From fedora-extras-commits at redhat.com  Sat Sep  1 00:21:15 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Fri, 31 Aug 2007 20:21:15 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.7,1.8
Message-ID: <200709010021.l810LFbo024916@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24895

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
- Rebuild




Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PolicyKit-gnome.spec	31 Aug 2007 21:02:07 -0000	1.7
+++ PolicyKit-gnome.spec	1 Sep 2007 00:20:42 -0000	1.8
@@ -10,7 +10,7 @@
 Summary: GNOME dialogs for PolicyKit
 Name: PolicyKit-gnome
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
@@ -79,6 +79,9 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
+* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
+- Rebuild
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
 - Require newer PolicyKit release
 



From fedora-extras-commits at redhat.com  Sat Sep  1 00:33:24 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Fri, 31 Aug 2007 20:33:24 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc4-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.677, 1.678 git-wireless-dev.patch, 1.34, 1.35 kernel.spec,
	1.140, 1.141 linux-2.6-utrace-tracehook.patch, 1.7, 1.8 sources,
	1.640, 1.641 upstream, 1.562,
	1.563 patch-2.6.23-rc4-git2.bz2.sign, 1.1, NONE
Message-ID: <200709010033.l810XOC1025155@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116

Modified Files:
	.cvsignore git-wireless-dev.patch kernel.spec 
	linux-2.6-utrace-tracehook.patch sources upstream 
Added Files:
	patch-2.6.23-rc4-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc4-git2.bz2.sign 
Log Message:
* Fri Aug 31 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc4-git3



--- NEW FILE patch-2.6.23-rc4-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG2GXryGugalF9Dw4RAudlAJ0cG+35KDaw26rUDzqZAdfJPIYTQQCfX3rm
lWU6c92/5zGPhNlbgpL6WX8=
=G6DG
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- .cvsignore	31 Aug 2007 17:20:37 -0000	1.677
+++ .cvsignore	1 Sep 2007 00:32:49 -0000	1.678
@@ -6,4 +6,4 @@
 patch-2.6.23-rc4.bz2
 patch-2.6.23-rc4.bz2
 patch-2.6.23-rc3-git10.bz2
-patch-2.6.23-rc4-git2.bz2
+patch-2.6.23-rc4-git3.bz2

git-wireless-dev.patch:

Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- git-wireless-dev.patch	30 Aug 2007 20:27:31 -0000	1.34
+++ git-wireless-dev.patch	1 Sep 2007 00:32:49 -0000	1.35
@@ -2428,7 +2428,7 @@
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  P:	Michael Chan
  M:	mchan at broadcom.com
-@@ -2057,6 +2095,16 @@ L:	http://lists.sourceforge.net/mailman/
+@@ -2096,6 +2096,16 @@ L:	http://lists.sourceforge.net/mailman/
  W:	http://ipw2200.sourceforge.net
  S:	Supported
  
@@ -2442,7 +2442,7 @@
 +T:	git git://intellinuxwireless.org/repos/iwlwifi
 +S:	Supported
 +
- IOC3 DRIVER
+ IOC3 ETHERNET DRIVER
  P:	Ralf Baechle
  M:	ralf at linux-mips.org
 @@ -3012,6 +3060,15 @@ L:	kpreempt-tech at lists.sourceforge.net


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kernel.spec	31 Aug 2007 22:08:01 -0000	1.140
+++ kernel.spec	1 Sep 2007 00:32:50 -0000	1.141
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1786,6 +1786,9 @@
 
 %changelog
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc4-git3
+
+* Fri Aug 31 2007 Dave Jones <davej at redhat.com>
 - Fix booting on Dell I5150.
   Apparently some VESA BIOS implementations clobber registers when called.
 

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-tracehook.patch	21 Aug 2007 19:42:55 -0000	1.7
+++ linux-2.6-utrace-tracehook.patch	1 Sep 2007 00:32:50 -0000	1.8
@@ -2906,7 +2906,7 @@
  	if (!thread_group_leader(p))
  		goto out;
  
--	if (p->real_parent == group_leader) {
+-	if (p->real_parent->tgid == group_leader->tgid) {
 +	if (p->parent == group_leader) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -r1.640 -r1.641
--- sources	31 Aug 2007 17:20:37 -0000	1.640
+++ sources	1 Sep 2007 00:32:50 -0000	1.641
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 cb7b0d6e6424f31ba41b9ba304b69833  patch-2.6.23-rc4.bz2
-a2de401162c4ca56878b05ea3777b1f6  patch-2.6.23-rc4-git2.bz2
+549f9a03a741881b70a4bae593246b22  patch-2.6.23-rc4-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- upstream	31 Aug 2007 17:20:37 -0000	1.562
+++ upstream	1 Sep 2007 00:32:50 -0000	1.563
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4-git2.bz2
+patch-2.6.23-rc4-git3.bz2


--- patch-2.6.23-rc4-git2.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 01:57:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 18:57:52 -0700
Subject: [pkgdb] rubygems (Fedora EPEL, 5) updated by kevin
Message-ID: <200709010157.l811vrog022678@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for rubygems
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rubygems (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rubygems (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rubygems (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:00:02 -0700
Subject: [pkgdb] maniadrive-music (Fedora, devel) updated by kevin
Message-ID: <200709010200.l81203HY022728@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive-music (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:00:01 -0700
Subject: [pkgdb] maniadrive-music was added for jwrdegoede
Message-ID: <200709010200.l81202FO022719@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package maniadrive-music with summary Replacement soundtrack for the non free ManiaDrive soundtrack
Kevin Fenzi (kevin) has approved Package maniadrive-music
Kevin Fenzi (kevin) has added a Fedora devel branch for maniadrive-music with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved maniadrive-music in Fedora devel
Kevin Fenzi (kevin) has approved Package maniadrive-music
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maniadrive-music (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on maniadrive-music (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maniadrive-music (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:26 -0400
Subject: rpms/maniadrive-music - New directory
Message-ID: <200709010200.l8120QqL032742@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music

Log Message:
Directory /cvs/extras/rpms/maniadrive-music added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:30 -0400
Subject: rpms/maniadrive-music/devel - New directory
Message-ID: <200709010200.l8120UH3032756@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive-music/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:35 -0400
Subject: rpms/maniadrive-music Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010200.l8120Zod000313@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive-music


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive-music
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:38 -0400
Subject: rpms/maniadrive-music/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709010200.l8120c1d000329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive-music


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive-music
# $Id: Makefile,v 1.1 2007/09/01 02:00:35 kevin Exp $
NAME := maniadrive-music
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:06:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:38 -0400
Subject: rpms/eclipse-rpm-editor - New directory
Message-ID: <200709010206.l8126cMH006489@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor

Log Message:
Directory /cvs/extras/rpms/eclipse-rpm-editor added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:44 -0400
Subject: rpms/eclipse-rpm-editor/devel - New directory
Message-ID: <200709010206.l8126i4i006503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-rpm-editor/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:49 -0400
Subject: rpms/eclipse-rpm-editor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010206.l8126nAI006532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-rpm-editor


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-rpm-editor
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:52 -0400
Subject: rpms/eclipse-rpm-editor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709010206.l8126q1j006551@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-rpm-editor


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-rpm-editor
# $Id: Makefile,v 1.1 2007/09/01 02:06:49 kevin Exp $
NAME := eclipse-rpm-editor
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:09:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:09:55 -0700
Subject: [pkgdb] sepostgresql was added for kaigai
Message-ID: <200709010209.l8129tNc022869@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package sepostgresql with summary Security-Enhanced PostgreSQL
Kevin Fenzi (kevin) has approved Package sepostgresql
Kevin Fenzi (kevin) has added a Fedora devel branch for sepostgresql with an owner of kaigai
Kevin Fenzi (kevin) has approved sepostgresql in Fedora devel
Kevin Fenzi (kevin) has approved Package sepostgresql
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sepostgresql (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sepostgresql (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sepostgresql (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:09:56 -0700
Subject: [pkgdb] sepostgresql (Fedora, devel) updated by kevin
Message-ID: <200709010209.l8129u21022878@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on sepostgresql (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:26 -0400
Subject: rpms/sepostgresql - New directory
Message-ID: <200709010210.l812AQnG006783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql

Log Message:
Directory /cvs/extras/rpms/sepostgresql added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:35 -0400
Subject: rpms/sepostgresql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709010210.l812AZwY006838@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sepostgresql


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sepostgresql
# $Id: Makefile,v 1.1 2007/09/01 02:10:32 kevin Exp $
NAME := sepostgresql
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:10:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:32 -0400
Subject: rpms/sepostgresql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010210.l812AWsh006822@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql

Added Files:
	Makefile import.log 
Log Message:
Setup of module sepostgresql


--- NEW FILE Makefile ---
# Top level Makefile for module sepostgresql
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:29 -0400
Subject: rpms/sepostgresql/devel - New directory
Message-ID: <200709010210.l812AT3Y006797@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql/devel

Log Message:
Directory /cvs/extras/rpms/sepostgresql/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:13:38 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Fri, 31 Aug 2007 22:13:38 -0400
Subject: rpms/PolicyKit/devel PolicyKit.spec,1.3,1.4
Message-ID: <200709010213.l812Dcto006896@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6876

Modified Files:
	PolicyKit.spec 
Log Message:
Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
- Rebuild




Index: PolicyKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/PolicyKit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PolicyKit.spec	31 Aug 2007 20:43:37 -0000	1.3
+++ PolicyKit.spec	1 Sep 2007 02:13:04 -0000	1.4
@@ -14,7 +14,7 @@
 Summary: Toolkit for privilege control
 Name: PolicyKit
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary
@@ -141,6 +141,9 @@
 %{_datadir}/gtk-doc/html/polkit/*
 
 %changelog
+* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
+- Rebuild
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
 - Upstream release 0.5
 



From fedora-extras-commits at redhat.com  Sat Sep  1 02:58:32 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 31 Aug 2007 22:58:32 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.477,1.478
Message-ID: <200709010258.l812wWl2007713@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7683

Modified Files:
	eclipse.spec 
Log Message:
fix pde package provides and oboletes


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- eclipse.spec	31 Aug 2007 16:43:09 -0000	1.477
+++ eclipse.spec	1 Sep 2007 02:57:59 -0000	1.478
@@ -31,6 +31,7 @@
 Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
+#Source4:        fedora-eclipse-product-plugin-3.3.0.1.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -271,6 +272,21 @@
 Summary:        Eclipse Plugin Development Environment
 Group:          Text Editors/Integrated Development Environments (IDE)
 Provides:	eclipse-sdk
+# Can remove for F9
+Obsoletes:	eclipse-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-pde-sdk
+Obsoletes:      eclipse-pde-sdk 1:3.3.0-13.fc8
+Provides:       eclipse-cvs-client-sdk
+Obsoletes:      eclipse-cvs-client-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-jdt-sdk
+Obsoletes:      eclipse-jdt-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-pde-sdk
+Obsoletes:      eclipse-pde-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-platform-sdk
+Obsoletes:      eclipse-platform-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-rcp-sdk
+Obsoletes:      eclipse-rcp-sdk < 1:3.3.0-13.fc8
+# end remove for F9
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
@@ -613,6 +629,7 @@
 fi
 
 tar jxf %{SOURCE20}
+#unzip -qq %{SOURCE4}
 
 %build
 ORIGCLASSPATH=$CLASSPATH



From fedora-extras-commits at redhat.com  Sat Sep  1 03:51:02 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 31 Aug 2007 23:51:02 -0400
Subject: rpms/snort/devel snort.spec,1.26,1.27
Message-ID: <200709010351.l813p2bc019653@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805

Modified Files:
	snort.spec 
Log Message:
 fix detection of libnet10 and mysql (on 64 bit platforms)



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- snort.spec	28 Aug 2007 03:59:10 -0000	1.26
+++ snort.spec	1 Sep 2007 03:50:29 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.7.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -13,12 +13,13 @@
 BuildRequires:  libpcap-devel >= 0.4
 BuildRequires:  perl
 BuildRequires:  pcre-devel
+BuildRequires:  sed
 
 %package        plain+flexresp
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10-devel
+BuildRequires:  libnet10
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -142,6 +143,8 @@
 %prep
 %setup -q
 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
 
 %build
 
@@ -179,6 +182,7 @@
 # mysql+flexresp
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -191,6 +195,7 @@
 # mysql
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                              --with-mysql-libraries=%{_libdir}/mysql \
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
@@ -256,6 +261,7 @@
 # bloat
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -471,6 +477,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
+- fix detection of mysql and libnet10
+
 * Mon Aug 27 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-1
 - update to 2.7.0.1
 



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:43 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:43 -0400
Subject: rpms/latexmk/F-7 .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1,
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814IhkO026149@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/F-7

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:34:53 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:10 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:10 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:34 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:10 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:34:53 -0000	1.2
+++ sources	1 Sep 2007 04:18:10 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:46 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:46 -0400
Subject: rpms/latexmk/FC-6 .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1, 
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814Ikss026164@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/FC-6

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:41:17 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:13 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:13 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:37 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:13 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:41:17 -0000	1.2
+++ sources	1 Sep 2007 04:18:13 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:48 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:48 -0400
Subject: rpms/latexmk/devel .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1, 
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814Im3Q026179@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/devel

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:34:53 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:15 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:15 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:40 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:15 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:34:53 -0000	1.2
+++ sources	1 Sep 2007 04:18:15 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:55:54 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 00:55:54 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.20,1.21
Message-ID: <200709010455.l814tscY026743@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26714

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
- setuptools seems to be broken WRT having an active and inactive version
  of an egg.  Have to make both versions inactive and manually setup a copy
  that can be started via import. (Necessary for the sqlalchemy0.3 compat
  package.)



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-sqlalchemy.spec	27 Aug 2007 21:52:02 -0000	1.20
+++ python-sqlalchemy.spec	1 Sep 2007 04:55:09 -0000	1.21
@@ -7,7 +7,7 @@
 
 Name:           python-sqlalchemy
 Version:        0.4.0
-Release:        0.1.%{betaver}%{?dist}
+Release:        0.3.%{betaver}%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -18,7 +18,11 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires:  python-setuptools-devel >= 0.6c3
+%else
 BuildRequires:  python-setuptools >= 0.6c3
+%endif
 
 %description
 SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
@@ -34,12 +38,17 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
+mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} --always-unzip dist/*.egg
+cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
+mv sqlalchemy ..
+ln -s ../sqlalchemy .
+
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
 
@@ -50,10 +59,19 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE PKG-INFO CHANGES doc examples
-%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg-info
+%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
 %{python_sitelib}/sqlalchemy/
 
 %changelog
+* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
+- setuptools seems to be broken WRT having an active and inactive version
+  of an egg.  Have to make both versions inactive and manually setup a copy
+  that can be started via import. (Necessary for the sqlalchemy0.3 compat
+  package.)
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.2.beta4
+- Modify setuptools to handle the -devel subpackage split in F-8.
+
 * Mon Aug 27 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-0.1.beta4
 - Update to 0.4 beta4.
 



From fedora-extras-commits at redhat.com  Sat Sep  1 06:21:27 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sat,  1 Sep 2007 02:21:27 -0400
Subject: fedora-security/audit fc7,1.87,1.88
Message-ID: <200709010621.l816LRYD007602@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7532

Modified Files:
	fc7 
Log Message:
CVE for qgit



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fc7	31 Aug 2007 16:23:03 -0000	1.87
+++ fc7	1 Sep 2007 06:21:24 -0000	1.88
@@ -5,11 +5,11 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070823
-# Up to date FC7 as of 20070827
+# Up to date CVE as of CVE email 20070829
+# Up to date FC7 as of 20070829
 
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-GENERIC-MAP-NOMATCH VULNERABLE (qgit) #268381
+CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861
 CVE-2007-4560 VULNERABLE (clamav) #260583
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal



From fedora-extras-commits at redhat.com  Sat Sep  1 08:24:03 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:24:03 -0400
Subject: rpms/icewm/devel .cvsignore,1.2,1.3 sources,1.3,1.4
Message-ID: <200709010824.l818O3ZB021516@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21492

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	1 Sep 2007 08:23:31 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsR8MAqz and /tmp/cvs54w68R differ



From fedora-extras-commits at redhat.com  Sat Sep  1 08:25:37 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:25:37 -0400
Subject: rpms/icewm/F-7 .cvsignore,1.2,1.3 sources,1.3,1.4
Message-ID: <200709010825.l818PbLB021569@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21539

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	1 Sep 2007 08:25:04 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsc0A5YM and /tmp/cvsRppX9U differ



From fedora-extras-commits at redhat.com  Sat Sep  1 08:26:50 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:26:50 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.4,1.5
Message-ID: <200709010826.l818Qo9T021604@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21578

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:34 -0000	1.4
+++ icewm.spec	1 Sep 2007 08:26:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,12 +11,10 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
 BuildRequires:	imlib-devel
@@ -136,6 +134,12 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.



From fedora-extras-commits at redhat.com  Sat Sep  1 08:29:32 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:29:32 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.5,1.6
Message-ID: <200709010829.l818TW5v021672@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21644

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	1 Sep 2007 08:26:17 -0000	1.5
+++ icewm.spec	1 Sep 2007 08:28:59 -0000	1.6
@@ -17,6 +17,7 @@
 BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -135,6 +136,7 @@
 
 %changelog
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
 - Fix broken source file.
 
 * Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:06 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818h7dF026108@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:11 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:11 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hBW7026117@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:16 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:16 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hGZg026131@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:25 -0700
Subject: [pkgdb] eclipse-rpm-editor was added for alcapcom
Message-ID: <200709010843.l818hIr0007916@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-rpm-editor with summary RPM Specfile editor for Eclipse
Kevin Fenzi (kevin) has approved Package eclipse-rpm-editor
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-rpm-editor with an owner of alcapcom
Kevin Fenzi (kevin) has approved eclipse-rpm-editor in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, 7) updated by kevin
Message-ID: <200709010843.l818hISh007925@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:18 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:18 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hIXW026141@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, devel) updated by kevin
Message-ID: <200709010843.l818hJXK007937@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, 6) updated by kevin
Message-ID: <200709010843.l818hKpH007950@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:07 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:07 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hLSx007962@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:17 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:17 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hL0q007972@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:31 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hVj9026156@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:31 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hWD4007981@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:33 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:33 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hX88007990@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:37 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:37 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hbZq026165@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:38 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:38 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hc0j026175@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:40 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818heSc007999@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:40 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010844.l818ifLu026192@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:43 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:43 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010844.l818ihG4026201@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:49 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:49 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010844.l818inkX026216@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:54 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010844.l818itoY026226@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:57 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010844.l818ivRj026235@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:02 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:02 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010845.l818j2XM026244@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:31 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kVFU026256@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:42 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:42 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010846.l818kW3x008035@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:48 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kXam008044@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:50 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:50 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010846.l818kX2L008053@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:34 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:34 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kYK0026268@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:55 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010846.l818kYAU008063@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:01 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:01 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kY1l008072@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:03 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:03 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010846.l818kZB4008081@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:32 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:32 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818kZ2E008091@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:39 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:39 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kdRZ008103@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:40 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818ke3M026281@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:42 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:42 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kgsq008115@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:46 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kkOi026293@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:47 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:47 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818klOR008128@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:48 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kmqE026305@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:57 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kv2j008140@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:58 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:58 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818kxSK026318@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:59 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:59 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010847.l818l0S7008153@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:46 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010847.l818lk93008166@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:47 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:47 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010847.l818ll71026331@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:48 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010847.l818lm8b008175@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:53 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:53 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010847.l818lrEi026340@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:54 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010847.l818lt28008185@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:55 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010847.l818ltw6026350@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:59 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:59 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010848.l818m0Hw008194@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:00 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:00 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010848.l818m0eK026359@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:01 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:01 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010848.l818m2vh008203@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:04 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:04 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010848.l818m4VX026368@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:06 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010848.l818m6cR008212@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:07 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:07 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010848.l818m7Kl026378@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 08:49:13 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:49:13 -0400
Subject: rpms/icewm/devel icewm.spec,1.5,1.6
Message-ID: <200709010849.l818nDLe022107@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22087

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	27 Aug 2007 16:46:11 -0000	1.5
+++ icewm.spec	1 Sep 2007 08:48:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -17,6 +17,7 @@
 BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -134,7 +135,11 @@
 
 
 %changelog
-* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-1
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
 - Fix bad %%{_fedora} if/else.
 
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1



From fedora-extras-commits at redhat.com  Sat Sep  1 09:04:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 1 Sep 2007 05:04:15 -0400
Subject: rpms/maniadrive-music/devel maniadrive-music.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709010904.l8194FOx028367@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-music.spec 
Log Message:
initial maniadrive import



--- NEW FILE maniadrive-music.spec ---
Name:           maniadrive-music
Version:        1.0
Release:        2%{?dist}
Summary:        Replacement soundtrack for the non free ManiaDrive soundtrack
Group:          Amusements/Games
License:        CC-BY and Free Art and GPL+
URL:            http://www.dogmazic.net/
Source0:        maniadrive-replacement-music.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
# to make sure this gets removed when maniadrive gets removed
Requires:       maniadrive 
# for /usr/share/maniadrive ownership
Requires:       maniadrive-data

%description
Soundtrack for ManiaDrive. This is not the original ManiaDrive soundtrack as
the original soundtrack is licensed under a CC BY-NC-SA license, which is not
acceptable to Fedora. This replacement music was carefully chosen to keep the
same atmosphere as the original music.

This soundtrack contains music from the following artists / groups:

Black moon
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Black+moon

Kitoy
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Kitoy

little
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=little

Mage
http://cqfd-corp.org/

Neub (aka Revision 1.1)
http://cqfd-corp.org/

Syndrome:
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Syndrome

Zzjmc
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Zzjmc


%prep
%setup -q -n mania_music


%build
# nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/maniadrive/mania_music
install -p -m 644 *.ogg $RPM_BUILD_ROOT%{_datadir}/maniadrive/mania_music


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.fedora COPYING
%{_datadir}/maniadrive/mania_music


%changelog
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
- Include 3 songs, instead of 1 song, from the original Maniadrive soundtrack,
  now that upstream has clarified the license status of the 2 added songs

* Sat Aug 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-music/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:00:35 -0000	1.1
+++ .cvsignore	1 Sep 2007 09:03:41 -0000	1.2
@@ -0,0 +1 @@
+maniadrive-replacement-music.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-music/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:00:35 -0000	1.1
+++ sources	1 Sep 2007 09:03:41 -0000	1.2
@@ -0,0 +1 @@
+8d97c24a6c087752b30986d84cb39fb2  maniadrive-replacement-music.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 09:04:55 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 05:04:55 -0400
Subject: rpms/icewm/FC-6 .cvsignore, 1.1, 1.2 icewm.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709010904.l8194tBN028429@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28371

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2007 19:36:05 -0000	1.1
+++ .cvsignore	1 Sep 2007 09:04:21 -0000	1.2
@@ -0,0 +1 @@
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:42 -0000	1.4
+++ icewm.spec	1 Sep 2007 09:04:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,13 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsZOzzXU and /tmp/cvsOZICtE differ



From fedora-extras-commits at redhat.com  Sat Sep  1 09:20:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 1 Sep 2007 05:20:10 -0400
Subject: rpms/xine-lib/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xine-lib.spec, 1.22, 1.23 xine-lib-1.1.7-open.patch, 1.1, NONE
Message-ID: <200709010920.l819KAik030173@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30148

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-1.1.7-open.patch 
Log Message:
* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
- 1.1.8, "open" patch applied upstream.
- Build XCB plugins by default for Fedora 8+ only.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Jun 2007 20:40:52 -0000	1.8
+++ .cvsignore	1 Sep 2007 09:19:38 -0000	1.9
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jun 2007 20:40:52 -0000	1.8
+++ sources	1 Sep 2007 09:19:38 -0000	1.9
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2  xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6  xine-lib-1.1.7-autotools.patch.bz2
+6cbfae9d31fc138c7cb3c3d178e1286d  xine-lib-1.1.8-pruned.tar.bz2
+b4a7c7a9af428b26667402d6dc180107  xine-lib-1.1.8-autotools.patch.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine-lib.spec	25 Aug 2007 21:23:05 -0000	1.22
+++ xine-lib.spec	1 Sep 2007 09:19:38 -0000	1.23
@@ -13,11 +13,16 @@
 %else
 %define         have_vidix 0
 %endif
+%if 0%{?fedora} >= 8
+%define         with_xcb 1
+%else
+%define         with_xcb 0
+%endif
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -30,13 +35,15 @@
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
-Patch2:         %{name}-1.1.7-open.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
 BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
-BuildRequires:  libGLU-devel libxcb-devel
+BuildRequires:  libGLU-devel
+%if %{with_xcb}
+BuildRequires:  libxcb-devel
+%endif
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
@@ -114,7 +121,9 @@
 %if 0%{!?_without_directfb:1}
   - DirectFB output
 %endif
-
+%if %{with_xcb}
+  - XCB output
+%endif
 
 
 %prep
@@ -124,7 +133,6 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-%patch2 -p1 -b .open
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -321,8 +329,10 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%if %{with_xcb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif
 
 
 %files devel
@@ -338,6 +348,10 @@
 
 
 %changelog
+* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
 * Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
 - Split the aRts plugin into its own subpackage
 


--- xine-lib-1.1.7-open.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 09:36:49 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:36:49 -0400
Subject: rpms/gcc/devel gcc41.spec,1.168,1.169
Message-ID: <200709010936.l819an6M030501@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30462

Modified Files:
	gcc41.spec 
Log Message:
4.1.2-21


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gcc41.spec	31 Aug 2007 21:09:32 -0000	1.168
+++ gcc41.spec	1 Sep 2007 09:36:16 -0000	1.169
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 20
+%define gcc_release 21
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -887,7 +887,7 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortranbegin.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a .
+mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/
 mv -f $RPM_BUILD_ROOT%{_prefix}/include/mf-runtime.h include/
 
 %ifarch sparc ppc
@@ -909,9 +909,12 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortranbegin.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libmudflap{,th}.*a 64/
 ln -sf lib32/libstdc++.a libstdc++.a
 ln -sf ../lib64/libstdc++.a 64/libstdc++.a
+ln -sf lib32/libmudflap.a libmudflap.a
+ln -sf ../lib64/libmudflap.a 64/libmudflap.a
+ln -sf lib32/libmudflapth.a libmudflapth.a
+ln -sf ../lib64/libmudflapth.a 64/libmudflapth.a
 %endif
 %ifarch %{multilib_64_archs}
 mkdir -p 32
@@ -931,11 +934,14 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortranbegin.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libmudflap{,th}.*a 32/
 %endif
 %ifarch sparc64 ppc64
 ln -sf ../lib32/libstdc++.a 32/libstdc++.a
 ln -sf lib64/libstdc++.a libstdc++.a
+ln -sf ../lib32/libmudflap.a 32/libmudflap.a
+ln -sf lib64/libmudflap.a libmudflap.a
+ln -sf ../lib32/libmudflapth.a 32/libmudflapth.a
+ln -sf lib64/libmudflapth.a libmudflapth.a
 %if %{build_java}
 ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
 ln -sf lib64/libgcj_bc.so libgcj_bc.so
@@ -943,6 +949,8 @@
 %else
 %ifarch %{multilib_64_archs}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflap.a 32/libmudflap.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflapth.a 32/libmudflapth.a
 %if %{build_java}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
 %endif
@@ -1219,6 +1227,10 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
@@ -1229,6 +1241,16 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
+%endif
+%ifarch sparc sparc64 ppc ppc64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
 %endif
 %dir %{_prefix}/libexec/getconf
 %{_prefix}/libexec/getconf/default
@@ -1576,27 +1598,29 @@
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
+%ifarch sparc ppc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
+%endif
+%ifarch sparc64 ppc64
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
+%endif
+%ifnarch sparc sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
 %endif
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Aug  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
+- fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
+  (#270281)
+
 * Fri Aug 31 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20
 - backport __attribute__((__gnu_inline__)) support for C++
 - fix ppc/ppc64 __sync_* builtins with aligned 8 or 16-bit values



From fedora-extras-commits at redhat.com  Sat Sep  1 09:38:23 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:38:23 -0400
Subject: rpms/gcc/devel gcc41.spec,1.169,1.170
Message-ID: <200709010938.l819cNMg030546@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30514

Modified Files:
	gcc41.spec 
Log Message:
4.1.2-21


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gcc41.spec	1 Sep 2007 09:36:16 -0000	1.169
+++ gcc41.spec	1 Sep 2007 09:37:50 -0000	1.170
@@ -1617,7 +1617,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Sat Aug  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
+* Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)
 



From fedora-extras-commits at redhat.com  Sat Sep  1 09:50:41 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:50:41 -0400
Subject: rpms/gcc/F-7 gcc41-c++-gnu_inline.patch, NONE,
	1.1 gcc41-ppc-sync-qihi.patch, NONE,
	1.1 gcc41-ppc64-ia64-GNU-stack.patch, NONE, 1.1 gcc41.spec,
	1.161, 1.162
Message-ID: <200709010950.l819ofXC030729@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-c++-gnu_inline.patch gcc41-ppc-sync-qihi.patch 
	gcc41-ppc64-ia64-GNU-stack.patch 
Log Message:
4.1.2-20.fc7

gcc41-c++-gnu_inline.patch:

--- NEW FILE gcc41-c++-gnu_inline.patch ---
2007-08-31  Jakub Jelinek  <jakub at redhat.com>

	* cp-tree.h (cp_disregard_inline_limits): New prototype.
	* decl.c (cp_disregard_inline_limits): New function.
	* cp-objcp-common.h
	(LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS): Define.

2007-08-30  Jakub Jelinek  <jakub at redhat.com>

	* gcc.dg/inline-24.c: New test.
	* g++.dg/opt/inline11.C: New test.

2007-08-27  Alexandre Oliva  <aoliva at redhat.com>

	* doc/extend.texi (gnu_inline funtion attribute): Document C++
	behavior.

	* decl.c (GNU_INLINE_P): New.
	(duplicate_decls): Handle gnu_inline.  Merge attributes and
	some flags in overriding definitions.
	(redeclaration_error_message): Handle gnu_inline.
	(start_preparsed_function): Likewise.

	* g++.dg/ext/gnu-inline-common.h: New.
	* g++.dg/ext/gnu-inline-global-reject.C: New.
	* g++.dg/ext/gnu-inline-global.C: New.
	* g++.dg/ext/gnu-inline-namespace.C: New.
	* g++.dg/ext/gnu-inline-anon-namespace.C: New.
	* g++.dg/ext/gnu-inline-class.C: New.
	* g++.dg/ext/gnu-inline-class-static.C: New.
	* g++.dg/ext/gnu-inline-template-class.C: New.
	* g++.dg/ext/gnu-inline-template-func.C: New.

--- gcc/cp/cp-tree.h.jj	2007-08-31 09:47:43.000000000 +0200
+++ gcc/cp/cp-tree.h	2007-08-31 14:09:08.000000000 +0200
@@ -4417,6 +4417,7 @@ extern linkage_kind decl_linkage		(tree)
 extern tree cp_walk_subtrees (tree*, int*, walk_tree_fn,
 			      void*, struct pointer_set_t*);
 extern int cp_cannot_inline_tree_fn		(tree*);
+extern int cp_disregard_inline_limits		(tree);
 extern tree cp_add_pending_fn_decls		(void*,tree);
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
--- gcc/cp/decl.c.jj	2007-08-31 09:47:43.000000000 +0200
+++ gcc/cp/decl.c	2007-08-31 14:27:12.000000000 +0200
@@ -1097,6 +1097,10 @@ check_redeclaration_exception_specificat
     }
 }
 
+#define GNU_INLINE_P(fn) (DECL_DECLARED_INLINE_P (fn)			\
+			  && lookup_attribute ("gnu_inline",		\
+					       DECL_ATTRIBUTES (fn)))
+
 /* If NEWDECL is a redeclaration of OLDDECL, merge the declarations.
    If the redeclaration is invalid, a diagnostic is issued, and the
    error_mark_node is returned.  Otherwise, OLDDECL is returned.
@@ -1626,19 +1630,45 @@ duplicate_decls (tree newdecl, tree oldd
 	= chainon (DECL_TEMPLATE_SPECIALIZATIONS (olddecl),
 		   DECL_TEMPLATE_SPECIALIZATIONS (newdecl));
 
+      DECL_ATTRIBUTES (old_result)
+	= (*targetm.merge_decl_attributes) (old_result, new_result);
+
       if (DECL_FUNCTION_TEMPLATE_P (newdecl))
 	{
-	  DECL_INLINE (old_result)
-	    |= DECL_INLINE (new_result);
-	  DECL_DECLARED_INLINE_P (old_result)
-	    |= DECL_DECLARED_INLINE_P (new_result);
-	  check_redeclaration_exception_specification (newdecl, olddecl);
+	  if (GNU_INLINE_P (old_result) != GNU_INLINE_P (new_result)
+	      && DECL_INITIAL (new_result))
+	    {
+	      if (DECL_INITIAL (old_result))
+		{
+		  DECL_INLINE (old_result) = 0;
+		  DECL_UNINLINABLE (old_result) = 1;
+		}
+	      else
+		{
+		  DECL_INLINE (old_result) = DECL_INLINE (new_result);
+		  DECL_UNINLINABLE (old_result) = DECL_UNINLINABLE (new_result);
+		}
+	      DECL_EXTERNAL (old_result) = DECL_EXTERNAL (new_result);
+	      DECL_NOT_REALLY_EXTERN (old_result)
+		= DECL_NOT_REALLY_EXTERN (new_result);
+	      DECL_INTERFACE_KNOWN (old_result)
+		= DECL_INTERFACE_KNOWN (new_result);
+	      DECL_DECLARED_INLINE_P (old_result)
+		= DECL_DECLARED_INLINE_P (new_result);
+	    }
+	  else
+	    {
+	      DECL_INLINE (old_result)
+		|= DECL_INLINE (new_result);
+	      DECL_DECLARED_INLINE_P (old_result)
+		|= DECL_DECLARED_INLINE_P (new_result);
+	      check_redeclaration_exception_specification (newdecl, olddecl);
+	    }
 	}
 
       /* If the new declaration is a definition, update the file and
 	 line information on the declaration.  */
-      if (DECL_INITIAL (old_result) == NULL_TREE
-	  && DECL_INITIAL (new_result) != NULL_TREE)
+      if (DECL_INITIAL (new_result) != NULL_TREE)
 	{
 	  DECL_SOURCE_LOCATION (olddecl)
 	    = DECL_SOURCE_LOCATION (old_result)
@@ -1795,9 +1825,29 @@ duplicate_decls (tree newdecl, tree oldd
   new_template = NULL_TREE;
   if (DECL_LANG_SPECIFIC (newdecl) && DECL_LANG_SPECIFIC (olddecl))
     {
-      DECL_INTERFACE_KNOWN (newdecl) |= DECL_INTERFACE_KNOWN (olddecl);
-      DECL_NOT_REALLY_EXTERN (newdecl) |= DECL_NOT_REALLY_EXTERN (olddecl);
-      DECL_COMDAT (newdecl) |= DECL_COMDAT (olddecl);
+      bool old_decl_gnu_inline;
+
+      if ((DECL_INTERFACE_KNOWN (olddecl)
+	   && TREE_CODE (olddecl) == FUNCTION_DECL)
+	  || (TREE_CODE (olddecl) == TEMPLATE_DECL
+	      && TREE_CODE (DECL_TEMPLATE_RESULT (olddecl)) == FUNCTION_DECL))
+	{
+	  tree fn = olddecl;
+
+	  if (TREE_CODE (fn) == TEMPLATE_DECL)
+	    fn = DECL_TEMPLATE_RESULT (olddecl);
+
+	  old_decl_gnu_inline = GNU_INLINE_P (fn) && DECL_INITIAL (fn);
+	}
+      else
+	old_decl_gnu_inline = false;
+
+      if (!old_decl_gnu_inline)
+	{
+	  DECL_INTERFACE_KNOWN (newdecl) |= DECL_INTERFACE_KNOWN (olddecl);
+	  DECL_NOT_REALLY_EXTERN (newdecl) |= DECL_NOT_REALLY_EXTERN (olddecl);
+	  DECL_COMDAT (newdecl) |= DECL_COMDAT (olddecl);
+	}
       DECL_TEMPLATE_INSTANTIATED (newdecl)
 	|= DECL_TEMPLATE_INSTANTIATED (olddecl);
 
@@ -1871,6 +1921,13 @@ duplicate_decls (tree newdecl, tree oldd
 	  /* [temp.expl.spec/14] We don't inline explicit specialization
 	     just because the primary template says so.  */
 	}
+      else if (new_defines_function && DECL_INITIAL (olddecl))
+	{
+	  /* C++ is always in in unit-at-a-time mode, so we never
+	     inline re-defined extern inline functions.  */
+	  DECL_INLINE (newdecl) = 0;
+	  DECL_UNINLINABLE (newdecl) = 1;
+	}
       else
 	{
 	  if (DECL_PENDING_INLINE_INFO (newdecl) == 0)
@@ -2113,9 +2170,25 @@ redeclaration_error_message (tree newdec
 	{
 	  if (DECL_NAME (olddecl) == NULL_TREE)
 	    return "%q#D not declared in class";
-	  else
+	  else if (!GNU_INLINE_P (olddecl)
+		   || GNU_INLINE_P (newdecl))
 	    return "redefinition of %q#D";
 	}
+
+      if (DECL_DECLARED_INLINE_P (olddecl) && DECL_DECLARED_INLINE_P (newdecl))
+	{
+	  bool olda = GNU_INLINE_P (olddecl);
+	  bool newa = GNU_INLINE_P (newdecl);
+
+	  if (olda != newa)
+	    {
+	      if (newa)
+		return "%q+D redeclared inline with %<gnu_inline%> attribute";
+	      else
+		return "%q+D redeclared inline without %<gnu_inline%> attribute";
+	    }
+	}
+
       return 0;
     }
   else if (TREE_CODE (newdecl) == TEMPLATE_DECL)
@@ -2141,9 +2214,24 @@ redeclaration_error_message (tree newdec
       ot = DECL_TEMPLATE_RESULT (olddecl);
       if (DECL_TEMPLATE_INFO (ot))
 	ot = DECL_TEMPLATE_RESULT (template_for_substitution (ot));
-      if (DECL_INITIAL (nt) && DECL_INITIAL (ot))
+      if (DECL_INITIAL (nt) && DECL_INITIAL (ot)
+	  && (!GNU_INLINE_P (ot) || GNU_INLINE_P (nt)))
 	return "redefinition of %q#D";
 
+      if (DECL_DECLARED_INLINE_P (ot) && DECL_DECLARED_INLINE_P (nt))
+	{
+	  bool olda = GNU_INLINE_P (ot);
+	  bool newa = GNU_INLINE_P (nt);
+
+	  if (olda != newa)
+	    {
+	      if (newa)
+		return "%q+D redeclared inline with %<gnu_inline%> attribute";
+	      else
+		return "%q+D redeclared inline without %<gnu_inline%> attribute";
+	    }
+	}
+
       return NULL;
     }
   else if (TREE_CODE (newdecl) == VAR_DECL
@@ -10447,6 +10535,14 @@ start_preparsed_function (tree decl1, tr
       && lookup_attribute ("noinline", attrs))
     warning (0, "inline function %q+D given attribute noinline", decl1);
 
+  /* Handle gnu_inline attribute.  */
+  if (GNU_INLINE_P (decl1))
+    {
+      DECL_EXTERNAL (decl1) = 1;
+      DECL_NOT_REALLY_EXTERN (decl1) = 0;
+      DECL_INTERFACE_KNOWN (decl1) = 1;
+    }
+
   if (DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl1))
     /* This is a constructor, we must ensure that any default args
        introduced by this definition are propagated to the clones
@@ -10702,8 +10798,9 @@ start_preparsed_function (tree decl1, tr
   else
     {
       /* This is a definition, not a reference.
-	 So clear DECL_EXTERNAL.  */
-      DECL_EXTERNAL (decl1) = 0;
+	 So clear DECL_EXTERNAL, unless this is a GNU extern inline.  */
+      if (!GNU_INLINE_P (decl1))
+	DECL_EXTERNAL (decl1) = 0;
 
       if ((DECL_DECLARED_INLINE_P (decl1)
 	   || DECL_TEMPLATE_INSTANTIATION (decl1))
@@ -11698,4 +11795,17 @@ cxx_comdat_group (tree decl)
   return IDENTIFIER_POINTER (name);
 }
 
+/* We want to inline __gnu_inline__ functions even if this would
+   violate inlining limits.  Some glibc and linux constructs depend on
+   such functions always being inlined when optimizing.  */
+
+int
+cp_disregard_inline_limits (tree fn)
+{
+  if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) != NULL)
+    return 1;
+
+  return (!flag_really_no_inline && GNU_INLINE_P (fn));
+}
+
 #include "gt-cp-decl.h"
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 22:37:34.000000000 +0100
+++ gcc/cp/cp-objcp-common.h	2007-08-31 13:58:32.000000000 +0200
@@ -107,6 +107,9 @@ extern tree objcp_tsubst_copy_and_build 
 #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN
 #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \
   cp_cannot_inline_tree_fn
+#undef LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS
+#define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \
+  cp_disregard_inline_limits
 #undef LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS
 #define LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS \
   cp_add_pending_fn_decls
--- gcc/doc/extend.texi.jj	2007-08-31 09:47:40.000000000 +0200
+++ gcc/doc/extend.texi	2007-08-31 13:00:28.000000000 +0200
@@ -1587,8 +1587,8 @@ refer to the single copy in the library.
 definitions of the functions need not be precisely the same, although
 if they do not have the same effect your program may behave oddly.
 
-If the function is neither @code{extern} nor @code{static}, then the
-function is compiled as a standalone function, as well as being
+In C, if the function is neither @code{extern} nor @code{static}, then
+the function is compiled as a standalone function, as well as being
 inlined where possible.
 
 This is how GCC traditionally handled functions declared
@@ -1606,6 +1606,10 @@ assume that it is always present, whethe
 In versions prior to 4.3, the only effect of explicitly including it is
 to disable warnings about using inline functions in C99 mode.
 
+In C++, this attribute does not depend on @code{extern} in any way,
+but it still requires the @code{inline} keyword to enable its special
+behavior.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/testsuite/gcc.dg/inline-24.c.jj	2007-08-31 14:11:45.000000000 +0200
+++ gcc/testsuite/gcc.dg/inline-24.c	2007-08-30 18:43:55.000000000 +0200
@@ -0,0 +1,28 @@
+/* Verify that gnu_inline inlines disregard inlining limits.  */
+/* { dg-do link } */
+/* { dg-options "-O2" } */
+
+extern int foo (int);
+extern int baz (int);
+
+extern inline __attribute__((gnu_inline))
+int foo (int x)
+{
+  int i;
+  if (!__builtin_constant_p (x))
+    {
+#define B(n) baz (1##n) + baz (2##n) + baz (3##n) \
+	     + baz (4##n) + baz (5##n) + baz (6##n)
+#define C(n) B(1##n) + B(2##n) + B(3##n) + B(4##n) + B(5##n) + B(6##n)
+#define D(n) C(1##n) + C(2##n) + C(3##n) + C(4##n) + C(5##n) + C(6##n)
+      return D(0) + D(1) + D(2) + D(3) + D(4)
+	     + D(5) + D(6) + D(7) + D(8) + D(9);
+    }
+  return 0;
+}
+
+int
+main (void)
+{
+  return foo (0);
+}
--- gcc/testsuite/g++.dg/opt/inline11.C.jj	2007-08-31 14:12:05.000000000 +0200
+++ gcc/testsuite/g++.dg/opt/inline11.C	2007-08-30 18:43:55.000000000 +0200
@@ -0,0 +1,28 @@
+/* Verify that gnu_inline inlines disregard inlining limits.  */
+/* { dg-do link } */
+/* { dg-options "-O2" } */
+
+extern int foo (int);
+extern int baz (int);
+
+extern inline __attribute__((gnu_inline))
+int foo (int x)
+{
+  int i;
+  if (!__builtin_constant_p (x))
+    {
+#define B(n) baz (1##n) + baz (2##n) + baz (3##n) \
+	     + baz (4##n) + baz (5##n) + baz (6##n)
+#define C(n) B(1##n) + B(2##n) + B(3##n) + B(4##n) + B(5##n) + B(6##n)
+#define D(n) C(1##n) + C(2##n) + C(3##n) + C(4##n) + C(5##n) + C(6##n)
+      return D(0) + D(1) + D(2) + D(3) + D(4)
+	     + D(5) + D(6) + D(7) + D(8) + D(9);
+    }
+  return 0;
+}
+
+int
+main (void)
+{
+  return foo (0);
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-global-reject.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-global-reject.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,55 @@
+/* Test __attribute__((gnu_inline)).
+
+   Check that we reject various forms of duplicate definitions.
+*/
+
+/* { dg-do compile } */
+
+#include "gnu-inline-common.h"
+
+#undef fn
+#define fn pfx(func_decl_inline_before)
+decl(inline, fn) // { dg-error "previous" "" }
+gnuindef(fn, 0) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_decl_inline_after)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+decl(inline, fn) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_def_gnuin_redef)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_redef)
+def(inline, fn, 0) // { dg-error "previous" "" }
+def(inline, fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_after)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+def(inline, fn, 1) // { dg-error "redeclare" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_before)
+def(inline, fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_before)
+def(, fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_decl_static_inline_before)
+decl(static inline, fn) // { dg-error "previous" "" }
+gnuindef(fn, 0) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_def_static_inline_after)
+decl(static, fn)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+decl(static, fn)
+def(static inline, fn, 1) // { dg-error "redeclare" "" }
--- gcc/testsuite/g++.dg/ext/gnu-inline-template-func.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-template-func.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+#define defpfx template <typename T>
+
+#include "gnu-inline-global.C"
+
+template int func1<int>(void);
+template int func2<int>(void);
+template int func3<int>(void);
+template int func4<int>(void);
+template int func5<int>(void);
--- gcc/testsuite/g++.dg/ext/gnu-inline-common.h.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-common.h	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,24 @@
+#ifndef gnu
+# define gnu_inline __attribute__((gnu_inline)) inline
+#endif
+
+#define declspec(spec, name) spec int name (void)
+#ifdef IN_CLASS
+# define decl(spec, name)
+#else
+# define decl(spec, name) defpfx declspec(spec, name);
+#endif
+#define def(spec, name, ret) defpfx declspec(spec, name) { return ret; }
+#define gnuindef(name, ret) def(gnu_inline, name, ret)
+
+#ifndef pfx
+# ifdef IN_CLASS
+#  define pfx(x) IN_CLASS::x
+# else
+#  define pfx(x) x
+# endif
+#endif
+
+#ifndef defpfx
+# define defpfx
+#endif
--- gcc/testsuite/g++.dg/ext/gnu-inline-anon-namespace.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-anon-namespace.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler-not "func1" } } */
+/* { dg-final { scan-assembler-not "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler-not "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+namespace {
+#include "gnu-inline-global.C"
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-class-static.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-class-static.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+#undef IN_CLASS
+#define IN_CLASS gnu_test_static
+
+struct IN_CLASS {
+  static int func1(void);
+  static int func2(void);
+  static int func3(void);
+  static int func4(void);
+  static int func5(void);
+};
+
+#include "gnu-inline-global.C"
--- gcc/testsuite/g++.dg/ext/gnu-inline-global.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-global.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,50 @@
+/* Test __attribute__((gnu_inline)).
+
+   Check that __attribute__((gnu_inline)) has no effect, in the
+   absence of extern and/or inline.
+
+   Check that we don't get out-of-line definitions for extern inline
+   gnu_inline functions, regardless of declarations or definitions.
+
+   Check that such functions can be overridden by out-of-line
+   definitions.
+
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+#include "gnu-inline-common.h"
+
+#undef fn
+#define fn pfx(func1) // must be emitted out-of-line
+gnuindef(fn, 0)
+def(, fn, 2)
+
+#undef fn
+#define fn pfx(func2) // must be emitted out-of-line
+decl(extern, fn)
+gnuindef(fn, 0)
+def(, fn, 2)
+
+#undef fn
+#define fn pfx(func3) // must not be emitted
+decl(extern, fn)
+gnuindef(fn, 0)
+
+#undef fn
+#define fn pfx(func4) // must be emitted out-of-line
+decl(extern, fn)
+gnuindef(fn, 0)
+def(, fn, 1)
+
+#undef fn
+#define fn pfx(func5) // must NOT be emitted, because it's static and unused
+decl(static, fn)
+gnuindef(fn, 0)
+def(, fn, 1)
--- gcc/testsuite/g++.dg/ext/gnu-inline-template-class.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-template-class.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+template <typename T> struct gnu_test {
+  int func1(void);
+  int func2(void);
+  int func3(void);
+  int func4(void);
+  int func5(void);
+};
+
+#define defpfx template <typename T>
+#define IN_CLASS gnu_test<T>
+
+#include "gnu-inline-global.C"
+
+template struct gnu_test<int>;
--- gcc/testsuite/g++.dg/ext/gnu-inline-namespace.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-namespace.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+namespace gnu_test {
+#include "gnu-inline-global.C"
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-class.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-class.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+#define IN_CLASS gnu_test
+
+struct IN_CLASS {
+  int func1(void);
+  int func2(void);
+  int func3(void);
+  int func4(void);
+  int func5(void);
+};
+
+#include "gnu-inline-global.C"

gcc41-ppc-sync-qihi.patch:

--- NEW FILE gcc41-ppc-sync-qihi.patch ---
2007-08-29  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_emit_sync): For QI or HI mode
	used_m, even if it is 32-bit aligned, adjust used_m MEM to have
	SImode and update m.  Don't run gen_lowpart_common on arbitrary
	memory address, force it to register first.

	* gcc.dg/sync-2.c (AI_ALIGN): Define if not defined.
	(AI): Add AI_ALIGN.
	* gcc.dg/sync-3.c: New test.

--- gcc/config/rs6000/rs6000.c.jj	2007-08-27 14:56:36.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2007-08-29 22:15:41.000000000 +0200
@@ -12757,14 +12757,16 @@ rs6000_emit_sync (enum rtx_code code, en
 	    ishift = GET_MODE_BITSIZE (SImode) - GET_MODE_BITSIZE (mode);
 
 	  shift = GEN_INT (ishift);
+	  used_m = change_address (used_m, SImode, 0);
 	}
       else
 	{
 	  rtx addrSI, aligned_addr;
 	  int shift_mask = mode == QImode ? 0x18 : 0x10;
 
-	  addrSI = force_reg (SImode, gen_lowpart_common (SImode,
-							  XEXP (used_m, 0)));
+	  addrSI = gen_lowpart_common (SImode,
+				       force_reg (Pmode, XEXP (used_m, 0)));
+	  addrSI = force_reg (SImode, addrSI);
 	  shift = gen_reg_rtx (SImode);
 
 	  emit_insn (gen_rlwinm (shift, addrSI, GEN_INT (3),
@@ -12777,14 +12779,14 @@ rs6000_emit_sync (enum rtx_code code, en
 				       1, OPTAB_LIB_WIDEN);
 	  used_m = change_address (used_m, SImode, aligned_addr);
 	  set_mem_align (used_m, 32);
-	  /* It's safe to keep the old alias set of USED_M, because
-	     the operation is atomic and only affects the original
-	     USED_M.  */
-	  if (GET_CODE (m) == NOT)
-	    m = gen_rtx_NOT (SImode, used_m);
-	  else
-	    m = used_m;
 	}
+      /* It's safe to keep the old alias set of USED_M, because
+	 the operation is atomic and only affects the original
+	 USED_M.  */
+      if (GET_CODE (m) == NOT)
+	m = gen_rtx_NOT (SImode, used_m);
+      else
+	m = used_m;
 
       if (GET_CODE (op) == NOT)
 	{
--- gcc/testsuite/gcc.dg/sync-2.c.jj	2006-10-05 00:25:32.000000000 +0200
+++ gcc/testsuite/gcc.dg/sync-2.c	2007-08-29 21:49:47.000000000 +0200
@@ -8,7 +8,11 @@
 extern void abort (void);
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 
-static char AI[18];
+#ifndef AI_ALIGN
+#define AI_ALIGN
+#endif
+
+static char AI[18] AI_ALIGN;
 static char init_qi[18] = { 3,5,7,9,0,0,0,0,-1,0,0,0,0,0,-1,0,0,0 };
 static char test_qi[18] = { 3,5,7,9,1,4,22,-12,7,8,9,7,1,-12,7,8,9,7 };
 
--- gcc/testsuite/gcc.dg/sync-3.c.jj	2007-08-29 21:49:59.000000000 +0200
+++ gcc/testsuite/gcc.dg/sync-3.c	2007-08-29 22:00:31.000000000 +0200
@@ -0,0 +1,10 @@
+/* { dg-do run } */
+/* { dg-require-effective-target sync_char_short } */
+/* { dg-options "-O2" } */
+/* { dg-options "-march=i486 -O2" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-mcpu=v9 -O2" { target sparc*-*-* } } */
+
+/* Test functionality of the intrinsics for 'short' and 'char'.  */
+
+#define AI_ALIGN __attribute__((__aligned__ (4)))
+#include "sync-2.c"

gcc41-ppc64-ia64-GNU-stack.patch:

--- NEW FILE gcc41-ppc64-ia64-GNU-stack.patch ---
2007-08-27  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_elf_end_indicate_exec_stack): New.
	* config/rs6000/linux64.h (TARGET_ASM_FILE_END): Use
	rs6000_elf_end_indicate_exec_stack.
	* config/ia64/ia64.c (ia64_linux_file_end): new.
	* config/ia64/linux.h (TARGET_ASM_FILE_END): Use ia64_linux_file_end.

--- gcc/config/rs6000/rs6000.c.jj	2007-06-27 12:10:19.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2007-08-27 19:27:24.000000000 +0200
@@ -638,6 +638,7 @@ static void rs6000_file_start (void);
 static unsigned int rs6000_elf_section_type_flags (tree, const char *, int);
 static void rs6000_elf_asm_out_constructor (rtx, int);
 static void rs6000_elf_asm_out_destructor (rtx, int);
+static void rs6000_elf_end_indicate_exec_stack (void) ATTRIBUTE_UNUSED;
 static void rs6000_elf_select_section (tree, int, unsigned HOST_WIDE_INT);
 static void rs6000_elf_unique_section (tree, int);
 static void rs6000_elf_select_rtx_section (enum machine_mode, rtx,
@@ -18896,6 +18897,20 @@ rs6000_elf_declare_function_name (FILE *
     }
   ASM_OUTPUT_LABEL (file, name);
 }
+
+static void
+rs6000_elf_end_indicate_exec_stack (void)
+{
+  if (TARGET_32BIT)
+    file_end_indicate_exec_stack ();
+  else
+    {
+      int saved_trampolines_created = trampolines_created;
+      trampolines_created = 0;
+      file_end_indicate_exec_stack ();
+      trampolines_created = saved_trampolines_created;
+    }
+}
 #endif
 
 #if TARGET_XCOFF
--- gcc/config/rs6000/linux64.h.jj	2006-11-08 17:53:15.000000000 +0100
+++ gcc/config/rs6000/linux64.h	2007-08-27 19:25:09.000000000 +0200
@@ -549,7 +549,7 @@ while (0)
 #undef DRAFT_V4_STRUCT_RET
 #define DRAFT_V4_STRUCT_RET (!TARGET_64BIT)
 
-#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+#define TARGET_ASM_FILE_END rs6000_elf_end_indicate_exec_stack
 
 #define TARGET_POSIX_IO
 
--- gcc/config/ia64/linux.h.jj	2006-07-14 18:00:58.000000000 +0200
+++ gcc/config/ia64/linux.h	2007-08-27 19:21:12.000000000 +0200
@@ -5,7 +5,7 @@
 
 #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
 
-#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+#define TARGET_ASM_FILE_END ia64_linux_file_end
 
 /* This is for -profile to use -lc_p instead of -lc.  */
 #undef CC1_SPEC
--- gcc/config/ia64/ia64.c.jj	2007-01-05 23:54:11.000000000 +0100
+++ gcc/config/ia64/ia64.c	2007-08-27 19:21:43.000000000 +0200
@@ -246,6 +246,8 @@ static void ia64_hpux_add_extern_decl (t
      ATTRIBUTE_UNUSED;
 static void ia64_hpux_file_end (void)
      ATTRIBUTE_UNUSED;
+static void ia64_linux_file_end (void)
+     ATTRIBUTE_UNUSED;
 static void ia64_init_libfuncs (void)
      ATTRIBUTE_UNUSED;
 static void ia64_hpux_init_libfuncs (void)
@@ -9096,4 +9098,13 @@ ia64_invalid_binary_op (int op ATTRIBUTE
   return NULL;
 }
 
+static void
+ia64_linux_file_end (void)
+{
+  int saved_trampolines_created = trampolines_created;
+  trampolines_created = 0;
+  file_end_indicate_exec_stack ();
+  trampolines_created = saved_trampolines_created;
+}
+
 #include "gt-ia64.h"


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gcc41.spec	27 Aug 2007 11:08:53 -0000	1.161
+++ gcc41.spec	1 Sep 2007 09:50:08 -0000	1.162
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 18
+%define gcc_release 20
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -142,6 +142,9 @@
 Patch28: gcc41-sparc-niagara.patch
 Patch29: gcc41-ppc-tramp.patch
 Patch30: gcc41-rh253102.patch
+Patch31: gcc41-c++-gnu_inline.patch
+Patch32: gcc41-ppc-sync-qihi.patch
+Patch33: gcc41-ppc64-ia64-GNU-stack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -455,6 +458,9 @@
 %patch28 -p0 -b .sparc-niagara~
 %patch29 -p0 -b .ppc-tramp~
 %patch30 -p0 -b .rh253102~
+%patch31 -p0 -b .c++-gnu_inline~
+%patch32 -p0 -b .ppc-sync-qihi~
+%patch33 -p0 -b .ppc64-ia64-GNU-stack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -879,7 +885,7 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortranbegin.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a .
+mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/
 mv -f $RPM_BUILD_ROOT%{_prefix}/include/mf-runtime.h include/
 
 %ifarch sparc ppc
@@ -901,9 +907,12 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortranbegin.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libmudflap{,th}.*a 64/
 ln -sf lib32/libstdc++.a libstdc++.a
 ln -sf ../lib64/libstdc++.a 64/libstdc++.a
+ln -sf lib32/libmudflap.a libmudflap.a
+ln -sf ../lib64/libmudflap.a 64/libmudflap.a
+ln -sf lib32/libmudflapth.a libmudflapth.a
+ln -sf ../lib64/libmudflapth.a 64/libmudflapth.a
 %endif
 %ifarch %{multilib_64_archs}
 mkdir -p 32
@@ -923,11 +932,14 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortranbegin.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libmudflap{,th}.*a 32/
 %endif
 %ifarch sparc64 ppc64
 ln -sf ../lib32/libstdc++.a 32/libstdc++.a
 ln -sf lib64/libstdc++.a libstdc++.a
+ln -sf ../lib32/libmudflap.a 32/libmudflap.a
+ln -sf lib64/libmudflap.a libmudflap.a
+ln -sf ../lib32/libmudflapth.a 32/libmudflapth.a
+ln -sf lib64/libmudflapth.a libmudflapth.a
 %if %{build_java}
 ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
 ln -sf lib64/libgcj_bc.so libgcj_bc.so
@@ -935,6 +947,8 @@
 %else
 %ifarch %{multilib_64_archs}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflap.a 32/libmudflap.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflapth.a 32/libmudflapth.a
 %if %{build_java}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
 %endif
@@ -1211,6 +1225,10 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
@@ -1221,6 +1239,16 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
+%endif
+%ifarch sparc sparc64 ppc ppc64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
 %endif
 %dir %{_prefix}/libexec/getconf
 %{_prefix}/libexec/getconf/default
@@ -1568,27 +1596,34 @@
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
+%ifarch sparc ppc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
+%endif
+%ifarch sparc64 ppc64
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
+%endif
+%ifnarch sparc sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
 %endif
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20.fc7
+- fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
+  (#270281)
+- backport __attribute__((__gnu_inline__)) support for C++
+- fix ppc/ppc64 __sync_* builtins with aligned 8 or 16-bit values
+- don't set executable flag on .note.GNU-stack on ppc64/ia64 even
+  when trampolines are used - trampolines on those architectures
+  don't need executable stack
+
 * Mon Aug 27 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-18.fc7
 - update from gcc-4_1-branch (-r124365:127672)
   - PRs c++/32112, c++/17763, rtl-optimization/32450, target/31331,



From fedora-extras-commits at redhat.com  Sat Sep  1 10:44:24 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Sep 2007 06:44:24 -0400
Subject: extras-repoclosure rc-run.py,1.27,1.28
Message-ID: <200709011044.l81AiOdX005397@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5377

Modified Files:
	rc-run.py 
Log Message:
make needsign repoid variable, too


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rc-run.py	15 Jun 2007 16:36:30 -0000	1.27
+++ rc-run.py	1 Sep 2007 10:44:20 -0000	1.28
@@ -93,7 +93,7 @@
         if a == "summary":
             reportcmd += " --mail=summary"
     elif o == "--needsign":
-        rs.AddRepo('fedora-extras-needsign','Fedora Extras Needsign',a)
+        rs.AddRepo('fedora-extras-needsign-%s'%int(now),'Fedora Extras Needsign',a)
         reportcmd += " --needsign"
     elif o == "--testing":
         withtesting = True



From fedora-extras-commits at redhat.com  Sat Sep  1 11:44:36 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 07:44:36 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.131, 1.132 sources, 1.246,
	1.247
Message-ID: <200709011144.l81BiaNd014508@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14136

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	16 Aug 2007 07:04:22 -0000	1.131
+++ .cvsignore	1 Sep 2007 11:44:03 -0000	1.132
@@ -1,96 +1,17 @@
-ooo-icons-bluecurve-OOO_1_1-9.tar.gz
-openoffice-gallery-extra.tar.bz2
-openoffice-png48x48.tar.bz2
 openoffice-template-extra.tar.bz2
-pl_PL.zip
-pt_BR.zip
-pt_PT.zip
-ru_RU.zip
-sk_SK.zip
-sl_SI.zip
-sv_SE.zip
-thes_de_DE.zip
-thes_hu_HU.zip
-uk_UA.zip
-ooo-build-cvs20040914.tar.bz2
-ooo-icons-bluecurve-OOO_1_1-10.tar.gz
-libwpd-snap-20040823.tar.gz
-ooo-build-cvs20040915.tar.bz2
 extra-templates.tar.bz2
 extra-gallery.tar.bz2
-ooo-build-cvs20040918.tar.bz2
 extra-dictionaries.tar.bz2
-ooo-build-cvs20041001.tar.bz2
-ooo-icons-bluecurve-OOO_1_1-11.tar.gz
-gnome-vfs.patch
-nb_NO-translation.gsi
-nn_NO-translation.gsi
-gu_IN-translation.gsi
-ta_IN-translation.gsi
-translation-gu_IN.gsi
-translation-ta_IN.gsi
-translation-nb_NO.gsi
-translation-nn_NO.gsi
-OOO_1_1_3.tar.bz2
-ooo-build-cvs20050121.tar.bz2
-ooo-build-cvs20050202.tar.bz2
-ooo-build-cvs20050205.tar.bz2
-SRC680_m80.tar.bz2
-Archive-Zip-1.13.tar.gz
-SRC680_m81.tar.bz2
-SRC680_m82.tar.bz2
-SRC680_m83.tar.bz2
-SRC680_m84.tar.bz2
-openoffice.org-myspell-contrib.tar.gz
-SRC680_m85.tar.bz2
-SRC680_m87.tar.bz2
-hsqldb_1_8_0_RC9.zip
-SRC680_m88.tar.bz2
-SRC680_m89.tar.bz2
-SRC680_m91.tar.bz2
-SRC680_m92.tar.bz2
 GSI_gu-IN.sdf
 GSI_kn-IN.sdf
 GSI_ta-IN.sdf
 GSI_nn.sdf
 GSI_nb.sdf
-SRC680_m93.tar.bz2
-db-3.2.9.patch
-db-3.2.9.tar.gz
-SRC680_m95.tar.bz2
-SRC680_m96.tar.bz2
-openoffice.org-jakubicons.tar.gz
-SRC680_m97.tar.bz2
-SRC680_m98.tar.bz2
-SRC680_m99.tar.bz2
-SRC680_m100.tar.bz2
-SRC680_m103.tar.bz2
-SRC680_m104.tar.bz2
 GSI_pa-IN.sdf
-SRC680_m106.tar.bz2
-GSI_ru.sdf
-SRC680_m108.tar.bz2
-SRC680_m109.tar.bz2
 GSI_bn-IN.sdf
 GSI_bn.sdf
 openoffice.org-simple-crash_report.sh
-SRC680_m110.tar.bz2
-SRC680_m111.tar.bz2
-hsqldb_1_8_0.zip
-SRC680_m112.tar.bz2
 GSI_cs.sdf
-SRC680_m113.tar.bz2
-SRC680_m114.tar.bz2
-SRC680_m115.tar.bz2
-SRC680_m116.tar.bz2
-SRC680_m117.tar.bz2
-SRC680_m118.tar.bz2
-SRC680_m119.tar.bz2
-SRC680_m120.tar.bz2
-gcj-sed.sh
-SRC680_m121.tar.bz2
-SRC680_m122.tar.bz2
-SRC680_m123.tar.bz2
 UseSystemFPicker.xcu
 RegisterAndLicence.xcu
 GSI_ga.sdf
@@ -106,4 +27,4 @@
 openoffice.org.langpack.template.tar.gz
 pa-IN-179.sdf
 unowinreg.dll
-OOG680_m1.tar.bz2
+OOG680_m3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- sources	21 Aug 2007 09:56:23 -0000	1.246
+++ sources	1 Sep 2007 11:44:03 -0000	1.247
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-258dd14f8fe05484206bc2f80d1aa5ad  OOG680_m2.tar.bz2
+c7ee60da19dc9c0cccd3c2c7559a6c51  OOG680_m3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 11:46:35 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 07:46:35 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1277,1.1278
Message-ID: <200709011146.l81BkZsl015835@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394

Modified Files:
	openoffice.org.spec 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1277
retrieving revision 1.1278
diff -u -r1.1277 -r1.1278
--- openoffice.org.spec	29 Aug 2007 11:16:43 -0000	1.1277
+++ openoffice.org.spec	1 Sep 2007 11:46:02 -0000	1.1278
@@ -1,6 +1,6 @@
 %define oootag OOG680
-%define ooomilestone 2
-%define rh_rpm_release 4
+%define ooomilestone 3
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2746,6 +2746,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
+- release candidate
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 



From fedora-extras-commits at redhat.com  Sat Sep  1 11:52:49 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sat, 1 Sep 2007 07:52:49 -0400
Subject: rpms/libapreq2/devel libapreq2.spec,1.28,1.29
Message-ID: <200709011152.l81BqnHf016182@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16157

Modified Files:
	libapreq2.spec 
Log Message:
Get ready to rebuild against new apr.



Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libapreq2.spec	28 Aug 2007 21:17:10 -0000	1.28
+++ libapreq2.spec	1 Sep 2007 11:52:17 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc2.6%{?dist}
+Release:        0.rc2.7%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.7
+- rebuild against apr-1.2.9-3 (bug #254241)
+
 * Wed Aug 29 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.6
 - rebuild against expat 2.0.1 (bug #195888)
 



From fedora-extras-commits at redhat.com  Sat Sep  1 11:53:34 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sat, 1 Sep 2007 07:53:34 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.40, 1.41 sources, 1.41,
	1.42 sugar.spec, 1.49, 1.50
Message-ID: <200709011153.l81BrYHX016213@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16188

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	30 Aug 2007 21:42:20 -0000	1.40
+++ .cvsignore	1 Sep 2007 11:53:01 -0000	1.41
@@ -1 +1 @@
-sugar-0.65-gite65fef5c79.tar.bz2
+sugar-0.65-gitfeb462d08d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	30 Aug 2007 21:42:20 -0000	1.41
+++ sources	1 Sep 2007 11:53:01 -0000	1.42
@@ -1 +1 @@
-8609394b634b2dab85cd0527a5946bb2  sugar-0.65-gite65fef5c79.tar.bz2
+8c33fbc69907b1fc89c302c652307acc  sugar-0.65-gitfeb462d08d.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sugar.spec	30 Aug 2007 21:42:20 -0000	1.49
+++ sugar.spec	1 Sep 2007 11:53:01 -0000	1.50
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070830git
-%define commitid e65fef5c79
+%define alphatag 20070901git
+%define commitid feb462d08d
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.33.%{alphatag}e65fef5c79
+Release: 0.34.%{alphatag}feb462d08d
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.33.20070830gite65fef5c79
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep  1 12:23:22 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:23:22 -0400
Subject: rpms/dietlibc/F-7 dietlibc-0.31-defpath.patch, NONE,
	1.1 dietlibc-0.31-stacksmash-dyn.patch, NONE,
	1.1 dietlibc-0.31-stacksmash.patch, NONE, 1.1 lastver, NONE,
	1.1 verinfo, NONE, 1.1
Message-ID: <200709011223.l81CNMYq022625@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22611

Added Files:
	dietlibc-0.31-defpath.patch dietlibc-0.31-stacksmash-dyn.patch 
	dietlibc-0.31-stacksmash.patch lastver verinfo 
Log Message:
initial checkin


dietlibc-0.31-defpath.patch:

--- NEW FILE dietlibc-0.31-defpath.patch ---
diff -up dietlibc-0.31/include/paths.h.~1~ dietlibc-0.31/include/paths.h
--- dietlibc-0.31/include/paths.h.defpath
+++ dietlibc-0.31/include/paths.h
@@ -2,7 +2,7 @@
 #define _PATHS_H
 
 #define _PATH_BSHELL "/bin/sh"
-#define _PATH_DEFPATH "/bin:/usr/bin:"
+#define _PATH_DEFPATH "/bin:/usr/bin"
 
 #define _PATH_DEVNULL "/dev/null"
 

dietlibc-0.31-stacksmash-dyn.patch:

--- NEW FILE dietlibc-0.31-stacksmash-dyn.patch ---
diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.~1~	2007-09-01 14:13:21.000000000 +0200
+++ dietlibc-0.31/lib/stack_smash_handler2.c	2007-09-01 14:13:40.000000000 +0200
@@ -2,6 +2,7 @@
 #include <write12.h>
 
 void __stack_chk_fail(void);
+void __stack_chk_fail_local(void) __attribute__((__alias__("__stack_chk_fail")));
 
 /* earlier versions of ProPolice actually gave the address and function
  * name as arguments to the handler, so it could print some useful

dietlibc-0.31-stacksmash.patch:

--- NEW FILE dietlibc-0.31-stacksmash.patch ---
2007-09-01  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/stack_smash_handler2: modified __stack_chk_fail() to trigger
	a segfault by accessing address 0x0. Every system with an MMU
	known by me, segfaults by dereferencing a NULL pointer

	* Makefile: added hack to compile stack_smash_handler2 with
	'--fno-omit-frame-pointer'.

diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.stacksmash
+++ dietlibc-0.31/lib/stack_smash_handler2.c
@@ -8,5 +8,13 @@ void __stack_chk_fail(void);
  * diagnostics.  No more. :-( */
 void __stack_chk_fail(void) {
   __write2("smashed stack detected, program terminated.\n");
-  _exit(127);
+
+  /* trigger a segfault which can be inspected within a debugger (inclusive
+   * stack-trace). 'abort(3)' at this place would be too heavy weighted.
+   *
+   * TODO: limit this to systems which are known to have an MMU (resp. is
+   * dietlibc with stack-protector used on systems without an MMU?)
+   */
+  while (1)
+	  *(char *)0 = 0;
 }
--- dietlibc-0.31/Makefile.stacksmash
+++ dietlibc-0.31/Makefile
@@ -172,9 +172,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
 $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+$(OBJDIR)/stack_smash_handler2.o:	XCFLAGS:=-fno-omit-frame-pointer
 
 $(OBJDIR)/%.o: %.c
-	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+	$(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
 endif
 


--- NEW FILE lastver ---
0.31


--- NEW FILE verinfo ---
http://www.kernel.org/pub/linux/libs/dietlibc/
dietlibc-(.*?).tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 12:34:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:34:44 -0400
Subject: rpms/dietlibc/devel dietlibc-0.31-defpath.patch, NONE,
	1.1 dietlibc-0.31-stacksmash-dyn.patch, NONE,
	1.1 dietlibc-0.31-stacksmash.patch, NONE, 1.1 lastver, NONE,
	1.1 verinfo, NONE, 1.1
Message-ID: <200709011234.l81CYiHI022786@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22772

Added Files:
	dietlibc-0.31-defpath.patch dietlibc-0.31-stacksmash-dyn.patch 
	dietlibc-0.31-stacksmash.patch lastver verinfo 
Log Message:
initial checkin


dietlibc-0.31-defpath.patch:

--- NEW FILE dietlibc-0.31-defpath.patch ---
diff -up dietlibc-0.31/include/paths.h.~1~ dietlibc-0.31/include/paths.h
--- dietlibc-0.31/include/paths.h.defpath
+++ dietlibc-0.31/include/paths.h
@@ -2,7 +2,7 @@
 #define _PATHS_H
 
 #define _PATH_BSHELL "/bin/sh"
-#define _PATH_DEFPATH "/bin:/usr/bin:"
+#define _PATH_DEFPATH "/bin:/usr/bin"
 
 #define _PATH_DEVNULL "/dev/null"
 

dietlibc-0.31-stacksmash-dyn.patch:

--- NEW FILE dietlibc-0.31-stacksmash-dyn.patch ---
diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.~1~	2007-09-01 14:13:21.000000000 +0200
+++ dietlibc-0.31/lib/stack_smash_handler2.c	2007-09-01 14:13:40.000000000 +0200
@@ -2,6 +2,7 @@
 #include <write12.h>
 
 void __stack_chk_fail(void);
+void __stack_chk_fail_local(void) __attribute__((__alias__("__stack_chk_fail")));
 
 /* earlier versions of ProPolice actually gave the address and function
  * name as arguments to the handler, so it could print some useful

dietlibc-0.31-stacksmash.patch:

--- NEW FILE dietlibc-0.31-stacksmash.patch ---
2007-09-01  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/stack_smash_handler2: modified __stack_chk_fail() to trigger
	a segfault by accessing address 0x0. Every system with an MMU
	known by me, segfaults by dereferencing a NULL pointer

	* Makefile: added hack to compile stack_smash_handler2 with
	'--fno-omit-frame-pointer'.

diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.stacksmash
+++ dietlibc-0.31/lib/stack_smash_handler2.c
@@ -8,5 +8,13 @@ void __stack_chk_fail(void);
  * diagnostics.  No more. :-( */
 void __stack_chk_fail(void) {
   __write2("smashed stack detected, program terminated.\n");
-  _exit(127);
+
+  /* trigger a segfault which can be inspected within a debugger (inclusive
+   * stack-trace). 'abort(3)' at this place would be too heavy weighted.
+   *
+   * TODO: limit this to systems which are known to have an MMU (resp. is
+   * dietlibc with stack-protector used on systems without an MMU?)
+   */
+  while (1)
+	  *(char *)0 = 0;
 }
--- dietlibc-0.31/Makefile.stacksmash
+++ dietlibc-0.31/Makefile
@@ -172,9 +172,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
 $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+$(OBJDIR)/stack_smash_handler2.o:	XCFLAGS:=-fno-omit-frame-pointer
 
 $(OBJDIR)/%.o: %.c
-	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+	$(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
 endif
 


--- NEW FILE lastver ---
0.31


--- NEW FILE verinfo ---
http://www.kernel.org/pub/linux/libs/dietlibc/
dietlibc-(.*?).tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 12:36:11 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:36:11 -0400
Subject: rpms/dietlibc/devel sources,1.6,1.7 dietlibc.spec,1.27,1.28
Message-ID: <200709011236.l81CaBt0022850@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22829

Modified Files:
	sources dietlibc.spec 
Log Message:
- updated to 0.31
- removed the no-stack-protector bits
- improved stack-smash code a little bit
- disabled dynamic lib for all arches



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jul 2006 14:18:32 -0000	1.6
+++ sources	1 Sep 2007 12:35:38 -0000	1.7
@@ -1,2 +1,2 @@
-2465d652fff6f1fad3da3b98e60e83c9  dietlibc-0.30.tar.bz2
-698d7624167aad89acfef504da0161ad  dietlibc-0.30.tar.bz2.sig
+acb98d469ee932d902fdf6de07802b7c  dietlibc-0.31.tar.bz2
+77dadb56faa06c1a5177d76806e79b28  dietlibc-0.31.tar.bz2.sig


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dietlibc.spec	17 Jan 2007 01:02:35 -0000	1.27
+++ dietlibc.spec	1 Sep 2007 12:35:38 -0000	1.28
@@ -6,7 +6,7 @@
 ##
 
 %ifarch %ix86 x86_64 arm
-%global do_dyn		1
+%global do_dyn		0
 %else
 %global do_dyn 		0
 %endif
@@ -26,8 +26,8 @@
 
 Summary:	Small libc implementation
 Name:		dietlibc
-Version:	0.30
-Release:	%release_func 4
+Version:	0.31
+Release:	%release_func 1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -35,16 +35,20 @@
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
-Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
+Patch31:	dietlibc-0.31-defpath.patch
+Patch32:	dietlibc-0.31-stacksmash.patch
+Patch33:	dietlibc-0.31-stacksmash-dyn.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
-
+%{!?with_dyn:Obsoletes:	dietlibc-lib < %version-%release}
 
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
 
 %description
 The diet libc is a libc that is optimized for small size. It can be
@@ -64,14 +68,14 @@
 %setup -q
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
-%patch20 -p1 -b .nostackprotector
 %patch30 -p1 -b .longdouble
+%patch31 -p1 -b .defpath
+%patch32 -p1 -b .stacksmash
+%patch33 -p1 -b .stacksmash-dyn
 
 sed -i -e 's!strip !: !g' Makefile
-sed -i -e 's!^#define WANT_SSP$!// \0!g;
-           s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 
@@ -90,7 +94,7 @@
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
-
+rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
 %clean
@@ -116,6 +120,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
+- updated to 0.31
+- removed the no-stack-protector bits
+- improved stack-smash code a little bit
+- disabled dynamic lib for all arches
+
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:08:04 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 1 Sep 2007 09:08:04 -0400
Subject: rpms/sepostgresql/devel sepostgresql-8.2.4-0.434.patch, NONE,
	1.1 sepostgresql-fedora-prefix.patch, NONE, 1.1 sepostgresql.8,
	NONE, 1.1 sepostgresql.fc, NONE, 1.1 sepostgresql.if, NONE,
	1.1 sepostgresql.init, NONE, 1.1 sepostgresql.spec, NONE,
	1.1 sepostgresql.te, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011308.l81D84Hg029482@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29424/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sepostgresql-8.2.4-0.434.patch 
	sepostgresql-fedora-prefix.patch sepostgresql.8 
	sepostgresql.fc sepostgresql.if sepostgresql.init 
	sepostgresql.spec sepostgresql.te 
Log Message:
import sepostgresql-8.2.4-0.434 as the initial version in Fedora rawhide


sepostgresql-8.2.4-0.434.patch:

--- NEW FILE sepostgresql-8.2.4-0.434.patch ---
diff -rpNU3 postgresql-8.2.4/configure.in sepostgresql-8.2.4/configure.in
--- postgresql-8.2.4/configure.in	2007-04-20 12:20:42.000000000 +0900
+++ sepostgresql-8.2.4/configure.in	2007-04-29 13:49:53.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.4/doc/postgres.tar.gz and sepostgresql-8.2.4/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.4/src/Makefile.global.in sepostgresql-8.2.4/src/Makefile.global.in
--- postgresql-8.2.4/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.4/src/backend/Makefile sepostgresql-8.2.4/src/backend/Makefile
--- postgresql-8.2.4/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.4/src/backend/access/common/heaptuple.c sepostgresql-8.2.4/src/backend/access/common/heaptuple.c
--- postgresql-8.2.4/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.4/src/backend/access/heap/heapam.c sepostgresql-8.2.4/src/backend/access/heap/heapam.c
--- postgresql-8.2.4/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
 		TransactionId xid[2];	/* xmax, xmin */
[...8179 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.4/src/include/utils/syscache.h sepostgresql-8.2.4/src/include/utils/syscache.h
--- postgresql-8.2.4/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.4/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);

sepostgresql-fedora-prefix.patch:

--- NEW FILE sepostgresql-fedora-prefix.patch ---
Index: trunk/src/Makefile.global.in
===================================================================
--- trunk/src/Makefile.global.in	(revision 430)
+++ trunk/src/Makefile.global.in	(working copy)
@@ -73,14 +73,14 @@
 datadir := @datadir@
 ifeq "$(findstring pgsql, $(datadir))" ""
 ifeq "$(findstring postgres, $(datadir))" ""
-override datadir := $(datadir)/postgresql
+override datadir := $(datadir)/sepgsql
 endif
 endif
 
 sysconfdir := @sysconfdir@
 ifeq "$(findstring pgsql, $(sysconfdir))" ""
 ifeq "$(findstring postgres, $(sysconfdir))" ""
-override sysconfdir := $(sysconfdir)/postgresql
+override sysconfdir := $(sysconfdir)/sepgsql
 endif
 endif
 
@@ -89,7 +89,7 @@
 pkglibdir = $(libdir)
 ifeq "$(findstring pgsql, $(pkglibdir))" ""
 ifeq "$(findstring postgres, $(pkglibdir))" ""
-override pkglibdir := $(pkglibdir)/postgresql
+override pkglibdir := $(pkglibdir)/sepgsql
 endif
 endif
 
@@ -98,7 +98,7 @@
 pkgincludedir = $(includedir)
 ifeq "$(findstring pgsql, $(pkgincludedir))" ""
 ifeq "$(findstring postgres, $(pkgincludedir))" ""
-override pkgincludedir := $(pkgincludedir)/postgresql
+override pkgincludedir := $(pkgincludedir)/sepgsql
 endif
 endif
 
@@ -109,7 +109,7 @@
 ifneq (,$(docdir))
 ifeq "$(findstring pgsql, $(docdir))" ""
 ifeq "$(findstring postgres, $(docdir))" ""
-override docdir := $(docdir)/postgresql
+override docdir := $(docdir)/sepgsql
 endif
 endif
 endif
Index: trunk/src/bin/pg_ctl/pg_ctl.c
===================================================================
--- trunk/src/bin/pg_ctl/pg_ctl.c	(revision 429)
+++ trunk/src/bin/pg_ctl/pg_ctl.c	(working copy)
@@ -557,7 +557,7 @@
 
 		postmaster_path = pg_malloc(MAXPGPATH);
 
-		if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,
+		if ((ret = find_other_exec(argv0, "sepostgres", PM_VERSIONSTR,
 								   postmaster_path)) < 0)
 		{
 			char		full_path[MAXPGPATH];
Index: trunk/src/bin/initdb/initdb.c
===================================================================
--- trunk/src/bin/initdb/initdb.c	(revision 429)
+++ trunk/src/bin/initdb/initdb.c	(working copy)
@@ -2646,7 +2646,7 @@
 	sprintf(pgdenv, "PGDATA=%s", pg_data);
 	putenv(pgdenv);
 
-	if ((ret = find_other_exec(argv[0], "postgres", PG_VERSIONSTR,
+	if ((ret = find_other_exec(argv[0], "sepostgres", PG_VERSIONSTR,
 							   backend_exec)) < 0)
 	{
 		char		full_path[MAXPGPATH];
Index: trunk/src/bin/pg_dump/pg_dumpall.c
===================================================================
--- trunk/src/bin/pg_dump/pg_dumpall.c	(revision 429)
+++ trunk/src/bin/pg_dump/pg_dumpall.c	(working copy)
@@ -139,7 +139,7 @@
 		}
 	}
 
-	if ((ret = find_other_exec(argv[0], "pg_dump", PGDUMP_VERSIONSTR,
+	if ((ret = find_other_exec(argv[0], "sepg_dump", PGDUMP_VERSIONSTR,
 							   pg_dump_bin)) < 0)
 	{
 		char		full_path[MAXPGPATH];


--- NEW FILE sepostgresql.8 ---
.TH "sepostgresql" "8" "Jul 15 2007" "kaigai at kaigai.gr.jp" "Security-Enhanced PostgreSQL"

.SH "NAME"
sepostgresql \- Security-Enhances PostgreSQL

.SH "DESCRIPTION"
Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL, to apply fine grained mandatory access control for database objects based on the security policy of SELinux. 
These features enable to apply flexible integrated access control policy between operating system and database management system, during all stages of the life of the information.
.PP
This document describes the way to customize SE-PostgreSQL on the default security policy.

.SH "BOOLEANS"
The SELinux policy is customizable via BOOLEAN variable. This variable has two states, 1 (on) or 0 (off). A part of the policy is enabled or disabled depending on related boolean variables.

\fBsepgsql_enable_unconfined\fP toggles whether \fIunconfined_t\fP and \fIsysadm_t\fP domains are allowed to access database objects without any restruction on type enforcement, or not.
When \fIsepgsql_enable_unconfined\fP is off, those domains are also restricted its operation as other domains begin applied. In the default, it is set to on.
You can set it as follows:

.EX
setsebool -P sepgsql_enable_unconfined ( \fBon\fP | off )
.EE

\fBsepgsql_enable_users_ddl\fP toggles whether non-administrative domain is allowed to use DDL statement like CREATE TABLE and so on.
In the default, it is set to on. You can set it as follows:

.EX
setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
.EE

\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case when required permission checks are allowed. In the default, it is set to off. You can set it as follows:

.EX
setsebool -P sepgsql_enable_auditallow ( on | \fBoff\fP )
.EE

\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case when required permission checks are denied. In the default, it is set to on. You can set it as follows:

.EX
setsebool -P sepgsql_enable_auditdeny ( \fBon\fP | off )
.EE

\fBsepgsql_enable_audittuple\fP toggles output of audit messages for any tuple. Because audit messages for tuples in a large size table can cause flood of messages, we can set \fIsepgsql_enable_audittuple\fP independently from any other object classes.
Audit messages for tuples are generated in the only case when \fIsepgsql_enable_audittuple\fP and either \fIsepgsql_enable_auditallow\fP or \fIsepgsql_enable_auditdeny\fP are enabled.
In the default, it is set to off. You can set it as follows:

.EX
setsebool -P sepgsql_enable_audittuple ( on | \fBoff\fP )
.EE

.SH "TYPES"

\fBsepgsql_db_t\fP is a only type for database itself.
It is attched for newly created databases in the default.

\fBsepgsql_table_t\fP is a type for tables, columns and tuples.
It is attached for newly created the objects in the default.
Non-administrative clients can do any kinds of operations except for relabeling.

\fBsepgsql_secret_table_t\fP is a type for tables, columns and tuples.
Non-administrative clients cannot access the objects with this type.

\fBsepgsql_ro_table_t\fP is a type for read-only tables, columns and tuples.
Non-administrative clients cannot modify the objects with this type.

\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns and tuples.
Non-administrative clients cannot update or delete the objects with this type.

\fBsepgsql_proc_t\fP is a type for procedures.
It is attached for newly created procedures by adminictrative domain.
Any client can call these procedures with this type.

\fBsepgsql_userproc_t\fP is a type for procedures.
It is attached for newly created procedures by non-administrative domain.
Administrative domains cannot call the procedure for safety. He have to relabel it into \fIsepgsql_proc_t\fP at first. It is a policy to avoid to execute doubtful code under administrative domain.

\fBsepgsql_trusted_proc_t\fP is a type for trusted procedures.
Calling procedures with this type invokes domain transition.
Then the function works as an administrative domain, so database administrator can provide limited path to access protected object.

\fBsepgsql_blob_t\fP is a type for binary large objects (blob).
It is attached for newly created blob in the default.
Non-administrative clients can read and write the blobs with this type.

\fBsepgsql_ro_blob_t\fP is a type for read-only binary large objects (blob).
Non-administrative clients cannot write the blobs with this type.

.SH "BACKUP and RESTORE"
\fI--enable-selinux\fP option in \fBsepg_dump\fP and \fBsepg_dumpall\fP enable to dump database image with security context. We can restore the dumped image using the standard \fIpg_restore\fP and so on.

.EX
Example)
$ sepg_dump -Ft -b --enable-selinux postgres | gzip -c > postgres.tgz
.EE

.SH AUTHOR	
This manual page was written by KaiGai Kohei <kaigai at kaigai.gr.jp>

.SH "SEE ALSO"

selinux(8), boolean(8)


--- NEW FILE sepostgresql.fc ---
#
# SE-PostgreSQL install path
#
/usr/bin/sepostgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
/usr/bin/initdb.sepgsql		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
/usr/bin/sepg_ctl		--	gen_context(system_u:object_r:initrc_exec_t,s0)

/var/lib/sepgsql(/.*)?			gen_context(system_u:object_r:postgresql_db_t,s0)
/var/lib/sepgsql/pgstartup\.log		gen_context(system_u:object_r:postgresql_log_t,s0)
/var/log/sepostgresql\.log.*	--	gen_context(system_u:object_r:postgresql_log_t,s0)


--- NEW FILE sepostgresql.if ---
########################################
## <summary>
##     marks as a server process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     Type marked as a database object type.
##     </summary>
## </param>
#
interface(`sepgsql_server_domain',`
	gen_require(`
		attribute sepgsql_server_type;
	')
	typeattribute $1 sepgsql_server_type;
')

########################################
## <summary>
##     Marks as a SE-PostgreSQL loadable shared library module
## </summary>
## <param name="type">
##     <summary>
##     Type marked as a database object type.
##     </summary>
## </param>
#
interface(`sepgsql_module_object',`
	gen_require(`
		attribute sepgsql_module_type;
	')
	typeattribute $1 sepgsql_module_type;
')

########################################
## <summary>
##     marks as a administrative client process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     A domain marked as a administrative client domain
##     </summary>
## </param>
#
interface(`sepgsql_unconfined_domain',`
	gen_require(`
		attribute sepgsql_admin_domain;
		attribute sepgsql_users_domain;
	')
	typeattribute $1 sepgsql_admin_domain;
	typeattribute $1 sepgsql_users_domain;
')

########################################
## <summary>
##     marks as a generic client process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     A domain marked as a generic client domain
##     </summary>
## </param>
#
interface(`sepgsql_client_domain',`
	gen_require(`
		attribute sepgsql_users_domain;
	')
	typeattribute $1 sepgsql_users_domain;
')


--- NEW FILE sepostgresql.init ---
#!/bin/sh
# sepostgresql	This is the init script for starting up SE-PostgreSQL
#
# chkconfig: - 62 38
# description: Starts and stops the SE-PostgreSQL backend daemon
# processname: postmaster
# pidfile: /var/run/postmaster.pid
#---------------------------------------------------------------------

PGVERSION="8.2.4"
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
SEPGVERSION="0.434"

# source function library
. /etc/rc.d/init.d/functions

# get config
. /etc/sysconfig/network

# find the name of the script
NAME=`basename $0`
if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then
    NAME=${NAME:3}
fi

# set defaults for configurable variables
SEPGSQL_BIN="/usr/bin"
SEPGSQL_DATA="/var/lib/sepgsql/data"
SEPGSQL_OPTS="-i -p 5432"
SEPGSQL_STARTUP_LOG="/var/lib/sepgsql/pgstartup.log"
SEPGSQL_LOG="/var/log/sepostgresql.log"
SEPGSQL_FALLBACK_CONTEXT="user_u:user_r:user_t"

# override defaults from /etc/sysconfig/sepostgresql
test -f /etc/sysconfig/${NAME} && . /etc/sysconfig/${NAME}

export SEPGSQL_FALLBACK_CONTEXT

# Check that networking is up.
test "${NETWORKING}" = "no" && exit 0
test -f "${SEPGSQL_BIN}/postmaster" || exit 1

script_result=0

do_start() {
    PSQL_START=$"Starting ${NAME} service: "
    echo -n "$PSQL_START"

    # make sure startup-time log file is valid
    if [ ! -e "${SEPGSQL_STARTUP_LOG}" -a ! -h "${SEPGSQL_STARTUP_LOG}" ]; then
        touch "${SEPGSQL_STARTUP_LOG}" || exit 1
        chown sepgsql:sepgsql "${SEPGSQL_STARTUP_LOG}"
        chmod 600 "${SEPGSQL_STARTUP_LOG}"
        /sbin/restorecon "${SEPGSQL_STARTUP_LOG}"
    fi
    
    # check for the SEPGSQL_DATA structure
    if [ -f "${SEPGSQL_DATA}/PG_VERSION" ] && [ -d "${SEPGSQL_DATA}/base" ]; then
        if [ x`cat "${SEPGSQL_DATA}/PG_VERSION"` != x"${PGMAJORVERSION}" ]; then
            echo_failure
            echo
            echo "HINT: An old version of the database format was found."
            echo "HINT: You need to upgrade the data format before using SE-PostgreSQL."
            exit 1
        fi
    else
        echo_failure
        echo
        echo "HINT: ${SEPGSQL_DATA} is missing."
        echo "HINT: Use '/etc/init.d/${NAME} initdb'"
        echo "HINT:   to initialize the database cluster first."
        exit 1
    fi

    # make sure SEPGSQL_LOG
    touch ${SEPGSQL_LOG}
    chown sepgsql:sepgsql ${SEPGSQL_LOG}
    chmod 600 ${SEPGSQL_LOG}
    test -x /sbin/restorecon && /sbin/restorecon ${SEPGSQL_LOG}

    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -c "./sepg_ctl -l ${SEPGSQL_LOG} -D ${SEPGSQL_DATA} -o '${SEPGSQL_OPTS}' start" \
        >> ${SEPGSQL_STARTUP_LOG} 2>&1 < /dev/null
    sleep 1
    PID=`/sbin/runuser sepgsql -c "./sepg_ctl -D ${SEPGSQL_DATA} status 2>/dev/null \
	| sed 's/^.*PID: //g' | sed 's/[^0-9].*$//g'"`
    if [ ${PIPESTATUS[0]} -eq 0 ]; then
        echo "$PID" > "/var/run/${NAME}.pid"
        touch "/var/lock/subsys/${NAME}.lock"
        echo_success
    else
        script_result=1
        echo_failure
    fi
    echo
}

do_stop() {
    echo -n $"Stopping ${NAME} service: "
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -c "./sepg_ctl -D ${SEPGSQL_DATA} stop" \
        >> ${SEPGSQL_STARTUP_LOG} 2>&1 < /dev/null
    ret=$?
    if [ $ret -eq 0 ]; then
        echo_success
    else
        echo_failure
        script_result=1
    fi
    echo
    rm -f "/var/run/${NAME}.pid"
    rm -f "/var/lock/subsys/${NAME}.lock"
}

do_status() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" 2>/dev/null \
        | head -1 | sed "s/^sepg_ctl:/${NAME}:/g"

    if [ ${PIPESTATUS[0]} -ne 0 ]; then
        script_result=3
        test -e "/var/run/${NAME}.pid"          && script_result=1
        test -e "/var/lock/subsys/${NAME}.lock" && script_result=2
    fi
}

do_condrestart() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" &>/dev/null && do_stop && do_start
}

do_condstop() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" &>/dev/null && do_stop
}

do_reload() {
    echo -n $"Reloading ${NAME} service: "
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} reload" &>/dev/null < /dev/null
    if [ $? -eq 0 ]; then
        echo_success
    else
        echo_failure
        script_result=1
    fi
    echo
}

do_initdb() {
    echo -n $"Initializing database: "

    if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
	echo_failure
	echo
	echo "HINT: Data directory is not empty"
	script_result=1
    else
	if [ ! -e "${SEPGSQL_DATA}" -a ! -h "${SEPGSQL_DATA}" ]; then
	    mkdir -p "${SEPGSQL_DATA}" || exit 1
	    chown sepgsql:sepgsql "${SEPGSQL_DATA}"
	    chmod 600 "${SEPGSQL_DATA}"
	fi
	# cleanup SELinux labeling for "${SEPGSQL_DATA}"
	test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
	# Initialize the database
        cd ${SEPGSQL_BIN}
	/sbin/runuser -- sepgsql -c "./initdb.sepgsql -A 'ident sameuser' ${SEPGSQL_DATA}" \
	    >> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
	if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
	    echo_success
	else
	    echo_failure
	    script_result=1
	fi
	echo
    fi
}

# see how we were called.
case "$1" in
    start)
        do_start
	;;
    stop)
        do_stop
	;;
    status)
	do_status
	;;
    restart)
	do_stop
	do_start
	;;
    condrestart)
        do_condrestart
	;;
    condstop)
        do_condstop
	;;
    reload|force-reload)
        do_reload
	;;
    initdb)
        do_initdb
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload|initdb}"
        exit 1
    ;;
esac

exit $script_result


--- NEW FILE sepostgresql.spec ---
#
# Security Enhanced PostgreSQL (SE-PostgreSQL)
#
# Copyright 2007 KaiGai Kohei <kaigai at kaigai.gr.jp>
# -----------------------------------------------------

# SELinux policy types
%define selinux_variants mls strict targeted

# SE-PostgreSQL status extension
%{!?sepgextension:%define sepgextension .beta}

Summary: Security Enhanced PostgreSQL
Name: sepostgresql
Version: 8.2.4
Release: 0.434%{?sepgextension}%{?dist}
License: BSD
Group: Applications/Databases
Url: http://code.google.com/p/sepgsql/
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
Source1: sepostgresql.init
Source2: sepostgresql.if
Source3: sepostgresql.te
Source4: sepostgresql.fc
Source5: sepostgresql.8
Patch0: sepostgresql-8.2.4-0.434.patch
Patch1: sepostgresql-fedora-prefix.patch
BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
Requires(pre): shadow-utils
Requires(post): policycoreutils /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): policycoreutils
Requires: postgresql-server = %{version}
Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.13 selinux-policy >= 3.0.6

%description
Security Enhanced PostgreSQL is an extension of PostgreSQL
based on SELinux security policy, that applies fine grained
mandatory access control to many objects within the database,
and takes advantage of user authorization integrated within
the operating system. SE-PostgreSQL works as a userspace
reference monitor to check any SQL query.

%prep
%setup -q -n postgresql-%{version}
%patch0 -p1
%patch1 -p1
mkdir selinux-policy
cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} selinux-policy

%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS

# build Binary Policy Module
pushd selinux-policy
for selinuxvariant in %{selinux_variants}
do
    make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile
    mv %{name}.pp %{name}.pp.${selinuxvariant}
    make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean
done
popd

# build SE-PostgreSQL
autoconf
%configure      --disable-rpath                 \
                --enable-selinux                \
%if %{defined sepgextension}
                --enable-debug                  \
                --enable-cassert                \
%endif
                --libdir=%{_libdir}/sepgsql     \
                --datadir=%{_datadir}/sepgsql

# parallel build, if possible
SECCLASS_DB_DATABASE=`grep ^define %{_datadir}/selinux/devel/include/support/all_perms.spt | cat -n | grep all_db_database_perms | awk '{print $1}'`
make CUSTOM_COPT="-D SECCLASS_DB_DATABASE=${SECCLASS_DB_DATABASE}" %{?_smp_mflags}

%install
rm -rf %{buildroot}

pushd selinux-policy
for selinuxvariant in %{selinux_variants}
do
    install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
    install -p -m 644 %{name}.pp.${selinuxvariant} \
        %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{name}.pp
done
popd

make DESTDIR=%{buildroot}  install

# avoid to conflict with native postgresql package
mv %{buildroot}%{_bindir}  %{buildroot}%{_bindir}.orig
install -d %{buildroot}%{_bindir}
mv %{buildroot}%{_bindir}.orig/initdb        %{buildroot}%{_bindir}/initdb.sepgsql
mv %{buildroot}%{_bindir}.orig/pg_ctl        %{buildroot}%{_bindir}/sepg_ctl
mv %{buildroot}%{_bindir}.orig/postgres      %{buildroot}%{_bindir}/sepostgres
mv %{buildroot}%{_bindir}.orig/pg_dump       %{buildroot}%{_bindir}/sepg_dump
mv %{buildroot}%{_bindir}.orig/pg_dumpall    %{buildroot}%{_bindir}/sepg_dumpall

# /usr/lib/sepgsql
mv %{buildroot}%{_libdir}/sepgsql  %{buildroot}%{_libdir}/sepgsql.orig
install -d %{buildroot}%{_libdir}/sepgsql
mv %{buildroot}%{_libdir}/sepgsql.orig/*_and_*.so  %{buildroot}%{_libdir}/sepgsql
mv %{buildroot}%{_libdir}/sepgsql.orig/plpgsql.so  %{buildroot}%{_libdir}/sepgsql

# remove unnecessary files
rm -rf %{buildroot}%{_bindir}.orig
rm -rf %{buildroot}%{_libdir}/sepgsql.orig
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_usr}/doc
rm -rf %{buildroot}%{_datadir}/sepgsql/timezone
rm -rf %{buildroot}%{_mandir}

# /var/lib/sepgsql
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql/data
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql/backups

# /etc/rc.d/init.d/*
mkdir -p %{buildroot}%{_initrddir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sepostgresql

# /usr/share/man/*
mkdir -p %{buildroot}%{_mandir}/man8
install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man8

%clean
rm -rf %{buildroot}

%pre
getent group  sepgsql >/dev/null || groupadd -r sepgsql
getent passwd sepgsql >/dev/null || \
    useradd -r -g sepgsql -d %{_localstatedir}/lib/sepgsql -s /bin/bash \
            -c "SE-PostgreSQL server" sepgsql
exit 0

%post
/sbin/chkconfig --add %{name}
/sbin/ldconfig

for selinuxvariant in %{selinux_variants}
do
    %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue;

    %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \
        %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || :
    %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{name}.pp >& /dev/null || :
done

# Fix up non-standard file contexts
/sbin/fixfiles -R %{name} restore || :
/sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :

%preun
if [ $1 -eq 0 ]; then           # rpm -e case
    /sbin/service %{name} condstop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi

%postun
/sbin/ldconfig
if [ $1 -ge 1 ]; then           # rpm -U case
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
if [ $1 -eq 0 ]; then           # rpm -e case
    for selinuxvariant in %{selinux_variants}
    do
        %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue;

        %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \
            %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || :
    done
    /sbin/fixfiles -R %{name} restore || :
    test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :
fi

%files
%defattr(-,root,root,-)
%doc COPYRIGHT README HISTORY
%{_initrddir}/sepostgresql
%{_bindir}/initdb.sepgsql
%{_bindir}/sepg_ctl
%{_bindir}/sepostgres
%{_bindir}/sepg_dump
%{_bindir}/sepg_dumpall
%{_mandir}/man8/sepostgresql.*
%dir %{_libdir}/sepgsql
%{_libdir}/sepgsql/plpgsql.so
%{_libdir}/sepgsql/*_and_*.so
%dir %{_datadir}/sepgsql
%{_datadir}/sepgsql/postgres.bki
%{_datadir}/sepgsql/postgres.description
%{_datadir}/sepgsql/postgres.shdescription
%{_datadir}/sepgsql/system_views.sql
%{_datadir}/sepgsql/*.sample
%{_datadir}/sepgsql/timezonesets/
%{_datadir}/sepgsql/conversion_create.sql
%{_datadir}/sepgsql/information_schema.sql
%{_datadir}/sepgsql/sql_features.txt
%attr(644,root,root) %{_datadir}/selinux/*/sepostgresql.pp
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups

%changelog
* Thu Aug 28 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.434.beta
- add Requires: postgresql-server, instead of Conflicts: tag
  (Some sharable files are removed from sepostgresql package)

* Fri Aug 24 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.429.beta
- add policycoreutils to Requires(post/postun)
- upstreamed selinux-policy got SE-PostgreSQL related object classes definition.

* Sat Aug 18 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.427.beta
- sepg_dumpall uses /usr/bin/sepg_dump

* Fri Aug 17 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.423.beta
- fix policy not to execute sepgsql_user_proc_t from administrative domain

* Fri Aug 10 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.418.beta
- object classes are renamed with "db_" prefix
- /etc/init.d/sepostgresql script is improved.

* Thu Aug 2 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.409.beta
- specfile updated based on the following comments
  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=249522#c5

* Mon Jul 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.407.beta
- fix spec file based on Fedora reviewing process
- add rawhide support

* Mon Jul 23 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.402.beta
- add manpage of sepostgresql
- fix specfile convention for Fedora suitable

* Sun Jul 15 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.398.beta
- SECCLASS_DATABASE is updated (fc7->62, fc6->61)

* Sun Jul  1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.391.beta
- Mark as a beta version.

* Sat Jun 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.384.alpha
- add fallback context support with $SEPGSQL_FALLBACK_CONTEXT
- add sepgsql_enable_users_ddl boolean to restrict sepgsql_sysobj_t
- BUGFIX: incorrect inherited attribute expanding for RECORD type (attno=0)
- BUGFIX: trigger functions were not checked in COPY FROM statement

* Tue Jun 26 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.376.alpha
- add pgaceExecutorStart() to hook ExecutorStart()

* Mon Jun 25 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.372.alpha
- add table name prefix for column name on audit messages
- use security_label_raw_in as an alternative for security_label_in
- add hook for query execution path with SPI_ interface
- add trigger function suppoer
- BUGFIX: remove unnecessary checks for COPY TO/FROM on non-table relation
- BUGFIX: remove unnecessary checks for LOCK on non-table relation
- BUGFIX: incorrect object id for tuples within pg_security
- BUGFIX: CommandCounterIncrement() might be called during heap_create_with_catalog.
- BUGFIX: correct self-deadlock
- update security policy: sepgsql_sysobj_t, sepgsql_user_proc_t, sepgsql_ro_blob_t

* Tue Jun 19 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.351.alpha
- BUGFIX: sepgsql_compute_avc_datum() accessed userspace AVC without
          holding any lock.
- improve build scripts.

* Sat Jun 16 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.320.alpha
- update: sepostgresql.pp security policy fot strict/mls suitable
- BUGFIX: column:drop evaluation for ALTER TABLE tbl DROP col; statement
- add --enable-security option for pg_dumpall command
- add {use} permission for table/column/tuple object classes

* Tue May 29 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.306.alpha
- BUGFIX: RangeTblEntry->requiredPerms are polluted.

* Sun May 27 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.304.alpha
- add support for dynamic object class/access vector mapping
- BUGFIX: Lack of implicit labeling on COPY FROM statement for system catalogs
- BUGFIX: Incorrect security context handling for inherited tables

* Fri May 25 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.292.alpha
- add pg_dump/pg_dumpall/pg_restore with --enable-security option
- add support on OUTER JOIN by rewriting query.
- add security_context support on COPY TO/FROM statement
- add unlabeled security context support (enable to obtain /selinux/initial_contexts/*)
- BUGFIX: lack of checks on JOIN ON condition
- BUGFIX: pseudo relation object (sequence, toast, ...) are not handled as database obj.
- BUGFIX: lack of tuple:insert checks at COPY FROM statement
- BUGFIX: server crash when CREATE TABLE command with newly defined CONTEXT = '...'.

* Wed May 16 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.266.alpha
- BUGFIX: incorrect security context of newly generated system object.
- BUGFIX: missing error text when audit log is disabled.
- BUGFIX: incorrect Oid of newly generated tuples within pg_security.
- BUGFIX: sepgsql_enable_audittuple is misconditioned.
- add checks for T_RowExpr/T_RowCompareExpr/T_BooleanTest
                 T_DistinctExpr/T_ConvertRowtypeExpr
- add support CONTEXT = 'xxx' for CREATE TABLE/FUNCTION/DATABASE statement

* Sun Apr 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.240.alpha
- update base version 8.2.3 -> 8.2.4
- BUGFIX: unexpected expose in OUTER JOIN statement.
          add rewrite OUTER JOIN into SUBQUERY to ensure filtering violated tuples.
- BUGFIX: strange operation in text_to_security_label()
- BUGFIX: infinite recursive call on security label -> oid mapping
- BUGFIX: sepgsql_avc_init() is called in policy state monitoring process
          to avoid nonsense initialization of avc_shmem.

* Fri Apr 27 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.232.alpha
- object class numbers were redefined. (SECCLASS_DATABASE got into 61)
- is_selinux_enabled() was cached on the shared memory segment.
- BUGFIX: server went into infinit loop on foreign key constraint.

* Mon Apr 16 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.226.alpha
- BUGFIX: cases when several variables with same type in a single table

* Sat Apr 07 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.214.alpha
- add the first implementation of SE-PostgreSQL on PGACE framework

* Wed Mar 21 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.212.alpha
- BUGFIX: SetOperation didn't handle its subquery correctly.
  So, it caused server crash.

* Wed Mar 07 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.209.alpha
- BUGFIX: var->varlevelsup was ignored, so outer references
  from subqueries cause a fault.

* Tue Feb 27 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.178.alpha
- Initial RPM build


--- NEW FILE sepostgresql.te ---
policy_module(sepostgresql, 0.434)

gen_require(`
	all_userspace_class_perms

	type postgresql_t;
	type lib_t, shlib_t;
	type unlabeled_t;

	attribute domain;
	attribute file_type;
')

########################################
#
# Declarations
#

# ---- Booleans ----
gen_tunable(sepgsql_enable_unconfined, true)
gen_tunable(sepgsql_enable_auditallow, false)
gen_tunable(sepgsql_enable_auditdeny,  true)
gen_tunable(sepgsql_enable_audittuple, false)
gen_tunable(sepgsql_enable_users_ddl,  true)

# ---- Database client type ----
attribute sepgsql_admin_domain;
attribute sepgsql_users_domain;

# ---- Database object type ----
attribute sepgsql_server_type;
attribute sepgsql_database_type;
attribute sepgsql_table_type;
attribute sepgsql_procedure_type;
attribute sepgsql_blob_type;
attribute sepgsql_module_type;

#---------------------------------------
# SE-PostgreSQL userspace-managed objects

# for database class
type sepgsql_db_t,		sepgsql_database_type;

# for table/column/tuple class
type sepgsql_table_t,		sepgsql_table_type;
type sepgsql_sysobj_t,		sepgsql_table_type;
type sepgsql_secret_table_t,	sepgsql_table_type;
type sepgsql_ro_table_t,	sepgsql_table_type;
type sepgsql_fixed_table_t,	sepgsql_table_type;

# for procedure class
type sepgsql_proc_t,		sepgsql_procedure_type;
type sepgsql_user_proc_t,	sepgsql_procedure_type;
type sepgsql_trusted_proc_t,	sepgsql_procedure_type;

# for blob class
type sepgsql_blob_t,		sepgsql_blob_type;
type sepgsql_ro_blob_t,		sepgsql_blob_type;
type sepgsql_secret_blob_t,	sepgsql_blob_type;

#---------------------------------------
# SE-PostgreSQL trusted procedure domain
type sepgsql_trusted_domain_t;
domain_type(sepgsql_trusted_domain_t)
sepgsql_unconfined_domain(sepgsql_trusted_domain_t)

#---------------------------------------
# SE-PostgreSQL loadable shared library modules
sepgsql_module_object(lib_t)
sepgsql_module_object(shlib_t)

#---------------------------------------
# unlabeled object (unlabeled_t)
typeattribute unlabeled_t sepgsql_database_type;
typeattribute unlabeled_t sepgsql_table_type;
typeattribute unlabeled_t sepgsql_procedure_type;
typeattribute unlabeled_t sepgsql_blob_type;

########################################
#
# SE-PostgreSQL server domain's policy
#
optional_policy(`
	gen_require(`
		type postgresql_t;
	')
	sepgsql_server_domain(postgresql_t)
')

########################################
#
# SE-PostgreSQL client domains
#

# -- unconfined_t --
optional_policy(`
	gen_require(`
		type unconfined_t;
	')
	sepgsql_unconfined_domain(unconfined_t)
')

# -- sysadm_t --
optional_policy(`
	gen_require(`
		type sysadm_t;
	')
	sepgsql_unconfined_domain(sysadm_t)
')

# -- user_t --
optional_policy(`
	gen_require(`
		type user_t;
	')
	sepgsql_client_domain(user_t)
')

# -- staff_t --
optional_policy(`
	gen_require(`
		type staff_t;
	')
	sepgsql_client_domain(staff_t)
')

# -- guest_t --
optional_policy(`
	gen_require(`
		type guest_t;
	')
	sepgsql_client_domain(guest_t)
')

# -- httpd_t (PHP script) --
optional_policy(`
	gen_require(`
		type httpd_t;
	')
	sepgsql_client_domain(httpd_t)
')

# -- httpd_sys_script_t (CGI script) --
optional_policy(`
	gen_require(`
		type httpd_sys_script_t;
	')
	sepgsql_client_domain(httpd_sys_script_t)
')

########################################
#
# SE-PostgreSQL Type Transition
#
type_transition domain domain : db_database sepgsql_db_t;
type_transition { domain - sepgsql_server_type } sepgsql_database_type : db_table sepgsql_table_t;
type_transition sepgsql_server_type sepgsql_database_type : db_table sepgsql_sysobj_t;
type_transition domain sepgsql_database_type : db_blob sepgsql_blob_t;

########################################
#
# SE-PostgreSQL policy for server domain
#
allow sepgsql_server_type self : netlink_selinux_socket create_socket_perms;
selinux_get_fs_mount(sepgsql_server_type)
selinux_get_enforce_mode(sepgsql_server_type)
selinux_validate_context(sepgsql_server_type)
selinux_compute_access_vector(sepgsql_server_type)
selinux_compute_create_context(sepgsql_server_type)
selinux_compute_relabel_context(sepgsql_server_type)

allow sepgsql_server_type sepgsql_database_type : db_database all_db_database_perms;
allow sepgsql_server_type sepgsql_module_type : db_database { install_module };
allow sepgsql_server_type sepgsql_table_type : db_table all_db_table_perms;
allow sepgsql_server_type sepgsql_table_type : db_column all_db_column_perms;
allow sepgsql_server_type sepgsql_table_type : db_tuple all_db_tuple_perms;
allow sepgsql_server_type sepgsql_procedure_type : db_procedure all_db_procedure_perms;
allow sepgsql_server_type sepgsql_blob_type : db_blob all_db_blob_perms;
# type transition for procedure
type_transition sepgsql_server_type sepgsql_database_type : db_procedure sepgsql_proc_t;

########################################
#
# SE-PostgreSQL policy for administrative domain
#
tunable_policy(`sepgsql_enable_unconfined',`
	allow sepgsql_admin_domain sepgsql_database_type : db_database all_db_database_perms;
	allow sepgsql_admin_domain sepgsql_module_type : db_database { install_module };
	allow sepgsql_admin_domain sepgsql_table_type : db_table all_db_table_perms;
	allow sepgsql_admin_domain sepgsql_table_type : db_column all_db_column_perms;
	allow sepgsql_admin_domain sepgsql_table_type : db_tuple all_db_tuple_perms;
	allow sepgsql_admin_domain { sepgsql_procedure_type - sepgsql_user_proc_t } : db_procedure all_db_procedure_perms;
	allow sepgsql_admin_domain sepgsql_user_proc_t : db_procedure { create drop getattr setattr relabelfrom relabelto };
	allow sepgsql_admin_domain sepgsql_blob_type : db_blob all_db_blob_perms;
	allow sepgsql_admin_domain sepgsql_server_type : db_blob { import export };
	# type transition for procedure
	type_transition sepgsql_admin_domain sepgsql_database_type : db_procedure sepgsql_proc_t;
',`
	# type transition for procedure
	type_transition sepgsql_admin_domain sepgsql_database_type : db_procedure sepgsql_user_proc_t;	
')

########################################
#
# SE-PostgreSQL policy for generic domain
#

allow sepgsql_users_domain sepgsql_db_t : db_database { getattr access };

allow sepgsql_users_domain sepgsql_table_t : db_table { getattr use select update insert delete };
allow sepgsql_users_domain sepgsql_table_t : db_column { getattr use select update insert };
allow sepgsql_users_domain sepgsql_table_t : db_tuple { use select update insert delete };

allow sepgsql_users_domain sepgsql_sysobj_t : db_table { getattr use select };
allow sepgsql_users_domain sepgsql_sysobj_t : db_column { getattr use select };
allow sepgsql_users_domain sepgsql_sysobj_t : db_tuple { use select };
tunable_policy(`sepgsql_enable_users_ddl',`
	allow sepgsql_users_domain sepgsql_table_t : db_table { create drop setattr };
	allow sepgsql_users_domain sepgsql_table_t : db_column { create drop setattr };
	allow sepgsql_users_domain sepgsql_sysobj_t : db_tuple { update insert delete };
')

allow sepgsql_users_domain sepgsql_secret_table_t : db_table { getattr };
allow sepgsql_users_domain sepgsql_secret_table_t : db_column { getattr };

allow sepgsql_users_domain sepgsql_ro_table_t : db_table { getattr use select };
allow sepgsql_users_domain sepgsql_ro_table_t : db_column { getattr use select };
allow sepgsql_users_domain sepgsql_ro_table_t : db_tuple { use select };

allow sepgsql_users_domain sepgsql_fixed_table_t : db_table { getattr use select insert };
allow sepgsql_users_domain sepgsql_fixed_table_t : db_column { getattr use select insert };
allow sepgsql_users_domain sepgsql_fixed_table_t : db_tuple { use select insert };

allow sepgsql_users_domain sepgsql_proc_t : db_procedure { getattr execute };
allow { sepgsql_users_domain - sepgsql_admin_domain} sepgsql_user_proc_t : db_procedure { create drop getattr setattr execute };
allow sepgsql_users_domain sepgsql_trusted_proc_t : db_procedure { getattr execute entrypoint };

allow sepgsql_users_domain sepgsql_blob_t : db_blob { create drop getattr setattr read write };
allow sepgsql_users_domain sepgsql_ro_blob_t : db_blob { getattr read };
allow sepgsql_users_domain sepgsql_secret_blob_t : db_blob { getattr };

# type transition for procedure
type_transition { sepgsql_users_domain - sepgsql_admin_domain } sepgsql_database_type : db_procedure sepgsql_user_proc_t;

# trusted procedure
type_transition sepgsql_users_domain sepgsql_trusted_proc_t : process sepgsql_trusted_domain_t;
allow sepgsql_users_domain sepgsql_trusted_domain_t : process { transition };

########################################
#
# SE-PostgreSQL loadable shared library policy
#

allow sepgsql_database_type sepgsql_module_type : db_database { load_module };

########################################
#
# SE-PostgreSQL audit switch
#
tunable_policy(`sepgsql_enable_auditallow',`
	auditallow domain sepgsql_database_type : db_database all_db_database_perms;
	auditallow domain sepgsql_table_type : db_table all_db_table_perms;
	auditallow domain sepgsql_table_type : db_column all_db_column_perms;
	auditallow domain sepgsql_procedure_type : db_procedure all_db_procedure_perms;
	auditallow domain sepgsql_blob_type : db_blob all_db_blob_perms;
	auditallow domain sepgsql_server_type : db_blob { import export };
	auditallow domain file_type : db_database { install_module };
')
tunable_policy(`sepgsql_enable_audittuple && sepgsql_enable_auditallow',`
	auditallow domain sepgsql_table_type : db_tuple all_db_tuple_perms;
')
tunable_policy(`! sepgsql_enable_auditdeny',`
	dontaudit domain sepgsql_database_type : db_database all_db_database_perms;
	dontaudit domain sepgsql_table_type : db_table all_db_table_perms;
	dontaudit domain sepgsql_table_type : db_column all_db_column_perms;
	dontaudit domain sepgsql_procedure_type : db_procedure all_db_procedure_perms;
	dontaudit domain sepgsql_blob_type : db_blob all_db_blob_perms;
	dontaudit domain sepgsql_server_type : db_blob { import export };
	dontaudit domain file_type : db_database { install_module };
')
tunable_policy(`! sepgsql_enable_audittuple || ! sepgsql_enable_auditdeny',`
	dontaudit domain sepgsql_table_type : db_tuple all_db_tuple_perms;
')


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:10:32 -0000	1.1
+++ .cvsignore	1 Sep 2007 13:07:32 -0000	1.2
@@ -0,0 +1 @@
+postgresql-8.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:10:32 -0000	1.1
+++ sources	1 Sep 2007 13:07:32 -0000	1.2
@@ -0,0 +1 @@
+f7f2548c41b87ceb63a495dc47a67440  postgresql-8.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 13:10:29 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:10:29 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.28,1.29
Message-ID: <200709011310.l81DATal029677@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29617

Modified Files:
	dietlibc.spec 
Log Message:
reenabled '-fno-stack-protector' for non-i386/x86_64 archs


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dietlibc.spec	1 Sep 2007 12:35:38 -0000	1.28
+++ dietlibc.spec	1 Sep 2007 13:09:57 -0000	1.29
@@ -35,6 +35,7 @@
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
+Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
 Patch31:	dietlibc-0.31-defpath.patch
 Patch32:	dietlibc-0.31-stacksmash.patch
@@ -73,9 +74,18 @@
 %patch32 -p1 -b .stacksmash
 %patch33 -p1 -b .stacksmash-dyn
 
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
+sed -i -e 's!^#define WANT_SSP$!// \0!g;
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
 sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:16:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sat, 1 Sep 2007 09:16:36 -0400
Subject: comps comps-f8.xml.in,1.84,1.85
Message-ID: <200709011316.l81DGa2C029782@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29748

Modified Files:
	comps-f8.xml.in 
Log Message:
add groups for Fonts and Legacy Fonts



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- comps-f8.xml.in	31 Aug 2007 07:06:30 -0000	1.84
+++ comps-f8.xml.in	1 Sep 2007 13:16:06 -0000	1.85
@@ -355,14 +355,7 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
-      <packagereq type="optional">efont-unicode-bdf</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">fonts-japanese</packagereq>
-      <packagereq type="optional">fonts-KOI8-R</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
@@ -381,10 +374,6 @@
       <packagereq type="optional">xdaliclock</packagereq>
       <packagereq type="optional">xkeycaps</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">xorg-x11-resutils</packagereq>
       <packagereq type="optional">xorg-x11-server-Xnest</packagereq>
       <packagereq type="optional">xorg-x11-server-Xvfb</packagereq>
@@ -398,6 +387,94 @@
     </packagelist>
   </group>
   <group>
+    <id>fonts</id>
+    <_name>Fonts</_name>
+    <_description>Fonts packages for rendering text on the desktop.</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">dejavu-lgc-fonts</packagereq>
+      <packagereq type="default">fonts-arabic</packagereq>
+      <packagereq type="default">fonts-bengali</packagereq>
+      <packagereq type="default">fonts-chinese</packagereq>
+      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">fonts-hindi</packagereq>
+      <packagereq type="default">fonts-kannada</packagereq>
+      <packagereq type="default">fonts-korean</packagereq>
+      <packagereq type="default">fonts-malayalam</packagereq>
+      <packagereq type="default">fonts-oriya</packagereq>
+      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">fonts-sinhala</packagereq>
+      <packagereq type="default">fonts-tamil</packagereq>
+      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">liberation-fonts</packagereq>
+      <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">bitstream-vera-fonts</packagereq>
+      <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">dejavu-fonts</packagereq>
+      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
+      <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-truetype-apl</packagereq>
+      <packagereq type="optional">freefont</packagereq>
+      <packagereq type="optional">gentium-fonts</packagereq>
+      <packagereq type="optional">hunky-fonts</packagereq>
+      <packagereq type="optional">linux-libertine-fonts</packagereq>
+      <packagereq type="optional">mathml-fonts</packagereq>
+      <packagereq type="optional">mgopen-fonts</packagereq>
+      <packagereq type="optional">sazanami-fonts-mincho</packagereq>
+      <packagereq type="optional">tibetan-machine-uni-fonts</packagereq>
+      <packagereq type="optional">VLGothic-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-syriac</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>legacy-fonts</id>
+    <_name>Legacy Fonts</_name>
+    <_description>Older bitmap and vector fonts packages</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">bitmap-fonts</packagereq>
+      <packagereq type="default">fonts-hebrew</packagereq>
+      <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-75dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-misc</packagereq>
+      <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
+      <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
+      <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">bitmap-fonts-cjk</packagereq>
+      <packagereq type="optional">efont-unicode-bdf</packagereq>
+      <packagereq type="optional">fonts-hebrew-fancy</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">fonts-KOI8-R</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-x11-apl</packagereq>
+      <packagereq type="optional">ghostscript-fonts</packagereq>
+      <packagereq type="optional">libdockapp-fonts</packagereq>
+      <packagereq type="optional">terminus-font-console</packagereq>
+      <packagereq type="optional">terminus-font-x11</packagereq>
+      <packagereq type="optional">urw-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-15-75dpi</packagereq>
+      <packagereq type="optional">zvbi-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>basque-support</id>
     <_name>Basque Support</_name>
     <_description/>
@@ -4060,8 +4137,10 @@
       <groupid>base</groupid>
       <groupid>base-x</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>java</groupid>
+      <groupid>legacy-fonts</groupid>
       <groupid>legacy-software-support</groupid>
       <groupid>system-tools</groupid>
       <groupid>virtualization</groupid>



From fedora-extras-commits at redhat.com  Sat Sep  1 13:21:14 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:21:14 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.29,1.30
Message-ID: <200709011321.l81DLEPp029845@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29827

Modified Files:
	dietlibc.spec 
Log Message:
made binaries non-executable to avoid "No build ID note" errors


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dietlibc.spec	1 Sep 2007 13:09:57 -0000	1.29
+++ dietlibc.spec	1 Sep 2007 13:20:41 -0000	1.30
@@ -104,6 +104,8 @@
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
+
+chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
 rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
@@ -132,9 +134,10 @@
 %changelog
 * Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
 - updated to 0.31
-- removed the no-stack-protector bits
+- removed the no-stack-protector bits for i386 and x86_64 archs
 - improved stack-smash code a little bit
 - disabled dynamic lib for all arches
+- made binaries non-executable to avoid "No build ID note" errors
 
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6



From fedora-extras-commits at redhat.com  Sat Sep  1 13:22:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:22:44 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.30,1.31
Message-ID: <200709011322.l81DMiKc029911@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29888

Modified Files:
	dietlibc.spec 
Log Message:
fixed typo


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dietlibc.spec	1 Sep 2007 13:20:41 -0000	1.30
+++ dietlibc.spec	1 Sep 2007 13:22:12 -0000	1.31
@@ -137,7 +137,7 @@
 - removed the no-stack-protector bits for i386 and x86_64 archs
 - improved stack-smash code a little bit
 - disabled dynamic lib for all arches
-- made binaries non-executable to avoid "No build ID note" errors
+- made objects non-executable to avoid "No build ID note" errors
 
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6



From fedora-extras-commits at redhat.com  Sat Sep  1 13:37:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:37:44 -0400
Subject: rpms/dietlibc/F-7 sources,1.6,1.7 dietlibc.spec,1.27,1.28
Message-ID: <200709011337.l81DbiOC030367@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228/F-7

Modified Files:
	sources dietlibc.spec 
Log Message:
- updated to 0.31
- removed the no-stack-protector bits for i386 and x86_64 archs
- improved stack-smash code a little bit
- disabled dynamic lib for all arches
- made objects non-executable to avoid "No build ID note" errors



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jul 2006 14:18:32 -0000	1.6
+++ sources	1 Sep 2007 13:37:11 -0000	1.7
@@ -1,2 +1,2 @@
-2465d652fff6f1fad3da3b98e60e83c9  dietlibc-0.30.tar.bz2
-698d7624167aad89acfef504da0161ad  dietlibc-0.30.tar.bz2.sig
+acb98d469ee932d902fdf6de07802b7c  dietlibc-0.31.tar.bz2
+77dadb56faa06c1a5177d76806e79b28  dietlibc-0.31.tar.bz2.sig


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/dietlibc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dietlibc.spec	17 Jan 2007 01:02:35 -0000	1.27
+++ dietlibc.spec	1 Sep 2007 13:37:11 -0000	1.28
@@ -6,7 +6,7 @@
 ##
 
 %ifarch %ix86 x86_64 arm
-%global do_dyn		1
+%global do_dyn		0
 %else
 %global do_dyn 		0
 %endif
@@ -26,8 +26,8 @@
 
 Summary:	Small libc implementation
 Name:		dietlibc
-Version:	0.30
-Release:	%release_func 4
+Version:	0.31
+Release:	%release_func 1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -37,14 +37,19 @@
 Patch10:	dietlibc-0.29-scall.patch
 Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
+Patch31:	dietlibc-0.31-defpath.patch
+Patch32:	dietlibc-0.31-stacksmash.patch
+Patch33:	dietlibc-0.31-stacksmash-dyn.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
-
+%{!?with_dyn:Obsoletes:	dietlibc-lib < %version-%release}
 
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
 
 %description
 The diet libc is a libc that is optimized for small size. It can be
@@ -64,14 +69,23 @@
 %setup -q
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
-%patch20 -p1 -b .nostackprotector
 %patch30 -p1 -b .longdouble
+%patch31 -p1 -b .defpath
+%patch32 -p1 -b .stacksmash
+%patch33 -p1 -b .stacksmash-dyn
 
-sed -i -e 's!strip !: !g' Makefile
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
-           s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
+sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 
@@ -91,6 +105,8 @@
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
 
+chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
+rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
 %clean
@@ -116,6 +132,13 @@
 
 
 %changelog
+* Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
+- updated to 0.31
+- removed the no-stack-protector bits for i386 and x86_64 archs
+- improved stack-smash code a little bit
+- disabled dynamic lib for all arches
+- made objects non-executable to avoid "No build ID note" errors
+
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:49:31 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 09:49:31 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.132,
	1.133 openoffice.org.spec, 1.1278,
	1.1279 openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch,
	1.1, NONE
Message-ID: <200709011349.l81DnVfj030552@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	.cvsignore openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch 
Log Message:
drop openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- .cvsignore	1 Sep 2007 11:44:03 -0000	1.132
+++ .cvsignore	1 Sep 2007 13:48:59 -0000	1.133
@@ -1,30 +1,7 @@
-openoffice-template-extra.tar.bz2
-extra-templates.tar.bz2
-extra-gallery.tar.bz2
-extra-dictionaries.tar.bz2
-GSI_gu-IN.sdf
-GSI_kn-IN.sdf
-GSI_ta-IN.sdf
-GSI_nn.sdf
-GSI_nb.sdf
-GSI_pa-IN.sdf
-GSI_bn-IN.sdf
-GSI_bn.sdf
-openoffice.org-simple-crash_report.sh
-GSI_cs.sdf
-UseSystemFPicker.xcu
-RegisterAndLicence.xcu
-GSI_ga.sdf
-javavendors.xml
-GSI_hi-IN.sdf
 evolocal.odb
 documentation.openoffice.org-templates.tar.gz
 redhat-templates.tar.gz
 Tigert-templates.tar.gz
 ooo64726.sdf
-AutoSaveCommon.xcu
-AutoSaveRecovery.xcu
-openoffice.org.langpack.template.tar.gz
-pa-IN-179.sdf
 unowinreg.dll
 OOG680_m3.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -r1.1278 -r1.1279
--- openoffice.org.spec	1 Sep 2007 11:46:02 -0000	1.1278
+++ openoffice.org.spec	1 Sep 2007 13:48:59 -0000	1.1279
@@ -80,55 +80,54 @@
 Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch18: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
-Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch20: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch23: workspace.fpicker6.patch
-Patch24: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch25: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch26: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch27: pseudoworkspace.valgrind1.patch
-Patch28: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch29: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch30: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch31: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch32: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch33: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch34: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch35: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch36: workspace.tl37.patch
-Patch37: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch38: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch39: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch40: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch41: workspace.configrefactor01.patch
-Patch42: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch43: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch44: openoffice.org-2.2.0.rh232389.tango.patch
-Patch45: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch46: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch47: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch48: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch49: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch50: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch51: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch52: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch53: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch54: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch56: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch57: workspace.unifysound01.patch
-Patch58: workspace.npower7.patch
-Patch59: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch60: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch61: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch62: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch63: workspace.dba23e.patch
-Patch64: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch65: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch66: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch21: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch22: workspace.fpicker6.patch
+Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch24: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch25: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch26: pseudoworkspace.valgrind1.patch
+Patch27: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch28: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch29: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch30: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch31: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch32: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch33: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch34: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch35: workspace.tl37.patch
+Patch36: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch37: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch38: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch39: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch40: workspace.configrefactor01.patch
+Patch41: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch43: openoffice.org-2.2.0.rh232389.tango.patch
+Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch45: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch46: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch47: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch48: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch49: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch50: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch51: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch52: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch53: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch56: workspace.unifysound01.patch
+Patch57: workspace.npower7.patch
+Patch58: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch59: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch60: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch61: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch62: workspace.dba23e.patch
+Patch63: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch64: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch65: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1016,59 +1015,58 @@
 %patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch16 -p1 -b .ooo54603.fontconfig.patch
 %patch17 -p1 -b .ooo69368.fixxmlsec.patch
-%patch18 -p1 -b .ooo67740.doublefree.xmlhelp.patch
-%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch20 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch21 -p1
-%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch23 -p1 -b .workspace.fpicker6.patch
-%patch24 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch25 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch26 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch27 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch28 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch29 -p1 -b .rh217065.syncbackspace.patch
-%patch30 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch31 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH32} >> svtools/source/dialogs/localize.sdf
-%patch33 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch34 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch35 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch36 -p1 -b .tl37.patch
-%patch37 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch38 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch39 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch40 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch41 -p0 -b .workspace.configrefactor01.patch
-%patch42 -p0 -b .ooo68717.gstreamer.video.patch
-%patch43 -p1 -b .ooo63159.sal.dtype.patch
-%patch44 -p1 -b .rh232389.tango.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch20 -p1
+%patch21 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch22 -p1 -b .workspace.fpicker6.patch
+%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch24 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch25 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch26 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch27 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch28 -p1 -b .rh217065.syncbackspace.patch
+%patch29 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch30 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH31} >> svtools/source/dialogs/localize.sdf
+%patch32 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch33 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch34 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch35 -p1 -b .tl37.patch
+%patch36 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch37 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch38 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch39 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch40 -p0 -b .workspace.configrefactor01.patch
+%patch41 -p0 -b .ooo68717.gstreamer.video.patch
+%patch42 -p1 -b .ooo63159.sal.dtype.patch
+%patch43 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch45 -p1 -b .ooo53397.linkopt.patch
+%patch44 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch46 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch47 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch48 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch45 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch46 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch47 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 %if %{linkopt}
-%patch49 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch48 -p0 -b .ooo77885.stoc.stocmerge.patch
 %endif
-%patch50 -p1 -b .ooo80816.selinux.bridges.patch
-%patch51 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch52 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch53 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch54 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch55 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH56}
-%patch57 -p1 -b .workspace.unifysound01.patch
-%patch58 -p1 -b .workspace.npower7.patch
-%patch59 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch60 -p1 -b .ooo80735.cppu.map.patch
-%patch61 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch62 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch63 -p1 -b .workspace.dba23e.patch
-%patch64 -p1 -b .ooo80967.ucb.neon27.patch
-%patch65 -p1 -b .ooo80931.sysui.genericname.patch
-%patch66 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch49 -p1 -b .ooo80816.selinux.bridges.patch
+%patch50 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch51 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch52 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch53 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch54 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH55}
+%patch56 -p1 -b .workspace.unifysound01.patch
+%patch57 -p1 -b .workspace.npower7.patch
+%patch58 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch59 -p1 -b .ooo80735.cppu.map.patch
+%patch60 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch61 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch62 -p1 -b .workspace.dba23e.patch
+%patch63 -p1 -b .ooo80967.ucb.neon27.patch
+%patch64 -p1 -b .ooo80931.sysui.genericname.patch
+%patch65 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2748,6 +2746,7 @@
 %changelog
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
+- drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 13:58:49 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 09:58:49 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1279,
	1.1280 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch,
	1.2, NONE
Message-ID: <200709011358.l81DwnBT030813@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30785

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch 
Log Message:
drop openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -r1.1279 -r1.1280
--- openoffice.org.spec	1 Sep 2007 13:48:59 -0000	1.1279
+++ openoffice.org.spec	1 Sep 2007 13:58:16 -0000	1.1280
@@ -107,27 +107,26 @@
 Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
 Patch43: openoffice.org-2.2.0.rh232389.tango.patch
 Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch45: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch46: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch47: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch48: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch49: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch50: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch51: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch52: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch53: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch56: workspace.unifysound01.patch
-Patch57: workspace.npower7.patch
-Patch58: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch59: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch60: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch61: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch62: workspace.dba23e.patch
-Patch63: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch64: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch65: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch45: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch46: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch47: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch48: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch49: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch50: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch51: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch52: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch53: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch55: workspace.unifysound01.patch
+Patch56: workspace.npower7.patch
+Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch59: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch60: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch61: workspace.dba23e.patch
+Patch62: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch63: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch64: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1044,29 +1043,28 @@
 %if %{linkopt}
 %patch44 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch45 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch46 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch47 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch45 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch46 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 %if %{linkopt}
-%patch48 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch47 -p0 -b .ooo77885.stoc.stocmerge.patch
 %endif
-%patch49 -p1 -b .ooo80816.selinux.bridges.patch
-%patch50 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch51 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch52 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch53 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch54 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH55}
-%patch56 -p1 -b .workspace.unifysound01.patch
-%patch57 -p1 -b .workspace.npower7.patch
-%patch58 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch59 -p1 -b .ooo80735.cppu.map.patch
-%patch60 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch61 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch62 -p1 -b .workspace.dba23e.patch
-%patch63 -p1 -b .ooo80967.ucb.neon27.patch
-%patch64 -p1 -b .ooo80931.sysui.genericname.patch
-%patch65 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch48 -p1 -b .ooo80816.selinux.bridges.patch
+%patch49 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch50 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch51 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch52 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch53 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH54}
+%patch55 -p1 -b .workspace.unifysound01.patch
+%patch56 -p1 -b .workspace.npower7.patch
+%patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch58 -p1 -b .ooo80735.cppu.map.patch
+%patch59 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch60 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch61 -p1 -b .workspace.dba23e.patch
+%patch62 -p1 -b .ooo80967.ucb.neon27.patch
+%patch63 -p1 -b .ooo80931.sysui.genericname.patch
+%patch64 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2747,6 +2745,7 @@
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
+- drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:02:09 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:02:09 -0400
Subject: rpms/eclipse-rpm-editor/devel
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011402.l81E29iH004478@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:01:35 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:01:35 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:04:24 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:04:24 -0400
Subject: rpms/eclipse-rpm-editor/F-7
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011404.l81E4OxZ004680@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4581/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:03:51 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:03:51 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:04:41 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat, 1 Sep 2007 10:04:41 -0400
Subject: rpms/snort/devel snort-2.7.0.1-glibc.patch, NONE, 1.1 snort.spec,
	1.27, 1.28
Message-ID: <200709011404.l81E4fm6004720@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4613

Modified Files:
	snort.spec 
Added Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
update for glibc open


snort-2.7.0.1-glibc.patch:

--- NEW FILE snort-2.7.0.1-glibc.patch ---
diff -ur snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c
--- snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c	2007-07-03 15:41:53.000000000 -0500
+++ snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c	2007-08-31 23:37:33.000000000 -0500
@@ -346,7 +346,7 @@
 
     /* open this description, create it if necessary, always wait on
      * sync to disk w/ every write, only write */
-    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
+    fd = open(filename, O_CREAT, 0660|O_TRUNC|O_SYNC|O_WRONLY);
 
     if(fd < 0)
     {
diff -ur snort-2.7.0.1-orig/src/util.c snort-2.7.0.1/src/util.c
--- snort-2.7.0.1-orig/src/util.c	2007-07-03 15:41:31.000000000 -0500
+++ snort-2.7.0.1/src/util.c	2007-08-31 23:37:41.000000000 -0500
@@ -1841,7 +1841,7 @@
     close(2);
 
 #ifdef DEBUG
-    open("/tmp/snort.debug", O_CREAT | O_RDWR);
+    open("/tmp/snort.debug", O_CREAT, 0660 | O_RDWR);
 #else
     open("/dev/null", O_RDWR);
 #endif


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- snort.spec	1 Sep 2007 03:50:29 -0000	1.27
+++ snort.spec	1 Sep 2007 14:04:08 -0000	1.28
@@ -1,12 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.7.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
+Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -142,6 +143,7 @@
 
 %prep
 %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
@@ -477,6 +479,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-3
+- fix for glibc open
+
 * Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
 - fix detection of mysql and libnet10
 



From fedora-extras-commits at redhat.com  Sat Sep  1 14:05:57 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:05:57 -0400
Subject: rpms/eclipse-rpm-editor/FC-6
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011405.l81E5vIw004856@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:05:22 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:05:22 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:08:40 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:08:40 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1280,
	1.1281 openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch, 1.1, NONE
Message-ID: <200709011408.l81E8eLG004974@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4940

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch 
Log Message:
drop openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -r1.1280 -r1.1281
--- openoffice.org.spec	1 Sep 2007 13:58:16 -0000	1.1280
+++ openoffice.org.spec	1 Sep 2007 14:08:07 -0000	1.1281
@@ -121,12 +121,11 @@
 Patch56: workspace.npower7.patch
 Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch59: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch60: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch61: workspace.dba23e.patch
-Patch62: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch63: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch64: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch60: workspace.dba23e.patch
+Patch61: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch62: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch63: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,12 +1058,11 @@
 %patch56 -p1 -b .workspace.npower7.patch
 %patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch58 -p1 -b .ooo80735.cppu.map.patch
-%patch59 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch60 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch61 -p1 -b .workspace.dba23e.patch
-%patch62 -p1 -b .ooo80967.ucb.neon27.patch
-%patch63 -p1 -b .ooo80931.sysui.genericname.patch
-%patch64 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch60 -p1 -b .workspace.dba23e.patch
+%patch61 -p1 -b .ooo80967.ucb.neon27.patch
+%patch62 -p1 -b .ooo80931.sysui.genericname.patch
+%patch63 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2746,6 +2744,7 @@
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+- drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:17:02 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:17:02 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1281,
	1.1282 workspace.dba23e.patch, 1.1, NONE
Message-ID: <200709011417.l81EH2B7005160@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5095

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.dba23e.patch 
Log Message:
drop workspace.dba23e.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -r1.1281 -r1.1282
--- openoffice.org.spec	1 Sep 2007 14:08:07 -0000	1.1281
+++ openoffice.org.spec	1 Sep 2007 14:16:29 -0000	1.1282
@@ -122,10 +122,9 @@
 Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch60: workspace.dba23e.patch
-Patch61: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch62: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch63: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch61: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch62: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,10 +1058,9 @@
 %patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch58 -p1 -b .ooo80735.cppu.map.patch
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch60 -p1 -b .workspace.dba23e.patch
-%patch61 -p1 -b .ooo80967.ucb.neon27.patch
-%patch62 -p1 -b .ooo80931.sysui.genericname.patch
-%patch63 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch60 -p1 -b .ooo80967.ucb.neon27.patch
+%patch61 -p1 -b .ooo80931.sysui.genericname.patch
+%patch62 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2745,6 +2743,7 @@
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+- drop integrated workspace.dba23e.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- workspace.dba23e.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:26:53 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:26:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1282,
	1.1283 openoffice.org-2.3.0.ooo80931.sysui.genericname.patch,
	1.1, NONE
Message-ID: <200709011426.l81EQr7a005370@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5346

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo80931.sysui.genericname.patch 
Log Message:
drop openoffice.org-2.3.0.ooo80931.sysui.genericname.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1282
retrieving revision 1.1283
diff -u -r1.1282 -r1.1283
--- openoffice.org.spec	1 Sep 2007 14:16:29 -0000	1.1282
+++ openoffice.org.spec	1 Sep 2007 14:26:21 -0000	1.1283
@@ -123,8 +123,7 @@
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch61: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch62: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,8 +1058,7 @@
 %patch58 -p1 -b .ooo80735.cppu.map.patch
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
-%patch61 -p1 -b .ooo80931.sysui.genericname.patch
-%patch62 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2744,6 +2742,7 @@
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 - drop integrated workspace.dba23e.patch
+- drop integrated openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.3.0.ooo80931.sysui.genericname.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:43 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:43 -0400
Subject: rpms/clamav/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81EihrH005622@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/clamav/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.91.2


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/clamav/
clamav-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:46 -0400
Subject: rpms/gif2png/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eik4k005639@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/gif2png/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/gif2png/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2.5.1


--- NEW FILE verinfo ---
http://www.catb.org/~esr/gif2png/
gif2png-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:49 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:49 -0400
Subject: rpms/gif2png/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Ein1a005658@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/gif2png/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/gif2png/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2.5.1


--- NEW FILE verinfo ---
http://www.catb.org/~esr/gif2png/
gif2png-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:52 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:52 -0400
Subject: rpms/kismet/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eiqbw005678@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/kismet/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2007-01-R1b


--- NEW FILE verinfo ---
http://www.kismetwireless.net/code/
kismet-([^-]+-[^-]*-[^-]*)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:58 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:58 -0400
Subject: rpms/libextractor/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eiw51005717@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libextractor/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.18a


--- NEW FILE verinfo ---
http://gnunet.org/libextractor/download/
libextractor-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:01 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:01 -0400
Subject: rpms/libextractor/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej1r8005734@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libextractor/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.18a


--- NEW FILE verinfo ---
http://gnunet.org/libextractor/download/
libextractor-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:04 -0400
Subject: rpms/libtasn1/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej4C6005751@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libtasn1/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.3.10


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
libtasn1-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:55 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:55 -0400
Subject: rpms/kismet/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81EitMF005695@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/kismet/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2007-01-R1b


--- NEW FILE verinfo ---
http://www.kismetwireless.net/code/
kismet-([^-]+-[^-]*-[^-]*)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:08 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:08 -0400
Subject: rpms/libtasn1/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej8JE005770@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libtasn1/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.3.10


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
libtasn1-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:11 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:11 -0400
Subject: rpms/mimetic/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjBUL005792@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/mimetic/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.9.3


--- NEW FILE verinfo ---
http://codesink.org/download/
mimetic-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:14 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:14 -0400
Subject: rpms/mimetic/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjENn005809@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/mimetic/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.9.3


--- NEW FILE verinfo ---
http://codesink.org/download/
mimetic-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:17 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:17 -0400
Subject: rpms/opencdk/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjHLD005828@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/opencdk/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.13


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/opencdk/
opencdk-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:20 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:20 -0400
Subject: rpms/opencdk/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjKPi005845@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/opencdk/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.13


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/opencdk/
opencdk-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:23 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:23 -0400
Subject: rpms/tinyca2/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjNxn005864@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tinyca2/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7.5


--- NEW FILE verinfo ---
http://tinyca.sm-zone.net/
tinyca2-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:26 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:26 -0400
Subject: rpms/tor/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjQsk005881@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tor/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.1.2.17


--- NEW FILE verinfo ---
http://tor.eff.org/dist/
tor-([^-]*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:29 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:29 -0400
Subject: rpms/tor/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjTOA005898@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tor/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.1.2.17


--- NEW FILE verinfo ---
http://tor.eff.org/dist/
tor-([^-]*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:32 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:32 -0400
Subject: rpms/x11-ssh-askpass/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjWd2005915@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/x11-ssh-askpass/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.2.4.1


--- NEW FILE verinfo ---
http://www.jmknoble.net/software/x11-ssh-askpass/
x11-ssh-askpass-([0-9]\..*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:35 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:35 -0400
Subject: rpms/x11-ssh-askpass/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjZbG005932@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/x11-ssh-askpass/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.2.4.1


--- NEW FILE verinfo ---
http://www.jmknoble.net/software/x11-ssh-askpass/
x11-ssh-askpass-([0-9]\..*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:41 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:41 -0400
Subject: rpms/xca/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjfGE005966@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xca/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.6.4


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xca/
xca-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:38 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:38 -0400
Subject: rpms/xca/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ejcit005949@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xca/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.6.4


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xca/
xca-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:44 -0400
Subject: rpms/xmlrpc-c/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Eji77005984@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xmlrpc-c/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.06.17


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xmlrpc-c/
xmlrpc-c-(1\.06\..*?)\.t



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:46 -0400
Subject: rpms/xmlrpc-c/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjkmH006001@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xmlrpc-c/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.06.17


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xmlrpc-c/
xmlrpc-c-(1\.06\..*?)\.t



From fedora-extras-commits at redhat.com  Sat Sep  1 14:52:38 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:52:38 -0400
Subject: rpms/x11-ssh-askpass/devel x11-ssh-askpass.spec,1.2,1.3
Message-ID: <200709011452.l81Eqcjv006120@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6102

Modified Files:
	x11-ssh-askpass.spec 
Log Message:
rebuilt with -Wl,--as-needed



Index: x11-ssh-askpass.spec
===================================================================
RCS file: /cvs/extras/rpms/x11-ssh-askpass/devel/x11-ssh-askpass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x11-ssh-askpass.spec	15 Sep 2006 17:53:46 -0000	1.2
+++ x11-ssh-askpass.spec	1 Sep 2007 14:52:05 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:		x11-ssh-askpass
 Version:	1.2.4.1
-Release:	%release_func 2
+Release:	%release_func 3
 Summary:	A passphrase dialog for X and not only for OpenSSH
 
 Group:		Applications/System
@@ -18,7 +18,7 @@
 Source10:	X11-ssh-askpass.csh
 Source11:	X11-ssh-askpass.sh
 Patch0:		x11-ssh-askpass-1.2.4-random.patch
-BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)
+BuildRoot:	%_tmppath/%name-%version-%release-root
 
 Provides:		openssh-askpass-x11
 Requires(pre):		%appdefaultsdir
@@ -47,6 +47,7 @@
 
 %global makeflags	XAPPLOADDIR='%appdefaultsdir'
 %build
+export LDFLAGS='-Wl,--as-needed'
 %configure --libexecdir=%_libexecdir/openssh
 xmkmf
 make includes  %makeflags
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.2.4.1-3
+- rebuilt with -Wl,--as-needed
+
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.2.4.1-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Sep  1 16:29:14 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 1 Sep 2007 12:29:14 -0400
Subject: rpms/php-pecl-memcache/EL-4 memcache-php439.patch, NONE,
	1.1 php-pecl-memcache.spec, NONE, 1.1 sources, 1.1, 1.2 README,
	1.1, NONE
Message-ID: <200709011629.l81GTEtj021389@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21365

Modified Files:
	sources 
Added Files:
	memcache-php439.patch php-pecl-memcache.spec 
Removed Files:
	README 
Log Message:
    new package (with EL4 specific specfile)

memcache-php439.patch:

--- NEW FILE memcache-php439.patch ---
--- memcache-2.1.2/memcache_session.c.orig	2007-09-01 18:10:33.000000000 +0200
+++ memcache-2.1.2/memcache_session.c	2007-09-01 18:11:35.000000000 +0200
@@ -32,6 +32,10 @@
 #include "ext/standard/url.h"
 #include "php_memcache.h"
 
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#       define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
 #if HAVE_MEMCACHE_SESSION
 
 ps_module ps_mod_memcache = {


--- NEW FILE php-pecl-memcache.spec ---
# ---- specific SPEC file only for RHEL4 (too much conditional stuff) ----

%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name memcache

Summary:      Extension to work with the Memcached caching daemon
Name:         php-pecl-memcache
Version:      2.1.2
Release:      1%{?dist}.1
License:      PHP
Group:        Development/Languages
URL:          http://pecl.php.net/package/%{pecl_name}

Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
Patch0:       memcache-php439.patch

BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel, zlib-devel
BuildRequires: autoconf, automake, libtool, openssl-devel
Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}

%description
Memcached is a caching daemon designed especially for
dynamic web applications to decrease database load by
storing objects in memory.

This extension allows you to work with memcached through
handy OO and procedural interfaces.

Memcache can be used as a PHP session handler.

%prep 
%setup -c -q
%patch0 -p0 -b .php439

%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot}

# Drop in the bit of configuration
%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so

; Options for the %{pecl_name} module

; Whether to transparently failover to other servers on errors
;memcache.allow_failover=1

; Defines how many servers to try when setting and getting data.
;memcache.max_failover_attempts=20

; Data will be transferred in chunks of this size
;memcache.chunk_size=8192

; The default TCP port number to use when connecting to the memcached server 
;memcache.default_port=11211

; Options to use the memcache session handler

; Use memcache as a session handler
;session.save_handler=memcache

; Defines a comma separated of server urls to use for session storage
;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
EOF


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-, root, root, -)
%doc %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README %{pecl_name}-%{version}/example.php
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so


%changelog
* Sat Sep  1 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1.el4.1
- specific spec for EL4
- memcache-php439.patch, see http://pecl.php.net/bugs/bug.php?id=11953

* Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 01:05:19 -0000	1.1
+++ sources	1 Sep 2007 16:28:41 -0000	1.2
@@ -0,0 +1 @@
+cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz


--- README DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 16:30:28 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sat, 1 Sep 2007 12:30:28 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.678, 1.679 kernel.spec, 1.141,
	1.142 linux-2.6-ps3-gelic-wireless.patch, 1.3, 1.4 sources,
	1.641, 1.642 upstream, 1.563,
	1.564 linux-2.6-vesa-reg-clobber.patch, 1.1,
	NONE patch-2.6.23-rc4-git3.bz2.sign, 1.1, NONE
Message-ID: <200709011630.l81GUSxW021492@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21449

Modified Files:
	.cvsignore kernel.spec linux-2.6-ps3-gelic-wireless.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc5.bz2.sign 
Removed Files:
	linux-2.6-vesa-reg-clobber.patch 
	patch-2.6.23-rc4-git3.bz2.sign 
Log Message:
* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc5



--- NEW FILE patch-2.6.23-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG2QjeyGugalF9Dw4RAipyAJ9m2CT5piDTfxEOWGCLRoZip93hJACePlKV
kSJyXg0nslXsxAN6TsUTp1A=
=74cz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- .cvsignore	1 Sep 2007 00:32:49 -0000	1.678
+++ .cvsignore	1 Sep 2007 16:29:55 -0000	1.679
@@ -3,7 +3,7 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4.bz2
+patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5.bz2
 patch-2.6.23-rc3-git10.bz2
 patch-2.6.23-rc4-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kernel.spec	1 Sep 2007 00:32:50 -0000	1.141
+++ kernel.spec	1 Sep 2007 16:29:55 -0000	1.142
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -667,7 +667,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1600: linux-2.6-vesa-reg-clobber.patch
 
 %endif
 
@@ -1191,9 +1190,6 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
-# Some VESA BIOSs clobber registers on return.
-ApplyPatch linux-2.6-vesa-reg-clobber.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1785,6 +1781,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc5
+
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc4-git3
 

linux-2.6-ps3-gelic-wireless.patch:

Index: linux-2.6-ps3-gelic-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ps3-gelic-wireless.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-ps3-gelic-wireless.patch	31 Jul 2007 11:33:24 -0000	1.3
+++ linux-2.6-ps3-gelic-wireless.patch	1 Sep 2007 16:29:55 -0000	1.4
@@ -42,16 +42,17 @@
  obj-$(CONFIG_SKY2) += sky2.o
 --- a/drivers/net/ps3_gelic_net.c
 +++ b/drivers/net/ps3_gelic_net.c
-@@ -556,6 +556,9 @@ static int gelic_net_stop(struct net_dev
+@@ -556,6 +556,10 @@ static int gelic_net_stop(struct net_dev
  {
  	struct gelic_net_card *card = netdev_priv(netdev);
  
 +#ifdef CONFIG_GELIC_WIRELESS
 +	gelicw_down(netdev);
 +#endif
- 	netif_poll_disable(netdev);
++
  	netif_stop_queue(netdev);
  
+ 	/* turn off DMA, force end */
 @@ -1067,6 +1070,9 @@ static irqreturn_t gelic_net_interrupt(i
  		gelic_net_kick_txdma(card, card->tx_chain.tail);
  		spin_unlock_irqrestore(&card->tx_dma_lock, flags);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- sources	1 Sep 2007 00:32:50 -0000	1.641
+++ sources	1 Sep 2007 16:29:55 -0000	1.642
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-cb7b0d6e6424f31ba41b9ba304b69833  patch-2.6.23-rc4.bz2
-549f9a03a741881b70a4bae593246b22  patch-2.6.23-rc4-git3.bz2
+8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- upstream	1 Sep 2007 00:32:50 -0000	1.563
+++ upstream	1 Sep 2007 16:29:55 -0000	1.564
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4-git3.bz2
+patch-2.6.23-rc5.bz2


--- linux-2.6-vesa-reg-clobber.patch DELETED ---


--- patch-2.6.23-rc4-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 16:33:08 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 1 Sep 2007 12:33:08 -0400
Subject: rpms/jd/devel .cvsignore, 1.140, 1.141 jd.spec, 1.166, 1.167 sources,
	1.141, 1.142
Message-ID: <200709011633.l81GX8MT021562@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21540

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
- svn 1304



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore	30 Aug 2007 06:43:07 -0000	1.140
+++ .cvsignore	1 Sep 2007 16:32:36 -0000	1.141
@@ -1 +1 @@
-jd-1.9.6-svn1294.tgz
+jd-1.9.6-svn1304.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- jd.spec	30 Aug 2007 06:50:14 -0000	1.166
+++ jd.spec	1 Sep 2007 16:32:36 -0000	1.167
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1294
+%define         strtag        svn1304
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -44,7 +44,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}.1
+Release:        %{rel}
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -84,8 +84,6 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-%{__cp} -p jd.png src/icons/jd96.png
-
 %{__make} %{?_smp_mflags}
 
 %install
@@ -121,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1294
-- svn 1294
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
+- svn 1304
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	30 Aug 2007 06:43:07 -0000	1.141
+++ sources	1 Sep 2007 16:32:36 -0000	1.142
@@ -1 +1 @@
-c41fe3b983317b842a40c44c53849958  jd-1.9.6-svn1294.tgz
+60cc39b08265a902ce8d7f561715b389  jd-1.9.6-svn1304.tgz



From fedora-extras-commits at redhat.com  Sat Sep  1 16:34:38 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sat, 1 Sep 2007 12:34:38 -0400
Subject: rpms/kernel/devel linux-2.6-libata-terminate-list.patch, NONE,
	1.1 kernel.spec, 1.142, 1.143
Message-ID: <200709011634.l81GYcOQ021643@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21620

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-terminate-list.patch 
Log Message:
* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
- Terminate list in ata-piix


linux-2.6-libata-terminate-list.patch:

--- NEW FILE linux-2.6-libata-terminate-list.patch ---

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e40c94f..3b8bf18 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -955,7 +955,8 @@ static int piix_broken_suspend(void)
 				DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
 			},
 		},
-		{ }
+
+		{ }	/* terminate list */
 	};
 	static const char *oemstrs[] = {
 		"Tecra M3,",
@@ -1187,6 +1188,8 @@ static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
 				DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
 			},
 		},
+
+		{ }	/* terminate list */
 	};
 	u32 iocfg;
 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kernel.spec	1 Sep 2007 16:29:55 -0000	1.142
+++ kernel.spec	1 Sep 2007 16:34:06 -0000	1.143
@@ -623,6 +623,7 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
+Patch662: linux-2.6-libata-terminate-list.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1116,6 +1117,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
+# Terminate list in ata-piix
+ApplyPatch linux-2.6-libata-terminate-list.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1782,6 +1785,9 @@
 
 %changelog
 * Sat Sep 01 2007 Dave Jones <davej at redhat.com>
+- Terminate list in ata-piix
+
+* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc5
 
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Sat Sep  1 16:55:17 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat, 1 Sep 2007 12:55:17 -0400
Subject: rpms/snort/F-7 snort-2.7.0.1-glibc.patch, NONE, 1.1 snort.spec, 1.23,
	1.24 sources, 1.8, 1.9
Message-ID: <200709011655.l81GtHOM022397@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22262

Modified Files:
	snort.spec sources 
Added Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
 update to 2.7.0.1 includes move to alternatives.  needs lots of testing 


snort-2.7.0.1-glibc.patch:

--- NEW FILE snort-2.7.0.1-glibc.patch ---
diff -ur snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c
--- snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c	2007-07-03 15:41:53.000000000 -0500
+++ snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c	2007-08-31 23:37:33.000000000 -0500
@@ -346,7 +346,7 @@
 
     /* open this description, create it if necessary, always wait on
      * sync to disk w/ every write, only write */
-    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
+    fd = open(filename, O_CREAT, 0660|O_TRUNC|O_SYNC|O_WRONLY);
 
     if(fd < 0)
     {
diff -ur snort-2.7.0.1-orig/src/util.c snort-2.7.0.1/src/util.c
--- snort-2.7.0.1-orig/src/util.c	2007-07-03 15:41:31.000000000 -0500
+++ snort-2.7.0.1/src/util.c	2007-08-31 23:37:41.000000000 -0500
@@ -1841,7 +1841,7 @@
     close(2);
 
 #ifdef DEBUG
-    open("/tmp/snort.debug", O_CREAT | O_RDWR);
+    open("/tmp/snort.debug", O_CREAT, 0660 | O_RDWR);
 #else
     open("/dev/null", O_RDWR);
 #endif


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/snort.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- snort.spec	19 Feb 2007 21:36:01 -0000	1.23
+++ snort.spec	1 Sep 2007 16:54:38 -0000	1.24
@@ -1,24 +1,20 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.1.3
-Release:        1%{?dist}
-License:        GPL
+Version:        2.7.0.1
+Release:        3%{?dist}
+License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
-Source2:	README.fedora
-Patch0:		snort-2.4.3-configure64.patch
+Source2:        README.fedora
+Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Prefix:         /usr
 Requires:       libpcap >= 0.4
-%if "%{?fedora}" <= "5"
-BuildRequires:  libpcap >= 0.4
-%else
 BuildRequires:  libpcap-devel >= 0.4
-%endif
 BuildRequires:  perl
 BuildRequires:  pcre-devel
+BuildRequires:  sed
 
 %package        plain+flexresp
 Summary:        Snort with Flexible Response
@@ -86,7 +82,7 @@
 attacks and probes, such as buffer overflows, stealth port scans,
 CGI attacks, SMB probes, OS fingerprinting attempts, and much more.
 Snort has a real-time alerting capabilty, with alerts being sent to syslog,
-a seperate "alert" file, or as a WinPopup message via Samba's smbclient
+a separate "alert" file, or as a WinPopup message via Samba's smbclient
 
 Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort
 
@@ -147,14 +143,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+%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
 
 %build
 
-SNORT_BASE_CONFIG="--prefix=%{_prefix} \
-                   --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap \
+SNORT_BASE_CONFIG="--with-libpcap-includes=/usr/include/pcap \
                    --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
@@ -188,6 +184,7 @@
 # mysql+flexresp
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -200,6 +197,7 @@
 # mysql
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                              --with-mysql-libraries=%{_libdir}/mysql \
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
@@ -265,6 +263,7 @@
 # bloat
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -281,7 +280,7 @@
 
 %install
 if [ -d %{buildroot} ]; then
-	rm -rf %{buildroot}
+        rm -rf %{buildroot}
 fi
 
 mkdir -p %{buildroot}%{_sysconfdir}/snort
@@ -307,24 +306,17 @@
 install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
 install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
 
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-
-
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-
-install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns'; do
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+done
 
 }
 
 install snort.8 %{buildroot}%{_mandir}/man8
 install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
-install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
+install -p -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
 perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
@@ -332,55 +324,121 @@
 
 %clean
 if [ -d %{buildroot} ]; then
-	rm -rf %{buildroot}
+         rm -rf %{buildroot}
 fi
 
 
 %post
-# make a symlink if there is no link
-ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
 /sbin/ldconfig
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-plain 10
+fi
 
 
 %preun
 /etc/rc.d/init.d/snortd stop
 if [ $1 = 0 ] ; then
    /sbin/chkconfig --del snortd
-   if [ -L %{_sbindir}/snort ]; then rm %{_sbindir}/snort; fi
+   %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain
 fi
 
 
 %post plain+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-plain+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-plain+flexresp 20
+fi
+
+%postun plain+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain+flexresp 
+fi
 
 
 %post mysql
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-mysql 30
+fi
+
+%postun mysql
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql
+fi
 
 
 %post mysql+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-mysql+flexresp 40
+fi
+
+%postun mysql+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql+flexresp
+fi
 
 
 %post postgresql
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-postgresql 50
+fi
+
+%postun postgresql
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql
+fi
 
 
 %post postgresql+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-postgresql+flexresp 60
+fi
+
+%postun postgresql+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql+flexresp
+fi
 
 
 %post snmp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-snmp 60
+fi
+
+%postun snmp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp 
+fi
 
 
 %post snmp+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-snmp+flexresp 70
+fi
+
+%postun snmp+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp+flexresp 
+fi
 
 
 %post bloat
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-bloat %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-bloat 80
+fi
+
+%postun bloat
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-bloat 
+fi
 
 
 %files
@@ -421,6 +479,22 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-3
+- fix for glibc open
+
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
+- fix detection of mysql and libnet10
+
+* Mon Aug 27 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-1
+- update to 2.7.0.1
+
+* Thu Jun 14 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.4-2
+- remove the release conditionals
+
+* Sun May 06 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.4-1
+- update to 2.6.1.4 
+- use alternatives
+
 * Mon Feb 19 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.3-1
 - update to 2.6.1.3 which fixes CVE-2006-5276
 
@@ -510,7 +584,7 @@
 - moved /var/snort/dev/null creation to install time
 
 * Tue Nov 21 2000 Chris Green <cmg at uab.edu>
-- changed to %{SnortPrefix}
+- changed to %%{SnortPrefix}
 - upgrade to patch2
 
 * Mon Jul 31 2000 Wim Vandersmissen <wim at bofh.st>
@@ -523,9 +597,9 @@
 
 * Sat Jul 22 2000 Wim Vandersmissen <wim at bofh.st>
 - Updated to version 1.6.3
-- Fixed the user/group stuff (moved to %post)
-- Added userdel/groupdel to %postun
-- Automagically adds the right IP, nameservers to %{_sysconfdir}/rules.base
+- Fixed the user/group stuff (moved to %%post)
+- Added userdel/groupdel to %%postun
+- Automagically adds the right IP, nameservers to %%{_sysconfdir}/rules.base
 
 * Sat Jul 08 2000 Dave Wreski <dave at linuxsecurity.com>
 - Updated to version 1.6.2
@@ -543,7 +617,7 @@
 - Fixed permissions on /var/log/snort
 - Created /var/log/snort/archive for archival of snort logs
 - Added post/preun to add/remove snortd to/from rc?.d directories
-- Defined configuration files as %config
+- Defined configuration files as %%config
 
 * Tue Mar 28 2000 William Stearns <wstearns at pobox.com>
 - Quick update to 1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Feb 2007 21:36:01 -0000	1.8
+++ sources	1 Sep 2007 16:54:38 -0000	1.9
@@ -1 +1 @@
-8b46997afd728fbdaafdc9b1d0278b07  snort-2.6.1.3.tar.gz
+06d3fa0b326dcdca59a19811f32b013a  snort-2.7.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 17:41:04 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 1 Sep 2007 13:41:04 -0400
Subject: rpms/kdelibs/F-7 kdelibs.spec,1.219,1.220
Message-ID: <200709011741.l81Hf4Bi030239@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/F-7

Modified Files:
	kdelibs.spec 
Log Message:
Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict (allows using the old /opt/kde4 versions for now)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kdelibs.spec	23 Aug 2007 15:13:43 -0000	1.219
+++ kdelibs.spec	1 Sep 2007 17:40:32 -0000	1.220
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -164,7 +164,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Conflicts: kdelibs4-devel
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -522,6 +521,10 @@
 
 
 %changelog
+* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
+- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
+  (allows using the old /opt/kde4 versions for now)
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
 - vcard30 patch (kde#115219,rh#253496)
 - -devel: restore awol Requires (< f8 only) (#253801)



From fedora-extras-commits at redhat.com  Sat Sep  1 17:41:07 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 1 Sep 2007 13:41:07 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.232,1.233
Message-ID: <200709011741.l81Hf7It030242@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel

Modified Files:
	kdelibs.spec 
Log Message:
Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict (allows using the old /opt/kde4 versions for now)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kdelibs.spec	23 Aug 2007 14:39:59 -0000	1.232
+++ kdelibs.spec	1 Sep 2007 17:40:35 -0000	1.233
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -164,7 +164,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Conflicts: kdelibs4-devel
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -522,6 +521,10 @@
 
 
 %changelog
+* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
+- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
+  (allows using the old /opt/kde4 versions for now)
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
 - vcard30 patch (kde#115219,rh#253496)
 - -devel: restore awol Requires (< f8 only) (#253801)



From fedora-extras-commits at redhat.com  Sat Sep  1 17:56:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 01 Sep 2007 10:56:12 -0700
Subject: [pkgdb] libmodplug (Fedora EPEL, 5) updated by kevin
Message-ID: <200709011756.l81HuDnl031187@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libmodplug
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libmodplug (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libmodplug (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libmodplug (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:58 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011803.l81I3wQO031294@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:10 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4AId031307@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:11 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4BhI031316@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:18 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:18 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4IwW031327@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:19 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:19 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4JfW031337@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:57 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4LR1011336@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:59 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:59 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4Nqw011345@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:03 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4OfZ011354@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:13 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:13 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4PWX011363@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:14 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:14 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4QJr011373@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:21 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:21 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4RQn011391@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:20 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4Rsr011382@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:39 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4eTg011404@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:40 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:40 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4fJt031356@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:41 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4gx3011413@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:56 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4uPt031371@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:03 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I53pt031381@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 5) to Obsolete for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:05 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I55nx011423@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:06 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:06 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I56jW031391@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:07 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:07 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I572q011437@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:09 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:09 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I59Ld031400@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:10 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5Bfh011446@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:11 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5CXt031410@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:27 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5RcQ031422@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:27 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5SNI011455@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:28 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5SLj031431@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:46 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:46 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5l69031441@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:47 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:47 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5ltq011477@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:49 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5nlf031451@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:52 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:52 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5qFj011486@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:53 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:53 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5rVR031460@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:54 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:54 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5sAc011495@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:56 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5u1D031469@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:57 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5vbR011509@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:58 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5wC0031479@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:01 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I61OI011519@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:02 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:02 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I623B031488@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:03 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I63Mn011528@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:22 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:22 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6MXX031499@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:21 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:21 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6LnJ011538@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:23 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:23 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6NtF011551@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:25 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:25 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6PNh031512@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:27 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6SU2011568@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:30 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Uc5031537@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:29 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Trn011581@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:28 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Shx031524@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:35 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6ZnU031549@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:37 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6bpc031561@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:41 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6fTR031574@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:43 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:43 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6h96031586@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:58 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I6wB9031599@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:03 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011807.l81I73Yq031609@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:11 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011807.l81I7BMs031618@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:13 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:13 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011807.l81I7DIX031628@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:37 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7bKM031640@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:39 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7d9q031649@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora devel) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:42 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:42 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7gGf031658@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:44 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:44 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7jOi031668@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:48 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:48 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7mGV031677@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:51 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7pPb031686@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:55 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:55 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7ts8031696@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:58 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7wGL031705@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora 7) to Approved for Patrice Dumas (pertusus)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 18:08:06 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Sat, 1 Sep 2007 14:08:06 -0400
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.4,1.5
Message-ID: <200709011808.l81I86r0005365@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-doxia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342

Modified Files:
	maven-doxia.spec 
Log Message:

- Rebuild without maven (fpr initial ppc build)




Index: maven-doxia.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-doxia.spec	20 Mar 2007 21:58:46 -0000	1.4
+++ maven-doxia.spec	1 Sep 2007 18:07:33 -0000	1.5
@@ -33,6 +33,9 @@
 
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
+
+%define _without_maven 1
+
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -40,7 +43,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.1.a7.3jpp.3%{?dist}
+Release:        0.1.a7.3jpp.4%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        Apache Software License
@@ -275,6 +278,9 @@
 %endif
 
 %changelog
+* Sat Sep 01 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.4
+- Rebuild without maven (fpr initial ppc build)
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.3
 - Added switch to ignore failures for the time being
 



From fedora-extras-commits at redhat.com  Sat Sep  1 18:12:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  1 Sep 2007 14:12:30 -0400
Subject: fedora-security/audit fc7,1.88,1.89
Message-ID: <200709011812.l81ICU1V006286@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6162

Modified Files:
	fc7 
Log Message:
Fix some typos



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fc7	1 Sep 2007 06:21:24 -0000	1.88
+++ fc7	1 Sep 2007 18:12:28 -0000	1.89
@@ -365,7 +365,7 @@
 CVE-2007-0777 version (seamonkey, fixed 1.0.8)
 CVE-2007-0775 version (seamonkey, fixed 1.0.8)
 *CVE-2007-0774 (mod_jk)
-VE-2007-0772 version (kernel, fixed 2.6.20.1) [since FEDORA-2007-291]
+CVE-2007-0772 version (kernel, fixed 2.6.20.1) [since FEDORA-2007-291]
 CVE-2007-0771 patch (kernel, fixed 2.6.20-1.2933) #227952
 CVE-2007-0770 patch (GraphicsMagick, fixed 1.1.7-7) #228758
 CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456
@@ -608,7 +608,7 @@
 CVE-2006-5330 ignore, no-ship (flash-plugin)
 *CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 *CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
-VE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 *CVE-2006-5276 VULNERABLE (snort) #229265
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 backport (xorg-x11-xinit) #212167 [since FEDORA-2007-1409]
@@ -1242,7 +1242,7 @@
 *CVE-2006-0017 (fedora directory server)
 *CVE-2006-0016 (fedora directory server)
 *CVE-2005-4838 (tomcat)
-VE-2005-4837 version (net-snmp, fixed 5.2.2)
+CVE-2005-4837 version (net-snmp, fixed 5.2.2)
 *CVE-2005-4836 (tomcat)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 VULNERABLE (firefox)
@@ -1381,7 +1381,7 @@
 *CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 version (poppler, fixed 0.4.4)
 CVE-2005-3191 version (kdegraphics, fixed 3.5.1)
-VE-2005-3191 version (cups, fixed 1.2.0)
+CVE-2005-3191 version (cups, fixed 1.2.0)
 *CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -1400,7 +1400,7 @@
 CVE-2005-3107 version (kernel, fixed 2.6.11)
 CVE-2005-3106 version (kernel, fixed 2.6.11)
 CVE-2005-3105 version (kernel, fixed 2.6.12)
-VE-2005-3089 version (firefox, fixed 1.0.7)
+CVE-2005-3089 version (firefox, fixed 1.0.7)
 CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped
 CVE-2005-3055 version (kernel, fixed 2.6.14)
 CVE-2005-3054 ignore (php)
@@ -2724,7 +2724,7 @@
 CVE-2002-0069 version (squid, fixed 2.4STABLE4)
 CVE-2002-0068 version (squid, fixed 2.4STABLE4)
 CVE-2002-0067 version (squid, fixed 2.4STABLE4)
-VE-2002-0063 version (cups, fixed 1.1.14)
+CVE-2002-0063 version (cups, fixed 1.1.14)
 CVE-2002-0062 version (ncurses, only 5.0)
 CVE-2002-0060 version (kernel, fixed 2.5.5)
 *CVE-2002-0059 ** zlib (cvs, dump, gcc, libgcj, kernel, vnc)



From fedora-extras-commits at redhat.com  Sat Sep  1 18:26:48 2007
From: fedora-extras-commits at redhat.com (Florian La Roche (laroche))
Date: Sat, 1 Sep 2007 14:26:48 -0400
Subject: devel/asciidoc .cvsignore, 1.3, 1.4 asciidoc.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200709011826.l81IQmEw006548@cvs-int.fedora.redhat.com>

Author: laroche

Update of /cvs/extras/devel/asciidoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6514

Modified Files:
	.cvsignore asciidoc.spec sources 
Log Message:
- 8.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/asciidoc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Mar 2007 01:49:21 -0000	1.3
+++ .cvsignore	1 Sep 2007 18:26:15 -0000	1.4
@@ -1 +1 @@
-asciidoc-8.1.0.tar.gz
+asciidoc-8.2.2.tar.gz


Index: asciidoc.spec
===================================================================
RCS file: /cvs/extras/devel/asciidoc/asciidoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- asciidoc.spec	20 Mar 2007 01:49:21 -0000	1.5
+++ asciidoc.spec	1 Sep 2007 18:26:15 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Text based document generation
 Name: asciidoc
-Version: 8.1.0
+Version: 8.2.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -68,6 +68,9 @@
 %doc README BUGS CHANGELOG COPYRIGHT doc examples
 
 %changelog
+* Sat Sep 01 2007 Florian La Roche <laroche at redhat.com> - 8.2.2-1
+- new upstream version 8.2.2
+
 * Mon Mar 19 2007 Chris Wright <chrisw at redhat.com> - 8.1.0-1
 - update to asciidoc 8.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/asciidoc/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Mar 2007 01:49:21 -0000	1.3
+++ sources	1 Sep 2007 18:26:15 -0000	1.4
@@ -1 +1 @@
-6d3e050b72a8b6df112c2f9aad7a4016  asciidoc-8.1.0.tar.gz
+58d8a0761608da6bfa7af3e886c05592  asciidoc-8.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 18:49:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  1 Sep 2007 14:49:39 -0400
Subject: fedora-security/audit epel4,NONE,1.1 epel5,NONE,1.1
Message-ID: <200709011849.l81IndoP007028@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7006

Added Files:
	epel4 epel5 
Log Message:
Initial epel4 and epel5 audit files to check.



--- NEW FILE epel4 ---
#
# ** are items that need attention
# *CVE are items that need verification for EPEL-4
# (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)

# Up to date CVE as of CVE email 20070829
# Up to date EPEL4 as of 
#
*CVE-2007-4631 VULNERABLE (qgit) #268381
*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
*CVE-2007-4560 VULNERABLE (clamav) #260583
*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
*CVE-2007-4400 VULNERABLE (konversation) #253545
*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3725 ** (clamav)
*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3113 VULNERABLE (cacti) #243592
*CVE-2007-3112 VULNERABLE (cacti) #243592
*CVE-2007-3025 ignore (clamav, Solaris only)
*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2958 VULNERABLE (claws-mail) #254121
*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
*CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
*CVE-2007-2165 VULNERABLE (proftpd) #237533
*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
*CVE-2007-1997 version (clamav, fixed in 0.90.2)
*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
*CVE-2007-1558 version (claws-mail, fixed 2.9.1) #237293
*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1055 version (mediawiki, fixed 1.8.3)
*CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0898 version (clamav, fixed 0.90) #229202
*CVE-2007-0897 version (clamav, fixed 0.90) #229202
*CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
*CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
*CVE-2006-6481 version (clamav, fixed 0.88.7)
*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
*CVE-2006-6374 ** (phpMyAdmin) #218853
*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-5874 version (clamav, fixed 0.88.1)
*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4684 version (zope, fixed 2.9.2)
*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
*CVE-2006-4248 ignore (thttpd, Debian specific issue)
*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
*CVE-2006-2489 version (nagios, fixed 2.3.1)
*CVE-2006-2427 ignore (clamav) not an issue bz#192076
*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
*CVE-2006-2017 version (dnsmasq, fixed 2.30)
*CVE-2006-1989 version (clamav, fixed 0.88.2)
*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
*CVE-2006-0162 version (clamav, fixed 0.88)
*CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
*CVE-2006-0106 version (wine, fixed 0.9.10)
*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
*CVE-2005-4803 version (graphviz, fixed 2.2.1)
*CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)


--- NEW FILE epel5 ---
#
# ** are items that need attention
# *CVE are items that need verification for EPEL-5
# (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)

# Up to date CVE as of CVE email 20070829
# Up to date EPEL5 as of 
#
*CVE-2007-4631 VULNERABLE (qgit) #268381
*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
*CVE-2007-4560 VULNERABLE (clamav) #260583
*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
*CVE-2007-4400 VULNERABLE (konversation) #253545
*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3725 ** (clamav)
*CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
*CVE-2007-3528 version (dar, fixed 2.3.4) #246760 [since FEDORA-2007-0904]
*CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3113 VULNERABLE (cacti) #243592
*CVE-2007-3112 VULNERABLE (cacti) #243592
*CVE-2007-3025 ignore (clamav, Solaris only)
*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
*CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
*CVE-2007-2165 VULNERABLE (proftpd) #237533
*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
*CVE-2007-1997 version (clamav, fixed in 0.90.2)
*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1515 version (imp, fixed 4.1.4)
*CVE-2007-1474 version (horde, fixed 3.1.4)
*CVE-2007-1474 ignore (imp, < 4.x only)
*CVE-2007-1473 version (horde, fixed 3.1.4)
*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1263 version (gpgme, fixed 1.1.4)
*CVE-2007-1055 version (mediawiki, fixed 1.8.3)
*CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0898 version (clamav, fixed 0.90) #229202
*CVE-2007-0897 version (clamav, fixed 0.90) #229202
*CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
*CVE-2007-0469 version (rubygems, fixed 0.9.1)
*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
*CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
*CVE-2006-6481 version (clamav, fixed 0.88.7)
*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
*CVE-2006-6374 ** (phpMyAdmin) #218853
*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
*CVE-2006-6235 patch (gnupg2, fixed 2.0.1-2) #218821
*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6169 version (gnupg2, fixed 2.0.1) #217950
*CVE-2006-6085 version (kile, fixed 1.9.3) #217238
*CVE-2006-5874 version (clamav, fixed 0.88.1)
*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
*CVE-2006-5111 version (libksba, fixed 0.9.14)
*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4684 version (zope, fixed 2.9.2)
*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
*CVE-2006-4248 ignore (thttpd, Debian specific issue)
*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
*CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
*CVE-2006-2489 version (nagios, fixed 2.3.1)
*CVE-2006-2427 ignore (clamav) not an issue bz#192076
*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
*CVE-2006-2017 version (dnsmasq, fixed 2.30)
*CVE-2006-1989 version (clamav, fixed 0.88.2)
*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
*CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
*CVE-2006-0162 version (clamav, fixed 0.88)
*CVE-2006-0106 version (wine, fixed 0.9.10)
*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
*CVE-2005-4803 version (graphviz, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Sat Sep  1 20:04:10 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 1 Sep 2007 16:04:10 -0400
Subject: rpms/fwfstab/devel fwfstab.spec,1.5,1.6
Message-ID: <200709012004.l81K4ACf022039@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014

Modified Files:
	fwfstab.spec 
Log Message:
* Sat Sep 1 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-6
- /still/ not working, perhaps I do need python as a BR




Index: fwfstab.spec
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/devel/fwfstab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwfstab.spec	28 Aug 2007 15:06:20 -0000	1.5
+++ fwfstab.spec	1 Sep 2007 20:03:37 -0000	1.6
@@ -1,10 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%{!?fedoraver: %define fedoraver  %(test -e /etc/fedora-release && rpm -q fedora-release --qf "%{VERSION}")}
-
 Name:        fwfstab
 Version:     0.01.1
-Release:     5%{?dist}
+Release:     6%{?dist}
 BuildArch:   noarch
 Summary:     A graphical file system table editor
 
@@ -16,6 +14,8 @@
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   desktop-file-utils
+BuildRequires:   python-devel >= 2.4
+Requires:        python >= 2.4
 Requires:        pygtk2 pygtk2-libglade
 Requires:        redhat-artwork usermode
 
@@ -80,6 +80,9 @@
 %doc README COPYING CHANGELOG
 
 %changelog
+* Sat Sep 1 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-6
+- /still/ not working, perhaps I do need python as a BR
+
 * Tue Aug 28 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-5
 - Rebuild because of bad file locations
 



From fedora-extras-commits at redhat.com  Sat Sep  1 20:19:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 01 Sep 2007 13:19:59 -0700
Subject: [pkgdb] gkrellm: scop has requested watchcommits
Message-ID: <200709012019.l81KJxv9000358@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on gkrellm (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:10 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRAFg000408@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on gkrellm (Fedora devel) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:26 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:26 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRQLu000417@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on gkrellm (Fedora 7) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:29 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:29 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRTVm000426@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on gkrellm (Fedora 7) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 21:39:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 14:39:46 -0700
Subject: [pkgdb] nco: pertusus has requested commit
Message-ID: <200709012139.l81LdlYM000969@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on nco (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 21:39:49 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 14:39:49 -0700
Subject: [pkgdb] nco: pertusus has requested watchbugzilla
Message-ID: <200709012139.l81Ldniw000978@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on nco (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  1 21:59:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 1 Sep 2007 17:59:58 -0400
Subject: rpms/libmpcdec/EL-4 .cvsignore, 1.3, 1.4 libmpcdec.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200709012159.l81LxwRY031299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmpcdec/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31277

Modified Files:
	.cvsignore libmpcdec.spec sources 
Log Message:
* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
- libmpcdec-1.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2006 14:29:40 -0000	1.3
+++ .cvsignore	1 Sep 2007 21:59:25 -0000	1.4
@@ -1,2 +1,2 @@
-clog
 libmpcdec-1.2.2.tar.bz2
+libmpcdec-1.2.6.tar.bz2


Index: libmpcdec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/libmpcdec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmpcdec.spec	8 Dec 2006 14:31:37 -0000	1.5
+++ libmpcdec.spec	1 Sep 2007 21:59:25 -0000	1.6
@@ -1,13 +1,13 @@
 
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
-Version: 1.2.2
-Release: 4%{?dist}.1
+Version: 1.2.6
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
-Source:	 http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
+Source0: http://files.musepack.net/source/libmpcdec-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -62,12 +62,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/*
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
+- libmpcdec-1.2.6
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-4
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Apr 2006 18:02:00 -0000	1.2
+++ sources	1 Sep 2007 21:59:25 -0000	1.3
@@ -1 +1 @@
-f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2
+7f7a060e83b4278acf4b77d7a7b9d2c0  libmpcdec-1.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 22:01:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 1 Sep 2007 18:01:12 -0400
Subject: rpms/libmpcdec/EL-5 .cvsignore, 1.2, 1.3 libmpcdec.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709012201.l81M1Cto004823@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmpcdec/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401

Modified Files:
	.cvsignore libmpcdec.spec sources 
Log Message:
* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
- libmpcdec-1.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Apr 2006 18:02:00 -0000	1.2
+++ .cvsignore	1 Sep 2007 22:00:39 -0000	1.3
@@ -1 +1,2 @@
 libmpcdec-1.2.2.tar.bz2
+libmpcdec-1.2.6.tar.bz2


Index: libmpcdec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/libmpcdec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmpcdec.spec	29 Aug 2006 18:08:41 -0000	1.4
+++ libmpcdec.spec	1 Sep 2007 22:00:39 -0000	1.5
@@ -1,13 +1,13 @@
 
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
-Version: 1.2.2
-Release: 4%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
-Source:	 http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
+Source0: http://files.musepack.net/source/libmpcdec-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -62,12 +62,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/*
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
+- libmpcdec-1.2.6
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-4
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Apr 2006 18:02:00 -0000	1.2
+++ sources	1 Sep 2007 22:00:39 -0000	1.3
@@ -1 +1 @@
-f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2
+7f7a060e83b4278acf4b77d7a7b9d2c0  libmpcdec-1.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 22:22:06 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 18:22:06 -0400
Subject: rpms/tango-icon-theme/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tango-icon-theme.spec, 1.3, 1.4
Message-ID: <200709012222.l81MM6d4005215@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5174

Modified Files:
	.cvsignore sources tango-icon-theme.spec 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2007 03:29:01 -0000	1.3
+++ .cvsignore	1 Sep 2007 22:21:33 -0000	1.4
@@ -1 +1 @@
-tango-icon-theme-0.8.0.tar.bz2
+tango-icon-theme-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2007 03:29:01 -0000	1.3
+++ sources	1 Sep 2007 22:21:33 -0000	1.4
@@ -1 +1 @@
-0bb6a808b514a530adb6fe54e9e3b004  tango-icon-theme-0.8.0.tar.bz2
+32d5258f448b5982af9cfa4364f31d41  tango-icon-theme-0.8.1.tar.gz


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tango-icon-theme.spec	1 Mar 2007 03:29:01 -0000	1.3
+++ tango-icon-theme.spec	1 Sep 2007 22:21:33 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		tango-icon-theme
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
@@ -9,7 +9,7 @@
 Group:		User Interface/Desktops
 URL:		http://tango-project.org/
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.bz2
+Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+- Update to new upstream release (0.8.1)
+
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1
 - Update to new upstream release (0.8.0).
 - Fix URL, and some other whitespace issues in the spec.



From fedora-extras-commits at redhat.com  Sat Sep  1 22:24:13 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 18:24:13 -0400
Subject: rpms/tango-icon-theme/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tango-icon-theme.spec, 1.3, 1.4
Message-ID: <200709012224.l81MODC3005331@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309

Modified Files:
	.cvsignore sources tango-icon-theme.spec 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2007 03:29:01 -0000	1.3
+++ .cvsignore	1 Sep 2007 22:23:41 -0000	1.4
@@ -1 +1 @@
-tango-icon-theme-0.8.0.tar.bz2
+tango-icon-theme-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2007 03:29:01 -0000	1.3
+++ sources	1 Sep 2007 22:23:41 -0000	1.4
@@ -1 +1 @@
-0bb6a808b514a530adb6fe54e9e3b004  tango-icon-theme-0.8.0.tar.bz2
+32d5258f448b5982af9cfa4364f31d41  tango-icon-theme-0.8.1.tar.gz


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/tango-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tango-icon-theme.spec	1 Mar 2007 03:29:01 -0000	1.3
+++ tango-icon-theme.spec	1 Sep 2007 22:23:41 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		tango-icon-theme
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
@@ -9,7 +9,7 @@
 Group:		User Interface/Desktops
 URL:		http://tango-project.org/
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.bz2
+Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+- Update to new upstream release (0.8.1)
+
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1
 - Update to new upstream release (0.8.0).
 - Fix URL, and some other whitespace issues in the spec.



From fedora-extras-commits at redhat.com  Sun Sep  2 01:01:13 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:01:13 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchbugzilla
Message-ID: <200709020101.l8211GTi002529@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 01:03:49 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:03:49 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchcommits
Message-ID: <200709020103.l8213nEJ002555@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchcommits acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 01:06:30 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:06:30 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchbugzilla
Message-ID: <200709020106.l8216Uf7002589@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 01:06:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:06:35 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has given up watchcommits
Message-ID: <200709020106.l8216ZV1002598@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has given up the watchcommits acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 01:57:15 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 21:57:15 -0400
Subject: rpms/deluge/devel deluge-use-mt-boost.patch,1.1,1.2
Message-ID: <200709020157.l821vFgE026695@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26674

Modified Files:
	deluge-use-mt-boost.patch 
Log Message:
Sync use-mt-boost patch with version 0.5.4.1 setup script.

deluge-use-mt-boost.patch:

Index: deluge-use-mt-boost.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge-use-mt-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-use-mt-boost.patch	4 Aug 2007 19:23:57 -0000	1.1
+++ deluge-use-mt-boost.patch	2 Sep 2007 01:57:12 -0000	1.2
@@ -1,14 +1,14 @@
---- ./setup.py.old	2007-08-04 10:55:23.000000000 -0700
-+++ ./setup.py	2007-08-04 11:03:52.000000000 -0700
-@@ -110,10 +110,7 @@ if not OS == "win":
+--- setup.py.old	2007-09-01 18:43:32.000000000 -0700
++++ setup.py	2007-09-01 18:45:34.000000000 -0700
+@@ -110,10 +110,7 @@
                       '/usr/include/python' + python_version]
  
- 	if OS == "linux":
--		if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)" /etc/issue')) == 0:
--			boosttype = 'nomt'
--		else:
--			boosttype = 'mt'
-+		boosttype = 'mt'
- 	elif OS == "freebsd":
- 		boosttype = 'nomt'
- 	else:
+     if OS == "linux":
+-        if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0:
+-            boosttype = 'nomt'
+-        else:
+-            boosttype = 'mt'
++        boosttype = 'mt'
+     elif OS == "freebsd":
+         boosttype = 'nomt'
+     else:



From fedora-extras-commits at redhat.com  Sun Sep  2 02:06:52 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 22:06:52 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.6,1.7
Message-ID: <200709020206.l8226qnG000367@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv343

Modified Files:
	python-TestGears.spec 
Log Message:
- Remove the .pth file (setuptools will generate its own otherwise it's
  unneeded.)
- Fix directory ownership.



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-TestGears.spec	10 Dec 2006 06:12:32 -0000	1.6
+++ python-TestGears.spec	2 Sep 2007 02:06:19 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-TestGears
 Version:        0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Unit testing for Python
 
 Group:          Development/Languages
@@ -30,25 +30,22 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-echo "TestGears-%{version}-py%{pyver}.egg-info" > %{buildroot}%{python_sitelib}/TestGears.pth
-
-echo '%defattr (0644,root,root,0755)' > pyfiles
-find %{buildroot}%{python_sitelib} -type d | \
-    sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
-find %{buildroot}%{python_sitelib} -not -type d -name '*.py*' | \
-    sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f pyfiles
-%defattr(-,root,root,-)
+%files
+%defattr(0644,root,root,0755)
 %doc docs LICENSE.txt TODO.txt
-%{python_sitelib}/TestGears-%{version}-py%{pyver}.egg-info/*
-%{python_sitelib}/TestGears.pth
+%{python_sitelib}/*
 
 %changelog
+* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-5
+- Remove the .pth file (setuptools will generate its own otherwise it's
+  unneeded.)
+- Fix directory ownership.
+
 * Sun Dec 10 2006 Luke Macken <lmacken at redhat.com> 0.2-4
 - Rebuld for python 2.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 02:14:40 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 22:14:40 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.9, 1.10 deluge.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709020214.l822EegE000436@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv411

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Jul 2007 02:45:37 -0000	1.9
+++ .cvsignore	2 Sep 2007 02:14:06 -0000	1.10
@@ -1 +1 @@
-deluge-0.5.3.tar.gz
+deluge-0.5.4.1.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- deluge.spec	26 Jul 2007 03:13:27 -0000	1.19
+++ deluge.spec	2 Sep 2007 02:14:06 -0000	1.20
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.3
+Version:	0.5.4.1
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
+- Update to new upstream release (0.5.4.1). 
+
 * Wed Jul 25 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.3-1
 - Update to new upstream release candidate (0.5.3)
 - Drop %%ifarch invocations for 64-bit builds. The internal setup script now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Jul 2007 02:45:37 -0000	1.9
+++ sources	2 Sep 2007 02:14:06 -0000	1.10
@@ -1 +1 @@
-382141fdf1c55dc75a183da02d2239fb  deluge-0.5.3.tar.gz
+36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  2 03:02:26 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:02:26 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.7,1.8
Message-ID: <200709020302.l8232Q2g007365@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7335

Modified Files:
	python-TestGears.spec 
Log Message:
* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-6
- python-setuptools change for rawhide.



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-TestGears.spec	2 Sep 2007 02:06:19 -0000	1.7
+++ python-TestGears.spec	2 Sep 2007 03:01:53 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           python-TestGears
 Version:        0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Unit testing for Python
 
 Group:          Development/Languages
@@ -14,7 +14,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools
+BuildRequires:  python-devel
+%if 0%{fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 TestGears provides automatic discovery of unittest.TestCases and the ability
@@ -41,6 +46,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-6
+- python-setuptools change for rawhide.
+
 * Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-5
 - Remove the .pth file (setuptools will generate its own otherwise it's
   unneeded.)



From fedora-extras-commits at redhat.com  Sun Sep  2 03:03:38 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:03:38 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.8,1.9
Message-ID: <200709020303.l8233cao007447@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7377

Modified Files:
	python-TestGears.spec 
Log Message:
Remember to make %{fedora} optional %{?fedora}



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-TestGears.spec	2 Sep 2007 03:01:53 -0000	1.8
+++ python-TestGears.spec	2 Sep 2007 03:03:04 -0000	1.9
@@ -15,7 +15,7 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools



From fedora-extras-commits at redhat.com  Sun Sep  2 03:11:04 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:11:04 -0400
Subject: rpms/python-decoratortools/devel python-decoratortools.spec, 1.2,
	1.3
Message-ID: <200709020311.l823B4JJ007641@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-decoratortools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7623

Modified Files:
	python-decoratortools.spec 
Log Message:
- Verify that .pth files are correct.
- Update license tag for new guidelines.
- Update setuptools BR for changes in rawhide.



Index: python-decoratortools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/devel/python-decoratortools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-decoratortools.spec	21 Aug 2007 21:10:41 -0000	1.2
+++ python-decoratortools.spec	2 Sep 2007 03:10:31 -0000	1.3
@@ -5,16 +5,21 @@
 
 Name:           python-decoratortools
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use class and function decorators -- even in Python 2.3
 Group:          Development/Languages
-License:        PSF or ZPL
+License:        Python or ZPLv2.1
 URL:            http://cheeseshop.python.org/pypi/DecoratorTools
 Source0:        http://cheeseshop.python.org/packages/source/D/DecoratorTools/%{module}-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 Want to use decorators, but still need to support Python 2.3? Wish you could
@@ -32,7 +37,7 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %clean
@@ -48,6 +53,11 @@
 
 
 %changelog
+* Sat Sep 01 2007 Toshio Kuratomi <a.badger at gmail.com> - 1.5-2
+- Verify that .pth files are correct.
+- Update license tag for new guidelines.
+- Update setuptools BR for changes in rawhide.
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> - 1.5-1
 - 1.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:42:14 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:42:14 -0400
Subject: rpms/python-clientform/devel python-clientform.spec,1.14,1.15
Message-ID: <200709020442.l824gEC7014912@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-clientform/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887

Modified Files:
	python-clientform.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-clientform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-clientform/devel/python-clientform.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-clientform.spec	18 Aug 2007 23:02:14 -0000	1.14
+++ python-clientform.spec	2 Sep 2007 04:41:42 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           python-clientform
 Version:        0.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python module for client-side HTML forms
 
 Group:          Development/Languages
@@ -13,7 +13,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 ClientForm is a Python module for handling HTML forms on the client side,
@@ -48,6 +54,9 @@
 %{python_sitelib}/ClientForm-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.2.7-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> 0.2.7-1
 - 0.2.7
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:43:02 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:43:02 -0400
Subject: rpms/python-configobj/devel python-configobj.spec,1.6,1.7
Message-ID: <200709020443.l824h2TH014977@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-configobj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14955

Modified Files:
	python-configobj.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-configobj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-configobj/devel/python-configobj.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-configobj.spec	3 Mar 2007 21:08:34 -0000	1.6
+++ python-configobj.spec	2 Sep 2007 04:42:29 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-configobj
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Config file reading, writing, and validation
 
 Group:          System Environment/Libraries
@@ -12,7 +12,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 ConfigObj is a simple but powerful config file reader and writer: an ini file
@@ -61,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 4.4.0-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Mar  3 2007 Luke Macken <lmacken at redhat.com> - 4.4.0-1
 - 4.4.0
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:43:52 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:43:52 -0400
Subject: rpms/python-formencode/devel python-formencode.spec,1.15,1.16
Message-ID: <200709020443.l824hq1h015075@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053

Modified Files:
	python-formencode.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-formencode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-formencode.spec	10 Apr 2007 15:10:22 -0000	1.15
+++ python-formencode.spec	2 Sep 2007 04:43:19 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           python-formencode
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
 Group:          Development/Libraries
@@ -16,7 +16,13 @@
 BuildArch:      noarch
 
 Requires: python-setuptools
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 
 %description
@@ -48,6 +54,9 @@
 %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.7.1-2
+- Update for python-setuptools changes in rawhide
+
 * Mon Apr  9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.7.1-1
 - Upgrade to bugfix 0.7.1 release.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:44:39 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:44:39 -0400
Subject: rpms/python-mechanize/devel python-mechanize.spec,1.6,1.7
Message-ID: <200709020444.l824idr5015140@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Modified Files:
	python-mechanize.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-mechanize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mechanize/devel/python-mechanize.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-mechanize.spec	3 Mar 2007 20:24:27 -0000	1.6
+++ python-mechanize.spec	2 Sep 2007 04:44:06 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-mechanize
 Version:        0.1.6
-Release:        0.1.b%{?dist}
+Release:        0.2.b%{?dist}
 Summary:        Stateful programmatic web browsing
 
 Group:          System Environment/Libraries
@@ -14,7 +14,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-clientform
 
 
@@ -61,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 0.1.6-0.2.b
+- Update for python-setuptools changes in rawhide
+
 * Sat Mar  3 2007 Luke Macken <lmacken at redhat.com> - 0.1.6-0.1.b
 - 0.1.6b
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:45:26 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:45:26 -0400
Subject: rpms/python-myghty/devel python-myghty.spec,1.10,1.11
Message-ID: <200709020445.l824jQYJ015213@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15183

Modified Files:
	python-myghty.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-myghty.spec	10 Dec 2006 03:28:50 -0000	1.10
+++ python-myghty.spec	2 Sep 2007 04:44:53 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           python-myghty
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -12,7 +12,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -48,6 +54,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.1-4
+- Update for python-setuptools changes in rawhide
+
 * Sat Dec  9 2006 Luke Macken <Lmacken at redhat.com> 1.1-2
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:46:12 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:46:12 -0400
Subject: rpms/python-nose/devel python-nose.spec,1.8,1.9
Message-ID: <200709020446.l824kCBi015284@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15259

Modified Files:
	python-nose.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-nose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-nose.spec	21 Aug 2007 21:14:45 -0000	1.8
+++ python-nose.spec	2 Sep 2007 04:45:39 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           python-nose
 Version:        0.10.0
-Release:        0.2.%{_betatag}%{?dist}
+Release:        0.3.%{_betatag}%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
 Group:          Development/Languages
@@ -16,7 +16,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 nose: a discovery-based unittest extension.
@@ -48,6 +54,9 @@
 %{python_sitelib}/nose
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.10.0-0.3.b1
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> 0.10.0-0.2.b1
 - 0.10.0b1
 - Update license tag to LGPLv2



From fedora-extras-commits at redhat.com  Sun Sep  2 04:46:58 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:46:58 -0400
Subject: rpms/python-paste/devel python-paste.spec,1.7,1.8
Message-ID: <200709020446.l824kwHM015362@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15327

Modified Files:
	python-paste.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/devel/python-paste.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paste.spec	8 Jul 2007 22:40:06 -0000	1.7
+++ python-paste.spec	2 Sep 2007 04:46:25 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           python-paste
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for using a Web Server Gateway Interface stack
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 These provide several pieces of "middleware" (or filters) that can be nested
@@ -60,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.4-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.4-1
 - 1.4
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:47:45 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:47:45 -0400
Subject: rpms/python-paste-deploy/devel python-paste-deploy.spec,1.7,1.8
Message-ID: <200709020447.l824ljso015423@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-deploy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15405

Modified Files:
	python-paste-deploy.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste-deploy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-deploy/devel/python-paste-deploy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paste-deploy.spec	8 Jul 2007 22:40:07 -0000	1.7
+++ python-paste-deploy.spec	2 Sep 2007 04:47:12 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           python-paste-deploy
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load, configure, and compose WSGI applications and servers
 Group:          System Environment/Libraries
 License:        MIT
@@ -11,7 +11,12 @@
 Source0:        http://cheeseshop.python.org/packages/source/P/PasteDeploy/PasteDeploy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-paste
 
 %description
@@ -51,6 +56,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.3.1-2
+- Update for python-setuptools changes in rawhide
+
 * Sun Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.3.1-1
 - 1.3.1
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:48:31 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:48:31 -0400
Subject: rpms/python-paste-script/devel python-paste-script.spec,1.9,1.10
Message-ID: <200709020448.l824mV2S015499@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	python-paste-script.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/python-paste-script.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-paste-script.spec	8 Jul 2007 22:40:08 -0000	1.9
+++ python-paste-script.spec	2 Sep 2007 04:47:58 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-paste-script
 Version:        1.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-paste, python-paste-deploy, python-cheetah
 
 %description
@@ -58,6 +63,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.3.5-2
+- Update for python-setuptools changes in rawhide
+
 * Sun Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.3.5-1
 - 1.3.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:49:18 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:49:18 -0400
Subject: rpms/python-ruledispatch/devel python-ruledispatch.spec,1.6,1.7
Message-ID: <200709020449.l824nIGw015564@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-ruledispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15542

Modified Files:
	python-ruledispatch.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-ruledispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ruledispatch/devel/python-ruledispatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-ruledispatch.spec	21 Aug 2007 20:40:36 -0000	1.6
+++ python-ruledispatch.spec	2 Sep 2007 04:48:45 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           python-ruledispatch
 Version:        0.5a0
-Release:        0.6.svn%{svnrev}%{?dist}
+Release:        0.7.svn%{svnrev}%{?dist}
 Summary:        A generic function package for Python
 
 Group:          Development/Languages
@@ -14,7 +14,12 @@
 Source0:        http://www.turbogears.org/preview/download/eggs/RuleDispatch-%{version}.dev-%{svnrev}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel python-setuptools >= 0.6a9
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-protocols >= 1.0
 
 %description
@@ -48,6 +53,9 @@
 %{python_sitearch}/dispatch/tests/*.pyo
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.5a0-0.7.svn2305
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> 0.5a0-0.6.svn2305
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:50:05 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:50:05 -0400
Subject: rpms/python-simplejson/devel python-simplejson.spec,1.11,1.12
Message-ID: <200709020450.l824o5Bc015637@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-simplejson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607

Modified Files:
	python-simplejson.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-simplejson.spec	21 Aug 2007 20:41:55 -0000	1.11
+++ python-simplejson.spec	2 Sep 2007 04:49:32 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           python-simplejson
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
@@ -12,7 +12,13 @@
 Source0:        http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 simplejson is a simple, fast, complete, correct and extensible
@@ -60,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-3
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:50:55 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:50:55 -0400
Subject: rpms/python-turbocheetah/devel python-turbocheetah.spec,1.4,1.5
Message-ID: <200709020450.l824otdR015738@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15715

Modified Files:
	python-turbocheetah.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-turbocheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbocheetah/devel/python-turbocheetah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-turbocheetah.spec	9 Dec 2006 19:59:19 -0000	1.4
+++ python-turbocheetah.spec	2 Sep 2007 04:50:22 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           python-turbocheetah
 Version:        0.9.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        TurboGears plugin to support use of Cheetah templates
 
 Group:          Development/Languages
@@ -16,7 +16,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-cheetah >= 1.0
 
 %description
@@ -52,6 +57,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 0.9.5-8
+- Update for python-setuptools changes in rawhide
+
 * Sat Dec  9 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-7
 - Add python-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:51:42 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:51:42 -0400
Subject: rpms/python-turbokid/devel python-turbokid.spec,1.7,1.8
Message-ID: <200709020451.l824pgLj015803@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15781

Modified Files:
	python-turbokid.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/python-turbokid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-turbokid.spec	18 Aug 2007 07:09:11 -0000	1.7
+++ python-turbokid.spec	2 Sep 2007 04:51:09 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:           python-turbokid
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
 Group:          Development/Languages
@@ -15,7 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-kid >= 0.9.6
 
 %description
@@ -49,6 +54,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-1
 - 1.0.2
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:52:34 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:52:34 -0400
Subject: rpms/TurboGears/devel TurboGears.spec,1.18,1.19
Message-ID: <200709020452.l824qYiQ015870@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15850

Modified Files:
	TurboGears.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurboGears.spec	11 May 2007 07:23:36 -0000	1.18
+++ TurboGears.spec	2 Sep 2007 04:51:56 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -15,7 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools >= 0.6c2 python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 # ElementTree is part of python 2.5 on FC7+
 %if 0%{?fedora} <= 6
@@ -82,6 +87,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+- Update for python-setuptools changes in rawhide
+
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2
 - Update etree patch to work with Python2.4
 - Update setuptools patch



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:07 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:07 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709020458.l824w8xe004425@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora devel) to Approved for Michael Patrick McGrath (mmcgrath)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:17 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:17 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709020458.l824wHp2004434@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora devel) to Approved for Michael Patrick McGrath (mmcgrath)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:22 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:22 -0700
Subject: [pkgdb] knetworkmanager had groupAcl changed
Message-ID: <200709020458.l824wM0O004443@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora devel) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Sun Sep  2 05:06:57 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 22:06:57 -0700
Subject: [pkgdb] snort had acl change status
Message-ID: <200709020506.l8256wYA004574@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on snort (Fedora devel) to Approved for Florian La Roche (laroche)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 05:41:11 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sun, 2 Sep 2007 01:41:11 -0400
Subject: rpms/kernel/devel linux-2.6-net-oops.patch, NONE, 1.1 kernel.spec, 
	1.143, 1.144
Message-ID: <200709020541.l825fB9k022444@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22421

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-oops.patch 
Log Message:
* Sun Sep 02 2007 Dave Jones <davej at redhat.com>
- Fix oops in IPv4.


linux-2.6-net-oops.patch:

--- NEW FILE linux-2.6-net-oops.patch ---
>From davej  Sun Sep  2 00:26:18 2007
Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932819AbXIBEUT at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-104.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,USER_IN_WHITELIST autolearn=ham version=3.2.3
Envelope-to: davej at kernelslacker.org
Delivery-date: Sun, 02 Sep 2007 05:20:51 +0100
Received: from testure.choralone.org [194.9.77.134]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
	for <davej at localhost> (single-drop); Sun, 02 Sep 2007 00:26:18 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
	by testure.choralone.org with esmtp (Exim 4.67)
	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S932819AbXIBEUT at vger.kernel.org>)
	id 1IRgx8-0005Ex-Ra
	for davej at kernelslacker.org; Sun, 02 Sep 2007 05:20:51 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S932819AbXIBEUT (ORCPT <rfc822;davej at kernelslacker.org>);
	Sun, 2 Sep 2007 00:20:19 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1750977AbXIBEUF
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sun, 2 Sep 2007 00:20:05 -0400
Received: from rhun.apana.org.au ([64.62.148.172]:1945 "EHLO
	arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750969AbXIBEUD (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sun, 2 Sep 2007 00:20:03 -0400
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by arnor.apana.org.au with esmtp (Exim 4.50 #1 (Debian))
	id 1IRgwL-0001Kl-Aa; Sun, 02 Sep 2007 14:20:01 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
	id 1IRgwF-0004G0-00; Sun, 02 Sep 2007 12:19:55 +0800
From:	Herbert Xu <herbert at gondor.apana.org.au>
To:	lists at nerdbynature.de (Christian Kujau)
Subject: Re: Oops in 2.6.23-rc5
Cc:	linux-kernel at vger.kernel.org, netdev at vger.kernel.org,
	torvalds at linux-foundation.org, davem at davemloft.net
Organization: Core
In-Reply-To: <alpine.DEB.0.999.0709012236460.6640 at sheep.housecafe.de>
X-Newsgroups: apana.lists.os.linux.kernel,apana.lists.os.linux.netdev
User-Agent: tin/1.7.4-20040225 ("Benbecula") (UNIX) (Linux/2.6.17-rc4 (i686))
Message-Id: <E1IRgwF-0004G0-00 at gondolin.me.apana.org.au>
Date:	Sun, 02 Sep 2007 12:19:55 +0800
Sender:	linux-kernel-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-kernel at vger.kernel.org
Status: RO
Content-Length: 1586
Lines: 43

Christian Kujau <lists at nerdbynature.de> wrote:
> 
> today I switched from 2.6.22.3 to 2.6.23-rc5 (skipped quite a few -rc 
> versions due to lack of time), and the box keeps panicking under certain 
> circumstances. I suspected disk related problems, because: when the box 
> is up, I usually resume ~10 bittorrent files. When doing this, each
> file (~200MB...1GB) is checked and disk activity is pretty high (20MB/s
> or so), and after 1 minute of doing so the box panicks. Every time.

You want this patch (by davem).

Unfortunately people are travelling so I'm not sure when it'll
get picked up by Linus.

Cheers,
-- 
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
--
From: davem at davemloft.net (David Miller)

> ip is at tcp_rto_min+0x20/0x40

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1ee7212..bbad2cd 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -560,7 +560,7 @@ static u32 tcp_rto_min(struct sock *sk)
 	struct dst_entry *dst = __sk_dst_get(sk);
 	u32 rto_min = TCP_RTO_MIN;
 
-	if (dst_metric_locked(dst, RTAX_RTO_MIN))
+	if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
 		rto_min = dst->metrics[RTAX_RTO_MIN-1];
 	return rto_min;
 }
-
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/devel/kernel.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kernel.spec	1 Sep 2007 16:34:06 -0000	1.143
+++ kernel.spec	2 Sep 2007 05:40:37 -0000	1.144
@@ -668,6 +668,7 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
+Patch1600: linux-2.6-net-oops.patch
 
 %endif
 
@@ -1193,6 +1194,10 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# Fix TCP oops.
+ApplyPatch linux-2.6-net-oops.patch
+
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1784,6 +1789,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Dave Jones <davej at redhat.com>
+- Fix oops in IPv4.
+
 * Sat Sep 01 2007 Dave Jones <davej at redhat.com>
 - Terminate list in ata-piix
 



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:39 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826MdoF029068@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/devel

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	18 Jan 2007 03:45:55 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:06 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:43 -0400
Subject: rpms/perl-File-Flat/F-7 perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826Mhoh029071@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/F-7

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/F-7/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	18 Jan 2007 03:45:55 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:10 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:46 -0400
Subject: rpms/perl-File-Flat/FC-6 perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826MkJu029074@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/FC-6

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/FC-6/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	19 Jan 2007 03:04:18 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:13 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:27 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QR36003583@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/devel

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:25:55 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:31 -0400
Subject: rpms/perl-File-NCopy/F-7 perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QVYD003586@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/F-7

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/F-7/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:25:58 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:34 -0400
Subject: rpms/perl-File-NCopy/FC-6 perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QYin003589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/FC-6

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/FC-6/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:26:01 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:30 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oULE004592@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/devel

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:49:57 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:33 -0400
Subject: rpms/perl-File-Slurp/F-7 perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oXPG004595@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/F-7

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-7/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:50:01 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:36 -0400
Subject: rpms/perl-File-Slurp/FC-6 perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oane004598@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/FC-6

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/FC-6/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:50:04 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:04:50 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:04:50 -0400
Subject: rpms/hardinfo/F-7 libzfix.patch,NONE,1.1 hardinfo.spec,1.4,1.5
Message-ID: <200709020904.l8294oEQ016944@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/hardinfo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hardinfo.spec	3 Aug 2007 08:28:02 -0000	1.4
+++ hardinfo.spec	2 Sep 2007 09:04:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -10,6 +10,7 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch 
 Patch2: fixuserdsp.patch
+Patch3: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -32,6 +33,8 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
+#fix libz.so detection
+%patch3 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -63,6 +66,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
+- Fix libz detection RH #274381
+
 * Fri Aug 03 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
 - Update License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:08:08 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:08:08 -0400
Subject: rpms/hardinfo/devel libzfix.patch,NONE,1.1 hardinfo.spec,1.17,1.18
Message-ID: <200709020908.l829881p017119@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17084

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hardinfo.spec	15 Aug 2007 13:11:16 -0000	1.17
+++ hardinfo.spec	2 Sep 2007 09:07:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System     
@@ -10,8 +10,8 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch
 Patch2: fixuserdsp.patch
-Patch3: debug.patch
 Patch4: fix_crash.patch
+Patch5: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -34,10 +34,10 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
-#enable debug output
-#%patch3 -p1 -b .debug
 #fix double free bug
 %patch4 -p1 -b .crash
+#fix libz.so detection
+%patch5 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-18
+- Fix libz detection RH #274381
+
 * Wed Aug 15 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-17
 - Disable debug 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:27:44 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:27:44 -0400
Subject: rpms/hardinfo/FC-6 libzfix.patch,NONE,1.1 hardinfo.spec,1.3,1.4
Message-ID: <200709020927.l829Riq6017588@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17560

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/hardinfo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hardinfo.spec	3 Aug 2007 08:29:30 -0000	1.3
+++ hardinfo.spec	2 Sep 2007 09:27:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -10,6 +10,7 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch 
 Patch2: fixuserdsp.patch
+Patch3: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -32,6 +33,8 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
+#fix libz.so detection
+%patch3 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -63,6 +66,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
+- Fix libz detection RH #274381
+
 * Fri Aug 03 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-4
 - Update License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 10:40:02 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sun, 2 Sep 2007 06:40:02 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec,1.1,1.2
Message-ID: <200709021040.l82Ae2rx024675@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24648

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
- Only build the plugin where the changelog plugin can be build, only
  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
  of dependencies on the cdt plugin.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-rpm-editor.spec	1 Sep 2007 14:01:35 -0000	1.1
+++ eclipse-rpm-editor.spec	2 Sep 2007 10:39:28 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -38,6 +38,14 @@
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
 
+# These plugins are really noarch but they the changelog plugin need cdt which 
+# we only build on these architectures.
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%else
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%endif
+
 %description
 The Eclipse Specfile Editor package contains Eclipse plugins that are
 useful for maintenance of RPM specfiles within the Eclipse IDE.
@@ -109,6 +117,11 @@
 %endif
 
 %changelog
+* Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
+- Only build the plugin where the changelog plugin can be build, only
+  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
+  of dependencies on the cdt plugin.
+
 * Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
 - Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 10:48:22 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sun, 2 Sep 2007 06:48:22 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec,1.1,1.2
Message-ID: <200709021048.l82AmMLC025031@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24990

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
- Only build the plugin where the changelog plugin can be build, only
  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
  of dependencies on the cdt plugin.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-rpm-editor.spec	1 Sep 2007 14:05:22 -0000	1.1
+++ eclipse-rpm-editor.spec	2 Sep 2007 10:47:44 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -37,6 +37,13 @@
 # the rpmlint plugin
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
+# These plugins are really noarch but they the changelog plugin need cdt which
+# we only build on these architectures.
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%else
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%endif
 
 %description
 The Eclipse Specfile Editor package contains Eclipse plugins that are
@@ -109,6 +116,11 @@
 %endif
 
 %changelog
+* Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
+- Only build the plugin where the changelog plugin can be build, only
+  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
+  of dependencies on the cdt plugin.
+
 * Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
 - Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 11:18:41 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mefoster))
Date: Sun, 02 Sep 2007 04:18:41 -0700
Subject: [pkgdb] kaffeine: mef has requested commit
Message-ID: <200709021118.l82BIhMc007588@app3.fedora.phx.redhat.com>

Mary Ellen Foster (mef) has requested the commit acl on kaffeine (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  2 11:28:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:28:46 -0400
Subject: rpms/dhcp-forwarder/F-7 dhcp-forwarder.spec,1.17,1.18
Message-ID: <200709021128.l82BSkAA031669@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31649/dhcp-forwarder/F-7

Modified Files:
	dhcp-forwarder.spec 
Log Message:
updated URLs



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/F-7/dhcp-forwarder.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dhcp-forwarder.spec	18 Jan 2007 07:37:48 -0000	1.17
+++ dhcp-forwarder.spec	2 Sep 2007 11:28:13 -0000	1.18
@@ -24,12 +24,12 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release: %release_func 12
+Release:	%release_func 12.1
 License:	GPL
 Group:		System Environment/Daemons
-URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
-Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
-Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+URL:		http://www.nongnu.org/dhcp-fwd/
+Source0:	http://download.savannah.gnu.org/releases/dhcp-fwd/%name-%version.tar.bz2
+Source1:	http://download.savannah.gnu.org/releases/dhcp-fwd/%name-%version.tar.bz2.asc
 Patch0:		dhcp-forwarder-0.7-bigend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(dhcp-forwarder)
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-13
+- updated URL
+
 * Thu Jan 18 2007 David Woodhouse <dwmw2 at infradead.org> 0.7-12
 - rebuilt with PPC support
 



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:13 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:13 -0400
Subject: rpms/dhcp-forwarder/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUDTe031735@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/dhcp-forwarder/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/dhcp-fwd/
dhcp-forwarder-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:10 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:10 -0400
Subject: rpms/clamav/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUAeV031718@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/clamav/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.91.2


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/clamav/
clamav-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:16 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:16 -0400
Subject: rpms/dhcp-forwarder/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUG85031752@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/dhcp-forwarder/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/dhcp-fwd/
dhcp-forwarder-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:19 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:19 -0400
Subject: rpms/ip-sentinel/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUJXM031769@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/ip-sentinel/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.12


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/ip-sentinel/
ip-sentinel-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:22 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:22 -0400
Subject: rpms/ip-sentinel/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUM2q031786@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/ip-sentinel/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.12


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/ip-sentinel/
ip-sentinel-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:25 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:25 -0400
Subject: rpms/milter-greylist/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUP3B031803@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/milter-greylist/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
3.0


--- NEW FILE verinfo ---
http://hcpnet.free.fr/milter-greylist/
milter-greylist-(3\.0.*?)\.t(?:gz|ar)



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:28 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:28 -0400
Subject: rpms/milter-greylist/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUS52031822@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/milter-greylist/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
3.0


--- NEW FILE verinfo ---
http://hcpnet.free.fr/milter-greylist/
milter-greylist-(3\.0.*?)\.t(?:gz|ar)



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:32 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:32 -0400
Subject: rpms/tinyca2/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUWh0031839@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/tinyca2/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7.5


--- NEW FILE verinfo ---
http://tinyca.sm-zone.net/
tinyca2-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:34 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:34 -0400
Subject: rpms/util-vserver/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUYMp031856@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/util-vserver/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.30.213


--- NEW FILE verinfo ---
http://ftp.linux-vserver.org/pub/utils/util-vserver/
util-vserver-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:37 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:37 -0400
Subject: rpms/util-vserver/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUbi3031873@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/util-vserver/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.30.213


--- NEW FILE verinfo ---
http://ftp.linux-vserver.org/pub/utils/util-vserver/
util-vserver-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 12:45:21 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:45:21 -0400
Subject: rpms/amarok/F-7 amarok-1.4.7-147126.patch, NONE, 1.1 amarok.spec,
	1.80, 1.81
Message-ID: <200709021245.l82CjLrm006743@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6683/F-7

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-147126.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
- add patch for kde bug 147126 : amarok freezes when trying to play
  mp3 files without mp3 support


amarok-1.4.7-147126.patch:

--- NEW FILE amarok-1.4.7-147126.patch ---
diff -up ./amarok/src/statusbar/statusBarBase.cpp.147126 ./amarok/src/statusbar/statusBarBase.cpp
--- ./amarok/src/statusbar/statusBarBase.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/statusbar/statusBarBase.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -25,6 +25,7 @@
 #include "squeezedtextlabel.h"
 #include "statusBarBase.h"
 #include "threadmanager.h"
+#include "enginecontroller.h"
 
 #include <kio/job.h>
 #include <kiconloader.h>
@@ -343,9 +344,13 @@ StatusBar::longMessageThreadSafe( const 
 void
 StatusBar::customEvent( QCustomEvent *e )
 {
-    QString *s = static_cast<QString*>( e->data() );
-    longMessage( *s );
-    delete s;
+    if(e->type() == 1000 ){
+      QString *s = static_cast<QString*>( e->data() );
+      longMessage( *s );
+      delete s;
+    }else if(e->type() == 2000 ){
+      EngineController::instance()->unplayableNotification();
+    }
 }
 
 
diff -up ./amarok/src/enginecontroller.cpp.147126 ./amarok/src/enginecontroller.cpp
--- ./amarok/src/enginecontroller.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -244,13 +244,10 @@ bool EngineController::canDecode( const 
     if( engine() != EngineController::instance()->m_voidEngine )
     {
         //we special case this as otherwise users hate us
-        if ( !valid && ext.lower() == "mp3" && !installDistroCodec(AmarokConfig::soundSystem()) )
-            Amarok::StatusBar::instance()->longMessageThreadSafe(
-                    i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
-                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
-                        "the installation of the multimedia-framework that the current engine uses. "
-                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
-                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+        if ( !valid && ext.lower() == "mp3"){
+            QCustomEvent * e = new QCustomEvent( 2000 );
+            QApplication::postEvent( Amarok::StatusBar::instance(), e );
+ }
 
         // Cache this result for the next lookup
         if ( !ext.isEmpty() )
@@ -260,6 +257,17 @@ bool EngineController::canDecode( const 
     return valid;
 }
 
+void EngineController::unplayableNotification() {
+
+    if( !installDistroCodec(AmarokConfig::soundSystem()))
+        Amarok::StatusBar::instance()->longMessageThreadSafe(
+                  i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
+                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
+                        "the installation of the multimedia-framework that the current engine uses. "
+                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
+                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+}
+
 bool EngineController::installDistroCodec( const QString& engine /*Filetype type*/)
 {
     KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
diff -up ./amarok/src/enginecontroller.h.147126 ./amarok/src/enginecontroller.h
--- ./amarok/src/enginecontroller.h.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.h	2007-09-02 13:55:38.000000000 +0200
@@ -52,6 +52,7 @@ public:
     uint                     trackPosition() const;
 
     EngineBase* loadEngine();
+    void unplayableNotification();
 
     uint trackLength() const { return m_bundle.length() * 1000; }
     const MetaBundle &bundle() const;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- amarok.spec	18 Aug 2007 06:56:53 -0000	1.80
+++ amarok.spec	2 Sep 2007 12:44:48 -0000	1.81
@@ -4,14 +4,15 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    2%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
-License:    GPL
+License:    GPLv2+
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0:     amarok-1.4.7-147126.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -85,6 +86,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .147126
 
 
 
@@ -241,6 +243,13 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
+- add patch for kde bug 147126 : amarok freezes when trying to play
+  mp3 files without mp3 support
+
+* Fri Aug 24 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-3
+- rebuild with libgpod-0.5.2
+
 * Sat Aug 18 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-2
 - version 1.4.7
 



From fedora-extras-commits at redhat.com  Sun Sep  2 12:45:24 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:45:24 -0400
Subject: rpms/amarok/devel amarok-1.4.7-147126.patch, NONE, 1.1 amarok.spec, 
	1.83, 1.84
Message-ID: <200709021245.l82CjO4B006746@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6683/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-147126.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
- add patch for kde bug 147126 : amarok freezes when trying to play
  mp3 files without mp3 support


amarok-1.4.7-147126.patch:

--- NEW FILE amarok-1.4.7-147126.patch ---
diff -up ./amarok/src/statusbar/statusBarBase.cpp.147126 ./amarok/src/statusbar/statusBarBase.cpp
--- ./amarok/src/statusbar/statusBarBase.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/statusbar/statusBarBase.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -25,6 +25,7 @@
 #include "squeezedtextlabel.h"
 #include "statusBarBase.h"
 #include "threadmanager.h"
+#include "enginecontroller.h"
 
 #include <kio/job.h>
 #include <kiconloader.h>
@@ -343,9 +344,13 @@ StatusBar::longMessageThreadSafe( const 
 void
 StatusBar::customEvent( QCustomEvent *e )
 {
-    QString *s = static_cast<QString*>( e->data() );
-    longMessage( *s );
-    delete s;
+    if(e->type() == 1000 ){
+      QString *s = static_cast<QString*>( e->data() );
+      longMessage( *s );
+      delete s;
+    }else if(e->type() == 2000 ){
+      EngineController::instance()->unplayableNotification();
+    }
 }
 
 
diff -up ./amarok/src/enginecontroller.cpp.147126 ./amarok/src/enginecontroller.cpp
--- ./amarok/src/enginecontroller.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -244,13 +244,10 @@ bool EngineController::canDecode( const 
     if( engine() != EngineController::instance()->m_voidEngine )
     {
         //we special case this as otherwise users hate us
-        if ( !valid && ext.lower() == "mp3" && !installDistroCodec(AmarokConfig::soundSystem()) )
-            Amarok::StatusBar::instance()->longMessageThreadSafe(
-                    i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
-                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
-                        "the installation of the multimedia-framework that the current engine uses. "
-                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
-                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+        if ( !valid && ext.lower() == "mp3"){
+            QCustomEvent * e = new QCustomEvent( 2000 );
+            QApplication::postEvent( Amarok::StatusBar::instance(), e );
+ }
 
         // Cache this result for the next lookup
         if ( !ext.isEmpty() )
@@ -260,6 +257,17 @@ bool EngineController::canDecode( const 
     return valid;
 }
 
+void EngineController::unplayableNotification() {
+
+    if( !installDistroCodec(AmarokConfig::soundSystem()))
+        Amarok::StatusBar::instance()->longMessageThreadSafe(
+                  i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
+                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
+                        "the installation of the multimedia-framework that the current engine uses. "
+                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
+                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+}
+
 bool EngineController::installDistroCodec( const QString& engine /*Filetype type*/)
 {
     KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
diff -up ./amarok/src/enginecontroller.h.147126 ./amarok/src/enginecontroller.h
--- ./amarok/src/enginecontroller.h.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.h	2007-09-02 13:55:38.000000000 +0200
@@ -52,6 +52,7 @@ public:
     uint                     trackPosition() const;
 
     EngineBase* loadEngine();
+    void unplayableNotification();
 
     uint trackLength() const { return m_bundle.length() * 1000; }
     const MetaBundle &bundle() const;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- amarok.spec	25 Aug 2007 21:29:02 -0000	1.83
+++ amarok.spec	2 Sep 2007 12:44:51 -0000	1.84
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,6 +12,7 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0:     amarok-1.4.7-147126.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -85,6 +86,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .147126
 
 
 
@@ -241,6 +243,10 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
+- add patch for kde bug 147126 : amarok freezes when trying to play
+  mp3 files without mp3 support
+
 * Fri Aug 24 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-3
 - rebuild with libgpod-0.5.2
 



From fedora-extras-commits at redhat.com  Sun Sep  2 12:46:12 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:46:12 -0400
Subject: rpms/glest-data/F-7 .cvsignore, 1.2, 1.3 glest-data.spec, 1.3,
	1.4 glest-get-translations.sh, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709021246.l82CkCFt006884@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793/F-7

Modified Files:
	.cvsignore glest-data.spec glest-get-translations.sh sources 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:45:40 -0000	1.3
@@ -1,2 +1,2 @@
-glest-translations-2.0.0.tar.gz
-glest_data_2.0.0.zip
+glest-translations-2.0.1.tar.gz
+glest_data_2.0.1.zip


Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/glest-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glest-data.spec	18 Aug 2007 07:09:51 -0000	1.3
+++ glest-data.spec	2 Sep 2007 12:45:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glest-data
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Data files for the game Glest
 
 Group:          Amusements/Games
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+
 * Mon Aug 13 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - fix ExcludArch tag, it does not parse commas (thanks Florian)
 


Index: glest-get-translations.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/glest-get-translations.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest-get-translations.sh	27 Nov 2006 19:54:30 -0000	1.1
+++ glest-get-translations.sh	2 Sep 2007 12:45:40 -0000	1.2
@@ -7,10 +7,12 @@
     exit 2
 fi
 
+majorver=`echo $version | sed -r -e 's/^([0-9]+)[0-9\.]+$/\1/g'`
+
 rm -rf translations
 mkdir translations
 cd translations
-wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
+wget -r -N -l 1 -np -nd -A "*_$majorver.*.zip" http://www.glest.org/files/contrib/translations/
 rm -f robots.txt
 cd ..
 tar -czf glest-translations-$version.tar.gz translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 19:54:30 -0000	1.2
+++ sources	2 Sep 2007 12:45:40 -0000	1.3
@@ -1,2 +1,2 @@
-aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
-8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip
+02afa4d079313239a3c972492be54a47  glest-translations-2.0.1.tar.gz
+0ca333baa78328f97c30a22063ea19fc  glest_data_2.0.1.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 12:46:15 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:46:15 -0400
Subject: rpms/glest-data/devel .cvsignore, 1.2, 1.3 glest-data.spec, 1.5,
	1.6 glest-get-translations.sh, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709021246.l82CkFQV006896@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793/devel

Modified Files:
	.cvsignore glest-data.spec glest-get-translations.sh sources 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:45:43 -0000	1.3
@@ -1,2 +1,2 @@
-glest-translations-2.0.0.tar.gz
-glest_data_2.0.0.zip
+glest-translations-2.0.1.tar.gz
+glest_data_2.0.1.zip


Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glest-data.spec	13 Aug 2007 08:43:17 -0000	1.5
+++ glest-data.spec	2 Sep 2007 12:45:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glest-data
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Data files for the game Glest
 
 Group:          Amusements/Games
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+
 * Mon Aug 13 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - fix ExcludArch tag, it does not parse commas (thanks Florian)
 


Index: glest-get-translations.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-get-translations.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest-get-translations.sh	27 Nov 2006 19:54:30 -0000	1.1
+++ glest-get-translations.sh	2 Sep 2007 12:45:43 -0000	1.2
@@ -7,10 +7,12 @@
     exit 2
 fi
 
+majorver=`echo $version | sed -r -e 's/^([0-9]+)[0-9\.]+$/\1/g'`
+
 rm -rf translations
 mkdir translations
 cd translations
-wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
+wget -r -N -l 1 -np -nd -A "*_$majorver.*.zip" http://www.glest.org/files/contrib/translations/
 rm -f robots.txt
 cd ..
 tar -czf glest-translations-$version.tar.gz translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 19:54:30 -0000	1.2
+++ sources	2 Sep 2007 12:45:43 -0000	1.3
@@ -1,2 +1,2 @@
-aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
-8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip
+02afa4d079313239a3c972492be54a47  glest-translations-2.0.1.tar.gz
+0ca333baa78328f97c30a22063ea19fc  glest_data_2.0.1.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 12:47:54 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:47:54 -0400
Subject: rpms/glest/F-7 .cvsignore, 1.2, 1.3 glest.spec, 1.7, 1.8 sources,
	1.2, 1.3 glest-2.0.0-gcc41.patch, 1.1, NONE
Message-ID: <200709021247.l82ClsA0007056@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7013/F-7

Modified Files:
	.cvsignore glest.spec sources 
Removed Files:
	glest-2.0.0-gcc41.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:47:21 -0000	1.3
@@ -1 +1 @@
-glest_source_2.0.0.zip
+glest_source_2.0.1.zip


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/glest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glest.spec	20 Dec 2006 11:59:40 -0000	1.7
+++ glest.spec	2 Sep 2007 12:47:21 -0000	1.8
@@ -1,15 +1,14 @@
 Name:           glest
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
+Source0:        http://dl.sf.net/glest/glest_source_%{version}.zip
 Source1:        glest.sh
 Patch0:         glest-2.0.0-unicode.patch
-Patch1:         glest-2.0.0-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -21,7 +20,7 @@
 Requires:       glx-utils
 
 # Does not work on PPC (see README.Linux). Bug 219540.
-ExcludeArch:    ppc
+ExcludeArch:    ppc ppc64
 
 %description
 Glest is a free 3D real time strategy game, that can be modified
@@ -33,9 +32,8 @@
 
 
 %prep
-%setup -q -n %{name}_source_%{version}
+%setup -q -c
 %patch0 -p1 -b .unicode
-%patch1 -p1 -b .gcc41
 find . -type f | xargs sed -i -e "s/\r//g" 
 #find . -type f | while read file; do
 #  grep -qs "\r\n" $file && dos2unix $file
@@ -96,6 +94,17 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+- patch1 merged upstream
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-7
+- fix ExcludArch tag (no comma allowed)
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-6
+- rebuild for BuildID
+- fix license tag
+
 * Wed Dec 20 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - require glx-utils, glxinfo is used in the wrapper script
 - don't try to update the configuration on startup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 20:05:47 -0000	1.2
+++ sources	2 Sep 2007 12:47:21 -0000	1.3
@@ -1 +1 @@
-f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip
+2d35a5d08331957f63240cadc9766b75  glest_source_2.0.1.zip


--- glest-2.0.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 12:47:56 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:47:56 -0400
Subject: rpms/glest/devel .cvsignore, 1.2, 1.3 glest.spec, 1.10, 1.11 sources,
	1.2, 1.3 glest-2.0.0-gcc41.patch, 1.1, NONE
Message-ID: <200709021247.l82Clu4l007061@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7013/devel

Modified Files:
	.cvsignore glest.spec sources 
Removed Files:
	glest-2.0.0-gcc41.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:47:24 -0000	1.3
@@ -1 +1 @@
-glest_source_2.0.0.zip
+glest_source_2.0.1.zip


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- glest.spec	26 Aug 2007 08:44:36 -0000	1.10
+++ glest.spec	2 Sep 2007 12:47:24 -0000	1.11
@@ -1,15 +1,14 @@
 Name:           glest
-Version:        2.0.0
-Release:        7%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
+Source0:        http://dl.sf.net/glest/glest_source_%{version}.zip
 Source1:        glest.sh
 Patch0:         glest-2.0.0-unicode.patch
-Patch1:         glest-2.0.0-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -33,9 +32,8 @@
 
 
 %prep
-%setup -q -n %{name}_source_%{version}
+%setup -q -c
 %patch0 -p1 -b .unicode
-%patch1 -p1 -b .gcc41
 find . -type f | xargs sed -i -e "s/\r//g" 
 #find . -type f | while read file; do
 #  grep -qs "\r\n" $file && dos2unix $file
@@ -96,6 +94,10 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+- patch1 merged upstream
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-7
 - fix ExcludArch tag (no comma allowed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 20:05:47 -0000	1.2
+++ sources	2 Sep 2007 12:47:24 -0000	1.3
@@ -1 +1 @@
-f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip
+2d35a5d08331957f63240cadc9766b75  glest_source_2.0.1.zip


--- glest-2.0.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 13:47:23 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 09:47:23 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.40,1.41
Message-ID: <200709021347.l82DlNPu013989@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13960

Modified Files:
	apr-util.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
- rebuild for fixed APR 32-bit ABI
- remove sqlite driver from main package (#274521)



Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- apr-util.spec	22 Aug 2007 19:02:56 -0000	1.40
+++ apr-util.spec	2 Sep 2007 13:46:51 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.8
-Release: 11
+Release: 12
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -133,7 +133,6 @@
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
-%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
 %files pgsql
 %defattr(-,root,root,-)
@@ -156,6 +155,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
+- rebuild for fixed APR 32-bit ABI
+- remove sqlite driver from main package (#274521)
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.2.8-11
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 13:57:42 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 09:57:42 -0400
Subject: rpms/httpd/devel httpd-2.2.4-oldflush.patch, NONE, 1.1 httpd.spec, 
	1.113, 1.114
Message-ID: <200709021357.l82DvgtA014203@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.2.4-oldflush.patch 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
- rebuild for fixed APR


httpd-2.2.4-oldflush.patch:

--- NEW FILE httpd-2.2.4-oldflush.patch ---
--- httpd-2.2.4/server/util_filter.c.oldflush
+++ httpd-2.2.4/server/util_filter.c
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
                                                 void *ctx)
 {
     ap_filter_t *f = ctx;
+    apr_status_t rv;
 
-    return ap_pass_brigade(f, bb);
+    rv = ap_pass_brigade(f, bb);
+
+    /* apr_brigade_write* require that the flush function ensures that
+     * the brigade is empty upon return; otherwise the brigade may be
+     * left with a transient bucket whose contents have fallen out of
+     * scope.  Call cleanup here unconditionally to avoid the issue in
+     * all cases. */
+    apr_brigade_cleanup(bb);
+
+    return rv;
 }
 
 AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- httpd.spec	22 Aug 2007 19:03:11 -0000	1.113
+++ httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
@@ -6,7 +6,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 9
+Release: 10
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -474,6 +474,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
+- rebuild for fixed APR
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 2.2.4-9
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:05:55 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:05:55 -0400
Subject: rpms/php/devel php.spec,1.146,1.147
Message-ID: <200709021405.l82E5tPq020388@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20345

Modified Files:
	php.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
- rebuild for fixed APR



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- php.spec	28 Aug 2007 18:37:03 -0000	1.146
+++ php.spec	2 Sep 2007 14:05:18 -0000	1.147
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language
 Name: php
 Version: 5.2.3
-Release: 8
+Release: 9
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -716,6 +716,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
+- rebuild for fixed APR
+
 * Tue Aug 28 2007 Joe Orton <jorton at redhat.com> 5.2.3-8
 - add ldconfig post/postun for -embedded (Hans de Goede)
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:06:22 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:06:22 -0400
Subject: rpms/mod_python/devel mod_python.spec,1.38,1.39
Message-ID: <200709021406.l82E6MnW020453@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20370

Modified Files:
	mod_python.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 3.3.1-5
- rebuild for fixed 32-bit APR



Index: mod_python.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_python.spec	21 Aug 2007 11:21:02 -0000	1.38
+++ mod_python.spec	2 Sep 2007 14:05:49 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: An embedded Python interpreter for the Apache HTTP Server
 Name: mod_python
 Version: 3.3.1
-Release: 4
+Release: 5
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch1: mod_python-3.1.3-ldflags.patch
@@ -59,6 +59,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 3.3.1-5
+- rebuild for fixed 32-bit APR
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 3.3.1-4
 - fix License
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:06:51 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:06:51 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.18,1.19
Message-ID: <200709021406.l82E6pkZ020497@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_kerb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20433

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
- rebuild for fixed 32-bit APR



Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_auth_kerb.spec	30 Aug 2007 13:56:58 -0000	1.18
+++ mod_auth_kerb.spec	2 Sep 2007 14:06:19 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.3
-Release: 4
+Release: 5
 License: BSD and MIT
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -52,6 +52,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 5.3-4
 - clarify License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:07:30 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:07:30 -0400
Subject: rpms/mod_perl/devel mod_perl.spec,1.51,1.52
Message-ID: <200709021407.l82E7UeN020567@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540

Modified Files:
	mod_perl.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
- rebuild for fixed 32-bit APR



Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_perl.spec	23 Aug 2007 07:57:57 -0000	1.51
+++ mod_perl.spec	2 Sep 2007 14:06:57 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.3
-Release:        12
+Release:        13
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@
 %{_includedir}/httpd/*
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 2.0.3-12
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:15:34 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:15:34 -0400
Subject: rpms/apr/devel apr.spec,1.70,1.71
Message-ID: <200709021415.l82EFYrQ021076@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20868

Modified Files:
	apr.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
- fix API/ABI of 32-bit builds (#254241)



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- apr.spec	31 Aug 2007 21:07:37 -0000	1.70
+++ apr.spec	2 Sep 2007 14:15:02 -0000	1.71
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.9
-Release: 3
+Release: 4
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,6 +18,7 @@
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
+Patch7: apr-1.2.9-openlfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, e2fsprogs-devel, python
 
@@ -47,6 +48,7 @@
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
+%patch7 -p1 -b .openlfs
 
 %build
 # regenerate configure script etc.
@@ -60,7 +62,6 @@
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom
-
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +87,15 @@
       $RPM_BUILD_ROOT%{_libdir}/libapr-*.a
 
 %check
+%if "%{_lib}" == "lib"
+# Fail if LFS support isn't preent in a 32-bit build, since this
+# breaks ABI and the soname doesn't change: see #254241
+if ! grep off64_t include/apr.h; then
+  cat config.log
+  : LFS support not present in 32-bit build
+  exit 1
+fi
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +124,7 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
-* Fri Aug 31 2007 Joe Orton <jorton at redhat.com> 1.2.9-3
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
 - fix API/ABI of 32-bit builds (#254241)
 
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1.2.9-2



From fedora-extras-commits at redhat.com  Sun Sep  2 14:53:31 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:53:31 -0400
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.29,1.30
Message-ID: <200709021453.l82ErVtD023524@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_pgsql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23497

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-6
- rebuild for fixed APR



Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_auth_pgsql.spec	21 Aug 2007 12:52:47 -0000	1.29
+++ mod_auth_pgsql.spec	2 Sep 2007 14:52:58 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache HTTP Server using a PostgreSQL database
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 5
+Release: 6
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-6
+- rebuild for fixed APR
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2.0.3-5
 - fix License, and package the license text
 



From fedora-extras-commits at redhat.com  Sun Sep  2 15:06:18 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 2 Sep 2007 11:06:18 -0400
Subject: rpms/gstreamer-plugins-good/devel
	gstreamer-0.10.6-id3demux-segment.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.44, 1.45
Message-ID: <200709021506.l82F6IEJ029775@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29753

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gstreamer-0.10.6-id3demux-segment.patch 
Log Message:
* Sun Sep 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-5
- Add a patch to fix id3demux, so that MP3s can be played back
  (#273561)


gstreamer-0.10.6-id3demux-segment.patch:

--- NEW FILE gstreamer-0.10.6-id3demux-segment.patch ---
--- gstid3demux.c	2007/05/25 20:51:36	1.29
+++ gstid3demux.c	2007/07/10 10:16:38	1.30
@@ -646,10 +646,7 @@
 
         /* Might need a new segment before the buffer */
         if (id3demux->need_newseg) {
-          if (!gst_id3demux_send_new_segment (id3demux)) {
-            GST_DEBUG_OBJECT (id3demux, "Failed to send new segment event");
-            goto error;
-          }
+          gst_id3demux_send_new_segment (id3demux);
           id3demux->need_newseg = FALSE;
         }
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gstreamer-plugins-good.spec	28 Aug 2007 22:29:07 -0000	1.44
+++ gstreamer-plugins-good.spec	2 Sep 2007 15:05:45 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.6
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -14,6 +14,7 @@
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
 Patch0:		gst-plugins-good-0.10.4-docs.patch
+Patch1:		gstreamer-0.10.6-id3demux-segment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}
@@ -95,6 +96,9 @@
 %prep
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p1 -b .docs
+pushd gst/id3demux/
+%patch1 -p0 -b .segment
+popd
 
 %build
 
@@ -232,8 +236,12 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sun Sep 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-5
+- Add a patch to fix id3demux, so that MP3s can be played back
+  (#273561)
+
 * Tue Aug 28 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-4
--Add the ladspa plugins (#253375)
+- Add the ladspa plugins (#253375)
 
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 0.10.6-3
 - Rebuild for build id



From fedora-extras-commits at redhat.com  Sun Sep  2 15:24:46 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 2 Sep 2007 11:24:46 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, NONE,
	1.1 xscreensaver.spec, 1.43, 1.44
Message-ID: <200709021524.l82FOkOJ030274@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30252

Modified Files:
	xscreensaver.spec 
Added Files:
	update-xscreensaver-hacks 
Log Message:
* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
- Try to make XScreenSaver.ad modular



--- NEW FILE update-xscreensaver-hacks ---
#!/bin/bash

_SYSCONFDIR=${sysconfdir:-/etc}
_PREFIX=${prefix:-/usr}
_DATADIR=${datadir:-${_PREFIX}/share}

ADDIR=${ADDIR:-${install_prefix}${_SYSCONFDIR}/xscreensaver}
CONFDIR=${CONFDIR:-${install_prefix}${_DATADIR}/xscreensaver/hacks.conf.d}
ADFILE=${ADFILE:-$ADDIR/XScreenSaver.ad}

fix_hackconf ()
{
	if [ ! -s $1 ] ; then
		echo "$1 is empty" &>2
		echo ""
		return 1
	fi

	tmpconf=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_1=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_2=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_3=`mktemp /tmp/hackconf.XXXXXXXX`
	sed -n -e '$p' $1 > $tmpconf_1
	sed -e '$d' $1 > $tmpconf_2
	for file in $tmpconf_1 $tmpconf_2 ; do
		if ( [ -s $file ] && grep -q '\\n\(\|\\\)[^\\].*$' $file ) ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
	done
	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
	fi
	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
	while [ -s $tmpconf_2 ] ; do
		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
		sed -i -e '1d' $tmpconf_2
		if grep -q '\\..*$' $tmpconf_3 ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
		if ! grep -q '\\$' $tmpconf_3 ; then
			sed -i -e 's|\(^.*$\)|\1\\|' $tmpconf_3
		fi
		cat $tmpconf_3 >> $tmpconf
	done
	cat $tmpconf_1 >> $tmpconf
	rm -f $tmpconf_1 $tmpconf_2 $tmpconf_3
	echo $tmpconf
	return 0
	
}

for suffix in header tail ; do
	if [ ! -r $ADDIR/XScreenSaver.ad.$suffix ] ; then
		echo "$ADDIR/XScreenSaver.ad.$suffix missing"
		exit 1
	fi
done

tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
cat $ADDIR/XScreenSaver.ad.header > $tmpfile

for hackconf in $CONFDIR/*.conf ; do
	hackconf_fixed=`fix_hackconf $hackconf`
	if [ -n "$hackconf_fixed" ] ; then
		cat $hackconf >> $tmpfile
		rm -f $hackconf_fixed
	fi
done
sed -i -e '$s|\\n\\$|\\n|' $tmpfile

cat $ADDIR/XScreenSaver.ad.tail >> $tmpfile
install -c -p -m 644 $tmpfile $ADFILE
rm -f $tmpfile




Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xscreensaver.spec	28 Aug 2007 19:18:51 -0000	1.43
+++ xscreensaver.spec	2 Sep 2007 15:24:14 -0000	1.44
@@ -2,7 +2,7 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -16,6 +16,7 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
+%define modular_conf  1
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,7 @@
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+Source10:        update-xscreensaver-hacks
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
@@ -272,6 +274,64 @@
 
 make %{?_smp_mflags}
 
+%if %{modular_conf}
+# Make XScreenSavar.ad modular
+CONFD=xscreensaver
+rm -rf $CONFD
+mkdir $CONFD
+
+# preserve the original adfile
+cp -p driver/XScreenSaver.ad $CONFD
+
+# First split XScreenSaver.ad into 3 parts
+cat driver/XScreenSaver.ad | \
+   sed -n -e '1,/\*programs/p' > $CONFD/XScreenSaver.ad.header
+cat driver/XScreenSaver.ad | sed -e '1,/\*programs/d' | \
+   sed -n -e '1,/\\n$/p' > $CONFD/XScreenSaver.ad.hacks
+cat driver/XScreenSaver.ad | sed -e '1,/\\n$/d' > $CONFD/XScreenSaver.ad.tail
+
+# Seperate XScreenSaver.ad.hacks into each hacks
+cd $CONFD
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/ ; cd hacks.conf.d
+
+while [ -s XScreenSaver.ad.hacks ] ; do
+# cut hacks file by \n
+   sed -n -e '1,1p' XScreenSaver.ad.hacks > .tmp
+   if grep -q '\\n[\\]*$' .tmp ; then
+      sed -i -e '1d' XScreenSaver.ad.hacks
+   else
+      sed -n -e '1,/\\n[\\]*$/p' XScreenSaver.ad.hacks > .tmp
+      sed -i -e '1,/\\n[\\]*$/d' XScreenSaver.ad.hacks
+   fi
+
+# name modular hack conf
+   set +x
+   cp -p .tmp .tmp.2
+   modname='\'
+   while ( echo $modname | grep -q '\\' ) ; do
+      sed -n -e '1,1p' .tmp.2 | sed -e \
+         's|^[-]*[ \t][ \t]*\([a-zA-Z][a-zA-Z-]*:[ \t][ \t]*\)*\("[^"][^"]*"[ \t][ \t]*\)*||' | \
+         sed -e 's|[ \t].*$||' > .mod.name
+      modname=`cat .mod.name`
+      sed -i -e '1,1d' .tmp.2
+   done
+   N=1
+   Filen=$modname.conf
+   while [ -f $Filen ] ; do
+      N=$((N+1))
+      Filen=$modname-$N.conf
+   done
+   sed -e 's|\\n$|\\n\\|' .tmp > $Filen
+   echo "   created: $Filen"
+
+# clean up
+   rm -f .tmp* .mod.name
+
+done
+set -x
+cd ../..
+%endif
+
 %install
 archdir=`./config.guess`
 cd $archdir
@@ -323,6 +383,57 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+%if %{modular_conf}
+# install update script
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}
+echo "%{_bindir}/update-xscreensaver-hacks" >> $dd/base.files
+
+# make hack conf modular
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
+cp -p xscreensaver/XScreenSaver.ad* \
+   $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+cp -p xscreensaver/hacks.conf.d/*.conf \
+   $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
+
+for adfile in xscreensaver/XScreenSaver.ad.* ; do
+   filen=`basename $adfile`
+   echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
+done
+echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
+echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+   $dd/base.files
+
+# check symlink
+rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+pushd ../../../..
+if [ ! $(pwd) == $RPM_BUILD_ROOT ] ; then
+   echo "Possibly symlink broken"
+   exit 1
+fi
+popd
+popd
+
+ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
+   $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+set +x
+for conf in xscreensaver/hacks.conf.d/*.conf ; do
+   modname=`basename $conf | sed -e 's|.conf||' | sed -e 's|-.*||'`
+   if grep -q -i $modname $dd/extras.files ; then
+        hackfile=$dd/extras.files
+   else
+        hackfile=$dd/gl-extras.files
+   fi
+   echo "%{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`" >> $hackfile
+   echo -n " Added: %{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`"
+   echo " >> `basename $hackfile`"
+done
+set -x
+%endif
+
 # add documents
 pushd $dd &> /dev/null
 for f in README* ; do
@@ -332,7 +443,7 @@
 
 # add directory
 pushd $RPM_BUILD_ROOT
-for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+for dir in `find . -type d | grep xscreensaver` ; do
    echo "%%dir ${dir#.}" >> $dd/base.files
 done
 popd
@@ -414,6 +525,16 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%if %{modular_conf}
+%post extras
+%{_bindir}/update-xscreensaver-hacks
+exit 0
+
+%post gl-extras
+%{_bindir}/update-xscreensaver-hacks
+exit 0
+%endif
+
 %files
 %defattr(-,root,root,-)
 
@@ -433,6 +554,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
+- Try to make XScreenSaver.ad modular
+
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
 



From fedora-extras-commits at redhat.com  Sun Sep  2 16:50:00 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Sun, 2 Sep 2007 12:50:00 -0400
Subject: rpms/audit/devel .cvsignore, 1.81, 1.82 audit.spec, 1.144,
	1.145 sources, 1.101, 1.102 audit-1.6-audispd.patch, 1.1,
	NONE s-c-audit-0.4.3.patch, 1.1, NONE
Message-ID: <200709021650.l82Go0vw008209@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8180

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.6-audispd.patch s-c-audit-0.4.3.patch 
Log Message:
* Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
- External plugin support in place
- Fix reference counting in auparse python bindings (#263961)
- Moved default af_unix plugin socket to /var/run/audispd_events



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	27 Aug 2007 20:29:41 -0000	1.81
+++ .cvsignore	2 Sep 2007 16:49:22 -0000	1.82
@@ -78,3 +78,4 @@
 audit-1.5.5.tar.gz
 audit-1.5.6.tar.gz
 audit-1.6.tar.gz
+audit-1.6.1.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- audit.spec	29 Aug 2007 17:18:22 -0000	1.144
+++ audit.spec	2 Sep 2007 16:49:22 -0000	1.145
@@ -1,16 +1,14 @@
 %define sca_version 0.4.3
-%define sca_release 2
+%define sca_release 3
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch1: s-c-audit-0.4.3.patch
-Patch2: audit-1.6-audispd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -69,8 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -158,6 +154,7 @@
 
 %files libs-devel
 %defattr(-,root,root)
+%doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
@@ -175,7 +172,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -194,7 +191,7 @@
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/*
+%attr(640,root,root) /etc/audisp/plugins.d/*
 
 %files -n system-config-audit -f system-config-audit.lang
 %defattr(-,root,root,-)
@@ -212,6 +209,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
+- External plugin support in place
+- Fix reference counting in auparse python bindings (#263961)
+- Moved default af_unix plugin socket to /var/run/audispd_events
+
 * Wed Aug 29 2007 Steve Grubb <sgrubb at redhat.com> 1.6-3
 - Add newline to audispd string formatted events
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	27 Aug 2007 20:29:41 -0000	1.101
+++ sources	2 Sep 2007 16:49:22 -0000	1.102
@@ -1 +1 @@
-538b2fc33878e420da1daabc769d1e1b  audit-1.6.tar.gz
+ce393ed76e25dd95f2d54ae27e7a25be  audit-1.6.1.tar.gz


--- audit-1.6-audispd.patch DELETED ---


--- s-c-audit-0.4.3.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 17:00:26 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sun,  2 Sep 2007 13:00:26 -0400
Subject: status-report-scripts pyGetReviewByFlags,1.7,1.8
Message-ID: <200709021700.l82H0RXm008494@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8476

Modified Files:
	pyGetReviewByFlags 
Log Message:
Adjust to new xmlrpc interface location.



Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyGetReviewByFlags	26 Jul 2007 18:01:12 -0000	1.7
+++ pyGetReviewByFlags	2 Sep 2007 17:00:23 -0000	1.8
@@ -17,7 +17,7 @@
 import tempfile
 import glob
 
-url = 'http://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
+url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
 
 flagData = {
     # 'FLAG' : (baseFlagFilename, openMsg, closeMsg),



From fedora-extras-commits at redhat.com  Sun Sep  2 17:20:55 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 13:20:55 -0400
Subject: rpms/icewm/EL-4 .cvsignore, 1.2, 1.3 icewm.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200709021720.l82HKtlQ015384@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	2 Sep 2007 17:20:22 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/icewm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icewm.spec	27 Aug 2007 14:00:27 -0000	1.3
+++ icewm.spec	2 Sep 2007 17:20:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,13 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsYSaXQR and /tmp/cvsI3AzIk differ



From fedora-extras-commits at redhat.com  Sun Sep  2 17:26:29 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 2 Sep 2007 13:26:29 -0400
Subject: rpms/piklab/devel piklab.spec,1.18,1.19
Message-ID: <200709021726.l82HQTtQ015515@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430/devel

Modified Files:
	piklab.spec 
Log Message:



Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- piklab.spec	18 Aug 2007 09:52:47 -0000	1.18
+++ piklab.spec	2 Sep 2007 17:25:56 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.14.5
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -70,14 +70,15 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --add-category "Application" \
-  --remove-category "QT" \
+
+desktop-file-install --vendor=fedora \
+  --dir %{buildroot}%{_datadir}/applications \
+  --add-category "Science" \
+  --remove-category "Development" \
+  --remove-category "IDE" \
   --remove-key="Patterns" \
   --delete-original \
-  src/data/app_data/%{name}.desktop
+  %{buildroot}/usr/share/applications/kde/piklab.desktop
 
 %{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
 %{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
@@ -102,18 +103,18 @@
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
 %{_datadir}/doc/HTML/en/%{name}/
@@ -124,6 +125,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Sun Sep 02 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.14.5-2
+  - fixing desktop file
+
 * Fri Aug 17 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.14.5-1
   - New upstream version
   - %%patch0 is no more needed



From fedora-extras-commits at redhat.com  Sun Sep  2 18:22:24 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 14:22:24 -0400
Subject: rpms/subversion/devel subversion.spec,1.100,1.101
Message-ID: <200709021822.l82IMOwe022380@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22336

Modified Files:
	subversion.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.4.4-7
- rebuild for fixed 32-bit APR 



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- subversion.spec	30 Aug 2007 14:37:01 -0000	1.100
+++ subversion.spec	2 Sep 2007 18:21:51 -0000	1.101
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.4
-Release: 6
+Release: 7
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -274,6 +274,9 @@
 %endif
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.4.4-7
+- rebuild for fixed 32-bit APR 
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 1.4.4-6
 - clarify License tag; re-enable test suite
 



From fedora-extras-commits at redhat.com  Sun Sep  2 18:56:39 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 14:56:39 -0400
Subject: rpms/subcommander/devel subcommander.spec,1.3,1.4
Message-ID: <200709021856.l82IudTZ022920@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/subcommander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22897

Modified Files:
	subcommander.spec 
Log Message:
Rebuild agains new neon lib


Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- subcommander.spec	8 Aug 2007 18:22:03 -0000	1.3
+++ subcommander.spec	2 Sep 2007 18:56:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		subcommander
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -66,6 +66,9 @@
 %doc README CHANGES COPYING
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-7
+- Rebuild agains updated neon lib (#243638)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-6
 - Changing license tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 19:31:09 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:31:09 -0400
Subject: rpms/suck/F-7 README.Fedora,1.1,1.2 suck.spec,1.10,1.11
Message-ID: <200709021931.l82JV96e029333@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267

Modified Files:
	README.Fedora suck.spec 
Log Message:
Add IPv6 support


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	8 Nov 2004 05:23:08 -0000	1.1
+++ README.Fedora	2 Sep 2007 19:30:36 -0000	1.2
@@ -75,7 +75,7 @@
 
 Then you can create a newsgroup with the following command:
 
-$ ctlinnd newgroups de.test
+$ ctlinnd newgroup de.test
 
 In this example a group for posting test articles was created on the local
 newsserver.


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- suck.spec	25 Mar 2007 19:10:10 -0000	1.10
+++ suck.spec	2 Sep 2007 19:30:36 -0000	1.11
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 14%{?dist}
+Release: 17%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -11,10 +11,12 @@
 Patch1: suck-4.3.2-perl.patch
 Patch2: suck-4.3.2-samples.patch
 Patch3: suck-4.3.2-parallel-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+Patch4: suck-4.3.2-ipv6.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 License: Public Domain
 Group: System Environment/Daemons
-BuildRequires: inn-devel >= 2.3, perl >= 3:5.8
+BuildRequires: inn-devel >= 2.3, perl-devel >= 3:5.8
 BuildRequires: openssl-devel, autoconf
 Requires: inn >= 2.3
 Conflicts: leafnode
@@ -30,6 +32,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp %{SOURCE3} .
 
@@ -42,12 +45,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall mandir=${RPM_BUILD_ROOT}%{_mandir}/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/news/bin
+make install DESTDIR=${RPM_BUILD_ROOT} \
+     bindir=${RPM_BUILD_ROOT}%{_bindir} \
+     mandir=${RPM_BUILD_ROOT}%{_mandir}/man1
+
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
-mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
-cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_libdir}/news/bin/getnews
+cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
 cp sample/put.news.sm ${RPM_BUILD_ROOT}/var/lib/news/suck/
 cp sample/put.news.sm.pl ${RPM_BUILD_ROOT}/var/lib/news/suck/
 cp %{SOURCE1} ${RPM_BUILD_ROOT}/var/lib/news/suck
@@ -66,8 +72,8 @@
 %{_bindir}/rpost
 %{_bindir}/testhost
 %{_bindir}/lmove
-%{_libdir}/news/bin/getnews
-%dir /var/lib/news/suck/
+%{_prefix}/lib/news/bin/getnews
+%attr(-,news,news) %dir /var/lib/news/suck/
 /var/lib/news/suck/put.news.sm
 /var/lib/news/suck/put.news.sm.pl
 /var/lib/news/suck/active-ignore
@@ -77,9 +83,19 @@
 %{_mandir}/man1/lmove.1*
 
 %dir /etc/sysconfig/suck/
-%config(noreplace) /etc/sysconfig/suck/site
+%config(noreplace) %{_sysconfdir}/sysconfig/suck/site
 
 %changelog
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
+- Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
+
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16
+- Adding IPv6 support
+- Fix typo in README.Fedora
+
+* Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-15
+- Rebuild for build id feature
+
 * Sun Mar 25 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-14
 - Add parallel build putch
 



From fedora-extras-commits at redhat.com  Sun Sep  2 19:34:38 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:34:38 -0400
Subject: rpms/suck/F-7 suck-4.3.2-ipv6.patch,NONE,1.1 suck.spec,1.11,1.12
Message-ID: <200709021934.l82JYcXE029470@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29404

Modified Files:
	suck.spec 
Added Files:
	suck-4.3.2-ipv6.patch 
Log Message:
Add forgotten file

suck-4.3.2-ipv6.patch:

--- NEW FILE suck-4.3.2-ipv6.patch ---
diff -urN suck-4.3.2.orig/active.c suck-4.3.2/active.c
--- suck-4.3.2.orig/active.c	2001-09-15 00:06:40.000000000 +0200
+++ suck-4.3.2/active.c	2007-08-15 13:33:49.000000000 +0200
@@ -181,7 +181,6 @@
 	
 	/* connect to localhost NNTP server */
 	int fd;
-	struct hostent *hi;
 	char *inbuf;
 	unsigned int port;
 
@@ -190,7 +189,7 @@
 		do_debug("Connecting to %s on port %d\n", master->localhost, port);
 	}
 	
-	if((fd = connect_to_nntphost(master->localhost, &hi, NULL, port, master->local_ssl, &master->local_ssl_struct)) >= 0) {
+	if((fd = connect_to_nntphost(master->localhost, NULL, 0, NULL, port, master->local_ssl, &master->local_ssl_struct)) >= 0) {
 		/* get the announcement line */
 		if(sgetline(fd, &inbuf, master->local_ssl, master->local_ssl_struct) < 0) {
 			close(fd);
diff -urN suck-4.3.2.orig/both.c suck-4.3.2/both.c
--- suck-4.3.2.orig/both.c	2003-03-25 23:38:45.000000000 +0100
+++ suck-4.3.2/both.c	2007-08-15 13:33:49.000000000 +0200
@@ -138,35 +138,13 @@
 	return retval;
 }
 
-/*---------------------------------------------*/
-struct hostent *get_hostent(const char *host) {
-	struct in_addr saddr;
-	int c;
-	struct hostent *hi = NULL;
-
-	if(host==NULL) { 
-		error_log(ERRLOG_REPORT,both_phrases[0], NULL); 
-	}
-	else {
-		c=*host;
-		if(isdigit(c)) {
- 			saddr.s_addr = inet_addr(host); 
- 			hi = gethostbyaddr((char *)&saddr,sizeof(struct in_addr),AF_INET);
-		}
-		else {
-			hi = gethostbyname(host);
-		}
-	}
-	return hi;
-}
 /*--------------------------------------------*/
-int connect_to_nntphost(const char *host, struct hostent **hi, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl) {
-	char *ptr, *realhost;
-	struct in_addr *aptr;
-	struct in_addr saddr;
-	struct sockaddr_in address;
+int connect_to_nntphost(const char *host, char *hname, size_t hnlength, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl)
+{
+	char *realhost, *pport;
 	char sport[10];
-	int sockfd = -1;
+	struct addrinfo *l, hint = { 0 };
+	int r, sockfd = -1;
 	
 #ifdef HAVE_LIBSSL
 	SSL *ssl_struct = NULL;
@@ -184,65 +162,60 @@
 	}
 #endif
 	/* handle host:port type syntax */
-	realhost = strdup(host);
-	if(realhost == NULL) {
-		MyPerror("out of memory copying host name");
-		return sockfd;
-	}
-	ptr = strchr(realhost, ':');
-	if(ptr != NULL) {
-		*ptr = '\0';  /* null terminate host name */
-		portnr = atoi(++ptr); /* get port number */
-	}
-	
-	
-	
-	sprintf(sport, "%hu", portnr);	/* cause print_phrases wants all strings */
-	print_phrases(msgs, both_phrases[1], sport, NULL);
-
-	/* Find the internet address of the NNTP server */
- 	*hi = get_hostent(realhost);
- 	if(*hi == NULL) {
+	realhost = alloca(strlen(host) + 1);
+	strcpy(realhost, host);
+	pport = strchr(realhost, ':');
+	if(pport != NULL) {
+		*pport = '\0';	/* null terminate host name */
+		++pport;	/* get port number */
+	}
+	else
+	{
+		snprintf(sport, sizeof(sport), "%hu", portnr);	/* cause print_phrases wants all strings */
+		pport = sport;
+	}
+	print_phrases(msgs, both_phrases[1], pport, NULL);
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+	r = getaddrinfo(realhost, pport, &hint, &l);
+	if(r != 0 || l == NULL)
+	{
 		error_log(ERRLOG_REPORT,"%v1%: ",realhost, NULL);
   		MyPerror(both_phrases[2]);
-		free(realhost);
  	}
-	else {
-		free(realhost);
-		print_phrases(msgs, both_phrases[3], (*hi)->h_name, NULL);
- 		while((ptr = *((*hi)->h_aliases)) != NULL) {
-			print_phrases(msgs, both_phrases[4], ptr, NULL );
-			(*hi)->h_aliases++;
-		}
- 		if((*hi)->h_addrtype != AF_INET) {
-  			error_log(ERRLOG_REPORT, both_phrases[5], NULL);
-		}
-		else {
-			while((aptr = (struct in_addr *)*((*hi)->h_addr_list)++) != NULL) {
-				saddr = *aptr;
-				print_phrases(msgs, both_phrases[17], inet_ntoa(*aptr), NULL);
-			}
-
-			/* Create a socket */
- 			if((sockfd = socket( AF_INET, SOCK_STREAM, SOCKET_PROTOCOL)) == -1) {
-				MyPerror(both_phrases[6]);
-			}
-			else { 
-				address.sin_family = AF_INET;
-				address.sin_port = htons(portnr);  /* NNTP port */
-				address.sin_addr= saddr;
-
-				/* Establish a connection */
-				if(connect(sockfd, (struct sockaddr *)&address, sizeof address ) == -1) {
-					MyPerror(both_phrases[7]);
-					close(sockfd);
-					sockfd = -1;
-				}
-				else {
-					print_phrases(msgs,both_phrases[8], (*hi)->h_name, NULL);
+	else
+	{
+		struct addrinfo *p = l;
+		print_phrases(msgs, both_phrases[3], p->ai_canonname, NULL);
+                if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1)
+		{
+            		MyPerror(both_phrases[6]);
+                }
+                else
+		{
+                        if(connect(sockfd, p->ai_addr, p->ai_addrlen) == -1)
+			{
+                                MyPerror(both_phrases[7]);
+                                close(sockfd);
+                                sockfd = -1;
+                        }
+                        else
+			{
+				char lhost[256], lport[64];
+				r = getnameinfo(p->ai_addr, p->ai_addrlen, lhost, sizeof(lhost),
+						lport, sizeof(lport), 0);
+				if(r == 0)
+				{
+                        		print_phrases(msgs,both_phrases[8], lhost, NULL);
+					if(hname && hnlength)
+					{
+						strncpy(hname, lhost, hnlength);
+						hname[hnlength] = '\0';
+					}
 				}
-			}
+                        }
 		}
+		freeaddrinfo(l);
 #ifdef HAVE_LIBSSL
 		if(sockfd > -1 && do_ssl == TRUE) {
 			if((ssl_struct = SSL_new(test1)) == NULL) {
diff -urN suck-4.3.2.orig/both.h suck-4.3.2/both.h
--- suck-4.3.2.orig/both.h	2002-08-28 00:54:34.000000000 +0200
+++ suck-4.3.2/both.h	2007-08-15 13:33:49.000000000 +0200
@@ -9,7 +9,7 @@
 /* declarations */
 int sgetline(int fd, char **sbuf, int, void *);
 int sputline(int fd, const char *outbuf, int, void *);
-int connect_to_nntphost(const char *host, struct hostent **, FILE *, unsigned short int, int, void **);
+int connect_to_nntphost(const char *host, char *hname, size_t hnlength, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl);
 void disconnect_from_nntphost(int, int, void **);
 char *number(char *sp, int *intPtr);
 char *get_long(char *, long *);
diff -urN suck-4.3.2.orig/rpost.c suck-4.3.2/rpost.c
--- suck-4.3.2.orig/rpost.c	2007-08-15 13:33:17.000000000 +0200
+++ suck-4.3.2/rpost.c	2007-08-15 13:33:49.000000000 +0200
@@ -28,7 +28,7 @@
 #ifndef PL_na
 # define PL_na (na)
 #endif
-#endif /* OLD_PERL */u
+#endif /* OLD_PERL */
 #endif
 
 #ifdef HAVE_DIRENT_H
@@ -117,7 +117,7 @@
 int main(int argc, char *argv[], char *env[]) {
 	char *inbuf;
 	int response, retval, loop, fargc, i;
-	struct hostent *hi;
+	char hname[256];
 	struct stat sbuf;
 	char **args, **fargs;
 	Args myargs;
@@ -244,7 +244,7 @@
 			retval = RETVAL_ERROR;
 		}
 		else {
-			myargs.sockfd = connect_to_nntphost( myargs.host, &hi, myargs.status_fptr, myargs.portnr, myargs.do_ssl, &myargs.ssl_struct);
+			myargs.sockfd = connect_to_nntphost(myargs.host, hname, sizeof(hname), myargs.status_fptr, myargs.portnr, myargs.do_ssl, &myargs.ssl_struct);
 			if(myargs.sockfd < 0) {
 				retval = RETVAL_ERROR;
 			}
@@ -299,7 +299,7 @@
 				retval = do_article(&myargs, stdin);
 			}
 	
-			print_phrases(myargs.status_fptr, rpost_phrases[4], hi->h_name, NULL);
+			print_phrases(myargs.status_fptr, rpost_phrases[4], hname, NULL);
 			if(myargs.debug == TRUE) {
 				do_debug("Sending quit");
 			}
diff -urN suck-4.3.2.orig/suck.c suck-4.3.2/suck.c
--- suck-4.3.2.orig/suck.c	2003-03-28 20:24:54.000000000 +0100
+++ suck-4.3.2/suck.c	2007-08-15 13:33:49.000000000 +0200
@@ -665,7 +665,6 @@
 
 	char *inbuf;
 	int nr, resp, retval = RETVAL_OK;
-	struct hostent *hi;
 	FILE *fp;
 	
 	
@@ -696,7 +695,7 @@
 	}
 	fp = (which_time == CONNECT_FIRST) ? master->msgs : NULL;
 
-	master->sockfd = connect_to_nntphost( master->host, &hi, fp, master->portnr, master->do_ssl, &master->ssl_struct);
+	master->sockfd = connect_to_nntphost( master->host, NULL, 0, fp, master->portnr, master->do_ssl, &master->ssl_struct);
 	
 	if(master->sockfd < 0 ) {
 		retval = RETVAL_ERROR;
diff -urN suck-4.3.2.orig/testhost.c suck-4.3.2/testhost.c
--- suck-4.3.2.orig/testhost.c	2003-03-23 16:34:46.000000000 +0100
+++ suck-4.3.2/testhost.c	2007-08-15 13:33:49.000000000 +0200
@@ -59,7 +59,6 @@
 int main(int argc, char *argv[]) {
 
 	int sockfd, response, loop, cmd, quiet, mode_reader, do_ssl, retval = RETVAL_OK;
-	struct hostent *hi;
 	struct stat sbuf;
 	unsigned short int portnr;
 	FILE *fptr = stdout;		/* used to print output to */
@@ -229,7 +228,7 @@
 	if(retval == RETVAL_OK) {
 		load_phrases(phrases);	/* this is here so everything displays okay */
 
-		sockfd = connect_to_nntphost( host, &hi, (quiet == FALSE)?  fptr : NULL, portnr, do_ssl, &ssl_struct);
+		sockfd = connect_to_nntphost(host, NULL, 0, (quiet == FALSE)?  fptr : NULL, portnr, do_ssl, &ssl_struct);
 		if(sockfd < 0 ) {
 			retval = RETVAL_ERROR;
 		}


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- suck.spec	2 Sep 2007 19:30:36 -0000	1.11
+++ suck.spec	2 Sep 2007 19:34:05 -0000	1.12
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}
+Release: 17%{?dist}.1
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -86,7 +86,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
 
 %changelog
-* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17.1
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16



From fedora-extras-commits at redhat.com  Sun Sep  2 19:44:08 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:44:08 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.4, 1.5 inadyn.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200709021944.l82Ji8ug029719@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/inadyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29697

Modified Files:
	.cvsignore inadyn.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2005 16:28:46 -0000	1.4
+++ .cvsignore	2 Sep 2007 19:43:36 -0000	1.5
@@ -1 +1 @@
-inadyn.v1.96.zip
+inadyn.v1.96.2.zip


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- inadyn.spec	8 Aug 2007 18:04:24 -0000	1.16
+++ inadyn.spec	2 Sep 2007 19:43:36 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           inadyn
 
-Version:        1.96
-Release: 	4%{?dist}
+Version:        1.96.2
+Release: 	1%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -82,6 +82,9 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96.2-1
+- New upstream release (#270801)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96-4
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2005 16:28:46 -0000	1.4
+++ sources	2 Sep 2007 19:43:36 -0000	1.5
@@ -1 +1 @@
-0d5ab08003ac08c36f55a562d0c4b1c1  inadyn.v1.96.zip
+d394ed5ab7a9313992bdc62c412cb369  inadyn.v1.96.2.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 19:50:12 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:50:12 -0400
Subject: rpms/inadyn/F-7 inadyn.spec,1.15,1.16 sources,1.4,1.5
Message-ID: <200709021950.l82JoCwx029878@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/inadyn/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29851

Modified Files:
	inadyn.spec sources 
Log Message:
New upstream version


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/F-7/inadyn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- inadyn.spec	3 Sep 2006 19:31:43 -0000	1.15
+++ inadyn.spec	2 Sep 2007 19:49:39 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           inadyn
 
-Version:        1.96
-Release: 	3%{?dist}
+Version:        1.96.2
+Release: 	1%{?dist}
 
 Summary:        Dynamic DNS Client
 
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://inadyn.ina-tech.net
 Source0:        http://inadyn.ina-tech.net/inadyn.v%{version}.zip
 Source1:        inadyn.conf
@@ -82,6 +82,12 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96.2-1
+- New upstream release (#270801)
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96-4
+- Changing license tag
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.96-3
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2005 16:28:46 -0000	1.4
+++ sources	2 Sep 2007 19:49:39 -0000	1.5
@@ -1 +1 @@
-0d5ab08003ac08c36f55a562d0c4b1c1  inadyn.v1.96.zip
+d394ed5ab7a9313992bdc62c412cb369  inadyn.v1.96.2.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:05 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:05 -0400
Subject: rpms/icewm/EL-4 icewm.spec,1.4,1.5
Message-ID: <200709021951.l82Jp5lx030015@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/EL-4

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	2 Sep 2007 17:20:22 -0000	1.4
+++ icewm.spec	2 Sep 2007 19:50:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:08 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:08 -0400
Subject: rpms/icewm/EL-5 .cvsignore, 1.1, 1.2 icewm.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709021951.l82Jp88S030024@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/EL-5

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2007 19:36:05 -0000	1.1
+++ .cvsignore	2 Sep 2007 19:50:35 -0000	1.2
@@ -0,0 +1 @@
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:31 -0000	1.4
+++ icewm.spec	2 Sep 2007 19:50:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,16 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvs4k5Nd3 and /tmp/cvsAbnpcP differ



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:10 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:10 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.6,1.7
Message-ID: <200709021951.l82JpAPN030027@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/F-7

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icewm.spec	1 Sep 2007 08:28:59 -0000	1.6
+++ icewm.spec	2 Sep 2007 19:50:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:13 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:13 -0400
Subject: rpms/icewm/FC-6 icewm.spec,1.5,1.6
Message-ID: <200709021951.l82JpDNv030030@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/FC-6

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	1 Sep 2007 09:04:21 -0000	1.5
+++ icewm.spec	2 Sep 2007 19:50:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:16 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:16 -0400
Subject: rpms/icewm/devel icewm.spec,1.6,1.7
Message-ID: <200709021951.l82JpGvK030033@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/devel

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icewm.spec	1 Sep 2007 08:48:41 -0000	1.6
+++ icewm.spec	2 Sep 2007 19:50:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 20:46:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:46:38 -0400
Subject: rpms/lesstif/devel lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE,
	1.1 lesstif.spec, 1.15, 1.16 lesstif-0.95.0-cutpaste64.patch,
	1.1, NONE lesstif-64.patch, 1.1, NONE
Message-ID: <200709022046.l82Kkcgu005542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5515

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lesstif.spec	30 Aug 2007 22:43:44 -0000	1.15
+++ lesstif.spec	2 Sep 2007 20:46:05 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)


--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 20:49:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:49:15 -0400
Subject: rpms/lesstif/F-7 lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE, 1.1 mwm.desktop,
	NONE, 1.1 lesstif-0.95.0-cutpaste64.patch, 1.1,
	NONE lesstif-64.patch, 1.1, NONE
Message-ID: <200709022049.l82KnFnO005630@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5616

Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch mwm.desktop 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
- Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
- Fix accelkeys which use more then one modifier (bz 214018)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


--- NEW FILE mwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mwm
Comment=Lesstif Motif window manager clone based on fvwm
Exec=mwm
Terminal=False
TryExec=mwm

[Window Manager]
SessionManaged=true



--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 20:51:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:51:44 -0400
Subject: rpms/lesstif/F-7 lesstif.spec,1.11,1.12
Message-ID: <200709022051.l82KpiSF005713@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695

Modified Files:
	lesstif.spec 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lesstif.spec	30 Aug 2007 22:47:17 -0000	1.11
+++ lesstif.spec	2 Sep 2007 20:51:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)



From fedora-extras-commits at redhat.com  Sun Sep  2 20:57:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:57:10 -0400
Subject: rpms/lesstif/FC-6 lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE, 1.1 mwm.desktop,
	NONE, 1.1 lesstif.spec, 1.9,
	1.10 lesstif-0.95.0-cutpaste64.patch, 1.1, NONE lesstif-64.patch,
	1.1, NONE
Message-ID: <200709022057.l82KvAaN005922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch mwm.desktop 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


--- NEW FILE mwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mwm
Comment=Lesstif Motif window manager clone based on fvwm
Exec=mwm
Terminal=False
TryExec=mwm

[Window Manager]
SessionManaged=true



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lesstif.spec	30 Aug 2007 23:00:09 -0000	1.9
+++ lesstif.spec	2 Sep 2007 20:56:37 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)


--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 22:25:12 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 2 Sep 2007 18:25:12 -0400
Subject: rpms/vala/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vala.spec,
	1.4, 1.5
Message-ID: <200709022225.l82MPCcx019995@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19918

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
Update to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2007 16:02:02 -0000	1.5
+++ .cvsignore	2 Sep 2007 22:24:39 -0000	1.6
@@ -1 +1 @@
-vala-0.0.8.tar.bz2
+vala-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2007 16:02:02 -0000	1.5
+++ sources	2 Sep 2007 22:24:39 -0000	1.6
@@ -1 +1 @@
-54c7b20e570121c9151ec9534ed68b79  vala-0.0.8.tar.bz2
+d6552982b10582d0b01c3d612fb098b2  vala-0.1.3.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vala.spec	25 Mar 2007 16:02:02 -0000	1.4
+++ vala.spec	2 Sep 2007 22:24:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           vala
-Version:        0.0.8
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -70,6 +70,7 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +81,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Mon Sep  3 00:49:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 2 Sep 2007 20:49:22 -0400
Subject: comps comps-f8.xml.in,1.85,1.86
Message-ID: <200709030049.l830nMQw001300@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1282

Modified Files:
	comps-f8.xml.in 
Log Message:
add ratpoison to Window Managers



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- comps-f8.xml.in	1 Sep 2007 13:16:06 -0000	1.85
+++ comps-f8.xml.in	3 Sep 2007 00:48:52 -0000	1.86
@@ -3794,6 +3794,7 @@
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">openbox</packagereq>
       <packagereq type="optional">pekwm</packagereq>
+      <packagereq type="optional">ratpoison</packagereq>
       <packagereq type="optional">windowlab</packagereq>
       <packagereq type="optional">WindowMaker</packagereq>
       <packagereq type="optional">wmx</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 02:42:00 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 2 Sep 2007 22:42:00 -0400
Subject: comps comps-f8.xml.in,1.86,1.87
Message-ID: <200709030242.l832g0al014917@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886

Modified Files:
	comps-f8.xml.in 
Log Message:
add matchbox-window-manager



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- comps-f8.xml.in	3 Sep 2007 00:48:52 -0000	1.86
+++ comps-f8.xml.in	3 Sep 2007 02:41:29 -0000	1.87
@@ -3790,6 +3790,7 @@
       <packagereq type="optional">fvwm</packagereq>
       <packagereq type="optional">hackedbox</packagereq>
       <packagereq type="optional">icewm</packagereq>
+      <packagereq type="optional">matchbox-window-manager</packagereq>
       <packagereq type="optional">obconf</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">openbox</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 03:12:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 2 Sep 2007 23:12:30 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.161,1.162
Message-ID: <200709030312.l833CUiO021375@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21357

Modified Files:
	gnome-vfs2.spec 
Log Message:
break dep cycle



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnome-vfs2.spec	12 Aug 2007 02:17:02 -0000	1.161
+++ gnome-vfs2.spec	3 Sep 2007 03:11:57 -0000	1.162
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.19.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -24,7 +24,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_version}
+#Requires:      gnome-mount >= %{gnome_mount_version}
 Requires:      GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
@@ -229,6 +229,10 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Sun Sep  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-3
+- Temporarily drop gnome-mount requires to break PolicyKit-gnome 
+  dependency cycle
+
 * Sat Aug 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-2
 - Fix the build
 - Update the license field



From fedora-extras-commits at redhat.com  Mon Sep  3 03:17:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 2 Sep 2007 23:17:58 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.162,1.163
Message-ID: <200709030317.l833HwfO021606@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21586

Modified Files:
	gnome-vfs2.spec 
Log Message:
drop one more



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-vfs2.spec	3 Sep 2007 03:11:57 -0000	1.162
+++ gnome-vfs2.spec	3 Sep 2007 03:17:26 -0000	1.163
@@ -48,7 +48,7 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+#BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:10 -0400
Subject: rpms/perl-HTML-Format/devel perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JAiO021722@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/devel

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/devel/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:37 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:12 -0400
Subject: rpms/perl-HTML-Format/F-7 perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JCiu021825@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/F-7

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/F-7/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:40 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:15 -0400
Subject: rpms/perl-HTML-Format/FC-6 perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JFca021828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/FC-6

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/FC-6/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:43 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:24:50 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:24:50 -0400
Subject: rpms/perl-HTML-Format/devel perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030324.l833Oo5J022448@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22430

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/devel/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:37 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:24:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:25:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:25:57 -0400
Subject: rpms/perl-HTML-Format/F-7 perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030325.l833PvU0022523@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22502

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/F-7/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:40 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:25:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:27:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:27:25 -0400
Subject: rpms/perl-HTML-Format/FC-6 perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030327.l833RPPx022617@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22572

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/FC-6/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:43 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:26:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:45 -0400
Subject: rpms/perl-File-Find-Rule/devel perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bj9O022858@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/devel

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/devel/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:13 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:48 -0400
Subject: rpms/perl-File-Find-Rule/F-7 perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bmDD022861@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/F-7

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-7/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:16 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:51 -0400
Subject: rpms/perl-File-Find-Rule/FC-6 perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bpJl022864@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/FC-6

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/FC-6/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:18 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:43:46 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Sun, 2 Sep 2007 23:43:46 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.35,1.36
Message-ID: <200709030343.l833hk6W023167@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131/F-7

Modified Files:
	stardict.spec 
Log Message:
small fix on rpmlint warning


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stardict.spec	27 Aug 2007 02:38:46 -0000	1.35
+++ stardict.spec	3 Sep 2007 03:43:13 -0000	1.36
@@ -7,7 +7,7 @@
 Version:	%{version}
 Release:	3%{?dist}
 Group: 		Applications/System
-License: 	GPL
+License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.0-floatwin.patch
@@ -68,7 +68,7 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%{_sysconfdir}/gconf/schemas/*.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict



From fedora-extras-commits at redhat.com  Mon Sep  3 03:43:48 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Sun, 2 Sep 2007 23:43:48 -0400
Subject: rpms/stardict/devel stardict.spec,1.35,1.36
Message-ID: <200709030343.l833hmOE023170@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131/devel

Modified Files:
	stardict.spec 
Log Message:
small fix on rpmlint warning


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stardict.spec	23 Aug 2007 03:17:40 -0000	1.35
+++ stardict.spec	3 Sep 2007 03:43:16 -0000	1.36
@@ -7,7 +7,7 @@
 Version:	%{version}
 Release:	3%{?dist}
 Group: 		Applications/System
-License: 	GPL
+License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.0-floatwin.patch
@@ -68,7 +68,7 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%{_sysconfdir}/gconf/schemas/*.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict



From fedora-extras-commits at redhat.com  Mon Sep  3 04:07:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 00:07:42 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.8,1.9
Message-ID: <200709030407.l8347gBP029377@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29355

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
fix BRs



Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PolicyKit-gnome.spec	1 Sep 2007 00:20:42 -0000	1.8
+++ PolicyKit-gnome.spec	3 Sep 2007 04:07:09 -0000	1.9
@@ -10,7 +10,7 @@
 Summary: GNOME dialogs for PolicyKit
 Name: PolicyKit-gnome
 Version: 0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
@@ -25,6 +25,7 @@
 BuildRequires: PolicyKit-devel >= %{polkit_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: intltool >= %{intltool_version}
+BuildRequires: gettext
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: gtk2 >= %{gtk2_version}
@@ -79,6 +80,9 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 0.5-4
+- Add gettext BR
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
 - Rebuild
 



From fedora-extras-commits at redhat.com  Mon Sep  3 04:26:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 00:26:53 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.50, 1.51 gnome-vfs2.spec, 1.163,
	1.164 sources, 1.52, 1.53
Message-ID: <200709030426.l834QruL029622@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Jul 2007 16:54:22 -0000	1.50
+++ .cvsignore	3 Sep 2007 04:26:21 -0000	1.51
@@ -1 +1 @@
-gnome-vfs-2.19.3.tar.bz2
+gnome-vfs-2.19.91.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-vfs2.spec	3 Sep 2007 03:17:26 -0000	1.163
+++ gnome-vfs2.spec	3 Sep 2007 04:26:21 -0000	1.164
@@ -13,8 +13,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.19.3
-Release: 3%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -24,7 +24,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-#Requires:      gnome-mount >= %{gnome_mount_version}
+Requires:      gnome-mount >= %{gnome_mount_version}
 Requires:      GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
@@ -48,7 +48,7 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-#BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
@@ -72,8 +72,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=356772
 Patch8: gnome-vfs-2.16.0-no-dbus.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=465836
-Patch9: posix.patch
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -126,7 +124,6 @@
 %patch201 -p0 -b .console
 
 %patch8 -p1 -b .no-dbus
-%patch9 -p1 -b .posix
 
 %build
 
@@ -229,6 +226,11 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Re-add gnome-mount dependency
+- Update to 2.19.91
+- Drop upstreamed posix patch
+
 * Sun Sep  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-3
 - Temporarily drop gnome-mount requires to break PolicyKit-gnome 
   dependency cycle


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	27 Jul 2007 16:54:22 -0000	1.52
+++ sources	3 Sep 2007 04:26:21 -0000	1.53
@@ -1 +1 @@
-3668d49286cf73c15c3c5f383f1e6966  gnome-vfs-2.19.3.tar.bz2
+6a08abf1f6f0188d7f4ae1e21a9b9551  gnome-vfs-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:06:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 01:06:42 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.59, 1.60 nautilus.spec, 1.163,
	1.164 sources, 1.63, 1.64
Message-ID: <200709030506.l8356gNs003748@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	14 Aug 2007 02:47:35 -0000	1.59
+++ .cvsignore	3 Sep 2007 05:06:08 -0000	1.60
@@ -1 +1 @@
-nautilus-2.19.90.tar.bz2
+nautilus-2.19.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- nautilus.spec	14 Aug 2007 02:47:35 -0000	1.163
+++ nautilus.spec	3 Sep 2007 05:06:08 -0000	1.164
@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.19.90
+Version: 	2.19.91
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -221,6 +221,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	14 Aug 2007 02:47:35 -0000	1.63
+++ sources	3 Sep 2007 05:06:08 -0000	1.64
@@ -1 +1 @@
-1503bfe9934edebfd0ae34e5f880b425  nautilus-2.19.90.tar.bz2
+0fe63741bbd8052ee0329b3312a2724c  nautilus-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:26:10 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:26:10 -0400
Subject: rpms/libgeda/FC-6 .cvsignore, 1.9, 1.10 libgeda.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200709030526.l835QAHK006018@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994/FC-6

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:39:02 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:25:38 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/libgeda.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgeda.spec	14 Jul 2007 11:39:02 -0000	1.12
+++ libgeda.spec	3 Sep 2007 05:25:38 -0000	1.13
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
+Version:         20070902
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
-License:         GPL
+License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:39:02 -0000	1.9
+++ sources	3 Sep 2007 05:25:38 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:27:56 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:27:56 -0400
Subject: rpms/libgeda/F-7 .cvsignore, 1.9, 1.10 libgeda.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709030527.l835RupB006116@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6090/F-7

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:42:10 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:27:23 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/libgeda.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgeda.spec	14 Jul 2007 11:42:10 -0000	1.11
+++ libgeda.spec	3 Sep 2007 05:27:23 -0000	1.12
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
+Version:         20070902
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
-License:         GPL
+License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:42:10 -0000	1.9
+++ sources	3 Sep 2007 05:27:23 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:28:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 01:28:42 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.57, 1.58 file-roller.spec, 1.99,
	1.100 sources, 1.58, 1.59
Message-ID: <200709030528.l835SgI7006201@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6154

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	13 Aug 2007 23:37:37 -0000	1.57
+++ .cvsignore	3 Sep 2007 05:28:09 -0000	1.58
@@ -1 +1 @@
-file-roller-2.19.90.tar.bz2
+file-roller-2.19.91.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- file-roller.spec	24 Aug 2007 14:44:35 -0000	1.99
+++ file-roller.spec	3 Sep 2007 05:28:09 -0000	1.100
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.90
-Release: 	2%{?dist}
+Version:	2.19.91
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	13 Aug 2007 23:37:37 -0000	1.58
+++ sources	3 Sep 2007 05:28:09 -0000	1.59
@@ -1 +1 @@
-c94ae2947227f42b30dcfd366e49dab4  file-roller-2.19.90.tar.bz2
+0afe74b6c2b67e30e5fa6ee2256dcead  file-roller-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:29:34 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:29:34 -0400
Subject: rpms/libgeda/devel .cvsignore, 1.9, 1.10 libgeda.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709030529.l835TYkZ006270@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6212/devel

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:44:32 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:29:01 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgeda.spec	23 Aug 2007 23:20:59 -0000	1.11
+++ libgeda.spec	3 Sep 2007 05:29:01 -0000	1.12
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
-Release:         2%{?dist}
+Version:         20070902
+Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
 License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,9 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
 - mass rebuild for fedora 8 - ppc32
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:44:32 -0000	1.9
+++ sources	3 Sep 2007 05:29:01 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:32:27 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:32:27 -0400
Subject: rpms/geda-utils/FC-6 .cvsignore, 1.7, 1.8 geda-utils.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030532.l835WRxm006424@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6400/FC-6

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:23:14 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:31:55 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-utils.spec	14 Jul 2007 12:23:14 -0000	1.7
+++ geda-utils.spec	3 Sep 2007 05:31:55 -0000	1.8
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,6 +78,12 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:23:14 -0000	1.7
+++ sources	3 Sep 2007 05:31:55 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:33:43 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:33:43 -0400
Subject: rpms/geda-utils/F-7 .cvsignore, 1.7, 1.8 geda-utils.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030533.l835XhCQ006510@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6485/F-7

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:24:38 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:33:11 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/geda-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-utils.spec	14 Jul 2007 12:24:38 -0000	1.7
+++ geda-utils.spec	3 Sep 2007 05:33:11 -0000	1.8
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,6 +78,12 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:24:38 -0000	1.7
+++ sources	3 Sep 2007 05:33:11 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:35:29 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:35:29 -0400
Subject: rpms/geda-utils/devel .cvsignore, 1.7, 1.8 geda-utils.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200709030535.l835ZT4p006638@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6588/devel

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:27:01 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:34:57 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/geda-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-utils.spec	24 Aug 2007 00:20:04 -0000	1.8
+++ geda-utils.spec	3 Sep 2007 05:34:57 -0000	1.9
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,8 +78,11 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:27:01 -0000	1.7
+++ sources	3 Sep 2007 05:34:57 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:37:00 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:37:00 -0400
Subject: rpms/geda-symbols/FC-6 .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <200709030537.l835b05G006764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701/FC-6

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:08:59 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:36:28 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:08:59 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:36:28 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:08:59 -0000	1.8
+++ sources	3 Sep 2007 05:36:28 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:37:31 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:37:31 -0400
Subject: rpms/geda-gsymcheck/FC-6 .cvsignore, 1.8, 1.9 geda-gsymcheck.spec,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709030537.l835bVZw006832@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6755/FC-6

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:35:57 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:36:58 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/geda-gsymcheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gsymcheck.spec	14 Jul 2007 12:35:57 -0000	1.8
+++ geda-gsymcheck.spec	3 Sep 2007 05:36:58 -0000	1.9
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,6 +58,12 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:35:57 -0000	1.8
+++ sources	3 Sep 2007 05:36:58 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:23 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:23 -0400
Subject: rpms/geda-symbols/F-7 .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <200709030539.l835dNmc007002@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/F-7

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:10:29 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:50 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:10:29 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:38:50 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:10:29 -0000	1.8
+++ sources	3 Sep 2007 05:38:50 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:26 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:26 -0400
Subject: rpms/geda-gschem/FC-6 .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.10, 
	1.11 gschem.desktop, 1.3, 1.4 sources, 1.8, 1.9
Message-ID: <200709030539.l835dQqE007010@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6939/FC-6

Modified Files:
	.cvsignore geda-gschem.spec gschem.desktop sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:47:12 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:54 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gschem.spec	14 Jul 2007 11:47:12 -0000	1.10
+++ geda-gschem.spec	3 Sep 2007 05:38:54 -0000	1.11
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,12 +124,18 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: gschem.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/gschem.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gschem.desktop	4 Feb 2007 22:33:04 -0000	1.3
+++ gschem.desktop	3 Sep 2007 05:38:54 -0000	1.4
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gschem
+Name=gEDA Schematic Editor
 GenericName=gEDA Schematic Editor
 Comment=Editor for creating electronic circuit diagrams
 Exec=gschem
 Icon=gschem
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
+Categories=Science;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:47:12 -0000	1.8
+++ sources	3 Sep 2007 05:38:54 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:30 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:30 -0400
Subject: rpms/geda-gsymcheck/F-7 .cvsignore, 1.8, 1.9 geda-gsymcheck.spec,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709030539.l835dUIY007047@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6944/F-7

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:37:27 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:57 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/geda-gsymcheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gsymcheck.spec	14 Jul 2007 12:37:27 -0000	1.8
+++ geda-gsymcheck.spec	3 Sep 2007 05:38:57 -0000	1.9
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,6 +58,12 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:37:27 -0000	1.8
+++ sources	3 Sep 2007 05:38:57 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:40:53 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:40:53 -0400
Subject: rpms/geda-gschem/F-7 .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.10,
	1.11 gschem.desktop, 1.3, 1.4 sources, 1.8, 1.9
Message-ID: <200709030540.l835erw5007236@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7158/F-7

Modified Files:
	.cvsignore geda-gschem.spec gschem.desktop sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:48:33 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:20 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/geda-gschem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gschem.spec	14 Jul 2007 11:48:33 -0000	1.10
+++ geda-gschem.spec	3 Sep 2007 05:40:20 -0000	1.11
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,12 +124,18 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: gschem.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/gschem.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gschem.desktop	4 Feb 2007 22:34:32 -0000	1.3
+++ gschem.desktop	3 Sep 2007 05:40:20 -0000	1.4
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gschem
+Name=gEDA Schematic Editor
 GenericName=gEDA Schematic Editor
 Comment=Editor for creating electronic circuit diagrams
 Exec=gschem
 Icon=gschem
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
+Categories=Science;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:48:33 -0000	1.8
+++ sources	3 Sep 2007 05:40:20 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:41:07 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:41:07 -0400
Subject: rpms/geda-symbols/devel .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030541.l835f7Hv007292@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7202/devel

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:12:11 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:34 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:12:11 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:40:34 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:12:11 -0000	1.8
+++ sources	3 Sep 2007 05:40:34 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:41:25 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:41:25 -0400
Subject: rpms/geda-gsymcheck/devel .cvsignore, 1.8, 1.9 geda-gsymcheck.spec, 
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200709030541.l835fPv5007332@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7230/devel

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:39:18 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:53 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/geda-gsymcheck.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gsymcheck.spec	24 Aug 2007 00:17:59 -0000	1.9
+++ geda-gsymcheck.spec	3 Sep 2007 05:40:53 -0000	1.10
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
-Release:          2%{?dist}
+Version:          20070902
+Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
 License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,8 +58,11 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:39:18 -0000	1.8
+++ sources	3 Sep 2007 05:40:53 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:18 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:18 -0400
Subject: rpms/geda-gnetlist/FC-6 .cvsignore, 1.8, 1.9 geda-gnetlist.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030543.l835hIFO007487@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7420/FC-6

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:30:07 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:42:45 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/geda-gnetlist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gnetlist.spec	14 Jul 2007 12:30:07 -0000	1.9
+++ geda-gnetlist.spec	3 Sep 2007 05:42:45 -0000	1.10
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,6 +82,12 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:30:07 -0000	1.8
+++ sources	3 Sep 2007 05:42:45 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:41 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:41 -0400
Subject: rpms/geda-gschem/devel .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <200709030543.l835hfhH007548@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7456/devel

Modified Files:
	.cvsignore geda-gschem.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:50:06 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:43:08 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geda-gschem.spec	24 Aug 2007 00:31:47 -0000	1.11
+++ geda-gschem.spec	3 Sep 2007 05:43:08 -0000	1.12
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
-Release:          2%{?dist}
+Version:          20070902
+Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
 License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,14 +124,17 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:50:06 -0000	1.8
+++ sources	3 Sep 2007 05:43:08 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:59 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:59 -0400
Subject: rpms/geda-gattrib/FC-6 .cvsignore, 1.7, 1.8 gattrib.desktop, 1.4,
	1.5 geda-gattrib.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200709030543.l835hxIP007596@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7495/FC-6

Modified Files:
	.cvsignore gattrib.desktop geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:14:03 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:43:27 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: gattrib.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/gattrib.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gattrib.desktop	14 Jul 2007 12:14:03 -0000	1.4
+++ gattrib.desktop	3 Sep 2007 05:43:27 -0000	1.5
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gattrib
+Name=gEDA Attribute Editor
 GenericName=gEDA Attribute Editor
 Comment=Editor for component attributes on circuit diagrams
 Exec=gattrib
 Icon=gattrib
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
+Categories=Science;


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gattrib.spec	14 Jul 2007 12:14:03 -0000	1.8
+++ geda-gattrib.spec	3 Sep 2007 05:43:27 -0000	1.9
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,10 +77,17 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:14:03 -0000	1.7
+++ sources	3 Sep 2007 05:43:27 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:06 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:06 -0400
Subject: rpms/geda-gnetlist/F-7 .cvsignore, 1.8, 1.9 geda-gnetlist.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030546.l835k6hO007764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/F-7

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:31:53 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:45:33 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/geda-gnetlist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gnetlist.spec	14 Jul 2007 12:31:53 -0000	1.9
+++ geda-gnetlist.spec	3 Sep 2007 05:45:33 -0000	1.10
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,6 +82,12 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:31:53 -0000	1.8
+++ sources	3 Sep 2007 05:45:33 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:36 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 01:46:36 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.36,1.37
Message-ID: <200709030546.l835kaTk007902@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7749/F-7

Modified Files:
	stardict.spec 
Log Message:
add doc


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- stardict.spec	3 Sep 2007 03:43:13 -0000	1.36
+++ stardict.spec	3 Sep 2007 05:46:03 -0000	1.37
@@ -5,7 +5,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -68,10 +68,11 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict
+%doc README COPYING ChangeLog AUTHORS doc/FAQ doc/HACKING doc/HowToCreateDictionary doc/StarDictFileFormat doc/Translation
 
 
 %post
@@ -82,6 +83,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
+- Small fix on spec file.
+
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:39 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 01:46:39 -0400
Subject: rpms/stardict/devel stardict.spec,1.36,1.37
Message-ID: <200709030546.l835kdWT007905@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7749/devel

Modified Files:
	stardict.spec 
Log Message:
add doc


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- stardict.spec	3 Sep 2007 03:43:16 -0000	1.36
+++ stardict.spec	3 Sep 2007 05:46:06 -0000	1.37
@@ -5,7 +5,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -68,10 +68,11 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict
+%doc README COPYING ChangeLog AUTHORS doc/FAQ doc/HACKING doc/HowToCreateDictionary doc/StarDictFileFormat doc/Translation
 
 
 %post
@@ -82,6 +83,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
+- Small fix on spec file.
+
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:40 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:40 -0400
Subject: rpms/geda-examples/FC-6 .cvsignore, 1.7, 1.8 geda-examples.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030546.l835kefH007910@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/FC-6

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:01:17 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:46:07 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:01:17 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:46:07 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:01:17 -0000	1.7
+++ sources	3 Sep 2007 05:46:07 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:52 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:52 -0400
Subject: rpms/geda-docs/FC-6 .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030546.l835kqDZ007961@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7858/FC-6

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:55:48 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:46:19 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:55:48 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:46:19 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:55:48 -0000	1.6
+++ sources	3 Sep 2007 05:46:19 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:57 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:57 -0400
Subject: rpms/geda-gattrib/F-7 .cvsignore, 1.7, 1.8 gattrib.desktop, 1.4,
	1.5 geda-gattrib.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709030546.l835kvGQ007976@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7867/F-7

Modified Files:
	.cvsignore gattrib.desktop geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:17:14 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:46:24 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: gattrib.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/gattrib.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gattrib.desktop	27 Jun 2007 20:46:40 -0000	1.4
+++ gattrib.desktop	3 Sep 2007 05:46:24 -0000	1.5
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gattrib
+Name=gEDA Attribute Editor
 GenericName=gEDA Attribute Editor
 Comment=Editor for component attributes on circuit diagrams
 Exec=gattrib
 Icon=gattrib
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
+Categories=Science;


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/geda-gattrib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gattrib.spec	14 Jul 2007 12:17:14 -0000	1.9
+++ geda-gattrib.spec	3 Sep 2007 05:46:24 -0000	1.10
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,10 +77,17 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:17:14 -0000	1.7
+++ sources	3 Sep 2007 05:46:24 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:24 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:24 -0400
Subject: rpms/geda-examples/F-7 .cvsignore, 1.7, 1.8 geda-examples.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030548.l835mOXH008255@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139/F-7

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:04:23 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:47:52 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:04:23 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:47:52 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:04:23 -0000	1.7
+++ sources	3 Sep 2007 05:47:52 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:30 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:30 -0400
Subject: rpms/geda-gnetlist/devel .cvsignore, 1.8, 1.9 geda-gnetlist.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200709030548.l835mU64008292@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8121/devel

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:33:36 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:47:57 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/geda-gnetlist.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gnetlist.spec	24 Aug 2007 00:15:33 -0000	1.10
+++ geda-gnetlist.spec	3 Sep 2007 05:47:57 -0000	1.11
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,8 +82,11 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:33:36 -0000	1.8
+++ sources	3 Sep 2007 05:47:57 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:44 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:44 -0400
Subject: rpms/geda-gattrib/devel .cvsignore, 1.7, 1.8 geda-gattrib.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200709030548.l835miJV008332@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8208/devel

Modified Files:
	.cvsignore geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:19:00 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:48:11 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gattrib.spec	24 Aug 2007 00:31:31 -0000	1.10
+++ geda-gattrib.spec	3 Sep 2007 05:48:11 -0000	1.11
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,12 +77,16 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:19:00 -0000	1.7
+++ sources	3 Sep 2007 05:48:11 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:49 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:49 -0400
Subject: rpms/geda-docs/F-7 .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030548.l835mnGY008340@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8196/F-7

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:57:47 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:48:16 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:57:47 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:48:16 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:57:47 -0000	1.6
+++ sources	3 Sep 2007 05:48:16 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:50:14 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:50:14 -0400
Subject: rpms/geda-examples/devel .cvsignore, 1.7, 1.8 geda-examples.spec,
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200709030550.l835oEGD008498@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8452/devel

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:06:44 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:49:42 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:06:44 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:49:42 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:06:44 -0000	1.7
+++ sources	3 Sep 2007 05:49:42 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:50:19 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:50:19 -0400
Subject: rpms/geda-docs/devel .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030550.l835oJ99008508@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454/devel

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:59:26 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:49:46 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:59:26 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:49:46 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:59:26 -0000	1.6
+++ sources	3 Sep 2007 05:49:46 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:01 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:01 -0400
Subject: rpms/libtasn1/F-7 lastver, 1.1, 1.2 libtasn1.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709030639.l836d12s015372@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/F-7

Modified Files:
	lastver libtasn1.spec sources 
Log Message:
updated to 1.1


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:02 -0000	1.1
+++ lastver	3 Sep 2007 06:38:27 -0000	1.2
@@ -1 +1 @@
-0.3.10
+1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:24 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:27 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:24 -0000	1.11
+++ sources	3 Sep 2007 06:38:27 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:04 -0400
Subject: rpms/libtasn1/FC-6 libtasn1.spec,1.18,1.19 sources,1.11,1.12
Message-ID: <200709030639.l836d4NU015376@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/FC-6

Modified Files:
	libtasn1.spec sources 
Log Message:
updated to 1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:14 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:31 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:14 -0000	1.11
+++ sources	3 Sep 2007 06:38:31 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:06 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:06 -0400
Subject: rpms/libtasn1/devel lastver, 1.1, 1.2 libtasn1.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709030639.l836d6U9015382@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/devel

Modified Files:
	lastver libtasn1.spec sources 
Log Message:
updated to 1.1


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:05 -0000	1.1
+++ lastver	3 Sep 2007 06:38:34 -0000	1.2
@@ -1 +1 @@
-0.3.10
+1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:09 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:34 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:09 -0000	1.11
+++ sources	3 Sep 2007 06:38:34 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 07:03:11 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 3 Sep 2007 03:03:11 -0400
Subject: rpms/db4/devel .cvsignore, 1.11, 1.12 db4.spec, 1.51, 1.52 sources, 
	1.11, 1.12
Message-ID: <200709030703.l8373BTa021855@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/db4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21833

Modified Files:
	.cvsignore db4.spec sources 
Log Message:
update to 4.6.19 (#273461)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Jul 2007 08:21:33 -0000	1.11
+++ .cvsignore	3 Sep 2007 07:02:38 -0000	1.12
@@ -6,3 +6,4 @@
 db-4.3.29.tar.gz
 db-4.5.20.tar.gz
 db-4.6.18.tar.gz
+db-4.6.19.tar.gz


Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- db4.spec	29 Aug 2007 12:53:44 -0000	1.51
+++ db4.spec	3 Sep 2007 07:02:38 -0000	1.52
@@ -7,8 +7,8 @@
 
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
-Version: 4.6.18
-Release: 2%{?dist}
+Version: 4.6.19
+Release: 1%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch2: db-4.3.29-sparc64.patch
@@ -349,6 +349,9 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 4.6.19-1
+- update to 4.6.19 (#273461)
+
 * Thu Aug 29 2007 Jindrich Novy <jnovy at redhat.com> 4.6.18-2
 - rebuild for BuildID
 - BR util-linux-ng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Jul 2007 08:21:33 -0000	1.11
+++ sources	3 Sep 2007 07:02:38 -0000	1.12
@@ -1,2 +1,2 @@
 42cc6c1e1e25818bd3e3f91328edb0f1  db.1.85.tar.gz
-95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 07:55:32 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 3 Sep 2007 03:55:32 -0400
Subject: rpms/bind/F-7 bind-9.4-2119_revert.patch, NONE, 1.1 bind.spec, 1.190,
	1.191
Message-ID: <200709030755.l837tWH6022948@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22860

Modified Files:
	bind.spec 
Added Files:
	bind-9.4-2119_revert.patch 
Log Message:
- temporary revert ISC 2119 change which conflicts with our
  "libbind-errno" patch (#254501)


bind-9.4-2119_revert.patch:

--- NEW FILE bind-9.4-2119_revert.patch ---
diff -up bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs bind-9.4.2b1/lib/bind/resolv/res_init.c
--- bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs	2007-08-31 09:01:10.000000000 +0200
+++ bind-9.4.2b1/lib/bind/resolv/res_init.c	2007-08-31 09:13:41.000000000 +0200
@@ -166,9 +166,7 @@ __res_vinit(res_state statp, int preinit
 #endif
 	int dots;
 	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
 
-	RES_SET_H_ERRNO(statp, 0);
 	if (statp->_u._ext.ext != NULL)
 		res_ndestroy(statp);
 
@@ -218,22 +216,8 @@ __res_vinit(res_state statp, int preinit
 		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather then immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
+	} else
+		return (-1);
 #ifdef RESOLVSORT
 	statp->nsort = 0;
 #endif
@@ -362,7 +346,7 @@ __res_vinit(res_state statp, int preinit
 		    continue;
 		}
 		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
+		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
 		    struct addrinfo hints, *ai;
 		    char sbuf[NI_MAXSERV];
 		    const size_t minsiz =
@@ -498,7 +482,7 @@ __res_vinit(res_state statp, int preinit
 	if ((cp = getenv("RES_OPTIONS")) != NULL)
 		res_setoptions(statp, cp, "env");
 	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
+	return (0);
 }
 
 static void


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- bind.spec	22 Aug 2007 10:56:52 -0000	1.190
+++ bind.spec	3 Sep 2007 07:54:59 -0000	1.191
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.1.%{RELEASEVER}%{?dist}
+Release: 	0.2.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +73,7 @@
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
+Patch72:	bind-9.4-2119_revert.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -298,6 +299,7 @@
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
+%patch72 -p1 -b .2119_revert
 :;
 
 
@@ -783,6 +785,10 @@
 
 
 %changelog
+* Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
+- temporary revert ISC 2119 change which conflicts with our
+  "libbind-errno" patch (#254501)
+
 * Tue Aug 21 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.1.b1
 - updated to 9.4.2b1
 - dropped patches



From fedora-extras-commits at redhat.com  Mon Sep  3 07:57:38 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 03:57:38 -0400
Subject: rpms/gimp-help/F-7 .cvsignore, 1.9, 1.10 gimp-help.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200709030757.l837vc3F023208@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp-help/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.13
don't use "%makeinstall ..." but "make DESTDIR=... install" for installing



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Apr 2007 14:09:03 -0000	1.9
+++ .cvsignore	3 Sep 2007 07:57:05 -0000	1.10
@@ -1 +1 @@
-gimp-help-2-0.12.tar.gz
+gimp-help-2-0.13.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/gimp-help.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gimp-help.spec	12 Apr 2007 14:09:03 -0000	1.12
+++ gimp-help.spec	3 Sep 2007 07:57:05 -0000	1.13
@@ -1,4 +1,4 @@
-%define gimphelpver 2-0.12
+%define gimphelpver 2-0.13
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
@@ -28,7 +28,7 @@
 
 %install
 rm -rf %buildroot
-%makeinstall GIMP_DATADIR=%{buildroot}%{_datadir}/gimp/%{gimpsubver}
+make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %buildroot
@@ -40,6 +40,10 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.13
+- version 2-0.13
+- don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing
+
 * Thu Apr 12 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.12
 - version 2-0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Apr 2007 14:09:03 -0000	1.9
+++ sources	3 Sep 2007 07:57:05 -0000	1.10
@@ -1 +1 @@
-fc1e2153eafa04fa701b23818029c3e1  gimp-help-2-0.12.tar.gz
+a0d3ab0e503cacaaaa031958bfad43e5  gimp-help-2-0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:15 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:15 -0400
Subject: rpms/util-vserver/devel util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.30, 1.31 sources, 1.11, 1.12 lastver,
	1.1, 1.2 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wF8q023346@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/devel

Modified Files:
	util-vserver.spec sources lastver 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- util-vserver.spec	4 Aug 2007 10:51:59 -0000	1.30
+++ util-vserver.spec	3 Sep 2007 07:57:42 -0000	1.31
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -198,16 +194,7 @@
 
 
 %check || :
-## REMOVE ME! Cause for the PPC workaround should be fixed by
-## http://svn.linux-vserver.org/projects/util-vserver/changeset/2545
-## which is going into 0.30.214
-%ifarch ppc
-  rc=true
-%else
-  rc=false
-%endif
-
-%__make check || $rc
+%__make check
 
 
 %clean
@@ -369,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 May 2007 20:40:16 -0000	1.11
+++ sources	3 Sep 2007 07:57:42 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	2 Sep 2007 11:30:35 -0000	1.1
+++ lastver	3 Sep 2007 07:57:42 -0000	1.2
@@ -1 +1 @@
-0.30.213
+0.30.214


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:17 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:17 -0400
Subject: rpms/util-vserver/FC-6 util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.26, 1.27 sources, 1.11,
	1.12 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wHhN023351@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/FC-6

Modified Files:
	util-vserver.spec sources 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util-vserver.spec	4 Aug 2007 10:52:07 -0000	1.26
+++ util-vserver.spec	3 Sep 2007 07:57:45 -0000	1.27
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -360,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jun 2007 07:10:45 -0000	1.11
+++ sources	3 Sep 2007 07:57:45 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:20 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:20 -0400
Subject: rpms/util-vserver/F-7 util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.26, 1.27 sources, 1.11, 1.12 lastver,
	1.1, 1.2 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wKUM023356@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/F-7

Modified Files:
	util-vserver.spec sources lastver 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util-vserver.spec	4 Aug 2007 10:52:10 -0000	1.26
+++ util-vserver.spec	3 Sep 2007 07:57:48 -0000	1.27
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -360,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jun 2007 07:05:05 -0000	1.11
+++ sources	3 Sep 2007 07:57:48 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	2 Sep 2007 11:30:32 -0000	1.1
+++ lastver	3 Sep 2007 07:57:48 -0000	1.2
@@ -1 +1 @@
-0.30.213
+0.30.214


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:40 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 03:58:40 -0400
Subject: rpms/rapidsvn/devel rapidsvn.spec,1.10,1.11
Message-ID: <200709030758.l837weoq023369@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/rapidsvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23326

Modified Files:
	rapidsvn.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.9.4-6
- rebuild for fixed 32-bit APR



Index: rapidsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rapidsvn.spec	23 Aug 2007 14:30:16 -0000	1.10
+++ rapidsvn.spec	3 Sep 2007 07:58:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           rapidsvn
 Version:        0.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Graphical interface for the Subversion revision control system
 
 Group:          Development/Tools
@@ -151,6 +151,9 @@
 %{_libdir}/libsvncpp.so
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.9.4-6
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 0.9.4-5
 - don't link against neon directly
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:02:13 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:02:13 -0400
Subject: rpms/kdesvn/devel kdesvn.spec,1.31,1.32
Message-ID: <200709030802.l8382DiK029631@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29470

Modified Files:
	kdesvn.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.13.0-4
- rebuild for fixed 32-bit APR (#254241)



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdesvn.spec	28 Aug 2007 14:17:08 -0000	1.31
+++ kdesvn.spec	3 Sep 2007 08:01:38 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        0.13.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.13.0-4
+- rebuild for fixed 32-bit APR (#254241)
+
 * Tue Aug 28 2007 Orion Poplawski <orion at cora.nwra.com> - 0.13.0-3
 - Rebuild for new expat
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:04:07 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:04:07 -0400
Subject: rpms/hunspell-pl/devel .cvsignore, 1.25, 1.26 hunspell-pl.spec, 1.27,
	1.28 sources, 1.25, 1.26
Message-ID: <200709030804.l83847OM029991@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29967

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	3 Aug 2007 09:46:04 -0000	1.25
+++ .cvsignore	3 Sep 2007 08:03:34 -0000	1.26
@@ -1 +1 @@
-alt-myspell-pl-20070803.tar.bz2
+alt-myspell-pl-20070903.tar.bz2


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hunspell-pl.spec	9 Aug 2007 07:18:22 -0000	1.27
+++ hunspell-pl.spec	3 Sep 2007 08:03:34 -0000	1.28
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20070803
+%define upstreamid 20070903
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.kurnik.pl/dictionary/alt-myspell-pl-%{upstreamid}.tar.bz2
@@ -34,6 +34,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 0.20070903-1
+- new version
+
 * Thu Aug 09 2007 Caolan McNamara <caolanm at redhat.com> - 0.20070803-1
 - clarify that is tri-licensed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	3 Aug 2007 09:46:04 -0000	1.25
+++ sources	3 Sep 2007 08:03:34 -0000	1.26
@@ -1 +1 @@
-be1adb5fd0d06e462e2d1fc79a820092  alt-myspell-pl-20070803.tar.bz2
+de1cc0ea7b480ccc36bf39b3332758b7  alt-myspell-pl-20070903.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 08:17:52 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:17:52 -0400
Subject: rpms/hunspell-it/devel .cvsignore, 1.2, 1.3 hunspell-it.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200709030817.l838Hq4r030633@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-it/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591

Modified Files:
	.cvsignore hunspell-it.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Feb 2007 09:20:23 -0000	1.2
+++ .cvsignore	3 Sep 2007 08:17:20 -0000	1.3
@@ -1 +1 @@
-italiano_2_3_beta_2006_07_23.zip
+italiano_2_4_2007_09_01.zip


Index: hunspell-it.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/hunspell-it.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-it.spec	3 Aug 2007 09:10:30 -0000	1.2
+++ hunspell-it.spec	3 Sep 2007 08:17:20 -0000	1.3
@@ -1,9 +1,9 @@
 Name: hunspell-it
 Summary: Italian hunspell dictionaries
-%define upstreamid 20060723
-Version: 2.3
-Release: 0.2.%{upstreamid}%{?dist}
-Source: http://downloads.sourceforge.net/sourceforge/linguistico/italiano_2_3_beta_2006_07_23.zip
+%define upstreamid 20070901
+Version: 2.4
+Release: 0.1.%{upstreamid}%{?dist}
+Source: http://downloads.sourceforge.net/sourceforge/linguistico/italiano_2_4_2007_09_01.zip
 Group: Applications/Text
 URL: http://linguistico.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,10 +38,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc GPL.txt history.txt license.txt notes.txt README_it_IT.txt README.txt thanks.txt
+%doc it_IT_README.txt it_IT_COPYING it_IT_AUTHORS it_IT_license.txt it_IT_notes.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 2.4-0.1.20070901
+- latest version
+
 * Fri Aug 03 2007 Caolan McNamara <caolanm at redhat.com> - 2.3-0.2.20060723
 - clarify license version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Feb 2007 09:20:23 -0000	1.2
+++ sources	3 Sep 2007 08:17:20 -0000	1.3
@@ -1 +1 @@
-fe9240990c600bca2ad33cb906651087  italiano_2_3_beta_2006_07_23.zip
+e7fbd9e2dfb25ea3288cdb918e1e1260  italiano_2_4_2007_09_01.zip



From fedora-extras-commits at redhat.com  Mon Sep  3 08:23:47 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 3 Sep 2007 04:23:47 -0400
Subject: rpms/bind/devel bind-9.5-2119_revert.patch, NONE,
	1.1 bind-9.5-fix_h_errno.patch, NONE, 1.1 bind.spec, 1.211, 1.212
Message-ID: <200709030823.l838NlqT030850@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30818

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-2119_revert.patch bind-9.5-fix_h_errno.patch 
Log Message:
- temporary revert ISC 2119 change and add "libbind-errno" patch
  (#254501) again


bind-9.5-2119_revert.patch:

--- NEW FILE bind-9.5-2119_revert.patch ---
diff -up bind-9.5.0a6/lib/bind/resolv/res_init.c.2119 bind-9.5.0a6/lib/bind/resolv/res_init.c
--- bind-9.5.0a6/lib/bind/resolv/res_init.c.2119	2007-07-09 03:43:23.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_init.c	2007-09-03 10:10:24.000000000 +0200
@@ -166,9 +166,7 @@ __res_vinit(res_state statp, int preinit
 #endif
 	int dots;
 	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
 
-	RES_SET_H_ERRNO(statp, 0);
 	if (statp->_u._ext.ext != NULL)
 		res_ndestroy(statp);
 
@@ -218,22 +216,8 @@ __res_vinit(res_state statp, int preinit
 		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather then immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
+	} else
+		return (-1);
 #ifdef RESOLVSORT
 	statp->nsort = 0;
 #endif
@@ -362,7 +346,7 @@ __res_vinit(res_state statp, int preinit
 		    continue;
 		}
 		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
+		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
 		    struct addrinfo hints, *ai;
 		    char sbuf[NI_MAXSERV];
 		    const size_t minsiz =
@@ -498,7 +482,7 @@ __res_vinit(res_state statp, int preinit
 	if ((cp = getenv("RES_OPTIONS")) != NULL)
 		res_setoptions(statp, cp, "env");
 	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
+	return (0);
 }
 
 static void

bind-9.5-fix_h_errno.patch:

--- NEW FILE bind-9.5-fix_h_errno.patch ---
--- bind-9.3.1rc1/lib/bind/irs/irs_data.c.fix_h_errno	2004-11-29 20:15:43.000000000 -0500
+++ bind-9.3.1rc1/lib/bind/irs/irs_data.c	2005-03-09 21:05:52.000000000 -0500
@@ -222,12 +222,7 @@
 void
 __h_errno_set(struct __res_state *res, int err) {
 
-
-#if (__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
-	res->res_h_errno = err;
-#else
 	h_errno = res->res_h_errno = err;
-#endif
 }
 
 #endif /*__BIND_NOSTATIC*/
--- bind-9.3.1rc1/lib/bind/resolv/res_query.c.fix_h_errno	2004-03-16 07:34:19.000000000 -0500
+++ bind-9.3.1rc1/lib/bind/resolv/res_query.c	2005-03-09 21:53:34.000000000 -0500
@@ -192,6 +192,8 @@
 		}
 		return (-1);
 	}
+	if( n > 0 )
+		RES_SET_H_ERRNO(statp,0);
 	return (n);
 }
 


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- bind.spec	23 Aug 2007 12:57:57 -0000	1.211
+++ bind.spec	3 Sep 2007 08:23:14 -0000	1.212
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.1.%{RELEASEVER}%{?dist}
+Release: 	11.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,8 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch75:	bind-9.5-update.patch
+Patch76:	bind-9.5-2119_revert.patch
+Patch77:	bind-9.5-fix_h_errno.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -246,6 +248,8 @@
 %endif
 %patch73 -p1 -b .libidn
 %patch75 -p1 -b .update
+%patch76 -p1 -b .2119
+%patch77 -p1 -b .errno
 :;
 
 
@@ -642,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.2.a6
+- temporary revert ISC 2119 change and add "libbind-errno" patch
+  (#254501) again
+
 * Thu Aug 23 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.1.a6
 - removed end dots from Summary sections (skasal at redhat.com)
 - fixed wrong file creation by autotools patch (skasal at redhat.com)



From fedora-extras-commits at redhat.com  Mon Sep  3 08:25:34 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:25:34 -0400
Subject: rpms/icu/devel .cvsignore, 1.7, 1.8 icu.spec, 1.52, 1.53 sources,
	1.7, 1.8
Message-ID: <200709030825.l838PYDM030942@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30881

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Aug 2007 13:04:35 -0000	1.7
+++ .cvsignore	3 Sep 2007 08:25:02 -0000	1.8
@@ -1 +1 @@
-icu4c-3_8_d01-src.tgz
+icu4c-3_8_d02-src.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- icu.spec	29 Aug 2007 07:17:49 -0000	1.52
+++ icu.spec	3 Sep 2007 08:25:02 -0000	1.53
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   3.8
-Release:   0.2.d01%{?dist}
+Release:   0.2.d02%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -140,6 +140,9 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 3.8-0.2.d02
+- next release candidate
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 3.8-0.2.d01
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Aug 2007 13:04:35 -0000	1.7
+++ sources	3 Sep 2007 08:25:02 -0000	1.8
@@ -1 +1 @@
-ae40391450c73775e615640308fc3b7a  icu4c-3_8_d01-src.tgz
+990c5a62be169e02c254297881e85808  icu4c-3_8_d02-src.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 08:27:43 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:27:43 -0400
Subject: rpms/icu/devel icu.spec,1.53,1.54
Message-ID: <200709030827.l838Rhaf031030@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31012

Modified Files:
	icu.spec 
Log Message:
next version


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- icu.spec	3 Sep 2007 08:25:02 -0000	1.53
+++ icu.spec	3 Sep 2007 08:27:10 -0000	1.54
@@ -5,7 +5,7 @@
 Group:     Development/Tools
 License:   MIT
 URL:       http://www.icu-project.org/
-Source0:   http://download.icu-project.org/files/icu4c/3.8/icu4c-3_8_d01-src.tgz
+Source0:   http://download.icu-project.org/files/icu4c/3.8/icu4c-3_8_d02-src.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, autoconf
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:31:06 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:31:06 -0400
Subject: rpms/mod_fcgid/devel mod_fcgid.spec,1.6,1.7
Message-ID: <200709030831.l838V6At031163@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31133

Modified Files:
	mod_fcgid.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
- rebuild for fixed 32-bit APR (#254241)



Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_fcgid.spec	23 Aug 2007 09:32:38 -0000	1.6
+++ mod_fcgid.spec	3 Sep 2007 08:30:33 -0000	1.7
@@ -11,7 +11,7 @@
 
 Name:		mod_fcgid
 Version:	2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -155,6 +155,9 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
+- rebuild for fixed 32-bit APR (#254241)
+
 * Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 2.1-5
 - Update source URL to point to downloads.sf.net rather than dl.sf.net
 - Upstream released new tarball without changing version number, though the



From fedora-extras-commits at redhat.com  Mon Sep  3 08:32:44 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:32:44 -0400
Subject: rpms/mod_security/devel mod_security.spec,1.20,1.21
Message-ID: <200709030832.l838WisI031251@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31231

Modified Files:
	mod_security.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
- rebuild for fixed 32-bit APR (#254241)



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_security.spec	29 Aug 2007 05:02:39 -0000	1.20
+++ mod_security.spec	3 Sep 2007 08:32:11 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
+- rebuild for fixed 32-bit APR (#254241)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.1.1-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 09:19:39 2007
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 3 Sep 2007 05:19:39 -0400
Subject: rpms/mod_dnssd/devel mod_dnssd.spec,1.4,1.5
Message-ID: <200709030919.l839JdgL005801@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/mod_dnssd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5780

Modified Files:
	mod_dnssd.spec 
Log Message:
Rebuild for new 32-bit APR ABI


Index: mod_dnssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_dnssd/devel/mod_dnssd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_dnssd.spec	21 Aug 2007 16:55:23 -0000	1.4
+++ mod_dnssd.spec	3 Sep 2007 09:19:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_dnssd
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An Apache HTTPD module which adds Zeroconf support
 
 Group:          System Environment/Daemons
@@ -40,6 +40,9 @@
 %{_libdir}/httpd/modules/mod_dnssd.so
 
 %changelog
+* Mon Sep  3 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-5
+- Rebuild for new 32-bit APR ABI
+
 * Tue Aug 21 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-4
 - Fix License tag
 - Rebuild for F8t2



From fedora-extras-commits at redhat.com  Mon Sep  3 09:35:05 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 3 Sep 2007 05:35:05 -0400
Subject: rpms/yumex/F-7 yumex.spec,1.59,1.60
Message-ID: <200709030935.l839Z5qZ006112@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6083

Modified Files:
	yumex.spec 
Log Message:
Test Build for Bodhi Testing


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/yumex.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- yumex.spec	22 Aug 2007 12:50:29 -0000	1.59
+++ yumex.spec	3 Sep 2007 09:34:33 -0000	1.60
@@ -2,7 +2,7 @@
 
 Name:     yumex
 Version:  2.0.1
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-2
+- Test build for Bohdi Testing
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Mon Sep  3 09:37:12 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 05:37:12 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.37,1.38
Message-ID: <200709030937.l839bCJQ006200@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6152/F-7

Modified Files:
	stardict.spec 
Log Message:
use desktop-file-install


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stardict.spec	3 Sep 2007 05:46:03 -0000	1.37
+++ stardict.spec	3 Sep 2007 09:36:39 -0000	1.38
@@ -19,6 +19,7 @@
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
 BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser
+BuildRequires: desktop-file-utils
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -52,6 +53,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
+desktop-file-install --vendor fedora --delete-original	\
+  --add-category X-Red-Hat-Base				\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
+
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
 
@@ -84,7 +91,7 @@
 
 %changelog
 * Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
-- Small fix on spec file.
+- Small fix on spec file. Use desktop-file-install.
 
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.



From fedora-extras-commits at redhat.com  Mon Sep  3 09:37:15 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 05:37:15 -0400
Subject: rpms/stardict/devel stardict.spec,1.37,1.38
Message-ID: <200709030937.l839bFvY006203@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6152/devel

Modified Files:
	stardict.spec 
Log Message:
use desktop-file-install


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stardict.spec	3 Sep 2007 05:46:06 -0000	1.37
+++ stardict.spec	3 Sep 2007 09:36:42 -0000	1.38
@@ -19,6 +19,7 @@
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
 BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser
+BuildRequires: desktop-file-utils
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -52,6 +53,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
+desktop-file-install --vendor fedora --delete-original	\
+  --add-category X-Red-Hat-Base				\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
+
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
 
@@ -84,7 +91,7 @@
 
 %changelog
 * Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
-- Small fix on spec file.
+- Small fix on spec file. Use desktop-file-install.
 
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.



From fedora-extras-commits at redhat.com  Mon Sep  3 09:55:47 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 05:55:47 -0400
Subject: rpms/g-wrap/devel g-wrap.spec,1.42,1.43
Message-ID: <200709030955.l839tlPf006525@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6462

Modified Files:
	g-wrap.spec 
Log Message:



Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- g-wrap.spec	31 Aug 2007 20:19:59 -0000	1.42
+++ g-wrap.spec	3 Sep 2007 09:55:14 -0000	1.43
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         3%{?dist}.1
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:10 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:10 -0400
Subject: rpms/g-wrap/EL-5 g-wrap.spec,1.43,1.44
Message-ID: <200709031001.l83A1AOn012428@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/EL-5

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/EL-5/g-wrap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- g-wrap.spec	31 Aug 2007 20:06:08 -0000	1.43
+++ g-wrap.spec	3 Sep 2007 10:00:37 -0000	1.44
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:13 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:13 -0400
Subject: rpms/g-wrap/F-7 g-wrap.spec,1.39,1.40
Message-ID: <200709031001.l83A1DEk012530@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/F-7

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/F-7/g-wrap.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- g-wrap.spec	31 Aug 2007 19:53:12 -0000	1.39
+++ g-wrap.spec	3 Sep 2007 10:00:40 -0000	1.40
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:16 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:16 -0400
Subject: rpms/g-wrap/devel g-wrap.spec,1.43,1.44
Message-ID: <200709031001.l83A1GRL012537@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/devel

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- g-wrap.spec	3 Sep 2007 09:55:14 -0000	1.43
+++ g-wrap.spec	3 Sep 2007 10:00:43 -0000	1.44
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}.1
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:17:28 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 3 Sep 2007 06:17:28 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.59,1.60
Message-ID: <200709031017.l83AHSec013260@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13238

Modified Files:
	kdevelop.spec 
Log Message:
rebuilt against apr




Index: kdevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdevelop.spec	29 Aug 2007 23:11:28 -0000	1.59
+++ kdevelop.spec	3 Sep 2007 10:16:55 -0000	1.60
@@ -10,7 +10,7 @@
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Than Ngo <than at redhat.com> - 9:3.4.1-5
+- rebuilt against apr
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.4.1-4
 - License: GPLv2
 - (Build)Requires: kdelibs3-devel kdesdk3-devel



From fedora-extras-commits at redhat.com  Mon Sep  3 10:48:51 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 3 Sep 2007 06:48:51 -0400
Subject: rpms/curl/devel curl.spec,1.56,1.57
Message-ID: <200709031048.l83AmpUd015037@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017

Modified Files:
	curl.spec 
Log Message:
revert back to use OpenSSL (#266021)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- curl.spec	27 Aug 2007 12:42:14 -0000	1.56
+++ curl.spec	3 Sep 2007 10:48:12 -0000	1.57
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,8 +12,9 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.16.4-ftp.patch
 URL: http://curl.haxx.se/
+Requires: openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel, nss-devel
+BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -25,7 +26,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig, automake
+Requires: openssl-devel, libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -41,11 +42,11 @@
 %patch3 -p1 -b .ftp
 
 %build
-if pkg-config nss ; then
-	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
+if pkg-config openssl ; then
+	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
 fi
-%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
+%configure --with-ssl=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
@@ -99,6 +100,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
+- revert back to use OpenSSL (#266021)
+
 * Mon Aug 27 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-3
 - don't use openssl, use nss instead
 



From fedora-extras-commits at redhat.com  Mon Sep  3 11:08:55 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 3 Sep 2007 07:08:55 -0400
Subject: rpms/pikloops/devel pikloops.spec,1.5,1.6
Message-ID: <200709031108.l83B8t51021407@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikloops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21388

Modified Files:
	pikloops.spec 
Log Message:
Fix desktop file


Index: pikloops.spec
===================================================================
RCS file: /cvs/extras/rpms/pikloops/devel/pikloops.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pikloops.spec	21 Aug 2007 17:10:47 -0000	1.5
+++ pikloops.spec	3 Sep 2007 11:08:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		pikloops
 Version:	0.2.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Code generator for PIC delays
 Summary(fr):	G??n??rateur de code de temporisation pour PIC
 
@@ -35,11 +35,10 @@
 %{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
+desktop-file-install --vendor=fedora \
+  --remove-category "Education" \
+  --dir %{buildroot}%{_datadir}/applications \
   --delete-original \
-  --add-category "X-Fedora" \
   src/%{name}.desktop
 
 # Fix absolute symlink
@@ -77,12 +76,15 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/doc/HTML/*/%{name}/
 %{_datadir}/icons/crystalsvg/*/apps/%{name}.png
 
 %changelog
+* Sun Sep 02 2007 Chitlesh Goorah <chitlesh[AT]fedoraproject[DOT]org> - 0.2.3-3
+  - Fix desktop file
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.2.3-2
   - Licence tag clarification
 



From fedora-extras-commits at redhat.com  Mon Sep  3 11:48:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 3 Sep 2007 07:48:24 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.20,1.21
Message-ID: <200709031148.l83BmOX6021968@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21943

Modified Files:
	hamlib.spec 
Log Message:
Rebuild, License tag update


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hamlib.spec	10 May 2007 03:52:04 -0000	1.20
+++ hamlib.spec	3 Sep 2007 11:47:51 -0000	1.21
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name: 		hamlib
-Version: 	1.2.5
-Release: 	5%{?dist}
-
-License: 	LGPL
-Group: 		System Environment/Libraries
-Summary: 	Run-time library to control radio transceivers and receivers
-Source: 	ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
+Name:           hamlib
+Version:        1.2.5
+Release:        6%{?dist}
+
+License:        GPLv2+ and LGPLv2+
+Group:          System Environment/Libraries
+Summary:        Run-time library to control radio transceivers and receivers
+Source:         ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
 
 # For whatever reason @SWIG@ isn't being set by the configure script.
 Patch: hamlib-bindings.patch
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
+- Rebuild, License tag update
+
 * Wed May  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.5-5
 - Move HTML devel documentation to the proper subpackage (#228364)
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:26:23 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 3 Sep 2007 08:26:23 -0400
Subject: rpms/grip/devel grip-3.2.0-lookup.patch, NONE, 1.1 grip.spec, 1.17,
	1.18
Message-ID: <200709031226.l83CQNxg028643@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28622

Modified Files:
	grip.spec 
Added Files:
	grip-3.2.0-lookup.patch 
Log Message:
* Mon Sep 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-17
- search for ripper and encoder executables in path (#249150)
- updated License:


grip-3.2.0-lookup.patch:

--- NEW FILE grip-3.2.0-lookup.patch ---
diff -ur grip-3.2.0/src/gripcfg.c grip-3.2.0.new/src/gripcfg.c
--- grip-3.2.0/src/gripcfg.c	2007-07-23 09:49:12.000000000 +0200
+++ grip-3.2.0.new/src/gripcfg.c	2007-07-23 09:50:46.000000000 +0200
@@ -62,13 +62,6 @@
 				      {"",""}
 };
 
-static CFGEntry encoder_cfg_entries[]={
-  {"name",CFG_ENTRY_STRING,256,NULL},
-  {"cmdline",CFG_ENTRY_STRING,256,NULL},
-  {"exe",CFG_ENTRY_STRING,256,NULL},
-  {"extension",CFG_ENTRY_STRING,10,NULL}
-};
-
 static void UseProxyChanged(GtkWidget *widget,gpointer data)
 {
   GripInfo *ginfo;
@@ -781,7 +774,7 @@
   };
 
 #ifdef CDPAR
-  if(ripcfg==0) return;
+  if(ripcfg==0) return TRUE;
 #endif
 
   sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
@@ -825,6 +818,9 @@
 
   if(LoadEncoderConfig(ginfo,ginfo->selected_encoder)) {
     strcpy(buf,ginfo->mp3exename);
+    /* in addition to searching the path during rip and encode
+     * also do a path lookup of the executable during config switches */
+    FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
     gtk_entry_set_text(GTK_ENTRY(uinfo->mp3exename_entry),buf);
 
     strcpy(buf,ginfo->mp3cmdline);
diff -ur grip-3.2.0/src/rip.c grip-3.2.0.new/src/rip.c
--- grip-3.2.0/src/rip.c	2004-04-15 20:21:15.000000000 +0200
+++ grip-3.2.0.new/src/rip.c	2007-07-23 09:47:34.000000000 +0200
@@ -1100,8 +1100,6 @@
 {
   static char res[PATH_MAX];
   EncodeTrack *enc_track;
-  gchar *conv_str,*st;
-  gsize rb,wb;
 
   enc_track=(EncodeTrack *)data;
 
@@ -1250,12 +1248,17 @@
 {
   GripInfo *ginfo;
   gboolean result;
+  char buf[sizeof(ginfo->ripexename) > sizeof(ginfo->mp3exename) ? sizeof(ginfo->ripexename) : sizeof(ginfo->mp3exename)];
 
   ginfo=(GripInfo *)data;
 
   if(widget) ginfo->doencode=FALSE;
   else ginfo->doencode=TRUE;
 
+  /* Let's find the ripper in the path; this changes the config */
+  FindExeInPath(ginfo->ripexename, buf, sizeof(buf));
+  strncpy(ginfo->ripexename, buf, sizeof(ginfo->ripexename));
+
   if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
     DisplayMsg(_("Invalid rip executable\nCheck your rip config"));
 
@@ -1263,6 +1266,9 @@
     return;
   }
 
+  /* the same for mp3exename */
+  FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
+  strncpy(ginfo->mp3exename, buf, sizeof(ginfo->mp3exename));
   if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
     DisplayMsg(_("Invalid encoder executable\nCheck your encoder config"));
 
@@ -1504,8 +1510,9 @@
       ginfo->rippid=fork();
       
       if(ginfo->rippid==0) {
+	int i;
 	CloseStuff(ginfo);
-	nice(ginfo->ripnice);
+	i=nice(ginfo->ripnice);
 	execv(ginfo->ripexename,char_args);
 	
 	LogStatus(ginfo,_("Exec failed\n"));
@@ -1539,6 +1546,7 @@
   int paranoia_mode;
   int dup_output_fd;
   FILE *output_fp;
+  int i;
 
   ginfo=(GripInfo *)arg;
 
@@ -1559,7 +1567,7 @@
   
   ginfo->rip_smile_level=0;
   
-  nice(ginfo->ripnice);
+  i=nice(ginfo->ripnice);
 
   dup_output_fd=dup(GetStatusWindowPipe(ginfo->gui_info.rip_status_window));
   output_fp=fdopen(dup_output_fd,"w");
@@ -1742,9 +1750,10 @@
   ginfo->mp3pid[cpu]=fork();
   
   if(ginfo->mp3pid[cpu]==0) {
+    int i;
     CloseStuff(ginfo);
     setsid();
-    nice(ginfo->mp3nice);
+    i=nice(ginfo->mp3nice);
     execv(ginfo->mp3exename,char_args);
     _exit(0);
   }


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grip.spec	17 Mar 2007 11:34:08 -0000	1.17
+++ grip.spec	3 Sep 2007 12:25:50 -0000	1.18
@@ -1,9 +1,9 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
-License: GPL
+License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz
 Source1: grip.1
@@ -12,6 +12,7 @@
 Patch3: grip-3.2.0-id3.c.patch
 Patch4: grip.desktop.patch
 Patch5: grip-64bit-fix.patch
+Patch6: grip-3.2.0-lookup.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .id3
 %patch4
 %patch5
+%patch6 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-17
+- search for ripper and encoder executables in path (#249150)
+- updated License:
+
 * Wed Jan 17 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-16
 - fixes for #220777, #222574, #232755
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:36:19 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 3 Sep 2007 08:36:19 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.30,1.31
Message-ID: <200709031236.l83CaJ50028816@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dvd+rw-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798

Modified Files:
	dvd+rw-tools.spec 
Log Message:
* Fri Aug 31 2007 Matthias Saou <http://freshrpms.net/> 7.0-7
- Minor spec file cleanups (tabs vs. spaces, etc.).
- Use install instead of cp for the html file to avoid umask differences.



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dvd+rw-tools.spec	17 Aug 2007 12:26:46 -0000	1.30
+++ dvd+rw-tools.spec	3 Sep 2007 12:35:47 -0000	1.31
@@ -1,20 +1,20 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.0
-Release: 	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
-Source1: 	index.html
+Source1:	index.html
 Patch1:		dvd+rw-tools-7.0-phys.patch
 Patch2:		dvd+rw-tools-7.0-pthread.patch
-Patch3: 	dvd+rw-tools-7.0.manpatch
-Patch4: 	dvd+rw-tools-7.0-wexit.patch
-Patch5: 	dvd+rw-tools-7.0-bacula.patch
-Patch6: 	dvd+rw-tools-7.0-glibc2.6.90.patch
+Patch3:		dvd+rw-tools-7.0.manpatch
+Patch4:		dvd+rw-tools-7.0-wexit.patch
+Patch5:		dvd+rw-tools-7.0-bacula.patch
+Patch6:		dvd+rw-tools-7.0-glibc2.6.90.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kernel-headers m4
 
 %description
@@ -22,36 +22,39 @@
 information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
 
 %prep
-%setup -q  -n %{name}-%{version}
+%setup -q
 %patch1 -p1 -b .phys
 %patch2 -p1 -b .pthread
 %patch3 -p1 -b .manpatch
 %patch4 -p1 -b .wexit
 %patch5 -p1 -b .bacula
 %patch6 -p1 -b .glibc2.6.90
+install -m 644 %{SOURCE1} index.html
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-
 make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}
 
-cp -p %SOURCE1 index.html
-
 %install
 rm -rf %{buildroot}
+# make install DESTDIR= does not work here
 %makeinstall
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-%{_prefix}/bin/*
+%defattr(-,root,root,-)
 %doc index.html LICENSE
+%{_bindir}/*
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Aug 31 2007 Matthias Saou <http://freshrpms.net/> 7.0-7
+- Minor spec file cleanups (tabs vs. spaces, etc.).
+- Use install instead of cp for the html file to avoid umask differences.
+
 * Fri Aug 17 2007 Harald Hoyer <harald at rawhide.home> - 7.0-6
 - changed license to GPLv2
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:37:47 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 08:37:47 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.11,1.12
Message-ID: <200709031237.l83Cbli6028958@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867

Modified Files:
	rss-glx.spec 
Log Message:
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rss-glx.spec	29 Aug 2007 14:54:53 -0000	1.11
+++ rss-glx.spec	3 Sep 2007 12:37:14 -0000	1.12
@@ -17,9 +17,15 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
+%if "%{fedora}" >= "8"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
+%define modular_xss 0%{?!_without_modular_xss:1}
 %define gss 0%{?!_without_gss:1}
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
@@ -30,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9%{?dist}
+Release: 9.1%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -43,11 +49,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
 %if %with_matrixview
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
+%if %modular_x
+BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -73,7 +79,12 @@
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %modular_xss
+Requires(post): xscreensaver-base >= 1:5.03-2
+Requires(preun): xscreensaver-base >= 1:5.03-2
+%else
+Requires: xscreensaver-base < 1:5.03-2
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -180,11 +191,8 @@
         popd >& /dev/null
         # external hacks description and symlinks for XScreenSaver
         cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
-name ${name}
-    command ${cmd} -r
-    enabled
-    visuals GL
-
+GL:     "${name}" \\
+        ${cmd} -r \\n\\
 EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
@@ -233,9 +241,9 @@
     %{_bindir}/update-xscreensaver-hacks
 fi
 
-%postun xscreensaver
+%preun xscreensaver
 if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+    %{_bindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -247,7 +255,7 @@
 
 %files xscreensaver
 %defattr(-, root, root)
-%dir %{xssexthacksconfdir}
+# xscreensaver-base provides %{xssexthacksconfdir}
 %config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
@@ -268,6 +276,11 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
 - Buildrequire gawk.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:46:40 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Mon, 3 Sep 2007 08:46:40 -0400
Subject: rpms/fetchmail/F-7 fetchmail-6.3.7-CVE-2007-4565.patch, NONE,
	1.1 fetchmail.spec, 1.51, 1.52
Message-ID: <200709031246.l83CkeMC029204@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.7-CVE-2007-4565.patch 
Log Message:
Fix license, Fix fetchmail NULL pointer dereference (CVE-2007-4565)

fetchmail-6.3.7-CVE-2007-4565.patch:

--- NEW FILE fetchmail-6.3.7-CVE-2007-4565.patch ---
--- fetchmail-6.3.7/sink.c_old	2007-08-31 12:17:54.000000000 +0200
+++ fetchmail-6.3.7/sink.c	2007-08-31 12:16:08.000000000 +0200
@@ -262,7 +262,7 @@
     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
 
     /* don't bounce in reply to undeliverable bounces */
-    if (!msg->return_path[0] ||
+    if (!msg || !msg->return_path[0] ||
 	strcmp(msg->return_path, "<>") == 0 ||
 	strcasecmp(msg->return_path, md1) == 0 ||
 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/F-7/fetchmail.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- fetchmail.spec	19 Feb 2007 00:47:48 -0000	1.51
+++ fetchmail.spec	3 Sep 2007 12:46:08 -0000	1.52
@@ -4,13 +4,15 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.7-CVE-2007-4565.patch
 URL: http://fetchmail.berlios.de/
-License: GPL
+# For a breakdown of the licensing, see COPYING
+License: GPL+ and GPLv2 and Public Domain
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
@@ -46,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .cve_2007_4565
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -83,6 +86,11 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.7-2
+- Fix license
+- Fix fetchmail NULL pointer dereference (CVE-2007-4565)
+  Resolves: #260861
+
 * Mon Feb 19 2007 Miloslav Trmac <mitr at redhat.com> - 6.3.7-1
 - Update to fetchmail-6.3.7
 



From fedora-extras-commits at redhat.com  Mon Sep  3 13:24:47 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 09:24:47 -0400
Subject: rpms/ocaml/devel ocaml.spec,1.31,1.32
Message-ID: <200709031324.l83DOl9R003481@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3454/devel

Modified Files:
	ocaml.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
- Don't include the release number in fedora-ocaml-release file, so
  that packages built against this won't depend on the Fedora release.



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ocaml.spec	29 Aug 2007 13:24:23 -0000	1.31
+++ ocaml.spec	3 Sep 2007 13:24:15 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -234,7 +234,7 @@
 cp %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/
 cp %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-echo %{version}-%{release} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
+echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
 
 %clean
@@ -421,6 +421,10 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
+- Don't include the release number in fedora-ocaml-release file, so
+  that packages built against this won't depend on the Fedora release.
+
 * Wed Aug 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.10.0-4
 - added BR util-linux-ng
 



From fedora-extras-commits at redhat.com  Mon Sep  3 14:35:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 10:35:42 -0400
Subject: rpms/ocaml/devel ocaml-find-requires.sh, 1.1, 1.2 ocaml.spec, 1.32,
	1.33
Message-ID: <200709031435.l83EZgA4011385@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11350

Modified Files:
	ocaml-find-requires.sh ocaml.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
- ocaml-runtime provides ocaml(runtime) = 3.10.0, and
  ocaml-find-requires.sh modified so that it adds this requires
  to other packages.  Now can upgrade base ocaml packages without
  needing to rebuild everything else.



Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-find-requires.sh	2 Jul 2007 15:13:39 -0000	1.1
+++ ocaml-find-requires.sh	3 Sep 2007 14:35:10 -0000	1.2
@@ -66,8 +66,7 @@
 sort -u
 
 if [ -n "$emit_compiler_version" ]; then
-    # Every OCaml program depends on the precise version of the
-    # compiler which was used to compile it.
-    # rpm -q --qf '%{NAME} = %{VERSION}-%{RELEASE}\n' ocaml
-    echo "ocaml = `cat /usr/lib*/ocaml/fedora-ocaml-release`"
+    # Every OCaml program depends on the version of the
+    # runtime which was used to compile it.
+    echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`"
 fi


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ocaml.spec	3 Sep 2007 13:24:15 -0000	1.32
+++ ocaml.spec	3 Sep 2007 14:35:10 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -38,6 +38,7 @@
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
+Provides:	ocaml(compiler) = %{version}
 ExcludeArch:    ppc64
 
 %description
@@ -54,6 +55,7 @@
 Group:          System Environment/Libraries
 Summary:        Objective Caml runtime environment
 Requires:       util-linux-ng
+Provides:	ocaml(runtime) = %{version}
 
 %description runtime
 Objective Caml is a high-level, strongly-typed, functional and
@@ -421,6 +423,12 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
+- ocaml-runtime provides ocaml(runtime) = 3.10.0, and
+  ocaml-find-requires.sh modified so that it adds this requires
+  to other packages.  Now can upgrade base ocaml packages without
+  needing to rebuild everything else.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
 - Don't include the release number in fedora-ocaml-release file, so
   that packages built against this won't depend on the Fedora release.



From fedora-extras-commits at redhat.com  Mon Sep  3 14:36:20 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 10:36:20 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.12,1.13
Message-ID: <200709031436.l83EaKcB011450@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386

Modified Files:
	rss-glx.spec 
Log Message:
fix %xssexthacksconfdir



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rss-glx.spec	3 Sep 2007 12:37:14 -0000	1.12
+++ rss-glx.spec	3 Sep 2007 14:35:48 -0000	1.13
@@ -1,5 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
-%define xssexthacksconfdir %{_sysconfdir}/xscreensaver/hacks.d
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %define xssbindir %{_libexecdir}/xscreensaver
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers



From fedora-extras-commits at redhat.com  Mon Sep  3 14:52:54 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 10:52:54 -0400
Subject: rpms/yum-cron/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031452.l83EqsV7011776@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753/devel

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fix cron.daily bug which was skippin gupdates, integrate checkonly patch
into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:44:39 -0000	1.2
+++ .cvsignore	3 Sep 2007 14:52:22 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:44:39 -0000	1.2
+++ sources	3 Sep 2007 14:52:22 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 15:19:53 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 14:52:22 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:00:06 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:00:06 -0400
Subject: rpms/yum-cron/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031500.l83F06je012283@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/F-7

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.  Integrated checkonly patch into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 19:15:49 -0000	1.2
+++ .cvsignore	3 Sep 2007 14:59:33 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 19:15:49 -0000	1.2
+++ sources	3 Sep 2007 14:59:33 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:40:45 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 14:59:33 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:02:47 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:02:47 -0400
Subject: rpms/yum-cron/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031502.l83F2l20018314@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18253/FC-6

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.
Integrated checkonly patch into souce tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:53:53 -0000	1.2
+++ .cvsignore	3 Sep 2007 15:02:13 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:53:53 -0000	1.2
+++ sources	3 Sep 2007 15:02:13 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:47:04 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 15:02:13 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:04:51 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:04:51 -0400
Subject: rpms/yum-cron/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031504.l83F4pMM018442@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18391/EL-5

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.
Integrated checkonly patch into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:53:53 -0000	1.2
+++ .cvsignore	3 Sep 2007 15:04:18 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:53:53 -0000	1.2
+++ sources	3 Sep 2007 15:04:18 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:49:15 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 15:04:18 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:24:39 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:24:39 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.1,
	1.2 xscreensaver.spec, 1.44, 1.45
Message-ID: <200709031524.l83FOdEx019180@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19160

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
- Don't split hack part of XScreenSaver.ad into each hack piece
  and make update script allow multiple config lines
  (along with rss-glx)



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-xscreensaver-hacks	2 Sep 2007 15:24:14 -0000	1.1
+++ update-xscreensaver-hacks	3 Sep 2007 15:24:07 -0000	1.2
@@ -11,7 +11,7 @@
 fix_hackconf ()
 {
 	if [ ! -s $1 ] ; then
-		echo "$1 is empty" &>2
+		echo "$1 is empty" >&2
 		echo ""
 		return 1
 	fi
@@ -37,15 +37,12 @@
 	while [ -s $tmpconf_2 ] ; do
 		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
 		sed -i -e '1d' $tmpconf_2
-		if grep -q '\\..*$' $tmpconf_3 ; then
+		if ! grep -q '\([ \t]\\$\|\\n\\$\)' $tmpconf_3 ; then
 			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
 			echo ""
 			echo "ignoring $1" >&2
 			return 1
 		fi
-		if ! grep -q '\\$' $tmpconf_3 ; then
-			sed -i -e 's|\(^.*$\)|\1\\|' $tmpconf_3
-		fi
 		cat $tmpconf_3 >> $tmpconf
 	done
 	cat $tmpconf_1 >> $tmpconf


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xscreensaver.spec	2 Sep 2007 15:24:14 -0000	1.44
+++ xscreensaver.spec	3 Sep 2007 15:24:07 -0000	1.45
@@ -2,7 +2,7 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -292,44 +292,9 @@
 
 # Seperate XScreenSaver.ad.hacks into each hacks
 cd $CONFD
-mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/ ; cd hacks.conf.d
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
 
-while [ -s XScreenSaver.ad.hacks ] ; do
-# cut hacks file by \n
-   sed -n -e '1,1p' XScreenSaver.ad.hacks > .tmp
-   if grep -q '\\n[\\]*$' .tmp ; then
-      sed -i -e '1d' XScreenSaver.ad.hacks
-   else
-      sed -n -e '1,/\\n[\\]*$/p' XScreenSaver.ad.hacks > .tmp
-      sed -i -e '1,/\\n[\\]*$/d' XScreenSaver.ad.hacks
-   fi
-
-# name modular hack conf
-   set +x
-   cp -p .tmp .tmp.2
-   modname='\'
-   while ( echo $modname | grep -q '\\' ) ; do
-      sed -n -e '1,1p' .tmp.2 | sed -e \
-         's|^[-]*[ \t][ \t]*\([a-zA-Z][a-zA-Z-]*:[ \t][ \t]*\)*\("[^"][^"]*"[ \t][ \t]*\)*||' | \
-         sed -e 's|[ \t].*$||' > .mod.name
-      modname=`cat .mod.name`
-      sed -i -e '1,1d' .tmp.2
-   done
-   N=1
-   Filen=$modname.conf
-   while [ -f $Filen ] ; do
-      N=$((N+1))
-      Filen=$modname-$N.conf
-   done
-   sed -e 's|\\n$|\\n\\|' .tmp > $Filen
-   echo "   created: $Filen"
-
-# clean up
-   rm -f .tmp* .mod.name
-
-done
-set -x
-cd ../..
 %endif
 
 %install
@@ -393,7 +358,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
 cp -p xscreensaver/XScreenSaver.ad* \
    $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
-cp -p xscreensaver/hacks.conf.d/*.conf \
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
    $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
 
 for adfile in xscreensaver/XScreenSaver.ad.* ; do
@@ -403,6 +368,8 @@
 echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
 echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
    $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+   >> $dd/base.files
 
 # check symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
@@ -419,19 +386,6 @@
 ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
    $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
 
-set +x
-for conf in xscreensaver/hacks.conf.d/*.conf ; do
-   modname=`basename $conf | sed -e 's|.conf||' | sed -e 's|-.*||'`
-   if grep -q -i $modname $dd/extras.files ; then
-        hackfile=$dd/extras.files
-   else
-        hackfile=$dd/gl-extras.files
-   fi
-   echo "%{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`" >> $hackfile
-   echo -n " Added: %{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`"
-   echo " >> `basename $hackfile`"
-done
-set -x
 %endif
 
 # add documents
@@ -526,11 +480,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{modular_conf}
-%post extras
-%{_bindir}/update-xscreensaver-hacks
-exit 0
-
-%post gl-extras
+%post base
 %{_bindir}/update-xscreensaver-hacks
 exit 0
 %endif
@@ -554,8 +504,13 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
+- Don't split hack part of XScreenSaver.ad into each hack piece
+  and make update script allow multiple config lines
+  (along with rss-glx)
+
 * Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
-- Try to make XScreenSaver.ad modular
+- Try to make XScreenSaver.ad modular (bug 200881)
 
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
@@ -565,7 +520,7 @@
   - Don't use include-directory patch anymore
   - Make all xscreensaver related directories owned by -base subpackage
     because now -extras and -gl-extras subpackage require it.
-  - Mark man files as %%doc explicitly, because %_mandir is expanded
+  - Mark man files as %%doc explicitly, because %%_mandir is expanded
     in files list
 - Fix write_long() (actually no_malloc_number_to_string())
 



From fedora-extras-commits at redhat.com  Mon Sep  3 15:33:48 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Mon, 3 Sep 2007 11:33:48 -0400
Subject: rpms/audit/F-7 audit-1.6-python.patch, NONE,
	1.1 s-c-audit-0.4.3.patch, 
	NONE, 1.1 audit.spec, 1.136, 1.137 audit-1.3.1-python.patch, 1.3, NONE
Message-ID: <200709031533.l83FXmIJ019615@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554

Modified Files:
	audit.spec 
Added Files:
	audit-1.6-python.patch s-c-audit-0.4.3.patch 
Removed Files:
	audit-1.3.1-python.patch 
Log Message:
* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
- Update s-c-audit to version 0.4.3
- Fix reference counting in auparse python bindings (#263961) 


audit-1.6-python.patch:

--- NEW FILE audit-1.6-python.patch ---
diff -ur /home/mitr/a/audit-1.6/bindings/python/auparse_python.c audit-1.6/bindings/python/auparse_python.c
--- /home/mitr/a/audit-1.6/bindings/python/auparse_python.c	2007-05-30 22:37:40.000000000 +0200
+++ audit-1.6/bindings/python/auparse_python.c	2007-08-29 18:03:35.000000000 +0200
@@ -57,8 +57,8 @@
 {
     if (self->sec == NULL) {
         if ((self->sec = PyInt_FromLong(self->event.sec)) == NULL) return NULL;
-        Py_INCREF(self->sec);
     }
+    Py_INCREF(self->sec);
     return self->sec;
 }
 
@@ -67,8 +67,8 @@
 {
     if (self->milli == NULL) {
         if ((self->milli = PyInt_FromLong(self->event.milli)) == NULL) return NULL;
-        Py_INCREF(self->milli);
     }
+    Py_INCREF(self->milli);
     return self->milli;
 }
 
@@ -77,8 +77,8 @@
 {
     if (self->serial == NULL) {
         if ((self->serial = PyInt_FromLong(self->event.serial)) == NULL) return NULL;
-        Py_INCREF(self->serial);
     }
+    Py_INCREF(self->serial);
     return self->serial;
 }
 
@@ -88,7 +88,9 @@
     if (self->event.host == NULL) {
         Py_RETURN_NONE;
     } else {
-        if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	if (self->host == NULL) {
+	    if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	}
         Py_INCREF(self->host);
         return self->host;
     }

s-c-audit-0.4.3.patch:

--- NEW FILE s-c-audit-0.4.3.patch ---
diff -ur audit-1.5.6.orig/system-config-audit/ChangeLog audit-1.5.6/system-config-audit/ChangeLog
--- audit-1.5.6.orig/system-config-audit/ChangeLog	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/ChangeLog	2007-08-28 14:20:16.000000000 -0400
@@ -1,3 +1,21 @@
+2007-08-28  Miloslav Trma??  <mitr at redhat.com>
+
+	* configure.ac: Release 0.4.3.
+	* NEWS: Update.
+
+	* src/audit_rules.py (Field.option_text): New parameter rule.  Use
+	-p only in rules with -w, -F perm= otherwise.
+	(Rule.command_text): Add -k only after -S.
+
+2007-08-02  Miloslav Trma??  <mitr at redhat.com>
+
+	* src/main_window.py (N_): Remove useless definition.
+
+2007-07-23  Miloslav Trma??  <mitr at redhat.com>
+
+	* src/watch_list_dialog.py (_WatchTable._validate_rule): Fix a
+	crash when the rule has no AUDIT_WATCH or AUDIT_PERM field.
+
 2007-07-17  Miloslav Trma??  <mitr at redhat.com>
 
 	* system-config-audit.desktop.in (Categories): Add System, to move the
diff -ur audit-1.5.6.orig/system-config-audit/configure.ac audit-1.5.6/system-config-audit/configure.ac
--- audit-1.5.6.orig/system-config-audit/configure.ac	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/configure.ac	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([system-config-audit], [0.4.2], [mitr at redhat.com])
+AC_INIT([system-config-audit], [0.4.3], [mitr at redhat.com])
 AC_COPYRIGHT(
 [Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
 
diff -ur audit-1.5.6.orig/system-config-audit/NEWS audit-1.5.6/system-config-audit/NEWS
--- audit-1.5.6.orig/system-config-audit/NEWS	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/NEWS	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,10 @@
+Changes in release 0.4.3:
+* Fix order of -k and -S, and using -p without -w, in audit rules
+* Fix a crash validating a non-watch rule
+* Move the menu entry to the Administration submenu in GNOME
+
 Changes in release 0.4.2:
-* Modify to run on RHEL 5.
+* Modify to run on RHEL 5
 
 Changes in release 0.4.1:
 * Add an install-fedora Makefile target
diff -ur audit-1.5.6.orig/system-config-audit/src/audit_rules.py audit-1.5.6/system-config-audit/src/audit_rules.py
--- audit-1.5.6.orig/system-config-audit/src/audit_rules.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/audit_rules.py	2007-08-28 14:08:59.000000000 -0400
@@ -347,13 +347,18 @@
         self.op = self.OP_EQ
         self.value = self.get_field_type(self.var).parse_value(string, self.op)
 
-    def option_text(self):
-        '''Return a string representing this field as an auditctl option.'''
+    def option_text(self, rule):
+        '''Return a string representing this field as an auditctl option.
+
+        Use rule to determine the correct syntax.
+
+        '''
         val = self._value_text()
         if self.var == audit.AUDIT_FILTERKEY:
             assert self.op == self.OP_EQ
             return '-k %s' % val
-        elif self.var == audit.AUDIT_PERM:
+        elif (self.var == audit.AUDIT_PERM and
+              len([f for f in rule.fields if f.var == audit.AUDIT_WATCH]) == 1):
             assert self.op == self.OP_EQ
             return '-p %s' % val
         else:
@@ -443,16 +448,21 @@
             o.append('-w %s' % watches[0].value)
             watch_used = True
         # Add fields before syscalls because -F arch=... may change the meaning
-        # of syscall names
+        # of syscall names.  But add AUDIT_FILTERKEY only after -S, auditctl
+        # stubbornly insists on that order.
         for f in self.fields:
-            if f.var != audit.AUDIT_WATCH or not watch_used:
-                o.append(f.option_text())
+            if (f.var != audit.AUDIT_FILTERKEY and
+                (f.var != audit.AUDIT_WATCH or not watch_used)):
+                o.append(f.option_text(self))
         if list is not rules.exclude_rules:
             for s in self.syscalls:
                 if s == self.SYSCALLS_ALL:
                     o.append('-S all')
                 else:
                     o.append('-S %s' % util.syscall_string(s, self.machine))
+        for f in self.fields:
+            if f.var == audit.AUDIT_FILTERKEY:
+                o.append(f.option_text(self))
         return ' '.join(o)
 
     def __eq__(self, rule):
diff -ur audit-1.5.6.orig/system-config-audit/src/main_window.py audit-1.5.6/system-config-audit/src/main_window.py
--- audit-1.5.6.orig/system-config-audit/src/main_window.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/main_window.py	2007-08-28 14:08:59.000000000 -0400
@@ -32,8 +32,6 @@
 import settings
 import util
 
-def N_(s): return s
-
 def exit_watch_rules(rules):
     '''Split exit rules to lists for WatchListDialog and RuleListDialog.
 
diff -ur audit-1.5.6.orig/system-config-audit/src/server.c audit-1.5.6/system-config-audit/src/server.c
--- audit-1.5.6.orig/system-config-audit/src/server.c	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/server.c	2007-08-28 14:08:59.000000000 -0400
@@ -200,7 +200,7 @@
       err = errno;
       goto err_fd;
     }
-  if (st.st_size > SIZE_MAX)
+  if (st.st_size > (off_t)SIZE_MAX)
     {
       err = EFBIG;
       goto err_fd;


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-7/audit.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- audit.spec	28 Aug 2007 13:25:30 -0000	1.136
+++ audit.spec	3 Sep 2007 15:33:16 -0000	1.137
@@ -1,14 +1,17 @@
-%define sca_version 0.4.2
+%define sca_version 0.4.3
+%define sca_release 1
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.5.7-updates.patch
+Patch2: s-c-audit-0.4.3.patch
+Patch3: audit-1.6-python.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -55,17 +58,10 @@
 The audit-libs-python package contains the bindings so that libaudit
 and libauparse can be used by python.
 
-%package audispd-plugins
-Summary: Default plugins for the audit dispatcher
-License: LGPL
-Group: System Environment/Daemons
-
-%description audispd-plugins
-The audispd-plugins package contains plugins for the audit dispatcher.
-
 %package -n system-config-audit
 Summary: Utility for editing audit configuration
 Version: %{sca_version}
+Release: %{sca_release}%{?dist}
 License: GPL
 Group: Applications/System
 Requires: pygtk2-libglade usermode usermode-gtk
@@ -76,8 +72,11 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+(cd system-config-audit; ./autogen.sh)
 aclocal && autoconf && autoheader && automake
 %configure --sbindir=/sbin --libdir=/%{_lib}
 make
@@ -162,6 +161,7 @@
 
 %files libs-devel
 %defattr(-,root,root)
+%doc contrib/skeleton.c
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
@@ -179,7 +179,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -214,6 +214,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
+- Update s-c-audit to version 0.4.3
+- Fix reference counting in auparse python bindings (#263961) 
+
 * Tue Aug 28 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-1
 - New upstream version
 


--- audit-1.3.1-python.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:35:11 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:35:11 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.45,1.46
Message-ID: <200709031535.l83FZB4l019719@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19684

Modified Files:
	xscreensaver.spec 
Log Message:
- move hack update scripts to %%_sbindir


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xscreensaver.spec	3 Sep 2007 15:24:07 -0000	1.45
+++ xscreensaver.spec	3 Sep 2007 15:34:39 -0000	1.46
@@ -350,8 +350,9 @@
 
 %if %{modular_conf}
 # install update script
-install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}
-echo "%{_bindir}/update-xscreensaver-hacks" >> $dd/base.files
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
+echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
 
 # make hack conf modular
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
@@ -481,7 +482,7 @@
 
 %if %{modular_conf}
 %post base
-%{_bindir}/update-xscreensaver-hacks
+%{_sbindir}/update-xscreensaver-hacks
 exit 0
 %endif
 
@@ -506,8 +507,9 @@
 %changelog
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
 - Don't split hack part of XScreenSaver.ad into each hack piece
-  and make update script allow multiple config lines
-  (along with rss-glx)
+  and make update script allow multiple hacks in one config file
+  (along with rss-glx, bug 200881)
+- move hack update scripts to %%_sbindir
 
 * Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
 - Try to make XScreenSaver.ad modular (bug 200881)



From fedora-extras-commits at redhat.com  Mon Sep  3 15:41:35 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 3 Sep 2007 11:41:35 -0400
Subject: rpms/vpnc/devel vpnc-0.4.0-sizeofbug.patch, NONE, 1.1 vpnc.spec,
	1.23, 1.24
Message-ID: <200709031541.l83FfZpJ020045@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20019

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
- fix long standing bug causing problems on x86_64 (#232565) now for real


vpnc-0.4.0-sizeofbug.patch:

--- NEW FILE vpnc-0.4.0-sizeofbug.patch ---
diff -up vpnc-0.4.0/vpnc.c.sizeofbug vpnc-0.4.0/vpnc.c
--- vpnc-0.4.0/vpnc.c.sizeofbug	2007-09-03 17:30:03.000000000 +0200
+++ vpnc-0.4.0/vpnc.c	2007-09-03 17:30:45.000000000 +0200
@@ -1971,7 +1971,7 @@ static void setup_link(struct sa_block *
 		rp->next->next->next = us;
 	}
 
-	gcry_create_nonce((uint8_t *) & msgid, sizeof(&msgid));
+	gcry_create_nonce((uint8_t *) & msgid, sizeof(msgid));
 	if (msgid == 0)
 		msgid = 1;
 


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vpnc.spec	22 Aug 2007 21:15:39 -0000	1.23
+++ vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -16,6 +16,7 @@
 Patch0:         vpnc-0.4.0-pie.patch
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.4.0-cloexec.patch
+Patch3:		vpnc-0.4.0-sizeofbug.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,11 +44,9 @@
 %patch0 -p1 -b .pie
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
+%patch3 -p1 -b .sizeofbug
 
 %build
-%ifarch x86_64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector//g)
-%endif
 make PREFIX=/usr
 
 %install
@@ -100,6 +99,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
+- fix long standing bug causing problems on x86_64 (#232565) now for real
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-3
 - license tag fix
 



From fedora-extras-commits at redhat.com  Mon Sep  3 15:53:05 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 3 Sep 2007 11:53:05 -0400
Subject: rpms/claws-mail/F-7 .cvsignore, 1.10, 1.11 claws-mail.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200709031553.l83Fr5Uh020318@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20277/F-7

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade
- new license tag (upstream switch to GPLv3+)
- fix #254121 (CVE-2007-2958)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jul 2007 15:21:28 -0000	1.10
+++ .cvsignore	3 Sep 2007 15:52:21 -0000	1.11
@@ -1 +1 @@
-claws-mail-2.10.0.tar.bz2
+claws-mail-3.0.0.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail.spec	22 Aug 2007 06:51:36 -0000	1.17
+++ claws-mail.spec	3 Sep 2007 15:52:21 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        2.10.0
-Release:        4%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
-License:        GPLv2+ and LGPLv2+
+License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-2.10.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,12 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-1
+- version upgrade
+- new license tag (upstream switch to GPLv3+)
+- fix #254121 (CVE-2007-2958)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-4
 - new license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jul 2007 15:21:28 -0000	1.10
+++ sources	3 Sep 2007 15:52:21 -0000	1.11
@@ -1 +1 @@
-ed409002b5e6b60b682ae3ee7f87a86d  claws-mail-2.10.0.tar.bz2
+9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 15:53:11 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 3 Sep 2007 11:53:11 -0400
Subject: rpms/claws-mail/devel .cvsignore, 1.10, 1.11 claws-mail.spec, 1.17, 
	1.18 sources, 1.10, 1.11
Message-ID: <200709031553.l83FrBOP020323@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20277/devel

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade
- new license tag (upstream switch to GPLv3+)
- fix #254121 (CVE-2007-2958)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jul 2007 14:29:49 -0000	1.10
+++ .cvsignore	3 Sep 2007 15:52:35 -0000	1.11
@@ -1 +1 @@
-claws-mail-2.10.0.tar.bz2
+claws-mail-3.0.0.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail.spec	22 Aug 2007 06:51:39 -0000	1.17
+++ claws-mail.spec	3 Sep 2007 15:52:35 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        2.10.0
-Release:        4%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
-License:        GPLv2+ and LGPLv2+
+License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-2.10.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,10 +207,15 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-1
+- version upgrade
+- new license tag (upstream switch to GPLv3+)
+- fix #254121 (CVE-2007-2958)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-4
 - new license tag
-- rebuild for ppc32
 
 * Wed Jul 18 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jul 2007 14:29:49 -0000	1.10
+++ sources	3 Sep 2007 15:52:35 -0000	1.11
@@ -1 +1 @@
-ed409002b5e6b60b682ae3ee7f87a86d  claws-mail-2.10.0.tar.bz2
+9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 15:58:19 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:58:19 -0400
Subject: rpms/jd/devel .cvsignore, 1.141, 1.142 jd.spec, 1.167, 1.168 sources,
	1.142, 1.143
Message-ID: <200709031558.l83FwJ08020499@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20428

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
- svn 1311



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	1 Sep 2007 16:32:36 -0000	1.141
+++ .cvsignore	3 Sep 2007 15:57:38 -0000	1.142
@@ -1 +1 @@
-jd-1.9.6-svn1304.tgz
+jd-1.9.6-svn1311.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- jd.spec	1 Sep 2007 16:32:36 -0000	1.167
+++ jd.spec	3 Sep 2007 15:57:38 -0000	1.168
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1304
+%define         strtag        svn1311
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
-- svn 1304
+* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
+- svn 1311
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- sources	1 Sep 2007 16:32:36 -0000	1.142
+++ sources	3 Sep 2007 15:57:38 -0000	1.143
@@ -1 +1 @@
-60cc39b08265a902ce8d7f561715b389  jd-1.9.6-svn1304.tgz
+ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 16:03:58 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon,  3 Sep 2007 12:03:58 -0400
Subject: fedora-security/manifest dist-fc7-updates,1.3,1.4
Message-ID: <200709031603.l83G3wfv026494@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/manifest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408

Modified Files:
	dist-fc7-updates 
Log Message:
Up-to-date



Index: dist-fc7-updates
===================================================================
RCS file: /cvs/fedora/fedora-security/manifest/dist-fc7-updates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dist-fc7-updates	30 Aug 2007 10:18:12 -0000	1.3
+++ dist-fc7-updates	3 Sep 2007 16:03:55 -0000	1.4
@@ -124,7 +124,7 @@
 aiccu-2007.01.15-1.fc7                    fe7-merge             jkeating
 aide-0.12-2.fc7                           fe7-merge             jkeating
 aiksaurus-1.2.1-15.fc6                    fe7-merge             jkeating
-aircrack-ng-0.9-1.fc7                     dist-fc7              till
+aircrack-ng-0.9.1-1.fc7                   dist-fc7-updates      till
 airsnort-0.2.7e-11.fc7                    fe7-merge             jkeating
 akode-2.0.1-6.fc7                         fe7-merge             jkeating
 alacarte-0.11.3-3.fc7                     dist-fc7              jkeating
@@ -147,7 +147,7 @@
 alsamixergui-0.9.0-0.3.rc1.fc6            fe7-merge             jkeating
 altermime-0.3.7-2.fc6                     fe7-merge             jkeating
 am-utils-6.1.5-6.fc7                      dist-fc7              jkeating
-amanda-2.5.1p3-2.fc7                      dist-fc7-updates      rbrich
+amanda-2.5.1p3-3.fc7                      dist-fc7-updates      rbrich
 amarok-1.4.6-2.fc7                        dist-fc7-updates      abompard
 amarokFS-0.5-1.fc7                        fe7-merge             jkeating
 amavisd-new-2.5.1-1.fc7                   dist-fc7-updates      steve
@@ -187,7 +187,7 @@
 archmage-0.0.8-1.fc7                      fe7-merge             jkeating
 ardour-0.99.3-8.fc7                       fe7-merge             jkeating
 argus-2.0.6.fixes.1-13.fc7                fe7-merge             jkeating
-aria2-0.11.1-1.fc7                        dist-fc7-updates      ecik
+aria2-0.11.2-1.fc7                        dist-fc7-updates      ecik
 arj-3.10.22-1.fc6                         fe7-merge             jkeating
 arm-gp2x-linux-SDL-1.2.9-4.fc7            dist-fc7-updates      jwrdegoede
 arm-gp2x-linux-binutils-2.16.1-2.fc7      dist-fc7-updates      jwrdegoede
@@ -249,7 +249,7 @@
 at-3.1.10-13.fc7                          dist-fc7-updates      mmaslano
 at-spi-1.18.1-1.fc7                       dist-fc7              jkeating
 atanks-2.4-1.fc7                          dist-fc7-updates      icon
-aterm-1.0.0-7.fc7                         fe7-merge             jkeating
+aterm-1.0.1-1.fc7                         dist-fc7-updates      awjb
 athcool-0.3.11-5.fc6                      fe7-merge             jkeating
 atitvout-0.4-6                            fe7-merge             jkeating
 atk-1.18.0-1.fc7                          dist-fc7              jkeating
@@ -276,7 +276,7 @@
 autoconf213-2.13-17.fc7                   dist-fc7              jkeating
 autodir-0.99.9-2.fc7                      dist-fc7              thias
 autodownloader-0.2.0-2.fc7                dist-fc7              jwrdegoede
-autofs-5.0.1-25                           dist-fc7-updates      iankent
+autofs-5.0.1-26                           dist-fc7-updates      iankent
 autogen-5.8.9-1.fc7                       fe7-merge             jkeating
 automake-1.10-5                           dist-fc7              jkeating
 automake14-1.4p6-15.fc7                   dist-fc7              jkeating
@@ -314,7 +314,7 @@
 bazaar-1.4.2-8.fc6                        fe7-merge             jkeating
 bbkeys-0.9.0-6.fc7                        fe7-merge             jkeating
 bc-1.06-26                                dist-fc7              jkeating
-bcel-5.1-10jpp.3.fc7                      dist-fc7-updates      pcheung
+bcel-5.1-10jpp.4.fc7                      dist-fc7-updates      pcheung
 bcfg2-0.9.4-4.fc7                         dist-fc7-updates      jcollie
 bchunk-1.2.0-4                            fe7-merge             jkeating
 bcm43xx-fwcutter-006-1.fc7                fe7-merge             jkeating
@@ -330,7 +330,7 @@
 beryl-manager-0.2.1-1.fc7                 dist-fc7-updates      jwilson
 beryl-plugins-0.2.1-1.fc7                 dist-fc7-updates      jwilson
 beryl-settings-0.2.1-1.fc7                dist-fc7-updates      jwilson
-bibletime-1.6.3b-3.fc7                    fe7-merge             jkeating
+bibletime-1.6.4-2.fc7                     dist-fc7-updates      anderson
 bidiv-1.5-4.fc6                           fe7-merge             jkeating
 bigloo-3.0a-4.fc7                         dist-fc7-updates      gemi
 bind-9.4.1-9.P1.fc7                       dist-fc7-updates      atkac
@@ -377,7 +377,7 @@
 bouml-doc-2.30-3.fc7                      dist-fc7-updates      rishi
 bouncycastle-1.34-3.fc7                   dist-fc7              jkeating
 brandy-1.0.19-4.fc6                       fe7-merge             jkeating
-brasero-0.5.2-1.fc7                       fe7-merge             jkeating
+brasero-0.6.1-1.fc7                       dist-fc7-updates      denis
 bridge-utils-1.1-2                        dist-fc6              jkeating
 brltty-3.7.2-3.fc7                        dist-fc7              jkeating
 bsd-games-2.17-20.fc7                     fe7-merge             jkeating
@@ -418,6 +418,7 @@
 camstream-0.26.3-11.fc7                   fe7-merge             jkeating
 castor-0.9.5-1jpp.7                       dist-fc6              jkeating
 catfish-0.3-0.1.b.fc7                     dist-fc7              mtasaka
+cbios-0.21-3.fc7                          dist-fc7-updates      oddsocks
 ccache-2.4-8.fc7                          fe7-merge             jkeating
 ccid-1.2.1-1.fc7                          dist-fc7              jkeating
 ccrtp-1.5.1-1.fc7                         fe7-merge             jkeating
@@ -515,7 +516,7 @@
 conserver-8.1.16-1.fc7                    fe7-merge             jkeating
 contact-lookup-applet-0.16-1.fc7          dist-fc7-updates      bpepple
 contacts-0.5-1.fc7                        dist-fc7-updates      denis
-control-center-2.18.0-18.fc7              dist-fc7              hadess
+control-center-2.18.0-20.fc7              dist-fc7-updates      rstrode
 convmv-1.10-2.fc6                         fe7-merge             jkeating
 cook-2.30-1.fc7                           dist-fc7-updates      gemi
 coolkey-1.1.0-1.fc7                       dist-fc7              jkeating
@@ -537,7 +538,7 @@
 createrepo-0.4.10-1.fc7                   dist-fc7-updates      pnasrat
 crm114-0-0.4.20070301.fc7                 fe7-merge             jkeating
 cronolog-1.6.2-4.fc7                      fe7-merge             jkeating
-crontabs-1.10-14.fc7                      dist-fc7              jkeating
+crontabs-1.10-15.fc7                      dist-fc7-updates      mmaslano
 crossfire-1.10.0-1.fc7                    dist-fc7-updates      wart
 crossfire-client-1.10.0-1.fc7             dist-fc7-updates      wart
 crossfire-maps-1.10.0-1.fc7               dist-fc7-updates      wart
@@ -545,8 +546,8 @@
 cryptix-3.2.0-9jpp.1                      dist-fc6              jkeating
 cryptix-asn1-20011119-7jpp.2              dist-fc6              jkeating
 crypto-utils-2.3-2                        dist-fc7              jkeating
-cryptsetup-luks-1.0.3-4.fc7               dist-fc7              jkeating
-crystal-1.0.4-1.fc7                       dist-fc7-updates      chitlesh
+cryptsetup-luks-1.0.5-4.fc7.1             dist-fc7-updates      till
+crystal-1.0.5-1.fc7                       dist-fc7-updates      chitlesh
 crystal-clear-20050622-5.fc7              dist-fc7-updates      chitlesh
 crystal-project-20070620-3.fc7            dist-fc7-updates      chitlesh
 crystal-stacker-1.5-3.fc6                 fe7-merge             jkeating
@@ -598,7 +599,7 @@
 dbus-qt-0.70-1.fc7                        fe7-merge             jkeating
 dbus-sharp-0.63-6.fc6                     dist-fc6              jkeating
 dclib-0.3.8-2.fc7                         fe7-merge             jkeating
-dcraw-8.53-2.fc7                          dist-fc7              jkeating
+dcraw-8.77-1.fc7                          dist-fc7-updates      nphilipp
 dd2-0.2.1-1.fc7                           fe7-merge             jkeating
 dd_rescue-1.12-6.fc7                      fe7-merge             jkeating
 ddclient-3.7.1-1.fc7                      fe7-merge             jkeating
@@ -730,7 +731,7 @@
 ekg2-0-0.7.20070427.fc7                   dist-fc7-updates      rathann
 ekiga-2.0.9-1.fc7                         dist-fc7              jkeating
 elektra-0.6.10-2.fc7                      fe7-merge             jkeating
-elfutils-0.128-2.fc7                      dist-fc7-updates      roland
+elfutils-0.129-1.fc7                      dist-fc7-updates      roland
 elilo-3.6-2                               dist-fc6              jkeating
 elinks-0.11.2-1.fc7                       dist-fc7              jkeating
 elisa-0.3.1-1.fc7                         dist-fc7-updates      thias
@@ -802,7 +803,7 @@
 fail2ban-0.8.1-10.fc7                     dist-fc7-updates      athimm
 fakechroot-2.5-12.fc7                     fe7-merge             jkeating
 fakeroot-1.6.4-15.fc7                     fe7-merge             jkeating
-fann-2.0.0-3.fc7                          dist-fc7-updates      tsmetana
+fann-2.0.0-4.fc7                          dist-fc7-updates      tsmetana
 farsight-0.1.20-2.fc7                     dist-fc7-updates      bpepple
 fast-user-switch-applet-2.17.4-4.fc7      dist-fc7              jkeating
 fatsort-0.9.7.1-1.fc7                     dist-fc7-updates      till
@@ -974,7 +975,7 @@
 gdhcpd-0.3.2-4.fc7                        dist-fc7-updates      drago01
 gdk-pixbuf-0.22.0-34.fc7                  fe7-merge             jkeating
 gdl-0.9-0.pre4.1.fc7                      fe7-merge             jkeating
-gdm-2.18.4-1.fc7                          dist-fc7-updates      rstrode
+gdm-2.18.4-2.fc7                          dist-fc7-updates      rstrode
 gdmap-0.7.5-6.fc6                         fe7-merge             jkeating
 gdome2-0.8.1-5.2.fc7                      fe7-merge             jkeating
 gds2pov-0.20070815-1.fc7                  dist-fc7-updates      chitlesh
@@ -1048,7 +1049,7 @@
 glib-java-0.2.6-8.fc7                     dist-fc7              jkeating
 glib2-2.12.13-1.fc7                       dist-fc7-updates      mclasen
 glibc-2.6-4                               dist-fc7-updates      jakub
-glibmm24-2.12.8-1.fc7                     fe7-merge             jkeating
+glibmm24-2.12.10-1.fc7                    dist-fc7-updates      denis
 glimmer-3.02-1.fc7                        fe7-merge             jkeating
 glipper-0.95.1-2.fc7                      fe7-merge             jkeating
 glitz-0.5.6-5.fc7                         fe7-merge             jkeating
@@ -1131,7 +1132,7 @@
 gnome-vfs2-obexftp-0.2-7.fc7              dist-fc7-updates      hadess
 gnome-vfsmm26-2.18.0-1.fc7                fe7-merge             jkeating
 gnome-volume-manager-2.17.0-7.fc7         dist-fc7              mclasen
-gnomebaker-0.6.1-1.fc7                    dist-fc7-updates      tsmetana
+gnomebaker-0.6.1-2.fc7                    dist-fc7-updates      tsmetana
 gnomeradio-1.6-3.fc6                      fe7-merge             jkeating
 gnomescan-0.4.0.2-1.fc7                   fe7-merge             jkeating
 gnomesword-2.2.3-1.fc7                    fe7-merge             jkeating
@@ -1375,7 +1376,7 @@
 ifd-egate-0.05-17                         dist-fc7              jkeating
 ifm-5.1-5.fc6                             fe7-merge             jkeating
 ifplugd-0.28-6.fc7                        fe7-merge             jkeating
-iftop-0.17-4.fc7                          fe7-merge             jkeating
+iftop-0.17-6.fc7                          dist-fc7-updates      robert
 ike-scan-1.9-2.fc7.1                      dist-fc7-updates      sindrepb
 iksemel-1.2-13.fc7                        fe7-merge             jkeating
 ikvm-0.22-10.fc6                          fe7-merge             jkeating
@@ -1479,7 +1480,7 @@
 jfsutils-1.1.10-4.1                       dist-fc6              jkeating
 jgroups-2.2.9.2-3jpp.2                    dist-fc6              jkeating
 jhead-2.7-1.fc7                           fe7-merge             jkeating
-jigdo-0.7.3-3.fc7                         fe7-merge             jkeating
+jigdo-0.7.3-4.fc7                         dist-fc7-updates      iburrell
 jlex-1.2.6-5jpp.1                         dist-fc6              jkeating
 jline-0.9.9-1jpp.1.fc7                    fe7-merge             jkeating
 joe-3.5-3.fc7                             dist-fc7              jkeating
@@ -1516,7 +1517,7 @@
 kasumi-2.2-4.fc7                          dist-fc7-updates      tagoh
 katapult-0.3.2.1-1.fc7                    dist-fc7-updates      chitlesh
 kawa-1.9.0-2.fc7                          fe7-merge             jkeating
-kazehakase-0.4.7-4.fc7                    dist-fc7-updates      mtasaka
+kazehakase-0.4.8-1.fc7                    dist-fc7-updates      mtasaka
 kbackup-0.5.1-7.fc7                       dist-fc7-updates      dionysos
 kbd-1.12-22.fc7                           dist-fc7-updates      vcrhonek
 kbibtex-0.1.5.52-10.fc7                   dist-fc7-updates      noltec
@@ -1526,24 +1527,21 @@
 kchmviewer-3.0-2.fc7                      fe7-merge             jkeating
 kcometen3-1.1-4.fc7                       fe7-merge             jkeating
 kdbg-2.0.5-2.fc7                          dist-fc7              jkeating
-kde-filesystem-3.5-11.fc7                 dist-fc7-updates      rdieter
+kde-filesystem-3.5-13.fc7                 dist-fc7-updates      rdieter
 kde-i18n-3.5.7-1.fc7                      dist-fc7-updates      than
 kde-settings-3.5-30.fc7                   dist-fc7-updates      than
 kdeaccessibility-3.5.7-1.fc7              dist-fc7-updates      than
 kdeaddons-3.5.7-1.fc7                     dist-fc7-updates      than
 kdeadmin-3.5.7-1.fc7.1                    dist-fc7-updates      than
 kdeartwork-3.5.7-2.fc7                    dist-fc7-updates      rdieter
-kdeartwork-extras-3.5.6-3.fc7             fe7-merge             jkeating
 kdebase-3.5.7-13.fc7                      dist-fc7-updates      rdieter
 kdebindings-3.5.7-1.fc7.1                 dist-fc7-updates      than
 kdebluetooth-1.0-0.31.beta3.fc7           dist-fc7-updates      gilboa
 kdeedu-3.5.7-1.fc7                        dist-fc7-updates      than
 kdegames-3.5.7-1.fc7                      dist-fc7-updates      rdieter
 kdegraphics-3.5.7-2.fc7                   dist-fc7-updates      rdieter
-kdegraphics-extras-3.5.5-1.fc7            fe7-merge             jkeating
-kdelibs-3.5.7-20.fc7                      dist-fc7-updates      rdieter
+kdelibs-3.5.7-21.fc7                      dist-fc7-updates      rdieter
 kdemultimedia-3.5.7-2.fc7                 dist-fc7-updates      rdieter
-kdemultimedia-extras-3.5.6-5.fc7          fe7-merge             jkeating
 kdenetwork-3.5.7-1.fc7.1                  dist-fc7-updates      rdieter
 kdepim-3.5.7-3.fc7                        dist-fc7-updates      rdieter
 kdesdk-3.5.7-7.fc7                        dist-fc7-updates      rdieter
@@ -1624,7 +1622,7 @@
 ksudoku-0.3-2.fc7                         fe7-merge             jkeating
 ksynaptics-0.3.3-1.fc7                    dist-fc7-updates      orion
 ktechlab-0.3.6-6.fc7                      dist-fc7-updates      chitlesh
-ktorrent-2.2.1-1.fc7                      dist-fc7-updates      liquidat
+ktorrent-2.2.1-3.fc7                      dist-fc7-updates      liquidat
 ktrack-0.3.0-15.rc1.fc6                   fe7-merge             jkeating
 kudzu-1.2.71.1-1                          dist-fc7-updates      notting
 kvm-24-1                                  dist-fc7              katzj
@@ -1658,7 +1656,7 @@
 lftp-3.5.10-3.fc7                         dist-fc7              jkeating
 lib3ds-1.2.0-10.fc7                       fe7-merge             jkeating
 lib765-0.4.1-1.fc7                        dist-fc7-updates      oddsocks
-libAfterImage-1.07-8.fc6                  fe7-merge             jkeating
+libAfterImage-1.15-2.fc7                  dist-fc7-updates      awjb
 libEMF-1.0.3-3.fc7                        fe7-merge             jkeating
 libFS-1.0.0-3.1                           dist-fc6              jkeating
 libFoundation-1.1.3-10.fc6                fe7-merge             jkeating
@@ -1956,6 +1954,7 @@
 lineak-xosdplugin-0.9-2.fc6               fe7-merge             jkeating
 lineakd-0.9-5.fc6                         fe7-merge             jkeating
 link-grammar-4.2.2-2.fc6                  fe7-merge             jkeating
+linkchecker-4.7-8.fc7                     dist-fc7-updates      mikep
 linphone-1.7.1-2.fc7                      dist-fc7              jcollie
 linux-atm-2.5.0-1.20050118cvs             dist-fc6              jkeating
 linux-libertine-fonts-2.4.9-1.fc7         fe7-merge             jkeating
@@ -2105,7 +2104,7 @@
 mirrormagic-2.0.2-3.fc7                   fe7-merge             jkeating
 mkbootdisk-1.5.3-2.1                      dist-fc6              jkeating
 mkinitrd-6.0.9-7.1                        dist-fc7-updates      pjones
-mksh-30-1.fc7                             dist-fc7-updates      robert
+mksh-30-2.fc7                             dist-fc7-updates      robert
 mktemp-1.5-25.fc7                         dist-fc7              jkeating
 mkvtoolnix-2.0.2-1.fc7                    fe7-merge             jkeating
 mlmmj-1.2.14-2.fc7                        fe7-merge             jkeating
@@ -2283,7 +2282,7 @@
 ntfs-config-1.0-0.4.rc5.fc7               dist-fc7-updates      laxathom
 ntfsprogs-1.13.1-6.fc7                    dist-fc7-updates      spot
 ntl-5.4-5.fc7                             fe7-merge             jkeating
-ntp-4.2.4p2-1.fc7                         dist-fc7-updates      mlichvar
+ntp-4.2.4p2-3.fc7                         dist-fc7-updates      mlichvar
 numactl-0.9.8-2.fc7                       dist-fc7              jkeating
 numlockx-1.0-11.fc6                       fe7-merge             jkeating
 numpy-1.0.3-0.1.fc7                       dist-fc7-updates      jwilson
@@ -2331,6 +2330,7 @@
 openldap-2.3.34-3.fc7                     dist-fc7-updates      jsafrane
 openlierox-0.57-0.3.beta2.fc7             fe7-merge             jkeating
 openmpi-1.1-8.fc7                         dist-fc7              jkeating
+openmsx-0.6.2-4.fc7                       dist-fc7-updates      oddsocks
 openobex-1.3-5.fc7                        dist-fc7              jkeating
 openoffice.org-2.2.0-14.11                dist-fc7-updates      caolanm
 openoffice.org-dict-cs_CZ-20060303-5.fc7  fe7-merge             jkeating
@@ -2466,6 +2466,7 @@
 perl-Cache-Simple-TimedExpiry-0.27-1.fc7  fe7-merge             jkeating
 perl-Cairo-1.023-1.fc7                    fe7-merge             jkeating
 perl-Calendar-Simple-1.17-1.fc6           fe7-merge             jkeating
+perl-Callback-1.07-1.fc7                  dist-fc7-updates      mkpai
 perl-Carp-Assert-0.20-1.fc7               fe7-merge             jkeating
 perl-Carp-Assert-More-1.12-3.fc6          fe7-merge             jkeating
 perl-Carp-Clan-5.9-1.fc7                  dist-fc7-updates      rnorwood
@@ -2555,7 +2556,7 @@
 perl-Crypt-Primes-0.50-3.fc7              fe7-merge             jkeating
 perl-Crypt-RSA-1.58-2.fc7                 fe7-merge             jkeating
 perl-Crypt-Random-1.25-3.fc7              fe7-merge             jkeating
-perl-Crypt-SSLeay-0.53-1.fc7              dist-fc7              jkeating
+perl-Crypt-SSLeay-0.56-1.fc7              dist-fc7-updates      rnorwood
 perl-Crypt-Simple-0.06-4.fc7              dist-fc7-updates      allisson
 perl-Crypt-SmbHash-0.12-5.fc7             fe7-merge             jkeating
 perl-Curses-1.15-1.fc6                    fe7-merge             jkeating
@@ -2869,7 +2870,7 @@
 perl-Net-CIDR-Lite-0.20-3.fc7             fe7-merge             jkeating
 perl-Net-CUPS-0.51-2.fc7                  fe7-merge             jkeating
 perl-Net-DBus-0.33.5-1.fc7                dist-fc7-updates      cweyl
-perl-Net-DNS-0.60-1.fc7                   dist-fc7-updates      rnorwood
+perl-Net-DNS-0.61-1.fc7                   dist-fc7-updates      rnorwood
 perl-Net-DNS-SEC-0.14-2.fc7               dist-fc7-updates      hardaker
 perl-Net-Domain-TLD-1.65-1.fc7            fe7-merge             jkeating
 perl-Net-GPSD-0.35-1.fc7                  fe7-merge             jkeating
@@ -2904,7 +2905,7 @@
 perl-OpenFrame-3.05-6.fc7                 fe7-merge             jkeating
 perl-PAR-Dist-0.21-2.fc7                  fe7-merge             jkeating
 perl-PBS-0.31-3.fc6                       fe7-merge             jkeating
-perl-PDF-API2-0.60-3.fc7                  dist-fc7              bjohnson
+perl-PDF-API2-0.62-2.fc7                  dist-fc7-updates      bjohnson
 perl-PDL-2.4.3-1.fc7                      dist-fc7              jkeating
 perl-POE-0.9989-1.fc7                     fe7-merge             jkeating
 perl-POE-API-Peek-1.0802-1.fc7            fe7-merge             jkeating
@@ -2948,6 +2949,7 @@
 perl-PerlIO-eol-0.14-1.fc7                fe7-merge             jkeating
 perl-PerlIO-via-dynamic-0.12-2.fc6        fe7-merge             jkeating
 perl-PerlIO-via-symlink-0.05-3.fc6        fe7-merge             jkeating
+perl-Perlbal-XS-HTTPHeaders-0.19-2.fc7    dist-fc7-updates      ruben
 perl-Pipeline-3.12-4.fc7                  fe7-merge             jkeating
 perl-Pod-Coverage-0.18-2.fc6              fe7-merge             jkeating
 perl-Pod-Escapes-1.04-5.fc6               fe7-merge             jkeating
@@ -3249,7 +3251,7 @@
 physfs-1.0.1-5.fc6                        fe7-merge             jkeating
 piccolo-1.04-2jpp.2.fc7                   fe7-merge             jkeating
 picocom-1.4-3.fc6                         fe7-merge             jkeating
-pidgin-2.1.0-2.fc7                        dist-fc7-updates      wtogami
+pidgin-2.1.1-1.fc7                        dist-fc7-updates      wtogami
 pidgin-guifications-2.14-2.fc7            dist-fc7              wtogami
 pidgin-libnotify-0.13-1.fc7               dist-fc7-updates      pgordon
 pidgin-rhythmbox-2.0-1.fc7                fe7-merge             jkeating
@@ -3290,7 +3292,7 @@
 plotmm-0.1.2-5.fc6                        fe7-merge             jkeating
 plotutils-2.5-3.fc6                       fe7-merge             jkeating
 plplot-5.7.3-2.fc7                        fe7-merge             jkeating
-plt-scheme-370-3.fc7                      dist-fc7              gemi
+plt-scheme-371-1.fc7                      dist-fc7-updates      gemi
 pm-utils-0.99.3-6.fc7                     dist-fc7              pjones
 pmd-3.6-1jpp.3.fc7                        fe7-merge             jkeating
 pmount-0.9.13-1.fc7                       dist-fc7              pertusus
@@ -3397,7 +3399,7 @@
 pymsn-0.2.2-1.fc7                         fe7-merge             jkeating
 pyorbit-2.14.2-2.fc7                      dist-fc7              jkeating
 pypar2-1.4-1.fc7                          dist-fc7-updates      mxcarron
-pyparsing-1.4.6-1.fc7                     fe7-merge             jkeating
+pyparsing-1.4.7-1.fc7                     dist-fc7-updates      jamatos
 pyparted-1.8.5-4.fc7                      dist-fc7              jkeating
 pypoker-eval-134.0-1.fc7                  dist-fc7              xulchris
 pyscript-0.6-6.fc7                        fe7-merge             jkeating
@@ -3472,7 +3474,7 @@
 python-meld3-0.6-2.fc7.1                  fe7-merge             jkeating
 python-metar-1.3.0-2.fc7                  fe7-merge             jkeating
 python-musicbrainz2-0.4.1-1.fc7           fe7-merge             jkeating
-python-mutagen-1.11-1.fc7                 fe7-merge             jkeating
+python-mutagen-1.12-1.fc7                 dist-fc7-updates      ecik
 python-myghty-1.1-3.fc7                   fe7-merge             jkeating
 python-nevow-0.9.18-2.fc7                 fe7-merge             jkeating
 python-nltk_lite-0.6.6-2.fc7              fe7-merge             jkeating
@@ -3563,10 +3565,10 @@
 qpidc-0.2-5.fc7                           fe7-merge             jkeating
 qps-1.9.19-0.2.b.fc7                      fe7-merge             jkeating
 qscintilla-1.7.1-1.fc7                    fe7-merge             jkeating
-qsf-1.2.6-2.fc7                           dist-fc7              mlichvar
+qsf-1.2.7-1.fc7                           dist-fc7-updates      mlichvar
 qstat-2.11-1.fc7                          fe7-merge             jkeating
 qsynth-0.2.5-6.fc6                        fe7-merge             jkeating
-qt-3.3.8-4.fc7                            dist-fc7              jkeating
+qt-3.3.8-6.fc7                            dist-fc7-updates      than
 qt-qsa-1.1.5-1.fc7                        dist-fc7-updates      belegdol
 qt4-4.3.1-3.fc7                           dist-fc7-updates      rdieter
 qt4-qsa-1.2.2-4.fc7                       dist-fc7-updates      frankb
@@ -3600,7 +3602,7 @@
 rcs-5.7-30.1                              dist-fc6              jkeating
 rdate-1.4-6                               dist-fc6              jkeating
 rdesktop-1.5.0-2.fc7                      dist-fc7              jkeating
-rdiff-backup-1.0.5-2.fc7                  fe7-merge             jkeating
+rdiff-backup-1.0.5-5.fc7                  dist-fc7-updates      kevin
 rdist-6.1.5-44                            dist-fc6              jkeating
 re2c-0.12.1-2.fc7                         dist-fc7-updates      thias
 readahead-1.4.1-2.fc7                     dist-fc7              jkeating
@@ -3662,7 +3664,7 @@
 rpy-0.4.6-17.fc7                          dist-fc7-updates      spot
 rrdtool-1.2.23-6.fc7                      dist-fc7-updates      jwilson
 rsh-0.17-40.fc7                           dist-fc7              jkeating
-rsibreak-0.8.0-1.fc6                      fe7-merge             jkeating
+rsibreak-0.8.0-2.fc7                      dist-fc7-updates      liquidat
 rsnapshot-1.3.0-1.fc7                     dist-fc7-updates      xris
 rss-glx-0.8.1.p-6.fc6                     fe7-merge             jkeating
 rss2email-2.60-3.fc7                      fe7-merge             jkeating
@@ -3678,7 +3680,7 @@
 ruby-bsearch-1.5-1.fc7                    fe7-merge             jkeating
 ruby-cairo-1.4.1-2.fc7                    fe7-merge             jkeating
 ruby-fam-0.2.0-3.fc7                      fe7-merge             jkeating
-ruby-gettext-package-1.9.0-2.fc7          dist-fc7              mtasaka
+ruby-gettext-package-1.10.0-1.fc7         dist-fc7-updates      mtasaka
 ruby-gnome2-0.16.0-7.fc7                  dist-fc7-updates      allisson
 ruby-mecab-0.96-1.fc7                     dist-fc7-updates      mtasaka
 ruby-mysql-2.7.1-2.fc6                    fe7-merge             jkeating
@@ -3695,7 +3697,7 @@
 rwall-0.17-25.2.2                         dist-fc6              jkeating
 rwho-0.17-26                              dist-fc6              jkeating
 rxvt-2.7.10-11.fc6                        fe7-merge             jkeating
-rxvt-unicode-8.2-1.fc7                    dist-fc7-updates      awjb
+rxvt-unicode-8.3-1.fc7                    dist-fc7-updates      awjb
 rzip-2.1-1.fc7                            fe7-merge             jkeating
 s390utils-1.5.4-4.fc7                     dist-fc7              jkeating
 s3switch-0.0-9.20020912.fc6               fe7-merge             jkeating
@@ -3812,7 +3814,7 @@
 sofia-sip-1.12.6-10.fc7                   dist-fc7-updates      jcollie
 sofsip-cli-0.13-3.fc7                     dist-fc7-updates      jcollie
 solfege-3.6.5-1.fc7                       fe7-merge             jkeating
-sonata-1.2.2-1.fc7                        dist-fc7-updates      ecik
+sonata-1.2.3-1.fc7                        dist-fc7-updates      ecik
 soprano-0.9.0-2.fc7                       dist-fc7-updates      rdieter
 sopwith-1.7.1-4                           fe7-merge             jkeating
 sound-juicer-2.16.4-1.fc7                 dist-fc7              jkeating
@@ -3825,11 +3827,11 @@
 spamassassin-3.2.3-1.fc7                  dist-fc7-updates      wtogami
 spambayes-1.0.4-4.fc7                     fe7-merge             jkeating
 spampd-2.30-3.fc7                         fe7-merge             jkeating
-spandsp-0.0.4-0.2.pre6.fc7                dist-fc7-updates      jcollie
+spandsp-0.0.4-0.3.pre7.fc7                dist-fc7-updates      jcollie
 sparse-0.3-1.fc7                          dist-fc7              roland
 specspo-14-1.fc7                          dist-fc7              mbacovsk
 specto-0.2.2-1.fc7                        dist-fc7-updates      laxathom
-speedcrunch-0.8-4.fc7                     dist-fc7-updates      liquidat
+speedcrunch-0.8-5.fc7                     dist-fc7-updates      liquidat
 speex-1.2-0.2.beta1                       dist-fc7              jkeating
 spicctrl-1.9-5.fc7                        fe7-merge             jkeating
 splint-3.1.1-15.fc6                       fe7-merge             jkeating
@@ -3948,7 +3950,7 @@
 tango-icon-theme-0.8.0-1.fc7              fe7-merge             jkeating
 tango-icon-theme-extras-0.1.0-1.fc7       fe7-merge             jkeating
 tanukiwrapper-3.2.1-2jpp.3                dist-fc6              jkeating
-tar-1.15.1-26.fc7                         dist-fc7              jkeating
+tar-1.15.1-27.fc7                         dist-fc7-updates      rbrich
 taskjuggler-2.4.0-2.fc7                   dist-fc7-updates      ovasik
 tasks-0.9-1.fc7                           dist-fc7-updates      dyoung
 tastymenu-0.8.2-1.fc7                     dist-fc7-updates      nixaff4
@@ -3989,7 +3991,7 @@
 telepathy-salut-0.1.3-1.fc7               dist-fc7-updates      bpepple
 telepathy-stream-engine-0.3.23-1.fc7      dist-fc7-updates      bpepple
 telescope-server-0-0.1.20070315.fc7       fe7-merge             jkeating
-tellico-1.2.10-1.fc7                      fe7-merge             jkeating
+tellico-1.2.13-1.fc7                      dist-fc7-updates      jamatos
 telnet-0.17-38.fc7                        dist-fc7              jkeating
 tenr-de-styles-pkg-1.1-1.fc7              fe7-merge             jkeating
 termcap-5.5-1.20060701.1                  dist-fc6              jkeating
@@ -4050,7 +4052,7 @@
 tklib-0.4.1-5.fc6                         fe7-merge             jkeating
 tktable-2.9-9.fc6                         fe7-merge             jkeating
 tla-1.3.4-5.fc6                           fe7-merge             jkeating
-tmda-1.1.11-4.fc7                         dist-fc7-updates      bjohnson
+tmda-1.1.12-1.fc7                         dist-fc7-updates      bjohnson
 tmpwatch-2.9.11-1                         dist-fc7              jkeating
 tn5250-0.17.3-14.fc7                      dist-fc7              jkeating
 tog-pegasus-2.6.0-2.fc7                   dist-fc7              jkeating
@@ -4101,7 +4103,7 @@
 udev-113-11.fc7                           dist-fc7-updates      harald
 udftools-1.0.0b3-7.fc6                    fe7-merge             jkeating
 udunits-1.12.4-11.fc6                     fe7-merge             jkeating
-ufraw-0.11-8.fc7                          dist-fc7-updates      nphilipp
+ufraw-0.12-1.fc7                          dist-fc7-updates      nphilipp
 ufsparse-2.1.1-1.fc6                      fe7-merge             jkeating
 uim-1.4.1-4.fc7                           dist-fc7-updates      tagoh
 ularn-1.5p4-8.fc7                         fe7-merge             jkeating
@@ -4120,7 +4122,7 @@
 upx-3.01-1.fc7                            dist-fc7-updates      limb
 uqm-0.6.2-1.fc7                           fe7-merge             jkeating
 uqm-content-0.6.0-2                       fe7-merge             jkeating
-urlgfe-1.0-1.fc7                          fe7-merge             jkeating
+urlgfe-1.0.2-1.fc7                        dist-fc7-updates      mtasaka
 urw-fonts-2.3-6.1.1                       dist-fc6              jkeating
 usbsink-0.3.1-1.fc7                       fe7-merge             jkeating
 usbutils-0.71-2.1                         dist-fc6              jkeating
@@ -4189,7 +4191,7 @@
 wallpapoz-0.4.1-1.fc7                     dist-fc7-updates      mtasaka
 wammu-0.19-3.fc7                          dist-fc7-updates      laxathom
 warzone2100-2.0.7-3.fc7                   dist-fc7-updates      karlik
-wavbreaker-0.8.1-2.fc7                    dist-fc7-updates      dmaley
+wavbreaker-0.8.1-3.fc7                    dist-fc7-updates      dmaley
 wavpack-4.41-1.fc7                        dist-fc7              peter
 wbxml2-0.9.2-8.fc7                        fe7-merge             jkeating
 wcstools-3.6.8-2.fc7                      fe7-merge             jkeating
@@ -4227,7 +4229,7 @@
 wmix-3.1-1.fc6                            fe7-merge             jkeating
 wmweather+-2.9-4.fc6                      fe7-merge             jkeating
 wmx-6pl1-14.fc6                           fe7-merge             jkeating
-wordpress-2.2.1-1.fc7                     dist-fc7-updates      jwb
+wordpress-2.2.2-0.fc7                     dist-fc7-updates      jwb
 words-3.0-12.fc7                          dist-fc7              jkeating
 wordtrans-1.1-0.2.pre13.fc7               dist-fc7              jkeating
 workrave-1.8.4-3.fc7                      fe7-merge             jkeating
@@ -4382,7 +4384,7 @@
 xmms-sid-0.8.0-0.3.beta15.fc6             fe7-merge             jkeating
 xmms-skins-1.2.10-15                      fe7-merge             jkeating
 xmms-speex-0.9.1-9.fc7                    fe7-merge             jkeating
-xmoto-0.3.1-1.fc7                         dist-fc7-updates      limb
+xmoto-0.3.3-1.fc7                         dist-fc7-updates      limb
 xmoto-edit-0.2.4-8.fc7                    dist-fc7-updates      limb
 xom-1.0-3jpp.4.fc7                        fe7-merge             jkeating
 xorg-sgml-doctools-1.1.1-1.fc7            dist-fc7              jkeating
@@ -4480,7 +4482,7 @@
 xrestop-0.4-1.fc7                         dist-fc7              jkeating
 xsane-0.994-3.fc7                         dist-fc7              jkeating
 xscorch-0.2.0-10.fc7                      dist-fc7-updates      mgarski
-xscreensaver-5.02-1.fc7.1                 dist-fc7              mtasaka
+xscreensaver-5.03-1.fc7                   dist-fc7-updates      mtasaka
 xsp-1.2.1-1.fc7                           fe7-merge             jkeating
 xsri-2.1.0-10.fc6                         dist-fc6              jkeating
 xsupplicant-1.2.8-1.fc7.1                 fe7-merge             jkeating



From fedora-extras-commits at redhat.com  Mon Sep  3 16:46:09 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 12:46:09 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.125, 1.126 jd.spec, 1.144, 1.145 sources, 
	1.126, 1.127
Message-ID: <200709031646.l83Gk9WF027962@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27937

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
- svn 1311



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- .cvsignore	25 Aug 2007 17:13:36 -0000	1.125
+++ .cvsignore	3 Sep 2007 16:45:33 -0000	1.126
@@ -1 +1 @@
-jd-1.9.6-svn1285.tgz
+jd-1.9.6-svn1311.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- jd.spec	25 Aug 2007 17:13:36 -0000	1.144
+++ jd.spec	3 Sep 2007 16:45:33 -0000	1.145
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1285
+%define         strtag        svn1311
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Aug 26 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1285
-- svn 1285
+* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
+- svn 1311
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	25 Aug 2007 17:13:36 -0000	1.126
+++ sources	3 Sep 2007 16:45:33 -0000	1.127
@@ -1 +1 @@
-adf45ea6466f7253259bc8d47860a9fd  jd-1.9.6-svn1285.tgz
+ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 17:15:19 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 13:15:19 -0400
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.7,1.8
Message-ID: <200709031715.l83HFJeb002254@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2208

Modified Files:
	ocaml-findlib.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
- Bump version to force rebuild against ocaml -6 release.



Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-findlib.spec	30 Aug 2007 08:25:47 -0000	1.7
+++ ocaml-findlib.spec	3 Sep 2007 17:14:46 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.1.2pl1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 
 Patch0:         findlib-camlp4-path.patch
 
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml >= 3.10.0-6
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
 BuildRequires:  ocaml-ocamldoc
@@ -30,7 +30,6 @@
 Objective CAML package manager and build helper.
 
 
-
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -111,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
+- Bump version to force rebuild against ocaml -6 release.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-12
 - Added BR: gawk.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 17:30:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 13:30:46 -0400
Subject: rpms/rpmlint/devel rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 rpmlint.config, 1.14,
	1.15 rpmlint.spec, 1.37, 1.38 sources, 1.16,
	1.17 rpmlint-0.80-fedoralicensing.patch, 1.1, NONE
Message-ID: <200709031730.l83HUkVU002668@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2637

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch 
Removed Files:
	rpmlint-0.80-fedoralicensing.patch 
Log Message:
* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
- 0.81.
- Improve Fedora license check (Todd Zullinger).
- Sync Fedora license list with Wiki rev 87.


rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Apr 2007 20:45:44 -0000	1.16
+++ .cvsignore	3 Sep 2007 17:30:14 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmlint.config	29 Aug 2007 19:47:29 -0000	1.14
+++ rpmlint.config	3 Sep 2007 17:30:14 -0000	1.15
@@ -28,7 +28,7 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 84 of that page.
+    # Last synced with Wiki revision 87 of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -98,6 +98,7 @@
     'Netscape',
     'Nokia',
     'OpenLDAP',
+    'OpenPBS',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -153,6 +154,7 @@
     'mplus',
     'OFL',
     'Utopia',
+    'XANO',
     # Others
     'Redistributable, no modification permitted',
     'Freely redistributable without restriction',
@@ -187,9 +189,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
 addFilter(" doc-file-dependency .* /bin/sh$")
 addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rpmlint.spec	29 Aug 2007 19:47:29 -0000	1.37
+++ rpmlint.spec	3 Sep 2007 17:30:14 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.80
-Release:        3%{?dist}
+Version:        0.81
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -11,7 +11,7 @@
 Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
-Patch2:         %{name}-0.80-fedoralicensing.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -70,6 +70,11 @@
 
 
 %changelog
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
 * Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Apr 2007 20:45:44 -0000	1.16
+++ sources	3 Sep 2007 17:30:14 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2


--- rpmlint-0.80-fedoralicensing.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 17:35:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 13:35:33 -0400
Subject: rpms/rpmlint/devel rpmlint.spec,1.38,1.39
Message-ID: <200709031735.l83HZXjP002906@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2855

Modified Files:
	rpmlint.spec 
Log Message:
Note fixed bug numbers


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rpmlint.spec	3 Sep 2007 17:30:14 -0000	1.38
+++ rpmlint.spec	3 Sep 2007 17:35:01 -0000	1.39
@@ -71,7 +71,7 @@
 
 %changelog
 * Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
-- 0.81.
+- 0.81, fixes #239611, #240840, #241471, #244835.
 - Improve Fedora license check (Todd Zullinger).
 - Sync Fedora license list with Wiki rev 87.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 17:39:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:39:03 -0400
Subject: extras-repoclosure rc-run.py,1.28,1.29
Message-ID: <200709031739.l83Hd3Kc003305@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3285

Modified Files:
	rc-run.py 
Log Message:
delete previous needsign repomd instead of playing tricks with tmp repoids or global md timeout values


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rc-run.py	1 Sep 2007 10:44:20 -0000	1.28
+++ rc-run.py	3 Sep 2007 17:39:01 -0000	1.29
@@ -5,7 +5,7 @@
 # If executed as "rc-run-all.py" it processes all releases.
 
 import fcntl, os, sys
-import errno, shutil, stat
+import errno, glob, shutil, stat
 import datetime, time
 import tempfile
 import getopt
@@ -19,6 +19,11 @@
 import Utils, RepoSupport
 
 
+def delneedsignmd(cachedir):
+    for dir in glob.glob('./*-needsign-*'):
+        shutil.rmtree(dir)
+
+
 def makereport():
     try:
         os.remove(logfilename)
@@ -36,6 +41,7 @@
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
         Utils.fix_mdcache_access(workdir,cachedir)
+        delneedsignmd(cachedir)
         rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:
@@ -51,7 +57,6 @@
 os.umask(cfg.signersumask)  # only for our /srv environment
 
 # Delete old log files.
-import glob
 now = time.time()
 for file in glob.glob('./rc-fe*.txt'):
     if ( (now - os.stat(file).st_mtime) > 3600*24*14 ):
@@ -93,7 +98,7 @@
         if a == "summary":
             reportcmd += " --mail=summary"
     elif o == "--needsign":
-        rs.AddRepo('fedora-extras-needsign-%s'%int(now),'Fedora Extras Needsign',a)
+        rs.AddRepo('fedora-extras-needsign','Fedora Extras Needsign',a)
         reportcmd += " --needsign"
     elif o == "--testing":
         withtesting = True



From fedora-extras-commits at redhat.com  Mon Sep  3 17:43:10 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:43:10 -0400
Subject: rpms/util-vserver/devel util-vserver.spec,1.31,1.32
Message-ID: <200709031743.l83HhAgU003612@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3537

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- util-vserver.spec	3 Sep 2007 07:57:42 -0000	1.31
+++ util-vserver.spec	3 Sep 2007 17:42:38 -0000	1.32
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 17:47:27 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 3 Sep 2007 13:47:27 -0400
Subject: rpms/deluge/devel .cvsignore, 1.11, 1.12 deluge.spec, 1.25,
	1.26 sources, 1.11, 1.12
Message-ID: <200709031747.l83HlRDD003991@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 RC1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Aug 2007 01:10:33 -0000	1.11
+++ .cvsignore	3 Sep 2007 17:46:55 -0000	1.12
@@ -1 +1 @@
-deluge-0.5.4.1.tar.gz
+deluge-0.5.4.1.95.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- deluge.spec	22 Aug 2007 01:10:33 -0000	1.25
+++ deluge.spec	3 Sep 2007 17:46:55 -0000	1.26
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1
+Version:	0.5.4.1.95
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
+- Update to new upstream release candidate (0.5.5 RC1)
+
 * Mon Aug 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
 - Update to new upstream release (0.5.4.1)
 - Build with new binutils to gain BuildID debugging goodness.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Aug 2007 01:10:33 -0000	1.11
+++ sources	3 Sep 2007 17:46:55 -0000	1.12
@@ -1 +1 @@
-36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
+4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 17:49:21 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:49:21 -0400
Subject: extras-repoclosure rc-run.py,1.29,1.30
Message-ID: <200709031749.l83HnL1V004396@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4370

Modified Files:
	rc-run.py 
Log Message:
consider cachedir arg, and do it earlier


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rc-run.py	3 Sep 2007 17:39:01 -0000	1.29
+++ rc-run.py	3 Sep 2007 17:49:18 -0000	1.30
@@ -20,7 +20,7 @@
 
 
 def delneedsignmd(cachedir):
-    for dir in glob.glob('./*-needsign-*'):
+    for dir in glob.glob(os.path.join(cachedir,'*-needsign-*')):
         shutil.rmtree(dir)
 
 
@@ -29,6 +29,8 @@
         os.remove(logfilename)
     except:
         pass
+    Utils.fix_mdcache_access(workdir,cachedir)
+    delneedsignmd(cachedir)
     for arch in rs.ReleaseArchsDict()[release]:
         print '%s (%s)' % (release,arch)
         rcargs = ('-a %s ' % rs.targetarchs[arch])
@@ -40,8 +42,6 @@
             rcargs += ('-r %s ' % repoid)
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
-        Utils.fix_mdcache_access(workdir,cachedir)
-        delneedsignmd(cachedir)
         rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:



From fedora-extras-commits at redhat.com  Mon Sep  3 17:56:45 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:56:45 -0400
Subject: upgradecheck upgradecheckspam.py,1.3,1.4 upgradecheck.py,1.35,1.36
Message-ID: <200709031756.l83Huj9k005959@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5925

Modified Files:
	upgradecheckspam.py upgradecheck.py 
Log Message:
no .fc4 anymore


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upgradecheckspam.py	24 Jul 2007 18:04:23 -0000	1.3
+++ upgradecheckspam.py	3 Sep 2007 17:56:43 -0000	1.4
@@ -41,7 +41,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('4', '5', '6', '7', '8')
+dists = ('5', '6', '7', '8')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- upgradecheck.py	17 Aug 2007 18:19:32 -0000	1.35
+++ upgradecheck.py	3 Sep 2007 17:56:43 -0000	1.36
@@ -41,7 +41,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('4', '5', '6', '7', '8')
+dists = ('5', '6', '7', '8')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')



From fedora-extras-commits at redhat.com  Mon Sep  3 17:57:25 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:57:25 -0400
Subject: rpms/util-vserver/F-7 util-vserver.spec,1.27,1.28
Message-ID: <200709031757.l83HvP64006129@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5987/F-7

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- util-vserver.spec	3 Sep 2007 07:57:48 -0000	1.27
+++ util-vserver.spec	3 Sep 2007 17:56:53 -0000	1.28
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 17:57:28 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:57:28 -0400
Subject: rpms/util-vserver/FC-6 util-vserver.spec,1.27,1.28
Message-ID: <200709031757.l83HvSX6006140@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5987/FC-6

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- util-vserver.spec	3 Sep 2007 07:57:45 -0000	1.27
+++ util-vserver.spec	3 Sep 2007 17:56:55 -0000	1.28
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 18:07:35 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 3 Sep 2007 14:07:35 -0400
Subject: status-report-scripts pyGetReviewByFlags,1.8,1.9
Message-ID: <200709031807.l83I7ZER014250@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14150

Modified Files:
	pyGetReviewByFlags 
Log Message:
Update URL since bugzilla.r.c no longer works within the colo.



Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyGetReviewByFlags	2 Sep 2007 17:00:23 -0000	1.8
+++ pyGetReviewByFlags	3 Sep 2007 18:07:33 -0000	1.9
@@ -17,7 +17,10 @@
 import tempfile
 import glob
 
-url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
+# This URL will work publically
+#url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
+# This URL will work in the Phoenix colo
+url = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi'
 
 flagData = {
     # 'FLAG' : (baseFlagFilename, openMsg, closeMsg),



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:18:21 -0700
Subject: [pkgdb] klear (Fedora, 7) updated by kevin
Message-ID: <200709031818.l83IIMs5022785@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for klear
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on klear (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:18:21 -0700
Subject: [pkgdb] klear (Fedora, devel) updated by kevin
Message-ID: <200709031818.l83IIMNn022794@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on klear (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:45 -0400
Subject: rpms/klear - New directory
Message-ID: <200709031818.l83IIjtV016589@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear

Log Message:
Directory /cvs/extras/rpms/klear added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:48 -0400
Subject: rpms/klear/devel - New directory
Message-ID: <200709031818.l83IImnb016611@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear/devel

Log Message:
Directory /cvs/extras/rpms/klear/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:51 -0400
Subject: rpms/klear Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031818.l83IIpuJ016643@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear

Added Files:
	Makefile import.log 
Log Message:
Setup of module klear


--- NEW FILE Makefile ---
# Top level Makefile for module klear
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:54 -0400
Subject: rpms/klear/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709031818.l83IIslR016666@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module klear


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: klear
# $Id: Makefile,v 1.1 2007/09/03 18:18:51 kevin Exp $
NAME := klear
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:19:12 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:19:12 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec, 1.2,
	1.3 eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031819.l83IJC0b016812@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481

Modified Files:
	eclipse-rpm-editor.spec 
Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-rpm-editor.spec	2 Sep 2007 10:39:28 -0000	1.2
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:18:40 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -13,9 +13,6 @@
 #   sh ./fetch-specfile-editor.sh %{svn_rev}
 Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
 Source1:        fetch-specfile-editor.sh
-# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
-# So this patch remove the rpmlint plugin temporarily 
-Patch0:         %{name}-remove-rpmlint-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -52,7 +49,6 @@
 
 %prep
 %setup -q -n specfile-editor-fetched-src-%{svn_rev}
-%patch0
 
 %build
 # See comments in the script to understand this.
@@ -106,7 +102,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
-#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
+%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
 %dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
 %doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
 %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
@@ -117,6 +113,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
+- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
+
 * Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
 - Only build the plugin where the changelog plugin can be build, only
   x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because


--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, 6) updated by kevin
Message-ID: <200709031821.l83ILmO0022822@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for audio-convert-mod
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, devel) updated by kevin
Message-ID: <200709031821.l83ILnM1022840@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, 7) updated by kevin
Message-ID: <200709031821.l83ILmox022831@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for audio-convert-mod
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:21:56 -0400
Subject: rpms/audio-convert-mod - New directory
Message-ID: <200709031821.l83ILuLp017277@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod

Log Message:
Directory /cvs/extras/rpms/audio-convert-mod added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:21:59 -0400
Subject: rpms/audio-convert-mod/devel - New directory
Message-ID: <200709031821.l83ILxUX017293@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod/devel

Log Message:
Directory /cvs/extras/rpms/audio-convert-mod/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:22:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:22:03 -0400
Subject: rpms/audio-convert-mod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031822.l83IM38s017321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod

Added Files:
	Makefile import.log 
Log Message:
Setup of module audio-convert-mod


--- NEW FILE Makefile ---
# Top level Makefile for module audio-convert-mod
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:22:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:22:06 -0400
Subject: rpms/audio-convert-mod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709031822.l83IM6WR017339@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module audio-convert-mod


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: audio-convert-mod
# $Id: Makefile,v 1.1 2007/09/03 18:22:03 kevin Exp $
NAME := audio-convert-mod
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:24:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:24:01 -0700
Subject: [pkgdb] maniadrive was added for jwrdegoede
Message-ID: <200709031824.l83IO17X022871@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package maniadrive with summary 3D stunt driving game
Kevin Fenzi (kevin) has approved Package maniadrive
Kevin Fenzi (kevin) has added a Fedora devel branch for maniadrive with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved maniadrive in Fedora devel
Kevin Fenzi (kevin) has approved Package maniadrive
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maniadrive (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on maniadrive (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maniadrive (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:24:02 -0700
Subject: [pkgdb] maniadrive (Fedora, devel) updated by kevin
Message-ID: <200709031824.l83IO2iR022880@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:19 -0400
Subject: rpms/maniadrive - New directory
Message-ID: <200709031824.l83IOJ2u017664@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive

Log Message:
Directory /cvs/extras/rpms/maniadrive added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:24 -0400
Subject: rpms/maniadrive/devel - New directory
Message-ID: <200709031824.l83IOOKS017673@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:30 -0400
Subject: rpms/maniadrive Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031824.l83IOUP8017705@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:32 -0400
Subject: rpms/maniadrive/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709031824.l83IOWtv017721@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive
# $Id: Makefile,v 1.1 2007/09/03 18:24:30 kevin Exp $
NAME := maniadrive
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:25:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:25:47 -0700
Subject: [pkgdb] maniadrive-data (Fedora, devel) updated by kevin
Message-ID: <200709031825.l83IPlUh022901@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive-data (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:02 -0400
Subject: rpms/maniadrive-data - New directory
Message-ID: <200709031826.l83IQ2dO017786@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data

Log Message:
Directory /cvs/extras/rpms/maniadrive-data added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:06 -0400
Subject: rpms/maniadrive-data/devel - New directory
Message-ID: <200709031826.l83IQ6bw017802@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive-data/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:09 -0400
Subject: rpms/maniadrive-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031826.l83IQ9X6017827@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive-data


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive-data
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:11 -0400
Subject: rpms/maniadrive-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709031826.l83IQBcN017843@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive-data


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive-data
# $Id: Makefile,v 1.1 2007/09/03 18:26:09 kevin Exp $
NAME := maniadrive-data
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, 6) updated by kevin
Message-ID: <200709031832.l83IWXZn022979@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora 6 to rishi

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, 7) updated by kevin
Message-ID: <200709031832.l83IWXmf022988@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora 7 to rishi

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, devel) updated by kevin
Message-ID: <200709031832.l83IWYLl022997@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora devel to rishi

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:34:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:34:20 -0700
Subject: [pkgdb] perl-Class-MethodMaker (Fedora EPEL, 4) updated by kevin
Message-ID: <200709031834.l83IYKG7023039@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Class-MethodMaker
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From fedora-extras-commits at redhat.com  Mon Sep  3 18:34:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:34:20 -0700
Subject: [pkgdb] perl-Class-MethodMaker (Fedora EPEL, 5) updated by kevin
Message-ID: <200709031834.l83IYKUE023048@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Class-MethodMaker
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From fedora-extras-commits at redhat.com  Mon Sep  3 18:36:44 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:36:44 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec, 1.2,
	1.3 eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031836.l83IaiI9018274@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239

Modified Files:
	eclipse-rpm-editor.spec 
Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-rpm-editor.spec	2 Sep 2007 10:47:44 -0000	1.2
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:36:12 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -13,9 +13,6 @@
 #   sh ./fetch-specfile-editor.sh %{svn_rev}
 Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
 Source1:        fetch-specfile-editor.sh
-# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
-# So this patch remove the rpmlint plugin temporarily 
-Patch0:         %{name}-remove-rpmlint-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -37,7 +34,8 @@
 # the rpmlint plugin
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
-# These plugins are really noarch but they the changelog plugin need cdt which
+
+# These plugins are really noarch but they the changelog plugin need cdt which 
 # we only build on these architectures.
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -51,7 +49,6 @@
 
 %prep
 %setup -q -n specfile-editor-fetched-src-%{svn_rev}
-%patch0
 
 %build
 # See comments in the script to understand this.
@@ -105,7 +102,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
-#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
+%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
 %dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
 %doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
 %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
@@ -116,6 +113,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
+- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
+
 * Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
 - Only build the plugin where the changelog plugin can be build, only
   x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because


--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:37:07 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:37:07 -0400
Subject: rpms/eclipse-rpm-editor/F-7
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031837.l83Ib7D9018330@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18323

Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, 7) updated by kevin
Message-ID: <200709031842.l83IgvEh023133@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for mencal
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, 6) updated by kevin
Message-ID: <200709031842.l83IgvjG023124@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for mencal
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora 6)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, devel) updated by kevin
Message-ID: <200709031842.l83IgvIg023142@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:16 -0400
Subject: rpms/mencal - New directory
Message-ID: <200709031843.l83IhGIL018641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal

Log Message:
Directory /cvs/extras/rpms/mencal added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:21 -0400
Subject: rpms/mencal/devel - New directory
Message-ID: <200709031843.l83IhLIL018655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal/devel

Log Message:
Directory /cvs/extras/rpms/mencal/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:25 -0400
Subject: rpms/mencal Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031843.l83IhPBQ018680@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal

Added Files:
	Makefile import.log 
Log Message:
Setup of module mencal


--- NEW FILE Makefile ---
# Top level Makefile for module mencal
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:27 -0400
Subject: rpms/mencal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709031843.l83IhRIw018696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mencal


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mencal
# $Id: Makefile,v 1.1 2007/09/03 18:43:25 kevin Exp $
NAME := mencal
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:46:04 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 14:46:04 -0400
Subject: rpms/clutter/devel .cvsignore, 1.4, 1.5 clutter.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709031846.l83Ik4ki019157@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19088/devel

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

Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jul 2007 02:42:36 -0000	1.4
+++ .cvsignore	3 Sep 2007 18:45:31 -0000	1.5
@@ -1 +1 @@
-clutter-0.3.1.tar.gz
+clutter-0.4.1.tar.gz


Index: clutter.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clutter.spec	22 Jul 2007 02:42:36 -0000	1.4
+++ clutter.spec	3 Sep 2007 18:45:31 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           clutter
-Version:        0.3.1
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.3/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel  mesa-libGL-devel gtk2-devel 
@@ -54,19 +54,22 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %exclude %{_libdir}/*.la
-%{_libdir}/libclutter-glx-0.3.so.0
-%{_libdir}/libclutter-glx-0.3.so.0.301.0
+%{_libdir}/libclutter-glx-0.4.so.0
+%{_libdir}/libclutter-glx-0.4.so.0.401.0
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/*
-%{_libdir}/libclutter-glx-0.3.so
-%{_libdir}/pkgconfig/clutter-0.3.pc
-%{_libdir}/pkgconfig/clutter-glx-0.3.pc
+%{_libdir}/libclutter-glx-0.4.so
+%{_libdir}/pkgconfig/clutter-0.4.pc
+%{_libdir}/pkgconfig/clutter-glx-0.4.pc
 %{_datadir}/gtk-doc/html/clutter
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.1-1
+- Update to 0.4.1
+
 * Sat Jul 21 2007 Allisson Azevedo <allisson at gmail.com> 0.3.1-1
 - Update to 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2007 02:42:36 -0000	1.4
+++ sources	3 Sep 2007 18:45:31 -0000	1.5
@@ -1 +1 @@
-549311509899e239d379939fe911156f  clutter-0.3.1.tar.gz
+ac824b3639067e83bdecd4ce83a942e2  clutter-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 18:50:21 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:50:21 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec,1.3,1.4
Message-ID: <200709031850.l83IoL9O019360@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
- Requires rpmlint >= 0.81



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-rpm-editor.spec	3 Sep 2007 18:18:40 -0000	1.3
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:49:48 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -30,9 +30,7 @@
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
 Requires: eclipse-changelog >= 2.5.1
-# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
-# the rpmlint plugin
-Requires: rpmlint >= 0.80
+Requires: rpmlint >= 0.81
 Requires: rpmdevtools
 
 # These plugins are really noarch but they the changelog plugin need cdt which 
@@ -113,6 +111,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
+- Requires rpmlint >= 0.81
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
 - Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 18:51:16 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:51:16 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec,1.3,1.4
Message-ID: <200709031851.l83IpGfP019418@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
- Requires rpmlint >= 0.81



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-rpm-editor.spec	3 Sep 2007 18:36:12 -0000	1.3
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:50:44 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -30,9 +30,7 @@
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
 Requires: eclipse-changelog >= 2.5.1
-# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
-# the rpmlint plugin
-Requires: rpmlint >= 0.80
+Requires: rpmlint >= 0.81
 Requires: rpmdevtools
 
 # These plugins are really noarch but they the changelog plugin need cdt which 
@@ -113,6 +111,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
+- Requires rpmlint >= 0.81
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
 - Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:08 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:08 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested commit
Message-ID: <200709031900.l83J089a023282@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the commit acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:10 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:10 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0AeD023288@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:13 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:13 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0Dvw023297@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:18 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:18 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0IAc023303@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:19 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:19 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0Jue023309@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:23 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:23 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0NVj023316@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:23 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:23 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0OpK023322@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:26 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:26 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchcommits
Message-ID: <200709031900.l83J0Qr1023328@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchcommits acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:02 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:02 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J124u023336@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the approveacls acl on audio-convert-mod (Fedora devel) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:05 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:05 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J15MA023379@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 6) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:06 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:06 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J16kS023386@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the watchcommits acl on audio-convert-mod (Fedora 6) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:09 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:09 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J19FY023393@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the watchbugzilla acl on audio-convert-mod (Fedora 7) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:11 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:11 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J1Bbf023399@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 7) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:52 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:52 -0700
Subject: [pkgdb] audio-convert-mod had groupAcl changed
Message-ID: <200709031901.l83J1qwR023412@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:55 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:55 -0700
Subject: [pkgdb] audio-convert-mod had groupAcl changed
Message-ID: <200709031901.l83J1tPu023418@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:18:52 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:18:52 -0400
Subject: rpms/maniadrive/devel maniadrive-1.2-fixes.patch, NONE,
	1.1 maniadrive-track-editor.desktop, NONE,
	1.1 maniadrive.desktop, NONE, 1.1 maniadrive.png, NONE,
	1.1 maniadrive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709031918.l83JIqoK026113@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-1.2-fixes.patch maniadrive-track-editor.desktop 
	maniadrive.desktop maniadrive.png maniadrive.spec 
Log Message:

initial maniadrive import


maniadrive-1.2-fixes.patch:

--- NEW FILE maniadrive-1.2-fixes.patch ---
diff -up ManiaDrive-1.2-src/raydium/ode.h.foobar ManiaDrive-1.2-src/raydium/ode.h
--- ManiaDrive-1.2-src/raydium/ode.h.foobar	2006-08-11 12:11:13.000000000 +0200
+++ ManiaDrive-1.2-src/raydium/ode.h	2007-08-12 00:30:29.000000000 +0200
@@ -11,7 +11,7 @@
 // ugly workaround to avoid odemath.h ...
 #define _ODE_ODEMATH_H_
 #endif
-#include "../ode/include/ode/ode.h"
+#include <ode/ode.h>
 
 #define RAYDIUM_ODE_MAX_OBJECTS			64
 #define RAYDIUM_ODE_MAX_ELEMENTS		256
diff -up ManiaDrive-1.2-src/raydium/php.c.foobar ManiaDrive-1.2-src/raydium/php.c
--- ManiaDrive-1.2-src/raydium/php.c.foobar	2006-08-13 03:55:37.000000000 +0200
+++ ManiaDrive-1.2-src/raydium/php.c	2007-08-12 00:33:15.000000000 +0200
@@ -151,6 +151,7 @@ int raydium_php_exec(char *name)  
     raydium_php_init_request(name);
 
     zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
+    zend_alter_ini_entry("safe_mode", 10, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("default_socket_timeout",23,"10",2, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
@@ -301,7 +302,7 @@ sapi_globals = ts_resource(sapi_globals_
 tsrm_ls = ts_resource(0);
 #endif
 raydium_sapi_module.phpinfo_as_text=1;
-path=malloc(strlen(PHP_INI_PATH));
+path=malloc(strlen(PHP_INI_PATH)+1);
 strcpy(path,PHP_INI_PATH);
 raydium_sapi_module.php_ini_path_override=path;
 sapi_startup(&raydium_sapi_module);
diff -up ManiaDrive-1.2-src/mania_drive.c.foobar ManiaDrive-1.2-src/mania_drive.c
--- ManiaDrive-1.2-src/mania_drive.c.foobar	2006-08-21 22:56:03.000000000 +0200
+++ ManiaDrive-1.2-src/mania_drive.c	2007-08-12 00:30:29.000000000 +0200
@@ -19,7 +19,7 @@ char *version="ManiaDrive 1.2custom";
 #define STORY_FILE_PRO		"mania_drive.story.pro"
 #define HISTORY_STATE_FILE	raydium_file_home_path("mania_drive.state")
 
-#define MUSIC_MENU	"mania_music/i_got_it_bad_-_The_Napoleon_Blown_Aparts.ogg"
+#define MUSIC_MENU	"mania_music/893_[Black_moon]_The_devil_into_you_[Creative_Commons___by_2.0]_[www.dogmazic.net].ogg"
 #define RESOLUTION_LIST "320x240\n640x480\n800x600\n1024x768"
 
 GLfloat sun[]={1.0,0.9,0.5,1.0};
@@ -2493,6 +2493,7 @@ int full_sx_i,full_sy_i;
 int mode;
 
 raydium_init_args_name(argc,argv,"mania_drive");
+chdir("/usr/share/maniadrive");
 
 raydium_parser_db_get("ManiaDrive-Windowed",str,"0");
 windowed_mode=atoi(str);
@@ -2559,7 +2560,7 @@ raydium_parser_db_get("ManiaDrive-Camera
 camera_lag=(lagActive[0]=='y'?1:0);
 sscanf(lagSpeed,"%f",&camera_lag_speed);
 
-raydium_parser_db_get("ManiaDrive-ShadowSupport",str,"1");
+raydium_parser_db_get("ManiaDrive-ShadowSupport",str,"0");
 shadow_support=atoi(str);
 
 raydium_parser_db_get("ManiaDrive-MusicVolume",str,"1.0");
diff -up ManiaDrive-1.2-src/mania2.c.foobar ManiaDrive-1.2-src/mania2.c
--- ManiaDrive-1.2-src/mania2.c.foobar	2006-08-17 15:36:32.000000000 +0200
+++ ManiaDrive-1.2-src/mania2.c	2007-08-12 00:30:29.000000000 +0200
@@ -15,7 +15,7 @@ char *title="CQFD Corp. Mania2";
 #ifdef WIN32
 #define MANIA_BINARY "mania_drive.exe"
 #else
-#define MANIA_BINARY "./mania_drive.static"
+#define MANIA_BINARY "/usr/bin/maniadrive"
 #endif
 
 
@@ -1027,6 +1027,7 @@ data_init();
 current_track[0]=0;
 
 raydium_init_args_name(argc,argv,"mania_drive");
+chdir("/usr/share/maniadrive");
 
 raydium_window_create(700,700,RAYDIUM_RENDERING_WINDOW,window);
 
diff -up ManiaDrive-1.2-src/Makefile.foobar ManiaDrive-1.2-src/Makefile
--- ManiaDrive-1.2-src/Makefile.foobar	2006-07-22 12:52:04.000000000 +0200
+++ ManiaDrive-1.2-src/Makefile	2007-08-12 00:30:29.000000000 +0200
@@ -7,8 +7,8 @@ CC = gcc
 CC = gcc
 AR = ar
 RANLIB = ranlib
-SYSTEM_LIBS =  -lGL -lGLU -lXinerama -lm -ljpeg -lopenal -lalut -lvorbis -lvorbisfile -logg -lresolv -lcrypt -lz -lcurl -lxml2 -lGLEW
+SYSTEM_LIBS =  -lGL -lGLU -lXinerama -lm -ljpeg -lopenal -lalut -lvorbisfile -lGLEW
-OTHER_LIBS =  raydium/ode/lib/libode.a raydium/php/libs/libphp5.a
+OTHER_LIBS = -lode -lphp5
 INCLUDE_PATH =  -Iraydium/ode/include/ -Iraydium/php/ -Iraydium/php/include -Iraydium/php/main/ -Iraydium/php/Zend -Iraydium/php/TSRM -I/usr/include/curl
 LIBS_PATH =  -L/usr/X11R6/lib/
 CFLAGS=-Wall


--- NEW FILE maniadrive-track-editor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ManiaDrive Track Editor
Comment=Create new tracks for ManiaDrive
Exec=maniadrive-track-editor
Icon=maniadrive.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;


--- NEW FILE maniadrive.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ManiaDrive
Comment=Drive a car on acrobatic tracks
Exec=maniadrive
Icon=maniadrive.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;


--- NEW FILE maniadrive.spec ---
Name:           maniadrive
Version:        1.2
Release:        2%{?dist}
Summary:        3D stunt driving game
Group:          Amusements/Games
License:        GPLv2+
URL:            http://maniadrive.raydium.org/
Source0:        http://downloads.sourceforge.net/%{name}/ManiaDrive-%{version}-src.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Source3:        %{name}-track-editor.desktop
Patch0:         %{name}-1.2-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glew-devel ode-devel php-devel php-embedded-devel
BuildRequires:  freealut-devel libjpeg-devel libXinerama-devel
BuildRequires:  libvorbis-devel desktop-file-utils
Requires:       %{name}-data = %{version}, php-soap, hicolor-icon-theme
# for people who try to install this using upstream capitalization
Provides:       ManiaDrive = %{version}-%{release}

%description
ManiaDrive is an arcade car game on acrobatic tracks, with a quick and nervous
gameplay (tracks almost never exceed one minute). Features: Complex car
physics, Challenging "story mode", LAN and Internet mode, Live scores,
Track editor, Dedicated server with HTTP interface and More than 30 blocks.


%package track-editor
Summary:        ManiaDrive track editor
Group:          Amusements/Games
Requires:       %{name} = %{version}-%{release}

%description track-editor
Track editor for ManiaDrive, an arcade car game on acrobatic tracks.


# upstream only does raydium svn snapshots, the closest thing to a release
# schedule are the snapshots included in maniadrive, so we package the included
# raydium snapshot as raydium
  
%package -n raydium
Summary:        3D stunt driving game
Group:          System Environment/Libraries
URL:            http://raydium.org/

%description -n raydium
Raydium is a game engine. It provides a set of functions which allow quick and
flexible games creation. There are a lot of other 3D/game engines (and some
are very complete, such as Ogre, Crystal Space, etc). Raydium does not try to
be as complex as these engines, but on the contrary is aiming at quick and
simple development.


%package -n raydium-devel
Summary:        Development files for raydium
Group:          Development/Libraries
Requires:       raydium = %{version}-%{release}
Requires:       php-devel glew-devel freealut-devel libjpeg-devel ode-devel
Requires:       libvorbis-devel

%description -n raydium-devel
The raydium-devel package contains libraries and header files for
developing applications that use raydium.


%prep
%setup -q -n ManiaDrive-%{version}-src
%patch0 -p1
rm -r rayphp/r3s rayphp/README


%build
# note the Makefile builds raydium, not maniadrive !
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC `php-config --includes`" \
  LINKING_OPTIONS=-Wl,-soname,libraydium-%{version}.so
  
# only one C-file and no makefile for maniadrive and the editor, so DIY
gcc $RPM_OPT_FLAGS -o %{name} `php-config --includes` -DFORCE_LIBRAYDIUM \
  mania_drive.c -L. -lraydium

gcc $RPM_OPT_FLAGS -o %{name}-track-editor `php-config --includes` \
  -DFORCE_LIBRAYDIUM mania2.c -L. -lraydium


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/raydium/headers
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raydium
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name}-track-editor $RPM_BUILD_ROOT%{_bindir}
install -m 755 libraydium.so.0.0 \
  $RPM_BUILD_ROOT%{_libdir}/libraydium-%{version}.so
ln -s libraydium-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libraydium.so
install -p -m 644 raydium/*.h  $RPM_BUILD_ROOT%{_includedir}/raydium
install -p -m 644 raydium/headers/*.h \
  $RPM_BUILD_ROOT%{_includedir}/raydium/headers
cp -a rayphp $RPM_BUILD_ROOT%{_datadir}/raydium

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE2}
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%post -n raydium -p /sbin/ldconfig

%postun -n raydium -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# no docs these are all in the -data package
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

%files track-editor
%defattr(-,root,root,-)
%{_bindir}/%{name}-track-editor
%{_datadir}/applications/fedora-%{name}-track-editor.desktop

%files -n raydium
%defattr(-,root,root,-)
%{_libdir}/libraydium-%{version}.so
%{_datadir}/raydium

%files -n raydium-devel
%defattr(-,root,root,-)
%{_libdir}/libraydium.so
%{_includedir}/raydium


%changelog
* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
- Improved and spell-fixed raydium description
- Fix a number of unused direct shlib dependencies in libraydium-1.2.so
- Add Requires on various -devel packages to the raydium-devel subpackage so
  that all headers included by the raydium headers will be present

* Fri Aug 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:24:30 -0000	1.1
+++ .cvsignore	3 Sep 2007 19:18:20 -0000	1.2
@@ -0,0 +1 @@
+ManiaDrive-1.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:24:30 -0000	1.1
+++ sources	3 Sep 2007 19:18:20 -0000	1.2
@@ -0,0 +1 @@
+90dec2154802225980f8b4ebd6570069  ManiaDrive-1.2-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:19:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:19:11 -0400
Subject: rpms/maniadrive-data/devel maniadrive-data-1.2-fixes.patch, NONE,
	1.1 maniadrive-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709031919.l83JJBM7026152@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26084/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-data-1.2-fixes.patch maniadrive-data.spec 
Log Message:
initial maniadrive-data import


maniadrive-data-1.2-fixes.patch:

--- NEW FILE maniadrive-data-1.2-fixes.patch ---
diff -up ManiaDrive-1.2-data/README~ ManiaDrive-1.2-data/README
--- ManiaDrive-1.2-data/README~	2007-08-11 15:28:59.000000000 +0200
+++ ManiaDrive-1.2-data/README	2007-08-11 15:28:59.000000000 +0200
@@ -17,18 +17,8 @@ Also features:
  - Full soundtrack
  
 License for Code & Art (except music): GNU General Public License (GPL)
-License for Music: Creative Commons 2.0 (CC2)
-
-Sound Track Details:
- * I got it bad (1:48) by The Napoleon Blown Aparts
- * Mine tonite (2:08) by Rocket City Riot
- * The Devil... (4:15) by Black Moon
- * erase and rewind (2:28) by Horstreich
- * Nowhere to go (2:06) by The Napoleon Blown Aparts
- * MeMak Racer 1 (1:28) by Neub (aka Revision 1.1)
- * revenge of yesterday (1:59) by Horstreich
- * Superstar Destroyer (2:47) by Zen Ace Ten (website is down ?)
- * Bienvenue au Mexique (1:26) by Mage
+License for Music: Creative Commons (CC BY) / Free Art License / GNU GPL,
+see README.fedora in the music package
 				    
 Xfennec and the whole Raydium Team thanks you for downloading this game !
 Raydium 3D Game Engine - http://raydium.org/
diff -up ManiaDrive-1.2-data/game/php.ini~ ManiaDrive-1.2-data/game/php.ini
--- ManiaDrive-1.2-data/game/php.ini~	2007-08-11 22:35:16.000000000 +0200
+++ ManiaDrive-1.2-data/game/php.ini	2007-08-11 22:35:16.000000000 +0200
@@ -1,4 +1,2 @@
 [PHP]
-extension_dir = "./"
-extension=php_curl.dll
-extension=php_soap.dll
\ No newline at end of file
+extension=soap.so
diff -up ManiaDrive-1.2-data/game/mania_tracklist.php~ ManiaDrive-1.2-data/game/mania_tracklist.php
--- ManiaDrive-1.2-data/game/mania_tracklist.php~	2007-08-11 22:35:55.000000000 +0200
+++ ManiaDrive-1.2-data/game/mania_tracklist.php	2007-08-11 22:35:55.000000000 +0200
@@ -28,10 +28,5 @@ foreach($file as $t)
     $nl="\n";
     }
 
-// save list to disk
-$fp=fopen("mania_tracklist.txt","wb");
-fwrite($fp,$list);
-fclose($fp);
-
 //var_dump($list);
 ?>


--- NEW FILE maniadrive-data.spec ---
Name:           maniadrive-data
Version:        1.2
Release:        2%{?dist}
Summary:        Data files for maniadrive, a 3D stunt driving game
Group:          Amusements/Games
License:        GPL+
URL:            http://maniadrive.raydium.org/
# This is:
# http://downloads.sourceforge.net/%{name}/ManiaDrive-%{version}-data.tar.gz
# With the game/mania_music directory removed because that contains non free
# music (CC BY-NC-SA licensed)
Source0:        ManiaDrive-%{version}-data.tar.gz
Patch0:         maniadrive-data-1.2-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
# to make sure this gets removed when maniadrive gets removed
Requires:       maniadrive

%description
Data files for maniadrive, a 3D stunt driving game. Notice this package does
not include the original ManiaDrive soundtrack as the original soundtrack is
licensed under a CC BY-NC-SA license, which is not acceptable to Fedora.

A replacement soundtrack is available in the maniadrive-music package (and will
get automatically installed together with maniadrive itself).


%prep
%setup -q -n ManiaDrive-%{version}-data
%patch0 -p1
sed -i 's/\r//g' game/php.ini game/mania.cfg game/*.tri game/*.mni
iconv -f ISO-8859-1 -t UTF8 README > README.tmp
mv README.tmp README


%build
# nothing to build, data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}
cp -a game $RPM_BUILD_ROOT%{_datadir}/maniadrive
ln -s ../raydium/rayphp $RPM_BUILD_ROOT%{_datadir}/maniadrive/rayphp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_datadir}/maniadrive


%changelog
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
- Correct License tag from GPLv2+ to GPL+
- Convert README to UTF-8

* Sat Aug 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:26:09 -0000	1.1
+++ .cvsignore	3 Sep 2007 19:18:38 -0000	1.2
@@ -0,0 +1 @@
+ManiaDrive-1.2-data.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:26:09 -0000	1.1
+++ sources	3 Sep 2007 19:18:38 -0000	1.2
@@ -0,0 +1 @@
+612460892e26f258f2e43757f70cd4ff  ManiaDrive-1.2-data.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:20:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 3 Sep 2007 15:20:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.41, 1.42 sources, 1.42,
	1.43 sugar.spec, 1.50, 1.51
Message-ID: <200709031920.l83JKHk3026229@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26203

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	1 Sep 2007 11:53:01 -0000	1.41
+++ .cvsignore	3 Sep 2007 19:19:44 -0000	1.42
@@ -1 +1 @@
-sugar-0.65-gitfeb462d08d.tar.bz2
+sugar-0.65-git0b3f687749.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	1 Sep 2007 11:53:01 -0000	1.42
+++ sources	3 Sep 2007 19:19:44 -0000	1.43
@@ -1 +1 @@
-8c33fbc69907b1fc89c302c652307acc  sugar-0.65-gitfeb462d08d.tar.bz2
+65e93be43c62389c4905d521f409f6ed  sugar-0.65-git0b3f687749.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sugar.spec	1 Sep 2007 11:53:01 -0000	1.50
+++ sugar.spec	3 Sep 2007 19:19:44 -0000	1.51
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070901git
-%define commitid feb462d08d
+%define alphatag 20070903git
+%define commitid 0b3f687749
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.34.%{alphatag}feb462d08d
+Release: 0.39.%{alphatag}0b3f687749
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
+- New snapshot
+
 * Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:29:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:29:10 -0400
Subject: comps comps-f8.xml.in,1.87,1.88
Message-ID: <200709031929.l83JTAaf026370@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26352

Modified Files:
	comps-f8.xml.in 
Log Message:
add maniadrive


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- comps-f8.xml.in	3 Sep 2007 02:41:29 -0000	1.87
+++ comps-f8.xml.in	3 Sep 2007 19:28:40 -0000	1.88
@@ -1461,6 +1461,7 @@
       <packagereq type="optional">Maelstrom</packagereq>
       <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
+      <packagereq type="optional">maniadrive</packagereq>
       <packagereq type="optional">methane</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:23 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchcommits
Message-ID: <200709031936.l83JaOm2023734@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on lesstif (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:31 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchcommits
Message-ID: <200709031936.l83JaVk1023743@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on lesstif (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:32 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:32 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested commit
Message-ID: <200709031936.l83JaWai023752@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on lesstif (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:37 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchbugzilla
Message-ID: <200709031936.l83Jab8T023772@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on lesstif (Fedora 6)

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



From fedora-extras-commits at redhat.com  Mon Sep  3 19:38:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 15:38:04 -0400
Subject: rpms/slim/F-7 slim.spec,1.1,1.2
Message-ID: <200709031938.l83Jc4mS026702@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26681

Modified Files:
	slim.spec 
Log Message:
minor bugfix from devel


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slim.spec	6 Aug 2007 20:53:25 -0000	1.1
+++ slim.spec	3 Sep 2007 19:37:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -27,7 +27,7 @@
 # we use 'include' in the pam file, so
 Requires:       pam >= 0.80
 # reuse the images
-Requires:       desktop-backgrounds-basic fedora-logos
+Requires:       desktop-backgrounds-basic system-logos
 
 %description
 SLiM (Simple Login Manager) is a graphical login manager for X11.
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
+- require system-logos instead of fedora-logos (#250365)
+
 * Tue May 22 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-5
 - make sure to own datadir slim parent too
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:39:21 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 15:39:21 -0400
Subject: rpms/clutter-gst/devel .cvsignore, 1.2, 1.3 clutter-gst.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200709031939.l83JdLZx026791@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26762/devel

Modified Files:
	.cvsignore clutter-gst.spec sources 
Log Message:

Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2007 10:41:19 -0000	1.2
+++ .cvsignore	3 Sep 2007 19:38:49 -0000	1.3
@@ -1 +1 @@
-clutter-gst-0.1.1.tar.gz
+clutter-gst-0.4.0.tar.gz


Index: clutter-gst.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/clutter-gst.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clutter-gst.spec	15 May 2007 10:41:19 -0000	1.1
+++ clutter-gst.spec	3 Sep 2007 19:38:49 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           clutter-gst
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.1/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
@@ -45,20 +45,23 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/libclutter-gst-0.1.la
-%{_libdir}/libclutter-gst-0.1.so.0
-%{_libdir}/libclutter-gst-0.1.so.0.1.0
+%exclude %{_libdir}/libclutter-gst-0.4.la
+%{_libdir}/libclutter-gst-0.4.so.0
+%{_libdir}/libclutter-gst-0.4.so.0.400.0
 %{_datadir}/gtk-doc/html/clutter-gst
 
 %files devel
 %defattr(-,root,root,-)
 %doc
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-0.1.pc
-%{_libdir}/libclutter-gst-0.1.so
+%{_libdir}/pkgconfig/clutter-gst-0.4.pc
+%{_libdir}/libclutter-gst-0.4.so
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.0-1
+- Update to 0.4.0
+
 * Sun May 13 2007 Allisson Azevedo <allisson at gmail.com> 0.1.1-2
 - INSTALL removed from docs
 - fix make install for keeping timestamps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2007 10:41:19 -0000	1.2
+++ sources	3 Sep 2007 19:38:49 -0000	1.3
@@ -1 +1 @@
-13fb455ab14c32a06758ed02076f7fa5  clutter-gst-0.1.1.tar.gz
+9b6ff997131619705a9d3796d38929c9  clutter-gst-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:45:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 15:45:02 -0400
Subject: rpms/slim/devel slim-1.3.0-make.patch,NONE,1.1 slim.spec,1.2,1.3
Message-ID: <200709031945.l83Jj2b7026914@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26884

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.0-make.patch 
Log Message:
new version, with pam

slim-1.3.0-make.patch:

--- NEW FILE slim-1.3.0-make.patch ---
--- slim-1.3.0/Makefile.orig	2007-07-15 16:09:28.000000000 +0200
+++ slim-1.3.0/Makefile	2007-08-06 19:01:49.000000000 +0200
@@ -5,7 +5,9 @@
 #######################################################
 CXX=/usr/bin/g++
 CC=/usr/bin/gcc
-CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+INSTALL=install
+OPTFLAGS=-O2 -g -Wall
+CFLAGS=$(OPTFLAGS) -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
 LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
@@ -42,10 +44,10 @@ slim: $(OBJECTS)
 	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 install: slim install-theme
-	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
-	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
+	$(INSTALL) -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
+	$(INSTALL) -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
 	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
-		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+		$(INSTALL) -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
 
 clean:
 	@rm -f slim *.o
@@ -61,9 +63,9 @@ dist:
 
 
 install-theme:
-	install -D -m 644 themes/default/slim.theme \
+	$(INSTALL) -D -m 644 themes/default/slim.theme \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
-	install -D -m 644 themes/default/panel.png \
+	$(INSTALL) -D -m 644 themes/default/panel.png \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
-	install -D -m 644 themes/default/background.jpg \
+	$(INSTALL) -D -m 644 themes/default/background.jpg \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slim.spec	6 Aug 2007 16:45:41 -0000	1.2
+++ slim.spec	3 Sep 2007 19:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           slim
-Version:        1.2.6
-Release:        6%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,7 +14,7 @@
 Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         slim-1.2.6-make.patch
+Patch0:         slim-1.3.0-make.patch
 Patch1:         slim-1.2.6-usexwd.patch
 Patch2:         slim-1.2.6-fedora.patch
 
@@ -48,7 +48,7 @@
 cp -p %{SOURCE3} README.Fedora
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-1
+- version upgrade
+
 * Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
 - require system-logos instead of fedora-logos (#250365)
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:54:29 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 15:54:29 -0400
Subject: rpms/clutter-gtk/devel .cvsignore, 1.2, 1.3 clutter-gtk.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200709031954.l83JsTSK027218@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27177/devel

Modified Files:
	.cvsignore clutter-gtk.spec sources 
Log Message:

Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 May 2007 02:35:18 -0000	1.2
+++ .cvsignore	3 Sep 2007 19:53:57 -0000	1.3
@@ -1 +1 @@
-clutter-gtk-0.1.0.tar.gz
+clutter-gtk-0.4.0.tar.gz


Index: clutter-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/clutter-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clutter-gtk.spec	12 May 2007 02:35:18 -0000	1.1
+++ clutter-gtk.spec	3 Sep 2007 19:53:57 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           clutter-gtk
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.1/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel clutter-devel       
@@ -50,21 +50,24 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
-%exclude %{_libdir}/libcluttergtk-1.0.la
-%{_libdir}/libcluttergtk-1.0.so.0
-%{_libdir}/libcluttergtk-1.0.so.0.100.0
+%exclude %{_libdir}/libclutter-gtk-0.4.la
+%{_libdir}/libclutter-gtk-0.4.so.0
+%{_libdir}/libclutter-gtk-0.4.so.0.400.0
 %{_datadir}/gtk-doc/html/clutter-gtk
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/pkgconfig/clutter-gtk.pc
-%{_libdir}/libcluttergtk-1.0.so
-%{_includedir}/clutter-0.2/clutter-gtk
+%{_libdir}/pkgconfig/clutter-gtk-0.4.pc
+%{_libdir}/libclutter-gtk-0.4.so
+%{_includedir}/clutter-0.4/clutter-gtk
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.0-1
+- Update to 0.4.0
+
 * Thu May 10 2007 Allisson Azevedo <allisson at gmail.com> 0.1.0-3
 - fix devel files section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 May 2007 02:35:18 -0000	1.2
+++ sources	3 Sep 2007 19:53:57 -0000	1.3
@@ -1 +1 @@
-0b0b30203a432d581aae91d1ca7d6367  clutter-gtk-0.1.0.tar.gz
+c3daf6a39749a10d4f5c9fbd3ea1da72  clutter-gtk-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:23 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:23 -0400
Subject: rpms/CGAL/F-7 .cvsignore,1.3,1.4 CGAL.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200709031959.l83JxN8J027528@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/F-7

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Jun 2007 14:33:23 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:50 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/CGAL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CGAL.spec	23 Aug 2007 21:58:08 -0000	1.8
+++ CGAL.spec	3 Sep 2007 19:58:50 -0000	1.9
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jun 2007 14:33:23 -0000	1.3
+++ sources	3 Sep 2007 19:58:50 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:26 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:26 -0400
Subject: rpms/CGAL/FC-5 .cvsignore, 1.3, 1.4 CGAL.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200709031959.l83JxQwV027533@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/FC-5

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2007 16:01:29 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:53 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/CGAL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CGAL.spec	23 Aug 2007 21:58:11 -0000	1.6
+++ CGAL.spec	3 Sep 2007 19:58:53 -0000	1.7
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2007 16:01:29 -0000	1.3
+++ sources	3 Sep 2007 19:58:53 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:29 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:29 -0400
Subject: rpms/CGAL/FC-6 .cvsignore, 1.3, 1.4 CGAL.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200709031959.l83JxTNO027539@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/FC-6

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2007 16:01:43 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:56 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/CGAL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CGAL.spec	23 Aug 2007 21:58:14 -0000	1.6
+++ CGAL.spec	3 Sep 2007 19:58:56 -0000	1.7
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2007 16:01:43 -0000	1.3
+++ sources	3 Sep 2007 19:58:56 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:31 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:31 -0400
Subject: rpms/CGAL/devel .cvsignore, 1.4, 1.5 CGAL.spec, 1.11, 1.12 sources, 
	1.4, 1.5
Message-ID: <200709031959.l83JxVG6027545@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/devel

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jun 2007 09:49:28 -0000	1.4
+++ .cvsignore	3 Sep 2007 19:58:59 -0000	1.5
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CGAL.spec	24 Aug 2007 08:16:39 -0000	1.11
+++ CGAL.spec	3 Sep 2007 19:58:59 -0000	1.12
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        7%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -110,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
 * Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
 - Add BR: mpfr since F-8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jun 2007 09:49:28 -0000	1.4
+++ sources	3 Sep 2007 19:58:59 -0000	1.5
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:01:08 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:01:08 -0400
Subject: rpms/audio-convert-mod/devel audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032001.l83K18uT000809@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27632/devel

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:00:35 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:00:35 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:06:56 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 16:06:56 -0400
Subject: rpms/pyclutter/devel .cvsignore, 1.2, 1.3 pyclutter.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709032006.l83K6ue0001490@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/pyclutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1422/devel

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

Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Apr 2007 02:26:36 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:06:23 -0000	1.3
@@ -1 +1 @@
-pyclutter-0.2.0.tar.gz
+pyclutter-0.4.1.tar.gz


Index: pyclutter.spec
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/pyclutter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyclutter.spec	2 Apr 2007 02:26:36 -0000	1.1
+++ pyclutter.spec	3 Sep 2007 20:06:23 -0000	1.2
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyclutter
-Version:        0.2.0
-Release:        5%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Python modules that allow you to use the Clutter toolkit
 
 Group:          Development/Languages
-License:        GPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.2/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
@@ -63,6 +63,9 @@
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.1-1
+- Update to 0.4.1
+
 * Sun Mar 29 2007 Allisson Azevedo <allisson at gmail.com> 0.2.0-5
 - Fix requires for devel package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Apr 2007 02:26:36 -0000	1.2
+++ sources	3 Sep 2007 20:06:23 -0000	1.3
@@ -1 +1 @@
-cb2565cd0014ccc3f1f2700c8c6f3193  pyclutter-0.2.0.tar.gz
+0e13f33dda075dc11e68ab3c52974c08  pyclutter-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:07:57 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:07:57 -0400
Subject: rpms/audio-convert-mod/F-7 audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032007.l83K7vDj001601@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1550

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial F-7 import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:07:24 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:07:24 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:08:22 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:08:22 -0400
Subject: rpms/audio-convert-mod/FC-6 audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032008.l83K8MAc001660@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1575

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial FC-6 import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:07:49 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:07:49 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:11:37 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:11:37 -0400
Subject: rpms/klear/devel klear.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709032011.l83KBbMR001886@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/devel

Modified Files:
	.cvsignore sources 
Added Files:
	klear.spec 
Log Message:



--- NEW FILE klear.spec ---
Name:           klear
Version:        0.6.1
Release:        1%{?dist}
Summary:        DVB TV application and harddisk-recorder for linux

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://www.klear.org/
Source0:        http://www.klear.org/sources/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scons kdebase-devel xine-lib-devel chrpath libXtst-devel gettext desktop-file-utils

%description
Klear is a graphical TV viewer with an integrated recording system 
for Linux.
It's designed as a DVB desktop application with all common features.
A clear, nifty and feature rich DVB viewer and recorder 
for your desktop machine.

%prep
%setup -q


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

chmod -x src/App/Engines/KlearXine/CKlearEngineXine.h
chmod -x src/App/CKlearAppRecorder.h
chmod -x src/GUI/Controller/CKlearControllerConfig.h
chmod -x src/App/CKlearAppRecorder.cpp
#this file should not be here...
%{__rm} -f po/it_old.po

export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons configure \
        kdeincludes=/usr/include/kde/ \
        libdir=%{_libdir} \
        %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons install DESTDIR=$RPM_BUILD_ROOT
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/klear



desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applnk/Multimedia   \
       %{buildroot}/%{_datadir}/applnk/Multimedia/klear.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
touch --no-create %{_datadir}/icons/hicolor

%postun
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc distfiles/AUTHORS distfiles/BUGS distfiles/changelog distfiles/COPYING distfiles/copyright distfiles/README
%{_bindir}/klear
%{_datadir}/applnk/Multimedia/klear.desktop
%{_datadir}/apps/klear
%{_datadir}/icons/hicolor/??x??/apps/klear.png



%changelog
* Sun Sep 02 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.1-1
- Update to 0.6.1
- Replace GPL with GPLv2
* Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.0-2
- Added RPM_OPT_FLAGS (the good way this time)
- Using desktop-file-install for the desktop file
- Removed qt-devel from BR since it's required by kdebase-devel  
- Removed QTLIB export since it's already present in qt.sh
- Corrected preceding changelog day
* Wed Mar 28 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-1
- Added RPM_OPT_FLAGS
- Added QT environment variables
* Sun Mar 18 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-0.1
- Initial RPM creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klear/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:18:51 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:11:05 -0000	1.2
@@ -0,0 +1 @@
+klear-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klear/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:18:51 -0000	1.1
+++ sources	3 Sep 2007 20:11:05 -0000	1.2
@@ -0,0 +1 @@
+9ca6f2ac404ecba0195b1449cc76c7c6  klear-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:13:48 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:13:48 -0400
Subject: rpms/klear/F-7 klear.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709032013.l83KDmEF001979@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/klear/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1958/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	klear.spec 
Log Message:



--- NEW FILE klear.spec ---
Name:           klear
Version:        0.6.1
Release:        1%{?dist}
Summary:        DVB TV application and harddisk-recorder for linux

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://www.klear.org/
Source0:        http://www.klear.org/sources/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scons kdebase-devel xine-lib-devel chrpath libXtst-devel gettext desktop-file-utils

%description
Klear is a graphical TV viewer with an integrated recording system 
for Linux.
It's designed as a DVB desktop application with all common features.
A clear, nifty and feature rich DVB viewer and recorder 
for your desktop machine.

%prep
%setup -q


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

chmod -x src/App/Engines/KlearXine/CKlearEngineXine.h
chmod -x src/App/CKlearAppRecorder.h
chmod -x src/GUI/Controller/CKlearControllerConfig.h
chmod -x src/App/CKlearAppRecorder.cpp
#this file should not be here...
%{__rm} -f po/it_old.po

export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons configure \
        kdeincludes=/usr/include/kde/ \
        libdir=%{_libdir} \
        %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons install DESTDIR=$RPM_BUILD_ROOT
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/klear



desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applnk/Multimedia   \
       %{buildroot}/%{_datadir}/applnk/Multimedia/klear.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
touch --no-create %{_datadir}/icons/hicolor

%postun
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc distfiles/AUTHORS distfiles/BUGS distfiles/changelog distfiles/COPYING distfiles/copyright distfiles/README
%{_bindir}/klear
%{_datadir}/applnk/Multimedia/klear.desktop
%{_datadir}/apps/klear
%{_datadir}/icons/hicolor/??x??/apps/klear.png



%changelog
* Sun Sep 02 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.1-1
- Update to 0.6.1
- Replace GPL with GPLv2
* Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.0-2
- Added RPM_OPT_FLAGS (the good way this time)
- Using desktop-file-install for the desktop file
- Removed qt-devel from BR since it's required by kdebase-devel  
- Removed QTLIB export since it's already present in qt.sh
- Corrected preceding changelog day
* Wed Mar 28 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-1
- Added RPM_OPT_FLAGS
- Added QT environment variables
* Sun Mar 18 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-0.1
- Initial RPM creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klear/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:18:51 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+klear-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klear/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:18:51 -0000	1.1
+++ sources	3 Sep 2007 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+9ca6f2ac404ecba0195b1449cc76c7c6  klear-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:15:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 16:15:39 -0400
Subject: rpms/slim/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709032015.l83KFdos002136@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106

Modified Files:
	.cvsignore sources 
Log Message:
new version, with pam


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2007 09:49:49 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:15:06 -0000	1.3
@@ -1 +1 @@
-slim-1.2.6.tar.gz
+slim-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2007 09:49:49 -0000	1.2
+++ sources	3 Sep 2007 20:15:06 -0000	1.3
@@ -1 +1 @@
-1bf891f046014a03236c21ce6cbe455b  slim-1.2.6.tar.gz
+1c1a87f3cbd3c334c874585e42701961  slim-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:46 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:46 -0400
Subject: rpms/CGAL/F-7 CGAL.spec,1.9,1.10
Message-ID: <200709032025.l83KPk6j002379@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/F-7

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/CGAL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CGAL.spec	3 Sep 2007 19:58:50 -0000	1.9
+++ CGAL.spec	3 Sep 2007 20:25:08 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:49 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:49 -0400
Subject: rpms/CGAL/FC-5 CGAL.spec,1.7,1.8
Message-ID: <200709032025.l83KPn8T002382@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/FC-5

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/CGAL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CGAL.spec	3 Sep 2007 19:58:53 -0000	1.7
+++ CGAL.spec	3 Sep 2007 20:25:16 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:52 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:52 -0400
Subject: rpms/CGAL/FC-6 CGAL.spec,1.7,1.8
Message-ID: <200709032025.l83KPqmJ002385@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/FC-6

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/CGAL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CGAL.spec	3 Sep 2007 19:58:56 -0000	1.7
+++ CGAL.spec	3 Sep 2007 20:25:19 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:55 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:55 -0400
Subject: rpms/CGAL/devel CGAL.spec,1.12,1.13
Message-ID: <200709032025.l83KPtUi002388@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/devel

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CGAL.spec	3 Sep 2007 19:58:59 -0000	1.12
+++ CGAL.spec	3 Sep 2007 20:25:22 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:51:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 16:51:48 -0400
Subject: rpms/gkrellm/EL-5 .cvsignore, 1.2, 1.3 gkrellm-2.1.28-config.patch, 
	1.1, 1.2 gkrellm.spec, 1.4, 1.5 sources, 1.2,
	1.3 gkrellm-2.1.24-libdir.patch, 1.1,
	NONE gkrellm-2.2.9-gkrellmd.conf.patch, 1.1,
	NONE gkrellm-2.2.9-hwmon.patch, 1.1,
	NONE gkrellm-2.2.9-libsensors.patch, 1.1, NONE
Message-ID: <200709032051.l83KpmpD004902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4871

Modified Files:
	.cvsignore gkrellm-2.1.28-config.patch gkrellm.spec sources 
Removed Files:
	gkrellm-2.1.24-libdir.patch gkrellm-2.2.9-gkrellmd.conf.patch 
	gkrellm-2.2.9-hwmon.patch gkrellm-2.2.9-libsensors.patch 
Log Message:
Sync with devel to prepare for first EPEL build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jul 2006 18:35:32 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:51:14 -0000	1.3
@@ -1 +1 @@
-gkrellm-2.2.9.tar.bz2
+gkrellm-2.3.0.tar.bz2

gkrellm-2.1.28-config.patch:

Index: gkrellm-2.1.28-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm-2.1.28-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellm-2.1.28-config.patch	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellm-2.1.28-config.patch	3 Sep 2007 20:51:14 -0000	1.2
@@ -1,6 +1,7 @@
---- gkrellm-2.1.28/server/gkrellmd.conf.rh1	2004-03-10 14:06:21.883901449 +0100
-+++ gkrellm-2.1.28/server/gkrellmd.conf	2004-03-10 14:12:20.712149159 +0100
-@@ -17,18 +17,19 @@
+diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd.conf
+--- gkrellm-2.3.0/server/gkrellmd.conf.config	2006-11-28 20:34:37.000000000 +0100
++++ gkrellm-2.3.0/server/gkrellmd.conf	2007-07-22 14:00:54.000000000 +0200
+@@ -17,21 +17,22 @@ port 19150
  # List of hosts allowed to connect.  If no hosts are specified in a
  # gkrellmd.conf file or on the command line, all hosts will be allowed.
  #
@@ -17,7 +18,11 @@
 -#user	nobody
 -#group	proc
 +user	gkrellmd
-+group	proc
++group	gkrellmd
+ 
+ # Create a PID file for the running gkrellmd.  Default is no PID file.
+-#pidfile /var/run/gkrellmd.pid
++pidfile /var/run/gkrellmd.pid
  
  # Run in background and detach from the controlling terminal
 -#detach
@@ -25,7 +30,7 @@
  
  # Time interval between checks for various monitors.  If nfs-interval
  # is <= 0 then gkrellmd will not read data for nfs file system types.
-@@ -51,7 +52,7 @@
+@@ -61,7 +62,7 @@ port 19150
  # Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
  # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
  #
@@ -34,7 +39,7 @@
  
  # Configure gkrellm clients to attempt automatic reconnects to a
  # gkrellmd server every reconnect-timeout seconds after a disconnected
-@@ -60,7 +61,7 @@
+@@ -70,7 +71,7 @@ port 19150
  # Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
  # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
  #


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
+++ gkrellm.spec	3 Sep 2007 20:51:14 -0000	1.5
@@ -1,26 +1,20 @@
 Name:           gkrellm
-Version:        2.2.9
-Release:        10%{?dist}
+Version:        2.3.0
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gkrellm.net/
 Source0:        http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
-Patch0:         gkrellm-2.1.24-libdir.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-Patch5:         gkrellm-2.2.9-hwmon.patch
-Patch6:         gkrellm-2.2.9-libsensors.patch
-Patch7:         gkrellm-2.2.9-gkrellmd.conf.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-%ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -63,14 +57,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch1 -p1 -z .config
+%patch2 -p1 -z .sansfont
+%patch3 -p1 -z .width
+%patch4 -p1 -z .libdir2
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -83,15 +73,8 @@
 
 
 %build
-%ifarch %{ix86} x86_64
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_LIBSENSORS"
-SYS_LIBS="-lsensors"
-%else
-CFLAGS="$RPM_OPT_FLAGS"
-SYS_LIBS=
-%endif
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$CFLAGS" SYS_LIBS="$SYS_LIBS"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -116,7 +99,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor gnome             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -184,6 +166,23 @@
 
 
 %changelog
+* Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
+- Update License tag for new Licensing Guidelines compliance
+
+* Sun Jul 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-1
+- New upstream release 2.3.0
+
+* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-3
+- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is
+  available there now.
+
+* Wed Nov  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
+- Add special case for via 686 volt sensors <sigh> (bug 213304)
+
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
+- New upstream release 2.2.10
+- Drop integrated lmsensors and sysfs sensors patches
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jul 2006 18:35:32 -0000	1.2
+++ sources	3 Sep 2007 20:51:14 -0000	1.3
@@ -1 +1 @@
-5334155797901724f4eb46a82ad72395  gkrellm-2.2.9.tar.bz2
+8ced6843f4681ad8501fd04285ecff1f  gkrellm-2.3.0.tar.bz2


--- gkrellm-2.1.24-libdir.patch DELETED ---


--- gkrellm-2.2.9-gkrellmd.conf.patch DELETED ---


--- gkrellm-2.2.9-hwmon.patch DELETED ---


--- gkrellm-2.2.9-libsensors.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:13 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:13 -0400
Subject: rpms/kftpgrabber/F-7 kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsDMc005000@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/F-7

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/F-7/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 15:54:19 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:41 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:16 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:16 -0400
Subject: rpms/kftpgrabber/FC-6 kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsGD1005003@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/FC-6

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/FC-6/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 16:18:34 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:43 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:18 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:18 -0400
Subject: rpms/kftpgrabber/devel kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsIH9005006@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/devel

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 15:54:19 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:46 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 21:03:33 2007
From: fedora-extras-commits at redhat.com (Paul F. Kunz (pfkeb))
Date: Mon, 3 Sep 2007 17:03:33 -0400
Subject: rpms/HippoDraw/FC-6 HippoDraw.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709032103.l83L3XtC011120@cvs-int.fedora.redhat.com>

Author: pfkeb

Update of /cvs/pkgs/rpms/HippoDraw/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	HippoDraw.spec 
Log Message:
Initial commit.



--- NEW FILE HippoDraw.spec ---
Name:    HippoDraw
Version: 1.21.1
Release: 2%{?dist}
Summary: Interactive and Python scriptable data analysis application

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Group: Applications/Engineering
License: GPL
URL: http://www.slac.stanford.edu/grp/ek/hippodraw/
Source0: ftp://ftp.slac.stanford.edu/users/pfkeb/hippodraw/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires: cfitsio-devel qt-devel desktop-file-utils doxygen graphviz
# in FC7 need graphiz that can generate .gof files
%if 0%{?fedora} >= 7
BuildRequires:graphviz-gd python-numarray
%endif
BuildRequires: tetex-latex tetex-dvips netpbm-progs ghostscript
Requires:  tetex-latex tetex-dvips netpbm-progs ghostscript

%description
HippoDraw is a highly interactive data analysis
environment that can be used as a stand-a-lone application or as a
Python extension module.

%package python
Summary: %{name} Python module
Group: Development/Languages
BuildRequires: boost-devel python-devel python-numarray
Requires: %{name} = %{version}-%{release}
Requires: python-numarray


%description  python
Provides Python module to use %{name} from Python scripts.

%package devel
Summary:  Library and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel boost-devel cfitsio-devel python-numarray

%description devel
The %{name}-devel package contains libraries and header files for
building applications use %{name}.

%package devel-docs
Summary: Class library documentation
Group: Documentation
Requires: %{name}-devel = %{version}-%{release}

%description devel-docs
This package contains the html documentation files for the %{name}
class library.  User documentation is part of the main package.

%prep
%setup -q

%build
# Exclude or avoid packages that might be installed in /usr/local
# Exclude wcslib that might be installed from rpm which is older version.
%{configure} --without-wcslib-lib --without-minuit2-lib --without-root-lib\
    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no
make %{?_smp_mflags}
make docs


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
make install DESTDIR=$RPM_BUILD_ROOT install-docs INSTALL="install -p"

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      qt/app/HippoDraw.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)

%{_bindir}/hippodraw
%{_libdir}/*.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/hippoApp.png
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/LICENSE
%{_datadir}/doc/%{name}-%{version}/DISCLAIMER.rtf
%dir %{_datadir}/doc/%{name}-%{version}/html
%{_datadir}/doc/%{name}-%{version}/html/*.html
%{_datadir}/doc/%{name}-%{version}/html/*.png
%{_datadir}/doc/%{name}-%{version}/html/*.css
%{_datadir}/doc/%{name}-%{version}/html/*.gif
%{_datadir}/doc/%{name}-%{version}/html/hippodraw.adp
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/hippoApp.png

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%exclude %{_includedir}/%{name}/numarray/num_util.h
%{_libdir}/*.so

%files devel-docs
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version}/html/lib

%files python
%defattr(-,root,root,-)
%dir %{python_sitearch}/%{name}
%dir %{python_sitelib}/%{name}
%ifarch x86_64 ppc64
%{python_sitearch}/hippo.pth
%endif
%{python_sitelib}/hippo.pth
%{python_sitearch}/%{name}/hippomodule.*
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo
%{_datadir}/%{name}/examples

%changelog
* Mon Jul 30 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-2
- Use exclude instead of ghost
- declare file site_arch/hippo.pth only on 64 bit platforms

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21.1-1
- fixed python_sitearch and python_sitelib

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-1
- Added require for devel-docs sub package

* Wed Jul 18 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.9-1
- remove some files from install
- remove dependency on cfitsio, it is automaticly generated
- fixed defattr

* Mon Jul 16 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.8-1
- Fixed desktop file

* Thu Jun 28 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.7-2
- Update to 1.20.7

* Sun Apr 22 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.9-2
- lower case filename for the app icon

* Mon Mar 26 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.8-1
- Update to 1.19.8 and fix install of config.h

* Mon Mar 12 2007 Paul F. Kunz <paul_kunz at lac.stanford.edu> - 1.19.6-2
- Added requirements of boost-devel and cfitsio-devel to -devel package


* Sun Mar 11 2007 Paul F. Kunz <Paul_Kunz at slac.stanford.edu> - 1.19.6-1
- Added make docs to build step
- Fix placement of Requires
- add requirement of qt-devel to -devel package

* Sat Mar 10 2007 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.19.5-1
- bump version number of sources
- put disclaimer and license in versioned directory

* Fri Mar  9 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- libaxiswidget.so was removed from sources
- Move rename doc package to devel-docs
- Documentation moved to directory with version in name

* Thu Mar  8 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- desktop file was fixed in sources
- Added build requirement on graphviz
- use install -p on install
- doc package depends on devel to be installed
- Change sitelib to sitearch for Python install

* Mon Mar  5 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- add requirement of latex and accessories for use of it

* Fri Mar  2 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- remove setting of QTDIR
- Use suggested python_sitelib macro
- update icon cache after install and uninstall
- do not use the -p option in post and postun

* Thu Mar  1 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- avoid boost in /usr/local if there

* Sun Oct 22 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.9-1
- Update version
- fix install step

* Wed Oct 11 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-5
- Take ownership of doc directory

* Tue Oct 10 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-4
- Need to own certain directories

* Mon Oct 9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-3

- Rebuild with modified upstream sources which removed explicit
  linking against X libs

- Rebuild with modified upstream source with fix for boost_python
  library

* Mon Oct  9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-2
- Fix incorrect macro in -doc description

* Sat Oct  7 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-1
- Update source version
- Get QTDIR from pkg-config
- remove redundant BuildRequires
- Do not have to expliectly set --prefix

* Wed Oct  4 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-3
- use configure macro
- Use RPM_BUILD_ROOT consistently

* Mon Oct  2 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-2
- removed tab use spaces
- Added documentation to -python subpackage
- Add doc file to -devel subpackage

* Sun Sep 24 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.5-1
- Move documentation to standard place

* Fri Sep 22 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.5-1
- Added desktop file
- Update to 1.18.5

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.4-1
- Get rid of wcslib which has no rpm

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Sort documentation in appropriate packages

* Sun Sep 17 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- added devel package
- made Python package

* Sat Sep 16 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Fixed to install in /usr/
- Make conform to recommended standard


* Sun Jul  2 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.17.6-1
- Add requirement of Minuit2
- Added requirement on cfitsio



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Aug 2007 00:24:33 -0000	1.1
+++ .cvsignore	3 Sep 2007 21:02:59 -0000	1.2
@@ -0,0 +1 @@
+HippoDraw-1.21.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 00:24:33 -0000	1.1
+++ sources	3 Sep 2007 21:03:00 -0000	1.2
@@ -0,0 +1 @@
+59f16e27ca93627da8e5d538fb32dd6e  HippoDraw-1.21.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 21:12:29 2007
From: fedora-extras-commits at redhat.com (Paul F. Kunz (pfkeb))
Date: Mon, 3 Sep 2007 17:12:29 -0400
Subject: rpms/HippoDraw/F-7 HippoDraw.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709032112.l83LCTN9011445@cvs-int.fedora.redhat.com>

Author: pfkeb

Update of /cvs/pkgs/rpms/HippoDraw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11416/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	HippoDraw.spec 
Log Message:
Initial commit



--- NEW FILE HippoDraw.spec ---
Name:    HippoDraw
Version: 1.21.1
Release: 2%{?dist}
Summary: Interactive and Python scriptable data analysis application

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Group: Applications/Engineering
License: GPL
URL: http://www.slac.stanford.edu/grp/ek/hippodraw/
Source0: ftp://ftp.slac.stanford.edu/users/pfkeb/hippodraw/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires: cfitsio-devel qt-devel desktop-file-utils doxygen graphviz
# in FC7 need graphiz that can generate .gof files
%if 0%{?fedora} >= 7
BuildRequires:graphviz-gd python-numarray
%endif
BuildRequires: tetex-latex tetex-dvips netpbm-progs ghostscript
Requires:  tetex-latex tetex-dvips netpbm-progs ghostscript

%description
HippoDraw is a highly interactive data analysis
environment that can be used as a stand-a-lone application or as a
Python extension module.

%package python
Summary: %{name} Python module
Group: Development/Languages
BuildRequires: boost-devel python-devel python-numarray
Requires: %{name} = %{version}-%{release}
Requires: python-numarray


%description  python
Provides Python module to use %{name} from Python scripts.

%package devel
Summary:  Library and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel boost-devel cfitsio-devel python-numarray

%description devel
The %{name}-devel package contains libraries and header files for
building applications use %{name}.

%package devel-docs
Summary: Class library documentation
Group: Documentation
Requires: %{name}-devel = %{version}-%{release}

%description devel-docs
This package contains the html documentation files for the %{name}
class library.  User documentation is part of the main package.

%prep
%setup -q

%build
# Exclude or avoid packages that might be installed in /usr/local
# Exclude wcslib that might be installed from rpm which is older version.
%{configure} --without-wcslib-lib --without-minuit2-lib --without-root-lib\
    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no
make %{?_smp_mflags}
make docs


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
make install DESTDIR=$RPM_BUILD_ROOT install-docs INSTALL="install -p"

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      qt/app/HippoDraw.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)

%{_bindir}/hippodraw
%{_libdir}/*.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/hippoApp.png
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/LICENSE
%{_datadir}/doc/%{name}-%{version}/DISCLAIMER.rtf
%dir %{_datadir}/doc/%{name}-%{version}/html
%{_datadir}/doc/%{name}-%{version}/html/*.html
%{_datadir}/doc/%{name}-%{version}/html/*.png
%{_datadir}/doc/%{name}-%{version}/html/*.css
%{_datadir}/doc/%{name}-%{version}/html/*.gif
%{_datadir}/doc/%{name}-%{version}/html/hippodraw.adp
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/hippoApp.png

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%exclude %{_includedir}/%{name}/numarray/num_util.h
%{_libdir}/*.so

%files devel-docs
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version}/html/lib

%files python
%defattr(-,root,root,-)
%dir %{python_sitearch}/%{name}
%dir %{python_sitelib}/%{name}
%ifarch x86_64 ppc64
%{python_sitearch}/hippo.pth
%endif
%{python_sitelib}/hippo.pth
%{python_sitearch}/%{name}/hippomodule.*
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo
%{_datadir}/%{name}/examples

%changelog
* Mon Jul 30 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-2
- Use exclude instead of ghost
- declare file site_arch/hippo.pth only on 64 bit platforms

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21.1-1
- fixed python_sitearch and python_sitelib

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-1
- Added require for devel-docs sub package

* Wed Jul 18 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.9-1
- remove some files from install
- remove dependency on cfitsio, it is automaticly generated
- fixed defattr

* Mon Jul 16 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.8-1
- Fixed desktop file

* Thu Jun 28 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.7-2
- Update to 1.20.7

* Sun Apr 22 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.9-2
- lower case filename for the app icon

* Mon Mar 26 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.8-1
- Update to 1.19.8 and fix install of config.h

* Mon Mar 12 2007 Paul F. Kunz <paul_kunz at lac.stanford.edu> - 1.19.6-2
- Added requirements of boost-devel and cfitsio-devel to -devel package


* Sun Mar 11 2007 Paul F. Kunz <Paul_Kunz at slac.stanford.edu> - 1.19.6-1
- Added make docs to build step
- Fix placement of Requires
- add requirement of qt-devel to -devel package

* Sat Mar 10 2007 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.19.5-1
- bump version number of sources
- put disclaimer and license in versioned directory

* Fri Mar  9 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- libaxiswidget.so was removed from sources
- Move rename doc package to devel-docs
- Documentation moved to directory with version in name

* Thu Mar  8 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- desktop file was fixed in sources
- Added build requirement on graphviz
- use install -p on install
- doc package depends on devel to be installed
- Change sitelib to sitearch for Python install

* Mon Mar  5 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- add requirement of latex and accessories for use of it

* Fri Mar  2 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- remove setting of QTDIR
- Use suggested python_sitelib macro
- update icon cache after install and uninstall
- do not use the -p option in post and postun

* Thu Mar  1 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- avoid boost in /usr/local if there

* Sun Oct 22 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.9-1
- Update version
- fix install step

* Wed Oct 11 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-5
- Take ownership of doc directory

* Tue Oct 10 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-4
- Need to own certain directories

* Mon Oct 9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-3

- Rebuild with modified upstream sources which removed explicit
  linking against X libs

- Rebuild with modified upstream source with fix for boost_python
  library

* Mon Oct  9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-2
- Fix incorrect macro in -doc description

* Sat Oct  7 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-1
- Update source version
- Get QTDIR from pkg-config
- remove redundant BuildRequires
- Do not have to expliectly set --prefix

* Wed Oct  4 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-3
- use configure macro
- Use RPM_BUILD_ROOT consistently

* Mon Oct  2 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-2
- removed tab use spaces
- Added documentation to -python subpackage
- Add doc file to -devel subpackage

* Sun Sep 24 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.5-1
- Move documentation to standard place

* Fri Sep 22 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.5-1
- Added desktop file
- Update to 1.18.5

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.4-1
- Get rid of wcslib which has no rpm

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Sort documentation in appropriate packages

* Sun Sep 17 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- added devel package
- made Python package

* Sat Sep 16 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Fixed to install in /usr/
- Make conform to recommended standard


* Sun Jul  2 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.17.6-1
- Add requirement of Minuit2
- Added requirement on cfitsio



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Aug 2007 00:24:33 -0000	1.1
+++ .cvsignore	3 Sep 2007 21:11:55 -0000	1.2
@@ -0,0 +1 @@
+HippoDraw-1.21.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 00:24:33 -0000	1.1
+++ sources	3 Sep 2007 21:11:55 -0000	1.2
@@ -0,0 +1 @@
+59f16e27ca93627da8e5d538fb32dd6e  HippoDraw-1.21.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 21:59:01 2007
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon, 3 Sep 2007 17:59:01 -0400
Subject: rpms/scrip/F-7 scrip.spec,1.3,1.4
Message-ID: <200709032159.l83Lx1R3012402@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/pkgs/rpms/scrip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378

Modified Files:
	scrip.spec 
Log Message:
sync with the updated scrip in devel


Index: scrip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scrip/F-7/scrip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scrip.spec	1 Sep 2006 03:10:51 -0000	1.3
+++ scrip.spec	3 Sep 2007 21:58:28 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           scrip
 Version:        1.4
-Release:        6%{?dist}
+Release:        9%{?dist}
 Summary:        Spherical Coordinate Remapping and Interpolation Package (SCRIP)
 
 Group:          Applications/Engineering
 #  The license is very similar to BSD with one exception: modified 
 #  sources cannot be redistributed using the "SCRIP" name.
 License:        SCRIP License
-URL:            http://climate.lanl.gov/Software/SCRIP/index.htm
+URL:            http://climate.lanl.gov/Software/SCRIP/
 Source0:        http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz
 Source1:        http://climate.lanl.gov/Software/SCRIP/copyright.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +30,7 @@
 
 %build
 cd source
-%{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-L%{_libdir}/netcdf-3 -lnetcdf"
+%{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-lnetcdff -lnetcdf"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -46,6 +46,15 @@
 %{_bindir}/*
 
 %changelog
+* Sun Aug 26 2007 Ed Hill <ed at eh3.com> - 1.4-9
+- add -lnetcdff for new netcdf v3.6.2
+
+* Sat Aug 25 2007 Ed Hill <ed at eh3.com> - 1.4-8
+- rebuild for BuildID
+
+* Sun Jun 24 2007 Ed Hill <ed at eh3.com> - 1.4-7
+- fix URL (Fedora bz 245388)
+
 * Thu Aug 31 2006 Ed Hill <ed at eh3.com> - 1.4-6
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Mon Sep  3 23:58:06 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 3 Sep 2007 19:58:06 -0400
Subject: devel/pykickstart .cvsignore, 1.64, 1.65 pykickstart.spec, 1.71,
	1.72 sources, 1.71, 1.72
Message-ID: <200709032358.l83Nw6rX026716@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pykickstart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
- fix a few tracebacks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	31 Aug 2007 14:44:14 -0000	1.64
+++ .cvsignore	3 Sep 2007 23:57:34 -0000	1.65
@@ -1,28 +1 @@
-pykickstart-0.36.tar.gz
-pykickstart-0.39.tar.gz
-pykickstart-0.40.tar.gz
-pykickstart-0.41.tar.gz
-pykickstart-0.42.tar.gz
-pykickstart-0.43.tar.gz
-pykickstart-0.90.tar.gz
-pykickstart-0.91.tar.gz
-pykickstart-0.92.tar.gz
-pykickstart-0.93.tar.gz
-pykickstart-0.94.tar.gz
-pykickstart-0.95.tar.gz
-pykickstart-0.96.tar.gz
-pykickstart-0.97.tar.gz
-pykickstart-0.98.tar.gz
-pykickstart-0.99.tar.gz
-pykickstart-0.100.tar.gz
-pykickstart-1.0.tar.gz
-pykickstart-1.1.tar.gz
-pykickstart-1.2.tar.gz
-pykickstart-1.3.tar.gz
-pykickstart-1.4.tar.gz
-pykickstart-1.5.tar.gz
-pykickstart-1.6.tar.gz
-pykickstart-1.7.tar.gz
-pykickstart-1.8.tar.gz
-pykickstart-1.9.tar.gz
-pykickstart-1.10.tar.gz
+pykickstart-1.11.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/pykickstart.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- pykickstart.spec	31 Aug 2007 14:44:14 -0000	1.71
+++ pykickstart.spec	3 Sep 2007 23:57:34 -0000	1.72
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.10
+Version: 1.11
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -42,6 +42,9 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
+- fix a few tracebacks
+
 * Fri Aug 31 2007 Chris Lumens <clumens at redhat.com> 1.10-1
 - Add network --ipv6=.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	31 Aug 2007 14:44:14 -0000	1.71
+++ sources	3 Sep 2007 23:57:34 -0000	1.72
@@ -1 +1 @@
-4ac7366f53d8f0cce0836d0aa7bd9e8c  pykickstart-1.10.tar.gz
+52d10943bca9bf61e9a5dd652b2acdca  pykickstart-1.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 00:10:18 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 3 Sep 2007 20:10:18 -0400
Subject: devel/squashfs-tools squashfs-tools.spec,1.13,1.14
Message-ID: <200709040010.l840AIfq000565@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/squashfs-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv542

Modified Files:
	squashfs-tools.spec 
Log Message:
* Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1
- update to 3.2r2



Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/squashfs-tools/squashfs-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- squashfs-tools.spec	20 Mar 2007 19:31:34 -0000	1.13
+++ squashfs-tools.spec	4 Sep 2007 00:09:45 -0000	1.14
@@ -1,8 +1,8 @@
-Summary: squashfs utilities
+Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 3.2
 Release: 1
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
 Source0: squashfs3.2-r2.tar.gz
@@ -26,7 +26,9 @@
 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/usr/sbin/unsquashfs
+install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+
+chmod -x README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,7 +38,7 @@
 %defattr(-,root,root,-)
 %doc README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
 /sbin/mksquashfs
-/usr/sbin/unsquashfs
+%{_sbindir}/unsquashfs
 
 %changelog
 * Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1



From fedora-extras-commits at redhat.com  Tue Sep  4 02:45:52 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 22:45:52 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.59, 1.60 gtkhtml3.spec, 1.99,
	1.100 sources, 1.59, 1.60
Message-ID: <200709040245.l842jq29015158@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131

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

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
- Update to 3.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	28 Aug 2007 10:48:34 -0000	1.59
+++ .cvsignore	4 Sep 2007 02:45:19 -0000	1.60
@@ -1 +1 @@
-gtkhtml-3.15.91.tar.bz2
+gtkhtml-3.15.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gtkhtml3.spec	28 Aug 2007 10:48:34 -0000	1.99
+++ gtkhtml3.spec	4 Sep 2007 02:45:19 -0000	1.100
@@ -8,7 +8,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.15.91
+Version: 3.15.92
 Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -130,6 +130,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
+- Update to 3.15.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 3.15.91-1.fc8
 - Update to 3.15.91
 - Remove patch for Red Hat bug #129212/GNOME bug #262907 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	28 Aug 2007 10:48:34 -0000	1.59
+++ sources	4 Sep 2007 02:45:19 -0000	1.60
@@ -1 +1 @@
-886fcadabbeb22d5757fcb43d0ee3031  gtkhtml-3.15.91.tar.bz2
+a37457a6de11ae2fa6661ecf2ae33958  gtkhtml-3.15.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 02:47:12 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 22:47:12 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.38,1.39
Message-ID: <200709040247.l842lCRM015356@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212/F-7

Modified Files:
	stardict.spec 
Log Message:
fix spec


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stardict.spec	3 Sep 2007 09:36:39 -0000	1.38
+++ stardict.spec	4 Sep 2007 02:46:40 -0000	1.39
@@ -57,7 +57,7 @@
 desktop-file-install --vendor fedora --delete-original	\
   --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
@@ -69,7 +69,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %{_bindir}/stardict
-%{_datadir}/applications/stardict.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/stardict
 %{_libdir}/stardict
 %{_datadir}/idl/*



From fedora-extras-commits at redhat.com  Tue Sep  4 02:47:15 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 22:47:15 -0400
Subject: rpms/stardict/devel stardict.spec,1.38,1.39
Message-ID: <200709040247.l842lFVV015359@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212/devel

Modified Files:
	stardict.spec 
Log Message:
fix spec


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stardict.spec	3 Sep 2007 09:36:42 -0000	1.38
+++ stardict.spec	4 Sep 2007 02:46:43 -0000	1.39
@@ -57,7 +57,7 @@
 desktop-file-install --vendor fedora --delete-original	\
   --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
@@ -69,7 +69,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %{_bindir}/stardict
-%{_datadir}/applications/stardict.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/stardict
 %{_libdir}/stardict
 %{_datadir}/idl/*



From fedora-extras-commits at redhat.com  Tue Sep  4 03:06:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:06:10 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.58, 1.59 file-roller.spec,
	1.100, 1.101 sources, 1.59, 1.60
Message-ID: <200709040306.l8436AiX021576@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21551

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	3 Sep 2007 05:28:09 -0000	1.58
+++ .cvsignore	4 Sep 2007 03:05:36 -0000	1.59
@@ -1 +1 @@
-file-roller-2.19.91.tar.bz2
+file-roller-2.19.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- file-roller.spec	3 Sep 2007 05:28:09 -0000	1.100
+++ file-roller.spec	4 Sep 2007 03:05:36 -0000	1.101
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.91
+Version:	2.19.92
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	3 Sep 2007 05:28:09 -0000	1.59
+++ sources	4 Sep 2007 03:05:36 -0000	1.60
@@ -1 +1 @@
-0afe74b6c2b67e30e5fa6ee2256dcead  file-roller-2.19.91.tar.bz2
+f19d29d7406e5773202da1782d7d1d0b  file-roller-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:12:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:12:20 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.29, 1.30 librsvg2.spec, 1.61,
	1.62 sources, 1.30, 1.31
Message-ID: <200709040312.l843CKZR021738@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21704

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Jul 2007 17:31:20 -0000	1.29
+++ .cvsignore	4 Sep 2007 03:11:47 -0000	1.30
@@ -1 +1 @@
-librsvg-2.18.0.tar.bz2
+librsvg-2.18.1.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- librsvg2.spec	23 Aug 2007 17:25:41 -0000	1.61
+++ librsvg2.spec	4 Sep 2007 03:11:47 -0000	1.62
@@ -11,14 +11,14 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.18.0
-Release: 4%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 
 License: 	LGPLv2+
-Group: System Environment/Libraries
+Group: 		System Environment/Libraries
 Source: 	http://download.gnome.org/sources/librsvg/2.18/librsvg-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
-Requires:		gtk2 >= %{gtk2_version}
+Requires:	gtk2 >= %{gtk2_version}
 Requires:	libxml2 >= %{libxml2_version}
 Requires:	freetype >= %{freetype_version}
 Requires:       cairo >= %{cairo_version}
@@ -47,8 +47,8 @@
 
 
 %package devel
-Summary: Libraries and include files for developing with librsvg
-Group: Development/Libraries
+Summary: 	Libraries and include files for developing with librsvg
+Group: 		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk2-devel >= %{gtk2_version}
 Requires:	libxml2-devel >= %{libxml2_version}
@@ -101,7 +101,7 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
+%doc AUTHORS COPYING COPYING.LIB NEWS README
 %{_libdir}/*.so.*
 %{_libdir}/gtk-2.0/*/engines/libsvg.so
 %{_libdir}/gtk-2.0/*/loaders/svg_loader.so
@@ -118,6 +118,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-4
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Jul 2007 17:31:20 -0000	1.30
+++ sources	4 Sep 2007 03:11:47 -0000	1.31
@@ -1 +1 @@
-cf3b600b874c6940594db512b4260382  librsvg-2.18.0.tar.bz2
+ab250b52cffb436e76f763e72f58e03d  librsvg-2.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:16:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:16:14 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.25,
	1.26 gnome-doc-utils.spec, 1.41, 1.42 sources, 1.25, 1.26
Message-ID: <200709040316.l843GE1l021832@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	31 Jul 2007 01:15:18 -0000	1.25
+++ .cvsignore	4 Sep 2007 03:15:41 -0000	1.26
@@ -1 +1 @@
-gnome-doc-utils-0.11.1.tar.bz2
+gnome-doc-utils-0.11.2.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-doc-utils.spec	7 Aug 2007 06:10:31 -0000	1.41
+++ gnome-doc-utils.spec	4 Sep 2007 03:15:41 -0000	1.42
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.11.1
+Version: 0.11.2
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: %{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.11/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.2-1
+- Update to 0.11.2
+
 * Thu Aug  2 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.1-2
 - Update the license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	31 Jul 2007 01:15:18 -0000	1.25
+++ sources	4 Sep 2007 03:15:41 -0000	1.26
@@ -1 +1 @@
-a63c55de0f8f343598dce60d071b2828  gnome-doc-utils-0.11.1.tar.bz2
+6999661ccbca9b0f409f6a735821e447  gnome-doc-utils-0.11.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:16:48 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:16:48 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.70,
	1.71 evolution-data-server-1.9.92-e-passwords.patch, 1.8,
	1.9 evolution-data-server.spec, 1.185, 1.186 sources, 1.70, 1.71
Message-ID: <200709040316.l843GmTo021867@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21829

Modified Files:
	.cvsignore evolution-data-server-1.9.92-e-passwords.patch 
	evolution-data-server.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
- Update to 1.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	28 Aug 2007 14:03:43 -0000	1.70
+++ .cvsignore	4 Sep 2007 03:16:15 -0000	1.71
@@ -1 +1 @@
-evolution-data-server-1.11.91.tar.bz2
+evolution-data-server-1.11.92.tar.bz2

evolution-data-server-1.9.92-e-passwords.patch:

Index: evolution-data-server-1.9.92-e-passwords.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.9.92-e-passwords.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- evolution-data-server-1.9.92-e-passwords.patch	28 Aug 2007 14:03:43 -0000	1.8
+++ evolution-data-server-1.9.92-e-passwords.patch	4 Sep 2007 03:16:15 -0000	1.9
@@ -1,5 +1,5 @@
---- evolution-data-server-1.11.91/libedataserverui/e-passwords.c.e-passwords	2007-08-24 08:48:15.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserverui/e-passwords.c	2007-08-28 15:25:45.000000000 +0200
+--- evolution-data-server-1.11.92/libedataserverui/e-passwords.c.e-passwords	2007-09-02 14:54:22.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserverui/e-passwords.c	2007-09-03 23:13:10.000000000 -0400
 @@ -23,18 +23,29 @@
   */
  
@@ -340,10 +340,7 @@
  static void
 -ep_msg_free(EPassMsg *msg)
 +ep_msg_dispatch (EPassMsg *msg)
- {
--	e_msgport_destroy(msg->msg.reply_port);
--	g_free(msg->password);
--	g_free(msg);
++{
 +	msg->callback (msg);
 +	e_flag_set (msg->done);
 +}
@@ -361,13 +358,11 @@
 +	g_async_queue_unlock (express_queue);
 +
 +	return success;
- }
- 
- static void
--ep_msg_send(EPassMsg *msg)
++}
++
++static void
 +ep_msg_send (EPassMsg *msg)
- {
--	int needidle = 0;
++{
 +	GMainContext *context;
 +
 +	context = g_main_context_default (); 
@@ -377,12 +372,7 @@
 +
 +	if (!(msg->expedite && ep_msg_expedite (msg)))
 +		g_thread_pool_push (dispatcher, msg, NULL);
- 
--	LOCK();
--	e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
--	if (!idle_id) {
--		if (!msg->ismain)
--			idle_id = g_idle_add(ep_idle_dispatch, NULL);
++
 +	/* Don't block the main loop. */
 +	if (g_main_context_is_owner (context))
 +		while (!e_flag_is_set (msg->done))
@@ -393,7 +383,10 @@
 +
 +static void
 +ep_msg_free (EPassMsg *msg)
-+{
+ {
+-	e_msgport_destroy(msg->msg.reply_port);
+-	g_free(msg->password);
+-	g_free(msg);
 +	e_flag_free (msg->done);
 +	g_slice_free (EPassMsg, msg);
 +}
@@ -414,9 +407,10 @@
 +	data->flags = flags;
 +
 +	return data;
-+}
-+
-+static void
+ }
+ 
+ static void
+-ep_msg_send(EPassMsg *msg)
 +ep_dialog_data_free (EPassDialogData *data)
 +{
 +	e_flag_free (data->done);
@@ -425,9 +419,15 @@
 +
 +static gboolean
 +ep_dialog_run (EPassMsg *msg)
-+{
+ {
+-	int needidle = 0;
 +	/* This function must run in the main thread. */
-+
+ 
+-	LOCK();
+-	e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
+-	if (!idle_id) {
+-		if (!msg->ismain)
+-			idle_id = g_idle_add(ep_idle_dispatch, NULL);
 +	EPassDialogData *data = msg->data;
 +	GtkBox *box;
 +	GtkWidget *dialog;
@@ -524,7 +524,7 @@
  {
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
-@@ -203,11 +436,8 @@ ep_clear_passwords_keyring(EPassMsg *msg
+@@ -203,11 +436,8 @@
  
  	result = gnome_keyring_get_default_keyring_sync (&default_keyring);
  	if (!default_keyring) {
@@ -538,7 +538,7 @@
  	        default_keyring = g_strdup ("default");			
  	}
  
-@@ -232,38 +462,44 @@ ep_clear_passwords_keyring(EPassMsg *msg
+@@ -232,38 +462,44 @@
  	}
  	
  	g_free (default_keyring);
@@ -552,15 +552,15 @@
 +ep_clear_passwords_keyfile (EPassMsg *msg)
  {
 -	char *path;
--
--	path = g_strdup_printf ("/Evolution/Passwords-%s", msg->component);
 +	gchar *group;
 +	GError *error = NULL;
  
--	gnome_config_private_clean_section (path);
--	gnome_config_private_sync_file ("/Evolution");
+-	path = g_strdup_printf ("/Evolution/Passwords-%s", msg->component);
 +	group = ep_key_file_get_group (msg->component);
  
+-	gnome_config_private_clean_section (path);
+-	gnome_config_private_sync_file ("/Evolution");
+-
 -	g_free (path);
 +	g_key_file_remove_group (key_file, group, &error);
 +	if (error == NULL)
@@ -601,7 +601,7 @@
  {
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
-@@ -272,11 +508,8 @@ ep_forget_passwords_keyring(EPassMsg *ms
+@@ -272,11 +508,8 @@
  
  	result = gnome_keyring_get_default_keyring_sync (&default_keyring);
  	if (!default_keyring) {
@@ -615,7 +615,7 @@
  	        default_keyring = g_strdup ("default");			
  	}	
  	d(g_print("Get Default %d\n", result));
-@@ -301,68 +534,53 @@ ep_forget_passwords_keyring(EPassMsg *ms
+@@ -301,68 +534,53 @@
  	g_free (default_keyring);
  
  	/* free up the session passwords */
@@ -711,7 +711,7 @@
  		guint32 item_id;
  
  		if (!strcmp (uri->protocol, "ldap") && !uri->user) {
-@@ -394,48 +612,48 @@ ep_remember_password_keyring(EPassMsg *m
+@@ -394,48 +612,48 @@
  		gnome_keyring_attribute_list_free (attributes);
  
  		/* now remove it from our session hash */
@@ -789,7 +789,7 @@
  }
  
  #ifdef WITH_GNOME_KEYRING
-@@ -446,7 +664,6 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -446,7 +664,6 @@
  	GnomeKeyringResult result;
  	GList *matches = NULL, *tmp;	
  	char *default_keyring = NULL;	
@@ -797,7 +797,7 @@
  	EUri *uri = e_uri_new (msg->key);
  
  	if (!strcmp (uri->protocol, "ldap") && !uri->user) {
-@@ -460,12 +677,7 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -460,12 +677,7 @@
  		uri->user = keycopy;
  	}
  	    
@@ -811,7 +811,7 @@
  
  	if (!uri->host && !uri->user)
  		/* No need to remove from keyring for pass phrases */
-@@ -524,36 +736,45 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -524,36 +736,45 @@
  	g_free (default_keyring);
  
  exit:
@@ -878,7 +878,7 @@
  
  #ifdef WITH_GNOME_KEYRING
  static void
-@@ -562,11 +783,11 @@ ep_get_password_keyring (EPassMsg *msg)
+@@ -562,11 +783,11 @@
  	char *passwd;
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
@@ -893,7 +893,7 @@
  	} else {
  		EUri *uri = e_uri_new (msg->key);
  		
-@@ -630,288 +851,154 @@ ep_get_password_keyring (EPassMsg *msg)
+@@ -630,288 +851,154 @@
  		
  		e_uri_free (uri);
  	}
@@ -958,11 +958,6 @@
 -		g_free (okey);
 -		g_free (value);
 -	}
--
--	g_hash_table_insert (passwords, g_strdup (msg->key), g_strdup (msg->oldpass));
--
--	if (!msg->noreply)
--		e_msgport_reply(&msg->msg);
 +#ifdef WITH_GNOME_KEYRING
 +	if (gnome_keyring_is_available ())
 +		ep_get_password_keyring (msg);
@@ -971,36 +966,36 @@
 +#else
 +	ep_get_password_keyfile (msg);
 +#endif
++}
+ 
+-	g_hash_table_insert (passwords, g_strdup (msg->key), g_strdup (msg->oldpass));
++static void
++ep_add_password (EPassMsg *msg)
++{
++	gchar *key = g_strdup (msg->key);
++	gchar *password = g_strdup (msg->password);
+ 
+-	if (!msg->noreply)
+-		e_msgport_reply(&msg->msg);
++	g_hash_table_insert (password_cache, key, password);
  }
  
 -static void ep_ask_password(EPassMsg *msg);
 -
  static void
 -pass_response(GtkDialog *dialog, int response, void *data)
-+ep_add_password (EPassMsg *msg)
++ep_ask_password (EPassMsg *msg)
  {
 -	EPassMsg *msg = data;
 -	int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
 -	EDList pending = E_DLIST_INITIALISER(pending);
 -	EPassMsg *mw, *mn;
-+	gchar *key = g_strdup (msg->key);
-+	gchar *password = g_strdup (msg->password);
- 
--	if (response == GTK_RESPONSE_OK) {
--		msg->password = g_strdup(gtk_entry_get_text((GtkEntry *)msg->entry));
-+	g_hash_table_insert (password_cache, key, password);
-+}
- 
--		if (type != E_PASSWORDS_REMEMBER_NEVER) {
--			int noreply = msg->noreply;
-+static void
-+ep_ask_password (EPassMsg *msg)
-+{
 +	EPassDialogData *data = msg->data;
 +	gchar *password;
 +	gint remember;
  
--			*msg->remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msg->check));
+-	if (response == GTK_RESPONSE_OK) {
+-		msg->password = g_strdup(gtk_entry_get_text((GtkEntry *)msg->entry));
 +	/* Open the express queue for this key.  This allows us to catch
 +	 * incoming operations on this key while waiting for the user to
 +	 * provide a password.  Once we have the password, immediately
@@ -1009,10 +1004,17 @@
 +	express_key = msg->key;
 +	g_async_queue_unlock (express_queue);
  
--			msg->noreply = 1;
+-		if (type != E_PASSWORDS_REMEMBER_NEVER) {
+-			int noreply = msg->noreply;
 +	if (data->flags & E_PASSWORDS_REPROMPT)
 +		ep_get_password (msg);
  
+-			*msg->remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msg->check));
++	/* Run the password dialog in the main thread. */
++	g_idle_add ((GSourceFunc) ep_dialog_run, msg);
+ 
+-			msg->noreply = 1;
+-
 -			if (*msg->remember || type == E_PASSWORDS_REMEMBER_FOREVER) {
 -				msg->oldpass = msg->password;
 -				ep_add_password(msg);
@@ -1028,18 +1030,26 @@
 -			if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER)
 -				ep_remember_password_file(msg);				    
 -#endif				    
-+	/* Run the password dialog in the main thread. */
-+	g_idle_add ((GSourceFunc) ep_dialog_run, msg);
++	/* Wait for the user to respond. */
++	e_flag_wait (data->done);
  
 -			msg->noreply = noreply;
 -		}
--	}
-+	/* Wait for the user to respond. */
-+	e_flag_wait (data->done);
++	/* If the user cancelled the dialog then we need to dispatch
++	 * any messages that we trapped in the express queue. */
++	if (data->response != GTK_RESPONSE_OK) {
++		g_async_queue_lock (express_queue);
++		express_key = NULL;
++		while ((msg = g_async_queue_try_pop_unlocked (express_queue)))
++			ep_msg_dispatch (msg);
++		g_async_queue_unlock (express_queue);
++		return;
+ 	}
  
 -	gtk_widget_destroy((GtkWidget *)dialog);
 -	password_dialog = NULL;
--
++	remember = data->flags & E_PASSWORDS_REMEMBER_MASK;
+ 
 -	/* ok, here things get interesting, we suck up any pending
 -	 * operations on this specific password, and return the same
 -	 * result or ignore other operations */
@@ -1067,23 +1077,20 @@
 -		}
 -		mw = mn;
 -		mn = (EPassMsg *)mn->msg.ln.next;
-+	/* If the user cancelled the dialog then we need to dispatch
-+	 * any messages that we trapped in the express queue. */
-+	if (data->response != GTK_RESPONSE_OK) {
-+		g_async_queue_lock (express_queue);
-+		express_key = NULL;
-+		while ((msg = g_async_queue_try_pop_unlocked (express_queue)))
-+			ep_msg_dispatch (msg);
-+		g_async_queue_unlock (express_queue);
-+		return;
- 	}
+-	}
 -	UNLOCK();
--
++	if (remember == E_PASSWORDS_REMEMBER_NEVER)
++		goto cleanup;
+ 
 -	if (!msg->noreply)
 -		e_msgport_reply(&msg->msg);
--
++	if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER)
++		ep_add_password (msg);
+ 
 -	ep_idle_dispatch(NULL);
 -}
++	if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER)
++		ep_remember_password (msg);
  
 -static void
 -ep_ask_password(EPassMsg *msg)
@@ -1092,12 +1099,9 @@
 -	int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
 -	guint noreply = msg->noreply;
 -	AtkObject *a11y;
-+	remember = data->flags & E_PASSWORDS_REMEMBER_MASK;
- 
+-
 -	msg->noreply = 1;
-+	if (remember == E_PASSWORDS_REMEMBER_NEVER)
-+		goto cleanup;
- 
+-
 -	/*password_dialog = (GtkDialog *)e_error_new(msg->parent, "mail:ask-session-password", msg->prompt, NULL);*/
 -	password_dialog = (GtkDialog *)gtk_message_dialog_new (msg->parent,
 -							       0,
@@ -1105,15 +1109,11 @@
 -							       GTK_BUTTONS_OK_CANCEL,
 -							       "%s", msg->prompt);
 -	gtk_window_set_title(GTK_WINDOW(password_dialog), msg->title);
-+	if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER)
-+		ep_add_password (msg);
- 
+-
 -	gtk_widget_ensure_style (GTK_WIDGET (password_dialog));
 -	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->vbox), 0);
 -	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->action_area), 12);
-+	if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER)
-+		ep_remember_password (msg);
- 
+-
 -	gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK);
 +cleanup:
  
@@ -1271,7 +1271,7 @@
   * 
   * Set the offline-state of the application.  This is a work-around
   * for having the backends fully offline aware, and returns a
-@@ -920,10 +1007,11 @@ e_passwords_shutdown (void)
+@@ -920,10 +1007,11 @@
   * FIXME: This is not a permanent api, review post 2.0.
   **/
  void
@@ -1286,7 +1286,7 @@
  }
  
  /**
-@@ -934,151 +1022,138 @@ e_passwords_set_online(int state)
+@@ -934,151 +1022,138 @@
  void
  e_passwords_forget_passwords (void)
  {
@@ -1322,15 +1322,15 @@
 -	EPassMsg *msg = ep_msg_new(ep_clear_passwords_file);		
 -#endif
 +	EPassMsg *msg;
-+
-+	g_return_if_fail (component != NULL);
-+
-+	msg = ep_msg_new (ep_clear_passwords, FALSE);
-+	msg->component = component;
  
 -	msg->component = component_name;
 -	ep_msg_send(msg);
 -	ep_msg_free(msg);
++	g_return_if_fail (component != NULL);
++
++	msg = ep_msg_new (ep_clear_passwords, FALSE);
++	msg->component = component;
++
 +	ep_msg_send (msg);
 +	ep_msg_free (msg);
  }
@@ -1436,14 +1436,14 @@
  	msg->key = key;
  
 -	ep_msg_send(msg);
--
--	passwd = msg->password;
--	msg->password = NULL;
--	ep_msg_free(msg);
 +	ep_msg_send (msg);
 +	password = msg->password;
 +	ep_msg_free (msg);
  
+-	passwd = msg->password;
+-	msg->password = NULL;
+-	ep_msg_free(msg);
+-
 -	return passwd;
 +	return password;
  }
@@ -1492,7 +1492,7 @@
   * @prompt: prompt string
   * @type: whether or not to offer to remember the password,
   * and for how long.
-@@ -1093,241 +1168,44 @@ e_passwords_add_password (const char *ke
+@@ -1093,245 +1168,44 @@
   * return value is non-%NULL and @remember_type is not
   * E_PASSWORDS_DO_NOT_REMEMBER.
   **/
@@ -1511,8 +1511,10 @@
  			  GtkWindow *parent)
  {
 -	char *passwd;
--	EPassMsg *msg = ep_msg_new(ep_ask_password);
-+	EPassMsg *msg;
+ 	EPassMsg *msg;
+-
+-	g_return_val_if_fail (component_name != NULL, NULL);
+-	g_return_val_if_fail (key != NULL, NULL);
 +	EPassDialogData *data;
 +	gboolean remember;
 +	gchar *password;
@@ -1524,6 +1526,7 @@
  	if ((type & E_PASSWORDS_ONLINE) && !ep_online_state)
  		return NULL;
  
+-	msg = ep_msg_new (ep_ask_password);
 -	msg->title = title;
 -	msg->component = component_name;
 -	msg->key = key;
@@ -1762,8 +1765,8 @@
 -	return (char *)plain;
 +	return password;
  }
---- evolution-data-server-1.11.91/libedataserverui/e-passwords.h.e-passwords	2007-07-05 08:01:52.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserverui/e-passwords.h	2007-08-28 15:32:45.000000000 +0200
+--- evolution-data-server-1.11.92/libedataserverui/e-passwords.h.e-passwords	2007-09-02 14:54:22.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserverui/e-passwords.h	2007-09-03 23:13:10.000000000 -0400
 @@ -28,45 +28,65 @@
  
  G_BEGIN_DECLS
@@ -1861,9 +1864,9 @@
  
  G_END_DECLS
  
---- evolution-data-server-1.11.91/libedataserver/e-msgport.h.e-passwords	2007-07-05 08:01:55.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserver/e-msgport.h	2007-08-28 15:18:31.000000000 +0200
-@@ -54,7 +54,7 @@ typedef struct _EMsgPort EMsgPort;
+--- evolution-data-server-1.11.92/libedataserver/e-msgport.h.e-passwords	2007-07-05 02:01:55.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserver/e-msgport.h	2007-09-03 23:13:10.000000000 -0400
+@@ -54,7 +54,7 @@
  
  /* header for any message */
  typedef struct _EMsg {


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- evolution-data-server.spec	28 Aug 2007 14:03:43 -0000	1.185
+++ evolution-data-server.spec	4 Sep 2007 03:16:15 -0000	1.186
@@ -26,7 +26,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.11.91
+Version: 1.11.92
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -381,6 +381,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
+- Update to 1.11.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 1.11.91-1.fc8
 - Update to 1.11.91
 - Removed patch for RH bug #215634 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	28 Aug 2007 14:03:43 -0000	1.70
+++ sources	4 Sep 2007 03:16:15 -0000	1.71
@@ -1 +1 @@
-5f405c32980d086091efbcedd4655724  evolution-data-server-1.11.91.tar.bz2
+51fc0b011c240eaefeadbdbcc9517af7  evolution-data-server-1.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:21:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:21:41 -0400
Subject: rpms/libgnomekbd/devel .cvsignore, 1.8, 1.9 libgnomekbd.spec, 1.24, 
	1.25 sources, 1.8, 1.9
Message-ID: <200709040321.l843LfM3022041@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22009

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Aug 2007 00:45:33 -0000	1.8
+++ .cvsignore	4 Sep 2007 03:21:08 -0000	1.9
@@ -1 +1 @@
-libgnomekbd-2.19.90.tar.bz2
+libgnomekbd-2.19.91.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgnomekbd.spec	13 Aug 2007 17:06:36 -0000	1.24
+++ libgnomekbd.spec	4 Sep 2007 03:21:08 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.19.90
-Release:        2%{?dist}
+Version:       	2.19.91
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -11,8 +11,6 @@
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
 Patch5:         libgnomekbd-2.17.2-redraw.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=466301
-Patch6:		bad-free.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,7 +55,6 @@
 %setup -q
 %patch1 -p1 -b .werror
 %patch5 -p1 -b .redraw
-%patch6 -p1 -b .bad-free
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -126,6 +123,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-2
 - Fix a bad free
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Aug 2007 00:45:33 -0000	1.8
+++ sources	4 Sep 2007 03:21:08 -0000	1.9
@@ -1 +1 @@
-1f962042ac9d8f64596e532791b15a29  libgnomekbd-2.19.90.tar.bz2
+9ca7372fba612b99d1e085e648e6c232  libgnomekbd-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:23:56 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:23:56 -0400
Subject: rpms/evolution/devel .cvsignore, 1.76, 1.77 evolution.spec, 1.283, 
	1.284 sources, 1.76, 1.77
Message-ID: <200709040323.l843NueP022203@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22153

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

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	28 Aug 2007 16:00:34 -0000	1.76
+++ .cvsignore	4 Sep 2007 03:23:24 -0000	1.77
@@ -1 +1 @@
-evolution-2.11.91.tar.bz2
+evolution-2.11.92.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- evolution.spec	29 Aug 2007 22:40:09 -0000	1.283
+++ evolution.spec	4 Sep 2007 03:23:24 -0000	1.284
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.91
-Release: 3%{?dist}
+Version: 2.11.92
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -698,6 +698,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
+- Update to 2.11.92
+
 * Wed Aug 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.91-3.fc8
 - Revise patch for GNOME bug #362638 to fix GNOME bug #357175
   (Evolution fails to close after IMAP alert has been displayed).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	28 Aug 2007 16:00:34 -0000	1.76
+++ sources	4 Sep 2007 03:23:24 -0000	1.77
@@ -1 +1 @@
-aeeedfac1769b5d24a61fb76d40f4b5f  evolution-2.11.91.tar.bz2
+4149faf2ee5f0b0ed10114b076fb0ade  evolution-2.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:26:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:26:27 -0400
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.76,1.77
Message-ID: <200709040326.l843QRr9022314@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22296

Modified Files:
	gtk2-engines.spec 
Log Message:
2.11.7



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gtk2-engines.spec	16 Aug 2007 20:20:55 -0000	1.76
+++ gtk2-engines.spec	4 Sep 2007 03:25:55 -0000	1.77
@@ -1,6 +1,6 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.11.6
+Version:        2.11.7
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.7-1
+- Update to 2.11.7
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-1
 - Update to 2.11.6
 



From fedora-extras-commits at redhat.com  Tue Sep  4 03:29:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:29:52 -0400
Subject: rpms/gtk2-engines/devel .cvsignore,1.38,1.39 sources,1.39,1.40
Message-ID: <200709040329.l843TqeE022422@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22402

Modified Files:
	.cvsignore sources 
Log Message:
update source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Aug 2007 20:20:55 -0000	1.38
+++ .cvsignore	4 Sep 2007 03:29:19 -0000	1.39
@@ -1 +1 @@
-gtk-engines-2.11.6.tar.bz2
+gtk-engines-2.11.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Aug 2007 20:20:55 -0000	1.39
+++ sources	4 Sep 2007 03:29:19 -0000	1.40
@@ -1 +1 @@
-74327bc3f6e26439602bf5fcaf9531ea  gtk-engines-2.11.6.tar.bz2
+fa962bb9be3d50d2d5006696637f4e9a  gtk-engines-2.11.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:32:57 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:32:57 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.36, 1.37 libgtop2.spec, 1.55,
	1.56 sources, 1.36, 1.37
Message-ID: <200709040332.l843WvfS022525@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgtop2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22503

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	10 Jul 2007 14:18:36 -0000	1.36
+++ .cvsignore	4 Sep 2007 03:32:24 -0000	1.37
@@ -1 +1 @@
-libgtop-2.19.5.tar.bz2
+libgtop-2.19.92.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgtop2.spec	22 Aug 2007 18:57:49 -0000	1.55
+++ libgtop2.spec	4 Sep 2007 03:32:24 -0000	1.56
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.19.5
-Release: 	3%{?dist}
+Version: 	2.19.92
+Release: 	1%{?dist}
 License: 	GPLv2+
 URL:            http://download.gnome.org/sources/libgtop/2.19
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 2.19.5-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	10 Jul 2007 14:18:36 -0000	1.36
+++ sources	4 Sep 2007 03:32:24 -0000	1.37
@@ -1 +1 @@
-233dfd63b9dc39f08308e73509edd14d  libgtop-2.19.5.tar.bz2
+12edde75a0b7cf92ac89206f89f9e275  libgtop-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:38:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:38:48 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.30, 1.31 librsvg2.spec, 1.62,
	1.63 sources, 1.31, 1.32
Message-ID: <200709040338.l843cmsg022654@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22623

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	4 Sep 2007 03:11:47 -0000	1.30
+++ .cvsignore	4 Sep 2007 03:38:15 -0000	1.31
@@ -1 +1 @@
-librsvg-2.18.1.tar.bz2
+librsvg-2.18.2.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- librsvg2.spec	4 Sep 2007 03:11:47 -0000	1.62
+++ librsvg2.spec	4 Sep 2007 03:38:15 -0000	1.63
@@ -11,7 +11,7 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.18.1
+Version: 2.18.2
 Release: 1%{?dist}
 
 License: 	LGPLv2+
@@ -118,6 +118,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Sep 2007 03:11:47 -0000	1.31
+++ sources	4 Sep 2007 03:38:15 -0000	1.32
@@ -1 +1 @@
-ab250b52cffb436e76f763e72f58e03d  librsvg-2.18.1.tar.bz2
+4691ad687281e943260021272c28043e  librsvg-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:43:21 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Mon, 3 Sep 2007 23:43:21 -0400
Subject: rpms/libedit/devel .cvsignore, 1.4, 1.5 libedit.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709040343.l843hLep022806@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/devel

Modified Files:
	.cvsignore libedit.spec sources 
Log Message:
Initial import into devel.

 Modified Files:
 	devel/.cvsignore devel/libedit.spec devel/sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2007 22:43:13 -0000	1.4
+++ .cvsignore	4 Sep 2007 03:42:48 -0000	1.5
@@ -1 +1 @@
-libedit-20070302-2.10.tar.gz
+libedit-20070831-2.10.tar.gz


Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/libedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libedit.spec	23 Mar 2007 22:43:13 -0000	1.5
+++ libedit.spec	4 Sep 2007 03:42:48 -0000	1.6
@@ -1,95 +1,72 @@
-%define	snap	20070302
+%define snap 20070831
 
-Name:           libedit
-Version:        2.10
-Release:        1.%{snap}cvs%{?dist}
-Summary:        The NetBSD Editline library (libedit)
-
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.thrysoee.dk/editline/
-Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: The NetBSD Editline library
+Name: libedit
+Version: 2.10
+Release: 1.%{snap}cvs%{?dist}
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.thrysoee.dk/editline/
+Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 
-BuildRequires:  ncurses-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: gawk
+BuildRequires: ncurses-devel
 
 %description
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
-
-%package	devel
-Summary:	Development files for %{name}
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ncurses-devel
-
-%description	devel
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
+Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
+It provides generic line editing, history, and tokenization functions, similar
+to those found in GNU Readline.
+
+%package devel
+Summary: Development files for %{name}
+Group: System Environment/Libraries
+
+Requires: %{name} = %{version}-%{release}
+Requires: ncurses-devel
+Requires: pkgconfig
 
+%description devel
 This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog INSTALL THANKS COPYING
-%{_libdir}/*.so.*
+%doc ChangeLog COPYING THANKS
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.a
+%doc examples/fileman.c examples/test.c
+%{_includedir}/histedit.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*
-%{_mandir}/man5/*
+%{_mandir}/man5/editrc.5.gz
 
-%changelog
-* Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.10-1.20070302cvs
-- Take ownership of libedit package.
-- Import libedit 2.10 20070302 snapshot.
-
-* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.9-3.20060603cvs
-- Rebuild for FC6
-
-* Thu Jun 29 2006 Michael J. Knox <michael at knox.net.nz> - 2.9-3.20060603cvs
-- updated to current snapshot
-- fixed incoherent-version-in-changelog rpmlint messages
-
-* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> - 2.9-2.20060213cvs
-- removed licence file I supplied, have requested upstream to provide one
-- removed unrequire build dep
-
-* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-1.20060213cvs
-- removed .la
-- added post and postun calls.
-- fixed package groups and release.
-- added %{name}.COPYING to include NetBSD BSD license.
+%dir %{_includedir}/editline
+%{_includedir}/editline/readline.h
 
-* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-20060103cvs
-- initial package for NetBSD's editline.
+%changelog
+* Sun Sep 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.10-1.20070831cvs
+- Initial build. Imported SPEC from Rawhide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2007 22:43:13 -0000	1.4
+++ sources	4 Sep 2007 03:42:48 -0000	1.5
@@ -1 +1 @@
-c67689f79ceb0e538ecdb0f893c64393  libedit-20070302-2.10.tar.gz
+e8abd1169825efecfccb0f7b4c338bb5  libedit-20070831-2.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 03:43:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:43:40 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.47,
	1.48 gnome-icon-theme.spec, 1.73, 1.74 sources, 1.50, 1.51
Message-ID: <200709040343.l843hebN022846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22780

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	13 Aug 2007 22:36:53 -0000	1.47
+++ .cvsignore	4 Sep 2007 03:43:08 -0000	1.48
@@ -1 +1 @@
-gnome-icon-theme-2.19.90.tar.bz2
+gnome-icon-theme-2.19.91.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-icon-theme.spec	13 Aug 2007 22:36:53 -0000	1.73
+++ gnome-icon-theme.spec	4 Sep 2007 03:43:08 -0000	1.74
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.19.90
+Version: 2.19.91
 Release: 1%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.19/%{name}-%{version}.tar.bz2
 License: GPL+
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Further correction of the license field


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Aug 2007 22:36:53 -0000	1.50
+++ sources	4 Sep 2007 03:43:08 -0000	1.51
@@ -1 +1 @@
-b93906d1b0f3dde2a142b8aef58226ce  gnome-icon-theme-2.19.90.tar.bz2
+8885d86e508185f1fd807e99f0d1f4fe  gnome-icon-theme-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:47:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:47:39 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.49, 1.50 gnome-themes.spec,
	1.95, 1.96 sources, 1.54, 1.55
Message-ID: <200709040347.l843ldFH022978@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22942

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	13 Aug 2007 21:51:08 -0000	1.49
+++ .cvsignore	4 Sep 2007 03:47:07 -0000	1.50
@@ -1 +1 @@
-gnome-themes-2.19.90.tar.bz2
+gnome-themes-2.19.92.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-themes.spec	13 Aug 2007 19:47:59 -0000	1.95
+++ gnome-themes.spec	4 Sep 2007 03:47:07 -0000	1.96
@@ -2,7 +2,7 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.19.90
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.19/%{name}-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Update the license field


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	13 Aug 2007 21:51:08 -0000	1.54
+++ sources	4 Sep 2007 03:47:07 -0000	1.55
@@ -1,2 +1,2 @@
-b20596f776b30b2b478338e8afdea543  gnome-themes-2.19.90.tar.bz2
+b556ea726a1adbe2bf5f20cea14a9e89  gnome-themes-2.19.92.tar.bz2
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:48:57 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Mon, 3 Sep 2007 23:48:57 -0400
Subject: rpms/libedit/F-7 .cvsignore, 1.4, 1.5 libedit.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709040348.l843mvTH023058@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libedit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23032/F-7

Modified Files:
	.cvsignore libedit.spec sources 
Log Message:
Initial import into F-7.

 Modified Files:
 	F-7/.cvsignore F-7/libedit.spec F-7/sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2007 22:43:13 -0000	1.4
+++ .cvsignore	4 Sep 2007 03:48:24 -0000	1.5
@@ -1 +1 @@
-libedit-20070302-2.10.tar.gz
+libedit-20070831-2.10.tar.gz


Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/libedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libedit.spec	23 Mar 2007 22:43:13 -0000	1.5
+++ libedit.spec	4 Sep 2007 03:48:24 -0000	1.6
@@ -1,95 +1,72 @@
-%define	snap	20070302
+%define snap 20070831
 
-Name:           libedit
-Version:        2.10
-Release:        1.%{snap}cvs%{?dist}
-Summary:        The NetBSD Editline library (libedit)
-
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.thrysoee.dk/editline/
-Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: The NetBSD Editline library
+Name: libedit
+Version: 2.10
+Release: 1.%{snap}cvs%{?dist}
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.thrysoee.dk/editline/
+Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 
-BuildRequires:  ncurses-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: gawk
+BuildRequires: ncurses-devel
 
 %description
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
-
-%package	devel
-Summary:	Development files for %{name}
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ncurses-devel
-
-%description	devel
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
+Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
+It provides generic line editing, history, and tokenization functions, similar
+to those found in GNU Readline.
+
+%package devel
+Summary: Development files for %{name}
+Group: System Environment/Libraries
+
+Requires: %{name} = %{version}-%{release}
+Requires: ncurses-devel
+Requires: pkgconfig
 
+%description devel
 This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog INSTALL THANKS COPYING
-%{_libdir}/*.so.*
+%doc ChangeLog COPYING THANKS
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.a
+%doc examples/fileman.c examples/test.c
+%{_includedir}/histedit.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*
-%{_mandir}/man5/*
+%{_mandir}/man5/editrc.5.gz
 
-%changelog
-* Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.10-1.20070302cvs
-- Take ownership of libedit package.
-- Import libedit 2.10 20070302 snapshot.
-
-* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.9-3.20060603cvs
-- Rebuild for FC6
-
-* Thu Jun 29 2006 Michael J. Knox <michael at knox.net.nz> - 2.9-3.20060603cvs
-- updated to current snapshot
-- fixed incoherent-version-in-changelog rpmlint messages
-
-* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> - 2.9-2.20060213cvs
-- removed licence file I supplied, have requested upstream to provide one
-- removed unrequire build dep
-
-* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-1.20060213cvs
-- removed .la
-- added post and postun calls.
-- fixed package groups and release.
-- added %{name}.COPYING to include NetBSD BSD license.
+%dir %{_includedir}/editline
+%{_includedir}/editline/readline.h
 
-* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-20060103cvs
-- initial package for NetBSD's editline.
+%changelog
+* Sun Sep 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.10-1.20070831cvs
+- Initial build. Imported SPEC from Rawhide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2007 22:43:13 -0000	1.4
+++ sources	4 Sep 2007 03:48:24 -0000	1.5
@@ -1 +1 @@
-c67689f79ceb0e538ecdb0f893c64393  libedit-20070302-2.10.tar.gz
+e8abd1169825efecfccb0f7b4c338bb5  libedit-20070831-2.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 03:54:49 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:54:49 -0400
Subject: rpms/evolution-exchange/devel .cvsignore, 1.7,
	1.8 evolution-exchange.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200709040354.l843snFq023215@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23169

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2007 16:13:42 -0000	1.7
+++ .cvsignore	4 Sep 2007 03:54:17 -0000	1.8
@@ -1 +1 @@
-evolution-exchange-2.11.91.tar.bz2
+evolution-exchange-2.11.92.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- evolution-exchange.spec	28 Aug 2007 16:13:42 -0000	1.8
+++ evolution-exchange.spec	4 Sep 2007 03:54:17 -0000	1.9
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.11.91
+Version: 2.11.92
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -162,6 +162,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
+- Update to 2.11.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 2.11.91-1.fc8
 - Update to 2.11.91
 - Removed patch for GNOME bug #466987 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Aug 2007 16:13:42 -0000	1.7
+++ sources	4 Sep 2007 03:54:17 -0000	1.8
@@ -1 +1 @@
-4343c780ed7b70683fe1a34fb642e661  evolution-exchange-2.11.91.tar.bz2
+34383a2be637b3baeb058072ef584ca7  evolution-exchange-2.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:55:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:55:01 -0400
Subject: rpms/eog/devel .cvsignore, 1.49, 1.50 eog.spec, 1.94, 1.95 sources, 
	1.49, 1.50
Message-ID: <200709040355.l843t1VD023262@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23192

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	14 Aug 2007 03:35:38 -0000	1.49
+++ .cvsignore	4 Sep 2007 03:54:28 -0000	1.50
@@ -1 +1 @@
-eog-2.19.5.tar.bz2
+eog-2.19.92.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- eog.spec	16 Aug 2007 05:18:41 -0000	1.94
+++ eog.spec	4 Sep 2007 03:54:28 -0000	1.95
@@ -13,8 +13,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.19.5
-Release: 3%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2
 Patch0: eog-2.19.4-svgz.patch
@@ -152,6 +152,9 @@
 %{_libdir}/pkgconfig/eog.pc
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.5-3
 - Hide it from the menus _again_
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	14 Aug 2007 03:35:38 -0000	1.49
+++ sources	4 Sep 2007 03:54:28 -0000	1.50
@@ -1 +1 @@
-7d734ee59cf8168cde9f5a874fdfd0df  eog-2.19.5.tar.bz2
+773960d53b71b4e3c539c139db3bd277  eog-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:02:04 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:02:04 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.22, 1.23 gconf-editor.spec,
	1.45, 1.46 sources, 1.22, 1.23
Message-ID: <200709040402.l84424RW029358@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29318

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Mar 2007 04:36:29 -0000	1.22
+++ .cvsignore	4 Sep 2007 04:01:29 -0000	1.23
@@ -1 +1 @@
-gconf-editor-2.18.0.tar.bz2
+gconf-editor-2.18.2.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gconf-editor.spec	23 Aug 2007 17:43:16 -0000	1.45
+++ gconf-editor.spec	4 Sep 2007 04:01:29 -0000	1.46
@@ -7,8 +7,8 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.18.0
-Release: 3%{?dist}
+Version: 2.18.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
@@ -104,6 +104,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-3
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Mar 2007 04:36:29 -0000	1.22
+++ sources	4 Sep 2007 04:01:29 -0000	1.23
@@ -1 +1 @@
-cbaefa1ff8a548a3d381c67aed426fb7  gconf-editor-2.18.0.tar.bz2
+e40f51b3cb2809b882c29d45b71657bd  gconf-editor-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:05:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:05:02 -0400
Subject: rpms/eog/devel eog.spec,1.95,1.96
Message-ID: <200709040405.l84452Yr029504@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469

Modified Files:
	eog.spec 
Log Message:
fix file lists



Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- eog.spec	4 Sep 2007 03:54:28 -0000	1.95
+++ eog.spec	4 Sep 2007 04:04:28 -0000	1.96
@@ -141,7 +141,6 @@
 %{_datadir}/applications/*
 %{_datadir}/omf/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/pixmaps/eog
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_libdir}/eog



From fedora-extras-commits at redhat.com  Tue Sep  4 04:17:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:17:24 -0400
Subject: rpms/pango/devel .cvsignore, 1.62, 1.63 pango.spec, 1.123,
	1.124 sources, 1.62, 1.63
Message-ID: <200709040417.l844HOiV029707@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29676

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	23 Aug 2007 16:52:41 -0000	1.62
+++ .cvsignore	4 Sep 2007 04:16:52 -0000	1.63
@@ -1 +1 @@
-pango-1.18.0.tar.bz2
+pango-1.18.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- pango.spec	23 Aug 2007 16:52:41 -0000	1.123
+++ pango.spec	4 Sep 2007 04:16:52 -0000	1.124
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.18.0
+Version: 1.18.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
+- Update to 1.18.1
+
 * Thu Aug 23 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.18.0-1
 - Update to 1.18.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	23 Aug 2007 16:52:41 -0000	1.62
+++ sources	4 Sep 2007 04:16:52 -0000	1.63
@@ -1 +1 @@
-5a3cbda73be7277a20d97f2bc89b0737  pango-1.18.0.tar.bz2
+282dcff56292359f6a5c75be0b4fe3df  pango-1.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:24:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:24:11 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.4, 1.5 gtksourceview2.spec, 
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709040424.l844OBnW030060@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29991

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
1.90.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2007 14:38:02 -0000	1.4
+++ .cvsignore	4 Sep 2007 04:23:39 -0000	1.5
@@ -1 +1 @@
-gtksourceview-1.90.3.tar.bz2
+gtksourceview-1.90.4.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtksourceview2.spec	7 Aug 2007 20:30:43 -0000	1.6
+++ gtksourceview2.spec	4 Sep 2007 04:23:39 -0000	1.7
@@ -5,8 +5,8 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.3
-Release: 2%{?dist} 
+Version: 1.90.4
+Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
@@ -69,7 +69,7 @@
 
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
-%doc README AUTHORS COPYING NEWS MAINTAINERS ChangeLog
+%doc README AUTHORS COPYING NEWS MAINTAINERS 
 %{_datadir}/gtksourceview-2.0
 %{_libdir}/*.so.*
 
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
+- Update to 1.90.4
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.3-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2007 14:38:02 -0000	1.4
+++ sources	4 Sep 2007 04:23:39 -0000	1.5
@@ -1 +1 @@
-584f6bd1c4cc4411f6be7fe96e0c3af5  gtksourceview-1.90.3.tar.bz2
+d4a1029c968ca61f8f65d3c22d4de07e  gtksourceview-1.90.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:27:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:27:31 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.25, 1.26 gcalctool.spec, 1.46,
	1.47 sources, 1.26, 1.27
Message-ID: <200709040427.l844RVAv030190@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30153

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Aug 2007 18:54:20 -0000	1.25
+++ .cvsignore	4 Sep 2007 04:26:59 -0000	1.26
@@ -1 +1 @@
-gcalctool-5.19.90.tar.bz2
+gcalctool-5.19.92.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gcalctool.spec	13 Aug 2007 18:54:20 -0000	1.46
+++ gcalctool.spec	4 Sep 2007 04:26:59 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.19.90
+Version:        5.19.92
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -56,7 +56,6 @@
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # delete this crap
@@ -97,11 +96,13 @@
 %{_bindir}/gcalctool
 %{_bindir}/gnome-calculator
 %{_datadir}/applications/gnome-gcalctool.desktop
-%{_datadir}/omf/gcalctool/
 %doc %{_mandir}/man1/gcalctool.1.gz
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.92-1
+- Update to 5.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.90-1
 - Update to 5.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Aug 2007 18:54:20 -0000	1.26
+++ sources	4 Sep 2007 04:26:59 -0000	1.27
@@ -1 +1 @@
-237e1b4805cf24ca2a7e5cdf741e4a2f  gcalctool-5.19.90.tar.bz2
+1b2a327311134d830a4b3628b51468f0  gcalctool-5.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:30:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:30:56 -0400
Subject: rpms/gok/devel .cvsignore, 1.24, 1.25 gok.spec, 1.52, 1.53 sources, 
	1.24, 1.25
Message-ID: <200709040430.l844Uupm030296@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30272

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Jul 2007 13:50:10 -0000	1.24
+++ .cvsignore	4 Sep 2007 04:30:23 -0000	1.25
@@ -1 +1 @@
-gok-1.3.1.tar.bz2
+gok-1.3.2.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gok.spec	29 Aug 2007 03:55:21 -0000	1.52
+++ gok.spec	4 Sep 2007 04:30:23 -0000	1.53
@@ -2,8 +2,8 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -110,7 +110,6 @@
 %{_bindir}/create-branching-keyboard
 %{_libdir}/bonobo/servers/GNOME_Gok.server
 %{_datadir}/gok
-%{_datadir}/omf/gok
 %{_datadir}/icons/hicolor/48x48/apps/gok.png
 %exclude %{_datadir}/applications/gok.desktop
 
@@ -122,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.2-1
+- Update to 1.3.2
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.1-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Jul 2007 13:50:10 -0000	1.24
+++ sources	4 Sep 2007 04:30:23 -0000	1.25
@@ -1 +1 @@
-4d985fe794aa794c6ab0c9efb1825af4  gok-1.3.1.tar.bz2
+643a6ef0e1752b41d4a3d2415c9cb174  gok-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:39:04 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:39:04 -0400
Subject: rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.13,
	1.14 evolution-2.9.1-kill-ememory.patch, 1.3, 1.4 evolution.spec,
	1.284, 1.285 evolution-2.11.91-compilation-breakage.patch, 1.1, NONE
Message-ID: <200709040439.l844d4X9030590@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30562

Modified Files:
	evolution-2.8.1-kill-ethread.patch 
	evolution-2.9.1-kill-ememory.patch evolution.spec 
Removed Files:
	evolution-2.11.91-compilation-breakage.patch 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92


evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- evolution-2.8.1-kill-ethread.patch	29 Aug 2007 22:40:09 -0000	1.13
+++ evolution-2.8.1-kill-ethread.patch	4 Sep 2007 04:39:01 -0000	1.14
@@ -1,4893 +1,4256 @@
-diff -up evolution-2.11.91/mail/mail-send-recv.c.kill-ethread evolution-2.11.91/mail/mail-send-recv.c
---- evolution-2.11.91/mail/mail-send-recv.c.kill-ethread	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.91/mail/mail-send-recv.c	2007-08-29 17:39:34.000000000 -0400
-@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d,
- /* ********************************************************************** */
+--- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,32 +44,30 @@
  
- struct _refresh_folders_msg {
+ 
+ struct _folder_unsub_t {
 -	struct _mail_msg msg;
 +	MailMsg base;
- 
- 	struct _send_info *info;
- 	GPtrArray *folders;
- 	CamelStore *store;
+ 	
+ 	char *uri;
  };
  
 -static char *
--refresh_folders_desc (struct _mail_msg *mm, int done)
+-folder_unsubscribe__desc (struct _mail_msg *mm, int done)
 +static gchar *
-+refresh_folders_desc (struct _refresh_folders_msg *m)
- {
- 	return g_strdup_printf(_("Checking for new mail"));
- }
- 
- static void
--refresh_folders_get (struct _mail_msg *mm)
-+refresh_folders_exec (struct _refresh_folders_msg *m)
++folder_unsubscribe_desc (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 	CamelFolder *folder;
- 	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri);
++	return g_strdup_printf (
++		_("Unsubscribing from folder \"%s\""), msg->uri);
  }
  
  static void
--refresh_folders_got (struct _mail_msg *mm)
-+refresh_folders_done (struct _refresh_folders_msg *m)
+-folder_unsubscribe__unsub (struct _mail_msg *mm)
++folder_unsubscribe_exec (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
--
- 	receive_done("", m->info);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+ 	extern CamelSession *session;
+ 	const char *path = NULL;
+ 	CamelStore *store;
+ 	CamelURL *url;
+ 	
+-	if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex)))
++	if (!(store = camel_session_get_store (session, msg->uri, &mm->ex)))
+ 		return;
+ 	
+-	url = camel_url_new (unsub->uri, NULL);
++	url = camel_url_new (msg->uri, NULL);
+ 	if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+ 		path = url->fragment;
+ 	else if (url->path && url->path[0])
+@@ -82,18 +80,17 @@
  }
  
  static void
--refresh_folders_free (struct _mail_msg *mm)
-+refresh_folders_free (struct _refresh_folders_msg *m)
+-folder_unsubscribe__free (struct _mail_msg *mm)
++folder_unsubscribe_free (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 
- 	for (i=0;i<m->folders->len;i++)
-@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg *
- 	camel_object_unref(m->store);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	g_free (unsub->uri);
++	g_free (msg->uri);
  }
  
--static struct _mail_msg_op refresh_folders_op = {
--	refresh_folders_desc,
--	refresh_folders_get,
--	refresh_folders_got,
--	refresh_folders_free,
-+static MailMsgInfo refresh_folders_info = {
-+	sizeof (struct _refresh_folders_msg),
-+	(MailMsgDescFunc) refresh_folders_desc,
-+	(MailMsgExecFunc) refresh_folders_exec,
-+	(MailMsgDoneFunc) refresh_folders_done,
-+	(MailMsgFreeFunc) refresh_folders_free
+-static struct _mail_msg_op unsubscribe_op = {
+-	folder_unsubscribe__desc,
+-	folder_unsubscribe__unsub,
+-	NULL,
+-	folder_unsubscribe__free,
++static MailMsgInfo unsubscribe_info = {
++	sizeof (struct _folder_unsub_t),
++	(MailMsgDescFunc) folder_unsubscribe_desc,
++	(MailMsgExecFunc) folder_unsubscribe_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) folder_unsubscribe_free
  };
  
- static void
-@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore
  
- 		get_folders(store, folders, info);
+@@ -105,8 +102,8 @@
+ 	if (target->uri == NULL)
+ 		return;
+ 	
+-	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
++	unsub = mail_msg_new (&unsubscribe_info);
+ 	unsub->uri = g_strdup (target->uri);
+ 	
+-	e_thread_put (mail_thread_new, (EMsg *) unsub);
++	mail_msg_unordered_push (unsub);
+ }
+--- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-09-02 14:56:39.000000000 -0400
++++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,7 +44,7 @@
+ 		return;
+ 	}
+ 	
+-	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new);
++	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push);
+ }
  
--		m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m));
-+		m = mail_msg_new(&refresh_folders_info);
- 		m->store = store;
- 		camel_object_ref(store);
- 		m->folders = folders;
- 		m->info = sinfo;
+ static void
+--- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread	2007-09-02 14:56:45.000000000 -0400
++++ evolution-2.11.92/plugins/save-attachments/save-attachments.c	2007-09-04 00:19:08.000000000 -0400
+@@ -403,5 +403,5 @@
+ 	camel_object_ref(data->folder);
+ 	data->uid = g_strdup(target->uids->pdata[0]);
  
--		e_thread_put(mail_thread_new, (EMsg *)m);
-+		mail_msg_unordered_push (m);
- 	} else {
- 		receive_done ("", data);
- 	}
-diff -up evolution-2.11.91/mail/mail-component.c.kill-ethread evolution-2.11.91/mail/mail-component.c
---- evolution-2.11.91/mail/mail-component.c.kill-ethread	2007-08-24 02:49:43.000000000 -0400
-+++ evolution-2.11.91/mail/mail-component.c	2007-08-29 17:39:34.000000000 -0400
-@@ -1005,7 +1005,7 @@ impl_handleURI (PortableServer_Servant s
- 		if (camel_url_get_param(url, "uid") != NULL) {
- 			char *curi = em_uri_to_camel(uri);
+-	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
++	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
+ }
+--- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-04 00:19:08.000000000 -0400
+@@ -121,7 +121,7 @@
+ }
  
--			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new);
-+			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push);
- 			g_free(curi);
- 		} else {
- 			g_warning("email uri's must include a uid parameter");
-diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/mail-ops.c
---- evolution-2.11.91/mail/mail-ops.c.kill-ethread	2007-07-05 02:09:38.000000000 -0400
-+++ evolution-2.11.91/mail/mail-ops.c	2007-08-29 17:39:34.000000000 -0400
-@@ -75,7 +75,7 @@
- /* used for both just filtering a folder + uid's, and for filtering a whole folder */
- /* used both for fetching mail, and for filtering mail */
- struct _filter_mail_msg {
+ struct _EMCreateFolder {
 -	struct _mail_msg msg;
 +	MailMsg base;
  	
- 	CamelFolder *source_folder; /* where they come from */
[...12250 lines suppressed...]
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre
- 				  G_CALLBACK (cal_opened_cb),
- 				  ca);
- 	}	
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state++;
+ 	if (busy_state == 1) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
  
- /**
-@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
- void
- alarm_queue_add_client (ECal *client)
+ void mail_disable_stop(void)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_add_async;
--
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	g_object_ref (client);
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_add_async;
-+	msg->client = g_object_ref (client);
+-	struct _mail_msg *m;
++	MailMsg *m;
  
--	d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
--	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+	message_push ((Message *) msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state--;
+ 	if (busy_state == 0) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
+@@ -930,7 +911,7 @@
+ /* ******************************************************************************** */
  
- /* Removes a component an its alarms */
-@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
-  * Removes a calendar client from the alarm queueing system.
-  **/
- static void
--alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
-+alarm_queue_remove_async (struct _alarm_client_msg *msg)
- {
- 	ClientAlarms *ca;
--	struct _alarm_client_msg *list = msg->data;
--	ECal *client = list->client;
-+	ECal *client = msg->client;
+ struct _op_status_msg {
+-	struct _mail_msg msg;
++	MailMsg base;
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al
- 	g_free (ca);
+ 	struct _CamelOperation *op;
+ 	char *what;
+@@ -938,16 +919,16 @@
+ 	void *data;
+ };
  
- 	g_hash_table_remove (client_alarms_hash, client);
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+-static void do_op_status(struct _mail_msg *mm)
++static void
++op_status_exec (struct _op_status_msg *m)
+ {
+ 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
+-	struct _mail_msg *msg;
+-	struct _mail_msg_priv *data;
++	MailMsg *msg;
++	MailMsgPrivate *data;
+ 	char *out, *p, *o, c;
+ 	int pc;
+ 	
+-	g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ()));
++	g_return_if_fail (mail_in_main_thread ());
+ 	
+ 	MAIL_MT_LOCK (mail_msg_lock);
+ 	
+@@ -986,8 +967,8 @@
+ 				progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
+ 			
+ 			MAIL_MT_UNLOCK (mail_msg_lock);
+-			if (msg->ops->describe_msg)
+-				what = msg->ops->describe_msg (msg, FALSE);
++			if (msg->info->desc)
++				what = msg->info->desc (msg);
+ 			/* uncommenting because message is not very useful for a user, see bug 271734*/
+ 			else {
+ 				what = g_strdup("");
+@@ -1001,11 +982,7 @@
+ 			MAIL_MT_LOCK (mail_msg_lock);
+ 			if (data->activity_state == 3) {
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+-				if (msg->cancel)
+-					camel_operation_unref (msg->cancel);
+-				camel_exception_clear (&msg->ex);
+-				g_free (msg->priv);
+-				g_free (msg);
++				mail_msg_free (msg);
+ 			} else {
+ 				data->activity_state = 2;
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+@@ -1021,18 +998,17 @@
  }
  
- /** alarm_queue_remove_client
-@@ -2156,22 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
- void
- alarm_queue_remove_client (ECal *client, gboolean immediately)
+ static void
+-do_op_status_free (struct _mail_msg *mm)
++op_status_free (struct _op_status_msg *m)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_remove_async;
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
 -
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_remove_async;
-+	msg->client = client;
+ 	g_free (m->what);
+ }
  
--	d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
- 	if (immediately)
--		alarm_queue_remove_async (NULL, msg, NULL);
-+		alarm_queue_remove_async (msg);
- 	else
--		e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+		message_push ((Message *) msg);
+-static struct _mail_msg_op op_status_op = {
+-	NULL,
+-	do_op_status,
+-	NULL,
+-	do_op_status_free,
++static MailMsgInfo op_status_info = {
++	sizeof (struct _op_status_msg),
++	(MailMsgDescFunc) NULL,
++	(MailMsgExecFunc) op_status_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) op_status_free
+ };
+ 
+ static void
+@@ -1042,7 +1018,7 @@
+ 	
+ 	d(printf("got operation statys: %s %d%%\n", what, pc));
+ 
+-	m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
++	m = mail_msg_new(&op_status_info);
+ 	m->op = op;
+ 	m->what = g_strdup(what);
+ 	switch (pc) {
+@@ -1055,7 +1031,7 @@
+ 	}
+ 	m->pc = pc;
+ 	m->data = data;
+-	e_msgport_put(mail_gui_port, (EMsg *)m);
++	mail_msg_main_loop_push(m);
  }
  
- /* Update non-time related variables for various structures on modification of an existing component 
+ /* ******************** */

evolution-2.9.1-kill-ememory.patch:

Index: evolution-2.9.1-kill-ememory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.9.1-kill-ememory.patch	4 Jun 2007 20:07:28 -0000	1.3
+++ evolution-2.9.1-kill-ememory.patch	4 Sep 2007 04:39:01 -0000	1.4
@@ -30,7 +30,7 @@
 -	default:
 -		string = NULL;
 -		index = NORMALISED_LAST;
--		g_assert_not_reached ();
+-		g_warning ("Should not be reached\n");
 -	}
 -	
 -	/* slight optimisation */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- evolution.spec	4 Sep 2007 03:23:24 -0000	1.284
+++ evolution.spec	4 Sep 2007 04:39:01 -0000	1.285
@@ -121,9 +121,6 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# The usual compilation breakage...
-Patch35: evolution-2.11.91-compilation-breakage.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -255,7 +252,6 @@
 %patch31 -p1 -b .meeting-list-view
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .compilation-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib


--- evolution-2.11.91-compilation-breakage.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 04:47:30 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:47:30 -0400
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.11.92-compilation-breakage.patch, NONE,
	1.1 evolution-exchange.spec, 1.9, 1.10
Message-ID: <200709040447.l844lUqG030738@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30713

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.11.92-compilation-breakage.patch 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92


evolution-exchange-2.11.92-compilation-breakage.patch:

--- NEW FILE evolution-exchange-2.11.92-compilation-breakage.patch ---
--- evolution-exchange-2.11.92/calendar/e-cal-backend-exchange.c.compilation-breakage	2007-09-04 00:44:22.000000000 -0400
+++ evolution-exchange-2.11.92/calendar/e-cal-backend-exchange.c	2007-09-04 00:45:07.000000000 -0400
@@ -46,6 +46,7 @@
 #include <mapi.h>
 
 #include <e-folder-exchange.h>
+#include <exchange-account.h>
 #include "exchange-component.h"
 #include <exchange-hierarchy.h>
 


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- evolution-exchange.spec	4 Sep 2007 03:54:17 -0000	1.9
+++ evolution-exchange.spec	4 Sep 2007 04:46:50 -0000	1.10
@@ -50,6 +50,9 @@
 # Remove deprecated e_passwords_shutdown().
 Patch15: evolution-exchange-2.11.4-e-passwords.patch
 
+# The usual compilation breakage...
+Patch16: evolution-exchange-2.11.91-compilation-breakage.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -89,6 +92,7 @@
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
+%patch16 -p1 -b .compilation-breakage
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"



From fedora-extras-commits at redhat.com  Tue Sep  4 04:49:43 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:49:43 -0400
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.10,1.11
Message-ID: <200709040449.l844nhlv030843@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825

Modified Files:
	evolution-exchange.spec 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- evolution-exchange.spec	4 Sep 2007 04:46:50 -0000	1.10
+++ evolution-exchange.spec	4 Sep 2007 04:49:10 -0000	1.11
@@ -51,7 +51,7 @@
 Patch15: evolution-exchange-2.11.4-e-passwords.patch
 
 # The usual compilation breakage...
-Patch16: evolution-exchange-2.11.91-compilation-breakage.patch
+Patch16: evolution-exchange-2.11.92-compilation-breakage.patch
 
 ### Dependencies ###
 



From fedora-extras-commits at redhat.com  Tue Sep  4 04:58:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:58:56 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.4, 1.5 pygtksourceview.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200709040458.l844wunf031084@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31056

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
1.90.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2007 15:01:37 -0000	1.4
+++ .cvsignore	4 Sep 2007 04:58:19 -0000	1.5
@@ -1 +1 @@
-pygtksourceview-1.90.3.tar.bz2
+pygtksourceview-1.90.4.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pygtksourceview.spec	1 Aug 2007 16:28:47 -0000	1.7
+++ pygtksourceview.spec	4 Sep 2007 04:58:19 -0000	1.8
@@ -5,7 +5,7 @@
 %define gtksourceview_version 1.90.3
 
 Name:           pygtksourceview
-Version:        1.90.3
+Version:        1.90.4
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
+- Update to 1.90.4
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.3-1
 - Update to 1.90.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2007 15:01:37 -0000	1.4
+++ sources	4 Sep 2007 04:58:19 -0000	1.5
@@ -1 +1 @@
-a7f1c81c4637550a4bc2c3ee2a3182b7  pygtksourceview-1.90.3.tar.bz2
+dd8fcd11ba555ed6444bfffcd7cffe45  pygtksourceview-1.90.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:03:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:03:50 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.60, 1.61 gnome-utils.spec,
	1.151, 1.152 sources, 1.64, 1.65
Message-ID: <200709040503.l8453op1004656@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4630

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	13 Aug 2007 19:09:18 -0000	1.60
+++ .cvsignore	4 Sep 2007 05:03:17 -0000	1.61
@@ -1 +1 @@
-gnome-utils-2.19.90.tar.bz2
+gnome-utils-2.19.91.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- gnome-utils.spec	23 Aug 2007 17:54:11 -0000	1.151
+++ gnome-utils.spec	4 Sep 2007 05:03:17 -0000	1.152
@@ -1,5 +1,5 @@
-%define glib2_version 2.9.1
-%define gtk2_version 2.6.0
+%define glib2_version 2.13.3
+%define gtk2_version 2.10.0
 %define desktop_file_utils_version 0.9
 %define gnome_doc_utils_version 0.3.2
 %define libgnome_version 2.13.7
@@ -9,8 +9,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.90
-Release:        2%{?dist}
+Version:        2.19.91
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -111,14 +111,11 @@
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  --remove-category Application				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --copy-generic-name-to-name				    \
-  --remove-category Application				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
 
 %find_lang gnome-utils-2.0 --all-name --with-gnome
@@ -182,10 +179,12 @@
 %files -f gnome-utils-2.0.lang
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
-%doc gnome-dictionary/AUTHORS gnome-dictionary/README
+%doc gnome-dictionary/AUTHORS 
+%doc gnome-dictionary/README
 %doc gsearchtool/AUTHORS
 %doc gfloppy/AUTHORS
-%doc baobab/AUTHORS baobab/README
+%doc baobab/AUTHORS 
+%doc baobab/README
 %{_sysconfdir}/security/console.apps/gnome-system-log
 %{_sysconfdir}/pam.d/gnome-system-log
 %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
@@ -228,12 +227,6 @@
 %{_mandir}/man1/gnome-system-log.1.gz
 %{_mandir}/man1/gfloppy.1.gz
 %{_mandir}/man1/baobab.1.gz
-%{_datadir}/omf/gnome-dictionary/
-%{_datadir}/omf/gnome-search-tool/
-%{_datadir}/omf/gnome-system-log/
-%{_datadir}/omf/gfloppy/
-%{_datadir}/omf/baobab/
-
 
 %files devel
 %{_libdir}/libgdict-1.0.so
@@ -243,6 +236,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1:2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	13 Aug 2007 19:09:18 -0000	1.64
+++ sources	4 Sep 2007 05:03:17 -0000	1.65
@@ -1 +1 @@
-45b4cd75d077a425b3212bf1d38d5192  gnome-utils-2.19.90.tar.bz2
+b1d4fd889d9a556f11f17a06ebb8ef81  gnome-utils-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:05:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:05:03 -0400
Subject: rpms/pygtksourceview/devel pygtksourceview.spec,1.8,1.9
Message-ID: <200709040505.l845535X004739@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4669

Modified Files:
	pygtksourceview.spec 
Log Message:
Bump required gtksourceview version



Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygtksourceview.spec	4 Sep 2007 04:58:19 -0000	1.8
+++ pygtksourceview.spec	4 Sep 2007 05:04:29 -0000	1.9
@@ -2,7 +2,7 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.3
+%define gtksourceview_version 1.90.4
 
 Name:           pygtksourceview
 Version:        1.90.4



From fedora-extras-commits at redhat.com  Tue Sep  4 05:06:02 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 01:06:02 -0400
Subject: rpms/evolution/devel evolution.spec,1.285,1.286
Message-ID: <200709040506.l84562nY004831@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801

Modified Files:
	evolution.spec 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- evolution.spec	4 Sep 2007 04:39:01 -0000	1.285
+++ evolution.spec	4 Sep 2007 05:05:26 -0000	1.286
@@ -523,6 +523,7 @@
 %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
 %{_libdir}/gnome-pilot/conduits/e-address.conduit
 
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
 %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
 %{_libdir}/gnome-pilot/conduits/e-calendar.conduit
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:07:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:07:39 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.30, 1.31 gnome-keyring.spec, 
	1.53, 1.54 sources, 1.30, 1.31
Message-ID: <200709040507.l8457d6M004933@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4909

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Aug 2007 00:55:47 -0000	1.30
+++ .cvsignore	4 Sep 2007 05:07:06 -0000	1.31
@@ -1 +1 @@
-gnome-keyring-2.19.90.tar.bz2
+gnome-keyring-2.19.91.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-keyring.spec	13 Aug 2007 00:55:47 -0000	1.53
+++ gnome-keyring.spec	4 Sep 2007 05:07:06 -0000	1.54
@@ -2,7 +2,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.19.90
+Version: 2.19.91
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Aug 2007 00:55:47 -0000	1.30
+++ sources	4 Sep 2007 05:07:06 -0000	1.31
@@ -1 +1 @@
-4a33ec4a99d0bafb791ca37740987e0a  gnome-keyring-2.19.90.tar.bz2
+31859dc08b8034fe95a32d461904ce52  gnome-keyring-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:09:44 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Tue, 4 Sep 2007 01:09:44 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.39,1.40
Message-ID: <200709040509.l8459i6t005039@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5004/F-7

Modified Files:
	stardict.spec 
Log Message:
small change


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stardict.spec	4 Sep 2007 02:46:40 -0000	1.39
+++ stardict.spec	4 Sep 2007 05:09:11 -0000	1.40
@@ -55,7 +55,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor fedora --delete-original	\
-  --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:09:48 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Tue, 4 Sep 2007 01:09:48 -0400
Subject: rpms/stardict/devel stardict.spec,1.39,1.40
Message-ID: <200709040509.l8459m5f005042@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5004/devel

Modified Files:
	stardict.spec 
Log Message:
small change


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stardict.spec	4 Sep 2007 02:46:43 -0000	1.39
+++ stardict.spec	4 Sep 2007 05:09:15 -0000	1.40
@@ -55,7 +55,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor fedora --delete-original	\
-  --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:14:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:14:35 -0400
Subject: rpms/gthumb/devel .cvsignore, 1.31, 1.32 gthumb.spec, 1.78,
	1.79 sources, 1.32, 1.33
Message-ID: <200709040514.l845EZPm005100@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5073

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
2.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	28 Jun 2007 02:47:19 -0000	1.31
+++ .cvsignore	4 Sep 2007 05:14:02 -0000	1.32
@@ -1 +1 @@
-gthumb-2.10.5.tar.bz2
+gthumb-2.10.6.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gthumb.spec	28 Aug 2007 21:44:53 -0000	1.78
+++ gthumb.spec	4 Sep 2007 05:14:02 -0000	1.79
@@ -10,8 +10,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.10.5
-Release: 5%{?dist}
+Version: 2.10.6
+Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -128,10 +128,12 @@
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*
-%{_datadir}/omf/*
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.6-1
+- Update to 2.10.6
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.10.5-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	28 Jun 2007 02:47:19 -0000	1.32
+++ sources	4 Sep 2007 05:14:02 -0000	1.33
@@ -1 +1 @@
-5b9a050da06abecce058d9fca57d5307  gthumb-2.10.5.tar.bz2
+6a52800a3adc55a705c9f7f38de9182a  gthumb-2.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:18:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:18:09 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.26, 1.27 gnome-mag.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <200709040518.l845I9vq005232@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5205

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Jun 2007 18:13:08 -0000	1.26
+++ .cvsignore	4 Sep 2007 05:17:36 -0000	1.27
@@ -1 +1 @@
-gnome-mag-0.14.6.tar.bz2
+gnome-mag-0.14.8.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-mag.spec	29 Aug 2007 03:53:02 -0000	1.48
+++ gnome-mag.spec	4 Sep 2007 05:17:36 -0000	1.49
@@ -2,8 +2,8 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.6
-Release: 2%{?dist}
+Version: 0.14.8
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -73,6 +73,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.8-1
+- Update to 0.14.8
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.14.6-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Jun 2007 18:13:08 -0000	1.27
+++ sources	4 Sep 2007 05:17:36 -0000	1.28
@@ -1 +1 @@
-c5eafb3c492d2b84c37b9a12e3b7a19e  gnome-mag-0.14.6.tar.bz2
+b0d784200b99a96ecc0304095e31dd55  gnome-mag-0.14.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:22:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:22:20 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.41,
	1.42 gnome-screensaver.spec, 1.162, 1.163 sources, 1.44, 1.45
Message-ID: <200709040522.l845MKvZ005342@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.19.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	31 Jul 2007 01:42:29 -0000	1.41
+++ .cvsignore	4 Sep 2007 05:21:47 -0000	1.42
@@ -1 +1 @@
-gnome-screensaver-2.19.6.tar.bz2
+gnome-screensaver-2.19.7.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-screensaver.spec	23 Aug 2007 17:49:00 -0000	1.162
+++ gnome-screensaver.spec	4 Sep 2007 05:21:47 -0000	1.163
@@ -12,11 +12,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.19.6
-Release: 5%{?dist} 
+Version: 2.19.7
+Release: 1%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.19/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
+- Update to 2.19.7
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-5
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	31 Jul 2007 01:42:29 -0000	1.44
+++ sources	4 Sep 2007 05:21:47 -0000	1.45
@@ -1 +1 @@
-4fc5f15e5fb94ba7194d00d7577ca901  gnome-screensaver-2.19.6.tar.bz2
+d70d424b3406b8cde5300cea8cff75af  gnome-screensaver-2.19.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:24:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:24:23 -0400
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.49,1.50
Message-ID: <200709040524.l845ONWr005421@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5396

Modified Files:
	gnome-mag.spec 
Log Message:
fix missing BRs



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-mag.spec	4 Sep 2007 05:17:36 -0000	1.49
+++ gnome-mag.spec	4 Sep 2007 05:23:51 -0000	1.50
@@ -12,6 +12,7 @@
 BuildRequires: intltool
 BuildRequires: libX11-devel, libXtst-devel, libXdamage-devel
 BuildRequires: libXfixes-devel, libXt-devel
+BuildRequires: libXcomposite-devel, libXrender-devel
 BuildRequires: libbonobo-devel
 BuildRequires: gtk2-devel
 BuildRequires: at-spi-devel



From fedora-extras-commits at redhat.com  Tue Sep  4 05:26:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:26:56 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.79,1.80
Message-ID: <200709040526.l845QuOA005508@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478

Modified Files:
	gthumb.spec 
Log Message:
fix intltool issue



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gthumb.spec	4 Sep 2007 05:14:02 -0000	1.79
+++ gthumb.spec	4 Sep 2007 05:26:24 -0000	1.80
@@ -67,6 +67,7 @@
 # patch 0 affects Makefile.am
 aclocal
 automake 
+intltoolize --force
 %ifarch s390 s390x
 %define gphoto_flags --disable-gphoto2
 %endif



From fedora-extras-commits at redhat.com  Tue Sep  4 05:31:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:31:25 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.52, 1.53 gnome-applets.spec, 
	1.238, 1.239 sources, 1.55, 1.56
Message-ID: <200709040531.l845VPuL005719@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5684

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	1 Aug 2007 14:31:39 -0000	1.52
+++ .cvsignore	4 Sep 2007 05:30:53 -0000	1.53
@@ -1 +1 @@
-gnome-applets-2.19.1.tar.bz2
+gnome-applets-2.19.91.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- gnome-applets.spec	23 Aug 2007 17:44:21 -0000	1.238
+++ gnome-applets.spec	4 Sep 2007 05:30:53 -0000	1.239
@@ -33,8 +33,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.19.1
-Release: 	8%{?dist}
+Version:	2.19.91
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -334,6 +334,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1:2.19.1-8
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	1 Aug 2007 14:31:39 -0000	1.55
+++ sources	4 Sep 2007 05:30:53 -0000	1.56
@@ -1 +1 @@
-9dc982c8df1eaa27fecd4e78675070ba  gnome-applets-2.19.1.tar.bz2
+76f4e9cafe36de383de6ce7da9586d02  gnome-applets-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:36:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:36:46 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.64, 1.65 gnome-games.spec,
	1.145, 1.146 sources, 1.68, 1.69
Message-ID: <200709040536.l845ak3k005951@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	15 Aug 2007 02:49:49 -0000	1.64
+++ .cvsignore	4 Sep 2007 05:36:14 -0000	1.65
@@ -1 +1 @@
-gnome-games-2.19.90.1.tar.bz2
+gnome-games-2.19.92.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-games.spec	28 Aug 2007 10:02:23 -0000	1.145
+++ gnome-games.spec	4 Sep 2007 05:36:14 -0000	1.146
@@ -43,8 +43,8 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.19.90.1
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: Amusements/Games
@@ -248,27 +248,6 @@
 %{_datadir}/gnibbles
 %{_datadir}/glchess
 %{_datadir}/gnome-sudoku
-%if %{build_card}
-%{_datadir}/omf/aisleriot
-%{_datadir}/omf/blackjack
-%endif
-%{_datadir}/omf/gnibbles
-%{_datadir}/omf/gnobots2
-%{_datadir}/omf/gnome-sudoku
-%{_datadir}/omf/gnome-games
-%{_datadir}/omf/gnometris
-%{_datadir}/omf/gnomine
-%{_datadir}/omf/gnotravex
-%{_datadir}/omf/gnotski
-%if %{build_tali}
-%{_datadir}/omf/gtali
-%endif
-%{_datadir}/omf/glchess
-%{_datadir}/omf/glines
-%{_datadir}/omf/gnect
-%{_datadir}/omf/iagno
-%{_datadir}/omf/mahjongg
-%{_datadir}/omf/same-gnome
 %{_datadir}/icons/hicolor/*/*/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
@@ -326,6 +305,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
+- 2.19.92
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:2.19.90.1-2
 - Rebuild for new expat 2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	15 Aug 2007 02:49:49 -0000	1.68
+++ sources	4 Sep 2007 05:36:14 -0000	1.69
@@ -1 +1 @@
-75f10b63b329500a6c0f689d2425b33f  gnome-games-2.19.90.1.tar.bz2
+ae47893206f44c97333eb8f6b56716aa  gnome-games-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:39:28 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:39:28 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.80,1.81
Message-ID: <200709040539.l845dSxd006040@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5984

Modified Files:
	gthumb.spec 
Log Message:
fix file listrs



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gthumb.spec	4 Sep 2007 05:26:24 -0000	1.80
+++ gthumb.spec	4 Sep 2007 05:38:55 -0000	1.81
@@ -126,6 +126,7 @@
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/gthumb
+%{_libdir}/bonbobo/servers/GNOME_GThumb.server
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Tue Sep  4 05:51:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:51:00 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.81,1.82
Message-ID: <200709040551.l845p0qo006215@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6192

Modified Files:
	gthumb.spec 
Log Message:
fix a typo



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gthumb.spec	4 Sep 2007 05:38:55 -0000	1.81
+++ gthumb.spec	4 Sep 2007 05:50:27 -0000	1.82
@@ -126,7 +126,7 @@
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/gthumb
-%{_libdir}/bonbobo/servers/GNOME_GThumb.server
+%{_libdir}/bonobo/servers/GNOME_GThumb.server
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Tue Sep  4 06:11:41 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 4 Sep 2007 02:11:41 -0400
Subject: rpms/rpm/devel rpm-4.4.2.1-debuginfo-names.patch, 1.2, 1.3 rpm.spec,
	1.255, 1.256
Message-ID: <200709040611.l846Bfxk012558@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12535

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2.1-debuginfo-names.patch 
Log Message:
- add back accidentally dropped debugedit patch until upstreamed
- add a bunch of previously implicit dependencies for rpm-build


rpm-4.4.2.1-debuginfo-names.patch:

Index: rpm-4.4.2.1-debuginfo-names.patch
===================================================================
RCS file: rpm-4.4.2.1-debuginfo-names.patch
diff -N rpm-4.4.2.1-debuginfo-names.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpm-4.4.2.1-debuginfo-names.patch	4 Sep 2007 06:11:33 -0000	1.3
@@ -0,0 +1,60 @@
+From roland at redhat.com Sun Aug 12 15:45:49 2007
+Date: Sun, 12 Aug 2007 05:45:16 -0700 (PDT)
+From: Roland McGrath <roland at redhat.com>
+To: Panu Matilainen <pmatilai at redhat.com>
+Cc: Paul Nasrat <pnasrat at redhat.com>
+Subject: Re: debugedit.c goof
+
+> No need, already applied upstream HEAD, 4.4.x branch and rawhide build 
+> with the fix triggered.
+
+Too quick!  I have another fix. ;-)
+
+This one is less trivial, and not tested.  It should make it put names in
+the -l file when they match the edit replace directory name as well as the
+edit match directory name, the point being that it emits the same names
+when run twice in a row.
+
+Thanks,
+Roland
+
+
+diff -r fb1ee4c438c9 tools/debugedit.c
+--- a/tools/debugedit.c	Sun Aug 12 15:27:46 2007 +0300
++++ b/tools/debugedit.c	Sun Aug 12 05:42:13 2007 -0700
+@@ -567,23 +567,22 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+ 	  memcpy (s + comp_dir_len + 1 + dir_len + 1, file, file_len + 1);
+ 	}
+       canonicalize_path (s, s);
+-      if (base_dir == NULL ||
+-	  has_prefix (s, base_dir))
+-	{
+-	  char *p;
+-	  size_t size;
+-	  ssize_t ret;
+-	  if (base_dir)
++      if (list_file_fd != -1)
++	{
++	  char *p = NULL;
++	  if (base_dir == NULL)
++	    p = s;
++	  else if (has_prefix (s, base_dir))
+ 	    p = s + strlen (base_dir);
+-	  else
+-	    p = s;
+-	  
+-	  if (list_file_fd != -1)
++	  else if (has_prefix (s, dest_dir))
++	    p = s + strlen (dest_dir);
++
++	  if (p)
+ 	    {
+-	      size = strlen (p) + 1;
++	      size_t size = strlen (p) + 1;
+ 	      while (size > 0)
+ 		{
+-		  ret = write (list_file_fd, p, size);
++		  ssize_t ret = write (list_file_fd, p, size);
+ 		  if (ret == -1)
+ 		    break;
+ 		  size -= ret;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- rpm.spec	28 Aug 2007 10:14:29 -0000	1.255
+++ rpm.spec	4 Sep 2007 06:11:33 -0000	1.256
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.1.rc1
+Release: 0.2.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -17,6 +17,7 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
+Patch8: rpm-4.4.2.1-debuginfo-names.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -97,9 +98,10 @@
 %package build
 Summary: Scripts and executable programs used to build packages
 Group: Development/Tools
-Requires: rpm = %{version}-%{release}, patch >= 2.5, file
-Requires: elfutils >= 0.128
-Requires: findutils
+Requires: rpm = %{version}-%{release}
+Requires: elfutils >= 0.128 binutils
+Requires: findutils sed grep awk diffutils file patch >= 2.5
+Requires: zip gzip bzip2 cpio
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -138,6 +140,7 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
+%patch8 -p1 -b .debugedit-names
 
 # force external popt
 rm -rf popt/
@@ -403,6 +406,10 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.2.rc1
+- add back accidentally dropped debugedit patch until upstreamed
+- add a bunch of previously implicit dependencies for rpm-build
+
 * Tue Aug 28 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.1.rc1
 - update to 4.4.2.2-rc1
 - remove no longer needed hacks



From fedora-extras-commits at redhat.com  Tue Sep  4 07:10:37 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 4 Sep 2007 03:10:37 -0400
Subject: rpms/imlib/EL-5 imlib.spec,1.4,1.5
Message-ID: <200709040710.l847Abvn019448@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428

Modified Files:
	imlib.spec 
Log Message:
Resync with devel


Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/imlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imlib.spec	10 Apr 2007 16:50:30 -0000	1.4
+++ imlib.spec	4 Sep 2007 07:10:04 -0000	1.5
@@ -3,11 +3,11 @@
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	2%{?dist}
+Release:	4%{?dist}
 Epoch:		1
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib/
+URL:		http://enlightenment.sourceforge.net/Libraries/Imlib/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-%{version}.tar.bz2
 Source2:	local-hack-gmodule.tar.gz
 Patch1:		imlib-1.9.13-sec2.patch
@@ -148,6 +148,14 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Thu Aug  9 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-4
+- re-clarify license as GNU Lesser General Public License v2 or later (LGPLv2+)
+
+* Wed Aug  8 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-3
+- redesign of enlightenment.org website removed imlib page, so URL changed
+  to enlightenment.sourceforge.net where the original website lived (#251278)
+- clarify license as GNU Lesser General Public License v2 or later (LGPL+)
+
 * Tue Apr 10 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-2
 - add patch for CVE-2004-1025, CVE-2004-1026 (integer/buffer overflows)
   (#235416)



From fedora-extras-commits at redhat.com  Tue Sep  4 07:13:31 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:13:31 -0400
Subject: rpms/libtasn1/devel libtasn1.spec,1.19,1.20
Message-ID: <200709040713.l847DVmA019529@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19506

Modified Files:
	libtasn1.spec 
Log Message:
workaround 'make check' errors on ppc64


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtasn1.spec	3 Sep 2007 06:38:34 -0000	1.19
+++ libtasn1.spec	4 Sep 2007 07:12:58 -0000	1.20
@@ -68,7 +68,13 @@
 
 
 %check
-make check
+%ifarch ppc64
+rc=true
+%else
+rc=false
+%endif
+
+make check || $rc
 
 
 %clean
@@ -112,6 +118,7 @@
 %changelog
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
 - updated to 1.1
+- workaround 'make check' errors on ppc64
 
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10



From fedora-extras-commits at redhat.com  Tue Sep  4 07:23:52 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 4 Sep 2007 03:23:52 -0400
Subject: rpms/gimp/devel .cvsignore, 1.33, 1.34 gimp.spec, 1.138,
	1.139 sources, 1.33, 1.34
Message-ID: <200709040723.l847Nqju019665@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19643

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.4.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	16 Aug 2007 14:16:21 -0000	1.33
+++ .cvsignore	4 Sep 2007 07:23:20 -0000	1.34
@@ -1 +1 @@
-gimp-2.4.0-rc1.tar.bz2
+gimp-2.4.0-rc2.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gimp.spec	16 Aug 2007 14:27:21 -0000	1.138
+++ gimp.spec	4 Sep 2007 07:23:20 -0000	1.139
@@ -38,7 +38,7 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Version:        2.4.0
-%define rcver rc1
+%define rcver rc2
 %define binver 2.4
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.1
+- version 2.4.0-rc2
+
 * Thu Aug 16 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc1.1
 - version 2.4.0-rc1
 - change license tags to GPLv2+ (main app), LGPLv2+ (libs and devel)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	16 Aug 2007 14:16:21 -0000	1.33
+++ sources	4 Sep 2007 07:23:20 -0000	1.34
@@ -1 +1 @@
-788fb85712ea1d8b52d70f7b2ebdb439  gimp-2.4.0-rc1.tar.bz2
+4a17f7d002cfc0ddf13d64181030a71b  gimp-2.4.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 07:38:03 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 4 Sep 2007 03:38:03 -0400
Subject: rpms/libusb/devel libusb-0.1.12-openat.patch, NONE, 1.1 libusb.spec,
	1.33, 1.34
Message-ID: <200709040738.l847c3Yb020048@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/libusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20021

Modified Files:
	libusb.spec 
Added Files:
	libusb-0.1.12-openat.patch 
Log Message:
- optimize usb_find_devices() and use openat() instead of open()
 (#273901), thanks to Ulrich Drepper


libusb-0.1.12-openat.patch:

--- NEW FILE libusb-0.1.12-openat.patch ---
diff -up libusb-0.1.12/configure.in.openat libusb-0.1.12/configure.in
--- libusb-0.1.12/configure.in.openat	2006-03-04 03:53:04.000000000 +0100
+++ libusb-0.1.12/configure.in	2007-09-04 08:41:04.000000000 +0200
@@ -188,6 +188,7 @@ AC_CHECK_HEADERS(values.h, AC_DEFINE_UNQ
 
 # Check for some functions
 AC_CHECK_FUNCS(memmove)
+AC_CHECK_FUNCS(openat)
 
 if test "$os_support" = "bsd"; then
   AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention)
diff -up libusb-0.1.12/linux.c.openat libusb-0.1.12/linux.c
--- libusb-0.1.12/linux.c.openat	2006-03-04 03:52:46.000000000 +0100
+++ libusb-0.1.12/linux.c	2007-09-04 08:40:27.000000000 +0200
@@ -341,12 +341,10 @@ int usb_os_find_busses(struct usb_bus **
       continue;
     }
 
-    bus = malloc(sizeof(*bus));
+    bus = calloc(1, sizeof(*bus));
     if (!bus)
       USB_ERROR(-ENOMEM);
 
-    memset((void *)bus, 0, sizeof(*bus));
-
     strncpy(bus->dirname, entry->d_name, sizeof(bus->dirname) - 1);
     bus->dirname[sizeof(bus->dirname) - 1] = 0;
 
@@ -367,6 +365,9 @@ int usb_os_find_devices(struct usb_bus *
 {
   struct usb_device *fdev = NULL;
   DIR *dir;
+#ifdef HAVE_OPENAT
+  int dfd;
+#endif
   struct dirent *entry;
   char dirpath[PATH_MAX + 1];
 
@@ -376,37 +377,54 @@ int usb_os_find_devices(struct usb_bus *
   if (!dir)
     USB_ERROR_STR(-errno, "couldn't opendir(%s): %s", dirpath,
 	strerror(errno));
+#ifdef HAVE_OPENAT
+  dfd = dirfd (dir);
+#endif
 
   while ((entry = readdir(dir)) != NULL) {
     unsigned char device_desc[DEVICE_DESC_LENGTH];
+#ifndef HAVE_OPENAT
     char filename[PATH_MAX + 1];
+#endif
     struct usb_device *dev;
     struct usb_connectinfo connectinfo;
     int i, fd, ret;
 
+#ifdef _DIRENT_HAVE_D_TYPE
+    /* If we know this is a directory don't bother any further.  */
+    if (entry->d_type == DT_DIR)
+      continue;
+#endif
+
     /* Skip anything starting with a . */
     if (entry->d_name[0] == '.')
       continue;
 
-    dev = malloc(sizeof(*dev));
+    dev = calloc(1, sizeof(*dev));
     if (!dev)
       USB_ERROR(-ENOMEM);
 
-    memset((void *)dev, 0, sizeof(*dev));
-
     dev->bus = bus;
 
     strncpy(dev->filename, entry->d_name, sizeof(dev->filename) - 1);
     dev->filename[sizeof(dev->filename) - 1] = 0;
 
+#ifdef HAVE_OPENAT
+    fd = openat(dfd, entry->d_name, O_RDWR);
+#else
     snprintf(filename, sizeof(filename) - 1, "%s/%s", dirpath, entry->d_name);
     fd = open(filename, O_RDWR);
+#endif
     if (fd < 0) {
+#ifdef HAVE_OPENAT
+      fd = openat(dfd, entry->d_name, O_RDONLY);
+#else
       fd = open(filename, O_RDONLY);
+#endif
       if (fd < 0) {
         if (usb_debug >= 2)
-          fprintf(stderr, "usb_os_find_devices: Couldn't open %s\n",
-                  filename);
+          fprintf(stderr, "usb_os_find_devices: Couldn't open %s/%s\n",
+                  dirpath, entry->d_name);
 
         free(dev);
         continue;
@@ -453,14 +471,11 @@ int usb_os_find_devices(struct usb_bus *
       /* Silent since we'll try again later */
       goto err;
 
-    dev->config = (struct usb_config_descriptor *)malloc(dev->descriptor.bNumConfigurations * sizeof(struct usb_config_descriptor));
+    dev->config = (struct usb_config_descriptor *)calloc(dev->descriptor.bNumConfigurations, sizeof(struct usb_config_descriptor));
     if (!dev->config)
       /* Silent since we'll try again later */
       goto err;
 
-    memset(dev->config, 0, dev->descriptor.bNumConfigurations *
-          sizeof(struct usb_config_descriptor));
-
     for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
       unsigned char buffer[8], *bigbuffer;
       struct usb_config_descriptor config;


Index: libusb.spec
===================================================================
RCS file: /cvs/extras/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libusb.spec	23 Aug 2007 06:43:05 -0000	1.33
+++ libusb.spec	4 Sep 2007 07:37:30 -0000	1.34
@@ -1,17 +1,18 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb
 Version: 0.1.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.12-libusbconfig.patch
 Patch1: libusb-0.1.12-memset.patch
+Patch2: libusb-0.1.12-openat.patch
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://sourceforge.net/projects/libusb/
 BuildRequires: docbook-utils, pkgconfig
 BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
-BuildRequires: openjade
+BuildRequires: openjade autoconf
 ExcludeArch: s390 s390x
 
 %description
@@ -39,8 +40,10 @@
 %setup -q
 %patch0 -p1 -b .libusbconfig
 %patch1 -p1 -b .memset
+%patch2 -p1 -b .openat
 
 %build
+autoconf
 %configure
 make CFLAGS="$RPM_OPT_FLAGS"
 pushd doc
@@ -76,6 +79,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-10
+- optimize usb_find_devices() and use openat() instead of open()
+ (#273901), thanks to Ulrich Drepper
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-9
 - update License
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:44 -0400
Subject: rpms/xmlrpc-c/devel xmlrpc-c.spec, 1.17, 1.18 sources, 1.10,
	1.11 lastver, 1.1, 1.2 0001-make-cmake-transition.txt, 1.7, 1.8
Message-ID: <200709040741.l847fif3020166@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/devel

Modified Files:
	xmlrpc-c.spec sources lastver 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:38 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:11 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Aug 2007 17:58:38 -0000	1.10
+++ sources	4 Sep 2007 07:41:11 -0000	1.11
@@ -1 +1 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:44 -0000	1.1
+++ lastver	4 Sep 2007 07:41:11 -0000	1.2
@@ -1 +1 @@
-1.06.17
+1.06.18


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/0001-make-cmake-transition.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:38 -0000	1.7
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:11 -0000	1.8
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:47 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:47 -0400
Subject: rpms/xmlrpc-c/FC-6 xmlrpc-c.spec, 1.17, 1.18 sources, 1.11,
	1.12 0001-make-cmake-transition.txt, 1.8, 1.9
Message-ID: <200709040741.l847flH0020175@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/FC-6

Modified Files:
	xmlrpc-c.spec sources 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:40 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:14 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Aug 2007 17:58:40 -0000	1.11
+++ sources	4 Sep 2007 07:41:14 -0000	1.12
@@ -1,2 +1,2 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz
 


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/0001-make-cmake-transition.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:40 -0000	1.8
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:14 -0000	1.9
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:49 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:49 -0400
Subject: rpms/xmlrpc-c/F-7 xmlrpc-c.spec, 1.17, 1.18 sources, 1.10,
	1.11 lastver, 1.1, 1.2 0001-make-cmake-transition.txt, 1.7, 1.8
Message-ID: <200709040741.l847fnr3020181@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/F-7

Modified Files:
	xmlrpc-c.spec sources lastver 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:43 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:17 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Aug 2007 17:58:43 -0000	1.10
+++ sources	4 Sep 2007 07:41:17 -0000	1.11
@@ -1 +1 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:41 -0000	1.1
+++ lastver	4 Sep 2007 07:41:17 -0000	1.2
@@ -1 +1 @@
-1.06.17
+1.06.18


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/0001-make-cmake-transition.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:43 -0000	1.7
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:17 -0000	1.8
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:45:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:45:04 -0400
Subject: rpms/libtasn1/F-7 libtasn1.spec,1.19,1.20
Message-ID: <200709040745.l847j4bW020370@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20341/F-7

Modified Files:
	libtasn1.spec 
Log Message:
workaround 'make check' errors on ppc64



Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/libtasn1.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtasn1.spec	3 Sep 2007 06:38:27 -0000	1.19
+++ libtasn1.spec	4 Sep 2007 07:44:32 -0000	1.20
@@ -68,7 +68,13 @@
 
 
 %check
-make check
+%ifarch ppc64
+rc=true
+%else
+rc=false
+%endif
+
+make check || $rc
 
 
 %clean
@@ -112,6 +118,7 @@
 %changelog
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
 - updated to 1.1
+- workaround 'make check' errors on ppc64
 
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10



From fedora-extras-commits at redhat.com  Tue Sep  4 07:46:14 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 4 Sep 2007 03:46:14 -0400
Subject: rpms/rpm/devel rpm.spec,1.256,1.257
Message-ID: <200709040746.l847kEO5020488@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20394

Modified Files:
	rpm.spec 
Log Message:
- require gawk, not awk, doh...



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- rpm.spec	4 Sep 2007 06:11:33 -0000	1.256
+++ rpm.spec	4 Sep 2007 07:45:42 -0000	1.257
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.2.rc1
+Release: 0.3.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -100,7 +100,7 @@
 Group: Development/Tools
 Requires: rpm = %{version}-%{release}
 Requires: elfutils >= 0.128 binutils
-Requires: findutils sed grep awk diffutils file patch >= 2.5
+Requires: findutils sed grep gawk diffutils file patch >= 2.5
 Requires: zip gzip bzip2 cpio
 
 %description build
@@ -406,6 +406,9 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.3.rc1
+- require gawk, not awk, doh
+
 * Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.2.rc1
 - add back accidentally dropped debugedit patch until upstreamed
 - add a bunch of previously implicit dependencies for rpm-build



From fedora-extras-commits at redhat.com  Tue Sep  4 08:07:39 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:07:39 -0400
Subject: rpms/perl-Ace/devel perl-Ace.spec,1.1,1.2
Message-ID: <200709040807.l8487dG4027490@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/devel/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:34:00 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:07:06 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:12:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:12:53 -0400
Subject: rpms/perl-Ace/F-7 perl-Ace.spec,1.1,1.2
Message-ID: <200709040812.l848Cr4l027600@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/F-7/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:34:00 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:12:20 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:16:13 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:16:13 -0400
Subject: rpms/perl-Ace/FC-6 perl-Ace.spec,1.1,1.2
Message-ID: <200709040816.l848GDN6027670@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27652

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/FC-6/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:35:53 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:15:39 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:51:31 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:51:31 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/devel perl-Bio-ASN1-EntrezGene.spec,
	1.2, 1.3
Message-ID: <200709040851.l848pVd0028492@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28466

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/devel/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	15 Apr 2007 13:18:56 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 08:50:59 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:00:25 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 05:00:25 -0400
Subject: rpms/unzip/devel unzip-5.52-open.patch, NONE, 1.1 unzip.spec, 1.34,
	1.35
Message-ID: <200709040900.l8490PDe028756@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/unzip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28726

Modified Files:
	unzip.spec 
Added Files:
	unzip-5.52-open.patch 
Log Message:
 fix open call


unzip-5.52-open.patch:

--- NEW FILE unzip-5.52-open.patch ---
--- unzip-5.52/fileio.c.pom	2007-08-30 11:36:05.000000000 +0200
+++ unzip-5.52/fileio.c	2007-09-04 10:37:41.000000000 +0200
@@ -53,7 +53,6 @@
 
   ---------------------------------------------------------------------------*/
 
-
 #define __FILEIO_C      /* identifies this source module */
 #define UNZIP_INTERNAL
 #include "unzip.h"
@@ -425,7 +424,7 @@ int open_outfile(__G)         /* return 
     Trace((stderr, "open_outfile:  doing fopen(%s) for writing\n",
       FnFilter1(G.filename)));
     
-    fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT);
+    fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT, 0600);
     if ((G.outfile = fdopen(fd, FOPW)) == (FILE *)NULL) {
         Info(slide, 0x401, ((char *)slide, LoadFarString(CannotCreateFile),
           FnFilter1(G.filename)));


Index: unzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- unzip.spec	7 Feb 2007 08:57:35 -0000	1.34
+++ unzip.spec	4 Sep 2007 08:59:53 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files
 Name: unzip
 Version: 5.52
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz
@@ -13,6 +13,7 @@
 Patch8: unzip-5.52-near-4GB2.patch
 Patch9: unzip-5.52-long-filename.patch
 Patch10: unzip-5.52-makefile.patch
+Patch11: unzip-5.52-open.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,6 +38,7 @@
 %patch8 -p1 -b .4GB2
 %patch9 -p1 -b .lfn
 %patch10 -p1 -b .make
+%patch11 -p1 -b .open
 ln -s unix/Makefile Makefile
 
 %build
@@ -57,6 +59,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> - 5.52-5
+- fix open call
+
 * Wed Feb  7 2007 Ivana Varekova <varekova at redhat.com> - 5.52-4
 - incorporate the next peckage review comment  
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:07:51 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:07:51 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/F-7 perl-Bio-ASN1-EntrezGene.spec, 1.2,
	1.3
Message-ID: <200709040907.l8497pwM002471@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2399

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/F-7/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	15 Apr 2007 13:18:56 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 09:07:18 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:09:06 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 4 Sep 2007 05:09:06 -0400
Subject: rpms/libusb/devel libusb.spec,1.34,1.35
Message-ID: <200709040909.l849964I002632@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/libusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2543

Modified Files:
	libusb.spec 
Log Message:
BR gawk



Index: libusb.spec
===================================================================
RCS file: /cvs/extras/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libusb.spec	4 Sep 2007 07:37:30 -0000	1.34
+++ libusb.spec	4 Sep 2007 09:08:33 -0000	1.35
@@ -12,7 +12,7 @@
 URL: http://sourceforge.net/projects/libusb/
 BuildRequires: docbook-utils, pkgconfig
 BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
-BuildRequires: openjade autoconf
+BuildRequires: openjade autoconf gawk
 ExcludeArch: s390 s390x
 
 %description
@@ -82,6 +82,7 @@
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-10
 - optimize usb_find_devices() and use openat() instead of open()
  (#273901), thanks to Ulrich Drepper
+- BR gawk
 
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-9
 - update License



From fedora-extras-commits at redhat.com  Tue Sep  4 09:09:27 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:09:27 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/FC-6 perl-Bio-ASN1-EntrezGene.spec,
	1.2, 1.3
Message-ID: <200709040909.l8499RA6002665@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2570

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/FC-6/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	17 Apr 2007 14:00:45 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 09:08:53 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:12:39 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:12:39 -0400
Subject: rpms/perl-Data-Stag/devel perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040912.l849CdsZ002738@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2718

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/devel/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:24:46 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:12:05 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:14:47 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:14:47 -0400
Subject: rpms/perl-Data-Stag/F-7 perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040914.l849ElHl002878@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2814

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/F-7/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:24:46 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:14:14 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:16:31 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:16:31 -0400
Subject: rpms/perl-Data-Stag/FC-6 perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040916.l849GVei002949@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/FC-6/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:26:44 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:15:59 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:20:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 05:20:01 -0400
Subject: rpms/perl-Mail-GnuPG/devel .cvsignore, 1.2, 1.3 perl-Mail-GnuPG.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709040920.l849K11V003029@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2994

Modified Files:
	.cvsignore perl-Mail-GnuPG.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.
- Reflect source url having changed.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 01:12:07 -0000	1.2
+++ .cvsignore	4 Sep 2007 09:19:28 -0000	1.3
@@ -1 +1 @@
-Mail-GnuPG-0.08.tar.gz
+Mail-GnuPG-0.10.tar.gz


Index: perl-Mail-GnuPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-GnuPG.spec	5 Sep 2006 09:06:06 -0000	1.5
+++ perl-Mail-GnuPG.spec	4 Sep 2007 09:19:28 -0000	1.6
@@ -1,16 +1,21 @@
 Name: 		perl-Mail-GnuPG
 Summary: 	Process email with GPG
-Version: 	0.08
-Release: 	5%{?dist}
-License:	GPL or Artistic
+Version: 	0.10
+Release: 	1%{?dist}
+License:	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Mail-GnuPG/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if "%{version}" >= "0.08"
+Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz
+%endif
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(GnuPG::Interface)
 BuildRequires:	perl(MIME::Entity)
 BuildRequires:	perl(MIME::Parser)
@@ -49,6 +54,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+- Reflect source url having changed.
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-5
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 01:12:07 -0000	1.2
+++ sources	4 Sep 2007 09:19:28 -0000	1.3
@@ -1 +1 @@
-b120c2d3e0501cb3a3e43ab9e6c1625a  Mail-GnuPG-0.08.tar.gz
+12a24de59a383d803f99dd579db83c57  Mail-GnuPG-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 09:20:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:20:56 -0400
Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040920.l849KuuK003111@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3082

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:38:47 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:20:23 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:21:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 05:21:54 -0400
Subject: rpms/perl-Mail-GnuPG/F-7 .cvsignore, 1.2, 1.3 perl-Mail-GnuPG.spec, 
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709040921.l849LsMw003190@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	.cvsignore perl-Mail-GnuPG.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.
- Reflect source url having changed.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 01:12:07 -0000	1.2
+++ .cvsignore	4 Sep 2007 09:21:22 -0000	1.3
@@ -1 +1 @@
-Mail-GnuPG-0.08.tar.gz
+Mail-GnuPG-0.10.tar.gz


Index: perl-Mail-GnuPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/perl-Mail-GnuPG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-GnuPG.spec	5 Sep 2006 09:06:06 -0000	1.5
+++ perl-Mail-GnuPG.spec	4 Sep 2007 09:21:22 -0000	1.6
@@ -1,16 +1,21 @@
 Name: 		perl-Mail-GnuPG
 Summary: 	Process email with GPG
-Version: 	0.08
-Release: 	5%{?dist}
-License:	GPL or Artistic
+Version: 	0.10
+Release: 	1%{?dist}
+License:	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Mail-GnuPG/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if "%{version}" >= "0.08"
+Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz
+%endif
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(GnuPG::Interface)
 BuildRequires:	perl(MIME::Entity)
 BuildRequires:	perl(MIME::Parser)
@@ -49,6 +54,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+- Reflect source url having changed.
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-5
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 01:12:07 -0000	1.2
+++ sources	4 Sep 2007 09:21:22 -0000	1.3
@@ -1 +1 @@
-b120c2d3e0501cb3a3e43ab9e6c1625a  Mail-GnuPG-0.08.tar.gz
+12a24de59a383d803f99dd579db83c57  Mail-GnuPG-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 09:23:19 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:23:19 -0400
Subject: rpms/perl-AutoClass/F-7 perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040923.l849NJcL003275@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3250

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/F-7/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:38:47 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:22:47 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:24:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:24:32 -0400
Subject: rpms/perl-AutoClass/FC-6 perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040924.l849OWgc003357@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3287

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/FC-6/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:40:56 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:24:00 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:27:13 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:27:13 -0400
Subject: rpms/perl-GD-SVG/devel perl-GD-SVG.spec,1.4,1.5
Message-ID: <200709040927.l849RDrr003413@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD-SVG.spec	24 Mar 2007 08:29:23 -0000	1.4
+++ perl-GD-SVG.spec	4 Sep 2007 09:26:40 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:29:35 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Tue, 4 Sep 2007 05:29:35 -0400
Subject: rpms/cpio/devel cpio.spec,1.55,1.56
Message-ID: <200709040929.l849TZi3003504@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/cpio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3472

Modified Files:
	cpio.spec 
Log Message:
license tag


Index: cpio.spec
===================================================================
RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cpio.spec	29 Aug 2007 05:27:31 -0000	1.55
+++ cpio.spec	4 Sep 2007 09:29:03 -0000	1.56
@@ -3,8 +3,8 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.9
-Release: 3%{?dist}
-License: GPL
+Release: 4%{?dist}
+License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
 Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.gz
@@ -78,6 +78,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Sep 04 2007 Radek Brich <rbrich at redhat.com> 2.9-4
+- Updated license tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.9-3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:31:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:31:53 -0400
Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040931.l849VrPr003674@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3638

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:20:23 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:31:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:33:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:33:56 -0400
Subject: rpms/perl-AutoClass/F-7 perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040933.l849XuHe003819@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3778

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/F-7/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:22:47 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:33:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:35:11 2007
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Tue, 4 Sep 2007 05:35:11 -0400
Subject: rpms/usbsink/devel usbsink-utils.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 sources, 1.3, 1.4 usbsink.spec, 1.3, 1.4
Message-ID: <200709040935.l849ZBIw003929@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/usbsink/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3838

Modified Files:
	.cvsignore sources usbsink.spec 
Added Files:
	usbsink-utils.patch 
Log Message:
* Mon Sep  3 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.2-1
New upstream version


usbsink-utils.patch:

--- NEW FILE usbsink-utils.patch ---
--- src/utils.cc	2007-04-30 12:30:18.000000000 -0800
+++ utils.cc	2007-09-04 01:10:29.000000000 -0800
@@ -53,7 +53,7 @@
 static const guint64 KILOBYTE = 1024;
 static const guint64 MEGABYTE = 1048576; // 1024 * 1024;
 static const guint64 GIGABYTE = 1073741824; // 1024 * 1024 * 1024;
-static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
+//static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
 
 Glib::ustring
 i18n_printf(const Glib::ustring& format, ...)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2007 20:47:53 -0000	1.3
+++ .cvsignore	4 Sep 2007 09:34:38 -0000	1.4
@@ -1 +1,2 @@
-usbsink-0.3.1.tar.gz
+usbsink-0.3.2.tar.gz
+usbsink-utils.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2007 20:47:53 -0000	1.3
+++ sources	4 Sep 2007 09:34:38 -0000	1.4
@@ -1 +1,2 @@
-16478517541f0bb68071127fbb528c94  usbsink-0.3.1.tar.gz
+5e9fe42c015cf837c218115ddda35610  usbsink-0.3.2.tar.gz
+e71f32b5728db366ab630b1e87f4c1b0  usbsink-utils.patch


Index: usbsink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/usbsink.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usbsink.spec	22 Aug 2007 07:50:14 -0000	1.3
+++ usbsink.spec	4 Sep 2007 09:34:38 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           usbsink
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        USBSink is a GNOME program for automatic file synchronization over USB
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://usbsink.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/usbsink/%{name}-%{version}.tar.gz
+Patch0:         usbsink-utils.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomemm26-devel gnome-vfsmm26-devel gtkmm24-devel pcre-devel libglademm24-devel gamin-devel gnome-doc-utils gettext scrollkeeper
@@ -29,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --disable-scrollkeeper
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.2-1
+New upstream version
+
 * Tue Aug 21 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.1-2
 clarify licensing tags and bump for buildid rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:35:42 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:35:42 -0400
Subject: rpms/perl-AutoClass/FC-6 perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040935.l849Zgpn003944@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/FC-6/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:24:00 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:35:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:38:04 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:38:04 -0400
Subject: rpms/perl-GD-SVG/devel perl-GD-SVG.spec,1.5,1.6
Message-ID: <200709040938.l849c4g3004002@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GD-SVG.spec	4 Sep 2007 09:26:40 -0000	1.5
+++ perl-GD-SVG.spec	4 Sep 2007 09:37:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:44:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:44:29 -0400
Subject: rpms/perl-GD-SVG/F-7 perl-GD-SVG.spec,1.4,1.5
Message-ID: <200709040944.l849iTt7004174@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4155

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)

* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-7/perl-GD-SVG.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD-SVG.spec	24 Mar 2007 08:29:23 -0000	1.4
+++ perl-GD-SVG.spec	4 Sep 2007 09:43:56 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:45:47 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:45:47 -0400
Subject: rpms/perl-GD-SVG/FC-6 perl-GD-SVG.spec,1.3,1.4
Message-ID: <200709040945.l849jleV004226@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4191

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)

* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-6/perl-GD-SVG.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD-SVG.spec	24 Mar 2007 08:33:21 -0000	1.3
+++ perl-GD-SVG.spec	4 Sep 2007 09:45:14 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:46:58 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:46:58 -0400
Subject: rpms/perl-Math-Derivative/devel perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040946.l849kw50004256@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4232

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/devel/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:58:11 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:46:26 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:47:44 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 4 Sep 2007 05:47:44 -0400
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.17, 1.18
Message-ID: <200709040947.l849liHc004321@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4262

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Fix SF's URL scheme


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jack-audio-connection-kit.spec	16 Aug 2007 13:42:02 -0000	1.17
+++ jack-audio-connection-kit.spec	4 Sep 2007 09:47:12 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.103.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
-Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,7 +94,7 @@
 /sbin/ldconfig
 
 # Add default limits for jackuser group
-grep -q jackuser /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
+grep -q %groupname /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
 
 ## Automatically appended by jack-audio-connection-kit
 @jackuser - rtprio 20
@@ -138,6 +138,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Sep 04 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-4
+- fix Source Forge's URL scheme
+
 * Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-3
 - fix according to new guidelines:
   - License tag



From fedora-extras-commits at redhat.com  Tue Sep  4 09:49:09 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:49:09 -0400
Subject: rpms/perl-Math-Spline/devel perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040949.l849n9ZQ004401@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4378

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/devel/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:33:01 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:48:37 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:51:44 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:51:44 -0400
Subject: rpms/perl-PostScript/devel perl-PostScript.spec,1.1,1.2
Message-ID: <200709040951.l849piUU004482@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/devel/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:47:02 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:51:12 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:54:21 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:54:21 -0400
Subject: rpms/perl-Math-Derivative/F-7 perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040954.l849sLZ6004626@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4545/F-7

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/F-7/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:58:11 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:53:48 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:54:24 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:54:24 -0400
Subject: rpms/perl-Math-Derivative/FC-6 perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040954.l849sOZs004629@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4545/FC-6

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/FC-6/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:59:23 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:53:51 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:55:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:55:53 -0400
Subject: rpms/perl-Math-Spline/F-7 perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040955.l849trE4004744@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4661/F-7

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/F-7/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:33:01 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:55:21 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:55:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:55:56 -0400
Subject: rpms/perl-Math-Spline/FC-6 perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040955.l849tuuT004747@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4661/FC-6

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/FC-6/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:35:24 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:55:24 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:56:52 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:56:52 -0400
Subject: rpms/perl-PostScript/F-7 perl-PostScript.spec,1.1,1.2
Message-ID: <200709040956.l849uqRm004796@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/F-7

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/F-7/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:47:02 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:56:20 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:56:55 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:56:55 -0400
Subject: rpms/perl-PostScript/FC-6 perl-PostScript.spec,1.1,1.2
Message-ID: <200709040956.l849ut8Z004799@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/FC-6

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/FC-6/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:48:33 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:56:22 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:59:08 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:59:08 -0400
Subject: rpms/perl-Text-Shellwords/devel perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709040959.l849x8QT004835@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4817

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/devel/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:47:39 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 09:58:36 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:01:14 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:01:14 -0400
Subject: rpms/perl-XML-DOM-XPath/devel perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041001.l84A1EvW010786@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/devel/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:56:33 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:00:41 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:03:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:03:32 -0400
Subject: rpms/perl-XML-XPathEngine/devel perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041003.l84A3WnP011415@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10915

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/devel/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:48:05 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:02:58 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:04:30 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:04:30 -0400
Subject: rpms/perl-Text-Shellwords/F-7 perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709041004.l84A4UW0012252@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11549/F-7

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/F-7/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:47:39 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 10:03:56 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:04:34 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:04:34 -0400
Subject: rpms/perl-Text-Shellwords/FC-6 perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709041004.l84A4YWH012319@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11549/FC-6

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-6/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:45:48 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 10:04:00 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:08:09 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:08:09 -0400
Subject: rpms/perl-XML-DOM-XPath/F-7 perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041008.l84A89xW013105@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053/F-7

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/F-7/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:56:33 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:07:35 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:08:12 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:08:12 -0400
Subject: rpms/perl-XML-DOM-XPath/FC-6 perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041008.l84A8CO9013109@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053/FC-6

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/FC-6/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:57:44 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:07:39 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:13:37 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:13:37 -0400
Subject: rpms/perl-XML-XPathEngine/F-7 perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041013.l84ADbva013237@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191/F-7

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-7/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:48:05 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:13:05 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:13:40 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:13:40 -0400
Subject: rpms/perl-XML-XPathEngine/FC-6 perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041013.l84ADe3W013240@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191/FC-6

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/FC-6/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:50:22 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:13:08 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:20:54 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 4 Sep 2007 06:20:54 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.21,1.22
Message-ID: <200709041020.l84AKsVK013343@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13316

Modified Files:
	hamlib.spec 
Log Message:
Added net-tools BR


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hamlib.spec	3 Sep 2007 11:47:51 -0000	1.21
+++ hamlib.spec	4 Sep 2007 10:20:21 -0000	1.22
@@ -18,7 +18,7 @@
 BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
-BuildRequires: libusb-devel, pkgconfig
+BuildRequires: libusb-devel, pkgconfig, net-tools
 BuildRequires: doxygen
 
 %description
@@ -206,6 +206,7 @@
 %changelog
 * Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
 - Rebuild, License tag update
+- Added net-tools BR
 
 * Wed May  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.5-5
 - Move HTML devel documentation to the proper subpackage (#228364)



From fedora-extras-commits at redhat.com  Tue Sep  4 10:48:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 4 Sep 2007 06:48:24 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.22,1.23
Message-ID: <200709041048.l84AmOvY013896@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13871

Modified Files:
	hamlib.spec 
Log Message:
Reworked the python deps


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hamlib.spec	4 Sep 2007 10:20:21 -0000	1.22
+++ hamlib.spec	4 Sep 2007 10:47:46 -0000	1.23
@@ -1,4 +1,6 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+
 
 Name:           hamlib
 Version:        1.2.5
@@ -17,7 +19,7 @@
 BuildRequires: automake >= 1.4, libtool >= 1.4, fileutils, findutils, flex
 BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
-BuildRequires: textutils, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
+BuildRequires: textutils, python, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
 BuildRequires: libusb-devel, pkgconfig, net-tools
 BuildRequires: doxygen
 
@@ -67,7 +69,7 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
-Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
+Requires: python-abi = %{pyver}
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.



From fedora-extras-commits at redhat.com  Tue Sep  4 11:19:09 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue,  4 Sep 2007 07:19:09 -0400
Subject: status-report-scripts parseBZbugList,1.82,1.83
Message-ID: <200709041119.l84BJ94q020560@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20542

Modified Files:
	parseBZbugList 
Log Message:
Adjust to new bugzilla interface location.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- parseBZbugList	30 Aug 2007 21:47:49 -0000	1.82
+++ parseBZbugList	4 Sep 2007 11:19:06 -0000	1.83
@@ -30,7 +30,7 @@
 use JSON;
 
 my $rpc = new XMLRPC::Lite (
-  proxy => 'https://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
+  proxy => 'https://bugzilla.redhat.com/xmlrpc.cgi'
 );
 # Not sure of the way to increase the timeout on reading...
 $rpc->transport->timeout(360);
@@ -568,7 +568,7 @@
       my $h = $buglist->{$$a[$i]};
       my @A = sort(keys %$h);
       $aa =
-	"[https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id="
+	"[https://bugzilla.redhat.com/buglist.cgi?bug_id="
 	. join(",", @A) . " $aa]";
     }
     if ($sponsor == 1) {
@@ -965,7 +965,7 @@
 sub displayBL {
   my ($BL, $BZ, $field) = @_;
   return if $#$BL < 0;
-  print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+  print STDERR "   https://bugzilla.redhat.com/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
   foreach my $b (sort @$BL) {
     my $a = $BZ->{$b};
@@ -996,7 +996,7 @@
     $n =~ s/\./ dot /g;
     foreach my $a (@$e) {
       print "||$n||`$a->{'pkg_name'}`||[",
-	"https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=",
+	"https://bugzilla.redhat.com/show_bug.cgi?id=",
 	$a->{'bug_id'}, " ", $a->{'bug_id'},
 	"]||$a->{'short_desc'}||\n";
     }



From fedora-extras-commits at redhat.com  Tue Sep  4 11:29:02 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:29:02 -0400
Subject: rpms/aspell-pa/devel aspell-pa.spec,1.1,1.2
Message-ID: <200709041129.l84BT21F020736@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-pa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20716

Modified Files:
	aspell-pa.spec 
Log Message:
updating for License Tag


Index: aspell-pa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-pa/devel/aspell-pa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-pa.spec	14 Mar 2007 07:47:02 -0000	1.1
+++ aspell-pa.spec	4 Sep 2007 11:28:29 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-pa
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Punjabi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,9 @@
 
 
 %changelog
+
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Updated License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:39:05 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:39:05 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.1,1.2
Message-ID: <200709041139.l84Bd5mM020973@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20953

Modified Files:
	aspell-bn.spec 
Log Message:
updating for Tag


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-bn.spec	14 Mar 2007 10:08:47 -0000	1.1
+++ aspell-bn.spec	4 Sep 2007 11:38:32 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-bn
 Version:        0.01.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Bengali Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,7 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:40:14 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:40:14 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.2,1.3
Message-ID: <200709041140.l84BeEKD021026@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20981

Modified Files:
	aspell-bn.spec 
Log Message:
updating for Tag


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-bn.spec	4 Sep 2007 11:38:32 -0000	1.2
+++ aspell-bn.spec	4 Sep 2007 11:39:42 -0000	1.3
@@ -57,5 +57,6 @@
 %changelog
 * Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
 - Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:40:32 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:40:32 -0400
Subject: rpms/aspell-gu/devel aspell-gu.spec,1.1,1.2
Message-ID: <200709041140.l84BeWCV021033@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-gu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003

Modified Files:
	aspell-gu.spec 
Log Message:
updating for License Tag


Index: aspell-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-gu/devel/aspell-gu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-gu.spec	14 Mar 2007 10:09:09 -0000	1.1
+++ aspell-gu.spec	4 Sep 2007 11:39:59 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-gu
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Gujarati Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:42:27 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:42:27 -0400
Subject: rpms/aspell-hi/devel aspell-hi.spec,1.1,1.2
Message-ID: <200709041142.l84BgRvu021154@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-hi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21128

Modified Files:
	aspell-hi.spec 
Log Message:
updating for Tag


Index: aspell-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-hi/devel/aspell-hi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-hi.spec	14 Mar 2007 09:55:29 -0000	1.1
+++ aspell-hi.spec	4 Sep 2007 11:41:55 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-hi
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Hindi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:43:11 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:43:11 -0400
Subject: rpms/aspell-mr/devel aspell-mr.spec,1.1,1.2
Message-ID: <200709041143.l84BhB7w021240@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-mr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21160

Modified Files:
	aspell-mr.spec 
Log Message:
updating for License Tag


Index: aspell-mr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-mr/devel/aspell-mr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-mr.spec	14 Mar 2007 10:12:23 -0000	1.1
+++ aspell-mr.spec	4 Sep 2007 11:42:38 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-mr
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Marathi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:43:29 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:43:29 -0400
Subject: rpms/aspell-hi/devel aspell-hi.spec,1.2,1.3
Message-ID: <200709041143.l84BhTQ1021243@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-hi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221

Modified Files:
	aspell-hi.spec 
Log Message:
updating for Tag


Index: aspell-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-hi/devel/aspell-hi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-hi.spec	4 Sep 2007 11:41:55 -0000	1.2
+++ aspell-hi.spec	4 Sep 2007 11:42:56 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Hindi Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:44:24 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:44:24 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.3,1.4
Message-ID: <200709041144.l84BiOHa021271@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21251

Modified Files:
	aspell-bn.spec 
Log Message:
updating for GPLv2


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-bn.spec	4 Sep 2007 11:39:42 -0000	1.3
+++ aspell-bn.spec	4 Sep 2007 11:43:52 -0000	1.4
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Bengali Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:45:09 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:45:09 -0400
Subject: rpms/aspell-or/devel aspell-or.spec,1.1,1.2
Message-ID: <200709041145.l84Bj9vn021300@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-or/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21277

Modified Files:
	aspell-or.spec 
Log Message:
updating for GPL Tag


Index: aspell-or.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-or/devel/aspell-or.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-or.spec	14 Mar 2007 10:22:16 -0000	1.1
+++ aspell-or.spec	4 Sep 2007 11:44:37 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-or
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Oriya Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:45:50 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:45:50 -0400
Subject: rpms/aspell-ta/devel aspell-ta.spec,1.1,1.2
Message-ID: <200709041145.l84BjoVe021335@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-ta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21311

Modified Files:
	aspell-ta.spec 
Log Message:
updating for GPLv2


Index: aspell-ta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ta/devel/aspell-ta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-ta.spec	14 Mar 2007 10:12:45 -0000	1.1
+++ aspell-ta.spec	4 Sep 2007 11:45:17 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-ta
 Version:        20040424
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Tamil Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:46:26 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:46:26 -0400
Subject: rpms/aspell-te/devel aspell-te.spec,1.1,1.2
Message-ID: <200709041146.l84BkQ2d021431@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-te/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21339

Modified Files:
	aspell-te.spec 
Log Message:
updating for GPL Tag


Index: aspell-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-te/devel/aspell-te.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-te.spec	14 Mar 2007 10:09:53 -0000	1.1
+++ aspell-te.spec	4 Sep 2007 11:45:54 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-te
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Telugu Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:47:36 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:47:36 -0400
Subject: rpms/aspell-te/devel aspell-te.spec,1.2,1.3
Message-ID: <200709041147.l84Bla6C021526@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-te/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21508

Modified Files:
	aspell-te.spec 
Log Message:
updating for GPL Tag


Index: aspell-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-te/devel/aspell-te.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-te.spec	4 Sep 2007 11:45:54 -0000	1.2
+++ aspell-te.spec	4 Sep 2007 11:47:04 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Telugu Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:48:33 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:48:33 -0400
Subject: rpms/aspell-gu/devel aspell-gu.spec,1.2,1.3
Message-ID: <200709041148.l84BmXiX021559@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-gu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21532

Modified Files:
	aspell-gu.spec 
Log Message:
updating for Tag


Index: aspell-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-gu/devel/aspell-gu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-gu.spec	4 Sep 2007 11:39:59 -0000	1.2
+++ aspell-gu.spec	4 Sep 2007 11:48:01 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Gujarati Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:56:23 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 07:56:23 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1283,
	1.1284 pseudoworkspace.valgrind1.patch, 1.19, 1.20
Message-ID: <200709041156.l84BuN4k021777@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
add ooo#81253 fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1283
retrieving revision 1.1284
diff -u -r1.1283 -r1.1284
--- openoffice.org.spec	1 Sep 2007 14:26:21 -0000	1.1283
+++ openoffice.org.spec	4 Sep 2007 11:55:50 -0000	1.1284
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 3
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2736,6 +2736,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
+- add ooo#81253 connectivity uninit fix
+
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pseudoworkspace.valgrind1.patch	16 Aug 2007 07:04:22 -0000	1.19
+++ pseudoworkspace.valgrind1.patch	4 Sep 2007 11:55:50 -0000	1.20
@@ -29,3 +29,18 @@
      SwUnderlineFont* pUnderFnt = 0;
  
      if( rInf.GetUnderFnt() )
+Index: source/commontools/statementcomposer.cxx
+===================================================================
+RCS file: /cvs/dba/connectivity/source/commontools/statementcomposer.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 statementcomposer.cxx
+--- openoffice.org.orig/connectivity/source/commontools/statementcomposer.cxx	31 Jul 2007 13:38:39 -0000	1.4
++++ openoffice.org/connectivity/source/commontools/statementcomposer.cxx	4 Sep 2007 11:51:46 -0000
+@@ -109,6 +109,7 @@
+             ,nCommandType( CommandType::COMMAND )
+             ,bEscapeProcessing( sal_True )
+             ,bComposerDirty( true )
++            ,bDisposeComposer( false )
+         {
+             if ( !_rxConnection.is() )
+                 throw NullPointerException();



From fedora-extras-commits at redhat.com  Tue Sep  4 11:59:55 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Tue, 4 Sep 2007 07:59:55 -0400
Subject: rpms/smartmontools/devel smartd-conf.py, 1.10, 1.11 smartd.initd,
	1.5, 
	1.6 smartmontools.spec, 1.34, 1.35 smartmontools.sysconf, 1.2, 1.3
Message-ID: <200709041159.l84Bxt0M021930@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21853

Modified Files:
	smartd-conf.py smartd.initd smartmontools.spec 
	smartmontools.sysconf 
Log Message:
* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-6
- fix #271741 - smartd-conf.py should allow customization of parameters
- fix #253753 - service starting by default, perhaps shouldn't
- update initscript (related #247058 - initscript review)



Index: smartd-conf.py
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd-conf.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smartd-conf.py	22 Feb 2007 12:13:39 -0000	1.10
+++ smartd-conf.py	4 Sep 2007 11:59:22 -0000	1.11
@@ -7,9 +7,9 @@
 
 class Drive:
     def __init__(self, bus, device, sysfspath):
-	    self.bus = bus
-	    self.device = device
-	    self.sysfspath = sysfspath
+        self.bus = bus
+        self.device = device
+        self.sysfspath = sysfspath
 
 def listDrivesbyHAL():
     drives = []
@@ -19,15 +19,15 @@
 
     storage_udi_list = halm.FindDeviceByCapability('storage')
     for udi in storage_udi_list:
-	drive_obj = bus.get_object('org.freedesktop.Hal', udi)
-	drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
-	storage_bus = drive.GetProperty('storage.bus')
-	drive_type = drive.GetProperty('storage.drive_type')
-	if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
-	    device_file = drive.GetProperty('block.device')
-	    sysfs_path = drive.GetProperty('linux.sysfs_path')
-	    drv = Drive(storage_bus, device_file, sysfs_path)
-	    drives += [drv]
+        drive_obj = bus.get_object('org.freedesktop.Hal', udi)
+        drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
+        storage_bus = drive.GetProperty('storage.bus')
+        drive_type = drive.GetProperty('storage.drive_type')
+        if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
+            device_file = drive.GetProperty('block.device')
+            sysfs_path = drive.GetProperty('linux.sysfs_path')
+            drv = Drive(storage_bus, device_file, sysfs_path)
+            drives += [drv]
     return drives
                                                                   
 drives = listDrivesbyHAL()
@@ -66,27 +66,35 @@
 
 def getfile(fname):
     try:
-	fh = open(fname)
+        fh = open(fname)
         line = fh.read().rstrip()
-	fh.close()
+        fh.close()
     except IOError:
-	line = ''
+        line = ''
     return line
 
+try:
+    execfile('/etc/sysconfig/smartmontools')
+except IOError:
+    pass
+
 for drive in drives:
     if getfile("%s/removable" % drive.sysfspath) == '0':
-	driver = ''
-	comment = ''
-	if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
-	    driver = '-d ata '
-	    if float(getfile("/sys/module/libata/version")) < 1.20:
-		comment = "# not yet supported in this kernel version\n# "
-	if not comment:
-	    status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
-		(driver, drive.device))
-	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
-		comment = "# smartctl -i returns error for this drive\n# "
-	print "%s%s %s-H -m root" % (comment, drive.device, driver)
+        driver = ''
+        comment = ''
+    if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
+        driver = '-d ata'
+        if float(getfile("/sys/module/libata/version")) < 1.20:
+            comment = "# not yet supported in this kernel version\n# "
+    if not comment:
+        status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
+        (driver, drive.device))
+        if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
+            comment = "# smartctl -i returns error for this drive\n# "
+    try:
+        print "%s%s %s %s" % (comment, drive.device, driver, smartd_conf_opts)
+    except NameError:
+        print "%s%s %s -H -m root" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smartd.initd	21 Jun 2007 13:26:38 -0000	1.5
+++ smartd.initd	4 Sep 2007 11:59:22 -0000	1.6
@@ -5,10 +5,20 @@
 # $Id$
 
 # For RedHat and cousins:
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 # processname: smartd 
 
+### BEGIN INIT INFO
+# Provides: smartd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start:
+# Short-Description: Self Monitoring and Reporting Technology (SMART) Daemon
+# Description: The smartd daemon monitors SMART status of the local hard drives and 
+#   provides advanced warnings of of disk degradation or failures.
+### END INIT INFO
+
 # 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
@@ -33,59 +43,98 @@
 
 [ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools
 
-case "$1" in
-    start | reload | restart)
-		if [ -x /usr/sbin/smartd-conf.py ]; then
-			GEN_CONF="*SMARTD*AUTOGENERATED*"
-			[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
-			&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
-			&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
-			&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
-		fi
-    ;;
-esac
+RETVAL=0
+prog=smartd
+pidfile=/var/lock/subsys/smartd
+
+genconfig()
+{
+	if [ -x /usr/sbin/smartd-conf.py ]; then
+		GEN_CONF="*SMARTD*AUTOGENERATED*"
+		[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
+		&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
+		&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
+		&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
+	fi
+}
+
+start()
+{
+	echo -n $"Starting $prog: "
+	daemon $SMARTD_BIN $smartd_opts
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && touch $pidfile
+	return $RETVAL
+}
+
+stop()
+{
+	echo -n $"Shutting down $prog: "
+	killproc $SMARTD_BIN
+	RETVAL=$?
+	echo
+	rm -f $pidfile
+	return $RETVAL
+}
+
+reload()
+{
+	echo -n $"Reloading $prog daemon configuration: "
+	killproc $SMARTD_BIN -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+report()
+{
+	echo -n $"Checking SMART devices now: "
+	killproc $SMARTD_BIN -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
 
-    RETVAL=0
-    
-    prog=smartd
-    
-    case "$1" in
+case "$1" in
 	start)
-	    echo -n $"Starting $prog: "
-	    daemon $SMARTD_BIN $smartd_opts
-	    touch /var/lock/subsys/smartd
-	    echo
-	    exit 0
-	    ;;
+		genconfig
+		start
+		;;
 	stop)
-	    echo -n $"Shutting down $prog: "
-	    killproc $SMARTD_BIN
-	    rm -f /var/lock/subsys/smartd
-	    echo
-	    ;;
+		stop
+		;;
 	reload)
-            echo -n $"Reloading $prog daemon configuration: "
-	    killproc $SMARTD_BIN -HUP
-	    RETVAL=$?
-	    echo
-	    ;;
+		genconfig
+		reload
+		;;
 	report)
-	    echo -n $"Checking SMART devices now: "
-	    killproc $SMARTD_BIN -USR1
-	    RETVAL=$?
-	    echo
-            ;;
+		report
+		;;
 	restart)
-	    $0 stop
-	    $0 start
-	    ;;
+		stop
+		genconfig
+		start
+		;;
+	try-restart)
+		if [ -f $pidfile ]; then
+			stop
+			genconfig
+			start
+		fi
+		;;
+	force-reload)
+		genconfig
+		reload || (stop; start)
+		;;
 	status)
-	    status $prog
-	    ;;
+		status $prog
+		RETVAL=$?
+		;;
 	*)
-	    echo $"Usage: $0 {start|stop|reload|report|restart|status}"
-	    RETVAL=1
-    esac
+		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
+		RETVAL=3
+esac
     
-    exit $RETVAL
+exit $RETVAL
 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smartmontools.spec	20 Aug 2007 11:23:11 -0000	1.34
+++ smartmontools.spec	4 Sep 2007 11:59:22 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -91,6 +91,11 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-6
+- fix #271741 - smartd-conf.py should allow customization of parameters
+- fix #253753 - service starting by default, perhaps shouldn't
+- update initscript (related #247058 - initscript review)
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-5
 - add support for 24 disks on 3ware RAID controllers (related #252055)
 - fix #245442 - add %%{arm} to smartmontools's set of build archs


Index: smartmontools.sysconf
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.sysconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smartmontools.sysconf	24 Mar 2006 17:50:08 -0000	1.2
+++ smartmontools.sysconf	4 Sep 2007 11:59:22 -0000	1.3
@@ -1,2 +1,4 @@
 # command line options for smartd
 smartd_opts="-q never"
+# autogenerated config file options
+# smartd_conf_opts="-H -m root"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:04:40 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Tue, 4 Sep 2007 08:04:40 -0400
Subject: rpms/smartmontools/F-7 smartd-conf.py, 1.10, 1.11 smartd.initd, 1.4,
	1.5 smartmontools.spec, 1.34, 1.35 smartmontools.sysconf, 1.2, 1.3
Message-ID: <200709041204.l84C4eew029307@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29282

Modified Files:
	smartd-conf.py smartd.initd smartmontools.spec 
	smartmontools.sysconf 
Log Message:
* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.2
- fix #271741 smartd-conf.py should allow customization of parameters



Index: smartd-conf.py
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartd-conf.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smartd-conf.py	22 Feb 2007 12:13:39 -0000	1.10
+++ smartd-conf.py	4 Sep 2007 12:04:07 -0000	1.11
@@ -7,9 +7,9 @@
 
 class Drive:
     def __init__(self, bus, device, sysfspath):
-	    self.bus = bus
-	    self.device = device
-	    self.sysfspath = sysfspath
+        self.bus = bus
+        self.device = device
+        self.sysfspath = sysfspath
 
 def listDrivesbyHAL():
     drives = []
@@ -19,15 +19,15 @@
 
     storage_udi_list = halm.FindDeviceByCapability('storage')
     for udi in storage_udi_list:
-	drive_obj = bus.get_object('org.freedesktop.Hal', udi)
-	drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
-	storage_bus = drive.GetProperty('storage.bus')
-	drive_type = drive.GetProperty('storage.drive_type')
-	if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
-	    device_file = drive.GetProperty('block.device')
-	    sysfs_path = drive.GetProperty('linux.sysfs_path')
-	    drv = Drive(storage_bus, device_file, sysfs_path)
-	    drives += [drv]
+        drive_obj = bus.get_object('org.freedesktop.Hal', udi)
+        drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
+        storage_bus = drive.GetProperty('storage.bus')
+        drive_type = drive.GetProperty('storage.drive_type')
+        if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
+            device_file = drive.GetProperty('block.device')
+            sysfs_path = drive.GetProperty('linux.sysfs_path')
+            drv = Drive(storage_bus, device_file, sysfs_path)
+            drives += [drv]
     return drives
                                                                   
 drives = listDrivesbyHAL()
@@ -66,27 +66,35 @@
 
 def getfile(fname):
     try:
-	fh = open(fname)
+        fh = open(fname)
         line = fh.read().rstrip()
-	fh.close()
+        fh.close()
     except IOError:
-	line = ''
+        line = ''
     return line
 
+try:
+    execfile('/etc/sysconfig/smartmontools')
+except IOError:
+    pass
+
 for drive in drives:
     if getfile("%s/removable" % drive.sysfspath) == '0':
-	driver = ''
-	comment = ''
-	if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
-	    driver = '-d ata '
-	    if float(getfile("/sys/module/libata/version")) < 1.20:
-		comment = "# not yet supported in this kernel version\n# "
-	if not comment:
-	    status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
-		(driver, drive.device))
-	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
-		comment = "# smartctl -i returns error for this drive\n# "
-	print "%s%s %s-H -m root" % (comment, drive.device, driver)
+        driver = ''
+        comment = ''
+    if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
+        driver = '-d ata'
+        if float(getfile("/sys/module/libata/version")) < 1.20:
+            comment = "# not yet supported in this kernel version\n# "
+    if not comment:
+        status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
+        (driver, drive.device))
+        if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
+            comment = "# smartctl -i returns error for this drive\n# "
+    try:
+        print "%s%s %s %s" % (comment, drive.device, driver, smartd_conf_opts)
+    except NameError:
+        print "%s%s %s -H -m root" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smartd.initd	7 Nov 2006 10:19:40 -0000	1.4
+++ smartd.initd	4 Sep 2007 12:04:07 -0000	1.5
@@ -8,7 +8,6 @@
 # chkconfig: 2345 99 01
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 # processname: smartd 
-
 # 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


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartmontools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smartmontools.spec	20 Aug 2007 11:38:43 -0000	1.34
+++ smartmontools.spec	4 Sep 2007 12:04:07 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	3.1%{?dist}
+Release: 	3.2%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.2
+- fix #271741 smartd-conf.py should allow customization of parameters
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.1
 - license tag update
 - add support for 24 disks on 3ware RAID controllers (related #252055)


Index: smartmontools.sysconf
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartmontools.sysconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smartmontools.sysconf	24 Mar 2006 17:50:08 -0000	1.2
+++ smartmontools.sysconf	4 Sep 2007 12:04:07 -0000	1.3
@@ -1,2 +1,4 @@
 # command line options for smartd
 smartd_opts="-q never"
+# autogenerated config file options
+# smartd_conf_opts="-H -m root"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:27:27 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 08:27:27 -0400
Subject: rpms/ejabberd/devel ejabberd.spec,1.12,1.13 ejabberdctl,1.1,1.2
Message-ID: <200709041227.l84CRRYm029884@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29815

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ejabberd.spec	22 Aug 2007 22:25:49 -0000	1.12
+++ ejabberd.spec	4 Sep 2007 12:26:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -173,6 +173,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
 * Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
 - Re-exclude ppc64
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 14:03:27 -0000	1.1
+++ ejabberdctl	4 Sep 2007 12:26:54 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:28:03 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 4 Sep 2007 08:28:03 -0400
Subject: rpms/fetchmail/devel fetchmail.spec,1.53,1.54
Message-ID: <200709041228.l84CS3hp029958@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29887

Modified Files:
	fetchmail.spec 
Log Message:
Fix CVE-2007-4565


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- fetchmail.spec	23 Aug 2007 10:13:24 -0000	1.53
+++ fetchmail.spec	4 Sep 2007 12:27:30 -0000	1.54
@@ -4,11 +4,12 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.8-CVE-2007-4565.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .cve_2007_4565
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -84,6 +86,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-3
+- Fix CVE-2007-4565
+
 * Thu Aug 23 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-2
 - fix license
 - rebuild



From fedora-extras-commits at redhat.com  Tue Sep  4 12:37:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 08:37:22 -0400
Subject: rpms/perl-Pod-Tests/devel perl-Pod-Tests.spec,1.5,1.6
Message-ID: <200709041237.l84CbMYk030178@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30141

Modified Files:
	perl-Pod-Tests.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/perl-Pod-Tests.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Tests.spec	5 Sep 2006 09:57:12 -0000	1.5
+++ perl-Pod-Tests.spec	4 Sep 2007 12:36:50 -0000	1.6
@@ -1,8 +1,8 @@
 Name: 		perl-Pod-Tests
 Version: 	0.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Pod-Tests/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Pod-Tests-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod) >= 1.00
 BuildRequires:	/usr/bin/dos2unix
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-4
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:37:52 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Tue, 4 Sep 2007 08:37:52 -0400
Subject: rpms/jokosher/devel jokosher.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <200709041237.l84CbqhI030230@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/jokosher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30133/devel

Modified Files:
	jokosher.spec sources 
Log Message:



Index: jokosher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jokosher/devel/jokosher.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jokosher.spec	24 Aug 2007 19:10:42 -0000	1.9
+++ jokosher.spec	4 Sep 2007 12:37:20 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name: jokosher
 Version: 1.0
-Release: 0.1.20070824svn%{?dist}
+Release: 0.1.20070904svn%{?dist}
 Summary: A simple and easy-to-use Open Source multi-track editor
 Group: Applications/Multimedia
 License: GPLv2+ with exceptions
@@ -16,7 +16,7 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: pygtk2-devel
-BuildRequires: python-setuptools
+BuildRequires: python-setuptools-devel
 BuildRequires: scrollkeeper
 BuildRequires: gettext
 Requires: python-setuptools
@@ -104,6 +104,10 @@
 %{_datadir}/omf/%{name}/
 
 %changelog
+* Tue Sep  4 2007 Christopher Brown <chris at localhost.localdomain> - 1.0-0.1.20070904svn
+- change to python-setuptools-devel
+- update to latest svn
+
 * Fri Aug 24 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070824svn
 - update to latest svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jokosher/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Aug 2007 19:10:42 -0000	1.7
+++ sources	4 Sep 2007 12:37:20 -0000	1.8
@@ -1 +1 @@
-f23f8794de6f12df4e65adff9abc9ad8  jokosher-1.0.tar.gz
+9dd1b9c8b7298121136182be574a3c29  jokosher-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 12:39:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 08:39:02 -0400
Subject: rpms/perl-Pod-Tests/F-7 perl-Pod-Tests.spec,1.5,1.6
Message-ID: <200709041239.l84Cd2TT030336@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30290

Modified Files:
	perl-Pod-Tests.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-7/perl-Pod-Tests.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Tests.spec	5 Sep 2006 09:57:12 -0000	1.5
+++ perl-Pod-Tests.spec	4 Sep 2007 12:38:30 -0000	1.6
@@ -1,8 +1,8 @@
 Name: 		perl-Pod-Tests
 Version: 	0.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Pod-Tests/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Pod-Tests-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod) >= 1.00
 BuildRequires:	/usr/bin/dos2unix
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-4
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:42:50 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 08:42:50 -0400
Subject: rpms/busybox/devel busybox.spec,1.63,1.64
Message-ID: <200709041242.l84CgoRF030616@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30571

Modified Files:
	busybox.spec 
Log Message:
spec file cleanup



Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- busybox.spec	27 Aug 2007 08:11:02 -0000	1.63
+++ busybox.spec	4 Sep 2007 12:42:17 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -54,11 +54,7 @@
 %prep
 %setup -q
 %patch13 -b .clean -p1
-#SELINUX Patch
 %patch -b .static -p1
-%ifarch ppc64
-#%patch4 -b .ppc64 -p1
-%endif
 %patch9 -b .tar -p1
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
@@ -77,21 +73,22 @@
 patch -R -p1 <%{PATCH0}
 # applied anaconda patch
 patch -b --suffix .anaconda -p1 < %{PATCH1}
-
 make defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox.anaconda
 
+#create busybox optimized for petitboot
 make clean
+# copy new configuration file
 cp %{SOURCE1} .config
+# .config file has to be recreated to the new format
 yes "" | make oldconfig
-make CC="gcc $RPM_OPT_FLAGS -Os"
+make CC="%__cc $RPM_OPT_FLAGS"
 cp busybox busybox.petitboot
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.anaconda $RPM_BUILD_ROOT/sbin/busybox.anaconda
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
@@ -115,6 +112,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> - 1:1.6.1-2
+- spec file cleanup
+
 * Mon Jul 23 2007 Ivana Varekova <varekova at redhat.com> - 1:1.6.1-1
 - update to 1.6.1
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:42:53 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 08:42:53 -0400
Subject: rpms/ejabberd/F-7 ejabberd.spec,1.11,1.12 ejabberdctl,1.1,1.2
Message-ID: <200709041242.l84Cgrt8030620@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30585

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ejabberd.spec	31 Jul 2007 13:30:05 -0000	1.11
+++ ejabberd.spec	4 Sep 2007 12:42:20 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://ejabberd.jabber.ru/
 Source0:        http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz
 Source1:        ejabberd.init
@@ -41,8 +41,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-# don't build on ppc64 since hevea hasn't been built on ppc64 yet
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -174,6 +173,22 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
+- Re-exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-9
+- Fix license
+- Don't exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-8
+- Bump & rebuild to build against latest erlang package.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-7
+- Bump release and rebuild due to Koji hiccups.
+
 * Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-6
 - Don't try building on PPC64 since hevea isn't available on PPC64.
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 13:00:44 -0000	1.1
+++ ejabberdctl	4 Sep 2007 12:42:20 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:43:41 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 4 Sep 2007 08:43:41 -0400
Subject: rpms/fetchmail/devel fetchmail-6.3.8-CVE-2007-4565.patch,NONE,1.1
Message-ID: <200709041243.l84ChfWJ030737@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30728

Added Files:
	fetchmail-6.3.8-CVE-2007-4565.patch 
Log Message:
add patch

fetchmail-6.3.8-CVE-2007-4565.patch:

--- NEW FILE fetchmail-6.3.8-CVE-2007-4565.patch ---
--- fetchmail-6.3.8/sink.c_old	2007-03-30 00:45:17.000000000 +0200
+++ fetchmail-6.3.8/sink.c	2007-09-04 13:30:35.000000000 +0200
@@ -262,7 +262,7 @@
     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
 
     /* don't bounce in reply to undeliverable bounces */
-    if (!msg->return_path[0] ||
+    if (!msg || !msg->return_path[0] ||
 	strcmp(msg->return_path, "<>") == 0 ||
 	strcasecmp(msg->return_path, md1) == 0 ||
 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)



From fedora-extras-commits at redhat.com  Tue Sep  4 12:44:11 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 08:44:11 -0400
Subject: fedora-security/audit fc7,1.89,1.90
Message-ID: <200709041244.l84CiB56030854@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30461

Modified Files:
	fc7 
Log Message:
Gallery2 WebdAv problems



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- fc7	1 Sep 2007 18:12:28 -0000	1.89
+++ fc7	4 Sep 2007 12:44:08 -0000	1.90
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070829
 # Up to date FC7 as of 20070829
 
+CVE-MAP-NOMATCH VULNERABLE (gallery2) #267421
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
 CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861



From fedora-extras-commits at redhat.com  Tue Sep  4 13:04:03 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 09:04:03 -0400
Subject: rpms/ejabberd/FC-6 ejabberd.spec,1.8,1.9 ejabberdctl,1.1,1.2
Message-ID: <200709041304.l84D43G8004756@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4724

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/FC-6/ejabberd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ejabberd.spec	31 Jul 2007 14:01:20 -0000	1.8
+++ ejabberd.spec	4 Sep 2007 13:03:29 -0000	1.9
@@ -1,10 +1,10 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://ejabberd.jabber.ru/
 Source0:        http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz
 Source1:        ejabberd.init
@@ -41,8 +41,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-# don't build on ppc64 since hevea hasn't been built on ppc64 yet
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -174,6 +173,22 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
+- Re-exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-9
+- Fix license
+- Don't exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-8
+- Bump & rebuild to build against latest erlang package.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-7
+- Bump release and rebuild due to Koji hiccups.
+
 * Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-6
 - Don't try building on PPC64 since hevea isn't available on PPC64.
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/FC-6/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 14:01:20 -0000	1.1
+++ ejabberdctl	4 Sep 2007 13:03:29 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 13:08:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:08:13 -0400
Subject: rpms/gdm/devel .cvsignore, 1.53, 1.54 gdm.spec, 1.278, 1.279 sources,
	1.56, 1.57
Message-ID: <200709041308.l84D8DXs005371@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.19.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	16 Aug 2007 03:38:00 -0000	1.53
+++ .cvsignore	4 Sep 2007 13:07:40 -0000	1.54
@@ -1,2 +1 @@
-gdm-2.19.6.tar.bz2
-fedora-faces-20070319.tar.bz2
+gdm-2.19.7.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- gdm.spec	24 Aug 2007 15:33:07 -0000	1.278
+++ gdm.spec	4 Sep 2007 13:07:40 -0000	1.279
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.6
-Release: 5%{?dist}
+Version: 2.19.7
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -52,9 +52,6 @@
 # make gdmsetup work with consolehelper
 Patch35: gdmsetup-path.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=467335
-Patch36: gdm-2.19.5-disable-typeahead.patch
-
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.6-selinux.patch
 
@@ -139,7 +136,6 @@
 %patch32 -p1 -b .a11y-fixes
 %patch33 -p1 -b .pass-ats-to-session
 %patch35 -p1 -b .gdmsetup-path
-%patch36 -p1 -b .disable-typeahead
 %patch37 -p1 -b .selinux
 
 %patch100 -p1 -b .change-defaults
@@ -355,6 +351,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Sep  4 2007 Matthias  Clasen <mclasen at redhat.com> - 1:2.19.7-1
+- Update to 2.19.7
+
 * Fri Aug 24 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.6-5
 - use pam_selinux instead of home grown selinux code (bug 254164)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	16 Aug 2007 03:38:00 -0000	1.56
+++ sources	4 Sep 2007 13:07:40 -0000	1.57
@@ -1,2 +1,2 @@
-89ffb6d595f82f9d04d68121b81c697b  gdm-2.19.6.tar.bz2
+27f04ecfaeabcd238f8df66660d50d7b  gdm-2.19.7.tar.bz2
 7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:13:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:13:19 -0400
Subject: rpms/gedit/devel .cvsignore, 1.64, 1.65 gedit.spec, 1.137,
	1.138 sources, 1.66, 1.67
Message-ID: <200709041313.l84DDJG6005674@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5641

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	16 Aug 2007 02:49:13 -0000	1.64
+++ .cvsignore	4 Sep 2007 13:12:46 -0000	1.65
@@ -1 +1 @@
-gedit-2.19.90.tar.bz2
+gedit-2.19.91.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gedit.spec	16 Aug 2007 02:49:13 -0000	1.137
+++ gedit.spec	4 Sep 2007 13:12:46 -0000	1.138
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.90
+Version: 	2.19.91
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.90-1
 - Update to 2.19.90
 - %%find_lang also finds omf files now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	16 Aug 2007 02:49:13 -0000	1.66
+++ sources	4 Sep 2007 13:12:46 -0000	1.67
@@ -1 +1 @@
-1613de3334030d96e1d7ed86eb526448  gedit-2.19.90.tar.bz2
+eb5fbd8c0f986665235cfc7fa3137e67  gedit-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:24:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:24:31 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.54,
	1.55 gnome-system-monitor.spec, 1.94, 1.95 sources, 1.54, 1.55
Message-ID: <200709041324.l84DOVvF006033@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5993

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.19.91.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	31 Jul 2007 00:33:27 -0000	1.54
+++ .cvsignore	4 Sep 2007 13:23:58 -0000	1.55
@@ -1 +1 @@
-gnome-system-monitor-2.19.6.tar.bz2
+gnome-system-monitor-2.19.91.1.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-system-monitor.spec	23 Aug 2007 18:18:16 -0000	1.94
+++ gnome-system-monitor.spec	4 Sep 2007 13:23:58 -0000	1.95
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.19.6
-Release: 4%{?dist}
+Version: 2.19.91.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -96,9 +96,11 @@
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/gnome-system-monitor/
-%{_datadir}/omf/gnome-system-monitor/
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-4
 - Rebuild for ppc toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	31 Jul 2007 00:33:27 -0000	1.54
+++ sources	4 Sep 2007 13:23:58 -0000	1.55
@@ -1 +1 @@
-7359406ff33ef6b368fd576f0a83219e  gnome-system-monitor-2.19.6.tar.bz2
+2f63214c75995014046d3c401e64fd4d  gnome-system-monitor-2.19.91.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:42:10 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 09:42:10 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1284,
	1.1285 pseudoworkspace.valgrind1.patch, 1.20, 1.21
Message-ID: <200709041342.l84DgAFf006479@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6451

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
add ooo#81258 sw uninit fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -r1.1284 -r1.1285
--- openoffice.org.spec	4 Sep 2007 11:55:50 -0000	1.1284
+++ openoffice.org.spec	4 Sep 2007 13:41:37 -0000	1.1285
@@ -2738,6 +2738,7 @@
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - add ooo#81253 connectivity uninit fix
+- add ooo#81258 sw uninit fix
 
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pseudoworkspace.valgrind1.patch	4 Sep 2007 11:55:50 -0000	1.20
+++ pseudoworkspace.valgrind1.patch	4 Sep 2007 13:41:37 -0000	1.21
@@ -44,3 +44,76 @@
          {
              if ( !_rxConnection.is() )
                  throw NullPointerException();
+Index: source/ui/config/usrpref.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 usrpref.cxx
+--- openoffice.org.orig/sw/source/ui/config/usrpref.cxx	27 Jun 2007 12:49:41 -0000	1.32
++++ openoffice.org/sw/source/ui/config/usrpref.cxx	4 Sep 2007 13:34:50 -0000
+@@ -79,16 +79,16 @@
+ }
+ 
+ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
+-	aContentConfig(bWeb, *this),
+-	aLayoutConfig(bWeb, *this),
+-	aGridConfig(bWeb, *this),
+-	aCursorConfig(*this),
+-	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
+ 	nFldUpdateFlags(0),
+     nLinkUpdateMode(0),
+     bIsHScrollMetricSet(sal_False),
+     bIsVScrollMetricSet(sal_False),
+-    nDefTab( MM50 * 4 )
++    nDefTab( MM50 * 4 ),
++	aContentConfig(bWeb, *this),
++	aLayoutConfig(bWeb, *this),
++	aGridConfig(bWeb, *this),
++	aCursorConfig(*this),
++	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
+ {
+     MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
+     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+Index: source/ui/inc/usrpref.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/inc/usrpref.hxx,v
+retrieving revision 1.11
+diff -u -r1.11 usrpref.hxx
+--- openoffice.org.orig/sw/source/ui/inc/usrpref.hxx	27 Jun 2007 12:50:12 -0000	1.11
++++ openoffice.org/sw/source/ui/inc/usrpref.hxx	4 Sep 2007 13:34:54 -0000
+@@ -141,6 +141,17 @@
+  ---------------------------------------------------------------------------*/
+ class SwMasterUsrPref : public SwViewOption
+ {
++	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
++	sal_Int32	nLinkUpdateMode;
++	FieldUnit	eUserMetric;
++	FieldUnit   eHScrollMetric;
++	sal_Bool    bIsHScrollMetricSet;
++	FieldUnit   eVScrollMetric;
++	sal_Bool    bIsVScrollMetricSet;
++
++	sal_Int32	nDefTab;			//default tab stop distance
++
++
+ 	friend class SwContentViewConfig;
+ 	friend class SwLayoutViewConfig;
+ 	friend class SwGridConfig;
+@@ -153,17 +164,6 @@
+ 	SwCursorConfig		aCursorConfig;
+ 	SwWebColorConfig* 	pWebColorConfig;
+ 
+-	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
+-	sal_Int32	nLinkUpdateMode;
+-	FieldUnit	eUserMetric;
+-    FieldUnit   eHScrollMetric;
+-    sal_Bool    bIsHScrollMetricSet;
+-    FieldUnit   eVScrollMetric;
+-    sal_Bool    bIsVScrollMetricSet;
+-
+-
+-	sal_Int32	nDefTab;			//default tab stop distance
+-
+ public:
+ 	SwMasterUsrPref(BOOL bWeb);
+ 	~SwMasterUsrPref();



From fedora-extras-commits at redhat.com  Tue Sep  4 13:44:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:44:13 -0400
Subject: rpms/beagle/devel .cvsignore, 1.21, 1.22 beagle.spec, 1.100,
	1.101 sources, 1.24, 1.25
Message-ID: <200709041344.l84DiDqQ006570@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548

Modified Files:
	.cvsignore beagle.spec sources 
Log Message:
0.2.18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 May 2007 03:53:59 -0000	1.21
+++ .cvsignore	4 Sep 2007 13:43:41 -0000	1.22
@@ -1 +1 @@
-beagle-0.2.17.tar.bz2
+beagle-0.2.18.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- beagle.spec	20 May 2007 04:06:53 -0000	1.100
+++ beagle.spec	4 Sep 2007 13:43:41 -0000	1.101
@@ -1,9 +1,10 @@
 Name:           beagle
-Version:        0.2.17
+Version:        0.2.18
 Release:        1%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
-License:        LGPL
+# see COPYING for details
+License:        ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LPGLv2+)
 URL:            http://beagle-project.org/
 Source0:        http://download.gnome.org/sources/beagle/0.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -331,6 +332,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.18-1
+- Update to 0.2.18
+- Update the license field
+
 * Sat May 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.17-1
 - Update to 0.2.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	20 May 2007 03:53:59 -0000	1.24
+++ sources	4 Sep 2007 13:43:41 -0000	1.25
@@ -1 +1 @@
-75903ca41fe8b7729d1a02987625e90f  beagle-0.2.17.tar.bz2
+8bab6ce40fff497120dbfcfd0a789c65  beagle-0.2.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:45:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:45:57 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041345.l84DjvvW006654@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6636

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:45:24 -0000	1.6
@@ -1,14 +1,15 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{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
@@ -41,6 +42,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 13:47:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:47:55 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/F-7
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041347.l84DltxW006756@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6722

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:47:22 -0000	1.6
@@ -1,14 +1,15 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{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
@@ -41,6 +42,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 13:52:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:52:16 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.60, 1.61 epiphany.spec, 1.159,
	1.160 sources, 1.61, 1.62
Message-ID: <200709041352.l84DqGXR006943@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	14 Aug 2007 02:11:58 -0000	1.60
+++ .cvsignore	4 Sep 2007 13:51:44 -0000	1.61
@@ -1 +1 @@
-epiphany-2.19.90.tar.bz2
+epiphany-2.19.91.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- epiphany.spec	24 Aug 2007 14:42:56 -0000	1.159
+++ epiphany.spec	4 Sep 2007 13:51:44 -0000	1.160
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -190,6 +190,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	14 Aug 2007 02:11:58 -0000	1.61
+++ sources	4 Sep 2007 13:51:44 -0000	1.62
@@ -1 +1 @@
-037ed0468cc44b81ce069bc9f9b46d1d  epiphany-2.19.90.tar.bz2
+9bd85a26913b90b8c81ec6b300f9ecf8  epiphany-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:57:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:57:27 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel
	perl-Cache-Simple-TimedExpiry.spec, 1.6, 1.7
Message-ID: <200709041357.l84DvRZP007162@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7138

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
Add BR: perl(Test::More) to work around bodhi and mock using divering package sets.


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:45:24 -0000	1.6
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:56:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -42,6 +43,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
 - Update license tag.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Tue Sep  4 14:01:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:01:38 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/F-7
	perl-Cache-Simple-TimedExpiry.spec, 1.6, 1.7
Message-ID: <200709041401.l84E1cl6013232@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10598

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
Add BR: perl(Test::More) to work around bodhi and mock using divering package sets.


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:47:22 -0000	1.6
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 14:01:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -42,6 +43,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
 - Update license tag.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Tue Sep  4 14:03:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:03:06 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-6
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041403.l84E36th013388@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13317

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
- BR: perl(Test::More).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/FC-6/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:20:49 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 14:02:33 -0000	1.6
@@ -1,14 +1,16 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,6 +43,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:03:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:03:22 -0400
Subject: rpms/orca/devel .cvsignore, 1.18, 1.19 orca.spec, 1.30, 1.31 sources,
	1.19, 1.20
Message-ID: <200709041403.l84E3MOh013428@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13338

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Aug 2007 22:41:14 -0000	1.18
+++ .cvsignore	4 Sep 2007 14:02:48 -0000	1.19
@@ -1 +1 @@
-orca-2.19.90.tar.bz2
+orca-2.19.92.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- orca.spec	13 Aug 2007 22:41:14 -0000	1.30
+++ orca.spec	4 Sep 2007 14:02:48 -0000	1.31
@@ -15,7 +15,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.19.90
+Version:	2.19.92
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Aug 2007 22:41:14 -0000	1.19
+++ sources	4 Sep 2007 14:02:48 -0000	1.20
@@ -1 +1 @@
-b62dd64bd77b1528d52a054af2975225  orca-2.19.90.tar.bz2
+d41a3d88509537f7674285d8a564f6b6  orca-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 14:07:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:07:39 -0400
Subject: rpms/beagle/devel beagle.spec,1.101,1.102
Message-ID: <200709041407.l84E7dNY013583@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557

Modified Files:
	beagle.spec 
Log Message:
fix desktop file



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- beagle.spec	4 Sep 2007 13:43:41 -0000	1.101
+++ beagle.spec	4 Sep 2007 14:07:05 -0000	1.102
@@ -148,7 +148,7 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   --add-category X-GNOME-SystemSettings				\
   --remove-category Utility                                     \
-  --add-only-show-in=GNOME                                      \
+  --remove-category Application					\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop



From fedora-extras-commits at redhat.com  Tue Sep  4 14:08:35 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 10:08:35 -0400
Subject: rpms/gd/devel gd-2.0.34-fonts.patch, NONE,
	1.1 gd-2.0.34-multilib.patch, 1.1, 1.2 gd.spec, 1.43, 1.44
Message-ID: <200709041408.l84E8ZZV013663@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13637

Modified Files:
	gd-2.0.34-multilib.patch gd.spec 
Added Files:
	gd-2.0.34-fonts.patch 
Log Message:
- fix font paths (#225786#5)
- fix pkgconfig Libs flag (#225786#4)


gd-2.0.34-fonts.patch:

--- NEW FILE gd-2.0.34-fonts.patch ---
--- gd-2.0.34/Makefile.in.pom	2007-09-04 15:08:18.000000000 +0200
+++ gd-2.0.34/Makefile.in	2007-09-04 15:58:05.000000000 +0200
@@ -227,7 +227,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -D_DEFAULT_FONTPATH="/usr/share/X11/fonts/TTF/:/usr/share/fonts/bitstream-vera/:/usr/share/fonts/dejavu-lgc/:/usr/share/fonts/default/Type1/:/usr/share/X11/fonts/Type1"
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@

gd-2.0.34-multilib.patch:

Index: gd-2.0.34-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd-2.0.34-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gd-2.0.34-multilib.patch	8 Feb 2007 13:09:04 -0000	1.1
+++ gd-2.0.34-multilib.patch	4 Sep 2007 14:08:31 -0000	1.2
@@ -1,3 +1,21 @@
+--- /dev/null   2007-09-04 12:46:47.564263777 +0200 
++++ gd-2.0.34/config/gdlib.pc.in        2007-09-04 15:17:09.000000000 +0200 
+@@ -0,0 +1,15 @@ 
++prefix=@prefix@ 
++exec_prefix=@exec_prefix@ 
++libdir=@libdir@ 
++includedir=@includedir@ 
++bindir=@bindir@ 
++ldflags=@LDFLAGS@ 
++ 
++ 
++Name: gd-devel 
++Description: A graphics library for quick creation of PNG or JPEG images 
++Version: @VERSION@ 
++Requires: 
++Libs: -ldg 
++Libs.private: @LIBS@ 
++Cflags: -I at includedir@ 
 --- gd-2.0.34/Makefile.in.pom	2007-02-03 02:41:46.000000000 +0100
 +++ gd-2.0.34/Makefile.in	2007-02-08 13:34:06.000000000 +0100
 @@ -341,6 +341,7 @@
@@ -42,23 +60,6 @@
  	uninstall-includeHEADERS uninstall-info-am \
  	uninstall-libLTLIBRARIES
  
---- gd-2.0.34/config/gdlib.pc.in.pom	2007-02-08 13:29:04.000000000 +0100
-+++ gd-2.0.34/config/gdlib.pc.in	2007-01-29 09:51:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+bindir=@bindir@
-+ldflags=@LDFLAGS@
-+
-+
-+Name: gd-devel
-+Description: A graphics library for quick creation of PNG or JPEG images
-+Version: @VERSION@
-+Requires:
-+Libs: @LIBS@
-+Cflags: -I at includedir@
 --- gd-2.0.34/config/gdlib-config.in.pom	2007-02-03 02:41:00.000000000 +0100
 +++ gd-2.0.34/config/gdlib-config.in	2007-02-08 13:27:25.000000000 +0100
 @@ -7,9 +7,10 @@


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gd.spec	27 Aug 2007 08:47:16 -0000	1.43
+++ gd.spec	4 Sep 2007 14:08:31 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.34
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         System Environment/Libraries
 License:       MIT and GPL
 URL:           http://www.libgd.org/Main_Page
@@ -13,6 +13,7 @@
 Patch6:        gd-2.0.33-overflow.patch
 Patch7:        gd-2.0.33-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
+Patch9:	       gd-2.0.34-fonts.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
 BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@@ -59,6 +60,7 @@
 %patch5 -p1 -b .sparc64 
 %patch7 -p1 -b .AALineThick
 %patch8 -p1 -b .bb
+%patch9 -p1 -b .fonts
 
 %build
 %configure --disable-rpath
@@ -98,6 +100,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-3
+- fix font paths (#225786#5)
+- fix pkgconfig Libs flag (#225786#4)
+
 * Thu Feb 22 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-2
 - incorporate package review feedback
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:13:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:13:39 -0400
Subject: rpms/vino/devel .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 vino.spec,
	1.55, 1.56
Message-ID: <200709041413.l84EDdCH013812@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13779

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Aug 2007 03:39:50 -0000	1.24
+++ .cvsignore	4 Sep 2007 14:13:05 -0000	1.25
@@ -1 +1 @@
-vino-2.19.90.tar.bz2
+vino-2.19.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Aug 2007 03:39:50 -0000	1.24
+++ sources	4 Sep 2007 14:13:05 -0000	1.25
@@ -1 +1 @@
-72de250a85a897f0c83ebfc42582f69d  vino-2.19.90.tar.bz2
+6589eb5b2f9e5e3f2dfd516ff48158a8  vino-2.19.92.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vino.spec	14 Aug 2007 03:42:55 -0000	1.55
+++ vino.spec	4 Sep 2007 14:13:05 -0000	1.56
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.19.90
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.19/%{name}-%{version}.tar.bz2
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Update the license field



From fedora-extras-commits at redhat.com  Tue Sep  4 14:19:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:19:05 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 tomboy.spec, 1.53, 1.54
Message-ID: <200709041419.l84EJ5Nv013934@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13912

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Aug 2007 19:56:09 -0000	1.17
+++ .cvsignore	4 Sep 2007 14:18:32 -0000	1.18
@@ -1 +1 @@
-tomboy-0.7.4.tar.bz2
+tomboy-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Aug 2007 19:56:09 -0000	1.17
+++ sources	4 Sep 2007 14:18:32 -0000	1.18
@@ -1 +1 @@
-cdf1d9d70773046b9e20281d692a86a5  tomboy-0.7.4.tar.bz2
+f7a7959bbfe1b67c1f5de32eb118a65a  tomboy-0.7.6.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- tomboy.spec	25 Aug 2007 16:59:22 -0000	1.53
+++ tomboy.spec	4 Sep 2007 14:18:32 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.7.4
-Release: 	3%{?dist}
+Version:        0.7.6
+Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -100,12 +100,14 @@
 %{_datadir}/icons/hicolor/scalable/apps/tomboy.svg
 %{_datadir}/icons/hicolor/scalable/apps/tomboy-tag.svg
 %{_datadir}/pixmaps/tomboy.png
-%{_datadir}/omf/tomboy
 
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.6-1
+- Update to 0.7.6
+
 * Sat Aug 25 2007 Ray Strode <rstrode at redhat.com> - 0.7.4-3
 - Not sure why ppc64 is excluded and it's causing a broken
   conduit dep, try adding it back to the build.



From fedora-extras-commits at redhat.com  Tue Sep  4 14:33:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:33:17 -0400
Subject: rpms/beagle/devel beagle.spec,1.102,1.103
Message-ID: <200709041433.l84EXH4N014298@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14270

Modified Files:
	beagle.spec 
Log Message:
more desktop file fixes



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- beagle.spec	4 Sep 2007 14:07:05 -0000	1.102
+++ beagle.spec	4 Sep 2007 14:32:45 -0000	1.103
@@ -140,8 +140,6 @@
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
-  --add-category X-Red-Hat-Base					\
-  --add-only-show-in=GNOME                                      \
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop
 
 desktop-file-install --vendor gnome --delete-original		\
@@ -149,6 +147,7 @@
   --add-category X-GNOME-SystemSettings				\
   --remove-category Utility                                     \
   --remove-category Application					\
+  --remove-category AdvancedSettings				\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop



From fedora-extras-commits at redhat.com  Tue Sep  4 14:48:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:48:20 -0400
Subject: rpms/tomboy/devel tomboy-wrapper.patch, NONE, 1.1 tomboy.spec, 1.54,
	1.55
Message-ID: <200709041448.l84EmK49014575@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14530

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-wrapper.patch 
Log Message:
update patch


tomboy-wrapper.patch:

--- NEW FILE tomboy-wrapper.patch ---
diff -up tomboy-0.7.6/Tomboy/tomboy.in.wrapper tomboy-0.7.6/Tomboy/tomboy.in
--- tomboy-0.7.6/Tomboy/tomboy.in.wrapper	2007-09-03 08:25:31.000000000 -0400
+++ tomboy-0.7.6/Tomboy/tomboy.in	2007-09-04 10:45:19.000000000 -0400
@@ -1,20 +1,10 @@
 #!/bin/sh
 
-if [ "x$PWD" = "x at srcdir@" ] ; then
-    echo "*** Running uninstalled @target@ ***"
+export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
+export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 
-    export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH:./Addins/PrintNotes/.libs"
-    export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-    export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
-
-    THIS_EXE="--debug ./@target@"
-else
-    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-    export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
-    export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
-
-    THIS_EXE="@pkglibdir@/@target@"
-fi
+THIS_EXE="@pkglibdir@/@target@"
 
 if [ -n "@extragac@" ]; then
     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tomboy.spec	4 Sep 2007 14:18:32 -0000	1.54
+++ tomboy.spec	4 Sep 2007 14:47:47 -0000	1.55
@@ -10,7 +10,7 @@
 # Mono.Addins is MIT
 URL:            http://www.beatniksoftware.com/tomboy/
 Source0:        http://download.gnome.org/sources/tomboy/0.7/%{name}-%{version}.tar.bz2
-Patch1:         tomboy-0.7.2-wrapper.patch
+Patch1:         tomboy-wrapper.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:49:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:49:32 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.11, 1.12
Message-ID: <200709041449.l84EnWBa014657@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14601

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Locale-Maketext-Lexicon.spec	11 Jun 2007 07:49:11 -0000	1.11
+++ perl-Locale-Maketext-Lexicon.spec	4 Sep 2007 14:49:00 -0000	1.12
@@ -1,11 +1,11 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.64
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Extract translatable strings from source
 %if "%{version}" > "0.60"
 License:	MIT
 %else
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 %endif
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
@@ -17,6 +17,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # Required by the tests
 %if "%{version}" > "0.60"
 BuildRequires:  /usr/bin/msgunfmt
@@ -67,6 +69,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Jun 11 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-1
 - Upgrade to 0.64.
 - Reflect source-url having changed.



From fedora-extras-commits at redhat.com  Tue Sep  4 14:51:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:51:46 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/F-7 .cvsignore, 1.7,
	1.8 perl-Locale-Maketext-Lexicon.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709041451.l84Epk4M014815@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Feb 2007 06:40:39 -0000	1.7
+++ .cvsignore	4 Sep 2007 14:51:13 -0000	1.8
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.62.tar.gz
+Locale-Maketext-Lexicon-0.64.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Locale-Maketext-Lexicon.spec	16 Feb 2007 06:40:39 -0000	1.10
+++ perl-Locale-Maketext-Lexicon.spec	4 Sep 2007 14:51:13 -0000	1.11
@@ -1,18 +1,24 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.62
-Release: 	1%{?dist}
+Version: 	0.64
+Release: 	2%{?dist}
 Summary: 	Extract translatable strings from source
 %if "%{version}" > "0.60"
 License:	MIT
 %else
-License:        GPL or Artistic
+License:	GPL+ or Artistic
 %endif
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
+%if "%{version}" >= "0.64"
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # Required by the tests
 %if "%{version}" > "0.60"
 BuildRequires:  /usr/bin/msgunfmt
@@ -63,6 +69,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
+* Mon Jun 11 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-1
+- Upgrade to 0.64.
+- Reflect source-url having changed.
+
 * Fri Feb 16 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.62-1
 - Upgrade to 0.62.
 - Reflect licence change from Artistic/GPL to MIT.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Feb 2007 06:40:39 -0000	1.7
+++ sources	4 Sep 2007 14:51:13 -0000	1.8
@@ -1 +1 @@
-989642c1a83ddc7f1337d77422ee40cf  Locale-Maketext-Lexicon-0.62.tar.gz
+ce0fc6dfbf41fc4a72d1431e9551a634  Locale-Maketext-Lexicon-0.64.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:11:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 11:11:46 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.55,1.56
Message-ID: <200709041511.l84FBkHw021766@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21742

Modified Files:
	tomboy.spec 
Log Message:
fix file list



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tomboy.spec	4 Sep 2007 14:47:47 -0000	1.55
+++ tomboy.spec	4 Sep 2007 15:11:13 -0000	1.56
@@ -89,6 +89,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_libdir}/%{name}
 %{_bindir}/%{name}
+%{_bindir}/tomboy-panel
 %{_libdir}/%{name}/*
 %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
 %{_libdir}/pkgconfig/*.pc



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:46 -0400
Subject: rpms/rt3/devel rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGk47021945@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/devel

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	29 Dec 2006 09:00:39 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:14 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:49 -0400
Subject: rpms/rt3/F-7 rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGnQ4021948@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/F-7

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-7/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	29 Dec 2006 09:00:39 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:17 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:52 -0400
Subject: rpms/rt3/FC-6 rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGq7Q021951@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/FC-6

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/FC-6/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	5 Jan 2007 09:51:34 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:20 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:25:00 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Tue, 4 Sep 2007 11:25:00 -0400
Subject: rpms/dstat/devel dstat.spec,1.4,1.5
Message-ID: <200709041525.l84FP0de022257@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/dstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22234

Modified Files:
	dstat.spec 
Log Message:
license tag


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dstat.spec	1 May 2007 18:07:18 -0000	1.4
+++ dstat.spec	4 Sep 2007 15:24:28 -0000	1.5
@@ -4,8 +4,8 @@
 Summary: Versatile resource statistics tool
 Name: dstat
 Version: 0.6.6
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
@@ -13,7 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
-#Requires: python # Picked up automatically
+BuildRequires: python
+Requires: python
 
 %description
 Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat.
@@ -31,28 +32,22 @@
 confusion, less mistakes.
 
 %prep
-
 %setup -q
 
 %build
-
-# Plugins .py files are modules, not executable python
-%{__chmod} a-x plugins/*.py
-%{__chmod} a-x examples/*
 # Make sure the docs are in unix format
 %{__sed} -i 's/\r//' docs/*.html
 # Remove the broken symlink
 %{__rm} -rf examples/dstat.py
+%{__chmod} a-x examples/*
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-# Install the docs
+# Install the man page
 cd docs
 %{__make} install DESTDIR=%{buildroot}
-
-/usr/lib/rpm/brp-python-bytecompile # FC4 and FC5 run this automatically
-
+# Plugins .py files are modules, not executable python
 %{__chmod} a-x %{buildroot}/%{_datadir}/dstat/*.py
 %{__chmod} a+x %{buildroot}/%{_datadir}/dstat/dstat.py
 
@@ -73,6 +68,10 @@
 %{_datadir}/dstat/*.pyc
 
 %changelog
+* Tue Sep 04 2007 Radek Brich <rbrich at redhat.com> - 0.6.6-2
+- Updated license tag.
+- Spec clean up.
+
 * Tue May 01 2007 Scott Baker <scott at perturb.org> - 0.6.6-1
 - Bumped to latest release
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:28:19 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 11:28:19 -0400
Subject: rpms/mash/devel .cvsignore, 1.12, 1.13 mash.spec, 1.10, 1.11 sources,
	1.13, 1.14
Message-ID: <200709041528.l84FSJpr022388@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22338

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Aug 2007 02:59:18 -0000	1.12
+++ .cvsignore	4 Sep 2007 15:27:47 -0000	1.13
@@ -1 +1 @@
-mash-0.2.0.tar.gz
+mash-0.2.1.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mash.spec	29 Aug 2007 02:40:32 -0000	1.10
+++ mash.spec	4 Sep 2007 15:27:47 -0000	1.11
@@ -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.2.0
+Version:        0.2.1
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.1-1
+- add nspluginwrapper to multilib whitelist (#275021)
+
 * Tue Aug 28 2007 Bill Nottingham <notting at redhat.com> 0.2.0-1
 - updates to work with pungi 1.0.0, conflict with older pungi
 - fix some multilib compose issues (<drago01 at gmail.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Aug 2007 02:59:18 -0000	1.13
+++ sources	4 Sep 2007 15:27:47 -0000	1.14
@@ -1 +1 @@
-7976838633b47a3e6889b247f1f2d430  mash-0.2.0.tar.gz
+1eab12ece2d64daf0360e30ddb25071e  mash-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:28:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:28:31 -0400
Subject: rpms/rt3/devel .cvsignore, 1.6, 1.7 rt3.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200709041528.l84FSVxP022395@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22361

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.4-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Dec 2006 09:00:39 -0000	1.6
+++ .cvsignore	4 Sep 2007 15:27:58 -0000	1.7
@@ -1 +1 @@
-rt-3.6.3.tar.gz
+rt-3.6.4.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rt3.spec	4 Sep 2007 15:16:14 -0000	1.17
+++ rt3.spec	4 Sep 2007 15:27:58 -0000	1.18
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.3
-Release:	2%{?dist}
+Version:	3.6.4
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.4-1
+- Upstream update.
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Dec 2006 09:00:39 -0000	1.6
+++ sources	4 Sep 2007 15:27:58 -0000	1.7
@@ -1 +1 @@
-d6b2fa930441f16b6530aa00665eb8c7  rt-3.6.3.tar.gz
+b7a42c308a07b1f7a496d4d816bb87cc  rt-3.6.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:33:16 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 11:33:16 -0400
Subject: rpms/poppler/devel poppler.spec,1.45,1.46
Message-ID: <200709041533.l84FXGWB022616@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22588

Modified Files:
	poppler.spec 
Log Message:
* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.6-1
- Update to 0.6



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- poppler.spec	16 Aug 2007 00:15:21 -0000	1.45
+++ poppler.spec	4 Sep 2007 15:32:44 -0000	1.46
@@ -2,8 +2,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.5.91
-Release: 2%{?dist}
+Version: 0.6
+Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -12,7 +12,6 @@
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
 # https://bugs.freedesktop.org/show_bug.cgi?id=12016
-Patch0: debug-spew.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -75,7 +74,6 @@
 
 %prep
 %setup -c -q -a1
-%patch -p1 -b .debug-spew
 
 %build
 ( cd  %{name}-%{version}
@@ -139,6 +137,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.6-1
+- Update to 0.6
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.91-2
 - Remove debug spew
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:40:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 11:40:07 -0400
Subject: rpms/poppler/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200709041540.l84Fe7a1022835@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22807

Modified Files:
	.cvsignore sources 
Log Message:
Add new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Aug 2007 03:03:27 -0000	1.18
+++ .cvsignore	4 Sep 2007 15:39:35 -0000	1.19
@@ -1 +1,2 @@
-poppler-0.5.91.tar.gz
+poppler-0.6.tar.gz
+poppler-data-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Aug 2007 03:03:27 -0000	1.18
+++ sources	4 Sep 2007 15:39:35 -0000	1.19
@@ -1,2 +1,2 @@
-0cc1b0f183b1559f10154bb57268c6e1  poppler-0.5.91.tar.gz
+96883867572aa1e55e979ec75369c562  poppler-0.6.tar.gz
 5c700eb06dda9dafec09cd85225e34d4  poppler-data-0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:47:10 2007
From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor))
Date: Tue, 4 Sep 2007 11:47:10 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.17,1.18
Message-ID: <200709041547.l84FlAlj025245@cvs-int.fedora.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/F-7

Modified Files:
	mugshot.spec 
Log Message:
- Don't put two autostart files in the autostart directory
  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
  (Nils Philippsen)



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mugshot.spec	22 Aug 2007 20:32:18 -0000	1.17
+++ mugshot.spec	4 Sep 2007 15:46:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -81,7 +81,7 @@
 desktop-file-install 					\
   --dir=$RPM_BUILD_ROOT%{_datadir}/gnome/autostart 	\
   --vendor=mugshot   					\
-  mugshot.desktop
+  mugshot-autostart.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,11 +206,15 @@
 %{_libdir}/mugshot
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
-%{_datadir}/gnome/autostart/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
+- Don't put two autostart files in the autostart directory
+  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
+  (Nils Philippsen)
+
 * Wed Aug 21 2007 Colin Walters <walters at redhat.com> - 1.1.50-1
 - 1.1.50
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:47:13 2007
From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor))
Date: Tue, 4 Sep 2007 11:47:13 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.16,1.17
Message-ID: <200709041547.l84FlDFQ025248@cvs-int.fedora.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/devel

Modified Files:
	mugshot.spec 
Log Message:
- Don't put two autostart files in the autostart directory
  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
  (Nils Philippsen)



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mugshot.spec	21 Aug 2007 19:11:30 -0000	1.16
+++ mugshot.spec	4 Sep 2007 15:46:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -81,7 +81,7 @@
 desktop-file-install 					\
   --dir=$RPM_BUILD_ROOT%{_datadir}/gnome/autostart 	\
   --vendor=mugshot   					\
-  mugshot.desktop
+  mugshot-autostart.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,11 +206,15 @@
 %{_libdir}/mugshot
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
-%{_datadir}/gnome/autostart/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
+- Don't put two autostart files in the autostart directory
+  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
+  (Nils Philippsen)
+
 * Wed Aug 21 2007 Colin Walters <walters at redhat.com> - 1.1.50-1
 - 1.1.50
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:54:10 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 11:54:10 -0400
Subject: rpms/dhcp/F-7 dhcp.spec,1.164,1.165 linux,1.5,1.6
Message-ID: <200709041554.l84FsA3r025560@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25480

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- dhcp.spec	9 Jul 2007 14:59:25 -0000	1.164
+++ dhcp.spec	4 Sep 2007 15:53:38 -0000	1.165
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  38%{?dist}
+Release:  39%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -434,6 +434,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
 * Mon Jul 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-38
 - Remove -TERM option from killproc command (#245317)
 


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux	11 Apr 2007 19:38:56 -0000	1.5
+++ linux	4 Sep 2007 15:53:38 -0000	1.6
@@ -410,15 +410,10 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
-	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
-	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
-	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
-	    for s in $new_ntp_servers ${localClocks[@]};
-	      do
-	      echo 'server '$s >> /etc/ntp.conf;
+	    /bin/egrep -v '^server .*  # added by /sbin/dhclient-script$'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    for s in $new_ntp_servers; do
+	      echo "server $s  # added by /sbin/dhclient-script" >> /etc/ntp.conf;
 	    done
-	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
 		: ;
 	    else



From fedora-extras-commits at redhat.com  Tue Sep  4 15:54:55 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 4 Sep 2007 11:54:55 -0400
Subject: rpms/gtkwave/devel .cvsignore, 1.40, 1.41 gtkwave.spec, 1.44,
	1.45 sources, 1.40, 1.41
Message-ID: <200709041554.l84FstC3025617@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25566

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	27 Jul 2007 08:49:24 -0000	1.40
+++ .cvsignore	4 Sep 2007 15:54:23 -0000	1.41
@@ -1 +1 @@
-gtkwave-3.0.30.tar.gz
+gtkwave-3.1.0.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gtkwave.spec	24 Aug 2007 15:36:07 -0000	1.44
+++ gtkwave.spec	4 Sep 2007 15:54:23 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.0.30
-Release:	3%{?dist}
+Version:	3.1.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Sep  4 2007 Paul Howarth <paul at city-fan.org> 3.1.0-1
+- update to 3.1.0
+
 * Fri Aug 24 2007 Paul Howarth <paul at city-fan.org> 3.0.30-3
 - clarify license as GPL, version 2 or later
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	27 Jul 2007 08:49:24 -0000	1.40
+++ sources	4 Sep 2007 15:54:23 -0000	1.41
@@ -1 +1 @@
-a5b3875938564da41773b31cc2cb1607  gtkwave-3.0.30.tar.gz
+b041a02ba825062c062ee8ac1633bbec  gtkwave-3.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:55:19 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 11:55:19 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.168,1.169 linux,1.5,1.6
Message-ID: <200709041555.l84FtJL4025677@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- dhcp.spec	16 Aug 2007 18:33:06 -0000	1.168
+++ dhcp.spec	4 Sep 2007 15:54:47 -0000	1.169
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  3%{?dist}
+Release:  4%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
 * Wed Aug 15 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-3
 - Remove the -x switch enabling extended new option info.  If given to
   dhclient now, it's ignored.


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux	11 Apr 2007 19:38:56 -0000	1.5
+++ linux	4 Sep 2007 15:54:47 -0000	1.6
@@ -410,15 +410,10 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
-	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
-	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
-	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
-	    for s in $new_ntp_servers ${localClocks[@]};
-	      do
-	      echo 'server '$s >> /etc/ntp.conf;
+	    /bin/egrep -v '^server .*  # added by /sbin/dhclient-script$'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    for s in $new_ntp_servers; do
+	      echo "server $s  # added by /sbin/dhclient-script" >> /etc/ntp.conf;
 	    done
-	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
 		: ;
 	    else



From fedora-extras-commits at redhat.com  Tue Sep  4 15:56:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 11:56:58 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.47,1.48
Message-ID: <200709041556.l84Fuwvu025846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25815

Modified Files:
	gcalctool.spec 
Log Message:
fix desktop file handling



Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gcalctool.spec	4 Sep 2007 04:26:59 -0000	1.47
+++ gcalctool.spec	4 Sep 2007 15:56:25 -0000	1.48
@@ -52,10 +52,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-sed -i -e "s/OnlyShowIn=GNOME;//" $RPM_BUILD_ROOT%{_datadir}/applications/*
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+desktop-file-install --vendor gnome --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  --remove-only-show-in GNOME				\
+  --remove-only-show-in XFCE				\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # delete this crap



From fedora-extras-commits at redhat.com  Tue Sep  4 16:02:09 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 12:02:09 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1285,1.1286
Message-ID: <200709041602.l84G29Zf031838@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804

Modified Files:
	openoffice.org.spec 
Log Message:
increase inline-limit to 128


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1285
retrieving revision 1.1286
diff -u -r1.1285 -r1.1286
--- openoffice.org.spec	4 Sep 2007 13:41:37 -0000	1.1285
+++ openoffice.org.spec	4 Sep 2007 16:01:34 -0000	1.1286
@@ -1090,7 +1090,10 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=64"
+#something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+#the frame from tools->bibliography not closable wrt the mutex in
+#LoadEnvListener so use >= 128
+export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
 #add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
 export CXX="$CXX -fno-threadsafe-statics"
 #convert _smp_mflags to dmake equivalent



From fedora-extras-commits at redhat.com  Tue Sep  4 16:04:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 12:04:25 -0400
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.9,
	1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709041604.l84G4Pg9032187@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2007 04:39:53 -0000	1.9
+++ .cvsignore	4 Sep 2007 16:03:51 -0000	1.10
@@ -1 +1 @@
-DBIx-SearchBuilder-1.48.tar.gz
+DBIx-SearchBuilder-1.49.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-DBIx-SearchBuilder.spec	12 Mar 2007 04:39:53 -0000	1.13
+++ perl-DBIx-SearchBuilder.spec	4 Sep 2007 16:03:51 -0000	1.14
@@ -6,10 +6,10 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.48
+Version: 	1.49
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://www.cpan.org/modules/by-module/DBIx/DBIx-SearchBuilder-%{version}.tar.gz
@@ -91,8 +91,12 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
+- Upstream update.
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.48-1
-- Upstream updata.
+- Upstream update.
 - BR: perl(ExtUtils::MakeMaker).
 
 * Fri Mar 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.46-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2007 04:39:53 -0000	1.9
+++ sources	4 Sep 2007 16:03:51 -0000	1.10
@@ -1 +1 @@
-3ce3e7a7a00a6d7f5bab0d215bedf9fe  DBIx-SearchBuilder-1.48.tar.gz
+08bc3cba4d7f39e1e70999e6f77254c7  DBIx-SearchBuilder-1.49.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:18:19 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 4 Sep 2007 12:18:19 -0400
Subject: rpms/abiword/devel abiword-2.4.6-toc-layout.patch, NONE,
	1.1 abiword.spec, 1.44, 1.45
Message-ID: <200709041618.l84GIJMT002189@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.6-toc-layout.patch 
Log Message:
Fix 248103


abiword-2.4.6-toc-layout.patch:

--- NEW FILE abiword-2.4.6-toc-layout.patch ---
r21892 | sum1 | 2007-09-04 01:28:58 +0200 (Tue, 04 Sep 2007) | 4 lines
Fix Red Hat Bug 248103, TOC layout crash when importing RTF.

--- abiword-2.4.6.orig/abi/src/text/fmt/xp/fl_DocLayout.cpp	2007-09-04 17:19:39.000000000 +0200
+++ abiword-2.4.6/abi/src/text/fmt/xp/fl_DocLayout.cpp	2007-09-04 17:23:30.000000000 +0200
@@ -595,14 +595,19 @@ void FL_DocLayout::fillLayouts(void)
 		fl_ContainerLayout * pCL = pLastSec->getLastLayout();
 		fl_BlockLayout * pBL = NULL;
 		bool bRebreak = false;
-		if(pCL->getContainerType() == FL_CONTAINER_BLOCK)
+		if(pCL && (pCL->getContainerType() == FL_CONTAINER_BLOCK))
+
 		{
 	              pBL = static_cast<fl_BlockLayout *>(pCL);
 		}
-		else
+		else if(pCL)
 		{
 	              pBL = pCL->getPrevBlockInDocument();
 		}
+		else
+		{
+	              UT_ASSERT_HARMLESS(pCL);
+		}
 		if(pBL)
 		{
 		      fp_Line * pLine = static_cast<fp_Line *>(pBL->getLastContainer());


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- abiword.spec	6 Apr 2007 16:10:03 -0000	1.44
+++ abiword.spec	4 Sep 2007 16:17:46 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -41,6 +41,7 @@
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
 Patch2: abiword-2.4.6-fontmanager.patch
+Patch3: abiword-2.4.6-toc-layout.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .fontmanager
+%patch3 -p1 -b .toc-layout
 
 %build
 cd abi
@@ -132,6 +134,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Sep 04 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:2.4.6-6.fc7
+- Fix 248103
+
 * Fri Apr 06 2007 Marc Maurer <uwog at abisource.com> - 1:2.4.6-5.fc7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 16:21:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 12:21:39 -0400
Subject: rpms/perl-DBIx-SearchBuilder/F-7 .cvsignore, 1.9,
	1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709041621.l84GLdw0002793@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2672

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2007 04:39:53 -0000	1.9
+++ .cvsignore	4 Sep 2007 16:21:06 -0000	1.10
@@ -1 +1 @@
-DBIx-SearchBuilder-1.48.tar.gz
+DBIx-SearchBuilder-1.49.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-DBIx-SearchBuilder.spec	12 Mar 2007 04:39:53 -0000	1.13
+++ perl-DBIx-SearchBuilder.spec	4 Sep 2007 16:21:06 -0000	1.14
@@ -6,10 +6,10 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.48
+Version: 	1.49
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://www.cpan.org/modules/by-module/DBIx/DBIx-SearchBuilder-%{version}.tar.gz
@@ -91,8 +91,12 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
+- Upstream update.
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.48-1
-- Upstream updata.
+- Upstream update.
 - BR: perl(ExtUtils::MakeMaker).
 
 * Fri Mar 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.46-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2007 04:39:53 -0000	1.9
+++ sources	4 Sep 2007 16:21:06 -0000	1.10
@@ -1 +1 @@
-3ce3e7a7a00a6d7f5bab0d215bedf9fe  DBIx-SearchBuilder-1.48.tar.gz
+08bc3cba4d7f39e1e70999e6f77254c7  DBIx-SearchBuilder-1.49.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:23:58 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 12:23:58 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.65, 1.66 pykickstart.spec, 1.72,
	1.73 sources, 1.72, 1.73
Message-ID: <200709041623.l84GNwTu003317@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3147

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	3 Sep 2007 23:57:34 -0000	1.65
+++ .cvsignore	4 Sep 2007 16:23:25 -0000	1.66
@@ -1 +1,2 @@
 pykickstart-1.11.tar.gz
+pykickstart-1.12.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pykickstart.spec	3 Sep 2007 23:57:34 -0000	1.72
+++ pykickstart.spec	4 Sep 2007 16:23:25 -0000	1.73
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.11
+Version: 1.12
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -42,6 +42,13 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
+- Fix lots of problems in processing the bootloader, device, network, and
+  raid commands.
+- Add %end when writing out scripts and packages.
+- Add a makefile target to run pychecker to cut down on errors in
+  releases.
+
 * Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
 - fix a few tracebacks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	3 Sep 2007 23:57:34 -0000	1.72
+++ sources	4 Sep 2007 16:23:25 -0000	1.73
@@ -1 +1 @@
-52d10943bca9bf61e9a5dd652b2acdca  pykickstart-1.11.tar.gz
+b623f52865d338ad158e3e03aac426bc  pykickstart-1.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:28:23 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 12:28:23 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.50, 1.51 sources, 
	1.61, 1.62 system-config-kickstart.spec, 1.65, 1.66
Message-ID: <200709041628.l84GSNHf004206@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4084

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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	28 Aug 2007 21:38:41 -0000	1.50
+++ .cvsignore	4 Sep 2007 16:27:50 -0000	1.51
@@ -1 +1,2 @@
 system-config-kickstart-2.7.7.1.tar.gz
+system-config-kickstart-2.7.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Aug 2007 21:38:41 -0000	1.61
+++ sources	4 Sep 2007 16:27:50 -0000	1.62
@@ -1 +1 @@
-dddda96f1eb6b40f8d964bb040328948  system-config-kickstart-2.7.7.1.tar.gz
+678a2b3f72edc142162aefc857124ccd  system-config-kickstart-2.7.12.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- system-config-kickstart.spec	28 Aug 2007 15:35:04 -0000	1.65
+++ system-config-kickstart.spec	4 Sep 2007 16:27:50 -0000	1.66
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
-Version: 2.7.11
+Version: 2.7.12
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
@@ -73,6 +73,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 2.7.12-1
+- Rework network device dialog to not use four input boxes for each address.
+- Don't require a gateway or nameserver address (#215191).
+
 * Tue Aug 28 2007 Chris Lumens <clumens at redhat.com> 2.7.11-1
 - The base repo's name has changed (#254601).
 



From fedora-extras-commits at redhat.com  Tue Sep  4 16:30:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 12:30:32 -0400
Subject: rpms/control-center/devel .cvsignore, 1.61, 1.62 control-center.spec,
	1.300, 1.301 sources, 1.64, 1.65
Message-ID: <200709041630.l84GUWjx004572@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4460

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	30 Aug 2007 08:45:16 -0000	1.61
+++ .cvsignore	4 Sep 2007 16:29:59 -0000	1.62
@@ -1 +1 @@
-gnome-control-center-2.19.91.tar.bz2
+gnome-control-center-2.19.92.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- control-center.spec	30 Aug 2007 09:13:51 -0000	1.300
+++ control-center.spec	4 Sep 2007 16:29:59 -0000	1.301
@@ -21,7 +21,7 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.19.91
+Version: 2.19.92
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -330,7 +330,6 @@
 %{_datadir}/gnome-control-center/pixmaps
 %{_datadir}/gnome-control-center/*.xml
 %{_datadir}/applications/*.desktop
-%{_datadir}/omf/control-center
 %{_datadir}/desktop-directories/*
 %{_datadir}/dbus-1/services/*
 %{_datadir}/mime/packages/gnome-theme-package.xml
@@ -387,6 +386,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 30 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.91.-1
 - Update to 2.19.91
 - Update the background and the default-apps patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	30 Aug 2007 08:45:16 -0000	1.64
+++ sources	4 Sep 2007 16:29:59 -0000	1.65
@@ -1 +1 @@
-d077ed6d4c775845bfc4bd3aba9fb65b  gnome-control-center-2.19.91.tar.bz2
+c7019c6351c46a413a90256762c33e57  gnome-control-center-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 16:35:17 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 12:35:17 -0400
Subject: rpms/krb5/devel krb5-1.6.2-key_exp.patch,1.1,1.2
Message-ID: <200709041635.l84GZHIO005188@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5050/devel

Modified Files:
	krb5-1.6.2-key_exp.patch 
Log Message:
- Do what the rfc says we should do, rather than what the error message
  suggests we're doing.


krb5-1.6.2-key_exp.patch:

Index: krb5-1.6.2-key_exp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.2-key_exp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-1.6.2-key_exp.patch	26 Jul 2007 19:06:51 -0000	1.1
+++ krb5-1.6.2-key_exp.patch	4 Sep 2007 16:34:44 -0000	1.2
@@ -1,13 +1,20 @@
 Sadique Puthen notes that the warning on the client side seems to be correspond
-to the wrong attribute on the KDC....
+to the wrong attribute on the KDC.  Do what RFC4120 says we should do.
 --- krb5-1.6.2/src/kdc/do_as_req.c	2007-06-25 15:49:06.000000000 -0400
 +++ krb5-1.6.2/src/kdc/do_as_req.c	2007-06-25 15:49:08.000000000 -0400
-@@ -371,7 +371,7 @@ process_as_req(krb5_kdc_req *request, kr
+@@ -371,7 +371,14 @@ process_as_req(krb5_kdc_req *request, kr
  	goto errout;
      }
      reply_encpart.nonce = request->nonce;
 -    reply_encpart.key_exp = client.expiration;
-+    reply_encpart.key_exp = client.pw_expiration;
++    if (client.expiration == 0) {
++       reply_encpart.key_exp = client.pw_expiration;
++    } else if (client.pw_expiration == 0) {
++       reply_encpart.key_exp = client.expiration;
++    } else {
++       reply_encpart.key_exp = client.pw_expiration < client.expiration ?;
++                               client.pw_expiration : client.expiration;
++    }
      reply_encpart.flags = enc_tkt_reply.flags;
      reply_encpart.server = ticket_reply.server;
  



From fedora-extras-commits at redhat.com  Tue Sep  4 16:41:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 12:41:43 -0400
Subject: rpms/evince/devel .cvsignore, 1.36, 1.37 evince.spec, 1.91,
	1.92 sources, 1.35, 1.36
Message-ID: <200709041641.l84GfhGJ005985@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
- Update to 2.19.92.  Evince now follows GNOME version numbers.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 Jul 2007 01:30:57 -0000	1.36
+++ .cvsignore	4 Sep 2007 16:41:10 -0000	1.37
@@ -1 +1 @@
-evince-0.9.3.tar.bz2
+evince-2.19.92.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- evince.spec	15 Aug 2007 13:50:43 -0000	1.91
+++ evince.spec	4 Sep 2007 16:41:10 -0000	1.92
@@ -4,8 +4,8 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	0.9.3
-Release:	5%{?dist}
+Version:	2.19.92
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
+- Update to 2.19.92.  Evince now follows GNOME version numbers.
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.9.3-5
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	31 Jul 2007 01:30:57 -0000	1.35
+++ sources	4 Sep 2007 16:41:10 -0000	1.36
@@ -1 +1 @@
-64259f5b7084f5c98b463eb42b000114  evince-0.9.3.tar.bz2
+274db35fee7c46b7d081e1ae86f495c2  evince-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 16:57:52 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 12:57:52 -0400
Subject: rpms/gkrellm/devel gkrellm-2.3.0-gnutls.patch, NONE,
	1.1 gkrellm.spec, 1.9, 1.10
Message-ID: <200709041657.l84GvqKJ007352@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7331

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-gnutls.patch 
Log Message:
* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
- Fix gnutls detection/build and use it instead of openssl.
- Sync user and group creation with current Fedora guidelines.


gkrellm-2.3.0-gnutls.patch:

--- NEW FILE gkrellm-2.3.0-gnutls.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-04 00:10:36.000000000 +0300
@@ -41,6 +41,7 @@ echo "Checking for gnutls... " 1>& 5
 
 cat << EOF > test.c
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <errno.h>
 #include <pthread.h>
 
diff -up gkrellm-2.3.0/src/mail.c~ gkrellm-2.3.0/src/mail.c
--- gkrellm-2.3.0/src/mail.c~	2007-07-07 02:45:25.000000000 +0300
+++ gkrellm-2.3.0/src/mail.c	2007-09-04 00:10:49.000000000 +0300
@@ -34,6 +34,7 @@
 
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <pthread.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellm.spec	7 Aug 2007 20:52:50 -0000	1.9
+++ gkrellm.spec	4 Sep 2007 16:57:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,11 +9,12 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Patch0:         gkrellm-2.3.0-gnutls.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +35,7 @@
 %package daemon
 Summary:        The GNU Krell Monitors Server
 Group:          System Environment/Daemons
-Requires(pre):  /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .gnutls
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
@@ -119,9 +121,10 @@
 
 
 %pre daemon
-# the daemon shouldn't run as nobody
-/usr/sbin/groupadd -r gkrellmd 2> /dev/null || :
-/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2> /dev/null || :
+getent group gkrellmd >/dev/null || groupadd -r gkrellmd
+getent passwd gkrellmd >/dev/null || \
+useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd
+:
 
 %post daemon
 /sbin/chkconfig --add gkrellmd || :
@@ -166,6 +169,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
+- Fix gnutls detection/build and use it instead of openssl.
+- Sync user and group creation with current Fedora guidelines.
+
 * Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:00:54 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 13:00:54 -0400
Subject: fedora-security/audit fc7,1.90,1.91
Message-ID: <200709041700.l84H0sBt007794@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7775

Modified Files:
	fc7 
Log Message:
CVE for gallery2



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fc7	4 Sep 2007 12:44:08 -0000	1.90
+++ fc7	4 Sep 2007 17:00:52 -0000	1.91
@@ -8,7 +8,7 @@
 # Up to date CVE as of CVE email 20070829
 # Up to date FC7 as of 20070829
 
-CVE-MAP-NOMATCH VULNERABLE (gallery2) #267421
+CVE-2007-4650 VULNERABLE (gallery2) #267421
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
 CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861



From fedora-extras-commits at redhat.com  Tue Sep  4 17:27:10 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Tue, 4 Sep 2007 13:27:10 -0400
Subject: rpms/postgresql/devel ecpg_config.h, NONE, 1.1 postgresql.spec, 1.82,
	1.83
Message-ID: <200709041727.l84HRA9e014996@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948

Modified Files:
	postgresql.spec 
Added Files:
	ecpg_config.h 
Log Message:
Fix multilib problem introduced in 8.2.x: new include file ecpg_config.h
is architecture-dependent.


--- NEW FILE ecpg_config.h ---
/*
 * Kluge to support multilib installation of both 32- and 64-bit RPMS:
 * we need to arrange that header files that appear in both RPMs are
 * identical.  Hence, this file is architecture-independent and calls
 * in an arch-dependent file that will appear in just one RPM.
 *
 * To avoid breaking arches not explicitly supported by Red Hat, we
 * use this indirection file *only* on known multilib arches.
 *
 * Note: this may well fail if user tries to use gcc's -I- option.
 * But that option is deprecated anyway.
 */
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- postgresql.spec	25 Aug 2007 20:53:39 -0000	1.82
+++ postgresql.spec	4 Sep 2007 17:26:37 -0000	1.83
@@ -81,7 +81,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -91,6 +91,7 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
@@ -484,6 +485,8 @@
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+    install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
     ;;
   *)
     ;;
@@ -819,6 +822,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Tom Lane <tgl at redhat.com> 8.2.4-6
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+
 * Sat Aug 25 2007 Tom Lane <tgl at redhat.com> 8.2.4-5
 - Use nicer solution for tzdata file substitution: upstream discussion
   concluded that hardwiring the path was better than a symlink after all.



From fedora-extras-commits at redhat.com  Tue Sep  4 17:31:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 4 Sep 2007 13:31:32 -0400
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.4,1.5
Message-ID: <200709041731.l84HVWHg015146@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15106

Modified Files:
	ocaml-lablgl.spec 
Log Message:



Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-lablgl.spec	30 Aug 2007 09:47:31 -0000	1.4
+++ ocaml-lablgl.spec	4 Sep 2007 17:31:00 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgl
 Version:        1.02
-Release:	13%{?dist}
+Release:	14%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:35:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 13:35:26 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, NONE,
	1.1 openoffice.org.spec, 1.1286,
	1.1287 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch,
	1.4, NONE
Message-ID: <200709041735.l84HZQXT015869@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15817

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 
Removed Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 
Log Message:
remove gcj assumptions

openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch:

--- NEW FILE openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch ---
Index: source/javavm/javavm.cxx
===================================================================
RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
retrieving revision 1.72
diff -u -p -u -r1.72 javavm.cxx
--- openoffice.org.orig/stoc/source/javavm/javavm.cxx	3 Jan 2006 12:44:05 -0000	1.72
+++ openoffice.org/stoc/source/javavm/javavm.cxx	30 Jan 2006 10:12:21 -0000
@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
         {
         case JFW_E_NONE: bStarted = true; break;
         case JFW_E_NO_SELECT:
+        case JFW_E_VM_CREATION_FAILED:
         {
             // No Java configured. We silenty run the java configuration
             // Java.
@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             continue;
             break;
         }
+#if 0
         case JFW_E_VM_CREATION_FAILED:
         {
             //Error:
@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             askForRetry(css::uno::makeAny(exc));
             return css::uno::Any();
         }
+#endif
         case JFW_E_RUNNING_JVM:
         {
             //This service should make sure that we do not start java twice.
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.12
diff -u -r1.12 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Sep 2006 10:54:01 -0000	1.12
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Nov 2006 16:04:59 -0000
@@ -67,7 +67,6 @@
 {
     static char const* ar[]= {
           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-          "/gcj-4.1.1/libjvm.so",
           "/libgcj.so.7",
           "/libgcj.so.6"
     };


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -r1.1286 -r1.1287
--- openoffice.org.spec	4 Sep 2007 16:01:34 -0000	1.1286
+++ openoffice.org.spec	4 Sep 2007 17:34:53 -0000	1.1287
@@ -50,7 +50,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, libgcj-devel, java-devel, zlib-devel, xerces-j2, prelink
+BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -58,7 +58,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -76,7 +76,7 @@
 %if %{gtkprintui}
 Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
 Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
@@ -146,8 +146,8 @@
 Group: Applications/Productivity
 Requires: liberation-fonts
 Requires: hunspell-en
-Requires: libgcj >= 4.0.0, bsh, java = 1.5.0
-Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
+Requires: bsh, java >= 1.5.0
+Requires: hsqldb, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -283,7 +283,7 @@
 Summary: Software Development Kit for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: unzip, java-1.5.0-gcj-devel
+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}.
@@ -1007,7 +1007,7 @@
 %if %{gtkprintui}
 %patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch14 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
 %patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch16 -p1 -b .ooo54603.fontconfig.patch
 %patch17 -p1 -b .ooo69368.fixxmlsec.patch


--- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 17:47:50 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 13:47:50 -0400
Subject: rpms/offlineimap/devel offlineimap-5.99.2-unclosed_listitem.patch, 
	NONE, 1.1 offlineimap.spec, 1.4, 1.5
Message-ID: <200709041747.l84HlojJ016327@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	offlineimap.spec 
Added Files:
	offlineimap-5.99.2-unclosed_listitem.patch 
Log Message:
* Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml


offlineimap-5.99.2-unclosed_listitem.patch:

--- NEW FILE offlineimap-5.99.2-unclosed_listitem.patch ---
diff -up offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem offlineimap-5.99.2/offlineimap.sgml
--- offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem	2007-09-04 19:43:19.000000000 +0200
+++ offlineimap-5.99.2/offlineimap.sgml	2007-09-04 19:43:09.000000000 +0200
@@ -230,6 +230,7 @@ remoteuser = jgoerzen
 	      IMAP server and point both &OfflineIMAP; and your mail
 	      reader at it.
 	    </para>
+	  </listitem>
 	</itemizedlist>
       </refsect2>
 


Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- offlineimap.spec	16 Aug 2007 14:29:15 -0000	1.4
+++ offlineimap.spec	4 Sep 2007 17:47:17 -0000	1.5
@@ -9,6 +9,7 @@
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
 Source0:        http://software.complete.org/offlineimap/static/download_area/%{version}/%{name}_%{version}.tar.gz
+Patch0:         offlineimap-5.99.2-unclosed_listitem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -29,10 +30,12 @@
 
 %prep
 %setup -q -n %name
+%patch0 -p1
 
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
+make doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +58,7 @@
 * Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
+- add unclosed listitem in offlineimap.sgml
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 17:53:00 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 13:53:00 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1287,1.1288
Message-ID: <200709041753.l84Hr0Ih016448@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16411

Modified Files:
	openoffice.org.spec 
Log Message:
fiddle


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1287
retrieving revision 1.1288
diff -u -r1.1287 -r1.1288
--- openoffice.org.spec	4 Sep 2007 17:34:53 -0000	1.1287
+++ openoffice.org.spec	4 Sep 2007 17:52:28 -0000	1.1288
@@ -1,7 +1,11 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-
+#temp, fix configure
+%ifnarch %{ix86} x86_64
+%define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define 
+%endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
@@ -1071,7 +1075,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-!
 afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdk_line} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh



From fedora-extras-commits at redhat.com  Tue Sep  4 17:55:15 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 4 Sep 2007 13:55:15 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.42,1.43
Message-ID: <200709041755.l84HtFKT016662@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16620

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- create links for default.png etc until more artwork shows up



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- desktop-backgrounds.spec	30 Aug 2007 19:39:27 -0000	1.42
+++ desktop-backgrounds.spec	4 Sep 2007 17:54:42 -0000	1.43
@@ -1,10 +1,10 @@
-%define rh_backgrounds_version 14
+%define rh_backgrounds_version 15
 %define infinity_version 0.0.1
 
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 2
+Release: 3
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -87,9 +87,11 @@
 	rm -rf ${bgdir}/${I}
 done
 
-# default background is now in fedora-logos
-rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default.png
-rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default-wide.png
+# create links until artwork shows up
+(cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
+ ln -s infinity/am00.png default.png;
+ ln -s infinity/am00.png default-wide.png;
+ ln -s infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +110,7 @@
 %{_datadir}/backgrounds/images/stone_bird.jpg
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
+%{_datadir}/backgrounds/images/*.png
 %{_datadir}/backgrounds/infinity/*.png
 %{_datadir}/backgrounds/infinity/infinity.xml
 %dir %{_datadir}/gnome-background-properties
@@ -131,6 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
+- create links for default.png etc until more artwork shows up
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 7.92-2
 - need to include less infinity backgrounds for now; the space usage 
   kill livecds



From fedora-extras-commits at redhat.com  Tue Sep  4 17:56:20 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 13:56:20 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-init_leases.patch, NONE,
	1.1 dhcpv6.spec, 1.61, 1.62
Message-ID: <200709041756.l84HuKTj016793@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)


dhcpv6-0.10-init_leases.patch:

--- NEW FILE dhcpv6-0.10-init_leases.patch ---
diff -up dhcp-0.10/lease.c.init_leases dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.init_leases	2007-09-04 12:25:35.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-04 13:48:44.000000000 -0400
@@ -180,18 +180,25 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
+	struct stat stbuf;
 	file = fopen(name, "a+");
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (!lstat(file, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- dhcpv6.spec	21 Aug 2007 15:34:14 -0000	1.61
+++ dhcpv6.spec	4 Sep 2007 17:55:48 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,6 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
+Patch7:  %{name}-0.10-init_leases.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -79,6 +80,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
+%patch7 -p1 -b .init_leases
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -173,6 +175,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
+- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 0.10-46
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:58:45 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 13:58:45 -0400
Subject: rpms/system-config-kickstart/devel sources,1.62,1.63
Message-ID: <200709041758.l84Hwj58016923@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16899

Modified Files:
	sources 
Log Message:
Another try at this build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Sep 2007 16:27:50 -0000	1.62
+++ sources	4 Sep 2007 17:58:13 -0000	1.63
@@ -1 +1 @@
-678a2b3f72edc142162aefc857124ccd  system-config-kickstart-2.7.12.tar.gz
+8b7269b51fa7b40a235b62f2a0c8039c  system-config-kickstart-2.7.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 17:59:43 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 13:59:43 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-init_leases.patch, NONE, 1.1 dhcpv6.spec,
	1.56, 1.57
Message-ID: <200709041759.l84Hxhbm016997@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)


dhcpv6-0.10-init_leases.patch:

--- NEW FILE dhcpv6-0.10-init_leases.patch ---
diff -up dhcp-0.10/lease.c.init_leases dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.init_leases	2007-09-04 12:25:35.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-04 13:48:44.000000000 -0400
@@ -180,18 +180,25 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
+	struct stat stbuf;
 	file = fopen(name, "a+");
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (!lstat(file, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- dhcpv6.spec	2 Aug 2007 19:15:37 -0000	1.56
+++ dhcpv6.spec	4 Sep 2007 17:59:11 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,6 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
+Patch7:  %{name}-0.10-init_leases.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -68,6 +69,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
+%patch7 -p1 -b .init_leases
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -160,6 +162,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
+- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
+
 * Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-42
 - Init script fixes (#237973)
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:08:36 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:08:36 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.35, 1.36 bug-buddy.spec, 1.78,
	1.79 sources, 1.35, 1.36
Message-ID: <200709041808.l84I8aFn023281@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Mar 2007 04:50:07 -0000	1.35
+++ .cvsignore	4 Sep 2007 18:08:03 -0000	1.36
@@ -1 +1 @@
-bug-buddy-2.18.0.tar.bz2
+bug-buddy-2.19.91.svn20070904.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- bug-buddy.spec	31 Mar 2007 00:44:57 -0000	1.78
+++ bug-buddy.spec	4 Sep 2007 18:08:03 -0000	1.79
@@ -1,26 +1,27 @@
 %define pango_version 1.2.0
-%define gtk2_version 2.3.0
+%define gtk2_version 2.11.3
 %define desktop_file_utils_version 0.12-2.fc7
 %define gnome_doc_utils_version 0.2.0
 %define gconf_version 2.14
 
+%define alphatag svn20070904
+
 Name: bug-buddy
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}.%{alphatag}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
-License: GPL
+License: GPLv2 and BSD
 Group: Applications/System
-URL: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/
-Source: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.17/%{name}-%{version}.tar.bz2
-Patch0: bug-buddy-2.18.0-dupe-apps.patch
+URL: http://www.gnome.org
+Source: http://download.gnome.org/sources/bug-buddy/2.19/%{name}-%{version}.%{alphatag}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libxml2-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gnome-vfs2-devel
-BuildRequires: libglade2-devel
 BuildRequires: libgnomecanvas-devel
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -58,8 +59,7 @@
 supports the GNOME, KDE, Debian, and Ximian bug tracking systems.
 
 %prep
-%setup -q
-%patch0 -p1 -b .dupe-apps
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-scrollkeeper
@@ -78,6 +78,12 @@
   --remove-category Application				\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/breakpad-0.1
+rm -rf $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{a,la}
+mv $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so.0.0.0 \
+   $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.{a,la,so.*}
+
 %find_lang %{name}
 
 %clean
@@ -115,14 +121,19 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%doc AUTHORS COPYING NEWS README 
 %{_datadir}/icons/hicolor/48x48/apps/bug-buddy.png
 %{_datadir}/bug-buddy
 %{_datadir}/applications/*
 %{_bindir}/*
+%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+%{_libdir}/bug-buddy/libbreakpad.*
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91.fc8.svn20070904-1
+- Update to a post-2.19.91 snapshot 
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-2
 - Make bug-buddy more robust 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Mar 2007 04:50:07 -0000	1.35
+++ sources	4 Sep 2007 18:08:03 -0000	1.36
@@ -1 +1 @@
-3b3d99f2450f300d73a201bc5c00498d  bug-buddy-2.18.0.tar.bz2
+0f08f484de7870771b4e4fc494a99c4c  bug-buddy-2.19.91.svn20070904.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 18:53:55 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:53:55 -0400
Subject: rpms/offlineimap/F-7 offlineimap-5.99.2-unclosed_listitem.patch,
	NONE, 1.1
Message-ID: <200709041853.l84IrtPv025077@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063

Added Files:
	offlineimap-5.99.2-unclosed_listitem.patch 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc


offlineimap-5.99.2-unclosed_listitem.patch:

--- NEW FILE offlineimap-5.99.2-unclosed_listitem.patch ---
diff -up offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem offlineimap-5.99.2/offlineimap.sgml
--- offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem	2007-09-04 19:43:19.000000000 +0200
+++ offlineimap-5.99.2/offlineimap.sgml	2007-09-04 19:43:09.000000000 +0200
@@ -230,6 +230,7 @@ remoteuser = jgoerzen
 	      IMAP server and point both &OfflineIMAP; and your mail
 	      reader at it.
 	    </para>
+	  </listitem>
 	</itemizedlist>
       </refsect2>
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:54:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:54:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1289,1.1290
Message-ID: <200709041854.l84IsQUm025136@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057

Modified Files:
	openoffice.org.spec 
Log Message:
tweak


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -r1.1289 -r1.1290
--- openoffice.org.spec	4 Sep 2007 18:36:39 -0000	1.1289
+++ openoffice.org.spec	4 Sep 2007 18:53:54 -0000	1.1290
@@ -4,6 +4,9 @@
 #temp, fix configure
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+%else
+%define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -53,7 +56,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
+BuildRequires:	gdb, java_devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -61,7 +64,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu



From fedora-extras-commits at redhat.com  Tue Sep  4 19:01:28 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 4 Sep 2007 15:01:28 -0400
Subject: devel/kvm .cvsignore, 1.14, 1.15 kvm.spec, 1.21, 1.22 sources, 1.14,
	1.15
Message-ID: <200709041901.l84J1SKK031739@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25707

Modified Files:
	.cvsignore kvm.spec sources 
Log Message:
* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
- update to kvm-36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/kvm/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Aug 2007 21:47:03 -0000	1.14
+++ .cvsignore	4 Sep 2007 19:00:54 -0000	1.15
@@ -1 +1 @@
-kvm-35.tar.gz
+kvm-36.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kvm.spec	27 Aug 2007 21:43:49 -0000	1.21
+++ kvm.spec	4 Sep 2007 19:00:54 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 35
-Release: 3%{?dist}
+Version: 36
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -87,6 +87,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
+- update to kvm-36
+
 * Mon Aug 27 2007 Daniel P. Berrange <berrange at redhat.com> - 35-3.fc8
 - Added patch for VNC password auth and TLS+x509 cert auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/kvm/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Aug 2007 21:47:03 -0000	1.14
+++ sources	4 Sep 2007 19:00:54 -0000	1.15
@@ -1 +1 @@
-d83569154ecca5da5514a130865d88c6  kvm-35.tar.gz
+0fdbc4a6228f3876166fc0d6f01bb668  kvm-36.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 19:02:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:02:08 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.81,1.82
Message-ID: <200709041902.l84J2839031831@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31685

Modified Files:
	bug-buddy.spec 
Log Message:
fix file lists for !i386



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- bug-buddy.spec	4 Sep 2007 18:33:28 -0000	1.81
+++ bug-buddy.spec	4 Sep 2007 19:01:33 -0000	1.82
@@ -129,7 +129,9 @@
 %{_datadir}/applications/*
 %{_bindir}/*
 %{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+%ifarch i386
 %{_libdir}/bug-buddy/libbreakpad.*
+%endif
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog



From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:03:54 -0400
Subject: rpms/blktrace - New directory
Message-ID: <200709041903.l84J3sHM031977@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace

Log Message:
Directory /cvs/extras/rpms/blktrace added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:03:59 -0400
Subject: rpms/blktrace/devel - New directory
Message-ID: <200709041903.l84J3x8e031991@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace/devel

Log Message:
Directory /cvs/extras/rpms/blktrace/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:04:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:04:04 -0400
Subject: rpms/blktrace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709041904.l84J44h4032018@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace

Added Files:
	Makefile import.log 
Log Message:
Setup of module blktrace


--- NEW FILE Makefile ---
# Top level Makefile for module blktrace
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  4 19:04:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:04:08 -0400
Subject: rpms/blktrace/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709041904.l84J48km032034@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module blktrace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: blktrace
# $Id: Makefile,v 1.1 2007/09/04 19:04:04 kevin Exp $
NAME := blktrace
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 fedora-extras-commits at redhat.com  Tue Sep  4 19:10:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:10:13 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.51, 1.52 gnome-desktop.spec, 
	1.97, 1.98 sources, 1.51, 1.52
Message-ID: <200709041910.l84JADOK032420@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32330

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 03:12:31 -0000	1.51
+++ .cvsignore	4 Sep 2007 19:09:30 -0000	1.52
@@ -1 +1 @@
-gnome-desktop-2.19.90.tar.bz2
+gnome-desktop-2.19.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome-desktop.spec	31 Aug 2007 19:14:39 -0000	1.97
+++ gnome-desktop.spec	4 Sep 2007 19:09:30 -0000	1.98
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.19.90
-Release: 7%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -125,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92 (translation updates)
+
 * Fri Aug 31 2007 Soren Sandmann <sandmann at redhat.com> - 2.19.90-7
 - Plug a leak in the slideshow parser
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 03:12:31 -0000	1.51
+++ sources	4 Sep 2007 19:09:30 -0000	1.52
@@ -1 +1 @@
-7d92bc0ed7a790ca5e890431828c21fe  gnome-desktop-2.19.90.tar.bz2
+b56187d2724b6715fbc9b2da7279d2bf  gnome-desktop-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:18:16 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:18:16 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1291,1.1292
Message-ID: <200709041918.l84JIGfQ032675@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32649

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1291
retrieving revision 1.1292
diff -u -r1.1291 -r1.1292
--- openoffice.org.spec	4 Sep 2007 18:56:53 -0000	1.1291
+++ openoffice.org.spec	4 Sep 2007 19:17:44 -0000	1.1292
@@ -1,11 +1,13 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-#temp, fix configure
+#temporary until I fix configure to find gcj's jdk_home on its own
+#and when the default java-devel pulled in is icedtea on intel-alikes
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
+%define jdk_line 
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2746,6 +2748,9 @@
 
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
+- rebuild against icu
+- rebuild against icedtea
+- don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix
 



From fedora-extras-commits at redhat.com  Tue Sep  4 19:20:11 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:20:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1292,1.1293
Message-ID: <200709041920.l84JKBGs000306@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32750

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -r1.1292 -r1.1293
--- openoffice.org.spec	4 Sep 2007 19:17:44 -0000	1.1292
+++ openoffice.org.spec	4 Sep 2007 19:19:39 -0000	1.1293
@@ -7,7 +7,6 @@
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
-%define jdk_line 
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build



From fedora-extras-commits at redhat.com  Tue Sep  4 19:22:19 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 4 Sep 2007 15:22:19 -0400
Subject: devel/kvm kvm.spec, 1.22, 1.23 qemu-0.9.0-vnc-authentication.patch, 
	1.1, 1.2
Message-ID: <200709041922.l84JMJQ5000384@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359

Modified Files:
	kvm.spec qemu-0.9.0-vnc-authentication.patch 
Log Message:
* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
- rebase vnc auth patch



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kvm.spec	4 Sep 2007 19:00:54 -0000	1.22
+++ kvm.spec	4 Sep 2007 19:21:46 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -42,7 +42,7 @@
 
 %patch101 -p1
 %patch102 -p0
-%patch103 -p1
+%patch103 -p1 -b .vnc
 
 %build
 LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -87,6 +87,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
+- rebase vnc auth patch
+
 * Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
 - update to kvm-36
 

qemu-0.9.0-vnc-authentication.patch:

Index: qemu-0.9.0-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/devel/kvm/qemu-0.9.0-vnc-authentication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-0.9.0-vnc-authentication.patch	27 Aug 2007 21:43:49 -0000	1.1
+++ qemu-0.9.0-vnc-authentication.patch	4 Sep 2007 19:21:46 -0000	1.2
@@ -1,76 +1,72 @@
-diff -rupN kvm-35.orig/qemu/configure kvm-35.new/qemu/configure
---- kvm-35.orig/qemu/configure	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/configure	2007-08-27 17:08:38.000000000 -0400
-@@ -86,6 +86,7 @@ alsa="no"
- fmod="no"
- fmod_lib=""
- fmod_inc=""
-+vnc_tls="yes"
- bsd="no"
- linux="no"
- kqemu="no"
-@@ -228,6 +229,8 @@ for opt do
-   ;;
-   --fmod-inc=*) fmod_inc="$optarg"
-   ;;
-+  --disable-vnc-tls) vnc_tls="no"
-+  ;;
-   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"
-   ;;
-   --disable-slirp) slirp="no"
-@@ -303,6 +306,7 @@ echo "  --enable-coreaudio       enable 
- echo "  --enable-alsa            enable ALSA audio driver"
- echo "  --enable-fmod            enable FMOD audio driver"
- echo "  --enabled-dsound         enable DirectSound audio driver"
-+echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
- echo "  --enable-system          enable all system emulation targets"
- echo "  --disable-system         disable all system emulation targets"
- echo "  --enable-linux-user      enable all linux usermode emulation targets"
-@@ -548,6 +552,16 @@ else
- fi # -z $sdl
+diff -up kvm-36/qemu/vl.h.vnc kvm-36/qemu/vl.h
+--- kvm-36/qemu/vl.h.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/vl.h	2007-09-04 15:15:08.000000000 -0400
+@@ -118,6 +118,7 @@ void hw_error(const char *fmt, ...);
+ extern const char *bios_dir;
  
- ##########################################
-+# VNC TLS detection
-+if test "$vnc_tls" = "yes" ; then
-+  `pkg-config gnutls` || vnc_tls="no"
-+fi
-+if test "$vnc_tls" = "yes" ; then
-+  vnc_tls_cflags=`pkg-config --cflags gnutls`
-+  vnc_tls_libs=`pkg-config --libs gnutls`
-+fi
-+
-+##########################################
- # alsa sound support libraries
+ extern int vm_running;
++extern const char *qemu_name;
  
- if test "$alsa" = "yes" ; then
-@@ -632,6 +646,11 @@ else
-     fmod_support=""
- fi
- echo "FMOD support      $fmod $fmod_support"
-+echo "VNC TLS support   $vnc_tls"
-+if test "$vnc_tls" = "yes" ; then
-+    echo "    TLS CFLAGS    $vnc_tls_cflags"
-+    echo "    TLS LIBS      $vnc_tls_libs"
-+fi
- echo "kqemu support     $kqemu"
- echo "kvm support       $kvm"
- echo "Documentation     $build_docs"
-@@ -776,6 +795,12 @@ if test "$fmod" = "yes" ; then
-   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
-   echo "#define CONFIG_FMOD 1" >> $config_h
- fi
-+if test "$vnc_tls" = "yes" ; then
-+  echo "CONFIG_VNC_TLS=yes" >> $config_mak
-+  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
-+  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
-+  echo "#define CONFIG_VNC_TLS 1" >> $config_h
-+fi
- qemu_version=`head $source_path/VERSION`
- echo "VERSION=$qemu_version" >>$config_mak
- echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
-diff -rupN kvm-35.orig/qemu/d3des.c kvm-35.new/qemu/d3des.c
---- kvm-35.orig/qemu/d3des.c	1969-12-31 19:00:00.000000000 -0500
-+++ kvm-35.new/qemu/d3des.c	2007-08-27 17:08:38.000000000 -0400
+ typedef struct vm_change_state_entry VMChangeStateEntry;
+ typedef void VMChangeStateHandler(void *opaque, int running);
+@@ -943,7 +944,10 @@ void sdl_display_init(DisplayState *ds, 
+ void cocoa_display_init(DisplayState *ds, int full_screen);
+ 
+ /* vnc.c */
+-void vnc_display_init(DisplayState *ds, const char *display);
++void vnc_display_init(DisplayState *ds);
++void vnc_display_close(DisplayState *ds);
++int vnc_display_open(DisplayState *ds, const char *display);
++int vnc_display_password(DisplayState *ds, const char *password);
+ void do_info_vnc(void);
+ 
+ /* x_keymap.c */
+diff -up kvm-36/qemu/monitor.c.vnc kvm-36/qemu/monitor.c
+--- kvm-36/qemu/monitor.c.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/monitor.c	2007-09-04 15:15:08.000000000 -0400
+@@ -422,7 +422,7 @@ static void do_io_statistics(const char 
+     }
+ }
+ 
+-static void do_change(const char *device, const char *filename)
++static void do_change_block(const char *device, const char *filename)
+ {
+     BlockDriverState *bs;
+     int i;
+@@ -447,6 +447,30 @@ static void do_change(const char *device
+     }
+ }
+ 
++static void do_change_vnc(const char *target)
++{
++    if (strcmp(target, "passwd") == 0 ||
++	strcmp(target, "password") == 0) {
++	char password[9];
++	monitor_readline("Password: ", 1, password, sizeof(password)-1);
++	password[sizeof(password)-1] = '\0';
++	if (vnc_display_password(NULL, password) < 0)
++	    term_printf("could not set VNC server password\n");
++    } else {
++	if (vnc_display_open(NULL, target) < 0)
++	    term_printf("could not start VNC server on %s\n", target);
++    }
++}
++
++static void do_change(const char *device, const char *target)
++{
++    if (strcmp(device, "vnc") == 0) {
++	do_change_vnc(target);
++    } else {
++	do_change_block(device, target);
++    }
++}
++
+ static void do_screen_dump(const char *filename)
+ {
+     vga_hw_screen_dump(filename);
+diff -up /dev/null kvm-36/qemu/d3des.c
+--- /dev/null	2007-08-31 09:05:50.271024097 -0400
++++ kvm-36/qemu/d3des.c	2007-09-04 15:15:08.000000000 -0400
 @@ -0,0 +1,434 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -506,64 +502,9 @@
 + *
 + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
 + **********************************************************************/
-diff -rupN kvm-35.orig/qemu/d3des.h kvm-35.new/qemu/d3des.h
---- kvm-35.orig/qemu/d3des.h	1969-12-31 19:00:00.000000000 -0500
-+++ kvm-35.new/qemu/d3des.h	2007-08-27 17:08:38.000000000 -0400
-@@ -0,0 +1,51 @@
-+/*
-+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
-+ * triple-length support removed for use in VNC.
-+ *
-+ * These changes are:
-+ *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
-+ *
-+ * This software 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.
-+ */
-+
-+/* d3des.h -
-+ *
-+ *	Headers and defines for d3des.c
-+ *	Graven Imagery, 1992.
-+ *
-+ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
-+ *	(GEnie : OUTER; CIS : [71755,204])
-+ */
-+
-+#define EN0	0	/* MODE == encrypt */
-+#define DE1	1	/* MODE == decrypt */
-+
-+extern void deskey(unsigned char *, int);
-+/*		      hexkey[8]     MODE
-+ * Sets the internal key register according to the hexadecimal
-+ * key contained in the 8 bytes of hexkey, according to the DES,
-+ * for encryption or decryption according to MODE.
-+ */
-+
-+extern void usekey(unsigned long *);
-+/*		    cookedkey[32]
-+ * Loads the internal key register with the data in cookedkey.
-+ */
-+
-+extern void cpkey(unsigned long *);
-+/*		   cookedkey[32]
-+ * Copies the contents of the internal key register into the storage
-+ * located at &cookedkey[0].
-+ */
-+
-+extern void des(unsigned char *, unsigned char *);
-+/*		    from[8]	      to[8]
-+ * Encrypts/Decrypts (according to the key currently loaded in the
-+ * internal key register) one block of eight bytes at address 'from'
-+ * into the block at address 'to'.  They can be the same.
-+ */
-+
-+/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
-+ ********************************************************************/
-diff -rupN kvm-35.orig/qemu/Makefile.target kvm-35.new/qemu/Makefile.target
---- kvm-35.orig/qemu/Makefile.target	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/Makefile.target	2007-08-27 17:08:38.000000000 -0400
+diff -up kvm-36/qemu/Makefile.target.vnc kvm-36/qemu/Makefile.target
+--- kvm-36/qemu/Makefile.target.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/Makefile.target	2007-09-04 15:15:08.000000000 -0400
 @@ -365,6 +365,11 @@ LIBS += -lkvm
  DEPLIBS += ../user/libkvm.a
  endif
@@ -594,146 +535,9 @@
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
  
  sdlaudio.o: sdlaudio.c
-diff -rupN kvm-35.orig/qemu/monitor.c kvm-35.new/qemu/monitor.c
---- kvm-35.orig/qemu/monitor.c	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/monitor.c	2007-08-27 17:08:38.000000000 -0400
-@@ -422,7 +422,7 @@ static void do_io_statistics(const char 
-     }
- }
- 
--static void do_change(const char *device, const char *filename)
-+static void do_change_block(const char *device, const char *filename)
- {
-     BlockDriverState *bs;
-     int i;
-@@ -447,6 +447,30 @@ static void do_change(const char *device
-     }
- }
- 
-+static void do_change_vnc(const char *target)
-+{
-+    if (strcmp(target, "passwd") == 0 ||
-+	strcmp(target, "password") == 0) {
-+	char password[9];
-+	monitor_readline("Password: ", 1, password, sizeof(password)-1);
-+	password[sizeof(password)-1] = '\0';
-+	if (vnc_display_password(NULL, password) < 0)
-+	    term_printf("could not set VNC server password\n");
-+    } else {
-+	if (vnc_display_open(NULL, target) < 0)
-+	    term_printf("could not start VNC server on %s\n", target);
-+    }
-+}
-+
-+static void do_change(const char *device, const char *target)
-+{
-+    if (strcmp(device, "vnc") == 0) {
-+	do_change_vnc(target);
-+    } else {
-+	do_change_block(device, target);
-+    }
-+}
-+
- static void do_screen_dump(const char *filename)
- {
-     vga_hw_screen_dump(filename);
-diff -rupN kvm-35.orig/qemu/vl.c kvm-35.new/qemu/vl.c
---- kvm-35.orig/qemu/vl.c	2007-08-27 17:07:03.000000000 -0400
-+++ kvm-35.new/qemu/vl.c	2007-08-27 17:11:10.000000000 -0400
-@@ -180,6 +180,7 @@ const char *option_rom[MAX_OPTION_ROMS];
- int nb_option_roms;
- int semihosting_enabled = 0;
- int autostart = 1;
-+const char *qemu_name;
- int time_drift_fix = 0;
- const char *cpu_vendor_string;
- 
-@@ -6227,12 +6228,10 @@ void main_loop_wait(int timeout)
-         IOHandlerRecord **pioh;
- 
-         for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
--            if (ioh->deleted)
--                continue;
--            if (FD_ISSET(ioh->fd, &rfds)) {
-+            if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
-                 ioh->fd_read(ioh->opaque);
-             }
--            if (FD_ISSET(ioh->fd, &wfds)) {
-+            if (!ioh->deleted && ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
-                 ioh->fd_write(ioh->opaque);
-             }
-         }
-@@ -6404,6 +6403,7 @@ void help(void)
- #if defined(TARGET_PPC) || defined(TARGET_SPARC)
-            "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
- #endif
-+           "-name string    set the name of the guest\n"
-            "\n"
-            "Network options:\n"
-            "-net nic[,vlan=n][,macaddr=addr][,model=type]\n"
-@@ -6570,6 +6570,7 @@ enum {
-     QEMU_OPTION_daemonize,
-     QEMU_OPTION_option_rom,
-     QEMU_OPTION_semihosting,
-+    QEMU_OPTION_name,
-     QEMU_OPTION_incoming,
-     QEMU_OPTION_tdf,
- #if defined(__linux__)
-@@ -6668,6 +6669,7 @@ const QEMUOption qemu_options[] = {
- #if defined(TARGET_ARM)
-     { "semihosting", 0, QEMU_OPTION_semihosting },
- #endif
-+    { "name", HAS_ARG, QEMU_OPTION_name },
-     { "tdf", 0, QEMU_OPTION_tdf }, /* enable time drift fix */
- #if defined(__linux__)
-     { "no-rtc", 0, QEMU_OPTION_no_rtc },
-@@ -7389,6 +7391,9 @@ int main(int argc, char **argv)
-             case QEMU_OPTION_semihosting:
-                 semihosting_enabled = 1;
-                 break;
-+            case QEMU_OPTION_name:
-+                qemu_name = optarg;
-+                break;
-             case QEMU_OPTION_tdf:
-                 time_drift_fix = 1;
- #if defined(__linux__)
-@@ -7616,7 +7621,9 @@ int main(int argc, char **argv)
-     if (nographic) {
-         dumb_display_init(ds);
-     } else if (vnc_display != NULL) {
--	vnc_display_init(ds, vnc_display);
-+        vnc_display_init(ds);
-+        if (vnc_display_open(ds, vnc_display) < 0)
-+            exit(1);
-     } else {
- #if defined(CONFIG_SDL)
-         sdl_display_init(ds, full_screen);
-diff -rupN kvm-35.orig/qemu/vl.h kvm-35.new/qemu/vl.h
---- kvm-35.orig/qemu/vl.h	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/vl.h	2007-08-27 17:08:38.000000000 -0400
-@@ -118,6 +118,7 @@ void hw_error(const char *fmt, ...);
- extern const char *bios_dir;
- 
- extern int vm_running;
-+extern const char *qemu_name;
- 
- typedef struct vm_change_state_entry VMChangeStateEntry;
- typedef void VMChangeStateHandler(void *opaque, int running);
-@@ -943,7 +944,10 @@ void sdl_display_init(DisplayState *ds, 
- void cocoa_display_init(DisplayState *ds, int full_screen);
- 
- /* vnc.c */
--void vnc_display_init(DisplayState *ds, const char *display);
-+void vnc_display_init(DisplayState *ds);
-+void vnc_display_close(DisplayState *ds);
-+int vnc_display_open(DisplayState *ds, const char *display);
-+int vnc_display_password(DisplayState *ds, const char *password);
- void do_info_vnc(void);
- 
- /* x_keymap.c */
-diff -rupN kvm-35.orig/qemu/vnc.c kvm-35.new/qemu/vnc.c
---- kvm-35.orig/qemu/vnc.c	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/vnc.c	2007-08-27 17:11:58.000000000 -0400
+diff -up kvm-36/qemu/vnc.c.vnc kvm-36/qemu/vnc.c
+--- kvm-36/qemu/vnc.c.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/vnc.c	2007-09-04 15:15:09.000000000 -0400
 @@ -30,6 +30,28 @@
  
  #include "vnc_keysym.h"
@@ -952,23 +756,7 @@
  
      vs->width = vs->ds->width;
      vs->height = vs->ds->height;
-@@ -1109,8 +1259,13 @@ static int protocol_client_init(VncState
- 	
-     vnc_write(vs, pad, 3);           /* padding */
- 
--    vnc_write_u32(vs, 4);        
--    vnc_write(vs, "QEMU", 4);
-+    if (qemu_name)
-+        size = snprintf(buf, sizeof(buf), "QEMU (%s)", qemu_name);
-+    else
-+        size = snprintf(buf, sizeof(buf), "QEMU");
-+
-+    vnc_write_u32(vs, size);
-+    vnc_write(vs, buf, size);
-     vnc_flush(vs);
- 
-     vnc_read_when(vs, protocol_client_msg, 1);
-@@ -1118,23 +1273,587 @@ static int protocol_client_init(VncState
+@@ -1126,23 +1276,587 @@ static int protocol_client_init(VncState
      return 0;
  }
  
@@ -1563,7 +1351,7 @@
  
      return 0;
  }
-@@ -1147,9 +1866,10 @@ static void vnc_listen_read(void *opaque
+@@ -1155,9 +1869,10 @@ static void vnc_listen_read(void *opaque
  
      vs->csock = accept(vs->lsock, (struct sockaddr *)&addr, &addrlen);
      if (vs->csock != -1) {
@@ -1575,7 +1363,7 @@
  	vnc_flush(vs);
  	vnc_read_when(vs, protocol_version, 12);
  	memset(vs->old_data, 0, vs->ds->linesize * vs->ds->height);
-@@ -1162,16 +1882,8 @@ static void vnc_listen_read(void *opaque
+@@ -1170,16 +1885,8 @@ static void vnc_listen_read(void *opaque
  
  extern int parse_host_port(struct sockaddr_in *saddr, const char *str);
  
@@ -1593,7 +1381,7 @@
      VncState *vs;
  
      vs = qemu_mallocz(sizeof(VncState));
-@@ -1180,7 +1892,8 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1188,7 +1895,8 @@ void vnc_display_init(DisplayState *ds, 
  
      ds->opaque = vs;
      vnc_state = vs;
@@ -1603,7 +1391,7 @@
  
      vs->lsock = -1;
      vs->csock = -1;
-@@ -1205,16 +1918,232 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1213,16 +1921,232 @@ void vnc_display_init(DisplayState *ds, 
      memset(vs->dirty_row, 0xFF, sizeof(vs->dirty_row));
  
      vnc_dpy_resize(vs->ds, 640, 400);
@@ -1838,7 +1626,7 @@
  	}
  
  	uaddr.sun_family = AF_UNIX;
-@@ -1228,40 +2157,53 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1236,40 +2160,53 @@ void vnc_display_init(DisplayState *ds, 
  	addr = (struct sockaddr *)&iaddr;
  	addrlen = sizeof(iaddr);
  
@@ -1907,3 +1695,199 @@
 -    }
 +    return qemu_set_fd_handler2(vs->lsock, vnc_listen_poll, vnc_listen_read, NULL, vs);
  }
+diff -up /dev/null kvm-36/qemu/d3des.h
+--- /dev/null	2007-08-31 09:05:50.271024097 -0400
++++ kvm-36/qemu/d3des.h	2007-09-04 15:15:08.000000000 -0400
+@@ -0,0 +1,51 @@
++/*
++ * This is D3DES (V5.09) by Richard Outerbridge with the double and
++ * triple-length support removed for use in VNC.
++ *
++ * These changes are:
++ *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
++ *
++ * This software 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.
++ */
++
++/* d3des.h -
++ *
++ *	Headers and defines for d3des.c
++ *	Graven Imagery, 1992.
++ *
++ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
++ *	(GEnie : OUTER; CIS : [71755,204])
++ */
++
++#define EN0	0	/* MODE == encrypt */
++#define DE1	1	/* MODE == decrypt */
++
++extern void deskey(unsigned char *, int);
++/*		      hexkey[8]     MODE
++ * Sets the internal key register according to the hexadecimal
++ * key contained in the 8 bytes of hexkey, according to the DES,
++ * for encryption or decryption according to MODE.
++ */
++
++extern void usekey(unsigned long *);
++/*		    cookedkey[32]
++ * Loads the internal key register with the data in cookedkey.
++ */
++
++extern void cpkey(unsigned long *);
++/*		   cookedkey[32]
++ * Copies the contents of the internal key register into the storage
++ * located at &cookedkey[0].
++ */
++
++extern void des(unsigned char *, unsigned char *);
++/*		    from[8]	      to[8]
++ * Encrypts/Decrypts (according to the key currently loaded in the
++ * internal key register) one block of eight bytes at address 'from'
++ * into the block at address 'to'.  They can be the same.
++ */
++
++/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
++ ********************************************************************/
+diff -up kvm-36/qemu/configure.vnc kvm-36/qemu/configure
+--- kvm-36/qemu/configure.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/configure	2007-09-04 15:15:08.000000000 -0400
+@@ -86,6 +86,7 @@ alsa="no"
+ fmod="no"
+ fmod_lib=""
+ fmod_inc=""
++vnc_tls="yes"
+ bsd="no"
+ linux="no"
+ kqemu="no"
+@@ -228,6 +229,8 @@ for opt do
+   ;;
+   --fmod-inc=*) fmod_inc="$optarg"
+   ;;
++  --disable-vnc-tls) vnc_tls="no"
++  ;;
+   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"
+   ;;
+   --disable-slirp) slirp="no"
+@@ -303,6 +306,7 @@ echo "  --enable-coreaudio       enable 
+ echo "  --enable-alsa            enable ALSA audio driver"
+ echo "  --enable-fmod            enable FMOD audio driver"
+ echo "  --enabled-dsound         enable DirectSound audio driver"
++echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
+ echo "  --enable-system          enable all system emulation targets"
+ echo "  --disable-system         disable all system emulation targets"
+ echo "  --enable-linux-user      enable all linux usermode emulation targets"
+@@ -548,6 +552,16 @@ else
+ fi # -z $sdl
+ 
+ ##########################################
++# VNC TLS detection
++if test "$vnc_tls" = "yes" ; then
++  `pkg-config gnutls` || vnc_tls="no"
++fi
++if test "$vnc_tls" = "yes" ; then
++  vnc_tls_cflags=`pkg-config --cflags gnutls`
++  vnc_tls_libs=`pkg-config --libs gnutls`
++fi
++
++##########################################
+ # alsa sound support libraries
+ 
+ if test "$alsa" = "yes" ; then
+@@ -632,6 +646,11 @@ else
+     fmod_support=""
+ fi
+ echo "FMOD support      $fmod $fmod_support"
++echo "VNC TLS support   $vnc_tls"
++if test "$vnc_tls" = "yes" ; then
++    echo "    TLS CFLAGS    $vnc_tls_cflags"
++    echo "    TLS LIBS      $vnc_tls_libs"
++fi
+ echo "kqemu support     $kqemu"
+ echo "kvm support       $kvm"
+ echo "Documentation     $build_docs"
+@@ -776,6 +795,12 @@ if test "$fmod" = "yes" ; then
+   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
+   echo "#define CONFIG_FMOD 1" >> $config_h
+ fi
++if test "$vnc_tls" = "yes" ; then
++  echo "CONFIG_VNC_TLS=yes" >> $config_mak
++  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
++  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
++  echo "#define CONFIG_VNC_TLS 1" >> $config_h
++fi
+ qemu_version=`head $source_path/VERSION`
+ echo "VERSION=$qemu_version" >>$config_mak
+ echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
+diff -up kvm-36/qemu/vl.c.vnc kvm-36/qemu/vl.c
+--- kvm-36/qemu/vl.c.vnc	2007-09-04 15:15:08.000000000 -0400
++++ kvm-36/qemu/vl.c	2007-09-04 15:15:08.000000000 -0400
+@@ -184,6 +184,7 @@ const char *option_rom[MAX_OPTION_ROMS];
+ int nb_option_roms;
+ int semihosting_enabled = 0;
+ int autostart = 1;
++const char *qemu_name;
+ int time_drift_fix = 0;
+ const char *cpu_vendor_string;
+ 
+@@ -6231,12 +6232,10 @@ void main_loop_wait(int timeout)
+         IOHandlerRecord **pioh;
+ 
+         for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
+-            if (ioh->deleted)
+-                continue;
+-            if (FD_ISSET(ioh->fd, &rfds)) {
++            if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
+                 ioh->fd_read(ioh->opaque);
+             }
+-            if (FD_ISSET(ioh->fd, &wfds)) {
++            if (!ioh->deleted && ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
+                 ioh->fd_write(ioh->opaque);
+             }
+         }
+@@ -6408,6 +6407,7 @@ void help(void)
+ #if defined(TARGET_PPC) || defined(TARGET_SPARC)
+            "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
+ #endif
++           "-name string    set the name of the guest\n"
+            "\n"
+            "Network options:\n"
+            "-net nic[,vlan=n][,macaddr=addr][,model=type]\n"
+@@ -6574,6 +6574,7 @@ enum {
+     QEMU_OPTION_daemonize,
+     QEMU_OPTION_option_rom,
+     QEMU_OPTION_semihosting,
++    QEMU_OPTION_name,
+     QEMU_OPTION_incoming,
+     QEMU_OPTION_tdf,
+ #if defined(__linux__)
+@@ -6672,6 +6673,7 @@ const QEMUOption qemu_options[] = {
+ #if defined(TARGET_ARM)
+     { "semihosting", 0, QEMU_OPTION_semihosting },
+ #endif
++    { "name", HAS_ARG, QEMU_OPTION_name },
+     { "tdf", 0, QEMU_OPTION_tdf }, /* enable time drift fix */
+ #if defined(__linux__)
+     { "no-rtc", 0, QEMU_OPTION_no_rtc },
+@@ -7393,6 +7395,9 @@ int main(int argc, char **argv)
+             case QEMU_OPTION_semihosting:
+                 semihosting_enabled = 1;
+                 break;
++            case QEMU_OPTION_name:
++                qemu_name = optarg;
++                break;
+             case QEMU_OPTION_tdf:
+                 time_drift_fix = 1;
+ #if defined(__linux__)
+@@ -7620,7 +7625,9 @@ int main(int argc, char **argv)
+     if (nographic) {
+         dumb_display_init(ds);
+     } else if (vnc_display != NULL) {
+-	vnc_display_init(ds, vnc_display);
++        vnc_display_init(ds);
++        if (vnc_display_open(ds, vnc_display) < 0)
++            exit(1);
+     } else {
+ #if defined(CONFIG_SDL)
+         sdl_display_init(ds, full_screen);



From fedora-extras-commits at redhat.com  Tue Sep  4 19:24:00 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:24:00 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1293,1.1294
Message-ID: <200709041924.l84JO0CI000625@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1293
retrieving revision 1.1294
diff -u -r1.1293 -r1.1294
--- openoffice.org.spec	4 Sep 2007 19:19:39 -0000	1.1293
+++ openoffice.org.spec	4 Sep 2007 19:23:28 -0000	1.1294
@@ -7,6 +7,7 @@
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
+%define jdk_line ''
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build



From fedora-extras-commits at redhat.com  Tue Sep  4 19:28:21 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:28:21 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.42, 1.43 gnome-session.spec, 
	1.136, 1.137 sources, 1.42, 1.43
Message-ID: <200709041928.l84JSLx6000786@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv755

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	13 Aug 2007 23:40:25 -0000	1.42
+++ .cvsignore	4 Sep 2007 19:27:48 -0000	1.43
@@ -1 +1 @@
-gnome-session-2.19.90.tar.bz2
+gnome-session-2.19.92.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-session.spec	23 Aug 2007 17:51:16 -0000	1.136
+++ gnome-session.spec	4 Sep 2007 19:27:48 -0000	1.137
@@ -11,8 +11,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -185,6 +185,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	13 Aug 2007 23:40:25 -0000	1.42
+++ sources	4 Sep 2007 19:27:48 -0000	1.43
@@ -1 +1 @@
-3bc117a08247a491cb29564bb753de08  gnome-session-2.19.90.tar.bz2
+52e05bcb16fbd904e01a5aebb2ce75d1  gnome-session-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 20:00:38 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 16:00:38 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.35,
	1.36 gnome-power-manager.spec, 1.95, 1.96 sources, 1.35, 1.36
Message-ID: <200709042000.l84K0cbj001705@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	30 Jul 2007 02:40:31 -0000	1.35
+++ .cvsignore	4 Sep 2007 20:00:05 -0000	1.36
@@ -1 +1 @@
-gnome-power-manager-2.19.6.tar.bz2
+gnome-power-manager-2.19.92.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-power-manager.spec	29 Aug 2007 03:53:48 -0000	1.95
+++ gnome-power-manager.spec	4 Sep 2007 20:00:05 -0000	1.96
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.19.6
-Release: 3%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.19/gnome-power-manager-%{version}.tar.bz2
@@ -117,7 +117,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
-%changelog
+%changelog 
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.6-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	30 Jul 2007 02:40:31 -0000	1.35
+++ sources	4 Sep 2007 20:00:05 -0000	1.36
@@ -1 +1 @@
-e8eb02cc9169ba459f4d347110835ef4  gnome-power-manager-2.19.6.tar.bz2
+4fa8c70075ac56a22824b2d751df2302  gnome-power-manager-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 20:08:23 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 4 Sep 2007 16:08:23 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.16, 1.17 sources, 
	1.16, 1.17 sugar-presence-service.spec, 1.16, 1.17
Message-ID: <200709042008.l84K8NVP007859@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7826

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 21:53:36 -0000	1.16
+++ .cvsignore	4 Sep 2007 20:07:50 -0000	1.17
@@ -1 +1 @@
-sugar-presence-service-0.65-git25218b4642.tar.bz2
+sugar-presence-service-0.65-gita79f7b6488.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 21:53:37 -0000	1.16
+++ sources	4 Sep 2007 20:07:50 -0000	1.17
@@ -1 +1 @@
-2f0b0019c025c54a47451796a24e9b7c  sugar-presence-service-0.65-git25218b4642.tar.bz2
+5385e5faea01bb8499463accf2edbfd7  sugar-presence-service-0.65-gita79f7b6488.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-presence-service.spec	30 Aug 2007 21:53:37 -0000	1.16
+++ sugar-presence-service.spec	4 Sep 2007 20:07:50 -0000	1.17
@@ -1,9 +1,9 @@
-%define alphatag 20070830git
-%define commitid 25218b4642
+%define alphatag 20070904git
+%define commitid a79f7b6488
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.11.%{alphatag}25218b4642
+Release: 0.12.%{alphatag}a79f7b6488
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.11.20070830git25218b4642
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep  4 20:16:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 4 Sep 2007 16:16:06 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.42, 1.43 sources, 1.43,
	1.44 sugar.spec, 1.51, 1.52
Message-ID: <200709042016.l84KG6ri008052@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8028

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	3 Sep 2007 19:19:44 -0000	1.42
+++ .cvsignore	4 Sep 2007 20:15:33 -0000	1.43
@@ -1 +1 @@
-sugar-0.65-git0b3f687749.tar.bz2
+sugar-0.65-git0ad6398cf1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	3 Sep 2007 19:19:44 -0000	1.43
+++ sources	4 Sep 2007 20:15:33 -0000	1.44
@@ -1 +1 @@
-65e93be43c62389c4905d521f409f6ed  sugar-0.65-git0b3f687749.tar.bz2
+584319f7d8c0f95e44ccea0315528d4f  sugar-0.65-git0ad6398cf1.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sugar.spec	3 Sep 2007 19:19:44 -0000	1.51
+++ sugar.spec	4 Sep 2007 20:15:33 -0000	1.52
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070903git
-%define commitid 0b3f687749
+%define alphatag 20070904git
+%define commitid 0ad6398cf1
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.39.%{alphatag}0b3f687749
+Release: 0.40.%{alphatag}0ad6398cf1
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
+- New snapshot
+
 * Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep  4 19:57:45 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 15:57:45 -0400
Subject: rpms/comps-extras/devel .cvsignore, 1.16, 1.17 comps-extras.spec,
	1.25, 1.26 sources, 1.20, 1.21
Message-ID: <200709041957.l84Jvj0t001553@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1531

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
update to 13-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	26 Apr 2007 14:45:21 -0000	1.16
+++ .cvsignore	4 Sep 2007 19:57:12 -0000	1.17
@@ -1 +1 @@
-comps-extras-12.tar.gz
+comps-extras-13.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comps-extras.spec	26 Apr 2007 14:45:21 -0000	1.25
+++ comps-extras.spec	4 Sep 2007 19:57:12 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 12
+Version: 13
 Release: 1
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
@@ -34,6 +34,9 @@
 %{_datadir}/pixmaps/comps/*
 
 %changelog
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> - 13-1
+- add fonts icons, tweak sound & video, system tools
+
 * Thu Apr 26 2007 Bill Nottingham <notting at redhat.com> - 12-1
 - updates to match current icon theme
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Apr 2007 14:45:21 -0000	1.20
+++ sources	4 Sep 2007 19:57:12 -0000	1.21
@@ -1 +1 @@
-a6594a5f0739ee1d7e6477c0783fec86  comps-extras-12.tar.gz
+41e7dc244d279416fd78ddc3ab4810ab  comps-extras-13.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 20:19:00 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 4 Sep 2007 16:19:00 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.51,
	1.52 selinux-policy.spec, 1.491, 1.492
Message-ID: <200709042019.l84KJ054008148@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8125

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
- Allow ktalkd to look at terminals


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- policy-20070501.patch	22 Aug 2007 14:14:52 -0000	1.51
+++ policy-20070501.patch	4 Sep 2007 20:18:57 -0000	1.52
@@ -467,6 +467,17 @@
  	role system_r types dmesg_t;
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te
+--- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-05-07 14:51:05.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-08-30 10:26:28.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ # Allow dmidecode to read /dev/mem
+ dev_read_raw_memory(dmidecode_t)
++dev_search_sysfs(dmidecode_t)
+ 
+ mls_file_read_up(dmidecode_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.4/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-05-07 14:51:05.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2007-08-07 09:42:35.000000000 -0400
@@ -1266,6 +1277,15 @@
 -ifdef(`targeted_policy',`',`
  HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:ROLE_gpg_secret_t,s0)
 -')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.6.4/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-07 14:51:02.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/java.fc	2007-08-27 09:50:36.000000000 -0400
+@@ -22,3 +22,5 @@
+ /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/eclipse/eclipse --	gen_context(system_u:object_r:java_exec_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.6.4/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/apps/java.if	2007-08-07 09:42:35.000000000 -0400
@@ -1465,7 +1485,7 @@
  	auth_search_pam_console_data($1_userhelper_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-09-04 15:55:30.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -1488,7 +1508,16 @@
  /usr/lib(64)?/cyrus-imapd/.*	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/dpkg/.+		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/emacsen-common/.*		gen_context(system_u:object_r:bin_t,s0)
-@@ -248,6 +254,7 @@
+@@ -164,6 +170,8 @@
+ /usr/libexec/openssh/sftp-server --	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/local/lib(64)?/ipsec/.*	-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Brother/lpd(/.*)?		gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Brother/Printer/[^/]*/cupswrapper(/.*)?      gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ 
+@@ -248,6 +256,7 @@
  /var/ftp/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
  /usr/lib/yp/.+			--	gen_context(system_u:object_r:bin_t,s0)
@@ -1496,7 +1525,7 @@
  
  /var/qmail/bin                  -d      gen_context(system_u:object_r:bin_t,s0)
  /var/qmail/bin(/.*)?                    gen_context(system_u:object_r:bin_t,s0)
-@@ -256,3 +263,13 @@
+@@ -256,3 +265,14 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -1510,6 +1539,7 @@
 +/etc/apcupsd/mastertimeout  --    gen_context(system_u:object_r:bin_t,s0)
 +/etc/apcupsd/offbattery  --    gen_context(system_u:object_r:bin_t,s0)
 +/etc/apcupsd/onbattery  --    gen_context(system_u:object_r:bin_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.6.4/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2007-05-07 14:51:04.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2007-08-07 09:42:35.000000000 -0400
@@ -1604,7 +1634,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-04 13:41:27.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1643,7 +1673,15 @@
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  network_port(mail, tcp,2000,s0)
-@@ -159,6 +165,9 @@
+@@ -152,6 +158,7 @@
+ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
+ network_port(uucpd, tcp,540,s0)
+ network_port(vnc, tcp,5900,s0)
++network_port(wccp, udp,2048,s0)
+ network_port(xen, tcp,8002,s0)
+ network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
+ network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
+@@ -159,6 +166,9 @@
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -1970,7 +2008,7 @@
  /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-14 08:16:29.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-27 09:57:21.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2073,7 +2111,7 @@
  ')
  
  ########################################
-@@ -3310,6 +3346,24 @@
+@@ -3310,6 +3346,43 @@
  
  ########################################
  ## <summary>
@@ -2095,10 +2133,29 @@
 +
 +########################################
 +## <summary>
++##	dontaudit Add and remove entries from /usr directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_rw_usr_dirs',`
++	gen_require(`
++		type usr_t;
++	')
++
++	dontaudit $1 usr_t:dir rw_dir_perms;
++')
++
++
++########################################
++## <summary>
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3386,6 +3440,24 @@
+@@ -3386,6 +3459,24 @@
  
  ########################################
  ## <summary>
@@ -2123,7 +2180,7 @@
  ##	Read symbolic links in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3432,6 +3504,24 @@
+@@ -3432,6 +3523,24 @@
  
  ########################################
  ## <summary>
@@ -2148,7 +2205,7 @@
  ##	Do not audit attempts to search /usr/src.
  ## </summary>
  ## <param name="domain">
-@@ -3637,7 +3727,7 @@
+@@ -3637,7 +3746,7 @@
  		type var_t;
  	')
  
@@ -2157,7 +2214,7 @@
  ')
  
  ########################################
-@@ -3993,7 +4083,7 @@
+@@ -3993,7 +4102,7 @@
  		type var_lock_t;
  	')
  
@@ -2166,7 +2223,7 @@
  ')
  
  ########################################
-@@ -4012,7 +4102,7 @@
+@@ -4012,7 +4121,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2175,7 +2232,7 @@
  ')
  
  ########################################
-@@ -4181,7 +4271,7 @@
+@@ -4181,7 +4290,7 @@
  		type var_run_t;
  	')
  
@@ -2184,7 +2241,7 @@
  ')
  
  ########################################
-@@ -4529,6 +4619,8 @@
+@@ -4529,6 +4638,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2193,7 +2250,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4551,6 +4643,8 @@
+@@ -4551,6 +4662,8 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2202,7 +2259,7 @@
  ')
  
  ########################################
-@@ -4588,3 +4682,28 @@
+@@ -4588,3 +4701,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')
@@ -2380,7 +2437,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.6.4/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-08-27 09:16:30.000000000 -0400
 @@ -43,6 +43,11 @@
  #
  # Non-persistent/pseudo filesystems
@@ -2393,7 +2450,7 @@
  type bdev_t;
  fs_type(bdev_t)
  genfscon bdev / gen_context(system_u:object_r:bdev_t,s0)
-@@ -54,17 +59,29 @@
+@@ -54,17 +59,30 @@
  
  type capifs_t;
  fs_type(capifs_t)
@@ -2417,13 +2474,14 @@
 +type fusefs_t;
 +fs_noxattr_type(fusefs_t)
 +allow fusefs_t self:filesystem associate;
++allow fusefs_t fs_t:filesystem associate;
 +genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0)
 +genfscon fuseblk / gen_context(system_u:object_r:fusefs_t,s0)
 +
  type futexfs_t;
  fs_type(futexfs_t)
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
-@@ -83,6 +100,11 @@
+@@ -83,6 +101,11 @@
  fs_type(inotifyfs_t)
  genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0)
  
@@ -2435,7 +2493,7 @@
  type nfsd_fs_t;
  fs_type(nfsd_fs_t)
  genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0)
-@@ -105,6 +127,16 @@
+@@ -105,6 +128,16 @@
  genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0)
  files_mountpoint(rpc_pipefs_t)
  
@@ -2829,7 +2887,7 @@
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-13 19:33:33.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-30 13:53:01.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3080,7 +3138,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.6.4/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-08-20 18:21:53.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-08-27 09:57:52.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(apache,1.6.0)
@@ -3266,7 +3324,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -463,6 +526,10 @@
+@@ -463,6 +526,18 @@
  ')
  
  optional_policy(`
@@ -3274,10 +3332,18 @@
 +')
 +
 +optional_policy(`
++	dbus_system_bus_client_template(httpd,httpd_t)
++	dbus_send_system_bus(httpd_t)
++	tunable_policy(`allow_httpd_dbus_avahi',`
++		avahi_dbus_chat(httpd_t)
++	')
++')
++
++optional_policy(`
  	daemontools_service_domain(httpd_t, httpd_exec_t)
  ')
  
-@@ -486,7 +553,6 @@
+@@ -486,7 +561,6 @@
  
  optional_policy(`
  	nagios_read_config(httpd_t)
@@ -3285,7 +3351,15 @@
  ')
  
  optional_policy(`
-@@ -606,6 +672,10 @@
+@@ -506,6 +580,7 @@
+ ')
+ 
+ optional_policy(`
++	files_dontaudit_rw_usr_dirs(httpd_t)
+ 	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
+ 	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
+ ')
+@@ -606,6 +681,10 @@
  manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -3296,7 +3370,7 @@
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -668,6 +738,12 @@
+@@ -668,6 +747,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -3309,7 +3383,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -685,18 +761,6 @@
+@@ -685,18 +770,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -3328,7 +3402,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -706,7 +770,8 @@
+@@ -706,7 +779,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -3338,7 +3412,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -720,21 +785,64 @@
+@@ -720,21 +794,64 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -3358,15 +3432,15 @@
  
 -tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
 +tunable_policy(`httpd_use_nfs', `
-+	fs_read_nfs_files(httpd_sys_script_t)
-+	fs_read_nfs_symlinks(httpd_sys_script_t)
-+')
-+
-+tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
  	fs_read_nfs_files(httpd_sys_script_t)
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
++tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
++	fs_read_nfs_files(httpd_sys_script_t)
++	fs_read_nfs_symlinks(httpd_sys_script_t)
++')
++
 +tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
 +	allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
 +	allow httpd_sys_script_t self:udp_socket create_socket_perms;
@@ -3408,23 +3482,23 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_sys_script_t)
  	fs_read_cifs_symlinks(httpd_sys_script_t)
-@@ -754,14 +862,8 @@
+@@ -754,14 +871,8 @@
  # Apache unconfined script local policy
  #
  
 -unconfined_domain(httpd_unconfined_script_t)
 -
--optional_policy(`
+ optional_policy(`
 -	cron_system_entry(httpd_t, httpd_exec_t)
 -')
 -
- optional_policy(`
+-optional_policy(`
 -	nscd_socket_use(httpd_unconfined_script_t)
 +	unconfined_domain(httpd_unconfined_script_t)
  ')
  
  ########################################
-@@ -784,7 +886,26 @@
+@@ -784,7 +895,19 @@
  
  miscfiles_read_localization(httpd_rotatelogs_t)
  
@@ -3437,6 +3511,8 @@
 +
 +files_search_var_lib(httpd_bugzilla_script_t)
 +
++mta_send_mail(httpd_bugzilla_script_t)
++
 +optional_policy(`
 +	mysql_search_db(httpd_bugzilla_script_t)
 +	mysql_stream_connect(httpd_bugzilla_script_t)
@@ -3444,15 +3520,6 @@
 +
 +optional_policy(`
 +	postgresql_stream_connect(httpd_bugzilla_script_t)
-+')
-+
-+
-+optional_policy(`
-+	dbus_system_bus_client_template(httpd,httpd_t)
-+	dbus_send_system_bus(httpd_t)
-+	tunable_policy(`allow_httpd_dbus_avahi',`
-+		avahi_dbus_chat(httpd_t)
-+	')
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-2.6.4/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-05-07 14:51:01.000000000 -0400
@@ -5289,7 +5356,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.6.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-04 11:12:55.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -5298,6 +5365,15 @@
  
  ## <desc>
  ## <p>
+@@ -62,7 +63,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
+ dontaudit kadmind_t self:capability sys_tty_config;
+-allow kadmind_t self:process signal_perms;
++allow kadmind_t self:process { setfscreate signal_perms };
+ allow kadmind_t self:netlink_route_socket r_netlink_socket_perms;
+ allow kadmind_t self:unix_dgram_socket { connect create write };
+ allow kadmind_t self:tcp_socket connected_stream_socket_perms;
 @@ -91,6 +92,7 @@
  kernel_read_kernel_sysctls(kadmind_t)
  kernel_list_proc(kadmind_t)
@@ -5324,7 +5400,15 @@
  
  userdom_dontaudit_use_unpriv_user_fds(kadmind_t)
  userdom_dontaudit_search_sysadm_home_dirs(kadmind_t)
-@@ -227,6 +233,7 @@
+@@ -142,6 +148,7 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(kadmind_t)
++	seutil_read_file_contexts(kadmind_t)
+ ')
+ 
+ optional_policy(`
+@@ -227,6 +234,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
  sysnet_read_config(krb5kdc_t)
@@ -5332,7 +5416,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
-@@ -248,3 +255,36 @@
+@@ -248,3 +256,36 @@
  optional_policy(`
  	udev_read_db(krb5kdc_t)
  ')
@@ -5369,6 +5453,37 @@
 +		pcscd_stream_connect(kerberosclient)
 +	')
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.6.4/policy/modules/services/ktalk.te
+--- nsaserefpolicy/policy/modules/services/ktalk.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ktalk.te	2007-09-04 09:20:32.000000000 -0400
+@@ -49,6 +49,8 @@
+ manage_files_pattern(ktalkd_t,ktalkd_var_run_t,ktalkd_var_run_t)
+ files_pid_filetrans(ktalkd_t,ktalkd_var_run_t,file)
+ 
++auth_use_nsswitch(ktalkd_t)
++
+ kernel_read_kernel_sysctls(ktalkd_t)
+ kernel_read_system_state(ktalkd_t)
+ kernel_read_network_state(ktalkd_t)
+@@ -75,17 +77,9 @@
+ 
+ miscfiles_read_localization(ktalkd_t)
+ 
+-sysnet_read_config(ktalkd_t)
+-
+ ifdef(`targeted_policy',`
+ 	term_dontaudit_use_generic_ptys(ktalkd_t)
+ 	term_dontaudit_use_unallocated_ttys(ktalkd_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(ktalkd_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(ktalkd_t)
+-')
++term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.6.4/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/lpd.if	2007-08-07 09:42:35.000000000 -0400
@@ -5613,8 +5728,8 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-2.6.4/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2007-08-07 09:42:35.000000000 -0400
-@@ -4,13 +4,13 @@
++++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2007-09-01 07:24:41.000000000 -0400
+@@ -4,13 +4,14 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
  
@@ -5625,6 +5740,7 @@
  
  /var/log/nagios(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
  /var/log/netsaint(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
++/var/spool/nagios(/.*)?			gen_context(system_u:object_r:nagios_spool_t,s0)
  
  ifdef(`distro_debian',`
  /usr/sbin/nagios		--	gen_context(system_u:object_r:nagios_exec_t,s0)
@@ -5633,7 +5749,7 @@
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-2.6.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2007-09-04 12:41:37.000000000 -0400
 @@ -10,10 +10,6 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t,nagios_exec_t)
@@ -5645,7 +5761,26 @@
  type nagios_etc_t;
  files_config_file(nagios_etc_t)
  
-@@ -73,8 +69,10 @@
+@@ -26,6 +22,9 @@
+ type nagios_var_run_t;
+ files_pid_file(nagios_var_run_t)
+ 
++type nagios_spool_t;
++files_type(nagios_spool_t)
++
+ type nrpe_t;
+ type nrpe_exec_t;
+ init_daemon_domain(nrpe_t,nrpe_exec_t)
+@@ -60,6 +59,8 @@
+ manage_files_pattern(nagios_t,nagios_var_run_t,nagios_var_run_t)
+ files_pid_filetrans(nagios_t,nagios_var_run_t,file)
+ 
++rw_fifo_files_pattern(nagios_t, nagios_spool_t, nagios_spool_t)
++
+ kernel_read_system_state(nagios_t)
+ kernel_read_kernel_sysctls(nagios_t)
+ 
+@@ -73,8 +74,10 @@
  corenet_udp_sendrecv_all_nodes(nagios_t)
  corenet_tcp_sendrecv_all_ports(nagios_t)
  corenet_udp_sendrecv_all_ports(nagios_t)
@@ -5656,7 +5791,7 @@
  
  domain_use_interactive_fds(nagios_t)
  # for ps
-@@ -97,8 +95,6 @@
+@@ -97,8 +100,6 @@
  
  miscfiles_read_localization(nagios_t)
  
@@ -5665,7 +5800,7 @@
  userdom_dontaudit_use_unpriv_user_fds(nagios_t)
  userdom_dontaudit_search_sysadm_home_dirs(nagios_t)
  
-@@ -121,7 +117,7 @@
+@@ -121,7 +122,7 @@
  ')
  
  optional_policy(`
@@ -5674,7 +5809,7 @@
  ')
  
  optional_policy(`
-@@ -141,42 +137,31 @@
+@@ -141,42 +142,31 @@
  #
  # Nagios CGI local policy
  #
@@ -5687,41 +5822,41 @@
 -
 -read_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
--
++allow httpd_nagios_script_t self:process signal_perms;
+ 
 -allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
-+allow httpd_nagios_script_t self:process signal_perms;
++read_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
++read_lnk_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
  
 -allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
-+read_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
-+read_lnk_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
- 
--kernel_read_system_state(nagios_cgi_t)
 +allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms;
 +read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
 +read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
  
--corecmd_exec_bin(nagios_cgi_t)
+-kernel_read_system_state(nagios_cgi_t)
 +allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms;
 +read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
 +read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
  
--domain_dontaudit_read_all_domains_state(nagios_cgi_t)
+-corecmd_exec_bin(nagios_cgi_t)
 +kernel_read_system_state(httpd_nagios_script_t)
  
+-domain_dontaudit_read_all_domains_state(nagios_cgi_t)
++domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
+ 
 -files_read_etc_files(nagios_cgi_t)
 -files_read_etc_runtime_files(nagios_cgi_t)
 -files_read_kernel_symbol_table(nagios_cgi_t)
-+domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
- 
--libs_use_ld_so(nagios_cgi_t)
--libs_use_shared_libs(nagios_cgi_t)
 +files_read_etc_runtime_files(httpd_nagios_script_t)
 +files_read_kernel_symbol_table(httpd_nagios_script_t)
  
+-libs_use_ld_so(nagios_cgi_t)
+-libs_use_shared_libs(nagios_cgi_t)
+-
 -logging_send_syslog_msg(nagios_cgi_t)
 -logging_search_logs(nagios_cgi_t)
 -
@@ -5951,10 +6086,61 @@
 +	samba_read_var_files(nscd_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.fc serefpolicy-2.6.4/policy/modules/services/ntp.fc
+--- nsaserefpolicy/policy/modules/services/ntp.fc	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ntp.fc	2007-09-04 11:51:35.000000000 -0400
+@@ -17,3 +17,8 @@
+ /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
+ 
+ /var/run/ntpd\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
++
++/etc/ntp/crypto(/.*)?         gen_context(system_u:object_r:ntpd_key_t,s0)
++/etc/ntp/keys              -- gen_context(system_u:object_r:ntpd_key_t,s0)
++
++/etc/rc\.d/init\.d/ntpd	--	gen_context(system_u:object_r:ntpd_script_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-2.6.4/policy/modules/services/ntp.if
+--- nsaserefpolicy/policy/modules/services/ntp.if	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ntp.if	2007-09-04 11:52:25.000000000 -0400
+@@ -53,3 +53,22 @@
+ 	corecmd_search_bin($1)
+ 	domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
+ ')
++
++########################################
++## <summary>
++##	Execute ntp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ntp_script_domtrans',`
++	gen_require(`
++		type ntpd_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1,ntpd_script_exec_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.6.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-08-07 09:42:35.000000000 -0400
-@@ -36,6 +36,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-09-04 11:51:02.000000000 -0400
+@@ -25,6 +25,12 @@
+ type ntpdate_exec_t;
+ init_system_domain(ntpd_t,ntpdate_exec_t)
+ 
++type ntpd_key_t;
++files_type(ntpd_key_t)
++
++type ntpd_script_exec_t;
++init_script_type(ntpd_script_exec_t)
++
+ ########################################
+ #
+ # Local policy
+@@ -36,6 +42,7 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
@@ -5962,7 +6148,16 @@
  allow ntpd_t self:unix_dgram_socket create_socket_perms;
  allow ntpd_t self:unix_stream_socket create_socket_perms;
  allow ntpd_t self:tcp_socket create_stream_socket_perms;
-@@ -81,6 +82,8 @@
+@@ -49,6 +56,8 @@
+ manage_files_pattern(ntpd_t,ntpd_log_t,ntpd_log_t)
+ logging_log_filetrans(ntpd_t,ntpd_log_t,{ file dir })
+ 
++read_files_pattern(ntpd_t,ntpd_key_t,ntpd_key_t)
++
+ # for some reason it creates a file in /tmp
+ manage_dirs_pattern(ntpd_t,ntpd_tmp_t,ntpd_tmp_t)
+ manage_files_pattern(ntpd_t,ntpd_tmp_t,ntpd_tmp_t)
+@@ -81,6 +90,8 @@
  
  fs_getattr_all_fs(ntpd_t)
  fs_search_auto_mountpoints(ntpd_t)
@@ -5971,7 +6166,7 @@
  
  auth_use_nsswitch(ntpd_t)
  
-@@ -106,6 +109,8 @@
+@@ -106,6 +117,8 @@
  
  sysnet_read_config(ntpd_t)
  
@@ -5980,7 +6175,7 @@
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-@@ -137,6 +142,10 @@
+@@ -137,6 +150,10 @@
  ')
  
  optional_policy(`
@@ -6349,8 +6544,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.6.4/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-08-07 09:42:35.000000000 -0400
-@@ -38,8 +38,6 @@
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-09-01 07:03:12.000000000 -0400
+@@ -38,12 +38,11 @@
  allow pegasus_t self:unix_stream_socket create_stream_socket_perms;
  allow pegasus_t self:tcp_socket create_stream_socket_perms;
  
@@ -6359,7 +6554,12 @@
  allow pegasus_t pegasus_conf_t:dir rw_dir_perms;
  allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink };
  allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms;
-@@ -96,13 +94,13 @@
+ 
++manage_dirs_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ manage_files_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ manage_lnk_files_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ filetrans_pattern(pegasus_t,pegasus_conf_t,pegasus_data_t,{ file dir })
+@@ -96,13 +95,13 @@
  
  auth_use_nsswitch(pegasus_t)
  auth_domtrans_chk_passwd(pegasus_t)
@@ -6376,7 +6576,7 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-@@ -116,6 +114,7 @@
+@@ -116,6 +115,7 @@
  miscfiles_read_localization(pegasus_t)
  
  sysnet_read_config(pegasus_t)
@@ -6384,7 +6584,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
  userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
-@@ -129,6 +128,7 @@
+@@ -129,6 +129,7 @@
  
  optional_policy(`
  	logging_send_syslog_msg(pegasus_t)
@@ -6539,8 +6739,34 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.6.4/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-08-13 19:36:56.000000000 -0400
-@@ -84,6 +84,12 @@
++++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-09-04 16:10:20.000000000 -0400
+@@ -6,6 +6,14 @@
+ # Declarations
+ #
+ 
++## <desc>
++## <p>
++## Allow postfix_local domain full write access to mail_spool directories
++## 
++## </p>
++## </desc>
++gen_tunable(allow_postfix_local_write_mail_spool,false)
++
+ attribute postfix_user_domains;
+ # domains that transition to the
+ # postfix user domains
+@@ -27,6 +35,10 @@
+ postfix_server_domain_template(local)
+ mta_mailserver_delivery(postfix_local_t)
+ 
++tunable_policy(`allow_postfix_local_write_mail_spool', `
++	mta_rw_spool(postfix_local_t)
++')
++
+ type postfix_local_tmp_t;
+ files_tmp_file(postfix_local_tmp_t)
+ 
+@@ -84,6 +96,12 @@
  type postfix_var_run_t;
  files_pid_file(postfix_var_run_t)
  
@@ -6553,7 +6779,7 @@
  ########################################
  #
  # Postfix master process local policy
-@@ -169,12 +175,18 @@
+@@ -169,12 +187,18 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
  
@@ -6572,7 +6798,7 @@
  	cyrus_stream_connect(postfix_master_t)
  ')
  
-@@ -184,9 +196,17 @@
+@@ -184,9 +208,17 @@
  ')
  
  optional_policy(`
@@ -6590,7 +6816,7 @@
  ###########################################################
  #
  # Partially converted rules.  THESE ARE ONLY TEMPORARY
-@@ -268,6 +288,8 @@
+@@ -268,6 +300,8 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -6599,7 +6825,7 @@
  mta_read_aliases(postfix_local_t)
  mta_delete_spool(postfix_local_t)
  # For reading spamassasin
-@@ -386,7 +408,7 @@
+@@ -386,7 +420,7 @@
  # Postfix pipe local policy
  #
  
@@ -6608,7 +6834,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -395,6 +417,10 @@
+@@ -395,6 +429,10 @@
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
  optional_policy(`
@@ -6619,7 +6845,7 @@
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -441,6 +467,10 @@
+@@ -441,6 +479,10 @@
  ')
  
  optional_policy(`
@@ -6630,7 +6856,7 @@
  	ppp_use_fds(postfix_postqueue_t)
  	ppp_sigchld(postfix_postqueue_t)
  ')
-@@ -519,8 +549,6 @@
+@@ -519,8 +561,6 @@
  # Postfix smtp delivery local policy
  #
  
@@ -6639,7 +6865,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -528,6 +556,8 @@
+@@ -528,6 +568,8 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -6648,7 +6874,7 @@
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
  ')
-@@ -536,6 +566,7 @@
+@@ -536,6 +578,7 @@
  #
  # Postfix smtpd local policy
  #
@@ -6656,7 +6882,7 @@
  allow postfix_smtpd_t postfix_master_t:tcp_socket rw_stream_socket_perms;
  
  # connect to master process
-@@ -552,9 +583,45 @@
+@@ -552,9 +595,45 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -7456,7 +7682,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-23 17:07:33.000000000 -0400
 @@ -28,6 +28,35 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -7579,10 +7805,14 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +363,10 @@
+@@ -319,6 +363,14 @@
  ')
  
  optional_policy(`
++	kerberos_read_keytab(smbd_t)
++')
++
++optional_policy(`
 +	lpd_exec_lpr(smbd_t)
 +')
 +
@@ -7590,7 +7820,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +387,23 @@
+@@ -339,6 +391,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -7614,7 +7844,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +417,7 @@
+@@ -352,7 +421,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -7623,7 +7853,7 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +427,12 @@
+@@ -362,9 +431,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -7637,7 +7867,7 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -391,6 +459,7 @@
+@@ -391,6 +463,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -7645,7 +7875,7 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -457,6 +526,7 @@
+@@ -457,6 +530,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -7653,7 +7883,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +584,7 @@
+@@ -514,7 +588,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -7662,7 +7892,7 @@
  ')
  
  optional_policy(`
-@@ -534,7 +604,6 @@
+@@ -534,7 +608,6 @@
  allow swat_t self:process signal_perms;
  allow swat_t self:fifo_file rw_file_perms;
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
@@ -7670,7 +7900,7 @@
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
  allow swat_t self:netlink_route_socket r_netlink_socket_perms;
-@@ -588,6 +657,7 @@
+@@ -588,6 +661,7 @@
  fs_getattr_xattr_fs(swat_t)
  
  auth_domtrans_chk_passwd(swat_t)
@@ -7678,7 +7908,7 @@
  
  libs_use_ld_so(swat_t)
  libs_use_shared_libs(swat_t)
-@@ -625,19 +695,25 @@
+@@ -625,19 +699,25 @@
  # Winbind local policy
  #
  
@@ -7705,7 +7935,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +721,8 @@
+@@ -645,6 +725,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -7714,7 +7944,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +760,9 @@
+@@ -682,7 +764,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -7724,7 +7954,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +775,6 @@
+@@ -695,9 +779,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -7734,7 +7964,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +790,6 @@
+@@ -713,10 +794,6 @@
  ')
  
  optional_policy(`
@@ -7745,7 +7975,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +809,7 @@
+@@ -736,6 +813,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -7753,7 +7983,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +837,25 @@
+@@ -763,4 +841,25 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -7921,7 +8151,7 @@
  /usr/sbin/snmp(trap)?d	--	gen_context(system_u:object_r:snmpd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.6.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-09-04 10:34:35.000000000 -0400
 @@ -9,9 +9,6 @@
  type snmpd_exec_t;
  init_daemon_domain(snmpd_t,snmpd_exec_t)
@@ -7949,7 +8179,26 @@
  allow snmpd_t snmpd_log_t:file manage_file_perms;
  logging_log_filetrans(snmpd_t,snmpd_log_t,file)
  
-@@ -135,18 +130,19 @@
+@@ -50,6 +45,7 @@
+ 
+ kernel_read_device_sysctls(snmpd_t)
+ kernel_read_kernel_sysctls(snmpd_t)
++kernel_read_fs_sysctls(snmpd_t)
+ kernel_read_net_sysctls(snmpd_t)
+ kernel_read_proc_symlinks(snmpd_t)
+ kernel_read_system_state(snmpd_t)
+@@ -84,9 +80,7 @@
+ files_read_etc_files(snmpd_t)
+ files_read_usr_files(snmpd_t)
+ files_read_etc_runtime_files(snmpd_t)
+-files_search_home(snmpd_t)
+-files_getattr_boot_dirs(snmpd_t)
+-files_dontaudit_getattr_home_dir(snmpd_t)
++auth_read_all_dirs_except_shadow(snmpd_t)
+ 
+ fs_getattr_all_dirs(snmpd_t)
+ fs_getattr_all_fs(snmpd_t)
+@@ -135,18 +129,19 @@
  
  optional_policy(`
  	mta_read_config(snmpd_t)
@@ -8101,8 +8350,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.6.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-08-07 09:42:35.000000000 -0400
-@@ -108,6 +108,8 @@
++++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-09-04 13:40:38.000000000 -0400
+@@ -91,6 +91,7 @@
+ corenet_udp_bind_gopher_port(squid_t)
+ corenet_tcp_bind_squid_port(squid_t)
+ corenet_udp_bind_squid_port(squid_t)
++corenet_udp_bind_wccp_port(squid_t)
+ corenet_tcp_connect_ftp_port(squid_t)
+ corenet_tcp_connect_gopher_port(squid_t)
+ corenet_tcp_connect_http_port(squid_t)
+@@ -108,6 +109,8 @@
  
  fs_getattr_all_fs(squid_t)
  fs_search_auto_mountpoints(squid_t)
@@ -8111,7 +8368,7 @@
  
  selinux_dontaudit_getattr_dir(squid_t)
  
-@@ -181,7 +183,11 @@
+@@ -181,7 +184,11 @@
  	udev_read_db(squid_t)
  ')
  
@@ -9005,7 +9262,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.6.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-09-04 10:57:17.000000000 -0400
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -9014,7 +9271,17 @@
  role system_r types fsadm_t;
  
  type fsadm_log_t;
-@@ -184,3 +185,9 @@
+@@ -108,8 +109,7 @@
+ 
+ term_use_console(fsadm_t)
+ 
+-corecmd_list_bin(fsadm_t)
+-corecmd_read_bin_symlinks(fsadm_t)
++corecmd_exec_bin(fsadm_t)
+ #RedHat bug #201164
+ corecmd_exec_shell(fsadm_t)
+ 
+@@ -184,3 +184,9 @@
  	fs_dontaudit_write_ramfs_pipes(fsadm_t)
  	rhgb_stub(fsadm_t)
  ')
@@ -9175,7 +9442,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.6.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-09-04 11:59:57.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -9191,16 +9458,164 @@
  	role system_r types $1;
  
  	domtrans_pattern(initrc_t,$2,$1)
-@@ -1088,7 +1091,7 @@
+@@ -554,18 +557,19 @@
+ #
+ interface(`init_spec_domtrans_script',`
+ 	gen_require(`
+-		type initrc_t, initrc_exec_t;
++		type initrc_t;
++		attribute initscript;
  	')
  
- 	files_search_tmp($1)
--	rw_files_pattern($1,initrc_tmp_t,initrc_tmp_t)
-+	allow $1 initrc_tmp_t:file rw_file_perms;
+ 	files_list_etc($1)
+-	spec_domtrans_pattern($1,initrc_exec_t,initrc_t)
++	spec_domtrans_pattern($1,initscript,initrc_t)
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
++		range_transition $1 initscript:process s0;
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++		range_transition $1 initscript:process s0 - mls_systemhigh;
+ 	')
+ ')
+ 
+@@ -581,18 +585,46 @@
+ #
+ interface(`init_domtrans_script',`
+ 	gen_require(`
+-		type initrc_t, initrc_exec_t;
++		type initrc_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	domtrans_pattern($1,initrc_exec_t,initrc_t)
++	domtrans_pattern($1,initscript,initrc_t)
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
++		range_transition $1 initscript:process s0;
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++		range_transition $1 initscript:process s0 - mls_systemhigh;
++	')
++')
++
++########################################
++## <summary>
++##	Execute init a specific script with an automatic domain transition.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`init_script_domtrans_spec',`
++	gen_require(`
++		type initrc_t;
++	')
++
++	files_list_etc($1)
++	domtrans_pattern($1,$2,initrc_t)
++
++	ifdef(`enable_mcs',`
++		range_transition $1 $2:process s0;
++	')
++
++	ifdef(`enable_mls',`
++		range_transition $1 $2:process s0 - mls_systemhigh;
+ 	')
+ ')
+ 
+@@ -623,11 +655,11 @@
+ # cjp: added for gentoo integrated run_init
+ interface(`init_script_file_domtrans',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	domain_auto_trans($1,initrc_exec_t,$2)
++	domain_auto_trans($1,initscript,$2)
  ')
  
  ########################################
-@@ -1248,7 +1251,7 @@
+@@ -698,11 +730,11 @@
+ #
+ interface(`init_getattr_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	allow $1 initrc_exec_t:file getattr;
++	allow $1 initscript:file getattr;
+ ')
+ 
+ ########################################
+@@ -717,11 +749,11 @@
+ #
+ interface(`init_exec_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	can_exec($1,initrc_exec_t)
++	can_exec($1,initscript)
+ ')
+ 
+ ########################################
+@@ -948,6 +980,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Send messages to init scripts over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`init_dbus_send_script',`
++	gen_require(`
++		type initrc_t;
++		class dbus send_msg;
++	')
++
++	allow $1 initrc_t:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ##	Send and receive messages from
+ ##	init scripts over dbus.
+ ## </summary>
+@@ -1026,11 +1077,11 @@
+ #
+ interface(`init_read_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_search_etc($1)
+-	allow $1 initrc_exec_t:file read_file_perms;
++	allow $1 initscript:file read_file_perms;
+ ')
+ 
+ ########################################
+@@ -1248,7 +1299,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -9209,7 +9624,7 @@
  ')
  
  ########################################
-@@ -1269,3 +1272,42 @@
+@@ -1269,3 +1320,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -9252,9 +9667,31 @@
 +
 +	allow $1 init_t:process ptrace;
 +')
++
++########################################
++## <summary>
++##	Make the specified type usable for initscripts
++##	in a filesystem.
++## </summary>
++## <param name="type">
++##	<summary>
++##	Type to be used for files.
++##	</summary>
++## </param>
++#
++interface(`init_script_type',`
++	gen_require(`
++		type initrc_t;
++		attribute initscript;
++	')
++
++	typeattribute $1 initscript;
++	domain_entry_file(initrc_t,$1)
++
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.6.4/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-09-04 12:06:53.000000000 -0400
 @@ -10,13 +10,20 @@
  # Declarations
  #
@@ -9277,7 +9714,26 @@
  ')
  
  # used for direct running of init scripts
-@@ -82,7 +89,7 @@
+@@ -28,6 +35,9 @@
+ # Mark process types as daemons
+ attribute daemon;
+ 
++# Mark /etc/init.d scripts types as initscripts
++attribute initscript;
++
+ #
+ # init_t is the domain of the init process.
+ #
+@@ -54,7 +64,7 @@
+ mls_trusted_object(initctl_t)
+ 
+ type initrc_t;
+-type initrc_exec_t;
++type initrc_exec_t, initscript;
+ domain_type(initrc_t)
+ domain_entry_file(initrc_t,initrc_exec_t)
+ role system_r types initrc_t;
+@@ -82,7 +92,7 @@
  #
  
  # Use capabilities. old rule:
@@ -9286,7 +9742,7 @@
  # is ~sys_module really needed? observed: 
  # sys_boot
  # sys_tty_config
-@@ -198,7 +205,7 @@
+@@ -198,7 +208,7 @@
  #
  
  allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -9295,7 +9751,7 @@
  dontaudit initrc_t self:capability sys_module; # sysctl is triggering this
  allow initrc_t self:passwd rootok;
  
-@@ -213,8 +220,7 @@
+@@ -213,10 +223,9 @@
  allow initrc_t initrc_devpts_t:chr_file rw_term_perms;
  term_create_pty(initrc_t,initrc_devpts_t)
  
@@ -9303,9 +9759,12 @@
 -init_exec(initrc_t)
 +init_telinit(initrc_t)
  
- can_exec(initrc_t,initrc_exec_t)
+-can_exec(initrc_t,initrc_exec_t)
++can_exec(initrc_t,initscript)
  
-@@ -508,6 +514,12 @@
+ manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
+ manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
+@@ -508,6 +517,12 @@
  	')
  ')
  
@@ -9318,7 +9777,7 @@
  ifdef(`targeted_policy',`
  	domain_subj_id_change_exemption(initrc_t)
  	unconfined_domain(initrc_t)
-@@ -520,11 +532,22 @@
+@@ -520,11 +535,22 @@
  	tunable_policy(`allow_daemons_use_tty',`
  		term_use_unallocated_ttys(daemon)
  		term_use_generic_ptys(daemon)
@@ -9343,7 +9802,7 @@
  ',`
  	# cjp: require doesnt work in the else of optionals :\
  	# this also would result in a type transition
-@@ -735,6 +758,9 @@
+@@ -735,6 +761,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -10539,7 +10998,16 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-08-22 08:36:58.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-09-04 11:49:43.000000000 -0400
+@@ -45,7 +45,7 @@
+ dontaudit dhcpc_t self:capability sys_tty_config;
+ # for access("/etc/bashrc", X_OK) on Red Hat
+ dontaudit dhcpc_t self:capability { dac_read_search sys_module };
+-allow dhcpc_t self:process signal_perms;
++allow dhcpc_t self:process { ptrace signal_perms };
+ allow dhcpc_t self:fifo_file rw_file_perms;
+ allow dhcpc_t self:tcp_socket create_stream_socket_perms;
+ allow dhcpc_t self:udp_socket create_socket_perms;
 @@ -164,6 +164,10 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)
@@ -10551,15 +11019,18 @@
  	optional_policy(`
  		networkmanager_dbus_chat(dhcpc_t)
  	')
-@@ -211,6 +215,7 @@
- 	# dhclient sometimes starts ntpd
- 	init_exec_script_files(dhcpc_t)
- 	ntp_domtrans(dhcpc_t)
-+	ntp_domtrans_ntpdate(dhcpc_t)
+@@ -208,9 +212,7 @@
  ')
  
  optional_policy(`
-@@ -221,6 +226,7 @@
+-	# dhclient sometimes starts ntpd
+-	init_exec_script_files(dhcpc_t)
+-	ntp_domtrans(dhcpc_t)
++	ntp_script_domtrans(dhcpc_t)
+ ')
+ 
+ optional_policy(`
+@@ -221,6 +223,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -10567,7 +11038,7 @@
  ')
  
  optional_policy(`
-@@ -259,6 +265,7 @@
+@@ -259,6 +262,7 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -10577,7 +11048,7 @@
  allow ifconfig_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-08-31 06:15:18.000000000 -0400
 @@ -18,11 +18,6 @@
  type udev_etc_t alias etc_udev_t;
  files_config_file(udev_etc_t)
@@ -10609,17 +11080,19 @@
  
  kernel_read_system_state(udev_t)
  kernel_getattr_core_if(udev_t)
-@@ -83,16 +80,23 @@
+@@ -82,6 +79,11 @@
+ kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
  kernel_signal(udev_t)
- 
++files_read_kernel_modules(udev_t)
++
 +#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182
 +kernel_rw_net_sysctls(udev_t)
 +kernel_read_network_state(udev_t)
-+
+ 
  corecmd_exec_all_executables(udev_t)
  
- dev_rw_sysfs(udev_t)
+@@ -89,10 +91,13 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
  dev_delete_generic_files(udev_t)
@@ -10633,7 +11106,7 @@
  files_read_etc_runtime_files(udev_t)
  files_read_etc_files(udev_t)
  files_exec_etc_files(udev_t)
-@@ -142,8 +146,14 @@
+@@ -142,8 +147,14 @@
  seutil_read_file_contexts(udev_t)
  seutil_domtrans_restorecon(udev_t)
  
@@ -10648,7 +11121,7 @@
  
  userdom_use_sysadm_ttys(udev_t)
  userdom_dontaudit_search_all_users_home_content(udev_t)
-@@ -176,6 +186,10 @@
+@@ -176,6 +187,10 @@
  ')
  
  optional_policy(`
@@ -10659,7 +11132,7 @@
  	consoletype_exec(udev_t)
  ')
  
-@@ -184,6 +198,10 @@
+@@ -184,6 +199,10 @@
  ')
  
  optional_policy(`
@@ -10670,7 +11143,7 @@
  	hal_dgram_send(udev_t)
  ')
  
-@@ -194,5 +212,24 @@
+@@ -194,5 +213,24 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- selinux-policy.spec	22 Aug 2007 14:14:52 -0000	1.491
+++ selinux-policy.spec	4 Sep 2007 20:18:57 -0000	1.492
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -162,7 +162,7 @@
 selinuxenabled; \
 if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log 2> /dev/null; \
+	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
+- Allow ktalkd to look at terminals
+
 * Tue Aug 21 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-40
 - Allow modutil sys_nice
 - Allow automount to run smbclient



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:37 -0400
Subject: rpms/armacycles-ad/devel - New directory
Message-ID: <200709041900.l84J0bSu025542@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad/devel

Log Message:
Directory /cvs/extras/rpms/armacycles-ad/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:34 -0400
Subject: rpms/armacycles-ad - New directory
Message-ID: <200709041900.l84J0YqR025528@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad

Log Message:
Directory /cvs/extras/rpms/armacycles-ad added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 12:03:39 -0700
Subject: [pkgdb] blktrace (Fedora, devel) updated by kevin
Message-ID: <200709041903.l84J3eX0005434@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on blktrace (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:41 -0400
Subject: rpms/armacycles-ad Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709041900.l84J0fG5025567@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad

Added Files:
	Makefile import.log 
Log Message:
Setup of module armacycles-ad


--- NEW FILE Makefile ---
# Top level Makefile for module armacycles-ad
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 12:03:38 -0700
Subject: [pkgdb] blktrace was added for sandeen
Message-ID: <200709041903.l84J3dYi005425@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package blktrace with summary block IO tracer
Kevin Fenzi (kevin) has approved Package blktrace
Kevin Fenzi (kevin) has added a Fedora devel branch for blktrace with an owner of sandeen
Kevin Fenzi (kevin) has approved blktrace in Fedora devel
Kevin Fenzi (kevin) has approved Package blktrace
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on blktrace (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on blktrace (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on blktrace (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 18:59:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 11:59:08 -0700
Subject: [pkgdb] armacycles-ad was added for limb
Message-ID: <200709041859.l84Ix8fO005296@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package armacycles-ad with summary A lightcycle game in 3D
Kevin Fenzi (kevin) has approved Package armacycles-ad
Kevin Fenzi (kevin) has added a Fedora devel branch for armacycles-ad with an owner of limb
Kevin Fenzi (kevin) has approved armacycles-ad in Fedora devel
Kevin Fenzi (kevin) has approved Package armacycles-ad
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on armacycles-ad (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on armacycles-ad (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on armacycles-ad (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 18:57:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:57:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1290,1.1291
Message-ID: <200709041857.l84IvQe9025381@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25348

Modified Files:
	openoffice.org.spec 
Log Message:
sigh, butterfingers


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1290
retrieving revision 1.1291
diff -u -r1.1290 -r1.1291
--- openoffice.org.spec	4 Sep 2007 18:53:54 -0000	1.1290
+++ openoffice.org.spec	4 Sep 2007 18:56:53 -0000	1.1291
@@ -56,7 +56,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java_devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
+BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:44 -0400
Subject: rpms/armacycles-ad/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709041900.l84J0ihU025583@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module armacycles-ad


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: armacycles-ad
# $Id: Makefile,v 1.1 2007/09/04 19:00:41 kevin Exp $
NAME := armacycles-ad
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 fedora-extras-commits at redhat.com  Tue Sep  4 19:16:47 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:16:47 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.51, 1.52 libwnck.spec, 1.82,
	1.83 sources, 1.51, 1.52
Message-ID: <200709041916.l84JGlL6032629@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32594

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 02:50:55 -0000	1.51
+++ .cvsignore	4 Sep 2007 19:16:14 -0000	1.52
@@ -1 +1 @@
-libwnck-2.19.90.tar.bz2
+libwnck-2.19.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- libwnck.spec	21 Aug 2007 20:04:00 -0000	1.82
+++ libwnck.spec	4 Sep 2007 19:16:14 -0000	1.83
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.19/%{name}-%{version}.tar.bz2
 License: LGPLv2+
@@ -100,6 +100,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92 (translations)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 02:50:55 -0000	1.51
+++ sources	4 Sep 2007 19:16:14 -0000	1.52
@@ -1 +1 @@
-07f05c75ef405fbb7a668ff7adad917e  libwnck-2.19.90.tar.bz2
+bab1a1f8b635d9c76aa13f388138a600  libwnck-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:36:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:36:17 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.58, 1.59 gnome-panel.spec,
	1.214, 1.215 sources, 1.58, 1.59
Message-ID: <200709041936.l84JaHqr000972@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv945

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	14 Aug 2007 03:06:22 -0000	1.58
+++ .cvsignore	4 Sep 2007 19:35:44 -0000	1.59
@@ -1 +1 @@
-gnome-panel-2.19.6.tar.bz2
+gnome-panel-2.19.92.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- gnome-panel.spec	23 Aug 2007 17:47:32 -0000	1.214
+++ gnome-panel.spec	4 Sep 2007 19:35:44 -0000	1.215
@@ -21,8 +21,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.19.6
-Release: 2%{?dist} 
+Version: 2.19.92
+Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -302,6 +302,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	14 Aug 2007 03:06:22 -0000	1.58
+++ sources	4 Sep 2007 19:35:44 -0000	1.59
@@ -1 +1 @@
-b9cf4ab373b8d7970c477091b44ace0f  gnome-panel-2.19.6.tar.bz2
+698ff684d9c6ca02191e302b12ac94e1  gnome-panel-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:08:49 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 15:08:49 -0400
Subject: rpms/mash/devel .cvsignore, 1.13, 1.14 mash.spec, 1.11, 1.12 sources,
	1.14, 1.15
Message-ID: <200709041908.l84J8neo032275@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32213

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Sep 2007 15:27:47 -0000	1.13
+++ .cvsignore	4 Sep 2007 19:08:16 -0000	1.14
@@ -1 +1 @@
-mash-0.2.1.tar.gz
+mash-0.2.2.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mash.spec	4 Sep 2007 15:27:47 -0000	1.11
+++ mash.spec	4 Sep 2007 19:08:16 -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:           mash
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,8 +44,9 @@
 %{_datadir}/mash
 
 %changelog
-* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.1-1
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.2-1
 - add nspluginwrapper to multilib whitelist (#275021)
+- fix kernel-devel (#247321)
 
 * Tue Aug 28 2007 Bill Nottingham <notting at redhat.com> 0.2.0-1
 - updates to work with pungi 1.0.0, conflict with older pungi


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Sep 2007 15:27:47 -0000	1.14
+++ sources	4 Sep 2007 19:08:16 -0000	1.15
@@ -1 +1 @@
-1eab12ece2d64daf0360e30ddb25071e  mash-0.2.1.tar.gz
+a667f16ef419392f001cc012e1ce95be  mash-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 18:50:59 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:50:59 -0400
Subject: rpms/offlineimap/F-7 offlineimap.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200709041850.l84IoxlO024876@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24849

Modified Files:
	offlineimap.spec sources 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/F-7/offlineimap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- offlineimap.spec	9 Dec 2006 04:13:45 -0000	1.3
+++ offlineimap.spec	4 Sep 2007 18:50:27 -0000	1.4
@@ -1,17 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           offlineimap
-Version:        4.0.16
-Release:        3%{?dist}
+Version:        5.99.2
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
-License:        GPL
+License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
 Source0:        http://software.complete.org/offlineimap/static/download_area/%{version}/%{name}_%{version}.tar.gz
+Patch0:         offlineimap-5.99.2-unclosed_listitem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
@@ -29,10 +31,14 @@
 
 %prep
 %setup -q -n %name
+%patch0 -p1
+
 
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
+docbook2man offlineimap.sgml
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,18 +46,30 @@
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -p offlineimap.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+#%doc manual.* todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
 %{_mandir}/man1/offlineimap.1.gz
 
+
 %changelog
+* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
+- update to new version
+- update license Tag
+- add unclosed listitem in offlineimap.sgml
+- add missing BR: docbook-utils
+- build manpage
+- remove todo and manual files from %%doc
+
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5
 - added BR: python-devel, which is needed now
@@ -91,5 +109,3 @@
 
 * Fri Apr 28 2006 Adam Spiers <offlineimap at adamspiers.org> 4.0.11-1
 - Initial build.
-
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Dec 2006 17:47:54 -0000	1.2
+++ sources	4 Sep 2007 18:50:27 -0000	1.3
@@ -1 +1 @@
-3de813eec9afa373006ac5cad7299389  offlineimap_4.0.16.tar.gz
+18912c9f7bc5a24f660906ca5c84e6f4  offlineimap_5.99.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 19:13:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 15:13:56 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.7, 1.8 pulseaudio.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200709041913.l84JDu23032529@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32505

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new snapshot from CVS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Aug 2007 22:48:59 -0000	1.7
+++ .cvsignore	4 Sep 2007 19:13:23 -0000	1.8
@@ -1 +1,2 @@
-pulseaudio-0.9.7.svn20070823.tar.gz
+libflashsupport-pulse-000.svn20070904.tar.gz
+pulseaudio-0.9.7.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pulseaudio.spec	22 Aug 2007 22:48:59 -0000	1.15
+++ pulseaudio.spec	4 Sep 2007 19:13:23 -0000	1.16
@@ -3,27 +3,31 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.8.svn20070823%{?dist}
-License:	GPL
+Release:	0.9.svn20070904%{?dist}
+License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070823.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070904.tar.gz
+Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
 BuildRequires: liboil-devel, m4, libcap-devel, libtool-ltdl-devel, pkgconfig
-BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel GConf2-devel
-BuildRequires: lirc-devel doxygen
+BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel, GConf2-devel
+BuildRequires: lirc-devel, doxygen
 #jack-audio-connection-kit-devel
-BuildRequires: hal-devel libatomic_ops-devel
+BuildRequires: hal-devel, libatomic_ops-devel
 # Libtool is dragging in rpaths.  Fedora's libtool should get rid of the
 # unneccessary ones.
 BuildRequires: libtool
 BuildRequires:	libXt-devel, xorg-x11-proto-devel
+BuildRequires: openssl-devel
+Obsoletes:	pulseaudio-devel
 
 Patch1: 	pulseaudio-0.9.6-nochown.patch
 
 %description
+A
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
@@ -78,19 +82,9 @@
 %description module-gconf
 GConf configuration backend for the PulseAudio sound server.
 
-%package devel
-Summary:	Headers and libraries for PulseAudio server module development
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-module-x11 = %{version}-%{release}
-Requires:	%{name}-lib-devel = %{version}-%{release}
-
-%description devel
-Headers and libraries for developing modules for the PulseAudio sound server.
-
 %package lib
 Summary:	Libraries for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
 
 %description lib
@@ -99,7 +93,7 @@
 
 %package lib-glib2
 Summary:	GLIB 2.x bindings for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
 
 %description lib-glib2
@@ -108,7 +102,7 @@
 
 %package lib-zeroconf
 Summary:    Zeroconf support for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:      System Environment/Libraries
 
 %description lib-zeroconf
@@ -117,7 +111,7 @@
 
 %package lib-devel
 Summary:	Headers and libraries for PulseAudio client development
-License:	LGPL
+License:	LGPLv2+
 Group:		Development/Libraries
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	%{name}-lib-glib2 = %{version}-%{release}
@@ -130,7 +124,7 @@
 
 %package utils
 Summary:	PulseAudio sound server utilities
-License:	LGPL
+License:	LGPLv2+
 Group:		Applications/Multimedia
 Requires:	%{name}-lib = %{version}-%{release}
 
@@ -138,22 +132,30 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q 
+%setup -q -T -b1 -n libflashsupport-pulse-000
+%setup -q -T -b0
 %patch1 -p1
 
 %build
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
+pwd
+pushd ../libflashsupport-pulse-000
+%configure --disable-rpath
+make LIBTOOL=/usr/bin/libtool
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+pushd ../libflashsupport-pulse-000
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la
 # configure --disable-static had no effect; delete manually.
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
-
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
 
 %clean
@@ -193,7 +195,6 @@
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %attr(4755,root,root) %{_bindir}/pulseaudio
-%{_libdir}/libpulsecore.so.*
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
@@ -226,7 +227,7 @@
 %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-cli.so
-#%{_libdir}/pulse-%{drvver}/modules/module-combine.so
+%{_libdir}/pulse-%{drvver}/modules/module-combine.so
 %{_libdir}/pulse-%{drvver}/modules/module-detect.so
 %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnfd.so
 %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnpid.so
@@ -242,7 +243,6 @@
 %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-null-sink.so
-#%{_libdir}/pulse-%{drvver}/modules/module-oss-mmap.so
 %{_libdir}/pulse-%{drvver}/modules/module-oss.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so
@@ -256,6 +256,7 @@
 #%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
+%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
 
 %files esound-compat
 %defattr(-,root,root)
@@ -290,11 +291,6 @@
 %{_libdir}/pulse-%{drvver}/modules/module-gconf.so
 %{_libexecdir}/pulse/gconf-helper
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/pulsecore/
-%{_libdir}/libpulsecore.so
-
 %files lib
 %defattr(-,root,root)
 %doc README LICENSE GPL LGPL
@@ -302,6 +298,7 @@
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.*
 %{_libdir}/libpulse-simple.so.*
+%{_libdir}/libflashsupport.so
 
 %files lib-glib2
 %defattr(-,root,root)
@@ -335,6 +332,11 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Thu Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
+- Update SVN snapshot
+- ship libflashsupport in our package
+- drop pulseaudio-devel since libpulsecore is not linked statically
+
 * Thu Aug 23 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.8.svn20070823
 - Update SVN snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2007 22:48:59 -0000	1.9
+++ sources	4 Sep 2007 19:13:23 -0000	1.10
@@ -1 +1,2 @@
-255641dd5e7869c2d13ddc11e0c604f6  pulseaudio-0.9.7.svn20070823.tar.gz
+cf255bd6fe00de595fedbf128f7d5062  libflashsupport-pulse-000.svn20070904.tar.gz
+487c4d60344d8c69e97b3ed39226b21f  pulseaudio-0.9.7.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 18:34:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:34:00 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.80,1.81
Message-ID: <200709041834.l84IY0kJ024359@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24340

Modified Files:
	bug-buddy.spec 
Log Message:
add BRs



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- bug-buddy.spec	4 Sep 2007 18:11:17 -0000	1.80
+++ bug-buddy.spec	4 Sep 2007 18:33:28 -0000	1.81
@@ -41,6 +41,7 @@
 BuildRequires: libsoup-devel >= 2.2.90
 BuildRequires: libgtop2-devel >= 2.13.3
 BuildRequires: evolution-data-server-devel >= 1.9.1
+BuildRequires: elfutils-libelf-devel
 
 Requires: gdb
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:37:11 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:37:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1288,1.1289
Message-ID: <200709041837.l84IbBuC024529@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24499

Modified Files:
	openoffice.org.spec 
Log Message:
bare define


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -r1.1288 -r1.1289
--- openoffice.org.spec	4 Sep 2007 17:52:28 -0000	1.1288
+++ openoffice.org.spec	4 Sep 2007 18:36:39 -0000	1.1289
@@ -4,7 +4,6 @@
 #temp, fix configure
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
-%define 
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1



From fedora-extras-commits at redhat.com  Tue Sep  4 18:36:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:36:18 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.8,1.9
Message-ID: <200709041836.l84IaIeN024489@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24436

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- offlineimap.spec	4 Sep 2007 18:25:20 -0000	1.8
+++ offlineimap.spec	4 Sep 2007 18:35:45 -0000	1.9
@@ -54,7 +54,7 @@
 %files
 %defattr(-,root,root,-)
 #%doc manual.* todo
-%doc README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/



From fedora-extras-commits at redhat.com  Tue Sep  4 18:11:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:11:50 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.79,1.80
Message-ID: <200709041811.l84IBoib023514@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23489

Modified Files:
	bug-buddy.spec 
Log Message:
add bug ref



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- bug-buddy.spec	4 Sep 2007 18:08:03 -0000	1.79
+++ bug-buddy.spec	4 Sep 2007 18:11:17 -0000	1.80
@@ -80,6 +80,7 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/breakpad-0.1
 rm -rf $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{a,la}
+# http://bugzilla.gnome.org/show_bug.cgi?id=473645
 mv $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so.0.0.0 \
    $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.{a,la,so.*}



From fedora-extras-commits at redhat.com  Tue Sep  4 18:25:53 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:25:53 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.7,1.8
Message-ID: <200709041825.l84IPrsK024064@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24037

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- offlineimap.spec	4 Sep 2007 18:12:45 -0000	1.7
+++ offlineimap.spec	4 Sep 2007 18:25:20 -0000	1.8
@@ -53,7 +53,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+#%doc manual.* todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html todo
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
@@ -67,6 +68,7 @@
 - add unclosed listitem in offlineimap.sgml
 - add missing BR: docbook-utils
 - build manpage
+- remove todo and manual files from %%doc
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 18:01:43 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:01:43 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.5,1.6
Message-ID: <200709041801.l84I1hs4022978@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22736

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- offlineimap.spec	4 Sep 2007 17:47:17 -0000	1.5
+++ offlineimap.spec	4 Sep 2007 18:01:09 -0000	1.6
@@ -13,6 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
@@ -55,10 +56,11 @@
 %{_mandir}/man1/offlineimap.1.gz
 
 %changelog
-* Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
+* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
 - add unclosed listitem in offlineimap.sgml
+- add missing BR: docbook-utils
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5
@@ -99,5 +101,3 @@
 
 * Fri Apr 28 2006 Adam Spiers <offlineimap at adamspiers.org> 4.0.11-1
 - Initial build.
-
-



From fedora-extras-commits at redhat.com  Tue Sep  4 18:13:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:13:18 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.6,1.7
Message-ID: <200709041813.l84IDICt023660@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23597

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- offlineimap.spec	4 Sep 2007 18:01:09 -0000	1.6
+++ offlineimap.spec	4 Sep 2007 18:12:45 -0000	1.7
@@ -33,10 +33,12 @@
 %setup -q -n %name
 %patch0 -p1
 
+
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
-make doc
+docbook2man offlineimap.sgml
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,9 +46,11 @@
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -p offlineimap.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
@@ -55,12 +59,14 @@
 %{python_sitelib}/offlineimap/
 %{_mandir}/man1/offlineimap.1.gz
 
+
 %changelog
 * Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
 - add unclosed listitem in offlineimap.sgml
 - add missing BR: docbook-utils
+- build manpage
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 18:10:56 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 14:10:56 -0400
Subject: rpms/krb5/devel CVE-2007-3999.patch, NONE, 1.1 CVE-2007-4000.patch, 
	NONE, 1.1 krb5.spec, 1.131, 1.132
Message-ID: <200709041810.l84IAu2W023484@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417/devel

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999.patch CVE-2007-4000.patch 
Log Message:
- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)


CVE-2007-3999.patch:

--- NEW FILE CVE-2007-3999.patch ---
*** src/lib/rpc/svc_auth_gss.c  (revision 20254)
--- src/lib/rpc/svc_auth_gss.c  (local)
***************
*** 339,345 ****
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}
--- 339,345 ----
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}

CVE-2007-4000.patch:

--- NEW FILE CVE-2007-4000.patch ---
*** src/lib/kadm5/srv/svr_policy.c      (revision 20254)
--- src/lib/kadm5/srv/svr_policy.c      (local)
***************
*** 211,218 ****
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
!     if( ret && (cnt==0) )
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))
--- 211,219 ----
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
!       return ret;
!     if (cnt != 1)
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- krb5.spec	25 Aug 2007 05:12:34 -0000	1.131
+++ krb5.spec	4 Sep 2007 18:10:23 -0000	1.132
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 4%{?dist}
+Release: 5%{?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
@@ -84,6 +84,8 @@
 Patch57: krb5-1.6.2-login_chdir.patch
 Patch58: krb5-1.6.2-key_exp.patch
 Patch59: krb5-kpasswd_tcp.patch
+Patch65: CVE-2007-3999.patch
+Patch66: CVE-2007-4000.patch
 
 Patch60: krb5-1.6.1-pam.patch
 Patch61: krb5-trunk-manpaths.patch
@@ -206,6 +208,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
+- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
+
 * Sat Aug 25 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-4
 - cover more cases in labeling files on creation
 - add missing gawk build dependency
@@ -1208,6 +1213,8 @@
 %patch51 -p0 -b .ldap_init
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
+%patch64 -p0 -b .2007-3999
+%patch65 -p0 -b .2007-4000
 #%patch55 -p1 -b .empty
 #%patch56 -p1 -b .doublelog
 #%patch57 -p1 -b .login_chdir



From fedora-extras-commits at redhat.com  Tue Sep  4 18:10:53 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 14:10:53 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999.patch, NONE, 1.1 CVE-2007-4000.patch,
	NONE, 1.1 krb5.spec, 1.113, 1.114
Message-ID: <200709041810.l84IArJt023480@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417/F-7

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999.patch CVE-2007-4000.patch 
Log Message:
- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)


CVE-2007-3999.patch:

--- NEW FILE CVE-2007-3999.patch ---
*** src/lib/rpc/svc_auth_gss.c  (revision 20254)
--- src/lib/rpc/svc_auth_gss.c  (local)
***************
*** 339,345 ****
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}
--- 339,345 ----
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}

CVE-2007-4000.patch:

--- NEW FILE CVE-2007-4000.patch ---
*** src/lib/kadm5/srv/svr_policy.c      (revision 20254)
--- src/lib/kadm5/srv/svr_policy.c      (local)
***************
*** 211,218 ****
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
!     if( ret && (cnt==0) )
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))
--- 211,219 ----
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
!       return ret;
!     if (cnt != 1)
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- krb5.spec	27 Jun 2007 18:41:04 -0000	1.113
+++ krb5.spec	4 Sep 2007 18:10:20 -0000	1.114
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -77,6 +77,8 @@
 Patch55: krb5-1.6.1-empty.patch
 Patch56: krb5-1.6.1-get_opt_fixup.patch
 Patch57: krb5-1.6.1-ftp-nospew.patch
+Patch58: CVE-2007-3999.patch
+Patch59: CVE-2007-4000.patch
 
 Patch62: krb5-any-fixup-patch.txt
 
@@ -196,6 +198,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
+- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
+
 * Wed Jun 27 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-2.1
 - incorporate fixes for MITKRB5-SA-2007-004 (CVE-2007-2442,CVE-2007-2443)
   and MITKRB5-SA-2007-005 (CVE-2007-2798)
@@ -1142,6 +1147,8 @@
 #%patch55 -p1 -b .empty
 %patch56 -p0 -b .get_opt_fixup
 %patch57 -p1 -b .ftp-nospew
+%patch58 -p0 -b .2007-3999
+%patch59 -p0 -b .2007-4000
 %patch70 -p0 -b .2007-004
 %patch71 -p0 -b .2007-005
 cp src/krb524/README README.krb524



From fedora-extras-commits at redhat.com  Tue Sep  4 18:25:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 14:25:16 -0400
Subject: rpms/gkrellm/EL-5 gkrellm-2.3.0-gnutls.patch, NONE, 1.1 gkrellm.spec,
	1.5, 1.6
Message-ID: <200709041825.l84IPGT8024031@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23986

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-gnutls.patch 
Log Message:
Resync with devel

gkrellm-2.3.0-gnutls.patch:

--- NEW FILE gkrellm-2.3.0-gnutls.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-04 00:10:36.000000000 +0300
@@ -41,6 +41,7 @@ echo "Checking for gnutls... " 1>& 5
 
 cat << EOF > test.c
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <errno.h>
 #include <pthread.h>
 
diff -up gkrellm-2.3.0/src/mail.c~ gkrellm-2.3.0/src/mail.c
--- gkrellm-2.3.0/src/mail.c~	2007-07-07 02:45:25.000000000 +0300
+++ gkrellm-2.3.0/src/mail.c	2007-09-04 00:10:49.000000000 +0300
@@ -34,6 +34,7 @@
 
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <pthread.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm.spec	3 Sep 2007 20:51:14 -0000	1.5
+++ gkrellm.spec	4 Sep 2007 18:24:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,11 +9,12 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Patch0:         gkrellm-2.3.0-gnutls.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +35,7 @@
 %package daemon
 Summary:        The GNU Krell Monitors Server
 Group:          System Environment/Daemons
-Requires(pre):  /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .gnutls
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
@@ -119,9 +121,10 @@
 
 
 %pre daemon
-# the daemon shouldn't run as nobody
-/usr/sbin/groupadd -r gkrellmd 2> /dev/null || :
-/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2> /dev/null || :
+getent group gkrellmd >/dev/null || groupadd -r gkrellmd
+getent passwd gkrellmd >/dev/null || \
+useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd
+:
 
 %post daemon
 /sbin/chkconfig --add gkrellmd || :
@@ -166,6 +169,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
+- Fix gnutls detection/build and use it instead of openssl.
+- Sync user and group creation with current Fedora guidelines.
+
 * Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:50 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:50 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmpmY006354@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchbugzilla acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:51 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:51 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmpwJ006363@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchcommits acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:55 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:55 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmtOG006372@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the approveacls acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

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



From fedora-extras-commits at redhat.com  Tue Sep  4 20:54:01 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 4 Sep 2007 16:54:01 -0400
Subject: rpms/kernel/devel kernel.spec, 1.144,
	1.145 linux-2.6-utrace-core.patch, 1.5,
	1.6 linux-2.6-utrace-ptrace-compat.patch, 1.4,
	1.5 linux-2.6-utrace-tracehook.patch, 1.8, 1.9
Message-ID: <200709042054.l84Ks1LL008639@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8604

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
utrace update (#232837, #248532)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kernel.spec	2 Sep 2007 05:40:37 -0000	1.144
+++ kernel.spec	4 Sep 2007 20:53:27 -0000	1.145
@@ -1789,6 +1789,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#232837, #248532)
+
 * Sun Sep 02 2007 Dave Jones <davej at redhat.com>
 - Fix oops in IPv4.
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-core.patch	21 Aug 2007 19:42:55 -0000	1.5
+++ linux-2.6-utrace-core.patch	4 Sep 2007 20:53:27 -0000	1.6
@@ -20,7 +20,7 @@
 ---
 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2263 +++++++++++++++++++++++++++++++++++++
+ kernel/utrace.c                   | 2344 +++++++++++++++++++++++++++++++++++++
  Documentation/utrace.txt          |  579 +++++++++
  Documentation/DocBook/Makefile    |    2 
  Documentation/DocBook/utrace.tmpl |   23 
@@ -28,7 +28,7 @@
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
  init/Kconfig                      |   20 
- 9 files changed, 3504 insertions(+), 18 deletions(-)
+ 9 files changed, 3585 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -46,7 +46,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/kernel/utrace.c
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,2263 @@
+@@ -0,0 +1,2344 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -522,7 +522,7 @@
 + */
 +struct utrace_attached_engine *
 +utrace_attach(struct task_struct *target, int flags,
-+	     const struct utrace_engine_ops *ops, void *data)
++	      const struct utrace_engine_ops *ops, void *data)
 +{
 +	struct utrace *utrace;
 +	struct utrace_attached_engine *engine;
@@ -624,10 +624,13 @@
 +EXPORT_SYMBOL_GPL(utrace_attach);
 +
 +/*
-+ * When an engine is detached, the target thread may still see it and make
-+ * callbacks until it quiesces.  We reset its event flags to just QUIESCE
-+ * and install a special ops vector whose callback is dead_engine_delete.
-+ * When the target thread quiesces, it can safely free the engine itself.
++ * When an engine is detached, the target thread may still see it
++ * and make callbacks until it quiesces.  We install a special ops
++ * vector whose callbacks are all dead_engine_delete.  When the
++ * target thread quiesces, it can safely free the engine itself.
++ * We must cover all callbacks in case of races between checking
++ * engine->flags and utrace_detach changing engine->ops.
++ * Only report_reap is never called due to a special case in utrace_reap.
 + */
 +static u32
 +dead_engine_delete(struct utrace_attached_engine *engine,
@@ -636,9 +639,38 @@
 +	return UTRACE_ACTION_DETACH;
 +}
 +
++/*
++ * Don't use .report_xxx = ... style here because this way makes it easier
++ * to be sure we're forced to have an initializer here for every member.
++ */
 +static const struct utrace_engine_ops dead_engine_ops =
 +{
-+	.report_quiesce = &dead_engine_delete
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 unsigned long, struct task_struct *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 pid_t)) &dead_engine_delete,
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *, u32, siginfo_t *,
++		 const struct k_sigaction *, struct k_sigaction *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 int)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 const struct linux_binprm *, struct pt_regs *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 long, long *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *))
++	&dead_engine_delete,
++	NULL,			/* report_reap */
++	NULL,			/* allow_access_process_vm */
++	NULL,			/* unsafe_exec */
++	NULL,			/* tracer_task */
 +};
 +
 +
@@ -844,9 +876,32 @@
 +		return ret;
 +	}
 +
-+	flags = engine->flags;
-+	engine->flags = UTRACE_EVENT(QUIESCE) | UTRACE_ACTION_QUIESCE;
++	/*
++	 * This must work while the target thread races with us doing:
++	 *	if (engine->flags & UTRACE_EVENT(x)) REPORT(x, ...);
++	 * The REPORT macro uses smp_rmb() between checking engine->flags
++	 * and using engine->ops.  Here we change engine->ops first, then
++	 * use smp_wmb() before changing engine->flags.  This ensures it
++	 * can check the old flags before using the old ops, or check the
++	 * old flags before using the new ops, or check the new flags
++	 * before using the new ops, but can never check the new flags
++	 * before using the old ops.  Hence, dead_engine_ops might be used
++	 * with any old flags in place.  So, it has report_* callback
++	 * pointers for every event type.  Since it has to have those
++	 * anyway, we enable (for after any potential race) all the events
++	 * that have no overhead to enable.  We want it to get into that
++	 * callback and complete the detach ASAP.
++	 */
 +	rcu_assign_pointer(engine->ops, &dead_engine_ops);
++	smp_wmb();
++	flags = engine->flags;
++	engine->flags = (UTRACE_EVENT(QUIESCE)
++			 | UTRACE_EVENT(CLONE)
++			 | UTRACE_EVENT(VFORK_DONE)
++			 | UTRACE_EVENT(EXEC)
++			 | UTRACE_EVENT(EXIT)
++			 | UTRACE_EVENT(JCTL)
++			 | UTRACE_ACTION_QUIESCE);
 +
 +	if (quiesce(target, 1)) {
 +		remove_engine(engine, target, utrace);
@@ -971,7 +1026,7 @@
 +{
 +	struct utrace *utrace;
 +	int report;
-+	unsigned long old_flags, old_utrace_flags;
++	unsigned long old_flags, old_utrace_flags, set_utrace_flags;
 +	int ret = -EALREADY;
 +
 +#ifdef ARCH_HAS_SINGLE_STEP
@@ -1005,6 +1060,22 @@
 +	}
 +
 +	/*
++	 * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL).
++	 * That bit indicates utrace_report_jctl has not run yet and so the
++	 * target cannot be considered quiescent.  But if the bit wasn't
++	 * already set, it can't be in running in there and really is
++	 * quiescent now in its existing job control stop.  We set
++	 * UTRACE_ACTION_QUIESCE to be sure that once it resumes it will
++	 * recompute its flags in utrace_quiescent.
++	 */
++	set_utrace_flags = flags;
++	if (((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL))
++	    && target->state == TASK_STOPPED) {
++		set_utrace_flags &= ~UTRACE_EVENT(JCTL);
++		set_utrace_flags |= UTRACE_ACTION_QUIESCE;
++	}
++
++	/*
 +	 * When setting these flags, it's essential that we really
 +	 * synchronize with exit_notify.  They cannot be set after
 +	 * exit_notify takes the tasklist_lock.  By holding the read
@@ -1014,20 +1085,20 @@
 +	 * knows positively that utrace_report_death will be called or
 +	 * that it won't.
 +	 */
-+	if ((flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
-+					   | DEATH_EVENTS)) {
++	if ((set_utrace_flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
++						      | DEATH_EVENTS)) {
 +		read_lock(&tasklist_lock);
 +		if (unlikely(target->exit_state)) {
 +			read_unlock(&tasklist_lock);
 +			spin_unlock(&utrace->lock);
 +			return ret;
 +		}
-+		target->utrace_flags |= flags;
++		target->utrace_flags |= set_utrace_flags;
 +		read_unlock(&tasklist_lock);
 +	}
 +
 +	engine->flags = flags;
-+	target->utrace_flags |= flags;
++	target->utrace_flags |= set_utrace_flags;
 +	ret = 0;
 +
 +	report = 0;
@@ -1149,10 +1220,20 @@
 +	return ret;
 +}
 +
-+#define REPORT(callback, ...) do { \
-+	u32 ret = (*rcu_dereference(engine->ops)->callback) \
-+		(engine, tsk, ##__VA_ARGS__); \
-+	action = update_action(tsk, utrace, engine, ret); \
++/*
++ * This macro is always used after checking engine->flags.
++ * The smp_rmb() here pairs with smp_wmb() in utrace_detach.
++ * engine->ops changes before engine->flags, so the flags we
++ * just tested properly enabled this report for the real ops,
++ * or harmlessly enabled it for dead_engine_ops.
++ */
++#define REPORT(callback, ...)						\
++	do {								\
++		u32 ret;						\
++		smp_rmb();						\
++		ret = (*rcu_dereference(engine->ops)->callback)		\
++			(engine, tsk, ##__VA_ARGS__);			\
++		action = update_action(tsk, utrace, engine, ret);	\
 +	} while (0)
 +
 +
@@ -3755,7 +3836,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1080,6 +1080,11 @@ struct task_struct {
+@@ -1081,6 +1081,11 @@ struct task_struct {
  	struct audit_context *audit_context;
  	seccomp_t seccomp;
  

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat.patch	21 Aug 2007 19:42:55 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat.patch	4 Sep 2007 20:53:27 -0000	1.5
@@ -24,7 +24,7 @@
  arch/powerpc/lib/sstep.c        |    3 
  kernel/fork.c                   |    2 
  kernel/exit.c                   |   13 
- kernel/ptrace.c                 | 2054 +++++++++++++++++++++++++++++++++++++--
+ kernel/ptrace.c                 | 2055 +++++++++++++++++++++++++++++++++++++--
  kernel/sys_ni.c                 |    4 
  kernel/Makefile                 |    3 
  include/linux/sched.h           |    4 
@@ -32,7 +32,7 @@
  include/asm-x86_64/tracehook.h  |    1 
  include/asm-x86_64/ptrace-abi.h |    3 
  init/Kconfig                    |   15 
- 20 files changed, 2641 insertions(+), 780 deletions(-)
+ 20 files changed, 2642 insertions(+), 780 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
 
 --- linux-2.6/fs/proc/base.c
@@ -1331,7 +1331,7 @@
  		tsk = next_thread(tsk);
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -19,213 +19,2007 @@
+@@ -19,213 +19,2008 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1394,19 +1394,66 @@
 +};
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* Initialized below. */
+ 
+ /*
+- * Check that we have indeed attached to the thing..
++ * We use this bit in task_struct.exit_code of a ptrace'd task to indicate
++ * a ptrace stop.  It must not overlap with any bits used in real exit_code's.
++ * Those are (PTRACE_EVENT_* << 8) | 0xff.
+  */
+-int ptrace_check_attach(struct task_struct *child, int kill)
++#define PTRACE_TRAPPED_MASK	0x10000
++
 +
 +static void
 +ptrace_state_unlink(struct ptrace_state *state)
-+{
+ {
+-	return -ENOSYS;
 +	task_lock(state->parent);
 +	list_del_rcu(&state->entry);
 +	task_unlock(state->parent);
-+}
-+
+ }
+ 
+-static int may_attach(struct task_struct *task)
 +static struct ptrace_state *
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
-+{
+ {
+-	/* May we inspect the given task?
+-	 * This check is used both for attaching with ptrace
+-	 * and for allowing access to sensitive information in /proc.
+-	 *
+-	 * ptrace_attach denies several cases that /proc allows
+-	 * because setting up the necessary parent/child relationship
+-	 * or halting the specified task is impossible.
+-	 */
+-	int dumpable = 0;
+-	/* Don't let security modules deny introspection */
+-	if (task == current)
+-		return 0;
+-	if (((current->uid != task->euid) ||
+-	     (current->uid != task->suid) ||
+-	     (current->uid != task->uid) ||
+-	     (current->gid != task->egid) ||
+-	     (current->gid != task->sgid) ||
+-	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-	smp_rmb();
+-	if (task->mm)
+-		dumpable = get_dumpable(task->mm);
+-	if (!dumpable && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-
+-	return security_ptrace(current, task);
+-}
+-
+-int ptrace_may_attach(struct task_struct *task)
+-{
+-	int err;
+-	task_lock(task);
+-	err = may_attach(task);
+-	task_unlock(task);
+-	return !err;
 +	struct ptrace_state *state;
 +
 +	NO_LOCKS;
@@ -1466,17 +1513,14 @@
 +	BUG_ON(state->rcu.next);
 +	call_rcu(&state->rcu, ptrace_state_free);
 +}
- 
- /*
-- * Check that we have indeed attached to the thing..
++
++/*
 + * Update the tracing engine state to match the new ptrace state.
-  */
--int ptrace_check_attach(struct task_struct *child, int kill)
++ */
 +static int __must_check
 +ptrace_update(struct task_struct *target, struct ptrace_state *state,
 +	      unsigned long flags, int from_stopped)
- {
--	return -ENOSYS;
++{
 +	int ret;
 +
 +	START_CHECK;
@@ -1541,9 +1585,8 @@
 +	END_CHECK;
 +
 +	return ret;
- }
- 
--static int may_attach(struct task_struct *task)
++}
++
 +/*
 + * This does ptrace_update and also installs state in engine->data.
 + * Only after utrace_set_flags succeeds (in ptrace_update) inside
@@ -1555,42 +1598,7 @@
 + */
 +static int __must_check
 +ptrace_setup_finish(struct task_struct *target, struct ptrace_state *state)
- {
--	/* May we inspect the given task?
--	 * This check is used both for attaching with ptrace
--	 * and for allowing access to sensitive information in /proc.
--	 *
--	 * ptrace_attach denies several cases that /proc allows
--	 * because setting up the necessary parent/child relationship
--	 * or halting the specified task is impossible.
--	 */
--	int dumpable = 0;
--	/* Don't let security modules deny introspection */
--	if (task == current)
--		return 0;
--	if (((current->uid != task->euid) ||
--	     (current->uid != task->suid) ||
--	     (current->uid != task->uid) ||
--	     (current->gid != task->egid) ||
--	     (current->gid != task->sgid) ||
--	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--	smp_rmb();
--	if (task->mm)
--		dumpable = get_dumpable(task->mm);
--	if (!dumpable && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--
--	return security_ptrace(current, task);
--}
--
--int ptrace_may_attach(struct task_struct *task)
--{
--	int err;
--	task_lock(task);
--	err = may_attach(task);
--	task_unlock(task);
--	return !err;
++{
 +	int ret;
 +
 +	NO_LOCKS;
@@ -1607,12 +1615,11 @@
 +	NO_LOCKS;
 +
 +	return ret;
- }
- 
--int ptrace_attach(struct task_struct *task)
++}
++
 +
 +static int ptrace_traceme(void)
- {
++{
 +	struct utrace_attached_engine *engine;
 +	struct ptrace_state *state;
 +	int retval;
@@ -1664,10 +1671,11 @@
 +	NO_LOCKS;
 +
 +	return retval;
-+}
-+
+ }
+ 
+-int ptrace_attach(struct task_struct *task)
 +static int ptrace_attach(struct task_struct *task)
-+{
+ {
 +	struct utrace_attached_engine *engine;
 +	struct ptrace_state *state;
  	int retval;
@@ -1685,9 +1693,8 @@
 -	retval = may_attach(task);
 -	if (retval)
 +	if (!task->mm)		/* kernel threads */
- 		goto bad;
- 
--	retval = -ENOSYS;
++		goto bad;
++
 +	pr_debug("%d ptrace_attach %d state %lu exit_code %x\n",
 +		 current->pid, task->pid, task->state, task->exit_code);
 +
@@ -1699,9 +1706,10 @@
 +		retval = PTR_ERR(engine);
 +		if (retval == -EEXIST)
 +			retval = -EPERM;
-+		goto bad;
+ 		goto bad;
 +	}
-+
+ 
+-	retval = -ENOSYS;
 +	pr_debug("%d ptrace_attach %d after utrace_attach: %lu exit_code %x\n",
 +		 current->pid, task->pid, task->state, task->exit_code);
 +
@@ -1735,8 +1743,6 @@
 +	if (retval)
 +		(void) utrace_detach(task, engine);
 +	else {
-+		int stopped = 0;
-+
 +		NO_LOCKS;
 +
 +		/*
@@ -1746,48 +1752,14 @@
 +		 * We cannot call into the signal code if it's dead.
 +		 */
 +		read_lock(&tasklist_lock);
-+		if (likely(!task->exit_state)) {
++		if (likely(!task->exit_state))
 +			force_sig_specific(SIGSTOP, task);
-+
-+			spin_lock_irq(&task->sighand->siglock);
-+			stopped = (task->state == TASK_STOPPED);
-+			spin_unlock_irq(&task->sighand->siglock);
-+		}
 +		read_unlock(&tasklist_lock);
 +
-+		if (stopped) {
-+			const struct utrace_regset *regset;
-+
-+			/*
-+			 * Set QUIESCE immediately, so we can allow
-+			 * ptrace requests while he's in TASK_STOPPED.
-+			 */
-+			retval = ptrace_update(task, state, /* XXX child death+other thread waits race could have freed state already */
-+					       UTRACE_ACTION_QUIESCE, 0);
-+			if (retval)
-+				/*
-+				 * Anything is possible here.  It might not
-+				 * really have been quiescent yet.  It
-+				 * might have just woken up and died.
-+				 */
-+				BUG_ON(retval != -ESRCH && retval != -EALREADY);
-+			retval = 0;
-+
-+			/*
-+			 * Do now the regset 0 writeback that we do on every
-+			 * stop, since it's never been done.  On register
-+			 * window machines, this makes sure the user memory
-+			 * backing the register data is up to date.
-+			 */
-+			regset = utrace_regset(task, engine,
-+					       utrace_native_view(task), 0);
-+			if (regset->writeback)
-+				(*regset->writeback)(task, regset, 1);
-+		}
-+
 +		pr_debug("%d ptrace_attach %d complete (%sstopped)"
 +			 " state %lu code %x",
-+			 current->pid, task->pid, stopped ? "" : "not ",
++			 current->pid, task->pid,
++			 task->state == TASK_STOPPED ? "" : "not ",
 +			 task->state, task->exit_code);
 +	}
  
@@ -2584,13 +2556,13 @@
 +	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-+
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2752,7 +2724,29 @@
 +		 * check fails we are sure to get a wakeup if it stops.
 +		 */
 +		exit_code = xchg(&p->exit_code, 0);
-+		if (exit_code)
++		if (exit_code & PTRACE_TRAPPED_MASK)
++			goto found;
++
++		/*
++		 * If p was in job-control stop (TASK_STOPPED) rather than
++		 * ptrace stop (TASK_TRACED), then SIGCONT can asynchronously
++		 * clear it back to TASK_RUNNING.  Until it gets scheduled
++		 * and clears its own ->exit_code, our xchg below will see
++		 * its stop signal.  But, we must not report it if it's no
++		 * longer in TASK_STOPPED, as vanilla wait would not--the
++		 * caller can tell if it sent the SIGCONT before calling
++		 * wait.  We must somehow distinguish this from the case
++		 * where p is in TASK_RUNNING with p->exit_code set because
++		 * it is on its way to entering TASK_TRACED (QUIESCE) for our
++		 * stop.  So, ptrace_report sets the PTRACE_TRAPPED_MASK bit
++		 * in exit_code when it's setting QUIESCE.  For a job control
++		 * control stop, that bit will never have been set.  Since
++		 * the bit's not set now, we should only report right now if
++		 * p is still stopped.  For this case we are protected by
++		 * races the same wait that vanilla do_wait (exit.c) is:
++		 * wait_chldexit is woken after p->state is set to TASK_STOPPED.
++		 */
++		if (p->state == TASK_STOPPED)
 +			goto found;
 +
 +		// XXX should handle WCONTINUED
@@ -2803,6 +2797,7 @@
 +	}
 +	else {
 +		why = CLD_TRAPPED;
++		exit_code &= ~PTRACE_TRAPPED_MASK;
 +		status = exit_code;
 +		exit_code = (status << 8) | 0x7f;
 +	}
@@ -2981,8 +2976,14 @@
 +	 */
 +	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
 +
++	/*
++	 * The PTRACE_TRAPPED_MASK bit distinguishes to ptrace_do_wait that
++	 * this is a ptrace report, so we expect to enter TASK_TRACED but
++	 * might not be there yet when examined.
++	 */
 +	BUG_ON(code == 0);
-+	tsk->exit_code = code;
++	WARN_ON(code &~ 0x7ff);
++	tsk->exit_code = code | PTRACE_TRAPPED_MASK;
 +	do_notify(tsk, state->parent, CLD_TRAPPED);
 +
 +	pr_debug("%d ptrace_report quiescing exit_code %x\n",
@@ -3178,15 +3179,13 @@
 +	NO_LOCKS;
 +	printk(KERN_ERR "ptrace out of memory, lost child %d of %d",
 +	       child->pid, parent->pid);
- }
- 
--int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
++}
++
 +static u32
 +ptrace_report_clone(struct utrace_attached_engine *engine,
 +		    struct task_struct *parent,
 +		    unsigned long clone_flags, struct task_struct *child)
- {
--	int copied;
++{
 +	int event, option;
 +	struct ptrace_state *state;
 +
@@ -3217,9 +3216,7 @@
 +	}
 +	else
 +		event = 0;
- 
--	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
--	return (copied == sizeof(data)) ? 0 : -EIO;
++
 +	if (!(clone_flags & CLONE_UNTRACED)
 +	    && (event || (clone_flags & CLONE_PTRACE))) {
 +		/*
@@ -3279,7 +3276,7 @@
 +	state->have_eventmsg = 0;
 +	state->u.siginfo = info;
 +	return ptrace_report(engine, tsk, state, signo) | UTRACE_SIGNAL_IGN;
- }
++}
 +
 +static u32
 +ptrace_report_jctl(struct utrace_attached_engine *engine,
@@ -3370,12 +3367,14 @@
 +			   struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
-+}
-+
+ }
+ 
+-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
 +		   struct task_struct *tsk, long orig_code, long *code)
-+{
+ {
+-	int copied;
 +	struct ptrace_state *state = get_ptrace_state(engine, tsk);
 +	if (unlikely(state == NULL))
 +		return UTRACE_ACTION_RESUME;
@@ -3402,9 +3401,11 @@
 +	}
 +
 +	END_CHECK;
-+
+ 
+-	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
+-	return (copied == sizeof(data)) ? 0 : -EIO;
 +	return unsafe;
-+}
+ }
 +
 +static struct task_struct *
 +ptrace_tracer_task(struct utrace_attached_engine *engine,
@@ -3503,7 +3504,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1178,6 +1178,10 @@ struct task_struct {
+@@ -1179,6 +1179,10 @@ struct task_struct {
  	atomic_t fs_excl;	/* holding fs exclusive resources */
  	struct rcu_head rcu;
  

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-utrace-tracehook.patch	1 Sep 2007 00:32:50 -0000	1.8
+++ linux-2.6-utrace-tracehook.patch	4 Sep 2007 20:53:27 -0000	1.9
@@ -221,7 +221,7 @@
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  
-@@ -427,7 +433,7 @@ static int do_task_stat(struct task_stru
+@@ -441,7 +447,7 @@ static int do_task_stat(struct task_stru
  
  		sid = signal_session(sig);
  		pgid = process_group(task);
@@ -257,7 +257,7 @@
  #include <linux/mount.h>
  #include <linux/security.h>
  #include <linux/syscalls.h>
-@@ -1161,13 +1161,7 @@ EXPORT_SYMBOL(prepare_binprm);
+@@ -1153,13 +1153,7 @@ EXPORT_SYMBOL(prepare_binprm);
  
  static int unsafe_exec(struct task_struct *p)
  {
@@ -272,7 +272,7 @@
  	if (atomic_read(&p->fs->count) > 1 ||
  	    atomic_read(&p->files->count) > 1 ||
  	    atomic_read(&p->sighand->count) > 1)
-@@ -1311,6 +1305,7 @@ int search_binary_handler(struct linux_b
+@@ -1303,6 +1297,7 @@ int search_binary_handler(struct linux_b
  				bprm->file = NULL;
  				current->did_exec = 1;
  				proc_exec_connector(current);
@@ -382,7 +382,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2754,11 +2760,6 @@ static int selinux_task_alloc_security(s
+@@ -2757,11 +2763,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -394,7 +394,7 @@
  	return 0;
  }
  
-@@ -4541,6 +4542,7 @@ static int selinux_setprocattr(struct ta
+@@ -4544,6 +4545,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -402,7 +402,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -4629,18 +4631,24 @@ static int selinux_setprocattr(struct ta
+@@ -4632,18 +4634,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -2621,7 +2621,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1448,8 +1445,7 @@ void do_notify_parent(struct task_struct
+@@ -1447,8 +1444,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2631,7 +2631,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1474,7 +1470,7 @@ void do_notify_parent(struct task_struct
+@@ -1473,7 +1469,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2640,7 +2640,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1502,20 +1498,13 @@ void do_notify_parent(struct task_struct
+@@ -1501,20 +1497,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2662,7 +2662,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1540,6 +1529,15 @@ static void do_notify_parent_cldstop(str
+@@ -1539,6 +1528,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2678,7 +2678,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1552,107 +1550,6 @@ static void do_notify_parent_cldstop(str
+@@ -1551,107 +1549,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2786,7 +2786,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1661,7 +1558,7 @@ finish_stop(int stop_count)
+@@ -1660,7 +1557,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -2795,7 +2795,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1788,44 +1685,24 @@ relock:
+@@ -1787,44 +1684,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -2856,7 +2856,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1874,7 +1751,7 @@ relock:
+@@ -1873,7 +1750,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -2865,7 +2865,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1903,13 +1780,13 @@ relock:
+@@ -1902,13 +1779,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -2881,7 +2881,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1921,7 +1798,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
+@@ -1920,7 +1797,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
  EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_proc);
@@ -2902,12 +2902,12 @@
  	stats->ac_stime	 = cputime_to_msecs(tsk->stime) * USEC_PER_MSEC;
 --- linux-2.6/kernel/sys.c
 +++ linux-2.6/kernel/sys.c
-@@ -1470,7 +1470,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1469,7 +1469,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
  	if (!thread_group_leader(p))
  		goto out;
  
 -	if (p->real_parent->tgid == group_leader->tgid) {
-+	if (p->parent == group_leader) {
++	if (p->parent->tgid == group_leader->tgid) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))
  			goto out;
@@ -3100,7 +3100,7 @@
  
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -938,7 +938,6 @@ struct task_struct {
+@@ -939,7 +939,6 @@ struct task_struct {
  	void *stack;
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
@@ -3108,7 +3108,7 @@
  
  	int lock_depth;		/* BKL lock depth */
  
-@@ -972,12 +971,6 @@ struct task_struct {
+@@ -973,12 +972,6 @@ struct task_struct {
  #endif
  
  	struct list_head tasks;
@@ -3121,7 +3121,7 @@
  
  	struct mm_struct *mm, *active_mm;
  
-@@ -997,15 +990,13 @@ struct task_struct {
+@@ -998,15 +991,13 @@ struct task_struct {
  	unsigned long stack_canary;
  #endif
  	/* 
@@ -3139,7 +3139,7 @@
  	 */
  	struct list_head children;	/* list of my children */
  	struct list_head sibling;	/* linkage in my parent's children list */
-@@ -1145,8 +1136,6 @@ struct task_struct {
+@@ -1146,8 +1137,6 @@ struct task_struct {
  
  	struct io_context *io_context;
  
@@ -3148,7 +3148,7 @@
  /*
   * current io wait handle: wait queue entry to use for io waits
   * If this thread is processing aio, this points at the waitqueue
-@@ -1523,6 +1512,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1526,6 +1515,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern void do_notify_parent(struct task_struct *, int);



From fedora-extras-commits at redhat.com  Tue Sep  4 21:12:27 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 17:12:27 -0400
Subject: fedora-security/audit fc6,1.250,1.251 fc7,1.91,1.92
Message-ID: <200709042112.l84LCRpQ015323@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15261

Modified Files:
	fc6 fc7 
Log Message:
gd



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- fc6	28 Aug 2007 16:44:20 -0000	1.250
+++ fc6	4 Sep 2007 21:12:24 -0000	1.251
@@ -35,6 +35,13 @@
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]
+CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277421
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245809
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3392 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fc7	4 Sep 2007 17:00:52 -0000	1.91
+++ fc7	4 Sep 2007 21:12:24 -0000	1.92
@@ -86,13 +86,13 @@
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 version (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-0033]
 CVE-2007-3507 version (flac123, fixed 0.0.10) #246322 [since FEDORA-2007-1045]
-CVE-2007-3478 ** (gd)
-CVE-2007-3477 ** (gd)
-CVE-2007-3476 ** (gd)
-CVE-2007-3475 ** (gd)
-CVE-2007-3474 ** (gd)
-CVE-2007-3473 ** (gd)
-CVE-2007-3472 ** (gd)
+CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277411
 CVE-2007-3410 backport (HelixPlayer) #245838 [since FEDORA-2007-0756]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245807
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]



From fedora-extras-commits at redhat.com  Tue Sep  4 21:15:02 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Tue, 4 Sep 2007 17:15:02 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.478,1.479
Message-ID: <200709042115.l84LF2q8015892@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366

Modified Files:
	eclipse.spec 
Log Message:
* 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.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- eclipse.spec	1 Sep 2007 02:57:59 -0000	1.478
+++ eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
@@ -23,15 +23,14 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        13%{?dist} 
+Release:        14%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
-Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-#Source4:        fedora-eclipse-product-plugin-3.3.0.1.zip
+Source4:        org.fedoraproject.ide.platform-3.3.0.1.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -223,6 +222,7 @@
 Requires: eclipse-cvs-client
 Requires: eclipse-subclipse
 Requires: eclipse-changelog
+Requires: eclipse-rpm-editor
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64 alpha
@@ -233,7 +233,7 @@
 %endif
 
 %description    platform
-The Eclipse Platform is the base of all IDE plugins.  This does not include the
+The Fedora Eclipse Platform is the base of all IDE plugins.  This does not include the
 Java Development Tools or the Plugin Development Environment.
 
 %package        jdt
@@ -384,9 +384,6 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties
 popd
 
-# Splashscreen
-cp %{SOURCE1} plugins/org.eclipse.platform/splash.bmp
-
 # FIXME this should be patched upstream with a flag to turn on and off 
 # all output should be directed to stdout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
@@ -629,7 +626,6 @@
 fi
 
 tar jxf %{SOURCE20}
-#unzip -qq %{SOURCE4}
 
 %build
 ORIGCLASSPATH=$CLASSPATH
@@ -688,8 +684,7 @@
 SDK=$(cd eclipse && pwd)
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
 pushd equinox-incubator
-mkdir -p build
-mkdir -p home
+mkdir -p build home
 homedir=$(cd home && pwd)
 
 # This can go away when package build handles plugins (not just features)
@@ -745,11 +740,13 @@
 ln -s plugins/$LAUNCHERNAME startup.jar
 popd
 
-## The FileInitializer app isn't part of the SDK (yet?) but we want it to be
-## around for other RPMs
+# Install the file initializer app
 cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
+# Install the Fedora Eclipse product plugin
+unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins %{SOURCE4}
+
 # Set up an extension location and a link file for the arch-specific dir
 echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link
 echo "name=Eclipse Platform" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension
@@ -824,8 +821,10 @@
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app
 
-# Set eclipse.product to be org.eclipse.platform.ide 
-sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
+# Set eclipse.product to org.fedoraproject.ide.platform 
+sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the launcher so
@@ -886,19 +885,17 @@
 popd
 
 # Icons
-PLATFORMSUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//")
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse48.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse32.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s ../../../../%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse.png \
+ln -s ../../../../%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %ifarch %{ix86} x86_64
 # Remove unused icon.xpm
 # see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
@@ -1360,6 +1357,7 @@
 %{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
+%{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform
 %ifarch %{ix86} x86_64 ppc
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
 %endif
@@ -1571,6 +1569,10 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Tue Sep  4 21:18:28 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 17:18:28 -0400
Subject: rpms/armacycles-ad/devel armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709042118.l84LISj1017586@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Sep 2007 19:00:41 -0000	1.1
+++ .cvsignore	4 Sep 2007 21:17:55 -0000	1.2
@@ -0,0 +1 @@
+armagetronad-0.2.8.2.1.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	4 Sep 2007 21:17:55 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:19:33 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 4 Sep 2007 17:19:33 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23, 
	1.24 telepathy-gabble.spec, 1.31, 1.32
Message-ID: <200709042119.l84LJXju017805@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17714

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	29 Aug 2007 20:05:22 -0000	1.23
+++ .cvsignore	4 Sep 2007 21:19:00 -0000	1.24
@@ -3,3 +3,4 @@
 telepathy-gabble-0.5.12.1.20070626darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070711darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
+telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	29 Aug 2007 20:05:22 -0000	1.23
+++ sources	4 Sep 2007 21:19:00 -0000	1.24
@@ -1 +1 @@
-f013d23c75ac7c79d24f1358f5740007  telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
+07d399b2e41a5ba90d410e5102b5c872  telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- telepathy-gabble.spec	29 Aug 2007 20:19:36 -0000	1.31
+++ telepathy-gabble.spec	4 Sep 2007 21:19:00 -0000	1.32
@@ -1,13 +1,13 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070829darcs_olpcrollup 
+%define alphatag 20070904darcs_olpctrial3a
 
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.12.1
-Release:        1.4.%{alphatag}%{?dist}
+Version:        0.5.13
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
+- New snapshot
+
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.12.1-1.4.20070829darcs_olpcrollup
 - New tube fixes
 



From fedora-extras-commits at redhat.com  Tue Sep  4 21:19:58 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 4 Sep 2007 17:19:58 -0400
Subject: rpms/blktrace/devel blktrace-cflags.patch, NONE, 1.1 blktrace.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709042119.l84LJwtQ017853@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17777/devel

Modified Files:
	.cvsignore sources 
Added Files:
	blktrace-cflags.patch blktrace.spec 
Log Message:
Initial package version


blktrace-cflags.patch:

--- NEW FILE blktrace-cflags.patch ---
--- blktrace/btt/Makefile.orig	2007-08-15 12:00:39.260464020 -0500
+++ blktrace/btt/Makefile	2007-08-15 12:01:29.568789170 -0500
@@ -6,10 +6,11 @@
 #
 
 CC	= gcc
+CFLAGS	= -O2 -Wall -W -g
 INCS	= -I. -I..
 OCFLAGS	= -UCOUNT_IOS -UDEBUG -DNDEBUG
-XCFLAGS	= -Wall -W -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS	= $(INCS) -O2 $(XCFLAGS) $(OCFLAGS)
+XCFLAGS	= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_CFLAGS = $(CFLAGS) $(INCS) $(XCFLAGS) $(OCFLAGS)
 
 PROGS	= btt
 LIBS	= $(PLIBS) $(ELIBS)
@@ -21,19 +22,19 @@
 all: depend $(PROGS)
 
 rbtree.o: ../rbtree.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 depend:
-	@$(CC) -MM $(CFLAGS) -I.. *.c 1> .depend
+	@$(CC) -MM $(ALL_CFLAGS) -I.. *.c 1> .depend
 
 clean: docsclean
 	-rm -f *.o $(PROGS) .depend
 
 %.o: %.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 btt: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 docs:
 	$(MAKE) -C doc all


--- NEW FILE blktrace.spec ---
Summary: Utilities for performing block layer IO tracing in the linux kernel
Name: blktrace
Version: 0.0
Release: 0.4.20070730162628git%{?dist}
License: GPLv2+
Group: Development/System
Source:  http://brick.kernel.dk/snaps/blktrace-git-20070730162628.tar.gz
Url: http://brick.kernel.dk/snaps

Patch1: blktrace-cflags.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
blktrace is a block layer IO tracing mechanism which provides detailed
information about request queue operations to user space.  This package
includes both blktrace, a utility which gathers event traces from the kernel;
and blkparse, a utility which formats trace data collected by blktrace.

You should install the blktrace package if you need to gather detailed
information about IO patterns.

%prep
%setup -q -n blktrace
%patch1 -p1 -b .cflags

%build
make CFLAGS="%{optflags}" all

%install
rm -rf %{buildroot}
make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/usr/share/man install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README COPYING
/usr/bin/*
%attr(0644,root,root) /usr/share/man/man1/*
%attr(0644,root,root) /usr/share/man/man8/*

%changelog
* Wed Aug 15 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.4.20070730162628git
- Fix up btt/Makefile to accept rpm's CFLAGS

* Tue Aug 14 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.3.20070730162628git
- Just drop the pdf build, bloats the buildroot for such a simple tool

* Wed Aug 01 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.2.20070730162628git
- Add ghostscript to BuildRequires, use attr macro for man pages

* Wed Aug 01 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.1.20070730162628git
- New package, initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Sep 2007 19:04:04 -0000	1.1
+++ .cvsignore	4 Sep 2007 21:19:25 -0000	1.2
@@ -0,0 +1 @@
+blktrace-git-20070730162628.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:04:04 -0000	1.1
+++ sources	4 Sep 2007 21:19:25 -0000	1.2
@@ -0,0 +1 @@
+74d9ba563e07eeb3d662c6735cbcdaa0  blktrace-git-20070730162628.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 21:24:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 17:24:02 -0400
Subject: rpms/hddtemp/devel hddtemp.init,1.3,1.4 hddtemp.spec,1.22,1.23
Message-ID: <200709042124.l84LO2Qp018020@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989

Modified Files:
	hddtemp.init hddtemp.spec 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
- Adjust server chkconfig start/stop priorities to start before gkrellmd,
  other cosmetic init script tweaks.



Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hddtemp.init	9 Jul 2007 21:13:32 -0000	1.3
+++ hddtemp.init	4 Sep 2007 21:23:29 -0000	1.4
@@ -2,7 +2,7 @@
 #
 # hddtemp       This shell script takes care of starting and stopping hddtemp.
 #
-# chkconfig:    - 90 10
+# chkconfig:    - 80 20
 # description:  hddtemp provides information about hard drives' temperature
 # processname:  hddtemp
 # config:       __ETCDIR__/sysconfig/hddtemp
@@ -27,13 +27,13 @@
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
 HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
-exec="__SBINDIR__/hddtemp"
-prog=$(basename $exec)
+exec=__SBINDIR__/hddtemp
+prog=${exec##*/}
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
     if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
-        action $"Unconfigured: $prog, see__ETCDIR__/sysconfig/hddtemp: " /bin/false
+        action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
         retval=6
     else
         echo -n $"Starting hard disk temperature monitor daemon ($prog): "


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hddtemp.spec	16 Aug 2007 09:13:24 -0000	1.22
+++ hddtemp.spec	4 Sep 2007 21:23:30 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.13.%{beta}%{?dist}
+Release:        0.14.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -95,6 +95,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
+- Adjust server chkconfig start/stop priorities to start before gkrellmd,
+  other cosmetic init script tweaks.
+
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Tue Sep  4 21:25:28 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 4 Sep 2007 17:25:28 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.32,1.33
Message-ID: <200709042125.l84LPS6R018061@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18033

Modified Files:
	telepathy-gabble.spec 
Log Message:
Fix for actual directory name


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- telepathy-gabble.spec	4 Sep 2007 21:19:00 -0000	1.32
+++ telepathy-gabble.spec	4 Sep 2007 21:24:56 -0000	1.33
@@ -6,14 +6,14 @@
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.13
+Version:        0.5.13.1
 Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.13.%{alphatag}.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,7 +60,7 @@
 
 
 %changelog
-* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
+* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13.1-0.1.20070904darcs_olpctrial3a
 - New snapshot
 
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.12.1-1.4.20070829darcs_olpcrollup



From fedora-extras-commits at redhat.com  Tue Sep  4 18:48:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:48:35 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.28, 1.29 gnome-menus.spec, 1.65,
	1.66 sources, 1.28, 1.29
Message-ID: <200709041848.l84ImZiq024818@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24769

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Aug 2007 21:58:11 -0000	1.28
+++ .cvsignore	4 Sep 2007 18:48:02 -0000	1.29
@@ -1 +1 @@
-gnome-menus-2.19.90.tar.bz2
+gnome-menus-2.19.92.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-menus.spec	23 Aug 2007 22:17:21 -0000	1.65
+++ gnome-menus.spec	4 Sep 2007 18:48:02 -0000	1.66
@@ -5,8 +5,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -98,6 +98,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 - BuildRequires: gawk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Aug 2007 21:58:11 -0000	1.28
+++ sources	4 Sep 2007 18:48:02 -0000	1.29
@@ -1 +1 @@
-69b746d6776269882ff05c2f20e32390  gnome-menus-2.19.90.tar.bz2
+ba03799545df6d7258e9b7b6c5b78aff  gnome-menus-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:32:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 17:32:58 -0400
Subject: rpms/hddtemp/devel hddtemp.spec,1.23,1.24
Message-ID: <200709042132.l84LWwfN020282@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20240

Modified Files:
	hddtemp.spec 
Log Message:
Mark hddtemp.db as %%config(noreplace).


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hddtemp.spec	4 Sep 2007 21:23:30 -0000	1.23
+++ hddtemp.spec	4 Sep 2007 21:32:25 -0000	1.24
@@ -90,7 +90,7 @@
 %{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
-%config /usr/share/misc/hddtemp.db
+%config(noreplace) /usr/share/misc/hddtemp.db
 %{_mandir}/man8/hddtemp.8*
 
 
@@ -98,6 +98,7 @@
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
 - Adjust server chkconfig start/stop priorities to start before gkrellmd,
   other cosmetic init script tweaks.
+- Mark hddtemp.db as %%config(noreplace).
 
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
 - License: GPLv2+



From fedora-extras-commits at redhat.com  Tue Sep  4 21:33:08 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 4 Sep 2007 17:33:08 -0400
Subject: rpms/rhgb/devel rhgb-0.17.6-drop-strings.patch, NONE, 1.1 rhgb.spec,
	1.80, 1.81
Message-ID: <200709042133.l84LX80M020287@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/rhgb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20249

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-0.17.6-drop-strings.patch 
Log Message:
- don't show strings like 
  "Starting random number generator"
  and
  "Starting console mouse services"
  anymore, since the subset we support aren't that good
  anyway, and it causes a lot of stutter when booting


rhgb-0.17.6-drop-strings.patch:

--- NEW FILE rhgb-0.17.6-drop-strings.patch ---
diff -up rhgb-0.17.6/src/main.c.drop-strings rhgb-0.17.6/src/main.c
--- rhgb-0.17.6/src/main.c.drop-strings	2007-09-04 14:59:11.000000000 -0400
+++ rhgb-0.17.6/src/main.c	2007-09-04 15:02:08.000000000 -0400
@@ -636,7 +636,7 @@ update_progress_bar (const char *step)
 	       */
 	      if (text)
 		{
-		  splash_set_label (splash, text);
+		  splash_set_label (splash, NULL);
 		}
 	    }
 	  break;


Index: rhgb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- rhgb.spec	28 Aug 2007 04:35:43 -0000	1.80
+++ rhgb.spec	4 Sep 2007 21:32:35 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -21,6 +21,7 @@
 Patch1: rhgb-0.17.6-dont-show-details-after-timeout.patch
 Patch2: rhgb-0.17.6-support-manual-switch.patch
 Patch3: rhgb-0.17.6-change-color.patch
+Patch4: rhgb-0.17.6-drop-strings.patch
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -31,6 +32,7 @@
 %patch1 -p1 -b .dont-show-details-after-timeout
 %patch2 -p1 -b .support-manual-switch
 %patch3 -p1 -b .change-color
+%patch4 -p1 -b .drop-strings
 
 %build
 %configure
@@ -60,6 +62,14 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 0.17.6-7
+- don't show strings like 
+  "Starting random number generator"
+  and
+  "Starting console mouse services"
+  anymore, since the subset we support aren't that good
+  anyway, and it causes a lot of stutter when booting
+
 * Mon Aug 27 2007 Ray Strode <rstrode at redhat.com> - 0.17.6-6
 - more color changes
 - drop image that isn't used in new theme



From fedora-extras-commits at redhat.com  Tue Sep  4 21:35:10 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 17:35:10 -0400
Subject: rpms/armacycles-ad/F-7 armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709042135.l84LZA7m020440@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20400

Modified Files:
	sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	4 Sep 2007 21:34:37 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:41:11 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 17:41:11 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.441, 1.442 anaconda.spec, 1.577, 
	1.578 sources, 1.569, 1.570
Message-ID: <200709042141.l84LfBSv020624@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- .cvsignore	31 Aug 2007 16:40:49 -0000	1.441
+++ .cvsignore	4 Sep 2007 21:40:38 -0000	1.442
@@ -1 +1,2 @@
 anaconda-11.3.0.26.tar.bz2
+anaconda-11.3.0.27.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- anaconda.spec	31 Aug 2007 16:40:49 -0000	1.577
+++ anaconda.spec	4 Sep 2007 21:40:38 -0000	1.578
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.26
+Version: 11.3.0.27
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 11.3.0.27-1
+- Honor hostname= command line option (dcantrell, #186560).
+- Set the hostname if provided by the user or by DHCP (dcantrell, #180451).
+- Blacklist floppy and iscsi modules (notting).
+- Fix traceback on GUI network config screen (dcantrell).
+- Kickstart networking interface fixes (dcantrell, #260621).
+- Don't traceback when reading kickstart post scripts (#276851).
+- On kickstart installs, output the incoming packages section to
+  anaconda-ks.cfg.
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.26-1
 - Some kickstart fixes (clumens, #269721)
 - More libraries (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- sources	31 Aug 2007 16:40:49 -0000	1.569
+++ sources	4 Sep 2007 21:40:38 -0000	1.570
@@ -1 +1 @@
-652dbaf824f5ce9579a3f6fb82a15a29  anaconda-11.3.0.26.tar.bz2
+1a854b0ef23af7429158c1f8e2198541  anaconda-11.3.0.27.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 22:00:19 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 4 Sep 2007 18:00:19 -0400
Subject: rpms/kernel/devel .cvsignore, 1.679, 1.680 kernel.spec, 1.145,
	1.146 linux-2.6-highres-timers.patch, 1.8,
	1.9 patch-2.6.23-rc4.bz2.sign, 1.1, NONE
Message-ID: <200709042200.l84M0J5M021164@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21122

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch 
Removed Files:
	patch-2.6.23-rc4.bz2.sign 
Log Message:
* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix oops in cpuidle under QEMU



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -r1.679 -r1.680
--- .cvsignore	1 Sep 2007 16:29:55 -0000	1.679
+++ .cvsignore	4 Sep 2007 21:59:46 -0000	1.680
@@ -4,6 +4,3 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc3-git10.bz2
-patch-2.6.23-rc4-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kernel.spec	4 Sep 2007 20:53:27 -0000	1.145
+++ kernel.spec	4 Sep 2007 21:59:46 -0000	1.146
@@ -1789,6 +1789,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
+- Fix oops in cpuidle under QEMU
+
 * Tue Sep  4 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#232837, #248532)
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-highres-timers.patch	24 Aug 2007 21:12:24 -0000	1.8
+++ linux-2.6-highres-timers.patch	4 Sep 2007 21:59:46 -0000	1.9
@@ -1417,7 +1417,7 @@
 +
 +	struct acpi_processor *pr = processors[cpu];
 +
-+	if (!pr->flags.power_setup_done)
++	if (!pr || !pr->flags.power_setup_done)
 +		return -EINVAL;
 +
 +	if (pr->flags.power == 0) {


--- patch-2.6.23-rc4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 22:06:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 4 Sep 2007 18:06:56 -0400
Subject: rpms/kernel/devel linux-2.6-ata-via-fix-dma-mode.patch, NONE,
	1.1 kernel.spec, 1.146, 1.147
Message-ID: <200709042206.l84M6upI027319@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ata-via-fix-dma-mode.patch 
Log Message:
* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
- fix DMA mode on VIA 6421


linux-2.6-ata-via-fix-dma-mode.patch:

--- NEW FILE linux-2.6-ata-via-fix-dma-mode.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b4154d4a01c6cc98b97dc239ca4302316c8f98da
Commit:     b4154d4a01c6cc98b97dc239ca4302316c8f98da
Parent:     7d05154840db52201d8e719fd0f091b8381e362f
Author:     Ondrej Zary <linux at rainbow-software.org>
AuthorDate: Sat Sep 1 00:55:21 2007 +0200
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Sat Sep 1 06:52:18 2007 -0400

    Fix sata_via write errors on PATA drive connected to VT6421
    
    I think that I've found and fixed the problem. There is a copy/paste bug in
    vt6421_set_dma_mode() function which causes wrong values to be written to
    PATA_UDMA_TIMING register.
    
    This patch fixes a copy/paste bug that breaks DMA modes on VT6421 PATA port.
    
    Signed-off-by: Ondrej Zary <linux at rainbow-software.org>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/sata_via.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index a4e6317..57fd30d 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 	static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
 }
 
 static const unsigned int svia_bar_sizes[] = {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kernel.spec	4 Sep 2007 21:59:46 -0000	1.146
+++ kernel.spec	4 Sep 2007 22:06:22 -0000	1.147
@@ -624,6 +624,7 @@
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-terminate-list.patch
+Patch663: linux-2.6-ata-via-fix-dma-mode.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1120,6 +1121,8 @@
 ApplyPatch linux-2.6-libata-acpi-enable.patch
 # Terminate list in ata-piix
 ApplyPatch linux-2.6-libata-terminate-list.patch
+# fix DMA on vt6421
+ApplyPatch linux-2.6-ata-via-fix-dma-mode.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1790,6 +1793,9 @@
 
 %changelog
 * Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix DMA mode on VIA 6421
+
+* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
 - Fix oops in cpuidle under QEMU
 
 * Tue Sep  4 2007 Roland McGrath <roland at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep  4 22:22:31 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 4 Sep 2007 18:22:31 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.20,
	1.21 epiphany-extensions.spec, 1.34, 1.35 sources, 1.20, 1.21
Message-ID: <200709042222.l84MMV7q027625@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.19.90


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	8 Aug 2007 19:57:50 -0000	1.20
+++ .cvsignore	4 Sep 2007 22:21:58 -0000	1.21
@@ -1 +1 @@
-epiphany-extensions-2.19.6.tar.bz2
+epiphany-extensions-2.19.90.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- epiphany-extensions.spec	24 Aug 2007 14:43:48 -0000	1.34
+++ epiphany-extensions.spec	4 Sep 2007 22:21:58 -0000	1.35
@@ -3,7 +3,7 @@
 %global gecko_version		1.8.1.6
 
 Name:		epiphany-extensions
-Version:	%{ephy_major}.6
+Version:	%{ephy_major}.90
 Release:	1%{?dist}
 Summary:	Extensions for Epiphany, the GNOME web browser
 
@@ -29,6 +29,7 @@
 
 Requires:	epiphany >= %{ephy_min_version}
 Requires:	gecko-libs = %{gecko_version}
+Requires:	pygtk2 >= 2.11
 
 Requires(pre):	GConf2
 
@@ -107,10 +108,16 @@
 
 
 %changelog
+* Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 2.19.90-1
+- Update to new upstream release (2.19.90), which contains reworked
+  installation rules for the icons and a fix for the Greasemonkey
+  extension so that it does not break when the directory is not
+  created (GNOME bug 437648).
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-1
 - Rebuild for build ID
 
-* Wed Aug  8 2007 Christopher Aillon <caillon at redhat.com> - 2.19.6-1
+* Wed Aug 08 2007 Christopher Aillon <caillon at redhat.com> - 2.19.6-1
 - Update to 2.19.6
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Aug 2007 19:57:50 -0000	1.20
+++ sources	4 Sep 2007 22:21:58 -0000	1.21
@@ -1 +1 @@
-202a16def45f5d00f74fb8015e410b21  epiphany-extensions-2.19.6.tar.bz2
+67b210fa2048a5fa0a7ccc317eea9f32  epiphany-extensions-2.19.90.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 22:42:19 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 18:42:19 -0400
Subject: comps comps-f8.xml.in,1.88,1.89
Message-ID: <200709042242.l84MgJQx029943@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29921

Modified Files:
	comps-f8.xml.in 
Log Message:
Armacycles-ad comps, f8



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- comps-f8.xml.in	3 Sep 2007 19:28:40 -0000	1.88
+++ comps-f8.xml.in	4 Sep 2007 22:41:48 -0000	1.89
@@ -1387,6 +1387,7 @@
       <packagereq type="optional">alienblaster</packagereq>
       <packagereq type="optional">alphabet-soup</packagereq>
       <packagereq type="optional">ants</packagereq>
+      <packagereq type="optional">armacycles-ad</packagereq>
       <packagereq type="optional">arrows</packagereq>
       <packagereq type="optional">asc</packagereq>
       <packagereq type="optional">asc-music</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep  4 23:43:42 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 19:43:42 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.8, 1.9 pulseaudio.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709042343.l84Nhg0W004907@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4879

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2007 19:13:23 -0000	1.8
+++ .cvsignore	4 Sep 2007 23:43:10 -0000	1.9
@@ -1,2 +1,2 @@
+pulseaudio-0.9.7.svn20070905.tar.gz
 libflashsupport-pulse-000.svn20070904.tar.gz
-pulseaudio-0.9.7.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pulseaudio.spec	4 Sep 2007 19:13:23 -0000	1.16
+++ pulseaudio.spec	4 Sep 2007 23:43:10 -0000	1.17
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.9.svn20070904%{?dist}
+Release:	0.10.svn20070905%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070904.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070905.tar.gz
 Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +27,6 @@
 Patch1: 	pulseaudio-0.9.6-nochown.patch
 
 %description
-A
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
@@ -37,6 +36,7 @@
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
 Conflicts:	esound
+Obsoletes:      esound
 
 %description esound-compat
 A compatibility script that allows applications to call /usr/bin/esd
@@ -140,7 +140,7 @@
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
-pwd
+export PULSEAUDIO_SOURCES=`pwd`
 pushd ../libflashsupport-pulse-000
 %configure --disable-rpath
 make LIBTOOL=/usr/bin/libtool
@@ -332,7 +332,10 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
-* Thu Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.10.svn20070905
+- Update SVN snapshot
+
+* Tue Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
 - Update SVN snapshot
 - ship libflashsupport in our package
 - drop pulseaudio-devel since libpulsecore is not linked statically


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Sep 2007 19:13:23 -0000	1.10
+++ sources	4 Sep 2007 23:43:10 -0000	1.11
@@ -1,2 +1,2 @@
-cf255bd6fe00de595fedbf128f7d5062  libflashsupport-pulse-000.svn20070904.tar.gz
-487c4d60344d8c69e97b3ed39226b21f  pulseaudio-0.9.7.svn20070904.tar.gz
+44a399ac877526b09a9c0e9ee4a9be93  pulseaudio-0.9.7.svn20070905.tar.gz
+07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 00:31:25 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 20:31:25 -0400
Subject: rpms/pavucontrol/devel .cvsignore, 1.3, 1.4 pavucontrol.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200709050031.l850VPoj012080@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12039

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
new svn snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 10:30:44 -0000	1.3
+++ .cvsignore	5 Sep 2007 00:30:52 -0000	1.4
@@ -1 +1 @@
-pavucontrol-0.9.5.svn20070816.tar.gz
+pavucontrol-0.9.5.svn20070905.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pavucontrol.spec	16 Aug 2007 10:30:44 -0000	1.2
+++ pavucontrol.spec	5 Sep 2007 00:30:52 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070905%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:	pavucontrol-0.9.5.svn20070816.tar.gz
+Source0:	pavucontrol-0.9.5.svn20070905.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,7 +53,10 @@
 
 
 %changelog
-* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5.svn20070816
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.2.svn20070905
+- Update from SVN snapshot
+
+* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.1.svn20070816
 - Update from SVN snapshot
 
 * Sat Sep  9 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.4-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 10:30:44 -0000	1.3
+++ sources	5 Sep 2007 00:30:52 -0000	1.4
@@ -1 +1 @@
-03240516703fc62c3cf642c2f486c663  pavucontrol-0.9.5.svn20070816.tar.gz
+a04b6fd8abe33c2a3447bbfa85a8067c  pavucontrol-0.9.5.svn20070905.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 00:37:50 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 20:37:50 -0400
Subject: rpms/usermode/devel .cvsignore, 1.50, 1.51 sources, 1.54,
	1.55 usermode.spec, 1.71, 1.72
Message-ID: <200709050037.l850bowl012307@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12269

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
- Fix handling of PAM conversations with no questions
  Resolves: #267361
- Update License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	11 Jun 2007 21:35:02 -0000	1.50
+++ .cvsignore	5 Sep 2007 00:37:17 -0000	1.51
@@ -1 +1 @@
-usermode-1.92.tar.bz2
+usermode-1.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	11 Jun 2007 21:35:02 -0000	1.54
+++ sources	5 Sep 2007 00:37:17 -0000	1.55
@@ -1 +1 @@
-6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- usermode.spec	11 Jun 2007 21:35:02 -0000	1.71
+++ usermode.spec	5 Sep 2007 00:37:17 -0000	1.72
@@ -4,9 +4,9 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.92
-Release: 1
-License: GPL
+Version: 1.93
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
@@ -116,6 +116,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
 * Mon Jun 11 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-1
 - Fix userhelper hangs in non-UTF8 locales
   Resolves: #242420



From fedora-extras-commits at redhat.com  Wed Sep  5 00:40:28 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 20:40:28 -0400
Subject: rpms/usermode/F-7 .cvsignore, 1.49, 1.50 sources, 1.53,
	1.54 usermode.spec, 1.70, 1.71
Message-ID: <200709050040.l850eSfC012399@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12374

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
- Fix handling of PAM conversations with no questions
  Resolves: #267361
- Update License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	15 Jun 2007 08:47:17 -0000	1.49
+++ .cvsignore	5 Sep 2007 00:39:55 -0000	1.50
@@ -1 +1 @@
-usermode-1.92.tar.bz2
+usermode-1.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	15 Jun 2007 08:47:17 -0000	1.53
+++ sources	5 Sep 2007 00:39:55 -0000	1.54
@@ -1 +1 @@
-6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/usermode.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- usermode.spec	15 Jun 2007 08:47:17 -0000	1.70
+++ usermode.spec	5 Sep 2007 00:39:55 -0000	1.71
@@ -4,9 +4,9 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.92
-Release: 0.fc7
-License: GPL
+Version: 1.93
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
@@ -116,7 +116,12 @@
 %{_datadir}/applications/*
 
 %changelog
-* Mon Jun 15 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-0.f7
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
+* Mon Jun 11 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-1
 - Fix userhelper hangs in non-UTF8 locales
   Resolves: #242420
 - Clean up menu categories in desktop files



From fedora-extras-commits at redhat.com  Wed Sep  5 00:48:33 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 4 Sep 2007 20:48:33 -0400
Subject: rpms/kinput2/devel kinput2.spec, 1.14, 1.15 xinput.d-kinput2-canna, 
	1.1, 1.2 xinput.d-kinput2-wnn, 1.1, 1.2
Message-ID: <200709050048.l850mXuN012588@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12559

Modified Files:
	kinput2.spec xinput.d-kinput2-canna xinput.d-kinput2-wnn 
Log Message:
* Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
- Add QT_IM_MODULE=xim to the xinput script.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kinput2.spec	23 Aug 2007 12:25:43 -0000	1.14
+++ kinput2.spec	5 Sep 2007 00:48:01 -0000	1.15
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -253,6 +253,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
+- Add QT_IM_MODULE=xim to the xinput script.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-33
 - Rebuild
 


Index: xinput.d-kinput2-canna
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/xinput.d-kinput2-canna,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.d-kinput2-canna	30 Jun 2005 09:39:32 -0000	1.1
+++ xinput.d-kinput2-canna	5 Sep 2007 00:48:01 -0000	1.2
@@ -2,3 +2,4 @@
 XIM_PROGRAM=kinput2
 XIM_ARGS="-canna +kinput -xim"
 GTK_IM_MODULE=xim
+QT_IM_MODULE=xim


Index: xinput.d-kinput2-wnn
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/xinput.d-kinput2-wnn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.d-kinput2-wnn	30 Jun 2005 09:39:32 -0000	1.1
+++ xinput.d-kinput2-wnn	5 Sep 2007 00:48:01 -0000	1.2
@@ -2,3 +2,4 @@
 XIM_PROGRAM=kinput2
 XIM_ARGS="-wnn +kinput -xim"
 GTK_IM_MODULE=xim
+QT_IM_MODULE=xim



From fedora-extras-commits at redhat.com  Wed Sep  5 01:07:59 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 21:07:59 -0400
Subject: rpms/libuser/devel libuser.spec,1.67,1.68
Message-ID: <200709050107.l8517xMV018813@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793

Modified Files:
	libuser.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-3
- s/popt/popt-devel/ in BuildRequires
  Resolves: #277541



Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- libuser.spec	8 Aug 2007 15:20:11 -0000	1.67
+++ libuser.spec	5 Sep 2007 01:07:26 -0000	1.68
@@ -5,12 +5,12 @@
 
 Name: libuser
 Version: 0.56.4
-Release: 2
+Release: 3
 Group: System Environment/Base
 License: LGPLv2+
 Source: libuser-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt, python-devel
+BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python-devel
 BuildRequires: cyrus-sasl-devel, openldap-devel
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -108,6 +108,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-3
+- s/popt/popt-devel/ in BuildRequires
+  Resolves: #277541
+
 * Wed Aug  8 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-2
 - Split the Python module to a separate subpackage (original patch by Yanko
   Kaneti)



From fedora-extras-commits at redhat.com  Wed Sep  5 02:38:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:38:36 -0700
Subject: [pkgdb] hddtemp (Fedora EPEL, 5) updated by kevin
Message-ID: <200709050238.l852cbjf009396@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for hddtemp
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hddtemp (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hddtemp (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hddtemp (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:40:18 -0700
Subject: [pkgdb] gimmage (Fedora, 7) updated by kevin
Message-ID: <200709050240.l852eKfW009449@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for gimmage
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on gimmage (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:40:18 -0700
Subject: [pkgdb] gimmage (Fedora, devel) updated by kevin
Message-ID: <200709050240.l852eLBJ009458@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gimmage (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:49 -0400
Subject: rpms/gimmage - New directory
Message-ID: <200709050240.l852en2r032370@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage

Log Message:
Directory /cvs/extras/rpms/gimmage added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:53 -0400
Subject: rpms/gimmage/devel - New directory
Message-ID: <200709050240.l852erme032384@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage/devel

Log Message:
Directory /cvs/extras/rpms/gimmage/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:58 -0400
Subject: rpms/gimmage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709050240.l852ewx5032409@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage

Added Files:
	Makefile import.log 
Log Message:
Setup of module gimmage


--- NEW FILE Makefile ---
# Top level Makefile for module gimmage
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  5 02:41:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:41:01 -0400
Subject: rpms/gimmage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709050241.l852f1kD032425@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gimmage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gimmage
# $Id: Makefile,v 1.1 2007/09/05 02:40:58 kevin Exp $
NAME := gimmage
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 fedora-extras-commits at redhat.com  Wed Sep  5 03:07:53 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 4 Sep 2007 23:07:53 -0400
Subject: rpms/graphviz/devel graphviz-arith.patch, NONE, 1.1 graphviz.spec, 
	1.37, 1.38
Message-ID: <200709050307.l8537ruQ006547@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	graphviz.spec 
Added Files:
	graphviz-arith.patch 
Log Message:

* Tue Sep 04 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-3
- Patch to resurrect arith.h


graphviz-arith.patch:

--- NEW FILE graphviz-arith.patch ---
Index: lib/common/Makefile.am
===================================================================
RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lib/common/Makefile.am	26 Jul 2007 13:53:25 -0000	1.46
+++ lib/common/Makefile.am	4 Sep 2007 23:39:07 -0000	1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $
+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
@@ -14,11 +14,10 @@
 AM_CFLAGS = -D_BLD_common=1
 endif
 
-pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h
+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
 noinst_HEADERS = render.h utils.h memory.h \
-	geomprocs.h colorprocs.h colortbl.h entities.h \
-	logic.h arith.h globals.h \
-	const.h macros.h htmllex.h htmltable.h pointset.h
+	geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
+	logic.h const.h macros.h htmllex.h htmltable.h pointset.h
 noinst_LTLIBRARIES = libcommon_C.la
 
 if WITH_CODEGENS


Index: graphviz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- graphviz.spec	23 Aug 2007 16:40:18 -0000	1.37
+++ graphviz.spec	5 Sep 2007 03:07:20 -0000	1.38
@@ -8,7 +8,7 @@
 Summary: Graph Visualization Tools
 Version: 2.14.1
 
-%define truerelease 2
+%define truerelease 3
 %{?distroagnostic: %define release %{truerelease}}
 %{!?distroagnostic: %define release %{truerelease}%{?dist}}
 
@@ -18,6 +18,7 @@
 License: CPL
 URL:     http://www.graphviz.org/
 Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz
+Patch0:  %{name}-arith.patch
 
 #-- feature and package selection -------------------------------------------
 #   depends on %dist and %fedora (or %rhl or %rhel) which are set
@@ -437,6 +438,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %if ! %{SHARP}
@@ -509,6 +511,9 @@
 #-- changelog --------------------------------------------------
 
 %changelog
+* Tue Sep 04 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-3
+- Patch to resurrect arith.h
+
 * Thu Aug 23 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-2
 - Added perl-devel to BR for F7+
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:36:53 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 4 Sep 2007 23:36:53 -0400
Subject: rpms/vala/devel vala.spec,1.5,1.6
Message-ID: <200709050336.l853arKE007235@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7200

Modified Files:
	vala.spec 
Log Message:
Enable binding generation tools


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vala.spec	2 Sep 2007 22:24:39 -0000	1.5
+++ vala.spec	5 Sep 2007 03:36:20 -0000	1.6
@@ -44,7 +44,7 @@
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -75,12 +75,17 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
+%{_bindir}/*gen
 %{_libdir}/libvala.so
+%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
 
 
 %changelog
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
 * Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
 - Update to 0.1.3
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:40:20 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 4 Sep 2007 23:40:20 -0400
Subject: rpms/vala/devel vala.spec,1.6,1.7
Message-ID: <200709050340.l853eKiY007336@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7295

Modified Files:
	vala.spec 
Log Message:
Bump release number


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vala.spec	5 Sep 2007 03:36:20 -0000	1.6
+++ vala.spec	5 Sep 2007 03:39:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Wed Sep  5 03:44:53 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 4 Sep 2007 23:44:53 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.10, 1.11 deluge.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200709050344.l853ir9D009534@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9359

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 RC1 (intended to stay in updates-testing until 0.5.5 final is released).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Sep 2007 02:14:06 -0000	1.10
+++ .cvsignore	5 Sep 2007 03:44:20 -0000	1.11
@@ -1 +1,2 @@
 deluge-0.5.4.1.tar.gz
+deluge-0.5.4.1.95.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- deluge.spec	2 Sep 2007 02:14:06 -0000	1.20
+++ deluge.spec	5 Sep 2007 03:44:20 -0000	1.21
@@ -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:	0.5.4.1
+Version:	0.5.4.1.95
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://deluge-torrent.org/downloads/%{name}-%{version}.tar.gz
@@ -105,6 +105,10 @@
 
 
 %changelog
+* Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
+- Update to new upstream release candidate (0.5.5 RC1)
+- Update License tag for new License version guidelines.
+
 * Sat Sep 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
 - Update to new upstream release (0.5.4.1). 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Sep 2007 02:14:06 -0000	1.10
+++ sources	5 Sep 2007 03:44:20 -0000	1.11
@@ -1 +1,2 @@
 36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
+4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 03:53:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 23:53:54 -0400
Subject: rpms/fwrestart/devel fwrestart.spec,1.5,1.6
Message-ID: <200709050353.l853rs1P009717@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698

Modified Files:
	fwrestart.spec 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 03:53:22 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:55:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 23:55:16 -0400
Subject: rpms/fwrestart/devel sources,1.4,1.5 .cvsignore,1.4,1.5
Message-ID: <200709050355.l853tGiU009764@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9732

Modified Files:
	sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 03:54:43 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 03:54:43 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:04:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:04:06 -0400
Subject: rpms/fwrestart/F-7 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050404.l85446XA015909@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15855

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:03:33 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:03:33 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:03:33 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:05:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:05:30 -0400
Subject: rpms/fwrestart/FC-6 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050405.l8545UOt016027@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15932

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:04:56 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:04:56 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:04:56 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:07:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:07:41 -0400
Subject: rpms/fwrestart/EL-4 fwrestart.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050407.l8547f44016133@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16089

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/fwrestart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwrestart.spec	9 May 2006 03:10:05 -0000	1.4
+++ fwrestart.spec	5 Sep 2007 04:07:08 -0000	1.5
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
+Version: 1.05
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-1
 - Update to 1.04
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 03:10:05 -0000	1.4
+++ sources	5 Sep 2007 04:07:08 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 03:10:05 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:07:08 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:09:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:09:01 -0400
Subject: rpms/fwrestart/EL-5 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050409.l85491Jo016227@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16196

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:08:27 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:08:27 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:08:27 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:53:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  5 Sep 2007 00:53:06 -0400
Subject: fedora-security/audit epel5,1.1,1.2
Message-ID: <200709050453.l854r6GR016943@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	epel5 
Log Message:
Process a bunch of epel5 entries



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel5	1 Sep 2007 18:49:37 -0000	1.1
+++ epel5	5 Sep 2007 04:53:03 -0000	1.2
@@ -109,58 +109,58 @@
 *CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
 *CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 *CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
-*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
-*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
-*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-5111 version (libksba, fixed 0.9.14)
-*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4684 version (zope, fixed 2.9.2)
-*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
-*CVE-2006-4248 ignore (thttpd, Debian specific issue)
-*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
-*CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
-*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
-*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
-*CVE-2006-2489 version (nagios, fixed 2.3.1)
-*CVE-2006-2427 ignore (clamav) not an issue bz#192076
-*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
-*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
-*CVE-2006-2017 version (dnsmasq, fixed 2.30)
-*CVE-2006-1989 version (clamav, fixed 0.88.2)
-*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
-*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
-*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
-*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
-*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
-*CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
-*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
-*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
-*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
-*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
-*CVE-2006-0162 version (clamav, fixed 0.88)
-*CVE-2006-0106 version (wine, fixed 0.9.10)
-*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
-*CVE-2005-4803 version (graphviz, fixed 2.2.1)
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
+CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
+CVE-2006-5111 version (libksba, fixed 0.9.14)
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4684 version (zope, fixed 2.9.2)
+CVE-2006-4249 version (plone, fixed 2.5.1-3) #213983
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
+CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
+CVE-2006-4192 version (libmodplug, fixed 0.8-3)
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
+CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
+CVE-2006-3458 version (zope, fixed 2.9.3-3) #198106
+CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
+CVE-2006-2489 version (nagios, fixed 2.3.1)
+CVE-2006-2427 ignore (clamav) not an issue bz#192076
+CVE-2006-2237 version (awstats, fixed 6.5-5) bz#190923
+CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
+CVE-2006-2017 version (dnsmasq, fixed 2.30)
+CVE-2006-1989 version (clamav, fixed 0.88.2)
+CVE-2006-1945 version (awstats, fixed 6.5-4) bz#190922
+CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
+CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
+CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
+CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
+CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
+CVE-2006-1079 version (thttpd, fixed 2.25b-11) bz#191095
+CVE-2006-1078 version (thttpd, fixed 2.25b-11) bz#191095
+CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
+CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0760 version (lighttpd, fixed 1.4.10)
+CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
+CVE-2006-0322 version (mediawiki, fixed 1.5.8)
+CVE-2006-0162 version (clamav, fixed 0.88)
+CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
+CVE-2005-4803 version (graphviz, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Wed Sep  5 04:59:02 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 00:59:02 -0400
Subject: rpms/exempi/devel exempi.spec,1.2,1.3
Message-ID: <200709050459.l854x2Bp017040@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17020

Modified Files:
	exempi.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-2
- Rebuild for expat 2.0



Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/exempi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exempi.spec	22 Aug 2007 12:08:15 -0000	1.2
+++ exempi.spec	5 Sep 2007 04:58:23 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
 Version:	1.99.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-2
+- Rebuild for expat 2.0
+
 * Wed Aug 22 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-1
 - Update tp 1.99.4
 



From fedora-extras-commits at redhat.com  Wed Sep  5 05:11:47 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:11:47 -0400
Subject: rpms/autofs/devel autofs-5.0.2-add-ldap-schema-discovery.patch, 1.1,
	1.2 autofs.spec, 1.221, 1.222
Message-ID: <200709050511.l855BlmR023157@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23125

Modified Files:
	autofs-5.0.2-add-ldap-schema-discovery.patch autofs.spec 
Log Message:
* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
- fix LDAP schema discovery.


autofs-5.0.2-add-ldap-schema-discovery.patch:

Index: autofs-5.0.2-add-ldap-schema-discovery.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.2-add-ldap-schema-discovery.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.2-add-ldap-schema-discovery.patch	28 Aug 2007 05:45:31 -0000	1.1
+++ autofs-5.0.2-add-ldap-schema-discovery.patch	5 Sep 2007 05:11:13 -0000	1.2
@@ -1,25 +1,6 @@
-diff --git a/include/defaults.h b/include/defaults.h
-index ef58467..9aec11a 100644
---- a/include/defaults.h
-+++ b/include/defaults.h
-@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
- unsigned int defaults_get_browse_mode(void);
- unsigned int defaults_get_logging(void);
- const char *defaults_get_ldap_server(void);
--const char *defaults_get_map_obj_class(void);
--const char *defaults_get_entry_obj_class(void);
--const char *defaults_get_map_attr(void);
--const char *defaults_get_entry_attr(void);
--const char *defaults_get_value_attr(void);
-+struct ldap_schema *defaults_get_default_schema(void);
-+struct ldap_schema *defaults_get_schema(void);
- unsigned int defaults_get_append_options(void);
- const char *defaults_get_auth_conf_file(void);
- 
-diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
-index 0a9deca..1378b9e 100644
---- a/include/lookup_ldap.h
-+++ b/include/lookup_ldap.h
+diff -up autofs-5.0.2/include/lookup_ldap.h.add-ldap-schema-discovery autofs-5.0.2/include/lookup_ldap.h
+--- autofs-5.0.2/include/lookup_ldap.h.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/include/lookup_ldap.h	2007-09-05 12:52:35.000000000 +0800
 @@ -10,6 +10,14 @@
  #include <krb5.h>
  #endif
@@ -48,164 +29,158 @@
  
  	/* TLS and SASL authentication information */
  	char        *auth_conf;
-diff --git a/lib/defaults.c b/lib/defaults.c
-index 4b4acba..b146f13 100644
---- a/lib/defaults.c
-+++ b/lib/defaults.c
-@@ -18,6 +18,7 @@
- #include <string.h>
+diff -up autofs-5.0.2/include/defaults.h.add-ldap-schema-discovery autofs-5.0.2/include/defaults.h
+--- autofs-5.0.2/include/defaults.h.add-ldap-schema-discovery	2007-06-18 15:18:08.000000000 +0800
++++ autofs-5.0.2/include/defaults.h	2007-09-05 12:52:35.000000000 +0800
+@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
+ unsigned int defaults_get_browse_mode(void);
+ unsigned int defaults_get_logging(void);
+ const char *defaults_get_ldap_server(void);
+-const char *defaults_get_map_obj_class(void);
+-const char *defaults_get_entry_obj_class(void);
+-const char *defaults_get_map_attr(void);
+-const char *defaults_get_entry_attr(void);
+-const char *defaults_get_value_attr(void);
++struct ldap_schema *defaults_get_default_schema(void);
++struct ldap_schema *defaults_get_schema(void);
+ unsigned int defaults_get_append_options(void);
+ const char *defaults_get_auth_conf_file(void);
  
- #include "defaults.h"
-+#include "lookup_ldap.h"
- #include "log.h"
+diff -up autofs-5.0.2/modules/lookup_ldap.c.add-ldap-schema-discovery autofs-5.0.2/modules/lookup_ldap.c
+--- autofs-5.0.2/modules/lookup_ldap.c.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-05 12:53:10.000000000 +0800
+@@ -42,6 +42,13 @@
  
- #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
-@@ -41,16 +42,8 @@
- #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
  
- static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
++static struct ldap_schema common_schema[] = {
++	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
++	{"automountMap", "ou", "automount", "cn", "automountInformation"},
++	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
++};
++static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++
+ int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
+ {
+ 	int rv;
+@@ -738,54 +745,15 @@ done:
+ 	return 1;
+ }
+ 
+-static int get_default_schema(struct lookup_context *ctxt)
+-{
+-	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
+-	if (!ctxt->map_obj_class)
+-		return 0;
 -
--static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
+-	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
+-	if (!ctxt->entry_obj_class)
+-		goto free_moc;
 -
--static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
--static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
--static const char *default_map_attr		= DEFAULT_MAP_ATTR;
--static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
--static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
+-	ctxt->map_attr = (char *) defaults_get_map_attr();
+-	if (!ctxt->map_attr)
+-		goto free_eoc;
 -
--static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
-+static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
-+static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
- 
- static char *get_env_string(const char *name)
+-	ctxt->entry_attr = (char *) defaults_get_entry_attr();
+-	if (!ctxt->entry_attr)
+-		goto free_ma;
+-
+-	ctxt->value_attr = (char *) defaults_get_value_attr();
+-	if (!ctxt->value_attr)
+-		goto free_ea;
+-
+-	return 1;
+-
+-free_ea:
+-	free(ctxt->entry_attr);
+-free_ma:
+-	free(ctxt->map_attr);
+-free_eoc:
+-	free(ctxt->entry_obj_class);
+-free_moc:
+-	free(ctxt->map_obj_class);
+-
+-	ctxt->map_obj_class = NULL;
+-	ctxt->entry_obj_class = NULL;
+-	ctxt->map_attr = NULL;
+-	ctxt->entry_attr = NULL;
+-
+-	return 0;
+-}
+-
+ static void free_context(struct lookup_context *ctxt)
  {
-@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(void)
- 	return (const char *) server;
+-	if (ctxt->map_obj_class) {
+-		free(ctxt->map_obj_class);
+-		free(ctxt->entry_obj_class);
+-		free(ctxt->map_attr);
+-		free(ctxt->entry_attr);
++	if (ctxt->schema) {
++		free(ctxt->schema->map_class);
++		free(ctxt->schema->map_attr);
++		free(ctxt->schema->entry_class);
++		free(ctxt->schema->entry_attr);
++		free(ctxt->schema->value_attr);
++		free(ctxt->schema);
+ 	}
+ 	if (ctxt->auth_conf)
+ 		free(ctxt->auth_conf);
+@@ -808,19 +776,15 @@ static void free_context(struct lookup_c
+ 	return;
  }
  
--const char *defaults_get_map_obj_class(void)
-+struct ldap_schema *defaults_get_default_schema(void)
+-static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
  {
--	char *moc;
-+	struct ldap_schema *schema;
-+	char *mc, *ma, *ec, *ea, *va;
- 
--	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
--	if (!moc)
--		return strdup(default_map_obj_class);
-+	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
-+	if (!mc)
-+		return NULL;
- 
--	return (const char *) moc;
--}
-+	ma = strdup(DEFAULT_MAP_ATTR);
-+	if (!ma) {
-+		free(mc);
-+		return NULL;
-+	}
- 
--const char *defaults_get_entry_obj_class(void)
--{
--	char *eoc;
-+	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
-+	if (!ec) {
-+		free(mc);
-+		free(ma);
-+		return NULL;
-+	}
- 
--	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
--	if (!eoc)
--		return strdup(default_entry_obj_class);
-+	ea = strdup(DEFAULT_ENTRY_ATTR);
-+	if (!ea) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		return NULL;
-+	}
- 
--	return (const char *) eoc;
--}
-+	va = strdup(DEFAULT_VALUE_ATTR);
-+	if (!va) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		free(ea);
-+		return NULL;
-+	}
- 
--const char *defaults_get_map_attr(void)
--{
--	char *ma;
-+	schema = malloc(sizeof(struct ldap_schema));
-+	if (!schema) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		free(ea);
-+		free(va);
-+		return NULL;
-+	}
+ 	char buf[PARSE_MAX_BUF];
+ 	char *query, *dn;
+ 	LDAPMessage *result, *e;
+-	char *class, *key;
+ 	char *attrs[2];
+ 	int scope;
+ 	int rv, l;
  
--	ma = get_env_string(ENV_NAME_MAP_ATTR);
--	if (!ma)
--		return strdup(default_map_attr);
-+	schema->map_class = mc;
-+	schema->map_attr = ma;
-+	schema->entry_class = ec;
-+	schema->entry_attr = ea;
-+	schema->value_attr = va;
+-	class = ctxt->map_obj_class;
+-	key = ctxt->map_attr;
+-
+ 	attrs[0] = LDAP_NO_ATTRS;
+ 	attrs[1] = NULL;
  
--	return (const char *) ma;
-+	return schema;
+@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, stru
+ 	return 1;
  }
  
--const char *defaults_get_entry_attr(void)
-+struct ldap_schema *defaults_get_schema(void)
- {
--	char *ea;
++static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
++{
 +	struct ldap_schema *schema;
 +	char *mc, *ma, *ec, *ea, *va;
- 
--	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
--	if (!ea)
--		return strdup(default_entry_attr);
-+	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
++
++	mc = strdup(s->map_class);
 +	if (!mc)
 +		return NULL;
- 
--	return (const char *) ea;
--}
-+	ma = get_env_string(ENV_NAME_MAP_ATTR);
++
++	ma = strdup(s->map_attr);
 +	if (!ma) {
 +		free(mc);
 +		return NULL;
 +	}
- 
--const char *defaults_get_value_attr(void)
--{
--	char *va;
-+	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
++
++	ec = strdup(s->entry_class);
 +	if (!ec) {
 +		free(mc);
 +		free(ma);
 +		return NULL;
 +	}
 +
-+	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
++	ea = strdup(s->entry_attr);
 +	if (!ea) {
 +		free(mc);
 +		free(ma);
 +		free(ec);
 +		return NULL;
 +	}
- 
- 	va = get_env_string(ENV_NAME_VALUE_ATTR);
--	if (!va)
--		return strdup(default_value_attr);
++
++	va = strdup(s->value_attr);
 +	if (!va) {
 +		free(mc);
 +		free(ma);
@@ -229,287 +204,287 @@
 +	schema->entry_class = ec;
 +	schema->entry_attr = ea;
 +	schema->value_attr = va;
- 
--	return (const char *) va;
++
 +	return schema;
- }
- 
- unsigned int defaults_get_append_options(void)
-diff --git a/man/auto.master.5.in b/man/auto.master.5.in
-index 69c796e..249c9a7 100644
---- a/man/auto.master.5.in
-+++ b/man/auto.master.5.in
-@@ -191,17 +191,25 @@ The old style
- is also understood. Alternatively, the type can be obtained from the Name Service Switch
- configuration, in which case the map name alone must be given.
- .P
--The default LDAP schema is the NIS schema described in RFC 2307.
--Entries in the nisMap schema are \fBnisObject\fP objects in
-+If no schema is set in the autofs configuration then autofs will check
-+each of the commonly used schema for a valid entry and if one is found
-+it will used for subsequent lookups.
-+.P
-+There are three common schemas in use:
-+.TP
-+.I nisMap
-+Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
- the specified subtree, where the \fBcn\fP attribute is the key
- (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
- contains the information used by the automounter.
--.P
--Entries in the automountMap schema are \fBautomount\fP objects in
--the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
--(depending on local usage) is the key (the wildcard key is "/"), and the
--\fBautomountInformation\fP attribute contains the information used by the
--automounter.
-+.TP
-+.I automountMap
-+The \fBautomountMap\fP schema has two variations that differ in the attribute
-+used for the map key. Entries in the automountMap schema are \fBautomount\fP
-+objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
-+attribute (depending on local usage) is the key (the wildcard key is "/"),
-+and the \fBautomountInformation\fP attribute contains the information used
-+by the automounter. Note that the \fBcn\fP attribute is case insensitive.
- .P
- The object classes and attributes used for accessing automount maps in
- LDAP can be changed by setting entries in the autofs configuration
-@@ -209,61 +217,44 @@ located in
- .nh
- .BR @@autofsconfdir@@/autofs .
- .hy
-+.TP
-+.B NOTE:
-+If a schema is given in the configuration then all the schema configuration
-+values must be set, any partial schema specification will be ignored.
- .P
- The configuration settings available are:
- .TP
--\fBMAP_OBJECT_CLASS\fP
--The map object class. Its Default value is "nisMap". In the
--.nh
--automountMap
--.hy
--schema this corresponds to the class
--.nh
--.BR automountMap .
--.hy
-+.B MAP_OBJECT_CLASS
-+The map object class. In the \fBnisMap\fP schema this corresponds to the class
-+\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
-+\fBautomountMap\fP.
- .TP
- .B ENTRY_OBJECT_CLASS
--The map entry object class. Its default value is \fBnisObject\fP.
--In the automountMap schema this corresponds to the class
--.nh
--.BR automount .
--.hy
-+The map entry object class. In the \fBnisMap\fP schema this corresponds
-+to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
-+corresponds to the class \fBautomount\fP.
- .TP
- .B MAP_ATTRIBUTE
- The attribute used to identify the name of the map to which this
--entry belongs. Its default value is
--.nh
--.BR nisMapName .
--.hy
--In the
--.nh
--automountMap
--.hy
--schema this corresponds to the attributes \fBou\fP or
--.nh
--.BR automountMapName .
--.hy
-+entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
-+\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
-+attribute \fBou\fP or \fBautomountMapName\fP.
- .TP
- .B ENTRY_ATTRIBUTE
--The attribute used to identify a map key. Its default value is
--In the
--.nh
--automountMap
--.hy
--schema this corresponds to the attribute
--.nh
--.BR automountKey .
--.hy
-+The attribute used to identify a map key. In the \fBnisMap\fP schema this
-+corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
-+it corresponds to the attribute \fBautomountKey\fP.
- .TP
- .B VALUE_ATTRIBUTE
--The attribute used to identify the value of the map entry. Its default
--value is
--.nh
--.BR BnisMapEntry .
--.hy
--In the automountMap schema this corresponds to the attribute
--.nh
--.BR automountInformation .
-+The attribute used to identify the value of the map entry. In the \fBnisMap\fP
-+schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
-+schema it corresponds to the attribute \fBautomountInformation\fP.
-+.TP
-+.B NOTE:
-+It is essential that entries use class and attribute in a consistent
-+manner for correct operation of autofs. For example mixing \fBcn\fP and
-+\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
-+work as expected.
- .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
- LDAP authenticated binds, TLS encrypted connections and certification
- may be used by setting appropriate values in the autofs authentication
-diff --git a/man/automount.8 b/man/automount.8
-index fc1846a..da67a5c 100644
---- a/man/automount.8
-+++ b/man/automount.8
-@@ -102,6 +102,8 @@ started they will be recoverd unless they are no longer present in
- the map in which case they need to umounted manually.
- .SH "SEE ALSO"
- .BR autofs (5),
-+.BR autofs (8),
-+.BR auto.master (5),
- .BR mount (8).
- .SH BUGS
- Don't know, I've fixed everything I know about.
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index a412797..d5e666b 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -42,6 +42,13 @@
- 
- int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
- 
-+static struct ldap_schema common_schema[] = {
-+	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
-+	{"automountMap", "ou", "automount", "cn", "automountInformation"},
-+	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
-+};
-+static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++}
 +
- int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
- {
- 	int rv;
-@@ -738,54 +745,15 @@ done:
- 	return 1;
- }
++static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++{
++	struct ldap_schema *schema;
++	unsigned int i;
++
++	if (ctxt->schema)
++		return 0;
++
++	for (i = 0; i < common_schema_count; i++) {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (get_query_dn(ldap, ctxt, class, key)) {
++			schema = alloc_common_schema(&common_schema[i]);
++			if (!schema) {
++				error(LOGOPT_ANY,
++				      MODPREFIX "failed to allocate schema");
++				return 0;
++			}
++			ctxt->schema = schema;
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
+ /*
+  * This initializes a context (persistent non-global data) for queries to
+  * this module.  Return zero if we succeed.
+@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
  
--static int get_default_schema(struct lookup_context *ctxt)
--{
--	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
--	if (!ctxt->map_obj_class)
--		return 0;
--
--	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
--	if (!ctxt->entry_obj_class)
--		goto free_moc;
--
--	ctxt->map_attr = (char *) defaults_get_map_attr();
--	if (!ctxt->map_attr)
--		goto free_eoc;
--
--	ctxt->entry_attr = (char *) defaults_get_entry_attr();
--	if (!ctxt->entry_attr)
--		goto free_ma;
--
--	ctxt->value_attr = (char *) defaults_get_value_attr();
--	if (!ctxt->value_attr)
--		goto free_ea;
--
--	return 1;
+-	/* Get default schema for queries */
+-	if (!get_default_schema(ctxt)) {
+-		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
+-		free_context(ctxt);
+-		return 1;
+-	}
 -
--free_ea:
--	free(ctxt->entry_attr);
--free_ma:
--	free(ctxt->map_attr);
--free_eoc:
--	free(ctxt->entry_obj_class);
--free_moc:
--	free(ctxt->map_obj_class);
+ #ifdef WITH_SASL
+ 	/*
+ 	 * Determine which authentication mechanism to use.  We sanity-
+@@ -954,13 +995,31 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	ret = get_query_dn(ldap, ctxt);
+-	unbind_ldap_connection(ldap, ctxt);
+-	if (!ret) {
+-		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
+-		free_context(ctxt);
+-		return 1;
++	/*
++	 * Get default schema for queries.
++	 * If the schema isn't defined in the configuration then check for
++	 * presence of a map dn in the common schemas.
++	 */
++	ctxt->schema = defaults_get_schema();
++	if (!ctxt->schema) {
++		if (!find_query_dn(ldap, ctxt)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY,
++			      MODPREFIX "failed to find valid query dn");
++			free_context(ctxt);
++			return 1;
++		}
++	} else {
++		const char *class = ctxt->schema->map_class;
++		const char *key = ctxt->schema->map_attr;
++		if (!get_query_dn(ldap, ctxt, class, key)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
++			free_context(ctxt);
++			return 1;
++		}
+ 	}
++	unbind_ldap_connection(ldap, ctxt);
+ 
+ 	/* Open the parser, if we can. */
+ 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+@@ -990,9 +1049,9 @@ int lookup_read_master(struct master *ma
+ 	int scope = LDAP_SCOPE_SUBTREE;
+ 	LDAP *ldap;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1141,9 +1200,9 @@ static int read_one_map(struct autofs_po
+ 
+ 	mc = source->mc;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1438,9 +1497,9 @@ static int lookup_one(struct autofs_poin
+ 		return CHE_FAIL;
+ 	}
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+diff -up autofs-5.0.2/lib/defaults.c.add-ldap-schema-discovery autofs-5.0.2/lib/defaults.c
+--- autofs-5.0.2/lib/defaults.c.add-ldap-schema-discovery	2007-06-18 15:18:08.000000000 +0800
++++ autofs-5.0.2/lib/defaults.c	2007-09-05 12:52:35.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <string.h>
+ 
+ #include "defaults.h"
++#include "lookup_ldap.h"
+ #include "log.h"
+ 
+ #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
+@@ -41,16 +42,8 @@
+ #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ 
+ static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
 -
--	ctxt->map_obj_class = NULL;
--	ctxt->entry_obj_class = NULL;
--	ctxt->map_attr = NULL;
--	ctxt->entry_attr = NULL;
+-static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
 -
--	return 0;
--}
+-static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
+-static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
+-static const char *default_map_attr		= DEFAULT_MAP_ATTR;
+-static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
+-static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
 -
- static void free_context(struct lookup_context *ctxt)
+-static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
++static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
++static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
+ 
+ static char *get_env_string(const char *name)
  {
--	if (ctxt->map_obj_class) {
--		free(ctxt->map_obj_class);
--		free(ctxt->entry_obj_class);
--		free(ctxt->map_attr);
--		free(ctxt->entry_attr);
-+	if (ctxt->schema) {
-+		free(ctxt->schema->map_class);
-+		free(ctxt->schema->map_attr);
-+		free(ctxt->schema->entry_class);
-+		free(ctxt->schema->entry_attr);
-+		free(ctxt->schema->value_attr);
-+		free(ctxt->schema);
- 	}
- 	if (ctxt->auth_conf)
- 		free(ctxt->auth_conf);
-@@ -808,19 +776,15 @@ static void free_context(struct lookup_context *ctxt)
- 	return;
+@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(voi
+ 	return (const char *) server;
  }
  
--static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
-+static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
+-const char *defaults_get_map_obj_class(void)
++struct ldap_schema *defaults_get_default_schema(void)
  {
- 	char buf[PARSE_MAX_BUF];
- 	char *query, *dn;
- 	LDAPMessage *result, *e;
--	char *class, *key;
- 	char *attrs[2];
- 	int scope;
- 	int rv, l;
+-	char *moc;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
  
--	class = ctxt->map_obj_class;
--	key = ctxt->map_attr;
--
- 	attrs[0] = LDAP_NO_ATTRS;
- 	attrs[1] = NULL;
+-	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
+-	if (!moc)
+-		return strdup(default_map_obj_class);
++	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
  
-@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
- 	return 1;
+-	return (const char *) moc;
+-}
++	ma = strdup(DEFAULT_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_entry_obj_class(void)
+-{
+-	char *eoc;
++	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
+ 
+-	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
+-	if (!eoc)
+-		return strdup(default_entry_obj_class);
++	ea = strdup(DEFAULT_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+-	return (const char *) eoc;
+-}
++	va = strdup(DEFAULT_VALUE_ATTR);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
+ 
+-const char *defaults_get_map_attr(void)
+-{
+-	char *ma;
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
+ 
+-	ma = get_env_string(ENV_NAME_MAP_ATTR);
+-	if (!ma)
+-		return strdup(default_map_attr);
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) ma;
++	return schema;
  }
  
-+static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
-+{
+-const char *defaults_get_entry_attr(void)
++struct ldap_schema *defaults_get_schema(void)
+ {
+-	char *ea;
 +	struct ldap_schema *schema;
 +	char *mc, *ma, *ec, *ea, *va;
-+
-+	mc = strdup(s->map_class);
+ 
+-	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
+-	if (!ea)
+-		return strdup(default_entry_attr);
++	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
 +	if (!mc)
 +		return NULL;
-+
-+	ma = strdup(s->map_attr);
+ 
+-	return (const char *) ea;
+-}
++	ma = get_env_string(ENV_NAME_MAP_ATTR);
 +	if (!ma) {
 +		free(mc);
 +		return NULL;
-+	}
-+
-+	ec = strdup(s->entry_class);
++	}
+ 
+-const char *defaults_get_value_attr(void)
+-{
+-	char *va;
++	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
 +	if (!ec) {
 +		free(mc);
 +		free(ma);
 +		return NULL;
 +	}
 +
-+	ea = strdup(s->entry_attr);
++	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
 +	if (!ea) {
 +		free(mc);
 +		free(ma);
 +		free(ec);
 +		return NULL;
 +	}
-+
-+	va = strdup(s->value_attr);
+ 
+ 	va = get_env_string(ENV_NAME_VALUE_ATTR);
+-	if (!va)
+-		return strdup(default_value_attr);
 +	if (!va) {
 +		free(mc);
 +		free(ma);
@@ -533,118 +508,146 @@
 +	schema->entry_class = ec;
 +	schema->entry_attr = ea;
 +	schema->value_attr = va;
-+
-+	return schema;
-+}
-+
-+static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
-+{
-+	struct ldap_schema *schema;
-+	unsigned int i;
-+
-+	if (ctxt->schema)
-+		return 0;
-+
-+	for (i = 0; i < common_schema_count; i++) {
-+		const char *class = common_schema[i].map_class;
-+		const char *key = common_schema[i].map_attr;
-+		if (get_query_dn(ldap, ctxt, class, key)) {
-+			schema = alloc_common_schema(&common_schema[i]);
-+			if (!schema) {
-+				error(LOGOPT_ANY,
-+				      MODPREFIX "failed to allocate schema");
-+				return 0;
-+			}
-+			ctxt->schema = schema;
-+			return 1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
- /*
-  * This initializes a context (persistent non-global data) for queries to
-  * this module.  Return zero if we succeed.
-@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
- 		return 1;
- 	}
- 
--	/* Get default schema for queries */
--	if (!get_default_schema(ctxt)) {
--		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
--		free_context(ctxt);
--		return 1;
--	}
--
- #ifdef WITH_SASL
- 	/*
- 	 * Determine which authentication mechanism to use.  We sanity-
-@@ -954,13 +995,22 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
- 		return 1;
- 	}
- 
--	ret = get_query_dn(ldap, ctxt);
--	unbind_ldap_connection(ldap, ctxt);
--	if (!ret) {
--		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
--		free_context(ctxt);
--		return 1;
-+	/*
-+	 * Get default schema for queries.
-+	 * If the schema isn't defined in the configuration then check for
-+	 * presence of a map dn in the common schemas.
-+	 */
-+	ctxt->schema = defaults_get_schema();
-+	if (!ctxt->schema) {
-+		if (!find_query_dn(ldap, ctxt)) {
-+			unbind_ldap_connection(ldap, ctxt);
-+			error(LOGOPT_ANY,
-+			      MODPREFIX "failed to find valid query dn");
-+			free_context(ctxt);
-+			return 1;
-+		}
- 	}
-+	unbind_ldap_connection(ldap, ctxt);
- 
- 	/* Open the parser, if we can. */
- 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
-@@ -990,9 +1040,9 @@ int lookup_read_master(struct master *master, time_t age, void *context)
- 	int scope = LDAP_SCOPE_SUBTREE;
- 	LDAP *ldap;
- 
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
- 
- 	attrs[0] = entry;
- 	attrs[1] = info;
-@@ -1141,9 +1191,9 @@ static int read_one_map(struct autofs_point *ap,
- 
- 	mc = source->mc;
- 
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
- 
- 	attrs[0] = entry;
- 	attrs[1] = info;
-@@ -1438,9 +1488,9 @@ static int lookup_one(struct autofs_point *ap,
- 		return CHE_FAIL;
- 	}
  
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
+-	return (const char *) va;
++	return schema;
+ }
  
- 	attrs[0] = entry;
- 	attrs[1] = info;
+ unsigned int defaults_get_append_options(void)
+diff -up autofs-5.0.2/man/auto.master.5.in.add-ldap-schema-discovery autofs-5.0.2/man/auto.master.5.in
+--- autofs-5.0.2/man/auto.master.5.in.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/man/auto.master.5.in	2007-09-05 12:52:35.000000000 +0800
+@@ -191,17 +191,25 @@ The old style
+ is also understood. Alternatively, the type can be obtained from the Name Service Switch
+ configuration, in which case the map name alone must be given.
+ .P
+-The default LDAP schema is the NIS schema described in RFC 2307.
+-Entries in the nisMap schema are \fBnisObject\fP objects in
++If no schema is set in the autofs configuration then autofs will check
++each of the commonly used schema for a valid entry and if one is found
++it will used for subsequent lookups.
++.P
++There are three common schemas in use:
++.TP
++.I nisMap
++Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
+ the specified subtree, where the \fBcn\fP attribute is the key
+ (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
+ contains the information used by the automounter.
+-.P
+-Entries in the automountMap schema are \fBautomount\fP objects in
+-the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
+-(depending on local usage) is the key (the wildcard key is "/"), and the
+-\fBautomountInformation\fP attribute contains the information used by the
+-automounter.
++.TP
++.I automountMap
++The \fBautomountMap\fP schema has two variations that differ in the attribute
++used for the map key. Entries in the automountMap schema are \fBautomount\fP
++objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
++attribute (depending on local usage) is the key (the wildcard key is "/"),
++and the \fBautomountInformation\fP attribute contains the information used
++by the automounter. Note that the \fBcn\fP attribute is case insensitive.
+ .P
+ The object classes and attributes used for accessing automount maps in
+ LDAP can be changed by setting entries in the autofs configuration
+@@ -209,61 +217,44 @@ located in
+ .nh
+ .BR @@autofsconfdir@@/autofs .
+ .hy
++.TP
++.B NOTE:
++If a schema is given in the configuration then all the schema configuration
++values must be set, any partial schema specification will be ignored.
+ .P
+ The configuration settings available are:
+ .TP
+-\fBMAP_OBJECT_CLASS\fP
+-The map object class. Its Default value is "nisMap". In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the class
+-.nh
+-.BR automountMap .
+-.hy
++.B MAP_OBJECT_CLASS
++The map object class. In the \fBnisMap\fP schema this corresponds to the class
++\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
++\fBautomountMap\fP.
+ .TP
+ .B ENTRY_OBJECT_CLASS
+-The map entry object class. Its default value is \fBnisObject\fP.
+-In the automountMap schema this corresponds to the class
+-.nh
+-.BR automount .
+-.hy
++The map entry object class. In the \fBnisMap\fP schema this corresponds
++to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
++corresponds to the class \fBautomount\fP.
+ .TP
+ .B MAP_ATTRIBUTE
+ The attribute used to identify the name of the map to which this
+-entry belongs. Its default value is
+-.nh
+-.BR nisMapName .
+-.hy
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attributes \fBou\fP or
+-.nh
+-.BR automountMapName .
+-.hy
++entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
++\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
++attribute \fBou\fP or \fBautomountMapName\fP.
+ .TP
+ .B ENTRY_ATTRIBUTE
+-The attribute used to identify a map key. Its default value is
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attribute
+-.nh
+-.BR automountKey .
+-.hy
++The attribute used to identify a map key. In the \fBnisMap\fP schema this
++corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
++it corresponds to the attribute \fBautomountKey\fP.
+ .TP
+ .B VALUE_ATTRIBUTE
+-The attribute used to identify the value of the map entry. Its default
+-value is
+-.nh
+-.BR BnisMapEntry .
+-.hy
+-In the automountMap schema this corresponds to the attribute
+-.nh
+-.BR automountInformation .
++The attribute used to identify the value of the map entry. In the \fBnisMap\fP
++schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
++schema it corresponds to the attribute \fBautomountInformation\fP.
++.TP
++.B NOTE:
++It is essential that entries use class and attribute in a consistent
++manner for correct operation of autofs. For example mixing \fBcn\fP and
++\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
++work as expected.
+ .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
+ LDAP authenticated binds, TLS encrypted connections and certification
+ may be used by setting appropriate values in the autofs authentication
+diff -up autofs-5.0.2/man/automount.8.add-ldap-schema-discovery autofs-5.0.2/man/automount.8
+--- autofs-5.0.2/man/automount.8.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/man/automount.8	2007-09-05 12:52:35.000000000 +0800
+@@ -102,6 +102,8 @@ started they will be recoverd unless the
+ the map in which case they need to umounted manually.
+ .SH "SEE ALSO"
+ .BR autofs (5),
++.BR autofs (8),
++.BR auto.master (5),
+ .BR mount (8).
+ .SH BUGS
+ Don't know, I've fixed everything I know about.


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- autofs.spec	28 Aug 2007 06:14:02 -0000	1.221
+++ autofs.spec	5 Sep 2007 05:11:13 -0000	1.222
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 14
+Release: 15
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
+- fix LDAP schema discovery.
+
 * Tue Aug 28 2007 Ian Kent <ikent at redhat.com> - 5.0.2-14
 - update patch to prevent failure on empty master map.
 - if there's no "automount" entry in nsswitch.conf use "files" source.



From fedora-extras-commits at redhat.com  Wed Sep  5 05:33:47 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:33:47 -0400
Subject: rpms/autofs/F-7 autofs-5.0.1-add-ldap-schema-discovery.patch, 1.2, 
	1.3 autofs-5.0.1-add-ldaps-support.patch, NONE, 1.1 autofs.spec,
	1.217, 1.218
Message-ID: <200709050533.l855XlLR025722@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25676

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-add-ldap-schema-discovery.patch 
	autofs-5.0.1-add-ldaps-support.patch 
Log Message:
* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.1-28
- add ldaps support (required by schema discovery).
- add back LDAP schema discovery if no schema is configured.


autofs-5.0.1-add-ldap-schema-discovery.patch:

Index: autofs-5.0.1-add-ldap-schema-discovery.patch
===================================================================
RCS file: autofs-5.0.1-add-ldap-schema-discovery.patch
diff -N autofs-5.0.1-add-ldap-schema-discovery.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:33:14 -0000	1.3
@@ -0,0 +1,656 @@
+diff -up autofs-5.0.1/include/lookup_ldap.h.add-ldap-schema-discovery autofs-5.0.1/include/lookup_ldap.h
+--- autofs-5.0.1/include/lookup_ldap.h.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/include/lookup_ldap.h	2007-09-05 13:27:06.000000000 +0800
+@@ -7,8 +7,17 @@
+ #include <openssl/err.h>
+ #include <sasl/sasl.h>
+ #include <libxml/tree.h>
++#include <krb5.h>
+ #endif
+ 
++struct ldap_schema {
++	char *map_class;
++	char *map_attr;
++	char *entry_class;
++	char *entry_attr;
++	char *value_attr;
++};
++
+ struct lookup_context {
+ 	char *mapname;
+ 
+@@ -21,11 +30,7 @@ struct lookup_context {
+ 	int version;
+ 
+ 	/* LDAP lookup configuration */
+-	char *map_obj_class;
+-	char *entry_obj_class;
+-	char *map_attr;
+-	char *entry_attr;
+-	char *value_attr;
++	struct ldap_schema *schema;
+ 
+ 	/* TLS and SASL authentication information */
+ 	char        *auth_conf;
+diff -up autofs-5.0.1/include/defaults.h.add-ldap-schema-discovery autofs-5.0.1/include/defaults.h
+--- autofs-5.0.1/include/defaults.h.add-ldap-schema-discovery	2007-09-05 13:27:05.000000000 +0800
++++ autofs-5.0.1/include/defaults.h	2007-09-05 13:27:06.000000000 +0800
+@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
+ unsigned int defaults_get_browse_mode(void);
+ unsigned int defaults_get_logging(void);
+ const char *defaults_get_ldap_server(void);
+-const char *defaults_get_map_obj_class(void);
+-const char *defaults_get_entry_obj_class(void);
+-const char *defaults_get_map_attr(void);
+-const char *defaults_get_entry_attr(void);
+-const char *defaults_get_value_attr(void);
++struct ldap_schema *defaults_get_default_schema(void);
++struct ldap_schema *defaults_get_schema(void);
+ unsigned int defaults_get_append_options(void);
+ const char *defaults_get_auth_conf_file(void);
+ 
+diff -up autofs-5.0.1/modules/lookup_ldap.c.add-ldap-schema-discovery autofs-5.0.1/modules/lookup_ldap.c
+--- autofs-5.0.1/modules/lookup_ldap.c.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/modules/lookup_ldap.c	2007-09-05 13:27:39.000000000 +0800
+@@ -42,6 +42,13 @@
+ 
+ int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
+ 
++static struct ldap_schema common_schema[] = {
++	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
++	{"automountMap", "ou", "automount", "cn", "automountInformation"},
++	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
++};
++static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++
+ int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
+ {
+ 	int rv;
+@@ -738,54 +745,15 @@ done:
+ 	return 1;
+ }
+ 
+-static int get_default_schema(struct lookup_context *ctxt)
+-{
+-	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
+-	if (!ctxt->map_obj_class)
+-		return 0;
+-
+-	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
+-	if (!ctxt->entry_obj_class)
+-		goto free_moc;
+-
+-	ctxt->map_attr = (char *) defaults_get_map_attr();
+-	if (!ctxt->map_attr)
+-		goto free_eoc;
+-
+-	ctxt->entry_attr = (char *) defaults_get_entry_attr();
+-	if (!ctxt->entry_attr)
+-		goto free_ma;
+-
+-	ctxt->value_attr = (char *) defaults_get_value_attr();
+-	if (!ctxt->value_attr)
+-		goto free_ea;
+-
+-	return 1;
+-
+-free_ea:
+-	free(ctxt->entry_attr);
+-free_ma:
+-	free(ctxt->map_attr);
+-free_eoc:
+-	free(ctxt->entry_obj_class);
+-free_moc:
+-	free(ctxt->map_obj_class);
+-
+-	ctxt->map_obj_class = NULL;
+-	ctxt->entry_obj_class = NULL;
+-	ctxt->map_attr = NULL;
+-	ctxt->entry_attr = NULL;
+-
+-	return 0;
+-}
+-
+ static void free_context(struct lookup_context *ctxt)
+ {
+-	if (ctxt->map_obj_class) {
+-		free(ctxt->map_obj_class);
+-		free(ctxt->entry_obj_class);
+-		free(ctxt->map_attr);
+-		free(ctxt->entry_attr);
++	if (ctxt->schema) {
++		free(ctxt->schema->map_class);
++		free(ctxt->schema->map_attr);
++		free(ctxt->schema->entry_class);
++		free(ctxt->schema->entry_attr);
++		free(ctxt->schema->value_attr);
++		free(ctxt->schema);
+ 	}
+ 	if (ctxt->auth_conf)
+ 		free(ctxt->auth_conf);
+@@ -808,19 +776,15 @@ static void free_context(struct lookup_c
+ 	return;
+ }
+ 
+-static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
+ {
+ 	char buf[PARSE_MAX_BUF];
+ 	char *query, *dn;
+ 	LDAPMessage *result, *e;
+-	char *class, *key;
+ 	char *attrs[2];
+ 	int scope;
+ 	int rv, l;
+ 
+-	class = ctxt->map_obj_class;
+-	key = ctxt->map_attr;
+-
+ 	attrs[0] = LDAP_NO_ATTRS;
+ 	attrs[1] = NULL;
+ 
+@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, stru
+ 	return 1;
+ }
+ 
++static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
++{
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
++
++	mc = strdup(s->map_class);
++	if (!mc)
++		return NULL;
++
++	ma = strdup(s->map_attr);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
++
++	ec = strdup(s->entry_class);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
++
++	ea = strdup(s->entry_attr);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
++
++	va = strdup(s->value_attr);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
++
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
++
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
++
++	return schema;
++}
++
++static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++{
++	struct ldap_schema *schema;
++	unsigned int i;
++
++	if (ctxt->schema)
++		return 0;
++
++	for (i = 0; i < common_schema_count; i++) {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (get_query_dn(ldap, ctxt, class, key)) {
++			schema = alloc_common_schema(&common_schema[i]);
++			if (!schema) {
++				error(LOGOPT_ANY,
++				      MODPREFIX "failed to allocate schema");
++				return 0;
++			}
++			ctxt->schema = schema;
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
+ /*
+  * This initializes a context (persistent non-global data) for queries to
+  * this module.  Return zero if we succeed.
+@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	/* Get default schema for queries */
+-	if (!get_default_schema(ctxt)) {
+-		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
+-		free_context(ctxt);
+-		return 1;
+-	}
+-
+ #ifdef WITH_SASL
+ 	/*
+ 	 * Determine which authentication mechanism to use.  We sanity-
+@@ -954,13 +995,31 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	ret = get_query_dn(ldap, ctxt);
+-	unbind_ldap_connection(ldap, ctxt);
+-	if (!ret) {
+-		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
+-		free_context(ctxt);
+-		return 1;
++	/*
++	 * Get default schema for queries.
++	 * If the schema isn't defined in the configuration then check for
++	 * presence of a map dn in the common schemas.
++	 */
++	ctxt->schema = defaults_get_schema();
++	if (!ctxt->schema) {
++		if (!find_query_dn(ldap, ctxt)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY,
++			      MODPREFIX "failed to find valid query dn");
++			free_context(ctxt);
++			return 1;
++		}
++	} else {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (!get_query_dn(ldap, ctxt, class, key)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
++			free_context(ctxt);
++			return 1;
++		}
+ 	}
++	unbind_ldap_connection(ldap, ctxt);
+ 
+ 	/* Open the parser, if we can. */
+ 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+@@ -990,9 +1049,9 @@ int lookup_read_master(struct master *ma
+ 	int scope = LDAP_SCOPE_SUBTREE;
+ 	LDAP *ldap;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1141,9 +1200,9 @@ static int read_one_map(struct autofs_po
+ 
+ 	mc = source->mc;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1438,9 +1497,9 @@ static int lookup_one(struct autofs_poin
+ 		return CHE_FAIL;
+ 	}
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+diff -up autofs-5.0.1/lib/defaults.c.add-ldap-schema-discovery autofs-5.0.1/lib/defaults.c
+--- autofs-5.0.1/lib/defaults.c.add-ldap-schema-discovery	2007-09-05 13:27:05.000000000 +0800
++++ autofs-5.0.1/lib/defaults.c	2007-09-05 13:27:06.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <string.h>
+ 
+ #include "defaults.h"
++#include "lookup_ldap.h"
+ #include "log.h"
+ 
+ #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
+@@ -41,16 +42,8 @@
+ #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ 
+ static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
+-
+-static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
+-
+-static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
+-static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
+-static const char *default_map_attr		= DEFAULT_MAP_ATTR;
+-static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
+-static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
+-
+-static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
++static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
++static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
+ 
+ static char *get_env_string(const char *name)
+ {
+@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(voi
+ 	return (const char *) server;
+ }
+ 
+-const char *defaults_get_map_obj_class(void)
++struct ldap_schema *defaults_get_default_schema(void)
+ {
+-	char *moc;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
+ 
+-	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
+-	if (!moc)
+-		return strdup(default_map_obj_class);
++	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
+ 
+-	return (const char *) moc;
+-}
++	ma = strdup(DEFAULT_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_entry_obj_class(void)
+-{
+-	char *eoc;
++	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
+ 
+-	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
+-	if (!eoc)
+-		return strdup(default_entry_obj_class);
++	ea = strdup(DEFAULT_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+-	return (const char *) eoc;
+-}
++	va = strdup(DEFAULT_VALUE_ATTR);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
+ 
+-const char *defaults_get_map_attr(void)
+-{
+-	char *ma;
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
+ 
+-	ma = get_env_string(ENV_NAME_MAP_ATTR);
+-	if (!ma)
+-		return strdup(default_map_attr);
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) ma;
++	return schema;
+ }
+ 
+-const char *defaults_get_entry_attr(void)
++struct ldap_schema *defaults_get_schema(void)
+ {
+-	char *ea;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
+ 
+-	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
+-	if (!ea)
+-		return strdup(default_entry_attr);
++	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
+ 
+-	return (const char *) ea;
+-}
++	ma = get_env_string(ENV_NAME_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_value_attr(void)
+-{
+-	char *va;
++	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
++
++	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+ 	va = get_env_string(ENV_NAME_VALUE_ATTR);
+-	if (!va)
+-		return strdup(default_value_attr);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
++
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
++
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) va;
++	return schema;
+ }
+ 
+ unsigned int defaults_get_append_options(void)
+diff -up autofs-5.0.1/man/auto.master.5.in.add-ldap-schema-discovery autofs-5.0.1/man/auto.master.5.in
+--- autofs-5.0.1/man/auto.master.5.in.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/man/auto.master.5.in	2007-09-05 13:27:06.000000000 +0800
+@@ -188,17 +188,25 @@ The old style
+ is also understood. Alternatively, the type can be obtained from the Name Service Switch
+ configuration, in which case the map name alone must be given.
+ .P
+-The default LDAP schema is the NIS schema described in RFC 2307.
+-Entries in the nisMap schema are \fBnisObject\fP objects in
++If no schema is set in the autofs configuration then autofs will check
++each of the commonly used schema for a valid entry and if one is found
++it will used for subsequent lookups.
++.P
++There are three common schemas in use:
++.TP
++.I nisMap
++Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
+ the specified subtree, where the \fBcn\fP attribute is the key
+ (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
+ contains the information used by the automounter.
+-.P
+-Entries in the automountMap schema are \fBautomount\fP objects in
+-the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
+-(depending on local usage) is the key (the wildcard key is "/"), and the
+-\fBautomountInformation\fP attribute contains the information used by the
+-automounter.
++.TP
++.I automountMap
++The \fBautomountMap\fP schema has two variations that differ in the attribute
++used for the map key. Entries in the automountMap schema are \fBautomount\fP
++objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
++attribute (depending on local usage) is the key (the wildcard key is "/"),
++and the \fBautomountInformation\fP attribute contains the information used
++by the automounter. Note that the \fBcn\fP attribute is case insensitive.
+ .P
+ The object classes and attributes used for accessing automount maps in
+ LDAP can be changed by setting entries in the autofs configuration
+@@ -206,61 +214,44 @@ located in
+ .nh
+ .BR @@autofsconfdir@@/autofs .
+ .hy
++.TP
++.B NOTE:
++If a schema is given in the configuration then all the schema configuration
++values must be set, any partial schema specification will be ignored.
+ .P
+ The configuration settings available are:
+ .TP
+-\fBMAP_OBJECT_CLASS\fP
+-The map object class. Its Default value is "nisMap". In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the class
+-.nh
+-.BR automountMap .
+-.hy
++.B MAP_OBJECT_CLASS
++The map object class. In the \fBnisMap\fP schema this corresponds to the class
++\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
++\fBautomountMap\fP.
+ .TP
+ .B ENTRY_OBJECT_CLASS
+-The map entry object class. Its default value is \fBnisObject\fP.
+-In the automountMap schema this corresponds to the class
+-.nh
+-.BR automount .
+-.hy
++The map entry object class. In the \fBnisMap\fP schema this corresponds
++to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
++corresponds to the class \fBautomount\fP.
+ .TP
+ .B MAP_ATTRIBUTE
+ The attribute used to identify the name of the map to which this
+-entry belongs. Its default value is
+-.nh
+-.BR nisMapName .
+-.hy
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attributes \fBou\fP or
+-.nh
+-.BR automountMapName .
+-.hy
++entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
++\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
++attribute \fBou\fP or \fBautomountMapName\fP.
+ .TP
+ .B ENTRY_ATTRIBUTE
+-The attribute used to identify a map key. Its default value is
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attribute
+-.nh
+-.BR automountKey .
+-.hy
++The attribute used to identify a map key. In the \fBnisMap\fP schema this
++corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
++it corresponds to the attribute \fBautomountKey\fP.
+ .TP
+ .B VALUE_ATTRIBUTE
+-The attribute used to identify the value of the map entry. Its default
+-value is
+-.nh
+-.BR BnisMapEntry .
+-.hy
+-In the automountMap schema this corresponds to the attribute
+-.nh
+-.BR automountInformation .
++The attribute used to identify the value of the map entry. In the \fBnisMap\fP
++schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
++schema it corresponds to the attribute \fBautomountInformation\fP.
++.TP
++.B NOTE:
++It is essential that entries use class and attribute in a consistent
++manner for correct operation of autofs. For example mixing \fBcn\fP and
++\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
++work as expected.
+ .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
+ LDAP authenticated binds, TLS encrypted connections and certification
+ may be used by setting appropriate values in the autofs authentication
+diff -up autofs-5.0.1/man/automount.8.in.add-ldap-schema-discovery autofs-5.0.1/man/automount.8.in
+--- autofs-5.0.1/man/automount.8.in.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/man/automount.8.in	2007-09-05 13:27:06.000000000 +0800
+@@ -104,6 +104,8 @@ started they will be recoverd unless the
+ the map in which case they need to umounted manually.
+ .SH "SEE ALSO"
+ .BR autofs (5),
++.BR autofs (8),
++.BR auto.master (5),
+ .BR mount (8).
+ .SH BUGS
+ Don't know, I've fixed everything I know about.

autofs-5.0.1-add-ldaps-support.patch:

--- NEW FILE autofs-5.0.1-add-ldaps-support.patch ---
--- autofs-5.0.1/include/lookup_ldap.h.add-ldaps-support	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/include/lookup_ldap.h	2007-06-20 11:41:02.000000000 +0800
@@ -13,6 +13,7 @@ struct lookup_context {
 	char *mapname;
 
 	char *server;
+	int port;
 	char *base;
 	char *qdn;
 
--- autofs-5.0.1/modules/Makefile.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/modules/Makefile	2007-06-20 11:41:02.000000000 +0800
@@ -64,6 +64,7 @@ install: all
 	-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
 	ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
 	ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
+	ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
 	ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so
 ifeq ($(EXT2FS), 1)
  ifeq ($(EXT3FS), 1)
--- autofs-5.0.1/modules/lookup_ldap.c.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/modules/lookup_ldap.c	2007-06-20 11:41:52.000000000 +0800
@@ -100,14 +100,8 @@ LDAP *init_ldap_connection(struct lookup
 	ctxt->version = 3;
 
 	/* Initialize the LDAP context. */
-	/* LDAP_PORT should not be hard-coded, here.  If we are going to
-	 * parse ldap strings ourselves, then we can put the port specified
-	 * in the host:port format here.  Otherwise, we can just pass the
-	 * host:port string to the ldap_init call and let the library handle
-	 * it.   -JM
-	 */
-	ldap = ldap_init(ctxt->server, LDAP_PORT);
-	if (!ldap) {
+	rv = ldap_initialize(&ldap, ctxt->server);
+	if (rv != LDAP_OPT_SUCCESS) {
 		crit(LOGOPT_ANY,
 		     MODPREFIX "couldn't initialize LDAP connection to %s",
 		     ctxt->server ? ctxt->server : "default server");
@@ -119,8 +113,8 @@ LDAP *init_ldap_connection(struct lookup
 	if (rv != LDAP_OPT_SUCCESS) {
 		/* fall back to LDAPv2 */
 		ldap_unbind_ext(ldap, NULL, NULL);
-		ldap = ldap_init(ctxt->server, LDAP_PORT);
-		if (!ldap) {
+		rv = ldap_initialize(&ldap, ctxt->server);
+		if (rv != LDAP_OPT_SUCCESS) {
 			crit(LOGOPT_ANY, MODPREFIX "couldn't initialize LDAP");
 			return NULL;
 		}
@@ -348,7 +342,7 @@ int parse_ldap_config(struct lookup_cont
 		goto out;
 	}
 
-	if (!usetls)
+	if (!usetls || ctxt->port == LDAPS_PORT)
 		use_tls = LDAP_TLS_DONT_USE;
 	else {
 		if (!strcasecmp(usetls, "yes"))
@@ -551,16 +545,31 @@ int auth_init(struct lookup_context *ctx
  */
 static int parse_server_string(const char *url, struct lookup_context *ctxt)
 {
-	char buf[MAX_ERR_BUF], *tmp = NULL;
-	const char *ptr;
-	int l;
+	char buf[MAX_ERR_BUF], *tmp = NULL, proto[9];
+	const char *ptr, *name;
+	int l, al_len;
 
+	memset(proto, 0, 9);
 	ptr = url;
 
 	debug(LOGOPT_NONE,
 	      MODPREFIX
 	      "Attempting to parse LDAP information from string \"%s\".", ptr);
 
+	ctxt->port = LDAP_PORT;
+	if (!strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6)) {
+		if (*(ptr + 4) == 's') {
+			ctxt->port = LDAPS_PORT;
+			memcpy(proto, ptr, 6);
+			strcat(proto, "//");
+			ptr += 6;
+		} else {
+			memcpy(proto, ptr, 5);
+			strcat(proto, "//");
+			ptr += 5;
+		}
+	}
+
 	if (!strncmp(ptr, "//", 2)) {
 		const char *s = ptr + 2;
 		const char *q = NULL;
@@ -568,7 +577,13 @@ static int parse_server_string(const cha
 		/* Isolate the server(s). */
 		if ((q = strchr(s, '/'))) {
 			l = q - s;
-			tmp = malloc(l + 1);
+			if (*proto) {
+				al_len = l + strlen(proto) + 2;
+				tmp = malloc(al_len);
+			} else {
+				al_len = l + 1;
+				tmp = malloc(al_len);
+			}
 			if (!tmp) {
 				char *estr;
 				estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -576,8 +591,13 @@ static int parse_server_string(const cha
 				return 0;
 			}
 			ctxt->server = tmp;
-			memset(ctxt->server, 0, l + 1);
-			memcpy(ctxt->server, s, l);
+			memset(ctxt->server, 0, al_len);
+			if (*proto) {
+				strcpy(ctxt->server, proto);
+				memcpy(ctxt->server + strlen(proto), s, l);
+				strcat(ctxt->server, "/");
+			} else
+				memcpy(ctxt->server, s, l);
 			ptr = q + 1;
 		} else {
 			crit(LOGOPT_ANY,
@@ -600,7 +620,7 @@ static int parse_server_string(const cha
 	} else if (strchr(ptr, ':') != NULL) {
 		char *q = NULL;
 
-		/* Isolate the server(s). Include the port spec */
+		/* Isolate the server. Include the port spec */
 		q = strchr(ptr, ':');
 		if (isdigit(*q))
 			while (isdigit(*q))
@@ -613,8 +633,14 @@ static int parse_server_string(const cha
 		}
 
 		l = q - ptr;
+		if (*proto) {
+			al_len = l + strlen(proto) + 2;
+			tmp = malloc(al_len);
+		} else {
+			al_len = l + 1;
+			tmp = malloc(al_len);
+		}
 		/* Isolate the server's name. */
-		tmp = malloc(l + 1);
 		if (!tmp) {
 			char *estr;
 			estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -622,8 +648,13 @@ static int parse_server_string(const cha
 			return 0;
 		}
 		ctxt->server = tmp;
-		memset(ctxt->server, 0, l + 1);
-		memcpy(ctxt->server, ptr, l);
+		memset(ctxt->server, 0, al_len);
+		if (*proto) {
+			strcpy(ctxt->server, proto);
+			memcpy(ctxt->server + strlen(proto), ptr, l);
+			strcat(ctxt->server, "/");
+		} else
+			memcpy(ctxt->server, ptr, l);
 		ptr += l + 1;
 	}
 
@@ -639,29 +670,41 @@ static int parse_server_string(const cha
 	 * the later LDAP calls will fail.
 	 */
 	l = strlen(ptr);
-	if (strchr(ptr, '=')) {
+	if ((name = strchr(ptr, '='))) {
 		char *base;
 
+		/*
+		 * An '=' with no ',' means a mapname has been given so just
+		 * grab it alone to keep it independent of schema otherwize
+		 * we expect a full dn.
+		 */
 		if (!strchr(ptr, ',')) {
-			debug(LOGOPT_NONE,
-			      MODPREFIX "LDAP dn not fuly specified");
-			if (ctxt->server)
-				free(ctxt->server);
-			return 0;
-		}
-
-		base = malloc(l + 1);
-		if (!base) {
-			char *estr;
-			estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
-			if (ctxt->server)
-				free(ctxt->server);
-			return 0;
+			char *map = strdup(name + 1);
+			if (map)
+				ctxt->mapname = map;
+			else {
+				char *estr;
+				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+				if (ctxt->server)
+					free(ctxt->server);
+				return 0;
+			}
+			
+		} else {
+			base = malloc(l + 1);
+			if (!base) {
+				char *estr;
+				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+				if (ctxt->server)
+					free(ctxt->server);
+				return 0;
+			}
+			ctxt->base = base;
+			memset(ctxt->base, 0, l + 1);
+			memcpy(ctxt->base, ptr, l);
 		}
-		ctxt->base = base;
-		memset(ctxt->base, 0, l + 1);
-		memcpy(ctxt->base, ptr, l);
 	} else {
 		char *map = malloc(l + 1);
 		if (!map) {
@@ -676,6 +719,14 @@ static int parse_server_string(const cha
 		memset(ctxt->mapname, 0, l + 1);
 		memcpy(map, ptr, l);
 	}
+
+	if (!ctxt->server && *proto) {
+		if (!strncmp(proto, "ldaps", 5)) {
+			warn(LOGOPT_ANY, MODPREFIX
+			     "server must be given to force ldaps, connection "
+			     "will use LDAP client configured protocol");
+		}
+	}
 done:
 	if (ctxt->mapname)
 		debug(LOGOPT_NONE, MODPREFIX "mapname %s", ctxt->mapname);
--- autofs-5.0.1/daemon/lookup.c.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/daemon/lookup.c	2007-06-20 11:41:02.000000000 +0800
@@ -169,20 +169,30 @@ int lookup_nss_read_master(struct master
 			char source[10];
 
 			memset(source, 0, 10);
-			/* TODO: ldaps is not yet handled by ldap module */
-			/* TODO: must tighten up this test */
-			if (!strncmp(name, "file", 4) ||
-			    !strncmp(name, "yp", 2) ||
-			    !strncmp(name, "nis", 3) ||
-			    !strncmp(name, "nisplus", 7) ||
-			    !strncmp(name, "ldap", 4)) {
+			if (!strncmp(name, "file:", 5) ||
+			    !strncmp(name, "yp:", 3) ||
+			    !strncmp(name, "nis:", 4) ||
+			    !strncmp(name, "nisplus:", 8) ||
+			    !strncmp(name, "ldap:", 5) ||
+			    !strncmp(name, "ldaps:", 6)) {
 				strncpy(source, name, tmp - name);
 
-				master->name = tmp + 1;
-
-				debug(LOGOPT_NONE,
-				      "reading master %s %s",
-				      source, master->name);
+				/*
+				 * If it's an ldap map leave the source in the
+				 * name so the lookup module can work out if
+				 * ldaps has been requested.
+				 */
+				if (strncmp(name, "ldap", 4)) {
+					master->name = tmp + 1;
+					debug(LOGOPT_NONE,
+					      "reading master %s %s",
+					      source, master->name);
+				} else {
+					master->name = name;
+					debug(LOGOPT_NONE,
+					      "reading master %s %s",
+					      source, tmp + 1);
+				}
 
 				result = do_read_master(master, source, age);
 				master->name = name;
--- autofs-5.0.1/lib/master_parse.y.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/lib/master_parse.y	2007-06-20 11:41:02.000000000 +0800
@@ -290,6 +290,19 @@ map:	PATH
 			local_free_vars();
 			YYABORT;
 		}
+		/* Add back the type for lookup_ldap.c to handle ldaps */
+		if (*local_argv[0]) {
+			tmp = malloc(strlen(type) + strlen(local_argv[0]) + 2);
+			if (!tmp) {
+				local_free_vars();
+				YYABORT;
+			}
+			strcpy(tmp, type);
+			strcat(tmp, ":");
+			strcat(tmp, local_argv[0]);
+			free(local_argv[0]);
+			local_argv[0] = tmp;
+		}
 	}
 	;
 
@@ -343,12 +356,12 @@ dnattrs: DNATTR EQUAL DNNAME
 		strcat($$, ",");
 		strcat($$, $5);
 	}
-	| DNATTR
+	| DNNAME
 	{
-		master_notify($1);
-		YYABORT;
+		/* Matches map in old style syntax ldap:server:map */
+		strcpy($$, $1);
 	}
-	| DNNAME
+	| DNATTR
 	{
 		master_notify($1);
 		YYABORT;
--- autofs-5.0.1/lib/master_tok.l.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/lib/master_tok.l	2007-06-20 11:41:02.000000000 +0800
@@ -104,7 +104,7 @@ DNATTRSTR	(cn|nisMapName|automountMapNam
 DNNAMESTR	([[:alnum:]_.\-]+)
 
 INTMAP		(-hosts|-null)
-MTYPE           ((file|program|yp|nis|nisplus|ldap|hesiod|userdir)(,(sun|hesiod))?)
+MTYPE           ((file|program|yp|nis|nisplus|ldap|ldaps|hesiod|userdir)(,(sun|hesiod))?)
 
 
 OPTTOUT		(-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
--- autofs-5.0.1/man/auto.master.5.in.add-ldaps-support	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/man/auto.master.5.in	2007-06-20 11:41:02.000000000 +0800
@@ -101,8 +101,9 @@ The map is a hesiod database whose
 .B filsys
 entries are used for maps.
 .TP
-.B ldap
-The map is stored in an LDAP directory.
+.B ldap \fPor\fB ldaps
+The map is stored in an LDAP directory. If \fBldaps\fP is used the
+appropriate certificate must be configured in the LDAP client.
 .RE
 .TP
 \fBformat\fP


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- autofs.spec	30 Aug 2007 17:24:46 -0000	1.217
+++ autofs.spec	5 Sep 2007 05:33:14 -0000	1.218
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 27
+Release: 28
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -44,6 +44,8 @@
 Patch32: autofs-5.0.1-consistent-random-selection-option-name.patch
 Patch33: autofs-5.0.2-fix-mount-nfs-nosymlink.patch
 Patch34: autofs-5.0.2-default-nsswitch.patch
+Patch35: autofs-5.0.1-add-ldaps-support.patch
+Patch36: autofs-5.0.1-add-ldap-schema-discovery.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
 Conflicts: kernel < 2.6.17
@@ -119,6 +121,8 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -171,8 +175,9 @@
 %{_libdir}/autofs/
 
 %changelog
-* Thu Aug 31 2007 Ian Kent <ikent at redhat.com> - 5.0.1-27
-- revert ldap schema discovery patch.
+* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.1-28
+- add ldaps support (required by schema discovery).
+- add back LDAP schema discovery if no schema is configured.
 
 * Tue Aug 28 2007 Ian Kent <ikent at redhat.com> - 5.0.1-26
 - fix "nosymlink" option handling and add desription to man page.



From fedora-extras-commits at redhat.com  Wed Sep  5 05:42:45 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:42:45 -0400
Subject: rpms/autofs/F-7 autofs-5.0.1-add-ldap-schema-discovery.patch, 1.3,
	1.4
Message-ID: <200709050542.l855gj2n025956@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25906

Modified Files:
	autofs-5.0.1-add-ldap-schema-discovery.patch 
Log Message:
- fix typo in schema discrovery patch.


autofs-5.0.1-add-ldap-schema-discovery.patch:

Index: autofs-5.0.1-add-ldap-schema-discovery.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs-5.0.1-add-ldap-schema-discovery.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:33:14 -0000	1.3
+++ autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:42:12 -0000	1.4
@@ -279,8 +279,8 @@
 +			return 1;
 +		}
 +	} else {
-+		const char *class = common_schema[i].map_class;
-+		const char *key = common_schema[i].map_attr;
++		const char *class = ctxt->schema->map_class;
++		const char *key = ctxt->schema->map_attr;
 +		if (!get_query_dn(ldap, ctxt, class, key)) {
 +			unbind_ldap_connection(ldap, ctxt);
 +			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");



From fedora-extras-commits at redhat.com  Wed Sep  5 05:59:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 01:59:12 -0400
Subject: rpms/hddtemp/EL-5 hddtemp.init,1.2,1.3 hddtemp.spec,1.20,1.21
Message-ID: <200709050559.l855xCZE026257@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26235

Modified Files:
	hddtemp.init hddtemp.spec 
Log Message:
Sync with devel


Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.init	4 Dec 2004 22:43:31 -0000	1.2
+++ hddtemp.init	5 Sep 2007 05:58:37 -0000	1.3
@@ -1,37 +1,46 @@
-#!/bin/sh
+#!/bin/bash
 #
 # hddtemp       This shell script takes care of starting and stopping hddtemp.
 #
-# chkconfig:    - 90 10
+# chkconfig:    - 80 20
 # description:  hddtemp provides information about hard drives' temperature
 # processname:  hddtemp
 # config:       __ETCDIR__/sysconfig/hddtemp
 
+### BEGIN INIT INFO
+# Provides: hddtemp
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Short-Description: Hard drive temperature monitor daemon
+# Description: Provides information about hard drives' temperatures.
+### END INIT INFO
+
 . __ETCDIR__/sysconfig/hddtemp
 
 # Source function library.
 . __INITDIR__/functions
 
-# Source networking configuration.
-. __ETCDIR__/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
 # Backwards compatibility.
 [ -z "$HDDTEMP_OPTIONS" -a -n "$HDDTEMPARGS" ] && \
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
 HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
-exec="__SBINDIR__/hddtemp"
-prog=$(basename $exec)
+exec=__SBINDIR__/hddtemp
+prog=${exec##*/}
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
-    echo -n $"Starting hard disk temperature monitor daemon ($prog): "
-    daemon $exec -d $HDDTEMP_OPTIONS
-    retval=$?
-    echo
+    if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
+        retval=6
+    else
+        echo -n $"Starting hard disk temperature monitor daemon ($prog): "
+        daemon $exec -d $HDDTEMP_OPTIONS
+        retval=$?
+        echo
+    fi
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
 }
@@ -55,16 +64,22 @@
     start|stop|restart)
         $1
         ;;
-    reload|force-reload)
+    force-reload)
         restart
         ;;
     status)
         status $prog
         ;;
     try-restart|condrestart)
-        [ ! -f $lockfile ] || restart
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hddtemp.spec	21 Mar 2007 19:09:04 -0000	1.20
+++ hddtemp.spec	5 Sep 2007 05:58:37 -0000	1.21
@@ -2,11 +2,11 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.11.%{beta}%{?dist}
+Release:        0.14.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://www.guzu.net/linux/hddtemp.php
 Source0:        http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
@@ -90,11 +90,22 @@
 %{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
-%config /usr/share/misc/hddtemp.db
+%config(noreplace) /usr/share/misc/hddtemp.db
 %{_mandir}/man8/hddtemp.8*
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
+- Adjust server chkconfig start/stop priorities to start before gkrellmd,
+  other cosmetic init script tweaks.
+- Mark hddtemp.db as %%config(noreplace).
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
+- License: GPLv2+
+
+* Tue Jul 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.12.beta15
+- Improve init script LSB compliance.
+
 * Tue Jan  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.11.beta15
 - SATA sense fix (#221100, Jens Axboe).
 



From fedora-extras-commits at redhat.com  Wed Sep  5 06:16:25 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 5 Sep 2007 02:16:25 -0400
Subject: comps comps-f8.xml.in,1.89,1.90
Message-ID: <200709050616.l856GPZr032656@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629

Modified Files:
	comps-f8.xml.in 
Log Message:
lang goo. Jens, please look over the scim/m17n stuff.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- comps-f8.xml.in	4 Sep 2007 22:41:48 -0000	1.89
+++ comps-f8.xml.in	5 Sep 2007 06:15:55 -0000	1.90
@@ -68,9 +68,11 @@
     <packagelist>
       <packagereq type="mandatory">fonts-arabic</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-ar</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-arabic</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
@@ -563,6 +565,7 @@
     <langonly>br</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-br</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-br</packagereq>
     </packagelist>
   </group>
   <group>
@@ -618,6 +621,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bulgarian</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
     </packagelist>
@@ -663,6 +667,8 @@
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">stardict</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-zh_CN</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-zh_TW</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1072,8 +1078,10 @@
       <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Dutch</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-nl</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-nl</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1273,6 +1281,7 @@
     <langonly>am</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ethiopic</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-amharic</packagereq>
       <packagereq type="optional">m17n-db-amharic</packagereq>
     </packagelist>
   </group>
@@ -1326,10 +1335,12 @@
       <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-French</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fr</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-fr</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-fr</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-fr</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1576,10 +1587,12 @@
       <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-German</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-de</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-de</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-de</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-de</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1913,6 +1926,7 @@
     <langonly>el</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-el</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-el</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Greek</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-el</packagereq>
@@ -1986,6 +2000,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hebrew</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-he</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-he_IL</packagereq>
+      <packagereq type="conditional" requires="tetex">tetex-fonts-hebrew</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
@@ -2004,6 +2019,7 @@
       <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-hi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq>
@@ -2051,6 +2067,7 @@
     <langonly>id</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-id</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-id</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-id</packagereq>
     </packagelist>
   </group>
@@ -2094,9 +2111,11 @@
       <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Italian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-it</packagereq>
+      <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="openoffice.org-core">openoffice.org-langpack-it</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-it</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2113,6 +2132,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-ja</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
       <packagereq type="optional">anthy</packagereq>
@@ -2523,6 +2543,17 @@
     </packagelist>
   </group>
   <group>
+    <id>low-saxon-support</id>
+    <_name>Low Saxon Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nds</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-nds</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
     <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
@@ -2600,6 +2631,7 @@
     <langonly>mi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-mi_tn</packagereq>
+      <packagereq type="conditional" requires="moodle">moodle-mi_wwow</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2619,6 +2651,17 @@
     </packagelist>
   </group>
   <group>
+    <id>mongolian-support</id>
+    <_name>Mongolian Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>mn</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="moodle">moodle-mn</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mysql</id>
     <_name>MySQL Database</_name>
     <_description>This package group contains packages useful for use with MySQL.</_description>
@@ -2690,6 +2733,19 @@
     </packagelist>
   </group>
   <group>
+    <id>nepali-support</id>
+    <_name>Nepali Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ne</langonly>
+    <packagelist>
+      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-nepali</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>news-server</id>
     <_name>News Server</_name>
     <_description>This group allows you to configure the system as a news server.</_description>
@@ -2723,6 +2779,7 @@
     <langonly>nb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-no</packagereq>
+      <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="kdelibs">kde-i18n-Norwegian</packagereq>
@@ -2843,6 +2900,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Polish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pl</packagereq>
+      <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="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq>
@@ -2950,7 +3008,9 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
       <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
@@ -2977,6 +3037,7 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-sr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq>
@@ -3228,6 +3289,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-es</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-es</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-es</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-es</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3279,6 +3341,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Swedish</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-sv</packagereq>
       <packagereq type="optional">m17n-db-swedish</packagereq>
@@ -3555,6 +3618,7 @@
       <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="xorg-x11-server-Xorg">scim-lang-thai</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-thai</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3674,6 +3738,7 @@
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
       <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-vietnamese</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4020,10 +4085,13 @@
       <groupid>lao-support</groupid>
       <groupid>latvian-support</groupid>
       <groupid>lithuanian-support</groupid>
+      <groupid>low-saxon-support</groupid>
       <groupid>malay-support</groupid>
       <groupid>malayalam-support</groupid>
       <groupid>maori-support</groupid>
       <groupid>marathi-support</groupid>
+      <groupid>mongolian-support</groupid>
+      <groupid>nepali-support</groupid>
       <groupid>northern-sotho-support</groupid>
       <groupid>norwegian-support</groupid>
       <groupid>oriya-support</groupid>



From fedora-extras-commits at redhat.com  Wed Sep  5 06:18:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 02:18:12 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.32,1.33
Message-ID: <200709050618.l856ICnj032705@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32678

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.4-45.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- em8300-kmod.spec	18 Aug 2007 15:07:56 -0000	1.32
+++ em8300-kmod.spec	5 Sep 2007 06:17:33 -0000	1.33
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.2-42.fc6}
+%{!?kversion: %define kversion 2.6.22.4-45.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.4-45.fc6.
+
 * Sat Aug 18 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-1
 - 0.16.3.
 - Build for kernel 2.6.22.2-42.fc6.



From fedora-extras-commits at redhat.com  Wed Sep  5 06:50:37 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 02:50:37 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo74751.bean.mawt.patch, NONE,
	1.1 openoffice.org.spec, 1.1294, 1.1295
Message-ID: <200709050650.l856obYx001180@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1156

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo74751.bean.mawt.patch 
Log Message:
add mawt patch for x86_64

openoffice.org-2.3.0.ooo74751.bean.mawt.patch:

--- NEW FILE openoffice.org-2.3.0.ooo74751.bean.mawt.patch ---
--- openoffice.org.orig/config_office/set_soenv.in	3 Aug 2007 13:09:48 -0000	1.156
+++ openoffice.org/config_office/set_soenv.in	29 Aug 2007 09:22:29 -0000
@@ -428,6 +428,7 @@
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
    }
    elsif ($platform =~ m/^sparc/)
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -r1.1294 -r1.1295
--- openoffice.org.spec	4 Sep 2007 19:23:28 -0000	1.1294
+++ openoffice.org.spec	5 Sep 2007 06:50:00 -0000	1.1295
@@ -57,16 +57,16 @@
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
+BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
+BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, vigra-devel, hsqldb
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
 BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
+BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1067,6 +1068,7 @@
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch62 -p1 -b .ooo74751.bean.mawt.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2750,6 +2752,7 @@
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu
 - rebuild against icedtea
+- add openoffice.org-2.3.0.ooo74751.bean.mawt.patch to allow build against icedtea
 - don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix



From fedora-extras-commits at redhat.com  Wed Sep  5 06:52:20 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 02:52:20 -0400
Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.21,
	1.22
Message-ID: <200709050652.l856qKd6001254@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1233

Modified Files:
	pseudoworkspace.valgrind1.patch 
Log Message:
fs reckons true is a better default

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pseudoworkspace.valgrind1.patch	4 Sep 2007 13:41:37 -0000	1.21
+++ pseudoworkspace.valgrind1.patch	5 Sep 2007 06:52:18 -0000	1.22
@@ -40,7 +40,7 @@
              ,nCommandType( CommandType::COMMAND )
              ,bEscapeProcessing( sal_True )
              ,bComposerDirty( true )
-+            ,bDisposeComposer( false )
++            ,bDisposeComposer( true )
          {
              if ( !_rxConnection.is() )
                  throw NullPointerException();



From fedora-extras-commits at redhat.com  Wed Sep  5 07:08:33 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:08:33 -0400
Subject: rpms/python-twisted-conch/F-7 python-twisted-conch.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709050708.l8578Xch007558@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-conch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7525

Modified Files:
	python-twisted-conch.spec sources 
Log Message:
update to latest version



Index: python-twisted-conch.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-7/python-twisted-conch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-conch.spec	27 Dec 2006 14:04:14 -0000	1.1
+++ python-twisted-conch.spec	5 Sep 2007 07:08:00 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedConch
 
 Name:           %{python}-twisted-conch
-Version:        0.7.0
-Release:        4%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Twisted SSHv2 implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://twistedmatrix.com/trac/wiki/TwistedConch
-Source0:        http://tmrc.mit.edu/mirror/twisted/Conch/0.7/TwistedConch-%{version}.tar.bz2 
+Source0:        http://tmrc.mit.edu/mirror/twisted/Conch/0.8/TwistedConch-%{version}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-crypto
 
 # a noarch-turned-arch package should not have debuginfo
@@ -80,6 +80,10 @@
 %{python_sitearch}/twisted/plugins/twisted_conch.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.8.0-1
+- new version
+
 * Tue Dec 26 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.7.0-4
 - fixed URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2006 14:04:14 -0000	1.2
+++ sources	5 Sep 2007 07:08:00 -0000	1.3
@@ -1 +1 @@
-0236162d53cf7f34ed341d9179e7783b  TwistedConch-0.7.0.tar.bz2
+f3ccdd8da6b6e26b0a1eae5e54b9b0e2  TwistedConch-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:13:15 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:13:15 -0400
Subject: rpms/python-twisted-names/devel .cvsignore, 1.2,
	1.3 python-twisted-names.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709050713.l857DFZC007684@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-names/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7658

Modified Files:
	.cvsignore python-twisted-names.spec sources 
Log Message:
update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Dec 2006 14:28:40 -0000	1.2
+++ .cvsignore	5 Sep 2007 07:12:41 -0000	1.3
@@ -1 +1 @@
-TwistedNames-0.3.0.tar.bz2
+TwistedNames-0.4.0.tar.bz2


Index: python-twisted-names.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/python-twisted-names.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-names.spec	19 Dec 2006 14:28:40 -0000	1.1
+++ python-twisted-names.spec	5 Sep 2007 07:12:41 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNames
 
 Name:           %{python}-twisted-names
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted DNS implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.3/TwistedNames-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.4/TwistedNames-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -69,6 +69,10 @@
 %{python_sitearch}/twisted/plugins/twisted_names.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- updated to latest version
+
 * Thu Dec 14 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Dec 2006 14:28:40 -0000	1.2
+++ sources	5 Sep 2007 07:12:41 -0000	1.3
@@ -1 +1 @@
-5aa672d0e26718466351351e7bfcf22a  TwistedNames-0.3.0.tar.bz2
+fae00c3c1489b6818d16b84f8ffcc807  TwistedNames-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:24:49 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:24:49 -0400
Subject: rpms/python-twisted-names/F-7 python-twisted-names.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709050724.l857OnTZ008113@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-names/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8091

Modified Files:
	python-twisted-names.spec sources 
Log Message:
update to 0.4.0


Index: python-twisted-names.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/F-7/python-twisted-names.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-names.spec	19 Dec 2006 14:28:40 -0000	1.1
+++ python-twisted-names.spec	5 Sep 2007 07:24:16 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNames
 
 Name:           %{python}-twisted-names
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted DNS implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.3/TwistedNames-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.4/TwistedNames-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -69,6 +69,10 @@
 %{python_sitearch}/twisted/plugins/twisted_names.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- updated to latest version
+
 * Thu Dec 14 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Dec 2006 14:28:40 -0000	1.2
+++ sources	5 Sep 2007 07:24:16 -0000	1.3
@@ -1 +1 @@
-5aa672d0e26718466351351e7bfcf22a  TwistedNames-0.3.0.tar.bz2
+fae00c3c1489b6818d16b84f8ffcc807  TwistedNames-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:26:10 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 03:26:10 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.40, 1.41 sources, 1.41, 
	1.42 system-config-samba.spec, 1.45, 1.46
Message-ID: <200709050726.l857QAA7008210@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8176

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
bundle the GPL
pull in updated translations
gracefully handle unknown configuration options (#247541)
don't throw exceptions when encountering lines without trailing newlines (#253464)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	13 Aug 2007 20:02:25 -0000	1.40
+++ .cvsignore	5 Sep 2007 07:25:38 -0000	1.41
@@ -1 +1 @@
-system-config-samba-1.2.47.tar.bz2
+system-config-samba-1.2.50.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Aug 2007 20:02:25 -0000	1.41
+++ sources	5 Sep 2007 07:25:38 -0000	1.42
@@ -1 +1 @@
-e8236b65144f134fe82d452fb2bd8c57  system-config-samba-1.2.47.tar.bz2
+f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- system-config-samba.spec	13 Aug 2007 20:02:25 -0000	1.45
+++ system-config-samba.spec	5 Sep 2007 07:25:38 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.47
+Version: 1.2.50
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -57,11 +57,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-samba ] ; then
-  rm -rf /usr/share/system-config-samba/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -70,7 +65,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-#%doc COPYING
+%doc COPYING
 %doc doc/*
 /usr/bin/system-config-samba
 %dir /usr/share/system-config-samba
@@ -81,6 +76,20 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
+- bundle the GPL
+
+* Thu Aug 30 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.49
+- pull in updated translations
+
+* Tue Aug 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.48
+- gracefully handle unknown configuration options (#247541)
+
+* Mon Aug 27 2007 Nils Philippsen <nphilipp at redhat.com>
+- don't throw exceptions when encountering lines without trailing newlines
+  (#253464)
+- don't remove *.pyc files upon uninstalling the package (#256401)
+
 * Mon Aug 13 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.47
 - improve detection of commented out default values (#251477)
 - use non-capital default values



From fedora-extras-commits at redhat.com  Wed Sep  5 07:37:08 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 5 Sep 2007 03:37:08 -0400
Subject: rpms/opencdk/devel sources, 1.7, 1.8 opencdk.spec, 1.11,
	1.12 lastver, 1.1, 1.2
Message-ID: <200709050737.l857b8wS008579@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540

Modified Files:
	sources opencdk.spec lastver 
Log Message:
updated to 0.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2007 23:33:48 -0000	1.7
+++ sources	5 Sep 2007 07:36:36 -0000	1.8
@@ -1,2 +1,2 @@
-65324874074ba7c67028b93979e6d1d9  opencdk-0.5.13.tar.gz
-fc8b34d300b89629491144726c846caf  opencdk-0.5.13.tar.gz.sig
+7bfc820bcdc08f0c31f860710368071e  opencdk-0.6.4.tar.bz2
+aa4c75dc6dbf83bc7a7b3b53772f1e12  opencdk-0.6.4.tar.bz2.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opencdk.spec	3 Feb 2007 23:33:48 -0000	1.11
+++ opencdk.spec	5 Sep 2007 07:36:36 -0000	1.12
@@ -4,14 +4,14 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.13
+Version:	0.6.4
 Release:	%release_func 1
 
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
-Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz
-Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz.sig
+Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2
+Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	libgcrypt-devel zlib-devel perl
 
@@ -85,7 +85,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/DETAILS doc/*.html
+%doc doc/*.html
 %_bindir/*-config
 %_includedir/*
 %_libdir/*.a
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.4-1
+- updated to 0.6.4
+
 * Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.13-1
 - updated to 0.5.13
 - build with '-Wl,--as-needed' and removed superfluous libs from the


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:17 -0000	1.1
+++ lastver	5 Sep 2007 07:36:36 -0000	1.2
@@ -1 +1 @@
-0.5.13
+0.6.4



From fedora-extras-commits at redhat.com  Wed Sep  5 07:40:51 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 5 Sep 2007 03:40:51 -0400
Subject: rpms/opencdk/F-7 sources, 1.7, 1.8 opencdk.spec, 1.11, 1.12 lastver,
	1.1, 1.2
Message-ID: <200709050740.l857epPl008713@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8685

Modified Files:
	sources opencdk.spec lastver 
Log Message:
updated to 0.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2007 23:33:48 -0000	1.7
+++ sources	5 Sep 2007 07:40:19 -0000	1.8
@@ -1,2 +1,2 @@
-65324874074ba7c67028b93979e6d1d9  opencdk-0.5.13.tar.gz
-fc8b34d300b89629491144726c846caf  opencdk-0.5.13.tar.gz.sig
+7bfc820bcdc08f0c31f860710368071e  opencdk-0.6.4.tar.bz2
+aa4c75dc6dbf83bc7a7b3b53772f1e12  opencdk-0.6.4.tar.bz2.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/opencdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opencdk.spec	3 Feb 2007 23:33:48 -0000	1.11
+++ opencdk.spec	5 Sep 2007 07:40:19 -0000	1.12
@@ -4,14 +4,14 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.13
+Version:	0.6.4
 Release:	%release_func 1
 
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
-Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz
-Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz.sig
+Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2
+Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	libgcrypt-devel zlib-devel perl
 
@@ -85,7 +85,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/DETAILS doc/*.html
+%doc doc/*.html
 %_bindir/*-config
 %_includedir/*
 %_libdir/*.a
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.4-1
+- updated to 0.6.4
+
 * Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.13-1
 - updated to 0.5.13
 - build with '-Wl,--as-needed' and removed superfluous libs from the


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:14 -0000	1.1
+++ lastver	5 Sep 2007 07:40:19 -0000	1.2
@@ -1 +1 @@
-0.5.13
+0.6.4



From fedora-extras-commits at redhat.com  Wed Sep  5 08:30:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed,  5 Sep 2007 04:30:53 -0400
Subject: fedora-security/audit fc6,1.251,1.252 fc7,1.92,1.93
Message-ID: <200709050830.l858UrGT015757@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692

Modified Files:
	fc6 fc7 
Log Message:
releng pushed loooots of stuff



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- fc6	4 Sep 2007 21:12:24 -0000	1.251
+++ fc6	5 Sep 2007 08:30:51 -0000	1.252
@@ -5,9 +5,9 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
 # Up to date CVE as of CVE email 20070823
-# Up to date FC6 as of 20070827
+# Up to date FC6 as of 20070905
 
-CVE-2007-4565 VULNERABLE (fetchmail) #260881
+CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash
@@ -16,12 +16,15 @@
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
-CVE-2007-4131 VULNERABLE (tar) #253684
-CVE-2007-4029 VULNERABLE (libvorbis) #250600
+CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
+CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-614]
+CVE-2007-4000 backport (krb5) [since FEDORA-2007-690]
+CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]
+CVE-2007-3848 version (kernel) [since FEDORA-2007-679]
 CVE-2007-3847 VULNERABLE (httpd) #250756
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
@@ -50,7 +53,7 @@
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3387 VULNERABLE (poppler) #251513
 CVE-2007-3387 backport (tetex) #251515 [since FEDORA-2007-669]
-CVE-2007-3387 VULNERABLE (kdegraphics) #251511
+CVE-2007-3387 backport (kdegraphics) #251511 [since FEDORA-2007-685]
 CVE-2007-3387 backport (cups) #251519 [since FEDORA-2007-644]
 CVE-2007-3384 ignore (tomcat) only affects 3.3.x and just affects an example
 CVE-2007-3381 version (gdm, fixed 2.18.4) #250277 [since FEDORA-2007-653]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fc7	4 Sep 2007 21:12:24 -0000	1.92
+++ fc7	5 Sep 2007 08:30:51 -0000	1.93
@@ -6,22 +6,22 @@
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
 # Up to date CVE as of CVE email 20070829
-# Up to date FC7 as of 20070829
+# Up to date FC7 as of 20070905
 
-CVE-2007-4650 VULNERABLE (gallery2) #267421
-CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
+CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 VULNERABLE (qgit) #268381
-CVE-2007-4565 VULNERABLE (fetchmail) #260861
+CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 VULNERABLE (clamav) #260583
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
+CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4534 VULNERABLE (vavoom) #256621
-CVE-2007-4533 VULNERABLE (vavoom) #256621
-CVE-2007-4532 VULNERABLE (vavoom) #256621
+CVE-2007-4534 backport (vavoom) #256621 [since CVE-2007-4533]
+CVE-2007-4533 backport (vavoom) #256621 [since CVE-2007-4533]
+CVE-2007-4532 backport (vavoom) #256621 [since CVE-2007-4533]
 CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
@@ -42,12 +42,14 @@
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-0414]
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
-CVE-2007-4139 VULNERABLE (wordpress) #250751
+CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
-CVE-2007-4131 VULNERABLE (tar) #253684
+CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4065 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
+CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252295 [since FEDORA-2007-1697]
@@ -142,7 +144,7 @@
 CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3007 ignore (php) safe mode isn't safe
 *CVE-2007-2975 (openfire)
-CVE-2007-2958 VULNERABLE (claws-mail) #254121
+CVE-2007-2958 version (claws-mail) #254121 [since FEDORA-2007-2009]
 CVE-2007-2958 backport (sylpheed) #254123 [since FEDORA-2007-1841]
 CVE-2007-2956 backport (qtpfsgui) #251674 [since FEDORA-2007-1581]
 CVE-2007-2949 version (gimp, fixed, 2.2.16) [since FEDORA-2007-0725]



From fedora-extras-commits at redhat.com  Wed Sep  5 08:33:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:33:44 -0400
Subject: rpms/openoffice.org/devel sources,1.247,1.248
Message-ID: <200709050833.l858XioQ015865@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15799

Modified Files:
	sources 
Log Message:
update for sandbox


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- sources	1 Sep 2007 11:44:03 -0000	1.247
+++ sources	5 Sep 2007 08:33:11 -0000	1.248
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-c7ee60da19dc9c0cccd3c2c7559a6c51  OOG680_m3.tar.bz2
+5b759a306c3ecd9284fdf6ba8e31388a  OOG680_m3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 08:35:53 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:35:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1295,1.1296
Message-ID: <200709050835.l858ZrU5015962@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15944

Modified Files:
	openoffice.org.spec 
Log Message:
icedtea issue


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -r1.1295 -r1.1296
--- openoffice.org.spec	5 Sep 2007 06:50:00 -0000	1.1295
+++ openoffice.org.spec	5 Sep 2007 08:35:20 -0000	1.1296
@@ -1,15 +1,7 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-#temporary until I fix configure to find gcj's jdk_home on its own
-#and when the default java-devel pulled in is icedtea on intel-alikes
-%ifnarch %{ix86} x86_64
-%define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
-%define jdk_ver 1.5.0
-%else
-%define jdk_line ''
-%define jdk_ver 1.7.0
-%endif
+
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
@@ -25,6 +17,13 @@
 %else
 %define stlport_abi_lockin 0
 %endif
+#temporary until 
+#a) jdk_line I fix configure to find gcj's jdk_home on its own
+#b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
+#c) and figure out if we want sandbox.jar
+%ifnarch %{ix86} x86_64
+%define jdk_is_gcj
+%endif
 
 %if %{stlport_abi_lockin}
 %define stlflags --with-stlport4
@@ -32,6 +31,14 @@
 %define stlflags --without-stlport4
 %endif
 
+%if %{jdk_is_gcj}
+%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+%else
+%define jdkflags ''
+%define jdk_ver 1.7.0
+%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 sk sl sr-CS 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
 %else
@@ -1081,7 +1088,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdk_line} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1623,6 +1630,9 @@
 %{instdir}/program/classes/officebean.jar
 %{instdir}/program/classes/report.jar
 %{instdir}/program/classes/ridl.jar
+%if ! %{jdk_is_gcj}
+%{instdir}/program/classes/sandbox.jar
+%endif
 %{instdir}/program/classes/sdbc_hsqldb.jar
 %{instdir}/program/classes/ScriptFramework.jar
 %{instdir}/program/classes/ScriptProviderForBeanShell.jar
@@ -2756,6 +2766,7 @@
 - don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix
+- package sandbox.jar where available
 
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate



From fedora-extras-commits at redhat.com  Wed Sep  5 08:38:45 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:38:45 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1296,1.1297
Message-ID: <200709050838.l858cjeK016101@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074

Modified Files:
	openoffice.org.spec 
Log Message:
icedtea issue


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1296
retrieving revision 1.1297
diff -u -r1.1296 -r1.1297
--- openoffice.org.spec	5 Sep 2007 08:35:20 -0000	1.1296
+++ openoffice.org.spec	5 Sep 2007 08:38:13 -0000	1.1297
@@ -21,8 +21,10 @@
 #a) jdk_line I fix configure to find gcj's jdk_home on its own
 #b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
 #c) and figure out if we want sandbox.jar
-%ifnarch %{ix86} x86_64
-%define jdk_is_gcj
+%ifarch %{ix86} x86_64
+%define jdk_is_gcj 0
+%else
+%define jdk_is_gcj 1
 %endif
 
 %if %{stlport_abi_lockin}



From fedora-extras-commits at redhat.com  Wed Sep  5 08:50:23 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 5 Sep 2007 04:50:23 -0400
Subject: rpms/gimmage/devel gimmage-0.2.3-desktop.patch, NONE,
	1.1 gimmage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709050850.l858oNmH016432@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16387/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gimmage-0.2.3-desktop.patch gimmage.spec 
Log Message:
Initial release


gimmage-0.2.3-desktop.patch:

--- NEW FILE gimmage-0.2.3-desktop.patch ---
--- gimmage-0.2.3/gimmage.desktop.in.orig	2007-09-04 12:01:18.000000000 +0200
+++ gimmage-0.2.3/gimmage.desktop.in	2007-09-04 12:01:35.000000000 +0200
@@ -3,6 +3,7 @@
 Exec=@prefix@/bin/gimmage
 Icon=gimmage.png
 Type=Application
-Categories=Application;Graphics;
+Categories=Graphics;Viewer;
 Comment=A simple image viewer.
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
\ No newline at end of file
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
+Encoding=UTF-8


--- NEW FILE gimmage.spec ---

Name:      gimmage
Version:   0.2.3
Release:   1%{?dist}
Summary:   A Simple GNOME Image Viewer
Group:     Applications/Multimedia
License:   GPLv2+
URL:       http://gimmage.berlios.de/
Source0:   http://download.berlios.de/gimmage/%{name}-%{version}.tar.gz
Patch0:    gimmage-0.2.3-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkmm24-devel >= 2.10.0
BuildRequires:  cairomm-devel
BuildRequires:  curl-devel
BuildRequires:  file-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext intltool


%description
Gimmage is a simple image viewer that aims to have a minimalist
interface and tries to be keyboard operable for browsing through a
large number of images quickly.


%prep
%setup -q
%patch0 -p1 -b .desktop


%build
%configure \
        --disable-static \
        --disable-rpath \
        --disable-dependency-tracking

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora \
    --delete-original \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Tue Sep  4 2007 Denis Leroy <denis at poolshark.org> - 0.2.3-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 02:40:58 -0000	1.1
+++ .cvsignore	5 Sep 2007 08:49:50 -0000	1.2
@@ -0,0 +1 @@
+gimmage-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 02:40:58 -0000	1.1
+++ sources	5 Sep 2007 08:49:50 -0000	1.2
@@ -0,0 +1 @@
+f51cca53b3d33415e75a91cf81b6ac39  gimmage-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:03:30 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 5 Sep 2007 05:03:30 -0400
Subject: rpms/gimmage/F-7 gimmage-0.2.3-desktop.patch, NONE, 1.1 gimmage.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709050903.l8593Uig022766@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gimmage/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742

Modified Files:
	.cvsignore sources 
Added Files:
	gimmage-0.2.3-desktop.patch gimmage.spec 
Log Message:
Initial release

gimmage-0.2.3-desktop.patch:

--- NEW FILE gimmage-0.2.3-desktop.patch ---
--- gimmage-0.2.3/gimmage.desktop.in.orig	2007-09-04 12:01:18.000000000 +0200
+++ gimmage-0.2.3/gimmage.desktop.in	2007-09-04 12:01:35.000000000 +0200
@@ -3,6 +3,7 @@
 Exec=@prefix@/bin/gimmage
 Icon=gimmage.png
 Type=Application
-Categories=Application;Graphics;
+Categories=Graphics;Viewer;
 Comment=A simple image viewer.
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
\ No newline at end of file
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
+Encoding=UTF-8


--- NEW FILE gimmage.spec ---

Name:      gimmage
Version:   0.2.3
Release:   1%{?dist}
Summary:   A Simple GNOME Image Viewer
Group:     Applications/Multimedia
License:   GPLv2+
URL:       http://gimmage.berlios.de/
Source0:   http://download.berlios.de/gimmage/%{name}-%{version}.tar.gz
Patch0:    gimmage-0.2.3-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkmm24-devel >= 2.10.0
BuildRequires:  cairomm-devel
BuildRequires:  curl-devel
BuildRequires:  file-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext intltool


%description
Gimmage is a simple image viewer that aims to have a minimalist
interface and tries to be keyboard operable for browsing through a
large number of images quickly.


%prep
%setup -q
%patch0 -p1 -b .desktop


%build
%configure \
        --disable-static \
        --disable-rpath \
        --disable-dependency-tracking

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora \
    --delete-original \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Tue Sep  4 2007 Denis Leroy <denis at poolshark.org> - 0.2.3-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 02:40:58 -0000	1.1
+++ .cvsignore	5 Sep 2007 09:02:56 -0000	1.2
@@ -0,0 +1 @@
+gimmage-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 02:40:58 -0000	1.1
+++ sources	5 Sep 2007 09:02:56 -0000	1.2
@@ -0,0 +1 @@
+f51cca53b3d33415e75a91cf81b6ac39  gimmage-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:24:34 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 05:24:34 -0400
Subject: rpms/perl-Graph/devel .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200709050924.l859OY2Y023241@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23211

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Aug 2007 12:15:36 -0000	1.4
+++ .cvsignore	5 Sep 2007 09:24:01 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/perl-Graph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Graph.spec	23 Aug 2007 13:35:58 -0000	1.6
+++ perl-Graph.spec	5 Sep 2007 09:24:01 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,8 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Aug 2007 12:15:36 -0000	1.5
+++ sources	5 Sep 2007 09:24:01 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:25:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 05:25:29 -0400
Subject: rpms/perl-Graph/devel perl-Graph.spec,1.7,1.8
Message-ID: <200709050925.l859PTt0023278@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23247

Modified Files:
	perl-Graph.spec 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/perl-Graph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Graph.spec	5 Sep 2007 09:24:01 -0000	1.7
+++ perl-Graph.spec	5 Sep 2007 09:24:56 -0000	1.8
@@ -63,6 +63,7 @@
 
 %changelog
 * Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
 
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.



From fedora-extras-commits at redhat.com  Wed Sep  5 09:29:42 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 5 Sep 2007 05:29:42 -0400
Subject: rpms/klamav/F-7 klamav-0.41.1-open-mode.patch, NONE, 1.1 klamav.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200709050929.l859TgMe023387@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/klamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23360

Modified Files:
	klamav.spec sources 
Added Files:
	klamav-0.41.1-open-mode.patch 
Log Message:
Update to 0.41.1

klamav-0.41.1-open-mode.patch:

--- NEW FILE klamav-0.41.1-open-mode.patch ---
--- klamav-0.41.1/src/klamd/misc.c.open-mode	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/klamd/misc.c	2007-08-19 17:45:49.000000000 +0300
@@ -157,7 +157,7 @@ int filecopy(const char *src, const char
     if((s = open(src, O_RDONLY|O_BINARY)) == -1)
 	return -1;
 
-    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) {
+    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, S_IRWXU)) == -1) {
 	close(s);
 	return -1;
     }


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/klamav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- klamav.spec	6 Mar 2007 09:59:14 -0000	1.3
+++ klamav.spec	5 Sep 2007 09:29:09 -0000	1.4
@@ -1,14 +1,13 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
-Version: 0.41
-Release: 2%{?dist}
-# Catch from http://ovh.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}-source.tar.gz
-Source0: %{name}-%{version}.tar.bz2
-#Source0: http://surfnet.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}.tar.bz2
+Version: 0.41.1
+Release: 5%{?dist}
+Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-suse-clamav-path.diff
+Patch1: klamav-0.41.1-open-mode.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
-License: GPL
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: clamav >= 0.90
 Requires: clamav-update >= 0.90
@@ -17,6 +16,7 @@
 BuildRequires: curl-devel
 BuildRequires: gmp-devel
 BuildRequires: desktop-file-utils
+BuildRequires: sqlite-devel >= 3.0
 
 %description
 ClamAV Anti-Virus protection for the KDE desktop.
@@ -24,14 +24,15 @@
 %prep
 %setup -q
 %patch0 -p0 -b .suse-clamav-path
+%patch1 -p1 -b .open-mode
 
 %build
-%configure --disable-rpath
-%{__make} %{?_smp_mflags}
+%configure --disable-rpath --without-included-sqlite
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf "${RPM_BUILD_ROOT}"
-%{__make} DESTDIR="${RPM_BUILD_ROOT}" install
+make DESTDIR="${RPM_BUILD_ROOT}" install
 
 # Fix absolute link
 ln -sf ../common ${RPM_BUILD_ROOT}%{_datadir}/doc/HTML/en/klamav02/
@@ -42,8 +43,6 @@
 %{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop.orig
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
-    --add-category Utilities \
     --delete-original \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
@@ -81,6 +80,16 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Sun Aug 19 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-5
+- fix desktop Categories
+- use system sqlite
+
+* Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-3
+- update to 0.41.1
+- fix License tag according to new guidelines
+- do not use __make macro
+- fix __open_missing_mode error
+
 * Tue Mar 06 2007 Andy Shevchenko <andy at smile.org.ua> 0.41-2
 - rebuild against new clamav
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2007 12:30:41 -0000	1.3
+++ sources	5 Sep 2007 09:29:09 -0000	1.4
@@ -1 +1 @@
-275fe29fda8db6f83717761f42534392  klamav-0.41.tar.bz2
+066e4c7089f9ef42958583bd5438e9e2  klamav-0.41.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 09:44:27 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 5 Sep 2007 05:44:27 -0400
Subject: rpms/gd/F-7 gd-2.0.35-AALineThick.patch, NONE,
	1.1 gd-2.0.35-overflow.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gd.spec, 1.42, 1.43 sources, 1.11,
	1.12 gd-2.0.33-AALineThick.patch, 1.1,
	NONE gd-2.0.33-overflow.patch, 1.1, NONE
Message-ID: <200709050944.l859iRC5023750@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23717

Modified Files:
	.cvsignore gd.spec sources 
Added Files:
	gd-2.0.35-AALineThick.patch gd-2.0.35-overflow.patch 
Removed Files:
	gd-2.0.33-AALineThick.patch gd-2.0.33-overflow.patch 
Log Message:
update to 2.0.35
fix several vulnerabilities #277421


gd-2.0.35-AALineThick.patch:

--- NEW FILE gd-2.0.35-AALineThick.patch ---
--- gd-2.0.35/gd.c.pom	2007-06-19 22:25:51.000000000 +0200
+++ gd-2.0.35/gd.c	2007-09-05 11:25:16.000000000 +0200
@@ -3474,6 +3474,8 @@ static void gdImageAALine (gdImagePtr im
 	/* keep them as 32bits */
 	long x, y, inc;
 	long dx, dy,tmp;
+	int w, wid, wstart; 
+	int thick = im->thick; 
 
 	if (!im->trueColor) {
 		/* TBB: don't crash when the image is of the wrong type */
@@ -3502,6 +3504,25 @@ static void gdImageAALine (gdImagePtr im
 		gdImageSetAAPixelColor(im, x1, y1, col, 0xFF);
 		return;
 	}
+	else { 
+	    double ag; 
+	    if (dy < dx)  
+		ag  = cos (atan2 (dy, dx)); 
+	    else  
+		ag = sin (atan2 (dy, dx)); 
+	    if (ag != 0)
+	    {
+		wid = thick / ag; 
+	    }
+	    else
+	    {
+		wid = 1;
+	    } 
+	    if (wid == 0)
+	    {
+		wid = 1;
+	    } 
+	} 
 	if (abs(dx) > abs(dy)) {
 		if (dx < 0) {
 			tmp = x1;
@@ -3518,8 +3539,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dy * 65536) / dx;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((x >> 16) <= x2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (y >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, x >> 16, (y >> 16) + 1,col, (~y >> 8) & 0xFF);
+			wstart = (y >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) {    
+			    gdImageSetAAPixelColor(im, (x >> 16) , w , col , (y >> 8) & 0xFF); 
+			    gdImageSetAAPixelColor(im, (x >> 16) , w + 1 , col, (~y >> 8) & 0xFF); 
+			} 
 			x += (1 << 16);
 			y += inc;
 		}
@@ -3539,8 +3563,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dx * 65536) / dy;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((y>>16) <= y2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (x >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, (x >> 16) + 1, (y >> 16),col, (~x >> 8) & 0xFF);
+			wstart = (x >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) { 
+			    gdImageSetAAPixelColor(im, w , y >> 16  , col, (x >> 8) & 0xFF);                    
+			    gdImageSetAAPixelColor(im, w + 1, y >> 16, col, (~x >> 8) & 0xFF);   
+			}
 			x += inc;
 			y += (1<<16);
 		}

gd-2.0.35-overflow.patch:

--- NEW FILE gd-2.0.35-overflow.patch ---
--- gd-2.0.35/gd_gd.c.pom	2006-04-05 17:52:22.000000000 +0200
+++ gd-2.0.35/gd_gd.c	2007-09-05 11:31:39.000000000 +0200
@@ -149,6 +149,10 @@ _gdCreateFromFile (gdIOCtx * in, int *sx
     {
       im = gdImageCreate (*sx, *sy);
     }
+  if (!im) 
+    { 
+      goto fail1; 
+    } 
   if (!_gdGetColors (in, im, gd2xFlag))
     {
       goto fail2;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2007 13:09:04 -0000	1.12
+++ .cvsignore	5 Sep 2007 09:43:55 -0000	1.13
@@ -1 +1 @@
-gd-2.0.34.tar.bz2
+gd-2.0.35.tar.bz2


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/gd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gd.spec	22 Feb 2007 12:44:56 -0000	1.42
+++ gd.spec	5 Sep 2007 09:43:55 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.0.34
-Release:       2%{?dist}
+Version:       2.0.35
+Release:       1%{?dist}
 Group:         System Environment/Libraries
 License:       BSD-style
 URL:           http://www.libgd.org/Main_Page
@@ -10,8 +10,8 @@
 Patch3:        gd-2.0.34-multilib.patch
 Patch4:        gd-loop.patch
 Patch5:        gd-2.0.34-sparc64.patch
-Patch6:        gd-2.0.33-overflow.patch
-Patch7:        gd-2.0.33-AALineThick.patch
+Patch6:        gd-2.0.35-overflow.patch
+Patch7:        gd-2.0.35-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
@@ -98,6 +98,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ivana varekova <varekova at redhat.com> 2.0.35-1
+- update to 2.0.35
+- fix several vulnerabilities #277421
+
 * Thu Feb 22 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-2
 - incorporate package review feedback
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2007 13:09:04 -0000	1.11
+++ sources	5 Sep 2007 09:43:55 -0000	1.12
@@ -1 +1 @@
-8c25c322f12030b1c24488efd577fec0  gd-2.0.34.tar.bz2
+6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  gd-2.0.35.tar.bz2


--- gd-2.0.33-AALineThick.patch DELETED ---


--- gd-2.0.33-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 09:56:57 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Wed, 5 Sep 2007 05:56:57 -0400
Subject: rpms/bind/devel bind.spec,1.212,1.213 named.init,1.58,1.59
Message-ID: <200709050956.l859uvpF024042@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24016

Modified Files:
	bind.spec named.init 
Log Message:
- initscript failure message is now printed correctly (#277981,
  Quentin Armitage (quentin armitage org uk) )



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- bind.spec	3 Sep 2007 08:23:14 -0000	1.212
+++ bind.spec	5 Sep 2007 09:56:24 -0000	1.213
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.2.%{RELEASEVER}%{?dist}
+Release: 	11.3.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -646,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.3.a6
+- initscript failure message is now printed correctly (#277981,
+  Quentin Armitage (quentin armitage org uk) )
+
 * Mon Sep 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.2.a6
 - temporary revert ISC 2119 change and add "libbind-errno" patch
   (#254501) again


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- named.init	23 Aug 2007 09:09:35 -0000	1.58
+++ named.init	5 Sep 2007 09:56:24 -0000	1.59
@@ -137,12 +137,12 @@
     [ -x /usr/bin/logger ] && echo "$named_err" | /usr/bin/logger -pdaemon.error -tnamed;
     exit 2;
   fi;
+  echo
   if [ $RETVAL -eq 0 ]; then
     touch /var/lock/subsys/named;
   else
     exit 7;
   fi
-  echo
   return 0;
 }
 



From fedora-extras-commits at redhat.com  Wed Sep  5 10:16:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:16:07 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.9,1.10
Message-ID: <200709051016.l85AG7In030359@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30339

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
- Upstream update.
- Update license.



Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-Autouse.spec	5 Sep 2006 11:56:37 -0000	1.9
+++ perl-Class-Autouse.spec	5 Sep 2007 10:15:35 -0000	1.10
@@ -1,8 +1,8 @@
 Name: 		perl-Class-Autouse
-Version: 	1.27
+Version: 	1.28
 Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Autouse/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
@@ -14,6 +14,9 @@
 BuildRequires: 	perl(Test::More) >= 0.47
 BuildRequires: 	perl(Carp)
 BuildRequires: 	perl(File::Spec) >= 0.80
+# FIXME: Class-Autouse actually wants perl(List::Util) >= 1.19
+# perl is currently being shipped with perl(List::Util) == 1.18
+# Should be safe to ignore
 BuildRequires:	perl(List::Util) >= 1.18
 
 # for improved tests
@@ -44,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -53,6 +56,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
+- Upstream update.
+- Update license.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 10:18:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:18:39 -0400
Subject: rpms/perl-Class-Autouse/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200709051018.l85AId7E030458@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30432

Modified Files:
	.cvsignore sources 
Log Message:
Update.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2006 11:56:37 -0000	1.7
+++ .cvsignore	5 Sep 2007 10:18:06 -0000	1.8
@@ -1 +1 @@
-Class-Autouse-1.27.tar.gz
+Class-Autouse-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2006 11:56:37 -0000	1.7
+++ sources	5 Sep 2007 10:18:06 -0000	1.8
@@ -1 +1 @@
-f6b69cae6db84d6c1728384e6e7bd281  Class-Autouse-1.27.tar.gz
+d9909d00aba3238dae31e27e4695dcc2  Class-Autouse-1.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:21:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:21:25 -0400
Subject: rpms/perl-Class-Autouse/F-7 .cvsignore, 1.7,
	1.8 perl-Class-Autouse.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709051021.l85ALPYj030697@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666

Modified Files:
	.cvsignore perl-Class-Autouse.spec sources 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
- Upstream update.
- Update license.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2006 11:56:37 -0000	1.7
+++ .cvsignore	5 Sep 2007 10:20:53 -0000	1.8
@@ -1 +1 @@
-Class-Autouse-1.27.tar.gz
+Class-Autouse-1.28.tar.gz


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/perl-Class-Autouse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-Autouse.spec	5 Sep 2006 11:56:37 -0000	1.9
+++ perl-Class-Autouse.spec	5 Sep 2007 10:20:53 -0000	1.10
@@ -1,8 +1,8 @@
 Name: 		perl-Class-Autouse
-Version: 	1.27
+Version: 	1.28
 Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Autouse/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
@@ -14,6 +14,9 @@
 BuildRequires: 	perl(Test::More) >= 0.47
 BuildRequires: 	perl(Carp)
 BuildRequires: 	perl(File::Spec) >= 0.80
+# FIXME: Class-Autouse actually wants perl(List::Util) >= 1.19
+# perl is currently being shipped with perl(List::Util) == 1.18
+# Should be safe to ignore
 BuildRequires:	perl(List::Util) >= 1.18
 
 # for improved tests
@@ -44,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -53,6 +56,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
+- Upstream update.
+- Update license.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.27-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2006 11:56:37 -0000	1.7
+++ sources	5 Sep 2007 10:20:53 -0000	1.8
@@ -1 +1 @@
-f6b69cae6db84d6c1728384e6e7bd281  Class-Autouse-1.27.tar.gz
+d9909d00aba3238dae31e27e4695dcc2  Class-Autouse-1.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:25:33 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 06:25:33 -0400
Subject: rpms/perl-Graph/F-7 .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200709051025.l85APXex030837@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30801

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Aug 2007 13:02:59 -0000	1.4
+++ .cvsignore	5 Sep 2007 10:25:00 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/perl-Graph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Graph.spec	23 Aug 2007 13:40:26 -0000	1.5
+++ perl-Graph.spec	5 Sep 2007 10:25:00 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Aug 2007 13:02:59 -0000	1.5
+++ sources	5 Sep 2007 10:25:00 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:37:44 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:37:44 -0400
Subject: rpms/GeoIP/devel .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709051037.l85Abi8I031503@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31480

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:37:12 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	5 Sep 2007 10:37:12 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	5 Sep 2007 10:37:12 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 10:48:36 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 06:48:36 -0400
Subject: rpms/perl-Graph/FC-6 .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200709051048.l85Amap3031852@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31816

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Aug 2007 12:02:14 -0000	1.4
+++ .cvsignore	5 Sep 2007 10:48:00 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/perl-Graph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Graph.spec	23 Aug 2007 13:43:23 -0000	1.5
+++ perl-Graph.spec	5 Sep 2007 10:48:00 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 12:02:14 -0000	1.5
+++ sources	5 Sep 2007 10:48:00 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:51:18 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:51:18 -0400
Subject: rpms/GeoIP/FC-6 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <200709051051.l85ApITm031937@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31891

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release
- Small fixes to fetch scripts



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Apr 2007 08:42:04 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/GeoIP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeoIP.spec	1 Apr 2007 08:42:04 -0000	1.9
+++ GeoIP.spec	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,10 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release
+- Small fixes to fetch scripts
+
 * Sun Apr 1 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 - Sync with devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Apr 2007 08:42:04 -0000	1.9
+++ sources	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-a650a3e4fb2f7c3984c4081cd5949d73  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 10:55:09 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:55:09 -0400
Subject: rpms/GeoIP/F-7 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200709051055.l85At970032080@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32049

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:54:30 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	5 Sep 2007 10:54:30 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	5 Sep 2007 10:54:30 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 11:00:30 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Wed, 05 Sep 2007 04:00:30 -0700
Subject: [pkgdb] kdnssd-avahi had acl change status
Message-ID: <200709051100.l85B0kbl013968@app3.fedora.phx.redhat.com>

Martin Bacovsky (mbacovsk) has set the watchbugzilla acl on kdnssd-avahi (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:00:49 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Wed, 05 Sep 2007 04:00:49 -0700
Subject: [pkgdb] kdnssd-avahi had acl change status
Message-ID: <200709051100.l85B0oLK013977@app3.fedora.phx.redhat.com>

Martin Bacovsky (mbacovsk) has set the commit acl on kdnssd-avahi (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:08:01 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:08:01 -0700
Subject: [pkgdb] mt-st Orphaned
Message-ID: <200709051108.l85B81C3014103@app3.fedora.phx.redhat.com>

Package mt-st in Fedora devel was orphaned by Jindrich Novy (jnovy)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:08:50 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Wed, 5 Sep 2007 07:08:50 -0400
Subject: rpms/mod_perl/devel filter-provides.sh, 1.1, 1.2 mod_perl.spec, 1.52,
	1.53
Message-ID: <200709051108.l85B8oXN008136@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8081

Modified Files:
	filter-provides.sh mod_perl.spec 
Log Message:
* Wed Sep  5 2007 Joe Orton <jorton at redhat.com> 2.0.3-14
- filter perl(HTTP::Request::Common) Provide from -devel (#247250)



Index: filter-provides.sh
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/filter-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filter-provides.sh	20 Apr 2007 10:01:30 -0000	1.1
+++ filter-provides.sh	5 Sep 2007 11:08:17 -0000	1.2
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 /usr/lib/rpm/perl.prov $* | \
-    sed -e '/perl(warnings)/d'
+    sed -e '/perl(warnings)/d' \
+        -e '/HTTP::Request::Common)/d'
+


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_perl.spec	2 Sep 2007 14:06:57 -0000	1.52
+++ mod_perl.spec	5 Sep 2007 11:08:17 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.3
-Release:        13
+Release:        14
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@
 %{_includedir}/httpd/*
 
 %changelog
+* Wed Sep  5 2007 Joe Orton <jorton at redhat.com> 2.0.3-14
+- filter perl(HTTP::Request::Common) Provide from -devel (#247250)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
 - rebuild for fixed 32-bit APR
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:19 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:19 -0400
Subject: rpms/xtide/F-7 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xtide.spec,
	1.30, 1.31
Message-ID: <200709051109.l85B9JhW008216@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/F-7

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 19:05:12 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:46 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 19:05:12 -0000	1.21
+++ sources	5 Sep 2007 11:08:46 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xtide.spec	11 Jun 2007 07:15:29 -0000	1.30
+++ xtide.spec	5 Sep 2007 11:08:46 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPL
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,17 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
+- Mass rebuild (buildID or binutils issue)
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.1
+- License update
+
 * Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3
 - Require needed fonts (bug reported from upstream)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:22 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:22 -0400
Subject: rpms/xtide/FC-6 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xtide.spec, 1.29, 1.30
Message-ID: <200709051109.l85B9MoA008221@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/FC-6

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 19:05:26 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:49 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 19:05:26 -0000	1.21
+++ sources	5 Sep 2007 11:08:49 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xtide.spec	11 Jun 2007 11:56:12 -0000	1.29
+++ xtide.spec	5 Sep 2007 11:08:49 -0000	1.30
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPL
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,17 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
+- Mass rebuild (buildID or binutils issue)
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.1
+- License update
+
 * Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3
 - Require needed fonts (bug reported from upstream)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:25 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:25 -0400
Subject: rpms/xtide/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xtide.spec, 1.32, 1.33
Message-ID: <200709051109.l85B9P5N008226@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/devel

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 18:05:32 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 18:05:32 -0000	1.21
+++ sources	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xtide.spec	21 Aug 2007 18:54:31 -0000	1.32
+++ xtide.spec	5 Sep 2007 11:08:52 -0000	1.33
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}.2
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPLv2+
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
 - Mass rebuild (buildID or binutils issue)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:27 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:27 -0700
Subject: [pkgdb] mtx Orphaned
Message-ID: <200709051122.l85BMR7c014213@app3.fedora.phx.redhat.com>

Package mtx in Fedora 7 was orphaned by Jindrich Novy (jnovy)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:40 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:40 -0700
Subject: [pkgdb] mtx: jnovy has requested watchcommits
Message-ID: <200709051122.l85BMeGs014220@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mtx (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:45 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:45 -0700
Subject: [pkgdb] mtx: jnovy has requested approveacls
Message-ID: <200709051122.l85BMj3K014227@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mtx (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:57 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Wed, 5 Sep 2007 07:22:57 -0400
Subject: rpms/rpm/devel rpm.spec,1.257,1.258
Message-ID: <200709051122.l85BMvIN008617@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8586

Modified Files:
	rpm.spec 
Log Message:
- remove duplicated libraries from rpm-devel (#278151)



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- rpm.spec	4 Sep 2007 07:45:42 -0000	1.257
+++ rpm.spec	5 Sep 2007 11:22:24 -0000	1.258
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.3.rc1
+Release: 0.4.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -333,10 +333,7 @@
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/librpm-4.4.so
-%{_libdir}/librpmdb-4.4.so
-%{_libdir}/librpmio-4.4.so
-%{_libdir}/librpmbuild-4.4.so
+%{_libdir}/librpm*-*.so
 
 %files build
 %defattr(-,root,root)
@@ -392,7 +389,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/rpm
-%{_libdir}/librpm*.so
+%{_libdir}/librp*[a-z].so
 %{_libdir}/librpm*.a
 %{_mandir}/man8/rpmcache.8*
 %{_mandir}/man8/rpmgraph.8*
@@ -406,6 +403,9 @@
 %endif
 
 %changelog
+* Wed Sep 05 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.4.rc1
+- remove duplicated libraries from rpm-devel (#278151)
+
 * Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.3.rc1
 - require gawk, not awk, doh
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:58 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:58 -0700
Subject: [pkgdb] mtx: jnovy has requested watchcommits
Message-ID: <200709051122.l85BMwF5014233@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mtx (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:23:01 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:23:01 -0700
Subject: [pkgdb] mtx: jnovy has requested approveacls
Message-ID: <200709051123.l85BN12A014239@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mtx (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:06 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:06 -0700
Subject: [pkgdb] mt-st: jnovy has requested watchcommits
Message-ID: <200709051124.l85BO6GT014266@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mt-st (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:10 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:10 -0700
Subject: [pkgdb] mt-st: jnovy has requested approveacls
Message-ID: <200709051124.l85BOANW014272@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mt-st (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:15 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:15 -0700
Subject: [pkgdb] mt-st: jnovy has requested watchcommits
Message-ID: <200709051124.l85BOFuG014278@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mt-st (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:19 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:19 -0700
Subject: [pkgdb] mt-st: jnovy has requested approveacls
Message-ID: <200709051124.l85BOJEY014284@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mt-st (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:25:43 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 5 Sep 2007 07:25:43 -0400
Subject: rpms/lighttpd/devel lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.17-sighup.patch, NONE, 1.1 .cvsignore, 1.20,
	1.21 lighttpd.spec, 1.36, 1.37 sources, 1.20,
	1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709051125.l85BPhqd008766@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8726

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch lighttpd-1.4.17-sighup.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.17.


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )

lighttpd-1.4.17-sighup.patch:

--- NEW FILE lighttpd-1.4.17-sighup.patch ---
Index: /branches/lighttpd-1.4.x/src/server.c
===================================================================
--- /branches/lighttpd-1.4.x/src/server.c (revision 1980)
+++ /branches/lighttpd-1.4.x/src/server.c (revision 1982)
@@ -69,4 +69,5 @@
 static volatile sig_atomic_t handle_sig_alarm = 1;
 static volatile sig_atomic_t handle_sig_hup = 0;
+static volatile sig_atomic_t forwarded_sig_hup = 0;
 
 #if defined(HAVE_SIGACTION) && defined(SA_SIGINFO)
@@ -95,6 +96,17 @@
 		break;
 	case SIGHUP:
-		handle_sig_hup = 1;
-		memcpy(&last_sighup_info, si, sizeof(*si));
+		/** 
+		 * we send the SIGHUP to all procs in the process-group
+		 * this includes ourself
+		 * 
+		 * make sure we only send it once and don't create a 
+		 * infinite loop
+		 */
+		if (!forwarded_sig_hup) {
+			handle_sig_hup = 1;
+			memcpy(&last_sighup_info, si, sizeof(*si));
+		} else {
+			forwarded_sig_hup = 0;
+		}
 		break;
 	case SIGCHLD:
@@ -989,5 +1001,5 @@
 	if (num_childs > 0) {
 		int child = 0;
-		while (!child && !srv_shutdown) {
+		while (!child && !srv_shutdown && !graceful_shutdown) {
 			if (num_childs > 0) {
 				switch (fork()) {
@@ -1004,12 +1016,59 @@
 				int status;
 
-				/* ignore EINTR */
-				if (-1 != wait(&status)) num_childs++;
-			}
-		}
-		if (srv_shutdown) {
-			kill(0, SIGTERM);
-		}
-		if (!child) return 0;
+				if (-1 != wait(&status)) {
+					/** 
+					 * one of our workers went away 
+					 */
+					num_childs++;
+				} else {
+					switch (errno) {
+					case EINTR:
+						/**
+						 * if we receive a SIGHUP we have to close our logs ourself as we don't 
+						 * have the mainloop who can help us here
+						 */
+						if (handle_sig_hup) {
+							handle_sig_hup = 0;
+
+							log_error_cycle(srv);
+
+							/**
+							 * forward to all procs in the process-group
+							 * 
+							 * we also send it ourself
+							 */
+							if (!forwarded_sig_hup) {
+								forwarded_sig_hup = 1;
+								kill(0, SIGHUP);
+							}
+						}
+						break;
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		/**
+		 * for the parent this is the exit-point 
+		 */
+		if (!child) {
+			/** 
+			 * kill all children too 
+			 */
+			if (graceful_shutdown) {
+				kill(0, SIGINT);
+			} else if (srv_shutdown) {
+				kill(0, SIGTERM);
+			}
+
+			log_error_close(srv);
+			network_close(srv);
+			connections_free(srv);
+			plugins_free(srv);
+			server_free(srv);
+			return 0;
+		}
 	}
 #endif
@@ -1102,7 +1161,7 @@
 				log_error_write(srv, __FILE__, __LINE__, "sdsd", 
 					"logfiles cycled UID =",
-					last_sigterm_info.si_uid,
+					last_sighup_info.si_uid,
 					"PID =",
-					last_sigterm_info.si_pid);
+					last_sighup_info.si_pid);
 #else
 				log_error_write(srv, __FILE__, __LINE__, "s", 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:08:02 -0000	1.20
+++ .cvsignore	5 Sep 2007 11:25:10 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.17.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- lighttpd.spec	23 Aug 2007 10:23:42 -0000	1.36
+++ lighttpd.spec	5 Sep 2007 11:25:10 -0000	1.37
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
-Release: 3%{?dist}
+Version: 1.4.17
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -15,7 +15,8 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
+Patch1: lighttpd-1.4.17-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -72,6 +73,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
+%patch1 -p3 -b .sighup
 
 
 %build
@@ -120,6 +122,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -160,6 +165,7 @@
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -179,6 +185,12 @@
 
 
 %changelog
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
 - Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:08:02 -0000	1.20
+++ sources	5 Sep 2007 11:25:10 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+85c99c2d6baf8ad9e38e6267efe7d9aa  lighttpd-1.4.17.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 11:30:14 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 05 Sep 2007 04:30:14 -0700
Subject: [pkgdb] mtx Owned
Message-ID: <200709051130.l85BUERx014327@app3.fedora.phx.redhat.com>

Package mtx in Fedora devel is now owned by Radek Brich (rbrich)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:30:43 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 5 Sep 2007 07:30:43 -0400
Subject: rpms/docbook-style-xsl/devel .cvsignore, 1.20,
	1.21 docbook-style-xsl.spec, 1.37, 1.38 sources, 1.20, 1.21
Message-ID: <200709051130.l85BUhSJ008957@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8886

Modified Files:
	.cvsignore docbook-style-xsl.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	29 Aug 2007 15:19:55 -0000	1.20
+++ .cvsignore	5 Sep 2007 11:30:11 -0000	1.21
@@ -1 +1,3 @@
 docbook-xsl-1.73.1.tar.gz
+docbook-xsl-1.73.2.tar.gz
+docbook-xsl-doc-1.73.2.tar.bz2


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- docbook-style-xsl.spec	30 Aug 2007 13:45:43 -0000	1.37
+++ docbook-style-xsl.spec	5 Sep 2007 11:30:11 -0000	1.38
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.73.1
-Release: 2%{?dist}
+Version: 1.73.2
+Release: 1%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -99,10 +99,13 @@
 
 
 %changelog
-* Thu Jul 30 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-2
+* Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
+- new upstream version
+
+* Thu Aug 30 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-2
 - removed patch for #249294(included in new version other way)
 
-* Wed Jul 29 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-1
+* Wed Aug 29 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-1
 - new upstream version(fixing some bugs)
 - small new-methods patch change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2007 15:19:55 -0000	1.20
+++ sources	5 Sep 2007 11:30:11 -0000	1.21
@@ -1,2 +1,2 @@
-e183c80a6a18cc3a8eeb3f3d749dbf76  docbook-xsl-doc-1.73.1.tar.bz2
-238a90e48d0a1b48b7876f8239bb0b5b  docbook-xsl-1.73.1.tar.gz
+7dd72a38c7d25e1396fa26b6ee53eae9  docbook-xsl-1.73.2.tar.gz
+d41ce59b783b60383cca765902a41039  docbook-xsl-doc-1.73.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 11:32:43 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 05 Sep 2007 04:32:43 -0700
Subject: [pkgdb] mt-st Owned
Message-ID: <200709051132.l85BWhn8014341@app3.fedora.phx.redhat.com>

Package mt-st in Fedora devel is now owned by Radek Brich (rbrich)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 11:38:45 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 5 Sep 2007 07:38:45 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.107,1.108
Message-ID: <200709051138.l85BcjgZ009185@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9165

Modified Files:
	kdegraphics.spec 
Log Message:
* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-4
- respin (for poppler)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdegraphics.spec	20 Aug 2007 20:08:54 -0000	1.107
+++ kdegraphics.spec	5 Sep 2007 11:38:13 -0000	1.108
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -311,6 +311,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-4
+- respin (for poppler)
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-3
 - (Build)Requires: kdelibs3(-devel)
 - Provides: kdegraphics3(-devel)



From fedora-extras-commits at redhat.com  Wed Sep  5 11:40:10 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:40:10 -0400
Subject: rpms/mod_geoip/devel .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051140.l85BeAhg009275@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:39:37 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:39:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:39:37 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:43:07 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:43:07 -0400
Subject: rpms/mod_geoip/F-7 .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051143.l85Bh7H5009369@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9345

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:42:35 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:42:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:42:35 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:44:12 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:44:12 -0400
Subject: rpms/mod_geoip/FC-6 .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051144.l85BiCcf009450@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9412

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:43:39 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:43:39 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:43:39 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:56:15 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 5 Sep 2007 07:56:15 -0400
Subject: rpms/powermanga/devel powermanga-0.90-install.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 powermanga.spec, 1.17, 1.18 sources,
	1.3, 1.4 powermanga-0.80-install.patch, 1.1, NONE
Message-ID: <200709051156.l85BuFEh009782@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9705

Modified Files:
	.cvsignore powermanga.spec sources 
Added Files:
	powermanga-0.90-install.patch 
Removed Files:
	powermanga-0.80-install.patch 
Log Message:
Update to 0.90.


powermanga-0.90-install.patch:

--- NEW FILE powermanga-0.90-install.patch ---
diff -Naupr powermanga-0.90.orig/data/curves/Makefile powermanga-0.90/data/curves/Makefile
--- powermanga-0.90.orig/data/curves/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile	2007-09-04 16:33:04.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/curves/Makefile.am powermanga-0.90/data/curves/Makefile.am
--- powermanga-0.90.orig/data/curves/Makefile.am	2007-07-13 07:31:49.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile.am	2007-09-04 16:32:47.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 
 dist_pkgdata_DATA = \
   bezier_curve_000.bin \
diff -Naupr powermanga-0.90.orig/data/curves/Makefile.in powermanga-0.90/data/curves/Makefile.in
--- powermanga-0.90.orig/data/curves/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile.in	2007-09-04 16:32:56.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile powermanga-0.90/data/levels/curves_phase/Makefile
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile	2007-09-04 16:33:33.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile.am powermanga-0.90/data/levels/curves_phase/Makefile.am
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile.am	2007-07-13 07:31:50.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile.am	2007-09-04 16:33:19.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 
 dist_pkgdata_DATA = \
   curves_00.bin \
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile.in powermanga-0.90/data/levels/curves_phase/Makefile.in
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile.in	2007-09-04 16:33:27.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile powermanga-0.90/data/levels/grids_phase/Makefile
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile	2007-09-04 16:33:57.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile.am powermanga-0.90/data/levels/grids_phase/Makefile.am
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile.am	2007-07-13 08:22:53.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile.am	2007-09-04 16:33:44.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 
 dist_pkgdata_DATA = \
  grid_00.bin \
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile.in powermanga-0.90/data/levels/grids_phase/Makefile.in
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile.in	2007-09-04 16:33:51.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/Makefile powermanga-0.90/data/Makefile
--- powermanga-0.90.orig/data/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/Makefile	2007-09-04 16:17:22.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/Makefile.am powermanga-0.90/data/Makefile.am
--- powermanga-0.90.orig/data/Makefile.am	2007-07-13 09:07:28.000000000 +0200
+++ powermanga-0.90/data/Makefile.am	2007-09-04 16:16:54.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 
 dist_pkgdata_DATA = \
   menu_order_keystrokes.bin 
diff -Naupr powermanga-0.90.orig/data/Makefile.in powermanga-0.90/data/Makefile.in
--- powermanga-0.90.orig/data/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/Makefile.in	2007-09-04 16:17:12.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile powermanga-0.90/graphics/bitmap/fonts/Makefile
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile	2007-09-04 17:08:20.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.am powermanga-0.90/graphics/bitmap/fonts/Makefile.am
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.am	2007-07-13 22:38:33.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile.am	2007-09-04 17:08:28.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 
 dist_pkgdata_DATA = \
   font_big.spr \
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.in powermanga-0.90/graphics/bitmap/fonts/Makefile.in
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile.in	2007-09-04 17:08:40.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile powermanga-0.90/graphics/bitmap/Makefile
--- powermanga-0.90.orig/graphics/bitmap/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile	2007-09-04 16:29:15.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile.am powermanga-0.90/graphics/bitmap/Makefile.am
--- powermanga-0.90.orig/graphics/bitmap/Makefile.am	2007-07-14 09:19:18.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile.am	2007-09-04 16:28:59.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 
 dist_pkgdata_DATA = \
   main_menu.spr \
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile.in powermanga-0.90/graphics/bitmap/Makefile.in
--- powermanga-0.90.orig/graphics/bitmap/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile.in	2007-09-04 16:29:08.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/Makefile powermanga-0.90/graphics/Makefile
--- powermanga-0.90.orig/graphics/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/Makefile	2007-09-04 16:20:30.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/Makefile.am powermanga-0.90/graphics/Makefile.am
--- powermanga-0.90.orig/graphics/Makefile.am	2007-08-02 18:19:51.000000000 +0200
+++ powermanga-0.90/graphics/Makefile.am	2007-09-04 16:20:15.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 
 dist_pkgdata_DATA = \
   256_colors_palette.bin \
diff -Naupr powermanga-0.90.orig/graphics/Makefile.in powermanga-0.90/graphics/Makefile.in
--- powermanga-0.90.orig/graphics/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/Makefile.in	2007-09-04 16:20:23.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile powermanga-0.90/graphics/sprites/guardians/Makefile
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile	2007-09-04 16:31:11.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile.am powermanga-0.90/graphics/sprites/guardians/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile.am	2007-07-13 21:25:51.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile.am	2007-09-04 16:30:53.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 
 dist_pkgdata_DATA = \
   guardian_00.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile.in powermanga-0.90/graphics/sprites/guardians/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile.in	2007-09-04 16:31:05.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile powermanga-0.90/graphics/sprites/Makefile
--- powermanga-0.90.orig/graphics/sprites/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile	2007-09-04 16:30:28.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile.am powermanga-0.90/graphics/sprites/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/Makefile.am	2007-07-13 21:46:20.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile.am	2007-09-04 16:30:14.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 
 dist_pkgdata_DATA = \
   all_enemies.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile.in powermanga-0.90/graphics/sprites/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile.in	2007-09-04 16:30:21.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile powermanga-0.90/graphics/sprites/meteors/Makefile
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile	2007-09-04 16:31:39.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile.am powermanga-0.90/graphics/sprites/meteors/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile.am	2007-07-12 21:30:55.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile.am	2007-09-04 16:31:24.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 
 dist_pkgdata_DATA = \
   meteor_00.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile.in powermanga-0.90/graphics/sprites/meteors/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile.in	2007-09-04 16:31:32.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile powermanga-0.90/graphics/sprites/spaceships/Makefile
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile	2007-09-04 16:32:02.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.am powermanga-0.90/graphics/sprites/spaceships/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.am	2007-07-13 13:06:05.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile.am	2007-09-04 16:31:49.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 
 dist_pkgdata_DATA = \
   spaceship_1_frame_0.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.in powermanga-0.90/graphics/sprites/spaceships/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile.in	2007-09-04 16:31:55.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile powermanga-0.90/graphics/sprites/stars/Makefile
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile	2007-09-04 16:32:23.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile.am powermanga-0.90/graphics/sprites/stars/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile.am	2007-07-13 20:22:31.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile.am	2007-09-04 16:32:10.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 
 dist_pkgdata_DATA = \
   star_big_0.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile.in powermanga-0.90/graphics/sprites/stars/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile.in	2007-09-04 16:32:17.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/Makefile powermanga-0.90/Makefile
--- powermanga-0.90.orig/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/Makefile	2007-09-04 16:37:08.000000000 +0200
@@ -81,7 +81,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/Makefile.am powermanga-0.90/Makefile.am
--- powermanga-0.90.orig/Makefile.am	2007-08-13 08:43:21.000000000 +0200
+++ powermanga-0.90/Makefile.am	2007-09-04 16:36:19.000000000 +0200
@@ -2,6 +2,6 @@
 SUBDIRS = texts src graphics graphics/bitmap graphics/bitmap/fonts graphics/sprites graphics/sprites/guardians graphics/sprites/stars graphics/sprites/meteors graphics/sprites/spaceships data data/curves data/levels/curves_phase data/levels/grids_phase sounds sounds/handheld_console
 EXTRA_DIST = bootstrap
 
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 dist_pkgdata_DATA = powermanga.6
 
diff -Naupr powermanga-0.90.orig/Makefile.in powermanga-0.90/Makefile.in
--- powermanga-0.90.orig/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/Makefile.in	2007-09-04 16:37:00.000000000 +0200
@@ -81,7 +81,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile powermanga-0.90/sounds/handheld_console/Makefile
--- powermanga-0.90.orig/sounds/handheld_console/Makefile	2007-09-03 09:45:03.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile	2007-09-04 16:34:27.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile.am powermanga-0.90/sounds/handheld_console/Makefile.am
--- powermanga-0.90.orig/sounds/handheld_console/Makefile.am	2007-08-13 08:43:23.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile.am	2007-09-04 16:34:15.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 dist_pkgdata_DATA = \
   music_congratulations.ogg \
   music_game.ogg \
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile.in powermanga-0.90/sounds/handheld_console/Makefile.in
--- powermanga-0.90.orig/sounds/handheld_console/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile.in	2007-09-04 16:34:21.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/sounds/Makefile powermanga-0.90/sounds/Makefile
--- powermanga-0.90.orig/sounds/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/sounds/Makefile	2007-09-04 16:21:05.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/sounds/Makefile.am powermanga-0.90/sounds/Makefile.am
--- powermanga-0.90.orig/sounds/Makefile.am	2007-08-13 08:43:22.000000000 +0200
+++ powermanga-0.90/sounds/Makefile.am	2007-09-04 16:20:49.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 
 dist_pkgdata_DATA = \
   music_congratulations.zik \
diff -Naupr powermanga-0.90.orig/sounds/Makefile.in powermanga-0.90/sounds/Makefile.in
--- powermanga-0.90.orig/sounds/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/sounds/Makefile.in	2007-09-04 16:20:58.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/src/Makefile powermanga-0.90/src/Makefile
--- powermanga-0.90.orig/src/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/src/Makefile	2007-09-04 16:28:42.000000000 +0200
@@ -224,7 +224,7 @@ target_os = linux-gnu
 target_vendor = pc
 top_builddir = ..
 top_srcdir = ..
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
@@ -1271,13 +1271,13 @@ uninstall-am: uninstall-gamesPROGRAMS
 
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 # 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.
diff -Naupr powermanga-0.90.orig/src/Makefile.am powermanga-0.90/src/Makefile.am
--- powermanga-0.90.orig/src/Makefile.am	2007-08-31 22:46:43.000000000 +0200
+++ powermanga-0.90/src/Makefile.am	2007-09-04 16:27:50.000000000 +0200
@@ -1,5 +1,5 @@
 
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 
@@ -10,13 +10,13 @@ powermanga_CFLAGS = -DPREFIX=\"$(prefix)
 powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 
 if ASSEMBLY
diff -Naupr powermanga-0.90.orig/src/Makefile.in powermanga-0.90/src/Makefile.in
--- powermanga-0.90.orig/src/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/src/Makefile.in	2007-09-04 16:28:23.000000000 +0200
@@ -224,7 +224,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
@@ -1271,13 +1271,13 @@ uninstall-am: uninstall-gamesPROGRAMS
 
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 # 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.
diff -Naupr powermanga-0.90.orig/src/tools.c powermanga-0.90/src/tools.c
--- powermanga-0.90.orig/src/tools.c	2007-08-31 22:46:43.000000000 +0200
+++ powermanga-0.90/src/tools.c	2007-09-04 17:05:55.000000000 +0200
@@ -498,7 +498,7 @@ locate_data_file (const char *const name
 #else
   struct stat s;
 #endif
-  const char *subdir = "/share/games/powermanga/";
+  const char *subdir = "/share/powermanga/";
 
   if (name == NULL)
     {
diff -Naupr powermanga-0.90.orig/texts/Makefile powermanga-0.90/texts/Makefile
--- powermanga-0.90.orig/texts/Makefile	2007-09-03 09:45:03.000000000 +0200
+++ powermanga-0.90/texts/Makefile	2007-09-04 16:21:32.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/texts/Makefile.am powermanga-0.90/texts/Makefile.am
--- powermanga-0.90.orig/texts/Makefile.am	2007-07-13 13:24:49.000000000 +0200
+++ powermanga-0.90/texts/Makefile.am	2007-09-04 16:21:16.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 
 dist_pkgdata_DATA = \
   about_en.txt \
diff -Naupr powermanga-0.90.orig/texts/Makefile.in powermanga-0.90/texts/Makefile.in
--- powermanga-0.90.orig/texts/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/texts/Makefile.in	2007-09-04 16:21:24.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2006 15:38:49 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:55:43 -0000	1.4
@@ -1 +1 @@
-powermanga-0.80.tgz
+powermanga-0.90.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- powermanga.spec	22 Aug 2007 18:56:36 -0000	1.17
+++ powermanga.spec	5 Sep 2007 11:55:43 -0000	1.18
@@ -1,17 +1,22 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.80
-Release: 6
-License: GPLv2+
+Version: 0.90
+Release: 1
+License: GPLv3+
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
 Source2: powermanga.desktop
-Patch0: powermanga-0.80-install.patch
+Patch0: powermanga-0.90-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+BuildRequires: gawk
 BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: zlib-devel
+BuildRequires: libpng-devel
+BuildRequires: desktop-file-utils
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -25,7 +30,8 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
+# The original configure script sets that mandatory -std=c99
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -std=c99"
 
 
 %install
@@ -47,10 +53,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE2}
 
-# Workaround for the "texts" dir not being installed, although it's needed
-%{__mkdir_p} %{buildroot}%{_datadir}/powermanga/texts
-%{__install} -p -m 0644 texts/*.txt \
-    %{buildroot}%{_datadir}/powermanga/texts/
+# Default to English
 echo "Lang=en" > \
     %{buildroot}%{_datadir}/powermanga/texts/config.ini
 
@@ -83,6 +86,13 @@
 
 
 %changelog
+* Mon Sep  3 2007 Matthias Saou <http://freshrpms.net/> 0.90-1
+- Update to 0.90.
+- Update License field (changed to GPLv3+).
+- Update install patch, include fix for "fonts" directory.
+- No longer manually install texts, but install the config.ini.
+- Add gawk and libpng-devel build requirements.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.80-6
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2006 15:38:49 -0000	1.3
+++ sources	5 Sep 2007 11:55:43 -0000	1.4
@@ -1 +1 @@
-8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz
+0465ca49dc85e3943a06b3da7e0b92ad  powermanga-0.90.tgz


--- powermanga-0.80-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 12:00:49 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 08:00:49 -0400
Subject: rpms/python-twisted-mail/devel .cvsignore, 1.2,
	1.3 python-twisted-mail.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051200.l85C0npq010027@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935

Modified Files:
	.cvsignore python-twisted-mail.spec sources 
Log Message:
update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2007 10:17:00 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:00:16 -0000	1.3
@@ -1 +1 @@
-TwistedMail-0.3.0.tar.bz2
+TwistedMail-0.4.0.tar.bz2


Index: python-twisted-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/python-twisted-mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-mail.spec	4 Jan 2007 10:17:00 -0000	1.1
+++ python-twisted-mail.spec	5 Sep 2007 12:00:16 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedMail
 
 Name:           %{python}-twisted-mail
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted Mail library, server and client
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.3/TwistedMail-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.4/TwistedMail-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-names
 
 # a noarch-turned-arch package should not have debuginfo
@@ -75,6 +75,10 @@
 %{python_sitearch}/twisted/plugins/twisted_mail.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- new version
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-4
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 10:17:00 -0000	1.2
+++ sources	5 Sep 2007 12:00:16 -0000	1.3
@@ -1 +1 @@
-33667938b399ee5513c59b5d4087294b  TwistedMail-0.3.0.tar.bz2
+b2e1428b527333878434777f284f0e91  TwistedMail-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 12:01:03 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 08:01:03 -0400
Subject: rpms/python-twisted-mail/F-7 python-twisted-mail.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051201.l85C1323012620@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9958

Modified Files:
	python-twisted-mail.spec sources 
Log Message:
update to 0.4.0


Index: python-twisted-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/F-7/python-twisted-mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-mail.spec	4 Jan 2007 10:17:00 -0000	1.1
+++ python-twisted-mail.spec	5 Sep 2007 12:00:30 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedMail
 
 Name:           %{python}-twisted-mail
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted Mail library, server and client
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.3/TwistedMail-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.4/TwistedMail-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-names
 
 # a noarch-turned-arch package should not have debuginfo
@@ -75,6 +75,10 @@
 %{python_sitearch}/twisted/plugins/twisted_mail.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- new version
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-4
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 10:17:00 -0000	1.2
+++ sources	5 Sep 2007 12:00:30 -0000	1.3
@@ -1 +1 @@
-33667938b399ee5513c59b5d4087294b  TwistedMail-0.3.0.tar.bz2
+b2e1428b527333878434777f284f0e91  TwistedMail-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 12:06:06 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 5 Sep 2007 08:06:06 -0400
Subject: rpms/docbook-style-xsl/F-7 .cvsignore, 1.17,
	1.18 docbook-style-xsl.spec, 1.32, 1.33 sources, 1.17, 1.18
Message-ID: <200709051206.l85C66XW016276@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16205

Modified Files:
	.cvsignore docbook-style-xsl.spec sources 
Log Message:
new usptream version(fixes #277631)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Jan 2007 23:11:59 -0000	1.17
+++ .cvsignore	5 Sep 2007 12:05:32 -0000	1.18
@@ -1,14 +1,2 @@
-docbook-xsl-1.65.1.tar.gz
-docbook-xsl-1.66.1.tar.gz
-docbook-xsl-1.67.0.tar.gz
-docbook-xsl-1.67.2.tar.bz2
-docbook-xsl-1.68.0.tar.bz2
-docbook-xsl-1.68.1.tar.bz2
-docbook-xsl-1.69.0.tar.bz2
-docbook-xsl-doc-1.69.0.tar.bz2
-docbook-xsl-1.69.1.tar.bz2
-docbook-xsl-doc-1.69.1.tar.bz2
-docbook-xsl-1.71.1.tar.bz2
-docbook-xsl-doc-1.71.1.tar.bz2
-docbook-xsl-1.72.0.tar.gz
-docbook-xsl-doc-1.72.0.tar.bz2
+docbook-xsl-doc-1.73.2.tar.bz2
+docbook-xsl-1.73.2.tar.gz


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-style-xsl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- docbook-style-xsl.spec	24 Jan 2007 12:56:26 -0000	1.32
+++ docbook-style-xsl.spec	5 Sep 2007 12:05:32 -0000	1.33
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.72.0
-Release: 2%{?dist}
+Version: 1.73.2
+Release: 1%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
+- new upstream(required for fix of #277631
+
 * Wed Jan 24 2007 Tomas Mraz <tmraz at redhat.com> 1.72.0-2
 - Install missing *.ent from common.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Jan 2007 23:11:59 -0000	1.17
+++ sources	5 Sep 2007 12:05:32 -0000	1.18
@@ -1,2 +1,2 @@
-3493dd2e82e0da3d3cab58d5263c634c  docbook-xsl-1.72.0.tar.gz
-f6b71552c992f16f477f0513f569985c  docbook-xsl-doc-1.72.0.tar.bz2
+d41ce59b783b60383cca765902a41039  docbook-xsl-doc-1.73.2.tar.bz2
+7dd72a38c7d25e1396fa26b6ee53eae9  docbook-xsl-1.73.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:35:49 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:35:49 -0400
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051235.l85CZnSE017045@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:00:35 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:35:16 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:00:35 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:35:16 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:00:35 -0000	1.2
+++ sources	5 Sep 2007 12:35:16 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:38:47 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:38:47 -0400
Subject: rpms/audio-convert-mod/F-7 .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051238.l85Cclgg017180@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17154

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:07:24 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:38:14 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:07:24 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:38:14 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:07:24 -0000	1.2
+++ sources	5 Sep 2007 12:38:14 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:41:16 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Wed, 5 Sep 2007 08:41:16 -0400
Subject: rpms/pavucontrol/devel pavucontrol.spec,1.3,1.4
Message-ID: <200709051241.l85CfGPj017274@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17254/devel

Modified Files:
	pavucontrol.spec 
Log Message:
Add versioned dependency on pulseaudio-libs


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pavucontrol.spec	5 Sep 2007 00:30:52 -0000	1.3
+++ pavucontrol.spec	5 Sep 2007 12:40:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.2.svn20070905%{?dist}
+Release:        0.3.svn20070905%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:  pulseaudio-lib-devel gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
+Requires:	pulseaudio-lib >= 0.9.7-0.10
 
 %description
 PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
@@ -53,6 +54,9 @@
 
 
 %changelog
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.3.svn20070905
+- Add versioned dependency on pulseaudio-libs
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.2.svn20070905
 - Update from SVN snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep  5 12:42:35 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:42:35 -0400
Subject: rpms/audio-convert-mod/FC-6 .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051242.l85CgZOU017320@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17290

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:07:49 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:42:03 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:07:49 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:42:03 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:07:49 -0000	1.2
+++ sources	5 Sep 2007 12:42:03 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:43:12 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Wed, 5 Sep 2007 08:43:12 -0400
Subject: rpms/pavucontrol/devel pavucontrol.spec,1.4,1.5
Message-ID: <200709051243.l85ChCHr017390@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17362

Modified Files:
	pavucontrol.spec 
Log Message:
make build-time dependency versioned, too


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pavucontrol.spec	5 Sep 2007 12:40:43 -0000	1.4
+++ pavucontrol.spec	5 Sep 2007 12:42:39 -0000	1.5
@@ -10,7 +10,8 @@
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-lib-devel gtkmm24-devel libglademm24-devel
+BuildRequires:  pulseaudio-lib-devel >= 0.9.7-0.10
+BuildRequires:  gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
 Requires:	pulseaudio-lib >= 0.9.7-0.10



From fedora-extras-commits at redhat.com  Wed Sep  5 12:46:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 08:46:36 -0400
Subject: rpms/ppracer/devel ppracer.spec,1.19,1.20
Message-ID: <200709051246.l85Ckaef017485@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17467

Modified Files:
	ppracer.spec 
Log Message:
change license to GPLv2+



Index: ppracer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ppracer.spec	14 Feb 2007 14:29:59 -0000	1.19
+++ ppracer.spec	5 Sep 2007 12:46:03 -0000	1.20
@@ -7,8 +7,8 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 10%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2+
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +94,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 0.3.1-11
+- change license to GPLv2+
+
 * Wed Feb 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.3.1-10
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep  5 12:47:06 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 05 Sep 2007 05:47:06 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709051247.l85Cl6R3015211@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kaffeine (Fedora devel) to Approved for Mary Ellen Foster (mef)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 12:47:07 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 05 Sep 2007 05:47:07 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709051247.l85Cl7U9015220@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kaffeine (Fedora devel) to Approved for Mary Ellen Foster (mef)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 12:52:14 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 08:52:14 -0400
Subject: devel/squashfs-tools squashfs-tools.spec,1.14,1.15
Message-ID: <200709051252.l85CqEDq017611@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/squashfs-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17586

Modified Files:
	squashfs-tools.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2-2
- fixes from package review (#226430)



Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/squashfs-tools/squashfs-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- squashfs-tools.spec	4 Sep 2007 00:09:45 -0000	1.14
+++ squashfs-tools.spec	5 Sep 2007 12:51:42 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 3.2
-Release: 1
+Release: 2
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
@@ -41,6 +41,9 @@
 %{_sbindir}/unsquashfs
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2-2
+- fixes from package review (#226430)
+
 * Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1
 - update to 3.2r2
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:00:16 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:00:16 -0400
Subject: rpms/python-twisted-news/devel .cvsignore, 1.2,
	1.3 python-twisted-news.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051300.l85D0GmU017918@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-news/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17863

Modified Files:
	.cvsignore python-twisted-news.spec sources 
Log Message:
updated to 0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2007 11:26:54 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:59:43 -0000	1.3
@@ -1 +1 @@
-TwistedNews-0.2.0.tar.bz2
+TwistedNews-0.3.0.tar.bz2


Index: python-twisted-news.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/python-twisted-news.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-news.spec	4 Jan 2007 11:26:54 -0000	1.1
+++ python-twisted-news.spec	5 Sep 2007 12:59:43 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNews
 
 Name:           %{python}-twisted-news
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Twisted News is an NNTP server and programming library
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.2/TwistedNews-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.3/TwistedNews-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-mail
 
 # a noarch-turned-arch package should not have debuginfo
@@ -63,6 +63,10 @@
 %{python_sitearch}/twisted/plugins/twisted_news.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.3.0-1
+- update to latest release
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 11:26:54 -0000	1.2
+++ sources	5 Sep 2007 12:59:43 -0000	1.3
@@ -1 +1 @@
-62a93645867bacad4a4ca4d45e9ce090  TwistedNews-0.2.0.tar.bz2
+cacbebf47882e57ca04d5c2ec3601830  TwistedNews-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:00:21 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:00:21 -0400
Subject: rpms/python-twisted-news/F-7 python-twisted-news.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051300.l85D0LCW017956@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-news/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886

Modified Files:
	python-twisted-news.spec sources 
Log Message:
update to 0.3.0


Index: python-twisted-news.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/F-7/python-twisted-news.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-news.spec	4 Jan 2007 11:26:54 -0000	1.1
+++ python-twisted-news.spec	5 Sep 2007 12:59:49 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNews
 
 Name:           %{python}-twisted-news
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Twisted News is an NNTP server and programming library
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.2/TwistedNews-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.3/TwistedNews-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-mail
 
 # a noarch-turned-arch package should not have debuginfo
@@ -63,6 +63,10 @@
 %{python_sitearch}/twisted/plugins/twisted_news.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.3.0-1
+- update to latest release
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 11:26:54 -0000	1.2
+++ sources	5 Sep 2007 12:59:49 -0000	1.3
@@ -1 +1 @@
-62a93645867bacad4a4ca4d45e9ce090  TwistedNews-0.2.0.tar.bz2
+cacbebf47882e57ca04d5c2ec3601830  TwistedNews-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:02:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 09:02:40 -0400
Subject: rpms/bzflag/devel bzflag.spec,1.30,1.31
Message-ID: <200709051302.l85D2eTc023982@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23946

Modified Files:
	bzflag.spec 
Log Message:
change license tag from LGPL to LGPLv2, the licensing is a bit ambigious about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to clarify this: http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248



Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bzflag.spec	22 Jun 2007 21:09:45 -0000	1.30
+++ bzflag.spec	5 Sep 2007 13:02:06 -0000	1.31
@@ -16,8 +16,8 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.8
-Release: 4%{?dist}
-License: LGPL
+Release: 5%{?dist}
+License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
@@ -96,6 +96,12 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-5
+- change license tag from LGPL to LGPLv2, the licensing is a bit ambigious
+  about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to
+  clarify this:
+  http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248
+
 * Fri Jun 22 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license tag from GPL to LGPL
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:04:45 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 5 Sep 2007 09:04:45 -0400
Subject: rpms/ejabberd/devel .cvsignore, 1.4, 1.5 ejabberd.spec, 1.13,
	1.14 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709051304.l85D4jGe024093@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24065

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:21:08 -0000	1.4
+++ .cvsignore	5 Sep 2007 13:04:12 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ejabberd.spec	4 Sep 2007 12:26:54 -0000	1.13
+++ ejabberd.spec	5 Sep 2007 13:04:12 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 14:03:27 -0000	1.2
+++ mod_ctlextra.erl	5 Sep 2007 13:04:12 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:21:08 -0000	1.4
+++ sources	5 Sep 2007 13:04:12 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 13:50:03 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 09:50:03 -0400
Subject: rpms/rsync/devel rsync-2.6.9-hlink-segv.patch, NONE, 1.1 rsync.spec,
	1.42, 1.43
Message-ID: <200709051350.l85Do3Qe025246@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.9-hlink-segv.patch 
Log Message:

Fix bug 244564



rsync-2.6.9-hlink-segv.patch:

--- NEW FILE rsync-2.6.9-hlink-segv.patch ---
--- rsync-2.6.9-orig/hlink.c	2007-06-17 11:51:28.000000000 +0200
+++ rsync-2.6.9/hlink.c	2007-06-17 11:58:22.000000000 +0200
@@ -315,6 +315,9 @@ void hard_link_cluster(struct file_struc
 		if (file->F_HLINDEX != SKIPPED_LINK)
 			continue;
 		hlink2 = f_name(file, NULL);
+#ifdef SUPPORT_ACLS
+		sx.acc_acl = sx.def_acl = NULL;
+#endif
 		statret = link_stat(hlink2, &sx.st, 0);
 		maybe_hard_link(file, ndx, hlink2, statret, &sx,
 				hlink1, &st, itemizing, code);


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.spec	19 Feb 2007 23:12:06 -0000	1.42
+++ rsync.spec	5 Sep 2007 13:49:27 -0000	1.43
@@ -1,17 +1,18 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
+Patch2: rsync-2.6.9-hlink-segv.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
-License: GPL
+License: GPLv2+
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -29,6 +30,7 @@
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 %patch1 -p1 -b .acl_xattrs_bug
+%patch2 -p1 -b .hlink_segv
 
 %build
 rm -fr autom4te.cache
@@ -58,6 +60,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc8
+- Add patch to fix crash bug with hardlinks and ACLs patches
+
 * Mon Feb 19 2007 Adam Jackson <ajax at redhat.com> 2.6.9-2
 - Add dist tag to Release to fix upgrades from FC5 or FC6.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:50:50 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Wed, 5 Sep 2007 09:50:50 -0400
Subject: rpms/revisor/devel revisor.spec,1.21,1.22 sources,1.24,1.25
Message-ID: <200709051350.l85DooQO025326@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256/devel

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-1rc6



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- revisor.spec	30 Aug 2007 12:38:42 -0000	1.21
+++ revisor.spec	5 Sep 2007 13:50:17 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc5%{?dist}
+Release: 1rc6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -17,15 +17,15 @@
 # Translation
 Requires: rhpl
 # Kickstart
-Requires: system-config-kickstart, pykickstart > 0.43
+Requires: system-config-kickstart, pykickstart
 # Compose tools
-Requires: pungi, livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
 Requires: notify-python
 Requires: usermode
 Requires: pam
 # At least these requirements are invalid for EPEL
-Requires: python >= 2.5
+Requires: python >= 2.4
 Requires: fedora-release >= 7
 BuildArch: noarch
 ExcludeArch: ppc ppc64
@@ -170,7 +170,9 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Thu Aug 30 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc5
+* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+- Removed pungi dependency
+- Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5
 - Split comps in their own package
 - Add rebrand module


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Aug 2007 12:38:42 -0000	1.24
+++ sources	5 Sep 2007 13:50:17 -0000	1.25
@@ -1 +1 @@
-664dd74d6f0084d557c746e550edcea8  revisor-2.0.4.3.tar.gz
+cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 13:52:03 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Wed, 5 Sep 2007 09:52:03 -0400
Subject: rpms/revisor/F-7 revisor.spec,1.15,1.16 sources,1.16,1.17
Message-ID: <200709051352.l85Dq3I0025452@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25392/F-7

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-1rc6



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/revisor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- revisor.spec	30 Aug 2007 12:45:01 -0000	1.15
+++ revisor.spec	5 Sep 2007 13:51:30 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc5%{?dist}
+Release: 1rc6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -17,15 +17,15 @@
 # Translation
 Requires: rhpl
 # Kickstart
-Requires: system-config-kickstart, pykickstart > 0.43
+Requires: system-config-kickstart, pykickstart
 # Compose tools
-Requires: pungi, livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
 Requires: notify-python
 Requires: usermode
 Requires: pam
 # At least these requirements are invalid for EPEL
-Requires: python >= 2.5
+Requires: python >= 2.4
 Requires: fedora-release >= 7
 BuildArch: noarch
 ExcludeArch: ppc ppc64
@@ -170,7 +170,9 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Thu Aug 30 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc5
+* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+- Removed pungi dependency
+- Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5
 - Split comps in their own package
 - Add rebrand module


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 12:45:01 -0000	1.16
+++ sources	5 Sep 2007 13:51:30 -0000	1.17
@@ -1 +1 @@
-664dd74d6f0084d557c746e550edcea8  revisor-2.0.4.3.tar.gz
+cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 13:52:57 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:52:57 -0400
Subject: rpms/python-twisted-words/devel .cvsignore, 1.2,
	1.3 python-twisted-words.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051352.l85DqvRp025602@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-words/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517

Modified Files:
	.cvsignore python-twisted-words.spec sources 
Log Message:
update to 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Dec 2006 23:19:24 -0000	1.2
+++ .cvsignore	5 Sep 2007 13:52:24 -0000	1.3
@@ -1 +1 @@
-TwistedWords-0.4.0.tar.bz2
+TwistedWords-0.5.0.tar.bz2


Index: python-twisted-words.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/python-twisted-words.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-words.spec	28 Dec 2006 23:19:24 -0000	1.1
+++ python-twisted-words.spec	5 Sep 2007 13:52:24 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedWords
 
 Name:           %{python}-twisted-words
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Twisted Words contains Instant Messaging implementations
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.4/TwistedWords-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.5/TwistedWords-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -74,6 +74,10 @@
 %{python_sitearch}/twisted/plugins/twisted_words.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.5.0-1
+- updated to latest version
+
 * Wed Dec 27 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.4.0-3
 - BR python-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Dec 2006 23:19:24 -0000	1.2
+++ sources	5 Sep 2007 13:52:24 -0000	1.3
@@ -1 +1 @@
-37d34da233aefe4a7a41b97bc9222b6a  TwistedWords-0.4.0.tar.bz2
+7004f93a2358abe093bed55c2fff25ef  TwistedWords-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:53:06 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:53:06 -0400
Subject: rpms/python-twisted-words/F-7 python-twisted-words.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051353.l85Dr6OJ025643@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-words/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547

Modified Files:
	python-twisted-words.spec sources 
Log Message:
update to 0.5.0


Index: python-twisted-words.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/F-7/python-twisted-words.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-words.spec	28 Dec 2006 23:19:24 -0000	1.1
+++ python-twisted-words.spec	5 Sep 2007 13:52:34 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedWords
 
 Name:           %{python}-twisted-words
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Twisted Words contains Instant Messaging implementations
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.4/TwistedWords-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.5/TwistedWords-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -74,6 +74,10 @@
 %{python_sitearch}/twisted/plugins/twisted_words.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.5.0-1
+- updated to latest version
+
 * Wed Dec 27 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.4.0-3
 - BR python-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Dec 2006 23:19:24 -0000	1.2
+++ sources	5 Sep 2007 13:52:34 -0000	1.3
@@ -1 +1 @@
-37d34da233aefe4a7a41b97bc9222b6a  TwistedWords-0.4.0.tar.bz2
+7004f93a2358abe093bed55c2fff25ef  TwistedWords-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:57:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 09:57:27 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.4, 1.5
Message-ID: <200709051357.l85DvRap025836@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25783

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:56:54 -0000	1.5
@@ -2,7 +2,7 @@
 Version: 	0.63
 Release: 	5%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:59:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 09:59:34 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/F-7 perl-ExtUtils-AutoInstall.spec,
	1.4, 1.5
Message-ID: <200709051359.l85DxYqM025954@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25931

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:59:01 -0000	1.5
@@ -2,7 +2,7 @@
 Version: 	0.63
 Release: 	5%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:01:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:01:44 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.5, 1.6
Message-ID: <200709051401.l85E1iss031970@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31668

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
bump release.


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:56:54 -0000	1.5
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:01:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Wed Sep  5 14:03:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:03:32 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/F-7 perl-ExtUtils-AutoInstall.spec,
	1.5, 1.6
Message-ID: <200709051403.l85E3W0p032093@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32058

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
bump release.


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:59:01 -0000	1.5
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:02:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Wed Sep  5 14:04:40 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 10:04:40 -0400
Subject: rpms/rsync/F-7 rsync-2.6.9-hlink-segv.patch, NONE, 1.1 rsync.spec, 
	1.42, 1.43
Message-ID: <200709051404.l85E4enP032243@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32156

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.9-hlink-segv.patch 
Log Message:
* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc7
- Add patch to fix crash bug with hardlinks and ACLs patches


rsync-2.6.9-hlink-segv.patch:

--- NEW FILE rsync-2.6.9-hlink-segv.patch ---
--- rsync-2.6.9-orig/hlink.c	2007-06-17 11:51:28.000000000 +0200
+++ rsync-2.6.9/hlink.c	2007-06-17 11:58:22.000000000 +0200
@@ -315,6 +315,9 @@ void hard_link_cluster(struct file_struc
 		if (file->F_HLINDEX != SKIPPED_LINK)
 			continue;
 		hlink2 = f_name(file, NULL);
+#ifdef SUPPORT_ACLS
+		sx.acc_acl = sx.def_acl = NULL;
+#endif
 		statret = link_stat(hlink2, &sx.st, 0);
 		maybe_hard_link(file, ndx, hlink2, statret, &sx,
 				hlink1, &st, itemizing, code);


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-7/rsync.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.spec	19 Feb 2007 23:12:06 -0000	1.42
+++ rsync.spec	5 Sep 2007 14:04:07 -0000	1.43
@@ -1,17 +1,18 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
+Patch2: rsync-2.6.9-hlink-segv.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
-License: GPL
+License: GPLv2+
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -29,6 +30,7 @@
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 %patch1 -p1 -b .acl_xattrs_bug
+%patch2 -p1 -b .hlink_segv
 
 %build
 rm -fr autom4te.cache
@@ -58,6 +60,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc7
+- Add patch to fix crash bug with hardlinks and ACLs patches
+
 * Mon Feb 19 2007 Adam Jackson <ajax at redhat.com> 2.6.9-2
 - Add dist tag to Release to fix upgrades from FC5 or FC6.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:05:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:05:00 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/FC-6 perl-ExtUtils-AutoInstall.spec, 
	1.4, 1.5
Message-ID: <200709051405.l85E50En032260@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32223

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/FC-6/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:04:26 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:23:53 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 10:23:53 -0400
Subject: devel/fedora-logos fedora-logos.spec,1.79,1.80
Message-ID: <200709051423.l85ENrfD000360@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/fedora-logos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv328

Modified Files:
	fedora-logos.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
- merge back changes that got lost



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/devel/fedora-logos/fedora-logos.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- fedora-logos.spec	31 Aug 2007 15:48:07 -0000	1.79
+++ fedora-logos.spec	5 Sep 2007 14:23:21 -0000	1.80
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 7.92.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 Source1: infinity-grub.xpm.gz
@@ -22,10 +22,7 @@
 Conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
-# for /usr/share/icons/Bluecurve
-Requires: redhat-artwork
-# for /usr/share/icons/hicolor
-Requires: hicolor-icon-theme
+Requires(post): coreutils
 
 %description
 The fedora-logos package (the "Packages") contain image files which
@@ -161,9 +158,24 @@
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
+for i in 16 24 32 36 48 96; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
+  cp $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places/start-here.png
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/Bluecurve || :
+touch --no-create %{_datadir}/icons/Fedora || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Bluecurve || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Fedora || :
+fi
+
 %files
 %defattr(-, root, root)
 %doc COPYING
@@ -177,11 +189,15 @@
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/Bluecurve/*/apps/*
+%{_datadir}/icons/Fedora/*/places/*
 %{_datadir}/gnome-screensaver/*
 %{_datadir}/applications/screensavers/*
 #%{_datadir}/backgrounds/images/*
 #%{_datadir}/gnome-background-properties/*.xml
-
+# we multi-own these directories, so as not to require the packages that
+# provide them, thereby dragging in excess dependencies.
+%{_datadir}/icons/Bluecurve
+%{_datadir}/icons/hicolor
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh
 /usr/lib/anaconda-runtime/*.jpg
@@ -190,6 +206,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
+- merge back changes that got lost
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-3
 - fix grub splash image to be an actual image
 
@@ -209,6 +228,19 @@
   (requested by Paul Frields)
 - update license field to be more clear
 
+* Wed Jul 04 2007 Florian La Roche <laroche at redhat.com> 6.0.98-5
+- require coreutils for the %%post script
+
+* Fri Jun 15 2007 Adam Jackson <ajax at redhat.com> 6.0.98-4
+- Remove the Requires on redhat-artwork and fedora-icon-theme, and just
+  multi-own the directories.  Fixes some hilarious dependency chains.
+
+* Mon Apr 23 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-3
+- Clean up %%post scriptlet (#237428)
+
+* Fri Apr 20 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-2
+- Add a Fedora icon theme
+
 * Thu Apr 05 2007 Than Ngo <than at redhat.com> - 6.0.98-1
 - fix ksplash BlueCurve theme
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:25:24 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 10:25:24 -0400
Subject: rpms/rsync/devel rsync.spec,1.43,1.44
Message-ID: <200709051425.l85EPOj6000445@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410

Modified Files:
	rsync.spec 
Log Message:

F8 requires an explicit popt-devel in BuildRequires now




Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rsync.spec	5 Sep 2007 13:49:27 -0000	1.43
+++ rsync.spec	5 Sep 2007 14:24:52 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
@@ -9,7 +9,7 @@
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
 Patch2: rsync-2.6.9-hlink-segv.patch
-BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
+BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPLv2+



From fedora-extras-commits at redhat.com  Wed Sep  5 14:50:22 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 5 Sep 2007 10:50:22 -0400
Subject: rpms/evolution/devel evolution.spec,1.286,1.287
Message-ID: <200709051450.l85EoMcF001157@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1128

Modified Files:
	evolution.spec 
Log Message:
Add a reminder comment for myself.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- evolution.spec	4 Sep 2007 05:05:26 -0000	1.286
+++ evolution.spec	5 Sep 2007 14:49:49 -0000	1.287
@@ -694,6 +694,9 @@
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
+# Look into re-enabling the inline-audio plugin once 2.12 ships.
+# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
+
 %changelog
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92



From fedora-extras-commits at redhat.com  Wed Sep  5 15:02:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:02:01 -0400
Subject: rpms/gkrellm/devel gkrellm.spec,1.10,1.11 gkrellmd.init,1.1,1.2
Message-ID: <200709051502.l85F210x007319@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7277

Modified Files:
	gkrellm.spec gkrellmd.init 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
- Rewrite gkrellmd init script: better LSB compliance, hddtemp
  interoperability, avoidance of X error messages, general cleanup.



Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gkrellm.spec	4 Sep 2007 16:57:14 -0000	1.10
+++ gkrellm.spec	5 Sep 2007 15:01:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
+- Rewrite gkrellmd init script: better LSB compliance, hddtemp
+  interoperability, avoidance of X error messages, general cleanup.
+
 * Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
 - Fix gnutls detection/build and use it instead of openssl.
 - Sync user and group creation with current Fedora guidelines.


Index: gkrellmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellmd.init	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellmd.init	5 Sep 2007 15:01:26 -0000	1.2
@@ -6,53 +6,70 @@
 # processname: gkrellmd
 # config: /etc/gkrellmd.conf
 
+### BEGIN INIT INFO
+# Provides: gkrellmd
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: hddtemp
+# Should-Stop: hddtemp
+# Short-Description: GNU Krell Monitors Server
+### END INIT INFO
+
 # source function library
 . /etc/rc.d/init.d/functions
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-# The process must be configured first.
-[ -f /etc/gkrellmd.conf ] || exit 0
-
-RETVAL=0
-
-prog="gkrellmd"
+exec=/usr/sbin/gkrellmd
+prog=${exec##*/}
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    if [ -f /etc/gkrellmd.conf ] ; then
+        echo -n $"Starting GNU Krell Monitors server ($prog): "
+        DISPLAY= daemon --user gkrellmd $exec -d
+        rv=$?
+        echo
+    else
+        action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false
+        rv=6
+    fi
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop() {
+    echo -n $"Stopping GNU Krell Monitors server ($prog): "
+    killproc $prog
+    rv=$?
+    [ $rv -eq 0 ] && rm -f $lockfile
+    echo
+    return $rv
+}
+
+restart() {
+    stop
+    start
+}
 
 case "$1" in
-  start)
-	echo -n $"Starting $prog: "
-        daemon --user gkrellmd /usr/sbin/gkrellmd -d
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd
-	echo
-	;;
-  stop)
-	echo -n $"Shutting down $prog: "
-	killproc gkrellmd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd
-	echo
-	;;
-  restart|reload|force-reload)
-        $0 stop
-        $0 start
-	RETVAL=$?
+    start|stop|restart)
+        $1
         ;;
-  condrestart|try-restart)
-        if [ -f /var/lock/subsys/gkrellmd ]; then
-                $0 stop
-		$0 start
+    force-reload)
+        restart
+        ;;
+    status)
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
         fi
-	RETVAL=$?
         ;;
-  status)
-        status gkrellmd
-	RETVAL=$?
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL



From fedora-extras-commits at redhat.com  Wed Sep  5 15:20:07 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:20:07 -0400
Subject: rpms/xsane/devel xsane.spec,1.48,1.49
Message-ID: <200709051520.l85FK7dD007957@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935

Modified Files:
	xsane.spec 
Log Message:
change license to GPLv2+



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xsane.spec	24 Apr 2007 11:52:54 -0000	1.48
+++ xsane.spec	5 Sep 2007 15:19:35 -0000	1.49
@@ -11,7 +11,7 @@
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
 Patch3: xsane-0.994-showeulaonce.patch
-License: GPL
+License: GPLv2+
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@@ -117,6 +117,9 @@
 fi
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+- change license to GPLv2+
+
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3
 - don't include obsolete Application category in desktop file (#226658)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 15:28:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:28:29 -0400
Subject: rpms/xsane/devel xsane.spec,1.49,1.50
Message-ID: <200709051528.l85FSTY7008163@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8133

Modified Files:
	xsane.spec 
Log Message:
fix changelog date



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xsane.spec	5 Sep 2007 15:19:35 -0000	1.49
+++ xsane.spec	5 Sep 2007 15:27:57 -0000	1.50
@@ -117,7 +117,7 @@
 fi
 
 %changelog
-* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
 - change license to GPLv2+
 
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3



From fedora-extras-commits at redhat.com  Wed Sep  5 15:29:19 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:29:19 -0400
Subject: rpms/ufraw/devel ufraw.spec,1.25,1.26
Message-ID: <200709051529.l85FTJYx008224@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8202

Modified Files:
	ufraw.spec 
Log Message:
change license to GPLv2



Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ufraw.spec	6 Aug 2007 07:52:48 -0000	1.25
+++ ufraw.spec	5 Sep 2007 15:28:46 -0000	1.26
@@ -20,9 +20,9 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
-License: GPL
+License: GPLv2
 URL: http://ufraw.sourceforge.net
 Source0: http://dl.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
@@ -165,6 +165,9 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.12-2
+- change license to GPLv2
+
 * Mon Aug 06 2007 Nils Philippsen <nphilipp at redhat.com> - 0.12-1
 - version 0.12
 - drop obsolete exiv2, cmserrorhandler patches



From fedora-extras-commits at redhat.com  Wed Sep  5 15:33:01 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 5 Sep 2007 11:33:01 -0400
Subject: rpms/bacula/devel bacula.spec,1.3,1.4
Message-ID: <200709051533.l85FX1wQ008418@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8388

Modified Files:
	bacula.spec 
Log Message:
* Wed Sep 5 2007 Andreas Thienemann <andreas at bawue.net> - 2.0.3-11
- Remove spooldir in client, fixing #251879
- Remove dependency on libtermcap, fixing #251158



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula.spec	29 Aug 2007 04:19:10 -0000	1.3
+++ bacula.spec	5 Sep 2007 15:32:29 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -38,7 +38,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
 BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
-BuildRequires: libtermcap-devel, gtk2-devel, libgnomeui-devel, GConf2-devel
+BuildRequires: gtk2-devel, libgnomeui-devel, GConf2-devel
 BuildRequires: glibc-devel, ORBit2-devel, libart_lgpl-devel, freetype-devel
 BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
 BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
@@ -355,6 +355,8 @@
 # Shell function to configure and build a Bacula tree
 build() {
 cp -rl ../bacula-%{version}/* .
+export CFLAGS=-I%{_includedir}/ncurses
+export CPPFLAGS=-I%{_includedir}/ncurses
 %configure \
 	--sysconfdir=%{_sysconfdir}/bacula \
 	--with-dir-user=bacula \
@@ -743,7 +745,6 @@
 %{_sbindir}/bacula-fd
 %{_initrddir}/bacula-fd
 %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
-%dir %{_localstatedir}/spool/bacula
 %{_mandir}/man8/bacula-fd.8*
 
 
@@ -919,6 +920,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Andreas Thienemann <andreas at bawue.net> - 2.0.3-11
+- Remove spooldir in client, fixing #251879
+- Remove dependency on libtermcap, fixing #251158
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.3-10
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 15:34:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:34:28 -0400
Subject: rpms/gkrellm/EL-5 gkrellmd.init,1.1,1.2 gkrellm.spec,1.6,1.7
Message-ID: <200709051534.l85FYSXh008473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8448

Modified Files:
	gkrellmd.init gkrellm.spec 
Log Message:
Resync with devel


Index: gkrellmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellmd.init	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellmd.init	5 Sep 2007 15:33:56 -0000	1.2
@@ -6,53 +6,70 @@
 # processname: gkrellmd
 # config: /etc/gkrellmd.conf
 
+### BEGIN INIT INFO
+# Provides: gkrellmd
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: hddtemp
+# Should-Stop: hddtemp
+# Short-Description: GNU Krell Monitors Server
+### END INIT INFO
+
 # source function library
 . /etc/rc.d/init.d/functions
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-# The process must be configured first.
-[ -f /etc/gkrellmd.conf ] || exit 0
-
-RETVAL=0
-
-prog="gkrellmd"
+exec=/usr/sbin/gkrellmd
+prog=${exec##*/}
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    if [ -f /etc/gkrellmd.conf ] ; then
+        echo -n $"Starting GNU Krell Monitors server ($prog): "
+        DISPLAY= daemon --user gkrellmd $exec -d
+        rv=$?
+        echo
+    else
+        action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false
+        rv=6
+    fi
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop() {
+    echo -n $"Stopping GNU Krell Monitors server ($prog): "
+    killproc $prog
+    rv=$?
+    [ $rv -eq 0 ] && rm -f $lockfile
+    echo
+    return $rv
+}
+
+restart() {
+    stop
+    start
+}
 
 case "$1" in
-  start)
-	echo -n $"Starting $prog: "
-        daemon --user gkrellmd /usr/sbin/gkrellmd -d
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd
-	echo
-	;;
-  stop)
-	echo -n $"Shutting down $prog: "
-	killproc gkrellmd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd
-	echo
-	;;
-  restart|reload|force-reload)
-        $0 stop
-        $0 start
-	RETVAL=$?
+    start|stop|restart)
+        $1
         ;;
-  condrestart|try-restart)
-        if [ -f /var/lock/subsys/gkrellmd ]; then
-                $0 stop
-		$0 start
+    force-reload)
+        restart
+        ;;
+    status)
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
         fi
-	RETVAL=$?
         ;;
-  status)
-        status gkrellmd
-	RETVAL=$?
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm.spec	4 Sep 2007 18:24:44 -0000	1.6
+++ gkrellm.spec	5 Sep 2007 15:33:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
+- Rewrite gkrellmd init script: better LSB compliance, hddtemp
+  interoperability, avoidance of X error messages, general cleanup.
+
 * Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
 - Fix gnutls detection/build and use it instead of openssl.
 - Sync user and group creation with current Fedora guidelines.



From fedora-extras-commits at redhat.com  Wed Sep  5 15:36:28 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 11:36:28 -0400
Subject: devel/anaconda .cvsignore, 1.442, 1.443 anaconda.spec, 1.578,
	1.579 sources, 1.570, 1.571
Message-ID: <200709051536.l85FaSic008533@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8510

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
- Make sure we find out about all nics (dcantrell)
- Hard drive install fixing (clumens, #287241)
- Make sure iniparse is in the image (notting, #276941)
- Add the short hostname to the localhost entry (dcantrell, #253979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- .cvsignore	4 Sep 2007 21:40:38 -0000	1.442
+++ .cvsignore	5 Sep 2007 15:35:55 -0000	1.443
@@ -1,2 +1 @@
-anaconda-11.3.0.26.tar.bz2
-anaconda-11.3.0.27.tar.bz2
+anaconda-11.3.0.28.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- anaconda.spec	4 Sep 2007 21:40:38 -0000	1.578
+++ anaconda.spec	5 Sep 2007 15:35:55 -0000	1.579
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.27
+Version: 11.3.0.28
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
+- Make sure we find out about all nics (dcantrell)
+- Hard drive install fixing (clumens, #287241)
+- Make sure iniparse is in the image (notting, #276941)
+- Add the short hostname to the localhost entry (dcantrell, #253979)
+
 * Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 11.3.0.27-1
 - Honor hostname= command line option (dcantrell, #186560).
 - Set the hostname if provided by the user or by DHCP (dcantrell, #180451).


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- sources	4 Sep 2007 21:40:38 -0000	1.570
+++ sources	5 Sep 2007 15:35:55 -0000	1.571
@@ -1 +1 @@
-1a854b0ef23af7429158c1f8e2198541  anaconda-11.3.0.27.tar.bz2
+9e00bb0aebbbe4e388a77e3dcec5866d  anaconda-11.3.0.28.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 15:57:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:57:17 -0400
Subject: rpms/gkrellm/EL-5 gkrellm-2.3.0-sensorscheck.patch, NONE,
	1.1 gkrellm.spec, 1.7, 1.8
Message-ID: <200709051557.l85FvHef008996@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8967

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-sensorscheck.patch 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4.1
- Adapt to lm_sensors availability/setup in EL.


gkrellm-2.3.0-sensorscheck.patch:

--- NEW FILE gkrellm-2.3.0-sensorscheck.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-03 23:47:50.000000000 +0300
@@ -129,6 +129,7 @@ cat << EOF > test.c
 
 int main()
 	{
+	/*
 	FILE	*f;
 
 	f = fopen("/etc/sensors.conf", "r");
@@ -137,6 +138,7 @@ int main()
 	if (sensors_init(f) != 0)
 		return 1;
 	fclose(f);
+	*/
 	return 0;
 	}
 EOF


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellm.spec	5 Sep 2007 15:33:56 -0000	1.7
+++ gkrellm.spec	5 Sep 2007 15:56:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -14,8 +14,11 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
+Patch5:         gkrellm-2.3.0-sensorscheck.patch
 BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
+%ifarch %{ix86} x86_64 alpha
 BuildRequires:  lm_sensors-devel
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -63,6 +66,7 @@
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
+%patch5 -p1 -z .sensorscheck
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -169,6 +173,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4.1
+- Adapt to lm_sensors availability/setup in EL.
+
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
 - Rewrite gkrellmd init script: better LSB compliance, hddtemp
   interoperability, avoidance of X error messages, general cleanup.



From fedora-extras-commits at redhat.com  Wed Sep  5 16:18:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 12:18:26 -0400
Subject: rpms/gkrellm-volume/devel gkrellm-volume.spec,1.10,1.11
Message-ID: <200709051618.l85GIQAP015678@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15597

Modified Files:
	gkrellm-volume.spec 
Log Message:
* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
- Convert docs to UTF-8.



Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/devel/gkrellm-volume.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gkrellm-volume.spec	16 Aug 2007 10:07:06 -0000	1.10
+++ gkrellm-volume.spec	5 Sep 2007 16:17:53 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -27,6 +27,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
+- Convert docs to UTF-8.
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-5
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:19:28 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 5 Sep 2007 12:19:28 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec, 1.3337,
	1.3338 linux-2.6-utrace-core.patch, 1.3,
	1.4 linux-2.6-utrace-ptrace-compat.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.3, 1.4
Message-ID: <200709051619.l85GJSiu015800@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15753

Modified Files:
	kernel-2.6.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch 
Log Message:
* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
- Update utrace



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3337
retrieving revision 1.3338
diff -u -r1.3337 -r1.3338
--- kernel-2.6.spec	30 Aug 2007 21:54:14 -0000	1.3337
+++ kernel-2.6.spec	5 Sep 2007 16:18:54 -0000	1.3338
@@ -2306,6 +2306,9 @@
 %endif
 
 %changelog
+* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
+- Update utrace
+
 * Thu Aug 30 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-core.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-core.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-core.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -24,11 +24,11 @@
  Documentation/utrace.txt          |  579 +++++++++
  include/linux/sched.h             |    5 
  include/linux/tracehook.h         |   85 +
- include/linux/utrace.h            |  544 +++++++++
+ include/linux/utrace.h            |  544 ++++++++
  init/Kconfig                      |   18 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2263 ++++++++++++++++++++++++++++++++++++++
- 9 files changed, 3502 insertions(+), 18 deletions(-)
+ kernel/utrace.c                   | 2344 ++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 3583 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -50,7 +50,7 @@
 ===================================================================
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2263 @@
+@@ -0,0 +1,2344 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -526,7 +526,7 @@
 + */
 +struct utrace_attached_engine *
 +utrace_attach(struct task_struct *target, int flags,
-+	     const struct utrace_engine_ops *ops, void *data)
++	      const struct utrace_engine_ops *ops, void *data)
 +{
 +	struct utrace *utrace;
 +	struct utrace_attached_engine *engine;
@@ -628,10 +628,13 @@
 +EXPORT_SYMBOL_GPL(utrace_attach);
 +
 +/*
-+ * When an engine is detached, the target thread may still see it and make
-+ * callbacks until it quiesces.  We reset its event flags to just QUIESCE
-+ * and install a special ops vector whose callback is dead_engine_delete.
-+ * When the target thread quiesces, it can safely free the engine itself.
++ * When an engine is detached, the target thread may still see it
++ * and make callbacks until it quiesces.  We install a special ops
++ * vector whose callbacks are all dead_engine_delete.  When the
++ * target thread quiesces, it can safely free the engine itself.
++ * We must cover all callbacks in case of races between checking
++ * engine->flags and utrace_detach changing engine->ops.
++ * Only report_reap is never called due to a special case in utrace_reap.
 + */
 +static u32
 +dead_engine_delete(struct utrace_attached_engine *engine,
@@ -640,9 +643,38 @@
 +	return UTRACE_ACTION_DETACH;
 +}
 +
++/*
++ * Don't use .report_xxx = ... style here because this way makes it easier
++ * to be sure we're forced to have an initializer here for every member.
++ */
 +static const struct utrace_engine_ops dead_engine_ops =
 +{
-+	.report_quiesce = &dead_engine_delete
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 unsigned long, struct task_struct *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 pid_t)) &dead_engine_delete,
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *, u32, siginfo_t *,
++		 const struct k_sigaction *, struct k_sigaction *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 int)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 const struct linux_binprm *, struct pt_regs *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 long, long *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *))
++	&dead_engine_delete,
++	NULL,			/* report_reap */
++	NULL,			/* allow_access_process_vm */
++	NULL,			/* unsafe_exec */
++	NULL,			/* tracer_task */
 +};
 +
 +
@@ -848,9 +880,32 @@
 +		return ret;
 +	}
 +
-+	flags = engine->flags;
-+	engine->flags = UTRACE_EVENT(QUIESCE) | UTRACE_ACTION_QUIESCE;
++	/*
++	 * This must work while the target thread races with us doing:
++	 *	if (engine->flags & UTRACE_EVENT(x)) REPORT(x, ...);
++	 * The REPORT macro uses smp_rmb() between checking engine->flags
++	 * and using engine->ops.  Here we change engine->ops first, then
++	 * use smp_wmb() before changing engine->flags.  This ensures it
++	 * can check the old flags before using the old ops, or check the
++	 * old flags before using the new ops, or check the new flags
++	 * before using the new ops, but can never check the new flags
++	 * before using the old ops.  Hence, dead_engine_ops might be used
++	 * with any old flags in place.  So, it has report_* callback
++	 * pointers for every event type.  Since it has to have those
++	 * anyway, we enable (for after any potential race) all the events
++	 * that have no overhead to enable.  We want it to get into that
++	 * callback and complete the detach ASAP.
++	 */
 +	rcu_assign_pointer(engine->ops, &dead_engine_ops);
++	smp_wmb();
++	flags = engine->flags;
++	engine->flags = (UTRACE_EVENT(QUIESCE)
++			 | UTRACE_EVENT(CLONE)
++			 | UTRACE_EVENT(VFORK_DONE)
++			 | UTRACE_EVENT(EXEC)
++			 | UTRACE_EVENT(EXIT)
++			 | UTRACE_EVENT(JCTL)
++			 | UTRACE_ACTION_QUIESCE);
 +
 +	if (quiesce(target, 1)) {
 +		remove_engine(engine, target, utrace);
@@ -975,7 +1030,7 @@
 +{
 +	struct utrace *utrace;
 +	int report;
-+	unsigned long old_flags, old_utrace_flags;
++	unsigned long old_flags, old_utrace_flags, set_utrace_flags;
 +	int ret = -EALREADY;
 +
 +#ifdef ARCH_HAS_SINGLE_STEP
@@ -1009,6 +1064,22 @@
 +	}
 +
 +	/*
++	 * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL).
++	 * That bit indicates utrace_report_jctl has not run yet and so the
++	 * target cannot be considered quiescent.  But if the bit wasn't
++	 * already set, it can't be in running in there and really is
++	 * quiescent now in its existing job control stop.  We set
++	 * UTRACE_ACTION_QUIESCE to be sure that once it resumes it will
++	 * recompute its flags in utrace_quiescent.
++	 */
++	set_utrace_flags = flags;
++	if (((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL))
++	    && target->state == TASK_STOPPED) {
++		set_utrace_flags &= ~UTRACE_EVENT(JCTL);
++		set_utrace_flags |= UTRACE_ACTION_QUIESCE;
++	}
++
++	/*
 +	 * When setting these flags, it's essential that we really
 +	 * synchronize with exit_notify.  They cannot be set after
 +	 * exit_notify takes the tasklist_lock.  By holding the read
@@ -1018,20 +1089,20 @@
 +	 * knows positively that utrace_report_death will be called or
 +	 * that it won't.
 +	 */
-+	if ((flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
-+					   | DEATH_EVENTS)) {
++	if ((set_utrace_flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
++						      | DEATH_EVENTS)) {
 +		read_lock(&tasklist_lock);
 +		if (unlikely(target->exit_state)) {
 +			read_unlock(&tasklist_lock);
 +			spin_unlock(&utrace->lock);
 +			return ret;
 +		}
-+		target->utrace_flags |= flags;
++		target->utrace_flags |= set_utrace_flags;
 +		read_unlock(&tasklist_lock);
 +	}
 +
 +	engine->flags = flags;
-+	target->utrace_flags |= flags;
++	target->utrace_flags |= set_utrace_flags;
 +	ret = 0;
 +
 +	report = 0;
@@ -1153,10 +1224,20 @@
 +	return ret;
 +}
 +
-+#define REPORT(callback, ...) do { \
-+	u32 ret = (*rcu_dereference(engine->ops)->callback) \
-+		(engine, tsk, ##__VA_ARGS__); \
-+	action = update_action(tsk, utrace, engine, ret); \
++/*
++ * This macro is always used after checking engine->flags.
++ * The smp_rmb() here pairs with smp_wmb() in utrace_detach.
++ * engine->ops changes before engine->flags, so the flags we
++ * just tested properly enabled this report for the real ops,
++ * or harmlessly enabled it for dead_engine_ops.
++ */
++#define REPORT(callback, ...)						\
++	do {								\
++		u32 ret;						\
++		smp_rmb();						\
++		ret = (*rcu_dereference(engine->ops)->callback)		\
++			(engine, tsk, ##__VA_ARGS__);			\
++		action = update_action(tsk, utrace, engine, ret);	\
 +	} while (0)
 +
 +
@@ -2951,7 +3032,7 @@
  struct linux_binprm;
  struct pt_regs;
  
-@@ -342,6 +343,7 @@ utrace_regset_copyin_ignore(unsigned int
+@@ -353,6 +354,7 @@ utrace_regset_copyin_ignore(unsigned int
   */
  static inline void tracehook_init_task(struct task_struct *child)
  {
@@ -2959,7 +3040,7 @@
  }
  
  /*
-@@ -350,6 +352,9 @@ static inline void tracehook_init_task(s
+@@ -361,6 +363,9 @@ static inline void tracehook_init_task(s
   */
  static inline void tracehook_release_task(struct task_struct *p)
  {
@@ -2969,7 +3050,7 @@
  }
  
  /*
-@@ -359,7 +364,20 @@ static inline void tracehook_release_tas
+@@ -370,7 +375,20 @@ static inline void tracehook_release_tas
   */
  static inline int tracehook_check_released(struct task_struct *p)
  {
@@ -2991,7 +3072,7 @@
  }
  
  /*
-@@ -370,7 +388,7 @@ static inline int tracehook_check_releas
+@@ -381,7 +399,7 @@ static inline int tracehook_check_releas
  static inline int tracehook_notify_cldstop(struct task_struct *tsk,
  					   const siginfo_t *info)
  {
@@ -3000,7 +3081,7 @@
  }
  
  /*
-@@ -384,7 +402,11 @@ static inline int tracehook_notify_cldst
+@@ -395,7 +413,11 @@ static inline int tracehook_notify_cldst
  static inline int tracehook_notify_death(struct task_struct *tsk,
  					 int *noreap, void **death_cookie)
  {
@@ -3013,7 +3094,7 @@
  	*noreap = 0;
  	return 0;
  }
-@@ -397,7 +419,8 @@ static inline int tracehook_notify_death
+@@ -408,7 +430,8 @@ static inline int tracehook_notify_death
  static inline int tracehook_consider_fatal_signal(struct task_struct *tsk,
  						  int sig)
  {
@@ -3023,7 +3104,7 @@
  }
  
  /*
-@@ -410,7 +433,7 @@ static inline int tracehook_consider_ign
+@@ -421,7 +444,7 @@ static inline int tracehook_consider_ign
  						    int sig,
  						    void __user *handler)
  {
@@ -3032,7 +3113,7 @@
  }
  
  
-@@ -421,7 +444,7 @@ static inline int tracehook_consider_ign
+@@ -432,7 +455,7 @@ static inline int tracehook_consider_ign
   */
  static inline int tracehook_induce_sigpending(struct task_struct *tsk)
  {
@@ -3041,7 +3122,7 @@
  }
  
  /*
-@@ -436,6 +459,8 @@ static inline int tracehook_get_signal(s
+@@ -447,6 +470,8 @@ static inline int tracehook_get_signal(s
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -3050,7 +3131,7 @@
  	return 0;
  }
  
-@@ -448,6 +473,8 @@ static inline int tracehook_get_signal(s
+@@ -459,6 +484,8 @@ static inline int tracehook_get_signal(s
   */
  static inline int tracehook_finish_stop(int last_one)
  {
@@ -3059,7 +3140,7 @@
  	return 0;
  }
  
-@@ -459,7 +486,7 @@ static inline int tracehook_finish_stop(
+@@ -470,7 +497,7 @@ static inline int tracehook_finish_stop(
   */
  static inline int tracehook_inhibit_wait_stopped(struct task_struct *child)
  {
@@ -3068,7 +3149,7 @@
  }
  
  /*
-@@ -469,7 +496,7 @@ static inline int tracehook_inhibit_wait
+@@ -480,7 +507,7 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_inhibit_wait_zombie(struct task_struct *child)
  {
@@ -3077,7 +3158,7 @@
  }
  
  /*
-@@ -479,7 +506,7 @@ static inline int tracehook_inhibit_wait
+@@ -490,7 +517,7 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_inhibit_wait_continued(struct task_struct *child)
  {
@@ -3086,7 +3167,7 @@
  }
  
  
-@@ -489,13 +516,9 @@ static inline int tracehook_inhibit_wait
+@@ -500,13 +527,9 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_unsafe_exec(struct task_struct *tsk)
  {
@@ -3102,7 +3183,7 @@
  }
  
  /*
-@@ -510,6 +533,8 @@ static inline int tracehook_unsafe_exec(
+@@ -521,6 +544,8 @@ static inline int tracehook_unsafe_exec(
   */
  static inline struct task_struct *tracehook_tracer_task(struct task_struct *p)
  {
@@ -3111,7 +3192,7 @@
  	return NULL;
  }
  
-@@ -521,6 +546,8 @@ static inline int tracehook_allow_access
+@@ -532,6 +557,8 @@ static inline int tracehook_allow_access
  {
  	if (tsk == current)
  		return 1;
@@ -3120,7 +3201,7 @@
  	return 0;
  }
  
-@@ -532,7 +559,7 @@ static inline int tracehook_allow_access
+@@ -543,7 +570,7 @@ static inline int tracehook_allow_access
   */
  static inline int tracehook_expect_breakpoints(struct task_struct *tsk)
  {
@@ -3129,7 +3210,7 @@
  }
  
  
-@@ -555,6 +582,10 @@ static inline int tracehook_expect_break
+@@ -566,6 +593,10 @@ static inline int tracehook_expect_break
  static inline void tracehook_report_death(struct task_struct *tsk,
  					  int exit_state, void *death_cookie)
  {
@@ -3140,7 +3221,7 @@
  }
  
  /*
-@@ -564,14 +595,18 @@ static inline void tracehook_report_deat
+@@ -575,14 +606,18 @@ static inline void tracehook_report_deat
   */
  static inline void tracehook_report_delayed_group_leader(struct task_struct *p)
  {
@@ -3160,7 +3241,7 @@
  }
  
  /*
-@@ -580,6 +615,8 @@ static inline void tracehook_report_exec
+@@ -591,6 +626,8 @@ static inline void tracehook_report_exec
   */
  static inline void tracehook_report_exit(long *exit_code)
  {
@@ -3169,7 +3250,7 @@
  }
  
  /*
-@@ -594,6 +631,8 @@ static inline void tracehook_report_exit
+@@ -605,6 +642,8 @@ static inline void tracehook_report_exit
  static inline void tracehook_report_clone(unsigned long clone_flags,
  					  struct task_struct *child)
  {
@@ -3178,7 +3259,7 @@
  }
  
  /*
-@@ -607,6 +646,8 @@ static inline void tracehook_report_clon
+@@ -618,6 +657,8 @@ static inline void tracehook_report_clon
  						   pid_t pid,
  						   struct task_struct *child)
  {
@@ -3187,7 +3268,7 @@
  }
  
  /*
-@@ -618,6 +659,8 @@ static inline void tracehook_report_clon
+@@ -629,6 +670,8 @@ static inline void tracehook_report_clon
  static inline void tracehook_report_vfork_done(struct task_struct *child,
  					       pid_t child_pid)
  {
@@ -3196,7 +3277,7 @@
  }
  
  /*
-@@ -625,6 +668,9 @@ static inline void tracehook_report_vfor
+@@ -636,6 +679,9 @@ static inline void tracehook_report_vfor
   */
  static inline void tracehook_report_syscall(struct pt_regs *regs, int is_exit)
  {
@@ -3206,7 +3287,7 @@
  }
  
  /*
-@@ -644,6 +690,11 @@ static inline void tracehook_report_hand
+@@ -655,6 +701,11 @@ static inline void tracehook_report_hand
  						  const sigset_t *oldset,
  						  struct pt_regs *regs)
  {

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-ptrace-compat.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-ptrace-compat.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -28,9 +28,9 @@
  kernel/Makefile                 |    3 
  kernel/exit.c                   |   13 
  kernel/fork.c                   |    2 
- kernel/ptrace.c                 | 2051 +++++++++++++++++++++++++++++++++++++---
+ kernel/ptrace.c                 | 2052 +++++++++++++++++++++++++++++++++++++---
  kernel/sys_ni.c                 |    4 
- 18 files changed, 2632 insertions(+), 174 deletions(-)
+ 18 files changed, 2633 insertions(+), 174 deletions(-)
 
 Index: b/fs/proc/base.c
 ===================================================================
@@ -87,7 +87,7 @@
 ===================================================================
 --- a/arch/i386/kernel/ptrace.c
 +++ b/arch/i386/kernel/ptrace.c
-@@ -735,6 +735,46 @@ const struct utrace_regset_view *utrace_
+@@ -739,6 +739,46 @@ const struct utrace_regset_view *utrace_
  	return &utrace_i386_native;
  }
  
@@ -138,7 +138,7 @@
 ===================================================================
 --- a/arch/x86_64/ia32/ptrace32.c
 +++ b/arch/x86_64/ia32/ptrace32.c
-@@ -166,11 +166,6 @@ static int getreg32(struct task_struct *
+@@ -167,11 +167,6 @@ static int getreg32(struct task_struct *
  
  #undef R32
  
@@ -150,7 +150,7 @@
  static int
  ia32_genregs_get(struct task_struct *target,
  		 const struct utrace_regset *regset,
-@@ -600,3 +595,54 @@ const struct utrace_regset_view utrace_i
+@@ -604,3 +599,54 @@ const struct utrace_regset_view utrace_i
  	.name = "i386", .e_machine = EM_386,
  	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
  };
@@ -222,7 +222,7 @@
 ===================================================================
 --- a/arch/x86_64/kernel/ptrace.c
 +++ b/arch/x86_64/kernel/ptrace.c
-@@ -714,6 +714,52 @@ const struct utrace_regset_view *utrace_
+@@ -717,6 +717,52 @@ const struct utrace_regset_view *utrace_
  }
  
  
@@ -683,7 +683,7 @@
 ===================================================================
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
-@@ -19,194 +19,2007 @@
+@@ -19,194 +19,2008 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -746,19 +746,66 @@
 +};
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* Initialized below. */
+ 
+ /*
+- * Check that we have indeed attached to the thing..
++ * We use this bit in task_struct.exit_code of a ptrace'd task to indicate
++ * a ptrace stop.  It must not overlap with any bits used in real exit_code's.
++ * Those are (PTRACE_EVENT_* << 8) | 0xff.
+  */
+-int ptrace_check_attach(struct task_struct *child, int kill)
++#define PTRACE_TRAPPED_MASK	0x10000
++
 +
 +static void
 +ptrace_state_unlink(struct ptrace_state *state)
-+{
+ {
+-	return -ENOSYS;
 +	task_lock(state->parent);
 +	list_del_rcu(&state->entry);
 +	task_unlock(state->parent);
-+}
-+
+ }
+ 
+-static int may_attach(struct task_struct *task)
 +static struct ptrace_state *
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
-+{
+ {
+-	/* May we inspect the given task?
+-	 * This check is used both for attaching with ptrace
+-	 * and for allowing access to sensitive information in /proc.
+-	 *
+-	 * ptrace_attach denies several cases that /proc allows
+-	 * because setting up the necessary parent/child relationship
+-	 * or halting the specified task is impossible.
+-	 */
+-	int dumpable = 0;
+-	/* Don't let security modules deny introspection */
+-	if (task == current)
+-		return 0;
+-	if (((current->uid != task->euid) ||
+-	     (current->uid != task->suid) ||
+-	     (current->uid != task->uid) ||
+-	     (current->gid != task->egid) ||
+-	     (current->gid != task->sgid) ||
+-	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-	smp_rmb();
+-	if (task->mm)
+-		dumpable = task->mm->dumpable;
+-	if (!dumpable && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-
+-	return security_ptrace(current, task);
+-}
+-
+-int ptrace_may_attach(struct task_struct *task)
+-{
+-	int err;
+-	task_lock(task);
+-	err = may_attach(task);
+-	task_unlock(task);
+-	return !err;
 +	struct ptrace_state *state;
 +
 +	NO_LOCKS;
@@ -818,17 +865,14 @@
 +	BUG_ON(state->rcu.next);
 +	call_rcu(&state->rcu, ptrace_state_free);
 +}
- 
- /*
-- * Check that we have indeed attached to the thing..
++
++/*
 + * Update the tracing engine state to match the new ptrace state.
-  */
--int ptrace_check_attach(struct task_struct *child, int kill)
++ */
 +static int __must_check
 +ptrace_update(struct task_struct *target, struct ptrace_state *state,
 +	      unsigned long flags, int from_stopped)
- {
--	return -ENOSYS;
++{
 +	int ret;
 +
 +	START_CHECK;
@@ -893,9 +937,8 @@
 +	END_CHECK;
 +
 +	return ret;
- }
- 
--static int may_attach(struct task_struct *task)
++}
++
 +/*
 + * This does ptrace_update and also installs state in engine->data.
 + * Only after utrace_set_flags succeeds (in ptrace_update) inside
@@ -907,42 +950,7 @@
 + */
 +static int __must_check
 +ptrace_setup_finish(struct task_struct *target, struct ptrace_state *state)
- {
--	/* May we inspect the given task?
--	 * This check is used both for attaching with ptrace
--	 * and for allowing access to sensitive information in /proc.
--	 *
--	 * ptrace_attach denies several cases that /proc allows
--	 * because setting up the necessary parent/child relationship
--	 * or halting the specified task is impossible.
--	 */
--	int dumpable = 0;
--	/* Don't let security modules deny introspection */
--	if (task == current)
--		return 0;
--	if (((current->uid != task->euid) ||
--	     (current->uid != task->suid) ||
--	     (current->uid != task->uid) ||
--	     (current->gid != task->egid) ||
--	     (current->gid != task->sgid) ||
--	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--	smp_rmb();
--	if (task->mm)
--		dumpable = task->mm->dumpable;
--	if (!dumpable && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--
--	return security_ptrace(current, task);
--}
--
--int ptrace_may_attach(struct task_struct *task)
--{
--	int err;
--	task_lock(task);
--	err = may_attach(task);
--	task_unlock(task);
--	return !err;
++{
 +	int ret;
 +
 +	NO_LOCKS;
@@ -1087,8 +1095,6 @@
 +	if (retval)
 +		(void) utrace_detach(task, engine);
 +	else {
-+		int stopped = 0;
-+
 +		NO_LOCKS;
 +
 +		/*
@@ -1098,48 +1104,14 @@
 +		 * We cannot call into the signal code if it's dead.
 +		 */
 +		read_lock(&tasklist_lock);
-+		if (likely(!task->exit_state)) {
++		if (likely(!task->exit_state))
 +			force_sig_specific(SIGSTOP, task);
-+
-+			spin_lock_irq(&task->sighand->siglock);
-+			stopped = (task->state == TASK_STOPPED);
-+			spin_unlock_irq(&task->sighand->siglock);
-+		}
 +		read_unlock(&tasklist_lock);
 +
-+		if (stopped) {
-+			const struct utrace_regset *regset;
-+
-+			/*
-+			 * Set QUIESCE immediately, so we can allow
-+			 * ptrace requests while he's in TASK_STOPPED.
-+			 */
-+			retval = ptrace_update(task, state, /* XXX child death+other thread waits race could have freed state already */
-+					       UTRACE_ACTION_QUIESCE, 0);
-+			if (retval)
-+				/*
-+				 * Anything is possible here.  It might not
-+				 * really have been quiescent yet.  It
-+				 * might have just woken up and died.
-+				 */
-+				BUG_ON(retval != -ESRCH && retval != -EALREADY);
-+			retval = 0;
-+
-+			/*
-+			 * Do now the regset 0 writeback that we do on every
-+			 * stop, since it's never been done.  On register
-+			 * window machines, this makes sure the user memory
-+			 * backing the register data is up to date.
-+			 */
-+			regset = utrace_regset(task, engine,
-+					       utrace_native_view(task), 0);
-+			if (regset->writeback)
-+				(*regset->writeback)(task, regset, 1);
-+		}
-+
 +		pr_debug("%d ptrace_attach %d complete (%sstopped)"
 +			 " state %lu code %x",
-+			 current->pid, task->pid, stopped ? "" : "not ",
++			 current->pid, task->pid,
++			 task->state == TASK_STOPPED ? "" : "not ",
 +			 task->state, task->exit_code);
 +	}
  
@@ -1488,7 +1460,13 @@
 +			else
 +				ret = (*regset->get)(target, regset,
 +						     pos, n, kdata, udata);
-+		}
+ 		}
+-		if (copy_to_user(dst, buf, retval))
+-			return -EFAULT;
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +
 +		if (kdata)
 +			kdata += n;
@@ -1536,7 +1514,8 @@
 +	if (request == PTRACE_ATTACH) {
 +		ret = ptrace_attach(child);
 +		goto out_tsk;
-+	}
+ 	}
+-	return copied;
 +
 +	rcu_read_lock();
 +	engine = utrace_attach(child, UTRACE_ATTACH_MATCH_OPS,
@@ -1563,13 +1542,7 @@
 +			if (child->state == TASK_STOPPED)
 +				ret = 0;
 +			unlock_task_sighand(child, &flags);
- 		}
--		if (copy_to_user(dst, buf, retval))
--			return -EFAULT;
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		if (ret == 0) {
 +			ret = ptrace_update(child, state,
 +					    UTRACE_ACTION_QUIESCE, 0);
@@ -1586,8 +1559,7 @@
 +		}
 +
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
- 	}
--	return copied;
++	}
 +
 +	rcu_read_unlock();
 +
@@ -1783,11 +1755,7 @@
 +		if (ret == 0) {
 +			ret = val;
 +			force_successful_syscall_return();
- 		}
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		goto out_tsk;
 +	}
 +
@@ -1807,8 +1775,7 @@
 +			break;
 +		ret = put_user(tmp, (unsigned long __user *) data);
 +		break;
- 	}
--	return copied;
++	}
 +
 +	case PTRACE_POKETEXT: /* write the word at location addr. */
 +	case PTRACE_POKEDATA:
@@ -1837,9 +1804,14 @@
 +					   (siginfo_t __user *) data,
 +					   sizeof(siginfo_t)))
 +				ret = -EFAULT;
-+		}
+ 		}
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		break;
-+	}
+ 	}
+-	return copied;
 +
 +out_tsk:
 +	NO_LOCKS;
@@ -1936,13 +1908,13 @@
 +	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-+
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2104,7 +2076,29 @@
 +		 * check fails we are sure to get a wakeup if it stops.
 +		 */
 +		exit_code = xchg(&p->exit_code, 0);
-+		if (exit_code)
++		if (exit_code & PTRACE_TRAPPED_MASK)
++			goto found;
++
++		/*
++		 * If p was in job-control stop (TASK_STOPPED) rather than
++		 * ptrace stop (TASK_TRACED), then SIGCONT can asynchronously
++		 * clear it back to TASK_RUNNING.  Until it gets scheduled
++		 * and clears its own ->exit_code, our xchg below will see
++		 * its stop signal.  But, we must not report it if it's no
++		 * longer in TASK_STOPPED, as vanilla wait would not--the
++		 * caller can tell if it sent the SIGCONT before calling
++		 * wait.  We must somehow distinguish this from the case
++		 * where p is in TASK_RUNNING with p->exit_code set because
++		 * it is on its way to entering TASK_TRACED (QUIESCE) for our
++		 * stop.  So, ptrace_report sets the PTRACE_TRAPPED_MASK bit
++		 * in exit_code when it's setting QUIESCE.  For a job control
++		 * control stop, that bit will never have been set.  Since
++		 * the bit's not set now, we should only report right now if
++		 * p is still stopped.  For this case we are protected by
++		 * races the same wait that vanilla do_wait (exit.c) is:
++		 * wait_chldexit is woken after p->state is set to TASK_STOPPED.
++		 */
++		if (p->state == TASK_STOPPED)
 +			goto found;
 +
 +		// XXX should handle WCONTINUED
@@ -2155,6 +2149,7 @@
 +	}
 +	else {
 +		why = CLD_TRAPPED;
++		exit_code &= ~PTRACE_TRAPPED_MASK;
 +		status = exit_code;
 +		exit_code = (status << 8) | 0x7f;
 +	}
@@ -2333,8 +2328,14 @@
 +	 */
 +	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
 +
++	/*
++	 * The PTRACE_TRAPPED_MASK bit distinguishes to ptrace_do_wait that
++	 * this is a ptrace report, so we expect to enter TASK_TRACED but
++	 * might not be there yet when examined.
++	 */
 +	BUG_ON(code == 0);
-+	tsk->exit_code = code;
++	WARN_ON(code &~ 0x7ff);
++	tsk->exit_code = code | PTRACE_TRAPPED_MASK;
 +	do_notify(tsk, state->parent, CLD_TRAPPED);
 +
 +	pr_debug("%d ptrace_report quiescing exit_code %x\n",

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-regset.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-regset.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-regset.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -12,25 +12,27 @@
 ---
 
  arch/i386/kernel/i387.c             |  143 +++---
- arch/i386/kernel/ptrace.c           |  822 ++++++++++++++++++++---------------
- arch/x86_64/ia32/ptrace32.c         |  719 ++++++++++++++++++++-----------
- arch/x86_64/ia32/fpu32.c            |   92 +++-
- arch/x86_64/kernel/ptrace.c         |  730 +++++++++++++++++++------------
+ arch/i386/kernel/ptrace.c           |  826 ++++++++++++++++++++----------------
  arch/powerpc/kernel/Makefile        |    4 
- arch/powerpc/kernel/ptrace32.c      |  443 -------------------
- arch/powerpc/kernel/ptrace.c        |  718 +++++++++++++++----------------
  arch/powerpc/kernel/ptrace-common.h |  145 ------
- kernel/ptrace.c                     |    8 
- include/linux/tracehook.h           |  244 ++++++++++
- include/asm-i386/i387.h             |   13 -
+ arch/powerpc/kernel/ptrace.c        |  718 +++++++++++++++----------------
+ arch/powerpc/kernel/ptrace32.c      |  443 -------------------
+ arch/x86_64/ia32/fpu32.c            |   92 +++-
+ arch/x86_64/ia32/ptrace32.c         |  725 ++++++++++++++++++++-----------
+ arch/x86_64/kernel/ptrace.c         |  733 +++++++++++++++++++------------
+ include/asm-i386/i387.h             |   13 
  include/asm-x86_64/fpu32.h          |    3 
  include/asm-x86_64/tracehook.h      |    8 
- 14 files changed, 2124 insertions(+), 1968 deletions(-)
+ include/linux/tracehook.h           |  255 ++++++++++-
+ kernel/ptrace.c                     |    8 
+ 14 files changed, 2147 insertions(+), 1969 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
  delete arch/powerpc/kernel/ptrace-common.h
 
---- linux-2.6/arch/i386/kernel/i387.c
-+++ linux-2.6/arch/i386/kernel/i387.c
+Index: b/arch/i386/kernel/i387.c
+===================================================================
+--- a/arch/i386/kernel/i387.c
++++ b/arch/i386/kernel/i387.c
 @@ -222,14 +222,10 @@ void set_fpu_twd( struct task_struct *ts
   * FXSR floating point environment conversions.
   */
@@ -240,19 +242,22 @@
  }
  
  /*
---- linux-2.6/arch/i386/kernel/ptrace.c
-+++ linux-2.6/arch/i386/kernel/ptrace.c
-@@ -17,7 +17,9 @@
+Index: b/arch/i386/kernel/ptrace.c
+===================================================================
+--- a/arch/i386/kernel/ptrace.c
++++ b/arch/i386/kernel/ptrace.c
+@@ -17,7 +17,10 @@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
 +#include <linux/module.h>
++#include <linux/elf.h>
  
 +#include <asm/tracehook.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
  #include <asm/system.h>
-@@ -28,10 +30,6 @@
+@@ -28,10 +31,6 @@
  #include <asm/desc.h>
  #include <asm/tracehook.h>
  
@@ -263,7 +268,7 @@
  
  /*
   * Determines which flags the user has access to [1 = access, 0 = no access].
-@@ -40,9 +38,6 @@
+@@ -40,9 +39,6 @@
   */
  #define FLAG_MASK 0x00050dd5
  
@@ -273,7 +278,7 @@
  /*
   * Offset of eflags on child stack..
   */
-@@ -90,28 +85,35 @@ static int putreg(struct task_struct *ch
+@@ -90,28 +86,35 @@ static int putreg(struct task_struct *ch
  	unsigned long regno, unsigned long value)
  {
  	switch (regno >> 2) {
@@ -331,7 +336,7 @@
  	}
  	if (regno > FS*4)
  		regno -= 1*4;
-@@ -125,20 +127,28 @@ static unsigned long getreg(struct task_
+@@ -125,20 +128,28 @@ static unsigned long getreg(struct task_
  	unsigned long retval = ~0UL;
  
  	switch (regno >> 2) {
@@ -374,7 +379,7 @@
  	}
  	return retval;
  }
-@@ -230,11 +240,11 @@ void tracehook_enable_single_step(struct
+@@ -230,11 +241,11 @@ void tracehook_enable_single_step(struct
  	/*
  	 * If TF was already set, don't do anything else
  	 */
@@ -388,7 +393,7 @@
  
  	/*
  	 * ..but if TF is changed by the instruction we will trace,
-@@ -255,29 +265,311 @@ void tracehook_disable_single_step(struc
+@@ -255,20 +266,300 @@ void tracehook_disable_single_step(struc
  	/* But touch TF only if it was set by us.. */
  	if (test_and_clear_tsk_thread_flag(child, TIF_FORCED_TF)) {
  		struct pt_regs *regs = get_child_regs(child);
@@ -697,6 +702,9 @@
  /*
   * Perform get_thread_area on behalf of the traced child.
   */
+@@ -273,11 +564,13 @@ void ptrace_disable(struct task_struct *
+  * Perform get_thread_area on behalf of the traced child.
+  */
  static int
 -ptrace_get_thread_area(struct task_struct *child,
 -		       int idx, struct user_desc __user *user_desc)
@@ -712,7 +720,7 @@
  
  /*
   * Get the current Thread-Local Storage area:
-@@ -299,23 +591,29 @@ ptrace_get_thread_area(struct task_struc
+@@ -299,23 +592,29 @@ ptrace_get_thread_area(struct task_struc
  #define GET_PRESENT(desc)	(((desc)->b >> 15) & 1)
  #define GET_USEABLE(desc)	(((desc)->b >> 20) & 1)
  
@@ -759,7 +767,7 @@
  
  	return 0;
  }
-@@ -324,304 +622,120 @@ ptrace_get_thread_area(struct task_struc
+@@ -324,304 +623,123 @@ ptrace_get_thread_area(struct task_struc
   * Perform set_thread_area on behalf of the traced child.
   */
  static int
@@ -1110,16 +1118,19 @@
 + */
 +static const struct utrace_regset native_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = FRAME_SIZE, .size = sizeof(long), .align = sizeof(long),
 +		.get = genregs_get, .set = genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpregs_active,
 +		.get = fpregs_get, .set = fpregs_set
 +	},
 +	{
++		.core_note_type = NT_PRXFPREG,
 +		.n = sizeof(struct user_fxsr_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpxregs_active,
@@ -1160,11 +1171,15 @@
  void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
  {
  	struct siginfo info;
---- linux-2.6/arch/x86_64/ia32/ptrace32.c
-+++ linux-2.6/arch/x86_64/ia32/ptrace32.c
-@@ -16,7 +16,11 @@
+Index: b/arch/x86_64/ia32/ptrace32.c
+===================================================================
+--- a/arch/x86_64/ia32/ptrace32.c
++++ b/arch/x86_64/ia32/ptrace32.c
+@@ -15,8 +15,13 @@
+ #include <linux/syscalls.h>
  #include <linux/unistd.h>
  #include <linux/mm.h>
++#include <linux/err.h>
  #include <linux/ptrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/module.h>
@@ -1174,7 +1189,7 @@
  #include <asm/compat.h>
  #include <asm/uaccess.h>
  #include <asm/user32.h>
-@@ -25,7 +29,8 @@
+@@ -25,7 +30,8 @@
  #include <asm/debugreg.h>
  #include <asm/i387.h>
  #include <asm/fpu32.h>
@@ -1184,7 +1199,7 @@
  
  /*
   * Determines which flags the user has access to [1 = access, 0 = no access].
-@@ -35,34 +40,41 @@
+@@ -35,34 +41,41 @@
  #define FLAG_MASK 0x54dd5UL
  
  #define R32(l,q) \
@@ -1239,7 +1254,7 @@
  		if ((val & 3) != 3) return -EIO;
  		stack[offsetof(struct pt_regs, cs)/8] = val & 0xffff;
  		break;
-@@ -78,57 +90,16 @@ static int putreg32(struct task_struct *
+@@ -78,57 +91,16 @@ static int putreg32(struct task_struct *
  	R32(eip, rip);
  	R32(esp, rsp);
  
@@ -1300,7 +1315,7 @@
  	}
  	return 0;
  }
-@@ -136,24 +107,33 @@ static int putreg32(struct task_struct *
+@@ -136,24 +108,33 @@ static int putreg32(struct task_struct *
  #undef R32
  
  #define R32(l,q) \
@@ -1347,7 +1362,7 @@
  		break;
  
  	R32(cs, cs);
-@@ -167,239 +147,456 @@ static int getreg32(struct task_struct *
+@@ -167,239 +148,459 @@ static int getreg32(struct task_struct *
  	R32(eax, rax);
  	R32(orig_eax, orig_rax);
  	R32(eip, rip);
@@ -1396,7 +1411,7 @@
  
 -static long ptrace32_siginfo(unsigned request, u32 pid, u32 addr, u32 data)
 +asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
- {
++{
 +	return -ENOSYS;
 +}
 +
@@ -1405,7 +1420,7 @@
 +		 const struct utrace_regset *regset,
 +		 unsigned int pos, unsigned int count,
 +		 void *kbuf, void __user *ubuf)
-+{
+ {
 +	if (kbuf) {
 +		u32 *kp = kbuf;
 +		while (count > 0) {
@@ -1473,7 +1488,13 @@
 +		void *kbuf, void __user *ubuf)
 +{
 +	struct user_i387_ia32_struct fp;
-+	int ret;
+ 	int ret;
+-	compat_siginfo_t __user *si32 = compat_ptr(data);
+-	siginfo_t ssi; 
+-	siginfo_t __user *si = compat_alloc_user_space(sizeof(siginfo_t));
+-	if (request == PTRACE_SETSIGINFO) {
+-		memset(&ssi, 0, sizeof(siginfo_t));
+-		ret = copy_siginfo_from_user32(&ssi, si32);
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -1497,13 +1518,7 @@
 +		const void *kbuf, const void __user *ubuf)
 +{
 +	struct user_i387_ia32_struct fp;
- 	int ret;
--	compat_siginfo_t __user *si32 = compat_ptr(data);
--	siginfo_t ssi; 
--	siginfo_t __user *si = compat_alloc_user_space(sizeof(siginfo_t));
--	if (request == PTRACE_SETSIGINFO) {
--		memset(&ssi, 0, sizeof(siginfo_t));
--		ret = copy_siginfo_from_user32(&ssi, si32);
++	int ret;
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -1645,41 +1660,33 @@
 -		else
 -			ret = put_user(val, (unsigned int __user *)datap); 
 -		break; 
-+	target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
- 
+-
 -	case PTRACE_POKEDATA:
 -	case PTRACE_POKETEXT:
 -		ret = 0;
 -		if (access_process_vm(child, addr, &data, sizeof(u32), 1)!=sizeof(u32))
 -			ret = -EIO; 
 -		break;
-+	return ret;
-+}
++	target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
  
 -	case PTRACE_PEEKUSR:
 -		ret = getreg32(child, addr, &val);
 -		if (ret == 0)
 -			ret = put_user(val, (__u32 __user *)datap);
 -		break;
-+static int
-+ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
-+{
-+	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
-+		return 8;
-+	return 0;
++	return ret;
 +}
  
 -	case PTRACE_POKEUSR:
 -		ret = putreg32(child, addr, data);
 -		break;
 +static int
-+ia32_dbregs_get(struct task_struct *target,
-+		const struct utrace_regset *regset,
-+		unsigned int pos, unsigned int count,
-+		void *kbuf, void __user *ubuf)
++ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
 +{
-+	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
-+		u32 val;
++	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
++		return 8;
++	return 0;
++}
  
 -	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 -		int i;
@@ -1692,6 +1699,15 @@
 -			getreg32(child, i, &val);
 -			ret |= __put_user(val,(u32 __user *)datap);
 -			datap += sizeof(u32);
++static int
++ia32_dbregs_get(struct task_struct *target,
++		const struct utrace_regset *regset,
++		unsigned int pos, unsigned int count,
++		void *kbuf, void __user *ubuf)
++{
++	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
++		u32 val;
++
 +		/*
 +		 * The hardware updates the status register on a debug trap,
 +		 * but do_debug (traps.c) saves it for us when that happens.
@@ -1934,8 +1950,8 @@
 +	put_cpu();
 +
 +	return 0;
- }
- 
++}
++
 +/*
 + * Determine how many TLS slots are in use.
 + */
@@ -1950,8 +1966,8 @@
 +			break;
 +	}
 +	return i;
-+}
-+
+ }
+ 
 +
 +/*
 + * This should match arch/i386/kernel/ptrace.c:native_regsets.
@@ -1959,17 +1975,20 @@
 + */
 +static const struct utrace_regset ia32_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = sizeof(struct user_regs_struct32)/4,
 +		.size = 4, .align = 4,
 +		.get = ia32_genregs_get, .set = ia32_genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_ia32_struct) / 4,
 +		.size = 4, .align = 4,
 +		.active = ia32_fpregs_active,
 +		.get = ia32_fpregs_get, .set = ia32_fpregs_set
 +	},
 +	{
++		.core_note_type = NT_PRXFPREG,
 +		.n = sizeof(struct user32_fxsr_struct) / 4,
 +		.size = 4, .align = 4,
 +		.active = ia32_fpxregs_active,
@@ -1994,8 +2013,10 @@
 +	.name = "i386", .e_machine = EM_386,
 +	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
 +};
---- linux-2.6/arch/x86_64/ia32/fpu32.c
-+++ linux-2.6/arch/x86_64/ia32/fpu32.c
+Index: b/arch/x86_64/ia32/fpu32.c
+===================================================================
+--- a/arch/x86_64/ia32/fpu32.c
++++ b/arch/x86_64/ia32/fpu32.c
 @@ -9,6 +9,7 @@
  #include <asm/processor.h>
  #include <asm/uaccess.h>
@@ -2148,19 +2169,22 @@
 +
 +	return 0;
 +}
---- linux-2.6/arch/x86_64/kernel/ptrace.c
-+++ linux-2.6/arch/x86_64/kernel/ptrace.c
-@@ -19,7 +19,9 @@
+Index: b/arch/x86_64/kernel/ptrace.c
+===================================================================
+--- a/arch/x86_64/kernel/ptrace.c
++++ b/arch/x86_64/kernel/ptrace.c
+@@ -19,7 +19,10 @@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
 +#include <linux/module.h>
++#include <linux/elf.h>
  
 +#include <asm/tracehook.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
  #include <asm/system.h>
-@@ -30,6 +32,7 @@
+@@ -30,6 +33,7 @@
  #include <asm/desc.h>
  #include <asm/proto.h>
  #include <asm/ia32.h>
@@ -2168,7 +2192,7 @@
  
  /*
   * does not yet catch signals sent when the child dies.
-@@ -228,52 +231,61 @@ static int putreg(struct task_struct *ch
+@@ -228,52 +232,61 @@ static int putreg(struct task_struct *ch
  	if (test_tsk_thread_flag(child, TIF_IA32))
  		value &= 0xffffffff;
  	switch (regno) {
@@ -2276,7 +2300,7 @@
  	}
  	put_stack_long(child, regno - sizeof(struct pt_regs), value);
  	return 0;
-@@ -282,298 +294,426 @@ static int putreg(struct task_struct *ch
+@@ -282,295 +295,380 @@ static int putreg(struct task_struct *ch
  static unsigned long getreg(struct task_struct *child, unsigned long regno)
  {
  	unsigned long val;
@@ -2906,6 +2930,10 @@
  	return ret;
  }
  
+@@ -574,6 +672,51 @@ long arch_ptrace(struct task_struct *chi
+ 	return ret;
+ }
+ 
 +
 +/*
 + * These are our native regset flavors.
@@ -2913,10 +2941,12 @@
 + */
 +static const struct utrace_regset native_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = sizeof(struct user_regs_struct)/8, .size = 8, .align = 8,
 +		.get = genregs_get, .set = genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpregs_active,
@@ -2952,8 +2982,10 @@
  asmlinkage void syscall_trace_enter(struct pt_regs *regs)
  {
  	/* do the secure computing check first */
---- linux-2.6/arch/powerpc/kernel/Makefile
-+++ linux-2.6/arch/powerpc/kernel/Makefile
+Index: b/arch/powerpc/kernel/Makefile
+===================================================================
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
 @@ -10,12 +10,14 @@ CFLAGS_prom_init.o      += -fPIC
  CFLAGS_btext.o		+= -fPIC
  endif
@@ -2970,8 +3002,10 @@
  				   paca.o cpu_setup_ppc970.o \
  				   cpu_setup_pa6t.o \
  				   firmware.o sysfs.o nvram_64.o
---- linux-2.6/arch/powerpc/kernel/ptrace32.c
-+++ linux-2.6/arch/powerpc/kernel/ptrace32.c
+Index: b/arch/powerpc/kernel/ptrace32.c
+===================================================================
+--- a/arch/powerpc/kernel/ptrace32.c
++++ /dev/null
 @@ -1,443 +0,0 @@
 -/*
 - * ptrace for 32-bit processes running on a 64-bit kernel.
@@ -3416,8 +3450,10 @@
 -	unlock_kernel();
 -	return ret;
 -}
---- linux-2.6/arch/powerpc/kernel/ptrace.c
-+++ linux-2.6/arch/powerpc/kernel/ptrace.c
+Index: b/arch/powerpc/kernel/ptrace.c
+===================================================================
+--- a/arch/powerpc/kernel/ptrace.c
++++ b/arch/powerpc/kernel/ptrace.c
 @@ -27,9 +27,8 @@
  #include <linux/signal.h>
  #include <linux/seccomp.h>
@@ -4229,8 +4265,10 @@
  
  void do_syscall_trace_enter(struct pt_regs *regs)
  {
---- linux-2.6/arch/powerpc/kernel/ptrace-common.h
-+++ linux-2.6/arch/powerpc/kernel/ptrace-common.h
+Index: b/arch/powerpc/kernel/ptrace-common.h
+===================================================================
+--- a/arch/powerpc/kernel/ptrace-common.h
++++ /dev/null
 @@ -1,145 +0,0 @@
 -/*
 - *    Copyright (c) 2002 Stephen Rothwell, IBM Coproration
@@ -4377,8 +4415,10 @@
 -}
 -
 -#endif /* _PPC64_PTRACE_COMMON_H */
---- linux-2.6/kernel/ptrace.c
-+++ linux-2.6/kernel/ptrace.c
+Index: b/kernel/ptrace.c
+===================================================================
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
 @@ -99,12 +99,6 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
@@ -4402,8 +4442,10 @@
  	return -ENOSYS;
  }
 -#endif /* __ARCH_SYS_PTRACE */
---- linux-2.6/include/linux/tracehook.h
-+++ linux-2.6/include/linux/tracehook.h
+Index: b/include/linux/tracehook.h
+===================================================================
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
 @@ -52,10 +52,10 @@ struct pt_regs;
   * should be one that can be evaluated in modules, i.e. uses exported symbols.
   *
@@ -4419,7 +4461,7 @@
   * Enabling or disabling redundantly is harmless.
   *
   *	void tracehook_enable_block_step(struct task_struct *tsk);
-@@ -93,6 +93,242 @@ struct pt_regs;
+@@ -93,6 +93,253 @@ struct pt_regs;
   */
  
  
@@ -4459,6 +4501,17 @@
 +	unsigned int bias;	/* Bias from natural indexing.  */
 +
 +	/*
++	 * If nonzero, this gives the n_type field (NT_* value) of the
++	 * core file note in which this regset's data appears.
++	 * NT_PRSTATUS is a special case in that the regset data starts
++	 * at offsetof(struct elf_prstatus, pr_reg) into the note data;
++	 * that is part of the per-machine ELF formats userland knows
++	 * about.  In other cases, the core file note contains exactly
++	 * the whole regset (n*size) and nothing else.
++	 */
++	unsigned int core_note_type;
++
++	/*
 +	 * Return -%ENODEV if not available on the hardware found.
 +	 * Return %0 if no interesting state in this thread.
 +	 * Return >%0 number of @size units of interesting state.
@@ -4662,8 +4715,10 @@
  /*
   * Following are entry points from core code, where the user debugging
   * support can affect the normal behavior.  The locking situation is
---- linux-2.6/include/asm-i386/i387.h
-+++ linux-2.6/include/asm-i386/i387.h
+Index: b/include/asm-i386/i387.h
+===================================================================
+--- a/include/asm-i386/i387.h
++++ b/include/asm-i386/i387.h
 @@ -130,17 +130,12 @@ extern int save_i387( struct _fpstate __
  extern int restore_i387( struct _fpstate __user *buf );
  
@@ -4686,8 +4741,10 @@
  
  /*
   * FPU state for core dumps...
---- linux-2.6/include/asm-x86_64/fpu32.h
-+++ linux-2.6/include/asm-x86_64/fpu32.h
+Index: b/include/asm-x86_64/fpu32.h
+===================================================================
+--- a/include/asm-x86_64/fpu32.h
++++ b/include/asm-x86_64/fpu32.h
 @@ -7,4 +7,7 @@ int restore_i387_ia32(struct task_struct
  int save_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf, 
  		   struct pt_regs *regs, int fsave);
@@ -4696,8 +4753,10 @@
 +int set_fpregs32(struct task_struct *, const struct user_i387_ia32_struct *);
 +
  #endif
---- linux-2.6/include/asm-x86_64/tracehook.h
-+++ linux-2.6/include/asm-x86_64/tracehook.h
+Index: b/include/asm-x86_64/tracehook.h
+===================================================================
+--- a/include/asm-x86_64/tracehook.h
++++ b/include/asm-x86_64/tracehook.h
 @@ -48,4 +48,12 @@ static inline void tracehook_abort_sysca
  	regs->orig_rax = -1L;
  }



From fedora-extras-commits at redhat.com  Wed Sep  5 16:20:18 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:20:18 -0400
Subject: rpms/pinot/devel dbusxapianindex_reload03.patch, NONE,
	1.1 pinot.spec, 1.10, 1.11
Message-ID: <200709051620.l85GKIeB015831@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15807

Modified Files:
	pinot.spec 
Added Files:
	dbusxapianindex_reload03.patch 
Log Message:
fix preferences segfault

dbusxapianindex_reload03.patch:

--- NEW FILE dbusxapianindex_reload03.patch ---
--- pinot-0.76_bak/Index/DBusXapianIndex.cpp	2007-08-22 21:58:20.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.cpp	2007-09-01 11:23:26.000000000 +0800
@@ -17,15 +17,6 @@
  */
 
 #include <iostream>
-extern "C"
-{
-#if DBUS_VERSION < 1000000
-#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-}
 
 #include "Languages.h"
 #include "XapianDatabaseFactory.h"
@@ -302,7 +293,7 @@
 /// Asks the D-Bus service to reload its configuration.
 bool DBusXapianIndex::reload(void)
 {
-	bool reloading = false;
+	gboolean reloading = FALSE;
 
 	DBusGConnection *pBus = getBusConnection();
 	if (pBus == NULL)
@@ -333,7 +324,12 @@
 	g_object_unref(pBusProxy);
 	// FIXME: don't we have to call dbus_g_connection_unref(pBus); ?
 
-	return reloading;
+	if (reloading == TRUE)
+	{
+		return true;
+	}
+
+	return false;
 }
 
 
--- pinot-0.76_bak/Index/DBusXapianIndex.h	2007-08-22 21:54:40.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.h	2007-09-01 11:23:37.000000000 +0800
@@ -21,12 +21,15 @@
 
 #include <string>
 #include <set>
+#include "config.h"
 extern "C"
 {
 #if DBUS_VERSION < 1000000
 #define DBUS_API_SUBJECT_TO_CHANGE
 #endif
 #include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 }
 
 #include "XapianIndex.h"
--- pinot-0.76_bak/UI/GTK2/src/pinot.cc	2007-08-22 22:01:28.000000000 +0800
+++ pinot-0.76/UI/GTK2/src/pinot.cc	2007-09-01 10:55:10.000000000 +0800
@@ -29,6 +29,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
+#include "config.h"
 extern "C"
 {
 #if DBUS_VERSION < 1000000
@@ -50,7 +51,6 @@
 #include "ViewHistory.h"
 #include "DownloaderInterface.h"
 #include "XapianIndex.h"
-#include "config.h"
 #include "NLS.h"
 #include "PinotSettings.h"
 #include "mainWindow.hh"


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pinot.spec	23 Aug 2007 15:38:33 -0000	1.10
+++ pinot.spec	5 Sep 2007 16:19:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.76        
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -8,6 +8,7 @@
 URL: http://pinot.berlios.de/            
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
+Patch1: dbusxapianindex_reload03.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -50,7 +51,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .lang_detect
-
+%patch1 -p1 -b .dbus_reload
 
 %build
 %configure
@@ -113,6 +114,9 @@
 %{_libdir}/deskbar-applet/handlers/pinot-*
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-2
+- Add upstream patch to fix preferences segfault
+
 * Thu Aug 23 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-1
 - Update to final 0.76
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:24:43 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:24:43 -0400
Subject: rpms/hardinfo/devel hardinfo.spec,1.18,1.19 libzfix.patch,1.1,1.2
Message-ID: <200709051624.l85GOhsT017948@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17923

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hardinfo.spec	2 Sep 2007 09:07:35 -0000	1.18
+++ hardinfo.spec	5 Sep 2007 16:24:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System     
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-19
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-18
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:07:35 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:24:10 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:27:29 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:27:29 -0400
Subject: rpms/hardinfo/F-7 hardinfo.spec,1.5,1.6 libzfix.patch,1.1,1.2
Message-ID: <200709051627.l85GRTSr018068@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18021

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/hardinfo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hardinfo.spec	2 Sep 2007 09:04:17 -0000	1.5
+++ hardinfo.spec	5 Sep 2007 16:26:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-7
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:04:17 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:26:56 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:27:51 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:27:51 -0400
Subject: rpms/hardinfo/FC-6 hardinfo.spec,1.4,1.5 libzfix.patch,1.1,1.2
Message-ID: <200709051627.l85GRpPI018111@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18044

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/hardinfo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hardinfo.spec	2 Sep 2007 09:27:11 -0000	1.4
+++ hardinfo.spec	5 Sep 2007 16:27:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 5%{?dist}
+Release: 7%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:27:11 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:27:18 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:32:49 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 5 Sep 2007 12:32:49 -0400
Subject: rpms/pixman/devel .cvsignore, 1.4, 1.5 pixman.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <200709051632.l85GWncQ018351@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18302/devel

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
pixman 0.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 17:20:46 -0000	1.4
+++ .cvsignore	5 Sep 2007 16:32:16 -0000	1.5
@@ -1 +1 @@
-pixman-20070827.tar.bz2
+pixman-0.9.5.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pixman.spec	27 Aug 2007 17:20:46 -0000	1.6
+++ pixman.spec	5 Sep 2007 16:32:16 -0000	1.7
@@ -2,20 +2,21 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.9.0
-Release:        7.%{gitdate}%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://gitweb.freedesktop.org/?p=pixman.git;a=summary
-# Git snapshot.  To recreate:
-# ./make-pixman-snapshot.sh %{gitrev}
-Source0:        pixman-%{gitdate}.tar.bz2
+URL:            http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+# To make git snapshots:
+# ./make-pixman-snapshot.sh %{?gitrev}
+# if no revision specified, makes a new one from HEAD.
+Source0:        pixman-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake autoconf libtool pkgconfig
+# BuildRequires:  automake autoconf libtool pkgconfig
 
 %description
 Pixman is a pixel manipulation library for X and cairo.
@@ -30,10 +31,9 @@
 Development library for pixman.
 
 %prep
-%setup -q -n %{name}-%{gitdate}
+%setup -q
 
 %build
-./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 0.9.5-1
+- Update to 0.9.5 release.
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.9.0-7.20070827
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 17:20:46 -0000	1.4
+++ sources	5 Sep 2007 16:32:16 -0000	1.5
@@ -1 +1 @@
-9800e9d33a255efcd982e2acc57c2ddd  pixman-20070827.tar.bz2
+f9fea77e46ec7a3a16e925e137f146e7  pixman-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 16:33:19 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:33:19 -0400
Subject: rpms/hunspell/devel .cvsignore, 1.11, 1.12 hunspell.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <200709051633.l85GXJeN018406@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18343

Modified Files:
	.cvsignore hunspell.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2007 07:15:28 -0000	1.11
+++ .cvsignore	5 Sep 2007 16:32:47 -0000	1.12
@@ -1 +1 @@
-hunspell-1.1.11-2.tar.gz
+hunspell-1.1.12-2.tar.gz


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hunspell.spec	28 Aug 2007 07:15:28 -0000	1.27
+++ hunspell.spec	5 Sep 2007 16:32:47 -0000	1.28
@@ -1,8 +1,8 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
-Version:   1.1.11.2
+Version:   1.1.12.2
 Release:   1%{?dist}
-Source:    http://downloads.sourceforge.net/%{name}/hunspell-1.1.11-2.tar.gz
+Source:    http://downloads.sourceforge.net/%{name}/hunspell-1.1.12-2.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +25,7 @@
 Includes and definitions for developing with hunspell
 
 %prep
-%setup -q -n hunspell-1.1.11
+%setup -q -n hunspell-1.1.12
 
 %build
 libtoolize --automake --force
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
+* Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> - 1.1.12.2-1
+- next version
+
 * Tue Aug 28 2007 Caolan McNamara <caolanm at redhat.com> - 1.1.11.2-1
 - next version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2007 07:15:28 -0000	1.11
+++ sources	5 Sep 2007 16:32:47 -0000	1.12
@@ -1 +1 @@
-828b4a742b9636046ebf208fc2d6324b  hunspell-1.1.11-2.tar.gz
+f4bb481a318eb388e07773f22be853d5  hunspell-1.1.12-2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 16:36:24 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:36:24 -0400
Subject: rpms/libgsf/devel .cvsignore, 1.18, 1.19 libgsf.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <200709051636.l85GaOkU018588@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18549

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Jul 2007 10:39:45 -0000	1.18
+++ .cvsignore	5 Sep 2007 16:35:52 -0000	1.19
@@ -1 +1 @@
-libgsf-1.14.5.tar.bz2
+libgsf-1.14.6.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgsf.spec	29 Aug 2007 07:18:59 -0000	1.47
+++ libgsf.spec	5 Sep 2007 16:35:52 -0000	1.48
@@ -3,8 +3,8 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.5
-Release: 3%{?dist}
+Version: 1.14.6
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -114,6 +114,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> 1.14.6-1
+- next version
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> 1.14.5-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Jul 2007 10:39:45 -0000	1.18
+++ sources	5 Sep 2007 16:35:52 -0000	1.19
@@ -1 +1 @@
-0c1a70ca77aef5706544c1b4082a632a  libgsf-1.14.5.tar.bz2
+5939265125356730fc1d90c8ee3af7eb  libgsf-1.14.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 16:43:13 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 5 Sep 2007 12:43:13 -0400
Subject: rpms/system-config-firewall/devel
	system-config-firewall-1.0.5-sysconfig.patch, NONE,
	1.1 system-config-firewall.spec, 1.5, 1.6
Message-ID: <200709051643.l85GhD0w018848@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819

Modified Files:
	system-config-firewall.spec 
Added Files:
	system-config-firewall-1.0.5-sysconfig.patch 
Log Message:
- fixed problem if /etc/sysconfig/system-config-securtylevel and 
  /etc/sysconfig/system-config-firewall are not readable



system-config-firewall-1.0.5-sysconfig.patch:

--- NEW FILE system-config-firewall-1.0.5-sysconfig.patch ---
diff -up system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig system-config-firewall-1.0.5/src/fw_sysconfig.py
--- system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig	2007-08-17 17:24:58.000000000 +0200
+++ system-config-firewall-1.0.5/src/fw_sysconfig.py	2007-09-05 18:39:06.000000000 +0200
@@ -31,7 +31,7 @@ def read_sysconfig_config(merge_config=N
     try:
         fd = open(filename, 'r')
     except:
-        return None
+        return merge_config
     argv = [ ]
     for line in fd.xreadlines():
         if not line:


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-firewall.spec	31 Aug 2007 17:39:11 -0000	1.5
+++ system-config-firewall.spec	5 Sep 2007 16:42:34 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -11,6 +11,7 @@
 Source0: %{name}-%{version}.tar.bz2
 Patch0: system-config-firewall-1.0.5-lokkit.patch
 Patch1: system-config-firewall-1.0.5-modules.patch
+Patch2: system-config-firewall-1.0.5-sysconfig.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -49,6 +50,7 @@
 %setup -q
 %patch0 -p1 -b .lokkit
 %patch1 -p1 -b .modules
+%patch2 -p1 -b .sysconfig
 
 %install
 rm -rf %{buildroot}
@@ -122,6 +124,10 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Wed Sep  5 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-4
+- fixed problem if /etc/sysconfig/system-config-securtylevel and 
+  /etc/sysconfig/system-config-firewall are not readable
+
 * Fri Aug 31 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-3
 - fixed problem if IP*TABLES_MODULES is not set in config files
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:59:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:59:44 -0400
Subject: rpms/libgsf/devel libgsf.spec,1.48,1.49
Message-ID: <200709051659.l85GxiQx019459@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435

Modified Files:
	libgsf.spec 
Log Message:
new libgsf


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgsf.spec	5 Sep 2007 16:35:52 -0000	1.48
+++ libgsf.spec	5 Sep 2007 16:59:04 -0000	1.49
@@ -13,6 +13,9 @@
 BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
@@ -61,12 +64,34 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang libgsf
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.la
 
-%post -p /sbin/ldconfig
+#%pre
+#if [ "$1" -gt 1 ]; then
+#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#    gconftool-2 --makefile-uninstall-rule \
+#      %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas >/dev/null
+#    # If the schema file has ever been renamed::
+#    #gconftool-2 --makefile-uninstall-rule \
+#    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null
+#fi
+
+%post
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.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/gsf-office-thumbnailer.schemas > /dev/null
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -76,6 +101,7 @@
 %{_libdir}/libgsf-1.so.*
 %{_bindir}/gsf-office-thumbnailer
 %{_mandir}/man1/gsf-office-thumbnailer.1.gz
+%{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
 
 %files gnome
 %defattr(-,root,root,-)
@@ -94,6 +120,7 @@
 %dir %{_includedir}/libgsf-1
 %{_includedir}/libgsf-1/gsf
 %{_includedir}/libgsf-1/gsf-win32
+%{_includedir}/libgsf-1/gsf-gvfs
 %{_datadir}/gtk-doc/html/gsf
 %{_mandir}/man1/gsf.1.gz
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:09:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:09:30 -0400
Subject: comps comps-f8.xml.in,1.90,1.91
Message-ID: <200709051709.l85H9U9Y025736@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25653

Modified Files:
	comps-f8.xml.in 
Log Message:
add vinagre



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- comps-f8.xml.in	5 Sep 2007 06:15:55 -0000	1.90
+++ comps-f8.xml.in	5 Sep 2007 17:08:59 -0000	1.91
@@ -1697,6 +1697,7 @@
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
       <packagereq type="optional">tracker-search-tool</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
+      <packagereq type="optional">vinagre</packagereq>
       <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
       <packagereq type="optional">xscreensaver-extras-gss</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 17:23:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Wed, 05 Sep 2007 10:23:56 -0700
Subject: [pkgdb] kudzu: ajax has requested commit
Message-ID: <200709051723.l85HNvW3018256@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on kudzu (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 17:28:22 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 13:28:22 -0400
Subject: rpms/iso-codes/devel .cvsignore, 1.9, 1.10 iso-codes.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200709051728.l85HSMoT026061@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25975

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.4-1
- Update to 1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Aug 2007 03:15:51 -0000	1.9
+++ .cvsignore	5 Sep 2007 17:27:50 -0000	1.10
@@ -1 +1 @@
-iso-codes-1.3.tar.gz
+iso-codes_1.4.orig.tar.gz


Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iso-codes.spec	9 Aug 2007 03:42:32 -0000	1.13
+++ iso-codes.spec	5 Sep 2007 17:27:50 -0000	1.14
@@ -3,7 +3,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -63,6 +63,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.4-1
+- Update to 1.4
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> 1.3-1
 - Update to 1.3
 - Update the license field


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Aug 2007 03:15:51 -0000	1.9
+++ sources	5 Sep 2007 17:27:50 -0000	1.10
@@ -1 +1 @@
-5f275f795f39795f3747bb1c60276e08  iso-codes-1.3.tar.gz
+c0389096d35645b36a55d0ab6529e5a3  iso-codes_1.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 17:30:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Wed, 5 Sep 2007 13:30:44 -0400
Subject: rpms/gnome-session/devel gnome-session-2.17.5-window-manager.patch, 
	1.4, 1.5 gnome-session.spec, 1.137, 1.138
Message-ID: <200709051730.l85HUiXh026233@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26210

Modified Files:
	gnome-session-2.17.5-window-manager.patch gnome-session.spec 
Log Message:
* Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
- Update gnome-session-2.17.5-window-manager.patch to apply (remove
  chunks that are now upstream).


gnome-session-2.17.5-window-manager.patch:

Index: gnome-session-2.17.5-window-manager.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session-2.17.5-window-manager.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-session-2.17.5-window-manager.patch	10 Aug 2007 19:09:52 -0000	1.4
+++ gnome-session-2.17.5-window-manager.patch	5 Sep 2007 17:30:41 -0000	1.5
@@ -49,30 +49,3 @@
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
-@@ -82,6 +87,7 @@ fi
- OPT1=
- OPT2=
- OPT3=
-+OPT4=
- if [ ! -z "$SMID" ] ; then
-   case `basename $WINDOW_MANAGER` in
-     sawfish|sawmill|metacity)
-@@ -117,14 +123,16 @@ fi
- 
- case `basename $WINDOW_MANAGER` in
-   compiz)
-+    export LIBGL_ALWAYS_INDIRECT=1
-     gtk-window-decorator &
--    OPT3=gconf
-+    OPT3=glib
-+    OPT4=gconf
-     ;;
-   beryl)
-     emerald &
-     ;;
- esac
- 
--exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
-+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
- 
- echo "ERROR: No window manager could run!"


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-session.spec	4 Sep 2007 19:27:48 -0000	1.137
+++ gnome-session.spec	5 Sep 2007 17:30:41 -0000	1.138
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -185,6 +185,10 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
+- Update gnome-session-2.17.5-window-manager.patch to apply (remove
+  chunks that are now upstream).
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:35:31 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 13:35:31 -0400
Subject: rpms/iso-codes/devel iso-codes.spec,1.14,1.15
Message-ID: <200709051735.l85HZVKs026524@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26488

Modified Files:
	iso-codes.spec 
Log Message:
fix the Source: line



Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iso-codes.spec	5 Sep 2007 17:27:50 -0000	1.14
+++ iso-codes.spec	5 Sep 2007 17:34:58 -0000	1.15
@@ -8,7 +8,7 @@
 License:	LGPLv2+
 Group:	System Environment/Base
 URL:	http://alioth.debian.org/projects/pkg-isocodes/
-Source:	http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes-%{version}.tar.gz
+Source:	http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_%{version}.orig.tar.gz
 BuildRequires:	gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Sep  5 17:36:22 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 5 Sep 2007 13:36:22 -0400
Subject: rpms/koffice/devel koffice.spec,1.65,1.66
Message-ID: <200709051736.l85HaMik026631@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26595

Modified Files:
	koffice.spec 
Log Message:
* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-11
- rebuild (for poppler) 
- re-enable (kross)ruby support (f8+)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- koffice.spec	22 Aug 2007 08:00:10 -0000	1.65
+++ koffice.spec	5 Sep 2007 17:35:50 -0000	1.66
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -51,8 +51,7 @@
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
-# rawhide/ruby is busted atm -- Rex
-%if 0%{?fedora} != 8 || 0%{?rhel} > 4
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
@@ -695,8 +694,13 @@
 
 
 %changelog
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-11
+- rebuild (for poppler) 
+- re-enable (kross)ruby support (f8+)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 1.6.3-10
+1.6.3-10
 - rebuild for buildid
 
 * Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org>



From fedora-extras-commits at redhat.com  Wed Sep  5 17:42:00 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 5 Sep 2007 13:42:00 -0400
Subject: rpms/mod_evasive/devel mod_evasive.spec,1.2,1.3
Message-ID: <200709051742.l85Hg0qm026822@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/mod_evasive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26790

Modified Files:
	mod_evasive.spec 
Log Message:
Rebuild for APR changes.



Index: mod_evasive.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_evasive/devel/mod_evasive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_evasive.spec	29 Aug 2007 04:17:37 -0000	1.2
+++ mod_evasive.spec	5 Sep 2007 17:41:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mod_evasive
 Version:        1.10.1
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Denial of Service evasion module for Apache
 
 Group:          System Environment/Daemons
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.10.1-4.1
+- Rebuild for APR changes
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.10.1-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:43:53 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 5 Sep 2007 13:43:53 -0400
Subject: rpms/eclipse/devel .cvsignore,1.36,1.37 sources,1.48,1.49
Message-ID: <200709051743.l85Hhrag026901@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879

Modified Files:
	.cvsignore sources 
Log Message:
upload source zip for fedora eclipse platform plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	29 Jun 2007 19:40:48 -0000	1.36
+++ .cvsignore	5 Sep 2007 17:43:20 -0000	1.37
@@ -1,3 +1,3 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3.zip
-eclipse-fedora-splash-3.3.0.png
+org.fedoraproject.ide.platform-3.3.0.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	29 Jun 2007 19:40:48 -0000	1.48
+++ sources	5 Sep 2007 17:43:20 -0000	1.49
@@ -1,3 +1,3 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-3f5ee621f738ee107e312817dadacab4  eclipse-fedora-splash-3.3.0.png
 91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
+2a0ca56fa68d685a0f3d23c09000d723  org.fedoraproject.ide.platform-3.3.0.1.zip



From fedora-extras-commits at redhat.com  Wed Sep  5 17:53:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:53:51 -0400
Subject: rpms/libxklavier/devel .cvsignore, 1.12, 1.13 libxklavier.spec, 1.32,
	1.33 sources, 1.12, 1.13
Message-ID: <200709051753.l85Hrpxj027177@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27151

Modified Files:
	.cvsignore libxklavier.spec sources 
Log Message:
3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 May 2007 03:27:30 -0000	1.12
+++ .cvsignore	5 Sep 2007 17:53:18 -0000	1.13
@@ -1 +1 @@
-libxklavier-3.2.tar.bz2
+libxklavier-3.3.tar.gz


Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libxklavier.spec	23 Aug 2007 17:57:19 -0000	1.32
+++ libxklavier.spec	5 Sep 2007 17:53:18 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	3.2
-Release: 	3%{?dist}
+Version:	3.3
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -11,7 +11,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
-Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -25,6 +25,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gtk-doc
 Requires: libxml2-devel
 
 %description devel
@@ -55,7 +56,7 @@
 %files
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README COPYING.LIB 
+%doc AUTHORS NEWS README COPYING.LIB 
 %{_libdir}/lib*.so.*
 %{_datadir}/libxklavier
 
@@ -68,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 3.3-1
+- Update to 3.3
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 3.2-3
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 03:27:30 -0000	1.12
+++ sources	5 Sep 2007 17:53:18 -0000	1.13
@@ -1 +1 @@
-d248f96fdfc0e4f0ed583428eda9a997  libxklavier-3.2.tar.bz2
+0b9a62ad4f007e6c42a70a4f6e0aecbf  libxklavier-3.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 17:58:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:58:50 -0400
Subject: rpms/libxklavier/devel libxklavier.spec,1.33,1.34
Message-ID: <200709051758.l85HwoW5027327@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27283

Modified Files:
	libxklavier.spec 
Log Message:
3.3



Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libxklavier.spec	5 Sep 2007 17:53:18 -0000	1.33
+++ libxklavier.spec	5 Sep 2007 17:58:18 -0000	1.34
@@ -11,7 +11,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
-Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.gz
+Source: http://download.gnome.org/sources/libxklavier/3.3/libxklavier-3.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description



From fedora-extras-commits at redhat.com  Wed Sep  5 18:10:56 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:10:56 -0400
Subject: rpms/xulrunner/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xulrunner.spec, 1.6, 1.7
Message-ID: <200709051810.l85IAu2D001137@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1112

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Clean up the changelog and move to alpha7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 04:34:18 -0000	1.2
+++ .cvsignore	5 Sep 2007 18:10:23 -0000	1.3
@@ -1 +1 @@
-xulrunner-1.9.alpha6pre.20070628.tar.bz2
+xulrunner-1.9a7-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 04:34:18 -0000	1.2
+++ sources	5 Sep 2007 18:10:23 -0000	1.3
@@ -1 +1 @@
-868349f0f0045acd8174e1fefc0f124e  xulrunner-1.9.alpha6pre.20070628.tar.bz2
+566f4424ca0d30b2dacbdd8fb2670077  xulrunner-1.9a7-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xulrunner.spec	31 Aug 2007 22:26:41 -0000	1.6
+++ xulrunner.spec	5 Sep 2007 18:10:23 -0000	1.7
@@ -14,14 +14,14 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha6.pre.1%{?dist}
+Release:        0.alpha7.1%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball xulrunner-%{version}-source.tar.bz2
 %else
-%define tarball xulrunner-1.9.alpha6pre.20070628.tar.bz2
+%define tarball xulrunner-1.9a7-source.tar.bz2
 %endif
 Source0:        %{tarball}
 Source10:       %{name}-mozconfig
@@ -368,746 +368,5 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Sun Jun  3 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-2
-- Properly clean up threads with newer NSPR
-
-* Wed May 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-1
-- Final version
-
-* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc3
-- Update to 2.0.0.4 RC3
-
-* Tue Apr 17 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-4
-- Fix permissions of the man page
-
-* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-3
-- Ensure initial homepage on all locales is our proper default
-
-* Sun Mar 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-2
-- Fix the symlink to default bookmarks
-- Use mktemp for temp dirs
-
-* Tue Mar 20 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-1
-- Update to 2.0.0.3
-
-* Tue Mar 20 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.2-3
-- Default bookmarks no longer live here; use system-bookmarks
-
-* Mon Mar 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.2-2
-- Oops, define the variables I expect to use.
-
-* Fri Feb 23 2007 Martin Stransky <stransky at redhat.com> 2.0.0.2-1
-- Update to 2002
-
-* Wed Feb 21 2007 David Woodhouse <dwmw2 at redhat.com> 2.0.0.1-6
-- Fix PPC64 runtime
-- Fix firefox script to use 32-bit browser by default on PPC64 hardware
-
-* Fri Feb  9 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-5
-- Start using the specified locale
-
-* Tue Jan 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-4
-- Fix the DND implementation to not grab, so it works with new GTK+.
-
-* Thu Jan 18 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-3
-- Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed.
-
-* Fri Dec 22 2006 Christopher Aillon <caillon at redhat.com> 2.0.0.1-2
-- Strip out some frequent warnings; they muddy up the build output
-
-* Thu Dec 21 2006 Christopher Aillon <caillon at redhat.com> 2.0.0.1-1
-- Update to 2001
-
-* Fri Oct 27 2006 Christopher Aillon <caillon at redhat.com> 2.0-2
-- Tweak the .desktop file
-
-* Tue Oct 24 2006 Christopher Aillon <caillon at redhat.com> 2.0-1
-- Update to 2.0
-- Add patch from Behdad to fix pango printing.
-
-* Wed Oct 11 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-7
-- Add virtual provides for gecko applications.
-
-* Wed Oct  4 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-6
-- Bring the invisible character to parity with GTK+
-
-* Tue Sep 26 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-5
-- Fix crash when changing gtk key theme
-- Fix gtkmozembed window visibility
-- Prevent UI freezes while changing GNOME theme
-- Remove verbiage about pango; no longer required by upstream.
-
-* Tue Sep 19 2006 Christopher Aillon <caillon at redhat/com> 1.5.0.7-4
-- Arrrr! Add Obsoletes: mozilla to avoid GRE conflicts, me hearties!
-
-* Mon Sep 18 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-3
-- Bring back the GRE files for embeddors
-
-* Thu Sep 14 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-2
-- Update default bookmarks for FC6
-
-* Wed Sep 13 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-1
-- Update to 1.5.0.7
-
-* Thu Sep  7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-12
-- Icon tweaks and minor spec-file variable cleanup: s/ffdir/mozappdir/g
-
-* Wed Sep  6 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-11
-- Fix for cursor position in editor widgets by tagoh and behdad (#198759)
-
-* Sun Sep  3 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-10
-- Enable GCC visibility
-- export XLIB_SKIP_ARGB_VISUALS=1 as a temporary workaround to prevent
-  a broken Adobe/Macromedia Flash Player plugin taking the X server.
-
-* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
-- Build with -rpath (#161958)
-
-* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 
-- Remove "Pango breaks MathML" from firefox.sh.in
-
-* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8
-- Turn visibility back off again for now, as it still breaks the build.
-
-* Sat Aug 26 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-7
-- Remove "Pango breaks MathML" from firefox-1.5-pango-about.patch
-
-* Thu Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-6
-- Remove debugging statement from firefox-1.5-pango-mathml.patch
-
-* Wed Aug 23 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-5
-- Attempt to turn visibility back on since the GCC issues should have
-  been fixed.
-
-* Tue Aug 22 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-4
-- Update NSS requires to workaround a bug introduced by NSS changes.
-  https://bugzilla.mozilla.org/show_bug.cgi?id=294542
-  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201922
-
-* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com>
-- Add a better nopangoxft patch that doesn't depend on pangocairo
-- Add firefox-1.5-pango-mathml.patch (bug 150393)
-
-* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-3
-- Rebuild
-
-* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-2
-- Update to 1.5.0.6
-
-* Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-8
-- Pass --libdir to configure
-
-* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
-- Dereference links in %%install so the files get put in the
-  right place.
-
-* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
-- Actually, those pkgconfig files really shouldn't be here as we use
-  system nss and nspr.
-
-* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-5
-- Add more pkgconfig files
-
-* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4
-- Add pkgconfig files
-
-* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-3
-- Don't strip provides when building the devel package
-
-* Wed Jul 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
-- Update to 1.5.0.5
-
-* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.4-4
-- Ugh:
-  - Mozilla the platform is deprecated
-  - XULrunner has been promised for a while but is still not 1.0
-  - Ship a firefox-devel for now as we need a devel platform.
-  - The plan is to kill firefox-devel when xulrunner 1.0 ships. 
-- Clean up the files list a little bit.
-
-* Thu Jun 15 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-3
-- Force "gmake -j1" on ppc ppc64 s390 s390x
-
-* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
-- Firefox 1.5.0.4
-
-* Thu May  4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.3-2
-- Firefox 1.5.0.3
-
-* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-4
-- Really drop the broken langpacks this time.
-
-* Tue Apr 18 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-3
-- Drop some broken langpacks
-
-* Thu Apr 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
-- Firefox 1.5.0.2
-
-* Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
-- Add a notice to the about dialog denoting this is a pango enabled build.
-- Tweak the user agent denoting this is a pango enabled build.
-
-* Mon Mar  6 2006 Warren Togami <wtogami at redhat.com> - 1.5.0.1-7
-- make links point to the correct release
-
-* Mon Mar  6 2006 Ray Strode <rstrode at redhat.com> - 1.5.0.1-6
-- Add new bookmarks file from Warren (bug 182386)
-
-* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de>
-- add buildrequires libXt-devel for X11/Intrinsic.h, X11/Shell.h
-
-* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-5
-- Rebuild
-
-* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-4
-- Ensure our wrapper handles URLs with commas/spaces (Ilya Konstantinov)
-- Fix a pango typo
-
-* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-3
-- Improve the langpack install stuff
-- Fix up dumpstack.patch to match the finalized change
-
-* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.1-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2
-- Update language packs to 1.5.0.1
-- Add dumpstack.patch
-
-* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
-- Update to 1.5.0.1
-
-* Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
-- Ship langpacks again from upstream
-- Stop providing MozillaFirebird and mozilla-firebird
-
-* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.5-4
-- Looks like we can build ppc64 again.  Happy New Year!
-
-* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> - 1.5-3
-- Once again, disable ppc64 because of a new issue.
-  See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944
-
-* Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> - 1.5-2
-- Use the system NSS libraries
-- Build on ppc64
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Nov 29 2005 Christopher Aillon <caillon at redhat.com> - 1.5-1
-- Update to Firefox 1.5
-
-* Mon Nov 28 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.1.rc3
-- Fix issue with popup dialogs and other actions causing lockups
-
-* Fri Nov 18 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.rc3
-- Update to 1.5 rc3
-
-* Thu Nov  3 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.rc1
-- Update to 1.5 rc1
-- Clean up the default bookmarks
-
-* Sat Oct  8 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.beta2
-- Update to 1.5 beta 2
-
-* Wed Sep 14 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.beta1
-- Update to 1.5 beta 1.
-- Add patch to svg rendering to adjust for cairo behavior.
-- Happy birthday, dad!
-
-* Sat Aug 27 2005 Christopher Aillon <caillon at redhat.com> - 1.1-0.2.8.deerpark.alpha2
-- Re-enable SVG, canvas, and system cairo.
-- Fix issue with typing in proxy preference panel
-
-* Thu Aug 18 2005 Jeremy Katz <katzj at redhat.com> - 1.1-0.2.7.deerpark.alpha2.1
-- another fix to not use pango_xft
-
-* Mon Aug 15 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.6.deerpark.alpha2
-- Rebuild
-
-* Fri Jul 29 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.5.deerpark.alpha2
-- Re-enable ppc now that its binutils are fixed.
-- Disable SVG and canvas again.  The in-tree copy does not build against new pango.
-- When clicking a link and going back via history, don't keep the link focused.
-
-* Fri Jul 22 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.4.deerpark.alpha2
-- Add patch from Christian Persch to make the file chooser modal
-- Change default behavior of opening links from external apps to: New Tab
-- New build options:
-  --enable-svg
-  --enable-canvas
-
-* Wed Jul 20 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.3.deerpark.alpha2
-- Update firefox-1.1-uriloader.patch to fix crashes when calling into gnome-vfs2
-
-* Tue Jul 19 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.2.deerpark.alpha2
-- Do away with firefox-rebuild-databases.pl
-
-* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.1.deerpark.alpha2
-- Rebuild
-
-* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.0.1.deerpark.alpha2
-- Update to Deer Park Alpha 2
-  - STILL TODO:
-    - This build is not localized yet.
-    - Theme issues not yet resolved.
-    - Building on ppc platforms is busted, disable them for now.
-    - Forward port all remaining patches.
-
-* Sun Jul 17 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-6
-- Avoid a crash on 64bit platforms
-- Use system NSPR
-
-* Thu Jun 23 2005 Kristian H??gsberg <krh at redhat.com>  0:1.0.4-5
-- Add firefox-1.0-pango-cairo.patch to get rid of the last few Xft
-  references, fixing the "no fonts" problem.
-- Copy over changes from FC4 branch.
-
-* Tue May 24 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-4
-- Only install searchplugins for en-US, since there isn't any way
-  to dynamically select searchplugins per locale yet.
-
-* Mon May 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-3
-- Add support for locales:
-    af-ZA, ast-ES, ca-AD, cs-CZ, cy-GB, da-DK, de-DE, el-GR,
-    en-GB  es-AR, es-ES, eu-ES, fi-FI, fr-FR, ga-IE, he-IL,
-    hu-HU, it-IT, ko-KR, ja-JP, ja-JPM, mk-MK, nb-NO, nl-NL,
-    pa-IN, pl-PL, pt-BR, pt-PT, ro-RO, ru-RU, sk-SK, sl-SI,
-    sq-AL, sv-SE, tr-TR, zh-CN, zh-TW
-
-* Wed May 11 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-2
-- Update to 1.0.4
-
-* Mon May  9 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-5
-- Correctly position the IM candidate window for most locales
-  Note: it is still incorrectly positioned for zh_TW after this fix
-- Add temporary workaround to not create files in the user's $HOME (#149664)
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-4
-- Rebuild
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com>
-- Patch from Marcel Mol supporting launching with filenames
-  containing whitespace.
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-3
-- Firefox script fixes to support multilib installs.
-- Add upstream patch to fix bidi justification of pango
-- Add patch to fix launching of helper applications
-
-* Wed Apr 27 2005 Warren Togami <wtogami at redhat.com>
-- remove JVM version probing (#116445)
-- correct confusing PANGO vars in startup script
-
-* Fri Apr 15 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-2
-- Add patch to properly link against libgfxshared_s.a
-
-* Fri Apr 15 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-1
-- Update to security release 1.0.3
-
-* Tue Apr 12 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-4
-- Update useragent patch to match upstream.
-- Add nspr-config 64 bit patch from rstrode at redhat.com
-
-* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-3
-- Updated firefox icon (https://bugzilla.mozilla.org/show_bug.cgi?id=261679)
-- Fix for some more cursor issues in textareas (149991, 150002, 152089)
-
-* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-2
-- Make the "browser.link.open_external" pref work (David Fraser)
-
-* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-1
-- Firefox 1.0.2
-
-* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-6
-- Add patch to fix italic rendering errors with certain fonts (e.g. Tahoma)
-- Re-enable jsd since there is now a venkman version that works with Firefox.
-
-* Tue Mar  8 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-5
-- Add patch to compile against new fortified glibc macros
-
-* Fri Mar  4 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-4
-- Build against gcc4, add build patches to do so.
-
-* Thu Mar  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-3
-- Remerge firefox-1.0-pango-selection.patch
-- Add execshield patches for ia64 and ppc
-- BuildRequires libgnome-devel, libgnomeui-devel
-
-* Sun Feb 27 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-2
-- Add upstream fix to reduce round trips to xserver during remote control
-- Add upstream fix to call g_set_application_name
-
-* Thu Feb 24 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-1
-- Update to 1.0.1 fixing several security flaws.
-- Temporarily disable langpacks to workaround startup issues (#145806)
-- Request the correct system colors from gtk (#143423)
-
-* Tue Dec 28 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-8
-- Add upstream langpacks
-
-* Sat Dec 25 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-7
-- Make sure we get a URL passed in to firefox (#138861)
-- Mark some generated files as ghost (#136015)
-
-* Wed Dec 15 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-6
-- Don't have downloads "disappear" when downloading to desktop (#139015)
-- Add RPM version to the useragent
-- BuildRequires pango-devel
-
-* Sat Dec 11 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-5
-- Fix spacing in textareas when using pango for rendering
-- Enable pango rendering by default.
-- Enable smooth scrolling by default
-
-* Fri Dec  3 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-4
-- Add StartupWMClass patch from Damian Christey (#135830)
-- Use system colors by default (#137810)
-- Re-add s390(x)
-
-* Sat Nov 20 2004 Christopher Blizzard <blizzard at redhat.com> 0:1.0-3
-- Add patch that uses pango for selection.
-
-* Fri Nov 12 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-2
-- Fix livemarks icon issue. (#138989)
-
-* Tue Nov  8 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-1
-- Firefox 1.0
-
-* Thu Nov  4 2004 Christopher Aillon <caillon at redhat.com> 0:0.99-1.0RC1.3
-- Add support for GNOME stock icons. (bmo #233461)
-
-* Sat Oct 30 2004 Warren Togami <wtogami at redhat.com> 0:0.99-1.0RC1.2
-- #136330 BR freetype-devel with conditions
-- #135050 firefox should own mozilla plugin dir
-
-* Sat Oct 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.99-1.0RC1.1
-- Update to firefox-rc1
-- Add patch for s390(x)
-
-* Tue Oct 26 2004 Christopher Aillon <caillon at redhat.com>
-- Fix LD_LIBRARY_PATH at startup (Steve Knodle)
-
-* Fri Oct 22 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.21
-- Prevent inlining of stack direction detection (#135255)
-
-* Tue Oct 19 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.20
-- More file chooser fixes:
-    Pop up a confirmation dialog before overwriting files (#134648)
-    Allow saving as complete once again
-- Fix for upstream 263263.
-
-* Tue Oct 19 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.18
-- Fix for upstream 262689.
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com 0:0.10.1-1.0PR1.16
-- Update pango patch to one that defaults to off
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com> 0:0.10.1-1.0PR1.15
-- Fix problem where default apps aren't showing up in the download
-  dialog (#136261)
-- Fix default height being larger than the available area, cherry picked
-  from upstream
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com> 0:0.10.1-1.0PR1.13
-- Actually turn on pango in the mozconfig
-
-* Sat Oct 16 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.12
-- Disable the default application checks. (#133713)
-- Disable the software update feature. (#136017)
-
-* Wed Oct 13 2004 Christopher Blizzard <blizzard at redhat.com>
-- Use pango for rendering
-
-* Tue Oct 12 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.10
-- Fix for 64 bit crash at startup (b.m.o #256603)
-
-* Fri Oct  8 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.9
-- Fix compile issues (#134914)
-- Add patch to fix button focus issues (#133507)
-- Add patches to fix tab focus stealing issue (b.m.o #124750)
-
-* Fri Oct  1 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.8
-- Update to 0.10.1
-- Fix tab switching keybindings (#133504)
-
-* Fri Oct  1 2004 Bill Nottingham <notting at redhat.com> 0:0.10.0-1.0PR1.7
-- filter out library Provides: and internal Requires:
-
-* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.6
-- Prereq desktop-file-utils >= 0.9
-
-* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.5
-- Add clipboard access prevention patch.
-
-* Wed Sep 29 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.4
-- Add the xul mime type to the .desktop file
-
-* Tue Sep 28 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.3
-- Backport the GTK+ file chooser.
-- Update desktop database after uninstall.
-
-* Mon Sep 27 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.2
-- Change the vendor to mozilla not fedora
-- Build with --disable-strip so debuginfo packages work (#133738)
-- Add pkgconfig patch (bmo #261090)
-
-* Fri Sep 24 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.1
-- Add a BR for desktop-file-utils
-- Update default configuration options to use the firefox mozconfig (#132916)
-- Use Red Hat bookmarks (#133262)
-- Update default homepage (#132721)
-- Fix JS math on AMD64 (#133226)
-- Build with MOZILLA_OFICIAL (#132917)
-
-* Tue Sep 14 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.0
-- Update to 1.0PR1
-- Update man page references to say Firefox instead of Firebird
-- Remove gcc34 and extensions patch; they are now upstream
-- Update desktop database
-- Minor tweaks to the .desktop file
-
-* Fri Sep 03 2004 Christopher Aillon <caillon at redhat.com> 0:0.9.3-8
-- Fixup .desktop entry Name, GenericName, and Comment (#131602)
-- Add MimeType desktop entry (patch from jrb at redhat.com)
-- Build with --disable-xprint
-
-* Tue Aug 31 2004 Warren Togami <wtogami at redhat.com> 0:0.9.3-7
-- rawhide import
-- fedora.us #1765 NetBSD's freetype 2.1.8 compat patch
-
-* Sun Aug 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.6
-- and mng support is disabled again as it seams that there is
-  no real mng support in the code
-
-* Sat Aug 28 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.5
-- remove ldconfig from scriptlets (bug #1846 comment #40)
-- reenabled mng support (bug #1971)
-- removed --enable-strip to let rpm to the stripping (bug #1971)
-- honor system settings in firefox.sh (bug #1971)
-- setting umask 022 in scriptlets (bug #1962)
-
-* Sat Aug 07 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.4
-- copy the icon to the right place(TM)
-
-* Fri Aug 06 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.3
-- readded the xpm removed in 0:0.9.2-0.fdr.5
-
-* Thu Aug 05 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.2
-- added mozilla-1.7-psfonts.patch from rawhide mozilla
-
-* Thu Aug 05 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.1
-- updated to 0.9.3
-- removed following from .mozconfig:
-    ac_add_options --with-system-mng
-    ac_add_options --enable-xprint
-    ac_add_options --disable-dtd-debug
-    ac_add_options --disable-freetype2
-    ac_add_options --enable-strip-libs
-    ac_add_options --enable-reorder
-    ac_add_options --enable-mathml
-    ac_add_options --without-system-nspr
-
-* Tue Aug 03 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.5
-- applied parts of the patch from Matthias Saou (bug #1846)
-- delete empty directories in %%{ffdir}/chrome
-- more cosmetic changes to the spec file
-
-* Wed Jul 14 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.4
-- mozilla-default-plugin-less-annoying.patch readded
-
-* Tue Jul 13 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.3
-- added krb5-devel as build requirement
-
-* Tue Jul 13 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.2
-- added patch from bugzilla.mozilla.org (bug #247846)
-- removed Xvfb hack
-
-* Fri Jul 09 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.1
-- updated to 0.9.2
-
-* Mon Jul 05 2004 Warren Togami <wtogami at redhat.com> 0:0.9.1-0.fdr.3
-- mharris suggestion for backwards compatibilty with Xvfb hack
-
-* Tue Jun 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.1-0.fdr.2
-- added massive hack from the debian package to create the
-  extension directory
-
-* Tue Jun 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.1-0.fdr.1
-- updated to 0.9.1
-
-* Wed Jun 17 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.4
-- remove extensions patch
-- add post hack to create extensions
-- enable negotiateauth extension
-- copy icon to browser/app/default.xpm
-- --enable-official-branding
-
-* Wed Jun 17 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.3
-- extensions patch
-
-* Wed Jun 16 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.2
-- added gnome-vfs2-devel as BuildRequires
-- added gcc-3.4 patch 
-
-* Wed Jun 16 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.1
-- updated to 0.9
-- dropped x86_64 patches
-- dropped xremote patches
-
-* Wed May 26 2004 Adrian Reber <adrian at lisas.de> 0:0.8-0.fdr.13
-- remove unused files: mozilla-config
-
-* Sun May 23 2004 David Hill <djh[at]ii.net> 0:0.8-0.fdr.12
-- update mozconfig (fixes bug #1443)
-- installation directory includes version number
-
-* Mon May 10 2004 Justin M. Forbes <64bit_fedora at comcast.net> 0:0.8-0.fdr.11
-- merge x86_64 release 10 with fedora.us release 10 bump release to 11
-
-* Mon Apr 19 2004 Justin M. Forbes <64bit_fedora at comcast.net> 0:0.8-0.fdr.10
-- rebuild for FC2
-- change Source71 to properly replace Source7 for maintainability
-
-* Sun Apr 18 2004 Warren Togami <wtogami at redhat.com> 0:0.8-0.fdr.10
-- 3rd xremote patch
-- test -Os rather than -O2
-
-* Sun Apr 18 2004 Gene Czarcinski <gene at czarc.net>
-- more x86_64 fixes
-- fix firefix-xremote-client for x86_64 (similar to what is done for
-  firefox.sh.in)
-
-* Sat Apr 03 2004 Warren Togami <wtogami at redhat.com> 0:0.8-0.fdr.9
-- xremote patch for thunderbird integration #1113
-- back out ugly hack from /usr/bin/firefox
-- correct default bookmarks
-
-* Wed Feb 25 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.7
-- readded the new firefox icons
-
-* Sat Feb 21 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.6
-- removed new firefox icons
-
-* Wed Feb 18 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.5
-- nothing
-
-* Thu Feb 12 2004 Gene Czarcinski <czar at acm.org>
-- update for x86_64 ... usr mozilla-1.6 patches
-- change "firefox-i*" to "firefox-*" in above stuff
-
-* Tue Feb 10 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.4
-- another icon changed
-
-* Tue Feb 10 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.3
-- startup script modified
-
-* Mon Feb 09 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.2
-- new firefox icon
-- more s/firebird/firefox/
-
-* Mon Feb 09 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.1
-- new version: 0.8
-- new name: firefox
-
-* Sun Oct 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.7-0.fdr.2
-- s/0.6.1/0.7/
-- changed user-app-dir back to .phoenix as .mozilla-firebird
-  is not working as expected
-- manpage now also available as MozillaFirebird.1
-
-* Thu Oct 16 2003 Adrian Reber <adrian at lisas.de> - 0:0.7-0.fdr.1
-- updated to 0.7
-- provides webclient
-- run regxpcom and regchrome after installation and removal
-- added a man page from the debian package
-- changed user-app-dir from .phoenix to .mozilla-firebird
-
-* Tue Jul 29 2003 Adrian Reber <adrian at lisas.de> - 0:0.6.1-0.fdr.2
-- now with mozilla-default-plugin-less-annoying.patch; see bug #586
-
-* Tue Jul 29 2003 Adrian Reber <adrian at lisas.de> - 0:0.6.1-0.fdr.1
-- updated to 0.6.1
-- changed buildrequires for XFree86-devel from 0:4.3.0 to 0:4.2.1 
-  it should now also build on RH80
-
-* Sun Jul 13 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.5.rh90
-- enabled the type ahead extension: bug #484
-
-* Sun Jul 13 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.4.rh90
-- renamed it again back to MozillaFirbird
-- added libmng-devel to BuildRequires
-- startup homepage is now www.fedora.us
-- improved the startup script to use the unix remote protocol 
-  to open a new window
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.3.rh90
-- new icon from http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png
-- now using gtk2 as toolkit
-- renamed again back to mozilla-firebird (I like it better)
-- Provides: MozillaFirebird for compatibility with previous releases
-- changed default bookmarks.html to contain links to www.fedora.us
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.2.rh90
-- renamed package to MozillaFirebird and all files with the old name
-- enabled mng, mathml, xinerama support
-- now honouring RPM_OPT_FLAGS
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.1.rh90
-- updated to 0.6
-
-* Thu May 01 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.1.cvs20030501.rh90
-- Updated to CVS.
-- Renamed to mozilla-firebird.
-
-* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.3.cvs20030409.rh90
-- Updated to CVS.
-- Removed hard-coded library path.
-
-* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.3.cvs20030402.rh90
-- Changed Prereq to Requires.
-- Changed BuildRequires to gtk+-devel (instead of file).
-- Recompressed source with bzip2.
-- Removed post.
-
-* Tue Apr 02 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.2.cvs20030402.rh90
-- Added desktop-file-utils to BuildRequires.
-- Changed category to X-Fedora-Extra.
-- Updated to CVS.
-
-* Sun Mar 30 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.2.cvs20030328.rh90
-- Added Epoch:0.
-- Added libgtk-1.2.so.0 to the BuildRequires
-
-* Fri Mar 28 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030328.rh90
-- Updated to latest CVS.
-- Moved phoenix startup script into its own file
-
-* Wed Mar 26 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030326.rh90
-- Updated to latest CVS.
-- Changed release to 9 vs 8.1.
-- Added cvs script.
-- added encoding to desktop file.
-
-* Sun Mar 23 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030323.rh81
-- Updated to latest CVS.
-- added release specification XFree86-devel Build Requirement.
-- changed chmod to %attr
-
-* Fri Mar 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030317.rh81
-- Fixed naming scheme.
-- Fixed .desktop file.
-
-* Mon Mar 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030317.1
-- Updated to CVS.
-
-* Fri Mar 14 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030313.2
-- General Tweaking.
-
-* Thu Mar 13 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030313.1
-- Updated CVS.
-- Modified mozconfig.
-
-* Sun Mar 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030309.1
-- Initial RPM release.
+* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
+- Initial cut at XULRunner 1.9 Alpha 7



From fedora-extras-commits at redhat.com  Wed Sep  5 18:15:18 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:15:18 -0700
Subject: [pkgdb] netlabel_tools: james has requested approveacls
Message-ID: <200709051815.l85IFJuX018801@app3.fedora.phx.redhat.com>

James Antill (james) has requested the approveacls acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:17:14 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:17:14 -0700
Subject: [pkgdb] netlabel_tools: james has given up approveacls
Message-ID: <200709051817.l85IHEHe018812@app3.fedora.phx.redhat.com>

James Antill (james) has given up the approveacls acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:19:57 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:19:57 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051819.l85IJvgl018828@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchbugzilla acl on netlabel_tools (Fedora devel) to Approved for James Antill (james)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:19:58 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:19:58 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051819.l85IJwc9018834@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora devel) to Approved for James Antill (james)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:20:01 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:20:01 -0700
Subject: [pkgdb] netlabel_tools: james has given up commit
Message-ID: <200709051820.l85IK1uN018846@app3.fedora.phx.redhat.com>

James Antill (james) has given up the commit acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:20:03 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:20:03 -0700
Subject: [pkgdb] netlabel_tools: james has given up watchbugzilla
Message-ID: <200709051820.l85IK42s018852@app3.fedora.phx.redhat.com>

James Antill (james) has given up the watchbugzilla acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:24:57 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:24:57 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.7,1.8
Message-ID: <200709051824.l85IOvBD001406@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374

Modified Files:
	xulrunner.spec 
Log Message:
remove the psfonts patch for now as it doesn't apply



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xulrunner.spec	5 Sep 2007 18:10:23 -0000	1.7
+++ xulrunner.spec	5 Sep 2007 18:24:24 -0000	1.8
@@ -126,7 +126,7 @@
 #%patch5  -p1 -b .visibility
 
 #%patch20 -p0
-%patch21 -p1 -b .psfonts
+#%patch21 -p1 -b .psfonts
 #%patch22 -p0 -b .default-applications
 #%patch40 -p1 -b .bullet-bill
 %patch41 -p1 -b .undo-uriloader



From fedora-extras-commits at redhat.com  Wed Sep  5 18:29:17 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 5 Sep 2007 14:29:17 -0400
Subject: rpms/alfont/devel alfont.spec,1.1,1.2
Message-ID: <200709051829.l85ITHmx001506@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1483

Modified Files:
	alfont.spec 
Log Message:
* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-3
- Update license tag



Index: alfont.spec
===================================================================
RCS file: /cvs/extras/rpms/alfont/devel/alfont.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alfont.spec	3 Dec 2006 20:22:33 -0000	1.1
+++ alfont.spec	5 Sep 2007 18:28:44 -0000	1.2
@@ -1,9 +1,9 @@
 Name:           alfont
 Version:        2.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Font rendering library for the Allegro game library
 Group:          System Environment/Libraries
-License:        BSD-like
+License:        FTL
 URL:            http://chernsha.sitesled.com/
 # this is http://chernsha.sitesled.com/AlFont206.rar repackaged in .tgz format
 Source0:        %{name}-%{version}.tar.gz
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-3
+- Update license tag
+
 * Sun Dec  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-2
 - Link the .so file with allegro (bz 217998)
 - Add "Requires: allegro-devel" to the -devel subpackage



From fedora-extras-commits at redhat.com  Wed Sep  5 18:36:37 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:36:37 -0700
Subject: [pkgdb] netlabel_tools: james has requested approveacls
Message-ID: <200709051836.l85Iab0w019014@app3.fedora.phx.redhat.com>

James Antill (james) has requested the approveacls acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:36:52 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:36:52 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051836.l85IaqGJ019020@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora 6 is now owned by James Antill (james)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:20 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:37:20 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.8,1.9
Message-ID: <200709051837.l85IbKZq001771@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1721

Modified Files:
	xulrunner.spec 
Log Message:
more patch disabling for now


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xulrunner.spec	5 Sep 2007 18:24:24 -0000	1.8
+++ xulrunner.spec	5 Sep 2007 18:36:47 -0000	1.9
@@ -129,8 +129,8 @@
 #%patch21 -p1 -b .psfonts
 #%patch22 -p0 -b .default-applications
 #%patch40 -p1 -b .bullet-bill
-%patch41 -p1 -b .undo-uriloader
-%patch42 -p0 -b .uriloader
+#%patch41 -p1 -b .undo-uriloader
+#%patch42 -p0 -b .uriloader
 #%patch81 -p1 -b .nopangoxft
 #%patch82 -p1 -b .pango-mathml
 #%patch83 -p1 -b .pango-cursor-position



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:46 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 5 Sep 2007 14:37:46 -0400
Subject: rpms/freetype1/devel freetype1.spec,1.2,1.3
Message-ID: <200709051837.l85IbkBg001817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freetype1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1753

Modified Files:
	freetype1.spec 
Log Message:
* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.4.pre
- Update license tag



Index: freetype1.spec
===================================================================
RCS file: /cvs/extras/rpms/freetype1/devel/freetype1.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freetype1.spec	22 Aug 2007 12:22:51 -0000	1.2
+++ freetype1.spec	5 Sep 2007 18:37:14 -0000	1.3
@@ -4,14 +4,14 @@
 
 Name:           freetype1
 Version:        1.4
-Release:        0.3.pre%{?dist}
+Release:        0.4.pre%{?dist}
 Summary:        Free TrueType font rendering engine, compatibility version
 Group:          System Environment/Libraries
-License:        BSD-like
+License:        FTL
 URL:            http://www.freetype.org
 # notice we don't use %{version} as this package is based on 1.3.1, which is
 # then patched to a 1.4 pre release.
-Source:         http://dl.sf.net/sourceforge/freetype/freetype-1.3.1.tar.gz
+Source:         http://downloads.sourceforge.net/freetype/freetype-1.3.1.tar.gz
 Patch0:         freetype-1.3.1-1.4pre.patch
 Patch1:         freetype-1.4-disable-ft1-bci.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.4.pre
+- Update license tag
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.3.pre
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:56 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:37:56 -0700
Subject: [pkgdb] python had acl change status
Message-ID: <200709051837.l85Ibus7019034@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on python (Fedora devel) to Approved for Jeremy Katz (katzj)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:38:16 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:38:16 -0700
Subject: [pkgdb] python-docs had acl change status
Message-ID: <200709051838.l85IcHT7019043@app3.fedora.phx.redhat.com>

James Antill (james) has set the commit acl on python-docs (Fedora devel) to Approved for Jeremy Katz (katzj)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 18:52:09 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 14:52:09 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.77, 1.78 libsemanage.spec,
	1.130, 1.131 sources, 1.79, 1.80
Message-ID: <200709051852.l85Iq9Fl002158@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2097

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	20 Aug 2007 23:30:14 -0000	1.77
+++ .cvsignore	5 Sep 2007 18:51:36 -0000	1.78
@@ -83,3 +83,4 @@
 libsemanage-2.0.2.tgz
 libsemanage-2.0.3.tgz
 libsemanage-2.0.4.tgz
+libsemanage-2.0.5.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- libsemanage.spec	20 Aug 2007 23:30:14 -0000	1.130
+++ libsemanage.spec	5 Sep 2007 18:51:36 -0000	1.131
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
+- Upgrade to latest from NSA
+
 * Mon Aug 20 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
 - Upgrade to latest from NSA
 	* Allow dontaudits to be turned off via semanage interface when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	20 Aug 2007 23:30:14 -0000	1.79
+++ sources	5 Sep 2007 18:51:36 -0000	1.80
@@ -1 +1 @@
-947b51b687e2fe0b5b591df8f2994ff1  libsemanage-2.0.4.tgz
+9d34a0b2f3033ee90489dbb516653b49  libsemanage-2.0.5.tgz



From fedora-extras-commits at redhat.com  Wed Sep  5 18:52:32 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 5 Sep 2007 14:52:32 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec, 1.43,
	1.44 infinity.xml, 1.1, 1.2
Message-ID: <200709051852.l85IqWGS002203@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2128

Modified Files:
	desktop-backgrounds.spec infinity.xml 
Log Message:
- create links for default.png etc until more artwork shows up
- start animated backgrounds at midnight



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- desktop-backgrounds.spec	4 Sep 2007 17:54:42 -0000	1.43
+++ desktop-backgrounds.spec	5 Sep 2007 18:52:00 -0000	1.44
@@ -89,9 +89,9 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -s infinity/am00.png default.png;
- ln -s infinity/am00.png default-wide.png;
- ln -s infinity/am00.png default-5_4.png)
+ ln -sf infinity/am00.png default.png;
+ ln -sf infinity/am00.png default-wide.png;
+ ln -sf infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,8 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
-* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
+* Wed Sep  5 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
 - create links for default.png etc until more artwork shows up
+- start animated backgrounds at midnight
 
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 7.92-2
 - need to include less infinity backgrounds for now; the space usage 


Index: infinity.xml
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/infinity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- infinity.xml	30 Aug 2007 19:39:27 -0000	1.1
+++ infinity.xml	5 Sep 2007 18:52:00 -0000	1.2
@@ -3,9 +3,9 @@
     <year>2007</year>
     <month>8</month>
     <day>28</day>
-    <hour>12</hour>
-    <minute>21</minute>
-    <second>23</second>
+    <hour>0</hour>
+    <minute>0</minute>
+    <second>0</second>
   </starttime>
 
 <static>



From fedora-extras-commits at redhat.com  Wed Sep  5 18:56:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 5 Sep 2007 14:56:59 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.44,1.45
Message-ID: <200709051856.l85IuxKe002450@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2351

Modified Files:
	desktop-backgrounds.spec 
Log Message:
revert some weirdness where I changed a version I shouldn't have



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- desktop-backgrounds.spec	5 Sep 2007 18:52:00 -0000	1.44
+++ desktop-backgrounds.spec	5 Sep 2007 18:56:26 -0000	1.45
@@ -1,4 +1,4 @@
-%define rh_backgrounds_version 15
+%define rh_backgrounds_version 14
 %define infinity_version 0.0.1
 
 Summary: Desktop backgrounds



From fedora-extras-commits at redhat.com  Wed Sep  5 18:58:06 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:58:06 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.9,1.10
Message-ID: <200709051858.l85Iw6qC002532@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2456

Modified Files:
	xulrunner.spec 
Log Message:
xptcall not implemented on ppc? ExcludeArch for now



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xulrunner.spec	5 Sep 2007 18:36:47 -0000	1.9
+++ xulrunner.spec	5 Sep 2007 18:57:33 -0000	1.10
@@ -9,7 +9,7 @@
 
 %define official_branding 0
 
-ExcludeArch: ppc64
+ExcludeArch: ppc64 ppc
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:48 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:48 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested commit
Message-ID: <200709051900.l85J0nfs019247@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the commit acl on netlabel_tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:51 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:51 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested watchbugzilla
Message-ID: <200709051900.l85J0q1s019257@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the watchbugzilla acl on netlabel_tools (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:59 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:59 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested approveacls
Message-ID: <200709051900.l85J0xXv019266@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the approveacls acl on netlabel_tools (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:01 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:01:01 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested watchbugzilla
Message-ID: <200709051901.l85J12xG019277@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the watchbugzilla acl on netlabel_tools (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:05 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:01:05 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested approveacls
Message-ID: <200709051901.l85J16g3019324@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the approveacls acl on netlabel_tools (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:59 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:01:59 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051901.l85J1xSS019337@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora devel) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:01 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:01 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J22VN019347@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora devel) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:07 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:07 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J27mi019356@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora 7) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:10 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:10 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2A6V019366@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora 7) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 15:02:15 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch,1.23,1.24
Message-ID: <200709051902.l85J2Ft9008687@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637

Modified Files:
	libsemanage-rhat.patch 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libsemanage-rhat.patch	20 Aug 2007 23:30:14 -0000	1.23
+++ libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
@@ -74,10 +74,25 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
+--- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
+@@ -37,10 +37,10 @@
+ 	int expand_check;
+ 	int save_previous;
+ 	int save_linked;
+-	int disable_genhomedircon;
+ 	mode_t file_mode;
+ 	struct external_prog *load_policy;
+ 	struct external_prog *setfiles;
++	struct external_prog *genhomedircon;
+ 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
+ } semanage_conf_t;
+ 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-07-16 14:20:38.000000000 -0400
+--- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1120,7 +1120,7 @@
+@@ -1130,7 +1120,7 @@
  
        skip_reload:
  
@@ -86,12 +101,3 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1262,7 +1262,7 @@
- 		goto cleanup;
- 	}
- 
--	if ((retval =
-+	if (sh->do_rebuild_file_context && (retval =
- 	     semanage_exec_prog(sh, sh->conf->genhomedircon,
- 				sh->conf->store_path, "")) != 0) {
- 		ERR(sh, "genhomedircon returned error code %d.", retval);



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:15 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:15 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2Fga019375@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora 6) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:18 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:18 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2Ijj019385@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora 6) to Approved for Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:03:19 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:03:19 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051903.l85J3JJ2019405@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora devel is now owned by Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:06:26 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:06:26 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051906.l85J6Qbx019439@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora 7 is now owned by Steve Conklin (sconklin)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:20:34 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:20:34 -0400
Subject: rpms/rubygem-mongrel/devel cgi_multipart_eof_fix-2.3.gem, NONE,
	1.1 rubygem-mongrel.spec, 1.1,
	1.2 remove-cgi-multipart-eof-fix-dep.patch, 1.1, NONE
Message-ID: <200709051920.l85JKYTF009296@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9261/devel

Modified Files:
	rubygem-mongrel.spec 
Added Files:
	cgi_multipart_eof_fix-2.3.gem 
Removed Files:
	remove-cgi-multipart-eof-fix-dep.patch 
Log Message:
include cgi multipart fix so that this spec can also be used on EL-5



--- NEW FILE cgi_multipart_eof_fix-2.3.gem ---
data.tar.gz
?F
?????????~6?y????Y??hck3}????'??_???O?"??????-???_????Y???Uh?]????qV*????
%??X??F??2????B??A?(r?2??K?e??x???a??????????r???^:?}{????z?V[?N?<????????]5	?????A?k???3??Xn?eUz??A}?????@/?????/??;??5O???f?u{????i?v????q?y??u??4??:S+?B??}G?3D#???
z?Tj??%??T?w??P??+??_EUh?v???N???"?S&x?m?r
k0r	?HB? x?p`*B?!?+*???s??m??f???>6??s??as,&p}???K????:??rvx????<lb?r
???<?M?YY????X?IeO*???	?`o??vQ??a???4DB??KH?U????}O???i4?P(
z?J?J
L:g?????4~8?;??(}??d(T????	?+47?????@W+??(D?Q?
=C?????K/???(?_?+2E???(J?? ?n?"KO??h
?r???n??|f?G2??Yq|?????p>=?.?????!p???;?b
G?s?z?t??La??;h6{??G?4-???^?qE7J?.????>??+???-?Nsw???m?????xR?????GO??????V?R	?[\?????p?Uan??G??2K??m8tm??j?Lf!?6??U?}
{^;?8$???p??? $?N???o????r<???g/c??
??fp?????V??x_?#7?HD*Q??c2?S7
?????`???%??????????idI?'???e?N3&.6_@??\{b0@?NA?ix??K?c???????? "t*?1???D???_	l?0C9?=?????nU??dp??MK?
F1p???;?0@?x3?y???b?KHDk?Od?<K?????F!
_?B??!o$,??4H??d?l?U?en????v???{%>????"]?b??????????T?p?2?4??????rC9??\d at F&.?Z>[??y4(?@???QWW?'?
?????`??]??t??u???\????????????/???/??}Uj?2?}?2
?$??T???L1?A??t,?T???Y??!&b?;??4P4}?bc??Y"t???CD??E?'???
???E?=??=?=??DX3H?
b?q??$??A?y?T5??Y?HS??j??+??N~?^????&cMxr?<??I`(D?G??8
????$???:???????M??L?gGq(5??0"?B?A?R?(??h????My%??????5Ar+???Z???4u???4?????G?M??+?[?I?{M?S?z?<??{J??`BYdA?????e	?eXsU+?Q??k?V-+?????	????c????v????t?~??}?'?s???C?R*)??g*Q??K???????X??_??????z??U????????O??o:????xY?7?l????xR????ctD?(???
{?ih??? D?[?h*?=Co3???????e }u?SEo??
b??E??qU??Q?aa??x?X?q?K?eg??0tf?*??_?BX`???:z?Kt(????<9rc4K?)?S??r??1???H????BRD?`?$)2	b??$?m??bu???L???tb???X????H:?^.?E??d??	??D[???	w?^z????h??(!C?#??????14??
F. ?x?h7S
[?:?/?C?IG??????????D?P??y????????H?_1j,Ep<?L?*tF??@(SXX?p9??<Qsb%l4?b>?7?)?{,l?-Y?]y?fJL???????`????H*X??9I???<	????Z??Us?????d????'?S?
??8Ay???.?yQn???-?W1
^?W
*????y\	A ???nI??????Q?I2??????x??i=???[???S??1B$??$?m?7?'?u9/!qD??0)????h?I?a???<?
8i^<?~?y?
??CI;+?D?e? ???>???e?Y5_+??:?w?kW????I??u
??????N?????????c??
?=??7????Y??B?N:??ShwZ???????{g???j?V?u?wx??:~U?:??Z??n?}\?!?i7?0?	?8jv("???l??oy??V??F<hw`Nv;?????.?r?9i?6q2???? ??????(????????????)?????????[??w')??5e?Q0?67m???JM	???.
???q???????IS??s;?`?tt?_}/?/+?Z???DU??D?6o?zW?G??????????????3?W?-??	?w??-%?b??&?6???;?F????N??F??????????9?????W????FE\)y$7c%?A~vfn?;Ru??qzl????3????F?
????/???mY????R??????U????<b?_?e`??O?,v"??$K??????h????????^c?a??>z?h??<?????.?????,?}t??Y???0????????a`??r0???=|?????;???FHQ???4?V`<|??;?v?>??'?(??L????hk`?t
?*????W? ?oO?z?????r?Z???.???Q>???SV?5?5????Zv?P???\??????x at 0?|?r??Z????????E-?6????h?
?	?YN?DF????i7
i?k3W"#??	?F??'?
???%?RKs?YH?Lz??h?J?????P??L9?-C>?3'??S???.??j????
?>G(?? 2??????X?i?]#????j?G???2*x??9Z??a?VI?QO????0y6 ?k??_??w?8?ys?W????H?([?I$?A?t??R??H?"?????h????e???`Q=??<?S????+&(C?y?
?iB9k^?
n?b?l_
?h??1S[??I???????;.?}?*???????p?/???enn?
(??,??]?pM
???????lZ^'??B????I{_??u???zu?ceg?F???R.?DN????k?.A6??0?m??o?J~!'??\R???-?????]??V]?1??&??1v?????xv??b?X??6<??iC?\??N;???????#a??H???????_w?'???f????y?]?`F??????y?7te?h???????{?f??@??:???Vp?"SVQ?;??????eR-?>???T?5+g?91???????kz??*??(<W(tl??&??1??
Ib???F?Sn???l?p???????}?
D~>?;????t~J?G
m?v?:???4??bD?"ho?<|#?'+???j5+O0=??f
?
+/????????m?OJ??lkK?^>?[??T?p?B@???b??????w??l<??^???????>O?j?|dR?E??Re????2D??/J(??K?&J???q??)gK??c>?qp???D?C?S?&a?y
??????\??7M??j&_hK???N\?;???0?vr???fz?$??vb>????S?V?%B?SU?Sl?K????
?K???
????????6?@?5	???}D????
??/$?????&????z$?*???Y?;

??G
???!??^??????????|?#
?F
i??B??\???3??9??"*q_????<?,??????U?QE?A????J7Z?????-? ??p(?????S??x??4?A?Z???z?>
t?h??`??<??
P??????2???e?:+?dK(K>???K?X??????i
wC?t?U?P?-h??5?
?m??y?1j?b??X???{??`?38???w1?(???9>J?%??+g??r5?<_u??q??8?M?q??????z?S???????@???H???'wRV???s??u2_;?!????E?O????g?6&???75 ??x? )??8='E??x6?2R??t??T??"??RsU'??t!
mC?}/?0??Z?9?s?&???Dkt??6b??Y?D2??"????????[iuCjo?W????<,??[Q???Vb???7?'???y???n????!?<,?<?h,e$????X?Q?in??E/'zOq?Y8??????&M?????>?
??3(

Index: rubygem-mongrel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/rubygem-mongrel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-mongrel.spec	28 Aug 2007 15:11:34 -0000	1.1
+++ rubygem-mongrel.spec	5 Sep 2007 19:20:01 -0000	1.2
@@ -8,14 +8,15 @@
 Name: rubygem-%{gemname}
 
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Libraries
-License: GPLv2+ or Ruby
+# The entire source code is (GPLv2+ or Ruby) except for the code in
+# cgi_multipart_eof_fix-2.3.gem  which is AFL
+License: (GPLv2+ or Ruby) and AFL
 URL: http://mongrel.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: remove-cgi-multipart-eof-fix-dep.patch
+Source1: http://gems.rubyforge.org/gems/cgi_multipart_eof_fix-2.3.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires: ruby >= 1.8.6
 Requires: rubygems
 BuildRequires: ruby-devel
 Requires: rubygem(daemons) >= 1.0.3
@@ -38,6 +39,8 @@
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE1}
 install -d -m0755 %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{geminstdir}/lib/http11.so %{buildroot}%{ruby_sitearch}
 strip %{buildroot}%{ruby_sitearch}/http11.so
@@ -50,7 +53,7 @@
 chmod a+x %{buildroot}%{geminstdir}/examples/webrick_compare.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/blog.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
-patch -p0 -d %{buildroot} < %{PATCH0}
+chmod a+x %{buildroot}%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/cgi_multipart_eof_fix_test.rb
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,12 +78,27 @@
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%dir %{gemdir}/gems/cgi_multipart_eof_fix-2.3/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/lib/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/CHANGELOG
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/LICENSE
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/Manifest
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/README
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/cgi_multipart_eof_fix.gemspec
+%doc %{gemdir}/doc/cgi_multipart_eof_fix-2.3
+%{gemdir}/cache/cgi_multipart_eof_fix-2.3.gem
+%{gemdir}/specifications/cgi_multipart_eof_fix-2.3.gemspec
+
 %changelog
-* Fri Aug 24 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-4
+* Mon Sep  1 2007 Scott Seago <sseago at redhat.com> - 1.0.1-5
+- Include cgi multipart fix
+
+* Fri Aug 24 2007 Scott Seago <sseago at redhat.com> - 1.0.1-4
 - rpmlint fixes
 - added Ruby >= 1.8.6 Requires
 
-* Thu Aug 23 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-3
+* Thu Aug 23 2007 Scott Seago <sseago at redhat.com> - 1.0.1-3
 - Removed requirement for rubygem(cgi_multipart_eof_fix)
 - Patched source to work without cgi_multipart_eof_fix
 


--- remove-cgi-multipart-eof-fix-dep.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:23:41 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:23:41 -0400
Subject: rpms/rubygem-mongrel/F-7 cgi_multipart_eof_fix-2.3.gem, NONE,
	1.1 rubygem-mongrel.spec, 1.1,
	1.2 remove-cgi-multipart-eof-fix-dep.patch, 1.1, NONE
Message-ID: <200709051923.l85JNf3j009463@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9439/F-7

Modified Files:
	rubygem-mongrel.spec 
Added Files:
	cgi_multipart_eof_fix-2.3.gem 
Removed Files:
	remove-cgi-multipart-eof-fix-dep.patch 
Log Message:
added cgi multipart fix to rpm to allow for EL-5 inclusion



--- NEW FILE cgi_multipart_eof_fix-2.3.gem ---
data.tar.gz
?F
?????????~6?y????Y??hck3}????'??_???O?"??????-???_????Y???Uh?]????qV*????
%??X??F??2????B??A?(r?2??K?e??x???a??????????r???^:?}{????z?V[?N?<????????]5	?????A?k???3??Xn?eUz??A}?????@/?????/??;??5O???f?u{????i?v????q?y??u??4??:S+?B??}G?3D#???
z?Tj??%??T?w??P??+??_EUh?v???N???"?S&x?m?r
k0r	?HB? x?p`*B?!?+*???s??m??f???>6??s??as,&p}???K????:??rvx????<lb?r
???<?M?YY????X?IeO*???	?`o??vQ??a???4DB??KH?U????}O???i4?P(
z?J?J
L:g?????4~8?;??(}??d(T????	?+47?????@W+??(D?Q?
=C?????K/???(?_?+2E???(J?? ?n?"KO??h
?r???n??|f?G2??Yq|?????p>=?.?????!p???;?b
G?s?z?t??La??;h6{??G?4-???^?qE7J?.????>??+???-?Nsw???m?????xR?????GO??????V?R	?[\?????p?Uan??G??2K??m8tm??j?Lf!?6??U?}
{^;?8$???p??? $?N???o????r<???g/c??
??fp?????V??x_?#7?HD*Q??c2?S7
?????`???%??????????idI?'???e?N3&.6_@??\{b0@?NA?ix??K?c???????? "t*?1???D???_	l?0C9?=?????nU??dp??MK?
F1p???;?0@?x3?y???b?KHDk?Od?<K?????F!
_?B??!o$,??4H??d?l?U?en????v???{%>????"]?b??????????T?p?2?4??????rC9??\d at F&.?Z>[??y4(?@???QWW?'?
?????`??]??t??u???\????????????/???/??}Uj?2?}?2
?$??T???L1?A??t,?T???Y??!&b?;??4P4}?bc??Y"t???CD??E?'???
???E?=??=?=??DX3H?
b?q??$??A?y?T5??Y?HS??j??+??N~?^????&cMxr?<??I`(D?G??8
????$???:???????M??L?gGq(5??0"?B?A?R?(??h????My%??????5Ar+???Z???4u???4?????G?M??+?[?I?{M?S?z?<??{J??`BYdA?????e	?eXsU+?Q??k?V-+?????	????c????v????t?~??}?'?s???C?R*)??g*Q??K???????X??_??????z??U????????O??o:????xY?7?l????xR????ctD?(???
{?ih??? D?[?h*?=Co3???????e }u?SEo??
b??E??qU??Q?aa??x?X?q?K?eg??0tf?*??_?BX`???:z?Kt(????<9rc4K?)?S??r??1???H????BRD?`?$)2	b??$?m??bu???L???tb???X????H:?^.?E??d??	??D[???	w?^z????h??(!C?#??????14??
F. ?x?h7S
[?:?/?C?IG??????????D?P??y????????H?_1j,Ep<?L?*tF??@(SXX?p9??<Qsb%l4?b>?7?)?{,l?-Y?]y?fJL???????`????H*X??9I???<	????Z??Us?????d????'?S?
??8Ay???.?yQn???-?W1
^?W
*????y\	A ???nI??????Q?I2??????x??i=???[???S??1B$??$?m?7?'?u9/!qD??0)????h?I?a???<?
8i^<?~?y?
??CI;+?D?e? ???>???e?Y5_+??:?w?kW????I??u
??????N?????????c??
?=??7????Y??B?N:??ShwZ???????{g???j?V?u?wx??:~U?:??Z??n?}\?!?i7?0?	?8jv("???l??oy??V??F<hw`Nv;?????.?r?9i?6q2???? ??????(????????????)?????????[??w')??5e?Q0?67m???JM	???.
???q???????IS??s;?`?tt?_}/?/+?Z???DU??D?6o?zW?G??????????????3?W?-??	?w??-%?b??&?6???;?F????N??F??????????9?????W????FE\)y$7c%?A~vfn?;Ru??qzl????3????F?
????/???mY????R??????U????<b?_?e`??O?,v"??$K??????h????????^c?a??>z?h??<?????.?????,?}t??Y???0????????a`??r0???=|?????;???FHQ???4?V`<|??;?v?>??'?(??L????hk`?t
?*????W? ?oO?z?????r?Z???.???Q>???SV?5?5????Zv?P???\??????x at 0?|?r??Z????????E-?6????h?
?	?YN?DF????i7
i?k3W"#??	?F??'?
???%?RKs?YH?Lz??h?J?????P??L9?-C>?3'??S???.??j????
?>G(?? 2??????X?i?]#????j?G???2*x??9Z??a?VI?QO????0y6 ?k??_??w?8?ys?W????H?([?I$?A?t??R??H?"?????h????e???`Q=??<?S????+&(C?y?
?iB9k^?
n?b?l_
?h??1S[??I???????;.?}?*???????p?/???enn?
(??,??]?pM
???????lZ^'??B????I{_??u???zu?ceg?F???R.?DN????k?.A6??0?m??o?J~!'??\R???-?????]??V]?1??&??1v?????xv??b?X??6<??iC?\??N;???????#a??H???????_w?'???f????y?]?`F??????y?7te?h???????{?f??@??:???Vp?"SVQ?;??????eR-?>???T?5+g?91???????kz??*??(<W(tl??&??1??
Ib???F?Sn???l?p???????}?
D~>?;????t~J?G
m?v?:???4??bD?"ho?<|#?'+???j5+O0=??f
?
+/????????m?OJ??lkK?^>?[??T?p?B@???b??????w??l<??^???????>O?j?|dR?E??Re????2D??/J(??K?&J???q??)gK??c>?qp???D?C?S?&a?y
??????\??7M??j&_hK???N\?;???0?vr???fz?$??vb>????S?V?%B?SU?Sl?K????
?K???
????????6?@?5	???}D????
??/$?????&????z$?*???Y?;

??G
???!??^??????????|?#
?F
i??B??\???3??9??"*q_????<?,??????U?QE?A????J7Z?????-? ??p(?????S??x??4?A?Z???z?>
t?h??`??<??
P??????2???e?:+?dK(K>???K?X??????i
wC?t?U?P?-h??5?
?m??y?1j?b??X???{??`?38???w1?(???9>J?%??+g??r5?<_u??q??8?M?q??????z?S???????@???H???'wRV???s??u2_;?!????E?O????g?6&???75 ??x? )??8='E??x6?2R??t??T??"??RsU'??t!
mC?}/?0??Z?9?s?&???Dkt??6b??Y?D2??"????????[iuCjo?W????<,??[Q???Vb???7?'???y???n????!?<,?<?h,e$????X?Q?in??E/'zOq?Y8??????&M?????>?
??3(

Index: rubygem-mongrel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/rubygem-mongrel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-mongrel.spec	28 Aug 2007 15:13:13 -0000	1.1
+++ rubygem-mongrel.spec	5 Sep 2007 19:23:09 -0000	1.2
@@ -8,14 +8,15 @@
 Name: rubygem-%{gemname}
 
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Libraries
-License: GPLv2+ or Ruby
+# The entire source code is (GPLv2+ or Ruby) except for the code in
+# cgi_multipart_eof_fix-2.3.gem  which is AFL
+License: (GPLv2+ or Ruby) and AFL
 URL: http://mongrel.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: remove-cgi-multipart-eof-fix-dep.patch
+Source1: http://gems.rubyforge.org/gems/cgi_multipart_eof_fix-2.3.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires: ruby >= 1.8.6
 Requires: rubygems
 BuildRequires: ruby-devel
 Requires: rubygem(daemons) >= 1.0.3
@@ -38,6 +39,8 @@
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE1}
 install -d -m0755 %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{geminstdir}/lib/http11.so %{buildroot}%{ruby_sitearch}
 strip %{buildroot}%{ruby_sitearch}/http11.so
@@ -50,7 +53,7 @@
 chmod a+x %{buildroot}%{geminstdir}/examples/webrick_compare.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/blog.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
-patch -p0 -d %{buildroot} < %{PATCH0}
+chmod a+x %{buildroot}%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/cgi_multipart_eof_fix_test.rb
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,12 +78,27 @@
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%dir %{gemdir}/gems/cgi_multipart_eof_fix-2.3/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/lib/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/CHANGELOG
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/LICENSE
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/Manifest
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/README
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/cgi_multipart_eof_fix.gemspec
+%doc %{gemdir}/doc/cgi_multipart_eof_fix-2.3
+%{gemdir}/cache/cgi_multipart_eof_fix-2.3.gem
+%{gemdir}/specifications/cgi_multipart_eof_fix-2.3.gemspec
+
 %changelog
-* Fri Aug 24 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-4
+* Mon Sep  1 2007 Scott Seago <sseago at redhat.com> - 1.0.1-5
+- Include cgi multipart fix
+
+* Fri Aug 24 2007 Scott Seago <sseago at redhat.com> - 1.0.1-4
 - rpmlint fixes
 - added Ruby >= 1.8.6 Requires
 
-* Thu Aug 23 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-3
+* Thu Aug 23 2007 Scott Seago <sseago at redhat.com> - 1.0.1-3
 - Removed requirement for rubygem(cgi_multipart_eof_fix)
 - Patched source to work without cgi_multipart_eof_fix
 


--- remove-cgi-multipart-eof-fix-dep.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:24:39 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 5 Sep 2007 15:24:39 -0400
Subject: comps comps-f8.xml.in,1.91,1.92
Message-ID: <200709051924.l85JOdPT009525@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9419

Modified Files:
	comps-f8.xml.in 
Log Message:
* Add bluez-gnome as a default for desktops
* Remove dvd+rw-tools from Desktop, it's pulled in by nautilus-cd-burner
* Make bluez-utils-cups a default printing package, as bluez-utils is a default
  base package
* Add bluez-utils-alsa as a default audio package



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- comps-f8.xml.in	5 Sep 2007 17:08:59 -0000	1.91
+++ comps-f8.xml.in	5 Sep 2007 19:24:09 -0000	1.92
@@ -1613,8 +1613,8 @@
       <packagereq type="default">alacarte</packagereq>
       <packagereq type="default">at-spi</packagereq>
       <packagereq type="default">bug-buddy</packagereq>
+      <packagereq type="default">bluez-gnome</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
-      <packagereq type="default">dvd+rw-tools</packagereq>
       <packagereq type="default">eog</packagereq>
       <packagereq type="default">esc</packagereq>
       <packagereq type="default">evince</packagereq>
@@ -2942,7 +2942,7 @@
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
-      <packagereq type="optional">bluez-utils-cups</packagereq>
+      <packagereq type="default">bluez-utils-cups</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3154,6 +3154,7 @@
     <packagelist>
       <packagereq type="mandatory">alsa-utils</packagereq>
       <packagereq type="mandatory">vorbis-tools</packagereq>
+      <packagereq type="default">bluez-utils-alsa</packagereq>
       <packagereq type="default">cdparanoia</packagereq>
       <packagereq type="default">genisoimage</packagereq>
       <packagereq type="default">gstreamer-plugins-good</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 19:27:15 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 5 Sep 2007 15:27:15 -0400
Subject: comps comps-f8.xml.in,1.92,1.93
Message-ID: <200709051927.l85JRFoN009576@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9548

Modified Files:
	comps-f8.xml.in 
Log Message:
* Add gnome-vfs2-obexftp to the default Desktop list (for Bluetooth browsing)
* Add gnome-phone-manager to the default Desktop



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- comps-f8.xml.in	5 Sep 2007 19:24:09 -0000	1.92
+++ comps-f8.xml.in	5 Sep 2007 19:26:45 -0000	1.93
@@ -1627,6 +1627,7 @@
       <packagereq type="default">gnome-bluetooth</packagereq>
       <packagereq type="default">gnome-media</packagereq>
       <packagereq type="default">gnome-netstatus</packagereq>
+      <packagereq type="default">gnome-phone-manager</packagereq>
       <packagereq type="default">gnome-pilot</packagereq>
       <packagereq type="default">gnome-power-manager</packagereq>
       <packagereq type="default">gnome-screensaver</packagereq>
@@ -1635,6 +1636,7 @@
       <packagereq type="default">gnome-user-docs</packagereq>
       <packagereq type="default">gnome-user-share</packagereq>
       <packagereq type="default">gnome-utils</packagereq>
+      <packagereq type="default">gnome-vfs2-obexftp</packagereq>
       <packagereq type="default">gnome-vfs2-smb</packagereq>
       <packagereq type="default">gnome-volume-manager</packagereq>
       <packagereq type="default">gok</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 19:30:34 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:30:34 -0400
Subject: rpms/rubygem-mongrel/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 cgi_multipart_eof_fix-2.3.gem, 1.1, NONE
Message-ID: <200709051930.l85JUYcC009680@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9635/F-7

Modified Files:
	.cvsignore sources 
Removed Files:
	cgi_multipart_eof_fix-2.3.gem 
Log Message:
moving gem to upload


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 21:29:03 -0000	1.2
+++ .cvsignore	5 Sep 2007 19:30:01 -0000	1.3
@@ -1 +1,2 @@
 mongrel-1.0.1.gem
+cgi_multipart_eof_fix-2.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 21:29:03 -0000	1.2
+++ sources	5 Sep 2007 19:30:01 -0000	1.3
@@ -1 +1,2 @@
 e3caa5d827d0d4bf03acc7245b71694f  mongrel-1.0.1.gem
+fca23cd955342af53f590c10c06ec87f  cgi_multipart_eof_fix-2.3.gem


--- cgi_multipart_eof_fix-2.3.gem DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:30:36 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:30:36 -0400
Subject: rpms/rubygem-mongrel/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 cgi_multipart_eof_fix-2.3.gem, 1.1, NONE
Message-ID: <200709051930.l85JUaew009684@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9635/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	cgi_multipart_eof_fix-2.3.gem 
Log Message:
moving gem to upload


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 21:27:39 -0000	1.2
+++ .cvsignore	5 Sep 2007 19:30:04 -0000	1.3
@@ -1 +1,2 @@
 mongrel-1.0.1.gem
+cgi_multipart_eof_fix-2.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 21:27:39 -0000	1.2
+++ sources	5 Sep 2007 19:30:04 -0000	1.3
@@ -1 +1,2 @@
 e3caa5d827d0d4bf03acc7245b71694f  mongrel-1.0.1.gem
+fca23cd955342af53f590c10c06ec87f  cgi_multipart_eof_fix-2.3.gem


--- cgi_multipart_eof_fix-2.3.gem DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:38:32 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 5 Sep 2007 15:38:32 -0400
Subject: rpms/claws-mail-plugins/F-7 .cvsignore, 1.8,
	1.9 claws-mail-plugins.spec, 1.14, 1.15 sources, 1.8, 1.9
Message-ID: <200709051938.l85JcWhO009965@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9894/F-7

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jul 2007 17:04:58 -0000	1.8
+++ .cvsignore	5 Sep 2007 19:38:00 -0000	1.9
@@ -1 +1 @@
-claws-mail-extra-plugins-2.10.0.tar.bz2
+claws-mail-extra-plugins-3.0.0.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- claws-mail-plugins.spec	22 Aug 2007 07:55:13 -0000	1.14
+++ claws-mail-plugins.spec	5 Sep 2007 19:38:00 -0000	1.15
@@ -1,26 +1,27 @@
 # define plugin version
-%define acpinotifier	1.0.11
-%define attachwarner    0.2.7
-%define attremover	1.0.6
-%define cachesaver	0.10.5
-%define fetchinfo	0.4.19
-%define gtkhtml2viewer  0.15.1
-%define mailmbox	1.13.1
-%define newmail		0.0.10
-%define notification	0.11
-%define pdfviewer       0.5
-%define perl		0.9.9
-%define rssyl		0.14
-%define smime		0.7.1
-%define synce		0.7.1
-%define vcalendar	1.96
+%define acpinotifier	1.0.12
+%define attachwarner    0.2.8
+%define attremover	1.0.7
+%define cachesaver	0.10.6
+%define fetchinfo	0.4.20
+%define gtkhtml2viewer  0.15.2
+%define mailmbox	1.14
+%define newmail		0.0.11
+%define notification	0.12
+%define pdfviewer       0.6
+%define perl		0.9.10
+%define rssyl		0.15
+%define smime		0.7.2
+%define spamreport      0.2
+%define synce		0.7.2
+%define vcalendar	1.97
 Name:           claws-mail-plugins
-Version:        2.10.0
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
-License:        GPLv2 and GPLv2+ and MIT
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  synce-devel
+BuildRequires:  libsynce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
@@ -55,6 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
+Requires:       %{name}-spamreport = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -208,6 +210,14 @@
 This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
 mails, verify signatures or sign and encrypt your own mails.
 
+%package spam-report
+Summary:        Report spam mail to various places
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description spam-report
+This plugin can report spam mails to various places.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -300,6 +310,11 @@
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#smime
+cd ../spam_report-%{spamreport}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 #synce
 cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
@@ -373,6 +388,10 @@
 cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 
+#spamreport
+cd ../spam_report-%{spamreport}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+
 
 #synce
 cd ../synce_plugin-%{synce}
@@ -507,6 +526,7 @@
 %{_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(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
@@ -569,6 +589,18 @@
 %doc smime-%{smime}/NEWS
 %{_libdir}/claws-mail/plugins/smime*
 
+%files spam-report
+%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(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(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
+
 %files synce
 %defattr(-,root,root,-)
 %doc synce_plugin-%{synce}/AUTHORS
@@ -599,6 +631,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0
+- version upgrade
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-2
 - new license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jul 2007 17:04:58 -0000	1.8
+++ sources	5 Sep 2007 19:38:00 -0000	1.9
@@ -1 +1 @@
-1dc867cb2b781a65eace390fd1deb424  claws-mail-extra-plugins-2.10.0.tar.bz2
+c59f022987fb8136b6d4a8a0611d2d39  claws-mail-extra-plugins-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 19:38:35 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 5 Sep 2007 15:38:35 -0400
Subject: rpms/claws-mail-plugins/devel .cvsignore, 1.8,
	1.9 claws-mail-plugins.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200709051938.l85JcZji009970@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9894/devel

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jul 2007 16:58:44 -0000	1.8
+++ .cvsignore	5 Sep 2007 19:38:03 -0000	1.9
@@ -1 +1 @@
-claws-mail-extra-plugins-2.10.0.tar.bz2
+claws-mail-extra-plugins-3.0.0.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- claws-mail-plugins.spec	22 Aug 2007 07:55:16 -0000	1.16
+++ claws-mail-plugins.spec	5 Sep 2007 19:38:03 -0000	1.17
@@ -1,26 +1,27 @@
 # define plugin version
-%define acpinotifier	1.0.11
-%define attachwarner    0.2.7
-%define attremover	1.0.6
-%define cachesaver	0.10.5
-%define fetchinfo	0.4.19
-%define gtkhtml2viewer  0.15.1
-%define mailmbox	1.13.1
-%define newmail		0.0.10
-%define notification	0.11
-%define pdfviewer       0.5
-%define perl		0.9.9
-%define rssyl		0.14
-%define smime		0.7.1
-%define synce		0.7.1
-%define vcalendar	1.96
+%define acpinotifier	1.0.12
+%define attachwarner    0.2.8
+%define attremover	1.0.7
+%define cachesaver	0.10.6
+%define fetchinfo	0.4.20
+%define gtkhtml2viewer  0.15.2
+%define mailmbox	1.14
+%define newmail		0.0.11
+%define notification	0.12
+%define pdfviewer       0.6
+%define perl		0.9.10
+%define rssyl		0.15
+%define smime		0.7.2
+%define spamreport      0.2
+%define synce		0.7.2
+%define vcalendar	1.97
 Name:           claws-mail-plugins
-Version:        2.10.0
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
-License:        GPLv2 and GPLv2+ and MIT
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  synce-devel
+BuildRequires:  libsynce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
@@ -55,6 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
+Requires:       %{name}-spamreport = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -208,6 +210,14 @@
 This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
 mails, verify signatures or sign and encrypt your own mails.
 
+%package spam-report
+Summary:        Report spam mail to various places
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description spam-report
+This plugin can report spam mails to various places.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -300,6 +310,11 @@
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#smime
+cd ../spam_report-%{spamreport}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 #synce
 cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
@@ -373,6 +388,10 @@
 cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 
+#spamreport
+cd ../spam_report-%{spamreport}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+
 
 #synce
 cd ../synce_plugin-%{synce}
@@ -507,6 +526,7 @@
 %{_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(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
@@ -569,6 +589,18 @@
 %doc smime-%{smime}/NEWS
 %{_libdir}/claws-mail/plugins/smime*
 
+%files spam-report
+%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(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(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
+
 %files synce
 %defattr(-,root,root,-)
 %doc synce_plugin-%{synce}/AUTHORS
@@ -599,10 +631,13 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0
+- version upgrade
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-2
 - new license tag
-- rebuild for ppc32
 
 * Tue Jul 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jul 2007 16:58:44 -0000	1.8
+++ sources	5 Sep 2007 19:38:03 -0000	1.9
@@ -1 +1 @@
-1dc867cb2b781a65eace390fd1deb424  claws-mail-extra-plugins-2.10.0.tar.bz2
+c59f022987fb8136b6d4a8a0611d2d39  claws-mail-extra-plugins-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 19:43:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 5 Sep 2007 15:43:56 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc5-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.680, 1.681 kernel.spec, 1.147,
	1.148 linux-2.6-build-nonintconfig.patch, 1.10, 1.11 sources,
	1.642, 1.643 upstream, 1.564,
	1.565 linux-2.6-ata-via-fix-dma-mode.patch, 1.1,
	NONE linux-2.6-libata-terminate-list.patch, 1.1,
	NONE linux-2.6-net-oops.patch, 1.1, NONE
Message-ID: <200709051943.l85JhuOQ010055@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10022

Modified Files:
	.cvsignore kernel.spec linux-2.6-build-nonintconfig.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc5-git1.bz2.sign 
Removed Files:
	linux-2.6-ata-via-fix-dma-mode.patch 
	linux-2.6-libata-terminate-list.patch linux-2.6-net-oops.patch 
Log Message:
* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc5-git1



--- NEW FILE patch-2.6.23-rc5-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG3avpyGugalF9Dw4RAiyrAJ9Sanwlphian9OKCBEtyrPnCYqgagCfe8fA
ClqxNm8hZwVxdOsNb4oqA8k=
=YXZA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- .cvsignore	4 Sep 2007 21:59:46 -0000	1.680
+++ .cvsignore	5 Sep 2007 19:43:23 -0000	1.681
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kernel.spec	4 Sep 2007 22:06:22 -0000	1.147
+++ kernel.spec	5 Sep 2007 19:43:23 -0000	1.148
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -623,8 +623,6 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
-Patch662: linux-2.6-libata-terminate-list.patch
-Patch663: linux-2.6-ata-via-fix-dma-mode.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -669,7 +667,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1600: linux-2.6-net-oops.patch
 
 %endif
 
@@ -1119,10 +1116,6 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
-# Terminate list in ata-piix
-ApplyPatch linux-2.6-libata-terminate-list.patch
-# fix DMA on vt6421
-ApplyPatch linux-2.6-ata-via-fix-dma-mode.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1197,9 +1190,6 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
-# Fix TCP oops.
-ApplyPatch linux-2.6-net-oops.patch
-
 
 # END OF PATCH APPLICATIONS
 
@@ -1792,6 +1782,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc5-git1
+
 * Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix DMA mode on VIA 6421
 

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-build-nonintconfig.patch	26 Jul 2007 17:09:28 -0000	1.10
+++ linux-2.6-build-nonintconfig.patch	5 Sep 2007 19:43:23 -0000	1.11
@@ -33,10 +33,10 @@
  static const char *get_help(struct menu *menu)
  {
  	if (menu_has_help(menu))
-@@ -103,6 +107,14 @@ static void conf_askvalue(struct symbol 
+@@ -103,6 +107,16 @@ static void conf_askvalue(struct symbol 
  		fflush(stdout);
  		fgets(line, 128, stdin);
- 		return;
+ 		return 1;
 +	case dont_ask:
 +		if (!sym_has_value(sym)) {
 +			fprintf(stderr,"CONFIG_%s\n",sym->name);
@@ -44,10 +44,12 @@
 +		}
 +		/*FALLTHROUGH*/
 +	case dont_ask_dont_tell:
-+		return;
++		if (sym_has_value(sym))
++			return 0;
++		return 1;
  	case set_default:
  		printf("%s\n", def);
- 		return;
+ 		return 1;
 @@ -346,6 +358,11 @@ static int conf_choice(struct menu *menu
  			printf("?");
  		printf("]: ");


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -r1.642 -r1.643
--- sources	1 Sep 2007 16:29:55 -0000	1.642
+++ sources	5 Sep 2007 19:43:23 -0000	1.643
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2
+4cfdcb5e00c1db78237b15e6ce955367  patch-2.6.23-rc5-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- upstream	1 Sep 2007 16:29:55 -0000	1.564
+++ upstream	5 Sep 2007 19:43:23 -0000	1.565
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5-git1.bz2


--- linux-2.6-ata-via-fix-dma-mode.patch DELETED ---


--- linux-2.6-libata-terminate-list.patch DELETED ---


--- linux-2.6-net-oops.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:15 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:15 -0700
Subject: [pkgdb] eclipse Orphaned
Message-ID: <200709051948.l85JmG01019775@app3.fedora.phx.redhat.com>

Package eclipse in Fedora devel was orphaned by Ben Konrath (bkonrath)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:17 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:17 -0700
Subject: [pkgdb] eclipse Orphaned
Message-ID: <200709051948.l85JmHRh019784@app3.fedora.phx.redhat.com>

Package eclipse in Fedora 7 was orphaned by Ben Konrath (bkonrath)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:38 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:38 -0700
Subject: [pkgdb] eclipse-pydev Orphaned
Message-ID: <200709051948.l85JmdXY019794@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora devel was orphaned by Ben Konrath (bkonrath)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:40 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:40 -0700
Subject: [pkgdb] eclipse-pydev Orphaned
Message-ID: <200709051948.l85JmeGo019804@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora 7 was orphaned by Ben Konrath (bkonrath)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:32 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 05 Sep 2007 12:49:32 -0700
Subject: [pkgdb] eclipse Owned
Message-ID: <200709051949.l85JnWkv019818@app3.fedora.phx.redhat.com>

Package eclipse in Fedora devel is now owned by Andrew Overholt (overholt)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:37 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 15:49:37 -0400
Subject: rpms/xulrunner/devel camellia256.patch, NONE, 1.1 xulrunner.spec,
	1.10, 1.11
Message-ID: <200709051949.l85Jnb67010469@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10444

Modified Files:
	xulrunner.spec 
Added Files:
	camellia256.patch 
Log Message:
temporarily revert support for camellia 256 as our NSS doesn't support it yet


camellia256.patch:

--- NEW FILE camellia256.patch ---
Temporarily revert https://bugzilla.mozilla.org/attachment.cgi?id=266361

Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.147
diff -u -8 -p -r1.147 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	14 May 2007 21:09:58 -0000	1.147
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	28 May 2007 09:51:50 -0000
@@ -902,16 +902,19 @@ static CipherPref CipherPrefs[] = {
  {"security.ssl3.rsa_des_ede3_sha", SSL_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA and a SHA1 MAC
  {"security.ssl3.rsa_fips_des_sha", SSL_RSA_FIPS_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC (FIPS)
  {"security.ssl3.rsa_des_sha", SSL_RSA_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC
  {"security.ssl3.rsa_1024_rc4_56_sha", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA}, // 56-bit RC4 encryption with RSA and a SHA1 MAC (export)
  {"security.ssl3.rsa_1024_des_cbc_sha", TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC (export)
  {"security.ssl3.rsa_rc4_40_md5", SSL_RSA_EXPORT_WITH_RC4_40_MD5}, // 40-bit RC4 encryption with RSA and an MD5 MAC (export)
  {"security.ssl3.rsa_rc2_40_md5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5}, // 40-bit RC2 encryption with RSA and an MD5 MAC (export)
  /* Extra SSL3/TLS cipher suites */
+ {"security.ssl3.dhe_rsa_camellia_256_sha", TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA, DHE, and a SHA1 MAC
+ {"security.ssl3.dhe_dss_camellia_256_sha", TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with DSA, DHE, and a SHA1 MAC
+ {"security.ssl3.rsa_camellia_256_sha", TLS_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_aes_256_sha", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_aes_256_sha", TLS_DHE_DSS_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA and a SHA1 MAC
    /* TLS_DHE_DSS_WITH_RC4_128_SHA // 128-bit RC4 encryption with DSA, DHE, and a SHA1 MAC
       If this cipher gets included at a later time, it should get added at this position */
  {"security.ssl3.ecdhe_ecdsa_aes_256_sha", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with ECDHE-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdhe_ecdsa_aes_128_sha", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with ECDHE-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdhe_ecdsa_des_ede3_sha", TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDHE-ECDSA and a SHA1 MAC
@@ -927,16 +930,19 @@ static CipherPref CipherPrefs[] = {
  {"security.ssl3.ecdh_ecdsa_des_ede3_sha", TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_ecdsa_rc4_128_sha", TLS_ECDH_ECDSA_WITH_RC4_128_SHA}, // 128-bit RC4 encryption with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_ecdsa_null_sha", TLS_ECDH_ECDSA_WITH_NULL_SHA}, // No encryption with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_aes_256_sha", TLS_ECDH_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_des_ede3_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_rc4_128_sha", TLS_ECDH_RSA_WITH_RC4_128_SHA}, // 128-bit RC4 encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_null_sha", TLS_ECDH_RSA_WITH_NULL_SHA}, // No encryption with ECDH-RSA and a SHA1 MAC
+ {"security.ssl3.dhe_rsa_camellia_128_sha", TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA, DHE, and a SHA1 MAC
+ {"security.ssl3.dhe_dss_camellia_128_sha", TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with DSA, DHE, and a SHA1 MAC
+ {"security.ssl3.rsa_camellia_128_sha", TLS_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_aes_128_sha", TLS_DHE_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_aes_128_sha", TLS_DHE_DSS_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_des_ede3_sha", SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_des_ede3_sha", SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_rsa_des_sha", SSL_DHE_RSA_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_des_sha", SSL_DHE_DSS_WITH_DES_CBC_SHA}, // 56-bit DES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_null_sha", SSL_RSA_WITH_NULL_SHA}, // No encryption with RSA authentication and a SHA1 MAC
Index: mozilla/netwerk/base/public/security-prefs.js
===================================================================
RCS file: /cvsroot/mozilla/netwerk/base/public/security-prefs.js,v
retrieving revision 1.15
diff -u -8 -p -r1.15 security-prefs.js
--- mozilla/netwerk/base/public/security-prefs.js	16 May 2006 00:33:43 -0000	1.15
+++ mozilla/netwerk/base/public/security-prefs.js	28 May 2007 09:52:49 -0000
@@ -15,16 +15,22 @@ pref("security.ssl3.rsa_rc4_128_sha", tr
 pref("security.ssl3.rsa_fips_des_ede3_sha", true);
 pref("security.ssl3.rsa_des_ede3_sha", true);
 pref("security.ssl3.rsa_fips_des_sha", false);
 pref("security.ssl3.rsa_des_sha", false);
 pref("security.ssl3.rsa_1024_rc4_56_sha", false);
 pref("security.ssl3.rsa_1024_des_cbc_sha", false);
 pref("security.ssl3.rsa_rc4_40_md5", false);
 pref("security.ssl3.rsa_rc2_40_md5", false);
+pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
+pref("security.ssl3.dhe_dss_camellia_256_sha", true);
+pref("security.ssl3.rsa_camellia_256_sha", true);
+pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
+pref("security.ssl3.dhe_dss_camellia_128_sha", true);
+pref("security.ssl3.rsa_camellia_128_sha", true);
 pref("security.ssl3.dhe_rsa_aes_256_sha", true);
 pref("security.ssl3.dhe_dss_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_des_ede3_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_null_sha", false);



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xulrunner.spec	5 Sep 2007 18:57:33 -0000	1.10
+++ xulrunner.spec	5 Sep 2007 19:49:05 -0000	1.11
@@ -35,6 +35,7 @@
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
+Patch2:         camellia256.patch
 
 # customization patches
 Patch21:        firefox-0.7.3-psfonts.patch
@@ -121,6 +122,7 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
+%patch2   -Rp1 -b .camellia256
 #%patch3  -p1
 #%patch4  -p1
 #%patch5  -p1 -b .visibility
@@ -370,3 +372,4 @@
 %changelog
 * Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
 - Initial cut at XULRunner 1.9 Alpha 7
+- Temporarily revert camellia 256 support since our nss doesn't support it yet



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 05 Sep 2007 12:49:34 -0700
Subject: [pkgdb] eclipse Owned
Message-ID: <200709051949.l85JnYWa019825@app3.fedora.phx.redhat.com>

Package eclipse in Fedora 7 is now owned by Andrew Overholt (overholt)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 19:55:34 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 15:55:34 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.11,1.12
Message-ID: <200709051955.l85JtYOT010581@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558

Modified Files:
	xulrunner.spec 
Log Message:
attempt to fix patch command


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xulrunner.spec	5 Sep 2007 19:49:05 -0000	1.11
+++ xulrunner.spec	5 Sep 2007 19:55:01 -0000	1.12
@@ -122,7 +122,7 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
-%patch2   -Rp1 -b .camellia256
+%patch2   -R -p1 -b .camellia256
 #%patch3  -p1
 #%patch4  -p1
 #%patch5  -p1 -b .visibility



From fedora-extras-commits at redhat.com  Wed Sep  5 20:01:16 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Wed, 5 Sep 2007 16:01:16 -0400
Subject: rpms/nss/devel nss-create-obj.patch, NONE, 1.1 nss-enable-pem.patch,
	NONE, 1.1 .cvsignore, 1.10, 1.11 nss.spec, 1.26, 1.27 sources,
	1.10, 1.11
Message-ID: <200709052001.l85K1GCB016708@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763

Modified Files:
	.cvsignore nss.spec sources 
Added Files:
	nss-create-obj.patch nss-enable-pem.patch 
Log Message:
* Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
- Add 3.12 ckfw and libnsspem


nss-create-obj.patch:

--- NEW FILE nss-create-obj.patch ---
Index: mozilla/security/nss/lib/nss/nss.def
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/nss/nss.def,v
retrieving revision 1.158.2.7
diff -u -r1.158.2.7 nss.def
--- mozilla/security/nss/lib/nss/nss.def     25 Apr 2007 23:26:53 -0000      1.158.2.7
+++ mozilla/security/nss/lib/nss/nss.def     31 Aug 2007 18:54:54 -0000
@@ -899,3 +899,10 @@
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12 {
+;+    global:
+PK11_CreateGenericObject;
+PK11_WriteRawAttribute;
+;+    local:
+;+       *;
+;+};
Index: mozilla/security/nss/lib/pk11wrap/pk11obj.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11obj.c,v
retrieving revision 1.11.2.3
diff -u -r1.11.2.3 pk11obj.c
--- mozilla/security/nss/lib/pk11wrap/pk11obj.c	5 Jan 2007 09:44:05 -0000	1.11.2.3
+++ mozilla/security/nss/lib/pk11wrap/pk11obj.c	9 May 2007 20:58:17 -0000
@@ -388,7 +388,7 @@
 
 SECStatus
 PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
-				CK_ATTRIBUTE *theTemplate, int count, 
+				const CK_ATTRIBUTE *theTemplate, int count, 
 				PRBool token, CK_OBJECT_HANDLE *objectID)
 {
 	CK_SESSION_HANDLE rwsession;
@@ -1306,7 +1306,7 @@
 	PK11_DestroyGenericObject(objects);
     }
     /* delete all the objects before it in the list */
-    for (objects = prevObject; objects;  objects = nextObject) {
+    for (objects = prevObject; objects;  objects = prevObject) {
 	prevObject = objects->prev;
 	PK11_DestroyGenericObject(objects);
     }
@@ -1314,6 +1314,96 @@
 }
 
 
+/*
+ * Hand Create a new object and return the Generic object for our new object.
+ */
+PK11GenericObject *
+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template,
+		int count,  PRBool token)
+{
+    CK_OBJECT_HANDLE objectID;
+    PK11GenericObject *obj;
+    CK_RV crv;
+
+    PK11_EnterSlotMonitor(slot);
+    crv = PK11_CreateNewObject(slot, slot->session, template, count, 
+			       token, &objectID);
+    PK11_ExitSlotMonitor(slot);
+    if (crv != CKR_OK) {
+	PORT_SetError(PK11_MapError(crv));
+	return NULL;
+    }
+
+    obj = PORT_New(PK11GenericObject);
+    if ( !obj ) {
+	/* error set by PORT_New */
+	return NULL;
+    }
+
+    /* initialize it */	
+    obj->slot = PK11_ReferenceSlot(slot);
+    obj->objectID = objectID;
+    obj->next = NULL;
+    obj->prev = NULL;
+    return obj;
+}
+
+/*
+ * Change an attribute on a raw object
+ */
+SECStatus
+PK11_WriteRawAttribute(PK11ObjectType objType, void *objSpec, 
+				CK_ATTRIBUTE_TYPE attrType, SECItem *item)
+{
+    PK11SlotInfo *slot = NULL;
+    CK_OBJECT_HANDLE handle;
+    CK_ATTRIBUTE setTemplate;
+    CK_RV crv;
+    CK_SESSION_HANDLE rwsession;
+
+    switch (objType) {
+    case PK11_TypeGeneric:
+	slot = ((PK11GenericObject *)objSpec)->slot;
+	handle = ((PK11GenericObject *)objSpec)->objectID;
+	break;
+    case PK11_TypePrivKey:
+	slot = ((SECKEYPrivateKey *)objSpec)->pkcs11Slot;
+	handle = ((SECKEYPrivateKey *)objSpec)->pkcs11ID;
+	break;
+    case PK11_TypePubKey:
+	slot = ((SECKEYPublicKey *)objSpec)->pkcs11Slot;
+	handle = ((SECKEYPublicKey *)objSpec)->pkcs11ID;
+	break;
+    case PK11_TypeSymKey:
+	slot = ((PK11SymKey *)objSpec)->slot;
+	handle = ((PK11SymKey *)objSpec)->objectID;
+	break;
+    case PK11_TypeCert: /* don't handle cert case for now */
+    default:
+	break;
+    }
+    if (slot == NULL) {
+	PORT_SetError(SEC_ERROR_UNKNOWN_OBJECT_TYPE);
+	return SECFailure;
+    }
+
+    PK11_SETATTRS(&setTemplate, attrType, (CK_CHAR *) item->data, item->len);
+    rwsession = PK11_GetRWSession(slot);
+    if (rwsession == CK_INVALID_SESSION) {
+    	PORT_SetError(SEC_ERROR_BAD_DATA);
+    	return SECFailure;
+    }
+    crv = PK11_GETTAB(slot)->C_SetAttributeValue(rwsession, handle,
+			&setTemplate, 1);
+    PK11_RestoreROSession(slot, rwsession);
+    if (crv != CKR_OK) {
+	PORT_SetError(PK11_MapError(crv));
+	return SECFailure;
+    }
+    return SECSuccess;
+}
+
+
 SECStatus
 PK11_ReadRawAttribute(PK11ObjectType objType, void *objSpec, 
 				CK_ATTRIBUTE_TYPE attrType, SECItem *item)
Index: mozilla/security/nss/lib/pk11wrap/pk11pub.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11pub.h,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 pk11pub.h
--- mozilla/security/nss/lib/pk11wrap/pk11pub.h	2 Mar 2006 00:12:27 -0000	1.14.2.1
+++ mozilla/security/nss/lib/pk11wrap/pk11pub.h	9 May 2007 20:58:17 -0000
@@ -688,8 +688,13 @@
 				 PK11GenericObject *object);
 SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
 SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
+PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, 
+				   const CK_ATTRIBUTE *template, 
+				   int count, PRBool token);
 SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, 
 				CK_ATTRIBUTE_TYPE attr, SECItem *item);
+SECStatus PK11_WriteRawAttribute(PK11ObjectType type, void *object, 
+				CK_ATTRIBUTE_TYPE attr, SECItem *item);
 
 
 /**********************************************************************
Index: mozilla/security/nss/lib/pk11wrap/secmodi.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/secmodi.h,v
retrieving revision 1.23
diff -u -r1.23 secmodi.h
--- mozilla/security/nss/lib/pk11wrap/secmodi.h	9 Sep 2005 02:03:57 -0000	1.23
+++ mozilla/security/nss/lib/pk11wrap/secmodi.h	9 May 2007 20:58:17 -0000
@@ -105,7 +105,7 @@
 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
 		(x)->pValue=(v); (x)->ulValueLen = (l);
 SECStatus PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
-                               CK_ATTRIBUTE *theTemplate, int count,
+                               const CK_ATTRIBUTE *theTemplate, int count,
                                 PRBool token, CK_OBJECT_HANDLE *objectID);
 
 SECStatus pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech);

nss-enable-pem.patch:

--- NEW FILE nss-enable-pem.patch ---
Index: mozilla/security/nss/lib/ckfw/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
retrieving revision 1.9
diff -u -r1.9 manifest.mn
--- mozilla/security/nss/lib/ckfw/manifest.mn   16 Dec 2005 00:48:01 -0000      1.9
+++ mozilla/security/nss/lib/ckfw/manifest.mn   31 Aug 2007 17:58:23 -0000
@@ -38,7 +38,7 @@
 
 CORE_DEPTH = ../../..
 
-DIRS = builtins 
+DIRS = builtins pem
 
 PRIVATE_EXPORTS = \
        ck.h              \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Jun 2007 00:01:44 -0000	1.10
+++ .cvsignore	5 Sep 2007 20:00:42 -0000	1.11
@@ -1,2 +1,4 @@
 nss-3.11.5-fbst-stripped.tar.gz
 nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
+nss-3.12-alpha-ckfw.tar.gz
+nss-3.12-alpha-pem.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nss.spec	28 Aug 2007 11:04:07 -0000	1.26
+++ nss.spec	5 Sep 2007 20:00:42 -0000	1.27
@@ -1,12 +1,13 @@
 %define nspr_version 4.6.2
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %define fips_source_version 3.11.5
+%define ckfw_source_version 3.12-alpha
 %define ckbi_version 1.64
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-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
@@ -29,12 +30,16 @@
 Source5:          blank-secmod.db
 Source7:          fake-kstat.h
 Source10:         %{name}-%{fips_source_version}-fbst-stripped.tar.gz
+Source11:         %{name}-%{ckfw_source_version}-ckfw.tar.gz
+Source12:         %{name}-%{ckfw_source_version}-pem.tar.gz
 
 Patch1:           nss-no-rpath.patch
 Patch2:           nss-smartcard-auth.patch
 Patch3:           nss-use-netstat-hack.patch
 Patch4:           nss-decouple-softokn.patch
 Patch5:           nss-disable-build-freebl-softoken.patch
+Patch6:           nss-enable-pem.patch
+Patch7:           nss-create-obj.patch
 
 
 %description
@@ -86,9 +91,12 @@
 %prep
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 10
+%setup -q -T -D -n %{name}-%{version} -a 11
+%setup -q -T -D -n %{name}-%{version} -a 12
 
 %define old_nss_lib %{name}-%{fips_source_version}/mozilla/security/nss/lib
 %define new_nss_lib mozilla/security/nss/lib
+%define new_ckfw_lib %{name}-%{ckfw_source_version}/mozilla/security/nss/lib
 
 # Ensure we will not use new freebl/softoken code
 rm -rf %{new_nss_lib}/freebl
@@ -98,6 +106,10 @@
 cp -a %{old_nss_lib}/freebl %{new_nss_lib}
 cp -a %{old_nss_lib}/softoken %{new_nss_lib}
 
+# set up ckfw
+rm -rf %{new_nss_lib}/ckfw
+cp -a %{new_ckfw_lib}/ckfw %{new_nss_lib}
+
 # Ensure the newer NSS tree will not build code, except the loader
 mv -i %{new_nss_lib}/freebl/loader.c %{new_nss_lib}/freebl/loader.c.save
 rm -rf %{new_nss_lib}/freebl/*.c %{new_nss_lib}/freebl/*.s
@@ -114,6 +126,8 @@
 %patch2 -p0 -b .smartcard-auth
 %patch4 -p0 -b .decouple-softokn
 %patch5 -p0 -b .nofbst
+%patch6 -p0 -b .libpem
+%patch7 -p0 -b .create-obj
 
 # Apply the patches to the tree where we build freebl/softoken
 cd nss-%{fips_source_version}
@@ -228,7 +242,7 @@
 done
 
 # Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so
+for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -298,6 +312,7 @@
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libnssckbi.so
+%{_libdir}/libnsspem.so
 %{_libdir}/libfreebl3.so
 %{unsupported_tools_directory}/shlibsign
 %ghost %{_libdir}/libsoftokn3.chk
@@ -370,6 +385,7 @@
 %{_includedir}/nss3/nssilckt.h
 %{_includedir}/nss3/nssilock.h
 %{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nsspem.h
 %{_includedir}/nss3/nssrwlk.h
 %{_includedir}/nss3/nssrwlkt.h
 %{_includedir}/nss3/ocsp.h
@@ -437,6 +453,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
+- Add 3.12 ckfw and libnsspem
+
 * Tue Aug 28 2007 Kai Engert <kengert at redhat.com> - 3.11.7-6
 - Updated license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 00:01:44 -0000	1.10
+++ sources	5 Sep 2007 20:00:42 -0000	1.11
@@ -1,2 +1,4 @@
 68c5e1bd8ba091e5a50babcd9e552bc5  nss-3.11.5-fbst-stripped.tar.gz
 c1053d1e001a5b1eb4b7c296a968ca5c  nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
+baa96599af6f0a2b656479d8e4efd58f  nss-3.12-alpha-ckfw.tar.gz
+84bad7e42304a6d4fdf2b83f5295b938  nss-3.12-alpha-pem.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:04:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 16:04:57 -0400
Subject: rpms/rpmlint/F-7 rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 rpmlint.config, 1.10,
	1.11 rpmlint.spec, 1.33, 1.34 sources, 1.16,
	1.17 rpmlint-0.80-fedoralicensing.patch, 1.1, NONE
Message-ID: <200709052004.l85K4vao016921@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch 
Removed Files:
	rpmlint-0.80-fedoralicensing.patch 
Log Message:
Sync with devel

rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Apr 2007 20:45:44 -0000	1.16
+++ .cvsignore	5 Sep 2007 20:04:24 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint.config	16 Aug 2007 15:41:16 -0000	1.10
+++ rpmlint.config	5 Sep 2007 20:04:24 -0000	1.11
@@ -28,9 +28,11 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 68 of that page.
+    # Last synced with Wiki revision 87 of that page.
+    'Adobe',
     'Affero GPL',
     'AFL',
+    'ARL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -59,6 +61,7 @@
     'EU Datagrid',
     'Giftware',
     'Glide',
+    'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
     'GPLv2',
@@ -68,6 +71,7 @@
     'GPLv3+',
     'IBM',
     'IJG',
+    'ImageMagick',
     'iMatix',
     'Intel ACPI',
     'Interbase',
@@ -94,8 +98,11 @@
     'Netscape',
     'Nokia',
     'OpenLDAP',
+    'OpenPBS',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
     'OSL 3.0',
@@ -110,6 +117,7 @@
     'Ruby',
     'Sleepycat',
     'SISSL',
+    'SLIB',
     'SPL',
     'TCL',
     'UCD',
@@ -125,11 +133,15 @@
     'ZPLv1.0+',
     'ZPLv2.0',
     'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
     'zlib',
     # Documentation licenses
     'CDL',
     'FBSDDL',
     'GFDL',
+    'IEEE',
+    'OFSFDL',
     'Open Publication',
     # Content licenses
     'CC-BY',
@@ -142,6 +154,7 @@
     'mplus',
     'OFL',
     'Utopia',
+    'XANO',
     # Others
     'Redistributable, no modification permitted',
     'Freely redistributable without restriction',
@@ -176,9 +189,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
 addFilter(" doc-file-dependency .* /bin/sh$")
 addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rpmlint.spec	16 Aug 2007 15:41:16 -0000	1.33
+++ rpmlint.spec	5 Sep 2007 20:04:24 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.80
-Release:        3%{?dist}
+Version:        0.81
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -11,7 +11,7 @@
 Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
-Patch2:         %{name}-0.80-fedoralicensing.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -70,6 +70,14 @@
 
 
 %changelog
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-3
 - Sync Fedora license list with Wiki rev 68.
 - Move pre-2006 changelog entries to CHANGES.package.old.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Apr 2007 20:45:44 -0000	1.16
+++ sources	5 Sep 2007 20:04:24 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2


--- rpmlint-0.80-fedoralicensing.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 20:11:05 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 5 Sep 2007 16:11:05 -0400
Subject: rpms/rogue/devel .cvsignore, 1.2, 1.3 rogue.spec, 1.11, 1.12 sources,
	1.2, 1.3 rogue-5.4-setgid.patch, 1.3,
	NONE rogue-5.4.2-64bit.patch, 1.1,
	NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch,
	1.1, NONE rogue-rpmopts.patch, 1.1, NONE
Message-ID: <200709052011.l85KB5F2017213@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17191

Modified Files:
	.cvsignore rogue.spec sources 
Removed Files:
	rogue-5.4-setgid.patch rogue-5.4.2-64bit.patch 
	rogue-5.4.2-warnings.patch rogue-includes.patch 
	rogue-rpmopts.patch 
Log Message:
Update to 5.4.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 15:59:40 -0000	1.2
+++ .cvsignore	5 Sep 2007 20:10:32 -0000	1.3
@@ -1 +1 @@
-rogue5.4.2-src.tar.gz
+rogue5.4.4-src.tar.gz


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rogue.spec	28 Aug 2007 18:02:38 -0000	1.11
+++ rogue.spec	5 Sep 2007 20:10:32 -0000	1.12
@@ -1,19 +1,14 @@
 Name:           rogue
-Version:        5.4.2
-Release:        10%{?dist}
+Version:        5.4.4
+Release:        1%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
 License:        BSD
 URL:            http://rogue.rogueforge.net/
-Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.2-src.tar.gz
+Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
 Source1:        rogue.desktop
 Source2:        rogue.png
-Patch0:         rogue-rpmopts.patch
-Patch1:         rogue-includes.patch
-Patch2:         rogue-5.4-setgid.patch
-Patch3:         rogue-5.4.2-64bit.patch
-Patch4:         rogue-5.4.2-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,27 +19,18 @@
 an entire genre.
 
 %prep
-%setup -q -c -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%{__sed} -i 's/\r//' rogue54.html
-%{__sed} -i 's/\r//' readme54.html
-chmod a-x *.c *.h
+%setup -q -n %{name}%{version}
 
 
 %build
-make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck
+make %{_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue
-install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6
-mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -52,8 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
-touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,11 +63,13 @@
 %{_datadir}/icons/hicolor/32x32/apps/rogue.png
 %dir %attr(0775,games,games) %{_var}/games/roguelike
 %config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr
-%doc LICENSE.TXT rogue54.doc rogue54.html readme54.html
-
+%doc %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Sun Sep 2 2007 Wart <wart at kobold.org> 5.4.4-1
+- Update to 5.4.4
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.4.2-10
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 15:59:40 -0000	1.2
+++ sources	5 Sep 2007 20:10:32 -0000	1.3
@@ -1 +1 @@
-bd656cb017a579eba835a0ee445a0a32  rogue5.4.2-src.tar.gz
+033288f46444b06814c81ea69d96e075  rogue5.4.4-src.tar.gz


--- rogue-5.4-setgid.patch DELETED ---


--- rogue-5.4.2-64bit.patch DELETED ---


--- rogue-5.4.2-warnings.patch DELETED ---


--- rogue-includes.patch DELETED ---


--- rogue-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 20:28:50 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 5 Sep 2007 16:28:50 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.479,1.480
Message-ID: <200709052028.l85KSo8K017542@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512

Modified Files:
	eclipse.spec 
Log Message:
* 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.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
+++ eclipse.spec	5 Sep 2007 20:28:17 -0000	1.480
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        14%{?dist} 
+Release:        15%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -107,11 +107,13 @@
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.31
-BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
+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-8jpp
+BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
 BuildRequires: mx4j >= 2.1
-BuildRequires: tomcat5 >= 5.5.23
-BuildRequires: tomcat5-jasper >= 5.5.23
-BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23
+BuildRequires: tomcat5 >= 5.5.23-9jpp.4
+BuildRequires: tomcat5-jasper >= 5.5.23-9jpp.4
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4
 BuildRequires: jetty
 BuildRequires: lucene >= 1.9.1
 BuildRequires: lucene-contrib >= 1.9.1
@@ -208,12 +210,14 @@
 #Requires: ant-apache-bsf ant-commons-net
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
+Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
+Requires: jakarta-commons-el >= 1.0-8jpp
+Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
-Requires: tomcat5 >= 5.5.23
-Requires: tomcat5-jasper-eclipse >= 5.5.23
-Requires: tomcat5-servlet-2.4-api >= 5.5.23
-Requires: tomcat5-jsp-2.0-api >= 5.5.23
+Requires: tomcat5 >= 5.5.23-9jpp.4
+Requires: tomcat5-jasper-eclipse >= 5.5.23-9jpp.4
+Requires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4
+Requires: tomcat5-jsp-2.0-api >= 5.5.23-9jpp.4
 Requires: jetty
 Requires: jsch >= 0.1.31
 Requires: lucene >= 1.9.1
@@ -595,7 +599,7 @@
 ln -s  %{_datadir}/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar \
    plugins/org.apache.jasper_5.5.17.v200706111724.jar
 
-# link to serlet-api
+# link to servlet-api
 rm plugins/javax.servlet_2.4.0.v200706111738.jar
 ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar
 
@@ -1569,6 +1573,10 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Wed Sep  5 20:35:28 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Wed, 5 Sep 2007 16:35:28 -0400
Subject: rpms/bouml/devel .cvsignore, 1.3, 1.4 bouml.spec, 1.4, 1.5 sources, 
	1.5, 1.6
Message-ID: <200709052035.l85KZSH6017754@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17687

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.1-1 in devel.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 20:44:51 -0000	1.3
+++ .cvsignore	5 Sep 2007 20:34:56 -0000	1.4
@@ -1 +1 @@
-bouml_2.30.2.tar.gz
+bouml_2.31.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouml.spec	21 Aug 2007 20:44:51 -0000	1.4
+++ bouml.spec	5 Sep 2007 20:34:56 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.30.2
+Version: 2.31.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -96,6 +96,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
+- Version bump to 2.31.1.
+
 * Wed Aug 22 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.30.2-1
 - Version bump to 2.30.2.
 - Cleaned up SPEC.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 20:44:51 -0000	1.5
+++ sources	5 Sep 2007 20:34:56 -0000	1.6
@@ -1 +1 @@
-1232a026271cb09fa02b6763a739b8d4  bouml_2.30.2.tar.gz
+51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:37:22 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Wed, 5 Sep 2007 16:37:22 -0400
Subject: rpms/bouml/F-7 .cvsignore, 1.5, 1.6 bouml.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200709052037.l85KbMkM017904@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17864

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.1-1 in F-7.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Aug 2007 20:48:26 -0000	1.5
+++ .cvsignore	5 Sep 2007 20:36:49 -0000	1.6
@@ -1 +1 @@
-bouml_2.30.2.tar.gz
+bouml_2.31.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/bouml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouml.spec	21 Aug 2007 20:48:26 -0000	1.4
+++ bouml.spec	5 Sep 2007 20:36:49 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.30.2
+Version: 2.31.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -96,6 +96,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
+- Version bump to 2.31.1.
+
 * Wed Aug 22 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.30.2-1
 - Version bump to 2.30.2.
 - Cleaned up SPEC.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 20:48:26 -0000	1.5
+++ sources	5 Sep 2007 20:36:49 -0000	1.6
@@ -1 +1 @@
-1232a026271cb09fa02b6763a739b8d4  bouml_2.30.2.tar.gz
+51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:19 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:19 -0700
Subject: [pkgdb] eclipse-mylyn: bkonrath has given up commit
Message-ID: <200709052047.l85KlJ5V020375@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-mylyn (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:46 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:46 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchbugzilla
Message-ID: <200709052047.l85Klk7X020389@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-nlspackager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:52 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:52 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchbugzilla
Message-ID: <200709052047.l85KlqpU020399@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-nlspackager (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:54 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:54 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up commit
Message-ID: <200709052047.l85KltbL020409@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-nlspackager (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:59 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:59 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchcommits
Message-ID: <200709052047.l85Klxh1020418@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on eclipse-nlspackager (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:14 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:14 -0700
Subject: [pkgdb] eclipse-pydev: bkonrath has given up commit
Message-ID: <200709052048.l85KmFEE020424@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-pydev (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:28 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchbugzilla
Message-ID: <200709052048.l85KmSfv020433@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-sdk-nls (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:30 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:30 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up commit
Message-ID: <200709052048.l85KmU1N020443@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-sdk-nls (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:33 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:33 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchcommits
Message-ID: <200709052048.l85KmXID020452@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on eclipse-sdk-nls (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:35 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:35 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchbugzilla
Message-ID: <200709052048.l85KmZ5A020461@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-sdk-nls (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:37 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:37 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up commit
Message-ID: <200709052048.l85Kmb49020472@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-sdk-nls (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:49 -0700
Subject: [pkgdb] jakarta-commons-el: bkonrath has given up commit
Message-ID: <200709052048.l85KmnAv020481@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-el (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:04 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:04 -0700
Subject: [pkgdb] jakarta-commons-logging: bkonrath has given up commit
Message-ID: <200709052049.l85Kn4mJ020494@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-logging (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:07 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:07 -0700
Subject: [pkgdb] jakarta-commons-logging: bkonrath has given up commit
Message-ID: <200709052049.l85Kn7u9020504@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-logging (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:16 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:16 -0700
Subject: [pkgdb] jsch: bkonrath has given up watchcommits
Message-ID: <200709052049.l85KnGRp020513@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on jsch (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:19 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:19 -0700
Subject: [pkgdb] jsch: bkonrath has given up watchcommits
Message-ID: <200709052049.l85KnJVf020522@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on jsch (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:28 -0700
Subject: [pkgdb] junit4: bkonrath has given up watchbugzilla
Message-ID: <200709052049.l85KnS1q020531@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on junit4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:30 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:30 -0700
Subject: [pkgdb] junit4: bkonrath has given up commit
Message-ID: <200709052049.l85KnUoH020541@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on junit4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:38 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:38 -0700
Subject: [pkgdb] lucene: bkonrath has given up watchcommits
Message-ID: <200709052049.l85Kncfk020550@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on lucene (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:42 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:42 -0700
Subject: [pkgdb] lucene: bkonrath has given up commit
Message-ID: <200709052049.l85KngCt020559@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on lucene (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:03:49 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 17:03:49 -0400
Subject: devel/yum yum-showasdep.patch, NONE, 1.1 sources, 1.61,
	1.62 yum.spec, 1.175, 1.176
Message-ID: <200709052103.l85L3nIU024655@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24632

Modified Files:
	sources yum.spec 
Added Files:
	yum-showasdep.patch 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
- test patch for only packages which are not being otherwise updated to not 
  be shown as being updated for deps


yum-showasdep.patch:

--- NEW FILE yum-showasdep.patch ---
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 4075116..672f960 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -374,6 +374,7 @@ class Depsolve(object):
                     if po.pkgtup == new:
                         txmbr = self.tsInfo.addUpdate(po, requiringPo)
                         txmbr.setAsDep(po=needpo)
+                        txmbr.reason = "dep"
                         self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: Updating %s to resolve dep.', po)
                 checkdeps = 1
                 
@@ -549,6 +550,7 @@ class Depsolve(object):
             # FIXME: we should probably handle updating multiple packages...
             txmbr = self.tsInfo.addUpdate(best, inst[0])
             txmbr.setAsDep()
+            txmbr.reason = "dep"
         else:
             self.verbose_logger.debug('TSINFO: Marking %s as install for %s', best,
                 name)
@@ -628,6 +630,7 @@ class Depsolve(object):
                 'TSINFO: Updating %s to resolve conflict.', po)
             txmbr = self.tsInfo.addUpdate(po, confpkg)
             txmbr.setAsDep()
+            txmbr.reason = "dep"
             CheckDeps = 1
             
         else:
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 3ed67c5..46e1afb 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -226,10 +226,10 @@ class TransactionData:
         self.depremoved = []
         self.depinstalled = []
         self.depupdated = []
-        
+
         for txmbr in self.getMembers():
             if txmbr.output_state == TS_UPDATE:
-                if txmbr.isDep:
+                if txmbr.isDep and txmbr.reason == "dep":
                     self.depupdated.append(txmbr)
                 else:
                     self.updated.append(txmbr)


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Aug 2007 22:43:46 -0000	1.61
+++ sources	5 Sep 2007 21:03:16 -0000	1.62
@@ -1,2 +1 @@
-89cf296107d580655aaf83fb7206edfc  yum-3.2.3.tar.gz
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- yum.spec	29 Aug 2007 16:10:24 -0000	1.175
+++ yum.spec	5 Sep 2007 21:03:16 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0: installonlyn-enable.patch
 Patch1: version-None-tuple.patch
 Patch2: rpmdb-unresolved.patch
+Patch3: yum-showasdep.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -50,6 +51,7 @@
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .ver-to-none
 %patch2 -p1 -b .unresolved
+%patch3 -p1 -b .showdep
 
 %build
 make
@@ -95,6 +97,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
+- test patch for only packages which are not being otherwise updated to not 
+  be shown as being updated for deps
+
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-3
 - patch from git-HEAD - unresolved deps
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:12:04 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Wed, 05 Sep 2007 14:12:04 -0700
Subject: [pkgdb] eclipse-pydev Owned
Message-ID: <200709052112.l85LC4mP020817@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora 7 is now owned by Jeff Johnston (jjohnstn)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:14:55 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 5 Sep 2007 17:14:55 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.1,1.2
Message-ID: <200709052114.l85LEtrH025010@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Remove epoch in plugin provides.
- Bump release number.
- Resolves: rhbz#274001




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.7.0-icedtea.spec	28 Aug 2007 14:56:44 -0000	1.1
+++ java-1.7.0-icedtea.spec	5 Sep 2007 21:14:23 -0000	1.2
@@ -94,7 +94,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.14.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.15.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -253,7 +253,7 @@
 
 # Standard JPackage plugin provides.
 Provides: java-plugin = %{javaver}
-Provides: java-%{javaver}-plugin = %{epoch}:%{version}
+Provides: java-%{javaver}-plugin = %{version}
 
 %description plugin
 The IcedTea web browser plugin.
@@ -715,6 +715,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Remove epoch in plugin provides.
+- Bump release number.
+- Resolves: rhbz#274001
+
 * Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18.snapshot
 - Include idlj man page in files list.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:20:24 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 5 Sep 2007 17:20:24 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.2,1.3
Message-ID: <200709052120.l85LKOEa025092@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Rename javadoc master alternative javadocdir.
- Resolves: rhbz#269901




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.7.0-icedtea.spec	5 Sep 2007 21:14:23 -0000	1.2
+++ java-1.7.0-icedtea.spec	5 Sep 2007 21:19:51 -0000	1.3
@@ -601,12 +601,13 @@
 
 %post javadoc
 alternatives \
-  --install %{_javadocdir}/java javadoc %{_javadocdir}/%{name}/api %{priority}
+  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
+  %{priority}
 
 %postun javadoc
 if [ $1 -eq 0 ]
 then
-  alternatives --remove javadoc %{_javadocdir}/%{name}/api
+  alternatives --remove javadocdir %{_javadocdir}/%{name}/api
 fi
 
 %post plugin
@@ -716,6 +717,10 @@
 
 %changelog
 * Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Rename javadoc master alternative javadocdir.
+- Resolves: rhbz#269901
+
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Remove epoch in plugin provides.
 - Bump release number.
 - Resolves: rhbz#274001



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, 6) updated by kevin
Message-ID: <200709052125.l85LPrTP020952@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, 7) updated by kevin
Message-ID: <200709052125.l85LPr3p020959@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, devel) updated by kevin
Message-ID: <200709052125.l85LPrlE020977@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora EPEL, 4) updated by kevin
Message-ID: <200709052125.l85LPrhu020968@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora EPEL, 5) updated by kevin
Message-ID: <200709052125.l85LPrJP020987@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:26:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:26:56 -0400
Subject: rpms/Pixie - New directory
Message-ID: <200709052126.l85LQu5q025719@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie

Log Message:
Directory /cvs/extras/rpms/Pixie added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:01 -0400
Subject: rpms/Pixie/devel - New directory
Message-ID: <200709052127.l85LR1I4025733@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie/devel

Log Message:
Directory /cvs/extras/rpms/Pixie/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:05 -0400
Subject: rpms/Pixie Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709052127.l85LR58p025759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie

Added Files:
	Makefile import.log 
Log Message:
Setup of module Pixie


--- NEW FILE Makefile ---
# Top level Makefile for module Pixie
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:07 -0400
Subject: rpms/Pixie/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709052127.l85LR7ai025780@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Pixie


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: Pixie
# $Id: Makefile,v 1.1 2007/09/05 21:27:05 kevin Exp $
NAME := Pixie
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 fedora-extras-commits at redhat.com  Wed Sep  5 21:27:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:27:42 -0700
Subject: [pkgdb] gkrellm-volume (Fedora EPEL, 5) updated by kevin
Message-ID: <200709052127.l85LRgrg021003@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gkrellm-volume
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep  5 21:30:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 17:30:51 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.45,
	1.46 selinux-policy.spec, 1.512, 1.513
Message-ID: <200709052130.l85LUpsY026275@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26218

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
- Allow sendmail to create etc_aliases_t


policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policy-20070703.patch	28 Aug 2007 15:35:11 -0000	1.45
+++ policy-20070703.patch	5 Sep 2007 21:30:18 -0000	1.46
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.6/config/appconfig-mcs/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -26,32 +26,32 @@
 +system_r:sysadm_su_t:s0		system_r:unconfined_t:s0
 +system_r:unconfined_t:s0	system_r:unconfined_t:s0
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.6/config/appconfig-mcs/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/default_type	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-08-28 15:53:39.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
  staff_r:staff_t
 -unconfined_r:unconfined_t
  user_r:user_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.6/config/appconfig-mcs/failsafe_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/failsafe_context	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-08-28 15:53:39.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mcs/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-08-28 15:53:39.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/root_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -71,17 +71,17 @@
 -#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 user_r:user_t:s0
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.6/config/appconfig-mcs/seusers
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/seusers	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-08-28 15:53:39.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +__default__:system_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mcs/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -92,15 +92,15 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.6/config/appconfig-mcs/userhelper_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/userhelper_context	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-08-28 15:53:39.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mcs/user_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -109,18 +109,18 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_su_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mcs/xguest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,5 @@
 +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_crond_t:s0
 +system_r:xdm_t		xguest_r:xguest_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.6/config/appconfig-mls/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -148,9 +148,9 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +staff_r:staff_sudo_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.6/config/appconfig-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/default_type	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-08-28 15:53:39.000000000 -0400
 @@ -1,6 +1,5 @@
 -auditadm_r:auditadm_t
 -secadm_r:secadm_t
@@ -160,17 +160,17 @@
 -unconfined_r:unconfined_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mls/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-08-28 15:53:39.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.6/config/appconfig-mls/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/root_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -189,9 +189,9 @@
  #
 -#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 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mls/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -202,9 +202,9 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mls/user_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -213,17 +213,17 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 +user_r:user_su_t:s0		user_r:user_t:s0
 +user_r:user_sudo_t:s0		user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-standard/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-standard/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-standard/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-standard/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
[...4671 lines suppressed...]
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13209,19 +13938,19 @@
 +	fs_manage_nfs_files(xend_t)
 +	fs_read_nfs_symlinks(xend_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.6/policy/modules/users/guest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.6/policy/modules/users/guest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.6/policy/modules/users/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.te	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -13232,19 +13961,19 @@
 +optional_policy(`
 +	hal_dbus_chat(xguest_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.6/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.6/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.6/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.te	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -13279,25 +14008,25 @@
 +
 +files_dontaudit_search_all_dirs(logadm_t)
 +files_dontaudit_getattr_all_files(logadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.6/policy/modules/users/metadata.xml
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/metadata.xml	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.6/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.6/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.6/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.te	2007-08-22 08:03:53.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-08-31 15:27:24.000000000 -0400
+@@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
 +########################################
@@ -13308,69 +14037,41 @@
 +userdom_base_user_template(webadm)
 +allow webadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
 +
-+# Allow webadm_t to restart the apache service
-+domain_dontaudit_search_all_domains_state(webadm_t)
-+apache_domtrans(webadm_t)
-+init_exec_script_files(webadm_t)
-+domain_role_change_exemption(webadm_t)
-+domain_obj_id_change_exemption(webadm_t)
-+role_transition webadm_r httpd_exec_t system_r;
-+allow webadm_r system_r;
-+
-+apache_manage_all_content(webadm_t)
-+apache_manage_config(webadm_t)
-+apache_manage_log(webadm_t)
-+apache_manage_modules(webadm_t)
-+apache_manage_lock(webadm_t)
-+apache_manage_pid(webadm_t)
-+apache_read_state(webadm_t)
-+apache_signal(webadm_t)
-+apache_getattr(webadm_t)
-+apache_relabel(webadm_t)
++bool webadm_read_user_files false;
++bool webadm_manage_user_files false;
++
++if (webadm_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(webadm_t)
++   userdom_read_unpriv_users_tmp_files(webadm_t)
++}
 +
-+seutil_domtrans_restorecon(webadm_t)
++if (webadm_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(webadm_t)
++   userdom_read_unpriv_users_tmp_files(webadm_t)
++   userdom_write_unpriv_users_tmp_files(webadm_t)
++}
 +
 +files_dontaudit_search_all_dirs(webadm_t)
-+files_dontaudit_getattr_all_files(webadm_t)
 +files_manage_generic_locks(webadm_t)
 +files_list_var(webadm_t)
 +selinux_get_enforce_mode(webadm_t)
-+
++seutil_domtrans_restorecon(webadm_t)
 +
 +logging_send_syslog_msg(webadm_t)
 +
-+ifdef(`targeted_policy',`
-+	term_use_generic_ptys(webadm_t)
-+	term_use_unallocated_ttys(webadm_t)
-+')
-+
 +userdom_dontaudit_search_sysadm_home_dirs(webadm_t)
 +userdom_dontaudit_search_generic_user_home_dirs(webadm_t)
 +
-+bool webadm_read_user_files false;
-+bool webadm_manage_user_files false;
-+
-+if (webadm_read_user_files) {
-+	userdom_read_unpriv_users_home_content_files(webadm_t)
-+	userdom_read_unpriv_users_tmp_files(webadm_t)
-+}
-+
-+if (webadm_manage_user_files) {
-+	userdom_manage_unpriv_users_home_content_dirs(webadm_t)
-+	userdom_read_unpriv_users_tmp_files(webadm_t)
-+	userdom_write_unpriv_users_tmp_files(webadm_t)
-+}
++apache_admin(webadm_t, webadm_r, { webadm_tty_device_t webadm_devpts_t })
 +
 +gen_require(`
 +	type gadmin_t;
 +')
 +allow gadmin_t webadm_t:process transition;
 +allow webadm_t gadmin_t:dir getattr;
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.6/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.6/policy/support/obj_perm_sets.spt	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-08-28 15:53:40.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -13394,9 +14095,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.6/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.6/policy/users	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/users	2007-08-28 15:53:40.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -13431,9 +14132,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, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.6/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.6/Rules.modular	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/Rules.modular	2007-08-28 15:53:40.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- selinux-policy.spec	28 Aug 2007 15:35:11 -0000	1.512
+++ selinux-policy.spec	5 Sep 2007 21:30:18 -0000	1.513
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -162,7 +162,7 @@
 selinuxenabled; \
 if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log 2> /dev/null; \
+	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
+- Allow sendmail to create etc_aliases_t
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-2
 - Allow login programs to read symlinks on homedirs
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:41:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  5 Sep 2007 17:41:26 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec, 1.40, 1.41 template.init, 1.4,
	1.5
Message-ID: <200709052141.l85LfQd5026767@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26747

Modified Files:
	rpmdevtools.spec template.init 
Log Message:
Init script template cleanups.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rpmdevtools.spec	28 Aug 2007 14:25:55 -0000	1.40
+++ rpmdevtools.spec	5 Sep 2007 21:41:23 -0000	1.41
@@ -111,6 +111,9 @@
 
 
 %changelog
+* 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.
 


Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template.init	5 Jul 2007 20:08:18 -0000	1.4
+++ template.init	5 Sep 2007 21:41:23 -0000	1.5
@@ -26,12 +26,6 @@
 # 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="/path/to/<daemonname>"
 prog=$(basename $exec)
 
@@ -62,32 +56,27 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdr_status() {
-    status $prog
-}
-
 case "$1" in
     start|stop|restart|reload)
         $1
         ;;
     force-reload)
-        force_reload
+        restart
         ;;
     status)
-        fdr_status
+        status $prog
         ;;
-    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
 	;;
+    reload)
+        # If config can be reloaded without restarting, implement it here,
+        # remove the "exit", and add "reload" to the usage message below.
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac



From fedora-extras-commits at redhat.com  Wed Sep  5 21:53:37 2007
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 5 Sep 2007 17:53:37 -0400
Subject: rpms/libnjb/devel .cvsignore, 1.6, 1.7 libnjb.rules, 1.2,
	1.3 libnjb.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200709052153.l85LrbIa027435@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27400

Modified Files:
	.cvsignore libnjb.rules libnjb.spec sources 
Log Message:
New upstream version, include HAL FDI file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jan 2006 21:17:38 -0000	1.6
+++ .cvsignore	5 Sep 2007 21:53:04 -0000	1.7
@@ -1 +1 @@
-libnjb-2.2.5.tar.gz
+libnjb-2.2.6.tar.gz


Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libnjb.rules	17 Aug 2007 22:20:57 -0000	1.2
+++ libnjb.rules	5 Sep 2007 21:53:04 -0000	1.3
@@ -1,13 +1,14 @@
-# libnjb.rules a udev rules file for libnjb devices
-# created by Linus Walleij, ENJOY!
+# nomad.rules a udev rules file for NOMAD jukeboxes.
+# Put this file in /etc/udev/rules.d
+# Hacked a bit for Fedora along the lines of libsane rules.
 
 ACTION!="add", GOTO="nomad_rules_end"
-SUBSYSTEM=="usb", GOTO="nomad_rules"
-SUBSYSTEM=="usb_device", GOTO="nomad_rules"
-
+ATTR{dev}!="?*", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_usb_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_usb_device_rules"
 GOTO="nomad_rules_end"
 
-LABEL="nomad_rules"
+LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
 ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
@@ -38,4 +39,38 @@
 # Creative Zen Sleek
 ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k"
 
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_device_rules"
+
+# Creative Nomad Jukebox
+ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 2
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 3
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen USB 2.0
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen NX
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Xtra
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+# Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Touch
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+# Creative Zen (Zen Micro variant)
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Micro
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+# Second Generation Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+# Dell Pocket DJ
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+# Creative Zen Sleek
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
+
 LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libnjb.spec	17 Aug 2007 22:20:57 -0000	1.9
+++ libnjb.spec	5 Sep 2007 21:53:04 -0000	1.10
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:		libnjb
-Version:	2.2.5
-Release:	4%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -67,6 +67,8 @@
 # Install device permissions
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -82,6 +84,7 @@
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -96,6 +99,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Linus Walleij <triad at df.lth.se> 2.2.6-1
+- Long overdue upstream release.
+- Shape up udev rules so they look like the libsane stuff.
+- Add HAL FDI file.
 * Fri Aug 17 2007 Linus Walleij <triad at df.lth.se> 2.2.5-4
 - Fixup libnjb udev rules to work with new udev and HAL.
 * Mon Aug 28 2006 Linus Walleij <triad at df.lth.se> 2.2.5-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jan 2006 21:17:38 -0000	1.6
+++ sources	5 Sep 2007 21:53:04 -0000	1.7
@@ -1 +1 @@
-f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz
+e1b3a89f6157c553ea46a78446429a0d  libnjb-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 21:55:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  5 Sep 2007 17:55:26 -0400
Subject: fedora-rpmdevtools rpminfo, NONE, 1.3.2.1 .cvsignore, 1.4.2.1,
	1.4.2.2 COPYING, 1.4, 1.4.2.1 rpmdev-diff, 1.1,
	1.1.2.1 rpmdev-extract, 1.1, 1.1.2.1 rpmdev-newspec, 1.4,
	1.4.2.1 rpmdev-rmdevelrpms, 1.2.2.2, 1.2.2.3 rpmdev-vercmp,
	1.1.2.2, 1.1.2.3 rpmdev-wipetree, 1.1,
	1.1.2.1 rpmdevtools.spec, 1.19.2.4, 1.19.2.5 rpmls, 1.1.2.1,
	1.1.2.2 template.init, 1.3.2.1, 1.3.2.2
Message-ID: <200709052155.l85LtQRR027568@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27539

Modified Files:
      Tag: rpmdevtools-5
	.cvsignore COPYING rpmdev-diff rpmdev-extract rpmdev-newspec 
	rpmdev-rmdevelrpms rpmdev-vercmp rpmdev-wipetree 
	rpmdevtools.spec rpmls template.init 
Added Files:
      Tag: rpmdevtools-5
	rpminfo 
Log Message:
Sync applicable bits from 6.x/HEAD.


--- NEW FILE rpminfo ---
#!/bin/sh
#
# Prints information for executables and libraries
#
# Copyright (C) 2004,2007 Red Hat, Inc.
# Authors:
# Thomas Woerner <twoerner 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, see <http://www.gnu.org/licenses/>.
#
# version 2004-07-07-02


LANG=C
READELF=/usr/bin/readelf
EU_READELF=/usr/bin/eu-readelf
OBJDUMP=/usr/bin/objdump
TMPDIR=/tmp

progname=`basename $0`

usage()  {
    cat <<EOF
Usage: $progname [-h] [-v] [-q] [-c] [-e | -l] [-p | -np | -P | -nP | -r]
                 [-s] [-o <file>] {-i | [<rpm package>...]}

  -h  | --help                 print help
  -v  | --verbose              be more verbose (to stderr)
  -q  | --quiet                only list files
  -qq                          really quiet: do not print rpath in split mode
  -i  | --installed            all installed packages
  -e  | --executables          list executables
  -l  | --libraries            list libraries
  -p  | --pic                  list pic
  -np | --no_pic               list no pic
  -P  | --pie                  list pie
  -nP | --no_pie               list no pie
  -r  | --rpath                list files containing rpath
  -ro | --rpath_odd            list files containing odd rpath
  -s  | --split                split output (.pie, .pic, .dso_pic, .rpath..)
                               output must be specified
  -t  | --test                 test for odd rpath
  -o <file> | --output=<file>  output in file <file>
  -T <dir> | --tmp-dir=<dir>   temporary directory

  Default options: -e -l -p -np -P -nP -r -t

EOF
    exit -1
}

opt() {
    [ -z "$1" ] && return

    if [ -n "$opts" ]; then
	[ $split -eq 0 ] && opts="${opts}, " || opts="${opts},"
    fi
    opts="${opts}$1"
}

check_rpath() {
    [ $rpath -ne 1 ] && return 

    local path=`$OBJDUMP -p "$1" 2>/dev/null | grep RPATH `
    if [ -n "$path" ]; then
	path=`echo $path | awk '{print $2}'`
        ## check rpath elements
	local odd=0
	if [ $test -eq 1 ]; then
	    [ -z "$path" ] && odd=1
	    OLDIFS=$IFS
	    IFS=:
	    for dir in $path; do
		[ -z "$dir" ] && odd=1
		[ "$dir" = "." ] && odd=2
		[ "$dir" = "/lib" ] && odd=3
		[ "$dir" = "/lib64" ] && odd=4
		[ "$dir" = "/usr/lib" ] && odd=5
		[ "$dir" = "/usr/lib64" ] && odd=6
		[ "$dir" = "/usr/X11R6/lib" ] && odd=7
		[ "$dir" = "/usr/X11R6/lib64" ] && odd=8
		[ "${dir:0:10}" = "/usr/local" ] && odd=9
		[ "${dir:0:12}" = "/usr/lib/qt-" ] && odd=10
		[ "${dir:0:8}" = "/usr/src" ] && odd=11
		echo $dir | egrep -q "/\." && odd=12
	    done
	    IFS=$OLDIFS
	fi
	[ $odd -eq 0 ] && opt "RPATH $path" || opt "-RPATH $path"
    fi
}

check_file() {
    local file=$1
    
    [ -L "$file" ] && return
    [ ! -f "$file" ] && return
    
    file -b "$file" 2>/dev/null | grep -q ELF || return
    
    if $EU_READELF -h "$file" 2>/dev/null | egrep -q 'Type:[[:space:]]*EXEC';
    then
	if [ $exec -eq 1 ]; then
	    if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
		if [ -u "$file" ]; then
		    [ $no_pie -eq 1 ] && opt "!PIE"
		else
		    [ $no_pic -eq 1 ] && opt "!PIC"
		fi
	    else
		# suid
		if [ -u "$file" ]; then
		    [ $no_pie -eq 1 ] && opt "!PIE"
		else
		    [ $pic -eq 1 ] && opt "PIC"
		fi
	    fi
	    check_rpath "$file"
	fi
    else
	if $EU_READELF -d "$file" 2>/dev/null | egrep -q '  DEBUG[[:space:]]*$';
	then
	    if [ $exec -eq 1 ]; then
		[ $pie -eq 1 ] && opt "PIE"
		check_rpath "$file"
	    fi
	else
	    if [ $lib -eq 1 ]; then
		if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
		    [ $no_pic -eq 1 ] && opt "DSO !PIC"
		else
		    [ $pic -eq 1 ] && opt "DSO PIC"
		fi
		check_rpath "$file"
	    fi
	fi
    fi
}

check_package() {
    package=$1

    local pkg=
    local prefix=
    local files=`rpm -ql $package 2>/dev/null`

    if echo $files | grep -q "not installed"; then
	# not installed
	if [ -f $package ]; then
	    rpm -qp $package >& /dev/null
	    if [ $? -eq 1 ]; then
		# no rpm package
		package=
	    else
		prefix=$temp_prefix`basename $package`
		if [ ${package:0:1} != "/" ]; then
		    package=`pwd`"/"$package
		fi
		local error=0
		mkdir $prefix 2> /dev/null && pushd "$prefix" >& /dev/null
		if [ $? -eq 0 ]; then
		    rpm2cpio "$package" \
			| cpio -i --make-directories >& /dev/null
		    [ $? -eq 0 ] || echo "Error while extracting package '$package'.. ignoring!" > /dev/stderr
		    files=`rpm -qlp $package 2>/dev/null`
		    popd >& /dev/null
		    chmod -R u+rwx $prefix 2>/dev/null 
		else
		    error=1
		fi
		if [ $error -eq 1 ]; then
		    echo "Can not create package directory.. skipping package '$package'!" > /dev/stderr
		    return
		fi
	    fi 
	else
	    # not a file
	    package=
	fi
    fi

    if [ -z "$package" ]; then
	echo "'$1' is not installed and is no rpm package..  skipping!" > /dev/stderr
	return
    fi

    local in_pie=0
    local in_non_pie=0
    local in_pic=0
    local in_dso_pic=0
    local in_non_pic=0
    local in_dso_non_pic=0
    local in_rpath=0
    local in_rpath_odd=0

    for file in $files; do
	opts=

	check_file "$prefix$file"

	[ -z "$opts" ] && continue
		
	if [ $split -eq 1 ]; then
	    pkg=`basename $package`
	    OLDIFS=$IFS
	    IFS=,
	    for opt in $opts; do
		o=
		[ "$opt" = "PIE" ] && o=pie
		[ "$opt" = "!PIE" ] && o=non_pie
		[ "$opt" = "PIC" ] && o=pic
		[ "$opt" = "DSO PIC" ] && o=dso_pic
		[ "$opt" = "!PIC" ] && o=non_pic
		[ "$opt" = "DSO !PIC" ] && o=dso_non_pic
		[ "${opt:0:6}" = "RPATH " ] && o=rpath && opt=${opt:6}
		[ "${opt:0:7}" = "-RPATH " ] && o=rpath_odd && opt=${opt:7}
		if [ -n "$o" ]; then
		    eval local in=\${in_$o}
		    if [ $in -eq 0 ]; then
			echo -e "\n$pkg" >> $output.$o
			eval in_$o=1
		    fi
		    if [ "${o:0:5}" = "rpath" -a $quiet -lt 2 ]; then
			echo -e "\t$file\tRPATH $opt" >> $output.$o
		    else
			echo -e "\t$file" >> $output.$o
		    fi
		fi
	    done
	    IFS=$OLDIFS
	else
	    if [ -z "$pkg" ]; then
		pkg=`basename $package`
		echo -e "\n$pkg" >> $output
	    fi
	    
	    if [ $quiet -eq 0 ]; then
		echo -e "\t$file\t$opts" >> $output
	    else
		echo -e "\t$file" >> $output
	    fi
	fi
    done

    if [ -n "$prefix" ]; then
	rm -rf $prefix
    fi
}

verbose=0
quiet=0
installed=0
exec=0
lib=0
pic=0
no_pic=0
pie=0
no_pie=0
rpath=0
split=0
test=0
output=
packages=
while [ $OPTIND -le $# ]; do
    eval pkg=\${$OPTIND}

    if [ ${pkg:0:1} = "-" ]; then
	[ "$pkg" = "-h" -o "$pkg" = "--help" ] && usage
	[ "$pkg" = "-v" -o "$pkg" = "--verbose" ] && verbose=1
	[ "$pkg" = "-q" -o "$pkg" = "--quiet" ] && quiet=1
	[ "$pkg" = "-qq" ] && quiet=2
	[ "$pkg" = "-i" -o "$pkg" = "--installed" ] && installed=1
	[ "$pkg" = "-e" -o "$pkg" = "--executables" ] && exec=1
	[ "$pkg" = "-l" -o "$pkg" = "--libraries" ] && lib=1
	[ "$pkg" = "-p" -o "$pkg" = "--pic" ] && pic=1
	[ "$pkg" = "-np" -o "$pkg" = "--no_pic" ] && no_pic=1
	[ "$pkg" = "-P" -o "$pkg" = "--pie" ] && pie=1
	[ "$pkg" = "-nP" -o "$pkg" = "--no_pie" ] && no_pie=1
	[ "$pkg" = "-r" -o "$pkg" = "--rpath" ] && rpath=1
	[ "$pkg" = "-s" -o "$pkg" = "--split" ] && split=1
	[ "$pkg" = "-t" -o "$pkg" = "--test" ] && test=1
	if [ "$pkg" = "-o" ]; then
	    OPTIND=$((OPTIND+1))
	    eval output=\${$OPTIND}
	fi
	if [ "${pkg:0:9}" = "--output=" ]; then
	    output=${pkg:9};
	fi
	if [ "$pkg" = "-T" ]; then
	    OPTIND=$((OPTIND+1))
	    eval TMPDIR=\${$OPTIND}
	fi
	if [ "${pkg:0:10}" = "--tmp-dir=" ]; then
	    TMPDIR=${pkg:10};
	fi
    else
	packages="$packages $pkg"
    fi
    
    OPTIND=$((OPTIND+1))
done

if [ ! -x "$READELF" ]; then
    echo "$progname: '$READELF' does not exist or is not executable.. exiting!"
    exit -1
fi
if [ ! -x "$EU_READELF" ]; then
    echo "$progname: '$EU_READELF' does not exist or is not executable.. exiting!"
    exit -1
fi
if [ ! -x "$OBJDUMP" ]; then
    echo "$progname: '$OBJDUMP' does not exist or is not executable.. exiting!"
    exit -1
fi

if [ ! -d "$TMPDIR" -o ! -w "$TMPDIR" ]; then
    echo "$progname: '$TMPDIR' does not exist or is not writable.. exiting!"
    exit -1
fi

[ -z "$packages" -a $installed -eq 0 ] && usage

if [ $exec -eq 0 -a $lib -eq 0 ]; then
    exec=1; lib=1
fi

if [ $pic -eq 0 -a $no_pic -eq 0 -a $pie -eq 0 -a $no_pie -eq 0 -a $rpath -eq 0 ]; then
    pic=1; no_pic=1; pie=1; no_pie=1; rpath=1; test=1
fi

if [ $split -eq 1 ]; then
    if [ -z "$output" ]; then
	echo "You can not use split without an output file prefix.. exiting!"
	exit -1
    else
	rm -f $output.*
    fi
fi
[ -n "$output" ] && rm -f $output || output=/dev/stdout

temp_prefix=`mktemp -d -q $TMPDIR/$progname.XXXXXX`
if [ $? -ne 0 -o -z $temp_prefix ]; then
    echo "Could not create temporary directory.. exiting!" > /dev/stderr
    exit -1
fi
temp_prefix="$temp_prefix/"

trap "chmod -R u+rwx $temp_prefix 2>/dev/null; rm -rf $temp_prefix; exit -1" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30

pkg_num=0
for pkg in $packages; do
    pkg_num=$((pkg_num+1))
done
pkg_no=1
for pkg in $packages; do
    tmp=`rpm -q $pkg | sort -u 2>/dev/null`
    [ $verbose -eq 1 ] && \
	printf "(%*d/%d) => %s\n" ${#pkg_num} $pkg_no $pkg_num $pkg \
	> /dev/stderr
    if echo $tmp | grep -q "not installed"; then
	check_package $pkg
    else
	for package in $tmp; do
	    check_package $package
	done
    fi
    pkg_no=$((pkg_no+1))
done

if [ $installed -eq 1 ]; then
    rpmqa=`rpm -qa | sort -u`
    for i in $rpmqa; do
	check_package "$i"
    done
fi

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/.cvsignore,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- .cvsignore	5 Jul 2007 21:19:44 -0000	1.4.2.1
+++ .cvsignore	5 Sep 2007 21:55:24 -0000	1.4.2.2
@@ -9,5 +9,4 @@
 configure
 install-sh
 missing
-rpminfo
 spectool-*


Index: COPYING
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- COPYING	18 Aug 2005 05:49:16 -0000	1.4
+++ COPYING	5 Sep 2007 21:55:24 -0000	1.4.2.1
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 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.
 
@@ -15,7 +15,7 @@
 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 Library General Public License instead.)  You can apply it to
+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
@@ -55,7 +55,7 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@
     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
@@ -168,7 +168,7 @@
 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
@@ -225,7 +225,7 @@
 
 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
@@ -278,7 +278,7 @@
 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
@@ -303,10 +303,9 @@
     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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.
 
@@ -336,5 +335,5 @@
 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 Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.


Index: rpmdev-diff
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-diff,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-diff	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-diff	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -3,6 +3,9 @@
 
 # rpmdev-diff -- Diff contents of two archives
 #
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skytt?? <scop at fedoraproject.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
@@ -11,7 +14,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -34,11 +37,13 @@
 version()
 {
     cat <<EOF
-rpmdev-diff version 1.0
+rpmdev-diff version 1.1
 
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.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.
 
 Written by Ville Skytt??.
 EOF


Index: rpmdev-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-extract,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-extract	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-extract	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -3,6 +3,9 @@
 
 # rpmdev-extract -- Extract various archives in "tar xvf" style
 #
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skytt?? <scop at fedoraproject.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
@@ -11,7 +14,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -27,14 +30,18 @@
 force=
 dir=
 
+shopt -s extglob
+
 version()
 {
     cat <<EOF
-rpmdev-extract version 1.0
+rpmdev-extract version 1.1
 
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.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.
 
 Written by Ville Skytt??.
 EOF
@@ -142,7 +149,11 @@
             cabextract -f "$f"
             ;;
         rpm)
-            name=`rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            name=`rpm -qp --qf="%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            if [ -z "$name" ] ; then # workaround for #250990
+                bname="`basename "$f"`"
+                name=${bname/?(\.*([^\.]))\.rpm/}
+            fi
             mkdir -p "$name"
             cd "$name"
             rpm2cpio "$f" \


Index: rpmdev-newspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-newspec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- rpmdev-newspec	9 Sep 2006 17:04:18 -0000	1.4
+++ rpmdev-newspec	5 Sep 2007 21:55:24 -0000	1.4.2.1
@@ -1,5 +1,24 @@
 #!/bin/bash
 
+# rpmdev-newspec -- generate new rpm .spec file from template
+#
+# Copyright (c) Warren Togami <warren at togami.com>,
+#               Ville Skytt?? <scop at fedoraproject.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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SPECDIR="/etc/rpmdevtools"
 DEFTYPE="minimal"
 DEFSPEC="newpackage.spec"


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- rpmdev-rmdevelrpms	7 Jul 2007 08:55:42 -0000	1.2.2.2
+++ rpmdev-rmdevelrpms	5 Sep 2007 21:55:24 -0000	1.2.2.3
@@ -3,7 +3,8 @@
 
 # rpmdev-rmdevelrpms -- Find (and optionally remove) "development" RPMs
 #
-# Author:  Ville Skytt?? <ville.skytta at iki.fi>
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author:  Ville Skytt?? <scop at fedoraproject.org>
 # Credits: Seth Vidal (yum), Thomas Vander Stichele (mach)
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -24,7 +25,7 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.7"
+__version__ = "1.8"
 
 
 dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
@@ -154,8 +155,10 @@
     print "rpmdev-rmdevelrpms version %s" % __version__
     print '''
 Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+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.
 
 Written by Ville Skytt??.'''
     sys.exit(0)


Index: rpmdev-vercmp
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-vercmp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rpmdev-vercmp	7 Jul 2007 08:47:26 -0000	1.1.2.2
+++ rpmdev-vercmp	5 Sep 2007 21:55:24 -0000	1.1.2.3
@@ -1,6 +1,22 @@
 #!/usr/bin/python
 #
-# Seth Vidal - yadda yadda yadda GPL Yadda yadda yadda Use at own risk
+# rpmdev-vercmp -- compare rpm versions
+#
+# Copyright (c) Seth Vidal
+#
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import rpm
 import sys


Index: rpmdev-wipetree
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-wipetree,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-wipetree	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-wipetree	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -1,10 +1,23 @@
 #!/bin/sh
 #
-# rpmdev-wipetree
-# Erases all files within the rpm build dir
+# rpmdev-wipetree -- erase all files within the rpm build dir
 #
-# Author:  Warren Togami <warren at togami.com>
-# License: GPL
+# Copyright (c) Warren Togami <warren at togami.com>,
+#               Ville Skytt?? <scop at fedoraproject.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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Sanity Check: Forbid root user
 if [ $(id -u) -eq 0 ]; then


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- rpmdevtools.spec	7 Jul 2007 10:34:04 -0000	1.19.2.4
+++ rpmdevtools.spec	5 Sep 2007 21:55:24 -0000	1.19.2.5
@@ -8,7 +8,8 @@
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License:        GPLv2+ and GPLv2
 URL:            http://fedoraproject.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
@@ -135,6 +136,13 @@
 
 
 %changelog
+* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Init script template cleanups.
+- Update rpminfo to version 2004-07-07-02.
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+- 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> - 5.4-1
 - 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.


Index: rpmls
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmls,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rpmls	5 Jul 2007 21:19:44 -0000	1.1.2.1
+++ rpmls	5 Sep 2007 21:55:24 -0000	1.1.2.2
@@ -10,12 +10,14 @@
 # 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 Library General Public License for more details.
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
 
+unset CDPATH
+
 owner=
 if [ "$1" = "-l" ] ; then
     owner='%-8{fileusername} %-8{filegroupname} '
@@ -23,8 +25,15 @@
 fi
 qf="[%-11{filemodes:perms} $owner%{filenames}\\n]"
 
-for file in "$@" ; do
-    p=
-    case "$file" in *.[rs]pm) p=p ;; esac
-    rpm -q$p --qf="$qf" "$file"
+for arg in "$@" ; do
+    case "$arg" in
+        *.[rs]pm)
+            # dirname/basename: workaround for #250990
+            cd "$(dirname "$arg")"
+            rpm -qp --qf="$qf" "$(basename "$arg")"
+            cd - >/dev/null 2>&1
+            ;;
+        *)
+            rpm -q --qf="$qf" "$arg"
+    esac
 done


Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- template.init	5 Jul 2007 21:19:44 -0000	1.3.2.1
+++ template.init	5 Sep 2007 21:55:24 -0000	1.3.2.2
@@ -26,12 +26,6 @@
 # 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="/path/to/<daemonname>"
 prog=$(basename $exec)
 
@@ -62,32 +56,27 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdr_status() {
-    status $prog
-}
-
 case "$1" in
     start|stop|restart|reload)
         $1
         ;;
     force-reload)
-        force_reload
+        restart
         ;;
     status)
-        fdr_status
+        status $prog
         ;;
-    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
 	;;
+    reload)
+        # If config can be reloaded without restarting, implement it here,
+        # remove the "exit", and add "reload" to the usage message below.
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac



From fedora-extras-commits at redhat.com  Wed Sep  5 21:59:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 17:59:02 -0400
Subject: rpms/gkrellm-volume/EL-5 gkrellm-volume.spec,1.9,1.10
Message-ID: <200709052159.l85Lx2N5027741@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27719

Modified Files:
	gkrellm-volume.spec 
Log Message:
Sync with devel for first EL build.


Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/EL-5/gkrellm-volume.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellm-volume.spec	30 Aug 2006 20:34:41 -0000	1.9
+++ gkrellm-volume.spec	5 Sep 2007 21:58:29 -0000	1.10
@@ -2,11 +2,11 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://gkrellm.luon.net/volume.phtml
 Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
 Patch0:         %{name}-version.patch
@@ -27,6 +27,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -55,6 +56,12 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
+- Convert docs to UTF-8.
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-5
+- License: GPLv2+
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:03:40 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:03:40 -0400
Subject: rpms/vala/F-7 vala.spec,1.4,1.5
Message-ID: <200709052203.l85M3em7001415@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374/F-7

Modified Files:
	vala.spec 
Log Message:
Update license and URL fields; pushed to F-7 as well



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vala.spec	25 Mar 2007 16:02:02 -0000	1.4
+++ vala.spec	5 Sep 2007 22:03:06 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           vala
-Version:        0.0.8
-Release:        1%{?dist}
+Version:        0.1.3
+Release:        3%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+License:        LGPLv2.1
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -44,7 +44,7 @@
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -70,16 +70,28 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
+%{_bindir}/*gen
 %{_libdir}/libvala.so
+%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
 
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:03:43 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:03:43 -0400
Subject: rpms/vala/devel vala.spec,1.7,1.8
Message-ID: <200709052203.l85M3hsW001418@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374/devel

Modified Files:
	vala.spec 
Log Message:
Update license and URL fields; pushed to F-7 as well



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vala.spec	5 Sep 2007 03:39:48 -0000	1.7
+++ vala.spec	5 Sep 2007 22:03:10 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           vala
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+License:        LGPLv2.1
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
 * Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
 - Enable binding generation tools
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:06:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:06:44 -0400
Subject: rpms/vala/F-7 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200709052206.l85M6iWQ001571@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1551

Modified Files:
	.cvsignore sources 
Log Message:
Fix F-7 sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2007 16:02:02 -0000	1.5
+++ .cvsignore	5 Sep 2007 22:06:11 -0000	1.6
@@ -1 +1 @@
-vala-0.0.8.tar.bz2
+vala-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2007 16:02:02 -0000	1.5
+++ sources	5 Sep 2007 22:06:11 -0000	1.6
@@ -1 +1 @@
-54c7b20e570121c9151ec9534ed68b79  vala-0.0.8.tar.bz2
+d6552982b10582d0b01c3d612fb098b2  vala-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 22:37:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 18:37:11 -0400
Subject: rpms/xkeyboard-config/devel dellm65.patch, NONE, 1.1 kinesis.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xkeyboard-config.spec, 1.9, 1.10
Message-ID: <200709052237.l85MbBDo002488@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2440

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Added Files:
	dellm65.patch kinesis.patch 
Log Message:
1.0


dellm65.patch:

--- NEW FILE dellm65.patch ---
diff -up xkeyboard-config-1.0/symbols/inet.dellm65 xkeyboard-config-1.0/symbols/inet
--- xkeyboard-config-1.0/symbols/inet.dellm65	2007-04-23 18:09:07.000000000 -0400
+++ xkeyboard-config-1.0/symbols/inet	2007-09-05 18:30:51.000000000 -0400
@@ -2451,3 +2451,18 @@ xkb_symbols "logitech_g15" {
     key <XFER> {         [     XF86Launch8 ] };
 
 };
+
+//
+// Dell Precision M65
+//
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I04>   {       [ XF86PowerOff          ]       };
+
+    key <LWIN> {        [       Super_L         ]       };
+};
+
diff -up xkeyboard-config-1.0/geometry/dell.dellm65 xkeyboard-config-1.0/geometry/dell
--- xkeyboard-config-1.0/geometry/dell.dellm65	2007-05-31 17:17:44.000000000 -0400
+++ xkeyboard-config-1.0/geometry/dell	2007-09-05 18:30:51.000000000 -0400
@@ -181,3 +181,362 @@ default xkb_geometry "dell101" {
     alias <AA00> = <LCTL>;
 
 }; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+
diff -up xkeyboard-config-1.0/rules/base.m_g.part.dellm65 xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.dellm65	2007-09-05 18:32:22.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part	2007-09-05 18:32:41.000000000 -0400
@@ -1,5 +1,6 @@
  $msmodels	=	microsoft(natural)
   dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
diff -up xkeyboard-config-1.0/rules/base.lists.part.dellm65 xkeyboard-config-1.0/rules/base.lists.part
--- xkeyboard-config-1.0/rules/base.lists.part.dellm65	2007-09-05 18:31:07.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.lists.part	2007-09-05 18:31:20.000000000 -0400
@@ -33,7 +33,7 @@
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 \
               cymotionlinux \
-              dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
+              dellm65 dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
               emachines ennyah_dkb1008 evdev \
               genius geniuscomfy geniuscomfy2 geniuskb19e \
               gyration honeywell_euroboard \
diff -up xkeyboard-config-1.0/rules/base.xml.in.dellm65 xkeyboard-config-1.0/rules/base.xml.in
--- xkeyboard-config-1.0/rules/base.xml.in.dellm65	2007-07-11 18:57:28.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.xml.in	2007-09-05 18:30:51.000000000 -0400
@@ -46,6 +46,12 @@
     </model>
     <model>
       <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>everex</name>
         <_description>Everex STEPnote</_description>
         <vendor>Everex</vendor>

kinesis.patch:

--- NEW FILE kinesis.patch ---
diff -up xkeyboard-config-1.0/rules/base.m_g.part.kinesis xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.kinesis	2007-09-05 15:18:32.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part	2007-09-05 15:19:01.000000000 -0400
@@ -11,4 +11,5 @@
  $macbooks      =       macintosh(%m)
  $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
   *		=       pc(pc104)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 22:43:06 -0000	1.2
+++ .cvsignore	5 Sep 2007 22:36:39 -0000	1.3
@@ -1 +1 @@
-xkeyboard-config-0.8.tar.bz2
+xkeyboard-config-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 22:43:06 -0000	1.2
+++ sources	5 Sep 2007 22:36:39 -0000	1.3
@@ -1 +1 @@
-48e694ebe816065670dda2a36f0581a2  xkeyboard-config-0.8.tar.bz2
+bcf08a6bf76bd5661f730d36a1d66517  xkeyboard-config-1.0.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xkeyboard-config.spec	1 Sep 2006 10:52:10 -0000	1.9
+++ xkeyboard-config.spec	5 Sep 2007 22:36:39 -0000	1.10
@@ -3,26 +3,19 @@
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 0.8
-Release: 7%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch0: xkeyboard-config-0.8-composify-ralt.patch
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=7990
-Patch1: xkeyboard-config-0.8-thinkpad.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=7991
-Patch2: xkeyboard-config-0.8-kinesis.patch
+Patch0: kinesis.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=7992
-Patch3: xkeyboard-config-0.8-dell.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=8068
-Patch4: xkeyboard-config-0.8-macbook.patch
-# backport from upstream cvs
-Patch5: xkeyboard-config-0.8-korean.patch
+Patch1: dellm65.patch
 
 BuildArch: noarch
 
@@ -52,18 +45,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .composify-ralt
 
-%patch1 -p1 -b .thinkpad
-%patch2 -p1 -b .kinesis
-%patch3 -p1 -b .dell
-%patch4 -p1 -b .macbook
-%patch5 -p1 -b .korean
+%patch0 -p1 -b .kinesis
+%patch1 -p1 -b .dellm65
 
 %build
-#autoreconf needed for macbook patch
-autoreconf
-
 %configure \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
@@ -98,6 +84,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 1.0-1
+- Update to 1.0
+- Drop upstreamed patches
+- Update remaining patches
+
 * Fri Sep  1 2006 Alexander Larsson <alexl at redhat.com> - 0.8-7
 - Update macbook patch to be closer to what got in upstream
 - (kp enter is ralt, not the option key)



From fedora-extras-commits at redhat.com  Wed Sep  5 22:50:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 18:50:42 -0400
Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec,1.21,1.22
Message-ID: <200709052250.l85MogMR002972@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2947

Modified Files:
	perl-Params-Util.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Params-Util.spec	30 May 2007 06:29:53 -0000	1.21
+++ perl-Params-Util.spec	5 Sep 2007 22:50:09 -0000	1.22
@@ -1,8 +1,8 @@
 Name: 		perl-Params-Util
-Version: 	0.25
+Version: 	0.29
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Util/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
@@ -42,7 +42,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
+%if "%{version}" == "0.29"
+# AUTOMATED_TESTING is broken - Shouldn't do any harm
+make test
+%else
 make test AUTOMATED_TESTING=1
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -51,6 +56,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
+- Upstream update.
+- Update licence tag.
+- Conditionally disable AUTOMATED_TESTING.
+
+* Sat Jul 28 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.26-1
+- Upstream update.
+
 * Wed May 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.25-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:53:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 18:53:00 -0400
Subject: rpms/perl-Params-Util/devel .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <200709052253.l85Mr0p2003065@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3042

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 May 2007 06:29:53 -0000	1.19
+++ .cvsignore	5 Sep 2007 22:52:27 -0000	1.20
@@ -1 +1 @@
-Params-Util-0.25.tar.gz
+Params-Util-0.29.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 May 2007 06:29:53 -0000	1.19
+++ sources	5 Sep 2007 22:52:27 -0000	1.20
@@ -1 +1 @@
-d3a95845d71e1a014ae7bbb02bee240c  Params-Util-0.25.tar.gz
+caa6ff878ffe3b097a7f07242e690be3  Params-Util-0.29.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 23:20:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:20:48 -0400
Subject: rpms/perl-Params-Util/F-7 .cvsignore, 1.19,
	1.20 perl-Params-Util.spec, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <200709052320.l85NKmNU009552@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 May 2007 06:39:26 -0000	1.19
+++ .cvsignore	5 Sep 2007 23:20:15 -0000	1.20
@@ -1 +1 @@
-Params-Util-0.25.tar.gz
+Params-Util-0.29.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/perl-Params-Util.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Params-Util.spec	30 May 2007 06:39:26 -0000	1.21
+++ perl-Params-Util.spec	5 Sep 2007 23:20:15 -0000	1.22
@@ -1,8 +1,8 @@
 Name: 		perl-Params-Util
-Version: 	0.25
+Version: 	0.29
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Util/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
@@ -42,7 +42,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
+%if "%{version}" == "0.29"
+# AUTOMATED_TESTING is broken - Shouldn't do any harm
+make test
+%else
 make test AUTOMATED_TESTING=1
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -51,6 +56,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
+- Upstream update.
+- Update licence tag.
+- Conditionally disable AUTOMATED_TESTING.
+
+* Sat Jul 28 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.26-1
+- Upstream update.
+
 * Wed May 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.25-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 May 2007 06:39:26 -0000	1.19
+++ sources	5 Sep 2007 23:20:15 -0000	1.20
@@ -1 +1 @@
-d3a95845d71e1a014ae7bbb02bee240c  Params-Util-0.25.tar.gz
+caa6ff878ffe3b097a7f07242e690be3  Params-Util-0.29.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 23:36:54 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 19:36:54 -0400
Subject: devel/yum-updatesd .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-updatesd.spec, 1.1, 1.2
Message-ID: <200709052336.l85Nasg6009962@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9927

Modified Files:
	.cvsignore sources yum-updatesd.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
- add option for configurable SMTP server
- fix email sending (Rich Fearn, #251196)
- make updates checking in the presence of NetworkManager smarter (#213732)
- ensure group info gets updated
- work with yum 3.0.x (jantill)
- don't poll gamin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2007 15:20:20 -0000	1.2
+++ .cvsignore	5 Sep 2007 23:36:21 -0000	1.3
@@ -1 +1 @@
-yum-updatesd-0.4.tar.bz2
+yum-updatesd-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2007 15:20:20 -0000	1.2
+++ sources	5 Sep 2007 23:36:21 -0000	1.3
@@ -1 +1 @@
-9ae8c8c5d92442f2430096cbbe17ecfd  yum-updatesd-0.4.tar.bz2
+369b99f963dc9a4eb8fbb3c52bd0b8cd  yum-updatesd-0.5.tar.bz2


Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yum-updatesd.spec	24 Jul 2007 15:20:20 -0000	1.1
+++ yum-updatesd.spec	5 Sep 2007 23:36:21 -0000	1.2
@@ -1,11 +1,10 @@
 Summary: Update notification daemon
 Name: yum-updatesd
 Epoch: 1
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
-# source is from the 0.4 tag at http://linux.duke.edu/yum/git/yum-updatesd.git
 Source0: %{name}-%{version}.tar.bz2
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -62,6 +61,14 @@
 
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
+- add option for configurable SMTP server
+- fix email sending (Rich Fearn, #251196)
+- make updates checking in the presence of NetworkManager smarter (#213732)
+- ensure group info gets updated
+- work with yum 3.0.x (jantill)
+- don't poll gamin
+
 * Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 1:0.4-1
 - minor review fixes.  add --oneshot mode
 



From fedora-extras-commits at redhat.com  Wed Sep  5 23:38:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:38:54 -0400
Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec,1.8,1.9
Message-ID: <200709052338.l85NcstQ010054@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-LongString/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10034

Modified Files:
	perl-Test-LongString.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
- BR: perl(ExtUtils::MakeMaker).
- Update license tag.



Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-LongString.spec	21 Feb 2007 10:10:48 -0000	1.8
+++ perl-Test-LongString.spec	5 Sep 2007 23:38:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-LongString
 Version: 	0.11
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Perl module to test long strings
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-LongString/
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Test-LongString-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Required by the tests
 BuildRequires: perl(Test::Builder) >= 0.12
 # 0.11 would require 1.04, but we only have 1.02
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
+- BR: perl(ExtUtils::MakeMaker).
+- Update license tag.
+
 * Wed Feb 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
 - Upstream update.
 - For now, ignore BR: perl(Test::Builder::Tester) > 1.04.



From fedora-extras-commits at redhat.com  Wed Sep  5 23:40:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:40:54 -0400
Subject: rpms/perl-Test-LongString/F-7 perl-Test-LongString.spec,1.8,1.9
Message-ID: <200709052340.l85NesIV010131@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-LongString/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10113

Modified Files:
	perl-Test-LongString.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
- BR: perl(ExtUtils::MakeMaker).
- Update license tag.



Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-LongString/F-7/perl-Test-LongString.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-LongString.spec	21 Feb 2007 10:10:48 -0000	1.8
+++ perl-Test-LongString.spec	5 Sep 2007 23:40:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-LongString
 Version: 	0.11
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Perl module to test long strings
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-LongString/
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Test-LongString-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Required by the tests
 BuildRequires: perl(Test::Builder) >= 0.12
 # 0.11 would require 1.04, but we only have 1.02
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
+- BR: perl(ExtUtils::MakeMaker).
+- Update license tag.
+
 * Wed Feb 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
 - Upstream update.
 - For now, ignore BR: perl(Test::Builder::Tester) > 1.04.



From fedora-extras-commits at redhat.com  Wed Sep  5 23:59:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Wed, 5 Sep 2007 19:59:18 -0400
Subject: rpms/oddjob/devel .cvsignore, 1.6, 1.7 oddjob.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200709052359.l85NxIjY010531@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10504

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
- update to 0.29



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jul 2006 18:39:13 -0000	1.6
+++ .cvsignore	5 Sep 2007 23:58:45 -0000	1.7
@@ -1 +1,2 @@
 oddjob-0.27-1.tar.gz
+oddjob-0.29-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- oddjob.spec	13 Feb 2007 23:39:12 -0000	1.14
+++ oddjob.spec	5 Sep 2007 23:58:45 -0000	1.15
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.27
-Release: 10
+Version: 0.29
+Release: 1%{?dist}
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -12,17 +12,25 @@
 BuildRequires: pam-devel, python-devel, pkgconfig
 BuildRequires: cyrus-sasl-devel, krb5-devel, openldap-devel
 BuildRequires: docbook-dtds, xmlto
-BuildRequires: python-devel
 Requires(post): /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(pre): /sbin/chkconfig
 URL: http://people.redhat.com/nalin/oddjob/
-Requires: %{name}-libs = %{version}-%{release}
 
 %description
 oddjob is a D-BUS service which performs particular tasks for clients which
 connect to it and issue requests using the system-wide message bus.
 
+%package mkhomedir
+Group: System Environment/Daemons
+Summary: An oddjob helper which creates and populates home directories
+Requires: %{name} = %{version}-%{release}
+
+%description mkhomedir
+This package contains the oddjob helper which can be used by the
+pam_oddjob_mkhomedir module to create a home directory for a user
+at login-time.
+
 %package devel
 Group: Development/Libraries
 Summary: Files for developing oddjob clients
@@ -43,6 +51,16 @@
 This package contains dynamic libraries which are used by simple oddjob client
 applications.
 
+%package python
+Group: System Environment/Libraries
+Summary: A Python binding for oddjob clients
+Requires: %{name}-libs = %{version}-%{release}
+
+%description python
+This package contains a python module which allows client applications
+written in the Python language to issue requests to the oddjobd server
+using the message bus.
+
 %package sample
 Group: System Environment/Daemons
 Summary: A sample oddjob service.
@@ -61,10 +79,11 @@
 %endif
 %configure \
 	--disable-static \
-	--with-selinux-acls=default \
+	--with-selinux-acls \
 	--with-selinux-labels \
 	--with-python --enable-xml-docs --enable-compat-dtd \
-	--libexecdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
+	--disable-dependency-tracking \
 	$sample_flag
 make %{_smp_mflags}
 
@@ -94,7 +113,7 @@
 
 %files
 %defattr(-,root,root)
-%doc *.dtd COPYING QUICKSTART python/sample.py doc/oddjob.html
+%doc *.dtd COPYING QUICKSTART python/sample.py doc/oddjob.html src/reload
 %if ! %{build_sample}
 %doc sample-install-root/sample
 %endif
@@ -104,19 +123,30 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
-%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
+%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/mkhomedir
-%{_libdir}/%{name}/sanity.sh
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/sanity.sh
 %{_mandir}/*/oddjob*.*
 
+%files mkhomedir
+%defattr(-,root,root)
+%doc src/mkhomedirfor src/mkmyhomedir
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/mkhomedir
+/%{_lib}/security/pam_oddjob_mkhomedir.so
+%{_mandir}/*/pam_oddjob_mkhomedir.*
+%config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob-mkhomedir.conf
+%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/liboddjob.so.*
+
+%files python
+%defattr(-,root,root)
 %{_libdir}/python*/site-packages/*
-/%{_lib}/security/*.so
-%{_mandir}/*/pam_*.*
 
 %files devel
 %defattr(-,root,root)
@@ -145,15 +175,19 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 13 2007 Nalin Dahyabhai <nalin at redhat.com> 0.27-10
-- make -devel depend on -libs, which supplies the libraries to which it
-  symlinks (#228377)
+* Wed Sep  5 2007 Nalin Dahyabhai <nalin at redhat.com> 0.29-1
+- split off mkhomedir bits into a subpackage (#236820)
+- take a pass at new-init-ifying the init script (#247005)
+
+* Thu Aug 16 2007 Nalin Dahyabhai <nalin at redhat.com>
+- move helpers to libexecdir, keeping pkglibdir around in the package (#237207)
+
+* Mon Apr  9 2007 Nalin Dahyabhai <nalin at redhat.com> 0.28-1
+- split off python subpackage, make -devel depend on -libs, let autodeps
+  provide the main package's dependency on -libs (#228377)
 
-* Sun Dec 10 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-9
-- add BuildRequires: on python-devel
-
-* Thu Sep  7 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-8
-- rebuild
+* Thu Feb 15 2007 Nalin Dahyabhai <nalin at redhat.com> 0.27-8
+- configure with --disable-dependency-tracking (Ville Skytt??, #228928)
 
 * Thu Jul 25 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-7
 - unmark the init script as a %%config file (part of #197182)
@@ -224,7 +258,7 @@
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration
   - oddjobd can reload its configuration now
-  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper (#246681)
 
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jul 2006 18:39:13 -0000	1.6
+++ sources	5 Sep 2007 23:58:45 -0000	1.7
@@ -1 +1 @@
-22af2ce420a85b0526b6af7fc12e0e26  oddjob-0.27-1.tar.gz
+51aac71afb06315afd6d6434cf5aa3cc  oddjob-0.29-1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 00:04:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:04:49 -0400
Subject: rpms/zeroinstall-injector/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 zeroinstall-injector.spec, 1.5, 1.6
Message-ID: <200709060004.l8604nqK016622@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578/F-7

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2006 00:00:33 -0000	1.3
+++ .cvsignore	6 Sep 2007 00:04:15 -0000	1.4
@@ -1 +1 @@
-zeroinstall-injector-0.24.tar.gz.gpg
+zeroinstall-injector-0.30.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2006 00:00:33 -0000	1.3
+++ sources	6 Sep 2007 00:04:15 -0000	1.4
@@ -1 +1 @@
-d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg
+c539dc6ffa39f18700220f5565d8eac3  zeroinstall-injector-0.30.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zeroinstall-injector.spec	19 Dec 2006 03:56:40 -0000	1.5
+++ zeroinstall-injector.spec	6 Sep 2007 00:04:15 -0000	1.6
@@ -1,30 +1,41 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define cache_dir /var/cache/0install.net
+
 Name:    zeroinstall-injector
-Version: 0.24
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
-License: LGPL
+License: LGPLv2.1
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
 Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel gnupg
-Requires: PyXML pygtk2 gnupg
+BuildRequires: python-devel gnupg desktop-file-utils
+Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires: /usr/sbin/useradd
 
 %description
-A running process is created by combining many different libraries (and other
-components). In the Zero Install world, we have all versions of each library
-available at all times. The problem then is how to choose which versions to
-use.
-
-The injector solves this problem by selecting components to meet a program's
-requirements, according to a policy you give it. The injector finds out which
-versions are available, and downloads and runs the ones you choose.
+The Zero Install Injector makes it easy for users to install software without
+needing root privileges. It takes the URL of a program and runs it
+(downloading it first if necessary). Any dependencies of the program are
+fetched in the same way. The user controls which version of the program and
+its dependencies to use.
+
+Zero Install is a decentralised installation system (there is no central
+repository; all packages are identified by URLs), loosly-coupled (if different
+programs require different versions of a library then both versions are
+installed in parallel, without conflicts), and has an emphasis on security
+(all package descriptions are GPG-signed, and contain cryptographic hashes of
+the contents of each version). Each version of each program is stored in its
+own sub-directory within the Zero Install cache (nothing is installed to
+directories outside of the cache, such as /usr/bin) and no code from the
+package is run during install or uninstall. The system can automatically check
+for updates when software is run.
 
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
@@ -36,15 +47,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
+mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
+
+desktop-file-install --vendor="fedora" \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# Add the "zeroinst" user.
+# This is not used by default, but is required if you want to
+# set up sharing of downloads later.
+/usr/sbin/useradd -c 'Zero Install shared cache' \
+    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
+%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
@@ -53,11 +79,20 @@
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
+%{python_sitelib}/zeroinstall/0launch-gui/zero-install.glade
 %{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
-
+%dir %{cache_dir}
+%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
+- Update to 0.30
+- License is now versioned
+- Incorporate changes from Thomas Leonard:
+  * create zeroinst user
+  * create shared cache
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> 0.24-3
 - Rebuild for development branch
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:04:52 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:04:52 -0400
Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.3, 1.4 sources, 1.3, 
	1.4 zeroinstall-injector.spec, 1.5, 1.6
Message-ID: <200709060004.l8604qF6016632@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578/devel

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2006 00:00:33 -0000	1.3
+++ .cvsignore	6 Sep 2007 00:04:19 -0000	1.4
@@ -1 +1 @@
-zeroinstall-injector-0.24.tar.gz.gpg
+zeroinstall-injector-0.30.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2006 00:00:33 -0000	1.3
+++ sources	6 Sep 2007 00:04:19 -0000	1.4
@@ -1 +1 @@
-d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg
+c539dc6ffa39f18700220f5565d8eac3  zeroinstall-injector-0.30.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zeroinstall-injector.spec	19 Dec 2006 03:56:40 -0000	1.5
+++ zeroinstall-injector.spec	6 Sep 2007 00:04:19 -0000	1.6
@@ -1,30 +1,41 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define cache_dir /var/cache/0install.net
+
 Name:    zeroinstall-injector
-Version: 0.24
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
-License: LGPL
+License: LGPLv2.1
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
 Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel gnupg
-Requires: PyXML pygtk2 gnupg
+BuildRequires: python-devel gnupg desktop-file-utils
+Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires: /usr/sbin/useradd
 
 %description
-A running process is created by combining many different libraries (and other
-components). In the Zero Install world, we have all versions of each library
-available at all times. The problem then is how to choose which versions to
-use.
-
-The injector solves this problem by selecting components to meet a program's
-requirements, according to a policy you give it. The injector finds out which
-versions are available, and downloads and runs the ones you choose.
+The Zero Install Injector makes it easy for users to install software without
+needing root privileges. It takes the URL of a program and runs it
+(downloading it first if necessary). Any dependencies of the program are
+fetched in the same way. The user controls which version of the program and
+its dependencies to use.
+
+Zero Install is a decentralised installation system (there is no central
+repository; all packages are identified by URLs), loosly-coupled (if different
+programs require different versions of a library then both versions are
+installed in parallel, without conflicts), and has an emphasis on security
+(all package descriptions are GPG-signed, and contain cryptographic hashes of
+the contents of each version). Each version of each program is stored in its
+own sub-directory within the Zero Install cache (nothing is installed to
+directories outside of the cache, such as /usr/bin) and no code from the
+package is run during install or uninstall. The system can automatically check
+for updates when software is run.
 
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
@@ -36,15 +47,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
+mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
+
+desktop-file-install --vendor="fedora" \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# Add the "zeroinst" user.
+# This is not used by default, but is required if you want to
+# set up sharing of downloads later.
+/usr/sbin/useradd -c 'Zero Install shared cache' \
+    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
+%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
@@ -53,11 +79,20 @@
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
+%{python_sitelib}/zeroinstall/0launch-gui/zero-install.glade
 %{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
-
+%dir %{cache_dir}
+%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
+- Update to 0.30
+- License is now versioned
+- Incorporate changes from Thomas Leonard:
+  * create zeroinst user
+  * create shared cache
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> 0.24-3
 - Rebuild for development branch
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:12:37 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:12:37 -0400
Subject: rpms/GeoIP/EL-4 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200709060012.l860CbSE016885@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	6 Sep 2007 00:12:04 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	6 Sep 2007 00:12:04 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	6 Sep 2007 00:12:04 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:14:56 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:14:56 -0400
Subject: rpms/GeoIP/EL-4 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709060014.l860EuVX016934@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16910

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 00:12:04 -0000	1.10
+++ .cvsignore	6 Sep 2007 00:14:24 -0000	1.11
@@ -1,5 +1,5 @@
+GeoIP-1.4.3.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
-GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Sep 2007 00:12:04 -0000	1.10
+++ sources	6 Sep 2007 00:14:24 -0000	1.11
@@ -1,5 +1,5 @@
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
-d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:17:52 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:17:52 -0400
Subject: rpms/GeoIP/EL-5 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <200709060017.l860Hqo6017037@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17015

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Apr 2007 08:42:04 -0000	1.9
+++ .cvsignore	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,4 +1,4 @@
-GeoIP-1.4.2.tar.gz
+GeoIP-1.4.3.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
 LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/GeoIP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeoIP.spec	1 Apr 2007 08:42:04 -0000	1.9
+++ GeoIP.spec	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,10 +79,13 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Apr 1 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
+* Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
-- Sync with devel
-- Fix dumb typo in fetch-geoipdata-city.pl
 
 * Mon Jan 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.1-2
 - License is actually LGPL now.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Apr 2007 08:42:04 -0000	1.9
+++ sources	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-a650a3e4fb2f7c3984c4081cd5949d73  fetch-geoipdata-city.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:31:54 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 20:31:54 -0400
Subject: rpms/tracker/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tracker.spec, 1.19, 1.20
Message-ID: <200709060031.l860Vsqb017732@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17704

Modified Files:
	.cvsignore sources tracker.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
- Version 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2007 23:47:52 -0000	1.7
+++ .cvsignore	6 Sep 2007 00:31:22 -0000	1.8
@@ -1 +1 @@
-tracker-0.6.1.tar.bz2
+tracker-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2007 23:47:52 -0000	1.7
+++ sources	6 Sep 2007 00:31:22 -0000	1.8
@@ -1 +1 @@
-3f706dc73fffa0a7b633b0c0aff6a263  tracker-0.6.1.tar.bz2
+d4d66cd73e6c59ac392565be622370f2  tracker-0.6.2.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tracker.spec	25 Aug 2007 12:24:50 -0000	1.19
+++ tracker.spec	6 Sep 2007 00:31:22 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.1
-Release:	2%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
@@ -11,11 +11,7 @@
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-%if "%fedora" >= "6"
-BuildRequires:	sqlite-devel
-%else
-BuildRequires:	dbus-devel, dbus-glib
-%endif
+BuildRequires:	sqlite-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -54,17 +50,14 @@
 
 %prep
 %setup -q
-# remove shebangs from the python files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i python/deskbar-handler/*.py
+%define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
 
 %build
-%if "%fedora" >= "6"
-%configure --disable-static --enable-external-sqlite	\
-	--enable-preferences --enable-deskbar-applet	\
-	--with-deskbar-applet-handler-dir=%{_libdir}/deskbar-applet/handlers
+%configure --disable-static --enable-deskbar-applet=auto	\
+%if "%deskbar_applet_ver" >= "2.19"
+	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/modules
 %else
-%configure --disable-static --enable-preferences	\
-	--enable-deskbar-applet
+	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/handlers
 %endif
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -123,12 +116,19 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
+%if "%deskbar_applet_ver" >= "2.19"
+%{_libdir}/deskbar-applet/modules/tracker*.py*
+%else
 %{_libdir}/deskbar-applet/handlers/*.py*
+%endif
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Version 0.6.2
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:33:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 5 Sep 2007 20:33:53 -0400
Subject: comps comps-f8.xml.in,1.93,1.94
Message-ID: <200709060033.l860XrUn017799@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17680

Modified Files:
	comps-f8.xml.in 
Log Message:
- add cjkunifonts to base-x and fonts groups
- install just cjkunifonts-uming by default instead of fonts-chinese



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- comps-f8.xml.in	5 Sep 2007 19:26:45 -0000	1.93
+++ comps-f8.xml.in	6 Sep 2007 00:33:23 -0000	1.94
@@ -310,11 +310,11 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
       <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-chinese</packagereq>
       <packagereq type="default">fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
       <packagereq type="default">fonts-hindi</packagereq>
@@ -357,6 +357,7 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
+      <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
@@ -395,10 +396,10 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
       <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-chinese</packagereq>
       <packagereq type="default">fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hindi</packagereq>
       <packagereq type="default">fonts-kannada</packagereq>
@@ -414,9 +415,11 @@
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep  6 00:34:53 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 20:34:53 -0400
Subject: rpms/referencer/devel referencer.spec,1.5,1.6
Message-ID: <200709060034.l860Yrfr017837@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17807

Modified Files:
	referencer.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
- Rebuild against newer poppler library



Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- referencer.spec	25 Aug 2007 12:22:18 -0000	1.5
+++ referencer.spec	6 Sep 2007 00:34:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.0.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
@@ -68,6 +68,9 @@
 %{_datadir}/referencer/
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
+- Rebuild against newer poppler library
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:36:23 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:36:23 -0400
Subject: rpms/python-GeoIP/devel .cvsignore, 1.2, 1.3 python-GeoIP.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709060036.l860aN2X017981@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17957

Modified Files:
	.cvsignore python-GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Feb 2006 22:33:22 -0000	1.2
+++ .cvsignore	6 Sep 2007 00:35:51 -0000	1.3
@@ -1 +1,2 @@
 GeoIP-Python-1.2.1.tar.gz
+GeoIP-Python-1.2.1-ccodes.patch


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	6 Sep 2007 00:35:51 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Feb 2006 22:33:22 -0000	1.2
+++ sources	6 Sep 2007 00:35:51 -0000	1.3
@@ -1 +1,2 @@
 5683420ea34490029ee0285ff048fda0  GeoIP-Python-1.2.1.tar.gz
+07b7d26c645581af0b797dc145e79dca  GeoIP-Python-1.2.1-ccodes.patch



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, 6) updated by kevin
Message-ID: <200709060040.l860ecYe022540@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-IPC-RUN3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora 6) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora 6) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, 7) updated by kevin
Message-ID: <200709060040.l860ecbl022549@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-IPC-RUN3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora 7) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora 7) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, devel) updated by kevin
Message-ID: <200709060040.l860ecns022558@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora devel) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora devel) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:31 -0400
Subject: rpms/perl-IPC-RUN3 - New directory
Message-ID: <200709060041.l860fVqh018224@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3

Log Message:
Directory /cvs/extras/rpms/perl-IPC-RUN3 added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:34 -0400
Subject: rpms/perl-IPC-RUN3/devel - New directory
Message-ID: <200709060041.l860fYdc018250@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-RUN3/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:37 -0400
Subject: rpms/perl-IPC-RUN3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709060041.l860fb2c018275@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-RUN3


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-RUN3
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:40 -0400
Subject: rpms/perl-IPC-RUN3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709060041.l860feck018291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-RUN3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IPC-RUN3
# $Id: Makefile,v 1.1 2007/09/06 00:41:37 kevin Exp $
NAME := perl-IPC-RUN3
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 fedora-extras-commits at redhat.com  Thu Sep  6 00:41:58 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:41:58 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.6,1.7
Message-ID: <200709060041.l860fwkI018463@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18167/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
- Fix desktop-file-install problems



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zeroinstall-injector.spec	6 Sep 2007 00:04:15 -0000	1.6
+++ zeroinstall-injector.spec	6 Sep 2007 00:41:26 -0000	1.7
@@ -52,6 +52,8 @@
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
 desktop-file-install --vendor="fedora" \
+    --remove-category="Application" \
+    --delete-original
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
@@ -69,7 +71,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
-%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/



From fedora-extras-commits at redhat.com  Thu Sep  6 00:42:03 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:42:03 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.6,1.7
Message-ID: <200709060042.l860g3Y7018467@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18167/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
- Fix desktop-file-install problems



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zeroinstall-injector.spec	6 Sep 2007 00:04:19 -0000	1.6
+++ zeroinstall-injector.spec	6 Sep 2007 00:41:30 -0000	1.7
@@ -52,6 +52,8 @@
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
 desktop-file-install --vendor="fedora" \
+    --remove-category="Application" \
+    --delete-original
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
@@ -69,7 +71,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
-%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/



From fedora-extras-commits at redhat.com  Thu Sep  6 00:48:00 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 5 Sep 2007 20:48:00 -0400
Subject: rpms/rogue/F-7 .cvsignore, 1.2, 1.3 rogue.spec, 1.10, 1.11 sources, 
	1.2, 1.3 rogue-5.4-setgid.patch, 1.3,
	NONE rogue-5.4.2-64bit.patch, 1.1,
	NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch,
	1.1, NONE rogue-rpmopts.patch, 1.1, NONE
Message-ID: <200709060048.l860m0Ot018608@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18570

Modified Files:
	.cvsignore rogue.spec sources 
Removed Files:
	rogue-5.4-setgid.patch rogue-5.4.2-64bit.patch 
	rogue-5.4.2-warnings.patch rogue-includes.patch 
	rogue-rpmopts.patch 
Log Message:
Update to 5.4.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 15:59:40 -0000	1.2
+++ .cvsignore	6 Sep 2007 00:47:28 -0000	1.3
@@ -1 +1 @@
-rogue5.4.2-src.tar.gz
+rogue5.4.4-src.tar.gz


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/rogue.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rogue.spec	16 Jul 2007 15:03:41 -0000	1.10
+++ rogue.spec	6 Sep 2007 00:47:28 -0000	1.11
@@ -1,19 +1,14 @@
 Name:           rogue
-Version:        5.4.2
-Release:        9%{?dist}
+Version:        5.4.4
+Release:        1%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
 License:        BSD
 URL:            http://rogue.rogueforge.net/
-Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.2-src.tar.gz
+Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
 Source1:        rogue.desktop
 Source2:        rogue.png
-Patch0:         rogue-rpmopts.patch
-Patch1:         rogue-includes.patch
-Patch2:         rogue-5.4-setgid.patch
-Patch3:         rogue-5.4.2-64bit.patch
-Patch4:         rogue-5.4.2-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,27 +19,18 @@
 an entire genre.
 
 %prep
-%setup -q -c -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%{__sed} -i 's/\r//' rogue54.html
-%{__sed} -i 's/\r//' readme54.html
-chmod a-x *.c *.h
+%setup -q -n %{name}%{version}
 
 
 %build
-make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck
+make %{_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue
-install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6
-mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -52,8 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
-touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,11 +63,13 @@
 %{_datadir}/icons/hicolor/32x32/apps/rogue.png
 %dir %attr(0775,games,games) %{_var}/games/roguelike
 %config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr
-%doc LICENSE.TXT rogue54.doc rogue54.html readme54.html
-
+%doc %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Sun Sep 2 2007 Wart <wart at kobold.org> 5.4.4-1
+- Update to 5.4.4
+
 * Sun Jul 15 2007 Wart <wart at kobold.org> 5.4.2-9
 - New upstream home page and download URL
 - Add patch when reading long values from the save file on 64-bit arch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 15:59:40 -0000	1.2
+++ sources	6 Sep 2007 00:47:28 -0000	1.3
@@ -1 +1 @@
-bd656cb017a579eba835a0ee445a0a32  rogue5.4.2-src.tar.gz
+033288f46444b06814c81ea69d96e075  rogue5.4.4-src.tar.gz


--- rogue-5.4-setgid.patch DELETED ---


--- rogue-5.4.2-64bit.patch DELETED ---


--- rogue-5.4.2-warnings.patch DELETED ---


--- rogue-includes.patch DELETED ---


--- rogue-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 00:53:07 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 5 Sep 2007 20:53:07 -0400
Subject: rpms/Pixie/devel Pixie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709060053.l860r7TX018685@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18658/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Pixie.spec 
Log Message:
Initial import



--- NEW FILE Pixie.spec ---
Name:           Pixie
Version:        2.2.2
Release:        1%{?dist}
Summary:        3D renderer Renderman compliant

Group:          Applications/Multimedia
License:        LGPLv2+
URL:            http://www.cs.utexas.edu/~okan/Pixie/pixie.htm
Source0:        http://downloads.sourceforge.net/pixie/%{name}-src-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  autoconf, automake, libtool, tcsh

BuildRequires:  bison
BuildRequires:  doxygen
BuildRequires:  flex

BuildRequires:  fltk-devel
BuildRequires:  OpenEXR-devel

BuildRequires:  libX11-devel
BuildRequires:  libICE-devel
BuildRequires:  libtiff-devel


%description
Pixie is a RenderMan like photorealistic renderer.
It is being developed in the hope that it will be
useful for graphics research and for people who
can not afford a commercial renderer.

%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}.

%package        docs
Summary:        Documentation for %{name}
Group:          Documentation

%description docs
This package contains documentation files for %{name}.


%prep
%setup -q -n %{name}

# Use autotool to prevent to do special tweaks
#csh makeunix

# Fix a logical problem in configure which link to the static version
sed -i.r_static -e 's|--ldstaticflags|--ldflags|' configure



%build
%configure \
  --program-prefix=%{name}_ \
  --disable-static \
  --enable-shared \
  --disable-static-fltk \
  --disable-selfcontained \
  --with-x


# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" CPPROG="cp -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

mkdir -p __doc
cp -pr $RPM_BUILD_ROOT%{_datadir}/doc/Pixie/* __doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
# zero-length + wrong-file-end-of-line-encoding tweaks
rm __doc/StaticSite_NotIncludedStatic.html
sed -i 's/\r//'  __doc/css/broswerforms_compact.css

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVNOTES README
%{_bindir}/*
%{_mandir}/man1/*.gz
%{_datadir}/Pixie/
%{_libdir}/*.so.*
%{_libdir}/Pixie/

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files docs
%defattr(-,root,root,-)
%doc __doc/*


%changelog
* Fri Jul 27 2007 kwizart < kwizart at gmail.com > - 2.2.2-1
- Update to 2.2.2

* Mon Jul 16 2007 kwizart < kwizart at gmail.com > - 2.2.1-2
- Fixed typo with libs
- Fixed timestamp with install -p

* Sat Jul 14 2007 kwizart < kwizart at gmail.com > - 2.2.1-1
- Update to 2.2.1
- Rename to Pixie
- Preserve timestamp at install step
- Improve directory ownership
- Move docs to sub-package
- Move libs to sub-package (multilibs)
- Add a dyn patch to link to shared ftgl

* Mon May 21 2007 kwizart < kwizart at gmail.com > - 2.1.1-1
- Initial spec file for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pixie/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 21:27:05 -0000	1.1
+++ .cvsignore	6 Sep 2007 00:52:35 -0000	1.2
@@ -0,0 +1 @@
+Pixie-src-2.2.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pixie/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 21:27:05 -0000	1.1
+++ sources	6 Sep 2007 00:52:35 -0000	1.2
@@ -0,0 +1 @@
+c4360ceca89319bcf60a15be96cbd245  Pixie-src-2.2.2.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 00:55:41 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:55:41 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.7,1.8
Message-ID: <200709060055.l860tfPs018826@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Missing backlash in desktop-file-install command



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zeroinstall-injector.spec	6 Sep 2007 00:41:26 -0000	1.7
+++ zeroinstall-injector.spec	6 Sep 2007 00:55:09 -0000	1.8
@@ -53,7 +53,7 @@
 
 desktop-file-install --vendor="fedora" \
     --remove-category="Application" \
-    --delete-original
+    --delete-original \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:55:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:55:44 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.7,1.8
Message-ID: <200709060055.l860timC018829@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Missing backlash in desktop-file-install command



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zeroinstall-injector.spec	6 Sep 2007 00:41:30 -0000	1.7
+++ zeroinstall-injector.spec	6 Sep 2007 00:55:11 -0000	1.8
@@ -53,7 +53,7 @@
 
 desktop-file-install --vendor="fedora" \
     --remove-category="Application" \
-    --delete-original
+    --delete-original \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 



From fedora-extras-commits at redhat.com  Thu Sep  6 02:24:21 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 22:24:21 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.46,
	1.47 selinux-policy.spec, 1.513, 1.514
Message-ID: <200709060224.l862OLb6031920@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31897

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
- Allow sendmail to create etc_aliases_t


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- policy-20070703.patch	5 Sep 2007 21:30:18 -0000	1.46
+++ policy-20070703.patch	6 Sep 2007 02:24:18 -0000	1.47
@@ -3164,7 +3164,7 @@
 +/etc/rc\.d/init\.d/httpd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.0.7/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-05 07:16:31.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-05 22:22:33.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3409,7 +3409,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1013,46 +1047,143 @@
+@@ -1013,46 +1047,141 @@
  ##	</summary>
  ## </param>
  #
@@ -3554,8 +3554,6 @@
 +	# Allow $1 to restart the apache service
 +	apache_script_domtrans($1)
 +	domain_system_change_exemption($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 httpd_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -6184,8 +6182,8 @@
 +/etc/rc\.d/init\.d/mysqld	--	gen_context(system_u:object_r:mysqld_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.0.7/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-04 16:56:14.000000000 -0400
-@@ -157,3 +157,80 @@
++++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-05 22:11:26.000000000 -0400
+@@ -157,3 +157,79 @@
  	logging_search_logs($1)
  	allow $1 mysqld_log_t:file { write append setattr ioctl };
  ')
@@ -6241,13 +6239,12 @@
 +		type mysqld_script_exec_t;
 +	')
 +
-+	allow $1 mysqld_t:process { ptrace signal_perms };
++	allow $1 mysqld_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, mysqld_t, mysqld_t)
 +	
 +	# Allow $1 to restart the apache service
 +	mysql_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 mysqld_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -7324,8 +7321,8 @@
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.0.7/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-05 15:13:11.000000000 -0400
-@@ -113,3 +113,78 @@
++++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-05 22:13:10.000000000 -0400
+@@ -113,3 +113,77 @@
          # Some versions of postgresql put the sock file in /tmp
  	allow $1 postgresql_tmp_t:sock_file write;
  ')
@@ -7379,13 +7376,12 @@
 +		type postgresql_log_t;
 +	')
 +
-+	allow $1 postgresql_t:process { ptrace signal_perms };
++	allow $1 postgresql_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, postgresql_t, postgresql_t)
 +
 +	# Allow $1 to restart the apache service
 +	postgresql_script_domtrans($1)
 +	domain_system_change_exemption($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 postgresql_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -10347,7 +10343,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.7/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-04 12:01:50.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-05 22:21:18.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -10418,7 +10414,7 @@
  
  manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
  manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
-@@ -496,6 +511,39 @@
+@@ -496,6 +511,43 @@
  ')
  
  optional_policy(`
@@ -10449,8 +10445,12 @@
 +
 +	tunable_policy(`allow_daemons_use_tty',`
 +		unconfined_use_terminals(daemon)
++		term_use_all_user_ttys(daemon)
++		term_use_all_user_ptys(daemon)
 + 	', `
 +		unconfined_dontaudit_use_terminals(daemon)
++		term_dontaudit_use_all_user_ttys(daemon)
++		term_dontaudit_use_all_user_ptys(daemon)
 + 	')
 +')
 + 
@@ -10458,7 +10458,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -631,12 +679,6 @@
+@@ -631,12 +683,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -10471,7 +10471,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -702,6 +744,9 @@
+@@ -702,6 +748,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -10720,7 +10720,7 @@
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.7/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-04 17:01:26.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-05 22:22:05.000000000 -0400
 @@ -33,8 +33,13 @@
  ## </param>
  #
@@ -11014,12 +11014,12 @@
 +		type auditd_var_run_t;
 +	')
 +
-+	allow $1 auditd_t:process { ptrace signal_perms };
++	allow $1 auditd_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, auditd_t, auditd_t)
++
 +	# Allow $1 to restart the apache service
 +	audit_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 audit_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -11068,14 +11068,14 @@
 +		type var_log_t;
 +	')
 +
-+	allow $1 syslogd_t:process { ptrace signal_perms };
-+	allow $1 klogd_t:process { ptrace signal_perms };
++	allow $1 syslogd_t:process { ptrace signal_perms getattr };
++	allow $1 klogd_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, syslogd_t, syslogd_t)
++	read_files_pattern($1, klogd_t, klogd_t)
 +
 +	# Allow $1 to restart the apache service
 +	syslog_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 syslog_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -12585,7 +12585,16 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-04 16:56:00.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-05 22:07:53.000000000 -0400
+@@ -45,7 +45,7 @@
+ 	type $1_tty_device_t; 
+ 	term_user_tty($1_t,$1_tty_device_t)
+ 
+-	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession };
++	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
+ 	allow $1_t self:fd use;
+ 	allow $1_t self:fifo_file rw_fifo_file_perms;
+ 	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -62,6 +62,10 @@
  
  	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
@@ -14025,7 +14034,7 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-08-31 15:27:24.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-05 21:49:04.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- selinux-policy.spec	5 Sep 2007 21:30:18 -0000	1.513
+++ selinux-policy.spec	6 Sep 2007 02:24:18 -0000	1.514
@@ -194,8 +194,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs n y
-%installCmds targeted mcs n y
+%setupCmds targeted mcs y y
+%installCmds targeted mcs y y
 %endif
 
 %if %{BUILD_MLS}
@@ -207,8 +207,8 @@
 %if %{BUILD_OLPC}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds olpc mcs n y
-%installCmds olpc mcs n y
+%setupCmds olpc mcs y y
+%installCmds olpc mcs y y
 %endif
 
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs



From fedora-extras-commits at redhat.com  Thu Sep  6 02:48:07 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 22:48:07 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.24,
	1.25 libsemanage.spec, 1.131, 1.132
Message-ID: <200709060248.l862m7iO032457@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32429

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
+++ libsemanage-rhat.patch	6 Sep 2007 02:48:04 -0000	1.25
@@ -74,21 +74,6 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
---- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
-@@ -37,10 +37,10 @@
- 	int expand_check;
- 	int save_previous;
- 	int save_linked;
--	int disable_genhomedircon;
- 	mode_t file_mode;
- 	struct external_prog *load_policy;
- 	struct external_prog *setfiles;
-+	struct external_prog *genhomedircon;
- 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
- } semanage_conf_t;
- 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libsemanage.spec	5 Sep 2007 18:51:36 -0000	1.131
+++ libsemanage.spec	6 Sep 2007 02:48:04 -0000	1.132
@@ -10,7 +10,7 @@
 Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libselinux-devel >= %{libselinuxver} swig
+BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel
 BuildRequires: libsepol-devel >= %{libsepolver} 
 BuildRequires: python-devel bison flex
 
@@ -33,7 +33,7 @@
 %package devel
 Summary: Header files and libraries used to build policy manipulation tools
 Group: Development/Libraries
-Requires: libsemanage = %{version}-%{release}
+Requires: libsemanage = %{version}-%{release} ustr
 
 %description devel
 The semanage-devel package contains the static libraries and header files



From fedora-extras-commits at redhat.com  Thu Sep  6 03:52:55 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Wed, 5 Sep 2007 23:52:55 -0400
Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.7,1.8
Message-ID: <200709060352.l863qte0006892@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/mod_auth_pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874

Modified Files:
	mod_auth_pam.spec 
Log Message:
Rebuild for new APR libs



Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_auth_pam.spec	21 Mar 2007 03:26:04 -0000	1.7
+++ mod_auth_pam.spec	6 Sep 2007 03:52:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Wed Sep  5 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.1.1-5
+- Rebuild for new APR libs
+
 * Tue Mar 20 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.1.1-4
 - Rebuild for Fedora 7
 



From fedora-extras-commits at redhat.com  Thu Sep  6 04:07:37 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 00:07:37 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.12,1.13
Message-ID: <200709060407.l8647b3M012976@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12949

Modified Files:
	xulrunner.spec 
Log Message:
fix file not found error



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xulrunner.spec	5 Sep 2007 19:55:01 -0000	1.12
+++ xulrunner.spec	6 Sep 2007 04:07:04 -0000	1.13
@@ -225,7 +225,7 @@
 
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
-%{__cp} rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
+%{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
 # set up our default bookmarks



From fedora-extras-commits at redhat.com  Thu Sep  6 05:48:57 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 6 Sep 2007 01:48:57 -0400
Subject: rpms/php-pear-Mail-Mime/devel .cvsignore, 1.3,
	1.4 php-pear-Mail-Mime.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709060548.l865mvTG020300@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-pear-Mail-Mime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20276

Modified Files:
	.cvsignore php-pear-Mail-Mime.spec sources 
Log Message:
Update to 1.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 May 2007 18:25:28 -0000	1.3
+++ .cvsignore	6 Sep 2007 05:48:24 -0000	1.4
@@ -1 +1 @@
-Mail_Mime-1.4.0.tgz
+Mail_Mime-1.5.2.tgz


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/php-pear-Mail-Mime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Mail-Mime.spec	16 May 2007 18:25:28 -0000	1.2
+++ php-pear-Mail-Mime.spec	6 Sep 2007 05:48:24 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.4.0
+Version:	1.5.2
 Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
@@ -13,7 +13,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1:1.4.9-1.2
+BuildRequires:	php-pear >= 1.6.0
 Requires:	php-pear(PEAR)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
@@ -77,6 +77,9 @@
 %{pear_phpdir}/Mail
 
 %changelog
+* Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-1
+- Upgraded to 1.5.2
+
 * Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.4.0-1
 - Upgraded to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 May 2007 18:25:28 -0000	1.3
+++ sources	6 Sep 2007 05:48:24 -0000	1.4
@@ -1 +1 @@
-71bf9236960ccc1196a6ff1729044cbf  Mail_Mime-1.4.0.tgz
+30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 06:28:56 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 02:28:56 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.7,1.8
Message-ID: <200709060628.l866SueJ026900@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26880

Modified Files:
	Config_EPEL.py 
Log Message:
apply patch enabling testing/stable



Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Config_EPEL.py	15 Aug 2007 02:29:22 -0000	1.7
+++ Config_EPEL.py	6 Sep 2007 06:28:54 -0000	1.8
@@ -28,12 +28,13 @@
     mail = True
     repoprune = True
     repoview = True
+    pushtotesting = True
     signkeycheck = True
-    doublesync = False
+
 
 top_workdir = '/srv/rpmbuild'
 
-treedir = top_workdir+'/%s/tree/%s/testing' % (project, project)
+treedir = top_workdir+'/%s/tree/%s' % (project, project)
 stagesdir = top_workdir+'/repodir'
 
 # Where we store mails to be sent, our main lockfile, ...
@@ -41,32 +42,42 @@
 rundir = top_workdir+'/epel-push-rundir'
 cachedir = rundir+'/mdcache'
 
-alldists = [ '5', '4' ] # also the order in build reports
+alldists = [ '5', 'testing/5', '4', 'testing/4' ] # also the order in build reports
 
 frozendists = []
 
 archdict = { 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386']
+            'testing/4':['ppc','x86_64', 'i386'],
+            'testing/5':['ppc','x86_64', 'i386']
             }
 
-multilibdists = [ '5', '4' ]
+multilibdists = [ '5', 'testing/5', '4', 'testing/4' ]
 
 # map: dist -> target arch -> list of pkg name regexp patterns
 # We don't check virtual package names, unless it's a virtual -devel pkg.
 # black-list takes precedence over white-list
-multiblacklists = { '5' : { 'x86_64' : [ 'gnustep-make', 'nagios*'] },
-               '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios*'] },
+multiblacklists = {
+    '5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
+    'testing/5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    'testing/4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
                }
+
 multiwhitelists = { 
-               '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
-               '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                }
 
 # packages to exclude from being pruned: dist => Python regexp list
-repoprune_keepdict = {'3': ["-kmod$","amaya","gnome-vfsmm26","libgnomemm26","libgnomeuimm26","xtide","wxGTK"],
+repoprune_keepdict = {
                       '4': ["-kmod$"],
                       '5': ["-kmod$"],
+                      'testing/4': ["-kmod$"],
+                      'testing/5': ["-kmod$"],
                       }
 
 # repository symlinks to remove/create since they confuse createrepo
@@ -76,8 +87,8 @@
 comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
 comps_up_pass2 = 'make -f Makefile'
 comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
-comps_map = { '5' : 'comps-el5.xml',
-              '4' : 'comps-el4.xml',
+comps_map = { 'testing/5' : 'comps-el5.xml',
+              'testing/4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}
@@ -94,13 +105,13 @@
               }
 
 # For RepoSupport.py features.
-testrepos = { '4' : [],
-              '5' : [],
-              'development' : []
+testrepos = { '4' : ['fedora-epel-testing'],
+              '5' : ['fedora-epel-testing']
               }
 
 # For RepoSupport.py features.
-reponames = { 'fedora-epel' : 'Fedora EPEL'
+reponames = { 'fedora-epel' : 'Fedora EPEL',
+              'fedora-epel-testing' : 'Fedora EPEL Test Updates'
               }
 
 # For RepoSupport.py features.



From fedora-extras-commits at redhat.com  Thu Sep  6 06:41:58 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 02:41:58 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.8,1.9
Message-ID: <200709060641.l866fwcd027110@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27088

Modified Files:
	Config_EPEL.py 
Log Message:
fix config



Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Config_EPEL.py	6 Sep 2007 06:28:54 -0000	1.8
+++ Config_EPEL.py	6 Sep 2007 06:41:56 -0000	1.9
@@ -48,7 +48,7 @@
 
 archdict = { 
             '4':['ppc','x86_64', 'i386'],
-            '5':['ppc','x86_64', 'i386']
+            '5':['ppc','x86_64', 'i386'],
             'testing/4':['ppc','x86_64', 'i386'],
             'testing/5':['ppc','x86_64', 'i386']
             }
@@ -84,11 +84,13 @@
 repobuild_linkdict = {}
 
 # comps.xml updating and installation
-comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
+comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedoraproject.org:/cvs/extras update'
 comps_up_pass2 = 'make -f Makefile'
 comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
 comps_map = { 'testing/5' : 'comps-el5.xml',
+              '5' : 'comps-el5.xml',
               'testing/4' : 'comps-el4.xml',
+              '4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}



From fedora-extras-commits at redhat.com  Thu Sep  6 07:14:32 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 03:14:32 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.3,1.4
Message-ID: <200709060714.l867EWh5001076@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1053

Modified Files:
	List.py 
Log Message:
testing is in the dist version not testing/ dir



Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- List.py	27 Feb 2007 23:11:02 -0000	1.3
+++ List.py	6 Sep 2007 07:14:30 -0000	1.4
@@ -26,6 +26,8 @@
         dists = cfg.alldists
     
     for dist in dists:
+        if dist.startswith('testing/'):
+            dist = dist.replace('testing/', '')
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
         print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)



From fedora-extras-commits at redhat.com  Thu Sep  6 07:32:36 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 6 Sep 2007 03:32:36 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.9, 1.10 im-chooser.spec, 1.17, 
	1.18 sources, 1.8, 1.9
Message-ID: <200709060732.l867WaHP001438@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Jul 2007 00:21:29 -0000	1.9
+++ .cvsignore	6 Sep 2007 07:32:03 -0000	1.10
@@ -9,3 +9,4 @@
 im-chooser-0.3.4.tar.gz
 im-chooser-0.4.0.tar.gz
 im-chooser-0.4.1.tar.gz
+im-chooser-0.5.0.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- im-chooser.spec	8 Aug 2007 12:25:24 -0000	1.17
+++ im-chooser.spec	6 Sep 2007 07:32:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		im-chooser
-Version:	0.4.1
-Release:	3%{?dist}
+Version:	0.5.0
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
+- New upstream release.
+
 * Wed Aug  8 2007 Akira TAGOH <tagoh at redhat.com>
 - Update License tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Jul 2007 00:21:29 -0000	1.8
+++ sources	6 Sep 2007 07:32:04 -0000	1.9
@@ -1 +1 @@
-24173c61117247138d63977b1d26841b  im-chooser-0.4.1.tar.gz
+4dfee80e78c97bedcfbb9fcc8e3df977  im-chooser-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 07:36:22 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 6 Sep 2007 03:36:22 -0400
Subject: rpms/system-config-network/F-7 .cvsignore, 1.20, 1.21 sources, 1.22,
	1.23 system-config-network.spec, 1.28, 1.29
Message-ID: <200709060736.l867aMKc001672@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1645

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
corrected version mess with FC6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	22 Aug 2007 10:39:44 -0000	1.20
+++ .cvsignore	6 Sep 2007 07:35:49 -0000	1.21
@@ -1 +1 @@
-system-config-network-1.3.95.2.tar.gz
+system-config-network-1.3.96.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Aug 2007 10:39:44 -0000	1.22
+++ sources	6 Sep 2007 07:35:49 -0000	1.23
@@ -1 +1 @@
-70f208421f7fde2db6235de63f35e93b  system-config-network-1.3.95.2.tar.gz
+80d28c1e3e9404fe3e14c1b0b1480aae  system-config-network-1.3.96.2.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/system-config-network.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- system-config-network.spec	22 Aug 2007 10:39:44 -0000	1.28
+++ system-config-network.spec	6 Sep 2007 07:35:49 -0000	1.29
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.3.95.2
+Version: 1.3.96.2
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
@@ -95,7 +95,7 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Thu Aug 21 2007 Harald Hoyer <harald at redhat.com> - 1.3.95.2-1
+* Thu Aug 21 2007 Harald Hoyer <harald at redhat.com> - 1.3.96.2-1
 - translation update (bug #234705, #246469)
 - fixed #221289
 - rhbz #211980, rhbz #213181



From fedora-extras-commits at redhat.com  Thu Sep  6 08:06:48 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 04:06:48 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.133, 1.134 sources, 1.248,
	1.249
Message-ID: <200709060806.l8686mNm008787@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8722

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- .cvsignore	1 Sep 2007 13:48:59 -0000	1.133
+++ .cvsignore	6 Sep 2007 08:06:15 -0000	1.134
@@ -4,4 +4,4 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
-OOG680_m3.tar.bz2
+OOG680_m4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- sources	5 Sep 2007 08:33:11 -0000	1.248
+++ sources	6 Sep 2007 08:06:15 -0000	1.249
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-5b759a306c3ecd9284fdf6ba8e31388a  OOG680_m3.tar.bz2
+913fa35cd89e620a2b6ac9315c632721  OOG680_m4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 08:11:08 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 04:11:08 -0400
Subject: rpms/bind/devel bind-9.5-pool_badfree.patch, NONE, 1.1 bind.spec,
	1.213, 1.214
Message-ID: <200709060811.l868B8HO009043@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8889

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-pool_badfree.patch 
Log Message:
- fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
  tmraz redhat com)


bind-9.5-pool_badfree.patch:

--- NEW FILE bind-9.5-pool_badfree.patch ---
Written-by: Tomas Mraz <tmraz at redhat.com>
Reviewed-by: Adam Tkac <atkac at redhat.com>

diff -up bind-9.5.0a6/lib/dns/resolver.c.badfree bind-9.5.0a6/lib/dns/resolver.c
--- bind-9.5.0a6/lib/dns/resolver.c.badfree	2007-06-19 01:47:41.000000000 +0200
+++ bind-9.5.0a6/lib/dns/resolver.c	2007-09-05 16:20:21.000000000 +0200
@@ -7455,17 +7455,17 @@ dns_resolver_createdispatchpool(dns_reso
 	return (result);
 
   cleanup:
-	for (i = 0; i < ndisps; i++) {
-		if (res->dispatchv4pool[i] != NULL)
-			dns_dispatch_detach(&res->dispatchv4pool[i]);
-		if (res->dispatchv6pool[i] != NULL)
-			dns_dispatch_detach(&res->dispatchv6pool[i]);
-	}
 	if (res->dispatchv4pool != NULL) {
+		for (i = 0; i < ndisps; i++)
+			if (res->dispatchv4pool[i] != NULL)
+				dns_dispatch_detach(&res->dispatchv4pool[i]);
 		isc_mem_put(res->mctx, res->dispatchv4pool,
 			    sizeof(dns_dispatch_t *) * ndisps);
 	}
 	if (res->dispatchv6pool != NULL) {
+		for (i = 0; i < ndisps; i++)
+			if (res->dispatchv6pool[i] != NULL)
+				dns_dispatch_detach(&res->dispatchv6pool[i]);
 		isc_mem_put(res->mctx, res->dispatchv6pool,
 			    sizeof(dns_dispatch_t *) * ndisps);
 	}


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- bind.spec	5 Sep 2007 09:56:24 -0000	1.213
+++ bind.spec	6 Sep 2007 08:10:34 -0000	1.214
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.3.%{RELEASEVER}%{?dist}
+Release: 	11.9.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,7 @@
 Patch75:	bind-9.5-update.patch
 Patch76:	bind-9.5-2119_revert.patch
 Patch77:	bind-9.5-fix_h_errno.patch
+Patch78:	bind-9.5-pool_badfree.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -250,6 +251,7 @@
 %patch75 -p1 -b .update
 %patch76 -p1 -b .2119
 %patch77 -p1 -b .errno
+%patch78 -p1 -b .badfree
 :;
 
 
@@ -646,6 +648,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.9.a6
+- fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
+  tmraz redhat com)
+
 * Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.3.a6
 - initscript failure message is now printed correctly (#277981,
   Quentin Armitage (quentin armitage org uk) )



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:12 -0400
Subject: rpms/wqy-bitmap-fonts/F-7 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868ECtm009271@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/F-7

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/F-7/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	21 May 2007 21:57:56 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:39 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:15 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:15 -0400
Subject: rpms/wqy-bitmap-fonts/FC-5 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868EF06009274@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/FC-5

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-5/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	22 May 2007 01:07:17 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:42 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:19 -0400
Subject: rpms/wqy-bitmap-fonts/FC-6 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868EJPE009277@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/FC-6

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-6/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	21 May 2007 20:53:46 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:46 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:22 -0400
Subject: rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.5,1.6
Message-ID: <200709060814.l868EMXD009280@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/devel

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wqy-bitmap-fonts.spec	28 Aug 2007 03:15:14 -0000	1.5
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:49 -0000	1.6
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 8%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:51 -0400
Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868Jpox009422@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/devel

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:28 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:19 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:54 -0400
Subject: rpms/perl-Module-Refresh/F-7 perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868JsE8009426@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/F-7

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/F-7/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:28 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:57 -0400
Subject: rpms/perl-Module-Refresh/FC-6 perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868Jv7u009429@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/FC-6

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/FC-6/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:33 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:24 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:27:02 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 04:27:02 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, NONE,
	1.1 openoffice.org.spec, 1.1297, 1.1298
Message-ID: <200709060827.l868R2xX009625@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch 
Log Message:
next version

openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:

--- NEW FILE openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch ---
Index: ./source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
retrieving revision 1.10
diff -u -r1.10 EnhancedCustomShapeFunctionParser.cxx
--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	24 Oct 2006 13:42:15 -0000	1.10
+++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	6 Sep 2007 08:10:27 -0000
@@ -1201,7 +1201,7 @@
     const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
             ::boost::spirit::parse( aStart,
                                     aEnd,
-                                    aExpressionGrammer,
+                                    aExpressionGrammer >> ::boost::spirit::end_p,
                                     ::boost::spirit::space_p ) );
     OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -r1.1297 -r1.1298
--- openoffice.org.spec	5 Sep 2007 08:38:13 -0000	1.1297
+++ openoffice.org.spec	6 Sep 2007 08:26:29 -0000	1.1298
@@ -1,6 +1,6 @@
 %define oootag OOG680
-%define ooomilestone 3
-%define rh_rpm_release 2
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -142,6 +142,7 @@
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1078,6 +1079,7 @@
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
+%patch63 -p1 -b .ooo77672.boost.use.end_p.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1109,12 +1111,17 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-#something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
-#the frame from tools->bibliography not closable wrt the mutex in
-#LoadEnvListener so use >= 128
-export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
-#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
-export CXX="$CXX -fno-threadsafe-statics"
+export ARCH_FLAGS
+
+##very not happy with gcc at the moment wrt launching the bibliography, 
+##let's go conservative for a bit
+##something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+##the frame from tools->bibliography not closable wrt the mutex in
+##LoadEnvListener so use >= 128, but want 64
+#export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
+##add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+#export CXX="$CXX -fno-threadsafe-statics"
+
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
@@ -1152,26 +1159,27 @@
 export GNOME_MIME_THEME=hicolor
 ./create_tree.sh
 
-#start of jakub based suggestion on prelink optimization 
-cd ../../../../desktop/source/app
-%if ! %{linkopt}
-sed -i -e "s/OBJ/SLO/" makefile.mk
-dmake
-%endif
-cd ../../util
-%if ! %{linkopt}
-%if %{stlport_abi_lockin}
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
-%else
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
-%endif
-%endif
-$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-#end of jakub based suggestion on prelink optimization
+#disable for now, breaks icedtea
+##start of jakub based suggestion on prelink optimization 
+#cd ../../../../desktop/source/app
+#%if ! %{linkopt}
+#sed -i -e "s/OBJ/SLO/" makefile.mk
+#dmake
+#%endif
+#cd ../../util
+#%if ! %{linkopt}
+#%if %{stlport_abi_lockin}
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
+#%else
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
+#%endif
+#%endif
+#$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+##end of jakub based suggestion on prelink optimization
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 
 %install
@@ -1191,14 +1199,15 @@
     echo - ---dump log end---
     dmake openoffice_en-US
 fi
-%if ! %{linkopt}
-cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-%endif
-cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
+#disable for now, breaks icedtea
+#%if ! %{linkopt}
+#cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
+#%endif
+#cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
 chmod -R +w $RPM_BUILD_ROOT/%{instdir}
 %if %{langpacks}
 dmake ooolanguagepack
@@ -2358,7 +2367,7 @@
 %{instdir}/program/resource/date680en-US.res
 %{instdir}/program/resource/sc680en-US.res
 %{instdir}/program/scalc
-%{instdir}/program/scalc.bin
+#%{instdir}/program/scalc.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2411,7 +2420,7 @@
 %{instdir}/help/en/sdraw.*
 %dir %{instdir}/program
 %{instdir}/program/sdraw
-%{instdir}/program/sdraw.bin
+#%{instdir}/program/sdraw.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2478,7 +2487,7 @@
 %{instdir}/program/libswui680*.so
 %{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
-%{instdir}/program/swriter.bin
+#%{instdir}/program/swriter.bin
 %dir %{instdir}/program/classes
 %{instdir}/program/classes/writer2latex.jar
 %dir %{instdir}/share
@@ -2547,7 +2556,7 @@
 %{instdir}/program/libanimcore.so
 %{instdir}/program/libplaceware*.so
 %{instdir}/program/simpress
-%{instdir}/program/simpress.bin
+#%{instdir}/program/simpress.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/config
 %{instdir}/share/config/soffice.cfg
@@ -2761,6 +2770,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
+- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
+  makes drawing shapes work properly again
+- next version
+- disable custom launchers, it breaks icedtea for some reason I haven't time to
+  figure out
+
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu
 - rebuild against icedtea



From fedora-extras-commits at redhat.com  Thu Sep  6 08:59:11 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal))
Date: Thu, 6 Sep 2007 04:59:11 -0400
Subject: rpms/resapplet/devel resapplet.desktop.in, 1.1, 1.2 resapplet.spec, 
	1.4, 1.5
Message-ID: <200709060859.l868xBZY011382@cvs-int.fedora.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/resapplet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11362

Modified Files:
	resapplet.desktop.in resapplet.spec 
Log Message:
- resapplet.desktop.in; s/SystemTools/System/, to conform with
  http://standards.freedesktop.org/menu-spec/latest/apa.html
- Fix License: tag, add Url:


Index: resapplet.desktop.in
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.desktop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resapplet.desktop.in	20 Dec 2006 10:10:02 -0000	1.1
+++ resapplet.desktop.in	6 Sep 2007 08:58:39 -0000	1.2
@@ -6,6 +6,6 @@
 Terminal=false
 Type=Application
 TryExec=resapplet
-Categories=GNOME;Application;SystemTools;X-Ximian-System-Toplevel;
+Categories=GNOME;Application;System;X-Ximian-System-Toplevel;
 StartupNotify=false
 Encoding=UTF-8


Index: resapplet.spec
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- resapplet.spec	22 Dec 2006 21:22:48 -0000	1.4
+++ resapplet.spec	6 Sep 2007 08:58:39 -0000	1.5
@@ -2,7 +2,9 @@
 Name:		resapplet
 Version:	0.1.1
 Release:	5%{?dist}
-License:	GPL
+License:	GPLv2+ and GPLv2
+# This is the best we have to silence rpmlint:
+URL:		http://svn.gnome.org/viewcvs/resapplet/
 Group:		User Interface/Desktops
 # Source obtained from OpenSuSE
 Source:		resapplet-%{version}.tar.bz2
@@ -31,7 +33,7 @@
 %setup -q -a 1
 cp -a %{S:2} . ; rm resapplet.desktop
 if %version != 0.1.1 ; then
-echo "Please remove Source2 and Source3 and verify, that translations work."
+echo "Please remove Source2 and Source3 and verify that translations work."
 exit 1
 fi
 %patch0 -p0
@@ -60,7 +62,6 @@
 
 desktop-file-install --vendor fedora --delete-original		\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-	--add-category System					\
 	--add-category Utility					\
 	--add-category X-Red-Hat-Base				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/resapplet.desktop
@@ -93,6 +94,15 @@
 %{_datadir}/icons/gnome/48x48/apps/resapplet.png
 
 %changelog
+* Thu Sep  6 2007 Stepan Kasal <skasal at redhat.com> 0.1.1-6
+- resapplet.desktop.in; s/SystemTools/System/, to conform with
+  http://standards.freedesktop.org/menu-spec/latest/apa.html
+- Fix License: tag, add Url:
+
+* Fri Dec 22 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-5
+- Call automake with "--add-missing".
+- Call aclocal before intltoolize.
+
 * Tue Dec 12 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-4
 - remove suse icons
 - add scriplets 
@@ -104,4 +114,4 @@
 - spec file changes
 
 * Wed Dec  6 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-1
-- initial Fedora built
+- initial Fedora build



From fedora-extras-commits at redhat.com  Thu Sep  6 09:00:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal))
Date: Thu, 6 Sep 2007 05:00:10 -0400
Subject: rpms/resapplet/devel resapplet.spec,1.5,1.6
Message-ID: <200709060900.l8690AbS011410@cvs-int.fedora.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/resapplet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11388

Modified Files:
	resapplet.spec 
Log Message:
forgot release++


Index: resapplet.spec
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- resapplet.spec	6 Sep 2007 08:58:39 -0000	1.5
+++ resapplet.spec	6 Sep 2007 08:59:37 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Resolution Switching Applet
 Name:		resapplet
 Version:	0.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+ and GPLv2
 # This is the best we have to silence rpmlint:
 URL:		http://svn.gnome.org/viewcvs/resapplet/



From fedora-extras-commits at redhat.com  Thu Sep  6 09:04:16 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 05:04:16 -0400
Subject: rpms/lftp/devel lftp.spec,1.59,1.60
Message-ID: <200709060904.l8694GSZ017383@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358

Modified Files:
	lftp.spec 
Log Message:
rebuild


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- lftp.spec	12 Apr 2007 08:01:49 -0000	1.59
+++ lftp.spec	6 Sep 2007 09:03:42 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.10
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
+- rebuild
+
 * Wed Apr 11 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-3
 - Correct mistake removing devel package & calling chkconfig
 - Resolves #235436



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:35 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695ZoK017579@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/devel

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:02:28 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:02 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:41 -0400
Subject: rpms/perl-Test-ClassAPI/F-7 perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695fQ3017586@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/F-7

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/F-7/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:02:28 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:06 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:45 -0400
Subject: rpms/perl-Test-ClassAPI/FC-6 perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695jkf017589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/FC-6

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/FC-6/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:04:08 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:11 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:06:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 6 Sep 2007 05:06:24 -0400
Subject: rpms/glibmm24/devel glibmm.spec,1.26,1.27
Message-ID: <200709060906.l8696OSw017733@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17595

Modified Files:
	glibmm.spec 
Log Message:
Removed Perl code autogeneration tools (#278191)


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- glibmm.spec	22 Aug 2007 11:17:56 -0000	1.26
+++ glibmm.spec	6 Sep 2007 09:05:52 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           glibmm24
 Version:        2.13.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
-BuildRequires:  glib2-devel >= 2.9.0
+BuildRequires:  glib2-devel >= 2.13.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -42,6 +42,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf tools
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation, put everything under gtk-doc
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-3
+- Removed Perl code autogeneration tools (#278191)
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-2
 - License tag update
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:06:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 05:06:32 -0400
Subject: rpms/xinetd/devel xinetd.spec, 1.48, 1.49 filter-requires-xinetd.sh,
	1.1, NONE xinetd-inetdconvert, 1.3, NONE
Message-ID: <200709060906.l8696Wv0017764@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17616

Modified Files:
	xinetd.spec 
Removed Files:
	filter-requires-xinetd.sh xinetd-inetdconvert 
Log Message:
removed inetdconvert script, nobody is using inetd
Resolves: 275511


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xinetd.spec	22 Aug 2007 07:21:10 -0000	1.48
+++ xinetd.spec	6 Sep 2007 09:05:59 -0000	1.49
@@ -1,6 +1,3 @@
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE99}
-
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
@@ -11,9 +8,7 @@
 URL: http://www.xinetd.org
 Source: http://www.xinetd.org/xinetd-%{version}.tar.gz
 Source1: xinetd.init
-Source2: xinetd-inetdconvert
 Source3: xinetd.sysconf
-Source99: filter-requires-xinetd.sh
 Patch0: xinetd-2.3.11-pie.patch
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
@@ -66,7 +61,6 @@
 install -m 644 contrib/xinetd.conf $RPM_BUILD_ROOT/etc
 install -m 644 contrib/xinetd.d/* $RPM_BUILD_ROOT/etc/xinetd.d
 install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/xinetd
-install -m 755 %SOURCE2 $RPM_BUILD_ROOT/usr/sbin/inetdconvert
 
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/itox*
 rm -f $RPM_BUILD_ROOT/usr/sbin/itox
@@ -105,10 +99,12 @@
 %config /etc/rc.d/init.d/xinetd
 %config(noreplace) /etc/xinetd.d/*
 /usr/sbin/xinetd
-/usr/sbin/inetdconvert
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-14
+- removed inetdconvert script, nobody is using inetd
+
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-13
 - updated license field
 


--- filter-requires-xinetd.sh DELETED ---


--- xinetd-inetdconvert DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 09:08:32 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 05:08:32 -0400
Subject: rpms/mgetty/devel mgetty.spec,1.40,1.41
Message-ID: <200709060908.l8698Wv0017903@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/mgetty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17838

Modified Files:
	mgetty.spec 
Log Message:
rebulid


Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mgetty.spec	23 Jan 2007 12:02:51 -0000	1.40
+++ mgetty.spec	6 Sep 2007 09:08:00 -0000	1.41
@@ -5,7 +5,7 @@
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
 Version: 1.1.33
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
 Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
 Source2: logrotate.mgetty
@@ -342,6 +342,9 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 1.1.33-11
+- rebuild
+
 * Tue Jan 23 2007 Maros Barabas <mbarabas at redhat.com> - 1.1.33-10
 - fixed install-info scriptlets (post,preun)
 - Resolves #223710



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:49 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 6 Sep 2007 05:14:49 -0400
Subject: rpms/gnuplot/devel gnuplot-4.2.0-refers_to.patch, NONE,
	1.1 gnuplot.spec, 1.41, 1.42 gnuplot-4.0.0-refers_to.patch, 1.1, NONE
Message-ID: <200709060914.l869EnMv018214@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18094

Modified Files:
	gnuplot.spec 
Added Files:
	gnuplot-4.2.0-refers_to.patch 
Removed Files:
	gnuplot-4.0.0-refers_to.patch 
Log Message:
- change font paths, change documenatation


gnuplot-4.2.0-refers_to.patch:

--- NEW FILE gnuplot-4.2.0-refers_to.patch ---
--- gnuplot-4.2.0/src/variable.c.refto	2006-06-27 04:36:30.000000000 +0200
+++ gnuplot-4.2.0/src/variable.c	2007-09-06 10:02:54.000000000 +0200
@@ -263,8 +263,9 @@ static const struct path_table fontpath_
     { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
 #endif
     /* Linux paths */
-    { "/usr/X11R6/lib/X11/fonts/Type1" },
-    { "/usr/X11R6/lib/X11/fonts/truetype" },
+    { "/usr/share/fonts/default/ghostscript/" },
+    { "/usr/share/fonts/default/Type1/" },
+    { "/usr/share/fonts/bitstream-vera/" },
     /* HP-UX */
     { "/usr/lib/X11/fonts!"},
     /* Ghostscript */


Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnuplot.spec	29 Aug 2007 13:00:27 -0000	1.41
+++ gnuplot.spec	6 Sep 2007 09:14:15 -0000	1.42
@@ -5,13 +5,13 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
-Patch1: gnuplot-4.0.0-refers_to.patch
+Patch1: gnuplot-4.2.0-refers_to.patch
 Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
@@ -53,6 +53,7 @@
 make html
 cd psdoc
 make 
+make ps_symbols.ps ps_fontfile_doc.pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,8 +76,8 @@
 %files
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
-#docs/gnuplot.html 
-%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.gpi tutorial/tutorial.dvi demo
+%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
+%doc docs/psdoc/ps_fontfile_doc.pdf
 %dir %{_libexecdir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -97,12 +98,13 @@
 %{_datadir}/emacs/site-lisp/gnuplot-gui.elc
 %{_datadir}/emacs/site-lisp/gnuplot.el
 %{_datadir}/emacs/site-lisp/gnuplot.elc
-#%{_datadir}/emacs/site-lisp/info-look.20.2.el
-#%{_datadir}/emacs/site-lisp/info-look.20.3.el
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
 
 %changelog
+* Thu Sep  6 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-4
+- change font paths, change documenatation
+
 * Tue Aug 28 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-3
 - Rebuild for selinux ppc32 issue.
 - Remove obsolete file


--- gnuplot-4.0.0-refers_to.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:52 -0400
Subject: rpms/perl-Params-Validate/devel perl-Params-Validate.spec, 1.15,
	1.16
Message-ID: <200709060914.l869EqIJ018217@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/devel

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Params-Validate.spec	22 Aug 2007 04:28:28 -0000	1.15
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:19 -0000	1.16
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	2%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
 * Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:56 -0400
Subject: rpms/perl-Params-Validate/F-7 perl-Params-Validate.spec,1.14,1.15
Message-ID: <200709060914.l869EuaC018220@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/F-7

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-7/perl-Params-Validate.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Validate.spec	12 Mar 2007 04:54:27 -0000	1.14
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:22 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	1%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
+* Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
+- Mass rebuild.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-1
 - BR: perl(ExtUtils::MakeMaker).
 - Upstream update.



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:59 -0400
Subject: rpms/perl-Params-Validate/FC-6 perl-Params-Validate.spec,1.13,1.14
Message-ID: <200709060914.l869ExxN018228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/FC-6

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/FC-6/perl-Params-Validate.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Validate.spec	12 Mar 2007 04:56:24 -0000	1.13
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:26 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	1%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
+* Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
+- Mass rebuild.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-1
 - BR: perl(ExtUtils::MakeMaker).
 - Upstream update.



From fedora-extras-commits at redhat.com  Thu Sep  6 09:39:11 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 05:39:11 -0400
Subject: rpms/openldap/devel openldap.spec,1.90,1.91
Message-ID: <200709060939.l869dBH1018717@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18697

Modified Files:
	openldap.spec 
Log Message:
added images to the guide.html
Resolves: #273581


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- openldap.spec	22 Aug 2007 07:17:45 -0000	1.90
+++ openldap.spec	6 Sep 2007 09:38:38 -0000	1.91
@@ -615,6 +615,7 @@
 %doc db-%{db_version}/LICENSE.bdb-backend
 %doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html
 %doc openldap-%{version_23}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
+%doc openldap-%{version_23}/doc/guide/admin/*.gif
 %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
@@ -670,6 +671,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-4%{?dist}
+- added images to the guide.html (#273581)
+
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-3%{?dist}
 - just rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:34 -0400
Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869hYFj018867@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/devel

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:23:07 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:02 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:23:07 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:02 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:23:07 -0000	1.7
+++ sources	6 Sep 2007 09:43:02 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:37 -0400
Subject: rpms/perl-DBIx-DBSchema/F-7 .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869hbWx018877@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/F-7

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:31:28 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:04 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:31:28 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:04 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:31:28 -0000	1.7
+++ sources	6 Sep 2007 09:43:04 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:40 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:40 -0400
Subject: rpms/perl-DBIx-DBSchema/FC-6 .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869heBw018882@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-6

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:47:20 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:07 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:47:20 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:07 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:47:20 -0000	1.7
+++ sources	6 Sep 2007 09:43:07 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 10:20:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 06:20:00 -0400
Subject: rpms/openldap/devel .cvsignore, 1.33, 1.34 openldap.spec, 1.91,
	1.92 sources, 1.33, 1.34 openldap-2.3.37-fortify-open.patch, 1.1, NONE
Message-ID: <200709061020.l86AK0Qm025426@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25397

Modified Files:
	.cvsignore openldap.spec sources 
Removed Files:
	openldap-2.3.37-fortify-open.patch 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	7 Aug 2007 07:11:51 -0000	1.33
+++ .cvsignore	6 Sep 2007 10:19:28 -0000	1.34
@@ -8,3 +8,4 @@
 openldap-2.3.34.tgz
 openldap-2.3.37.tgz
 db-4.6.18.tar.gz
+openldap-2.3.38.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- openldap.spec	6 Sep 2007 09:38:38 -0000	1.91
+++ openldap.spec	6 Sep 2007 10:19:28 -0000	1.92
@@ -2,7 +2,7 @@
 %define db_version 4.6.18
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.37
+%define version_23 2.3.38
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -37,7 +37,6 @@
 Patch7: openldap-2.3.34-quiet-slaptest.patch
 Patch8: openldap-2.3.34-pthread.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
-Patch10: openldap-2.3.37-fortify-open.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -174,7 +173,6 @@
 %patch7 -p1 -b .quiet-slaptest
 %patch8 -p1 -b .pthread
 %patch9 -p1 -b .smbk5pwd
-%patch10 -p1 -b .fortify-open
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -671,7 +669,8 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
-* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-4%{?dist}
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-1%{?dist}
+- new upstream version
 - added images to the guide.html (#273581)
 
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-3%{?dist}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	7 Aug 2007 07:08:43 -0000	1.33
+++ sources	6 Sep 2007 10:19:28 -0000	1.34
@@ -1,4 +1,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
-f5c6cec07469ce8f64710eba3aeb58f8  openldap-2.3.37.tgz
 95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+f83b0f2b62f6a06dc1ca83a1f0426efd  openldap-2.3.38.tgz


--- openldap-2.3.37-fortify-open.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 10:54:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 06:54:52 -0400
Subject: rpms/perl-HTTP-Server-Simple-Mason/devel
	perl-HTTP-Server-Simple-Mason.spec, 1.4, 1.5
Message-ID: <200709061054.l86AsqWc026049@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26024

Modified Files:
	perl-HTTP-Server-Simple-Mason.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
- Update license tag.



Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple-Mason.spec	5 Sep 2006 10:00:10 -0000	1.4
+++ perl-HTTP-Server-Simple-Mason.spec	6 Sep 2007 10:54:14 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-HTTP-Server-Simple-Mason
 Version: 	0.09
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
 Source: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-%{version}.tar.gz
@@ -16,6 +16,7 @@
 BuildRequires:	perl(Hook::LexWrap)
 
 # Required by the tests
+BuildRequires:  perl(Test::More)
 BuildRequires: 	perl(Test::Pod) >= 1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
 
@@ -54,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 11:07:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 07:07:12 -0400
Subject: rpms/perl-HTTP-Server-Simple-Mason/F-7
	perl-HTTP-Server-Simple-Mason.spec, 1.4, 1.5
Message-ID: <200709061107.l86B7Cld032281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32256

Modified Files:
	perl-HTTP-Server-Simple-Mason.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
- Update license tag.



Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-7/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple-Mason.spec	5 Sep 2006 10:00:10 -0000	1.4
+++ perl-HTTP-Server-Simple-Mason.spec	6 Sep 2007 11:06:39 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-HTTP-Server-Simple-Mason
 Version: 	0.09
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
 Source: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-%{version}.tar.gz
@@ -16,6 +16,7 @@
 BuildRequires:	perl(Hook::LexWrap)
 
 # Required by the tests
+BuildRequires:  perl(Test::More)
 BuildRequires: 	perl(Test::Pod) >= 1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
 
@@ -54,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 11:22:01 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 07:22:01 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, NONE,
	1.1 openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, 1.1,
	1.2 openoffice.org.spec, 1.1298, 1.1299
Message-ID: <200709061122.l86BM1vU032597@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32571

Modified Files:
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch 
Log Message:
add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch

openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch ---
Index: inc/com/sun/star/uno/Any.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Any.h,v
retrieving revision 1.12
diff -u -r1.12 Any.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Any.h	10 Jan 2006 15:52:55 -0000	1.12
+++ openoffice.org/cppu/inc/com/sun/star/uno/Any.h	6 Sep 2007 11:00:18 -0000
@@ -70,7 +70,7 @@
     return true if the any contains an assignable value (no data loss), e.g. the any contains a
     short and you >>= it into a long variable.
 */
-class Any : public uno_Any
+class CPPU_GCC_DLLPUBLIC_EXPORT Any : public uno_Any
 {
 public:
 	// these are here to force memory de/allocation to sal lib.
Index: inc/com/sun/star/uno/Type.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Type.h,v
retrieving revision 1.15
diff -u -r1.15 Type.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Type.h	9 Mar 2006 10:44:42 -0000	1.15
+++ openoffice.org/cppu/inc/com/sun/star/uno/Type.h	6 Sep 2007 11:00:18 -0000
@@ -79,7 +78,7 @@
 
     @see typelib_TypeDescriptionReference
 */
-class Type
+class CPPU_GCC_DLLPUBLIC_EXPORT Type
 {
 	/** the C typelib reference pointer
         @internal

openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:

Index: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch	6 Sep 2007 08:26:29 -0000	1.1
+++ openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch	6 Sep 2007 11:21:59 -0000	1.2
@@ -14,3 +14,28 @@
                                      ::boost::spirit::space_p ) );
      OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
  
+Index: source/engine/smilfunctionparser.cxx
+===================================================================
+RCS file: /cvs/graphics/slideshow/source/engine/smilfunctionparser.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 smilfunctionparser.cxx
+--- openoffice.org.orig/slideshow/source/engine/smilfunctionparser.cxx	17 Jul 2007 14:41:21 -0000	1.7
++++ openoffice.org/slideshow/source/engine/smilfunctionparser.cxx	6 Sep 2007 10:48:58 -0000
+@@ -579,7 +579,7 @@
+             const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
+                   ::boost::spirit::parse( aStart,
+                                           aEnd,
+-                                          aExpressionGrammer,
++                                          aExpressionGrammer >> ::boost::spirit::end_p,
+                                           ::boost::spirit::space_p ) );
+             OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+ 
+@@ -625,7 +625,7 @@
+             const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
+                   ::boost::spirit::parse( aStart,
+                                           aEnd,
+-                                          aExpressionGrammer,
++                                          aExpressionGrammer >> ::boost::spirit::end_p,
+                                           ::boost::spirit::space_p ) );
+             OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -r1.1298 -r1.1299
--- openoffice.org.spec	6 Sep 2007 08:26:29 -0000	1.1298
+++ openoffice.org.spec	6 Sep 2007 11:21:59 -0000	1.1299
@@ -143,6 +143,7 @@
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
+Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1080,6 +1081,7 @@
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
+%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl



From fedora-extras-commits at redhat.com  Thu Sep  6 11:26:29 2007
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Thu, 6 Sep 2007 07:26:29 -0400
Subject: rpms/libnjb/F-7 libnjb.rules, 1.1, 1.2 libnjb.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200709061126.l86BQTBn032641@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619

Modified Files:
	libnjb.rules libnjb.spec sources 
Log Message:
New upstream release, fix udev rules, add HAL FDI file.



Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.rules	25 Jan 2006 21:12:33 -0000	1.1
+++ libnjb.rules	6 Sep 2007 11:25:56 -0000	1.2
@@ -1,37 +1,76 @@
-# libnjb.rules a udev rules file for libnjb devices
-# created by Linus Walleij, ENJOY!
+# nomad.rules a udev rules file for NOMAD jukeboxes.
+# Put this file in /etc/udev/rules.d
+# Hacked a bit for Fedora along the lines of libsane rules.
 
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"
+ACTION!="add", GOTO="nomad_rules_end"
+ATTR{dev}!="?*", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_usb_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_usb_device_rules"
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
-SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 2
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4100", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 3
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4101", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4108", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen USB 2.0
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="410b", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen NX
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4109", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Xtra
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4110", SYMLINK+="libnjb-%k"
 # Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4111", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Touch
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411b", SYMLINK+="libnjb-%k"
 # Creative Zen (Zen Micro variant)
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411d", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Micro
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411e", SYMLINK+="libnjb-%k"
 # Second Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4126", SYMLINK+="libnjb-%k"
 # Dell Pocket DJ
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4127", SYMLINK+="libnjb-%k"
 # Creative Zen Sleek
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4136", SYMLINK+="libnjb-%k"
-# Third Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="412f", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_device_rules"
+
+# Creative Nomad Jukebox
+ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 2
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 3
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen USB 2.0
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen NX
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Xtra
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+# Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Touch
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+# Creative Zen (Zen Micro variant)
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Micro
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+# Second Generation Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+# Dell Pocket DJ
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+# Creative Zen Sleek
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
 
 LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libnjb.spec	28 Aug 2006 16:23:06 -0000	1.8
+++ libnjb.spec	6 Sep 2007 11:25:56 -0000	1.9
@@ -1,18 +1,9 @@
 # SPEC file for libnjb, primary target is the Fedora Extras
 # RPM repository.
-#
-# For testing a certain distribution, rely on macros that
-# you define in your ".rpmmacros" file. For example, for
-# test building a Fedora Extras package, define the following
-# two macros in .rpmmacros:
-#
-# %dist .fc5
-# %fedora 5
-#
 
 Name:		libnjb
-Version:	2.2.5
-Release:	3%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -76,6 +67,8 @@
 # Install device permissions
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -91,6 +84,7 @@
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -105,6 +99,12 @@
 
 
 %changelog
+* Wed Sep 5 2007 Linus Walleij <triad at df.lth.se> 2.2.6-1
+- Long overdue upstream release.
+- Shape up udev rules so they look like the libsane stuff.
+- Add HAL FDI file.
+* Fri Aug 17 2007 Linus Walleij <triad at df.lth.se> 2.2.5-4
+- Fixup libnjb udev rules to work with new udev and HAL.
 * Mon Aug 28 2006 Linus Walleij <triad at df.lth.se> 2.2.5-3
 - Rebuild for Fedora Extras 6.
 * Tue Feb 14 2006 Linus Walleij <triad at df.lth.se> 2.2.5-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jan 2006 21:17:38 -0000	1.6
+++ sources	6 Sep 2007 11:25:56 -0000	1.7
@@ -1 +1 @@
-f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz
+e1b3a89f6157c553ea46a78446429a0d  libnjb-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 11:28:49 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 07:28:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, NONE,
	1.1 openoffice.org.spec, 1.1299, 1.1300
Message-ID: <200709061128.l86BSnXs000312@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32706

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch 
Log Message:
add more warnings patches

openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch ---
Index: source/uno/treecontrolpeer.cxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.cxx,v
retrieving revision 1.4
diff -u -r1.4 treecontrolpeer.cxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.cxx	2 Jul 2007 09:29:44 -0000	1.4
+++ openoffice.org/svtools/source/uno/treecontrolpeer.cxx	6 Sep 2007 11:22:59 -0000
@@ -284,7 +284,7 @@
 
 // --------------------------------------------------------------------
 
-UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos /* = LIST_APPEND */ )
+UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos /* = LIST_APPEND */ )
 {
 	UnoTreeListEntry* pEntry = 0;
 	if( mpTreeImpl )
Index: source/uno/treecontrolpeer.hxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.hxx,v
retrieving revision 1.2
diff -u -r1.2 treecontrolpeer.hxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.hxx	27 Jun 2007 12:18:50 -0000	1.2
+++ openoffice.org/svtools/source/uno/treecontrolpeer.hxx	6 Sep 2007 11:22:59 -0000
@@ -138,7 +138,7 @@
 	void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
 	void addNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
 
-	UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos = LIST_APPEND );
+	UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos = LIST_APPEND );
 	bool updateEntry( UnoTreeListEntry* pEntry );
 
 	void updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -r1.1299 -r1.1300
--- openoffice.org.spec	6 Sep 2007 11:21:59 -0000	1.1299
+++ openoffice.org.spec	6 Sep 2007 11:28:16 -0000	1.1300
@@ -144,6 +144,7 @@
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
 Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1082,6 +1083,7 @@
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
 %patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2772,6 +2774,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.2
+- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
+
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
 - ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
   makes drawing shapes work properly again



From fedora-extras-commits at redhat.com  Thu Sep  6 11:36:45 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 07:36:45 -0400
Subject: rpms/bind/devel bind-9.5-_res_errno.patch, NONE, 1.1 bind.spec,
	1.214, 1.215 bind-9.5-2119_revert.patch, 1.1,
	NONE bind-9.5-fix_h_errno.patch, 1.1, NONE
Message-ID: <200709061136.l86BajCa000570@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-_res_errno.patch 
Removed Files:
	bind-9.5-2119_revert.patch bind-9.5-fix_h_errno.patch 
Log Message:
- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
  obsoleted by upstream bind-9.5-_res_errno.patch


bind-9.5-_res_errno.patch:

--- NEW FILE bind-9.5-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org> (upstream)
Reviewed-by: Adam Tkac <atkac redhat com>

diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- bind.spec	6 Sep 2007 08:10:34 -0000	1.214
+++ bind.spec	6 Sep 2007 11:36:13 -0000	1.215
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.9.%{RELEASEVER}%{?dist}
+Release: 	12.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,9 +65,8 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch75:	bind-9.5-update.patch
-Patch76:	bind-9.5-2119_revert.patch
-Patch77:	bind-9.5-fix_h_errno.patch
 Patch78:	bind-9.5-pool_badfree.patch
+Patch79:	bind-9.5-_res_errno.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -249,9 +248,8 @@
 %endif
 %patch73 -p1 -b .libidn
 %patch75 -p1 -b .update
-%patch76 -p1 -b .2119
-%patch77 -p1 -b .errno
 %patch78 -p1 -b .badfree
+%patch79 -p1 -b .errno
 :;
 
 
@@ -648,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.a6
+- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
+  obsoleted by upstream bind-9.5-_res_errno.patch
+
 * Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.9.a6
 - fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
   tmraz redhat com)


--- bind-9.5-2119_revert.patch DELETED ---


--- bind-9.5-fix_h_errno.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 11:50:32 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 07:50:32 -0400
Subject: rpms/ocaml/devel ocaml-find-provides.sh, 1.1,
	1.2 ocaml-find-requires.sh, 1.2, 1.3 ocaml.spec, 1.33, 1.34
Message-ID: <200709061150.l86BoWVh000829@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv801

Modified Files:
	ocaml-find-provides.sh ocaml-find-requires.sh ocaml.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-7
- Run chrpath to delete rpaths used on some of the stublibs.
- Ignore Parsetree module in dependency calculation.
- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
  over-match module names.



Index: ocaml-find-provides.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-find-provides.sh	2 Jul 2007 15:13:39 -0000	1.1
+++ ocaml-find-provides.sh	6 Sep 2007 11:49:59 -0000	1.2
@@ -56,9 +56,9 @@
 # Get a list of the modules these file(s) provide.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -E "$modules_re" |
+grep -E '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |
 grep -Ev "$ignore_modules_re" |
-sort -u
\ No newline at end of file
+sort -u


Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-find-requires.sh	3 Sep 2007 14:35:10 -0000	1.2
+++ ocaml-find-requires.sh	6 Sep 2007 11:49:59 -0000	1.3
@@ -58,7 +58,7 @@
 # Get a list of the modules these file(s) depend on.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -Ev "$modules_re" |
+grep -Ev '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ocaml.spec	3 Sep 2007 14:35:10 -0000	1.33
+++ ocaml.spec	6 Sep 2007 11:49:59 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -35,6 +35,7 @@
 BuildRequires:  libXt-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
+BuildRequires:  chrpath
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
@@ -189,7 +190,7 @@
 cp %{SOURCE2} refman.pdf
 
 %define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
 %define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 %build
@@ -238,6 +239,9 @@
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
+# Remove rpaths from stublibs .so files.
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -423,6 +427,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-7
+- Run chrpath to delete rpaths used on some of the stublibs.
+- Ignore Parsetree module in dependency calculation.
+- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
+  over-match module names.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
 - ocaml-runtime provides ocaml(runtime) = 3.10.0, and
   ocaml-find-requires.sh modified so that it adds this requires



From fedora-extras-commits at redhat.com  Thu Sep  6 11:56:41 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 07:56:41 -0400
Subject: rpms/gnash/devel .cvsignore, 1.4, 1.5 gnash.spec, 1.7, 1.8 sources, 
	1.4, 1.5 gnash-CVE-2007-2500.patch, 1.1,
	NONE gnash-README.fedora, 1.1,
	NONE gnash-configure-pkgconfig.patch, 1.1,
	NONE gnash-continue_on_info_install_error.patch, 1.1,
	NONE gnash-plugin-tempfile-dir.patch, 1.1, NONE
Message-ID: <200709061156.l86Buff9000985@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv954

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-CVE-2007-2500.patch gnash-README.fedora 
	gnash-configure-pkgconfig.patch 
	gnash-continue_on_info_install_error.patch 
	gnash-plugin-tempfile-dir.patch 
Log Message:
* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
- update to 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2007 14:11:00 -0000	1.4
+++ .cvsignore	6 Sep 2007 11:56:09 -0000	1.5
@@ -1 +1 @@
-gnash-0.8.0.tar.bz2
+gnash-0.8.1.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnash.spec	3 Aug 2007 15:10:50 -0000	1.7
+++ gnash.spec	6 Sep 2007 11:56:09 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           gnash
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -68,7 +68,7 @@
 %prep
 %setup -q
 
-chmod a-x libgeometry/snappingrange.h
+chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -83,31 +83,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so \
- $RPM_BUILD_ROOT/%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
+# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
 rm \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
- $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+rm \
+ $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # asspec info isn't generated rightly
 rm \
- $RPM_BUILD_ROOT/%{_infodir}/asspec.info
-# omf is broken
-rm -rf \
- $RPM_BUILD_ROOT/%{_datadir}/omf
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# omf was broken
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
-rm \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm \
+# $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -118,7 +119,8 @@
 %post 
 /sbin/ldconfig
 # currently help system is broken
-#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
@@ -135,15 +137,17 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
-%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/
+#%{_libdir}/libgnash*-*.so
+#%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-#%{_datadir}/omf/gnash/
+%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -151,7 +155,7 @@
 
 %files klash
 %defattr(-,root,root,-)
-%{_bindir}/klash
+%{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 #%{_datadir}/config/klashrc
@@ -162,6 +166,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
+- update to 0.8.1
+
 * Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
 - rebuild for boost soname change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2007 14:11:00 -0000	1.4
+++ sources	6 Sep 2007 11:56:09 -0000	1.5
@@ -1 +1 @@
-b3a3b22d608b5050b1b2743bc348c536  gnash-0.8.0.tar.bz2
+28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz


--- gnash-CVE-2007-2500.patch DELETED ---


--- gnash-README.fedora DELETED ---


--- gnash-configure-pkgconfig.patch DELETED ---


--- gnash-continue_on_info_install_error.patch DELETED ---


--- gnash-plugin-tempfile-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:02:35 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 08:02:35 -0400
Subject: rpms/ocaml-curl/devel ocaml-curl.spec,1.2,1.3
Message-ID: <200709061202.l86C2Z01007057@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7031

Modified Files:
	ocaml-curl.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-5
- Force rebuild because of changed build-requires/provides scripts in OCaml.



Index: ocaml-curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curl/devel/ocaml-curl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-curl.spec	30 Aug 2007 09:29:00 -0000	1.2
+++ ocaml-curl.spec	6 Sep 2007 12:02:02 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curl
 Version:        0.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml Curl library (ocurl)
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, curl-devel >= 7.9.8
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, curl-devel >= 7.9.8
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-5
+- Force rebuild because of changed build-requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:04:59 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 08:04:59 -0400
Subject: rpms/bind/F-7 bind-9.4-_res_errno.patch, NONE, 1.1 bind.spec, 1.191,
	1.192 bind-9.4-2119_revert.patch, 1.1,
	NONE libbind-9.3.1rc1-fix_h_errno.patch, 1.1, NONE
Message-ID: <200709061205.l86C4xpN007214@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135

Modified Files:
	bind.spec 
Added Files:
	bind-9.4-_res_errno.patch 
Removed Files:
	bind-9.4-2119_revert.patch libbind-9.3.1rc1-fix_h_errno.patch 
Log Message:
- patches bind-9.4-2119_revert.patch and
  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
  bind-9.4-_res_errno.patch


bind-9.4-_res_errno.patch:

--- NEW FILE bind-9.4-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org>
Reviewed-by: Adam Tkac <atkac redhat com>

diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- bind.spec	3 Sep 2007 07:54:59 -0000	1.191
+++ bind.spec	6 Sep 2007 12:04:26 -0000	1.192
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.2.%{RELEASEVER}%{?dist}
+Release: 	0.3.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +56,6 @@
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
 Patch12: 	bind-9.3.1rc1-sdb.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
-Patch14: 	libbind-9.3.1rc1-fix_h_errno.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch17: 	bind-9.3.2b1-fix_sdb_ldap.patch
 Patch22: 	bind-9.3.1-sdb_dbus.patch
@@ -73,7 +72,7 @@
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
-Patch72:	bind-9.4-2119_revert.patch
+Patch73:	bind-9.4-_res_errno.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -259,7 +258,6 @@
 %endif
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
-%patch14 -p1 -b .fix_h_errno
 %endif
 %patch16 -p1 -b .redhat_doc
 %if %{WITH_DBUS}
@@ -299,7 +297,7 @@
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
-%patch72 -p1 -b .2119_revert
+%patch73 -p1 -b .errno
 :;
 
 
@@ -785,6 +783,11 @@
 
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
+- patches bind-9.4-2119_revert.patch and
+  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
+  bind-9.4-_res_errno.patch
+
 * Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
 - temporary revert ISC 2119 change which conflicts with our
   "libbind-errno" patch (#254501)


--- bind-9.4-2119_revert.patch DELETED ---


--- libbind-9.3.1rc1-fix_h_errno.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:19:41 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 6 Sep 2007 08:19:41 -0400
Subject: rpms/hplip/devel hplip.fdi, NONE, 1.1 hplip-udev-rules.patch, 1.2, 
	1.3 hplip.spec, 1.157, 1.158
Message-ID: <200709061219.l86CJf8l007600@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7576

Modified Files:
	hplip-udev-rules.patch hplip.spec 
Added Files:
	hplip.fdi 
Log Message:
* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
- Reverted udev rules change.
- Ship a HAL FDI file to get correct access control on the USB device
  nodes (bug #251470).
- Make libsane-hpaio requires the main hplip package, needed for
  libhpip.so (bug #280281).



--- NEW FILE hplip.fdi ---
<?xml version="1.0" encoding="UTF-8"?> 

<deviceinfo version="0.2">
  <device>
    <!-- HPLIP-driven printers and scanners -->
    <match key="info.bus" contains="usb_device">
      <match key="usb_device.vendor_id" int="0x03f0">
        <append key="info.capabilities" type="strlist">scanner</append>
      </match>
    </match>

    <!-- Set ACLs -->
    <match key="info.capabilities" contains="scanner">
      <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">scanner</merge>
    </match>
  </device>
</deviceinfo>

hplip-udev-rules.patch:

Index: hplip-udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-udev-rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-udev-rules.patch	30 Aug 2007 15:27:19 -0000	1.2
+++ hplip-udev-rules.patch	6 Sep 2007 12:19:39 -0000	1.3
@@ -1,14 +1,12 @@
---- hplip-2.7.7/55-hpmud.rules.udev-rules	2007-05-17 17:48:16.000000000 +0100
-+++ hplip-2.7.7/55-hpmud.rules	2007-08-09 10:22:42.000000000 +0100
-@@ -1,5 +1,9 @@
+--- hplip-2.7.6/55-hpmud.rules.udev-rules	2007-07-20 14:13:01.000000000 +0100
++++ hplip-2.7.6/55-hpmud.rules	2007-07-20 14:13:32.000000000 +0100
+@@ -1,5 +1,7 @@
  # TODO: add PROGRAM rule for 7/xx/xx printer class interface
 -SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
 +SUBSYSTEM!="usb", GOTO="hpmud_rules_end"
 +ATTR{devnum}!="?*", GOTO="hpmud_rules_end"
 +ATTR{busnum}!="?*", GOTO="hpmud_rules_end"
-+ENV{PHYSDEVDRIVER}=="usblp", GOTO="hpmud_rules_end"
  ACTION!="add", GOTO="hpmud_rules_end"
 -SYSFS{idVendor}=="03f0", GROUP="lp"
 +SYSFS{idVendor}=="03f0", GROUP="lp", MODE="0664"
-+SYSFS{idVendor}=="03f0", SYMLINK+="scanner-%k"
  LABEL="hpmud_rules_end"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- hplip.spec	30 Aug 2007 15:27:19 -0000	1.157
+++ hplip.spec	6 Sep 2007 12:19:39 -0000	1.158
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -12,7 +12,8 @@
 Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
-Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source1: hplip.fdi
 Patch1: hplip-desktop.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
@@ -34,6 +35,7 @@
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 Requires: python-imaging
+Requires: hal
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -79,6 +81,7 @@
 License: GPL
 Obsoletes: libsane-hpoj <= 0.91
 Requires: sane-backends
+Requires: %{name} = %{version}-%{release}
 ExcludeArch: s390 s390x
 
 %description -n libsane-hpaio
@@ -153,6 +156,9 @@
 	--add-category Application				\
 	hplip.desktop
 
+mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+
 # Remove files we don't want to package.
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
@@ -165,6 +171,7 @@
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_sysconfdir}/udev/rules.d/*
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -271,6 +278,13 @@
 exit 0
 
 %changelog
+* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
+- Reverted udev rules change.
+- Ship a HAL FDI file to get correct access control on the USB device
+  nodes (bug #251470).
+- Make libsane-hpaio requires the main hplip package, needed for
+  libhpip.so (bug #280281).
+
 * Thu Aug 30 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-3
 - Updated udev rules to allow scanning by console user.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:23:50 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 08:23:50 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1300,1.1301
Message-ID: <200709061223.l86CNoEJ007714@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7692

Modified Files:
	openoffice.org.spec 
Log Message:
build failed, so merge 2 with 1


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -r1.1300 -r1.1301
--- openoffice.org.spec	6 Sep 2007 11:28:16 -0000	1.1300
+++ openoffice.org.spec	6 Sep 2007 12:23:17 -0000	1.1301
@@ -2774,14 +2774,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.2
-- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
-
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
-- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
-  makes drawing shapes work properly again
 - next version
+- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p to
+  make drawing shapes work properly again with new boost 1.34
+- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 - disable custom launchers, it breaks icedtea for some reason I haven't time to
   figure out
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:24:01 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:24:01 -0400
Subject: extras-buildsys/utils/pushscript RepoSupport.py, 1.4,
	1.5 RepoSupportExample.py, 1.2, NONE
Message-ID: <200709061224.l86CO1dF007768@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7713

Modified Files:
	RepoSupport.py 
Removed Files:
	RepoSupportExample.py 
Log Message:
- access to the testing repo ids is needed
- delete the unneeded example




Index: RepoSupport.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoSupport.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepoSupport.py	25 Feb 2007 16:25:50 -0000	1.4
+++ RepoSupport.py	6 Sep 2007 12:23:58 -0000	1.5
@@ -46,9 +46,13 @@
         return self.archdict
 
     def ReleaseRepoList(self,dist):
-        """return list of repository base-ids for the given release"""
+        """return list of base repository ids for the given release"""
         return self.baserepos.get(dist) or []
 
+    def TestRepoList(self,dist):
+        """return list of testing repository ids for the given release"""
+        return self.testrepos.get(dist) or []
+
     def ExtRepoList(self,dist):
         return self.extrepos.get(dist) or []
 


--- RepoSupportExample.py DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:25:34 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 08:25:34 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.27,
	1.28 policycoreutils.spec, 1.443, 1.444
Message-ID: <200709061225.l86CPYxA007858@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
- Bump libsemanage version for disable dontaudit
- New gui features for creating admin users


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policycoreutils-gui.patch	31 Aug 2007 21:17:12 -0000	1.27
+++ policycoreutils-gui.patch	6 Sep 2007 12:25:31 -0000	1.28
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-08-31 15:06:49.000000000 -0400
-@@ -0,0 +1,2313 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-05 22:33:12.000000000 -0400
+@@ -0,0 +1,2312 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,8 +1028,7 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="can_focus">True</property>
-+	  <property name="show_tabs">True</property>
++	  <property name="show_tabs">False</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -3231,8 +3230,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-08-31 15:06:45.000000000 -0400
-@@ -0,0 +1,444 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-05 22:33:06.000000000 -0400
+@@ -0,0 +1,432 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3265,8 +3264,6 @@
 +import gnome
 +import sys
 +import polgen
-+import sepolgen.interfaces as interfaces
-+import sepolgen.defaults as defaults
 +import re
 +
 +##
@@ -3305,13 +3302,6 @@
 +else:
 +    xml = gtk.glade.XML ("/usr/share/system-config-selinux/polgen.glade", domain=PROGNAME)
 +
-+fn = defaults.interface_info()
-+try:
-+    fd = open(fn)
-+except:
-+    sys.stderr.write("could not open interface info [%s]\n" % fn)
-+    sys.exit(1)
-+
 +FILE = 1
 +DIR = 2
 +
@@ -3400,11 +3390,8 @@
 +        col = gtk.TreeViewColumn(_("Application"), gtk.CellRendererText(), text = 0)
 +        self.admin_treeview.append_column(col)
 +
-+        # List of per_role_template interfaces
-+        ifs = interfaces.InterfaceSet()
-+        ifs.from_file(fd)
-+        fd.close()
-+        for i in ifs.interfaces.keys():
++        for i in polgen.methods:
++            print i
 +            m = re.findall("(.*)%s" % polgen.USER_TRANSITION_INTERFACE, i) 
 +            if len(m) > 0:
 +                iter = self.transition_store.append()
@@ -3442,7 +3429,7 @@
 +                self.forward_button.set_label(gtk.STOCK_APPLY)
 +        
 +    def back(self,arg):
-+        type = self.confine_application()
++        type = self.get_type()
 +        if self.pages[type][self.current_page] == self.FINISH_PAGE:
 +            self.forward_button.set_label(gtk.STOCK_GO_FORWARD)
 +
@@ -3679,8 +3666,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-08-31 15:06:41.000000000 -0400
-@@ -0,0 +1,656 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-05 22:26:53.000000000 -0400
+@@ -0,0 +1,715 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3715,6 +3702,8 @@
 +from templates import script
 +from templates import user
 +import seobject
++import sepolgen.interfaces as interfaces
++import sepolgen.defaults as defaults
 +
 +##
 +## I18N
@@ -3733,6 +3722,20 @@
 +    import __builtin__
 +    __builtin__.__dict__['_'] = unicode
 +
++methods = []
++fn = defaults.interface_info()
++try:
++    fd = open(fn)
++    # List of per_role_template interfaces
++    ifs = interfaces.InterfaceSet()
++    ifs.from_file(fd)
++    fd.close()
++    methods = ifs.interfaces.keys()
++except:
++    sys.stderr.write("could not open interface info [%s]\n" % fn)
++    sys.exit(1)
++
++
 +ALL = 0
 +RESERVED = 1
 +UNRESERVED = 2
@@ -3792,6 +3795,7 @@
 +                self.need_udp_type=False
 +		self.admin_domains = []
 +		self.transition_domains = []
++                self.roles = []
 +                
 +        def __isnetset(self, l):
 +            return l[ALL] or l[RESERVED] or l[UNRESERVED] or len(l[PORTS]) > 0
@@ -3799,6 +3803,9 @@
 +        def set_admin_domains(self, admin_domains):
 +            self.admin_domains = admin_domains
 +
++        def set_admin_roles(self, roles):
++            self.roles = roles
++
 +        def set_transition_domains(self, transition_domains):
 +            self.transition_domains = transition_domains
 +
@@ -3906,7 +3913,21 @@
 +                if self.use_pam:
 +                    newte = re.sub("TEMPLATETYPE", self.name, executable.te_pam_rules)
 +                return newte
-+            
++
++        def generate_network_action(self, protocol, action, port_name):
++            line = ""
++            method = "corenet_%s_%s_%s" % (protocol, action, port_name)
++            if method in methods:
++                line = "%s(%s_t)\n" % (method, self.name)
++            else:
++                line = """
++gen_require(`
++    type %s_t;
++')
++allow %s_t %s_t:%s_socket name_%s;
++""" % (port_name, self.name, port_name, protocol, action)
++            return line
++                
 +	def generate_network_types(self):
 +                for i in self.in_tcp[PORTS]:
 +                    rec = self.find_port(int(i))
@@ -3914,7 +3935,8 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("tcp", "bind", port_name)
++#                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +
@@ -3924,7 +3946,8 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("tcp", "connect", port_name)
++#                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +                        
@@ -3934,7 +3957,8 @@
 +                        self.need_udp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("udp", "bind", port_name)
++#                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_udp_ports:
 +                            self.found_udp_ports.append(line)
 +                
@@ -4022,8 +4046,10 @@
 +
 +        def generate_admin_rules(self):
 +            newte = ""
++            newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++            
 +            for app in self.admin_domains:
-+                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
 +                newte += re.sub("APPLICATION", app, tmp)
 +            return newte
 +
@@ -4132,6 +4158,17 @@
 +	def generate_default_rules(self):
 +		return self.DEFAULT_TYPES[self.type][1]()
 +		
++	def generate_roles_rules(self):
++            newte = ""
++            if self.type in ( TUSER, XUSER):
++                roles = ""
++                if len(self.roles) > 0:
++                    newte += re.sub("TEMPLATETYPE", self.name, user.te_newrole_rules)
++                    for role in self.roles:
++                        tmp = re.sub("TEMPLATETYPE", self.name, user.te_roles_rules)
++                        newte += re.sub("ROLE", role, tmp)
++            return newte
++        
 +	def generate_te(self):
 +		newte = self.generate_default_types()
 +		for d in self.DEFAULT_DIRS:
@@ -4157,6 +4194,7 @@
 +		newte += self.generate_uid_rules()		
 +		newte += self.generate_syslog_rules()		
 +                newte += self.generate_pam_rules()		
++                newte += self.generate_roles_rules()
 +                newte += self.generate_transition_rules()
 +                newte += self.generate_admin_rules()
 +		return newte
@@ -4188,6 +4226,18 @@
 +
 +		return newfc
 +	
++	def generate_user_sh(self):
++            newsh = ""
++            if self.type in ( TUSER, XUSER):
++                roles = ""
++                for role in self.roles:
++                    roles += " %s_r" % role
++                if roles != "":
++                    roles += " system_r"
++                tmp = re.sub("TEMPLATETYPE", self.name, script.users)
++                newsh += re.sub("ROLES", roles, tmp)
++            return newsh
++        
 +	def generate_sh(self):
 +		newsh = re.sub("TEMPLATETYPE", self.name, script.compile)
 +		newsh = re.sub("PACKAGEFILENAME", self.file_name, newsh)
@@ -4208,6 +4258,8 @@
 +                    if self.find_port(i) == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
++
++                newsh += self.generate_user_sh()
 +			
 +		return newsh
 +	
@@ -4265,7 +4317,7 @@
 +    mypolicy.set_use_syslog(True)
 +    mypolicy.set_use_pam(True)
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +
 +    mypolicy = policy("myuser", USER)
 +    mypolicy.set_program("/usr/bin/myuser")
@@ -4277,7 +4329,7 @@
 +    mypolicy.set_use_pam(True)
 +    mypolicy.add_file("/var/lib/myuser/myuser.sock")
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
 +
 +    mypolicy = policy("myrwho", DAEMON)
@@ -4290,7 +4342,7 @@
 +    mypolicy.set_use_pam(True)
 +    mypolicy.add_dir("/var/run/myrwho")
 +    mypolicy.add_dir("/var/lib/myrwho")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myinetd", INETD)
 +    mypolicy.set_program("/usr/bin/mytest")
@@ -4308,16 +4360,12 @@
 +    mypolicy.add_dir("/etc/daemon")
 +    mypolicy.add_dir("/etc/daemon/special")
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +
 +    mypolicy = policy("mytuser", TUSER)
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
-+    mypolicy.set_in_udp(1, 0, 0, "1513")
-+    mypolicy.set_use_uid(True)
-+    mypolicy.set_use_syslog(True)
-+    mypolicy.set_use_pam(True)
-+    mypolicy.set_transition_domains(["mozilla", "ssh"])
-+    print mypolicy.generate("/tmp")
++    mypolicy.set_transition_domains(["sudo"])
++    mypolicy.set_admin_roles(["mydbadm"])
++    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myxuser", XUSER)
 +    mypolicy.set_in_tcp(1, 1, 1, "")
@@ -4326,13 +4374,11 @@
 +    mypolicy.set_use_syslog(True)
 +    mypolicy.set_use_pam(True)
 +    mypolicy.set_transition_domains(["mozilla"])
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
-+    mypolicy = policy("myruser", RUSER)
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
-+    mypolicy.set_in_udp(1, 0, 0, "1513")
-+    mypolicy.set_admin_domains(["postgresql", "mysql", "apache"])
-+    print mypolicy.generate("/tmp")
++    mypolicy = policy("mydbadm", RUSER)
++    mypolicy.set_admin_domains(["postgresql", "mysql"])
++    print mypolicy.generate("/var/tmp")
 +    
 +    sys.exit(0)
 +    
@@ -8762,8 +8808,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-08-31 15:41:21.000000000 -0400
-@@ -0,0 +1,222 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-05 22:25:10.000000000 -0400
+@@ -0,0 +1,229 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8906,7 +8952,8 @@
 +#
 +interface(`TEMPLATETYPE_domtrans',`
 +	gen_require(`
-+		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
++		type TEMPLATETYPE_t;
++                type TEMPLATETYPE_exec_t;
 +	')
 +
 +	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
@@ -8961,13 +9008,19 @@
 +## <rolecap/>
 +#
 +interface(`TEMPLATETYPE_admin',`
++	gen_require(`
++		type TEMPLATETYPE_t;
++	')
++
++	allow $1 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, TEMPLATETYPE_t, TEMPLATETYPE_t)
++	        
 +"""
 +
 +if_initscript_admin="""
 +	# Allow $1 to restart the apache service
 +	TEMPLATETYPE_script_domtrans($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
++	domain_system_change_exemption($1)
 +	role_transition $2 TEMPLATETYPE_script_exec_t system_r;
 +	allow $2 system_r;
 +"""
@@ -9226,8 +9279,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-08-31 15:07:36.000000000 -0400
-@@ -0,0 +1,42 @@
++++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-05 22:25:46.000000000 -0400
+@@ -0,0 +1,45 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9270,6 +9323,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
++users="""\
++/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
++"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-08-31 15:07:36.000000000 -0400
@@ -9418,8 +9474,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-08-31 15:07:36.000000000 -0400
-@@ -0,0 +1,97 @@
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-05 22:25:03.000000000 -0400
+@@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9511,11 +9567,53 @@
 +"""
 +
 +te_admin_rules="""
++allow TEMPLATETYPE_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
++files_dontaudit_search_all_dirs(TEMPLATETYPE_t)
++
++selinux_get_enforce_mode(TEMPLATETYPE_t)
++seutil_domtrans_restorecon(TEMPLATETYPE_t)
++seutil_search_default_contexts(mydbadm_t)
++
++logging_send_syslog_msg(TEMPLATETYPE_t)
++
++kernel_read_system_state(TEMPLATETYPE_t)
++
++domain_dontaudit_search_all_domains_state(TEMPLATETYPE_t)
++domain_dontaudit_ptrace_all_domains(TEMPLATETYPE_t)
++
++userdom_dontaudit_search_sysadm_home_dirs(TEMPLATETYPE_t)
++userdom_dontaudit_search_generic_user_home_dirs(TEMPLATETYPE_t)
++
++bool TEMPLATETYPE_read_user_files false;
++bool TEMPLATETYPE_manage_user_files false;
++
++if (TEMPLATETYPE_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(TEMPLATETYPE_t)
++   userdom_read_unpriv_users_tmp_files(TEMPLATETYPE_t)
++}
++
++if (TEMPLATETYPE_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(TEMPLATETYPE_t)
++   userdom_read_unpriv_users_tmp_files(TEMPLATETYPE_t)
++   userdom_write_unpriv_users_tmp_files(TEMPLATETYPE_t)
++}
++
++"""
++
++te_admin_domain_rules="""
 +optional_policy(`
 +	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r, { TEMPLATETYPE_tty_device_t TEMPLATETYPE_devpts_t })
 +')
 +"""
 +
++te_roles_rules="""
++userdom_role_change_template(TEMPLATETYPE, ROLE)
++"""
++
++te_newrole_rules="""
++seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++"""
++
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- policycoreutils.spec	31 Aug 2007 21:17:12 -0000	1.443
+++ policycoreutils.spec	6 Sep 2007 12:25:31 -0000	1.444
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.6-1
-%define	libsemanagever	2.0.4-1
+%define	libsepolver	2.0.9-1
+%define	libsemanagever	2.0.5-1
 %define	libselinuxver	2.0.23-3
 %define	sepolgenver	1.0.9
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,10 @@
 fi
 
 %changelog
+* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
+- Bump libsemanage version for disable dontaudit
+- New gui features for creating admin users
+
 * Fri Aug 31 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-8
 - Fix generated code for admin policy
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:27:18 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Thu, 6 Sep 2007 08:27:18 -0400
Subject: rpms/gcc/devel gcc41-builtin-chk-anticipated.patch, NONE,
	1.1 gcc41-builtin-throw.patch, NONE,
	1.1 gcc41-builtin-va-arg-pack.patch, NONE, 1.1 gcc41.spec, 1.170,
	1.171
Message-ID: <200709061227.l86CRING007957@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack.patch 
Log Message:
4.1.2-22

gcc41-builtin-chk-anticipated.patch:

--- NEW FILE gcc41-builtin-chk-anticipated.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33289
	* decl.c (builtin_function_1): Set DECL_ANTICIPATED also
	on __*_chk non-__builtin_* decls.

	* g++.dg/eh/builtin4.C: New test.

--- gcc/cp/decl.c.jj	2007-08-31 14:28:19.000000000 +0200
+++ gcc/cp/decl.c	2007-09-04 21:28:06.000000000 +0200
@@ -3517,6 +3529,17 @@ builtin_function_1 (tree decl, tree cont
      anticipated but not actually declared.  */
   if (name[0] != '_' || name[1] != '_')
     DECL_ANTICIPATED (decl) = 1;
+  else if (strncmp (name + 2, "builtin_", strlen ("builtin_")) != 0)
+    {
+      size_t len = strlen (name);
+
+      /* Treat __*_chk fortification functions as anticipated as well,
+	 unless they are __builtin_*.  */
+      if (len > strlen ("___chk")
+	  && memcmp (name + len - strlen ("_chk"),
+		     "_chk", strlen ("_chk") + 1) == 0)
+	DECL_ANTICIPATED (decl) = 1;
+    }
 
   return decl;
 }
--- gcc/testsuite/g++.dg/eh/builtin4.C.jj	2007-09-04 22:06:06.000000000 +0200
+++ gcc/testsuite/g++.dg/eh/builtin4.C	2007-09-04 22:07:03.000000000 +0200
@@ -0,0 +1,6 @@
+// PR c++/33289
+// { dg-do compile }
+
+typedef __SIZE_TYPE__ size_t;
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();

gcc41-builtin-throw.patch:

--- NEW FILE gcc41-builtin-throw.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	* builtin-attrs.def (ATTR_NONNULL_3): New.
	(DEF_FORMAT_ATTRIBUTE): Use just ATTR_NONNULL_##FA instead of
	ATTR_NOTHROW_NONNULL_##FA.
	(DEF_FORMAT_ATTRIBUTE_NOTHROW, DEF_FORMAT_ATTRIBUTE_BOTH): New macros.
	(ATTR_FORMAT_PRINTF_NOTHROW_2_0, ATTR_PRINTF_NOTHROW_2_3,
	ATTR_FORMAT_PRINTF_NOTHROW_3_0, ATTR_FORMAT_PRINTF_NOTHROW_3_4,
	ATTR_FORMAT_PRINTF_NOTHROW_4_0, ATTR_PRINTF_NOTHROW_4_5,
	ATTR_FORMAT_PRINTF_NOTHROW_5_0, ATTR_FORMAT_PRINTF_NOTHROW_5_6,
	ATTR_FORMAT_SCANF_NOTHROW_2_0, ATTR_FORMAT_SCANF_NOTHROW_2_3,
	ATTR_FORMAT_STRFTIME_NOTHROW_3_0, ATTR_FORMAT_STRFMON_NOTHROW_3_4):
	New.
	(ATTR_FORMAT_PRINTF_4_0, ATTR_PRINTF_4_5, ATTR_FORMAT_PRINTF_5_0,
	ATTR_FORMAT_PRINTF_5_6, ATTR_FORMAT_STRFTIME_3_0,
	ATTR_FORMAT_NOTHROW_3_4): Remove.
	* builtins.def (snprintf, sprintf, sscanf, vsnprintf, vsprintf,
	vsscanf, strfmon, strftime, __snprintf_chk, __sprintf_chk,
	__vsnprintf_chk, __vsprintf_chk): Use ATTR_FORMAT_*_NOTHROW_*
	instead of ATTR_FORMAT_*_*.

--- gcc/builtin-attrs.def.jj	2007-08-13 15:11:18.000000000 +0200
+++ gcc/builtin-attrs.def	2007-09-03 11:26:13.000000000 +0200
@@ -118,6 +118,8 @@ DEF_ATTR_TREE_LIST (ATTR_NONNULL_LIST, A
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_1, ATTR_NONNULL, ATTR_LIST_1, ATTR_NULL)
 /* Functions whose second parameter is a nonnull pointer.  */
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_2, ATTR_NONNULL, ATTR_LIST_2, ATTR_NULL)
+/* Functions whose third parameter is a nonnull pointer.  */
+DEF_ATTR_TREE_LIST (ATTR_NONNULL_3, ATTR_NONNULL, ATTR_LIST_3, ATTR_NULL)
 /* Nothrow functions with the sentinel(1) attribute. */
 DEF_ATTR_TREE_LIST (ATTR_NOTHROW_SENTINEL_1, ATTR_SENTINEL, ATTR_LIST_1, \
 			ATTR_NOTHROW_LIST)
@@ -157,24 +159,38 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_
   DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
 		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
   DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_NOTHROW(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
+		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_BOTH(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)	 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
 		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_4)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_5)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_6)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_4)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_5)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_6)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(STRFTIME,3,3_0)
-DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFTIME,3,3_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3_4)
 #undef DEF_FORMAT_ATTRIBUTE
+#undef DEF_FORMAT_ATTRIBUTE_NOTHROW
+#undef DEF_FORMAT_ATTRIBUTE_BOTH
 
 /* Construct a tree for a format_arg attribute.  */
 #define DEF_FORMAT_ARG_ATTRIBUTE(FA)					\
--- gcc/builtins.def.jj	2007-08-30 18:46:59.000000000 +0200
+++ gcc/builtins.def	2007-09-03 10:52:18.000000000 +0200
@@ -553,16 +553,16 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTCHAR
 DEF_LIB_BUILTIN        (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_SCANF, "scanf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_SCANF_1_2)
-DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
-DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_2_3)
+DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_2_3)
+DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_NOTHROW_2_3)
 DEF_LIB_BUILTIN        (BUILT_IN_VFPRINTF, "vfprintf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
 DEF_C99_BUILTIN        (BUILT_IN_VFSCANF, "vfscanf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
 DEF_LIB_BUILTIN        (BUILT_IN_VPRINTF, "vprintf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_1_0)
 DEF_C99_BUILTIN        (BUILT_IN_VSCANF, "vscanf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_1_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)
-DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_3_0)
+DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_NOTHROW_2_0)
 
 /* Category: ctype builtins.  */
 DEF_LIB_BUILTIN        (BUILT_IN_ISALNUM, "isalnum", BT_FN_INT_INT, ATTR_PURE_NOTHROW_LIST)
@@ -693,8 +693,8 @@ DEF_GCC_BUILTIN        (BUILT_IN_RETURN_
 DEF_GCC_BUILTIN        (BUILT_IN_SAVEREGS, "saveregs", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_STDARG_START, "stdarg_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_3_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_UNWIND_INIT, "unwind_init", BT_FN_VOID, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_SETJMP_BUF, "update_setjmp_buf", BT_FN_VOID_PTR_INT, ATTR_NULL)
@@ -730,10 +730,10 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCAT_
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCPY_CHK, "__strcpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCAT_CHK, "__strncat_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCPY_CHK, "__strncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_5_6)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_4_5)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_5_0)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_4_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_5_6)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_4_5)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_5_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_4_0)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_FPRINTF_CHK, "__fprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PRINTF_CHK, "__printf_chk", BT_FN_INT_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_VFPRINTF_CHK, "__vfprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)

gcc41-builtin-va-arg-pack.patch:

--- NEW FILE gcc41-builtin-va-arg-pack.patch ---
2007-09-05  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
	* tree.h (CALL_EXPR_VA_ARG_PACK): Define.
	* tree-inline.h (copy_body_data): Add call_expr field.
	* tree-inline.c (expand_call_inline): Initialize call_expr.
	(copy_bb): Append anonymous inline fn arguments to arguments
	when inlining a CALL_EXPR_VA_ARG_PACK call.
	* builtins.c (expand_builtin): Issue an error if
	BUILT_IN_VA_ARG_PACK is seen during expand.
	(fold_builtin_1): Don't fold calls with
	__builtin_va_arg_pack () call as last argument.
	* gimplify.c (gimplify_call_expr): If last argument to a vararg
	function is __builtin_va_arg_pack (), decrease number of call
	arguments and instead set CALL_EXPR_VA_ARG_PACK on the CALL_EXPR.
	* fold-const.c (fold): Don't fold CALL_EXPRs with
	CALL_EXPR_VA_ARG_PACK bit set.
	* expr.c (expand_expr_real_1): Issue an error if
	CALL_EXPR_VA_ARG_PACK CALL_EXPR is seen during expand.
	* tree-pretty-print.c (dump_generic_node): Handle printing
	CALL_EXPR_VA_ARG_PACK bit on CALL_EXPRs.
	* doc/extend.texi (__builtin_va_arg_pack): Document.

	* gcc.c-torture/execute/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1a.c: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:09.000000000 +0200
+++ gcc/builtins.def	2007-09-06 10:19:24.000000000 +0200
@@ -665,6 +665,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_
 DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY, "va_copy", BT_FN_VOID_VALIST_REF_VALIST_ARG, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/tree.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree.h	2007-09-06 11:50:56.000000000 +0200
@@ -411,6 +411,8 @@ struct tree_common GTY(())
            VAR_DECL or FUNCTION_DECL or IDENTIFIER_NODE
        ASM_VOLATILE_P in
            ASM_EXPR
+       CALL_EXPR_VA_ARG_PACK in
+	  CALL_EXPR
        TYPE_CACHED_VALUES_P in
           ..._TYPE
        SAVE_EXPR_RESOLVED_P in
@@ -1066,6 +1068,11 @@ extern void omp_clause_range_check_faile
 #define SAVE_EXPR_RESOLVED_P(NODE) \
   (TREE_CHECK (NODE, SAVE_EXPR)->common.public_flag)
 
+/* Set on a CALL_EXPR if this stdarg call should be passed the argument
+   pack.  */
+#define CALL_EXPR_VA_ARG_PACK(NODE) \
+  (CALL_EXPR_CHECK(NODE)->common.public_flag)
+
 /* In any expression, decl, or constant, nonzero means it has side effects or
    reevaluation of the whole expression could produce a different value.
    This is set if any subexpression is a function call, a side effect or a
--- gcc/tree-inline.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/tree-inline.h	2007-09-06 10:19:24.000000000 +0200
@@ -57,6 +57,10 @@ typedef struct copy_body_data
   /* Current BLOCK.  */
   tree block;
 
+  /* CALL_EXPR if va arg parameter packs should be expanded or NULL
+     is not.  */
+  tree call_expr;
+
   /* Exception region the inlined call lie in.  */
   int eh_region;
   /* Take region number in the function being copied, add this value and
--- gcc/tree-inline.c.jj	2007-04-26 09:41:49.000000000 +0200
+++ gcc/tree-inline.c	2007-09-06 12:35:57.000000000 +0200
@@ -725,6 +725,22 @@ copy_bb (copy_body_data *id, basic_block
 
           bsi_insert_after (&copy_bsi, stmt, BSI_NEW_STMT);
 	  call = get_call_expr_in (stmt);
+	  if (call && CALL_EXPR_VA_ARG_PACK (call) && id->call_expr)
+	    {
+	      tree arglist, *a, p;
+	      TREE_OPERAND (call, 1) = copy_list (TREE_OPERAND (call, 1));
+
+	      for (a = &TREE_OPERAND (call, 1); *a; a = &TREE_CHAIN (*a))
+		;
+
+	      p = DECL_ARGUMENTS (id->src_fn);
+	      for (arglist = TREE_OPERAND (id->call_expr, 1);
+		   p; p = TREE_CHAIN (p), arglist = TREE_CHAIN (arglist))
+		;
+
+	      *a = copy_list (arglist);
+	      CALL_EXPR_VA_ARG_PACK (call) = 0;
+	    }
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
@@ -2085,6 +2101,7 @@ expand_call_inline (basic_block bb, tree
   /* Record the function we are about to inline.  */
   id->src_fn = fn;
   id->src_node = cg_edge->callee;
+  id->call_expr = t;
 
   initialize_inlined_parameters (id, args, TREE_OPERAND (t, 2), fn, bb);
 
--- gcc/builtins.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/builtins.c	2007-09-06 11:04:56.000000000 +0200
@@ -5979,6 +5979,12 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_ARGS_INFO:
       return expand_builtin_args_info (arglist);
 
+    case BUILT_IN_VA_ARG_PACK:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
@@ -9017,7 +9023,27 @@ fold_builtin_1 (tree fndecl, tree arglis
 {
   tree type = TREE_TYPE (TREE_TYPE (fndecl));
   enum built_in_function fcode;
+  tree a;
+
+  if (arglist)
+    {
+      for (a = arglist; TREE_CHAIN (a); a = TREE_CHAIN (a))
+	;
 
+      /* Before gimplification CALL_EXPR_VA_ARG_PACK is not set, but
+	 instead last argument is __builtin_va_arg_pack ().  Defer folding
+	 even in that case, until arguments are finalized.  */
+      if (TREE_CODE (TREE_VALUE (a)) == CALL_EXPR)
+	{
+	  tree fndecl2 = get_callee_fndecl (TREE_VALUE (a));
+	  if (fndecl2
+	      && TREE_CODE (fndecl2) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (fndecl2) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (fndecl2) == BUILT_IN_VA_ARG_PACK)
+	    return NULL_TREE;
+	}
+    }
+
   if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
     return targetm.fold_builtin (fndecl, arglist, ignore);
 
--- gcc/gimplify.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/gimplify.c	2007-09-06 11:42:01.000000000 +0200
@@ -2018,6 +2018,55 @@ gimplify_call_expr (tree *expr_p, tree *
   ret = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, NULL,
 		       is_gimple_call_addr, fb_rvalue);
 
+  if (ret != GS_ERROR && TREE_OPERAND (*expr_p, 1))
+    {
+      int nargs;
+
+      for (nargs = 1, arglist = TREE_OPERAND (*expr_p, 1);
+	   TREE_CHAIN (arglist);
+	   arglist = TREE_CHAIN (arglist))
+	nargs++;
+
+      if (TREE_CODE (TREE_VALUE (arglist)) == CALL_EXPR)
+	{
+	  tree last_arg = TREE_VALUE (arglist);
+	  tree last_arg_fndecl = get_callee_fndecl (last_arg);
+
+	  if (last_arg_fndecl
+	      && TREE_CODE (last_arg_fndecl) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (last_arg_fndecl) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (last_arg_fndecl) == BUILT_IN_VA_ARG_PACK)
+	    {
+	      tree p = NULL_TREE, *aptr;
+	      int i;
+
+	      if (decl && DECL_ARGUMENTS (decl))
+		p = DECL_ARGUMENTS (decl);
+	      else if (decl)
+		p = TYPE_ARG_TYPES (TREE_TYPE (decl));
+	      else if (POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (*expr_p, 0))))
+		p = TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE
+						(TREE_OPERAND (*expr_p, 0))));
+	      for (i = 0; p; p = TREE_CHAIN (p))
+		i++;
+
+	      if (i < nargs)
+		{
+		  TREE_OPERAND (*expr_p, 1)
+		    = copy_list (TREE_OPERAND (*expr_p, 1));
+
+		  for (aptr = &TREE_OPERAND (*expr_p, 1);
+		       TREE_CHAIN (*aptr);
+		       aptr = &TREE_CHAIN (*aptr))
+		    ;
+
+		  *aptr = NULL_TREE;
+		  CALL_EXPR_VA_ARG_PACK (*expr_p) = 1;
+		}
+	    }
+	}
+    }
+
   if (PUSH_ARGS_REVERSED)
     TREE_OPERAND (*expr_p, 1) = nreverse (TREE_OPERAND (*expr_p, 1));
   for (arglist = TREE_OPERAND (*expr_p, 1); arglist;
@@ -2037,7 +2086,7 @@ gimplify_call_expr (tree *expr_p, tree *
   if (ret != GS_ERROR)
     {
       decl = get_callee_fndecl (*expr_p);
-      if (decl && DECL_BUILT_IN (decl))
+      if (decl && DECL_BUILT_IN (decl) && !CALL_EXPR_VA_ARG_PACK (*expr_p))
 	{
 	  tree arglist = TREE_OPERAND (*expr_p, 1);
 	  tree new = fold_builtin (decl, arglist, !want_value);
--- gcc/fold-const.c.jj	2007-08-31 09:47:39.000000000 +0200
+++ gcc/fold-const.c	2007-09-06 11:40:55.000000000 +0200
@@ -10409,6 +10409,8 @@ fold (tree expr)
 	  op0 = TREE_OPERAND (t, 0);
 	  op1 = TREE_OPERAND (t, 1);
 	  op2 = TREE_OPERAND (t, 2);
+	  if (code == CALL_EXPR && CALL_EXPR_VA_ARG_PACK (t))
+	    return expr;
 	  tem = fold_ternary (code, type, op0, op1, op2);
 	  return tem ? tem : expr;
 	default:
--- gcc/expr.c.jj	2007-04-24 22:58:53.000000000 +0200
+++ gcc/expr.c	2007-09-06 10:19:24.000000000 +0200
@@ -7475,6 +7475,10 @@ expand_expr_real_1 (tree exp, rtx target
       return expand_expr (OBJ_TYPE_REF_EXPR (exp), target, tmode, modifier);
 
     case CALL_EXPR:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      if (CALL_EXPR_VA_ARG_PACK (exp))
+	error ("invalid use of %<__builtin_va_arg_pack ()%>");
       /* Check for a built-in function.  */
       if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
 	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
--- gcc/doc/extend.texi.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-06 10:19:25.000000000 +0200
@@ -552,6 +552,32 @@ the containing function.  You should spe
 returned by @code{__builtin_apply}.
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack ()
+This built-in function represents all anonymous arguments of an inline
+function.  It can be used only in inline functions which will be always
+inlined, never compiled as a separate function, such as those using
+ at code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+It must be only passed as last argument to some other function
+with variable arguments.  This is useful for writing small wrapper
+inlines for variable argument functions, when using preprocessor
+macros is undesirable.  For example:
+ at smallexample
+extern int myprintf (FILE *f, const char *format, ...);
+extern inline __attribute__ ((__gnu_inline__)) int
+myprintf (FILE *f, const char *format, ...)
+@{
+  int r = fprintf (f, "myprintf: ");
+  if (r < 0)
+    return r;
+  int s = fprintf (f, format, __builtin_va_arg_pack ());
+  if (s < 0)
+    return s;
+  return r + s;
+@}
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/tree-pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree-pretty-print.c	2007-09-06 10:24:51.000000000 +0200
@@ -1128,6 +1128,15 @@ dump_generic_node (pretty_printer *buffe
       op1 = TREE_OPERAND (node, 1);
       if (op1)
 	dump_generic_node (buffer, op1, spc, flags, false);
+      if (CALL_EXPR_VA_ARG_PACK (node))
+	{
+	  if (op1)
+	    {
+	      pp_character (buffer, ',');
+	      pp_space (buffer);
+	    }
+	  pp_string (buffer, "__builtin_va_arg_pack ()");
+	}
       pp_character (buffer, ')');
 
       op1 = TREE_OPERAND (node, 2);
--- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
@@ -0,0 +1,143 @@
+/* __builtin_va_arg_pack () builtin tests.  */
+
+#include <stdarg.h>
+
+extern void abort (void);
+
+int v1 = 8;
+long int v2 = 3;
+void *v3 = (void *) &v2;
+struct A { char c[16]; } v4 = { "foo" };
+long double v5 = 40;
+char seen[20];
+int cnt;
+
+__attribute__ ((noinline)) int
+foo1 (int x, int y, ...)
+{
+  int i;
+  long int l;
+  void *v;
+  struct A a;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt;
+  if (y != 6)
+    abort ();
+  i = va_arg (ap, int);
+  if (i != 5)
+    abort ();
+  switch (x)
+    {
+    case 0:
+      i = va_arg (ap, int);
+      if (i != 9 || v1 != 9)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      v = (void *) va_arg (ap, struct A *);
+      if (v != (void *) &v4)
+	abort ();
+      l = va_arg (ap, long int);
+      if (l != 3 || v2 != 4)
+	abort ();
+      break;
+    case 1:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != ld)
+	abort ();
+      i = va_arg (ap, int);
+      if (i != 8)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x;
+}
+
+__attribute__ ((noinline)) int
+foo2 (int x, int y, ...)
+{
+  long long int ll;
+  void *v;
+  struct A a, b;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt | 64;
+  if (y != 10)
+    abort ();
+  switch (x)
+    {
+    case 11:
+      break;
+    case 12:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != 40)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      b = va_arg (ap, struct A);
+      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      ll = va_arg (ap, long long int);
+      if (ll != 16LL)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x + 8;
+}
+
+__attribute__ ((noinline)) int
+foo3 (void)
+{
+  return 6;
+}
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+bar (int x, ...)
+{
+  if (x < 10)
+    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
+  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  if (bar (0, ++v1, v4, &v4, v2++) != 0)
+    abort ();
+  if (bar (1, ++v5, 8, v3) != 1)
+    abort ();
+  if (bar (2) != 2)
+    abort ();
+  if (bar (v1 + 2) != 19)
+    abort ();
+  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1.c	2007-09-06 12:52:00.000000000 +0200
@@ -0,0 +1,46 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+extern inline __attribute__((always_inline)) int
+f2 (int y, ...)
+{
+  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f3 (int y, ...)
+{
+  return bar (y, "", 5, __builtin_va_arg_pack ());
+}
+
+extern inline __attribute__((always_inline)) int
+f4 (int y, ...)
+{
+  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f5 (int y, ...)
+{
+  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f6 (int y, ...)
+{
+  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
+}
+
+int
+test (void)
+{
+  int a = f2 (5, "a", 6);
+  a += f3 (6, "ab", 17LL);
+  a += f4 (7, 1, 2, 3);
+  a += f5 (8, 7L);
+  a += f6 (9);
+  return a;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1a.c.jj	2007-09-06 12:51:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1a.c	2007-09-06 12:52:09.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+int
+f1 (int x, ...)
+{
+  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gcc41.spec	1 Sep 2007 09:37:50 -0000	1.170
+++ gcc41.spec	6 Sep 2007 12:26:46 -0000	1.171
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 21
+%define gcc_release 22
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -147,6 +147,9 @@
 Patch31: gcc41-c++-gnu_inline.patch
 Patch32: gcc41-ppc-sync-qihi.patch
 Patch33: gcc41-ppc64-ia64-GNU-stack.patch
+Patch34: gcc41-builtin-chk-anticipated.patch
+Patch35: gcc41-builtin-throw.patch
+Patch36: gcc41-builtin-va-arg-pack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -463,6 +466,9 @@
 %patch31 -p0 -b .c++-gnu_inline~
 %patch32 -p0 -b .ppc-sync-qihi~
 %patch33 -p0 -b .ppc64-ia64-GNU-stack~
+%patch34 -p0 -b .builtin-chk-anticipated~
+%patch35 -p0 -b .builtin-throw~
+%patch36 -p0 -b .builtin-va-arg-pack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1617,6 +1623,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22
+- backport __builtin_va_arg_pack () support
+- make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked
+  and __builtin___{,v}{,f}printf_chk can throw
+- handle __*_chk builtins without __builtin_ in the name as anticipated in
+  C++
+
 * Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)



From fedora-extras-commits at redhat.com  Thu Sep  6 12:30:57 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Thu, 6 Sep 2007 08:30:57 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-chk-anticipated.patch, NONE,
	1.1 gcc41-builtin-throw.patch, NONE,
	1.1 gcc41-builtin-va-arg-pack.patch, NONE, 1.1 gcc41.spec, 1.162,
	1.163
Message-ID: <200709061230.l86CUvYG008107@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8080

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack.patch 
Log Message:
4.1.2-21.fc7


gcc41-builtin-chk-anticipated.patch:

--- NEW FILE gcc41-builtin-chk-anticipated.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33289
	* decl.c (builtin_function_1): Set DECL_ANTICIPATED also
	on __*_chk non-__builtin_* decls.

	* g++.dg/eh/builtin4.C: New test.

--- gcc/cp/decl.c.jj	2007-08-31 14:28:19.000000000 +0200
+++ gcc/cp/decl.c	2007-09-04 21:28:06.000000000 +0200
@@ -3517,6 +3529,17 @@ builtin_function_1 (tree decl, tree cont
      anticipated but not actually declared.  */
   if (name[0] != '_' || name[1] != '_')
     DECL_ANTICIPATED (decl) = 1;
+  else if (strncmp (name + 2, "builtin_", strlen ("builtin_")) != 0)
+    {
+      size_t len = strlen (name);
+
+      /* Treat __*_chk fortification functions as anticipated as well,
+	 unless they are __builtin_*.  */
+      if (len > strlen ("___chk")
+	  && memcmp (name + len - strlen ("_chk"),
+		     "_chk", strlen ("_chk") + 1) == 0)
+	DECL_ANTICIPATED (decl) = 1;
+    }
 
   return decl;
 }
--- gcc/testsuite/g++.dg/eh/builtin4.C.jj	2007-09-04 22:06:06.000000000 +0200
+++ gcc/testsuite/g++.dg/eh/builtin4.C	2007-09-04 22:07:03.000000000 +0200
@@ -0,0 +1,6 @@
+// PR c++/33289
+// { dg-do compile }
+
+typedef __SIZE_TYPE__ size_t;
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();

gcc41-builtin-throw.patch:

--- NEW FILE gcc41-builtin-throw.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	* builtin-attrs.def (ATTR_NONNULL_3): New.
	(DEF_FORMAT_ATTRIBUTE): Use just ATTR_NONNULL_##FA instead of
	ATTR_NOTHROW_NONNULL_##FA.
	(DEF_FORMAT_ATTRIBUTE_NOTHROW, DEF_FORMAT_ATTRIBUTE_BOTH): New macros.
	(ATTR_FORMAT_PRINTF_NOTHROW_2_0, ATTR_PRINTF_NOTHROW_2_3,
	ATTR_FORMAT_PRINTF_NOTHROW_3_0, ATTR_FORMAT_PRINTF_NOTHROW_3_4,
	ATTR_FORMAT_PRINTF_NOTHROW_4_0, ATTR_PRINTF_NOTHROW_4_5,
	ATTR_FORMAT_PRINTF_NOTHROW_5_0, ATTR_FORMAT_PRINTF_NOTHROW_5_6,
	ATTR_FORMAT_SCANF_NOTHROW_2_0, ATTR_FORMAT_SCANF_NOTHROW_2_3,
	ATTR_FORMAT_STRFTIME_NOTHROW_3_0, ATTR_FORMAT_STRFMON_NOTHROW_3_4):
	New.
	(ATTR_FORMAT_PRINTF_4_0, ATTR_PRINTF_4_5, ATTR_FORMAT_PRINTF_5_0,
	ATTR_FORMAT_PRINTF_5_6, ATTR_FORMAT_STRFTIME_3_0,
	ATTR_FORMAT_NOTHROW_3_4): Remove.
	* builtins.def (snprintf, sprintf, sscanf, vsnprintf, vsprintf,
	vsscanf, strfmon, strftime, __snprintf_chk, __sprintf_chk,
	__vsnprintf_chk, __vsprintf_chk): Use ATTR_FORMAT_*_NOTHROW_*
	instead of ATTR_FORMAT_*_*.

--- gcc/builtin-attrs.def.jj	2007-08-13 15:11:18.000000000 +0200
+++ gcc/builtin-attrs.def	2007-09-03 11:26:13.000000000 +0200
@@ -118,6 +118,8 @@ DEF_ATTR_TREE_LIST (ATTR_NONNULL_LIST, A
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_1, ATTR_NONNULL, ATTR_LIST_1, ATTR_NULL)
 /* Functions whose second parameter is a nonnull pointer.  */
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_2, ATTR_NONNULL, ATTR_LIST_2, ATTR_NULL)
+/* Functions whose third parameter is a nonnull pointer.  */
+DEF_ATTR_TREE_LIST (ATTR_NONNULL_3, ATTR_NONNULL, ATTR_LIST_3, ATTR_NULL)
 /* Nothrow functions with the sentinel(1) attribute. */
 DEF_ATTR_TREE_LIST (ATTR_NOTHROW_SENTINEL_1, ATTR_SENTINEL, ATTR_LIST_1, \
 			ATTR_NOTHROW_LIST)
@@ -157,24 +159,38 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_
   DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
 		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
   DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_NOTHROW(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
+		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_BOTH(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)	 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
 		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_4)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_5)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_6)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_4)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_5)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_6)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(STRFTIME,3,3_0)
-DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFTIME,3,3_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3_4)
 #undef DEF_FORMAT_ATTRIBUTE
+#undef DEF_FORMAT_ATTRIBUTE_NOTHROW
+#undef DEF_FORMAT_ATTRIBUTE_BOTH
 
 /* Construct a tree for a format_arg attribute.  */
 #define DEF_FORMAT_ARG_ATTRIBUTE(FA)					\
--- gcc/builtins.def.jj	2007-08-30 18:46:59.000000000 +0200
+++ gcc/builtins.def	2007-09-03 10:52:18.000000000 +0200
@@ -553,16 +553,16 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTCHAR
 DEF_LIB_BUILTIN        (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_SCANF, "scanf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_SCANF_1_2)
-DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
-DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_2_3)
+DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_2_3)
+DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_NOTHROW_2_3)
 DEF_LIB_BUILTIN        (BUILT_IN_VFPRINTF, "vfprintf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
 DEF_C99_BUILTIN        (BUILT_IN_VFSCANF, "vfscanf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
 DEF_LIB_BUILTIN        (BUILT_IN_VPRINTF, "vprintf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_1_0)
 DEF_C99_BUILTIN        (BUILT_IN_VSCANF, "vscanf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_1_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)
-DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_3_0)
+DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_NOTHROW_2_0)
 
 /* Category: ctype builtins.  */
 DEF_LIB_BUILTIN        (BUILT_IN_ISALNUM, "isalnum", BT_FN_INT_INT, ATTR_PURE_NOTHROW_LIST)
@@ -693,8 +693,8 @@ DEF_GCC_BUILTIN        (BUILT_IN_RETURN_
 DEF_GCC_BUILTIN        (BUILT_IN_SAVEREGS, "saveregs", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_STDARG_START, "stdarg_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_3_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_UNWIND_INIT, "unwind_init", BT_FN_VOID, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_SETJMP_BUF, "update_setjmp_buf", BT_FN_VOID_PTR_INT, ATTR_NULL)
@@ -730,10 +730,10 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCAT_
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCPY_CHK, "__strcpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCAT_CHK, "__strncat_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCPY_CHK, "__strncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_5_6)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_4_5)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_5_0)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_4_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_5_6)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_4_5)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_5_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_4_0)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_FPRINTF_CHK, "__fprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PRINTF_CHK, "__printf_chk", BT_FN_INT_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_VFPRINTF_CHK, "__vfprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)

gcc41-builtin-va-arg-pack.patch:

--- NEW FILE gcc41-builtin-va-arg-pack.patch ---
2007-09-05  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
	* tree.h (CALL_EXPR_VA_ARG_PACK): Define.
	* tree-inline.h (copy_body_data): Add call_expr field.
	* tree-inline.c (expand_call_inline): Initialize call_expr.
	(copy_bb): Append anonymous inline fn arguments to arguments
	when inlining a CALL_EXPR_VA_ARG_PACK call.
	* builtins.c (expand_builtin): Issue an error if
	BUILT_IN_VA_ARG_PACK is seen during expand.
	(fold_builtin_1): Don't fold calls with
	__builtin_va_arg_pack () call as last argument.
	* gimplify.c (gimplify_call_expr): If last argument to a vararg
	function is __builtin_va_arg_pack (), decrease number of call
	arguments and instead set CALL_EXPR_VA_ARG_PACK on the CALL_EXPR.
	* fold-const.c (fold): Don't fold CALL_EXPRs with
	CALL_EXPR_VA_ARG_PACK bit set.
	* expr.c (expand_expr_real_1): Issue an error if
	CALL_EXPR_VA_ARG_PACK CALL_EXPR is seen during expand.
	* tree-pretty-print.c (dump_generic_node): Handle printing
	CALL_EXPR_VA_ARG_PACK bit on CALL_EXPRs.
	* doc/extend.texi (__builtin_va_arg_pack): Document.

	* gcc.c-torture/execute/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1a.c: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:09.000000000 +0200
+++ gcc/builtins.def	2007-09-06 10:19:24.000000000 +0200
@@ -665,6 +665,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_
 DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY, "va_copy", BT_FN_VOID_VALIST_REF_VALIST_ARG, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/tree.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree.h	2007-09-06 11:50:56.000000000 +0200
@@ -411,6 +411,8 @@ struct tree_common GTY(())
            VAR_DECL or FUNCTION_DECL or IDENTIFIER_NODE
        ASM_VOLATILE_P in
            ASM_EXPR
+       CALL_EXPR_VA_ARG_PACK in
+	  CALL_EXPR
        TYPE_CACHED_VALUES_P in
           ..._TYPE
        SAVE_EXPR_RESOLVED_P in
@@ -1066,6 +1068,11 @@ extern void omp_clause_range_check_faile
 #define SAVE_EXPR_RESOLVED_P(NODE) \
   (TREE_CHECK (NODE, SAVE_EXPR)->common.public_flag)
 
+/* Set on a CALL_EXPR if this stdarg call should be passed the argument
+   pack.  */
+#define CALL_EXPR_VA_ARG_PACK(NODE) \
+  (CALL_EXPR_CHECK(NODE)->common.public_flag)
+
 /* In any expression, decl, or constant, nonzero means it has side effects or
    reevaluation of the whole expression could produce a different value.
    This is set if any subexpression is a function call, a side effect or a
--- gcc/tree-inline.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/tree-inline.h	2007-09-06 10:19:24.000000000 +0200
@@ -57,6 +57,10 @@ typedef struct copy_body_data
   /* Current BLOCK.  */
   tree block;
 
+  /* CALL_EXPR if va arg parameter packs should be expanded or NULL
+     is not.  */
+  tree call_expr;
+
   /* Exception region the inlined call lie in.  */
   int eh_region;
   /* Take region number in the function being copied, add this value and
--- gcc/tree-inline.c.jj	2007-04-26 09:41:49.000000000 +0200
+++ gcc/tree-inline.c	2007-09-06 12:35:57.000000000 +0200
@@ -725,6 +725,22 @@ copy_bb (copy_body_data *id, basic_block
 
           bsi_insert_after (&copy_bsi, stmt, BSI_NEW_STMT);
 	  call = get_call_expr_in (stmt);
+	  if (call && CALL_EXPR_VA_ARG_PACK (call) && id->call_expr)
+	    {
+	      tree arglist, *a, p;
+	      TREE_OPERAND (call, 1) = copy_list (TREE_OPERAND (call, 1));
+
+	      for (a = &TREE_OPERAND (call, 1); *a; a = &TREE_CHAIN (*a))
+		;
+
+	      p = DECL_ARGUMENTS (id->src_fn);
+	      for (arglist = TREE_OPERAND (id->call_expr, 1);
+		   p; p = TREE_CHAIN (p), arglist = TREE_CHAIN (arglist))
+		;
+
+	      *a = copy_list (arglist);
+	      CALL_EXPR_VA_ARG_PACK (call) = 0;
+	    }
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
@@ -2085,6 +2101,7 @@ expand_call_inline (basic_block bb, tree
   /* Record the function we are about to inline.  */
   id->src_fn = fn;
   id->src_node = cg_edge->callee;
+  id->call_expr = t;
 
   initialize_inlined_parameters (id, args, TREE_OPERAND (t, 2), fn, bb);
 
--- gcc/builtins.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/builtins.c	2007-09-06 11:04:56.000000000 +0200
@@ -5979,6 +5979,12 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_ARGS_INFO:
       return expand_builtin_args_info (arglist);
 
+    case BUILT_IN_VA_ARG_PACK:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
@@ -9017,7 +9023,27 @@ fold_builtin_1 (tree fndecl, tree arglis
 {
   tree type = TREE_TYPE (TREE_TYPE (fndecl));
   enum built_in_function fcode;
+  tree a;
+
+  if (arglist)
+    {
+      for (a = arglist; TREE_CHAIN (a); a = TREE_CHAIN (a))
+	;
 
+      /* Before gimplification CALL_EXPR_VA_ARG_PACK is not set, but
+	 instead last argument is __builtin_va_arg_pack ().  Defer folding
+	 even in that case, until arguments are finalized.  */
+      if (TREE_CODE (TREE_VALUE (a)) == CALL_EXPR)
+	{
+	  tree fndecl2 = get_callee_fndecl (TREE_VALUE (a));
+	  if (fndecl2
+	      && TREE_CODE (fndecl2) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (fndecl2) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (fndecl2) == BUILT_IN_VA_ARG_PACK)
+	    return NULL_TREE;
+	}
+    }
+
   if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
     return targetm.fold_builtin (fndecl, arglist, ignore);
 
--- gcc/gimplify.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/gimplify.c	2007-09-06 11:42:01.000000000 +0200
@@ -2018,6 +2018,55 @@ gimplify_call_expr (tree *expr_p, tree *
   ret = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, NULL,
 		       is_gimple_call_addr, fb_rvalue);
 
+  if (ret != GS_ERROR && TREE_OPERAND (*expr_p, 1))
+    {
+      int nargs;
+
+      for (nargs = 1, arglist = TREE_OPERAND (*expr_p, 1);
+	   TREE_CHAIN (arglist);
+	   arglist = TREE_CHAIN (arglist))
+	nargs++;
+
+      if (TREE_CODE (TREE_VALUE (arglist)) == CALL_EXPR)
+	{
+	  tree last_arg = TREE_VALUE (arglist);
+	  tree last_arg_fndecl = get_callee_fndecl (last_arg);
+
+	  if (last_arg_fndecl
+	      && TREE_CODE (last_arg_fndecl) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (last_arg_fndecl) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (last_arg_fndecl) == BUILT_IN_VA_ARG_PACK)
+	    {
+	      tree p = NULL_TREE, *aptr;
+	      int i;
+
+	      if (decl && DECL_ARGUMENTS (decl))
+		p = DECL_ARGUMENTS (decl);
+	      else if (decl)
+		p = TYPE_ARG_TYPES (TREE_TYPE (decl));
+	      else if (POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (*expr_p, 0))))
+		p = TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE
+						(TREE_OPERAND (*expr_p, 0))));
+	      for (i = 0; p; p = TREE_CHAIN (p))
+		i++;
+
+	      if (i < nargs)
+		{
+		  TREE_OPERAND (*expr_p, 1)
+		    = copy_list (TREE_OPERAND (*expr_p, 1));
+
+		  for (aptr = &TREE_OPERAND (*expr_p, 1);
+		       TREE_CHAIN (*aptr);
+		       aptr = &TREE_CHAIN (*aptr))
+		    ;
+
+		  *aptr = NULL_TREE;
+		  CALL_EXPR_VA_ARG_PACK (*expr_p) = 1;
+		}
+	    }
+	}
+    }
+
   if (PUSH_ARGS_REVERSED)
     TREE_OPERAND (*expr_p, 1) = nreverse (TREE_OPERAND (*expr_p, 1));
   for (arglist = TREE_OPERAND (*expr_p, 1); arglist;
@@ -2037,7 +2086,7 @@ gimplify_call_expr (tree *expr_p, tree *
   if (ret != GS_ERROR)
     {
       decl = get_callee_fndecl (*expr_p);
-      if (decl && DECL_BUILT_IN (decl))
+      if (decl && DECL_BUILT_IN (decl) && !CALL_EXPR_VA_ARG_PACK (*expr_p))
 	{
 	  tree arglist = TREE_OPERAND (*expr_p, 1);
 	  tree new = fold_builtin (decl, arglist, !want_value);
--- gcc/fold-const.c.jj	2007-08-31 09:47:39.000000000 +0200
+++ gcc/fold-const.c	2007-09-06 11:40:55.000000000 +0200
@@ -10409,6 +10409,8 @@ fold (tree expr)
 	  op0 = TREE_OPERAND (t, 0);
 	  op1 = TREE_OPERAND (t, 1);
 	  op2 = TREE_OPERAND (t, 2);
+	  if (code == CALL_EXPR && CALL_EXPR_VA_ARG_PACK (t))
+	    return expr;
 	  tem = fold_ternary (code, type, op0, op1, op2);
 	  return tem ? tem : expr;
 	default:
--- gcc/expr.c.jj	2007-04-24 22:58:53.000000000 +0200
+++ gcc/expr.c	2007-09-06 10:19:24.000000000 +0200
@@ -7475,6 +7475,10 @@ expand_expr_real_1 (tree exp, rtx target
       return expand_expr (OBJ_TYPE_REF_EXPR (exp), target, tmode, modifier);
 
     case CALL_EXPR:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      if (CALL_EXPR_VA_ARG_PACK (exp))
+	error ("invalid use of %<__builtin_va_arg_pack ()%>");
       /* Check for a built-in function.  */
       if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
 	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
--- gcc/doc/extend.texi.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-06 10:19:25.000000000 +0200
@@ -552,6 +552,32 @@ the containing function.  You should spe
 returned by @code{__builtin_apply}.
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack ()
+This built-in function represents all anonymous arguments of an inline
+function.  It can be used only in inline functions which will be always
+inlined, never compiled as a separate function, such as those using
+ at code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+It must be only passed as last argument to some other function
+with variable arguments.  This is useful for writing small wrapper
+inlines for variable argument functions, when using preprocessor
+macros is undesirable.  For example:
+ at smallexample
+extern int myprintf (FILE *f, const char *format, ...);
+extern inline __attribute__ ((__gnu_inline__)) int
+myprintf (FILE *f, const char *format, ...)
+@{
+  int r = fprintf (f, "myprintf: ");
+  if (r < 0)
+    return r;
+  int s = fprintf (f, format, __builtin_va_arg_pack ());
+  if (s < 0)
+    return s;
+  return r + s;
+@}
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/tree-pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree-pretty-print.c	2007-09-06 10:24:51.000000000 +0200
@@ -1128,6 +1128,15 @@ dump_generic_node (pretty_printer *buffe
       op1 = TREE_OPERAND (node, 1);
       if (op1)
 	dump_generic_node (buffer, op1, spc, flags, false);
+      if (CALL_EXPR_VA_ARG_PACK (node))
+	{
+	  if (op1)
+	    {
+	      pp_character (buffer, ',');
+	      pp_space (buffer);
+	    }
+	  pp_string (buffer, "__builtin_va_arg_pack ()");
+	}
       pp_character (buffer, ')');
 
       op1 = TREE_OPERAND (node, 2);
--- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
@@ -0,0 +1,143 @@
+/* __builtin_va_arg_pack () builtin tests.  */
+
+#include <stdarg.h>
+
+extern void abort (void);
+
+int v1 = 8;
+long int v2 = 3;
+void *v3 = (void *) &v2;
+struct A { char c[16]; } v4 = { "foo" };
+long double v5 = 40;
+char seen[20];
+int cnt;
+
+__attribute__ ((noinline)) int
+foo1 (int x, int y, ...)
+{
+  int i;
+  long int l;
+  void *v;
+  struct A a;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt;
+  if (y != 6)
+    abort ();
+  i = va_arg (ap, int);
+  if (i != 5)
+    abort ();
+  switch (x)
+    {
+    case 0:
+      i = va_arg (ap, int);
+      if (i != 9 || v1 != 9)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      v = (void *) va_arg (ap, struct A *);
+      if (v != (void *) &v4)
+	abort ();
+      l = va_arg (ap, long int);
+      if (l != 3 || v2 != 4)
+	abort ();
+      break;
+    case 1:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != ld)
+	abort ();
+      i = va_arg (ap, int);
+      if (i != 8)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x;
+}
+
+__attribute__ ((noinline)) int
+foo2 (int x, int y, ...)
+{
+  long long int ll;
+  void *v;
+  struct A a, b;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt | 64;
+  if (y != 10)
+    abort ();
+  switch (x)
+    {
+    case 11:
+      break;
+    case 12:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != 40)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      b = va_arg (ap, struct A);
+      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      ll = va_arg (ap, long long int);
+      if (ll != 16LL)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x + 8;
+}
+
+__attribute__ ((noinline)) int
+foo3 (void)
+{
+  return 6;
+}
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+bar (int x, ...)
+{
+  if (x < 10)
+    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
+  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  if (bar (0, ++v1, v4, &v4, v2++) != 0)
+    abort ();
+  if (bar (1, ++v5, 8, v3) != 1)
+    abort ();
+  if (bar (2) != 2)
+    abort ();
+  if (bar (v1 + 2) != 19)
+    abort ();
+  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1.c	2007-09-06 12:52:00.000000000 +0200
@@ -0,0 +1,46 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+extern inline __attribute__((always_inline)) int
+f2 (int y, ...)
+{
+  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f3 (int y, ...)
+{
+  return bar (y, "", 5, __builtin_va_arg_pack ());
+}
+
+extern inline __attribute__((always_inline)) int
+f4 (int y, ...)
+{
+  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f5 (int y, ...)
+{
+  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f6 (int y, ...)
+{
+  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
+}
+
+int
+test (void)
+{
+  int a = f2 (5, "a", 6);
+  a += f3 (6, "ab", 17LL);
+  a += f4 (7, 1, 2, 3);
+  a += f5 (8, 7L);
+  a += f6 (9);
+  return a;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1a.c.jj	2007-09-06 12:51:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1a.c	2007-09-06 12:52:09.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+int
+f1 (int x, ...)
+{
+  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gcc41.spec	1 Sep 2007 09:50:08 -0000	1.162
+++ gcc41.spec	6 Sep 2007 12:30:25 -0000	1.163
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 20
+%define gcc_release 21
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -145,6 +145,9 @@
 Patch31: gcc41-c++-gnu_inline.patch
 Patch32: gcc41-ppc-sync-qihi.patch
 Patch33: gcc41-ppc64-ia64-GNU-stack.patch
+Patch34: gcc41-builtin-chk-anticipated.patch
+Patch35: gcc41-builtin-throw.patch
+Patch36: gcc41-builtin-va-arg-pack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -461,6 +464,9 @@
 %patch31 -p0 -b .c++-gnu_inline~
 %patch32 -p0 -b .ppc-sync-qihi~
 %patch33 -p0 -b .ppc64-ia64-GNU-stack~
+%patch34 -p0 -b .builtin-chk-anticipated~
+%patch35 -p0 -b .builtin-throw~
+%patch36 -p0 -b .builtin-va-arg-pack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1615,6 +1621,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21.fc7
+- backport __builtin_va_arg_pack () support
+- make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked
+  and __builtin___{,v}{,f}printf_chk can throw
+- handle __*_chk builtins without __builtin_ in the name as anticipated in
+  C++
+
 * Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20.fc7
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)



From fedora-extras-commits at redhat.com  Thu Sep  6 12:33:16 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:33:16 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.12,1.13
Message-ID: <200709061233.l86CXGqt008226@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8175

Modified Files:
	MultiLib.py 
Log Message:
- multi-lib resolver needs to work in testing repos and be
able to copy new multi-lib deps from stable in order to avoid
broken deps



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MultiLib.py	8 Mar 2007 12:02:18 -0000	1.12
+++ MultiLib.py	6 Sep 2007 12:33:13 -0000	1.13
@@ -108,12 +108,12 @@
             hdr = rpmUtils.miscutils.hdrFromPackage(ts,srpmloc)
             excludearch = hdr['excludearch']
         except rpmUtils.RpmUtilsError, e:  # source rpm not there or bad
-            print 'ERROR: %s' % e
+            print 'ERROR: %s' % ''.join(e)
             print srpmloc
             print 'referenced by: %s' % fname
             # TODO: We don't want such builds! Do something about it.
-            # Is this case possible at all? Or only during dep resolving
-            # and when running into old pkgs?
+            # This is normal for multi-lib, where a test update pulls in
+            # deps from stable as long as it stays in updates-testing.
             srcrpm = None
             excludearch = []
         
@@ -172,8 +172,6 @@
         self.resolved = {}
         self.seenbefore = []
         self.needed = {}
-        self.needed['rpms'] = []
-        self.needed['debug'] = []
 
     def readMetadata(self):
         self.doRepoSetup()
@@ -182,18 +180,22 @@
             self.repos.populateSack(which=[repo.id], with='filelists')
 
     def addNeededPkg(self,pkg):
+        self.needed.setdefault(pkg.repoid,{})
+        self.needed[pkg.repoid].setdefault('rpms',[])
+        self.needed[pkg.repoid].setdefault('debug',[])
+        
         (n,a,e,v,r) = pkg.returnPackageTuple()
         file = '%s-%s-%s.%s.rpm' % (n,v,r,a)
-        if file not in self.needed['rpms']:
-            self.needed['rpms'].append(file)
+        if file not in self.needed[pkg.repoid]['rpms']:
+            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['debug']:
-                self.needed['debug'].append(debugrpm)
+            if debugrpm not in self.needed[pkg.repoid]['debug']:
+                self.needed[pkg.repoid]['debug'].append(debugrpm)
                 print ' +', debugrpm
 
     def resolveRequires(self,pkg):
@@ -240,15 +242,22 @@
         return False
     missingdict[targetarch].setdefault('rpms',[])
     missingdict[targetarch].setdefault('debug',[])
-    
+
+    dotesting = dist.startswith('testing/')
+    testdist = dist
+    if dotesting:
+        dist = dist.replace('testing/','')
+
     rs = RepoSupport.RepoSupport(cfg)
     conf = rs.GenerateConfig([dist])
 
     repoids = []
     srcarch = rpmUtils.arch.getBaseArch( rpmUtils.arch.multilibArches[targetarch][0] )
-    # Only look at basearch repo.
     a = srcarch
-    for r in rs.ReleaseRepoList(dist):
+    repolist = rs.ReleaseRepoList(dist)
+    if dotesting:
+        repolist += rs.TestRepoList(dist)
+    for r in repolist:
         if r.find(cfg.project) < 0:  # only look at our project's repos
             continue
         repoids.append(rs.RepoId(r,dist,a))
@@ -256,7 +265,7 @@
 
     # Only look at multicompat packages.
     my = Resolver(arch = srcarch, config = conf,
-                  pushcfg=cfg, dist=dist, targetarch=targetarch)
+                  pushcfg=cfg, dist=testdist, targetarch=targetarch)
     os.remove(conf)
     for repo in my.repos.repos.values():
         if repo.id not in repoids:
@@ -278,7 +287,7 @@
     Utils.fix_mdcache_access(cfg.rundir,cfg.cachedir)
 
     ts = rpmUtils.transaction.initReadOnlyTransaction()
-    compatrepodir = os.path.join(cfg.treedir,dist,srcarch)
+    compatrepodir = os.path.join(cfg.treedir,testdist,srcarch)
     for f in missingdict[targetarch]['rpms']:
         print f
         fpath = os.path.join(compatrepodir,f)
@@ -287,19 +296,41 @@
 
     changed = False
     print 'Installing needed packages for %s:' % targetarch
-    for f in my.needed['rpms']+missingdict[targetarch]['rpms']:
-        srcfile = os.path.join(cfg.treedir,dist,srcarch,f)
-        destfile = os.path.join(cfg.treedir,dist,targetarch,f)
+
+    def addrpm(f,src,dest):
+        srcfile = os.path.join(src,f)
+        destfile = os.path.join(dest,f)
+        if not os.path.exists(srcfile):
+            print 'WARNING: missing', srcfile
+            return False
         if not os.path.exists(destfile):  # silent extra-check
+            print 'Adding:', destfile
             Utils.install_link_or_copy(srcfile,destfile)
+            return True
+        else:
+            return False
+
+    destreporoot = os.path.join(cfg.treedir,testdist,targetarch)
+    srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+    for f in missingdict[targetarch]['rpms']:
+        if addrpm(f,srcreporoot,destreporoot):
             changed = True
-    for f in my.needed['debug']:
-        srcfile = os.path.join(cfg.treedir,dist,srcarch,'debug',f)
-        destfile = os.path.join(cfg.treedir,dist,targetarch,'debug',f)
-        if os.path.exists(srcfile):
-            if not os.path.exists(destfile):  # silent extra-check
-                Utils.install_link_or_copy(srcfile,destfile)
+    
+    for repoid in my.needed.keys():
+        if repoid.find('testing')<0:
+            # Make available new multi-lib deps from non-testing repo.
+            srcreporoot = os.path.join(cfg.treedir,dist,srcarch)
+        else:
+            srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+        for f in my.needed[repoid]['rpms']:
+            if addrpm(f,srcreporoot,destreporoot):
+                changed = True
+        destdebugreporoot = os.path.join(destreporoot,'debug')
+        srcdebugreporoot = os.path.join(srcreporoot,'debug')
+        for f in my.needed[repoid]['debug']:
+            if addrpm(f,srcdebugreporoot,destdebugreporoot):
                 changed = True
+
     print 'done.'
         
     return changed



From fedora-extras-commits at redhat.com  Thu Sep  6 12:37:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 08:37:33 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.125,
	1.126 libselinux.spec, 1.282, 1.283
Message-ID: <200709061237.l86CbXec008388@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8354

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- libselinux-rhat.patch	3 Aug 2007 20:06:53 -0000	1.125
+++ libselinux-rhat.patch	6 Sep 2007 12:37:00 -0000	1.126
@@ -1,12 +1,46 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.24/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.24/src/matchpathcon.c	2007-07-23 10:21:34.000000000 -0400
-@@ -65,7 +65,7 @@
- #ifdef __GNUC__
-     __attribute__ ((format(printf, 1, 2)))
- #endif
--    (*myprintf) (const char *fmt,...);
-+    (*myprintf) (const char *fmt,...) = &default_printf;
- 
- void set_matchpathcon_printf(void (*f) (const char *fmt, ...))
- {
+Index: libselinux/src/selinuxswig_python.i
+===================================================================
+--- libselinux/src/selinuxswig_python.i	(revision 2549)
++++ libselinux/src/selinuxswig_python.i	(working copy)
+@@ -98,4 +98,41 @@
+ 	}
+ }
+ 
++%typemap(in) char * const [] {
++	int i, size;
++	PyObject * s;
++
++	if (!PySequence_Check($input)) {
++		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
++		return NULL;
++	}
++
++	size = PySequence_Size($input);
++	
++	$1 = (char**) malloc(size + 1);
++
++	for(i = 0; i < size; i++) {
++		if (!PyString_Check(PySequence_GetItem($input, i))) {
++			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
++			return NULL;
++		}
++	}
++		
++	for(i = 0; i < size; i++) {
++		s = PySequence_GetItem($input, i);
++		$1[i] = (char*) malloc(PyString_Size(s) + 1);
++		strcpy($1[i], PyString_AsString(s));
++	}
++	$1[size] = NULL;
++}
++
++%typemap(freearg,match="in") char * const [] {
++	int i = 0;
++	while($1[i]) {
++		free($1[i]);
++		i++;
++	}
++	free($1);
++}
++
+ %include "selinuxswig.i"


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- libselinux.spec	28 Aug 2007 15:27:49 -0000	1.282
+++ libselinux.spec	6 Sep 2007 12:37:00 -0000	1.283
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.31
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -122,6 +124,9 @@
 
 %changelog
 
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
+- Apply James Athway patch to fix rpm_execcon python binding
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-3
 - Move libselinux.so back into main package, breaks procps
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:46:22 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 08:46:22 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1301,1.1302
Message-ID: <200709061246.l86CkMi6008558@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8530

Modified Files:
	openoffice.org.spec 
Log Message:
shite, forgot libsoffice.so


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -r1.1301 -r1.1302
--- openoffice.org.spec	6 Sep 2007 12:23:17 -0000	1.1301
+++ openoffice.org.spec	6 Sep 2007 12:45:50 -0000	1.1302
@@ -1942,7 +1942,7 @@
 %{instdir}/program/setofficelang*
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
-%{instdir}/program/libsoffice.so
+#%{instdir}/program/libsoffice.so
 %{instdir}/program/sofficerc
 %{instdir}/program/spadmin
 %{instdir}/program/spadmin.bin



From fedora-extras-commits at redhat.com  Thu Sep  6 12:55:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:55:03 -0400
Subject: extras-buildsys/utils/pushscript RepoSupport.py,1.5,1.6
Message-ID: <200709061255.l86Ct33c009415@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9397

Modified Files:
	RepoSupport.py 
Log Message:
refresh metadata sooner


Index: RepoSupport.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoSupport.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepoSupport.py	6 Sep 2007 12:23:58 -0000	1.5
+++ RepoSupport.py	6 Sep 2007 12:55:00 -0000	1.6
@@ -83,6 +83,7 @@
 reposdir=/dev/null
 exactarch=1
 obsoletes=1
+metadata_expire=300
 retries=20
 
 """ % (cachedir)



From fedora-extras-commits at redhat.com  Thu Sep  6 13:23:24 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 09:23:24 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.13,1.14
Message-ID: <200709061323.l86DNOro015717@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15699

Modified Files:
	MultiLib.py 
Log Message:
consider that testing requires stable


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MultiLib.py	6 Sep 2007 12:33:13 -0000	1.13
+++ MultiLib.py	6 Sep 2007 13:23:21 -0000	1.14
@@ -320,14 +320,22 @@
         if repoid.find('testing')<0:
             # Make available new multi-lib deps from non-testing repo.
             srcreporoot = os.path.join(cfg.treedir,dist,srcarch)
+            addfromext = True
         else:
             srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+            addfromext = False
         for f in my.needed[repoid]['rpms']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,f)):
+                    continue
             if addrpm(f,srcreporoot,destreporoot):
                 changed = True
         destdebugreporoot = os.path.join(destreporoot,'debug')
         srcdebugreporoot = os.path.join(srcreporoot,'debug')
         for f in my.needed[repoid]['debug']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,'debug',f)):
+                    continue
             if addrpm(f,srcdebugreporoot,destdebugreporoot):
                 changed = True
 



From fedora-extras-commits at redhat.com  Thu Sep  6 13:29:33 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:29:33 -0400
Subject: rpms/system-config-vsftpd/devel system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061329.l86DTXdx015930@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15907

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:29:00 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:29:00 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:43:08 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:43:08 -0400
Subject: rpms/system-config-vsftpd/F-7 system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061343.l86Dh8vI016272@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16239

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:42:36 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:42:36 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:48:58 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 09:48:58 -0400
Subject: rpms/kbackup/devel kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 kbackup.spec, 1.11, 1.12 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061348.l86Dmw0q016538@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16402

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
----------------------------------------------------------------------


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 13:48:25 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kbackup.spec	21 Aug 2007 16:56:54 -0000	1.11
+++ kbackup.spec	6 Sep 2007 13:48:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	8%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -8,9 +8,8 @@
 License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,11 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-8
   - Licence tag clarification
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 13:48:25 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 13:50:39 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:50:39 -0400
Subject: rpms/system-config-vsftpd/FC-6 system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061350.l86DodxT016649@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:50:07 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:50:07 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:58:25 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 09:58:25 -0400
Subject: rpms/kbackup/F-7 kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 kbackup.spec, 1.10, 1.11 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061358.l86DwPcO016862@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16823

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
  - Licence tag clarification


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 13:57:53 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/kbackup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kbackup.spec	12 Jul 2007 12:34:22 -0000	1.10
+++ kbackup.spec	6 Sep 2007 13:57:53 -0000	1.11
@@ -1,16 +1,15 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
 Group:		Applications/Archiving
-License:	GPL
+License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,12 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+  - Licence tag clarification
+
 * Thu Jul 12 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-7
   - Disable parallel building until this is fixed by upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 13:57:53 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 14:00:58 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 10:00:58 -0400
Subject: rpms/kbackup/FC-6 kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 kbackup.spec, 1.8, 1.9 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061400.l86E0wEe016976@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16948

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
  - Licence tag clarification


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 14:00:25 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/kbackup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kbackup.spec	12 Jul 2007 12:36:37 -0000	1.8
+++ kbackup.spec	6 Sep 2007 14:00:25 -0000	1.9
@@ -1,16 +1,15 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
 Group:		Applications/Archiving
-License:	GPL
+License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,12 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+  - Licence tag clarification
+
 * Thu Jul 12 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-7
   - Disable parallel building until this is fixed by upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 14:00:25 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 14:15:55 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 10:15:55 -0400
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.8,1.9
Message-ID: <200709061415.l86EFtQS023250@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226

Modified Files:
	ocaml-findlib.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-14
- Ignore Parsetree module, it's a part of the toplevel.



Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-findlib.spec	3 Sep 2007 17:14:46 -0000	1.8
+++ ocaml-findlib.spec	6 Sep 2007 14:15:23 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.1.2pl1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -23,7 +23,7 @@
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-14
+- Ignore Parsetree module, it's a part of the toplevel.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
 - Bump version to force rebuild against ocaml -6 release.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:48 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 10:26:48 -0400
Subject: rpms/firefox/devel firefox.spec,1.193,1.194
Message-ID: <200709061426.l86EQm8r023744@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23708

Modified Files:
	firefox.spec 
Log Message:
* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
- Fix default page for all locales



Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- firefox.spec	29 Aug 2007 17:03:19 -0000	1.193
+++ firefox.spec	6 Sep 2007 14:26:15 -0000	1.194
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -192,7 +192,14 @@
 %endif
 
 # set up our default bookmarks
-cp %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
+%{__cp} %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
+
+# set up our default homepage
+%{__cat} >> %{SOURCE12} << EOF
+pref("browser.startup.homepage", "%{homepage}");
+pref("startup.homepage_override_url", "%{homepage}");
+pref("startup.homepage_welcome_url", "%{homepage}");
+EOF
 
 
 #---------------------------------------------------------------------
@@ -431,6 +438,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
+- Fix default page for all locales
+
 * Wed Aug 29 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-5
 - Tweak the default home page
 



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:53 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:26:53 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchbugzilla
Message-ID: <200709061426.l86EQt4C030478@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:54 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:26:54 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061426.l86EQtV9030490@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:01 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:01 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchbugzilla
Message-ID: <200709061427.l86ER1Ra030503@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchbugzilla acl on knetworkmanager (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:02 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:02 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061427.l86ER7at030512@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:07 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:07 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested commit
Message-ID: <200709061427.l86ER78o030530@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the commit acl on knetworkmanager (Fedora 5)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:06 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:06 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061427.l86ER7E6030521@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora 5)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:12 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:12 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested commit
Message-ID: <200709061427.l86ERC5Q030541@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the commit acl on knetworkmanager (Fedora 6)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:51 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 10:27:51 -0400
Subject: rpms/mash/devel .cvsignore, 1.14, 1.15 mash.spec, 1.12, 1.13 sources,
	1.15, 1.16
Message-ID: <200709061427.l86ERpMr023820@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23796

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Sep 2007 19:08:16 -0000	1.14
+++ .cvsignore	6 Sep 2007 14:27:19 -0000	1.15
@@ -1 +1 @@
-mash-0.2.2.tar.gz
+mash-0.2.3.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mash.spec	4 Sep 2007 19:08:16 -0000	1.12
+++ mash.spec	6 Sep 2007 14:27:19 -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:           mash
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.2.3-1
+- blacklist java-1.7.0-icedtea-devel (#271761)
+
 * Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.2-1
 - add nspluginwrapper to multilib whitelist (#275021)
 - fix kernel-devel (#247321)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Sep 2007 19:08:16 -0000	1.15
+++ sources	6 Sep 2007 14:27:19 -0000	1.16
@@ -1 +1 @@
-a667f16ef419392f001cc012e1ce95be  mash-0.2.2.tar.gz
+e3da610758f7d1c7ce5568dc44746541  mash-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 14:30:33 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 10:30:33 -0400
Subject: rpms/firefox/devel firefox-redhat-default-prefs.js,1.8,1.9
Message-ID: <200709061430.l86EUXQw023929@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23897

Modified Files:
	firefox-redhat-default-prefs.js 
Log Message:
* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
- Fix default page for all locales



Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- firefox-redhat-default-prefs.js	10 Apr 2007 20:27:00 -0000	1.8
+++ firefox-redhat-default-prefs.js	6 Sep 2007 14:30:01 -0000	1.9
@@ -2,9 +2,6 @@
 pref("app.update.autoInstallEnabled", false);
 pref("browser.display.use_system_colors",   true);
 pref("browser.link.open_external",          3);
-pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_override_url", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_welcome_url", "file:///usr/share/doc/HTML/index.html");
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");



From fedora-extras-commits at redhat.com  Thu Sep  6 14:34:29 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 6 Sep 2007 10:34:29 -0400
Subject: devel/yum-updatesd yum-updatesd.spec,1.2,1.3
Message-ID: <200709061434.l86EYTMu024158@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24139

Modified Files:
	yum-updatesd.spec 
Log Message:
add source url


Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-updatesd.spec	5 Sep 2007 23:36:21 -0000	1.2
+++ yum-updatesd.spec	6 Sep 2007 14:33:56 -0000	1.3
@@ -5,7 +5,7 @@
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.bz2
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
 BuildRequires: python



From fedora-extras-commits at redhat.com  Thu Sep  6 14:46:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 10:46:55 -0400
Subject: rpms/gnash/devel gnash.spec,1.8,1.9
Message-ID: <200709061446.l86EktPq024535@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24476

Modified Files:
	gnash.spec 
Log Message:
agg is now the default renderer


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnash.spec	6 Sep 2007 11:56:09 -0000	1.8
+++ gnash.spec	6 Sep 2007 14:46:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@
 # modular Xorg 
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
+BuildRequires:  agg-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
@@ -166,8 +167,9 @@
 #%{_bindir}/cygnal
 
 %changelog
-* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
+- agg is now the default renderer
 
 * Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
 - rebuild for boost soname change



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:15 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:15 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnGqJ030736@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora devel) to Approved for Roland Wolters (liquidat)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:30 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:30 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnUJH030750@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora 7) to Approved for Roland Wolters (liquidat)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:32 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:32 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnWiK030759@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 7) to Approved for Roland Wolters (liquidat)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:39 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:39 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnebO030769@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 5) to Approved for Roland Wolters (liquidat)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:45 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:45 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnjNZ030778@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 6) to Approved for Roland Wolters (liquidat)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 15:00:03 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 11:00:03 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.47,
	1.48 selinux-policy.spec, 1.514, 1.515
Message-ID: <200709061500.l86F031i026973@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26942

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
- Define user_home_type as home_type


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- policy-20070703.patch	6 Sep 2007 02:24:18 -0000	1.47
+++ policy-20070703.patch	6 Sep 2007 15:00:00 -0000	1.48
@@ -368,6 +368,41 @@
 +	hal_use_fds(alsa_t)
 +	hal_write_log(alsa_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.7/policy/modules/admin/amanda.if
+--- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-29 14:10:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 10:18:35.000000000 -0400
+@@ -71,6 +71,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Search amanda var library directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`amanda_search_var_lib',`
++	gen_require(`
++		type amanda_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 amanda_var_lib_t:dir search_dir_perms;
++
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to read /etc/dumpdates.
+ ## </summary>
+ ## <param name="domain">
+@@ -141,3 +161,4 @@
+ 
+ 	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-08-28 15:53:39.000000000 -0400
@@ -4634,7 +4669,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 10:19:10.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -4724,7 +4759,7 @@
  ifdef(`distro_debian',`
  	optional_policy(`
  		# Debian logcheck has the home dir set to its cache
-@@ -180,6 +201,15 @@
+@@ -180,11 +201,24 @@
  	locallogin_link_keys(crond_t)
  ')
  
@@ -4740,7 +4775,16 @@
  tunable_policy(`fcron_crond', `
  	allow crond_t system_cron_spool_t:file manage_file_perms;
  ')
-@@ -239,7 +269,6 @@
+ 
+ optional_policy(`
++	amanda_search_var_lib(crond_t)
++')
++
++optional_policy(`
+ 	amavis_search_lib(crond_t)
+ ')
+ 
+@@ -239,7 +273,6 @@
  allow system_crond_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file)
  
@@ -4748,7 +4792,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
-@@ -249,6 +278,8 @@
+@@ -249,6 +282,8 @@
  # for this purpose.
  allow system_crond_t system_cron_spool_t:file entrypoint;
  
@@ -4757,7 +4801,7 @@
  # Permit a transition from the crond_t domain to this domain.
  # The transition is requested explicitly by the modified crond 
  # via setexeccon.  There is no way to set up an automatic
-@@ -270,9 +301,16 @@
+@@ -270,9 +305,16 @@
  filetrans_pattern(system_crond_t,crond_tmp_t,system_crond_tmp_t,{ file lnk_file })
  files_tmp_filetrans(system_crond_t,system_crond_tmp_t,file)
  
@@ -4775,7 +4819,7 @@
  
  kernel_read_kernel_sysctls(system_crond_t)
  kernel_read_system_state(system_crond_t)
-@@ -326,7 +364,7 @@
+@@ -326,7 +368,7 @@
  init_read_utmp(system_crond_t)
  init_dontaudit_rw_utmp(system_crond_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -4784,7 +4828,7 @@
  
  libs_use_ld_so(system_crond_t)
  libs_use_shared_libs(system_crond_t)
-@@ -334,6 +372,7 @@
+@@ -334,6 +376,7 @@
  libs_exec_ld_so(system_crond_t)
  
  logging_read_generic_logs(system_crond_t)
@@ -4792,7 +4836,7 @@
  logging_send_syslog_msg(system_crond_t)
  
  miscfiles_read_localization(system_crond_t)
-@@ -384,6 +423,14 @@
+@@ -384,6 +427,14 @@
  ')
  
  optional_policy(`
@@ -4807,7 +4851,7 @@
  	mrtg_append_create_logs(system_crond_t)
  ')
  
-@@ -424,8 +471,7 @@
+@@ -424,8 +475,7 @@
  ')
  
  optional_policy(`
@@ -4817,7 +4861,7 @@
  ')
  
  optional_policy(`
-@@ -433,9 +479,13 @@
+@@ -433,9 +483,13 @@
  ')
  
  optional_policy(`
@@ -12585,7 +12629,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-05 22:07:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 10:57:49.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13255,15 +13299,11 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1852,21 +1935,57 @@
+@@ -1856,17 +1939,53 @@
+ ##	</summary>
  ## </param>
- ## <param name="domain">
- ##	<summary>
--##	Domain to not audit
-+##	Domain to not audit
-+##	</summary>
-+## </param>
-+#
+ #
+-template(`userdom_dontaudit_list_user_home_dirs',`
 +template(`userdom_dontaudit_list_user_home_dirs',`
 +	gen_require(`
 +		type $1_home_dir_t;
@@ -13296,10 +13336,9 @@
 +## <param name="domain">
 +##	<summary>
 +##	Domain allowed access.
- ##	</summary>
- ## </param>
- #
--template(`userdom_dontaudit_list_user_home_dirs',`
++##	</summary>
++## </param>
++#
 +template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
 -		type $1_home_dir_t;
@@ -13378,7 +13417,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5695,297 @@
+@@ -5559,3 +5695,299 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -13633,8 +13672,10 @@
 +interface(`userdom_user_home_type',`
 +	gen_require(`
 +		attribute user_home_type;
++		attribute home_type;
 +	')
 +	typeattribute $1 user_home_type;
++	typeattribute $1 home_type;
 +')
 +
 +########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- selinux-policy.spec	6 Sep 2007 02:24:18 -0000	1.514
+++ selinux-policy.spec	6 Sep 2007 15:00:00 -0000	1.515
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
+- Define user_home_type as home_type
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
 - Allow sendmail to create etc_aliases_t
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:05:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 11:05:40 -0400
Subject: rpms/mash/F-7 mash-multilib.patch,NONE,1.1 mash.spec,1.6,1.7
Message-ID: <200709061505.l86F5eiQ000667@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv626

Modified Files:
	mash.spec 
Added Files:
	mash-multilib.patch 
Log Message:
backport multilib fixes


mash-multilib.patch:

--- NEW FILE mash-multilib.patch ---
--- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
+++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
@@ -87,18 +109,18 @@
         self.name = 'devel'
     
     def select(self, po):
-        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
+        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
         whitelist = ['perl']
         if po.name in blacklist:
             return False
-        if po.name.startswith('kernel'):
-            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
-                if p_name == 'kernel-devel':
-                    return False
         if po.name in whitelist:
             return True
         if RuntimeMultilibMethod.select(self,po):
             return True
+        if po.name.startswith('kernel'):
+            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
+                if p_name == 'kernel-devel':
+                    return False
         if po.name.endswith('-devel'):
             return True
         return False


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mash.spec	21 Jun 2007 17:30:43 -0000	1.6
+++ mash.spec	6 Sep 2007 15:05:07 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -12,6 +12,7 @@
 Requires:       yum, createrepo, koji
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch:		mash-multilib.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{__python} setup.py build
@@ -43,6 +45,9 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.1.18-2
+- backport some multilib fixes from HEAD (#247321, #271761)
+
 * Thu Jun 21 2007 Bill Nottingham <notting at redhat.com> 0.1.18-1
 - pull in cyrus-sasl plugins (#245176)
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:07:08 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 6 Sep 2007 11:07:08 -0400
Subject: rpms/ejabberd/F-7 .cvsignore, 1.4, 1.5 ejabberd.spec, 1.12,
	1.13 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709061507.l86F78II000764@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv731

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:21:08 -0000	1.4
+++ .cvsignore	6 Sep 2007 15:06:36 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ejabberd.spec	4 Sep 2007 12:42:20 -0000	1.12
+++ ejabberd.spec	6 Sep 2007 15:06:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 12:50:20 -0000	1.2
+++ mod_ctlextra.erl	6 Sep 2007 15:06:36 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:21:08 -0000	1.4
+++ sources	6 Sep 2007 15:06:36 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 15:13:15 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 11:13:15 -0400
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.7, 1.8 phpMyAdmin.htaccess, 1.1,
	1.2 phpMyAdmin.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061513.l86FDF0u001093@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1022

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jul 2007 13:20:29 -0000	1.7
+++ .cvsignore	6 Sep 2007 15:12:42 -0000	1.8
@@ -1 +1 @@
-phpMyAdmin-2.10.3-all-languages.tar.bz2
+phpMyAdmin-2.11.0-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 15:12:42 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 15:12:42 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 15:12:42 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 15:32:20 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:32:20 -0400
Subject: rpms/ocaml-expat/devel ocaml-expat.spec,1.4,1.5
Message-ID: <200709061532.l86FWKXT001573@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-expat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	ocaml-expat.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-8
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-expat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-expat/devel/ocaml-expat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-expat.spec	30 Aug 2007 09:30:13 -0000	1.4
+++ ocaml-expat.spec	6 Sep 2007 15:31:47 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-expat
 Version:        0.9.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml wrapper for the Expat XML parsing library
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath
 BuildRequires:  util-linux-ng, gawk
 
 %define _use_internal_dependency_generator 0
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-8
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:33:43 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:33:43 -0400
Subject: rpms/ocaml-pcre/devel ocaml-pcre.spec,1.3,1.4
Message-ID: <200709061533.l86FXhfo001675@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Modified Files:
	ocaml-pcre.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-8
- Force rebuild because of base OCaml.



Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-pcre.spec	30 Aug 2007 09:31:27 -0000	1.3
+++ ocaml-pcre.spec	6 Sep 2007 15:33:11 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pcre
 Version:        5.11.4
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, pcre-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, pcre-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -87,6 +88,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-8
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:35:11 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:35:11 -0400
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.4,1.5
Message-ID: <200709061535.l86FZBHM001826@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ulex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1733

Modified Files:
	ocaml-ulex.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-ulex.spec	30 Aug 2007 09:32:46 -0000	1.4
+++ ocaml-ulex.spec	6 Sep 2007 15:34:38 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ulex
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml lexer generator for Unicode
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml = 3.10.0, ocaml-findlib-devel, ocaml-camlp4-devel
+BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib-devel, ocaml-camlp4-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:36:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:36:42 -0400
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.2,1.3
Message-ID: <200709061536.l86Fag0b001981@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xml-light/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891

Modified Files:
	ocaml-xml-light.spec 
Log Message:
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-xml-light.spec	30 Aug 2007 09:33:23 -0000	1.2
+++ ocaml-xml-light.spec	6 Sep 2007 15:36:09 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimal XML parser and printer for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-4
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-3
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:38:10 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:38:10 -0400
Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.2,1.3
Message-ID: <200709061538.l86FcAY9002106@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2049

Modified Files:
	ocaml-curses.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-5.20020319
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-curses.spec	30 Aug 2007 09:29:36 -0000	1.2
+++ ocaml-curses.spec	6 Sep 2007 15:37:38 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           ocaml-curses
 Version:        0.1
-Release:        4.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        OCaml bindings for ncurses
 
 Group:          Development/Libraries
@@ -20,7 +20,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ncurses-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ncurses-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-5.20020319
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-4.20020319
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:39:53 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:39:53 -0400
Subject: rpms/ocaml-extlib/devel ocaml-extlib.spec,1.2,1.3
Message-ID: <200709061539.l86Fdrsn002182@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-extlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2161

Modified Files:
	ocaml-extlib.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-7
- Force rebuild because of base OCaml.



Index: ocaml-extlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-extlib.spec	30 Aug 2007 09:30:49 -0000	1.2
+++ ocaml-extlib.spec	6 Sep 2007 15:39:20 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-extlib
 Version:        1.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml ExtLib additions to the standard library
 
 Group:          Development/Libraries
@@ -16,7 +16,8 @@
 Patch0:         extlib-ocamldoc-debian.patch
 Patch1:         extlib-install.patch
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -113,6 +114,12 @@
 %{_libdir}/ocaml/extlib/*.ml
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-7
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-6
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:41:38 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:41:38 -0400
Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.3,1.4
Message-ID: <200709061541.l86FfcBW002282@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ssl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211

Modified Files:
	ocaml-ssl.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-5
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-ssl.spec	30 Aug 2007 09:32:10 -0000	1.3
+++ ocaml-ssl.spec	6 Sep 2007 15:41:06 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ssl
 Version:        0.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SSL bindings for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, openssl-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, openssl-devel
 BuildRequires:  gawk
 Requires:       openssl
 
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-5
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:41:50 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:41:50 -0400
Subject: rpms/ocaml-calendar/devel ocaml-calendar.spec,1.2,1.3
Message-ID: <200709061541.l86FfoTc002331@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2237

Modified Files:
	ocaml-calendar.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-9
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-8
- Force rebuild because of base OCaml.



Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-calendar.spec	30 Aug 2007 09:27:46 -0000	1.2
+++ ocaml-calendar.spec	6 Sep 2007 15:41:18 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-calendar
 Version:        1.10
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml >= 3.06, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -79,6 +80,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-9
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-8
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:42:03 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 11:42:03 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.480,1.481
Message-ID: <200709061542.l86Fg3l2002374@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2246

Modified Files:
	eclipse.spec 
Log Message:
* 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.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- eclipse.spec	5 Sep 2007 20:28:17 -0000	1.480
+++ eclipse.spec	6 Sep 2007 15:41:30 -0000	1.481
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        15%{?dist} 
+Release:        16%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -556,7 +556,6 @@
   find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
-%if %{gcj_support}
 # remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
 for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
   version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
@@ -570,7 +569,6 @@
   linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
   sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
 done
-%endif
 
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.31.jar
@@ -672,17 +670,10 @@
 # Build the rest of Eclipse
 export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
 export JAVA_HOME=%{java_home}
-%if %{gcj_support}
 ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-%else
-ant \
-  -Dnobootstrap=true \
-  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-  -Dlibsconfig=true -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-%endif
 
 ## Build the FileInitializer application
 SDK=$(cd eclipse && pwd)
@@ -1573,6 +1564,9 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Sep  6 15:48:39 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 6 Sep 2007 11:48:39 -0400
Subject: rpms/git/devel .cvsignore, 1.43, 1.44 git.spec, 1.37, 1.38 sources, 
	1.43, 1.44
Message-ID: <200709061548.l86FmdaN002632@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2598

Modified Files:
	.cvsignore git.spec sources 
Log Message:
* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
- git-1.5.3.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	24 Aug 2007 00:28:24 -0000	1.43
+++ .cvsignore	6 Sep 2007 15:48:06 -0000	1.44
@@ -1 +1 @@
-git-1.5.2.5.tar.gz
+git-1.5.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- git.spec	24 Aug 2007 00:28:24 -0000	1.37
+++ git.spec	6 Sep 2007 15:48:06 -0000	1.38
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.2.5
+Version: 	1.5.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
+- git-1.5.3.1-1
+
 * Thu Aug 23 2007 James Bowes <jbowes at redhat.com> 1.5.2.5-1
 - git-1.5.2.5-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	24 Aug 2007 00:28:24 -0000	1.43
+++ sources	6 Sep 2007 15:48:06 -0000	1.44
@@ -1 +1 @@
-4e8de9e56882f3214a92f6d7dc3c49ec  git-1.5.2.5.tar.gz
+afef243b2d271004d13b0381ac2ee580  git-1.5.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 15:58:23 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 11:58:23 -0400
Subject: rpms/gnash/F-7 .cvsignore, 1.4, 1.5 gnash.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <200709061558.l86FwNLm002835@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
- update to 0.8.1
- agg is now the default renderer



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2007 16:57:21 -0000	1.4
+++ .cvsignore	6 Sep 2007 15:57:50 -0000	1.5
@@ -1 +1 @@
-gnash-0.8.0.tar.bz2
+gnash-0.8.1.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/gnash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnash.spec	17 Jun 2007 16:57:21 -0000	1.6
+++ gnash.spec	6 Sep 2007 15:57:50 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           gnash
-Version:        0.8.0
-Release:        1%{?dist}
+Version:        0.8.1
+Release:        2%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -17,6 +17,7 @@
 # modular Xorg 
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
+BuildRequires:  agg-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
@@ -68,7 +69,7 @@
 %prep
 %setup -q
 
-chmod a-x libgeometry/snappingrange.h
+chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -83,31 +84,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so \
- $RPM_BUILD_ROOT/%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
+# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
 rm \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
- $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+rm \
+ $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # asspec info isn't generated rightly
 rm \
- $RPM_BUILD_ROOT/%{_infodir}/asspec.info
-# omf is broken
-rm -rf \
- $RPM_BUILD_ROOT/%{_datadir}/omf
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# omf was broken
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
-rm \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm \
+# $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -118,7 +120,8 @@
 %post 
 /sbin/ldconfig
 # currently help system is broken
-#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
@@ -135,15 +138,17 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
-%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/
+#%{_libdir}/libgnash*-*.so
+#%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-#%{_datadir}/omf/gnash/
+%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -151,7 +156,7 @@
 
 %files klash
 %defattr(-,root,root,-)
-%{_bindir}/klash
+%{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 #%{_datadir}/config/klashrc
@@ -162,6 +167,13 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
+- update to 0.8.1
+- agg is now the default renderer
+
+* Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
+- rebuild for boost soname change
+
 * Sun Jun 17 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-1
 - update to 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2007 16:57:21 -0000	1.4
+++ sources	6 Sep 2007 15:57:50 -0000	1.5
@@ -1 +1 @@
-b3a3b22d608b5050b1b2743bc348c536  gnash-0.8.0.tar.bz2
+28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:06:36 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 6 Sep 2007 12:06:36 -0400
Subject: rpms/nss/devel nss-create-obj.patch,1.1,1.2 nss.spec,1.27,1.28
Message-ID: <200709061606.l86G6ai6009041@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9015

Modified Files:
	nss-create-obj.patch nss.spec 
Log Message:
* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
- fix a C++ mode compilation error


nss-create-obj.patch:

Index: nss-create-obj.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-create-obj.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-create-obj.patch	5 Sep 2007 20:00:42 -0000	1.1
+++ nss-create-obj.patch	6 Sep 2007 16:06:32 -0000	1.2
@@ -49,7 +49,7 @@
 + * Hand Create a new object and return the Generic object for our new object.
 + */
 +PK11GenericObject *
-+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template,
++PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template_,
 +		int count,  PRBool token)
 +{
 +    CK_OBJECT_HANDLE objectID;
@@ -57,7 +57,7 @@
 +    CK_RV crv;
 +
 +    PK11_EnterSlotMonitor(slot);
-+    crv = PK11_CreateNewObject(slot, slot->session, template, count, 
++    crv = PK11_CreateNewObject(slot, slot->session, template_, count, 
 +			       token, &objectID);
 +    PK11_ExitSlotMonitor(slot);
 +    if (crv != CKR_OK) {
@@ -150,7 +150,7 @@
  SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
  SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
 +PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, 
-+				   const CK_ATTRIBUTE *template, 
++				   const CK_ATTRIBUTE *template_, 
 +				   int count, PRBool token);
  SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, 
  				CK_ATTRIBUTE_TYPE attr, SECItem *item);


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nss.spec	5 Sep 2007 20:00:42 -0000	1.27
+++ nss.spec	6 Sep 2007 16:06:32 -0000	1.28
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -453,6 +453,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
+- fix a C++ mode compilation error
+
 * Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
 - Add 3.12 ckfw and libnsspem
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:08:33 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 12:08:33 -0400
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.5,1.6
Message-ID: <200709061608.l86G8X8q009139@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ulex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9110

Modified Files:
	ocaml-ulex.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-6
- Ignore Parsetree module.



Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-ulex.spec	6 Sep 2007 15:34:38 -0000	1.5
+++ ocaml-ulex.spec	6 Sep 2007 16:08:00 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ulex
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OCaml lexer generator for Unicode
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-6
+- Ignore Parsetree module.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
 - Force rebuild because of updated requires/provides scripts in OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:20:06 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 12:20:06 -0400
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.3,1.4
Message-ID: <200709061620.l86GK6G4009546@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xml-light/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9491

Modified Files:
	ocaml-xml-light.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-5
- Don't package test.cmi file (it's a test program).



Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-xml-light.spec	6 Sep 2007 15:36:09 -0000	1.3
+++ ocaml-xml-light.spec	6 Sep 2007 16:19:33 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Minimal XML parser and printer for OCaml
 
 Group:          Development/Libraries
@@ -57,6 +57,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+rm -f test.cmi
 ocamlfind install xml-light META *.mli *.cmi *.cma *.a *.cmxa *.cmx
 
 
@@ -88,6 +89,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-5
+- Don't package test.cmi file (it's a test program).
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-4
 - Force rebuild because of updated requires/provides scripts in OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:22:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 6 Sep 2007 12:22:01 -0400
Subject: rpms/jd/devel .cvsignore, 1.142, 1.143 jd.spec, 1.168, 1.169 sources,
	1.143, 1.144
Message-ID: <200709061622.l86GM131009756@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
- svn 1314



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- .cvsignore	3 Sep 2007 15:57:38 -0000	1.142
+++ .cvsignore	6 Sep 2007 16:21:29 -0000	1.143
@@ -1 +1 @@
-jd-1.9.6-svn1311.tgz
+jd-1.9.6-svn1314.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- jd.spec	3 Sep 2007 15:57:38 -0000	1.168
+++ jd.spec	6 Sep 2007 16:21:29 -0000	1.169
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1311
+%define         strtag        svn1314
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
-- svn 1311
+* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
+- svn 1314
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- sources	3 Sep 2007 15:57:38 -0000	1.143
+++ sources	6 Sep 2007 16:21:29 -0000	1.144
@@ -1 +1 @@
-ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz
+2255ee977583bd11cd408a5d849a9c4e  jd-1.9.6-svn1314.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:29:25 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 12:29:25 -0400
Subject: rpms/avahi/devel avahi.spec,1.93,1.94
Message-ID: <200709061629.l86GTPGR010087@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002

Modified Files:
	avahi.spec 
Log Message:
- Ship ssh static service file by default, don't ship ssh-sftp by default
- resolves: #269741: split off avahi-ui-tools package
- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel



Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- avahi.spec	28 Aug 2007 18:31:08 -0000	1.93
+++ avahi.spec	6 Sep 2007 16:28:52 -0000	1.94
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -50,12 +50,21 @@
 convenient.
 
 %package tools
-Summary: Tools for mDNS browsing and publishing
+Summary: Command line tools for mDNS browsing and publishing
 Group: System Environment/Base
 Requires: %{name} = %{version}, gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
 
 %description tools
-Tools that use avahi to browse and publish mDNS services and hosts.
+Command line tools that use avahi to browse and publish mDNS services.
+
+%package ui-tools
+Summary: UI tools for mDNS browsing
+Group: System Environment/Base
+Requires: %{name} = %{version}
+Requires: %{name}-ui = %{version}
+
+%description ui-tools
+Graphical user interface tools that use Avahi to browse for mDNS services.
 
 %package glib
 Summary: Glib libraries for avahi
@@ -90,6 +99,7 @@
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}
 Requires: %{name}-ui = %{version}
+Requires: %{name}-glib-devel = %{version}
 
 %description ui-devel
 The avahi-ui-devel package contains the header files and libraries
@@ -234,7 +244,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # remove example 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service
 
 # remove desktop file for avahi-discover
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
@@ -340,7 +350,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
+%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/avahi-daemon
 %dir %{_sysconfdir}/avahi
 %dir %{_sysconfdir}/avahi/etc
@@ -349,7 +359,7 @@
 %dir %{_sysconfdir}/avahi/services
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
-%config(noreplace) %{_sysconfdir}/avahi/services/sftp-ssh.service
+%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(0755,root,root) %{_sbindir}/avahi-daemon
 %attr(0755,root,root) %{_libdir}/libavahi-common.so.*
@@ -379,9 +389,16 @@
 # These are .py files only, so they don't go in lib64
 %{_prefix}/lib/python?.?/site-packages/*
 %{_mandir}/man1/*
-%{_datadir}/applications/b*.desktop
 %{_datadir}/avahi/interfaces/
 %exclude %{_bindir}/avahi-discover-standalone
+%exclude %{_bindir}/b*
+%exclude %{_mandir}/man1/b*
+
+%files ui-tools
+%defattr(0644, root, root, 0755)
+%attr(0755,root,root) %{_bindir}/b*
+%{_mandir}/man1/b*
+%{_datadir}/applications/b*.desktop
 
 %files devel
 %defattr(0644, root, root, 0755)
@@ -466,6 +483,11 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-4
+- Ship ssh static service file by default, don't ship ssh-sftp by default
+- resolves: #269741: split off avahi-ui-tools package
+- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel
+
 * Tue Aug 28 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.21-3
 - resolves: #246875: Initscript Review
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:30:58 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:30:58 -0400
Subject: rpms/phpMyAdmin/EL-4 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061630.l86GUwC2010230@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/EL-4

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:25 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:30:26 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 16:30:26 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:31:01 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:31:01 -0400
Subject: rpms/phpMyAdmin/EL-5 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061631.l86GV1Xg010241@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/EL-5

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:28 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:30:28 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 16:30:28 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:31:04 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:31:04 -0400
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709061631.l86GV4Hc010247@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/FC-6

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:31 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- phpMyAdmin.spec	23 Jul 2007 13:20:26 -0000	1.9
+++ phpMyAdmin.spec	6 Sep 2007 16:30:31 -0000	1.10
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:26 -0000	1.7
+++ sources	6 Sep 2007 16:30:31 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:34:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:34:00 -0400
Subject: rpms/phpMyAdmin/F-7 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061634.l86GY0ju010464@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10437

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:33:27 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:24 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:33:27 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:24 -0000	1.7
+++ sources	6 Sep 2007 16:33:27 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:02 -0400
Subject: rpms/perl-Class-ReturnValue/devel .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg2JG011131@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/devel

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 02:52:23 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:30 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/perl-Class-ReturnValue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-ReturnValue.spec	17 Aug 2007 02:52:24 -0000	1.7
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 02:52:24 -0000	1.3
+++ sources	6 Sep 2007 16:41:30 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:05 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:05 -0400
Subject: rpms/perl-Class-ReturnValue/F-7 .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg5xA011144@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/F-7

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 03:12:08 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:33 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/perl-Class-ReturnValue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-ReturnValue.spec	17 Aug 2007 03:12:08 -0000	1.7
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 03:12:08 -0000	1.3
+++ sources	6 Sep 2007 16:41:33 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:08 -0400
Subject: rpms/perl-Class-ReturnValue/FC-6 .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg89R011157@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/FC-6

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 03:13:55 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:36 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/perl-Class-ReturnValue.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-ReturnValue.spec	17 Aug 2007 03:13:55 -0000	1.6
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 03:13:55 -0000	1.3
+++ sources	6 Sep 2007 16:41:36 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:20 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 6 Sep 2007 12:42:20 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.50,1.51
Message-ID: <200709061642.l86GgKpK011194@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11028

Modified Files:
	kernel-xen.spec 
Log Message:
Include modules.block and modules.networking on the package (bug #280731)



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	30 Aug 2007 22:14:44 -0000	1.50
+++ kernel-xen.spec	6 Sep 2007 16:41:47 -0000	1.51
@@ -1648,7 +1648,10 @@
     rm -f modinfo
     rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
-    rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.*
+    for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+    do
+        rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+    done
 
     # Move the devel headers out of the root file system
     mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
@@ -2023,6 +2026,8 @@
 /lib/modules/%{KVERREL}/extra
 /lib/modules/%{KVERREL}/updates
 /lib/modules/%{KVERREL}/weak-updates
+/lib/modules/%{KVERREL}/modules.block
+/lib/modules/%{KVERREL}/modules.networking
 %ghost /boot/initrd-%{KVERREL}.img
 
 %files devel
@@ -2071,6 +2076,8 @@
 /lib/modules/%{KVERREL}debug/extra
 /lib/modules/%{KVERREL}debug/updates
 /lib/modules/%{KVERREL}debug/weak-updates
+/lib/modules/%{KVERREL}debug/modules.block
+/lib/modules/%{KVERREL}debug/modules.networking
 %ghost /boot/initrd-%{KVERREL}debug.img
 
 %package debug-devel
@@ -2123,6 +2130,8 @@
 /lib/modules/%{KVERREL}PAE/extra
 /lib/modules/%{KVERREL}PAE/updates
 /lib/modules/%{KVERREL}PAE/weak-updates
+/lib/modules/%{KVERREL}PAE/modules.block
+/lib/modules/%{KVERREL}PAE/modules.networking
 %ghost /boot/initrd-%{KVERREL}PAE.img
 
 %files PAE-devel
@@ -2163,6 +2172,8 @@
 /lib/modules/%{KVERREL}PAE-debug/extra
 /lib/modules/%{KVERREL}PAE-debug/updates
 /lib/modules/%{KVERREL}PAE-debug/weak-updates
+/lib/modules/%{KVERREL}PAE-debug/modules.block
+/lib/modules/%{KVERREL}PAE-debug/modules.networking
 %ghost /boot/initrd-%{KVERREL}PAE-debug.img
 
 %package PAE-debug-devel
@@ -2216,6 +2227,8 @@
 /lib/modules/%{KVERREL}smp/extra
 /lib/modules/%{KVERREL}smp/updates
 /lib/modules/%{KVERREL}smp/weak-updates
+/lib/modules/%{KVERREL}smp/modules.block
+/lib/modules/%{KVERREL}smp/modules.networking
 %ghost /boot/initrd-%{KVERREL}smp.img
 
 %files smp-devel
@@ -2264,6 +2277,8 @@
 /lib/modules/%{KVERREL}xen/extra
 /lib/modules/%{KVERREL}xen/updates
 /lib/modules/%{KVERREL}xen/weak-updates
+/lib/modules/%{KVERREL}xen/modules.block
+/lib/modules/%{KVERREL}xen/modules.networking
 %ghost /boot/initrd-%{KVERREL}xen.img
 
 %files -n kernel-xen-devel
@@ -2307,6 +2322,8 @@
 /lib/modules/%{KVERREL}kdump/extra
 /lib/modules/%{KVERREL}kdump/updates
 /lib/modules/%{KVERREL}kdump/weak-updates
+/lib/modules/%{KVERREL}kdump/modules.block
+/lib/modules/%{KVERREL}kdump/modules.networking
 %ghost /boot/initrd-%{KVERREL}kdump.img
 
 %files kdump-devel
@@ -2332,6 +2349,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 06 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Include modules.block and modules.networking on the package (bug #280731)
+
 * Thu Aug 30 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Provides: xen-hypervisor-abi = 3.1 (bug #269581)
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:58:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 12:58:45 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.215,
	1.216 redhat-panel-default-setup.entries, 1.13, 1.14
Message-ID: <200709061658.l86GwjpA014303@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14150

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Log Message:
Improved handling of launchers for preferred apps



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- gnome-panel.spec	4 Sep 2007 19:35:44 -0000	1.215
+++ gnome-panel.spec	6 Sep 2007 16:58:07 -0000	1.216
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -92,6 +92,12 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=456371
 Patch7: clock-timezones.patch
 
+# the next three patches belong together
+# http://bugzilla.gnome.org/show_bug.cgi?id=470966
+Patch8: launcher-desktop-files.patch
+Patch9: desktop-file-monitoring.patch
+Patch10: preferred-apps.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -124,6 +130,9 @@
 %patch4 -p1 -b .search
 #%patch6 -p0 -b .compiz-support
 %patch7 -p1 -b .clock-timezones
+%patch8 -p1 -b .launcher-desktop-files
+%patch9 -p1 -b .desktop-file-monitoring
+%patch10 -p1 -b .preferred-apps
 
 . %{SOURCE4}
 
@@ -302,6 +311,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-2
+- Improve the handling of preferred apps in launchers
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- redhat-panel-default-setup.entries	13 Feb 2007 20:58:10 -0000	1.13
+++ redhat-panel-default-setup.entries	6 Sep 2007 16:58:07 -0000	1.14
@@ -276,7 +276,7 @@
       <key>objects/web_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-web.desktop</string>
+        <string>preferred-web-browser.desktop</string>
       </value>
     </entry>
 
@@ -330,7 +330,7 @@
       <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-email.desktop</string>
+        <string>preferred-mail-reader.desktop</string>
       </value>
     </entry>
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:59:37 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 12:59:37 -0400
Subject: rpms/gnome-panel/devel desktop-file-monitoring.patch, NONE,
	1.1 launcher-desktop-files.patch, NONE, 1.1 preferred-apps.patch,
	NONE, 1.1
Message-ID: <200709061659.l86Gxb47014481@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14451

Added Files:
	desktop-file-monitoring.patch launcher-desktop-files.patch 
	preferred-apps.patch 
Log Message:
add new patches


desktop-file-monitoring.patch:

--- NEW FILE desktop-file-monitoring.patch ---
diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.h
--- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-05 23:24:37.000000000 -0400
@@ -13,6 +13,7 @@
 
 #include "applet.h"
 #include "panel-widget.h"
+#include <libgnomevfs/gnome-vfs.h>
 
 G_BEGIN_DECLS
 
@@ -29,6 +30,8 @@ typedef struct {
 	GSList 		  *error_dialogs;
 
 	gulong             destroy_handler;
+
+	GnomeVFSMonitorHandle *monitor; 
 } Launcher;
 
 void panel_launcher_create           (PanelToplevel *toplevel,
diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h
--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-05 23:24:37.000000000 -0400
@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
 				 const char       *uri);
 
 G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog);
+
 
 void panel_ditem_register_save_uri_func (PanelDItemEditor  *dialog,
 					 PanelDitemSaveUri  save_uri,
diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.c
--- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-06 00:33:52.000000000 -0400
@@ -285,6 +287,8 @@ static void
 destroy_launcher (GtkWidget *widget,
 		  Launcher  *launcher)
 {
+	if (launcher->monitor)
+		gnome_vfs_monitor_cancel (launcher->monitor);
 	launcher_properties_destroy (launcher);
 	launcher_widget_destroy_open_dialogs (launcher);
 }
@@ -458,6 +462,37 @@ drag_data_get_cb (GtkWidget        *widg
 
 }
 
+static void setup_button (Launcher *launcher);
+
+static void
+desktop_file_changed (GnomeVFSMonitorHandle    *handle,
+		      const gchar              *monitor_uri,
+		      const gchar              *info_uri,
+		      GnomeVFSMonitorEventType  event_type,
+		      gpointer                  user_data)
+{
+	Launcher *launcher = user_data;
+	GKeyFile *key_file;
+
+	if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED ||
+	    event_type == GNOME_VFS_MONITOR_EVENT_CREATED) {
+		gchar *path;
+
+		path = gnome_vfs_get_local_path_from_uri (monitor_uri);
+
+		key_file = g_key_file_new ();
+		if (g_key_file_load_from_file (key_file, path,
+					       G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+					       NULL)) {
+			g_key_file_free (launcher->key_file);
+			launcher->key_file = key_file;
+			setup_button (launcher);        
+		}
+
+		g_free (path);
+	}
+}
+
 static Launcher *
 create_launcher (const char *location)
 {
@@ -534,6 +569,25 @@ create_launcher (const char *location)
 	launcher->key_file = key_file;
 	launcher->prop_dialog = NULL;
 	launcher->destroy_handler = 0;
+	launcher->monitor = NULL;
+
+	/* Watch for changes to the desktop file. Since we don't want 
+	 * to do this for every launcher, we only do it if the desktop 
+	 * file contains a X-Panel-Monitor entry.
+	 */
+	if (g_key_file_get_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", NULL)) {
+		gchar *uri;
+
+
+
+		uri = g_strdup_printf ("file:%s", new_location);
+		gnome_vfs_monitor_add (&launcher->monitor, 
+				       uri,
+				       GNOME_VFS_MONITOR_FILE,
+				       desktop_file_changed,
+				       launcher);
+		g_free (uri);
+	}
 
 	/* Icon will be setup later */
 	launcher->button = button_widget_new (NULL /* icon */,
@@ -662,6 +716,15 @@ static void
 launcher_changed (PanelDItemEditor *dialog,
 		  Launcher         *launcher)
 {
+	/* If the user manually changes launcher properties,
+	 * we stop monitoring the desktop file to not overwrite
+	 * user changes.
+	 */
+	if (launcher->monitor) {
+		gnome_vfs_monitor_cancel (launcher->monitor);
+		launcher->monitor = NULL;
+	}
+
 	/* Setup the button look */
 	setup_button (launcher);
 }
@@ -733,6 +796,43 @@ launcher_save_uri (PanelDItemEditor *dia
 	return NULL;
 }
 
+static const char *
+desktop_file_to_monitor (PanelDItemEditor *editor)
+{
+	const char *entry;
+	GKeyFile *key_file;
+
+	/* When the user selects a desktop file in the ditem editor,
+	 * start monitoring the desktop file for changes.
+	 */
+	entry = panel_ditem_editor_get_orig_desktop_file (editor);
+	if (entry) {
+		key_file = g_key_file_new ();
+		if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
+		    !panel_util_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) 
+			entry = NULL;
+		g_key_file_free (key_file);
+	}
+
+	return entry;
+}
+
+static void
+start_monitoring (Launcher *launcher)
+{
+	gchar *uri;
+
+	uri = g_strdup_printf ("file:%s", launcher->location);
+	if (launcher->monitor)
+		gnome_vfs_monitor_cancel (launcher->monitor);
+	gnome_vfs_monitor_add (&launcher->monitor, 
+			       uri,
+			       GNOME_VFS_MONITOR_FILE,
+			       desktop_file_changed,
+			       launcher);
+	g_free (uri);
+}
+ 
 static void
 launcher_saved (GtkWidget *dialog,
 		Launcher  *launcher)
@@ -740,11 +840,15 @@ launcher_saved (GtkWidget *dialog,
 	const char  *uri;
 	GConfClient *client;
 	const char  *key;
+	const char *path;
 
 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
 	if (panel_launcher_get_filename (uri) != NULL)
 		uri = panel_launcher_get_filename (uri);
 
+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
+		uri = path;
+
 	if (uri && launcher->location && strcmp (uri, launcher->location)) {
 		client = panel_gconf_get_client ();
 
@@ -757,6 +861,9 @@ launcher_saved (GtkWidget *dialog,
 		if (launcher->location)
 			g_free (launcher->location);
 		launcher->location = g_strdup (uri);
+
+		if (path)
+			start_monitoring (launcher);
 	}
 }
 
@@ -923,6 +1030,7 @@ launcher_new_saved (GtkWidget *dialog,
 	PanelWidget *panel;
 	int          pos;
 	const char  *uri;
+	const char  *path;
 
 	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
 	panel = g_object_get_data (G_OBJECT (dialog), "panel");
@@ -930,6 +1038,10 @@ launcher_new_saved (GtkWidget *dialog,
 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
 	if (panel_launcher_get_filename (uri) != NULL)
 		uri = panel_launcher_get_filename (uri);
+
+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
+		uri = path;
+
 	panel_launcher_create (panel->toplevel, pos, uri);
 }
 
diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-05 23:24:37.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-05 23:24:37.000000000 -0400
@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
 
 	/* the directory of the theme for the icon, see bug #119208 */
 	char *icon_theme_dir;
+
+	char *orig_desktop_file;
 };
 
 /* Time in seconds after which we save the file on the disk */
@@ -367,6 +369,10 @@ panel_ditem_editor_destroy (GtkObject *o
 		g_free (dialog->priv->icon_theme_dir);
 	dialog->priv->icon_theme_dir = NULL;
 
+	if (dialog->priv->orig_desktop_file != NULL)
+		g_free (dialog->priv->orig_desktop_file);
+	dialog->priv->orig_desktop_file = NULL;
+
 	GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);
 }
 
@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd
 							   TRUE);
 	}
 
+	/* When the user changes any fields, unset the orig_desktop_file
+	 * field since the editor contents are not entirely from a desktop
+	 * file anymore.
+	 */ 
+	g_free (dialog->priv->orig_desktop_file);
+	dialog->priv->orig_desktop_file = NULL;
+
 	dialog->priv->dirty = TRUE;
 	g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
 }
@@ -1003,6 +1016,13 @@ update_editor_from_desktop_file (PanelDI
 		 */ 
 		setup_icon_entry (dialog, icon);
 
+		/* We set the orig_desktop_file field to let the
+		 * launcher know that the editor contents are coming
+		 * directly from a desktop file.
+		 */ 
+		g_free (dialog->priv->orig_desktop_file);
+		dialog->priv->orig_desktop_file = g_strdup (uri);
+
 		return TRUE;    
 	}
 
@@ -1826,3 +1846,12 @@ panel_ditem_register_save_uri_func (Pane
 	dialog->priv->save_uri = save_uri;
 	dialog->priv->save_uri_data = data;
 }
+
+G_CONST_RETURN char *
+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)
+{
+	g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
+
+	return dialog->priv->orig_desktop_file;
+}
+

launcher-desktop-files.patch:

--- NEW FILE launcher-desktop-files.patch ---
diff -up gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c
--- gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file	2007-08-28 00:20:51.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c	2007-08-28 00:20:57.000000000 -0400
@@ -973,6 +973,42 @@ panel_ditem_editor_icon_changed (PanelDI
 	g_free (file);
 }
 
+static gboolean
+update_editor_from_desktop_file (PanelDItemEditor *dialog,
+				 const gchar      *uri)
+{
+	GKeyFile *key_file;
+	char *name;
+	char *comment;
+	char *exec;
+	char *icon;
+
+	key_file = g_key_file_new ();
+	if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
+		if (panel_util_key_file_get_boolean (key_file, "Terminal", FALSE)) 
+			gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
+		else
+			gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0); 
+
+		name = panel_util_key_file_get_locale_string (key_file, "Name");
+		comment = panel_util_key_file_get_locale_string (key_file, "Comment");
+		icon = panel_util_key_file_get_locale_string (key_file, "Icon");
+		exec = panel_util_key_file_get_string (key_file, "Exec");
+
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");            
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");           
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");         
+		/* Note: we need to set the icon last, since the editor
+		 * tries to guess the icon when the command is modified
+		 */ 
+		setup_icon_entry (dialog, icon);
+
+		return TRUE;    
+	}
+
+	return FALSE;
+}
+
 static void
 command_browse_chooser_response (GtkFileChooser   *chooser,
 				 gint              response_id,
@@ -986,7 +1022,11 @@ command_browse_chooser_response (GtkFile
 		case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
 		case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
 			text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-			uri = panel_util_make_exec_uri_for_desktop (text);
+			if (g_str_has_suffix (text, ".desktop") &&
+			    update_editor_from_desktop_file (dialog, text))
+				uri = NULL;
+			else 
+				uri = panel_util_make_exec_uri_for_desktop (text);
 			g_free (text);
 			break;
 		case PANEL_DITEM_EDITOR_TYPE_LINK:
@@ -996,8 +1036,9 @@ command_browse_chooser_response (GtkFile
 			g_assert_not_reached ();
 		}
 
-		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-				    uri);
+		if (uri)
+			gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
+				    	    uri);
 		g_free (uri);
 	}
 

preferred-apps.patch:

--- NEW FILE preferred-apps.patch ---
diff -up gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps gnome-panel-2.19.6/gnome-panel/main.c
--- gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps	2007-08-28 01:01:57.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/main.c	2007-08-28 01:02:42.000000000 -0400
@@ -26,6 +26,7 @@
 #include "panel-action-protocol.h"
 #include "panel-lockdown.h"
 #include "panel-icon-names.h"
+#include "launcher.h"
 #include "xstuff.h"
 
 #include "nothing.cP"
@@ -81,6 +82,7 @@ main (int argc, char **argv)
 			      GCONF_CLIENT_PRELOAD_NONE,
 			      NULL);
 
+	panel_preferred_apps_init ();
 	panel_global_config_load ();
 	panel_lockdown_init ();
 	panel_profile_load ();
diff -up gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.c
--- gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps	2007-08-28 00:49:14.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/launcher.c	2007-08-28 01:01:47.000000000 -0400
@@ -22,6 +22,7 @@
 #include <libgnomeui/gnome-url.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <gdk/gdkx.h>
+#include <gmenu-tree.h>
 
 #include "launcher.h"
 
@@ -39,6 +40,7 @@
 #include "panel-compatibility.h"
 #include "panel-ditem-editor.h"
 #include "panel-icon-names.h"
+#include "panel-run-dialog.h"
 
 static GdkScreen *
 launcher_get_screen (Launcher *launcher)
@@ -1264,3 +1266,166 @@ panel_launcher_set_dnd_enabled (Launcher
 	} else
 		gtk_drag_source_unset (launcher->button);
 }
+
+static gchar *
+find_desktop_file_from_exec (const gchar *exec)
+{
+	GSList *all_applications, *l;
+	gchar *path = NULL;
+	gchar **tokens, **tokens2;
+	gint i, match = 0;
+
+	/* FIXME no need to construct a humongous list here */
+	all_applications = get_all_applications ();
+
+	for (l = all_applications; l; l = l->next) {
+		GMenuTreeEntry *entry = l->data;
+		const char     *entry_exec;
+
+		entry_exec = gmenu_tree_entry_get_exec (entry);
+
+		if (strcmp (exec, entry_exec) == 0) {
+			path = gmenu_tree_entry_get_desktop_file_path (entry);
+			break;
+		}
+
+		tokens = g_strsplit (exec, " ", -1);
+		tokens2 = g_strsplit (entry_exec, " ", -1);
+
+		for (i = 0; tokens[i] && tokens2[i]; i++) {
+			if (strcmp (tokens[i], tokens2[i]) != 0)
+				break;
+		}
+		if (i > match) {
+			match = i;
+			path = gmenu_tree_entry_get_desktop_file_path (entry);
+		}
+
+		g_strfreev (tokens);
+		g_strfreev (tokens2);
+	}
+
+	path = g_strdup (path);
+	g_slist_free (all_applications);
+
+	return path;
+}
+
+static void
+update_preferred_app (const gchar *filename,
+		      const gchar *key,
+		      const gchar *exec)
+{
+	gchar *location;
+	GKeyFile *key_file;
+	GError *error = NULL;
+	gchar *data;
+	gsize len;
+	gboolean needs_terminal;
+
+	location = find_desktop_file_from_exec (exec);
+	key_file = g_key_file_new ();
+	if (!panel_util_key_file_load_from_uri (key_file, location,
+						G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+						NULL)) {
+		/* FIXME would be much better if preferred apps were backed by desktop files */
+		g_key_file_set_string (key_file, "Desktop Entry", "Version", "1.0");
+		g_key_file_set_string (key_file, "Desktop Entry", "Encoding", "UTF-8");
+		g_key_file_set_string (key_file, "Desktop Entry", "Type", "Application");
+		g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec);
+		if (strstr (key, "http")) {
+			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Web Browser");
+			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Web Browser");
+			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Browse the Web");
+			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-web-browser.png");
+		}
+		else if (strstr (key, "mailto")) {
+			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Mail Reader");
+			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Mail Reader");
+			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Send email");
+			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-email.png");
+		}
+		if (g_str_has_suffix (key, "command")) {
+			int len;
+			char *key2;
+
+			len = strlen (key);
+			key2 = g_new (char, len - strlen ("command") + strlen ("needs_terminal") + 1);
+			strncpy (key2, key,  len - strlen ("command"));
+			strcpy (key2 + len - strlen ("command"), "needs_terminal");
+			needs_terminal = gconf_client_get_bool (panel_gconf_get_client (),
+								key2,
+								NULL);
+			g_free (key2);
+		}
+		else
+			needs_terminal = FALSE;
+		g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal", needs_terminal);
+	}
+
+	g_free (location);
+
+	g_key_file_set_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", TRUE);
+	g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay", TRUE);
+
+	data = g_key_file_to_data (key_file, &len, &error);
+	if (error) {
+		g_printerr (_("Failed to convert data for '%s': %s"), 
+			    filename, error->message);
+		g_error_free (error);
+		g_key_file_free (key_file);
+
+		return; 
+	}
+	if (!g_file_set_contents (filename, data, len, &error)) {
+		g_printerr (_("Failed to save '%s': %s"), 
+			    filename, error->message);
+		g_error_free (error);
+	}
+
+	g_key_file_free (key_file);
+	g_free (data);
+}
+
+static void
+preferred_app_changed (GConfClient *client,
+		       gint         notify_id,
+		       GConfEntry  *entry,
+		       const gchar  *filename)
+{
+	update_preferred_app (filename, 
+	gconf_entry_get_key (entry), 
+	gconf_value_get_string (entry->value));
+}
+
+void
+panel_preferred_apps_init (void)
+{
+	GConfClient *client;
+	gchar *filename, *exec;
+	gint i;
+
+	const gchar *keys[] = {
+		"/desktop/gnome/url-handlers/http/command",
+		"/desktop/gnome/url-handlers/mailto/command", 
+		NULL };
+	const gchar *files[] = {
+		"preferred-web-browser.desktop",
+		"preferred-mail-reader.desktop",
+		NULL }; 
+
+	client = panel_gconf_get_client ();
+
+	for (i = 0; keys[i]; i++) {
+		filename = g_build_filename (g_get_user_data_dir (), 
+					     "applications", files[i], NULL);
+		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
+			exec = gconf_client_get_string (client, keys[i], NULL);
+			update_preferred_app (filename, keys[i], exec);
+			g_free (exec);
+		}
+		gconf_client_notify_add (client, keys[i],
+					 (GConfClientNotifyFunc) preferred_app_changed,
+					 filename, g_free, NULL);
+	}
+}
diff -up gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.h
--- gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps	2007-08-28 00:46:47.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/launcher.h	2007-08-28 00:47:10.000000000 -0400
@@ -75,6 +75,7 @@ void            launcher_properties_dest
 void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
 						 gboolean  dnd_enabled);
 
+void            panel_preferred_apps_init       (void);
 
 G_END_DECLS
 
diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h
--- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps	2007-08-28 00:48:11.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h	2007-08-28 00:48:34.000000000 -0400
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
 void panel_run_dialog_present           (GdkScreen  *screen,
 					 guint32    activate_time);
 
+GSList *get_all_applications           (void);
+
 G_END_DECLS
 
 #endif /* __PANEL_RUN_DIALOG_H__ */
diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c
--- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps	2007-08-28 00:47:26.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c	2007-08-28 00:47:51.000000000 -0400
@@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
 	return list;
 }
 
-static GSList *
+GSList *
 get_all_applications (void)
 {
 	GMenuTree          *tree;



From fedora-extras-commits at redhat.com  Thu Sep  6 17:15:57 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:15:57 -0400
Subject: rpms/ocaml-csv/devel ocaml-csv.spec,1.2,1.3
Message-ID: <200709061715.l86HFvsX023301@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-csv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23171

Modified Files:
	ocaml-csv.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-5
- Force rebuild because of base OCaml.



Index: ocaml-csv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-csv/devel/ocaml-csv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-csv.spec	30 Aug 2007 09:28:23 -0000	1.2
+++ ocaml-csv.spec	6 Sep 2007 17:15:23 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-csv
 Version:        1.1.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml library for reading and writing CSV files
 
 Group:          Development/Libraries
@@ -16,7 +16,8 @@
 Patch0:         csv-extlib.patch
 Patch1:         csv-install.patch
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-extlib-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-extlib-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -107,6 +108,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-5
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:24:49 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:24:49 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.4, 1.5 ocaml-libvirt.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709061724.l86HOnCX023803@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23759/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
- New upstream version 0.3.2.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2007 09:49:16 -0000	1.4
+++ .cvsignore	6 Sep 2007 17:24:16 -0000	1.5
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.5.tar.gz
+ocaml-libvirt-0.3.2.6.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-libvirt.spec	30 Aug 2007 09:49:16 -0000	1.3
+++ ocaml-libvirt.spec	6 Sep 2007 17:24:16 -0000	1.4
@@ -8,7 +8,7 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.5
+Version:        0.3.2.6
 Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
@@ -22,7 +22,7 @@
 # Note for people building from this spec file:
 # These BR's can be found in Fedora development, or here:
 # http://www.annexia.org/tmp/ocaml/
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-extlib-devel
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
+- New upstream version 0.3.2.6.
+
 * Wed Aug 29 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.5-1
 - New upstream version 0.3.2.5.
 - Keep TODO out of the main package, but add (renamed) TODO.libvirt and


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2007 09:49:16 -0000	1.4
+++ sources	6 Sep 2007 17:24:16 -0000	1.5
@@ -1 +1 @@
-1ee9bac2181ee3123ebe018ead0a1933  ocaml-libvirt-0.3.2.5.tar.gz
+9e58cf2cb88d0db8e50915e147054e52  ocaml-libvirt-0.3.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 17:27:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:27:42 -0400
Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.4,1.5
Message-ID: <200709061727.l86HRgW7023950@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23923

Modified Files:
	ocaml-libvirt.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
  scripts.



Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-libvirt.spec	6 Sep 2007 17:24:16 -0000	1.4
+++ ocaml-libvirt.spec	6 Sep 2007 17:27:10 -0000	1.5
@@ -9,7 +9,7 @@
 
 Name:           ocaml-libvirt
 Version:        0.3.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -22,7 +22,7 @@
 # Note for people building from this spec file:
 # These BR's can be found in Fedora development, or here:
 # http://www.annexia.org/tmp/ocaml/
-BuildRequires:  ocaml
+BuildRequires:  ocaml >= 3.10.0-7
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-extlib-devel
@@ -204,6 +204,10 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
+- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
+  scripts.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
 - New upstream version 0.3.2.6.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:31:27 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 6 Sep 2007 13:31:27 -0400
Subject: rpms/redhat-menus/devel redhat-menus.spec,1.83,1.84
Message-ID: <200709061731.l86HVR8L024379@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24320

Modified Files:
	redhat-menus.spec 
Log Message:
- create /etx/xdg/menus/settings-merged by default



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- redhat-menus.spec	3 Jul 2007 02:48:28 -0000	1.83
+++ redhat-menus.spec	6 Sep 2007 17:30:54 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -61,6 +61,10 @@
 # this is in gnome-menus now
 rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/System.directory
 
+# create the settings-merged to prevent gamin from looking for it
+# in a loop
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/settings-merged ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,11 +79,15 @@
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-post-merged
+%dir %{_sysconfdir}/xdg/menus/settings-merged
 %config %{_sysconfdir}/xdg/menus/*.menu
 %{_datadir}/desktop-menu-patches/*.desktop
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Sep  6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
+- create /etx/xdg/menus/settings-merged by default
+
 * Wed Jul  2 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-8
 - More category finetuning
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:35:00 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 13:35:00 -0400
Subject: rpms/kernel/devel kernel.spec, 1.148,
	1.149 linux-2.6-execshield.patch, 1.71, 1.72
Message-ID: <200709061735.l86HZ0Yi024517@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24459

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- exec-shield: enable interrupts in do_iret_error()



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kernel.spec	5 Sep 2007 19:43:23 -0000	1.148
+++ kernel.spec	6 Sep 2007 17:34:27 -0000	1.149
@@ -1782,6 +1782,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- exec-shield: enable interrupts in do_iret_error()
+
 * Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc5-git1
 

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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- linux-2.6-execshield.patch	3 Aug 2007 16:45:32 -0000	1.71
+++ linux-2.6-execshield.patch	6 Sep 2007 17:34:27 -0000	1.72
@@ -367,7 +367,7 @@
  	 * Walk the list again, actually closing and freeing it,
 --- linux-2.6.22.noarch/arch/i386/kernel/traps.c~	2007-07-20 13:50:07.000000000 -0400
 +++ linux-2.6.22.noarch/arch/i386/kernel/traps.c	2007-07-20 13:52:09.000000000 -0400
-@@ -573,7 +573,84 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+@@ -573,7 +573,88 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
@@ -429,14 +429,18 @@
 + * The fixup code for errors in iret jumps to here (iret_exc).  It loses
 + * the original trap number and error code.  The bogus trap 32 and error
 + * code 0 are what the vanilla kernel delivers via:
-+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
++ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
++ *
++ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
 + *
 + * In case of a general protection fault in the iret instruction, we
 + * need to check for a lazy CS update for exec-shield.
 + */
 +fastcall void do_iret_error(struct pt_regs *regs, long error_code)
 +{
-+	int ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
++	int ok;
++	local_irq_enable();
++	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
 +	put_cpu();
 +	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
 +	    error_code, 32, SIGSEGV) != NOTIFY_STOP) {



From fedora-extras-commits at redhat.com  Thu Sep  6 17:36:15 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 6 Sep 2007 13:36:15 -0400
Subject: rpms/git/devel git.spec,1.38,1.39
Message-ID: <200709061736.l86HaFX7024613@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24592

Modified Files:
	git.spec 
Log Message:
* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
- Include git-gui and git-citool docs



Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- git.spec	6 Sep 2007 15:48:06 -0000	1.38
+++ git.spec	6 Sep 2007 17:35:42 -0000	1.39
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.3.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -194,10 +194,10 @@
 %{_bindir}/git-citool
 %{_datadir}/git-gui/
 # Not Yet...
-# %{!?_without_docs: %{_mandir}/man1/git-gui.1}
-# %{!?_without_docs: %doc Documentation/git-gui.html}
-# %{!?_without_docs: %{_mandir}/man1/git-citool.1}
-# %{!?_without_docs: %doc Documentation/git-citool.html}
+%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
+%{!?_without_docs: %doc Documentation/git-gui.html}
+%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
+%{!?_without_docs: %doc Documentation/git-citool.html}
 
 %files -n gitk
 %defattr(-,root,root)
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
+- Include git-gui and git-citool docs
+
 * Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
 - git-1.5.3.1-1
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:39:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 13:39:49 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.481,1.482
Message-ID: <200709061739.l86HdnqZ024836@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24812

Modified Files:
	eclipse.spec 
Log Message:
fix files listing in jdt


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- eclipse.spec	6 Sep 2007 15:41:30 -0000	1.481
+++ eclipse.spec	6 Sep 2007 17:39:17 -0000	1.482
@@ -1502,9 +1502,9 @@
 %{_libdir}/gcj/%{name}/jdimodel.jar.*
 %{_libdir}/gcj/%{name}/jdi.jar.*
 %else
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
 %endif
 
 %files pde



From fedora-extras-commits at redhat.com  Thu Sep  6 17:46:14 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 13:46:14 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1302,1.1303
Message-ID: <200709061746.l86HkE23025005@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24968

Modified Files:
	openoffice.org.spec 
Log Message:
drop the warnings silencer and force nss ver to make sure we have the template fixed one for building


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -r1.1302 -r1.1303
--- openoffice.org.spec	6 Sep 2007 12:45:50 -0000	1.1302
+++ openoffice.org.spec	6 Sep 2007 17:45:42 -0000	1.1303
@@ -75,7 +75,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -1082,7 +1082,7 @@
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
-%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+#%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 
 %if %{linkopt}



From fedora-extras-commits at redhat.com  Thu Sep  6 17:48:55 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Thu, 6 Sep 2007 13:48:55 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient-addosgimanifest.patch, NONE,
	1.1 jakarta-commons-httpclient.spec, 1.18, 1.19
Message-ID: <200709061748.l86Hmt7M025057@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-httpclient/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25034

Modified Files:
	jakarta-commons-httpclient.spec 
Added Files:
	jakarta-commons-httpclient-addosgimanifest.patch 
Log Message:
Add OSGi MANIFEST.MF information



jakarta-commons-httpclient-addosgimanifest.patch:

--- NEW FILE jakarta-commons-httpclient-addosgimanifest.patch ---
--- MANIFEST.MF	2007-09-06 12:31:02.000000000 -0400
+++ /tmp/orb/org.apache.commons.httpclient/META-INF/MANIFEST.MF	2007-09-06 12:30:45.000000000 -0400
@@ -3,4 +3,27 @@
 Specification-Version: 1.0
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: @version@
-
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.httpclient
+Bundle-Version: 3.0.1.qualifier
+Import-Package: javax.crypto;resolution:=optional,
+ javax.crypto.spec;resolution:=optional,
+ javax.net;resolution:=optional,
+ javax.net.ssl;resolution:=optional,
+ org.apache.commons.codec;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.binary;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.net;version="[1.2.0,2.0.0)",
+ org.apache.commons.logging;version="[1.0.4,2.0.0)"
+Export-Package: org.apache.commons.httpclient;version="3.0.1",
+ org.apache.commons.httpclient.auth;version="3.0.1",
+ org.apache.commons.httpclient.cookie;version="3.0.1",
+ org.apache.commons.httpclient.methods;version="3.0.1",
+ org.apache.commons.httpclient.methods.multipart;version="3.0.1",
+ org.apache.commons.httpclient.params;version="3.0.1",
+ org.apache.commons.httpclient.protocol;version="3.0.1",
+ org.apache.commons.httpclient.util;version="3.0.1"
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.2


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-httpclient.spec	16 Mar 2007 18:10:37 -0000	1.18
+++ jakarta-commons-httpclient.spec	6 Sep 2007 17:48:22 -0000	1.19
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,14 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.0.1
-Release:        1jpp.1%{?dist}
+Release:        1jpp.2%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        Apache Software License
 Source0:        http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0.1-src.tar.gz
 Patch0:         %{name}-disablecryptotests.patch
+# Add OSGi MANIFEST.MF bits
+Patch1:         %{name}-addosgimanifest.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries/Java
 %if ! %{gcj_support}
@@ -124,6 +126,11 @@
 
 %patch0
 
+pushd src/conf
+%{__sed} -i 's/\r//' MANIFEST.MF
+%patch1
+popd
+
 # Use javax classes, not com.sun ones
 # assume no filename contains spaces
 pushd src
@@ -225,6 +232,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1:3.0.1-1jpp.2
+- Add OSGi MANIFEST.MF information.
+
 * Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> - 1:3.0.1-1jpp.1
 - Merge with upstream and more rpmlint cleanup.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 18:17:30 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 6 Sep 2007 14:17:30 -0400
Subject: rpms/audit/devel audit-1.6.1-event-host.patch, NONE, 1.1 audit.spec,
	1.145, 1.146
Message-ID: <200709061817.l86IHUnF031526@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31504

Modified Files:
	audit.spec 
Added Files:
	audit-1.6.1-event-host.patch 
Log Message:
* Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
- Fix uninitialized variable in auparse (John Dennis)


audit-1.6.1-event-host.patch:

--- NEW FILE audit-1.6.1-event-host.patch ---
diff -r -u audit-1.6.1.orig/auparse/auparse.c audit-1.6.1/auparse/auparse.c
--- audit-1.6.1.orig/auparse/auparse.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/auparse.c	2007-09-06 12:31:27.000000000 -0400
@@ -574,6 +574,7 @@
 {
 	char *ptr, *tmp;
 
+        e->host = NULL;         // FIXME
 	tmp = strndupa(b, 80);
 	ptr = strtok(tmp, " ");
 	if (ptr) {
diff -r -u audit-1.6.1.orig/auparse/ellist.c audit-1.6.1/auparse/ellist.c
--- audit-1.6.1.orig/auparse/ellist.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/ellist.c	2007-09-06 10:21:14.000000000 -0400
@@ -35,6 +35,7 @@
 	l->e.milli = 0L;       
 	l->e.sec = 0L;         
 	l->e.serial = 0L;
+	l->e.host = NULL;
 }
 hidden_def(aup_list_create);
 
@@ -258,6 +259,7 @@
 	l->e.milli = 0L;       
 	l->e.sec = 0L;         
 	l->e.serial = 0L;      
+	l->e.host = NULL;      
 }
 hidden_def(aup_list_clear);
 
@@ -269,6 +271,7 @@
 	e->sec = l->e.sec;
         e->milli = l->e.milli;
         e->serial = l->e.serial;
+        e->host = l->e.host;
 	return 1;
 }
 hidden_def(aup_list_get_event);
@@ -281,6 +284,7 @@
 	l->e.sec = e->sec;
         l->e.milli = e->milli;
         l->e.serial = e->serial;
+        l->e.host = e->host;
 	return 1;
 }
 hidden_def(aup_list_set_event);
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.c audit-1.6.1/auparse/test/auparse_test.c
--- audit-1.6.1.orig/auparse/test/auparse_test.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.c	2007-09-06 10:21:14.000000000 -0400
@@ -42,7 +42,7 @@
 				printf("Error getting timestamp - aborting\n");
 				exit(1);
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			auparse_first_field(au);
 			do {
 				printf("        %s=%s (%s)\n",
@@ -80,7 +80,7 @@
 				printf("Error getting timestamp - aborting\n");
 				exit(1);
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			printf("\n");
 			record_cnt++;
 		} while(auparse_next_record(au) > 0);
@@ -207,7 +207,7 @@
 			if (e == NULL) {
 				return;
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			auparse_first_field(au);
 			do {
 				printf("        %s=%s (%s)\n",
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.py audit-1.6.1/auparse/test/auparse_test.py
--- audit-1.6.1.orig/auparse/test/auparse_test.py	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.py	2007-09-06 11:57:52.000000000 -0400
@@ -10,12 +10,19 @@
 import sys
 import time
 load_path = '../../bindings/python/build/lib.linux-i686-2.4'
-if True:
+if False:
     sys.path.insert(0, load_path)
 
 import auparse
 import audit
 
+def none_to_null(s):
+    'used so output matches C version'
+    if s is None:
+        return '(null)'
+    else:
+        return s
+
 def walk_test(au):
     event_cnt = 1
 
@@ -39,7 +46,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             au.first_field()
             while True:
                 print "        %s=%s (%s)" % (au.get_field_name(), au.get_field_str(), au.interpret_field())
@@ -71,7 +78,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             print
             record_cnt += 1
             if not au.next_record(): break
@@ -131,7 +138,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             au.first_field()
             while True:
                 print "        %s=%s (%s)" % (au.get_field_name(), au.get_field_str(), au.interpret_field())
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.ref audit-1.6.1/auparse/test/auparse_test.ref
--- audit-1.6.1.orig/auparse/test/auparse_test.ref	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.ref	2007-09-06 13:01:19.000000000 -0400
@@ -11,7 +11,7 @@
 event 1 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=1 file=None
-    event time: 1143146623.787:142
+    event time: 1143146623.787:142, host=(null)
         type=LOGIN (LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -21,7 +21,7 @@
 event 2 has 1 records
     record 1 of type 1300(SYSCALL) has 24 fields
     line=2 file=None
-    event time: 1143146623.875:143
+    event time: 1143146623.875:143, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=188 (setxattr)
@@ -50,7 +50,7 @@
 event 3 has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=3 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
         type=USER_LOGIN (USER_LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -68,7 +68,7 @@
 event has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=1 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
 
 Test 3 Done
 
@@ -76,7 +76,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -91,7 +91,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -121,13 +121,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -142,7 +142,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=./test.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -158,7 +158,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=./test.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -174,7 +174,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=./test.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -184,7 +184,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=./test.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -200,7 +200,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=./test.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -216,7 +216,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=./test.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -235,7 +235,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -250,7 +250,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -280,13 +280,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -301,7 +301,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=test.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -317,7 +317,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=test.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -333,7 +333,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=test.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -343,7 +343,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=test.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -359,7 +359,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=test.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -375,7 +375,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=test.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -391,7 +391,7 @@
 event 8 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read (read)
@@ -406,7 +406,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -436,13 +436,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -457,7 +457,7 @@
 event 9 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=test2.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -473,7 +473,7 @@
 event 10 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=test2.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -489,7 +489,7 @@
 event 11 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=test2.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -499,7 +499,7 @@
 event 12 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=test2.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -515,7 +515,7 @@
 event 13 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=test2.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -531,7 +531,7 @@
 event 14 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=test2.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -572,7 +572,7 @@
 event 1 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=1 file=None
-    event time: 1143146623.787:142
+    event time: 1143146623.787:142, host=(null)
         type=LOGIN (LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -582,7 +582,7 @@
 event 2 has 1 records
     record 1 of type 1300(SYSCALL) has 24 fields
     line=2 file=None
-    event time: 1143146623.875:143
+    event time: 1143146623.875:143, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=188 (setxattr)
@@ -611,7 +611,7 @@
 event 3 has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=3 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
         type=USER_LOGIN (USER_LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -629,7 +629,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -644,7 +644,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -674,13 +674,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -695,7 +695,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=None
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -711,7 +711,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=None
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -727,7 +727,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=None
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -737,7 +737,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=None
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -753,7 +753,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=None
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -769,7 +769,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=None
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- audit.spec	2 Sep 2007 16:49:22 -0000	1.145
+++ audit.spec	6 Sep 2007 18:16:57 -0000	1.146
@@ -1,14 +1,15 @@
 %define sca_version 0.4.3
-%define sca_release 3
+%define sca_release 4
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+Patch1: audit-1.6.1-event-host.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -209,6 +211,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
+- Fix uninitialized variable in auparse (John Dennis)
+
 * Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
 - External plugin support in place
 - Fix reference counting in auparse python bindings (#263961)



From fedora-extras-commits at redhat.com  Thu Sep  6 18:45:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 14:45:43 -0400
Subject: rpms/mesa/devel mesa-7.0.1-965-sampler-crash.patch, NONE,
	1.1 mesa.spec, 1.139, 1.140
Message-ID: <200709061845.l86Ijh9U032042@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32021

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.0.1-965-sampler-crash.patch 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)


mesa-7.0.1-965-sampler-crash.patch:

--- NEW FILE mesa-7.0.1-965-sampler-crash.patch ---
commit 410d8f7cdb40889e66f5c6794878ad9a5f572ee7
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Aug 29 10:13:10 2007 -0400

    i965: samplers group in fours in WM_STATE. fix bug#9415

diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index ff5cb31..5b4f2ab 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -117,7 +117,7 @@ static void upload_wm_unit(struct brw_context *brw )
    wm.thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
 
    /* CACHE_NEW_SAMPLER */
-   wm.wm4.sampler_count = brw->wm.sampler_count;
+   wm.wm4.sampler_count = (brw->wm.sampler_count + 1) / 4;
    wm.wm4.sampler_state_pointer = brw->wm.sampler_gs_offset >> 5;
 
    /* BRW_NEW_FRAGMENT_PROGRAM */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mesa.spec	28 Aug 2007 13:39:17 -0000	1.139
+++ mesa.spec	6 Sep 2007 18:45:11 -0000	1.140
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -52,6 +52,7 @@
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.0.1-stable-branch.patch
 Patch27: mesa-7.0-use_master-r300.patch
+Patch28: mesa-7.0.1-965-sampler-crash.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -183,6 +184,7 @@
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .stable
 %patch27 -p1 -b .r300
+%patch28 -p1 -b .965-sampler
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -412,6 +414,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
+- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
+
 * Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 7.0.1-4
 - Rebuild for new libexpat.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 18:55:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 14:55:56 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.61, 1.62 gnome-utils.spec,
	1.152, 1.153 sources, 1.65, 1.66
Message-ID: <200709061855.l86Itu8r032283@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	4 Sep 2007 05:03:17 -0000	1.61
+++ .cvsignore	6 Sep 2007 18:55:24 -0000	1.62
@@ -1 +1 @@
-gnome-utils-2.19.91.tar.bz2
+gnome-utils-2.19.92.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gnome-utils.spec	4 Sep 2007 05:03:17 -0000	1.152
+++ gnome-utils.spec	6 Sep 2007 18:55:24 -0000	1.153
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.91
+Version:        2.19.92
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -236,6 +236,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	4 Sep 2007 05:03:17 -0000	1.65
+++ sources	6 Sep 2007 18:55:24 -0000	1.66
@@ -1 +1 @@
-b1d4fd889d9a556f11f17a06ebb8ef81  gnome-utils-2.19.91.tar.bz2
+87d0ebb61b53f5a5011cb4b380e1cf86  gnome-utils-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 19:06:08 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 15:06:08 -0400
Subject: rpms/avahi/devel avahi-0.6.21-libdns_sd-fix.patch, NONE,
	1.1 avahi-0.6.21-initscript.patch, 1.1, 1.2 avahi.spec, 1.94, 1.95
Message-ID: <200709061906.l86J686B006205@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6158

Modified Files:
	avahi-0.6.21-initscript.patch avahi.spec 
Added Files:
	avahi-0.6.21-libdns_sd-fix.patch 
Log Message:
- resolves #249044: Update init script to use runlevel 96
- resolves #251700: Fix assertion in libdns_sd-compat


avahi-0.6.21-libdns_sd-fix.patch:

--- NEW FILE avahi-0.6.21-libdns_sd-fix.patch ---
Index: avahi-compat-libdns_sd/compat.c
===================================================================
--- avahi-compat-libdns_sd/compat.c	(revision 1535)
+++ avahi-compat-libdns_sd/compat.c	(revision 1536)
@@ -990,6 +990,16 @@
                     return;
                 }
             }
+
+            if (!sdref->service_name_chosen) {
+
+                assert(sdref->service_name);
+                
+                if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) {
+                    reg_report_error(sdref, kDNSServiceErr_NoMemory);
+                    return;
+                }
+            }
             
             /* Register the service */
 

avahi-0.6.21-initscript.patch:

Index: avahi-0.6.21-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi-0.6.21-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.21-initscript.patch	28 Aug 2007 18:31:08 -0000	1.1
+++ avahi-0.6.21-initscript.patch	6 Sep 2007 19:05:34 -0000	1.2
@@ -1,7 +1,19 @@
-diff -up avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript avahi-0.6.21/initscript/fedora/avahi-daemon.in
---- avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript	2007-08-28 15:00:24.000000000 +0200
-+++ avahi-0.6.21/initscript/fedora/avahi-daemon.in	2007-08-28 17:34:28.000000000 +0200
-@@ -14,20 +14,25 @@ OTHER_AVAHI_OPTS=""
+Index: initscript/fedora/avahi-dnsconfd.in
+===================================================================
+--- initscript/fedora/avahi-dnsconfd.in	(revision 1531)
++++ initscript/fedora/avahi-dnsconfd.in	(revision 1535)
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ #
+-# avahi-daemon:       Starts the Avahi dns configuration daemon
++# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 97 02
++# chkconfig: - 96 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script \
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced \
+ #       on the local LAN. This is useful for configuring unicast DNS servers in \
+@@ -14,18 +14,24 @@
  
  # Source function library.
  . /etc/init.d/functions
@@ -10,40 +22,58 @@
  
 -# Check that networking is configured.
 -[ ${NETWORKING} = "no" ] && exit 0
- 
- AVAHI_BIN=@sbindir@/avahi-daemon
+-
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
 -test -x $AVAHI_BIN || exit 5
-+
+ 
 +if [ $1 == 'status' ]; then
 +    test -x $AVAHI_BIN || exit 4
 +else 
 +    test -x $AVAHI_BIN || exit 5
 +fi
++
+ LOCKFILE=/var/lock/subsys/avahi-dnsconfd
  
- LOCKFILE=/var/lock/subsys/avahi-daemon
- 
- base=${0##*/}
- 
++base=${0##*/}
++
  start() {
 +    # Check that networking is configured.
 +    [ ${NETWORKING} = "no" ] && exit 1
 +
- 	echo -n $"Starting Avahi daemon... "
- 	if [ -s /etc/localtime ]; then
- 	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
-@@ -96,7 +101,7 @@ case "$1" in
+ 	echo -n $"Starting Avahi DNS daemon... "
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+@@ -58,7 +64,6 @@
+ 	return $RETVAL
+ }
+ 
+-
+ restart() {
+ 	stop
+ 	start
+@@ -92,7 +97,7 @@
  	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 -	exit 1
 +	exit 2
+ 	;;
  esac
  
- exit $RETVAL
-diff -up avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in
---- avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript	2007-08-28 17:35:07.000000000 +0200
-+++ avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in	2007-08-28 17:36:48.000000000 +0200
-@@ -14,18 +14,21 @@ OTHER_AVAHI_OPTS=""
+Index: initscript/fedora/avahi-daemon.in
+===================================================================
+--- initscript/fedora/avahi-daemon.in	(revision 1531)
++++ initscript/fedora/avahi-daemon.in	(revision 1535)
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi Daemon
+ #
+-# chkconfig: 345 97 02
++# chkconfig: 345 96 02
+ # description: This is a daemon which runs on client machines to perform \
+ #              Zeroconf service discovery on a network. avahi-daemon must be \
+ #              running on systems  that use Avahi for service discovery. \
+@@ -14,20 +14,24 @@
  
  # Source function library.
  . /etc/init.d/functions
@@ -53,29 +83,33 @@
 -# Check that networking is configured.
 -[ ${NETWORKING} = "no" ] && exit 0
 -
- AVAHI_BIN=@sbindir@/avahi-dnsconfd
+ AVAHI_BIN=@sbindir@/avahi-daemon
 -test -x $AVAHI_BIN || exit 5
+ 
 +if [ $1 == 'status' ]; then
 +    test -x $AVAHI_BIN || exit 4
 +else 
 +    test -x $AVAHI_BIN || exit 5
 +fi
++
+ LOCKFILE=/var/lock/subsys/avahi-daemon
  
- LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+ base=${0##*/}
  
  start() {
 +    # Check that networking is configured.
 +    [ ${NETWORKING} = "no" ] && exit 1
 +
- 	echo -n $"Starting Avahi DNS daemon... "
-         $AVAHI_BIN -D
- 	RETVAL=$?
-@@ -92,7 +95,7 @@ case "$1" in
+ 	echo -n $"Starting Avahi daemon... "
+ 	if [ -s /etc/localtime ]; then
+ 	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
+@@ -96,7 +100,8 @@
  	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 -	exit 1
 +	exit 2
- 	;;
++        ;;
  esac
  
+ exit $RETVAL


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- avahi.spec	6 Sep 2007 16:28:52 -0000	1.94
+++ avahi.spec	6 Sep 2007 19:05:35 -0000	1.95
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -39,6 +39,7 @@
 Patch1:     avahi-0.6.21-avahi-browse-help-fix.patch
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch3:     avahi-0.6.21-initscript.patch
+Patch4:     avahi-0.6.21-libdns_sd-fix.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -221,8 +222,9 @@
 %patch1 -p0 -b .avahi-browse-help-fix
 %if %{WITH_MONO}
 %patch2 -p1 -b .MONO_SHARED_DIR
-%patch3 -p1 -b .initscript
 %endif
+%patch3 -p0 -b .initscript
+%patch4 -p0 -b .dns_sd
 
 %build
 
@@ -483,6 +485,10 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-5
+- resolves #249044: Update init script to use runlevel 96
+- resolves #251700: Fix assertion in libdns_sd-compat
+
 * Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-4
 - Ship ssh static service file by default, don't ship ssh-sftp by default
 - resolves: #269741: split off avahi-ui-tools package



From fedora-extras-commits at redhat.com  Thu Sep  6 19:09:16 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 6 Sep 2007 15:09:16 -0400
Subject: rpms/obexftp/devel .cvsignore, 1.4, 1.5 obexftp.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709061909.l86J9GPa006339@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/obexftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6313

Modified Files:
	.cvsignore obexftp.spec sources 
Log Message:
- updated to 0.22-rc7
- added pkgconfig file
- make perl BR more specific



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Aug 2007 19:06:25 -0000	1.4
+++ .cvsignore	6 Sep 2007 19:08:43 -0000	1.5
@@ -1 +1 @@
-obexftp-0.22-rc6.tar.bz2
+obexftp-0.22-rc7.tar.bz2


Index: obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/obexftp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obexftp.spec	27 Aug 2007 18:59:03 -0000	1.7
+++ obexftp.spec	6 Sep 2007 19:08:43 -0000	1.8
@@ -2,13 +2,13 @@
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
 %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
-%define pre rc6
+%define pre rc7
 
 Name: obexftp
 Summary: Tool to access devices via the OBEX protocol
 Group: Applications/File
 Version: 0.22
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.bz2
@@ -19,7 +19,7 @@
 BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: openobex-devel >= 1.2
-BuildRequires: perl-devel
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: python-devel
 BuildRequires: tcl-devel
 
@@ -74,6 +74,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: openobex-devel >= 1.2
+Requires: pkgconfig
 
 %description devel
 This package contains the header files, static libraries and development
@@ -120,6 +121,7 @@
 %{_includedir}/multicobex/
 %{_includedir}/obexftp/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/obexftp.pc
 
 %files -n python-%{name}
 %defattr(-, root, root, -)
@@ -138,6 +140,11 @@
 %{ruby_sitearch}/obexftp.so
 
 %changelog
+* Thu Sep 06 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.22-0.5.rc7
+- updated to 0.22-rc7
+- added pkgconfig file
+- make perl BR more specific
+
 * Mon Aug 27 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.22-0.4.rc6
 - rebuilt for BuildID
 - updated license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Aug 2007 19:06:25 -0000	1.4
+++ sources	6 Sep 2007 19:08:43 -0000	1.5
@@ -1 +1 @@
-79c50f564bdeeba662fd0fa384bfa183  obexftp-0.22-rc6.tar.bz2
+3c2a9807288fd6c6f564d10fbc2bc8c0  obexftp-0.22-rc7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 19:11:32 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 6 Sep 2007 15:11:32 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24, 
	1.25 telepathy-gabble.spec, 1.33, 1.34
Message-ID: <200709061911.l86JBWTO006609@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6574

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	4 Sep 2007 21:19:00 -0000	1.24
+++ .cvsignore	6 Sep 2007 19:10:58 -0000	1.25
@@ -4,3 +4,4 @@
 telepathy-gabble-0.5.12.1.20070711darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
+telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Sep 2007 21:19:00 -0000	1.24
+++ sources	6 Sep 2007 19:10:58 -0000	1.25
@@ -1 +1 @@
-07d399b2e41a5ba90d410e5102b5c872  telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
+6bf82d42255c15f819639c78765c27af  telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- telepathy-gabble.spec	4 Sep 2007 21:24:56 -0000	1.33
+++ telepathy-gabble.spec	6 Sep 2007 19:10:58 -0000	1.34
@@ -1,19 +1,19 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070904darcs_olpctrial3a
+%define alphatag 20070906darcs_olpctrial3a
 
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.13.1
+Version:        0.5.14.1
 Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.13.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.%{alphatag}.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
+- New snapshot
+
 * Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13.1-0.1.20070904darcs_olpctrial3a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 19:22:50 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 6 Sep 2007 15:22:50 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.51,1.52
Message-ID: <200709061922.l86JMorV006956@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6909

Modified Files:
	kernel-xen.spec 
Log Message:
Actually include the code that generates modules.{networking,block}



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kernel-xen.spec	6 Sep 2007 16:41:47 -0000	1.51
+++ kernel-xen.spec	6 Sep 2007 19:22:17 -0000	1.52
@@ -1633,6 +1633,20 @@
     # mark modules executable so that strip-to-file can strip them
     cat modnames | xargs chmod u+x
 
+    fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA |
+    sed -n 's,^.*/\([^/]*\.ko\):  *U \(.*\)$,\1 \2,p' > drivers.undef
+
+    collect_modules_list()
+    {
+      sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef |
+      LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
+    }
+
+    collect_modules_list networking \
+    			 'register_netdev|ieee80211_register_hw|usbnet_probe'
+    collect_modules_list block \
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue'
+
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do



From fedora-extras-commits at redhat.com  Thu Sep  6 19:24:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 15:24:32 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.153,1.154
Message-ID: <200709061924.l86JOW7v007049@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6994

Modified Files:
	gnome-utils.spec 
Log Message:
fix file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-utils.spec	6 Sep 2007 18:55:24 -0000	1.153
+++ gnome-utils.spec	6 Sep 2007 19:24:00 -0000	1.154
@@ -216,8 +216,6 @@
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_datadir}/icons/hicolor/24x24/apps/baobab.png
 %{_datadir}/icons/hicolor/scalable/apps/baobab.svg
-%{_datadir}/icons/hicolor/48x48/apps/gnome-dictionary.png
-%{_datadir}/icons/hicolor/scalable/apps/gnome-dictionary.svg
 %{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server



From fedora-extras-commits at redhat.com  Thu Sep  6 19:26:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 15:26:44 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.5, 1.6 openoffice.org.spec, 1.1303, 1.1304
Message-ID: <200709061926.l86JQi7O007195@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7172

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
scale back on visibility

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	2 Dec 2006 11:40:26 -0000	1.5
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	6 Sep 2007 19:26:41 -0000	1.6
@@ -9,22 +9,22 @@
      case ${sd_arg} in
      -calc)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+	sd_binary="scalc.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -draw)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+	sd_binary="sdraw.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -impress)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+	sd_binary="simpress.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -writer)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+	sd_binary="swriter.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      *)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1303
retrieving revision 1.1304
diff -u -r1.1303 -r1.1304
--- openoffice.org.spec	6 Sep 2007 17:45:42 -0000	1.1303
+++ openoffice.org.spec	6 Sep 2007 19:26:41 -0000	1.1304
@@ -1100,6 +1100,9 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#visibility seem to be f*cked up right now
+unset HAVE_GCC_VISIBILITY_FEATURE
+#unneccessary to build for both hash types
 unset HAVE_LD_HASH_STYLE
 #faster build
 export nodep=true
@@ -2782,6 +2785,7 @@
 - add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 - disable custom launchers, it breaks icedtea for some reason I haven't time to
   figure out
+- disable visibility for now, seems screwed up.
 
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:09 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 6 Sep 2007 15:37:09 -0400
Subject: rpms/gnu-smalltalk/devel gst-2.3.6-am.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 gnu-smalltalk.spec, 1.21, 1.22 sources, 1.7,
	1.8 gst-2.3.5-am.patch, 1.1, NONE
Message-ID: <200709061937.l86Jb9ro007602@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561

Modified Files:
	.cvsignore gnu-smalltalk.spec sources 
Added Files:
	gst-2.3.6-am.patch 
Removed Files:
	gst-2.3.5-am.patch 
Log Message:
New upstream release

gst-2.3.6-am.patch:

--- NEW FILE gst-2.3.6-am.patch ---
diff -up smalltalk-2.3.6/configure.automake smalltalk-2.3.6/configure
--- smalltalk-2.3.6/configure.automake	2007-09-06 09:34:49.000000000 +0200
+++ smalltalk-2.3.6/configure	2007-09-06 20:56:08.000000000 +0200
@@ -723,7 +723,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='GNU Smalltalk'
-PACKAGE_TARNAME='smalltalk'
+PACKAGE_TARNAME='gnu-smalltalk'
 PACKAGE_VERSION='2.3.6'
 PACKAGE_STRING='GNU Smalltalk 2.3.6'
 PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
@@ -947,8 +947,7 @@ CPP
 EMACS
 EMACSLOADPATH'
 ac_subdirs_all='libffi
-snprintfv
-sigsegv'
+snprintfv'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1498,7 +1497,7 @@ Fine tuning of the installation director
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/smalltalk]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gnu-smalltalk]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -2434,7 +2433,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='smalltalk'
+ PACKAGE='gnu-smalltalk'
  VERSION='2.3.6'
 
 
@@ -5239,7 +5238,140 @@ esac
 fi
 
 if test $enable_generational_gc != no; then
-  subdirs="$subdirs sigsegv"
+  if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for sigsegv.h" >&5
+echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
+echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sigsegv.h usability" >&5
+echo $ECHO_N "checking sigsegv.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <sigsegv.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sigsegv.h presence" >&5
+echo $ECHO_N "checking sigsegv.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sigsegv.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sigsegv.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sigsegv.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sigsegv.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sigsegv.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sigsegv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to help-smalltalk at gnu.org ##
+## ------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for sigsegv.h" >&5
+echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sigsegv_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
+echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
+
+fi
+if test $ac_cv_header_sigsegv_h = yes; then
+  MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la"
+fi
+
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -8462,7 +8594,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8465 "configure"' > conftest.$ac_ext
+  echo '#line 8597 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10020,11 +10152,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10023: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10155: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10027: \$? = $ac_status" >&5
+   echo "$as_me:10159: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10263,11 +10395,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10266: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10398: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10270: \$? = $ac_status" >&5
+   echo "$as_me:10402: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10323,11 +10455,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10326: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10458: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10330: \$? = $ac_status" >&5
+   echo "$as_me:10462: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12471,7 +12603,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12474 "configure"
+#line 12606 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12569,7 +12701,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12572 "configure"
+#line 12704 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18084,7 +18216,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18087 "configure"
+#line 18219 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff -up smalltalk-2.3.6/Makefile.in.automake smalltalk-2.3.6/Makefile.in
--- smalltalk-2.3.6/Makefile.in.automake	2007-09-06 09:34:44.000000000 +0200
+++ smalltalk-2.3.6/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -276,7 +276,7 @@ MODULES_TK = @MODULES_TK@
 NCURSES_DISABLED = @NCURSES_DISABLED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-PACKAGE = smalltalk
+PACKAGE = gnu-smalltalk
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -324,7 +324,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-imagedir = @imagedir@
+imagedir = ${libdir}/@PACKAGE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -349,7 +349,7 @@ target_alias = @target_alias@
 # Automake requirements
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
 	i18n tcp examples blox-tk . gtk tests doc
 
 SUBDIRS = lib-src lightning $(subdirs) $(am__append_1) libgst i18n tcp \
@@ -1122,19 +1122,19 @@ dist-hook: gst-package
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
 	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+	-rm -f $(DESTDIR)$(imagesdir)/packages.xml
 	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
diff -up smalltalk-2.3.6/Makefile.am.automake smalltalk-2.3.6/Makefile.am
--- smalltalk-2.3.6/Makefile.am.automake	2007-09-06 09:29:42.000000000 +0200
+++ smalltalk-2.3.6/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -19,9 +19,9 @@
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
 
-PACKAGE=smalltalk
+PACKAGE=gnu-smalltalk
 
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
 	i18n tcp examples blox-tk . gtk tests doc
 
 SUBDIRS = lib-src lightning $(subdirs)
@@ -50,6 +50,7 @@ dist_noinst_SCRIPTS = build-aux/texi2dvi
 ###########################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
+imagedir = ${libdir}/@PACKAGE@
 nodist_pkgconfig_DATA = gnu-smalltalk.pc
 
 pkglib_DATA = libc.la
@@ -158,19 +159,19 @@ dist-hook: gst-package
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
 	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+	-rm -f $(DESTDIR)$(imagesdir)/packages.xml
 	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
diff -up smalltalk-2.3.6/configure.ac.automake smalltalk-2.3.6/configure.ac
--- smalltalk-2.3.6/configure.ac.automake	2007-09-06 09:28:23.000000000 +0200
+++ smalltalk-2.3.6/configure.ac	2007-09-06 20:56:00.000000000 +0200
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 2.3.6, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 2.3.6, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -80,7 +80,7 @@ AC_ARG_ENABLE(generational-gc,
         *) enable_generational_gc=yes ;;
 esac])
 if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
+  AC_CHECK_HEADER(sigsegv.h, MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la")
   AC_DEFINE(HAVE_SIGSEGV_H, 1,
     [Define to 1 if libsigsegv is being used])
 fi
diff -up smalltalk-2.3.6/examples/Makefile.in.automake smalltalk-2.3.6/examples/Makefile.in
--- smalltalk-2.3.6/examples/Makefile.in.automake	2007-09-06 09:34:34.000000000 +0200
+++ smalltalk-2.3.6/examples/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -281,7 +281,7 @@ sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
 EXTRA_LTLIBRARIES = gdbm.la zlib.la
 pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la
diff -up smalltalk-2.3.6/examples/Makefile.am.automake smalltalk-2.3.6/examples/Makefile.am
--- smalltalk-2.3.6/examples/Makefile.am.automake	2007-05-24 22:10:25.000000000 +0200
+++ smalltalk-2.3.6/examples/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -1,4 +1,4 @@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
 
diff -up smalltalk-2.3.6/libgst/Makefile.in.automake smalltalk-2.3.6/libgst/Makefile.in
--- smalltalk-2.3.6/libgst/Makefile.in.automake	2007-09-06 09:34:39.000000000 +0200
+++ smalltalk-2.3.6/libgst/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -41,10 +41,8 @@ host_triplet = @host@
 @HAVE_INSTALLED_LIGHTNING_FALSE at am__append_1 = -I$(top_srcdir)/lightning -I$(top_builddir)/lightning \
 @HAVE_INSTALLED_LIGHTNING_FALSE@  -I$(top_srcdir) -I$(top_builddir)
 
- at HAVE_SIGSEGV_TRUE@am__append_2 = -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
 EXTRA_PROGRAMS = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
- at HAVE_SIGSEGV_TRUE@am__append_3 = $(top_builddir)/sigsegv/src/libsigsegv.la
- at HAVE_SIGSEGV_TRUE@am__append_4 = $(top_builddir)/sigsegv/src/libsigsegv.la
+ at HAVE_SIGSEGV_TRUE@am__append_2 = -lsigsegv
 subdir = libgst
 DIST_COMMON = $(dist_noinst_DATA) $(include_HEADERS) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
@@ -97,8 +95,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
- at HAVE_SIGSEGV_TRUE@am__DEPENDENCIES_1 =  \
- at HAVE_SIGSEGV_TRUE@	$(top_builddir)/sigsegv/src/libsigsegv.la
+am__DEPENDENCIES_1 =
 am_libgst_la_OBJECTS = interp.lo lib.lo gst-parse.lo lex.lo str.lo \
 	tree.lo byte.lo comp.lo sym.lo dict.lo oop.lo opt.lo save.lo \
 	cint.lo heap.lo input.lo sysdep.lo callin.lo xlat.lo events.lo \
@@ -314,8 +311,7 @@ AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatad
 	-DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
 	-I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
 	-I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-	@INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \
-	$(am__append_1) $(am__append_2)
+	@INCSNPRINTFV@ -I$(top_builddir)/lib-src $(am__append_1)
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 CLEANFILES = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
@@ -323,10 +319,10 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
 # definitions for libgst.la
 libgst_la_LIBADD = $(top_builddir)/lib-src/library.la \
 	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ \
-	@LIBGMP@ $(am__append_3)
+	@LIBGMP@ $(am__append_2)
 libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ \
-	$(am__append_4)
+	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
 	-export-symbols-regex "^gst_.*"
 
diff -up smalltalk-2.3.6/libgst/Makefile.am.automake smalltalk-2.3.6/libgst/Makefile.am
--- smalltalk-2.3.6/libgst/Makefile.am.automake	2007-02-13 17:32:35.000000000 +0100
+++ smalltalk-2.3.6/libgst/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -8,17 +8,13 @@ AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatad
   -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
   -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
   -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-  @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
+  @INCSNPRINTFV@ -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
 AM_CPPFLAGS += -I$(top_srcdir)/lightning -I$(top_builddir)/lightning \
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
-
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -33,8 +29,7 @@ libgst_la_DEPENDENCIES=$(top_builddir)/l
 	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
 
 if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
+libgst_la_LIBADD += -lsigsegv
 endif
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
@@ -113,6 +108,7 @@ $(srcdir)/match.stamp: byte.def byte.c o
 	@echo timestamp > $(srcdir)/match.stamp
 
 
+
 # rules for invoking genprims
 # Try to economize in the rebuilds, by avoiding unnecessary
 # changes to the timestamp of prims.inl


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jun 2007 18:50:46 -0000	1.7
+++ .cvsignore	6 Sep 2007 19:36:36 -0000	1.8
@@ -1 +1 @@
-smalltalk-2.3.5.tar.gz
+smalltalk-2.3.6.tar.gz


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnu-smalltalk.spec	9 Aug 2007 17:49:00 -0000	1.21
+++ gnu-smalltalk.spec	6 Sep 2007 19:36:36 -0000	1.22
@@ -1,9 +1,9 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 2.3.5
-Release: 3%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-2.3.5-am.patch
+Patch1: gst-2.3.6-am.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -142,6 +142,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Thu Sep  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-3
 - Try to fix smp_mflags issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jun 2007 18:50:46 -0000	1.7
+++ sources	6 Sep 2007 19:36:36 -0000	1.8
@@ -1 +1 @@
-552df4030532f4c1dcc24cfb0c5ad097  smalltalk-2.3.5.tar.gz
+c2fd207d55a873531ad89750f7f6478e  smalltalk-2.3.6.tar.gz


--- gst-2.3.5-am.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:13 -0700
Subject: [pkgdb] micq was added for ondrejj
Message-ID: <200709061937.l86JbFb4001127@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package micq with summary Text/line based ICQ client with many features
Kevin Fenzi (kevin) has approved Package micq
Kevin Fenzi (kevin) has added a Fedora devel branch for micq with an owner of ondrejj
Kevin Fenzi (kevin) has approved micq in Fedora devel
Kevin Fenzi (kevin) has approved Package micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, 6) updated by kevin
Message-ID: <200709061937.l86JbODx001136@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora 6)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, 7) updated by kevin
Message-ID: <200709061937.l86JbODv001145@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, devel) updated by kevin
Message-ID: <200709061937.l86JbOMl001155@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:54 -0400
Subject: rpms/micq - New directory
Message-ID: <200709061937.l86JbsiM007704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq

Log Message:
Directory /cvs/extras/rpms/micq added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:56 -0400
Subject: rpms/micq/devel - New directory
Message-ID: <200709061937.l86Jbu9x007720@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq/devel

Log Message:
Directory /cvs/extras/rpms/micq/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:59 -0400
Subject: rpms/micq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061937.l86JbxeE007747@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq

Added Files:
	Makefile import.log 
Log Message:
Setup of module micq


--- NEW FILE Makefile ---
# Top level Makefile for module micq
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:38:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:38:01 -0400
Subject: rpms/micq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709061938.l86Jc1wC007763@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module micq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: micq
# $Id: Makefile,v 1.1 2007/09/06 19:37:59 kevin Exp $
NAME := micq
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:40:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:30 -0400
Subject: rpms/tomcat-native - New directory
Message-ID: <200709061940.l86JeU6S008087@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native

Log Message:
Directory /cvs/extras/rpms/tomcat-native added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:34 -0400
Subject: rpms/tomcat-native/devel - New directory
Message-ID: <200709061940.l86JeYM2008096@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native/devel

Log Message:
Directory /cvs/extras/rpms/tomcat-native/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:39 -0400
Subject: rpms/tomcat-native Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061940.l86JedRr008128@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native

Added Files:
	Makefile import.log 
Log Message:
Setup of module tomcat-native


--- NEW FILE Makefile ---
# Top level Makefile for module tomcat-native
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:42 -0400
Subject: rpms/tomcat-native/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709061940.l86Jeg2t008145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tomcat-native


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tomcat-native
# $Id: Makefile,v 1.1 2007/09/06 19:40:40 kevin Exp $
NAME := tomcat-native
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:41:59 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 15:41:59 -0400
Subject: rpms/kernel/devel linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 
	NONE, 1.1 linux-2.6-x86-fix-hang-on-C7.patch, NONE,
	1.1 linux-2.6-xen-fix-bootup.patch, NONE, 1.1 kernel.spec, 1.149,
	1.150
Message-ID: <200709061941.l86JfxAb008354@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8301

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-x86-fix-hang-on-C7.patch 
	linux-2.6-xen-fix-bootup.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- fix Xen boot problem
- fix boot hang on Via C7 CPU
- Fix oops in networking code


linux-2.6-skb_copy_and_csum_datagram_iovec.patch:

--- NEW FILE linux-2.6-skb_copy_and_csum_datagram_iovec.patch ---
[NET]: Do not dereference iov if length is zero

When msg_iovlen is zero we shouldn't try to dereference
msg_iov.  Right now the only thing that tries to do so
is skb_copy_and_csum_datagram_iovec.  Since the total
length should also be zero if msg_iovlen is zero, it's
sufficient to check the total length there and simply
return if it's zero.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
---
diff --git a/net/core/datagram.c b/net/core/datagram.c
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(str
 	__wsum csum;
 	int chunk = skb->len - hlen;
 
+	if (!chunk)
+		return 0;
+
 	/* Skip filled elements.
 	 * Pretty silly, look at memcpy_toiovec, though 8)
 	 */

linux-2.6-x86-fix-hang-on-C7.patch:

--- NEW FILE linux-2.6-x86-fix-hang-on-C7.patch ---
The CLFLUSH for the modified code line in text_poke was supposed
to speed up CPU recovery. Unfortunately it seems to cause hangs
on some VIA C3s (at least on VIA Esther Model 10 Stepping 9)
Remove it.

Thanks to Stefan Becker for reporting/testing.

Signed-off-by: Andi Kleen <ak at suse.de>

---
 arch/i386/kernel/alternative.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: linux/arch/i386/kernel/alternative.c
===================================================================
--- linux.orig/arch/i386/kernel/alternative.c
+++ linux/arch/i386/kernel/alternative.c
@@ -445,8 +445,6 @@ void __kprobes text_poke(void *addr, uns
 {
 	memcpy(addr, opcode, len);
 	sync_core();
-	/* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline
-	   case. */
-	if (cpu_has_clflush)
-		asm("clflush (%0) " :: "r" (addr) : "memory");
+	/* Could also do a CLFLUSH here to speed up CPU recovery; but
+	   that causes hangs on some VIA CPUs. */
 }

linux-2.6-xen-fix-bootup.patch:

--- NEW FILE linux-2.6-xen-fix-bootup.patch ---
commit 92ea189254b87727d6be407558d9c18fed0937bb
Author: Christian Ehrhardt <lk at c--e.de>
Date:   Mon Sep 3 20:32:38 2007 +0200

    [x86 setup] Work around bug in Xen HVM
    
    Apparently XEN does not keep the contents of the 48-bit gdt_48 data
    structure that is passed to lgdt in the XEN machine state. Instead it
    appears to save the _address_ of the 48-bit descriptor
    somewhere. Unfortunately this data happens to reside on the stack and
    is probably no longer availiable at the time of the actual protected
    mode jump.
    
    This is Xen bug but given that there is a one-line patch to work
    around this problem, the linux kernel should probably do this.  My fix
    is to make the gdt_48 description in setup_gdt static (in setup_idt
    this is already the case). This allows the kernel to boot under
    Xen HVM again.
    
    Signed-off-by: Christian Ehrhardt <lk at c--e.de>
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 6be9ca8..f7958f1 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -122,7 +122,7 @@ static void setup_gdt(void)
 		/* DS: data, read/write, 4 GB, base 0 */
 		[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
 	};
-	struct gdt_ptr gdt;
+	static struct gdt_ptr gdt;
 
 	gdt.len = sizeof(boot_gdt)-1;
 	gdt.ptr = (u32)&boot_gdt + (ds() << 4);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kernel.spec	6 Sep 2007 17:34:27 -0000	1.149
+++ kernel.spec	6 Sep 2007 19:41:27 -0000	1.150
@@ -667,6 +667,9 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
+Patch1520: linux-2.6-xen-fix-bootup.patch
+Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
 
 %endif
 
@@ -1190,6 +1193,14 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# Fix Xen bootup
+ApplyPatch linux-2.6-xen-fix-bootup.patch
+
+# fix oops in with sunrpc
+ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+
+# fix hang on C7 CPU
+ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1783,6 +1794,11 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix Xen boot problem
+- fix boot hang on Via C7 CPU
+- Fix oops in networking code
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - exec-shield: enable interrupts in do_iret_error()
 
 * Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep  6 19:42:28 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 15:42:28 -0400
Subject: comps comps-f8.xml.in,1.94,1.95
Message-ID: <200709061942.l86JgSl3008359@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307

Modified Files:
	comps-f8.xml.in 
Log Message:
Make all 75dpi bitmap fonts optional instead of default or mandatory. (#254086)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- comps-f8.xml.in	6 Sep 2007 00:33:23 -0000	1.94
+++ comps-f8.xml.in	6 Sep 2007 19:41:58 -0000	1.95
@@ -300,9 +300,7 @@
       <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq type="mandatory">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="mandatory">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-misc</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-Type1</packagereq>
@@ -377,6 +375,8 @@
       <packagereq type="optional">xdaliclock</packagereq>
       <packagereq type="optional">xkeycaps</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-resutils</packagereq>
       <packagereq type="optional">xorg-x11-server-Xnest</packagereq>
       <packagereq type="optional">xorg-x11-server-Xvfb</packagereq>
@@ -445,9 +445,7 @@
       <packagereq type="default">bitmap-fonts</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-misc</packagereq>
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
@@ -467,7 +465,9 @@
       <packagereq type="optional">terminus-font-console</packagereq>
       <packagereq type="optional">terminus-font-x11</packagereq>
       <packagereq type="optional">urw-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
@@ -621,12 +621,12 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bg</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bulgarian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -748,10 +748,10 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hr</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hr_HR</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-croatian</packagereq>
     </packagelist>
   </group>
@@ -766,7 +766,6 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-cs</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Czech</packagereq>
@@ -775,6 +774,7 @@
       <packagereq type="conditional" requires="moodle">moodle-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cs_CZ</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1267,12 +1267,12 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ee</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Estonian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-et</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-et</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-et_EE</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2042,13 +2042,13 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hungarian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-hu</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hu_HU</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2902,7 +2902,6 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pl</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Polish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pl</packagereq>
@@ -2910,6 +2909,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-pl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2977,9 +2977,9 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Romanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3017,7 +3017,7 @@
       <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
-      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
     </packagelist>
@@ -3045,7 +3045,6 @@
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-sr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr-Latn</packagereq>
@@ -3053,6 +3052,7 @@
       <packagereq type="conditional" requires="moodle">moodle-sr_cr_bo</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sr_lt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sr_CS</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-serbian</packagereq>
     </packagelist>
   </group>
@@ -3099,12 +3099,12 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-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>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-slovak</packagereq>
     </packagelist>
   </group>
@@ -3119,12 +3119,12 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-sl</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Slovenian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sl_SI</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3689,7 +3689,7 @@
       <packagereq type="conditional" requires="moodle">moodle-tr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-tr_TR</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3707,7 +3707,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-uk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Thu Sep  6 19:44:27 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 15:44:27 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.45,1.46
Message-ID: <200709061944.l86JiR3d008448@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8420

Modified Files:
	desktop-backgrounds.spec 
Log Message:
fix symlinks



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- desktop-backgrounds.spec	5 Sep 2007 18:56:26 -0000	1.45
+++ desktop-backgrounds.spec	6 Sep 2007 19:43:55 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 3
+Release: 4
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -89,9 +89,9 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -sf infinity/am00.png default.png;
- ln -sf infinity/am00.png default-wide.png;
- ln -sf infinity/am00.png default-5_4.png)
+ ln -sf ../infinity/am00.png default.png;
+ ln -sf ../infinity/am00.png default-wide.png;
+ ln -sf ../infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,6 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> - 7.92-4
+- fix symlinks
+
 * Wed Sep  5 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
 - create links for default.png etc until more artwork shows up
 - start animated backgrounds at midnight



From fedora-extras-commits at redhat.com  Thu Sep  6 19:45:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:45:13 -0700
Subject: [pkgdb] aspell-sk was added for ondrejj
Message-ID: <200709061945.l86JjDSD001243@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aspell-sk with summary Slovak dictionaries for Aspell
Kevin Fenzi (kevin) has approved Package aspell-sk
Kevin Fenzi (kevin) has added a Fedora devel branch for aspell-sk with an owner of ondrejj
Kevin Fenzi (kevin) has approved aspell-sk in Fedora devel
Kevin Fenzi (kevin) has approved Package aspell-sk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aspell-sk (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aspell-sk (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aspell-sk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:48:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 15:48:09 -0400
Subject: rpms/kernel/devel linux-2.6-sched-cfs-fix-mc.patch, NONE,
	1.1 kernel.spec, 1.150, 1.151
Message-ID: <200709061948.l86Jm96H008671@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8627

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-sched-cfs-fix-mc.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- fix imbalance in scheduler on multicore systems


linux-2.6-sched-cfs-fix-mc.patch:

--- NEW FILE linux-2.6-sched-cfs-fix-mc.patch ---
Try to fix MC/HT scheduler optimization breakage again, with out breaking
the FUZZ logic.

First fix the check
	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
with this
	if (*imbalance < busiest_load_per_task)

As the current check is always false for nice 0 tasks (as SCHED_LOAD_SCALE_FUZZ
is same as busiest_load_per_task for nice 0 tasks).

With the above change, imbalance was getting reset to 0 in the corner case
condition, making the FUZZ logic fail. Fix it by not corrupting the
imbalance and change the imbalance, only when it finds that the
HT/MC optimization is needed.

Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 9fe473a..03e5e8d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2511,7 +2511,7 @@ group_next:
 	 * a think about bumping its value to force at least one task to be
 	 * moved
 	 */
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
+	if (*imbalance < busiest_load_per_task) {
 		unsigned long tmp, pwr_now, pwr_move;
 		unsigned int imbn;
 
@@ -2563,10 +2563,8 @@ small_imbalance:
 		pwr_move /= SCHED_LOAD_SCALE;
 
 		/* Move if we gain throughput */
-		if (pwr_move <= pwr_now)
-			goto out_balanced;
-
-		*imbalance = busiest_load_per_task;
+		if (pwr_move > pwr_now)
+			*imbalance = busiest_load_per_task;
 	}
 
 	return busiest;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- kernel.spec	6 Sep 2007 19:41:27 -0000	1.150
+++ kernel.spec	6 Sep 2007 19:47:37 -0000	1.151
@@ -670,6 +670,7 @@
 Patch1520: linux-2.6-xen-fix-bootup.patch
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
+Patch1535: linux-2.6-sched-cfs-fix-mc.patch
 
 %endif
 
@@ -1202,6 +1203,9 @@
 # fix hang on C7 CPU
 ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
 
+# fix scheduler on multicore
+ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1794,6 +1798,9 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix imbalance in scheduler on multicore systems
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix Xen boot problem
 - fix boot hang on Via C7 CPU
 - Fix oops in networking code



From fedora-extras-commits at redhat.com  Thu Sep  6 19:49:49 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 6 Sep 2007 15:49:49 -0400
Subject: rpms/openssh/devel openssh-4.3p2-cve-2007-3102.patch, NONE,
	1.1 openssh-4.7p1-audit.patch, NONE,
	1.1 openssh-4.7p1-log-in-chroot.patch, NONE,
	1.1 openssh-4.7p1-mls.patch, NONE,
	1.1 openssh-4.7p1-nss-keys.patch, NONE,
	1.1 openssh-4.7p1-pam-session.patch, NONE,
	1.1 openssh-4.7p1-redhat.patch, NONE,
	1.1 openssh-4.7p1-selinux.patch, NONE,
	1.1 openssh-4.7p1-sftp-drain-acks.patch, NONE,
	1.1 openssh-4.7p1-vendor.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 openssh.spec, 1.112, 1.113 sources, 1.19,
	1.20 openssh-3.9p1-log-in-chroot.patch, 1.1,
	NONE openssh-4.3p2-pam-session.patch, 1.3,
	NONE openssh-4.5p1-audit.patch, 1.1,
	NONE openssh-4.5p1-mls.patch, 1.5,
	NONE openssh-4.5p1-nss-keys.patch, 1.3,
	NONE openssh-4.5p1-redhat.patch, 1.1,
	NONE openssh-4.5p1-selinux.patch, 1.2,
	NONE openssh-4.5p1-sftp-drain-acks.patch, 1.1,
	NONE openssh-4.5p1-vendor.patch, 1.1, NONE
Message-ID: <200709061949.l86Jnn6i008844@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8741

Modified Files:
	.cvsignore openssh.spec sources 
Added Files:
	openssh-4.3p2-cve-2007-3102.patch openssh-4.7p1-audit.patch 
	openssh-4.7p1-log-in-chroot.patch openssh-4.7p1-mls.patch 
	openssh-4.7p1-nss-keys.patch openssh-4.7p1-pam-session.patch 
	openssh-4.7p1-redhat.patch openssh-4.7p1-selinux.patch 
	openssh-4.7p1-sftp-drain-acks.patch openssh-4.7p1-vendor.patch 
Removed Files:
	openssh-3.9p1-log-in-chroot.patch 
	openssh-4.3p2-pam-session.patch openssh-4.5p1-audit.patch 
	openssh-4.5p1-mls.patch openssh-4.5p1-nss-keys.patch 
	openssh-4.5p1-redhat.patch openssh-4.5p1-selinux.patch 
	openssh-4.5p1-sftp-drain-acks.patch openssh-4.5p1-vendor.patch 
Log Message:
* Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
- upgrade to latest upstream
- use libedit in sftp (#203009)
- fixed audit log injection problem (CVE-2007-3102)


openssh-4.3p2-cve-2007-3102.patch:

--- NEW FILE openssh-4.3p2-cve-2007-3102.patch ---
--- openssh-4.3p2/loginrec.c.inject-fix	2007-06-20 21:18:00.000000000 +0200
+++ openssh-4.3p2/loginrec.c	2007-07-13 15:25:35.000000000 +0200
@@ -1389,11 +1389,44 @@
 #endif /* USE_WTMPX */
 
 #ifdef HAVE_LINUX_AUDIT
+static void
+_audit_hexscape(const char *what, char *where, unsigned int size)
+{
+	const char *ptr = what;
+	const char *hex = "0123456789ABCDEF";
+
+	while (*ptr) {
+		if (*ptr == '"' || *ptr < 0x21 || *ptr > 0x7E) {
+			unsigned int i;
+			ptr = what;
+			for (i = 0; *ptr && i+2 < size; i += 2) {
+				where[i] = hex[((unsigned)*ptr & 0xF0)>>4]; /* Upper nibble */
+				where[i+1] = hex[(unsigned)*ptr & 0x0F];   /* Lower nibble */
+				ptr++;
+			}
+			where[i] = '\0';
+			return;
+		}
+		ptr++;
+	}
+	where[0] = '"';
+	if ((unsigned)(ptr - what) < size - 3)
+	{
+		size = ptr - what + 3;
+	}
+	strncpy(where + 1, what, size - 3);
+	where[size-2] = '"';
+	where[size-1] = '\0';
+}
+
+#define AUDIT_LOG_SIZE 128
+#define AUDIT_ACCT_SIZE (AUDIT_LOG_SIZE - 8)
+
 int
 linux_audit_record_event(int uid, const char *username,
 	const char *hostname, const char *ip, const char *ttyn, int success)
 {
-	char buf[64];
+	char buf[AUDIT_LOG_SIZE];
 	int audit_fd, rc;
 
 	audit_fd = audit_open();
@@ -1406,8 +1439,11 @@
 	}
 	if (username == NULL)
 		snprintf(buf, sizeof(buf), "uid=%d", uid);
-	else
-		snprintf(buf, sizeof(buf), "acct=%s", username);
+	else {
+		char encoded[AUDIT_ACCT_SIZE];
+		_audit_hexscape(username, encoded, sizeof(encoded));
+		snprintf(buf, sizeof(buf), "acct=%s", encoded);
+	}
 	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
 		buf, hostname, ip, ttyn, success);
 	close(audit_fd);

openssh-4.7p1-audit.patch:

--- NEW FILE openssh-4.7p1-audit.patch ---
diff -up openssh-4.7p1/auth.c.audit openssh-4.7p1/auth.c
--- openssh-4.7p1/auth.c.audit	2007-03-26 18:35:28.000000000 +0200
+++ openssh-4.7p1/auth.c	2007-09-06 17:07:44.000000000 +0200
@@ -286,6 +286,12 @@ auth_log(Authctxt *authctxt, int authent
 		    get_canonical_hostname(options.use_dns), "ssh", &loginmsg);
 # endif
 #endif
+#if HAVE_LINUX_AUDIT
+	if (authenticated == 0 && !authctxt->postponed) {
+		linux_audit_record_event(-1, authctxt->user, NULL,
+			get_remote_ipaddr(), "sshd", 0);
+	}
+#endif
 #ifdef SSH_AUDIT_EVENTS
 	if (authenticated == 0 && !authctxt->postponed)
 		audit_event(audit_classify_auth(method));
@@ -492,6 +498,10 @@ getpwnamallow(const char *user)
 		record_failed_login(user,
 		    get_canonical_hostname(options.use_dns), "ssh");
 #endif
+#ifdef HAVE_LINUX_AUDIT
+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
+			"sshd", 0);
+#endif
 #ifdef SSH_AUDIT_EVENTS
 		audit_event(SSH_INVALID_USER);
 #endif /* SSH_AUDIT_EVENTS */
diff -up openssh-4.7p1/loginrec.c.audit openssh-4.7p1/loginrec.c
--- openssh-4.7p1/loginrec.c.audit	2007-04-29 04:10:58.000000000 +0200
+++ openssh-4.7p1/loginrec.c	2007-09-06 17:07:44.000000000 +0200
@@ -176,6 +176,10 @@
 #include "auth.h"
 #include "buffer.h"
 
+#ifdef HAVE_LINUX_AUDIT
+# include <libaudit.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif
@@ -202,6 +206,9 @@ int utmp_write_entry(struct logininfo *l
 int utmpx_write_entry(struct logininfo *li);
 int wtmp_write_entry(struct logininfo *li);
 int wtmpx_write_entry(struct logininfo *li);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_write_entry(struct logininfo *li);
+#endif
 int lastlog_write_entry(struct logininfo *li);
 int syslogin_write_entry(struct logininfo *li);
 
@@ -440,6 +447,10 @@ login_write(struct logininfo *li)
 
 	/* set the timestamp */
 	login_set_current_time(li);
+#ifdef HAVE_LINUX_AUDIT
+	if (linux_audit_write_entry(li) == 0)
+		fatal("linux_audit_write_entry failed: %s", strerror(errno));
+#endif
 #ifdef USE_LOGIN
 	syslogin_write_entry(li);
 #endif
@@ -1394,6 +1405,51 @@ wtmpx_get_entry(struct logininfo *li)
 }
 #endif /* USE_WTMPX */
 
+#ifdef HAVE_LINUX_AUDIT
+int
+linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success)
+{
+	char buf[64];
+	int audit_fd, rc;
+
+	audit_fd = audit_open();
+	if (audit_fd < 0) {
+	 	if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+					errno == EAFNOSUPPORT)
+			return 1; /* No audit support in kernel */
+		else
+			return 0; /* Must prevent login */
+	}
+	if (username == NULL)
+		snprintf(buf, sizeof(buf), "uid=%d", uid);
+	else
+		snprintf(buf, sizeof(buf), "acct=%s", username);
+	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
+		buf, hostname, ip, ttyn, success);
+	close(audit_fd);
+	if (rc >= 0)
+		return 1;
+	else
+		return 0;
+}
+
+int
+linux_audit_write_entry(struct logininfo *li)
+{
+	switch(li->type) {
+	case LTYPE_LOGIN:
+		return (linux_audit_record_event(li->uid, NULL, li->hostname,
+			NULL, li->line, 1));
+	case LTYPE_LOGOUT:
+		return (1);	/* We only care about logins */
+	default:
+		logit("%s: invalid type field", __func__);
+		return (0);
+	}
+}
+#endif /* HAVE_LINUX_AUDIT */
+
 /**
  ** Low-level libutil login() functions
  **/
diff -up openssh-4.7p1/config.h.in.audit openssh-4.7p1/config.h.in
--- openssh-4.7p1/config.h.in.audit	2007-09-04 08:50:04.000000000 +0200
+++ openssh-4.7p1/config.h.in	2007-09-06 17:07:44.000000000 +0200
@@ -1334,6 +1334,9 @@
 /* Define if you want SELinux support. */
 #undef WITH_SELINUX
 
+/* Define if you want Linux audit support. */
+#undef HAVE_LINUX_AUDIT
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff -up openssh-4.7p1/loginrec.h.audit openssh-4.7p1/loginrec.h
--- openssh-4.7p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/loginrec.h	2007-09-06 17:07:44.000000000 +0200
@@ -127,5 +127,9 @@ char *line_stripname(char *dst, const ch
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 
 void record_failed_login(const char *, const char *, const char *);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success);
+#endif /* HAVE_LINUX_AUDIT */
 
 #endif /* _HAVE_LOGINREC_H_ */
diff -up openssh-4.7p1/configure.ac.audit openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.audit	2007-09-06 17:07:44.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 17:15:23.000000000 +0200
@@ -3216,6 +3216,18 @@ AC_ARG_WITH(selinux,
 	fi ]
 )
 
+# Check whether user wants Linux audit support
+LINUX_AUDIT_MSG="no"
+AC_ARG_WITH(linux-audit,
+	[  --with-linux-audit   Enable Linux audit support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
+		LINUX_AUDIT_MSG="yes"
+		AC_CHECK_HEADERS(libaudit.h)
+		SSHDLIBS="$SSHDLIBS -laudit"
+	fi ]
+)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -4037,6 +4049,7 @@ echo "                       PAM support
 echo "                   OSF SIA support: $SIA_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
+echo "               Linux audit support: $LINUX_AUDIT_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"

openssh-4.7p1-log-in-chroot.patch:

--- NEW FILE openssh-4.7p1-log-in-chroot.patch ---
diff -up openssh-4.7p1/sshd.c.log-chroot openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.log-chroot	2007-09-06 17:24:13.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:24:13.000000000 +0200
@@ -596,6 +596,10 @@ privsep_preauth_child(void)
 	/* Demote the private keys to public keys. */
 	demote_sensitive_data();
 
+	/* Open the syslog permanently so the chrooted process still
+	   can write to syslog. */
+	open_log();
+	
 	/* Change our root directory */
 	if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1)
 		fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR,
diff -up openssh-4.7p1/log.c.log-chroot openssh-4.7p1/log.c
--- openssh-4.7p1/log.c.log-chroot	2007-05-20 07:08:16.000000000 +0200
+++ openssh-4.7p1/log.c	2007-09-06 17:29:34.000000000 +0200
@@ -56,6 +56,7 @@ static LogLevel log_level = SYSLOG_LEVEL
 static int log_on_stderr = 1;
 static int log_facility = LOG_AUTH;
 static char *argv0;
+static int log_fd_keep;
 
 extern char *__progname;
 
@@ -370,10 +371,21 @@ do_log(LogLevel level, const char *fmt, 
 		syslog_r(pri, &sdata, "%.500s", fmtbuf);
 		closelog_r(&sdata);
 #else
+	    if (!log_fd_keep) {
 		openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
+	    }
 		syslog(pri, "%.500s", fmtbuf);
+	    if (!log_fd_keep) {
 		closelog();
+	    }
 #endif
 	}
 	errno = saved_errno;
 }
+
+void
+open_log(void)
+{
+	openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility);
+	log_fd_keep = 1;
+}
diff -up openssh-4.7p1/log.h.log-chroot openssh-4.7p1/log.h
--- openssh-4.7p1/log.h.log-chroot	2006-08-18 16:32:21.000000000 +0200
+++ openssh-4.7p1/log.h	2007-09-06 17:24:13.000000000 +0200
@@ -62,4 +62,6 @@ void     debug3(const char *, ...) __att
 
 void	 do_log(LogLevel, const char *, va_list);
 void	 cleanup_exit(int) __dead;
+
+void     open_log(void);
 #endif

openssh-4.7p1-mls.patch:

--- NEW FILE openssh-4.7p1-mls.patch ---
diff -up openssh-4.7p1/misc.c.mls openssh-4.7p1/misc.c
--- openssh-4.7p1/misc.c.mls	2007-01-05 06:24:48.000000000 +0100
+++ openssh-4.7p1/misc.c	2007-09-06 17:39:28.000000000 +0200
@@ -418,6 +418,7 @@ char *
 colon(char *cp)
 {
 	int flag = 0;
+	int start = 1;
 
 	if (*cp == ':')		/* Leading colon is part of file name. */
 		return (0);
@@ -431,8 +432,13 @@ colon(char *cp)
 			return (cp+1);
 		if (*cp == ':' && !flag)
 			return (cp);
-		if (*cp == '/')
-			return (0);
+		if (start) {
+		/* Slash on beginning or after dots only denotes file name. */
+			if (*cp == '/')
+				return (0);
+			if (*cp != '.')
+				start = 0;
+		}
 	}
 	return (0);
 }
diff -up openssh-4.7p1/session.c.mls openssh-4.7p1/session.c
--- openssh-4.7p1/session.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/session.c	2007-09-06 17:39:28.000000000 +0200
@@ -1347,10 +1347,6 @@ do_setusercontext(struct passwd *pw)
 #endif
 	if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
 		fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
-
-#ifdef WITH_SELINUX
-	ssh_selinux_setup_exec_context(pw->pw_name);
-#endif
 }
 
 static void
diff -up openssh-4.7p1/openbsd-compat/port-linux.c.mls openssh-4.7p1/openbsd-compat/port-linux.c
--- openssh-4.7p1/openbsd-compat/port-linux.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/openbsd-compat/port-linux.c	2007-08-07 17:38:18.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.4 2007/06/27 22:48:03 djm Exp $ */
+/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh at redhat.com>
@@ -33,12 +33,23 @@
 #include "key.h"
 #include "hostfile.h"
 #include "auth.h"
+#include "xmalloc.h"
 
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
+#include <selinux/context.h>
 #include <selinux/get_context_list.h>
+#include <selinux/get_default_type.h>
+#include <selinux/av_permissions.h>
+
+#ifdef HAVE_LINUX_AUDIT
+#include <libaudit.h>
+#include <unistd.h>
+#endif
 
 extern Authctxt *the_authctxt;
+extern int inetd_flag;
+extern int rexeced_flag;
 
 /* Wrapper around is_selinux_enabled() to log its return value once only */
 static int
@@ -54,17 +65,173 @@ ssh_selinux_enabled(void)
 	return (enabled);
 }
 
+/* Send audit message */
+static int
+send_audit_message(int success, security_context_t default_context,
+		       security_context_t selected_context)
+{
+	int rc=0;
+#ifdef HAVE_LINUX_AUDIT
+	char *msg = NULL;
+	int audit_fd = audit_open();
+	security_context_t default_raw=NULL;
+	security_context_t selected_raw=NULL;
+	rc = -1;
+	if (audit_fd < 0) {
+		if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+                                        errno == EAFNOSUPPORT)
+                        return 0; /* No audit support in kernel */
+		error("Error connecting to audit system.");
+		return rc;
+	}
+	if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) {
+		error("Error translating default context.");
+		default_raw = NULL;
+	}
+	if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) {
+		error("Error translating selected context.");
+		selected_raw = NULL;
+	}
+	if (asprintf(&msg, "sshd: default-context=%s selected-context=%s",
+		     default_raw ? default_raw : (default_context ? default_context: "?"),
+		     selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) {
+		error("Error allocating memory.");
+		goto out;
+	}
+	if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE,
+				   msg, NULL, NULL, NULL, success) <= 0) {
+		error("Error sending audit message.");
+		goto out;
+	}
+	rc = 0;
+      out:
+	free(msg);
+	freecon(default_raw);
+	freecon(selected_raw);
+	close(audit_fd);
+#endif
+	return rc;
+}
+
+static int
+mls_range_allowed(security_context_t src, security_context_t dst)
+{
+	struct av_decision avd;
+	int retval;
+	unsigned int bit = CONTEXT__CONTAINS;
+
+	debug("%s: src:%s dst:%s", __func__, src, dst);
+	retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd);
+	if (retval || ((bit & avd.allowed) != bit))
+		return 0;
+
+	return 1;
+}
+
+static int
+get_user_context(const char *sename, const char *role, const char *lvl,
+	security_context_t *sc) {
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) {
+	        /* User may have requested a level completely outside of his 
+	           allowed range. We get a context just for auditing as the
+	           range check below will certainly fail for default context. */
+#endif
+		if (get_default_context(sename, NULL, sc) != 0) {
+			*sc = NULL;
+			return -1;
+		}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	}
+#endif
+	if (role != NULL && role[0]) {
+		context_t con;
+		char *type=NULL;
+		if (get_default_type(role, &type) != 0) {
+			error("get_default_type: failed to get default type for '%s'",
+				role);
+			goto out;
+		}
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_role_set(con, role);
+		context_type_set(con, type);
+		freecon(*sc);
+		*sc = strdup(context_str(con));
+		context_free(con);
+		if (!*sc) 
+			return -1;
+	}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl != NULL && lvl[0]) {
+		/* verify that the requested range is obtained */
+		context_t con;
+		security_context_t obtained_raw;
+		security_context_t requested_raw;
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_range_set(con, lvl);
+		if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) {
+			context_free(con);
+			goto out;
+		}
+		if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) {
+			freecon(obtained_raw);
+			context_free(con);
+			goto out;
+		}
+
+		debug("get_user_context: obtained context '%s' requested context '%s'",
+			obtained_raw, requested_raw);
+		if (strcmp(obtained_raw, requested_raw)) {
+			/* set the context to the real requested one but fail */
+			freecon(requested_raw);
+			freecon(obtained_raw);
+			freecon(*sc);
+			*sc = strdup(context_str(con));
+			context_free(con);
+			return -1;
+		}
+		freecon(requested_raw);
+		freecon(obtained_raw);
+		context_free(con);
+	}
+#endif
+	return 0;
+      out:
+        freecon(*sc);
+        *sc = NULL;
+        return -1;
+}
+
 /* Return the default security context for the given username */
-static security_context_t
-ssh_selinux_getctxbyname(char *pwname)
+static int
+ssh_selinux_getctxbyname(char *pwname,
+	security_context_t *default_sc, security_context_t *user_sc)
 {
-	security_context_t sc = NULL;
 	char *sename, *lvl;
+	const char *reqlvl = NULL;
 	char *role = NULL;
-	int r = 0;
+	int r = -1;
+	context_t con = NULL;
+
+	*default_sc = NULL;
+	*user_sc = NULL;
+	if (the_authctxt) {
+		if (the_authctxt->role != NULL) {
+			char *slash;
+			role = xstrdup(the_authctxt->role);
+			if ((slash = strchr(role, '/')) != NULL) {
+				*slash = '\0';
+				reqlvl = slash + 1;
+			}
+		}
+	}
 
-	if (the_authctxt) 
-		role=the_authctxt->role;
 #ifdef HAVE_GETSEUSERBYNAME
 	if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) {
 		sename = NULL;
@@ -72,37 +239,62 @@ ssh_selinux_getctxbyname(char *pwname)
 	}
 #else
 	sename = pwname;
-	lvl = NULL;
+	lvl = "";
 #endif
 
 	if (r == 0) {
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
-		if (role != NULL && role[0])
-			r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc);
-		else
-			r = get_default_context_with_level(sename, lvl, NULL, &sc);
+		r = get_default_context_with_level(sename, lvl, NULL, default_sc);
 #else
-		if (role != NULL && role[0])
-			r = get_default_context_with_role(sename, role, NULL, &sc);
-		else
-			r = get_default_context(sename, NULL, &sc);
+		r = get_default_context(sename, NULL, default_sc);
 #endif
 	}
 
-	if (r != 0) {
-		switch (security_getenforce()) {
-		case -1:
-			fatal("%s: ssh_selinux_getctxbyname: "
-			    "security_getenforce() failed", __func__);
-		case 0:
-			error("%s: Failed to get default SELinux security "
-			    "context for %s", __func__, pwname);
-			break;
-		default:
-			fatal("%s: Failed to get default SELinux security "
-			    "context for %s (in enforcing mode)",
-			    __func__, pwname);
+	if (r == 0) {
+		/* If launched from xinetd, we must use current level */
+		if (inetd_flag && !rexeced_flag) {
+			security_context_t sshdsc=NULL;
+
+			if (getcon_raw(&sshdsc) < 0)
+				fatal("failed to allocate security context");
+
+			if ((con=context_new(sshdsc)) == NULL)
+				fatal("failed to allocate selinux context");
+			reqlvl = context_range_get(con);
+			freecon(sshdsc);
+			if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0)
+			    /* we actually don't change level */
+			    reqlvl = "";
+
+			debug("%s: current connection level '%s'", __func__, reqlvl);
 		}
+		
+		if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) {
+			r = get_user_context(sename, role, reqlvl, user_sc);
+		
+			if (r == 0 && reqlvl != NULL && reqlvl[0]) {
+				security_context_t default_level_sc = *default_sc;
+				if (role != NULL && role[0]) {
+					if (get_user_context(sename, role, lvl, &default_level_sc) < 0)
+						default_level_sc = *default_sc;
+				}
+				/* verify that the requested range is contained in the user range */
+				if (mls_range_allowed(default_level_sc, *user_sc)) {
+					logit("permit MLS level %s (user range %s)", reqlvl, lvl);
+				} else {
+					r = -1;
+					error("deny MLS level %s (user range %s)", reqlvl, lvl);
+				}
+				if (default_level_sc != *default_sc)
+					freecon(default_level_sc);
+			}
+		} else {
+			*user_sc = *default_sc;
+		}
+	}
+	if (r != 0) {
+		error("%s: Failed to get default SELinux security "
+		    "context for %s", __func__, pwname);
 	}
 
 #ifdef HAVE_GETSEUSERBYNAME
@@ -111,14 +303,20 @@ ssh_selinux_getctxbyname(char *pwname)
 	if (lvl != NULL)
 		xfree(lvl);
 #endif
+	if (role != NULL)
+		xfree(role);
+	if (con)
+		context_free(con);
 
-	return (sc);
+	return (r);
 }
 
 /* Set the execution context to the default for the specified user */
 void
 ssh_selinux_setup_exec_context(char *pwname)
 {
+	int r = 0;
+	security_context_t default_ctx = NULL;
 	security_context_t user_ctx = NULL;
 
 	if (!ssh_selinux_enabled())
@@ -126,22 +324,39 @@ ssh_selinux_setup_exec_context(char *pwn
 
 	debug3("%s: setting execution context", __func__);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
-	if (setexeccon(user_ctx) != 0) {
+	r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx);
+	if (r >= 0) {
+		r = setexeccon(user_ctx);
+		if (r < 0) {
+			error("%s: Failed to set SELinux execution context %s for %s",
+			    __func__, user_ctx, pwname);
+		}
+	}
+	if (user_ctx == NULL) {
+		user_ctx = default_ctx;
+	}
+	if (r < 0 || user_ctx != default_ctx) {
+		/* audit just the case when user changed a role or there was
+		   a failure */
+		send_audit_message(r >= 0, default_ctx, user_ctx);
+	}
+	if (r < 0) {
 		switch (security_getenforce()) {
 		case -1:
 			fatal("%s: security_getenforce() failed", __func__);
 		case 0:
-			error("%s: Failed to set SELinux execution "
-			    "context for %s", __func__, pwname);
+			error("%s: SELinux failure. Continuing in permissive mode.",
+			    __func__);
 			break;
 		default:
-			fatal("%s: Failed to set SELinux execution context "
-			    "for %s (in enforcing mode)", __func__, pwname);
+			fatal("%s: SELinux failure. Aborting connection.",
+			    __func__);
 		}
 	}
-	if (user_ctx != NULL)
+	if (user_ctx != NULL && user_ctx != default_ctx)
 		freecon(user_ctx);
+	if (default_ctx != NULL)
+		freecon(default_ctx);
 
 	debug3("%s: done", __func__);
 }
@@ -159,7 +374,10 @@ ssh_selinux_setup_pty(char *pwname, cons
 
 	debug3("%s: setting TTY context on %s", __func__, tty);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
+	if (getexeccon(&user_ctx) < 0) {
+		error("%s: getexeccon: %s", __func__, strerror(errno));
+		goto out;
+	}
 
 	/* XXX: should these calls fatal() upon failure in enforcing mode? */
 
diff -up openssh-4.7p1/sshd.c.mls openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:39:28.000000000 +0200
@@ -1838,6 +1838,9 @@ main(int ac, char **av)
 		restore_uid();
 	}
 #endif
+#ifdef WITH_SELINUX
+	ssh_selinux_setup_exec_context(authctxt->pw->pw_name);
+#endif
 #ifdef USE_PAM
 	if (options.use_pam) {
 		do_pam_setcred(1);

openssh-4.7p1-nss-keys.patch:

--- NEW FILE openssh-4.7p1-nss-keys.patch ---
diff -up openssh-4.7p1/key.c.nss-keys openssh-4.7p1/key.c
--- openssh-4.7p1/key.c.nss-keys	2007-08-08 06:28:26.000000000 +0200
+++ openssh-4.7p1/key.c	2007-09-06 17:43:59.000000000 +0200
@@ -93,6 +93,54 @@ key_new(int type)
 	return k;
 }
 
+#ifdef HAVE_LIBNSS
+Key *
+key_new_nss(int type)
+{
+	Key *k = key_new(type);
+
+	k->nss = xcalloc(1, sizeof(*k->nss));
+	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
+
+	return k;
+}
+
+Key *
+key_new_nss_copy(int type, const Key *c)
+{
+	Key *k = key_new_nss(type);
+
+	switch (k->type) {
+		case KEY_RSA:
+			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
+				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+		case KEY_DSA:
+			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
+				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
+				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
+				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+	}
+		
+	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
+	if (k->nss->privk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
+
+	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
+	if (k->nss->pubk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
+	
+	if (c->nss->privk->wincx)
+		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
+
+	return k;
+}
+#endif
+
+
 Key *
 key_new_private(int type)
 {
@@ -148,6 +196,19 @@ key_free(Key *k)
 		fatal("key_free: bad key type %d", k->type);
 		break;
 	}
+#ifdef HAVE_LIBNSS
+	if (k->flags & KEY_FLAG_NSS) {
+		if (k->nss->privk->wincx != NULL) {
+			memset(k->nss->privk->wincx, 0,
+				strlen(k->nss->privk->wincx));
+			xfree(k->nss->privk->wincx);
+			k->nss->privk->wincx = NULL;
+		}
+		SECKEY_DestroyPrivateKey(k->nss->privk);
+		SECKEY_DestroyPublicKey(k->nss->pubk);
+		xfree(k->nss);
+	}
+#endif
 	xfree(k);
 }
 
diff -up openssh-4.7p1/ssh-dss.c.nss-keys openssh-4.7p1/ssh-dss.c
--- openssh-4.7p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
+++ openssh-4.7p1/ssh-dss.c	2007-09-06 17:43:59.000000000 +0200
@@ -39,6 +39,10 @@
 #include "log.h"
 #include "key.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 #define INTBLOB_LEN	20
 #define SIGBLOB_LEN	(2*INTBLOB_LEN)
 
@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
 		error("ssh_dss_sign: no DSA key");
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECItem *rawsig;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
+			error("ssh_dss_sign: sign failed");
+			return -1;
+		}
+		
+		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
+			error("ssh_dss_sign: der decode failed");
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+		if (rawsig->len != SIGBLOB_LEN) {
+			error("ssh_dss_sign: unsupported signature length %d",
+				rawsig->len);
+			SECITEM_ZfreeItem(rawsig, PR_TRUE);
+			return -1;
+		}
+		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
+		SECITEM_ZfreeItem(rawsig, PR_TRUE);
+	} else {
+#endif
 	EVP_DigestInit(&md, evp_md);
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
 	DSA_SIG_free(sig);
-
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	if (datafellows & SSH_BUG_SIGBLOB) {
 		if (lenp != NULL)
 			*lenp = SIGBLOB_LEN;
diff -up openssh-4.7p1/ssh-agent.c.nss-keys openssh-4.7p1/ssh-agent.c
--- openssh-4.7p1/ssh-agent.c.nss-keys	2007-03-21 10:45:07.000000000 +0100
+++ openssh-4.7p1/ssh-agent.c	2007-09-06 17:43:59.000000000 +0200
@@ -79,6 +79,10 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
+
 #if defined(HAVE_SYS_PRCTL_H)
 #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
 #endif
@@ -701,6 +705,114 @@ send:
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+process_add_nss_key (SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0, death = 0, confirm = 0;
+	Key **keys, *k;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	while (buffer_len(&e->request)) {
+		switch (buffer_get_char(&e->request)) {
+		case SSH_AGENT_CONSTRAIN_LIFETIME:
+			death = time(NULL) + buffer_get_int(&e->request);
+			break;
+		case SSH_AGENT_CONSTRAIN_CONFIRM:
+			confirm = 1;
+			break;
+		default:
+			break;
+		}
+	}
+	if (lifetime && !death)
+		death = time(NULL) + lifetime;
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	/* password is owned by keys[0] now */
+	xfree(tokenname);
+	xfree(keyname);
+
+	if (keys == NULL) {
+		memset(password, 0, strlen(password));
+		xfree(password);
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		tab = idtab_lookup(version);
+		if (lookup_identity(k, version) == NULL) {
+			id = xmalloc(sizeof(Identity));
+			id->key = k;
+			id->comment = nss_get_key_label(k);
+			id->death = death;
+			id->confirm = confirm;
+			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
+			tab->nentries++;
+			success = 1;
+		} else {
+			key_free(k);
+		}
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+
+static void
+process_remove_nss_key(SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0;
+	Key **keys, *k = NULL;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	xfree(tokenname);
+	xfree(keyname);
+	xfree(password);
+
+	if (keys == NULL || keys[0] == NULL) {
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		if ((id = lookup_identity(k, version)) != NULL) {
+			tab = idtab_lookup(version);
+			TAILQ_REMOVE(&tab->idlist, id, next);
+			tab->nentries--;
+			free_identity(id);
+			success = 1;
+		}
+		key_free(k);
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+#endif /* HAVE_LIBNSS */
+
 /* dispatch incoming messages */
 
 static void
@@ -793,6 +905,15 @@ process_message(SocketEntry *e)
 		process_remove_smartcard_key(e);
 		break;
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	case SSH_AGENTC_ADD_NSS_KEY:
+	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
+		process_add_nss_key(e);
+		break;
+	case SSH_AGENTC_REMOVE_NSS_KEY:
+		process_remove_nss_key(e);
+		break;
+#endif /* SMARTCARD */
 	default:
 		/* Unknown message.  Respond with failure. */
 		error("Unknown message %d", type);
diff -up openssh-4.7p1/authfd.h.nss-keys openssh-4.7p1/authfd.h
--- openssh-4.7p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
+++ openssh-4.7p1/authfd.h	2007-09-06 17:43:59.000000000 +0200
@@ -49,6 +49,12 @@
 #define SSH2_AGENTC_ADD_ID_CONSTRAINED		25
 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
 
+/* nss */
+#define SSH_AGENTC_ADD_NSS_KEY			30
+#define SSH_AGENTC_REMOVE_NSS_KEY		31
+#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED	32
+
+
 #define	SSH_AGENT_CONSTRAIN_LIFETIME		1
 #define	SSH_AGENT_CONSTRAIN_CONFIRM		2
 
@@ -83,6 +89,8 @@ int	 ssh_remove_all_identities(Authentic
 int	 ssh_lock_agent(AuthenticationConnection *, int, const char *);
 int	 ssh_update_card(AuthenticationConnection *, int, const char *,
     const char *, u_int, u_int);
+int	 ssh_update_nss_key(AuthenticationConnection *, int, const char *,
+    const char *, const char *, u_int, u_int);
 
 int
 ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
diff -up openssh-4.7p1/configure.ac.nss-keys openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.nss-keys	2007-09-06 17:43:59.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 17:51:48.000000000 +0200
@@ -3228,6 +3228,20 @@ AC_ARG_WITH(linux-audit,
 	fi ]
 )
 
+# Check whether user wants NSS support
+LIBNSS_MSG="no"
+AC_ARG_WITH(nss,
+	[  --with-nss   Enable NSS support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.])
+		LIBNSS_MSG="yes"
+		CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4"
+		AC_CHECK_HEADERS(pk11pub.h)
+		LIBS="$LIBS -lnss3"
+	fi
+	])
+AC_SUBST(LIBNSS)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -4050,6 +4064,7 @@ echo "                   OSF SIA support
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
 echo "               Linux audit support: $LINUX_AUDIT_MSG"
+echo "                       NSS support: $LIBNSS_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"
diff -up /dev/null openssh-4.7p1/README.nss
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/README.nss	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,36 @@
+How to use NSS tokens with OpenSSH?
+
+This version of OpenSSH contains experimental support for authentication using
+keys stored in tokens stored in NSS database. This for example includes any
+PKCS#11 tokens which are installed in your NSS database.
+
+As the code is experimental and preliminary only SSH protocol 2 is supported.
+The NSS certificate and token databases are looked for in the ~/.ssh
+directory or in a directory specified by environment variable NSS_DB_PATH.
+
+Common operations:
+
+(1) tell the ssh client to use the NSS keys:
+
+	$ ssh -o 'UseNSS yes' otherhost
+	
+	if you want to use a specific token:
+	
+	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
+
+(2) or tell the agent to use the NSS keys:
+
+	$ ssh-add -n
+	
+	if you want to use a specific token:
+	
+	$ ssh-add -n -T 'My PKCS11 Token'
+
+(3) extract the public key from token so it can be added to the
+server:
+
+	$ ssh-keygen -n
+	
+	if you want to use a specific token and/or key:
+	
+	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'
diff -up openssh-4.7p1/authfd.c.nss-keys openssh-4.7p1/authfd.c
--- openssh-4.7p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
+++ openssh-4.7p1/authfd.c	2007-09-06 17:43:59.000000000 +0200
@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
 	return decode_reply(type);
 }
 
+int
+ssh_update_nss_key(AuthenticationConnection *auth, int add,
+    const char *tokenname, const char *keyname,
+    const char *pass, u_int life, u_int confirm)
+{
+	Buffer msg;
+	int type, constrained = (life || confirm);
+
+	if (add) {
+		type = constrained ?
+		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
+		    SSH_AGENTC_ADD_NSS_KEY;
+	} else
+		type = SSH_AGENTC_REMOVE_NSS_KEY;
+
+	buffer_init(&msg);
+	buffer_put_char(&msg, type);
+	buffer_put_cstring(&msg, tokenname);
+	buffer_put_cstring(&msg, keyname);
+	buffer_put_cstring(&msg, pass);
+
+	if (constrained) {
+		if (life != 0) {
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
+			buffer_put_int(&msg, life);
+		}
+		if (confirm != 0)
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
+	}
+
+	if (ssh_request_reply(auth, &msg, &msg) == 0) {
+		buffer_free(&msg);
+		return 0;
+	}
+	type = buffer_get_char(&msg);
+	buffer_free(&msg);
+	return decode_reply(type);
+}
+
 /*
  * Removes all identities from the agent.  This call is not meant to be used
  * by normal applications.
diff -up openssh-4.7p1/readconf.h.nss-keys openssh-4.7p1/readconf.h
--- openssh-4.7p1/readconf.h.nss-keys	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/readconf.h	2007-09-06 17:43:59.000000000 +0200
@@ -84,6 +84,8 @@ typedef struct {
 	char   *preferred_authentications;
 	char   *bind_address;	/* local socket address for connection to sshd */
 	char   *smartcard_device; /* Smartcard reader device */
+	int     use_nss;        /* Use NSS library for keys */
+	char   *nss_token;      /* Look for NSS keys on token */
 	int	verify_host_key_dns;	/* Verify host key using DNS */
 
 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
diff -up /dev/null openssh-4.7p1/nsskeys.c
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/nsskeys.c	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc. 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 ``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 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.
+ */
+
+#include "includes.h"
+#ifdef HAVE_LIBNSS
+
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openssl/evp.h>
+
+#include <nss.h>
+#include <keyhi.h>
+#include <pk11pub.h>
+#include <cert.h>
+
+#include "xmalloc.h"
+#include "key.h"
+#include "log.h"
+#include "misc.h"
+#include "nsskeys.h"
+#include "pathnames.h"
+
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char *password = arg;
+	if (retry || password == NULL)
+		return NULL;
+	
+	return PL_strdup(password);
+}
+
+int
+nss_init(PK11PasswordFunc pwfn)
+{
+	char *dbpath;
+	char buf[MAXPATHLEN];
+
+	if (NSS_IsInitialized())
+		return 0;
+
+	if ((dbpath=getenv("NSS_DB_PATH")) == NULL) {
+		struct passwd *pw;
+		if ((pw = getpwuid(getuid())) == NULL ||
+			pw->pw_dir == NULL) {
+			return -1;
+		}
+		snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
+			    _PATH_SSH_USER_DIR);
+		dbpath = buf;
+	}
+
+	if (NSS_Init(dbpath) != SECSuccess)
+		return -1;
+
+	if (pwfn == NULL) {
+		pwfn = password_cb;
+	}
+
+	PK11_SetPasswordFunc(pwfn);
+	
+	return 0;
+}
+
+static Key *
+make_key_from_privkey(SECKEYPrivateKey *privk, char *password)
+{
+	Key *k;
+	switch (SECKEY_GetPrivateKeyType(privk)) {
+		case rsaKey:
+			k = key_new_nss(KEY_RSA);
+			break;
+		case dsaKey:
+			k = key_new_nss(KEY_DSA);
+			break;
+		default:
+			return NULL;
+	}
+	k->nss->pubk = SECKEY_ConvertToPublicKey(privk);
+	if (k->nss->pubk != NULL) {
+		k->nss->privk = SECKEY_CopyPrivateKey(privk);
+	}
+	if (k->nss->privk != NULL) {
+		if (password != NULL) {
+			k->nss->privk->wincx = xstrdup(password);
+		}
+		return k;
+	}
+	key_free(k);
+	return NULL;
+}
+
+static Key **
+add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated)
+{
+	if (*allocated < *i + 2) {
+		*allocated += 16;
+		keys = xrealloc(keys, *allocated, sizeof(k));
+	}
+	keys[*i] = k;
+	(*i)++;
+	keys[*i] = NULL;
+	return keys;
+}
+
+static int
+nss_convert_pubkey(Key *k)
+{
+	u_char *n;
+	unsigned int len;
+	char *p;
+
+	switch (k->type) {
+		case KEY_RSA:
+			n = k->nss->pubk->u.rsa.modulus.data;
+			len = k->nss->pubk->u.rsa.modulus.len;
+
+			if (BN_bin2bn(n, len, k->rsa->n) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.rsa.publicExponent.data;
+			len = k->nss->pubk->u.rsa.publicExponent.len;
+
+			if (BN_bin2bn(n, len, k->rsa->e) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+		case KEY_DSA:
+			n = k->nss->pubk->u.dsa.params.prime.data;
+			len = k->nss->pubk->u.dsa.params.prime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->p) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.subPrime.data;
+			len = k->nss->pubk->u.dsa.params.subPrime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->q) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.base.data;
+			len = k->nss->pubk->u.dsa.params.base.len;
+
+			if (BN_bin2bn(n, len, k->dsa->g) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.publicValue.data;
+			len = k->nss->pubk->u.dsa.publicValue.len;
+
+			if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+	}
+
+	p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
+	debug("fingerprint %u %s", key_size(k), p);
+	xfree(p);
+
+	return 0;
+}
+
+static Key **
+nss_find_privkeys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key *k = NULL;
+	Key **keys = NULL;
+	PK11SlotList *slots;
+	PK11SlotListElement *sle;
+	size_t allocated = 0;
+	size_t i = 0;
+
+	if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) {
+		if (tokenname == NULL) {
+			debug("No NSS token found");
+		} else {
+			debug("NSS token not found: %s", tokenname);
+		}
+		return NULL;
+	}
+	
+	for (sle = slots->head; sle; sle = sle->next) {
+		SECKEYPrivateKeyList *list;
+		SECKEYPrivateKeyListNode *node;
+		char *tmppass = password;
+				
+		if (PK11_NeedLogin(sle->slot)) {
+			if (password == NULL) {
+				char *prompt;
+				if (asprintf(&prompt, "Enter passphrase for token %s: ",
+					PK11_GetTokenName(sle->slot)) < 0)
+					fatal("password_cb: asprintf failed");
+				tmppass = read_passphrase(prompt, RP_ALLOW_STDIN);
+			}
+			PK11_Authenticate(sle->slot, PR_TRUE, tmppass);
+		}
+
+		debug("Looking for: %s:%s", tokenname, keyname);
+		list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname,
+			tmppass);
+		if (list == NULL && keyname != NULL) {
+			char *fooname;
+			/* NSS bug workaround */
+			if (asprintf(&fooname, "%s~", keyname) < 0) {
+				error("nss_find_privkey: asprintf failed");
+				PK11_FreeSlotList(slots);
+				return NULL;
+			}
+			list = PK11_ListPrivKeysInSlot(sle->slot, fooname,
+			tmppass);
+			free(fooname);
+		}
+		if (list == NULL && keyname != NULL) {
+			CERTCertificate *cert;
+			SECKEYPrivateKey *privk;
+			cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(),
+				(char *)keyname);
+			if (cert == NULL)
+				goto cleanup;
+			privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass);
+			CERT_DestroyCertificate(cert);
+			if (privk == NULL)
+				goto cleanup;
+			if ((k=make_key_from_privkey(privk, tmppass)) != NULL) {
+				nss_convert_pubkey(k);
+				keys = add_key_to_list(k, keys, &i, &allocated);
+			}
+			SECKEY_DestroyPrivateKey(privk);
+		} else {
+			if (list == NULL)
+				goto cleanup;
+			for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+				node=PRIVKEY_LIST_NEXT(node))
+				if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) {
+					nss_convert_pubkey(k);
+					keys = add_key_to_list(k, keys, &i, &allocated);
+				}
+			SECKEY_DestroyPrivateKeyList(list);
+		}
+cleanup:
+		if (password == NULL && tmppass != NULL) {
+			memset(tmppass, 0, strlen(tmppass));
+			xfree(tmppass);
+		}
+	}
+	PK11_FreeSlotList(slots);
+
+	return keys;
+}
+
+Key **
+nss_get_keys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key **keys;
+
+	if (nss_init(NULL) == -1) {
+		error("Failed to initialize NSS library");
+		return NULL;
+	}
+
+	keys = nss_find_privkeys(tokenname, keyname, password);
+	if (keys == NULL && keyname != NULL) {
+		error("Cannot find key in nss, token removed");
+		return NULL;
+	}
+#if 0
+	keys = xcalloc(3, sizeof(Key *));
+
+	if (k->type == KEY_RSA) {
+		n = key_new_nss_copy(KEY_RSA1, k);
+
+		keys[0] = n;
+		keys[1] = k;
+		keys[2] = NULL;
+	} else {
+		keys[0] = k;
+		keys[1] = NULL;
+	}
+#endif
+	return keys;
+}
+
+char *
+nss_get_key_label(Key *key)
+{
+	char *label, *nickname;
+	
+	nickname = PK11_GetPrivateKeyNickname(key->nss->privk);
+	label = xstrdup(nickname);
+	PORT_Free(nickname);
+
+	return label;
+}
+
+#endif /* HAVE_LIBNSS */
diff -up openssh-4.7p1/ssh.c.nss-keys openssh-4.7p1/ssh.c
--- openssh-4.7p1/ssh.c.nss-keys	2007-08-08 06:32:41.000000000 +0200
+++ openssh-4.7p1/ssh.c	2007-09-06 17:43:59.000000000 +0200
@@ -104,6 +104,9 @@
 #ifdef SMARTCARD
 #include "scard.h"
 #endif
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
 
 extern char *__progname;
 
@@ -1217,9 +1220,11 @@ load_public_identity_files(void)
 	int i = 0;
 	Key *public;
 	struct passwd *pw;
-#ifdef SMARTCARD
+#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
 	Key **keys;
+#endif
 
+#ifdef SMARTCARD
 	if (options.smartcard_device != NULL &&
 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
@@ -1240,6 +1245,27 @@ load_public_identity_files(void)
 		xfree(keys);
 	}
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	if (options.use_nss &&
+	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
+		int count;
+		for (count = 0; keys[count] != NULL; count++) {
+			memmove(&options.identity_files[1], &options.identity_files[0],
+			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
+			memmove(&options.identity_keys[1], &options.identity_keys[0],
+			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
+			options.num_identity_files++;
+			options.identity_keys[0] = keys[count];
+			options.identity_files[0] = nss_get_key_label(keys[count]);
+		}
+		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
+			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
+		i += count;
+		xfree(keys);
+	}
+#endif /* HAVE_LIBNSS */
+
 	if ((pw = getpwuid(original_real_uid)) == NULL)
 		fatal("load_public_identity_files: getpwuid failed");
 	if (gethostname(thishost, sizeof(thishost)) == -1)
diff -up /dev/null openssh-4.7p1/nsskeys.h
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/nsskeys.h	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc.  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 ``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 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.
+ */
+
+#ifndef NSSKEYS_H
+#define NSSKEYS_H
+#ifdef HAVE_LIBNSS
+#include <pk11func.h>
+#include <prtypes.h>
+
+int	nss_init(PK11PasswordFunc);
+Key	**nss_get_keys(const char *, const char *, char *);
+char	*nss_get_key_label(Key *);
+/*void	 sc_close(void);*/
+/*int	 sc_put_key(Key *, const char *);*/
+
+#endif
+#endif
diff -up openssh-4.7p1/Makefile.in.nss-keys openssh-4.7p1/Makefile.in
--- openssh-4.7p1/Makefile.in.nss-keys	2007-06-11 06:01:42.000000000 +0200
+++ openssh-4.7p1/Makefile.in	2007-09-06 17:53:14.000000000 +0200
@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
-	entropy.o scard-opensc.o gss-genr.o umac.o
+	entropy.o scard-opensc.o gss-genr.o umac.o nsskeys.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 	sshconnect.o sshconnect1.o sshconnect2.o
diff -up openssh-4.7p1/key.h.nss-keys openssh-4.7p1/key.h
--- openssh-4.7p1/key.h.nss-keys	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/key.h	2007-09-06 17:43:59.000000000 +0200
@@ -29,11 +29,17 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <keyhi.h>
+#endif
+
 typedef struct Key Key;
 enum types {
 	KEY_RSA1,
 	KEY_RSA,
 	KEY_DSA,
+	KEY_NSS,
 	KEY_UNSPEC
 };
 enum fp_type {
@@ -47,16 +53,30 @@ enum fp_rep {
 
 /* key is stored in external hardware */
 #define KEY_FLAG_EXT		0x0001
+#define KEY_FLAG_NSS		0x0002
+
+#ifdef HAVE_LIBNSS
+typedef struct NSSKey NSSKey;
+struct NSSKey {
+	SECKEYPrivateKey *privk;
+	SECKEYPublicKey *pubk;
+};
+#endif
 
 struct Key {
 	int	 type;
 	int	 flags;
 	RSA	*rsa;
 	DSA	*dsa;
+#ifdef HAVE_LIBNSS
+	NSSKey  *nss;
+#endif
 };
 
 Key		*key_new(int);
 Key		*key_new_private(int);
+Key 		*key_new_nss(int);
+Key		*key_new_nss_copy(int, const Key *);
 void		 key_free(Key *);
 Key		*key_demote(const Key *);
 int		 key_equal(const Key *, const Key *);
diff -up openssh-4.7p1/ssh-add.c.nss-keys openssh-4.7p1/ssh-add.c
--- openssh-4.7p1/ssh-add.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-add.c	2007-09-06 17:43:59.000000000 +0200
@@ -43,6 +43,14 @@
 
 #include <openssl/evp.h>
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <secmod.h>
+#include <pk11pub.h>
+#include <keyhi.h>
+#include <cert.h>
+#endif
+
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdarg.h>
@@ -56,6 +64,7 @@
 #include "rsa.h"
 #include "log.h"
 #include "key.h"
+#include "nsskeys.h"
 #include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
@@ -306,6 +315,117 @@ do_file(AuthenticationConnection *ac, in
 	return 0;
 }
 
+#ifdef HAVE_LIBNSS
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char **passcache = arg;
+	char *password, *p2 = NULL;
+	char *prompt;
+	
+	if (retry)
+		return NULL;
+	
+	if (asprintf(&prompt, "Enter passphrase for token %s: ",
+		PK11_GetTokenName(slot)) < 0)
+		fatal("password_cb: asprintf failed");
+
+	password = read_passphrase(prompt, RP_ALLOW_STDIN);
+	
+	if (password != NULL && (p2=PL_strdup(password)) == NULL) {
+		memset(password, 0, strlen(password));
+		fatal("password_cb: PL_strdup failed");
+	}
+
+	if (passcache != NULL) {
+		if (*passcache != NULL) {
+			memset(*passcache, 0, strlen(*passcache));
+			xfree(*passcache);
+		}
+		*passcache = password;
+	} else {
+		memset(password, 0, strlen(password));
+		xfree(password);
+	}
+	
+	return p2;
+}
+
+static int
+add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add)
+{
+	SECKEYPrivateKeyList *list;
+	SECKEYPrivateKeyListNode *node;
+	char *passcache = NULL;
+	char *tokenname;
+	
+	int count = 0;
+	
+	if (PK11_NeedLogin(slot))
+		PK11_Authenticate(slot, PR_TRUE, &passcache);
+		
+	if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) {
+		return 0;
+	}
+	
+	tokenname = PK11_GetTokenName(slot);
+	
+	for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+		node=PRIVKEY_LIST_NEXT(node)) {
+		char *keyname;
+		SECKEYPublicKey *pub;
+		
+		keyname = PK11_GetPrivateKeyNickname(node->key);
+		if (keyname == NULL || *keyname == '\0') {
+			/* no nickname to refer to */
+			CERTCertificate *cert;
+			char *kn;
+			cert = PK11_GetCertFromPrivateKey(node->key);
+			if (cert == NULL)
+				continue;
+			kn = strchr(cert->nickname, ':');
+			if (kn == NULL)
+				kn = cert->nickname;
+			else
+				kn++;
+			keyname = PORT_Strdup(kn);
+			CERT_DestroyCertificate(cert);
+			if (keyname == NULL)
+				continue;
+		}
+		pub = SECKEY_ConvertToPublicKey(node->key);
+		if (pub == NULL) {
+			fprintf(stderr, "No public key for: %s:%s\n",
+				tokenname, keyname);
+			continue; /* not possible to obtain public key */
+		}
+		SECKEY_DestroyPublicKey(pub);
+		
+		if (ssh_update_nss_key(ac, add, tokenname, keyname,
+			passcache?passcache:"",	lifetime, confirm)) {
+			fprintf(stderr, "Key %s: %s:%s\n",
+				add?"added":"removed", tokenname, keyname);
+			count++;
+		} else {
+			fprintf(stderr, "Could not %s key: %s:%s\n",
+				add?"add":"remove", tokenname, keyname);
+		}
+		
+		PORT_Free(keyname);
+		count++;
+	}
+
+	if (passcache != NULL) {
+		memset(passcache, 0, strlen(passcache));
+		xfree(passcache);
+	}
+	
+	SECKEY_DestroyPrivateKeyList(list);
+	
+	return count;
+}
+#endif
+
 static void
 usage(void)
 {
@@ -333,6 +453,10 @@ main(int argc, char **argv)
 	AuthenticationConnection *ac = NULL;
 	char *sc_reader_id = NULL;
 	int i, ch, deleting = 0, ret = 0;
+#ifdef HAVE_LIBNSS
+	char *token_id = NULL;
+	int use_nss = 0;
+#endif
 
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
@@ -350,7 +474,7 @@ main(int argc, char **argv)
 		    "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -372,6 +496,11 @@ main(int argc, char **argv)
 			if (delete_all(ac) == -1)
 				ret = 1;
 			goto done;
+#ifdef HAVE_LIBNSS
+		case 'n':
+			use_nss = 1;
+			break;
+#endif
 		case 's':
 			sc_reader_id = optarg;
 			break;
@@ -386,6 +515,11 @@ main(int argc, char **argv)
 				goto done;
 			}
 			break;
+#ifdef HAVE_LIBNSS
+		case 'T':
+			token_id = optarg;
+			break;
+#endif
 		default:
 			usage();
 			ret = 1;
@@ -399,6 +533,40 @@ main(int argc, char **argv)
 			ret = 1;
 		goto done;
 	}
+#ifdef HAVE_LIBNSS
+	if (use_nss) {
+		PK11SlotList *slots;
+		PK11SlotListElement *sle;
+		int count = 0;
+		if (nss_init(password_cb) == -1) {
+			fprintf(stderr, "Failed to initialize NSS library\n");
+			ret = 1;
+			goto done;
+		}
+		
+		if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE,
+			NULL)) == NULL) {
+			fprintf(stderr, "No tokens found\n");
+			ret = 1;
+			goto nss_done;
+		}
+
+		for (sle = slots->head; sle; sle = sle->next) {
+			int rv;
+			if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) {
+				ret = 1;
+			}
+			count += rv;
+		}
+		if (count == 0) {
+			ret = 1;
+		}
+nss_done:		
+		NSS_Shutdown();
+		clear_pass();
+		goto done;
+	}
+#endif
 	if (argc == 0) {
 		char buf[MAXPATHLEN];
 		struct passwd *pw;
diff -up openssh-4.7p1/ssh-rsa.c.nss-keys openssh-4.7p1/ssh-rsa.c
--- openssh-4.7p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-rsa.c	2007-09-06 17:43:59.000000000 +0200
@@ -32,6 +32,10 @@
 #include "compat.h"
 #include "ssh.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
 
 /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
 		error("ssh_rsa_sign: no RSA key");
 		return -1;
 	}
+
+	slen = RSA_size(key->rsa);
+	sig = xmalloc(slen);
+
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECOidTag alg;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
+			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
+			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
+
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			alg) != SECSuccess) {
+			error("ssh_rsa_sign: sign failed");
+			return -1;
+		}
+		if (sigitem.len > slen) {
+			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
+			xfree(sig);
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		if (sigitem.len < slen) {
+			memset(sig, 0, slen - sigitem.len);
+		}
+		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+	} else {
+#endif
 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
 
-	slen = RSA_size(key->rsa);
-	sig = xmalloc(slen);
-
 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
 	memset(digest, 'd', sizeof(digest));
 
@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
 		xfree(sig);
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	/* encode signature */
 	buffer_init(&b);
 	buffer_put_cstring(&b, "ssh-rsa");
diff -up openssh-4.7p1/ssh-keygen.c.nss-keys openssh-4.7p1/ssh-keygen.c
--- openssh-4.7p1/ssh-keygen.c.nss-keys	2007-02-19 12:10:25.000000000 +0100
+++ openssh-4.7p1/ssh-keygen.c	2007-09-06 17:48:08.000000000 +0200
@@ -52,6 +52,11 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include "nsskeys.h"
+#endif
+
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS		2048
 #define DEFAULT_BITS_DSA	1024
@@ -499,6 +504,26 @@ do_download(struct passwd *pw, const cha
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname)
+{
+	Key **keys = NULL;
+	int i;
+	
+	keys = nss_get_keys(tokenname, keyname, NULL);
+	if (keys == NULL)
+		fatal("cannot find public key in NSS");
+	for (i = 0; keys[i]; i++) {
+		key_write(keys[i], stdout);
+		key_free(keys[i]);
+		fprintf(stdout, "\n");
+	}
+	xfree(keys);
+	exit(0);
+}
+#endif /* HAVE_LIBNSS */
+
 static void
 do_fingerprint(struct passwd *pw)
 {
@@ -1056,7 +1081,8 @@ main(int argc, char **argv)
 	Key *private, *public;
 	struct passwd *pw;
 	struct stat st;
-	int opt, type, fd, download = 0;
+	int opt, type, fd, download = 1;
+	int use_nss = 0;
 	u_int32_t memory = 0, generator_wanted = 0, trials = 100;
 	int do_gen_candidates = 0, do_screen_candidates = 0;
 	int log_level = SYSLOG_LEVEL_INFO;
@@ -1090,7 +1116,7 @@ main(int argc, char **argv)
 	}
 
 	while ((opt = getopt(argc, argv,
-	    "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
+	    "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
 		switch (opt) {
 		case 'b':
 			bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);
@@ -1130,6 +1156,10 @@ main(int argc, char **argv)
 		case 'g':
 			print_generic = 1;
 			break;
+		case 'n':
+			use_nss = 1;
+			download = 1;
+			break;
 		case 'P':
 			identity_passphrase = optarg;
 			break;
@@ -1161,10 +1191,10 @@ main(int argc, char **argv)
 		case 't':
 			key_type_name = optarg;
 			break;
-		case 'D':
-			download = 1;
-			/*FALLTHROUGH*/
 		case 'U':
+			download = 0;
+			/*FALLTHROUGH*/
+		case 'D':
 			reader_id = optarg;
 			break;
 		case 'v':
@@ -1269,6 +1299,17 @@ main(int argc, char **argv)
 			exit(0);
 		}
 	}
+
+	if (use_nss) {
+#ifdef HAVE_LIBNSS
+		if (download)
+			do_nss_download(pw, reader_id, identity_file);
+		else
+			fatal("no support for NSS key upload.");
+#else
+		fatal("no support for NSS keys.");
+#endif
+	}
 	if (reader_id != NULL) {
 #ifdef SMARTCARD
 		if (download)
diff -up openssh-4.7p1/readconf.c.nss-keys openssh-4.7p1/readconf.c
--- openssh-4.7p1/readconf.c.nss-keys	2007-03-21 10:46:03.000000000 +0100
+++ openssh-4.7p1/readconf.c	2007-09-06 17:43:59.000000000 +0200
@@ -124,6 +124,7 @@ typedef enum {
 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
+	oUseNSS, oNSSToken,
 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
@@ -209,6 +210,13 @@ static struct {
 #else
 	{ "smartcarddevice", oUnsupported },
 #endif
+#ifdef HAVE_LIBNSS
+	{ "usenss", oUseNSS },
+	{ "nsstoken", oNSSToken },
+#else
+	{ "usenss", oUnsupported },
+	{ "nsstoken", oNSSToken },
+#endif
 	{ "clearallforwardings", oClearAllForwardings },
 	{ "enablesshkeysign", oEnableSSHKeysign },
 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
@@ -601,6 +609,14 @@ parse_string:
 		charptr = &options->smartcard_device;
 		goto parse_string;
 
+	case oUseNSS:
+		intptr = &options->use_nss;
+		goto parse_flag;
+
+	case oNSSToken:
+		charptr = &options->nss_token;
+		goto parse_command;
+
 	case oProxyCommand:
 		charptr = &options->proxy_command;
 parse_command:
@@ -1049,6 +1065,8 @@ initialize_options(Options * options)
 	options->preferred_authentications = NULL;
 	options->bind_address = NULL;
 	options->smartcard_device = NULL;
+	options->use_nss = -1;
+	options->nss_token = NULL;
 	options->enable_ssh_keysign = - 1;
 	options->no_host_authentication_for_localhost = - 1;
 	options->identities_only = - 1;
@@ -1177,6 +1195,8 @@ fill_default_options(Options * options)
 		options->no_host_authentication_for_localhost = 0;
 	if (options->identities_only == -1)
 		options->identities_only = 0;
+	if (options->use_nss == -1)
+		options->use_nss = 0;
 	if (options->enable_ssh_keysign == -1)
 		options->enable_ssh_keysign = 0;
 	if (options->rekey_limit == -1)

openssh-4.7p1-pam-session.patch:

--- NEW FILE openssh-4.7p1-pam-session.patch ---
diff -up openssh-4.7p1/session.c.pam-session openssh-4.7p1/session.c
--- openssh-4.7p1/session.c.pam-session	2007-08-16 15:28:04.000000000 +0200
+++ openssh-4.7p1/session.c	2007-09-06 17:37:46.000000000 +0200
@@ -422,11 +422,6 @@ do_exec_no_pty(Session *s, const char *c
 
 	session_proctitle(s);
 
-#if defined(USE_PAM)
-	if (options.use_pam && !use_privsep)
-		do_pam_setcred(1);
-#endif /* USE_PAM */
-
 	/* Fork the child. */
 	if ((pid = fork()) == 0) {
 		is_child = 1;
@@ -557,14 +552,6 @@ do_exec_pty(Session *s, const char *comm
 	ptyfd = s->ptyfd;
 	ttyfd = s->ttyfd;
 
-#if defined(USE_PAM)
-	if (options.use_pam) {
-		do_pam_set_tty(s->tty);
-		if (!use_privsep)
-			do_pam_setcred(1);
-	}
-#endif
-
 	/* Fork the child. */
 	if ((pid = fork()) == 0) {
 		is_child = 1;
@@ -1300,17 +1287,9 @@ do_setusercontext(struct passwd *pw)
 # ifdef __bsdi__
 		setpgid(0, 0);
 # endif
-#ifdef GSSAPI
-		if (options.gss_authentication) {
-			temporarily_use_uid(pw);
-			ssh_gssapi_storecreds();
-			restore_uid();
-		}
-#endif
 # ifdef USE_PAM
 		if (options.use_pam) {
-			do_pam_session();
-			do_pam_setcred(use_privsep);
+			do_pam_setcred(0);
 		}
 # endif /* USE_PAM */
 		if (setusercontext(lc, pw, pw->pw_uid,
@@ -1337,13 +1316,6 @@ do_setusercontext(struct passwd *pw)
 			exit(1);
 		}
 		endgrent();
-#ifdef GSSAPI
-		if (options.gss_authentication) {
-			temporarily_use_uid(pw);
-			ssh_gssapi_storecreds();
-			restore_uid();
-		}
-#endif
 # ifdef USE_PAM
 		/*
 		 * PAM credentials may take the form of supplementary groups.
@@ -1351,8 +1323,7 @@ do_setusercontext(struct passwd *pw)
 		 * Reestablish them here.
 		 */
 		if (options.use_pam) {
-			do_pam_session();
-			do_pam_setcred(use_privsep);
+			do_pam_setcred(0);
 		}
 # endif /* USE_PAM */
 # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
diff -up openssh-4.7p1/sshd.c.pam-session openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.pam-session	2007-09-06 17:37:46.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:37:46.000000000 +0200
@@ -1831,7 +1831,21 @@ main(int ac, char **av)
 	audit_event(SSH_AUTH_SUCCESS);
 #endif
 
-	/*
+#ifdef GSSAPI
+	if (options.gss_authentication) {
+		temporarily_use_uid(authctxt->pw);
+		ssh_gssapi_storecreds();
+		restore_uid();
+	}
+#endif
+#ifdef USE_PAM
+	if (options.use_pam) {
+		do_pam_setcred(1);
+		do_pam_session();
+	}
+#endif
+
+ 	/*
 	 * In privilege separation, we fork another child and prepare
 	 * file descriptor passing.
 	 */
diff -up openssh-4.7p1/monitor.c.pam-session openssh-4.7p1/monitor.c
--- openssh-4.7p1/monitor.c.pam-session	2007-09-06 17:37:46.000000000 +0200
+++ openssh-4.7p1/monitor.c	2007-09-06 17:37:46.000000000 +0200
@@ -1566,6 +1566,11 @@ mm_answer_term(int sock, Buffer *req)
 	/* The child is terminating */
 	session_destroy_all(&mm_session_close);
 
+#ifdef USE_PAM
+	if (options.use_pam)
+		sshpam_cleanup();
+#endif
+
 	while (waitpid(pmonitor->m_pid, &status, 0) == -1)
 		if (errno != EINTR)
 			exit(1);
diff -up openssh-4.7p1/auth-pam.c.pam-session openssh-4.7p1/auth-pam.c
--- openssh-4.7p1/auth-pam.c.pam-session	2007-08-10 06:32:34.000000000 +0200
+++ openssh-4.7p1/auth-pam.c	2007-09-06 17:37:46.000000000 +0200
@@ -598,15 +598,17 @@ static struct pam_conv store_conv = { ss
 void
 sshpam_cleanup(void)
 {
-	debug("PAM: cleanup");
-	if (sshpam_handle == NULL)
+	if (sshpam_handle == NULL || (use_privsep && !mm_is_monitor()))
 		return;
+	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
 	if (sshpam_cred_established) {
+		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
 	if (sshpam_session_open) {
+		debug("PAM: closing session");
 		pam_close_session(sshpam_handle, PAM_SILENT);
 		sshpam_session_open = 0;
 	}

openssh-4.7p1-redhat.patch:

--- NEW FILE openssh-4.7p1-redhat.patch ---
diff -up openssh-4.7p1/sshd_config.redhat openssh-4.7p1/sshd_config
--- openssh-4.7p1/sshd_config.redhat	2007-03-21 10:42:25.000000000 +0100
+++ openssh-4.7p1/sshd_config	2007-09-06 16:23:58.000000000 +0200
@@ -33,6 +33,7 @@ Protocol 2
 # Logging
 # obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
+SyslogFacility AUTHPRIV
 #LogLevel INFO
 
 # Authentication:
@@ -59,9 +60,11 @@ Protocol 2
 # To disable tunneled clear text passwords, change to no here!
 #PasswordAuthentication yes
 #PermitEmptyPasswords no
+PasswordAuthentication yes
 
 # Change to no to disable s/key passwords
 #ChallengeResponseAuthentication yes
+ChallengeResponseAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -71,7 +74,9 @@ Protocol 2
 
 # GSSAPI options
 #GSSAPIAuthentication no
+GSSAPIAuthentication yes
 #GSSAPICleanupCredentials yes
+GSSAPICleanupCredentials yes
 
 # Set this to 'yes' to enable PAM authentication, account processing, 
 # and session processing. If this is enabled, PAM authentication will 
@@ -83,10 +88,16 @@ Protocol 2
 # PAM authentication, then enable this but set PasswordAuthentication
 # and ChallengeResponseAuthentication to 'no'.
 #UsePAM no
+UsePAM yes
 
+# Accept locale-related environment variables
+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
+AcceptEnv LC_IDENTIFICATION LC_ALL
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
+X11Forwarding yes
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PrintMotd yes
diff -up openssh-4.7p1/ssh_config.redhat openssh-4.7p1/ssh_config
--- openssh-4.7p1/ssh_config.redhat	2007-06-11 06:04:42.000000000 +0200
+++ openssh-4.7p1/ssh_config	2007-09-06 16:21:49.000000000 +0200
@@ -43,3 +43,13 @@
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+Host *
+	GSSAPIAuthentication yes
+# If this option is set to yes then remote X11 clients will have full access
+# to the original X11 display. As virtually no X11 client supports the untrusted
+# mode correctly we set this to yes.
+	ForwardX11Trusted yes
+# Send locale-related environment variables
+	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
+	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
+	SendEnv LC_IDENTIFICATION LC_ALL
diff -up openssh-4.7p1/sshd_config.0.redhat openssh-4.7p1/sshd_config.0
--- openssh-4.7p1/sshd_config.0.redhat	2007-09-04 08:50:11.000000000 +0200
+++ openssh-4.7p1/sshd_config.0	2007-09-06 16:21:49.000000000 +0200
@@ -435,9 +435,9 @@ DESCRIPTION
 
      SyslogFacility
              Gives the facility code that is used when logging messages from
-             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
-             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
-             fault is AUTH.
+             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+             The default is AUTH.
 
      TCPKeepAlive
              Specifies whether the system should send TCP keepalive messages
diff -up openssh-4.7p1/sshd_config.5.redhat openssh-4.7p1/sshd_config.5
--- openssh-4.7p1/sshd_config.5.redhat	2007-06-11 06:07:13.000000000 +0200
+++ openssh-4.7p1/sshd_config.5	2007-09-06 16:21:49.000000000 +0200
@@ -748,7 +748,7 @@ Note that this option applies to protoco
 .It Cm SyslogFacility
 Gives the facility code that is used when logging messages from
 .Xr sshd 8 .
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
 The default is AUTH.
 .It Cm TCPKeepAlive

openssh-4.7p1-selinux.patch:

--- NEW FILE openssh-4.7p1-selinux.patch ---
diff -up openssh-4.7p1/configure.ac.selinux openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.selinux	2007-09-06 19:46:32.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 19:52:23.000000000 +0200
@@ -3211,6 +3211,7 @@ AC_ARG_WITH(selinux,
 		AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
 		    AC_MSG_ERROR(SELinux support requires libselinux library))
 		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
+		LIBS="$LIBS $LIBSELINUX"
 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
 		LIBS="$save_LIBS"
 	fi ]
diff -up openssh-4.7p1/auth1.c.selinux openssh-4.7p1/auth1.c
--- openssh-4.7p1/auth1.c.selinux	2007-09-06 19:46:32.000000000 +0200
+++ openssh-4.7p1/auth1.c	2007-09-06 19:46:32.000000000 +0200
@@ -388,7 +388,7 @@ void
 do_authentication(Authctxt *authctxt)
 {
 	u_int ulen;
-	char *user, *style = NULL;
+	char *user, *style = NULL, *role=NULL;
 
 	/* Get the name of the user that we wish to log in as. */
 	packet_read_expect(SSH_CMSG_USER);
@@ -397,11 +397,19 @@ do_authentication(Authctxt *authctxt)
 	user = packet_get_string(&ulen);
 	packet_check_eom();
 
+	if ((role = strchr(user, '/')) != NULL)
+		*role++ = '\0';
+
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = '\0';
+	else
+		if (role && (style = strchr(role, ':')) != NULL)
+			*style++ = '\0';
+			
 
 	authctxt->user = user;
 	authctxt->style = style;
+	authctxt->role = role;
 
 	/* Verify that the user is a valid user. */
 	if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
diff -up openssh-4.7p1/monitor_wrap.h.selinux openssh-4.7p1/monitor_wrap.h
--- openssh-4.7p1/monitor_wrap.h.selinux	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/monitor_wrap.h	2007-09-06 19:46:32.000000000 +0200
@@ -41,6 +41,7 @@ int mm_is_monitor(void);
 DH *mm_choose_dh(int, int, int);
 int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int);
 void mm_inform_authserv(char *, char *);
+void mm_inform_authrole(char *);
 struct passwd *mm_getpwnamallow(const char *);
 char *mm_auth2_read_banner(void);
 int mm_auth_password(struct Authctxt *, char *);
diff -up openssh-4.7p1/monitor.h.selinux openssh-4.7p1/monitor.h
--- openssh-4.7p1/monitor.h.selinux	2006-03-26 05:30:02.000000000 +0200
+++ openssh-4.7p1/monitor.h	2007-09-06 19:46:32.000000000 +0200
@@ -30,7 +30,7 @@
 
 enum monitor_reqtype {
 	MONITOR_REQ_MODULI, MONITOR_ANS_MODULI,
-	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,
+	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE,
 	MONITOR_REQ_SIGN, MONITOR_ANS_SIGN,
 	MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM,
 	MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER,
diff -up openssh-4.7p1/monitor_wrap.c.selinux openssh-4.7p1/monitor_wrap.c
--- openssh-4.7p1/monitor_wrap.c.selinux	2007-06-11 06:01:42.000000000 +0200
+++ openssh-4.7p1/monitor_wrap.c	2007-09-06 19:46:32.000000000 +0200
@@ -294,6 +294,23 @@ mm_inform_authserv(char *service, char *
 	buffer_free(&m);
 }
 
+/* Inform the privileged process about role */
+
+void
+mm_inform_authrole(char *role)
+{
+	Buffer m;
+
+	debug3("%s entering", __func__);
+
+	buffer_init(&m);
+	buffer_put_cstring(&m, role ? role : "");
+
+	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m);
+
+	buffer_free(&m);
+}
+
 /* Do the password authentication */
 int
 mm_auth_password(Authctxt *authctxt, char *password)
diff -up openssh-4.7p1/openbsd-compat/port-linux.c.selinux openssh-4.7p1/openbsd-compat/port-linux.c
--- openssh-4.7p1/openbsd-compat/port-linux.c.selinux	2007-06-28 00:48:03.000000000 +0200
+++ openssh-4.7p1/openbsd-compat/port-linux.c	2007-09-06 19:46:32.000000000 +0200
@@ -30,11 +30,16 @@
 #ifdef WITH_SELINUX
 #include "log.h"
 #include "port-linux.h"
+#include "key.h"
+#include "hostfile.h"
+#include "auth.h"
 
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
 #include <selinux/get_context_list.h>
 
+extern Authctxt *the_authctxt;
+
 /* Wrapper around is_selinux_enabled() to log its return value once only */
 static int
 ssh_selinux_enabled(void)
@@ -53,23 +58,36 @@ ssh_selinux_enabled(void)
 static security_context_t
 ssh_selinux_getctxbyname(char *pwname)
 {
-	security_context_t sc;
-	char *sename = NULL, *lvl = NULL;
-	int r;
+	security_context_t sc = NULL;
+	char *sename, *lvl;
+	char *role = NULL;
+	int r = 0;
 
+	if (the_authctxt) 
+		role=the_authctxt->role;
 #ifdef HAVE_GETSEUSERBYNAME
-	if (getseuserbyname(pwname, &sename, &lvl) != 0)
-		return NULL;
+	if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) {
+		sename = NULL;
+		lvl = NULL;
+	}
 #else
 	sename = pwname;
 	lvl = NULL;
 #endif
 
+	if (r == 0) {
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
-	r = get_default_context_with_level(sename, lvl, NULL, &sc);
+		if (role != NULL && role[0])
+			r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc);
+		else
+			r = get_default_context_with_level(sename, lvl, NULL, &sc);
 #else
-	r = get_default_context(sename, NULL, &sc);
+		if (role != NULL && role[0])
+			r = get_default_context_with_role(sename, role, NULL, &sc);
+		else
+			r = get_default_context(sename, NULL, &sc);
 #endif
+	}
 
 	if (r != 0) {
 		switch (security_getenforce()) {
diff -up openssh-4.7p1/auth.h.selinux openssh-4.7p1/auth.h
--- openssh-4.7p1/auth.h.selinux	2006-08-18 16:32:46.000000000 +0200
+++ openssh-4.7p1/auth.h	2007-09-06 19:46:32.000000000 +0200
@@ -58,6 +58,7 @@ struct Authctxt {
 	char		*service;
 	struct passwd	*pw;		/* set if 'valid' */
 	char		*style;
+	char		*role;
 	void		*kbdintctxt;
 #ifdef BSD_AUTH
 	auth_session_t	*as;
diff -up openssh-4.7p1/auth2.c.selinux openssh-4.7p1/auth2.c
--- openssh-4.7p1/auth2.c.selinux	2007-05-20 06:58:41.000000000 +0200
+++ openssh-4.7p1/auth2.c	2007-09-06 19:46:32.000000000 +0200
@@ -141,7 +141,7 @@ input_userauth_request(int type, u_int32
 {
 	Authctxt *authctxt = ctxt;
 	Authmethod *m = NULL;
-	char *user, *service, *method, *style = NULL;
+	char *user, *service, *method, *style = NULL, *role = NULL;
 	int authenticated = 0;
 
 	if (authctxt == NULL)
@@ -153,6 +153,9 @@ input_userauth_request(int type, u_int32
 	debug("userauth-request for user %s service %s method %s", user, service, method);
 	debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
 
+	if ((role = strchr(user, '/')) != NULL)
+		*role++ = 0;
+
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = 0;
 
@@ -178,8 +181,11 @@ input_userauth_request(int type, u_int32
 		    use_privsep ? " [net]" : "");
 		authctxt->service = xstrdup(service);
 		authctxt->style = style ? xstrdup(style) : NULL;
-		if (use_privsep)
+		authctxt->role = role ? xstrdup(role) : NULL;
+		if (use_privsep) {
 			mm_inform_authserv(service, style);
+			mm_inform_authrole(role);
+		}
 	} else if (strcmp(user, authctxt->user) != 0 ||
 	    strcmp(service, authctxt->service) != 0) {
 		packet_disconnect("Change of username or service not allowed: "
diff -up openssh-4.7p1/monitor.c.selinux openssh-4.7p1/monitor.c
--- openssh-4.7p1/monitor.c.selinux	2007-05-20 07:10:16.000000000 +0200
+++ openssh-4.7p1/monitor.c	2007-09-06 19:46:32.000000000 +0200
@@ -133,6 +133,7 @@ int mm_answer_sign(int, Buffer *);
 int mm_answer_pwnamallow(int, Buffer *);
 int mm_answer_auth2_read_banner(int, Buffer *);
 int mm_answer_authserv(int, Buffer *);
+int mm_answer_authrole(int, Buffer *);
 int mm_answer_authpassword(int, Buffer *);
 int mm_answer_bsdauthquery(int, Buffer *);
 int mm_answer_bsdauthrespond(int, Buffer *);
@@ -204,6 +205,7 @@ struct mon_table mon_dispatch_proto20[] 
     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
+    {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
 #ifdef USE_PAM
@@ -657,6 +659,7 @@ mm_answer_pwnamallow(int sock, Buffer *m
 	else {
 		/* Allow service/style information on the auth context */
 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
+		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
 	}
 
@@ -702,6 +705,23 @@ mm_answer_authserv(int sock, Buffer *m)
 }
 
 int
+mm_answer_authrole(int sock, Buffer *m)
+{
+	monitor_permit_authentications(1);
+
+	authctxt->role = buffer_get_string(m, NULL);
+	debug3("%s: role=%s",
+	    __func__, authctxt->role);
+
+	if (strlen(authctxt->role) == 0) {
+		xfree(authctxt->role);
+		authctxt->role = NULL;
+	}
+
+	return (0);
+}
+
+int
 mm_answer_authpassword(int sock, Buffer *m)
 {
 	static int call_count;

openssh-4.7p1-sftp-drain-acks.patch:

--- NEW FILE openssh-4.7p1-sftp-drain-acks.patch ---
diff -up openssh-4.7p1/sftp-client.c.drain-acks openssh-4.7p1/sftp-client.c
--- openssh-4.7p1/sftp-client.c.drain-acks	2007-02-19 12:13:39.000000000 +0100
+++ openssh-4.7p1/sftp-client.c	2007-09-06 17:54:41.000000000 +0200
@@ -992,7 +992,8 @@ int
 do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
     int pflag)
 {
-	int local_fd, status;
+	int local_fd;
+	int status = SSH2_FX_OK;
 	u_int handle_len, id, type;
 	u_int64_t offset;
 	char *handle, *data;
@@ -1074,7 +1075,7 @@ do_upload(struct sftp_conn *conn, char *
 		 * Simulate an EOF on interrupt, allowing ACKs from the
 		 * server to drain.
 		 */
-		if (interrupted)
+		if (interrupted || status != SSH2_FX_OK)
 			len = 0;
 		else do
 			len = read(local_fd, data, conn->transfer_buflen);
@@ -1131,18 +1132,6 @@ do_upload(struct sftp_conn *conn, char *
 				fatal("Can't find request for ID %u", r_id);
 			TAILQ_REMOVE(&acks, ack, tq);
 
-			if (status != SSH2_FX_OK) {
-				error("Couldn't write to remote file \"%s\": %s",
-				    remote_path, fx2txt(status));
-				if (showprogress)
-					stop_progress_meter();
-				do_close(conn, handle, handle_len);
-				close(local_fd);
-				xfree(data);
-				xfree(ack);
-				status = -1;
-				goto done;
-			}
 			debug3("In write loop, ack for %u %u bytes at %llu",
 			    ack->id, ack->len, (unsigned long long)ack->offset);
 			++ackid;
@@ -1154,21 +1143,25 @@ do_upload(struct sftp_conn *conn, char *
 		stop_progress_meter();
 	xfree(data);
 
+	if (status != SSH2_FX_OK) {
+		error("Couldn't write to remote file \"%s\": %s",
+		    remote_path, fx2txt(status));
+		status = -1;
+	}
+
 	if (close(local_fd) == -1) {
 		error("Couldn't close local file \"%s\": %s", local_path,
 		    strerror(errno));
-		do_close(conn, handle, handle_len);
 		status = -1;
-		goto done;
 	}
 
 	/* Override umask and utimes if asked */
 	if (pflag)
 		do_fsetstat(conn, handle, handle_len, &a);
 
-	status = do_close(conn, handle, handle_len);
+	if (do_close(conn, handle, handle_len) != SSH2_FX_OK)
+		status = -1;
 
-done:
 	xfree(handle);
 	buffer_free(&msg);
 	return(status);

openssh-4.7p1-vendor.patch:

--- NEW FILE openssh-4.7p1-vendor.patch ---
diff -up openssh-4.7p1/configure.ac.vendor openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 16:27:47.000000000 +0200
@@ -3792,6 +3792,12 @@ AC_ARG_WITH(lastlog,
 		fi
 	]
 )
+AC_ARG_ENABLE(vendor-patchlevel,
+  [  --enable-vendor-patchlevel=TAG  specify a vendor patch level],
+  [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL="$enableval"],
+  [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL=none])
 
 dnl lastlog, [uw]tmpx? detection
 dnl  NOTE: set the paths in the platform section to avoid the
@@ -4041,6 +4047,7 @@ echo "       IP address in \$DISPLAY hac
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
 echo "              Random number source: $RAND_MSG"
+echo "                Vendor patch level: $SSH_VENDOR_PATCHLEVEL"
 if test ! -z "$USE_RAND_HELPER" ; then
 echo "     ssh-rand-helper collects from: $RAND_HELPER_MSG"
 fi
diff -up openssh-4.7p1/sshd_config.5.vendor openssh-4.7p1/sshd_config.5
--- openssh-4.7p1/sshd_config.5.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config.5	2007-09-06 16:27:47.000000000 +0200
@@ -725,6 +725,14 @@ This option applies to protocol version 
 .It Cm ServerKeyBits
 Defines the number of bits in the ephemeral protocol version 1 server key.
 The minimum value is 512, and the default is 768.
+.It Cm ShowPatchLevel
+Specifies whether
+.Nm sshd
+will display the patch level of the binary in the identification string.
+The patch level is set at compile-time.
+The default is
+.Dq no .
+This option applies to protocol version 1 only.
 .It Cm StrictModes
 Specifies whether
 .Xr sshd 8
diff -up openssh-4.7p1/servconf.h.vendor openssh-4.7p1/servconf.h
--- openssh-4.7p1/servconf.h.vendor	2007-02-19 12:25:38.000000000 +0100
+++ openssh-4.7p1/servconf.h	2007-09-06 16:27:47.000000000 +0200
@@ -120,6 +120,7 @@ typedef struct {
 	int	max_startups;
 	int	max_authtries;
 	char   *banner;			/* SSH-2 banner message */
+	int	show_patchlevel;	/* Show vendor patch level to clients */
 	int	use_dns;
 	int	client_alive_interval;	/*
 					 * poke the client this often to
diff -up openssh-4.7p1/servconf.c.vendor openssh-4.7p1/servconf.c
--- openssh-4.7p1/servconf.c.vendor	2007-05-20 07:03:16.000000000 +0200
+++ openssh-4.7p1/servconf.c	2007-09-06 16:29:11.000000000 +0200
@@ -113,6 +113,7 @@ initialize_server_options(ServerOptions 
 	options->max_startups = -1;
 	options->max_authtries = -1;
 	options->banner = NULL;
+	options->show_patchlevel = -1;
 	options->use_dns = -1;
 	options->client_alive_interval = -1;
 	options->client_alive_count_max = -1;
@@ -250,6 +251,9 @@ fill_default_server_options(ServerOption
 	if (options->permit_tun == -1)
 		options->permit_tun = SSH_TUNMODE_NO;
 
+	if (options->show_patchlevel == -1)
+		options->show_patchlevel = 0;
+
 	/* Turn privilege separation on by default */
 	if (use_privsep == -1)
 		use_privsep = 1;
@@ -293,6 +297,7 @@ typedef enum {
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
 	sMatch, sPermitOpen, sForceCommand,
 	sUsePrivilegeSeparation,
+	sShowPatchLevel,
 	sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@ -390,6 +395,7 @@ static struct {
 	{ "maxstartups", sMaxStartups, SSHCFG_GLOBAL },
 	{ "maxauthtries", sMaxAuthTries, SSHCFG_GLOBAL },
 	{ "banner", sBanner, SSHCFG_ALL },
+	{ "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL },
 	{ "usedns", sUseDNS, SSHCFG_GLOBAL },
 	{ "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL },
 	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
@@ -1005,6 +1011,10 @@ parse_flag:
 		intptr = &use_privsep;
 		goto parse_flag;
 
+	case sShowPatchLevel:
+		intptr = &options->show_patchlevel;
+		goto parse_flag;
+
 	case sAllowUsers:
 		while ((arg = strdelim(&cp)) && *arg != '\0') {
 			if (options->num_allow_users >= MAX_ALLOW_USERS)
diff -up openssh-4.7p1/sshd_config.0.vendor openssh-4.7p1/sshd_config.0
--- openssh-4.7p1/sshd_config.0.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config.0	2007-09-06 16:27:47.000000000 +0200
@@ -418,6 +418,11 @@ DESCRIPTION
              Defines the number of bits in the ephemeral protocol version 1
              server key.  The minimum value is 512, and the default is 768.
 
+     ShowPatchLevel
+	     Specifies whether sshd will display the specific patch level of
+	     the binary in the server identification string.  The patch level
+	     is set at compile-time.  The default is M-bM-^@M-^\noM-bM-^@M-^].
+
      StrictModes
              Specifies whether sshd(8) should check file modes and ownership
              of the user's files and home directory before accepting login.
diff -up openssh-4.7p1/sshd_config.vendor openssh-4.7p1/sshd_config
--- openssh-4.7p1/sshd_config.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config	2007-09-06 16:27:47.000000000 +0200
@@ -109,6 +109,7 @@ X11Forwarding yes
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
+#ShowPatchLevel no
 #UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
diff -up openssh-4.7p1/sshd.c.vendor openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.vendor	2007-06-05 10:22:32.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 16:27:47.000000000 +0200
@@ -419,7 +419,8 @@ sshd_exchange_identification(int sock_in
 		major = PROTOCOL_MAJOR_1;
 		minor = PROTOCOL_MINOR_1;
 	}
-	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_VERSION);
+	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor,
+		 (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION);
 	server_version_string = xstrdup(buf);
 
 	/* Send our protocol version identification. */
@@ -1434,7 +1435,8 @@ main(int ac, char **av)
 		exit(1);
 	}
 
-	debug("sshd version %.100s", SSH_RELEASE);
+	debug("sshd version %.100s",
+	      (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE);
 
 	/* Store privilege separation user for later use if required. */
 	if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Dec 2006 13:42:47 -0000	1.19
+++ .cvsignore	6 Sep 2007 19:49:16 -0000	1.20
@@ -1 +1 @@
-openssh-4.5p1-noacss.tar.bz2
+openssh-4.7p1-noacss.tar.bz2


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openssh.spec	9 Aug 2007 18:33:41 -0000	1.112
+++ openssh.spec	6 Sep 2007 19:49:16 -0000	1.113
@@ -1,10 +1,5 @@
+# Do we want SELinux & Audit
 %define WITH_SELINUX 1
-%if %{WITH_SELINUX}
-# Audit patch applicable only over SELinux patch
-%define WITH_AUDIT 1
-%else
-%define WITH_AUDIT 0
-%endif
 
 # OpenSSH privilege separation requires a user & group ID
 %define sshd_uid    74
@@ -28,6 +23,9 @@
 # Do we want kerberos5 support (1=yes 0=no)
 %define kerberos5 1
 
+# Do we want libedit support
+%define libedit 1
+
 # Do we want NSS tokens support
 %define nss 1
 
@@ -59,42 +57,44 @@
 # Turn off some stuff for resuce builds
 %if %{rescue}
 %define kerberos5 0
+%define libedit 0
 %endif
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
-Version: 4.5p1
-Release: 8%{?dist}%{?rescue_rel}
+Version: 4.7p1
+Release: 1%{?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.sig
+#Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
 # This package differs from the upstream OpenSSH tarball in that
 # the ACSS cipher is removed by running openssh-nukeacss.sh in
 # the unpacked source directory.
 Source0: openssh-%{version}-noacss.tar.bz2
 Source1: openssh-nukeacss.sh
-Patch0: openssh-4.5p1-redhat.patch
+Patch0: openssh-4.7p1-redhat.patch
 Patch2: openssh-3.8.1p1-skip-initial.patch
 Patch3: openssh-3.8.1p1-krb5-config.patch
-Patch4: openssh-4.5p1-vendor.patch
+Patch4: openssh-4.7p1-vendor.patch
 Patch5: openssh-4.3p2-initscript.patch
-Patch12: openssh-4.5p1-selinux.patch
-Patch16: openssh-4.5p1-audit.patch
+Patch10: openssh-4.7p1-pam-session.patch
+Patch12: openssh-4.7p1-selinux.patch
+Patch13: openssh-4.7p1-mls.patch
+Patch16: openssh-4.7p1-audit.patch
+Patch17: openssh-4.3p2-cve-2007-3102.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
 Patch26: openssh-4.2p1-pam-no-stack.patch
-Patch27: openssh-3.9p1-log-in-chroot.patch
+Patch27: openssh-4.7p1-log-in-chroot.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
 Patch39: openssh-4.3p2-no-v6only.patch
 Patch44: openssh-4.3p2-allow-ip-opts.patch
-Patch48: openssh-4.3p2-pam-session.patch
 Patch49: openssh-4.3p2-gssapi-canohost.patch
-Patch50: openssh-4.5p1-mls.patch
-Patch51: openssh-4.5p1-nss-keys.patch
-Patch52: openssh-4.5p1-sftp-drain-acks.patch
+Patch51: openssh-4.7p1-nss-keys.patch
+Patch52: openssh-4.7p1-sftp-drain-acks.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +126,10 @@
 BuildRequires: krb5-devel
 %endif
 
+%if %{libedit}
+BuildRequires: libedit-devel
+%endif
+
 %if %{nss}
 BuildRequires: nss-devel
 %endif
@@ -133,9 +137,6 @@
 %if %{WITH_SELINUX}
 Requires: libselinux >= 1.27.7
 BuildRequires: libselinux-devel >= 1.27.7
-%endif
-
-%if %{WITH_AUDIT}
 Requires: audit-libs >= 1.0.8
 BuildRequires: audit-libs >= 1.0.8
 %endif
@@ -204,13 +205,14 @@
 %patch4 -p1 -b .vendor
 %patch5 -p1 -b .initscript
 
+%patch10 -p1 -b .pam-session
+
 %if %{WITH_SELINUX}
 #SELinux
 %patch12 -p1 -b .selinux
-%endif
-
-%if %{WITH_AUDIT}
+%patch13 -p1 -b .mls
 %patch16 -p1 -b .audit
+%patch17 -p1 -b .inject-fix
 %endif
 
 %patch22 -p1 -b .keep-above
@@ -223,9 +225,7 @@
 %patch38 -p1 -b .grab-info
 %patch39 -p1 -b .no-v6only
 %patch44 -p1 -b .ip-opts
-%patch48 -p1 -b .pam-sesssion
 %patch49 -p1 -b .canohost
-%patch50 -p1 -b .mls
 %patch51 -p1 -b .nss-keys
 %patch52 -p1 -b .drain-acks
 
@@ -282,15 +282,17 @@
 	--with-pam \
 %endif
 %if %{WITH_SELINUX}
-	--with-selinux \
-%endif
-%if %{WITH_AUDIT}
-	--with-linux-audit \
+	--with-selinux --with-linux-audit \
 %endif
 %if %{kerberos5}
-	--with-kerberos5${krb5_prefix:+=${krb5_prefix}}
+	--with-kerberos5${krb5_prefix:+=${krb5_prefix}} \
 %else
-	--without-kerberos5
+	--without-kerberos5 \
+%endif
+%if %{libedit}
+	--with-libedit
+%else
+	--without-libedit
 %endif
 
 %if %{static_libcrypto}
@@ -478,6 +480,11 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
+- upgrade to latest upstream
+- use libedit in sftp (#203009)
+- fixed audit log injection problem (CVE-2007-3102)
+
 * Thu Aug  9 2007 Tomas Mraz <tmraz at redhat.com> - 4.5p1-8
 - fix sftp client problems on write error (#247802)
 - allow disabling autocreation of server keys (#235466)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Dec 2006 13:42:47 -0000	1.19
+++ sources	6 Sep 2007 19:49:16 -0000	1.20
@@ -1 +1 @@
-9ef9bf019945105f2ac1760c95c9b339  openssh-4.5p1-noacss.tar.bz2
+21634329a8f1cd0e7a7974ade7280bdc  openssh-4.7p1-noacss.tar.bz2


--- openssh-3.9p1-log-in-chroot.patch DELETED ---


--- openssh-4.3p2-pam-session.patch DELETED ---


--- openssh-4.5p1-audit.patch DELETED ---


--- openssh-4.5p1-mls.patch DELETED ---


--- openssh-4.5p1-nss-keys.patch DELETED ---


--- openssh-4.5p1-redhat.patch DELETED ---


--- openssh-4.5p1-selinux.patch DELETED ---


--- openssh-4.5p1-sftp-drain-acks.patch DELETED ---


--- openssh-4.5p1-vendor.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:07 -0400
Subject: rpms/aspell-sk - New directory
Message-ID: <200709061950.l86Jo7i9008889@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk

Log Message:
Directory /cvs/extras/rpms/aspell-sk added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:11 -0400
Subject: rpms/aspell-sk/devel - New directory
Message-ID: <200709061950.l86JoB6A008905@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk/devel

Log Message:
Directory /cvs/extras/rpms/aspell-sk/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:15 -0400
Subject: rpms/aspell-sk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061950.l86JoFEi008932@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk

Added Files:
	Makefile import.log 
Log Message:
Setup of module aspell-sk


--- NEW FILE Makefile ---
# Top level Makefile for module aspell-sk
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:17 -0400
Subject: rpms/aspell-sk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709061950.l86JoHl8008948@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aspell-sk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aspell-sk
# $Id: Makefile,v 1.1 2007/09/06 19:50:15 kevin Exp $
NAME := aspell-sk
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:51:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:51:33 -0700
Subject: [pkgdb] revisor (Fedora EPEL, 5) updated by kevin
Message-ID: <200709061951.l86JpXKW001287@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for revisor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on revisor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on revisor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on revisor (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 19:56:10 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 6 Sep 2007 15:56:10 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.43, 1.44 sources, 1.44,
	1.45 sugar.spec, 1.52, 1.53
Message-ID: <200709061956.l86JuAd2009549@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9497

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Sep 2007 20:15:33 -0000	1.43
+++ .cvsignore	6 Sep 2007 19:55:37 -0000	1.44
@@ -1 +1 @@
-sugar-0.65-git0ad6398cf1.tar.bz2
+sugar-0.65-gitd9a30c23ff.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	4 Sep 2007 20:15:33 -0000	1.44
+++ sources	6 Sep 2007 19:55:37 -0000	1.45
@@ -1 +1 @@
-584319f7d8c0f95e44ccea0315528d4f  sugar-0.65-git0ad6398cf1.tar.bz2
+b363c82dcf6fcb7f2c64c71d8d739332  sugar-0.65-gitd9a30c23ff.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sugar.spec	4 Sep 2007 20:15:33 -0000	1.52
+++ sugar.spec	6 Sep 2007 19:55:37 -0000	1.53
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070904git
-%define commitid 0ad6398cf1
+%define alphatag 20070906git
+%define commitid d9a30c23ff
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.40.%{alphatag}0ad6398cf1
+Release: 0.41.%{alphatag}d9a30c23ff
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
+- New snapshot
+
 * Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 19:58:55 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 6 Sep 2007 15:58:55 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sugar-artwork.spec, 1.23, 1.24
Message-ID: <200709061958.l86JwtMt009664@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9641

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Aug 2007 21:50:24 -0000	1.22
+++ .cvsignore	6 Sep 2007 19:58:23 -0000	1.23
@@ -1 +1 @@
-sugar-artwork-0.34-gitd2120f79b7.tar.bz2
+sugar-artwork-0.34-gitf89f6e00cc.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Aug 2007 21:50:24 -0000	1.22
+++ sources	6 Sep 2007 19:58:23 -0000	1.23
@@ -1 +1 @@
-d833f608800c2bb959596c44b8b312d6  sugar-artwork-0.34-gitd2120f79b7.tar.bz2
+c45cc536ac31f86a95377c1f93bb0a27  sugar-artwork-0.34-gitf89f6e00cc.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-artwork.spec	30 Aug 2007 21:50:24 -0000	1.23
+++ sugar-artwork.spec	6 Sep 2007 19:58:23 -0000	1.24
@@ -1,10 +1,10 @@
-%define alphatag 20070830git
-%define commitid d2120f79b7
+%define alphatag 20070906git
+%define commitid f89f6e00cc
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.23.%{alphatag}d2120f79b7
+Release: 0.24.%{alphatag}f89f6e00cc
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.23.20070830gitd2120f79b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:07:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:07:18 -0400
Subject: rpms/krb5/F-7 kadmind.init,1.10,1.11
Message-ID: <200709062007.l86K7IRg015934@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15901

Modified Files:
	kadmind.init 
Log Message:
- fix incorrect call to "test" in the kadmin init script



Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/kadmind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadmind.init	27 Jun 2007 18:14:25 -0000	1.10
+++ kadmind.init	6 Sep 2007 20:06:44 -0000	1.11
@@ -32,7 +32,7 @@
   	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
 	    # Make an educated guess -- if they're using kldap somewhere,
 	    # then we don't know for sure that this is an error.
-  	    if [ ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ] ; then
+  	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
 	    fi
 	    exit 0



From fedora-extras-commits at redhat.com  Thu Sep  6 20:07:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:07:52 -0400
Subject: rpms/krb5/devel kadmind.init,1.10,1.11
Message-ID: <200709062007.l86K7qFv015988@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15931

Modified Files:
	kadmind.init 
Log Message:
- fix incorrect call to test in the kadmin init script


Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadmind.init	18 May 2007 22:16:16 -0000	1.10
+++ kadmind.init	6 Sep 2007 20:07:18 -0000	1.11
@@ -32,7 +32,7 @@
   	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
 	    # Make an educated guess -- if they're using kldap somewhere,
 	    # then we don't know for sure that this is an error.
-  	    if [ ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ] ; then
+  	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
 	    fi
 	    exit 0



From fedora-extras-commits at redhat.com  Thu Sep  6 20:08:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:08:18 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999-2.patch,NONE,1.1 krb5.spec,1.114,1.115
Message-ID: <200709062008.l86K8IL0016007@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15967

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999-2.patch 
Log Message:
- incorporate updated fix for CVE-2007-3999

CVE-2007-3999-2.patch:

--- NEW FILE CVE-2007-3999-2.patch ---
*** src/lib/rpc/svc_auth_gss.c	(revision 20474)
--- src/lib/rpc/svc_auth_gss.c	(local)
***************
*** 355,360 ****
--- 355,369 ----
  	memset(rpchdr, 0, sizeof(rpchdr));
  
  	/* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
+ 	oa = &msg->rm_call.cb_cred;
+ 	if (oa->oa_length > MAX_AUTH_BYTES)
+ 		return (FALSE);
+ 
+ 	/* 8 XDR units from the IXDR macro calls. */
+ 	if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT +
+ 			      RNDUP(oa->oa_length)))
+ 		return (FALSE);
+ 
  	buf = (int32_t *)(void *)rpchdr;
  	IXDR_PUT_LONG(buf, msg->rm_xid);
  	IXDR_PUT_ENUM(buf, msg->rm_direction);
***************
*** 362,368 ****
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
- 	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
  	if (oa->oa_length) {
--- 371,376 ----


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- krb5.spec	4 Sep 2007 18:10:20 -0000	1.114
+++ krb5.spec	6 Sep 2007 20:07:45 -0000	1.115
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -77,7 +77,7 @@
 Patch55: krb5-1.6.1-empty.patch
 Patch56: krb5-1.6.1-get_opt_fixup.patch
 Patch57: krb5-1.6.1-ftp-nospew.patch
-Patch58: CVE-2007-3999.patch
+Patch58: CVE-2007-3999-2.patch
 Patch59: CVE-2007-4000.patch
 
 Patch62: krb5-any-fixup-patch.txt
@@ -198,6 +198,10 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
+- incorporate updated fix for CVE-2007-3999
+- fix incorrect call to "test" in the kadmin init script
+
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
 
@@ -1147,7 +1151,7 @@
 #%patch55 -p1 -b .empty
 %patch56 -p0 -b .get_opt_fixup
 %patch57 -p1 -b .ftp-nospew
-%patch58 -p0 -b .2007-3999
+%patch58 -p0 -b .2007-3999-2
 %patch59 -p0 -b .2007-4000
 %patch70 -p0 -b .2007-004
 %patch71 -p0 -b .2007-005



From fedora-extras-commits at redhat.com  Thu Sep  6 20:08:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:08:52 -0400
Subject: rpms/krb5/devel krb5.spec,1.132,1.133
Message-ID: <200709062008.l86K8qN2016070@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16011

Modified Files:
	krb5.spec 
Log Message:
- incorporate updated fix for CVE-2007-3999


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- krb5.spec	4 Sep 2007 18:10:23 -0000	1.132
+++ krb5.spec	6 Sep 2007 20:08:19 -0000	1.133
@@ -84,7 +84,7 @@
 Patch57: krb5-1.6.2-login_chdir.patch
 Patch58: krb5-1.6.2-key_exp.patch
 Patch59: krb5-kpasswd_tcp.patch
-Patch65: CVE-2007-3999.patch
+Patch65: CVE-2007-3999-2.patch
 Patch66: CVE-2007-4000.patch
 
 Patch60: krb5-1.6.1-pam.patch
@@ -208,6 +208,10 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
+- incorporate updated fix for CVE-2007-3999
+- fix incorrect call to "test" in the kadmin init script
+
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
 
@@ -1213,7 +1217,7 @@
 %patch51 -p0 -b .ldap_init
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
-%patch64 -p0 -b .2007-3999
+%patch64 -p0 -b .2007-3999-2
 %patch65 -p0 -b .2007-4000
 #%patch55 -p1 -b .empty
 #%patch56 -p1 -b .doublelog



From fedora-extras-commits at redhat.com  Thu Sep  6 20:09:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:09:48 -0400
Subject: rpms/krb5/devel krb5.spec,1.133,1.134
Message-ID: <200709062009.l86K9mmZ016139@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16109

Modified Files:
	krb5.spec 
Log Message:
bump the revision


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- krb5.spec	6 Sep 2007 20:08:19 -0000	1.133
+++ krb5.spec	6 Sep 2007 20:09:14 -0000	1.134
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 5%{?dist}
+Release: 6%{?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 fedora-extras-commits at redhat.com  Thu Sep  6 20:11:25 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:11:25 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.23,1.24
Message-ID: <200709062011.l86KBPST016238@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16192

Modified Files:
	libXaw.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
- Move Xaw6 to a compat package, nothing in the distro needs it.



Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libXaw.spec	21 Aug 2007 20:11:15 -0000	1.23
+++ libXaw.spec	6 Sep 2007 20:10:52 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -26,6 +26,13 @@
 %description
 X.Org X11 libXaw runtime library
 
+%package compat
+Summary: X.Org X11 libXaw version 6 compatibility
+Group: System Environment/Libraries
+
+%description compat
+X.Org X11 libXaw version 6 compatibility
+
 %package devel
 Summary: X.Org X11 libXaw development package
 Group: Development/Libraries
@@ -45,14 +52,8 @@
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure --disable-xaw8 \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-xaw8 --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -72,13 +73,18 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/libXaw.so.6
 %{_libdir}/libXaw.so.7
-%{_libdir}/libXaw6.so.6
-%{_libdir}/libXaw6.so.6.0.1
 %{_libdir}/libXaw7.so.7
 %{_libdir}/libXaw7.so.7.0.0
 
+%files compat
+%defattr(-,root,root,-)
+%{_libdir}/libXaw.so.6
+%{_libdir}/libXaw6.so
+%{_libdir}/libXaw6.so.6
+%{_libdir}/libXaw6.so.6.0.1
+%{_libdir}/pkgconfig/xaw6.pc
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
@@ -87,13 +93,7 @@
 # FIXME:  Is this C file really supposed to be here?
 %{_includedir}/X11/Xaw/Template.c
 %{_libdir}/libXaw.so
-%if %{with_static}
-%{_libdir}/libXaw6.a
-%{_libdir}/libXaw7.a
-%endif
-%{_libdir}/libXaw6.so
 %{_libdir}/libXaw7.so
-%{_libdir}/pkgconfig/xaw6.pc
 %{_libdir}/pkgconfig/xaw7.pc
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
@@ -101,6 +101,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
+- Move Xaw6 to a compat package, nothing in the distro needs it.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-9
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:11:30 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:11:30 -0400
Subject: rpms/varnish/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 varnish.spec, 1.1, 1.2
Message-ID: <200709062011.l86KBUfT016274@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
Update to 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 May 2007 18:03:11 -0000	1.2
+++ .cvsignore	6 Sep 2007 20:10:56 -0000	1.3
@@ -1 +1 @@
-varnish-1.0.4.tar.gz
+varnish-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 May 2007 18:03:11 -0000	1.2
+++ sources	6 Sep 2007 20:10:56 -0000	1.3
@@ -1 +1 @@
-2a917e485700d44b28c0d0b626ea90d8  varnish-1.0.4.tar.gz
+fb4159a46a32b8c5bceca88f22e999a5  varnish-1.1.1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnish.spec	21 May 2007 18:03:11 -0000	1.1
+++ varnish.spec	6 Sep 2007 20:10:56 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -10,6 +10,7 @@
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -28,40 +29,51 @@
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
 #Requires: ncurses
+#Obsoletes: libvarnish1
 
 %description libs
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
-#
-#%description devel
-#Development libraries for %{name}.
-#Varnish is a high-performance HTTP accelerator
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
+
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
 
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
+#./autogen.sh
+
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
-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;
+        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
 sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
 
+
+%if "%dist" == "el4"
+    sed -i 's,daemon --pidfile \${\?PIDFILE}\?,daemon,g;
+            s,status -p \$PIDFILE,status,g;
+            s,killproc -p \$PIDFILE,killproc,g' \
+    redhat/varnish.initrc redhat/varnishlog.initrc
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -69,8 +81,8 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
@@ -105,12 +117,30 @@
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
+%{_libdir}/libvcl.so
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+%doc LICENSE
+
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+    -c "Varnish http accelerator user" varnish
+exit 0
 
 %post
 /sbin/chkconfig --add varnish
@@ -135,9 +165,23 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
+- Bumped the version number to 1.1.1.
+* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
+- Update for 1.1 branch
+- Added the devel package for the header files and static library files
+- Added a varnish user, and fixed the init script accordingly
+
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at linpro.no> - 1.1-1
+- Bump Version and Release for 1.1
+
+* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
+- Fixed initrc-script bug only visible on el4 (fixes #107)
+
 * Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
 - Repack from unchanged 1.0.4 tarball
 - Final review request and CVS request for Fedora Extras
+- Repack with extra obsoletes for upgrading from older sf.net package
 
 * Fri May 18 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.0.4-1
 - Bump Version and Release for 1.0.4



From fedora-extras-commits at redhat.com  Thu Sep  6 20:14:06 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Thu, 06 Sep 2007 13:14:06 -0700
Subject: [pkgdb] redhat-rpm-config: ajax has requested watchcommits
Message-ID: <200709062014.l86KEARM001609@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on redhat-rpm-config (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redhat-rpm-config



From fedora-extras-commits at redhat.com  Thu Sep  6 20:18:26 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:18:26 -0400
Subject: rpms/varnish/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 varnish.spec,
	1.1, 1.2
Message-ID: <200709062018.l86KIQl3016532@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16503

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
Update to 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jun 2007 18:48:43 -0000	1.2
+++ .cvsignore	6 Sep 2007 20:17:54 -0000	1.3
@@ -1 +1 @@
-varnish-1.0.4.tar.gz
+varnish-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jun 2007 18:48:43 -0000	1.2
+++ sources	6 Sep 2007 20:17:54 -0000	1.3
@@ -1 +1 @@
-2a917e485700d44b28c0d0b626ea90d8  varnish-1.0.4.tar.gz
+fb4159a46a32b8c5bceca88f22e999a5  varnish-1.1.1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnish.spec	4 Jun 2007 18:54:10 -0000	1.1
+++ varnish.spec	6 Sep 2007 20:17:54 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -10,6 +10,7 @@
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -28,40 +29,51 @@
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
 #Requires: ncurses
+#Obsoletes: libvarnish1
 
 %description libs
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
-#
-#%description devel
-#Development libraries for %{name}.
-#Varnish is a high-performance HTTP accelerator
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
+
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
 
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
+#./autogen.sh
+
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
-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;
+        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
 sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
 
+
+%if "%dist" == "el4"
+    sed -i 's,daemon --pidfile \${\?PIDFILE}\?,daemon,g;
+            s,status -p \$PIDFILE,status,g;
+            s,killproc -p \$PIDFILE,killproc,g' \
+    redhat/varnish.initrc redhat/varnishlog.initrc
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -69,8 +81,8 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
@@ -105,12 +117,30 @@
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
+%{_libdir}/libvcl.so
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+%doc LICENSE
+
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+    -c "Varnish http accelerator user" varnish
+exit 0
 
 %post
 /sbin/chkconfig --add varnish
@@ -135,9 +165,23 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
+- Bumped the version number to 1.1.1.
+* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
+- Update for 1.1 branch
+- Added the devel package for the header files and static library files
+- Added a varnish user, and fixed the init script accordingly
+
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at linpro.no> - 1.1-1
+- Bump Version and Release for 1.1
+
+* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
+- Fixed initrc-script bug only visible on el4 (fixes #107)
+
 * Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
 - Repack from unchanged 1.0.4 tarball
 - Final review request and CVS request for Fedora Extras
+- Repack with extra obsoletes for upgrading from older sf.net package
 
 * Fri May 18 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.0.4-1
 - Bump Version and Release for 1.0.4



From fedora-extras-commits at redhat.com  Thu Sep  6 20:20:58 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:20:58 -0400
Subject: rpms/krb5/devel CVE-2007-3999-2.patch,NONE,1.1
Message-ID: <200709062020.l86KKw6X016675@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16656

Added Files:
	CVE-2007-3999-2.patch 
Log Message:
- incorporate updated fix for CVE-2007-3999


CVE-2007-3999-2.patch:

--- NEW FILE CVE-2007-3999-2.patch ---
*** src/lib/rpc/svc_auth_gss.c	(revision 20474)
--- src/lib/rpc/svc_auth_gss.c	(local)
***************
*** 355,360 ****
--- 355,369 ----
  	memset(rpchdr, 0, sizeof(rpchdr));
  
  	/* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
+ 	oa = &msg->rm_call.cb_cred;
+ 	if (oa->oa_length > MAX_AUTH_BYTES)
+ 		return (FALSE);
+ 
+ 	/* 8 XDR units from the IXDR macro calls. */
+ 	if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT +
+ 			      RNDUP(oa->oa_length)))
+ 		return (FALSE);
+ 
  	buf = (int32_t *)(void *)rpchdr;
  	IXDR_PUT_LONG(buf, msg->rm_xid);
  	IXDR_PUT_ENUM(buf, msg->rm_direction);
***************
*** 362,368 ****
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
- 	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
  	if (oa->oa_length) {
--- 371,376 ----



From fedora-extras-commits at redhat.com  Thu Sep  6 20:24:14 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:24:14 -0400
Subject: rpms/varnish/F-7 varnish.spec,1.2,1.3
Message-ID: <200709062024.l86KOEKd016846@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16807

Modified Files:
	varnish.spec 
Log Message:
1.1.1-2: Removed autogen call (only diff from relase tarball)


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- varnish.spec	6 Sep 2007 20:17:54 -0000	1.2
+++ varnish.spec	6 Sep 2007 20:23:42 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -165,8 +165,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
+- Removed autogen call (only diff from relase tarball)
+
 * Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
 - Bumped the version number to 1.1.1.
+
 * Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
 - Update for 1.1 branch
 - Added the devel package for the header files and static library files



From fedora-extras-commits at redhat.com  Thu Sep  6 20:25:04 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:25:04 -0400
Subject: rpms/tomcat-native/devel tomcat-native.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062025.l86KP4lJ016891@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tomcat-native.spec 
Log Message:
Initial import (#273761)


--- NEW FILE tomcat-native.spec ---
Name:           tomcat-native
Version:        1.1.10
Release:        0.2%{?dist}
Summary:        Tomcat native library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://tomcat.apache.org/tomcat-6.0-doc/apr.html
Source0:        http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel
BuildRequires:  jpackage-utils
BuildRequires:  apr-devel >= 1.2.1
BuildRequires:  openssl-devel
# Upstream compatibility:
Provides:       tcnative = %{version}-%{release}

%description
Tomcat can use the Apache Portable Runtime to provide superior
scalability, performance, and better integration with native server
technologies.  The Apache Portable Runtime is a highly portable library
that is at the heart of Apache HTTP Server 2.x.  APR has many uses,
including access to advanced IO functionality (such as sendfile, epoll
and OpenSSL), OS level functionality (random number generation, system
status, etc), and native process handling (shared memory, NT pipes and
Unix sockets).  This package contains the Tomcat native library which
provides support for using APR in Tomcat.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd jni/native
%configure \
    --with-apr=%{_bindir}/apr-1-config \
    --with-java-home=%{java_home} \
    --with-java-platform=2
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make -C jni/native install DESTDIR=$RPM_BUILD_ROOT
# Perhaps a devel package sometime?  Not for now; no headers are installed.
rm -f $RPM_BUILD_ROOT%{_libdir}/libtcnative*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE.txt
# Note: unversioned *.so needed here :(
%{_libdir}/libtcnative*.so*


%changelog
* Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
- License: ASL 2.0.

* Mon Apr 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.1
- 1.1.10.

* Tue Apr  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9-0.1
- 1.1.9.

* Sat Jan  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-0.1
- 1.1.8.

* Tue Dec 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-0.1
- 1.1.7.

* Mon Nov 13 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-0.1
- 1.1.6.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.4-0.1
- 1.1.4, specfile cleanup.

* Wed Jun 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.3-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:40:40 -0000	1.1
+++ .cvsignore	6 Sep 2007 20:24:32 -0000	1.2
@@ -0,0 +1 @@
+tomcat-native-1.1.10-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:40:40 -0000	1.1
+++ sources	6 Sep 2007 20:24:32 -0000	1.2
@@ -0,0 +1 @@
+8d2eaef338a1a02f3d929a575d5e1453  tomcat-native-1.1.10-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:26:38 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:26:38 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.87, 1.88 hwdata.spec, 1.92,
	1.93 sources, 1.90, 1.91
Message-ID: <200709062026.l86KQcTr017022@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/hwdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16990/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.207-1
- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite
  so dumb.  90kHz hsync is way out of range for any common single-link DVI
  panel, for example. (#247271)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	12 Jul 2007 10:57:02 -0000	1.87
+++ .cvsignore	6 Sep 2007 20:26:06 -0000	1.88
@@ -1 +1 @@
-hwdata-0.206.tar.gz
+hwdata-0.207.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- hwdata.spec	12 Jul 2007 10:57:02 -0000	1.92
+++ hwdata.spec	6 Sep 2007 20:26:06 -0000	1.93
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.206
+Version: 0.207
 Release: 1%{?dist}
 License: GPL/MIT
 Group: System Environment/Base
@@ -35,6 +35,11 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.207-1
+- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite
+  so dumb.  90kHz hsync is way out of range for any common single-link DVI
+  panel, for example. (#247271)
+
 * Thu Jul 12 2007 Karsten Hopp <karsten at redhat.com> 0.206-1
 - build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	12 Jul 2007 10:57:02 -0000	1.90
+++ sources	6 Sep 2007 20:26:06 -0000	1.91
@@ -1 +1 @@
-bbf951781b3ef98ea0bd594fcc95ee89  hwdata-0.206.tar.gz
+0dee4e77c08ce7f14b53fe3732418c9e  hwdata-0.207.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:27:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:27:29 -0400
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.1,1.2
Message-ID: <200709062027.l86KRTjo017094@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17068

Modified Files:
	tomcat-native.spec 
Log Message:
* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
- First Fedora build.



Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-native.spec	6 Sep 2007 20:24:32 -0000	1.1
+++ tomcat-native.spec	6 Sep 2007 20:26:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.10
-Release:        0.2%{?dist}
+Release:        1%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -61,11 +61,14 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE.txt
-# Note: unversioned *.so needed here :(
+# Note: unversioned *.so needed here due to how Tomcat loads the lib :(
 %{_libdir}/libtcnative*.so*
 
 
 %changelog
+* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
+- First Fedora build.
+
 * Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
 - License: ASL 2.0.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:08 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:29:08 -0400
Subject: rpms/varnish/devel varnish.spec,1.2,1.3
Message-ID: <200709062029.l86KT8Yl017271@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17206

Modified Files:
	varnish.spec 
Log Message:
1.1.1-2: Removed autogen call (only diff from relase tarball)


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- varnish.spec	6 Sep 2007 20:10:56 -0000	1.2
+++ varnish.spec	6 Sep 2007 20:28:35 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -165,8 +165,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
+- Removed autogen call (only diff from relase tarball)
+
 * Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
 - Bumped the version number to 1.1.1.
+
 * Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
 - Update for 1.1 branch
 - Added the devel package for the header files and static library files



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:08 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:08 -0700
Subject: [pkgdb] libassuan: nalin has requested watchcommits
Message-ID: <200709062029.l86KT8AX001738@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchcommits acl on libassuan (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:16 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:16 -0700
Subject: [pkgdb] gpa: nalin has requested watchbugzilla
Message-ID: <200709062029.l86KTHlw001748@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchbugzilla acl on gpa (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:27 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:27 -0700
Subject: [pkgdb] gnupg2: nalin has requested watchbugzilla
Message-ID: <200709062029.l86KTRBX001757@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchbugzilla acl on gnupg2 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:28 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:28 -0700
Subject: [pkgdb] gnupg2: nalin has requested watchcommits
Message-ID: <200709062029.l86KTTmb001767@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchcommits acl on gnupg2 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:34:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:34:19 -0400
Subject: rpms/tomcat-native/EL-5 tomcat-native.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062034.l86KYJMC017382@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359

Modified Files:
	.cvsignore sources 
Added Files:
	tomcat-native.spec 
Log Message:
First EPEL import (#273761)


--- NEW FILE tomcat-native.spec ---
Name:           tomcat-native
Version:        1.1.10
Release:        1%{?dist}
Summary:        Tomcat native library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://tomcat.apache.org/tomcat-6.0-doc/apr.html
Source0:        http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel
BuildRequires:  jpackage-utils
BuildRequires:  apr-devel >= 1.2.1
BuildRequires:  openssl-devel
# Upstream compatibility:
Provides:       tcnative = %{version}-%{release}

%description
Tomcat can use the Apache Portable Runtime to provide superior
scalability, performance, and better integration with native server
technologies.  The Apache Portable Runtime is a highly portable library
that is at the heart of Apache HTTP Server 2.x.  APR has many uses,
including access to advanced IO functionality (such as sendfile, epoll
and OpenSSL), OS level functionality (random number generation, system
status, etc), and native process handling (shared memory, NT pipes and
Unix sockets).  This package contains the Tomcat native library which
provides support for using APR in Tomcat.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd jni/native
%configure \
    --with-apr=%{_bindir}/apr-1-config \
    --with-java-home=%{java_home} \
    --with-java-platform=2
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make -C jni/native install DESTDIR=$RPM_BUILD_ROOT
# Perhaps a devel package sometime?  Not for now; no headers are installed.
rm -f $RPM_BUILD_ROOT%{_libdir}/libtcnative*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE.txt
# Note: unversioned *.so needed here due to how Tomcat loads the lib :(
%{_libdir}/libtcnative*.so*


%changelog
* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
- First Fedora build.

* Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
- License: ASL 2.0.

* Mon Apr 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.1
- 1.1.10.

* Tue Apr  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9-0.1
- 1.1.9.

* Sat Jan  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-0.1
- 1.1.8.

* Tue Dec 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-0.1
- 1.1.7.

* Mon Nov 13 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-0.1
- 1.1.6.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.4-0.1
- 1.1.4, specfile cleanup.

* Wed Jun 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.3-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:40:40 -0000	1.1
+++ .cvsignore	6 Sep 2007 20:33:46 -0000	1.2
@@ -0,0 +1 @@
+tomcat-native-1.1.10-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:40:40 -0000	1.1
+++ sources	6 Sep 2007 20:33:46 -0000	1.2
@@ -0,0 +1 @@
+8d2eaef338a1a02f3d929a575d5e1453  tomcat-native-1.1.10-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:36:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:36:59 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.14,1.15
Message-ID: <200709062036.l86Kaxt9017542@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-cyrix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17509

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.0-5
- Fix license.  Disown the module and driver directories. (#226585)



Index: xorg-x11-drv-cyrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cyrix/devel/xorg-x11-drv-cyrix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-cyrix.spec	21 Aug 2007 19:11:28 -0000	1.14
+++ xorg-x11-drv-cyrix.spec	6 Sep 2007 20:36:26 -0000	1.15
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,14 +50,15 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/cyrix_drv.so
 %{_datadir}/hwdata/videoaliases/cyrix.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/cyrix.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.0-5
+- Fix license.  Disown the module and driver directories. (#226585)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-4
 - Rebuild for build id
 
@@ -90,7 +91,7 @@
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
-- Set "ExclusiveArch: %{ix86}"
+- Set "ExclusiveArch: %%{ix86}"
 
 * Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
 - Initial spec file for cyrix video driver generated automatically



From fedora-extras-commits at redhat.com  Thu Sep  6 20:40:02 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:40:02 -0400
Subject: rpms/xorg-x11-drv-neomagic/devel xorg-x11-drv-neomagic.spec, 1.12, 
	1.13
Message-ID: <200709062040.l86Ke29V017676@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655

Modified Files:
	xorg-x11-drv-neomagic.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.1-4
- Fix license.  Disown the module and driver dirs. (#226610)



Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-neomagic.spec	21 Aug 2007 19:21:34 -0000	1.12
+++ xorg-x11-drv-neomagic.spec	6 Sep 2007 20:39:29 -0000	1.13
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.1.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,18 +50,18 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/neomagic_drv.so
 %{_datadir}/hwdata/videoaliases/neomagic.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.1-4
+- Fix license.  Disown the module and driver dirs. (#226610)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.1-3
 - Rebuild for build id
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.1.1-2.1
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2



From fedora-extras-commits at redhat.com  Thu Sep  6 20:41:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 06 Sep 2007 13:41:27 -0700
Subject: [pkgdb] gpa had acl change status
Message-ID: <200709062041.l86KfRHf001853@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on gpa (Fedora devel) to Approved for Nalin Somabhai Dahyabhai (nalin)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:41:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:41:43 -0400
Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.16,1.17
Message-ID: <200709062041.l86Kfhig017779@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17760

Modified Files:
	xorg-x11-drv-nsc.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 2.8.1-4
- Fix license.  Disown the module and driver dirs. (#226611)



Index: xorg-x11-drv-nsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nsc.spec	24 Jan 2007 21:13:38 -0000	1.16
+++ xorg-x11-drv-nsc.spec	6 Sep 2007 20:41:10 -0000	1.17
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
 Version:   2.8.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,14 +58,14 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/nsc_drv.so
 %{_datadir}/hwdata/videoaliases/nsc.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 2.8.1-4
+- Fix license.  Disown the module and driver dirs. (#226611)
+
 * Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 2.8.1-2
 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for
   selinux conformance.  (#220749)



From fedora-extras-commits at redhat.com  Thu Sep  6 20:42:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 06 Sep 2007 13:42:56 -0700
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <200709062042.l86KgvaY001888@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on gnupg2 (Fedora devel) to Approved for Nalin Somabhai Dahyabhai (nalin)

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



From fedora-extras-commits at redhat.com  Thu Sep  6 20:44:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:44:08 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.19,1.20
Message-ID: <200709062044.l86Ki8lj017853@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.8.1-9
- Disown the manual directory. (#226622)



Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-sisusb.spec	23 Aug 2007 20:31:16 -0000	1.19
+++ xorg-x11-drv-sisusb.spec	6 Sep 2007 20:43:35 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version:   0.8.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -49,10 +49,12 @@
 %files
 %defattr(-,root,root,-)
 %{driverdir}/sisusb_drv.so
-%dir %{_mandir}
 %{_mandir}/man4/*.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.8.1-9
+- Disown the manual directory. (#226622)
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.8.1-8
 - sisusb-0.8.1-open-is-not-fopen.patch: Despite the similarity, you can not
   pass character literals to open that match the string literals you'd pass



From fedora-extras-commits at redhat.com  Thu Sep  6 20:48:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:48:00 -0400
Subject: rpms/xorg-x11-drv-vga/devel xorg-x11-drv-vga.spec,1.15,1.16
Message-ID: <200709062048.l86Km0LO017951@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17933

Modified Files:
	xorg-x11-drv-vga.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 4.1.0-5
- Fix license.  Disown the module and driver dirs. (#226632)



Index: xorg-x11-drv-vga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vga/devel/xorg-x11-drv-vga.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-vga.spec	21 Aug 2007 19:23:21 -0000	1.15
+++ xorg-x11-drv-vga.spec	6 Sep 2007 20:47:28 -0000	1.16
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,8 +41,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-# FIXME: Remove all libtool archives (*.la) from modules directory.  This
-# should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
@@ -50,14 +48,14 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/vga_drv.so
 %{_datadir}/hwdata/videoaliases/vga.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 4.1.0-5
+- Fix license.  Disown the module and driver dirs. (#226632)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 4.1.0-4
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:56:50 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:56:50 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.155, 1.156 kudzu.spec, 1.176,
	1.177 sources, 1.174, 1.175
Message-ID: <200709062056.l86Kuo4a018138@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18112/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
- Add pcidom to the exported slot list of pciDevice.
- Add clog target to Makefile.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	23 Aug 2007 15:09:29 -0000	1.155
+++ .cvsignore	6 Sep 2007 20:56:17 -0000	1.156
@@ -1 +1 @@
-kudzu-1.2.74.tar.gz
+kudzu-1.2.75.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kudzu.spec	23 Aug 2007 15:09:29 -0000	1.176
+++ kudzu.spec	6 Sep 2007 20:56:17 -0000	1.177
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.74
+Version: 1.2.75
 Release: 1
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
@@ -72,6 +72,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
+- Add pcidom to the exported slot list of pciDevice.
+- Add clog target to Makefile.
+
 * Thu Aug 23 2007 Jeremy Katz <katzj at redhat.com> - 1.2.74-1
 - fix module names for new firewire stack changing (#231708)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- sources	23 Aug 2007 15:09:29 -0000	1.174
+++ sources	6 Sep 2007 20:56:17 -0000	1.175
@@ -1 +1 @@
-07c14196f3ffd5f1484e0c464dd77cbd  kudzu-1.2.74.tar.gz
+1ca8fbb5ac6c829978501cd8a7aa3ad0  kudzu-1.2.75.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:00:40 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:00:40 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.49, 1.50 rhpxl.spec, 1.60,
	1.61 sources, 1.56, 1.57
Message-ID: <200709062100.l86L0ePI018212@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18190

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.49-1
- rhpxl 0.49.  Fixes domainful PPC machines, and avoids probing for serial
  mice since they make USB devices go boom.
- Fix License.
- Update URL to point to the new home.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	4 May 2007 14:25:22 -0000	1.49
+++ .cvsignore	6 Sep 2007 21:00:08 -0000	1.50
@@ -1 +1 @@
-rhpxl-0.47.tar.gz
+rhpxl-0.49.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- rhpxl.spec	24 Aug 2007 12:14:13 -0000	1.60
+++ rhpxl.spec	6 Sep 2007 21:00:08 -0000	1.61
@@ -3,20 +3,16 @@
 Summary: Python library for configuring and running X
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
-Version: 0.47
-Release: 3%{?dist}
-# This is a Red Hat maintained package which is specific to
-# our distribution.  Thus the source is only available from
-# within this srpm.
-Source0: %{name}-%{version}.tar.gz
-License: GPL
+Version: 0.49
+Release: 1%{?dist}
+Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
+License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, gettext, libXrandr-devel, libX11-devel
 ExcludeArch: s390 s390x
-Requires: python, rhpl, kudzu >= 1.2.0, newt, hwdata >= 0.169
+Requires: python, rhpl, kudzu >= 1.2.75, newt, hwdata >= 0.169
 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.0.1-6
-Conflicts: libXfont < 0.99.2-2
 
 %description
 The rhpxl (pronounced 'rapunzel') package contains a Python library for
@@ -45,6 +41,12 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.49-1
+- rhpxl 0.49.  Fixes domainful PPC machines, and avoids probing for serial
+  mice since they make USB devices go boom.
+- Fix License.
+- Update URL to point to the new home.
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.47-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	13 Jun 2007 14:33:15 -0000	1.56
+++ sources	6 Sep 2007 21:00:08 -0000	1.57
@@ -1 +1 @@
-d77d07a38b72db1df9dd909f3bc5faff  rhpxl-0.47.tar.gz
+ad8a3151b455d435c4928611f421fc0a  rhpxl-0.49.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:02:12 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 17:02:12 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999.patch,1.1,NONE
Message-ID: <200709062102.l86L2CGw024179@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24170

Removed Files:
	CVE-2007-3999.patch 
Log Message:
- bye-bye obsolete patch



--- CVE-2007-3999.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 21:03:04 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 17:03:04 -0400
Subject: rpms/krb5/devel CVE-2007-3999.patch,1.1,NONE
Message-ID: <200709062103.l86L34mf024265@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24258

Removed Files:
	CVE-2007-3999.patch 
Log Message:
bye-bye obsolete patch


--- CVE-2007-3999.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 21:07:53 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:07:53 -0400
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.24,1.25
Message-ID: <200709062107.l86L7rhU024387@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-via/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24369

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
- Explain why there's no ldconfig for the xvmc drivers. (#226633)



Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-via.spec	24 Aug 2007 12:06:50 -0000	1.24
+++ xorg-x11-drv-via.spec	6 Sep 2007 21:07:20 -0000	1.25
@@ -4,16 +4,10 @@
 
 %define with_xvmc 1
 
-%ifarch %{ix86} x86_64
-%define with_dri 1
-%else
-%define with_dri 0
-%endif
-
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -28,9 +22,7 @@
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
-%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
-%endif
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
@@ -51,12 +43,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static \
-%if %{with_dri}
-           --enable-dri
-%else
-           --disable-dri
-%endif
+%configure --disable-static --enable-dri
 
 make
 
@@ -68,13 +55,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-# FIXME: Remove all libtool archives (*.la) from modules directory.  This
-# should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# There's no %post ldconfig for these, because even though they're DSOs,
+# they're not meant to ever be linked against.  They're dlopen'd by
+# libXvMC.so itself.
+
 %files
 %defattr(-,root,root,-)
 %{driverdir}/via_drv.so
@@ -95,6 +84,9 @@
 %endif
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
+- Explain why there's no ldconfig for the xvmc drivers. (#226633)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.2.2-3
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:14:20 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Thu, 6 Sep 2007 17:14:20 -0400
Subject: rpms/gq/F-7 gq.spec,1.4,1.5
Message-ID: <200709062114.l86LEKaU024554@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24530

Modified Files:
	gq.spec 
Log Message:
- Add default-codeset to configure




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/F-7/gq.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gq.spec	21 Aug 2007 16:58:44 -0000	1.4
+++ gq.spec	6 Sep 2007 21:13:48 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:21:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:21:33 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.5,1.6
Message-ID: <200709062121.l86LLXLd024722@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683

Modified Files:
	online-desktop.spec 
Log Message:
* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
- new upstream



Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- online-desktop.spec	27 Aug 2007 18:48:12 -0000	1.5
+++ online-desktop.spec	6 Sep 2007 21:21:01 -0000	1.6
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://developer.mugshot.org/
-#X-SCM:         scm:svn:http://svn.mugshot.org/svn/online-desktop/trunk
+#X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -91,10 +91,13 @@
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
+%{_datadir}/gnome/*.session
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
+%dir %{python_sitelib}/ddm
+%{python_sitelib}/ddm/*
 %doc COPYING README
 
 %files flickr
@@ -176,6 +179,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.2.9-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:22:33 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Thu, 6 Sep 2007 17:22:33 -0400
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.2,
	1.3 setroubleshoot-plugins.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709062122.l86LMXmR024768@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24734/devel

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
update to upstream 1.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2007 17:26:59 -0000	1.2
+++ .cvsignore	6 Sep 2007 21:21:59 -0000	1.3
@@ -1 +1 @@
-setroubleshoot-plugins-1.10.0.tar.gz
+setroubleshoot-plugins-1.10.2.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setroubleshoot-plugins.spec	23 Aug 2007 17:26:59 -0000	1.1
+++ setroubleshoot-plugins.spec	6 Sep 2007 21:21:59 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 1.10.0
+Version: 1.10.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -9,7 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: python
+BuildRequires: perl-XML-Parser
+BuildRequires: intltool gettext python
 Requires: dbus
 
 %define pkgdocdir %{_datadir}/doc/%{name}-%{version}
@@ -49,6 +50,12 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Sep  6 2007 Dan Walsh <dwalsh at redhat.com> - 1.10.2-1
+	- Change priority on use_nfs_home_dir to 55
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
+	- add BuildRequires perl-XML-Parser
+
 * Fri Jul 20 2007 John Dennis <jdennis at redhat.com> - 1.10.0-1
         - move all plugins and their translations from setroubleshoot-server
           package to this new independent package to allow easier updating


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2007 17:26:59 -0000	1.2
+++ sources	6 Sep 2007 21:21:59 -0000	1.3
@@ -1 +1 @@
-811a719a5207830a47f0a87439fbccd5  setroubleshoot-plugins-1.10.0.tar.gz
+acb5d5e49bbf237916ade9e2f9c91373  setroubleshoot-plugins-1.10.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:26:06 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:26:06 -0400
Subject: rpms/xorg-x11-server/devel
	xserver-1.3.0-xrandr-timestamp-buglet.patch, NONE,
	1.1 xorg-x11-server.spec, 1.248, 1.249
Message-ID: <200709062126.l86LQ6rW024933@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24877

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-xrandr-timestamp-buglet.patch 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
- xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
  stop working after several hours. (Marius Gedminas, #273801)


xserver-1.3.0-xrandr-timestamp-buglet.patch:

--- NEW FILE xserver-1.3.0-xrandr-timestamp-buglet.patch ---
--- a/randr/rrscreen.c.orig	2006-07-05 21:31:44.000000000 +0300
+++ b/randr/rrscreen.c	2007-02-03 00:00:10.000000000 +0200
@@ -723,7 +723,6 @@
     pScrPriv = rrGetScrPriv(pScreen);
     
     time = ClientTimeToServerTime(stuff->timestamp);
-    configTime = ClientTimeToServerTime(stuff->configTimestamp);
     
     oldWidth = pScreen->width;
     oldHeight = pScreen->height;
@@ -738,11 +737,15 @@
 	return BadAlloc;
     
     /*
-     * if the client's config timestamp is not the same as the last config
+     * If the client's config timestamp is not the same as the last config
      * timestamp, then the config information isn't up-to-date and
-     * can't even be validated
+     * can't even be validated.
+     *
+     * Note that the client only knows about the milliseconds part of the
+     * timestamp, so using CompareTimeStamps here would cause randr to suddenly
+     * stop working after several hours have passed (freedesktop bug #6502).
      */
-    if (CompareTimeStamps (configTime, pScrPriv->lastConfigTime) != 0)
+    if (stuff->configTimestamp != pScrPriv->lastConfigTime.milliseconds)
     {
 	rep.status = RRSetConfigInvalidConfigTime;
 	goto sendReply;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- xorg-x11-server.spec	24 Aug 2007 21:52:40 -0000	1.248
+++ xorg-x11-server.spec	6 Sep 2007 21:25:33 -0000	1.249
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   22%{?dist}
+Release:   23%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 Patch22:   xserver-1.3.0-fbdevhw-magic-numbers.patch
 Patch23:   xserver-1.3.0-ramdac-export.patch
 Patch24:   xserver-1.3.0-reput-video.patch
+Patch25:   xserver-1.3.0-xrandr-timestamp-buglet.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -296,6 +297,7 @@
 %patch22 -p1 -b .magic-numbers
 %patch23 -p1 -b .ramdac
 %patch24 -p1 -b .reput
+%patch25 -p1 -b .xrandr-timestamp
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -606,6 +608,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
+- xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
+  stop working after several hours. (Marius Gedminas, #273801)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-22
 - Bump BuildRequires: xorg-x11-xtrans-devel to pull in abstract socket
   support.



From fedora-extras-commits at redhat.com  Thu Sep  6 21:28:18 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 17:28:18 -0400
Subject: upgradecheck upgradecheck.py,1.36,1.37
Message-ID: <200709062128.l86LSIS6025019@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24999

Modified Files:
	upgradecheck.py 
Log Message:
good bye, fedora-maintainers


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- upgradecheck.py	3 Sep 2007 17:56:43 -0000	1.36
+++ upgradecheck.py	6 Sep 2007 21:28:15 -0000	1.37
@@ -33,7 +33,7 @@
     sys.exit(1)
 
 mail_from = "buildsys at fedoraproject.org"
-mail_to = "fedora-maintainers at redhat.com"
+mail_to = "fedora-devel-list at redhat.com"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
 smtp_server = None
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:39:09 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:39:09 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.17,1.18
Message-ID: <200709062139.l86Ld9xm025442@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25424

Modified Files:
	mugshot.spec 
Log Message:
new upstream


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mugshot.spec	4 Sep 2007 15:46:40 -0000	1.17
+++ mugshot.spec	6 Sep 2007 21:38:36 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.50
-Release:        2%{?dist}
+Version:        1.1.51
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -204,12 +204,17 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
+- 1.1.51
+
 * Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
 - Don't put two autostart files in the autostart directory
   (https://bugzilla.redhat.com/show_bug.cgi?id=274921)



From fedora-extras-commits at redhat.com  Thu Sep  6 21:41:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:41:35 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.30,1.31
Message-ID: <200709062141.l86LfZgD025530@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25507

Modified Files:
	bigboard.spec 
Log Message:
new upstream


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bigboard.spec	27 Aug 2007 18:49:55 -0000	1.30
+++ bigboard.spec	6 Sep 2007 21:41:03 -0000	1.31
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.11
+Version:        0.5.12
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -53,10 +53,6 @@
 %doc COPYING
 %dir %{_libexecdir}/bigboard
 %attr(0755,root,root) %{_libexecdir}/bigboard/*
-%dir %{python_sitearch}/mugshot
-%{python_sitearch}/mugshot/*.py
-%{python_sitearch}/mugshot/*.pyc
-%{python_sitearch}/mugshot/*.pyo
 %dir %{python_sitearch}/bigboard
 %{python_sitearch}/bigboard/*.so
 %{python_sitearch}/bigboard/*.py
@@ -79,12 +75,11 @@
 %{python_sitearch}/bigboard_externals/*
 %dir %{_datadir}/bigboard
 %{_datadir}/bigboard/*
-%{_datadir}/bigboard/*.png
-%{_datadir}/gnome/autostart/*.desktop
-%{_bindir}/bigboard
-%{_bindir}/gconf-online-sync
-%{_libdir}/bonobo/servers/BigBoard_Applet.server
-%{_libexecdir}/bigboard-applet
+%{_datadir}/gnome/*
+%{_datadir}/gnome-2.0/*
+%{_bindir}/*
+%{_libdir}/bonobo/servers/*
+%{_libexecdir}/bigboard-applets
 # no desktop file included because the bigboard is launched as part of online
 # desktop mode
 
@@ -95,6 +90,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.5.11-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:43:11 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 6 Sep 2007 17:43:11 -0400
Subject: rpms/nss/devel nss.spec,1.28,1.29 sources,1.11,1.12
Message-ID: <200709062143.l86LhBfa025643@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25595

Modified Files:
	nss.spec sources 
Log Message:
* Thu Sep 06 2007 Rob Crittenden <rcritten at redhat.com> - 3.11.7-9
- Fix off-by-one error in the PEM module



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nss.spec	6 Sep 2007 16:06:32 -0000	1.28
+++ nss.spec	6 Sep 2007 21:42:39 -0000	1.29
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -453,6 +453,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Rob Crittenden <rcritten at redhat.com> - 3.11.7-9
+- Fix off-by-one error in the PEM module
+
 * Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
 - fix a C++ mode compilation error
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Sep 2007 20:00:42 -0000	1.11
+++ sources	6 Sep 2007 21:42:39 -0000	1.12
@@ -1,4 +1,4 @@
 68c5e1bd8ba091e5a50babcd9e552bc5  nss-3.11.5-fbst-stripped.tar.gz
 c1053d1e001a5b1eb4b7c296a968ca5c  nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
 baa96599af6f0a2b656479d8e4efd58f  nss-3.12-alpha-ckfw.tar.gz
-84bad7e42304a6d4fdf2b83f5295b938  nss-3.12-alpha-pem.tar.gz
+cb4e4fc7c06ad3b02178ed453273abec  nss-3.12-alpha-pem.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:50:26 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:50:26 -0400
Subject: rpms/online-desktop/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200709062150.l86LoQmU025803@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25743

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 18:48:12 -0000	1.5
+++ .cvsignore	6 Sep 2007 21:49:53 -0000	1.6
@@ -1 +1 @@
-online-desktop-0.2.9.tar.gz
+online-desktop-0.2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 18:48:12 -0000	1.5
+++ sources	6 Sep 2007 21:49:53 -0000	1.6
@@ -1 +1 @@
-b75bd28551b0ec5282d67b450124ea1c  online-desktop-0.2.9.tar.gz
+67e6eadf468433ab122d2b5acaac5ade  online-desktop-0.2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:50:52 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:50:52 -0400
Subject: rpms/bigboard/devel .cvsignore,1.22,1.23 sources,1.23,1.24
Message-ID: <200709062150.l86LoqhB025845@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25778

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Aug 2007 18:49:55 -0000	1.22
+++ .cvsignore	6 Sep 2007 21:50:19 -0000	1.23
@@ -1 +1 @@
-bigboard-0.5.11.tar.gz
+bigboard-0.5.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Aug 2007 18:49:55 -0000	1.23
+++ sources	6 Sep 2007 21:50:19 -0000	1.24
@@ -1 +1 @@
-651d5d896702a1bb8a3ecbcaedd668b3  bigboard-0.5.11.tar.gz
+fe6047806ed00354145f471b2c5baef7  bigboard-0.5.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:51:54 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 6 Sep 2007 17:51:54 -0400
Subject: rpms/cdlabelgen/devel .cvsignore, 1.4, 1.5 cdlabelgen.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709062151.l86LpsIS025950@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/cdlabelgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25897

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
- updated to 4.0.0
- preserve timestamps upon install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2006 18:00:25 -0000	1.4
+++ .cvsignore	6 Sep 2007 21:51:21 -0000	1.5
@@ -1 +1 @@
-cdlabelgen-3.6.0.tgz
+cdlabelgen-4.0.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/cdlabelgen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdlabelgen.spec	17 Aug 2007 11:55:57 -0000	1.4
+++ cdlabelgen.spec	6 Sep 2007 21:51:21 -0000	1.5
@@ -1,7 +1,7 @@
 Name: cdlabelgen
 Summary: Generates frontcards and traycards for inserting in CD jewelcases
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
 Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
 URL: http://www.aczoom.com/tools/cdinsert/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +17,13 @@
 %setup -q
 
 %build
-make
-#pod2man cdlabelgen > cdlabelgen.1
+# nothing to build
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -pm755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -pm644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -pm644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,6 +36,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 06 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 4.0.0-1
+- updated to 4.0.0
+- preserve timestamps upon install
+
 * Fri Aug 17 2007 Harald Hoyer <harald at rawhide.home> - 3.6.0-2
 - changed License tag to BSD with advertising
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2006 18:00:25 -0000	1.4
+++ sources	6 Sep 2007 21:51:21 -0000	1.5
@@ -1 +1 @@
-6867ad98ec198de3fcf24ffd11525f8c  cdlabelgen-3.6.0.tgz
+0b8225fd914b5c7aa1d3e616b1c8accc  cdlabelgen-4.0.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:51:58 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:51:58 -0400
Subject: rpms/mugshot/devel .cvsignore,1.10,1.11 sources,1.11,1.12
Message-ID: <200709062151.l86Lpw6X025954@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25920

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Aug 2007 19:13:26 -0000	1.10
+++ .cvsignore	6 Sep 2007 21:51:26 -0000	1.11
@@ -1 +1 @@
-mugshot-1.1.50.tar.gz
+mugshot-1.1.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Aug 2007 19:13:26 -0000	1.11
+++ sources	6 Sep 2007 21:51:26 -0000	1.12
@@ -1 +1 @@
-d3c656d2d77da635fc73908c46fa960b  mugshot-1.1.50.tar.gz
+dabad9f5dfd3e76e2c4c63722e9f6ebd  mugshot-1.1.51.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:58:03 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 6 Sep 2007 17:58:03 -0400
Subject: rpms/imlib2/devel imlib2.spec,1.27,1.28
Message-ID: <200709062158.l86Lw33w026253@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233

Modified Files:
	imlib2.spec 
Log Message:
* Thu Sep  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
- Update license tag



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- imlib2.spec	9 Aug 2007 06:13:30 -0000	1.27
+++ imlib2.spec	6 Sep 2007 21:57:30 -0000	1.28
@@ -1,8 +1,8 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
 Version:        1.4.0
-Release:        2%{?dist}
-License:        MIT with advertising??
+Release:        3%{?dist}
+License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
 Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -132,6 +132,9 @@
 %{_libdir}/imlib2/loaders/id3.*
 
 %changelog
+* Thu Sep  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
+- Update license tag
+
 * Wed Aug  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-2
 - put the id3tag loader in its own imlib2-id3tag-loader subpackage as it links
   to libid3tag, which is GPLv2+, and we don't want the imlib2 main package to



From fedora-extras-commits at redhat.com  Thu Sep  6 22:11:34 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 6 Sep 2007 18:11:34 -0400
Subject: rpms/zope/EL-5 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 sources, 1.18, 1.19 zope.spec, 1.34,
	1.35 zope-2.7.3-config.patch, 1.2, NONE
Message-ID: <200709062211.l86MBYdl032477@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32439/EL-5

Modified Files:
	.cvsignore sources zope.spec 
Added Files:
	zope-2.10.4-config.patch 
Removed Files:
	zope-2.7.3-config.patch 
Log Message:
Update zope to 2.10.4


zope-2.10.4-config.patch:

--- NEW FILE zope-2.10.4-config.patch ---
--- skel/etc/zope.conf.in.orig	2007-08-14 00:14:05.000000000 -0600
+++ skel/etc/zope.conf.in	2007-08-14 00:14:49.000000000 -0600
@@ -148,6 +148,7 @@
 #
 #    effective-user chrism
 
+effective-user zope
 
 # Directive: enable-product-installation
 #
@@ -288,6 +289,7 @@
 #
 #     mime-types  $INSTANCE/etc/mime.types
 
+mime-types  /etc/mime.types
 
 # Directive: structured-text-header-level
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Aug 2007 16:42:01 -0000	1.18
+++ .cvsignore	6 Sep 2007 22:11:00 -0000	1.19
@@ -1 +1 @@
-Zope-2.9.8-final.tgz
+Zope-2.10.4-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Aug 2007 16:42:01 -0000	1.18
+++ sources	6 Sep 2007 22:11:00 -0000	1.19
@@ -1 +1 @@
-ad7acd2378568264cc301657ee79d361  Zope-2.9.8-final.tgz
+07dde81bdfe42ca00f73912b3d73e0ec  Zope-2.10.4-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/zope.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zope.spec	6 Aug 2007 16:42:01 -0000	1.34
+++ zope.spec	6 Sep 2007 22:11:00 -0000	1.35
@@ -1,4 +1,4 @@
-%define python_minver 2.4.2
+%define python_minver 2.4.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -14,12 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.8
-Release: 1%{?dist}
+Version: 2.10.4
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz
+Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,13 +28,10 @@
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz
-Patch0:  zope-2.7.3-config.patch
-#Patch1:  zope.configure-2.9.5.patch
-
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
-Requires:      python >= %{python_minver}
+Patch0: zope-2.10.4-config.patch
+
+BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} 
+Requires:      python >= %{python_minver}, libxml2-python, python-elementtree
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -50,10 +47,7 @@
 
 %prep
 %setup -q -n Zope-%{version}-final
-%patch0 -p2 -b .config
-#%patch1 -p1
-# remove the backup, or we'll install it too...
-rm -f skel/etc/zope.conf.in.config
+%patch0 -p0
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -107,10 +101,14 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
-#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+chmod 750 $RPM_BUILD_ROOT%{instance_home}
+
+# Set needed permissions
+# We might go as far as to only allow zope r/w to the .pyc files
+for dir in %{instance_home}/{Products,log,lib,var}; do
+    chmod 775 $RPM_BUILD_ROOT$dir
+done
 
-chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # included in %%doc
@@ -156,7 +154,7 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc doc/* README.Fedora
+%doc doc/* README.Fedora ZopePublicLicense.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
@@ -174,187 +172,17 @@
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
-%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
-%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+%attr(-, root, %{zope_group}) %{instance_home}/*
 %{python_sitearch}/zope.pth
 
 
 %changelog
-* Mon Aug 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.8-1
-- Updated to 2.9.8
+* Mon Sep 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-3
+- Updated Requires for libxml2-python and python-elementtree
 
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-2
-- Added zope.pth to fix misc. zope scripts including some zeo stuff
+* Tue Aug 14 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-2
+- Added config patch
 
-* Mon Apr 2 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-1
-- Removed hotfix 20070320
-- Updated to 2.9.7
-- Removed no longer needed patch for acceptable python version
-
-* Wed Mar 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-2
-- Added hotfix 20070320 (#233378)
-
-* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
-- Updated to 2.9.6 added Five back into Zope (#221252)
-
-* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
-- Updated to 2.9.5 and removed not needed patches
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
-- Removed Five from zope package (plone 2.5.1 now provides the needed
-  version.)
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-2
-- fix path on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-1
-- update to 2.9.4
-
-* Wed Aug  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.9.3-4
-- Security: fix world-writable permissions on logrotate config files
-  and README.Fedora (#200794).
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-3
-- try to fix build on x86_64 (take 2)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-2
-- try to fix build on x86_64 (take 1)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-1
-- version 2.9.3
-- add Hotfix_20060705
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
-- version 2.9.2
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
-- version 2.8.5
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
-- rebuild
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
-- add warning about zope 2.8 & python 2.4 (bug 171681)
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
-- version 2.8.3
-
-* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
-- version 2.8.2
-
-* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
-- version 2.8.1
-
-* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
-- rebuild
-
-* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
-- version 2.8.0
-
-* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-2
-- don't remove the zope user un postun (to keep the Data.fs to the
-  correct owner after removal)
-
-* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1%{?dist}
-- version 2.7.6
-- use disttag
-
-* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
-- add hotfix
-
-* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
-- version 2.7.5
-- drop Epoch
-- change release tag for FC4
-- convert some tabs into spaces
-
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
-- version 2.7.4
-- flag the documentation as %%doc
-- make %%zope_home go+rx to allow users to create instances and to allow
-  access to docs
-- add a logrotate cron job
-- flag config files as %%config even in %%zope_home and %%instance_home
-
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
-- activate "security-policy-implementation python" in zope.conf
-
-* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
-- revert to zope's default directory tree to allow multiple instances
-- make the zopectl script multiple-instaces-aware.
-- add README.Fedora
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.4
-- compile scripts in %zope_home/bin too
-- keep skel dir in %zope_home to fix mkzopeinstance
-- BuildRequire python, since python-devel doesn't require it.
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.3
-- compile .pyc instead of just touch-ing them
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
-- deal with leftover .pyc files
-- minor spec cleanups
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.1
-- fix scriptlets requirements
-- use standard buildroot
-- replace %%buildroot by RPM_BUILD_ROOT
-- update to 2.7.3
-- drop Hotfix
-- drop patch 1, fixed upstream
-
-* Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
-  http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
-- add patch to warn the user that the initial user cannot be added while
-  Zope is running (from Chris McDonough)
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.1
-- version 2.7.2
-- remove leftover byte-compilation in %%post
-- Zope 2.7.x really requires python >= 2.3.3
-
-* Wed Jul 14 2004 Rex Dieter <rexdieter at sf.net> 2.7.1-0.fdr.1
-- 2.7.1
-- move files created in %%post back into rpm.  Unowned files are bad.
-- make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
-- don't use Requires(preun,postun)
-- use %%_smp_mflags
-
-* Tue Apr 28 2004 Chris McDonough <chrism at plope.com> 2.7.0-0.fdr.1
-- Prep for submission to Fedora.us by revising work done by Matthias
-- Refer to source files by URL instead of by name
-- Write version.txt into software home in post
-- Don't ship byte-compiled files, instead compile them in post
-- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup)
-- Add patch for objectmanager bug that could effect sites that depend
-  on userid/username separation
-- Improved init script (OK and FAILED now are printed at the appropriate
-  times)
-- Remove runzope workaround by adding a <zoperunner> stanza to the
-  config file.
-- Start in runlevels 345.
-- Known issues:
-  - zopectl is started and runs as the root user at boot time,
-    (although Zope itself runs as the zope user)
-  - no distro-specific docs telling people which port the software
-    runs on or how to add a user via zopectl adduser.
-
-* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6.fr
-- Initial RPM release.
-- The startup/stop needs to be modified further.
-- Currently "zopectl" returns an error although Zope does start...
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-1
+- Initial Package
 


--- zope-2.7.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 22:17:15 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 6 Sep 2007 18:17:15 -0400
Subject: rpms/plone/EL-5 .cvsignore, 1.15, 1.16 plone.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <200709062217.l86MHFsh032653@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32627/EL-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 May 2007 22:07:25 -0000	1.15
+++ .cvsignore	6 Sep 2007 22:16:42 -0000	1.16
@@ -1 +1 @@
-Plone-2.5.3-final.tar.gz
+Plone-3.0.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/plone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plone.spec	23 May 2007 22:29:19 -0000	1.28
+++ plone.spec	6 Sep 2007 22:16:43 -0000	1.29
@@ -1,17 +1,18 @@
-%define python_minver 2.4.2
-%define zope_minver 2.9.4
+%define python_minver 2.4.3
+%define zope_minver 2.10.4
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
+%define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        2.5.3
+Version:        3.0
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://plone.googlecode.com/files/Plone-%{version}-final.tar.gz
+Source0:        http://plone.googlecode.com/files/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,12 +21,12 @@
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
-It is easy to use, translated into over 30 languages and carefully follows
+It is easy to use, translated into over 35 languages and carefully follows
 standards. It's under active development and easily extensible with add-on
 products.
 
 %prep
-%setup -q -n Plone-%{version}-final
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -37,15 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{software_home}/Products
-cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
-
-# Remove Five because Zope provides the correct verison of Five
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
-
-# Avoid conflicts, put those in %%doc
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
-
+install -d $RPM_BUILD_ROOT%{software_home}/lib/python
+cp -pr Products/* $RPM_BUILD_ROOT%{software_home}/Products
+cp -pr lib/python/* $RPM_BUILD_ROOT%{software_home}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,88 +53,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt CONTENTS.txt
-%{software_home}/Products/*
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyc
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyo
-
+%doc README.txt RELEASENOTES.txt INSTALL.txt
+%{software_home}/*
 
 %changelog
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.3-1
-- Fixed CacheFu squid scripts (removed pyc and pyo)
-- Updated to 2.5.3
-
-* Sun Jan 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.2-1
-- Updated to 2.5.2
-- Removed Plone Hotfix 20061031
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-6
-- Retag
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-5
-- Updated so zope now provides Five
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-4
-- Updated so plone now provides the correct version of the Five product
-
-* Sat Nov 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-3
-- add Plone Hotfix 20061031 (bug 213983)
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- rebuild
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- version 2.5.1
-
-* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
-- Update PasswordResetTool to fix CVE-2006-4247
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
-- Zope 2.9.4 went back to zope/lib/python on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-2
-- fix path on x86_64
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-1
-- Version 2.5
-- Drop Hotfix, included
-- condrestart Zope on %%post
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
-- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
-- restart Zope on upgrade (will migrate it to %%postun for the
-  next release, but we need to make sure zope is restarted for
-  this one (security)
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
-- version 2.1.2
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
-- version 2.1.1
-
-* Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
-- version 2.1 final
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr>
-- rebuild
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.3.rc2
-- update to rc2
-- drop buildarch: noarch since _libdir depends on arch (on x86_64)
-- put readmes in %%doc
-
-* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.2.rc1
-- update to rc1
-
-* Wed Jun 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.1.alpha2
-- update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
+- Moved plone install back to software_home
+- Updated to Plone 3.0 final release
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.5-2
-- apply Matthias' suggestions: cleanup %%description, drop Epoch, and
-  use a better Group.
+* Wed Aug 2 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.2rc2
+- Moved plone install from software_home to instance_home (workaround)
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.5-1
-- initial Fedora Extras RPM
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.1rc2
+- Initial Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 May 2007 22:07:25 -0000	1.15
+++ sources	6 Sep 2007 22:16:43 -0000	1.16
@@ -1 +1 @@
-36117b0757982d66d445b6c6b9df0e25  Plone-2.5.3-final.tar.gz
+84a4513fdabd191c85e364e159979590  Plone-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:35:43 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Thu, 6 Sep 2007 18:35:43 -0400
Subject: rpms/nfs4-acl-tools/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709062235.l86MZhNW000853@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs4-acl-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv779

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded nfs4-acl-tests-0.1.tar.bz2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs4-acl-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Mar 2007 16:44:55 -0000	1.2
+++ .cvsignore	6 Sep 2007 22:35:11 -0000	1.3
@@ -1 +1,2 @@
 nfs4-acl-tools-0.3.1.tar.gz
+nfs4-acl-tests-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs4-acl-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Mar 2007 16:44:55 -0000	1.2
+++ sources	6 Sep 2007 22:35:11 -0000	1.3
@@ -1 +1,2 @@
 1869c246a3418df6a568ea40def12e88  nfs4-acl-tools-0.3.1.tar.gz
+78ce03a2605c623bf1612c810b278ec2  nfs4-acl-tests-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 22:39:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:39:53 -0400
Subject: rpms/perl-IPC-Run3/devel perl-IPC-Run3.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062239.l86MdrBA001040@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1012

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:39:21 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:39:21 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:39:21 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:40:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:40:59 -0400
Subject: rpms/perl-IPC-Run3/F-7 perl-IPC-Run3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062240.l86Mex8o001179@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137/F-7

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:40:27 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:40:27 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:40:27 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:41:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:41:02 -0400
Subject: rpms/perl-IPC-Run3/FC-6 perl-IPC-Run3.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062241.l86Mf294001186@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137/FC-6

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:40:30 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:40:30 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:40:30 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:00:08 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu,  6 Sep 2007 19:00:08 -0400
Subject: fedora-accounts website.py,1.12,1.13
Message-ID: <200709062300.l86N08hQ001578@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1551

Modified Files:
	website.py 
Log Message:
Make cookie handling more secure.



Index: website.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/website.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- website.py	9 Aug 2007 03:31:11 -0000	1.12
+++ website.py	6 Sep 2007 23:00:06 -0000	1.13
@@ -243,13 +243,19 @@
         return
     return arow
 
-def set_auth(username='', password=''):
-    c = Cookie.SmartCookie()
+def set_auth(username=None, password=None):
+    if not username:
+        username = ''
+    if not password:
+        password = ''
+    c = Cookie.SimpleCookie()
     c.load(os.environ.get('HTTP_COOKIE', ''))
     if c.has_key('auth_username'):
         c['auth_username'] = username
+        c['auth_username']['secure'] = True
     if c.has_key('auth_password'):
         c['auth_password'] = password
+        c['auth_password']['secure'] = True
     if c:
         print c
     return c
@@ -286,7 +292,9 @@
             del c['auth_password']
     else:
         c['auth_username'] = auth_username
+        c['auth_username']['secure'] = True
         c['auth_password'] = auth_password
+        c['auth_password']['secure'] = True
     print c
     return auth_username, auth_password
 



From fedora-extras-commits at redhat.com  Thu Sep  6 23:34:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 19:34:35 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.65,
	1.66 policy-20070703.patch, 1.48, 1.49 selinux-policy.spec,
	1.515, 1.516
Message-ID: <200709062334.l86NYZnK008367@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8340

Modified Files:
	modules-targeted.conf policy-20070703.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
- Fix java labeling 



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- modules-targeted.conf	27 Aug 2007 21:43:05 -0000	1.65
+++ modules-targeted.conf	6 Sep 2007 23:34:02 -0000	1.66
@@ -928,7 +928,7 @@
 #
 # Policy for sendmail.
 # 
-qmail = module
+qmail = off
 
 # Layer: admin
 # Module: quota

policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.48 -r 1.49 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- policy-20070703.patch	6 Sep 2007 15:00:00 -0000	1.48
+++ policy-20070703.patch	6 Sep 2007 23:34:02 -0000	1.49
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -28,7 +28,7 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
@@ -37,13 +37,13 @@
  user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-09-06 15:43:06.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
@@ -51,7 +51,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -73,7 +73,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-09-06 15:43:06.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
@@ -81,7 +81,7 @@
 +__default__:system_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -94,13 +94,13 @@
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -111,7 +111,7 @@
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -120,7 +120,7 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -150,7 +150,7 @@
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,6 +1,5 @@
 -auditadm_r:auditadm_t
 -secadm_r:secadm_t
@@ -162,7 +162,7 @@
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mls/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-09-06 15:43:06.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
@@ -170,7 +170,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -191,7 +191,7 @@
 +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -204,7 +204,7 @@
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -215,7 +215,7 @@
 +user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -223,7 +223,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t	staff_r:staff_t sysadm_r:sysadm_t
 +system_r:remote_login_t	staff_r:staff_t
@@ -236,7 +236,7 @@
 +sysadm_r:sysadm_sudo_t	sysadm_r:sysadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	system_r:unconfined_t user_r:user_t
 +system_r:remote_login_t	system_r:unconfined_t user_r:user_t
@@ -247,7 +247,7 @@
 +user_r:user_sudo_t	system_r:unconfined_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -256,7 +256,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.7/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -268,7 +268,7 @@
  .TP
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.0.7/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-08-30 11:24:32.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -30,7 +30,7 @@
  .EX
[...1983 lines suppressed...]
@@ -12074,7 +12115,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-04 11:49:28.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -12133,7 +12174,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.7/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-08-31 06:47:15.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-09-06 15:43:06.000000000 -0400
 @@ -68,8 +68,9 @@
  allow udev_t udev_tbl_t:file manage_file_perms;
  dev_filetrans(udev_t,udev_tbl_t,file)
@@ -12235,7 +12276,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.7/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-09-06 15:43:06.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -12422,7 +12463,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-08-29 06:26:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-06 15:43:06.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -12620,7 +12661,7 @@
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.0.7/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,5 @@
  HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
@@ -12629,7 +12670,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 10:57:49.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13719,7 +13760,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-05 13:26:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-06 15:43:06.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -13828,12 +13869,12 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.0.7/policy/modules/system/virt.fc
 --- nsaserefpolicy/policy/modules/system/virt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +/var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.0.7/policy/modules/system/virt.if
 --- nsaserefpolicy/policy/modules/system/virt.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,58 @@
 +## <summary>Virtualization </summary>
 +
@@ -13895,14 +13936,14 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.0.7/policy/modules/system/virt.te
 --- nsaserefpolicy/policy/modules/system/virt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,3 @@
 +# var/lib files
 +type virt_var_lib_t;
 +files_type(virt_var_lib_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.7/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-09-06 15:43:06.000000000 -0400
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -13930,7 +13971,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-06 15:43:06.000000000 -0400
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13990,17 +14031,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -14013,17 +14054,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -14060,22 +14101,22 @@
 +files_dontaudit_getattr_all_files(logadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-05 21:49:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -14121,7 +14162,7 @@
 +allow webadm_t gadmin_t:dir getattr;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-09-06 15:43:06.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -14147,7 +14188,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/users	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/users	2007-09-06 15:43:06.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -14184,7 +14225,7 @@
 +gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/Rules.modular	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/Rules.modular	2007-09-06 15:43:06.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- selinux-policy.spec	6 Sep 2007 15:00:00 -0000	1.515
+++ selinux-policy.spec	6 Sep 2007 23:34:02 -0000	1.516
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
+- Fix java labeling 
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
 - Define user_home_type as home_type
 



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:19 -0400
Subject: rpms/wqy-bitmap-fonts/F-7 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdJAt008684@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/F-7

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/F-7/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:39 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:46 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:21 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:21 -0400
Subject: rpms/wqy-bitmap-fonts/FC-5 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdL0L008687@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/FC-5

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-5/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:42 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:49 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:24 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:24 -0400
Subject: rpms/wqy-bitmap-fonts/FC-6 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdOua008690@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/FC-6

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-6/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:46 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:52 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:27 -0400
Subject: rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.6,1.7
Message-ID: <200709062339.l86NdRS1008719@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/devel

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:49 -0000	1.6
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:55 -0000	1.7
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 8%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:54:48 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 19:54:48 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.9, 1.10 pulseaudio.spec, 1.17, 
	1.18 sources, 1.11, 1.12
Message-ID: <200709062354.l86NsmWl008999@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new svn snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2007 23:43:10 -0000	1.9
+++ .cvsignore	6 Sep 2007 23:54:15 -0000	1.10
@@ -1,2 +1,2 @@
-pulseaudio-0.9.7.svn20070905.tar.gz
+pulseaudio-0.9.7.svn20070907.tar.gz
 libflashsupport-pulse-000.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pulseaudio.spec	4 Sep 2007 23:43:10 -0000	1.17
+++ pulseaudio.spec	6 Sep 2007 23:54:15 -0000	1.18
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.10.svn20070905%{?dist}
+Release:	0.11.svn20070907%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070905.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070907.tar.gz
 Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -197,6 +197,7 @@
 %attr(4755,root,root) %{_bindir}/pulseaudio
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
+%{_libdir}/libpulsecore.so.*
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
 %{_libdir}/pulse-%{drvver}/modules/libauthkey-prop.so
 %{_libdir}/pulse-%{drvver}/modules/libauthkey.so
@@ -314,6 +315,7 @@
 %doc doxygen/html
 %{_includedir}/pulse/
 %{_libdir}/libpulse.so
+%{_libdir}/libpulsecore.so
 %{_libdir}/libpulse-mainloop-glib.so
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
@@ -332,6 +334,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Fri Sep 7 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.11.svn20070907
+- Update SVN snapshot, don't link libpulsecore.so statically anymore
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.10.svn20070905
 - Update SVN snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Sep 2007 23:43:10 -0000	1.11
+++ sources	6 Sep 2007 23:54:15 -0000	1.12
@@ -1,2 +1,2 @@
-44a399ac877526b09a9c0e9ee4a9be93  pulseaudio-0.9.7.svn20070905.tar.gz
+2cf935e7b91fb0cffca558c511df8213  pulseaudio-0.9.7.svn20070907.tar.gz
 07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 01:28:23 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 21:28:23 -0400
Subject: rpms/eclipse/devel .cvsignore,1.37,1.38 sources,1.49,1.50
Message-ID: <200709070128.l871SN1X023801@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774

Modified Files:
	.cvsignore sources 
Log Message:
add update fedora eclipse product plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Sep 2007 17:43:20 -0000	1.37
+++ .cvsignore	7 Sep 2007 01:27:51 -0000	1.38
@@ -1,3 +1,3 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3.zip
-org.fedoraproject.ide.platform-3.3.0.1.zip
+org.fedoraproject.ide.platform-3.3.0.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	5 Sep 2007 17:43:20 -0000	1.49
+++ sources	7 Sep 2007 01:27:51 -0000	1.50
@@ -1,3 +1,3 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
-2a0ca56fa68d685a0f3d23c09000d723  org.fedoraproject.ide.platform-3.3.0.1.zip
+735e884062912dba926e205de8ad8fce  org.fedoraproject.ide.platform-3.3.0.2.zip



From fedora-extras-commits at redhat.com  Fri Sep  7 02:19:57 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 6 Sep 2007 22:19:57 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.4,1.5
Message-ID: <200709070219.l872JvXl031651@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
- New upstream release



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fvwm.spec	22 Aug 2007 03:42:50 -0000	1.4
+++ fvwm.spec	7 Sep 2007 02:19:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		fvwm
-Version:	2.5.21
-Release:	5%{?dist}
+Version:	2.5.23
+Release:	1%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+- New upstream release
+
 * Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5
 - Update license tag
 - Rebuild for buildid



From fedora-extras-commits at redhat.com  Fri Sep  7 02:22:57 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 6 Sep 2007 22:22:57 -0400
Subject: rpms/fvwm/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709070222.l872MvST032088@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31999

Modified Files:
	.cvsignore sources 
Log Message:
files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2007 02:33:14 -0000	1.2
+++ .cvsignore	7 Sep 2007 02:22:25 -0000	1.3
@@ -1 +1 @@
-fvwm-2.5.21.tar.bz2
+fvwm-2.5.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2007 02:33:14 -0000	1.2
+++ sources	7 Sep 2007 02:22:25 -0000	1.3
@@ -1 +1 @@
-c11efef91420e686d54f772e7162e879  fvwm-2.5.21.tar.bz2
+c301f9aad1203c26818a6651e3d1afc8  fvwm-2.5.23.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 04:36:37 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 7 Sep 2007 00:36:37 -0400
Subject: rpms/w3c-libwww/devel w3c-libwww.spec,1.4,1.5
Message-ID: <200709070436.l874abdx022140@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073

Modified Files:
	w3c-libwww.spec 
Log Message:
- enable reentrant



Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- w3c-libwww.spec	23 Aug 2007 05:49:08 -0000	1.4
+++ w3c-libwww.spec	7 Sep 2007 04:36:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.5.20060206cvs%{?dist}
+Release:       0.6.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -74,7 +74,8 @@
 echo timestamp > stamp-h.in
 
 %build
-%configure --enable-shared --disable-static --with-gnu-ld --with-regex --with-zlib --with-ssl
+%configure --enable-shared --disable-static --with-gnu-ld --with-regex \
+--with-zlib --with-ssl --enable-reentrant
 export tagname=CC
 make %{?_smp_mflags}
 
@@ -121,6 +122,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Fri Sep 07 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.6.20060206cvs
+- enable reentrant
+
 * Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.5.20060206cvs
 - rebuild for buildid



From fedora-extras-commits at redhat.com  Fri Sep  7 04:52:21 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Fri, 7 Sep 2007 00:52:21 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.81,1.82
Message-ID: <200709070452.l874qLNV023014@cvs-int.fedora.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22965

Modified Files:
	m17n-db.spec 
Log Message:
Removed incorrect version of hi-typewriter.mim


Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- m17n-db.spec	20 Aug 2007 05:59:38 -0000	1.81
+++ m17n-db.spec	7 Sep 2007 04:51:42 -0000	1.82
@@ -1,12 +1,11 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.4.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
 Source0:    %{name}-%{version}.tar.gz
-Source1:    hi-typewriter.mim
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:     number_pad_itrans-222634.patch
@@ -203,7 +202,8 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
 mv $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/pkgconfig/m17n-db.pc
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
+#Remove hi-typewriter keymap till we get correct version of it
+#install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 # For installing the translation files
 %find_lang %name
@@ -273,6 +273,9 @@
 %{_datadir}/m17n/ug-*.mim
 
 %changelog
+* Fri Sep 07 2007 Parag Nemade <pnemade at redhat.com> - 1.4.0-6.fc8
+- Removed incorrect version of hi-typewriter.mim
+
 * Mon Aug 20 2007 Parag Nemade <pnemade at redhat.com> - 1.4.0-5.fc8
 - Added Obsoletes to m17n-db-gregorian
 - Added Obsoletes to m17n-db-uyghur



From fedora-extras-commits at redhat.com  Fri Sep  7 05:03:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:03:49 -0400
Subject: rpms/aspell-sk/devel aspell-sk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709070503.l8753n1T029527@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aspell-sk.spec 
Log Message:
Initial aspell-sk import.




--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:50:15 -0000	1.1
+++ .cvsignore	7 Sep 2007 05:03:16 -0000	1.2
@@ -0,0 +1 @@
+aspell-sk-0.52-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:03:16 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:47 -0400
Subject: rpms/aspell-sk/EL-4 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875AlaV030102@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/EL-4

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:14 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:51 -0400
Subject: rpms/aspell-sk/EL-5 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875ApNZ030109@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/EL-5

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:18 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:55 -0400
Subject: rpms/aspell-sk/F-7 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875Atau030116@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/F-7

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:21 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:59 -0400
Subject: rpms/aspell-sk/FC-6 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875Axj9030123@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/FC-6

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:25 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:17:55 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Fri, 7 Sep 2007 01:17:55 -0400
Subject: rpms/php-pear-Mail-Mime/devel php-pear-Mail-Mime.spec,1.3,1.4
Message-ID: <200709070517.l875HtpT030733@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-pear-Mail-Mime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30669

Modified Files:
	php-pear-Mail-Mime.spec 
Log Message:
Fix requires and buildrequires (thanks remi)



Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/php-pear-Mail-Mime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Mail-Mime.spec	6 Sep 2007 05:48:24 -0000	1.3
+++ php-pear-Mail-Mime.spec	7 Sep 2007 05:17:22 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		php-pear-Mail-Mime
 Version:	1.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
@@ -13,8 +13,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1.6.0
-Requires:	php-pear(PEAR)
+BuildRequires:	php-pear >= 1:1.4.9-1.2
+Requires:	php-pear(PEAR) >= 1.6.0
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -77,6 +77,9 @@
 %{pear_phpdir}/Mail
 
 %changelog
+* Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-2
+- Add Requirement for pear-1.6.0
+
 * Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-1
 - Upgraded to 1.5.2
 



From fedora-extras-commits at redhat.com  Fri Sep  7 05:24:50 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 7 Sep 2007 01:24:50 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.482,1.483
Message-ID: <200709070524.l875Oopr031085@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31045

Modified Files:
	eclipse.spec 
Log Message:
* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-17
- Update Fedora Eclipse product plugin to fix Welcome page.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- eclipse.spec	6 Sep 2007 17:39:17 -0000	1.482
+++ eclipse.spec	7 Sep 2007 05:24:17 -0000	1.483
@@ -23,14 +23,14 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        16%{?dist} 
+Release:        17%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-Source4:        org.fedoraproject.ide.platform-3.3.0.1.zip
+Source4:        org.fedoraproject.ide.platform-3.3.0.2.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -1564,6 +1564,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 05:41:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:41:54 -0400
Subject: rpms/micq/devel micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709070541.l875fsxf032189@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119/devel

Modified Files:
	.cvsignore sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ initial import.


micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/micq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:37:59 -0000	1.1
+++ .cvsignore	7 Sep 2007 05:41:22 -0000	1.2
@@ -0,0 +1 @@
+micq-0.5.4.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:41:22 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 05:44:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:44:18 -0400
Subject: rpms/micq/F-7 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709070544.l875iIaH032433@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355/F-7

Modified Files:
	sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ spec, patch and source file

micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:43:46 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 05:44:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:44:21 -0400
Subject: rpms/micq/FC-6 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709070544.l875iLVc032438@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355/FC-6

Modified Files:
	sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ spec, patch and source file

micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:43:49 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 06:01:35 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 7 Sep 2007 02:01:35 -0400
Subject: rpms/pcmciautils/devel pcmciautils-014-newrules.patch, 1.4,
	1.5 pcmciautils.spec, 1.27, 1.28
Message-ID: <200709070601.l8761Z7j006735@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/pcmciautils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6706

Modified Files:
	pcmciautils-014-newrules.patch pcmciautils.spec 
Log Message:
* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 014-11
- fixed udev rule


pcmciautils-014-newrules.patch:

Index: pcmciautils-014-newrules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils-014-newrules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pcmciautils-014-newrules.patch	22 Aug 2007 14:12:09 -0000	1.4
+++ pcmciautils-014-newrules.patch	7 Sep 2007 06:01:30 -0000	1.5
@@ -23,7 +23,7 @@
  # returns, so that "strong" matches have a higher priority.
 -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
 -		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}=1
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1"
  
  # PCMCIA sockets:
  #


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pcmciautils.spec	22 Aug 2007 14:12:09 -0000	1.27
+++ pcmciautils.spec	7 Sep 2007 06:01:30 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
 Version: 014
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
@@ -54,6 +54,9 @@
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 014-11
+- fixed udev rule
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 014-10
 - changed license tag
 - added arm architecture



From fedora-extras-commits at redhat.com  Fri Sep  7 06:45:19 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 7 Sep 2007 02:45:19 -0400
Subject: rpms/gnash/devel gnash.spec,1.9,1.10
Message-ID: <200709070645.l876jJEY009494@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9438

Modified Files:
	gnash.spec 
Log Message:
* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
- better documentation generation



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnash.spec	6 Sep 2007 14:46:22 -0000	1.9
+++ gnash.spec	7 Sep 2007 06:44:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -80,6 +80,18 @@
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
+# texinfo and therefore info generation is broken, still we have the
+# code to regenerate them
+pushd doc/C
+rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
+   actionscript.info actionscript.texi
+make man html info
+pushd asspec
+rm asspec.info asspec.html asspec.texi
+make html info
+popd
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +123,8 @@
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
+# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+
 %find_lang %{name}
 
 %clean
@@ -119,14 +133,17 @@
 
 %post 
 /sbin/ldconfig
-# currently help system is broken
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
+# the info is empty, but doesn't hurt
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
 fi
 
 %postun
@@ -136,7 +153,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html 
+%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
 %doc doc/C/images
 %{_bindir}/gtk-gnash
 %{_bindir}/gnash
@@ -167,6 +184,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
+- better documentation generation
+
 * Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
 - agg is now the default renderer



From fedora-extras-commits at redhat.com  Fri Sep  7 07:12:59 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 7 Sep 2007 03:12:59 -0400
Subject: rpms/gcc/devel gcc41-builtin-va-arg-pack.patch, 1.1, 1.2 gcc41.spec,
	1.171, 1.172
Message-ID: <200709070712.l877Cxu5016867@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840

Modified Files:
	gcc41-builtin-va-arg-pack.patch gcc41.spec 
Log Message:
4.1.2-23

gcc41-builtin-va-arg-pack.patch:

Index: gcc41-builtin-va-arg-pack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-builtin-va-arg-pack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-builtin-va-arg-pack.patch	6 Sep 2007 12:26:46 -0000	1.1
+++ gcc41-builtin-va-arg-pack.patch	7 Sep 2007 07:12:55 -0000	1.2
@@ -1,3 +1,11 @@
+2007-09-07  Jakub Jelinek  <jakub at redhat.com>
+
+	* tree.c (cp_cannot_inline_tree_fn): Don't mark varargs_function_p
+	as uninlinable.
+
+	* g++.dg/ext/va-arg-pack-1.C: New test.
+	* g++.dg/ext/va-arg-pack-2.C: New test.
+
 2007-09-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
@@ -291,6 +299,21 @@
        pp_character (buffer, ')');
  
        op1 = TREE_OPERAND (node, 2);
+--- gcc/cp/tree.c.jj	2007-03-12 08:28:01.000000000 +0100
++++ gcc/cp/tree.c	2007-09-07 09:03:07.000000000 +0200
+@@ -2078,12 +2078,6 @@ cp_cannot_inline_tree_fn (tree* fnp)
+       return 1;
+     }
+ 
+-  if (varargs_function_p (fn))
+-    {
+-      DECL_UNINLINABLE (fn) = 1;
+-      return 1;
+-    }
+-
+   if (! function_attribute_inlinable_p (fn))
+     {
+       DECL_UNINLINABLE (fn) = 1;
 --- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
 +++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
 @@ -0,0 +1,143 @@
@@ -500,3 +523,200 @@
 +{
 +  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
 +}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-1.C.jj	2007-09-07 08:52:55.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-1.C	2007-09-07 08:53:45.000000000 +0200
+@@ -0,0 +1,145 @@
++// __builtin_va_arg_pack () builtin tests.
++// { dg-do run }
++// { dg-options "-O2" }
++
++#include <stdarg.h>
++
++extern "C" void abort (void);
++
++int v1 = 8;
++long int v2 = 3;
++void *v3 = (void *) &v2;
++struct A { char c[16]; } v4 = { "foo" };
++long double v5 = 40;
++char seen[20];
++int cnt;
++
++__attribute__ ((noinline)) int
++foo1 (int x, int y, ...)
++{
++  int i;
++  long int l;
++  void *v;
++  struct A a;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt;
++  if (y != 6)
++    abort ();
++  i = va_arg (ap, int);
++  if (i != 5)
++    abort ();
++  switch (x)
++    {
++    case 0:
++      i = va_arg (ap, int);
++      if (i != 9 || v1 != 9)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      v = (void *) va_arg (ap, struct A *);
++      if (v != (void *) &v4)
++	abort ();
++      l = va_arg (ap, long int);
++      if (l != 3 || v2 != 4)
++	abort ();
++      break;
++    case 1:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != ld)
++	abort ();
++      i = va_arg (ap, int);
++      if (i != 8)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x;
++}
++
++__attribute__ ((noinline)) int
++foo2 (int x, int y, ...)
++{
++  long long int ll;
++  void *v;
++  struct A a, b;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt | 64;
++  if (y != 10)
++    abort ();
++  switch (x)
++    {
++    case 11:
++      break;
++    case 12:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != 40)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      b = va_arg (ap, struct A);
++      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      ll = va_arg (ap, long long int);
++      if (ll != 16LL)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x + 8;
++}
++
++__attribute__ ((noinline)) int
++foo3 (void)
++{
++  return 6;
++}
++
++extern inline __attribute__ ((always_inline, gnu_inline)) int
++bar (int x, ...)
++{
++  if (x < 10)
++    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
++  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
++}
++
++int
++main (void)
++{
++  if (bar (0, ++v1, v4, &v4, v2++) != 0)
++    abort ();
++  if (bar (1, ++v5, 8, v3) != 1)
++    abort ();
++  if (bar (2) != 2)
++    abort ();
++  if (bar (v1 + 2) != 19)
++    abort ();
++  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
++    abort ();
++  return 0;
++}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-2.C.jj	2007-09-07 08:53:23.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-2.C	2007-09-07 08:54:25.000000000 +0200
+@@ -0,0 +1,46 @@
++// { dg-do compile }
++// { dg-options "-O2" }
++
++int bar (int, const char *, int, ...);
++int baz (int, const char *, long int);
++
++extern inline __attribute__((always_inline)) int
++f2 (int y, ...)
++{
++  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f3 (int y, ...)
++{
++  return bar (y, "", 5, __builtin_va_arg_pack ());
++}
++
++extern inline __attribute__((always_inline)) int
++f4 (int y, ...)
++{
++  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f5 (int y, ...)
++{
++  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f6 (int y, ...)
++{
++  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
++}
++
++int
++test (void)
++{
++  int a = f2 (5, "a", 6);
++  a += f3 (6, "ab", 17LL);
++  a += f4 (7, 1, 2, 3);
++  a += f5 (8, 7L);
++  a += f6 (9);
++  return a;
++}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gcc41.spec	6 Sep 2007 12:26:46 -0000	1.171
+++ gcc41.spec	7 Sep 2007 07:12:55 -0000	1.172
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 22
+%define gcc_release 23
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1623,6 +1623,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23
+- fix __builtin_va_arg_pack () support for C++
+
 * Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22
 - backport __builtin_va_arg_pack () support
 - make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked



From fedora-extras-commits at redhat.com  Fri Sep  7 07:14:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 7 Sep 2007 03:14:03 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-va-arg-pack.patch, 1.1, 1.2 gcc41.spec, 
	1.163, 1.164
Message-ID: <200709070714.l877E3q5017046@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17019

Modified Files:
	gcc41-builtin-va-arg-pack.patch gcc41.spec 
Log Message:
4.1.2-22.fc7

gcc41-builtin-va-arg-pack.patch:

Index: gcc41-builtin-va-arg-pack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41-builtin-va-arg-pack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-builtin-va-arg-pack.patch	6 Sep 2007 12:30:25 -0000	1.1
+++ gcc41-builtin-va-arg-pack.patch	7 Sep 2007 07:13:59 -0000	1.2
@@ -1,3 +1,11 @@
+2007-09-07  Jakub Jelinek  <jakub at redhat.com>
+
+	* tree.c (cp_cannot_inline_tree_fn): Don't mark varargs_function_p
+	as uninlinable.
+
+	* g++.dg/ext/va-arg-pack-1.C: New test.
+	* g++.dg/ext/va-arg-pack-2.C: New test.
+
 2007-09-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
@@ -291,6 +299,21 @@
        pp_character (buffer, ')');
  
        op1 = TREE_OPERAND (node, 2);
+--- gcc/cp/tree.c.jj	2007-03-12 08:28:01.000000000 +0100
++++ gcc/cp/tree.c	2007-09-07 09:03:07.000000000 +0200
+@@ -2078,12 +2078,6 @@ cp_cannot_inline_tree_fn (tree* fnp)
+       return 1;
+     }
+ 
+-  if (varargs_function_p (fn))
+-    {
+-      DECL_UNINLINABLE (fn) = 1;
+-      return 1;
+-    }
+-
+   if (! function_attribute_inlinable_p (fn))
+     {
+       DECL_UNINLINABLE (fn) = 1;
 --- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
 +++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
 @@ -0,0 +1,143 @@
@@ -500,3 +523,200 @@
 +{
 +  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
 +}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-1.C.jj	2007-09-07 08:52:55.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-1.C	2007-09-07 08:53:45.000000000 +0200
+@@ -0,0 +1,145 @@
++// __builtin_va_arg_pack () builtin tests.
++// { dg-do run }
++// { dg-options "-O2" }
++
++#include <stdarg.h>
++
++extern "C" void abort (void);
++
++int v1 = 8;
++long int v2 = 3;
++void *v3 = (void *) &v2;
++struct A { char c[16]; } v4 = { "foo" };
++long double v5 = 40;
++char seen[20];
++int cnt;
++
++__attribute__ ((noinline)) int
++foo1 (int x, int y, ...)
++{
++  int i;
++  long int l;
++  void *v;
++  struct A a;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt;
++  if (y != 6)
++    abort ();
++  i = va_arg (ap, int);
++  if (i != 5)
++    abort ();
++  switch (x)
++    {
++    case 0:
++      i = va_arg (ap, int);
++      if (i != 9 || v1 != 9)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      v = (void *) va_arg (ap, struct A *);
++      if (v != (void *) &v4)
++	abort ();
++      l = va_arg (ap, long int);
++      if (l != 3 || v2 != 4)
++	abort ();
++      break;
++    case 1:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != ld)
++	abort ();
++      i = va_arg (ap, int);
++      if (i != 8)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x;
++}
++
++__attribute__ ((noinline)) int
++foo2 (int x, int y, ...)
++{
++  long long int ll;
++  void *v;
++  struct A a, b;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt | 64;
++  if (y != 10)
++    abort ();
++  switch (x)
++    {
++    case 11:
++      break;
++    case 12:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != 40)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      b = va_arg (ap, struct A);
++      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      ll = va_arg (ap, long long int);
++      if (ll != 16LL)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x + 8;
++}
++
++__attribute__ ((noinline)) int
++foo3 (void)
++{
++  return 6;
++}
++
++extern inline __attribute__ ((always_inline, gnu_inline)) int
++bar (int x, ...)
++{
++  if (x < 10)
++    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
++  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
++}
++
++int
++main (void)
++{
++  if (bar (0, ++v1, v4, &v4, v2++) != 0)
++    abort ();
++  if (bar (1, ++v5, 8, v3) != 1)
++    abort ();
++  if (bar (2) != 2)
++    abort ();
++  if (bar (v1 + 2) != 19)
++    abort ();
++  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
++    abort ();
++  return 0;
++}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-2.C.jj	2007-09-07 08:53:23.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-2.C	2007-09-07 08:54:25.000000000 +0200
+@@ -0,0 +1,46 @@
++// { dg-do compile }
++// { dg-options "-O2" }
++
++int bar (int, const char *, int, ...);
++int baz (int, const char *, long int);
++
++extern inline __attribute__((always_inline)) int
++f2 (int y, ...)
++{
++  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f3 (int y, ...)
++{
++  return bar (y, "", 5, __builtin_va_arg_pack ());
++}
++
++extern inline __attribute__((always_inline)) int
++f4 (int y, ...)
++{
++  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f5 (int y, ...)
++{
++  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f6 (int y, ...)
++{
++  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
++}
++
++int
++test (void)
++{
++  int a = f2 (5, "a", 6);
++  a += f3 (6, "ab", 17LL);
++  a += f4 (7, 1, 2, 3);
++  a += f5 (8, 7L);
++  a += f6 (9);
++  return a;
++}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gcc41.spec	6 Sep 2007 12:30:25 -0000	1.163
+++ gcc41.spec	7 Sep 2007 07:13:59 -0000	1.164
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 21
+%define gcc_release 22
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1621,6 +1621,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22.fc7
+- fix __builtin_va_arg_pack () support for C++
+
 * Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21.fc7
 - backport __builtin_va_arg_pack () support
 - make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked



From fedora-extras-commits at redhat.com  Fri Sep  7 07:21:01 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 03:21:01 -0400
Subject: rpms/ice/F-7 ice.spec,1.1,1.2
Message-ID: <200709070721.l877L1jw017421@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385/F-7

Modified Files:
	ice.spec 
Log Message:
Added required Obsoletes: for the zeroc names



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ice.spec	31 Aug 2007 05:07:00 -0000	1.1
+++ ice.spec	7 Sep 2007 07:20:28 -0000	1.2
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -92,6 +92,7 @@
 Summary: Tools for developing Ice applications in C++
 Group: Development/Tools
 Provides: ice-c++-devel = %{version}-%{release}
+Obsoletes: ice-c++-devel < %{version}-%{release}
 Requires: ice = %{version}-%{release}
 %description devel
 Tools for developing Ice applications in C++.
@@ -130,6 +131,7 @@
 Summary: The Ice runtime for C#
 Group: System Environment/Libraries
 Provides: ice-dotnet = %{version}-%{release}
+Obsoletes: ice-dotnet < %{version}-%{release}
 Requires: ice = %{version}-%{release}, mono-core >= 1.2.2
 %description csharp
 The Ice runtime for C#
@@ -579,6 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+- Also add Obsoletes: for the old zeroc names
+
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag
 - Minor typo corrections in README.Fedora



From fedora-extras-commits at redhat.com  Fri Sep  7 07:21:03 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 03:21:03 -0400
Subject: rpms/ice/devel ice.spec,1.1,1.2
Message-ID: <200709070721.l877L3uH017443@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385/devel

Modified Files:
	ice.spec 
Log Message:
Added required Obsoletes: for the zeroc names



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ice.spec	31 Aug 2007 05:02:22 -0000	1.1
+++ ice.spec	7 Sep 2007 07:20:31 -0000	1.2
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -92,6 +92,7 @@
 Summary: Tools for developing Ice applications in C++
 Group: Development/Tools
 Provides: ice-c++-devel = %{version}-%{release}
+Obsoletes: ice-c++-devel < %{version}-%{release}
 Requires: ice = %{version}-%{release}
 %description devel
 Tools for developing Ice applications in C++.
@@ -130,6 +131,7 @@
 Summary: The Ice runtime for C#
 Group: System Environment/Libraries
 Provides: ice-dotnet = %{version}-%{release}
+Obsoletes: ice-dotnet < %{version}-%{release}
 Requires: ice = %{version}-%{release}, mono-core >= 1.2.2
 %description csharp
 The Ice runtime for C#
@@ -579,6 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+- Also add Obsoletes: for the old zeroc names
+
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag
 - Minor typo corrections in README.Fedora



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:21 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:21 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878ENPE007907@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchbugzilla acl on lesstif (Fedora devel) to Approved for Hans de Goede (jwrdegoede)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:24 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:24 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EOdJ007916@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the commit acl on lesstif (Fedora devel) to Approved for Hans de Goede (jwrdegoede)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:28 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:28 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878ETxq007926@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchcommits acl on lesstif (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:32 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:32 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EXD6007937@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchcommits acl on lesstif (Fedora 6) to Approved for Hans de Goede (jwrdegoede)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:34 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:34 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EYSr007946@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the commit acl on lesstif (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 08:30:32 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:30:32 -0400
Subject: rpms/ice/F-7 ice.spec,1.2,1.3
Message-ID: <200709070830.l878UWqG027857@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27747/F-7

Modified Files:
	ice.spec 
Log Message:
Fixed bad date in changelog



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ice.spec	7 Sep 2007 07:20:28 -0000	1.2
+++ ice.spec	7 Sep 2007 08:29:59 -0000	1.3
@@ -581,7 +581,7 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
 - Also add Obsoletes: for the old zeroc names
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9



From fedora-extras-commits at redhat.com  Fri Sep  7 08:30:35 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:30:35 -0400
Subject: rpms/ice/devel ice.spec,1.2,1.3
Message-ID: <200709070830.l878UZap027860@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27747/devel

Modified Files:
	ice.spec 
Log Message:
Fixed bad date in changelog



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ice.spec	7 Sep 2007 07:20:31 -0000	1.2
+++ ice.spec	7 Sep 2007 08:30:02 -0000	1.3
@@ -581,7 +581,7 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
 - Also add Obsoletes: for the old zeroc names
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9



From fedora-extras-commits at redhat.com  Fri Sep  7 08:37:50 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:37:50 -0400
Subject: rpms/ice/F-7 ice.spec,1.3,1.4
Message-ID: <200709070837.l878bovi028415@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307/F-7

Modified Files:
	ice.spec 
Log Message:
Bump release so I can rebuild with the correct date (sigh ...)



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ice.spec	7 Sep 2007 08:29:59 -0000	1.3
+++ ice.spec	7 Sep 2007 08:37:18 -0000	1.4
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -581,8 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
+- Fix bad date in changelog
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag



From fedora-extras-commits at redhat.com  Fri Sep  7 08:37:53 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:37:53 -0400
Subject: rpms/ice/devel ice.spec,1.3,1.4
Message-ID: <200709070837.l878brfm028420@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307/devel

Modified Files:
	ice.spec 
Log Message:
Bump release so I can rebuild with the correct date (sigh ...)



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ice.spec	7 Sep 2007 08:30:02 -0000	1.3
+++ ice.spec	7 Sep 2007 08:37:21 -0000	1.4
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -581,8 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
+- Fix bad date in changelog
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag



From fedora-extras-commits at redhat.com  Fri Sep  7 08:42:57 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Fri,  7 Sep 2007 04:42:57 -0400
Subject: fedora-security/audit fc6,1.252,1.253 fc7,1.93,1.94
Message-ID: <200709070842.l878gvaJ028628@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28608/audit

Modified Files:
	fc6 fc7 
Log Message:
PHP wireshark kerberos



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- fc6	5 Sep 2007 08:30:51 -0000	1.252
+++ fc6	7 Sep 2007 08:42:54 -0000	1.253
@@ -4,9 +4,18 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070823
+# Up to date CVE as of CVE email 20070907
 # Up to date FC6 as of 20070905
 
+CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
+CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
+CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
+CVE-2007-4660 VULNERABLE (php, fixed 5.2.4) 
+CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
+CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- fc7	5 Sep 2007 08:30:51 -0000	1.93
+++ fc7	7 Sep 2007 08:42:54 -0000	1.94
@@ -5,9 +5,18 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070829
+# Up to date CVE as of CVE email 20070907
 # Up to date FC7 as of 20070905
 
+CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
+CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
+CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
+CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
+CVE-2007-4660 VULNERABLE (php, fixed 5.2.4)
+CVE-2007-4659 VULNERABLE (php, fixed 5.2.4) #276531 Tracking bug!
+CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 VULNERABLE (qgit) #268381



From fedora-extras-commits at redhat.com  Fri Sep  7 08:47:09 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Fri, 7 Sep 2007 04:47:09 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.42,1.43
Message-ID: <200709070847.l878l9CC028799@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28752

Modified Files:
	gnuplot.spec 
Log Message:
- move emacs files to */site-lisp/gnuplot subdirectory



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnuplot.spec	6 Sep 2007 09:14:15 -0000	1.42
+++ gnuplot.spec	7 Sep 2007 08:46:37 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -62,6 +62,10 @@
 install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
+install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/gnuplot
+mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
+mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
+
 %post 
 /sbin/install-info --quiet %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
 
@@ -94,14 +98,16 @@
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/gnuplot-gui.el
-%{_datadir}/emacs/site-lisp/gnuplot-gui.elc
-%{_datadir}/emacs/site-lisp/gnuplot.el
-%{_datadir}/emacs/site-lisp/gnuplot.elc
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.el
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.elc
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.el
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.elc
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
-
 %changelog
+* Fri Sep  7 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-5
+- move emacs files to */site-lisp/gnuplot subdirectory
+
 * Thu Sep  6 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-4
 - change font paths, change documenatation
 



From fedora-extras-commits at redhat.com  Fri Sep  7 09:09:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 7 Sep 2007 05:09:06 -0400
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.5,1.6
Message-ID: <200709070909.l87996g9003672@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3654

Modified Files:
	ocaml-lablgl.spec 
Log Message:
rebuild


Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-lablgl.spec	4 Sep 2007 17:31:00 -0000	1.5
+++ ocaml-lablgl.spec	7 Sep 2007 09:08:32 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgl
 Version:        1.02
-Release:	14%{?dist}
+Release:	15%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.02-15
+- Rebuild
+
 * Thu Aug 30 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.02-13
 - Rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 10:07:38 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Fri, 7 Sep 2007 06:07:38 -0400
Subject: rpms/revisor/devel revisor.spec,1.22,1.23 sources,1.25,1.26
Message-ID: <200709071007.l87A7cYS012543@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12453/devel

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-7



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- revisor.spec	5 Sep 2007 13:50:17 -0000	1.22
+++ revisor.spec	7 Sep 2007 10:07:05 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -170,7 +170,8 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
+- Bugfixes
 - Removed pungi dependency
 - Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	5 Sep 2007 13:50:17 -0000	1.25
+++ sources	7 Sep 2007 10:07:05 -0000	1.26
@@ -1 +1 @@
-cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz
+eb0bf848e92d6605e36b9146db85de23  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 10:08:55 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Fri, 7 Sep 2007 06:08:55 -0400
Subject: rpms/revisor/F-7 revisor.spec,1.16,1.17 sources,1.17,1.18
Message-ID: <200709071008.l87A8tvn012683@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12647/F-7

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-7



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/revisor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- revisor.spec	5 Sep 2007 13:51:30 -0000	1.16
+++ revisor.spec	7 Sep 2007 10:08:21 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -170,7 +170,8 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
+- Bugfixes
 - Removed pungi dependency
 - Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Sep 2007 13:51:30 -0000	1.17
+++ sources	7 Sep 2007 10:08:21 -0000	1.18
@@ -1 +1 @@
-cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz
+eb0bf848e92d6605e36b9146db85de23  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 10:57:25 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 06:57:25 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.37, 1.38 gnome-media.spec,
	1.100, 1.101 sources, 1.36,
	1.37 gnome-media-2.17.90-disable-scrollkeeper.patch, 1.1,
	NONE gnome-media-cd-last-track-mode.patch, 1.1,
	NONE gnome-media-set-modal.patch, 1.1, NONE
Message-ID: <200709071057.l87AvPCd017785@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17565

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	gnome-media-2.17.90-disable-scrollkeeper.patch 
	gnome-media-cd-last-track-mode.patch 
	gnome-media-set-modal.patch 
Log Message:
* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
- Update to 2.19.92
- Remove upstreamed/obsolete patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Mar 2007 16:00:54 -0000	1.37
+++ .cvsignore	7 Sep 2007 10:56:48 -0000	1.38
@@ -1 +1 @@
-gnome-media-2.18.0.tar.bz2
+gnome-media-2.19.92.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-media.spec	25 Aug 2007 13:36:49 -0000	1.100
+++ gnome-media.spec	7 Sep 2007 10:56:48 -0000	1.101
@@ -11,15 +11,12 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.18.0
-Release:        6%{?dist}
+Version:        2.19.92
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
-Patch0:         gnome-media-2.17.90-disable-scrollkeeper.patch
-Patch1:         gnome-media-2.13.5-hide-help-button.patch
-Patch2:         gnome-media-set-modal.patch
-Patch3:         gnome-media-cd-last-track-mode.patch
+Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -47,10 +44,8 @@
 BuildRequires:  gstreamer-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_version}
 BuildRequires:  nautilus-cd-burner-devel
-BuildRequires:  scrollkeeper
-BuildRequires:  gettext
+BuildRequires:  gnome-doc-utils
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  autoconf automake libtool intltool
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -79,19 +74,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .scrollkeeper-disable
-%patch1 -p1 -b .hide-help-button
-%patch2 -p0 -b .modal
-cd gnome-cd/
-%patch3 -p0 -b .last-track-mode
+%patch0 -p1 -b .hide-help-button
 
 %build
-libtoolize --force
-intltoolize --force
-autoreconf
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 %configure  --disable-schemas-install
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -199,6 +187,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+- Remove upstreamed/obsolete patches
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-6
 - Run intltoolize before autoreconf, to avoid intltool version
   mismatches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2007 16:00:54 -0000	1.36
+++ sources	7 Sep 2007 10:56:48 -0000	1.37
@@ -1 +1 @@
-a472d8c7733b119376bc6127ee55a82d  gnome-media-2.18.0.tar.bz2
+f095fceca0175e04afb966e0366a9bc4  gnome-media-2.19.92.tar.gz


--- gnome-media-2.17.90-disable-scrollkeeper.patch DELETED ---


--- gnome-media-cd-last-track-mode.patch DELETED ---


--- gnome-media-set-modal.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 11:01:39 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 07:01:39 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.101,1.102
Message-ID: <200709071101.l87B1dp6024575@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18571

Modified Files:
	gnome-media.spec 
Log Message:
upstream configure uses .tar.gz



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gnome-media.spec	7 Sep 2007 10:56:48 -0000	1.101
+++ gnome-media.spec	7 Sep 2007 11:01:04 -0000	1.102
@@ -15,7 +15,7 @@
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
+Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 



From fedora-extras-commits at redhat.com  Fri Sep  7 11:21:38 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 07:21:38 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.102,1.103
Message-ID: <200709071121.l87BLchN027496@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27409

Modified Files:
	gnome-media.spec 
Log Message:
Yep, doesn't build with smp_flags



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gnome-media.spec	7 Sep 2007 11:01:04 -0000	1.102
+++ gnome-media.spec	7 Sep 2007 11:21:06 -0000	1.103
@@ -79,7 +79,7 @@
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 %configure  --disable-schemas-install
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Fri Sep  7 11:29:17 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 07:29:17 -0400
Subject: rpms/freenx/devel .cvsignore, 1.5, 1.6 freenx.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709071129.l87BTHtL028422@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28259

Modified Files:
	.cvsignore freenx.spec sources 
Log Message:
Bump to 0.7.0, BZ 252976.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Apr 2007 21:03:12 -0000	1.5
+++ .cvsignore	7 Sep 2007 11:28:44 -0000	1.6
@@ -1 +1 @@
-freenx-0.6.0.tar.gz
+freenx-0.7.0.tar.gz


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	29 Apr 2007 21:03:12 -0000	1.6
+++ freenx.spec	7 Sep 2007 11:28:44 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Apr 2007 21:03:12 -0000	1.5
+++ sources	7 Sep 2007 11:28:44 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 11:32:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 7 Sep 2007 07:32:15 -0400
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.2,1.3
Message-ID: <200709071132.l87BWFr5028854@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28749

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
rebuild


Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-lablgtk.spec	30 Aug 2007 09:49:34 -0000	1.2
+++ ocaml-lablgtk.spec	7 Sep 2007 11:31:42 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.6.0
-Release:        9.20060908cvs%{?dist}
+Release:        10.20060908cvs%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Gerard Milmeister <gemi at bluewin.ch> - 2.6.0-10.20060908cvs
+- rebuild
+
 * Thu Aug 30 2007 Gerard Milmeister <gemi at bluewin.ch> - 2.6.0-9.20060908cvs
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 11:39:10 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 07:39:10 -0400
Subject: rpms/freenx/F-7 freenx.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709071139.l87BdAiR029830@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29711

Modified Files:
	freenx.spec sources 
Log Message:
Bump to 0.7.0, BZ 252976.



Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	29 Apr 2007 21:03:12 -0000	1.6
+++ freenx.spec	7 Sep 2007 11:38:37 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Apr 2007 21:03:12 -0000	1.5
+++ sources	7 Sep 2007 11:38:37 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 12:00:14 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:00:14 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.103,1.104
Message-ID: <200709071200.l87C0EaF032165@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	gnome-media.spec 
Log Message:
Disable the sound recorder in configure, and add gettext as a BR



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-media.spec	7 Sep 2007 11:21:06 -0000	1.103
+++ gnome-media.spec	7 Sep 2007 11:59:42 -0000	1.104
@@ -45,7 +45,7 @@
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_version}
 BuildRequires:  nautilus-cd-burner-devel
 BuildRequires:  gnome-doc-utils
-BuildRequires:  perl(XML::Parser)
+BuildRequires:  gettext perl(XML::Parser)
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -78,7 +78,7 @@
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
-%configure  --disable-schemas-install
+%configure --disable-schemas-install --enable-grecord=no
 make #%{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:26 -0700
Subject: [pkgdb] gnupg: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKR6H010256@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on gnupg (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:28 -0700
Subject: [pkgdb] gnupg: rdieter has requested commit
Message-ID: <200709071220.l87CKSsF010265@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on gnupg (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:41 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKfpe010274@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgcrypt (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:47 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:47 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKleI010286@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgcrypt (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:49 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchcommits
Message-ID: <200709071220.l87CKnEd010296@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgcrypt (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:03 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchbugzilla
Message-ID: <200709071221.l87CL3H5010305@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgpg-error (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:04 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchcommits
Message-ID: <200709071221.l87CL4SB010314@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgpg-error (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:08 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchcommits
Message-ID: <200709071221.l87CL87V010327@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgpg-error (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:09 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:09 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested commit
Message-ID: <200709071221.l87CL9rF010336@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libgpg-error (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 12:24:20 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Fri, 7 Sep 2007 08:24:20 -0400
Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.38,1.39
Message-ID: <200709071224.l87COKO8008603@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8489

Modified Files:
	docbook-style-xsl.spec 
Log Message:
added PreReq: libxml2 >= 2.4.8(#253962)


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- docbook-style-xsl.spec	5 Sep 2007 11:30:11 -0000	1.38
+++ docbook-style-xsl.spec	7 Sep 2007 12:23:48 -0000	1.39
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -12,6 +12,8 @@
 PreReq: docbook-dtd-xml
 # xml-common was using /usr/share/xml until 0.6.3-8.
 PreReq: xml-common >= 0.6.3-8
+# required because of usage of /usr/bin/xmlcatalog
+PreReq: libxml2 >= 2.4.8
 # PassiveTeX before 1.21 can't handle the newer stylesheets.
 Conflicts: passivetex < 1.21
 
@@ -99,6 +101,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-2
+- Added PreReq of libxml2(#253962)
+
 * Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:27:09 2007
From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera))
Date: Fri, 7 Sep 2007 08:27:09 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.28,1.29
Message-ID: <200709071227.l87CR9nx009040@cvs-int.fedora.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8968

Modified Files:
	fonts-indic.spec 
Log Message:
Renamed the package to reflect upstream project


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fonts-indic.spec	27 Jul 2007 09:27:07 -0000	1.28
+++ fonts-indic.spec	7 Sep 2007 12:26:37 -0000	1.29
@@ -2,9 +2,9 @@
 %define update_cache    /usr/bin/fc-cache 
 %define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
-Name:        fonts-indic
+Name:        lohit-fonts
 Version:     2.1.5
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     GPL
 Group:       User Interface/X
 BuildArch:   noarch
@@ -13,23 +13,23 @@
 Source:    fonts-indic-%{version}.tar.gz
 
 Summary: Free Indian truetype/opentype fonts
-%description
+%description 
 This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil,
 Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
-%package -n fonts-%1\
+%package -n lohit-fonts-%1\
 Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      User Interface/X \
-Obsoletes:  ttfonts-%2 <= 1.6-1\
-Provides :  ttfonts-%2 <= 1.6-1\
+Provides:  fonts-%1 = %{version}-%{release}\
+Obsoletes :  fonts-%1 < 2.1.5-3\
 Requires:   fontconfig\
 \
-%description -n fonts-%1\
+%description -n lohit-fonts-%1\
 These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
 \
-%files -n fonts-%1\
+%files -n lohit-fonts-%1\
 %defattr(-, root, root)\
 %dir %{xfontdir}\
 %dir %{xfontdir}/%1\
@@ -37,12 +37,12 @@
 %ghost %{xfontdir}/%1/fonts.cache-1\
 %{xfontdir}/%1/*ttf\
 \
-%post -n fonts-%1 \
+%post -n lohit-fonts-%1 \
 if [ -x %{_bindir}/fc-cache ]; then \
   %{_bindir}/fc-cache /usr/share/fonts \
 fi \
 \
-%postun -n fonts-%1 \
+%postun -n lohit-fonts-%1 \
 if [ "$1" = "0" ]; then \
   if [ -x %{_bindir}/fc-cache ]; then \
     %{_bindir}/fc-cache /usr/share/fonts \
@@ -60,7 +60,7 @@
 %mk_pkg telugu te
 
 %prep
-%setup -q
+%setup -q -n fonts-indic-%{version}
 
 %build
 echo "Nothing to do in Build."
@@ -80,6 +80,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
+- Renamed the package to reflect the upstream project name #253158
+
 * Fri Jul 27 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-2.fc8
 - SPEC cleanup as part of merge review #225763
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:36:09 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:36:09 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.104,1.105
Message-ID: <200709071236.l87Ca9iq010235@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158

Modified Files:
	gnome-media.spec 
Log Message:
Add new icons as well



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-media.spec	7 Sep 2007 11:59:42 -0000	1.104
+++ gnome-media.spec	7 Sep 2007 12:35:37 -0000	1.105
@@ -171,6 +171,7 @@
 %{_datadir}/idl/GNOME_Media_CDDBSlave2.idl
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/omf/gnome-media
 %{_datadir}/gnome-media
 %{_datadir}/gstreamer-properties



From fedora-extras-commits at redhat.com  Fri Sep  7 12:40:04 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 7 Sep 2007 08:40:04 -0400
Subject: rpms/gimp/devel gimp.spec,1.139,1.140
Message-ID: <200709071240.l87Ce47k010563@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10537

Modified Files:
	gimp.spec 
Log Message:
rebuild to pick up new version of poppler



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gimp.spec	4 Sep 2007 07:23:20 -0000	1.139
+++ gimp.spec	7 Sep 2007 12:39:31 -0000	1.140
@@ -45,7 +45,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}1%{?dist}
+Release:        %{?rcver:0.%{rcver}.}2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.2
+- rebuild to pick up new version of poppler
+
 * Tue Sep 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.1
 - version 2.4.0-rc2
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:44:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:44:19 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.105,1.106
Message-ID: <200709071244.l87CiJ9p010774@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10716

Modified Files:
	gnome-media.spec 
Log Message:
No OMF dir anymore



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-media.spec	7 Sep 2007 12:35:37 -0000	1.105
+++ gnome-media.spec	7 Sep 2007 12:43:46 -0000	1.106
@@ -172,7 +172,6 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/omf/gnome-media
 %{_datadir}/gnome-media
 %{_datadir}/gstreamer-properties
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:50:37 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 7 Sep 2007 08:50:37 -0400
Subject: rpms/curl/devel curl.spec,1.57,1.58
Message-ID: <200709071250.l87CobpJ010980@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10953

Modified Files:
	curl.spec 
Log Message:
- add support for the NSS PKCS#11 pem reader so the command-line is the
  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
- switch to NSS again



Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- curl.spec	3 Sep 2007 10:48:12 -0000	1.57
+++ curl.spec	7 Sep 2007 12:50:04 -0000	1.58
@@ -4,17 +4,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 4%{?dist}
+Release: 5%{?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.16.4-ftp.patch
+Patch4: curl-7.16.4-nsspem.patch
 URL: http://curl.haxx.se/
-Requires: openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: nss-devel >= 3.11.7-7
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -26,7 +27,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel, libidn-devel, pkgconfig, automake
+Requires: libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -40,13 +41,14 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .ftp
+%patch4 -p1 -b .nsspem
 
 %build
-if pkg-config openssl ; then
-	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
+if pkg-config nss ; then
+	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
 fi
-%configure --with-ssl=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
@@ -100,6 +102,11 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
+- add support for the NSS PKCS#11 pem reader so the command-line is the
+  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
+- switch to NSS again
+
 * Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
 - revert back to use OpenSSL (#266021)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:51:11 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 7 Sep 2007 08:51:11 -0400
Subject: rpms/curl/devel curl-7.16.4-nsspem.patch,NONE,1.1
Message-ID: <200709071251.l87CpB0R011028@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11015

Added Files:
	curl-7.16.4-nsspem.patch 
Log Message:
add nsspem patch


curl-7.16.4-nsspem.patch:

--- NEW FILE curl-7.16.4-nsspem.patch ---
diff -up curl-7.16.4/configure.nsspem curl-7.16.4/configure
--- curl-7.16.4/configure.nsspem	2007-06-25 11:18:41.000000000 +0200
+++ curl-7.16.4/configure	2007-09-06 08:35:31.000000000 +0200
@@ -26760,7 +26760,7 @@ echo "$as_me: WARNING: Use --with-ssl, -
 fi
 
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   { echo "$as_me:$LINENO: checking CA cert bundle install path" >&5
 echo $ECHO_N "checking CA cert bundle install path... $ECHO_C" >&6; }
diff -up curl-7.16.4/configure.ac.nsspem curl-7.16.4/configure.ac
--- curl-7.16.4/configure.ac.nsspem	2007-06-12 23:39:21.000000000 +0200
+++ curl-7.16.4/configure.ac	2007-09-06 08:35:31.000000000 +0200
@@ -1468,7 +1468,7 @@ dnl ************************************
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   AC_MSG_CHECKING([CA cert bundle install path])
 
diff -up curl-7.16.4/lib/nss.c.nsspem curl-7.16.4/lib/nss.c
--- curl-7.16.4/lib/nss.c.nsspem	2007-05-25 23:56:27.000000000 +0200
+++ curl-7.16.4/lib/nss.c	2007-09-06 09:26:39.000000000 +0200
@@ -55,6 +55,7 @@
 #include <ssl.h>
 #include <sslerr.h>
 #include <secerr.h>
+#include <secmod.h>
 #include <sslproto.h>
 #include <prtypes.h>
 #include <pk11pub.h>
@@ -69,10 +70,19 @@
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif
 
+#define SSL_DIR "/etc/pki/nssdb"
+
+/* enough to fit the string "PEM Token #[0|1]" */
+#define SLOTSIZE 13
+
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
 static int initialized = 0;
-static int noverify = 0;
+static int verify_done = 0;
+char * select_nickname = NULL;
+
+/* Global so our callbacks can update as appropriate */
+static int curlerr;
 
 #define HANDSHAKE_TIMEOUT 30
 
@@ -87,15 +97,25 @@ typedef struct {
   PRInt32 version; /* protocol version valid for this cipher */
 } cipher_s;
 
-/* the table itself is defined in nss_engine_init.c */
 #ifdef NSS_ENABLE_ECC
 #define ciphernum 48
 #else
 #define ciphernum 23
 #endif
 
+#define PK11_SETATTRS(x,id,v,l) \
+	do { \
+		(x)->type = (id); \
+		(x)->pValue=(v); \
+		(x)->ulValueLen = (l); \
+	} while (0)
+
+#define CERT_NewTempCertificate __CERT_NewTempCertificate
+
 enum sslversion { SSL2 = 1, SSL3 = 2, TLS = 4 };
 
+pphrase_arg_t *parg = NULL;
+
 cipher_s cipherlist[ciphernum] = {
   /* SSL2 cipher suites */
   {"rc4", SSL_EN_RC4_128_WITH_MD5, SSL2},
@@ -154,6 +174,9 @@ cipher_s cipherlist[ciphernum] = {
 #endif
 };
 
+const char* pem_library = "libnsspem.so";
+static SECMODModule* mod = NULL;
+
 static SECStatus set_ciphers(struct SessionHandle *data, PRFileDesc * model,
                              char *cipher_list)
 {
@@ -197,9 +220,7 @@ static SECStatus set_ciphers(struct Sess
     }
 
     if(found == PR_FALSE) {
-      char buf[1024];
-      snprintf(buf, 1024, "Unknown cipher in list: %s", cipher);
-      failf(data, buf);
+      failf(data, "Unknown cipher in list: %s", cipher);
       return SECFailure;
     }
 
@@ -220,27 +241,240 @@ static SECStatus set_ciphers(struct Sess
   return SECSuccess;
 }
 
+/*
+ * Determine whether the nickname passed in is a filename that needs to
+ * be loaded as a PEM or a regular NSS nickname. 
+ *
+ * returns 1 for a file
+ * returns 0 for not a file (NSS nickname)
+ */
+static int is_file(const char *filename) {
+    struct stat st;
+
+    if (filename == NULL)
+      return 0;
+
+    if (stat(filename, &st) == 0) {
+      if (S_ISREG(st.st_mode))
+        return 1;
+    }
+    return 0;
+}
+
+static int
+nss_load_cert(struct SessionHandle *data, const char *filename, PRBool cacert)
+{
+  CERTCertificate *cert;
+  void *proto_win = NULL;
+  CK_SLOT_ID slotID;
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_BBOOL ckfalse = CK_FALSE;
+  CK_OBJECT_CLASS objClass = CKO_CERTIFICATE;
+  char *nickname = NULL;
+  char *slotname = NULL;
+  char *n;
+
+  /* If there is no slash in the filename it is assumed to be a regular
+   * NSS nickname.
+   */
+  if (is_file(filename)) {
+    n = strrchr(filename, '/');
+    if (n)
+      n++;
+  } else {
+    /* A nickname from the NSS internal database */
+    nickname = strdup(filename);
+    goto done;
+  }
+
+  attrs = theTemplate;
+
+  /* All CA and trust objects go into slot 0. Other slots are used
+   * for storing certificates. With each new user certificate we increment
+   * the slot count. We only support 1 user certificate right now.
+   */
+  if (cacert) {
+    slotID = 0;
+  } else {
+    slotID = 1;
+  } 
+  
+  slotname = (char *)malloc(SLOTSIZE);
+  nickname = (char *)malloc(PATH_MAX);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+  snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", slotID, n);
+
+  slot = PK11_FindSlotByName(slotname);
+  
+  if (!slot) {
+    free(slotname);
+    free(nickname);
+    return 0;
+  }
+  
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)filename, strlen(filename)+1); attrs++;
+  if (cacert) {
+    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  } else {
+    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) ); attrs++;
+  }
+
+  /* This load the certificate in our PEM module into the appropriate
+   * slot.
+   */
+  rv = PK11_CreateGenericObject(slot, theTemplate, 4, PR_FALSE /* isPerm */);
+
+  PK11_FreeSlot(slot);
+
+  free(slotname);
+  if (rv == NULL) {
+      free(nickname);
+      return 0;
+  }
+
+done:
+  /* Double-check that the certificate or nickname requested exists in
+   * either the token or the NSS certificate database.
+   */
+  if (!cacert) {
+    cert = PK11_FindCertFromNickname((char *)nickname, proto_win);
+
+    /* An invalid nickname was passed in */
+    if (cert == NULL) {
+      PR_SetError(SEC_ERROR_UNKNOWN_CERT, 0);
+      return 0;
+    }
+
+    CERT_DestroyCertificate(cert);
+  }
+  free(nickname);
+
+  return 1;
+}
+
+static int nss_load_key(char *key_file)
+{
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_OBJECT_CLASS objClass = CKO_PRIVATE_KEY;
+  CK_SLOT_ID slotID;
+  char *slotname = NULL;
+
+  attrs = theTemplate;
+
+  /* FIXME: grok the various file types */
+
+  /* FIXME: shouldn't be hardcoded */
+  slotID = 1;
+
+  slotname = (char *)malloc(SLOTSIZE);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+
+  slot = PK11_FindSlotByName(slotname);
+  free(slotname);
+
+  if (!slot) {
+    return 0;
+  }
+
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)key_file, 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) {
+    PR_SetError(SEC_ERROR_BAD_KEY, 0);
+    return 0;
+  }
+
+  /* This will force the token to be seen as re-inserted */
+  PK11_IsPresent(slot);
+
+  parg->retryCount = 0;
+  /* parg is initialized in nss_Init_Tokens() */
+  if (PK11_Authenticate(slot, PR_TRUE, parg) != SECSuccess) {
+    return 0;
+  }
+
+  return 1;
+}
+
+static int display_error(struct connectdata *conn, PRInt32 err, const char *filename) {
+  switch(err) {
+    case SEC_ERROR_BAD_PASSWORD:
+      failf(conn->data, "Unable to load client key: Incorrect password\n");
+      return 1;
+    case SEC_ERROR_UNKNOWN_CERT:
+      failf(conn->data, "Unable to load certificate %s\n", filename);
+      return 1;
+  }
+  return 0; /* The caller will print a generic error */
+}
+
+static int cert_stuff(struct connectdata *conn, char *cert_file, char *key_file)
+{
+  struct SessionHandle *data = conn->data;
+  int rv = 0;
+
+  if (cert_file)
+    rv = nss_load_cert(data, cert_file, PR_FALSE);  
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), cert_file))
+        failf(data, "Unable to load client cert %d.", PR_GetError());
+      return 0;
+    }
+  if (key_file || (is_file(cert_file) )) {
+    if (key_file)
+      rv = nss_load_key(key_file);
+    else
+      rv = nss_load_key(cert_file);
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), key_file))
+        failf(data, "Unable to load client key %d.", PR_GetError());
+
+      return 0;
+    }
+  }
+  return 1;
+}
+
 static char * nss_get_password(PK11SlotInfo * slot, PRBool retry, void *arg)
 {
   pphrase_arg_t *parg = (pphrase_arg_t *) arg;
-  (void)slot; /* unused */
-  (void)retry; /* unused */
+  parg->retryCount++;
+  if (parg->retryCount > 2)
+    return NULL;
   if(parg->data->set.key_passwd)
     return (char *)PORT_Strdup((char *)parg->data->set.key_passwd);
   else
     return NULL;
 }
 
-static SECStatus nss_Init_Tokens(struct connectdata * conn)
+static char * nss_no_password(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+   return NULL;
+}
+
+static SECStatus nss_Init_Tokens(struct SessionHandle *data)
 {
   PK11SlotList *slotList;
   PK11SlotListElement *listEntry;
   SECStatus ret, status = SECSuccess;
-  pphrase_arg_t *parg;
 
-  parg = (pphrase_arg_t *) malloc(sizeof(*parg));
+  if (!parg)
+      parg = (pphrase_arg_t *) malloc(sizeof(*parg));
   parg->retryCount = 0;
-  parg->data = conn->data;
+  parg->data = data;
 
   PK11_SetPasswordFunc(nss_get_password);
 
@@ -253,10 +487,10 @@ static SECStatus nss_Init_Tokens(struct 
 
     if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {
       if(slot == PK11_GetInternalKeySlot()) {
-        failf(conn->data, "The NSS database has not been initialized.\n");
+        failf(data, "The NSS database has not been initialized.\n");
       }
       else {
-        failf(conn->data, "The token %s has not been initialized.",
+        failf(data, "The token %s has not been initialized.",
               PK11_GetTokenName(slot));
       }
       PK11_FreeSlot(slot);
@@ -265,6 +499,8 @@ static SECStatus nss_Init_Tokens(struct 
 
     ret = PK11_Authenticate(slot, PR_TRUE, parg);
     if(SECSuccess != ret) {
+      if (PR_GetError() == SEC_ERROR_BAD_PASSWORD)
+        infof(data, "The password for token '%s' is incorrect\n", PK11_GetTokenName(slot));
       status = SECFailure;
       break;
     }
@@ -272,15 +508,59 @@ static SECStatus nss_Init_Tokens(struct 
     PK11_FreeSlot(slot);
   }
 
-  free(parg);
   return status;
 }
 
 static SECStatus BadCertHandler(void *arg, PRFileDesc * socket)
 {
   SECStatus success = SECSuccess;
-  (void)arg;
-  (void)socket;
+  struct connectdata *conn = (struct connectdata *)arg;
+  PRErrorCode err = PR_GetError();
+  CERTCertificate *cert = NULL;
+  char *subject, *issuer;
+
+  if (verify_done)
+      return success;
+
+  verify_done = 1;
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  CERT_DestroyCertificate(cert);
+
+  switch(err) {
+  case SEC_ERROR_CA_CERT_INVALID:
+    infof(conn->data, "Issuer certificate is invalid: '%s'\n", issuer);
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    break;
+  case SEC_ERROR_UNTRUSTED_ISSUER:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Certificate is signed by an untrusted issuer: '%s'\n", issuer);
+    break;
+  case SSL_ERROR_BAD_CERT_DOMAIN:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "common name: %s (does not match '%s')\n",
+          subject, conn->host.dispname);
+    break;
+  case SEC_ERROR_EXPIRED_CERTIFICATE:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Remote Certificate has expired.\n");
+    break;
+  default:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Bad certificate received. Subject = '%s', Issuer = '%s'\n", subject, issuer);
+    break;
+  }
+  if (success == SECSuccess)
+    infof(conn->data, "SSL certificate verify ok.\n");
+  PR_Free(subject);
+  PR_Free(issuer);
+  curlerr = CURLE_SSL_CACERT;
 
   return success;
 }
@@ -295,6 +575,52 @@ static SECStatus HandshakeCallback(PRFil
   return SECSuccess;
 }
 
+static void display_conn_info(struct connectdata *conn, PRFileDesc * socket)
+{
+  SSLChannelInfo channel;
+  SSLCipherSuiteInfo suite;
+  CERTCertificate *cert;
+  char *subject, *issuer, *common_name;
+  PRExplodedTime printableTime;
+  char timeString[256];
+  PRTime notBefore, notAfter;
+
+  if (SSL_GetChannelInfo(socket, &channel, sizeof channel) ==
+    SECSuccess && channel.length == sizeof channel &&
+    channel.cipherSuite) {
+    if (SSL_GetCipherSuiteInfo(channel.cipherSuite,
+      &suite, sizeof suite) == SECSuccess) {
+      infof(conn->data, "SSL connection using %s\n", suite.cipherSuiteName);
+    }
+  }
+
+  infof(conn->data, "Server certificate:\n");
+
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  common_name = CERT_GetCommonName(&cert->subject);
+  infof(conn->data, "\tsubject: %s\n", subject);
+
+  CERT_GetCertTimes(cert, &notBefore, &notAfter);
+  PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\tstart date: %s\n", timeString);
+  PR_ExplodeTime(notAfter, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\texpire date: %s\n", timeString);
+  infof(conn->data, "\tcommon name: %s\n", common_name);
+  infof(conn->data, "\tissuer: %s\n", issuer);
+
+  PR_Free(subject);
+  PR_Free(issuer);
+  PR_Free(common_name);
+
+  CERT_DestroyCertificate(cert);
+
+  return;
+}
+
 /**
  *
  * Callback to pick the SSL client certificate.
@@ -309,24 +635,42 @@ static SECStatus SelectClientCert(void *
   char *nickname = (char *)arg;
   void *proto_win = NULL;
   SECStatus secStatus = SECFailure;
+  PK11SlotInfo *slot;
   (void)caNames;
 
   proto_win = SSL_RevealPinArg(socket);
 
+  if (!nickname)
+    return secStatus;
+
   cert = PK11_FindCertFromNickname(nickname, proto_win);
   if(cert) {
-    privKey = PK11_FindKeyByAnyCert(cert, proto_win);
-    if(privKey) {
-      secStatus = SECSuccess;
-    }
-    else {
-      CERT_DestroyCertificate(cert);
+
+    if (!strncmp(nickname, "PEM Token", 9)) {
+      CK_SLOT_ID slotID = 1; /* hardcoded for now */
+      char * slotname = (char *)malloc(SLOTSIZE);
+      snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+      slot = PK11_FindSlotByName(slotname);
+      privKey = PK11_FindPrivateKeyFromCert(slot, cert, NULL);
+      PK11_FreeSlot(slot);
+      free(slotname);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
+    } else {
+      privKey = PK11_FindKeyByAnyCert(cert, proto_win);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
     }
   }
 
   if(secStatus == SECSuccess) {
     *pRetCert = cert;
     *pRetKey = privKey;
+  } else {
+    if (cert)
+      CERT_DestroyCertificate(cert);
   }
 
   return secStatus;
@@ -397,6 +741,8 @@ void Curl_nss_close(struct connectdata *
     }
     connssl->use = FALSE; /* get back to ordinary socket usage */
   }
+  if (select_nickname)
+    free(select_nickname);
 }
 
 /*
@@ -418,31 +764,52 @@ CURLcode Curl_nss_connect(struct connect
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   SECStatus rv;
-  int curlerr = CURLE_SSL_CONNECT_ERROR;
+  char *configstring = NULL;
+  char *certDir = NULL;
+
+  curlerr = CURLE_SSL_CONNECT_ERROR;
+  certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
+
+  if (!certDir) {
+    struct stat st;
+
+    if (stat(SSL_DIR, &st) == 0)
+      if (S_ISDIR(st.st_mode)) {
+        certDir = "/etc/pki/nssdb";
+      }
+  }
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   if(!initialized) {
-    if(!data->set.ssl.CAfile) {
-      if(data->set.ssl.verifypeer) {
-        failf(data, "No NSS cacert database specified.");
-        return CURLE_SSL_CACERT_BADFILE;
-      }
-      else {
-        rv = NSS_NoDB_Init(NULL);
-        noverify = 1;
-      }
+    if(!certDir) {
+      rv = NSS_NoDB_Init(NULL);
     }
     else {
-      rv = NSS_Initialize(data->set.ssl.CAfile, NULL, NULL, "secmod.db",
+      rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
                           NSS_INIT_READONLY);
     }
     if(rv != SECSuccess) {
       curlerr = CURLE_SSL_CACERT_BADFILE;
       goto error;
     }
-  }
+    configstring = (char *)malloc(4096);
+
+    NSS_SetDomesticPolicy();
 
-  NSS_SetDomesticPolicy();
+    PR_snprintf(configstring, 4096, "library=%s name=PEM", pem_library);
+//    PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"NSS=\"trustorder=75\"\"", pem_library);
+//     PR_snprintf(configstring, 4096, "library=/usr/lib/libnsspem.so name=PEM parameters=\"/etc/pki/tls/certs/ca-bundle.crt\" NSS=\"trustorder=75\"");
+
+    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!mod || !mod->loaded) {
+      if (mod) {
+        SECMOD_DestroyModule(mod);
+        mod = NULL;
+      }
+      infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL PEM certificates will not work.\n", pem_library);
+    }
+    free(configstring);
+  }
 
   model = PR_NewTCPSocket();
   if(!model)
@@ -482,26 +849,92 @@ CURLcode Curl_nss_connect(struct connect
     goto error;
 
   if(data->set.ssl.cipher_list) {
-    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess)
+    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess) {
+      curlerr = CURLE_SSL_CIPHER;
       goto error;
+    }
   }
 
-  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, NULL)
-     != SECSuccess)
+  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
+     != SECSuccess) {
     goto error;
+  }
   if(SSL_HandshakeCallback(model, (SSLHandshakeCallback) HandshakeCallback,
                            NULL) != SECSuccess)
     goto error;
 
+  if (mod && data->set.ssl.CAfile) {
+    rv = nss_load_cert(data, data->set.ssl.CAfile, PR_TRUE);
+  } else if (data->set.ssl.CApath) {
+    struct stat st;
+    PRDir      *dir;
+    PRDirEntry *entry;
+
+    if (stat(data->set.ssl.CApath, &st) == -1)
+      curlerr = CURLE_SSL_CACERT_BADFILE;
+      goto error;
+
+    if (S_ISDIR(st.st_mode)) {
+      dir = PR_OpenDir(data->set.ssl.CApath);
+      int rv;
+      do {
+        entry = PR_ReadDir(dir, PR_SKIP_BOTH | PR_SKIP_HIDDEN);
+
+        if (entry) {
+          char fullpath[PATH_MAX];
+
+          snprintf(fullpath, sizeof(fullpath), "%s/%s", data->set.ssl.CApath, entry->name);
+          rv = nss_load_cert(data, fullpath, PR_TRUE);
+        }
+      /* This is purposefully tolerant of errors so non-PEM files
+       * can be in the same directory */
+      } while (entry != NULL);
+      PR_CloseDir(dir);
+    }
+  }
+  infof(data,
+        "  CAfile: %s\n"
+        "  CApath: %s\n",
+        data->set.ssl.CAfile ? data->set.ssl.CAfile : "none",
+        data->set.ssl.CApath ? data->set.ssl.CApath : "none");
+
   if(data->set.cert) {
+    char * n;
+    char * nickname;
+
+    nickname = (char *)malloc(PATH_MAX);
+    if (is_file(data->set.cert)) {
+      n = strrchr(data->set.cert, '/');
+      if (n) {
+          n++; /* skip last slash */
+          snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", 1, n);
+      }
+    } else {
+        strncpy(nickname, data->set.cert, PATH_MAX);
+    }
+    if(nss_Init_Tokens(conn->data) != SECSuccess) {
+      free(nickname);
+      goto error;
+    }
+    if (!cert_stuff(conn, data->set.cert, data->set.key)) {
+      /* failf() is already done in cert_stuff() */
+      free(nickname);
+      return CURLE_SSL_CERTPROBLEM;
+    }
+
+    select_nickname = strdup(nickname);
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)data->set.cert) != SECSuccess) {
+                                 (void *)select_nickname) != SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }
-    if(nss_Init_Tokens(conn) != SECSuccess)
-      goto error;
+
+    free(nickname);
+    free(parg);
+
+    /* No longer return the password, lets us free parg */
+    PK11_SetPasswordFunc(nss_no_password);
   }
 
   /* Import our model socket  onto the existing file descriptor */
@@ -509,6 +942,7 @@ CURLcode Curl_nss_connect(struct connect
   connssl->handle = SSL_ImportFD(model, connssl->handle);
   if(!connssl->handle)
     goto error;
+  PR_Close(model); /* We don't need this any more */
 
   /* Force handshake on next I/O */
   SSL_ResetHandshake(connssl->handle, /* asServer */ PR_FALSE);
@@ -518,14 +952,17 @@ CURLcode Curl_nss_connect(struct connect
   /* Force the handshake now */
   if (SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
-      != SECSuccess)
+      != SECSuccess) {
     goto error;
+  }
+
+  display_conn_info(conn, connssl->handle);
 
   return CURLE_OK;
 
 error:
   err = PR_GetError();
-  failf(data, "NSS error %d", err);
+  infof(data, "NSS error %d\n", err);
   if(model)
     PR_Close(model);
   return curlerr;



From fedora-extras-commits at redhat.com  Fri Sep  7 12:52:37 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 7 Sep 2007 08:52:37 -0400
Subject: rpms/udev/devel udev-115-git-20070907.patch, NONE,
	1.1 udev-115-looplast.patch, NONE,
	1.1 udev-115-rulesinstall.patch, NONE, 1.1 udev.spec, 1.218, 1.219
Message-ID: <200709071252.l87CqbvU011183@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11134

Modified Files:
	udev.spec 
Added Files:
	udev-115-git-20070907.patch udev-115-looplast.patch 
	udev-115-rulesinstall.patch 
Log Message:
* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
- some upstream fixes from git
- last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)


udev-115-git-20070907.patch:

--- NEW FILE udev-115-git-20070907.patch ---
diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
deleted file mode 100644
index ee349dc..0000000
--- a/etc/udev/gentoo/05-udev-early.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
-SUBSYSTEM=="module",	OPTIONS="ignore_device"
-
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
new file mode 100644
index 0000000..7bc55c6
--- /dev/null
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -0,0 +1,47 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="kernel_compat_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+
+# needed for kernels <2.6.16
+SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+
+# needed for kernels <2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
+
+
+# needed for kernels <2.6.22
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+
+
+
+# this driver is broken and should not be loaded automatically
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
+# needed for kernels <2.6.21
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
+
+# No need for more code, as MODALIAS is present
+ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
+
+# needed for kernels <2.6.22
+SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+
+LABEL="kernel_compat_end"
+
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index dd32971..7c2ac81 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -1,13 +1,9 @@
+# do not edit this file, it will be overwritten on update
+
 # /etc/udev/rules/50-udev.rules:  device naming rules for udev
 #
 # Gentoo specific rules
 #
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
 
 # Net devices can have arbitrary names, even
 # ones set by the user. Not try to match normal
@@ -241,10 +237,6 @@ KERNEL=="umad*",	NAME="infiniband/%k"
 KERNEL=="issm*",	NAME="infiniband/%k"
 
 
-# usbfs-like device nodes
-# the way to go up to kernel 2.6.21 (and above if setting USB_DEVICE_CLASS=y)
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
-# starting from kernel 2.6.22 use this rule
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
 	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
 
diff --git a/etc/udev/gentoo/80-hotplug.rules b/etc/udev/gentoo/80-hotplug.rules
deleted file mode 100644
index 0637dbc..0000000
--- a/etc/udev/gentoo/80-hotplug.rules
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/udev/rules/80-hotplug.rules:  module loading rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Module autoloading
-ACTION!="add", GOTO="hotplug_load_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="hotplug_load_end"
-
diff --git a/etc/udev/gentoo/90-network.rules b/etc/udev/gentoo/90-network.rules
new file mode 100644
index 0000000..50903af
--- /dev/null
+++ b/etc/udev/gentoo/90-network.rules
@@ -0,0 +1,8 @@
+# do not edit this file, it will be overwritten on update
+
+# /etc/udev/rules/90-network.rules:  triggering network init-scripts
+
+# Activate our network if we can
+SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
+SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
+
diff --git a/etc/udev/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
deleted file mode 100644
index 40ada28..0000000
--- a/etc/udev/gentoo/95-udev-late.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/udev/rules/95-udev-late.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
-# event to be catched by udevmonitor
-RUN+="socket:/org/kernel/udev/monitor"
-
diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index bff2fe5..bdce004 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -17,18 +17,15 @@ KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # mem
-KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
-KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
-KERNEL=="urandom",		MODE="0644"
-KERNEL=="full",			MODE="0666"
 
 # input
 KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0600"
 KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644", SYMLINK+="%k"
 
 # video4linux
@@ -58,7 +55,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{
 KERNEL=="parport[0-9]*",	GROUP="lp"
 SUBSYSTEM=="printer",		KERNEL=="lp*", GROUP="lp"
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*",		GROUP="lp" SYMLINK+="par%n"
+KERNEL=="lp[0-9]*",		GROUP="lp", SYMLINK+="par%n"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
 
 # block, tapes, block-releated
@@ -71,7 +68,7 @@ KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
 KERNEL=="sch[0-9]*",		GROUP="disk"
 KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk""
+KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
@@ -80,6 +77,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="qft0",			SYMLINK+="ftape"
+SUBSYSTEM=="bsg"		NAME="bsg/%k"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
@@ -91,7 +89,8 @@ KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",			MODE="0666"
-KERNEL=="rtc",			MODE="0644"
+KERNEL=="rtc|rtc0",		MODE="0644"
+KERNEL=="rtc0",			SYMLINK+="rtc"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
 KERNEL=="mmtimer",		MODE="0644"
@@ -103,3 +102,6 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 
+# do not delete static device nodes
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+
diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index e71f135..3388266 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -7,6 +7,7 @@ SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 
diff --git a/etc/udev/rules.d/95-udev-late.rules b/etc/udev/rules.d/95-udev-late.rules
index 1755d08..4a015b9 100644
--- a/etc/udev/rules.d/95-udev-late.rules
+++ b/etc/udev/rules.d/95-udev-late.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"
 
diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6d1d19c..ff2c47c 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -142,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-	uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+	uint64_t sboff;
 
 	/* version 0 at the end of the device */
+	sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
 	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
 		return 0;
 
 	/* version 1.0 at the end of the device */
+	sboff = (size & ~(0x1000 - 1)) - 0x2000;
 	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
 		return 0;
 
diff --git a/extras/volume_id/vol_id.8 b/extras/volume_id/vol_id.8
index 7594253..daa583b 100644
--- a/extras/volume_id/vol_id.8
+++ b/extras/volume_id/vol_id.8
@@ -1,6 +1,6 @@
 .\"     Title: vol_id
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: vol_id
 .\"    Source: volume_id
@@ -11,69 +11,69 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-vol_id \- probe filesystem type and read label and uuid
+vol_id - probe filesystem type and read label and uuid
 .SH "SYNOPSIS"
 .HP 7
 \fBvol_id\fR [\fB\-\-export\fR] [\fB\-\-type\fR] [\fB\-\-label\fR] [\fB\-\-label\-raw\fR] [\fB\-\-uuid\fR] [\fB\-\-skip\-raid\fR] [\fB\-\-probe\-all\fR] [\fB\-\-help\fR] [\fIdevice\fR]
 .SH "DESCRIPTION"
 .PP
 \fBvol_id\fR
-is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem.
+is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume\. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem\.
 .SH "OPTIONS"
 .PP
 \fB\-\-export\fR
 .RS 4
-Print all values in key/value format to import them into the environment.
+Print all values in key/value format to import them into the environment\.
 .RE
 .PP
 \fB\-\-type\fR
 .RS 4
-Print the filesystem type.
+Print the filesystem type\.
 .RE
 .PP
 \fB\-\-label\fR
 .RS 4
-Print the safe version of volume label suitable for use as filename.
+Print the safe version of volume label suitable for use as filename\.
 .RE
 .PP
 \fB\-\-label\-raw\fR
 .RS 4
-Print the raw volume label.
+Print the raw volume label\.
 .RE
 .PP
 \fB\-\-uuid\fR
 .RS 4
-Print the uuid of a volume.
+Print the uuid of a volume\.
 .RE
 .PP
 \fB\-\-skip\-raid\fR
 .RS 4
-Skip detection of raid metadata.
+Skip detection of raid metadata\.
 .RE
 .PP
 \fB\-\-probe\-all\fR
 .RS 4
-Probe for all types and print all matches.
+Probe for all types and print all matches\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Set the syslog priority.
+Set the syslog priority\.
 .RE
 .SH "EXIT STATUS"
 .PP
 \fBvol_id\fR
-will only return successful if the value asked for is not empty. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored.
+will only return successful if the value asked for is not empty\. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored\.
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udev.7 b/udev.7
index 821a476..874c9ab 100644
--- a/udev.7
+++ b/udev.7
@@ -1,6 +1,6 @@
 .\"     Title: udev
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udev
 .\"    Source: udev
@@ -11,213 +11,213 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udev \- dynamic device management
+udev - dynamic device management
 .SH "DESCRIPTION"
 .PP
-udev provides a dynamic device directory containing only the files for actually present devices. It creates or removes device node files in the
+udev provides a dynamic device directory containing only the files for actually present devices\. It creates or removes device node files in the
 \fI/dev\fR
-directory, or it renames network interfaces.
+directory, or it renames network interfaces\.
 .PP
 Usually udev runs as
 \fBudevd\fR(8)
-and receives uevents directly from the kernel if a device is added or removed from the system.
+and receives uevents directly from the kernel if a device is added or removed from the system\.
 .PP
-If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling.
+If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device\. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling\.
 .SH "CONFIGURATION"
 .PP
 All udev configuration files are placed in
-\fI/etc/udev/*\fR. Every file consists of a set of lines of text. All empty lines or lines beginning with '#' will be ignored.
+\fI/etc/udev/*\fR\. Every file consists of a set of lines of text\. All empty lines or lines beginning with \'#\' will be ignored\.
 .SS "Configuration file"
 .PP
 udev expects its main configuration file at
-\fI/etc/udev/udev.conf\fR. It consists of a set of variables allowing the user to override default udev values. The following variables can be set:
+\fI/etc/udev/udev\.conf\fR\. It consists of a set of variables allowing the user to override default udev values\. The following variables can be set:
 .PP
 \fBudev_root\fR
 .RS 4
-Specifies where to place the device nodes in the filesystem. The default value is
-\fI/dev\fR.
+Specifies where to place the device nodes in the filesystem\. The default value is
+\fI/dev\fR\.
 .RE
 .PP
 \fBudev_rules\fR
 .RS 4
 The name of the udev rules file or directory to look for files with the suffix
-\fI.rules\fR. Multiple rule files are read in lexical order. The default value is
-\fI/etc/udev/rules.d\fR.
+\fI\.rules\fR\. Multiple rule files are read in lexical order\. The default value is
+\fI/etc/udev/rules\.d\fR\.
 .RE
 .PP
 \fBudev_log\fR
 .RS 4
-The logging priority. Valid values are the numerical syslog priorities or their textual representations:
+The logging priority\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .SS "Rules files"
 .PP
 The udev rules are read from the files located in the
-\fI/etc/udev/rules.d\fR
-directory or at the location specified value in the configuration file. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned.
+\fI/etc/udev/rules\.d\fR
+directory or at the location specified value in the configuration file\. Every line in the rules file contains at least one key value pair\. There are two kind of keys, match and assignment keys\. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned\.
 .PP
-A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling. If no matching rule is found, the default device node name is used.
+A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling\. If no matching rule is found, the default device node name is used\.
 .PP
-A rule may consist of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are:
+A rule may consist of a list of one or more key value pairs separated by a comma\. Each key has a distinct operation, depending on the used operator\. Valid operators are:
 .PP
 \fB==\fR
 .RS 4
-Compare for equality.
+Compare for equality\.
 .RE
 .PP
 \fB!=\fR
 .RS 4
-Compare for non\-equality.
+Compare for non\-equality\.
 .RE
 .PP
 \fB=\fR
 .RS 4
-Assign a value to a key. Keys that represent a list, are reset and only this single value is assigned.
+Assign a value to a key\. Keys that represent a list, are reset and only this single value is assigned\.
 .RE
 .PP
 \fB+=\fR
 .RS 4
-Add the value to a key that holds a list of entries.
+Add the value to a key that holds a list of entries\.
 .RE
 .PP
 \fB:=\fR
 .RS 4
-Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules.
+Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules\.
 .RE
 .PP
-The following key names can be used to match against device properties. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device.
+The following key names can be used to match against device properties\. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event\. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device\.
 .PP
 \fBACTION\fR
 .RS 4
-Match the name of the event action.
+Match the name of the event action\.
 .RE
 .PP
 \fBDEVPATH\fR
 .RS 4
-Match the devpath of the event device.
+Match the devpath of the event device\.
 .RE
 .PP
 \fBKERNEL\fR
 .RS 4
-Match the name of the event device.
+Match the name of the event device\.
 .RE
 .PP
 \fBSUBSYSTEM\fR
 .RS 4
-Match the subsystem of the event device.
+Match the subsystem of the event device\.
 .RE
 .PP
 \fBDRIVER\fR
 .RS 4
-Match the driver name of the event device. Only set for devices which are bound to a driver at the time the event is generated.
+Match the driver name of the event device\. Only set for devices which are bound to a driver at the time the event is generated\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Match sysfs attribute values of the event device. Up to five
+Match sysfs attribute values of the event device\. Up to five
 \fBATTR\fR
-keys can be specified per rule. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself. Depending on the type of operator, this key is also used to set the value of a sysfs attribute.
+keys can be specified per rule\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\. Depending on the type of operator, this key is also used to set the value of a sysfs attribute\.
 .RE
 .PP
 \fBKERNELS\fR
 .RS 4
-Search the devpath upwards for a matching device name.
+Search the devpath upwards for a matching device name\.
 .RE
 .PP
 \fBSUBSYSTEMS\fR
 .RS 4
-Search the devpath upwards for a matching device subsystem name.
+Search the devpath upwards for a matching device subsystem name\.
 .RE
 .PP
 \fBDRIVERS\fR
 .RS 4
-Search the devpath upwards for a matching device driver name.
+Search the devpath upwards for a matching device driver name\.
 .RE
 .PP
 \fBATTRS{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Search the devpath upwards for a device with matching sysfs attribute values. Up to five
+Search the devpath upwards for a device with matching sysfs attribute values\. Up to five
 \fBATTRS\fR
-keys can be specified per rule, but all of them must match on the same device. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself.
+keys can be specified per rule, but all of them must match on the same device\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Match against the value of an environment variable. Up to five
+Match against the value of an environment variable\. Up to five
 \fBENV\fR
-keys can be specified per rule. Depending on the type of operator, this key is also used to export a variable to the environment.
+keys can be specified per rule\. Depending on the type of operator, this key is also used to export a variable to the environment\.
 .RE
 .PP
 \fBTEST{\fR\fB\fIoctal mode mask\fR\fR\fB}\fR
 .RS 4
-Test the existence of a file. An octal mode mask can be specified if needed.
+Test the existence of a file\. An octal mode mask can be specified if needed\.
 .RE
 .PP
 \fBPROGRAM\fR
 .RS 4
-Execute external program. The key is true, if the program returns with exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout, is available in the RESULT key.
+Execute external program\. The key is true, if the program returns with exit code zero\. The whole event environment is available to the executed program\. The program\'s output printed to stdout, is available in the RESULT key\.
 .RE
 .PP
 \fBRESULT\fR
 .RS 4
-Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call.
+Match the returned string of the last PROGRAM call\. This key can be used in the same or in any later rule after a PROGRAM call\.
 .RE
 .PP
-Most of the fields support a shell style pattern matching. The following pattern characters are supported:
+Most of the fields support a shell style pattern matching\. The following pattern characters are supported:
 .PP
 \fB*\fR
 .RS 4
-Matches zero, or any number of characters.
+Matches zero, or any number of characters\.
 .RE
 .PP
 \fB?\fR
 .RS 4
-Matches any single character.
+Matches any single character\.
 .RE
 .PP
 \fB[]\fR
 .RS 4
-Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched.
+Matches any single character specified within the brackets\. For example, the pattern string \'tty[SR]\' would match either \'ttyS\' or \'ttyR\'\. Ranges are also supported within this match with the \'\-\' character\. For example, to match on the range of all digits, the pattern [0\-9] would be used\. If the first character following the \'[\' is a \'!\', any characters not enclosed are matched\.
 .RE
 .PP
 The following keys can get values assigned:
 .PP
 \fBNAME\fR
 .RS 4
-The name of the node to be created, or the name the network interface should be renamed to. Only one rule can set the node name, all later rules with a NAME key will be ignored.
+The name of the node to be created, or the name the network interface should be renamed to\. Only one rule can set the node name, all later rules with a NAME key will be ignored\.
 .RE
 .PP
 \fBSYMLINK\fR
 .RS 4
-The name of a symlink targeting the node. Every matching rule can add this value to the list of symlinks to be created along with the device node. Multiple symlinks may be specified by separating the names by the space character.
+The name of a symlink targeting the node\. Every matching rule can add this value to the list of symlinks to be created along with the device node\. Multiple symlinks may be specified by separating the names by the space character\.
 .RE
 .PP
 \fBOWNER, GROUP, MODE\fR
 .RS 4
-The permissions for the device node. Every specified value overwrites the compiled\-in default value.
+The permissions for the device node\. Every specified value overwrites the compiled\-in default value\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value that should be written to a sysfs attribute of the event device. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute.
+The value that should be written to a sysfs attribute of the event device\. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Export a variable to the environment. Depending on the type of operator, this key is also to match against an environment variable.
+Export a variable to the environment\. Depending on the type of operator, this key is also to match against an environment variable\.
 .RE
 .PP
 \fBRUN\fR
 .RS 4
-Add a program to the list of programs to be executed for a specific device. This can only be used for very short running tasks. Running an event process for a long period of time may block all further events for this or a dependent device. Long running tasks need to be immediately detached from the event process itself.
+Add a program to the list of programs to be executed for a specific device\. This can only be used for very short running tasks\. Running an event process for a long period of time may block all further events for this or a dependent device\. Long running tasks need to be immediately detached from the event process itself\.
 .RE
 .PP
 \fBLABEL\fR
 .RS 4
-Named label where a GOTO can jump to.
+Named label where a GOTO can jump to\.
 .RE
 .PP
 \fBGOTO\fR
@@ -229,72 +229,68 @@ Jumps to the next LABEL with a matching name
 .RS 4
 Import a set of variables into the event environment, depending on
 \fItype\fR:
-.RS 4
 .PP
 \fBprogram\fR
 .RS 4
-Execute an external program specified as the assigned value and import its output, which must be in environment key format.
+Execute an external program specified as the assigned value and import its output, which must be in environment key format\.
 .RE
 .PP
 \fBfile\fR
 .RS 4
-Import a text file specified as the assigned value, which must be in environment key format.
+Import a text file specified as the assigned value, which must be in environment key format\.
 .RE
 .PP
 \fBparent\fR
 .RS 4
-Import the stored keys from the parent device by reading the database entry of the parent device. The value assigned to
+Import the stored keys from the parent device by reading the database entry of the parent device\. The value assigned to
 \fBIMPORT{parent}\fR
-is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons).
-.RE
+is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons)\.
 .RE
-.IP "" 4
+.sp
 If no option is given, udev will choose between
 \fBprogram\fR
 and
 \fBfile\fR
-based on the executable bit of the file permissions.
+based on the executable bit of the file permissions\.
 .RE
 .PP
 \fBWAIT_FOR_SYSFS\fR
 .RS 4
-Wait for the specified sysfs file of the device to be created. Can be used to fight against kernel sysfs timing issues.
+Wait for the specified sysfs file of the device to be created\. Can be used to fight against kernel sysfs timing issues\.
 .RE
 .PP
 \fBOPTIONS\fR
 .RS 4
 Rule and device options:
-.RS 4
 .PP
 \fBlast_rule\fR
 .RS 4
-Stops further rules application. No later rules will have any effect.
+Stops further rules application\. No later rules will have any effect\.
 .RE
 .PP
 \fBignore_device\fR
 .RS 4
-Ignore this event completely.
+Ignore this event completely\.
 .RE
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device. This may be useful as a workaround for broken device drivers.
+Do not remove the device node when the device goes away\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Specify the priority of the created symlinks. Devices with higher priorities overwrite existing symlinks of other devices.
+Specify the priority of the created symlinks\. Devices with higher priorities overwrite existing symlinks of other devices\.
 .RE
 .PP
 \fBall_partitions\fR
 .RS 4
-Create the device nodes for all available partitions of a block device. This may be useful for removable media devices where media changes are not detected.
+Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
 .RE
 .PP
 \fBstring_escape=\fR\fB\fInone|replace\fR\fR
 .RS 4
-Usually control and other possibly unsafe characters are replaced in strings used for device naming. The mode of replacement can be specified with this option.
-.RE
+Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
 .RE
 .RE
 .PP
@@ -306,23 +302,23 @@ The
 \fBGROUP\fR
 and
 \fBRUN\fR
-fields support simple printf\-like string substitutions. The
+fields support simple printf\-like string substitutions\. The
 \fBRUN\fR
-format chars gets applied after all rules have been processed, right before the program is executed. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are:
+format chars gets applied after all rules have been processed, right before the program is executed\. It allows the use of the complete environment set by earlier matching rules\. For all other fields, substitutions are applied while the individual rule is being processed\. The available substitutions are:
 .PP
 \fB$kernel\fR, \fB%k\fR
 .RS 4
-The kernel name for this device.
+The kernel name for this device\.
 .RE
 .PP
 \fB$number\fR, \fB%n\fR
 .RS 4
-The kernel number for this device. For example, 'sda3' has kernel number of '3'
+The kernel number for this device\. For example, \'sda3\' has kernel number of \'3\'
 .RE
 .PP
 \fB$devpath\fR, \fB%p\fR
 .RS 4
-The devpath of the device.
+The devpath of the device\.
 .RE
 .PP
 \fB$id\fR, \fB%b\fR
@@ -332,85 +328,90 @@ The name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
-\fB$driver\fR, \fB%d\fR
+\fB$driver\fR
 .RS 4
 The driver name of the device matched while searching the devpath upwards for
 \fBSUBSYSTEMS\fR,
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 .RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute. If the attribute is a symlink, the last element of the symlink target is returned as the value.
+The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
 .RE
 .PP
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value of an environment variable.
+The value of an environment variable\.
 .RE
 .PP
 \fB$major\fR, \fB%M\fR
 .RS 4
-The kernel major number for the device.
+The kernel major number for the device\.
 .RE
 .PP
 \fB$minor\fR, \fB%m\fR
 .RS 4
-The kernel minor number for the device.
+The kernel minor number for the device\.
 .RE
 .PP
 \fB$result\fR, \fB%c\fR
 .RS 4
-The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
-\fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted:
+The string returned by the external program requested with PROGRAM\. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
+\fB%c{N}\fR\. If the number is followed by the \'+\' char this part plus all remaining parts of the result string are substituted:
 \fB%c{N+}\fR
 .RE
 .PP
 \fB$parent\fR, \fB%P\fR
 .RS 4
-The node name of the parent device.
+The node name of the parent device\.
+.RE
+.PP
+\fB$name\fR
+.RS 4
+The name of the device node\. The value is only set if an earlier rule assigned a value, or during a remove events\.
 .RE
 .PP
 \fB$root\fR, \fB%r\fR
 .RS 4
-The udev_root value.
+The udev_root value\.
 .RE
 .PP
 \fB$sys\fR, \fB%S\fR
 .RS 4
-The sysfs mount point.
+The sysfs mount point\.
 .RE
 .PP
 \fB$tempnode\fR, \fB%N\fR
 .RS 4
-The name of a created temporary device node to provide access to the device from a external program before the real node is created.
+The name of a created temporary device node to provide access to the device from a external program before the real node is created\.
 .RE
 .PP
 \fB%%\fR
 .RS 4
-The '%' character itself.
+The \'%\' character itself\.
 .RE
 .PP
 \fB$$\fR
 .RS 4
-The '$' character itself.
+The \'$\' character itself\.
 .RE
 .PP
-The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute
+The count of characters to be substituted may be limited by specifying the format length value\. For example, \'%3s{file}\' will only insert the first three characters of the sysfs attribute
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>
+<greg at kroah\.com>
 and Kay Sievers
-<kay.sievers at vrfy.org>. With much help from Dan Stekloff
-<dsteklof at us.ibm.com>
-and many others.
+<kay\.sievers at vrfy\.org>\. With much help from Dan Stekloff
+<dsteklof at us\.ibm\.com>
+and many others\.
 .SH "SEE ALSO"
 .PP
 \fBudevd\fR(8),
diff --git a/udev.h b/udev.h
index f13eb83..33b39aa 100644
--- a/udev.h
+++ b/udev.h
@@ -69,6 +69,7 @@ struct udevice {
 	struct sysfs_device dev_local;
 	struct sysfs_device *dev_parent;	/* current parent device used for matching */
 	char action[NAME_SIZE];
+	char *devpath_old;
 
 	/* node */
 	char name[PATH_SIZE];
@@ -131,6 +132,7 @@ extern int udev_node_remove(struct udevice *udev);
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
+extern int udev_db_rename(const char *devpath_old, const char *devpath);
 extern int udev_db_get_device(struct udevice *udev, const char *devpath);
 extern int udev_db_get_devices_by_name(const char *name, struct list_head *name_list);
 extern int udev_db_get_all_entries(struct list_head *name_list);
diff --git a/udev.xml b/udev.xml
index b43abb7..83a9d75 100644
--- a/udev.xml
+++ b/udev.xml
@@ -416,8 +416,8 @@
                   <varlistentry>
                     <term><option>ignore_remove</option></term>
                     <listitem>
-                      <para>Ignore any later remove event for this device. This may be useful
-                      as a workaround for broken device drivers.</para>
+                      <para>Do not remove the device node when the device goes away. This may be
+                      useful as a workaround for broken device drivers.</para>
                     </listitem>
                   </varlistentry>
                   <varlistentry>
@@ -488,7 +488,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>$driver</option>, <option>%d</option></term>
+              <term><option>$driver</option></term>
               <listitem>
                 <para>The driver name of the device matched while searching the devpath upwards for
                   <option>SUBSYSTEMS</option>, <option>KERNELS</option>, <option>DRIVERS</option> and <option>ATTRS</option>.
@@ -548,6 +548,14 @@
             </varlistentry>
 
             <varlistentry>
+              <term><option>$name</option></term>
+              <listitem>
+                <para>The name of the device node. The value is only set if an earlier
+                rule assigned a value, or during a remove events.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
               <term><option>$root</option>, <option>%r</option></term>
               <listitem>
                 <para>The udev_root value.</para>
diff --git a/udev_db.c b/udev_db.c
index abc1e5a..29aa031 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -117,6 +117,16 @@ out:
 	return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+	char filename[PATH_SIZE];
+	char filename_old[PATH_SIZE];
+
+	devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+	devpath_to_db_path(devpath, filename, sizeof(filename));
+	return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
diff --git a/udev_device.c b/udev_device.c
index 23ba313..62217ff 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -168,6 +168,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
@@ -262,10 +266,6 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* import database entry, and delete it */
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
-			if (udev->ignore_remove) {
-				info("ignore_remove for '%s'", udev->name);
-				goto exit;
-			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
@@ -281,6 +281,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'", udev->name);
+			goto exit;
+		}
 		/* remove the node */
 		retval = udev_node_remove(udev);
 
diff --git a/udev_node.c b/udev_node.c
index fcd52d0..25eed86 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -133,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
 				    stats.st_rdev == stats2.st_rdev) {
 					info("replace device node '%s' with symlink to our node '%s'", slink, node);
 				} else {
-					err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+					err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
 					goto exit;
 				}
 			}
diff --git a/udev_rules.c b/udev_rules.c
index 0dcbf15..dcd0914 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -475,10 +475,12 @@ static int pass_env_to_socket(const char *sockname, const char *devpath, const c
 
 	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
 	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
 		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
 		bufpos++;
 	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
 
 	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
 	if (count < 0)
@@ -604,6 +606,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
 		SUBST_SYS,
 		SUBST_ENV,
@@ -625,6 +628,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
 		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
 		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
 		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
 		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
@@ -843,6 +847,10 @@ found:
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
@@ -986,7 +994,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
-	if (rule->test.operation != KEY_OP_UNSET) {
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
 		char filename[PATH_SIZE];
 		char devpath[PATH_SIZE];
 		char *attr;
@@ -1031,7 +1040,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
 		int found;
 
-		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
 		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
@@ -1464,9 +1473,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET ||
-		    rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
@@ -1477,6 +1491,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				struct name_entry *entry;
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 3afc31a..9e43581 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -469,6 +469,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid TEST operation");
+				goto invalid;
+			}
 			attr = get_key_attribute(key + sizeof("TEST")-1);
 			if (attr != NULL)
 				rule->test_mode_mask = strtol(attr, NULL, 8);
diff --git a/udev_selinux.c b/udev_selinux.c
index 1ad6e8a..3fa84a0 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
diff --git a/udev_sysfs.c b/udev_sysfs.c
index 34ae9ac..d5b04c3 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -355,6 +355,8 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
 
 	dbg("open '%s'/'%s'", devpath, attr_name);
 	sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+	if(sysfs_len >= sizeof(path_full))
+		sysfs_len = sizeof(path_full) - 1;
 	path = &path_full[sysfs_len];
 	strlcat(path_full, devpath, sizeof(path_full));
 	strlcat(path_full, "/", sizeof(path_full));
diff --git a/udevd.8 b/udevd.8
index 25996d1..46edde4 100644
--- a/udevd.8
+++ b/udevd.8
@@ -1,6 +1,6 @@
 .\"     Title: udevd
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevd, udevcontrol
 .\"    Source: udev
@@ -11,7 +11,7 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevd \- event managing daemon
+udevd - event managing daemon
 .SH "SYNOPSIS"
 .HP 6
 \fBudevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\-trace\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
@@ -19,87 +19,87 @@ udevd \- event managing daemon
 \fBudevcontrol \fR\fB\fIcommand\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevd listens to kernel uevents and passes the incoming events to udev. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling.
+udevd listens to kernel uevents and passes the incoming events to udev\. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling\.
 .SH "OPTIONS"
 .PP
 \fB\-\-daemon\fR
 .RS 4
-Detach and run in the background.
+Detach and run in the background\.
 .RE
 .PP
 \fB\-\-debug\-trace\fR
 .RS 4
-Run all events completely serialized. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel.
+Run all events completely serialized\. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel\.
 .RE
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print log messages to stdout.
+Print log messages to stdout\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version number.
+Print version number\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .PP
 \fBlog_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set the internal log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
+Set the internal log level of udevd\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .PP
 \fBstop_exec_queue\fR
 .RS 4
-Signal udevd to stop executing new events. Incoming events will be queued.
+Signal udevd to stop executing new events\. Incoming events will be queued\.
 .RE
 .PP
 \fBstart_exec_queue\fR
 .RS 4
-Signal udevd to enable the execution of events.
+Signal udevd to enable the execution of events\.
 .RE
 .PP
 \fBreload_rules\fR
 .RS 4
-Signal udevd to reload the rules from the config.
+Signal udevd to reload the rules from the config\.
 .RE
 .PP
 \fBenv \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set global variable.
+Set global variable\.
 .RE
 .PP
 \fBmax_childs\fR
 .RS 4
-Set the maximum number of events, udevd will handle at the same time.
+Set the maximum number of events, udevd will handle at the same time\.
 .RE
 .PP
 \fBmax_childs_running\fR
 .RS 4
-Set the maximum number of events, which are allowed to run at the same time.
+Set the maximum number of events, which are allowed to run at the same time\.
 .RE
 .PP
 \fBhelp\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevd.c b/udevd.c
index 8f56de6..5ff5d3f 100644
--- a/udevd.c
+++ b/udevd.c
@@ -130,6 +130,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
 	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+	udev->devpath_old = msg->devpath_old;
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -156,14 +157,14 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	struct udevd_uevent_msg *loop_msg;
 	int fd;
 
-	/* add location of queue files */
+	/* location of queue file */
 	strlcpy(filename, udev_root, sizeof(filename));
 	strlcat(filename, "/", sizeof(filename));
 	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
 	strlcat(filename, msg->devpath, sizeof(filename));
 	path_encode(&filename[start], sizeof(filename) - start);
 
-	/* add location of failed files */
+	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
@@ -174,6 +175,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	case EVENT_QUEUED:
 		unlink(filename_failed);
 		delete_path(filename_failed);
+
 		create_path(filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
@@ -181,10 +183,25 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		return;
 	case EVENT_FINISHED:
 	case EVENT_FAILED:
-		unlink(filename_failed);
-		delete_path(filename_failed);
+		if (msg->devpath_old != NULL) {
+			/* "move" event - rename failed file to current name, do not delete failed */
+			char filename_failed_old[PATH_SIZE];
+
+			strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+			strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+			start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+			strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+			path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+			if (rename(filename_failed_old, filename_failed) == 0)
+				info("renamed devpath, moved failed state of '%s' to %s'",
+				     msg->devpath_old, msg->devpath);
+		} else {
+			unlink(filename_failed);
+			delete_path(filename_failed);
+		}
 
-		/* don't remove, if events for the same path are still pending */
+		/* skip if events for the same path are still pending */
 		list_for_each_entry(loop_msg, &running_list, node)
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
@@ -193,7 +210,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
 
-		/* move failed events to the failed directory */
+		/* move failed event to the failed directory */
 		if (state == EVENT_FAILED) {
 			create_path(filename_failed);
 			rename(filename, filename_failed);
@@ -201,7 +218,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			unlink(filename);
 		}
 
-		/* clean up the queue directory */
+		/* clean up possibly empty queue directory */
 		delete_path(filename);
 
 		return;
@@ -212,7 +229,7 @@ static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
 	list_del(&msg->node);
 
-	/* mark as failed, if add event returns non-zero */
+	/* mark as failed, if "add" event returns non-zero */
 	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
 		export_event_state(msg, EVENT_FAILED);
 	else
@@ -280,6 +297,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
+	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
@@ -469,11 +487,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 		if (loop_msg->seqnum >= msg->seqnum)
 			break;
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still pending %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -481,22 +504,27 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still pending %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 
-	/* check runing-queue for still running events */
+	/* check run queue for still running events */
 	list_for_each_entry(loop_msg, &running_list, node) {
 		if (limit && childs_count++ > limit) {
 			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
 			return 1;
 		}
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still running %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -504,7 +532,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still running %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 	return 0;
@@ -588,6 +616,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
+		else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+			msg->devpath_old = &key[12];
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
 			msg->physdevpath = &key[12];
 		else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
diff --git a/udevd.h b/udevd.h
index 4ca6d1d..9be34cb 100644
--- a/udevd.h
+++ b/udevd.h
@@ -66,6 +66,7 @@ struct udevd_uevent_msg {
 	char *driver;
 	dev_t devt;
 	unsigned long long seqnum;
+	char *devpath_old;
 	char *physdevpath;
 	unsigned int timeout;
 	char *envp[UEVENT_NUM_ENVP+1];
diff --git a/udevinfo.8 b/udevinfo.8
index 337f206..6115f29 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -1,6 +1,6 @@
 .\"     Title: udevinfo
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevinfo
 .\"    Source: udev
@@ -11,32 +11,32 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevinfo \- query udev device information
+udevinfo - query udev device information
 .SH "SYNOPSIS"
 .HP 9
 \fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevinfo queries the udev database for device information stored in the udev database. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device.
+udevinfo queries the udev database for device information stored in the udev database\. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\.
 .SH "OPTIONS"
 .PP
 \fB\-\-query=\fR\fB\fItype\fR\fR
 .RS 4
-Query the database for specified type of device data. It needs the
+Query the database for specified type of device data\. It needs the
 \fB\-\-path\fR
 or
 \fB\-\-name\fR
-to identify the specified device. Valid queries are:
+to identify the specified device\. Valid queries are:
 \fBname\fR,
 \fBsymlink\fR,
 \fBpath\fR,
 \fBenv\fR,
-\fBall\fR.
+\fBall\fR\.
 .RE
 .PP
 \fB\-\-path=\fR\fB\fIdevpath\fR\fR
 .RS 4
-The devpath of the device to query.
+The devpath of the device to query\.
 .RE
 .PP
 \fB\-\-name=\fR\fB\fInode\fR\fR
@@ -47,36 +47,36 @@ The name of the device node or a symlink to query
 \fB\-\-root\fR
 .RS 4
 The udev root directory:
-\fI/dev\fR. If used in conjunction with a
+\fI/dev\fR\. If used in conjunction with a
 \fBname\fR
 or
 \fBsymlink\fR
-query, the query returns the absolute path including the root directory.
+query, the query returns the absolute path including the root directory\.
 .RE
 .PP
 \fB\-\-attribute\-walk\fR
 .RS 4
-Print all sysfs properties of the specified device that can be used in udev rules to match the specified device. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules.
+Print all sysfs properties of the specified device that can be used in udev rules to match the specified device\. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules\.
 .RE
 .PP
 \fB\-\-export\-db\fR
 .RS 4
-Export the content of the udev database.
+Export the content of the udev database\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version.
+Print version\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevinfo.c b/udevinfo.c
index d0b1c44..be9aa76 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -79,6 +79,8 @@ static void print_all_attributes(const char *devpath, const char *key)
 			if (attr_value == NULL)
 				continue;
 			len = strlcpy(value, attr_value, sizeof(value));
+			if(len >= sizeof(value))
+				len = sizeof(value) - 1;
 			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
 			/* remove trailing newlines */
diff --git a/udevmonitor.8 b/udevmonitor.8
index 0adb998..5b624a7 100644
--- a/udevmonitor.8
+++ b/udevmonitor.8
@@ -1,6 +1,6 @@
 .\"     Title: udevmonitor
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevmonitor
 .\"    Source: udev
@@ -11,38 +11,38 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevmonitor \- print the kernel and udev event sequence to the console
+udevmonitor - print the kernel and udev event sequence to the console
 .SH "SYNOPSIS"
 .HP 12
 \fBudevmonitor\fR [\fB\-\-environment\fR] [\fB\-\-kernel\fR] [\fB\-\-udev\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event.
+udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\.
 .SH "OPTIONS"
 .PP
 \fB\-\-environment\fR
 .RS 4
-Print the complete environment for all events. Can be used to compare the kernel supplied and the udev added environment values.
+Print the complete environment for all events\. Can be used to compare the kernel supplied and the udev added environment values\.
 .RE
 .PP
 \fB\-\-kernel\fR
 .RS 4
-Print the kernel uevents.
+Print the kernel uevents\.
 .RE
 .PP
 \fB\-\-udev\fR
 .RS 4
-Print the udev event after the rule processing.
+Print the udev event after the rule processing\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevmonitor.c b/udevmonitor.c
index a9cc061..644a955 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -43,7 +43,6 @@ static int init_udev_monitor_socket(void)
 {
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
-	const int feature_on = 1;
 	int retval;
 
 	memset(&saddr, 0x00, sizeof(saddr));
@@ -67,9 +66,6 @@ static int init_udev_monitor_socket(void)
 		return -1;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
 	return 0;
 }
 
diff --git a/udevsettle.8 b/udevsettle.8
index 818a7ff..39054d9 100644
--- a/udevsettle.8
+++ b/udevsettle.8
@@ -1,6 +1,6 @@
 .\"     Title: udevsettle
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevsettle
 .\"    Source: udev
@@ -11,29 +11,29 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevsettle \- wait until queued kernel/udev events are handled
+udevsettle - wait until queued kernel/udev events are handled
 .SH "SYNOPSIS"
 .HP 11
 \fBudevsettle\fR [\fB\-\-timeout=\fR\fB\fIseconds\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Waits watching the udev event queue and exits if all current events are handled.
+Waits watching the udev event queue and exits if all current events are handled\.
 .SH "OPTIONS"
 .PP
 \fB\-\-timeout=\fR\fB\fIseconds\fR\fR
 .RS 4
-maximum seconds to wait for the queue to become empty.
+maximum seconds to wait for the queue to become empty\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevstart.8 b/udevstart.8
index ac7d070..6b463cf 100644
--- a/udevstart.8
+++ b/udevstart.8
@@ -1,6 +1,6 @@
 .\"     Title: udevstart
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevstart
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevstart \- populate initial device directory
+udevstart - populate initial device directory
 .SH "SYNOPSIS"
 .HP 10
 \fBudevstart\fR
 .SH "DESCRIPTION"
 .PP
-udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules. udevstart is used to create the initial device directory after system bootup.
+udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules\. udevstart is used to create the initial device directory after system bootup\.
 .SH "AUTHOR"
 .PP
 Written by Harald Hoyer
-<harald at redhat.com>.
+<harald at redhat\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtest.8 b/udevtest.8
index 9ab9249..a090465 100644
--- a/udevtest.8
+++ b/udevtest.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtest
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevtest
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtest \- simulate a udev run and print the action to the console
+udevtest - simulate a udev run and print the action to the console
 .SH "SYNOPSIS"
 .HP 21
 \fBudevtest \fR\fB\fIdevice\-path\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed.
+udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed\.
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>.
+<greg at kroah\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.8 b/udevtrigger.8
index 5ef9e8f..06c7e45 100644
--- a/udevtrigger.8
+++ b/udevtrigger.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtrigger
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevtrigger
 .\"    Source: udev
@@ -11,66 +11,66 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtrigger \- request kernel devices events for coldplug
+udevtrigger - request kernel devices events for coldplug
 .SH "SYNOPSIS"
 .HP 12
 \fBudevtrigger\fR [\fB\-\-verbose\fR] [\fB\-\-dry\-run\fR] [\fB\-\-retry\-failed\fR] [\fB\-\-help\fR] [\fB\-\-action=\fR\fB\fIaction\fR\fR] [\fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR] [\fB\-\-attr\-nomatch=\fR\fB\fIattribute=value\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Trigger kernel device uevents to replay missing events at system coldplug.
+Trigger kernel device uevents to replay missing events at system coldplug\.
 .SH "OPTIONS"
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print the list of devices which will be triggered.
+Print the list of devices which will be triggered\.
 .RE
 .PP
 \fB\-\-dry\-run\fR
 .RS 4
-Do not actually trigger the event.
+Do not actually trigger the event\.
 .RE
 .PP
 \fB\-\-retry\-failed\fR
 .RS 4
-Trigger only the events which are failed during a previous run.
+Trigger only the events which are failed during a previous run\.
 .RE
 .PP
 \fB\-\-action=\fR\fB\fIaction\fR\fR
 .RS 4
-Type of event to be triggered. The default value is "add".
+Type of event to be triggered\. The default value is "add"\.
 .RE
 .PP
 \fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Do not trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .PP
 \fB\-\-attr\-nomatch\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Do not trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 and Hannes Reinecke
-<hare at suse.de>.
+<hare at suse\.de>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.c b/udevtrigger.c
index cf8f209..309c54a 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -435,6 +435,8 @@ static void scan_failed(void)
 				continue;
 
 			start = strlcpy(device, sysfs_path, sizeof(device));
+			if(start >= sizeof(device))
+				start = sizeof(device) - 1;
 			strlcat(device, dent->d_name, sizeof(device));
 			path_decode(&device[start]);
 			device_list_insert(device);

udev-115-looplast.patch:

--- NEW FILE udev-115-looplast.patch ---
--- udev-115/etc/udev/rules.d/50-udev-default.rules.looplast	2007-09-07 14:32:01.000000000 +0200
+++ udev-115/etc/udev/rules.d/50-udev-default.rules	2007-09-07 14:33:14.000000000 +0200
@@ -9,6 +9,9 @@ KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*",
 KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
 KERNEL=="tty0",			SYMLINK+="systty"
 
+# loop
+KERNEL=="loop[0-9]", SUBSYSTEM=="block", GROUP="disk", MODE="0640", OPTIONS+="last_rule"
+
 # serial
 KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
 KERNEL=="ppp",			MODE="0600", OPTIONS+="ignore_remove"

udev-115-rulesinstall.patch:

--- NEW FILE udev-115-rulesinstall.patch ---
--- udev-115/Makefile.rulesinstall	2007-09-07 14:46:07.000000000 +0200
+++ udev-115/Makefile	2007-09-07 14:46:38.000000000 +0200
@@ -234,9 +234,9 @@ install-config:
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@ for i in $(shell ls -1 etc/udev/rules.d); do \
-		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
-			$(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+	@ for i in etc/udev/rules.d/*.rules; do \
+		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+			$(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
 		fi \
 	done
 	@ extras="$(EXTRAS)"; for target in $$extras; do \


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- udev.spec	24 Aug 2007 08:37:19 -0000	1.218
+++ udev.spec	7 Sep 2007 12:52:05 -0000	1.219
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -20,6 +20,9 @@
 
 Patch1: udev-089-nopie.patch
 Patch2: udev-091-lib64.patch
+Patch3: udev-115-git-20070907.patch
+Patch4: udev-115-looplast.patch
+Patch5: udev-115-rulesinstall.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -69,6 +72,9 @@
 %setup -q  
 %patch1 -p1 -b .nopie
 %patch2 -p1 -b .lib64
+%patch3 -p1 -b .git20070907
+%patch4 -p1 -b .looplast
+%patch5 -p1 -b .rulesinstall
 
 rm -f etc/udev/redhat/51-hotplug.rules etc/udev/redhat/50* etc/udev/redhat/06*
 %build
@@ -183,7 +189,6 @@
 
 for i in \
 	etc/udev/redhat/*.rules \
-	etc/udev/rules.d/*.rules \
 	etc/udev/packages/40-ia64.rules \
 	etc/udev/packages/40-alsa.rules \
 	etc/udev/packages/40-ppc.rules \
@@ -347,6 +352,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
+- some upstream fixes from git
+- last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)
+
 * Thu Aug 24 2007 Harald Hoyer <harald at redhat.com> - 115-1
 - version 115
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:16:16 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:16:16 -0400
Subject: rpms/qtparted/devel qtparted.pam,1.1,1.2 qtparted.spec,1.22,1.23
Message-ID: <200709071316.l87DGG5e018158@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18102

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Fix qtparted.pam (#237075).


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:15:44 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qtparted.spec	29 Mar 2007 21:54:08 -0000	1.22
+++ qtparted.spec	7 Sep 2007 13:15:44 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
 * Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
 - Rebuild again.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:21:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:21:10 -0400
Subject: rpms/qtparted/F-7 qtparted.pam,1.1,1.2 qtparted.spec,1.22,1.23
Message-ID: <200709071321.l87DLAmw018428@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18389

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/F-7/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:20:38 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/F-7/qtparted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qtparted.spec	29 Mar 2007 21:54:08 -0000	1.22
+++ qtparted.spec	7 Sep 2007 13:20:38 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
 * Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
 - Rebuild again.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:22:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 09:22:01 -0400
Subject: rpms/liboil/devel liboil.spec,1.21,1.22
Message-ID: <200709071322.l87DM19Y018505@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18376

Modified Files:
	liboil.spec 
Log Message:
* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
- Revert the previous commit, it's still broken, see:
  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172



Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- liboil.spec	30 Aug 2007 13:36:23 -0000	1.21
+++ liboil.spec	7 Sep 2007 13:21:28 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -11,7 +11,12 @@
 Patch1: liboil-0.3.9-s390.patch
 # PPC64 isn't being detected properly
 # http://bugzilla.redhat.com/242418
-Patch2: liboil-0.3.12-ppc64-configure.patch
+# Patch2: liboil-0.3.12-ppc64-configure.patch
+
+# Disable PPC altogether, as oil_prototype_from_string() crashes in malloc
+# otherwise
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c16
+Patch2: liboil-0.3.12-disable-altivec.patch
 
 # Fix SIGILL handling for CPU tests
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
@@ -51,10 +56,10 @@
 %patch4 -p0 -b .altivec2
 popd
 
-# Disable automatic use of Altivec by the compiler, so that liboil only
-# uses it when it's available.
-cp configure foo
-sed -i 's/\([^,]\)-maltivec/\1-Wa,-maltivec/' configure
+# Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
+sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure
+sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure
 
 %build
 %configure
@@ -98,6 +103,10 @@
 
 
 %changelog
+* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
+- Revert the previous commit, it's still broken, see:
+  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172
+
 * Thu Aug 30 2007 - David Woodhouse <dwmw2 at infradead.org> - 0.3.12-10
 - Re-enable explicit Altivec but don't let the compiler use it automatically
 - Start applying the ppc64-configure patch again



From fedora-extras-commits at redhat.com  Fri Sep  7 13:26:28 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 09:26:28 -0400
Subject: rpms/libselinux/F-7 libselinux-rhat.patch, 1.121,
	1.122 libselinux.spec, 1.268, 1.269
Message-ID: <200709071326.l87DQSU1018777@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
- fix swig binding for rpm_execcon


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-rhat.patch,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- libselinux-rhat.patch	11 Jul 2007 16:05:02 -0000	1.121
+++ libselinux-rhat.patch	7 Sep 2007 13:26:25 -0000	1.122
@@ -1,1095 +1,6 @@
-diff -up libselinux-2.0.14/src/selinuxswig_wrap.c.rhat libselinux-2.0.14/src/selinuxswig_wrap.c
---- libselinux-2.0.14/src/selinuxswig_wrap.c.rhat	2007-04-24 10:36:20.000000000 -0400
-+++ libselinux-2.0.14/src/selinuxswig_wrap.c	2007-07-11 12:00:41.000000000 -0400
-@@ -2449,11 +2449,11 @@ SWIG_Python_MustGetPtr(PyObject *obj, sw
- /* -------- TYPES TABLE (BEGIN) -------- */
- 
- #define SWIGTYPE_p_SELboolean swig_types[0]
--#define SWIGTYPE_p_access_vector_t swig_types[1]
--#define SWIGTYPE_p_char swig_types[2]
--#define SWIGTYPE_p_int swig_types[3]
--#define SWIGTYPE_p_p_char swig_types[4]
--#define SWIGTYPE_p_p_p_char swig_types[5]
-+#define SWIGTYPE_p_char swig_types[1]
-+#define SWIGTYPE_p_int swig_types[2]
-+#define SWIGTYPE_p_p_char swig_types[3]
-+#define SWIGTYPE_p_p_p_char swig_types[4]
-+#define SWIGTYPE_p_p_security_context_t swig_types[5]
- #define SWIGTYPE_p_security_context_t swig_types[6]
- #define SWIGTYPE_p_unsigned_int swig_types[7]
- static swig_type_info *swig_types[9];
-@@ -2485,6 +2485,99 @@ static swig_module_info swig_module = {s
- 
- 
- 	#include "selinux/selinux.h"
-+	#include "selinux/get_context_list.h"
-+
-+
-+SWIGINTERN swig_type_info*
-+SWIG_pchar_descriptor(void)
-+{
-+  static int init = 0;
-+  static swig_type_info* info = 0;
-+  if (!init) {
-+    info = SWIG_TypeQuery("_p_char");
-+    init = 1;
-+  }
-+  return info;
-+}
-+
-+
-+SWIGINTERNINLINE PyObject *
-+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-+{
-+  if (carray) {
-+    if (size > INT_MAX) {
-+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-+      return pchar_descriptor ? 
-+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
-+    } else {
-+      return PyString_FromStringAndSize(carray, (int)(size));
-+    }
-+  } else {
-+    return SWIG_Py_Void();
-+  }
-+}
-+
-+
-+SWIGINTERNINLINE PyObject * 
-+SWIG_FromCharPtr(const char *cptr)
-+{ 
-+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
-+}
-+
-+
-+SWIGINTERN int
-+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
-+{
-+  if (PyString_Check(obj)) {
-+    char *cstr; Py_ssize_t len;
-+    PyString_AsStringAndSize(obj, &cstr, &len);
-+    if (cptr)  {
-+      if (alloc) {
-+	/* 
-+	   In python the user should not be able to modify the inner
-+	   string representation. To warranty that, if you define
-+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-+	   buffer is always returned.
-+
-+	   The default behavior is just to return the pointer value,
-+	   so, be careful.
-+	*/ 
-+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-+	if (*alloc != SWIG_OLDOBJ) 
-+#else
-+	if (*alloc == SWIG_NEWOBJ) 
-+#endif
-+	  {
-+	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-+	    *alloc = SWIG_NEWOBJ;
-+	  }
-+	else {
-+	  *cptr = cstr;
-+	  *alloc = SWIG_OLDOBJ;
-+	}
-+      } else {
-+	*cptr = PyString_AsString(obj);
-+      }
-+    }
-+    if (psize) *psize = len + 1;
-+    return SWIG_OK;
-+  } else {
-+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-+    if (pchar_descriptor) {
-+      void* vptr = 0;
-+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-+	if (cptr) *cptr = (char *) vptr;
-+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-+	if (alloc) *alloc = SWIG_OLDOBJ;
-+	return SWIG_OK;
-+      }
-+    }
-+  }
-+  return SWIG_TypeError;
-+}
-+
-+
-+
- 
- 
-   #define SWIG_From_long   PyInt_FromLong 
-@@ -2644,74 +2737,6 @@ SWIG_AsVal_int (PyObject * obj, int *val
- }
- 
- 
--SWIGINTERN swig_type_info*
--SWIG_pchar_descriptor(void)
--{
--  static int init = 0;
--  static swig_type_info* info = 0;
--  if (!init) {
--    info = SWIG_TypeQuery("_p_char");
--    init = 1;
--  }
--  return info;
--}
--
--
--SWIGINTERN int
--SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
--{
--  if (PyString_Check(obj)) {
--    char *cstr; Py_ssize_t len;
--    PyString_AsStringAndSize(obj, &cstr, &len);
--    if (cptr)  {
--      if (alloc) {
--	/* 
--	   In python the user should not be able to modify the inner
--	   string representation. To warranty that, if you define
--	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
--	   buffer is always returned.
--
--	   The default behavior is just to return the pointer value,
--	   so, be careful.
--	*/ 
--#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
--	if (*alloc != SWIG_OLDOBJ) 
--#else
--	if (*alloc == SWIG_NEWOBJ) 
--#endif
--	  {
--	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
--	    *alloc = SWIG_NEWOBJ;
--	  }
--	else {
--	  *cptr = cstr;
--	  *alloc = SWIG_OLDOBJ;
--	}
--      } else {
--	*cptr = PyString_AsString(obj);
--      }
--    }
--    if (psize) *psize = len + 1;
--    return SWIG_OK;
--  } else {
--    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--    if (pchar_descriptor) {
--      void* vptr = 0;
--      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
--	if (cptr) *cptr = (char *) vptr;
--	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
--	if (alloc) *alloc = SWIG_OLDOBJ;
--	return SWIG_OK;
--      }
--    }
--  }
--  return SWIG_TypeError;
--}
--
--
--
--
--
- SWIGINTERN int
- SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
- {
-@@ -2781,33 +2806,396 @@ SWIG_AsVal_unsigned_SS_int (PyObject * o
-   return res;
- }
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+SWIGINTERN PyObject *_wrap_get_ordered_context_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t arg2 ;
-+  security_context_t **arg3 = (security_context_t **) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  void *argp3 = 0 ;
-+  int res3 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_ordered_context_list",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_security_context_t, 0 |  0 );
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_ordered_context_list" "', argument " "3"" of type '" "security_context_t **""'"); 
-+  }
-+  arg3 = (security_context_t **)(argp3);
-+  result = (int)get_ordered_context_list((char const *)arg1,arg2,arg3);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_ordered_context_list_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t **arg4 = (security_context_t **) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  void *argp4 = 0 ;
-+  int res4 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  PyObject * obj3 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_ordered_context_list_with_level",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list_with_level" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_ordered_context_list_with_level" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_security_context_t, 0 |  0 );
-+  if (!SWIG_IsOK(res4)) {
-+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "get_ordered_context_list_with_level" "', argument " "4"" of type '" "security_context_t **""'"); 
-+  }
-+  arg4 = (security_context_t **)(argp4);
-+  result = (int)get_ordered_context_list_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t arg2 ;
-+  security_context_t *arg3 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  security_context_t temp3 = NULL ;
-+  char *temp30 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  {
-+    arg3 = &temp3;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OO:get_default_context",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  result = (int)get_default_context((char const *)arg1,arg2,arg3);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg3)
-+    temp30 = *arg3;
-+    else
-+    temp30 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp30));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t *arg4 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  security_context_t temp4 = NULL ;
-+  char *temp40 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  {
-+    arg4 = &temp4;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_level",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_level" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_level" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  result = (int)get_default_context_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg4)
-+    temp40 = *arg4;
-+    else
-+    temp40 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_role(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t *arg4 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  security_context_t temp4 = NULL ;
-+  char *temp40 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  {
-+    arg4 = &temp4;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_role",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_role" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_role" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  result = (int)get_default_context_with_role((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg4)
-+    temp40 = *arg4;
-+    else
-+    temp40 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_rolelevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  char *arg3 = (char *) 0 ;
-+  security_context_t arg4 ;
-+  security_context_t *arg5 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  int res3 ;
-+  char *buf3 = 0 ;
-+  int alloc3 = 0 ;
-+  security_context_t temp5 = NULL ;
-+  char *temp50 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  PyObject * obj3 = 0 ;
-+  
-+  {
-+    arg5 = &temp5;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_default_context_with_rolelevel",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_rolelevel" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_rolelevel" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_default_context_with_rolelevel" "', argument " "3"" of type '" "char const *""'");
-+  }
-+  arg3 = (char *)(buf3);
-+  {
-+    arg4 = (security_context_t)PyString_AsString(obj3);
-+  }
-+  result = (int)get_default_context_with_rolelevel((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg5)
-+    temp50 = *arg5;
-+    else
-+    temp50 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp50));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_query_user_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t *arg1 = (security_context_t *) 0 ;
-+  security_context_t *arg2 = (security_context_t *) 0 ;
-+  int result;
-+  security_context_t temp1 = NULL ;
-+  security_context_t temp2 = NULL ;
-+  char *temp10 = NULL ;
-+  char *temp20 = NULL ;
-+  
-+  {
-+    arg1 = &temp1;
-+  }
-+  {
-+    arg2 = &temp2;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)":query_user_context")) SWIG_fail;
-+  result = (int)query_user_context(arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg1)
-+    temp10 = *arg1;
-+    else
-+    temp10 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
-+  }
-+  {
-+    if (*arg2)
-+    temp20 = *arg2;
-+    else
-+    temp20 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
-+  }
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
- 
--SWIGINTERNINLINE PyObject *
--SWIG_FromCharPtrAndSize(const char* carray, size_t size)
--{
--  if (carray) {
--    if (size > INT_MAX) {
--      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--      return pchar_descriptor ? 
--	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
--    } else {
--      return PyString_FromStringAndSize(carray, (int)(size));
--    }
--  } else {
--    return SWIG_Py_Void();
-+SWIGINTERN PyObject *_wrap_manual_user_enter_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t *arg2 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  security_context_t temp2 = NULL ;
-+  char *temp20 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  
-+  {
-+    arg2 = &temp2;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"O:manual_user_enter_context",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "manual_user_enter_context" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  result = (int)manual_user_enter_context((char const *)arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg2)
-+    temp20 = *arg2;
-+    else
-+    temp20 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
-   }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
- }
- 
- 
--SWIGINTERNINLINE PyObject * 
--SWIG_FromCharPtr(const char *cptr)
--{ 
--  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
--}
--
--#ifdef __cplusplus
--extern "C" {
--#endif
- SWIGINTERN PyObject *_wrap_is_selinux_enabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   int result;
-@@ -2834,6 +3222,48 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_freecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t arg1 ;
-+  PyObject * obj0 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"O:freecon",&obj0)) SWIG_fail;
-+  {
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-+  }
-+  freecon(arg1);
-+  resultobj = SWIG_Py_Void();
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_freeconary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t *arg1 = (security_context_t *) 0 ;
-+  security_context_t temp1 = NULL ;
-+  char *temp10 = NULL ;
-+  
-+  {
-+    arg1 = &temp1;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)":freeconary")) SWIG_fail;
-+  freeconary(arg1);
-+  resultobj = SWIG_Py_Void();
-+  {
-+    if (*arg1)
-+    temp10 = *arg1;
-+    else
-+    temp10 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
-+  }
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_getcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   security_context_t *arg1 = (security_context_t *) 0 ;
-@@ -3777,6 +4207,55 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_matchpathcon_init_prefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:matchpathcon_init_prefix",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchpathcon_init_prefix" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "matchpathcon_init_prefix" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  result = (int)matchpathcon_init_prefix((char const *)arg1,(char const *)arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_matchpathcon_fini(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)":matchpathcon_fini")) SWIG_fail;
-+  matchpathcon_fini();
-+  resultobj = SWIG_Py_Void();
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_matchmediacon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   char *arg1 = (char *) 0 ;
-@@ -3994,6 +4473,19 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_selinux_securetty_types_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *result = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)":selinux_securetty_types_path")) SWIG_fail;
-+  result = (char *)selinux_securetty_types_path();
-+  resultobj = SWIG_FromCharPtr((const char *)result);
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_selinux_booleans_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   char *result = 0 ;
-@@ -4085,27 +4577,17 @@ fail:
- }
- 
- 
--SWIGINTERN PyObject *_wrap_selinux_check_passwd_access(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_selinux_check_securetty_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
--  access_vector_t arg1 ;
-+  security_context_t arg1 ;
-   int result;
--  void *argp1 ;
--  int res1 = 0 ;
-   PyObject * obj0 = 0 ;
-   
--  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_passwd_access",&obj0)) SWIG_fail;
-+  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_securetty_context",&obj0)) SWIG_fail;
-   {
--    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
--    if (!SWIG_IsOK(res1)) {
--      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'"); 
--    }  
--    if (!argp1) {
--      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'");
--    } else {
--      arg1 = *((access_vector_t *)(argp1));
--    }
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-   }
--  result = (int)selinux_check_passwd_access(arg1);
-+  result = (int)selinux_check_securetty_context(arg1);
-   resultobj = SWIG_From_int((int)(result));
-   return resultobj;
- fail:
-@@ -4113,30 +4595,26 @@ fail:
- }
- 
- 
--SWIGINTERN PyObject *_wrap_checkPasswdAccess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_set_selinuxmnt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
--  access_vector_t arg1 ;
--  int result;
--  void *argp1 ;
--  int res1 = 0 ;
-+  char *arg1 = (char *) 0 ;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-   PyObject * obj0 = 0 ;
-   
--  if (!PyArg_ParseTuple(args,(char *)"O:checkPasswdAccess",&obj0)) SWIG_fail;
--  {
--    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
--    if (!SWIG_IsOK(res1)) {
--      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'"); 
--    }  
--    if (!argp1) {
--      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'");
--    } else {
--      arg1 = *((access_vector_t *)(argp1));
--    }
-+  if (!PyArg_ParseTuple(args,(char *)"O:set_selinuxmnt",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_selinuxmnt" "', argument " "1"" of type '" "char *""'");
-   }
--  result = (int)checkPasswdAccess(arg1);
--  resultobj = SWIG_From_int((int)(result));
-+  arg1 = (char *)(buf1);
-+  set_selinuxmnt(arg1);
-+  resultobj = SWIG_Py_Void();
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-   return resultobj;
- fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-   return NULL;
- }
- 
-@@ -4153,6 +4631,10 @@ SWIGINTERN PyObject *_wrap_rpm_execcon(P
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
-+  void *argp3 = 0 ;
-+  int res3 = 0 ;
-+  void *argp4 = 0 ;
-+  int res4 = 0 ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -4169,58 +4651,16 @@ SWIGINTERN PyObject *_wrap_rpm_execcon(P
-     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
-   }
-   arg2 = (char *)(buf2);
--  {
--    /* Check if is a list */
--    if (PyList_Check(obj2)) {
--      int size = PyList_Size(obj2);
--      int i = 0;
--      arg3 = (char **) malloc((size+1)*sizeof(char *));
--      if (arg3 == NULL) {
--        PyErr_SetString(PyExc_MemoryError,"Out of memory");
--        return NULL;
--      }
--      for (i = 0; i < size; i++) {
--        PyObject *o = PyList_GetItem(obj2,i);
--        if (PyString_Check(o))
--        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
--        else {
--          PyErr_SetString(PyExc_TypeError,"list must contain strings");
--          free(arg3);
--          return NULL;
--        }
--      }
--      arg3[i] = 0;
--    } else {
--      PyErr_SetString(PyExc_TypeError,"not a list");
--      return NULL;
--    }
--  }
--  {
--    /* Check if is a list */
--    if (PyList_Check(obj3)) {
--      int size = PyList_Size(obj3);
--      int i = 0;
--      arg4 = (char **) malloc((size+1)*sizeof(char *));
--      if (arg4 == NULL) {
--        PyErr_SetString(PyExc_MemoryError,"Out of memory");
--        return NULL;
--      }
--      for (i = 0; i < size; i++) {
--        PyObject *o = PyList_GetItem(obj3,i);
--        if (PyString_Check(o))
--        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
--        else {
--          PyErr_SetString(PyExc_TypeError,"list must contain strings");
--          free(arg4);
--          return NULL;
--        }
--      }
--      arg4[i] = 0;
--    } else {
--      PyErr_SetString(PyExc_TypeError,"not a list");
--      return NULL;
--    }
-+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char **""'"); 
-+  }
-+  arg3 = (char **)(argp3);
-+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
-+  if (!SWIG_IsOK(res4)) {
-+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char **""'"); 
-   }
-+  arg4 = (char **)(argp4);
-   result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
-   resultobj = SWIG_From_int((int)(result));
-   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-@@ -4387,9 +4827,101 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_selinux_file_context_cmp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t arg1 ;
-+  security_context_t arg2 ;
-+  int result;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_cmp",&obj0,&obj1)) SWIG_fail;
-+  {
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-+  }
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  result = (int)selinux_file_context_cmp(arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_selinux_file_context_verify(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  mode_t arg2 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  unsigned int val2 ;
-+  int ecode2 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_verify",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_file_context_verify" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-+  if (!SWIG_IsOK(ecode2)) {
-+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "selinux_file_context_verify" "', argument " "2"" of type '" "mode_t""'");
-+  } 
-+  arg2 = (mode_t)(val2);
-+  result = (int)selinux_file_context_verify((char const *)arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_selinux_lsetfilecon_default(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"O:selinux_lsetfilecon_default",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_lsetfilecon_default" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  result = (int)selinux_lsetfilecon_default((char const *)arg1);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
- static PyMethodDef SwigMethods[] = {
-+	 { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL},
-+	 { (char *)"get_ordered_context_list_with_level", _wrap_get_ordered_context_list_with_level, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context", _wrap_get_default_context, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_level", _wrap_get_default_context_with_level, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_role", _wrap_get_default_context_with_role, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_rolelevel", _wrap_get_default_context_with_rolelevel, METH_VARARGS, NULL},
-+	 { (char *)"query_user_context", _wrap_query_user_context, METH_VARARGS, NULL},
-+	 { (char *)"manual_user_enter_context", _wrap_manual_user_enter_context, METH_VARARGS, NULL},
- 	 { (char *)"is_selinux_enabled", _wrap_is_selinux_enabled, METH_VARARGS, NULL},
- 	 { (char *)"is_selinux_mls_enabled", _wrap_is_selinux_mls_enabled, METH_VARARGS, NULL},
-+	 { (char *)"freecon", _wrap_freecon, METH_VARARGS, NULL},
-+	 { (char *)"freeconary", _wrap_freeconary, METH_VARARGS, NULL},
- 	 { (char *)"getcon", _wrap_getcon, METH_VARARGS, NULL},
- 	 { (char *)"setcon", _wrap_setcon, METH_VARARGS, NULL},
- 	 { (char *)"getpidcon", _wrap_getpidcon, METH_VARARGS, NULL},
-@@ -4426,6 +4958,8 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"set_matchpathcon_flags", _wrap_set_matchpathcon_flags, METH_VARARGS, NULL},
- 	 { (char *)"matchpathcon_init", _wrap_matchpathcon_init, METH_VARARGS, NULL},
- 	 { (char *)"matchpathcon", _wrap_matchpathcon, METH_VARARGS, NULL},
-+	 { (char *)"matchpathcon_init_prefix", _wrap_matchpathcon_init_prefix, METH_VARARGS, NULL},
-+	 { (char *)"matchpathcon_fini", _wrap_matchpathcon_fini, METH_VARARGS, NULL},
- 	 { (char *)"matchmediacon", _wrap_matchmediacon, METH_VARARGS, NULL},
- 	 { (char *)"selinux_getenforcemode", _wrap_selinux_getenforcemode, METH_VARARGS, NULL},
- 	 { (char *)"selinux_policy_root", _wrap_selinux_policy_root, METH_VARARGS, NULL},
-@@ -4440,6 +4974,7 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"selinux_homedir_context_path", _wrap_selinux_homedir_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_media_context_path", _wrap_selinux_media_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_contexts_path", _wrap_selinux_contexts_path, METH_VARARGS, NULL},
-+	 { (char *)"selinux_securetty_types_path", _wrap_selinux_securetty_types_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_booleans_path", _wrap_selinux_booleans_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_customizable_types_path", _wrap_selinux_customizable_types_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_users_path", _wrap_selinux_users_path, METH_VARARGS, NULL},
-@@ -4447,14 +4982,17 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"selinux_translations_path", _wrap_selinux_translations_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_netfilter_context_path", _wrap_selinux_netfilter_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_path", _wrap_selinux_path, METH_VARARGS, NULL},
--	 { (char *)"selinux_check_passwd_access", _wrap_selinux_check_passwd_access, METH_VARARGS, NULL},
--	 { (char *)"checkPasswdAccess", _wrap_checkPasswdAccess, METH_VARARGS, NULL},
-+	 { (char *)"selinux_check_securetty_context", _wrap_selinux_check_securetty_context, METH_VARARGS, NULL},
-+	 { (char *)"set_selinuxmnt", _wrap_set_selinuxmnt, METH_VARARGS, NULL},
- 	 { (char *)"rpm_execcon", _wrap_rpm_execcon, METH_VARARGS, NULL},
- 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
- 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
- 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
- 	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
- 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
-+	 { (char *)"selinux_file_context_cmp", _wrap_selinux_file_context_cmp, METH_VARARGS, NULL},
-+	 { (char *)"selinux_file_context_verify", _wrap_selinux_file_context_verify, METH_VARARGS, NULL},
-+	 { (char *)"selinux_lsetfilecon_default", _wrap_selinux_lsetfilecon_default, METH_VARARGS, NULL},
- 	 { NULL, NULL, 0, NULL }
- };
- 
-@@ -4462,41 +5000,41 @@ static PyMethodDef SwigMethods[] = {
- /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
- 
- static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0};
--static swig_type_info _swigt__p_access_vector_t = {"_p_access_vector_t", "access_vector_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***", 0, 0, (void*)0, 0};
-+static swig_type_info _swigt__p_p_security_context_t = {"_p_p_security_context_t", "security_context_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_security_context_t = {"_p_security_context_t", "security_context_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|mode_t *", 0, 0, (void*)0, 0};
- 
- static swig_type_info *swig_type_initial[] = {
-   &_swigt__p_SELboolean,
--  &_swigt__p_access_vector_t,
-   &_swigt__p_char,
-   &_swigt__p_int,
-   &_swigt__p_p_char,
-   &_swigt__p_p_p_char,
-+  &_swigt__p_p_security_context_t,
-   &_swigt__p_security_context_t,
-   &_swigt__p_unsigned_int,
- };
- 
- static swig_cast_info _swigc__p_SELboolean[] = {  {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}};
--static swig_cast_info _swigc__p_access_vector_t[] = {  {&_swigt__p_access_vector_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
-+static swig_cast_info _swigc__p_p_security_context_t[] = {  {&_swigt__p_p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_security_context_t[] = {  {&_swigt__p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
- 
- static swig_cast_info *swig_cast_initial[] = {
-   _swigc__p_SELboolean,
--  _swigc__p_access_vector_t,
-   _swigc__p_char,
-   _swigc__p_int,
-   _swigc__p_p_char,
-   _swigc__p_p_p_char,
-+  _swigc__p_p_security_context_t,
-   _swigc__p_security_context_t,
-   _swigc__p_unsigned_int,
- };
-@@ -5019,6 +5557,7 @@ SWIGEXPORT void SWIG_init(void) {
-   SWIG_InstallConstants(d,swig_const_table);
-   
-   
-+  SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
-   SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
-   SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
- }
 diff -up libselinux-2.0.14/src/selinuxswig.i.rhat libselinux-2.0.14/src/selinuxswig.i
 --- libselinux-2.0.14/src/selinuxswig.i.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/src/selinuxswig.i	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/src/selinuxswig.i	2007-09-07 09:21:26.000000000 -0400
 @@ -21,6 +21,7 @@
  %module selinux
  %{
@@ -1139,10 +50,10 @@
 -extern int checkPasswdAccess(access_vector_t requested);
 +#extern int selinux_check_passwd_access(access_vector_t requested);
 +#extern int checkPasswdAccess(access_vector_t requested);
- 
++
 +extern int selinux_check_securetty_context(security_context_t tty_context);
 +void set_selinuxmnt(char *mnt);
-+
+ 
 +#ifdef SWIGpython
  // This tells SWIG to treat char ** as a special case
 -%typemap(python,in) char ** {
@@ -1150,15 +61,59 @@
    /* Check if is a list */
    if (PyList_Check($input)) {
      int size = PyList_Size($input);
-@@ -143,6 +158,7 @@ extern int checkPasswdAccess(access_vect
+@@ -143,10 +158,48 @@ extern int checkPasswdAccess(access_vect
      return NULL;
    }
  }
 +#endif
  
- extern int rpm_execcon(unsigned int verified, 
- 		       const char *filename, 
-@@ -164,3 +180,7 @@ extern int selinux_raw_to_trans_context(
+-extern int rpm_execcon(unsigned int verified, 
+-		       const char *filename, 
+-		       char **, char **);
++%typemap(in) char * const [] {
++	int i, size;
++	PyObject * s;
++
++	if (!PySequence_Check($input)) {
++		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
++		return NULL;
++	}
++
++	size = PySequence_Size($input);
++	
++	$1 = (char**) malloc(size + 1);
++
++	for(i = 0; i < size; i++) {
++		if (!PyString_Check(PySequence_GetItem($input, i))) {
++			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
++			return NULL;
++		}
++	}
++		
++	for(i = 0; i < size; i++) {
++		s = PySequence_GetItem($input, i);
++		$1[i] = (char*) malloc(PyString_Size(s) + 1);
++		strcpy($1[i], PyString_AsString(s));
++	}
++	$1[size] = NULL;
++}
++
++%typemap(freearg,match="in") char * const [] {
++	int i = 0;
++	while($1[i]) {
++		free($1[i]);
++		i++;
++	}
++	free($1);
++}
++
++extern int rpm_execcon(unsigned int verified,
++		       const char *filename,
++		       char *const argv[], char *const envp[]);
+ 
+ extern int is_context_customizable (security_context_t scontext);
+ 
+@@ -164,3 +217,7 @@ extern int selinux_raw_to_trans_context(
  }
  extern int selinux_getpolicytype(char **enforce);
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
@@ -1168,7 +123,7 @@
 +int selinux_lsetfilecon_default(const char *path);
 diff -up libselinux-2.0.14/src/selinux.py.rhat libselinux-2.0.14/src/selinux.py
 --- libselinux-2.0.14/src/selinux.py.rhat	2007-04-24 10:36:20.000000000 -0400
-+++ libselinux-2.0.14/src/selinux.py	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/src/selinux.py	2007-09-07 09:17:52.000000000 -0400
 @@ -48,8 +48,19 @@ except AttributeError:
  del types
  
@@ -1226,8 +181,8 @@
  
  
 diff -up libselinux-2.0.14/include/selinux/flask.h.rhat libselinux-2.0.14/include/selinux/flask.h
---- libselinux-2.0.14/include/selinux/flask.h.rhat	2007-07-11 12:02:16.000000000 -0400
-+++ libselinux-2.0.14/include/selinux/flask.h	2007-07-11 12:02:23.000000000 -0400
+--- libselinux-2.0.14/include/selinux/flask.h.rhat	2007-04-24 10:36:21.000000000 -0400
++++ libselinux-2.0.14/include/selinux/flask.h	2007-09-07 09:17:52.000000000 -0400
 @@ -64,6 +64,8 @@
  #define SECCLASS_PACKET                                  57
  #define SECCLASS_KEY                                     58
@@ -1238,8 +193,8 @@
  /*
   * Security identifier indices for initial entities
 diff -up libselinux-2.0.14/include/selinux/av_permissions.h.rhat libselinux-2.0.14/include/selinux/av_permissions.h
---- libselinux-2.0.14/include/selinux/av_permissions.h.rhat	2007-07-11 12:02:07.000000000 -0400
-+++ libselinux-2.0.14/include/selinux/av_permissions.h	2007-07-11 12:02:09.000000000 -0400
+--- libselinux-2.0.14/include/selinux/av_permissions.h.rhat	2007-04-24 10:36:21.000000000 -0400
++++ libselinux-2.0.14/include/selinux/av_permissions.h	2007-09-07 09:17:52.000000000 -0400
 @@ -290,12 +290,16 @@
  #define NODE__RAWIP_RECV                          0x00000010UL
  #define NODE__RAWIP_SEND                          0x00000020UL
@@ -1297,7 +252,7 @@
 +#define MEMPROTECT__MMAP_ZERO                     0x00000001UL
 diff -up libselinux-2.0.14/man/man8/selinux.8.rhat libselinux-2.0.14/man/man8/selinux.8
 --- libselinux-2.0.14/man/man8/selinux.8.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man8/selinux.8	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man8/selinux.8	2007-09-07 09:17:52.000000000 -0400
 @@ -62,14 +62,13 @@ compile-time tunable options and a set o
  .B system-config-securitylevel
  allows customization of these booleans and tunables.
@@ -1316,7 +271,7 @@
  .SH AUTHOR	
 diff -up libselinux-2.0.14/man/man8/matchpathcon.8.rhat libselinux-2.0.14/man/man8/matchpathcon.8
 --- libselinux-2.0.14/man/man8/matchpathcon.8.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man8/matchpathcon.8	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man8/matchpathcon.8	2007-09-07 09:17:52.000000000 -0400
 @@ -10,16 +10,16 @@ Prints the file path and the default sec
  .SH OPTIONS
  .B \-n
@@ -1340,7 +295,7 @@
  
 diff -up libselinux-2.0.14/man/man3/avc_compute_create.3.rhat libselinux-2.0.14/man/man3/avc_compute_create.3
 --- libselinux-2.0.14/man/man3/avc_compute_create.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_compute_create.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_compute_create.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_compute_create \- obtain SELinux label for new object.
  .SH "SYNOPSIS"
@@ -1352,7 +307,7 @@
  .BI "int avc_compute_create(security_id_t " ssid ", security_id_t " tsid ,
 diff -up libselinux-2.0.14/man/man3/getexeccon.3.rhat libselinux-2.0.14/man/man3/getexeccon.3
 --- libselinux-2.0.14/man/man3/getexeccon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getexeccon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getexeccon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -1,16 +1,16 @@
  .TH "getexeccon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -1395,7 +350,7 @@
  runs a helper for rpm in an appropriate security context.  The
 diff -up libselinux-2.0.14/man/man3/getfilecon.3.rhat libselinux-2.0.14/man/man3/getfilecon.3
 --- libselinux-2.0.14/man/man3/getfilecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getfilecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getfilecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,9 +5,9 @@ getfilecon, fgetfilecon, lgetfilecon \- 
  .B #include <selinux/selinux.h>
  .sp
@@ -1418,7 +373,7 @@
  .SH "RETURN VALUE"
 diff -up libselinux-2.0.14/man/man3/selinux_binary_policy_path.3.rhat libselinux-2.0.14/man/man3/selinux_binary_policy_path.3
 --- libselinux-2.0.14/man/man3/selinux_binary_policy_path.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_binary_policy_path.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_binary_policy_path.3	2007-09-07 09:17:52.000000000 -0400
 @@ -10,27 +10,27 @@ directories and files.
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
@@ -1460,7 +415,7 @@
  
 diff -up libselinux-2.0.14/man/man3/security_class_to_string.3.rhat libselinux-2.0.14/man/man3/security_class_to_string.3
 --- libselinux-2.0.14/man/man3/security_class_to_string.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_class_to_string.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_class_to_string.3	2007-09-07 09:17:52.000000000 -0400
 @@ -8,7 +8,7 @@ between SELinux class and permission val
  
  .SH "SYNOPSIS"
@@ -1472,7 +427,7 @@
  .BI "const char * security_class_to_string(security_class_t " tclass ");"
 diff -up libselinux-2.0.14/man/man3/getfscreatecon.3.rhat libselinux-2.0.14/man/man3/getfscreatecon.3
 --- libselinux-2.0.14/man/man3/getfscreatecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getfscreatecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getfscreatecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@ getfscreatecon, setfscreatecon \- get or
  .B #include <selinux/selinux.h>
  .sp
@@ -1498,7 +453,7 @@
  save, reset, and restore the fscreate context to avoid unexpected behaviors.
 diff -up libselinux-2.0.14/man/man3/freecon.3.rhat libselinux-2.0.14/man/man3/freecon.3
 --- libselinux-2.0.14/man/man3/freecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/freecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/freecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ freecon, freeconary \- free memory assoc
  .B #include <selinux/selinux.h>
  .sp
@@ -1510,7 +465,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/security_getenforce.3.rhat libselinux-2.0.14/man/man3/security_getenforce.3
 --- libselinux-2.0.14/man/man3/security_getenforce.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_getenforce.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_getenforce.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ security_getenforce, security_setenforce
  .B #include <selinux/selinux.h>
  .sp
@@ -1522,7 +477,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/selinux_getenforcemode.3.rhat libselinux-2.0.14/man/man3/selinux_getenforcemode.3
 --- libselinux-2.0.14/man/man3/selinux_getenforcemode.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_getenforcemode.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_getenforcemode.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,13 +5,13 @@ selinux_getenforcemode \- get the enforc
  .B #include <selinux/selinux.h>
  .sp
@@ -1541,7 +496,7 @@
  Sets the value of enforce to -1 if SELinux should be disabled.
 diff -up libselinux-2.0.14/man/man3/matchmediacon.3.rhat libselinux-2.0.14/man/man3/matchmediacon.3
 --- libselinux-2.0.14/man/man3/matchmediacon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/matchmediacon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/matchmediacon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,14 +6,14 @@ matchmediacon \- get the default SELinux
  .B #include <selinux/selinux.h>
  .sp
@@ -1562,7 +517,7 @@
  .SH "RETURN VALUE"
 diff -up libselinux-2.0.14/man/man3/getseuserbyname.3.rhat libselinux-2.0.14/man/man3/getseuserbyname.3
 --- libselinux-2.0.14/man/man3/getseuserbyname.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getseuserbyname.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getseuserbyname.3	2007-09-07 09:17:52.000000000 -0400
 @@ -12,7 +12,7 @@ a given Linux username.  The SELinux use
  then be passed to other libselinux functions such as 
  get_ordered_context_list_with_level and get_default_context_with_level.
@@ -1574,7 +529,7 @@
  using free.  
 diff -up libselinux-2.0.14/man/man3/is_context_customizable.3.rhat libselinux-2.0.14/man/man3/is_context_customizable.3
 --- libselinux-2.0.14/man/man3/is_context_customizable.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/is_context_customizable.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/is_context_customizable.3	2007-09-07 09:17:52.000000000 -0400
 @@ -8,7 +8,7 @@ is_context_customizable \- check whether
  
  .SH "DESCRIPTION"
@@ -1586,7 +541,7 @@
  
 diff -up libselinux-2.0.14/man/man3/security_compute_av.3.rhat libselinux-2.0.14/man/man3/security_compute_av.3
 --- libselinux-2.0.14/man/man3/security_compute_av.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_compute_av.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_compute_av.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@ the SELinux policy database in the kerne
  
  .SH "SYNOPSIS"
@@ -1598,7 +553,7 @@
  .BI "int security_compute_av(security_context_t "scon ", security_context_t "tcon ", security_class_t "tclass ", access_vector_t "requested ", struct av_decision *" avd );
 diff -up libselinux-2.0.14/man/man3/setfilecon.3.rhat libselinux-2.0.14/man/man3/setfilecon.3
 --- libselinux-2.0.14/man/man3/setfilecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/setfilecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/setfilecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,9 +6,9 @@ setfilecon, fsetfilecon, lsetfilecon \- 
  .B #include <selinux/selinux.h>
  .sp
@@ -1613,7 +568,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/matchpathcon.3.rhat libselinux-2.0.14/man/man3/matchpathcon.3
 --- libselinux-2.0.14/man/man3/matchpathcon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/matchpathcon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/matchpathcon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,18 +6,18 @@ matchpathcon \- get the default SELinux 
  .B #include <selinux/selinux.h>
  .sp
@@ -1694,7 +649,7 @@
  Returns 0 on success or -1 otherwise.
 diff -up libselinux-2.0.14/man/man3/avc_init.3.rhat libselinux-2.0.14/man/man3/avc_init.3
 --- libselinux-2.0.14/man/man3/avc_init.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_init.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_init.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,17 +6,17 @@
  avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown.
  .SH "SYNOPSIS"
@@ -1719,7 +674,7 @@
  .sp
 diff -up libselinux-2.0.14/man/man3/security_load_booleans.3.rhat libselinux-2.0.14/man/man3/security_load_booleans.3
 --- libselinux-2.0.14/man/man3/security_load_booleans.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_load_booleans.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_load_booleans.3	2007-09-07 09:17:52.000000000 -0400
 @@ -7,15 +7,15 @@ security_get_boolean_pending \- routines
  .B #include <selinux/selinux.h>
  .sp
@@ -1777,7 +732,7 @@
  .SH AUTHOR	
 diff -up libselinux-2.0.14/man/man3/avc_add_callback.3.rhat libselinux-2.0.14/man/man3/avc_add_callback.3
 --- libselinux-2.0.14/man/man3/avc_add_callback.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_add_callback.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_add_callback.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,26 +6,26 @@
  avc_add_callback \- additional event notification for SELinux userspace object managers.
  .SH "SYNOPSIS"
@@ -1814,7 +769,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/avc_has_perm.3.rhat libselinux-2.0.14/man/man3/avc_has_perm.3
 --- libselinux-2.0.14/man/man3/avc_has_perm.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_has_perm.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_has_perm.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_has_perm, avc_has_perm_noaudit, avc_audit, avc_entry_ref_init \- obtain and audit SELinux access decisions.
  .SH "SYNOPSIS"
@@ -1851,7 +806,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/get_ordered_context_list.3.rhat libselinux-2.0.14/man/man3/get_ordered_context_list.3
 --- libselinux-2.0.14/man/man3/get_ordered_context_list.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/get_ordered_context_list.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/get_ordered_context_list.3	2007-09-07 09:17:52.000000000 -0400
 @@ -4,7 +4,7 @@ get_ordered_context_list, get_ordered_co
  
  .SH "SYNOPSIS"
@@ -1863,7 +818,7 @@
  .BI "int get_ordered_context_list(const char *" user ", security_context_t "fromcon ", security_context_t **" list );
 diff -up libselinux-2.0.14/man/man3/getcon.3.rhat libselinux-2.0.14/man/man3/getcon.3
 --- libselinux-2.0.14/man/man3/getcon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getcon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getcon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -1,21 +1,21 @@
  .TH "getcon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -1894,7 +849,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/avc_cache_stats.3.rhat libselinux-2.0.14/man/man3/avc_cache_stats.3
 --- libselinux-2.0.14/man/man3/avc_cache_stats.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_cache_stats.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_cache_stats.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics.
  .SH "SYNOPSIS"
@@ -1906,7 +861,7 @@
  .BI "void avc_av_stats(void);"
 diff -up libselinux-2.0.14/man/man3/avc_context_to_sid.3.rhat libselinux-2.0.14/man/man3/avc_context_to_sid.3
 --- libselinux-2.0.14/man/man3/avc_context_to_sid.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_context_to_sid.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_context_to_sid.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_context_to_sid, avc_sid_to_context, sidput, sidget, avc_get_initial_sid \- obtain and manipulate SELinux security ID's.
  .SH "SYNOPSIS"
@@ -1918,7 +873,7 @@
  .BI "int avc_context_to_sid(security_context_t " ctx ", security_id_t *" sid ");"
 diff -up libselinux-2.0.14/man/man3/selinux_policy_root.3.rhat libselinux-2.0.14/man/man3/selinux_policy_root.3
 --- libselinux-2.0.14/man/man3/selinux_policy_root.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_policy_root.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_policy_root.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ selinux_policy_root \- return the path o
  .B #include <selinux/selinux.h>
  .sp
@@ -1930,7 +885,7 @@
  .B selinux_policy_root
 diff -up libselinux-2.0.14/man/man3/context_new.3.rhat libselinux-2.0.14/man/man3/context_new.3
 --- libselinux-2.0.14/man/man3/context_new.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/context_new.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/context_new.3	2007-09-07 09:17:52.000000000 -0400
 @@ -4,27 +4,27 @@ context_new, context_str, context_free, 
  
  .SH "SYNOPSIS"
@@ -1972,7 +927,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/Makefile.rhat libselinux-2.0.14/Makefile
 --- libselinux-2.0.14/Makefile.rhat	2007-04-24 10:36:19.000000000 -0400
-+++ libselinux-2.0.14/Makefile	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/Makefile	2007-09-07 09:17:52.000000000 -0400
 @@ -2,6 +2,9 @@ all: 
  	$(MAKE) -C src 
  	$(MAKE) -C utils


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- libselinux.spec	11 Aug 2007 10:32:35 -0000	1.268
+++ libselinux.spec	7 Sep 2007 13:26:25 -0000	1.269
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -122,6 +122,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
+- fix swig binding for rpm_execcon
+
 * Fri Aug 10 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-5
 - Move libselinux.so to devel package
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:38:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:38:10 -0400
Subject: rpms/qtparted/FC-6 qtparted.pam,1.1,1.2 qtparted.spec,1.19,1.20
Message-ID: <200709071338.l87DcABe019420@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19358

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/FC-6/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:37:38 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/FC-6/qtparted.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qtparted.spec	8 Mar 2007 00:39:19 -0000	1.19
+++ qtparted.spec	7 Sep 2007 13:37:38 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        12%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,15 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
+* Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
+- Rebuild again.
+
+* Tue Mar 20 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-13
+- Rebuild.
+
 * Tue Jan 16 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-12
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:12 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:12 -0400
Subject: devel/vim 7.1.088,NONE,1.1
Message-ID: <200709071403.l87E3CEs026731@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719

Added Files:
	7.1.088 
Log Message:
- patchlevel 88


--- NEW FILE 7.1.088 ---
To: vim-dev at vim.org
Subject: patch 7.1.088 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.088 (extra)
Problem:    The coordinates used by ":winpos" differ from what getwinposx()
	    and getwinposy() return.
Solution:   Use MoveWindowStructure() instead of MoveWindow(). (Michael Henry)
Files:	    src/gui_mac.c


*** ../vim-7.1.087/src/gui_mac.c	Tue Jun 19 16:33:53 2007
--- src/gui_mac.c	Wed Aug 29 20:33:34 2007
***************
*** 3149,3155 ****
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindow(gui.VimWindow, x, y, TRUE);
  }
  
      void
--- 3149,3155 ----
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y, TRUE);
  }
  
      void
***************
*** 5556,5562 ****
   * SetDialogTracksCursor() : Get the I-beam cursor over input box
   * MoveDialogItem():	    Probably better than SetDialogItem
   * SizeDialogItem():		(but is it Carbon Only?)
!  * AutoSizeDialog():	    Magic resize of dialog based on text lenght
   */
  }
  #endif /* FEAT_DIALOG_GUI */
--- 5556,5562 ----
   * SetDialogTracksCursor() : Get the I-beam cursor over input box
   * MoveDialogItem():	    Probably better than SetDialogItem
   * SizeDialogItem():		(but is it Carbon Only?)
!  * AutoSizeDialog():	    Magic resize of dialog based on text length
   */
  }
  #endif /* FEAT_DIALOG_GUI */
*** ../vim-7.1.087/src/version.c	Tue Aug 21 18:02:58 2007
--- src/version.c	Thu Aug 30 10:32:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     88,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10E. You start counting in hex.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:19 -0400
Subject: devel/vim 7.1.089,NONE,1.1
Message-ID: <200709071403.l87E3Jeq026767@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26751

Added Files:
	7.1.089 
Log Message:
- patchlevel 89


--- NEW FILE 7.1.089 ---
To: vim-dev at vim.org
Subject: patch 7.1.089
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.089
Problem:    ":let loaded_getscriptPlugin" doesn't clear to eol, result is
	    "#1in".
Solution:   Clear to the end of the screen after displaying the first variable
	    value.
Files:	    src/eval.c


*** ../vim-7.1.088/src/eval.c	Tue Aug 14 22:40:13 2007
--- src/eval.c	Wed Aug 29 22:40:15 2007
***************
*** 369,385 ****
  static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
  static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
  static char_u *skip_var_one __ARGS((char_u *arg));
! static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty));
! static void list_glob_vars __ARGS((void));
! static void list_buf_vars __ARGS((void));
! static void list_win_vars __ARGS((void));
  #ifdef FEAT_WINDOWS
! static void list_tab_vars __ARGS((void));
  #endif
! static void list_vim_vars __ARGS((void));
! static void list_script_vars __ARGS((void));
! static void list_func_vars __ARGS((void));
! static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg));
  static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
  static int check_changedtick __ARGS((char_u *arg));
  static char_u *get_lval __ARGS((char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int quiet, int fne_flags));
--- 369,385 ----
  static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
  static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
  static char_u *skip_var_one __ARGS((char_u *arg));
! static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty, int *first));
! static void list_glob_vars __ARGS((int *first));
! static void list_buf_vars __ARGS((int *first));
! static void list_win_vars __ARGS((int *first));
  #ifdef FEAT_WINDOWS
! static void list_tab_vars __ARGS((int *first));
  #endif
! static void list_vim_vars __ARGS((int *first));
! static void list_script_vars __ARGS((int *first));
! static void list_func_vars __ARGS((int *first));
! static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg, int *first));
  static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
  static int check_changedtick __ARGS((char_u *arg));
  static char_u *get_lval __ARGS((char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int quiet, int fne_flags));
***************
*** 704,711 ****
  static hashtab_T *find_var_ht __ARGS((char_u *name, char_u **varname));
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
! static void list_one_var __ARGS((dictitem_T *v, char_u *prefix));
! static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string));
  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
  static int var_check_ro __ARGS((int flags, char_u *name));
  static int var_check_fixed __ARGS((int flags, char_u *name));
--- 704,711 ----
  static hashtab_T *find_var_ht __ARGS((char_u *name, char_u **varname));
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
! static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
! static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string, int *first));
  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
  static int var_check_ro __ARGS((int flags, char_u *name));
  static int var_check_fixed __ARGS((int flags, char_u *name));
***************
*** 1699,1704 ****
--- 1699,1705 ----
      int		semicolon = 0;
      char_u	op[2];
      char_u	*argend;
+     int		first = TRUE;
  
      argend = skip_var_list(arg, &var_count, &semicolon);
      if (argend == NULL)
***************
*** 1715,1733 ****
  	    EMSG(_(e_invarg));
  	else if (!ends_excmd(*arg))
  	    /* ":let var1 var2" */
! 	    arg = list_arg_vars(eap, arg);
  	else if (!eap->skip)
  	{
  	    /* ":let" */
! 	    list_glob_vars();
! 	    list_buf_vars();
! 	    list_win_vars();
  #ifdef FEAT_WINDOWS
! 	    list_tab_vars();
  #endif
! 	    list_script_vars();
! 	    list_func_vars();
! 	    list_vim_vars();
  	}
  	eap->nextcmd = check_nextcmd(arg);
      }
--- 1716,1734 ----
  	    EMSG(_(e_invarg));
  	else if (!ends_excmd(*arg))
  	    /* ":let var1 var2" */
! 	    arg = list_arg_vars(eap, arg, &first);
  	else if (!eap->skip)
  	{
  	    /* ":let" */
! 	    list_glob_vars(&first);
! 	    list_buf_vars(&first);
! 	    list_win_vars(&first);
  #ifdef FEAT_WINDOWS
! 	    list_tab_vars(&first);
  #endif
! 	    list_script_vars(&first);
! 	    list_func_vars(&first);
! 	    list_vim_vars(&first);
  	}
  	eap->nextcmd = check_nextcmd(arg);
      }
***************
*** 1932,1941 ****
   * If "empty" is TRUE also list NULL strings as empty strings.
   */
      static void
! list_hashtable_vars(ht, prefix, empty)
      hashtab_T	*ht;
      char_u	*prefix;
      int		empty;
  {
      hashitem_T	*hi;
      dictitem_T	*di;
--- 1933,1943 ----
   * If "empty" is TRUE also list NULL strings as empty strings.
   */
      static void
! list_hashtable_vars(ht, prefix, empty, first)
      hashtab_T	*ht;
      char_u	*prefix;
      int		empty;
+     int		*first;
  {
      hashitem_T	*hi;
      dictitem_T	*di;
***************
*** 1950,1956 ****
  	    di = HI2DI(hi);
  	    if (empty || di->di_tv.v_type != VAR_STRING
  					   || di->di_tv.vval.v_string != NULL)
! 		list_one_var(di, prefix);
  	}
      }
  }
--- 1952,1958 ----
  	    di = HI2DI(hi);
  	    if (empty || di->di_tv.v_type != VAR_STRING
  					   || di->di_tv.vval.v_string != NULL)
! 		list_one_var(di, prefix, first);
  	}
      }
  }
***************
*** 1959,1990 ****
   * List global variables.
   */
      static void
! list_glob_vars()
  {
!     list_hashtable_vars(&globvarht, (char_u *)"", TRUE);
  }
  
  /*
   * List buffer variables.
   */
      static void
! list_buf_vars()
  {
      char_u	numbuf[NUMBUFLEN];
  
!     list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:", TRUE);
  
      sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
!     list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER, numbuf);
  }
  
  /*
   * List window variables.
   */
      static void
! list_win_vars()
  {
!     list_hashtable_vars(&curwin->w_vars.dv_hashtab, (char_u *)"w:", TRUE);
  }
  
  #ifdef FEAT_WINDOWS
--- 1961,1998 ----
   * List global variables.
   */
      static void
! list_glob_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&globvarht, (char_u *)"", TRUE, first);
  }
  
  /*
   * List buffer variables.
   */
      static void
! list_buf_vars(first)
!     int *first;
  {
      char_u	numbuf[NUMBUFLEN];
  
!     list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:",
! 								 TRUE, first);
  
      sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
!     list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER,
! 							       numbuf, first);
  }
  
  /*
   * List window variables.
   */
      static void
! list_win_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&curwin->w_vars.dv_hashtab,
! 						 (char_u *)"w:", TRUE, first);
  }
  
  #ifdef FEAT_WINDOWS
***************
*** 1992,2000 ****
   * List tab page variables.
   */
      static void
! list_tab_vars()
  {
!     list_hashtable_vars(&curtab->tp_vars.dv_hashtab, (char_u *)"t:", TRUE);
  }
  #endif
  
--- 2000,2010 ----
   * List tab page variables.
   */
      static void
! list_tab_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&curtab->tp_vars.dv_hashtab,
! 						 (char_u *)"t:", TRUE, first);
  }
  #endif
  
***************
*** 2002,2040 ****
   * List Vim variables.
   */
      static void
! list_vim_vars()
  {
!     list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE);
  }
  
  /*
   * List script-local variables, if there is a script.
   */
      static void
! list_script_vars()
  {
      if (current_SID > 0 && current_SID <= ga_scripts.ga_len)
! 	list_hashtable_vars(&SCRIPT_VARS(current_SID), (char_u *)"s:", FALSE);
  }
  
  /*
   * List function variables, if there is a function.
   */
      static void
! list_func_vars()
  {
      if (current_funccal != NULL)
  	list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
! 						       (char_u *)"l:", FALSE);
  }
  
  /*
   * List variables in "arg".
   */
      static char_u *
! list_arg_vars(eap, arg)
      exarg_T	*eap;
      char_u	*arg;
  {
      int		error = FALSE;
      int		len;
--- 2012,2055 ----
   * List Vim variables.
   */
      static void
! list_vim_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE, first);
  }
  
  /*
   * List script-local variables, if there is a script.
   */
      static void
! list_script_vars(first)
!     int *first;
  {
      if (current_SID > 0 && current_SID <= ga_scripts.ga_len)
! 	list_hashtable_vars(&SCRIPT_VARS(current_SID),
! 						(char_u *)"s:", FALSE, first);
  }
  
  /*
   * List function variables, if there is a function.
   */
      static void
! list_func_vars(first)
!     int *first;
  {
      if (current_funccal != NULL)
  	list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
! 						(char_u *)"l:", FALSE, first);
  }
  
  /*
   * List variables in "arg".
   */
      static char_u *
! list_arg_vars(eap, arg, first)
      exarg_T	*eap;
      char_u	*arg;
+     int		*first;
  {
      int		error = FALSE;
      int		len;
***************
*** 2091,2105 ****
  			{
  			    switch (*name)
  			    {
! 				case 'g': list_glob_vars(); break;
! 				case 'b': list_buf_vars(); break;
! 				case 'w': list_win_vars(); break;
  #ifdef FEAT_WINDOWS
! 				case 't': list_tab_vars(); break;
  #endif
! 				case 'v': list_vim_vars(); break;
! 				case 's': list_script_vars(); break;
! 				case 'l': list_func_vars(); break;
  				default:
  					  EMSG2(_("E738: Can't list variables for %s"), name);
  			    }
--- 2106,2120 ----
  			{
  			    switch (*name)
  			    {
! 				case 'g': list_glob_vars(first); break;
! 				case 'b': list_buf_vars(first); break;
! 				case 'w': list_win_vars(first); break;
  #ifdef FEAT_WINDOWS
! 				case 't': list_tab_vars(first); break;
  #endif
! 				case 'v': list_vim_vars(first); break;
! 				case 's': list_script_vars(first); break;
! 				case 'l': list_func_vars(first); break;
  				default:
  					  EMSG2(_("E738: Can't list variables for %s"), name);
  			    }
***************
*** 2116,2122 ****
  			    *arg = NUL;
  			    list_one_var_a((char_u *)"",
  				    arg == arg_subsc ? name : name_start,
! 				    tv.v_type, s == NULL ? (char_u *)"" : s);
  			    *arg = c;
  			    vim_free(tf);
  			}
--- 2131,2139 ----
  			    *arg = NUL;
  			    list_one_var_a((char_u *)"",
  				    arg == arg_subsc ? name : name_start,
! 				    tv.v_type,
! 				    s == NULL ? (char_u *)"" : s,
! 				    first);
  			    *arg = c;
  			    vim_free(tf);
  			}
***************
*** 18001,18009 ****
   * List the value of one internal variable.
   */
      static void
! list_one_var(v, prefix)
      dictitem_T	*v;
      char_u	*prefix;
  {
      char_u	*tofree;
      char_u	*s;
--- 18024,18033 ----
   * List the value of one internal variable.
   */
      static void
! list_one_var(v, prefix, first)
      dictitem_T	*v;
      char_u	*prefix;
+     int		*first;
  {
      char_u	*tofree;
      char_u	*s;
***************
*** 18011,18026 ****
  
      s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
! 						s == NULL ? (char_u *)"" : s);
      vim_free(tofree);
  }
  
      static void
! list_one_var_a(prefix, name, type, string)
      char_u	*prefix;
      char_u	*name;
      int		type;
      char_u	*string;
  {
      /* don't use msg() or msg_attr() to avoid overwriting "v:statusmsg" */
      msg_start();
--- 18035,18051 ----
  
      s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
! 					 s == NULL ? (char_u *)"" : s, first);
      vim_free(tofree);
  }
  
      static void
! list_one_var_a(prefix, name, type, string, first)
      char_u	*prefix;
      char_u	*name;
      int		type;
      char_u	*string;
+     int		*first;  /* when TRUE clear rest of screen and set to FALSE */
  {
      /* don't use msg() or msg_attr() to avoid overwriting "v:statusmsg" */
      msg_start();
***************
*** 18052,18057 ****
--- 18077,18087 ----
  
      if (type == VAR_FUNC)
  	msg_puts((char_u *)"()");
+     if (*first)
+     {
+ 	msg_clr_eos();
+ 	*first = FALSE;
+     }
  }
  
  /*
*** ../vim-7.1.088/src/version.c	Thu Aug 30 10:34:19 2007
--- src/version.c	Thu Aug 30 11:06:32 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     89,
  /**/

-- 
Edison's greatest achievement came in 1879, when he invented the
electric company.  Edison's design was a brilliant adaptation of the
simple electrical circuit: the electric company sends electricity
through a wire to a customer, then immediately gets the electricity
back through another wire

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:27 -0400
Subject: devel/vim 7.1.090,NONE,1.1
Message-ID: <200709071403.l87E3Rhm026799@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26788

Added Files:
	7.1.090 
Log Message:
- patchlevel 90


--- NEW FILE 7.1.090 ---
To: vim-dev at vim.org
Subject: patch 7.1.090
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.090
Problem:    Compiler warning on Mac OS X 10.5.
Solution:   Don't redeclare sigaltstack(). (Hisashi T Fujinaka)
Files:	    src/os_unix.c


*** ../vim-7.1.089/src/os_unix.c	Sat Aug 11 22:22:56 2007
--- src/os_unix.c	Wed Aug 22 22:28:48 2007
***************
*** 753,759 ****
      if (signal_stack != NULL)
      {
  # ifdef HAVE_SIGALTSTACK
! #  ifdef __APPLE__
  	/* missing prototype.  Adding it to osdef?.h.in doesn't work, because
  	 * "struct sigaltstack" needs to be declared. */
  	extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct sigaltstack *oss));
--- 753,760 ----
      if (signal_stack != NULL)
      {
  # ifdef HAVE_SIGALTSTACK
! #  if defined(__APPLE__) && (!defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
! 		|| MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
  	/* missing prototype.  Adding it to osdef?.h.in doesn't work, because
  	 * "struct sigaltstack" needs to be declared. */
  	extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct sigaltstack *oss));
***************
*** 5688,5694 ****
  
  /*
   * Closes connection to gpm
!  * returns non-zero if connection succesfully closed
   */
      static void
  gpm_close()
--- 5689,5695 ----
  
  /*
   * Closes connection to gpm
!  * returns non-zero if connection successfully closed
   */
      static void
  gpm_close()
*** ../vim-7.1.089/src/version.c	Thu Aug 30 11:10:38 2007
--- src/version.c	Thu Aug 30 11:46:07 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     90,
  /**/

-- 
       We're knights of the round table
       We dance whene'er we're able
       We do routines and chorus scenes
       With footwork impeccable.
       We dine well here in Camelot
       We eat ham and jam and spam a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:35 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:35 -0400
Subject: devel/vim 7.1.091,NONE,1.1
Message-ID: <200709071403.l87E3ZU7026830@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26819

Added Files:
	7.1.091 
Log Message:
- patchlevel 91


--- NEW FILE 7.1.091 ---
To: vim-dev at vim.org
Subject: patch 7.1.091 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.091 (extra)
Problem:    Win32: Can't embed Vim inside another application.
Solution:   Add the --windowid argument. (Nageshwar)
Files:	    runtime/doc/gui_w32.txt, runtime/doc/starting.txt,
	    runtime/doc/vi_diff.txt, src/globals.h, src/gui_w32.c, src/main.c


*** ../vim-7.1.090/runtime/doc/gui_w32.txt	Sat May 12 15:35:53 2007
--- runtime/doc/gui_w32.txt	Tue Aug 14 17:32:27 2007
***************
*** 1,4 ****
! *gui_w32.txt*   For Vim version 7.1.  Last change: 2007 May 03
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *gui_w32.txt*   For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 52,57 ****
--- 52,67 ----
  								*gui-w32s*
  There is a specific version of gvim.exe that runs under the Win32s subsystem
  of Windows 3.1 or 3.11.  See |win32s|.
+ 
+ 
+ Using Vim as a plugin					*gui-w32-windowid*
+ 
+ When gvim starts up normally, it creates its own top level window.  If you
+ pass Vim the command-line option |--windowid| with a decimal or hexadecimal
+ value, Vim will create a window that is a child of the window with the given
+ ID.  This enables Vim to act as a plugin in another application.  This really
+ is a programmer's interface, and is of no use without a supporting application
+ to spawn Vim correctly.
  
  ==============================================================================
  2. Vim as default editor				*vim-default-editor*
*** ../vim-7.1.090/runtime/doc/starting.txt	Sat May 12 16:56:17 2007
--- runtime/doc/starting.txt	Tue Aug 14 17:34:22 2007
***************
*** 1,4 ****
! *starting.txt*  For Vim version 7.1.  Last change: 2007 May 12
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *starting.txt*  For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 547,552 ****
--- 547,557 ----
  		GTK+ GUI Vim only.  Make gvim try to use GtkPlug mechanism, so
  		that it runs inside another window.  See |gui-gtk-socketid|
  		for details. {not in Vi}
+ 
+ --windowid {id}						*--windowid*
+ 		Win32 GUI Vim only.  Make gvim try to use the window {id} as a
+ 		parent, so that it runs inside that window.  See
+ 		|gui-w32-windowid| for details. {not in Vi}
  
  --echo-wid						*--echo-wid*
  		GTK+ GUI Vim only.  Make gvim echo the Window ID on stdout,
*** ../vim-7.1.090/runtime/doc/vi_diff.txt	Sat May 12 14:54:28 2007
--- runtime/doc/vi_diff.txt	Tue Aug 14 17:35:10 2007
***************
*** 1,4 ****
! *vi_diff.txt*   For Vim version 7.1.  Last change: 2007 May 07
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *vi_diff.txt*   For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 826,831 ****
--- 826,833 ----
  --servername {name}	Vim: Specify Vim server name
  
  --socketid {id}		Vim: GTK window socket to run Vim in
+ 
+ --windowid {id}		Vim: Win32 window ID to run Vim in
  
  --version	Vim: show version message and exit.
  
*** ../vim-7.1.090/src/globals.h	Thu May 10 19:26:02 2007
--- src/globals.h	Wed Aug 29 22:27:45 2007
***************
*** 876,882 ****
  EXTERN int no_mapping INIT(= FALSE);	/* currently no mapping allowed */
  EXTERN int no_zero_mapping INIT(= 0);	/* mapping zero not allowed */
  EXTERN int allow_keys INIT(= FALSE);	/* allow key codes when no_mapping
! 					     * is set */
  EXTERN int no_u_sync INIT(= 0);		/* Don't call u_sync() */
  
  EXTERN int restart_edit INIT(= 0);	/* call edit when next cmd finished */
--- 876,882 ----
  EXTERN int no_mapping INIT(= FALSE);	/* currently no mapping allowed */
  EXTERN int no_zero_mapping INIT(= 0);	/* mapping zero not allowed */
  EXTERN int allow_keys INIT(= FALSE);	/* allow key codes when no_mapping
! 					 * is set */
  EXTERN int no_u_sync INIT(= 0);		/* Don't call u_sync() */
  
  EXTERN int restart_edit INIT(= 0);	/* call edit when next cmd finished */
***************
*** 1250,1255 ****
--- 1250,1263 ----
  #ifdef FEAT_GUI_GTK
  EXTERN guint32	gtk_socket_id INIT(= 0);
  EXTERN int	echo_wid_arg INIT(= FALSE);	/* --echo-wid argument */
+ #endif
+ 
+ #ifdef FEAT_GUI_W32
+ /*
+  * The value of the --windowid argument.
+  * For embedding gvim inside another application.
+  */
+ EXTERN int	win_socket_id INIT(= 0);
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
*** ../vim-7.1.090/src/gui_w32.c	Tue Aug 14 16:57:04 2007
--- src/gui_w32.c	Tue Aug 14 17:13:41 2007
***************
*** 23,28 ****
--- 23,30 ----
   * e.g., replace LONG with LONG_PTR, etc.
   */
  
+ #include "vim.h"
+ 
  /*
   * These are new in Windows ME/XP, only defined in recent compilers.
   */
***************
*** 1432,1447 ****
  	}
      }
      else
! 	/* Open toplevel window. */
  	s_hwnd = CreateWindow(
! 	    szVimWndClass, "Vim MSWindows GUI",
! 	    WS_OVERLAPPEDWINDOW,
! 	    gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x,
! 	    gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y,
! 	    100,				/* Any value will do */
! 	    100,				/* Any value will do */
! 	    NULL, NULL,
! 	    s_hinst, NULL);
  
      if (s_hwnd == NULL)
  	return FAIL;
--- 1434,1462 ----
  	}
      }
      else
!     {
! 	/* If the provided windowid is not valid reset it to zero, so that it
! 	 * is ignored and we open our own window. */
! 	if (IsWindow((HWND)win_socket_id) <= 0)
! 	    win_socket_id = 0;
! 
! 	/* Create a window.  If win_socket_id is not zero without border and
! 	 * titlebar, it will be reparented below. */
  	s_hwnd = CreateWindow(
! 		szVimWndClass, "Vim MSWindows GUI",
! 		win_socket_id == 0 ? WS_OVERLAPPEDWINDOW : WS_POPUP,
! 		gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x,
! 		gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y,
! 		100,				/* Any value will do */
! 		100,				/* Any value will do */
! 		NULL, NULL,
! 		s_hinst, NULL);
! 	if (s_hwnd != NULL && win_socket_id != 0)
! 	{
! 	    SetParent(s_hwnd, (HWND)win_socket_id);
! 	    ShowWindow(s_hwnd, SW_SHOWMAXIMIZED);
! 	}
!     }
  
      if (s_hwnd == NULL)
  	return FAIL;
*** ../vim-7.1.090/src/main.c	Fri Aug 10 21:32:41 2007
--- src/main.c	Tue Aug 14 17:22:52 2007
***************
*** 275,280 ****
--- 275,281 ----
       *   -display or --display
       *   --server...
       *   --socketid
+      *   --windowid
       */
      early_arg_scan(&params);
  
***************
*** 1489,1495 ****
   * Get the name of the display, before gui_prepare() removes it from
   * argv[].  Used for the xterm-clipboard display.
   *
!  * Also find the --server... arguments and --socketid
   */
  /*ARGSUSED*/
      static void
--- 1490,1496 ----
   * Get the name of the display, before gui_prepare() removes it from
   * argv[].  Used for the xterm-clipboard display.
   *
!  * Also find the --server... arguments and --socketid and --windowid
   */
  /*ARGSUSED*/
      static void
***************
*** 1536,1559 ****
  #  endif
  	}
  # endif
! # ifdef FEAT_GUI_GTK
  	else if (STRICMP(argv[i], "--socketid") == 0)
  	{
! 	    unsigned int    socket_id;
  	    int		    count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), "%x", &socket_id);
  	    else
! 		count = sscanf(argv[i+1], "%u", &socket_id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
! 		gtk_socket_id = socket_id;
  	    i++;
  	}
  	else if (STRICMP(argv[i], "--echo-wid") == 0)
  	    echo_wid_arg = TRUE;
  # endif
--- 1537,1571 ----
  #  endif
  	}
  # endif
! 
! # if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
! #  ifdef FEAT_GUI_W32
! 	else if (STRICMP(argv[i], "--windowid") == 0)
! #  else
  	else if (STRICMP(argv[i], "--socketid") == 0)
+ #  endif
  	{
! 	    unsigned int    id;
  	    int		    count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), "%x", &id);
  	    else
! 		count = sscanf(argv[i+1], "%u", &id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
! #  ifdef FEAT_GUI_W32
! 		win_socket_id = id;
! #  else
! 		gtk_socket_id = id;
! #  endif
  	    i++;
  	}
+ # endif
+ # ifdef FEAT_GUI_GTK
  	else if (STRICMP(argv[i], "--echo-wid") == 0)
  	    echo_wid_arg = TRUE;
  # endif
***************
*** 1683,1690 ****
  		    }
  		}
  #endif
! #ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "socketid", 8) == 0)
  		{
  		    /* already processed -- snatch the following arg */
  		    if (argc > 1)
--- 1695,1706 ----
  		    }
  		}
  #endif
! #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
! # ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "socketid", 8) == 0)
+ # else
+ 		else if (STRNICMP(argv[0] + argv_idx, "windowid", 8) == 0)
+ # endif
  		{
  		    /* already processed -- snatch the following arg */
  		    if (argc > 1)
***************
*** 1693,1698 ****
--- 1709,1716 ----
  			++argv;
  		    }
  		}
+ #endif
+ #ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "echo-wid", 8) == 0)
  		{
  		    /* already processed, skip */
***************
*** 3120,3125 ****
--- 3138,3144 ----
  #endif
  #ifdef FEAT_GUI_W32
      main_msg(_("-P <parent title>\tOpen Vim inside parent application"));
+     main_msg(_("--windowid <HWND>\tOpen Vim inside another win32 widget"));
  #endif
  
  #ifdef FEAT_GUI_GNOME
*** ../vim-7.1.090/src/version.c	Thu Aug 30 11:46:46 2007
--- src/version.c	Thu Aug 30 12:21:02 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     91,
  /**/

-- 
       We're knights of the Round Table
       Our shows are formidable
       But many times
       We're given rhymes
       That are quite unsingable
       We're opera mad in Camelot
       We sing from the diaphragm a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:42 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:42 -0400
Subject: devel/vim 7.1.092,NONE,1.1
Message-ID: <200709071403.l87E3gBl026860@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849

Added Files:
	7.1.092 
Log Message:
- patchlevel 92


--- NEW FILE 7.1.092 ---
To: vim-dev at vim.org
Subject: patch 7.1.092 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.092 (extra, after 7.1.088)
Problem:    Wrong arguments for MoveWindowStructure().
Solution:   Remove "TRUE". (Michael Henry)
Files:	    src/gui_mac.c


*** ../vim-7.1.091/src/gui_mac.c	Thu Aug 30 10:34:19 2007
--- src/gui_mac.c	Thu Aug 30 12:48:41 2007
***************
*** 3149,3155 ****
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y, TRUE);
  }
  
      void
--- 3149,3155 ----
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y);
  }
  
      void
***************
*** 5293,5299 ****
      short	itemType;
      short	useIcon;
      short	width;
!     short	totalButtonWidth = 0;   /* the width of all button together
  					   including spacing */
      short	widestButton = 0;
      short	dfltButtonEdge     = 20;  /* gut feeling */
--- 5293,5299 ----
      short	itemType;
      short	useIcon;
      short	width;
!     short	totalButtonWidth = 0;   /* the width of all buttons together
  					   including spacing */
      short	widestButton = 0;
      short	dfltButtonEdge     = 20;  /* gut feeling */
***************
*** 5483,5489 ****
      {
  
  	macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
! 	/* With vertical, it's better to have all button the same lenght */
  	if (vertical)
  	{
  	    macSizeDialogItem(theDialog, button, widestButton, 0);
--- 5483,5489 ----
      {
  
  	macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
! 	/* With vertical, it's better to have all buttons the same length */
  	if (vertical)
  	{
  	    macSizeDialogItem(theDialog, button, widestButton, 0);
*** ../vim-7.1.091/src/version.c	Thu Aug 30 12:24:21 2007
--- src/version.c	Thu Aug 30 12:47:24 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     92,
  /**/

-- 
       In war we're tough and able.
       Quite indefatigable
       Between our quests
       We sequin vests
       And impersonate Clark Gable
       It's a busy life in Camelot.
       I have to push the pram a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:49 -0400
Subject: devel/vim 7.1.093,NONE,1.1
Message-ID: <200709071403.l87E3nkW026890@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879

Added Files:
	7.1.093 
Log Message:
- patchlevel 93


--- NEW FILE 7.1.093 ---
To: vim-dev at vim.org
Subject: patch 7.1.093
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.093
Problem:    Reading past end of a screen line when determining cell width.
	    (Dominique Pelle)
Solution:   Add an argument to mb_off2cells() for the maximum offset.
Files:	    src/globals.h, src/gui.c, src/mbyte.c, src/proto/mbyte.pro,
	    src/screen.c


*** ../vim-7.1.092/src/globals.h	Thu Aug 30 12:24:21 2007
--- src/globals.h	Wed Aug 29 22:27:45 2007
***************
*** 801,807 ****
  EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
  EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
  EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
! EXTERN int (*mb_off2cells) __ARGS((unsigned off)) INIT(= latin_off2cells);
  EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
  EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);
  
--- 801,807 ----
  EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
  EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
  EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
! EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
  EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
  EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);
  
*** ../vim-7.1.092/src/gui.c	Wed Aug 15 20:07:53 2007
--- src/gui.c	Wed Aug 29 22:16:51 2007
***************
*** 1080,1086 ****
  		cur_width = gui.char_width;
  	    }
  #ifdef FEAT_MBYTE
! 	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col) > 1)
  	    {
  		/* Double wide character. */
  		if (shape_table[idx].shape != SHAPE_VER)
--- 1080,1087 ----
  		cur_width = gui.char_width;
  	    }
  #ifdef FEAT_MBYTE
! 	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col,
! 				    LineOffset[gui.row] + screen_Columns) > 1)
  	    {
  		/* Double wide character. */
  		if (shape_table[idx].shape != SHAPE_VER)
***************
*** 1159,1165 ****
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
!  	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
--- 1160,1166 ----
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
! 	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
*** ../vim-7.1.092/src/mbyte.c	Sat Aug 11 13:57:31 2007
--- src/mbyte.c	Thu Aug 30 13:48:30 2007
***************
*** 1310,1329 ****
  /*
   * mb_off2cells() function pointer.
   * Return number of display cells for char at ScreenLines[off].
!  * Caller must make sure "off" and "off + 1" are valid!
   */
  /*ARGSUSED*/
      int
! latin_off2cells(off)
      unsigned	off;
  {
      return 1;
  }
  
      int
! dbcs_off2cells(off)
      unsigned	off;
  {
      /* Number of cells is equal to number of bytes, except for euc-jp when
       * the first byte is 0x8e. */
      if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
--- 1310,1335 ----
  /*
   * mb_off2cells() function pointer.
   * Return number of display cells for char at ScreenLines[off].
!  * We make sure that the offset used is less than "max_off".
   */
  /*ARGSUSED*/
      int
! latin_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
      return 1;
  }
  
      int
! dbcs_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
+     /* never check beyond end of the line */
+     if (off >= max_off)
+ 	return 1;
+ 
      /* Number of cells is equal to number of bytes, except for euc-jp when
       * the first byte is 0x8e. */
      if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
***************
*** 1332,1341 ****
  }
  
      int
! utf_off2cells(off)
      unsigned	off;
  {
!     return ScreenLines[off + 1] == 0 ? 2 : 1;
  }
  
  /*
--- 1338,1348 ----
  }
  
      int
! utf_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
!     return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1;
  }
  
  /*
***************
*** 2899,2910 ****
      if (composing_hangul)
  	return TRUE;
  #endif
!     if (enc_dbcs != 0)
! 	return dbcs_off2cells(LineOffset[row] + col) > 1;
!     if (enc_utf8)
! 	return (col + 1 < Columns
! 		&& ScreenLines[LineOffset[row] + col + 1] == 0);
!     return FALSE;
  }
  
  # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
--- 2906,2913 ----
      if (composing_hangul)
  	return TRUE;
  #endif
!     return (*mb_off2cells)(LineOffset[row] + col,
! 					LineOffset[row] + screen_Columns) > 1;
  }
  
  # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
*** ../vim-7.1.092/src/proto/mbyte.pro	Sat May  5 20:02:52 2007
--- src/proto/mbyte.pro	Wed Aug 29 20:49:02 2007
***************
*** 12,20 ****
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
  int latin_char2cells __ARGS((int c));
! int latin_off2cells __ARGS((unsigned off));
! int dbcs_off2cells __ARGS((unsigned off));
! int utf_off2cells __ARGS((unsigned off));
  int latin_ptr2char __ARGS((char_u *p));
  int utf_ptr2char __ARGS((char_u *p));
  int mb_ptr2char_adv __ARGS((char_u **pp));
--- 12,20 ----
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
  int latin_char2cells __ARGS((int c));
! int latin_off2cells __ARGS((unsigned off, unsigned max_off));
! int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
! int utf_off2cells __ARGS((unsigned off, unsigned max_off));
  int latin_ptr2char __ARGS((char_u *p));
  int utf_ptr2char __ARGS((char_u *p));
  int mb_ptr2char_adv __ARGS((char_u **pp));
*** ../vim-7.1.092/src/screen.c	Sun Aug  5 20:10:16 2007
--- src/screen.c	Thu Aug 30 10:31:26 2007
***************
*** 1024,1030 ****
  	    type = VALID;
      }
  
!     /* Trick: we want to avoid clearning the screen twice.  screenclear() will
       * set "screen_cleared" to TRUE.  The special value MAYBE (which is still
       * non-zero and thus not FALSE) will indicate that screenclear() was not
       * called. */
--- 1024,1030 ----
  	    type = VALID;
      }
  
!     /* Trick: we want to avoid clearing the screen twice.  screenclear() will
       * set "screen_cleared" to TRUE.  The special value MAYBE (which is still
       * non-zero and thus not FALSE) will indicate that screenclear() was not
       * called. */
***************
*** 4632,4638 ****
  
  	/*
  	 * At end of screen line and there is more to come: Display the line
! 	 * so far.  If there is no more to display it is catched above.
  	 */
  	if ((
  #ifdef FEAT_RIGHTLEFT
--- 4632,4638 ----
  
  	/*
  	 * At end of screen line and there is more to come: Display the line
! 	 * so far.  If there is no more to display it is caught above.
  	 */
  	if ((
  #ifdef FEAT_RIGHTLEFT
***************
*** 4709,4717 ****
  #endif
  #ifdef FEAT_MBYTE
  			 && !(has_mbyte
! 			     && ((*mb_off2cells)(LineOffset[screen_row]) == 2
  				 || (*mb_off2cells)(LineOffset[screen_row - 1]
! 							+ (int)Columns - 2) == 2))
  #endif
  		   )
  		{
--- 4709,4721 ----
  #endif
  #ifdef FEAT_MBYTE
  			 && !(has_mbyte
! 			     && ((*mb_off2cells)(LineOffset[screen_row],
! 				     LineOffset[screen_row] + screen_Columns)
! 									  == 2
  				 || (*mb_off2cells)(LineOffset[screen_row - 1]
! 							+ (int)Columns - 2,
! 				     LineOffset[screen_row] + screen_Columns)
! 									== 2))
  #endif
  		   )
  		{
***************
*** 4871,4876 ****
--- 4875,4884 ----
  {
      unsigned	    off_from;
      unsigned	    off_to;
+ #ifdef FEAT_MBYTE
+     unsigned	    max_off_from;
+     unsigned	    max_off_to;
+ #endif
      int		    col = 0;
  #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT)
      int		    hl;
***************
*** 4897,4902 ****
--- 4905,4914 ----
  
      off_from = (unsigned)(current_ScreenLine - ScreenLines);
      off_to = LineOffset[row] + coloff;
+ #ifdef FEAT_MBYTE
+     max_off_from = off_from + screen_Columns;
+     max_off_to = LineOffset[row] + screen_Columns;
+ #endif
  
  #ifdef FEAT_RIGHTLEFT
      if (rlflag)
***************
*** 4931,4937 ****
      {
  #ifdef FEAT_MBYTE
  	if (has_mbyte && (col + 1 < endcol))
! 	    char_cells = (*mb_off2cells)(off_from);
  	else
  	    char_cells = 1;
  #endif
--- 4943,4949 ----
      {
  #ifdef FEAT_MBYTE
  	if (has_mbyte && (col + 1 < endcol))
! 	    char_cells = (*mb_off2cells)(off_from, max_off_from);
  	else
  	    char_cells = 1;
  #endif
***************
*** 5008,5014 ****
  		 * ScreenLinesUC[] is sufficient. */
  		if (char_cells == 1
  			&& col + 1 < endcol
! 			&& (*mb_off2cells)(off_to) > 1)
  		{
  		    /* Writing a single-cell character over a double-cell
  		     * character: need to redraw the next cell. */
--- 5020,5026 ----
  		 * ScreenLinesUC[] is sufficient. */
  		if (char_cells == 1
  			&& col + 1 < endcol
! 			&& (*mb_off2cells)(off_to, max_off_to) > 1)
  		{
  		    /* Writing a single-cell character over a double-cell
  		     * character: need to redraw the next cell. */
***************
*** 5017,5024 ****
  		}
  		else if (char_cells == 2
  			&& col + 2 < endcol
! 			&& (*mb_off2cells)(off_to) == 1
! 			&& (*mb_off2cells)(off_to + 1) > 1)
  		{
  		    /* Writing the second half of a double-cell character over
  		     * a double-cell character: need to redraw the second
--- 5029,5036 ----
  		}
  		else if (char_cells == 2
  			&& col + 2 < endcol
! 			&& (*mb_off2cells)(off_to, max_off_to) == 1
! 			&& (*mb_off2cells)(off_to + 1, max_off_to) > 1)
  		{
  		    /* Writing the second half of a double-cell character over
  		     * a double-cell character: need to redraw the second
***************
*** 5037,5046 ****
  	     * char over the left halve of an existing one. */
  	    if (has_mbyte && col + char_cells == endcol
  		    && ((char_cells == 1
! 			    && (*mb_off2cells)(off_to) > 1)
  			|| (char_cells == 2
! 			    && (*mb_off2cells)(off_to) == 1
! 			    && (*mb_off2cells)(off_to + 1) > 1)))
  		clear_next = TRUE;
  #endif
  
--- 5049,5058 ----
  	     * char over the left halve of an existing one. */
  	    if (has_mbyte && col + char_cells == endcol
  		    && ((char_cells == 1
! 			    && (*mb_off2cells)(off_to, max_off_to) > 1)
  			|| (char_cells == 2
! 			    && (*mb_off2cells)(off_to, max_off_to) == 1
! 			    && (*mb_off2cells)(off_to + 1, max_off_to) > 1)))
  		clear_next = TRUE;
  #endif
  
***************
*** 5180,5189 ****
  			/* find previous character by counting from first
  			 * column and get its width. */
  			unsigned off = LineOffset[row];
  
  			while (off < off_to)
  			{
! 			    prev_cells = (*mb_off2cells)(off);
  			    off += prev_cells;
  			}
  		    }
--- 5192,5202 ----
  			/* find previous character by counting from first
  			 * column and get its width. */
  			unsigned off = LineOffset[row];
+ 			unsigned max_off = LineOffset[row] + screen_Columns;
  
  			while (off < off_to)
  			{
! 			    prev_cells = (*mb_off2cells)(off, max_off);
  			    off += prev_cells;
  			}
  		    }
***************
*** 5369,5375 ****
  static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
  
  /*
!  * Get the lenght of an item as it will be shown in the status line.
   */
      static int
  status_match_len(xp, s)
--- 5382,5388 ----
  static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
  
  /*
!  * Get the length of an item as it will be shown in the status line.
   */
      static int
  status_match_len(xp, s)
***************
*** 5435,5441 ****
      int		row;
      char_u	*buf;
      int		len;
!     int		clen;		/* lenght in screen cells */
      int		fillchar;
      int		attr;
      int		i;
--- 5448,5454 ----
      int		row;
      char_u	*buf;
      int		len;
!     int		clen;		/* length in screen cells */
      int		fillchar;
      int		attr;
      int		i;
***************
*** 6187,6192 ****
--- 6200,6206 ----
      char_u	*ptr = text;
      int		c;
  #ifdef FEAT_MBYTE
+     unsigned	max_off;
      int		mbyte_blen = 1;
      int		mbyte_cells = 1;
      int		u8c = 0;
***************
*** 6203,6208 ****
--- 6217,6225 ----
  	return;
  
      off = LineOffset[row] + col;
+ #ifdef FEAT_MBYTE
+     max_off = LineOffset[row] + screen_Columns;
+ #endif
      while (col < screen_Columns
  	    && (len < 0 || (int)(ptr - text) < len)
  	    && *ptr != NUL)
***************
*** 6326,6344 ****
  	    else if (has_mbyte
  		    && (len < 0 ? ptr[mbyte_blen] == NUL
  					     : ptr + mbyte_blen >= text + len)
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off) == 1
! 			    && (*mb_off2cells)(off + 1) > 1)))
  		clear_next_cell = TRUE;
  
  	    /* Make sure we never leave a second byte of a double-byte behind,
  	     * it confuses mb_off2cells(). */
  	    if (enc_dbcs
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off) == 1
! 			    && (*mb_off2cells)(off + 1) > 1)))
  		ScreenLines[off + mbyte_blen] = 0;
  #endif
  	    ScreenLines[off] = c;
--- 6343,6361 ----
  	    else if (has_mbyte
  		    && (len < 0 ? ptr[mbyte_blen] == NUL
  					     : ptr + mbyte_blen >= text + len)
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off, max_off) == 1
! 			    && (*mb_off2cells)(off + 1, max_off) > 1)))
  		clear_next_cell = TRUE;
  
  	    /* Make sure we never leave a second byte of a double-byte behind,
  	     * it confuses mb_off2cells(). */
  	    if (enc_dbcs
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off, max_off) == 1
! 			    && (*mb_off2cells)(off + 1, max_off) > 1)))
  		ScreenLines[off + mbyte_blen] = 0;
  #endif
  	    ScreenLines[off] = c;
***************
*** 6924,6929 ****
--- 6941,6949 ----
  {
      int		r, c;
      int		off;
+ #ifdef FEAT_MBYTE
+     int		max_off;
+ #endif
  
      /* Can't use ScreenLines unless initialized */
      if (ScreenLines == NULL)
***************
*** 6934,6943 ****
      for (r = row; r < row + height; ++r)
      {
  	off = LineOffset[r];
  	for (c = col; c < col + width; ++c)
  	{
  #ifdef FEAT_MBYTE
! 	    if (enc_dbcs != 0 && dbcs_off2cells(off + c) > 1)
  	    {
  		screen_char_2(off + c, r, c);
  		++c;
--- 6954,6966 ----
      for (r = row; r < row + height; ++r)
      {
  	off = LineOffset[r];
+ #ifdef FEAT_MBYTE
+ 	max_off = off + screen_Columns;
+ #endif
  	for (c = col; c < col + width; ++c)
  	{
  #ifdef FEAT_MBYTE
! 	    if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1)
  	    {
  		screen_char_2(off + c, r, c);
  		++c;
***************
*** 6947,6953 ****
  	    {
  		screen_char(off + c, r, c);
  #ifdef FEAT_MBYTE
! 		if (utf_off2cells(off + c) > 1)
  		    ++c;
  #endif
  	    }
--- 6970,6976 ----
  	    {
  		screen_char(off + c, r, c);
  #ifdef FEAT_MBYTE
! 		if (utf_off2cells(off + c, max_off) > 1)
  		    ++c;
  #endif
  	    }
*** ../vim-7.1.092/src/version.c	Thu Aug 30 12:50:00 2007
--- src/version.c	Thu Aug 30 13:45:25 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     93,
  /**/

-- 
There is a fine line between courage and foolishness.
Unfortunately, it's not a fence.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:57 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:57 -0400
Subject: devel/vim 7.1.094,NONE,1.1
Message-ID: <200709071403.l87E3vbT026914@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26906

Added Files:
	7.1.094 
Log Message:
- patchlevel 94


--- NEW FILE 7.1.094 ---
To: vim-dev at vim.org
Subject: patch 7.1.094
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.094
Problem:    When checking if syntax highlighting is present, looking in the
	    current buffer instead of the specified one.
Solution:   Use "buf" instead of "curbuf".
Files:	    src/syntax.c


*** ../vim-7.1.093/src/syntax.c	Tue Aug 21 17:29:04 2007
--- src/syntax.c	Wed Aug 29 23:27:52 2007
***************
*** 5987,5994 ****
  {
      return (buf->b_syn_patterns.ga_len != 0
  	    || buf->b_syn_clusters.ga_len != 0
! 	    || curbuf->b_keywtab.ht_used > 0
! 	    || curbuf->b_keywtab_ic.ht_used > 0);
  }
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
--- 5987,5994 ----
  {
      return (buf->b_syn_patterns.ga_len != 0
  	    || buf->b_syn_clusters.ga_len != 0
! 	    || buf->b_keywtab.ht_used > 0
! 	    || buf->b_keywtab_ic.ht_used > 0);
  }
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
*** ../vim-7.1.093/src/version.c	Thu Aug 30 13:51:52 2007
--- src/version.c	Thu Aug 30 19:35:52 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     94,
  /**/

-- 
MAN:     You don't frighten us, English pig-dog!  Go and boil your bottoms,
         son of a silly person.  I blow my nose on you, so-called Arthur-king,
         you and your silly English K...kaniggets.
   He puts hands to his ears and blows a raspberry.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:04 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:04 -0400
Subject: devel/vim 7.1.095,NONE,1.1
Message-ID: <200709071404.l87E444e026937@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26930

Added Files:
	7.1.095 
Log Message:
- patchlevel 95


--- NEW FILE 7.1.095 ---
To: vim-dev at vim.org
Subject: patch 7.1.095
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.095
Problem:    The FocusLost and FocusGained autocommands are triggered
	    asynchronously in the GUI.  This may cause arbitrary problems.
Solution:   Put the focus event in the input buffer and handle it when ready
	    for it.
Files:	    src/eval.c, src/getchar.c, src/gui.c, src/gui_gtk_x11.c,
	    src/keymap.h


*** ../vim-7.1.094/src/eval.c	Thu Aug 30 11:10:38 2007
--- src/eval.c	Mon Sep  3 22:48:09 2007
***************
*** 9912,9929 ****
  
      ++no_mapping;
      ++allow_keys;
!     if (argvars[0].v_type == VAR_UNKNOWN)
! 	/* getchar(): blocking wait. */
! 	n = safe_vgetc();
!     else if (get_tv_number_chk(&argvars[0], &error) == 1)
! 	/* getchar(1): only check if char avail */
! 	n = vpeekc();
!     else if (error || vpeekc() == NUL)
! 	/* illegal argument or getchar(0) and no char avail: return zero */
! 	n = 0;
!     else
! 	/* getchar(0) and char avail: return char */
! 	n = safe_vgetc();
      --no_mapping;
      --allow_keys;
  
--- 9912,9935 ----
  
      ++no_mapping;
      ++allow_keys;
!     for (;;)
!     {
! 	if (argvars[0].v_type == VAR_UNKNOWN)
! 	    /* getchar(): blocking wait. */
! 	    n = safe_vgetc();
! 	else if (get_tv_number_chk(&argvars[0], &error) == 1)
! 	    /* getchar(1): only check if char avail */
! 	    n = vpeekc();
! 	else if (error || vpeekc() == NUL)
! 	    /* illegal argument or getchar(0) and no char avail: return zero */
! 	    n = 0;
! 	else
! 	    /* getchar(0) and char avail: return char */
! 	    n = safe_vgetc();
! 	if (n == K_IGNORE)
! 	    continue;
! 	break;
!     }
      --no_mapping;
      --allow_keys;
  
*** ../vim-7.1.094/src/getchar.c	Thu May 10 18:43:02 2007
--- src/getchar.c	Wed Aug 29 22:38:49 2007
***************
*** 1596,1603 ****
  		continue;
  	    }
  #endif
- 
  #ifdef FEAT_GUI
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
  	     * it being recognized as the start of a special key. */
  	    if (c == K_CSI)
--- 1596,1610 ----
  		continue;
  	    }
  #endif
  #ifdef FEAT_GUI
+ 	    /* The caller doesn't need to know that the focus event is delayed
+ 	     * until getting a character. */
+ 	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
+ 	    {
+ 		ui_focus_change(c == K_FOCUSGAINED);
+ 		continue;
+ 	    }
+ 
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
  	     * it being recognized as the start of a special key. */
  	    if (c == K_CSI)
*** ../vim-7.1.094/src/gui.c	Thu Aug 30 13:51:52 2007
--- src/gui.c	Thu Aug 30 14:10:48 2007
***************
*** 4519,4525 ****
      xim_set_focus(in_focus);
  # endif
  
!     ui_focus_change(in_focus);
  #endif
  }
  
--- 4519,4536 ----
      xim_set_focus(in_focus);
  # endif
  
!     /* Put events in the input queue only when allowed.
!      * ui_focus_change() isn't called directly, because it invokes
!      * autocommands and that must not happen asynchronously. */
!     if (!hold_gui_events)
!     {
! 	char_u  bytes[3];
! 
! 	bytes[0] = CSI;
! 	bytes[1] = KS_EXTRA;
! 	bytes[2] = in_focus ? (int)KE_FOCUSGAINED : (int)KE_FOCUSLOST;
! 	add_to_input_buf(bytes, 3);
!     }
  #endif
  }
  
*** ../vim-7.1.094/src/gui_gtk_x11.c	Tue Jun 19 18:07:52 2007
--- src/gui_gtk_x11.c	Wed Aug 29 22:43:34 2007
***************
*** 813,822 ****
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
  
!     /* make sure keyboard input goes to the draw area (if this is focus for a window) */
      if (widget != gui.drawarea)
  	gtk_widget_grab_focus(gui.drawarea);
  
      return TRUE;
  }
  
--- 813,827 ----
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
  
!     /* make sure keyboard input goes to the draw area (if this is focus for a
!      * window) */
      if (widget != gui.drawarea)
  	gtk_widget_grab_focus(gui.drawarea);
  
+     /* make sure the input buffer is read */
+     if (gtk_main_level() > 0)
+ 	gtk_main_quit();
+ 
      return TRUE;
  }
  
***************
*** 828,833 ****
--- 833,842 ----
  
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
+ 
+     /* make sure the input buffer is read */
+     if (gtk_main_level() > 0)
+ 	gtk_main_quit();
  
      return TRUE;
  }
*** ../vim-7.1.094/src/keymap.h	Sat May  5 19:34:22 2007
--- src/keymap.h	Wed Aug 29 22:17:51 2007
***************
*** 254,259 ****
--- 254,261 ----
      , KE_DROP		/* DnD data is available */
      , KE_CURSORHOLD	/* CursorHold event */
      , KE_NOP		/* doesn't do something */
+     , KE_FOCUSGAINED	/* focus gained */
+     , KE_FOCUSLOST	/* focus lost */
  };
  
  /*
***************
*** 445,450 ****
--- 447,454 ----
  #define K_CMDWIN	TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)
  
  #define K_DROP		TERMCAP2KEY(KS_EXTRA, KE_DROP)
+ #define K_FOCUSGAINED	TERMCAP2KEY(KS_EXTRA, KE_FOCUSGAINED)
+ #define K_FOCUSLOST	TERMCAP2KEY(KS_EXTRA, KE_FOCUSLOST)
  
  #define K_CURSORHOLD	TERMCAP2KEY(KS_EXTRA, KE_CURSORHOLD)
  
*** ../vim-7.1.094/src/version.c	Thu Aug 30 19:36:52 2007
--- src/version.c	Wed Sep  5 21:42:41 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     95,
  /**/

-- 
ARTHUR:      Who are you?
TALL KNIGHT: We are the Knights Who Say "Ni"!
BEDEVERE:    No!  Not the Knights Who Say "Ni"!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:11 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:11 -0400
Subject: devel/vim 7.1.096,NONE,1.1
Message-ID: <200709071404.l87E4Bfq026960@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26953

Added Files:
	7.1.096 
Log Message:
- patchlevel 96


--- NEW FILE 7.1.096 ---
To: vim-dev at vim.org
Subject: patch 7.1.096
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.096
Problem:    Reading past end of a string when resizing Vim. (Dominique Pelle)
Solution:   Check the string pointer before getting the char it points to.
Files:	    src/message.c


*** ../vim-7.1.095/src/message.c	Tue Aug  7 21:59:26 2007
--- src/message.c	Thu Aug 30 22:53:03 2007
***************
*** 944,949 ****
--- 944,950 ----
  		c = K_IGNORE;
  	    }
  #endif
+ 
  	    /*
  	     * Allow scrolling back in the messages.
  	     * Also accept scroll-down commands when messages fill the screen,
***************
*** 1840,1845 ****
--- 1841,1847 ----
      char_u	*sb_str = str;
      int		sb_col = msg_col;
      int		wrap;
+     int		did_last_char;
  
      did_wait_return = FALSE;
      while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
***************
*** 1909,1915 ****
--- 1911,1920 ----
  		else
  #endif
  		    msg_screen_putchar(*s++, attr);
+ 		did_last_char = TRUE;
  	    }
+ 	    else
+ 		did_last_char = FALSE;
  
  	    if (p_more)
  		/* store text for scrolling back */
***************
*** 1944,1954 ****
  
  	    /* When we displayed a char in last column need to check if there
  	     * is still more. */
! 	    if (*s >= ' '
! #ifdef FEAT_RIGHTLEFT
! 		    && !cmdmsg_rl
! #endif
! 	       )
  		continue;
  	}
  
--- 1949,1955 ----
  
  	    /* When we displayed a char in last column need to check if there
  	     * is still more. */
! 	    if (did_last_char)
  		continue;
  	}
  
*** ../vim-7.1.095/src/version.c	Wed Sep  5 21:45:54 2007
--- src/version.c	Thu Sep  6 12:31:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     96,
  /**/

-- 
Yah, well, we had to carve our electrons out of driftwood we'd
find.  In the winter.  Uphill.  Both ways.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:19 -0400
Subject: devel/vim 7.1.097,NONE,1.1
Message-ID: <200709071404.l87E4J94026983@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976

Added Files:
	7.1.097 
Log Message:
- patchlevel 97


--- NEW FILE 7.1.097 ---
To: vim-dev at vim.org
Subject: patch 7.1.097
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.097
Problem:    ":setlocal stl=%!1+1" does not work.
Solution:   Adjust check for pointer. (Politz)
Files:	    src/option.c


*** ../vim-7.1.096/src/option.c	Sun Aug 12 15:50:26 2007
--- src/option.c	Wed Sep  5 22:34:27 2007
***************
*** 6348,6354 ****
  		errmsg = check_stl_option(p_ruf);
  	}
  	/* check 'statusline' only if it doesn't start with "%!" */
! 	else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
--- 6352,6358 ----
  		errmsg = check_stl_option(p_ruf);
  	}
  	/* check 'statusline' only if it doesn't start with "%!" */
! 	else if (varp == &p_ruf || s[0] != '%' || s[1] != '!')
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
*** ../vim-7.1.096/src/version.c	Thu Sep  6 12:53:59 2007
--- src/version.c	Thu Sep  6 13:31:37 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     97,
  /**/

-- 
Not too long ago, cut and paste was done with scissors and glue...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:27 -0400
Subject: devel/vim 7.1.098,NONE,1.1
Message-ID: <200709071404.l87E4R6x027021@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002

Added Files:
	7.1.098 
Log Message:
- patchlevel 98


--- NEW FILE 7.1.098 ---
To: vim-dev at vim.org
Subject: patch 7.1.098
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.098
Problem:    ":call s:var()" doesn't work if "s:var" is a Funcref. (Andy Wokula)
Solution:   Before converting "s:" into a script ID, check if it is a Funcref.
Files:	    src/eval.c


*** ../vim-7.1.097/src/eval.c	Wed Sep  5 21:45:54 2007
--- src/eval.c	Thu Sep  6 12:11:19 2007
***************
*** 19367,19372 ****
--- 19367,19394 ----
      if (lv.ll_name == NULL)
      {
  	/* Error found, but continue after the function name. */
+ 	*pp = end;
+ 	goto theend;
+     }
+ 
+     /* Check if the name is a Funcref.  If so, use the value. */
+     if (lv.ll_exp_name != NULL)
+     {
+ 	len = (int)STRLEN(lv.ll_exp_name);
+ 	name = deref_func_name(lv.ll_exp_name, &len);
+ 	if (name == lv.ll_exp_name)
+ 	    name = NULL;
+     }
+     else
+     {
+ 	len = (int)(end - *pp);
+ 	name = deref_func_name(*pp, &len);
+ 	if (name == *pp)
+ 	    name = NULL;
+     }
+     if (name != NULL)
+     {
+ 	name = vim_strsave(name);
  	*pp = end;
  	goto theend;
      }
*** ../vim-7.1.097/src/version.c	Thu Sep  6 13:32:53 2007
--- src/version.c	Thu Sep  6 14:24:10 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     98,
  /**/

-- 
Not too long ago, a program was something you watched on TV...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:34 -0400
Subject: devel/vim 7.1.099,NONE,1.1
Message-ID: <200709071404.l87E4YCf027053@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27039

Added Files:
	7.1.099 
Log Message:
- patchlevel 99


--- NEW FILE 7.1.099 ---
To: vim-dev at vim.org
Subject: patch 7.1.099
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.099
Problem:    When the 'keymap' and 'paste' options have a non-default value,
	    ":mkexrc" and ":mksession" do not correctly set the options.
Solution:   Set the options with side effects before other options.
Files:	    src/option.c

 
*** ../vim-7.1.098/src/option.c	Thu Sep  6 13:32:53 2007
--- src/option.c	Wed Sep  5 22:34:27 2007
***************
*** 427,432 ****
--- 427,434 ----
  #define P_NOGLOB       0x100000L/* do not use local value for global vimrc */
  #define P_NFNAME       0x200000L/* only normal file name chars allowed */
  #define P_INSECURE     0x400000L/* option was set from a modeline */
+ #define P_PRI_MKRC     0x800000L/* priority for :mkvimrc (setting option has
+ 				   side effects) */
  
  #define ISK_LATIN1  (char_u *)"@,48-57,_,192-255"
  
***************
*** 773,778 ****
--- 775,782 ----
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
+ 			    /* P_PRI_MKRC isn't needed here, optval_default()
+ 			     * always returns TRUE for 'compatible' */
      {"compatible",  "cp",   P_BOOL|P_RALL,
  			    (char_u *)&p_cp, PV_NONE,
  			    {(char_u *)TRUE, (char_u *)FALSE}},
***************
*** 1515,1521 ****
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME,
  #ifdef FEAT_KEYMAP
  			    (char_u *)&p_keymap, PV_KMAP,
  			    {(char_u *)"", (char_u *)0L}
--- 1519,1525 ----
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
  #ifdef FEAT_KEYMAP
  			    (char_u *)&p_keymap, PV_KMAP,
  			    {(char_u *)"", (char_u *)0L}
***************
*** 1836,1842 ****
      {"paragraphs",  "para", P_STRING|P_VI_DEF,
  			    (char_u *)&p_para, PV_NONE,
  			    {(char_u *)"IPLPPPQPP LIpplpipbp", (char_u *)0L}},
!     {"paste",	    NULL,   P_BOOL|P_VI_DEF,
  			    (char_u *)&p_paste, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L}},
      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
--- 1840,1846 ----
      {"paragraphs",  "para", P_STRING|P_VI_DEF,
  			    (char_u *)&p_para, PV_NONE,
  			    {(char_u *)"IPLPPPQPP LIpplpipbp", (char_u *)0L}},
!     {"paste",	    NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
  			    (char_u *)&p_paste, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L}},
      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
***************
*** 8535,8547 ****
      char_u		*varp_local = NULL;	/* fresh value */
      char		*cmd;
      int			round;
  
      /*
       * The options that don't have a default (terminal name, columns, lines)
       * are never written.  Terminal options are also not written.
       */
!     for (p = &options[0]; !istermoption(p); p++)
! 	if (!(p->flags & P_NO_MKRC) && !istermoption(p))
  	{
  	    /* skip global option when only doing locals */
  	    if (p->indir == PV_NONE && !(opt_flags & OPT_GLOBAL))
--- 8539,8558 ----
      char_u		*varp_local = NULL;	/* fresh value */
      char		*cmd;
      int			round;
+     int			pri;
  
      /*
       * The options that don't have a default (terminal name, columns, lines)
       * are never written.  Terminal options are also not written.
+      * Do the loop over "options[]" twice: once for options with the
+      * P_PRI_MKRC flag and once without.
       */
!     for (pri = 1; pri >= 0; --pri)
!     {
!       for (p = &options[0]; !istermoption(p); p++)
! 	if (!(p->flags & P_NO_MKRC)
! 		&& !istermoption(p)
! 		&& ((pri == 1) == ((p->flags & P_PRI_MKRC) != 0)))
  	{
  	    /* skip global option when only doing locals */
  	    if (p->indir == PV_NONE && !(opt_flags & OPT_GLOBAL))
***************
*** 8637,8642 ****
--- 8648,8654 ----
  		}
  	    }
  	}
+     }
      return OK;
  }
  
*** ../vim-7.1.098/src/version.c	Thu Sep  6 14:25:50 2007
--- src/version.c	Thu Sep  6 16:32:31 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     99,
  /**/

-- 
Not too long ago, a keyboard was something to make music with...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:05:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 10:05:26 -0400
Subject: rpms/redhat-menus/devel categories.patch, 1.4, 1.5 redhat-menus.spec,
	1.84, 1.85
Message-ID: <200709071405.l87E5QJA027223@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27067

Modified Files:
	categories.patch redhat-menus.spec 
Log Message:
More category finetuning; remove remaining overrides


categories.patch:

Index: categories.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/categories.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- categories.patch	3 Jul 2007 02:48:28 -0000	1.4
+++ categories.patch	7 Sep 2007 14:04:52 -0000	1.5
@@ -1,7 +1,51 @@
+diff -up redhat-menus-8.9.10/menus/server-settings.menu.categories redhat-menus-8.9.10/menus/server-settings.menu
+--- redhat-menus-8.9.10/menus/server-settings.menu.categories	2007-09-07 10:01:24.000000000 -0400
++++ redhat-menus-8.9.10/menus/server-settings.menu	2007-09-07 10:01:34.000000000 -0400
+@@ -21,7 +21,6 @@
+   <Include>
+     <And>
+       <Category>X-Red-Hat-Base</Category>
+-      <Category>Application</Category>
+       <Category>X-Red-Hat-ServerConfig</Category>
+     </And>
+   </Include>
+@@ -34,7 +33,6 @@
+       <And>
+         <Not><Category>X-Red-Hat-Base-Only</Category></Not>
+         <Not><Category>X-Red-Hat-Base</Category></Not>
+-        <Category>Application</Category>
+         <Category>X-Red-Hat-ServerConfig</Category>
+       </And>
+     </Include>
 diff -up redhat-menus-8.9.10/menus/applications.menu.categories redhat-menus-8.9.10/menus/applications.menu
---- redhat-menus-8.9.10/menus/applications.menu.categories	2007-07-02 22:35:48.000000000 -0400
-+++ redhat-menus-8.9.10/menus/applications.menu	2007-07-02 22:36:44.000000000 -0400
-@@ -123,23 +123,15 @@
+--- redhat-menus-8.9.10/menus/applications.menu.categories	2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/applications.menu	2007-09-07 10:01:04.000000000 -0400
+@@ -43,7 +43,6 @@
+       <And>
+         <Category>Development</Category>
+       </And>
+-      <Filename>emacs.desktop</Filename>
+     </Include>
+   </Menu> <!-- End Development Tools -->
+ 
+@@ -77,8 +76,6 @@
+       <And>
+         <Category>Graphics</Category>
+       </And>
+-      <Filename>dia.desktop</Filename>
+-      <Filename>drawing.desktop</Filename>
+     </Include>
+   </Menu> <!-- End Graphics -->
+ 
+@@ -89,6 +86,7 @@
+     <Include>
+       <And>
+         <Category>Network</Category>
++	<Not><Category>Settings</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Internet -->
+@@ -123,38 +121,13 @@
      <Include>
        <And>
          <Category>System</Category>
@@ -18,27 +62,30 @@
 -      <Filename>gdmflexiserver-xnest.desktop</Filename>
 -      <Filename>gnome-file-roller.desktop</Filename>
 -      <Filename>gnome-gfloppy.desktop</Filename>
-       <Filename>redhat-authconfig.desktop</Filename>
-       <Filename>redhat-usermount.desktop</Filename>
+-      <Filename>redhat-authconfig.desktop</Filename>
+-      <Filename>redhat-usermount.desktop</Filename>
 -      <Filename>system-config-date.desktop</Filename>
-       <Filename>system-config-keyboard.desktop</Filename>
+-      <Filename>system-config-keyboard.desktop</Filename>
 -      <Filename>system-config-language.desktop</Filename>
-       <Filename>system-config-mouse.desktop</Filename>
-       <Filename>system-config-nfs.desktop</Filename>
+-      <Filename>system-config-mouse.desktop</Filename>
+-      <Filename>system-config-nfs.desktop</Filename>
        <Filename>pirut.desktop</Filename>
-@@ -147,11 +139,8 @@
-       <Filename>system-config-securitylevel.desktop</Filename>
-       <Filename>system-config-services.desktop</Filename>
-       <Filename>system-config-soundcard.desktop</Filename>
+-      <Filename>system-config-rootpassword.desktop</Filename>
+-      <Filename>system-config-securitylevel.desktop</Filename>
+-      <Filename>system-config-services.desktop</Filename>
+-      <Filename>system-config-soundcard.desktop</Filename>
 -      <Filename>system-config-users.desktop</Filename>
-       <Filename>redhat-neat.desktop</Filename>
-       <Filename>redhat-neat-control.desktop</Filename>
+-      <Filename>redhat-neat.desktop</Filename>
+-      <Filename>redhat-neat-control.desktop</Filename>
 -      <Filename>redhat-printconf-gui.desktop</Filename>
 -      <Filename>redhat-rhn-up2date-config.desktop</Filename>
-       <Filename>redhat-switchdesk.desktop</Filename>
-       <Filename>redhat-switchmail.desktop</Filename>
-       <Filename>redhat-switch-printer.desktop</Filename>
-@@ -167,7 +156,6 @@
+-      <Filename>redhat-switchdesk.desktop</Filename>
+-      <Filename>redhat-switchmail.desktop</Filename>
+-      <Filename>redhat-switch-printer.desktop</Filename>
+     </Exclude>
+   </Menu>   <!-- End System Tools -->
+ 
+@@ -167,7 +140,6 @@
        <And>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
@@ -47,8 +94,8 @@
          <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
          <Not><Category>Screensaver</Category></Not>
 diff -up redhat-menus-8.9.10/menus/preferences.menu.categories redhat-menus-8.9.10/menus/preferences.menu
---- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-07-02 22:35:48.000000000 -0400
-+++ redhat-menus-8.9.10/menus/preferences.menu	2007-07-02 22:35:48.000000000 -0400
+--- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/preferences.menu	2007-09-07 10:01:04.000000000 -0400
 @@ -28,12 +28,12 @@
        <Category>Settings</Category>
        <Not>
@@ -122,7 +169,7 @@
    </Menu> <!-- End System -->
 diff -up redhat-menus-8.9.10/menus/system-settings.menu.categories redhat-menus-8.9.10/menus/system-settings.menu
 --- redhat-menus-8.9.10/menus/system-settings.menu.categories	2007-03-19 13:45:14.000000000 -0400
-+++ redhat-menus-8.9.10/menus/system-settings.menu	2007-07-02 22:36:56.000000000 -0400
++++ redhat-menus-8.9.10/menus/system-settings.menu	2007-09-07 10:01:04.000000000 -0400
 @@ -18,7 +18,9 @@
    <DefaultMergeDirs/>
  
@@ -134,7 +181,7 @@
  
    <!-- Merge in server settings -->
    <Menu>
-@@ -30,10 +32,8 @@
+@@ -30,50 +32,11 @@
  
    <Include>
      <And>
@@ -147,24 +194,23 @@
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
        <Not><Category>Screensaver</Category></Not>
      </And>
-@@ -41,39 +41,13 @@
+   </Include>
  
-   <Include>
-     <Filename>redhat-authconfig.desktop</Filename>
+-  <Include>
+-    <Filename>redhat-authconfig.desktop</Filename>
 -    <Filename>system-config-date.desktop</Filename>
-     <Filename>system-config-keyboard.desktop</Filename>
+-    <Filename>system-config-keyboard.desktop</Filename>
 -    <Filename>system-config-language.desktop</Filename>
-     <Filename>system-config-mouse.desktop</Filename>
-     <Filename>system-config-rootpassword.desktop</Filename>
-     <Filename>system-config-securitylevel.desktop</Filename>
-     <Filename>system-config-soundcard.desktop</Filename>
+-    <Filename>system-config-mouse.desktop</Filename>
+-    <Filename>system-config-rootpassword.desktop</Filename>
+-    <Filename>system-config-securitylevel.desktop</Filename>
+-    <Filename>system-config-soundcard.desktop</Filename>
 -    <Filename>system-config-users.desktop</Filename>
-+    <Filename>system-config-lvm.desktop</Filename>
-     <Filename>redhat-neat.desktop</Filename>
+-    <Filename>redhat-neat.desktop</Filename>
 -    <Filename>redhat-printconf-gui.desktop</Filename>
 -    <Filename>redhat-rhn-up2date-config.desktop</Filename>
-   </Include>
- 
+-  </Include>
+-
 -  <Exclude>
 -    <Filename>system-config-packages.desktop</Filename>
 -  </Exclude>


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- redhat-menus.spec	6 Sep 2007 17:30:54 -0000	1.84
+++ redhat-menus.spec	7 Sep 2007 14:04:52 -0000	1.85
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -85,6 +85,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-10
+- More category finetuning; remove remaining overrides
+
 * Thu Sep  6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
 - create /etx/xdg/menus/settings-merged by default
 



From fedora-extras-commits at redhat.com  Fri Sep  7 14:05:40 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:05:40 -0400
Subject: devel/vim 7.1.100, NONE, 1.1 README.patches, 1.82, 1.83 vim.spec,
	1.174, 1.175
Message-ID: <200709071405.l87E5eBb027244@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27178

Modified Files:
	README.patches vim.spec 
Added Files:
	7.1.100 
Log Message:
- patchlevel 100


--- NEW FILE 7.1.100 ---
To: vim-dev at vim.org
Subject: patch 7.1.100
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.100
Problem:    Win32: Executing cscope doesn't always work properly.
Solution:   Use another way to invoke cscope. (Mike Williams)
Files:	    src/if_cscope.c, src/if_cscope.h, src/main.c,
	    src/proto/if_cscope.pro


*** ../vim-7.1.099/src/if_cscope.c	Tue Aug 21 18:02:58 2007
--- src/if_cscope.c	Sun Sep  2 16:50:50 2007
***************
*** 24,34 ****
      /* not UNIX, must be WIN32 */
  # include "vimio.h"
  # include <fcntl.h>
- # include <process.h>
- # define STDIN_FILENO    0
- # define STDOUT_FILENO   1
- # define STDERR_FILENO   2
- # define pipe(fds) _pipe(fds, 256, O_TEXT|O_NOINHERIT)
  #endif
  #include "if_cscope.h"
  
--- 24,29 ----
***************
*** 65,71 ****
  static char *	    cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
  static char *	    cs_pathcomponents __ARGS((char *path));
  static void	    cs_print_tags_priv __ARGS((char **, char **, int));
! static int	    cs_read_prompt __ARGS((int ));
  static void	    cs_release_csp __ARGS((int, int freefnpp));
  static int	    cs_reset __ARGS((exarg_T *eap));
  static char *	    cs_resolve_file __ARGS((int, char *));
--- 60,66 ----
  static char *	    cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
  static char *	    cs_pathcomponents __ARGS((char *path));
  static void	    cs_print_tags_priv __ARGS((char **, char **, int));
! static int	    cs_read_prompt __ARGS((int));
  static void	    cs_release_csp __ARGS((int, int freefnpp));
  static int	    cs_reset __ARGS((exarg_T *eap));
  static char *	    cs_resolve_file __ARGS((int, char *));
***************
*** 504,510 ****
  #if defined(UNIX)
      else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
  #else
! 	/* substitute define S_ISREG from os_unix.h */
      else if (((statbuf.st_mode) & S_IFMT) == S_IFREG)
  #endif
      {
--- 499,505 ----
  #if defined(UNIX)
      else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
  #else
! 	/* WIN32 - substitute define S_ISREG from os_unix.h */
      else if (((statbuf.st_mode) & S_IFMT) == S_IFREG)
  #endif
      {
***************
*** 717,733 ****
  cs_create_connection(i)
      int i;
  {
!     int to_cs[2], from_cs[2], len;
!     char *prog, *cmd, *ppath = NULL;
! #ifndef UNIX
!     int in_save, out_save, err_save;
!     long_i ph;
! # ifdef FEAT_GUI
!     HWND activewnd = NULL;
!     HWND consolewnd = NULL;
! # endif
  #endif
  
      /*
       * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
       * from_cs[0] and writes to to_cs[1].
--- 712,734 ----
  cs_create_connection(i)
      int i;
  {
! #ifdef UNIX
!     int		to_cs[2], from_cs[2];
! #endif
!     int		len;
!     char	*prog, *cmd, *ppath = NULL;
! #ifdef WIN32
!     int		fd;
!     SECURITY_ATTRIBUTES sa;
!     PROCESS_INFORMATION pi;
!     STARTUPINFO si;
!     BOOL	pipe_stdin = FALSE, pipe_stdout = FALSE;
!     HANDLE	stdin_rd, stdout_rd;
!     HANDLE	stdout_wr, stdin_wr;
!     BOOL	created;
  #endif
  
+ #if defined(UNIX)
      /*
       * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
       * from_cs[0] and writes to to_cs[1].
***************
*** 748,765 ****
  	return CSCOPE_FAILURE;
      }
  
- #if defined(UNIX)
      switch (csinfo[i].pid = fork())
      {
      case -1:
  	(void)EMSG(_("E622: Could not fork for cscope"));
  	goto err_closing;
      case 0:				/* child: run cscope. */
- #else
- 	in_save = dup(STDIN_FILENO);
- 	out_save = dup(STDOUT_FILENO);
- 	err_save = dup(STDERR_FILENO);
- #endif
  	if (dup2(to_cs[0], STDIN_FILENO) == -1)
  	    PERROR("cs_create_connection 1");
  	if (dup2(from_cs[1], STDOUT_FILENO) == -1)
--- 749,760 ----
***************
*** 768,782 ****
  	    PERROR("cs_create_connection 3");
  
  	/* close unused */
- #if defined(UNIX)
  	(void)close(to_cs[1]);
  	(void)close(from_cs[0]);
  #else
! 	/* On win32 we must close opposite ends because we are the parent */
! 	(void)close(to_cs[0]);
! 	to_cs[0] = -1;
! 	(void)close(from_cs[1]);
! 	from_cs[1] = -1;
  #endif
  	/* expand the cscope exec for env var's */
  	if ((prog = (char *)alloc(MAXPATHL + 1)) == NULL)
--- 763,794 ----
  	    PERROR("cs_create_connection 3");
  
  	/* close unused */
  	(void)close(to_cs[1]);
  	(void)close(from_cs[0]);
  #else
! 	/* WIN32 */
! 	/* Create pipes to communicate with cscope */
! 	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
! 	sa.bInheritHandle = TRUE;
! 	sa.lpSecurityDescriptor = NULL;
! 
! 	if (!(pipe_stdin = CreatePipe(&stdin_rd, &stdin_wr, &sa, 0))
! 		|| !(pipe_stdout = CreatePipe(&stdout_rd, &stdout_wr, &sa, 0)))
! 	{
! 	    (void)EMSG(_("E566: Could not create cscope pipes"));
! err_closing:
! 	    if (pipe_stdin)
! 	    {
! 		CloseHandle(stdin_rd);
! 		CloseHandle(stdin_wr);
! 	    }
! 	    if (pipe_stdout)
! 	    {
! 		CloseHandle(stdout_rd);
! 		CloseHandle(stdout_wr);
! 	    }
! 	    return CSCOPE_FAILURE;
! 	}
  #endif
  	/* expand the cscope exec for env var's */
  	if ((prog = (char *)alloc(MAXPATHL + 1)) == NULL)
***************
*** 784,789 ****
--- 796,802 ----
  #ifdef UNIX
  	    return CSCOPE_FAILURE;
  #else
+ 	    /* WIN32 */
  	    goto err_closing;
  #endif
  	}
***************
*** 800,805 ****
--- 813,819 ----
  #ifdef UNIX
  		return CSCOPE_FAILURE;
  #else
+ 		/* WIN32 */
  		goto err_closing;
  #endif
  	    }
***************
*** 818,823 ****
--- 832,838 ----
  #ifdef UNIX
  	    return CSCOPE_FAILURE;
  #else
+ 	    /* WIN32 */
  	    goto err_closing;
  #endif
  	}
***************
*** 826,831 ****
--- 841,847 ----
  #if defined(UNIX)
  	(void)sprintf(cmd, "exec %s -dl -f %s", prog, csinfo[i].fname);
  #else
+ 	/* WIN32 */
  	(void)sprintf(cmd, "%s -dl -f %s", prog, csinfo[i].fname);
  #endif
  	if (csinfo[i].ppath != NULL)
***************
*** 851,910 ****
  	exit(127);
  	/* NOTREACHED */
      default:	/* parent. */
- #else
- # ifdef FEAT_GUI
- 	activewnd = GetForegroundWindow(); /* on win9x cscope steals focus */
- 	/* Dirty hack to hide annoying console window */
- 	if (AllocConsole())
- 	{
- 	    char *title;
- 	    title = (char *)alloc(1024);
- 	    if (title == NULL)
- 		FreeConsole();
- 	    else
- 	    {
- 		GetConsoleTitle(title, 1024); /* save for future restore */
- 		SetConsoleTitle(
- 		    "GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
- 		Sleep(40); /* as stated in MS KB we must wait 40 ms */
- 		consolewnd = FindWindow(NULL,
- 			"GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
- 		if (consolewnd != NULL)
- 		    ShowWindow(consolewnd, SW_HIDE);
- 		SetConsoleTitle(title);
- 		vim_free(title);
- 	    }
- 	}
- # endif
- 	/* May be use &shell, &shellquote etc */
- # ifdef __BORLANDC__
- 	/* BCC 5.5 uses a different function name for spawnlp */
- 	ph = (long_i)spawnlp(P_NOWAIT, prog, cmd, NULL);
- # else
- 	ph = (long_i)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
- # endif
- 	vim_free(prog);
- 	vim_free(cmd);
- # ifdef FEAT_GUI
- 	/* Dirty hack part two */
- 	if (activewnd != NULL)
- 	    /* restoring focus */
- 	    SetForegroundWindow(activewnd);
- 	if (consolewnd != NULL)
- 	    FreeConsole();
- 
- # endif
- 	if (ph == -1)
- 	{
- 	    PERROR(_("cs_create_connection exec failed"));
- 	    (void)EMSG(_("E623: Could not spawn cscope process"));
- 	    goto err_closing;
- 	}
- 	/* else */
- 	csinfo[i].pid = 0;
- 	csinfo[i].hProc = (HANDLE)ph;
- 
- #endif /* !UNIX */
  	/*
  	 * Save the file descriptors for later duplication, and
  	 * reopen as streams.
--- 867,872 ----
***************
*** 914,935 ****
  	if ((csinfo[i].fr_fp = fdopen(from_cs[0], "r")) == NULL)
  	    PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
- #if defined(UNIX)
  	/* close unused */
  	(void)close(to_cs[0]);
  	(void)close(from_cs[1]);
  
  	break;
      }
  #else
! 	/* restore stdhandles */
!     dup2(in_save, STDIN_FILENO);
!     dup2(out_save, STDOUT_FILENO);
!     dup2(err_save, STDERR_FILENO);
!     close(in_save);
!     close(out_save);
!     close(err_save);
! #endif
      return CSCOPE_SUCCESS;
  } /* cs_create_connection */
  
--- 876,927 ----
  	if ((csinfo[i].fr_fp = fdopen(from_cs[0], "r")) == NULL)
  	    PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
  	/* close unused */
  	(void)close(to_cs[0]);
  	(void)close(from_cs[1]);
  
  	break;
      }
+ 
  #else
!     /* WIN32 */
!     /* Create a new process to run cscope and use pipes to talk with it */
!     GetStartupInfo(&si);
!     si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
!     si.wShowWindow = SW_HIDE;  /* Hide child application window */
!     si.hStdOutput = stdout_wr;
!     si.hStdError  = stdout_wr;
!     si.hStdInput  = stdin_rd;
!     created = CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE,
! 							NULL, NULL, &si, &pi);
!     vim_free(prog);
!     vim_free(cmd);
! 
!     if (!created)
!     {
! 	PERROR(_("cs_create_connection exec failed"));
! 	(void)EMSG(_("E623: Could not spawn cscope process"));
! 	goto err_closing;
!     }
!     /* else */
!     csinfo[i].pid = pi.dwProcessId;
!     csinfo[i].hProc = pi.hProcess;
!     CloseHandle(pi.hThread);
! 
!     /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
! 	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
! 	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
! 	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
! 	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
! 
!     /* Close handles for file descriptors inherited by the cscope process */
!     CloseHandle(stdin_rd);
!     CloseHandle(stdout_wr);
! 
! #endif /* !UNIX */
! 
      return CSCOPE_SUCCESS;
  } /* cs_create_connection */
  
***************
*** 2097,2104 ****
  /*
   * PRIVATE: cs_release_csp
   *
!  * does the actual free'ing for the cs ptr with an optional flag of whether
!  * or not to free the filename.  called by cs_kill and cs_reset.
   */
      static void
  cs_release_csp(i, freefnpp)
--- 2089,2096 ----
  /*
   * PRIVATE: cs_release_csp
   *
!  * Does the actual free'ing for the cs ptr with an optional flag of whether
!  * or not to free the filename.  Called by cs_kill and cs_reset.
   */
      static void
  cs_release_csp(i, freefnpp)
***************
*** 2116,2125 ****
  	(void)fputs("q\n", csinfo[i].to_fp);
  	(void)fflush(csinfo[i].to_fp);
      }
!     /* give cscope chance to exit normally */
!     if (csinfo[i].hProc != NULL
! 	    && WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
! 	TerminateProcess(csinfo[i].hProc, 0);
  #endif
  
      if (csinfo[i].fr_fp != NULL)
--- 2108,2120 ----
  	(void)fputs("q\n", csinfo[i].to_fp);
  	(void)fflush(csinfo[i].to_fp);
      }
!     if (csinfo[i].hProc != NULL)
!     {
! 	/* Give cscope a chance to exit normally */
! 	if (WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
! 	    TerminateProcess(csinfo[i].hProc, 0);
! 	CloseHandle(csinfo[i].hProc);
!     }
  #endif
  
      if (csinfo[i].fr_fp != NULL)
***************
*** 2301,2306 ****
--- 2296,2316 ----
      wait_return(TRUE);
      return CSCOPE_SUCCESS;
  } /* cs_show */
+ 
+ 
+ /*
+  * PUBLIC: cs_end
+  *
+  * Only called when VIM exits to quit any cscope sessions.
+  */
+     void
+ cs_end()
+ {
+     int i;
+ 
+     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+ 	cs_release_csp(i, TRUE);
+ }
  
  #endif	/* FEAT_CSCOPE */
  
*** ../vim-7.1.099/src/if_cscope.h	Thu Jun 30 23:59:58 2005
--- src/if_cscope.h	Sun Sep  2 16:51:08 2007
***************
*** 72,78 ****
      ino_t	    st_ino;	/* inode number of cscope db */
  #else
  # if defined(WIN32)
!     int	    pid;	/* Can't get pid so set it to 0 ;) */
      HANDLE	    hProc;	/* cscope process handle */
      DWORD	    nVolume;	/* Volume serial number, instead of st_dev */
      DWORD	    nIndexHigh;	/* st_ino has no meaning in the Windows */
--- 72,78 ----
      ino_t	    st_ino;	/* inode number of cscope db */
  #else
  # if defined(WIN32)
!     DWORD	    pid;	/* PID of the connected cscope process. */
      HANDLE	    hProc;	/* cscope process handle */
      DWORD	    nVolume;	/* Volume serial number, instead of st_dev */
      DWORD	    nIndexHigh;	/* st_ino has no meaning in the Windows */
*** ../vim-7.1.099/src/main.c	Thu Aug 30 12:24:21 2007
--- src/main.c	Sun Sep  2 16:44:36 2007
***************
*** 1331,1336 ****
--- 1331,1339 ----
  #ifdef FEAT_NETBEANS_INTG
      netbeans_end();
  #endif
+ #ifdef FEAT_CSCOPE
+     cs_end();
+ #endif
  
      mch_exit(exitval);
  }
***************
*** 3671,3677 ****
  	mainerr_arg_missing((char_u *)filev[-1]);
      if (mch_dirname(cwd, MAXPATHL) != OK)
  	return NULL;
!     if ((p = vim_strsave_escaped_ext(cwd, PATH_ESC_CHARS, '\\', TRUE)) == NULL)
  	return NULL;
      ga_init2(&ga, 1, 100);
      ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
--- 3674,3686 ----
  	mainerr_arg_missing((char_u *)filev[-1]);
      if (mch_dirname(cwd, MAXPATHL) != OK)
  	return NULL;
!     if ((p = vim_strsave_escaped_ext(cwd,
! #ifdef BACKSLASH_IN_FILENAME
! 		    "",  /* rem_backslash() will tell what chars to escape */
! #else
! 		    PATH_ESC_CHARS,
! #endif
! 		    '\\', TRUE)) == NULL)
  	return NULL;
      ga_init2(&ga, 1, 100);
      ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
*** ../vim-7.1.099/src/proto/if_cscope.pro	Sat May  5 19:15:39 2007
--- src/proto/if_cscope.pro	Sun Sep  2 16:51:34 2007
***************
*** 6,9 ****
--- 6,10 ----
  void cs_free_tags __ARGS((void));
  void cs_print_tags __ARGS((void));
  int cs_connection __ARGS((int num, char_u *dbpath, char_u *ppath));
+ void cs_end __ARGS((void));
  /* vim: set ft=c : */
*** ../vim-7.1.099/src/version.c	Thu Sep  6 16:33:47 2007
--- src/version.c	Thu Sep  6 17:27:51 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     100,
  /**/

-- 
I have to exercise early in the morning before my brain
figures out what I'm doing.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- README.patches	24 Aug 2007 14:27:34 -0000	1.82
+++ README.patches	7 Sep 2007 14:05:05 -0000	1.83
@@ -111,3 +111,16 @@
   2496  7.1.085  after ":split fold.c" folds in one window disappear
   3561  7.1.086  crash when using specific Python syntax highlighting
   4165  7.1.087  cscope: reading past command end; writing past buffer end
+  2276  7.1.088  (extra) window position wrong when using ":winpos"
+ 13841  7.1.089  when listing variables text of command is not cleared
+  2372  7.1.090  compiler warning on Mac OS X 10.5 for sigaltstack()
+ 10488  7.1.091  (extra) Win32: add --windowid argument
+  2901  7.1.092  (extra, after 7.1.088) wrong args for MoveWindowStructure()
+ 15955  7.1.093  read past end of screen line when checking for double width
+  1901  7.1.094  using wrong buffer to check if syntax HL is present
+  5809  7.1.095  autocmmand for focus events may cause problems
+  2287  7.1.096  reading past end of a string when resizing Vim
+  1620  7.1.097  "setlocal stl=%!expr" doesn't work
+  1780  7.1.098  ":call s:var()" doesn't work if "s:var" is a Funcref
+  4552  7.1.099  ":mkvimrc" doesn't work properly when 'paste' or 'keymap' set
+ 14551  7.1.100  Win32: Executing cscope doesn't always work properly


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- vim.spec	27 Aug 2007 13:28:26 -0000	1.174
+++ vim.spec	7 Sep 2007 14:05:05 -0000	1.175
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 87
+%define patchlevel 100
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -141,6 +141,23 @@
 Patch085: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085
 Patch086: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086
 Patch087: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087
+# Mac:
+#Patch088: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088
+Patch089: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089
+Patch090: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090
+# Win32:
+#Patch091: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091
+# Mac:
+#Patch092: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092
+Patch093: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093
+Patch094: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094
+Patch095: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095
+Patch096: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096
+Patch097: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097
+Patch098: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098
+Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
+# Win32:
+#Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -366,6 +383,23 @@
 %patch085 -p0 
 %patch086 -p0 
 %patch087 -p0 
+# Mac:
+#patch088 -p0 
+%patch089 -p0 
+%patch090 -p0 
+# Win32:
+#patch091 -p0 
+# Mac:
+#patch092 -p0 
+%patch093 -p0 
+%patch094 -p0 
+%patch095 -p0 
+%patch096 -p0 
+%patch097 -p0 
+%patch098 -p0 
+%patch099 -p0 
+# Win32:
+#patch100 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -751,6 +785,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1
+- patchlevel 100
+
 * Fri Aug 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.87-1
 - add build requirement perl-devel
 - fix tarball unpacking



From fedora-extras-commits at redhat.com  Fri Sep  7 14:27:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 10:27:30 -0400
Subject: rpms/gdm/devel .cvsignore, 1.54, 1.55 gdm.spec, 1.279, 1.280 sources,
	1.57, 1.58
Message-ID: <200709071427.l87ERUOh028680@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28552

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.19.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	4 Sep 2007 13:07:40 -0000	1.54
+++ .cvsignore	7 Sep 2007 14:26:58 -0000	1.55
@@ -1 +1 @@
-gdm-2.19.7.tar.bz2
+gdm-2.19.8.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- gdm.spec	4 Sep 2007 13:07:40 -0000	1.279
+++ gdm.spec	7 Sep 2007 14:26:58 -0000	1.280
@@ -15,7 +15,7 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.7
+Version: 2.19.8
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
@@ -203,19 +203,16 @@
  
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
-  --remove-category Application				    \
+  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmsetup.desktop || :
+
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
   $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop || :
 
 desktop-file-install --delete-original       			\
   --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications          	\
-  --remove-category Application				    	\
   $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver.desktop || :
 
-desktop-file-install --delete-original       			\
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications            	\
-  --remove-category Application				    	\
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver-xnest.desktop || :
-
 # broken install-data-local in gui/Makefile.am makes this necessary
 (cd $RPM_BUILD_ROOT%{_bindir} && ln -sf gdmXnestchooser gdmXnest)
 
@@ -351,7 +348,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
-* Tue Sep  4 2007 Matthias  Clasen <mclasen at redhat.com> - 1:2.19.7-1
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.8-1
+- Update to 2.19.8
+
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.7-1
 - Update to 2.19.7
 
 * Fri Aug 24 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.6-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	4 Sep 2007 13:07:40 -0000	1.57
+++ sources	7 Sep 2007 14:26:58 -0000	1.58
@@ -1,2 +1,2 @@
-27f04ecfaeabcd238f8df66660d50d7b  gdm-2.19.7.tar.bz2
+65eb454eef0b9fc9d4abf9de3d2c9b45  gdm-2.19.8.tar.bz2
 7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:15 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:15 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709071438.l87EcF2m011724@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on gnupg (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:37 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:37 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709071438.l87EcbeR011739@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgpg-error (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:46 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:46 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709071438.l87EclmH011748@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgcrypt (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:48 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709071438.l87Ecmox011758@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgcrypt (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 14:43:07 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 7 Sep 2007 10:43:07 -0400
Subject: rpms/rogue/devel rogue.png,1.2,NONE rogue.desktop,1.4,NONE
Message-ID: <200709071443.l87Eh73M029622@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29613

Removed Files:
	rogue.png rogue.desktop 
Log Message:
Drop two files that are now part of upstream's source tarball.




--- rogue.desktop DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:23 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:23 -0700
Subject: [pkgdb] system-config-lvm (Fedora, 7) updated by toshio
Message-ID: <200709071548.l87FmOUp012506@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-lvm (Fedora 7) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:23 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:23 -0700
Subject: [pkgdb] system-config-lvm (Fedora, devel) updated by toshio
Message-ID: <200709071548.l87FmPT3012518@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-lvm (Fedora devel) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:45 -0700
Subject: [pkgdb] system-config-cluster (Fedora, 7) updated by toshio
Message-ID: <200709071548.l87FmkcE012531@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-cluster (Fedora 7) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-cluster



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:45 -0700
Subject: [pkgdb] system-config-cluster (Fedora, devel) updated by toshio
Message-ID: <200709071548.l87FmkoN012543@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-cluster (Fedora devel) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-cluster



From fedora-extras-commits at redhat.com  Fri Sep  7 15:53:28 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 07 Sep 2007 08:53:28 -0700
Subject: [pkgdb] telepathy-gabble: mcepl has requested commit
Message-ID: <200709071553.l87FrSxv012583@app3.fedora.phx.redhat.com>

Matej Cepl (mcepl) has requested the commit acl on telepathy-gabble (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 15:55:56 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 11:55:56 -0400
Subject: rpms/libtelepathy/devel Makefile,1.1,1.2
Message-ID: <200709071555.l87FtufD008358@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316

Modified Files:
	Makefile 
Log Message:
just test





From fedora-extras-commits at redhat.com  Fri Sep  7 15:58:01 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 11:58:01 -0400
Subject: rpms/libtelepathy/devel .cvsignore, 1.12, 1.13 libtelepathy.spec,
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <200709071558.l87Fw1jL008499@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Jun 2007 19:09:45 -0000	1.12
+++ .cvsignore	7 Sep 2007 15:57:29 -0000	1.13
@@ -1 +1 @@
-libtelepathy-0.0.55.tar.gz
+libtelepathy-0.0.57.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libtelepathy.spec	21 Aug 2007 17:08:19 -0000	1.13
+++ libtelepathy.spec	7 Sep 2007 15:57:29 -0000	1.14
@@ -1,17 +1,17 @@
 Name:           libtelepathy
-Version:        0.0.55
-Release:        3%{?dist}
+Version:        0.0.57
+Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:		http://telepathy.freedesktop.org/wiki/    
+URL:            http://telepathy.freedesktop.org/wiki/    
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	dbus-devel  
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libxslt
+BuildRequires:  dbus-devel  
+BuildRequires:  dbus-glib-devel
+BuildRequires:  libxslt
 
 
 %description
@@ -22,9 +22,9 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
-Requires:	pkgconfig
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       pkgconfig
 
 
 %description    devel
@@ -71,17 +71,11 @@
 
 
 %changelog
-* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-3
-- Rebuild.
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.0.57-1
+- New upstream version.
 
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-2
-- Update license tag.
-
-* Wed Jun 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-1
-- Update to 0.0.55.
-
-* Sun May 20 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.54-1
-- Update to 0.0.54.
+* Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.0.55-1
+- Update to 0.0.55
 
 * Fri Apr 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.53-1
 - Update to 0.0.53.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Jun 2007 19:09:45 -0000	1.12
+++ sources	7 Sep 2007 15:57:29 -0000	1.13
@@ -1 +1 @@
-2cbbbeaf97c154a7fb9b088b95deb70e  libtelepathy-0.0.55.tar.gz
+74d788c17ef2d01c6d4c084d64839dfc  libtelepathy-0.0.57.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:02:04 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:02:04 -0400
Subject: rpms/libtelepathy/F-7 .cvsignore, 1.11, 1.12 libtelepathy.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <200709071602.l87G24xa014813@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Jun 2007 20:04:33 -0000	1.11
+++ .cvsignore	7 Sep 2007 16:01:30 -0000	1.12
@@ -1,2 +1 @@
-libtelepathy-0.0.53.tar.gz
-libtelepathy-0.0.55.tar.gz
+libtelepathy-0.0.57.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/libtelepathy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libtelepathy.spec	14 Jun 2007 20:04:33 -0000	1.10
+++ libtelepathy.spec	7 Sep 2007 16:01:30 -0000	1.11
@@ -1,17 +1,17 @@
 Name:           libtelepathy
-Version:        0.0.55
+Version:        0.0.57
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
 Group:          System Environment/Libraries
-License:        LGPL
-URL:		http://telepathy.freedesktop.org/wiki/    
+License:        LGPLv2+
+URL:            http://telepathy.freedesktop.org/wiki/    
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	dbus-devel  
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libxslt
+BuildRequires:  dbus-devel  
+BuildRequires:  dbus-glib-devel
+BuildRequires:  libxslt
 
 
 %description
@@ -22,9 +22,9 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
-Requires:	pkgconfig
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       pkgconfig
 
 
 %description    devel
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.0.57-1
+- New upstream version.
+
 * Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.0.55-1
 - Update to 0.0.55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 20:04:33 -0000	1.11
+++ sources	7 Sep 2007 16:01:30 -0000	1.12
@@ -1 +1 @@
-2cbbbeaf97c154a7fb9b088b95deb70e  libtelepathy-0.0.55.tar.gz
+74d788c17ef2d01c6d4c084d64839dfc  libtelepathy-0.0.57.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:06:14 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:06:14 -0400
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 telepathy-gabble.spec, 1.26, 1.27
Message-ID: <200709071606.l87G6EEk015238@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15169

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Aug 2007 22:34:45 -0000	1.21
+++ .cvsignore	7 Sep 2007 16:05:41 -0000	1.22
@@ -1 +1 @@
-telepathy-gabble-0.5.13.tar.gz
+telepathy-gabble-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 Aug 2007 22:34:45 -0000	1.21
+++ sources	7 Sep 2007 16:05:41 -0000	1.22
@@ -1 +1 @@
-286613c8b7d76d18dcb6489e2bdd65c2  telepathy-gabble-0.5.13.tar.gz
+4b5532dec83a9ae097e8dd482eeee4df  telepathy-gabble-0.5.14.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- telepathy-gabble.spec	30 Aug 2007 22:34:45 -0000	1.26
+++ telepathy-gabble.spec	7 Sep 2007 16:05:41 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.5.13
+Version:        0.5.14
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -11,13 +11,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel >= 0.72
-BuildRequires:	loudmouth-devel >= 1.1.1
-BuildRequires:	telepathy-glib-devel >= 0.5.14
-BuildRequires:	libxslt
-BuildRequires:	python
+BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  loudmouth-devel >= 1.1.1
+BuildRequires:  telepathy-glib-devel >= 0.5.14
+BuildRequires:  libxslt
+BuildRequires:  python
 
-Requires:	telepathy-filesystem
+Requires:  telepathy-filesystem
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.5.14-1
+- New upstream version
+
 * Thu Aug 30 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-1
 - Update to 0.5.13.
 - Bump minimum version of telepathy-glib.



From fedora-extras-commits at redhat.com  Fri Sep  7 16:08:40 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:08:40 -0400
Subject: rpms/telepathy-gabble/F-7 .cvsignore,1.20,1.21 sources,1.20,1.21
Message-ID: <200709071608.l87G8e4b015415@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15382

Modified Files:
	.cvsignore sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Jun 2007 00:18:04 -0000	1.20
+++ .cvsignore	7 Sep 2007 16:08:07 -0000	1.21
@@ -1 +1 @@
-telepathy-gabble-0.5.12.tar.gz
+telepathy-gabble-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Jun 2007 00:18:04 -0000	1.20
+++ sources	7 Sep 2007 16:08:07 -0000	1.21
@@ -1 +1 @@
-807cf9c79f8dd17e890a5f769bde7158  telepathy-gabble-0.5.12.tar.gz
+4b5532dec83a9ae097e8dd482eeee4df  telepathy-gabble-0.5.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:11:56 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:11:56 -0400
Subject: rpms/telepathy-gabble/F-7 telepathy-gabble.spec,1.22,1.23
Message-ID: <200709071611.l87GBurZ015687@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627

Modified Files:
	telepathy-gabble.spec 
Log Message:
new upstream version, forgot SPEC


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/telepathy-gabble.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-gabble.spec	5 Aug 2007 23:34:41 -0000	1.22
+++ telepathy-gabble.spec	7 Sep 2007 16:11:22 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.5.12
-Release:        2%{?dist}
+Version:        0.5.14
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -11,12 +11,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel >= 0.72
-BuildRequires:	loudmouth-devel >= 1.1.1
-BuildRequires:	telepathy-glib-devel >= 0.5.13
-BuildRequires:	libxslt
+BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  loudmouth-devel >= 1.1.1
+BuildRequires:  telepathy-glib-devel >= 0.5.14
+BuildRequires:  libxslt
+BuildRequires:  python
 
-Requires:	telepathy-filesystem
+Requires:  telepathy-filesystem
 
 
 %description
@@ -51,9 +52,25 @@
 
 
 %changelog
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-2
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.5.14-1
+- New upstream version
+
+* Thu Aug 30 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-1
+- Update to 0.5.13.
+- Bump minimum version of telepathy-glib.
+
+* Tue Aug 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-5
+- Add python as a BR.
+
+* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-4
+- Rebuild.
+
+* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-3
 - Update license tag.
 
+* Tue Jun 19 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-2
+- Correct version check for loudmouth
+
 * Tue Jun 19 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-1
 - Update to 0.5.12.
 - Add BR on telepathy-glib-devel



From fedora-extras-commits at redhat.com  Fri Sep  7 16:22:48 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 12:22:48 -0400
Subject: rpms/gdm/devel gdm-2.19.8-selinux.patch, NONE, 1.1 gdm.spec, 1.280, 
	1.281 gdm-2.19.6-selinux.patch, 1.1, NONE
Message-ID: <200709071622.l87GMmKY016596@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16535

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.19.8-selinux.patch 
Removed Files:
	gdm-2.19.6-selinux.patch 
Log Message:
- make things work better for xguest users (bug 254164)


gdm-2.19.8-selinux.patch:

--- NEW FILE gdm-2.19.8-selinux.patch ---
diff -up gdm-2.19.8/configure.ac.selinux gdm-2.19.8/configure.ac
diff -up gdm-2.19.8/daemon/slave.c.selinux gdm-2.19.8/daemon/slave.c
--- gdm-2.19.8/daemon/slave.c.selinux	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/daemon/slave.c	2007-09-07 12:21:37.000000000 -0400
@@ -89,7 +89,6 @@
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
-#include <selinux/get_context_list.h>
 #endif /* HAVE_SELINUX */
 
 #include <glib/gi18n.h>
@@ -172,6 +171,10 @@ static uid_t logged_in_uid             =
 static gid_t logged_in_gid             = -1;
 #endif
 
+#ifdef HAVE_SELINUX
+security_context_t logged_in_context   = NULL;
+#endif 
+
 static int greeter_fd_out              = -1;
 static int greeter_fd_in               = -1;
 
@@ -2036,6 +2039,7 @@ restart_the_greeter (void)
 	gdm_slave_sensitize_config ();
 }
 
+
 static gboolean
 play_login_sound (const char *sound_file)
 {
@@ -3519,48 +3523,6 @@ open_xsession_errors (struct passwd *pwe
 	return logfd;
 }
 
-#ifdef HAVE_SELINUX
-/* This should be run just before we exec the user session */
-static gboolean
-gdm_selinux_setup (const char *login)
-{
-	security_context_t scontext;
-	int ret=-1;
-	char *seuser=NULL;
-	char *level=NULL;
-
-	/* If selinux is not enabled, then we don't do anything */
-	if (is_selinux_enabled () <= 0)
-		return TRUE;
-
-	if (getseuserbyname(login, &seuser, &level) == 0)
-		ret=get_default_context_with_level(seuser, level, 0, &scontext);
-
-	if (ret < 0) {
-		gdm_error ("SELinux gdm login: unable to obtain default security context for %s.", login);
-		/* note that this will be run when the .xsession-errors
-		   is already being logged, so we can use stderr */
-		gdm_fdprintf (2, "SELinux gdm login: unable to obtain default security context for %s.", login);
- 		return (security_getenforce()==0);
-	}
-
-	gdm_assert (scontext != NULL);
-
-	if (setexeccon (scontext) != 0) {
-		gdm_error ("SELinux gdm login: unable to set executable context %s.",
-			   (char *)scontext);
-		gdm_fdprintf (2, "SELinux gdm login: unable to set executable context %s.",
-			      (char *)scontext);
-		freecon (scontext);
-		return (security_getenforce()==0);
-	}
-
-	freecon (scontext);
-
-	return TRUE;
-}
-#endif /* HAVE_SELINUX */
-
 static void
 session_child_run (struct passwd *pwent,
 		   int logfd,
@@ -3801,6 +3763,10 @@ session_child_run (struct passwd *pwent,
                         close (iceauth_fd);
         }
 
+#ifdef HAVE_SELINUX
+        setexeccon (logged_in_context);
+#endif
+
 	NEVER_FAILS_setegid (pwent->pw_gid);
 #ifdef HAVE_LOGINCAP
 	if (setusercontext (NULL, pwent, pwent->pw_uid,
@@ -4046,16 +4012,6 @@ session_child_run (struct passwd *pwent,
 	}
 #endif
 
-#ifdef HAVE_SELINUX
-	if ( ! gdm_selinux_setup (pwent->pw_name)) {
-		/* 66 means no "session crashed" examine .xsession-errors
-		   dialog */
-		gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
-			       _("Error! Unable to set executable context."));
-		_exit (66);
-	}
-#endif
-
         g_shell_parse_argv (fullexec->str, NULL, &argv, NULL);
 	VE_IGNORE_EINTR (execv (argv[0], argv));
 	g_strfreev (argv);
@@ -4741,6 +4697,11 @@ gdm_slave_session_start (void)
 
 	NEVER_FAILS_root_set_euid_egid (0, gdm_daemon_config_get_gdmgid ());
 
+#ifdef HAVE_SELINUX
+        getexeccon (&logged_in_context);
+        setexeccon (NULL);
+#endif
+
 	if G_UNLIKELY ( ! authok) {
 		gdm_debug ("gdm_slave_session_start: Auth not OK");
 
@@ -5009,6 +4970,10 @@ gdm_slave_session_stop (gboolean run_pos
 	seteuid (0);
 	setegid (0);
 
+#ifdef HAVE_SELINUX
+        setexeccon (NULL);
+#endif
+
 	gdm_slave_send_num (GDM_SOP_SESSPID, 0);
 
 	/* Now still as root make the system authfile not readable by others,
@@ -5069,6 +5034,12 @@ gdm_slave_session_stop (gboolean run_pos
 	logged_in_uid = -1;
 	logged_in_gid = -1;
 
+#ifdef HAVE_SELINUX
+        setexeccon (logged_in_context);
+	freecon (logged_in_context);
+	logged_in_context = NULL;
+#endif
+
 	/* things are going to be killed, so ignore errors */
 	XSetErrorHandler (ignore_xerror_handler);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- gdm.spec	7 Sep 2007 14:26:58 -0000	1.280
+++ gdm.spec	7 Sep 2007 16:22:15 -0000	1.281
@@ -53,7 +53,7 @@
 Patch35: gdmsetup-path.patch
 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
-Patch37: gdm-2.19.6-selinux.patch
+Patch37: gdm-2.19.8-selinux.patch
 
 Patch100: gdm-2.19.6-change-defaults.patch
 
@@ -348,6 +348,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-2
+- make things work better for xguest users (bug 254164)
+
 * Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.8-1
 - Update to 2.19.8
 


--- gdm-2.19.6-selinux.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 16:23:44 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 12:23:44 -0400
Subject: rpms/gdm/devel gdm.spec,1.281,1.282
Message-ID: <200709071623.l87GNi5q016711@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- gdm.spec	7 Sep 2007 16:22:15 -0000	1.281
+++ gdm.spec	7 Sep 2007 16:23:11 -0000	1.282
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X



From fedora-extras-commits at redhat.com  Fri Sep  7 16:30:22 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 7 Sep 2007 12:30:22 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.1.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.139, 1.140 sources, 1.144, 1.145 system-config-printer.spec,
	1.127, 1.128
Message-ID: <200709071630.l87GUMtY017234@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.1.tar.bz2.sig 
Log Message:
* Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
- 0.7.74.1:
  - Updated Polish translation (bug #263001).
  - Don't select the default printer after changes to another printer have
    been made.
  - Always construct URI from input fields when changing device (bug #281551).
  - Avoid busy-cursor traceback when window is not yet displayed.



--- NEW FILE system-config-printer-0.7.74.1.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- .cvsignore	30 Aug 2007 13:25:16 -0000	1.139
+++ .cvsignore	7 Sep 2007 16:29:48 -0000	1.140
@@ -135,3 +135,4 @@
 system-config-printer-0.7.73.tar.bz2
 pycups-1.9.25.tar.bz2
 system-config-printer-0.7.74.tar.bz2
+system-config-printer-0.7.74.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	30 Aug 2007 13:25:16 -0000	1.144
+++ sources	7 Sep 2007 16:29:48 -0000	1.145
@@ -1,2 +1,2 @@
 eda648fec5d187fa13a676c60c7e6b1e  pycups-1.9.25.tar.bz2
-325264dec8740ac51f62e8e5b3e3b47e  system-config-printer-0.7.74.tar.bz2
+b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- system-config-printer.spec	30 Aug 2007 13:25:16 -0000	1.127
+++ system-config-printer.spec	7 Sep 2007 16:29:48 -0000	1.128
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74
+Version: 0.7.74.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -126,6 +126,14 @@
 fi
 
 %changelog
+* Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
+- 0.7.74.1:
+  - Updated Polish translation (bug #263001).
+  - Don't select the default printer after changes to another printer have
+    been made.
+  - Always construct URI from input fields when changing device (bug #281551).
+  - Avoid busy-cursor traceback when window is not yet displayed.
+
 * Thu Aug 30 2007 Tim Waugh <twaugh at redhat.com> 0.7.74-1
 - Updated pycups to 1.9.25.
 - 0.7.74:



From fedora-extras-commits at redhat.com  Fri Sep  7 16:37:16 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 7 Sep 2007 12:37:16 -0400
Subject: rpms/squid/F-7 squid-2.6.STABLE16-config.patch, NONE, 1.1 .cvsignore,
	1.28, 1.29 sources, 1.30, 1.31 squid.spec, 1.86,
	1.87 squid-2.6.STABLE14-config.patch, 1.1, NONE
Message-ID: <200709071637.l87GbGsk017935@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE16-config.patch 
Removed Files:
	squid-2.6.STABLE14-config.patch 
Log Message:
* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE14


squid-2.6.STABLE16-config.patch:

--- NEW FILE squid-2.6.STABLE16-config.patch ---
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config	2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
 #http_access allow our_networks
 
 # And finally deny all other access to this proxy
+http_access allow localhost
 http_access deny all
 NOCOMMENT_END
 DOC_END
@@ -2250,7 +2251,7 @@ DOC_END
 
 NAME: logfile_rotate
 TYPE: int
-DEFAULT: 10
+DEFAULT: 0
 LOC: Config.Log.rotateNumber
 DOC_START
 	Specifies the number of logfile rotations to make when you
@@ -2266,6 +2267,8 @@ DOC_START
 	purposes, so -k rotate uses another signal.  It is best to get
 	in the habit of using 'squid -k rotate' instead of 'kill -USR1
 	<pid>'.
+	
+logfile_rotate 0
 DOC_END
 
 NAME: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
 
 NAME: cache_mgr
 TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
 LOC: Config.adminEmail
 DOC_START
 	Email-address of local cache manager who will receive
-	mail if the cache dies. The default is "webmaster".
+	mail if the cache dies. The default is "root".
 DOC_END
 
 NAME: mail_from
@@ -3374,21 +3377,22 @@ DOC_END
 
 NAME: cache_effective_user
 TYPE: string
-DEFAULT: nobody
+DEFAULT: squid
 LOC: Config.effectiveUser
 DOC_START
 	If you start Squid as root, it will change its effective/real
 	UID/GID to the user specified below.  The default is to change
-	to UID to nobody.  If you define cache_effective_user, but not
+	to UID to squid.  If you define cache_effective_user, but not
 	cache_effective_group, Squid sets the GID to the effective
 	user's default group ID (taken from the password file) and
 	supplementary group list from the from groups membership of
 	cache_effective_user.
+cache_effective_user squid
 DOC_END
 
 NAME: cache_effective_group
 TYPE: string
-DEFAULT: none
+DEFAULT: squid
 LOC: Config.effectiveGroup
 DOC_START
 	If you want Squid to run with a specific GID regardless of
@@ -3398,6 +3402,7 @@ DOC_START
 	and only this GID is effective. If Squid is not started as
 	root the user starting Squid must be member of the specified
 	group.
+cache_effective_group squid
 DOC_END
 
 NAME: httpd_suppress_version_string
@@ -4018,12 +4023,12 @@ COMMENT_END
 NAME: snmp_port
 TYPE: ushort
 LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
 IFDEF: SQUID_SNMP
 DOC_START
 	Squid can now serve statistics and status information via SNMP.
-	By default it listens to port 3401 on the machine. If you don't
-	wish to use SNMP, set this to "0".
+	A value of "0" disables SNMP support. If you wish to use SNMP,
+	set this to "3401" to use the normal SNMP support.
 DOC_END
 
 NAME: snmp_access
@@ -4402,15 +4407,22 @@ TYPE: string
 LOC: Config.errorDirectory
 DEFAULT: @DEFAULT_ERROR_DIR@
 DOC_START
-	If you wish to create your own versions of the default
-	(English) error files, either to customize them to suit your
-	language or company copy the template English files to another
+	Directory where the error files are read from.
+	/usr/lib/squid/errors contains sets of error files
+	in different languages. The default error directory
+	is /etc/squid/errors, which is a link to one of these
+	error sets.
+
+	If you wish to create your own versions of the error files,
+	either to customize them to suit your language or company,
+	copy the template English files to another
 	directory and point this tag at them.
-
-	The squid developers are interested in making squid available in
-	a wide variety of languages. If you are making translations for a
-	langauge that Squid does not currently provide please consider
-	contributing your translation back to the project.
+	
+    The squid developers are interested in making squid available in
+    a wide variety of languages. If you are making translations for a
+    langauge that Squid does not currently provide please consider
+    contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
 DOC_END
 
 NAME: error_map


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	2 Aug 2007 10:07:22 -0000	1.28
+++ .cvsignore	7 Sep 2007 16:36:44 -0000	1.29
@@ -1 +1 @@
-squid-2.6.STABLE14.tar.bz2
+squid-2.6.STABLE16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Aug 2007 10:07:22 -0000	1.30
+++ sources	7 Sep 2007 16:36:44 -0000	1.31
@@ -1 +1 @@
-eadb138d48320df8b99349121159c6bf  squid-2.6.STABLE14.tar.bz2
+849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/squid.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- squid.spec	2 Aug 2007 10:07:22 -0000	1.86
+++ squid.spec	7 Sep 2007 16:36:44 -0000	1.87
@@ -4,7 +4,7 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE14
+Version:  2.6.STABLE16
 Release:  1%{?dist}
 Epoch:    7
 License:  GPL
@@ -26,7 +26,7 @@
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-2.6.STABLE14-config.patch
+Patch201: squid-2.6.STABLE16-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
@@ -326,6 +326,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
+- upgrade to latest upstream 2.6.STABLE14
+
 * Wed Aug  1 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
 - upgrade to latest upstream 2.6.STABLE14
 


--- squid-2.6.STABLE14-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 16:39:54 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 7 Sep 2007 12:39:54 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.tar.bz2.sig, 1.1, NONE
Message-ID: <200709071639.l87Gds7r018154@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18143

Removed Files:
	system-config-printer-0.7.74.tar.bz2.sig 
Log Message:
No longer need this.


--- system-config-printer-0.7.74.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 17:29:51 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 13:29:51 -0400
Subject: rpms/netpanzer/FC-6 netpanzer-desktop.patch, NONE,
	1.1 netpanzer.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709071729.l87HTpdh026296@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26193

Modified Files:
	netpanzer.spec sources 
Added Files:
	netpanzer-desktop.patch 
Log Message:
Bump to 0.8.2, merge -data in to follow upstream.


netpanzer-desktop.patch:

--- NEW FILE netpanzer-desktop.patch ---
--- netpanzer.desktop	2007-08-29 14:32:49.000000000 -0500
+++ netpanzer.desktop	2007-08-29 14:32:49.000000000 -0500
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=1.0
 Encoding=UTF-8
 Type=Application
 Name=NetPanzer
@@ -9,4 +8,4 @@
 Exec=netpanzer
 Terminal=false
 StartupNotify=false
-Categories=Application;Game;StrategyGame;
+Categories=Game;StrategyGame;


Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/FC-6/netpanzer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netpanzer.spec	16 Aug 2007 17:07:18 -0000	1.5
+++ netpanzer.spec	7 Sep 2007 17:29:18 -0000	1.6
@@ -1,18 +1,19 @@
 Name:           netpanzer
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        An Online Multiplayer Tactical Warfare Game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://netpanzer.berlios.de
 Source0:        http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2
+Patch0:         netpanzer-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen
-BuildRequires:	SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
-#Requires:       SDL >= 1.2.5, SDL_mixer >= 1.2, SDL_image >= 1.2, physfs >= 0.1.9
-Requires:	netpanzer-data >= 0.8
+BuildRequires:  SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
+Obsoletes:      netpanzer-data <= 0.8
+Provides:       netpanzer-data = %{version}-%{release}
 
 %description
 netPanzer is an online multiplayer tactical warfare game designed for FAST
@@ -28,6 +29,9 @@
 # Strip \r from RELNOTES file
 sed -i 's/\r//' RELNOTES
 
+#Correct .desktop file
+%patch0 -p0
+
 %build
 %configure
 jam %{?_smp_mflags}
@@ -73,9 +77,14 @@
 %{_bindir}/netpanzer
 %{_datadir}/applications/fedora-netpanzer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/netpanzer.png
-
+%{_datadir}/netpanzer
 
 %changelog
+* Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.8.2-1
+- Bumped to 0.8.2.
+- Merged in and obsoleted/provided netpanzer-data to follow upstream.
+- Patch to correct upstream .desktop file.
+
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> 0.8.1-2
 - License tag correction.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 12:42:38 -0000	1.3
+++ sources	7 Sep 2007 17:29:18 -0000	1.4
@@ -1 +1 @@
-044afc7559d9783abbea8deaa33d7a73  netpanzer-0.8.1.tar.bz2
+3f446403ac7e72ed0ff9e093517c83d3  netpanzer-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 17:34:23 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 7 Sep 2007 13:34:23 -0400
Subject: rpms/python-virtinst/F-7 virtinst-0.200.0-cdrom-src.patch, NONE,
	1.1 virtinst-0.200.0-kvm-kernel.patch, NONE,
	1.1 python-virtinst.spec, 1.21, 1.22
Message-ID: <200709071734.l87HYN01026586@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26530

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.200.0-cdrom-src.patch 
	virtinst-0.200.0-kvm-kernel.patch 
Log Message:
Fixed post-install CDROm source and KVM kernel config

virtinst-0.200.0-cdrom-src.patch:

--- NEW FILE virtinst-0.200.0-cdrom-src.patch ---
diff -rup virtinst-0.200.0/virtinst/Guest.py virtinst-0.200.0.new/virtinst/Guest.py
--- virtinst-0.200.0/virtinst/Guest.py	2007-07-18 22:04:21.000000000 -0400
+++ virtinst-0.200.0.new/virtinst/Guest.py	2007-09-06 23:11:54.000000000 -0400
@@ -151,9 +151,7 @@ class VirtualDisk:
                 ret += "      <driver name='%(name)s'/>\n" % { "name": self.driver_name }
             else:
                 ret += "      <driver name='%(name)s' type='%(type)s'/>\n" % { "name": self.driver_name, "type": self.driver_type }
-        if self.path is None:
-            ret += "      <source %(typeattr)s=''/>\n" % { "typeattr": typeattr }
-        else:
+        if self.path is not None:
             ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": self.path }
         ret += "      <target dev='%(disknode)s'/>\n" % { "disknode": disknode }
         if self.read_only:

virtinst-0.200.0-kvm-kernel.patch:

--- NEW FILE virtinst-0.200.0-kvm-kernel.patch ---
changeset:   254:b33e850305be
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Aug 21 17:46:58 2007 -0400
summary:     Fixed XML generated for kernel/initrd installs of KVM

diff -r 7220fc5059e4 -r b33e850305be virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Tue Aug 21 17:42:12 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Aug 21 17:46:58 2007 -0400
@@ -692,7 +692,7 @@ class DistroInstaller(Guest.Installer):
             else:
                 osblob += "    <type>%s</type>\n" % type
 
-            if self.install["kernel"]:
+            if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % self.install["kernel"]
                 osblob += "    <initrd>%s</initrd>\n"   % self.install["initrd"]
                 osblob += "    <cmdline>%s</cmdline>\n" % self.install["extraargs"]



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-7/python-virtinst.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-virtinst.spec	26 Jul 2007 15:07:55 -0000	1.21
+++ python-virtinst.spec	7 Sep 2007 17:33:50 -0000	1.22
@@ -11,7 +11,7 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.200.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.et.redhat.com/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -25,6 +25,8 @@
 BuildRequires: python-devel
 Obsoletes: python-xeninst < 0.97.0
 Patch1: %{appname}-%{version}-default-arch.patch
+Patch2: %{appname}-%{version}-cdrom-src.patch
+Patch3: %{appname}-%{version}-kvm-kernel.patch
 
 %description
 virtinst is a module to help in starting installations of Fedora/Red
@@ -39,6 +41,8 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -67,6 +71,10 @@
 %{_bindir}/virt-clone
 
 %changelog
+* Thu Sep  6 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-3.fc7
+- Fixed CDROM source post-install (rhbz #260981)
+- Fixed kernel for post-install config with KVM guests
+
 * Thu Jul 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-2.fc7
 - Fixed default architecture
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:34:28 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 13:34:28 -0400
Subject: rpms/armacycles-ad/FC-6 armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709071734.l87HYSIu026594@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26528

Modified Files:
	sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	7 Sep 2007 17:33:55 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 17:35:07 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 13:35:07 -0400
Subject: rpms/jakarta-commons-codec/devel
	jakarta-commons-codec-addosgimanifest.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 jakarta-commons-codec.spec, 1.17, 1.18
Message-ID: <200709071735.l87HZ7Aw026720@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26580

Modified Files:
	.cvsignore jakarta-commons-codec.spec 
Added Files:
	jakarta-commons-codec-addosgimanifest.patch 
Log Message:
Add OSGi manifest


jakarta-commons-codec-addosgimanifest.patch:

--- NEW FILE jakarta-commons-codec-addosgimanifest.patch ---
--- MANIFEST.MF 2007-09-06 12:18:33.000000000 -0400
+++ MANIFEST.MF 2007-09-06 12:10:37.000000000 -0400
@@ -4,4 +4,15 @@
 Specification-Version: 1.3
 Implementation-Title: org.apache.commons.codec
 Implementation-Vendor: Apache Software Foundation
-Implementation-Version: 1.3
\ No newline at end of file
+Implementation-Version: 1.3
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.codec
+Bundle-Version: 1.3.0.qualifier
+Bundle-Localization: plugin
+Export-Package: org.apache.commons.codec;version="1.3.0",
+ org.apache.commons.codec.binary;version="1.3.0",
+ org.apache.commons.codec.digest;version="1.3.0",
+ org.apache.commons.codec.language;version="1.3.0",
+ org.apache.commons.codec.net;version="1.3.0"
+Bundle-Vendor: %bundleProvider



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Apr 2007 00:19:38 -0000	1.4
+++ .cvsignore	7 Sep 2007 17:34:34 -0000	1.5
@@ -1 +1,11 @@
-commons-codec-1.3-src.tar.gz
+.classpath
+.clover
+.project
+CODEC_1_*.xml
+HEAD.xml
+dist
+junit*.properties
+maven.log
+pub
+target
+velocity.log
\ No newline at end of file


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-codec.spec	26 Apr 2007 00:19:38 -0000	1.17
+++ jakarta-commons-codec.spec	7 Sep 2007 17:34:34 -0000	1.18
@@ -38,7 +38,7 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        8jpp.1%{?dist}
+Release:        8jpp.2%{?dist}
 Summary:        Implementations of common encoders and decoders
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -50,6 +50,8 @@
 # tar czvf commons-codec-1.3-src.tar.gz .
 
 Patch0:         jakarta-commons-codec-1.3-buildscript.patch
+# Add OSGi manifest
+Patch1:         %{name}-addosgimanifest.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit
@@ -91,6 +93,11 @@
 # This problem has been communicated upstream Bug 31096
 %patch0 -p1
 
+# Add OSGi manifest
+pushd src/conf
+%patch1 -p0
+popd
+
 #fixes eof encoding
 %{__sed} -i 's/\r//' LICENSE.txt
 %{__sed} -i 's/\r//' RELEASE-NOTES.txt
@@ -171,6 +178,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.3-8jpp.2
+- Add OSGi manifest.
+
 * Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp.1
 - Update to latest jpp version
 - Fix rpmlint issues



From fedora-extras-commits at redhat.com  Fri Sep  7 17:43:00 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:43:00 -0400
Subject: rpms/gdm/devel gdm.spec,1.282,1.283
Message-ID: <200709071743.l87Hh0gd027143@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27111

Modified Files:
	gdm.spec 
Log Message:
- rebuild --with-selinux



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- gdm.spec	7 Sep 2007 16:23:11 -0000	1.282
+++ gdm.spec	7 Sep 2007 17:42:28 -0000	1.283
@@ -154,7 +154,8 @@
 %configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-console-helper \
 	   --disable-scrollkeeper  \
-	   --with-console-kit
+	   --with-console-kit      \
+	   --with-selinux
 make
 
 %install
@@ -348,6 +349,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-3
+- rebuild --with-selinux
+
 * Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-2
 - make things work better for xguest users (bug 254164)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:45:54 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:45:54 -0400
Subject: rpms/gdm/devel gdm.spec,1.283,1.284
Message-ID: <200709071745.l87HjsYu027268@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27213

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- gdm.spec	7 Sep 2007 17:42:28 -0000	1.283
+++ gdm.spec	7 Sep 2007 17:45:21 -0000	1.284
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X



From fedora-extras-commits at redhat.com  Fri Sep  7 17:53:43 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 7 Sep 2007 13:53:43 -0400
Subject: rpms/xmlrpc3/devel xmlrpc3-client-addosgimanifest.patch, NONE,
	1.1 xmlrpc3-common-addosgimanifest.patch, NONE, 1.1 xmlrpc3.spec,
	1.2, 1.3
Message-ID: <200709071753.l87HrhO9027609@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27565

Modified Files:
	xmlrpc3.spec 
Added Files:
	xmlrpc3-client-addosgimanifest.patch 
	xmlrpc3-common-addosgimanifest.patch 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
- Add OSGi manifests.

xmlrpc3-client-addosgimanifest.patch:

--- NEW FILE xmlrpc3-client-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 14:09:29.000000000 -0400
+++ pom.xml	2007-09-06 14:14:25.000000000 -0400
@@ -11,7 +11,29 @@
   <name>Apache XML-RPC Client Library</name>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
-  </build>
+        <plugins>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
+			    <Bundle-Version>3.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
+			    <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			    <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+			    <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
   <dependencies>
     <dependency>
       <groupId>org.apache.xmlrpc</groupId>

xmlrpc3-common-addosgimanifest.patch:

--- NEW FILE xmlrpc3-common-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 14:09:36.000000000 -0400
+++ pom.xml	2007-09-06 14:12:43.000000000 -0400
@@ -34,6 +34,26 @@
         </configuration>
       </plugin>
 -->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
+			    <Bundle-Version>3.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common, org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer, org.apache.xmlrpc.util</Export-Package>
+			    <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			    <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+			    <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
     </plugins>
   </build>
   <dependencies>


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlrpc3.spec	24 Aug 2007 14:28:51 -0000	1.2
+++ xmlrpc3.spec	7 Sep 2007 17:53:10 -0000	1.3
@@ -35,7 +35,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    1jpp.2%{?dist}
+Release:    1jpp.3%{?dist}
 Summary:    Java XML-RPC implementation
 License:    Apache Software License
 Group:      Development/Libraries
@@ -46,6 +46,9 @@
 # The tests pom.xml doesn't include necessary dependencies on junit and
 # servletapi
 Patch0:     %{name}-addjunitandservletapitotestpom.patch
+# Add OSGi MANIFEST information
+Patch1:     %{name}-client-addosgimanifest.patch
+Patch2:     %{name}-common-addosgimanifest.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
@@ -152,6 +155,12 @@
 %setup -q -n %{mainname}-%{version}
 %patch0
 cp %{SOURCE1} .
+pushd client
+%patch1
+popd
+pushd common
+%patch2
+popd
 
 %build
 dos2unix LICENSE.txt
@@ -258,6 +267,9 @@
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
+- Add OSGi manifests.
+
 * Fri Aug 24 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:54:51 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:54:51 -0400
Subject: rpms/gdm/devel gdm.spec,1.284,1.285
Message-ID: <200709071754.l87Hsptk027715@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647

Modified Files:
	gdm.spec 
Log Message:
add buildrequires for libselinux-devel



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- gdm.spec	7 Sep 2007 17:45:21 -0000	1.284
+++ gdm.spec	7 Sep 2007 17:54:19 -0000	1.285
@@ -107,6 +107,8 @@
 %endif
 BuildRequires: nss-devel >= %{nss_version}
 BuildRequires: ConsoleKit
+BuildRequires: libselinux-devel
+
 Requires: audit-libs >= %{libauditver}
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep  7 18:04:49 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 7 Sep 2007 14:04:49 -0400
Subject: rpms/telepathy-glib/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-glib.spec, 1.2, 1.3
Message-ID: <200709071804.l87I4n07001703@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1670

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Fri Sep  7 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
- Update to 0.5.14.
- Add BR on python.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jun 2007 04:48:18 -0000	1.2
+++ .cvsignore	7 Sep 2007 18:04:16 -0000	1.3
@@ -1 +1 @@
-telepathy-glib-0.5.13.tar.gz
+telepathy-glib-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jun 2007 04:48:18 -0000	1.2
+++ sources	7 Sep 2007 18:04:16 -0000	1.3
@@ -1 +1 @@
-61b16101b6164ae495c765c2d09a0899  telepathy-glib-0.5.13.tar.gz
+a784f13a377873464d1bf430ed35ad43  telepathy-glib-0.5.14.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/telepathy-glib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-glib.spec	5 Aug 2007 23:41:36 -0000	1.2
+++ telepathy-glib.spec	7 Sep 2007 18:04:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           telepathy-glib
-Version:        0.5.13
-Release:        4%{?dist}
+Version:        0.5.14
+Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
 Group:          System Environment/Libraries
@@ -10,9 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk-doc
-BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel
+BuildRequires:  dbus-devel >= 0.61
+BuildRequires:	dbus-glib-devel >= 0.72
 BuildRequires:	libxslt
+BuildRequires:	python
 
 
 %description
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Fri Sep  7 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
+- Update to 0.5.14.
+- Add BR on python.
+
 * Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-4
 - Update license tag.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 18:05:42 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Fri, 7 Sep 2007 14:05:42 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.153, 1.154 mkinitrd.spec, 1.218, 
	1.219 sources, 1.196, 1.197
Message-ID: <200709071805.l87I5g4t001797@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.15-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- .cvsignore	31 Aug 2007 19:27:29 -0000	1.153
+++ .cvsignore	7 Sep 2007 18:05:09 -0000	1.154
@@ -1 +1 @@
-mkinitrd-6.0.14.tar.bz2
+mkinitrd-6.0.15.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- mkinitrd.spec	31 Aug 2007 19:27:29 -0000	1.218
+++ mkinitrd.spec	7 Sep 2007 18:05:09 -0000	1.219
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.14
+Version: 6.0.15
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Fri Sep  7 2007 Peter Jones <pjones at redhat.com> - 6.0.15-1
+- Fix dmraid on x86_64.
+
 * Fri Aug 31 2007 Peter Jones <pjones at redhat.com> - 6.0.14-1
 - Don't probe loop devices as boot disks or in mkblkdevs
 - Minor performance improvements.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- sources	31 Aug 2007 19:27:29 -0000	1.196
+++ sources	7 Sep 2007 18:05:09 -0000	1.197
@@ -1 +1 @@
-56063c689feea06a55bf2d2f78f9d419  mkinitrd-6.0.14.tar.bz2
+65234e6e2b8ee9bdc436062995379feb  mkinitrd-6.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:06:46 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 7 Sep 2007 14:06:46 -0400
Subject: rpms/xmlrpc3/devel xmlrpc3.spec,1.3,1.4
Message-ID: <200709071806.l87I6kFr001873@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1846

Modified Files:
	xmlrpc3.spec 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.4
- Disable ppc64 (rh#239123).


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlrpc3.spec	7 Sep 2007 17:53:10 -0000	1.3
+++ xmlrpc3.spec	7 Sep 2007 18:06:12 -0000	1.4
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2005, JPackage roject
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    1jpp.3%{?dist}
+Release:    1jpp.4%{?dist}
 Summary:    Java XML-RPC implementation
 License:    Apache Software License
 Group:      Development/Libraries
@@ -50,6 +50,9 @@
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+ExcludeArch: ppc64
+
 BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
 BuildRequires:  maven2-plugin-resources
@@ -267,6 +270,9 @@
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.4
+- Disable ppc64 (rh#239123).
+
 * Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
 - Add OSGi manifests.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:31 -0700
Subject: [pkgdb] alpine was added for joshuadf
Message-ID: <200709071822.l87IMXGP014220@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package alpine with summary UW Alpine mail user agent
Kevin Fenzi (kevin) has approved Package alpine
Kevin Fenzi (kevin) has added a Fedora devel branch for alpine with an owner of joshuadf
Kevin Fenzi (kevin) has approved alpine in Fedora devel
Kevin Fenzi (kevin) has approved Package alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora EPEL, 4) updated by kevin
Message-ID: <200709071822.l87IMo3S024754@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, 7) updated by kevin
Message-ID: <200709071822.l87IMp1a024769@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, 6) updated by kevin
Message-ID: <200709071822.l87IMphm024784@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora EPEL, 5) updated by kevin
Message-ID: <200709071822.l87IMqTc024799@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, devel) updated by kevin
Message-ID: <200709071822.l87IMqPF024814@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:27 -0400
Subject: rpms/alpine - New directory
Message-ID: <200709071823.l87INRUb002797@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine

Log Message:
Directory /cvs/extras/rpms/alpine added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:31 -0400
Subject: rpms/alpine/devel - New directory
Message-ID: <200709071823.l87INVYL002815@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine/devel

Log Message:
Directory /cvs/extras/rpms/alpine/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:34 -0400
Subject: rpms/alpine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071823.l87INYDV002844@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine

Added Files:
	Makefile import.log 
Log Message:
Setup of module alpine


--- NEW FILE Makefile ---
# Top level Makefile for module alpine
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:36 -0400
Subject: rpms/alpine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709071823.l87INaf0002862@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alpine


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alpine
# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $
NAME := alpine
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:26:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:00 -0700
Subject: [pkgdb] flashrom was added for peter
Message-ID: <200709071826.l87IQ1gi014255@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package flashrom with summary Simple program for reading/writing BIOS chips content
Kevin Fenzi (kevin) has approved Package flashrom
Kevin Fenzi (kevin) has added a Fedora devel branch for flashrom with an owner of peter
Kevin Fenzi (kevin) has approved flashrom in Fedora devel
Kevin Fenzi (kevin) has approved Package flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, 6) updated by kevin
Message-ID: <200709071826.l87IQAV1014264@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, 7) updated by kevin
Message-ID: <200709071826.l87IQAM0014273@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, devel) updated by kevin
Message-ID: <200709071826.l87IQAXM014283@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:26:55 -0400
Subject: rpms/flashrom - New directory
Message-ID: <200709071826.l87IQt7T003408@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom

Log Message:
Directory /cvs/extras/rpms/flashrom added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:26:59 -0400
Subject: rpms/flashrom/devel - New directory
Message-ID: <200709071826.l87IQxXb003425@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom/devel

Log Message:
Directory /cvs/extras/rpms/flashrom/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:27:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:27:02 -0400
Subject: rpms/flashrom Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071827.l87IR2m3003454@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom

Added Files:
	Makefile import.log 
Log Message:
Setup of module flashrom


--- NEW FILE Makefile ---
# Top level Makefile for module flashrom
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:27:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:27:05 -0400
Subject: rpms/flashrom/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709071827.l87IR5iF003472@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flashrom


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: flashrom
# $Id: Makefile,v 1.1 2007/09/07 18:27:02 kevin Exp $
NAME := flashrom
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:29:32 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 7 Sep 2007 14:29:32 -0400
Subject: devel/pirut .cvsignore, 1.67, 1.68 pirut.spec, 1.70, 1.71 sources, 
	1.69, 1.70
Message-ID: <200709071829.l87ITWgP003868@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
- Catch another downloading error (#270201)
- Handle errors a little better in puplet
- Fix repo refreshing after adding/removing repos



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	31 Aug 2007 03:53:18 -0000	1.67
+++ .cvsignore	7 Sep 2007 18:28:59 -0000	1.68
@@ -1 +1 @@
-pirut-1.3.16.tar.gz
+pirut-1.3.17.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- pirut.spec	31 Aug 2007 03:53:18 -0000	1.70
+++ pirut.spec	7 Sep 2007 18:28:59 -0000	1.71
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.16
+Version: 1.3.17
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -77,6 +77,11 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
+- Catch another downloading error (#270201)
+- Handle errors a little better in puplet
+- Fix repo refreshing after adding/removing repos
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.16-1
 - another repo editor fix from Debarshi Ray
 - fix image display


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	31 Aug 2007 03:53:18 -0000	1.69
+++ sources	7 Sep 2007 18:28:59 -0000	1.70
@@ -1 +1 @@
-9ea74be8a047d5528301884739dd88a5  pirut-1.3.16.tar.gz
+350e800d69a92d600ce76d552ebc31b7  pirut-1.3.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:00 -0700
Subject: [pkgdb] libflaim was added for snecker
Message-ID: <200709071832.l87IW1RX014333@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libflaim with summary Flaim Database Engine
Kevin Fenzi (kevin) has approved Package libflaim
Kevin Fenzi (kevin) has added a Fedora devel branch for libflaim with an owner of snecker
Kevin Fenzi (kevin) has approved libflaim in Fedora devel
Kevin Fenzi (kevin) has approved Package libflaim
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libflaim (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libflaim (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libflaim (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 7 Sep 2007 14:32:10 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-boot.patch, 1.2,
	1.3 kernel.spec, 1.151, 1.152
Message-ID: <200709071832.l87IWAeK004181@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4154

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: debug early boot


linux-2.6-x86-debug-boot.patch:

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: linux-2.6-x86-debug-boot.patch
diff -N linux-2.6-x86-debug-boot.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
@@ -0,0 +1,108 @@
+---
+ arch/i386/boot/main.c |   12 ++++++++++++
+ arch/i386/boot/pm.c   |    8 ++++++++
+ 2 files changed, 20 insertions(+)
+
+--- linux-2.6.22.noarch.orig/arch/i386/boot/main.c
++++ linux-2.6.22.noarch/arch/i386/boot/main.c
+@@ -105,6 +105,7 @@ static void set_bios_mode(void)
+ void main(void)
+ {
+ 	/* First, copy the boot header into the "zeropage" */
++	puts("Booting: ");
+ 	copy_boot_params();
+ 
+ 	/* End of heap check */
+@@ -118,6 +119,7 @@ void main(void)
+ 	}
+ 
+ 	/* Make sure we have all the proper CPU support */
++	puts("A");
+ 	if (validate_cpu()) {
+ 		puts("Unable to boot - please use a kernel appropriate "
+ 		     "for your CPU.\n");
+@@ -125,37 +127,47 @@ void main(void)
+ 	}
+ 
+ 	/* Tell the BIOS what CPU mode we intend to run in. */
++	puts("B");
+ 	set_bios_mode();
+ 
+ 	/* Detect memory layout */
++	puts("C");
+ 	detect_memory();
+ 
+ 	/* Set keyboard repeat rate (why?) */
++	puts("D");
+ 	keyboard_set_repeat();
+ 
+ 	/* Set the video mode */
++	puts("E");
+ 	set_video();
+ 
+ 	/* Query MCA information */
++	puts("F");
+ 	query_mca();
+ 
+ 	/* Voyager */
+ #ifdef CONFIG_X86_VOYAGER
++	puts("G");
+ 	query_voyager();
+ #endif
+ 
++	puts("H");
+ 	/* Query Intel SpeedStep (IST) information */
+ 	query_ist();
+ 
+ 	/* Query APM information */
+ #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
++	puts("I");
+ 	query_apm_bios();
+ #endif
+ 
+ 	/* Query EDD information */
+ #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
++	puts("J");
+ 	query_edd();
+ #endif
+ 	/* Do the last things and invoke protected mode */
++	puts("K");
+ 	go_to_protected_mode();
+ }
+--- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
++++ linux-2.6.22.noarch/arch/i386/boot/pm.c
+@@ -145,26 +145,34 @@ static void setup_idt(void)
+ void go_to_protected_mode(void)
+ {
+ 	/* Hook before leaving real mode, also disables interrupts */
++	puts("L");
+ 	realmode_switch_hook();
+ 
+ 	/* Move the kernel/setup to their final resting places */
++	puts("M");
+ 	move_kernel_around();
+ 
+ 	/* Enable the A20 gate */
++	puts("N");
+ 	if (enable_a20()) {
+ 		puts("A20 gate not responding, unable to boot...\n");
+ 		die();
+ 	}
+ 
+ 	/* Reset coprocessor (IGNNE#) */
++	puts("O");
+ 	reset_coprocessor();
+ 
+ 	/* Mask all interrupts in the PIC */
++	puts("P");
+ 	mask_all_interrupts();
+ 
+ 	/* Actual transition to protected mode... */
++	puts("Q");
+ 	setup_idt();
++	puts("R");
+ 	setup_gdt();
++	puts("S\n");
+ 	protected_mode_jump(boot_params.hdr.code32_start,
+ 			    (u32)&boot_params + (ds() << 4));
+ }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kernel.spec	6 Sep 2007 19:47:37 -0000	1.151
+++ kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
@@ -579,6 +579,7 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
+Patch75: linux-2.6-x86-debug-boot.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -1003,6 +1004,8 @@
 ApplyPatch linux-2.6-x86-tune-generic.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
+# debug early boot
+ApplyPatch linux-2.6-x86-debug-boot.patch
 
 #
 # PowerPC
@@ -1194,6 +1197,8 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# ---------- below all scheduled for 2.6.23 -----------------
+
 # Fix Xen bootup
 ApplyPatch linux-2.6-xen-fix-bootup.patch
 
@@ -1798,6 +1803,9 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: debug early boot
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix imbalance in scheduler on multicore systems
 
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:10 -0700
Subject: [pkgdb] libflaim (Fedora, devel) updated by kevin
Message-ID: <200709071832.l87IWAmh024904@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on libflaim (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:10 -0700
Subject: [pkgdb] libflaim (Fedora, 7) updated by kevin
Message-ID: <200709071832.l87IWB1x024913@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libflaim
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on libflaim (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:48 -0400
Subject: rpms/libflaim - New directory
Message-ID: <200709071832.l87IWmD3004268@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim

Log Message:
Directory /cvs/extras/rpms/libflaim added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:54 -0400
Subject: rpms/libflaim/devel - New directory
Message-ID: <200709071832.l87IWsbo004288@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim/devel

Log Message:
Directory /cvs/extras/rpms/libflaim/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:57 -0400
Subject: rpms/libflaim Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071832.l87IWvuW004315@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim

Added Files:
	Makefile import.log 
Log Message:
Setup of module libflaim


--- NEW FILE Makefile ---
# Top level Makefile for module libflaim
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:59 -0400
Subject: rpms/libflaim/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709071832.l87IWxos004333@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libflaim


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libflaim
# $Id: Makefile,v 1.1 2007/09/07 18:32:57 kevin Exp $
NAME := libflaim
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi (Fedora, 7) updated by kevin
Message-ID: <200709071837.l87IbLgC014402@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for nabi
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) changed owner of nabi in Fedora 7 to sbehera
Kevin Fenzi (kevin) approved watchbugzilla on nabi (Fedora 7) for petersen
Kevin Fenzi (kevin) approved watchcommits on nabi (Fedora 7) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on nabi (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi summary updated by kevin
Message-ID: <200709071837.l87IbL3w014393@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package nabi summary to Hangul X Input Method

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi (Fedora, devel) updated by kevin
Message-ID: <200709071837.l87IbLGX014411@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of nabi in Fedora devel to sbehera
Kevin Fenzi (kevin) approved watchbugzilla on nabi (Fedora devel) for petersen
Kevin Fenzi (kevin) approved watchcommits on nabi (Fedora devel) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on nabi (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:38:51 -0700
Subject: [pkgdb] xine-lib (Fedora EPEL, 5) updated by kevin
Message-ID: <200709071838.l87IcqDc014460@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for xine-lib
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of xine-lib in Fedora EPEL 5 to scop
Kevin Fenzi (kevin) approved watchbugzilla on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved watchcommits on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved commit on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved build on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved approveacls on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved checkout on xine-lib (Fedora EPEL 5) for abompard

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:40:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:40:54 -0700
Subject: [pkgdb] cheese was added for mclasen
Message-ID: <200709071840.l87IesnD024971@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package cheese with summary A webcam application for snapshots and movies
Kevin Fenzi (kevin) has approved Package cheese
Kevin Fenzi (kevin) has added a Fedora devel branch for cheese with an owner of mclasen
Kevin Fenzi (kevin) has approved cheese in Fedora devel
Kevin Fenzi (kevin) has approved Package cheese
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cheese (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cheese (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cheese (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:14 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:41:14 -0400
Subject: rpms/flashrom/devel flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071841.l87IfEei005383@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5320/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:40:42 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:40:42 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:49 -0400
Subject: rpms/cheese - New directory
Message-ID: <200709071841.l87IfnHh005529@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese

Log Message:
Directory /cvs/extras/rpms/cheese added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:53 -0400
Subject: rpms/cheese/devel - New directory
Message-ID: <200709071841.l87Ifrww005547@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese/devel

Log Message:
Directory /cvs/extras/rpms/cheese/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:59 -0400
Subject: rpms/cheese Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071841.l87Ifxil005580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese

Added Files:
	Makefile import.log 
Log Message:
Setup of module cheese


--- NEW FILE Makefile ---
# Top level Makefile for module cheese
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:42:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:42:01 -0400
Subject: rpms/cheese/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709071842.l87Ig1fu005598@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cheese


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cheese
# $Id: Makefile,v 1.1 2007/09/07 18:41:59 kevin Exp $
NAME := cheese
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:44:41 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:44:41 -0400
Subject: rpms/flashrom/F-7 flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071844.l87IifuG005959@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:44:08 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:44:08 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:46:24 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:46:24 -0400
Subject: rpms/flashrom/FC-6 flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071846.l87IkOZp006248@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6166/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:45:51 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:45:51 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:49:01 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Fri, 7 Sep 2007 14:49:01 -0400
Subject: rpms/httpd/devel httpd-2.2.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.18,
	1.19 httpd-2.2.4-oldflush.patch, 1.1, 1.2 httpd.spec, 1.114,
	1.115 sources, 1.15, 1.16 upstream, 1.8,
	1.9 httpd-2.0.54.tar.gz.asc, 1.1, NONE httpd-2.2.4.tar.gz.asc,
	1.1, NONE
Message-ID: <200709071849.l87In1IF006607@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547

Modified Files:
	.cvsignore httpd-2.2.4-oldflush.patch httpd.spec sources 
	upstream 
Added Files:
	httpd-2.2.6.tar.gz.asc 
Removed Files:
	httpd-2.0.54.tar.gz.asc httpd-2.2.4.tar.gz.asc 
Log Message:
* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
- update to 2.2.6 (#250757, #282761)



--- NEW FILE httpd-2.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)

iD8DBQBG3buFizpgHwjJdeURAiQhAJ0UzwL/Sg4PZdw1USvc4CWytBg+kgCeKf83
vNBG4bcFy+gEuU0vVE/HCGM=
=dt4x
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Mar 2007 13:29:57 -0000	1.18
+++ .cvsignore	7 Sep 2007 18:48:27 -0000	1.19
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz

httpd-2.2.4-oldflush.patch:

Index: httpd-2.2.4-oldflush.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.4-oldflush.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.4-oldflush.patch	2 Sep 2007 13:57:10 -0000	1.1
+++ httpd-2.2.4-oldflush.patch	7 Sep 2007 18:48:27 -0000	1.2
@@ -1,3 +1,6 @@
+
+http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
+
 --- httpd-2.2.4/server/util_filter.c.oldflush
 +++ httpd-2.2.4/server/util_filter.c
 @@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
+++ httpd.spec	7 Sep 2007 18:48:27 -0000	1.115
@@ -5,8 +5,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.4
-Release: 10
+Version: 2.2.6
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -36,6 +36,7 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -122,6 +123,7 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -474,6 +476,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
+- update to 2.2.6 (#250757, #282761)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
 - rebuild for fixed APR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Mar 2007 13:29:57 -0000	1.15
+++ sources	7 Sep 2007 18:48:27 -0000	1.16
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstream	12 Mar 2007 13:29:57 -0000	1.8
+++ upstream	7 Sep 2007 18:48:27 -0000	1.9
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz


--- httpd-2.0.54.tar.gz.asc DELETED ---


--- httpd-2.2.4.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:51:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 7 Sep 2007 14:51:49 -0400
Subject: rpms/eclipse/devel eclipse.desktop, 1.1, 1.2 eclipse.spec, 1.483,
	1.484
Message-ID: <200709071851.l87IpndW006926@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6840

Modified Files:
	eclipse.desktop eclipse.spec 
Log Message:
* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-18
- Build 1.6 plugins when building with IcedTea.



Index: eclipse.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse.desktop	9 Sep 2004 04:27:27 -0000	1.1
+++ eclipse.desktop	7 Sep 2007 18:51:16 -0000	1.2
@@ -5,5 +5,4 @@
 Icon=eclipse.png
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;IDE;Development;Java;X-Red-Hat-Base;
+Categories=IDE;Development;Java;X-Red-Hat-Base;


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- eclipse.spec	7 Sep 2007 05:24:17 -0000	1.483
+++ eclipse.spec	7 Sep 2007 18:51:16 -0000	1.484
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        17%{?dist} 
+Release:        18%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -562,8 +562,14 @@
   sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
   linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
   sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+# If we're build with IcedTea then we don't want to remove the plugins from the
+# feature.xml because we will build these plugins after the main build. This
+# allows us to produce 1.5 bytecode for all of the SDK except for the parts that
+# explicitly use Java 1.6. This enables GCJ to work with Eclipse on all platforms. 
+%if ! %{gcj_support}
   linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
   sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+%endif 
   linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
   sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
   linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
@@ -675,18 +681,34 @@
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
 
-## Build the FileInitializer application
+  
+# build 1.6 when building with IcedTea
 SDK=$(cd eclipse && pwd)
+mkdir -p home
+homedir=$(cd home && pwd)
+LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+
+%if ! %{gcj_support}
+for plugin in jdt.compiler.tool jdt.compiler.apt jdt.apt.pluggable.core; do
+  pushd plugins/org.eclipse.$plugin
+  java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+       org.eclipse.core.launcher.Main                    \
+       -application org.eclipse.ant.core.antRunner       \
+       build.update.jar                                  \
+       -vmargs -Duser.home=$homedir 
+  popd
+done
+%endif 
+
+## Build the FileInitializer application
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
 pushd equinox-incubator
-mkdir -p build home
-homedir=$(cd home && pwd)
+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
 
-LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
      -Duser.home=$homedir                              \
       org.eclipse.core.launcher.Main \
@@ -729,6 +751,13 @@
 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
 %endif
 
+# Install 1.6 plugins when building with IcedTea
+%if ! %{gcj_support}
+for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
+  cp plugins/org.eclipse.$plugin/org.eclipse.$plugin_*.jar $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins
+done
+%endif
+
 # Add a compatibility symlink to startup.jar
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
@@ -912,22 +941,6 @@
 # freedesktop.org menu entry
 install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Put Fedora Core version into about.mappings of org.eclipse.sdk and
-# org.eclipse.platform to show it in Eclipse about dialog.  
-# (courtesy Debian Eclipse packagers)
-# FIXME use the third id
-SDKPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.sdk_ | sed "s/org.eclipse.sdk_//")
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_$SDKPLUGINVERSION
-OS_VERSION=$(cat /etc/*-release | head -n 1)
-sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp
-mv about.mappings.tmp about.mappings
-popd
-PLATFORMPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//")
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMPLUGINVERSION
-sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp
-mv about.mappings.tmp about.mappings
-popd
-
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
 cp %{SOURCE16} copy-platform
@@ -1502,9 +1515,9 @@
 %{_libdir}/gcj/%{name}/jdimodel.jar.*
 %{_libdir}/gcj/%{name}/jdi.jar.*
 %else
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
 %endif
 
 %files pde
@@ -1564,6 +1577,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:03:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 15:03:15 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.49,
	1.50 selinux-policy.spec, 1.516, 1.517
Message-ID: <200709071903.l87J3FhY013815@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13792

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
- Allow wine to run in system role


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- policy-20070703.patch	6 Sep 2007 23:34:02 -0000	1.49
+++ policy-20070703.patch	7 Sep 2007 19:03:11 -0000	1.50
@@ -2401,9 +2401,20 @@
 +	role $2 types wine_t;
 +	allow wine_t $3:chr_file rw_term_perms;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.0.7/policy/modules/apps/wine.te
+--- nsaserefpolicy/policy/modules/apps/wine.te	2007-07-25 10:37:37.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/wine.te	2007-09-07 09:04:03.000000000 -0400
+@@ -9,6 +9,7 @@
+ type wine_t;
+ type wine_exec_t;
+ application_domain(wine_t,wine_exec_t)
++role system_r types wine_t;
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-07 13:47:17.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2437,6 +2448,14 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
+@@ -259,3 +265,7 @@
+ ifdef(`distro_suse',`
+ /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
+ ')
++
++/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
++/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
++/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in	2007-09-06 15:43:06.000000000 -0400
@@ -2486,7 +2505,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-07 15:02:19.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2528,11 +2547,21 @@
  network_port(nessus, tcp,1241,s0)
  network_port(netsupport, tcp,5405,s0, udp,5405,s0)
  network_port(nmbd, udp,137,s0, udp,138,s0)
-@@ -160,13 +166,17 @@
+@@ -146,7 +152,7 @@
+ network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
+ network_port(spamd, tcp,783,s0)
+ network_port(ssh, tcp,22,s0)
+-network_port(soundd, tcp,8000,s0, tcp,9433,s0)
++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
+ network_port(squid, udp,3401,s0, tcp,3401,s0, udp,4827,s0, tcp,4827,s0) # snmp and htcp
+@@ -160,13 +166,18 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
 +network_port(wccp, udp,2048,s0)
++network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
 -network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
 +network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0, tcp,6020,s0)
@@ -5920,7 +5949,7 @@
  		allow $1 self:tcp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.7/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-07 10:31:47.000000000 -0400
 @@ -62,7 +62,7 @@
  # Use capabilities. Surplus capabilities may be allowed.
  allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
@@ -5964,6 +5993,15 @@
  ')
  
  optional_policy(`
+@@ -151,7 +157,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice };
+ dontaudit krb5kdc_t self:capability sys_tty_config;
+-allow krb5kdc_t self:process { setsched getsched signal_perms };
++allow krb5kdc_t self:process { setfscreate setsched getsched signal_perms };
+ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms;
+ allow krb5kdc_t self:tcp_socket create_stream_socket_perms;
+ allow krb5kdc_t self:udp_socket create_socket_perms;
 @@ -223,6 +229,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
@@ -5972,6 +6010,14 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
+@@ -233,6 +240,7 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(krb5kdc_t)
++	seutil_read_file_contexts(krb5kdc_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.0.7/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/ktalk.te	2007-09-06 15:43:06.000000000 -0400
@@ -7732,7 +7778,7 @@
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.7/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-07 10:32:33.000000000 -0400
 @@ -59,10 +59,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -7782,16 +7828,17 @@
  ')
  
  tunable_policy(`nfs_export_all_ro',`
-@@ -143,6 +154,8 @@
+@@ -143,6 +154,9 @@
  manage_files_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t)
  files_tmp_filetrans(gssd_t, gssd_tmp_t, { file dir })
  
 +auth_use_nsswitch(gssd_t)
 +
++kernel_read_system_state(gssd_t)
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
-@@ -158,6 +171,9 @@
+@@ -158,6 +172,9 @@
  
  miscfiles_read_certs(gssd_t)
  
@@ -9287,7 +9334,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 15:02:10.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9323,7 +9370,15 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -246,6 +257,7 @@
+@@ -189,6 +200,7 @@
+ corenet_sendrecv_all_client_packets(xdm_t)
+ # xdm tries to bind to biff_port_t
+ corenet_dontaudit_tcp_bind_all_ports(xdm_t)
++corenet_udp_bind_xdmcp_ports(xdm_t)
+ 
+ dev_read_rand(xdm_t)
+ dev_read_sysfs(xdm_t)
+@@ -246,6 +258,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -9331,7 +9386,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +269,7 @@
+@@ -257,6 +270,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -9339,7 +9394,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -271,6 +284,10 @@
+@@ -271,6 +285,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -9350,7 +9405,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +323,8 @@
+@@ -306,6 +324,8 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -9359,7 +9414,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +367,8 @@
+@@ -348,12 +368,8 @@
  ')
  
  optional_policy(`
@@ -9373,7 +9428,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +400,7 @@
+@@ -385,7 +401,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9382,7 +9437,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +440,10 @@
+@@ -425,6 +441,10 @@
  ')
  
  optional_policy(`
@@ -9393,7 +9448,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +453,19 @@
+@@ -434,47 +454,19 @@
  ')
  
  optional_policy(`
@@ -11333,7 +11388,7 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.7/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-09-07 09:00:42.000000000 -0400
 @@ -150,7 +150,9 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -11362,7 +11417,16 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -293,5 +298,15 @@
+@@ -275,6 +280,8 @@
+ seutil_search_default_contexts(lvm_t)
+ seutil_sigchld_newrole(lvm_t)
+ 
++userdom_dontaudit_search_sysadm_home_dirs(lvm_t)
++
+ ifdef(`distro_redhat',`
+ 	# this is from the initrd:
+ 	files_rw_isid_type_dirs(lvm_t)
+@@ -293,5 +300,15 @@
  ')
  
  optional_policy(`
@@ -13971,7 +14035,25 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-07 08:48:47.000000000 -0400
+@@ -95,7 +95,7 @@
+ read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ 
+-allow xend_t xenctl_t:fifo_file manage_file_perms;
++allow xend_t xenctl_t:fifo_file manage_fifo_file_perms;
+ dev_filetrans(xend_t, xenctl_t, fifo_file)
+ 
+ manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t)
+@@ -126,7 +126,7 @@
+ domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
+ allow xenstored_t xend_t:fd use;
+ allow xenstored_t xend_t:process sigchld;
+-allow xenstored_t xend_t:fifo_file write;
++allow xenstored_t xend_t:fifo_file write_fifo_file_perms;
+ 
+ # transition to console
+ domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13980,6 +14062,15 @@
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
+@@ -224,7 +225,7 @@
+ 
+ allow xenconsoled_t self:capability { dac_override fsetid ipc_lock };
+ allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms;
+-allow xenconsoled_t self:fifo_file { read write };
++allow xenconsoled_t self:fifo_file  rw_fifo_file_perms;
+ 
+ allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms;
+ 
 @@ -257,7 +258,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
@@ -13998,7 +14089,14 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -324,6 +325,7 @@
+@@ -318,12 +319,13 @@
+ allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
+ 
+ # internal communication is often done using fifo and unix sockets.
+-allow xm_t self:fifo_file { read write };
++allow xm_t self:fifo_file  rw_fifo_file_perms;
+ allow xm_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow xm_t self:tcp_socket create_stream_socket_perms;
  
  manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
  manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- selinux-policy.spec	6 Sep 2007 23:34:02 -0000	1.516
+++ selinux-policy.spec	7 Sep 2007 19:03:11 -0000	1.517
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
+- Allow wine to run in system role
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
 - Fix java labeling 
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 7 Sep 2007 15:36:33 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.31,1.32
Message-ID: <200709071936.l87JaXDg015882@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15729

Modified Files:
	bigboard.spec 
Log Message:
add some brs


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bigboard.spec	6 Sep 2007 21:41:03 -0000	1.31
+++ bigboard.spec	7 Sep 2007 19:36:01 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           bigboard
 Version:        0.5.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -26,6 +26,8 @@
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
 
 %description
@@ -90,6 +92,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
+- some brs
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:50 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:50 -0400
Subject: rpms/sipp/EL-4 sipp.spec,1.6,1.7
Message-ID: <200709071936.l87JaoV7015942@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/EL-4

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/EL-4/sipp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sipp.spec	25 Jul 2007 09:43:48 -0000	1.6
+++ sipp.spec	7 Sep 2007 19:36:17 -0000	1.7
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	3.2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
 BuildRequires:	libpcap
+%else
+BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,10 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
 * Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
 - finally added correct BR for EL-4
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:53 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:53 -0400
Subject: rpms/sipp/EL-5 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87JarLf015949@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/EL-5

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/EL-5/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:55 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:20 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:56 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:56 -0400
Subject: rpms/sipp/F-7 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87Jauc1015957@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/F-7

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/F-7/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:50 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:23 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:58 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:58 -0400
Subject: rpms/sipp/FC-6 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87JawFd015963@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/FC-6

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/FC-6/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:55 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:26 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:37:01 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:37:01 -0400
Subject: rpms/sipp/devel sipp.spec,1.3,1.4
Message-ID: <200709071937.l87Jb13e015970@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/devel

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/devel/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:25:01 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:28 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:40:13 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:40:13 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec, 
	1.17, 1.18
Message-ID: <200709071940.l87JeDUU016415@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-launcher.spec	9 Feb 2007 19:27:11 -0000	1.17
+++ jakarta-commons-launcher.spec	7 Sep 2007 19:39:40 -0000	1.18
@@ -37,7 +37,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.1
-Release:        1jpp.2%{?dist}
+Release:        1jpp.3%{?dist}
 Epoch:          0
 Summary:        A cross platform Java application launcher
 License:        Apache Software License
@@ -168,6 +168,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-launcher-%{version}.jar.*
 %endif
 
@@ -178,6 +179,9 @@
 
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:1.1-1jpp.3
+- Fix unowned directory
+
 * Fri Feb 09 2007 Matt Wringe <mwringe at redhat.com> - 0:1.1-1jpp.2
 - Fix macro naming for post and postun
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:46:45 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 15:46:45 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.252,1.253
Message-ID: <200709071946.l87JkjW6016945@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	gtk2.spec 
Log Message:
- install dummy binary in libdir/gtk-2.0/immodules directory to
  aid rpm when doing ia64 multilib (bug 253726)



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- gtk2.spec	27 Aug 2007 00:38:43 -0000	1.252
+++ gtk2.spec	7 Sep 2007 19:46:12 -0000	1.253
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -147,7 +147,7 @@
         exit 1
 fi
 
-%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png
+%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png --enable-debug
 
 ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 
 ## past gtk 2.1.2
@@ -155,6 +155,12 @@
 # turn off for now, since floatingtest needs a display
 #make check
 
+# create a dummy binary for /usr/lib/gtk-2.0/immodules to work around
+# problems in our ia64 multilib infrastructure
+# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
+echo 'int main (void) { return 0; }' > relocation-tag.c
+gcc -Os relocation-tag.c -o .relocation-tag
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -238,6 +244,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
 
+# we need to install a binary in the immodules directory to make sure
+# that it gets properly relocated to /emul for ia64 emulation of x86
+# See https://bugzilla.redhat.com/show_bug.cgi?id=253726
+install -m 0644 .relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
+
 #
 # We need the substitution of $host so we use an external
 # file list
@@ -299,6 +310,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-8
+- install dummy binary in libdir/gtk-2.0/immodules directory to
+  aid rpm when doing ia64 multilib (bug 253726)
+
 * Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-7
 - own libdir/gtk-2.0/immodules directory (#255621)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:35:06 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:35:06 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.36, 1.37
Message-ID: <200709071935.l87JZ6PC015627@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15593

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-commons-modeler.spec	26 Apr 2007 00:25:06 -0000	1.36
+++ jakarta-commons-modeler.spec	7 Sep 2007 19:34:33 -0000	1.37
@@ -38,7 +38,7 @@
 Name:       jakarta-%{short_name}
 Epoch:      0
 Version:    2.0
-Release:    3jpp.1%{?dist}
+Release:    3jpp.2%{?dist}
 Summary:    Model MBeans utilty classes
 Group:      Development/Libraries/Java
 License:    Apache Software License
@@ -168,6 +168,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
@@ -177,6 +178,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.2
+- Fix unowned directory
+
 * Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.1
 - Merge with lastest jpp version
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:24:42 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:24:42 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 
	1.36, 1.37
Message-ID: <200709071924.l87JOgI7015033@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14977

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-commons-digester.spec	23 Jan 2007 03:17:43 -0000	1.36
+++ jakarta-commons-digester.spec	7 Sep 2007 19:24:09 -0000	1.37
@@ -48,7 +48,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        6jpp.1
+Release:        6jpp.2
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -182,6 +182,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7-rss.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7.jar.*
 %endif
@@ -199,6 +200,9 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:1.7-6jpp.2
+- Fix unowned dir (/usr/lib/gcj/jakarta-commons-digester)
+
 * Mon Jan 22 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.7-6jpp.1
 - Resynch with JPP release
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:01:28 2007
From: fedora-extras-commits at redhat.com (Joshua Daniel Franklin (joshuadf))
Date: Fri, 7 Sep 2007 16:01:28 -0400
Subject: rpms/alpine/devel alpine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709072001.l87K1S5c023891@cvs-int.fedora.redhat.com>

Author: joshuadf

Update of /cvs/pkgs/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alpine.spec 
Log Message:



--- NEW FILE alpine.spec ---
# Fedora review: http://bugzilla.redhat.com/249365

Summary: UW Alpine mail user agent
Name: alpine
Version: 0.9999
Release: 2%{?dist}

License: Apache Software License
Group: Applications/Internet
URL: http://www.washington.edu/alpine
#Source0: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.bz2
# removed cc5.sol problem file, see BZ for details
Source0: %{name}-%{version}.tar.bz2

Requires: /usr/sbin/sendmail aspell mailcap
# Using "Conflicts" instead of Obsoletes because while alpine is substantially
# compatible with pine the change to Unicode breaks important user
# functionality such as non-ASCII encoded saved passwords. Additionally, there
# are also many patches to pine floating around that for political/technical
# reasons will not be integrated into alpine. (I'd like to stay out of it...
# just search "Mark Crispin maildir" for the gory details.) Since licensing
# prevents a Fedora pine package, I cannot predict what patches users might
# have and so want to warn them instead of automatically replacing their pine
# install with an alpine that could break their configuration. 
# I understand this to be a special case of the "Optional Functionality"
# description at http://fedoraproject.org/wiki/Packaging/Conflicts
Conflicts: pine
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: /usr/sbin/sendmail
BuildRequires: gettext inews krb5-devel ncurses-devel 
BuildRequires: openldap-devel openssl-devel pam-devel passwd sendmail

%description
Alpine -- an Alternatively Licensed Program for Internet
News & Email -- is a tool for reading, sending, and managing
electronic messages.  Alpine is the successor to Pine and was
developed by Computing & Communications at the University of
Washington.  
  Though originally designed for inexperienced email users,
Alpine supports many advanced features, and an ever-growing number of
configuration and personal-preference options.
Changes and enhancements over pine:
  * Released under the Apache Software License, Version 2.0.
  * Internationalization built around new internal Unicode support.
  * Ground-up reorganization of source code around new "pith/" core 
routine library.
  * Ground-up reorganization of build and install procedure based on 
GNU Build System's autotools.

%prep
%setup -q
chmod -x alpine/arg.c pico/main.c

%build
touch imap/ip6
# --without-tcl disables the TCL-based CGI "Web Alpine"
%configure \
  --without-tcl \
  --with-c-client-target=lfd \
  --with-passfile=.alpine.passfile \
  --with-spellcheck-prog=aspell
make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE doc/tech-notes.txt
%{_bindir}/alpine
%{_bindir}/pico
%{_bindir}/pilot
%{_bindir}/rpload
%{_bindir}/rpdump
%{_mandir}/man1/alpine.1*
%{_mandir}/man1/pico.1*
%{_mandir}/man1/pilot.1*
%{_mandir}/man1/rpload.1*
%{_mandir}/man1/rpdump.1*

%changelog
* Fri Sep 07 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.9999-2
- update to latest 

* Fri Aug 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.999-3
- EXTRACFLAGS=$RPM_OPT_FLAGS
- --with-c-client-target=lfd
- --with-passfile=.alpine.passfile
- Requires: mailcap

* Mon Jul 24 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.2
- remove problem cc5.sol file
- integrate changes from Patrick "Jima" Laughton <jima at beer.tclug.org>

* Mon Jul 24 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.1
- correct spec syntax, explain Conflicts tag

* Mon Jul 23 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.0
- initial alpine spec
- Apache Software License 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:23:34 -0000	1.1
+++ .cvsignore	7 Sep 2007 20:00:54 -0000	1.2
@@ -0,0 +1 @@
+alpine-0.9999.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:23:34 -0000	1.1
+++ sources	7 Sep 2007 20:00:54 -0000	1.2
@@ -0,0 +1 @@
+61ce134e24185727e6a0736738767630  alpine-0.9999.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 20:07:01 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 7 Sep 2007 16:07:01 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.2, 1.3 Makefile, 1.1,
	1.2 java-1.7.0-icedtea-makefile.patch, 1.1,
	1.2 java-1.7.0-icedtea.spec, 1.3, 1.4 sources, 1.2,
	1.3 generate-cacerts.pl, 1.1, NONE
Message-ID: <200709072007.l87K71GR024398@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305

Modified Files:
	.cvsignore Makefile java-1.7.0-icedtea-makefile.patch 
	java-1.7.0-icedtea.spec sources 
Removed Files:
	generate-cacerts.pl 
Log Message:
* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Do not require openssl for build.
- Require openssl.
- Set gcjbootstrap to 0.
- Remove generate-cacerts.pl.
- Update icedtearelease.
- Update icedteasnapshot.
- Update openjdkver.
- Update openjdkdate.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Aug 2007 14:56:44 -0000	1.2
+++ .cvsignore	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
-openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	28 Aug 2007 14:24:02 -0000	1.1
+++ Makefile	7 Sep 2007 20:06:27 -0000	1.2
@@ -3,6 +3,9 @@
 NAME := java-1.7.0-icedtea
 SPECFILE = $(firstword $(wildcard *.spec))
 
+TARGET_ARCH = $(shell rpm --eval "%{_arch}" | sed 's/i.86/i586/')
+MOCKARGS = --arch $(TARGET_ARCH)
+
 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

java-1.7.0-icedtea-makefile.patch:

Index: java-1.7.0-icedtea-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.7.0-icedtea-makefile.patch	28 Aug 2007 14:56:44 -0000	1.1
+++ java-1.7.0-icedtea-makefile.patch	7 Sep 2007 20:06:27 -0000	1.2
@@ -1,9 +1,10 @@
---- Makefile.am.orig	2007-08-27 14:14:11.000000000 -0400
-+++ Makefile.am	2007-08-27 14:14:27.000000000 -0400
-@@ -122,15 +122,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.am ./Makefile.am
+--- ../icedtea-1.4.orig/Makefile.am	2007-09-06 19:09:50.000000000 -0400
++++ ./Makefile.am	2007-09-06 19:12:49.000000000 -0400
+@@ -113,15 +113,6 @@
+ endif
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -13,15 +14,16 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:
---- Makefile.in.orig	2007-08-27 14:14:16.000000000 -0400
-+++ Makefile.in	2007-08-27 14:14:34.000000000 -0400
-@@ -643,15 +643,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.in ./Makefile.in
+--- ../icedtea-1.4.orig/Makefile.in	2007-09-06 19:10:07.000000000 -0400
++++ ./Makefile.in	2007-09-06 19:12:55.000000000 -0400
+@@ -646,15 +646,6 @@
+ 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -31,6 +33,6 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.7.0-icedtea.spec	5 Sep 2007 21:19:51 -0000	1.3
+++ java-1.7.0-icedtea.spec	7 Sep 2007 20:06:27 -0000	1.4
@@ -1,14 +1,13 @@
 # If gcjbootstrap is 1 IcedTea is bootstrapped against
 # java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
-# java-1.7.0-icedtea-devel.  Building against java-1.7.0-icedtea-devel
-# is not supported yet.
-%define gcjbootstrap 1
+# java-1.7.0-icedtea-devel.
+%define gcjbootstrap 0
 
-%define icedteaver 1.3
-%define icedteasnapshot -a9c9ee1b6479a84f2153be67fce85b0dbf371398
+%define icedteaver 1.4
+%define icedteasnapshot -f23640f520cf248e08d731f91fed62ed14e97b2f
 %define icedtearelease snapshot
-%define openjdkver b18
-%define openjdkdate 16_aug_2007
+%define openjdkver b19
+%define openjdkdate 30_aug_2007
 
 %define genurl http://icedtea.classpath.org/hg/fedora/raw-file/32c44002d507/
 
@@ -107,10 +106,9 @@
 # Save icedtea.classpath.org space and bandwidth.
 # NoSource: 1
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
-Source3:  %{genurl}generate-cacerts.pl
-Source4:  %{genurl}generate-fedora-zip.sh
-Source5:  README.src
-Source6:  README.plugin
+Source3:  %{genurl}generate-fedora-zip.sh
+Source4:  README.src
+Source5:  README.plugin
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -140,13 +138,14 @@
 BuildRequires: libbonobo-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
-# Certificate file generation requirements.
-BuildRequires: openssl
 # gcjwebplugin build requirements.
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 
+# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
+# cacerts.
+Requires: openssl
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -262,16 +261,19 @@
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
+cp %{SOURCE4} .
 cp %{SOURCE5} .
-cp %{SOURCE6} .
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
-make patch-ecj.stamp patch.stamp
+%if %{gcjbootstrap}
+make stamps/patch-ecj.stamp
 pushd openjdk-ecj
   patch -p1 < %{PATCH1}
   patch -p1 < %{PATCH2}
 popd
+%endif
+make stamps/patch.stamp
 patch -p0 < %{PATCH1}
 patch -p0 < %{PATCH2}
 make
@@ -368,10 +370,6 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# Generate and install cacerts file.
-%{__perl} %{SOURCE3} %{buildoutputdir}/j2sdk-image/bin/keytool
-install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -716,6 +714,16 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Do not require openssl for build.
+- Require openssl.
+- Set gcjbootstrap to 0.
+- Remove generate-cacerts.pl.
+- Update icedtearelease.
+- Update icedteasnapshot.
+- Update openjdkver.
+- Update openjdkdate.
+
 * Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Rename javadoc master alternative javadocdir.
 - Resolves: rhbz#269901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Aug 2007 14:56:44 -0000	1.2
+++ sources	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-d4fff908a9a9fe1dedfe7e9544132ba3  icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
-6c14ade20274f189be1646223f7e8929  openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


--- generate-cacerts.pl DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 20:10:11 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 16:10:11 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.50,
	1.51 selinux-policy.spec, 1.517, 1.518
Message-ID: <200709072010.l87KABTk024626@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24599

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
- Turn off direct transition


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- policy-20070703.patch	7 Sep 2007 19:03:11 -0000	1.50
+++ policy-20070703.patch	7 Sep 2007 20:10:07 -0000	1.51
@@ -12734,7 +12734,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-07 15:05:57.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13106,7 +13106,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +881,162 @@
+@@ -954,21 +881,163 @@
  ##	</summary>
  ## </param>
  #
@@ -13166,6 +13166,7 @@
 +	dontaudit $1_t self:capability { sys_nice fsetid };
 +
 +	allow $1_t self:process ~{ setcurrent setexec setrlimit execmem execstack execheap };
++	dontaudit $1_t self:process setrlimit;
 +	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
 +
 +	allow $1_t self:context contains;
@@ -13275,7 +13276,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1045,51 @@
+@@ -977,23 +1046,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -13338,7 +13339,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1125,7 @@
+@@ -1029,15 +1126,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -13355,7 +13356,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1142,6 @@
+@@ -1054,17 +1143,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -13373,7 +13374,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1179,8 @@
+@@ -1102,6 +1180,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -13382,7 +13383,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1206,7 @@
+@@ -1127,7 +1207,7 @@
  	# $1_t local policy
  	#
  
@@ -13391,7 +13392,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1218,11 @@
+@@ -1139,7 +1219,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -13404,7 +13405,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1856,17 +1939,53 @@
+@@ -1856,17 +1940,53 @@
  ##	</summary>
  ## </param>
  #
@@ -13462,7 +13463,7 @@
  ##	in a user home subdirectory.
  ## </summary>
  ## <desc>
-@@ -1891,13 +2010,12 @@
+@@ -1891,13 +2011,12 @@
  ##	</summary>
  ## </param>
  #
@@ -13479,7 +13480,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3196,7 @@
+@@ -3078,7 +3197,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -13488,7 +13489,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4733,24 @@
+@@ -4615,6 +4734,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -13513,7 +13514,7 @@
  
  ########################################
  ## <summary>
-@@ -5323,7 +5459,7 @@
+@@ -5323,7 +5460,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -13522,7 +13523,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5695,299 @@
+@@ -5559,3 +5696,299 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- selinux-policy.spec	7 Sep 2007 19:03:11 -0000	1.517
+++ selinux-policy.spec	7 Sep 2007 20:10:07 -0000	1.518
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -194,8 +194,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs y y
-%installCmds targeted mcs y y
+%setupCmds targeted mcs n y
+%installCmds targeted mcs n y
 %endif
 
 %if %{BUILD_MLS}
@@ -207,8 +207,8 @@
 %if %{BUILD_OLPC}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds olpc mcs y y
-%installCmds olpc mcs y y
+%setupCmds olpc mcs n y
+%installCmds olpc mcs n y
 %endif
 
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
+- Turn off direct transition
+
 * Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
 - Allow wine to run in system role
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:14:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 16:14:42 -0400
Subject: rpms/gtk2/devel workaround.patch,NONE,1.1 gtk2.spec,1.253,1.254
Message-ID: <200709072014.l87KEgkj024834@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24806

Modified Files:
	gtk2.spec 
Added Files:
	workaround.patch 
Log Message:
Add a workaround for the flash backend


workaround.patch:

--- NEW FILE workaround.patch ---
Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
@@ -287,6 +287,7 @@
 gtk_clipboard_get_for_display (GdkDisplay *display, 
 			       GdkAtom     selection)
 {
+  g_return_val_if_fail (display != NULL, NULL);
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   g_return_val_if_fail (!display->closed, NULL);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- gtk2.spec	7 Sep 2007 19:46:12 -0000	1.253
+++ gtk2.spec	7 Sep 2007 20:14:10 -0000	1.254
@@ -37,6 +37,9 @@
 Patch5: systray-tooltips.patch
 # fixed in upstream svn
 Patch6: tooltip-compat.patch
+# a workaround for some brokenness in the flash plugin
+# see http://bugzilla.gnome.org/show_bug.cgi?id=463773
+Patch7: workaround.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -127,6 +130,7 @@
 %patch4 -p1 -b .silence
 %patch5 -p1 -b .tooltips
 %patch6 -p1 -b .tooltip-compat
+%patch7 -p1 -b .workaround
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -310,7 +314,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-8
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-9
+- Add a workaround for the flash plugin
+
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 2.11.6-8
 - install dummy binary in libdir/gtk-2.0/immodules directory to
   aid rpm when doing ia64 multilib (bug 253726)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:15:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 16:15:45 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.254,1.255
Message-ID: <200709072015.l87KFj2O024917@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24850

Modified Files:
	gtk2.spec 
Log Message:
bump rev



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- gtk2.spec	7 Sep 2007 20:14:10 -0000	1.254
+++ gtk2.spec	7 Sep 2007 20:15:12 -0000	1.255
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 20:16:44 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:16:44 -0400
Subject: rpms/wcstools/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 wcstools.spec, 1.10, 1.11 wcstools3-codewarn.patch, 1.4,
	1.5 wcstools3-shared.patch, 1.4, 1.5
Message-ID: <200709072016.l87KGiZK025081@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Mar 2007 17:55:59 -0000	1.6
+++ .cvsignore	7 Sep 2007 20:16:11 -0000	1.7
@@ -1 +1 @@
-wcstools-3.6.8.tar.gz
+wcstools-3.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 17:55:59 -0000	1.6
+++ sources	7 Sep 2007 20:16:11 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wcstools.spec	27 Aug 2007 13:55:31 -0000	1.10
+++ wcstools.spec	7 Sep 2007 20:16:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}.1
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
@@ -84,6 +84,8 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
 - Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-codewarn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-codewarn.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-codewarn.patch	7 Sep 2007 20:16:11 -0000	1.5
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-shared.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-shared.patch	7 Sep 2007 20:16:11 -0000	1.5
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:20:20 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:20:20 -0400
Subject: rpms/wcstools/F-7 sources, 1.6, 1.7 wcstools.spec, 1.8,
	1.9 wcstools3-codewarn.patch, 1.4, 1.5 wcstools3-shared.patch,
	1.4, 1.5
Message-ID: <200709072020.l87KKKuB025412@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25361

Modified Files:
	sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 17:55:59 -0000	1.6
+++ sources	7 Sep 2007 20:19:47 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wcstools.spec	20 Mar 2007 09:44:54 -0000	1.8
+++ wcstools.spec	7 Sep 2007 20:19:47 -0000	1.9
@@ -1,16 +1,16 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
-License: GPL
+License: GPLv2+
 URL: http://tdc-www.harvard.edu/wcstools
 Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Patch2: wcstools3-bug232413.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Wcstools is a set of software utilities, written in C, which create,
@@ -22,7 +22,7 @@
 %package -n libwcs
 Summary: Libwcs shared library 
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,7 +33,7 @@
 %package -n libwcs-devel
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
-License: LGPL
+License: LGPLv2+
 Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
+- Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
 - Fix for bug #232413
 * Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools3-codewarn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-codewarn.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-codewarn.patch	7 Sep 2007 20:19:47 -0000	1.5
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools3-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-shared.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-shared.patch	7 Sep 2007 20:19:47 -0000	1.5
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:21:16 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Fri, 7 Sep 2007 16:21:16 -0400
Subject: rpms/e2fsprogs/devel blkid_types-wrapper.h, NONE,
	1.1 ext2_types-wrapper.h, NONE, 1.1 e2fsprogs.spec, 1.78, 1.79
Message-ID: <200709072021.l87KLGgo025559@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25440

Modified Files:
	e2fsprogs.spec 
Added Files:
	blkid_types-wrapper.h ext2_types-wrapper.h 
Log Message:
* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
- wrap a couple headers to fix multilib issues (#270441)



--- NEW FILE blkid_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because blkid_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "blkid_types-i386.h"
#elif defined(__ia64__)
#include "blkid_types-ia64.h"
#elif defined(__powerpc64__)
#include "blkid_types-ppc64.h"
#elif defined(__powerpc__)
#include "blkid_types-ppc.h"
#elif defined(__s390x__)
#include "blkid_types-s390x.h"
#elif defined(__s390__)
#include "blkid_types-s390.h"
#elif defined(__x86_64__)
#include "blkid_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



--- NEW FILE ext2_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because ext2_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "ext2_types-i386.h"
#elif defined(__ia64__)
#include "ext2_types-ia64.h"
#elif defined(__powerpc64__)
#include "ext2_types-ppc64.h"
#elif defined(__powerpc__)
#include "ext2_types-ppc.h"
#elif defined(__s390x__)
#include "ext2_types-s390x.h"
#elif defined(__s390__)
#include "ext2_types-s390.h"
#elif defined(__x86_64__)
#include "ext2_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- e2fsprogs.spec	30 Aug 2007 01:41:58 -0000	1.78
+++ e2fsprogs.spec	7 Sep 2007 20:20:43 -0000	1.79
@@ -4,12 +4,14 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
 Group: System Environment/Base
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1: ext2_types-wrapper.h
+Source2: blkid_types-wrapper.h
 Patch30: e2fsprogs-1.38-resize-inode.patch
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
@@ -110,6 +112,16 @@
 export PATH=/sbin:$PATH
 make install install-libs DESTDIR="%{buildroot}" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+
+# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
+mv -f $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types-%{_arch}.h
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h
+
+mv -f $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types-%{_arch}.h
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+
 %find_lang %{name}
 
 %check
@@ -248,8 +260,11 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
+- wrap a couple headers to fix multilib issues (#270441)
+
 * Wed Aug 29 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-4
-- add gawk to e2fsprogs-devel Requires, compile_et needs it
+- add gawk to e2fsprogs-devel Requires, compile_et needs it (#265961)
 
 * Thu Aug 23 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-3
 - Update license tags



From fedora-extras-commits at redhat.com  Fri Sep  7 20:24:39 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:24:39 -0400
Subject: rpms/wcstools/FC-6 sources, 1.6, 1.7 wcstools.spec, 1.9,
	1.10 wcstools3-codewarn.patch, 1.3, 1.4 wcstools3-shared.patch,
	1.3, 1.4
Message-ID: <200709072024.l87KOdpX025811@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25747

Modified Files:
	sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 18:20:36 -0000	1.6
+++ sources	7 Sep 2007 20:24:05 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wcstools.spec	20 Mar 2007 09:25:23 -0000	1.9
+++ wcstools.spec	7 Sep 2007 20:24:05 -0000	1.10
@@ -1,16 +1,16 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
-License: GPL
+License: GPLv2+
 URL: http://tdc-www.harvard.edu/wcstools
 Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Patch2: wcstools3-bug232413.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Wcstools is a set of software utilities, written in C, which create,
@@ -22,7 +22,7 @@
 %package -n libwcs
 Summary: Libwcs shared library 
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,7 +33,7 @@
 %package -n libwcs-devel
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
-License: LGPL
+License: LGPLv2+
 Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
+- Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
 - Fix for bug #232413
 * Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools3-codewarn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools3-codewarn.patch	19 Mar 2007 18:20:36 -0000	1.3
+++ wcstools3-codewarn.patch	7 Sep 2007 20:24:05 -0000	1.4
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools3-shared.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools3-shared.patch	19 Mar 2007 18:20:36 -0000	1.3
+++ wcstools3-shared.patch	7 Sep 2007 20:24:05 -0000	1.4
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:26:44 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 16:26:44 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.51,1.52
Message-ID: <200709072026.l87KQiwB025957@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25907

Modified Files:
	policy-20070703.patch 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
- Turn off direct transition


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- policy-20070703.patch	7 Sep 2007 20:10:07 -0000	1.51
+++ policy-20070703.patch	7 Sep 2007 20:26:11 -0000	1.52
@@ -9334,7 +9334,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 15:02:10.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 16:19:01.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9370,14 +9370,14 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -189,6 +200,7 @@
+@@ -185,6 +196,7 @@
+ corenet_udp_sendrecv_all_ports(xdm_t)
+ corenet_tcp_bind_all_nodes(xdm_t)
+ corenet_udp_bind_all_nodes(xdm_t)
++corenet_udp_bind_xdmcp_port(xdm_t)
+ corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
- corenet_dontaudit_tcp_bind_all_ports(xdm_t)
-+corenet_udp_bind_xdmcp_ports(xdm_t)
- 
- dev_read_rand(xdm_t)
- dev_read_sysfs(xdm_t)
 @@ -246,6 +258,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:30:53 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 7 Sep 2007 16:30:53 -0400
Subject: rpms/maven2/devel maven2-ant17.patch,NONE,1.1 maven2.spec,1.4,1.5
Message-ID: <200709072030.l87KUrKx026211@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26178

Modified Files:
	maven2.spec 
Added Files:
	maven2-ant17.patch 
Log Message:

- Exclude ppc64 build
- Add patch to build with ant 1.7
- Build with bootstrap (First build on F8/ppc)



maven2-ant17.patch:

--- NEW FILE maven2-ant17.patch ---
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java.sav	2007-08-29 17:02:14.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java	2007-08-29 17:02:20.000000000 -0400
@@ -29,7 +29,7 @@ public class LocalRepository
 {
     private File location;
 
-    public File getLocation()
+    public File getFileLocation()
     {
         return ( (LocalRepository) getInstance() ).location;
     }
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java.sav	2007-08-29 17:02:44.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java	2007-08-29 17:02:59.000000000 -0400
@@ -188,7 +188,7 @@ public class DependenciesTask
         }
 
         FileList fileList = new FileList();
-        fileList.setDir( getLocalRepository().getLocation() );
+        fileList.setDir( getLocalRepository().getFileLocation() );
 
         FileSet fileSet = new FileSet();
         fileSet.setDir( fileList.getDir( getProject() ) );
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java.sav	2007-08-29 17:03:09.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java	2007-08-29 17:03:19.000000000 -0400
@@ -78,7 +78,7 @@ public abstract class AbstractArtifactTa
         ArtifactRepositoryLayout repositoryLayout =
             (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, localRepository.getLayout() );
 
-        return new DefaultArtifactRepository( "local", "file://" + localRepository.getLocation(), repositoryLayout );
+        return new DefaultArtifactRepository( "local", "file://" + localRepository.getFileLocation(), repositoryLayout );
     }
 
     protected ArtifactRepository createRemoteArtifactRepository( RemoteRepository repository )


Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven2.spec	20 Mar 2007 06:58:29 -0000	1.4
+++ maven2.spec	7 Sep 2007 20:30:20 -0000	1.5
@@ -34,6 +34,7 @@
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 %define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
+%define _with_bootstrap 1
 %define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
 %define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
 
@@ -107,6 +108,7 @@
 Patch6:          %{name}-enable-unbuilt-modules.patch
 Patch7:          %{name}-fastjar-manifest-fix.patch
 Patch8:          %{name}-noexternaljavadoclinks.patch 
+Patch9:          %{name}-ant17.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
@@ -273,6 +275,7 @@
 BuildRequires:       java-gcj-compat-devel
 Requires(post):      java-gcj-compat
 Requires(postun):    java-gcj-compat
+ExcludeArch:         ppc64
 %endif
 
 %description
@@ -920,6 +923,7 @@
 %patch6 -b .sav
 %patch7 -b .sav
 %patch8 -b .sav
+%patch9 -b .sav
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
@@ -2291,6 +2295,11 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
+- Exclude ppc64 build
+- Add patch to build with ant 1.7
+- Build with bootstrap (First build on F8/ppc)
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.6
 - Build without bootstrap
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:03:24 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 7 Sep 2007 17:03:24 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.44, 1.45 sources, 1.45,
	1.46 sugar.spec, 1.53, 1.54
Message-ID: <200709072103.l87L3OPM002240@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2218

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Sep 2007 19:55:37 -0000	1.44
+++ .cvsignore	7 Sep 2007 21:02:50 -0000	1.45
@@ -1 +1 @@
-sugar-0.65-gitd9a30c23ff.tar.bz2
+sugar-0.65-gitc8700feccf.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	6 Sep 2007 19:55:37 -0000	1.45
+++ sources	7 Sep 2007 21:02:50 -0000	1.46
@@ -1 +1 @@
-b363c82dcf6fcb7f2c64c71d8d739332  sugar-0.65-gitd9a30c23ff.tar.bz2
+c3ccf0f431a100fa6abe3cb44a81f07f  sugar-0.65-gitc8700feccf.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sugar.spec	6 Sep 2007 19:55:37 -0000	1.53
+++ sugar.spec	7 Sep 2007 21:02:50 -0000	1.54
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070906git
-%define commitid d9a30c23ff
+%define alphatag 20070907git
+%define commitid c8700feccf
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.41.%{alphatag}d9a30c23ff
+Release: 0.42.%{alphatag}c8700feccf
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
+- New snapshot
+
 * Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:33 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Fri, 7 Sep 2007 17:21:33 -0400
Subject: rpms/tesseract/F-7 tesseract-2.01-upstream_patch1.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tesseract.spec, 1.2, 1.3
Message-ID: <200709072121.l87LLXsJ004784@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4495/tesseract/F-7

Modified Files:
	.cvsignore sources tesseract.spec 
Added Files:
	tesseract-2.01-upstream_patch1.patch 
Log Message:
Upgrade to v2.01


tesseract-2.01-upstream_patch1.patch:

--- NEW FILE tesseract-2.01-upstream_patch1.patch ---
+++ training/unicharset_extractor.cpp	2007-08-28 03:59:07.000000000 +0200
--- training/unicharset_extractor.cpp	2007-08-31 00:11:09.000000000 +0200
@@ -72,7 +72,7 @@
       unicharset->set_isalpha(id, 1);
       if (iswlower(wc))
         unicharset->set_islower(id, 1);
-      if (iswlower(wc))
+      if (iswupper(wc))
         unicharset->set_isupper(id, 1);
     }
     if (iswdigit(wc))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Aug 2007 14:34:25 -0000	1.3
+++ .cvsignore	7 Sep 2007 21:21:00 -0000	1.4
@@ -1,2 +1,2 @@
+tesseract-2.01.tar.gz
 tesseract-2.00.eng.tar.gz
-tesseract-2.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Aug 2007 14:34:25 -0000	1.3
+++ sources	7 Sep 2007 21:21:00 -0000	1.4
@@ -1,2 +1,2 @@
+fb0e6e7652b985049c11a4bc8e593885  tesseract-2.01.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz
-6d68d940ed15c61300cb04019c30f46c  tesseract-2.00.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/tesseract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tesseract.spec	24 Aug 2007 14:34:25 -0000	1.2
+++ tesseract.spec	7 Sep 2007 21:21:00 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		tesseract
-Version:	2.00
+Version:	2.01
 Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
@@ -7,7 +7,8 @@
 License:	ASL 2.0
 URL:		http://code.google.com/p/tesseract-ocr/
 Source0:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.eng.tar.gz
+Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-2.00.eng.tar.gz
+Patch0:		tesseract-2.01-upstream_patch1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtiff-devel
 
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -a 1
+%patch0
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
@@ -52,7 +54,6 @@
 %{_bindir}/unicharset_extractor
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
-%{_datadir}/%{name}/tessdata/eng*
 
 %doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
 
@@ -61,6 +62,8 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Karol Trzcionka <karlikt at gmail.com> - 2.01-1
+- Upgrade to v2.01
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
 - Upgrade to v2.00
 * Thu Mar 22 2007 Karol Trzcionka <karlikt at gmail.com> - 1.04-1



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:35 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Fri, 7 Sep 2007 17:21:35 -0400
Subject: rpms/tesseract/devel tesseract-2.01-upstream_patch1.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tesseract.spec, 1.2, 1.3
Message-ID: <200709072121.l87LLZRZ004797@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4495/tesseract/devel

Modified Files:
	.cvsignore sources tesseract.spec 
Added Files:
	tesseract-2.01-upstream_patch1.patch 
Log Message:
Upgrade to v2.01


tesseract-2.01-upstream_patch1.patch:

--- NEW FILE tesseract-2.01-upstream_patch1.patch ---
+++ training/unicharset_extractor.cpp	2007-08-28 03:59:07.000000000 +0200
--- training/unicharset_extractor.cpp	2007-08-31 00:11:09.000000000 +0200
@@ -72,7 +72,7 @@
       unicharset->set_isalpha(id, 1);
       if (iswlower(wc))
         unicharset->set_islower(id, 1);
-      if (iswlower(wc))
+      if (iswupper(wc))
         unicharset->set_isupper(id, 1);
     }
     if (iswdigit(wc))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Aug 2007 14:34:28 -0000	1.3
+++ .cvsignore	7 Sep 2007 21:21:03 -0000	1.4
@@ -1,2 +1,2 @@
+tesseract-2.01.tar.gz
 tesseract-2.00.eng.tar.gz
-tesseract-2.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Aug 2007 14:34:28 -0000	1.3
+++ sources	7 Sep 2007 21:21:03 -0000	1.4
@@ -1,2 +1,2 @@
+fb0e6e7652b985049c11a4bc8e593885  tesseract-2.01.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz
-6d68d940ed15c61300cb04019c30f46c  tesseract-2.00.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/tesseract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tesseract.spec	24 Aug 2007 14:34:28 -0000	1.2
+++ tesseract.spec	7 Sep 2007 21:21:03 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		tesseract
-Version:	2.00
+Version:	2.01
 Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
@@ -7,7 +7,8 @@
 License:	ASL 2.0
 URL:		http://code.google.com/p/tesseract-ocr/
 Source0:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.eng.tar.gz
+Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-2.00.eng.tar.gz
+Patch0:		tesseract-2.01-upstream_patch1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtiff-devel
 
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -a 1
+%patch0
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
@@ -52,7 +54,6 @@
 %{_bindir}/unicharset_extractor
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
-%{_datadir}/%{name}/tessdata/eng*
 
 %doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
 
@@ -61,6 +62,8 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Karol Trzcionka <karlikt at gmail.com> - 2.01-1
+- Upgrade to v2.01
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
 - Upgrade to v2.00
 * Thu Mar 22 2007 Karol Trzcionka <karlikt at gmail.com> - 1.04-1



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:52 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 17:21:52 -0400
Subject: rpms/balsa/devel .cvsignore, 1.21, 1.22 balsa.spec, 1.32,
	1.33 sources, 1.21, 1.22
Message-ID: <200709072121.l87LLq3g004845@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4707

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
update to upstream 2.3.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	25 Aug 2007 20:48:39 -0000	1.21
+++ .cvsignore	7 Sep 2007 21:21:20 -0000	1.22
@@ -1 +1 @@
-balsa-2.3.19.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- balsa.spec	25 Aug 2007 20:48:39 -0000	1.32
+++ balsa.spec	7 Sep 2007 21:21:20 -0000	1.33
@@ -1,7 +1,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.19
+Version:        2.3.20
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20.
+
 * Sat Aug 25 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.19-1
 - Update to upstream 2.3.19.
 
@@ -133,68 +136,3 @@
 * Mon Sep 11 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.13-2
 - rebuild for FC6.
 
-* Mon Jun 26 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.13-1
-- update to upstream version 2.3.13.
-
-* Tue Jun  6 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.12-2
-- add gettext as an explicit buildreq (#194245).
-
-* Sat Mar  4 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.12-1
-- update to upstream version 2.3.12.
-
-* Wed Mar  1 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.11-1
-- update to upstream version 2.3.11.
-
-* Sun Jan 29 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.10-1
-- update to upstream 2.3.10
-
-* Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
-- update to 2.3.9.
-
-* Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
-- update to 2.3.8; enable gtkhtml and gtkspell.
-
-* Sun Dec  4 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.7-1
-- update to upstream version 2.3.7. Use gmime-2.1.17
-
-* Wed Oct 23 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.6-1
-- update to upstream version 2.3.6
-
-* Wed Oct 19 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.5
-- update to upstream version 2.3.5
-
-* Tue Jul  5 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.4
-- update to upstream version 2.3.4
-
-* Tue Jun 14 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- directory ownership cleanup (credit to Michael Schwendt).
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- add missing scrollkeeper dependency.
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- libesmtp imported to fedora extras - reenable.
-
-* Sat Jun 11 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- Implement the reviewers's suggestions as on fedora-extras-list
-
-* Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3-1
-- bump version to 2.3.3
-- add libesmtp-devel dependency.
-- do not forget about config_opts.
-
-* Fri May 20 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.2-1
-- adapt to Fedora Extras template.
-
-
-* Sat Jul 26 2003 Misu Moldovan <dumol at go.ro>
-- further split the Red Hat and Mandrake sections
-- fix Mandrake 9.x dependencies
-
-* Mon Sep 16 2002 Pawel Salek <pawsa at theochem.kth.se>
-- adapt to GNOME2 requirements.
-
-* Sun Jun 24 2001 Spider <spider at darkmere.wanfear.com>
-- remove all defined paths to user-specified. 
-- update configures, locales, update esmtp as a requires/buildrequires 
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	25 Aug 2007 20:48:39 -0000	1.21
+++ sources	7 Sep 2007 21:21:20 -0000	1.22
@@ -1 +1 @@
-e6f7d9508dc901aea7470e4d9431e066  balsa-2.3.19.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 21:35:55 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 7 Sep 2007 17:35:55 -0400
Subject: rpms/libupnp/devel open.patch,NONE,1.1 libupnp.spec,1.14,1.15
Message-ID: <200709072135.l87LZtrS009338@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9191

Modified Files:
	libupnp.spec 
Added Files:
	open.patch 
Log Message:


open.patch:

--- NEW FILE open.patch ---
diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c libupnp-1.6.0/upnp/src/genlib/net/http-new/httpreadwrite.c
--- libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c	2007-05-23 15:18:08.000000000 +0200
+++ libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c	2007-09-01 16:18:33.000000000 +0200
@@ -349,7 +349,7 @@
             filename = ( char * )va_arg( argp, char * );
 
             if( Instr && Instr->IsVirtualFile )
-                Fp = virtualDirCallback.open( filename, UPNP_READ );
+                Fp = (virtualDirCallback.open)( filename, UPNP_READ );
             else
                 Fp = fopen( filename, "rb" );
 
diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c libupnp-1.6.0/upnp/src/genlib/net/http-new/webserver.c
--- libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c	2007-05-23 15:18:08.000000000 +0200
+++ libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c	2007-09-01 16:18:33.000000000 +0200
@@ -1531,7 +1531,7 @@
 
     if( Instr && Instr->IsVirtualFile ) {
 
-        Fp = virtualDirCallback.open( filename, UPNP_WRITE );
+        Fp = (virtualDirCallback.open)( filename, UPNP_WRITE );
         if( Fp == NULL ) {
             return HTTP_INTERNAL_SERVER_ERROR;
         }


Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libupnp.spec	29 Aug 2007 05:57:22 -0000	1.14
+++ libupnp.spec	7 Sep 2007 21:35:23 -0000	1.15
@@ -1,11 +1,12 @@
 Version: 1.6.0
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.libupnp.org/
 Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2
+Patch0: open.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define docdeveldir %{_docdir}/%{name}-devel-%{version}
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-documentation
@@ -78,6 +80,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 07 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.6.0-3
+- Patch to build with new glibc
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.6.0-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:44:54 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 17:44:54 -0400
Subject: rpms/balsa/FC-6 .cvsignore, 1.17, 1.18 balsa.spec, 1.24,
	1.25 sources, 1.17, 1.18
Message-ID: <200709072144.l87LisVK010846@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10729

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.20, fix #474366.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Jul 2007 19:34:34 -0000	1.17
+++ .cvsignore	7 Sep 2007 21:44:22 -0000	1.18
@@ -1 +1 @@
-balsa-2.3.17.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/balsa.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- balsa.spec	4 Jul 2007 19:34:34 -0000	1.24
+++ balsa.spec	7 Sep 2007 21:44:22 -0000	1.25
@@ -1,7 +1,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.17
+Version:        2.3.20
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20, fix #474366.
+
 * Wed Jul  4 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.17-1
 - update to upstream 2.3.17.
 
@@ -135,50 +138,3 @@
 * Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
 - update to 2.3.9.
 
-* Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
-- update to 2.3.8; enable gtkhtml and gtkspell.
-
-* Sun Dec  4 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.7-1
-- update to upstream version 2.3.7. Use gmime-2.1.17
-
-* Wed Oct 23 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.6-1
-- update to upstream version 2.3.6
-
-* Wed Oct 19 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.5
-- update to upstream version 2.3.5
-
-* Tue Jul  5 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.4
-- update to upstream version 2.3.4
-
-* Tue Jun 14 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- directory ownership cleanup (credit to Michael Schwendt).
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- add missing scrollkeeper dependency.
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- libesmtp imported to fedora extras - reenable.
-
-* Sat Jun 11 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- Implement the reviewers's suggestions as on fedora-extras-list
-
-* Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3-1
-- bump version to 2.3.3
-- add libesmtp-devel dependency.
-- do not forget about config_opts.
-
-* Fri May 20 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.2-1
-- adapt to Fedora Extras template.
-
-
-* Sat Jul 26 2003 Misu Moldovan <dumol at go.ro>
-- further split the Red Hat and Mandrake sections
-- fix Mandrake 9.x dependencies
-
-* Mon Sep 16 2002 Pawel Salek <pawsa at theochem.kth.se>
-- adapt to GNOME2 requirements.
-
-* Sun Jun 24 2001 Spider <spider at darkmere.wanfear.com>
-- remove all defined paths to user-specified. 
-- update configures, locales, update esmtp as a requires/buildrequires 
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Jul 2007 19:34:34 -0000	1.17
+++ sources	7 Sep 2007 21:44:22 -0000	1.18
@@ -1 +1 @@
-0e29e5be9287bf921b68e624c07b1dd2  balsa-2.3.17.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:33 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:33 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrXcL025941@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:33 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:33 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrYx6025950@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:34 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrYFt016065@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:51 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:51 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87LrpaN025959@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:52 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87Lrqwd016076@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:53 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:53 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87LrsKB025969@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:12 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:12 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsCFX016091@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:14 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:14 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsEj6025982@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:15 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:15 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsFbX016103@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Fri Sep  7 22:12:45 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Fri, 7 Sep 2007 18:12:45 -0400
Subject: rpms/varnish/F-7 varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3,
	1.4
Message-ID: <200709072212.l87MCj6K020671@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618

Modified Files:
	varnish.spec 
Added Files:
	varnish-cs1913.patch 
Log Message:
* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
- Added a patch, changeset 1913 from svn trunk. This makes varnish
  more stable under specific loads. 



varnish-cs1913.patch:

--- NEW FILE varnish-cs1913.patch ---
Index: bin/varnishd/cache_center.c
===================================================================
--- bin/varnishd/cache_center.c	(revision 1912)
+++ bin/varnishd/cache_center.c	(revision 1913)
@@ -524,7 +524,12 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varnish.spec	6 Sep 2007 20:23:42 -0000	1.3
+++ varnish.spec	7 Sep 2007 22:12:12 -0000	1.4
@@ -1,11 +1,12 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Patch0: varnish-cs1913.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
@@ -48,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -165,6 +168,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
+- Added a patch, changeset 1913 from svn trunk. This makes varnish
+  more stable under specific loads. 
+
 * Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
 - Removed autogen call (only diff from relase tarball)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 22:14:21 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Fri, 7 Sep 2007 18:14:21 -0400
Subject: rpms/varnish/devel varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3,
	1.4
Message-ID: <200709072214.l87MELGU020825@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20719

Modified Files:
	varnish.spec 
Added Files:
	varnish-cs1913.patch 
Log Message:
* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
- Added a patch, changeset 1913 from svn trunk. This makes varnish
  more stable under specific loads. 



varnish-cs1913.patch:

--- NEW FILE varnish-cs1913.patch ---
Index: bin/varnishd/cache_center.c
===================================================================
--- bin/varnishd/cache_center.c	(revision 1912)
+++ bin/varnishd/cache_center.c	(revision 1913)
@@ -524,7 +524,12 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varnish.spec	6 Sep 2007 20:28:35 -0000	1.3
+++ varnish.spec	7 Sep 2007 22:13:48 -0000	1.4
@@ -1,11 +1,12 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Patch0: varnish-cs1913.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
@@ -48,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -165,6 +168,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
+- Added a patch, changeset 1913 from svn trunk. This makes varnish
+  more stable under specific loads. 
+
 * Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
 - Removed autogen call (only diff from relase tarball)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 22:14:49 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 18:14:49 -0400
Subject: rpms/balsa/F-7 .cvsignore, 1.19, 1.20 balsa.spec, 1.28, 1.29 sources,
	1.19, 1.20
Message-ID: <200709072214.l87MEnw7020850@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20782

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.20, fix #474366.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Aug 2007 08:27:28 -0000	1.19
+++ .cvsignore	7 Sep 2007 22:14:17 -0000	1.20
@@ -1 +1 @@
-balsa-2.3.17.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/balsa.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- balsa.spec	4 Aug 2007 08:27:28 -0000	1.28
+++ balsa.spec	7 Sep 2007 22:14:17 -0000	1.29
@@ -1,8 +1,8 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.17
-Release:        2%{?dist}
+Version:        2.3.20
+Release:        1%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20, fix #474366.
+
 * Sat Aug  4 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.17-2
 - fix build problem.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	4 Aug 2007 08:27:28 -0000	1.19
+++ sources	7 Sep 2007 22:14:17 -0000	1.20
@@ -1 +1 @@
-0e29e5be9287bf921b68e624c07b1dd2  balsa-2.3.17.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:26 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:26 -0400
Subject: rpms/netpanzer-data/F-7 dead.package,NONE,1.1
Message-ID: <200709072242.l87MgQPG022256@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/F-7

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:29 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:29 -0400
Subject: rpms/netpanzer-data/FC-6 dead.package,NONE,1.1
Message-ID: <200709072242.l87MgTaU022274@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/FC-6

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:32 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:32 -0400
Subject: rpms/netpanzer-data/devel dead.package,NONE,1.1
Message-ID: <200709072242.l87MgWMG022292@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/devel

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:16 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:16 -0400
Subject: rpms/netpanzer-data/F-7 Makefile, 1.1, NONE branch, 1.1,
	NONE netpanzer-data.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnGRx022696@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/F-7

Removed Files:
	Makefile branch netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- branch DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:19 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:19 -0400
Subject: rpms/netpanzer-data/FC-6 Makefile, 1.1, NONE branch, 1.1,
	NONE netpanzer-data.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnJVf022711@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/FC-6

Removed Files:
	Makefile branch netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- branch DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:22 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:22 -0400
Subject: rpms/netpanzer-data/devel Makefile, 1.1, NONE netpanzer-data.spec,
	1.7, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnMP9022728@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/devel

Removed Files:
	Makefile netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 23:05:47 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:05:47 -0400
Subject: rpms/libflaim/devel libflaim-permissions.patch, NONE,
	1.1 libflaim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709072305.l87N5lr9029660@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29580/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libflaim-permissions.patch libflaim.spec 
Log Message:


libflaim-permissions.patch:

--- NEW FILE libflaim-permissions.patch ---
--- libflaim-4.9.1046/Makefile	2007-03-29 15:09:57.000000000 +0100
+++ Makefile	2007-09-06 14:57:19.000000000 +0100
@@ -1888,7 +1888,7 @@
 	$(ec)$(gprintf) "Installing ...\n"
 	mkdir -p $(lib_install_dir)/pkgconfig
 	mkdir -p $(include_install_dir)
-	install --mode=644 $(flaim_shared_lib) $(lib_install_dir)
+	install --mode=755 $(flaim_shared_lib) $(lib_install_dir)
 	install --mode=644 $(flaim_static_lib) $(lib_install_dir)
 	install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
 	install --mode=644 src/flaim.h $(include_install_dir)


--- NEW FILE libflaim.spec ---
#
# spec file for package libflaim (Version 4.9.1046)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugzilla.redhat.com/
#

Name:		libflaim
BuildRequires:	libstdc++ 
BuildRequires:	libstdc++-devel
BuildRequires:	ncurses-devel
Summary:	Embeddable cross-platform database engine
URL:		http://forge.novell.com/modules/xfmod/project/?flaim
Version:	4.9.989
Release:	10%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
Patch0:		%{name}-permissions.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust. It is available on a wide variety of 32 bit and 64 bit
platforms.

%package devel
Summary:	Embeddable cross-platform database engine
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust.

%prep
%setup -q
%patch -p1

%build
make CXXFLAGS="$RPM_OPT_FLAGS" lib_dir_name=%{_lib} libs

%install
rm -rf $RPM_BUILD_ROOT
make rpm_build_root=$RPM_BUILD_ROOT lib_dir_name=%{_lib} install

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT VERSION
%exclude %{_libdir}/libflaim.a
%{_libdir}/libflaim.so.*

%files devel
%defattr(-,root,root)
%{_libdir}/libflaim.so
%{_libdir}/pkgconfig/libflaim.pc
%{_includedir}/flaim.h
%{_includedir}/flaimtk.h

%changelog
* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
- downgrade from svn checkout to official release

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn
- patch for install permissions

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10
- update buildroot and other changes for bugzilla review #251020

* Thu Aug 30 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.2
- add pkgconfig requires
- exclude static libs

* Thu Aug  2 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.1
- minor changes for Fedora build
- updated bug url
- added post and postun ldconfig call

* Thu Mar 29 2007 dsanders at novell.com
- Fixed problem of accessing FlmRecord object before it was constructed.

* Thu Mar 29 2007 aj at suse.de
- Add BuildRequires for ncurses-devel.

* Sat Feb 10 2007 aj at suse.de
- Add defattr.

* Thu Feb  8 2007 dsanders at novell.com
- Changes to support Ubuntu packages, including 64-bit.
- Needed to lock the record cache mutex in FlmRecord::Release just before deleting the object to prevent a race condition.
- Changed license to LGPL.
- Updated copyright.
- Added pragmas for windows to remove compiler warnings for VC6 compiler.
- Fixed keyword substitution tokens.
- Added FlmReadFully() and enhanced the base64 decoder.
- Removed commands in makefile that was outputting provides to the spec file.

* Thu Feb  1 2007 ro at suse.de
- remove self-provides from devel package

* Thu Nov 16 2006 dsanders at novell.com
- Removed .exe files from package.
- Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures.
- Getting rid of references to gv_FlmSysData.
- Needed to add a (FLMUINT) cast to a FLMBOOL before it can be cast as a void *.
- Fixed mis-typed member of OPT_INFO structure.
- Fixed Linux compiler warnings.
- Changed several places that needed to access pDbInfo->pProgress instead of just Progress.
- Support for Ubuntu and Debian packages

* Fri Sep 29 2006 aj at suse.de
- Remove explicit self-provides

* Fri Sep  8 2006 dsanders at novell.com
- Added support for 64 bit numbers.
- Modified to use aligned buffers to improve direct I/O efficiency.
- Modified block cache allocator to make more efficient use of memory.
- Added option to allow disabling of direct I/O on Linux and Unix platforms.
- Enhancements to reduce the overhead of growing and shrinking files.
- Modified async I/O to make better reuse of available buffers when writes complete out of order.
- Fixed some memory leaks and other minor defects.
- Added more asserts to debug code.
- Enhancements and improvements to the field ID table inside of FlmRecord object.
- Updated doxygen document to be more accurate.
- Added a gigatest utility for testing bulk loads.
- Added more unit tests.
- Various tweaks for better support of various platforms and compilers.

* Tue Jun 27 2006 dsanders at novell.com
- Needed to make some typedefs public for Solaris 8.
- Also fixed so that flaimtk.h is copied from ftk.h when building srcdist

* Thu Jun 22 2006 ro at suse.de
- removed buggy self-provides from devel package

* Thu Jun 22 2006 dsanders at novell.com
- Modified common toolkit formatter to support colors when logging.
- Modified to use common formatter in toolkit for logging.

* Tue Jun 20 2006 dsanders at novell.com
- Logger client was not being set up properly in common toolkit.
- Fixed a Netware build issue
- Fixed an OS X compiler warning
- Fixed linux compiler warning
- Needed to lock/unlock the random generator mutex when getting a random number.
- f_printf needed to call fflush.
- Base 64 decoder needed to return success instead of eof hit.

* Mon Jun 19 2006 dsanders at novell.com
- Restructured code to use new common toolkit
- Support for Netware, including unit tests
- Fixed various memory leaks and enabled memory tracking for debug builds.
- Made some changes for how async I/O is supported on Solaris.
- Fixed various compiler warnings on various platforms.
- Added more documentation.

* Thu Jun  1 2006 dsanders at novell.com
- Fixed compiler warnings for ia64 platform.

* Tue May 30 2006 dsanders at novell.com
- Added support for Sparc Linux and OpenSuse 10.1
- Various Makefile changes for HP-UX, OS X, and Solaris
- Various code cleanups to support a common toolkit
- Got rid of timeouts for internal transactions.
- Removed some unused methods from the FlmRecord class.
- Fixed defect where partial blocks were being written at the end of database files
- Fixed race condition that was causing memory to be double-freed.
- Added better support for atomic operations on various Unix and Linux platforms.
- Allow application to exceed hardcoded cache limits when setting a hard cache limit.
- Changed RCODE to be an enumerated type - for easier documentation in doxygen.
- Fixed various compiler issues for solaris platform
- Added support for large binary and text fields (up to 4 GB)
- Added async and direct I/O support for Linux and Solaris
- Added new field table for level one fields inside FlmRecords to speed up searches.
- Added support for Netware
- Fixed double mutex lock issue.
- Added support for building Windows binaries with Visual Studio 8.
- Modified slab manager on Solaris to use regular malloc calls instead of mmap.
* Tue Feb 28 2006 dsanders at novell.com
- Added support for Intel MAC and __sparc49 (64 bit) platforms
- Initialized variables to quiet compiler warnings
- Got rid of unneeded internal functions
- Various fixes for Windows - support for vc8 compiler, workaround to compiler issues with inline methods
- Fixedup copyright notice in one source file
* Mon Feb 13 2006 dsanders at novell.com
- Changed naming convention for shared library to conform to standard - should be no need for SONAME fix now.
- Added dbshell utility.
- Started adding support for using autotools.
- Fixed bug on FlmDbReduceSize - needed to quit when encountering a block in a not-yet-deleted b-tree
- Added various new unit tests.
- Fixed various compiler warnings.

* Mon Feb 13 2006 ro at suse.de
- install the SONAME at least as symlink (should be the real file)

* Wed Feb  8 2006 dsanders at novell.com
- Removed make.exe and printf.exe from package.
- Added support for Ubuntu and Debian
- Simplified how unit tests are created.
- Added some new unit tests

* Fri Feb  3 2006 dsanders at novell.com
- Fixed libflaim.pc to specify includedir and Cflags:
- Also changed name: to Name:
- Modified Makefile to use macros for outputting $ and %% characters

* Fri Feb  3 2006 dsanders at novell.com
- Added support for PowerPC architectures
- Changed so that revision number for RPMs will match version number
- in SVN repository.

* Wed Feb  1 2006 dsanders at novell.com
- Initial submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:32:57 -0000	1.1
+++ .cvsignore	7 Sep 2007 23:05:14 -0000	1.2
@@ -0,0 +1 @@
+libflaim-4.9.989.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:32:57 -0000	1.1
+++ sources	7 Sep 2007 23:05:14 -0000	1.2
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:21:24 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:21:24 -0400
Subject: rpms/libflaim/F-7 sources,1.1,1.2
Message-ID: <200709072321.l87NLOgL030595@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30532/libflaim/F-7

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:32:57 -0000	1.1
+++ sources	7 Sep 2007 23:20:51 -0000	1.2
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:36:43 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:36:43 -0400
Subject: rpms/libflaim/F-7 sources,1.2,1.3
Message-ID: <200709072336.l87NahZJ031341@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31294/F-7

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2007 23:20:51 -0000	1.2
+++ sources	7 Sep 2007 23:36:10 -0000	1.3
@@ -1 +0,0 @@
-cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:50:38 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:50:38 -0400
Subject: rpms/libflaim/F-7 libflaim-permissions.patch, NONE,
	1.1 libflaim.spec, NONE, 1.1
Message-ID: <200709072350.l87NocW5032329@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32273

Added Files:
	libflaim-permissions.patch libflaim.spec 
Log Message:


libflaim-permissions.patch:

--- NEW FILE libflaim-permissions.patch ---
--- libflaim-4.9.1046/Makefile	2007-03-29 15:09:57.000000000 +0100
+++ Makefile	2007-09-06 14:57:19.000000000 +0100
@@ -1888,7 +1888,7 @@
 	$(ec)$(gprintf) "Installing ...\n"
 	mkdir -p $(lib_install_dir)/pkgconfig
 	mkdir -p $(include_install_dir)
-	install --mode=644 $(flaim_shared_lib) $(lib_install_dir)
+	install --mode=755 $(flaim_shared_lib) $(lib_install_dir)
 	install --mode=644 $(flaim_static_lib) $(lib_install_dir)
 	install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
 	install --mode=644 src/flaim.h $(include_install_dir)


--- NEW FILE libflaim.spec ---
#
# spec file for package libflaim (Version 4.9.1046)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugzilla.redhat.com/
#

Name:		libflaim
BuildRequires:	libstdc++ 
BuildRequires:	libstdc++-devel
BuildRequires:	ncurses-devel
Summary:	Embeddable cross-platform database engine
URL:		http://forge.novell.com/modules/xfmod/project/?flaim
Version:	4.9.989
Release:	10%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
Patch0:		%{name}-permissions.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust. It is available on a wide variety of 32 bit and 64 bit
platforms.

%package devel
Summary:	Embeddable cross-platform database engine
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust.

%prep
%setup -q
%patch -p1

%build
make CXXFLAGS="$RPM_OPT_FLAGS" lib_dir_name=%{_lib} libs

%install
rm -rf $RPM_BUILD_ROOT
make rpm_build_root=$RPM_BUILD_ROOT lib_dir_name=%{_lib} install

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT VERSION
%exclude %{_libdir}/libflaim.a
%{_libdir}/libflaim.so.*

%files devel
%defattr(-,root,root)
%{_libdir}/libflaim.so
%{_libdir}/pkgconfig/libflaim.pc
%{_includedir}/flaim.h
%{_includedir}/flaimtk.h

%changelog
* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
- downgrade from svn checkout to official release

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn
- patch for install permissions

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10
- update buildroot and other changes for bugzilla review #251020

* Thu Aug 30 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.2
- add pkgconfig requires
- exclude static libs

* Thu Aug  2 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.1
- minor changes for Fedora build
- updated bug url
- added post and postun ldconfig call

* Thu Mar 29 2007 dsanders at novell.com
- Fixed problem of accessing FlmRecord object before it was constructed.

* Thu Mar 29 2007 aj at suse.de
- Add BuildRequires for ncurses-devel.

* Sat Feb 10 2007 aj at suse.de
- Add defattr.

* Thu Feb  8 2007 dsanders at novell.com
- Changes to support Ubuntu packages, including 64-bit.
- Needed to lock the record cache mutex in FlmRecord::Release just before deleting the object to prevent a race condition.
- Changed license to LGPL.
- Updated copyright.
- Added pragmas for windows to remove compiler warnings for VC6 compiler.
- Fixed keyword substitution tokens.
- Added FlmReadFully() and enhanced the base64 decoder.
- Removed commands in makefile that was outputting provides to the spec file.

* Thu Feb  1 2007 ro at suse.de
- remove self-provides from devel package

* Thu Nov 16 2006 dsanders at novell.com
- Removed .exe files from package.
- Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures.
- Getting rid of references to gv_FlmSysData.
- Needed to add a (FLMUINT) cast to a FLMBOOL before it can be cast as a void *.
- Fixed mis-typed member of OPT_INFO structure.
- Fixed Linux compiler warnings.
- Changed several places that needed to access pDbInfo->pProgress instead of just Progress.
- Support for Ubuntu and Debian packages

* Fri Sep 29 2006 aj at suse.de
- Remove explicit self-provides

* Fri Sep  8 2006 dsanders at novell.com
- Added support for 64 bit numbers.
- Modified to use aligned buffers to improve direct I/O efficiency.
- Modified block cache allocator to make more efficient use of memory.
- Added option to allow disabling of direct I/O on Linux and Unix platforms.
- Enhancements to reduce the overhead of growing and shrinking files.
- Modified async I/O to make better reuse of available buffers when writes complete out of order.
- Fixed some memory leaks and other minor defects.
- Added more asserts to debug code.
- Enhancements and improvements to the field ID table inside of FlmRecord object.
- Updated doxygen document to be more accurate.
- Added a gigatest utility for testing bulk loads.
- Added more unit tests.
- Various tweaks for better support of various platforms and compilers.

* Tue Jun 27 2006 dsanders at novell.com
- Needed to make some typedefs public for Solaris 8.
- Also fixed so that flaimtk.h is copied from ftk.h when building srcdist

* Thu Jun 22 2006 ro at suse.de
- removed buggy self-provides from devel package

* Thu Jun 22 2006 dsanders at novell.com
- Modified common toolkit formatter to support colors when logging.
- Modified to use common formatter in toolkit for logging.

* Tue Jun 20 2006 dsanders at novell.com
- Logger client was not being set up properly in common toolkit.
- Fixed a Netware build issue
- Fixed an OS X compiler warning
- Fixed linux compiler warning
- Needed to lock/unlock the random generator mutex when getting a random number.
- f_printf needed to call fflush.
- Base 64 decoder needed to return success instead of eof hit.

* Mon Jun 19 2006 dsanders at novell.com
- Restructured code to use new common toolkit
- Support for Netware, including unit tests
- Fixed various memory leaks and enabled memory tracking for debug builds.
- Made some changes for how async I/O is supported on Solaris.
- Fixed various compiler warnings on various platforms.
- Added more documentation.

* Thu Jun  1 2006 dsanders at novell.com
- Fixed compiler warnings for ia64 platform.

* Tue May 30 2006 dsanders at novell.com
- Added support for Sparc Linux and OpenSuse 10.1
- Various Makefile changes for HP-UX, OS X, and Solaris
- Various code cleanups to support a common toolkit
- Got rid of timeouts for internal transactions.
- Removed some unused methods from the FlmRecord class.
- Fixed defect where partial blocks were being written at the end of database files
- Fixed race condition that was causing memory to be double-freed.
- Added better support for atomic operations on various Unix and Linux platforms.
- Allow application to exceed hardcoded cache limits when setting a hard cache limit.
- Changed RCODE to be an enumerated type - for easier documentation in doxygen.
- Fixed various compiler issues for solaris platform
- Added support for large binary and text fields (up to 4 GB)
- Added async and direct I/O support for Linux and Solaris
- Added new field table for level one fields inside FlmRecords to speed up searches.
- Added support for Netware
- Fixed double mutex lock issue.
- Added support for building Windows binaries with Visual Studio 8.
- Modified slab manager on Solaris to use regular malloc calls instead of mmap.
* Tue Feb 28 2006 dsanders at novell.com
- Added support for Intel MAC and __sparc49 (64 bit) platforms
- Initialized variables to quiet compiler warnings
- Got rid of unneeded internal functions
- Various fixes for Windows - support for vc8 compiler, workaround to compiler issues with inline methods
- Fixedup copyright notice in one source file
* Mon Feb 13 2006 dsanders at novell.com
- Changed naming convention for shared library to conform to standard - should be no need for SONAME fix now.
- Added dbshell utility.
- Started adding support for using autotools.
- Fixed bug on FlmDbReduceSize - needed to quit when encountering a block in a not-yet-deleted b-tree
- Added various new unit tests.
- Fixed various compiler warnings.

* Mon Feb 13 2006 ro at suse.de
- install the SONAME at least as symlink (should be the real file)

* Wed Feb  8 2006 dsanders at novell.com
- Removed make.exe and printf.exe from package.
- Added support for Ubuntu and Debian
- Simplified how unit tests are created.
- Added some new unit tests

* Fri Feb  3 2006 dsanders at novell.com
- Fixed libflaim.pc to specify includedir and Cflags:
- Also changed name: to Name:
- Modified Makefile to use macros for outputting $ and %% characters

* Fri Feb  3 2006 dsanders at novell.com
- Added support for PowerPC architectures
- Changed so that revision number for RPMs will match version number
- in SVN repository.

* Wed Feb  1 2006 dsanders at novell.com
- Initial submission



From fedora-extras-commits at redhat.com  Fri Sep  7 23:56:36 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:56:36 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.1,1.2
Message-ID: <200709072356.l87Nua1P002331@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2313

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libflaim.spec	7 Sep 2007 23:50:35 -0000	1.1
+++ libflaim.spec	7 Sep 2007 23:56:04 -0000	1.2
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,7 +73,7 @@
 %{_includedir}/flaimtk.h
 
 %changelog
-* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
+* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-11
 - downgrade from svn checkout to official release
 
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn



From fedora-extras-commits at redhat.com  Sat Sep  8 00:12:38 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 20:12:38 -0400
Subject: rpms/libflaim/devel libflaim.spec,1.1,1.2
Message-ID: <200709080012.l880Cc2u009236@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9192/devel

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/libflaim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libflaim.spec	7 Sep 2007 23:05:14 -0000	1.1
+++ libflaim.spec	8 Sep 2007 00:12:05 -0000	1.2
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	10%{?dist}
+Release:	12%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
+- build system issue
+
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
 - downgrade from svn checkout to official release
 



From fedora-extras-commits at redhat.com  Sat Sep  8 00:24:37 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 20:24:37 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.2,1.3
Message-ID: <200709080024.l880ObC2010023@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libflaim.spec	7 Sep 2007 23:56:04 -0000	1.2
+++ libflaim.spec	8 Sep 2007 00:24:03 -0000	1.3
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,7 +73,10 @@
 %{_includedir}/flaimtk.h
 
 %changelog
-* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-11
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
+- build system issue
+
+* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
 - downgrade from svn checkout to official release
 
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn



From fedora-extras-commits at redhat.com  Sat Sep  8 00:28:13 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:28:13 -0400
Subject: rpms/mksh/devel .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709080028.l880SD1I010339@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10284

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:30:15 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:27:40 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:30:27 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:27:40 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:30:15 -0000	1.4
+++ sources	8 Sep 2007 00:27:41 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:29:47 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:29:47 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.4,1.5 mksh.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <200709080029.l880TllI010578@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10487

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:31:41 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:29:14 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:31:39 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:29:14 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:31:41 -0000	1.4
+++ sources	8 Sep 2007 00:29:14 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:31:49 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:31:49 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080031.l880VnMw010746@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10690

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:34:32 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:31:16 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:32:43 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:31:16 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:34:32 -0000	1.4
+++ sources	8 Sep 2007 00:31:16 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:33:05 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:33:05 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080033.l880X5Ci010876@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10826

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:36:23 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:32:33 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:35:32 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:32:33 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:36:23 -0000	1.4
+++ sources	8 Sep 2007 00:32:33 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:34:26 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:34:26 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080034.l880YQ2s011012@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10966

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:35:32 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:33:53 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:33:50 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:33:53 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:35:32 -0000	1.4
+++ sources	8 Sep 2007 00:33:53 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 01:54:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 21:54:51 -0400
Subject: rpms/cheese/devel cheese.spec, NONE, 1.1 stripmenot.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709080154.l881spRQ019986@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cheese.spec stripmenot.patch 
Log Message:
initial import



--- NEW FILE cheese.spec ---
Name:           cheese
Version:        0.2.4 
Release:        2%{?dist}
Summary:        A webcam application for snapshots and movies

Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://live.gnome.org/Cheese
# see http://live.gnome.org/Cheese/Releases for the sources
Source0:        %{name}-%{version}.tar.gz
Patch0:         stripmenot.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libglade2-devel >= 2.0.0
BuildRequires: dbus-devel
BuildRequires: gstreamer-devel >= 0.10.12
BuildRequires: gstreamer-plugins-base-devel >= 0.10.12
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnomeui-devel
BuildRequires: evolution-data-server-devel
#BuildRequires: xorg-x11-proto-devel
BuildRequires: libXxf86vm-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext

Requires: gstreamer-plugins-good >= 0.10.6-2

%description
Cheese is a Photobooth-inspired GNOME application for taking pictures and 
videos from a webcam. It also includes fancy graphical effects based on the 
gstreamer-backend.

%prep
%setup -q
%patch0 -p1 -b .stripmenot

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --delete-original --vendor="" 	\
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications 	\
	$RPM_BUILD_ROOT%{_datadir}/applications/cheese.desktop

%find_lang %{name} --with-gnome


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/cheese
%{_datadir}/applications/cheese.desktop
%{_datadir}/cheese
%{_datadir}/icons/hicolor/*/apps/cheese.png
%{_datadir}/icons/hicolor/scalable/apps/cheese.svg

%changelog
* Fri Sep  7 2007  Matthias Clasen  <mclasen at redhat.com> 0.2.4-2
- package review feedback

* Thu Sep  6 2007  Matthias Clasen  <mclasen at redhat.com> 0.2.4-1
- Initial packages

stripmenot.patch:

--- NEW FILE stripmenot.patch ---
diff -up cheese-0.2.4/toc2/make/toc2-install.make.stripmenot cheese-0.2.4/toc2/make/toc2-install.make
--- cheese-0.2.4/toc2/make/toc2-install.make.stripmenot	2007-09-07 00:41:13.000000000 -0400
+++ cheese-0.2.4/toc2/make/toc2-install.make	2007-09-07 00:41:55.000000000 -0400
@@ -147,7 +147,7 @@ toc2.call.install-dll =  $(call toc2.cal
 ##			}
 
 toc2.install.flags.nonbins = -m 0644
-toc2.install.flags.bins = -s -m 0755
+toc2.install.flags.bins = -m 0755
 toc2.install.flags.bin-scripts = -m 0755
 toc2.install.flags.dlls = -m 0755
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:41:59 -0000	1.1
+++ .cvsignore	8 Sep 2007 01:54:19 -0000	1.2
@@ -0,0 +1 @@
+cheese-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:41:59 -0000	1.1
+++ sources	8 Sep 2007 01:54:19 -0000	1.2
@@ -0,0 +1 @@
+f3a14b9ef07167f5fb6b34ccd67de339  cheese-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 02:03:50 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 7 Sep 2007 22:03:50 -0400
Subject: rpms/yadex/devel yadex.spec,1.7,1.8
Message-ID: <200709080203.l8823og7026213@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26191

Modified Files:
	yadex.spec 
Log Message:
No longer BuildRequires: gawk due to buildroot changes




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- yadex.spec	22 Aug 2007 18:07:29 -0000	1.7
+++ yadex.spec	8 Sep 2007 02:03:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  libX11-devel gawk
+BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Sep 7 2007 Wart <wart at kobold.org> 1.7.0-9
+- No longer BuildRequires: gawk due to buildroot changes
+
 * Tue Aug 21 2007 Wart <wart at kobold.org> 1.7.0-8
 - License tag clarification
 - Add BuildRequires: gawk due to changes in the buildroot



From fedora-extras-commits at redhat.com  Sat Sep  8 02:41:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 22:41:56 -0400
Subject: comps comps-f8.xml.in,1.95,1.96
Message-ID: <200709080241.l882fuOM028081@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28022

Modified Files:
	comps-f8.xml.in 
Log Message:
Add cheese



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- comps-f8.xml.in	6 Sep 2007 19:41:58 -0000	1.95
+++ comps-f8.xml.in	8 Sep 2007 02:41:26 -0000	1.96
@@ -1879,6 +1879,7 @@
       <packagereq type="optional">agave</packagereq>
       <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">cheese</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">dcraw</packagereq>
       <packagereq type="optional">digikam</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 03:25:19 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 7 Sep 2007 23:25:19 -0400
Subject: rpms/spandsp/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 spandsp.spec, 1.16, 1.17
Message-ID: <200709080325.l883PJYn003551@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.4pre8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Aug 2007 20:49:02 -0000	1.14
+++ .cvsignore	8 Sep 2007 03:24:46 -0000	1.15
@@ -1 +1 @@
-spandsp-0.0.4pre7.tgz
+spandsp-0.0.4pre8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	25 Aug 2007 20:49:02 -0000	1.14
+++ sources	8 Sep 2007 03:24:46 -0000	1.15
@@ -1 +1 @@
-7931fe0452b37e4ca5032254a7b9e400  spandsp-0.0.4pre7.tgz
+73d7843a7c681c37ea9e1eb205c6fe81  spandsp-0.0.4pre8.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- spandsp.spec	25 Aug 2007 20:49:02 -0000	1.16
+++ spandsp.spec	8 Sep 2007 03:24:46 -0000	1.17
@@ -1,9 +1,9 @@
-%define pre 7
+%define pre 8
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.4
-Release: 0.3%{?pre:.pre%{pre}}%{?dist}
+Release: 0.4%{?pre:.pre%{pre}}%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep  7 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.4.pre8
+- Update to 0.0.4pre8
+
 * Sat Aug 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.2.pre7
 - Update to 0.0.4pre7
 



From fedora-extras-commits at redhat.com  Sat Sep  8 03:26:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Fri, 7 Sep 2007 23:26:56 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.22,1.23
Message-ID: <200709080326.l883QuDF003683@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3642

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Fri Sep 07 2007 Adam Jackson <ajax at redhat.com> 7.2-7
- Add linuxwacom and synaptics to the default set.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drivers.spec	11 May 2007 18:51:29 -0000	1.22
+++ xorg-x11-drivers.spec	8 Sep 2007 03:26:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,8 @@
 # where we really do know that it's arch-specific.  Those go at the end of
 # this list.
 
+Requires: linuxwacom
+Requires: synaptics
 Requires: xorg-x11-drv-acecad
 Requires: xorg-x11-drv-aiptek
 Requires: xorg-x11-drv-apm
@@ -84,7 +86,9 @@
 Requires: xorg-x11-drv-neomagic
 %endif
 
-# Thus far via chips are only on x86 and amd64 motherboards
+# Thus far via chips are only on x86 and amd64 motherboards.  This might be
+# the driver that ends up supporting the S3 Chrome cards, so don't be
+# surprised if this changes.
 %ifarch %{ix86} x86_64
 Requires: xorg-x11-drv-via
 %endif
@@ -117,6 +121,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 07 2007 Adam Jackson <ajax at redhat.com> 7.2-7
+- Add linuxwacom and synaptics to the default set.
+
 * Fri May 11 2007 Adam Jackson <ajax at redhat.com> 7.2-6
 - Add xorg-x11-drv-nouveau.  If this bothers you, uninstall the metapackage.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 03:28:22 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Fri, 7 Sep 2007 23:28:22 -0400
Subject: comps comps-f8.xml.in,1.96,1.97
Message-ID: <200709080328.l883SMNM003803@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735

Modified Files:
	comps-f8.xml.in 
Log Message:
Remove explicit mention of linuxwacom and synaptics, since xorg-x11-drivers
will pull them in now.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- comps-f8.xml.in	8 Sep 2007 02:41:26 -0000	1.96
+++ comps-f8.xml.in	8 Sep 2007 03:27:52 -0000	1.97
@@ -328,7 +328,6 @@
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
-      <packagereq type="default">linuxwacom</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">pirut</packagereq>
       <packagereq type="default">policycoreutils-gui</packagereq>
@@ -336,7 +335,6 @@
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
-      <packagereq type="default">synaptics</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-display</packagereq>
       <packagereq type="default">system-config-network</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 07:21:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 8 Sep 2007 03:21:15 -0400
Subject: rpms/gperiodic/devel .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709080721.l887LFUN005114@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	8 Sep 2007 07:20:43 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	5 May 2007 17:57:28 -0000	1.7
+++ gperiodic.spec	8 Sep 2007 07:20:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 8%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
 * Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	8 Sep 2007 07:20:43 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 05:23:41 -0400
Subject: rpms/lirc-kmod-common/devel dead.package,1.1,1.2
Message-ID: <200709080923.l889NfCW022468@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22448

Modified Files:
	dead.package 
Log Message:
https://bugzilla.redhat.com/192621


Index: dead.package
===================================================================
RCS file: /cvs/pkgs/rpms/lirc-kmod-common/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	27 Aug 2006 11:22:27 -0000	1.1
+++ dead.package	8 Sep 2007 09:23:04 -0000	1.2
@@ -0,0 +1 @@
+https://bugzilla.redhat.com/192621



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:52 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:52 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchcommits
Message-ID: <200709080923.l889NqI1029675@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchcommits acl on lirc-kmod (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:53 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchbugzilla
Message-ID: <200709080923.l889Nslc021593@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on lirc-kmod (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:57 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchcommits
Message-ID: <200709080923.l889NvMc029682@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchcommits acl on lirc-kmod (Fedora 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:58 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchbugzilla
Message-ID: <200709080923.l889Nx6l029688@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on lirc-kmod (Fedora 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 09:44:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 05:44:37 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec,1.41,1.42
Message-ID: <200709080944.l889ib31023275@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257

Modified Files:
	rpmdevtools.spec 
Log Message:
Sync deps with Fedora's new assumed present in buildroots packages list.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- rpmdevtools.spec	5 Sep 2007 21:41:23 -0000	1.41
+++ rpmdevtools.spec	8 Sep 2007 09:44:35 -0000	1.42
@@ -18,26 +18,38 @@
 BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
-Requires:       fakeroot
 # Minimal RPM build requirements
-Requires:       rpm-build >= 4.4.2.1
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
+Requires:       patch
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build >= 4.4.2.1
+Requires:       sed
 Requires:       tar
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
 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
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -111,6 +123,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- 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.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 10:22:58 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Sat, 8 Sep 2007 06:22:58 -0400
Subject: rpms/pm-utils/devel pm-utils.spec, 1.75, 1.76 sources, 1.32,
	1.33 radeontool-1.5.diff, 1.1,
	NONE radeontool-fix-option-handling.diff, 1.2,
	NONE radeontool-get-rid-of-lspci.diff, 1.1,
	NONE vbetool-0.3-fix-gcc4bug.patch, 1.3, NONE vbetool-libz.patch,
	1.2, NONE
Message-ID: <200709081022.l88AMwEg030795@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30736

Modified Files:
	pm-utils.spec sources 
Removed Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff vbetool-0.3-fix-gcc4bug.patch 
	vbetool-libz.patch 
Log Message:
* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
- Adjust %files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
- remove (C|CXX|F)FLAGS definitions, they are already in %configure
- remove Core in Summary tag
- add URL for pm-utils
- add %{?arm} to ExclusiveArch (#245463)
- remove vbetool and require it (it is a separte package now)
- remove radeontool and require it (it is a separte package now)
- Update License Tag
- cleanup buildrequires



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pm-utils.spec	31 Aug 2007 08:39:48 -0000	1.75
+++ pm-utils.spec	8 Sep 2007 10:22:26 -0000	1.76
@@ -1,12 +1,14 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
-License: GPLv2 and zlib and BSD
+License: GPLv2
 Version: 0.99.3
 Release: 12%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
+Requires: radeontool
+Requires: vbetool
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -20,31 +22,15 @@
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
-%define vbever 0.7
-Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
-# URL: http://fdd.com/software/radeon/
-Source20: http://fdd.com/software/radeon/radeontool-1.5.tar.gz
-%ifarch %{ix86}
-Obsoletes: vbetool
-Provides: vbetool
-Obsoletes: radeontool
-Provides: radeontool
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90, zlib-devel
+BuildRequires: hal-devel pkgconfig
+BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-vbe-redirect.patch
 Patch3: pm-utils-0.99.3-cfg.patch
 
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-libz.patch
-
-Patch20: radeontool-1.5.diff
-Patch21: radeontool-fix-option-handling.diff
-Patch22: radeontool-get-rid-of-lspci.diff
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -58,49 +44,13 @@
 %patch2 -p1 -b .vbe-redirect
 %patch3 -p1 -b .cfg
 
-%patch10 -p0 -b .gcc4
-%patch11 -p0 -b .zlib
-
-cd radeontool-1.5
-%patch20 -p0 -b .volatile
-%patch21 -p0 -b .options
-%patch22 -p0 -b .no-lspci
-cd ..
 
 %build
-cd vbetool-%{vbever}
-%ifarch %{ix86}
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
-
-%ifarch %{ix86} x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
 %configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch %{ix86} x86_64
-cd vbetool-%{vbever}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-cd radeontool-1.5
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}
-cd ..
-%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -157,22 +107,21 @@
 %{_sbindir}/pm-powersave
 %{_sbindir}/pm-suspend
 %{_sbindir}/pm-suspend-hybrid
-%ifarch %{ix86} x86_64
-%{_sbindir}/radeontool
-%{_sbindir}/vbetool
-%endif
 
 %{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Fri Aug 31 2007 Till Maas <opensource till name> - 0.99.3-12
+* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
 - Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
 - remove (C|CXX|F)FLAGS definitions, they are already in %%configure
 - remove Core in Summary tag
 - add URL for pm-utils
-- add full URL source for radeontool
 - add %%{?arm} to ExclusiveArch (#245463)
+- remove vbetool and require it (it is a separte package now)
+- remove radeontool and require it (it is a separte package now)
+- Update License Tag
+- cleanup buildrequires
 
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
 - Install (not just build) vbetool and radeontool on x86_64 too


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2007 14:20:54 -0000	1.32
+++ sources	8 Sep 2007 10:22:26 -0000	1.33
@@ -1,3 +1 @@
-8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
 0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz


--- radeontool-1.5.diff DELETED ---


--- radeontool-fix-option-handling.diff DELETED ---


--- radeontool-get-rid-of-lspci.diff DELETED ---


--- vbetool-0.3-fix-gcc4bug.patch DELETED ---


--- vbetool-libz.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 10:26:55 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Sat, 8 Sep 2007 06:26:55 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.76,1.77
Message-ID: <200709081026.l88AQt44031004@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30958

Modified Files:
	pm-utils.spec 
Log Message:
* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
- Adjust %files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
- remove (C|CXX|F)FLAGS definitions, they are already in %configure
- remove Core in Summary tag
- add URL for pm-utils
- add %{?arm} to ExclusiveArch (#245463)
- remove vbetool and require it (it is a separate package now)
- remove radeontool and require it (it is a separate package now)
- Update License Tag
- cleanup buildrequires
- clear %setup



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- pm-utils.spec	8 Sep 2007 10:22:26 -0000	1.76
+++ pm-utils.spec	8 Sep 2007 10:26:22 -0000	1.77
@@ -37,7 +37,7 @@
 to power management.
 
 %prep
-%setup -q -a 10 -a 20
+%setup -q 
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
@@ -118,10 +118,11 @@
 - remove Core in Summary tag
 - add URL for pm-utils
 - add %%{?arm} to ExclusiveArch (#245463)
-- remove vbetool and require it (it is a separte package now)
-- remove radeontool and require it (it is a separte package now)
+- remove vbetool and require it (it is a separate package now)
+- remove radeontool and require it (it is a separate package now)
 - Update License Tag
 - cleanup buildrequires
+- clear %%setup
 
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
 - Install (not just build) vbetool and radeontool on x86_64 too



From fedora-extras-commits at redhat.com  Sat Sep  8 10:51:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 06:51:58 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec,1.19.2.5,1.19.2.6
Message-ID: <200709081051.l88Apweh008046@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7979

Modified Files:
      Tag: rpmdevtools-5
	rpmdevtools.spec 
Log Message:
Sync deps with Fedora's new assumed present in buildroots packages list.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- rpmdevtools.spec	5 Sep 2007 21:55:24 -0000	1.19.2.5
+++ rpmdevtools.spec	8 Sep 2007 10:51:55 -0000	1.19.2.6
@@ -19,26 +19,37 @@
 Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
 # Minimal RPM build requirements
-Requires:       rpm-build
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
-Requires:       tar
 Requires:       patch
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build
+Requires:       sed
+Requires:       tar
 Requires:       unzip
+Requires:       util-linux
+Requires:       which
+# Additionally required for tool operations
+#Requires:      cpio
+Requires:       file
+Requires:       perl
+Requires:       python
+Requires:       rpm-python
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -136,6 +147,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- 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.
 - Update rpminfo to version 2004-07-07-02.



From fedora-extras-commits at redhat.com  Sat Sep  8 11:27:54 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 07:27:54 -0400
Subject: rpms/libflaim/F-7 .cvsignore,1.1,1.2 sources,1.3,1.4
Message-ID: <200709081127.l88BRs6A028670@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28628/F-7

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:32:57 -0000	1.1
+++ .cvsignore	8 Sep 2007 11:27:22 -0000	1.2
@@ -0,0 +1 @@
+libflaim-4.9.989.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2007 23:36:10 -0000	1.3
+++ sources	8 Sep 2007 11:27:22 -0000	1.4
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 11:49:24 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 07:49:24 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.3,1.4
Message-ID: <200709081149.l88BnOhe029766@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libflaim.spec	8 Sep 2007 00:24:03 -0000	1.3
+++ libflaim.spec	8 Sep 2007 11:48:52 -0000	1.4
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-13
+- bumping again for build system after lockout
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
 - build system issue
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:08:44 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 8 Sep 2007 08:08:44 -0400
Subject: rpms/spandsp/F-7 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 spandsp.spec, 1.14, 1.15
Message-ID: <200709081208.l88C8iMS004120@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/spandsp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.4pre8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Aug 2007 03:07:07 -0000	1.14
+++ .cvsignore	8 Sep 2007 12:08:11 -0000	1.15
@@ -1 +1 @@
-spandsp-0.0.4pre7.tgz
+spandsp-0.0.4pre8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Aug 2007 03:07:07 -0000	1.14
+++ sources	8 Sep 2007 12:08:11 -0000	1.15
@@ -1 +1 @@
-7931fe0452b37e4ca5032254a7b9e400  spandsp-0.0.4pre7.tgz
+73d7843a7c681c37ea9e1eb205c6fe81  spandsp-0.0.4pre8.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/spandsp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- spandsp.spec	26 Aug 2007 03:07:07 -0000	1.14
+++ spandsp.spec	8 Sep 2007 12:08:11 -0000	1.15
@@ -1,9 +1,9 @@
-%define pre 7
+%define pre 8
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.4
-Release: 0.3%{?pre:.pre%{pre}}%{?dist}
+Release: 0.4%{?pre:.pre%{pre}}%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep  7 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.4.pre8
+- Update to 0.0.4pre8
+
 * Sat Aug 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.2.pre7
 - Update to 0.0.4pre7
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:10:47 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 08:10:47 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.4,1.5
Message-ID: <200709081210.l88CAlYQ004244@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libflaim.spec	8 Sep 2007 11:48:52 -0000	1.4
+++ libflaim.spec	8 Sep 2007 12:10:14 -0000	1.5
@@ -9,13 +9,14 @@
 #
 
 Name:		libflaim
+BuildRequires:	util-linux-ng
 BuildRequires:	libstdc++ 
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +74,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-14
+- util-linux-ng for buildsys
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-13
 - bumping again for build system after lockout
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:11:28 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 08:11:28 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.17,1.18
Message-ID: <200709081211.l88CBS9N004344@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4256

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
- Update for agreement with packaging guidelines - add versioned
  emacs requirement



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emacs-vm.spec	30 Aug 2007 20:53:42 -0000	1.17
+++ emacs-vm.spec	8 Sep 2007 12:10:55 -0000	1.18
@@ -8,15 +8,18 @@
 %define devoversion 495
 
 
-%define pkgdir %{_datadir}/emacs/site-lisp/vm
+%define emacs_version %(pkg-config emacs --modversion)
+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%define emacs_startdir %(pkg-coonfig emacs --variable sitestartdir)
+
+%define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define startd %{_datadir}/emacs/site-lisp/site-start.d/
-%define initfile %{startd}/vm-mode-init.el
+%define initfile %{emacs_startdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -25,7 +28,7 @@
 Source1: u-vm-color.el
 Patch0: vm-8.0.3-fix-Makefile.patch
 
-Requires: emacs
+Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +128,10 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
+- Update for agreement with packaging guidelines - add versioned
+  emacs requirement
+
 * Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
 - Fix problem with vm-autoloads.el RH BZ #262361 
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:30:56 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 08:30:56 -0400
Subject: rpms/VLGothic-fonts/F-7 .cvsignore, 1.2, 1.3 VLGothic-fonts.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709081230.l88CUuJM005048@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5007

Modified Files:
	.cvsignore VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2006 00:10:23 -0000	1.2
+++ .cvsignore	8 Sep 2007 12:30:24 -0000	1.3
@@ -1 +1 @@
-VLGothic-20061026.tar.bz2
+VLGothic-20070901.tar.bz2


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 08:34:04 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 12:30:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:34:04 -0000	1.5
+++ sources	8 Sep 2007 12:30:24 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 12:40:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:40:39 -0400
Subject: rpms/gkrellm-hddtemp/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.2, NONE gkrellm-hddtemp.spec, 1.10,
	NONE sources, 1.2, NONE
Message-ID: <200709081240.l88CedlG005619@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5612

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gkrellm-hddtemp.spec sources 
Log Message:
gkrellm can use a server mode hddtemp itself.
https://www.redhat.com/archives/fedora-maintainers/2007-September/msg00075.html



--- NEW FILE dead.package ---
gkrellm can use a server mode hddtemp itself.
https://www.redhat.com/archives/fedora-maintainers/2007-September/msg00075.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gkrellm-hddtemp.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 12:44:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:44:11 -0400
Subject: comps comps-f8.xml.in,1.97,1.98
Message-ID: <200709081244.l88CiBf0005773@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5731

Modified Files:
	comps-f8.xml.in 
Log Message:
+tomcat-native


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- comps-f8.xml.in	8 Sep 2007 03:27:52 -0000	1.97
+++ comps-f8.xml.in	8 Sep 2007 12:43:41 -0000	1.98
@@ -3828,6 +3828,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">tiquit</packagereq>
+      <packagereq type="optional">tomcat-native</packagereq>
       <packagereq type="optional">tomcat5</packagereq>
       <packagereq type="optional">tomcat5-admin-webapps</packagereq>
       <packagereq type="optional">tomcat5-webapps</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:53:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:53:32 -0400
Subject: comps comps-f8.xml.in,1.98,1.99
Message-ID: <200709081253.l88CrW6e006204@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6167

Modified Files:
	comps-f8.xml.in 
Log Message:
+bash-completion


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- comps-f8.xml.in	8 Sep 2007 12:43:41 -0000	1.98
+++ comps-f8.xml.in	8 Sep 2007 12:53:02 -0000	1.99
@@ -3392,6 +3392,7 @@
       <packagereq type="optional">arpwatch</packagereq>
       <packagereq type="optional">audit</packagereq>
       <packagereq type="optional">avahi-tools</packagereq>
+      <packagereq type="optional">bash-completion</packagereq>
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">catfish</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:55:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:55:00 -0400
Subject: comps comps-el5.xml.in,1.8,1.9
Message-ID: <200709081255.l88Ct0uh006265@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222

Modified Files:
	comps-el5.xml.in 
Log Message:
+ccache, cvsps, colordiff, hddtemp, bash-completion, gkrellm, tomcat-native


Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-el5.xml.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps-el5.xml.in	24 Jul 2007 17:49:04 -0000	1.8
+++ comps-el5.xml.in	8 Sep 2007 12:54:30 -0000	1.9
@@ -62,8 +62,11 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">ccache</packagereq>
       <packagereq type="optional">cmake</packagereq>
       <packagereq type="optional">cmucl</packagereq>
+      <packagereq type="optional">cvsps</packagereq>
+      <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
       <packagereq type="optional">git</packagereq>
       <packagereq type="optional">lua</packagereq>
@@ -196,6 +199,7 @@
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>
+      <packagereq type="optional">hddtemp</packagereq>
     </packagelist>
   </group>
   <group>
@@ -303,6 +307,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">bash-completion</packagereq>
       <packagereq type="optional">cfengine</packagereq>
       <packagereq type="optional">chrpath</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
@@ -310,6 +315,7 @@
       <packagereq type="optional">environment-modules</packagereq>
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">ghex</packagereq>
+      <packagereq type="optional">gkrellm</packagereq>
       <packagereq type="optional">isic</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">p7zip</packagereq>
@@ -361,6 +367,7 @@
       <packagereq type="optional">moin</packagereq>
       <packagereq type="optional">plone</packagereq>
       <packagereq type="optional">Pound</packagereq>
+      <packagereq type="optional">tomcat-native</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:25 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxReI023335@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora devel was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:30 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxUHZ030908@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 7 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:35 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxZOL023342@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 1 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:37 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxb8L030914@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 2 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:39 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxdbg023348@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 3 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:42 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxg8A030920@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 4 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:44 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxjVt023354@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 5 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:45 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxkIH030926@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 6 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:48 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxmuO023360@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:05:02 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 8 Sep 2007 09:05:02 -0400
Subject: rpms/libeXosip2/FC-6 .cvsignore, 1.6, 1.7 libeXosip2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200709081305.l88D527R012606@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libeXosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12561

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Nov 2006 19:17:53 -0000	1.6
+++ .cvsignore	8 Sep 2007 13:04:28 -0000	1.7
@@ -1 +1 @@
-libeXosip2-3.0.1.tar.gz
+libeXosip2-3.0.3.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/libeXosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libeXosip2.spec	15 Nov 2006 19:17:53 -0000	1.10
+++ libeXosip2.spec	8 Sep 2007 13:04:28 -0000	1.11
@@ -1,15 +1,15 @@
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 3.0.1
+Version: 3.0.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
 Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
-BuildRequires: libosip2-devel
+BuildRequires: libosip2-devel >= 3.0.3
 BuildRequires: doxygen
 
 %description
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.0.3-1
+- Update to 3.0.3
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2.3-3
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Nov 2006 19:17:53 -0000	1.6
+++ sources	8 Sep 2007 13:04:28 -0000	1.7
@@ -1 +1 @@
-bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz
+84a6e94f1bcfd5d10640cdd4939208a7  libeXosip2-3.0.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:04 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:04 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D94jP031019@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora devel was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:07 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:07 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D98xW023519@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 1 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:09 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9Amf031047@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 2 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:11 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9BDK023525@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 3 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:12 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9DUp031053@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 4 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:14 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:14 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9E1B023532@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 5 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:16 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9GMq031059@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Red Hat Linux 8 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:17 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9HlY023538@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:45 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9joa031066@app4.fedora.phx.redhat.com>

Package cdiff in Fedora devel was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:46 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9lSk023547@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 1 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:48 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9mOs031073@app4.fedora.phx.redhat.com>

Package cdiff in Fedora 2 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:49 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9nwR023554@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 3 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:51 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9p5I031079@app4.fedora.phx.redhat.com>

Package cdiff in Fedora 4 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:54 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9sGq023560@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 5 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:55 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9t9p031085@app4.fedora.phx.redhat.com>

Package cdiff in Red Hat Linux 8 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:56 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:56 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9uSo023567@app3.fedora.phx.redhat.com>

Package cdiff in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:42 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAg8s031093@app4.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora devel was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:44 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAi5O023582@app3.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora 4 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:45 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAk99031099@app4.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora 5 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 14:16:21 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:16:21 -0400
Subject: rpms/VLGothic-fonts/devel VLGothic-fonts.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709081416.l88EGLVQ021622@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21580

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 09:08:50 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 14:15:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 09:08:50 -0000	1.5
+++ sources	8 Sep 2007 14:15:48 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:24:51 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:24:51 -0400
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec, 1.7, 1.8 sources, 1.5,
	1.6
Message-ID: <200709081424.l88EOp4e022089@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22018

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VLGothic-fonts.spec	2 Jun 2007 08:28:52 -0000	1.7
+++ VLGothic-fonts.spec	8 Sep 2007 14:24:18 -0000	1.8
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:28:52 -0000	1.5
+++ sources	8 Sep 2007 14:24:18 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:28:24 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 10:28:24 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.18,1.19
Message-ID: <200709081428.l88ESOMP022320@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22287

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
- Update for agreement with packaging guidelines - add versioned
  emacs requirement



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emacs-vm.spec	8 Sep 2007 12:10:55 -0000	1.18
+++ emacs-vm.spec	8 Sep 2007 14:27:52 -0000	1.19
@@ -12,6 +12,8 @@
 %define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %define emacs_startdir %(pkg-coonfig emacs --variable sitestartdir)
 
+%{!?emacs_version %define emacs_version 21.4}
+
 %define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
 %define initfile %{emacs_startdir}/vm-mode-init.el



From fedora-extras-commits at redhat.com  Sat Sep  8 14:32:41 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:32:41 -0400
Subject: rpms/VLGothic-fonts/FC-5 VLGothic-fonts.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709081432.l88EWfVe022496@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22462

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-5/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 08:25:42 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 14:32:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:25:42 -0000	1.5
+++ sources	8 Sep 2007 14:32:08 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:49:21 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Sat, 8 Sep 2007 10:49:21 -0400
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.6,1.7
Message-ID: <200709081449.l88EnLh9024328@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24202/devel

Modified Files:
	ruby-gnome2.spec 
Log Message:

- Rebuild against new poppler
- Changed license to LGPLv2+



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ruby-gnome2.spec	9 Aug 2007 16:46:53 -0000	1.6
+++ ruby-gnome2.spec	8 Sep 2007 14:48:48 -0000	1.7
@@ -3,12 +3,12 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
-License:        LGPL
+License:        LGPLv2+
 URL:            http://ruby-gnome2.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-script.patch
@@ -621,6 +621,11 @@
 
 
 %changelog
+
+* Sat Sep  8 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-11
+- Rebuild against new poppler
+- Changed license to LGPLv2+
+
 * Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.16.0-10
 - Adjust to GLib 2.14 API + typo fix in glib module
 



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:34 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88ExZFv031616@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:34 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88ExaOW031625@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:37 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:37 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081459.l88Exccs024443@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:49 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:49 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88Exnqt024452@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:52 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:52 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88ExqIY031634@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:53 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:53 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081459.l88ExscC031644@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:58 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:58 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88ExwUc024461@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:59 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88Exxkq024471@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:01 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:01 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081500.l88F01Qr031653@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:08 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:08 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081500.l88F08WG024497@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:09 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:09 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081500.l88F0AUg024506@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:11 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:11 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081500.l88F0BIG024516@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:31:35 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:31:35 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.8,1.9
Message-ID: <200709081531.l88FVZKQ032473@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Update scriptlet that creates zeroinst user


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zeroinstall-injector.spec	6 Sep 2007 00:55:09 -0000	1.8
+++ zeroinstall-injector.spec	8 Sep 2007 15:31:03 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -16,8 +16,8 @@
 
 BuildArch: noarch
 BuildRequires: python-devel gnupg desktop-file-utils
-Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
-Requires: /usr/sbin/useradd
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires(pre): shadow-utils
 
 %description
 The Zero Install Injector makes it easy for users to install software without
@@ -64,8 +64,11 @@
 # Add the "zeroinst" user.
 # This is not used by default, but is required if you want to
 # set up sharing of downloads later.
-/usr/sbin/useradd -c 'Zero Install shared cache' \
-    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +91,9 @@
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
 - Update to 0.30
 - License is now versioned



From fedora-extras-commits at redhat.com  Sat Sep  8 15:31:38 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:31:38 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.8,1.9
Message-ID: <200709081531.l88FVcdY032478@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Update scriptlet that creates zeroinst user


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zeroinstall-injector.spec	6 Sep 2007 00:55:11 -0000	1.8
+++ zeroinstall-injector.spec	8 Sep 2007 15:31:06 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -16,8 +16,8 @@
 
 BuildArch: noarch
 BuildRequires: python-devel gnupg desktop-file-utils
-Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
-Requires: /usr/sbin/useradd
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires(pre): shadow-utils
 
 %description
 The Zero Install Injector makes it easy for users to install software without
@@ -64,8 +64,11 @@
 # Add the "zeroinst" user.
 # This is not used by default, but is required if you want to
 # set up sharing of downloads later.
-/usr/sbin/useradd -c 'Zero Install shared cache' \
-    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +91,9 @@
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
 - Update to 0.30
 - License is now versioned



From fedora-extras-commits at redhat.com  Sat Sep  8 15:39:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 8 Sep 2007 11:39:59 -0400
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.33,1.34
Message-ID: <200709081539.l88FdxeL000452@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv405

Modified Files:
	plt-scheme.spec 
Log Message:
restructured spec


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plt-scheme.spec	27 Aug 2007 22:21:26 -0000	1.33
+++ plt-scheme.spec	8 Sep 2007 15:39:27 -0000	1.34
@@ -1,10 +1,10 @@
 Name:           plt-scheme
 Version:        371
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.drscheme.org
 Source:		http://download.plt-scheme.org/bundles/371/plt/plt-371-src-unix.tgz
 Source1:	drscheme.png
@@ -68,40 +68,21 @@
 
 %build
 cd src
-CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS ./configure --enable-gl --enable-xrender --enable-xft
+CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS %configure --enable-gl --enable-xrender --enable-xft
 make # %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
-pushd src
-make install
-popd
-
-cp -fr bin collects doc include lib $RPM_BUILD_ROOT%{_libdir}/plt
-
-# clean up
-find $RPM_BUILD_ROOT%{_libdir}/plt -type d -exec chmod 0755 '{}' ';'
-rm -rf $RPM_BUILD_ROOT%{_libdir}/plt/collects/plot/src
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-pushd $RPM_BUILD_ROOT%{_bindir}
-  for i in ../%{_lib}/plt/bin/*
-  do
-    ln -sf $i .
-  done
-  # binary planet conflicts with other packages
-  rm -f planet
-  ln -sf ../%{_lib}/plt/bin/planet plt-planet
-popd
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cd src
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+
+mv $RPM_BUILD_ROOT%{_bindir}/planet $RPM_BUILD_ROOT%{_bindir}/plt-planet 
 
 cat > drscheme.desktop <<EOF
 [Desktop Entry]
@@ -133,12 +114,18 @@
 %doc readme.txt
 %{_bindir}/*
 %{_libdir}/plt
+%{_libdir}/*.a
 %{_mandir}/man*/*
+%{_datadir}/plt
+%{_includedir}/plt
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 
 %changelog
+* Tue Sep  4 2007 Gerard Milmeister <gemi at bluewin.ch> - 371-2
+- restructuring spec file
+
 * Mon Aug 20 2007 Gerard Milmeister <gemi at bluewin.ch> - 371-1
 - update to new release 371
 



From fedora-extras-commits at redhat.com  Sat Sep  8 15:43:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 8 Sep 2007 11:43:34 -0400
Subject: rpms/glob2/F-7 glob2-desktopfileinstall.patch, NONE,
	1.1 glob2-texts.pl.patch, NONE, 1.1 glob2.desktop, NONE,
	1.1 .cvsignore, 1.2, 1.3 glob2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709081543.l88FhYwF000638@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv605

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-desktopfileinstall.patch glob2-texts.pl.patch 
	glob2.desktop 
Log Message:
update to 0.9.1

glob2-desktopfileinstall.patch:

--- NEW FILE glob2-desktopfileinstall.patch ---
--- data/SConscript.orig	2007-09-02 05:14:54.000000000 +0200
+++ data/SConscript	2007-09-04 18:41:04.000000000 +0200
@@ -10,9 +10,9 @@
             env.Install(env["INSTALLDIR"] + "/glob2/data", file)
         
     
-    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
+#    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
     env.Alias("install", env["INSTALLDIR"]+"/glob2/data")
-    env.Alias("install", env["INSTALLDIR"]+"/applications")
+#    env.Alias("install", env["INSTALLDIR"]+"/applications")
     PackTar(env["TARFILE"], "SConscript")
     
 SConscript("fonts/SConscript")

glob2-texts.pl.patch:

--- NEW FILE glob2-texts.pl.patch ---
--- data/texts.pl.txt.orig	2007-09-02 05:14:55.000000000 +0200
+++ data/texts.pl.txt	2007-09-04 19:32:26.000000000 +0200
@@ -245,7 +245,7 @@
 [Damaged Map]
 
 [dblbuff]
-Podw????jne buforowanie
+Podw??jne buforowanie
 [decrease units working]
 
 [default terrain]
@@ -373,7 +373,7 @@
 [fruit]
 
 [fullscreen]
-Pe????ny ekran
+Pe??ny ekran
 [game full]
 Komplet graczy
 [game shortcuts]
@@ -691,7 +691,7 @@
 [sand]
 Piasek
 [save before quit?]
-Czy chcesz zapisa???? stan gry, przed jej zako????czeniem ?
+Czy chcesz zapisa?? stan gry, przed jej zako??czeniem ?
 [save game]
 Zapisz gr??
 [save map]
@@ -1077,7 +1077,7 @@
 [YESTS_CONNECTION_REFUSED_PROTOCOL_TOO_OLD]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? Twoja wersja Globulation 2 jest zbyt stara, by m??g?? si?? z ni?? komunikowa??.
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odm????wi???? po????????czenia bez dalszego wyja????nienia.
+Metaserwer YOG odm??wi?? po????czenia bez dalszego wyja??nienia.
 [YESTS_CONNECTION_REFUSED_USERNAME_ALLREADY_USED]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? tw??j login jest ju?? zaj??ty przez kogo?? innego.
 [YESTS_CREATED]
@@ -1099,7 +1099,7 @@
 [YOG_HELP_MSG]
 Komenda "/msg <nazwa> <wiadomo????>" pozwala Ci przes??a?? wiadomo???? do jednej osoby. Np. "/msg Daemon42 Twoje t??umaczenie ssie...". W skr??cie "/m"
 [You are no more marked as away]
-Nie jeste???? ju???? oznaczony jako nieaktywny.
+Nie jeste?? ju?? oznaczony jako nieaktywny.
 [You are now marked as away]
 Jeste?? oznaczony jako nieaktywny.
 [you have lost]


--- NEW FILE glob2.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
Icon=glob2.png
Terminal=false
Type=Application
Categories=Game;StrategyGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 May 2007 13:28:20 -0000	1.2
+++ .cvsignore	8 Sep 2007 15:43:01 -0000	1.3
@@ -1 +1 @@
-glob2-0.8.21.tar.gz
+glob2-0.9.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/glob2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glob2.spec	19 Aug 2007 22:18:19 -0000	1.3
+++ glob2.spec	8 Sep 2007 15:43:01 -0000	1.4
@@ -1,21 +1,21 @@
 Name:           glob2
-Version:        0.8.21
-Release:        3%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-0.8.21-texts.pl.patch
-#patch1 fixes CXXFLAGS
-Patch1:         glob2-0.8.21-configure.diff
+Patch0:         glob2-texts.pl.patch
+Patch1:         glob2-desktopfileinstall.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel,SDL-devel
+BuildRequires:  libvorbis-devel,scons
+BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
 %description
@@ -33,45 +33,42 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
-chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}
+chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 
-sed -i 's/MultipleArgs\=false/Encoding\=UTF\-8/' data/%{name}.desktop
-sed -i 's|Icon=glob2-icon-48x48.png|Icon=glob2.png|' data/%{name}.desktop
-touch -c -r aclocal.m4 configure configure.in
-sed -i 's|INSTALL_DATA = @INSTALL_DATA@|INSTALL_DATA = @INSTALL_DATA@ -p|' data/{gfx,gfx/cursor,fonts,gui,icons,zik}/Makefile.in
 
 %build
-%configure --disable-dependency-tracking
-make %{?_smp_mflags}
+scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
+mv $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --delete-original                               \
-        --remove-category Application                   \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        %{SOURCE3}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +84,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
+- update to 0.9.1
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3
 - License tag update
 * Tue May 22 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 13:28:20 -0000	1.2
+++ sources	8 Sep 2007 15:43:01 -0000	1.3
@@ -1 +1 @@
-3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz
+172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 15:51:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 8 Sep 2007 11:51:58 -0400
Subject: rpms/glob2/devel glob2-desktopfileinstall.patch, NONE,
	1.1 glob2-texts.pl.patch, NONE, 1.1 glob2.desktop, NONE,
	1.1 .cvsignore, 1.2, 1.3 glob2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709081551.l88FpwgO001349@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1295

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-desktopfileinstall.patch glob2-texts.pl.patch 
	glob2.desktop 
Log Message:
update to 0.9.1

glob2-desktopfileinstall.patch:

--- NEW FILE glob2-desktopfileinstall.patch ---
--- data/SConscript.orig	2007-09-02 05:14:54.000000000 +0200
+++ data/SConscript	2007-09-04 18:41:04.000000000 +0200
@@ -10,9 +10,9 @@
             env.Install(env["INSTALLDIR"] + "/glob2/data", file)
         
     
-    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
+#    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
     env.Alias("install", env["INSTALLDIR"]+"/glob2/data")
-    env.Alias("install", env["INSTALLDIR"]+"/applications")
+#    env.Alias("install", env["INSTALLDIR"]+"/applications")
     PackTar(env["TARFILE"], "SConscript")
     
 SConscript("fonts/SConscript")

glob2-texts.pl.patch:

--- NEW FILE glob2-texts.pl.patch ---
--- data/texts.pl.txt.orig	2007-09-02 05:14:55.000000000 +0200
+++ data/texts.pl.txt	2007-09-04 19:32:26.000000000 +0200
@@ -245,7 +245,7 @@
 [Damaged Map]
 
 [dblbuff]
-Podw????jne buforowanie
+Podw??jne buforowanie
 [decrease units working]
 
 [default terrain]
@@ -373,7 +373,7 @@
 [fruit]
 
 [fullscreen]
-Pe????ny ekran
+Pe??ny ekran
 [game full]
 Komplet graczy
 [game shortcuts]
@@ -691,7 +691,7 @@
 [sand]
 Piasek
 [save before quit?]
-Czy chcesz zapisa???? stan gry, przed jej zako????czeniem ?
+Czy chcesz zapisa?? stan gry, przed jej zako??czeniem ?
 [save game]
 Zapisz gr??
 [save map]
@@ -1077,7 +1077,7 @@
 [YESTS_CONNECTION_REFUSED_PROTOCOL_TOO_OLD]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? Twoja wersja Globulation 2 jest zbyt stara, by m??g?? si?? z ni?? komunikowa??.
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odm????wi???? po????????czenia bez dalszego wyja????nienia.
+Metaserwer YOG odm??wi?? po????czenia bez dalszego wyja??nienia.
 [YESTS_CONNECTION_REFUSED_USERNAME_ALLREADY_USED]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? tw??j login jest ju?? zaj??ty przez kogo?? innego.
 [YESTS_CREATED]
@@ -1099,7 +1099,7 @@
 [YOG_HELP_MSG]
 Komenda "/msg <nazwa> <wiadomo????>" pozwala Ci przes??a?? wiadomo???? do jednej osoby. Np. "/msg Daemon42 Twoje t??umaczenie ssie...". W skr??cie "/m"
 [You are no more marked as away]
-Nie jeste???? ju???? oznaczony jako nieaktywny.
+Nie jeste?? ju?? oznaczony jako nieaktywny.
 [You are now marked as away]
 Jeste?? oznaczony jako nieaktywny.
 [you have lost]


--- NEW FILE glob2.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
Icon=glob2.png
Terminal=false
Type=Application
Categories=Game;StrategyGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 May 2007 13:23:01 -0000	1.2
+++ .cvsignore	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-glob2-0.8.21.tar.gz
+glob2-0.9.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glob2.spec	25 Aug 2007 14:42:14 -0000	1.3
+++ glob2.spec	8 Sep 2007 15:51:25 -0000	1.4
@@ -1,21 +1,21 @@
 Name:           glob2
-Version:        0.8.21
-Release:        4%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-0.8.21-texts.pl.patch
-#patch1 fixes CXXFLAGS
-Patch1:         glob2-0.8.21-configure.diff
+Patch0:         glob2-texts.pl.patch
+Patch1:         glob2-desktopfileinstall.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel,SDL-devel
+BuildRequires:  libvorbis-devel,scons
+BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
 %description
@@ -33,45 +33,42 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
-chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}
+chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 
-sed -i 's/MultipleArgs\=false/Encoding\=UTF\-8/' data/%{name}.desktop
-sed -i 's|Icon=glob2-icon-48x48.png|Icon=glob2.png|' data/%{name}.desktop
-touch -c -r aclocal.m4 configure configure.in
-sed -i 's|INSTALL_DATA = @INSTALL_DATA@|INSTALL_DATA = @INSTALL_DATA@ -p|' data/{gfx,gfx/cursor,fonts,gui,icons,zik}/Makefile.in
 
 %build
-%configure --disable-dependency-tracking
-make %{?_smp_mflags}
+scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
+mv $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --delete-original                               \
-        --remove-category Application                   \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        %{SOURCE3}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +84,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
+- update to 0.9.1
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-4
 - BuildID rebuild
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 13:23:01 -0000	1.2
+++ sources	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz
+172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 15:53:35 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:53:35 -0400
Subject: rpms/vala/devel vala.spec,1.8,1.9
Message-ID: <200709081553.l88FrZRZ001448@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1427/devel

Modified Files:
	vala.spec 
Log Message:
License updates, and splitting of -vapigen subpackage for functionality and license reasons (it contains GPLv2 files)


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vala.spec	5 Sep 2007 22:03:10 -0000	1.8
+++ vala.spec	8 Sep 2007 15:53:02 -0000	1.9
@@ -1,10 +1,11 @@
 Name:           vala
 Version:        0.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPLv2.1
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2.1+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,18 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2.1+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
@@ -75,14 +88,22 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
-%{_bindir}/*gen
 %{_libdir}/libvala.so
-%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/%gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
 - Licensing and URL updates
 



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:15 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuFvT031987@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:15 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuGHL024965@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchcommits acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:17 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:17 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuIjO031993@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the commit acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:20 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:20 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuKKc031999@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the approveacls acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

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



From fedora-extras-commits at redhat.com  Sat Sep  8 16:24:35 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:24:35 -0400
Subject: rpms/audio-convert-mod/devel acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081624.l88GOZbV009722@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9602

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help



acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:35:16 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:02 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:24:47 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:24:47 -0400
Subject: rpms/audio-convert-mod/FC-6 acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081624.l88GOlJ2009767@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help



acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:42:03 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:15 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:25:01 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:25:01 -0400
Subject: rpms/audio-convert-mod/F-7 acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081625.l88GP1Vl009820@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help


acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:38:14 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:28 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:26:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat,  8 Sep 2007 12:26:41 -0400
Subject: fedora-accounts passwd-template-cvschroot,1.1,1.2
Message-ID: <200709081626.l88GQfH6009985@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9965

Modified Files:
	passwd-template-cvschroot 
Log Message:
Added transifex users


Index: passwd-template-cvschroot
===================================================================
RCS file: /cvs/fedora/fedora-accounts/passwd-template-cvschroot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- passwd-template-cvschroot	25 Mar 2005 00:38:55 -0000	1.1
+++ passwd-template-cvschroot	8 Sep 2007 16:26:39 -0000	1.2
@@ -3,3 +3,7 @@
 daemon:x:2:2:daemon:/sbin:/sbin/nologin
 nobody:x:99:99:Nobody:/:/sbin/nologin
 sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin
+transifexcvs:x:401:401:Transifex CVS User:/home/transifexcvs:/bin/sh
+transifexgit:x:402:402:Transifex CVS User:/home/transifexgit:/bin/sh
+transifexhg:x:403:403:Transifex CVS User:/home/transifexhg:/bin/sh
+transifexsvn:x:404:404:Transifex CVS User:/home/transifexsvn:/bin/sh



From fedora-extras-commits at redhat.com  Sat Sep  8 17:05:43 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 13:05:43 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.5,1.6
Message-ID: <200709081705.l88H5hZY019190@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19135

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libflaim.spec	8 Sep 2007 12:10:14 -0000	1.5
+++ libflaim.spec	8 Sep 2007 17:05:10 -0000	1.6
@@ -9,14 +9,13 @@
 #
 
 Name:		libflaim
-BuildRequires:	util-linux-ng
 BuildRequires:	libstdc++ 
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -74,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-15
+- change for 64 bit build
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-14
 - util-linux-ng for buildsys
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:13:25 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:13:25 -0400
Subject: rpms/vala/devel vala.spec,1.9,1.10
Message-ID: <200709081713.l88HDPfr019495@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465/devel

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vala.spec	8 Sep 2007 15:53:02 -0000	1.9
+++ vala.spec	8 Sep 2007 17:12:52 -0000	1.10
@@ -5,7 +5,7 @@
 
 Group:          Development/Languages
 # Most files are LGPLv2.1+, curses.vala is 2-clause BSD
-License:        LGPLv2.1+ and BSD
+License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Summary:        Bindings generators for %{name}
 Group:          Development/Languages
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
-License:        LGPLv2.1+ and GPLv2
+License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl-XML-LibXML
 
@@ -93,7 +93,7 @@
 
 %files vapigen
 %defattr(-,root,root,-)
-%{_bindir}/%gen
+%{_bindir}/*gen
 %{_libdir}/vala
 
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:21:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:21:11 -0400
Subject: upgradecheck upgradecheck.py,1.37,1.38 upgradecheckspam.py,1.4,1.5
Message-ID: <200709081721.l88HLBe6019776@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19754

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Whitelist kde*-extras from FE6->F7, https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- upgradecheck.py	6 Sep 2007 21:28:15 -0000	1.37
+++ upgradecheck.py	8 Sep 2007 17:21:09 -0000	1.38
@@ -50,12 +50,11 @@
 # (not really doable as long as we operate on SRPMS): per-package tuples of
 # known good paths
 known_good = {
-#    'koffice': (('FL3-updates', 'FE4'),
-#                ('FL3-updates', 'FE5'),
-#                ('FL3-updates', 'FE6'),
-#                ('FL3-updates', 'FE7'),
-#                ),
-    }
+    # kde*-extras: https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html
+    'kdeartwork-extras':    (('FE6', 'F7'),),
+    'kdegraphics-extras':   (('FE6', 'F7'),),
+    'kdemultimedia-extras': (('FE6', 'F7'),),
+}
 
 # Where to checkout owners/owners.list
 ownersworkdir = '/srv/extras-push/work'


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upgradecheckspam.py	3 Sep 2007 17:56:43 -0000	1.4
+++ upgradecheckspam.py	8 Sep 2007 17:21:09 -0000	1.5
@@ -50,12 +50,11 @@
 # (not really doable as long as we operate on SRPMS): per-package tuples of
 # known good paths
 known_good = {
-#    'koffice': (('FL3-updates', 'FE4'),
-#                ('FL3-updates', 'FE5'),
-#                ('FL3-updates', 'FE6'),
-#                ('FL3-updates', 'FE7'),
-#                ),
-    }
+    # kde*-extras: https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html
+    'kdeartwork-extras':    (('FE6', 'F7'),),
+    'kdegraphics-extras':   (('FE6', 'F7'),),
+    'kdemultimedia-extras': (('FE6', 'F7'),),
+}
 
 # Where to checkout owners/owners.list
 ownersworkdir = '/srv/extras-push/work'



From fedora-extras-commits at redhat.com  Sat Sep  8 17:23:20 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sat, 8 Sep 2007 13:23:20 -0400
Subject: rpms/mach/devel .cvsignore, 1.5, 1.6 mach.spec, 1.13, 1.14 sources, 
	1.6, 1.7
Message-ID: <200709081723.l88HNKSW019937@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19873

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2007 21:47:36 -0000	1.5
+++ .cvsignore	8 Sep 2007 17:22:47 -0000	1.6
@@ -1 +1 @@
-mach-0.9.1.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mach.spec	16 Aug 2007 09:19:13 -0000	1.13
+++ mach.spec	8 Sep 2007 17:22:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mach
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -102,6 +102,10 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
 - License: GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:47:36 -0000	1.6
+++ sources	8 Sep 2007 17:22:47 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 17:23:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:23:44 -0400
Subject: upgradecheck upgradecheck-fedora.conf, NONE,
	1.1 upgradecheck-extras.conf, 1.5, NONE
Message-ID: <200709081723.l88HNiRV019997@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19980

Added Files:
	upgradecheck-fedora.conf 
Removed Files:
	upgradecheck-extras.conf 
Log Message:
core+extras -> fedora, remove separate extras config


--- NEW FILE upgradecheck-fedora.conf ---
[main]
metadata_expire=0
keepcache=0
reposdir=

[FC4]
name=FC4
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/i386/os/

[FC5]
name=FC5
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/source/SRPMS/

[FC6]
name=FC6
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS/

[F7]
name=F7
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/7/Everything/source/SRPMS/

[F8]
name=F8
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/

[FC4-updates]
name=FC4-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/SRPMS/

[FC5-updates]
name=FC5-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/SRPMS/

[FC6-updates]
name=FC6-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS/

[F7-updates]
name=F7-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/7/SRPMS/

[F7-updates-testing]
name=F7-updates-testing
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/7/SRPMS/

[FE4]
name=FE4
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/4/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/4/SRPMS/

[FE5]
name=FE5
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/5/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/5/SRPMS/

[FE6]
name=FE6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/


--- upgradecheck-extras.conf DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 17:25:47 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:25:47 -0400
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.60,1.61
Message-ID: <200709081725.l88HPlKf020107@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pushscript

Modified Files:
	Config_Extras.py 
Log Message:
core+extras -> fedora


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Config_Extras.py	28 Aug 2007 11:37:21 -0000	1.60
+++ Config_Extras.py	8 Sep 2007 17:25:45 -0000	1.61
@@ -149,7 +149,7 @@
 #repoview = '/usr/bin/repoview'
 repoview = '/srv/extras-push/work/repoview -q'
 
-#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
+#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-fedora.conf'),
 #             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py --mail=owners --mail=summary &'
 #             ]
 post_cmds = []



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:23 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:27:23 -0400
Subject: rpms/vala/F-7 vala.spec,1.5,1.6
Message-ID: <200709081727.l88HRNKt020237@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/F-7

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vala.spec	5 Sep 2007 22:03:06 -0000	1.5
+++ vala.spec	8 Sep 2007 17:26:50 -0000	1.6
@@ -1,10 +1,11 @@
 Name:           vala
 Version:        0.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPLv2.1
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,18 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
@@ -75,14 +88,22 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
-%{_bindir}/*gen
 %{_libdir}/libvala.so
-%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/*gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
 - Licensing and URL updates
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:26 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:27:26 -0400
Subject: rpms/vala/FC-6 vala.spec,1.3,1.4
Message-ID: <200709081727.l88HRQn5020240@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/FC-6

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/FC-6/vala.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vala.spec	25 Mar 2007 16:01:59 -0000	1.3
+++ vala.spec	8 Sep 2007 17:26:53 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           vala
-Version:        0.0.8
-Release:        1%{?dist}
+Version:        0.1.3
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2+ and BSD
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -38,13 +39,25 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -70,6 +83,7 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -77,9 +91,28 @@
 %{_libdir}/libvala.so
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/*gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:27:33 -0400
Subject: upgradecheck upgradecheck-core+extras.conf,1.9,NONE
Message-ID: <200709081727.l88HRXrx020266@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20250

Removed Files:
	upgradecheck-core+extras.conf 
Log Message:
Oops, previous commit was supposed to remove this too


--- upgradecheck-core+extras.conf DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 17:39:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:39:17 -0400
Subject: upgradecheck upgradecheck-epel.conf,NONE,1.1
Message-ID: <200709081739.l88HdHgJ020686@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669

Added Files:
	upgradecheck-epel.conf 
Log Message:
Add EPEL config


--- NEW FILE upgradecheck-epel.conf ---
[main]
metadata_expire=0
keepcache=0
reposdir=

[EL4]
name=EL4
baseurl=http://mirror.centos.org/centos/4/os/SRPMS/

[EL5]
name=EL5
baseurl=http://mirror.centos.org/centos/5/os/SRPMS/

[EL4-updates]
name=EL4-updates
baseurl=http://mirror.centos.org/centos/4/updates/SRPMS/

[EL5-updates]
name=EL5-updates
baseurl=http://mirror.centos.org/centos/5/updates/SRPMS/

[EPEL4]
name=EPEL4
#baseurl=http://download.fedora.redhat.com/pub/epel/4/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/4/SRPMS/

[EPEL5]
name=EPEL5
#baseurl=http://download.fedora.redhat.com/pub/epel/5/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/5/SRPMS/

[EPEL4-testing]
name=EPEL4-testing
#baseurl=http://download.fedora.redhat.com/pub/epel/testing/4/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/testing/4/SRPMS/

[EPEL5-testing]
name=EPEL5-testing
#baseurl=http://download.fedora.redhat.com/pub/epel/testing/5/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/testing/5/SRPMS/



From fedora-extras-commits at redhat.com  Sat Sep  8 17:40:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:40:20 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.9,1.10
Message-ID: <200709081740.l88HeKp2020731@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20713

Modified Files:
	Config_EPEL.py 
Log Message:
Point to EPEL upgradecheck configs (still commented out)


Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Config_EPEL.py	6 Sep 2007 06:41:56 -0000	1.9
+++ Config_EPEL.py	8 Sep 2007 17:40:17 -0000	1.10
@@ -132,7 +132,7 @@
 repoview = '/srv/extras-push/work/repoview -q'
 
 post_cmds = []
-#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
+#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-epel.conf'),
 #             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py --mail=owners --mail=summary &'
 #             ]
 



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:47 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:47 -0400
Subject: rpms/cksfv/F-7 .cvsignore, 1.6, 1.7 cksfv.spec, 1.16, 1.17 sources, 
	1.6, 1.7
Message-ID: <200709081807.l88I7lcq027850@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/F-7

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:01 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:14 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/cksfv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cksfv.spec	14 Jul 2007 02:26:01 -0000	1.16
+++ cksfv.spec	8 Sep 2007 18:07:14 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           cksfv
-Version:        1.3.11
+Version:        1.3.12
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -43,6 +43,12 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
+- Rebuild for selinux ppc32 issue.
+
 * Fri Jul 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.11-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:02 -0000	1.6
+++ sources	8 Sep 2007 18:07:14 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:50 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:50 -0400
Subject: rpms/cksfv/FC-6 .cvsignore, 1.6, 1.7 cksfv.spec, 1.16, 1.17 sources,
	1.6, 1.7
Message-ID: <200709081807.l88I7ovM027861@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/FC-6

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:04 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:17 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/cksfv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cksfv.spec	14 Jul 2007 02:26:04 -0000	1.16
+++ cksfv.spec	8 Sep 2007 18:07:17 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           cksfv
-Version:        1.3.11
+Version:        1.3.12
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -43,6 +43,12 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
+- Rebuild for selinux ppc32 issue.
+
 * Fri Jul 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.11-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:04 -0000	1.6
+++ sources	8 Sep 2007 18:07:17 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:53 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:53 -0400
Subject: rpms/cksfv/devel .cvsignore, 1.6, 1.7 cksfv.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200709081807.l88I7rYg027871@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/devel

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:07 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:20 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cksfv.spec	28 Aug 2007 17:32:51 -0000	1.17
+++ cksfv.spec	8 Sep 2007 18:07:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           cksfv
-Version:        1.3.11
-Release:        2%{?dist}
+Version:        1.3.12
+Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
 Group:          Applications/File
@@ -43,6 +43,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:07 -0000	1.6
+++ sources	8 Sep 2007 18:07:20 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:12:47 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 8 Sep 2007 14:12:47 -0400
Subject: rpms/liferea/devel .cvsignore, 1.61, 1.62 liferea.spec, 1.90,
	1.91 sources, 1.62, 1.63
Message-ID: <200709081812.l88ICl8i028108@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
- Update to 1.2.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	21 Aug 2007 17:12:01 -0000	1.61
+++ .cvsignore	8 Sep 2007 18:12:14 -0000	1.62
@@ -1 +1 @@
-liferea-1.2.22.tar.gz
+liferea-1.2.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- liferea.spec	21 Aug 2007 17:12:01 -0000	1.90
+++ liferea.spec	8 Sep 2007 18:12:14 -0000	1.91
@@ -1,7 +1,7 @@
 %define gecko_ver 1.8.1.6
 
 Name:           liferea
-Version:        1.2.22
+Version:        1.2.23
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
+- Update to 1.2.23.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.22-1
 - Update to 1.2.22.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	21 Aug 2007 17:12:01 -0000	1.62
+++ sources	8 Sep 2007 18:12:14 -0000	1.63
@@ -1 +1 @@
-e76a449651e0b019101207f2f6b0c8be  liferea-1.2.22.tar.gz
+2d910c60f063a7d274d69815ca55d002  liferea-1.2.23.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:43:52 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 8 Sep 2007 14:43:52 -0400
Subject: rpms/liferea/F-7 .cvsignore, 1.55, 1.56 liferea.spec, 1.83,
	1.84 sources, 1.56, 1.57
Message-ID: <200709081843.l88IhqS6002602@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/liferea/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2439

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
- Update to 1.2.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	3 Jul 2007 15:15:43 -0000	1.55
+++ .cvsignore	8 Sep 2007 18:43:20 -0000	1.56
@@ -1 +1 @@
-liferea-1.2.19.tar.gz
+liferea-1.2.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/liferea.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- liferea.spec	5 Aug 2007 21:16:23 -0000	1.83
+++ liferea.spec	8 Sep 2007 18:43:20 -0000	1.84
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.5
 
 Name:           liferea
-Version:        1.2.19
-Release:        4%{?dist}
+Version:        1.2.23
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
+- Update to 1.2.23.
+
 * Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.19-4
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	3 Jul 2007 15:15:43 -0000	1.56
+++ sources	8 Sep 2007 18:43:20 -0000	1.57
@@ -1 +1 @@
-c1045a6e2c8a6192beb9d72b3e435645  liferea-1.2.19.tar.gz
+2d910c60f063a7d274d69815ca55d002  liferea-1.2.23.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:20 -0400
Subject: rpms/perl-MP3-Info/F-7 .cvsignore, 1.3, 1.4 perl-MP3-Info.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiKIg002753@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/F-7

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:43 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:47 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Jan 2007 02:37:15 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:47 -0000	1.6
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
-Release:        1%{?dist}.1
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,9 +49,11 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
-* Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1.fc7.1
-- Retag release bump
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
 
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:43 -0000	1.3
+++ sources	8 Sep 2007 18:43:47 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:22 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:22 -0400
Subject: rpms/perl-MP3-Info/FC-6 .cvsignore, 1.3, 1.4 perl-MP3-Info.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiMck002769@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/FC-6

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:38 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:50 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MP3-Info.spec	8 Jan 2007 02:09:38 -0000	1.4
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:50 -0000	1.5
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
+Version:        1.22
 Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,7 +49,12 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
+
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:38 -0000	1.3
+++ sources	8 Sep 2007 18:43:50 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:25 -0400
Subject: rpms/perl-MP3-Info/devel .cvsignore, 1.3, 1.4 perl-MP3-Info.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiPIf002785@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/devel

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:43 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:53 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Jan 2007 02:37:15 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:53 -0000	1.6
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
-Release:        1%{?dist}.1
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,9 +49,11 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
-* Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1.fc7.1
-- Retag release bump
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
 
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:43 -0000	1.3
+++ sources	8 Sep 2007 18:43:53 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:12 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:12 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081857.l88IvCVt005664@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:43:47 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:14 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.5,1.6
Message-ID: <200709081857.l88IvEhZ005679@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Sep 2007 18:43:50 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:17 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081857.l88IvHWY005694@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:43:53 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:38 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:38 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.7,1.8
Message-ID: <200709081903.l88J3c4a012814@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 18:56:39 -0000	1.7
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:42 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:42 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081903.l88J3gxD012831@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:56:42 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:46 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:46 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.7,1.8
Message-ID: <200709081903.l88J3kZJ012834@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 18:56:45 -0000	1.7
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:04:09 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:04:09 -0400
Subject: rpms/blam/F-7 blam.spec,1.11,1.12
Message-ID: <200709081904.l88J495r012874@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12808

Modified Files:
	blam.spec 
Log Message:
Sync with devel branch: Add gnome-sharp runtime dependency (fixes bug 253200); and update License tag for new guidelines.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-7/blam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blam.spec	18 Jul 2007 09:05:51 -0000	1.11
+++ blam.spec	8 Sep 2007 19:03:36 -0000	1.12
@@ -5,11 +5,11 @@
 
 Name:		blam
 Version:	1.8.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.cmartin.tk/blam.html
 
 Source0:	http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@
 Requires:	dbus-sharp >= %{dbus_sharp_min_version}	
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
+Requires:	gnome-sharp
 
 Requires(pre):	GConf2
 
@@ -124,6 +125,10 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-6
+- Add gnome-sharp runtime dependency; fixes bug 253200.
+- Update License tag in accordance with new guidelines.
+
 * Wed Jul 18 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-5
 - Rebuild for newer Gecko libraries (Firefox 2.0.0.5)
 - Depend on the gecko-libs and gecko-devel virtuals, instead of querying RPM



From fedora-extras-commits at redhat.com  Sat Sep  8 19:11:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:11:53 -0400
Subject: rpms/smart/devel ksmarttray.desktop, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.11, 1.12
Message-ID: <200709081911.l88JBrXx013354@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315

Modified Files:
	.cvsignore sources 
Added Files:
	ksmarttray.desktop 
Log Message:
Move ksmarttray.desktop to CVS instead of lookaside cache for tracking purposes.


--- NEW FILE ksmarttray.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KSmartTray
Comment=Keep up to date with package updates
Exec=ksmarttray
Type=Application
Terminal=false
Categories=System;KDE;Monitor;TrayIcon;Applet;
OnlyShowIn=TrayIcon;Applet;
Icon=ksmarttray


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Feb 2007 00:47:01 -0000	1.8
+++ .cvsignore	8 Sep 2007 19:11:20 -0000	1.9
@@ -1,5 +1,4 @@
 smart-0.50.tar.bz2
 smart-0.50-ccache.patch
 smart-0.42-autofs5fix.patch
-ksmarttray.desktop
 smart-0.50-auto.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Aug 2007 22:46:52 -0000	1.11
+++ sources	8 Sep 2007 19:11:20 -0000	1.12
@@ -2,4 +2,3 @@
 044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
 371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
 258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
-9480428b470ef9af0a92a14445bb191b  ksmarttray.desktop



From fedora-extras-commits at redhat.com  Sat Sep  8 19:26:56 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:26:56 -0400
Subject: rpms/smart/devel ksmarttray.desktop,1.1,1.2 smart.spec,1.23,1.24
Message-ID: <200709081926.l88JQuq4013842@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13758

Modified Files:
	ksmarttray.desktop smart.spec 
Log Message:
* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
- KSmartTray desktop entry fixes.
- License: GPLv2+



Index: ksmarttray.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/ksmarttray.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksmarttray.desktop	8 Sep 2007 19:11:20 -0000	1.1
+++ ksmarttray.desktop	8 Sep 2007 19:26:24 -0000	1.2
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KSmartTray
 Comment=Keep up to date with package updates
 Exec=ksmarttray
 Type=Application
 Terminal=false
 Categories=System;KDE;Monitor;TrayIcon;Applet;
-OnlyShowIn=TrayIcon;Applet;
+OnlyShowIn=GNOME;KDE;XFCE;
 Icon=ksmarttray


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/smart.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- smart.spec	17 Aug 2007 19:46:04 -0000	1.23
+++ smart.spec	8 Sep 2007 19:26:24 -0000	1.24
@@ -7,8 +7,8 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.50
-Release: 47%{?dist}
-License: GPL
+Release: 48%{?dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
 Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
@@ -207,6 +207,10 @@
 %endif
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
+- KSmartTray desktop entry fixes.
+- License: GPLv2+
+
 * Thu Aug  2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
 - Add kernel-tuxonice series support.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:28:40 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:28:40 -0400
Subject: rpms/blam/devel blam.spec,1.15,1.16
Message-ID: <200709081928.l88JSeGg013936@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	blam.spec 
Log Message:
Add mono-web runtime dependency.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/blam.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blam.spec	17 Aug 2007 21:58:27 -0000	1.15
+++ blam.spec	8 Sep 2007 19:28:07 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -40,6 +40,7 @@
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
 Requires:	gnome-sharp
+Requires:	mono-web
 
 Requires(pre):	GConf2
 
@@ -125,6 +126,10 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-8
+- Add mono-web runtime dependency; fixes bugs 282331 (Blam does not open
+  links with commas correctly) and 277561 (Blam does nothing useful).
+
 * Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-7
 - Add gnome-sharp runtime dependency; fixes bug 253200.
 - Update License tag in accordance with new guidelines.



From fedora-extras-commits at redhat.com  Sat Sep  8 19:30:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:30:22 -0400
Subject: rpms/chrpath/devel chrpath.spec,1.2,1.3
Message-ID: <200709081930.l88JUMXn014104@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/chrpath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14024

Modified Files:
	chrpath.spec 
Log Message:
* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.13-2
- License: GPL+



Index: chrpath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chrpath/devel/chrpath.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chrpath.spec	30 Aug 2006 00:27:33 -0000	1.2
+++ chrpath.spec	8 Sep 2007 19:29:49 -0000	1.3
@@ -1,8 +1,8 @@
 Summary: Modify rpath of compiled programs
 Name: chrpath
 Version: 0.13
-Release: 1.1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPL+
 Group: Development/Tools
 URL: ftp://ftp.hungry.com/pub/hungry/chrpath/
 Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz
@@ -36,6 +36,9 @@
 %{_mandir}/man1/chrpath.1*
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.13-2
+- License: GPL+
+
 * Sun Mar 12 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.13-1
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:31:26 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:31:26 -0400
Subject: rpms/blam/F-7 blam.spec,1.12,1.13
Message-ID: <200709081931.l88JVQkN014188@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14137

Modified Files:
	blam.spec 
Log Message:
Add mono-web dependency.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-7/blam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blam.spec	8 Sep 2007 19:03:36 -0000	1.12
+++ blam.spec	8 Sep 2007 19:30:54 -0000	1.13
@@ -40,6 +40,7 @@
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
 Requires:	gnome-sharp
+Requires:	mono-web
 
 Requires(pre):	GConf2
 
@@ -126,7 +127,9 @@
 
 %changelog
 * Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-6
-- Add gnome-sharp runtime dependency; fixes bug 253200.
+- Add gnome-sharp and mono-web runtime dependencies; fixes bugs 282331 (Blam
+  does not open links with commas correctly) and 277561 (Blam does nothing
+  useful).
 - Update License tag in accordance with new guidelines.
 
 * Wed Jul 18 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-5



From fedora-extras-commits at redhat.com  Sat Sep  8 19:35:58 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:35:58 -0400
Subject: rpms/php-pecl-radius/F-7 .cvsignore, 1.2, 1.3 php-pecl-radius.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081935.l88JZw3H014464@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/F-7

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:24:47 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:26 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:24:47 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:26 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:24:47 -0000	1.2
+++ sources	8 Sep 2007 19:35:26 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:36:04 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:36:04 -0400
Subject: rpms/php-pecl-radius/devel .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081936.l88Ja4JR014474@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/devel

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:24:47 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:31 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:24:47 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:31 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:24:47 -0000	1.2
+++ sources	8 Sep 2007 19:35:31 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:36:01 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:36:01 -0400
Subject: rpms/php-pecl-radius/FC-6 .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081936.l88Ja1XT014469@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/FC-6

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:26:07 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:28 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:26:07 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:29 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:26:07 -0000	1.2
+++ sources	8 Sep 2007 19:35:29 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:42:52 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:42:52 -0400
Subject: rpms/qgit/devel .cvsignore, 1.13, 1.14 qgit.spec, 1.18, 1.19 sources,
	1.13, 1.14
Message-ID: <200709081942.l88JgqNA014803@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14732

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:36:41 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:42:20 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	21 Aug 2007 15:19:29 -0000	1.18
+++ qgit.spec	8 Sep 2007 19:42:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           qgit
-Version:        1.5.6
-Release:        2%{?dist}
+Version:        1.5.7
+Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
 Group:          Development/Tools
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+
 * Tue Aug 21 2007 Dan Horak <dan[at]danny.cz> 1.5.6-2
 - update license tag
 - rebuild for F8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:36:41 -0000	1.13
+++ sources	8 Sep 2007 19:42:20 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:43:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:43:15 -0400
Subject: rpms/php-pecl-radius/EL-5 .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081943.l88JhF9I014824@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14775/EL-5

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:26:07 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:42:42 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:26:07 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:42:42 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:26:07 -0000	1.2
+++ sources	8 Sep 2007 19:42:42 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:48:55 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:48:55 -0400
Subject: rpms/qgit/F-7 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources, 
	1.13, 1.14
Message-ID: <200709081948.l88JmtBx015160@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:54:11 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:48:22 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:50 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:48:22 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:54:11 -0000	1.13
+++ sources	8 Sep 2007 19:48:22 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:52:25 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Sat, 8 Sep 2007 15:52:25 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.72, 1.73 setroubleshoot.init,
	1.9, 1.10 setroubleshoot.spec, 1.87, 1.88 sources, 1.83, 1.84
Message-ID: <200709081952.l88JqPDG015495@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15413/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	12 Jun 2007 21:01:44 -0000	1.72
+++ .cvsignore	8 Sep 2007 19:51:52 -0000	1.73
@@ -1 +1 @@
-setroubleshoot-1.9.7.tar.gz
+setroubleshoot-1.10.3.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setroubleshoot.init	15 Sep 2006 20:52:45 -0000	1.9
+++ setroubleshoot.init	8 Sep 2007 19:51:52 -0000	1.10
@@ -9,22 +9,50 @@
 # config: /etc/setroubleshoot/setroubleshoot.cfg
 # pidfile: /var/run/setroubleshoot.pid
 #
+
+### BEGIN INIT INFO
+# Provides: lsb-setroubleshootd
+# Required-Start: $local_fs $syslog $network $named
+# Required-Stop: $local_fs $syslog $network $named
+# Default-Start:  3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop SELinux Troubleshooting Daemon
+# Description: controls operation of the SELinux Troubleshooting Daemon
+#	(setroubleshootd) which listens for SELinux AVC denial messages
+#	analyzes it and provides a friendly interpretation.
+### END INIT INFO
+
 # Return values according to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - insufficient privilege
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
+# 0	success
+# 1	generic or unspecified error (current practice)
+# 2	invalid or excess argument(s)
+# 3	unimplemented feature (for example, "reload")
+# 4	user had insufficient privilege
+# 5	program is not installed
+# 6	program is not configured
+# 7	program is not running
+
+# Command argument
+# start		start the service
+# stop		stop the service
+# restart	stop and restart the service if the service is already running, otherwise start the service
+# try-restart	restart the service if the service is already running
+# reload	cause the configuration of the service to be reloaded without actually stopping and restarting the service
+# force-reload	cause the configuration to be reloaded if the service supports this, otherwise restart the service if it is running
+# status	print the current status of the service
+
+# start, stop, restart, force-reload, and status actions must be supported
+# reload and the try-restart actions are optional.
+# the init script.
+
+
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
+# /lib/lsb/init-functions
 . /etc/init.d/functions
 
-
 # Silently exit is SELinux is not enabled
 [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
@@ -99,17 +127,17 @@
     restart)
 	restart
 	;;
-    reload)
+    force-reload|reload)
 	reload
 	;;
-    condrestart)
+    try-restart|condrestart)
 	condrestart
 	;;
     cleardb)
 	cleardb
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|cleardb}"
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload|cleardb}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- setroubleshoot.spec	12 Jun 2007 21:01:44 -0000	1.87
+++ setroubleshoot.spec	8 Sep 2007 19:51:52 -0000	1.88
@@ -1,10 +1,10 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.9.7
+Version: 1.10.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
-URL: http://www.redhat.com/ 
+URL: https://hosted.fedoraproject.org/projects/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source1: setroubleshoot.init
 Source2: setroubleshoot.logrotate
@@ -12,25 +12,32 @@
 BuildArch: noarch
 BuildRequires: perl-XML-Parser
 Requires: %{name}-server = %{version}-%{release} 
+Requires: %{name}-plugins
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2, gnome-python2-canvas 
-Requires: usermode, rhpl
 BuildRequires: desktop-file-utils
 Requires: gnome-python2-gtkhtml2
+Requires: dbus
+Requires: dbus-python
+Requires: libxml2-python
 Requires(post):   /usr/bin/update-desktop-database
+Requires(post):   dbus
 Requires(postun): /usr/bin/update-desktop-database
+Requires(postun): dbus
 Requires: notify-python
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define pkgpythondir  %{python_sitelib}/%{name}
 %define pkgdocdir     %{_datadir}/doc/%{name}-%{version}
+%define pkgguidir     %{_datadir}/%{name}/gui
 %define pkgdatadir    %{_datadir}/%{name}
 %define pkglibexecdir %{_prefix}/libexec/%{name}
 %define pkgvardatadir %{_localstatedir}/lib/%{name}
 %define pkgrundir     %{_localstatedir}/run/%{name}
 %define pkgconfigdir  %{_sysconfdir}/%{name}
 %define pkglogdir     %{_localstatedir}/log/%{name}
+%define pkgdatabase   %{pkgvardatadir}/audit_listener_database.xml
 
 %description
 setroubleshoot gui. Application that allows you to view setroubleshoot-server 
@@ -41,19 +48,21 @@
 to user preference. The same tools can be run on existing log files.
 
 %files
+%{pkgguidir}
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/sealert.service
 %{_datadir}/icons/hicolor
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/browser.py*
-%{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/email_dialog.py*
+%{pkgpythondir}/gui_utils.py*
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || :
 
 %postun
 /usr/bin/update-desktop-database %{_datadir}/applications
@@ -72,7 +81,8 @@
 make DESTDIR=%{buildroot} install
 %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-touch %{buildroot}%{pkgvardatadir}/audit_listener_database.xml
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
+touch %{buildroot}%{pkgdatabase}
 touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
 %find_lang %{name}
 
@@ -80,9 +90,16 @@
 Summary: SELinux troubleshoot server
 Group: Applications/System
 
+Requires: %{name}-plugins
 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: audit-libs-python
+Requires: libuser
 
 BuildRequires: intltool gettext python
 
@@ -99,7 +116,10 @@
 to user preference. The same tools can be run on existing log files.
 
 %post server
-[ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml
+if [ -f %{pkgdatabase} ]; then
+    chown root:root %{pkgdatabase} >/dev/null 2>&1 || :
+    chmod 600 %{pkgdatabase} >/dev/null 2>&1 || :
+fi
 /sbin/chkconfig --add %{name}
 /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 
@@ -126,8 +146,8 @@
 %{pkgpythondir}/__init__.py*
 %{pkgpythondir}/access_control.py*
 %{pkgpythondir}/analyze.py*
+%{pkgpythondir}/audit_data.py*
 %{pkgpythondir}/avc_audit.py*
-%{pkgpythondir}/avc_auparse.py*
 %{pkgpythondir}/config.py*
 %{pkgpythondir}/email_alert.py*
 %{pkgpythondir}/errcode.py*
@@ -142,15 +162,93 @@
 %config %{pkgconfigdir}/%{name}.cfg
 %dir %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/dbus-1/system.d/setroubleshootd.conf
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
-%ghost %attr(0644,root,root) %{pkgvardatadir}/audit_listener_database.xml
+%ghost %attr(0600,root,root) %{pkgdatabase}
 %ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients
 %{_mandir}/man8/sealert.8.gz
-
-/etc/rc.d/init.d/%{name}
+%attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- modify avc_audit.py to use new audit_data.py implementation
+
+	- can listen for audit events on either /var/run/audit_events
+	  in bindary protocol mode or /var/run/audisp_events in
+	  text protocol mode
+
+* Thu Sep  6 2007 John Dennis <jdennis at redhat.com> - 1.10.2-1
+	- remove all copied code from test_setroubleshootd, now we import
+	  from setroubleshoot
+	
+	- export ClientConnectionHandler from rpc.py as a base class.
+	  Derive SetroubleshootdClientConnectionHandler and
+	  AuditClientConnectionHandler from ClientConnectionHandler.
+
+	- add audisp_listen as test program
+
+	- create setroubleshoot sym link in top devel directory pointing
+	  to src so import setroubleshoot.foo if PYTHONPATH=topdir
+
+	- add get_option, convert_cfg_type to config.py.in so that one
+	  can pass optional dict to override config file settings
+
+	- rewrite log_init() so it's easier for other programs to use it,
+	  fix the import logic concering log & config
+
+	- remove log code from test_setroubleshoot, now just does import
+	  from setroubleshoot.
+	
+	- test_setroubleshootd can now handle audit records in both text
+	  and binary formats, can be selected by command line arg. It can now
+	  either output to clients connecting on a socket or to stdout. Can
+	  now optionally exit after N socket client connections.
+
+	- remove non audit record lines from test data
+
+	- remove config_init() and log_init() from package __init__.py
+	  It was the wrong place to call them, now call them when the
+	  process initializes before the first setroubleshoot imports
+
+	- add parse_config_setting() and set_config() to config module
+	- setroubleshootd now accepts -c --config command line arg
+	- test_sectroubleshoot: add err defines & program_error exception
+	  add is_valid() tests to assure we read a valid audit record
+	  log the unrecognized line if not valid, clean up socket close()
+
+	- Relates Bug #247056, update initscript to LSB standards
+	  Note: LSB initscripts in Fedora is not yet a resolved issue,
+	  the changes implemented were to add an LSB block and support
+	  the new LSB try-restart and force-reload commands. However
+	  the new /lib/lsb/init-functions are NOT currently used as this
+	  is the unstable part.
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
+	- add BuildRequires perl-XML-Parser
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.0-1
+
+	- move all plugins and their translations to independent package
+	- wrap XML generation inside try/except
+	- correct how access list is obtained in avc_auparse.py
+	- add try/except around top level of AnalyzeThread.run so exceptions
+	  in the thread get reported and the analysis thread does not just die.
+	- also add try/except around LogfileThread.process_logfile
+	- add new function assure_file_ownership_permissions()
+	- server now forces it's database file permissions/ownership to be 0600 root:root
+	- rpm now forces the server's database file permissions/ownership to be 0600 root:root
+	- Resolves Bug #251545: Review Request: setroubleshoot-plugins - analysis plugins for setroubleshoot
+	- clean up some other rpmlint warnings in setroubleshoot.spec
+	- fix missing install of setroubleshoot icon and sym link to it
+	- Resolves Bug #251551, setroubleshoot shows up in in wrong desktop menu
+	  also run desktop-file-install in rpm install
+	- add /etc/dbus-1/system.d/setroubleshootd.conf dbus configuration file
+	- Resolves Bug #250979, Bug #250932 Missing dependencies
+	- Restore plugins/Makefile.am which got nuked somehow
+	- remove dus.dbus_bindings.bus_name_has_owner(), deprecated as of F7
+	- wrap rpm transactions in try/except
+
 * Tue Jun 12 2007 John Dennis <jdennis at redhat.com> - 1.9.7-1
 	- Resolves Bug# 241739, this bug is the lead bug for several bug reports,
 	  all consequences of the same problem, setroubleshootd/sealert when run
@@ -709,7 +807,7 @@
 	- fix allow_execmod plugin to report better data.
 
 * Mon Jun 26 2006 John Dennis <jdennis at redhat.com> - 0.3-1
-	- add missing /var/log directory %files section in spec file,
+	- add missing /var/log directory files section in spec file,
 	  and add logrotate script
 
 * Mon Jun 26 2006 John Dennis <jdennis at redhat.com> - 0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	12 Jun 2007 21:01:44 -0000	1.83
+++ sources	8 Sep 2007 19:51:52 -0000	1.84
@@ -1 +1 @@
-cb39cb419aa3f3709811e721ef1bde41  setroubleshoot-1.9.7.tar.gz
+6e5b7395364c637854d069c5cf2a45ba  setroubleshoot-1.10.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:52:35 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:52:35 -0400
Subject: rpms/qgit/FC-6 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081952.l88JqZLB015538@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15458

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:57:08 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:52:03 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:52 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:52:03 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:57:08 -0000	1.13
+++ sources	8 Sep 2007 19:52:03 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:57:16 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:57:16 -0400
Subject: rpms/qgit/EL-4 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081957.l88JvGAk015908@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:36:41 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:56:43 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:45 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:56:43 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:36:41 -0000	1.13
+++ sources	8 Sep 2007 19:56:43 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:59:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:59:28 -0400
Subject: rpms/qgit/EL-5 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081959.l88JxSfE016117@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16077

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:57:08 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:58:55 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:47 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:58:55 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:57:08 -0000	1.13
+++ sources	8 Sep 2007 19:58:55 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:36 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:36 -0400
Subject: rpms/php-pecl-xdebug/EL-5 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4a6W022292@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/EL-5

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:51 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:02 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:39:59 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:02 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:51 -0000	1.4
+++ sources	8 Sep 2007 20:04:02 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:40 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:40 -0400
Subject: rpms/php-pecl-xdebug/F-7 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec, 
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4e5v022299@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/F-7

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:57 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:06 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:40:02 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:06 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:57 -0000	1.4
+++ sources	8 Sep 2007 20:04:06 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:43 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:43 -0400
Subject: rpms/php-pecl-xdebug/FC-6 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4hsj022306@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/FC-6

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:51 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:10 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:39:59 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:10 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:51 -0000	1.4
+++ sources	8 Sep 2007 20:04:10 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:47 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:47 -0400
Subject: rpms/php-pecl-xdebug/devel .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4lGM022317@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/devel

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:57 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:14 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:40:02 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:14 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:57 -0000	1.4
+++ sources	8 Sep 2007 20:04:14 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:40:12 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 8 Sep 2007 16:40:12 -0400
Subject: rpms/libbonoboui/devel help-error.patch, NONE, 1.1 libbonoboui.spec,
	1.56, 1.57
Message-ID: <200709082040.l88KeCdW024109@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24083

Modified Files:
	libbonoboui.spec 
Added Files:
	help-error.patch 
Log Message:
show a dialog if help is missing


help-error.patch:

--- NEW FILE help-error.patch ---
diff -up libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error libbonoboui-2.19.6/bonobo/bonobo-ui-util.c
--- libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error	2007-02-27 09:07:59.000000000 -0500
+++ libbonoboui-2.19.6/bonobo/bonobo-ui-util.c	2007-09-08 16:19:23.000000000 -0400
@@ -593,8 +593,20 @@ bonobo_help_display_cb (BonoboUIComponen
 		cl->program, doc_id, doc_id, NULL, &error);
 
 	if (error) {
-		/* FIXME: better error handling ? */
-		g_warning ("Error: '%s'", error->message);
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (NULL, 0, 
+                                                 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_OK,
+						 _("Could not display help for this application"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  error->message);
+		g_signal_connect_swapped (dialog, "response",
+					  G_CALLBACK (gtk_widget_destroy),
+					  dialog);
+
+		gtk_window_present (GTK_WINDOW (dialog));
+
 		g_error_free (error);
 	}
 }


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libbonoboui.spec	23 Aug 2007 18:15:50 -0000	1.56
+++ libbonoboui.spec	8 Sep 2007 20:39:40 -0000	1.57
@@ -14,9 +14,11 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.19.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.19/%{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=125046
+Patch0: help-error.patch
 License: GPLv2+ and LGPLv2+
 # bonobo-browser is GPL, libbonoboui is LGPL
 Group: System Environment/Libraries
@@ -71,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .help-error
 
 %build
 
@@ -119,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-4
+- Display a dialog if help cannot be found
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-3
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Sat Sep  8 20:53:59 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:53:59 -0400
Subject: rpms/php-pear-DB-DataObject/EL-5 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082053.l88KrxD8024732@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/EL-5

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:26 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:14 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:26 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:17 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:26 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:14 -0000	1.3
+++ sources	8 Sep 2007 20:53:26 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:01 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:01 -0400
Subject: rpms/php-pear-DB-DataObject/F-7 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks1OJ024740@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/F-7

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:29 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:20 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:29 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:22 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:29 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:20 -0000	1.3
+++ sources	8 Sep 2007 20:53:29 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:04 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:04 -0400
Subject: rpms/php-pear-DB-DataObject/FC-6 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks4DL024748@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/FC-6

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:32 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:14 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:32 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:17 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:32 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:14 -0000	1.3
+++ sources	8 Sep 2007 20:53:32 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:07 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:07 -0400
Subject: rpms/php-pear-DB-DataObject/devel .cvsignore, 1.3,
	1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks7Pd024753@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/devel

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:20 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:34 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:22 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:34 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:20 -0000	1.3
+++ sources	8 Sep 2007 20:53:34 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:55:52 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:55:52 -0400
Subject: rpms/php-pear-DB-DataObject/devel PHP-LICENSE-3.01,1.2,1.3
Message-ID: <200709082055.l88Ktq3h024821@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24795/devel

Added Files:
	PHP-LICENSE-3.01 
Log Message:
forgot this one


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:55:20 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.



From fedora-extras-commits at redhat.com  Sat Sep  8 21:11:40 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Sat, 8 Sep 2007 17:11:40 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.73, 1.74 setroubleshoot.init,
	1.10, 1.11 setroubleshoot.spec, 1.88, 1.89 sources, 1.84, 1.85
Message-ID: <200709082111.l88LBeJT031637@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31583/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
fix init script



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	8 Sep 2007 19:51:52 -0000	1.73
+++ .cvsignore	8 Sep 2007 21:11:06 -0000	1.74
@@ -1 +1 @@
-setroubleshoot-1.10.3.tar.gz
+setroubleshoot-1.10.4.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setroubleshoot.init	8 Sep 2007 19:51:52 -0000	1.10
+++ setroubleshoot.init	8 Sep 2007 21:11:06 -0000	1.11
@@ -50,7 +50,6 @@
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
-# /lib/lsb/init-functions
 . /etc/init.d/functions
 
 # Silently exit is SELinux is not enabled


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- setroubleshoot.spec	8 Sep 2007 19:51:52 -0000	1.88
+++ setroubleshoot.spec	8 Sep 2007 21:11:06 -0000	1.89
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.3
+Version: 1.10.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -171,6 +171,9 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
+	- fix init script
+
 * Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
 	- modify avc_audit.py to use new audit_data.py implementation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	8 Sep 2007 19:51:52 -0000	1.84
+++ sources	8 Sep 2007 21:11:06 -0000	1.85
@@ -1 +1 @@
-6e5b7395364c637854d069c5cf2a45ba  setroubleshoot-1.10.3.tar.gz
+68c3d6d05d5273dd042e792f24ef09f2  setroubleshoot-1.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:15 -0400
Subject: rpms/php-pear-Pager/EL-5 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRFwt032287@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/EL-5

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:42 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:42 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:42 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:17 -0400
Subject: rpms/php-pear-Pager/F-7 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRHjE032294@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/F-7

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:45 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:45 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:45 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:20 -0400
Subject: rpms/php-pear-Pager/FC-6 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRKYs032301@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/FC-6

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:47 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:47 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:48 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:23 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:23 -0400
Subject: rpms/php-pear-Pager/devel .cvsignore, 1.3, 1.4 php-pear-Pager.spec, 
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRNDl032308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/devel

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:50 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:50 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:50 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:49:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 17:49:01 -0400
Subject: rpms/mach/devel mach.spec,1.14,1.15
Message-ID: <200709082149.l88Ln18k004049@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011

Modified Files:
	mach.spec 
Log Message:
* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
- Drop no longer needed (and failing) old ppc config bug workarounds.
- Sync group creation scriptlet with current Fedora packaging guidelines.
- Set default config to the "updates" flavour.



Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/devel/mach.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mach.spec	8 Sep 2007 17:22:47 -0000	1.14
+++ mach.spec	8 Sep 2007 21:48:26 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           mach
 Version:        0.9.2
-Release:        1%{?dist}
-Summary:        make a chroot
+Release:        2%{?dist}
+Summary:        Make a chroot
 
 Group:          Applications/System
 License:        GPLv2+
@@ -44,7 +44,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=updates
 make
 
 %install
@@ -56,19 +56,13 @@
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/tmp/mach
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach
 
-# the ppc dist files were not added to the dist, so install them manually
-for v in 4 5 6 development
-do
-  install -m 644 etc/dist.d/fedora-$v-ppc %{_sysconfdir}/mach/dist.d
-done
-
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -102,6 +96,11 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
 * Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.2-1
 - new release



From fedora-extras-commits at redhat.com  Sat Sep  8 21:55:39 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:55:39 -0400
Subject: rpms/php-pear-File/devel .cvsignore, 1.2, 1.3 php-pear-File.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709082155.l88LtdnZ004477@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-File/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/devel

Modified Files:
	.cvsignore php-pear-File.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2006 06:26:38 -0000	1.2
+++ .cvsignore	8 Sep 2007 21:55:07 -0000	1.3
@@ -1 +1 @@
-File-1.2.2.tgz
+File-1.3.0.tgz


Index: php-pear-File.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/php-pear-File.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-File.spec	14 Dec 2006 06:26:38 -0000	1.1
+++ php-pear-File.spec	8 Sep 2007 21:55:07 -0000	1.2
@@ -2,12 +2,12 @@
 %define pear_name File
 
 Name:           php-pear-File
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Common file and directory routines
 
 Group:          Development/Languages
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/File
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -47,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
@@ -75,5 +75,8 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.0-1
+- Upstream sync
+
 * Wed Dec 13 2006 Christopher Stone <chris.stone at gmail.com> 1.2.2-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2006 06:26:38 -0000	1.2
+++ sources	8 Sep 2007 21:55:07 -0000	1.3
@@ -1 +1 @@
-ba8f020b70fb6a37c6258e0e42033aad  File-1.2.2.tgz
+9d806e98095f2b10373ac521a098d9ed  File-1.3.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 22:02:03 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 18:02:03 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.19,1.20
Message-ID: <200709082202.l88M238J010767@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4788

Modified Files:
	emacs-vm.spec 
Log Message:
Add logic to allow for not having a pkg-config file present for Emacs at package
build time.



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emacs-vm.spec	8 Sep 2007 14:27:52 -0000	1.19
+++ emacs-vm.spec	8 Sep 2007 22:01:29 -0000	1.20
@@ -7,12 +7,17 @@
 %define vmversion 8.0.3
 %define devoversion 495
 
-
+# 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 21.4
+%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-coonfig emacs --variable sitestartdir)
-
-%{!?emacs_version %define emacs_version 21.4}
+%endif
 
 %define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
@@ -34,7 +39,7 @@
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs texinfo texinfo-tex
+BuildRequires: emacs-el texinfo texinfo-tex
 
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
@@ -133,6 +138,7 @@
 * Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
 - Update for agreement with packaging guidelines - add versioned
   emacs requirement
+- If no pkg-config is found, revert to sensible defaults
 
 * Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
 - Fix problem with vm-autoloads.el RH BZ #262361 



From fedora-extras-commits at redhat.com  Sat Sep  8 22:17:41 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 18:17:41 -0400
Subject: rpms/php-pear-PHPUnit/devel .cvsignore, 1.4,
	1.5 php-pear-PHPUnit.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082217.l88MHfLe011858@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11768/devel

Modified Files:
	.cvsignore php-pear-PHPUnit.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 May 2007 01:47:19 -0000	1.4
+++ .cvsignore	8 Sep 2007 22:17:09 -0000	1.5
@@ -1 +1 @@
-PHPUnit-3.0.6.tgz
+PHPUnit-3.1.8.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/php-pear-PHPUnit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-PHPUnit.spec	7 May 2007 01:47:19 -0000	1.5
+++ php-pear-PHPUnit.spec	8 Sep 2007 22:17:09 -0000	1.6
@@ -3,7 +3,7 @@
 %define channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.0.6
+Version:        3.1.8
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -97,11 +97,13 @@
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}
-%{pear_phpdir}/%{pear_name}2
 %{_bindir}/phpunit
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 3.1.8-1
+- Upstream sync
+
 * Sun May 06 2007 Christopher Stone <chris.stone at gmail.com> 3.0.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 May 2007 01:47:19 -0000	1.4
+++ sources	8 Sep 2007 22:17:09 -0000	1.5
@@ -1 +1 @@
-cf8365f8b8e86412e6c1590d6d4e872f  PHPUnit-3.0.6.tgz
+17cb76d972afc116e780c03c9a1835ec  PHPUnit-3.1.8.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 00:00:14 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Sat, 8 Sep 2007 20:00:14 -0400
Subject: comps/po sr.po,1.3,1.4
Message-ID: <200709090000.l8900Ebm025395@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25374

Modified Files:
	sr.po 
Log Message:
updated sr translation


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sr.po	8 Sep 2007 23:59:43 -0000	1.4
@@ -9,12 +9,14 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-24 11:42-0000\n"
+"PO-Revision-Date: 2007-09-09 00:55-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
-"Language-Team: Serbian (sr) <fedora at prevod.org>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr 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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -396,16 +398,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ???? ?????????? ???????????????? ???????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????????? ?????????????? ???? ?????????????? ????????????."
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -415,17 +415,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ???????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -493,19 +491,17 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -528,23 +524,20 @@
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -623,9 +616,8 @@
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -652,9 +644,8 @@
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -692,9 +683,8 @@
 "?????? ?????????????? ???? ????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "?????????????? ???? ????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -717,9 +707,8 @@
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -730,14 +719,12 @@
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -764,9 +751,8 @@
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -789,9 +775,8 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -826,9 +811,8 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -855,9 +839,8 @@
 msgstr "?????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "?????????????? ???? ??????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -888,9 +871,8 @@
 msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -992,14 +974,12 @@
 msgstr "?????? ?????????? ???????????? ???????????? ???????????? ?????????????? ?????? ???????? ???? Postgresql-????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1018,18 +998,16 @@
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "?????????????? ???? ????????"
+msgstr "?????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1057,364 +1035,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???? ???????????????? ?????????????? ????????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "??????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ?????????????? ???? ???????????? ???????????? ???? ???????????? ????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse ?????????????????????? ???????????????? ????????????????."
+msgstr "?????????????????????? ???????????????? ???????????????? ?????????????????? ???? Eclipse-??."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "?????????????????? ??????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ???????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????? ???? ??????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????? ???? ??????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "?????????????? ???? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? ?????????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Mozilla ?????????????? ???? ?????????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "?????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "?????????????? ???? ????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ??????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ??????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ??????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ??????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "???????????????????????? ?????? ???????????? ?????? ???????????? ???? ???????????????????????????? ????????????."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ?????????? ????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Mozilla ???????????? ???? x86 ??????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib ???????????? ??????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ???????? ????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????? ?????????????? ???????????? ???? ?????????????????? ??????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "?????????????? ???? ????????????????"
-
-#~ msgid "System"
-#~ msgstr "????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "??????-???? Emacs ???????????????? ????????????."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "?????? ???????????? ?????????????????????? ???????????????????? IMAP ?????? Postfix ?????????????? ??????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "?????? ???????????? ?????????????? ?????????????? ???????????????????????? ???? ???????????????????? ???????????????? Red Hat "
-#~ "Enterprise Linux-??."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????? ???????????????? ????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????????????? ?????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "?????????????? ???? ppc64 ???????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? x86 ?????????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "?????????????? ???? x86 ???????????????????? ??????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????? ??????????????????????"
-
-#~ msgid "English"
-#~ msgstr "????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????"
-
-#~ msgid "Italian"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ??????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????."
-
-#~ msgid "Japanese"
-#~ msgstr "????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "?????????????????????????????? ??????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? "
-#~ "???????????????????????????????? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????????????? "
-#~ "????????????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????????????????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? ppc64 ?????????????????????? ??????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????????????? "
-#~ "????????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "?????????????????? ????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????? ???? ????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? ?????????????????? ????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? GFS ???? ???????????? ????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "?????????????? GFS ???? ???????????? ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ???????????? ?????????????? ?????????????? ???????????????????????? ???? ???????????????????? ????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????? ???????????????? ?? ???????????????? ????????????"
-
-#~ msgid "Misc"
-#~ msgstr "??????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "???????????????? ???? ??????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ???????? ?????????????? ?????????????? ???????????????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????? ??????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "???????????????? ?? ?????????? ???? ?????????? ??????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????? ???? ????????????????????????????"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ???????????? ????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????? ???????? ?????????????? ???????????????????????????? ???? ?????????????????? ??????????????????????."
+msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"



From fedora-extras-commits at redhat.com  Sun Sep  9 00:01:09 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Sat, 8 Sep 2007 20:01:09 -0400
Subject: comps/po sr@Latn.po,1.3,1.4
Message-ID: <200709090001.l89019eu031150@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25404

Modified Files:
	sr at Latn.po 
Log Message:
updated sr at Latn translation


Index: sr at Latn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at Latn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sr at Latn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sr at Latn.po	9 Sep 2007 00:00:38 -0000	1.4
@@ -9,12 +9,14 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-24 11:42-0000\n"
+"PO-Revision-Date: 2007-09-09 00:58-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
-"Language-Team: Serbian (sr) <fedora at prevod.org>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr 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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -396,16 +398,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Ova grupa je skupina alata za razne programe svojstvene hardveru."
+msgstr "Ova grupa je skupina mre??nih servera za posebne namene."
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za arapsko okru??enje."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -415,17 +415,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za hebrejsko okru??enje."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za japansko okru??enje."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -493,19 +491,17 @@
 msgstr "Podr??ka za ??e??ki"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za ??e??ko okru??enje."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Podr??ka za afrikanski"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Podr??ka za kanadski"
+msgstr "Podr??ka za albanski"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -528,23 +524,20 @@
 msgstr "Podr??ka za baskijski"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Podr??ka za bugarski"
+msgstr "Podr??ka za beloruski"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Podr??ka za bengalski"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Podr??ka za kineski"
+msgstr "Podr??ka za butanski"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Podr??ka za estonski"
+msgstr "Podr??ka za bosanski"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -623,9 +616,8 @@
 msgstr "Podr??ka za farski"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Podr??ka za galicijski"
+msgstr "Podr??ka za filipinski"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -652,9 +644,8 @@
 msgstr "Podr??ka za galicijski"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za gruzijski"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -692,9 +683,8 @@
 "kao servera za ??tampanje."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Podr??ka za zulu"
+msgstr "Podr??ka za inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -717,9 +707,8 @@
 msgstr "Podr??ka za kanadu"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za kmerski"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -730,14 +719,12 @@
 msgstr "Jezici"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "Podr??ka za tajlandski"
+msgstr "Podr??ka za lao??ki"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Podr??ka za hrvatski"
+msgstr "Podr??ka za letonski"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -764,9 +751,8 @@
 msgstr "Podr??ka za malajalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "Podr??ka za marati"
+msgstr "Podr??ka za maorski"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -789,9 +775,8 @@
 msgstr "Podr??ka za oriju"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "Podr??ka za srpski"
+msgstr "Podr??ka za persijski"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -826,9 +811,8 @@
 msgstr "Podr??ka za ruski"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za samoanski"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -855,9 +839,8 @@
 msgstr "Najmanja mogu??a instalacija"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "Podr??ka za svati"
+msgstr "Podr??ka za somail"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -888,9 +871,8 @@
 msgstr "Podr??ka za ??vedski"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Podr??ka za tamilski"
+msgstr "Podr??ka za tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -959,7 +941,7 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
-"Ova grupa sadr??i sve Red Hat-ove prilago??ene alate za pode??avanje servera."
+"Ova grupa sadr??i sve Red Hatove prilago??ene alate za pode??avanje servera."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
 msgid ""
@@ -989,17 +971,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "Ova grupa paketa sadr??i pakete korisne pri radu sa Postgresql-om."
+msgstr "Ova grupa paketa sadr??i pakete korisne pri radu sa Postgresqlom."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za tibetanski"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "Podr??ka za tsongu"
+msgstr "Podr??ka za tongu"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1018,18 +998,16 @@
 msgstr "Podr??ka za ukrajinski"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "Podr??ka za zulu"
+msgstr "Podr??ka za urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "Podr??ka za vendu"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "Podr??ka za kineski"
+msgstr "Podr??ka za vijetnamski"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1057,364 +1035,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Grupa za izgradnju sistema izgradnje"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "Fontovi"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Paketi fontova za prikaz teksta na radnoj povr??i."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse integrisano razvojno okru??enje."
+msgstr "Integrisano razvojno okru??enje zasnovano na Eclipseu."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Zastareli fontovi"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Podr??ka za tajlandski"
+msgstr "Podr??ka za ni??i saksonski"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "Podr??ka za estonski"
+msgstr "Podr??ka za mongolski"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "Podr??ka za bengalski"
+msgstr "Podr??ka za nepalski"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Podr??ka za brazilski"
-
-#~ msgid "British Support"
-#~ msgstr "Podr??ka za britanski"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na usagla??enoj arhitekturi"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Mozilla podr??ka na usagla??enoj arhitekturi"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Podr??ka za usagla??ene arhitekture"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Podr??ka za ??irilicu"
-
-#~ msgid "Desktops"
-#~ msgstr "Radna okru??enja"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 podr??ka"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 podr??ka"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 podr??ka"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 podr??ka"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Instalirajte ove pakete ako ??elite da prekompilirate jezgro."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE radno okru??enje"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Razvoj jezgra"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Razni paketi"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Mozilla paketi za x86 platformu"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib paketi podr??ke"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL baza podataka"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "Podr??ka razvoju paketa za neosnovnu arhitekturu"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Podr??ka za sirijski"
-
-#~ msgid "System"
-#~ msgstr "Sistem"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU-ov Emacs ure??iva?? teksta."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "Ovi paketi omogu??avaju pode??avanje IMAP ili Postfix servera po??te."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Ovi paketi pru??aju podr??ku usagla??avanja sa prethodnim izdanjima Red Hat "
-#~ "Enterprise Linux-a."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Nepodr??ane razvojne biblioteke"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Uobi??ajena radna stanica"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Podr??ka za ppc64 usagla??ene arhitekture"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na x86 usagla??enoj arhitekturi"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Podr??ka za x86 usagla??ene arhitekture"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "brazilski portugalski"
-
-#~ msgid "English"
-#~ msgstr "engleski"
-
-#~ msgid "French"
-#~ msgstr "francuski"
-
-#~ msgid "German"
-#~ msgstr "nema??ki"
-
-#~ msgid "Italian"
-#~ msgstr "italijanski"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 Dokumentacija"
-
-#~ msgid "Spanish"
-#~ msgstr "??panski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na brazilskom "
-#~ "portugalskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na engleskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na francuskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na nema??kom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na italijanskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na ??panskom."
-
-#~ msgid "Japanese"
-#~ msgstr "japanski"
-
-#~ msgid "Korean"
-#~ msgstr "korejski"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "pojednostavljeni kineski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na japanskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na korejskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na "
-#~ "pojednostavljenom kineskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na tradicionalnom "
-#~ "kineskom."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "tradicionalni kineski"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na ppc64 usagla??enoj arhitekturi"
-
-#~ msgid "Bengali"
-#~ msgstr "bengalski"
-
-#~ msgid "Gujarati"
-#~ msgstr "gud??aratski"
-
-#~ msgid "Hindi"
-#~ msgstr "hindu"
-
-#~ msgid "Punjabi"
-#~ msgstr "pend??apski"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 4 Dokumentacija"
-
-#~ msgid "Tamil"
-#~ msgstr "tamilski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na bengalskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na gud??aratskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na hindu jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na pend??apskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na tamilskom "
-#~ "jeziku."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Skladi??te ??vori??ta"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Podr??ka za u??voravanje"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Paketi koji pru??aju podr??ku za skladi??te ??vori??ta."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Paketi koji pru??aju podr??ku za GFS sa jednim ??vorom."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Podr??ka GFS sa jednim ??vorom"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "Ovi paketi pru??aju podr??ku usagla??avanja sa prethodnim izdanjima."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java izvr??no okru??enje i razvojni pribor"
-
-#~ msgid "Misc"
-#~ msgstr "Razno"
-
-#~ msgid "Misc packages"
-#~ msgstr "Razni paketi"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedija"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Programi za multimediju"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Paketi koji pru??aju dodatnu funkcionalnost za Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Radna stanica"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Programi i alati za radnu stanicu."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Podr??ka za virtualizaciju"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Usagla??ene arhitekture"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Biblioteke za usagla??ene arhitekture"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib paketi biblioteka"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "Paketi koji pru??aju funkcionalnost za uskla??enu arhitekturu."
+msgstr "Stariji paketi batmapiranih i vektorskih fontova"



From fedora-extras-commits at redhat.com  Sun Sep  9 00:18:55 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 20:18:55 -0400
Subject: rpms/geany/devel .cvsignore, 1.3, 1.4 geany.spec, 1.5, 1.6 sources, 
	1.3, 1.4
Message-ID: <200709090018.l890ItZs032076@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32030

Modified Files:
	.cvsignore geany.spec sources 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
- Update to version 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2007 02:46:58 -0000	1.3
+++ .cvsignore	9 Sep 2007 00:18:23 -0000	1.4
@@ -1 +1 @@
-geany-0.10.1.tar.bz2
+geany-0.11.tar.bz2


Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geany.spec	24 Feb 2007 02:46:58 -0000	1.5
+++ geany.spec	9 Sep 2007 00:18:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:      geany
-Version:   0.10.1
+Version:   0.11
 Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
@@ -59,6 +59,9 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
+- Update to version 0.11
+
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1
 - updating to 0.10.1 of geany
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2007 02:46:58 -0000	1.3
+++ sources	9 Sep 2007 00:18:23 -0000	1.4
@@ -1 +1 @@
-48b0ff7eec8e2a2c02180c83a8c883fd  geany-0.10.1.tar.bz2
+1a0a679f4107d8c584d4e173d400f87c  geany-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:51 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:51 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911qg5002448@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:53 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:53 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911rbm002457@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:56 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:56 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911wUc029401@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:02 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:02 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89122pX002466@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:05 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:05 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89125xT029410@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:08 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:08 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89128n7002476@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:12 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:12 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Cpj029419@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:14 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:14 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Fa1002485@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:16 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:16 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Hen029429@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:23 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:23 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Ole002494@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:25 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:25 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912QsE029438@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:28 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:28 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912SHb002504@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 02:30:32 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 8 Sep 2007 22:30:32 -0400
Subject: rpms/nagios/devel nagios.spec,1.33,1.34
Message-ID: <200709090230.l892UWLQ016538@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16498

Modified Files:
	nagios.spec 
Log Message:
release bump for rebuild


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nagios.spec	23 Aug 2007 02:12:36 -0000	1.33
+++ nagios.spec	9 Sep 2007 02:30:00 -0000	1.34
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -163,6 +163,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-4
+- rebuild
+
 * Wed Aug 22 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-3
 - Rebuild for ppc32 and license
 



From fedora-extras-commits at redhat.com  Sun Sep  9 02:36:47 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 8 Sep 2007 22:36:47 -0400
Subject: rpms/cacti/devel cacti.spec,1.10,1.11
Message-ID: <200709090236.l892aldJ016877@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16833

Modified Files:
	cacti.spec 
Log Message:
Silly rebuild


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	9 Sep 2007 02:36:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 6%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -103,6 +103,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Sun Sep  9 03:08:29 2007
From: fedora-extras-commits at redhat.com (Igor Pires Soares (igor))
Date: Sat, 8 Sep 2007 23:08:29 -0400
Subject: comps/po pt_BR.po,1.3,1.4
Message-ID: <200709090308.l8938TLV023952@cvs-int.fedora.redhat.com>

Author: igor

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23900

Modified Files:
	pt_BR.po 
Log Message:
Translation update



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pt_BR.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pt_BR.po	9 Sep 2007 03:07:59 -0000	1.4
@@ -16,7 +16,7 @@
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-03-18 16:22-0300\n"
+"PO-Revision-Date: 2007-09-09 00:04-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"
@@ -26,606 +26,827 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
+#: ../comps-fe5.xml.in.h:1
+#: ../comps-fe6.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2
+#: ../comps-fe6.xml.in.h:2
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas Administrativas"
 
-#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3
+#: ../comps-fe6.xml.in.h:3
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica????es"
 
-#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4
+#: ../comps-fe6.xml.in.h:4
+#: ../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-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5
+#: ../comps-fe6.xml.in.h:5
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ?? ??rabe"
 
-#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6
+#: ../comps-fe6.xml.in.h:6
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ?? Arm??nio"
 
-#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7
+#: ../comps-fe6.xml.in.h:7
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e Publica????o"
 
-#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8
+#: ../comps-fe6.xml.in.h:8
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema B??sico"
 
-#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9
+#: ../comps-fe6.xml.in.h:10
+#: ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32
+#: ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Ambientes de Trabalho"
 
-#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10
+#: ../comps-fe6.xml.in.h:11
+#: ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33
+#: ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Ambientes de trabalho"
 
-#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11
+#: ../comps-fe6.xml.in.h:12
+#: ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34
+#: ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12
+#: ../comps-fe6.xml.in.h:13
+#: ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36
+#: ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Ferramentas de Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13
+#: ../comps-fe6.xml.in.h:14
+#: ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14
+#: ../comps-fe6.xml.in.h:15
+#: ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39
+#: ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editores"
 
-#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
-#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
+#: ../comps-fe5.xml.in.h:15
+#: ../comps-fe6.xml.in.h:16
+#: ../comps-f7.xml.in.h:40
+#: ../comps-f8.xml.in.h:40
+#: ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Softwares Educacionais"
 
-#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
-#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
+#: ../comps-fe5.xml.in.h:16
+#: ../comps-fe6.xml.in.h:17
+#: ../comps-f7.xml.in.h:41
+#: ../comps-f8.xml.in.h:41
+#: ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Softwares educacionais para aprendizado"
 
-#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
-#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
+#: ../comps-fe5.xml.in.h:17
+#: ../comps-fe6.xml.in.h:18
+#: ../comps-f7.xml.in.h:42
+#: ../comps-f8.xml.in.h:42
+#: ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Engenharia e Ci??ncia"
[...2486 lines suppressed...]
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4619,7 +4728,6 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>telugu-support</id> <_name>Suporte??????Telugu</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -4640,7 +4748,6 @@
 #~ "x11-server-Xorg\">scim-m17n</packagereq> <packagereq type=\"conditional\" "
 #~ "requires=\"qt\">scim-qtimm</packagereq> </packagelist> </group> <group> "
 #~ "<id>turkish-support</id> <_name>Suporte??????Turco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"optional\">compat-db</packagereq> "
@@ -4671,7 +4778,6 @@
 #~ "<packagereq type=\"optional\">qt4</packagereq> </packagelist> </group> "
 #~ "<group> <id>lithuanian-support</id> <_name>Suporte??????Lituano</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>as</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4698,7 +4804,6 @@
 #~ "<_name>Autoria??e??Publica????o</_name> "
 #~ "<_description>Estas??ferramentas??permitem??criar??documenta????o??no??formato??DocBook??e??convert??-"
 #~ "la??para??HTML,??PDF,??PostScript??e??texto."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bg</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4719,7 +4824,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-"
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> <id>catalan-"
 #~ "support</id> <_name>Suporte??????Catal??o</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4742,7 +4846,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>brazilian-support</id> "
 #~ "<_name>Suporte??????Portugu??s??Brasileiro</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>br</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4755,7 +4858,6 @@
 #~ "requires=\"aspell\">aspell-br</packagereq> </packagelist> </group> "
 #~ "<group> <id>british-support</id> <_name>Suporte??????Ingl??s??Brit??nico</"
 #~ "_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>de</langonly> <packagelist> <packagereq type=\"default"
@@ -4776,7 +4878,6 @@
 #~ "packagelist> </group> <group> <id>graphical-internet</id> "
 #~ "<_name>Internet??em??Modo??Gr??fico</_name> "
 #~ "<_description>Este??grupo??inclui??clientes??gr??ficos??de??email,??Web??e??chat."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>es</langonly> <packagelist> <packagereq type=\"default"
@@ -4795,7 +4896,6 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-es</packagereq> </"
 #~ "packagelist> </group> <group> <id>swedish-support</id> "
 #~ "<_name>Suporte??????Sueco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>et</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4814,7 +4914,6 @@
 #~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
 #~ "\">kde-i18n-Estonian</packagereq> </packagelist> </group> <group> "
 #~ "<id>ethiopic-support</id> <_name>Suporte??????Et??ope</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fi</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4827,7 +4926,6 @@
 #~ "requires=\"kdelibs\">kde-i18n-Finnish</packagereq> </packagelist> </"
 #~ "group> <group> <id>faeroese-support</id> <_name>Suporte??????Faro??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fr</langonly> <packagelist> <packagereq type=\"default"
@@ -4849,7 +4947,6 @@
 #~ "packagelist> </group> <group> <id>gnome-desktop</id> "
 #~ "<_name>Ambiente??de????rea??de??Trabalho??GNOME</_name> <_description>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."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>he</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4862,7 +4959,6 @@
 #~ "\">fonts-hebrew</packagereq> <packagereq type=\"conditional\" requires="
 #~ "\"kdelibs\">kde-i18n-Hebrew</packagereq> </packagelist> </group> <group> "
 #~ "<id>hindi-support</id> <_name>Suporte??????Hindu</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hr</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4881,7 +4977,6 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
 #~ "75dpi</packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>Suporte??????Checo</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hu</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4901,7 +4996,6 @@
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> "
 #~ "<id>icelandic-support</id> <_name>Suporte??????Island??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>it</langonly> <packagelist> <packagereq type=\"default"
@@ -4920,7 +5014,6 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-it</packagereq> </"
 #~ "packagelist> </group> <group> <id>japanese-support</id> "
 #~ "<_name>Suporte??????Japon??s</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ml</langonly> <packagelist> <packagereq type=\"default"
@@ -4943,7 +5036,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>marathi-support</id> "
 #~ "<_name>Suporte??????Marati</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>or</langonly> <packagelist> <packagereq type=\"default"
@@ -4966,7 +5058,6 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>polish-support</id> <_name>Suporte??????Polon??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
@@ -4991,7 +5082,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>romanian-support</id> "
 #~ "<_name>Suporte??????Romeno</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
@@ -5020,7 +5110,6 @@
 #~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
 #~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
 #~ "support</id> <_name>Suporte??????S??rvio</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
@@ -5045,7 +5134,6 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
 #~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
 #~ "<_name>Suporte??????Eslovaco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -5070,7 +5158,6 @@
 #~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
 #~ "<id>sound-and-video</id> <_name>Som??e??V??deo</_name> "
 #~ "<_description>De??grava????o??de??CDs??at????a??reprodu????o??de??CDs??de????udio??e??arquivos??multim??dia,??este??grupo??de??pacotes??permite??lidar??com??som??e??v??deo??no??sistema."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
@@ -5095,7 +5182,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>telugu-support</id> "
 #~ "<_name>Suporte??????Telugu</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -5114,7 +5200,6 @@
 #~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
 #~ "packagelist> </group> <group> <id>turkish-support</id> "
 #~ "<_name>Suporte??????Turco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
@@ -5159,3 +5244,4 @@
 #~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
 #~ "group> <group> <id>core</id> <_name>Core</_name> "
 #~ "<_description>A??menor??instala????o??poss??vel"
+



From fedora-extras-commits at redhat.com  Sun Sep  9 03:28:10 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 8 Sep 2007 23:28:10 -0400
Subject: rpms/NetworkManager/OLPC-2 .cvsignore, 1.56,
	1.57 NetworkManager.spec, 1.165, 1.166 sources, 1.74, 1.75
Message-ID: <200709090328.l893SAAW024839@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24785

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Sat Sep 08 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2771
- Add more granular mesh device control, including the ability to lock
   device activation to one channel, and to start activation at a different
   step




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	30 Aug 2007 22:36:50 -0000	1.56
+++ .cvsignore	9 Sep 2007 03:27:37 -0000	1.57
@@ -15,3 +15,4 @@
 NetworkManager-0.6.5.svn2657.tar.gz
 NetworkManager-0.6.5.svn2658.tar.gz
 NetworkManager-0.6.5.svn2751.tar.gz
+NetworkManager-0.6.5.svn2771.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/NetworkManager.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- NetworkManager.spec	30 Aug 2007 22:36:50 -0000	1.165
+++ NetworkManager.spec	9 Sep 2007 03:27:37 -0000	1.166
@@ -8,7 +8,7 @@
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
 
-%define svn_revision svn2751
+%define svn_revision svn2771
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -162,6 +162,11 @@
 
 
 %changelog
+* Sat Sep 08 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2771
+- Add more granular mesh device control, including the ability to lock
+   device activation to one channel, and to start activation at a different
+   step
+
 * Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2751
 - Add a getFrequency call to wireless & mesh devices
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	30 Aug 2007 22:36:50 -0000	1.74
+++ sources	9 Sep 2007 03:27:37 -0000	1.75
@@ -1 +1 @@
-4dba7049e4aa0efe4f16e5569b05ac3c  NetworkManager-0.6.5.svn2751.tar.gz
+78707b15fcfbe1b54970a8dce8c94870  NetworkManager-0.6.5.svn2771.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 03:55:30 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 8 Sep 2007 23:55:30 -0400
Subject: rpms/sepostgresql/devel sepostgresql-8.2.4-1.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sepostgresql.init, 1.1,
	1.2 sepostgresql.spec, 1.1, 1.2 sepostgresql.te, 1.1, 1.2
Message-ID: <200709090355.l893tU1j025943@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25771

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sepostgresql.te 
Added Files:
	sepostgresql-8.2.4-1.patch 
Log Message:
- upstreamed SE-PostgreSQL 8.2.4-1.0 released.
  (there is no differences from 8.2.4-0.434.beta actually)
- The minor version of SE-PostgreSQL is ommited from the patch filename,
  because it is updated so frequently and CVS handles it full-replaced.



sepostgresql-8.2.4-1.patch:

--- NEW FILE sepostgresql-8.2.4-1.patch ---
diff -rpNU3 postgresql-8.2.4/configure.in sepostgresql-8.2.4/configure.in
--- postgresql-8.2.4/configure.in	2007-04-20 12:20:42.000000000 +0900
+++ sepostgresql-8.2.4/configure.in	2007-04-29 13:49:53.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.4/doc/postgres.tar.gz and sepostgresql-8.2.4/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.4/src/Makefile.global.in sepostgresql-8.2.4/src/Makefile.global.in
--- postgresql-8.2.4/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.4/src/backend/Makefile sepostgresql-8.2.4/src/backend/Makefile
--- postgresql-8.2.4/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.4/src/backend/access/common/heaptuple.c sepostgresql-8.2.4/src/backend/access/common/heaptuple.c
--- postgresql-8.2.4/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.4/src/backend/access/heap/heapam.c sepostgresql-8.2.4/src/backend/access/heap/heapam.c
--- postgresql-8.2.4/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
 		TransactionId xid[2];	/* xmax, xmin */
[...8179 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.4/src/include/utils/syscache.h sepostgresql-8.2.4/src/include/utils/syscache.h
--- postgresql-8.2.4/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.4/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2007 13:07:32 -0000	1.2
+++ .cvsignore	9 Sep 2007 03:54:57 -0000	1.3
@@ -1 +1,2 @@
 postgresql-8.2.4.tar.gz
+sepostgresql-8.2.4-0.434.patch


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.init	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.init	9 Sep 2007 03:54:57 -0000	1.2
@@ -9,7 +9,7 @@
 
 PGVERSION="8.2.4"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="0.434"
+SEPGVERSION="1.0"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.spec	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.spec	9 Sep 2007 03:54:57 -0000	1.2
@@ -8,12 +8,12 @@
 %define selinux_variants mls strict targeted
 
 # SE-PostgreSQL status extension
-%{!?sepgextension:%define sepgextension .beta}
+
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.2.4
-Release: 0.434%{?sepgextension}%{?dist}
+Release: 1.0%{?sepgextension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,7 +24,7 @@
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.4-0.434.patch
+Patch0: sepostgresql-8.2.4-1.patch
 Patch1: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
 Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
@@ -208,6 +208,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Mon Sep 1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-1.0
+- mark as SE-PostgreSQL 8.2.4-1.0
+
 * Thu Aug 28 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.434.beta
 - add Requires: postgresql-server, instead of Conflicts: tag
   (Some sharable files are removed from sepostgresql package)


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.te	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.te	9 Sep 2007 03:54:57 -0000	1.2
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 0.434)
+policy_module(sepostgresql, 1.0)
 
 gen_require(`
 	all_userspace_class_perms



From fedora-extras-commits at redhat.com  Sun Sep  9 04:20:55 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:20:55 -0400
Subject: rpms/xorg-x11-drv-amd/F-7
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch, NONE,
	1.1 sources, 1.9, 1.10 xorg-x11-drv-amd.spec, 1.15,
	1.16 lx-downscaling-fix.patch, 1.1, NONE
Message-ID: <200709090420.l894KtuN000348@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv308

Modified Files:
	sources xorg-x11-drv-amd.spec 
Added Files:
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch 
Removed Files:
	lx-downscaling-fix.patch 
Log Message:
update from OLPC-2 branch

fix-potential-CPU-GP-race-in-lx_get_source_color.patch:

--- NEW FILE fix-potential-CPU-GP-race-in-lx_get_source_color.patch ---
>From a3088c6ba17d136131f76993d789305256fde2bf Mon Sep 17 00:00:00 2001
From: Bernardo Innocenti <bernie at codewiz.org>
Date: Wed, 11 Jul 2007 08:55:17 -0400
Subject: [PATCH] Fix potential CPU/GP race in lx_get_source_color()
Organization: One Laptop Per Child

---
 src/amd_lx_exa.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/amd_lx_exa.c b/src/amd_lx_exa.c
index 3f079cd..69c8fa6 100644
--- a/src/amd_lx_exa.c
+++ b/src/amd_lx_exa.c
@@ -262,6 +262,9 @@ static unsigned int lx_get_source_color(PicturePtr pSrc, int x, int y, int dstFo
   
   bits += (y * stride) + (x * (bpp >> 3));
 
+  /* GP may still be working on this surface */
+  gp_wait_until_idle();
+
   /* Read the source value */
 
   switch(bpp) {
-- 
1.5.2.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2007 19:37:39 -0000	1.9
+++ sources	9 Sep 2007 04:20:23 -0000	1.10
@@ -1 +1 @@
-330632bf2bfe0c80094dc288788367ab  xf86-video-amd-0.0-git20070625.tar.bz2
+21dbe589b49f71b189d40f6aa5e0aab9  xf86-video-amd-0.0-git20070807.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/xorg-x11-drv-amd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-amd.spec	25 Jun 2007 19:37:39 -0000	1.15
+++ xorg-x11-drv-amd.spec	9 Sep 2007 04:20:23 -0000	1.16
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070625
+%define gitdate 20070807
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   22.%{gitdate}%{?dist}
+Release:   23.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -37,7 +37,9 @@
 
 Patch0: lx-disable-compression.patch
 Patch1: amd-build-fixes.patch
-Patch2: lx-downscaling-fix.patch
+
+# HACK HACK HACK (always stalls the pipeline or something like that)
+Patch2: fix-potential-CPU-GP-race-in-lx_get_source_color.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -46,7 +48,7 @@
 %setup -q -n %{tarball}-2.7.6.5
 %patch0 -p1 -b .jx
 %patch1 -p1 -b .build-fix
-%patch2 -p1 -b .lx-downscale-fix
+%patch2 -p1 -b .fix-color-race-HACK
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -80,6 +82,25 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Aug  7 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070807
+- Fix GX RGB overlay
+
+* Wed Jul 18 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070718
+- Get current framebuffer size from kernel framebuffer driver
+
+* Thu Jul 12 2007 Dan Williams <dcbw at rehdat.com> 0.0-23.20070711
+- Temporary hack for the font color corruption problem
+
+* Wed Jul 11 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070711
+- Fix display power management and dcon bugs
+
+* Fri Jul  6 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070706
+- Fix GTK drawing with GX acceleration (laptop.org #1869)
+
+* Thu Jul  5 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070705
+- Handle the LX video palette correctly
+- Remove upstreamed LX downscaling fix patch
+
 * Wed Jun 25 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070625
 - Udpate to git snapshot
    - Fix downscaling on the LX


--- lx-downscaling-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 04:24:51 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:24:51 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 sugar-datastore.spec, 1.22, 1.23
Message-ID: <200709090424.l894OpRS000577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv528

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
- New snapshot (async writes and ownership transfer on update/create)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	1 Aug 2007 20:29:02 -0000	1.21
+++ .cvsignore	9 Sep 2007 04:24:19 -0000	1.22
@@ -1,2 +1,3 @@
 sugar-datastore-0.2.2-git356b35a278.tar.bz2
 sugar-datastore-0.2.2-gita111996299.tar.bz2
+sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	1 Aug 2007 20:29:02 -0000	1.21
+++ sources	9 Sep 2007 04:24:19 -0000	1.22
@@ -1 +1 @@
-ed561e8debe2080d8b3e35104d4608a6  sugar-datastore-0.2.2-gita111996299.tar.bz2
+433ff1bdd4017e250e3d895897548f38  sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-datastore.spec	1 Aug 2007 20:29:02 -0000	1.22
+++ sugar-datastore.spec	9 Sep 2007 04:24:19 -0000	1.23
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070801git
-%define commitid a111996299
+%define alphatag 20070909git
+%define commitid 0a7e80f01a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.18.%{alphatag}a111996299
+Release: 0.19.%{alphatag}0a7e80f01a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
+- New snapshot (async writes and ownership transfer on update/create)
+
 * Wed Aug 01 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.18.20070801gita111996299
 - New snapshot (fix #2607)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 04:31:11 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:31:11 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.17, 1.18 sources, 
	1.17, 1.18 sugar-presence-service.spec, 1.17, 1.18
Message-ID: <200709090431.l894VBRQ000890@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv860

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Sep 2007 20:07:50 -0000	1.17
+++ .cvsignore	9 Sep 2007 04:30:38 -0000	1.18
@@ -1 +1,2 @@
 sugar-presence-service-0.65-gita79f7b6488.tar.bz2
+sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Sep 2007 20:07:50 -0000	1.17
+++ sources	9 Sep 2007 04:30:38 -0000	1.18
@@ -1 +1 @@
-5385e5faea01bb8499463accf2edbfd7  sugar-presence-service-0.65-gita79f7b6488.tar.bz2
+6fe20b5dc4e20c40bc24ada12e6ba2ce  sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sugar-presence-service.spec	4 Sep 2007 20:07:50 -0000	1.17
+++ sugar-presence-service.spec	9 Sep 2007 04:30:38 -0000	1.18
@@ -1,9 +1,9 @@
-%define alphatag 20070904git
-%define commitid a79f7b6488
+%define alphatag 20070909git
+%define commitid 3b1f4a0c42
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.12.%{alphatag}a79f7b6488
+Release: 0.13.%{alphatag}3b1f4a0c42
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
+- New snapshot
+
 * Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 04:38:13 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:38:13 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47 sugar.spec, 1.54, 1.55
Message-ID: <200709090438.l894cDCd001247@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1192

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	7 Sep 2007 21:02:50 -0000	1.45
+++ .cvsignore	9 Sep 2007 04:37:40 -0000	1.46
@@ -1 +1,2 @@
 sugar-0.65-gitc8700feccf.tar.bz2
+sugar-0.65-git6b6470ebcb.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	7 Sep 2007 21:02:50 -0000	1.46
+++ sources	9 Sep 2007 04:37:40 -0000	1.47
@@ -1 +1 @@
-c3ccf0f431a100fa6abe3cb44a81f07f  sugar-0.65-gitc8700feccf.tar.bz2
+1883a0c668d9a5e51ca12e2680610d34  sugar-0.65-git6b6470ebcb.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sugar.spec	7 Sep 2007 21:02:50 -0000	1.54
+++ sugar.spec	9 Sep 2007 04:37:40 -0000	1.55
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070907git
-%define commitid c8700feccf
+%define alphatag 20070909git
+%define commitid 6b6470ebcb
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.42.%{alphatag}c8700feccf
+Release: 0.43.%{alphatag}6b6470ebcb
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
+- New snapshot
+
 * Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 05:00:48 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 01:00:48 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 sugar-artwork.spec, 1.24, 1.25
Message-ID: <200709090500.l8950m8U002296@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2272

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2007 19:58:23 -0000	1.23
+++ .cvsignore	9 Sep 2007 05:00:09 -0000	1.24
@@ -1 +1,2 @@
 sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
+sugar-artwork-0.34-git2e13ad392d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	6 Sep 2007 19:58:23 -0000	1.23
+++ sources	9 Sep 2007 05:00:09 -0000	1.24
@@ -1 +1 @@
-c45cc536ac31f86a95377c1f93bb0a27  sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
+06860f882931ea996fd9e0af1ef0c591  sugar-artwork-0.34-git2e13ad392d.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-artwork.spec	6 Sep 2007 19:58:23 -0000	1.24
+++ sugar-artwork.spec	9 Sep 2007 05:00:09 -0000	1.25
@@ -1,10 +1,10 @@
-%define alphatag 20070906git
-%define commitid f89f6e00cc
+%define alphatag 20070909git
+%define commitid 2e13ad392d
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.24.%{alphatag}f89f6e00cc
+Release: 0.25.%{alphatag}2e13ad392d
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
+- New snapshot
+
 * Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 05:25:16 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 01:25:16 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.46, 1.47 sources, 1.47,
	1.48 sugar.spec, 1.55, 1.56
Message-ID: <200709090525.l895PGOY009125@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9081

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	9 Sep 2007 04:37:40 -0000	1.46
+++ .cvsignore	9 Sep 2007 05:24:44 -0000	1.47
@@ -1,2 +1,3 @@
 sugar-0.65-gitc8700feccf.tar.bz2
 sugar-0.65-git6b6470ebcb.tar.bz2
+sugar-0.65-gita1f5cece18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	9 Sep 2007 04:37:40 -0000	1.47
+++ sources	9 Sep 2007 05:24:44 -0000	1.48
@@ -1 +1 @@
-1883a0c668d9a5e51ca12e2680610d34  sugar-0.65-git6b6470ebcb.tar.bz2
+a8c99692c40eb2ee2b991a101c643a9f  sugar-0.65-gita1f5cece18.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sugar.spec	9 Sep 2007 04:37:40 -0000	1.55
+++ sugar.spec	9 Sep 2007 05:24:44 -0000	1.56
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %define alphatag 20070909git
-%define commitid 6b6470ebcb
+%define commitid a1f5cece18
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.43.%{alphatag}6b6470ebcb
+Release: 0.44.%{alphatag}a1f5cece18
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 06:34:46 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 02:34:46 -0400
Subject: rpms/kdelibs/devel kdelibs.spec, 1.223.2.14,
	1.223.2.15 kdelibs-3.92.0-conflict-kde3.patch, 1.1.2.1,
	NONE kdelibs-3.92.0-kde4home.diff, 1.1.2.1, NONE
Message-ID: <200709090634.l896YkkZ017584@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17535/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Removed Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.92.0-conflict-kde3.patch 
	kdelibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.14
retrieving revision 1.223.2.15
diff -u -r1.223.2.14 -r1.223.2.15
--- kdelibs.spec	16 Aug 2007 16:05:09 -0000	1.223.2.14
+++ kdelibs.spec	9 Sep 2007 06:34:13 -0000	1.223.2.15
@@ -1,10 +1,10 @@
 
 # TODO:
-# 1. package some noarch bits separately: apidocs, oxygen(icons).
+# 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.92.0
-Release: 4%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -32,11 +32,6 @@
 Requires: shared-mime-info
 #Requires: kde4-settings
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdelibs-%{version}-kde4home.diff
-# purpose of this patch?  -- Rex
-Patch1: kdelibs-3.92.0-conflict-kde3.patch
-
 Source1: kde4.sh
 Source2: kde4.csh
 
@@ -68,7 +63,7 @@
 BuildRequires: pcre-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel
-BuildRequires: strigi-devel >= 0.5.3
+BuildRequires: strigi-devel >= 0.5.5
 BuildRequires: zlib-devel
 
 %description
@@ -105,9 +100,6 @@
 %prep
 %setup -q -n kdelibs-%{version}
 
-#patch0 -p1 -b .kde4home
-%patch1 -p1 -b .conflict-kde3
-
 
 %build
 
@@ -131,23 +123,15 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-## unpackaged files
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
-rm -rf %{buildroot}%{_datadir}/emoticons
-
 
 %post
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
@@ -162,7 +146,6 @@
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/checkXML
 %exclude %{_kde4_bindir}/kconfig_compiler
-%exclude %{_kde4_bindir}/ksvgtopng
 %exclude %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_appsdir}/*
 # kdewidgets
@@ -174,11 +157,10 @@
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
-%{_kde4_iconsdir}/oxygen/
-#{_kde4_sharedir}/emoticons/*
 %{_kde4_sharedir}/locale/all_languages/
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
+%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
@@ -190,7 +172,6 @@
 %doc KDE4PORTING.html
 %{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kconfig_compiler
-%{_kde4_bindir}/ksvgtopng
 %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_bindir}/makekdewidgets
 %{_kde4_bindir}/makekdewidgets
@@ -205,6 +186,15 @@
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop kdeprint soversion conflict patch (fixed upstream)
+- remove icon-related code, pics/ is now in kdebase-runtime
+- BR strigi-devel >= 0.5.5 due to API changes
+- package hicolor presence_* icons which are not in hicolor-icon-theme
+- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - -devel: omit most (hopefully) extraneous Requires:
 - use macros.kde4


--- kdelibs-3.92.0-conflict-kde3.patch DELETED ---


--- kdelibs-3.92.0-kde4home.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:46 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:46 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709090908.l8998m7i000564@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:47 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:47 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709090908.l8998niF005121@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:49 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:49 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709090908.l8998nfi005130@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 10:32:11 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 06:32:11 -0400
Subject: rpms/geany/devel geany.spec,1.6,1.7
Message-ID: <200709091032.l89AWB7k015979@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15932

Modified Files:
	geany.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
- Fix Version entry in .desktop file



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geany.spec	9 Sep 2007 00:18:23 -0000	1.6
+++ geany.spec	9 Sep 2007 10:31:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.11
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -31,6 +31,9 @@
 %prep
 %setup -q
 
+# Fix incorrect version entry in desktop file
+sed -i -e 's/Version=1.1/Version=1.0/' geany.desktop.in
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -59,6 +62,9 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
+- Fix Version entry in .desktop file
+
 * Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
 - Update to version 0.11
 



From fedora-extras-commits at redhat.com  Sun Sep  9 10:48:24 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 9 Sep 2007 06:48:24 -0400
Subject: comps comps-f8.xml.in,1.99,1.100
Message-ID: <200709091048.l89AmOgi016710@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16648

Modified Files:
	comps-f8.xml.in 
Log Message:
added netgen, pharosc, pharosc-alliance, pharosc-magic, pharosc-synopsys and pharosc-xcircuit


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- comps-f8.xml.in	8 Sep 2007 12:53:02 -0000	1.99
+++ comps-f8.xml.in	9 Sep 2007 10:47:54 -0000	1.100
@@ -1210,6 +1210,7 @@
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>
       <packagereq type="optional">netcdf</packagereq>
+      <packagereq type="optional">netgen</packagereq>
       <packagereq type="optional">ngspice</packagereq>
       <packagereq type="optional">numpy</packagereq>
       <packagereq type="optional">octave</packagereq>
@@ -1221,6 +1222,11 @@
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">pcb</packagereq>
       <packagereq type="optional">perl-bioperl</packagereq>
+      <packagereq type="optional">pharosc</packagereq>
+      <packagereq type="optional">pharosc-alliance</packagereq>
+      <packagereq type="optional">pharosc-magic</packagereq>
+      <packagereq type="optional">pharosc-synopsys</packagereq>
+      <packagereq type="optional">pharosc-xcircuit</packagereq>
       <packagereq type="optional">pikdev</packagereq>
       <packagereq type="optional">piklab</packagereq>
       <packagereq type="optional">pikloops</packagereq>



From fedora-extras-commits at redhat.com  Sun Sep  9 11:19:29 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 07:19:29 -0400
Subject: rpms/geany/devel geany.spec,1.7,1.8
Message-ID: <200709091119.l89BJTcq026426@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26382

Modified Files:
	geany.spec 
Log Message:
Fix errors in email address in changelog



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geany.spec	9 Sep 2007 10:31:37 -0000	1.7
+++ geany.spec	9 Sep 2007 11:18:45 -0000	1.8
@@ -62,10 +62,10 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
-* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
 - Fix Version entry in .desktop file
 
-* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
 - Update to version 0.11
 
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1



From fedora-extras-commits at redhat.com  Sun Sep  9 11:21:14 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 07:21:14 -0400
Subject: rpms/geany/F-7 geany.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200709091121.l89BLECl026477@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26437

Modified Files:
	geany.spec sources 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
- Fix Version entry in .desktop file

* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
- Update to version 0.11




Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-7/geany.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geany.spec	24 Feb 2007 02:46:58 -0000	1.5
+++ geany.spec	9 Sep 2007 11:20:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.10.1
-Release:   1%{?dist}
+Version:   0.11
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -31,6 +31,9 @@
 %prep
 %setup -q
 
+# Fix incorrect version entry in desktop file
+sed -i -e 's/Version=1.1/Version=1.0/' geany.desktop.in
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -59,6 +62,12 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
+- Fix Version entry in .desktop file
+
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
+- Update to version 0.11
+
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1
 - updating to 0.10.1 of geany
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geany/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2007 02:46:58 -0000	1.3
+++ sources	9 Sep 2007 11:20:36 -0000	1.4
@@ -1 +1 @@
-48b0ff7eec8e2a2c02180c83a8c883fd  geany-0.10.1.tar.bz2
+1a0a679f4107d8c584d4e173d400f87c  geany-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 11:56:30 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 07:56:30 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-parallel-devel.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.15, 1.223.2.16
Message-ID: <200709091156.l89BuURd027729@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27709/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-parallel-devel.diff 
Log Message:
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.15
retrieving revision 1.223.2.16
diff -u -r1.223.2.15 -r1.223.2.16
--- kdelibs.spec	9 Sep 2007 06:34:13 -0000	1.223.2.15
+++ kdelibs.spec	9 Sep 2007 11:55:58 -0000	1.223.2.16
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -35,6 +35,9 @@
 Source1: kde4.sh
 Source2: kde4.csh
 
+# make -devel packages parallel-installable
+Patch0: kdelibs-3.93.0-parallel-devel.diff
+
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
 Requires: qt4 >= %{qt4_ver} 
@@ -76,8 +79,6 @@
 Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" == "kdelibs4"
-# Yes, we still have conflicts, in _bindir, _libdir
-Conflicts: kdelibs-devel
 %else
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
@@ -99,6 +100,7 @@
 
 %prep
 %setup -q -n kdelibs-%{version}
+%patch0 -p1
 
 
 %build
@@ -123,6 +125,31 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# remove files which conflict with KDE 3
+rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
+      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
+rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
+      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
+rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
+rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
+
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
 
 %post
 /sbin/ldconfig ||:
@@ -144,12 +171,10 @@
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
 %{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/checkXML
-%exclude %{_kde4_bindir}/kconfig_compiler
-%exclude %{_kde4_bindir}/kunittestmodrunner
+%exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
 # kdewidgets
-%exclude %{_kde4_bindir}/makekdewidgets
+%exclude %{_kde4_bindir}/makekdewidgets4
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 # ksgmltools2
@@ -157,7 +182,6 @@
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
-%{_kde4_sharedir}/locale/all_languages/
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
 %{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
@@ -165,27 +189,29 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/
+%exclude %{_kde4_libdir}/kde4/devel/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
 %defattr(-,root,root,-)
 %doc KDE4PORTING.html
-%{_kde4_bindir}/checkXML
-%{_kde4_bindir}/kconfig_compiler
-%{_kde4_bindir}/kunittestmodrunner
-%{_kde4_bindir}/makekdewidgets
-%{_kde4_bindir}/makekdewidgets
+%{_kde4_bindir}/kconfig_compiler4
+%{_kde4_bindir}/makekdewidgets4
 %{_kde4_appsdir}/kdewidgets/
 %dir %{_kde4_libdir}/kde4/plugins/designer
 %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %{_kde4_appsdir}/ksgmltools2/
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
-
+%{_kde4_libdir}/kde4/devel/
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- remove files which conflict with KDE 3
+- rename kconfig_compiler and makekdewidgets to *4
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- drop Conflicts: kdelibs-devel
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Sun Sep  9 12:04:06 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 08:04:06 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.20,1.21
Message-ID: <200709091204.l89C464I001499@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1409

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
- Add BuildRequires: emacs since emacs-el doesn't pull this in



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emacs-vm.spec	8 Sep 2007 22:01:29 -0000	1.20
+++ emacs-vm.spec	9 Sep 2007 12:03:33 -0000	1.21
@@ -26,7 +26,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -39,7 +39,7 @@
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs-el texinfo texinfo-tex
+BuildRequires: emacs emacs-el texinfo texinfo-tex
 
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
@@ -135,6 +135,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
+- Add BuildRequires: emacs since emacs-el doesn't pull this in
+
 * Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
 - Update for agreement with packaging guidelines - add versioned
   emacs requirement



From fedora-extras-commits at redhat.com  Sun Sep  9 12:25:27 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 08:25:27 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec, 1.6,
	1.7 kdepimlibs-3.92.0-kde4home.diff, 1.1, NONE
Message-ID: <200709091225.l89CPRie002270@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219/devel

Modified Files:
	kdepimlibs.spec 
Removed Files:
	kdepimlibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- list BR strigi-devel only once
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdepimlibs.spec	16 Aug 2007 20:55:39 -0000	1.6
+++ kdepimlibs.spec	9 Sep 2007 12:24:54 -0000	1.7
@@ -1,8 +1,8 @@
 
 Name: kdepimlibs
 
-Version: 3.92.0
-Release: 3%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,9 +12,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdepimlibs-%{version}-kde4home.diff
-
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -28,7 +25,6 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-BuildRequires: strigi-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: libacl-devel bzip2-devel gamin-devel strigi-devel zlib-devel
@@ -72,6 +68,23 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
 
 %post -p /sbin/ldconfig
 
@@ -94,14 +107,21 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- list BR strigi-devel only once
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: LGPLv2


--- kdepimlibs-3.92.0-kde4home.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 12:25:49 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 08:25:49 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.21,1.22
Message-ID: <200709091225.l89CPnjt002273@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2250

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-6
- Fix typo with start file creation



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- emacs-vm.spec	9 Sep 2007 12:03:33 -0000	1.21
+++ emacs-vm.spec	9 Sep 2007 12:25:16 -0000	1.22
@@ -12,7 +12,7 @@
 %if %($(pkg-config emacs) ; echo $?)
 %define emacs_version 21.4
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d/
+%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)
@@ -26,7 +26,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -92,7 +92,7 @@
 (cd lisp ; install -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{startd}
+install -d %{buildroot}/%{emacs_startdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -135,6 +135,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-6
+- Fix typo with start file creation
+
 * Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
 - Add BuildRequires: emacs since emacs-el doesn't pull this in
 



From fedora-extras-commits at redhat.com  Sun Sep  9 12:38:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sun, 9 Sep 2007 08:38:12 -0400
Subject: comps comps-f8.xml.in,1.100,1.101
Message-ID: <200709091238.l89CcC1W002842@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2799

Modified Files:
	comps-f8.xml.in 
Log Message:
Update the buildsys-build group.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- comps-f8.xml.in	9 Sep 2007 10:47:54 -0000	1.100
+++ comps-f8.xml.in	9 Sep 2007 12:37:41 -0000	1.101
@@ -594,17 +594,21 @@
       <packagereq type="mandatory">cpio</packagereq>
       <packagereq type="mandatory">diffutils</packagereq>
       <packagereq type="mandatory">fedora-release</packagereq>
+      <packagereq type="mandatory">findutils</packagereq>
+      <packagereq type="mandatory">gawk</packagereq>
       <packagereq type="mandatory">gcc</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
+      <packagereq type="mandatory">grep</packagereq>
       <packagereq type="mandatory">gzip</packagereq>
+      <packagereq type="mandatory">info</packagereq>
       <packagereq type="mandatory">make</packagereq>
       <packagereq type="mandatory">patch</packagereq>
-      <packagereq type="mandatory">perl</packagereq>
       <packagereq type="mandatory">redhat-rpm-config</packagereq>
       <packagereq type="mandatory">rpm-build</packagereq>
       <packagereq type="mandatory">sed</packagereq>
       <packagereq type="mandatory">tar</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
+      <packagereq type="mandatory">util-linux-ng</packagereq>
       <packagereq type="mandatory">which</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:29 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:29 -0700
Subject: [pkgdb] geany: jgu has requested watchcommits
Message-ID: <200709091348.l89DmW3S004837@app4.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the watchcommits acl on geany (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:37 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:37 -0700
Subject: [pkgdb] geany: jgu has requested commit
Message-ID: <200709091348.l89DmcVk001584@app3.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) 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 fedora-extras-commits at redhat.com  Sun Sep  9 13:48:47 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:47 -0700
Subject: [pkgdb] geany: jgu has requested watchcommits
Message-ID: <200709091348.l89DmmZw004846@app4.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the watchcommits acl on geany (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:49 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:49 -0700
Subject: [pkgdb] geany: jgu has requested commit
Message-ID: <200709091348.l89DmneT001593@app3.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the commit acl on geany (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 14:50:35 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 9 Sep 2007 10:50:35 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.23,1.24
Message-ID: <200709091450.l89EoZgJ021173@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21131

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
- remove the dependency from -extras to -arts, and use Obsoletes to
  provide an upgrade path



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xine-lib.spec	1 Sep 2007 09:19:38 -0000	1.23
+++ xine-lib.spec	9 Sep 2007 14:50:02 -0000	1.24
@@ -22,7 +22,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -79,12 +79,13 @@
 Summary:         aRts plugin for xine-lib
 Group:           System Environment/Libraries
 Requires:        %{name} = %{version}-%{release}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:       xine-lib-extras < 1.1.7-3
 
 %package extras
 Summary:         Additional plugins for xine-lib
 Group:           System Environment/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        %{name}-arts = %{version}-%{release}
 
 
 %description
@@ -348,6 +349,10 @@
 
 
 %changelog
+* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+  provide an upgrade path
+
 * Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
 - 1.1.8, "open" patch applied upstream.
 - Build XCB plugins by default for Fedora 8+ only.



From fedora-extras-commits at redhat.com  Sun Sep  9 14:59:35 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 10:59:35 -0400
Subject: rpms/shorewall/devel .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091459.l89ExZic021663@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:00:33 -0000	1.29
+++ .cvsignore	9 Sep 2007 14:59:03 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:00:33 -0000	1.36
+++ shorewall.spec	9 Sep 2007 14:59:03 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:00:33 -0000	1.29
+++ sources	9 Sep 2007 14:59:03 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:08:53 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 11:08:53 -0400
Subject: rpms/shorewall/FC-6 .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091508.l89F8rhL028002@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27958

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:26:24 -0000	1.29
+++ .cvsignore	9 Sep 2007 15:08:19 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:26:24 -0000	1.36
+++ shorewall.spec	9 Sep 2007 15:08:19 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:26:24 -0000	1.29
+++ sources	9 Sep 2007 15:08:19 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:11:59 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 11:11:59 -0400
Subject: rpms/shorewall/F-7 .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091511.l89FBxhn028215@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28162

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:17:21 -0000	1.29
+++ .cvsignore	9 Sep 2007 15:11:25 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:17:22 -0000	1.36
+++ shorewall.spec	9 Sep 2007 15:11:25 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:17:22 -0000	1.29
+++ sources	9 Sep 2007 15:11:25 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:26:35 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Sun, 9 Sep 2007 11:26:35 -0400
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709091526.l89FQZQX028820@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28695

Modified Files:
	pcmanx-gtk2.spec sources 
Log Message:
- upgrade to svn 355
- clean up packager's name in .spec file



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcmanx-gtk2.spec	16 Apr 2007 18:22:24 -0000	1.1
+++ pcmanx-gtk2.spec	9 Sep 2007 15:26:03 -0000	1.2
@@ -1,11 +1,11 @@
 # Source package is generated using:
 #        1. svn co https://svn.csie.net/pcmanx/trunk pcmanx-gtk2
 #        2. tar czvf pcmanx-gtk2.tar.gz pcmanx-gtk2
-%define    alphatag 336svn
+%define    alphatag 355svn
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
-Version:   0.3.5
-Release:   9.%{alphatag}%{?dist}
+Version:   0.3.6
+Release:   1.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,35 +84,38 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
+* Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
+- svn 355
+
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
 - remove README. Its content is not useful for end users
 
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
 - fix build in rawhide (automake 1.10)
 - use svn revision number instead of checkout date
 
-* Fri Apr  6 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
+* Fri Apr  6 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
 - fix svn build
 - svn 20070406
 
-* Fri Mar 30 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
+* Fri Mar 30 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
 - svn 20070330
 - enable libnotify support
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-5
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-5
 - Remove X-Fedora category in desktop file
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-4
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-4
 - Add gettext to BuildRequires
 - remove deprecated categories in desktop file
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-3
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-3
 - fix debuginfo rpm issues
 - fix desktop file issues
 - remove unnecessary update-desktop-database scriptlets (no Mimetypes entry in desktop file)
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-2
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-2
 - Move desktop-file-utils to BuildRequires
 
-* Wed Jan 10 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-1
+* Wed Jan 10 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 18:22:24 -0000	1.2
+++ sources	9 Sep 2007 15:26:03 -0000	1.3
@@ -1 +1 @@
-4be1a6f2ec82064128ee4c0addf4faed  pcmanx-gtk2.tar.gz
+3e9f23fb8f051a4c099599f27616a687  pcmanx-gtk2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:15:46 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:15:46 -0400
Subject: rpms/gcstar/FC-6 gcstar.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200709091715.l89HFkMb014171@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14093

Modified Files:
	gcstar.spec sources 
Log Message:
New upstream version: 1.2.0



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcstar.spec	8 Mar 2007 22:41:24 -0000	1.5
+++ gcstar.spec	9 Sep 2007 17:15:14 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gcstar.org/
 Source0:        http://download.gna.org/gcstar/gcstar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 
 BuildRequires:    desktop-file-utils
 Requires:         perl-Gtk2
+Obsoletes:        gcfilms
 
 %define desktop_vendor fedora
 
@@ -100,6 +101,12 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
+* Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
+  - Updated license tag
+* Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3
+  - Added Obsoletes tag
 * Fri Feb 23 2007 Tian <tian at c-sait.net> - 1.1.1-2
   - Execution bit on xdg-open
 * Fri Feb 16 2007 Tian <tian at c-sait.net> - 1.1.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 22:15:23 -0000	1.3
+++ sources	9 Sep 2007 17:15:14 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:17:32 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:17:32 -0400
Subject: rpms/gcstar/F-7 .cvsignore, 1.4, 1.5 gcstar.spec, 1.8, 1.9 sources, 
	1.3, 1.4
Message-ID: <200709091717.l89HHW0F014284@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version: 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 19:48:34 -0000	1.4
+++ .cvsignore	9 Sep 2007 17:16:59 -0000	1.5
@@ -1 +1 @@
-gcstar-1.1.1.tar.gz
+gcstar-1.2.0.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/gcstar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcstar.spec	16 Aug 2007 18:09:47 -0000	1.8
+++ gcstar.spec	9 Sep 2007 17:16:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        4%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
   - Updated license tag
 * Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 19:48:34 -0000	1.3
+++ sources	9 Sep 2007 17:16:59 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:19:34 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:19:34 -0400
Subject: rpms/gcstar/devel .cvsignore,1.4,1.5 sources,1.3,1.4
Message-ID: <200709091719.l89HJYMH014353@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14333

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version: 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 19:48:34 -0000	1.4
+++ .cvsignore	9 Sep 2007 17:19:01 -0000	1.5
@@ -1 +1 @@
-gcstar-1.1.1.tar.gz
+gcstar-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 19:48:34 -0000	1.3
+++ sources	9 Sep 2007 17:19:01 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:26:18 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:26:18 -0400
Subject: rpms/qucs/devel qucs.desktop,1.2,1.3 qucs.spec,1.16,1.17
Message-ID: <200709091726.l89HQI6v014660@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14614

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:25:46 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qucs.spec	29 Aug 2007 05:58:08 -0000	1.16
+++ qucs.spec	9 Sep 2007 17:25:46 -0000	1.17
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.0.12-3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:28:37 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:28:37 -0400
Subject: rpms/qucs/devel qucs.spec,1.17,1.18
Message-ID: <200709091728.l89HSb23014797@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14756

Modified Files:
	qucs.spec 
Log Message:



Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qucs.spec	9 Sep 2007 17:25:46 -0000	1.17
+++ qucs.spec	9 Sep 2007 17:28:05 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,7 +50,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-4
 - Modifiy qucs.desktop BZ 283941
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.0.12-3



From fedora-extras-commits at redhat.com  Sun Sep  9 17:31:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:31:15 -0400
Subject: rpms/qucs/F-7 qucs.desktop,1.2,1.3 qucs.spec,1.15,1.16
Message-ID: <200709091731.l89HVFTb014967@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/F-7/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:30:43 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/F-7/qucs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qucs.spec	18 Jun 2007 14:58:34 -0000	1.15
+++ qucs.spec	9 Sep 2007 17:30:43 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:32:39 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:32:39 -0400
Subject: rpms/qucs/FC-6 qucs.desktop,1.2,1.3 qucs.spec,1.14,1.15
Message-ID: <200709091732.l89HWdOr015097@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-6/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:32:06 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-6/qucs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qucs.spec	18 Jun 2007 15:22:59 -0000	1.14
+++ qucs.spec	9 Sep 2007 17:32:06 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:33:45 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:33:45 -0400
Subject: rpms/qucs/EL-4 qucs.desktop,1.2,1.3 qucs.spec,1.11,1.12
Message-ID: <200709091733.l89HXjxY015285@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15243

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-4/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:34:49 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:33:13 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-4/qucs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qucs.spec	18 Jun 2007 15:25:50 -0000	1.11
+++ qucs.spec	9 Sep 2007 17:33:13 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:34:55 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:34:55 -0400
Subject: rpms/qucs/EL-5 qucs.desktop,1.2,1.3 qucs.spec,1.14,1.15
Message-ID: <200709091734.l89HYtRx015398@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15351

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-5/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:34:23 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-5/qucs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qucs.spec	18 Jun 2007 15:27:09 -0000	1.14
+++ qucs.spec	9 Sep 2007 17:34:23 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:47:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 9 Sep 2007 13:47:12 -0400
Subject: rpms/gq/FC-6 gq.spec,1.3,1.4
Message-ID: <200709091747.l89HlCkR015955@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888/FC-6

Modified Files:
	gq.spec 
Log Message:

Add default-codeset to configure (FC-6 and devel branch)




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/FC-6/gq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gq.spec	21 Aug 2007 17:03:12 -0000	1.3
+++ gq.spec	9 Sep 2007 17:46:39 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:47:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 9 Sep 2007 13:47:15 -0400
Subject: rpms/gq/devel gq.spec,1.5,1.6
Message-ID: <200709091747.l89HlFOg015960@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888/devel

Modified Files:
	gq.spec 
Log Message:

Add default-codeset to configure (FC-6 and devel branch)




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/gq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gq.spec	21 Aug 2007 16:56:15 -0000	1.5
+++ gq.spec	9 Sep 2007 17:46:42 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:48:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Sun, 9 Sep 2007 13:48:59 -0400
Subject: rpms/hotwire/devel .cvsignore, 1.7, 1.8 hotwire.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200709091748.l89HmxLl016107@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/hotwire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16063

Modified Files:
	.cvsignore hotwire.spec sources 
Log Message:
0.595


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jul 2007 22:29:44 -0000	1.7
+++ .cvsignore	9 Sep 2007 17:48:27 -0000	1.8
@@ -1,6 +1 @@
-hotwire-0.450.zip
-hotwire-0.554.zip
-hotwire-0.556.zip
-hotwire-0.567.zip
-hotwire-0.575.zip
-hotwire-0.590.zip
+hotwire-0.595.zip


Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/hotwire.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hotwire.spec	11 Jul 2007 22:29:44 -0000	1.10
+++ hotwire.spec	9 Sep 2007 17:48:27 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: Hotwire Shell
 Name: hotwire
-Version: 0.590
+Version: 0.595
 Release: 1%{?dist}
 Source0: http://hotwire-shell.org/download/hotwire-%{version}.zip
 License: GPL
@@ -56,6 +56,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Sun Sep 09 2007 Colin Walters <walters at redhat.com> - 0.595-1
+- new upstream
+
 * Tue Jul 12 2007 Colin Walters <walters at redhat.com> - 0.590-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jul 2007 22:29:44 -0000	1.7
+++ sources	9 Sep 2007 17:48:27 -0000	1.8
@@ -1,2 +1 @@
-e465e180cd90df1b5c88c5648c996469  hotwire-0.575.zip
-13b9d559b725b3b36104f6f97ae3ede6  hotwire-0.590.zip
+2da79522e51904c78df9bd3dfb5e13ef  hotwire-0.595.zip



From fedora-extras-commits at redhat.com  Sun Sep  9 18:01:01 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Sep 2007 14:01:01 -0400
Subject: rpms/tango-icon-theme/F-7 tango-icon-theme.spec,1.4,1.5
Message-ID: <200709091801.l89I11r6017326@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673/F-7

Modified Files:
	tango-icon-theme.spec 
Log Message:
Fix dates in %changelog.


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/tango-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tango-icon-theme.spec	1 Sep 2007 22:23:41 -0000	1.4
+++ tango-icon-theme.spec	9 Sep 2007 18:00:27 -0000	1.5
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+* Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
 - Update to new upstream release (0.8.1)
 
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1



From fedora-extras-commits at redhat.com  Sun Sep  9 18:01:05 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Sep 2007 14:01:05 -0400
Subject: rpms/tango-icon-theme/devel tango-icon-theme.spec,1.4,1.5
Message-ID: <200709091801.l89I15ah021791@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673/devel

Modified Files:
	tango-icon-theme.spec 
Log Message:
Fix dates in %changelog.


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tango-icon-theme.spec	1 Sep 2007 22:21:33 -0000	1.4
+++ tango-icon-theme.spec	9 Sep 2007 18:00:31 -0000	1.5
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+* Sun Sep 09 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
 - Update to new upstream release (0.8.1)
 
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1



From fedora-extras-commits at redhat.com  Sun Sep  9 18:10:46 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 9 Sep 2007 14:10:46 -0400
Subject: rpms/jd/devel .cvsignore, 1.143, 1.144 jd.spec, 1.169, 1.170 sources,
	1.144, 1.145
Message-ID: <200709091810.l89IAkZj023020@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22996

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
- svn 1322



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- .cvsignore	6 Sep 2007 16:21:29 -0000	1.143
+++ .cvsignore	9 Sep 2007 18:10:13 -0000	1.144
@@ -1 +1 @@
-jd-1.9.6-svn1314.tgz
+jd-1.9.6-svn1322.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- jd.spec	6 Sep 2007 16:21:29 -0000	1.169
+++ jd.spec	9 Sep 2007 18:10:13 -0000	1.170
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1314
+%define         strtag        svn1322
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -84,6 +86,7 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
+find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -119,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
-- svn 1314
+* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
+- svn 1322
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	6 Sep 2007 16:21:29 -0000	1.144
+++ sources	9 Sep 2007 18:10:13 -0000	1.145
@@ -1 +1 @@
-2255ee977583bd11cd408a5d849a9c4e  jd-1.9.6-svn1314.tgz
+c2739df7a9ba803064f93beb6f87ed72  jd-1.9.6-svn1322.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 18:40:11 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Sun, 9 Sep 2007 14:40:11 -0400
Subject: rpms/strigi/devel strigi.spec,1.6,1.7
Message-ID: <200709091840.l89IeBeH025060@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029

Modified Files:
	strigi.spec 
Log Message:
* Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
- Rebuild for BuildID changes



Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- strigi.spec	11 Aug 2007 21:56:08 -0000	1.6
+++ strigi.spec	9 Sep 2007 18:39:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -109,6 +109,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
+- Rebuild for BuildID changes
+
 * Sat Aug 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
 - Update to 0.5.5 release
 



From fedora-extras-commits at redhat.com  Sun Sep  9 19:36:14 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun, 9 Sep 2007 15:36:14 -0400
Subject: rpms/php-pear/devel .cvsignore, 1.11, 1.12 php-pear.spec, 1.26,
	1.27 sources, 1.11, 1.12 pear-downloaddir.patch, 1.1,
	NONE pear-peclinstall.patch, 1.1, NONE
Message-ID: <200709091936.l89JaEiC000599@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv559

Modified Files:
	.cvsignore php-pear.spec sources 
Removed Files:
	pear-downloaddir.patch pear-peclinstall.patch 
Log Message:
update to 1.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jul 2007 18:31:05 -0000	1.11
+++ .cvsignore	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-PEAR-1.6.1.tgz
+PEAR-1.6.2.tgz
 XML_RPC-1.5.1.tgz
 Archive_Tar-1.3.2.tgz
 Console_Getopt-1.2.3.tgz


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- php-pear.spec	21 Aug 2007 11:34:25 -0000	1.26
+++ php-pear.spec	9 Sep 2007 19:35:42 -0000	1.27
@@ -12,8 +12,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.6.1
-Release: 2
+Version: 1.6.2
+Release: 1%{?dist}
 Epoch: 1
 License: PHP
 Group: Development/Languages
@@ -33,13 +33,6 @@
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 
-# To Avoid warnings when using pecl (un)install command
-# see  http://pear.php.net/bugs/bug.php?id=11420 
-Patch0: pear-peclinstall.patch
-# To avoid error when "system" download_dir is not writable for normal user.
-# see  http://pear.php.net/bugs/bug.php?id=11517
-Patch1: pear-downloaddir.patch
-
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg
@@ -63,6 +56,8 @@
     tar xzf  $archive --strip-components 1
 done
 
+# apply patches on used PEAR during install
+# -- no patch
 
 %build
 # This is an empty build section.
@@ -109,9 +104,9 @@
 install -m 644 -c %{SOURCE13} \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear     
 
+# apply patches on installed PEAR tree
 cd $RPM_BUILD_ROOT%{peardir} 
-patch -p4 <%{PATCH0}
-patch -p4 <%{PATCH1}
+# -- no patch
 
 # Why this file here ?
 rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
@@ -139,6 +134,11 @@
 %doc LICENSE
 
 %changelog
+* Sun Sep  9 2007 Remi Collet <Fedora at FamilleCollet.com> 1:1.6.2-1
+- update to 1.6.2
+- remove patches merged upstream
+- Fix : "pear install" hangs on non default channel (#283401)
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1:1.6.1-2
 - fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jul 2007 18:31:05 -0000	1.11
+++ sources	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-1476f0ec3917d68e3d7af1346a9a7b89  PEAR-1.6.1.tgz
+8658f584d0ba2648b795fe8b1d8998c2  PEAR-1.6.2.tgz
 1b516162ad65971b5fd04a7c279627ec  XML_RPC-1.5.1.tgz
 17d49e837b64df4e8f9124f829b22cd1  Archive_Tar-1.3.2.tgz
 d7618327f9302a7191893768982de823  Console_Getopt-1.2.3.tgz


--- pear-downloaddir.patch DELETED ---


--- pear-peclinstall.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 19:42:14 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 15:42:14 -0400
Subject: rpms/gnu-smalltalk/devel gst-2.3.6-pathfix.patch, NONE,
	1.1 gnu-smalltalk.spec, 1.22, 1.23
Message-ID: <200709091942.l89JgEf7000939@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv896

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-2.3.6-pathfix.patch 
Log Message:
Disable ppc64 temporarly

gst-2.3.6-pathfix.patch:

--- NEW FILE gst-2.3.6-pathfix.patch ---
--- orig/kernel/VFS.st
+++ mod/kernel/VFS.st
@@ -231,10 +231,7 @@ update: aspect
      filesystems specified by the subclasses upon image load."
 
     (aspect == #returnFromSnapshot or: [ aspect == #finishedSnapshot ]) ifTrue: [
-	Registry := LookupTable new.
-	self allSubclassesDo: [ :each |
-	    each fileSystems do: [ :fs | self register: fs forClass: each ]
-	]
+	Registry := nil.
     ].
     (aspect == #aboutToQuit or: [ aspect == #aboutToSnapshot ]) ifTrue: [
 	self allSubclassesDo: [ :each | each release ].
@@ -264,6 +261,12 @@ vfsFor: fileName name: fsName subPath: s
     "Create an instance of a subclass of the receiver, implementing the virtual
      file `subPath' inside the `fileName' archive.  fsName is the virtual
      filesystem name and is used to determine the subclass to be instantiated."
+    Registry isNil ifTrue: [
+        Registry := LookupTable new.
+	self allSubclassesDo: [ :each |
+	    each fileSystems do: [ :fs | self register: fs forClass: each ]
+	]
+    ].
     ^(Registry at: fsName) 
 	vfsFor: fileName name: fsName subPath: subPath!
 

Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnu-smalltalk.spec	6 Sep 2007 19:36:36 -0000	1.22
+++ gnu-smalltalk.spec	9 Sep 2007 19:41:41 -0000	1.23
@@ -1,14 +1,17 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-2.3.6-am.patch
+Patch2: gst-2.3.6-pathfix.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
+ExcludeArch: ppc64
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -61,7 +64,8 @@
 
 %prep
 %setup -q -n smalltalk-%{version}
-%patch1 -p1 -b .automake
+%patch1 -p1
+%patch2 -p1 -b .pfx
 
 %build
 # automake
@@ -142,6 +146,10 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-2
+- Remove build path from gst.im
+- Temporarly disable ppc64
+
 * Thu Sep  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:04:00 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:04:00 -0400
Subject: rpms/crossvc/devel .cvsignore, 1.4, 1.5 crossvc.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200709092004.l89K40Dm007674@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7593

Modified Files:
	.cvsignore crossvc.spec sources 
Log Message:
Add Req to qt-3.3.8-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jul 2007 17:02:05 -0000	1.4
+++ .cvsignore	9 Sep 2007 20:03:27 -0000	1.5
@@ -1 +1 @@
-crossvc-1.5.2pre.tgz
+crossvc-1.5.1-0-generic-src.tgz


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crossvc.spec	8 Aug 2007 17:52:58 -0000	1.6
+++ crossvc.spec	9 Sep 2007 20:03:27 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             crossvc
-Version:          1.5.2
-Release:          0.2%{?dist}
+Version:          1.5.1
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -21,6 +21,7 @@
 BuildRequires:    qt-devel >= 1:3.3
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
+Requires:	  qt >= 3.3.8-6
 
 Provides:         lincvs = %{version}-%{release}
 Obsoletes:        lincvs < 1.5.0
@@ -88,6 +89,10 @@
 
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
+- Downgrade to last stable release
+- Add Req to qt-3.3.8-6 (#246024)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-0.2
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jul 2007 17:02:05 -0000	1.4
+++ sources	9 Sep 2007 20:03:27 -0000	1.5
@@ -1 +1 @@
-9914bbf275a53dd5da60c8b7e20d81ab  crossvc-1.5.2pre.tgz
+50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 20:07:25 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:07:25 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.7,1.8
Message-ID: <200709092007.l89K7Pkx007890@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7811

Modified Files:
	crossvc.spec 
Log Message:
Increase release to avoid EVR issues


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crossvc.spec	9 Sep 2007 20:03:27 -0000	1.7
+++ crossvc.spec	9 Sep 2007 20:06:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -89,7 +89,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:11:34 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:11:34 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.8,1.9
Message-ID: <200709092011.l89KBYXQ008108@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8070

Modified Files:
	crossvc.spec 
Log Message:
Correct wrong Source entry in SPEC file


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- crossvc.spec	9 Sep 2007 20:06:52 -0000	1.8
+++ crossvc.spec	9 Sep 2007 20:11:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -10,8 +10,7 @@
 # This is a prerelease of crossvc-1.5.2 which I have got
 # from upstream via mail. This should contains a workaroud
 # for a bug in qt-3.3.8
-source0:	  crossvc-1.5.2pre.tgz
-#Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
+Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
 Patch1:		  crossvc-1.5.2-nocreate.patch
 
@@ -89,7 +88,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-6
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:15:06 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:15:06 -0400
Subject: rpms/crossvc/F-7 crossvc.spec,1.6,1.7
Message-ID: <200709092015.l89KF6WY008287@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8258

Modified Files:
	crossvc.spec 
Log Message:
Add Req to qt-3.3.8-6


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/crossvc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crossvc.spec	12 Aug 2007 18:34:20 -0000	1.6
+++ crossvc.spec	9 Sep 2007 20:14:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -17,6 +17,7 @@
 BuildRequires:    qt-devel >= 1:3.3
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
+Requires:	  qt >= 3.3.8-6
 
 Provides:         lincvs = %{version}-%{release}
 Obsoletes:        lincvs < 1.5.0
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
+- Add Req to qt-3.3.8-6 (#246024)
+
 * Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
 - Changing license tag
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:19:46 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:19:46 -0400
Subject: rpms/crossvc/devel crossvc-1.5.1-nocreate.patch, 1.2,
	1.3 crossvc.spec, 1.9, 1.10 crossvc-1.5.2-nocreate.patch, 1.1, NONE
Message-ID: <200709092019.l89KJk2n008520@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8495

Modified Files:
	crossvc.spec 
Added Files:
	crossvc-1.5.1-nocreate.patch 
Removed Files:
	crossvc-1.5.2-nocreate.patch 
Log Message:
Correct wrong patch in SPEC file

crossvc-1.5.1-nocreate.patch:

Index: crossvc-1.5.1-nocreate.patch
===================================================================
RCS file: crossvc-1.5.1-nocreate.patch
diff -N crossvc-1.5.1-nocreate.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.1-nocreate.patch	9 Sep 2007 20:19:44 -0000	1.3
@@ -0,0 +1,50 @@
+--- CrossVC/src/ImportDialog.ui.nocreate	2007-06-28 19:38:19.000000000 +0200
++++ CrossVC/src/ImportDialog.ui	2007-06-28 19:40:49.000000000 +0200
+@@ -651,14 +651,6 @@ enter the appropriate value or leave thi
+                 <property name="name">
+                     <cstring>unnamed</cstring>
+                 </property>
+-                <widget class="QCheckBox" row="1" column="0">
+-                    <property name="name">
+-                        <cstring>m_CreateDirs</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Create CVS directories while importing</string>
+-                    </property>
+-                </widget>
+                 <widget class="QCheckBox" row="0" column="0">
+                     <property name="name">
+                         <cstring>m_KeepFTime</cstring>
+--- CrossVC/src/Import.cpp.nocreate	2007-06-28 19:42:23.000000000 +0200
++++ CrossVC/src/Import.cpp	2007-06-28 19:43:13.000000000 +0200
+@@ -185,7 +185,6 @@ void Import::acceptCvs() {
+    int rshMode = dlg->rshMode();
+    int sshAccess = dlg->getSshPreset();
+    bool keepFTime = dlg->getKeepFTime();
+-   bool createDirs = dlg->getCreateDirs();
+    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
+    QStringList binaryWildcards = dlg->getBinaryWildcards();
+ 
+@@ -250,8 +249,7 @@ void Import::acceptCvs() {
+    files += " import ";
+    
+    if (keepFTime) files += "-d ";
+-   if (createDirs) files += "-C ";
+-    
++      
+   
+    //ignore files:
+    QString sIgnore = "-I ! ";
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-06-28 19:41:17.000000000 +0200
++++ CrossVC/src/ImportDialogImpl.cpp	2007-06-28 19:42:12.000000000 +0200
+@@ -691,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
+ 	return m_KeepFTime->isChecked();
+ }
+ 
+-bool ImportDialogImpl::getCreateDirs() {
+-	return m_CreateDirs->isChecked();
+-}
+-
+ void ImportDialogImpl::getAndSetModule() {
+    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
+    m_ModuleBrowser = NULL;


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- crossvc.spec	9 Sep 2007 20:11:01 -0000	1.9
+++ crossvc.spec	9 Sep 2007 20:19:44 -0000	1.10
@@ -12,7 +12,7 @@
 # for a bug in qt-3.3.8
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.2-nocreate.patch
+Patch1:		  crossvc-1.5.1-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


--- crossvc-1.5.2-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 20:20:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:20:55 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.10,1.11
Message-ID: <200709092020.l89KKttt008581@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8549

Modified Files:
	crossvc.spec 
Log Message:
Increase release


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- crossvc.spec	9 Sep 2007 20:19:44 -0000	1.10
+++ crossvc.spec	9 Sep 2007 20:20:23 -0000	1.11
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          6%{?dist}
+Release:          7%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -88,7 +88,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-6
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-7
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:23:25 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 16:23:25 -0400
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.7, 1.8
Message-ID: <200709092023.l89KNPvn008770@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739

Modified Files:
	eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec 
Log Message:
Fix MANIFEST.MF patch


eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 15:12:49 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 20:23:22 -0000	1.2
@@ -1,12 +1,13 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
- Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
- Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
-  lib/svnClientAdapter.jar,
-  lib/svnjavahl.jar,
-  lib/svnkit.jar,
+--- MANIFEST.MF.original	2007-09-09 14:40:20.000000000 -0400
++++ MANIFEST.MF	2007-09-09 14:42:09.000000000 -0400
+@@ -14,8 +14,8 @@
+  rg.tigris.subversion.svnclientadapter.commandline.parser,org.tigris.s
+  ubversion.svnclientadapter.javahl,org.tigris.subversion.svnclientadap
+  ter.svnkit,org.tigris.subversion.svnclientadapter.utils
+-Bundle-ClassPath: .,lib/svnClientAdapter.jar,lib/svnjavahl.jar,lib/svn
+- kit.jar,lib/ganymed.jar
++Bundle-ClassPath: lib/subclipse-core.jar,lib/svnClientAdapter.jar,lib/
++ svnjavahl.jar,lib/svnkit.jar,lib/ganymed.jar
+ Bundle-Name: %pluginName
+ Bundle-Localization: plugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-subclipse.spec	29 Aug 2007 05:34:31 -0000	1.7
+++ eclipse-subclipse.spec	9 Sep 2007 20:23:22 -0000	1.8
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -197,7 +197,7 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
+# adding the recently created jar to the plugin manifest
 patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars



From fedora-extras-commits at redhat.com  Sun Sep  9 21:40:39 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 9 Sep 2007 17:40:39 -0400
Subject: rpms/kleansweep/devel kleansweep.spec,1.2,1.3
Message-ID: <200709092140.l89Ledfl017489@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17446/devel

Modified Files:
	kleansweep.spec 
Log Message:



Index: kleansweep.spec
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/kleansweep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kleansweep.spec	24 Aug 2007 00:12:02 -0000	1.2
+++ kleansweep.spec	9 Sep 2007 21:40:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          kleansweep
 Version:       0.2.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Reclaim disk space by finding unneeded files
 
 License:       GPLv2
@@ -38,8 +38,8 @@
 
 desktop-file-install --vendor fedora             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "System"                    \
-  --delete-original                          \
+  --remove-category "System"                    \
+  --delete-original                             \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/kleansweep.desktop
 
 %find_lang %{name}
@@ -67,6 +67,9 @@
 
 
 %Changelog
+* Sun Sep 09 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 0.2.9-5
+- fixed duplicate kmenu entries
+
 * Thu Aug 23 2007 Chitlesh Goorah  <chitlesh [AT] fedoraproject DOT org> - 0.2.9-4
 - mass rebuild for fedora 8 - BuildID
 



From fedora-extras-commits at redhat.com  Sun Sep  9 21:40:58 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 17:40:58 -0400
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.2,
	1.3 eclipse-subclipse.spec, 1.8, 1.9
Message-ID: <200709092140.l89LewIN017562@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533

Modified Files:
	eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec 
Log Message:
Change MANIFEST.MF patch to be applied on %prep stage


eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 20:23:22 -0000	1.2
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 21:40:55 -0000	1.3
@@ -1,13 +1,10 @@
---- MANIFEST.MF.original	2007-09-09 14:40:20.000000000 -0400
-+++ MANIFEST.MF	2007-09-09 14:42:09.000000000 -0400
-@@ -14,8 +14,8 @@
-  rg.tigris.subversion.svnclientadapter.commandline.parser,org.tigris.s
-  ubversion.svnclientadapter.javahl,org.tigris.subversion.svnclientadap
-  ter.svnkit,org.tigris.subversion.svnclientadapter.utils
--Bundle-ClassPath: .,lib/svnClientAdapter.jar,lib/svnjavahl.jar,lib/svn
-- kit.jar,lib/ganymed.jar
-+Bundle-ClassPath: lib/subclipse-core.jar,lib/svnClientAdapter.jar,lib/
-+ svnjavahl.jar,lib/svnkit.jar,lib/ganymed.jar
- Bundle-Name: %pluginName
- Bundle-Localization: plugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
+ Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
+ Bundle-Version: 1.2.2
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
+  lib/svnClientAdapter.jar,
+  lib/svnjavahl.jar,
+  lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-subclipse.spec	9 Sep 2007 20:23:22 -0000	1.8
+++ eclipse-subclipse.spec	9 Sep 2007 21:40:55 -0000	1.9
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -29,11 +29,8 @@
 Source10:       subclipse-fetch-1.2.2.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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifest
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on %prep stage
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep  9 21:43:32 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 17:43:32 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.9,1.10
Message-ID: <200709092143.l89LhWI9017692@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17650

Modified Files:
	eclipse-subclipse.spec 
Log Message:
remove % used in a changelog comment



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-subclipse.spec	9 Sep 2007 21:40:55 -0000	1.9
+++ eclipse-subclipse.spec	9 Sep 2007 21:42:59 -0000	1.10
@@ -239,7 +239,7 @@
 
 %changelog
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
-- Change MANIFEST.MF patch to be applied on %prep stage
+- Change MANIFEST.MF patch to be applied on prep stage
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
 - Rebuild for selinux ppc32 issue.



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:41 -0700
Subject: [pkgdb] flpsed was added for nboyle
Message-ID: <200709092216.l89MGgnr007563@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package flpsed with summary WYSIWYG pseudo PostScript editor
Kevin Fenzi (kevin) has approved Package flpsed
Kevin Fenzi (kevin) has added a Fedora devel branch for flpsed with an owner of nboyle
Kevin Fenzi (kevin) has approved flpsed in Fedora devel
Kevin Fenzi (kevin) has approved Package flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, 7) updated by kevin
Message-ID: <200709092216.l89MGuCg007572@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, devel) updated by kevin
Message-ID: <200709092216.l89MGucn007581@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, 6) updated by kevin
Message-ID: <200709092216.l89MGvu6007591@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:25 -0400
Subject: rpms/flpsed - New directory
Message-ID: <200709092217.l89MHPAG024740@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed

Log Message:
Directory /cvs/extras/rpms/flpsed added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:27 -0400
Subject: rpms/flpsed/devel - New directory
Message-ID: <200709092217.l89MHRIg024759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed/devel

Log Message:
Directory /cvs/extras/rpms/flpsed/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:30 -0400
Subject: rpms/flpsed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092217.l89MHUEW024790@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed

Added Files:
	Makefile import.log 
Log Message:
Setup of module flpsed


--- NEW FILE Makefile ---
# Top level Makefile for module flpsed
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:33 -0400
Subject: rpms/flpsed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092217.l89MHX9d024808@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flpsed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: flpsed
# $Id: Makefile,v 1.1 2007/09/09 22:17:31 kevin Exp $
NAME := flpsed
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:22:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:34 -0700
Subject: [pkgdb] radeontool was added for till
Message-ID: <200709092222.l89MMZqR005881@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package radeontool with summary Backlight and video output configuration tool for radeon cards
Kevin Fenzi (kevin) has approved Package radeontool
Kevin Fenzi (kevin) has added a Fedora devel branch for radeontool with an owner of till
Kevin Fenzi (kevin) has approved radeontool in Fedora devel
Kevin Fenzi (kevin) has approved Package radeontool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on radeontool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on radeontool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on radeontool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:22:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:43 -0700
Subject: [pkgdb] radeontool (Fedora, devel) updated by kevin
Message-ID: <200709092222.l89MMiic007628@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved commit on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved build on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved approveacls on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved checkout on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on radeontool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:22:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:43 -0700
Subject: [pkgdb] radeontool (Fedora, 7) updated by kevin
Message-ID: <200709092222.l89MMiXC007640@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for radeontool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved commit on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved build on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved approveacls on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved checkout on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on radeontool (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:03 -0400
Subject: rpms/radeontool - New directory
Message-ID: <200709092223.l89MN3KN026056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool

Log Message:
Directory /cvs/extras/rpms/radeontool added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:07 -0400
Subject: rpms/radeontool/devel - New directory
Message-ID: <200709092223.l89MN75A026081@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool/devel

Log Message:
Directory /cvs/extras/rpms/radeontool/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:10 -0400
Subject: rpms/radeontool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092223.l89MNArD026119@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool

Added Files:
	Makefile import.log 
Log Message:
Setup of module radeontool


--- NEW FILE Makefile ---
# Top level Makefile for module radeontool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:13 -0400
Subject: rpms/radeontool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092223.l89MNDF2026145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module radeontool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: radeontool
# $Id: Makefile,v 1.1 2007/09/09 22:23:11 kevin Exp $
NAME := radeontool
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:27:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:18 -0700
Subject: [pkgdb] vbetool was added for till
Message-ID: <200709092227.l89MRIHR007665@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package vbetool with summary Run real-mode video BIOS code to alter hardware state
Kevin Fenzi (kevin) has approved Package vbetool
Kevin Fenzi (kevin) has added a Fedora devel branch for vbetool with an owner of till
Kevin Fenzi (kevin) has approved vbetool in Fedora devel
Kevin Fenzi (kevin) has approved Package vbetool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on vbetool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on vbetool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on vbetool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:27:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:24 -0700
Subject: [pkgdb] vbetool (Fedora, 7) updated by kevin
Message-ID: <200709092227.l89MROus005920@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for vbetool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved commit on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved build on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved approveacls on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved checkout on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on vbetool (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:27:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:24 -0700
Subject: [pkgdb] vbetool (Fedora, devel) updated by kevin
Message-ID: <200709092227.l89MROJ8005932@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved commit on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved build on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved approveacls on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved checkout on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on vbetool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:30:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:30:49 -0700
Subject: [pkgdb] pm-utils summary updated by kevin
Message-ID: <200709092230.l89MUnML005964@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package pm-utils summary to Power management utilities and scripts for Fedora

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:32 -0700
Subject: [pkgdb] ksirk was added for jwrdegoede
Message-ID: <200709092233.l89MXXoZ005998@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ksirk with summary Turnbased multiplayer board strategy game (conquer the world!)
Kevin Fenzi (kevin) has approved Package ksirk
Kevin Fenzi (kevin) has added a Fedora devel branch for ksirk with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ksirk in Fedora devel
Kevin Fenzi (kevin) has approved Package ksirk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ksirk (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ksirk (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ksirk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:38 -0700
Subject: [pkgdb] ksirk (Fedora, 7) updated by kevin
Message-ID: <200709092233.l89MXdYY006007@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ksirk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on ksirk (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:38 -0700
Subject: [pkgdb] ksirk (Fedora, devel) updated by kevin
Message-ID: <200709092233.l89MXdti006016@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on ksirk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:42 -0400
Subject: rpms/vbetool - New directory
Message-ID: <200709092233.l89MXg3w028514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool

Log Message:
Directory /cvs/extras/rpms/vbetool added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:48 -0400
Subject: rpms/vbetool/devel - New directory
Message-ID: <200709092233.l89MXmnB028544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool/devel

Log Message:
Directory /cvs/extras/rpms/vbetool/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:51 -0400
Subject: rpms/vbetool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092233.l89MXpSu028580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool

Added Files:
	Makefile import.log 
Log Message:
Setup of module vbetool


--- NEW FILE Makefile ---
# Top level Makefile for module vbetool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:53 -0400
Subject: rpms/vbetool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092233.l89MXrVu028607@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vbetool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vbetool
# $Id: Makefile,v 1.1 2007/09/09 22:33:51 kevin Exp $
NAME := vbetool
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:34:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:22 -0400
Subject: rpms/ksirk - New directory
Message-ID: <200709092234.l89MYMCC028818@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk

Log Message:
Directory /cvs/extras/rpms/ksirk added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:27 -0400
Subject: rpms/ksirk/devel - New directory
Message-ID: <200709092234.l89MYRkm028842@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk/devel

Log Message:
Directory /cvs/extras/rpms/ksirk/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:30 -0400
Subject: rpms/ksirk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092234.l89MYUET028875@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk

Added Files:
	Makefile import.log 
Log Message:
Setup of module ksirk


--- NEW FILE Makefile ---
# Top level Makefile for module ksirk
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:32 -0400
Subject: rpms/ksirk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709092234.l89MYWCT028899@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ksirk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ksirk
# $Id: Makefile,v 1.1 2007/09/09 22:34:30 kevin Exp $
NAME := ksirk
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:37:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:04 -0700
Subject: [pkgdb] isync was added for lkundrak
Message-ID: <200709092237.l89Mb56t007723@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package isync with summary Tool to synchronize IMAP4 and Maildir mailboxes
Kevin Fenzi (kevin) has approved Package isync
Kevin Fenzi (kevin) has added a Fedora devel branch for isync with an owner of lkundrak
Kevin Fenzi (kevin) has approved isync in Fedora devel
Kevin Fenzi (kevin) has approved Package isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, 7) updated by kevin
Message-ID: <200709092237.l89MbFBq006047@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, 6) updated by kevin
Message-ID: <200709092237.l89MbG4X006058@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092237.l89MbGl7006065@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora EPEL, 4) updated by kevin
Message-ID: <200709092237.l89MbGqb006083@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, devel) updated by kevin
Message-ID: <200709092237.l89MbGIF006074@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:34 -0400
Subject: rpms/isync - New directory
Message-ID: <200709092237.l89MbYHp029710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync

Log Message:
Directory /cvs/extras/rpms/isync added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:40 -0400
Subject: rpms/isync/devel - New directory
Message-ID: <200709092237.l89Mber9029734@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync/devel

Log Message:
Directory /cvs/extras/rpms/isync/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:44 -0400
Subject: rpms/isync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092237.l89Mbi1n029773@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync

Added Files:
	Makefile import.log 
Log Message:
Setup of module isync


--- NEW FILE Makefile ---
# Top level Makefile for module isync
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:46 -0400
Subject: rpms/isync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709092237.l89MbkVe029803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module isync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: isync
# $Id: Makefile,v 1.1 2007/09/09 22:37:44 kevin Exp $
NAME := isync
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:39:41 -0700
Subject: [pkgdb] svn2cl (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092239.l89Mdfvb006104@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for svn2cl
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on svn2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on svn2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on svn2cl (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:29 -0700
Subject: [pkgdb] hedgewars was added for jwrdegoede
Message-ID: <200709092242.l89MgTeb007764@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package hedgewars with summary 2D tankbattle game with the tanks replaced by hedgehogs
Kevin Fenzi (kevin) has approved Package hedgewars
Kevin Fenzi (kevin) has added a Fedora devel branch for hedgewars with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved hedgewars in Fedora devel
Kevin Fenzi (kevin) has approved Package hedgewars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hedgewars (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hedgewars (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hedgewars (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:35 -0700
Subject: [pkgdb] hedgewars (Fedora, 7) updated by kevin
Message-ID: <200709092242.l89MgZ26006127@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for hedgewars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on hedgewars (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:35 -0700
Subject: [pkgdb] hedgewars (Fedora, devel) updated by kevin
Message-ID: <200709092242.l89MgZU4006136@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on hedgewars (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:42:58 -0400
Subject: rpms/hedgewars - New directory
Message-ID: <200709092242.l89MgwWC031280@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars

Log Message:
Directory /cvs/extras/rpms/hedgewars added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:03 -0400
Subject: rpms/hedgewars/devel - New directory
Message-ID: <200709092243.l89Mh3nC031321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars/devel

Log Message:
Directory /cvs/extras/rpms/hedgewars/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:05 -0400
Subject: rpms/hedgewars Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092243.l89Mh5dm031354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars

Added Files:
	Makefile import.log 
Log Message:
Setup of module hedgewars


--- NEW FILE Makefile ---
# Top level Makefile for module hedgewars
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:08 -0400
Subject: rpms/hedgewars/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092243.l89Mh8bh031379@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hedgewars


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hedgewars
# $Id: Makefile,v 1.1 2007/09/09 22:43:06 kevin Exp $
NAME := hedgewars
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:43:28 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:43:28 -0400
Subject: rpms/flpsed/devel flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092243.l89MhSxX031538@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial import into CVS



--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:42:52 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:42:52 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:45 -0700
Subject: [pkgdb] xsc was added for limb
Message-ID: <200709092244.l89MijOT007777@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package xsc with summary A clone of the old vector graphics video game Star Castle
Kevin Fenzi (kevin) has approved Package xsc
Kevin Fenzi (kevin) has added a Fedora devel branch for xsc with an owner of limb
Kevin Fenzi (kevin) has approved xsc in Fedora devel
Kevin Fenzi (kevin) has approved Package xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, 6) updated by kevin
Message-ID: <200709092244.l89MisK7006166@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, 7) updated by kevin
Message-ID: <200709092244.l89Mit6i006175@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, devel) updated by kevin
Message-ID: <200709092244.l89MitA5006184@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:12 -0400
Subject: rpms/xsc - New directory
Message-ID: <200709092245.l89MjC1N031997@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc

Log Message:
Directory /cvs/extras/rpms/xsc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:19 -0400
Subject: rpms/xsc/devel - New directory
Message-ID: <200709092245.l89MjJph032027@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc/devel

Log Message:
Directory /cvs/extras/rpms/xsc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:22 -0400
Subject: rpms/xsc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092245.l89MjMwf032060@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc

Added Files:
	Makefile import.log 
Log Message:
Setup of module xsc


--- NEW FILE Makefile ---
# Top level Makefile for module xsc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:24 -0400
Subject: rpms/xsc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092245.l89MjO25032086@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xsc
# $Id: Makefile,v 1.1 2007/09/09 22:45:22 kevin Exp $
NAME := xsc
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:46:51 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:46:51 -0400
Subject: rpms/flpsed/F-7 flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092246.l89MkplG032597@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32455/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial CVS import


--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:46:19 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:46:19 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:48:12 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:48:12 -0400
Subject: rpms/flpsed/FC-6 flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092248.l89MmC4g000484@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial CVS import


--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:47:39 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:47:39 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:32 -0700
Subject: [pkgdb] gnome-web-photo was added for hadess
Message-ID: <200709092249.l89MnWEM007813@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gnome-web-photo with summary HTML pages thumbnailer
Kevin Fenzi (kevin) has approved Package gnome-web-photo
Kevin Fenzi (kevin) has added a Fedora devel branch for gnome-web-photo with an owner of hadess
Kevin Fenzi (kevin) has approved gnome-web-photo in Fedora devel
Kevin Fenzi (kevin) has approved Package gnome-web-photo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-web-photo (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-web-photo (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-web-photo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:46 -0700
Subject: [pkgdb] gnome-web-photo summary updated by kevin
Message-ID: <200709092249.l89MnlH2006234@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package gnome-web-photo summary to HTML pages thumbnailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:47 -0700
Subject: [pkgdb] gnome-web-photo (Fedora, devel) updated by kevin
Message-ID: <200709092249.l89MnlHS006243@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of gnome-web-photo in Fedora devel to hadess
Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-web-photo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:11 -0400
Subject: rpms/gnome-web-photo - New directory
Message-ID: <200709092250.l89MoBrt000937@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo

Log Message:
Directory /cvs/extras/rpms/gnome-web-photo added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:17 -0400
Subject: rpms/gnome-web-photo/devel - New directory
Message-ID: <200709092250.l89MoH5j000964@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo/devel

Log Message:
Directory /cvs/extras/rpms/gnome-web-photo/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:20 -0400
Subject: rpms/gnome-web-photo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092250.l89MoK6m001002@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-web-photo


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-web-photo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:22 -0400
Subject: rpms/gnome-web-photo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092250.l89MoMqZ001026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-web-photo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-web-photo
# $Id: Makefile,v 1.1 2007/09/09 22:50:20 kevin Exp $
NAME := gnome-web-photo
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:55:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:55:29 -0700
Subject: [pkgdb] cvs2cl (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092255.l89MtUWe006296@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cvs2cl
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cvs2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cvs2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cvs2cl (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:56:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:56:48 -0700
Subject: [pkgdb] cd-discid (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092256.l89Mun0Z006307@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cd-discid
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cd-discid (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cd-discid (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cd-discid (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 22:59:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:59:29 -0700
Subject: [pkgdb] abcde (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092259.l89MxT6t007862@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for abcde
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abcde (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abcde (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abcde (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Sun Sep  9 23:11:24 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Sun, 9 Sep 2007 19:11:24 -0400
Subject: rpms/xsc/devel xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092311.l89NBOHF008848@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8805/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:45:22 -0000	1.1
+++ .cvsignore	9 Sep 2007 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+xsc-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	9 Sep 2007 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 03:20:56 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:20:56 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100320.l8A3KvCu009246@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 03:20:59 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:20:59 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100321.l8A3L0lw008531@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 03:21:02 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:21:02 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100321.l8A3L3sx009255@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 04:22:02 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Mon, 10 Sep 2007 00:22:02 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.5,1.6
Message-ID: <200709100422.l8A4M25b021640@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21603

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
- New upstream release



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fvwm.spec	7 Sep 2007 02:19:24 -0000	1.5
+++ fvwm.spec	10 Sep 2007 04:21:30 -0000	1.6
@@ -20,6 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
+BuildRequires:	gnome-libs-devel librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -69,12 +70,6 @@
 chmod +x %{__perl_requires}
 
 
-# Work around FVWM bug #4208
-find . -name '*.in' -type f -print0 \
- | xargs -0 sed -i -e 's:@datarootdir@:@datadir@:'
-
-
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -116,7 +111,7 @@
 
 
 %changelog
-* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
 - New upstream release
 
 * Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5



From fedora-extras-commits at redhat.com  Mon Sep 10 04:55:07 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Mon, 10 Sep 2007 00:55:07 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.6,1.7
Message-ID: <200709100455.l8A4t7cj022805@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22760

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
- Don't add gnome-libs-devel to BR (not on ppc64?)



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fvwm.spec	10 Sep 2007 04:21:30 -0000	1.6
+++ fvwm.spec	10 Sep 2007 04:54:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fvwm
 Version:	2.5.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -20,7 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
-BuildRequires:	gnome-libs-devel librsvg2-devel
+BuildRequires:	librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
+- Don't add gnome-libs-devel to BR (not on ppc64?)
+
 * Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:19 -0400
Subject: rpms/perl-Set-IntSpan/devel .cvsignore, 1.6,
	1.7 perl-Set-IntSpan.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xJSU023100@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/devel

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Mar 2007 20:53:29 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:42 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Set-IntSpan.spec	13 Aug 2007 19:59:57 -0000	1.12
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
-Release:        2%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
 - License: GPL+ or Artistic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Mar 2007 20:53:29 -0000	1.6
+++ sources	10 Sep 2007 04:58:42 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:23 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:23 -0400
Subject: rpms/perl-Set-IntSpan/F-7 .cvsignore, 1.6, 1.7 perl-Set-IntSpan.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xNZI023106@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/F-7

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Mar 2007 20:53:29 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:50 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/perl-Set-IntSpan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Set-IntSpan.spec	25 Mar 2007 20:53:29 -0000	1.11
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:50 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Set-IntSpan/
 Source0:        http://www.cpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
+- License: GPL+ or Artistic
+
 * Sun Mar 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-1
 - 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Mar 2007 20:53:29 -0000	1.6
+++ sources	10 Sep 2007 04:58:50 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:26 -0400
Subject: rpms/perl-Set-IntSpan/FC-6 .cvsignore, 1.6,
	1.7 perl-Set-IntSpan.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xQ35023112@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/FC-6

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Mar 2007 17:14:41 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:53 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/perl-Set-IntSpan.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Set-IntSpan.spec	26 Mar 2007 17:14:41 -0000	1.10
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:53 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Set-IntSpan/
 Source0:        http://www.cpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
+- License: GPL+ or Artistic
+
 * Sun Mar 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-1
 - 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Mar 2007 17:14:41 -0000	1.6
+++ sources	10 Sep 2007 04:58:53 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 06:00:48 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Sep 2007 02:00:48 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-kde149703.diff, NONE,
	1.1.2.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1.2.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.16, 1.223.2.17
Message-ID: <200709100600.l8A60mte030675@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30649/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
Log Message:
fix kde#149703, kde#149704, kde#149705

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
diff -ur kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp
--- kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp	2007-08-29 23:53:46.000000000 +0200
+++ kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp	2007-09-10 06:09:18.000000000 +0200
@@ -341,6 +341,11 @@
 
     QStringList allFiles = componentData().dirs()->findAllResources("data", filter) + componentData().dirs()->findAllResources("data", _file);
 
+    if (allFiles.isEmpty() || allFiles.first().startsWith("/usr/"))
+    {
+      allFiles.prepend(KStandardDirs::locateLocal("data", filter));
+    }
+
     file = findMostRecentXMLFile( allFiles, doc );
 
     if ( file.isEmpty() )

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.16
retrieving revision 1.223.2.17
diff -u -r1.223.2.16 -r1.223.2.17
--- kdelibs.spec	9 Sep 2007 11:55:58 -0000	1.223.2.16
+++ kdelibs.spec	10 Sep 2007 06:00:08 -0000	1.223.2.17
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -37,6 +37,12 @@
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-3.93.0-parallel-devel.diff
+# fix kde#149703
+Patch1: kdelibs-3.93.0-kde149703.diff
+# fix kde#149704
+Patch2: kdelibs-3.93.0-kde149704.diff
+# fix kde#149705
+Patch3: kdelibs-3.93.0-kde149705.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -101,6 +107,9 @@
 %prep
 %setup -q -n kdelibs-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -206,6 +215,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- fix kde#149703, kde#149704, kde#149705
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - remove files which conflict with KDE 3
 - rename kconfig_compiler and makekdewidgets to *4



From fedora-extras-commits at redhat.com  Mon Sep 10 06:55:19 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Mon, 10 Sep 2007 02:55:19 -0400
Subject: rpms/system-config-language/devel sources,1.23,1.24
Message-ID: <200709100655.l8A6tJPs005802@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5747

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	20 Aug 2007 02:03:50 -0000	1.23
+++ sources	10 Sep 2007 06:54:41 -0000	1.24
@@ -1 +1 @@
-8f3b3e0545e27f32d78814c4c67f52c2  system-config-language-1.2.8.tar.bz2
+8a33fab49fed83a462312a146b3ce11c  system-config-language-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 06:57:05 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Mon, 10 Sep 2007 02:57:05 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.30,
	1.31
Message-ID: <200709100657.l8A6v59B005853@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5810

Modified Files:
	system-config-language.spec 
Log Message:
fix bug275711 and bug284331.



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-language.spec	20 Aug 2007 02:05:19 -0000	1.30
+++ system-config-language.spec	10 Sep 2007 06:56:32 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,7 +73,10 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
-* Mon Aug 13 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.8
+* Mon Sep 10 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.9
+- fix bug275711 and bug284331.
+
+* Mon Aug 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.8
 - re-fix bug251478.
 
 * Mon Aug 13 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.7



From fedora-extras-commits at redhat.com  Mon Sep 10 07:13:22 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 10 Sep 2007 03:13:22 -0400
Subject: rpms/curl/devel curl.spec,1.58,1.59
Message-ID: <200709100713.l8A7DMpA012489@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12449

Modified Files:
	curl.spec 
Log Message:
provide webclient


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- curl.spec	7 Sep 2007 12:50:04 -0000	1.58
+++ curl.spec	10 Sep 2007 07:12:49 -0000	1.59
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.16.4-ftp.patch
 Patch4: curl-7.16.4-nsspem.patch
+Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, pkgconfig, libidn-devel
@@ -102,6 +103,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
+- provide webclient (#225671)
+
 * Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
 - add support for the NSS PKCS#11 pem reader so the command-line is the
   same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)



From fedora-extras-commits at redhat.com  Mon Sep 10 07:18:46 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Sep 2007 03:18:46 -0400
Subject: rpms/uim/devel uim.spec,1.44,1.45 xinput.d-uim,1.2,1.3
Message-ID: <200709100718.l8A7IkI8012824@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12782

Modified Files:
	uim.spec xinput.d-uim 
Log Message:
* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
- Update the xinput script to support the new im-chooser.
  - bring up uim-toolbar-gtk-systray as the auxiliary program
  - support the config button.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- uim.spec	20 Aug 2007 02:08:10 -0000	1.44
+++ uim.spec	10 Sep 2007 07:18:14 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -384,6 +384,11 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
+- Update the xinput script to support the new im-chooser.
+  - bring up uim-toolbar-gtk-systray as the auxiliary program
+  - support the config button.
+
 * Mon Aug 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-6
 - uim-1.4.1-m17n-not-list-nil-im.patch: Fix appearing m17n-nil IME and crashing
   when it's selected. (#235331)


Index: xinput.d-uim
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/xinput.d-uim,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinput.d-uim	18 Apr 2005 12:51:45 -0000	1.2
+++ xinput.d-uim	10 Sep 2007 07:18:14 -0000	1.3
@@ -2,3 +2,6 @@
 XIM_PROGRAM=uim-xim
 GTK_IM_MODULE=uim
 QT_IM_MODULE=uim
+SHORT_DESC=UIM
+PREFERENCE_PROGRAM=/usr/bin/uim-pref-gtk
+AUXILIARY_PROGRAM=/usr/bin/uim-toolbar-gtk-systray



From fedora-extras-commits at redhat.com  Mon Sep 10 07:37:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 03:37:29 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.44, 1.45 sources, 1.45,
	1.46 system-config-samba.spec, 1.49, 1.50
Message-ID: <200709100737.l8A7bTAa013720@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13684

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
update Polish, Serbian translations
$RPM_BUILD_ROOT -> %%{buildroot}
don't add distro specific desktop categories from Fedora 8 on (#277591)
attempt to put the tool into the System -> Administration menu (#249440)
require libuser-python from Fedora 8 on (#251354)
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	31 Aug 2007 15:33:46 -0000	1.44
+++ .cvsignore	10 Sep 2007 07:36:56 -0000	1.45
@@ -1 +1 @@
-system-config-samba-1.2.50.tar.bz2
+system-config-samba-1.2.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	31 Aug 2007 15:33:46 -0000	1.45
+++ sources	10 Sep 2007 07:36:56 -0000	1.46
@@ -1 +1 @@
-f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2
+2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- system-config-samba.spec	31 Aug 2007 15:33:46 -0000	1.49
+++ system-config-samba.spec	10 Sep 2007 07:36:56 -0000	1.50
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.50
+Version: 1.2.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -21,7 +21,11 @@
 Requires: usermode >= 1.36
 Requires: samba
 Requires: samba-common
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+Requires: libuser-python
+%else
 Requires: libuser
+%endif
 Requires: htmlview
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
@@ -37,19 +41,20 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base       \
-  --add-category X-Red-Hat-ServerConfig       \
-  $RPM_BUILD_ROOT%{_datadir}/applications/system-config-samba.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} <= 7 && 0%{?rhel} <= 5
+  --add-category SystemSetup \
+%endif
+  %{buildroot}%{_datadir}/applications/system-config-samba.desktop
 
 %find_lang %name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -76,6 +81,14 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+- update Polish, Serbian translations
+- $RPM_BUILD_ROOT -> %%{buildroot}
+- don't add distro specific desktop categories from Fedora 8 on (#277591)
+- attempt to put the tool into the System -> Administration menu (#249440)
+- require libuser-python from Fedora 8 on (#251354)
+- make use of force tagging (since mercurial 0.9.4)
+
 * Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
 - bundle the GPL
 



From fedora-extras-commits at redhat.com  Mon Sep 10 07:43:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 03:43:36 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.41, 1.42 sources, 1.42, 
	1.43 system-config-samba.spec, 1.46, 1.47
Message-ID: <200709100743.l8A7haqW013956@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
update Polish, Serbian translations
$RPM_BUILD_ROOT -> %%{buildroot}
don't add distro specific desktop categories from Fedora 8 on (#277591)
attempt to put the tool into the System -> Administration menu (#249440)
require libuser-python from Fedora 8 on (#251354)
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	5 Sep 2007 07:25:38 -0000	1.41
+++ .cvsignore	10 Sep 2007 07:43:04 -0000	1.42
@@ -1 +1 @@
-system-config-samba-1.2.50.tar.bz2
+system-config-samba-1.2.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	5 Sep 2007 07:25:38 -0000	1.42
+++ sources	10 Sep 2007 07:43:04 -0000	1.43
@@ -1 +1 @@
-f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2
+2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- system-config-samba.spec	5 Sep 2007 07:25:38 -0000	1.46
+++ system-config-samba.spec	10 Sep 2007 07:43:04 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.50
+Version: 1.2.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -21,7 +21,11 @@
 Requires: usermode >= 1.36
 Requires: samba
 Requires: samba-common
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+Requires: libuser-python
+%else
 Requires: libuser
+%endif
 Requires: htmlview
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
@@ -37,19 +41,20 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base       \
-  --add-category X-Red-Hat-ServerConfig       \
-  $RPM_BUILD_ROOT%{_datadir}/applications/system-config-samba.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} <= 7 && 0%{?rhel} <= 5
+  --add-category SystemSetup \
+%endif
+  %{buildroot}%{_datadir}/applications/system-config-samba.desktop
 
 %find_lang %name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -76,6 +81,14 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+- update Polish, Serbian translations
+- $RPM_BUILD_ROOT -> %%{buildroot}
+- don't add distro specific desktop categories from Fedora 8 on (#277591)
+- attempt to put the tool into the System -> Administration menu (#249440)
+- require libuser-python from Fedora 8 on (#251354)
+- make use of force tagging (since mercurial 0.9.4)
+
 * Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
 - bundle the GPL
 



From fedora-extras-commits at redhat.com  Mon Sep 10 07:46:51 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:46:51 -0400
Subject: rpms/ksirk/devel ksirk-1.7-desktop.patch, NONE, 1.1 ksirk.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100746.l8A7kpg0014167@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14112/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ksirk-1.7-desktop.patch ksirk.spec 
Log Message:
initial ksirk import


ksirk-1.7-desktop.patch:

--- NEW FILE ksirk-1.7-desktop.patch ---
diff -up ksirk-1.7/ksirk/ksirk.desktop~ ksirk-1.7/ksirk/ksirk.desktop
--- ksirk-1.7/ksirk/ksirk.desktop~	2007-08-19 10:20:40.000000000 +0200
+++ ksirk-1.7/ksirk/ksirk.desktop	2007-08-19 10:20:40.000000000 +0200
@@ -1,20 +1,13 @@
 # KDE Config File
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=ksirk -caption "%c" %i %m
 Icon=ksirk.png
-MiniIcon=ksirk.png
 DocPath=ksirk/index.html
-Comment=KsirK is a computerized version of a strategy board game: Risk !
-Comment[fr]=KsirK est une version sur ordinateur du jeu de plateau de strat??gie: Risk !
-Comment[it]=Ksirk ?? la versione computerizzata del gioco da tavolo strategico: Risico! 
+Comment=A strategy board game
+Comment[fr]=Une jeu de plateau de strat??gie
+Comment[it]=Gioco da tavolo strategico
 Terminal=0
 Name=KsirK
-Name[de]=KsirK
-Name[it]=KsirK
-Name[fr]=KsirK
-GenericName=Risk Computerized
-GenericName[de]=
-GenericName[it]=Risico Computerizzato
-GenericName[fr]=Risk sur ordinateur
 Categories=Qt;KDE;Game;StrategyGame;


--- NEW FILE ksirk.spec ---
Name:           ksirk
Version:        1.7
Release:        2%{?dist}
Summary:        Turnbased multiplayer board strategy game (conquer the world!)
Group:          Amusements/Games
License:        GPLv2
URL:            http://home.gna.org/ksirk/index.shtml
Source0:        http://download.gna.org/ksirk/%{name}-%{version}.tar.bz2
Patch0:         ksirk-1.7-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  kdelibs3-devel kdegames-devel python gettext
Requires:       hicolor-icon-theme

%description
KsirK is a computerized version of a well known strategy board game. In the
current version, KsirK is a usable multi-player mono-machine game with a basic
AI. The goal of the game is simply to conquer the World... It is done by
attacking your neighbors with your armies. 


%prep
%setup -q
%patch0 -p1


%build
export CXXFLAGS="$RPM_OPT_FLAGS"
./waf.py configure --prefix=%{_prefix}
./waf.py %{?_smp_mflags} -v


%install
rm -rf $RPM_BUILD_ROOT
./waf.py install --destdir=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.la
%find_lang %{name}
# these are unversioned libs, which are only used by ksirk itself
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mv $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.so \
  $RPM_BUILD_ROOT%{_libdir}/%{name}
# install a wrapper which sets LD_CONFIG_PATH so that ksirk can find its libs
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.bin
cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
#!/bin/bash
export LD_LIBRARY_PATH=%{_libdir}/%{name}
exec %{name}.bin "$@"
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/locolor || :
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
touch --no-create %{_datadir}/icons/locolor || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/apps/%{name}
%{_datadir}/applications/kde/%{name}.desktop
%{_datadir}/icons/locolor
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_docdir}/HTML/%{name}


%changelog
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires

* Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:34:30 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:46:19 -0000	1.2
@@ -0,0 +1 @@
+ksirk-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:34:30 -0000	1.1
+++ sources	10 Sep 2007 07:46:19 -0000	1.2
@@ -0,0 +1 @@
+de0c295a7f7f87a2476fae647704f0f8  ksirk-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:47:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:47:54 -0400
Subject: rpms/hedgewars/devel hedgewars-0.9.0-debuginfo.patch, NONE,
	1.1 hedgewars.desktop, NONE, 1.1 hedgewars.png, NONE,
	1.1 hedgewars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100747.l8A7lsvP014275@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.desktop 
	hedgewars.png hedgewars.spec 
Log Message:
initial hedgewars import


hedgewars-0.9.0-debuginfo.patch:

--- NEW FILE hedgewars-0.9.0-debuginfo.patch ---
diff -up hedgewars-0.9.0/CMakeLists.txt~ hedgewars-0.9.0/CMakeLists.txt
--- hedgewars-0.9.0/CMakeLists.txt~	2007-08-26 15:09:29.000000000 +0200
+++ hedgewars-0.9.0/CMakeLists.txt	2007-08-26 15:09:29.000000000 +0200
@@ -33,7 +33,7 @@ if(WIN32 AND NOT UNIX)
 	set(CPACK_NSIS_CONTACT "unC0Rr at gmail.com")
 	set(CPACK_NSIS_MODIFY_PATH ON)
 else(WIN32 AND NOT UNIX)
-	set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
+	set(CPACK_STRIP_FILES "bin/hwengine")
 endif(WIN32 AND NOT UNIX)
 
 include(CPack)


--- NEW FILE hedgewars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hedgewars
Comment=2D tankbattle game with the tanks replaced by hedgehogs
Exec=hedgewars
Icon=hedgewars
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE hedgewars.spec ---
Name:           hedgewars
Version:        0.9.0
Release:        2%{?dist}
Summary:        2D tankbattle game with the tanks replaced by hedgehogs
Group:          Amusements/Games
License:        GPL+
URL:            http://www.hedgewars.org/
Source0:        http://hedgewars.org/download/hedgewars-src-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         hedgewars-0.9.0-debuginfo.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
Requires:       hicolor-icon-theme

%description
Hedgewars is a turn based strategy game but the real buzz is from watching the
devastation caused by those pesky hedgehogs with those fantastic weapons.

Each player controls a team of several hedgehogs. During the course of the
game, players take turns with one of their hedgehogs. They then use whatever
tools and weapons are available to attack and kill the opponents' hedgehogs,
thereby winning the game. Hedgehogs may move around the terrain in a variety
of ways, normally by walking and jumping but also by using particular tools
such as the "Rope" or "Parachute", to move to otherwise inaccessible areas.


%prep
%setup -q
%patch0 -p1


%build
cmake -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=%{_prefix} \
  -DDATA_INSTALL_DIR=%{_datadir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING Fonts_LICENSE.txt README
%{_bindir}/%{name}
%{_bindir}/hwengine
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup

* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:43:06 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:47:21 -0000	1.2
@@ -0,0 +1 @@
+hedgewars-src-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:43:06 -0000	1.1
+++ sources	10 Sep 2007 07:47:21 -0000	1.2
@@ -0,0 +1 @@
+5e1bd87ac9c7db761ff3427acdae6f89  hedgewars-src-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:49:06 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:49:06 -0400
Subject: rpms/ksirk/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709100749.l8A7n6Wh014413@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14354

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:34:30 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:48:34 -0000	1.2
@@ -0,0 +1 @@
+ksirk-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:34:30 -0000	1.1
+++ sources	10 Sep 2007 07:48:34 -0000	1.2
@@ -0,0 +1 @@
+de0c295a7f7f87a2476fae647704f0f8  ksirk-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:50:27 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:50:27 -0400
Subject: rpms/ksirk/F-7 ksirk-1.7-desktop.patch, NONE, 1.1 ksirk.spec, NONE,
	1.1
Message-ID: <200709100750.l8A7oRlZ014527@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14518

Added Files:
	ksirk-1.7-desktop.patch ksirk.spec 
Log Message:
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires


ksirk-1.7-desktop.patch:

--- NEW FILE ksirk-1.7-desktop.patch ---
diff -up ksirk-1.7/ksirk/ksirk.desktop~ ksirk-1.7/ksirk/ksirk.desktop
--- ksirk-1.7/ksirk/ksirk.desktop~	2007-08-19 10:20:40.000000000 +0200
+++ ksirk-1.7/ksirk/ksirk.desktop	2007-08-19 10:20:40.000000000 +0200
@@ -1,20 +1,13 @@
 # KDE Config File
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=ksirk -caption "%c" %i %m
 Icon=ksirk.png
-MiniIcon=ksirk.png
 DocPath=ksirk/index.html
-Comment=KsirK is a computerized version of a strategy board game: Risk !
-Comment[fr]=KsirK est une version sur ordinateur du jeu de plateau de strat??gie: Risk !
-Comment[it]=Ksirk ?? la versione computerizzata del gioco da tavolo strategico: Risico! 
+Comment=A strategy board game
+Comment[fr]=Une jeu de plateau de strat??gie
+Comment[it]=Gioco da tavolo strategico
 Terminal=0
 Name=KsirK
-Name[de]=KsirK
-Name[it]=KsirK
-Name[fr]=KsirK
-GenericName=Risk Computerized
-GenericName[de]=
-GenericName[it]=Risico Computerizzato
-GenericName[fr]=Risk sur ordinateur
 Categories=Qt;KDE;Game;StrategyGame;


--- NEW FILE ksirk.spec ---
Name:           ksirk
Version:        1.7
Release:        2%{?dist}
Summary:        Turnbased multiplayer board strategy game (conquer the world!)
Group:          Amusements/Games
License:        GPLv2
URL:            http://home.gna.org/ksirk/index.shtml
Source0:        http://download.gna.org/ksirk/%{name}-%{version}.tar.bz2
Patch0:         ksirk-1.7-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  kdelibs3-devel kdegames-devel python gettext
Requires:       hicolor-icon-theme

%description
KsirK is a computerized version of a well known strategy board game. In the
current version, KsirK is a usable multi-player mono-machine game with a basic
AI. The goal of the game is simply to conquer the World... It is done by
attacking your neighbors with your armies. 


%prep
%setup -q
%patch0 -p1


%build
export CXXFLAGS="$RPM_OPT_FLAGS"
./waf.py configure --prefix=%{_prefix}
./waf.py %{?_smp_mflags} -v


%install
rm -rf $RPM_BUILD_ROOT
./waf.py install --destdir=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.la
%find_lang %{name}
# these are unversioned libs, which are only used by ksirk itself
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mv $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.so \
  $RPM_BUILD_ROOT%{_libdir}/%{name}
# install a wrapper which sets LD_CONFIG_PATH so that ksirk can find its libs
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.bin
cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
#!/bin/bash
export LD_LIBRARY_PATH=%{_libdir}/%{name}
exec %{name}.bin "$@"
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/locolor || :
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
touch --no-create %{_datadir}/icons/locolor || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/apps/%{name}
%{_datadir}/applications/kde/%{name}.desktop
%{_datadir}/icons/locolor
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_docdir}/HTML/%{name}


%changelog
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires

* Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 10 07:50:46 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:50:46 -0400
Subject: comps comps-f7.xml.in,1.249,1.250 comps-f8.xml.in,1.101,1.102
Message-ID: <200709100750.l8A7okfZ014584@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14497

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
add ksirk hedgewars


Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- comps-f7.xml.in	20 Aug 2007 14:52:41 -0000	1.249
+++ comps-f7.xml.in	10 Sep 2007 07:50:16 -0000	1.250
@@ -1330,10 +1330,12 @@
       <packagereq type="optional">gnugo</packagereq>
       <packagereq type="optional">grhino</packagereq>
       <packagereq type="optional">gweled</packagereq>
+      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
+      <packagereq type="optional">ksirk</packagereq>
       <packagereq type="optional">ksudoku</packagereq>
       <packagereq type="optional">lacewing</packagereq>
       <packagereq type="optional">lincity-ng</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- comps-f8.xml.in	9 Sep 2007 12:37:41 -0000	1.101
+++ comps-f8.xml.in	10 Sep 2007 07:50:16 -0000	1.102
@@ -1470,10 +1470,12 @@
       <packagereq type="optional">gnugo</packagereq>
       <packagereq type="optional">grhino</packagereq>
       <packagereq type="optional">gweled</packagereq>
+      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
+      <packagereq type="optional">ksirk</packagereq>
       <packagereq type="optional">ksudoku</packagereq>
       <packagereq type="optional">lacewing</packagereq>
       <packagereq type="optional">lincity-ng</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 10 07:51:20 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:51:20 -0400
Subject: rpms/hedgewars/F-7 hedgewars-0.9.0-debuginfo.patch, NONE,
	1.1 hedgewars.desktop, NONE, 1.1 hedgewars.png, NONE,
	1.1 hedgewars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100751.l8A7pKG5014618@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14588

Modified Files:
	.cvsignore sources 
Added Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.desktop 
	hedgewars.png hedgewars.spec 
Log Message:
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup


hedgewars-0.9.0-debuginfo.patch:

--- NEW FILE hedgewars-0.9.0-debuginfo.patch ---
diff -up hedgewars-0.9.0/CMakeLists.txt~ hedgewars-0.9.0/CMakeLists.txt
--- hedgewars-0.9.0/CMakeLists.txt~	2007-08-26 15:09:29.000000000 +0200
+++ hedgewars-0.9.0/CMakeLists.txt	2007-08-26 15:09:29.000000000 +0200
@@ -33,7 +33,7 @@ if(WIN32 AND NOT UNIX)
 	set(CPACK_NSIS_CONTACT "unC0Rr at gmail.com")
 	set(CPACK_NSIS_MODIFY_PATH ON)
 else(WIN32 AND NOT UNIX)
-	set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
+	set(CPACK_STRIP_FILES "bin/hwengine")
 endif(WIN32 AND NOT UNIX)
 
 include(CPack)


--- NEW FILE hedgewars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hedgewars
Comment=2D tankbattle game with the tanks replaced by hedgehogs
Exec=hedgewars
Icon=hedgewars
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE hedgewars.spec ---
Name:           hedgewars
Version:        0.9.0
Release:        2%{?dist}
Summary:        2D tankbattle game with the tanks replaced by hedgehogs
Group:          Amusements/Games
License:        GPL+
URL:            http://www.hedgewars.org/
Source0:        http://hedgewars.org/download/hedgewars-src-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         hedgewars-0.9.0-debuginfo.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
Requires:       hicolor-icon-theme

%description
Hedgewars is a turn based strategy game but the real buzz is from watching the
devastation caused by those pesky hedgehogs with those fantastic weapons.

Each player controls a team of several hedgehogs. During the course of the
game, players take turns with one of their hedgehogs. They then use whatever
tools and weapons are available to attack and kill the opponents' hedgehogs,
thereby winning the game. Hedgehogs may move around the terrain in a variety
of ways, normally by walking and jumping but also by using particular tools
such as the "Rope" or "Parachute", to move to otherwise inaccessible areas.


%prep
%setup -q
%patch0 -p1


%build
cmake -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=%{_prefix} \
  -DDATA_INSTALL_DIR=%{_datadir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING Fonts_LICENSE.txt README
%{_bindir}/%{name}
%{_bindir}/hwengine
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup

* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:43:06 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:50:48 -0000	1.2
@@ -0,0 +1 @@
+hedgewars-src-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:43:06 -0000	1.1
+++ sources	10 Sep 2007 07:50:48 -0000	1.2
@@ -0,0 +1 @@
+5e1bd87ac9c7db761ff3427acdae6f89  hedgewars-src-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 08:44:46 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 04:44:46 -0400
Subject: rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-restart.patch, 
	NONE, 1.1 nspluginwrapper-0.9.91.5-rpc-error.patch, NONE,
	1.1 nspluginwrapper-0.9.91.5-rh.patch, 1.1,
	1.2 nspluginwrapper.spec, 1.16, 1.17
Message-ID: <200709100844.l8A8ikax023056@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23025

Modified Files:
	nspluginwrapper-0.9.91.5-rh.patch nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-restart.patch 
	nspluginwrapper-0.9.91.5-rpc-error.patch 
Log Message:
added upstream patches - RPC error handling and plugin restart

nspluginwrapper-0.9.91.5-restart.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-restart.patch ---
Index: src/npw-viewer.c
===================================================================
--- src/npw-viewer.c	(r??vision 466)
+++ src/npw-viewer.c	(r??vision 470)
@@ -2268,6 +2268,8 @@
 {
   D(bug("handle_NPP_New\n"));
 
+  rpc_connection_ref(connection);
+
   uint32_t instance_id;
   NPMIMEType plugin_type;
   int32_t mode;
@@ -2344,7 +2346,10 @@
 
   NPSavedData *save_area;
   NPError ret = g_NPP_Destroy(instance, &save_area);
-  return rpc_method_send_reply(connection, RPC_TYPE_INT32, ret, RPC_TYPE_NP_SAVED_DATA, save_area, RPC_TYPE_INVALID);
+
+  error = rpc_method_send_reply(connection, RPC_TYPE_INT32, ret, RPC_TYPE_NP_SAVED_DATA, save_area, RPC_TYPE_INVALID);
+  rpc_connection_unref(connection);
+  return error;
 }
 
 // NPP_SetWindow
@@ -2654,13 +2659,13 @@
 g_NPP_WriteReady(NPP instance, NPStream *stream)
 {
   if (instance == NULL)
-	return NPERR_INVALID_INSTANCE_ERROR;
+	return 0;
 
   if (plugin_funcs.writeready == NULL)
-	return NPERR_INVALID_FUNCTABLE_ERROR;
+	return 0;
 
   if (stream == NULL)
-	return NPERR_INVALID_PARAM;
+	return 0;
 
   D(bug("NPP_WriteReady instance=%p, stream=%p\n", instance, stream));
   int32 ret = plugin_funcs.writeready(instance, stream);
@@ -3086,7 +3091,7 @@
   if (g_user_agent)
 	free(g_user_agent);
   if (g_rpc_connection)
-	rpc_exit(g_rpc_connection);
+	rpc_connection_unref(g_rpc_connection);
 
   id_kill();
   return 0;
Index: src/npw-wrapper.c
===================================================================
--- src/npw-wrapper.c	(r??vision 466)
+++ src/npw-wrapper.c	(r??vision 470)
@@ -21,6 +21,7 @@
 #define _GNU_SOURCE 1 /* RTLD_DEFAULT */
 #include "sysdeps.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,6 +74,9 @@
 // Netscape exported functions
 static NPNetscapeFuncs mozilla_funcs;
 
+// NPAPI version nspluginwrapper supports
+static int npapi_version = 0;
+
 // Wrapper plugin data
 typedef struct {
   int initialized;
@@ -89,6 +93,7 @@
 typedef struct _PluginInstance {
   NPP instance;
   uint32_t instance_id;
+  rpc_connection_t *connection;
 } PluginInstance;
 
 // Plugin side data for an NPStream instance
@@ -101,7 +106,38 @@
 // Prototypes
 static void plugin_init(int is_NP_Initialize);
 static void plugin_exit(void);
+static NPError plugin_restart_if_needed(void);
 
+/*
+ *  Notes concerning NSPluginWrapper recovery model.
+ *
+ *  NSPluginWrapper will restart the Viewer if it detected to be
+ *  dead. It will not attempt to "replay" the plugin. This means that
+ *  if a plugin crashed, its window will remain grayed: only new
+ *  instances will start a new viewer.
+ *
+ *  Each PlugInstance holds a reference to the RPC connection it was
+ *  created with. g_rpc_connection can be seen as the "master"
+ *  connection (used to initialize and shutdown things). The RPC
+ *  connections are reference counted so that when the master
+ *  connection is set to a new one, previous connections are still
+ *  live. That way, old NPP instances are not passed down with the new
+ *  connection and thus can fail early/gracefully in subsequent calls
+ *  to NPP_*() functions.
+ *
+ *  TODO: make NPRuntime aware of per-plugin connections? This
+ *  shouldn't matter from the Wrapper side because npruntime requests
+ *  come from the Viewer side (see NPN_*() handlers). XXX: even with a
+ *  running script (NPClass handlers)?
+ */
+
+// Minimal time between two plugin restarts in sec
+#define MIN_RESTART_INTERVAL 1
+
+// Consume as many bytes as possible when we are not NPP_WriteReady()
+// XXX: move to a common place to Wrapper and Viewer
+#define NPERR_STREAM_BUFSIZ 65536
+
 // Helpers
 #ifndef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
@@ -110,7 +146,16 @@
 #define max(x, y) ((x) > (y) ? (x) : (y))
 #endif
 
+#define PLUGIN_INSTANCE(INSTANCE) plugin_instance(INSTANCE)
 
+static inline PluginInstance *plugin_instance(NPP instance)
+{
+  PluginInstance *plugin = (PluginInstance *)instance->pdata;
+  assert(plugin->instance == instance);
+  return plugin;
+}
+
+
 /* ====================================================================== */
 /* === RPC communication                                              === */
 /* ====================================================================== */
@@ -1177,13 +1222,13 @@
 
 // Creates a new instance of a plug-in
 static NPError
-invoke_NPP_New(NPMIMEType mime_type, NPP instance,
+invoke_NPP_New(PluginInstance *plugin, NPMIMEType mime_type,
 			   uint16_t mode, int16_t argc, char *argn[], char *argv[],
 			   NPSavedData *saved)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_NEW,
-								RPC_TYPE_UINT32, ((PluginInstance *)instance->pdata)->instance_id,
+								RPC_TYPE_UINT32, plugin->instance_id,
 								RPC_TYPE_STRING, mime_type,
 								RPC_TYPE_INT32, (int32_t)mode,
 								RPC_TYPE_ARRAY, RPC_TYPE_STRING, (uint32_t)argc, argn,
@@ -1197,7 +1242,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1216,17 +1261,25 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
-
+	
+  // Check if we need to restart the plug-in
+  NPError ret = plugin_restart_if_needed();
+  if (ret != NPERR_NO_ERROR)
+  	return ret;
+		
   PluginInstance *plugin = malloc(sizeof(*plugin));
   if (plugin == NULL)
 	return NPERR_OUT_OF_MEMORY_ERROR;
   memset(plugin, 0, sizeof(*plugin));
   plugin->instance = instance;
   plugin->instance_id = id_create(plugin);
+  plugin->connection = g_rpc_connection;
   instance->pdata = plugin;
 
+  rpc_connection_ref(plugin->connection);
+
   D(bug("NPP_New instance=%p\n", instance));
-  NPError ret = invoke_NPP_New(mime_type, instance, mode, argc, argn, argv, saved);
+  ret = invoke_NPP_New(plugin, mime_type, mode, argc, argn, argv, saved);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
   if (saved) {
@@ -1240,11 +1293,11 @@
 
 // Deletes a specific instance of a plug-in
 static NPError
-invoke_NPP_Destroy(NPP instance, NPSavedData **save)
+invoke_NPP_Destroy(PluginInstance *plugin, NPSavedData **save)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_DESTROY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -1254,7 +1307,7 @@
 
   int32_t ret;
   NPSavedData *save_area = NULL;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_NP_SAVED_DATA, &save_area,
 									RPC_TYPE_INVALID);
@@ -1280,28 +1333,29 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_Destroy instance=%p\n", instance));
-  NPError ret = invoke_NPP_Destroy(instance, save);
+  NPError ret = invoke_NPP_Destroy(plugin, save);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
-  PluginInstance *plugin = instance->pdata;
-  if (plugin) {
-	id_remove(plugin->instance_id);
-	free(plugin);
-	instance->pdata = NULL;
-  }
+  rpc_connection_unref(plugin->connection);
 
+  id_remove(plugin->instance_id);
+  free(plugin);
+  instance->pdata = NULL;
   return ret;
 }
 
 // Tells the plug-in when a window is created, moved, sized, or destroyed
 static NPError
-invoke_NPP_SetWindow(NPP instance, NPWindow *window)
+invoke_NPP_SetWindow(PluginInstance *plugin, NPWindow *window)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_SET_WINDOW,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_WINDOW, window,
 								RPC_TYPE_INVALID);
 
@@ -1311,7 +1365,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1328,20 +1382,23 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_SetWindow instance=%p\n", instance));
-  NPError ret = invoke_NPP_SetWindow(instance, window);
+  NPError ret = invoke_NPP_SetWindow(plugin, window);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
 
 // Allows the browser to query the plug-in for information
 static NPError
-invoke_NPP_GetValue(NPP instance, NPPVariable variable, void *value)
+invoke_NPP_GetValue(PluginInstance *plugin, NPPVariable variable, void *value)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_GET_VALUE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_INT32, variable,
 								RPC_TYPE_INVALID);
 
@@ -1355,7 +1412,7 @@
   case RPC_TYPE_STRING:
 	{
 	  char *str = NULL;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1384,7 +1441,7 @@
   case RPC_TYPE_INT32:
 	{
 	  int32_t n = 0;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INT32, &n, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INT32, &n, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1396,7 +1453,7 @@
   case RPC_TYPE_BOOLEAN:
 	{
 	  uint32_t b = 0;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_BOOLEAN, &b, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_BOOLEAN, &b, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1408,7 +1465,7 @@
   case RPC_TYPE_NP_OBJECT:
 	{
 	  NPObject *npobj = NULL;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_NP_OBJECT, &npobj, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_NP_OBJECT, &npobj, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1427,6 +1484,9 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   switch (rpc_type_of_NPPVariable(variable)) {
   case RPC_TYPE_STRING:
@@ -1440,14 +1500,14 @@
   }
 
   D(bug("NPP_GetValue instance=%p, variable=%d\n", instance, variable));
-  NPError ret = invoke_NPP_GetValue(instance, variable, value);
+  NPError ret = invoke_NPP_GetValue(plugin, variable, value);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
 
 // Sets information about the plug-in
 static NPError
-invoke_NPP_SetValue(NPP instance, NPPVariable variable, void *value)
+invoke_NPP_SetValue(PluginInstance *plugin, NPPVariable variable, void *value)
 {
   UNIMPLEMENTED();
 
@@ -1459,20 +1519,23 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_SetValue instance=%p, variable=%d\n", instance, variable));
-  NPError ret = invoke_NPP_SetValue(instance, variable, value);
+  NPError ret = invoke_NPP_SetValue(plugin, variable, value);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return NPERR_GENERIC_ERROR;
 }
 
 // Notifies the instance of the completion of a URL request
 static void
-invoke_NPP_URLNotify(NPP instance, const char *url, NPReason reason, void *notifyData)
+invoke_NPP_URLNotify(PluginInstance *plugin, const char *url, NPReason reason, void *notifyData)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_URL_NOTIFY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_STRING, url,
 								RPC_TYPE_INT32, reason,
 								RPC_TYPE_NP_NOTIFY_DATA, notifyData,
@@ -1483,7 +1546,7 @@
 	return;
   }
 
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
+  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INVALID);
   
   if (error != RPC_ERROR_NO_ERROR)
 	npw_perror("NPP_URLNotify() wait for reply", error);
@@ -1494,19 +1557,22 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   D(bug("NPP_URLNotify instance=%p, url='%s', reason=%d, notifyData=%p\n", instance, url, reason, notifyData));
-  invoke_NPP_URLNotify(instance, url, reason, notifyData);
+  invoke_NPP_URLNotify(plugin, url, reason, notifyData);
   D(bug(" done\n"));
 }
 
 // Notifies a plug-in instance of a new data stream
 static NPError
-invoke_NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
+invoke_NPP_NewStream(PluginInstance *plugin, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_NEW_STREAM,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_STRING, type,
 								RPC_TYPE_UINT32, ((StreamInstance *)stream->pdata)->stream_id,
 								RPC_TYPE_STRING, stream->url,
@@ -1524,7 +1590,7 @@
 
   int32_t ret;
   uint32_t r_stype;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_UINT32, &r_stype,
 									RPC_TYPE_NP_NOTIFY_DATA, &stream->notifyData,
@@ -1544,6 +1610,9 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   StreamInstance *stream_pdata = malloc(sizeof(*stream_pdata));
   if (stream_pdata == NULL)
@@ -1555,18 +1624,18 @@
   stream->pdata = stream_pdata;
 
   D(bug("NPP_NewStream instance=%p\n", instance));
-  NPError ret = invoke_NPP_NewStream(instance, type, stream, seekable, stype);
+  NPError ret = invoke_NPP_NewStream(plugin, type, stream, seekable, stype);
   D(bug(" return: %d [%s], stype=%s\n", ret, string_of_NPError(ret), string_of_NPStreamType(*stype)));
   return ret;
 }
 
 // Tells the plug-in that a stream is about to be closed or destroyed
 static NPError
-invoke_NPP_DestroyStream(NPP instance, NPStream *stream, NPReason reason)
+invoke_NPP_DestroyStream(PluginInstance *plugin, NPStream *stream, NPReason reason)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_DESTROY_STREAM,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INT32, reason,
 								RPC_TYPE_INVALID);
@@ -1577,7 +1646,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1594,9 +1663,12 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_DestroyStream instance=%p\n", instance));
-  NPError ret = invoke_NPP_DestroyStream(instance, stream, reason);
+  NPError ret = invoke_NPP_DestroyStream(plugin, stream, reason);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
   StreamInstance *stream_pdata = stream->pdata;
@@ -1611,11 +1683,11 @@
 
 // Provides a local file name for the data from a stream
 static void
-invoke_NPP_StreamAsFile(NPP instance, NPStream *stream, const char *fname)
+invoke_NPP_StreamAsFile(PluginInstance *plugin, NPStream *stream, const char *fname)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_STREAM_AS_FILE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_STRING, fname,
 								RPC_TYPE_INVALID);
@@ -1625,7 +1697,7 @@
 	return;
   }
 
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
+  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR)
 	npw_perror("NPP_StreamAsFile() wait for reply", error);
@@ -1636,35 +1708,38 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   D(bug("NPP_StreamAsFile instance=%p\n", instance));
-  invoke_NPP_StreamAsFile(instance, stream, fname);
+  invoke_NPP_StreamAsFile(plugin, stream, fname);
   D(bug(" done\n"));
 }
 
 // Determines maximum number of bytes that the plug-in can consume
 static int32
-invoke_NPP_WriteReady(NPP instance, NPStream *stream)
+invoke_NPP_WriteReady(PluginInstance *plugin, NPStream *stream)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_WRITE_READY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
 	npw_perror("NPP_WriteReady() invoke", error);
-	return 0;
+	return NPERR_STREAM_BUFSIZ;
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
 	npw_perror("NPP_WriteReady() wait for reply", error);
-	return 0;
+	return NPERR_STREAM_BUFSIZ;
   }
 
   return ret;
@@ -1674,10 +1749,13 @@
 g_NPP_WriteReady(NPP instance, NPStream *stream)
 {
   if (instance == NULL)
-	return -1;
+	return 0;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return 0;
 
   D(bug("NPP_WriteReady instance=%p\n", instance));
-  int32 ret = invoke_NPP_WriteReady(instance, stream);
+  int32 ret = invoke_NPP_WriteReady(plugin, stream);
   D(bug(" return: %d\n", ret));
   return ret;
 }
@@ -1685,11 +1763,11 @@
 
 // Delivers data to a plug-in instance
 static int32
-invoke_NPP_Write(NPP instance, NPStream *stream, int32 offset, int32 len, void *buf)
+invoke_NPP_Write(PluginInstance *plugin, NPStream *stream, int32 offset, int32 len, void *buf)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_WRITE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INT32, offset,
 								RPC_TYPE_ARRAY, RPC_TYPE_CHAR, len, buf,
@@ -1701,7 +1779,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1718,16 +1796,19 @@
 {
   if (instance == NULL)
 	return -1;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return -1;
 
   D(bug("NPP_Write instance=%p\n", instance));
-  int32 ret = invoke_NPP_Write(instance, stream, offset, len, buf);
+  int32 ret = invoke_NPP_Write(plugin, stream, offset, len, buf);
   D(bug(" return: %d\n", ret));
   return ret;
 }
 
 
 // Requests a platform-specific print operation for an embedded or full-screen plug-in
-static void invoke_NPP_Print(NPP instance, NPPrint *PrintInfo)
+static void invoke_NPP_Print(PluginInstance *plugin, NPPrint *PrintInfo)
 {
   NPPrintCallbackStruct *platformPrint;
   switch (PrintInfo->mode) {
@@ -1746,9 +1827,9 @@
 	platform_print_id = id_create(platformPrint);
   D(bug(" platformPrint=%p\n", platformPrint));
 
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_PRINT,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_UINT32, platform_print_id,
 								RPC_TYPE_NP_PRINT, PrintInfo,
 								RPC_TYPE_INVALID);
@@ -1759,7 +1840,7 @@
   }
 
   uint32_t pluginPrinted;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_BOOLEAN, &pluginPrinted,
 									RPC_TYPE_INVALID);
 
@@ -1780,17 +1861,20 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   if (PrintInfo == NULL)
 	return;
 
   D(bug("NPP_Print instance=%p\n", instance));
-  invoke_NPP_Print(instance, PrintInfo);
+  invoke_NPP_Print(plugin, PrintInfo);
   D(bug(" done\n"));
 }
 
 // Delivers a platform-specific window event to the instance
-static int16 invoke_NPP_HandleEvent(NPP instance, void *event)
+static int16 invoke_NPP_HandleEvent(PluginInstance *plugin, void *event)
 {
   UNIMPLEMENTED();
 
@@ -1801,9 +1885,12 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_HandleEvent instance=%p\n", instance));
-  int16 ret = invoke_NPP_HandleEvent(instance, event);
+  int16 ret = invoke_NPP_HandleEvent(plugin, event);
   D(bug(" return: ret\n", ret));
   return ret;
 }
@@ -2206,10 +2293,10 @@
 g_LONG64_NPP_WriteReady(NPP instance, void *stream)
 {
   if (instance == NULL)
-	return -1L;
+	return 0;
 
   if (stream == NULL)
-	return -1L;
+	return 0;
 
   return (int64)(int32)g_NPP_WriteReady(instance, NP_STREAM32(stream));
 }
@@ -2310,6 +2397,30 @@
 }
 
 // Provides global initialization for a plug-in
+static NPError
+invoke_NP_Initialize(uint32_t npapi_version)
+{
+  int error = rpc_method_invoke(g_rpc_connection,
+								RPC_METHOD_NP_INITIALIZE,
+								RPC_TYPE_UINT32, npapi_version,
+								RPC_TYPE_INVALID);
+
+  if (error != RPC_ERROR_NO_ERROR) {
+	npw_perror("NP_Initialize() invoke", error);
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+  }
+
+  int32_t ret;
+  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
+
+  if (error != RPC_ERROR_NO_ERROR) {
+	npw_perror("NP_Initialize() wait for reply", error);
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+  }
+
+  return ret;
+}
+
 NPError
 NP_Initialize(NPNetscapeFuncs *moz_funcs, NPPluginFuncs *plugin_funcs)
 {
@@ -2374,26 +2485,9 @@
 
   // pass down common NPAPI version supported by both the underlying
   // browser and the thunking capabilities of nspluginwrapper
-  uint32_t version = min(moz_funcs->version, plugin_funcs->version);
+  npapi_version = min(moz_funcs->version, plugin_funcs->version);
 
-  int error = rpc_method_invoke(g_rpc_connection,
-								RPC_METHOD_NP_INITIALIZE,
-								RPC_TYPE_UINT32, (uint32_t)version,
-								RPC_TYPE_INVALID);
-
-  if (error != RPC_ERROR_NO_ERROR) {
-	npw_perror("NP_Initialize() invoke", error);
-	return NPERR_MODULE_LOAD_FAILED_ERROR;
-  }
-
-  int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
-
-  if (error != RPC_ERROR_NO_ERROR) {
-	npw_perror("NP_Initialize() wait for reply", error);
-	return NPERR_MODULE_LOAD_FAILED_ERROR;
-  }
-
+  NPError ret = invoke_NP_Initialize(npapi_version);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
@@ -2657,7 +2751,7 @@
   }
 
   if (g_rpc_connection) {
-	rpc_exit(g_rpc_connection);
+	rpc_connection_unref(g_rpc_connection);
 	g_rpc_connection = NULL;
   }
 
@@ -2708,3 +2802,40 @@
 	g_plugin.description = NULL;
   }
 }
+
+static NPError plugin_restart(void)
+{
+  if (g_plugin.is_wrapper)
+	return NPERR_NO_ERROR;
+
+  // Shut it down    
+  plugin_exit();
+  g_plugin.initialized = 0;
+  g_plugin.viewer_pid = -1;
+  g_plugin.is_wrapper = 0;
+
+  // And start it again
+  plugin_init(1);
+  if (g_plugin.initialized <= 0)
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+
+  return invoke_NP_Initialize(npapi_version);
+}
+
+static NPError plugin_restart_if_needed(void)
+{
+  if (rpc_status(g_rpc_connection) != RPC_STATUS_ACTIVE) {
+	static time_t last_restart = 0;
+	time_t now = time(NULL);
+	if (now - last_restart < MIN_RESTART_INTERVAL)
+	  return NPERR_GENERIC_ERROR;
+	last_restart = now;
+
+	D(bug("Restart plugins viewer\n"));
+	NPError ret = plugin_restart();
+	D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
+	return ret;
+  }
+
+  return NPERR_NO_ERROR;
+}
Index: src/rpc.c
===================================================================
--- src/rpc.c	(r??vision 466)
+++ src/rpc.c	(r??vision 470)
@@ -289,6 +289,7 @@
 // Client / Server connection
 struct rpc_connection_t {
   int type;
+  int refcnt;
   int status;
   int socket;
   char *socket_path;
@@ -301,6 +302,22 @@
   char send_buffer[BUFSIZ];
 };
 
+// Increment connection reference count
+void rpc_connection_ref(rpc_connection_t *connection)
+{
+  if (connection)
+	++connection->refcnt;
+}
+
+// Decrement connection reference count and destroy it if it reaches zero
+void rpc_connection_unref(rpc_connection_t *connection)
+{
+  if (connection && --connection->refcnt == 0) {
+	D(bug("Close unused connection\n"));
+	rpc_exit(connection);
+  }
+}
+
 // Returns connection status
 static inline int _rpc_status(rpc_connection_t *connection)
 {
@@ -417,6 +434,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_SERVER;
+  connection->refcnt = 1;
   connection->status = RPC_STATUS_CLOSED;
   connection->socket = -1;
   connection->server_thread_active = 0;
@@ -468,6 +486,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_CLIENT;
+  connection->refcnt = 1;
   connection->status = RPC_STATUS_CLOSED;
   connection->server_socket = -1;
   connection->callbacks = NULL;
Index: src/rpc.h
===================================================================
--- src/rpc.h	(r??vision 466)
+++ src/rpc.h	(r??vision 470)
@@ -42,6 +42,9 @@
 
 // Connection Handling
 typedef struct rpc_connection_t rpc_connection_t;
+extern void rpc_connection_ref(rpc_connection_t *connection) attribute_hidden;
+extern void rpc_connection_unref(rpc_connection_t *connection) attribute_hidden;
+
 extern rpc_connection_t *rpc_init_server(const char *ident) attribute_hidden;
 extern rpc_connection_t *rpc_init_client(const char *ident) attribute_hidden;
 extern int rpc_exit(rpc_connection_t *connection) attribute_hidden;
Index: NEWS
===================================================================
--- NEWS	(r??vision 466)
+++ NEWS	(r??vision 470)
@@ -1,6 +1,9 @@
-nspluginwrapper NEWS -- history of user-visible changes.  2007-08-26
+nspluginwrapper NEWS -- history of user-visible changes.  2007-MM-DD
 Copyright (C) 2005-2007 Gwenole Beauchesne
 
+Version 0.9.92 (BETA) - DD.MMM.2007
+* Restart plugins viewer on error (Martin Stransky)
+
 Version 0.9.91.5 (BETA) - 26.Aug.2007
 * Fix a memory leak in NPP_Destroy()
 * Fix DiamondX XEmbed example plugin

nspluginwrapper-0.9.91.5-rpc-error.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-rpc-error.patch ---
Index: src/rpc.c
===================================================================
--- src/rpc.c	(r??vision 460)
+++ src/rpc.c	(r??vision 466)
@@ -29,6 +29,7 @@
 
 #include "sysdeps.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -288,6 +289,7 @@
 // Client / Server connection
 struct rpc_connection_t {
   int type;
+  int status;
   int socket;
   char *socket_path;
   int server_socket;
@@ -299,6 +301,47 @@
   char send_buffer[BUFSIZ];
 };
 
+// Returns connection status
+static inline int _rpc_status(rpc_connection_t *connection)
+{
+  return connection->status;
+}
+
+int rpc_status(rpc_connection_t *connection)
+{
+  if (connection == NULL)
+	return RPC_STATUS_BROKEN;
+  return _rpc_status(connection);
+}
+
+// Set connection status
+static void _rpc_set_status(rpc_connection_t *connection, int error)
+{
+  if (connection->status == RPC_STATUS_ACTIVE) {
+	switch (error) {
+	case RPC_ERROR_NO_ERROR:
+	  connection->status = RPC_STATUS_ACTIVE;
+	  break;
+	case RPC_ERROR_CONNECTION_CLOSED:
+	  connection->status = RPC_STATUS_CLOSED;
+	  break;
+	default:
+	  connection->status = RPC_STATUS_BROKEN;
+	  break;
+	}
+  }
+}
+
+static inline int rpc_error(rpc_connection_t *connection, int error)
+{
+  // XXX: this function must be called only in case of error
+  // (otherwise, it's an internal error)
+  assert(error < 0);
+  assert(connection != NULL);
+  _rpc_set_status(connection, error);
+  return error;
+}
+
 // Returns socket fd or -1 if invalid connection
 int rpc_socket(rpc_connection_t *connection)
 {
@@ -374,6 +417,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_SERVER;
+  connection->status = RPC_STATUS_CLOSED;
   connection->socket = -1;
   connection->server_thread_active = 0;
   connection->callbacks = NULL;
@@ -404,6 +448,7 @@
 	return NULL;
   }
 
+  connection->status = RPC_STATUS_ACTIVE;
   return connection;
 }
 
@@ -423,6 +468,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_CLIENT;
+  connection->status = RPC_STATUS_CLOSED;
   connection->server_socket = -1;
   connection->callbacks = NULL;
   connection->n_callbacks = 0;
@@ -467,6 +513,7 @@
 	return NULL;
   }
 
+  connection->status = RPC_STATUS_ACTIVE;
   return connection;
 }
 
@@ -1334,11 +1381,14 @@
   int32_t msg_tag;
   int error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_START)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
-  return _rpc_dispatch(connection, &message);
+  int method = _rpc_dispatch(connection, &message);
+  if (method < 0)
+	return rpc_error(connection, method);
+  return method;
 }
 
 
@@ -1443,6 +1493,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1459,24 +1511,24 @@
   // send: <invoke> = MESSAGE_START <method-id> MESSAGE_END
   int error = rpc_message_send_int32(&message, RPC_MESSAGE_START);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, method);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // wait: MESSAGE_ACK
   int32_t msg_tag;
   error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
   // send optional arguments
   va_list args;
@@ -1490,19 +1542,19 @@
 	error = rpc_message_send_args(&message, args);
 	va_end(args);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_flush(&message);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 
 	// wait: MESSAGE_ACK
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	if (msg_tag != RPC_MESSAGE_ACK)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
   }
-  
+
   return RPC_ERROR_NO_ERROR;
 }
 
@@ -1513,6 +1565,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1523,15 +1577,15 @@
   int error = rpc_message_recv_args(&message, args);
   va_end(args);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // send: MESSAGE_ACK
   error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   return RPC_ERROR_NO_ERROR;
 }
@@ -1547,6 +1601,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_init(&message, connection);
   va_start(args, connection);
@@ -1559,11 +1615,11 @@
   while (!done) {
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	switch (msg_tag) {
 	case RPC_MESSAGE_START:
 	  if ((error = _rpc_dispatch(connection, &message)) < 0)
-		return error;
+		return rpc_error(connection, error);
 	  break;
 	case RPC_MESSAGE_REPLY:
 	case RPC_MESSAGE_ACK:
@@ -1575,11 +1631,12 @@
 		int32_t error_code;
 		error = rpc_message_recv_int32(&message, &error_code);
 		if (error != RPC_ERROR_NO_ERROR)
-		  return error;
-		return error_code;
+		  return rpc_error(connection, error);
+		// return other-side error code
+		return rpc_error(connection, error_code);
 	  }
 	default:
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 	}
   }
 
@@ -1587,35 +1644,35 @@
 
 	// wait: <reply>
 	if (msg_tag != RPC_MESSAGE_REPLY)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 	va_start(args, connection);
 	error = rpc_message_recv_args(&message, args);
 	va_end(args);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	if (msg_tag != RPC_MESSAGE_END)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
 	// send: MESSAGE_ACK
 	error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_flush(&message);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 
 	// wait: MESSAGE_ACK (prepare for final ACK)
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
   }
 
   // wait: MESSAGE_ACK
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
   
   return RPC_ERROR_NO_ERROR;
 }
@@ -1626,7 +1683,9 @@
   D(bug("rpc_method_send_reply\n"));
 
   if (connection == NULL)
-	return RPC_ERROR_GENERIC;
+	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1634,27 +1693,27 @@
   // send: <reply> = MESSAGE_REPLY [ <method-args> ] MESSAGE_END
   int error = rpc_message_send_int32(&message, RPC_MESSAGE_REPLY);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   va_list args;
   va_start(args, connection);
   error = rpc_message_send_args(&message, args);
   va_end(args);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // wait: MESSAGE_ACK
   int32_t msg_tag;
   error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
   return RPC_ERROR_NO_ERROR;
 }
Index: src/rpc.h
===================================================================
--- src/rpc.h	(r??vision 460)
+++ src/rpc.h	(r??vision 466)
@@ -51,6 +51,13 @@
 extern int rpc_wait_dispatch(rpc_connection_t *connection, int timeout) attribute_hidden;
 extern int rpc_socket(rpc_connection_t *connection) attribute_hidden;
 
+enum {
+  RPC_STATUS_BROKEN						= -1,
+  RPC_STATUS_CLOSED						= 0,
+  RPC_STATUS_ACTIVE						= 1,
+};
+extern int rpc_status(rpc_connection_t *connection) attribute_hidden;
+
 // Message Passing
 enum {
   RPC_TYPE_INVALID						=  0,

nspluginwrapper-0.9.91.5-rh.patch:

Index: nspluginwrapper-0.9.91.5-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.5-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.5-rh.patch	28 Aug 2007 11:12:58 -0000	1.1
+++ nspluginwrapper-0.9.91.5-rh.patch	10 Sep 2007 08:44:43 -0000	1.2
@@ -643,28 +643,6 @@
  #include "utils.h"
  
  #define XP_UNIX 1
-@@ -85,6 +86,8 @@ typedef struct {
- 
- static Plugin g_plugin = { 0, -1, 0, NULL, NULL, NULL };
- 
-+static uint32_t version = 0;
-+
- // Instance state information about the plugin
- typedef struct _PluginInstance {
-   NPP instance;
-@@ -101,6 +104,12 @@ typedef struct _StreamInstance {
- // Prototypes
- static void plugin_init(int is_NP_Initialize);
- static void plugin_exit(void);
-+static NPError plugin_restart(void);
-+static NPError check_restart(void);
-+static time_t  last_restart = 0; 
-+
-+// Minimal time between two plugin restarts in sec
-+#define RESTART_INTERVAL      1
- 
- // Helpers
- #ifndef min
 @@ -211,7 +220,7 @@ g_NPN_GetValue(NPP instance, NPNVariable
    if (mozilla_funcs.getvalue == NULL)
  	return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -682,20 +660,6 @@
    abort();
  }
  
-@@ -1216,7 +1226,12 @@ g_NPP_New(NPMIMEType mime_type, NPP inst
- {
-   if (instance == NULL)
- 	return NPERR_INVALID_INSTANCE_ERROR;
--
-+	
-+  // Check if we need to restart the plug-in
-+  NPError rt = check_restart();
-+  if(rt != NPERR_NO_ERROR)
-+  	return(rt);
-+		
-   PluginInstance *plugin = malloc(sizeof(*plugin));
-   if (plugin == NULL)
- 	return NPERR_OUT_OF_MEMORY_ERROR;
 @@ -1485,8 +1500,9 @@ invoke_NPP_URLNotify(NPP instance, const
  
    error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
@@ -707,15 +671,6 @@
  }
  
  static void
-@@ -2374,7 +2390,7 @@ NP_Initialize(NPNetscapeFuncs *moz_funcs
- 
-   // pass down common NPAPI version supported by both the underlying
-   // browser and the thunking capabilities of nspluginwrapper
--  uint32_t version = min(moz_funcs->version, plugin_funcs->version);
-+  version = min(moz_funcs->version, plugin_funcs->version);
- 
-   int error = rpc_method_invoke(g_rpc_connection,
- 								RPC_METHOD_NP_INITIALIZE,
 @@ -2467,9 +2483,9 @@ static void plugin_init(int is_NP_Initia
    static int init_count = 0;
    ++init_count;
@@ -728,71 +683,6 @@
  
    // Cache MIME info and plugin name/description
    if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
-@@ -2708,3 +2724,64 @@ static void __attribute__((destructor)) 
- 	g_plugin.description = NULL;
-   }
- }
-+
-+static NPError plugin_restart(void)
-+{
-+  if(!g_plugin.is_wrapper) {
-+	D(bug("plugin restart\n"));
-+
-+	// Shut it down    
-+	plugin_exit();
-+
-+	g_plugin.initialized = 0;
-+	g_plugin.viewer_pid = -1;
-+	g_plugin.is_wrapper = 0;
-+
-+	// And start it again
-+	plugin_init(1);
-+	if (g_plugin.initialized <= 0)
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+		
-+	int error = rpc_method_invoke(g_rpc_connection,
-+				RPC_METHOD_NP_INITIALIZE,
-+				RPC_TYPE_UINT32, (uint32_t)version,
-+				RPC_TYPE_INVALID);
-+	
-+	if (error != RPC_ERROR_NO_ERROR) {
-+		npw_perror("NP_Initialize() invoke", error);
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+	}
-+	
-+	int32_t ret;
-+	error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
-+	
-+	if (error != RPC_ERROR_NO_ERROR) {
-+		npw_perror("NP_Initialize() wait for reply", error);
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+	}
-+	
-+	D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
-+	return ret;
-+  }
-+  return NPERR_NO_ERROR;
-+}
-+
-+static NPError check_restart(void)
-+{
-+	if(rpc_status_get(g_rpc_connection)) {
-+
-+		time_t atime = time(NULL);
-+		if(atime - last_restart < RESTART_INTERVAL)
-+			return(NPERR_GENERIC_ERROR);
-+		last_restart = atime;
-+
-+		D(bug("Plugin restart\n"));
-+		int ret = plugin_restart();
-+		if(ret == NPERR_NO_ERROR) {			
-+			rpc_error_clear(g_rpc_connection);
-+		}		
-+		D(bug("check_restart return %d [%s]\n", ret, string_of_NPError(ret)));
-+		return(ret);
-+	}	
-+	return(NPERR_NO_ERROR);
-+}
 --- /dev/null	2007-08-28 09:06:54.719628589 +0200
 +++ nspluginwrapper-0.9.91.5/src/npw-dir.c	2007-08-28 11:10:19.000000000 +0200
 @@ -0,0 +1,97 @@
@@ -1405,326 +1295,3 @@
    }
  
    return 0;
---- nspluginwrapper-0.9.91.5/src/rpc.h.rh	2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.5/src/rpc.h	2007-08-28 11:10:19.000000000 +0200
-@@ -103,4 +103,11 @@ extern int rpc_method_wait_for_reply(rpc
- extern int rpc_method_get_args(rpc_connection_t *connection, ...) attribute_hidden;
- extern int rpc_method_send_reply(rpc_connection_t *connection, ...) attribute_hidden;
- 
-+// Error handling
-+void rpc_error_check(rpc_connection_t *connection, int err_code);
-+int  rpc_error_get(rpc_connection_t *connection);
-+void rpc_error_set(rpc_connection_t *connection);
-+void rpc_error_clear(rpc_connection_t *connection);
-+int  rpc_status_get(rpc_connection_t *connection);
-+
- #endif /* RPC_H */
---- nspluginwrapper-0.9.91.5/src/rpc.c.rh	2007-04-02 22:03:07.000000000 +0200
-+++ nspluginwrapper-0.9.91.5/src/rpc.c	2007-08-28 11:10:19.000000000 +0200
-@@ -232,6 +232,7 @@ const char *rpc_strerror(int error)
-   return str;
- }
- 
-+
- // Set non blocking I/O on the specified socket
- static int rpc_set_non_blocking_io(int socket)
- {
-@@ -293,12 +294,41 @@ struct rpc_connection_t {
-   int server_socket;
-   int server_thread_active;
-   pthread_t server_thread;
-+  int last_error;
-   rpc_method_descriptor_t *callbacks;
-   int n_callbacks;
-   int send_offset;
-   char send_buffer[BUFSIZ];
- };
- 
-+#define ERROR_RPC(error)  ((error) > -1100 && (error) <= -1000)
-+
-+void rpc_error_check(rpc_connection_t *connection, int err_code)
-+{
-+  if(ERROR_RPC(err_code))
-+	connection->last_error = err_code;
-+}
-+
-+int  rpc_error_get(rpc_connection_t *connection)
-+{	
-+  return(connection->last_error);
-+}
-+
-+void rpc_error_set(rpc_connection_t *connection)
-+{	
-+  connection->last_error = RPC_ERROR_GENERIC;
-+}
-+
-+void rpc_error_clear(rpc_connection_t *connection)
-+{
-+  connection->last_error = 0;
-+}
-+
-+int  rpc_status_get(rpc_connection_t *connection)
-+{	
-+  return(ERROR_RPC(connection->last_error));
-+}
-+
- // Returns socket fd or -1 if invalid connection
- int rpc_socket(rpc_connection_t *connection)
- {
-@@ -378,6 +408,7 @@ rpc_connection_t *rpc_init_server(const 
-   connection->server_thread_active = 0;
-   connection->callbacks = NULL;
-   connection->n_callbacks = 0;
-+	connection->last_error = 0;
- 
-   if ((connection->server_socket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- 	perror("server socket");
-@@ -426,6 +457,7 @@ rpc_connection_t *rpc_init_client(const 
-   connection->server_socket = -1;
-   connection->callbacks = NULL;
-   connection->n_callbacks = 0;
-+	connection->last_error = 0;
- 
-   if ((connection->socket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- 	perror("client socket");
-@@ -1441,8 +1473,9 @@ int rpc_method_invoke(rpc_connection_t *
- {
-   D(bug("rpc_method_invoke method=%d\n", method));
- 
--  if (connection == NULL)
-+  if (connection == NULL) {
- 	return RPC_ERROR_CONNECTION_NULL;
-+  }
- 
-   rpc_message_t message;
-   rpc_message_init(&message, connection);
-@@ -1452,29 +1485,41 @@ int rpc_method_invoke(rpc_connection_t *
- 	int ret = _rpc_wait_dispatch(connection, 0);
- 	if (ret == 0)
- 	  break;
--	if (ret < 0 || (ret = rpc_dispatch(connection)) < 0)
-+	if (ret < 0 || (ret = rpc_dispatch(connection)) < 0) {
-+          rpc_error_check(connection,ret);
- 	  return ret;
-+  	}
-   }
- 
-   // send: <invoke> = MESSAGE_START <method-id> MESSAGE_END
-   int error = rpc_message_send_int32(&message, RPC_MESSAGE_START);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_send_int32(&message, method);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
- 
-   // wait: MESSAGE_ACK
-   int32_t msg_tag;
-   error = rpc_message_recv_int32(&message, &msg_tag);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   if (msg_tag != RPC_MESSAGE_ACK)
- 	return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 
-@@ -1489,16 +1534,22 @@ int rpc_method_invoke(rpc_connection_t *
- 	va_start(args, method);
- 	error = rpc_message_send_args(&message, args);
- 	va_end(args);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+        }
- 	error = rpc_message_flush(&message);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 
- 	// wait: MESSAGE_ACK
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	if (msg_tag != RPC_MESSAGE_ACK)
- 	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
-   }
-@@ -1522,16 +1573,22 @@ int rpc_method_get_args(rpc_connection_t
-   va_start(args, connection);
-   int error = rpc_message_recv_args(&message, args);
-   va_end(args);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   // send: MESSAGE_ACK
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   return RPC_ERROR_NO_ERROR;
- }
-@@ -1545,8 +1602,9 @@ int rpc_method_wait_for_reply(rpc_connec
-   va_list args;
-   rpc_message_t message;
- 
--  if (connection == NULL)
-+  if (connection == NULL) {
- 	return RPC_ERROR_CONNECTION_NULL;
-+  }
- 
-   rpc_message_init(&message, connection);
-   va_start(args, connection);
-@@ -1558,12 +1616,16 @@ int rpc_method_wait_for_reply(rpc_connec
-   bool done = false;
-   while (!done) {
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	switch (msg_tag) {
- 	case RPC_MESSAGE_START:
--	  if ((error = _rpc_dispatch(connection, &message)) < 0)
-+	  if ((error = _rpc_dispatch(connection, &message)) < 0) {
-+		rpc_error_check(connection,error);
- 		return error;
-+	  }
- 	  break;
- 	case RPC_MESSAGE_REPLY:
- 	case RPC_MESSAGE_ACK:
-@@ -1574,8 +1636,10 @@ int rpc_method_wait_for_reply(rpc_connec
- 		// wait: <error-code>
- 		int32_t error_code;
- 		error = rpc_message_recv_int32(&message, &error_code);
--		if (error != RPC_ERROR_NO_ERROR)
-+		if (error != RPC_ERROR_NO_ERROR) {
-+		  rpc_error_check(connection,error);
- 		  return error;
-+		}
- 		return error_code;
- 	  }
- 	default:
-@@ -1591,26 +1655,36 @@ int rpc_method_wait_for_reply(rpc_connec
- 	va_start(args, connection);
- 	error = rpc_message_recv_args(&message, args);
- 	va_end(args);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	if (msg_tag != RPC_MESSAGE_END)
- 	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 
- 	// send: MESSAGE_ACK
- 	error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	error = rpc_message_flush(&message);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 
- 	// wait: MESSAGE_ACK (prepare for final ACK)
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
-   }
- 
-   // wait: MESSAGE_ACK
-@@ -1633,26 +1707,36 @@ int rpc_method_send_reply(rpc_connection
- 
-   // send: <reply> = MESSAGE_REPLY [ <method-args> ] MESSAGE_END
-   int error = rpc_message_send_int32(&message, RPC_MESSAGE_REPLY);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   va_list args;
-   va_start(args, connection);
-   error = rpc_message_send_args(&message, args);
-   va_end(args);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   // wait: MESSAGE_ACK
-   int32_t msg_tag;
-   error = rpc_message_recv_int32(&message, &msg_tag);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   if (msg_tag != RPC_MESSAGE_ACK)
- 	return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nspluginwrapper.spec	28 Aug 2007 11:12:58 -0000	1.16
+++ nspluginwrapper.spec	10 Sep 2007 08:44:43 -0000	1.17
@@ -70,13 +70,15 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
 Source3:        %{name}.sh.in
-Patch0:		nspluginwrapper-0.9.91.5-rh.patch
-Patch1:		nspluginwrapper-0.9.91.4-config.patch
+Patch0:		nspluginwrapper-0.9.91.5-rpc-error.patch
+Patch1:		nspluginwrapper-0.9.91.5-restart.patch
+Patch2:		nspluginwrapper-0.9.91.5-rh.patch
+Patch3:		nspluginwrapper-0.9.91.4-config.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -104,8 +106,10 @@
 
 %prep
 %setup  -q -a 1
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .cnf
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1 -b .rh
+%patch3 -p1 -b .cnf
 
 # remove old/incompatibile stuff
 rm -rf npapi
@@ -221,6 +225,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-2
+- added upstream patches - RPC error handling and plugin restart
+
 * Mon Aug 27 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-1
 - update to the latest upstream
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:06:19 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 05:06:19 -0400
Subject: rpms/libcaca/EL-5 .cvsignore, 1.2, 1.3 libcaca.spec, 1.12,
	1.13 sources, 1.2, 1.3 libcaca-0.9-man3.patch, 1.1, NONE
Message-ID: <200709100906.l8A96JB1029936@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29865

Modified Files:
	.cvsignore libcaca.spec sources 
Removed Files:
	libcaca-0.9-man3.patch 
Log Message:
Sync files from devel for initial EPEL build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:42:00 -0000	1.2
+++ .cvsignore	10 Sep 2007 09:05:45 -0000	1.3
@@ -1 +1 @@
-libcaca-0.9.tar.bz2
+libcaca-0.99.beta11.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/libcaca.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libcaca.spec	28 Aug 2006 11:24:21 -0000	1.12
+++ libcaca.spec	10 Sep 2007 09:05:45 -0000	1.13
@@ -1,15 +1,24 @@
+%define beta beta11
+
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
-Version: 0.9
-Release: 11%{?dist}
-License: LGPL
+Version: 0.99
+Release: 0.3.%{beta}%{?dist}
+License: WTFPL
 Group: System Environment/Libraries
-URL: http://sam.zoy.org/projects/libcaca/
-Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
-Patch: libcaca-0.9-man3.patch
+URL: http://libcaca.zoy.org/
+Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: libX11-devel, libXt-devel, ncurses-devel >= 5, slang-devel
-Buildrequires: imlib2-devel, zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: slang-devel
+BuildRequires: ncurses-devel
+BuildRequires: libX11-devel
+BuildRequires: glut-devel
+BuildRequires: imlib2-devel
+BuildRequires: pango-devel
+# For the docs
+Buildrequires: doxygen
+Buildrequires: tetex-latex
+Buildrequires: tetex-dvips
 
 %description
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -20,7 +29,13 @@
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
 Group: Development/Libraries
-Requires: libX11-devel, ncurses-devel >= 5, slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel
+Requires: ncurses-devel
+Requires: libX11-devel
+Requires: glut-devel
+Requires: imlib2-devel
+Requires: pango-devel
 
 %description devel
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -52,60 +67,83 @@
 
 
 %prep
-%setup
-%patch -p1 -b .man3
+%setup -q -n libcaca-%{version}.%{beta}
 
 
 %build
-%configure \
-    --x-includes=%{_includedir} \
-    --x-libraries=%{_libdir} \
-    --enable-slang \
-    --enable-ncurses \
-    --enable-x11 \
-    --enable-imlib2
+%configure --disable-rpath
+# Remove useless 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 %{buildroot}
+%{__rm} -rf %{buildroot} libcucul-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
+%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*.so.*
+
 %files devel
-%defattr(-, root, root, 0755)
-%doc COPYING %{name}-devel-docs/*
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%doc ChangeLog libcucul-dev-docs/*
 %{_bindir}/caca-config
-%{_includedir}/*
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
-#{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-, root, root, 0755)
-%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
-%{_bindir}/cacaball
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacamoir
-%{_bindir}/cacaplas
+%{_bindir}/cacaplay
+%{_bindir}/cacaserver
 %{_bindir}/cacaview
+%{_bindir}/img2irc
 %{_datadir}/libcaca/
-%{_mandir}/man1/cacaball.1*
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
-%{_mandir}/man1/cacamoir.1*
-%{_mandir}/man1/cacaplas.1*
+%{_mandir}/man1/cacaplay.1*
+%{_mandir}/man1/cacaserver.1*
 %{_mandir}/man1/cacaview.1*
+%{_mandir}/man1/img2irc.1*
 
 
 %changelog
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.3.beta11
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.2.beta11
+- Update License field.
+
+* Thu Mar 29 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.1.beta11
+- Update to 0.99beta11.
+- We now have a main libcaca package with just the shared lib (built by default
+  now), so make the devel sub-package require it too. Leave static lib for now.
+- Enable opengl and pango support.
+- Remove useless rpath.
+- Remove no longer needed man3 patch.
+- Remove all configure options, they're autodetected.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9-11
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:42:00 -0000	1.2
+++ sources	10 Sep 2007 09:05:45 -0000	1.3
@@ -1 +1 @@
-c7d5c46206091a9203fcb214abb25e4a  libcaca-0.9.tar.bz2
+94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz


--- libcaca-0.9-man3.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 09:06:24 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 05:06:24 -0400
Subject: rpms/libcaca/EL-4 .cvsignore, 1.2, 1.3 libcaca.spec, 1.3,
	1.4 sources, 1.2, 1.3 libcaca-0.9-man3.patch, 1.1, NONE
Message-ID: <200709100906.l8A96Oqo029946@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29869

Modified Files:
	.cvsignore libcaca.spec sources 
Removed Files:
	libcaca-0.9-man3.patch 
Log Message:
Sync files from devel for initial EPEL build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:42:00 -0000	1.2
+++ .cvsignore	10 Sep 2007 09:05:51 -0000	1.3
@@ -1 +1 @@
-libcaca-0.9.tar.bz2
+libcaca-0.99.beta11.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/libcaca.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libcaca.spec	10 Dec 2004 21:27:33 -0000	1.3
+++ libcaca.spec	10 Sep 2007 09:05:51 -0000	1.4
@@ -1,15 +1,24 @@
+%define beta beta11
+
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
-Version: 0.9
-Release: 5
-License: LGPL
+Version: 0.99
+Release: 0.3.%{beta}%{?dist}
+License: WTFPL
 Group: System Environment/Libraries
-URL: http://sam.zoy.org/projects/libcaca/
-Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
-Patch: libcaca-0.9-man3.patch
+URL: http://libcaca.zoy.org/
+Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: XFree86-devel, ncurses-devel >= 5, slang-devel, imlib2-devel
-Buildrequires: zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: slang-devel
+BuildRequires: ncurses-devel
+BuildRequires: libX11-devel
+BuildRequires: glut-devel
+BuildRequires: imlib2-devel
+BuildRequires: pango-devel
+# For the docs
+Buildrequires: doxygen
+Buildrequires: tetex-latex
+Buildrequires: tetex-dvips
 
 %description
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -20,7 +29,13 @@
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
 Group: Development/Libraries
-Requires: XFree86-devel, ncurses-devel >= 5, slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel
+Requires: ncurses-devel
+Requires: libX11-devel
+Requires: glut-devel
+Requires: imlib2-devel
+Requires: pango-devel
 
 %description devel
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -52,57 +67,103 @@
 
 
 %prep
-%setup
-%patch -p1 -b .man3
+%setup -q -n libcaca-%{version}.%{beta}
 
 
 %build
-%configure \
-    --program-prefix="%{?_program_prefix}" \
-    --enable-slang \
-    --enable-ncurses \
-    --enable-x11 \
-    --enable-imlib2
+%configure --disable-rpath
+# Remove useless 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 %{buildroot}
+%{__rm} -rf %{buildroot} libcucul-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
+%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*.so.*
+
 %files devel
-%defattr(-, root, root, 0755)
-%doc COPYING %{name}-devel-docs/*
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%doc ChangeLog libcucul-dev-docs/*
 %{_bindir}/caca-config
-%{_includedir}/*
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
-#{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-, root, root, 0755)
-%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
-%{_bindir}/cacaball
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacamoir
-%{_bindir}/cacaplas
+%{_bindir}/cacaplay
+%{_bindir}/cacaserver
 %{_bindir}/cacaview
-%{_datadir}/libcaca/*
-%{_mandir}/man1/cacaball.1*
+%{_bindir}/img2irc
+%{_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*
 
 
 %changelog
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.3.beta11
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.2.beta11
+- Update License field.
+
+* Thu Mar 29 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.1.beta11
+- Update to 0.99beta11.
+- We now have a main libcaca package with just the shared lib (built by default
+  now), so make the devel sub-package require it too. Leave static lib for now.
+- Enable opengl and pango support.
+- Remove useless rpath.
+- Remove no longer needed man3 patch.
+- Remove all configure options, they're autodetected.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9-11
+- FC6 rebuild.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.9-10
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.9-9
+- Rebuild for new gcc/glibc.
+
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-8
+- Include unpackaged man page symlinks.
+- Rebuild against new slang.
+
+* Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 0.9-7
+- Change XFree86-devel requirements to libX11-devel.
+- Force --x-includes= and --x-libraries=, otherwise -L gets passed empty.
+
+* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9-6
+- Include libcaca datadir.
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 0.9-5
 - Bump release to provide Extras upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:42:00 -0000	1.2
+++ sources	10 Sep 2007 09:05:51 -0000	1.3
@@ -1 +1 @@
-c7d5c46206091a9203fcb214abb25e4a  libcaca-0.9.tar.bz2
+94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz


--- libcaca-0.9-man3.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 09:08:06 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 10 Sep 2007 05:08:06 -0400
Subject: rpms/hplip/F-7 hplip.spec,1.139,1.140
Message-ID: <200709100908.l8A986SB030095@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30062

Modified Files:
	hplip.spec 
Log Message:
* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
- hp-toolbox requires a graphical scanning program to be available
  (bug #283291).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- hplip.spec	16 Jul 2007 17:23:24 -0000	1.139
+++ hplip.spec	10 Sep 2007 09:07:33 -0000	1.140
@@ -57,6 +57,10 @@
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
+# hp-toolbox requires a graphical scanning program to be available
+# (bug #283291).
+Requires: xsane
+
 %description gui
 HPLIP graphical tools.
 
@@ -292,6 +296,10 @@
 exit 0
 
 %changelog
+* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
+- hp-toolbox requires a graphical scanning program to be available
+  (bug #283291).
+
 * Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
 - Low ink is a warning condition, not an error.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:19:23 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 05:19:23 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.17,1.18
Message-ID: <200709100919.l8A9JNkx030396@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30358

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail-plugins.spec	5 Sep 2007 19:38:03 -0000	1.17
+++ claws-mail-plugins.spec	10 Sep 2007 09:18:50 -0000	1.18
@@ -31,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  libsynce-devel
+BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 09:47:40 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 05:47:40 -0400
Subject: rpms/isync/devel isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100947.l8A9le0k031550@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 09:54:22 2007
From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera))
Date: Mon, 10 Sep 2007 05:54:22 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.29,1.30
Message-ID: <200709100954.l8A9sM3U032177@cvs-int.fedora.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32139

Modified Files:
	fonts-indic.spec 
Log Message:
Reverted changes


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fonts-indic.spec	7 Sep 2007 12:26:37 -0000	1.29
+++ fonts-indic.spec	10 Sep 2007 09:53:50 -0000	1.30
@@ -2,9 +2,9 @@
 %define update_cache    /usr/bin/fc-cache 
 %define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
-Name:        lohit-fonts
+Name:        fonts-indic
 Version:     2.1.5
-Release:     3%{?dist}
+Release:     2%{?dist}
 License:     GPL
 Group:       User Interface/X
 BuildArch:   noarch
@@ -19,17 +19,17 @@
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
-%package -n lohit-fonts-%1\
+%package -n fonts-%1\
 Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      User Interface/X \
-Provides:  fonts-%1 = %{version}-%{release}\
-Obsoletes :  fonts-%1 < 2.1.5-3\
+Provides:  ttfonts-%2 <= 1.6-1\
+Obsoletes :  ttfonts-%2 <= 1.6-1\
 Requires:   fontconfig\
 \
-%description -n lohit-fonts-%1\
+%description -n fonts-%1\
 These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
 \
-%files -n lohit-fonts-%1\
+%files -n fonts-%1\
 %defattr(-, root, root)\
 %dir %{xfontdir}\
 %dir %{xfontdir}/%1\
@@ -37,12 +37,12 @@
 %ghost %{xfontdir}/%1/fonts.cache-1\
 %{xfontdir}/%1/*ttf\
 \
-%post -n lohit-fonts-%1 \
+%post -n fonts-%1 \
 if [ -x %{_bindir}/fc-cache ]; then \
   %{_bindir}/fc-cache /usr/share/fonts \
 fi \
 \
-%postun -n lohit-fonts-%1 \
+%postun -n fonts-%1 \
 if [ "$1" = "0" ]; then \
   if [ -x %{_bindir}/fc-cache ]; then \
     %{_bindir}/fc-cache /usr/share/fonts \
@@ -80,6 +80,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
+- Reverting back renaming changes
+
 * Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
 - Renamed the package to reflect the upstream project name #253158
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:57:43 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 05:57:43 -0400
Subject: rpms/hedgewars/devel hedgewars.spec,1.1,1.2
Message-ID: <200709100957.l8A9vh1t032415@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32378

Modified Files:
	hedgewars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)



Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hedgewars.spec	10 Sep 2007 07:47:21 -0000	1.1
+++ hedgewars.spec	10 Sep 2007 09:57:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -13,6 +13,8 @@
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
 Requires:       hicolor-icon-theme
+# No freepascal on ppc64 :(
+ExcludeArch:    ppc64
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
+- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)
+
 * Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Install data files into /usr/share/hedgewars instead of into
   /usr/share/hedgewars/hedgewars



From fedora-extras-commits at redhat.com  Mon Sep 10 10:06:47 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 06:06:47 -0400
Subject: rpms/hedgewars/F-7 hedgewars.spec,1.1,1.2
Message-ID: <200709101006.l8AA6lC6006463@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6435

Modified Files:
	hedgewars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)



Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/hedgewars.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hedgewars.spec	10 Sep 2007 07:50:48 -0000	1.1
+++ hedgewars.spec	10 Sep 2007 10:06:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -13,6 +13,8 @@
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
 Requires:       hicolor-icon-theme
+# No freepascal on ppc64 :(
+ExcludeArch:    ppc64
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
+- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)
+
 * Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Install data files into /usr/share/hedgewars instead of into
   /usr/share/hedgewars/hedgewars



From fedora-extras-commits at redhat.com  Mon Sep 10 10:09:00 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 06:09:00 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.18,1.19
Message-ID: <200709101009.l8AA90VS006628@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6575

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- add perl-devel BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail-plugins.spec	10 Sep 2007 09:18:50 -0000	1.18
+++ claws-mail-plugins.spec	10 Sep 2007 10:08:27 -0000	1.19
@@ -30,7 +30,7 @@
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
-BuildRequires:  perl
+BuildRequires:  perl-devel
 BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 10:12:38 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:12:38 -0400
Subject: rpms/isync/FC-6 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101012.l8AACcRr006826@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6750/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:12:05 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:12:05 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:13:19 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:13:19 -0400
Subject: rpms/isync/EL-4 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101013.l8AADJgQ006933@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6881/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:12:45 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:12:45 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:16:49 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:16:49 -0400
Subject: rpms/isync/EL-5 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101016.l8AAGnrR007082@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7040/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:16:15 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:16:15 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:18:40 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:18:40 -0400
Subject: rpms/isync/F-7 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101018.l8AAIegr007233@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7193/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:18:07 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:18:07 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:27:53 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 06:27:53 -0400
Subject: rpms/claws-mail-plugins/F-7 claws-mail-plugins.spec,1.15,1.16
Message-ID: <200709101027.l8AARr0C007575@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7496

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- port BR fixes from devel



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- claws-mail-plugins.spec	5 Sep 2007 19:38:00 -0000	1.15
+++ claws-mail-plugins.spec	10 Sep 2007 10:27:20 -0000	1.16
@@ -30,8 +30,8 @@
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
-BuildRequires:  perl
-BuildRequires:  libsynce-devel
+BuildRequires:  perl-devel
+BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 10:31:53 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 10 Sep 2007 06:31:53 -0400
Subject: rpms/hplip/F-7 hplip-cmd_scan.patch, NONE, 1.1 hplip.spec, 1.140,
	1.141
Message-ID: <200709101031.l8AAVrEu007914@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7818

Modified Files:
	hplip.spec 
Added Files:
	hplip-cmd_scan.patch 
Log Message:
* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).


hplip-cmd_scan.patch:

--- NEW FILE hplip-cmd_scan.patch ---
diff -up hplip-1.7.4a/base/utils.py.cmd_scan hplip-1.7.4a/base/utils.py
--- hplip-1.7.4a/base/utils.py.cmd_scan	2007-09-10 10:12:06.000000000 +0100
+++ hplip-1.7.4a/base/utils.py	2007-09-10 10:13:21.000000000 +0100
@@ -542,6 +542,7 @@ class UserSettings(object):
     
     def loadDefaults(self):
         # Print
+        self.cmd_print = ''
         path = which('hp-print')
     
         if len(path) > 0:
@@ -564,6 +565,7 @@ class UserSettings(object):
                         self.cmd_print = 'xpp -P%PRINTER%'
     
         # Scan
+        self.cmd_scan = ''
         path = which('xsane')
     
         if len(path) > 0:


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- hplip.spec	10 Sep 2007 09:07:33 -0000	1.140
+++ hplip.spec	10 Sep 2007 10:31:21 -0000	1.141
@@ -22,6 +22,7 @@
 Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
+Patch10: hplip-cmd_scan.patch
 Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -57,10 +58,6 @@
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
-# hp-toolbox requires a graphical scanning program to be available
-# (bug #283291).
-Requires: xsane
-
 %description gui
 HPLIP graphical tools.
 
@@ -115,6 +112,9 @@
 # Clear the media-empty-error printer state.
 %patch9 -p1 -b .media-empty
 
+# Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
+%patch10 -p1 -b .cmd_scan
+
 # Prevent a traceback when unloading a photo card (bug #238617).
 %patch11 -p1 -b .unload-traceback
 
@@ -297,8 +297,7 @@
 
 %changelog
 * Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
-- hp-toolbox requires a graphical scanning program to be available
-  (bug #283291).
+- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
 
 * Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
 - Low ink is a warning condition, not an error.



From fedora-extras-commits at redhat.com  Mon Sep 10 10:38:40 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:38:40 -0400
Subject: rpms/python-iniparse/devel .cvsignore, 1.3, 1.4 python-iniparse.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709101038.l8AAcemF008145@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077

Modified Files:
	.cvsignore python-iniparse.spec sources 
Log Message:
Release 0.2.1-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2007 11:18:51 -0000	1.3
+++ .cvsignore	10 Sep 2007 10:38:07 -0000	1.4
@@ -1 +1,2 @@
 iniparse-0.2.1.tar.gz
+iniparse-comment.patch


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-iniparse.spec	28 Aug 2007 14:45:28 -0000	1.4
+++ python-iniparse.spec	10 Sep 2007 10:38:07 -0000	1.5
@@ -2,12 +2,13 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
+Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools-devel
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-
+%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -48,6 +49,8 @@
 
 %changelog
 
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
 - Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:18:51 -0000	1.3
+++ sources	10 Sep 2007 10:38:07 -0000	1.4
@@ -1 +1,2 @@
 0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch



From fedora-extras-commits at redhat.com  Mon Sep 10 10:49:09 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:49:09 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec,1.2,1.3
Message-ID: <200709101049.l8AAn9NI008477@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441

Modified Files:
	python-iniparse.spec 
Log Message:
Release 0.2.1-3


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:21:04 -0000	1.2
+++ python-iniparse.spec	10 Sep 2007 10:48:29 -0000	1.3
@@ -2,12 +2,13 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
+Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-
+%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -47,6 +48,9 @@
 
 
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3



From fedora-extras-commits at redhat.com  Mon Sep 10 10:55:19 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:55:19 -0400
Subject: rpms/python-iniparse/F-7 sources,1.3,1.4
Message-ID: <200709101055.l8AAtJBe008682@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8639

Modified Files:
	sources 
Log Message:
Release 0.2.1-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:21:04 -0000	1.3
+++ sources	10 Sep 2007 10:54:41 -0000	1.4
@@ -1 +1,2 @@
 0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch



From fedora-extras-commits at redhat.com  Mon Sep 10 11:52:20 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 07:52:20 -0400
Subject: rpms/bzflag/devel bzflag.spec,1.31,1.32
Message-ID: <200709101152.l8ABqKUF016776@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	bzflag.spec 
Log Message:
drop blurb about upstream being ambigous about the license, they really intended LGPL V2.1 and nothing else



Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bzflag.spec	5 Sep 2007 13:02:06 -0000	1.31
+++ bzflag.spec	10 Sep 2007 11:51:47 -0000	1.32
@@ -16,7 +16,7 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
@@ -96,11 +96,8 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-5
-- change license tag from LGPL to LGPLv2, the licensing is a bit ambigious
-  about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to
-  clarify this:
-  http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-6
+- change license tag from LGPL to LGPLv2
 
 * Fri Jun 22 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license tag from GPL to LGPL



From fedora-extras-commits at redhat.com  Mon Sep 10 11:57:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 10 Sep 2007 07:57:35 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.31,1.32
Message-ID: <200709101157.l8ABvZCw017298@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17244

Modified Files:
	man-pages-fr.spec 
Log Message:
rhbz#273941 doesn't install linkchecker man page.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- man-pages-fr.spec	22 Aug 2007 13:10:48 -0000	1.31
+++ man-pages-fr.spec	10 Sep 2007 11:57:03 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.40.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -73,6 +73,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
 # latex2rtf
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# linuxchecker
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/linkchecker.1
 # man
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
@@ -104,6 +106,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Mon Sep 10 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-9
+- 273941 doesn't install linkchecker man page
+
 * Wed Aug 22 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-1
 - new version from upstream
 - check license



From fedora-extras-commits at redhat.com  Mon Sep 10 12:17:34 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 08:17:34 -0400
Subject: rpms/yum-utils/devel .cvsignore, 1.13, 1.14 sources, 1.15,
	1.16 yum-utils.spec, 1.23, 1.24
Message-ID: <200709101217.l8ACHY3V024024@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23988

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:
Release 1.1.7-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Jul 2007 13:27:47 -0000	1.13
+++ .cvsignore	10 Sep 2007 12:17:02 -0000	1.14
@@ -1 +1 @@
-yum-utils-1.1.6.tar.gz
+yum-utils-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Jul 2007 13:27:47 -0000	1.15
+++ sources	10 Sep 2007 12:17:02 -0000	1.16
@@ -1 +1 @@
-e7ad94116fdb343da0153f8fe556afd6  yum-utils-1.1.6.tar.gz
+6680e58d20b07507f09bd6ab6f9d435c  yum-utils-1.1.7.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- yum-utils.spec	24 Jul 2007 13:27:47 -0000	1.23
+++ yum-utils.spec	10 Sep 2007 12:17:02 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -175,6 +175,17 @@
 and so on).Therefore, the plugin functions well even without
 compiling careful lists of all important packages.
 
+%package -n yum-basearchonly
+Summary: Yum plugin to let Yum install only basearch packages.
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-basearchonly
+this plugin makes Yum only install basearch packages on multiarch systems.
+If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed.
+If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'.
+The plugin only works with 'yum install'.
+
 
 %prep
 %setup -q
@@ -185,7 +196,10 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf security protect-packages"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \
+         downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \
+         security protect-packages basearchonly"
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -309,7 +323,18 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf
 /usr/lib/yum-plugins/protect-packages.*
 
+%files -n yum-basearchonly
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf
+/usr/lib/yum-plugins/basearchonly.*
+
+
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <tla at rasmil.dk>
+- mark as 1.1.7
+* Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
+- Added basearchonly plugin by Adel Gadllah
 * Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark as 1.1.6
 * Tue Jul 17 2007 Tim Lauridsen <tla at rasmil.dk>



From fedora-extras-commits at redhat.com  Mon Sep 10 12:18:42 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 08:18:42 -0400
Subject: rpms/yum-utils/F-7 sources,1.15,1.16 yum-utils.spec,1.23,1.24
Message-ID: <200709101218.l8ACIga1024134@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24053

Modified Files:
	sources yum-utils.spec 
Log Message:
Release 1.1.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Jul 2007 13:29:51 -0000	1.15
+++ sources	10 Sep 2007 12:18:09 -0000	1.16
@@ -1 +1 @@
-e7ad94116fdb343da0153f8fe556afd6  yum-utils-1.1.6.tar.gz
+6680e58d20b07507f09bd6ab6f9d435c  yum-utils-1.1.7.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-7/yum-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- yum-utils.spec	24 Jul 2007 13:29:51 -0000	1.23
+++ yum-utils.spec	10 Sep 2007 12:18:09 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -175,6 +175,17 @@
 and so on).Therefore, the plugin functions well even without
 compiling careful lists of all important packages.
 
+%package -n yum-basearchonly
+Summary: Yum plugin to let Yum install only basearch packages.
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-basearchonly
+this plugin makes Yum only install basearch packages on multiarch systems.
+If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed.
+If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'.
+The plugin only works with 'yum install'.
+
 
 %prep
 %setup -q
@@ -185,7 +196,10 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf security protect-packages"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \
+         downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \
+         security protect-packages basearchonly"
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -309,7 +323,18 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf
 /usr/lib/yum-plugins/protect-packages.*
 
+%files -n yum-basearchonly
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf
+/usr/lib/yum-plugins/basearchonly.*
+
+
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <tla at rasmil.dk>
+- mark as 1.1.7
+* Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
+- Added basearchonly plugin by Adel Gadllah
 * Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark as 1.1.6
 * Tue Jul 17 2007 Tim Lauridsen <tla at rasmil.dk>



From fedora-extras-commits at redhat.com  Mon Sep 10 12:20:23 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 08:20:23 -0400
Subject: fedora-security/audit fc7,1.94,1.95
Message-ID: <200709101220.l8ACKNRK024303@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230

Modified Files:
	fc7 
Log Message:
lighttpd



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fc7	7 Sep 2007 08:42:54 -0000	1.94
+++ fc7	10 Sep 2007 12:20:21 -0000	1.95
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070907
 # Up to date FC7 as of 20070905
 
+CVE-2007-4727 VULNERABLE (lighttpd) #284511
 CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode



From fedora-extras-commits at redhat.com  Mon Sep 10 12:31:31 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:31:31 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.10,1.11
Message-ID: <200709101231.l8ACVVOR024827@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24794

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Build for all supported arquitectures



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-subclipse.spec	9 Sep 2007 21:42:59 -0000	1.10
+++ eclipse-subclipse.spec	10 Sep 2007 12:30:58 -0000	1.11
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -47,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -238,6 +238,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-7
+- Build for all supported arquitectures
+
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
 - Change MANIFEST.MF patch to be applied on prep stage
 



From fedora-extras-commits at redhat.com  Mon Sep 10 12:36:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Sep 2007 08:36:29 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.10, 1.11 im-chooser.spec, 1.18, 
	1.19 sources, 1.9, 1.10
Message-ID: <200709101236.l8ACaTg4025083@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25043

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 07:32:03 -0000	1.10
+++ .cvsignore	10 Sep 2007 12:35:57 -0000	1.11
@@ -10,3 +10,4 @@
 im-chooser-0.4.0.tar.gz
 im-chooser-0.4.1.tar.gz
 im-chooser-0.5.0.tar.gz
+im-chooser-0.5.1.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- im-chooser.spec	6 Sep 2007 07:32:04 -0000	1.18
+++ im-chooser.spec	10 Sep 2007 12:35:57 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		im-chooser
-Version:	0.5.0
+Version:	0.5.1
 Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
+- New upstream release.
+
 * Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Sep 2007 07:32:04 -0000	1.9
+++ sources	10 Sep 2007 12:35:57 -0000	1.10
@@ -1 +1 @@
-4dfee80e78c97bedcfbb9fcc8e3df977  im-chooser-0.5.0.tar.gz
+4c2b6eba1dd41ff0c5baaca5dc15f2a4  im-chooser-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 12:44:28 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:44:28 -0400
Subject: rpms/ganymed-ssh2/devel ganymed-ssh2.spec,1.6,1.7
Message-ID: <200709101244.l8ACiSZ6025441@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Modified Files:
	ganymed-ssh2.spec 
Log Message:
Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/ganymed-ssh2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ganymed-ssh2.spec	29 Aug 2007 05:35:20 -0000	1.6
+++ ganymed-ssh2.spec	10 Sep 2007 12:43:55 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 12:46:51 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:46:51 -0400
Subject: rpms/svnkit/devel svnkit.spec,1.3,1.4
Message-ID: <200709101246.l8ACkprm025579@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25540

Modified Files:
	svnkit.spec 
Log Message:
Build for all supported arquitectures



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svnkit.spec	29 Aug 2007 05:36:52 -0000	1.3
+++ svnkit.spec	10 Sep 2007 12:46:18 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.2-5
+- Build for all supported arquitectures 
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:05:57 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 09:05:57 -0400
Subject: rpms/gimp-help/devel gimp-help.spec,1.13,1.14
Message-ID: <200709101305.l8AD5v9U032310@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp-help/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32279

Modified Files:
	gimp-help.spec 
Log Message:
change licensing tag to GFDL



Index: gimp-help.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/devel/gimp-help.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gimp-help.spec	8 Aug 2007 14:36:02 -0000	1.13
+++ gimp-help.spec	10 Sep 2007 13:05:23 -0000	1.14
@@ -4,8 +4,8 @@
 Summary: Help files for the GIMP.
 Name: gimp-help
 Version: %(echo %gimphelpver|cut -d- -f1)
-Release: 0.1.%(echo %gimphelpver|cut -d- -f2)%{?dist}
-License: GNU FDL
+Release: 0.2.%(echo %gimphelpver|cut -d- -f2)%{?dist}
+License: GFDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
 Source: ftp://ftp.gimp.org/pub/gimp/help/gimp-help-%{gimphelpver}.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.2.0.13
+- change licensing tag to GFDL
+
 * Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.13
 - version 2-0.13
 - don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing



From fedora-extras-commits at redhat.com  Mon Sep 10 13:07:33 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 10 Sep 2007 09:07:33 -0400
Subject: rpms/seaview/devel .cvsignore, 1.2, 1.3 seaview-chris.patch, 1.1,
	1.2 seaview.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709101307.l8AD7Xrd032396@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/pkgs/rpms/seaview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32356

Modified Files:
	.cvsignore seaview-chris.patch seaview.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jun 2007 22:04:42 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:06:59 -0000	1.3
@@ -1 +1 @@
-seaview.tar
+seaview_2.0.tar.gz

seaview-chris.patch:

Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview-chris.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview-chris.patch	28 Jun 2007 22:04:42 -0000	1.1
+++ seaview-chris.patch	10 Sep 2007 13:06:59 -0000	1.2
@@ -1,6 +1,6 @@
 --- seaview/Makefile.chris	2007-05-07 11:08:57.000000000 +0200
 +++ seaview/Makefile	2007-05-07 11:11:44.000000000 +0200
-@@ -3,25 +3,26 @@
+@@ -3,26 +3,27 @@
  #seaviewps  does not use the PDFLibLite library and outputs postscript 
  
  #customize these next 3 lines
@@ -16,6 +16,7 @@
 +HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
  
  CXX = g++
+ CC = gcc
  
 -OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
 +#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
@@ -35,8 +36,8 @@
 +#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
  
  
- OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
-@@ -37,8 +38,8 @@
+ OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
+@@ -38,8 +39,8 @@
  
  seaviewps : seaview.o $(OBJECTS) postscript.o
  	$(CXX) $(DEBUG)  seaview.o $(OBJECTS) postscript.o \


Index: seaview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seaview.spec	16 Aug 2007 22:17:54 -0000	1.2
+++ seaview.spec	10 Sep 2007 13:06:59 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           seaview
-Version:        0
-Release:        0.1.20070616%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Graphical multiple sequence alignment editor
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://pbil.univ-lyon1.fr/software/seaview.html
-Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview.tar
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_2.0.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream version, with a true version number :)
+
 * Thu Aug 16 2007 Christian Iseli <Christian.Iseli at licr.org> 0-0.1.20070616
  - Fix License tag to GPLv2+.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jun 2007 22:04:42 -0000	1.2
+++ sources	10 Sep 2007 13:06:59 -0000	1.3
@@ -1 +1 @@
-df7b54c231a5af24246e8129575717c1  seaview.tar
+72ff14e3511b88d26281accf16597534  seaview_2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 13:10:33 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:10:33 -0400
Subject: rpms/firefox/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 firefox.spec, 1.194, 1.195
Message-ID: <200709101310.l8ADAXfE032542@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32467

Modified Files:
	firefox-1.5-pango-underline.patch firefox.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	9 Jul 2007 10:15:21 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:10:00 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- firefox.spec	6 Sep 2007 14:26:15 -0000	1.194
+++ firefox.spec	10 Sep 2007 13:10:00 -0000	1.195
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -438,6 +438,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
+- added fix for #246248 - firefox crashes when searching for word "do"
+
 * Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
 - Fix default page for all locales
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:17:40 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Sep 2007 09:17:40 -0400
Subject: rpms/graphviz/EL-4 graphviz.spec,1.10,1.11
Message-ID: <200709101317.l8ADHeex000410@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/graphviz/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv372

Modified Files:
	graphviz.spec 
Log Message:

* Mon Sep 10 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-4
- Bump-n-build to fix libperl.so dependency



Index: graphviz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/EL-4/graphviz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- graphviz.spec	19 Jul 2007 21:45:17 -0000	1.10
+++ graphviz.spec	10 Sep 2007 13:17:08 -0000	1.11
@@ -4,7 +4,7 @@
 Name:				graphviz
 
 Version:			2.6
-Release:			3%{?dist}
+Release:			4%{?dist}
 
 Group:				Applications/Multimedia
 License:			CPL
@@ -137,6 +137,9 @@
 %{_bindir}/dot -c
 
 %changelog
+* Mon Sep 10 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-4
+- Bump-n-build to fix libperl.so dependency
+
 * Thu Jul 19 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-3
 - Uncommenting %%excludes to exclude erroneously installed ltdl libs
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:22:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:22:45 -0400
Subject: rpms/TeXmacs/F-7 .cvsignore, 1.27, 1.28 TeXmacs.spec, 1.49,
	1.50 sources, 1.28, 1.29 TeXmacs-1.0.6.10-qual.patch, 1.1, NONE
Message-ID: <200709101322.l8ADMjZ0000689@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv653

Modified Files:
	.cvsignore TeXmacs.spec sources 
Removed Files:
	TeXmacs-1.0.6.10-qual.patch 
Log Message:
new release 1.0.6.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 May 2007 13:08:11 -0000	1.27
+++ .cvsignore	10 Sep 2007 13:22:12 -0000	1.28
@@ -1 +1 @@
-TeXmacs-1.0.6.10-src.tar.gz
+TeXmacs-1.0.6.11-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/TeXmacs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- TeXmacs.spec	4 Jul 2007 08:19:18 -0000	1.49
+++ TeXmacs.spec	10 Sep 2007 13:22:12 -0000	1.50
@@ -1,15 +1,14 @@
 Name:		TeXmacs
-Version:	1.0.6.10
-Release:	3%{?dist}
+Version:	1.0.6.11
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.10-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.11-src.tar.gz
 Patch2:		TeXmacs-event.patch
 Patch5:         TeXmacs-1.6.0.7-rdelim.patch
-Patch6:         TeXmacs-1.0.6.10-qual.patch
 Patch7:         TeXmacs-1.0.6.10-psfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex
@@ -57,7 +56,6 @@
 %setup -q -n TeXmacs-%{version}-src
 %patch2 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
@@ -158,6 +156,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.11-1
+- new release 1.0.6.11
+
 * Fri Jun 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.10-3
 - ps generation fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 May 2007 13:08:11 -0000	1.28
+++ sources	10 Sep 2007 13:22:12 -0000	1.29
@@ -1 +1 @@
-5b5dbd678529bf346e1b67059bda7b57  TeXmacs-1.0.6.10-src.tar.gz
+c05875cf7ae502578d50e07709cab9e1  TeXmacs-1.0.6.11-src.tar.gz


--- TeXmacs-1.0.6.10-qual.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 13:25:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:25:31 -0400
Subject: rpms/TeXmacs/devel .cvsignore, 1.27, 1.28 TeXmacs.spec, 1.50,
	1.51 sources, 1.28, 1.29 TeXmacs-1.0.6.10-qual.patch, 1.1, NONE
Message-ID: <200709101325.l8ADPV1w000876@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831

Modified Files:
	.cvsignore TeXmacs.spec sources 
Removed Files:
	TeXmacs-1.0.6.10-qual.patch 
Log Message:
new release 1.0.6.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 May 2007 13:08:11 -0000	1.27
+++ .cvsignore	10 Sep 2007 13:24:58 -0000	1.28
@@ -1 +1 @@
-TeXmacs-1.0.6.10-src.tar.gz
+TeXmacs-1.0.6.11-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- TeXmacs.spec	29 Aug 2007 04:11:18 -0000	1.50
+++ TeXmacs.spec	10 Sep 2007 13:24:58 -0000	1.51
@@ -158,8 +158,8 @@
 
 
 %changelog
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.6.10-4
-- Rebuild for selinux ppc32 issue.
+* Mon Sep 10 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.11-1
+- new release 1.0.6.11
 
 * Fri Jun 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.10-3
 - ps generation fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 May 2007 13:08:11 -0000	1.28
+++ sources	10 Sep 2007 13:24:58 -0000	1.29
@@ -1 +1 @@
-5b5dbd678529bf346e1b67059bda7b57  TeXmacs-1.0.6.10-src.tar.gz
+c05875cf7ae502578d50e07709cab9e1  TeXmacs-1.0.6.11-src.tar.gz


--- TeXmacs-1.0.6.10-qual.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 13:27:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:27:07 -0400
Subject: rpms/TeXmacs/devel TeXmacs.spec,1.51,1.52
Message-ID: <200709101327.l8ADR7U4000999@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv949

Modified Files:
	TeXmacs.spec 
Log Message:
new release 1.0.6.11


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TeXmacs.spec	10 Sep 2007 13:24:58 -0000	1.51
+++ TeXmacs.spec	10 Sep 2007 13:26:35 -0000	1.52
@@ -1,15 +1,14 @@
 Name:		TeXmacs
-Version:	1.0.6.10
-Release:	4%{?dist}
+Version:	1.0.6.11
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.10-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.11-src.tar.gz
 Patch2:		TeXmacs-event.patch
 Patch5:         TeXmacs-1.6.0.7-rdelim.patch
-Patch6:         TeXmacs-1.0.6.10-qual.patch
 Patch7:         TeXmacs-1.0.6.10-psfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex
@@ -57,7 +56,6 @@
 %setup -q -n TeXmacs-%{version}-src
 %patch2 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:27:53 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 09:27:53 -0400
Subject: rpms/svnkit/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.4, 1.5
Message-ID: <200709101327.l8ADRrWB001143@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
Update to upstream 1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 13:14:17 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:27:20 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 13:14:17 -0000	1.2
+++ sources	10 Sep 2007 13:27:20 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svnkit.spec	10 Sep 2007 12:46:18 -0000	1.4
+++ svnkit.spec	10 Sep 2007 13:27:20 -0000	1.5
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -118,7 +118,8 @@
 
 
 %changelog
-* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.2-5
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
 - Build for all supported arquitectures 
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4



From fedora-extras-commits at redhat.com  Mon Sep 10 13:29:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:29:56 -0400
Subject: rpms/thunderbird/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 thunderbird.spec, 1.102, 1.103
Message-ID: <200709101329.l8ADTusu001291@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Modified Files:
	firefox-1.5-pango-underline.patch thunderbird.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	23 Dec 2006 21:05:09 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:29:23 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- thunderbird.spec	13 Aug 2007 20:28:29 -0000	1.102
+++ thunderbird.spec	10 Sep 2007 13:29:23 -0000	1.103
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -314,6 +314,9 @@
 #===============================================================================
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+- added fix for #246248 - firefox crashes when searching for word "do"
+
 * Mon Aug 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-2
 - Update the license tag
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:31:29 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:31:29 -0400
Subject: rpms/seamonkey/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 seamonkey.spec, 1.26, 1.27
Message-ID: <200709101331.l8ADVTRg001394@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1355

Modified Files:
	firefox-1.5-pango-underline.patch seamonkey.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 1.1.3-8
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	27 Jul 2007 12:34:15 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:31:26 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- seamonkey.spec	28 Aug 2007 11:06:25 -0000	1.26
+++ seamonkey.spec	10 Sep 2007 13:31:26 -0000	1.27
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -429,6 +429,8 @@
 
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 1.1.3-8
+- added fix for #246248 - firefox crashes when searching for word "do"
 * Tue Aug 28 2007 Kai Engert <kengert at redhat.com> - 1.1.3-7
 - Updated license tag
 * Mon Aug 7 2007 Martin Stransky <stransky at redhat.com> 1.1.3-6



From fedora-extras-commits at redhat.com  Mon Sep 10 13:37:05 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 10 Sep 2007 09:37:05 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.484,1.485
Message-ID: <200709101337.l8ADb5ee001659@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606

Modified Files:
	eclipse.spec 
Log Message:
* Mon Sep 10 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-19
- Don't require subclipse, cdt, or rpm-editor on ppc64.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- eclipse.spec	7 Sep 2007 18:51:16 -0000	1.484
+++ eclipse.spec	10 Sep 2007 13:36:32 -0000	1.485
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        18%{?dist} 
+Release:        19%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -224,12 +224,14 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-Requires: eclipse-subclipse
-Requires: eclipse-changelog
-Requires: eclipse-rpm-editor
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+# no CDT -> no changelog -> no rpm-editor
+# (upstream does not support ppc64)
 %ifnarch ppc64 alpha
+Requires: eclipse-subclipse
+Requires: eclipse-changelog
+Requires: eclipse-rpm-editor
 Requires: eclipse-mylyn
 Requires: eclipse-mylyn-ide
 Requires: eclipse-mylyn-bugzilla
@@ -1577,6 +1579,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:38:19 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 10 Sep 2007 09:38:19 -0400
Subject: rpms/seaview/F-7 .cvsignore, 1.2, 1.3 seaview-chris.patch, 1.1,
	1.2 seaview.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709101338.l8ADcJ3W001793@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/pkgs/rpms/seaview/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1736

Modified Files:
	.cvsignore seaview-chris.patch seaview.spec sources 
Log Message:
New upstream version.  Fix license tag.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2007 06:20:34 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:37:46 -0000	1.3
@@ -1 +1 @@
-seaview.tar
+seaview_2.0.tar.gz

seaview-chris.patch:

Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/seaview-chris.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview-chris.patch	29 Jun 2007 06:20:34 -0000	1.1
+++ seaview-chris.patch	10 Sep 2007 13:37:46 -0000	1.2
@@ -1,6 +1,6 @@
 --- seaview/Makefile.chris	2007-05-07 11:08:57.000000000 +0200
 +++ seaview/Makefile	2007-05-07 11:11:44.000000000 +0200
-@@ -3,25 +3,26 @@
+@@ -3,26 +3,27 @@
  #seaviewps  does not use the PDFLibLite library and outputs postscript 
  
  #customize these next 3 lines
@@ -16,6 +16,7 @@
 +HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
  
  CXX = g++
+ CC = gcc
  
 -OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
 +#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
@@ -35,8 +36,8 @@
 +#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
  
  
- OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
-@@ -37,8 +38,8 @@
+ OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
+@@ -38,8 +39,8 @@
  
  seaviewps : seaview.o $(OBJECTS) postscript.o
  	$(CXX) $(DEBUG)  seaview.o $(OBJECTS) postscript.o \


Index: seaview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/seaview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview.spec	29 Jun 2007 06:20:34 -0000	1.1
+++ seaview.spec	10 Sep 2007 13:37:46 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           seaview
-Version:        0
-Release:        0.1.20070615%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Graphical multiple sequence alignment editor
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://pbil.univ-lyon1.fr/software/seaview.html
-Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview.tar
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_2.0.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream version, with a true version number :)
+ - Fix License tag to GPLv2+.
+
 * Thu Jun 28 2007 Christian Iseli <Christian.Iseli at licr.org> 0-0.1.20070615
  - New upstream tarball.
  - Add desktop file and icon.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2007 06:20:34 -0000	1.2
+++ sources	10 Sep 2007 13:37:46 -0000	1.3
@@ -1 +1 @@
-df7b54c231a5af24246e8129575717c1  seaview.tar
+72ff14e3511b88d26281accf16597534  seaview_2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 14:19:10 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 10:19:10 -0400
Subject: rpms/gnome-web-photo import.log,1.1,1.2
Message-ID: <200709101419.l8AEJAZO009403@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363

Modified Files:
	import.log 
Log Message:
Upload gnome-web-photo, the HTML page thumbnailer



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2007 22:50:18 -0000	1.1
+++ import.log	10 Sep 2007 14:18:37 -0000	1.2
@@ -0,0 +1 @@
+gnome-web-photo-0_3-4:HEAD:gnome-web-photo-0.3-4.src.rpm:1189433869



From fedora-extras-commits at redhat.com  Mon Sep 10 14:19:12 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 10:19:12 -0400
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101419.l8AEJCa0009407@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-web-photo.spec 
Log Message:
Upload gnome-web-photo, the HTML page thumbnailer



--- NEW FILE gnome-web-photo.spec ---
Summary: HTML pages thumbnailer
Name: gnome-web-photo
Version: 0.3
Release: 4%{?dist}
License: LGPLv2+
Group: Applications/Internet
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): GConf2
Requires(preun): GConf2
BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libxml2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: gecko-devel >= 1.8
BuildRequires: libjpeg-devel
BuildRequires: gettext perl(XML::Parser)

%description
gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
including the file manager, to generate screenshots of web pages.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

mv $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/thumbnailer.schemas \
	$RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas

%find_lang %{name}

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/gnome-web-photo.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/gnome-web-photo.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/gnome-web-photo.schemas >& /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog AUTHORS README TODO COPYING.README
%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
%{_bindir}/*
%{_datadir}/gnome-web-photo

%changelog
* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-4
- Fix license, as mentioned by Kevin Fenzi

* Thu Sep 06 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-3
- Update following Matthias Clasen's comments

* Wed Sep 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-2
- Update following Peter Gordon's comments

* Tue Mar 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
- First post!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:50:20 -0000	1.1
+++ .cvsignore	10 Sep 2007 14:18:40 -0000	1.2
@@ -0,0 +1 @@
+gnome-web-photo-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:50:20 -0000	1.1
+++ sources	10 Sep 2007 14:18:40 -0000	1.2
@@ -0,0 +1 @@
+1c9cdf4ce25b58641e0af16215c413a5  gnome-web-photo-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 14:32:36 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Mon, 10 Sep 2007 10:32:36 -0400
Subject: rpms/koan/devel koan.spec,1.21,1.22
Message-ID: <200709101432.l8AEWaB0010063@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018

Modified Files:
	koan.spec 
Log Message:
Updating to 0.6.1-2 to fix EVR




Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- koan.spec	30 Aug 2007 16:41:20 -0000	1.21
+++ koan.spec	10 Sep 2007 14:32:04 -0000	1.22
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
-Release: 2%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Mon Sep 04 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-1
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 14:44:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 10 Sep 2007 10:44:09 -0400
Subject: rpms/kernel/devel kernel.spec, 1.152,
	1.153 linux-2.6-x86-debug-boot.patch, 1.3, 1.4
Message-ID: <200709101444.l8AEi9Cw010675@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10643

Modified Files:
	kernel.spec linux-2.6-x86-debug-boot.patch 
Log Message:
* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: fix debug early boot



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
+++ kernel.spec	10 Sep 2007 14:43:37 -0000	1.153
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: fix debug early boot
+
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86: debug early boot
 

linux-2.6-x86-debug-boot.patch:

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-debug-boot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
+++ linux-2.6-x86-debug-boot.patch	10 Sep 2007 14:43:37 -0000	1.4
@@ -17,7 +17,7 @@
  	}
  
  	/* Make sure we have all the proper CPU support */
-+	puts("A");
++	putchar('A');
  	if (validate_cpu()) {
  		puts("Unable to boot - please use a kernel appropriate "
  		     "for your CPU.\n");
@@ -25,84 +25,80 @@
  	}
  
  	/* Tell the BIOS what CPU mode we intend to run in. */
-+	puts("B");
++	putchar('B');
  	set_bios_mode();
  
  	/* Detect memory layout */
-+	puts("C");
++	putchar('C');
  	detect_memory();
  
  	/* Set keyboard repeat rate (why?) */
-+	puts("D");
++	putchar('D');
  	keyboard_set_repeat();
  
  	/* Set the video mode */
-+	puts("E");
++	putchar('E');
  	set_video();
  
  	/* Query MCA information */
-+	puts("F");
++	putchar('F');
  	query_mca();
  
  	/* Voyager */
  #ifdef CONFIG_X86_VOYAGER
-+	puts("G");
++	putchar('G');
  	query_voyager();
  #endif
  
-+	puts("H");
++	putchar('H');
  	/* Query Intel SpeedStep (IST) information */
  	query_ist();
  
  	/* Query APM information */
  #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+	puts("I");
++	putchar('I');
  	query_apm_bios();
  #endif
  
  	/* Query EDD information */
  #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
-+	puts("J");
++	putchar('J');
  	query_edd();
  #endif
  	/* Do the last things and invoke protected mode */
-+	puts("K");
++	putchar('K');
  	go_to_protected_mode();
  }
 --- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
 +++ linux-2.6.22.noarch/arch/i386/boot/pm.c
-@@ -145,26 +145,34 @@ static void setup_idt(void)
+@@ -145,24 +145,30 @@ static void setup_idt(void)
  void go_to_protected_mode(void)
  {
  	/* Hook before leaving real mode, also disables interrupts */
-+	puts("L");
++	putchar('L');
  	realmode_switch_hook();
  
  	/* Move the kernel/setup to their final resting places */
-+	puts("M");
++	putchar('M');
  	move_kernel_around();
  
  	/* Enable the A20 gate */
-+	puts("N");
++	putchar('N');
  	if (enable_a20()) {
  		puts("A20 gate not responding, unable to boot...\n");
  		die();
  	}
  
  	/* Reset coprocessor (IGNNE#) */
-+	puts("O");
++	putchar('O');
  	reset_coprocessor();
  
  	/* Mask all interrupts in the PIC */
-+	puts("P");
++	putchar('P');
  	mask_all_interrupts();
  
  	/* Actual transition to protected mode... */
-+	puts("Q");
++	puts("Q\n");
  	setup_idt();
-+	puts("R");
  	setup_gdt();
-+	puts("S\n");
  	protected_mode_jump(boot_params.hdr.code32_start,
- 			    (u32)&boot_params + (ds() << 4));
- }



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:31 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 10 Sep 2007 10:57:31 -0400
Subject: rpms/widelands/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 widelands.flagfix.patch, 1.1, 1.2 widelands.spec, 1.2,
	1.3 widelands.workfix.patch, 1.1, NONE
Message-ID: <200709101457.l8AEvV3b011357@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237/widelands/F-7

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Removed Files:
	widelands.workfix.patch 
Log Message:
Upgrade to build-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 May 2007 09:29:12 -0000	1.2
+++ .cvsignore	10 Sep 2007 14:56:58 -0000	1.3
@@ -1 +1 @@
-widelands-build10-source.tar.bz2
+widelands-build-11-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 May 2007 09:29:12 -0000	1.2
+++ sources	10 Sep 2007 14:56:58 -0000	1.3
@@ -1 +1 @@
-9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2
+ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.flagfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- widelands.flagfix.patch	7 May 2007 09:29:12 -0000	1.1
+++ widelands.flagfix.patch	10 Sep 2007 14:56:58 -0000	1.2
@@ -1,10 +1,12 @@
---- ./build/scons-tools/scons_configure.py.flagfix	2007-03-04 18:25:06.000000000 +0100
-+++ ./build/scons-tools/scons_configure.py	2007-04-30 11:41:58.000000000 +0200
-@@ -319,57 +319,4 @@
+diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
+--- ./build/scons-tools/scons_configure.py.flagfix	2007-06-03 17:17:45.000000000 +0200
++++ ./build/scons-tools/scons_configure.py	2007-09-08 00:03:37.000000000 +0200
+@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en
  			print 'Could not find efence, so doing a debug-efence build is impossible !'
  			env.Exit(1)
  
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
+-	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -	conf.CheckCompilerFlag('-Wall', env)
 -	conf.CheckCompilerFlag('-Wcast-align', env)
@@ -59,3 +61,4 @@
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
+


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widelands.spec	8 May 2007 17:41:50 -0000	1.2
+++ widelands.spec	10 Sep 2007 14:56:58 -0000	1.3
@@ -1,18 +1,17 @@
-%define build_id build10
+%define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.4.%{build_id}%{?dist}
+Release:        0.6.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.widelands.org
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
-Patch0:         widelands.workfix.patch
-Patch1:         widelands.flagfix.patch
+Patch0:         widelands.flagfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
 BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags 
 %ifnarch ppc64
 BuildRequires: optipng
@@ -30,18 +29,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
-sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-sed -i 's#doc#txts##' txts/SConscript
 
 %build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
-scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
+scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
 
@@ -73,11 +68,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -90,6 +89,10 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
+- Upgrade to build-11
+* Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10
+- Patching for compatibility with scons 0.97
 * Tue May 08 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.4.build10
 - Change BRs for ppc64
 * Sun May 06 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.3.build10


--- widelands.workfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:33 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 10 Sep 2007 10:57:33 -0400
Subject: rpms/widelands/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 widelands.flagfix.patch, 1.2, 1.3 widelands.spec, 1.3,
	1.4 widelands.scons.patch, 1.1, NONE widelands.workfix.patch,
	1.1, NONE
Message-ID: <200709101457.l8AEvXQn011368@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237/widelands/devel

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Removed Files:
	widelands.scons.patch widelands.workfix.patch 
Log Message:
Upgrade to build-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 May 2007 09:29:12 -0000	1.2
+++ .cvsignore	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-widelands-build10-source.tar.bz2
+widelands-build-11-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 May 2007 09:29:12 -0000	1.2
+++ sources	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2
+ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.flagfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widelands.flagfix.patch	26 Aug 2007 00:26:10 -0000	1.2
+++ widelands.flagfix.patch	10 Sep 2007 14:57:01 -0000	1.3
@@ -1,10 +1,12 @@
---- ./build/scons-tools/scons_configure.py.flagfix	2007-08-25 13:36:07.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py	2007-08-25 13:47:16.000000000 +0200
-@@ -259,57 +259,4 @@ def do_configure(config_h_file, conf, en
+diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
+--- ./build/scons-tools/scons_configure.py.flagfix	2007-06-03 17:17:45.000000000 +0200
++++ ./build/scons-tools/scons_configure.py	2007-09-08 00:03:37.000000000 +0200
+@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en
  			print 'Could not find efence, so doing a debug-efence build is impossible !'
  			env.Exit(1)
  
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
+-	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -	conf.CheckCompilerFlag('-Wall', env)
 -	conf.CheckCompilerFlag('-Wcast-align', env)
@@ -59,3 +61,4 @@
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
+


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.spec	26 Aug 2007 00:26:10 -0000	1.3
+++ widelands.spec	10 Sep 2007 14:57:01 -0000	1.4
@@ -1,19 +1,17 @@
-%define build_id build10
+%define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.5.%{build_id}%{?dist}
+Release:        0.6.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.widelands.org
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
-Patch0:         widelands.workfix.patch
-Patch1:         widelands.flagfix.patch
-Patch2:         widelands.scons.patch
+Patch0:         widelands.flagfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
 BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags 
 %ifnarch ppc64
 BuildRequires: optipng
@@ -31,19 +29,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-sed -i 's#doc#txts##' txts/SConscript
 
 %build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
-scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
+scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
 
@@ -75,11 +68,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -92,6 +89,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
+- Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10
 - Patching for compatibility with scons 0.97
 * Tue May 08 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.4.build10


--- widelands.scons.patch DELETED ---


--- widelands.workfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:41 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 10:57:41 -0400
Subject: rpms/pcmanx-gtk2/F-7 pcmanx-gtk2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709101457.l8AEvffr011376@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11259

Modified Files:
	pcmanx-gtk2.spec sources 
Log Message:
- upgrade to svn 355
- clean up packager's name in .spec file



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/pcmanx-gtk2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcmanx-gtk2.spec	16 Apr 2007 18:22:24 -0000	1.1
+++ pcmanx-gtk2.spec	10 Sep 2007 14:57:09 -0000	1.2
@@ -1,11 +1,11 @@
 # Source package is generated using:
 #        1. svn co https://svn.csie.net/pcmanx/trunk pcmanx-gtk2
 #        2. tar czvf pcmanx-gtk2.tar.gz pcmanx-gtk2
-%define    alphatag 336svn
+%define    alphatag 355svn
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
-Version:   0.3.5
-Release:   9.%{alphatag}%{?dist}
+Version:   0.3.6
+Release:   1.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,35 +84,38 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
+* Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
+- svn 355
+
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
 - remove README. Its content is not useful for end users
 
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
 - fix build in rawhide (automake 1.10)
 - use svn revision number instead of checkout date
 
-* Fri Apr  6 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
+* Fri Apr  6 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
 - fix svn build
 - svn 20070406
 
-* Fri Mar 30 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
+* Fri Mar 30 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
 - svn 20070330
 - enable libnotify support
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-5
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-5
 - Remove X-Fedora category in desktop file
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-4
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-4
 - Add gettext to BuildRequires
 - remove deprecated categories in desktop file
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-3
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-3
 - fix debuginfo rpm issues
 - fix desktop file issues
 - remove unnecessary update-desktop-database scriptlets (no Mimetypes entry in desktop file)
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-2
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-2
 - Move desktop-file-utils to BuildRequires
 
-* Wed Jan 10 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-1
+* Wed Jan 10 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 18:22:24 -0000	1.2
+++ sources	10 Sep 2007 14:57:09 -0000	1.3
@@ -1 +1 @@
-4be1a6f2ec82064128ee4c0addf4faed  pcmanx-gtk2.tar.gz
+3e9f23fb8f051a4c099599f27616a687  pcmanx-gtk2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 14:59:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 10:59:39 -0400
Subject: rpms/cvs2cl/EL-5 cvs2cl-2.67-man.patch, NONE, 1.1 cvs2cl.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200709101459.l8AExd9Z011574@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvs2cl/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528

Modified Files:
	cvs2cl.spec sources 
Added Files:
	cvs2cl-2.67-man.patch 
Log Message:
Sync with devel for first EPEL build

cvs2cl-2.67-man.patch:

--- NEW FILE cvs2cl-2.67-man.patch ---
--- cvs2cl~	2007-08-02 04:50:07.000000000 +0300
+++ cvs2cl	2007-08-13 22:43:54.000000000 +0300
@@ -2945,3 +2945,3 @@
 
-=item, B<--group-within-date>
+=item B<--group-within-date>
 


Index: cvs2cl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2cl/EL-5/cvs2cl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cvs2cl.spec	30 Mar 2007 21:48:02 -0000	1.12
+++ cvs2cl.spec	10 Sep 2007 14:59:07 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           cvs2cl
-Version:        2.60
+Version:        2.67
 Release:        1%{?dist}
 Summary:        Generate ChangeLogs from CVS working copies
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://www.red-bean.com/cvs2cl/
 Source0:        http://www.red-bean.com/cvs2cl/cvs2cl.pl
 Source1:        http://www.red-bean.com/cvs2cl/changelog.dtd
@@ -16,6 +16,7 @@
 Source7:        http://www.red-bean.com/cvs2cl/cl2html_rss-karaguezian.xslt
 Source8:        http://www.red-bean.com/cvs2cl/ChangeLog.xsd
 Patch0:         %{name}-2.60-perldeps.patch
+Patch1:         %{name}-2.67-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,15 +24,16 @@
 Requires:       xml-common
 
 %description
-cvs2cl generates GNU-style ChangeLogs for a CVS working copy using
-the output of the "cvs log" command. The script originaly came from
-the open source CVS book at http://cvsbook.red-bean.com/.
+cvs2cl generates GNU-style ChangeLogs for a CVS working copy using the
+output of the "cvs log" command.  The script originally came from the
+open source CVS book at http://cvsbook.red-bean.com/.
 
 
 %prep
 %setup -c -T
 sed -e 's/cvs2cl\.pl/cvs2cl/' %{SOURCE0} > cvs2cl
 %patch0
+%patch1
 
 
 %build
@@ -71,6 +73,14 @@
 
 
 %changelog
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.67-1
+- 2.67 + man page fix.
+- Fix spelling error in %%description.
+- License: GPLv2+
+
+* Tue Apr 24 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.62-1
+- 2.62.
+
 * Sat Mar 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.60-1
 - 2.60.
 - Dependency fixups.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2cl/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2007 21:48:02 -0000	1.3
+++ sources	10 Sep 2007 14:59:07 -0000	1.4
@@ -4,6 +4,6 @@
 f5af372c18e9199955d87f9da009b697  cl2html-ciaglia.xslt
 1b6c38d10a73eb1667550d2b56bcf3b9  cl2html_rss-karaguezian.xslt
 de54d6ce72570c845ef5a0dcc8bf9399  cl2html.xslt
-30b45da870831c764473e63e5dfd8fe5  cvs2cl.pl
 f7d7cf88b314c0cb1a16c8c93d1c8e54  cvs2cl_ruether.xslt
 6c521f9e2b2ae5fbcee63b3c2f47d607  filter-cvs2cl.xslt
+cf85f85fdbb8d8d115895e955c46732c  cvs2cl.pl



From fedora-extras-commits at redhat.com  Mon Sep 10 15:06:44 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:06:44 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-ldap-configuration.patch, 1.6,
	1.7 dhcp.spec, 1.169, 1.170
Message-ID: <200709101506.l8AF6ia7017981@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956

Modified Files:
	dhcp-3.0.5-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
- Fix typos in ldap.c and correct LDAP macros (#283391)


dhcp-3.0.5-ldap-configuration.patch:

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-3.0.5-ldap-configuration.patch	1 Apr 2007 20:52:27 -0000	1.6
+++ dhcp-3.0.5-ldap-configuration.patch	10 Sep 2007 15:06:40 -0000	1.7
@@ -143,12 +143,12 @@
  #endif
  
 +#if defined(LDAP_CONFIGURATION)
-+# define SV_LDAP_SERVER  		46
-+# define SV_LDAP_PORT  			47
-+# define SV_LDAP_USERNAME  		48
-+# define SV_LDAP_PASSWORD  		49
-+# define SV_LDAP_BASE_DN 		50
-+# define SV_LDAP_METHOD			51
++# define SV_LDAP_SERVER  		47
++# define SV_LDAP_PORT  			48
++# define SV_LDAP_USERNAME  		49
++# define SV_LDAP_PASSWORD  		50
++# define SV_LDAP_BASE_DN 		51
++# define SV_LDAP_METHOD			52
 +#endif
 +
  #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
@@ -521,7 +521,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -545,7 +545,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -556,7 +556,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpPermitList")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -589,7 +589,7 @@
 +
 +  for (i=0; search[i] != NULL; i++)
 +    {
-+      if ((ldap_method = LDAP_METHOD_DYNAMIC) &&
++      if ((ldap_method == LDAP_METHOD_DYNAMIC) &&
 +          (strcmp (search[i], "dhcpHostDN") == 0))
 +        continue;
 +
@@ -644,7 +644,7 @@
 +    
 +  ignore = 0;
 +  found = 1;
-+  for (i=0; objectClass[i]->bv_val != NULL; i++)
++  for (i=0; objectClass[i] != NULL && objectClass[i]->bv_val != NULL; i++)
 +    {
 +      if (strcmp (objectClass[i]->bv_val, "dhcpSharedNetwork") == 0)
 +        ldap_parse_shared_network (item, cfile);
@@ -693,7 +693,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpOption")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, "option ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
@@ -704,7 +704,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpStatements")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -885,7 +885,7 @@
 +  if (ldap_server == NULL || ldap_username == NULL || ldap_password == NULL ||
 +      ldap_base_dn == NULL)
 +    {
-+      log_info ("Not searching LDAP since ldap-server, ldap-port, ldap-username, ldap-password and ldap-baes-dn were not specified in the config file");
++      log_info ("Not searching LDAP since ldap-server, ldap-username, ldap-password and ldap-base-dn were not specified in the config file");
 +      disable_ldap = 1;
 +      return;
 +    }
@@ -1180,7 +1180,7 @@
 +  *option_buffer = '\0';
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpStatements")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          if (strncasecmp ("lease limit ", temp[i]->bv_val, 12) == 0)
 +            {
@@ -1196,7 +1196,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpOption")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (option_buffer, "option ", sizeof (option_buffer) - strlen (option_buffer) - 1);
 +          strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1);


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- dhcp.spec	4 Sep 2007 15:54:47 -0000	1.169
+++ dhcp.spec	10 Sep 2007 15:06:40 -0000	1.170
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  4%{?dist}
+Release:  5%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
+- Fix typos in ldap.c and correct LDAP macros (#283391)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
 - Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:07:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Mon, 10 Sep 2007 11:07:46 -0400
Subject: comps/po pl.po,1.3,1.4
Message-ID: <200709101507.l8AF7kPV018076@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18041/comps/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pl.po	10 Sep 2007 15:07:16 -0000	1.4
@@ -10,13 +10,12 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-23 00:19+0200\n"
+"PO-Revision-Date: 2007-09-10 17:06+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl 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.9.1\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -397,16 +396,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Ta grupa jest zbiorem program??w dla r????nych narz??dzi sprz??towych."
+msgstr "Ta grupa jest zbiorem serwer??w sieciowych do r????nych zastosowa??"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowiskarabskich."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -416,17 +413,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk hebrajskich."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk japo??skich."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -494,19 +489,17 @@
 msgstr "Obs??uga czeskiego"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk czeskich."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Obs??uga afrykanerskiego"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Obs??uga kanadyjskiego"
+msgstr "Obs??uga alba??skiego"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -529,23 +522,20 @@
 msgstr "Obs??uga baskijskiego"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Obs??uga bu??garskiego"
+msgstr "Obs??uga bia??oruskiego"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Obs??uga bengalskiego"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Obs??uga chi??skiego"
+msgstr "Obs??uga buta??skiego"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Obs??uga esto??skiego"
+msgstr "Obs??uga bo??niackiego"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -624,9 +614,8 @@
 msgstr "Obs??uga farerskiego"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Obs??uga galisyjskiego"
+msgstr "Obs??uga filipino"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -653,9 +642,8 @@
 msgstr "Obs??uga galisyjskiego"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga gruzi??skiego"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -693,9 +681,8 @@
 "serwer druku."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Obs??uga zuluskiego"
+msgstr "Obs??uga inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -718,9 +705,8 @@
 msgstr "Obs??uga kannada"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga khmerskiego"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -731,14 +717,12 @@
 msgstr "J??zyki"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "Obs??uga tajskiego"
+msgstr "Obs??uga laota??skiego"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Obs??uga chorwackiego"
+msgstr "Obs??uga ??otewskiego"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -765,9 +749,8 @@
 msgstr "Obs??uga malajalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "Obs??uga marathi"
+msgstr "Obs??uga maoryskiego"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -790,9 +773,8 @@
 msgstr "Obs??uga oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "Obs??uga serbskiego"
+msgstr "Obs??uga perskiego"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -827,9 +809,8 @@
 msgstr "Obs??uga rosyjskiego"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga samoa??skiego"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -856,9 +837,8 @@
 msgstr "Najmniejsza mo??liwa instalacja"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "Obs??uga swati"
+msgstr "Obs??uga somalijskiego"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -889,9 +869,8 @@
 msgstr "Obs??uga szwedzkiego"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Obs??uga tamilskiego"
+msgstr "Obs??uga tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -997,14 +976,12 @@
 "Ta grupa pakiet??w zawiera przydatne narz??dzia do u??ywania z PostgreSQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga tybeta??skiego"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "Obs??uga tsonga"
+msgstr "Obs??uga tonga"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1023,18 +1000,16 @@
 msgstr "Obs??uga ukrai??skiego"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "Obs??uga zuluskiego"
+msgstr "Obs??uga urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "Obs??uga venda"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "Obs??uga chi??skiego"
+msgstr "Obs??uga wietnamskiego"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1062,373 +1037,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Grupa systemu budowania"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Eclipse Fedory"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "Czcionki"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Pakiety czcionek do wy??wietlania tekstu w ??rodowisku graficznym."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Zintegrowane ??rodowisko programistyczne Eclipse."
+msgstr "Zintegrowane ??rodowisko programistyczne oparte na Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Przestarza??e czcionki"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Obs??uga tajskiego"
+msgstr "Obs??uga dolnosakso??skiego"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "Obs??uga esto??skiego"
+msgstr "Obs??uga mongolskiego"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "Obs??uga bengalskiego"
+msgstr "Obs??uga nepalskiego"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Obs??uga brazylijskiego"
-
-#~ msgid "British Support"
-#~ msgstr "Obs??uga brytyjskiego"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodno??ci"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Obs??uga architektur zgodnych z Mozill??"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Obs??uga architektur zgodno??ci"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Obs??uga cyrylicy"
-
-#~ msgid "Desktops"
-#~ msgstr "??rodowiska graficzne"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "Obs??uga ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "Obs??uga ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "Obs??uga ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "Obs??uga ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Zainstaluj te pakiety, aby ponownie skompilowa?? j??dro."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "??rodowisko graficzne KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Programowanie j??dra"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "R????ne zawarte pakiety"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Pakiety Mozilli dla platformy x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Pakiety obs??ugi Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "Baza danych SQL"
-
-#~ msgid "Server"
-#~ msgstr "Serwer"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "Obs??uga tworzenia pakiet??w dla innych architektur ni?? podstawowa"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Obs??uga syryjskiego"
-
-#~ msgid "System"
-#~ msgstr "System"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "Edytor tekstu GNU Emacs."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "Te pakiety pozwalaj?? na skonfigurowanie serwera pocztowego IMAP lub "
-#~ "Postfix."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Te pakiety dostarczaj?? obs??ug?? zgodno??ci z poprzednimi wydaniami Red Hat "
-#~ "Enterprise Linuksa."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Nieobs??ugiwane biblioteki programistyczne"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Typowa stacja robocza"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Obs??uga architektur zgodnych z PPC64"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodnych z x86"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Obs??uga zgodno??ci z architektur?? x86"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "brazylijski portugalski"
-
-#~ msgid "English"
-#~ msgstr "angielski"
-
-#~ msgid "French"
-#~ msgstr "francuski"
-
-#~ msgid "German"
-#~ msgstr "niemiecki"
-
-#~ msgid "Italian"
-#~ msgstr "w??oski"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Dokumentacja Red Hat Enterprise Linuksa 3"
-
-#~ msgid "Spanish"
-#~ msgstr "hiszpa??ski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "portugalskim brazylijskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "angielskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "francuskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "niemieckim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku w??oskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "hiszpa??skim."
-
-#~ msgid "Japanese"
-#~ msgstr "japo??ski"
-
-#~ msgid "Korean"
-#~ msgstr "korea??ski"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "chi??ski uproszczony"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "japo??skim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "korea??skim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "chi??skim uproszczonym."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "chi??skim tradycyjnym."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "chi??ski tradycyjny"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodnych z PPC64"
-
-#~ msgid "Bengali"
-#~ msgstr "bengalski"
-
-#~ msgid "Gujarati"
-#~ msgstr "gud??arati"
-
-#~ msgid "Hindi"
-#~ msgstr "hindi"
-
-#~ msgid "Punjabi"
-#~ msgstr "pend??abi"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Dokumentacja Red Hat Enterprise Linuksa 4"
-
-#~ msgid "Tamil"
-#~ msgstr "tamilski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "bengalskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "gud??arati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku hindi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "pend??abi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacje Red Hat Enterprise Linuksa w j??zyku "
-#~ "tamilskim."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Klastrowa pami???? masowa"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Obs??uga klastr??w."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pakiety dostarczaj??ce obs??ug?? klastrowej pami??ci masowej."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pakiety dostarczaj??ce obs??ug?? jednow??z??owego GFS."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Obs??uga jednow??z??owego GFS"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "Te pakiety zapewniaj?? obs??ug?? zgodno??ci z poprzednimi wydaniami."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "??rodowiska wykonawcze i zestawy programistyczne"
-
-#~ msgid "Misc"
-#~ msgstr "R????ne"
-
-#~ msgid "Misc packages"
-#~ msgstr "R????ne pakiety"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Aplikacje multimedialne"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pakiety dostarczaj??ce dodatkow?? funkcjonalno???? dla Red Hat Enterprise "
-#~ "Linuksa"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Stacja robocza"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Aplikacje i narz??dzia stacji roboczej."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Obs??uga wirtualizacji."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Architektura zgodno??ci"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Biblioteki architektury zgodno??ci"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Pakiety biblioteki Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "Pakiety dostarczaj??ce funkcjonalno???? architektury zgodno??ci."
+msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"



From fedora-extras-commits at redhat.com  Mon Sep 10 15:08:52 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:08:52 -0400
Subject: rpms/dhcp/F-7 dhcp-3.0.5-ldap-configuration.patch, 1.6,
	1.7 dhcp.spec, 1.165, 1.166
Message-ID: <200709101508.l8AF8qXI018195@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18164

Modified Files:
	dhcp-3.0.5-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-40
- Fix typos in ldap.c and correct LDAP macros (#283391)


dhcp-3.0.5-ldap-configuration.patch:

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-3.0.5-ldap-configuration.patch	1 Apr 2007 20:52:27 -0000	1.6
+++ dhcp-3.0.5-ldap-configuration.patch	10 Sep 2007 15:08:48 -0000	1.7
@@ -143,12 +143,12 @@
  #endif
  
 +#if defined(LDAP_CONFIGURATION)
-+# define SV_LDAP_SERVER  		46
-+# define SV_LDAP_PORT  			47
-+# define SV_LDAP_USERNAME  		48
-+# define SV_LDAP_PASSWORD  		49
-+# define SV_LDAP_BASE_DN 		50
-+# define SV_LDAP_METHOD			51
++# define SV_LDAP_SERVER  		47
++# define SV_LDAP_PORT  			48
++# define SV_LDAP_USERNAME  		49
++# define SV_LDAP_PASSWORD  		50
++# define SV_LDAP_BASE_DN 		51
++# define SV_LDAP_METHOD			52
 +#endif
 +
  #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
@@ -521,7 +521,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -545,7 +545,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -556,7 +556,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpPermitList")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -589,7 +589,7 @@
 +
 +  for (i=0; search[i] != NULL; i++)
 +    {
-+      if ((ldap_method = LDAP_METHOD_DYNAMIC) &&
++      if ((ldap_method == LDAP_METHOD_DYNAMIC) &&
 +          (strcmp (search[i], "dhcpHostDN") == 0))
 +        continue;
 +
@@ -644,7 +644,7 @@
 +    
 +  ignore = 0;
 +  found = 1;
-+  for (i=0; objectClass[i]->bv_val != NULL; i++)
++  for (i=0; objectClass[i] != NULL && objectClass[i]->bv_val != NULL; i++)
 +    {
 +      if (strcmp (objectClass[i]->bv_val, "dhcpSharedNetwork") == 0)
 +        ldap_parse_shared_network (item, cfile);
@@ -693,7 +693,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpOption")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, "option ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
@@ -704,7 +704,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpStatements")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -885,7 +885,7 @@
 +  if (ldap_server == NULL || ldap_username == NULL || ldap_password == NULL ||
 +      ldap_base_dn == NULL)
 +    {
-+      log_info ("Not searching LDAP since ldap-server, ldap-port, ldap-username, ldap-password and ldap-baes-dn were not specified in the config file");
++      log_info ("Not searching LDAP since ldap-server, ldap-username, ldap-password and ldap-base-dn were not specified in the config file");
 +      disable_ldap = 1;
 +      return;
 +    }
@@ -1180,7 +1180,7 @@
 +  *option_buffer = '\0';
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpStatements")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          if (strncasecmp ("lease limit ", temp[i]->bv_val, 12) == 0)
 +            {
@@ -1196,7 +1196,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpOption")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (option_buffer, "option ", sizeof (option_buffer) - strlen (option_buffer) - 1);
 +          strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1);


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- dhcp.spec	4 Sep 2007 15:53:38 -0000	1.165
+++ dhcp.spec	10 Sep 2007 15:08:48 -0000	1.166
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  39%{?dist}
+Release:  40%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -434,6 +434,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-40
+- Fix typos in ldap.c and correct LDAP macros (#283391)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
 - Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:10:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:10:57 -0400
Subject: rpms/cd-discid/EL-5 cd-discid.spec,1.6,1.7
Message-ID: <200709101510.l8AFAvMT018439@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cd-discid/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366

Modified Files:
	cd-discid.spec 
Log Message:
Sync with devel for first EPEL build


Index: cd-discid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/EL-5/cd-discid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cd-discid.spec	29 Aug 2006 19:24:33 -0000	1.6
+++ cd-discid.spec	10 Sep 2007 15:10:24 -0000	1.7
@@ -1,10 +1,12 @@
 Name:           cd-discid
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Utility to get CDDB discid information
 
 Group:          Applications/Multimedia
-License:        GPL
+# Also "Larry Wall's Artistic" upstream, but that's not accepted in Fedora
+License:        GPLv2+
+URL:            http://freshmeat.net/projects/cddiscid/
 Source0:        http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +42,10 @@
 
 
 %changelog
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-7
+- License: GPLv2+
+- Add URL.
+
 * Tue Aug 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:11:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Mon, 10 Sep 2007 11:11:24 -0400
Subject: comps/po pl.po,1.4,1.5
Message-ID: <200709101511.l8AFBO3Q018503@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18419/comps/po

Modified Files:
	pl.po 
Log Message:
Oops


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pl.po	10 Sep 2007 15:07:16 -0000	1.4
+++ pl.po	10 Sep 2007 15:10:54 -0000	1.5
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-09-10 17:06+0200\n"
+"PO-Revision-Date: 2007-09-10 17:10+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -403,7 +403,7 @@
 #: ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowiskarabskich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk arabskich."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63



From fedora-extras-commits at redhat.com  Mon Sep 10 15:16:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 10 Sep 2007 11:16:47 -0400
Subject: rpms/telepathy-salut/OLPC-2 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-salut.spec, 1.10, 1.11
Message-ID: <200709101516.l8AFGlmV020189@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20149

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2007 20:14:55 -0000	1.8
+++ .cvsignore	10 Sep 2007 15:16:15 -0000	1.9
@@ -5,3 +5,4 @@
 telepathy-salut-0.1.3.1.20070715darcs.tar.gz
 telepathy-salut-0.1.3.1.20070720darcs.tar.gz
 telepathy-salut-0.1.4.1.20070829darcs.tar.gz
+telepathy-salut-0.1.4.1.20070910darcs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2007 20:14:55 -0000	1.8
+++ sources	10 Sep 2007 15:16:15 -0000	1.9
@@ -1 +1 @@
-6035391907667734d6817f4409771cdf  telepathy-salut-0.1.4.1.20070829darcs.tar.gz
+97805603ffdda441c4894a69197583a1  telepathy-salut-0.1.4.1.20070910darcs.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- telepathy-salut.spec	29 Aug 2007 21:14:45 -0000	1.10
+++ telepathy-salut.spec	10 Sep 2007 15:16:15 -0000	1.11
@@ -1,10 +1,10 @@
-%define darcsdate 20070829darcs
+%define darcsdate 20070910darcs
 
 %define telepathy_glib_version 0.5.14
 
 Name:           telepathy-salut
 Version:        0.1.4.1
-Release:        0.2.%{darcsdate}%{?dist}
+Release:        0.3.%{darcsdate}%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
+- New snapshot
+
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.1.4.1-0.2.20070829darcs.olpc2
 - Build against telepathy-glib-0.5.14
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:18:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:18:22 -0400
Subject: rpms/xine-lib/EL-5 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xine-lib.spec, 1.9, 1.10
Message-ID: <200709101518.l8AFIMLi020358@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20278

Modified Files:
	.cvsignore sources xine-lib.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 09:13:26 -0000	1.7
+++ .cvsignore	10 Sep 2007 15:17:50 -0000	1.8
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 09:13:26 -0000	1.7
+++ sources	10 Sep 2007 15:17:50 -0000	1.8
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2  xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6  xine-lib-1.1.7-autotools.patch.bz2
+6cbfae9d31fc138c7cb3c3d178e1286d  xine-lib-1.1.8-pruned.tar.bz2
+b4a7c7a9af428b26667402d6dc180107  xine-lib-1.1.8-autotools.patch.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xine-lib.spec	14 Jul 2007 09:13:26 -0000	1.9
+++ xine-lib.spec	10 Sep 2007 15:17:50 -0000	1.10
@@ -1,6 +1,11 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
-# - xcb stuff when it's available
+# - drop the opengl video out plugin?
+#   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
+# - move pulseaudio to main package from -extras?
+#   http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
+#   --> not yet:
+#    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
@@ -8,12 +13,17 @@
 %else
 %define         have_vidix 0
 %endif
+%if 0%{?fedora} >= 8
+%define         with_xcb 1
+%else
+%define         with_xcb 0
+%endif
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.7
-Release:        1%{?dist}
-License:        GPL
+Version:        1.1.8
+Release:        2%{?dist}
+License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
@@ -29,7 +39,11 @@
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
-BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
+BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
+BuildRequires:  libGLU-devel
+%if %{with_xcb}
+BuildRequires:  libxcb-devel
+%endif
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
@@ -61,6 +75,13 @@
 Requires:        %{name} = %{version}-%{release}
 Requires:        pkgconfig zlib-devel
 
+%package arts
+Summary:         aRts plugin for xine-lib
+Group:           System Environment/Libraries
+Requires:        %{name} = %{version}-%{release}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:       xine-lib-extras < 1.1.7-3
+
 %package extras
 Summary:         Additional plugins for xine-lib
 Group:           System Environment/Libraries
@@ -81,9 +102,11 @@
 %description devel
 This package contains development files for xine-lib.
 
+%description arts
+This package contains the aRts extra plugin for xine-lib.
+
 %description extras
 This package contains extra plugins for xine-lib:
-  - aRts
   - EsounD
   - JACK
   - Pulseaudio
@@ -99,7 +122,9 @@
 %if 0%{!?_without_directfb:1}
   - DirectFB output
 %endif
-
+%if %{with_xcb}
+  - XCB output
+%endif
 
 
 %prep
@@ -121,36 +146,37 @@
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
-%configure --disable-dependency-tracking \
-    --with-xv-path=%{_libdir} \
-    --with-w32-path=%{codecdir} \
-    --with-real-codecs-path=%{codecdir} \
-    --with-external-ffmpeg \
-    --with-external-libmpcdec \
-    --with-libflac \
-    --with-wavpack \
-    --with-arts \
+# Keep list of options in mostly the same order as ./configure --help.
+%configure \
+    --disable-dependency-tracking \
     --enable-ipv6 \
 %if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif
-%if 0%{?_without_imagemagick:1}
-    --without-imagemagick \
-%endif
+%endif # directfb
+    --disable-a52dec \
+    --disable-mad \
+    --disable-dvdnavtest --with-external-dvdnav \
+    --disable-vcd \
+    --disable-asf \
+    --disable-faad \
 %if 0%{?_with_freetype:1}
-    --with-freetype \
-    --with-fontconfig \
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
-%endif
-%endif
-    --disable-libfame \
-    --disable-faad \
-    --disable-mad \
-    --disable-asf \
-    --disable-vcd \
-    --disable-a52dec \
-    --with-external-dvdnav --disable-dvdnavtest
+%endif # antialiasing
+    --with-freetype \
+    --with-fontconfig \
+%endif # freetype
+    --with-external-ffmpeg \
+    --with-xv-path=%{_libdir} \
+    --with-libflac \
+    --with-external-libmpcdec \
+%if 0%{?_without_imagemagick:1}
+    --without-imagemagick \
+%endif # imagemagick
+    --with-arts \
+    --with-wavpack \
+    --with-real-codecs-path=%{codecdir} \
+    --with-w32-path=%{codecdir}
 
 make %{?_smp_mflags}
 
@@ -282,9 +308,12 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
 
-%files extras
+%files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
+
+%files extras
+%defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
@@ -301,6 +330,10 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif
 
 
 %files devel
@@ -316,9 +349,29 @@
 
 
 %changelog
+* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+  provide an upgrade path
+
+* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
+- Split the aRts plugin into its own subpackage
+
+* Tue Aug 14 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-2
+- Include XCB output plugins (in -extras at least for now).
+- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
+- Clean up %%configure options.
+- License: GPLv2+
+
 * Thu Jun  7 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-1
 - 1.1.7.
 
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
+- respin (for libmpcdec)
+
 * Wed Apr 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-2
 - Make Real codec search path /usr/lib(64)/codecs again (#237743).
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:18:49 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 11:18:49 -0400
Subject: rpms/eclipse-subclipse/devel subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse.spec, 1.11,
	1.12 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709101518.l8AFInDl020375@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20305

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
update to upstream 1.2.4



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 15:12:49 -0000	1.5
+++ .cvsignore	10 Sep 2007 15:18:16 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-subclipse.spec	10 Sep 2007 12:30:58 -0000	1.11
+++ eclipse-subclipse.spec	10 Sep 2007 15:18:16 -0000	1.12
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        7%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,7 +26,7 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
@@ -238,7 +238,8 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
-* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-7
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
 - Build for all supported arquitectures
 
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 15:12:49 -0000	1.5
+++ sources	10 Sep 2007 15:18:16 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:22:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:22:09 -0400
Subject: rpms/abcde/EL-5 abcde.spec,1.12,1.13
Message-ID: <200709101522.l8AFM9ea020580@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541

Modified Files:
	abcde.spec 
Log Message:
Sync with devel for first EPEL build


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/EL-5/abcde.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcde.spec	29 Aug 2006 21:29:11 -0000	1.12
+++ abcde.spec	10 Sep 2007 15:21:37 -0000	1.13
@@ -1,10 +1,12 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
-License:        GPL or Artistic
+# Also "Larry Wall's Artistic" upstream, but the original Artistic is
+# not accepted in Fedora
+License:        GPLv2+
 URL:            http://www.hispalinux.es/~data/abcde.php
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-2.1.19-inst.patch
@@ -31,6 +33,9 @@
 mv examples/cue2discid .
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall \
@@ -55,6 +60,10 @@
 
 
 %changelog
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
+- License: GPLv2+
+- Add (empty) %%build section.
+
 * Tue Aug 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-2
 - Change vorbis-tools and flac dependencies to Requires(hint), drop
   speex dependency.



From fedora-extras-commits at redhat.com  Mon Sep 10 15:23:21 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 10 Sep 2007 11:23:21 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.18, 1.19 sources, 
	1.18, 1.19 sugar-presence-service.spec, 1.18, 1.19
Message-ID: <200709101523.l8AFNL1R020653@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20614

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	9 Sep 2007 04:30:38 -0000	1.18
+++ .cvsignore	10 Sep 2007 15:22:48 -0000	1.19
@@ -1,2 +1,3 @@
 sugar-presence-service-0.65-gita79f7b6488.tar.bz2
 sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
+sugar-presence-service-0.65-git3ed091301b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Sep 2007 04:30:38 -0000	1.18
+++ sources	10 Sep 2007 15:22:48 -0000	1.19
@@ -1 +1 @@
-6fe20b5dc4e20c40bc24ada12e6ba2ce  sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
+58fd9f1225a3d7bbc3d1f4d713d403b9  sugar-presence-service-0.65-git3ed091301b.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sugar-presence-service.spec	9 Sep 2007 04:30:38 -0000	1.18
+++ sugar-presence-service.spec	10 Sep 2007 15:22:48 -0000	1.19
@@ -1,9 +1,9 @@
-%define alphatag 20070909git
-%define commitid 3b1f4a0c42
+%define alphatag 20070910git
+%define commitid 3ed091301b
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.13.%{alphatag}3b1f4a0c42
+Release: 0.14.%{alphatag}3ed091301b
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:26:25 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 11:26:25 -0400
Subject: rpms/xsc/devel xsc.spec,1.1,1.2
Message-ID: <200709101526.l8AFQPEX020869@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20837

Modified Files:
	xsc.spec 
Log Message:
BR fix.



Index: xsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/xsc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsc.spec	9 Sep 2007 23:10:51 -0000	1.1
+++ xsc.spec	10 Sep 2007 15:25:53 -0000	1.2
@@ -10,6 +10,7 @@
 Source1: xsc.desktop
 Source2: xsc.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
+BuildRequires: libXt-devel, desktop-file-utils
 Requires: hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Mon Sep 10 15:36:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:36:22 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.10,1.11
Message-ID: <200709101536.l8AFaMhs021510@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	xine-lib.spec 
Log Message:
* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
- Adjust default -extras feature set for EPEL-5.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xine-lib.spec	10 Sep 2007 15:17:50 -0000	1.10
+++ xine-lib.spec	10 Sep 2007 15:35:50 -0000	1.11
@@ -9,20 +9,32 @@
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
-%define         have_vidix 1
+    %define     have_vidix  1
 %else
-%define         have_vidix 0
+    %define     have_vidix  0
 %endif
 %if 0%{?fedora} >= 8
-%define         with_xcb 1
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
-%define         with_xcb 0
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+%if 0%{?fedora}
+    %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
+    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%else
+    %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
+    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
+    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
+    %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%endif
+%define         with_dfb    %{?_without_directfb:0}%{!?_without_directfb:1}
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -43,25 +55,34 @@
 BuildRequires:  libGLU-devel
 %if %{with_xcb}
 BuildRequires:  libxcb-devel
-%endif
+%endif # xcb
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
 BuildRequires:  directfb-devel
-%endif
+%endif # dfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
 %if 0%{?_with_freetype:1}
 BuildRequires:  fontconfig-devel
-%endif
+%endif # freetype
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  wavpack-devel libmpcdec-devel
+%if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires:  jack-audio-connection-kit-devel
+%endif # jack
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -93,11 +114,9 @@
 It can play back various media. It also decodes multimedia files from local
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  Non-default rpmbuild options:
---without imagemagick:  Disable ImageMagick support
---without directfb:     Disable DirectFB support
---with    freetype:     Enable FreeType/Fontconfig support
---with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too.  --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -108,23 +127,31 @@
 %description extras
 This package contains extra plugins for xine-lib:
   - EsounD
+%if %{with_jack}
   - JACK
+%endif # jack
+%if %{with_pa}
   - Pulseaudio
+%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
   - SDL
+%if %{with_aalib}
   - AA-lib
+%endif # aalib
+%if %{with_caca}
   - Libcaca
+%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
-%endif
-%if 0%{!?_without_directfb:1}
+%endif # imagemagick
+%if %{with_dfb}
   - DirectFB output
-%endif
+%endif # dfb
 %if %{with_xcb}
   - XCB output
-%endif
+%endif # xcb
 
 
 %prep
@@ -150,9 +177,9 @@
 %configure \
     --disable-dependency-tracking \
     --enable-ipv6 \
-%if 0%{!?_without_directfb:1}
+%if %{with_dfb}
     --enable-directfb \
-%endif # directfb
+%endif # dfb
     --disable-a52dec \
     --disable-mad \
     --disable-dvdnavtest --with-external-dvdnav \
@@ -241,7 +268,7 @@
 %{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -252,7 +279,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
@@ -262,7 +289,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
@@ -300,7 +327,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
@@ -315,25 +342,33 @@
 %files extras
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%endif # dfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
 %if %{with_xcb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif
+%endif # xcb
 
 
 %files devel
@@ -349,6 +384,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
+- Adjust default -extras feature set for EPEL-5.
+
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to
   provide an upgrade path



From fedora-extras-commits at redhat.com  Mon Sep 10 15:43:31 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Sep 2007 11:43:31 -0400
Subject: devel/python python-2.5.1-plural-fix.patch, NONE, 1.1 python.spec, 
	1.117, 1.118
Message-ID: <200709101543.l8AFhVtV021879@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21838

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-plural-fix.patch 
Log Message:
* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
- work around problems with multi-line plural specification (#252136)


python-2.5.1-plural-fix.patch:

--- NEW FILE python-2.5.1-plural-fix.patch ---
diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py
--- Python-2.5.1/Lib/gettext.py.plural	2007-09-10 11:38:57.000000000 -0400
+++ Python-2.5.1/Lib/gettext.py	2007-09-10 11:39:00.000000000 -0400
@@ -299,6 +299,8 @@ class GNUTranslations(NullTranslations):
                     item = item.strip()
                     if not item:
                         continue
+                    if item.startswith("#"):
+                        continue
                     if ':' in item:
                         k, v = item.split(':', 1)
                         k = k.strip().lower()


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- python.spec	28 Aug 2007 13:50:29 -0000	1.117
+++ python.spec	10 Sep 2007 15:42:58 -0000	1.118
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -33,6 +33,7 @@
 Patch3: python-2.4.1-canonicalize.patch
 Patch4: python-2.5-cflags.patch
 Patch5: python-2.5.1-ctypes-exec-stack.patch
+Patch6: python-2.5.1-plural-fix.patch
 
 # upstreamed
 
@@ -161,6 +162,7 @@
 %patch3 -p1 -b .canonicalize
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .ctypesexec
+%patch6 -p1 -b .plural
 
 %patch50 -p1 -b .egginfo
 %patch60 -p1 -b .db46
@@ -421,6 +423,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
+- work around problems with multi-line plural specification (#252136)
+
 * Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-9
 - rebuild against new expat
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:06 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:06 -0400
Subject: rpms/lighttpd/EL-4 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 lighttpd.spec, 1.8, 1.9 sources, 1.7,
	1.8 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFk64C022132@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/EL-4

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jul 2007 08:07:51 -0000	1.7
+++ .cvsignore	10 Sep 2007 15:45:33 -0000	1.8
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lighttpd.spec	26 Jul 2007 08:07:51 -0000	1.8
+++ lighttpd.spec	10 Sep 2007 15:45:33 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jul 2007 08:07:51 -0000	1.7
+++ sources	10 Sep 2007 15:45:33 -0000	1.8
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:09 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:09 -0400
Subject: rpms/lighttpd/EL-5 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.34, 1.35 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFk97B022138@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/EL-5

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:07:54 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:36 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lighttpd.spec	26 Jul 2007 08:07:54 -0000	1.34
+++ lighttpd.spec	10 Sep 2007 15:45:36 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:07:54 -0000	1.20
+++ sources	10 Sep 2007 15:45:36 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:12 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:12 -0400
Subject: rpms/lighttpd/F-7 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.34, 1.35 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkCOB022145@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/F-7

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:07:57 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:39 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/lighttpd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lighttpd.spec	26 Jul 2007 08:07:57 -0000	1.34
+++ lighttpd.spec	10 Sep 2007 15:45:39 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:07:57 -0000	1.20
+++ sources	10 Sep 2007 15:45:39 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:14 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:14 -0400
Subject: rpms/lighttpd/FC-6 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.32, 1.33 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkEX1022150@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/FC-6

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:08:00 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:42 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lighttpd.spec	26 Jul 2007 08:08:00 -0000	1.32
+++ lighttpd.spec	10 Sep 2007 15:45:42 -0000	1.33
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:08:00 -0000	1.20
+++ sources	10 Sep 2007 15:45:42 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:17 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:17 -0400
Subject: rpms/lighttpd/devel .cvsignore, 1.21, 1.22 lighttpd.spec, 1.37,
	1.38 sources, 1.21, 1.22 lighttpd-1.4.17-sighup.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkHEl022159@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/devel

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.4.17-sighup.patch 
Log Message:
Update to 1.4.18 (security update).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Sep 2007 11:25:10 -0000	1.21
+++ .cvsignore	10 Sep 2007 15:45:45 -0000	1.22
@@ -1 +1 @@
-lighttpd-1.4.17.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lighttpd.spec	5 Sep 2007 11:25:10 -0000	1.37
+++ lighttpd.spec	10 Sep 2007 15:45:45 -0000	1.38
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.17
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -16,7 +16,6 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.4.17-defaultconf.patch
-Patch1: lighttpd-1.4.17-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -73,7 +72,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
-%patch1 -p3 -b .sighup
 
 
 %build
@@ -159,6 +157,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
@@ -185,6 +184,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
 * Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
 - Update to 1.4.17.
 - Update defaultconf patch to match new example configuration.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Sep 2007 11:25:10 -0000	1.21
+++ sources	10 Sep 2007 15:45:45 -0000	1.22
@@ -1 +1 @@
-85c99c2d6baf8ad9e38e6267efe7d9aa  lighttpd-1.4.17.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.17-sighup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:48:13 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:48:13 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-device-names.patch, NONE,
	1.1 dhcpv6.spec, 1.62, 1.63
Message-ID: <200709101548.l8AFmDQ0022523@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22466

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-device-names.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
- Recognize 802.1Q VLAN network device names (#245115)


dhcpv6-0.10-device-names.patch:

--- NEW FILE dhcpv6-0.10-device-names.patch ---
diff -up dhcp-0.10/server6_token.l.string dhcp-0.10/server6_token.l
--- dhcp-0.10/server6_token.l.string	2007-09-10 11:43:04.000000000 -0400
+++ dhcp-0.10/server6_token.l	2007-09-10 11:43:58.000000000 -0400
@@ -79,7 +79,7 @@ addr_tail       ({hexdigit}{1,4}|({hexdi
 addr_body       ({hexdigit}{1,4}(":"|"::"))*
 ipv6addr        {addr_head}{addr_body}{addr_tail}
 string		[a-zA-Z0-9:\._-][a-zA-Z0-9:\._-]*
-ifname		[a-zA-Z]+[0-9]+
+ifname		({string})+
 
 %s S_IFACE
 %s S_DUID


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- dhcpv6.spec	4 Sep 2007 17:55:48 -0000	1.62
+++ dhcpv6.spec	10 Sep 2007 15:47:41 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 47%{?dist}
+Release: 48%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -17,6 +17,7 @@
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-init_leases.patch
+Patch8:  %{name}-0.10-device-names.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -81,6 +82,7 @@
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .init_leases
+%patch8 -p1 -b .device-names
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -175,6 +177,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
+- Recognize 802.1Q VLAN network device names (#245115)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:59:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 11:59:08 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.28,
	1.29 policycoreutils.spec, 1.444, 1.445
Message-ID: <200709101559.l8AFx8Pt023034@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
- Change Requires /bin/rpm to rpm


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policycoreutils-gui.patch	6 Sep 2007 12:25:31 -0000	1.28
+++ policycoreutils-gui.patch	10 Sep 2007 15:59:05 -0000	1.29
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-05 22:33:12.000000000 -0400
-@@ -0,0 +1,2312 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 11:56:01.000000000 -0400
+@@ -0,0 +1,2364 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,7 +1028,8 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="show_tabs">False</property>
++	  <property name="can_focus">True</property>
++	  <property name="show_tabs">True</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -1772,6 +1773,57 @@
 +	  </child>
 +
 +	  <child>
++	    <widget class="GnomeDruidPageStandard" id="roles_page">
++	      <property name="visible">True</property>
++	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
++
++	      <child internal-child="vbox">
++		<widget class="GtkVBox" id="vbox13">
++		  <property name="border_width">16</property>
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">6</property>
++
++		  <child>
++		    <widget class="GtkScrolledWindow" id="scrolledwindow4">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="shadow_type">GTK_SHADOW_IN</property>
++		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++		      <child>
++			<widget class="GtkTreeView" id="role_treeview">
++			  <property name="visible">True</property>
++			  <property name="tooltip" translatable="yes">Select the domains that you would like this user administer.</property>
++			  <property name="can_focus">True</property>
++			  <property name="headers_visible">False</property>
++			  <property name="rules_hint">False</property>
++			  <property name="reorderable">False</property>
++			  <property name="enable_search">True</property>
++			  <property name="fixed_height_mode">False</property>
++			  <property name="hover_selection">False</property>
++			  <property name="hover_expand">False</property>
++			</widget>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">True</property>
++		      <property name="fill">True</property>
++		    </packing>
++		  </child>
++		</widget>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="tab_expand">False</property>
++	      <property name="tab_fill">True</property>
++	    </packing>
++	  </child>
++
++	  <child>
 +	    <widget class="GtkLabel" id="label30">
 +	      <property name="visible">True</property>
 +	      <property name="label" translatable="yes">label30</property>
@@ -3230,8 +3282,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-05 22:33:06.000000000 -0400
-@@ -0,0 +1,432 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 11:58:05.000000000 -0400
+@@ -0,0 +1,452 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3265,6 +3317,8 @@
 +import sys
 +import polgen
 +import re
++import commands
++
 +
 +##
 +## I18N
@@ -3311,12 +3365,13 @@
 +    APP_PAGE = 2
 +    TRANSITION_PAGE = 3
 +    ADMIN_PAGE = 4
-+    IN_NET_PAGE = 5
-+    OUT_NET_PAGE = 6
-+    COMMON_APPS_PAGE = 7
-+    FILES_PAGE = 8
-+    GEN_POLICY_PAGE = 9
-+    FINISH_PAGE = 10
++    ROLE_PAGE = 5
++    IN_NET_PAGE = 6
++    OUT_NET_PAGE = 7
++    COMMON_APPS_PAGE = 8
++    FILES_PAGE = 9
++    GEN_POLICY_PAGE = 10
++    FINISH_PAGE = 11
 +    
 +    def __init__(self):
 +        self.xml = xml
@@ -3335,7 +3390,7 @@
 +        self.notebook = xml.get_widget ("notebook1")
 +        self.pages={}
 +        for i in polgen.USERS:
-+            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE] 
++            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE] 
 +        self.pages[polgen.RUSER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE]
 +        for i in polgen.APPLICATIONS:
 +            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE,self.GEN_POLICY_PAGE, self.FINISH_PAGE ]
@@ -3373,6 +3428,20 @@
 +        for b in self.network_buttons.keys():
 +            b.connect("clicked",self.network_all_clicked)
 +
++        self.role_treeview = self.xml.get_widget("role_treeview")
++        self.role_store = gtk.ListStore(gobject.TYPE_STRING)
++        self.role_treeview.set_model(self.role_store)
++        self.role_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
++        self.role_store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
++        col = gtk.TreeViewColumn(_("Role"), gtk.CellRendererText(), text = 0)
++        self.role_treeview.append_column(col)
++
++        roles = commands.getoutput("/usr/bin/seinfo -r").split()[2:]
++        for i in roles:
++            iter = self.role_store.append()
++            self.role_store.set_value(iter, 0, i[:-2])
++
++        self.types = commands.getoutput("/usr/bin/seinfo -t").split()[2:]
 +        self.transition_treeview = self.xml.get_widget("transition_treeview")
 +        self.transition_store = gtk.ListStore(gobject.TYPE_STRING)
 +        self.transition_treeview.set_model(self.transition_store)
@@ -3381,7 +3450,6 @@
 +        col = gtk.TreeViewColumn(_("Application"), gtk.CellRendererText(), text = 0)
 +        self.transition_treeview.append_column(col)
 +
-+
 +        self.admin_treeview = self.xml.get_widget("admin_treeview")
 +        self.admin_store = gtk.ListStore(gobject.TYPE_STRING)
 +        self.admin_treeview.set_model(self.admin_store)
@@ -3391,11 +3459,11 @@
 +        self.admin_treeview.append_column(col)
 +
 +        for i in polgen.methods:
-+            print i
 +            m = re.findall("(.*)%s" % polgen.USER_TRANSITION_INTERFACE, i) 
 +            if len(m) > 0:
-+                iter = self.transition_store.append()
-+                self.transition_store.set_value(iter, 0, m[0])
++                if "%s_exec_t" % m[0] in self.types and "user_%s_t" % m[0] in self.types:
++                    iter = self.transition_store.append()
++                    self.transition_store.set_value(iter, 0, m[0])
 +                continue
 +
 +            m = re.findall("(.*)%s" % polgen.ADMIN_TRANSITION_INTERFACE, i) 
@@ -3490,7 +3558,7 @@
 +            return polgen.TUSER
 +        if self.root_user_radiobutton.get_active():
 +            return polgen.RUSER
-+        
++
 +    def generate_policy(self, *args):
 +        try:
 +            my_policy=polgen.policy(self.get_name(), self.get_type())
@@ -3504,7 +3572,7 @@
 +                my_policy.set_use_tmp(self.tmp_checkbutton.get_active() == 1)
 +                my_policy.set_use_uid(self.uid_checkbutton.get_active() == 1)
 +                my_policy.set_use_pam(self.pam_checkbutton.get_active() == 1)
-+                my_policy.set_init_script(self.exec_entry.get_text())
++                my_policy.set_init_script(self.script_entry.get_text())
 +            else:
 +                if self.get_type() == polgen.RUSER:
 +                    selected = []
@@ -3515,6 +3583,10 @@
 +                    self.transition_treeview.get_selection().selected_foreach(foreach, selected)
 +                    my_policy.set_transition_domains(selected)
 +                
++                    selected = []
++                    self.role_treeview.get_selection().selected_foreach(foreach, selected)
++                    my_policy.set_admin_roles(selected)
++                
 +            iter= self.store.get_iter_first()
 +            while(iter):
 +                if self.store.get_value(iter, 1) == FILE:
@@ -3666,8 +3738,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-05 22:26:53.000000000 -0400
-@@ -0,0 +1,715 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 11:55:14.000000000 -0400
+@@ -0,0 +1,718 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3729,8 +3801,8 @@
 +    # List of per_role_template interfaces
 +    ifs = interfaces.InterfaceSet()
 +    ifs.from_file(fd)
-+    fd.close()
 +    methods = ifs.interfaces.keys()
++    fd.close()
 +except:
 +    sys.stderr.write("could not open interface info [%s]\n" % fn)
 +    sys.exit(1)
@@ -4136,9 +4208,9 @@
 +	
 +	def generate_if(self):
 +                newif = ""
-+                if self.program:
++                if self.program != "":
 +                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_program_rules)
-+                if self.initscript:
++                if self.initscript != "":
 +                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_initscript_rules)
 +		
 +		for d in self.DEFAULT_DIRS:
@@ -4241,7 +4313,10 @@
 +	def generate_sh(self):
 +		newsh = re.sub("TEMPLATETYPE", self.name, script.compile)
 +		newsh = re.sub("PACKAGEFILENAME", self.file_name, newsh)
-+		newsh += re.sub("FILENAME", self.program, script.restorecon)
++                if self.program != "":
++                    newsh += re.sub("FILENAME", self.program, script.restorecon)
++                if self.initscript != "":
++                    newsh += re.sub("FILENAME", self.initscript, script.restorecon)
 +
 +		for i in self.files.keys():
 +			newsh += re.sub("FILENAME", i, script.restorecon)
@@ -9474,7 +9549,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-05 22:25:03.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-10 11:43:28.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9571,8 +9646,8 @@
 +files_dontaudit_search_all_dirs(TEMPLATETYPE_t)
 +
 +selinux_get_enforce_mode(TEMPLATETYPE_t)
-+seutil_domtrans_restorecon(TEMPLATETYPE_t)
-+seutil_search_default_contexts(mydbadm_t)
++seutil_domtrans_setfiles(TEMPLATETYPE_t)
++seutil_search_default_contexts(TEMPLATETYPE_t)
 +
 +logging_send_syslog_msg(TEMPLATETYPE_t)
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- policycoreutils.spec	6 Sep 2007 12:25:31 -0000	1.444
+++ policycoreutils.spec	10 Sep 2007 15:59:05 -0000	1.445
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -23,7 +23,7 @@
 Patch3:	 policycoreutils-gui.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
-Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed 
+Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
 Requires: libselinux >=  %{libselinuxver} libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -200,7 +200,10 @@
 fi
 
 %changelog
-* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
+- Change Requires /bin/rpm to rpm
+
+* Wed Sep 5 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
 - Bump libsemanage version for disable dontaudit
 - New gui features for creating admin users
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:04:28 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 12:04:28 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.32, 1.33 hwbrowser.spec, 1.44,
	1.45 sources, 1.38, 1.39
Message-ID: <200709101604.l8AG4SdH029292@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
make use of force tagging (since mercurial 0.9.4)
fix licensing and author blurbs
tag as GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	21 Jul 2007 12:26:16 -0000	1.32
+++ .cvsignore	10 Sep 2007 16:03:54 -0000	1.33
@@ -1 +1 @@
-hwbrowser-0.34.tar.bz2
+hwbrowser-0.35.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hwbrowser.spec	21 Jul 2007 15:08:41 -0000	1.44
+++ hwbrowser.spec	10 Sep 2007 16:03:54 -0000	1.45
@@ -1,9 +1,9 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.34
+Version: 0.35
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
-License: GPL
+License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -52,6 +52,13 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
+- make use of force tagging (since mercurial 0.9.4)
+
+* Fri Aug 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- fix licensing and author blurbs
+- tag as GPLv2+
+
 * Sat Jul 21 2007 Nils Philippsen <nphilipp at redhat.com> - 0.34-1
 - Use Hg for tagging
 - use bzipped tarballs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	21 Jul 2007 15:08:41 -0000	1.38
+++ sources	10 Sep 2007 16:03:54 -0000	1.39
@@ -1 +1 @@
-b02bacb9f05c37c018a294e3c9eb06b2  hwbrowser-0.34.tar.bz2
+476b50bdb95ebf3addc7484199d6e517  hwbrowser-0.35.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 16:06:00 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 12:06:00 -0400
Subject: rpms/freenx/FC-6 freenx.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709101606.l8AG60C5029423@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380

Modified Files:
	freenx.spec sources 
Log Message:
Bump to 0.7.0.



Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/FC-6/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	19 May 2007 17:19:49 -0000	1.6
+++ freenx.spec	10 Sep 2007 16:05:26 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 May 2007 17:19:49 -0000	1.5
+++ sources	10 Sep 2007 16:05:26 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 16:07:31 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 10 Sep 2007 12:07:31 -0400
Subject: rpms/octave/devel octave.spec,1.56,1.57
Message-ID: <200709101607.l8AG7V3P029579@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29513

Modified Files:
	octave.spec 
Log Message:
Remove redundant menu category in desktop file (bug 274431).


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- octave.spec	28 Jul 2007 20:30:27 -0000	1.56
+++ octave.spec	10 Sep 2007 16:06:58 -0000	1.57
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        2.9.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -89,7 +89,7 @@
 
 # Create desktop file
 rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor fedora --add-category X-Fedora \
+desktop-file-install --vendor fedora --add-category X-Fedora --remove-category Development \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
 
 # Create directories for add-on packages
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-3
+- Remove redundant menu category in desktop file (bug 274431).
+
 * Thu Jul 26 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-1
 - New release.
 - Changed ufsparse-devel dependency to suitesparse-devel.



From fedora-extras-commits at redhat.com  Mon Sep 10 16:07:47 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 10 Sep 2007 12:07:47 -0400
Subject: rpms/yum/devel .cvsignore, 1.59, 1.60 sources, 1.62, 1.63 yum.spec, 
	1.176, 1.177
Message-ID: <200709101607.l8AG7l2v029615@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29524

Modified Files:
	.cvsignore sources yum.spec 
Log Message:
3.2.5 - dump out unused patches from specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	28 Aug 2007 22:43:46 -0000	1.59
+++ .cvsignore	10 Sep 2007 16:07:13 -0000	1.60
@@ -1,2 +1,3 @@
 yum-3.2.3.tar.gz
 yum-3.2.4.tar.gz
+yum-3.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	5 Sep 2007 21:03:16 -0000	1.62
+++ sources	10 Sep 2007 16:07:14 -0000	1.63
@@ -1 +1,2 @@
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
+f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- yum.spec	5 Sep 2007 21:03:16 -0000	1.176
+++ yum.spec	10 Sep 2007 16:07:14 -0000	1.177
@@ -2,17 +2,15 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.4
-Release: 4%{?dist}
+Version: 3.2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
-Patch1: version-None-tuple.patch
-Patch2: rpmdb-unresolved.patch
-Patch3: yum-showasdep.patch
+Patch1: yum-showasdep.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -49,9 +47,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
-%patch1 -p1 -b .ver-to-none
-%patch2 -p1 -b .unresolved
-%patch3 -p1 -b .showdep
+%patch1 -p1 -b .showdep
 
 %build
 make
@@ -97,6 +93,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.5-1
+- 3.2.5 - pull out unused patches
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
 - test patch for only packages which are not being otherwise updated to not 
   be shown as being updated for deps



From fedora-extras-commits at redhat.com  Mon Sep 10 16:19:26 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 12:19:26 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch,1.29,1.30
Message-ID: <200709101619.l8AGJQtb031495@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452

Modified Files:
	policycoreutils-gui.patch 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
- Change Requires /bin/rpm to rpm


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policycoreutils-gui.patch	10 Sep 2007 15:59:05 -0000	1.29
+++ policycoreutils-gui.patch	10 Sep 2007 16:19:23 -0000	1.30
@@ -3738,8 +3738,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 11:55:14.000000000 -0400
-@@ -0,0 +1,718 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 12:16:38.000000000 -0400
+@@ -0,0 +1,719 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -4118,11 +4118,12 @@
 +
 +        def generate_admin_rules(self):
 +            newte = ""
-+            newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++            if self.type == RUSER:
++                newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
 +            
-+            for app in self.admin_domains:
-+                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
-+                newte += re.sub("APPLICATION", app, tmp)
++                for app in self.admin_domains:
++                    tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
++                    newte += re.sub("APPLICATION", app, tmp)
 +            return newte
 +
 +        def generate_admin_if(self):



From fedora-extras-commits at redhat.com  Mon Sep 10 16:19:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 12:19:28 -0400
Subject: rpms/opensc/devel .cvsignore, 1.19, 1.20 opensc.spec, 1.33,
	1.34 sources, 1.19, 1.20
Message-ID: <200709101619.l8AGJSDu031509@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31318

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-1
- 0.11.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Aug 2007 17:24:51 -0000	1.19
+++ .cvsignore	10 Sep 2007 16:18:55 -0000	1.20
@@ -1 +1 @@
-opensc-0.11.4-rc1.tar.gz
+opensc-0.11.4.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- opensc.spec	20 Aug 2007 17:24:51 -0000	1.33
+++ opensc.spec	10 Sep 2007 16:18:55 -0000	1.34
@@ -2,14 +2,13 @@
 
 Name:           opensc
 Version:        0.11.4
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
-#Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.11.1-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,7 +53,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
 f=doc/ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -145,6 +144,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-1
+- 0.11.4.
+
 * Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-0.1.rc1
 - 0.11.4-rc1, pkcs11-tool usage message fix applied upstream.
 - License: LGPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Aug 2007 17:24:51 -0000	1.19
+++ sources	10 Sep 2007 16:18:55 -0000	1.20
@@ -1 +1 @@
-63f82c0ce4cfa9cf300ab5773b784890  opensc-0.11.4-rc1.tar.gz
+2031aa617be609d50d014d5d370bb8a2  opensc-0.11.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 16:21:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:21:12 -0400
Subject: rpms/kasablanca/EL-5 kasablanca.spec,1.17,1.18
Message-ID: <200709101621.l8AGLC40031836@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kasablanca/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31796

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.4.0.2-10
- License: GPLv2+
- cosmetics



Index: kasablanca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasablanca/EL-5/kasablanca.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kasablanca.spec	29 Aug 2006 18:07:46 -0000	1.17
+++ kasablanca.spec	10 Sep 2007 16:20:39 -0000	1.18
@@ -2,9 +2,9 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
-License: GPL
+License: GPLv2+
 Url: 	 http://kasablanca.berlios.de/ 
 Source:	 http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz
 Group: 	 Applications/Internet 
@@ -37,7 +37,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# Needed(?) for older/legacy setups, harmless otherwise
+## Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
   export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
@@ -58,9 +58,7 @@
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --vendor="" \
-  --add-category="X-Fedora" \
   --add-category="Network" \
-  --add-category="Application" \
   --add-category="KDE" \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
@@ -91,29 +89,29 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun 
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
-%config %{_datadir}/config*/*
+%{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.4.0.2-10
+- License: GPLv2+
+- cosmetics
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-9
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:22:23 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 10 Sep 2007 12:22:23 -0400
Subject: rpms/yum/F-7 sources,1.61,1.62 yum.spec,1.164,1.165
Message-ID: <200709101622.l8AGMNb1032005@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31941

Modified Files:
	sources yum.spec 
Log Message:
3.2.5




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	29 Aug 2007 04:20:25 -0000	1.61
+++ sources	10 Sep 2007 16:21:50 -0000	1.62
@@ -1,2 +1,2 @@
-89cf296107d580655aaf83fb7206edfc  yum-3.2.3.tar.gz
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
+f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/yum.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- yum.spec	29 Aug 2007 16:16:28 -0000	1.164
+++ yum.spec	10 Sep 2007 16:21:50 -0000	1.165
@@ -2,16 +2,14 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.4
-Release: 2%{?dist}
+Version: 3.2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
-Patch1: version-None-tuple.patch
-Patch2: rpmdb-unresolved.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -47,8 +45,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
-%patch1 -p1 -b .ver-to-none
-%patch2 -p1 -b .unresolved
 
 
 %build
@@ -114,6 +110,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.5-1
+- 3.2.5
+- prune unnecessary patches
+ 
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.4-2
 - two patches from git-HEAD to test fixes of all sorts
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:23:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:23:33 -0400
Subject: rpms/gtk-qt-engine/EL-5 .cvsignore, 1.6, 1.7 gtk-qt-engine.spec,
	1.26, 1.27 sources, 1.6, 1.7
Message-ID: <200709101623.l8AGNXq2032104@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32013

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Log Message:
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
- gtk-qt-engine-20070811svn (revision 38)
- License: GPLv2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Dec 2006 20:10:06 -0000	1.6
+++ .cvsignore	10 Sep 2007 16:23:00 -0000	1.7
@@ -1,2 +1,3 @@
 gtk-qt-engine-0.7.tar.bz2
 gtk-qt-engine-20061211svn.tar.bz2
+gtk-qt-engine-20070811svn.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtk-qt-engine.spec	18 Dec 2006 20:10:06 -0000	1.26
+++ gtk-qt-engine.spec	10 Sep 2007 16:23:00 -0000	1.27
@@ -1,20 +1,21 @@
 
 %define real_ver 0.7
-%define svn 20061211svn
+%define svn 20070811svn
 
 Summary: A project allowing GTK to use Qt widget styles.
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.70
-Release: 4.%{svn}%{?dist}
+Release: 5.%{svn}%{?dist}
 
-License: GPL
-URL:     http://www.freedesktop.org/Software/gtk-qt
+License: GPLv2+
+URL: 	 http://gtk-qt.ecs.soton.ac.uk/
+#URL:	 http://www.freedesktop.org/Software/gtk-qt
 %if "%{?svn:1}" == "1"
 Source0: gtk-qt-engine-%{svn}.tar.bz2
 Source1: gtk-qt-engine-svn.sh
 %else
-Source0: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-%{real_ver}.tar.bz2
+Source0: http://gtk-qt.ecs.soton.ac.uk/files/%{real_ver}/gtk-qt-engine-%{real_ver}.tar.bz2 
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -23,8 +24,8 @@
 BuildRequires: gtk2-devel >= 2.2
 BuildRequires: libbonoboui-devel
 BuildRequires: qt-devel 
-BuildRequires: kdelibs-devel 
 BuildRequires: libpng-devel
+BuildRequires: kdelibs3-devel
 
 
 %description
@@ -41,11 +42,7 @@
 %build
 
 %if "%{?svn:1}" == "1"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake . \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DBUILD_SHARED_LIBS:BOOL=ON
+%cmake .
 %else
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 %configure
@@ -80,6 +77,10 @@
 
 
 %changelog 
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
+- gtk-qt-engine-20070811svn (revision 38)
+- License: GPLv2
+
 * Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-4.20061211svn
 - gtk-qt-engine-20061211svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Dec 2006 20:10:06 -0000	1.6
+++ sources	10 Sep 2007 16:23:00 -0000	1.7
@@ -1 +1 @@
-ab25f35e9812e3fd7dba080ad2853645  gtk-qt-engine-20061211svn.tar.bz2
+c06bd40c5892e7abca0470c2f680b32f  gtk-qt-engine-20070811svn.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 16:24:00 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:24:00 -0400
Subject: rpms/gtk-qt-engine/EL-5 gtk-qt-engine.spec,1.27,1.28
Message-ID: <200709101624.l8AGO0eW032119@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075

Modified Files:
	gtk-qt-engine.spec 
Log Message:
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
- gtk-qt-engine-20070811svn (revision 38)
- License: GPLv2



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtk-qt-engine.spec	10 Sep 2007 16:23:00 -0000	1.27
+++ gtk-qt-engine.spec	10 Sep 2007 16:23:27 -0000	1.28
@@ -25,7 +25,7 @@
 BuildRequires: libbonoboui-devel
 BuildRequires: qt-devel 
 BuildRequires: libpng-devel
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Mon Sep 10 16:38:49 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 12:38:49 -0400
Subject: rpms/xfsdump/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfsdump.spec, 1.1, 1.2
Message-ID: <200709101638.l8AGcnYF000878@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsdump/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792

Modified Files:
	.cvsignore sources xfsdump.spec 
Log Message:
* Thu May 31 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-1
- Update to xfsdump 2.2.45



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 17:26:34 -0000	1.2
+++ .cvsignore	10 Sep 2007 16:38:16 -0000	1.3
@@ -1 +1 @@
-xfsdump_2.2.42-1.tar.gz
+xfsdump_2.2.45-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 17:26:34 -0000	1.2
+++ sources	10 Sep 2007 16:38:16 -0000	1.3
@@ -1 +1 @@
-4e113a39b07723bbb140d2e5c5389cfe  xfsdump_2.2.42-1.tar.gz
+9f4f6da94d14e638639a542b0fa8a722  xfsdump_2.2.45-1.tar.gz


Index: xfsdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/xfsdump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfsdump.spec	1 Sep 2006 17:26:34 -0000	1.1
+++ xfsdump.spec	10 Sep 2007 16:38:16 -0000	1.2
@@ -1,14 +1,14 @@
 Summary: Administrative utilities for the XFS filesystem
 Name: xfsdump
-Version: 2.2.42
-Release: 2%{?dist}
+Version: 2.2.45
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
 Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, libtool, gettext
-BuildRequires: readline-devel, libtermcap-devel, xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
+BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
 Requires: xfsprogs >= 2.6.30, attr >= 2.0.0
 
 
@@ -60,8 +60,11 @@
 /sbin/*
 
 %changelog
+* Thu May 31 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-1
+- Update to xfsdump 2.2.45
+
 * Wed Aug 31 2006 Russell Cattelan <cattelan at thebarn.com> - 2.2.42-2
-Remove Distribution: tag
+- Remove Distribution: tag
 
 * Wed Aug 23 2006 Russell Cattelan <cattelan at thebarn.com> - 2.2.42-1
 - update to version 2.2.42 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:42:28 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 10 Sep 2007 12:42:28 -0400
Subject: rpms/gcstar/devel gcstar.spec,1.6,1.7
Message-ID: <200709101642.l8AGgSvD001500@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1348

Modified Files:
	gcstar.spec 
Log Message:
New upstream version: 1.2.0


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcstar.spec	18 Aug 2007 05:35:46 -0000	1.6
+++ gcstar.spec	10 Sep 2007 16:41:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        4%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
   - Updated license tag
 * Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3



From fedora-extras-commits at redhat.com  Mon Sep 10 16:57:27 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 12:57:27 -0400
Subject: rpms/svnkit/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec, 
	1.1, 1.2
Message-ID: <200709101657.l8AGvR0n005807@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5661

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 13:51:26 -0000	1.2
+++ .cvsignore	10 Sep 2007 16:56:47 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 13:51:26 -0000	1.2
+++ sources	10 Sep 2007 16:56:47 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 13:51:26 -0000	1.1
+++ svnkit.spec	10 Sep 2007 16:56:47 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 13:02:04 -0400
Subject: rpms/lyx/EL-5 .cvsignore, 1.16, 1.17 lyx.spec, 1.49, 1.50 sources, 
	1.15, 1.16
Message-ID: <200709101702.l8AH24lA012546@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12418

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
- lyx-1.4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Feb 2007 13:34:49 -0000	1.16
+++ .cvsignore	10 Sep 2007 17:01:29 -0000	1.17
@@ -2,3 +2,4 @@
 beamer.layout
 lyx-1.4.3.tar.bz2
 lyx-1.4.4.tar.bz2
+lyx-1.4.5.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- lyx.spec	16 Feb 2007 13:34:49 -0000	1.49
+++ lyx.spec	10 Sep 2007 17:01:29 -0000	1.50
@@ -1,13 +1,13 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.4.5.1
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.4-xdg_open.patch
@@ -19,8 +19,6 @@
 Source20: lyx.desktop
 Source21: lyx-qt.desktop
 Source22: lyx-xforms.desktop
-# misc
-Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout
 
 # qt frontend
 BuildRequires: qt-devel
@@ -134,7 +132,6 @@
 
 # misc/extras
 install -p -m644 %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
-install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/
 
 # Set up the lyx-specific class files where TeX can see them
 texmf=%{_datadir}/texmf
@@ -220,6 +217,9 @@
 
 
 %changelog
+* Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
+- lyx-1.4.5.1
+
 * Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-2
 - biffed sources, respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Feb 2007 13:34:49 -0000	1.15
+++ sources	10 Sep 2007 17:01:29 -0000	1.16
@@ -1,2 +1 @@
-c906271900a0627d3df2a38ad962a285  beamer.layout
-2e778eba4191c5f9fb2cafa7901c322c  lyx-1.4.4.tar.bz2
+b74d82e80c49c7edb782ec7395b7ca27  lyx-1.4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:27 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:02:27 -0400
Subject: rpms/gperiodic/F-7 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101702.l8AH2R22012649@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12484

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:01:53 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	5 May 2007 17:57:28 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:01:53 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 8%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
 * Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:01:53 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:58 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:02:58 -0400
Subject: rpms/ganymed-ssh2/F-7 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709101702.l8AH2whW012776@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12623

Modified Files:
	ganymed-ssh2.spec 
Log Message:
- Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/F-7/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	10 Sep 2007 17:02:24 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:04:11 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:04:11 -0400
Subject: rpms/gperiodic/FC-6 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101704.l8AH4BBM013012@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12899

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:03:37 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:03:37 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 7%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
 * Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
 - Correct information for "Bh", Bohrium
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:03:37 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:05:52 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 10 Sep 2007 13:05:52 -0400
Subject: rpms/perl-Cflow/EL-5 perl-Cflow.spec,1.5,1.6
Message-ID: <200709101705.l8AH5q8T013366@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-Cflow/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246

Modified Files:
	perl-Cflow.spec 
Log Message:
* Mon Sep 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 1.053-6
- Update License tag
- Add BR perl(ExtUtils::MakeMaker)



Index: perl-Cflow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cflow/EL-5/perl-Cflow.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cflow.spec	7 Sep 2006 16:34:57 -0000	1.5
+++ perl-Cflow.spec	10 Sep 2007 17:05:18 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           perl-Cflow
 Version:        1.053
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Find flows in raw IP flow files
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://net.doit.wisc.edu/~plonka/Cflow/
 Source0:        http://net.doit.wisc.edu/~plonka/Cflow/Cflow-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  flow-tools-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -55,6 +56,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 1.053-6
+- Update License tag
+- Add BR perl(ExtUtils::MakeMaker)
+
 * Thu Sep  7 2006 - Orion Poplawski <orion at cora.nwra.com> - 1.053-5
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:05:56 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:05:56 -0400
Subject: rpms/gperiodic/EL-4 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709101705.l8AH5uow013416@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13232

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:05:22 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/gperiodic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gperiodic.spec	30 Oct 2005 21:49:09 -0000	1.1
+++ gperiodic.spec	10 Sep 2007 17:05:22 -0000	1.2
@@ -1,13 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 2%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -16,7 +17,7 @@
 
 %prep
 %setup -q
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -26,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -58,6 +54,27 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-6
+- Rebuild for distag problem
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-5
+- Modify URL in package descrpition and source
+
+* Tue Feb 14 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-4
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-3
+- Rebuild for FC5
+
 * Mon Oct 24 2005 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-2
 - Applied patch file : 
 https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=120301


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:05:22 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:07:33 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:07:33 -0400
Subject: rpms/gperiodic/EL-5 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101707.l8AH7Xh1013749@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13616

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:07:00 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:07:00 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 7%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
 * Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
 - Correct information for "Bh", Bohrium
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:07:00 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:11:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:11:15 -0400
Subject: rpms/gperiodic/EL-4 gperiodic-bh.patch,NONE,1.1
Message-ID: <200709101711.l8AHBFgM014548@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14505

Added Files:
	gperiodic-bh.patch 
Log Message:


gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>2</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>3</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>4</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>6</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>7</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>9</sup> 7s<sup>1</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:13:15 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:13:15 -0400
Subject: rpms/ganymed-ssh2/FC-6 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709101713.l8AHDFYY014897@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783

Modified Files:
	ganymed-ssh2.spec 
Log Message:
- Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-6/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	10 Sep 2007 17:12:42 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:14:32 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:14:32 -0400
Subject: rpms/gperiodic/EL-4 gperiodic.spec,1.2,1.3
Message-ID: <200709101714.l8AHEWWW015101@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15021

Modified Files:
	gperiodic.spec 
Log Message:



Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/gperiodic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gperiodic.spec	10 Sep 2007 17:05:22 -0000	1.2
+++ gperiodic.spec	10 Sep 2007 17:13:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -54,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-2
+- Rebuild
+
 * Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:23:32 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:23:32 -0400
Subject: rpms/svnkit/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.1, 1.2
Message-ID: <200709101723.l8AHNW27016348@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 15:16:23 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:22:59 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 15:16:23 -0000	1.2
+++ sources	10 Sep 2007 17:22:59 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 15:16:23 -0000	1.1
+++ svnkit.spec	10 Sep 2007 17:22:59 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:27:05 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Sep 2007 13:27:05 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.216,
	1.217 preferred-apps.patch, 1.1, 1.2
Message-ID: <200709101727.l8AHR5nH017422@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17292

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
- create ~/.local/share/applications before writing out 
  preferred app launchers



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- gnome-panel.spec	6 Sep 2007 16:58:07 -0000	1.216
+++ gnome-panel.spec	10 Sep 2007 17:26:32 -0000	1.217
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -311,6 +311,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 10 2007 Ray Strode <rstrode at redhat.com> - 2.19.92-3
+- create ~/.local/share/applications before writing out 
+  preferred app launchers
+
 * Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-2
 - Improve the handling of preferred apps in launchers
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- preferred-apps.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ preferred-apps.patch	10 Sep 2007 17:26:32 -0000	1.2
@@ -1,25 +1,18 @@
-diff -up gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps gnome-panel-2.19.6/gnome-panel/main.c
---- gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps	2007-08-28 01:01:57.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/main.c	2007-08-28 01:02:42.000000000 -0400
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
+diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h	2007-09-10 13:22:09.000000000 -0400
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
  
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- 			      GCONF_CLIENT_PRELOAD_NONE,
- 			      NULL);
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
  
-+	panel_preferred_apps_init ();
- 	panel_global_config_load ();
- 	panel_lockdown_init ();
- 	panel_profile_load ();
-diff -up gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.c
---- gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps	2007-08-28 00:49:14.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/launcher.c	2007-08-28 01:01:47.000000000 -0400
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.c
+--- gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps	2007-09-10 13:22:09.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-10 13:24:09.000000000 -0400
 @@ -22,6 +22,7 @@
  #include <libgnomeui/gnome-url.h>
  #include <libgnomevfs/gnome-vfs.h>
@@ -36,7 +29,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1264,3 +1266,166 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1284,3 +1286,173 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -176,7 +169,7 @@
 +panel_preferred_apps_init (void)
 +{
 +	GConfClient *client;
-+	gchar *filename, *exec;
++        gchar *dirname, *filename, *exec;
 +	gint i;
 +
 +	const gchar *keys[] = {
@@ -191,21 +184,28 @@
 +	client = panel_gconf_get_client ();
 +
 +	for (i = 0; keys[i]; i++) {
-+		filename = g_build_filename (g_get_user_data_dir (), 
-+					     "applications", files[i], NULL);
++                dirname = g_build_filename (g_get_user_data_dir (), 
++					    "applications", NULL);
++		filename = g_build_filename (dirname, files[i], NULL);
 +		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
++                        
++                        if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
++                            g_mkdir_with_parents (dirname);
++
 +			exec = gconf_client_get_string (client, keys[i], NULL);
 +			update_preferred_app (filename, keys[i], exec);
 +			g_free (exec);
 +		}
++                g_free (dirname);
++
 +		gconf_client_notify_add (client, keys[i],
 +					 (GConfClientNotifyFunc) preferred_app_changed,
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.h
---- gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps	2007-08-28 00:46:47.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/launcher.h	2007-08-28 00:47:10.000000000 -0400
+diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.h
+--- gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps	2007-09-10 13:22:09.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-10 13:22:09.000000000 -0400
 @@ -75,6 +75,7 @@ void            launcher_properties_dest
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
@@ -214,21 +214,28 @@
  
  G_END_DECLS
  
-diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps	2007-08-28 00:48:11.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h	2007-08-28 00:48:34.000000000 -0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
+diff -up gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps gnome-panel-2.19.92/gnome-panel/main.c
+--- gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/main.c	2007-09-10 13:22:09.000000000 -0400
+@@ -26,6 +26,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
  
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -81,6 +82,7 @@ main (int argc, char **argv)
+ 			      GCONF_CLIENT_PRELOAD_NONE,
+ 			      NULL);
  
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps	2007-08-28 00:47:26.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c	2007-08-28 00:47:51.000000000 -0400
++	panel_preferred_apps_init ();
+ 	panel_global_config_load ();
+ 	panel_lockdown_init ();
+ 	panel_profile_load ();
+diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c	2007-09-10 13:22:09.000000000 -0400
 @@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }



From fedora-extras-commits at redhat.com  Mon Sep 10 17:29:31 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Sep 2007 13:29:31 -0400
Subject: rpms/gnome-panel/devel preferred-apps.patch,1.2,1.3
Message-ID: <200709101729.l8AHTVGc017814@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776

Modified Files:
	preferred-apps.patch 
Log Message:
fix typo in previous patch


preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- preferred-apps.patch	10 Sep 2007 17:26:32 -0000	1.2
+++ preferred-apps.patch	10 Sep 2007 17:29:28 -0000	1.3
@@ -190,7 +190,7 @@
 +		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
 +                        
 +                        if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
-+                            g_mkdir_with_parents (dirname);
++                            g_mkdir_with_parents (dirname, 0755);
 +
 +			exec = gconf_client_get_string (client, keys[i], NULL);
 +			update_preferred_app (filename, keys[i], exec);



From fedora-extras-commits at redhat.com  Mon Sep 10 17:47:14 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:47:14 -0400
Subject: rpms/eclipse-subclipse/FC-6 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709101747.l8AHlEVX019010@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
- Update to upstream 1.2.4
- Build for all supported arquitectures
- Change MANIFEST.MF patch to be applied on prep stage



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 18:25:12 -0000	1.5
+++ .cvsignore	10 Sep 2007 17:46:42 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 18:25:12 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	10 Sep 2007 17:46:42 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 18:25:12 -0000	1.5
+++ eclipse-subclipse.spec	10 Sep 2007 17:46:42 -0000	1.6
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,16 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 18:25:12 -0000	1.5
+++ sources	10 Sep 2007 17:46:42 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 17:55:03 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 10 Sep 2007 13:55:03 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.2.2-setuptools.patch,1.2,1.3
Message-ID: <200709101755.l8AHt3wl019306@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19267

Modified Files:
	TurboGears-1.0.2.2-setuptools.patch 
Log Message:
* Leave cherrypy in and add a maximum for SQLAlchemy.


TurboGears-1.0.2.2-setuptools.patch:

Index: TurboGears-1.0.2.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.2.2-setuptools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.2.2-setuptools.patch	11 May 2007 07:23:36 -0000	1.2
+++ TurboGears-1.0.2.2-setuptools.patch	10 Sep 2007 17:55:00 -0000	1.3
@@ -1,10 +1,10 @@
---- setup.py.orig	2007-05-11 02:49:06.000000000 -0400
-+++ setup.py	2007-05-11 02:49:30.000000000 -0400
-@@ -16,32 +16,21 @@
-         "TurboJson >= 0.9.9",
-         "TurboCheetah >= 0.9.5",
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -18,30 +18,20 @@ install_requires = [
          "TurboKid >= 1.0.1",
--        "CherryPy >= 2.2.1,<3.0.0alpha",
+         "CherryPy >= 2.2.1,<3.0.0alpha",
          "simplejson >= 1.3",
 -        "elementtree >= 1.2.6",
          "PasteScript >= 0.9.7",
@@ -13,8 +13,9 @@
          "RuleDispatch >= 0.5a0.dev-r2303",
          "DecoratorTools >= 1.4",
 -        "ConfigObj >= 4.3.2"]
+-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
 +        ]
- tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
++tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
  standard = ["SQLObject>=0.8,<0.10dev"]
  
  # python 2.5 compatible list
@@ -34,3 +35,12 @@
  
  setup(
      name="TurboGears",
+@@ -122,7 +112,7 @@ the TurboGears subversion repository</a>
+     extras_require = {
+         "exp" : ["TGFastData"],
+         "standard" : standard,
+-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
++        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
+         "testtools" : ["nose >= 0.9.1"],
+         "tgtesttools" : tgtesttools,
+     },



From fedora-extras-commits at redhat.com  Mon Sep 10 18:04:03 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 14:04:03 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-IA_NA-ignore.patch, NONE,
	1.1 dhcpv6-0.10-elapsed-time.patch, NONE,
	1.1 dhcpv6-0.10-lsb.patch, NONE,
	1.1 dhcpv6-0.10-reassign-global.patch, NONE,
	1.1 dhcpv6-0.10-remove-leases.patch, NONE,
	1.1 dhcpv6-0.10-retransmit-confirm.patch, NONE, 1.1 dhcpv6.spec,
	1.63, 1.64
Message-ID: <200709101804.l8AI43nC026107@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25969

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-IA_NA-ignore.patch dhcpv6-0.10-elapsed-time.patch 
	dhcpv6-0.10-lsb.patch dhcpv6-0.10-reassign-global.patch 
	dhcpv6-0.10-remove-leases.patch 
	dhcpv6-0.10-retransmit-confirm.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
- Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
- Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)
- In dhcp6c, do not remove leases no on the updated list (#265761)
- Retransmit confirm message in expected duration in dhcp6c (#251192)
- Store correct value to elapsed time option in solicit msg (#249451)
- Reassign IPv6 global address after confirm/reply msg in dhcp6c (#249466)


dhcpv6-0.10-IA_NA-ignore.patch:

--- NEW FILE dhcpv6-0.10-IA_NA-ignore.patch ---
diff -up dhcp-0.10/client6_addr.c.ia_na_ignore dhcp-0.10/client6_addr.c
--- dhcp-0.10/client6_addr.c.ia_na_ignore	2007-09-10 13:40:07.000000000 -0400
+++ dhcp-0.10/client6_addr.c	2007-09-10 13:41:25.000000000 -0400
@@ -97,8 +97,7 @@ dhcp6_add_iaidaddr(struct dhcp6_optinfo 
 	struct dhcp6_lease *cl_lease;
 	double d;
 	/* ignore IA with T1 > T2 */
-	if (client6_iaidaddr.client6_info.iaidinfo.renewtime >
-	    client6_iaidaddr.client6_info.iaidinfo.rebindtime) {
+	if (optinfo->iaidinfo.renewtime > optinfo->iaidinfo.rebindtime) {
 		dprintf(LOG_INFO, " T1 time is greater than T2 time");
 		return (0);
 	}

dhcpv6-0.10-elapsed-time.patch:

--- NEW FILE dhcpv6-0.10-elapsed-time.patch ---
diff -up dhcp-0.10/dhcp6c.c.time dhcp-0.10/dhcp6c.c
--- dhcp-0.10/dhcp6c.c.time	2007-09-10 13:51:30.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2007-09-10 13:53:14.000000000 -0400
@@ -1040,12 +1040,10 @@ client6_send(ev)
 		unsigned int etime;
 		gettimeofday(&now, NULL);
 		timeval_sub(&now, &(ev->start_time), &duration);
-		optinfo.elapsed_time = 
 		etime = (duration.tv_sec) * 100 + (duration.tv_usec) / 10000;
 		if (etime > DHCP6_ELAPSEDTIME_MAX)
-			optinfo.elapsed_time = DHCP6_ELAPSEDTIME_MAX;
-		else
-			optinfo.elapsed_time = etime;
+			etime = DHCP6_ELAPSEDTIME_MAX;
+		optinfo.elapsed_time = htons((uint16_t)etime);
 	}
 	dh6->dh6_xid &= ~ntohl(DH6_XIDMASK);
 	dh6->dh6_xid |= htonl(ev->xid);

dhcpv6-0.10-lsb.patch:

--- NEW FILE dhcpv6-0.10-lsb.patch ---
diff -up dhcp-0.10/dhcp6r.sh.lsb dhcp-0.10/dhcp6r.sh
--- dhcp-0.10/dhcp6r.sh.lsb	2007-09-10 12:52:07.000000000 -0400
+++ dhcp-0.10/dhcp6r.sh	2007-09-10 13:04:13.000000000 -0400
@@ -1,14 +1,29 @@
-#!/bin/bash
+#!/bin/sh
 #
-# chkconfig: - 66 36
-# description: dhcp6r supports the DHCPv6 relay agent protocol.
+### BEGIN INIT INFO
+# Provides: dhcp6r
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start: $network
+# Required-Start:
+# Required-Stop:
+# Short-Description: Start and stop the DHCPv6 relay agent
+# Description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages
+#              from clients to servers and vice versa.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
+#
+# chkconfig: - 2345 66 36
+# description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages \
+#              from clients to servers and vice versa.
 # processname: dhcp6r
 # config: /etc/sysconfig/dhcp6r
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcp6r
 dhcp6r=/usr/sbin/dhcp6r
 lockfile=/var/lock/subsys/dhcp6r
@@ -39,7 +54,9 @@ stop() {
     killproc $prog -TERM
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && success || failure
+    echo
+    rm -f $lockfile
     return $RETVAL
 }
 
@@ -47,21 +64,22 @@ stop() {
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    reload)
+    try-restart|reload)
         RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
         fi
         ;;
     status)
@@ -69,7 +87,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
         RETVAL=3
         ;;
 esac
diff -up dhcp-0.10/dhcp6s.sh.lsb dhcp-0.10/dhcp6s.sh
--- dhcp-0.10/dhcp6s.sh.lsb	2007-09-10 12:52:07.000000000 -0400
+++ dhcp-0.10/dhcp6s.sh	2007-09-10 13:23:04.000000000 -0400
@@ -1,16 +1,36 @@
-#!/bin/bash
+#!/bin/sh
 #
-# chkconfig: - 66 36
-# description: dhcp6s supports the server side of Dynamic Host Configuration \
-#              Protocol for IPv6.
+### BEGIN INIT INFO
+# Provides: dhcp6s
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start: $network
+# Required-Start:
+# Required-Stop:
+# Short-Description: Start and stop the DHCPv6 server agent
+# Description: dhcp6s provides IPv6 addresses and prefix assignment
+#              administrative policy and configuration information for
+#              DHCPv6 clients.  dhcp6s also manages those addresses and
+#              prefixes, such as IPv6 addresses, prefixes, DNS server
+#              addresses, or ntp server addresses.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
+#
+# chkconfig: - 2345 66 36
+# description: dhcp6s provides IPv6 addresses and prefix assignment \
+#              administrative policy and configuration information for \
+#              DHCPv6 clients.  dhcp6s also manages those addresses and \
+#              prefixes, such as IPv6 addresses, prefixes, DNS server \
+#              addresses, or ntp server addresses.
 # processname: dhcp6s
 # config: /etc/dhcp6s.conf
 # config: /etc/sysconfig/dhcp6s
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcp6s
 dhcp6s=/usr/sbin/dhcp6s
 lockfile=/var/lock/subsys/dhcp6s
@@ -46,7 +66,9 @@ stop() {
     killproc $prog -TERM
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && success || failure
+    echo
+    rm -f $lockfile
     return $RETVAL
 }
 
@@ -54,21 +76,22 @@ stop() {
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    reload)
+    try-restart|reload)
         RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
         fi
         ;;
     status)
@@ -76,7 +99,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
         RETVAL=3
         ;;
 esac

dhcpv6-0.10-reassign-global.patch:

--- NEW FILE dhcpv6-0.10-reassign-global.patch ---
diff -up dhcp-0.10/dhcp6c.c.global dhcp-0.10/dhcp6c.c
--- dhcp-0.10/dhcp6c.c.global	2007-09-10 13:57:04.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2007-09-10 13:58:03.000000000 -0400
@@ -1977,8 +1977,8 @@ static struct dhcp6_timer 
 			 * send confirm for ipv6address or 
 			 * rebind for prefix delegation */
 			dhcp6_remove_timer(client6_iaidaddr.timer);
-			client6_request_flag &= CLIENT6_CONFIRM_ADDR;
-			create_request_list(0);
+			client6_request_flag |= CLIENT6_CONFIRM_ADDR;
+			create_request_list(1);
 			if (client6_iaidaddr.client6_info.type == IAPD)
 				newstate = DHCP6S_REBIND;
 			else

dhcpv6-0.10-remove-leases.patch:

--- NEW FILE dhcpv6-0.10-remove-leases.patch ---
diff -up dhcp-0.10/client6_addr.c.leases dhcp-0.10/client6_addr.c
--- dhcp-0.10/client6_addr.c.leases	2007-09-10 13:44:36.000000000 -0400
+++ dhcp-0.10/client6_addr.c	2007-09-10 13:45:23.000000000 -0400
@@ -386,6 +386,7 @@ dhcp6_update_iaidaddr(struct dhcp6_optin
 		}
 		continue;
 	}
+#if 0
 	/* remove leases that not on the updated list */
 	for (cl = TAILQ_FIRST(&client6_iaidaddr.lease_list); cl; cl = cl_next) { 
 			cl_next = TAILQ_NEXT(cl, link);
@@ -394,7 +395,8 @@ dhcp6_update_iaidaddr(struct dhcp6_optin
 		/* remove leases that not on the updated list */
 		if (lv == NULL)
 			dhcp6_remove_lease(cl);
-	}	
+	}
+#endif
 	/* update server id */
 	if (client6_iaidaddr.state == REBIND) {
 		if (duidcpy(&client6_iaidaddr.client6_info.serverid, &optinfo->serverID)) {

dhcpv6-0.10-retransmit-confirm.patch:

--- NEW FILE dhcpv6-0.10-retransmit-confirm.patch ---
diff -up dhcp-0.10/dhcp6.h.retransmit dhcp-0.10/dhcp6.h
--- dhcp-0.10/dhcp6.h.retransmit	2007-09-10 13:48:28.000000000 -0400
+++ dhcp-0.10/dhcp6.h	2007-09-10 13:49:01.000000000 -0400
@@ -88,7 +88,7 @@
 #define REC_TIMEOUT	2000
 #define REC_MAX_RC	8
 #define CNF_TIMEOUT	1000
-#define CNF_MAX_RD	10000
+#define CNF_MAX_RD	10
 #define CNF_MAX_RT	4000
 
 #define DHCP6_DURATITION_INFINITE 0xffffffff


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- dhcpv6.spec	10 Sep 2007 15:47:41 -0000	1.63
+++ dhcpv6.spec	10 Sep 2007 18:03:29 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -18,6 +18,12 @@
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-init_leases.patch
 Patch8:  %{name}-0.10-device-names.patch
+Patch9:  %{name}-0.10-lsb.patch
+Patch10: %{name}-0.10-IA_NA-ignore.patch
+Patch11: %{name}-0.10-remove-leases.patch
+Patch12: %{name}-0.10-retransmit-confirm.patch
+Patch13: %{name}-0.10-elapsed-time.patch
+Patch14: %{name}-0.10-reassign-global.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -58,7 +64,7 @@
 %package -n libdhcp6client-devel
 Summary:  Header files for development with the DHCPv6 client library
 Group:    Development/Libraries
-Requires: pkgconfig, %{name} = %{version}-%{release}
+Requires: pkgconfig, libdhcp6client = %{version}-%{release}
 
 %description -n libdhcp6client-devel
 Header files for development with the DHCPv6 client library.
@@ -83,6 +89,12 @@
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .init_leases
 %patch8 -p1 -b .device-names
+%patch9 -p1 -b .lsb
+%patch10 -p1 -b .ia_na_ignore
+%patch11 -p1 -b .remove_leases
+%patch12 -p1 -b .retransmit
+%patch13 -p1 -b .elapsed
+%patch14 -p1 -b .reassign
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -177,6 +189,14 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
+- Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
+- Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)
+- In dhcp6c, do not remove leases no on the updated list (#265761)
+- Retransmit confirm message in expected duration in dhcp6c (#251192)
+- Store correct value to elapsed time option in solicit msg (#249451)
+- Reassign IPv6 global address after confirm/reply msg in dhcp6c (#249466)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
 - Recognize 802.1Q VLAN network device names (#245115)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:04:05 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:04:05 -0400
Subject: rpms/postr/devel .cvsignore, 1.3, 1.4 postr.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <200709101804.l8AI45eb026116@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25920

Modified Files:
	.cvsignore postr.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jun 2007 08:04:56 -0000	1.3
+++ .cvsignore	10 Sep 2007 18:03:30 -0000	1.4
@@ -1 +1 @@
-postr-0.7.tar.gz
+postr-0.8.tar.gz


Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/postr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postr.spec	16 Jun 2007 08:04:56 -0000	1.2
+++ postr.spec	10 Sep 2007 18:03:30 -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:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2007 08:04:56 -0000	1.3
+++ sources	10 Sep 2007 18:03:30 -0000	1.4
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:12:34 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Mon, 10 Sep 2007 14:12:34 -0400
Subject: rpms/libflaim/devel libflaim.spec,1.2,1.3
Message-ID: <200709101812.l8AICYX0026959@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/libflaim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libflaim.spec	8 Sep 2007 00:12:05 -0000	1.2
+++ libflaim.spec	10 Sep 2007 18:11:59 -0000	1.3
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	12%{?dist}
+Release:	15%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Mon Sep 10 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-15
+- bump release for EVR issues
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
 - build system issue
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:16:27 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:16:27 -0400
Subject: rpms/postr/devel postr.spec,1.3,1.4
Message-ID: <200709101816.l8AIGR9X027245@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27219

Modified Files:
	postr.spec 
Log Message:
Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/postr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postr.spec	10 Sep 2007 18:03:30 -0000	1.3
+++ postr.spec	10 Sep 2007 18:15:54 -0000	1.4
@@ -6,7 +6,7 @@
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,7 @@
 %changelog
 * Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
 - New upstream
+- Updated license tag.
 
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.



From fedora-extras-commits at redhat.com  Mon Sep 10 18:21:40 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Sep 2007 14:21:40 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-kde149704.diff, 1.1.2.1,
	1.1.2.2 kdelibs.spec, 1.223.2.17, 1.223.2.18
Message-ID: <200709101821.l8AILeSF027473@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27448/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-kde149704.diff kdelibs.spec 
Log Message:
use upstream fix (by David Faure) for kde#149704

kdelibs-3.93.0-kde149704.diff:

Index: kdelibs-3.93.0-kde149704.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kdelibs-3.93.0-kde149704.diff,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- kdelibs-3.93.0-kde149704.diff	10 Sep 2007 06:00:08 -0000	1.1.2.1
+++ kdelibs-3.93.0-kde149704.diff	10 Sep 2007 18:21:37 -0000	1.1.2.2
@@ -1,15 +1,71 @@
-diff -ur kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp
---- kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp	2007-08-29 23:53:46.000000000 +0200
-+++ kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp	2007-09-10 06:09:18.000000000 +0200
-@@ -341,6 +341,11 @@
+Index: xmlgui/kxmlguiclient.cpp
+===================================================================
+--- xmlgui/kxmlguiclient.cpp	(revision 709581)
++++ xmlgui/kxmlguiclient.cpp	(working copy)
+@@ -785,11 +785,11 @@
+     allDocuments.append( d );
+   }
  
-     QStringList allFiles = componentData().dirs()->findAllResources("data", filter) + componentData().dirs()->findAllResources("data", _file);
+-  QList<DocStruct>::Iterator best = allDocuments.end();
++  QList<DocStruct>::const_iterator best = allDocuments.end();
+   uint bestVersion = 0;
  
-+    if (allFiles.isEmpty() || allFiles.first().startsWith("/usr/"))
-+    {
-+      allFiles.prepend(KStandardDirs::locateLocal("data", filter));
-+    }
-+
-     file = findMostRecentXMLFile( allFiles, doc );
+-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
+-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
++  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
++  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
+   for (; docIt != docEnd; ++docIt )
+   {
+     QString versionStr = findVersionNumber( (*docIt).data );
+@@ -814,19 +814,19 @@
+   {
+     if ( best != allDocuments.begin() )
+     {
+-      QList<DocStruct>::Iterator local = allDocuments.begin();
++      QList<DocStruct>::iterator local = allDocuments.begin();
++      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
  
-     if ( file.isEmpty() )
+-      // load the local document and extract the action properties
+-      QDomDocument document;
+-      document.setContent( (*local).data );
++        // load the local document and extract the action properties
++        QDomDocument document;
++        document.setContent( (*local).data );
+ 
+-      ActionPropertiesMap properties = extractActionProperties( document );
++        ActionPropertiesMap properties = extractActionProperties( document );
+ 
+-      // in case the document has a ActionProperties section
+-      // we must not delete it but copy over the global doc
+-      // to the local and insert the ActionProperties section
+-      if ( !properties.isEmpty() )
+-      {
++        // in case the document has a ActionProperties section
++        // we must not delete it but copy over the global doc
++        // to the local and insert the ActionProperties section
++        if ( !properties.isEmpty() ) {
+           // now load the global one with the higher version number
+           // into memory
+           document.setContent( (*best).data );
+@@ -845,14 +845,14 @@
+             f.write( utf8data.constData(), utf8data.length() );
+             f.close();
+           }
++        }
++        else
++        {
++          QString f = (*local).file;
++          QString backup = f + QLatin1String( ".backup" );
++          QFile::rename( f, backup );
++        }
+       }
+-      else
+-      {
+-        QString f = (*local).file;
+-        QString backup = f + QLatin1String( ".backup" );
+-        QDir dir;
+-        dir.rename( f, backup );
+-      }
+     }
+     doc = (*best).data;
+     return (*best).file;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.17
retrieving revision 1.223.2.18
diff -u -r1.223.2.17 -r1.223.2.18
--- kdelibs.spec	10 Sep 2007 06:00:08 -0000	1.223.2.17
+++ kdelibs.spec	10 Sep 2007 18:21:37 -0000	1.223.2.18
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -108,7 +108,9 @@
 %setup -q -n kdelibs-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+pushd kdeui
+%patch2 -p0
+popd
 %patch3 -p1
 
 
@@ -215,6 +217,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
+- use upstream fix (by David Faure) for kde#149704
+
 * Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - fix kde#149703, kde#149704, kde#149705
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:25:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 14:25:14 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.52,
	1.53 selinux-policy.spec, 1.492, 1.493
Message-ID: <200709101825.l8AIPE1H027767@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27741

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- policy-20070501.patch	4 Sep 2007 20:18:57 -0000	1.52
+++ policy-20070501.patch	10 Sep 2007 18:25:11 -0000	1.53
@@ -469,12 +469,12 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-08-30 10:26:28.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-09-07 17:06:51.000000000 -0400
 @@ -22,6 +22,7 @@
  
  # Allow dmidecode to read /dev/mem
  dev_read_raw_memory(dmidecode_t)
-+dev_search_sysfs(dmidecode_t)
++dev_read_sysfs(dmidecode_t)
  
  mls_file_read_up(dmidecode_t)
  
@@ -2512,8 +2512,33 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.6.4/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-08-07 09:42:35.000000000 -0400
-@@ -333,6 +333,24 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-09-10 08:58:54.000000000 -0400
+@@ -108,6 +108,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Set the priority of kernel threads.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_setsched',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:process setsched;
++')
++
++########################################
++## <summary>
+ ##	Send a SIGCHLD signal to kernel threads.
+ ## </summary>
+ ## <param name="domain">
+@@ -333,6 +351,24 @@
  
  ########################################
  ## <summary>
@@ -2538,7 +2563,7 @@
  ##	Allow link to the kernel key ring.
  ## </summary>
  ## <param name="domain">
-@@ -1848,6 +1866,26 @@
+@@ -1848,6 +1884,26 @@
  
  ########################################
  ## <summary>
@@ -2565,7 +2590,7 @@
  ##	Do not audit attempts to list unlabeled directories.
  ## </summary>
  ## <param name="domain">
-@@ -2158,9 +2196,6 @@
+@@ -2158,9 +2214,6 @@
  	')
  
  	allow $1 unlabeled_t:association { sendto recvfrom };
@@ -2887,7 +2912,7 @@
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-30 13:53:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-09-05 07:17:12.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -2899,6 +2924,22 @@
  	#This type is for webpages
  	type httpd_$1_content_t, httpdcontent; # customizable
  	files_type(httpd_$1_content_t)
+@@ -65,13 +61,13 @@
+ 	dontaudit httpd_$1_script_t httpd_t:unix_stream_socket { read write };
+ 
+ 	# Allow the script process to search the cgi directory, and users directory
+-	allow httpd_$1_script_t httpd_$1_content_t:dir search_dir_perms;
++	allow httpd_$1_script_t httpd_$1_content_t:dir list_dir_perms;
+ 
+ 	append_files_pattern(httpd_$1_script_t,httpd_log_t,httpd_log_t)
+ 	logging_search_logs(httpd_$1_script_t)
+ 
+ 	can_exec(httpd_$1_script_t, httpd_$1_script_exec_t)
+-	allow httpd_$1_script_t httpd_$1_script_exec_t:dir search_dir_perms;
++	allow httpd_$1_script_t httpd_$1_script_exec_t:dir list_dir_perms;
+ 
+ 	allow httpd_$1_script_t httpd_$1_script_ra_t:dir { list_dir_perms add_entry_dir_perms };
+ 	read_files_pattern(httpd_$1_script_t,httpd_$1_script_ra_t,httpd_$1_script_ra_t)
 @@ -120,10 +116,6 @@
  		can_exec(httpd_$1_script_t, httpdcontent)
  	')
@@ -3567,7 +3608,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.6.4/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-09-10 10:51:56.000000000 -0400
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -3587,7 +3628,7 @@
  allow apcupsd_t self:fifo_file rw_file_perms;
  allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
  allow apcupsd_t self:tcp_socket create_stream_socket_perms;
-@@ -35,16 +40,23 @@
+@@ -35,16 +40,24 @@
  manage_files_pattern(apcupsd_t,apcupsd_log_t,apcupsd_log_t)
  logging_log_filetrans(apcupsd_t,apcupsd_log_t,{ file dir })
  
@@ -3610,10 +3651,11 @@
 +corenet_tcp_bind_apcupsd_port(apcupsd_t)
 +corenet_sendrecv_apcupsd_server_packets(apcupsd_t)
 +corenet_tcp_connect_apcupsd_port(apcupsd_t)
++allow apcupsd_t self:udp_socket create_socket_perms;
  
  dev_rw_generic_usb_dev(apcupsd_t)
  
-@@ -53,6 +65,15 @@
+@@ -53,6 +66,15 @@
  
  files_read_etc_files(apcupsd_t)
  files_search_locks(apcupsd_t)
@@ -3629,13 +3671,15 @@
  
  libs_use_ld_so(apcupsd_t)
  libs_use_shared_libs(apcupsd_t)
-@@ -61,7 +82,39 @@
+@@ -61,7 +83,41 @@
  
  miscfiles_read_localization(apcupsd_t)
  
 -ifdef(`targeted_policy',`
 -	term_dontaudit_use_unallocated_ttys(apcupsd_t)
 -	term_dontaudit_use_generic_ptys(apcupsd_t)
++sysnet_dns_name_resolve(apcupsd_t)
++
 +userdom_use_unpriv_users_ttys(apcupsd_t)
 +userdom_use_unpriv_users_ptys(apcupsd_t)
 +
@@ -6605,7 +6649,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-2.6.4/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2007-09-04 17:47:25.000000000 -0400
 @@ -5,6 +5,7 @@
  /usr/libexec/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
  /usr/libexec/postfix/lmtp --	gen_context(system_u:object_r:postfix_smtp_exec_t,s0)
@@ -9011,7 +9055,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.6.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-05 12:06:43.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -9070,7 +9114,7 @@
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t)
  userdom_dontaudit_use_sysadm_terms(system_chkpwd_t)
-@@ -302,6 +311,38 @@
+@@ -302,6 +311,36 @@
  ')
  
  optional_policy(`
@@ -9099,16 +9143,14 @@
 +miscfiles_read_localization(updpwd_t)
 +
 +auth_manage_shadow(updpwd_t)
++auth_use_nsswitch(updpwd_t)
++
 +term_dontaudit_use_console(updpwd_t)
 +term_dontaudit_use_console(updpwd_t)
 +term_dontaudit_use_unallocated_ttys(updpwd_t)
 +files_manage_etc_files(updpwd_t)
 +kernel_read_system_state(updpwd_t)
 +logging_send_syslog_msg(updpwd_t)
-+
-+optional_policy(`
-+	nscd_socket_use(updpwd_t)
-+')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.fc serefpolicy-2.6.4/policy/modules/system/brctl.fc
 --- nsaserefpolicy/policy/modules/system/brctl.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/system/brctl.fc	2007-08-07 09:42:35.000000000 -0400
@@ -9145,8 +9187,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-2.6.4/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2007-08-07 09:42:35.000000000 -0400
-@@ -0,0 +1,50 @@
++++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2007-09-10 08:59:30.000000000 -0400
+@@ -0,0 +1,51 @@
 +policy_module(brctl,1.0.0)
 +
 +########################################
@@ -9169,6 +9211,7 @@
 +allow brctl_t self:tcp_socket create_socket_perms;
 +allow brctl_t self:unix_dgram_socket create_socket_perms;
 +
++dev_write_sysfs_dirs(brctl_t)
 +dev_rw_sysfs(brctl_t)
 +
 +# Init script handling
@@ -10451,7 +10494,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.6.4/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-08-21 09:08:39.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-09-10 08:58:12.000000000 -0400
 @@ -43,7 +43,7 @@
  # insmod local policy
  #
@@ -10461,7 +10504,15 @@
  allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
  
  allow insmod_t self:udp_socket create_socket_perms; 
-@@ -80,6 +80,8 @@
+@@ -64,6 +64,7 @@
+ kernel_read_kernel_sysctls(insmod_t)
+ kernel_rw_kernel_sysctl(insmod_t)
+ kernel_read_hotplug_sysctls(insmod_t)
++kernel_setsched(insmod_t)
+ 
+ files_read_kernel_modules(insmod_t)
+ # for locking: (cjp: ????)
+@@ -80,6 +81,8 @@
  # cjp: why is this needed?  insmod cannot mounton any dir
  # and it also transitions to mount
  dev_mount_usbfs(insmod_t)
@@ -10470,7 +10521,7 @@
  
  fs_getattr_xattr_fs(insmod_t)
  
-@@ -102,6 +104,7 @@
+@@ -102,6 +105,7 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
  init_use_script_ptys(insmod_t)
@@ -10478,7 +10529,7 @@
  
  libs_use_ld_so(insmod_t)
  libs_use_shared_libs(insmod_t)
-@@ -123,6 +126,18 @@
+@@ -123,6 +127,18 @@
  ')
  
  optional_policy(`
@@ -10497,7 +10548,7 @@
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -155,6 +170,7 @@
+@@ -155,6 +171,7 @@
  
  optional_policy(`
  	rpm_rw_pipes(insmod_t)
@@ -10505,7 +10556,7 @@
  ')
  
  optional_policy(`
-@@ -185,6 +201,7 @@
+@@ -185,6 +202,7 @@
  
  files_read_kernel_symbol_table(depmod_t)
  files_read_kernel_modules(depmod_t)
@@ -10714,7 +10765,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.6.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-09-04 16:32:23.000000000 -0400
 @@ -445,6 +445,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -10749,6 +10800,35 @@
  	manage_files_pattern($1,selinux_config_t,selinux_config_t)
  	read_lnk_files_pattern($1,selinux_config_t,selinux_config_t)
  ')
+@@ -791,6 +795,28 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit Read the file_contexts files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`seutil_dontaudit_read_file_contexts',`
++	gen_require(`
++		type selinux_config_t, default_context_t, file_context_t;
++	')
++
++	files_search_etc($1)
++	dontaudit $1 { selinux_config_t default_context_t }:dir search_dir_perms;
++	dontaudit $1 file_context_t:dir search_dir_perms;
++	dontaudit $1 file_context_t:file r_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Read and write the file_contexts files.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-08-07 09:42:35.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- selinux-policy.spec	4 Sep 2007 20:18:57 -0000	1.492
+++ selinux-policy.spec	10 Sep 2007 18:25:11 -0000	1.493
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 41%{?dist}
+Release: 42%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,10 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
+- Allow modprobe to setsched on kernel
+
+
 * Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
 - Allow ktalkd to look at terminals
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:26:20 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 10 Sep 2007 14:26:20 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.47, 1.48 sources, 1.48,
	1.49 sugar.spec, 1.56, 1.57
Message-ID: <200709101826.l8AIQK3U027902@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	9 Sep 2007 05:24:44 -0000	1.47
+++ .cvsignore	10 Sep 2007 18:25:47 -0000	1.48
@@ -1,3 +1 @@
-sugar-0.65-gitc8700feccf.tar.bz2
-sugar-0.65-git6b6470ebcb.tar.bz2
-sugar-0.65-gita1f5cece18.tar.bz2
+sugar-0.65-git79237f3114.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	9 Sep 2007 05:24:44 -0000	1.48
+++ sources	10 Sep 2007 18:25:47 -0000	1.49
@@ -1 +1 @@
-a8c99692c40eb2ee2b991a101c643a9f  sugar-0.65-gita1f5cece18.tar.bz2
+3ca3e5e4e8d1d024ae7c01de5ebeafe3  sugar-0.65-git79237f3114.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sugar.spec	9 Sep 2007 05:24:44 -0000	1.56
+++ sugar.spec	10 Sep 2007 18:25:47 -0000	1.57
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070909git
-%define commitid a1f5cece18
+%define alphatag 20070910git
+%define commitid 79237f3114
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.44.%{alphatag}a1f5cece18
+Release: 0.45.%{alphatag}79237f3114
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:26:42 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:26:42 -0400
Subject: rpms/postr/F-7 postr.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200709101826.l8AIQgN4027946@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27665

Modified Files:
	postr.spec sources 
Log Message:
- New upstream version.
- Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/F-7/postr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postr.spec	16 Jun 2007 07:55:48 -0000	1.3
+++ postr.spec	10 Sep 2007 18:26:10 -0000	1.4
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+- Updated license tag.
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2007 07:55:48 -0000	1.4
+++ sources	10 Sep 2007 18:26:10 -0000	1.5
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:31:22 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 10 Sep 2007 14:31:22 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sugar-datastore.spec, 1.23, 1.24
Message-ID: <200709101831.l8AIVMx2028311@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28234

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	9 Sep 2007 04:24:19 -0000	1.22
+++ .cvsignore	10 Sep 2007 18:30:49 -0000	1.23
@@ -1,3 +1 @@
-sugar-datastore-0.2.2-git356b35a278.tar.bz2
-sugar-datastore-0.2.2-gita111996299.tar.bz2
-sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2
+sugar-datastore-0.2.2-git617bf5d005.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Sep 2007 04:24:19 -0000	1.22
+++ sources	10 Sep 2007 18:30:49 -0000	1.23
@@ -1 +1 @@
-433ff1bdd4017e250e3d895897548f38  sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2
+2a4e5ee382ea17f0d6730957ba96d940  sugar-datastore-0.2.2-git617bf5d005.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-datastore.spec	9 Sep 2007 04:24:19 -0000	1.23
+++ sugar-datastore.spec	10 Sep 2007 18:30:49 -0000	1.24
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070909git
-%define commitid 0a7e80f01a
+%define alphatag 20070910git
+%define commitid 617bf5d005
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.19.%{alphatag}0a7e80f01a
+Release: 0.20.%{alphatag}617bf5d005
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
+- New snapshot
+
 * Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
 - New snapshot (async writes and ownership transfer on update/create)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:31:47 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 14:31:47 -0400
Subject: rpms/xsc/devel xsc.spec,1.2,1.3
Message-ID: <200709101831.l8AIVlkh028368@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28272

Modified Files:
	xsc.spec 
Log Message:
Probable BR, configure fix.



Index: xsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/xsc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsc.spec	10 Sep 2007 15:25:53 -0000	1.2
+++ xsc.spec	10 Sep 2007 18:31:14 -0000	1.3
@@ -10,7 +10,7 @@
 Source1: xsc.desktop
 Source2: xsc.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: libXt-devel, desktop-file-utils
+BuildRequires: desktop-file-utils, libX11-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -25,7 +25,7 @@
 
 %build
 
-%configure
+%configure --x-includes="" --x-libraries=""
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install



From fedora-extras-commits at redhat.com  Mon Sep 10 18:43:25 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 14:43:25 -0400
Subject: rpms/xsc/F-7 xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709101843.l8AIhPJv028847@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28826

Modified Files:
	sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: desktop-file-utils, libX11-devel
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure --x-includes="" --x-libraries=""
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	10 Sep 2007 18:42:52 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:44:44 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:44:44 -0400
Subject: rpms/postr/FC-6 postr.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200709101844.l8AIiit2028921@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28895

Modified Files:
	postr.spec sources 
Log Message:
- New upstream version.
- Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/FC-6/postr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postr.spec	16 Jun 2007 08:08:38 -0000	1.2
+++ postr.spec	10 Sep 2007 18:44:11 -0000	1.3
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+- Updated license tag.
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2007 08:08:38 -0000	1.3
+++ sources	10 Sep 2007 18:44:11 -0000	1.4
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 19:33:02 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:33:02 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-file-checks.patch, NONE, 1.1 dhcpv6.spec,
	1.57, 1.58 dhcpv6-0.10-init_leases.patch, 1.1, NONE
Message-ID: <200709101933.l8AJX2WP003807@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3780

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-file-checks.patch 
Removed Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
- Fix more segfaults when dhcp6s starts with empty control files (#253968)


dhcpv6-0.10-file-checks.patch:

--- NEW FILE dhcpv6-0.10-file-checks.patch ---
diff -up dhcp-0.10/dhcp6s.c.file_check dhcp-0.10/dhcp6s.c
--- dhcp-0.10/dhcp6s.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2007-09-10 15:25:12.000000000 -0400
@@ -1096,13 +1096,14 @@ static struct dhcp6_timer
 	struct timeval timo;
 	struct stat buf;
 	FILE *file;
-	stat(PATH_SERVER6_LEASE, &buf);
 	strcpy(server6_lease_temp, PATH_SERVER6_LEASE);
-	strcat(server6_lease_temp, "XXXXXX");	
-	if (buf.st_size > MAX_FILE_SIZE) {
-		file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
-		if (file != NULL)
-			server6_lease_file = file;
+	strcat(server6_lease_temp, "XXXXXX");
+	if (!stat(PATH_SERVER6_LEASE, &buf)) {
+		if (buf.st_size > MAX_FILE_SIZE) {
+			file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
+			if (file != NULL)
+				server6_lease_file = file;
+		}
 	}
 	d = DHCP6_SYNCFILE_TIME;
 	timo.tv_sec = (long)d;
diff -up dhcp-0.10/lease.c.file_check dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-10 15:26:18.000000000 -0400
@@ -180,18 +180,30 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
-	file = fopen(name, "a+");
+	struct stat stbuf;
+	if (name != NULL) {
+		file = fopen(name, "a+");
+	} else {
+		dprintf(LOG_ERR, "%s" "no lease file specified", FNAME);
+		return (NULL);
+	}
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (stat(name, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- dhcpv6.spec	4 Sep 2007 17:59:11 -0000	1.57
+++ dhcpv6.spec	10 Sep 2007 19:32:30 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,7 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
-Patch7:  %{name}-0.10-init_leases.patch
+Patch7:  %{name}-0.10-file-checks.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -69,7 +69,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
-%patch7 -p1 -b .init_leases
+%patch7 -p1 -b .file_check
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -162,6 +162,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
+- Fix more segfaults when dhcp6s starts with empty control files (#253968)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
 


--- dhcpv6-0.10-init_leases.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:35:52 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:35:52 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-device-names.patch, NONE,
	1.1 dhcpv6.spec, 1.58, 1.59
Message-ID: <200709101935.l8AJZqq4003966@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3927

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-device-names.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
- Fix more segfaults when dhcp6s starts with empty control files (#253968)
- Recognize 802.1Q VLAN network device names (#245115)


dhcpv6-0.10-device-names.patch:

--- NEW FILE dhcpv6-0.10-device-names.patch ---
diff -up dhcp-0.10/server6_token.l.string dhcp-0.10/server6_token.l
--- dhcp-0.10/server6_token.l.string	2007-09-10 11:43:04.000000000 -0400
+++ dhcp-0.10/server6_token.l	2007-09-10 11:43:58.000000000 -0400
@@ -79,7 +79,7 @@ addr_tail       ({hexdigit}{1,4}|({hexdi
 addr_body       ({hexdigit}{1,4}(":"|"::"))*
 ipv6addr        {addr_head}{addr_body}{addr_tail}
 string		[a-zA-Z0-9:\._-][a-zA-Z0-9:\._-]*
-ifname		[a-zA-Z]+[0-9]+
+ifname		({string})+
 
 %s S_IFACE
 %s S_DUID


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- dhcpv6.spec	10 Sep 2007 19:32:30 -0000	1.58
+++ dhcpv6.spec	10 Sep 2007 19:35:19 -0000	1.59
@@ -17,6 +17,7 @@
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-file-checks.patch
+Patch8:  %{name}-0.10-device-names.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -70,6 +71,7 @@
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .file_check
+%patch8 -p1 -b .device-names
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -164,6 +166,7 @@
 %changelog
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
 - Fix more segfaults when dhcp6s starts with empty control files (#253968)
+- Recognize 802.1Q VLAN network device names (#245115)
 
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)



From fedora-extras-commits at redhat.com  Mon Sep 10 19:39:14 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:39:14 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-file-checks.patch, NONE,
	1.1 dhcpv6.spec, 
	1.64, 1.65 dhcpv6-0.10-init_leases.patch, 1.1, NONE
Message-ID: <200709101939.l8AJdECF004203@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-file-checks.patch 
Removed Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-50
- Fix more segfaults when dhcp6s starts with empty control files (#253968)


dhcpv6-0.10-file-checks.patch:

--- NEW FILE dhcpv6-0.10-file-checks.patch ---
diff -up dhcp-0.10/dhcp6s.c.file_check dhcp-0.10/dhcp6s.c
--- dhcp-0.10/dhcp6s.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2007-09-10 15:25:12.000000000 -0400
@@ -1096,13 +1096,14 @@ static struct dhcp6_timer
 	struct timeval timo;
 	struct stat buf;
 	FILE *file;
-	stat(PATH_SERVER6_LEASE, &buf);
 	strcpy(server6_lease_temp, PATH_SERVER6_LEASE);
-	strcat(server6_lease_temp, "XXXXXX");	
-	if (buf.st_size > MAX_FILE_SIZE) {
-		file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
-		if (file != NULL)
-			server6_lease_file = file;
+	strcat(server6_lease_temp, "XXXXXX");
+	if (!stat(PATH_SERVER6_LEASE, &buf)) {
+		if (buf.st_size > MAX_FILE_SIZE) {
+			file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
+			if (file != NULL)
+				server6_lease_file = file;
+		}
 	}
 	d = DHCP6_SYNCFILE_TIME;
 	timo.tv_sec = (long)d;
diff -up dhcp-0.10/lease.c.file_check dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-10 15:26:18.000000000 -0400
@@ -180,18 +180,30 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
-	file = fopen(name, "a+");
+	struct stat stbuf;
+	if (name != NULL) {
+		file = fopen(name, "a+");
+	} else {
+		dprintf(LOG_ERR, "%s" "no lease file specified", FNAME);
+		return (NULL);
+	}
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (stat(name, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- dhcpv6.spec	10 Sep 2007 18:03:29 -0000	1.64
+++ dhcpv6.spec	10 Sep 2007 19:38:42 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,7 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
-Patch7:  %{name}-0.10-init_leases.patch
+Patch7:  %{name}-0.10-file-checks.patch
 Patch8:  %{name}-0.10-device-names.patch
 Patch9:  %{name}-0.10-lsb.patch
 Patch10: %{name}-0.10-IA_NA-ignore.patch
@@ -87,7 +87,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
-%patch7 -p1 -b .init_leases
+%patch7 -p1 -b .file-checks
 %patch8 -p1 -b .device-names
 %patch9 -p1 -b .lsb
 %patch10 -p1 -b .ia_na_ignore
@@ -189,6 +189,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-50
+- Fix more segfaults when dhcp6s starts with empty control files (#253968)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
 - Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
 - Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)


--- dhcpv6-0.10-init_leases.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:45:06 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 15:45:06 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.30,
	1.31 policycoreutils.spec, 1.445, 1.446
Message-ID: <200709101945.l8AJj6N5004463@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4436

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
- Lots of fixes for polgengui


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policycoreutils-gui.patch	10 Sep 2007 16:19:23 -0000	1.30
+++ policycoreutils-gui.patch	10 Sep 2007 19:45:03 -0000	1.31
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 11:56:01.000000000 -0400
-@@ -0,0 +1,2364 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 15:42:48.000000000 -0400
+@@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,8 +1028,7 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="can_focus">True</property>
-+	  <property name="show_tabs">True</property>
++	  <property name="show_tabs">False</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -1080,7 +1079,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="select_type_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select application or user type that you want to confine.</property>
++	      <property name="title" translatable="yes">Select application or user role to be confined.</property>
 +	      <signal name="next" handler="on_select_type_page_next" last_modification_time="Sat, 04 Aug 2007 11:39:15 GMT"/>
 +
 +	      <child internal-child="vbox">
@@ -1773,6 +1772,29 @@
 +	  </child>
 +
 +	  <child>
++	    <widget class="GtkLabel" id="label30">
++	      <property name="visible">True</property>
++	      <property name="label" translatable="yes">label30</property>
++	      <property name="use_underline">False</property>
++	      <property name="use_markup">False</property>
++	      <property name="justify">GTK_JUSTIFY_LEFT</property>
++	      <property name="wrap">False</property>
++	      <property name="selectable">False</property>
++	      <property name="xalign">0.5</property>
++	      <property name="yalign">0.5</property>
++	      <property name="xpad">0</property>
++	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
++	    </widget>
++	    <packing>
++	      <property name="type">tab</property>
++	    </packing>
++	  </child>
++
++	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="roles_page">
 +	      <property name="visible">True</property>
 +	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
@@ -1824,9 +1846,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label30">
++	    <widget class="GtkLabel" id="label31">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label30</property>
++	      <property name="label" translatable="yes">label31</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2247,9 +2269,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label31">
++	    <widget class="GtkLabel" id="label32">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label31</property>
++	      <property name="label" translatable="yes">label32</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2563,9 +2585,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label32">
++	    <widget class="GtkLabel" id="label33">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label32</property>
++	      <property name="label" translatable="yes">label33</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2695,9 +2717,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label33">
++	    <widget class="GtkLabel" id="label34">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label33</property>
++	      <property name="label" translatable="yes">label34</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3025,9 +3047,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label34">
++	    <widget class="GtkLabel" id="label35">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label34</property>
++	      <property name="label" translatable="yes">label35</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3141,9 +3163,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label35">
++	    <widget class="GtkLabel" id="label43">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label35</property>
++	      <property name="label" translatable="yes"></property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3181,7 +3203,7 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label43">
++	    <widget class="GtkLabel" id="label44">
 +	      <property name="visible">True</property>
 +	      <property name="label" translatable="yes"></property>
 +	      <property name="use_underline">False</property>
@@ -3282,8 +3304,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 11:58:05.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 15:43:11.000000000 -0400
+@@ -0,0 +1,453 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3572,7 +3594,8 @@
 +                my_policy.set_use_tmp(self.tmp_checkbutton.get_active() == 1)
 +                my_policy.set_use_uid(self.uid_checkbutton.get_active() == 1)
 +                my_policy.set_use_pam(self.pam_checkbutton.get_active() == 1)
-+                my_policy.set_init_script(self.script_entry.get_text())
++                if self.get_type() is polgen.DAEMON:
++                    my_policy.set_init_script(self.init_script_entry.get_text())
 +            else:
 +                if self.get_type() == polgen.RUSER:
 +                    selected = []
@@ -3738,8 +3761,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 12:16:38.000000000 -0400
-@@ -0,0 +1,719 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
+@@ -0,0 +1,727 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -4207,6 +4230,13 @@
 +		newte += re.sub("TEMPLATETYPE", self.name, executable.te_cgi_rules)
 +		return newte
 +	
++	def generate_user_if(self):
++                newif = ""
++                if self.type == USER:
++                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_user_program_rules)
++
++                return newif
++                
 +	def generate_if(self):
 +                newif = ""
 +                if self.program != "":
@@ -4221,6 +4251,7 @@
 +                                        if os.path.exists(i) and stat.S_ISSOCK(os.stat(i)[stat.ST_MODE]):
 +                                            newif += re.sub("TEMPLATETYPE", self.name, self.DEFAULT_DIRS[d][2].if_stream_rules)
 +                                            break
++                newif += self.generate_user_if()
 +                newif += self.generate_admin_if()
 +                
 +		return newif
@@ -8884,8 +8915,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-05 22:25:10.000000000 -0400
-@@ -0,0 +1,229 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-10 15:43:29.000000000 -0400
+@@ -0,0 +1,277 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8951,6 +8982,8 @@
 +type TEMPLATETYPE_t;
 +type TEMPLATETYPE_exec_t;
 +application_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++role system_r types TEMPLATETYPE_t;
++
 +"""
 +
 +te_cgi_types="""\
@@ -8995,6 +9028,22 @@
 +"""
 +
 +te_userapp_rules="""
++########################################
++#
++# TEMPLATETYPE local policy
++#
++
++## internal communication is often done using fifo and unix sockets.
++allow TEMPLATETYPE_t self:fifo_file rw_file_perms;
++allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(TEMPLATETYPE_t)
++
++libs_use_ld_so(TEMPLATETYPE_t)
++libs_use_shared_libs(TEMPLATETYPE_t)
++
++miscfiles_read_localization(TEMPLATETYPE_t)
++
 +"""
 +
 +te_cgi_rules="""
@@ -9032,11 +9081,41 @@
 +                type TEMPLATETYPE_exec_t;
 +	')
 +
-+	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++')
++
++"""
++
++if_user_program_rules="""
++########################################
++## <summary>
++##	Execute TEMPLATETYPE in the TEMPLATETYPE domain, and
++##	allow the specified role the TEMPLATETYPE domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the TEMPLATETYPE domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the role's terminal.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_run',`
++	gen_require(`
++		type TEMPLATETYPE_t;
++	')
 +
-+	allow TEMPLATETYPE_t $1:fd use;
-+	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
-+	allow TEMPLATETYPE_t $1:process sigchld;
++	TEMPLATETYPE_domtrans($1)
++	role $2 types TEMPLATETYPE_t;
++	dontaudit TEMPLATETYPE_t $3:chr_file rw_term_perms;
 +')
 +
 +"""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- policycoreutils.spec	10 Sep 2007 15:59:05 -0000	1.445
+++ policycoreutils.spec	10 Sep 2007 19:45:03 -0000	1.446
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
+- Lots of fixes for polgengui
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
 - Change Requires /bin/rpm to rpm
 



From fedora-extras-commits at redhat.com  Mon Sep 10 19:47:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:47:56 -0700
Subject: [pkgdb] boswars was added for jwrdegoede
Message-ID: <200709101947.l8AJlvEJ018320@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package boswars with summary Bos Wars is a futuristic real-time strategy game
Kevin Fenzi (kevin) has approved Package boswars
Kevin Fenzi (kevin) has added a Fedora devel branch for boswars with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved boswars in Fedora devel
Kevin Fenzi (kevin) has approved Package boswars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on boswars (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on boswars (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on boswars (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:48:04 -0700
Subject: [pkgdb] boswars (Fedora, devel) updated by kevin
Message-ID: <200709101948.l8AJm5Og014700@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on boswars (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:48:04 -0700
Subject: [pkgdb] boswars (Fedora, 7) updated by kevin
Message-ID: <200709101948.l8AJm5vs014709@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for boswars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on boswars (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:47 -0400
Subject: rpms/boswars - New directory
Message-ID: <200709101948.l8AJmlCR004694@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars

Log Message:
Directory /cvs/extras/rpms/boswars added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:53 -0400
Subject: rpms/boswars/devel - New directory
Message-ID: <200709101948.l8AJmrdh004710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars/devel

Log Message:
Directory /cvs/extras/rpms/boswars/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:56 -0400
Subject: rpms/boswars Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709101948.l8AJmuNe004737@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars

Added Files:
	Makefile import.log 
Log Message:
Setup of module boswars


--- NEW FILE Makefile ---
# Top level Makefile for module boswars
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:58 -0400
Subject: rpms/boswars/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709101948.l8AJmwMv004753@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module boswars


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: boswars
# $Id: Makefile,v 1.1 2007/09/10 19:48:56 kevin Exp $
NAME := boswars
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 fedora-extras-commits at redhat.com  Mon Sep 10 19:50:46 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 10 Sep 2007 15:50:46 -0400
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.3,1.4
Message-ID: <200709101950.l8AJok9R004922@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-ant-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4890

Modified Files:
	plexus-ant-factory.spec 
Log Message:

- bUild with maven




Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-ant-factory.spec	31 Aug 2007 21:42:12 -0000	1.3
+++ plexus-ant-factory.spec	10 Sep 2007 19:50:14 -0000	1.4
@@ -33,8 +33,6 @@
   %{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:
   %{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a1.2jpp.3%{?dist}
+Release:        0.1.a1.2jpp.4%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 License:        MIT-Style
@@ -211,6 +209,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.4
+- Build with maven
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.3
 - Build without maven (to build on ppc)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:51:21 -0700
Subject: [pkgdb] filezilla was added for kwizart
Message-ID: <200709101951.l8AJpLXs018349@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package filezilla with summary FileZilla FTP, FTPS and SFTP client
Kevin Fenzi (kevin) has approved Package filezilla
Kevin Fenzi (kevin) has added a Fedora devel branch for filezilla with an owner of kwizart
Kevin Fenzi (kevin) has approved filezilla in Fedora devel
Kevin Fenzi (kevin) has approved Package filezilla
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on filezilla (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on filezilla (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on filezilla (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:51:22 -0700
Subject: [pkgdb] filezilla (Fedora, devel) updated by kevin
Message-ID: <200709101951.l8AJpM1D014732@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on filezilla (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:38 -0400
Subject: rpms/filezilla - New directory
Message-ID: <200709101951.l8AJpcUr004988@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla

Log Message:
Directory /cvs/extras/rpms/filezilla added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:42 -0400
Subject: rpms/filezilla/devel - New directory
Message-ID: <200709101951.l8AJpgj5005004@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla/devel

Log Message:
Directory /cvs/extras/rpms/filezilla/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:44 -0400
Subject: rpms/filezilla Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709101951.l8AJpiuA005029@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla

Added Files:
	Makefile import.log 
Log Message:
Setup of module filezilla


--- NEW FILE Makefile ---
# Top level Makefile for module filezilla
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:47 -0400
Subject: rpms/filezilla/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709101951.l8AJpl9J005051@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module filezilla


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: filezilla
# $Id: Makefile,v 1.1 2007/09/10 19:51:45 kevin Exp $
NAME := filezilla
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 fedora-extras-commits at redhat.com  Mon Sep 10 19:59:02 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 10 Sep 2007 15:59:02 -0400
Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.3,1.4
Message-ID: <200709101959.l8AJx2kM005364@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-bsh-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5320

Modified Files:
	plexus-bsh-factory.spec 
Log Message:

Build with maven




Index: plexus-bsh-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-bsh-factory.spec	31 Aug 2007 21:38:03 -0000	1.3
+++ plexus-bsh-factory.spec	10 Sep 2007 19:58:30 -0000	1.4
@@ -31,8 +31,6 @@
 %define _with_gcj_support 1
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -41,7 +39,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a7s.2jpp.3%{?dist}
+Release:        0.1.a7s.2jpp.4%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT-Style
@@ -210,6 +208,9 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.4
+- Build with maven
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.3
 - Build without maven (to build on ppc)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 20:11:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:11:35 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.11, 1.12 mugshot.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <200709102011.l8AKBZjn011743@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11703

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Sep 2007 21:51:26 -0000	1.11
+++ .cvsignore	10 Sep 2007 20:11:01 -0000	1.12
@@ -1 +1 @@
-mugshot-1.1.51.tar.gz
+mugshot-1.1.52.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mugshot.spec	6 Sep 2007 21:38:36 -0000	1.18
+++ mugshot.spec	10 Sep 2007 20:11:01 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.51
+Version:        1.1.52
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -54,6 +54,12 @@
 a "live social experience" and interoperation with online services you and 
 your friends use. It's fun and easy.
 
+%package devel
+Summary: Development headers for Online Desktop
+Group: Development/Languages
+
+%description devel
+This package contains libraries for Online Desktop.
 
 %prep
 %setup -q
@@ -70,7 +76,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Don't package a .la file for the component .so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mugshot/firefox/components/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Run desktop-file-install to so we get validation (and to make
 # things fedora-packaging-guidelines compliant)
@@ -204,14 +210,23 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
-%dir %{_includedir}/ddm-1
-%{_includedir}/ddm-1/*
+
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
+%files devel
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so*
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
+- add devel pkg
+- 1.1.52
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
 - 1.1.51
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2007 21:51:26 -0000	1.12
+++ sources	10 Sep 2007 20:11:01 -0000	1.13
@@ -1 +1 @@
-dabad9f5dfd3e76e2c4c63722e9f6ebd  mugshot-1.1.51.tar.gz
+d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:16:52 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:16:52 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.6, 1.7 online-desktop.spec, 
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200709102016.l8AKGq8l012001@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11960

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2007 21:49:53 -0000	1.6
+++ .cvsignore	10 Sep 2007 20:16:20 -0000	1.7
@@ -1 +1 @@
-online-desktop-0.2.10.tar.gz
+online-desktop-0.2.12.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- online-desktop.spec	6 Sep 2007 21:21:01 -0000	1.6
+++ online-desktop.spec	10 Sep 2007 20:16:20 -0000	1.7
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.10
+Version:        0.2.12
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -178,7 +178,13 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+- new upstream
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
+- new upstream
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2007 21:49:53 -0000	1.6
+++ sources	10 Sep 2007 20:16:20 -0000	1.7
@@ -1 +1 @@
-67e6eadf468433ab122d2b5acaac5ade  online-desktop-0.2.10.tar.gz
+f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:26:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:26:35 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.23, 1.24 bigboard.spec, 1.32,
	1.33 sources, 1.24, 1.25
Message-ID: <200709102026.l8AKQZB5012385@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12345

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2007 21:50:19 -0000	1.23
+++ .cvsignore	10 Sep 2007 20:26:02 -0000	1.24
@@ -1 +1 @@
-bigboard-0.5.12.tar.gz
+bigboard-0.5.13.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bigboard.spec	7 Sep 2007 19:36:01 -0000	1.32
+++ bigboard.spec	10 Sep 2007 20:26:02 -0000	1.33
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.12
-Release:        2%{?dist}
+Version:        0.5.13
+Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -29,6 +29,7 @@
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
+BuildRequires:  mugshot-devel >= 1.1.52
 
 %description
 Bigboard is a sidebar and application launcher that works with mugshot.org
@@ -92,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.13-1
+- 0.5.13
+
 * Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
 - some brs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Sep 2007 21:50:19 -0000	1.24
+++ sources	10 Sep 2007 20:26:02 -0000	1.25
@@ -1 +1 @@
-fe6047806ed00354145f471b2c5baef7  bigboard-0.5.12.tar.gz
+f0001794311b90a9b9f0d9ad750a0878  bigboard-0.5.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:30:43 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 10 Sep 2007 16:30:43 -0400
Subject: rpms/filezilla/devel filezilla.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709102030.l8AKUhKW012826@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel

Modified Files:
	.cvsignore sources 
Added Files:
	filezilla.spec 
Log Message:
Initial import



--- NEW FILE filezilla.spec ---
Name:           filezilla
Version:        3.0.0
Release:        1%{?dist}
Summary:        FileZilla FTP, FTPS and SFTP client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://filezilla.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

## Needed if autogen.sh is invoked
#BuildRequires:  automake, autoconf, libtool
## 
## Needed if test program is build
BuildRequires:  cppunit-devel >= 1.10.2
##
BuildRequires:  gawk
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  gnutls-devel >= 1.5.4
BuildRequires:  libidn-devel
BuildRequires:  wxGTK-devel >= 2.8.4

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


%description
FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
- Supports FTP, FTP over SSL/TLS (FTPS) and SSH File Transfer Protocol (SFTP)
- Cross-platform
- Available in many languages
- Supports resume and transfer of large files >4GB
- Easy to use Site Manager and transfer queue
- Drag & drop support
- Speed limits
- Filename filters
- Network configuration wizard 


%prep
%setup -q

# Run autotools if needed
# sh autogen.sh


%build
%configure \
  --disable-static \
  --enable-locales \
  --localedir=%{_datadir}/locale \
  --disable-manualupdatecheck \
  --disable-autoupdatecheck 

## Do not use --enable-buildtype=official 
## that option enables the "check for updates" dialog to download
## new binaries from the official website.

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"

mkdir -p __doc
install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs

desktop-file-install --vendor "fedora" \
  --delete-original \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop


%find_lang %{name}

%check
pushd tests
make test
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :

%postun
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS
%doc __doc/*
%{_bindir}/*
%{_datadir}/filezilla/
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
- Update to 3.0.0 (final)
- Add vendor field for .desktop

* Mon Sep  3 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.3.rc3
- Update to 3.0.0rc3
- Add BR gawk
- Improve description/summary
- Removed dual listed doc file

* Mon Aug 27 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.2.rc2
- Update to 3.0.0-rc2
- Upstream now install their own desktop file and pixmap

* Mon Aug 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.2.rc1
- Update to 3.0.0-rc1
- Enable make check

* Fri Jul 27 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta11
- Update to beta11

* Wed Jun  5 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta10
- Update to beta10

* Sat May 26 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta8
- Update to beta8

* Tue Mar 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta7
- Update to beta7

* Tue Mar 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta6
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:51:45 -0000	1.1
+++ .cvsignore	10 Sep 2007 20:30:10 -0000	1.2
@@ -0,0 +1 @@
+FileZilla_3.0.0_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:51:45 -0000	1.1
+++ sources	10 Sep 2007 20:30:10 -0000	1.2
@@ -0,0 +1 @@
+9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 20:35:48 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 10 Sep 2007 16:35:48 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-vdso-fix-clock-masking.patch,
	NONE, 1.1 kernel.spec, 1.153, 1.154
Message-ID: <200709102035.l8AKZmbH013079@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86_64-vdso-fix-clock-masking.patch 
Log Message:
* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
- fix clock warping on x86_64


linux-2.6-x86_64-vdso-fix-clock-masking.patch:

--- NEW FILE linux-2.6-x86_64-vdso-fix-clock-masking.patch ---
Add missing mask operation to vdso

vdso vgetns() didn't mask the time source offset calculation, which could
lead to time problems with 32bit HPET. Add the masking.

Thanks to Chuck Ebbert for tracking down.

Signed-off-by: Andi Kleen <ak at suse.de>

--- linux.orig/arch/x86_64/vdso/vclock_gettime.c
+++ linux/arch/x86_64/vdso/vclock_gettime.c
@@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long c
 
 static inline long vgetns(void)
 {
+	long v;
 	cycles_t (*vread)(void);
 	vread = gtod->clock.vread;
-	return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >>
-		gtod->clock.shift;
+	v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
+	return (v * gtod->clock.mult) >> gtod->clock.shift;
 }
 
 static noinline int do_realtime(struct timespec *ts)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kernel.spec	10 Sep 2007 14:43:37 -0000	1.153
+++ kernel.spec	10 Sep 2007 20:35:15 -0000	1.154
@@ -672,6 +672,7 @@
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
 Patch1535: linux-2.6-sched-cfs-fix-mc.patch
+Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
 
@@ -1211,6 +1212,9 @@
 # fix scheduler on multicore
 ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
 
+# fix x86_64 clock warping
+ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1803,6 +1807,9 @@
 
 %changelog
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix clock warping on x86_64
+
+* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86: fix debug early boot
 
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Mon Sep 10 20:37:38 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 16:37:38 -0400
Subject: rpms/claws-mail-plugins/F-7 claws-mail-plugins.spec,1.16,1.17
Message-ID: <200709102037.l8AKbckW013170@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13091/F-7

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix typo



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- claws-mail-plugins.spec	10 Sep 2007 10:27:20 -0000	1.16
+++ claws-mail-plugins.spec	10 Sep 2007 20:37:06 -0000	1.17
@@ -17,7 +17,7 @@
 %define vcalendar	1.97
 Name:           claws-mail-plugins
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -56,7 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
-Requires:       %{name}-spamreport = %{version}-%{release}
+Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -631,8 +631,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Sep 10 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-2
+- fix typo
+
 * Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 3.0.0
+- 3.0.0-1
 - version upgrade
 
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Mon Sep 10 20:37:42 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 16:37:42 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.19,1.20
Message-ID: <200709102037.l8AKbgpm013173@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13091/devel

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix typo



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- claws-mail-plugins.spec	10 Sep 2007 10:08:27 -0000	1.19
+++ claws-mail-plugins.spec	10 Sep 2007 20:37:09 -0000	1.20
@@ -17,7 +17,7 @@
 %define vcalendar	1.97
 Name:           claws-mail-plugins
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -56,7 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
-Requires:       %{name}-spamreport = %{version}-%{release}
+Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -631,8 +631,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Sep 10 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-2
+- fix typo
+
 * Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 3.0.0
+- 3.0.0-1
 - version upgrade
 
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Mon Sep 10 21:21:18 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Mon, 10 Sep 2007 17:21:18 -0400
Subject: rpms/pm-utils/devel .cvsignore, 1.26, 1.27 sources, 1.33,
	1.34 pm-utils.spec, 1.77, 1.78
Message-ID: <200709102121.l8ALLIPE020767@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20727

Modified Files:
	.cvsignore sources pm-utils.spec 
Log Message:
- update to .4-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Mar 2007 14:09:36 -0000	1.26
+++ .cvsignore	10 Sep 2007 21:20:45 -0000	1.27
@@ -1,3 +1 @@
-radeontool-1.5.tar.gz
-vbetool_0.7-1.tar.gz
-pm-utils-0.99.3.tar.gz
+pm-utils-0.99.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	8 Sep 2007 10:22:26 -0000	1.33
+++ sources	10 Sep 2007 21:20:45 -0000	1.34
@@ -1 +1 @@
-0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz
+a88503876f63c96b55784be91b6458d2  pm-utils-0.99.4.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- pm-utils.spec	8 Sep 2007 10:26:22 -0000	1.77
+++ pm-utils.spec	10 Sep 2007 21:20:45 -0000	1.78
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
-Version: 0.99.3
-Release: 12%{?dist}
+Version: 0.99.4
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -28,8 +28,7 @@
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
-Patch2: pm-utils-0.99.3-vbe-redirect.patch
-Patch3: pm-utils-0.99.3-cfg.patch
+Patch2: pm-utils-0.99.3-cfg.patch
 
 
 %description
@@ -41,8 +40,7 @@
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
-%patch2 -p1 -b .vbe-redirect
-%patch3 -p1 -b .cfg
+%patch2 -p1 -b .cfg
 
 
 %build
@@ -112,7 +110,12 @@
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
+* Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
+- Merge new upstream
+- remove pm/power.d/laptop-tools
+- add --quirk-reset-brightness (needed for the Fujitsu Lifebook S7110)
+
+* Sat Sep 08 2007 Till Maas <opensource till name> - 0.99.3-12
 - Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
 - remove (C|CXX|F)FLAGS definitions, they are already in %%configure
 - remove Core in Summary tag



From fedora-extras-commits at redhat.com  Mon Sep 10 21:30:42 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 17:30:42 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.4,1.5
Message-ID: <200709102130.l8ALUgD8021143@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21122

Modified Files:
	List.py 
Log Message:
complete Dennis fix for the single plague needsign problem


Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- List.py	6 Sep 2007 07:14:30 -0000	1.4
+++ List.py	10 Sep 2007 21:30:40 -0000	1.5
@@ -26,8 +26,11 @@
         dists = cfg.alldists
     
     for dist in dists:
-        if dist.startswith('testing/'):
-            dist = dist.replace('testing/', '')
+        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+            if dist.startswith('testing/'):
+                dist = dist.replace('testing/', '')
+                if dist in dists:
+                    continue
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
         print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)



From fedora-extras-commits at redhat.com  Mon Sep 10 21:40:34 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 17:40:34 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.5,1.6
Message-ID: <200709102140.l8ALeYCj021428@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410

Modified Files:
	List.py 
Log Message:
print -testing in the needsign repo id even!


Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- List.py	10 Sep 2007 21:30:40 -0000	1.5
+++ List.py	10 Sep 2007 21:40:32 -0000	1.6
@@ -26,13 +26,15 @@
         dists = cfg.alldists
     
     for dist in dists:
-        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
-            if dist.startswith('testing/'):
-                dist = dist.replace('testing/', '')
-                if dist in dists:
-                    continue
+        if dist.startswith('testing/'):
+            dist = dist.replace('testing/', '')
+            if dist in dists:
+                continue
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
-        print distdir+':'
+        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+            print distdir+'-testing:'
+        else:
+            print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)
         bs = LocalPlague(needsignroot)
         results = bs.GetBuildResults()



From fedora-extras-commits at redhat.com  Mon Sep 10 22:00:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 18:00:19 -0400
Subject: rpms/flac/devel .cvsignore, 1.5, 1.6 flac.spec, 1.29, 1.30 sources, 
	1.6, 1.7 flac-1.1.3-noxmms.patch, 1.1,
	NONE flac-1.1.4-hide-byteswap.patch, 1.1,
	NONE flac-1.1.4-link-ogg.patch, 1.1, NONE
Message-ID: <200709102200.l8AM0Jbv021899@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21823

Modified Files:
	.cvsignore flac.spec sources 
Removed Files:
	flac-1.1.3-noxmms.patch flac-1.1.4-hide-byteswap.patch 
	flac-1.1.4-link-ogg.patch 
Log Message:
* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
- Update for 1.20 and drop obsolete patches (#285161)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2007 11:55:44 -0000	1.5
+++ .cvsignore	10 Sep 2007 21:59:47 -0000	1.6
@@ -1,4 +1 @@
-flac-1.1.0.tar.gz
-flac-1.1.2.tar.gz
-flac-1.1.3.tar.gz
-flac-1.1.4.tar.gz
+flac-1.2.0.tar.gz


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- flac.spec	24 Aug 2007 12:23:56 -0000	1.29
+++ flac.spec	10 Sep 2007 21:59:47 -0000	1.30
@@ -1,18 +1,15 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.1.4
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch2: flac-1.1.4-hide-byteswap.patch
-Patch3: flac-1.1.3-gnu-stack.patch
-Patch4: flac-1.1.3-noxmms.patch
-Patch5: flac-1.1.4-link-ogg.patch
+Patch1: flac-1.1.3-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
-BuildRequires: libtool, gettext-devel
+BuildRequires: gettext-devel
 Obsoletes: flac-libs
 Provides: flac-libs
 
@@ -36,16 +33,11 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .extra-sym
-%patch3 -p1 -b .gnu-stack
-%patch4 -p1 -b .noxmms
-%patch5 -p1 -b .link-ogg
-
-autoreconf -i -f
+%patch1 -p1 -b .gnu-stack
 
 %build
 export XMMS_CONFIG=no # Disable XMMS
-%configure --with-pic
+%configure --with-pic --disable-xmms-plugin
 
 make %{?_smp_mflags}
 
@@ -80,6 +72,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
+- Update for 1.20 and drop obsolete patches (#285161)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1.1.4-5
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Feb 2007 11:55:44 -0000	1.6
+++ sources	10 Sep 2007 21:59:47 -0000	1.7
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+ea176bfb291707b46a537b091c226ae7  flac-1.2.0.tar.gz


--- flac-1.1.3-noxmms.patch DELETED ---


--- flac-1.1.4-hide-byteswap.patch DELETED ---


--- flac-1.1.4-link-ogg.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 22:02:40 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 18:02:40 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.66,
	1.67 policy-20070703.patch, 1.52, 1.53 selinux-policy.spec,
	1.518, 1.519
Message-ID: <200709102202.l8AM2eSI027926@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27888

Modified Files:
	modules-targeted.conf policy-20070703.patch 
	selinux-policy.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
- Allow newalias/sendmail dac_override
- Allow bind to bind to all udp ports



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- modules-targeted.conf	6 Sep 2007 23:34:02 -0000	1.66
+++ modules-targeted.conf	10 Sep 2007 22:02:06 -0000	1.67
@@ -1505,3 +1505,12 @@
 # Minimally prived root role for managing apache
 # 
 webadm = module
+
+#
+# Layer: services
+# Module: exim
+#
+# exim mail server 
+# 
+exim = module
+

policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.52 -r 1.53 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- policy-20070703.patch	7 Sep 2007 20:26:11 -0000	1.52
+++ policy-20070703.patch	10 Sep 2007 22:02:06 -0000	1.53
@@ -495,12 +495,12 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-3.0.7/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-09-07 17:05:59.000000000 -0400
 @@ -20,6 +20,7 @@
  
  # Allow dmidecode to read /dev/mem
  dev_read_raw_memory(dmidecode_t)
-+dev_search_sysfs(dmidecode_t)
++dev_read_sysfs(dmidecode_t)
  
  mls_file_read_all_levels(dmidecode_t)
  
@@ -2745,7 +2745,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-10 16:27:16.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2830,7 +2830,32 @@
  ##	List the contents of the root directory.
  ## </summary>
  ## <param name="domain">
-@@ -3323,6 +3359,42 @@
+@@ -3107,6 +3143,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Manage temporary directories in /tmp.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`files_manage_generic_tmp_dirs',`
++	gen_require(`
++		type tmp_t;
++	')
++
++	manage_dirs_pattern($1,tmp_t,tmp_t)
++')
++
++########################################
++## <summary>
+ ##	Manage temporary files and directories in /tmp.
+ ## </summary>
+ ## <param name="domain">
+@@ -3323,6 +3377,42 @@
  
  ########################################
  ## <summary>
@@ -2873,7 +2898,7 @@
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3381,7 +3453,7 @@
+@@ -3381,7 +3471,7 @@
  
  ########################################
  ## <summary>
@@ -2882,7 +2907,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -3389,17 +3461,17 @@
+@@ -3389,17 +3479,17 @@
  ##	</summary>
  ## </param>
  #
@@ -2903,7 +2928,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -3407,12 +3479,12 @@
+@@ -3407,12 +3497,12 @@
  ##	</summary>
  ## </param>
  #
@@ -2918,7 +2943,7 @@
  ')
  
  ########################################
-@@ -4043,7 +4115,7 @@
+@@ -4043,7 +4133,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2927,7 +2952,7 @@
  ')
  
  ########################################
-@@ -4560,6 +4632,8 @@
+@@ -4560,6 +4650,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2936,7 +2961,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4582,6 +4656,11 @@
+@@ -4582,6 +4674,11 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2948,7 +2973,7 @@
  ')
  
  ########################################
-@@ -4619,3 +4698,28 @@
+@@ -4619,3 +4716,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')
@@ -3171,6 +3196,99 @@
  	allow $1 security_t:dir list_dir_perms;
  	allow $1 security_t:file { getattr read };
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.0.7/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-08-22 07:14:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/storage.fc	2007-09-10 15:52:30.000000000 -0400
+@@ -52,7 +52,7 @@
+ 
+ /dev/cciss/[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+-/dev/fuse		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,mls_systemhigh)
+ /dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.0.7/policy/modules/kernel/storage.if
+--- nsaserefpolicy/policy/modules/kernel/storage.if	2007-08-22 07:14:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/storage.if	2007-09-10 15:54:45.000000000 -0400
+@@ -673,3 +673,61 @@
+ 
+ 	typeattribute $1 storage_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Allow the caller to get the attributes
++##	of device nodes of fuse devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`storage_getattr_fuse_dev',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dev_list_all_dev_nodes($1)
++	allow $1 fuse_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	read or write fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	allow $1 fuse_device_t:chr_file rw_file_perms;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read or write
++##	fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
[...1648 lines suppressed...]
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -11637,7 +12686,7 @@
  
  libs_use_ld_so(mount_t)
  libs_use_shared_libs(mount_t)
-@@ -127,10 +138,15 @@
+@@ -127,10 +139,15 @@
  	')
  ')
  
@@ -11654,7 +12703,7 @@
  ')
  
  optional_policy(`
-@@ -159,13 +175,8 @@
+@@ -159,13 +176,8 @@
  
  	fs_search_rpc(mount_t)
  
@@ -11668,7 +12717,7 @@
  ')
  
  optional_policy(`
-@@ -189,10 +200,6 @@
+@@ -189,10 +201,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -11679,7 +12728,7 @@
  ########################################
  #
  # Unconfined mount local policy
-@@ -201,4 +208,29 @@
+@@ -201,4 +209,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -11993,7 +13042,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.7/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-09-10 14:35:10.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(selinuxutil,1.6.2)
@@ -12110,7 +13159,15 @@
  
  dev_read_urand(semanage_t)
  
-@@ -465,6 +479,8 @@
+@@ -452,6 +466,7 @@
+ files_read_etc_runtime_files(semanage_t)
+ files_read_usr_files(semanage_t)
+ files_list_pids(semanage_t)
++fs_list_inotifyfs(semanage_t)
+ 
+ mls_file_write_all_levels(semanage_t)
+ mls_file_read_all_levels(semanage_t)
+@@ -465,6 +480,8 @@
  
  # Running genhomedircon requires this for finding all users
  auth_use_nsswitch(semanage_t)
@@ -12119,7 +13176,7 @@
  
  libs_use_ld_so(semanage_t)
  libs_use_shared_libs(semanage_t)
-@@ -488,6 +504,17 @@
+@@ -488,6 +505,17 @@
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
@@ -12137,7 +13194,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -515,6 +542,8 @@
+@@ -515,6 +543,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -12146,7 +13203,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -531,6 +560,7 @@
+@@ -531,6 +561,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -12154,7 +13211,7 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -586,6 +616,10 @@
+@@ -586,6 +617,10 @@
  
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
@@ -12527,7 +13584,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-10 16:37:23.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -12598,17 +13655,17 @@
  
  optional_policy(`
 -	ada_domtrans(unconfined_t)
--')
--
--optional_policy(`
--	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
--	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
--	# this is disallowed usage:
--	unconfined_domain(httpd_unconfined_script_t)
 +	ada_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
+-	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+-	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
+-	# this is disallowed usage:
+-	unconfined_domain(httpd_unconfined_script_t)
+-')
+-
+-optional_policy(`
 -	bind_run_ndc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
 +	bootloader_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
@@ -12653,7 +13710,7 @@
  ')
  
  optional_policy(`
-@@ -155,22 +153,12 @@
+@@ -155,32 +153,23 @@
  
  optional_policy(`
  	postfix_run_map(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -12678,18 +13735,18 @@
  ')
  
  optional_policy(`
-@@ -180,9 +168,10 @@
+ 	samba_per_role_template(unconfined)
+ 	samba_run_net(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+ 	samba_run_winbind_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
++	samba_run_smbcontrol(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
 -	spamassassin_per_role_template(unconfined,unconfined_t,unconfined_r)
-+	sendmail_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
++	sendmail_run_unconfined(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
-+
  optional_policy(`
- 	sysnet_run_dhcpc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
- 	sysnet_dbus_chat_dhcpc(unconfined_t)
 @@ -205,11 +194,12 @@
  ')
  
@@ -13825,7 +14882,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-10 14:07:37.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -13908,7 +14965,12 @@
  	netutils_run(sysadm_t,sysadm_r,admin_terminal)
  	netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  	netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -447,11 +448,15 @@
+@@ -443,15 +444,20 @@
+ 
+ optional_policy(`
+ 	samba_run_net(sysadm_t,sysadm_r,admin_terminal)
++	samba_run_smbcontrol(sysadm_t,sysadm_r,admin_terminal)
+ 	samba_run_winbind_helper(sysadm_t,sysadm_r,admin_terminal)
  ')
  
  optional_policy(`
@@ -13924,7 +14986,7 @@
  	', `
  		userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  	')
-@@ -494,3 +499,7 @@
+@@ -494,3 +500,7 @@
  optional_policy(`
  	yam_run(sysadm_t,sysadm_r,admin_terminal)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- selinux-policy.spec	7 Sep 2007 20:10:07 -0000	1.518
+++ selinux-policy.spec	10 Sep 2007 22:02:06 -0000	1.519
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
+- Allow newalias/sendmail dac_override
+- Allow bind to bind to all udp ports
+
 * Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
 - Turn off direct transition
 



From fedora-extras-commits at redhat.com  Mon Sep 10 22:12:53 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 18:12:53 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.83,
	1.84 sources, 1.39, 1.40
Message-ID: <200709102212.l8AMCrGk028481@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
- Resolves #274551, #253331, #254246, #254248
- Rebase Autotools to 0.9.3 
    




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Aug 2007 21:15:55 -0000	1.31
+++ .cvsignore	10 Sep 2007 22:12:19 -0000	1.32
@@ -4,3 +4,4 @@
 eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- eclipse-cdt.spec	23 Aug 2007 19:04:49 -0000	1.83
+++ eclipse-cdt.spec	10 Sep 2007 22:12:19 -0000	1.84
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -62,7 +62,7 @@
 
 Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -347,6 +347,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
+- Resolves #274551, #253331, #254246, #254248
+- Rebase Autotools to 0.9.3 
+
 * Thu Aug 23 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-5
 - Add eclipse-cvs-client dependency
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	17 Aug 2007 18:53:43 -0000	1.39
+++ sources	10 Sep 2007 22:12:19 -0000	1.40
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 089752c5437767e4756b893da17a7574  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-dd644089e39baca4b2007ec9fcbc91e7  eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+19ec953175bc545859ed0da61c1d3535  eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:27:01 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 18:27:01 -0400
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.7,1.8
Message-ID: <200709102227.l8AMR1bI029023@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29005

Modified Files:
	WhatsNew.py 
Log Message:
inherit stable dist when doing WhatsNew name queries


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WhatsNew.py	10 May 2007 14:18:52 -0000	1.7
+++ WhatsNew.py	10 Sep 2007 22:26:59 -0000	1.8
@@ -102,7 +102,13 @@
 
 def queryname(dist,name):
     """query whether source rpm name is known, returns True or False"""
-    return names.has_key(dist) and names[dist].has_key(name)
+    instable = names.has_key(dist) and names[dist].has_key(name)
+    if dist.startswith('testing/'):
+        dist = dist.replace('testing/', '')
+        intesting = names.has_key(dist) and names[dist].has_key(name)
+        return (instable or intesting)
+    else:
+        return instable
 
 
 def put(dist,srcrpm,ts):



From fedora-extras-commits at redhat.com  Mon Sep 10 22:46:22 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 18:46:22 -0400
Subject: rpms/eclipse-cdt/F-7 .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.81, 
	1.82 sources, 1.37, 1.38
Message-ID: <200709102246.l8AMkM0S029700@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
- Resolves #274551
- Rebase autotools to 0.1.2
- Add check for failure to generate makefile and no makefile exists





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Aug 2007 18:16:32 -0000	1.31
+++ .cvsignore	10 Sep 2007 22:45:45 -0000	1.32
@@ -11,3 +11,4 @@
 eclipse-cdt-autotools-0.0.9.tar.gz
 eclipse-cdt-autotools-3_x-0.1.0.tar.gz
 eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+eclipse-cdt-autotools-3_x-0.1.2.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/eclipse-cdt.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- eclipse-cdt.spec	16 Aug 2007 18:16:32 -0000	1.81
+++ eclipse-cdt.spec	10 Sep 2007 22:45:45 -0000	1.82
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -42,7 +42,7 @@
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.2.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -319,6 +319,11 @@
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
+- Resolves #274551
+- Rebase autotools to 0.1.2
+- Add check for failure to generate makefile and no makefile exists
+
 * Thu Aug 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-7
 - Resolves #251412
 - Rebase autotools to 0.1.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	16 Aug 2007 18:17:58 -0000	1.37
+++ sources	10 Sep 2007 22:45:45 -0000	1.38
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-bf84e6e5af97ab6f3430ea1395c3c003  eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+8aeab614fd9e95aa3b9373f210fcde32  eclipse-cdt-autotools-3_x-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:57:06 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Mon, 10 Sep 2007 18:57:06 -0400
Subject: rpms/vbetool/devel vbetool-0.3-fix-gcc4bug.patch, NONE,
	1.1 vbetool-libz.patch, NONE, 1.1 vbetool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709102257.l8AMv6Sn030194@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vbetool-0.3-fix-gcc4bug.patch vbetool-libz.patch vbetool.spec 
Log Message:
initial import


vbetool-0.3-fix-gcc4bug.patch:

--- NEW FILE vbetool-0.3-fix-gcc4bug.patch ---
--- vbetool-0.7/vbetool.c.gcc4	2006-07-25 21:27:21.000000000 -0400
+++ vbetool-0.7/vbetool.c	2007-02-20 13:29:22.000000000 -0500
@@ -345,9 +345,10 @@
 {
 	int size;
 	char *buffer = __save_state(&size);
+	ssize_t num_written;
 
 	if (buffer)
-		write(1, buffer, size);	/* FIXME: should retry on short write); */
+		num_written = write(1, buffer, size);	/* FIXME: should retry on short write); */
 }
 
 int do_blank(int state)

vbetool-libz.patch:

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
 SUBDIRS = x86emu
 @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
 @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
+ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_FALSE at x86lib = ""
 man_MANS = vbetool.1
 vbetool_SOURCES = vbetool.c $(x86)


--- NEW FILE vbetool.spec ---
Name:           vbetool
Version:        0.7
Release:        2%{?dist}
Summary:        Run real-mode video BIOS code to alter hardware state

Group:          System Environment/Base
License:        GPLv2
URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
Patch10:        vbetool-0.3-fix-gcc4bug.patch
Patch11:        vbetool-libz.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel pciutils-devel
# does not build on ppc and ppc64
ExcludeArch:    ppc ppc64
# vbetool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch.


%prep
%setup -q
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .zlib


%build
%ifarch x86_64
%configure --with-x86emu
%else
%configure
%endif
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 COPYING
%{_sbindir}/vbetool
%{_mandir}/man1/vbetool.1.gz


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> 0.7-2
- ExcludeArch: ppc and ppc64 (does not build there)
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 0.7-1
- initial release for Fedora with patches from the pm-utils package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:33:51 -0000	1.1
+++ .cvsignore	10 Sep 2007 22:56:27 -0000	1.2
@@ -0,0 +1 @@
+vbetool_0.7-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:33:51 -0000	1.1
+++ sources	10 Sep 2007 22:56:27 -0000	1.2
@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:59:22 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Mon, 10 Sep 2007 18:59:22 -0400
Subject: rpms/radeontool/devel radeontool-1.5.diff, NONE,
	1.1 radeontool-fix-option-handling.diff, NONE,
	1.1 radeontool-get-rid-of-lspci.diff, NONE, 1.1 radeontool.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709102259.l8AMxM6T030336@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff radeontool.spec 
Log Message:
initial import


radeontool-1.5.diff:

--- NEW FILE radeontool-1.5.diff ---
--- radeontool.c
+++ radeontool.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <asm/page.h>
 
 #include "radeon_reg.h"
 
@@ -30,7 +29,7 @@
 
 /* *radeon_cntl_mem is mapped to the actual device's memory mapped control area. */
 /* Not the address but what it points to is volatile. */
-unsigned char * volatile radeon_cntl_mem;
+volatile unsigned char * radeon_cntl_mem;
 
 static void fatal(char *why)
 {
@@ -47,7 +46,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    value = *(unsigned long * volatile)(radeon_cntl_mem+offset);  
+    value = *(volatile unsigned long *)(radeon_cntl_mem+offset);  
     if(debug) 
         printf("%08lx\n",value);
     return value;
@@ -60,7 +59,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    *(unsigned long * volatile)(radeon_cntl_mem+offset) = value;  
+    *(volatile unsigned long *)(radeon_cntl_mem+offset) = value;  
 }
 
 static void usage(void)
@@ -83,10 +82,10 @@
 /* with /dev/mem, then I could write this whole program in perl, */
 /* but sadly this is only the size of physical RAM.  If you */
 /* want to be truely bad and poke into device memory you have to mmap() */
-static unsigned char * map_devince_memory(unsigned int base,unsigned int length) 
+static volatile unsigned char * map_device_memory(unsigned int base,unsigned int length) 
 {
     int mem_fd;
-    unsigned char *device_mem;
+    volatile unsigned char *device_mem;
 
     /* open /dev/mem */
     if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
@@ -94,12 +93,12 @@
     }
 
     /* mmap graphics memory */
-    if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
+    if ((device_mem = malloc(length + (getpagesize()-1))) == NULL) {
         fatal("allocation error \n");
     }
-    if ((unsigned long)device_mem % PAGE_SIZE)
-        device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
-    device_mem = (unsigned char *)mmap(
+    if ((unsigned long)device_mem % getpagesize())
+        device_mem += getpagesize() - ((unsigned long)device_mem % getpagesize());
+    device_mem = (volatile unsigned char *)mmap(
         (caddr_t)device_mem, 
         length,
         PROT_READ|PROT_WRITE,
@@ -107,9 +106,9 @@
         mem_fd, 
         base
     );
-    if ((long)device_mem < 0) {
+    if (device_mem == (volatile unsigned char *)-1) {
         if(debug)
-            fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+            fprintf(stderr,"mmap returned %d\n",(int)(long)device_mem);
         fatal("mmap error \n");
     }
     return device_mem;
@@ -316,7 +315,7 @@
     }
     if(debug)
         printf("Radeon found. Base control address is %x.\n",base);
-    radeon_cntl_mem = map_devince_memory(base,0x2000);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
 }
 
 int main(int argc,char *argv[]) 

radeontool-fix-option-handling.diff:

--- NEW FILE radeontool-fix-option-handling.diff ---
--- radeontool.c.options	2007-02-20 14:48:20.000000000 -0500
+++ radeontool.c	2007-02-20 14:53:07.000000000 -0500
@@ -320,18 +320,21 @@
 
 int main(int argc,char *argv[]) 
 {
+    int found_other = 0;
+    while (argc > 1 && !found_other) {
+        if(strcmp(argv[1],"--debug") == 0) {
+            debug=1;
+            argv++; argc--;
+        } else if(strncmp(argv[1],"--skip=",7) == 0) {
+            skip=atoi(argv[1]+7);
+            argv++; argc--;
+        } else {
+            found_other = 1;
+        }
+    }
     if(argc == 1) {
-        map_radeon_cntl_mem();
 	usage();
     }
-    if(strcmp(argv[1],"--debug") == 0) {
-        debug=1;
-        argv++; argc--;
-    };
-    if(strcmp(argv[1],"--skip=") == 0) {
-        skip=atoi(argv[1]+7);
-        argv++; argc--;
-    };
     map_radeon_cntl_mem();
     if(argc == 2) {
         if(strcmp(argv[1],"regs") == 0) {

radeontool-get-rid-of-lspci.diff:

--- NEW FILE radeontool-get-rid-of-lspci.diff ---
--- radeontool.c	2006/02/22 11:07:50	1.3
+++ radeontool.c	2006/03/08 00:37:25
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <pci/pci.h>
 
 #include "radeon_reg.h"
 
@@ -231,7 +232,7 @@ void radeon_cmd_stretch(char *param)
     radeon_set(RADEON_FP_VERT_STRETCH,"RADEON_FP_VERT_STRETCH",fp_vert_stretch);
 }
 
-
+#if 0
 /* Here we fork() and exec() the lspci command to look for the Radeon hardware address. */
 static void map_radeon_cntl_mem(void)
 {
@@ -317,6 +318,62 @@ We need to look through it to find the s
         printf("Radeon found. Base control address is %x.\n",base);
     radeon_cntl_mem = map_device_memory(base,0x2000);
 }
+#else
+static u32
+conf2long(unsigned char *c, unsigned int p)
+{
+    return c[p] | (c[p+1] << 8) | (c[p+2] << 16) | (c[p+3] << 24);
+}
+
+static void map_radeon_cntl_mem(void)
+{
+    struct pci_access *pacc;
+    struct pci_dev *dev;
+    unsigned int class;
+    int i;
+    int base = -1;
+    unsigned char *config;
+
+    config = malloc(64);
+    if (!config)
+        fatal("malloc(64) failed\n");
+    pacc = pci_alloc();
+    pci_init(pacc);
+    pci_scan_bus(pacc);
+    for(dev=pacc->devices; dev; dev=dev->next) {            /* Iterate over all devices */
+        pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);/* Fill in header info we need */
+        class = pci_read_word(dev, PCI_CLASS_DEVICE);       /* Read config register directly */
+        if (dev->vendor_id == 0x1002 && class == 0x300) {   /* ATI && Graphics card */
+            if (debug)
+                printf("Found: %02x:%02x.%d vendor=%04x device=%04x class=%04x\n",
+                       dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id, class);
+            if (skip-- < 1) {
+                pci_read_block(dev, 0, config, 64);
+                for (i=0; i<6; i++){
+                    u32 flag = conf2long(config, PCI_BASE_ADDRESS_0 + 4*i);
+                    if (flag & PCI_BASE_ADDRESS_SPACE_IO)   /* I/O-Ports, not memory */
+                        continue;
+                    /* the original code parsed lspci for "emory" and "K", so it
+                     * has to be at least 1K and less than 1M
+                     */
+                    if (dev->size[i] >=1024 && dev->size[i] < 1024*1024) {
+                        base = dev->base_addr[i];
+                        goto found;
+                    }
+                }
+            }
+        }
+    }
+ found:
+    pci_cleanup(pacc);
+    free(config);
+    if (base == -1)
+        fatal("Radeon not found.\n");
+    if (debug)
+        printf("Radeon found. Base control address is %x.\n",base);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
+}
+#endif
 
 int main(int argc,char *argv[]) 
 {

--- Makefile.no-lspci	2007-02-20 14:56:57.000000000 -0500
+++ Makefile	2007-02-20 14:56:42.000000000 -0500
@@ -1,7 +1,7 @@
 
 
 radeontool: radeontool.c
-	gcc -Wall -O2 radeontool.c -o radeontool
+	gcc -Wall -O2 radeontool.c -o radeontool -lpci
 
 
 



--- NEW FILE radeontool.spec ---
Name:           radeontool
Version:        1.5
Release:        2%{?dist}
Summary:        Backlight and video output configuration tool for radeon cards

Group:          System Environment/Base
License:        zlib
URL:            http://fdd.com/software/radeon/
Source0:        http://fdd.com/software/radeon/radeontool-%{version}.tar.gz
Patch20:        radeontool-1.5.diff
Patch21:        radeontool-fix-option-handling.diff
Patch22:        radeontool-get-rid-of-lspci.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pciutils-devel zlib-devel
# radeontool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
Radeontool may switch the backlight and external video output on and off.  Use
radeontool at your own risk, it may damage your hardware.


%prep
%setup -q
%patch20 -p0 -b .volatile
%patch21 -p0 -b .options
%patch22 -p0 -b .no-lspci


%build
gcc $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT

install -D -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}/radeontool


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES
%{_sbindir}/radeontool


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> - 1.5-2
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 1.5-1
- initial release for Fedora with patches from pm-utils package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:23:11 -0000	1.1
+++ .cvsignore	10 Sep 2007 22:58:50 -0000	1.2
@@ -0,0 +1 @@
+radeontool-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:23:11 -0000	1.1
+++ sources	10 Sep 2007 22:58:50 -0000	1.2
@@ -0,0 +1 @@
+8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 23:01:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 19:01:03 -0400
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.8,1.9
Message-ID: <200709102301.l8AN13Vi002151@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30421

Modified Files:
	WhatsNew.py 
Log Message:
inherit from stable dist when doing WhatsNew changelog queries


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WhatsNew.py	10 Sep 2007 22:26:59 -0000	1.8
+++ WhatsNew.py	10 Sep 2007 23:01:01 -0000	1.9
@@ -135,9 +135,18 @@
 
 def getclog(dist,name):
     """get the list of most recent changelog 3-tuples for this package, if any have been stored in the WhatsNew db before"""
-    if not names.has_key(dist):
-        return []
-    return names[dist].get(name,[])
+    def _getclog(dist,name):
+        if not names.has_key(dist):
+            return []
+        return names[dist].get(name,[])
+
+    if dist.startswith('testing/'):
+        testingclog = _getclog(dist,name)
+        if len(testingclog):
+            return testingclog
+        # inherit changelogs from stable repo
+        dist = dist.replace('testing/', '')
+    return _getclog(dist,name)
 
 
 def formatclog(clogtuples):



From fedora-extras-commits at redhat.com  Mon Sep 10 23:07:57 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 19:07:57 -0400
Subject: rpms/eclipse-cdt/EL-5 .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.80,
	1.81 sources, 1.36, 1.37
Message-ID: <200709102307.l8AN7vUi004181@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4142

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
- Resolves #274551
- Rebase autotools to 0.1.2
- Add check for failure to generate makefile and no makefile exists





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	21 Aug 2007 21:07:07 -0000	1.31
+++ .cvsignore	10 Sep 2007 23:07:24 -0000	1.32
@@ -11,3 +11,4 @@
 eclipse-cdt-autotools-0.0.9.tar.gz
 eclipse-cdt-autotools-3_x-0.1.0.tar.gz
 eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+eclipse-cdt-autotools-3_x-0.1.2.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/eclipse-cdt.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- eclipse-cdt.spec	21 Aug 2007 21:07:07 -0000	1.80
+++ eclipse-cdt.spec	10 Sep 2007 23:07:24 -0000	1.81
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -42,7 +42,7 @@
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.2.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -319,6 +319,11 @@
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
+- Resolves #274551
+- Rebase autotools to 0.1.2
+- Add check for failure to generate makefile and no makefile exists
+
 * Thu Aug 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-7
 - Resolves #251412
 - Rebase autotools to 0.1.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	21 Aug 2007 21:07:07 -0000	1.36
+++ sources	10 Sep 2007 23:07:24 -0000	1.37
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-bf84e6e5af97ab6f3430ea1395c3c003  eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+8aeab614fd9e95aa3b9373f210fcde32  eclipse-cdt-autotools-3_x-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 23:29:40 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 19:29:40 -0400
Subject: rpms/pcmanx-gtk2/F-7 pcmanx-gtk2.spec,1.2,1.3
Message-ID: <200709102329.l8ANTehT005171@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5091

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
increase release number



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/pcmanx-gtk2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmanx-gtk2.spec	10 Sep 2007 14:57:09 -0000	1.2
+++ pcmanx-gtk2.spec	10 Sep 2007 23:29:07 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.6
-Release:   1.%{alphatag}%{?dist}
+Release:   2.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Sep 11 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-2.355svn
+- increase release number to work around an error
+
 * Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
 - svn 355
 



From fedora-extras-commits at redhat.com  Mon Sep 10 23:42:38 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 19:42:38 -0400
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.2,1.3
Message-ID: <200709102342.l8ANgc7I005841@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5752

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
bump release number



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmanx-gtk2.spec	9 Sep 2007 15:26:03 -0000	1.2
+++ pcmanx-gtk2.spec	10 Sep 2007 23:42:06 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.6
-Release:   1.%{alphatag}%{?dist}
+Release:   2.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Sep 11 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-2.355svn
+- bump release number
+
 * Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
 - svn 355
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:01:50 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 20:01:50 -0400
Subject: extras-buildsys/utils/pushscript Push.py,1.44,1.45
Message-ID: <200709110001.l8B01oLT012582@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128

Modified Files:
	Push.py 
Log Message:
* Make pushing in updates-testing mode require explicit args, e.g.

  epel-push testing/5 testing/4
  epel-push all

so specifying only the normal/stable repo numbers does not trigger
any pushes from plague-results to the testing repos. Specifying
stable dist numbers can still be used to handle external changes
to the stable repos (moved/removed packages etc.)

* No empty build reports anymore. We've had this long ago, but then
wanted to simulate the daily rawhide reports, even in case of zero pkgs.




Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Push.py	23 Aug 2007 12:11:17 -0000	1.44
+++ Push.py	11 Sep 2007 00:01:47 -0000	1.45
@@ -188,28 +188,31 @@
     or None."""
 
     changedrepo = None
+    srcdist = dist  # the plague-results dist number
 
-    srcdist = dist
-    distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
+    # When we're in updates-testing override mode, adjust the "srcdist"
+    # parameter to point to the single plague-results directory, and
+    # reject pushing to non-testing repositories.
+    if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+        if dist.startswith('testing/'):
+            srcdist = dist.replace('testing/','')
+        else:  # no-op
+            return 0, changedrepo
+    
+    distdir = '%s-%s-%s' % (cfg.distro, srcdist, cfg.project)
     needsignroot = os.path.join(cfg.stagesdir, distdir)
-
-    if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting and not dist.startswith('testing/') and not dist=='development':
-        dist = 'testing/%s' % dist
-        destroot = os.path.join(cfg.treedir, dist)
-    else:
-        destroot = os.path.join(cfg.treedir, dist)
+    destroot = os.path.join(cfg.treedir, dist)
+    print '='*70
+    print 'Target repository:', destroot
+    print '='*70
     if not os.path.exists(destroot):
         os.makedirs(destroot)
-    
-    if srcdist.startswith('testing/'):
-        return 0, changedrepo
-    
     Utils.make_std_repodirs(cfg,dist,destroot)
     
     repolockname = os.path.join(needsignroot,REPO_LOCKFILE_NAME)
     repolock = LockFile(name=repolockname,blocking=True)
     try:
-        print 'Waiting for repository lock on %s:' % distdir,
+        print 'Waiting for repository lock on %s:' % needsignroot,
         sys.stdout.flush()
         repolock.lock()
         print 'OK'
@@ -334,14 +337,20 @@
         if not dist in distlist:
             continue
         brm = BuildReportManager(cfg.rundir,dist)
-    
-        body += "\nPackages built and released for %s %s: %s\n\n" % (cfg.project_hr, dist, brm.GetCount())
+        count = brm.GetCount()
+        if not count:
+            continue
+        body += "\nPackages built and released for %s %s: %s\n\n" % (cfg.project_hr, dist, count)
         body += brm.GetReport()
         body += '\n\n'
 
     for dist in cfg.alldists:  # we do this for sorting the dists
         if not dist in distlist:
             continue
+        brm = BuildReportManager(cfg.rundir,dist)
+        count = brm.GetCount()
+        if not count:
+            continue
         body += "\nChanges in %s %s: \n\n" % (cfg.project_hr, dist)
         try:
             WhatsNew.load(cfg.rundir)
@@ -349,6 +358,9 @@
         except:
             pass
 
+    if not len(body):
+        print 'Empty build report. Nothing sent.'
+        return
     body += cfg.mail_footer
     
     email.Charset.add_charset('utf-8',email.Charset.SHORTEST,None,None)
@@ -410,7 +422,6 @@
             sys.exit(errno.EINVAL)
         if d not in diststopush:
             diststopush.append(d)
-    Utils.debugprint(diststopush)
     if not len(diststopush):
         usage()
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:10:35 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 20:10:35 -0400
Subject: extras-buildsys/utils/pushscript ToStable.py,1.5,1.6
Message-ID: <200709110010.l8B0AZLG012924@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12906

Modified Files:
	ToStable.py 
Log Message:
unused value


Index: ToStable.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/ToStable.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ToStable.py	23 Aug 2007 21:57:16 -0000	1.5
+++ ToStable.py	11 Sep 2007 00:10:33 -0000	1.6
@@ -23,9 +23,6 @@
 from LockFile import LockFile
 from BuildReport import *
 
-DEBUG = False
-Utils.setdebug(DEBUG)
-
 ts = rpmUtils.transaction.initReadOnlyTransaction()
 
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:33:02 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:33:02 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.19,1.20
Message-ID: <200709110033.l8B0X2P9013972@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13928

Modified Files:
	linkchecker.spec 
Log Message:
Rebuild for F8.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linkchecker.spec	11 Dec 2006 16:36:39 -0000	1.19
+++ linkchecker.spec	11 Sep 2007 00:32:29 -0000	1.20
@@ -1,30 +1,26 @@
 %{!?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)")}
 
 Summary: Check HTML documents for broken links
 Name: linkchecker
-Version: 3.3
-Release: 11%{?dist}
-License: GPL
+Version: 4.7
+Release: 9%{?dist}
+License: GPLv2
 Group: Development/Tools
-Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: linkchecker-4.7-fedora-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://linkchecker.sourceforge.net/
-BuildRequires: python-devel
+BuildRequires: python-devel gettext
 # Do not have one of these to test on:
-ExcludeArch: x86_64
+# ExcludeArch: x86_64
 
 %description
 Linkchecker is a simple script that checks HTML documents for broken links.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch1 -p1 -b .fedora-build
 
 # Fix character encoding
 iconv -f iso-8859-1 -t utf-8 -o linkchecker-de.1 doc/de/linkchecker.1
@@ -42,32 +38,70 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
-# Collate list of python files
-(
-  echo '%defattr (0644,root,root,0755)'
-  find %{buildroot}%{python_sitelib}/linkchecker -type d |
-    sed 's:%{buildroot}\(.*\):%dir \1:'
-  find %{buildroot}%{python_sitelib} -not -type d |
-    sed 's:%{buildroot}\(.*\):\1:'
-) > pyfiles
+# The upstream installer does not seem to install these right:
+%{__install} -D -m 0644 build/share/locale/de/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/de/LC_MESSAGES/linkchecker.mo
+%{__install} -D -m 0644 build/share/locale/fr/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES/linkchecker.mo
+%{__install} -D -m 0644 build/share/locale/es/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/es/LC_MESSAGES/linkchecker.mo
+
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f pyfiles
-%{python_sitelib}/*.pyc
-%{python_sitelib}/*.pyo
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %{_bindir}/linkchecker
-%dir %{_datadir}/linkchecker/
-%{_datadir}/linkchecker/*
-%{_mandir}/man1/*
-%doc TODO doc/ cgi/lconline/ test/ README LICENSE
-%dir %{_mandir}/de/man1
+#%ifarch x86_64 ppc64
+%{python_sitearch}/linkcheck/
+%{python_sitearch}/_linkchecker_configdata.*
+#%else
+#%{python_sitelib}/linkcheck/
+#%{python_sitelib}/_linkchecker_configdata.*
+#%endif
+%config(noreplace) %{_sysconfdir}/linkchecker
+%{_mandir}/man1/linkchecker.1*
 %lang(de) %{_mandir}/de/man1/linkchecker.1*
-%dir %{_mandir}/fr/man1
 %lang(fr) %{_mandir}/fr/man1/linkchecker.1*
+%doc TODO doc/en README COPYING
 
 %changelog
+* Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
+   - Rebuild for F7.
+
+* Fri Jul 27 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-8
+   - On 64-bit platforms, everything is in %{python_sitearch}/linkcheck/.
+
+* Wed Jul 25 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-7
+   - Install configuration files in /etc/linkchecker.
+   - Do not install examples.
+
+* Tue Jul 24 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-6
+   - Install logging.conf again.
+   - Use %%find_lang.
+
+* Sat Jul 21 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-5
+   - Simplify %%files.
+   - Don't install logging.conf because it is not documented.
+   - Install linkcheckerrc into /etc/linkchecker.
+
+* Mon Jul 16 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-4
+   - Own %%{python_sitelib}/linkcheck/ and %%{python_sitearch}/linkcheck/.
+   - Include .1.gz-style man pages in %%files.
+   - Include _linkchecker_configdata.* instead of just .py.
+
+* Sat Jul 14 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-3
+   - Use sitearch for .so, sitelib for .py, .pyo and .pyc.
+   - Clean up docs directory.
+
+* Thu Jul 12 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-2
+   - Use sitearch instead of sitelib.
+   - Fix upstream source location.
+   - Simplify %%files.
+
+* Wed Jul 11 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-1
+   - Rebuild for F7.
+   - Update to upstream 4.7.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-11
    - Rebuild for FC6.
 
@@ -84,7 +118,7 @@
    - Install /usr/lib/python2.4/site-packages/_linkchecker_configdata.pyc again.
 
 * Fri Jul 28 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-6
-   - Add %{buildroot} to previous.
+   - Add %%{buildroot} to previous.
 
 * Fri Jul 28 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-5
    - Do not install /usr/lib/python2.4/site-packages/_linkchecker_configdata.pyc



From fedora-extras-commits at redhat.com  Tue Sep 11 00:34:45 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:34:45 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.20,1.21
Message-ID: <200709110034.l8B0YjfL014047@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14004

Modified Files:
	linkchecker.spec 
Log Message:
Rebuild for F8.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linkchecker.spec	11 Sep 2007 00:32:29 -0000	1.20
+++ linkchecker.spec	11 Sep 2007 00:34:12 -0000	1.21
@@ -66,7 +66,7 @@
 
 %changelog
 * Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
-   - Rebuild for F7.
+   - Rebuild for F8.
 
 * Fri Jul 27 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-8
    - On 64-bit platforms, everything is in %{python_sitearch}/linkcheck/.



From fedora-extras-commits at redhat.com  Tue Sep 11 00:39:57 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:39:57 -0400
Subject: rpms/linkchecker/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200709110039.l8B0dvep014283@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247

Modified Files:
	.cvsignore sources 
Log Message:
Forgot to add new sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2006 12:23:54 -0000	1.3
+++ .cvsignore	11 Sep 2007 00:39:25 -0000	1.4
@@ -1 +1,2 @@
-linkchecker-3.3.tar.gz
+linkchecker-4.7.tar.gz
+linkchecker-4.7-fedora-build.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2006 12:23:54 -0000	1.3
+++ sources	11 Sep 2007 00:39:25 -0000	1.4
@@ -1 +1,2 @@
-84b1ac29c8a638f77f9db5c2b27b5a79  linkchecker-3.3.tar.gz
+0bd9860cf8acd546ac57b7b8ff5933e8  linkchecker-4.7.tar.gz
+82b08063ad744537e8cd07ea8a694ded  linkchecker-4.7-fedora-build.patch



From fedora-extras-commits at redhat.com  Tue Sep 11 00:41:30 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:41:30 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.21,1.22
Message-ID: <200709110041.l8B0fUCi014522@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14342

Modified Files:
	linkchecker.spec 
Log Message:
Bump version to retag.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linkchecker.spec	11 Sep 2007 00:34:12 -0000	1.21
+++ linkchecker.spec	11 Sep 2007 00:40:57 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 4.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -65,6 +65,9 @@
 %doc TODO doc/en README COPYING
 
 %changelog
+* Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-10
+   - Bump version to retag with new sources.
+
 * Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
    - Rebuild for F8.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 03:06:09 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 23:06:09 -0400
Subject: rpms/xfsprogs/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 xfsprogs.spec, 1.29, 1.30
Message-ID: <200709110306.l8B369Yv004688@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4666

Modified Files:
	.cvsignore sources xfsprogs.spec 
Log Message:
* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-1
- Update to xfsprogs 2.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2007 22:16:00 -0000	1.11
+++ .cvsignore	11 Sep 2007 03:05:36 -0000	1.12
@@ -1 +1 @@
-xfsprogs_2.9.3-1.tar.gz
+xfsprogs_2.9.4-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2007 22:16:00 -0000	1.12
+++ sources	11 Sep 2007 03:05:36 -0000	1.13
@@ -1 +1 @@
-fd41478ab239c8815961dc13e3d4fa6f  xfsprogs_2.9.3-1.tar.gz
+174683e3b86b587ed59823fdbbb96ea4  xfsprogs_2.9.4-1.tar.gz


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfsprogs.spec	25 Aug 2007 00:09:46 -0000	1.29
+++ xfsprogs.spec	11 Sep 2007 03:05:36 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem
 Name: xfsprogs
-Version: 2.9.3
-Release: 3%{?dist}
+Version: 2.9.4
+Release: 1%{?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
@@ -111,6 +111,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-1
+- Update to xfsprogs 2.9.4
+
 * Fri Aug 24 2007 Eric Sandeen <sandeen at redhat.com> 2.9.3-3
 - Add gawk to buildrequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 03:19:59 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 23:19:59 -0400
Subject: rpms/xfsdump/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfsdump.spec, 1.5, 1.6 fix-open-O_CREAT-perms.patch, 1.1, NONE
Message-ID: <200709110319.l8B3JxgR006406@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsdump/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6186

Modified Files:
	.cvsignore sources xfsdump.spec 
Removed Files:
	fix-open-O_CREAT-perms.patch 
Log Message:
* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.46-1
- Update to xfsdump version 2.2.46
- Dropped O_CREAT patch, now upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2007 05:06:32 -0000	1.3
+++ .cvsignore	11 Sep 2007 03:19:26 -0000	1.4
@@ -1 +1 @@
-xfsdump_2.2.45-1.tar.gz
+xfsdump_2.2.46-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2007 05:06:32 -0000	1.3
+++ sources	11 Sep 2007 03:19:26 -0000	1.4
@@ -1 +1 @@
-9f4f6da94d14e638639a542b0fa8a722  xfsdump_2.2.45-1.tar.gz
+c233a3f032d183d5bfa5dce210a08418  xfsdump_2.2.46-1.tar.gz


Index: xfsdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/xfsdump.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfsdump.spec	25 Aug 2007 00:04:28 -0000	1.5
+++ xfsdump.spec	11 Sep 2007 03:19:26 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Administrative utilities for the XFS filesystem
 Name: xfsdump
-Version: 2.2.45
-Release: 3%{?dist}
+Version: 2.2.46
+Release: 1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 License: GPL+
@@ -13,8 +13,6 @@
 BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
 Requires: xfsprogs >= 2.6.30, attr >= 2.0.0
 
-Patch1: fix-open-O_CREAT-perms.patch
-
 %description
 The xfsdump package contains xfsdump, xfsrestore and a number of
 other utilities for administering XFS filesystems.
@@ -34,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 autoconf
@@ -64,6 +61,10 @@
 /sbin/*
 
 %changelog
+* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.46-1
+- Update to xfsdump version 2.2.46
+- Dropped O_CREAT patch, now upstream
+
 * Fri Aug 24 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-3
 - Update license tag
 - Fix up O_CREAT opens with no mode


--- fix-open-O_CREAT-perms.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 05:27:38 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:27:38 -0400
Subject: rpms/zabbix/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zabbix.spec,
	1.8, 1.9
Message-ID: <200709110527.l8B5RcEK027633@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27609

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 15:40:03 -0000	1.7
+++ .cvsignore	11 Sep 2007 05:27:04 -0000	1.8
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 15:40:04 -0000	1.7
+++ sources	11 Sep 2007 05:27:04 -0000	1.8
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zabbix.spec	2 Jul 2007 15:40:04 -0000	1.8
+++ zabbix.spec	11 Sep 2007 05:27:04 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:33:42 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:33:42 -0400
Subject: rpms/zabbix/F-7 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zabbix.spec, 
	1.10, 1.11
Message-ID: <200709110533.l8B5XgA9027921@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27894

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 15:01:23 -0000	1.7
+++ .cvsignore	11 Sep 2007 05:33:09 -0000	1.8
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 15:01:24 -0000	1.7
+++ sources	11 Sep 2007 05:33:09 -0000	1.8
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	2 Jul 2007 15:01:24 -0000	1.10
+++ zabbix.spec	11 Sep 2007 05:33:09 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:37:47 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:37:47 -0400
Subject: rpms/zabbix/EL-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 zabbix.spec,
	1.8, 1.9
Message-ID: <200709110537.l8B5blCD028138@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28106

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release
- built without WWW monitoring support due old libcurl



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jul 2007 14:36:16 -0000	1.6
+++ .cvsignore	11 Sep 2007 05:37:14 -0000	1.7
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jul 2007 14:36:16 -0000	1.6
+++ sources	11 Sep 2007 05:37:14 -0000	1.7
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zabbix.spec	16 Jul 2007 14:36:16 -0000	1.8
+++ zabbix.spec	11 Sep 2007 05:37:14 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -27,7 +27,7 @@
 
 BuildRequires:  %{database}-devel, net-snmp-devel
 BuildRequires:  openldap-devel, gnutls-devel
-BuildRequires:  iksemel-devel, curl-devel
+BuildRequires:  iksemel-devel
 Requires:       logrotate, fping, net-snmp-libs
 Requires(pre):      /usr/sbin/useradd
 Requires(post):     /sbin/chkconfig
@@ -98,7 +98,7 @@
     --with-%{zdb} \
     --with-net-snmp \
     --with-ldap \
-    --with-libcurl \
+    --without-libcurl \
     --with-jabber
 
 #make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,10 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+- built without WWW monitoring support due old libcurl
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:39:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:39:28 -0400
Subject: rpms/zabbix/EL-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 zabbix.spec,
	1.9, 1.10
Message-ID: <200709110539.l8B5dS2F028302@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jul 2007 14:34:31 -0000	1.6
+++ .cvsignore	11 Sep 2007 05:38:55 -0000	1.7
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jul 2007 14:34:31 -0000	1.6
+++ sources	11 Sep 2007 05:38:55 -0000	1.7
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	16 Jul 2007 14:34:31 -0000	1.9
+++ zabbix.spec	11 Sep 2007 05:38:55 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 07:13:28 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:13:28 -0400
Subject: comps comps-f7.xml.in,1.250,1.251 comps-f8.xml.in,1.102,1.103
Message-ID: <200709110713.l8B7DSE0010945@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10918

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
add boswars


Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- comps-f7.xml.in	10 Sep 2007 07:50:16 -0000	1.250
+++ comps-f7.xml.in	11 Sep 2007 07:12:57 -0000	1.251
@@ -1285,6 +1285,7 @@
       <packagereq type="optional">blobby</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bombardier</packagereq>
+      <packagereq type="optional">boswars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>
       <packagereq type="optional">bzflag</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- comps-f8.xml.in	10 Sep 2007 07:50:16 -0000	1.102
+++ comps-f8.xml.in	11 Sep 2007 07:12:58 -0000	1.103
@@ -1425,6 +1425,7 @@
       <packagereq type="optional">blobby</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bombardier</packagereq>
+      <packagereq type="optional">boswars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>
       <packagereq type="optional">bzflag</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 07:23:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:23:02 -0400
Subject: rpms/boswars/devel boswars-2.4.1-SConstruct.patch, NONE,
	1.1 boswars-2.4.1-guichan26.patch, NONE, 1.1 boswars.desktop,
	NONE, 1.1 boswars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709110723.l8B7N23G011222@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11166/devel

Modified Files:
	.cvsignore sources 
Added Files:
	boswars-2.4.1-SConstruct.patch boswars-2.4.1-guichan26.patch 
	boswars.desktop boswars.spec 
Log Message:
initial boswars import


boswars-2.4.1-SConstruct.patch:

--- NEW FILE boswars-2.4.1-SConstruct.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -279,7 +278,8 @@ AutoConfigureIfNeeded(env, '')
 
 # define the different build environments (variants)
 release = env.Copy()
-release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer -fexpensive-optimizations -ffast-math'))
+release.Append(CCFLAGS = Split('-ffast-math'))
+release.Append(LIBS = '-ltolua++')
 
 if mingw['extrapath']:
   mingw.Tool('crossmingw', toolpath = ['tools/scons/'])

boswars-2.4.1-guichan26.patch:

--- NEW FILE boswars-2.4.1-guichan26.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -75,7 +75,6 @@ def globSources(sourceDirs, builddir):
 
 def buildSourcesList(builddir):
    sources = globSources("action ai editor game map network pathfinder sound stratagus ui unit video tolua", builddir)
-   sources.append(globSources("guichan guichan/sdl guichan/widgets", builddir))
    return sources
 sourcesEngine = buildSourcesList('build')
 
@@ -274,7 +273,6 @@ AutoConfigureIfNeeded(env, '')
 def addBosWarsPaths(env):
    # Stratagus build specifics
    env.Append(CPPPATH=engineSourceDir+'/include')
-   env.Append(CPPPATH=engineSourceDir+'/guichan/include')
 addBosWarsPaths(env)
 
 # define the different build environments (variants)
diff -up boswars-2.4.1-src/engine/include/widgets.h.hdg boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h.hdg	2007-09-07 19:32:04.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-07 20:35:09.000000000 +0200
@@ -111,9 +111,9 @@ public:
 	virtual void drawBox(gcn::Graphics *graphics);
 	virtual void draw(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -137,9 +137,9 @@ public:
 	virtual void draw(gcn::Graphics *graphics);
 	virtual void drawBox(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -229,7 +229,7 @@ public:
 	Windows(const std::string &text, int width, int height);
 	void add(gcn::Widget *widget, int x, int y);
 private:
-	virtual void mouseMotion(int x, int y);
+	virtual void mouseDragged (gcn::MouseEvent &mouseEvent);
 	virtual void setBackgroundColor(const gcn::Color &color);
 	virtual void setBaseColor(const gcn::Color &color);
 private:
diff -up boswars-2.4.1-src/engine/include/font.h.hdg boswars-2.4.1-src/engine/include/font.h
--- boswars-2.4.1-src/engine/include/font.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/font.h	2007-09-07 19:32:04.000000000 +0200
@@ -58,7 +58,7 @@
 ----------------------------------------------------------------------------*/
 
 #include "video.h"
-#include "guichan/font.h"
+#include "guichan/font.hpp"
 
 /*----------------------------------------------------------------------------
 --  Declarations
diff -up boswars-2.4.1-src/engine/include/video.h.hdg boswars-2.4.1-src/engine/include/video.h
--- boswars-2.4.1-src/engine/include/video.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/video.h	2007-09-07 19:32:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include "SDL.h"
 #include "SDL_opengl.h"
-#include "guichan/image.h"
+#include "guichan/image.hpp"
 
 class CFont;
 
diff -up boswars-2.4.1-src/engine/editor/editloop.cpp.hdg boswars-2.4.1-src/engine/editor/editloop.cpp
--- boswars-2.4.1-src/engine/editor/editloop.cpp.hdg	2007-07-03 23:57:45.000000000 +0200
+++ boswars-2.4.1-src/engine/editor/editloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -56,7 +56,7 @@
 #include "iolib.h"
 #include "iocompat.h"
 #include "commands.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 #include "script.h"
 
@@ -109,7 +109,7 @@ static int CalculateUnitIcons(void);
 class EditorSliderListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int iconsPerStep = CalculateUnitIcons();
 		int steps = (Editor.ShownUnitTypes.size() + iconsPerStep - 1) / iconsPerStep;
 		double value = editorSlider->getValue();
@@ -464,7 +464,7 @@ static void CleanEditResource()
 class CEditResourceOKActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int amount = atoi(editResourceTextField->getText().c_str());
 		for (int i = 0; i < MaxCosts; ++i) {
 			UnitUnderCursor->ResourcesHeld[i] = amount * CYCLES_PER_SECOND;
@@ -477,7 +477,7 @@ static CEditResourceOKActionListener Edi
 class CEditResourceCancelActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		editResourceMenu->stop();
 	}
 };
@@ -514,7 +514,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceTextField, 40, 46);
 
 	editResourceOKButton = new gcn::Button(_("~!OK"));
-	editResourceOKButton->setHotKey("o");
 	editResourceOKButton->setSize(106, 28);
 	editResourceOKButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceOKButton->setBaseColor(gcn::Color(38, 38, 78, 130));
@@ -522,7 +521,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceOKButton, 24, 88);
 
 	editResourceCancelButton = new gcn::Button(_("~!Cancel"));
-	editResourceCancelButton->setHotKey("c");
 	editResourceCancelButton->setSize(106, 28);
 	editResourceCancelButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceCancelButton->setBaseColor(gcn::Color(38, 38, 78, 130));
diff -up boswars-2.4.1-src/engine/ui/widgets.cpp.hdg boswars-2.4.1-src/engine/ui/widgets.cpp
--- boswars-2.4.1-src/engine/ui/widgets.cpp.hdg	2007-09-02 21:44:42.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/widgets.cpp	2007-09-07 22:32:09.000000000 +0200
@@ -361,7 +361,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		img = disabledImage ? disabledImage : normalImage;
 	} else if (isPressed()) {
 		img = pressedImage ? pressedImage : normalImage;
-	} else if (0 && hasMouse()) {
+	} else if (0 && mHasMouse) {
 		// FIXME: add mouse-over image
 		img = NULL;
 	} else {
@@ -396,7 +396,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		graphics->drawText(getCaption(), textX + 2, textY + 2, getAlignment());
 	}
     
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
 	}
 }
@@ -491,7 +491,7 @@ void ImageRadioButton::draw(gcn::Graphic
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -499,9 +499,9 @@ void ImageRadioButton::draw(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageRadioButton::mousePress(int x, int y, int button)
+void ImageRadioButton::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -509,9 +509,9 @@ void ImageRadioButton::mousePress(int x,
 /**
 **  Mouse button released callback
 */
-void ImageRadioButton::mouseRelease(int x, int y, int button)
+void ImageRadioButton::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -519,9 +519,9 @@ void ImageRadioButton::mouseRelease(int 
 /**
 **  Mouse clicked callback
 */
-void ImageRadioButton::mouseClick(int x, int y, int button, int count)
+void ImageRadioButton::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
         setMarked(true);
         generateAction();
 	}
@@ -598,7 +598,7 @@ void ImageCheckBox::draw(gcn::Graphics *
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -635,9 +635,9 @@ void ImageCheckBox::drawBox(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageCheckBox::mousePress(int x, int y, int button)
+void ImageCheckBox::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -645,9 +645,9 @@ void ImageCheckBox::mousePress(int x, in
 /**
 **  Mouse button released callback
 */
-void ImageCheckBox::mouseRelease(int x, int y, int button)
+void ImageCheckBox::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -655,9 +655,9 @@ void ImageCheckBox::mouseRelease(int x, 
 /**
 **  Mouse clicked callback
 */
-void ImageCheckBox::mouseClick(int x, int y, int button, int count)
+void ImageCheckBox::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		toggle();
 	}
 }
@@ -1109,7 +1109,7 @@ Windows::Windows(const std::string &titl
 {
 	container.setDimension(gcn::Rectangle(0, 0, width, height));
 	scroll.setDimension(gcn::Rectangle(0, 0, width, height));
-	this->setContent(&scroll);
+	this->add((gcn::Widget *)&scroll, 0, 0);
 	scroll.setContent(&container);
 	this->resizeToContent();
 }
@@ -1146,9 +1146,9 @@ void Windows::add(gcn::Widget *widget, i
 **    when the container is a "scrollable" ScrollArea with the cursor.
 **    The cursor can go outside the visual area.
 */
-void Windows::mouseMotion(int x, int y)
+void Windows::mouseDragged (gcn::MouseEvent &mouseEvent)
 {
-	gcn::BasicContainer *bcontainer = getParent();
+	gcn::Widget *bcontainer = getParent();
 	int diffx;
 	int diffy;
 	int criticalx;
@@ -1156,18 +1156,18 @@ void Windows::mouseMotion(int x, int y)
 	int absx;
 	int absy;
 
-	if (!mMouseDrag || !isMovable()) {
+	if (!isMovable()) {
 		return;
 	}
 
-	diffx = x - mMouseXOffset;
-	diffy = y - mMouseYOffset;
+	diffx = mouseEvent.getX() - mDragOffsetX;
+	diffy = mouseEvent.getY() - mDragOffsetY;
 	if (blockwholewindow) {
 		criticalx = getX();
 		criticaly = getY();
 	} else {
-		criticalx = getX() + mMouseXOffset;
-		criticaly = getY() + mMouseYOffset;
+		criticalx = getX() + mDragOffsetX;
+		criticaly = getY() + mDragOffsetY;
 	}
 
 
@@ -1190,15 +1190,13 @@ void Windows::mouseMotion(int x, int y)
 	}
 
 	// Place the window.
-	x = getX() + diffx;
-	y = getY() + diffy;
-	setPosition(x, y);
+	setPosition(getX() + diffx, getY() + diffy);
 
 	// Move the cursor.
 	// Usefull only when window reachs the limit.
 	getAbsolutePosition(absx, absy);
-	CursorX = absx + mMouseXOffset;
-	CursorY = absy + mMouseYOffset;
+	CursorX = absx + mDragOffsetX;
+	CursorY = absy + mDragOffsetY;
 }
 
 /**
@@ -1377,7 +1375,7 @@ void DropDownWidget::setList(lua_State *
 void DropDownWidget::setSize(int width, int height)
 {
 	DropDown::setSize(width, height);
-	this->getListBox()->setSize(width, height);
+	this->mListBox->setSize(width, height);
 }
 
 /*----------------------------------------------------------------------------
@@ -1571,7 +1569,7 @@ void MenuScreen::draw(gcn::Graphics *gra
 		Gui->getGraphics()->popClipArea();
 		Gui->draw();
 		Gui->setTop(w);
-		w->_getFocusHandler()->setFocus(f);
+		f->requestFocus();
 		Gui->getGraphics()->pushClipArea(r);
 	}
 	gcn::Container::draw(graphics);
diff -up boswars-2.4.1-src/engine/ui/interface.cpp.hdg boswars-2.4.1-src/engine/ui/interface.cpp
--- boswars-2.4.1-src/engine/ui/interface.cpp.hdg	2007-07-03 23:57:47.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/interface.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -836,8 +836,6 @@ static int InputKey(int key)
 
 		default:
 			if (key >= ' ') {
-				gcn::Key k(key);
-				std::string kstr = k.toString();
 				if (key == '~') {
 					if (InputIndex < (int)sizeof(Input) - 2) {
 						Input[InputIndex++] = key;
@@ -845,10 +843,8 @@ static int InputKey(int key)
 						Input[InputIndex] = '\0';
 						ShowInput();
 					}
-				} else if (InputIndex < (int)(sizeof(Input) - kstr.size())) {
-					for (size_t i = 0; i < kstr.size(); ++i) {
-						Input[InputIndex++] = kstr[i];
-					}
+				} else if (InputIndex < (int)sizeof(Input) - 1) {
+					Input[InputIndex++] = key;
 					Input[InputIndex] = '\0';
 					ShowInput();
 				}
diff -up boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg boswars-2.4.1-src/engine/stratagus/mainloop.cpp
--- boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg	2007-07-03 23:57:48.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/mainloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -68,7 +68,7 @@
 #include "editor.h"
 #include "sound.h"
 
-#include <guichan.h>
+#include <guichan.hpp>
 void DrawGuichanWidgets();
 
 //----------------------------------------------------------------------------
diff -up boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg boswars-2.4.1-src/engine/stratagus/stratagus.cpp
--- boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg	2007-09-02 21:44:43.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/stratagus.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -205,7 +205,7 @@ extern int getopt(int argc, char *const 
 #include "widgets.h"
 #include "iolib.h"
 #include "util.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 extern void CreateUserDirectories(void);
 
diff -up boswars-2.4.1-src/engine/include/widgets.h~ boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h~	2007-09-09 09:44:18.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-09 09:44:18.000000000 +0200
@@ -28,8 +28,8 @@
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
 
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 typedef int lua_Object; // from tolua++.h
 


--- NEW FILE boswars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bos Wars
Comment=Bos Wars is a futuristic real-time strategy game
Exec=boswars -d /usr/share/boswars
Icon=boswars.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE boswars.spec ---
Name:           boswars
Version:        2.4.1
Release:        2%{?dist}
Summary:        Bos Wars is a futuristic real-time strategy game
Group:          Amusements/Games
License:        GPLv2
URL:            http://www.boswars.org/
Source0:        http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz
Source1:        %{name}.desktop
Patch0:         boswars-2.4.1-SConstruct.patch
# incomplete patch to port boswars to the sysytem guichan-0.6 instead of
# using the included guichan-0.4. Incomplete, NOT finished and NOT working!
Patch1:         boswars-2.4.1-guichan26.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel
BuildRequires:  tolua++-devel libpng-devel scons desktop-file-utils

%description
Bos Wars is a futuristic real-time strategy game. It is possible to play
against human opponents over LAN, internet, or against the computer.
Bos Wars aims to create a completly original and fun open source RTS game.


%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \
  engine/include/animation.h engine/guichan/sdl/gsdl.cpp
# we want to use the system version of these
rm engine/tolua/*.h engine/tolua/tolua_*.cpp


%build
scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS"


%install
rm -fr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 languages/*.po languages/*.pot \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
cp -a campaigns graphics maps scripts sounds units video \
  $RPM_BUILD_ROOT%{_datadir}/%{name}


# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 graphics/elites/ui/elites_claw.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boswars/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:48:56 -0000	1.1
+++ .cvsignore	11 Sep 2007 07:22:03 -0000	1.2
@@ -0,0 +1 @@
+boswars-2.4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boswars/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:48:56 -0000	1.1
+++ sources	11 Sep 2007 07:22:03 -0000	1.2
@@ -0,0 +1 @@
+ad4fe087da5697e920c746c75c20b07f  boswars-2.4.1-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 07:25:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:25:54 -0400
Subject: rpms/ksirk/devel ksirk.spec,1.1,1.2
Message-ID: <200709110725.l8B7PsbW011389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11351

Modified Files:
	ksirk.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
- Release increment for rebuild due to koji weirdness



Index: ksirk.spec
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/ksirk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksirk.spec	10 Sep 2007 07:46:19 -0000	1.1
+++ ksirk.spec	11 Sep 2007 07:25:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ksirk
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turnbased multiplayer board strategy game (conquer the world!)
 Group:          Amusements/Games
 License:        GPLv2
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
+- Release increment for rebuild due to koji weirdness
+
 * Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
 - Add missing gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 07:26:30 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:26:30 -0400
Subject: rpms/boswars/F-7 boswars-2.4.1-SConstruct.patch, NONE,
	1.1 boswars-2.4.1-guichan26.patch, NONE, 1.1 boswars.desktop,
	NONE, 1.1 boswars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709110726.l8B7QU1K011473@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/boswars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11396

Modified Files:
	.cvsignore sources 
Added Files:
	boswars-2.4.1-SConstruct.patch boswars-2.4.1-guichan26.patch 
	boswars.desktop boswars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel


boswars-2.4.1-SConstruct.patch:

--- NEW FILE boswars-2.4.1-SConstruct.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -279,7 +278,8 @@ AutoConfigureIfNeeded(env, '')
 
 # define the different build environments (variants)
 release = env.Copy()
-release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer -fexpensive-optimizations -ffast-math'))
+release.Append(CCFLAGS = Split('-ffast-math'))
+release.Append(LIBS = '-ltolua++')
 
 if mingw['extrapath']:
   mingw.Tool('crossmingw', toolpath = ['tools/scons/'])

boswars-2.4.1-guichan26.patch:

--- NEW FILE boswars-2.4.1-guichan26.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -75,7 +75,6 @@ def globSources(sourceDirs, builddir):
 
 def buildSourcesList(builddir):
    sources = globSources("action ai editor game map network pathfinder sound stratagus ui unit video tolua", builddir)
-   sources.append(globSources("guichan guichan/sdl guichan/widgets", builddir))
    return sources
 sourcesEngine = buildSourcesList('build')
 
@@ -274,7 +273,6 @@ AutoConfigureIfNeeded(env, '')
 def addBosWarsPaths(env):
    # Stratagus build specifics
    env.Append(CPPPATH=engineSourceDir+'/include')
-   env.Append(CPPPATH=engineSourceDir+'/guichan/include')
 addBosWarsPaths(env)
 
 # define the different build environments (variants)
diff -up boswars-2.4.1-src/engine/include/widgets.h.hdg boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h.hdg	2007-09-07 19:32:04.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-07 20:35:09.000000000 +0200
@@ -111,9 +111,9 @@ public:
 	virtual void drawBox(gcn::Graphics *graphics);
 	virtual void draw(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -137,9 +137,9 @@ public:
 	virtual void draw(gcn::Graphics *graphics);
 	virtual void drawBox(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -229,7 +229,7 @@ public:
 	Windows(const std::string &text, int width, int height);
 	void add(gcn::Widget *widget, int x, int y);
 private:
-	virtual void mouseMotion(int x, int y);
+	virtual void mouseDragged (gcn::MouseEvent &mouseEvent);
 	virtual void setBackgroundColor(const gcn::Color &color);
 	virtual void setBaseColor(const gcn::Color &color);
 private:
diff -up boswars-2.4.1-src/engine/include/font.h.hdg boswars-2.4.1-src/engine/include/font.h
--- boswars-2.4.1-src/engine/include/font.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/font.h	2007-09-07 19:32:04.000000000 +0200
@@ -58,7 +58,7 @@
 ----------------------------------------------------------------------------*/
 
 #include "video.h"
-#include "guichan/font.h"
+#include "guichan/font.hpp"
 
 /*----------------------------------------------------------------------------
 --  Declarations
diff -up boswars-2.4.1-src/engine/include/video.h.hdg boswars-2.4.1-src/engine/include/video.h
--- boswars-2.4.1-src/engine/include/video.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/video.h	2007-09-07 19:32:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include "SDL.h"
 #include "SDL_opengl.h"
-#include "guichan/image.h"
+#include "guichan/image.hpp"
 
 class CFont;
 
diff -up boswars-2.4.1-src/engine/editor/editloop.cpp.hdg boswars-2.4.1-src/engine/editor/editloop.cpp
--- boswars-2.4.1-src/engine/editor/editloop.cpp.hdg	2007-07-03 23:57:45.000000000 +0200
+++ boswars-2.4.1-src/engine/editor/editloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -56,7 +56,7 @@
 #include "iolib.h"
 #include "iocompat.h"
 #include "commands.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 #include "script.h"
 
@@ -109,7 +109,7 @@ static int CalculateUnitIcons(void);
 class EditorSliderListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int iconsPerStep = CalculateUnitIcons();
 		int steps = (Editor.ShownUnitTypes.size() + iconsPerStep - 1) / iconsPerStep;
 		double value = editorSlider->getValue();
@@ -464,7 +464,7 @@ static void CleanEditResource()
 class CEditResourceOKActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int amount = atoi(editResourceTextField->getText().c_str());
 		for (int i = 0; i < MaxCosts; ++i) {
 			UnitUnderCursor->ResourcesHeld[i] = amount * CYCLES_PER_SECOND;
@@ -477,7 +477,7 @@ static CEditResourceOKActionListener Edi
 class CEditResourceCancelActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		editResourceMenu->stop();
 	}
 };
@@ -514,7 +514,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceTextField, 40, 46);
 
 	editResourceOKButton = new gcn::Button(_("~!OK"));
-	editResourceOKButton->setHotKey("o");
 	editResourceOKButton->setSize(106, 28);
 	editResourceOKButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceOKButton->setBaseColor(gcn::Color(38, 38, 78, 130));
@@ -522,7 +521,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceOKButton, 24, 88);
 
 	editResourceCancelButton = new gcn::Button(_("~!Cancel"));
-	editResourceCancelButton->setHotKey("c");
 	editResourceCancelButton->setSize(106, 28);
 	editResourceCancelButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceCancelButton->setBaseColor(gcn::Color(38, 38, 78, 130));
diff -up boswars-2.4.1-src/engine/ui/widgets.cpp.hdg boswars-2.4.1-src/engine/ui/widgets.cpp
--- boswars-2.4.1-src/engine/ui/widgets.cpp.hdg	2007-09-02 21:44:42.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/widgets.cpp	2007-09-07 22:32:09.000000000 +0200
@@ -361,7 +361,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		img = disabledImage ? disabledImage : normalImage;
 	} else if (isPressed()) {
 		img = pressedImage ? pressedImage : normalImage;
-	} else if (0 && hasMouse()) {
+	} else if (0 && mHasMouse) {
 		// FIXME: add mouse-over image
 		img = NULL;
 	} else {
@@ -396,7 +396,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		graphics->drawText(getCaption(), textX + 2, textY + 2, getAlignment());
 	}
     
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
 	}
 }
@@ -491,7 +491,7 @@ void ImageRadioButton::draw(gcn::Graphic
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -499,9 +499,9 @@ void ImageRadioButton::draw(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageRadioButton::mousePress(int x, int y, int button)
+void ImageRadioButton::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -509,9 +509,9 @@ void ImageRadioButton::mousePress(int x,
 /**
 **  Mouse button released callback
 */
-void ImageRadioButton::mouseRelease(int x, int y, int button)
+void ImageRadioButton::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -519,9 +519,9 @@ void ImageRadioButton::mouseRelease(int 
 /**
 **  Mouse clicked callback
 */
-void ImageRadioButton::mouseClick(int x, int y, int button, int count)
+void ImageRadioButton::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
         setMarked(true);
         generateAction();
 	}
@@ -598,7 +598,7 @@ void ImageCheckBox::draw(gcn::Graphics *
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -635,9 +635,9 @@ void ImageCheckBox::drawBox(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageCheckBox::mousePress(int x, int y, int button)
+void ImageCheckBox::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -645,9 +645,9 @@ void ImageCheckBox::mousePress(int x, in
 /**
 **  Mouse button released callback
 */
-void ImageCheckBox::mouseRelease(int x, int y, int button)
+void ImageCheckBox::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -655,9 +655,9 @@ void ImageCheckBox::mouseRelease(int x, 
 /**
 **  Mouse clicked callback
 */
-void ImageCheckBox::mouseClick(int x, int y, int button, int count)
+void ImageCheckBox::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		toggle();
 	}
 }
@@ -1109,7 +1109,7 @@ Windows::Windows(const std::string &titl
 {
 	container.setDimension(gcn::Rectangle(0, 0, width, height));
 	scroll.setDimension(gcn::Rectangle(0, 0, width, height));
-	this->setContent(&scroll);
+	this->add((gcn::Widget *)&scroll, 0, 0);
 	scroll.setContent(&container);
 	this->resizeToContent();
 }
@@ -1146,9 +1146,9 @@ void Windows::add(gcn::Widget *widget, i
 **    when the container is a "scrollable" ScrollArea with the cursor.
 **    The cursor can go outside the visual area.
 */
-void Windows::mouseMotion(int x, int y)
+void Windows::mouseDragged (gcn::MouseEvent &mouseEvent)
 {
-	gcn::BasicContainer *bcontainer = getParent();
+	gcn::Widget *bcontainer = getParent();
 	int diffx;
 	int diffy;
 	int criticalx;
@@ -1156,18 +1156,18 @@ void Windows::mouseMotion(int x, int y)
 	int absx;
 	int absy;
 
-	if (!mMouseDrag || !isMovable()) {
+	if (!isMovable()) {
 		return;
 	}
 
-	diffx = x - mMouseXOffset;
-	diffy = y - mMouseYOffset;
+	diffx = mouseEvent.getX() - mDragOffsetX;
+	diffy = mouseEvent.getY() - mDragOffsetY;
 	if (blockwholewindow) {
 		criticalx = getX();
 		criticaly = getY();
 	} else {
-		criticalx = getX() + mMouseXOffset;
-		criticaly = getY() + mMouseYOffset;
+		criticalx = getX() + mDragOffsetX;
+		criticaly = getY() + mDragOffsetY;
 	}
 
 
@@ -1190,15 +1190,13 @@ void Windows::mouseMotion(int x, int y)
 	}
 
 	// Place the window.
-	x = getX() + diffx;
-	y = getY() + diffy;
-	setPosition(x, y);
+	setPosition(getX() + diffx, getY() + diffy);
 
 	// Move the cursor.
 	// Usefull only when window reachs the limit.
 	getAbsolutePosition(absx, absy);
-	CursorX = absx + mMouseXOffset;
-	CursorY = absy + mMouseYOffset;
+	CursorX = absx + mDragOffsetX;
+	CursorY = absy + mDragOffsetY;
 }
 
 /**
@@ -1377,7 +1375,7 @@ void DropDownWidget::setList(lua_State *
 void DropDownWidget::setSize(int width, int height)
 {
 	DropDown::setSize(width, height);
-	this->getListBox()->setSize(width, height);
+	this->mListBox->setSize(width, height);
 }
 
 /*----------------------------------------------------------------------------
@@ -1571,7 +1569,7 @@ void MenuScreen::draw(gcn::Graphics *gra
 		Gui->getGraphics()->popClipArea();
 		Gui->draw();
 		Gui->setTop(w);
-		w->_getFocusHandler()->setFocus(f);
+		f->requestFocus();
 		Gui->getGraphics()->pushClipArea(r);
 	}
 	gcn::Container::draw(graphics);
diff -up boswars-2.4.1-src/engine/ui/interface.cpp.hdg boswars-2.4.1-src/engine/ui/interface.cpp
--- boswars-2.4.1-src/engine/ui/interface.cpp.hdg	2007-07-03 23:57:47.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/interface.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -836,8 +836,6 @@ static int InputKey(int key)
 
 		default:
 			if (key >= ' ') {
-				gcn::Key k(key);
-				std::string kstr = k.toString();
 				if (key == '~') {
 					if (InputIndex < (int)sizeof(Input) - 2) {
 						Input[InputIndex++] = key;
@@ -845,10 +843,8 @@ static int InputKey(int key)
 						Input[InputIndex] = '\0';
 						ShowInput();
 					}
-				} else if (InputIndex < (int)(sizeof(Input) - kstr.size())) {
-					for (size_t i = 0; i < kstr.size(); ++i) {
-						Input[InputIndex++] = kstr[i];
-					}
+				} else if (InputIndex < (int)sizeof(Input) - 1) {
+					Input[InputIndex++] = key;
 					Input[InputIndex] = '\0';
 					ShowInput();
 				}
diff -up boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg boswars-2.4.1-src/engine/stratagus/mainloop.cpp
--- boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg	2007-07-03 23:57:48.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/mainloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -68,7 +68,7 @@
 #include "editor.h"
 #include "sound.h"
 
-#include <guichan.h>
+#include <guichan.hpp>
 void DrawGuichanWidgets();
 
 //----------------------------------------------------------------------------
diff -up boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg boswars-2.4.1-src/engine/stratagus/stratagus.cpp
--- boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg	2007-09-02 21:44:43.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/stratagus.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -205,7 +205,7 @@ extern int getopt(int argc, char *const 
 #include "widgets.h"
 #include "iolib.h"
 #include "util.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 extern void CreateUserDirectories(void);
 
diff -up boswars-2.4.1-src/engine/include/widgets.h~ boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h~	2007-09-09 09:44:18.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-09 09:44:18.000000000 +0200
@@ -28,8 +28,8 @@
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
 
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 typedef int lua_Object; // from tolua++.h
 


--- NEW FILE boswars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bos Wars
Comment=Bos Wars is a futuristic real-time strategy game
Exec=boswars -d /usr/share/boswars
Icon=boswars.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE boswars.spec ---
Name:           boswars
Version:        2.4.1
Release:        2%{?dist}
Summary:        Bos Wars is a futuristic real-time strategy game
Group:          Amusements/Games
License:        GPLv2
URL:            http://www.boswars.org/
Source0:        http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz
Source1:        %{name}.desktop
Patch0:         boswars-2.4.1-SConstruct.patch
# incomplete patch to port boswars to the sysytem guichan-0.6 instead of
# using the included guichan-0.4. Incomplete, NOT finished and NOT working!
Patch1:         boswars-2.4.1-guichan26.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel
BuildRequires:  tolua++-devel libpng-devel scons desktop-file-utils

%description
Bos Wars is a futuristic real-time strategy game. It is possible to play
against human opponents over LAN, internet, or against the computer.
Bos Wars aims to create a completly original and fun open source RTS game.


%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \
  engine/include/animation.h engine/guichan/sdl/gsdl.cpp
# we want to use the system version of these
rm engine/tolua/*.h engine/tolua/tolua_*.cpp


%build
scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS"


%install
rm -fr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 languages/*.po languages/*.pot \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
cp -a campaigns graphics maps scripts sounds units video \
  $RPM_BUILD_ROOT%{_datadir}/%{name}


# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 graphics/elites/ui/elites_claw.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:48:56 -0000	1.1
+++ .cvsignore	11 Sep 2007 07:25:58 -0000	1.2
@@ -0,0 +1 @@
+boswars-2.4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:48:56 -0000	1.1
+++ sources	11 Sep 2007 07:25:58 -0000	1.2
@@ -0,0 +1 @@
+ad4fe087da5697e920c746c75c20b07f  boswars-2.4.1-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 07:27:37 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 11 Sep 2007 03:27:37 -0400
Subject: rpms/rpm/devel .cvsignore, 1.20, 1.21 rpm.spec, 1.258, 1.259 sources,
	1.126, 1.127 rpm-4.4.2.1-debuginfo-names.patch, 1.3, NONE
Message-ID: <200709110727.l8B7Rb3n011574@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11533

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.4.2.1-debuginfo-names.patch 
Log Message:
- 4.4.2.2-rc2
- resolves #180996, #281611, #259961, #277161, #155079
- drop debugedit-names patch now that it's really upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Aug 2007 10:14:29 -0000	1.20
+++ .cvsignore	11 Sep 2007 07:27:05 -0000	1.21
@@ -1 +1 @@
-rpm-4.4.2.2-rc1.tar.gz
+rpm-4.4.2.2-rc2.tar.gz


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- rpm.spec	5 Sep 2007 11:22:24 -0000	1.258
+++ rpm.spec	11 Sep 2007 07:27:05 -0000	1.259
@@ -6,10 +6,10 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.4.rc1
+Release: 0.5.rc2
 Group: System Environment/Base
 Url: http://www.rpm.org/
-Source: %{name}-%{version}-rc1.tar.gz
+Source: %{name}-%{version}-rc2.tar.gz
 Patch1: rpm-4.4.1-prereq.patch
 Patch2: rpm-4.4.2-ghost-conflicts.patch
 Patch3: rpm-4.4.2-trust.patch
@@ -17,7 +17,6 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
-Patch8: rpm-4.4.2.1-debuginfo-names.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -132,7 +131,7 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 %patch1 -p1 -b .prereq
 %patch2 -p1 -b .ghostconflicts
 %patch3 -p1 -b .trust
@@ -140,7 +139,6 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
-%patch8 -p1 -b .debugedit-names
 
 # force external popt
 rm -rf popt/
@@ -403,6 +401,11 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.5.rc2
+- 4.4.2.2-rc2
+- resolves #180996, #281611, #259961, #277161, #155079
+- drop debugedit-names patch now that it's really upstream
+
 * Wed Sep 05 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.4.rc1
 - remove duplicated libraries from rpm-devel (#278151)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	28 Aug 2007 10:14:29 -0000	1.126
+++ sources	11 Sep 2007 07:27:05 -0000	1.127
@@ -1 +1 @@
-d315aa039298d49274898a45a97a68d7  rpm-4.4.2.2-rc1.tar.gz
+75c0be2051be684e5f0b1517c4269aa3  rpm-4.4.2.2-rc2.tar.gz


--- rpm-4.4.2.1-debuginfo-names.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 08:01:54 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 04:01:54 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.78,1.79
Message-ID: <200709110801.l8B81sqc018694@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753

Modified Files:
	pm-utils.spec 
Log Message:
Do not require vbetool on ppc anc ppc64



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- pm-utils.spec	10 Sep 2007 21:20:45 -0000	1.78
+++ pm-utils.spec	11 Sep 2007 08:01:08 -0000	1.79
@@ -2,13 +2,15 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
 Requires: radeontool
+%ifnarch ppc ppc64
 Requires: vbetool
+%endif
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -110,6 +112,9 @@
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
+* Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
+- Require vbetool not on ppc and ppc64
+
 * Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
 - Merge new upstream
 - remove pm/power.d/laptop-tools



From fedora-extras-commits at redhat.com  Tue Sep 11 08:23:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:23:27 -0700
Subject: [pkgdb] basesystem: karsten has requested commit
Message-ID: <200709110823.l8B8NSkG018858@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on basesystem (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:23:55 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:23:55 -0700
Subject: [pkgdb] filesystem: karsten has requested commit
Message-ID: <200709110823.l8B8NuYm018867@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on filesystem (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:13 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:13 -0700
Subject: [pkgdb] openhpi: karsten has requested commit
Message-ID: <200709110824.l8B8OFdr024947@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on openhpi (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:22 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:22 -0700
Subject: [pkgdb] OpenIPMI: karsten has requested commit
Message-ID: <200709110824.l8B8ONj9018881@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on OpenIPMI (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:37 -0700
Subject: [pkgdb] rootfiles: karsten has requested commit
Message-ID: <200709110824.l8B8OcWT024966@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on rootfiles (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:43 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:43 -0700
Subject: [pkgdb] setup: karsten has requested commit
Message-ID: <200709110824.l8B8OhgZ024976@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on setup (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:47 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:47 -0700
Subject: [pkgdb] sg3_utils: karsten has requested commit
Message-ID: <200709110824.l8B8OmxW018891@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sg3_utils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:54 -0700
Subject: [pkgdb] system-config-httpd: karsten has requested commit
Message-ID: <200709110824.l8B8OtwL018900@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on system-config-httpd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-httpd



From fedora-extras-commits at redhat.com  Tue Sep 11 08:25:06 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:25:06 -0700
Subject: [pkgdb] vconfig: karsten has requested commit
Message-ID: <200709110825.l8B8P7Zx018909@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on vconfig (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:27:38 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:27:38 -0700
Subject: [pkgdb] ctags: karsten has requested commit
Message-ID: <200709110827.l8B8Rc9h018934@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on ctags (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:05 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:05 -0700
Subject: [pkgdb] doxygen: karsten has requested commit
Message-ID: <200709110828.l8B8S6jT024997@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on doxygen (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:12 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:12 -0700
Subject: [pkgdb] efax: karsten has requested commit
Message-ID: <200709110828.l8B8SC2v025006@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on efax (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:16 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:16 -0700
Subject: [pkgdb] eject: karsten has requested commit
Message-ID: <200709110828.l8B8SHS5018944@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on eject (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:22 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:22 -0700
Subject: [pkgdb] fonts-KOI8-R: karsten has requested commit
Message-ID: <200709110828.l8B8SM1F018953@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on fonts-KOI8-R (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fonts-KOI8-R



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:27 -0700
Subject: [pkgdb] isdn4k-utils: karsten has requested commit
Message-ID: <200709110828.l8B8SSI5018968@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on isdn4k-utils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:33 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:33 -0700
Subject: [pkgdb] joystick: karsten has requested commit
Message-ID: <200709110828.l8B8SXqR018977@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on joystick (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:37 -0700
Subject: [pkgdb] kdbg: karsten has requested commit
Message-ID: <200709110828.l8B8ScLA018986@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on kdbg (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:15 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:15 -0700
Subject: [pkgdb] lrzsz: karsten has requested commit
Message-ID: <200709110829.l8B8TGbT019002@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on lrzsz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:20 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:20 -0700
Subject: [pkgdb] mktemp: karsten has requested commit
Message-ID: <200709110829.l8B8TKAT019011@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on mktemp (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:23 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:23 -0700
Subject: [pkgdb] mktemp: karsten has requested watchbugzilla
Message-ID: <200709110829.l8B8TNxA025022@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on mktemp (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:31 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:31 -0700
Subject: [pkgdb] mozplugger: karsten has requested commit
Message-ID: <200709110829.l8B8TVio025032@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on mozplugger (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:36 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:36 -0700
Subject: [pkgdb] pcre: karsten has requested commit
Message-ID: <200709110829.l8B8TbeU025047@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on pcre (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:49 -0700
Subject: [pkgdb] rp-pppoe: karsten has requested commit
Message-ID: <200709110829.l8B8TnlR025061@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on rp-pppoe (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:53 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:53 -0700
Subject: [pkgdb] sharutils: karsten has requested commit
Message-ID: <200709110829.l8B8TrfM019020@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sharutils (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:59 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:59 -0700
Subject: [pkgdb] switchdesk: karsten has requested watchbugzilla
Message-ID: <200709110829.l8B8TxS4025070@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on switchdesk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:00 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:00 -0700
Subject: [pkgdb] switchdesk: karsten has requested commit
Message-ID: <200709110830.l8B8U0l4025079@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on switchdesk (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:07 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:07 -0700
Subject: [pkgdb] sysreport: karsten has requested commit
Message-ID: <200709110830.l8B8U7aa025095@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sysreport (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:08 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:08 -0700
Subject: [pkgdb] sysreport: karsten has requested watchbugzilla
Message-ID: <200709110830.l8B8U86W025104@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on sysreport (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:13 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:13 -0700
Subject: [pkgdb] system-switch-mail: karsten has requested commit
Message-ID: <200709110830.l8B8UEUF019032@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on system-switch-mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-mail



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:18 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:18 -0700
Subject: [pkgdb] transfig: karsten has requested commit
Message-ID: <200709110830.l8B8UIq2019042@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on transfig (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:24 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:24 -0700
Subject: [pkgdb] tvtime: karsten has requested commit
Message-ID: <200709110830.l8B8UOEc025114@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on tvtime (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:34 -0700
Subject: [pkgdb] urw-fonts: karsten has requested commit
Message-ID: <200709110830.l8B8UYHX019051@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on urw-fonts (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:43 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:43 -0700
Subject: [pkgdb] which: karsten has requested commit
Message-ID: <200709110830.l8B8Uhx4019060@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on which (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:48 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:48 -0700
Subject: [pkgdb] wordtrans: karsten has requested commit
Message-ID: <200709110830.l8B8UmZd019070@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on wordtrans (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:54 -0700
Subject: [pkgdb] Xaw3d: karsten has requested commit
Message-ID: <200709110830.l8B8UsWp019079@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on Xaw3d (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:59 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:59 -0700
Subject: [pkgdb] xferstats: karsten has requested commit
Message-ID: <200709110830.l8B8UxpI025124@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on xferstats (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:31:02 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:31:02 -0700
Subject: [pkgdb] xfig: karsten has requested commit
Message-ID: <200709110831.l8B8V3TL019088@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on xfig (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 08:48:32 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 11 Sep 2007 04:48:32 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.30,1.31
Message-ID: <200709110848.l8B8mWBp021114@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21032

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.4-45.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sysprof-kmod.spec	21 Aug 2007 07:32:58 -0000	1.30
+++ sysprof-kmod.spec	11 Sep 2007 08:47:59 -0000	1.31
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.2-42.fc6}
+%{!?kversion: %define kversion 2.6.22.4-45.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 08:58:43 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 11 Sep 2007 04:58:43 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.33, 1.34 hwbrowser.spec, 1.45,
	1.46 sources, 1.39, 1.40
Message-ID: <200709110858.l8B8whA7021548@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21509

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
make "hwbrowser" executable (#285171)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	10 Sep 2007 16:03:54 -0000	1.33
+++ .cvsignore	11 Sep 2007 08:58:11 -0000	1.34
@@ -1 +1 @@
-hwbrowser-0.35.tar.bz2
+hwbrowser-0.36.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- hwbrowser.spec	10 Sep 2007 16:03:54 -0000	1.45
+++ hwbrowser.spec	11 Sep 2007 08:58:11 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.35
+Version: 0.36
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -52,6 +52,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
+- make "hwbrowser" executable (#285171)
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 Sep 2007 16:03:54 -0000	1.39
+++ sources	11 Sep 2007 08:58:11 -0000	1.40
@@ -1 +1 @@
-476b50bdb95ebf3addc7484199d6e517  hwbrowser-0.35.tar.bz2
+8a139843dae96f83ee27595ad7fa5d20  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 09:10:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 05:10:38 -0400
Subject: rpms/vixie-cron/F-7 vixie-cron-4.1-pam_crontab.patch, 1.1,
	1.2 vixie-cron.spec, 1.99, 1.100
Message-ID: <200709110910.l8B9AcXW027787@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27750

Modified Files:
	vixie-cron-4.1-pam_crontab.patch vixie-cron.spec 
Log Message:
Change patch - add correct setting of home dir for selinux rhbz#241877.


vixie-cron-4.1-pam_crontab.patch:

Index: vixie-cron-4.1-pam_crontab.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/F-7/vixie-cron-4.1-pam_crontab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-pam_crontab.patch	30 Jul 2007 15:13:24 -0000	1.1
+++ vixie-cron-4.1-pam_crontab.patch	11 Sep 2007 09:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/cron.h.old	2007-07-30 16:34:07.000000000 +0200
-+++ vixie-cron-4.1/cron.h	2007-07-26 15:14:19.000000000 +0200
+--- vixie-cron-4.1/cron.h.pamcrontab	2007-09-11 10:22:20.000000000 +0200
++++ vixie-cron-4.1/cron.h	2007-09-11 10:22:21.000000000 +0200
 @@ -47,3 +47,20 @@
  #include "funcs.h"
  #include "globals.h"
@@ -21,37 +21,8 @@
 +        return(retcode);    }
 +#endif
 +
---- vixie-cron-4.1/do_command.c.old	2007-07-30 16:34:08.000000000 +0200
-+++ vixie-cron-4.1/do_command.c	2007-07-26 16:56:11.000000000 +0200
-@@ -71,7 +71,7 @@
-          */
- 	if ( cron_set_job_security_context( e, u, &jobenv ) != 0 )
- 	{
--	    syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
-+	    //syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
- 	    exit(ERROR_EXIT);
- 	}
- 
-@@ -158,7 +158,7 @@
- 	switch (fork()) {
- 	case -1:
- 		log_it("CRON", getpid(), "error", "can't fork");
--		cron_close_security_session();
-+		cron_close_pam();
- 		exit(ERROR_EXIT);
- 		/*NOTREACHED*/
- 	case 0:
-@@ -523,7 +523,7 @@
- 			Debug(DPROC, (", dumped core"))
- 		Debug(DPROC, ("\n"))
- 	}
--	cron_close_security_session();
-+	cron_close_pam();
- 	env_free(jobenv);
- }
- 
---- vixie-cron-4.1/crontab.c.old	2007-07-30 16:34:09.000000000 +0200
-+++ vixie-cron-4.1/crontab.c	2007-07-30 10:49:09.000000000 +0200
+--- vixie-cron-4.1/crontab.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/crontab.c	2007-09-11 10:22:21.000000000 +0200
 @@ -37,7 +37,6 @@
  #include <selinux/av_permissions.h>
  #endif
@@ -127,8 +98,8 @@
  		if (!glue_strings(q, sizeof q, editor, Filename, ' ')) {
  			fprintf(stderr, "%s: editor command line too long\n",
  			    ProgramName);
---- vixie-cron-4.1/security.c.old	2007-07-30 16:34:09.000000000 +0200
-+++ vixie-cron-4.1/security.c	2007-07-30 16:30:52.000000000 +0200
+--- vixie-cron-4.1/security.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/security.c	2007-09-11 10:30:26.000000000 +0200
 @@ -46,70 +46,55 @@
  int cron_restore_default_security_context() {
  	setexeccon(NULL);
@@ -341,19 +312,18 @@
 -    {
 -	log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
 -	return -1;	
-+    if (chdir(homedir) == -1) {
-+		log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
-+		log_it("CRON", getpid(), homedir, strerror(errno));
-+		return -1;
++    if (initgroups(pw->pw_name, pw->pw_gid) != 0) {
++		log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
++		return -1;	
      }
  
 -    if ( setuid( pw->pw_uid ) != 0 )
 -    {
 -	log_it("CRON", getpid(), "setuid failed:", strerror(errno));
 -	return -1;
-+    if (initgroups(pw->pw_name, pw->pw_gid) != 0) {
-+		log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
-+		return -1;	
++    if (setuid( pw->pw_uid ) != 0) {
++		log_it("CRON", getpid(), "setuid failed:", strerror(errno));
++		return -1;
      }
  
 -	if ( chdir(homedir) == -1 )
@@ -361,12 +331,13 @@
 -    log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
 -    log_it("CRON", getpid(), homedir, strerror(errno));
 -    return -1;
-+    if (setuid( pw->pw_uid ) != 0) {
-+		log_it("CRON", getpid(), "setuid failed:", strerror(errno));
-+		return -1;
++    if (chdir(homedir) == -1) {
++	log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
++        log_it("CRON", getpid(), homedir, strerror(errno));
++        return -1;
      }
 -   
-+    
++                                                        
      return 0;
  }
  
@@ -842,3 +813,32 @@
      }
      return jobenv;    
  #else
+--- vixie-cron-4.1/do_command.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/do_command.c	2007-09-11 10:22:21.000000000 +0200
+@@ -71,7 +71,7 @@
+          */
+ 	if ( cron_set_job_security_context( e, u, &jobenv ) != 0 )
+ 	{
+-	    syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
++	    //syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
+ 	    exit(ERROR_EXIT);
+ 	}
+ 
+@@ -158,7 +158,7 @@
+ 	switch (fork()) {
+ 	case -1:
+ 		log_it("CRON", getpid(), "error", "can't fork");
+-		cron_close_security_session();
++		cron_close_pam();
+ 		exit(ERROR_EXIT);
+ 		/*NOTREACHED*/
+ 	case 0:
+@@ -523,7 +523,7 @@
+ 			Debug(DPROC, (", dumped core"))
+ 		Debug(DPROC, ("\n"))
+ 	}
+-	cron_close_security_session();
++	cron_close_pam();
+ 	env_free(jobenv);
+ }
+ 


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/F-7/vixie-cron.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vixie-cron.spec	30 Jul 2007 15:13:24 -0000	1.99
+++ vixie-cron.spec	11 Sep 2007 09:10:31 -0000	1.100
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 83%{?dist}
+Release: 84%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -272,6 +272,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-84
+- fix problem with selinux homedir #241877 in patch pam_crontab
+
 * Mon Jul 31 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-83
 - update from devel
 - add pam to crontab, add variable tmpdir, fix man again



From fedora-extras-commits at redhat.com  Tue Sep 11 09:51:23 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:51:23 -0400
Subject: rpms/apr/devel .cvsignore, 1.10, 1.11 apr.spec, 1.71, 1.72 sources, 
	1.10, 1.11 apr-1.2.9-openlfs.patch, 1.1, NONE
Message-ID: <200709110951.l8B9pNJT029066@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29015

Modified Files:
	.cvsignore apr.spec sources 
Removed Files:
	apr-1.2.9-openlfs.patch 
Log Message:
Bump up to 1.2.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Jun 2007 23:42:07 -0000	1.10
+++ .cvsignore	11 Sep 2007 09:50:48 -0000	1.11
@@ -1 +1 @@
-apr-1.2.9.tar.bz2
+apr-1.2.11.tar.bz2


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- apr.spec	2 Sep 2007 14:15:02 -0000	1.71
+++ apr.spec	11 Sep 2007 09:50:48 -0000	1.72
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.9
-Release: 4
+Version: 1.2.11
+Release: 1
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,7 +18,6 @@
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
-Patch7: apr-1.2.9-openlfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, e2fsprogs-devel, python
 
@@ -48,7 +47,6 @@
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
-%patch7 -p1 -b .openlfs
 
 %build
 # regenerate configure script etc.
@@ -124,6 +122,10 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
+- bump up to 1.2.11
+- drop openlfs patch (fixed upstream)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
 - fix API/ABI of 32-bit builds (#254241)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Jun 2007 23:42:07 -0000	1.10
+++ sources	11 Sep 2007 09:50:48 -0000	1.11
@@ -1 +1 @@
-86a5a7d0f8807b97645956a2b4ed6f14  apr-1.2.9.tar.bz2
+22ede19520beb37dc17e62592b06a59c  apr-1.2.11.tar.bz2


--- apr-1.2.9-openlfs.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 09:51:30 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:51:30 -0400
Subject: rpms/apr-util/devel .cvsignore, 1.7, 1.8 apr-util-1.2.8-dbddso.patch,
	1.3, 1.4 apr-util.spec, 1.41, 1.42 apr_dbd_mysql.c, 1.1,
	1.2 sources, 1.9, 1.10 apr-util-1.2.8-autoexpat.patch, 1.1,
	NONE apr-util-1.2.8-dbdopen.patch, 1.1,
	NONE apr-util-1.2.8-xmlns.patch, 1.1, NONE
Message-ID: <200709110951.l8B9pUte029076@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29021

Modified Files:
	.cvsignore apr-util-1.2.8-dbddso.patch apr-util.spec 
	apr_dbd_mysql.c sources 
Removed Files:
	apr-util-1.2.8-autoexpat.patch apr-util-1.2.8-dbdopen.patch 
	apr-util-1.2.8-xmlns.patch 
Log Message:
Bump up to 1.2.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Dec 2006 16:01:27 -0000	1.7
+++ .cvsignore	11 Sep 2007 09:50:55 -0000	1.8
@@ -1 +1 @@
-apr-util-1.2.8.tar.gz
+apr-util-1.2.10.tar.bz2

apr-util-1.2.8-dbddso.patch:

Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-util-1.2.8-dbddso.patch	23 Mar 2007 09:45:59 -0000	1.3
+++ apr-util-1.2.8-dbddso.patch	11 Sep 2007 09:50:55 -0000	1.4
@@ -229,7 +229,7 @@
  #if APU_HAVE_MYSQL
      DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
  #endif
-@@ -94,62 +92,68 @@
+@@ -94,64 +92,70 @@
  #if APU_HAVE_SOME_OTHER_BACKEND
      DRIVER_LOAD("firebird", apr_dbd_other_driver, pool);
  #endif
@@ -285,16 +285,18 @@
 +    pool = apr_hash_pool_get(drivers);
  
  #ifdef WIN32
-     sprintf(path, "apr_dbd_%s.dll", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
+ #elif defined(NETWARE)
+     apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
  #else
--    sprintf(path, "apr_dbd_%s.so", name);
+-    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
 +    apr_snprintf(path, sizeof path, APU_DSO_LIBDIR "/apr_dbd_%s.so", name);
  #endif
      rv = apr_dso_load(&dlhandle, path, pool);
      if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
          goto unlock;
      }
-     sprintf(path, "apr_dbd_%s_driver", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
 -    rv = apr_dso_sym((void*)driver, dlhandle, path);
 +    rv = apr_dso_sym(&symbol, dlhandle, path);
      if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- apr-util.spec	2 Sep 2007 13:46:51 -0000	1.41
+++ apr-util.spec	11 Sep 2007 09:50:55 -0000	1.42
@@ -3,19 +3,16 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.8
-Release: 12
+Version: 1.2.10
+Release: 1
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-Source1: http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+Source1: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.2.x/dbd/apr_dbd_mysql.c
 Patch0: apr-util-1.2.2-exports.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
 Patch3: apr-util-1.2.8-dbddso.patch
-Patch4: apr-util-1.2.8-xmlns.patch
-Patch5: apr-util-1.2.8-autoexpat.patch
-Patch6: apr-util-1.2.8-dbdopen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel, e2fsprogs-devel
@@ -73,9 +70,6 @@
 %patch0 -p1 -b .exports
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .dbddso
-%patch4 -p1 -b .xmlns
-%patch5 -p1 -b .autoexpat
-%patch6 -p1 -b .dbdopen
 
 cp $RPM_SOURCE_DIR/apr_dbd_mysql.c dbd
 
@@ -155,6 +149,13 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.10-1
+- bump up to 1.2.10
+- pick up newly checked in MySQL DBD driver directly from ASF
+- remove dbdopen patch (fixed upstream)
+- remove xmlns patch (fixed upstream)
+- remove autoexpat patch (fixed upstream)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
 - rebuild for fixed APR 32-bit ABI
 - remove sqlite driver from main package (#274521)


Index: apr_dbd_mysql.c
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr_dbd_mysql.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_dbd_mysql.c	28 Feb 2007 12:52:44 -0000	1.1
+++ apr_dbd_mysql.c	11 Sep 2007 09:50:55 -0000	1.2
@@ -1,50 +1,19 @@
-/*
-         Copyright (c) 2003-7, WebThing Ltd and other contributors
- 
-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.  Alternatively, where this program
-is aggregated with the Apache APR-UTIL package version 1.2 or later,
-you can distribute and/or modify it under the terms of the Apache
-License 2.0 as published by the Apache Software Foundation.
- 
-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
-applicable 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.
-You may obtain a copy of the Apache License 2.0 at:
-http://www.apache.org/licenses/LICENSE-2.0
- 
-*/
-
-/* LICENSE NOTE
- *
- * The current GPL satisfies MySQL licensing terms without
- * invoking any exceptions.  ASF policy doesn't permit GPL
- * software to be distributed by apache.org, but this should
- * not be a problem for third-parties who wish to distribute
- * it alongside the APR and other Apache software.
- * 
- * It is updated to dual license after discussion with Debian
- * and taking into account MySQL's FOSS exception.
- * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
- * http://www.mysql.com/company/legal/licensing/foss-exception.html
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * MAINTAINERS
- *
- * This code was originally written by Nick Kew for MySQL 4.1.
- * and subsequently updated by others to support MySQL 5.0.
- * The current lead maintainer is Bojan Smojver, with others
- * contributing via the developer list at apr.apache.org.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
 #include "apu.h"
 #define HAVE_MYSQL_MYSQL_H
 
@@ -74,17 +43,9 @@
 
 struct apr_dbd_prepared_t {
     MYSQL_STMT* stmt;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int nargs;
-    int nvals;
-    apr_dbd_type_e *types;
-#endif
 };
 
 struct apr_dbd_transaction_t {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int mode;
-#endif
     int errnum;
     apr_dbd_t *handle;
 };
@@ -100,156 +61,12 @@
     MYSQL_RES *res;
     MYSQL_STMT *statement;
     MYSQL_BIND *bind;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    apr_pool_t *pool;
-#endif
 };
 struct apr_dbd_row_t {
     MYSQL_ROW row;
     apr_dbd_results_t *res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    unsigned long *len;
-#endif
-};
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-/* MySQL specific bucket for BLOB types */
-typedef struct apr_bucket_lob apr_bucket_lob;
-/**
- * A bucket referring to a MySQL BLOB
- */
-struct apr_bucket_lob {
-    /** Number of buckets using this memory */
-    apr_bucket_refcount  refcount;
-    /** The row this bucket refers to */
-    const apr_dbd_row_t *row;
-    /** The column this bucket refers to */
-    int col;
-    /** The pool into which any needed structures should
-     *  be created while reading from this bucket */
-    apr_pool_t *readpool;
 };
 
-static void lob_bucket_destroy(void *data);
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block);
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p);
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list);
-
-static const apr_bucket_type_t apr_bucket_type_lob = {
-    "LOB", 5, APR_BUCKET_DATA,
-    lob_bucket_destroy,
-    lob_bucket_read,
-    apr_bucket_setaside_notimpl,
-    apr_bucket_shared_split,
-    apr_bucket_shared_copy
-};
-
-static void lob_bucket_destroy(void *data)
-{
-    apr_bucket_lob *f = data;
-
-    if (apr_bucket_shared_destroy(f)) {
-        /* no need to destroy database objects here; it will get
-         * done automatically when the pool gets cleaned up */
-        apr_bucket_free(f);
-    }
-}
-
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block)
-{
-    apr_bucket_lob *a = e->data;
-    const apr_dbd_row_t *row = a->row;
-    apr_dbd_results_t *res = row->res;
-    int col = a->col;
-    apr_bucket *b = NULL;
-    int rv;
-    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
-    apr_off_t boffset = e->start;
-    MYSQL_BIND *bind = &res->bind[col];
-
-    *str = NULL;  /* in case we die prematurely */
-
-    /* fetch from offset if not at the beginning */
-    if (boffset > 0) {
-        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
-        if (rv != 0) {
-            return APR_EGENERAL;
-        }
-    }
-    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
-    *len = e->length - blength;
-    *str = bind->buffer;
-
-    /* allocate new buffer, since we used this one for the bucket */
-    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
-
-    /*
-     * Change the current bucket to refer to what we read,
-     * even if we read nothing because we hit EOF.
-     */
-    apr_bucket_pool_make(e, *str, *len, res->pool);
-
-    /* If we have more to read from the field, then create another bucket */
-    if (blength > 0) {
-        /* for efficiency, we can just build a new apr_bucket struct
-         * to wrap around the existing LOB bucket */
-        b = apr_bucket_alloc(sizeof(*b), e->list);
-        b->start  = boffset + *len;
-        b->length = blength;
-        b->data   = a;
-        b->type   = &apr_bucket_type_lob;
-        b->free   = apr_bucket_free;
-        b->list   = e->list;
-        APR_BUCKET_INSERT_AFTER(e, b);
-    }
-    else {
-        lob_bucket_destroy(a);
-    }
-
-    return APR_SUCCESS;
-}
-
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p)
-{
-    apr_bucket_lob *f;
-
-    f = apr_bucket_alloc(sizeof(*f), b->list);
-    f->row = row;
-    f->col = col;
-    f->readpool = p;
-
-    b = apr_bucket_shared_make(b, f, offset, len);
-    b->type = &apr_bucket_type_lob;
-
-    return b;
-}
-
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list)
-{
-    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
-    APR_BUCKET_INIT(b);
-    b->free = apr_bucket_free;
-    b->list = list;
-    return apr_bucket_lob_make(b, row, col, offset, len, p);
-}
-
-#endif
-
 static apr_status_t free_result(void *data)
 {
     mysql_free_result(data);
@@ -273,9 +90,6 @@
             }
             (*results)->random = seek;
             (*results)->statement = NULL;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-            (*results)->pool = pool;
-#endif
             if (seek) {
                 (*results)->res = mysql_store_result(sql->conn);
             }
@@ -289,27 +103,12 @@
         ret = mysql_errno(sql->conn);
     }
     
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
-{
-    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
-        return NULL;
-    }
-
-    return mysql_fetch_fields(res->res)[n].name;
-}
-#endif
-
 static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **row, int rownum)
 {
@@ -352,9 +151,6 @@
         }
         (*row)->row = r;
         (*row)->res = res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        (*row)->len = mysql_fetch_lengths(res->res);
-#endif
     }
     else {
         apr_pool_cleanup_run(pool, res->res, free_result);
@@ -412,160 +208,6 @@
 }
 #endif
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
-                                        apr_dbd_type_e type, void *data)
-{
-    if (row->res->statement) {
-        MYSQL_BIND *bind = &row->res->bind[n];
-        unsigned long len = *bind->length;
-
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return APR_EGENERAL;
-        }
-
-        if (*bind->is_null) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
-            *(char**)data = bind->buffer;
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_lob_create(row, n, 0, len,
-                                      row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    else {
-        if (row->row[n] == NULL) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *(char**)data = row->row[n];
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_pool_create(row->row[n], row->len[n],
-                                       row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    return 0;
-}
-#endif
-
 static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
 {
     return mysql_error(sql->conn);
@@ -582,11 +224,7 @@
         ret = mysql_errno(sql->conn);
     }
     *nrows = mysql_affected_rows(sql->conn);
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
@@ -607,467 +245,6 @@
     return APR_SUCCESS;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             int nargs, int nvals, apr_dbd_type_e *types,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    int ret;
-
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        (*statement)->nargs = nargs;
-        (*statement)->nvals = nvals;
-        (*statement)->types = types;
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
-                           const char **values, MYSQL_BIND *bind)
-{
-    int i, j;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_unsigned = 0;
-        bind[i].is_null = NULL;
-
-        if (values[j] == NULL) {
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-        }
-        else {
-            switch (statement->types[i]) {
-            case APR_DBD_TYPE_BLOB:
-            case APR_DBD_TYPE_CLOB:
-                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = atol(values[++j]);
-
-                /* skip table and column */
-                j += 2;
-                break;
-            default:
-                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = strlen(values[j]);
-                break;
-            }
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                     int *nrows, apr_dbd_prepared_t *statement,
-                                     MYSQL_BIND *bind)
-{
-    int ret;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            const char **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                      apr_dbd_results_t **res,
-                                      apr_dbd_prepared_t *statement,
-                                      int random, MYSQL_BIND *bind)
-{
-    int nfields, i;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            (*res)->pool = pool;
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                    }
-                    else {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    }
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             const char **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
-}
-
-static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
-                            const void **values, MYSQL_BIND *bind)
-{
-    void *arg;
-    int i, j;
-    apr_dbd_type_e type;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        arg = (void *)values[j];
-
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = NULL;
-
-        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UTINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_SHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_USHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_INT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UINT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONG:
-            if (sizeof(int) == sizeof(long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(int));
-                *(int*)bind[i].buffer = *(long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONG:
-            if (sizeof(unsigned int) == sizeof(unsigned long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
-                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            if (sizeof(long long) == sizeof(apr_int64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(long long));
-                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
-                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = strlen((const char *)arg);
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            bind[i].buffer = (void *)arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = *(apr_size_t*)values[++j];
-
-            /* skip table and column */
-            j += 2;
-            break;
-        case APR_DBD_TYPE_NULL:
-        default:
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-            break;
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
-                             int *nrows, apr_dbd_prepared_t *statement,
-                             const void **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                              apr_dbd_prepared_t *statement, va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              const void **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                               apr_dbd_results_t **res,
-                               apr_dbd_prepared_t *statement, int random,
-                               va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
-}
-#else
 static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
                              apr_dbd_prepared_t **statement)
@@ -1368,18 +545,12 @@
     }
     return ret;
 }
-#endif
 
 static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
 {
     int ret = -1;
     if (trans) {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        /* rollback on error or explicit rollback request */
-        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
-#else
         if (trans->errnum) {
-#endif
             trans->errnum = 0;
             ret = mysql_rollback(trans->handle->conn);
         }
@@ -1412,25 +583,6 @@
     return (*trans)->errnum;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode;
-}
-
-static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
-                                          int mode)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode = (mode & TXN_MODE_BITS);
-}
-#endif
-
 static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
 {
     static const char *const delims = " \r\n\t;|,";
@@ -1608,18 +760,6 @@
     dbd_mysql_pvselect,
     dbd_mysql_pquery,
     dbd_mysql_pselect
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    ,
-    dbd_mysql_get_name,
-    dbd_mysql_transaction_mode_get,
-    dbd_mysql_transaction_mode_set,
-    "?",
-    dbd_mysql_pvbquery,
-    dbd_mysql_pvbselect,
-    dbd_mysql_pbquery,
-    dbd_mysql_pbselect,
-    dbd_mysql_datum_get
-#endif
 };
 
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Dec 2006 16:01:27 -0000	1.9
+++ sources	11 Sep 2007 09:50:55 -0000	1.10
@@ -1 +1 @@
-a2e2e54d65e9eae961f7171335cf2550  apr-util-1.2.8.tar.gz
+9277c21fe41065bd359db98c474aa998  apr-util-1.2.10.tar.bz2


--- apr-util-1.2.8-autoexpat.patch DELETED ---


--- apr-util-1.2.8-dbdopen.patch DELETED ---


--- apr-util-1.2.8-xmlns.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 09:52:40 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:52:40 -0400
Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.3,1.4
Message-ID: <200709110952.l8B9qePk029169@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29129

Modified Files:
	apr-api-docs.spec 
Log Message:
Sync with apr-1.2.11/apr-util-1.2.10.



Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-api-docs.spec	21 Aug 2007 23:30:44 -0000	1.3
+++ apr-api-docs.spec	11 Sep 2007 09:52:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
-Version:        1.2.9
-Release:        3%{?dist}
+Version:        1.2.11
+Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -58,6 +58,9 @@
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Tue Sep 11 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
+- Align with latest apr/apr-util
+
 * Wed Aug 22 2007 Bojan Smojver <bojan at rexursive.com> 1.2.9-3
 - Fix license
 



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:49 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:49 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7oJr020417@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchbugzilla acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:49 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:49 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7okj020426@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchcommits acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:53 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:53 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7svZ020435@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchcommits acl on basesystem (Fedora devel) to Obsolete for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:55 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:55 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7tO6028471@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:53 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:53 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7svl028462@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchbugzilla acl on basesystem (Fedora devel) to Obsolete for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:25 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:25 -0700
Subject: [pkgdb] filesystem had acl change status
Message-ID: <200709111208.l8BC8P2o028502@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on filesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:28 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:28 -0700
Subject: [pkgdb] openhpi had acl change status
Message-ID: <200709111208.l8BC8TxI020468@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on openhpi (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:31 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:31 -0700
Subject: [pkgdb] OpenIPMI had acl change status
Message-ID: <200709111208.l8BC8Vpc028512@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on OpenIPMI (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:09 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:09 -0700
Subject: [pkgdb] rootfiles had acl change status
Message-ID: <200709111209.l8BC99qY028525@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on rootfiles (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:12 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:12 -0700
Subject: [pkgdb] setup had acl change status
Message-ID: <200709111209.l8BC9C4q020482@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on setup (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:15 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:15 -0700
Subject: [pkgdb] sg3_utils had acl change status
Message-ID: <200709111209.l8BC9F7S028534@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on sg3_utils (Fedora devel) to Approved for Karsten Hopp (karsten)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:18 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:18 -0700
Subject: [pkgdb] system-config-httpd had acl change status
Message-ID: <200709111209.l8BC9J9E020491@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on system-config-httpd (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-httpd



From fedora-extras-commits at redhat.com  Tue Sep 11 12:27:11 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 11 Sep 2007 08:27:11 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.46,1.47 sources,1.40,1.41
Message-ID: <200709111227.l8BCRBGf019871@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19831

Modified Files:
	hwbrowser.spec sources 
Log Message:
buildrequire expat to augment xgettext for glade files



Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- hwbrowser.spec	11 Sep 2007 08:58:11 -0000	1.46
+++ hwbrowser.spec	11 Sep 2007 12:26:39 -0000	1.47
@@ -12,6 +12,7 @@
 BuildRequires: automake
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
+BuildRequires: expat
 Requires: gnome-python2
 Requires: gnome-python2-canvas
 Requires: pygtk2
@@ -54,6 +55,7 @@
 %changelog
 * Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
+- buildrequire expat to augment xgettext for glade files
 
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	11 Sep 2007 08:58:11 -0000	1.40
+++ sources	11 Sep 2007 12:26:39 -0000	1.41
@@ -1 +1 @@
-8a139843dae96f83ee27595ad7fa5d20  hwbrowser-0.36.tar.bz2
+2c98067d3f3f4f91ecf4f9f321f1e984  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:48:32 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:48:32 -0400
Subject: rpms/wdaemon/F-7 wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111248.l8BCmWl8020613@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:48:00 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:48:00 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:56:57 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:56:57 -0400
Subject: rpms/wdaemon/FC-6 wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111256.l8BCuvRl020958@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20893

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:56:25 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:56:25 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:59:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 08:59:31 -0400
Subject: rpms/gnome-session/devel ice-leaks.patch, NONE,
	1.1 gnome-session.spec, 1.138, 1.139
Message-ID: <200709111259.l8BCxVDk021145@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21090

Modified Files:
	gnome-session.spec 
Added Files:
	ice-leaks.patch 
Log Message:
fix memory leaks


ice-leaks.patch:

--- NEW FILE ice-leaks.patch ---
diff -up gnome-session-2.19.92/gnome-session/ice.c.ice-leaks gnome-session-2.19.92/gnome-session/ice.c
--- gnome-session-2.19.92/gnome-session/ice.c.ice-leaks	2007-09-11 01:56:57.000000000 -0400
+++ gnome-session-2.19.92/gnome-session/ice.c	2007-09-11 01:57:49.000000000 -0400
@@ -455,10 +455,13 @@ clean_ice (void)
   /* During shutdown we don't want to report errors via a dialog.  */
   write_authfile (authfile, entries, FALSE);
 
+  g_slist_foreach (entries, (GFunc)IceFreeAuthFileEntry, NULL);
   g_slist_free (entries);
 
   g_free (input_id);
   IceFreeListenObjs (num_sockets, sockets);
+
+  g_slist_foreach (auth_entries, (GFunc)IceFreeAuthFileEntry, NULL);
   g_slist_free (auth_entries);
   
   ice_depth = ~0;	/* We are very frozen, like totally off */


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-session.spec	5 Sep 2007 17:30:41 -0000	1.138
+++ gnome-session.spec	11 Sep 2007 12:58:58 -0000	1.139
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -57,6 +57,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=475468
+Patch22: ice-leaks.patch
+
 BuildRequires: esound-devel >= %{esound_version}
 BuildRequires: /usr/bin/esd
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -101,6 +104,7 @@
 %patch13 -p1 -b .window-manager
 %patch20 -p1 -b .timeout
 #%patch21 -p0 -b .use-gdm-hints
+%patch22 -p1 -b .ice-leaks
 
 %build
 
@@ -185,6 +189,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-3
+- Plug memory leaks in the ICE code
+
 * Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
 - Update gnome-session-2.17.5-window-manager.patch to apply (remove
   chunks that are now upstream).



From fedora-extras-commits at redhat.com  Tue Sep 11 12:59:31 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:59:31 -0400
Subject: rpms/wdaemon/devel wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111259.l8BCxVhY021144@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21088

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:58:58 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:58:58 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 13:02:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 11 Sep 2007 09:02:56 -0400
Subject: rpms/bigloo/F-7 .cvsignore, 1.13, 1.14 bigloo.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <200709111302.l8BD2u2q027296@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27249

Modified Files:
	.cvsignore bigloo.spec sources 
Log Message:
new release 3.0b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Jun 2007 19:35:54 -0000	1.13
+++ .cvsignore	11 Sep 2007 13:02:23 -0000	1.14
@@ -1 +1 @@
-bigloo3.0a.tar.gz
+bigloo3.0b.tar.gz


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/bigloo.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bigloo.spec	1 Jun 2007 22:51:14 -0000	1.25
+++ bigloo.spec	11 Sep 2007 13:02:23 -0000	1.26
@@ -1,12 +1,12 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.0a
-Release:	4%{?dist}
+Version: 	3.0b
+Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2+
 URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
 Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
 Patch0:         bigloo-javassl.patch
@@ -76,7 +76,7 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0b-1
+- new release 3.0b
+
 * Sat Jun  2 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-4
 - exclude ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Jun 2007 19:35:54 -0000	1.13
+++ sources	11 Sep 2007 13:02:23 -0000	1.14
@@ -1 +1 @@
-91b86d1514658e1a254456b4e288e092  bigloo3.0a.tar.gz
+426ad39c4358ca21ce3e49eebbcb12cf  bigloo3.0b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 13:19:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 09:19:25 -0400
Subject: rpms/groff/devel groff.spec,1.51,1.52
Message-ID: <200709111319.l8BDJP8K028035@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27985

Modified Files:
	groff.spec 
Log Message:
Change spec file for review.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- groff.spec	16 Aug 2007 14:11:35 -0000	1.51
+++ groff.spec	11 Sep 2007 13:18:53 -0000	1.52
@@ -3,8 +3,8 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 7%{?dist}
-License: GPL
+Release: 8%{?dist}
+License: GPLv2 and FDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -190,8 +190,12 @@
 ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
 # installed, but not packaged in rpm
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
 mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
@@ -233,6 +237,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-8
+- another change in spec for review
+
 * Thu Aug 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-7
 - rebuild
 - another encoding are print correct with nroff



From fedora-extras-commits at redhat.com  Tue Sep 11 13:33:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 11 Sep 2007 09:33:22 -0400
Subject: rpms/bigloo/devel .cvsignore, 1.13, 1.14 bigloo.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <200709111333.l8BDXMMJ028600@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/devel

Modified Files:
	.cvsignore bigloo.spec sources 
Log Message:
new release 3.0b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Jun 2007 09:38:52 -0000	1.13
+++ .cvsignore	11 Sep 2007 13:32:50 -0000	1.14
@@ -1 +1 @@
-bigloo3.0a.tar.gz
+bigloo3.0b.tar.gz


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bigloo.spec	2 Jun 2007 09:38:52 -0000	1.22
+++ bigloo.spec	11 Sep 2007 13:32:50 -0000	1.23
@@ -1,12 +1,12 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.0a
-Release:	4%{?dist}
+Version: 	3.0b
+Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2+
 URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
 Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
 Patch0:         bigloo-javassl.patch
@@ -76,7 +76,7 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0b-1
+- new release 3.0b
+
 * Sat Jun  2 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-4
 - exclude ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Jun 2007 09:38:52 -0000	1.13
+++ sources	11 Sep 2007 13:32:50 -0000	1.14
@@ -1 +1 @@
-91b86d1514658e1a254456b4e288e092  bigloo3.0a.tar.gz
+426ad39c4358ca21ce3e49eebbcb12cf  bigloo3.0b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 13:48:24 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 11 Sep 2007 09:48:24 -0400
Subject: status-report-scripts bzstat.gp,1.1,1.2 grabBZstats,1.1,1.2
Message-ID: <200709111348.l8BDmOsL029103@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29083

Modified Files:
	bzstat.gp grabBZstats 
Log Message:
Update for new interface.


Index: bzstat.gp
===================================================================
RCS file: /cvs/fedora/status-report-scripts/bzstat.gp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzstat.gp	7 Jul 2006 15:25:37 -0000	1.1
+++ bzstat.gp	11 Sep 2007 13:48:22 -0000	1.2
@@ -2,16 +2,20 @@
 # $Id$
 # Useful to plot grabBZstats script output
 set xlabel "Week #, starting from August 1, 2005"
-set ylabel "Ticket count"
+set ylabel "Ticket count per week"
+set y2label "Open ticket in queue"
+set yrange [0:150]
+set ytics nomirror
+set y2tics nomirror 0,1000
 set key top left
-set style data lp
-set term png small color picsize 1024 768
+set style data line
+set term png small size 1024,768
 set output "bzstat.png"
-plot "bzstat.data" using 1:2 t "opened tickets",\
-  "bzstat.data" using 1:3 t "closed tickets",\
-  "bzstat.data" using 1:4 t "queue size",\
-  "bzstat.data" using 1:5 t "accepted tickets",\
-  "bzstat.data" using 1:6 t "duplicate tickets",\
-  "bzstat.data" using 1:7 t "dropped tickets"
+plot "bzstat.data" using 1:2 t "opened tickets p.w.",\
+  "bzstat.data" using 1:3 t "closed tickets p.w.",\
+  "bzstat.data" using 1:5 t "accepted tickets p.w.",\
+  "bzstat.data" using 1:6 t "duplicate tickets p.w.",\
+  "bzstat.data" using 1:7 t "dropped tickets p.w.",\
+  "bzstat.data" using 1:4 t "open ticket in queue" axis x1y2
 set output
 quit


Index: grabBZstats
===================================================================
RCS file: /cvs/fedora/status-report-scripts/grabBZstats,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grabBZstats	7 Jul 2006 15:25:37 -0000	1.1
+++ grabBZstats	11 Sep 2007 13:48:22 -0000	1.2
@@ -9,20 +9,18 @@
 use strict;
 use Getopt::Long;
 use Date::Manip;
-use File::Temp qw/ tempfile /;
+use XMLRPC::Lite;
 
-# Cookies and BZ URLs to retrieve tickets
-my $BZ_cooky = "# HTTP Cookie File
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917104	COLUMNLIST	opendate%20changeddate%20bug_severity%20assigned_to%20reporter%20bug_status%20resolution%20component%20blockedby%20short_desc
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917173	Bugzilla_logincookie	496436
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917173	Bugzilla_login	156481";
-my @BZ_URLs;
-# All package reviews
-push @BZ_URLs,
-  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&chfieldto=Now&component=Package%20Review&ctype=csv";
+my $rpc = new XMLRPC::Lite (
+  proxy => 'https://bugzilla.redhat.com/xmlrpc.cgi'
+);
+# Not sure of the way to increase the timeout on reading...
+$rpc->transport->timeout(360);
+$main::BZusername = "";
+$main::password = "";
 
 my %opt;
-my @options = ( "help" );
+my @options = ( "help", "bu=s", "p=s" );
 
 my @Ticket;
 my $startDate = ParseDate("1 August 2005");
@@ -30,80 +28,35 @@
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
+$main::BZusername = $opt{"bu"} if defined $opt{"bu"};
+$main::password = $opt{"p"} if defined $opt{"p"};
 
 &usage() if defined $opt{'help'};
 
-my ($tfh, $tfn) = tempfile();
-print $tfh $BZ_cooky;
-close $tfh;
-foreach my $url (@BZ_URLs) {
-  local *IN;
-  open IN, "wget --load-cookies $tfn -nv -O - \"$url\"|"
-    or die "Failed to wget $url : $!";
-  while ( <IN> ) {
-    s/[,\n]+$//;
-    my @F = split /,/;
-    my $i = 0;
-    while ($i <= $#F) {
-      if (substr($F[$i], 0, 1) eq '"') {
-	if (substr($F[$i], -1, 1) ne '"') {
-	  $F[$i] .= "," . $F[$i + 1];
-	  splice @F, $i + 1, 1;
-	  next;
-	}
-      }
-      $i += 1;
-    }
-    if ($F[0] !~ /^\d+$/) {
-      # Check header line
-      if ($F[0] ne "bug_id"
-	  || $F[1] ne "\"opendate\""
-	  || $F[2] ne "\"changeddate\""
-	  || $F[3] ne "\"bug_severity\""
-	  || $F[4] ne "\"assigned_to\""
-	  || $F[5] ne "\"reporter\""
-	  || $F[6] ne "\"bug_status\""
-	  || $F[7] ne "\"resolution\""
-	  || $F[8] ne "\"component\""
-	  || $F[9] ne "\"blockedby\""
-	  || $F[10] ne "\"short_desc\"") {
-	die "Bad header: $_";
-      }
-      next;
-    }
-    next if $F[10] =~ /TESTING-BUGSPAM/;
-    next if $F[10] =~ /^.Tracker:/;
-    warn "assigned_to should be an email address: $F[4]"
-      if index($F[4], "@") < 0;
-    warn "reporter should be an email address: $F[5]"
-      if index($F[5], "@") < 0;
-    $F[9] =~ s/["{}]//g;
-    $F[1] =~ s/["]//g;
-    $F[2] =~ s/["]//g;
-    $F[6] =~ s/["]//g;
-    $F[7] =~ s/["]//g;
-    $F[8] =~ s/["]//g;
-    $F[1] = ParseDate($F[1]);
-    $F[2] = ParseDate($F[2]);
-    push @Ticket, \@F;
-  }
-  close IN;
-}
-unlink $tfn;
-my @SubmitSortedT = sort { Date_Cmp($$a[1], $$b[1]) } @Ticket;
-my @ModifSortedT = sort { Date_Cmp($$a[2], $$b[2]) } @Ticket;
+my $bA = &runQuery($rpc);
+foreach my $bug (@$bA) {
+  # Try to guess package name
+  my $name = $bug->{'short_desc'};
+  $bug->{'opendate'} = ParseDate($bug->{'opendate'});
+  $bug->{'changeddate'} = ParseDate($bug->{'changeddate'});
+  next if $name =~ /TESTING-BUGSPAM/;
+  next if $name =~ /^.Tracker:/;
+  push @Ticket, $bug;
+}
+my @SubmitSortedT = sort { Date_Cmp($a->{'opendate'}, $b->{'opendate'}) } @Ticket;
+my @ModifSortedT = sort { Date_Cmp($a->{'changeddate'}, $b->{'changeddate'}) } @Ticket;
 my $curDate = $startDate;
 my $openCount = 0;
 my @Open;
 foreach my $e (@SubmitSortedT) {
-  if (Date_Cmp($$e[1], $curDate) < 0) {
+  if (Date_Cmp($e->{'opendate'}, $curDate) < 0) {
     $openCount += 1;
     next;
   }
   push @Open, $openCount;
   $openCount = 0;
   $curDate = DateCalc($curDate, "+ 1 week");
-  while (Date_Cmp($$e[1], $curDate) >= 0) {
+  while (Date_Cmp($e->{'opendate'}, $curDate) >= 0) {
     push @Open, $openCount;
     $curDate = DateCalc($curDate, "+ 1 week");
   }
@@ -120,19 +73,20 @@
 my @Close;
 my @K = ("Accepted", "DUPLICATE", "Dropped");
 foreach my $e (@ModifSortedT) {
-  next if $$e[6] ne "CLOSED";
+  next if $e->{'bug_status'} ne "CLOSED";
   my $key;
   $key = "Accepted"
-    if $$e[7] =~ /^(CURRENTRELEASE|NEXTRELEASE|RAWHIDE)$/;
+    if $e->{'resolution'} =~ /^(CURRENTRELEASE|NEXTRELEASE|RAWHIDE|ERRATA)$/;
   $key = "DUPLICATE"
-    if $$e[7] eq "DUPLICATE";
+    if $e->{'resolution'} eq "DUPLICATE";
   $key = "Dropped"
-    if $$e[7] =~ /^(CANTFIX|DEFERRED|NOTABUG|WONTFIX|WORKSFORME)$/;
+    if $e->{'resolution'} =~ /^(CANTFIX|DEFERRED|NOTABUG|WONTFIX|WORKSFORME|INSUFFICIENT_DATA|UPSTREAM)$/;
   unless (defined $key) {
-    print STDERR join("|", @$e), "\n";
+    print STDERR $e->{'bug_id'}, ": ", $e->{'resolution'}, "\n";
     die "Can't classify";
+    #$key = "Dropped";
   }
-  if (Date_Cmp($$e[2], $curDate) < 0) {
+  if (Date_Cmp($e->{'changeddate'}, $curDate) < 0) {
     $closeCount->{"all"} += 1;
     $closeCount->{$key} += 1;
     next;
@@ -140,7 +94,7 @@
   push @Close, $closeCount;
   $closeCount = {};
   $curDate = DateCalc($curDate, "+ 1 week");
-  while (Date_Cmp($$e[2], $curDate) >= 0) {
+  while (Date_Cmp($e->{'changeddate'}, $curDate) >= 0) {
     push @Close, $closeCount;
     $closeCount = {};
     $curDate = DateCalc($curDate, "+ 1 week");
@@ -183,3 +137,59 @@
   -help           this help note\n";
   exit 1;
 }
+
+sub runQuery {
+  my ($rpc) = @_;
+  my $querydata = {
+    'column_list' => ['opendate', 'changeddate', 'bug_severity', 'alias',
+		      'assigned_to', 'reporter', 'bug_status',
+		      'resolution', 'component', 'blockedby', 'short_desc'],
+    'product'     => ['Fedora'],
+    'component'   => ['Package Review'],
+    'bug_status'  => ["NEW", "VERIFIED", "ASSIGNED", "REOPENED",
+		      "NEEDINFO_ENG", "NEEDINFO", "INVESTIGATE", "MODIFIED",
+		      "ON_DEV", "UNCONFIRMED", "QA_READY", "ON_QA",
+		      "FAILS_QA", "NEEDINFO_REPORTER", "RELEASE_PENDING",
+		      "POST"]
+  };
+  my $call;
+  while (1) {
+    print STDERR "Running runQuery(rpc) all open\n";
+    eval {
+      $call = $rpc->call('bugzilla.runQuery', $querydata,
+			 $main::BZusername, $main::password);
+      if ($call->faultstring) {
+	print STDERR $call->faultstring . "\n";
+	exit 1;
+      }
+    };
+    if ($@) {
+      warn $@;
+    } else {
+      last;
+    }
+  }
+  my $result = $call->result;
+  my $res_all = $result->{'bugs'};
+  $querydata->{'bug_status'} = ["CLOSED"];
+  while (1) {
+    print STDERR "Running runQuery(rpc) closed\n";
+    eval {
+      $call = $rpc->call('bugzilla.runQuery', $querydata,
+	  		  $main::BZusername, $main::password);
+      if ($call->faultstring) {
+	print STDERR $call->faultstring . "\n";
+	exit 1;
+      }
+    };
+    if ($@) {
+      warn $@;
+    } else {
+      last;
+    }
+  }
+  $result = $call->result;
+  my $res2 = $result->{'bugs'};
+  push @$res_all, @$res2;
+  return $res_all;
+}



From fedora-extras-commits at redhat.com  Tue Sep 11 14:08:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 10:08:36 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.53,1.54
Message-ID: <200709111408.l8BE8aRh003260@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3239

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- policy-20070501.patch	10 Sep 2007 18:25:11 -0000	1.53
+++ policy-20070501.patch	11 Sep 2007 14:08:33 -0000	1.54
@@ -244,10 +244,76 @@
 +	hal_write_log(alsa_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.6.4/policy/modules/admin/amanda.if
+--- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-07 14:51:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.if	2007-09-11 09:15:10.000000000 -0400
+@@ -71,6 +71,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Search amanda var library directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`amanda_search_var_lib',`
++	gen_require(`
++		type amanda_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 amanda_var_lib_t:dir search_dir_perms;
++
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to read /etc/dumpdates.
+ ## </summary>
+ ## <param name="domain">
+@@ -141,3 +161,4 @@
+ 
+ 	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-08-07 09:42:34.000000000 -0400
-@@ -85,7 +85,7 @@
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 09:15:03.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(amanda,1.5.0)
++policy_module(amanda,1.6.1)
+ 
+ #######################################
+ #
+@@ -51,8 +51,7 @@
+ # type for amrecover
+ type amanda_recover_t;
+ type amanda_recover_exec_t;
+-domain_type(amanda_recover_t)
+-domain_entry_file(amanda_recover_t,amanda_recover_exec_t)
++application_domain(amanda_recover_t,amanda_recover_exec_t)
+ role system_r types amanda_recover_t;
+ 
+ # type for recover files ( restored data )
+@@ -70,12 +69,11 @@
+ 
+ allow amanda_t self:capability { chown dac_override setuid kill };
+ allow amanda_t self:process { setpgid signal };
+-allow amanda_t self:fifo_file { getattr read write ioctl lock };
++allow amanda_t self:fifo_file rw_fifo_file_perms;
+ allow amanda_t self:unix_stream_socket create_stream_socket_perms;
+ allow amanda_t self:unix_dgram_socket create_socket_perms;
+ allow amanda_t self:tcp_socket create_stream_socket_perms;
+ allow amanda_t self:udp_socket create_socket_perms;
+-allow amanda_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # access to amanda_amandates_t
+ allow amanda_t amanda_amandates_t:file { getattr lock read write };
+@@ -85,18 +83,22 @@
  
  # access to amandas data structure
  allow amanda_t amanda_data_t:dir { read search write };
@@ -256,7 +322,12 @@
  
  # access to amanda_dumpdates_t
  allow amanda_t amanda_dumpdates_t:file { getattr lock read write };
-@@ -97,6 +97,9 @@
+ 
+ can_exec(amanda_t,amanda_exec_t)
++can_exec(amanda_t,amanda_inetd_exec_t)
+ 
+ # access to amanda_gnutarlists_t (/var/lib/amanda/gnutar-lists)
+ allow amanda_t amanda_gnutarlists_t:dir rw_dir_perms;
  allow amanda_t amanda_gnutarlists_t:file manage_file_perms;
  allow amanda_t amanda_gnutarlists_t:lnk_file manage_file_perms;
  
@@ -266,6 +337,79 @@
  manage_files_pattern(amanda_t,amanda_log_t,amanda_log_t)
  manage_dirs_pattern(amanda_t,amanda_log_t,amanda_log_t)
  logging_log_filetrans(amanda_t,amanda_log_t,{ file dir })
+@@ -105,6 +107,8 @@
+ manage_dirs_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_t, amanda_tmp_t, { file dir })
+ 
++auth_use_nsswitch(amanda_t)
++
+ kernel_read_system_state(amanda_t)
+ kernel_read_kernel_sysctls(amanda_t)
+ kernel_dontaudit_getattr_unlabeled_files(amanda_t)
+@@ -113,7 +117,8 @@
+ # Added for targeted policy
+ term_use_unallocated_ttys(amanda_t)
+ 
+-corenet_non_ipsec_sendrecv(amanda_t)
++corenet_all_recvfrom_unlabeled(amanda_t)
++corenet_all_recvfrom_netlabel(amanda_t)
+ corenet_tcp_sendrecv_all_if(amanda_t)
+ corenet_udp_sendrecv_all_if(amanda_t)
+ corenet_raw_sendrecv_all_if(amanda_t)
+@@ -150,8 +155,6 @@
+ libs_use_ld_so(amanda_t)
+ libs_use_shared_libs(amanda_t)
+ 
+-sysnet_read_config(amanda_t)
+-
+ optional_policy(`
+ 	auth_read_shadow(amanda_t)
+ ')
+@@ -160,14 +163,6 @@
+ 	logging_send_syslog_msg(amanda_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(amanda_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_t)
+-')
+-
+ ########################################
+ #
+ # Amanda recover local policy
+@@ -197,10 +192,13 @@
+ manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
+ 
++auth_use_nsswitch(amanda_recover_t)
++
+ kernel_read_system_state(amanda_recover_t)
+ kernel_read_kernel_sysctls(amanda_recover_t)
+ 
+-corenet_non_ipsec_sendrecv(amanda_recover_t)
++corenet_all_recvfrom_unlabeled(amanda_recover_t)
++corenet_all_recvfrom_netlabel(amanda_recover_t)
+ corenet_tcp_sendrecv_all_if(amanda_recover_t)
+ corenet_udp_sendrecv_all_if(amanda_recover_t)
+ corenet_tcp_sendrecv_all_nodes(amanda_recover_t)
+@@ -232,14 +230,4 @@
+ 
+ miscfiles_read_localization(amanda_recover_t)
+ 
+-sysnet_read_config(amanda_recover_t)
+-
+ userdom_search_sysadm_home_content_dirs(amanda_recover_t)
+-
+-optional_policy(`
+-	nis_use_ypbind(amanda_recover_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_recover_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.4/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2007-08-07 09:42:34.000000000 -0400
@@ -1634,7 +1778,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-04 13:41:27.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 08:17:57.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1673,15 +1817,16 @@
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  network_port(mail, tcp,2000,s0)
-@@ -152,6 +158,7 @@
+@@ -152,13 +158,18 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
 +network_port(wccp, udp,2048,s0)
  network_port(xen, tcp,8002,s0)
++network_port(xfs, tcp,7100,s0)
  network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
  network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
-@@ -159,6 +166,9 @@
+ network_port(zope, tcp,8021,s0)
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -4175,7 +4320,7 @@
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.6.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-09-11 09:16:17.000000000 -0400
 @@ -42,6 +42,9 @@
  type cron_log_t;
  logging_log_file(cron_log_t)
@@ -4268,7 +4413,7 @@
  ifdef(`distro_debian',`
  	optional_policy(`
  		# Debian logcheck has the home dir set to its cache
-@@ -185,34 +209,9 @@
+@@ -185,40 +209,19 @@
  	locallogin_link_keys(crond_t)
  ')
  
@@ -4306,7 +4451,17 @@
  
  tunable_policy(`fcron_crond', `
  	allow crond_t system_cron_spool_t:file manage_file_perms;
-@@ -232,11 +231,7 @@
+ ')
+ 
+ optional_policy(`
++	amanda_search_var_lib(crond_t)
++')
++
++optional_policy(`
+ 	amavis_search_lib(crond_t)
+ ')
+ 
+@@ -232,11 +235,7 @@
  ')
  
  optional_policy(`
@@ -4319,7 +4474,7 @@
  ')
  
  optional_policy(`
-@@ -258,25 +253,39 @@
+@@ -258,25 +257,39 @@
  # System cron process domain
  #
  
@@ -4363,7 +4518,7 @@
  	allow system_crond_t self:capability { dac_override dac_read_search chown setgid setuid fowner net_bind_service fsetid };
  	allow system_crond_t self:process { signal_perms setsched };
  	allow system_crond_t self:fifo_file rw_fifo_file_perms;
-@@ -369,7 +378,7 @@
+@@ -369,7 +382,7 @@
  	init_read_utmp(system_crond_t)
  	init_dontaudit_rw_utmp(system_crond_t)
  	# prelink tells init to restart it self, we either need to allow or dontaudit
@@ -4372,7 +4527,7 @@
  
  	libs_use_ld_so(system_crond_t)
  	libs_use_shared_libs(system_crond_t)
-@@ -428,6 +437,10 @@
+@@ -428,6 +441,10 @@
  	')
  
  	optional_policy(`
@@ -4385,7 +4540,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.6.4/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-09-11 08:58:55.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4403,12 +4558,11 @@
  /usr/lib(64)?/cups/daemon/.*	-- gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
-@@ -52,3 +53,5 @@
+@@ -52,3 +53,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+/usr/local/Brother/lpd(/.*)?	gen_context(system_u:object_r:cupsd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.6.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/cups.te	2007-08-07 09:42:35.000000000 -0400
@@ -5249,9 +5403,17 @@
  files_search_home(inetd_child_t)
  
  manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.6.4/policy/modules/services/kerberos.fc
+--- nsaserefpolicy/policy/modules/services/kerberos.fc	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.fc	2007-09-11 09:03:39.000000000 -0400
+@@ -16,3 +16,4 @@
+ 
+ /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
+ /var/log/kadmin(d)?\.log		gen_context(system_u:object_r:kadmind_log_t,s0)
++/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.6.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-09-11 09:02:58.000000000 -0400
 @@ -33,43 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -5298,109 +5460,56 @@
  ')
  
  ########################################
-@@ -94,46 +61,47 @@
+@@ -94,6 +61,27 @@
  
  ########################################
  ## <summary>
--##	Do not audit attempts to write the kerberos
--##	configuration file (/etc/krb5.conf).
 +##	Read the kerberos kdc configuration file (/etc/krb5kdc.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
--##	Domain to not audit.
++## </summary>
++## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
- ##	</summary>
- ## </param>
++##	</summary>
++## </param>
 +## <rolecap/>
- #
--interface(`kerberos_dontaudit_write_config',`
++#
 +interface(`kerberos_read_kdc_config',`
- 	gen_require(`
--		type krb5_conf_t;
++	gen_require(`
 +		type krb5kdc_conf_t;
- 	')
- 
--	dontaudit $1 krb5_conf_t:file write;
++	')
++
 +	files_search_etc($1)
 +	allow $1 krb5kdc_conf_t:file read_file_perms;
 +
- ')
- 
- ########################################
- ## <summary>
--##	Read and write the kerberos configuration file (/etc/krb5.conf).
-+##	Do not audit attempts to write the kerberos
-+##	configuration file (/etc/krb5.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
--##	Domain allowed access.
-+##	Domain to not audit.
- ##	</summary>
- ## </param>
--## <rolecap/>
- #
--interface(`kerberos_rw_config',`
-+interface(`kerberos_dontaudit_write_config',`
- 	gen_require(`
- 		type krb5_conf_t;
- 	')
- 
--	files_search_etc($1)
--	allow $1 krb5_conf_t:file rw_file_perms;
-+	dontaudit $1 krb5_conf_t:file write;
- ')
- 
- ########################################
- ## <summary>
--##	Read the kerberos key table.
-+##	Read and write the kerberos configuration file (/etc/krb5.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -142,18 +110,18 @@
- ## </param>
- ## <rolecap/>
- #
--interface(`kerberos_read_keytab',`
-+interface(`kerberos_rw_config',`
- 	gen_require(`
--		type krb5_keytab_t;
-+		type krb5_conf_t;
- 	')
- 
- 	files_search_etc($1)
--	allow $1 krb5_keytab_t:file read_file_perms;
-+	allow $1 krb5_conf_t:file rw_file_perms;
- ')
- 
- ########################################
- ## <summary>
--##	Read the kerberos kdc configuration file (/etc/krb5kdc.conf).
-+##	Read the kerberos key table.
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to write the kerberos
+ ##	configuration file (/etc/krb5.conf).
  ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -162,12 +130,11 @@
+@@ -162,12 +150,13 @@
  ## </param>
  ## <rolecap/>
  #
 -interface(`kerberos_read_kdc_config',`
-+interface(`kerberos_read_keytab',`
++interface(`kerberos_manage_host_rcache',`
  	gen_require(`
 -		type krb5kdc_conf_t;
-+		type krb5_keytab_t;
++		type krb5_host_rcache_t;
  	')
  
- 	files_search_etc($1)
+-	files_search_etc($1)
 -	allow $1 krb5kdc_conf_t:file read_file_perms;
 -
-+	allow $1 krb5_keytab_t:file read_file_perms;
++	files_search_tmp($1)
++	allow $1 self:process setfscreate;
++	seutil_read_file_contexts($1)
++	allow $1 krb5_host_rcache_t:file manage_file_perms;
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.6.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-04 11:12:55.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-11 09:02:16.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -5409,7 +5518,17 @@
  
  ## <desc>
  ## <p>
-@@ -62,7 +63,7 @@
+@@ -54,6 +55,9 @@
+ type krb5kdc_var_run_t;
+ files_pid_file(krb5kdc_var_run_t)
+ 
++type krb5_host_rcache_t;
++files_tmp_file(krb5_host_rcache_t)
++
+ ########################################
+ #
+ # kadmind local policy
+@@ -62,7 +66,7 @@
  # Use capabilities. Surplus capabilities may be allowed.
  allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
  dontaudit kadmind_t self:capability sys_tty_config;
@@ -5418,7 +5537,7 @@
  allow kadmind_t self:netlink_route_socket r_netlink_socket_perms;
  allow kadmind_t self:unix_dgram_socket { connect create write };
  allow kadmind_t self:tcp_socket connected_stream_socket_perms;
-@@ -91,6 +92,7 @@
+@@ -91,6 +95,7 @@
  kernel_read_kernel_sysctls(kadmind_t)
  kernel_list_proc(kadmind_t)
  kernel_read_proc_symlinks(kadmind_t)
@@ -5426,7 +5545,7 @@
  
  corenet_non_ipsec_sendrecv(kadmind_t)
  corenet_tcp_sendrecv_all_if(kadmind_t)
-@@ -117,6 +119,9 @@
+@@ -117,6 +122,9 @@
  domain_use_interactive_fds(kadmind_t)
  
  files_read_etc_files(kadmind_t)
@@ -5436,7 +5555,7 @@
  
  libs_use_ld_so(kadmind_t)
  libs_use_shared_libs(kadmind_t)
-@@ -126,6 +131,7 @@
+@@ -126,6 +134,7 @@
  miscfiles_read_localization(kadmind_t)
  
  sysnet_read_config(kadmind_t)
@@ -5444,7 +5563,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(kadmind_t)
  userdom_dontaudit_search_sysadm_home_dirs(kadmind_t)
-@@ -142,6 +148,7 @@
+@@ -142,6 +151,7 @@
  
  optional_policy(`
  	seutil_sigchld_newrole(kadmind_t)
@@ -5452,7 +5571,16 @@
  ')
  
  optional_policy(`
-@@ -227,6 +234,7 @@
+@@ -156,7 +166,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice };
+ dontaudit krb5kdc_t self:capability sys_tty_config;
+-allow krb5kdc_t self:process { setsched getsched signal_perms };
++allow krb5kdc_t self:process { setfscreate setsched getsched signal_perms };
+ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms;
+ allow krb5kdc_t self:tcp_socket create_stream_socket_perms;
+ allow krb5kdc_t self:udp_socket create_socket_perms;
+@@ -227,6 +237,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
  sysnet_read_config(krb5kdc_t)
@@ -5460,7 +5588,13 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
-@@ -248,3 +256,36 @@
+@@ -243,8 +254,42 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(krb5kdc_t)
++	seutil_read_file_contexts(krb5kdc_t)
+ ')
+ 
  optional_policy(`
  	udev_read_db(krb5kdc_t)
  ')
@@ -7148,15 +7282,55 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.6.4/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-08-07 09:42:35.000000000 -0400
-@@ -64,6 +64,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-09-11 09:05:43.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(rlogin,1.3.0)
++policy_module(rlogin,1.4.0)
+ 
+ ########################################
+ #
+@@ -50,7 +50,8 @@
+ kernel_read_system_state(rlogind_t)
+ kernel_read_network_state(rlogind_t)
+ 
+-corenet_non_ipsec_sendrecv(rlogind_t)
++corenet_all_recvfrom_unlabeled(rlogind_t)
++corenet_all_recvfrom_netlabel(rlogind_t)
+ corenet_tcp_sendrecv_all_if(rlogind_t)
+ corenet_udp_sendrecv_all_if(rlogind_t)
+ corenet_tcp_sendrecv_all_nodes(rlogind_t)
+@@ -63,9 +64,10 @@
+ fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
++auth_use_nsswitch(rlogind_t)
  auth_domtrans_chk_passwd(rlogind_t)
 +auth_domtrans_upd_passwd(rlogind_t)
  auth_rw_login_records(rlogind_t)
- auth_use_nsswitch(rlogind_t)
+-auth_use_nsswitch(rlogind_t)
+ 
+ files_read_etc_files(rlogind_t)
+ files_read_etc_runtime_files(rlogind_t)
+@@ -81,7 +83,7 @@
+ 
+ miscfiles_read_localization(rlogind_t)
+ 
+-seutil_dontaudit_search_config(rlogind_t)
++seutil_read_config(rlogind_t)
+ 
+ sysnet_read_config(rlogind_t)
  
+@@ -92,7 +94,9 @@
+ remotelogin_domtrans(rlogind_t)
+ 
+ optional_policy(`
++	kerberos_use(rlogind_t)
+ 	kerberos_read_keytab(rlogind_t)
++	kerberos_manage_host_rcache(rlogind_t)
+ ')
+ 
+ ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-2.6.4/policy/modules/services/rpcbind.fc
 --- nsaserefpolicy/policy/modules/services/rpcbind.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2007-08-07 09:42:35.000000000 -0400
@@ -7428,15 +7602,105 @@
  tunable_policy(`nfs_export_all_ro',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-2.6.4/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2007-08-07 09:42:35.000000000 -0400
-@@ -44,6 +44,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2007-09-11 09:10:41.000000000 -0400
+@@ -11,19 +11,22 @@
+ domain_subj_id_change_exemption(rshd_t)
+ domain_role_change_exemption(rshd_t)
+ role system_r types rshd_t;
++domain_interactive_fd(rshd_t)
+ 
+ ########################################
+ #
+ # Local policy
+ #
+-allow rshd_t self:capability { setuid setgid fowner fsetid chown dac_override };
++allow rshd_t self:capability { kill setuid setgid fowner fsetid chown dac_override };
+ allow rshd_t self:process { signal_perms fork setsched setpgid setexec };
+ allow rshd_t self:fifo_file rw_fifo_file_perms;
+ allow rshd_t self:tcp_socket create_stream_socket_perms;
++allow rshd_t self:key {search  write link};
+ 
+ kernel_read_kernel_sysctls(rshd_t)
+ 
+-corenet_non_ipsec_sendrecv(rshd_t)
++corenet_all_recvfrom_unlabeled(rshd_t)
++corenet_all_recvfrom_netlabel(rshd_t)
+ corenet_tcp_sendrecv_generic_if(rshd_t)
+ corenet_udp_sendrecv_generic_if(rshd_t)
+ corenet_tcp_sendrecv_all_nodes(rshd_t)
+@@ -32,6 +35,8 @@
+ corenet_udp_sendrecv_all_ports(rshd_t)
+ corenet_tcp_bind_all_nodes(rshd_t)
+ corenet_tcp_bind_rsh_port(rshd_t)
++corenet_tcp_bind_all_rpc_ports(rshd_t)
++corenet_tcp_connect_all_rpc_ports(rshd_t)
+ corenet_sendrecv_rsh_server_packets(rshd_t)
+ 
+ dev_read_urand(rshd_t)
+@@ -43,31 +48,43 @@
+ selinux_compute_relabel_context(rshd_t)
  selinux_compute_user_contexts(rshd_t)
  
++auth_use_nsswitch(rshd_t)
  auth_domtrans_chk_passwd(rshd_t)
 +auth_domtrans_upd_passwd(rshd_t)
++auth_search_key(rshd_t)
++auth_write_login_records(rshd_t)
  
  corecmd_read_bin_symlinks(rshd_t)
  
+ files_list_home(rshd_t)
+ files_read_etc_files(rshd_t)
+-files_search_tmp(rshd_t)
++files_manage_generic_tmp_dirs(rshd_t)
++
++init_rw_utmp(rshd_t)
+ 
+ libs_use_ld_so(rshd_t)
+ libs_use_shared_libs(rshd_t)
+ 
+ logging_send_syslog_msg(rshd_t)
++logging_search_logs(rshd_t)
+ 
+ miscfiles_read_localization(rshd_t)
+ 
+ seutil_read_config(rshd_t)
+ seutil_read_default_contexts(rshd_t)
+ 
+-sysnet_read_config(rshd_t)
+-
+ userdom_search_all_users_home_content(rshd_t)
+ 
++optional_policy(`
++	kerberos_use(rshd_t)
++	kerberos_read_keytab(rshd_t)
++	kerberos_manage_host_rcache(rshd_t)
++')
++
+ ifdef(`targeted_policy',`
+ 	unconfined_domain(rshd_t)
+ 	unconfined_shell_domtrans(rshd_t)
++	unconfined_signal(rshd_t)
+ ')
+ 
+ tunable_policy(`use_nfs_home_dirs',`
+@@ -80,16 +97,3 @@
+ 	fs_read_cifs_symlinks(rshd_t)
+ ')
+ 
+-optional_policy(`
+-	kerberos_use(rshd_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(rshd_t)
+-')
+-
+-ifdef(`TODO',`
+-optional_policy(`
+-	allow rshd_t rlogind_tmp_t:file rw_file_perms;
+-')
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.6.4/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2007-08-07 09:42:35.000000000 -0400
@@ -7539,7 +7803,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.6.4/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-09-11 09:23:35.000000000 -0400
 @@ -3,6 +3,7 @@
  # /etc
  #
@@ -7548,7 +7812,15 @@
  /etc/samba/secrets\.tdb		--	gen_context(system_u:object_r:samba_secrets_t,s0)
  /etc/samba/smbpasswd		--	gen_context(system_u:object_r:samba_secrets_t,s0)
  /etc/samba(/.*)?			gen_context(system_u:object_r:samba_etc_t,s0)
-@@ -27,6 +28,9 @@
+@@ -14,6 +15,7 @@
+ /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
+ /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
+ /usr/bin/smbmnt			--	gen_context(system_u:object_r:smbmount_exec_t,s0)
++/usr/bin/smbcontrol		--	gen_context(system_u:object_r:smbcontrol_exec_t,s0)
+ /usr/sbin/swat			--	gen_context(system_u:object_r:swat_exec_t,s0)
+ 
+ /usr/sbin/nmbd			--	gen_context(system_u:object_r:nmbd_exec_t,s0)
+@@ -27,6 +29,9 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
@@ -7560,7 +7832,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-11 09:24:04.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -7653,7 +7925,7 @@
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +443,70 @@
+@@ -377,3 +443,121 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -7724,15 +7996,64 @@
 +
 +	read_files_pattern($1, samba_share_t, samba_share_t)
 +')
++
++########################################
++## <summary>
++##	Execute a domain transition to run smbcontrol.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_smbcontrol',`
++	gen_require(`
++		type smbcontrol_t;
++                type smbcontrol_exec_t;
++	')
++
++	domtrans_pattern($1,smbcontrol_exec_t,smbcontrol_t)
++')
++
++
++########################################
++## <summary>
++##	Execute smbcontrol in the smbcontrol domain, and
++##	allow the specified role the smbcontrol domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the smbcontrol domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the role's terminal.
++##	</summary>
++## </param>
++#
++interface(`samba_run_smbcontrol',`
++	gen_require(`
++		type smbcontrol_t;
++	')
++
++	samba_domtrans_smbcontrol($1)
++	role $2 types smbcontrol_t;
++	dontaudit smbcontrol_t $3:chr_file rw_term_perms;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-23 17:07:33.000000000 -0400
-@@ -28,6 +28,35 @@
- ## </desc>
- gen_tunable(samba_share_nfs,false)
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-11 09:56:07.000000000 -0400
+@@ -16,6 +16,14 @@
  
-+## <desc>
-+## <p>
+ ## <desc>
+ ## <p>
 +## Allow samba to run as the domain controller; add machines to passwd file
 +## 
 +## </p>
@@ -7741,17 +8062,24 @@
 +
 +## <desc>
 +## <p>
-+## Allow samba to be exported read/write.
+ ## Allow samba to export user home directories.
+ ## </p>
+ ## </desc>
+@@ -23,6 +31,27 @@
+ 
+ ## <desc>
+ ## <p>
++## Export all files on system read only.
 +## </p>
 +## </desc>
-+gen_tunable(samba_export_all_rw,false)
++gen_tunable(samba_export_all_ro,false)
 +
 +## <desc>
 +## <p>
-+## Allow samba to be exported read only
++## Export all files on system read-write.
 +## </p>
 +## </desc>
-+gen_tunable(samba_export_all_ro,false)
++gen_tunable(samba_export_all_rw,false)
 +
 +## <desc>
 +## <p>
@@ -7760,27 +8088,54 @@
 +## </desc>
 +gen_tunable(samba_run_unconfined,false)
 +
- type nmbd_t;
- type nmbd_exec_t;
- init_daemon_domain(nmbd_t,nmbd_exec_t)
-@@ -117,6 +146,7 @@
- allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
- allow samba_net_t self:udp_socket create_socket_perms;
- allow samba_net_t self:tcp_socket create_socket_perms;
-+allow samba_net_t self:netlink_route_socket r_netlink_socket_perms;
++## <desc>
++## <p>
+ ## Allow samba to export NFS volumes.
+ ## </p>
+ ## </desc>
+@@ -108,6 +137,11 @@
+ type winbind_var_run_t;
+ files_pid_file(winbind_var_run_t)
+ 
++type smbcontrol_t;
++type smbcontrol_exec_t;
++application_domain(smbcontrol_t, smbcontrol_exec_t)
++role system_r types smbcontrol_t;
++
+ ########################################
+ #
+ # Samba net local policy
+@@ -131,6 +165,8 @@
+ manage_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ manage_lnk_files_pattern(samba_net_t,samba_var_t,samba_var_t)
  
- allow samba_net_t samba_etc_t:file read_file_perms;
++auth_use_nsswitch(samba_net_t)
++
+ kernel_read_proc_symlinks(samba_net_t)
  
-@@ -159,6 +189,8 @@
+ corenet_tcp_sendrecv_all_if(samba_net_t)
+@@ -159,8 +195,7 @@
  
  miscfiles_read_localization(samba_net_t) 
  
+-sysnet_read_config(samba_net_t)
+-sysnet_use_ldap(samba_net_t)
 +samba_read_var_files(samba_net_t) 
-+
- sysnet_read_config(samba_net_t)
- sysnet_use_ldap(samba_net_t)
  
-@@ -191,7 +223,7 @@
+ userdom_dontaudit_search_sysadm_home_dirs(samba_net_t)
+ 
+@@ -173,10 +208,6 @@
+ 	kerberos_use(samba_net_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(samba_net_t)
+-')
+-
+ ########################################
+ #
+ # smbd Local policy
+@@ -191,18 +222,16 @@
  allow smbd_t self:msgq create_msgq_perms;
  allow smbd_t self:sem create_sem_perms;
  allow smbd_t self:shm create_shm_perms;
@@ -7789,7 +8144,8 @@
  allow smbd_t self:tcp_socket create_stream_socket_perms;
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -200,9 +232,8 @@
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
  
@@ -7801,7 +8157,7 @@
  allow smbd_t samba_log_t:dir setattr;
  dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -231,7 +262,8 @@
+@@ -231,7 +260,8 @@
  manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
  files_pid_filetrans(smbd_t,smbd_var_run_t,file)
  
@@ -7811,17 +8167,17 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -256,6 +288,9 @@
- corenet_tcp_connect_ipp_port(smbd_t)
- corenet_tcp_connect_smbd_port(smbd_t)
+@@ -241,6 +271,9 @@
+ kernel_read_software_raid_state(smbd_t)
+ kernel_read_system_state(smbd_t)
  
 +corecmd_exec_shell(smbd_t)
 +corecmd_exec_bin(smbd_t)
 +
- dev_read_sysfs(smbd_t)
- dev_read_urand(smbd_t)
- dev_getattr_mtrr_dev(smbd_t)
-@@ -265,11 +300,14 @@
+ corenet_tcp_sendrecv_all_if(smbd_t)
+ corenet_udp_sendrecv_all_if(smbd_t)
+ corenet_raw_sendrecv_all_if(smbd_t)
+@@ -265,11 +298,14 @@
  fs_get_xattr_fs_quotas(smbd_t)
  fs_search_auto_mountpoints(smbd_t)
  fs_getattr_rpc_dirs(smbd_t)
@@ -7836,7 +8192,13 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -296,6 +334,12 @@
+@@ -290,12 +326,16 @@
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
+-sysnet_read_config(smbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
  
@@ -7849,7 +8211,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +363,14 @@
+@@ -319,6 +359,14 @@
  ')
  
  optional_policy(`
@@ -7864,7 +8226,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +391,23 @@
+@@ -339,6 +387,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -7888,7 +8250,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +421,7 @@
+@@ -352,7 +417,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -7897,7 +8259,7 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +431,12 @@
+@@ -362,9 +427,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -7911,7 +8273,16 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -391,6 +463,7 @@
+@@ -373,6 +441,8 @@
+ 
+ allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
+ 
++auth_use_nsswitch(nmbd_t)
++
+ kernel_getattr_core_if(nmbd_t)
+ kernel_getattr_message_if(nmbd_t)
+ kernel_read_kernel_sysctls(nmbd_t)
+@@ -391,6 +461,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -7919,7 +8290,24 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -457,6 +530,7 @@
+@@ -402,6 +473,7 @@
+ 
+ files_read_usr_files(nmbd_t)
+ files_read_etc_files(nmbd_t)
++files_list_var_lib(nmbd_t)
+ 
+ libs_use_ld_so(nmbd_t)
+ libs_use_shared_libs(nmbd_t)
+@@ -411,8 +483,6 @@
+ 
+ miscfiles_read_localization(nmbd_t)
+ 
+-sysnet_read_config(nmbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
+ userdom_use_unpriv_users_fds(nmbd_t)
+@@ -457,6 +527,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -7927,24 +8315,96 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +588,7 @@
+@@ -489,6 +560,8 @@
+ term_list_ptys(smbmount_t)
+ term_use_controlling_term(smbmount_t)
+ 
++auth_use_nsswitch(smbmount_t)
++
+ corecmd_list_bin(smbmount_t)
+ 
+ files_list_mnt(smbmount_t)
+@@ -508,21 +581,11 @@
+ 
+ logging_search_logs(smbmount_t)
+ 
+-sysnet_read_config(smbmount_t)
+-
+ userdom_use_all_users_fds(smbmount_t)
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
 -	cups_read_rw_config(smbd_t)
+-')
+-
+-optional_policy(`
+-	nis_use_ypbind(smbmount_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(smbmount_t)
 +	cups_read_rw_config(smbmount_t)
  ')
  
- optional_policy(`
-@@ -534,7 +608,6 @@
- allow swat_t self:process signal_perms;
+ ########################################
+@@ -530,22 +593,30 @@
+ # SWAT Local policy
+ #
+ 
+-allow swat_t self:capability { setuid setgid };
+-allow swat_t self:process signal_perms;
++allow swat_t self:capability { setuid setgid sys_resource net_bind_service };
++allow swat_t self:process { setrlimit signal_perms };
  allow swat_t self:fifo_file rw_file_perms;
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
 -allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
- allow swat_t self:netlink_route_socket r_netlink_socket_perms;
-@@ -588,6 +661,7 @@
+-allow swat_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+-allow swat_t nmbd_exec_t:file { execute read };
++can_exec(swat_t, nmbd_exec_t)
++allow swat_t nmbd_port_t:udp_socket name_bind;
++allow swat_t nmbd_t:process { signal signull };
++allow swat_t nmbd_var_run_t:file { lock read unlink };
+ 
+ rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
+ 
++init_read_utmp(swat_t)
++init_dontaudit_write_utmp(swat_t)
++
+ append_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-allow swat_t smbd_exec_t:file execute ;
++allow swat_t self:unix_stream_socket connectto;
++can_exec(swat_t, smbd_exec_t)
++allow swat_t smbd_port_t:tcp_socket name_bind;
++allow swat_t smbd_t:process signal;
++allow swat_t smbd_var_run_t:file { lock unlink };
+ 
+ allow swat_t smbd_t:process signull;
+ 
+@@ -558,7 +629,11 @@
+ manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
+ files_pid_filetrans(swat_t,swat_var_run_t,file)
+ 
+-allow swat_t winbind_exec_t:file execute;
++can_exec(swat_t, winbind_exec_t)
++allow swat_t winbind_var_run_t:dir { write add_name remove_name };
++allow swat_t winbind_var_run_t:sock_file { create unlink };
++
++auth_use_nsswitch(swat_t)
+ 
+ kernel_read_kernel_sysctls(swat_t)
+ kernel_read_system_state(swat_t)
+@@ -582,23 +657,24 @@
+ 
+ dev_read_urand(swat_t)
+ 
++files_list_var_lib(swat_t)
+ files_read_etc_files(swat_t)
+ files_search_home(swat_t)
+ files_read_usr_files(swat_t)
  fs_getattr_xattr_fs(swat_t)
  
  auth_domtrans_chk_passwd(swat_t)
@@ -7952,7 +8412,32 @@
  
  libs_use_ld_so(swat_t)
  libs_use_shared_libs(swat_t)
-@@ -625,19 +699,25 @@
+ 
+ logging_send_syslog_msg(swat_t)
++logging_send_audit_msgs(swat_t)
+ logging_search_logs(swat_t)
+ 
+ miscfiles_read_localization(swat_t)
+ 
+-sysnet_read_config(swat_t)
+-
+ optional_policy(`
+ 	cups_read_rw_config(swat_t)
+ 	cups_stream_connect(swat_t)
+@@ -612,32 +688,30 @@
+ 	kerberos_use(swat_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(swat_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(swat_t)
+-')
+-
+ ########################################
+ #
  # Winbind local policy
  #
  
@@ -7979,7 +8464,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +725,8 @@
+@@ -645,6 +719,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -7988,7 +8473,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +764,9 @@
+@@ -682,7 +758,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -7998,7 +8483,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +779,6 @@
+@@ -695,9 +773,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -8008,7 +8493,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +794,6 @@
+@@ -713,10 +788,6 @@
  ')
  
  optional_policy(`
@@ -8019,7 +8504,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +813,7 @@
+@@ -736,6 +807,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -8027,32 +8512,67 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +841,25 @@
+@@ -763,4 +835,60 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
 +	squid_rw_stream_sockets(winbind_helper_t)
-+')
+ ')
 +
 +########################################
 +#
 +# samba_unconfined_script_t local policy
 +#
-+type samba_unconfined_script_t;
-+domain_type(samba_unconfined_script_t)
-+role system_r types samba_unconfined_script_t;
-+
-+# This type is used for executable scripts files
-+type samba_unconfined_script_exec_t;
-+corecmd_shell_entry_type(samba_unconfined_script_t)
-+domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t)
-+allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
-+allow smbd_t samba_unconfined_script_exec_t:file ioctl;
++optional_policy(`
++	type samba_unconfined_script_t;
++	domain_type(samba_unconfined_script_t)
++	role system_r types samba_unconfined_script_t;
 +
-+tunable_policy(`samba_run_unconfined',`
-+	domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
- ')
-+unconfined_domain(samba_unconfined_script_t)
++	# This type is used for executable scripts files
++	type samba_unconfined_script_exec_t;
++	corecmd_shell_entry_type(samba_unconfined_script_t)
++	domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t)
++	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
++	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
++
++	tunable_policy(`samba_run_unconfined',`
++		domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
++		')
++	unconfined_domain(samba_unconfined_script_t)
++')
++
++########################################
++#
++# smbcontrol local policy
++#
++
++## internal communication is often done using fifo and unix sockets.
++allow smbcontrol_t self:fifo_file rw_file_perms;
++allow smbcontrol_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(smbcontrol_t)
++
++libs_use_ld_so(smbcontrol_t)
++libs_use_shared_libs(smbcontrol_t)
++
++miscfiles_read_localization(smbcontrol_t)
++
++files_search_var_lib(smbcontrol_t)
++samba_read_config(smbcontrol_t)
++samba_rw_var_files(smbcontrol_t)
++samba_search_var(smbcontrol_t)
++samba_read_winbind_pid(smbcontrol_t)
++
++allow smbcontrol_t smbd_t:process signal;
++allow smbd_t smbcontrol_t:process { signal signull };
++
++allow nmbd_t smbcontrol_t:process signal;
++allow smbcontrol_t nmbd_t:process { signal signull };
++
++allow smbcontrol_t winbind_t:process { signal signull };
++allow winbind_t smbcontrol_t:process signal;
++
++allow smbcontrol_t nmbd_var_run_t:file { read lock };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-08-07 09:42:35.000000000 -0400
@@ -8430,8 +8950,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.6.4/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-08-07 09:42:35.000000000 -0400
-@@ -709,3 +709,42 @@
++++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-09-11 09:11:48.000000000 -0400
+@@ -521,6 +521,7 @@
+ 
+ 	optional_policy(`
+ 		kerberos_use($1_t)
++		kerberos_manage_host_rcache($1_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -709,3 +710,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -8510,6 +9038,83 @@
  ifdef(`TODO',`
  tunable_policy(`ssh_sysadm_login',`
  	# Relabel and access ptys created by sshd
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-2.6.4/policy/modules/services/telnet.te
+--- nsaserefpolicy/policy/modules/services/telnet.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/telnet.te	2007-09-11 09:05:30.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(telnet,1.4.0)
++policy_module(telnet,1.5.0)
+ 
+ ########################################
+ #
+@@ -32,7 +32,6 @@
+ allow telnetd_t self:udp_socket create_socket_perms;
+ # for identd; cjp: this should probably only be inetd_child rules?
+ allow telnetd_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
+-allow telnetd_t self:netlink_route_socket r_netlink_socket_perms;
+ allow telnetd_t self:capability { setuid setgid };
+ 
+ allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr };
+@@ -49,7 +48,8 @@
+ kernel_read_system_state(telnetd_t)
+ kernel_read_network_state(telnetd_t)
+ 
+-corenet_non_ipsec_sendrecv(telnetd_t)
++corenet_all_recvfrom_unlabeled(telnetd_t)
++corenet_all_recvfrom_netlabel(telnetd_t)
+ corenet_tcp_sendrecv_all_if(telnetd_t)
+ corenet_udp_sendrecv_all_if(telnetd_t)
+ corenet_tcp_sendrecv_all_nodes(telnetd_t)
+@@ -61,10 +61,12 @@
+ 
+ fs_getattr_xattr_fs(telnetd_t)
+ 
++auth_use_nsswitch(telnetd_t)
+ auth_rw_login_records(telnetd_t)
+ 
+ corecmd_search_bin(telnetd_t)
+ 
++files_read_usr_files(telnetd_t)
+ files_read_etc_files(telnetd_t)
+ files_read_etc_runtime_files(telnetd_t)
+ # for identd; cjp: this should probably only be inetd_child rules?
+@@ -79,9 +81,7 @@
+ 
+ miscfiles_read_localization(telnetd_t)
+ 
+-seutil_dontaudit_search_config(telnetd_t)
+-
+-sysnet_read_config(telnetd_t)
++seutil_read_config(telnetd_t)
+ 
+ remotelogin_domtrans(telnetd_t)
+ 
+@@ -89,17 +89,16 @@
+ optional_policy(`
+ 	kerberos_use(telnetd_t)
+ 	kerberos_read_keytab(telnetd_t)
++	kerberos_manage_host_rcache(telnetd_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(telnetd_t)
++tunable_policy(`use_nfs_home_dirs',`
++	fs_manage_nfs_dirs(telnetd_t)
++	fs_manage_nfs_files(telnetd_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(telnetd_t)
++tunable_policy(`use_samba_home_dirs',`
++	fs_manage_cifs_dirs(telnetd_t)
++	fs_manage_cifs_files(telnetd_t)
+ ')
+ 
+-ifdef(`TODO',`
+-# Allow krb5 telnetd to use fork and open /dev/tty for use
+-allow telnetd_t userpty_type:chr_file setattr;
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.6.4/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/tftp.te	2007-08-22 08:28:44.000000000 -0400
@@ -8574,6 +9179,25 @@
 +corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t)
 +
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.6.4/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/xfs.te	2007-09-11 08:17:28.000000000 -0400
+@@ -37,6 +37,15 @@
+ kernel_read_kernel_sysctls(xfs_t)
+ kernel_read_system_state(xfs_t)
+ 
++corenet_all_recvfrom_unlabeled(xfs_t)
++corenet_all_recvfrom_netlabel(xfs_t)
++corenet_tcp_sendrecv_generic_if(xfs_t)
++corenet_tcp_sendrecv_all_nodes(xfs_t)
++corenet_tcp_sendrecv_all_ports(xfs_t)
++corenet_tcp_bind_all_nodes(xfs_t)
++corenet_tcp_bind_xfs_port(xfs_t)
++corenet_sendrecv_xfs_client_packets(xfs_t)
++
+ corecmd_list_bin(xfs_t)
+ 
+ dev_read_sysfs(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.6.4/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/xserver.if	2007-08-07 09:42:35.000000000 -0400
@@ -10831,7 +11455,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-09-10 14:35:42.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.5.0)
@@ -11028,7 +11652,15 @@
  
  dev_read_urand(semanage_t)
  
-@@ -595,6 +611,8 @@
+@@ -581,6 +597,7 @@
+ files_read_etc_runtime_files(semanage_t)
+ files_read_usr_files(semanage_t)
+ files_list_pids(semanage_t)
++fs_list_inotifyfs(semanage_t)
+ 
+ mls_file_write_down(semanage_t)
+ mls_rangetrans_target(semanage_t)
+@@ -595,6 +612,8 @@
  
  # Running genhomedircon requires this for finding all users
  auth_use_nsswitch(semanage_t)
@@ -11037,7 +11669,7 @@
  
  libs_use_ld_so(semanage_t)
  libs_use_shared_libs(semanage_t)
-@@ -621,6 +639,15 @@
+@@ -621,6 +640,15 @@
  
  userdom_search_sysadm_home_dirs(semanage_t)
  
@@ -11053,7 +11685,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -700,6 +727,8 @@
+@@ -700,6 +728,8 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`



From fedora-extras-commits at redhat.com  Tue Sep 11 14:11:26 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:11:26 -0400
Subject: rpms/krb5/devel krb5-1.6.1-pam.patch,1.4,1.5
Message-ID: <200709111411.l8BEBQok003411@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3380

Modified Files:
	krb5-1.6.1-pam.patch 
Log Message:
- ftpd: also do PAM management for clients who use strong authentication


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krb5-1.6.1-pam.patch	17 Jul 2007 21:02:32 -0000	1.4
+++ krb5-1.6.1-pam.patch	11 Sep 2007 14:11:22 -0000	1.5
@@ -825,7 +825,24 @@
  #include <grp.h> 
  #include <setjmp.h>
  #ifndef POSIX_SETJMP
-@@ -903,6 +906,10 @@ end_login()
+@@ -803,6 +807,16 @@
+ 		}
+ #endif /* KRB5_KRB4_COMPAT */
+ 
++#ifdef USE_PAM
++		if (appl_pam_enabled(kcontext, "ftpd")) {
++			if (appl_pam_acct_mgmt(FTP_PAM_SERVICE, 0,
++					       pw->pw_name, "",
++					       FTP_PAM_SERVICE) != 0) {
++				reply(530, "Login incorrect.");
++				return;
++			}
++		}
++#endif
+ 		if (!authorized && authlevel == AUTHLEVEL_AUTHORIZE) {
+ 			strncat(buf, "; Access denied.",
+ 				sizeof(buf) - strlen(buf) - 1);
+@@ -903,6 +916,10 @@ end_login()
  	(void) krb5_seteuid((uid_t)0);
  	if (logged_in)
  		pty_logwtmp(ttyline, "", "");
@@ -836,7 +853,7 @@
  	if (have_creds) {
  #ifdef GSSAPI
  		krb5_cc_destroy(kcontext, ccache);
-@@ -1073,9 +1080,17 @@ pass(passwd)
+@@ -1073,9 +1090,17 @@ pass(passwd)
  		 *   kpass fails and the user has no local password
  		 *   kpass fails and the provided password doesn't match pw
  		 */
@@ -857,7 +874,7 @@
  			pw = NULL;
  			sleep(5);
  			if (++login_attempts >= 3) {
-@@ -1092,6 +1107,17 @@ pass(passwd)
+@@ -1092,6 +1117,17 @@ pass(passwd)
  	}
  	login_attempts = 0;		/* this time successful */
  
@@ -875,7 +892,7 @@
  	login(passwd, 0);
  	return;
  }
-@@ -1110,6 +1136,18 @@ login(passwd, logincode)
+@@ -1110,6 +1146,18 @@ login(passwd, logincode)
  		chown(tkt_string(), pw->pw_uid, pw->pw_gid);
  #endif
  	}
@@ -894,7 +911,7 @@
  
  	(void) krb5_setegid((gid_t)pw->pw_gid);
  	(void) initgroups(pw->pw_name, pw->pw_gid);
-@@ -2125,6 +2163,10 @@ dologout(status)
+@@ -2125,6 +2173,10 @@ dologout(status)
  		dest_tkt();
  #endif
  	}



From fedora-extras-commits at redhat.com  Tue Sep 11 14:12:06 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:12:06 -0400
Subject: rpms/krb5/devel krb5-1.6.1-selinux-label.patch,1.2,1.3
Message-ID: <200709111412.l8BEC69I003545@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3423

Modified Files:
	krb5-1.6.1-selinux-label.patch 
Log Message:
- also label kadmind log files and files created by the db2 plugin


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- krb5-1.6.1-selinux-label.patch	25 Aug 2007 04:31:34 -0000	1.2
+++ krb5-1.6.1-selinux-label.patch	11 Sep 2007 14:12:03 -0000	1.3
@@ -417,16 +417,16 @@
  #include "krb.h"
  #include "krb4int.h"
  #include <stdio.h>
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-08-24 23:38:39.000000000 -0400
-@@ -58,6 +58,7 @@
- #include <string.h>
- #include <unistd.h>
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2000-07-02 23:43:42.000000000 -0400
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-09-06 12:36:18.000000000 -0400
+@@ -60,6 +60,7 @@
  
-+#include "k5-label.h"
  #include "db-int.h"
  #include "btree.h"
++#include "k5-label.h"
  
+ #ifdef DEBUG
+ #undef	MINPSIZE
 --- krb5-1.6.1/src/plugins/kdb/db2/libdb2/configure.in	2007-08-25 03:19:00.000000000 -0400
 +++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/configure.in	2007-08-24 23:38:41.000000000 -0400
 @@ -89,6 +89,8 @@
@@ -438,16 +438,16 @@
  KRB5_BUILD_LIBRARY
  KRB5_BUILD_LIBOBJS
  KRB5_BUILD_PROGRAM
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-08-24 23:38:39.000000000 -0400
-@@ -51,6 +51,7 @@
- #include <assert.h>
- #endif
- 
-+#include "k5-label.h"
- #include "db-int.h"
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2006-06-14 22:35:44.000000000 -0400
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-09-06 12:37:15.000000000 -0400
+@@ -55,6 +55,7 @@
  #include "hash.h"
  #include "page.h"
+ #include "extern.h"
++#include "k5-label.h"
+ 
+ static int32_t flush_meta __P((HTAB *));
+ static int32_t hash_access __P((HTAB *, ACTION, const DBT *, DBT *));
 --- krb5-1.6.1/src/plugins/kdb/db2/libdb2/include/config.h.in	2007-04-20 19:39:29.000000000 -0400
 +++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/include/config.h.in	2007-08-24 23:44:21.000000000 -0400
 @@ -39,6 +39,9 @@
@@ -484,16 +484,16 @@
  /* Define to empty if `const' does not conform to ANSI C. */
  #undef const
  
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-08-24 23:38:39.000000000 -0400
-@@ -51,6 +51,7 @@
- #include <stdio.h>
- #include <unistd.h>
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	1998-01-21 11:33:31.000000000 -0500
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-09-06 12:36:52.000000000 -0400
+@@ -53,6 +53,7 @@
  
-+#include "k5-label.h"
  #include "db-int.h"
  #include "recno.h"
++#include "k5-label.h"
  
+ DB *
+ __rec_open(fname, flags, mode, openinfo, dflags)
 --- krb5-1.6.1/src/plugins/preauth/cksum_body/config.h.in	2007-04-20 19:39:45.000000000 -0400
 +++ krb5-1.6.1/src/plugins/preauth/cksum_body/config.h.in	2007-08-24 23:46:17.000000000 -0400
 @@ -39,6 +39,9 @@



From fedora-extras-commits at redhat.com  Tue Sep 11 14:12:30 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:12:30 -0400
Subject: rpms/pm-utils/F-7 .cvsignore, 1.26, 1.27 pm-utils.spec, 1.65,
	1.66 sources, 1.32, 1.33 pm-utils-0.99.3-selinux.patch, 1.1,
	NONE radeontool-1.5.diff, 1.1,
	NONE radeontool-fix-option-handling.diff, 1.2,
	NONE radeontool-get-rid-of-lspci.diff, 1.1,
	NONE vbetool-0.3-fix-gcc4bug.patch, 1.3, NONE vbetool-libz.patch,
	1.2, NONE
Message-ID: <200709111412.l8BECUIX003571@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466

Modified Files:
	.cvsignore pm-utils.spec sources 
Removed Files:
	pm-utils-0.99.3-selinux.patch radeontool-1.5.diff 
	radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff vbetool-0.3-fix-gcc4bug.patch 
	vbetool-libz.patch 
Log Message:
sync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Mar 2007 14:09:36 -0000	1.26
+++ .cvsignore	11 Sep 2007 14:11:56 -0000	1.27
@@ -1,3 +1 @@
-radeontool-1.5.tar.gz
-vbetool_0.7-1.tar.gz
-pm-utils-0.99.3.tar.gz
+pm-utils-0.99.4.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pm-utils.spec	3 Jul 2007 22:44:14 -0000	1.65
+++ pm-utils.spec	11 Sep 2007 14:11:56 -0000	1.66
@@ -1,11 +1,16 @@
 Name: pm-utils
-Summary: Power management utilities and scripts for Fedora Core
-License: GPL
-Version: 0.99.3
-Release: 9%{?dist}
+Summary: Power management utilities and scripts for Fedora
+License: GPLv2
+Version: 0.99.4
+Release: 2%{?dist}
 Group: System Environment/Base
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
+URL: http://pm-utils.freedesktop.org
+ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
+Requires: radeontool
+%ifnarch ppc ppc64
+Requires: vbetool
+%endif
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -19,106 +24,33 @@
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
-%define vbever 0.7
-Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
-Source20: radeontool-1.5.tar.gz
-%ifarch i386 x86_64
-Obsoletes: vbetool
-Provides: vbetool
-Obsoletes: radeontool
-Provides: radeontool
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90, zlib-devel
+BuildRequires: hal-devel pkgconfig
+BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
-Patch2: pm-utils-0.99.3-vbe-redirect.patch
-Patch3: pm-utils-0.99.3-cfg.patch
-Patch4: pm-utils-0.99.3-selinux.patch
-
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-libz.patch
-
-Patch20: radeontool-1.5.diff
-Patch21: radeontool-fix-option-handling.diff
-Patch22: radeontool-get-rid-of-lspci.diff
+Patch2: pm-utils-0.99.3-cfg.patch
+
 
 %description
-The pm-utils package contains utilities and scripts for Fedora Core
-useful for power management.
+The pm-utils package contains utilities and scripts useful for tasks related
+to power management.
 
 %prep
-%setup -q -a 10 -a 20
+%setup -q 
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
-%patch2 -p1 -b .vbe-redirect
-%patch3 -p1 -b .cfg
-%patch4 -p1 -b .selinux
-
-%patch10 -p0 -b .gcc4
-%patch11 -p0 -b .zlib
-
-cd radeontool-1.5
-%patch20 -p0 -b .volatile
-%patch21 -p0 -b .options
-%patch22 -p0 -b .no-lspci
-cd ..
+%patch2 -p1 -b .cfg
 
-%build
-cd vbetool-%{vbever}
-%ifarch i386
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
 
-%ifarch i386 x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-./configure --host=%{_host} --build=%{_build} \
-	--target=%{_target_platform} \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_exec_prefix}/lib \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}
+%build
+%configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch i386 x86_64
-cd vbetool-%{vbever}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-cd radeontool-1.5
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}
-cd ..
-%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -161,32 +93,65 @@
 
 %files
 %defattr(-,root,root)
-%{_sysconfdir}/pm/*
+%{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
-%{_exec_prefix}/lib/pm-utils/bin/*
+%dir %{_exec_prefix}/lib/pm-utils/
+%{_exec_prefix}/lib/pm-utils/bin/
 %{_exec_prefix}/lib/pm-utils/defaults
 %{_exec_prefix}/lib/pm-utils/functions
-%{_exec_prefix}/lib/pm-utils/power.d/*
-%{_exec_prefix}/lib/pm-utils/sleep.d/*
+%{_exec_prefix}/lib/pm-utils/power.d/
+%{_exec_prefix}/lib/pm-utils/sleep.d/
 %{_bindir}/*
-%{_sbindir}/*
+%{_sbindir}/pm-hibernate
+%{_sbindir}/pm-powersave
+%{_sbindir}/pm-suspend
+%{_sbindir}/pm-suspend-hybrid
+
 %{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Tue Jul 03 2007 Peter Jones <pjones at redhat.com> - 0.99.3-9
-- Fix a config file bug
-- Rebuild...
+* Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
+- Require vbetool not on ppc and ppc64
+
+* Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
+- Merge new upstream
+- remove pm/power.d/laptop-tools
+- add --quirk-reset-brightness (needed for the Fujitsu Lifebook S7110)
+
+* Sat Sep 08 2007 Till Maas <opensource till name> - 0.99.3-12
+- Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
+- remove (C|CXX|F)FLAGS definitions, they are already in %%configure
+- remove Core in Summary tag
+- add URL for pm-utils
+- add %%{?arm} to ExclusiveArch (#245463)
+- remove vbetool and require it (it is a separate package now)
+- remove radeontool and require it (it is a separate package now)
+- Update License Tag
+- cleanup buildrequires
+- clear %%setup
+
+* Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
+- Install (not just build) vbetool and radeontool on x86_64 too
+- Explicitly list files under %%_sbindir, so they don't drop away again
+- Light spec cleanups
+
+* Thu Aug 16 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-10
+- License verification and update
+
+* Wed Jul 18 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-9
+- Fixed description to be distribution independant (#247366)
 
 * Thu Jun 07 2007 Peter Jones <pjones at redhat.com> - 0.99.3-8
 - Bump release and rebuild for newer buildsystem code
 
-* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6.1
-- Bump release and rebuild due to missing binaries
+* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-7
+- Bump release and rebuild
 
-* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 0.99.3-6
-- Don't remove the logfile before creating it.
+* Tue May 29 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6
+- Fixed missing builds for vbetool and radeontool for some archs (#241469)
+- Fixed typo in functions where wrong variable was used (#241633)
 
 * Wed May 16 2007 Peter Jones <pjones at redhat.com> - 0.99.3-5
 - ... and create the directory the logfile goes in.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2007 14:20:54 -0000	1.32
+++ sources	11 Sep 2007 14:11:56 -0000	1.33
@@ -1,3 +1 @@
-8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
-0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz
+a88503876f63c96b55784be91b6458d2  pm-utils-0.99.4.tar.gz


--- pm-utils-0.99.3-selinux.patch DELETED ---


--- radeontool-1.5.diff DELETED ---


--- radeontool-fix-option-handling.diff DELETED ---


--- radeontool-get-rid-of-lspci.diff DELETED ---


--- vbetool-0.3-fix-gcc4bug.patch DELETED ---


--- vbetool-libz.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 14:13:11 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:13:11 -0400
Subject: rpms/krb5/devel krb5.spec,1.134,1.135
Message-ID: <200709111413.l8BEDBm0003618@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3579

Modified Files:
	krb5.spec 
Log Message:
- also perform PAM session and credential management when ftpd accepts a
  client using strong authentication, missed earlier
- also label kadmind log files and files created by the db2 plugin



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- krb5.spec	6 Sep 2007 20:09:14 -0000	1.134
+++ krb5.spec	11 Sep 2007 14:12:38 -0000	1.135
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 6%{?dist}
+Release: 7%{?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
@@ -208,6 +208,11 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-7
+- also perform PAM session and credential management when ftpd accepts a
+  client using strong authentication, missed earlier
+- also label kadmind log files and files created by the db2 plugin
+
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
 - incorporate updated fix for CVE-2007-3999
 - fix incorrect call to "test" in the kadmin init script



From fedora-extras-commits at redhat.com  Tue Sep 11 14:14:18 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 10:14:18 -0400
Subject: rpms/ode/devel .cvsignore,1.4,1.5 ode.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200709111414.l8BEEI1Q003735@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3670

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
- New upstream release 0.8.1-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Feb 2007 16:09:47 -0000	1.4
+++ .cvsignore	11 Sep 2007 14:13:44 -0000	1.5
@@ -1 +1 @@
-ode-src-0.8.zip
+ode-src-0.8.1-rc1.zip


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ode.spec	15 Aug 2007 08:27:51 -0000	1.7
+++ ode.spec	11 Sep 2007 14:13:44 -0000	1.8
@@ -1,11 +1,13 @@
+%define prever rc1
+
 Name:           ode
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        0.1.%{prever}%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD or LGPLv2+
 URL:            http://www.ode.org
-Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}.zip
+Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}-%{prever}.zip
 Patch0:         ode-0.6-configure.patch
 Patch1:         ode-0.8-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{prever}
 %patch0 -p1 -z .configure
 %patch1 -p1 -z .install
 # sigh stop autoxxx from rerunning because of our patches above.
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
+- New upstream release 0.8.1-rc1
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Feb 2007 16:09:47 -0000	1.4
+++ sources	11 Sep 2007 14:13:44 -0000	1.5
@@ -1 +1 @@
-fb7462ba0af2fbc230cb1b3f79e0acbb  ode-src-0.8.zip
+4c8de285f55460ae3a2385fb607270e7  ode-src-0.8.1-rc1.zip



From fedora-extras-commits at redhat.com  Tue Sep 11 14:15:34 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:15:34 -0400
Subject: rpms/vbetool/F-7 vbetool-0.3-fix-gcc4bug.patch, NONE,
	1.1 vbetool-libz.patch, NONE, 1.1 vbetool.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709111415.l8BEFY8U003914@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3862

Modified Files:
	sources 
Added Files:
	vbetool-0.3-fix-gcc4bug.patch vbetool-libz.patch vbetool.spec 
Log Message:
sync with devel


vbetool-0.3-fix-gcc4bug.patch:

--- NEW FILE vbetool-0.3-fix-gcc4bug.patch ---
--- vbetool-0.7/vbetool.c.gcc4	2006-07-25 21:27:21.000000000 -0400
+++ vbetool-0.7/vbetool.c	2007-02-20 13:29:22.000000000 -0500
@@ -345,9 +345,10 @@
 {
 	int size;
 	char *buffer = __save_state(&size);
+	ssize_t num_written;
 
 	if (buffer)
-		write(1, buffer, size);	/* FIXME: should retry on short write); */
+		num_written = write(1, buffer, size);	/* FIXME: should retry on short write); */
 }
 
 int do_blank(int state)

vbetool-libz.patch:

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
 SUBDIRS = x86emu
 @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
 @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
+ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_FALSE at x86lib = ""
 man_MANS = vbetool.1
 vbetool_SOURCES = vbetool.c $(x86)


--- NEW FILE vbetool.spec ---
Name:           vbetool
Version:        0.7
Release:        2%{?dist}
Summary:        Run real-mode video BIOS code to alter hardware state

Group:          System Environment/Base
License:        GPLv2
URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
Patch10:        vbetool-0.3-fix-gcc4bug.patch
Patch11:        vbetool-libz.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel pciutils-devel
# does not build on ppc and ppc64
ExcludeArch:    ppc ppc64
# vbetool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch.


%prep
%setup -q
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .zlib


%build
%ifarch x86_64
%configure --with-x86emu
%else
%configure
%endif
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 COPYING
%{_sbindir}/vbetool
%{_mandir}/man1/vbetool.1.gz


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> 0.7-2
- ExcludeArch: ppc and ppc64 (does not build there)
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 0.7-1
- initial release for Fedora with patches from the pm-utils package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:33:51 -0000	1.1
+++ sources	11 Sep 2007 14:15:00 -0000	1.2
@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 14:19:39 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:19:39 -0400
Subject: rpms/radeontool/F-7 radeontool-1.5.diff, NONE,
	1.1 radeontool-fix-option-handling.diff, NONE,
	1.1 radeontool-get-rid-of-lspci.diff, NONE, 1.1 radeontool.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709111419.l8BEJdmA004163@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/radeontool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4093

Modified Files:
	sources 
Added Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff radeontool.spec 
Log Message:
sync with devel


radeontool-1.5.diff:

--- NEW FILE radeontool-1.5.diff ---
--- radeontool.c
+++ radeontool.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <asm/page.h>
 
 #include "radeon_reg.h"
 
@@ -30,7 +29,7 @@
 
 /* *radeon_cntl_mem is mapped to the actual device's memory mapped control area. */
 /* Not the address but what it points to is volatile. */
-unsigned char * volatile radeon_cntl_mem;
+volatile unsigned char * radeon_cntl_mem;
 
 static void fatal(char *why)
 {
@@ -47,7 +46,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    value = *(unsigned long * volatile)(radeon_cntl_mem+offset);  
+    value = *(volatile unsigned long *)(radeon_cntl_mem+offset);  
     if(debug) 
         printf("%08lx\n",value);
     return value;
@@ -60,7 +59,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    *(unsigned long * volatile)(radeon_cntl_mem+offset) = value;  
+    *(volatile unsigned long *)(radeon_cntl_mem+offset) = value;  
 }
 
 static void usage(void)
@@ -83,10 +82,10 @@
 /* with /dev/mem, then I could write this whole program in perl, */
 /* but sadly this is only the size of physical RAM.  If you */
 /* want to be truely bad and poke into device memory you have to mmap() */
-static unsigned char * map_devince_memory(unsigned int base,unsigned int length) 
+static volatile unsigned char * map_device_memory(unsigned int base,unsigned int length) 
 {
     int mem_fd;
-    unsigned char *device_mem;
+    volatile unsigned char *device_mem;
 
     /* open /dev/mem */
     if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
@@ -94,12 +93,12 @@
     }
 
     /* mmap graphics memory */
-    if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
+    if ((device_mem = malloc(length + (getpagesize()-1))) == NULL) {
         fatal("allocation error \n");
     }
-    if ((unsigned long)device_mem % PAGE_SIZE)
-        device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
-    device_mem = (unsigned char *)mmap(
+    if ((unsigned long)device_mem % getpagesize())
+        device_mem += getpagesize() - ((unsigned long)device_mem % getpagesize());
+    device_mem = (volatile unsigned char *)mmap(
         (caddr_t)device_mem, 
         length,
         PROT_READ|PROT_WRITE,
@@ -107,9 +106,9 @@
         mem_fd, 
         base
     );
-    if ((long)device_mem < 0) {
+    if (device_mem == (volatile unsigned char *)-1) {
         if(debug)
-            fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+            fprintf(stderr,"mmap returned %d\n",(int)(long)device_mem);
         fatal("mmap error \n");
     }
     return device_mem;
@@ -316,7 +315,7 @@
     }
     if(debug)
         printf("Radeon found. Base control address is %x.\n",base);
-    radeon_cntl_mem = map_devince_memory(base,0x2000);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
 }
 
 int main(int argc,char *argv[]) 

radeontool-fix-option-handling.diff:

--- NEW FILE radeontool-fix-option-handling.diff ---
--- radeontool.c.options	2007-02-20 14:48:20.000000000 -0500
+++ radeontool.c	2007-02-20 14:53:07.000000000 -0500
@@ -320,18 +320,21 @@
 
 int main(int argc,char *argv[]) 
 {
+    int found_other = 0;
+    while (argc > 1 && !found_other) {
+        if(strcmp(argv[1],"--debug") == 0) {
+            debug=1;
+            argv++; argc--;
+        } else if(strncmp(argv[1],"--skip=",7) == 0) {
+            skip=atoi(argv[1]+7);
+            argv++; argc--;
+        } else {
+            found_other = 1;
+        }
+    }
     if(argc == 1) {
-        map_radeon_cntl_mem();
 	usage();
     }
-    if(strcmp(argv[1],"--debug") == 0) {
-        debug=1;
-        argv++; argc--;
-    };
-    if(strcmp(argv[1],"--skip=") == 0) {
-        skip=atoi(argv[1]+7);
-        argv++; argc--;
-    };
     map_radeon_cntl_mem();
     if(argc == 2) {
         if(strcmp(argv[1],"regs") == 0) {

radeontool-get-rid-of-lspci.diff:

--- NEW FILE radeontool-get-rid-of-lspci.diff ---
--- radeontool.c	2006/02/22 11:07:50	1.3
+++ radeontool.c	2006/03/08 00:37:25
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <pci/pci.h>
 
 #include "radeon_reg.h"
 
@@ -231,7 +232,7 @@ void radeon_cmd_stretch(char *param)
     radeon_set(RADEON_FP_VERT_STRETCH,"RADEON_FP_VERT_STRETCH",fp_vert_stretch);
 }
 
-
+#if 0
 /* Here we fork() and exec() the lspci command to look for the Radeon hardware address. */
 static void map_radeon_cntl_mem(void)
 {
@@ -317,6 +318,62 @@ We need to look through it to find the s
         printf("Radeon found. Base control address is %x.\n",base);
     radeon_cntl_mem = map_device_memory(base,0x2000);
 }
+#else
+static u32
+conf2long(unsigned char *c, unsigned int p)
+{
+    return c[p] | (c[p+1] << 8) | (c[p+2] << 16) | (c[p+3] << 24);
+}
+
+static void map_radeon_cntl_mem(void)
+{
+    struct pci_access *pacc;
+    struct pci_dev *dev;
+    unsigned int class;
+    int i;
+    int base = -1;
+    unsigned char *config;
+
+    config = malloc(64);
+    if (!config)
+        fatal("malloc(64) failed\n");
+    pacc = pci_alloc();
+    pci_init(pacc);
+    pci_scan_bus(pacc);
+    for(dev=pacc->devices; dev; dev=dev->next) {            /* Iterate over all devices */
+        pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);/* Fill in header info we need */
+        class = pci_read_word(dev, PCI_CLASS_DEVICE);       /* Read config register directly */
+        if (dev->vendor_id == 0x1002 && class == 0x300) {   /* ATI && Graphics card */
+            if (debug)
+                printf("Found: %02x:%02x.%d vendor=%04x device=%04x class=%04x\n",
+                       dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id, class);
+            if (skip-- < 1) {
+                pci_read_block(dev, 0, config, 64);
+                for (i=0; i<6; i++){
+                    u32 flag = conf2long(config, PCI_BASE_ADDRESS_0 + 4*i);
+                    if (flag & PCI_BASE_ADDRESS_SPACE_IO)   /* I/O-Ports, not memory */
+                        continue;
+                    /* the original code parsed lspci for "emory" and "K", so it
+                     * has to be at least 1K and less than 1M
+                     */
+                    if (dev->size[i] >=1024 && dev->size[i] < 1024*1024) {
+                        base = dev->base_addr[i];
+                        goto found;
+                    }
+                }
+            }
+        }
+    }
+ found:
+    pci_cleanup(pacc);
+    free(config);
+    if (base == -1)
+        fatal("Radeon not found.\n");
+    if (debug)
+        printf("Radeon found. Base control address is %x.\n",base);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
+}
+#endif
 
 int main(int argc,char *argv[]) 
 {

--- Makefile.no-lspci	2007-02-20 14:56:57.000000000 -0500
+++ Makefile	2007-02-20 14:56:42.000000000 -0500
@@ -1,7 +1,7 @@
 
 
 radeontool: radeontool.c
-	gcc -Wall -O2 radeontool.c -o radeontool
+	gcc -Wall -O2 radeontool.c -o radeontool -lpci
 
 
 



--- NEW FILE radeontool.spec ---
Name:           radeontool
Version:        1.5
Release:        2%{?dist}
Summary:        Backlight and video output configuration tool for radeon cards

Group:          System Environment/Base
License:        zlib
URL:            http://fdd.com/software/radeon/
Source0:        http://fdd.com/software/radeon/radeontool-%{version}.tar.gz
Patch20:        radeontool-1.5.diff
Patch21:        radeontool-fix-option-handling.diff
Patch22:        radeontool-get-rid-of-lspci.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pciutils-devel zlib-devel
# radeontool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
Radeontool may switch the backlight and external video output on and off.  Use
radeontool at your own risk, it may damage your hardware.


%prep
%setup -q
%patch20 -p0 -b .volatile
%patch21 -p0 -b .options
%patch22 -p0 -b .no-lspci


%build
gcc $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT

install -D -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}/radeontool


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES
%{_sbindir}/radeontool


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> - 1.5-2
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 1.5-1
- initial release for Fedora with patches from pm-utils package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:23:11 -0000	1.1
+++ sources	11 Sep 2007 14:19:06 -0000	1.2
@@ -0,0 +1 @@
+8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 14:26:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 11 Sep 2007 10:26:21 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch, NONE, 1.1 flac.spec,
	1.30, 1.31 flac-1.1.3-gnu-stack.patch, 1.1, NONE
Message-ID: <200709111426.l8BEQL5k004525@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453

Modified Files:
	flac.spec 
Added Files:
	flac-1.2.0-gnu-stack.patch 
Removed Files:
	flac-1.1.3-gnu-stack.patch 
Log Message:
* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
- Update GNU stack patch to cover all the NASM sources used


flac-1.2.0-gnu-stack.patch:

--- NEW FILE flac-1.2.0-gnu-stack.patch ---
diff -upr flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
@@ -563,4 +563,6 @@ cident FLAC__bitreader_read_rice_signed_
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+	section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -116,4 +116,6 @@ cident FLAC__cpu_info_extended_amd_asm_i
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -307,4 +307,6 @@ cident FLAC__fixed_compute_best_predicto
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -1506,4 +1506,6 @@ cident FLAC__lpc_restore_signal_asm_ia32
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
@@ -154,4 +154,6 @@ cident precompute_partition_info_sums_32
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+	section .note.GNU-stack noalloc
+%endif


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- flac.spec	10 Sep 2007 21:59:47 -0000	1.30
+++ flac.spec	11 Sep 2007 14:25:48 -0000	1.31
@@ -1,11 +1,11 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch1: flac-1.1.3-gnu-stack.patch
+Patch1: flac-1.2.0-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
@@ -72,7 +72,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
+* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
+- Update GNU stack patch to cover all the NASM sources used
+
+* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-1
 - Update for 1.20 and drop obsolete patches (#285161)
 
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1.1.4-5


--- flac-1.1.3-gnu-stack.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 14:26:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 10:26:40 -0400
Subject: rpms/librsvg2/devel filter-leak.patch, NONE, 1.1 stack-leak.patch, 
	NONE, 1.1 librsvg2.spec, 1.63, 1.64
Message-ID: <200709111426.l8BEQeBH004530@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494

Modified Files:
	librsvg2.spec 
Added Files:
	filter-leak.patch stack-leak.patch 
Log Message:
fix memory leaks


filter-leak.patch:

--- NEW FILE filter-leak.patch ---
diff -up librsvg-2.18.2/rsvg-filter.c.filter-leak librsvg-2.18.2/rsvg-filter.c
--- librsvg-2.18.2/rsvg-filter.c.filter-leak	2007-09-11 10:03:39.000000000 -0400
+++ librsvg-2.18.2/rsvg-filter.c	2007-09-11 10:04:24.000000000 -0400
@@ -703,7 +703,6 @@ rsvg_new_filter (void)
     filter->y = _rsvg_css_parse_length ("-10%");
     filter->width = _rsvg_css_parse_length ("120%");
     filter->height = _rsvg_css_parse_length ("120%");
-    filter->super.children = g_ptr_array_new ();
     filter->super.set_atts = rsvg_filter_set_args;
     return (RsvgNode *) filter;
 }
@@ -1702,7 +1701,6 @@ rsvg_new_filter_primitive_merge (void)
     filter->super.super.free = &rsvg_filter_primitive_merge_free;
 
     filter->super.super.set_atts = rsvg_filter_primitive_merge_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -2201,7 +2199,6 @@ rsvg_new_filter_primitive_component_tran
 
     filter->super.super.set_atts = rsvg_filter_primitive_component_transfer_set_atts;
 
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -4088,7 +4085,6 @@ rsvg_new_filter_primitive_diffuse_lighti
     filter->super.render = &rsvg_filter_primitive_diffuse_lighting_render;
     filter->super.super.free = &rsvg_filter_primitive_diffuse_lighting_free;
     filter->super.super.set_atts = rsvg_filter_primitive_diffuse_lighting_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -4267,7 +4263,6 @@ rsvg_new_filter_primitive_specular_light
     filter->super.render = &rsvg_filter_primitive_specular_lighting_render;
     filter->super.super.free = &rsvg_filter_primitive_specular_lighting_free;
     filter->super.super.set_atts = rsvg_filter_primitive_specular_lighting_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 

stack-leak.patch:

--- NEW FILE stack-leak.patch ---
diff -up librsvg-2.18.2/rsvg-cairo-draw.c.stack-leak librsvg-2.18.2/rsvg-cairo-draw.c
--- librsvg-2.18.2/rsvg-cairo-draw.c.stack-leak	2007-09-11 09:34:39.000000000 -0400
+++ librsvg-2.18.2/rsvg-cairo-draw.c	2007-09-11 09:35:03.000000000 -0400
@@ -981,7 +981,7 @@ rsvg_cairo_pop_render_stack (RsvgDrawing
         GdkPixbuf *pixbuf = render->pixbuf_stack->data;
         GdkPixbuf *bg = rsvg_compile_bg (ctx);
 
-        render->pixbuf_stack = g_list_remove_link (render->pixbuf_stack, render->pixbuf_stack);
+        render->pixbuf_stack = g_list_remove (render->pixbuf_stack, pixbuf);
 
 
         output = rsvg_filter_render (state->filter, pixbuf, bg, ctx, &render->bbox, "2103");


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- librsvg2.spec	4 Sep 2007 03:38:15 -0000	1.63
+++ librsvg2.spec	11 Sep 2007 14:26:07 -0000	1.64
@@ -12,11 +12,13 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 Source: 	http://download.gnome.org/sources/librsvg/2.18/librsvg-%{version}.tar.bz2
+Patch0:		stack-leak.patch
+Patch1:		filter-leak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	gtk2 >= %{gtk2_version}
 Requires:	libxml2 >= %{libxml2_version}
@@ -63,6 +65,8 @@
 
 %prep
 %setup -q -n librsvg-%{version}
+%patch0 -p1 -b .stack-leak
+%patch1 -p1 -b .filter-leak
 
 %build
 %configure --with-svgz \
@@ -118,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
+- Plug memory leaks
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 



From fedora-extras-commits at redhat.com  Tue Sep 11 14:33:56 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 11 Sep 2007 10:33:56 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch,1.1,1.2
Message-ID: <200709111433.l8BEXuCE004825@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4800

Modified Files:
	flac-1.2.0-gnu-stack.patch 
Log Message:
And the same patch in the right direction...


flac-1.2.0-gnu-stack.patch:

Index: flac-1.2.0-gnu-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac-1.2.0-gnu-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:25:48 -0000	1.1
+++ flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
@@ -1,55 +1,55 @@
-diff -upr flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
-@@ -563,4 +563,6 @@ cident FLAC__bitreader_read_rice_signed_
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
+@@ -563,6 +563,4 @@ cident FLAC__bitreader_read_rice_signed_
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -116,4 +116,6 @@ cident FLAC__cpu_info_extended_amd_asm_i
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
+@@ -116,6 +116,4 @@ cident FLAC__cpu_info_extended_amd_asm_i
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -307,4 +307,6 @@ cident FLAC__fixed_compute_best_predicto
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
+@@ -307,6 +307,4 @@ cident FLAC__fixed_compute_best_predicto
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -1506,4 +1506,6 @@ cident FLAC__lpc_restore_signal_asm_ia32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
+@@ -1506,6 +1506,4 @@ cident FLAC__lpc_restore_signal_asm_ia32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
-@@ -154,4 +154,6 @@ cident precompute_partition_info_sums_32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
+@@ -154,6 +154,4 @@ cident precompute_partition_info_sums_32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1



From fedora-extras-commits at redhat.com  Tue Sep 11 14:35:23 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 11 Sep 2007 10:35:23 -0400
Subject: rpms/libpng10/devel .cvsignore, 1.5, 1.6 libpng10.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200709111435.l8BEZNt1004940@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	.cvsignore libpng10.spec sources 
Log Message:
update to 1.0.28


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Aug 2007 13:00:16 -0000	1.5
+++ .cvsignore	11 Sep 2007 14:34:50 -0000	1.6
@@ -1 +1 @@
-libpng-1.0.27.tar.bz2
+libpng-1.0.28.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libpng10.spec	20 Aug 2007 13:00:16 -0000	1.8
+++ libpng10.spec	11 Sep 2007 14:34:50 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.27
+Version:	1.0.28
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Tue Sep 11 2007 Paul Howarth <paul at city-fan.org> 1.0.28-1
+- update to 1.0.28
+
 * Mon Aug 20 2007 Paul Howarth <paul at city-fan.org> 1.0.27-1
 - update to 1.0.27
 - add new file ANNOUNCE, which lists changes since last release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Aug 2007 13:00:16 -0000	1.5
+++ sources	11 Sep 2007 14:34:50 -0000	1.6
@@ -1 +1 @@
-bd00ab16a9a5168b53747eb13d66ad57  libpng-1.0.27.tar.bz2
+ed06dd7c54594b41276df24926e29f04  libpng-1.0.28.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 14:47:35 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 10:47:35 -0400
Subject: rpms/ksirk/F-7 ksirk.spec,1.1,1.2
Message-ID: <200709111447.l8BElZAg005324@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	ksirk.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
- Release increment for rebuild due to koji weirdness



Index: ksirk.spec
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/ksirk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksirk.spec	10 Sep 2007 07:50:24 -0000	1.1
+++ ksirk.spec	11 Sep 2007 14:47:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ksirk
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turnbased multiplayer board strategy game (conquer the world!)
 Group:          Amusements/Games
 License:        GPLv2
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
+- Release increment for rebuild due to koji weirdness
+
 * Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
 - Add missing gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:01:12 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Tue, 11 Sep 2007 11:01:12 -0400
Subject: rpms/samba/devel .cvsignore, 1.43, 1.44 filter-requires-samba.sh,
	1.5, 1.6 samba.spec, 1.133, 1.134 sources, 1.47,
	1.48 samba-3.0.25-imdap-basedn.patch, 1.1,
	NONE samba3-glibc-open.patch, 1.1,
	NONE samba3_idmap_ldap_memleak.patch, 1.1, NONE
Message-ID: <200709111501.l8BF1C5q011655@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5735

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec sources 
Removed Files:
	samba-3.0.25-imdap-basedn.patch samba3-glibc-open.patch 
	samba3_idmap_ldap_memleak.patch 
Log Message:

Security and Bugfix release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	21 Aug 2007 13:27:26 -0000	1.43
+++ .cvsignore	11 Sep 2007 15:00:39 -0000	1.44
@@ -1 +1 @@
-samba-3.0.25c.tar.gz
+samba-3.0.26a.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/filter-requires-samba.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filter-requires-samba.sh	14 Mar 2007 10:21:24 -0000	1.5
+++ filter-requires-samba.sh	11 Sep 2007 15:00:39 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8|smbldap_tools)'


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- samba.spec	24 Aug 2007 18:02:18 -0000	1.133
+++ samba.spec	11 Sep 2007 15:00:39 -0000	1.134
@@ -1,8 +1,8 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25c
-Release: 4%{?dist}
+Version: 3.0.26a
+Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -41,9 +41,6 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch210: samba-3.0.25-imdap-basedn.patch
-Patch211: samba3_idmap_ldap_memleak.patch
-Patch300: samba3-glibc-open.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -161,9 +158,6 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
-%patch210 -p1 -b .idmap_basedn
-%patch211 -p0 -b .idmap_ldap_memleak
-%patch300 -p0 -b .glibc_open
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -646,6 +640,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
+- upgrade to the latest upstream realease
+- includes security fixes released today in 3.0.26
+
 * Tue Aug 24 2007 Simo Sorce <ssorce at redhat.com> 3.0.25c-4.fc8
 - add fix reported upstream for heavy idmap_ldap memleak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	21 Aug 2007 13:27:26 -0000	1.47
+++ sources	11 Sep 2007 15:00:39 -0000	1.48
@@ -1 +1 @@
-87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz
+6511ff23d9b1d4858744778bba543c5d  samba-3.0.26a.tar.gz


--- samba-3.0.25-imdap-basedn.patch DELETED ---


--- samba3-glibc-open.patch DELETED ---


--- samba3_idmap_ldap_memleak.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 15:19:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 11:19:44 -0400
Subject: rpms/iproute/devel iproute.spec,1.69,1.70
Message-ID: <200709111519.l8BFJi6U012288@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260

Modified Files:
	iproute.spec 
Log Message:
Changes in spec file for package review.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- iproute.spec	31 Aug 2007 10:48:26 -0000	1.69
+++ iproute.spec	11 Sep 2007 15:19:12 -0000	1.70
@@ -17,7 +17,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires(pre): tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 BuildRequires: flex
-Obsoletes: shapecfg
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -46,7 +45,6 @@
 	$RPM_BUILD_ROOT/etc/iproute2 \
 	$RPM_BUILD_ROOT%{_libdir}/tc
 
-iconv -f latin1 -t utf8 < man/man8/* > $RPM_BUILD_ROOT/%{_mandir}/man8/*
 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}
 #install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc
@@ -73,7 +71,6 @@
 AVPKT=3000
 EOF
 
-
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:29:01 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Tue, 11 Sep 2007 11:29:01 -0400
Subject: rpms/netatalk/devel netatalk.spec,1.35,1.36
Message-ID: <200709111529.l8BFT1Dt013212@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164

Modified Files:
	netatalk.spec 
Log Message:
rebuild


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- netatalk.spec	29 Aug 2007 04:52:17 -0000	1.35
+++ netatalk.spec	11 Sep 2007 15:28:28 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -186,6 +186,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13
+- rebuild
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:32:52 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 11 Sep 2007 11:32:52 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.154, 1.155 mkinitrd.spec, 1.219, 
	1.220 sources, 1.197, 1.198
Message-ID: <200709111532.l8BFWqD8013540@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13508

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to .16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- .cvsignore	7 Sep 2007 18:05:09 -0000	1.154
+++ .cvsignore	11 Sep 2007 15:32:19 -0000	1.155
@@ -1 +1 @@
-mkinitrd-6.0.15.tar.bz2
+mkinitrd-6.0.16.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- mkinitrd.spec	7 Sep 2007 18:05:09 -0000	1.219
+++ mkinitrd.spec	11 Sep 2007 15:32:19 -0000	1.220
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.15
+Version: 6.0.16
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Fri Sep 11 2007 Peter Jones <pjones at redhat.com> - 6.0.16-1
+- Fix handling of CCISS one more time (bz#274201)
+
 * Fri Sep  7 2007 Peter Jones <pjones at redhat.com> - 6.0.15-1
 - Fix dmraid on x86_64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- sources	7 Sep 2007 18:05:09 -0000	1.197
+++ sources	11 Sep 2007 15:32:19 -0000	1.198
@@ -1 +1 @@
-65234e6e2b8ee9bdc436062995379feb  mkinitrd-6.0.15.tar.bz2
+55b1ec0cb506085eaca5612c09a5d61b  mkinitrd-6.0.16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 15:41:22 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 11 Sep 2007 08:41:22 -0700
Subject: [pkgdb] htmlview had groupAcl changed
Message-ID: <200709111541.l8BFfM8q021702@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) has set the commit acl on htmlview (Fedora devel) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Tue Sep 11 15:41:26 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 11 Sep 2007 08:41:26 -0700
Subject: [pkgdb] htmlview had groupAcl changed
Message-ID: <200709111541.l8BFfRvX030933@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has set the commit acl on htmlview (Fedora 7) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Tue Sep 11 15:49:32 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 11:49:32 -0400
Subject: rpms/devhelp/devel .cvsignore, 1.13, 1.14 devhelp.spec, 1.71,
	1.72 sources, 1.13, 1.14
Message-ID: <200709111549.l8BFnWkr014347@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14140

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

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 0.16-1.fc8
- Update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Jun 2007 19:38:43 -0000	1.13
+++ .cvsignore	11 Sep 2007 15:49:00 -0000	1.14
@@ -1 +1 @@
-devhelp-0.15.tar.bz2
+devhelp-0.16.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- devhelp.spec	8 Aug 2007 19:54:22 -0000	1.71
+++ devhelp.spec	11 Sep 2007 15:49:00 -0000	1.72
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.15
-Release: 4%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -128,6 +128,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 0.16-1.fc8
+- Update to 0.16
+
 * Wed Aug  8 2007 Christopher Aillon <caillon at redhat.com> - 0.15-4
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Jun 2007 19:38:43 -0000	1.13
+++ sources	11 Sep 2007 15:49:00 -0000	1.14
@@ -1 +1 @@
-e5ec0eebc5313c0d11c2371b2b1a9c16  devhelp-0.15.tar.bz2
+61d2300ab657ab63c65a49311916a6d2  devhelp-0.16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 15:49:45 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 11:49:45 -0400
Subject: rpms/suck/devel README.Fedora, 1.2, 1.3 suck-4.3.2-samples.patch,
	1.1, 1.2 suck.spec, 1.13, 1.14
Message-ID: <200709111549.l8BFnji5014359@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14281

Modified Files:
	README.Fedora suck-4.3.2-samples.patch suck.spec 
Log Message:
Allow use of alternative sites


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.Fedora	15 Aug 2007 15:53:21 -0000	1.2
+++ README.Fedora	11 Sep 2007 15:49:12 -0000	1.3
@@ -64,6 +64,9 @@
 
 NNTP_PASS	Password for NNTP authorization (if required)
 
+NNTP_POST       yes = Posting articles to remote host (Default)
+                no  = Don't post articles to remote host
+
 Creating Newsgroups
 
 Befor you can fetch news from the remote newsserver, you have to create
@@ -125,3 +128,27 @@
 If you have posted any article in a newsgroup, you can run getnews as
 described above to transfer the new articles to the newsserver of your 
 provider.
+
+Use of alternative sites
+
+If you want to use an alternative sites, you can create a configuration
+file for each site on the directory:
+
+/etc/news/suck.d/
+
+You can use a random file name for each configuration file.
+
+The content of this file is similar of the site file in
+
+/etc/sysconfig/suck/site
+
+if you want to exchange news to an alternative site, you can call
+getnews as:
+
+getnews <filename>
+
+in this case /etc/news/suck.d/<filename> will be used instead of
+/etc/sysconfig/suck/site.
+
+If you are using several site, please avoid posting articles received
+from one site to anonther site.
\ No newline at end of file

suck-4.3.2-samples.patch:

Index: suck-4.3.2-samples.patch
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck-4.3.2-samples.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- suck-4.3.2-samples.patch	8 Nov 2004 05:23:08 -0000	1.1
+++ suck-4.3.2-samples.patch	11 Sep 2007 15:49:12 -0000	1.2
@@ -1,30 +1,6 @@
---- suck-4.3.2/sample/get.news.generic.bak	1999-02-20 00:32:57.000000000 +0100
-+++ suck-4.3.2/sample/get.news.generic	2004-03-25 19:15:48.437267328 +0100
-@@ -9,16 +9,18 @@
- REMOTE_HOST=news.pixi.com
- LOCAL_HOST=localhost
- 
--SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
--NEWSDIR=/usr/lib/news			# base directory for news binaries 
--BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
-+NEWSDIR=/var/lib/news			# base directory for news binaries 
-+BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
- 
- SHLOCK=${NEWSDIR}/bin/shlock
- 
- TMPDIR=${BASEDIR}			# location for suck.* files
- MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
- 
--OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
-+SITE=pixie
-+
-+OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
- SCRIPT=${BASEDIR}/put.news		# my filter for rpost
- OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
- LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
---- suck-4.3.2/sample/get.news.inn.bak	1997-09-27 09:29:59.000000000 +0200
-+++ suck-4.3.2/sample/get.news.inn	2004-03-25 19:16:26.430491480 +0100
+diff -up suck-4.3.2/sample/get.news.inn.samp suck-4.3.2/sample/get.news.inn
+--- suck-4.3.2/sample/get.news.inn.samp	1997-09-27 09:29:59.000000000 +0200
++++ suck-4.3.2/sample/get.news.inn	2007-09-10 17:43:34.000000000 +0200
 @@ -5,12 +5,11 @@
  #NOTE: this script probably needs to be run by root.  Most systems will
  # not let a normal user run ctlinnd 
@@ -40,7 +16,7 @@
  
  CTLINND=${NEWSDIR}/bin/ctlinnd		# location of binary
  SHLOCK=${NEWSDIR}/bin/shlock		# location of binary
-@@ -18,12 +17,7 @@
+@@ -18,12 +17,7 @@ SHLOCK=${NEWSDIR}/bin/shlock		# location
  TMPDIR=${BASEDIR}			# location for suck.* files
  MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile messages when getting them
  
@@ -54,16 +30,25 @@
  OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
  LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
  NEWSGROUP=news				# which group owns the file in out.going, typically either news or uucp.
-@@ -32,6 +26,8 @@
+@@ -32,6 +26,17 @@ TESTHOST=testhost
  RPOST=rpost
  SUCK=suck
  
-+CONFIG=/etc/sysconfig/suck/site
++if [ $# -gt 1 ]; then
++  echo "Usage: getnew [<sitename>]"
++  exit
++fi
++
++if [ -n "$1" ]; then
++  CONFIG=/etc/news/suck.d/$1
++else
++  CONFIG=/etc/sysconfig/suck/site
++fi
 +
  # if we are already running, abort 
  
  trap 'rm -f ${LOCKFILE} ; echo "Aborting" ; exit 1' 1 2 3 15
-@@ -41,18 +37,46 @@
+@@ -41,18 +46,55 @@ if [ $? -ne 0 ]; then
  	exit
  fi
  
@@ -86,7 +71,16 @@
 +
 +if [ -n "$NNTP_USER" -a -n "$NNTP_PASS" ]; then
 +    AUTHINFO="-u -Q"
-+fi;
++fi
++
++if [ -z $POST ]; then
++  POST="yes"
++fi
++
++if [ $POST != "yes" -a $POST != "no" ]; then
++  echo "Invalid value for post"
++  exit
++fi
 +
 +export NNTP_USER
 +export NNTP_PASS
@@ -112,16 +106,22 @@
  	SUCK_STATUS=$?
  
  	if [ ${SUCK_STATUS} -eq 0 ]; then
-@@ -70,7 +94,7 @@
+@@ -68,9 +110,12 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 	fi
+ 
  	# now upload messages
- 	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
+-	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
  
 -		${TESTHOST} ${REMOTE_HOST} -s
++	if [ $POST = "yes" ]; then
++
++	    if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
++
 +		${TESTHOST} ${NNTP_HOST} -s
  
  		if [ $? -ne 0 ]; then
  			echo "Remote posting host not responding"
-@@ -93,12 +117,11 @@
+@@ -93,12 +138,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
  			fi
  
  			# outgoing messages to post
@@ -135,8 +135,22 @@
  			elif [ ${ERRLEV} -eq 1 ]; then
  				echo "Error posting a message"
  			elif [ ${ERRLEV} -eq 2 ]; then
---- suck-4.3.2/sample/put.news.sm.bak	2002-06-04 15:20:16.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm	2004-03-25 19:15:48.439267024 +0100
+@@ -115,8 +159,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 				chmod 664 ${OUTGOINGNEW}
+ 			fi
+ 		fi
+-	fi	
+ 	
++	    fi	
++	
++	fi
++
+ 	echo "You can hang up the modem now"
+ 
+ fi
+diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
+--- suck-4.3.2/sample/put.news.sm.samp	2002-06-04 15:20:16.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm	2007-09-10 17:40:27.000000000 +0200
 @@ -10,15 +10,18 @@
  # this to somewhere normal users can read or write.
  
@@ -159,20 +173,36 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
---- suck-4.3.2/sample/put.news.sm.pl.bak	2002-06-04 15:20:43.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm.pl	2004-03-25 19:15:48.439267024 +0100
-@@ -26,7 +26,7 @@
- 	# rpost will then handle the error
- 	# We do this since rpost can't differentiate between
- 	# a missing file or a script file
--	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
-+	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
- #	open IFP, "<${infile}" or die "Can't read ${infile}";
- 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
+--- suck-4.3.2/sample/get.news.generic.samp	1999-02-20 00:32:57.000000000 +0100
++++ suck-4.3.2/sample/get.news.generic	2007-09-10 17:40:27.000000000 +0200
+@@ -9,16 +9,18 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
+ 
+-SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
+-NEWSDIR=/usr/lib/news			# base directory for news binaries 
+-BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
++SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
++NEWSDIR=/var/lib/news			# base directory for news binaries 
++BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
+ 
+ SHLOCK=${NEWSDIR}/bin/shlock
  
---- suck-4.3.2/sample/put.news.bak	1998-10-04 21:32:26.000000000 +0200
-+++ suck-4.3.2/sample/put.news	2004-03-25 19:15:48.440266872 +0100
-@@ -14,14 +14,17 @@
+ TMPDIR=${BASEDIR}			# location for suck.* files
+ MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
+ 
+-OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
++SITE=pixie
++
++OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
+ SCRIPT=${BASEDIR}/put.news		# my filter for rpost
+ OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
+ LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
+diff -up suck-4.3.2/sample/put.news.samp suck-4.3.2/sample/put.news
+--- suck-4.3.2/sample/put.news.samp	1998-10-04 21:32:26.000000000 +0200
++++ suck-4.3.2/sample/put.news	2007-09-10 17:40:27.000000000 +0200
+@@ -14,14 +14,17 @@ if [ $# -ne 2 ]; then
  	exit -1
  fi
  
@@ -192,3 +222,15 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
+diff -up suck-4.3.2/sample/put.news.sm.pl.samp suck-4.3.2/sample/put.news.sm.pl
+--- suck-4.3.2/sample/put.news.sm.pl.samp	2002-06-04 15:20:43.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm.pl	2007-09-10 17:40:27.000000000 +0200
+@@ -26,7 +26,7 @@ sub perl_rpost {
+ 	# rpost will then handle the error
+ 	# We do this since rpost can't differentiate between
+ 	# a missing file or a script file
+-	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
++	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
+ #	open IFP, "<${infile}" or die "Can't read ${infile}";
+ 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+ 


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- suck.spec	15 Aug 2007 17:15:15 -0000	1.13
+++ suck.spec	11 Sep 2007 15:49:12 -0000	1.14
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -30,15 +30,15 @@
 %setup -q
 %patch -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .samp
 %patch3 -p1
 %patch4 -p1
 
 cp %{SOURCE3} .
 
 autoconf
-%configure --with-inn-lib=/usr/lib/news/lib \
-           --with-inn-include=/usr/include/inn
+%configure --with-inn-lib=%{_libdir}/news/lib \
+           --with-inn-include=%{_includedir}/inn
 
 %build
 make %{?_smp_mflags}
@@ -51,6 +51,7 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/news/suck.d
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
 cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
@@ -82,10 +83,14 @@
 %{_mandir}/man1/testhost.1*
 %{_mandir}/man1/lmove.1*
 
-%dir /etc/sysconfig/suck/
+%dir %{_sysconfdir}/sysconfig/suck/
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
+%dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Mon Sep 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-18
+- Allow usage of several sites
+
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:56:06 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 11:56:06 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.54,1.55
Message-ID: <200709111556.l8BFu6lN014666@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14645

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- policy-20070501.patch	11 Sep 2007 14:08:33 -0000	1.54
+++ policy-20070501.patch	11 Sep 2007 15:56:03 -0000	1.55
@@ -1713,8 +1713,53 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-08-07 09:42:35.000000000 -0400
-@@ -2061,3 +2061,61 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 11:35:53.000000000 -0400
+@@ -1449,6 +1449,44 @@
+ 
+ ########################################
+ ## <summary>
++##      Connect TCP sockets to rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##      The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`corenet_tcp_connect_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	allow $1 rpc_port_type:tcp_socket name_connect;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to connect TCP sockets
++##	all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`corenet_dontaudit_tcp_connect_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	dontaudit $1 rpc_port_type:tcp_socket name_connect;
++')
++
++
++########################################
++## <summary>
+ ##	Read and write the TUN/TAP virtual network device.
+ ## </summary>
+ ## <param name="domain">
+@@ -2061,3 +2099,61 @@
  
  	typeattribute $1 corenet_unconfined_type;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 11 16:07:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 12:07:51 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.53,
	1.54 selinux-policy.spec, 1.519, 1.520
Message-ID: <200709111607.l8BG7pxa022277@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22239

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
- Allow xfs to bind to port 7100


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- policy-20070703.patch	10 Sep 2007 22:02:06 -0000	1.53
+++ policy-20070703.patch	11 Sep 2007 16:07:47 -0000	1.54
@@ -370,7 +370,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.7/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-11 08:55:05.000000000 -0400
 @@ -71,6 +71,26 @@
  
  ########################################
@@ -403,6 +403,74 @@
  	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
  ')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.0.7/policy/modules/admin/amanda.te
+--- nsaserefpolicy/policy/modules/admin/amanda.te	2007-07-25 10:37:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.te	2007-09-11 08:54:52.000000000 -0400
+@@ -74,7 +74,6 @@
+ allow amanda_t self:unix_dgram_socket create_socket_perms;
+ allow amanda_t self:tcp_socket create_stream_socket_perms;
+ allow amanda_t self:udp_socket create_socket_perms;
+-allow amanda_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # access to amanda_amandates_t
+ allow amanda_t amanda_amandates_t:file { getattr lock read write };
+@@ -108,6 +107,8 @@
+ manage_dirs_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_t, amanda_tmp_t, { file dir })
+ 
++auth_use_nsswitch(amanda_t)
++
+ kernel_read_system_state(amanda_t)
+ kernel_read_kernel_sysctls(amanda_t)
+ kernel_dontaudit_getattr_unlabeled_files(amanda_t)
+@@ -154,8 +155,6 @@
+ libs_use_ld_so(amanda_t)
+ libs_use_shared_libs(amanda_t)
+ 
+-sysnet_read_config(amanda_t)
+-
+ optional_policy(`
+ 	auth_read_shadow(amanda_t)
+ ')
+@@ -164,14 +163,6 @@
+ 	logging_send_syslog_msg(amanda_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(amanda_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_t)
+-')
+-
+ ########################################
+ #
+ # Amanda recover local policy
+@@ -201,6 +192,8 @@
+ manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
+ 
++auth_use_nsswitch(amanda_recover_t)
++
+ kernel_read_system_state(amanda_recover_t)
+ kernel_read_kernel_sysctls(amanda_recover_t)
+ 
+@@ -237,14 +230,4 @@
+ 
+ miscfiles_read_localization(amanda_recover_t)
+ 
+-sysnet_read_config(amanda_recover_t)
+-
+ userdom_search_sysadm_home_content_dirs(amanda_recover_t)
+-
+-optional_policy(`
+-	nis_use_ypbind(amanda_recover_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_recover_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-09-06 15:43:06.000000000 -0400
@@ -2505,7 +2573,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-07 15:02:19.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-11 09:22:25.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2556,7 +2624,7 @@
  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
  network_port(squid, udp,3401,s0, tcp,3401,s0, udp,4827,s0, tcp,4827,s0) # snmp and htcp
-@@ -160,13 +166,18 @@
+@@ -160,13 +166,19 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
@@ -2564,6 +2632,7 @@
 +network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
 -network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
++network_port(xfs, tcp,7100,s0)
 +network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0, tcp,6020,s0)
  network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
  network_port(zope, tcp,8021,s0)
@@ -2745,7 +2814,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-10 16:27:16.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 08:45:38.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -3004,7 +3073,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.7/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-09-11 10:46:12.000000000 -0400
 @@ -55,6 +55,8 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
@@ -3014,9 +3083,17 @@
  
  #
  # etc_runtime_t is the type of various
+@@ -188,6 +190,7 @@
+ fs_associate(file_type)
+ fs_associate_noxattr(file_type)
+ fs_associate_tmpfs(file_type)
++fs_associate_ramfs(file_type)
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.7/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-09-11 10:45:23.000000000 -0400
 @@ -271,45 +271,6 @@
  
  ########################################
@@ -3072,7 +3149,40 @@
  ## </summary>
  ## <param name="domain">
  ##      <summary>
-@@ -2276,7 +2237,7 @@
+@@ -2139,6 +2100,7 @@
+ 	rw_files_pattern($1,nfsd_fs_t,nfsd_fs_t)
+ ')
+ 
++
+ ########################################
+ ## <summary>
+ ##	Mount a RAM filesystem.
+@@ -2214,6 +2176,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow the type to associate to ramfs filesystems.
++## </summary>
++## <param name="type">
++##	<summary>
++##	The type of the object to be associated.
++##	</summary>
++## </param>
++#
++interface(`fs_associate_ramfs',`
++	gen_require(`
++		type ramfs_t;
++	')
++
++	allow $1 ramfs_t:filesystem associate;
++')
++
++########################################
++## <summary>
+ ##	Search directories on a ramfs
+ ## </summary>
+ ## <param name="domain">
+@@ -2276,7 +2256,7 @@
  ##	Domain allowed access.
  ##	</summary>
  ## </param>
@@ -3081,7 +3191,7 @@
  interface(`fs_dontaudit_read_ramfs_files',`
  	gen_require(`
  		type ramfs_t;
-@@ -3533,3 +3494,42 @@
+@@ -3533,3 +3513,42 @@
  	relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs)
  	relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs)
  ')
@@ -4854,7 +4964,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-11 09:00:57.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -5296,7 +5406,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.7/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-09-11 11:08:24.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -6542,7 +6652,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.0.7/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.fc	2007-09-10 14:42:55.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.fc	2007-09-11 09:03:41.000000000 -0400
 @@ -16,3 +16,4 @@
  
  /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
@@ -6550,7 +6660,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.7/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-10 17:37:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-11 09:02:54.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6590,7 +6700,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.7/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-10 14:42:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-11 09:02:44.000000000 -0400
 @@ -54,6 +54,9 @@
  type krb5kdc_var_run_t;
  files_pid_file(krb5kdc_var_run_t)
@@ -7400,7 +7510,7 @@
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.0.7/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-09-11 10:21:10.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -7526,7 +7636,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.0.7/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-11 10:21:22.000000000 -0400
 @@ -25,6 +25,12 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -7566,16 +7676,17 @@
  
  auth_use_nsswitch(ntpd_t)
  
-@@ -107,6 +118,8 @@
+@@ -106,6 +117,9 @@
+ miscfiles_read_localization(ntpd_t)
  
  sysnet_read_config(ntpd_t)
- 
-+term_use_ptmx(ntpd_t)
++sysnet_dontaudit_dhcpc_use_fds(ntpd_t)
 +
++term_use_ptmx(ntpd_t)
+ 
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
- userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-@@ -122,6 +135,10 @@
+@@ -122,6 +136,10 @@
  ')
  
  optional_policy(`
@@ -7586,7 +7697,7 @@
  	logrotate_exec(ntpd_t)
  ')
  
-@@ -132,3 +149,4 @@
+@@ -132,3 +150,4 @@
  optional_policy(`
  	udev_read_db(ntpd_t)
  ')
@@ -8392,7 +8503,7 @@
  # Only permit unprivileged user domains to be entered via rlogin,
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.0.7/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-09-11 11:38:16.000000000 -0400
 @@ -59,6 +59,7 @@
  corenet_sendrecv_all_client_packets(rhgb_t)
  
@@ -8409,6 +8520,14 @@
  
  xserver_read_xdm_xserver_tmp_files(rhgb_t)
  xserver_kill_xdm_xserver(rhgb_t)
+@@ -117,6 +119,7 @@
+ xserver_domtrans_xdm_xserver(rhgb_t)
+ xserver_signal_xdm_xserver(rhgb_t)
+ xserver_read_xdm_tmp_files(rhgb_t)
++xserver_stream_connect_xdm_xserver(rhgb_t)
+ 
+ optional_policy(`
+ 	consoletype_exec(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.7/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/ricci.te	2007-09-06 15:43:06.000000000 -0400
@@ -8441,15 +8560,19 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.7/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-09-10 17:48:31.000000000 -0400
-@@ -65,6 +65,7 @@
++++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-09-11 08:27:48.000000000 -0400
+@@ -64,9 +64,10 @@
+ fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
++auth_use_nsswitch(rlogind_t)
  auth_domtrans_chk_passwd(rlogind_t)
 +auth_domtrans_upd_passwd(rlogind_t)
  auth_rw_login_records(rlogind_t)
- auth_use_nsswitch(rlogind_t)
+-auth_use_nsswitch(rlogind_t)
  
+ files_read_etc_files(rlogind_t)
+ files_read_etc_runtime_files(rlogind_t)
 @@ -82,7 +83,7 @@
  
  miscfiles_read_localization(rlogind_t)
@@ -8585,7 +8708,7 @@
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.0.7/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-09-10 16:54:18.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-09-11 09:10:14.000000000 -0400
 @@ -11,15 +11,17 @@
  domain_subj_id_change_exemption(rshd_t)
  domain_role_change_exemption(rshd_t)
@@ -8614,7 +8737,7 @@
  corenet_sendrecv_rsh_server_packets(rshd_t)
  
  dev_read_urand(rshd_t)
-@@ -44,26 +48,31 @@
+@@ -44,28 +48,44 @@
  selinux_compute_relabel_context(rshd_t)
  selinux_compute_user_contexts(rshd_t)
  
@@ -8648,25 +8771,36 @@
 -
  userdom_search_all_users_home_content(rshd_t)
  
- tunable_policy(`use_nfs_home_dirs',`
-@@ -78,13 +87,12 @@
- 
- optional_policy(`
- 	kerberos_use(rshd_t)
++optional_policy(`
++	kerberos_use(rshd_t)
 +	kerberos_read_keytab(rshd_t)
 +	kerberos_manage_host_rcache(rshd_t)
++')
++
++optional_policy(`
++	unconfined_shell_domtrans(rshd_t)
++	unconfined_signal(rshd_t)
++')
++
+ tunable_policy(`use_nfs_home_dirs',`
+ 	fs_read_nfs_files(rshd_t)
+ 	fs_read_nfs_symlinks(rshd_t)
+@@ -76,15 +96,3 @@
+ 	fs_read_cifs_symlinks(rshd_t)
  ')
  
- optional_policy(`
+-optional_policy(`
+-	kerberos_use(rshd_t)
+-')
+-
+-optional_policy(`
 -	nscd_socket_use(rshd_t)
 -')
 -
 -optional_policy(`
 -	unconfined_domain(rshd_t)
- 	unconfined_shell_domtrans(rshd_t)
-+	unconfined_signal(rshd_t)
- ')
-+
+-	unconfined_shell_domtrans(rshd_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.0.7/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/rsync.te	2007-09-06 15:43:06.000000000 -0400
@@ -8768,7 +8902,7 @@
  corenet_all_recvfrom_unlabeled(rwho_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.0.7/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-09-10 14:04:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-09-11 09:23:37.000000000 -0400
 @@ -15,6 +15,7 @@
  /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
  /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
@@ -8788,7 +8922,7 @@
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.7/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-09-10 14:06:00.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-09-11 09:24:00.000000000 -0400
 @@ -349,6 +349,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
@@ -8902,7 +9036,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.7/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-09-10 14:03:09.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-09-11 10:50:53.000000000 -0400
 @@ -137,6 +137,11 @@
  type winbind_var_run_t;
  files_pid_file(winbind_var_run_t)
@@ -8915,16 +9049,55 @@
  ########################################
  #
  # Samba net local policy
-@@ -190,6 +195,8 @@
+@@ -146,7 +151,6 @@
+ allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
+ allow samba_net_t self:udp_socket create_socket_perms;
+ allow samba_net_t self:tcp_socket create_socket_perms;
+-allow samba_net_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow samba_net_t samba_etc_t:file read_file_perms;
+ 
+@@ -161,6 +165,8 @@
+ manage_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ manage_lnk_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ 
++auth_use_nsswitch(samba_net_t)
++
+ kernel_read_proc_symlinks(samba_net_t)
+ 
+ corenet_all_recvfrom_unlabeled(samba_net_t)
+@@ -190,8 +196,7 @@
  
  miscfiles_read_localization(samba_net_t) 
  
+-sysnet_read_config(samba_net_t)
+-sysnet_use_ldap(samba_net_t)
 +samba_read_var_files(samba_net_t) 
-+
- sysnet_read_config(samba_net_t)
- sysnet_use_ldap(samba_net_t)
  
-@@ -226,8 +233,8 @@
+ userdom_dontaudit_search_sysadm_home_dirs(samba_net_t)
+ 
+@@ -199,10 +204,6 @@
+ 	kerberos_use(samba_net_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(samba_net_t)
+-')
+-
+ ########################################
+ #
+ # smbd Local policy
+@@ -217,17 +218,16 @@
+ allow smbd_t self:msgq create_msgq_perms;
+ allow smbd_t self:sem create_sem_perms;
+ allow smbd_t self:shm create_shm_perms;
+-allow smbd_t self:sock_file read_file_perms;
++allow smbd_t self:sock_file read_sock_file_perms;
+ allow smbd_t self:tcp_socket create_stream_socket_perms;
+ allow smbd_t self:udp_socket create_socket_perms;
+ allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
  
@@ -8935,7 +9108,16 @@
  allow smbd_t samba_log_t:dir setattr;
  dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -298,6 +305,7 @@
+@@ -256,7 +256,7 @@
+ manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
+ files_pid_filetrans(smbd_t,smbd_var_run_t,file)
+ 
+-allow smbd_t winbind_var_run_t:sock_file { read write getattr };
++allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
+ 
+ kernel_getattr_core_if(smbd_t)
+ kernel_getattr_message_if(smbd_t)
+@@ -298,6 +298,7 @@
  
  auth_use_nsswitch(smbd_t)
  auth_domtrans_chk_passwd(smbd_t)
@@ -8943,7 +9125,16 @@
  
  domain_use_interactive_fds(smbd_t)
  domain_dontaudit_list_all_domains_state(smbd_t)
-@@ -350,6 +358,14 @@
+@@ -321,8 +322,6 @@
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
+-sysnet_read_config(smbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(smbd_t)
+ userdom_use_unpriv_users_fds(smbd_t)
+@@ -350,6 +349,14 @@
  ')
  
  optional_policy(`
@@ -8958,7 +9149,52 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -533,6 +549,7 @@
+@@ -398,7 +405,7 @@
+ allow nmbd_t self:msgq create_msgq_perms;
+ allow nmbd_t self:sem create_sem_perms;
+ allow nmbd_t self:shm create_shm_perms;
+-allow nmbd_t self:sock_file read_file_perms;
++allow nmbd_t self:sock_file read_sock_file_perms;
+ allow nmbd_t self:tcp_socket create_stream_socket_perms;
+ allow nmbd_t self:udp_socket create_socket_perms;
+ allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
+@@ -421,6 +428,8 @@
+ 
+ allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
+ 
++auth_use_nsswitch(nmbd_t)
++
+ kernel_getattr_core_if(nmbd_t)
+ kernel_getattr_message_if(nmbd_t)
+ kernel_read_kernel_sysctls(nmbd_t)
+@@ -462,17 +471,11 @@
+ 
+ miscfiles_read_localization(nmbd_t)
+ 
+-sysnet_read_config(nmbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
+ userdom_use_unpriv_users_fds(nmbd_t)
+ 
+ optional_policy(`
+-	nis_use_ypbind(nmbd_t)
+-')
+-
+-optional_policy(`
+ 	seutil_sigchld_newrole(nmbd_t)
+ ')
+ 
+@@ -506,6 +509,8 @@
+ manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
+ files_list_var_lib(smbmount_t)
+ 
++auth_use_nsswitch(smbmount_t)
++
+ kernel_read_system_state(smbmount_t)
+ 
+ corenet_all_recvfrom_unlabeled(smbmount_t)
+@@ -533,6 +538,7 @@
  storage_raw_write_fixed_disk(smbmount_t)
  
  term_list_ptys(smbmount_t)
@@ -8966,19 +9202,26 @@
  
  corecmd_list_bin(smbmount_t)
  
-@@ -556,6 +573,11 @@
- sysnet_read_config(smbmount_t)
+@@ -553,16 +559,11 @@
+ 
+ logging_search_logs(smbmount_t)
  
+-sysnet_read_config(smbmount_t)
+-
  userdom_use_all_users_fds(smbmount_t)
 +userdom_use_sysadm_ttys(smbmount_t)
-+
-+optional_policy(`
-+	cups_read_rw_config(smbmount_t)
-+')
  
  optional_policy(`
- 	nis_use_ypbind(smbmount_t)
-@@ -570,15 +592,18 @@
+-	nis_use_ypbind(smbmount_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(smbmount_t)
++	cups_read_rw_config(smbmount_t)
+ ')
+ 
+ ########################################
+@@ -570,24 +571,28 @@
  # SWAT Local policy
  #
  
@@ -8990,9 +9233,15 @@
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
- allow swat_t self:netlink_route_socket r_netlink_socket_perms;
+-allow swat_t self:netlink_route_socket r_netlink_socket_perms;
  
 -allow swat_t nmbd_exec_t:file { execute read };
++allow swat_t self:unix_stream_socket connectto;
++can_exec(swat_t, smbd_exec_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 };
++
 +can_exec(swat_t, nmbd_exec_t)
 +allow swat_t nmbd_port_t:udp_socket name_bind;
 +allow swat_t nmbd_t:process { signal signull };
@@ -9000,7 +9249,16 @@
  
  rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
  
-@@ -597,7 +622,9 @@
+ append_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-allow swat_t smbd_exec_t:file execute ;
+-
+-allow swat_t smbd_t:process signull;
+-
+ allow swat_t smbd_var_run_t:file read;
+ 
+ manage_dirs_pattern(swat_t,swat_tmp_t,swat_tmp_t)
+@@ -597,7 +602,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -9008,10 +9266,12 @@
 +can_exec(swat_t, winbind_exec_t)
 +allow swat_t winbind_var_run_t:dir { write add_name remove_name };
 +allow swat_t winbind_var_run_t:sock_file { create unlink };
++
++auth_use_nsswitch(swat_t)
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -622,17 +649,20 @@
+@@ -622,23 +631,24 @@
  
  dev_read_urand(swat_t)
  
@@ -9032,14 +9292,25 @@
  logging_search_logs(swat_t)
  
  miscfiles_read_localization(swat_t)
-@@ -660,6 +690,24 @@
- 	nscd_socket_use(swat_t)
+ 
+-sysnet_read_config(swat_t)
+-
+ optional_policy(`
+ 	cups_read_rw_config(swat_t)
+ 	cups_stream_connect(swat_t)
+@@ -652,13 +662,16 @@
+ 	kerberos_use(swat_t)
  ')
  
-+	
+-optional_policy(`
+-	nis_use_ypbind(swat_t)
+-')
 +init_read_utmp(swat_t)
 +init_dontaudit_write_utmp(swat_t)
-+
+ 
+-optional_policy(`
+-	nscd_socket_use(swat_t)
+-')
 +manage_dirs_pattern(swat_t,samba_log_t,samba_log_t)
 +create_files_pattern(swat_t,samba_log_t,samba_log_t)
 +
@@ -9047,17 +9318,10 @@
 +
 +manage_files_pattern(swat_t,samba_var_t,samba_var_t)
 +files_list_var_lib(swat_t)
-+
-+allow swat_t self:unix_stream_socket connectto;
-+allow swat_t smbd_exec_t:file { execute_no_trans read };
-+allow swat_t smbd_port_t:tcp_socket name_bind;
-+allow swat_t smbd_t:process signal;
-+allow swat_t smbd_var_run_t:file { lock unlink };
-+
+ 
  ########################################
  #
- # Winbind local policy
-@@ -672,7 +720,6 @@
+@@ -672,7 +685,6 @@
  allow winbind_t self:fifo_file { read write };
  allow winbind_t self:unix_dgram_socket create_socket_perms;
  allow winbind_t self:unix_stream_socket create_stream_socket_perms;
@@ -9065,7 +9329,7 @@
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
-@@ -709,6 +756,8 @@
+@@ -709,6 +721,8 @@
  manage_sock_files_pattern(winbind_t,winbind_var_run_t,winbind_var_run_t)
  files_pid_filetrans(winbind_t,winbind_var_run_t,file)
  
@@ -9074,7 +9338,7 @@
  kernel_read_kernel_sysctls(winbind_t)
  kernel_list_proc(winbind_t)
  kernel_read_proc_symlinks(winbind_t)
-@@ -733,7 +782,9 @@
+@@ -733,7 +747,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -9084,7 +9348,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -746,9 +797,6 @@
+@@ -746,9 +762,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -9094,7 +9358,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -758,10 +806,6 @@
+@@ -758,10 +771,6 @@
  ')
  
  optional_policy(`
@@ -9105,7 +9369,16 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -804,6 +848,7 @@
+@@ -784,6 +793,8 @@
+ allow winbind_helper_t samba_var_t:dir search;
+ files_list_var_lib(winbind_helper_t)
+ 
++auth_use_nsswitch(winbind_helper_t)
++
+ stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
+ 
+ term_list_ptys(winbind_helper_t)
+@@ -804,6 +815,7 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -9113,7 +9386,7 @@
  ')
  
  ########################################
-@@ -828,3 +873,36 @@
+@@ -828,3 +840,36 @@
  		domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
  	')
  ')
@@ -9396,7 +9669,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 11:09:25.000000000 -0400
 @@ -33,7 +33,6 @@
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -9432,13 +9705,15 @@
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
  
-@@ -108,6 +113,3 @@
-         rpm_use_script_fds(setroubleshootd_t)
+@@ -109,5 +114,7 @@
  ')
  
--optional_policy(`
+ optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
--')
++	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
++	dbus_send_system_bus(setroubleshootd_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.7/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-06-19 16:23:35.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/snmp.fc	2007-09-06 15:43:06.000000000 -0400
@@ -9770,7 +10045,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.7/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-09-10 17:53:16.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-09-11 09:12:11.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -9904,7 +10179,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.7/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/telnet.te	2007-09-10 17:54:44.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/telnet.te	2007-09-11 08:25:22.000000000 -0400
 @@ -32,7 +32,6 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
@@ -10013,6 +10288,25 @@
 +corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t)
 +
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-3.0.7/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xfs.te	2007-09-11 08:19:36.000000000 -0400
+@@ -37,6 +37,15 @@
+ kernel_read_kernel_sysctls(xfs_t)
+ kernel_read_system_state(xfs_t)
+ 
++corenet_all_recvfrom_unlabeled(xfs_t)
++corenet_all_recvfrom_netlabel(xfs_t)
++corenet_tcp_sendrecv_generic_if(xfs_t)
++corenet_tcp_sendrecv_all_nodes(xfs_t)
++corenet_tcp_sendrecv_all_ports(xfs_t)
++corenet_tcp_bind_all_nodes(xfs_t)
++corenet_tcp_bind_xfs_port(xfs_t)
++corenet_sendrecv_xfs_client_packets(xfs_t)
++
+ corecmd_list_bin(xfs_t)
+ 
+ dev_read_sysfs(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.0.7/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-08-22 07:14:07.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/xserver.fc	2007-09-06 15:43:06.000000000 -0400
@@ -10041,7 +10335,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.7/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-09-11 11:45:01.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -10374,7 +10668,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 16:19:01.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-11 09:22:25.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -11863,7 +12157,7 @@
  # Sulogin local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.0.7/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-09-11 11:58:06.000000000 -0400
 @@ -1,12 +1,15 @@
 -
  /dev/log		-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -11881,16 +12175,18 @@
  /sbin/syslogd		--	gen_context(system_u:object_r:syslogd_exec_t,s0)
  /sbin/syslog-ng		--	gen_context(system_u:object_r:syslogd_exec_t,s0)
  
-@@ -32,6 +35,8 @@
+@@ -32,7 +35,10 @@
  /var/log/audit\.log	--	gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
  ')
  
 +/var/named/chroot/var/log	-d	gen_context(system_u:object_r:var_log_t,s0)
 +
  /var/run/audit_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
++/var/run/audispd_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-@@ -43,3 +48,8 @@
+ /var/run/klogd\.pid	--	gen_context(system_u:object_r:klogd_var_run_t,s0)
+@@ -43,3 +49,8 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
  /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
@@ -13224,7 +13520,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.7/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-09-11 10:23:22.000000000 -0400
 @@ -522,6 +522,8 @@
  
  	files_search_etc($1)
@@ -13234,6 +13530,30 @@
  ')
  
  ########################################
+@@ -556,3 +558,23 @@
+ 	files_search_etc($1)
+ 	allow $1 net_conf_t:file read_file_perms;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to use
++##	the dhcp file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The domain sending the SIGCHLD.
++##	</summary>
++## </param>
++#
++interface(`sysnet_dontaudit_dhcpc_use_fds',`
++	gen_require(`
++		type dhcpc_t;
++	')
++
++	dontaudit $1 dhcpc_t:fd use;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-06 15:43:06.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- selinux-policy.spec	10 Sep 2007 22:02:06 -0000	1.519
+++ selinux-policy.spec	11 Sep 2007 16:07:47 -0000	1.520
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
+- Allow xfs to bind to port 7100
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
 - Allow newalias/sendmail dac_override
 - Allow bind to bind to all udp ports



From fedora-extras-commits at redhat.com  Tue Sep 11 16:11:30 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:11:30 -0400
Subject: rpms/wordpress/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 wordpress.spec, 1.14, 1.15
Message-ID: <200709111611.l8BGBUaI022693@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22610

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Aug 2007 14:54:45 -0000	1.10
+++ .cvsignore	11 Sep 2007 16:10:57 -0000	1.11
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Aug 2007 14:54:45 -0000	1.10
+++ sources	11 Sep 2007 16:10:57 -0000	1.11
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wordpress.spec	29 Aug 2007 14:54:45 -0000	1.14
+++ wordpress.spec	11 Sep 2007 16:10:57 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -51,6 +51,7 @@
 %doc readme.html
 %doc README.fedora
 %{_datadir}/wordpress/wp-atom.php
+%{_datadir}/wordpress/wp-app.php
 %{_datadir}/wordpress/wp-blog-header.php
 %{_datadir}/wordpress/wp-comments-post.php
 %{_datadir}/wordpress/wp-commentsrss2.php
@@ -73,6 +74,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
 * Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:05 -0700
Subject: [pkgdb] dbench was added for sundaram
Message-ID: <200709111615.l8BGF51c021960@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package dbench with summary Filesystem load benchmarking tool
Kevin Fenzi (kevin) has approved Package dbench
Kevin Fenzi (kevin) has added a Fedora devel branch for dbench with an owner of sundaram
Kevin Fenzi (kevin) has approved dbench in Fedora devel
Kevin Fenzi (kevin) has approved Package dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:21 -0700
Subject: [pkgdb] dbench (Fedora, 6) updated by kevin
Message-ID: <200709111615.l8BGFNjq031450@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora 6)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora, 7) updated by kevin
Message-ID: <200709111615.l8BGFOVJ031458@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora EPEL, 5) updated by kevin
Message-ID: <200709111615.l8BGFOgl031470@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora OLPC, 2) updated by kevin
Message-ID: <200709111615.l8BGFOjQ031486@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora OLPC 2)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora, devel) updated by kevin
Message-ID: <200709111615.l8BGFOaw031494@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora EPEL, 4) updated by kevin
Message-ID: <200709111615.l8BGFPMc031506@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:42 -0400
Subject: rpms/dbench - New directory
Message-ID: <200709111616.l8BGGg10023481@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench

Log Message:
Directory /cvs/extras/rpms/dbench added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:46 -0400
Subject: rpms/dbench/devel - New directory
Message-ID: <200709111616.l8BGGkBg023505@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench/devel

Log Message:
Directory /cvs/extras/rpms/dbench/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:51 -0400
Subject: rpms/dbench Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709111616.l8BGGpu0023544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench

Added Files:
	Makefile import.log 
Log Message:
Setup of module dbench


--- NEW FILE Makefile ---
# Top level Makefile for module dbench
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:54 -0400
Subject: rpms/dbench/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709111616.l8BGGsXU023563@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dbench


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dbench
# $Id: Makefile,v 1.1 2007/09/11 16:16:51 kevin Exp $
NAME := dbench
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 fedora-extras-commits at redhat.com  Tue Sep 11 16:19:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:19:31 -0700
Subject: [pkgdb] olpc-logos was added for sundaram
Message-ID: <200709111619.l8BGJVh2031534@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package olpc-logos with summary OLPC-related icons and pictures
Kevin Fenzi (kevin) has approved Package olpc-logos
Kevin Fenzi (kevin) has added a Fedora devel branch for olpc-logos with an owner of sundaram
Kevin Fenzi (kevin) has approved olpc-logos in Fedora devel
Kevin Fenzi (kevin) has approved Package olpc-logos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on olpc-logos (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on olpc-logos (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on olpc-logos (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:19:33 -0700
Subject: [pkgdb] olpc-logos (Fedora OLPC, 2) updated by kevin
Message-ID: <200709111619.l8BGJX9E031546@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for olpc-logos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on olpc-logos (Fedora OLPC 2)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:45 -0400
Subject: rpms/olpc-logos - New directory
Message-ID: <200709111619.l8BGJjmY024449@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos

Log Message:
Directory /cvs/extras/rpms/olpc-logos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:50 -0400
Subject: rpms/olpc-logos/devel - New directory
Message-ID: <200709111619.l8BGJoxw024483@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos/devel

Log Message:
Directory /cvs/extras/rpms/olpc-logos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:58 -0400
Subject: rpms/olpc-logos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709111619.l8BGJwKN024522@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos

Added Files:
	Makefile import.log 
Log Message:
Setup of module olpc-logos


--- NEW FILE Makefile ---
# Top level Makefile for module olpc-logos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 11 16:20:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:20:05 -0400
Subject: rpms/olpc-logos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709111620.l8BGK5C4024552@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module olpc-logos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: olpc-logos
# $Id: Makefile,v 1.1 2007/09/11 16:19:58 kevin Exp $
NAME := olpc-logos
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 fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, 6) updated by kevin
Message-ID: <200709111626.l8BGQIHQ031615@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora 6 to sandeen

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, 7) updated by kevin
Message-ID: <200709111626.l8BGQIHg031624@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora 7 to sandeen

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, devel) updated by kevin
Message-ID: <200709111626.l8BGQIwM031633@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora devel to sandeen

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:36:09 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:36:09 -0400
Subject: rpms/wordpress/F-7 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wordpress.spec, 1.15, 1.16
Message-ID: <200709111636.l8BGa9JY026906@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26846

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 14:54:39 -0000	1.11
+++ .cvsignore	11 Sep 2007 16:35:36 -0000	1.12
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 14:54:39 -0000	1.11
+++ sources	11 Sep 2007 16:35:36 -0000	1.12
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/wordpress.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wordpress.spec	29 Aug 2007 14:54:39 -0000	1.15
+++ wordpress.spec	11 Sep 2007 16:35:36 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -74,6 +74,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
 * Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update



From fedora-extras-commits at redhat.com  Tue Sep 11 16:41:53 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:41:53 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111641.l8BGfsas022094@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:41:54 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:41:54 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111641.l8BGfsj0031756@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:14 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:14 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111642.l8BGgFaA022103@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:16 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:16 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111642.l8BGgGpX031769@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:22 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:22 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111642.l8BGgM07031782@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora 6)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:25 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:25 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111642.l8BGgPua022113@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora 6)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:45:59 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:45:59 -0400
Subject: rpms/wordpress/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wordpress.spec, 1.17, 1.18
Message-ID: <200709111645.l8BGjxfV028187@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28103

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 14:54:42 -0000	1.11
+++ .cvsignore	11 Sep 2007 16:45:21 -0000	1.12
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 14:54:42 -0000	1.11
+++ sources	11 Sep 2007 16:45:21 -0000	1.12
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/wordpress.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wordpress.spec	29 Aug 2007 14:54:42 -0000	1.17
+++ wordpress.spec	11 Sep 2007 16:45:21 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -74,7 +74,10 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-1
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
+* Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update
 



From fedora-extras-commits at redhat.com  Tue Sep 11 16:48:10 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 12:48:10 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.5, 1.6 gtksourceview2.spec, 
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200709111648.l8BGmAGa028531@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27727

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

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
- Update to 1.90.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2007 04:23:39 -0000	1.5
+++ .cvsignore	11 Sep 2007 16:47:32 -0000	1.6
@@ -1 +1 @@
-gtksourceview-1.90.4.tar.bz2
+gtksourceview-1.90.5.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtksourceview2.spec	4 Sep 2007 04:23:39 -0000	1.7
+++ gtksourceview2.spec	11 Sep 2007 16:47:32 -0000	1.8
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.4
+Version: 1.90.5
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
+- Update to 1.90.5
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
 - Update to 1.90.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2007 04:23:39 -0000	1.5
+++ sources	11 Sep 2007 16:47:32 -0000	1.6
@@ -1 +1 @@
-d4a1029c968ca61f8f65d3c22d4de07e  gtksourceview-1.90.4.tar.bz2
+4d439022469b25f8c944751bcf787db3  gtksourceview-1.90.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 16:49:50 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 12:49:50 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.5, 1.6 pygtksourceview.spec,
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200709111649.l8BGnok3028853@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28729

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

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
- Update to 1.90.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2007 04:58:19 -0000	1.5
+++ .cvsignore	11 Sep 2007 16:49:18 -0000	1.6
@@ -1 +1 @@
-pygtksourceview-1.90.4.tar.bz2
+pygtksourceview-1.90.5.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pygtksourceview.spec	4 Sep 2007 05:04:29 -0000	1.9
+++ pygtksourceview.spec	11 Sep 2007 16:49:18 -0000	1.10
@@ -2,10 +2,10 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.4
+%define gtksourceview_version 1.90.5
 
 Name:           pygtksourceview
-Version:        1.90.4
+Version:        1.90.5
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
+- Update to 1.90.5
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
 - Update to 1.90.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2007 04:58:19 -0000	1.5
+++ sources	11 Sep 2007 16:49:18 -0000	1.6
@@ -1 +1 @@
-dd8fcd11ba555ed6444bfffcd7cffe45  pygtksourceview-1.90.4.tar.bz2
+e26be6d014b5f091af5c4250bb63c2ff  pygtksourceview-1.90.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:00 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:00 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo0eN022155@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchbugzilla acl on wordpress (Fedora devel) to Approved for Adrian Reber (adrian)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:01 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:01 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo1Mw031844@app3.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchcommits acl on wordpress (Fedora devel) to Approved for Adrian Reber (adrian)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:03 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:03 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo4KV022166@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchbugzilla acl on wordpress (Fedora 7) to Approved for Adrian Reber (adrian)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:05 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:05 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo5uA022175@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchcommits acl on wordpress (Fedora 7) to Approved for Adrian Reber (adrian)

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



From fedora-extras-commits at redhat.com  Tue Sep 11 17:21:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 13:21:09 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6.bz2.sign, NONE, 1.1 .cvsignore, 
	1.681, 1.682 kernel.spec, 1.154,
	1.155 linux-2.6-utrace-ptrace-compat-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.4,
	1.5 linux-2.6-utrace-tracehook.patch, 1.9, 1.10 sources, 1.643,
	1.644 upstream, 1.565, 1.566 linux-2.6-sched-cfs-fix-mc.patch,
	1.1, NONE linux-2.6-x86-fix-hang-on-C7.patch, 1.1,
	NONE linux-2.6-xen-fix-bootup.patch, 1.1,
	NONE linux-2.6-xfs-quota-hashtable-allocation-fix.patch, 1.1,
	NONE linux-2.6-xfs-sane-filestreams-object-timeout.patch, 1.1,
	NONE patch-2.6.23-rc5-git1.bz2.sign, 1.1,
	NONE patch-2.6.23-rc5.bz2.sign, 1.1, NONE
Message-ID: <200709111721.l8BHL9jR004633@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4577

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-utrace-ptrace-compat-ia64.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc6.bz2.sign 
Removed Files:
	linux-2.6-sched-cfs-fix-mc.patch 
	linux-2.6-x86-fix-hang-on-C7.patch 
	linux-2.6-xen-fix-bootup.patch 
	linux-2.6-xfs-quota-hashtable-allocation-fix.patch 
	linux-2.6-xfs-sane-filestreams-object-timeout.patch 
	patch-2.6.23-rc5-git1.bz2.sign patch-2.6.23-rc5.bz2.sign 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6



--- NEW FILE patch-2.6.23-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG5gdmyGugalF9Dw4RAkNmAJ4v85yBt0vYY0Kv5TB5dPzlcEfibQCcDdaH
6yOAhDbVmL46P/SekJp93e4=
=8jFC
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -r1.681 -r1.682
--- .cvsignore	5 Sep 2007 19:43:23 -0000	1.681
+++ .cvsignore	11 Sep 2007 17:20:35 -0000	1.682
@@ -3,5 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5-git1.bz2
+patch-2.6.23-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kernel.spec	10 Sep 2007 20:35:15 -0000	1.154
+++ kernel.spec	11 Sep 2007 17:20:35 -0000	1.155
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -659,19 +659,14 @@
 Patch1230: linux-2.6-powerpc-spu-vicinity.patch
 Patch1300: linux-2.6-usb-suspend-classes.patch
 Patch1400: linux-2.6-smarter-relatime.patch
-Patch1500: linux-2.6-xfs-sane-filestreams-object-timeout.patch
 Patch1501: linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
-Patch1502: linux-2.6-xfs-quota-hashtable-allocation-fix.patch
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1520: linux-2.6-xen-fix-bootup.patch
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
-Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
-Patch1535: linux-2.6-sched-cfs-fix-mc.patch
 Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
@@ -1163,9 +1158,7 @@
 ApplyPatch linux-2.6-smarter-relatime.patch
 
 # xfs bugfixes & stack reduction
-ApplyPatch linux-2.6-xfs-sane-filestreams-object-timeout.patch
 ApplyPatch linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
-ApplyPatch linux-2.6-xfs-quota-hashtable-allocation-fix.patch
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
@@ -1200,18 +1193,9 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# Fix Xen bootup
-ApplyPatch linux-2.6-xen-fix-bootup.patch
-
 # fix oops in with sunrpc
 ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
-# fix hang on C7 CPU
-ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
-
-# fix scheduler on multicore
-ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
-
 # fix x86_64 clock warping
 ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
@@ -1806,6 +1790,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6
+
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix clock warping on x86_64
 

linux-2.6-utrace-ptrace-compat-ia64.patch:

Index: linux-2.6-utrace-ptrace-compat-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-ptrace-compat-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 17:20:35 -0000	1.4
@@ -145,7 +145,7 @@
  /*
   * Write f32-f127 back to task->thread.fph if it has been modified.
   */
-@@ -792,832 +717,6 @@ access_nat_bits (struct task_struct *chi
+@@ -792,831 +717,6 @@ access_nat_bits (struct task_struct *chi
  	return 0;
  }
  
@@ -950,7 +950,6 @@
 -
 -	      case PTRACE_DETACH:
 -		/* detach a process that was attached. */
--		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -		ret = ptrace_detach(child, data);
 -		goto out_tsk;
 -

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset.patch	21 Aug 2007 19:42:55 -0000	1.4
+++ linux-2.6-utrace-regset.patch	11 Sep 2007 17:20:35 -0000	1.5
@@ -3827,12 +3827,13 @@
  
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -99,12 +99,6 @@ int ptrace_detach(struct task_struct *ch
+@@ -99,13 +99,6 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
 -	/* Architecture-specific hardware disable .. */
 -	ptrace_disable(child);
+-	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -
 -	/* .. re-parent .. */
 -	child->exit_code = data;

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace-tracehook.patch	4 Sep 2007 20:53:27 -0000	1.9
+++ linux-2.6-utrace-tracehook.patch	11 Sep 2007 17:20:35 -0000	1.10
@@ -564,12 +564,11 @@
  	}
  }
  
-@@ -273,9 +274,7 @@ static void clear_singlestep(struct task
+@@ -273,8 +274,7 @@ static void clear_singlestep(struct task
   */
  void ptrace_disable(struct task_struct *child)
  { 
 -	clear_singlestep(child);
--	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -	clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
 +	tracehook_disable_single_step(child);
  }
@@ -2331,8 +2330,8 @@
  {
  	if (!valid_signal(data))
 @@ -234,13 +102,10 @@ int ptrace_detach(struct task_struct *ch
- 	/* Architecture-specific hardware disable .. */
  	ptrace_disable(child);
+ 	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  
 -	write_lock_irq(&tasklist_lock);
 -	/* protect against de_thread()->release_task() */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -r1.643 -r1.644
--- sources	5 Sep 2007 19:43:23 -0000	1.643
+++ sources	11 Sep 2007 17:20:35 -0000	1.644
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2
-4cfdcb5e00c1db78237b15e6ce955367  patch-2.6.23-rc5-git1.bz2
+8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- upstream	5 Sep 2007 19:43:23 -0000	1.565
+++ upstream	11 Sep 2007 17:20:35 -0000	1.566
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5-git1.bz2
+patch-2.6.23-rc6.bz2


--- linux-2.6-sched-cfs-fix-mc.patch DELETED ---


--- linux-2.6-x86-fix-hang-on-C7.patch DELETED ---


--- linux-2.6-xen-fix-bootup.patch DELETED ---


--- linux-2.6-xfs-quota-hashtable-allocation-fix.patch DELETED ---


--- linux-2.6-xfs-sane-filestreams-object-timeout.patch DELETED ---


--- patch-2.6.23-rc5-git1.bz2.sign DELETED ---


--- patch-2.6.23-rc5.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 17:24:21 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 11 Sep 2007 13:24:21 -0400
Subject: fedora-security/audit fc6,1.253,1.254 fc7,1.95,1.96
Message-ID: <200709111724.l8BHOLWE004715@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4695/audit

Modified Files:
	fc6 fc7 
Log Message:
Note Fedora updates.
Clean-up some old stuff.
Move few misplaced lines.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- fc6	7 Sep 2007 08:42:54 -0000	1.253
+++ fc6	11 Sep 2007 17:24:18 -0000	1.254
@@ -4,10 +4,10 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070907
-# Up to date FC6 as of 20070905
+# Up to date CVE as of CVE email 20070910
+# Up to date FC6 as of 20070910
 
-CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -42,8 +42,9 @@
 CVE-2007-3820 ** (kdebase) #248537
 CVE-2007-3799 ** (php)
 CVE-2007-3798 version (tcpdump, fixed 3.9.7) #250290 [since FEDORA-2007-654]
-CVE-2007-3782 ** (mysql)
-CVE-2007-3781 ** (mysql)
+CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3780 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- fc7	10 Sep 2007 12:20:21 -0000	1.95
+++ fc7	11 Sep 2007 17:24:18 -0000	1.96
@@ -5,11 +5,11 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070907
-# Up to date FC7 as of 20070905
+# Up to date CVE as of CVE email 20070910
+# Up to date FC7 as of 20070910
 
 CVE-2007-4727 VULNERABLE (lighttpd) #284511
-CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -20,19 +20,19 @@
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
-CVE-2007-4631 VULNERABLE (qgit) #268381
+CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
-CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4534 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4533 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4532 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+CVE-2007-4534 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4533 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4532 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4510 version (clamav, fixed 0.91.2) #253780 [since FEDORA-2007-2050]
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
 CVE-2007-4400 VULNERABLE (konversation) #253545
@@ -53,6 +53,7 @@
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
+CVE-2007-4138 VULNERABLE (samba, fixed 3.0.26) #286311
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
@@ -77,15 +78,16 @@
 CVE-2007-3820 backport (kdelibs) [since FEDORA-2007-1699]
 CVE-2007-3820 backport (kdebase) #248537 [since FEDORA-2007-1700]
 CVE-2007-3799 ** (php)
-CVE-2007-3781 ** (mysql)
-CVE-2007-3782 ** (mysql)
+CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3780 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3770 backport (terminal/xfce) [since FEDORA-2007-1620]
 CVE-2007-3738 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3737 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3736 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3735 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3728 ignore (libsilc, 1.1.1 only)
-CVE-2007-3725 ** (clamav)
+CVE-2007-3725 version (clamav) [since FEDORA-2007-2050]
 CVE-2007-3713 backport (centericq) #247979 [since FEDORA-2007-1160]
 CVE-2007-3656 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3642 version (kernel, fixed 2.6.22.1) [since FEDORA-2007-1130]
@@ -98,13 +100,13 @@
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 version (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-0033]
 CVE-2007-3507 version (flac123, fixed 0.0.10) #246322 [since FEDORA-2007-1045]
-CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3478 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3477 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3476 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3475 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3474 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3473 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3472 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
 CVE-2007-3410 backport (HelixPlayer) #245838 [since FEDORA-2007-0756]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245807
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
@@ -130,28 +132,27 @@
 CVE-2007-3240 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3239 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3238 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
-CVE-2007-3140 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3231 version (mecab, fixed 0.96) [since FEDORA-2007-0366]
 CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
-CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
-CVE-2007-3099 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
-CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
 CVE-2007-3165 version (tor, fixed 0.1.2.14) #244502 [since FEDORA-2007-1674]
 CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
 CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
 CVE-2007-3145 VULNERABLE (galeon) **
 CVE-2007-3140 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3126 ignore (gimp) just a crash
-CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3123 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-3122 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3121 version (zvbi, fixed 0.2.25) [since FEDORA-2007-0175]
 *CVE-2007-3113 VULNERABLE (cacti) #243592
 *CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
+CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
+CVE-2007-3099 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
 CVE-2007-3089 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3025 ignore (clamav, Solaris only)
-CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3024 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-3023 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3007 ignore (php) safe mode isn't safe
 *CVE-2007-2975 (openfire)
 CVE-2007-2958 version (claws-mail) #254121 [since FEDORA-2007-2009]
@@ -182,7 +183,7 @@
 CVE-2007-2754 backport (freetype) [since FEDORA-2007-0033]
 CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
 CVE-2007-2683 backport (mutt)
-*CVE-2007-2654 VULNERABLE (xfsdump) #240396
+CVE-2007-2654 version (xfsdump) #240396
 CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
 CVE-2007-2645 backport (libexif) #240055 [since FEDORA-2007-0414]
 *CVE-2007-2637 patch (moin, fixed 1.5.7-2)
@@ -222,8 +223,8 @@
 *CVE-2007-2165 VULNERABLE (proftpd) #237533
 CVE-2007-2138 version (postgresql, fixed 8.2.4) #237682 [since FEDORA-2007-0174]
 CVE-2007-2057 version (aircrack-ng, fixed 0.8-0.1)
-CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2028 (freeradius)
+CVE-2007-2029 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-2028 version (freeradius)
 *CVE-2007-2026 (file)
 CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
 CVE-2007-1997 version (clamav, fixed in 0.90.2)
@@ -297,7 +298,7 @@
 CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
 CVE-2007-1401 ignore (php) unshipped cracklib extension
 CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
-*CVE-2007-1398 ignore (snort, inline mode not shipped) #232109
+CVE-2007-1398 ignore (snort, inline mode not shipped) #232109, new upstream [since FEDORA-2007-2060]
 CVE-2007-1396 ignore (php) feature, not a flaw
 *CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1387 patch (xine-lib, fixed 1.1.4-3)
@@ -622,7 +623,7 @@
 *CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 *CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5276 VULNERABLE (snort) #229265
+CVE-2006-5276 version (snort) #229265 [since FEDORA-2007-2060]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 backport (xorg-x11-xinit) #212167 [since FEDORA-2007-1409]
 *CVE-2006-5215 version (xorg-x11-xdm)



From fedora-extras-commits at redhat.com  Tue Sep 11 17:49:32 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 11 Sep 2007 13:49:32 -0400
Subject: fedora-security/audit fc6,1.254,1.255 fc7,1.96,1.97
Message-ID: <200709111749.l8BHnWWD005401@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5379/audit

Modified Files:
	fc6 fc7 
Log Message:
Add few more issues



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- fc6	11 Sep 2007 17:24:18 -0000	1.254
+++ fc6	11 Sep 2007 17:49:30 -0000	1.255
@@ -7,7 +7,9 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC6 as of 20070910
 
+CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
+CVE-2007-4730 VULNERABLE (xorg-x11) #286061
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fc7	11 Sep 2007 17:24:18 -0000	1.96
+++ fc7	11 Sep 2007 17:49:30 -0000	1.97
@@ -8,8 +8,10 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
-CVE-2007-4727 VULNERABLE (lighttpd) #284511
+CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
+CVE-2007-4730 VULNERABLE (xorg-x11) #286051
+CVE-2007-4727 VULNERABLE (lighttpd) #284511
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -290,7 +292,7 @@
 CVE-2007-1463 version (inkscape, fixed 0.45.1)
 CVE-2007-1460 version (php, fixed 5.2.2)
 CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
-*CVE-2007-1420 VULNERABLE (mysql, fixed 5.0.36) #232604
+CVE-2007-1420 version (mysql, fixed 5.0.36) #232604
 CVE-2007-1413 ignore (php) Windows NT SNMP specific
 CVE-2007-1412 ignore (php) unshipped cpdf extension
 CVE-2007-1411 ignore (php) unshipped mssql extension



From fedora-extras-commits at redhat.com  Tue Sep 11 17:57:30 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 11 Sep 2007 13:57:30 -0400
Subject: rpms/emacs/devel emacs.spec,1.97,1.98
Message-ID: <200709111757.l8BHvUHd005698@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5670

Modified Files:
	emacs.spec 
Log Message:
* Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
- fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
- use macro instead of variable style for buildroot.



Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- emacs.spec	27 Aug 2007 20:50:03 -0000	1.97
+++ emacs.spec	11 Sep 2007 17:56:57 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -46,6 +46,9 @@
 %define paranoid 1
 %define expurgate 0
 
+%define site_lisp %{_datadir}/emacs/site-lisp
+%define pkgconfig %{_datadir}/pkgconfig
+
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
 editor. Emacs contains special code editing features, a scripting
@@ -143,7 +146,7 @@
 
 %__make %{?_smp_mflags} -C lisp updates
 
-# Create pkg-config file
+# Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
 sitestartdir=%{site_lisp}/site-start.d
@@ -154,12 +157,12 @@
 EOF
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall
 
 # let alternatives manage the symlink
-rm $RPM_BUILD_ROOT%{_bindir}/emacs
+rm %{buildroot}%{_bindir}/emacs
 
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
@@ -168,44 +171,42 @@
 %__make %{?_smp_mflags}
 
 # install the emacs without X
-install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox
+install -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
 
 # make sure movemail isn't setgid
-chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail
-
-%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{site_lisp}
-install -m 0644 %SOURCE4 %{site_lisp}/site-start.el
-install -m 0644 %SOURCE18 %{site_lisp}
-
-mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs}
-mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1}
-mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags}
+mkdir -p %{buildroot}%{site_lisp}
+install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
+install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
+
+mv %{buildroot}%{_bindir}/{etags,etags.emacs}
+mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
+mv %{buildroot}%{_bindir}/{ctags,gctags}
 
 # GNOME / KDE files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/gnu-emacs.desktop
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/pixmaps/
 
 # install site-lisp files
-install -m 0644 site-lisp/*.el{,c} %{site_lisp}
+install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
 
-mkdir -p %{site_lisp}/site-start.d
-install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d
+mkdir -p %{buildroot}%{site_lisp}/site-start.d
+install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
 
 # default initialization file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs
+mkdir -p %{buildroot}%{_sysconfdir}/skel
+install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
 
 # install pkgconfig file
-mkdir -p %{buildroot}%{_datadir}/pkg-config
-install -m 0644 emacs.pc %{buildroot}%{_datadir}/pkg-config
+mkdir -p %{buildroot}/%{pkgconfig}
+install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # after everything is installed, remove info dir
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/*
+rm -f %{buildroot}%{_infodir}/dir
+rm %{buildroot}%{_localstatedir}/games/emacs/*
 
 #
 # create file lists
@@ -213,7 +214,7 @@
 rm -f *-filelist {common,el}-*-files
 
 ( TOPDIR=${PWD}
-  cd $RPM_BUILD_ROOT
+  cd %{buildroot}
 
   find .%{_datadir}/emacs/%{version}/lisp \
     .%{_datadir}/emacs/%{version}/leim \
@@ -227,7 +228,7 @@
 cat el-*-files common-lisp-dir-files > el-filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
@@ -295,11 +296,15 @@
 
 %files -f el-filelist el
 %defattr(-,root,root)
-%{_datadir}/pkg-config/emacs.pc
+%{pkgconfig}/emacs.pc
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
+- fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
+- use macro instead of variable style for buildroot.
+
 * Mon Aug 28 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
 - change group from Development to Utility
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:04:30 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 14:04:30 -0400
Subject: rpms/kernel/devel kernel.spec, 1.155,
	1.156 linux-2.6-utrace-ptrace-compat-ia64.patch, 1.4,
	1.5 linux-2.6-utrace-ptrace-compat.patch, 1.5,
	1.6 linux-2.6-utrace-regset-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.5,
	1.6 linux-2.6-utrace-tracehook-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-tracehook.patch, 1.10, 1.11
Message-ID: <200709111804.l8BI4UrW011977@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11872

Modified Files:
	kernel.spec linux-2.6-utrace-ptrace-compat-ia64.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset-ia64.patch 
	linux-2.6-utrace-regset.patch 
	linux-2.6-utrace-tracehook-ia64.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- utrace update



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kernel.spec	11 Sep 2007 17:20:35 -0000	1.155
+++ kernel.spec	11 Sep 2007 18:03:54 -0000	1.156
@@ -1791,6 +1791,9 @@
 
 %changelog
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- utrace update
+
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6
 
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-utrace-ptrace-compat-ia64.patch:

Index: linux-2.6-utrace-ptrace-compat-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat-ia64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 17:20:35 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 18:03:54 -0000	1.5
@@ -9,8 +9,8 @@
 ---
 
  arch/ia64/ia32/sys_ia32.c |   40 ++
- arch/ia64/kernel/ptrace.c | 1020 +++++----------------------------------------
- 2 files changed, 159 insertions(+), 901 deletions(-)
+ arch/ia64/kernel/ptrace.c | 1019 +++++----------------------------------------
+ 2 files changed, 159 insertions(+), 900 deletions(-)
 
 --- linux-2.6/arch/ia64/ia32/sys_ia32.c
 +++ linux-2.6/arch/ia64/ia32/sys_ia32.c
@@ -977,7 +977,7 @@
  
  /* "asmlinkage" so the input arguments are preserved... */
  
-@@ -1671,6 +770,9 @@ syscall_trace_leave (long arg0, long arg
+@@ -1670,6 +770,9 @@ syscall_trace_leave (long arg0, long arg
  	}
  }
  
@@ -987,7 +987,7 @@
  /* Utrace implementation starts here */
  
  typedef struct utrace_get {
-@@ -2464,3 +1566,119 @@ const struct utrace_regset_view *utrace_
+@@ -2463,3 +1566,119 @@ const struct utrace_regset_view *utrace_
  #endif
  	return &utrace_ia64_native;
  }

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-ptrace-compat.patch	4 Sep 2007 20:53:27 -0000	1.5
+++ linux-2.6-utrace-ptrace-compat.patch	11 Sep 2007 18:03:54 -0000	1.6
@@ -24,7 +24,7 @@
  arch/powerpc/lib/sstep.c        |    3 
  kernel/fork.c                   |    2 
  kernel/exit.c                   |   13 
- kernel/ptrace.c                 | 2055 +++++++++++++++++++++++++++++++++++++--
+ kernel/ptrace.c                 | 2056 +++++++++++++++++++++++++++++++++++++--
  kernel/sys_ni.c                 |    4 
  kernel/Makefile                 |    3 
  include/linux/sched.h           |    4 
@@ -32,7 +32,7 @@
  include/asm-x86_64/tracehook.h  |    1 
  include/asm-x86_64/ptrace-abi.h |    3 
  init/Kconfig                    |   15 
- 20 files changed, 2642 insertions(+), 780 deletions(-)
+ 20 files changed, 2643 insertions(+), 780 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
 
 --- linux-2.6/fs/proc/base.c
@@ -1331,7 +1331,7 @@
  		tsk = next_thread(tsk);
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -19,213 +19,2008 @@
+@@ -19,213 +19,2009 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1777,11 +1777,8 @@
 +static int ptrace_detach(struct task_struct *task,
 +			 struct utrace_attached_engine *engine,
 +			 struct ptrace_state *state)
- {
--	if (!valid_signal(data))
--		return -EIO;
- 
--	return -ENOSYS;
++{
++
 +	int error;
 +
 +	NO_LOCKS;
@@ -1839,29 +1836,20 @@
 +		spin_unlock_irq(&current->sighand->siglock);
 +	}
 +	return error;
- }
- 
--int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
++}
++
 +
 +/*
 + * This is called when we are exiting.  We must stop all our ptracing.
 + */
 +void
 +ptrace_exit(struct task_struct *tsk)
- {
--	int copied = 0;
++{
 +	struct list_head *pos, *n;
 +	int restart;
- 
--	while (len > 0) {
--		char buf[128];
--		int this_len, retval;
++
 +	NO_LOCKS;
- 
--		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
--		retval = access_process_vm(tsk, src, buf, this_len, 0);
--		if (!retval) {
--			if (copied)
++
 +	/*
 +	 * Taking the task_lock after PF_EXITING is set ensures that a
 +	 * child in ptrace_traceme will not put itself on our list when
@@ -1874,7 +1862,6 @@
 +	}
 +	task_unlock(tsk);
 +
-+	restart = 0;
 +	do {
 +		struct ptrace_state *state;
 +		int error;
@@ -1883,6 +1870,7 @@
 +
 +		rcu_read_lock();
 +
++		restart = 0;
 +		list_for_each_safe_rcu(pos, n, &tsk->ptracees) {
 +			state = list_entry(pos, struct ptrace_state, entry);
 +			error = utrace_detach(state->task, state->engine);
@@ -1904,7 +1892,7 @@
 +				wait_task_inactive(p);
 +				put_task_struct(p);
 +				restart = 1;
- 				break;
++				goto loop_unlocked;
 +			}
 +			else {
 +				BUG_ON(error != -ESRCH);
@@ -1914,10 +1902,11 @@
 +
 +		rcu_read_unlock();
 +
++	loop_unlocked:
 +		END_CHECK;
 +
 +		cond_resched();
-+	} while (restart > 0);
++	} while (unlikely(restart > 0));
 +
 +	if (likely(restart == 0))
 +		/*
@@ -1976,14 +1965,16 @@
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long offset, unsigned int size,
 +		     void __user *data, int write)
-+{
+ {
+-	if (!valid_signal(data))
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	int ret;
 +
 +	if (unlikely(regset == NULL))
-+		return -EIO;
-+
+ 		return -EIO;
+ 
+-	return -ENOSYS;
 +	if (size == (unsigned int) -1)
 +		size = regset->size * regset->n;
 +
@@ -2003,23 +1994,33 @@
 +	}
 +
 +	return ret;
-+}
-+
+ }
+ 
+-int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
 +int
 +ptrace_onereg_access(struct task_struct *target,
 +		     struct utrace_attached_engine *engine,
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long regno,
 +		     void __user *data, int write)
-+{
+ {
+-	int copied = 0;
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	unsigned int pos;
 +	int ret;
-+
+ 
+-	while (len > 0) {
+-		char buf[128];
+-		int this_len, retval;
 +	if (unlikely(regset == NULL))
 +		return -EIO;
-+
+ 
+-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+-		retval = access_process_vm(tsk, src, buf, this_len, 0);
+-		if (!retval) {
+-			if (copied)
+-				break;
 +	if (regno < regset->bias || regno >= regset->bias + regset->n)
 +		return -EINVAL;
 +
@@ -2191,12 +2192,6 @@
 +				ret = -ESRCH;
 +			if (unlikely(ret))
 +				BUG_ON(ret != -ESRCH);
-+		}
-+
-+		if (ret) {
-+			pr_debug("%d not stopped (%lu)\n",
-+				 child->pid, child->state);
-+			goto out_tsk_rcu;
  		}
 -		if (copy_to_user(dst, buf, retval))
 -			return -EFAULT;
@@ -2205,6 +2200,12 @@
 -		dst += retval;
 -		len -= retval;			
 +
++		if (ret) {
++			pr_debug("%d not stopped (%lu)\n",
++				 child->pid, child->state);
++			goto out_tsk_rcu;
++		}
++
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
  	}
 -	return copied;
@@ -2403,14 +2404,9 @@
 +		if (ret == 0) {
 +			ret = val;
 +			force_successful_syscall_return();
- 		}
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		goto out_tsk;
- 	}
--	return copied;
++	}
 +
 +	switch (request) {
 +	default:
@@ -2457,9 +2453,14 @@
 +					   (siginfo_t __user *) data,
 +					   sizeof(siginfo_t)))
 +				ret = -EFAULT;
-+		}
+ 		}
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		break;
-+	}
+ 	}
+-	return copied;
 +
 +out_tsk:
 +	NO_LOCKS;
@@ -2556,13 +2557,13 @@
 +	return ret;
  }
 +#endif
-+
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
++
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2572,13 +2573,13 @@
 +	      struct task_struct *p, struct ptrace_state *state)
  {
 -	int ret = -EPERM;
--
--	ret = security_ptrace(current->parent, current);
--	if (ret)
--		return -EPERM;
 +	int detach_error;
 +	struct utrace_attached_engine *engine;
  
+-	ret = security_ptrace(current->parent, current);
+-	if (ret)
+-		return -EPERM;
+-
 -	return -ENOSYS;
 +restart:
 +	NO_LOCKS;
@@ -2926,7 +2927,7 @@
 -		get_task_struct(child);
 +	if (unlikely(parent->signal == NULL))
 +		goto out;
-+
+ 
 +	sighand = parent->sighand;
 +	spin_lock_irqsave(&sighand->siglock, flags);
 +	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
@@ -2937,7 +2938,7 @@
 +	 */
 +	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
 +	spin_unlock_irqrestore(&sighand->siglock, flags);
- 
++
 +out:
  	read_unlock(&tasklist_lock);
 -	if (!child)
@@ -3179,13 +3180,15 @@
 +	NO_LOCKS;
 +	printk(KERN_ERR "ptrace out of memory, lost child %d of %d",
 +	       child->pid, parent->pid);
-+}
-+
+ }
+ 
+-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
 +static u32
 +ptrace_report_clone(struct utrace_attached_engine *engine,
 +		    struct task_struct *parent,
 +		    unsigned long clone_flags, struct task_struct *child)
-+{
+ {
+-	int copied;
 +	int event, option;
 +	struct ptrace_state *state;
 +
@@ -3216,7 +3219,9 @@
 +	}
 +	else
 +		event = 0;
-+
+ 
+-	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
+-	return (copied == sizeof(data)) ? 0 : -EIO;
 +	if (!(clone_flags & CLONE_UNTRACED)
 +	    && (event || (clone_flags & CLONE_PTRACE))) {
 +		/*
@@ -3276,7 +3281,7 @@
 +	state->have_eventmsg = 0;
 +	state->u.siginfo = info;
 +	return ptrace_report(engine, tsk, state, signo) | UTRACE_SIGNAL_IGN;
-+}
+ }
 +
 +static u32
 +ptrace_report_jctl(struct utrace_attached_engine *engine,
@@ -3367,14 +3372,12 @@
 +			   struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
- }
- 
--int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
++}
++
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
 +		   struct task_struct *tsk, long orig_code, long *code)
- {
--	int copied;
++{
 +	struct ptrace_state *state = get_ptrace_state(engine, tsk);
 +	if (unlikely(state == NULL))
 +		return UTRACE_ACTION_RESUME;
@@ -3401,11 +3404,9 @@
 +	}
 +
 +	END_CHECK;
- 
--	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
--	return (copied == sizeof(data)) ? 0 : -EIO;
++
 +	return unsafe;
- }
++}
 +
 +static struct task_struct *
 +ptrace_tracer_task(struct utrace_attached_engine *engine,

linux-2.6-utrace-regset-ia64.patch:

Index: linux-2.6-utrace-regset-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-regset-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-regset-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
@@ -603,7 +603,7 @@
  asmlinkage long
  sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
  {
-@@ -1602,6 +1617,7 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1601,6 +1616,7 @@ sys_ptrace (long request, pid_t pid, uns
  	unlock_kernel();
  	return ret;
  }
@@ -611,7 +611,7 @@
  
  /* "asmlinkage" so the input arguments are preserved... */
  
-@@ -1654,3 +1670,797 @@ syscall_trace_leave (long arg0, long arg
+@@ -1653,3 +1669,797 @@ syscall_trace_leave (long arg0, long arg
  		tracehook_report_syscall_step(&regs);
  	}
  }

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-regset.patch	11 Sep 2007 17:20:35 -0000	1.5
+++ linux-2.6-utrace-regset.patch	11 Sep 2007 18:03:55 -0000	1.6
@@ -19,12 +19,12 @@
  arch/powerpc/kernel/Makefile   |    2 
  arch/powerpc/kernel/ptrace32.c |   20 -
  arch/powerpc/kernel/ptrace.c   |  617 ++++++++++++++++++++----------
- kernel/ptrace.c                |    8 
+ kernel/ptrace.c                |    9 
  include/linux/tracehook.h      |  255 ++++++++++++-
  include/asm-i386/i387.h        |   13 -
  include/asm-x86_64/fpu32.h     |    3 
  include/asm-x86_64/tracehook.h |    8 
- 13 files changed, 2203 insertions(+), 1217 deletions(-)
+ 13 files changed, 2203 insertions(+), 1218 deletions(-)
 
 --- linux-2.6/arch/i386/kernel/i387.c
 +++ linux-2.6/arch/i386/kernel/i387.c
@@ -3841,7 +3841,7 @@
  	return -ENOSYS;
  }
  
-@@ -212,12 +206,10 @@ struct task_struct *ptrace_get_task_stru
+@@ -213,12 +206,10 @@ struct task_struct *ptrace_get_task_stru
  	return child;
  }
  

linux-2.6-utrace-tracehook-ia64.patch:

Index: linux-2.6-utrace-tracehook-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-tracehook-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
@@ -93,7 +93,7 @@
  #include <linux/smp_lock.h>
  #include <linux/user.h>
  #include <linux/security.h>
-@@ -1602,28 +1603,6 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1601,28 +1602,6 @@ sys_ptrace (long request, pid_t pid, uns
  	return ret;
  }
  
@@ -122,7 +122,7 @@
  /* "asmlinkage" so the input arguments are preserved... */
  
  asmlinkage void
-@@ -1631,9 +1610,8 @@ syscall_trace_enter (long arg0, long arg
+@@ -1630,9 +1609,8 @@ syscall_trace_enter (long arg0, long arg
  		     long arg4, long arg5, long arg6, long arg7,
  		     struct pt_regs regs)
  {
@@ -134,7 +134,7 @@
  
  	if (unlikely(current->audit_context)) {
  		long syscall;
-@@ -1668,8 +1646,11 @@ syscall_trace_leave (long arg0, long arg
+@@ -1667,8 +1645,11 @@ syscall_trace_leave (long arg0, long arg
  		audit_syscall_exit(success, result);
  	}
  

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-utrace-tracehook.patch	11 Sep 2007 17:20:35 -0000	1.10
+++ linux-2.6-utrace-tracehook.patch	11 Sep 2007 18:03:55 -0000	1.11
@@ -47,7 +47,7 @@
  arch/s390/kernel/process.c          |    3 
  arch/frv/kernel/ptrace.c            |   15 -
  arch/i386/math-emu/fpu_entry.c      |    6 -
- arch/i386/kernel/ptrace.c           |  104 ++-------
+ arch/i386/kernel/ptrace.c           |  103 ++-------
  arch/i386/kernel/signal.c           |   37 +--
  arch/i386/kernel/process.c          |    3 
  arch/i386/kernel/vm86.c             |    7 -
@@ -100,7 +100,7 @@
  include/asm-x86_64/thread_info.h    |    3 
  drivers/connector/cn_proc.c         |    4 
  mm/nommu.c                          |    4 
- 67 files changed, 904 insertions(+), 1140 deletions(-)
+ 67 files changed, 904 insertions(+), 1139 deletions(-)
  create include/linux/tracehook.h
  create include/asm-i386/tracehook.h
  create include/asm-powerpc/tracehook.h
@@ -574,7 +574,7 @@
  }
  
  /*
-@@ -476,18 +475,18 @@ long arch_ptrace(struct task_struct *chi
+@@ -475,18 +475,18 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  		if (request == PTRACE_SYSEMU) {
@@ -597,7 +597,7 @@
  		wake_up_process(child);
  		ret = 0;
  		break;
-@@ -503,7 +502,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -502,7 +502,7 @@ long arch_ptrace(struct task_struct *chi
  			break;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -606,7 +606,7 @@
  		wake_up_process(child);
  		break;
  
-@@ -513,13 +512,8 @@ long arch_ptrace(struct task_struct *chi
+@@ -512,13 +512,8 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  
@@ -621,7 +621,7 @@
  		child->exit_code = data;
  		/* give it a chance to run. */
  		wake_up_process(child);
-@@ -647,78 +641,24 @@ void send_sigtrap(struct task_struct *ts
+@@ -646,78 +641,24 @@ void send_sigtrap(struct task_struct *ts
   * - triggered by current->work.syscall_trace
   */
  __attribute__((regparm(3)))
@@ -2329,7 +2329,7 @@
  int ptrace_detach(struct task_struct *child, unsigned int data)
  {
  	if (!valid_signal(data))
-@@ -234,13 +102,10 @@ int ptrace_detach(struct task_struct *ch
+@@ -235,13 +103,10 @@ int ptrace_detach(struct task_struct *ch
  	ptrace_disable(child);
  	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  
@@ -2346,7 +2346,7 @@
  }
  
  int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
-@@ -293,103 +158,10 @@ int ptrace_writedata(struct task_struct 
+@@ -294,103 +159,10 @@ int ptrace_writedata(struct task_struct 
  	return copied;
  }
  
@@ -2451,7 +2451,7 @@
  }
  
  /**
-@@ -402,20 +174,11 @@ int ptrace_traceme(void)
+@@ -403,20 +175,11 @@ int ptrace_traceme(void)
  {
  	int ret = -EPERM;
  
@@ -2477,7 +2477,7 @@
  }
  
  /**
-@@ -452,42 +215,7 @@ struct task_struct *ptrace_get_task_stru
+@@ -453,42 +216,7 @@ struct task_struct *ptrace_get_task_stru
  #ifndef __ARCH_SYS_PTRACE
  asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
  {



From fedora-extras-commits at redhat.com  Tue Sep 11 18:11:00 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Tue, 11 Sep 2007 14:11:00 -0400
Subject: rpms/samba/F-7 .cvsignore, 1.42, 1.43 filter-requires-samba.sh, 1.5,
	1.6 samba.spec, 1.130, 1.131 sources, 1.46,
	1.47 samba-3.0.25-imdap-basedn.patch, 1.1, NONE
Message-ID: <200709111811.l8BIB028012346@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12293

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec sources 
Removed Files:
	samba-3.0.25-imdap-basedn.patch 
Log Message:
* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
- upgrade to the latest upstream realease
- includes security fixes released today in 3.0.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	21 Aug 2007 13:53:11 -0000	1.42
+++ .cvsignore	11 Sep 2007 18:10:27 -0000	1.43
@@ -1 +1 @@
-samba-3.0.25c.tar.gz
+samba-3.0.26a.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/filter-requires-samba.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filter-requires-samba.sh	14 Mar 2007 10:21:24 -0000	1.5
+++ filter-requires-samba.sh	11 Sep 2007 18:10:27 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8|smbldap_tools)'


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- samba.spec	21 Aug 2007 13:53:11 -0000	1.130
+++ samba.spec	11 Sep 2007 18:10:27 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25c
+Version: 3.0.26a
 Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -41,7 +41,6 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch210: samba-3.0.25-imdap-basedn.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -158,7 +157,6 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
-%patch210 -p1 -b .idmap_basedn
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -641,6 +639,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
+- upgrade to the latest upstream realease
+- includes security fixes released today in 3.0.26
+
 * Tue Aug 21 2007 Simo Sorce <ssorce at redhat.com> 3.0.25c-0.fc7
 - update to 3.0.25c
 - add patch to fix samba bugzilla 4772


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	21 Aug 2007 13:53:11 -0000	1.46
+++ sources	11 Sep 2007 18:10:27 -0000	1.47
@@ -1 +1 @@
-87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz
+6511ff23d9b1d4858744778bba543c5d  samba-3.0.26a.tar.gz


--- samba-3.0.25-imdap-basedn.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 18:12:06 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:12:06 -0400
Subject: rpms/mksh/devel .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709111812.l8BIC6Nj012419@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:27:40 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:11:32 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:27:40 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:11:32 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:27:41 -0000	1.5
+++ sources	11 Sep 2007 18:11:32 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:13:15 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:13:15 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.5,1.6 mksh.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709111813.l8BIDFIp012491@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12450

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:29:14 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:12:41 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:29:14 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:12:41 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:29:14 -0000	1.5
+++ sources	11 Sep 2007 18:12:41 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:14:22 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:14:22 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111814.l8BIEMRq012588@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12516

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:31:16 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:13:49 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:31:16 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:13:49 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:31:16 -0000	1.5
+++ sources	11 Sep 2007 18:13:49 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:15:36 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:15:36 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111815.l8BIFaeV012668@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12629

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:32:33 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:15:03 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:32:33 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:15:03 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:32:33 -0000	1.5
+++ sources	11 Sep 2007 18:15:03 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:16:30 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:16:30 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111816.l8BIGUhf012720@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12688

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:33:53 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:15:57 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:33:53 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:15:57 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:33:53 -0000	1.5
+++ sources	11 Sep 2007 18:15:57 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:22:09 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 11 Sep 2007 14:22:09 -0400
Subject: rpms/gnash/OLPC-2 .cvsignore, 1.5, 1.6 gnash.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200709111822.l8BIM9io013111@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jul 2007 16:09:51 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:21:35 -0000	1.6
@@ -1,3 +1,4 @@
 gnash-0.7.2.tar.bz2
 gnash-0.8.0.tar.bz2
 gnash-0.8.1.20070718cvs.tar.bz2
+gnash-0.8.1.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnash.spec	18 Jul 2007 16:09:51 -0000	1.18
+++ gnash.spec	11 Sep 2007 18:21:35 -0000	1.19
@@ -1,14 +1,12 @@
-%define alphatag 20070718cvs
-
 Name:           gnash
 Version:        0.8.1
-Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.%{alphatag}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -116,6 +114,9 @@
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
 %changelog
+* Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> - 0.8.1-1
+- update to release
+
 * Wed Jul 18 2007 John (J5) Palmieri <johnp at redhat.com> - 0.8.1-0.1.20070718cvs
 - update to CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jul 2007 16:09:51 -0000	1.5
+++ sources	11 Sep 2007 18:21:35 -0000	1.6
@@ -1 +1 @@
-7b4d3dc51ba1902af113e7d001b90b41  gnash-0.8.1.20070718cvs.tar.bz2
+5f80a25cb7a37fb351d28fd2097d8f3e  gnash-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 18:34:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 11 Sep 2007 14:34:15 -0400
Subject: rpms/gperiodic/devel gtk.patch,NONE,1.1 gperiodic.spec,1.8,1.9
Message-ID: <200709111834.l8BIYFDX013720@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13689

Modified Files:
	gperiodic.spec 
Added Files:
	gtk.patch 
Log Message:


gtk.patch:

--- NEW FILE gtk.patch ---
--- gperiodic-2.0.10/Makefile	2007-07-11 14:58:05.000000000 +0200
+++ gperiodic-2.0.10/Makefile	2007-09-11 20:11:45.000000000 +0200
@@ -1,5 +1,5 @@
 CC := gcc
-CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
 LIBS :=`pkg-config --libs gtk+-2.0`
 bindir ?= /usr/bin
 datadir ?= /usr/share


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gperiodic.spec	8 Sep 2007 07:20:43 -0000	1.8
+++ gperiodic.spec	11 Sep 2007 18:33:42 -0000	1.9
@@ -1,14 +1,15 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
+Patch1: gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -54,6 +56,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-2
+- Patch to erase DGTK_DISABLE_DEPRECATED flag from the Makefile
+
 * Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:41:47 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 14:41:47 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.55,1.56
Message-ID: <200709111841.l8BIflUx013989@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13944

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- policy-20070501.patch	11 Sep 2007 15:56:03 -0000	1.55
+++ policy-20070501.patch	11 Sep 2007 18:41:14 -0000	1.56
@@ -2198,7 +2198,7 @@
  /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-27 09:57:21.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-09-11 14:40:52.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2301,7 +2301,32 @@
  ')
  
  ########################################
-@@ -3310,6 +3346,43 @@
+@@ -3112,6 +3148,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Manage temporary directories in /tmp.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`files_manage_generic_tmp_dirs',`
++	gen_require(`
++		type tmp_t;
++	')
++
++	manage_dirs_pattern($1,tmp_t,tmp_t)
++')
++
++########################################
++## <summary>
+ ##	Manage temporary files and directories in /tmp.
+ ## </summary>
+ ## <param name="domain">
+@@ -3310,6 +3364,43 @@
  
  ########################################
  ## <summary>
@@ -2345,7 +2370,7 @@
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3386,6 +3459,24 @@
+@@ -3386,6 +3477,24 @@
  
  ########################################
  ## <summary>
@@ -2370,7 +2395,7 @@
  ##	Read symbolic links in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3432,6 +3523,24 @@
+@@ -3432,6 +3541,24 @@
  
  ########################################
  ## <summary>
@@ -2395,7 +2420,7 @@
  ##	Do not audit attempts to search /usr/src.
  ## </summary>
  ## <param name="domain">
-@@ -3637,7 +3746,7 @@
+@@ -3637,7 +3764,7 @@
  		type var_t;
  	')
  
@@ -2404,7 +2429,7 @@
  ')
  
  ########################################
-@@ -3993,7 +4102,7 @@
+@@ -3993,7 +4120,7 @@
  		type var_lock_t;
  	')
  
@@ -2413,7 +2438,7 @@
  ')
  
  ########################################
-@@ -4012,7 +4121,7 @@
+@@ -4012,7 +4139,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2422,7 +2447,7 @@
  ')
  
  ########################################
-@@ -4181,7 +4290,7 @@
+@@ -4181,7 +4308,7 @@
  		type var_run_t;
  	')
  
@@ -2431,7 +2456,7 @@
  ')
  
  ########################################
-@@ -4529,6 +4638,8 @@
+@@ -4529,6 +4656,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2440,7 +2465,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4551,6 +4662,8 @@
+@@ -4551,6 +4680,8 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2449,7 +2474,7 @@
  ')
  
  ########################################
-@@ -4588,3 +4701,28 @@
+@@ -4588,3 +4719,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 11 18:46:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 11 Sep 2007 14:46:59 -0400
Subject: rpms/mach/F-7 .cvsignore, 1.5, 1.6 mach.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <200709111846.l8BIkxeE014189@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14155/F-7

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2007 21:47:36 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:46:26 -0000	1.6
@@ -1 +1 @@
-mach-0.9.1.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/mach.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mach.spec	24 Jan 2007 10:44:09 -0000	1.12
+++ mach.spec	11 Sep 2007 18:46:26 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           mach
-Version:        0.9.1
+Version:        0.9.2
 Release:        2%{?dist}
-Summary:        make a chroot
+Summary:        Make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -44,7 +44,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=updates
 make
 
 %install
@@ -56,19 +56,13 @@
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/tmp/mach
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach
 
-# the ppc dist files were not added to the dist, so install them manually
-for v in 4 5 6 development
-do
-  install -m 644 etc/dist.d/fedora-$v-ppc %{_sysconfdir}/mach/dist.d
-done
-
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -102,6 +96,18 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
+- License: GPLv2+
+
 * Wed Jan 24 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2
 - add ppc files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:47:36 -0000	1.6
+++ sources	11 Sep 2007 18:46:26 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 18:56:02 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Sep 2007 14:56:02 -0400
Subject: rpms/firefox/devel firefox-2.0-indicator-crash.patch, NONE,
	1.1 firefox.spec, 1.195, 1.196
Message-ID: <200709111856.l8BIu2OH014597@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14563

Modified Files:
	firefox.spec 
Added Files:
	firefox-2.0-indicator-crash.patch 
Log Message:
* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
- Fix crashes when using GTK+ themes containing a gtkrc which specify 
  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing


firefox-2.0-indicator-crash.patch:

--- NEW FILE firefox-2.0-indicator-crash.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=389801

--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
+++ mozilla/gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
     else
         *indicator_spacing = default_indicator_spacing;
 
-    g_free(tmp_indicator_size);
-    g_free(tmp_indicator_spacing);
+    gtk_requisition_free(tmp_indicator_size);
+    gtk_border_free(tmp_indicator_spacing);
  
     return MOZ_GTK_SUCCESS;
 }


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- firefox.spec	10 Sep 2007 13:10:00 -0000	1.195
+++ firefox.spec	11 Sep 2007 18:55:30 -0000	1.196
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -71,6 +71,7 @@
 Patch102:       firefox-1.5-theme-change.patch
 Patch104:       firefox-1.5-ppc64.patch
 Patch105:       firefox-2.0-dnd.patch
+Patch106:       firefox-2.0-indicator-crash.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -172,6 +173,7 @@
 %patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 %patch105 -p0 -b .dnd
+%patch106 -p1 -b .indicator-crash
 
 # For branding specific patches.
 
@@ -438,6 +440,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
+- Fix crashes when using GTK+ themes containing a gtkrc which specify 
+  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
 - added fix for #246248 - firefox crashes when searching for word "do"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:59:03 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Sep 2007 14:59:03 -0400
Subject: rpms/thunderbird/devel firefox-2.0-indicator-crash.patch, NONE,
	1.1 thunderbird.spec, 1.103, 1.104
Message-ID: <200709111859.l8BIx3CD014734@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14713

Modified Files:
	thunderbird.spec 
Added Files:
	firefox-2.0-indicator-crash.patch 
Log Message:
* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
- Fix crashes when using GTK+ themes containing a gtkrc which specify 
  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing


firefox-2.0-indicator-crash.patch:

--- NEW FILE firefox-2.0-indicator-crash.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=389801

--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
+++ mozilla/gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
     else
         *indicator_spacing = default_indicator_spacing;
 
-    g_free(tmp_indicator_size);
-    g_free(tmp_indicator_spacing);
+    gtk_requisition_free(tmp_indicator_size);
+    gtk_border_free(tmp_indicator_spacing);
  
     return MOZ_GTK_SUCCESS;
 }


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- thunderbird.spec	10 Sep 2007 13:29:23 -0000	1.103
+++ thunderbird.spec	11 Sep 2007 18:58:30 -0000	1.104
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -62,6 +62,7 @@
 Patch102:       firefox-1.5-theme-change.patch
 Patch103:       thunderbird-1.5-profile-migrator.patch
 Patch104:       firefox-1.5-dnd-nograb.patch
+Patch106:       firefox-2.0-indicator-crash.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -143,6 +144,7 @@
 %patch102 -p0 -b .theme-change
 %patch103 -p1 -b .profile-migrator
 #%patch104 -p1 -b .dnd-nograb
+%patch106 -p1 -b .indicator-crash
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -314,6 +316,10 @@
 #===============================================================================
 
 %changelog
+* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
+- Fix crashes when using GTK+ themes containing a gtkrc which specify 
+  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
 - added fix for #246248 - firefox crashes when searching for word "do"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:03:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 15:03:48 -0400
Subject: rpms/krb5/devel kadmind.init,1.11,1.12
Message-ID: <200709111903.l8BJ3mdc020889@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20836

Modified Files:
	kadmind.init 
Log Message:
- don't exit if we have a kldap db



Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadmind.init	6 Sep 2007 20:07:18 -0000	1.11
+++ kadmind.init	11 Sep 2007 19:03:15 -0000	1.12
@@ -34,8 +34,8 @@
 	    # then we don't know for sure that this is an error.
   	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
+	        exit 0
 	    fi
-	    exit 0
 	fi
   	if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
 	    echo $"Error. This appears to be a slave server, found kpropd.acl"



From fedora-extras-commits at redhat.com  Tue Sep 11 19:04:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 15:04:35 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.31,
	1.32 policycoreutils.spec, 1.446, 1.447
Message-ID: <200709111904.l8BJ4Z4d021031@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
- Remove bogus import libxml2 


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policycoreutils-gui.patch	10 Sep 2007 19:45:03 -0000	1.31
+++ policycoreutils-gui.patch	11 Sep 2007 19:04:32 -0000	1.32
@@ -1,7 +1,7 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,227 @@
++++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
+@@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
 +#
@@ -27,7 +27,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -231,8 +230,8 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,210 @@
++++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
+@@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -254,7 +253,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import seobject
 +import commands
@@ -445,8 +443,8 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,180 @@
++++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
+@@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -469,7 +467,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands
@@ -667,8 +664,8 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,57 @@
++++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
+@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -691,7 +688,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -728,8 +724,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,182 @@
++++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
+@@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -753,7 +749,6 @@
 +import gtk.glade
 +import os
 +import commands
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -3304,8 +3299,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 15:43:11.000000000 -0400
-@@ -0,0 +1,453 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
+@@ -0,0 +1,452 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3333,7 +3328,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import gnome
 +import sys
@@ -4492,8 +4486,8 @@
 +	
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,248 @@
++++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
+@@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -4516,7 +4510,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -5044,8 +5037,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,137 @@
++++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
+@@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -5068,7 +5061,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -5185,8 +5177,8 @@
 +    
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,220 @@
++++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
+@@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -5209,7 +5201,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -8739,8 +8730,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,172 @@
++++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
+@@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -8768,7 +8759,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import gnome
 +import sys
@@ -10312,8 +10302,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,119 @@
++++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
+@@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -10336,7 +10326,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -10435,8 +10424,8 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,173 @@
++++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
+@@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -10459,7 +10448,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- policycoreutils.spec	10 Sep 2007 19:45:03 -0000	1.446
+++ policycoreutils.spec	11 Sep 2007 19:04:32 -0000	1.447
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
+- Remove bogus import libxml2 
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
 - Lots of fixes for polgengui
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:10:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 15:10:30 -0400
Subject: rpms/GConf2/devel dir-leak.patch, NONE, 1.1 sync-leak.patch, NONE, 
	1.1 GConf2.spec, 1.62, 1.63
Message-ID: <200709111910.l8BJAUbj021215@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21187

Modified Files:
	GConf2.spec 
Added Files:
	dir-leak.patch sync-leak.patch 
Log Message:
fix some memory leaks


dir-leak.patch:

--- NEW FILE dir-leak.patch ---
diff -up GConf-2.19.1/backends/markup-tree.c.dir-leak GConf-2.19.1/backends/markup-tree.c
--- GConf-2.19.1/backends/markup-tree.c.dir-leak	2007-09-11 14:51:12.000000000 -0400
+++ GConf-2.19.1/backends/markup-tree.c	2007-09-11 14:52:30.000000000 -0400
@@ -263,6 +263,7 @@ markup_dir_free (MarkupDir *dir)
 
       tmp = tmp->next;
     }
+  g_slist_free (dir->entries);
 
   tmp = dir->subdirs;
   while (tmp)
@@ -273,6 +274,7 @@ markup_dir_free (MarkupDir *dir)
 
       tmp = tmp->next;
     }
+  g_slist_free (dir->subdirs);
 
   g_free (dir->name);
 

sync-leak.patch:

--- NEW FILE sync-leak.patch ---
diff -up GConf-2.19.1/backends/xml-cache.c.leaks GConf-2.19.1/backends/xml-cache.c
--- GConf-2.19.1/backends/xml-cache.c.leaks	2007-09-11 10:54:43.000000000 -0400
+++ GConf-2.19.1/backends/xml-cache.c	2007-09-11 10:54:58.000000000 -0400
@@ -272,6 +272,7 @@ cache_sync (Cache    *cache,
 
   /* sync it all */
   g_slist_foreach (list, (GFunc) cache_sync_foreach, &sd);
+  g_slist_free (list);
 
   /* If we deleted some subdirs, we may now be able to delete
    * more parent dirs. So go ahead and do the sync again.


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- GConf2.spec	23 Aug 2007 18:12:43 -0000	1.62
+++ GConf2.spec	11 Sep 2007 19:09:57 -0000	1.63
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.19.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
@@ -27,6 +27,9 @@
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
 Patch1: GConf2-2.14.0-timeout.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=475970
+Patch2: sync-leak.patch 
+Patch3: dir-leak.patch 
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -63,6 +66,8 @@
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .timers  
+%patch2 -p1 -b .sync-leak
+%patch3 -p1 -b .dir-leak
 
 %build
 rm -f libtool
@@ -124,6 +129,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-4
+- Fix memory leaks
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.1-3
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:14:49 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 15:14:49 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.56,1.57
Message-ID: <200709111914.l8BJEnP8021722@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21668

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- policy-20070501.patch	11 Sep 2007 18:41:14 -0000	1.56
+++ policy-20070501.patch	11 Sep 2007 19:14:45 -0000	1.57
@@ -281,7 +281,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 09:15:03.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 15:13:25.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(amanda,1.5.0)
@@ -346,17 +346,16 @@
  kernel_read_system_state(amanda_t)
  kernel_read_kernel_sysctls(amanda_t)
  kernel_dontaudit_getattr_unlabeled_files(amanda_t)
-@@ -113,7 +117,8 @@
+@@ -113,7 +117,7 @@
  # Added for targeted policy
  term_use_unallocated_ttys(amanda_t)
  
 -corenet_non_ipsec_sendrecv(amanda_t)
 +corenet_all_recvfrom_unlabeled(amanda_t)
-+corenet_all_recvfrom_netlabel(amanda_t)
  corenet_tcp_sendrecv_all_if(amanda_t)
  corenet_udp_sendrecv_all_if(amanda_t)
  corenet_raw_sendrecv_all_if(amanda_t)
-@@ -150,8 +155,6 @@
+@@ -150,8 +154,6 @@
  libs_use_ld_so(amanda_t)
  libs_use_shared_libs(amanda_t)
  
@@ -365,7 +364,7 @@
  optional_policy(`
  	auth_read_shadow(amanda_t)
  ')
-@@ -160,14 +163,6 @@
+@@ -160,14 +162,6 @@
  	logging_send_syslog_msg(amanda_t)
  ')
  
@@ -380,7 +379,7 @@
  ########################################
  #
  # Amanda recover local policy
-@@ -197,10 +192,13 @@
+@@ -197,10 +191,12 @@
  manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
  files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
  
@@ -391,11 +390,10 @@
  
 -corenet_non_ipsec_sendrecv(amanda_recover_t)
 +corenet_all_recvfrom_unlabeled(amanda_recover_t)
-+corenet_all_recvfrom_netlabel(amanda_recover_t)
  corenet_tcp_sendrecv_all_if(amanda_recover_t)
  corenet_udp_sendrecv_all_if(amanda_recover_t)
  corenet_tcp_sendrecv_all_nodes(amanda_recover_t)
-@@ -232,14 +230,4 @@
+@@ -232,14 +228,4 @@
  
  miscfiles_read_localization(amanda_recover_t)
  
@@ -5256,8 +5254,8 @@
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.6.4/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-08-07 09:42:35.000000000 -0400
-@@ -2,15 +2,20 @@
++++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-09-11 15:14:23.000000000 -0400
+@@ -2,15 +2,22 @@
  /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
  /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
  
@@ -5283,6 +5281,8 @@
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 +
++/var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/log/pm(/.*)?				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.6.4/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/hal.if	2007-08-07 09:42:35.000000000 -0400



From fedora-extras-commits at redhat.com  Tue Sep 11 19:22:10 2007
From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp))
Date: Tue, 11 Sep 2007 15:22:10 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch, 1.1, 1.2
Message-ID: <200709111922.l8BJMAo2022246@cvs-int.fedora.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22225

Modified Files:
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch 
Log Message:
Add note to bg-none patch about when it can be dropped

xorg-x11-server-1.1.0-dont-backfill-bg-none.patch:

Index: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-dont-backfill-bg-none.patch	12 Jul 2006 23:29:00 -0000	1.1
+++ xorg-x11-server-1.1.0-dont-backfill-bg-none.patch	11 Sep 2007 19:22:07 -0000	1.2
@@ -1,6 +1,14 @@
 Disable backfilling of windows created with bg=none, which otherwise
 would force a framebuffer readback.
 
+Note that this patch can only be dropped if you verify that 
+
+   https://bugzilla.redhat.com/show_bug.cgi?id=285991
+
+is fixed (which it is in upstream git as of 
+
+f98dfec79dadb70fa7bba84e7335f92b3a73dc02
+
 --- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
 +++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
 @@ -478,6 +478,7 @@



From fedora-extras-commits at redhat.com  Tue Sep 11 19:22:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 11 Sep 2007 15:22:58 -0400
Subject: rpms/rpmlint/EL-5 rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 rpmlint-CHANGES.package.old, NONE, 1.1 .cvsignore, 1.16,
	1.17 rpmlint.config, 1.5, 1.6 rpmlint.spec, 1.29, 1.30 sources,
	1.16, 1.17
Message-ID: <200709111922.l8BJMwoN022310@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22257

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch rpmlint-CHANGES.package.old 
Log Message:
Sync with devel + Wiki license list rev 90

rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


--- NEW FILE rpmlint-CHANGES.package.old ---
* Sun Nov 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-2
- Take file based dependencies into account in dangling symlink checks
  (completes the fix for #165839).
- Skip some checks for binaries not understood by objdump (#165173).
- Improve long descriptions of some script warnings.
- Fix command output parsing in non-English locales.
- Import Enrico's latest DocFilesCheck (with some local tweaks).
- Use rm instead of %%exclude.

* Wed Nov 16 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Add DocFilesCheck from Enrico Scholz.

* Sat Sep  3 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Improve accuracy of doc, info and games path regexps.
- Improve error message when invoked on non-rpm files.
- Filter more Mandriva specific warnings.

* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Add dangling symlink exceptions tuned for Fedora to default config
  (partially fixes #165839).

* Wed Aug 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-1
- 0.71, confmsg patch and bits from initvars patch applied upstream.
- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
- Patch to not warn about non-empty *.bs (in Perl packages).
- Patch to clarify PreReq explanation, make it a warning instead of an error.
- Patch to warn about use of BuildPreReq.

* Thu Jul  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-4
- Fix false "positives" from libtool archives confused as scripts,
  non-executable scripts installed in docs, FE disttags, unsuccessfully
  expanded shell variables and quotation in init scripts.

* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-3
- 0.70, use sed instead of perl during build.
- Default configuration improvements: allow Development/Debug group (for
  debuginfo packages), filter out errors/warnings about non-indexed jars,
  invalid LC_MESSAGES and man page dirs, and library packages containing
  something else in addition to libraries.
- Make info about non-config files in /etc more accurate.
- Patch to warn about services that default to enabled after "chkconfig add",
  not the other way around.

* Thu May 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-3
- Filter out more not-that-useful messages in the default config.

* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-2
- 0.69.
- Simplify bash-completion snippet installation, remove triggers.
- Default configuration improvements: filter messages about missing packager,
  Mandriva specific package naming conventions, %%ghost files without
  %%post scriptlets, and 0664 source permissions.
- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
- Convert docs to UTF-8.
- Improve summary.

* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
- 0.68, siteperl patch applied upstream.
- Fix "no-dependency-on" filtering in default config.
- Add LaTeX Project Public License to default config.
- Remove upstream-only %%changelog entries.

* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
- 0.67.
- Patch to catch more site_perl directories.
- Default config improvements: filter Distribution and Vendor warnings,
  use empty string instead of None for release extension (fixes -i).

* Sat Jan 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.65-1
- Update to 0.65.

* Sat Jan  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.64-1
- Update to 0.64.
- Default config tweaks: don't mandate Epochs nor "fdr" in Release.

* Tue Oct 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
- Requires cpio (bug 2169).

* Sun Oct  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
- Update to 0.61.

* Mon Aug 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
- Update to 0.60.

* Mon May  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
- Update to 0.59.

* Sun Feb 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
- Update to 0.57.1.

* Wed Feb 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
- Update to 0.56.

* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).

* Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
- Add back %%ghost handling of not-installed compiled versions of *.py.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
- Update to 0.55.
- Spec cleanups.

* Tue Dec 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
- Update to 0.53.

* Thu Oct  2 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
- Add list of valid shells for post'n'friends scriptlets into default config.

* Sat Sep 13 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
- Update to 0.52.

* Thu Sep  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
- Filter more Mdk-specific warnings in default config.

* Wed Sep  3 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
- Upstream tarball reappeared, use it.

* Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
- Filter Mdk-specific python-related stuff in the default config.

* Fri Aug 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
- Update to 0.51.1.
- Own %%ghost'ed *.py{c,o}, and ditto for the config file.
- Add list of valid licenses to default config.
- Set "Fedora Linux" as suggested distribution in default config.
- Clean up %%doc list.

* Fri May  9 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
- Update to 0.50, all patches now applied upstream.

* Mon May  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Filter out mdk-specific "no-dependancy perl-base" messages in config.

* Thu May  1 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
- Update to 0.49.

* Sun Apr 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
- Add one more strict Epoch checking patch.
- Slightly enhanced default config.

* Fri Apr 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
- Patch to work with installed packages (including -a) and rpm 4.2.
- Remove spurious rpm-devel BuildRequirement.

* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
- Patch to work with packages signed with an unknown key.
- Save .spec in UTF-8.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
- First Fedora release, based on upstream spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 May 2007 18:59:06 -0000	1.16
+++ .cvsignore	11 Sep 2007 19:22:25 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmlint.config	3 Mar 2007 16:56:27 -0000	1.5
+++ rpmlint.config	11 Sep 2007 19:22:26 -0000	1.6
@@ -19,10 +19,152 @@
     "/usr/bin/perl",
     "/usr/bin/python",
 ))
+
 setOption("DanglingSymlinkExceptions", (
     ['consolehelper$', 'usermode'],
     ['consolehelper-gtk$', 'usermode-gtk'],
 ))
+
+setOption("ValidLicenses", (
+    # These are the short names for all of the Fedora approved licenses.
+    # The master list is kept here: http://fedoraproject.org/wiki/Licensing
+    # Last synced with Wiki revision 90 of that page.
+    'Adobe',
+    'Affero GPL',
+    'AFL',
+    'ARL',
+    'ASL 1.0',
+    'ASL 1.0+',
+    'ASL 1.1',
+    'ASL 1.1+',
+    'ASL 2.0',
+    'ASL 2.0+',
+    'APSL 2.0',
+    'APSL 2.0+',
+    'Artistic 2.0',
+    'Artistic clarified',
+    'BitTorrent',
+    'Boost',
+    'BSD',
+    'BSD with advertising',
+    'CeCILL',
+    'CDDL',
+    'CPL',
+    'Condor',
+    'Copyright only',
+    'Cryptix',
+    'Crystal Stacker',
+    'EPL',
+    'eCos',
+    'EFL 2.0',
+    'EFL 2.0+',
+    'EU Datagrid',
+    'FTL',
+    'Giftware',
+    'Glide',
+    'gnuplot',
+    'GPL+',
+    'GPL+ or Artistic',
+    'GPLv2',
+    'GPLv2 with exceptions',
+    'GPLv2+',
+    'GPLv2+ with exceptions',
+    'GPLv3',
+    'GPLv3 with exceptions',
+    'GPLv3+',
+    'GPLv3+ with exceptions',
+    'IBM',
+    'IJG',
+    'ImageMagick',
+    'iMatix',
+    'Imlib2',
+    'Intel ACPI',
+    'Interbase',
+    'ISC',
+    'Jabber',
+    'JasPer',
+    'LGPLv2',
+    'LGPLv2 with exceptions',
+    'LGPLv2+',
+    'LGPLv3',
+    'LGPLv3+',
+    'libtiff',
+    'LPL',
+    'LPPL',
+    'mecab-ipadic',
+    'MIT',
+    'MPLv1.0',
+    'MPLv1.0+',
+    'MPLv1.1',
+    'MPLv1.1+',
+    'NCSA',
+    'NGPL',
+    'NOSL',
+    'Netscape',
+    'Nokia',
+    'OpenLDAP',
+    'OpenPBS',
+    'OSL 1.0',
+    'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
+    'OSL 2.0',
+    'OSL 2.0+',
+    'OSL 3.0',
+    'OSL 3.0+',
+    'OpenSSL',
+    'Phorum',
+    'PHP',
+    'Public Domain',
+    'Python',
+    'QPL',
+    'RPSL',
+    'Ruby',
+    'Sleepycat',
+    'SISSL',
+    'SLIB',
+    'SPL',
+    'TCL',
+    'UCD',
+    'Vim',
+    'VNLSL',
+    'VSL',
+    'W3C',
+    'WTFPL',
+    'wxWindows',
+    'xinetd',
+    'Zend',
+    'ZPLv1.0',
+    'ZPLv1.0+',
+    'ZPLv2.0',
+    'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
+    'zlib',
+    # Documentation licenses
+    'CDL',
+    'FBSDDL',
+    'GFDL',
+    'IEEE',
+    'OFSFDL',
+    'Open Publication',
+    # Content licenses
+    'CC-BY',
+    'CC-BY-SA',
+    'DSL',
+    'Free Art',
+    # Font licenses
+    'Arphic',
+    'Bitstream Vera',
+    'mplus',
+    'OFL',
+    'Utopia',
+    'XANO',
+    # Others
+    'Redistributable, no modification permitted',
+    'Freely redistributable without restriction',
+))
+
 # Standard users & groups from the setup package:
 setOption("StandardUsers",
           ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
@@ -52,7 +194,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
+addFilter(" doc-file-dependency .* /bin/sh$")
+addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rpmlint.spec	13 May 2007 18:59:06 -0000	1.29
+++ rpmlint.spec	11 Sep 2007 19:22:26 -0000	1.30
@@ -1,15 +1,17 @@
 Name:           rpmlint
-Version:        0.80
-Release:        1%{?dist}
+Version:        0.81
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2
 URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
+Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,7 +34,9 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
+install -pm 644 %{SOURCE2} CHANGES.package.old
 
 
 %build
@@ -55,7 +59,7 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog CHANGES.package.old README
 %config(noreplace) %{_sysconfdir}/rpmlint/
 %{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
@@ -66,6 +70,27 @@
 
 
 %changelog
+* Tue Sep 11 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-2
+- Sync Fedora license list with Wiki rev 90.
+
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-3
+- Sync Fedora license list with Wiki rev 68.
+- Move pre-2006 changelog entries to CHANGES.package.old.
+
+* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
+- new fedora licensing scheme
+
+* Thu May 31 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Filter hardcoded-library-path errors for /lib/udev.
+
 * Thu Apr 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-1
 - 0.80, fixes #227389, #228645, #233795.
 - Accept "Redistributable, no modification permitted" as a valid license.
@@ -119,156 +144,3 @@
 - Sync with upstream CVS as of 2006-01-15, includes improved versions of
   most of the earlier patches.
 - Add dependency on binutils.
-
-* Sun Nov 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-2
-- Take file based dependencies into account in dangling symlink checks
-  (completes the fix for #165839).
-- Skip some checks for binaries not understood by objdump (#165173).
-- Improve long descriptions of some script warnings.
-- Fix command output parsing in non-English locales.
-- Import Enrico's latest DocFilesCheck (with some local tweaks).
-- Use rm instead of %%exclude.
-
-* Wed Nov 16 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Add DocFilesCheck from Enrico Scholz.
-
-* Sat Sep  3 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Improve accuracy of doc, info and games path regexps.
-- Improve error message when invoked on non-rpm files.
-- Filter more Mandriva specific warnings.
-
-* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Add dangling symlink exceptions tuned for Fedora to default config
-  (partially fixes #165839).
-
-* Wed Aug 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-1
-- 0.71, confmsg patch and bits from initvars patch applied upstream.
-- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
-- Patch to not warn about non-empty *.bs (in Perl packages).
-- Patch to clarify PreReq explanation, make it a warning instead of an error.
-- Patch to warn about use of BuildPreReq.
-
-* Thu Jul  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-4
-- Fix false "positives" from libtool archives confused as scripts,
-  non-executable scripts installed in docs, FE disttags, unsuccessfully
-  expanded shell variables and quotation in init scripts.
-
-* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-3
-- 0.70, use sed instead of perl during build.
-- Default configuration improvements: allow Development/Debug group (for
-  debuginfo packages), filter out errors/warnings about non-indexed jars,
-  invalid LC_MESSAGES and man page dirs, and library packages containing
-  something else in addition to libraries.
-- Make info about non-config files in /etc more accurate.
-- Patch to warn about services that default to enabled after "chkconfig add",
-  not the other way around.
-
-* Thu May 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-3
-- Filter out more not-that-useful messages in the default config.
-
-* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-2
-- 0.69.
-- Simplify bash-completion snippet installation, remove triggers.
-- Default configuration improvements: filter messages about missing packager,
-  Mandriva specific package naming conventions, %%ghost files without
-  %%post scriptlets, and 0664 source permissions.
-- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
-- Convert docs to UTF-8.
-- Improve summary.
-
-* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
-- 0.68, siteperl patch applied upstream.
-- Fix "no-dependency-on" filtering in default config.
-- Add LaTeX Project Public License to default config.
-- Remove upstream-only %%changelog entries.
-
-* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
-- 0.67.
-- Patch to catch more site_perl directories.
-- Default config improvements: filter Distribution and Vendor warnings,
-  use empty string instead of None for release extension (fixes -i).
-
-* Sat Jan 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.65-1
-- Update to 0.65.
-
-* Sat Jan  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.64-1
-- Update to 0.64.
-- Default config tweaks: don't mandate Epochs nor "fdr" in Release.
-
-* Tue Oct 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
-- Requires cpio (bug 2169).
-
-* Sun Oct  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
-- Update to 0.61.
-
-* Mon Aug 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
-- Update to 0.60.
-
-* Mon May  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
-- Update to 0.59.
-
-* Sun Feb 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
-- Update to 0.57.1.
-
-* Wed Feb 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
-- Update to 0.56.
-
-* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
-- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).
-
-* Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
-- Add back %%ghost handling of not-installed compiled versions of *.py.
-
-* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
-- Update to 0.55.
-- Spec cleanups.
-
-* Tue Dec 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
-- Update to 0.53.
-
-* Thu Oct  2 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
-- Add list of valid shells for post'n'friends scriptlets into default config.
-
-* Sat Sep 13 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
-- Update to 0.52.
-
-* Thu Sep  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
-- Filter more Mdk-specific warnings in default config.
-
-* Wed Sep  3 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
-- Upstream tarball reappeared, use it.
-
-* Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
-- Filter Mdk-specific python-related stuff in the default config.
-
-* Fri Aug 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
-- Update to 0.51.1.
-- Own %%ghost'ed *.py{c,o}, and ditto for the config file.
-- Add list of valid licenses to default config.
-- Set "Fedora Linux" as suggested distribution in default config.
-- Clean up %%doc list.
-
-* Fri May  9 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
-- Update to 0.50, all patches now applied upstream.
-
-* Mon May  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
-- %%{buildroot} -> $RPM_BUILD_ROOT.
-- Filter out mdk-specific "no-dependancy perl-base" messages in config.
-
-* Thu May  1 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
-- Update to 0.49.
-
-* Sun Apr 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
-- Add one more strict Epoch checking patch.
-- Slightly enhanced default config.
-
-* Fri Apr 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
-- Patch to work with installed packages (including -a) and rpm 4.2.
-- Remove spurious rpm-devel BuildRequirement.
-
-* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
-- Patch to work with packages signed with an unknown key.
-- Save .spec in UTF-8.
-
-* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
-- First Fedora release, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 May 2007 18:59:06 -0000	1.16
+++ sources	11 Sep 2007 19:22:26 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 19:30:21 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 15:30:21 -0400
Subject: rpms/highlight/devel highlight-2.6.3-rpmopts.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 highlight.spec, 1.21, 1.22 sources,
	1.10, 1.11 highlight-2.6.2-rpmopts.patch, 1.1, NONE
Message-ID: <200709111930.l8BJULW6022790@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22758

Modified Files:
	.cvsignore highlight.spec sources 
Added Files:
	highlight-2.6.3-rpmopts.patch 
Removed Files:
	highlight-2.6.2-rpmopts.patch 
Log Message:
New upstream release

highlight-2.6.3-rpmopts.patch:

--- NEW FILE highlight-2.6.3-rpmopts.patch ---
diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
--- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
+++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
@@ -15,7 +15,7 @@
 
 CXX=c++
 
-CFLAGS := -O2
+CFLAGS := ${RPM_OPT_FLAGS}
 
 # Do not strip by default (Mac OS X lazy pointer issues)
 # Add -static to avoid linking with shared libs (can cause trouble when highlight


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Aug 2007 15:20:43 -0000	1.9
+++ .cvsignore	11 Sep 2007 19:29:48 -0000	1.10
@@ -1 +1 @@
-highlight-2.6.2.tar.gz
+highlight-2.6.3.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- highlight.spec	9 Aug 2007 15:20:43 -0000	1.21
+++ highlight.spec	11 Sep 2007 19:29:48 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.2-rpmopts.patch
+Patch2:		highlight-2.6.3-rpmopts.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Aug 2007 15:20:43 -0000	1.10
+++ sources	11 Sep 2007 19:29:48 -0000	1.11
@@ -1 +1 @@
-9f024bb8898b1ba2f92f6966ab6978c8  highlight-2.6.2.tar.gz
+0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz


--- highlight-2.6.2-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 19:31:53 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 15:31:53 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.24, 1.25 bigboard.spec, 1.33,
	1.34 sources, 1.25, 1.26
Message-ID: <200709111931.l8BJVrWr023026@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22884

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Sep 2007 20:26:02 -0000	1.24
+++ .cvsignore	11 Sep 2007 19:31:21 -0000	1.25
@@ -1 +1 @@
-bigboard-0.5.13.tar.gz
+bigboard-0.5.15.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bigboard.spec	10 Sep 2007 20:26:02 -0000	1.33
+++ bigboard.spec	11 Sep 2007 19:31:21 -0000	1.34
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.13
+Version:        0.5.15
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,8 +93,8 @@
 killall -HUP gconfd-2 || :
 
 %changelog
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.13-1
-- 0.5.13
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
+- new upstream
 
 * Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
 - some brs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	10 Sep 2007 20:26:02 -0000	1.25
+++ sources	11 Sep 2007 19:31:21 -0000	1.26
@@ -1 +1 @@
-f0001794311b90a9b9f0d9ad750a0878  bigboard-0.5.13.tar.gz
+bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 19:44:34 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 15:44:34 -0400
Subject: rpms/metacity/F-7 metacity-2.18.5-dont-deref-null-pointer.patch,
	NONE, 1.1 metacity.spec, 1.115, 1.116
Message-ID: <200709111944.l8BJiYe0023595@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23511

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- don't dereference a NULL pointer (crash on logout, leading
  to weird problems on next login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c
--- metacity-2.18.5/src/session.c.dont-deref-null-pointer	2007-09-11 15:41:23.000000000 -0400
+++ metacity-2.18.5/src/session.c	2007-09-11 15:41:34.000000000 -0400
@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter
 
       display_iter = display_iter->next;
     }
-  /* don't need to free displays */
-  displays = NULL;
 
   if (lame == NULL)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-7/metacity.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- metacity.spec	18 Jun 2007 14:01:27 -0000	1.115
+++ metacity.spec	11 Sep 2007 19:44:01 -0000	1.116
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.18/%{metacity_filename}.tar.bz2
 License: GPL
@@ -35,6 +35,8 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
+Patch0: metacity-2.18.5-dont-deref-null-pointer.patch
+
 %description
 
 Metacity is a simple window manager that integrates nicely with 
@@ -56,7 +58,7 @@
 
 %prep
 %setup -q -n %{metacity_filename}
-
+%patch0 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +143,10 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.18.5-2
+- don't dereference a NULL pointer (crash on logout, leading
+  to weird problems on next login, bug 243761)
+
 * Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
 - Update to 2.18.5, fixing a problem with window activation
   and workspace switching of KDE applications



From fedora-extras-commits at redhat.com  Tue Sep 11 19:44:41 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 15:44:41 -0400
Subject: rpms/highlight/F-7 highlight-2.6.3-rpmopts.patch, NONE,
	1.1 highlight.spec, 1.20, 1.21 sources, 1.10,
	1.11 highlight-2.6.2-rpmopts.patch, 1.1, NONE
Message-ID: <200709111944.l8BJifWw023609@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23539

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.3-rpmopts.patch 
Removed Files:
	highlight-2.6.2-rpmopts.patch 
Log Message:
New upstream release

highlight-2.6.3-rpmopts.patch:

--- NEW FILE highlight-2.6.3-rpmopts.patch ---
diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
--- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
+++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
@@ -15,7 +15,7 @@
 
 CXX=c++
 
-CFLAGS := -O2
+CFLAGS := ${RPM_OPT_FLAGS}
 
 # Do not strip by default (Mac OS X lazy pointer issues)
 # Add -static to avoid linking with shared libs (can cause trouble when highlight


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/highlight.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- highlight.spec	9 Aug 2007 16:41:56 -0000	1.20
+++ highlight.spec	11 Sep 2007 19:44:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.2-rpmopts.patch
+Patch2:		highlight-2.6.3-rpmopts.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Aug 2007 16:41:56 -0000	1.10
+++ sources	11 Sep 2007 19:44:09 -0000	1.11
@@ -1 +1 @@
-9f024bb8898b1ba2f92f6966ab6978c8  highlight-2.6.2.tar.gz
+0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz


--- highlight-2.6.2-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 19:48:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 15:48:59 -0400
Subject: rpms/metacity/devel metacity-2.18.5-dont-deref-null-pointer.patch, 
	NONE, 1.1 metacity.spec, 1.129, 1.130
Message-ID: <200709111948.l8BJmxUO023741@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23716

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- fix crash on logout (and on the subsequent login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c
--- metacity-2.18.5/src/session.c.dont-deref-null-pointer	2007-09-11 15:41:23.000000000 -0400
+++ metacity-2.18.5/src/session.c	2007-09-11 15:41:34.000000000 -0400
@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter
 
       display_iter = display_iter->next;
     }
-  /* don't need to free displays */
-  displays = NULL;
 
   if (lame == NULL)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- metacity.spec	21 Aug 2007 21:19:09 -0000	1.129
+++ metacity.spec	11 Sep 2007 19:48:23 -0000	1.130
@@ -7,10 +7,11 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
+Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +65,7 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
+%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +152,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.19.55-4
+- fix crash on logout (and on the subsequent login, bug 243761)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.19.55-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:53:30 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 15:53:30 -0400
Subject: rpms/tracker/devel trackerd-getenv.patch, NONE, 1.1 tracker.spec,
	1.20, 1.21
Message-ID: <200709111953.l8BJrUe0023939@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23895

Modified Files:
	tracker.spec 
Added Files:
	trackerd-getenv.patch 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)


trackerd-getenv.patch:

--- NEW FILE trackerd-getenv.patch ---
diff -up tracker-0.6.2/src/trackerd/tracker-apps.c.getenv tracker-0.6.2/src/trackerd/tracker-apps.c
--- tracker-0.6.2/src/trackerd/tracker-apps.c.getenv	2007-08-18 20:31:41.000000000 -0400
+++ tracker-0.6.2/src/trackerd/tracker-apps.c	2007-09-11 12:47:38.000000000 -0400
@@ -18,7 +18,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include<string.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "tracker-apps.h"
 #include "tracker-db.h"
@@ -51,6 +52,7 @@ tracker_applications_add_service_directo
 		value = getenv ("XDG_DATA_DIRS");
 		if (value != NULL) {
 			gchar **dir_array;
+			tracker_log ("XDG_DATA_DIRS is at %p",value);
 			dir_array = g_strsplit (value, ":", 0);
 
 			gint i;


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tracker.spec	6 Sep 2007 00:31:22 -0000	1.20
+++ tracker.spec	11 Sep 2007 19:52:50 -0000	1.21
@@ -1,11 +1,12 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
 Version:	0.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
 Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
+Patch0:		trackerd-getenv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .getenv
 %define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
 
 %build
@@ -126,6 +128,9 @@
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
+- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
+
 * Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
 - Version 0.6.2
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:54:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 15:54:46 -0400
Subject: rpms/GConf2/devel dead-leak.patch,NONE,1.1 GConf2.spec,1.63,1.64
Message-ID: <200709111954.l8BJskFU024028@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23956

Modified Files:
	GConf2.spec 
Added Files:
	dead-leak.patch 
Log Message:
one more leak fix


dead-leak.patch:

--- NEW FILE dead-leak.patch ---
diff -up GConf-2.19.1/gconf/gconf-database.c.dead-leak GConf-2.19.1/gconf/gconf-database.c
--- GConf-2.19.1/gconf/gconf-database.c.dead-leak	2007-09-11 15:33:11.000000000 -0400
+++ GConf-2.19.1/gconf/gconf-database.c	2007-09-11 15:32:42.000000000 -0400
@@ -1259,6 +1259,8 @@ gconf_database_notify_listeners (GConfDa
       tmp = g_slist_next(tmp);
     }
 
+  g_slist_free (closure.dead);
+
   if (notify_others)
     {
       g_return_if_fail (modified_sources != NULL);


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- GConf2.spec	11 Sep 2007 19:09:57 -0000	1.63
+++ GConf2.spec	11 Sep 2007 19:54:13 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.19.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=475970
 Patch2: sync-leak.patch 
 Patch3: dir-leak.patch 
+Patch4: dead-leak.patch 
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -68,6 +69,7 @@
 %patch1 -p1 -b .timers  
 %patch2 -p1 -b .sync-leak
 %patch3 -p1 -b .dir-leak
+%patch4 -p1 -b .dead-leak
 
 %build
 rm -f libtool
@@ -129,6 +131,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-5
+- Some more leak fixes
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-4
 - Fix memory leaks
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:58:07 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Tue, 11 Sep 2007 15:58:07 -0400
Subject: rpms/pdns/devel pdns.spec,1.6,1.7
Message-ID: <200709111958.l8BJw76h024236@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/pdns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	pdns.spec 
Log Message:
* Tue Sep 11 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-2
- Fix license tag
- Add README for geo backend to docs
* Tue Apr 24 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-1
- Upstream released 2.9.21
- Enabled new SQLite backend
* Thu Apr 10 2007 <ruben at rubenkerkhof.com> 2.9.20-9
- Add Requires for chkconfig, service and useradd (#235582)
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-8
- Add the pdns user and group to the config file
- Don't restart pdns on an upgrade
- Minor cleanups in scriptlets
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-7
- Fixed typo in scriptlet
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-6
- Check if user pdns exists before adding it
* Sat Dec 30 2006 <ruben at rubenkerkhof.com> 2.9.20-5
- Strip rpath from the backends as well
* Fri Dec 29 2006 <ruben at rubenkerkhof.com> 2.9.20-4
- Disable rpath
* Thu Dec 28 2006 <ruben at rubenkerkhof.com> 2.9.20-3
- More fixes as per review #219973
* Wed Dec 27 2006 <ruben at rubenkerkhof.com> 2.9.20-2
- A few changes for FE review (bz #219973):
- Renamed package to pdns, since that's how upstream calls it
- Removed calls to ldconfig
- Subpackages now require %{version}-%{release}
* Sat Dec 16 2006 <ruben at rubenkerkhof.com> 2.9.20-1
- Initial import



Index: pdns.spec
===================================================================
RCS file: /cvs/extras/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdns.spec	24 Apr 2007 07:38:10 -0000	1.6
+++ pdns.spec	11 Sep 2007 19:57:34 -0000	1.7
@@ -1,10 +1,10 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
-License:	GPL
+License:	GPLv2
 URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
@@ -166,7 +166,7 @@
 
 %files backend-geo
 %defattr(-,root,root,-)
-%doc pdns/COPYING
+%doc pdns/COPYING modules/geobackend/README
 %{_libdir}/%{name}/libgeobackend.so
 
 %files backend-ldap
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-2
+- Fix license tag
+- Add README for geo backend to docs
 * Tue Apr 24 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-1
 - Upstream released 2.9.21
 - Enabled new SQLite backend



From fedora-extras-commits at redhat.com  Tue Sep 11 19:59:12 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 15:59:12 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.19,1.20
Message-ID: <200709111959.l8BJxCEA024300@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24265

Modified Files:
	mugshot.spec 
Log Message:
* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
- shuffle .sos around (b.r.c 286371)
- make devel package require dbus-devel



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mugshot.spec	10 Sep 2007 20:11:01 -0000	1.19
+++ mugshot.spec	11 Sep 2007 19:58:39 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.52
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -57,6 +57,7 @@
 %package devel
 Summary: Development headers for Online Desktop
 Group: Development/Languages
+Requires: dbus-devel
 
 %description devel
 This package contains libraries for Online Desktop.
@@ -210,7 +211,7 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
-
+%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
@@ -220,9 +221,13 @@
 %dir %{_includedir}/ddm-1
 %{_includedir}/ddm-1/*
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so*
+%{_libdir}/*.so
 
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
+- shuffle .sos around (b.r.c 286371)
+- make devel package require dbus-devel
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
 - add devel pkg
 - 1.1.52



From fedora-extras-commits at redhat.com  Tue Sep 11 20:02:22 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 16:02:22 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.18,1.19 sources,1.13,1.14
Message-ID: <200709112002.l8BK2MRD030453@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30408

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mugshot.spec	4 Sep 2007 15:46:37 -0000	1.18
+++ mugshot.spec	11 Sep 2007 20:01:49 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.50
+Version:        1.1.52
 Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -54,6 +54,13 @@
 a "live social experience" and interoperation with online services you and 
 your friends use. It's fun and easy.
 
+%package devel
+Summary: Development headers for Online Desktop
+Group: Development/Languages
+Requires: dbus-devel
+
+%description devel
+This package contains libraries for Online Desktop.
 
 %prep
 %setup -q
@@ -70,7 +77,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Don't package a .la file for the component .so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mugshot/firefox/components/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Run desktop-file-install to so we get validation (and to make
 # things fedora-packaging-guidelines compliant)
@@ -204,12 +211,30 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
+%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
+%files devel
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
+- shuffle .sos around (b.r.c 286371)
+- make devel package require dbus-devel
+
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
+- add devel pkg
+- 1.1.52
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
+- 1.1.51
+
 * Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
 - Don't put two autostart files in the autostart directory
   (https://bugzilla.redhat.com/show_bug.cgi?id=274921)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Aug 2007 20:32:18 -0000	1.13
+++ sources	11 Sep 2007 20:01:49 -0000	1.14
@@ -1 +1 @@
-d3c656d2d77da635fc73908c46fa960b  mugshot-1.1.50.tar.gz
+d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 20:04:29 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 16:04:29 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.5, 1.6 sources, 1.5,
	1.6
Message-ID: <200709112004.l8BK4TdO030668@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30579

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- online-desktop.spec	27 Aug 2007 19:03:27 -0000	1.5
+++ online-desktop.spec	11 Sep 2007 20:03:55 -0000	1.6
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.9
+Version:        0.2.12
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://developer.mugshot.org/
-#X-SCM:         scm:svn:http://svn.mugshot.org/svn/online-desktop/trunk
+#X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -91,10 +91,13 @@
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
+%{_datadir}/gnome/*.session
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
+%dir %{python_sitelib}/ddm
+%{python_sitelib}/ddm/*
 %doc COPYING README
 
 %files flickr
@@ -175,7 +178,16 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+- new upstream
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
+- new upstream
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.2.9-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 19:03:27 -0000	1.5
+++ sources	11 Sep 2007 20:03:55 -0000	1.6
@@ -1 +1 @@
-b75bd28551b0ec5282d67b450124ea1c  online-desktop-0.2.9.tar.gz
+f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 20:04:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 16:04:58 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.57,1.58
Message-ID: <200709112004.l8BK4wcj030755@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30725

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- policy-20070501.patch	11 Sep 2007 19:14:45 -0000	1.57
+++ policy-20070501.patch	11 Sep 2007 20:04:54 -0000	1.58
@@ -1711,7 +1711,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 11:35:53.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:53:08.000000000 -0400
 @@ -1449,6 +1449,44 @@
  
  ########################################
@@ -1813,15 +1813,15 @@
 +#
 +interface(`corenet_all_recvfrom_netlabel',`
 +	gen_require(`
-+		type netlabel_peer_t;
++		type unlabeled_t;
 +	')
 +
-+	allow $1 netlabel_peer_t:{ tcp_socket udp_socket rawip_socket } recvfrom;
++	allow $1 unlabeled_t:{ tcp_socket udp_socket rawip_socket } recvfrom;
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 08:17:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 15:52:36.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2815,7 +2815,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.6.4/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-09-11 15:52:39.000000000 -0400
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)



From fedora-extras-commits at redhat.com  Tue Sep 11 20:05:42 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 16:05:42 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.54,
	1.55 selinux-policy.spec, 1.520, 1.521
Message-ID: <200709112005.l8BK5g37030858@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30810

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
- Allow NetworkManager to dbus chat with yum-updated


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- policy-20070703.patch	11 Sep 2007 16:07:47 -0000	1.54
+++ policy-20070703.patch	11 Sep 2007 20:05:08 -0000	1.55
@@ -2814,7 +2814,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 08:45:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 14:40:00.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -3289,7 +3289,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.7/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-09-11 13:01:12.000000000 -0400
 @@ -138,6 +138,7 @@
  		type security_t;
  	')
@@ -6285,7 +6285,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.7/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-09-10 14:54:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-09-11 14:32:19.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -6327,20 +6327,21 @@
  ')
  
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
-@@ -252,7 +264,9 @@
+@@ -252,7 +264,10 @@
  ')
  
  optional_policy(`
 +	kerberos_use(ftpd_t)
  	kerberos_read_keytab(ftpd_t)
 +	kerberos_manage_host_rcache(ftpd_t)
++	selinux_validate_context(ftpd_t)
  ')
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.7/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-09-06 15:43:06.000000000 -0400
-@@ -8,9 +8,15 @@
++++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-09-11 15:14:05.000000000 -0400
+@@ -8,9 +8,17 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
  /usr/sbin/hald		--			gen_context(system_u:object_r:hald_exec_t,s0)
@@ -6356,6 +6357,8 @@
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 +
++/var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/log/pm(/.*)?				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.0.7/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-29 14:10:57.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/hal.if	2007-09-06 15:43:06.000000000 -0400
@@ -7386,7 +7389,7 @@
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.7/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-09-11 14:21:48.000000000 -0400
 @@ -20,7 +20,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -7405,7 +7408,17 @@
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
  corenet_tcp_sendrecv_all_if(NetworkManager_t)
-@@ -152,6 +154,11 @@
+@@ -136,6 +138,9 @@
+ 	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
+ 	dbus_connect_system_bus(NetworkManager_t)
+ 	dbus_send_system_bus(NetworkManager_t)
++	optional_policy(`
++		rpm_dbus_chat(NetworkManager_t)
++	')
+ ')
+ 
+ optional_policy(`
+@@ -152,6 +157,11 @@
  ')
  
  optional_policy(`
@@ -7417,7 +7430,7 @@
  	ppp_domtrans(NetworkManager_t)
  	ppp_read_pid_files(NetworkManager_t)
  	ppp_signal(NetworkManager_t)
-@@ -166,8 +173,10 @@
+@@ -166,8 +176,10 @@
  ')
  
  optional_policy(`
@@ -9669,7 +9682,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 11:09:25.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 15:24:02.000000000 -0400
 @@ -33,7 +33,6 @@
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -9705,13 +9718,14 @@
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
  
-@@ -109,5 +114,7 @@
+@@ -109,5 +114,8 @@
  ')
  
  optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
 +	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
 +	dbus_send_system_bus(setroubleshootd_t)
++	dbus_connect_system_bus(setroubleshootd_t)
  ')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.7/policy/modules/services/snmp.fc
@@ -11302,8 +11316,8 @@
 +/usr/sbin/brctl		--	gen_context(system_u:object_r:brctl_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.if serefpolicy-3.0.7/policy/modules/system/brctl.if
 --- nsaserefpolicy/policy/modules/system/brctl.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-09-06 15:43:06.000000000 -0400
-@@ -0,0 +1,25 @@
++++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-09-11 14:23:37.000000000 -0400
+@@ -0,0 +1,43 @@
 +
 +## <summary>Utilities for configuring the linux ethernet bridge</summary>
 +
@@ -11329,6 +11343,24 @@
 +	allow brctl_t $1:fifo_file rw_file_perms;
 +	allow brctl_t $1:process sigchld;
 +')
++
++########################################
++## <summary>
++##	Get attributes brctl executable.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`brctl_getattr',`
++	gen_require(`
++		type brctl_exec_t;
++	')
++
++	allow $1 brctl_exec_t:file getattr;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-3.0.7/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.0.7/policy/modules/system/brctl.te	2007-09-10 08:59:32.000000000 -0400
@@ -15418,7 +15450,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-07 08:48:47.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-11 14:25:59.000000000 -0400
 @@ -95,7 +95,7 @@
  read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
  rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
@@ -15428,7 +15460,13 @@
  dev_filetrans(xend_t, xenctl_t, fifo_file)
  
  manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t)
-@@ -126,7 +126,7 @@
+@@ -122,11 +122,13 @@
+ manage_fifo_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
+ files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir })
+ 
++init_stream_connect_script(xend_t)
++
+ # transition to store
  domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
  allow xenstored_t xend_t:fd use;
  allow xenstored_t xend_t:process sigchld;
@@ -15437,7 +15475,7 @@
  
  # transition to console
  domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
-@@ -176,6 +176,7 @@
+@@ -176,6 +178,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -15445,7 +15483,18 @@
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
-@@ -224,7 +225,7 @@
+@@ -214,6 +217,10 @@
+ netutils_domtrans(xend_t)
+ 
+ optional_policy(`
++	brctl_getattr(xend_t)
++')
++
++optional_policy(`
+ 	consoletype_exec(xend_t)
+ ')
+ 
+@@ -224,7 +231,7 @@
  
  allow xenconsoled_t self:capability { dac_override fsetid ipc_lock };
  allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms;
@@ -15454,7 +15503,7 @@
  
  allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms;
  
-@@ -257,7 +258,7 @@
+@@ -257,7 +264,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
  
@@ -15463,7 +15512,7 @@
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -265,7 +266,7 @@
+@@ -265,7 +272,7 @@
  # Xen store local policy
  #
  
@@ -15472,7 +15521,7 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -318,12 +319,13 @@
+@@ -318,12 +325,13 @@
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
  
  # internal communication is often done using fifo and unix sockets.
@@ -15487,7 +15536,7 @@
  files_search_var_lib(xm_t)
  
  allow xm_t xen_image_t:dir rw_dir_perms;
-@@ -336,6 +338,7 @@
+@@ -336,6 +344,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -15495,7 +15544,15 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -366,3 +369,14 @@
+@@ -353,6 +362,7 @@
+ 
+ term_use_all_terms(xm_t)
+ 
++init_stream_connect_script(xm_t)
+ init_rw_script_stream_sockets(xm_t)
+ init_use_fds(xm_t)
+ 
+@@ -366,3 +376,14 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- selinux-policy.spec	11 Sep 2007 16:07:47 -0000	1.520
+++ selinux-policy.spec	11 Sep 2007 20:05:08 -0000	1.521
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
+- Allow NetworkManager to dbus chat with yum-updated
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
 - Allow xfs to bind to port 7100
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:06:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 16:06:59 -0400
Subject: rpms/metacity/F-7 metacity.spec,1.116,1.117
Message-ID: <200709112006.l8BK6xh7031004@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30957

Modified Files:
	metacity.spec 
Log Message:
add upstream bug reference



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-7/metacity.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- metacity.spec	11 Sep 2007 19:44:01 -0000	1.116
+++ metacity.spec	11 Sep 2007 20:06:26 -0000	1.117
@@ -35,6 +35,7 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=433253
 Patch0: metacity-2.18.5-dont-deref-null-pointer.patch
 
 %description



From fedora-extras-commits at redhat.com  Tue Sep 11 20:07:32 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 16:07:32 -0400
Subject: rpms/metacity/devel metacity.spec,1.130,1.131
Message-ID: <200709112007.l8BK7WqT031021@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996

Modified Files:
	metacity.spec 
Log Message:
add upstream bug reference



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- metacity.spec	11 Sep 2007 19:48:23 -0000	1.130
+++ metacity.spec	11 Sep 2007 20:06:58 -0000	1.131
@@ -11,6 +11,7 @@
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=433253
 Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops



From fedora-extras-commits at redhat.com  Tue Sep 11 20:09:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 16:09:26 -0400
Subject: rpms/gnome-user-share/devel str-leak.patch, NONE,
	1.1 gnome-user-share.spec, 1.26, 1.27
Message-ID: <200709112009.l8BK9QPr031415@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-user-share/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31195

Modified Files:
	gnome-user-share.spec 
Added Files:
	str-leak.patch 
Log Message:
fix a small memory leak`


str-leak.patch:

--- NEW FILE str-leak.patch ---
diff -up gnome-user-share-0.11/user_share.c.str-leak gnome-user-share-0.11/user_share.c
--- gnome-user-share-0.11/user_share.c.str-leak	2007-09-11 16:00:18.000000000 -0400
+++ gnome-user-share-0.11/user_share.c	2007-09-11 16:00:40.000000000 -0400
@@ -594,6 +594,7 @@ spawn_httpd (int port, pid_t *pid_out)
 		argv[i++] = "RequirePasswordAlways";
     }
     
+    g_free (str);
     g_object_unref (client);
     
     argv[i] = NULL;


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-user-share.spec	28 Aug 2007 21:38:30 -0000	1.26
+++ gnome-user-share.spec	11 Sep 2007 20:08:52 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.11
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -12,6 +12,8 @@
 Patch1: gnome-user-share-0.11-export-session-id.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=456390
 Patch2: password-edit.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=475994
+Patch3: str-leak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
@@ -45,6 +47,7 @@
 %patch0 -p1 -b .invisible-char
 %patch1 -p1 -b .export-session-id
 %patch2 -p1 -b .password-edit
+%patch3 -p1 -b .str-leak
 
 %build
 autoheader ; autoconf # for patch1
@@ -95,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 0.11-9
+- Fix a memory leak
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.11-8
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:15:55 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:15:55 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 sugar-datastore.spec, 1.24, 1.25
Message-ID: <200709112015.l8BKFtqp032700@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32658

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 Sep 2007 18:30:49 -0000	1.23
+++ .cvsignore	11 Sep 2007 20:15:20 -0000	1.24
@@ -1 +1 @@
-sugar-datastore-0.2.2-git617bf5d005.tar.bz2
+sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Sep 2007 18:30:49 -0000	1.23
+++ sources	11 Sep 2007 20:15:20 -0000	1.24
@@ -1 +1 @@
-2a4e5ee382ea17f0d6730957ba96d940  sugar-datastore-0.2.2-git617bf5d005.tar.bz2
+b039a6ca3736f49a9c2ca305aea6446e  sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-datastore.spec	10 Sep 2007 18:30:49 -0000	1.24
+++ sugar-datastore.spec	11 Sep 2007 20:15:20 -0000	1.25
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070910git
-%define commitid 617bf5d005
+%define alphatag 20070911git
+%define commitid b0b4c4115a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.20.%{alphatag}617bf5d005
+Release: 0.21.%{alphatag}b0b4c4115a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
+- New snapshot
+
 * Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:27:01 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:27:01 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.19, 1.20 sources, 
	1.19, 1.20 sugar-presence-service.spec, 1.19, 1.20
Message-ID: <200709112027.l8BKR1nt001070@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	10 Sep 2007 15:22:48 -0000	1.19
+++ .cvsignore	11 Sep 2007 20:26:28 -0000	1.20
@@ -1,3 +1 @@
-sugar-presence-service-0.65-gita79f7b6488.tar.bz2
-sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
-sugar-presence-service-0.65-git3ed091301b.tar.bz2
+sugar-presence-service-0.65-gitbff163d57b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	10 Sep 2007 15:22:48 -0000	1.19
+++ sources	11 Sep 2007 20:26:28 -0000	1.20
@@ -1 +1 @@
-58fd9f1225a3d7bbc3d1f4d713d403b9  sugar-presence-service-0.65-git3ed091301b.tar.bz2
+18de89aa92cbe6c8171113524488bb7f  sugar-presence-service-0.65-gitbff163d57b.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar-presence-service.spec	10 Sep 2007 15:22:48 -0000	1.19
+++ sugar-presence-service.spec	11 Sep 2007 20:26:28 -0000	1.20
@@ -1,9 +1,9 @@
-%define alphatag 20070910git
-%define commitid 3ed091301b
+%define alphatag 20070911git
+%define commitid bff163d57b
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.14.%{alphatag}3ed091301b
+Release: 0.15.%{alphatag}bff163d57b
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
+- New snapshot
+
 * Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:41:05 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 11 Sep 2007 16:41:05 -0400
Subject: rpms/nsd/devel .cvsignore, 1.8, 1.9 nsd.spec, 1.20, 1.21 sources,
	1.8, 1.9 nsd-2.3.3-checking.patch, 1.1, NONE
Message-ID: <200709112041.l8BKf5Xb001621@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585

Modified Files:
	.cvsignore nsd.spec sources 
Removed Files:
	nsd-2.3.3-checking.patch 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Mar 2007 04:27:39 -0000	1.8
+++ .cvsignore	11 Sep 2007 20:40:27 -0000	1.9
@@ -4,3 +4,4 @@
 nsd-3.0.2.tar.gz
 nsd-3.0.3.tar.gz
 nsd-3.0.5.tar.gz
+nsd-3.0.6.tar.gz


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	13 Jul 2007 18:47:18 -0000	1.20
+++ nsd.spec	11 Sep 2007 20:40:27 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -30,7 +30,7 @@
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d -m 0755 %{buildroot}%{_initrddir}
-install -d -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
 # change .sample to normal config files
@@ -74,6 +74,10 @@
 fi
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2007 04:27:39 -0000	1.8
+++ sources	11 Sep 2007 20:40:27 -0000	1.9
@@ -4,3 +4,4 @@
 a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
 73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
 ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz
+db964272bb653f3691cdae6932953432  nsd-3.0.6.tar.gz


--- nsd-2.3.3-checking.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 20:44:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:44:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.48, 1.49 sources, 1.49,
	1.50 sugar.spec, 1.57, 1.58
Message-ID: <200709112044.l8BKiHVe001802@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1767

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	10 Sep 2007 18:25:47 -0000	1.48
+++ .cvsignore	11 Sep 2007 20:43:40 -0000	1.49
@@ -1 +1 @@
-sugar-0.65-git79237f3114.tar.bz2
+sugar-0.65-git8b784a6223.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	10 Sep 2007 18:25:47 -0000	1.49
+++ sources	11 Sep 2007 20:43:40 -0000	1.50
@@ -1 +1 @@
-3ca3e5e4e8d1d024ae7c01de5ebeafe3  sugar-0.65-git79237f3114.tar.bz2
+db824af53d51c851dc8ca1d75484a317  sugar-0.65-git8b784a6223.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sugar.spec	10 Sep 2007 18:25:47 -0000	1.57
+++ sugar.spec	11 Sep 2007 20:43:40 -0000	1.58
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070910git
-%define commitid 79237f3114
+%define alphatag 20070911git
+%define commitid 8b784a6223
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.45.%{alphatag}79237f3114
+Release: 0.46.%{alphatag}8b784a6223
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
+- New snapshot
+
 * Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:51:09 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 16:51:09 -0400
Subject: rpms/exaile/devel exaile.spec,1.12,1.13
Message-ID: <200709112051.l8BKp9YP002170@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/exaile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2124

Modified Files:
	exaile.spec 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-3
- Require pygtk2-libglade (BZ #278471)



Index: exaile.spec
===================================================================
RCS file: /cvs/extras/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- exaile.spec	22 Aug 2007 11:56:33 -0000	1.12
+++ exaile.spec	11 Sep 2007 20:50:30 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	A music player
 Name:		exaile
 Version:	0.2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Applications/Multimedia
 # It actually says GPL 1 or later version; a couple of files includes the Artistic license 
 License:	GPLv+ and Artistic
@@ -20,7 +20,7 @@
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	python-sqlite2
-Requires:	pygtk2
+Requires:	pygtk2-libglade
 Requires:	gnome-python2-gtkhtml2
 Requires:	gnome-python2-gtkmozembed
 Requires:	python-CDDB
@@ -98,6 +98,9 @@
 %{_mandir}/man1/exaile*.*
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-3
+- Require pygtk2-libglade (BZ #278471)
+
 * Wed Aug 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:52:50 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 16:52:50 -0400
Subject: rpms/krb5/devel krb5.spec,1.135,1.136
Message-ID: <200709112052.l8BKqoJQ002333@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	krb5.spec 
Log Message:
- move the db2 kdb plugin from -server to -libs, because a multilib libkdb
  might need it



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- krb5.spec	11 Sep 2007 14:12:38 -0000	1.135
+++ krb5.spec	11 Sep 2007 20:52:15 -0000	1.136
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 7%{?dist}
+Release: 8%{?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
@@ -208,6 +208,10 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-8
+- move the db2 kdb plugin from -server to -libs, because a multilib libkdb
+  might need it
+
 * Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-7
 - also perform PAM session and credential management when ftpd accepts a
   client using strong authentication, missed earlier
@@ -1653,8 +1657,6 @@
 %dir %{krb5prefix}/man/man8
 %dir %{krb5prefix}/sbin
 
-%{_libdir}/krb5/plugins/kdb/db2.so
-
 # Problem-reporting tool.
 %{krb5prefix}/sbin/krb5-send-pr
 %{krb5prefix}/man/man1/krb5-send-pr.1*
@@ -1729,6 +1731,8 @@
 %dir %{_libdir}/krb5
 %dir %{_libdir}/krb5/plugins
 %dir %{_libdir}/krb5/plugins/*
+%dir %{_libdir}/krb5/plugins/*
+%{_libdir}/krb5/plugins/kdb/db2.so
 %{krb5prefix}/share
 
 %files devel



From fedora-extras-commits at redhat.com  Tue Sep 11 20:53:18 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 16:53:18 -0400
Subject: rpms/exaile/F-7 exaile.spec,1.9,1.10
Message-ID: <200709112053.l8BKrI2A002366@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/exaile/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2307

Modified Files:
	exaile.spec 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
- Require pygtk2-libglade (BZ #278471)



Index: exaile.spec
===================================================================
RCS file: /cvs/extras/rpms/exaile/F-7/exaile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- exaile.spec	30 Jun 2007 10:45:27 -0000	1.9
+++ exaile.spec	11 Sep 2007 20:52:46 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	A music player
 Name:		exaile
 Version:	0.2.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.exaile.org
@@ -19,7 +19,7 @@
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	python-sqlite2
-Requires:	pygtk2
+Requires:	pygtk2-libglade
 Requires:	gnome-python2-gtkhtml2
 Requires:	gnome-python2-gtkmozembed
 Requires:	python-CDDB
@@ -97,6 +97,9 @@
 %{_mandir}/man1/exaile*.*
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
+- Require pygtk2-libglade (BZ #278471)
+
 * Sat Jun 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-1
 - New release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:10:15 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 17:10:15 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.18,1.19 sources,1.14,1.15
Message-ID: <200709112110.l8BLAF9V009274@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9237

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bigboard.spec	27 Aug 2007 19:03:14 -0000	1.18
+++ bigboard.spec	11 Sep 2007 21:09:42 -0000	1.19
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.11
+Version:        0.5.15
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -26,7 +26,10 @@
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
+BuildRequires:  mugshot-devel >= 1.1.52
 
 %description
 Bigboard is a sidebar and application launcher that works with mugshot.org
@@ -53,10 +56,6 @@
 %doc COPYING
 %dir %{_libexecdir}/bigboard
 %attr(0755,root,root) %{_libexecdir}/bigboard/*
-%dir %{python_sitearch}/mugshot
-%{python_sitearch}/mugshot/*.py
-%{python_sitearch}/mugshot/*.pyc
-%{python_sitearch}/mugshot/*.pyo
 %dir %{python_sitearch}/bigboard
 %{python_sitearch}/bigboard/*.so
 %{python_sitearch}/bigboard/*.py
@@ -79,12 +78,11 @@
 %{python_sitearch}/bigboard_externals/*
 %dir %{_datadir}/bigboard
 %{_datadir}/bigboard/*
-%{_datadir}/bigboard/*.png
-%{_datadir}/gnome/autostart/*.desktop
-%{_bindir}/bigboard
-%{_bindir}/gconf-online-sync
-%{_libdir}/bonobo/servers/BigBoard_Applet.server
-%{_libexecdir}/bigboard-applet
+%{_datadir}/gnome/*
+%{_datadir}/gnome-2.0/*
+%{_bindir}/*
+%{_libdir}/bonobo/servers/*
+%{_libexecdir}/bigboard-applets
 # no desktop file included because the bigboard is launched as part of online
 # desktop mode
 
@@ -95,6 +93,15 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
+- new upstream
+
+* Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
+- some brs
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.5.11-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Aug 2007 19:03:14 -0000	1.14
+++ sources	11 Sep 2007 21:09:42 -0000	1.15
@@ -1 +1 @@
-651d5d896702a1bb8a3ecbcaedd668b3  bigboard-0.5.11.tar.gz
+bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 21:21:18 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 17:21:18 -0400
Subject: rpms/evolution/devel evolution.spec,1.287,1.288
Message-ID: <200709112121.l8BLLIZO009611@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9534

Modified Files:
	evolution.spec 
Log Message:

* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
- Split off an evolution-help package



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- evolution.spec	5 Sep 2007 14:49:49 -0000	1.287
+++ evolution.spec	11 Sep 2007 21:20:45 -0000	1.288
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -231,6 +231,14 @@
 %description devel
 Development files needed for building things which link against evolution.
 
+%package help
+Group: Applications/Productivity
+Summary: Help files for Evolution
+Requires: %{name} = %{version}-%{release}
+
+%description help
+This package contains the help for Evolution. 
+
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
@@ -399,6 +407,9 @@
 done
 %find_lang evolution-%{evo_major} --all-name --with-gnome
 
+grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
+grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -423,7 +434,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f evolution-%{evo_major}.lang
+%files -f translations.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 
@@ -446,9 +457,6 @@
 %{_datadir}/applications/redhat-evolution-contacts.desktop
 %{_datadir}/applications/redhat-evolution-tasks.desktop
 
-# Online help:
-%{_datadir}/omf/evolution
-
 # Icons:
 %{_datadir}/icons/hicolor/16x16/apps/evolution.png
 %{_datadir}/icons/hicolor/22x22/apps/evolution.png
@@ -694,10 +702,16 @@
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
+%files help -f help.lang
+%dir %{_datadir}/omf/evolution
+
 # Look into re-enabling the inline-audio plugin once 2.12 ships.
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
+- Split off an evolution-help package
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:26:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 17:26:23 -0400
Subject: rpms/kernel/devel linux-2.6-libata-pata-dma-disable-option.patch,
	NONE, 
	1.1 linux-2.6-scsi-mpt-vmware-fix.patch, NONE, 1.1 kernel.spec,
	1.156, 1.157
Message-ID: <200709112126.l8BLQN42009945@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9903

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata-dma-disable-option.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- fix emulated vmware SCSI disks
- add option to disable libata PATA DMA


linux-2.6-libata-pata-dma-disable-option.patch:

--- NEW FILE linux-2.6-libata-pata-dma-disable-option.patch ---
This is useful when debugging, handling problem systems, or for
distributions just to get the system installed so it can be sorted
out later.

This is a bit smarter than the old IDE one and lets you do

libata.pata_dma=0		Disable all PATA DMA like old IDE
libata.pata_dma=1		Disk DMA only
libata.pata_dma=2		ATAPI DMA only
libata.pata_dma=4		CF DMA only

(or combinations thereof - 0,1,3 being the useful ones I suspect)

(I've split CF as it seems to be a seperate case of pain and suffering
different to the others and caused by assorted PIO wired adapters etc)

SATA is not affected - for one its not clear it makes sense to disable
DMA for SATA if even always possible, for two we've seen no failure 
evidence to justify needing to support this kind of hammer on SATA.

Signed-off-by: Alan Cox <alan at redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/include/linux/libata.h linux-2.6.23rc3-mm1/include/linux/libata.h
--- linux.vanilla-2.6.23rc3-mm1/include/linux/libata.h	2007-08-22 17:23:14.000000000 +0100
+++ linux-2.6.23rc3-mm1/include/linux/libata.h	2007-08-22 17:50:32.000000000 +0100
@@ -315,6 +315,12 @@
 	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */
 	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */
 	ATA_HORKAGE_BROKEN_HPA	= (1 << 4),	/* Broken HPA */
+ 
+	/* DMA mask for user DMA control: User visible values do not 
+	   renumber */
+	ATA_DMA_MASK_ATA	= (1 << 0),	/* DMA on ATA Disk */
+	ATA_DMA_MASK_ATAPI	= (1 << 1),	/* DMA on ATAPI */
+	ATA_DMA_MASK_CFA	= (1 << 2),	/* DMA on CF Card */
 };
 
 enum hsm_task_states {
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/drivers/ata/libata-core.c linux-2.6.23rc3-mm1/drivers/ata/libata-core.c
--- linux.vanilla-2.6.23rc3-mm1/drivers/ata/libata-core.c	2007-08-22 17:23:00.000000000 +0100
+++ linux-2.6.23rc3-mm1/drivers/ata/libata-core.c	2007-08-22 18:17:31.321738376 +0100
@@ -99,6 +99,10 @@
 module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
 MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
 
+static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
+module_param_named(pata_dma, ata_pata_dma, int, 0644);
+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -2839,16 +2854,29 @@
 	/* step 1: calculate xfer_mask */
	for (i = 0; i < ATA_MAX_DEVICES; i++) {
 		unsigned int pio_mask, dma_mask;
+		unsigned int mode_mask;
 
 		dev = &ap->device[i];
 
 		if (!ata_dev_enabled(dev))
 			continue;
 
+		mode_mask = ATA_DMA_MASK_ATA;
+		if (dev->class == ATA_DEV_ATAPI)
+			mode_mask = ATA_DMA_MASK_ATAPI;
+		else if (ata_id_is_cfa(dev->id))
+			mode_mask = ATA_DMA_MASK_CFA;
+
 		ata_dev_xfermask(dev);
 
 		pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
 		dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+
+		if ((ata_pata_dma & mode_mask) || ap->cbl == ATA_CBL_SATA)
+			dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		else
+			dma_mask = 0;
+
 		dev->pio_mode = ata_xfer_mask2mode(pio_mask);
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
--- linux-2.6.22.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.22.noarch/Documentation/kernel-parameters.txt
@@ -870,6 +870,12 @@ and is between 256 and 4096 characters. 
 	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
 			Format: addr:<io>,irq:<irq>
 
+	libata.pata_dma= [LIBATA]
+		libata.pata_dma=0	Disable all PATA DMA like old IDE
+		libata.pata_dma=1	Disk DMA only
+		libata.pata_dma=2	ATAPI DMA only
+		libata.pata_dma=4	CF DMA only
+
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
 			See Documentation/ramdisk.txt.
 

linux-2.6-scsi-mpt-vmware-fix.patch:

--- NEW FILE linux-2.6-scsi-mpt-vmware-fix.patch ---
The attached patch is a workaround for a bug in VMWare's emulated LSI
Fusion SCSI HBA.  The emulated firmware returns zero for the maximum
number of attached devices; the real firmware returns a positive
number.  Therefore, the kernel that boots and works fine on bare metal
will fail on VMWare because this firmware value is handed to the SCSI
midlayer, which then skips the entire bus scan.

F7 bz 241935

The patch below was submitted by Eric Moore of LSI to the linux-scsi
mailing list:

http://marc.info/?l=linux-scsi&m=117432237404247

then immediately rejected by Christoph Hellwig, who prefers that
VMWare fix their emulation instead.

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index eddb933..21fadf2 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -2571,8 +2571,19 @@ GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
 	pfacts->MaxPersistentIDs = le16_to_cpu(pfacts->MaxPersistentIDs);
 	pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets);
 
-	max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID :
-	    pfacts->MaxDevices;
+	switch (ioc->bus_type) {
+	case SAS:
+		max_id = pfacts->PortSCSIID;
+		break;
+	case FC:
+		max_id = pfacts->MaxDevices;
+		break;
+	case SPI:
+	default:
+		max_id = MPT_MAX_SCSI_DEVICES;
+		break;
+	}
+
 	ioc->devices_per_bus = (max_id > 255) ? 256 : max_id;
 	ioc->number_of_buses = (ioc->devices_per_bus < 256) ? 1 : max_id/256;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kernel.spec	11 Sep 2007 18:03:54 -0000	1.156
+++ kernel.spec	11 Sep 2007 21:25:51 -0000	1.157
@@ -608,6 +608,7 @@
 Patch370: linux-2.6-crash-driver.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-scsi-async-double-add.patch
+Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
 Patch423: linux-2.6-gfs-locking-exports.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
@@ -624,6 +625,7 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
+Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1072,6 +1074,8 @@
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 # Fix async scanning double-add problems
 ApplyPatch linux-2.6-scsi-async-double-add.patch
+# fix vmware emulated scsi controller
+ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1119,6 +1123,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
+# add option to disable PATA DMA
+ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1791,6 +1797,10 @@
 
 %changelog
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix emulated vmware SCSI disks
+- add option to disable libata PATA DMA
+
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - utrace update
 
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep 11 21:27:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 17:27:38 -0400
Subject: rpms/childsplay_plugins/devel
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.2,
	1.3 childsplay_plugins.spec, 1.8, 1.9
Message-ID: <200709112127.l8BLRcbe010016@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-2
- Adapt gcompris alphabet sounds using patch for new gcompris alphabet sounds
  location


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 10:54:28 -0000	1.2
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	11 Sep 2007 21:27:05 -0000	1.3
@@ -6,11 +6,11 @@
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
 -        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
 -        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/voices',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/voices',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
-+            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'
++            self.sounddir = '/usr/share/gcompris/boards/voices/en/alphabet'
          img = load_image(os.path.join\
                          (self.libdir,'Findsound2Data','Data','soundbut.png'),1)
          
@@ -33,7 +33,7 @@
          # Look for alphabet sounds for this locale.
          # If all fails we fall back to the "old" wahoo sound.
 -        alphabetdir = os.path.join(DATADIR,'AlphabetSounds',wordsloc)
-+        alphabetdir = os.path.join('/usr/share/gcompris/boards/sounds',wordsloc,'alphabet')
++        alphabetdir = os.path.join('/usr/share/gcompris/boards/voices',wordsloc,'alphabet')
          if not os.path.exists(alphabetdir):
              print >> sys.stderr, "Can't find",alphabetdir
              alphabetdir = None


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- childsplay_plugins.spec	26 Aug 2007 07:24:46 -0000	1.8
+++ childsplay_plugins.spec	11 Sep 2007 21:27:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           childsplay_plugins
 Version:        0.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPLv3
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-2
+- Adapt gcompris alphabet sounds using patch for new gcompris alphabet sounds
+  location
+
 * Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-1
 - New upstream version 0.90, license changed to GPL version 3,
   no other changes.



From fedora-extras-commits at redhat.com  Tue Sep 11 21:33:55 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 17:33:55 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.7,1.8
Message-ID: <200709112133.l8BLXtRn010279@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10257

Modified Files:
	online-desktop.spec 
Log Message:
require devilspie


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- online-desktop.spec	10 Sep 2007 20:16:20 -0000	1.7
+++ online-desktop.spec	11 Sep 2007 21:33:22 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           online-desktop
 Version:        0.2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
+Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -178,10 +179,10 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
-- new upstream
-
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
+- require devilspie
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:55:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 17:55:01 -0400
Subject: rpms/gcompris/devel gcompris-8.4-configure-bugfix.patch, NONE,
	1.1 gcompris-8.4-fullscreen.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 gcompris.spec, 1.27, 1.28 sources, 1.10, 1.11
Message-ID: <200709112155.l8BLt1WG011866@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11759

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4-configure-bugfix.patch 
	gcompris-8.4-fullscreen.patch 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
- New upstream release 8.4
- Drop -flags sub-package, the idea was that by putting the flags in a
  subpackage they could be used by other packages, but this never happened.
- License changed to GPL version 3 (or higher)


gcompris-8.4-configure-bugfix.patch:

--- NEW FILE gcompris-8.4-configure-bugfix.patch ---
diff -up gcompris-8.4/configure~ gcompris-8.4/configure
--- gcompris-8.4/configure~	2007-09-11 21:13:09.000000000 +0200
+++ gcompris-8.4/configure	2007-09-11 21:13:09.000000000 +0200
@@ -24027,8 +24027,6 @@ _ACEOF
 
 
 
-CFLAGS=$cflags_previous
-LIBS=$libs_previous
 
 # Check whether --enable-glibtest was given.
 if test "${enable_glibtest+set}" = set; then

gcompris-8.4-fullscreen.patch:

--- NEW FILE gcompris-8.4-fullscreen.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c.fullscreen gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c.fullscreen	2007-09-11 22:44:33.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c	2007-09-11 22:44:58.000000000 +0200
@@ -970,14 +970,27 @@ void gc_fullscreen_set(gboolean state)
     {
       gdk_window_set_decorations (window->window, 0);
       gdk_window_set_functions (window->window, 0);
+      gtk_widget_set_uposition (window, 0, 0);
 #ifdef XF86_VIDMODE
-      if(properties->noxf86vm)
+      if(!properties->noxf86vm)
+      {
+        gdk_window_set_override_redirect (window->window, 1);
+        gdk_window_set_keep_above (window->window, 1);
+        gdk_window_raise (window->window);
+      }
+      else
 #endif
 	gtk_window_fullscreen (GTK_WINDOW(window));
-      gtk_widget_set_uposition (window, 0, 0);
     }
   else
     {
+#ifdef XF86_VIDMODE
+      if(!properties->noxf86vm)
+      {
+        gdk_window_set_keep_above (window->window, 0);
+        gdk_window_set_override_redirect (window->window, 0);
+      }
+#endif
       /* The hide must be done at least for KDE */
       gtk_widget_hide (window);
       gdk_window_set_decorations (window->window, GDK_DECOR_ALL);
@@ -987,7 +1000,6 @@ void gc_fullscreen_set(gboolean state)
       if(properties->noxf86vm)
 #endif
 	gtk_window_unfullscreen (GTK_WINDOW(window));
-      gtk_widget_set_uposition (window, 0, 0);
 
       /* Mandatory or on windows we get iconified */
       gtk_window_deiconify (GTK_WINDOW(window));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Aug 2007 05:02:48 -0000	1.10
+++ .cvsignore	11 Sep 2007 21:54:28 -0000	1.11
@@ -1 +1 @@
-gcompris-8.3.3.tar.gz
+gcompris-8.4.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcompris.spec	17 Aug 2007 05:02:48 -0000	1.27
+++ gcompris.spec	11 Sep 2007 21:54:28 -0000	1.28
@@ -1,25 +1,30 @@
 Name:           gcompris
-Version:        8.3.3
+Version:        8.4
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-8.1-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
+Patch2:         gcompris-8.4-configure-bugfix.patch
+Patch3:         gcompris-8.4-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
 Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
 Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # note we do not provide these, they no longer exist
 Obsoletes:      %{name}-libs < %{version}-%{release}
 Obsoletes:      %{name}-devel < %{version}-%{release}
+# the flags are no longer in a separate sub-package
+Obsoletes:      %{name}-flags < %{version}-%{release}
+Provides:       %{name}-flags = %{version}-%{release}
 
 %description
 GCompris / I Got IT is an educationnal game for children starting at 2.
@@ -252,11 +257,14 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
-mv tmp docs/C/gcompris.info
+%patch2 -p1
+%patch3 -p1
+iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
+mv tmp docs/C/%{name}.info
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags pangoft2`"
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
 %configure --enable-py-build-only --enable-gnet
@@ -267,17 +275,17 @@
 sed -i \
   -e 's/Name=Educational suite GCompris/Name=GCompris Educational suite/' \
   -e 's/Categories=Game;KidsGame;/Categories=Education;/' \
-  gcompris.desktop
+  %{name}.desktop
 sed -i \
   -e 's/Comment=Administration for gcompris/Comment=Specify which activities may be used by whom/' \
   -e 's/Categories=Education;Teaching;/Categories=Education;/' \
-  gcompris-edit.desktop
+  %{name}-edit.desktop
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT/usr/lib/menu
 %find_lang %{name}
@@ -324,42 +332,8 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/DOCUMENTATIONS
-%{_datadir}/gcompris/boards/README
-%{_datadir}/gcompris/boards/a*
-%{_datadir}/gcompris/boards/b*
-%{_datadir}/gcompris/boards/c*
-%{_datadir}/gcompris/boards/d*
-%{_datadir}/gcompris/boards/e*
-%{_datadir}/gcompris/boards/f*.xml
-%{_datadir}/gcompris/boards/fishes
-%{_datadir}/gcompris/boards/g*
-%{_datadir}/gcompris/boards/h*
-%{_datadir}/gcompris/boards/i*
-%{_datadir}/gcompris/boards/k*
-%{_datadir}/gcompris/boards/l*
-%{_datadir}/gcompris/boards/m*
-%{_datadir}/gcompris/boards/n*
-%{_datadir}/gcompris/boards/o*
-%{_datadir}/gcompris/boards/p*
-%{_datadir}/gcompris/boards/r*
-%{_datadir}/gcompris/boards/s*.xml
-%{_datadir}/gcompris/boards/scales
-%{_datadir}/gcompris/boards/skins
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/*.wav
-%{_datadir}/gcompris/boards/sounds/melody
-%{_datadir}/gcompris/boards/sounds/memory
-%{_datadir}/gcompris/boards/sounds/chronos
-%{_datadir}/gcompris/boards/sounds/LuneRouge
-%{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
-%{_datadir}/gcompris/boards/sounds/README
-%{_datadir}/gcompris/boards/submarine
-%{_datadir}/gcompris/boards/t*
-%{_datadir}/gcompris/boards/w*
-%{_datadir}/gcompris/python
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/boards/voices
 %{_datadir}/gnome
 %{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
 %{_datadir}/applications/fedora-%{name}*.desktop
@@ -368,174 +342,174 @@
 
 %files sound-ar
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ar
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ar
 
 %files sound-cs
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/cs
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/cs
 
 %files sound-da
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/da
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/da
 
 %files sound-de
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/de
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/de
 
 %files sound-el
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/el
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/el
 
 %files sound-en
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/en
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/en
 
 %files sound-es
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/es
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/es
 
 %files sound-eu
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/eu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/eu
 
 %files sound-fi
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fi
 
 %files sound-fr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fr
 
 %files sound-hi
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hi
 
 %files sound-hu
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hu
 
 %files sound-id
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/id
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/id
 
 %files sound-it
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/it
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/it
 
 %files sound-mr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/mr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/mr
 
 %files sound-nb
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nb
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nb
 
 %files sound-nl
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nl
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nl
 
 %files sound-pt
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/pt
-%{_datadir}/gcompris/boards/sounds/pt_BR
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/pt
+%{_datadir}/%{name}/boards/voices/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ru
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ru
 
 %files sound-so
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/so
 
 %files sound-sr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sr
 
 %files sound-sv
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sv
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sv
 
 %files sound-tr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/tr
-
-%files flags
-%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/flags
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/tr
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
+- New upstream release 8.4
+- Drop -flags sub-package, the idea was that by putting the flags in a
+  subpackage they could be used by other packages, but this never happened.
+- License changed to GPL version 3 (or higher)
+
 * Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.3-1
 - New upstream release 8.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Aug 2007 05:02:48 -0000	1.10
+++ sources	11 Sep 2007 21:54:28 -0000	1.11
@@ -1 +1 @@
-4b551a5ac3c53749927b081c8553d392  gcompris-8.3.3.tar.gz
+33e5882945f43232953478c93eacf0e6  gcompris-8.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 21:58:31 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Tue, 11 Sep 2007 17:58:31 -0400
Subject: rpms/rubygems/devel .cvsignore, 1.4, 1.5 rubygems.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709112158.l8BLwVwL012537@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12374

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
Version 0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:45:49 -0000	1.4
+++ .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:45:49 -0000	1.3
+++ rubygems.spec	11 Sep 2007 21:57:59 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:45:49 -0000	1.4
+++ sources	11 Sep 2007 21:57:59 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:10:50 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 18:10:50 -0400
Subject: rpms/gcompris/devel gcompris.spec,1.28,1.29
Message-ID: <200709112210.l8BMAoFU020351@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20244

Modified Files:
	gcompris.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
- New upstream release 8.4
- Drop -flags sub-package, the idea was that by putting the flags in a
  subpackage they could be used by other packages, but this never happened.
- License changed to GPL version 3 (or higher)



Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcompris.spec	11 Sep 2007 21:54:28 -0000	1.28
+++ gcompris.spec	11 Sep 2007 22:10:16 -0000	1.29
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
-Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
+Buildrequires:  gnome-python2 xorg-x11-proto-devel gstreamer-devel
+Buildrequires:  python-sqlite2 texi2html texinfo
+Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
 Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires(post): /sbin/install-info



From fedora-extras-commits at redhat.com  Tue Sep 11 22:16:01 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:16:01 -0400
Subject: rpms/dbench/devel dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709112216.l8BMG1I3021186@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial import


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:15:28 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	11 Sep 2007 22:15:28 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:19:51 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:19:51 -0400
Subject: rpms/dbench/OLPC-2 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709112219.l8BMJpAN021758@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial import


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:19:18 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	11 Sep 2007 22:19:18 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:31:56 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:31:56 -0400
Subject: rpms/vbetool/devel vbetool.spec,1.1,1.2
Message-ID: <200709112231.l8BMVugE023675@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23540

Modified Files:
	vbetool.spec 
Log Message:
add bug number of ppc(64) ExcludeArch bugs



Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbetool.spec	10 Sep 2007 22:56:27 -0000	1.1
+++ vbetool.spec	11 Sep 2007 22:31:24 -0000	1.2
@@ -12,7 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel pciutils-devel
-# does not build on ppc and ppc64
+# does not build on ppc and ppc64, see #285361 (RedHat Bugzilla)
+# on ppc sys/io.h is missing, on ppc64 there are more complaints
+# build.logs are attached in the bug report
 ExcludeArch:    ppc ppc64
 # vbetool is included in (some of) these pm-utils releases
 Conflicts:      pm-utils <= 0.99.3-11



From fedora-extras-commits at redhat.com  Tue Sep 11 22:35:53 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 11 Sep 2007 18:35:53 -0400
Subject: rpms/initscripts/OLPC-2 olpc-login, NONE,
	1.1 initscripts-8.54.1-olpc.patch, 1.5, 1.6 initscripts.spec,
	1.148, 1.149
Message-ID: <200709112235.l8BMZrl0024235@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24194

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Added Files:
	olpc-login 
Log Message:
- clean up olpc-dm
- make sure olpc-dm sources /etc/sysconfig/i18n
- add an olpc-login pam control file to avoid unneeded checks



--- NEW FILE olpc-login ---
#%PAM-1.0
auth       required    pam_env.so
auth       required    pam_permit.so
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- initscripts-8.54.1-olpc.patch	30 Aug 2007 22:37:18 -0000	1.5
+++ initscripts-8.54.1-olpc.patch	11 Sep 2007 22:35:50 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-08-30 18:34:28.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-11 18:23:52.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-08-30 18:33:15.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-11 18:23:52.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,9 +43,9 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-08-29 13:13:59.090486248 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-08-30 18:33:15.000000000 -0400
-@@ -0,0 +1,595 @@
+--- /dev/null	2007-09-11 11:59:20.755757520 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-11 18:29:19.000000000 -0400
+@@ -0,0 +1,568 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -173,6 +173,69 @@
 +  return 0;
 +}
 +
++/* strip comments and leading white space*/
++char *
++strip(char *src)
++{
++  int tpos=0;
++  int len;
++  int i;
++  int first_char_found=0;
++  char *result;
++ 
++  len = strlen(src);
++  result = (char *)malloc(len);
++  
++  for (i=0; i < len; i++)
++    {
++      if (!first_char_found && !isblank((int)src[i]))
++        first_char_found = 1;
++
++      if (first_char_found)
++        {
++          if (src[i] == (int)'#')
++            break;
++
++          result[tpos] = src[i];
++          tpos++;
++        }
++    }
++
++  if (tpos == 0)
++    {
++      /* blank line */
++      free(result);
++      result = NULL;
++    }
++  else
++    result[tpos]='\0';
++
++  return result;
++}
++
++void 
++source_i18n(void)
++{
++  FILE *f;
++  char *line;
++
++  f = fopen("/etc/sysconfig/i18n", "r");
++  while(fscanf(f, "%as", &line)==1)
++    {
++      char *sline;
++ 
++      sline = strip(line);
++      if (sline == NULL)
++        continue;
++
++      putenv(sline);
++
++      free(line);
++    }
++ 
++  fclose(f);
++}
++
 +void
 +olpc_login(void)
 +{
@@ -212,74 +275,25 @@
 +   *     seteuid olpc -> start clients
 +   */ 
 +  ttyn = "/dev/tty2";
-+
-+  if (strncmp(ttyn, "/dev/", 5) == 0)
-+    tty_name = ttyn+5;
-+  else
-+    tty_name = ttyn;
-+
-+  if (strncmp(ttyn, "/dev/tty", 8) == 0)
-+    tty_number = ttyn+8;
-+  else 
-+    {
-+      char *p = ttyn;
-+      while (*p && !isdigit(*p)) p++;
-+      tty_number = p;
-+    }
-+
-+  printf("TTY: %s\n", tty_name);
-+
-+  /* find names of Virtual Console devices, for later mode change */
-+  snprintf(vcsn, sizeof(vcsn), "/dev/vcs%s", tty_number);
-+  snprintf(vcsan, sizeof(vcsan), "/dev/vcsa%s", tty_number);
++  tty_number = "2";
 +
 +  /* set pgid to pid */
 +  setpgrp();
 +  /* this means that setsid() will fail */
 +  
-+  {
-+    struct termios tt, ttt;
-+	
-+    tcgetattr(0, &tt);
-+    ttt = tt;
-+    ttt.c_cflag &= ~HUPCL;
-+
-+    /* These can fail, e.g. with ttyn on a read-only filesystem */
-+    chown(ttyn, 0, 0);
-+    chmod(ttyn, TTY_MODE);
-+
-+    /* Kill processes left on this tty */
-+    tcsetattr(0,TCSAFLUSH,&ttt);
-+    signal(SIGHUP, SIG_IGN); /* so vhangup() wont kill us */
-+    vhangup();
-+    signal(SIGHUP, SIG_DFL);
-+
-+    /* open stdin,stdout,stderr to the tty */
-+    opentty(ttyn);
-+	
-+    /* restore tty modes */
-+    tcsetattr(0,TCSAFLUSH,&tt);
-+  }
++  openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);
 +
-+  openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
-+
-+  retcode = pam_start("login", OLPC_USER, &conv, &pamh);
++  retcode = pam_start("olpc-login", OLPC_USER, &conv, &pamh);
 +  if(retcode != PAM_SUCCESS) 
 +    {
-+      fprintf(stderr, "login: PAM Failure, aborting: %s\n",
++      fprintf(stderr, "olpc-login: PAM Failure, aborting: %s\n",
 +              pam_strerror(pamh, retcode));
 +      syslog(LOG_ERR, "Couldn't initialize PAM: %s",
 +             pam_strerror(pamh, retcode));
 +      exit(99);
 +    }
-+  /* hostname & tty are either set to NULL or their correct values,
-+     depending on how much we know */
-+  retcode = pam_set_item(pamh, PAM_RHOST, hostname);
-+  PAM_FAIL_CHECK;
 +  retcode = pam_set_item(pamh, PAM_TTY, tty_name);
 +  PAM_FAIL_CHECK;
-+  retcode = pam_set_item(pamh, PAM_USER_PROMPT, "You shouldn't see this login prompt");
-+  PAM_FAIL_CHECK;
 +
 +  /*
 +   * Authentication may be skipped (for example, during krlogin, rlogin, etc...), 
@@ -333,7 +347,7 @@
 +  if (!pwd->pw_name || !pwd->pw_passwd || !pwd->pw_gecos ||
 +	!pwd->pw_dir || !pwd->pw_shell) 
 +    {
-+      fprintf(stderr, "login: Out of memory\n");
++      fprintf(stderr, "olpc-login: Out of memory\n");
 +      syslog(LOG_ERR, "Out of memory");
 +      pam_end(pamh, PAM_SYSTEM_ERR);
 +      exit(1);
@@ -460,53 +474,18 @@
 +    updwtmp(_PATH_WTMP, &ut);
 +  }
 +
-+  chown(ttyn, pwd->pw_uid,
-+	(gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
-+  chmod(ttyn, TTY_MODE);
-+
-+  /* if tty is one of the VC's then change owner and mode of the 
-+     special /dev/vcs devices as well */
-+  if (consoletty(0)) 
-+    {
-+      chown(vcsn, pwd->pw_uid, (gr ? gr->gr_gid : pwd->pw_gid));
-+      chown(vcsan, pwd->pw_uid, (gr ? gr->gr_gid : pwd->pw_gid));
-+      chmod(vcsn, TTY_MODE);
-+      chmod(vcsan, TTY_MODE);
-+    }
-+
-+
 +  setgid(pwd->pw_gid);
 +  
-+  if (*pwd->pw_shell == '\0')
-+    pwd->pw_shell = _PATH_BSHELL;
-+
-+  {
-+    char *ep;
-+	
-+    if(!((ep = getenv("TERM")) && (termenv = strdup(ep))))
-+      termenv = "dumb";
-+  }
-+ 
-+ 
 +  environ = (char**)malloc(sizeof(char*));
 +  memset(environ, 0, sizeof(char*));
-+  
++ 
++  source_i18n();
++ 
 +  setenv("HOME", pwd->pw_dir, 0);    /* legal to override */
 +  setenv("PATH", _PATH_DEFPATH, 1);
 +  
 +  setenv("SHELL", pwd->pw_shell, 1);
-+  setenv("TERM", termenv, 1);
-+  
-+  /* mailx will give a funny error msg if you forget this one */
-+  {
-+    char tmp[MAXPATHLEN];
-+    /* avoid snprintf */
-+    if (sizeof(_PATH_MAILDIR) + strlen(pwd->pw_name) + 1 < MAXPATHLEN) 
-+      {
-+        sprintf(tmp, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-+        setenv("MAIL",tmp,0);
-+      }
-+  }
++  /*setenv("TERM", termenv, 1);*/
 +  
 +  /* LOGNAME is not documented in login(1) but
 +     HP-UX 6.5 does it. We'll not allow modifying it.
@@ -524,9 +503,6 @@
 +      }
 +  }
 +
-+  if (!strncmp(tty_name, "ttyS", 4))
-+    syslog(LOG_INFO, "DIALUP AT %s BY %s", tty_name, pwd->pw_name);
-+  
 +  /* allow tracking of good logins.
 +     -steve philp (sphilp at mail.alliance.net) */
 +  
@@ -562,7 +538,7 @@
 +    {
 +      int errsv = errno;
 +      /* error in fork() */
-+      fprintf(stderr, "login: failure forking: %s", strerror(errsv));
++      fprintf(stderr, "olpc-login: failure forking: %s", strerror(errsv));
 +      PAM_END;
 +      exit(0);
 +    }
@@ -574,7 +550,7 @@
 +      sigaction(SIGQUIT, &sa, NULL);
 +      sigaction(SIGINT, &sa, NULL);
 +      while(wait(NULL) == -1 && errno == EINTR) /**/ ;
-+      openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
++      openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);
 +      PAM_END;
 +      exit(0);
 +    }
@@ -594,7 +570,7 @@
 +  setsid();
 +
 +  /* make sure we have a controlling tty */
-+  openlog("login", LOG_ODELAY, LOG_AUTHPRIV);	/* reopen */
++  openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);	/* reopen */
 +
 +  /*
 +   * TIOCSCTTY: steal tty from other process group.
@@ -636,14 +612,11 @@
 +  /* Use PAM to login as user*/
 +  olpc_login (); 
 +
-+  /* fork and exec startx. wait on child to cleanup */ 
-+  execl("/usr/bin/startx", "startx", "--", "-fp", "built-ins", "-wr", NULL);
-+
 +  return 0;
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-08-30 18:33:15.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-11 18:23:52.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- initscripts.spec	30 Aug 2007 22:37:18 -0000	1.148
+++ initscripts.spec	11 Sep 2007 22:35:50 -0000	1.149
@@ -3,8 +3,9 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 5 
+Release: 6%{?dist} 
 Source: initscripts-%{version}.tar.bz2
+Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
@@ -45,6 +46,9 @@
 rm -rf $RPM_BUILD_ROOT
 make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install
 
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d/
+cp -f %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/
+
 %find_lang %{name}
 
 %ifnarch s390 s390x
@@ -200,8 +204,14 @@
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 /sbin/olpc-dm
+%{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-6
+- clean up olpc-dm
+- make sure olpc-dm sources /etc/sysconfig/i18n
+- add an olpc-login pam control file to avoid unneeded checks
+
 * Thu Aug 30 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-5
 - remove /etc/mtab and /etc/fstab from /etc/rwtab
 



From fedora-extras-commits at redhat.com  Tue Sep 11 22:37:06 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:37:06 -0400
Subject: comps comps-f8.xml.in,1.103,1.104
Message-ID: <200709112237.l8BMb68R024472@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24342

Modified Files:
	comps-f8.xml.in 
Log Message:
add vbetool and radeontool



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- comps-f8.xml.in	11 Sep 2007 07:12:58 -0000	1.103
+++ comps-f8.xml.in	11 Sep 2007 22:36:35 -0000	1.104
@@ -3498,6 +3498,7 @@
       <packagereq type="optional">pwgen</packagereq>
       <packagereq type="optional">qdbm</packagereq>
       <packagereq type="optional">qstat</packagereq>
+      <packagereq type="optional">radeontool</packagereq>
       <packagereq type="optional">rdesktop</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
@@ -3525,6 +3526,7 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">uucp</packagereq>
+      <packagereq type="optional">vbetool</packagereq>
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 22:40:26 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:40:26 -0400
Subject: rpms/olpc-logos/devel olpc-logos.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709112240.l8BMeQYA025031@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/devel

Modified Files:
	.cvsignore sources 
Added Files:
	olpc-logos.spec 
Log Message:
Initial import



--- NEW FILE olpc-logos.spec ---
# This is a Red Hat maintained package which is specific to
# OLPC.  Thus the source is only available from
# within this srpm.

# OLPC is x86 compatible arch and the package is only meant for OLPC


# This package replaces fedora-logos on OLPC  and contains the
# only trademarked image file needed for OLPC (the grub splash).
# It is not meant to be used on Fedora 



Name: olpc-logos
Summary: OLPC-related icons and pictures
Version: 0.1 
Release: 5%{?dist}
Group: System Environment/Base
Source0: olpc-logos-%{version}.tar.bz2
License: Copyright 2006 Red Hat, Inc.  All rights reserved.
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Obsoletes: redhat-logos < 1.2.0
Provides: redhat-logos = 1.2.0
Provides: system-logos = %{version}-%{release}

%description
The olpc-logos package (the "Packages") contain image files which
incorporate the OLPC trademarks and logos (the "Marks").

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

# should be ifarch i386
mkdir -p %{buildroot}/boot/grub
install -p -m 644 bootloader/grub-splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
# end i386 bits

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root)
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits


%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-5
- Drop a few redundant BR and conflicts
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-4
- Fixed timestamp. Add a couple of comments. Removed the fedora-logos provides
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-3
- Marked this package as upstream for source and fixed build root as per review.  Added provides for fedora-logos
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-2
- Submit for review in Fedora
* Tue Nov 07 2006 John (J5) Palmieri  <johnp at redhat.com> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:19:58 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:39:53 -0000	1.2
@@ -0,0 +1 @@
+olpc-logos-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:19:58 -0000	1.1
+++ sources	11 Sep 2007 22:39:53 -0000	1.2
@@ -0,0 +1 @@
+a4c3cdcecb3d948d21c2bf0ed1ffa972  olpc-logos-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 22:42:36 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:42:36 -0400
Subject: comps comps-f7.xml.in,1.251,1.252
Message-ID: <200709112242.l8BMga9A025437@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25298

Modified Files:
	comps-f7.xml.in 
Log Message:
add radeontool and vbetool



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- comps-f7.xml.in	11 Sep 2007 07:12:57 -0000	1.251
+++ comps-f7.xml.in	11 Sep 2007 22:42:06 -0000	1.252
@@ -3278,6 +3278,7 @@
       <packagereq type="optional">pwgen</packagereq>
       <packagereq type="optional">qdbm</packagereq>
       <packagereq type="optional">qstat</packagereq>
+      <packagereq type="optional">radeontool</packagereq>
       <packagereq type="optional">rdesktop</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
@@ -3305,6 +3306,7 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">uucp</packagereq>
+      <packagereq type="optional">vbetool</packagereq>
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 22:42:40 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:42:40 -0400
Subject: rpms/olpc-logos/OLPC-2 olpc-logos.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709112242.l8BMgeiV025455@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/olpc-logos/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	olpc-logos.spec 
Log Message:
Initial import



--- NEW FILE olpc-logos.spec ---
# This is a Red Hat maintained package which is specific to
# OLPC.  Thus the source is only available from
# within this srpm.

# OLPC is x86 compatible arch and the package is only meant for OLPC


# This package replaces fedora-logos on OLPC  and contains the
# only trademarked image file needed for OLPC (the grub splash).
# It is not meant to be used on Fedora 



Name: olpc-logos
Summary: OLPC-related icons and pictures
Version: 0.1 
Release: 5%{?dist}
Group: System Environment/Base
Source0: olpc-logos-%{version}.tar.bz2
License: Copyright 2006 Red Hat, Inc.  All rights reserved.
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Obsoletes: redhat-logos < 1.2.0
Provides: redhat-logos = 1.2.0
Provides: system-logos = %{version}-%{release}

%description
The olpc-logos package (the "Packages") contain image files which
incorporate the OLPC trademarks and logos (the "Marks").

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

# should be ifarch i386
mkdir -p %{buildroot}/boot/grub
install -p -m 644 bootloader/grub-splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
# end i386 bits

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root)
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits


%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-5
- Drop a few redundant BR and conflicts
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-4
- Fixed timestamp. Add a couple of comments. Removed the fedora-logos provides
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-3
- Marked this package as upstream for source and fixed build root as per review.  Added provides for fedora-logos
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-2
- Submit for review in Fedora
* Tue Nov 07 2006 John (J5) Palmieri  <johnp at redhat.com> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:19:58 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:42:07 -0000	1.2
@@ -0,0 +1 @@
+olpc-logos-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:19:58 -0000	1.1
+++ sources	11 Sep 2007 22:42:07 -0000	1.2
@@ -0,0 +1 @@
+a4c3cdcecb3d948d21c2bf0ed1ffa972  olpc-logos-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 23:05:02 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Tue, 11 Sep 2007 19:05:02 -0400
Subject: rpms/msv/devel msv.spec,1.1,1.2
Message-ID: <200709112305.l8BN52gv002331@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/msv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165

Modified Files:
	msv.spec 
Log Message:
- Fix unowned directories
- Change copyright files to utf-8 format
- Change license field to BSD (from BSD-Style)



Index: msv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msv/devel/msv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msv.spec	12 Mar 2007 14:54:43 -0000	1.1
+++ msv.spec	11 Sep 2007 23:04:28 -0000	1.2
@@ -37,9 +37,9 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.1%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
 Epoch:          1
-License:        BSD-Style
+License:        BSD
 URL:            http://msv.dev.java.net
 Group:          Development/Libraries
 # cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r msv-20050722 msv ; mv msv msv-20050722 tar zcf msv-20050722.tar.gz msv-*
@@ -238,6 +238,20 @@
 done
 rm tempf
 
+#change encoding of non utf-8 files
+iconv msv/doc/copyright.txt -f iso-8859-1 -t utf-8 -o msv/doc/copyright.txt.utf8
+mv msv/doc/copyright.txt.utf8 msv/doc/copyright.txt
+iconv relames/doc/copyright.txt -f iso-8859-1 -t utf-8 -o relames/doc/copyright.txt.utf8
+mv relames/doc/copyright.txt.utf8 relames/doc/copyright.txt
+iconv rngconverter/doc/copyright.txt -f iso-8859-1 -t utf-8 -o rngconverter/doc/copyright.txt.utf8
+mv rngconverter/doc/copyright.txt.utf8 rngconverter/doc/copyright.txt
+iconv generator/doc/copyright.txt -f iso-8859-1 -t utf-8 -o generator/doc/copyright.txt.utf8
+mv generator/doc/copyright.txt.utf8 generator/doc/copyright.txt
+iconv xsdlib/doc/copyright.txt -f iso-8859-1 -t utf-8 -o xsdlib/doc/copyright.txt.utf8
+mv xsdlib/doc/copyright.txt.utf8 xsdlib/doc/copyright.txt
+
+
+
 %patch0 -b .sav
 %patch1 -b .sav2
 %patch2
@@ -358,6 +372,8 @@
 %{_javadir}/%{name}-msv-%{version}.jar
 %{_javadir}/%{name}-msv.jar
 %{_javadir}/msv-strict.jar
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/license.txt
 %doc %{_docdir}/%{name}/msv/copyright.txt
 %if %{gcj_support}
@@ -367,10 +383,12 @@
 
 %files msv-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/msv
 
 %files demo
 %defattr(0644,root,root,0755)
+%dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/msv
 %{_datadir}/%{name}-%{version}/xsdlib
 
@@ -378,7 +396,8 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-relames-%{version}.jar
 %{_javadir}/%{name}-relames.jar
-#%{_docdir}/%{name}/relames/license.txt
+##%{_docdir}/%{name}/relames/license.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/copyright.txt
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-relames*
@@ -386,12 +405,14 @@
 
 %files relames-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/relames
 
 %files rngconv
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-rngconv-%{version}.jar
 %{_javadir}/%{name}-rngconv.jar
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/license.txt
 %doc %{_docdir}/%{name}/rngconv/copyright.txt
 %if %{gcj_support}
@@ -402,6 +423,7 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-xmlgen-%{version}.jar
 %{_javadir}/%{name}-xmlgen.jar
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/license.txt
 %doc %{_docdir}/%{name}/xmlgen/copyright.txt
 %if %{gcj_support}
@@ -410,6 +432,7 @@
 
 %files xmlgen-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xmlgen
 
 %files xsdlib
@@ -417,6 +440,7 @@
 %{_javadir}/%{name}-xsdlib-%{version}.jar
 %{_javadir}/%{name}-xsdlib.jar
 %{_javadir}/xsdlib.jar
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/license.txt
 %doc %{_docdir}/%{name}/xsdlib/copyright.txt
 %if %{gcj_support}
@@ -425,23 +449,35 @@
 
 %files xsdlib-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xsdlib
 
 %files manual
 %defattr(0644,root,root,0755)
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/ChangeLog.txt
 %doc %{_docdir}/%{name}/msv/*.html
 %doc %{_docdir}/%{name}/msv/*.gif
 %doc %{_docdir}/%{name}/msv/README.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/README.txt
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/README.txt
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/*.html
 %doc %{_docdir}/%{name}/xmlgen/README.txt
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/*.html
 %doc %{_docdir}/%{name}/xsdlib/README.txt
 
 
 %changelog
+* Tue Sep 11 2007 Matt Wringe <mwringe at redhat.com> 0:1.2-0.1.20050722.3jpp.2
+- Fix unowned directories
+- Change copyright files to utf-8 format
+- Change license field to BSD (from BSD-Style)
+
 * Fri Feb 16 2007 Andrew Overholt <overholt at redhat.com> 0:1.2-0.1.20050722.3jpp.1
 - Remove postun Requires on jpackage-utils
 - Set gcj_support to 1



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:26 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:26 -0400
Subject: rpms/liberation-fonts/F-7 liberation-fonts.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200709120016.l8C0GQvj018226@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/F-7

Modified Files:
	liberation-fonts.spec sources 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/F-7/liberation-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liberation-fonts.spec	21 Aug 2007 02:52:22 -0000	1.5
+++ liberation-fonts.spec	12 Sep 2007 00:15:51 -0000	1.6
@@ -6,7 +6,7 @@
 Name:         liberation-fonts
 Version:      0.2
 Release:      1%{?dist}
-License:      GPL + font exception
+License:      GPLv2 with exceptions
 Group:        User Interface/X
 URL:          https://www.redhat.com/promo/fonts/
 Source0:      https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 02:48:17 -0000	1.3
+++ sources	12 Sep 2007 00:15:51 -0000	1.4
@@ -1,2 +1 @@
-360dee2d73159522db3be6af8ec23294  liberation-fonts-ttf-2.tar.gz
 77728078a17e39f7c242b42c3bf6feb8  liberation-fonts-ttf-3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:30 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:30 -0400
Subject: rpms/liberation-fonts/FC-6 liberation-fonts.spec,1.3,1.4
Message-ID: <200709120016.l8C0GU88018252@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/FC-6

Modified Files:
	liberation-fonts.spec 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/FC-6/liberation-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liberation-fonts.spec	15 May 2007 17:28:36 -0000	1.3
+++ liberation-fonts.spec	12 Sep 2007 00:15:56 -0000	1.4
@@ -2,7 +2,7 @@
 Name: liberation-fonts
 Version: 0.1
 Release: 9%{?dist}
-License: GPL + font exception
+License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
 Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-2.tar.gz 



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:35 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:35 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.5,1.6
Message-ID: <200709120016.l8C0GZhT018265@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/devel

Modified Files:
	liberation-fonts.spec 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liberation-fonts.spec	14 Jun 2007 06:51:09 -0000	1.5
+++ liberation-fonts.spec	12 Sep 2007 00:16:00 -0000	1.6
@@ -5,7 +5,7 @@
 License: GPL + font exception
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
-Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 
+Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz
 Source1: 59-liberation-fonts.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Sep 12 00:17:00 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Sep 2007 20:17:00 -0400
Subject: rpms/kernel/devel kernel.spec, 1.157,
	1.158 linux-2.6-utrace-core.patch, 1.6, 1.7
Message-ID: <200709120017.l8C0H0M5018333@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
Log Message:
utrace update (#248532, #267161, #284311)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kernel.spec	11 Sep 2007 21:25:51 -0000	1.157
+++ kernel.spec	12 Sep 2007 00:16:26 -0000	1.158
@@ -1796,14 +1796,14 @@
 
 
 %changelog
+* Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#248532, #267161, #284311)
+
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix emulated vmware SCSI disks
 - add option to disable libata PATA DMA
 
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
-- utrace update
-
-* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6
 
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-core.patch	4 Sep 2007 20:53:27 -0000	1.6
+++ linux-2.6-utrace-core.patch	12 Sep 2007 00:16:26 -0000	1.7
@@ -20,7 +20,7 @@
 ---
 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2344 +++++++++++++++++++++++++++++++++++++
+ kernel/utrace.c                   | 2359 +++++++++++++++++++++++++++++++++++++
  Documentation/utrace.txt          |  579 +++++++++
  Documentation/DocBook/Makefile    |    2 
  Documentation/DocBook/utrace.tmpl |   23 
@@ -28,7 +28,7 @@
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
  init/Kconfig                      |   20 
- 9 files changed, 3585 insertions(+), 18 deletions(-)
+ 9 files changed, 3600 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -46,7 +46,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/kernel/utrace.c
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,2344 @@
+@@ -0,0 +1,2359 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2004,13 +2004,28 @@
 +	 */
 +	if (signal.signr != 0) {
 +		if (signal.return_ka == NULL) {
-+			ka = &tsk->sighand->action[signal.signr - 1];
++			/*
++			 * utrace_inject_signal recorded this to have us
++			 * use the injected signal's normal sigaction.  We
++			 * have to perform the SA_ONESHOT work now because
++			 * our caller will never touch the real sigaction.
++			 */
++			ka = &tsk->sighand->action[info->si_signo - 1];
++			*return_ka = *ka;
 +			if (ka->sa.sa_flags & SA_ONESHOT)
 +				ka->sa.sa_handler = SIG_DFL;
-+			*return_ka = *ka;
 +		}
 +		else
 +			BUG_ON(signal.return_ka != return_ka);
++
++		/*
++		 * We already processed the SA_ONESHOT work ahead of time.
++		 * Once we return nonzero, our caller will only refer to
++		 * return_ka.  So we must clear the flag to be sure it
++		 * doesn't clear return_ka->sa.sa_handler.
++		 */
++		return_ka->sa.sa_flags &= ~SA_ONESHOT;
++
 +		return signal.signr;
 +	}
 +



From fedora-extras-commits at redhat.com  Wed Sep 12 00:18:17 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Sep 2007 20:18:17 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec, 1.3338,
	1.3339 linux-2.6-utrace-core.patch, 1.4,
	1.5 linux-2.6-utrace-ptrace-compat.patch, 1.4, 1.5
Message-ID: <200709120018.l8C0IHTk018545@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18429

Modified Files:
	kernel-2.6.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
Log Message:
utrace update (#248532, #267161, #284311)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3338
retrieving revision 1.3339
diff -u -r1.3338 -r1.3339
--- kernel-2.6.spec	5 Sep 2007 16:18:54 -0000	1.3338
+++ kernel-2.6.spec	12 Sep 2007 00:17:42 -0000	1.3339
@@ -478,7 +478,7 @@
 Patch00: patch-2.6.%{base_sublevel}.%{stable_update}.bz2
 
 # non-released_kernel case
-# These are automagically defined by the rcrev and gitrev values set up 
+# These are automagically defined by the rcrev and gitrev values set up
 # near the top of this spec file.
 %else
 %if 0%{?rcrev}
@@ -2306,8 +2306,8 @@
 %endif
 
 %changelog
-* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
-- Update utrace
+* Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#248532, #267161, #284311)
 
 * Thu Aug 30 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-core.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-core.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-core.patch	12 Sep 2007 00:17:42 -0000	1.5
@@ -27,8 +27,8 @@
  include/linux/utrace.h            |  544 ++++++++
  init/Kconfig                      |   18 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2344 ++++++++++++++++++++++++++++++++++++++
- 9 files changed, 3583 insertions(+), 18 deletions(-)
+ kernel/utrace.c                   | 2359 ++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 3598 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -50,7 +50,7 @@
 ===================================================================
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2344 @@
+@@ -0,0 +1,2359 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2008,13 +2008,28 @@
 +	 */
 +	if (signal.signr != 0) {
 +		if (signal.return_ka == NULL) {
-+			ka = &tsk->sighand->action[signal.signr - 1];
++			/*
++			 * utrace_inject_signal recorded this to have us
++			 * use the injected signal's normal sigaction.  We
++			 * have to perform the SA_ONESHOT work now because
++			 * our caller will never touch the real sigaction.
++			 */
++			ka = &tsk->sighand->action[info->si_signo - 1];
++			*return_ka = *ka;
 +			if (ka->sa.sa_flags & SA_ONESHOT)
 +				ka->sa.sa_handler = SIG_DFL;
-+			*return_ka = *ka;
 +		}
 +		else
 +			BUG_ON(signal.return_ka != return_ka);
++
++		/*
++		 * We already processed the SA_ONESHOT work ahead of time.
++		 * Once we return nonzero, our caller will only refer to
++		 * return_ka.  So we must clear the flag to be sure it
++		 * doesn't clear return_ka->sa.sa_handler.
++		 */
++		return_ka->sa.sa_flags &= ~SA_ONESHOT;
++
 +		return signal.signr;
 +	}
 +

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat.patch	12 Sep 2007 00:17:42 -0000	1.5
@@ -28,9 +28,9 @@
  kernel/Makefile                 |    3 
  kernel/exit.c                   |   13 
  kernel/fork.c                   |    2 
- kernel/ptrace.c                 | 2052 +++++++++++++++++++++++++++++++++++++---
+ kernel/ptrace.c                 | 2053 +++++++++++++++++++++++++++++++++++++---
  kernel/sys_ni.c                 |    4 
- 18 files changed, 2633 insertions(+), 174 deletions(-)
+ 18 files changed, 2634 insertions(+), 174 deletions(-)
 
 Index: b/fs/proc/base.c
 ===================================================================
@@ -683,7 +683,7 @@
 ===================================================================
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
-@@ -19,194 +19,2008 @@
+@@ -19,194 +19,2009 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1131,9 +1131,7 @@
 +			 struct ptrace_state *state)
  {
 -	if (!valid_signal(data))
--		return -EIO;
- 
--	return -ENOSYS;
++
 +	int error;
 +
 +	NO_LOCKS;
@@ -1191,29 +1189,20 @@
 +		spin_unlock_irq(&current->sighand->siglock);
 +	}
 +	return error;
- }
- 
--int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
++}
++
 +
 +/*
 + * This is called when we are exiting.  We must stop all our ptracing.
 + */
 +void
 +ptrace_exit(struct task_struct *tsk)
- {
--	int copied = 0;
++{
 +	struct list_head *pos, *n;
 +	int restart;
- 
--	while (len > 0) {
--		char buf[128];
--		int this_len, retval;
++
 +	NO_LOCKS;
- 
--		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
--		retval = access_process_vm(tsk, src, buf, this_len, 0);
--		if (!retval) {
--			if (copied)
++
 +	/*
 +	 * Taking the task_lock after PF_EXITING is set ensures that a
 +	 * child in ptrace_traceme will not put itself on our list when
@@ -1226,7 +1215,6 @@
 +	}
 +	task_unlock(tsk);
 +
-+	restart = 0;
 +	do {
 +		struct ptrace_state *state;
 +		int error;
@@ -1235,6 +1223,7 @@
 +
 +		rcu_read_lock();
 +
++		restart = 0;
 +		list_for_each_safe_rcu(pos, n, &tsk->ptracees) {
 +			state = list_entry(pos, struct ptrace_state, entry);
 +			error = utrace_detach(state->task, state->engine);
@@ -1256,7 +1245,7 @@
 +				wait_task_inactive(p);
 +				put_task_struct(p);
 +				restart = 1;
- 				break;
++				goto loop_unlocked;
 +			}
 +			else {
 +				BUG_ON(error != -ESRCH);
@@ -1266,10 +1255,11 @@
 +
 +		rcu_read_unlock();
 +
++	loop_unlocked:
 +		END_CHECK;
 +
 +		cond_resched();
-+	} while (restart > 0);
++	} while (unlikely(restart > 0));
 +
 +	if (likely(restart == 0))
 +		/*
@@ -1291,8 +1281,9 @@
 +		return 0;
 +
 +	if (!valid_signal(signr))
-+		return -EIO;
-+
+ 		return -EIO;
+ 
+-	return -ENOSYS;
 +	if (state->syscall) {
 +		/*
 +		 * This is the traditional ptrace behavior when given
@@ -1320,22 +1311,32 @@
 +	}
 +
 +	return 0;
-+}
-+
+ }
+ 
+-int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
 +int
 +ptrace_regset_access(struct task_struct *target,
 +		     struct utrace_attached_engine *engine,
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long offset, unsigned int size,
 +		     void __user *data, int write)
-+{
+ {
+-	int copied = 0;
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	int ret;
-+
+ 
+-	while (len > 0) {
+-		char buf[128];
+-		int this_len, retval;
 +	if (unlikely(regset == NULL))
 +		return -EIO;
-+
+ 
+-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+-		retval = access_process_vm(tsk, src, buf, this_len, 0);
+-		if (!retval) {
+-			if (copied)
+-				break;
 +	if (size == (unsigned int) -1)
 +		size = regset->size * regset->n;
 +
@@ -1460,13 +1461,7 @@
 +			else
 +				ret = (*regset->get)(target, regset,
 +						     pos, n, kdata, udata);
- 		}
--		if (copy_to_user(dst, buf, retval))
--			return -EFAULT;
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +
 +		if (kdata)
 +			kdata += n;
@@ -1514,8 +1509,7 @@
 +	if (request == PTRACE_ATTACH) {
 +		ret = ptrace_attach(child);
 +		goto out_tsk;
- 	}
--	return copied;
++	}
 +
 +	rcu_read_lock();
 +	engine = utrace_attach(child, UTRACE_ATTACH_MATCH_OPS,
@@ -1542,7 +1536,13 @@
 +			if (child->state == TASK_STOPPED)
 +				ret = 0;
 +			unlock_task_sighand(child, &flags);
-+		}
+ 		}
+-		if (copy_to_user(dst, buf, retval))
+-			return -EFAULT;
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		if (ret == 0) {
 +			ret = ptrace_update(child, state,
 +					    UTRACE_ACTION_QUIESCE, 0);
@@ -1559,7 +1559,8 @@
 +		}
 +
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
-+	}
+ 	}
+-	return copied;
 +
 +	rcu_read_unlock();
 +



From fedora-extras-commits at redhat.com  Wed Sep 12 01:15:11 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 21:15:11 -0400
Subject: rpms/evolution/devel evolution-2.11.92-mail-attachment.patch, NONE, 
	1.1 evolution.spec, 1.288, 1.289
Message-ID: <200709120115.l8C1FBP1032540@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32292

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.11.92-mail-attachment.patch 
Log Message:

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
- Add patch for GNOME bug #476040 (fix attachment icon).


evolution-2.11.92-mail-attachment.patch:

--- NEW FILE evolution-2.11.92-mail-attachment.patch ---
diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-11 18:58:15.000000000 -0400
@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items
 	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
-	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},
+	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
 	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
 /* 	{ NULL, 0, NULL }, */
diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c
--- evolution-2.11.92/mail/message-list.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/message-list.c	2007-09-11 18:58:15.000000000 -0400
@@ -223,7 +223,7 @@ static struct {
 	{ "stock_mail-unread-multiple",        NULL },
 	{ "stock_mail-open-multiple",          NULL },
 	{ NULL,                                NULL },
-	{ "stock_attach",                      NULL },
+	{ "mail-attachment",                   NULL },
 	{ "emblem-important",                  NULL },
 	{ "stock_score-lowest",                NULL },
 	{ "stock_score-lower",                 NULL },
diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c
--- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment	2007-09-02 14:57:07.000000000 -0400
+++ evolution-2.11.92/widgets/misc/e-attachment-bar.c	2007-09-11 18:58:15.000000000 -0400
@@ -281,8 +281,7 @@ update (EAttachmentBar *bar)
 		attachment = priv->attachments->pdata[i];
 		
 		if (!attachment->is_available_local || !attachment->body) {
-			/* stock_attach would be better, but its fugly scaled up */
-			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
+			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
 				g_object_unref (pixbuf);
 			}
@@ -373,8 +372,7 @@ update (EAttachmentBar *bar)
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			if (pixbuf == NULL) {
 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
 			}
 			g_free (mime_type);
 		}
diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c
--- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment	2007-09-02 14:56:48.000000000 -0400
+++ evolution-2.11.92/composer/e-msg-composer.c	2007-09-11 18:58:15.000000000 -0400
@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
+/*	E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
 	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
@@ -3989,7 +3989,7 @@ create_composer (int visible_mask)
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
+	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
 
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-11 18:58:16.000000000 -0400
@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget)
 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
 	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 }
 
diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
--- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment	2007-09-02 14:57:08.000000000 -0400
+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c	2007-09-11 18:58:15.000000000 -0400
@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
 
 	E_PIXMAP_END
 };
@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor)
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-11 18:58:16.000000000 -0400
@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- evolution.spec	11 Sep 2007 21:20:45 -0000	1.288
+++ evolution.spec	12 Sep 2007 01:14:37 -0000	1.289
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -121,6 +121,9 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
+# GNOME bug #476040
+Patch35: evolution-2.11.92-mail-attachment.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -260,6 +263,7 @@
 %patch31 -p1 -b .meeting-list-view
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
+%patch35 -p1 -b .mail-attachment
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -709,6 +713,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
+- Add patch for GNOME bug #476040 (fix attachment icon).
+
 * Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
 - Split off an evolution-help package
 



From fedora-extras-commits at redhat.com  Wed Sep 12 01:32:17 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 11 Sep 2007 21:32:17 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.300.0-fedora8-distro.patch, NONE,
	1.1 python-virtinst.spec, 1.23,
	1.24 virtinst-0.200.0-default-arch.patch, 1.1, NONE
Message-ID: <200709120132.l8C1WHK3002339@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2239

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.300.0-fedora8-distro.patch 
Removed Files:
	virtinst-0.200.0-default-arch.patch 
Log Message:
Fixed detection of F8 distro layout (rhbz #273781)

python-virtinst-0.300.0-fedora8-distro.patch:

--- NEW FILE python-virtinst-0.300.0-fedora8-distro.patch ---
changeset:   268:6b4684756fcf
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:02 2007 -0400
files:       virtinst/DistroManager.py
description:
Fix detection of Fedora distros for latest F8 style trees


diff -r a6d47ed6c97c -r 6b4684756fcf virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Wed Aug 29 18:25:09 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Sep 11 21:20:02 2007 -0400
@@ -210,6 +210,9 @@ class RedHatImageStore(ImageStore):
 # Fedora distro check
 class FedoraImageStore(RedHatImageStore):
     def isValidStore(self, fetcher, progresscb):
+        if fetcher.hasFile("fedora.css", progresscb):
+            logging.debug("Detected a Fedora distro")
+            return True
         if fetcher.hasFile("Fedora", progresscb):
             logging.debug("Detected a Fedora distro")
             return True

changeset:   269:39d2c56e9895
tag:         tip
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:30 2007 -0400
files:       virtinst/FullVirtGuest.py
description:
Fix typo in Fedora 8 distro name


diff -r 6b4684756fcf -r 39d2c56e9895 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:02 2007 -0400
+++ b/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:30 2007 -0400
@@ -34,7 +34,7 @@ class FullVirtGuest(Guest.XenGuest):
                                           "fedora5": { "label": "Fedora Core 5", "distro": "fedora" }, \
                                           "fedora6": { "label": "Fedora Core 6", "distro": "fedora" }, \
                                           "fedora7": { "label": "Fedora 7", "distro": "fedora" }, \
-                                          "fedora8": { "label": "Fedora 7", "distro": "fedora" }, \
+                                          "fedora8": { "label": "Fedora 8", "distro": "fedora" }, \
                                           "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, \
                                           "generic24": { "label": "Generic 2.4.x kernel" }, \
                                           "generic26": { "label": "Generic 2.6.x kernel" }, \



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-virtinst.spec	29 Aug 2007 22:38:15 -0000	1.23
+++ python-virtinst.spec	12 Sep 2007 01:31:44 -0000	1.24
@@ -11,8 +11,9 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+Patch1: %{name}-%{version}-fedora8-distro.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -64,7 +66,10 @@
 %{_bindir}/virt-image
 
 %changelog
-* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1
+* Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-2.fc8
+- Fixed detection of Fedora 8 distro trees (rhbz #273781)
+
+* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1.fc8
 - Updated to 0.300.0
 - Added virt-image tool
 - Switched to calling virsh console and virt-viewer


--- virtinst-0.200.0-default-arch.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 02:54:52 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Tue, 11 Sep 2007 22:54:52 -0400
Subject: rpms/kdebase/devel kdebase.spec, 1.263.2.17, 1.263.2.18 kde4-opt.sh,
	1.1.2.1, NONE kde4-xdg_menu_prefix.sh, 1.1.2.2,
	NONE kdebase-3.91.0-consolekit-kdm.patch, 1.1.2.1,
	NONE kdebase-3.92.0-kde4home.diff, 1.1.2.2,
	NONE kdebase-3.92.0-redhat-startkde.patch, 1.1.2.2, NONE
Message-ID: <200709120254.l8C2sq0l020015@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Removed Files:
      Tag: kdebase-kde4-branch
	kde4-opt.sh kde4-xdg_menu_prefix.sh 
	kdebase-3.91.0-consolekit-kdm.patch 
	kdebase-3.92.0-kde4home.diff 
	kdebase-3.92.0-redhat-startkde.patch 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.17
retrieving revision 1.263.2.18
diff -u -r1.263.2.17 -r1.263.2.18
--- kdebase.spec	17 Aug 2007 10:22:04 -0000	1.263.2.17
+++ kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.92.0
-Release:       4%{?dist}
+Version:       3.93.0
+Release:       1%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -20,20 +20,6 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# /usr/bin/plasma (#250180)
-Conflicts:  rss-glx < 0.8.1.p-8
-
-# FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
-# don't rely on env (same goes for kde3) -- Rex
-Source1: kde4-opt.sh
-Source2: kde4-xdg_menu_prefix.sh
-
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdebase-%{version}-kde4home.diff
-Patch1: kdebase-%{version}-redhat-startkde.patch
-# see http://bugzilla.redhat.com/228111 , http://bugs.kde.org/147790
-Patch2: kdebase-3.91.0-consolekit-kdm.patch
-
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
@@ -44,47 +30,28 @@
 Requires: eject
 %endif
 
-Obsoletes: %{name}-kdm < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-kdm = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# FIXME/TODO
-#BuildRequires: libcaptury-devel
-
-BuildRequires: automake libtool
-BuildRequires: bluez-libs-devel
 BuildRequires: bzip2-devel
+# needed?
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
-BuildRequires: dbus-devel
 BuildRequires: doxygen
-BuildRequires: imake
 BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
 BuildRequires: gettext
-BuildRequires: glib2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+# needed?
 BuildRequires: libart_lgpl-devel
+# needed?
 BuildRequires: libfontenc-devel
-BuildRequires: libpng-devel
-%ifnarch s390 s390x
-BuildRequires: libraw1394-devel
-%endif
 BuildRequires: libusb-devel
-BuildRequires: libXcomposite-devel libXcursor-devel libXdamage-devel 
-BuildRequires: libXext-devel libXfixes-devel libXinerama-devel
-BuildRequires: libXrandr-devel libXrender-devel libXres-devel
-BuildRequires: libXScrnSaver-devel libXtst-devel libXxf86misc-devel
-BuildRequires: libxklavier-devel
-BuildRequires: lm_sensors-devel
-BuildRequires: NetworkManager-devel
 BuildRequires: OpenEXR-devel
+# needed?
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
-BuildRequires: pam-devel
 BuildRequires: pkgconfig
+BuildRequires: qimageblitz-devel
 # samba support
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
@@ -93,7 +60,14 @@
 %endif
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
-BuildRequires: xorg-x11-font-utils xorg-x11-proto-devel
+BuildRequires: xine-lib-devel
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+%if 0%{?fedora} >= 8
+BuildRequires:  libxcb-devel
+%endif
+# needed?
+BuildRequires: xorg-x11-font-utils
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
@@ -112,15 +86,6 @@
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
-## FIXME/TODO: trim these down -- Rex
-#Requires: libXcomposite-devel libXdamage-devel
-#Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
-#Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-#Requires: libXScrnSaver-devel libXtst-devel
-#Requires: libXinerama-devel libfontenc-devel
-#Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-#Requires: hal-devel bluez-libs-devel
-#Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
 %description devel
 Header files for developing applications using %{name}.
 WARNING: This is a beta version. It probably has many bugs left.
@@ -130,9 +95,6 @@
 %prep
 %setup -q -n kdebase-%{version}
 
-%patch1 -p1 -b .redhat-startkde
-%patch2 -p1 -b .consolekit_kdm
-
 
 %build
 
@@ -146,44 +108,17 @@
 
 %install
 rm -rf %{buildroot}
+mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -d %{buildroot}%{_sysconfdir}/kde/{env,shutdown}
-install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/
-install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
-
-# setup %{_kde4_appsdir}/kdm/faces
-mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
-pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
-# nuke default kdm setup in favor of our own (not yet, FIXME: update kde-settings)
-#rm -rf  %{buildroot}%{_datadir}/config/kdm/
-# FIXME/TODO: kdmrc default values reference %%buildroot
-sed -i -e "s|%{buildroot}||g" %{buildroot}%{_datadir}/config/kdm/* ||:
-
-sed -i \
-  -e "s|@@PREFIX@@|%{_kde4_prefix}|" \
-  -e "s|@@BINDIR@@|%{_kde4_bindir}|" \
-  -e "s|@@LIBDIR@@|%{_kde4_libdir}|" \
-  -e "s|@@SYSCONFDIR@@|%_kde4_sysconfdir}|" \
-  %{buildroot}%{_kde4_sysconfdir}/kde/env/*.sh
-
-mkdir -p %{buildroot}/usr/share/xsessions
-## kde->kde4 xsession
-%if "%{name}" != "kdebase"
-mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde.desktop \
-   %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-ln -s %{_kde4_appsdir}/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
-%else
-ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
-%endif
-
-## Unpackaged files
-# Conflicts with kdelibs (ick)
-rm -f %{buildroot}%{_datadir}/icons/oxygen/*/*/{acroread,wine}.*
+## unpackaged files
+# these conflict with KDE 3 too -- Kevin
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+# omit gigantic oxygen scalable/svg icons, for now -- Rex
+#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
+# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
+rm -rf %{buildroot}%{_datadir}/emoticons
 
 
 %clean
@@ -193,23 +128,18 @@
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files
 %defattr(-,root,root,-)
-/usr/share/xsessions/*.desktop
-%{_kde4_sysconfdir}/kde/env/*
-#{_kde4_sysconfdir}/kde/shutdown/*
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
@@ -220,20 +150,15 @@
 %{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/desktop-directories/*
 %{_kde4_iconsdir}/crystalsvg/
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/kde4/*
-%{_libdir}/strigi/*
-%config %{_kde4_sysconfdir}/*rc
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
@@ -244,6 +169,23 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
+- remove kdebase-kdm Obsoletes/Provides (for the same reason)
+- remove KDM (and KDM session) setup code (for the same reason)
+- remove rss-glx conflict (Plasma is now in kdebase-workspace)
+- remove redhat-startkde patch (startkde is now in kdebase-workspace)
+- remove kde4-opt.sh (all the code in it is commented out)
+- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
+- remove bogus BRs on automake and libtool
+- remove workspace-only BRs
+- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
+- remove workspace files and directories
+- handle icons (moved from kdelibs4)
+- add mkdir %%{buildroot} in %%install
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: GPLv2


--- kde4-opt.sh DELETED ---


--- kde4-xdg_menu_prefix.sh DELETED ---


--- kdebase-3.91.0-consolekit-kdm.patch DELETED ---


--- kdebase-3.92.0-kde4home.diff DELETED ---


--- kdebase-3.92.0-redhat-startkde.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 03:47:51 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 11 Sep 2007 23:47:51 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.200.0-default-arch.patch, 
	NONE, 1.1 python-virtinst.spec, 1.24, 1.25
Message-ID: <200709120347.l8C3lpMY000789@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv694

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.200.0-default-arch.patch 
Log Message:
Fixed default  arch again

python-virtinst-0.200.0-default-arch.patch:

--- NEW FILE python-virtinst-0.200.0-default-arch.patch ---
diff -rup virtinst-0.200.0.orig/virtinst/util.py virtinst-0.200.0.new/virtinst/util.py
--- virtinst-0.200.0.orig/virtinst/util.py	2007-07-18 22:04:21.000000000 -0400
+++ virtinst-0.200.0.new/virtinst/util.py	2007-07-26 10:25:15.000000000 -0400
@@ -124,7 +124,7 @@ def get_default_arch():
     arch = os.uname()[4]
     if arch == "x86_64":
         return "x86_64"
-    return "i386"
+    return "i686"
 
 # this function is directly from xend/server/netif.py and is thus
 # available under the LGPL,


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-virtinst.spec	12 Sep 2007 01:31:44 -0000	1.24
+++ python-virtinst.spec	12 Sep 2007 03:47:19 -0000	1.25
@@ -11,9 +11,10 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{name}-%{version}-fedora8-distro.patch
+Patch2: %{name}-0.200.0-default-arch.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +38,7 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -66,6 +68,9 @@
 %{_bindir}/virt-image
 
 %changelog
+* Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-3.fc8
+- Fixed default architecture. Again.
+
 * Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-2.fc8
 - Fixed detection of Fedora 8 distro trees (rhbz #273781)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 06:18:47 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:18:47 -0400
Subject: rpms/dbench/F-7 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709120618.l8C6Ilkg006995@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6838

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	12 Sep 2007 06:18:09 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	12 Sep 2007 06:18:09 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 06:21:35 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:21:35 -0400
Subject: rpms/dbench/F-7 dbench.spec,NONE,1.1
Message-ID: <200709120621.l8C6LZws007485@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7437

Added Files:
	dbench.spec 
Log Message:
Initial build



--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5



From fedora-extras-commits at redhat.com  Wed Sep 12 06:43:55 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 02:43:55 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.6,1.7
Message-ID: <200709120643.l8C6htOs010516@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10428

Modified Files:
	liberation-fonts.spec 
Log Message:
update license field to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- liberation-fonts.spec	12 Sep 2007 00:16:00 -0000	1.6
+++ liberation-fonts.spec	12 Sep 2007 06:43:17 -0000	1.7
@@ -1,8 +1,8 @@
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
 Version: 0.2
-Release: 1%{?dist}
-License: GPL + font exception
+Release: 2%{?dist}
+License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
 Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz
@@ -53,6 +53,9 @@
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-2.fc8
+- update license field to GPLv2
+
 * Thu Jun 14 2007 Caius Chance <cchance at redhat.com> 0.2-1.fc8
 - Updated new source tarball from upstream: '-3' (version 0.2).
 



From fedora-extras-commits at redhat.com  Wed Sep 12 06:53:00 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 02:53:00 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.18,1.263.2.19
Message-ID: <200709120653.l8C6r0qP011350@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11288/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.18
retrieving revision 1.263.2.19
diff -u -r1.263.2.18 -r1.263.2.19
--- kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
+++ kdebase.spec	12 Sep 2007 06:52:23 -0000	1.263.2.19
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.93.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -30,6 +30,9 @@
 Requires: eject
 %endif
 
+# should not conflict with d3lphin, but does with old Dolphin
+Conflicts:     dolphin <= 0.8.2
+
 BuildRequires: bzip2-devel
 # needed?
 BuildRequires: cdparanoia-devel cdparanoia
@@ -111,14 +114,97 @@
 mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-## unpackaged files
-# these conflict with KDE 3 too -- Kevin
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
-#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
+
+# remove files which conflict with KDE 3
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
 rm -rf %{buildroot}%{_datadir}/emoticons
+rm -rf %{buildroot}%{_kde4_datadir}/locale
+rm -rf %{buildroot}%{_kde4_datadir}/autostart
+rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
+rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
+rm -rf %{buildroot}%{_kde4_datadir}/config
+rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
+rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
+# binaries: conflict with kdebase
+rm -f %{buildroot}%{_kde4_bindir}/drkonqi
+rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
+rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
+rm -f %{buildroot}%{_kde4_bindir}/kdeeject
+rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
+rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
+rm -f %{buildroot}%{_kde4_bindir}/kdesu
+rm -f %{buildroot}%{_kde4_bindir}/kdesud
+rm -f %{buildroot}%{_kde4_bindir}/kdialog
+rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
+rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
+rm -f %{buildroot}%{_kde4_bindir}/kfind
+rm -f %{buildroot}%{_kde4_bindir}/kfmclient
+rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
+rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
+rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
+rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
+rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
+rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
+rm -f %{buildroot}%{_kde4_bindir}/knetattach
+rm -f %{buildroot}%{_kde4_bindir}/konqueror
+rm -f %{buildroot}%{_kde4_bindir}/konsole
+rm -f %{buildroot}%{_kde4_bindir}/kprinter
+rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
+rm -f %{buildroot}%{_kde4_bindir}/kstart
+rm -f %{buildroot}%{_kde4_bindir}/ktrash
+rm -f %{buildroot}%{_kde4_bindir}/kwrite
+rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
+rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
+rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
+# binaries: conflict with kdelibs
+rm -f %{buildroot}%{_kde4_bindir}/kcmshell
+rm -f %{buildroot}%{_kde4_bindir}/kfile
+rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
+rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
+rm -f %{buildroot}%{_kde4_bindir}/kioexec
+rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
+# binaries: conflict with kdebase-extras
+rm -f %{buildroot}%{_kde4_bindir}/kappfinder
+# do not strictly conflict, but we removed the corresponding binaries:
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
+# we also removed the binaries for these:
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
+
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
 
 
 %clean
@@ -127,13 +213,11 @@
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
@@ -143,32 +227,31 @@
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
-%{_kde4_datadir}/autostart/*
-%{_kde4_datadir}/config/
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
-%{_kde4_datadir}/desktop-directories/*
-%{_kde4_iconsdir}/crystalsvg/
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/*
-%{_kde4_sysconfdir}/xdg/menus/*.menu
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- remove files which conflict with KDE 3
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- Conflicts with KDE 3 versions of dolphin pre d3lphin rename
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Wed Sep 12 06:55:41 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:55:41 -0400
Subject: rpms/dbench/EL-5 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709120655.l8C6tfDI011568@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11477

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:28:25 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 04:28:25 -0400
Subject: rpms/python-memcached/F-7 sources,1.2,1.3
Message-ID: <200709120828.l8C8SPbq030495@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	sources 
Log Message:
Updating the sources to 1.39 release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2007 02:46:01 -0000	1.2
+++ sources	12 Sep 2007 08:27:53 -0000	1.3
@@ -1 +1 @@
-b5154b816e2dfd54dcd3264e16b3fa77  python-memcached-1.36.tar.gz
+403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:30:02 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 04:30:02 -0400
Subject: rpms/python-memcached/F-7 python-memcached.spec,1.1,1.2
Message-ID: <200709120830.l8C8U2sH030555@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30520

Modified Files:
	python-memcached.spec 
Log Message:
Oops, forgot to update spec file as well, for 1.39 release in F-7.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-memcached.spec	27 Jun 2007 02:46:01 -0000	1.1
+++ python-memcached.spec	12 Sep 2007 08:29:29 -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()")}
 
 Name:           python-memcached
-Version:        1.36
-Release:        3%{?dist}
+Version:        1.39
+Release:        1%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -40,6 +40,12 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
+- Update to 1.39 upstream release.
+
+* Sat Aug 11 2007 Sean Reifschneider <jafo at tummy.com> 1.38-1
+- Update to 1.38 upstream release.
+
 * Sun Jun 10 2007 Sean Reifschneider <jafo at tummy.com> 1.36-3
 - Changes based on feedback from Ruben Kerkhof:
 - Fixing license.



From fedora-extras-commits at redhat.com  Wed Sep 12 08:42:17 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 04:42:17 -0400
Subject: rpms/bluez-libs/devel .cvsignore, 1.25, 1.26 bluez-libs.spec, 1.40, 
	1.41 sources, 1.25, 1.26
Message-ID: <200709120842.l8C8gHtE031041@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31002

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 17:08:05 -0000	1.25
+++ .cvsignore	12 Sep 2007 08:41:45 -0000	1.26
@@ -1 +1 @@
-bluez-libs-3.17.tar.gz
+bluez-libs-3.18.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bluez-libs.spec	30 Aug 2007 17:08:05 -0000	1.40
+++ bluez-libs.spec	12 Sep 2007 08:41:45 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.17
+Version: 3.18
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> - 3.18-1
+- Update to bluez-libs 3.18
+
 * Thu Aug 30 2007 David Woodhouse <dwmw2 at infradead.org> - 3.17-1
 - Update to bluez-libs 3.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Aug 2007 17:08:05 -0000	1.25
+++ sources	12 Sep 2007 08:41:45 -0000	1.26
@@ -1 +1 @@
-0b7869b980efabe23ff1d86cf4faca25  bluez-libs-3.17.tar.gz
+9e091f2ce00b906c4c456fff24e69e55  bluez-libs-3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:54:27 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 04:54:27 -0400
Subject: rpms/bluez-utils/devel .cvsignore, 1.23, 1.24 bluez-utils.spec, 1.75,
	1.76 sources, 1.23, 1.24
Message-ID: <200709120854.l8C8sRP1031543@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31511

Modified Files:
	.cvsignore bluez-utils.spec sources 
Log Message:
3.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Aug 2007 17:38:07 -0000	1.23
+++ .cvsignore	12 Sep 2007 08:53:54 -0000	1.24
@@ -1 +1 @@
-bluez-utils-3.17.tar.gz
+bluez-utils-3.18.tar.gz


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- bluez-utils.spec	30 Aug 2007 17:38:07 -0000	1.75
+++ bluez-utils.spec	12 Sep 2007 08:53:54 -0000	1.76
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.17
+Version: 3.18
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -153,6 +153,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> 3.18-1
+- Update to bluez-utils 3.18
+
 * Thu Aug 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.17-1
 - Update to bluez-utils 3.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Aug 2007 17:38:07 -0000	1.23
+++ sources	12 Sep 2007 08:53:54 -0000	1.24
@@ -1 +1 @@
-8c7c45c672280db11c4e2a2a445be47e  bluez-utils-3.17.tar.gz
+2b6b4d519b8f75ef3990122934e660ba  bluez-utils-3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 09:02:16 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 05:02:16 -0400
Subject: rpms/bluez-utils/devel bluez-utils-3.11-cups-discovery.patch, 1.1, 
	NONE bluez-utils-3.12-pand-man-page.patch, 1.1, NONE
Message-ID: <200709120902.l8C92G8v005287@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5277

Removed Files:
	bluez-utils-3.11-cups-discovery.patch 
	bluez-utils-3.12-pand-man-page.patch 
Log Message:
remove old patches


--- bluez-utils-3.11-cups-discovery.patch DELETED ---


--- bluez-utils-3.12-pand-man-page.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 09:11:36 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 05:11:36 -0400
Subject: rpms/ktechlab/devel ktechlab-bugfix.diff, NONE, 1.1 ktechlab.spec, 
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <200709120911.l8C9BaAu005703@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5664/devel

Modified Files:
	ktechlab.spec sources 
Added Files:
	ktechlab-bugfix.diff 
Log Message:


ktechlab-bugfix.diff:

--- NEW FILE ktechlab-bugfix.diff ---
Index: src/picitem.h
===================================================================
--- src/picitem.h	(Revision 18)
+++ src/picitem.h	(Arbeitskopie)
@@ -76,6 +76,8 @@
 	
 		static QString typeString() { return "microitem"; }
 		virtual void updateZ( int baseZ );
+
+		bool mousePressEvent( const EventInfo &info );
 	
 	protected slots:
 		void slotMicroSettingsDlgAccepted();
Index: src/picitem.cpp
===================================================================
--- src/picitem.cpp	(Revision 18)
+++ src/picitem.cpp	(Arbeitskopie)
@@ -15,6 +15,7 @@
 #include "microsettingsdlg.h"
 #include "micropackage.h"
 #include "picitem.h"
+#include "eventinfo.h"
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -386,6 +387,26 @@
 	
 	p_icnDocument->requestStateSave();
 }
+
+bool PicItem::mousePressEvent( const EventInfo &info )
+{
+	QMouseEvent *e = info.mouseReleaseEvent( 0, 0 );
+
+	const PinItemList::iterator end = m_pinItemList.end();
+	for ( PinItemList::iterator it = m_pinItemList.begin(); it != end; ++it )
+		if ( (*it)->boundingRect().contains(info.pos) ) 
+		{
+			if (e->isAccepted())
+			{
+				(*it)->switchState();
+				delete e;
+				return true;
+			}
+		}
+	delete e;
+
+	return CNItem::mousePressEvent( info );
+}
 //END class PicItem
 
 #include "picitem.moc"


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktechlab.spec	18 Aug 2007 20:34:42 -0000	1.13
+++ ktechlab.spec	12 Sep 2007 09:11:02 -0000	1.14
@@ -1,7 +1,8 @@
 Name:             ktechlab
 Version:          0.3.69
-Release:          4.20070626svn%{?dist}
-# revision checkout 18
+Release:          5%{?dist}
+# revision checkout 18 with chitlesh's enhancements that upstream
+# haven't added since 2 months
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPLv2
@@ -11,6 +12,7 @@
 Source:           http://downloads.sourceforge.net/ktechlab/%{name}-%{version}.tar.bz2
 
 Patch0:           ktechlab-0.3.6-multilib.patch
+Patch1:           ktechlab-bugfix.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +44,7 @@
 %{__rm} -rf autom4te.cache
 
 %patch0 -p0 -b .multilib
+%patch1 -p0 -b .bugfix
 
 %build
 %configure --disable-rpath
@@ -52,12 +55,13 @@
 %{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora            \
-    --add-category Engineering                  \
+    --remove-category Education                 \
     --delete-original                           \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applnk/Development/%{name}.desktop
 
-#setting default path for sdcc
+
+#fedora-specific : setting default path for sdcc
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/profile.d
 cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh << EOF
 # setting default path for sdcc - fedora
@@ -68,7 +72,10 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
 
-# No translation
+#fixing missing icon
+%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/
+
+
 %find_lang %{name}
 
 %clean
@@ -76,6 +83,7 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+source %{_sysconfdir}/profile.d/%{name}.sh
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
 
@@ -100,7 +108,12 @@
 
 
 %Changelog
-* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.6-6
+* Sat Sep 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-5
+- updated desktop file
+- fixed missing icon of bar graph display
+- disable rough oscilloscope
+
+* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-4.20070626svn
 - fixed conflict with alliance and changed license
 
 * Mon Aug 13 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-3.20070626svn


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2007 12:14:30 -0000	1.4
+++ sources	12 Sep 2007 09:11:02 -0000	1.5
@@ -1 +1 @@
-92bc145289d18bd89118754d66e7a6a2  ktechlab-0.3.69.tar.bz2
+9404e62c621df5d34b2bc455a8d0ae42  ktechlab-0.3.69.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 09:15:50 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 05:15:50 -0400
Subject: rpms/transmission/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 transmission.spec, 1.7, 1.8
Message-ID: <200709120915.l8C9FoaN005908@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5878

Modified Files:
	.cvsignore sources transmission.spec 
Log Message:
Update to upstream 0.82, many bug fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Aug 2007 18:01:15 -0000	1.6
+++ .cvsignore	12 Sep 2007 09:15:18 -0000	1.7
@@ -1 +1 @@
-Transmission-0.81.tar.gz
+transmission-0.82.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Aug 2007 18:01:15 -0000	1.6
+++ sources	12 Sep 2007 09:15:18 -0000	1.7
@@ -1 +1 @@
-30ba36c3c88b34e3a9bbfde726c6ebe7  Transmission-0.81.tar.gz
+ddc7842b4c8f7882d90dcf874019ccdc  transmission-0.82.tar.gz


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- transmission.spec	25 Aug 2007 18:34:25 -0000	1.7
+++ transmission.spec	12 Sep 2007 09:15:18 -0000	1.8
@@ -1,13 +1,13 @@
 
 Name:           transmission
-Version:        0.81
+Version:        0.82
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
 License:        MIT
 URL:            http://transmission.m0k.org/
-Source0:        http://download.m0k.org/transmission/files/Transmission-%{version}.tar.gz
+Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.gz
 Patch0:         transmission-0.71-manpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 0.82-1
+- Update to upstream 0.82, many bug fixes
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.81-1
 - Update to upstream 0.81
 - Add work-around for busted tarball without a sub-directory



From fedora-extras-commits at redhat.com  Wed Sep 12 09:43:07 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 12 Sep 2007 05:43:07 -0400
Subject: rpms/system-config-firewall/devel sources, 1.4,
	1.5 system-config-firewall.spec, 1.6,
	1.7 system-config-firewall-1.0.5-lokkit.patch, 1.1,
	NONE system-config-firewall-1.0.5-modules.patch, 1.1,
	NONE system-config-firewall-1.0.5-sysconfig.patch, 1.1, NONE
Message-ID: <200709120943.l8C9h7Ns006555@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523

Modified Files:
	sources system-config-firewall.spec 
Removed Files:
	system-config-firewall-1.0.5-lokkit.patch 
	system-config-firewall-1.0.5-modules.patch 
	system-config-firewall-1.0.5-sysconfig.patch 
Log Message:
- dropped --stop option from fw_gui::genArgs
- new translations
- sysctl support for masquerading (net.ipv4.ip_forward will be set)
- glade file: fixed spacings, dropped not needed containers




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2007 15:43:19 -0000	1.4
+++ sources	12 Sep 2007 09:42:35 -0000	1.5
@@ -1 +1 @@
-f8591ac55121995deeeda29985ae0026  system-config-firewall-1.0.5.tar.bz2
+cc6ea00488c648fc3478d260670f0d28  system-config-firewall-1.0.6.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-config-firewall.spec	5 Sep 2007 16:42:34 -0000	1.6
+++ system-config-firewall.spec	12 Sep 2007 09:42:35 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -9,9 +9,6 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
-Patch0: system-config-firewall-1.0.5-lokkit.patch
-Patch1: system-config-firewall-1.0.5-modules.patch
-Patch2: system-config-firewall-1.0.5-sysconfig.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -48,9 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .lokkit
-%patch1 -p1 -b .modules
-%patch2 -p1 -b .sysconfig
 
 %install
 rm -rf %{buildroot}
@@ -119,11 +113,18 @@
 %{_datadir}/system-config-firewall/fw_selinux.*
 %{_datadir}/system-config-firewall/fw_services.*
 %{_datadir}/system-config-firewall/fw_sysconfig.*
+%{_datadir}/system-config-firewall/fw_sysctl.*
 %{_datadir}/system-config-firewall/fw_tui.*
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Wed Sep 12 2007 Thomas Woerner <twoerner at redhat.com> 1.0.6-1
+- dropped --stop option from fw_gui::genArgs
+- new translations
+- sysctl support for masquerading (net.ipv4.ip_forward will be set)
+- glade file: fixed spacings, dropped not needed containers
+
 * Wed Sep  5 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-4
 - fixed problem if /etc/sysconfig/system-config-securtylevel and 
   /etc/sysconfig/system-config-firewall are not readable


--- system-config-firewall-1.0.5-lokkit.patch DELETED ---


--- system-config-firewall-1.0.5-modules.patch DELETED ---


--- system-config-firewall-1.0.5-sysconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 09:49:09 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 12 Sep 2007 05:49:09 -0400
Subject: rpms/python-iniparse/devel python-iniparse.spec,1.5,1.6
Message-ID: <200709120949.l8C9n9R4006759@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701

Modified Files:
	python-iniparse.spec 
Log Message:
Make the same spec work on F8 and earlier


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-iniparse.spec	10 Sep 2007 10:38:07 -0000	1.5
+++ python-iniparse.spec	12 Sep 2007 09:48:37 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
@@ -11,7 +11,11 @@
 Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -49,6 +53,10 @@
 
 %changelog
 
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
 * Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
 - Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2



From fedora-extras-commits at redhat.com  Wed Sep 12 09:51:07 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 12 Sep 2007 05:51:07 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec,1.3,1.4
Message-ID: <200709120951.l8C9p70g006900@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6786

Modified Files:
	python-iniparse.spec 
Log Message:
Make the same spec work on F8 and earlier


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-iniparse.spec	10 Sep 2007 10:48:29 -0000	1.3
+++ python-iniparse.spec	12 Sep 2007 09:50:34 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
@@ -11,7 +11,11 @@
 Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -49,8 +53,14 @@
 
 %changelog
 
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
 * Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
 - Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3



From fedora-extras-commits at redhat.com  Wed Sep 12 09:52:02 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 05:52:02 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.18, 1.223.2.19
Message-ID: <200709120952.l8C9q2oY006989@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6911/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-colorscheme-hack.diff 
Log Message:
fix strange coloring due to incomplete changes to KColorScheme: KColorScheme was in a state of transition when Beta 2 was released, so disabled text isn't handled properly. This hack restores the August 27 behavior (while keeping the August 29 API).

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.18
retrieving revision 1.223.2.19
diff -u -r1.223.2.18 -r1.223.2.19
--- kdelibs.spec	10 Sep 2007 18:21:37 -0000	1.223.2.18
+++ kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -43,6 +43,10 @@
 Patch2: kdelibs-3.93.0-kde149704.diff
 # fix kde#149705
 Patch3: kdelibs-3.93.0-kde149705.diff
+# KColorScheme was in a state of transition when Beta 2 was released, so
+# disabled text isn't handled properly. This hack restores the August 27
+# behavior (while keeping the August 29 API).
+Patch4: kdelibs-3.93.0-colorscheme-hack.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -112,6 +116,7 @@
 %patch2 -p0
 popd
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -217,6 +222,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
+- fix strange coloring due to incomplete changes to KColorScheme
+
 * Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - use upstream fix (by David Faure) for kde#149704
 



From fedora-extras-commits at redhat.com  Wed Sep 12 10:17:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 06:17:01 -0400
Subject: rpms/groff/devel groff.spec,1.52,1.53
Message-ID: <200709121017.l8CAH1JZ013424@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13390

Modified Files:
	groff.spec 
Log Message:
Add smp flag into the spec file.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- groff.spec	11 Sep 2007 13:18:53 -0000	1.52
+++ groff.spec	12 Sep 2007 10:16:28 -0000	1.53
@@ -114,7 +114,7 @@
 (cd doc && makeinfo groff.texinfo)
 %if %{with_x}
 cd src/xditview
-xmkmf && make
+xmkmf && make %{?_smp_mflags}
 %endif
 
 %install



From fedora-extras-commits at redhat.com  Wed Sep 12 10:31:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 06:31:41 -0400
Subject: rpms/iproute/devel iproute.spec,1.70,1.71
Message-ID: <200709121031.l8CAVfeN013879@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13844

Modified Files:
	iproute.spec 
Log Message:
Add smp flag into spec file. Change some macros.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- iproute.spec	11 Sep 2007 15:19:12 -0000	1.70
+++ iproute.spec	12 Sep 2007 10:31:09 -0000	1.71
@@ -15,7 +15,7 @@
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires(pre): tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
+BuildRequires: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 BuildRequires: flex
 
 %description
@@ -33,7 +33,7 @@
 %build
 export LIBDIR=%{_libdir}
 
-make
+make %{?_smp_mflags}
 make -C doc
 
 %install
@@ -42,7 +42,7 @@
 mkdir -p $RPM_BUILD_ROOT/sbin \
 	$RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT%{_mandir}/man8 \
-	$RPM_BUILD_ROOT/etc/iproute2 \
+	$RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \
 	$RPM_BUILD_ROOT%{_libdir}/tc
 
 install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
@@ -53,13 +53,13 @@
 rm -r $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
 iconv -f latin1 -t utf8 < man/man8/ss.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
 install -m 755 examples/cbq.init-%{cbq_version} $RPM_BUILD_ROOT/sbin/cbq
-install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig/cbq
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq
 
-cp -f etc/iproute2/* $RPM_BUILD_ROOT/etc/iproute2
+cp -f etc/iproute2/* $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 
 #create example avpkt file
-cat <<EOF > $RPM_BUILD_ROOT/etc/sysconfig/cbq/cbq-0000.example
+cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/cbq-0000.example
 DEVICE=eth0,10Mbit,1Mbit
 RATE=128Kbit
 WEIGHT=10Kbit
@@ -67,7 +67,7 @@
 RULE=192.168.1.0/24
 EOF
 
-cat <<EOF > $RPM_BUILD_ROOT/etc/sysconfig/cbq/avpkt
+cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/avpkt
 AVPKT=3000
 EOF
 
@@ -76,18 +76,18 @@
 
 %files
 %defattr(-,root,root,-)
-%dir /etc/iproute2
+%dir %{_sysconfdir}/iproute2
 %doc README.decnet README.iproute2+tc RELNOTES examples/README.cbq
 %doc doc/*.ps examples
 /sbin/*
 %{_mandir}/man8/*
-%attr(644,root,root) %config(noreplace) /etc/iproute2/*
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 %{_sbindir}/*
 %dir %{_libdir}/tc
 %{_libdir}/tc/*
 /sbin/cbq
-%dir /etc/sysconfig/cbq
-%config(noreplace) /etc/sysconfig/cbq/*
+%dir %{_sysconfdir}/sysconfig/cbq
+%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
 * Fri Aug 30 2007 Marcela Maslanova <mmaslano at redhat.com> - 2.6.22-3



From fedora-extras-commits at redhat.com  Wed Sep 12 10:32:45 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 06:32:45 -0400
Subject: rpms/evolution-webcal/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200709121032.l8CAWjG7013918@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-webcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	.cvsignore sources 
Log Message:
Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Aug 2007 21:31:20 -0000	1.18
+++ .cvsignore	12 Sep 2007 10:32:13 -0000	1.19
@@ -0,0 +1 @@
+evolution-webcal-2.11.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Aug 2007 21:31:20 -0000	1.18
+++ sources	12 Sep 2007 10:32:13 -0000	1.19
@@ -0,0 +1 @@
+c5b38d451808e48bfb6b072893441ac5  evolution-webcal-2.11.91.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 10:46:31 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 06:46:31 -0400
Subject: rpms/transmission/devel transmission-0.81-downloaddir.patch, NONE, 
	1.1 transmission.spec, 1.8, 1.9
Message-ID: <200709121046.l8CAkVk9014189@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14163

Modified Files:
	transmission.spec 
Added Files:
	transmission-0.81-downloaddir.patch 
Log Message:
Added patch to support default user download directory (Bastien Nocera)

transmission-0.81-downloaddir.patch:

--- NEW FILE transmission-0.81-downloaddir.patch ---
Index: gtk/util.c
===================================================================
--- gtk/util.c	(revision 2629)
+++ gtk/util.c	(working copy)
@@ -319,7 +319,12 @@
 {
     static char * wd = NULL;
     const char * dir = tr_prefs_get( PREF_ID_DIR );
+
     if (NULL == dir) {
+#if GLIB_CHECK_VERSION(2, 13, 7)
+      dir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
+      return dir;
+#endif
       if (NULL == wd)
         wd = g_get_current_dir();
       dir = wd;


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- transmission.spec	12 Sep 2007 09:15:18 -0000	1.8
+++ transmission.spec	12 Sep 2007 10:45:52 -0000	1.9
@@ -9,6 +9,7 @@
 URL:            http://transmission.m0k.org/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.gz
 Patch0:         transmission-0.71-manpath.patch
+Patch1:         transmission-0.81-downloaddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,6 +28,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .manpath
+%patch1 -p0 -b .dwnldir
 
 
 %build
@@ -70,6 +72,7 @@
 %changelog
 * Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 0.82-1
 - Update to upstream 0.82, many bug fixes
+- Added patch to support default user download directory (Bastien Nocera)
 
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.81-1
 - Update to upstream 0.81



From fedora-extras-commits at redhat.com  Wed Sep 12 10:58:19 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 06:58:19 -0400
Subject: rpms/python-vorbis/F-7 python-vorbis-1.5a-python2.5.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 python-vorbis.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709121058.l8CAwJb8014634@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-vorbis/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573/F-7

Modified Files:
	.cvsignore python-vorbis.spec sources 
Added Files:
	python-vorbis-1.5a-python2.5.patch 
Log Message:
Update to 1.5a and fix python 2.5 crash (#285341).


python-vorbis-1.5a-python2.5.patch:

--- NEW FILE python-vorbis-1.5a-python2.5.patch ---
diff -Nur pyvorbis-1.5a/src/pyvorbiscodec.c pyvorbis-1.5apatched/src/pyvorbiscodec.c
--- pyvorbis-1.5a/src/pyvorbiscodec.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbiscodec.c	2007-09-11 00:17:48.000000000 +0200
@@ -118,7 +118,7 @@
 {
   vorbis_dsp_clear(PY_DSP(self));
   Py_XDECREF(((py_dsp *)self)->parent);
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject*
diff -Nur pyvorbis-1.5a/src/pyvorbisfile.c pyvorbis-1.5apatched/src/pyvorbisfile.c
--- pyvorbis-1.5a/src/pyvorbisfile.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisfile.c	2007-09-11 00:21:22.000000000 +0200
@@ -171,7 +171,7 @@
 
   ret = py_ov_open(newobj, args);
   if (ret == NULL) {
-    PyMem_DEL(newobj);
+    PyObject_Del(newobj);
     return NULL;
   }
 
@@ -196,7 +196,7 @@
 
   free(py_self->ovf);
 
-  PyObject_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *
diff -Nur pyvorbis-1.5a/src/pyvorbisinfo.c pyvorbis-1.5apatched/src/pyvorbisinfo.c
--- pyvorbis-1.5a/src/pyvorbisinfo.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisinfo.c	2007-09-11 00:16:42.000000000 +0200
@@ -134,7 +134,7 @@
 static void
 py_ov_info_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 #define CMP_RET(x) \
@@ -418,7 +418,7 @@
     free(ovc_self->vc);
   }
 
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 
@@ -999,6 +999,7 @@
 #if PY_UNICODE
       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
       if (!item) {
+        PyErr_Clear();
         /* To deal with non-UTF8 comments (against the standard) */
         item = PyString_FromStringAndSize(val, vallen); 
       } 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 18:30:31 -0000	1.3
+++ .cvsignore	12 Sep 2007 10:57:42 -0000	1.4
@@ -1 +1 @@
-pyvorbis-1.4.tar.gz
+pyvorbis-1.5a.tar.gz


Index: python-vorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/python-vorbis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vorbis.spec	2 Mar 2007 18:30:31 -0000	1.4
+++ python-vorbis.spec	12 Sep 2007 10:57:42 -0000	1.5
@@ -2,12 +2,13 @@
 
 Summary: Python wrapper for the Ogg Vorbis audio libraries
 Name: python-vorbis
-Version: 1.4
-Release: 1%{?dist}
-License: LGPL
+Version: 1.5
+Release: 0.1.a
+License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
-Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}.tar.gz
+Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}a.tar.gz
+Patch0: python-vorbis-1.5a-python2.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-ogg
 BuildRequires: python-devel, python-ogg-devel, libvorbis-devel
@@ -19,7 +20,8 @@
 
 
 %prep
-%setup -q -n pyvorbis-%{version}
+%setup -q -n pyvorbis-%{version}a
+%patch0 -p1 -b .python2.5
 
 
 %build
@@ -43,6 +45,17 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.5-0.1.a
+- Update to 1.5a pre-release.
+- Include patch to fix crash with python 2.5 (#285341).
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4-3
+- Rebuild for new BuildID feature.
+
+* Fri Aug  3 2007 Matthias Saou <http://freshrpms.net/> 1.4-2
+- Update License field.
+- Remove dist tag, since the package will seldom change.
+
 * Fri Mar  2 2007 Matthias Saou <http://freshrpms.net/> 1.4-1
 - Update to 1.4.
 - Use new URL and source location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 18:30:31 -0000	1.3
+++ sources	12 Sep 2007 10:57:42 -0000	1.4
@@ -1 +1 @@
-b4921e792c0a74f75b9d3057df10ee7c  pyvorbis-1.4.tar.gz
+7c7bce3ca3fc4f075ce9220c8c0c2200  pyvorbis-1.5a.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 10:58:22 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 06:58:22 -0400
Subject: rpms/python-vorbis/devel python-vorbis-1.5a-python2.5.patch, NONE, 
	1.1 .cvsignore, 1.3, 1.4 python-vorbis.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200709121058.l8CAwM12014641@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-vorbis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573/devel

Modified Files:
	.cvsignore python-vorbis.spec sources 
Added Files:
	python-vorbis-1.5a-python2.5.patch 
Log Message:
Update to 1.5a and fix python 2.5 crash (#285341).


python-vorbis-1.5a-python2.5.patch:

--- NEW FILE python-vorbis-1.5a-python2.5.patch ---
diff -Nur pyvorbis-1.5a/src/pyvorbiscodec.c pyvorbis-1.5apatched/src/pyvorbiscodec.c
--- pyvorbis-1.5a/src/pyvorbiscodec.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbiscodec.c	2007-09-11 00:17:48.000000000 +0200
@@ -118,7 +118,7 @@
 {
   vorbis_dsp_clear(PY_DSP(self));
   Py_XDECREF(((py_dsp *)self)->parent);
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject*
diff -Nur pyvorbis-1.5a/src/pyvorbisfile.c pyvorbis-1.5apatched/src/pyvorbisfile.c
--- pyvorbis-1.5a/src/pyvorbisfile.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisfile.c	2007-09-11 00:21:22.000000000 +0200
@@ -171,7 +171,7 @@
 
   ret = py_ov_open(newobj, args);
   if (ret == NULL) {
-    PyMem_DEL(newobj);
+    PyObject_Del(newobj);
     return NULL;
   }
 
@@ -196,7 +196,7 @@
 
   free(py_self->ovf);
 
-  PyObject_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *
diff -Nur pyvorbis-1.5a/src/pyvorbisinfo.c pyvorbis-1.5apatched/src/pyvorbisinfo.c
--- pyvorbis-1.5a/src/pyvorbisinfo.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisinfo.c	2007-09-11 00:16:42.000000000 +0200
@@ -134,7 +134,7 @@
 static void
 py_ov_info_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 #define CMP_RET(x) \
@@ -418,7 +418,7 @@
     free(ovc_self->vc);
   }
 
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 
@@ -999,6 +999,7 @@
 #if PY_UNICODE
       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
       if (!item) {
+        PyErr_Clear();
         /* To deal with non-UTF8 comments (against the standard) */
         item = PyString_FromStringAndSize(val, vallen); 
       } 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 18:30:31 -0000	1.3
+++ .cvsignore	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-pyvorbis-1.4.tar.gz
+pyvorbis-1.5a.tar.gz


Index: python-vorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/python-vorbis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-vorbis.spec	23 Aug 2007 07:47:44 -0000	1.6
+++ python-vorbis.spec	12 Sep 2007 10:57:49 -0000	1.7
@@ -2,12 +2,13 @@
 
 Summary: Python wrapper for the Ogg Vorbis audio libraries
 Name: python-vorbis
-Version: 1.4
-Release: 3
+Version: 1.5
+Release: 0.2.a
 License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
-Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}.tar.gz
+Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}a.tar.gz
+Patch0: python-vorbis-1.5a-python2.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-ogg
 BuildRequires: python-devel, python-ogg-devel, libvorbis-devel
@@ -19,7 +20,8 @@
 
 
 %prep
-%setup -q -n pyvorbis-%{version}
+%setup -q -n pyvorbis-%{version}a
+%patch0 -p1 -b .python2.5
 
 
 %build
@@ -43,6 +45,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.5-0.2.a
+- Update to 1.5a pre-release.
+- Include patch to fix crash with python 2.5 (#285341).
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4-3
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 18:30:31 -0000	1.3
+++ sources	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-b4921e792c0a74f75b9d3057df10ee7c  pyvorbis-1.4.tar.gz
+7c7bce3ca3fc4f075ce9220c8c0c2200  pyvorbis-1.5a.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 11:01:56 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 07:01:56 -0400
Subject: rpms/gkrellm-freq/EL-5 gkrellm-freq.spec,1.5,1.6
Message-ID: <200709121101.l8CB1um3020785@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691/EL-5

Modified Files:
	gkrellm-freq.spec 
Log Message:
Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.



Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/EL-5/gkrellm-freq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-freq.spec	28 Aug 2006 10:03:00 -0000	1.5
+++ gkrellm-freq.spec	12 Sep 2007 11:01:23 -0000	1.6
@@ -3,8 +3,8 @@
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
 Version: 1.0
-Release: 3%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPL+
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
 Source: http://www.peakunix.net/downloads/gkrellm-gkfreq-%{version}.tar.gz
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -n gkrellm-gkfreq-%{version}
+%setup -q -n gkrellm-gkfreq-%{version}
 %patch -p1 -b .noasm
 
 
@@ -40,12 +40,24 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc CHANGES COPYING README
 %{gkplugindir}/gkfreq.so
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.0-7
+- Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-6
+- Rebuild for new BuildID feature.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 1.0-5
+- Update License field... GPLv2 only, will be a problem with GPLv3 gkrellm.
+
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-4
+- Remove dist, as it might be a while before the next rebuild.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.0-3
 - FC6 rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep 12 11:02:01 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 07:02:01 -0400
Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec,1.8,1.9
Message-ID: <200709121102.l8CB21PP020791@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691/devel

Modified Files:
	gkrellm-freq.spec 
Log Message:
Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.



Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gkrellm-freq.spec	22 Aug 2007 16:16:52 -0000	1.8
+++ gkrellm-freq.spec	12 Sep 2007 11:01:27 -0000	1.9
@@ -3,8 +3,8 @@
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
 Version: 1.0
-Release: 6
-License: GPLv2
+Release: 7%{?dist}
+License: GPL+
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
 Source: http://www.peakunix.net/downloads/gkrellm-gkfreq-%{version}.tar.gz
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.0-7
+- Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-6
 - Rebuild for new BuildID feature.
 



From fedora-extras-commits at redhat.com  Wed Sep 12 11:07:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 07:07:39 -0400
Subject: rpms/iproute/devel iproute2-2.4.7-initvar.patch, 1.1,
	NONE iproute2-2.6.9-owl-nstat-bound.patch, 1.1,
	NONE iproute2-2.6.9-ss.patch, 1.1,
	NONE iproute2-ss050901-host_len.patch, 1.1,
	NONE iproute2-ss050901-opt_flags.patch, 1.1, NONE
Message-ID: <200709121107.l8CB7dLP020961@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20954

Removed Files:
	iproute2-2.4.7-initvar.patch 
	iproute2-2.6.9-owl-nstat-bound.patch iproute2-2.6.9-ss.patch 
	iproute2-ss050901-host_len.patch 
	iproute2-ss050901-opt_flags.patch 
Log Message:
Remove unused patches.



--- iproute2-2.4.7-initvar.patch DELETED ---


--- iproute2-2.6.9-owl-nstat-bound.patch DELETED ---


--- iproute2-2.6.9-ss.patch DELETED ---


--- iproute2-ss050901-host_len.patch DELETED ---


--- iproute2-ss050901-opt_flags.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 11:09:33 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Wed, 12 Sep 2007 07:09:33 -0400
Subject: rpms/netatalk/devel netatalk-2.0.3-build_open.patch, NONE,
	1.1 netatalk.spec, 1.36, 1.37
Message-ID: <200709121109.l8CB9XLl021030@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21007

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-build_open.patch 
Log Message:
Build fix

netatalk-2.0.3-build_open.patch:

--- NEW FILE netatalk-2.0.3-build_open.patch ---
--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old	2004-03-22 05:38:51.000000000 +0100
+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c	2007-09-11 17:59:59.000000000 +0200
@@ -131,9 +131,9 @@
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags, mode);
+    return (p->open)(p, NULL, f, d, t, flags, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -275,7 +275,7 @@
     }
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
 	LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc));
 	/* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */
         if (rc == DB_RUNRECOVERY) {
@@ -288,10 +288,10 @@
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- netatalk.spec	11 Sep 2007 15:28:28 -0000	1.36
+++ netatalk.spec	12 Sep 2007 11:09:00 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -16,6 +16,7 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
+Patch5:  netatalk-2.0.3-build_open.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -48,6 +49,7 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
+%patch5  -p1 -b .build_open
 
 ln -s ./NEWS ChangeLog
 
@@ -186,6 +188,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-14
+- patch to build on FC, bad open call 
+
 * Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 12 12:01:47 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Sep 2007 08:01:47 -0400
Subject: rpms/strigi/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 strigi.spec, 
	1.3, 1.4
Message-ID: <200709121201.l8CC1l4K028497@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/strigi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28446

Modified Files:
	.cvsignore sources strigi.spec 
Log Message:
* Wed Sep 12 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
- Update to 0.5.5 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 May 2007 16:21:53 -0000	1.2
+++ .cvsignore	12 Sep 2007 12:01:13 -0000	1.3
@@ -1 +1 @@
-strigi-0.5.1.tar.bz2
+strigi-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 May 2007 16:21:53 -0000	1.2
+++ sources	12 Sep 2007 12:01:13 -0000	1.3
@@ -1 +1 @@
-b976b4f3cf451fc53cd773c338d78994  strigi-0.5.1.tar.bz2
+bf61ec453f5e0063ea70ace783df3a14  strigi-0.5.5.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/strigi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- strigi.spec	17 May 2007 01:54:05 -0000	1.3
+++ strigi.spec	12 Sep 2007 12:01:13 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		strigi
-Version:	0.5.1
-Release:	5%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
-License:	LGPL
+License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
 Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
@@ -93,6 +93,7 @@
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
 %{_datadir}/applications/*strigiclient.desktop
+%{_datadir}/dbus-1/services/*.service
 %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 %{_datadir}/strigi/
 
@@ -108,6 +109,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Wed Sep 12 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
+- Update to 0.5.5 release
+
 * Wed May 16 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.1-5
 - Split out a strigi-libs subpackage as suggested in BZ#223586
 _ Include a strigidaemon autostart desktop file



From fedora-extras-commits at redhat.com  Wed Sep 12 12:11:09 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 08:11:09 -0400
Subject: rpms/libgdamm/devel .cvsignore, 1.3, 1.4 libgdamm.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709121211.l8CCB9fo028853@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28815

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to 2.9.8, a bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jul 2007 13:27:06 -0000	1.3
+++ .cvsignore	12 Sep 2007 12:10:36 -0000	1.4
@@ -1,2 +1 @@
-libgdamm-1.3.7.tar.bz2
-libgdamm-2.9.7.tar.bz2
+libgdamm-2.9.8.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/libgdamm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgdamm.spec	23 Aug 2007 22:18:18 -0000	1.5
+++ libgdamm.spec	12 Sep 2007 12:10:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libgdamm
-Version:	2.9.7
-Release:	2%{?dist}
+Version:	2.9.8
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 2.9.8-1
+- Update to 2.9.8, a bugfix release
+
 * Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.7-2
 - rebuild for license tag, ppc32
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2007 13:27:06 -0000	1.3
+++ sources	12 Sep 2007 12:10:36 -0000	1.4
@@ -1 +1 @@
-dd1ae0a7c241b510a46a66f9978ca123  libgdamm-2.9.7.tar.bz2
+4169ab88368ce5342efcdbdbd3345674  libgdamm-2.9.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 12:23:25 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 08:23:25 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.7,1.8
Message-ID: <200709121223.l8CCNPY7029802@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29705

Modified Files:
	liberation-fonts.spec 
Log Message:
- add fontdir macro
- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)                                                                            
- add catalogue symlink




Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liberation-fonts.spec	12 Sep 2007 06:43:17 -0000	1.7
+++ liberation-fonts.spec	12 Sep 2007 12:22:53 -0000	1.8
@@ -1,7 +1,10 @@
+%define fontdir %{_datadir}/fonts/liberation
+%define catalogue %{_sysconfdir}/X11/fontpath.d
+
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
 Version: 0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
@@ -9,8 +12,7 @@
 Source1: 59-liberation-fonts.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-# for /etc/fonts/conf.d 
-Requires: fontconfig
+Buildrequires: xorg-x11-font-utils
 
 %description
 The Liberation Fonts are intended to be replacements for the three
@@ -28,12 +30,19 @@
 %install
 rm -rf %{buildroot}
 # fonts
-install -m 0755 -d %{buildroot}%{_datadir}/fonts/liberation
-install -m 0644 *.ttf %{buildroot}%{_datadir}/fonts/liberation
+install -m 0755 -d %{buildroot}%{fontdir}
+install -m 0644 *.ttf %{buildroot}%{fontdir}
 # configuration
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d
 
+install -d $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+
+# generate fonts.dir and fonts.scale
+mkfontdir %{buildroot}%{fontdir}
+mkfontscale %{buildroot}%{fontdir}
+
 %post
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/fonts
@@ -49,10 +58,19 @@
 %files
 %defattr(-,root,root)
 %doc License.txt COPYING
-%{_datadir}/fonts/liberation
+%dir %{fontdir}
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
+%{fontdir}/*.ttf
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%{catalogue}/%{name}
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-3.fc8
+- add fontdir macro
+- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)
+- add catalogue symlink
+
 * Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-2.fc8
 - update license field to GPLv2
 



From fedora-extras-commits at redhat.com  Wed Sep 12 12:24:07 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 08:24:07 -0400
Subject: rpms/glom/devel .cvsignore, 1.12, 1.13 glom.spec, 1.16, 1.17 sources,
	1.12, 1.13
Message-ID: <200709121224.l8CCO7ZM029840@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29816

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.6.0, updated BRs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jul 2007 10:23:00 -0000	1.12
+++ .cvsignore	12 Sep 2007 12:23:35 -0000	1.13
@@ -1 +1 @@
-glom-1.5.2.tar.bz2
+glom-1.6.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glom.spec	23 Aug 2007 15:20:17 -0000	1.16
+++ glom.spec	12 Sep 2007 12:23:35 -0000	1.17
@@ -1,9 +1,9 @@
-%define major_version  1.5
-%define minor_version  2
+%define major_version  1.6
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -14,8 +14,8 @@
 
 BuildRequires:  bakery-devel >= 2.4
 BuildRequires:  desktop-file-utils gettext-devel intltool
-BuildRequires:  libgdamm-devel >= 2.9.7
-BuildRequires:  libxml++-devel >= 2.18.0
+BuildRequires:  libgdamm-devel >= 2.9.8
+BuildRequires:  libxml++-devel >= 2.18.1
 BuildRequires:  python-devel
 BuildRequires:  gnome-python2-gda-devel
 BuildRequires:  libgnome-devel >= 2.6.0
@@ -25,7 +25,7 @@
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  libgtksourceviewmm-devel
-BuildRequires:  libgda-devel >= 3.0
+BuildRequires:  libgda-devel >= 3.0.1
 BuildRequires:  postgresql-server
 BuildRequires:	libgda-postgres-devel
 BuildRequires:  avahi-glib-devel
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 1.6.0-1
+- Update to 1.6.0, updated BRs
+
 * Thu Aug 23 2007 Denis Leroy <denis at poolshark.org> - 1.5.2-2
 - License tag update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2007 10:23:00 -0000	1.12
+++ sources	12 Sep 2007 12:23:35 -0000	1.13
@@ -1 +1 @@
-4ae984143deb4f19ef9740d128edf8bb  glom-1.5.2.tar.bz2
+f279ff74c8014b23191f74bc4aa576ff  glom-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 12:50:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 08:50:27 -0400
Subject: rpms/gettext/devel gettext-xglade-include-expat-285701.patch, NONE, 
	1.1 gettext.spec, 1.76, 1.77
Message-ID: <200709121250.l8CCoRMs031103@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
- buildrequire expat-devel
- add gettext-xglade-include-expat-285701.patch to include expat.h
  to get xgettext to dl the right libexpat (Nils Philippsen, #285701)


gettext-xglade-include-expat-285701.patch:

--- NEW FILE gettext-xglade-include-expat-285701.patch ---
diff -up gettext-0.16.1/gettext-tools/src/x-glade.c~ gettext-0.16.1/gettext-tools/src/x-glade.c
--- gettext-0.16.1/gettext-tools/src/x-glade.c~	2006-11-28 03:02:08.000000000 +1000
+++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-12 22:40:26.000000000 +1000
@@ -28,10 +28,9 @@
 #include <string.h>
 #if DYNLOAD_LIBEXPAT
 # include <dlfcn.h>
-#else
-# if HAVE_LIBEXPAT
-#  include <expat.h>
-# endif
+#endif
+#if HAVE_LIBEXPAT
+# include <expat.h>
 #endif
 
 #include "message.h"


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gettext.spec	16 Aug 2007 04:10:48 -0000	1.76
+++ gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
+# need expat for xgettext on glade
+Buildrequires: expat-devel
 %if %{buildjar}
 BuildRequires: %{_bindir}/fastjar
 # require zip and unzip for brp-java-repack-jars
@@ -26,6 +28,7 @@
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
 Patch3: gettext-php-prinf-output-237241.patch
+Patch4: gettext-xglade-include-expat-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -62,6 +65,7 @@
 %patch1 -p1 -b .1-fails~
 %patch2 -p0 -b .2-header~
 %patch3 -p1 -b .3-printf~
+%patch4 -p1 -b .4-expat~
 
 
 %build
@@ -227,6 +231,11 @@
 
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-10
+- buildrequire expat-devel
+- add gettext-xglade-include-expat-285701.patch to include expat.h
+  to get xgettext to dl the right libexpat (Nils Philippsen, #285701)
+
 * Thu Aug 16 2007 Jens Petersen <petersen at redhat.com>
 - specify license is GPL and LGPL version 2 or later
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:10:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 09:10:57 -0400
Subject: rpms/man-pages-fr/F-7 man-pages-fr.spec,1.30,1.31
Message-ID: <200709121310.l8CDAvfg005394@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5355

Modified Files:
	man-pages-fr.spec 
Log Message:
Fix conflict in 273941  	 



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/F-7/man-pages-fr.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- man-pages-fr.spec	6 Mar 2007 07:42:37 -0000	1.30
+++ man-pages-fr.spec	12 Sep 2007 13:10:23 -0000	1.31
@@ -1,8 +1,8 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.39
-Release:	8%{?dist}
-License:	Distributable
+Release:	9%{?dist}
+License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
 Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
@@ -17,9 +17,6 @@
 
 %prep
 %setup -q -D -a 1 -n man-pages-fr-2.39.0
-##%setup -q -D -a 2
-##%patch1 -p1 -b .aumix_missTH
-# pick up the supplemental pages, which overwrite a few files too
 cp -a pagesdeman/usr/share/man/fr/* .
 mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr
 rm -rf pagesdeman/
@@ -53,8 +50,6 @@
 		fi
 done
 
-##make install-install DESTDIR=$RPM_BUILD_ROOT
-
 # Remove files already included in other packages
 # alsa-utils
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/alsaconf.8
@@ -73,6 +68,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
 # latex2rtf
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# linuxchecker
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/linkchecker.1
 # man
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
@@ -104,6 +101,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Wed Sep 12 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-9
+- rhbz#273941
+
 * Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-8
 - merge review
 - rhbz#230061



From fedora-extras-commits at redhat.com  Wed Sep 12 13:14:04 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 12 Sep 2007 09:14:04 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.26.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.140, 1.141 sources, 1.145,
	1.146 system-config-printer.spec, 1.128,
	1.129 pycups-1.9.25.tar.bz2.sig, 1.1, NONE
Message-ID: <200709121314.l8CDE4Tk005542@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5509

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.26.tar.bz2.sig 
Removed Files:
	pycups-1.9.25.tar.bz2.sig 
Log Message:
* Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.26.
- Build requires epydoc.  Ship HTML documentation.



--- NEW FILE pycups-1.9.26.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore	7 Sep 2007 16:29:48 -0000	1.140
+++ .cvsignore	12 Sep 2007 13:13:31 -0000	1.141
@@ -136,3 +136,4 @@
 pycups-1.9.25.tar.bz2
 system-config-printer-0.7.74.tar.bz2
 system-config-printer-0.7.74.1.tar.bz2
+pycups-1.9.26.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	7 Sep 2007 16:29:48 -0000	1.145
+++ sources	12 Sep 2007 13:13:31 -0000	1.146
@@ -1,2 +1,2 @@
-eda648fec5d187fa13a676c60c7e6b1e  pycups-1.9.25.tar.bz2
 b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
+7819b0749172f01162c11e9a9f01dea2  pycups-1.9.26.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- system-config-printer.spec	7 Sep 2007 16:29:48 -0000	1.128
+++ system-config-printer.spec	12 Sep 2007 13:13:31 -0000	1.129
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.25
+%define pycups_version 1.9.26
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -18,6 +18,7 @@
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: xmlto
+BuildRequires: epydoc
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -56,6 +57,7 @@
 
 pushd pycups-%{pycups_version}
 make
+make doc
 popd
 
 %install
@@ -80,7 +82,7 @@
 
 %files libs -f system-config-printer.lang
 %defattr(-,root,root)
-%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples}
+%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples,html}
 %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
 %{_libdir}/python*/*/*.so
 %dir %{_datadir}/%{name}
@@ -126,6 +128,10 @@
 fi
 
 %changelog
+* Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.26.
+- Build requires epydoc.  Ship HTML documentation.
+
 * Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
 - 0.7.74.1:
   - Updated Polish translation (bug #263001).


--- pycups-1.9.25.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 13:16:30 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 12 Sep 2007 09:16:30 -0400
Subject: rpms/procps/devel procps.spec,1.66,1.67
Message-ID: <200709121316.l8CDGUcc005623@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5595

Modified Files:
	procps.spec 
Log Message:
* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-17
- fix #185994 - top "Cpu0" line never updates when using
  "Single Cpu = Off" option on single processor machine



Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/devel/procps.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- procps.spec	27 Aug 2007 07:01:29 -0000	1.66
+++ procps.spec	12 Sep 2007 13:15:56 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 16.1%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -62,6 +62,8 @@
 Patch29: procps-3.2.7-psman.patch
 #255441 - ldopen libselinux.so.1 instead of libselinux.so
 Patch30: procps-3.2.7-ps-libselinux.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch31: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -117,6 +119,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 cp %SOURCE1 .
 
@@ -154,6 +157,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-17
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Aug 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16.1
 - bump release
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:21:28 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 12 Sep 2007 09:21:28 -0400
Subject: rpms/procps/devel procps-3.2.7-top-cpu0.patch,NONE,1.1
Message-ID: <200709121321.l8CDLSNa005762@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753

Added Files:
	procps-3.2.7-top-cpu0.patch 
Log Message:
added patch

procps-3.2.7-top-cpu0.patch:

--- NEW FILE procps-3.2.7-top-cpu0.patch ---
--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
+++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
@@ -959,8 +959,15 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
 
    // now value each separate cpu's tics



From fedora-extras-commits at redhat.com  Wed Sep 12 13:27:47 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 12 Sep 2007 09:27:47 -0400
Subject: rpms/libdv/devel libdv.spec,1.21,1.22
Message-ID: <200709121327.l8CDRlt2006121@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libdv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6080

Modified Files:
	libdv.spec 
Log Message:
* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
- Update License field (Matthias Saou)
- Remove useless zero epoch (Matthias Saou)
- Add pkgconfig devel sub-package req (Matthias Saou)
- Minor spec formatting changes and clean-ups



Index: libdv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libdv.spec	19 Jan 2007 21:15:19 -0000	1.21
+++ libdv.spec	12 Sep 2007 13:27:14 -0000	1.22
@@ -1,31 +1,20 @@
-Summary:	Software decoder for DV format video
-Name:		libdv
-Version:	1.0.0
-Release:	1%{?dist}
-Epoch:		0
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://libdv.sourceforge.net/
-Source:		http://dl.sf.net/libdv/libdv-%{version}.tar.gz
-Patch1:		libdv-0.104-no-exec-stack.patch
-Patch2:		libdv-1.0.0-pic.patch
-Patch3:		libdv-1.0.0-gtk2.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	gtk2-devel
-BuildRequires:	libXt-devel, libXv-devel
+Summary:        Software decoder for DV format video
+Name:           libdv
+Version:        1.0.0
+Release:        2%{?dist}
+License:        LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://libdv.sourceforge.net/
+Source:         http://downloads.sourceforge.net/libdv/libdv-%{version}.tar.gz
+Patch1:         libdv-0.104-no-exec-stack.patch
+Patch2:         libdv-1.0.0-pic.patch
+Patch3:         libdv-1.0.0-gtk2.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel, libXv-devel
 # Required for the gtk2 patch
-BuildRequires:	autoconf, automake, libtool, SDL-devel
-ExcludeArch:	s390 s390x
-
-%package	devel
-Summary:	Development package for libdv
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%package	tools
-Summary:	Basic tools to manipulate Digital Video streams
-Group:		Applications/Multimedia
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+BuildRequires:  autoconf, automake, libtool, SDL-devel
+ExcludeArch:    s390 s390x
 
 %description
 The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -34,6 +23,11 @@
 developed according to the official standards for DV video: IEC 61834
 and SMPTE 314M.
 
+%package tools
+Summary:        Basic tools to manipulate Digital Video streams
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}
+
 %description tools
 This package contains some basic programs to display and encode
 digital video streams. This programs uses the Quasar DV codec (libdv),
@@ -41,6 +35,12 @@
 digital camcorders, typically those that support the IEEE 1394
 (a.k.a. FireWire or i.Link) interface.
 
+%package devel
+Summary:        Development package for libdv
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
 %description devel
 This package contains development files for libdv.
 
@@ -93,11 +93,17 @@
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
+- Update License field (Matthias Saou)
+- Remove useless zero epoch (Matthias Saou)
+- Add pkgconfig devel sub-package req (Matthias Saou)
+- Minor spec formatting changes and clean-ups
+
 * Fri Jan 19 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-1
 - New upstream release
 - PIC patch from Mike Frysinger <vapier at gentoo.org> (#146596)
 - Re-enable asm on i386
-  
+
 * Thu Sep 21 2006 Jarod Wilson <jwilson at redhat.com> 0.104-5
 - Disable asm on i386 for now to prevent text relocations in DSO
 
@@ -145,7 +151,7 @@
 - upgrade to 0.103
 
 * Sun Jun 20 2004 Jeremy Katz <katzj at redhat.com> - 0:0.102-4
-- gtk+ doesn't need to be in the .pc file (committed upstream, reported 
+- gtk+ doesn't need to be in the .pc file (committed upstream, reported
 - don't require gtk+-devel for -devel package (unneeded)
   to fedora-devel-list by John Thacker)
 
@@ -170,7 +176,7 @@
 * Sun Apr 27 2003 Dams <anvil[AT]livna.org> 0:0.99-0.fdr.2
 - Added post/postun scriptlets
 
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 
+* Fri Apr 25 2003 Dams <anvil[AT]livna.org>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:56:22 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 12 Sep 2007 09:56:22 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1304,1.1305
Message-ID: <200709121356.l8CDuMYh010322@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10289

Modified Files:
	openoffice.org.spec 
Log Message:
try simple build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1304
retrieving revision 1.1305
diff -u -r1.1304 -r1.1305
--- openoffice.org.spec	6 Sep 2007 19:26:41 -0000	1.1304
+++ openoffice.org.spec	12 Sep 2007 13:55:49 -0000	1.1305
@@ -1133,6 +1133,8 @@
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
 if [ "$SMP_MFLAGS" == "-P0" ]; then SMP_MFLAGS=-P2; fi
+#grr, having problems
+export SMP_MFLAGS=-P1
 #just in case you have a >16 proc box
 export MAXPROCESSLIMIT=65535
 #get core dumps



From fedora-extras-commits at redhat.com  Wed Sep 12 14:20:44 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 12 Sep 2007 10:20:44 -0400
Subject: rpms/libdv/devel libdv.spec,1.22,1.23
Message-ID: <200709121420.l8CEKimj017090@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libdv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17072

Modified Files:
	libdv.spec 
Log Message:
* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-3
- A few more fixes from Matthias Saou:
 - List man pages in %files consistently w/o gz extension
 - Add BR: popt-devel for f8+, its now split fromm rpm-devel



Index: libdv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libdv.spec	12 Sep 2007 13:27:14 -0000	1.22
+++ libdv.spec	12 Sep 2007 14:20:12 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:        Software decoder for DV format video
 Name:           libdv
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://libdv.sourceforge.net/
@@ -14,6 +14,9 @@
 BuildRequires:  libXt-devel, libXv-devel
 # Required for the gtk2 patch
 BuildRequires:  autoconf, automake, libtool, SDL-devel
+%if "%{?fedora}" >= "8"
+BuildRequires: popt-devel
+%endif
 ExcludeArch:    s390 s390x
 
 %description
@@ -81,8 +84,8 @@
 %{_bindir}/dvconnect
 %{_bindir}/encodedv
 %{_bindir}/playdv
-%{_mandir}/man1/dubdv.1.gz
-%{_mandir}/man1/dvconnect.1.gz
+%{_mandir}/man1/dubdv.1*
+%{_mandir}/man1/dvconnect.1*
 %{_mandir}/man1/encodedv.1*
 %{_mandir}/man1/playdv.1*
 
@@ -93,6 +96,11 @@
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-3
+- A few more fixes from Matthias Saou:
+ - List man pages in %%files consistently w/o gz extension
+ - Add BR: popt-devel for f8+, its now split fromm rpm-devel
+
 * Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
 - Update License field (Matthias Saou)
 - Remove useless zero epoch (Matthias Saou)



From fedora-extras-commits at redhat.com  Wed Sep 12 14:42:42 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 10:42:42 -0400
Subject: comps comps-f8.xml.in,1.104,1.105
Message-ID: <200709121442.l8CEggXp017940@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17900

Modified Files:
	comps-f8.xml.in 
Log Message:
Add evolution-help to comps-f8.xml.in.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- comps-f8.xml.in	11 Sep 2007 22:36:35 -0000	1.104
+++ comps-f8.xml.in	12 Sep 2007 14:42:12 -0000	1.105
@@ -1804,6 +1804,7 @@
       <packagereq type="default">bittorrent-gui</packagereq>
       <packagereq type="default">ekiga</packagereq>
       <packagereq type="default">evolution</packagereq>
+      <packagereq type="default">evolution-help</packagereq>
       <packagereq type="default">evolution-webcal</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">pidgin</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 12 14:48:43 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Wed, 12 Sep 2007 10:48:43 -0400
Subject: rpms/hotwire/F-7 hotwire.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200709121448.l8CEmh4j018188@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/hotwire/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130

Modified Files:
	hotwire.spec sources 
Log Message:
new upstream


Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/F-7/hotwire.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hotwire.spec	11 Jul 2007 22:48:09 -0000	1.5
+++ hotwire.spec	12 Sep 2007 14:48:11 -0000	1.6
@@ -3,7 +3,7 @@
 
 Summary: Hotwire Shell
 Name: hotwire
-Version: 0.590
+Version: 0.595
 Release: 1%{?dist}
 Source0: http://hotwire-shell.org/download/hotwire-%{version}.zip
 License: GPL
@@ -56,6 +56,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Sun Sep 09 2007 Colin Walters <walters at redhat.com> - 0.595-1
+- new upstream
+
 * Tue Jul 12 2007 Colin Walters <walters at redhat.com> - 0.590-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jul 2007 22:48:09 -0000	1.5
+++ sources	12 Sep 2007 14:48:11 -0000	1.6
@@ -1,2 +1 @@
-e465e180cd90df1b5c88c5648c996469  hotwire-0.575.zip
-13b9d559b725b3b36104f6f97ae3ede6  hotwire-0.590.zip
+2da79522e51904c78df9bd3dfb5e13ef  hotwire-0.595.zip



From fedora-extras-commits at redhat.com  Wed Sep 12 14:48:56 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 10:48:56 -0400
Subject: rpms/kmenu-gnome/F-7 remove-system-administration.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 kmenu-gnome.spec, 1.12, 1.13 sources,
	1.11, 1.12
Message-ID: <200709121448.l8CEmucV018237@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17991/F-7

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Added Files:
	remove-system-administration.patch 
Log Message:


remove-system-administration.patch:

--- NEW FILE remove-system-administration.patch ---
--- kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu.orig	2007-09-09 23:30:50.000000000 +0200
+++ kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu	2007-09-10 07:25:07.000000000 +0200
@@ -1285,50 +1285,6 @@
 			<Filename>synaptic-kde.desktop</Filename>
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>Settings</Category>
-				<Not><Or>
-				<Filename>gdmsetup.desktop</Filename>
-				<Filename>gnome-nettool.desktop</Filename>
-				<Filename>gnome-system-monitor.desktop</Filename>
-				<Filename>gslapt.desktop</Filename>
-				<Filename>qt-language-selector.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>boot.desktop</Filename>
-				<Filename>dropline-installer.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>gnome-app-install.desktop</Filename>
-				<Filename>gnome-app-install-xfce.desktop</Filename>
-				<Filename>gnome-apt.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>update-manager.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-				<!-- Include rPath Administration Tools -->
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>net-internet-druid.desktop</Filename>
-				<Filename>net-neat.desktop</Filename>
-				<Filename>net-swat.desktop</Filename>
-				<Filename>net-system-config-date.desktop</Filename>
-				<Filename>net-system-config-display.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>net-system-config-securitylevel.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>
 				<And>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:19:09 -0000	1.11
+++ .cvsignore	12 Sep 2007 14:48:23 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.8.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/kmenu-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmenu-gnome.spec	20 Aug 2007 20:19:09 -0000	1.12
+++ kmenu-gnome.spec	12 Sep 2007 14:48:23 -0000	1.13
@@ -1,15 +1,17 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.8
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: pharagraphe 3 of LGPL permits changing the license to GPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
 
 Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+Patch:      remove-system-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +21,11 @@
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -78,6 +81,14 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Sep 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.8-2
+- new upstream release
+
+* Wed Sep 12 2007 Ariszlo <ariszlo at gmail.com> - 0.6.8-1
+- release 0.6.8
+- Added include categories to fc5-hide-bug196275.menu
+- Added remove-system-administration.patch
+
 * Mon Aug 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.7-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:19:09 -0000	1.11
+++ sources	12 Sep 2007 14:48:23 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+003e5d317881a78005434267a3631035  31025-kmenu-gnome-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 14:51:41 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 10:51:41 -0400
Subject: rpms/kmenu-gnome/devel remove-system-administration.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 kmenu-gnome.spec, 1.12, 1.13 sources,
	1.11, 1.12
Message-ID: <200709121451.l8CEpfVG018439@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Added Files:
	remove-system-administration.patch 
Log Message:


remove-system-administration.patch:

--- NEW FILE remove-system-administration.patch ---
--- kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu.orig	2007-09-09 23:30:50.000000000 +0200
+++ kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu	2007-09-10 07:25:07.000000000 +0200
@@ -1285,50 +1285,6 @@
 			<Filename>synaptic-kde.desktop</Filename>
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>Settings</Category>
-				<Not><Or>
-				<Filename>gdmsetup.desktop</Filename>
-				<Filename>gnome-nettool.desktop</Filename>
-				<Filename>gnome-system-monitor.desktop</Filename>
-				<Filename>gslapt.desktop</Filename>
-				<Filename>qt-language-selector.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>boot.desktop</Filename>
-				<Filename>dropline-installer.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>gnome-app-install.desktop</Filename>
-				<Filename>gnome-app-install-xfce.desktop</Filename>
-				<Filename>gnome-apt.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>update-manager.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-				<!-- Include rPath Administration Tools -->
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>net-internet-druid.desktop</Filename>
-				<Filename>net-neat.desktop</Filename>
-				<Filename>net-swat.desktop</Filename>
-				<Filename>net-system-config-date.desktop</Filename>
-				<Filename>net-system-config-display.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>net-system-config-securitylevel.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>
 				<And>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:23:51 -0000	1.11
+++ .cvsignore	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.8.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmenu-gnome.spec	20 Aug 2007 20:23:51 -0000	1.12
+++ kmenu-gnome.spec	12 Sep 2007 14:51:08 -0000	1.13
@@ -1,15 +1,17 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.8
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: pharagraphe 3 of LGPL permits changing the license to GPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
 
 Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+Patch:      remove-system-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +21,11 @@
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -78,6 +81,14 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Sep 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.8-2
+- new upstream release
+
+* Wed Sep 12 2007 Ariszlo <ariszlo at gmail.com> - 0.6.8-1
+- release 0.6.8
+- Added include categories to fc5-hide-bug196275.menu
+- Added remove-system-administration.patch
+
 * Mon Aug 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.7-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:23:51 -0000	1.11
+++ sources	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+003e5d317881a78005434267a3631035  31025-kmenu-gnome-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 14:55:38 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 10:55:38 -0400
Subject: devel/yum yum-trans-display-object.patch, NONE, 1.1 yum.spec, 1.177,
	1.178 cli-ouput-fix.patch, 1.1, NONE depsolve-fixes.patch, 1.1,
	NONE rpmdb-unresolved.patch, 1.1, NONE version-None-tuple.patch,
	1.1, NONE
Message-ID: <200709121455.l8CEtc4F018710@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18669

Modified Files:
	yum.spec 
Added Files:
	yum-trans-display-object.patch 
Removed Files:
	cli-ouput-fix.patch depsolve-fixes.patch 
	rpmdb-unresolved.patch version-None-tuple.patch 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
- add upstream patch to improve RPMTransaction display


yum-trans-display-object.patch:

--- NEW FILE yum-trans-display-object.patch ---
commit ae1618ec6ab66beef49c3d27ac0083c4115bd8cb
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Sep 12 10:40:12 2007 -0400

    allow passing in an already created display object

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index ecddce1..f77400e 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -115,7 +115,10 @@ class SimpleCliCallBack(RPMBaseCallback):
 
 class RPMTransaction:
     def __init__(self, base, test=False, display=NoOutputCallBack):
-        self.display = display() # display callback
+        if not callable(display):
+            self.display = display
+        else:
+            self.display = display() # display callback
         self.base = base # base yum object b/c we need so much
         self.test = test # are we a test?
         


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- yum.spec	10 Sep 2007 16:07:14 -0000	1.177
+++ yum.spec	12 Sep 2007 14:55:06 -0000	1.178
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
+Patch2: yum-trans-display-object.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -48,6 +49,7 @@
 %setup -q
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .showdep
+%patch2 -p1 -b .transdisp
 
 %build
 make
@@ -93,6 +95,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
+- add upstream patch to improve RPMTransaction display
+
 * Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.5-1
 - 3.2.5 - pull out unused patches
 


--- cli-ouput-fix.patch DELETED ---


--- depsolve-fixes.patch DELETED ---


--- rpmdb-unresolved.patch DELETED ---


--- version-None-tuple.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:01:46 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 12 Sep 2007 11:01:46 -0400
Subject: rpms/byacc/devel byacc.spec,1.2,1.3
Message-ID: <200709121501.l8CF1kiV024920@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/byacc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18940

Modified Files:
	byacc.spec 
Log Message:
* Fri Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.9.20050813-2
- Update summary.
- Remove useless doc copying in install section.
- Add NOTES and NO_WARRANTY docs.



Index: byacc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/byacc/devel/byacc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- byacc.spec	1 Mar 2007 18:19:49 -0000	1.2
+++ byacc.spec	12 Sep 2007 15:01:11 -0000	1.3
@@ -1,9 +1,9 @@
 %define byaccdate 20050813
 
-Summary: A public domain Yacc parser generator
+Summary: Berkeley Yacc, a parser generator
 Name: byacc
 Version: 1.9.%{byaccdate}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: Development/Tools
 URL: http://dickey.his.com/byacc/byacc.html
@@ -29,8 +29,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s yacc $RPM_BUILD_ROOT/%{_bindir}/byacc
 ln -s yacc.1 $RPM_BUILD_ROOT/%{_mandir}/man1/byacc.1
-install -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
-install -m 644 ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
 
 %check
 echo ====================TESTING=========================
@@ -41,14 +39,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES
-%defattr(-,root,root)
+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
+%defattr(-,root,root,-)
 %{_bindir}/yacc
 %{_bindir}/byacc
 %{_mandir}/man1/yacc.1*
 %{_mandir}/man1/byacc.1*
 
 %changelog
+* Fri Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.9.20050813-2
+- Update summary.
+- Remove useless doc copying in install section.
+- Add NOTES and NO_WARRANTY docs.
+
 * Thu Feb  2 2007 Petr Machata <pmachata at redhat.com> - 1.9.20050813-1
 - Thomas Dickey's 20050813 version of byacc:
   - own build system (linux patch reverted)



From fedora-extras-commits at redhat.com  Wed Sep 12 15:18:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:18:51 -0400
Subject: rpms/kdesdk/devel kdesdk-3.5.7-subversion.patch, NONE,
	1.1 kdesdk.spec, 1.71, 1.72 kdesdk-3.4.0-db4.patch, 1.1, NONE
Message-ID: <200709121518.l8CFIpWk025809@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25776

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.5.7-subversion.patch 
Removed Files:
	kdesdk-3.4.0-db4.patch 
Log Message:
* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
- update %description to mention included apps
- move manpages to main pkg.
- Provides: cervisia umbrello
- kbugbuster kuiviewer: drop --add-only-show-in KDE
- kioslave/svn: --with-subversion, patch


kdesdk-3.5.7-subversion.patch:

--- NEW FILE kdesdk-3.5.7-subversion.patch ---
diff -up kdesdk-3.5.7/kioslave/svn/configure.in.in.svn kdesdk-3.5.7/kioslave/svn/configure.in.in
--- kdesdk-3.5.7/kioslave/svn/configure.in.in.svn	2005-10-10 09:58:25.000000000 -0500
+++ kdesdk-3.5.7/kioslave/svn/configure.in.in	2007-09-12 09:39:42.000000000 -0500
@@ -86,7 +86,7 @@ fi
 AC_SUBST(SVNCONFIG)
 if test -x "$SVNCONFIG"; then
 	SVNLD="`$SVNCONFIG --ldflags`"
-	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1 -lsvn_subr-1"
 	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
 	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
 	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
@@ -141,7 +141,7 @@ dnl		AC_MSG_ERROR([Subversion headers ar
 		SVN_SUBDIR=
 	fi
 fi
-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
 SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
 SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdesdk.spec	29 Aug 2007 12:07:57 -0000	1.71
+++ kdesdk.spec	12 Sep 2007 15:18:18 -0000	1.72
@@ -1,24 +1,20 @@
 
-%define debug 0
-%define final 0
+%define _with_subversion --with-subversion --with-apr-config=apr-1-config --with-apu-config=apu-1-config
 
-%define arts 1
-
-%define make_cvs 1
-
-%define appdir %{_datadir}/applications/kde
+%define make_cvs 1 
 
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 9%{?dist}.1
+Release: 10%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdesdk-3.4.0-db4.patch
+
+Patch1: kdesdk-3.5.7-subversion.patch
 Patch2: kdesdk-3.5.4-multilib.patch
 
 Provides: kdesdk3 = %{version}-%{release}
@@ -42,29 +38,42 @@
 BuildRequires: binutils-devel
 %endif
 BuildRequires: perl
-BuildRequires: subversion-devel >= 1.0, neon-devel
+%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+
+# Obsoletes/Provides
+%define cervisia_ver 2.4.7
+Provides: cervisia = %{cervisia_ver}-%{release}
+
+%define umbrello_ver 1.5.7
+Obsoletes: umbrello < %{umbrello_ver}-%{release}
+Provides:  umbrello = %{umbrello_ver}-%{release}
+
 
 %description
-A collection of applications and tools used by KDE developers.
-Among other things, kdesdk provides tools for working on the KDE CVS
-repository.
+A collection of applications and tools used by developers, including:
+* cervisia: a CVS frontend
+* kbabel: PO file management
+* kbugbuster: a tool to manage the KDE bug report system
+* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* kompare: diff tool
+* kuiviewer: displays designer's UI files
+* umbrello: UML modeller and UML diagram tool
+
 
 %package devel
-Summary: Development files for kdesdk
+Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdesdk3-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs3-devel
-
 %description devel
-Development files for kdesdk. Install kdesdk-devel if you wish
-to develop or compile KDE sdk applications.
+%{summary}.
 
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .db4
+%patch1 -p1 -b .subversion
 %patch2 -p1 -b .multilib
 
 %if %{make_cvs}
@@ -76,20 +85,12 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-%if %{arts} == 0
-   --without-arts \
-%endif
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --includedir=%{_includedir}/kde
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
+  %{?_with_subversion}
 
 make %{?_smp_mflags}
 
@@ -99,11 +100,9 @@
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor "" --delete-original \
-  --dir %{buildroot}%{appdir} \
-  --add-only-show-in KDE \
-  %{buildroot}%{appdir}/kbugbuster.desktop \
-  %{buildroot}%{appdir}/kuiviewer.desktop
+desktop-file-install --vendor "" \
+  --dir %{buildroot}%{_datadir}/applications/kde \
+  %{buildroot}%{_datadir}/applications/kde/*.desktop \
 
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
@@ -149,12 +148,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/*.la
+%{_docdir}/HTML/en/*
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -164,17 +159,28 @@
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/applications/kde/*
 %{_datadir}/config.kcfg/*
+%{_libdir}/kde3/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_libdir}/libkdeinit_*.so
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/*.a
-%{_mandir}/man1/*
+%{_libdir}/libktrace_s.a
 
 
 %changelog
+* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
+- update %%description to mention included apps
+- move manpages to main pkg.
+- Provides: cervisia umbrello
+- kbugbuster kuiviewer: drop --add-only-show-in KDE
+- kioslave/svn: --with-subversion, patch
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-9
 - License: GPLv2
 - (Build)Requires: kdelibs3(-devel) kdepim3-devel


--- kdesdk-3.4.0-db4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:37:17 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 11:37:17 -0400
Subject: rpms/xsc/FC-6 xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709121537.l8CFbHDr026678@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26635

Modified Files:
	sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: desktop-file-utils, libX11-devel
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure --x-includes="" --x-libraries=""
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	12 Sep 2007 15:36:44 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 15:48:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:48:29 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.130,1.131
Message-ID: <200709121548.l8CFmTKo027064@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27028

Modified Files:
	kdepim.spec 
Log Message:
* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
- drop OnlyShowIn=KDE munging
- update %description
- tidy up



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdepim.spec	30 Aug 2007 01:57:27 -0000	1.130
+++ kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
@@ -1,18 +1,18 @@
+
 %define debug 0
+# --enable-final requires > 1GB VM, sometimes kills our builders 
 %define final 0
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
 %define make_cvs 1
 
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
 Name:    kdepim
-Summary: PIM (Personal Information Manager) for KDE
+Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -70,7 +70,9 @@
 BuildRequires: automake libtool
 %endif
 
-Obsoletes: akregator < 0:1.0
+%define akregator_ver 1.2.7
+Obsoletes: akregator < 0:%{akregator_ver}-%{release}
+#Provides: akregator = 0:%{akregator_ver}-%{release} 
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -84,7 +86,14 @@
 %endif
 
 %description
-A PIM (Personal Information Manager) for KDE.
+%{summary}, including:
+* akregator: feed aggregator 
+* kmail: email client
+* knode: newsreader
+* knotes: sticky notes for the desktop
+* kontact: integrated PIM management
+* korganizer: journal, appointments, events, todos
+%{?_with_pilot_link:* kpilot: HotSync?? software for Palm OS?? devices}
 
 %package devel
 Summary: Development files for %{name} 
@@ -113,7 +122,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -145,24 +154,30 @@
 %install
 rm -rf %{buildroot} 
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
-# Make symlinks relative
-mkdir -p %{buildroot}%{prefix}/share/doc/HTML/en/common
-pushd %{buildroot}%{prefix}/share/doc/HTML/en
+# make symlinks relative
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
-   [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
+   if [ -d $i -a -L $i/common ]; then
+      rm -f $i/common
+      ln -nfs ../common $i
+   fi
 done
 popd
 
+
 ## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
 ## some of these gems.  -- Rex
+%if 0
 for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
    KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
    if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
       echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
    fi
 done
+%endif
 
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
@@ -232,6 +247,11 @@
 
 
 %changelog
+* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- drop OnlyShowIn=KDE munging
+- update %%description
+- tidy up
+
 * Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
 - templates for forwarding do not work with inline mails (kde#140549)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:29 -0700
Subject: [pkgdb] guile-gnome-platform was added for laxathom
Message-ID: <200709121551.l8CFpU1e022812@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package guile-gnome-platform with summary Guile wrapper collection for the GNOME library stack
Kevin Fenzi (kevin) has approved Package guile-gnome-platform
Kevin Fenzi (kevin) has added a Fedora devel branch for guile-gnome-platform with an owner of laxathom
Kevin Fenzi (kevin) has approved guile-gnome-platform in Fedora devel
Kevin Fenzi (kevin) has approved Package guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, 6) updated by kevin
Message-ID: <200709121551.l8CFpkXl032265@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121551.l8CFplHZ032274@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, 7) updated by kevin
Message-ID: <200709121551.l8CFploe032283@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, devel) updated by kevin
Message-ID: <200709121551.l8CFpmav032292@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121551.l8CFpmik032301@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:23 -0400
Subject: rpms/guile-gnome-platform - New directory
Message-ID: <200709121552.l8CFqNjt027375@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform

Log Message:
Directory /cvs/extras/rpms/guile-gnome-platform added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:27 -0400
Subject: rpms/guile-gnome-platform/devel - New directory
Message-ID: <200709121552.l8CFqRuC027394@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform/devel

Log Message:
Directory /cvs/extras/rpms/guile-gnome-platform/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:29 -0400
Subject: rpms/guile-gnome-platform Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121552.l8CFqT7W027420@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform

Added Files:
	Makefile import.log 
Log Message:
Setup of module guile-gnome-platform


--- NEW FILE Makefile ---
# Top level Makefile for module guile-gnome-platform
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:33 -0400
Subject: rpms/guile-gnome-platform/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709121552.l8CFqXY9027436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guile-gnome-platform


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: guile-gnome-platform
# $Id: Makefile,v 1.1 2007/09/12 15:52:30 kevin Exp $
NAME := guile-gnome-platform
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 fedora-extras-commits at redhat.com  Wed Sep 12 15:53:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:53:55 -0700
Subject: [pkgdb] slingshot was added for limb
Message-ID: <200709121553.l8CFrtBI032361@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package slingshot with summary A Newtonian strategy game
Kevin Fenzi (kevin) has approved Package slingshot
Kevin Fenzi (kevin) has added a Fedora devel branch for slingshot with an owner of limb
Kevin Fenzi (kevin) has approved slingshot in Fedora devel
Kevin Fenzi (kevin) has approved Package slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, 7) updated by kevin
Message-ID: <200709121554.l8CFs9r3032375@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, devel) updated by kevin
Message-ID: <200709121554.l8CFsA8n032384@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, 6) updated by kevin
Message-ID: <200709121554.l8CFsAh4032394@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:22 -0400
Subject: rpms/slingshot - New directory
Message-ID: <200709121554.l8CFsMgj027902@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot

Log Message:
Directory /cvs/extras/rpms/slingshot added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:26 -0400
Subject: rpms/slingshot/devel - New directory
Message-ID: <200709121554.l8CFsQMe027919@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot/devel

Log Message:
Directory /cvs/extras/rpms/slingshot/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:29 -0400
Subject: rpms/slingshot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121554.l8CFsTXe027946@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot

Added Files:
	Makefile import.log 
Log Message:
Setup of module slingshot


--- NEW FILE Makefile ---
# Top level Makefile for module slingshot
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:33 -0400
Subject: rpms/slingshot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709121554.l8CFsX93027962@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module slingshot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: slingshot
# $Id: Makefile,v 1.1 2007/09/12 15:54:31 kevin Exp $
NAME := slingshot
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 fedora-extras-commits at redhat.com  Wed Sep 12 15:55:46 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:55:46 -0400
Subject: rpms/lyx/EL-5 lyx.spec,1.50,1.51
Message-ID: <200709121555.l8CFtk1I028192@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164

Modified Files:
	lyx.spec 
Log Message:
* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
- License: GPLv2+
- EPEL: drop aiksaurus support (until aiksaurus is available)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lyx.spec	10 Sep 2007 17:01:29 -0000	1.50
+++ lyx.spec	12 Sep 2007 15:55:13 -0000	1.51
@@ -1,10 +1,14 @@
 
+%if 0%{?fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
@@ -25,14 +29,13 @@
 # xforms frontend
 BuildRequires: xforms-devel
 
+%{?_with_aiksaurus:BuildRequires: aiksaurus-devel}
+BuildRequires: aspell-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: python
-BuildRequires: aiksaurus-devel
-BuildRequires: aspell-devel
+BuildRequires: tetex-fonts tetex-latex
 BuildRequires: zlib-devel
-BuildRequires: tetex-latex
-BuildRequires: tetex-fonts
 
 # For texhash
 Requires(post): tetex-fonts
@@ -43,8 +46,6 @@
 Requires: tetex-dvips
 Requires: mathml-fonts
 Requires: ghostscript
-# Short-hand for Requires+Requires(post,postun)
-Prereq: xdg-utils
 ## Soft dependencies
 %if 0%{?fedora} > 3
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -53,6 +54,7 @@
 %endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
+Requires(hint): xdg-utils
 
 %description
 LyX is a modern approach to writing documents which breaks with the
@@ -112,7 +114,7 @@
   --enable-compression-support \
   --with-frontend="qt xforms" \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
+  %{?_with_aiksaurus} %{!?_with_aiksaurus:--without-aiksaurus} \
   --with-aspell \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
@@ -162,15 +164,18 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure.py  > /dev/null 2>&1 ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
+fi
 
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing, 
@@ -217,6 +222,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
+- License: GPLv2+
+- EPEL: drop aiksaurus support (until aiksaurus is available)
+
 * Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
 - lyx-1.4.5.1
 



From fedora-extras-commits at redhat.com  Wed Sep 12 15:58:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:58:58 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect was added for remi
Message-ID: <200709121558.l8CFwxjR032446@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-pear-HTML-QuickForm-advmultiselect with summary Element for HTML_QuickForm that emulate a multi-select
Kevin Fenzi (kevin) has approved Package php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has added a Fedora devel branch for php-pear-HTML-QuickForm-advmultiselect with an owner of remi
Kevin Fenzi (kevin) has approved php-pear-HTML-QuickForm-advmultiselect in Fedora devel
Kevin Fenzi (kevin) has approved Package php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	6) updated by kevin
Message-ID: <200709121605.l8CG5MMf032551@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora 6 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect summary updated by
	kevin
Message-ID: <200709121605.l8CG5MJE032542@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package php-pear-HTML-QuickForm-advmultiselect summary to Element for HTML_QuickForm that emulate a multi-select

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	devel) updated by kevin
Message-ID: <200709121605.l8CG5NDL032560@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora devel to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	7) updated by kevin
Message-ID: <200709121605.l8CG5NaB032569@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora 7 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL,
	5) updated by kevin
Message-ID: <200709121605.l8CG5N6n032578@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora EPEL 5 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:17:09 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 12 Sep 2007 12:17:09 -0400
Subject: fedora-security/audit fc7,1.97,1.98
Message-ID: <200709121617.l8CGHACP002359@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2338/audit

Modified Files:
	fc7 
Log Message:
mediawiki XSS



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- fc7	11 Sep 2007 17:49:30 -0000	1.97
+++ fc7	12 Sep 2007 16:17:07 -0000	1.98
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
+GENERIC-MAP-NOMATCH VULNERABLE (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:38 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect - New directory
Message-ID: <200709121624.l8CGOcUj002812@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:42 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel - New directory
Message-ID: <200709121624.l8CGOgus002825@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:47 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200709121624.l8CGOl4R002857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-QuickForm-advmultiselect


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-QuickForm-advmultiselect
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:50 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel .cvsignore, NONE, 
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709121624.l8CGOoPZ002873@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-QuickForm-advmultiselect


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-HTML-QuickForm-advmultiselect
# $Id: Makefile,v 1.1 2007/09/12 16:24:48 kevin Exp $
NAME := php-pear-HTML-QuickForm-advmultiselect
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:30:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:00 -0700
Subject: [pkgdb] pguiman was added for odvorace
Message-ID: <200709121630.l8CGU03x032719@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package pguiman with summary The PostgreSQL database server managing tool
Kevin Fenzi (kevin) has approved Package pguiman
Kevin Fenzi (kevin) has added a Fedora devel branch for pguiman with an owner of odvorace
Kevin Fenzi (kevin) has approved pguiman in Fedora devel
Kevin Fenzi (kevin) has approved Package pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, 6) updated by kevin
Message-ID: <200709121630.l8CGU9N4023801@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, devel) updated by kevin
Message-ID: <200709121630.l8CGUALT023819@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, 7) updated by kevin
Message-ID: <200709121630.l8CGUAIB023810@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:36 -0400
Subject: rpms/pguiman - New directory
Message-ID: <200709121630.l8CGUam8003421@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman

Log Message:
Directory /cvs/extras/rpms/pguiman added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:39 -0400
Subject: rpms/pguiman/devel - New directory
Message-ID: <200709121630.l8CGUd8a003435@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman/devel

Log Message:
Directory /cvs/extras/rpms/pguiman/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:42 -0400
Subject: rpms/pguiman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121630.l8CGUgOr003462@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman

Added Files:
	Makefile import.log 
Log Message:
Setup of module pguiman


--- NEW FILE Makefile ---
# Top level Makefile for module pguiman
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:45 -0400
Subject: rpms/pguiman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709121630.l8CGUjNi003478@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pguiman


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pguiman
# $Id: Makefile,v 1.1 2007/09/12 16:30:43 kevin Exp $
NAME := pguiman
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:35:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:22 -0700
Subject: [pkgdb] tack was added for mlichvar
Message-ID: <200709121635.l8CGZNdB023963@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package tack with summary Terminfo action checker
Kevin Fenzi (kevin) has approved Package tack
Kevin Fenzi (kevin) has added a Fedora devel branch for tack with an owner of mlichvar
Kevin Fenzi (kevin) has approved tack in Fedora devel
Kevin Fenzi (kevin) has approved Package tack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tack (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on tack (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tack (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:35:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:32 -0700
Subject: [pkgdb] tack (Fedora, devel) updated by kevin
Message-ID: <200709121635.l8CGZWv2000342@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on tack (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:35:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:32 -0700
Subject: [pkgdb] tack (Fedora, 7) updated by kevin
Message-ID: <200709121635.l8CGZXph000351@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for tack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on tack (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:33 -0400
Subject: rpms/tack - New directory
Message-ID: <200709121639.l8CGdXuC003993@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack

Log Message:
Directory /cvs/extras/rpms/tack added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:38 -0400
Subject: rpms/tack/devel - New directory
Message-ID: <200709121639.l8CGdcoa004009@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack/devel

Log Message:
Directory /cvs/extras/rpms/tack/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:41 -0400
Subject: rpms/tack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121639.l8CGdfgZ004036@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack

Added Files:
	Makefile import.log 
Log Message:
Setup of module tack


--- NEW FILE Makefile ---
# Top level Makefile for module tack
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:44 -0400
Subject: rpms/tack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709121639.l8CGdiqw004053@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tack


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tack
# $Id: Makefile,v 1.1 2007/09/12 16:39:41 kevin Exp $
NAME := tack
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:55:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:55:58 -0700
Subject: [pkgdb] Django (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121655.l8CGtwGF024173@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for Django
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Django (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Django (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Django (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 16:55:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:55:58 -0700
Subject: [pkgdb] Django (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121655.l8CGtw1G024182@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for Django
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Django (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Django (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Django (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:17:07 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 13:17:07 -0400
Subject: rpms/curl/OLPC-2 curl-7.16.4-ftp.patch, NONE,
	1.1 curl-7.16.4-nsspem.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 curl.spec, 1.49, 1.50 sources, 1.25,
	1.26 curl-7.14.1-nousr.patch, 1.1,
	NONE curl-7.15.0-curl_config-version.patch, 1.1, NONE
Message-ID: <200709121717.l8CHH70Q011701@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/curl/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572/OLPC-2

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.16.4-ftp.patch curl-7.16.4-nsspem.patch 
Removed Files:
	curl-7.14.1-nousr.patch curl-7.15.0-curl_config-version.patch 
Log Message:
Import f8 srpm, branch was accidentally made from F-7.


curl-7.16.4-ftp.patch:

--- NEW FILE curl-7.16.4-ftp.patch ---
--- curl-7.16.4/lib/ftp.c.ftp	2007-07-02 00:01:19.000000000 +0200
+++ curl-7.16.4/lib/ftp.c	2007-08-10 13:24:34.000000000 +0200
@@ -2372,7 +2372,7 @@ static CURLcode ftp_state_user_resp(stru
   (void)instate; /* no use for this yet */
 
   /* some need password anyway, and others just return 2xx ignored */
-  if((ftpcode == 331 || ftpcode/100 == 2) && (ftpc->state == FTP_USER)) {
+  if((ftpcode == 331) && (ftpc->state == FTP_USER)) {
     /* 331 Password required for ...
        (the server requires to send the user's password too) */
     NBFTPSENDF(conn, "PASS %s", ftp->passwd?ftp->passwd:"");

curl-7.16.4-nsspem.patch:

--- NEW FILE curl-7.16.4-nsspem.patch ---
diff -up curl-7.16.4/configure.nsspem curl-7.16.4/configure
--- curl-7.16.4/configure.nsspem	2007-06-25 11:18:41.000000000 +0200
+++ curl-7.16.4/configure	2007-09-06 08:35:31.000000000 +0200
@@ -26760,7 +26760,7 @@ echo "$as_me: WARNING: Use --with-ssl, -
 fi
 
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   { echo "$as_me:$LINENO: checking CA cert bundle install path" >&5
 echo $ECHO_N "checking CA cert bundle install path... $ECHO_C" >&6; }
diff -up curl-7.16.4/configure.ac.nsspem curl-7.16.4/configure.ac
--- curl-7.16.4/configure.ac.nsspem	2007-06-12 23:39:21.000000000 +0200
+++ curl-7.16.4/configure.ac	2007-09-06 08:35:31.000000000 +0200
@@ -1468,7 +1468,7 @@ dnl ************************************
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   AC_MSG_CHECKING([CA cert bundle install path])
 
diff -up curl-7.16.4/lib/nss.c.nsspem curl-7.16.4/lib/nss.c
--- curl-7.16.4/lib/nss.c.nsspem	2007-05-25 23:56:27.000000000 +0200
+++ curl-7.16.4/lib/nss.c	2007-09-06 09:26:39.000000000 +0200
@@ -55,6 +55,7 @@
 #include <ssl.h>
 #include <sslerr.h>
 #include <secerr.h>
+#include <secmod.h>
 #include <sslproto.h>
 #include <prtypes.h>
 #include <pk11pub.h>
@@ -69,10 +70,19 @@
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif
 
+#define SSL_DIR "/etc/pki/nssdb"
+
+/* enough to fit the string "PEM Token #[0|1]" */
+#define SLOTSIZE 13
+
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
 static int initialized = 0;
-static int noverify = 0;
+static int verify_done = 0;
+char * select_nickname = NULL;
+
+/* Global so our callbacks can update as appropriate */
+static int curlerr;
 
 #define HANDSHAKE_TIMEOUT 30
 
@@ -87,15 +97,25 @@ typedef struct {
   PRInt32 version; /* protocol version valid for this cipher */
 } cipher_s;
 
-/* the table itself is defined in nss_engine_init.c */
 #ifdef NSS_ENABLE_ECC
 #define ciphernum 48
 #else
 #define ciphernum 23
 #endif
 
+#define PK11_SETATTRS(x,id,v,l) \
+	do { \
+		(x)->type = (id); \
+		(x)->pValue=(v); \
+		(x)->ulValueLen = (l); \
+	} while (0)
+
+#define CERT_NewTempCertificate __CERT_NewTempCertificate
+
 enum sslversion { SSL2 = 1, SSL3 = 2, TLS = 4 };
 
+pphrase_arg_t *parg = NULL;
+
 cipher_s cipherlist[ciphernum] = {
   /* SSL2 cipher suites */
   {"rc4", SSL_EN_RC4_128_WITH_MD5, SSL2},
@@ -154,6 +174,9 @@ cipher_s cipherlist[ciphernum] = {
 #endif
 };
 
+const char* pem_library = "libnsspem.so";
+static SECMODModule* mod = NULL;
+
 static SECStatus set_ciphers(struct SessionHandle *data, PRFileDesc * model,
                              char *cipher_list)
 {
@@ -197,9 +220,7 @@ static SECStatus set_ciphers(struct Sess
     }
 
     if(found == PR_FALSE) {
-      char buf[1024];
-      snprintf(buf, 1024, "Unknown cipher in list: %s", cipher);
-      failf(data, buf);
+      failf(data, "Unknown cipher in list: %s", cipher);
       return SECFailure;
     }
 
@@ -220,27 +241,240 @@ static SECStatus set_ciphers(struct Sess
   return SECSuccess;
 }
 
+/*
+ * Determine whether the nickname passed in is a filename that needs to
+ * be loaded as a PEM or a regular NSS nickname. 
+ *
+ * returns 1 for a file
+ * returns 0 for not a file (NSS nickname)
+ */
+static int is_file(const char *filename) {
+    struct stat st;
+
+    if (filename == NULL)
+      return 0;
+
+    if (stat(filename, &st) == 0) {
+      if (S_ISREG(st.st_mode))
+        return 1;
+    }
+    return 0;
+}
+
+static int
+nss_load_cert(struct SessionHandle *data, const char *filename, PRBool cacert)
+{
+  CERTCertificate *cert;
+  void *proto_win = NULL;
+  CK_SLOT_ID slotID;
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_BBOOL ckfalse = CK_FALSE;
+  CK_OBJECT_CLASS objClass = CKO_CERTIFICATE;
+  char *nickname = NULL;
+  char *slotname = NULL;
+  char *n;
+
+  /* If there is no slash in the filename it is assumed to be a regular
+   * NSS nickname.
+   */
+  if (is_file(filename)) {
+    n = strrchr(filename, '/');
+    if (n)
+      n++;
+  } else {
+    /* A nickname from the NSS internal database */
+    nickname = strdup(filename);
+    goto done;
+  }
+
+  attrs = theTemplate;
+
+  /* All CA and trust objects go into slot 0. Other slots are used
+   * for storing certificates. With each new user certificate we increment
+   * the slot count. We only support 1 user certificate right now.
+   */
+  if (cacert) {
+    slotID = 0;
+  } else {
+    slotID = 1;
+  } 
+  
+  slotname = (char *)malloc(SLOTSIZE);
+  nickname = (char *)malloc(PATH_MAX);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+  snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", slotID, n);
+
+  slot = PK11_FindSlotByName(slotname);
+  
+  if (!slot) {
+    free(slotname);
+    free(nickname);
+    return 0;
+  }
+  
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)filename, strlen(filename)+1); attrs++;
+  if (cacert) {
+    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  } else {
+    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) ); attrs++;
+  }
+
+  /* This load the certificate in our PEM module into the appropriate
+   * slot.
+   */
+  rv = PK11_CreateGenericObject(slot, theTemplate, 4, PR_FALSE /* isPerm */);
+
+  PK11_FreeSlot(slot);
+
+  free(slotname);
+  if (rv == NULL) {
+      free(nickname);
+      return 0;
+  }
+
+done:
+  /* Double-check that the certificate or nickname requested exists in
+   * either the token or the NSS certificate database.
+   */
+  if (!cacert) {
+    cert = PK11_FindCertFromNickname((char *)nickname, proto_win);
+
+    /* An invalid nickname was passed in */
+    if (cert == NULL) {
+      PR_SetError(SEC_ERROR_UNKNOWN_CERT, 0);
+      return 0;
+    }
+
+    CERT_DestroyCertificate(cert);
+  }
+  free(nickname);
+
+  return 1;
+}
+
+static int nss_load_key(char *key_file)
+{
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_OBJECT_CLASS objClass = CKO_PRIVATE_KEY;
+  CK_SLOT_ID slotID;
+  char *slotname = NULL;
+
+  attrs = theTemplate;
+
+  /* FIXME: grok the various file types */
+
+  /* FIXME: shouldn't be hardcoded */
+  slotID = 1;
+
+  slotname = (char *)malloc(SLOTSIZE);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+
+  slot = PK11_FindSlotByName(slotname);
+  free(slotname);
+
+  if (!slot) {
+    return 0;
+  }
+
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)key_file, 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) {
+    PR_SetError(SEC_ERROR_BAD_KEY, 0);
+    return 0;
+  }
+
+  /* This will force the token to be seen as re-inserted */
+  PK11_IsPresent(slot);
+
+  parg->retryCount = 0;
+  /* parg is initialized in nss_Init_Tokens() */
+  if (PK11_Authenticate(slot, PR_TRUE, parg) != SECSuccess) {
+    return 0;
+  }
+
+  return 1;
+}
+
+static int display_error(struct connectdata *conn, PRInt32 err, const char *filename) {
+  switch(err) {
+    case SEC_ERROR_BAD_PASSWORD:
+      failf(conn->data, "Unable to load client key: Incorrect password\n");
+      return 1;
+    case SEC_ERROR_UNKNOWN_CERT:
+      failf(conn->data, "Unable to load certificate %s\n", filename);
+      return 1;
+  }
+  return 0; /* The caller will print a generic error */
+}
+
+static int cert_stuff(struct connectdata *conn, char *cert_file, char *key_file)
+{
+  struct SessionHandle *data = conn->data;
+  int rv = 0;
+
+  if (cert_file)
+    rv = nss_load_cert(data, cert_file, PR_FALSE);  
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), cert_file))
+        failf(data, "Unable to load client cert %d.", PR_GetError());
+      return 0;
+    }
+  if (key_file || (is_file(cert_file) )) {
+    if (key_file)
+      rv = nss_load_key(key_file);
+    else
+      rv = nss_load_key(cert_file);
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), key_file))
+        failf(data, "Unable to load client key %d.", PR_GetError());
+
+      return 0;
+    }
+  }
+  return 1;
+}
+
 static char * nss_get_password(PK11SlotInfo * slot, PRBool retry, void *arg)
 {
   pphrase_arg_t *parg = (pphrase_arg_t *) arg;
-  (void)slot; /* unused */
-  (void)retry; /* unused */
+  parg->retryCount++;
+  if (parg->retryCount > 2)
+    return NULL;
   if(parg->data->set.key_passwd)
     return (char *)PORT_Strdup((char *)parg->data->set.key_passwd);
   else
     return NULL;
 }
 
-static SECStatus nss_Init_Tokens(struct connectdata * conn)
+static char * nss_no_password(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+   return NULL;
+}
+
+static SECStatus nss_Init_Tokens(struct SessionHandle *data)
 {
   PK11SlotList *slotList;
   PK11SlotListElement *listEntry;
   SECStatus ret, status = SECSuccess;
-  pphrase_arg_t *parg;
 
-  parg = (pphrase_arg_t *) malloc(sizeof(*parg));
+  if (!parg)
+      parg = (pphrase_arg_t *) malloc(sizeof(*parg));
   parg->retryCount = 0;
-  parg->data = conn->data;
+  parg->data = data;
 
   PK11_SetPasswordFunc(nss_get_password);
 
@@ -253,10 +487,10 @@ static SECStatus nss_Init_Tokens(struct 
 
     if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {
       if(slot == PK11_GetInternalKeySlot()) {
-        failf(conn->data, "The NSS database has not been initialized.\n");
+        failf(data, "The NSS database has not been initialized.\n");
       }
       else {
-        failf(conn->data, "The token %s has not been initialized.",
+        failf(data, "The token %s has not been initialized.",
               PK11_GetTokenName(slot));
       }
       PK11_FreeSlot(slot);
@@ -265,6 +499,8 @@ static SECStatus nss_Init_Tokens(struct 
 
     ret = PK11_Authenticate(slot, PR_TRUE, parg);
     if(SECSuccess != ret) {
+      if (PR_GetError() == SEC_ERROR_BAD_PASSWORD)
+        infof(data, "The password for token '%s' is incorrect\n", PK11_GetTokenName(slot));
       status = SECFailure;
       break;
     }
@@ -272,15 +508,59 @@ static SECStatus nss_Init_Tokens(struct 
     PK11_FreeSlot(slot);
   }
 
-  free(parg);
   return status;
 }
 
 static SECStatus BadCertHandler(void *arg, PRFileDesc * socket)
 {
   SECStatus success = SECSuccess;
-  (void)arg;
-  (void)socket;
+  struct connectdata *conn = (struct connectdata *)arg;
+  PRErrorCode err = PR_GetError();
+  CERTCertificate *cert = NULL;
+  char *subject, *issuer;
+
+  if (verify_done)
+      return success;
+
+  verify_done = 1;
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  CERT_DestroyCertificate(cert);
+
+  switch(err) {
+  case SEC_ERROR_CA_CERT_INVALID:
+    infof(conn->data, "Issuer certificate is invalid: '%s'\n", issuer);
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    break;
+  case SEC_ERROR_UNTRUSTED_ISSUER:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Certificate is signed by an untrusted issuer: '%s'\n", issuer);
+    break;
+  case SSL_ERROR_BAD_CERT_DOMAIN:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "common name: %s (does not match '%s')\n",
+          subject, conn->host.dispname);
+    break;
+  case SEC_ERROR_EXPIRED_CERTIFICATE:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Remote Certificate has expired.\n");
+    break;
+  default:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Bad certificate received. Subject = '%s', Issuer = '%s'\n", subject, issuer);
+    break;
+  }
+  if (success == SECSuccess)
+    infof(conn->data, "SSL certificate verify ok.\n");
+  PR_Free(subject);
+  PR_Free(issuer);
+  curlerr = CURLE_SSL_CACERT;
 
   return success;
 }
@@ -295,6 +575,52 @@ static SECStatus HandshakeCallback(PRFil
   return SECSuccess;
 }
 
+static void display_conn_info(struct connectdata *conn, PRFileDesc * socket)
+{
+  SSLChannelInfo channel;
+  SSLCipherSuiteInfo suite;
+  CERTCertificate *cert;
+  char *subject, *issuer, *common_name;
+  PRExplodedTime printableTime;
+  char timeString[256];
+  PRTime notBefore, notAfter;
+
+  if (SSL_GetChannelInfo(socket, &channel, sizeof channel) ==
+    SECSuccess && channel.length == sizeof channel &&
+    channel.cipherSuite) {
+    if (SSL_GetCipherSuiteInfo(channel.cipherSuite,
+      &suite, sizeof suite) == SECSuccess) {
+      infof(conn->data, "SSL connection using %s\n", suite.cipherSuiteName);
+    }
+  }
+
+  infof(conn->data, "Server certificate:\n");
+
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  common_name = CERT_GetCommonName(&cert->subject);
+  infof(conn->data, "\tsubject: %s\n", subject);
+
+  CERT_GetCertTimes(cert, &notBefore, &notAfter);
+  PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\tstart date: %s\n", timeString);
+  PR_ExplodeTime(notAfter, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\texpire date: %s\n", timeString);
+  infof(conn->data, "\tcommon name: %s\n", common_name);
+  infof(conn->data, "\tissuer: %s\n", issuer);
+
+  PR_Free(subject);
+  PR_Free(issuer);
+  PR_Free(common_name);
+
+  CERT_DestroyCertificate(cert);
+
+  return;
+}
+
 /**
  *
  * Callback to pick the SSL client certificate.
@@ -309,24 +635,42 @@ static SECStatus SelectClientCert(void *
   char *nickname = (char *)arg;
   void *proto_win = NULL;
   SECStatus secStatus = SECFailure;
+  PK11SlotInfo *slot;
   (void)caNames;
 
   proto_win = SSL_RevealPinArg(socket);
 
+  if (!nickname)
+    return secStatus;
+
   cert = PK11_FindCertFromNickname(nickname, proto_win);
   if(cert) {
-    privKey = PK11_FindKeyByAnyCert(cert, proto_win);
-    if(privKey) {
-      secStatus = SECSuccess;
-    }
-    else {
-      CERT_DestroyCertificate(cert);
+
+    if (!strncmp(nickname, "PEM Token", 9)) {
+      CK_SLOT_ID slotID = 1; /* hardcoded for now */
+      char * slotname = (char *)malloc(SLOTSIZE);
+      snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+      slot = PK11_FindSlotByName(slotname);
+      privKey = PK11_FindPrivateKeyFromCert(slot, cert, NULL);
+      PK11_FreeSlot(slot);
+      free(slotname);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
+    } else {
+      privKey = PK11_FindKeyByAnyCert(cert, proto_win);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
     }
   }
 
   if(secStatus == SECSuccess) {
     *pRetCert = cert;
     *pRetKey = privKey;
+  } else {
+    if (cert)
+      CERT_DestroyCertificate(cert);
   }
 
   return secStatus;
@@ -397,6 +741,8 @@ void Curl_nss_close(struct connectdata *
     }
     connssl->use = FALSE; /* get back to ordinary socket usage */
   }
+  if (select_nickname)
+    free(select_nickname);
 }
 
 /*
@@ -418,31 +764,52 @@ CURLcode Curl_nss_connect(struct connect
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   SECStatus rv;
-  int curlerr = CURLE_SSL_CONNECT_ERROR;
+  char *configstring = NULL;
+  char *certDir = NULL;
+
+  curlerr = CURLE_SSL_CONNECT_ERROR;
+  certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
+
+  if (!certDir) {
+    struct stat st;
+
+    if (stat(SSL_DIR, &st) == 0)
+      if (S_ISDIR(st.st_mode)) {
+        certDir = "/etc/pki/nssdb";
+      }
+  }
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   if(!initialized) {
-    if(!data->set.ssl.CAfile) {
-      if(data->set.ssl.verifypeer) {
-        failf(data, "No NSS cacert database specified.");
-        return CURLE_SSL_CACERT_BADFILE;
-      }
-      else {
-        rv = NSS_NoDB_Init(NULL);
-        noverify = 1;
-      }
+    if(!certDir) {
+      rv = NSS_NoDB_Init(NULL);
     }
     else {
-      rv = NSS_Initialize(data->set.ssl.CAfile, NULL, NULL, "secmod.db",
+      rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
                           NSS_INIT_READONLY);
     }
     if(rv != SECSuccess) {
       curlerr = CURLE_SSL_CACERT_BADFILE;
       goto error;
     }
-  }
+    configstring = (char *)malloc(4096);
+
+    NSS_SetDomesticPolicy();
 
-  NSS_SetDomesticPolicy();
+    PR_snprintf(configstring, 4096, "library=%s name=PEM", pem_library);
+//    PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"NSS=\"trustorder=75\"\"", pem_library);
+//     PR_snprintf(configstring, 4096, "library=/usr/lib/libnsspem.so name=PEM parameters=\"/etc/pki/tls/certs/ca-bundle.crt\" NSS=\"trustorder=75\"");
+
+    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!mod || !mod->loaded) {
+      if (mod) {
+        SECMOD_DestroyModule(mod);
+        mod = NULL;
+      }
+      infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL PEM certificates will not work.\n", pem_library);
+    }
+    free(configstring);
+  }
 
   model = PR_NewTCPSocket();
   if(!model)
@@ -482,26 +849,92 @@ CURLcode Curl_nss_connect(struct connect
     goto error;
 
   if(data->set.ssl.cipher_list) {
-    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess)
+    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess) {
+      curlerr = CURLE_SSL_CIPHER;
       goto error;
+    }
   }
 
-  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, NULL)
-     != SECSuccess)
+  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
+     != SECSuccess) {
     goto error;
+  }
   if(SSL_HandshakeCallback(model, (SSLHandshakeCallback) HandshakeCallback,
                            NULL) != SECSuccess)
     goto error;
 
+  if (mod && data->set.ssl.CAfile) {
+    rv = nss_load_cert(data, data->set.ssl.CAfile, PR_TRUE);
+  } else if (data->set.ssl.CApath) {
+    struct stat st;
+    PRDir      *dir;
+    PRDirEntry *entry;
+
+    if (stat(data->set.ssl.CApath, &st) == -1)
+      curlerr = CURLE_SSL_CACERT_BADFILE;
+      goto error;
+
+    if (S_ISDIR(st.st_mode)) {
+      dir = PR_OpenDir(data->set.ssl.CApath);
+      int rv;
+      do {
+        entry = PR_ReadDir(dir, PR_SKIP_BOTH | PR_SKIP_HIDDEN);
+
+        if (entry) {
+          char fullpath[PATH_MAX];
+
+          snprintf(fullpath, sizeof(fullpath), "%s/%s", data->set.ssl.CApath, entry->name);
+          rv = nss_load_cert(data, fullpath, PR_TRUE);
+        }
+      /* This is purposefully tolerant of errors so non-PEM files
+       * can be in the same directory */
+      } while (entry != NULL);
+      PR_CloseDir(dir);
+    }
+  }
+  infof(data,
+        "  CAfile: %s\n"
+        "  CApath: %s\n",
+        data->set.ssl.CAfile ? data->set.ssl.CAfile : "none",
+        data->set.ssl.CApath ? data->set.ssl.CApath : "none");
+
   if(data->set.cert) {
+    char * n;
+    char * nickname;
+
+    nickname = (char *)malloc(PATH_MAX);
+    if (is_file(data->set.cert)) {
+      n = strrchr(data->set.cert, '/');
+      if (n) {
+          n++; /* skip last slash */
+          snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", 1, n);
+      }
+    } else {
+        strncpy(nickname, data->set.cert, PATH_MAX);
+    }
+    if(nss_Init_Tokens(conn->data) != SECSuccess) {
+      free(nickname);
+      goto error;
+    }
+    if (!cert_stuff(conn, data->set.cert, data->set.key)) {
+      /* failf() is already done in cert_stuff() */
+      free(nickname);
+      return CURLE_SSL_CERTPROBLEM;
+    }
+
+    select_nickname = strdup(nickname);
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)data->set.cert) != SECSuccess) {
+                                 (void *)select_nickname) != SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }
-    if(nss_Init_Tokens(conn) != SECSuccess)
-      goto error;
+
+    free(nickname);
+    free(parg);
+
+    /* No longer return the password, lets us free parg */
+    PK11_SetPasswordFunc(nss_no_password);
   }
 
   /* Import our model socket  onto the existing file descriptor */
@@ -509,6 +942,7 @@ CURLcode Curl_nss_connect(struct connect
   connssl->handle = SSL_ImportFD(model, connssl->handle);
   if(!connssl->handle)
     goto error;
+  PR_Close(model); /* We don't need this any more */
 
   /* Force handshake on next I/O */
   SSL_ResetHandshake(connssl->handle, /* asServer */ PR_FALSE);
@@ -518,14 +952,17 @@ CURLcode Curl_nss_connect(struct connect
   /* Force the handshake now */
   if (SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
-      != SECSuccess)
+      != SECSuccess) {
     goto error;
+  }
+
+  display_conn_info(conn, connssl->handle);
 
   return CURLE_OK;
 
 error:
   err = PR_GetError();
-  failf(data, "NSS error %d", err);
+  infof(data, "NSS error %d\n", err);
   if(model)
     PR_Close(model);
   return curlerr;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Apr 2007 18:20:54 -0000	1.24
+++ .cvsignore	12 Sep 2007 17:16:35 -0000	1.25
@@ -1,5 +1 @@
-curl-7.15.4.tar.bz2
-curl-7.15.5.tar.bz2
-curl-7.16.0.tar.bz2
-curl-7.16.1.tar.bz2
-curl-7.16.2.tar.bz2
+curl-7.16.4.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/curl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- curl.spec	11 May 2007 12:07:53 -0000	1.49
+++ curl.spec	12 Sep 2007 17:16:35 -0000	1.50
@@ -1,19 +1,22 @@
-%define ldap_version 2.3
+# get the current ldap library version to link against automatically
+%define ldap_version %(readlink %{_libdir}/libldap.so | sed 's,.*libldap-\\([0-9.]*\\)\\.so\\..*,\\1,')
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.2
-Release: 3%{?dist}
+Version: 7.16.4
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-Patch0: curl-7.14.1-nousr.patch
-Patch1: curl-7.15.0-curl_config-version.patch
-Patch2: curl-7.15.3-multilib.patch
-Patch3: curl-7.16.0-privlibs.patch
+Patch1: curl-7.15.3-multilib.patch
+Patch2: curl-7.16.0-privlibs.patch
+Patch3: curl-7.16.4-ftp.patch
+Patch4: curl-7.16.4-nsspem.patch
+Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: nss-devel >= 3.11.7-7
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -25,7 +28,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel, libidn-devel, pkgconfig, automake
+Requires: libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -36,31 +39,31 @@
 
 %prep
 %setup -q 
-%patch0 -p1 -b .nousr
-%patch1 -p1 -b .ver
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .privlibs
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .privlibs
+%patch3 -p1 -b .ftp
+%patch4 -p1 -b .nsspem
 
 %build
-aclocal
-libtoolize --force
-./reconf
-
-if pkg-config openssl ; then
-	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
+if pkg-config nss ; then
+	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
 fi
-%configure --with-ssl=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
 	--with-lber-lib=liblber-%{ldap_version}.so.0 \
 	--disable-static
+sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
+	Makefile libcurl.pc
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
+
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
@@ -90,6 +93,7 @@
 %files devel
 %defattr(-,root,root)
 %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
+%doc docs/CONTRIBUTE
 %{_bindir}/curl-config*
 %{_includedir}/curl
 %{_libdir}/*.so
@@ -99,6 +103,45 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
+- provide webclient (#225671)
+
+* Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
+- add support for the NSS PKCS#11 pem reader so the command-line is the
+  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
+- switch to NSS again
+
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
+- revert back to use OpenSSL (#266021)
+
+* Mon Aug 27 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-3
+- don't use openssl, use nss instead
+
+* Fri Aug 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-2
+- fix anonymous ftp login (#251570), thanks to David Cantrell
+
+* Wed Jul 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-1
+- update to 7.16.4
+
+* Mon Jun 25 2007 Jindrich Novy <jnovy at redhat.com> 7.16.3-1
+- update to 7.16.3
+- drop .print patch, applied upstream
+- next series of merge review fixes by Paul Howarth
+- remove aclocal stuff, no more needed
+- simplify makefile arguments
+- don't reference standard library paths in libcurl.pc
+- include docs/CONTRIBUTE
+
+* Mon Jun 18 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-5
+- don't print like crazy (#236981), backported from upstream CVS
+
+* Fri Jun 15 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-4
+- another series of review fixes (#225671),
+  thanks to Paul Howarth
+- check version of ldap library automatically
+- don't use %%makeinstall and preserve timestamps
+- drop useless patches
+
 * Fri May 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-3
 - add automake BR to curl-devel to fix aclocal dir. ownership,
   thanks to Patrice Dumas


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Apr 2007 18:20:54 -0000	1.25
+++ sources	12 Sep 2007 17:16:35 -0000	1.26
@@ -1,2 +1 @@
-acdab0b0467c55e10ed02d2afed80575  curl-7.16.1.tar.bz2
-37a1de15c4300ca9413d39d2bcea9b36  curl-7.16.2.tar.bz2
+ffa6d1f4e28ca493a43f9dc17882c4d8  curl-7.16.4.tar.bz2


--- curl-7.14.1-nousr.patch DELETED ---


--- curl-7.15.0-curl_config-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 17:17:27 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 12 Sep 2007 13:17:27 -0400
Subject: rpms/gdm/devel gdm-2.19.8-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.285, 1.286 gdm-2.19.6-change-defaults.patch, 1.3, NONE
Message-ID: <200709121717.l8CHHRkf011760@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11636

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.19.8-change-defaults.patch 
Removed Files:
	gdm-2.19.6-change-defaults.patch 
Log Message:
- Change default password character back to circle instead of
  asterisk (bug 287951)


gdm-2.19.8-change-defaults.patch:

--- NEW FILE gdm-2.19.8-change-defaults.patch ---
diff -up gdm-2.19.8/config/gdm.conf.in.change-defaults gdm-2.19.8/config/gdm.conf.in
--- gdm-2.19.8/config/gdm.conf.in.change-defaults	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/config/gdm.conf.in	2007-09-12 13:14:39.000000000 -0400
@@ -66,9 +66,9 @@ TimedLoginDelay=30
 # should leave this alone.
 #Chooser=@libexecdir@/gdmchooser
 
-# The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
-# to get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+# The greeter for attached (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@libexecdir@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,23 +78,23 @@ TimedLoginDelay=30
 # This is useful for enabling additional feature support e.g. GNOME
 # accessibility framework. Only "trusted" modules should be allowed to minimize
 # security holes
-#AddGtkModules=false
+AddGtkModules=true
 # By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
 # Default path for root.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # If you are having trouble with using a single server for a long time and want
 # GDM to kill/restart the server, turn this on.  On Solaris, this value is
 # always true and this configuration setting is ignored.
-#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@
+AlwaysRestartServer=true
 
 # User and group used for running GDM GUI applications.  By default this is set
 # to user "gdm" and group "gdm".  This user/group should have very limited
@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
 #
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-RebootCommand=@REBOOT_COMMAND@
-HaltCommand=@HALT_COMMAND@
-SuspendCommand=@SUSPEND_COMMAND@
+#
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
 
 # The following options specify how GDM system commands are supported.
 #
@@ -158,14 +158,14 @@ ServAuthDir=@authdir@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@gdmconfdir@/Xsession
+BaseXsession=/etc/X11/xinit/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
 # like /tmp if you don't want the authorizations to be in home directories.
@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession
 # is the home directory the UserAuthFBDir will still be used in case the home
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
 # behavior.
-UserAuthDir=
+UserAuthDir=/tmp
 # Fallback directory for writing authorization file if user's home directory
 # is not writable.
 UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
+#UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
-StandardXServer=@X_SERVER@
+StandardXServer=@X_SERVER@ -br
 # The maximum number of flexible X servers to run.
 #FlexibleXServers=5
 # And after how many minutes should we reap the flexible server if there is no
@@ -209,7 +209,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_
 #DoubleLoginWarning=true
 # Should a second login always resume the current session and switch VT's on
 # Linux and FreeBSD systems for console logins
-#AlwaysLoginCurrentSession=true
+AlwaysLoginCurrentSession=true
 
 # If true then the last login information is printed to the user before being
 # prompted for password.  While this gives away some info on what users are on
@@ -246,7 +246,7 @@ SecurityTokensDriver=
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
-AllowRoot=true
+AllowRoot=false
 # Allow login as root via XDMCP.  This value will be overridden and set to
 # false if the /etc/default/login file exists and contains
 # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
@@ -356,7 +356,7 @@ Enable=false
 #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
-#GtkTheme=Default
+GtkTheme=Clearlooks
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
 # this only affects the standard greeter as the graphical greeter does not yet
 # have this ability.
@@ -377,7 +377,7 @@ Enable=false
 # themed login (gdmgreeter).
 #
 # The standard login has a title bar that the user can move.
-#TitleBar=true
+TitleBar=false
 # Don't allow user to move the standard login window.  Only makes sense if
 # TitleBar is on.
 #LockPosition=false
@@ -395,13 +395,13 @@ Enable=false
 # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
 # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
 # greeter.
-Browser=false
+Browser=true
 # The default picture in the browser.
 #DefaultFace=@pixmapdir@/nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=500
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
 # by commas.
@@ -418,7 +418,7 @@ Browser=false
 # large numbers of users and this feature should not be used in such
 # environments.  The setting of IncludeAll does nothing if Include is set to a
 # non-empty value.
-#IncludeAll=false
+IncludeAll=true
 # If user or user.png exists in this dir it will be used as his picture.
 #GlobalFaceDir=@datadir@/pixmaps/faces/
 
@@ -427,7 +427,7 @@ Browser=false
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -474,8 +474,9 @@ DefaultRemoteWelcome=true
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
 # as the background color.
-BackgroundColor=#76848F
-GraphicalThemedColor=#76848F
+BackgroundColor=#20305a
+GraphicalThemedColor=#000000
+
 # XDMCP session should only get a color, this is the sanest setting since you
 # don't want to take up too much bandwidth
 #BackgroundRemoteOnlyColor=true
@@ -496,8 +497,8 @@ GraphicalThemedColor=#76848F
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
 # use this rather then just running an xterm from a script.
-#ShowGnomeFailsafeSession=true
-#ShowXtermFailsafeSession=true
+ShowGnomeFailsafeSession=false
+ShowXtermFailsafeSession=false
 # Normally there is a session type called 'Last' that is shown which refers to
 # the last session the user used.  If off, we will be in 'switchdesk' mode
 # where the session saving stuff is disabled in GDM
@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
 #Use24Clock=auto
 # Use circles in the password field.  Looks kind of cool actually, but only
 # works with certain fonts.
-#UseCirclesInEntry=false
+UseCirclesInEntry=true
 # Do not show any visible feedback in the password field. This is standard for
 # instance in console, xdm and ssh.
 #UseInvisibleInEntry=false
@@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
 # list then provide a list that is delimited by /: to the GraphicalThemes
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
+GraphicalTheme=FedoraFlyingHigh
 #GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
@@ -633,7 +634,7 @@ Gestures=false
 
 [server-Standard]
 name=Standard server
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
 flexible=true
 # Indicates that the X server should be started at a different process
 # priority.  Values can be any integer value accepted by the setpriority C


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- gdm.spec	7 Sep 2007 17:54:19 -0000	1.285
+++ gdm.spec	12 Sep 2007 17:16:53 -0000	1.286
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -55,7 +55,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.8-selinux.patch
 
-Patch100: gdm-2.19.6-change-defaults.patch
+Patch100: gdm-2.19.8-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -351,6 +351,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-4
+- Change default password character back to circle instead of
+  asterisk (bug 287951)
+
 * Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-3
 - rebuild --with-selinux
 


--- gdm-2.19.6-change-defaults.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 17:18:59 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 13:18:59 -0400
Subject: rpms/slingshot/devel slingshot, NONE, 1.1 slingshot-font-path.patch,
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709121718.l8CHIx6D011873@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/devel

Modified Files:
	.cvsignore sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 15:54:31 -0000	1.1
+++ .cvsignore	12 Sep 2007 17:18:26 -0000	1.2
@@ -0,0 +1 @@
+slingshot-0.8.1p.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	12 Sep 2007 17:18:26 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 17:22:36 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:22:36 -0700
Subject: [pkgdb] curl had groupAcl changed
Message-ID: <200709121722.l8CHMbqn024671@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has set the commit acl on curl (Fedora devel) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:24:30 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 10:24:30 -0700
Subject: [pkgdb] curl (Fedora OLPC, 2) updated by jkeating
Message-ID: <200709121724.l8CHOUqu024716@app3.fedora.phx.redhat.com>

Jesse Keating (jkeating) added a Fedora OLPC 2 branch for curl
Jesse Keating (jkeating) has set commit to Approved for cvsextras on curl (Fedora OLPC 2)
Jesse Keating (jkeating) has set build to Approved for cvsextras on curl (Fedora OLPC 2)
Jesse Keating (jkeating) has set checkout to Approved for cvsextras on curl (Fedora OLPC 2)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:27:16 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 13:27:16 -0400
Subject: rpms/slingshot/F-7 slingshot, NONE, 1.1 slingshot-font-path.patch, 
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709121727.l8CHRGqM012275@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12229

Modified Files:
	sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	12 Sep 2007 17:26:44 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:21 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:28:21 -0700
Subject: [pkgdb] curl Orphaned
Message-ID: <200709121728.l8CHSLki024777@app3.fedora.phx.redhat.com>

Package curl in Fedora OLPC 2 was orphaned by Jindrich Novy (jnovy)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:37 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 10:28:37 -0700
Subject: [pkgdb] curl (Fedora OLPC, 2) updated by jkeating
Message-ID: <200709121728.l8CHSbYl000813@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of curl in Fedora OLPC 2 to johnp

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:49 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:28:49 -0700
Subject: [pkgdb] curl had groupAcl changed
Message-ID: <200709121728.l8CHSnWa000819@app4.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has set the commit acl on curl (Fedora devel) to Denied for cvsextras

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:48:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:48:15 -0700
Subject: [pkgdb] rlwrap (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121748.l8CHmGNE000982@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for rlwrap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rlwrap (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rlwrap (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rlwrap (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:48:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:48:15 -0700
Subject: [pkgdb] rlwrap (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121748.l8CHmGSL000991@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for rlwrap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rlwrap (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rlwrap (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rlwrap (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:49:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:49:01 -0700
Subject: [pkgdb] gcin (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121749.l8CHn1dk025152@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for gcin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gcin (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gcin (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gcin (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:49:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:49:01 -0700
Subject: [pkgdb] gcin (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121749.l8CHn1b2025161@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gcin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gcin (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gcin (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gcin (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:50:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:50:07 -0700
Subject: [pkgdb] mach (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121750.l8CHo7Id001016@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for mach
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of mach in Fedora EPEL 5 to scop
Kevin Fenzi (kevin) approved watchbugzilla on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved watchcommits on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved commit on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved build on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved approveacls on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved checkout on mach (Fedora EPEL 5) for thomasvs

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



From fedora-extras-commits at redhat.com  Wed Sep 12 17:53:19 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 12 Sep 2007 13:53:19 -0400
Subject: rpms/ltrace/devel .cvsignore, 1.8, 1.9 ltrace.spec, 1.60,
	1.61 sources, 1.8, 1.9
Message-ID: <200709121753.l8CHrJ1A014122@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/ltrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14073

Modified Files:
	.cvsignore ltrace.spec sources 
Log Message:
* Wed Sep 12 2007 Petr Machata <pmachata at redhat.com> - 0.5-9.45svn
- cleanup spec
- resolves: #226109



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2006 12:02:36 -0000	1.8
+++ .cvsignore	12 Sep 2007 17:52:47 -0000	1.9
@@ -1 +1 @@
-ltrace-0.5.tar.gz
+ltrace-0.5-svn45.tar.gz


Index: ltrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ltrace.spec	16 Aug 2007 11:27:37 -0000	1.60
+++ ltrace.spec	12 Sep 2007 17:52:47 -0000	1.61
@@ -1,9 +1,19 @@
 Summary: Tracks runtime library calls from dynamically linked executables
 Name: ltrace
 Version: 0.5
-Release: 8.45svn%{?dist}
-URL: http://alioth.debian.org/projects/ltrace/
-Source: ltrace-0.5.tar.gz
+Release: 9.45svn%{?dist}
+URL: http://ltrace.alioth.debian.org/
+License: GPLv2+
+Group: Development/Debuggers
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: elfutils-libelf-devel dejagnu
+
+# Tarball generated from svn checkout.  To regenerate:
+# svn co svn://svn.debian.org/ltrace -r 45
+# cd ltrace/ltrace/trunk && ./autogen.sh && ./configure && make dist
+Source: ltrace-0.5-svn45.tar.gz
+
 Patch0: ltrace-0.4-exec.patch
 Patch1: ltrace-0.4-fork.patch
 Patch2: ltrace-0.5-opd.patch
@@ -18,11 +28,6 @@
 Patch11: ltrace-0.5-exec-tests.patch
 Patch12: ltrace-0.5-man.patch
 Patch13: ltrace-0.5-ia64-sigill.patch
-License: GPLv2+
-Group: Development/Debuggers
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: elfutils-libelf-devel dejagnu
 
 %description
 Ltrace is a debugging program which runs a specified command until the
@@ -53,13 +58,15 @@
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
+# This ugly hack is necessary to build and link files for correct
+# architecture.  It makes a difference on ppc.
 export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
-%configure CC="$CC" LDFLAGS="$LDFLAGS -Wl,-z,relro"
-make
+%configure CC="$CC"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{version}/ install
+make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} docdir=%{_docdir}/ltrace-%{version}/ install
 
 #%check
 #echo ====================TESTING=========================
@@ -72,11 +79,15 @@
 %files
 %defattr(-,root,root)
 %doc COPYING README TODO BUGS ChangeLog
-%{_prefix}/bin/ltrace
+%{_bindir}/ltrace
 %{_mandir}/man1/ltrace.1*
-%config(noreplace) /etc/ltrace.conf
+%config(noreplace) %{_sysconfdir}/ltrace.conf
 
 %changelog
+* Wed Sep 12 2007 Petr Machata <pmachata at redhat.com> - 0.5-9.45svn
+- cleanup spec
+- resolves: #226109
+
 * Thu Aug 16 2007 Petr Machata <pmachata at redhat.com> - 0.5-8.45svn
 - Fix licensing tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2006 12:02:37 -0000	1.8
+++ sources	12 Sep 2007 17:52:47 -0000	1.9
@@ -1 +1 @@
-9b96a0056e9ba88a54e938973bf83025  ltrace-0.5.tar.gz
+9b96a0056e9ba88a54e938973bf83025  ltrace-0.5-svn45.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:04:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:04:20 -0400
Subject: rpms/mediawiki/devel .cvsignore, 1.12, 1.13 mediawiki.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200709121804.l8CI4Ks8020444@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20417

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.10.2-36
- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Aug 2007 12:33:16 -0000	1.12
+++ .cvsignore	12 Sep 2007 18:03:47 -0000	1.13
@@ -1,2 +1,2 @@
-mediawiki-1.10.0.tar.gz
 mediawiki-1.9.1-commoncode.patch
+mediawiki-1.10.2.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mediawiki.spec	6 Aug 2007 13:22:13 -0000	1.17
+++ mediawiki.spec	12 Sep 2007 18:03:47 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.10.0
-Release: 35.0.1%{?dist}
+Version: 1.10.2
+Release: 36%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.mediawiki.org/
@@ -88,8 +88,11 @@
 /var/www/wiki/config/*
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.10.2-36
+- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Wed May  9 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.0-35
-- Update to 1.0.
+- Update to 1.10.0.
 
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34
 - Update to 1.9.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Aug 2007 12:33:16 -0000	1.12
+++ sources	12 Sep 2007 18:03:47 -0000	1.13
@@ -1,2 +1,2 @@
-78733fece881e7d3c2c1e6859493ed06  mediawiki-1.10.0.tar.gz
 d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
+f1a5659624444c7101f258c7d43b03a0  mediawiki-1.10.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:09:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Wed, 12 Sep 2007 11:09:45 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by toshio
Message-ID: <200709121809.l8CI9joG001254@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved watchcommits on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved commit on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved build on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved approveacls on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved checkout on xulrunner (Fedora devel) for stransky

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



From fedora-extras-commits at redhat.com  Wed Sep 12 18:11:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:11:25 -0400
Subject: rpms/mediawiki/F-7 .cvsignore, 1.11, 1.12 mediawiki.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200709121811.l8CIBPsY021372@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.9.4-35
- Update to 1.9.4 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Feb 2007 17:38:18 -0000	1.11
+++ .cvsignore	12 Sep 2007 18:10:52 -0000	1.12
@@ -1,2 +1,2 @@
-mediawiki-1.9.3.tar.gz
 mediawiki-1.9.1-commoncode.patch
+mediawiki-1.9.4.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/mediawiki.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mediawiki.spec	6 Aug 2007 13:22:11 -0000	1.17
+++ mediawiki.spec	12 Sep 2007 18:10:52 -0000	1.18
@@ -1,11 +1,11 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.9.3
-Release: 34.0.2%{?dist}
+Version: 1.9.4
+Release: 35%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://wikipedia.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/wikipedia/%{name}-%{version}.tar.gz
+Source0: http://download.wikimedia.org/mediawiki/1.9/%{name}-%{version}.tar.gz
 Patch0: mediawiki-1.9.1-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ocaml >= 3.06
@@ -88,11 +88,14 @@
 /var/www/wiki/config/*
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.9.4-35
+- Update to 1.9.4 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Mon Aug  6 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34.0.1
 - Bump release to please koji/CVS.
 
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34
-- Update to 1.9.4.
+- Update to 1.9.3.
 
 * Mon Feb  5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.2-33
 - Update to 1.9.2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Feb 2007 17:38:18 -0000	1.11
+++ sources	12 Sep 2007 18:10:52 -0000	1.12
@@ -1,2 +1,2 @@
-3b522510b3a80212ba8dcdc51c938128  mediawiki-1.9.3.tar.gz
 d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
+e97a74e17fe2f067b7c3fc040e1eddee  mediawiki-1.9.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:12:51 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Wed, 12 Sep 2007 11:12:51 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by toshio
Message-ID: <200709121812.l8CICp8x001287@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of xulrunner in Fedora devel to caillon

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



From fedora-extras-commits at redhat.com  Wed Sep 12 18:21:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:21:51 -0400
Subject: rpms/mediawiki/FC-6 .cvsignore, 1.8, 1.9 mediawiki.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200709121821.l8CILpOn023244@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23092

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.8.5-9
- Update to 1.8.5 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Feb 2007 12:24:32 -0000	1.8
+++ .cvsignore	12 Sep 2007 18:21:18 -0000	1.9
@@ -1 +1 @@
-mediawiki-1.8.4.tar.gz
+mediawiki-1.8.5.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mediawiki.spec	22 Feb 2007 12:24:32 -0000	1.13
+++ mediawiki.spec	12 Sep 2007 18:21:18 -0000	1.14
@@ -1,14 +1,14 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name: mediawiki
-Version: 1.8.4
-Release: 8%{?dist}
+Version: 1.8.5
+Release: 9%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
 License: GPL
 URL: http://www.mediawiki.org/
-Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz
+Source0: http://download.wikimedia.org/mediawiki/1.8/mediawiki-%{version}.tar.gz
 Source1: mediawiki-httpd.conf
 Source2: mediawiki-install.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.8.5-9
+- Update to 1.8.5 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.4-8
 - Update to 1.8.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Feb 2007 12:24:32 -0000	1.9
+++ sources	12 Sep 2007 18:21:18 -0000	1.10
@@ -1 +1 @@
-deda96c093bc0f16df5ded6228e6275a  mediawiki-1.8.4.tar.gz
+8521cad53aa4dbda59bfd7ef1cba2553  mediawiki-1.8.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:24:11 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 12 Sep 2007 14:24:11 -0400
Subject: fedora-security/audit fc7,1.98,1.99
Message-ID: <200709121824.l8CIOBi2023876@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23837/audit

Modified Files:
	fc7 
Log Message:
mediawiki cve name



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc7	12 Sep 2007 16:17:07 -0000	1.98
+++ fc7	12 Sep 2007 18:24:08 -0000	1.99
@@ -8,7 +8,7 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
-GENERIC-MAP-NOMATCH VULNERABLE (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Wed Sep 12 18:36:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 14:36:23 -0400
Subject: rpms/kernel/devel linux-2.6-acpi-git-ec-init-fixes.patch, NONE,
	1.1 linux-2.6-drivers-ssb-debug-revision.patch, NONE,
	1.1 kernel.spec, 1.158, 1.159
Message-ID: <200709121836.l8CIaNVV025565@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-git-ec-init-fixes.patch 
	linux-2.6-drivers-ssb-debug-revision.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- better debug message for SSB driver
- acpi: fix EC initialization (from linux-acpi.git)


linux-2.6-acpi-git-ec-init-fixes.patch:

--- NEW FILE linux-2.6-acpi-git-ec-init-fixes.patch ---
From: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Wed, 5 Sep 2007 23:56:38 +0000 (-0400)
Subject: ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one.
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=4c611060660f0de3e9b8f02df207312bc6f5c331

ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one.

ASUS notebooks have numerous problems with EC initialization
This patch tries to work around three known issues reported
in bugzilla 8598, 8709 and 8909/8919.

Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3f7935a..9cd7997 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -121,6 +121,7 @@ static struct acpi_ec {
 	atomic_t event_count;
 	wait_queue_head_t wait;
 	struct list_head list;
+	u8 handlers_installed;
 } *boot_ec, *first_ec;
 
 /* --------------------------------------------------------------------------
@@ -680,32 +681,50 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 	status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
 	if (ACPI_FAILURE(status))
 		return status;
-
 	/* Find and register all query methods */
 	acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
 			    acpi_ec_register_query_methods, ec, NULL);
-
 	/* Use the global lock for all EC transactions? */
 	acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
-
 	ec->handle = handle;
-
-	printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
-			  ec->gpe, ec->command_addr, ec->data_addr);
-
 	return AE_CTRL_TERMINATE;
 }
 
+static void ec_remove_handlers(struct acpi_ec *ec)
+{
+	if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
+				ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
+		printk(KERN_ERR PREFIX "failed to remove space handler\n");
+	if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
+				&acpi_ec_gpe_handler)))
+		printk(KERN_ERR PREFIX "failed to remove gpe handler\n");
+	ec->handlers_installed = 0;
+}
+
 static int acpi_ec_add(struct acpi_device *device)
 {
 	struct acpi_ec *ec = NULL;
 
 	if (!device)
 		return -EINVAL;
-
 	strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
+	/* Check for boot EC */
+	if (boot_ec) {
+		if (boot_ec->handle == device->handle) {
+			/* Pre-loaded EC from DSDT, just move pointer */
+			ec = boot_ec;
+			boot_ec = NULL;
+			goto end;
+		} else if (boot_ec->handle == ACPI_ROOT_OBJECT) {
+			/* ECDT-based EC, time to shut it down */
+			ec_remove_handlers(boot_ec);
+			kfree(boot_ec);
+			first_ec = boot_ec = NULL;
+		}
+	}
+
 	ec = make_acpi_ec();
 	if (!ec)
 		return -ENOMEM;
@@ -715,25 +734,14 @@ static int acpi_ec_add(struct acpi_device *device)
 		kfree(ec);
 		return -EINVAL;
 	}
-
-	/* Check if we found the boot EC */
-	if (boot_ec) {
-		if (boot_ec->gpe == ec->gpe) {
-			/* We might have incorrect info for GL at boot time */
-			mutex_lock(&boot_ec->lock);
-			boot_ec->global_lock = ec->global_lock;
-			/* Copy handlers from new ec into boot ec */
-			list_splice(&ec->list, &boot_ec->list);
-			mutex_unlock(&boot_ec->lock);
-			kfree(ec);
-			ec = boot_ec;
-		}
-	} else
-		first_ec = ec;
 	ec->handle = device->handle;
+      end:
+	if (!first_ec)
+		first_ec = ec;
 	acpi_driver_data(device) = ec;
-
 	acpi_ec_add_fs(device);
+	printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
+			  ec->gpe, ec->command_addr, ec->data_addr);
 	return 0;
 }
 
@@ -756,10 +764,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
 	acpi_driver_data(device) = NULL;
 	if (ec == first_ec)
 		first_ec = NULL;
-
-	/* Don't touch boot EC */
-	if (boot_ec != ec)
-		kfree(ec);
+	kfree(ec);
 	return 0;
 }
 
@@ -789,6 +794,8 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
 static int ec_install_handlers(struct acpi_ec *ec)
 {
 	acpi_status status;
+	if (ec->handlers_installed)
+		return 0;
 	status = acpi_install_gpe_handler(NULL, ec->gpe,
 					  ACPI_GPE_EDGE_TRIGGERED,
 					  &acpi_ec_gpe_handler, ec);
@@ -807,6 +814,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
 		return -ENODEV;
 	}
 
+	ec->handlers_installed = 1;
 	return 0;
 }
 
@@ -823,41 +831,22 @@ static int acpi_ec_start(struct acpi_device *device)
 	if (!ec)
 		return -EINVAL;
 
-	/* Boot EC is already working */
-	if (ec != boot_ec)
-		ret = ec_install_handlers(ec);
+	ret = ec_install_handlers(ec);
 
 	/* EC is fully operational, allow queries */
 	atomic_set(&ec->query_pending, 0);
-
 	return ret;
 }
 
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
-	acpi_status status;
 	struct acpi_ec *ec;
-
 	if (!device)
 		return -EINVAL;
-
 	ec = acpi_driver_data(device);
 	if (!ec)
 		return -EINVAL;
-
-	/* Don't touch boot EC */
-	if (ec == boot_ec)
-		return 0;
-
-	status = acpi_remove_address_space_handler(ec->handle,
-						   ACPI_ADR_SPACE_EC,
-						   &acpi_ec_space_handler);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
-
-	status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
+	ec_remove_handlers(ec);
 
 	return 0;
 }
@@ -877,7 +866,7 @@ int __init acpi_ec_ecdt_probe(void)
 	status = acpi_get_table(ACPI_SIG_ECDT, 1,
 				(struct acpi_table_header **)&ecdt_ptr);
 	if (ACPI_SUCCESS(status)) {
-		printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n\n");
+		printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
 		boot_ec->command_addr = ecdt_ptr->control.address;
 		boot_ec->data_addr = ecdt_ptr->data.address;
 		boot_ec->gpe = ecdt_ptr->gpe;
@@ -899,7 +888,6 @@ int __init acpi_ec_ecdt_probe(void)
       error:
 	kfree(boot_ec);
 	boot_ec = NULL;
-
 	return -ENODEV;
 }
 

linux-2.6-drivers-ssb-debug-revision.patch:

--- NEW FILE linux-2.6-drivers-ssb-debug-revision.patch ---
---
 drivers/ssb/main.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ssb/main.c
+++ linux-2.6.22.noarch/drivers/ssb/main.c
@@ -884,6 +884,8 @@ static u32 ssb_tmslow_reject_bitmask(str
 	case SSB_IDLOW_SSBREV_23:
 		return SSB_TMSLOW_REJECT_23;
 	default:
+		printk(KERN_ERR "ssb: rev %x\n", 
+		       ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV);
 		WARN_ON(1);
 	}
 	return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kernel.spec	12 Sep 2007 00:16:26 -0000	1.158
+++ kernel.spec	12 Sep 2007 18:35:50 -0000	1.159
@@ -632,6 +632,7 @@
 Patch690: git-wireless-dev.patch
 Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
+Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
 Patch711: linux-2.6-netdev-e1000e-02.patch
 Patch712: linux-2.6-netdev-e1000e-03.patch
@@ -643,6 +644,7 @@
 Patch718: linux-2.6-netdev-e1000e-09.patch
 Patch719: linux-2.6-netdev-e1000e-10.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
+Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
@@ -1138,6 +1140,9 @@
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 
+# debug the SSB driver
+ApplyPatch linux-2.6-drivers-ssb-debug-revision.patch
+
 # latest Intel driver for ich9
 ApplyPatch linux-2.6-netdev-e1000e-01.patch
 ApplyPatch linux-2.6-netdev-e1000e-02.patch
@@ -1151,6 +1156,8 @@
 ApplyPatch linux-2.6-netdev-e1000e-10.patch
 
 # ACPI patches
+# fix EC init
+ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -1796,6 +1803,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- better debug message for SSB driver
+- acpi: fix EC initialization (from linux-acpi.git)
+
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#248532, #267161, #284311)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:49 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:49 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbnQf025776@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/EL-4

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:15:57 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:16 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:15:57 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:16 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:15:57 -0000	1.6
+++ sources	12 Sep 2007 18:37:16 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:52 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:52 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbq4w025783@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/EL-5

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:15:03 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:19 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:15:03 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:19 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:15:03 -0000	1.6
+++ sources	12 Sep 2007 18:37:19 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:54 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:54 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.6,1.7 mksh.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <200709121837.l8CIbsnn025792@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/F-7

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:12:41 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:22 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:12:41 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:22 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:12:41 -0000	1.6
+++ sources	12 Sep 2007 18:37:22 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:57 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:57 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbv2k025799@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/FC-6

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:13:49 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:25 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:13:49 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:25 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:13:49 -0000	1.6
+++ sources	12 Sep 2007 18:37:25 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:38:00 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:38:00 -0400
Subject: rpms/mksh/devel .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200709121838.l8CIc0jO025806@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/devel

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:11:32 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:27 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:11:32 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:27 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:11:32 -0000	1.6
+++ sources	12 Sep 2007 18:37:27 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:43:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:43:48 -0400
Subject: rpms/mach/devel mach.spec,1.15,1.16
Message-ID: <200709121843.l8CIhmrr026580@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26458

Modified Files:
	mach.spec 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
- Set default flavour to "epel" for EPEL builds.



Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/devel/mach.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mach.spec	8 Sep 2007 21:48:26 -0000	1.15
+++ mach.spec	12 Sep 2007 18:43:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mach
 Version:        0.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Make a chroot
 
 Group:          Applications/System
@@ -22,6 +22,13 @@
 BuildRequires:	gcc-c++
 BuildRequires:	libselinux-devel
 
+%if 0%{!?flavor:1}
+%if 0%{?rhel}
+%define flavor epel
+%else
+%define flavor updates
+%endif
+%endif
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
@@ -44,7 +51,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=updates
+	--with-flavor=%{flavor}
 make
 
 %install
@@ -96,6 +103,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
+- Set default flavour to "epel" for EPEL builds.
+
 * Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
 - Drop no longer needed (and failing) old ppc config bug workarounds.
 - Sync group creation scriptlet with current Fedora packaging guidelines.



From fedora-extras-commits at redhat.com  Wed Sep 12 18:45:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:45:35 -0400
Subject: rpms/mach/EL-5 .cvsignore, 1.4, 1.5 mach.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <200709121845.l8CIjZIg026811@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26712

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
Sync with devel for first EPEL build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2006 14:08:26 -0000	1.4
+++ .cvsignore	12 Sep 2007 18:45:03 -0000	1.5
@@ -1 +1 @@
-mach-0.9.0.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/mach.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mach.spec	7 Jan 2007 21:52:52 -0000	1.11
+++ mach.spec	12 Sep 2007 18:45:03 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           mach
-Version:        0.9.1
-Release:        1%{?dist}
-Summary:        make a chroot
+Version:        0.9.2
+Release:        3%{?dist}
+Summary:        Make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,6 +22,13 @@
 BuildRequires:	gcc-c++
 BuildRequires:	libselinux-devel
 
+%if 0%{!?flavor:1}
+%if 0%{?rhel}
+%define flavor epel
+%else
+%define flavor updates
+%endif
+%endif
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
@@ -44,7 +51,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=%{flavor}
 make
 
 %install
@@ -62,7 +69,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -96,6 +103,25 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
+- Set default flavour to "epel" for EPEL builds.
+
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
+- License: GPLv2+
+
+* Wed Jan 24 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.1-2
+- add ppc files
+
 * Sun Jan 07 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-1
 - new release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:52:52 -0000	1.6
+++ sources	12 Sep 2007 18:45:03 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 18:46:15 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 14:46:15 -0400
Subject: rpms/rarian/devel .cvsignore, 1.3, 1.4 rarian.spec, 1.8, 1.9 sources,
	1.3, 1.4 rarian-0.5.8-omfdir.patch, 1.1, NONE
Message-ID: <200709121846.l8CIkFma026945@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26817

Modified Files:
	.cvsignore rarian.spec sources 
Removed Files:
	rarian-0.5.8-omfdir.patch 
Log Message:

* Wed Sep 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-1
- Update to 0.6.0
- Remove patch for RH bug #254301 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Aug 2007 01:09:43 -0000	1.3
+++ .cvsignore	12 Sep 2007 18:45:42 -0000	1.4
@@ -1 +1 @@
-rarian-0.5.8.tar.bz2
+rarian-0.6.0.tar.bz2


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/rarian.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rarian.spec	30 Aug 2007 16:05:10 -0000	1.8
+++ rarian.spec	12 Sep 2007 18:45:42 -0000	1.9
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: rarian
-Version: 0.5.8
-Release: 3%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -10,11 +10,6 @@
 Source: http://ftp.gnome.org/pub/gnome/sources/rarian/0.5/rarian-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-### Patches ###
-
-# RH bug #254301
-Patch0: rarian-0.5.8-omfdir.patch
-
 ### Dependencies ###
 
 Requires: libxslt
@@ -57,7 +52,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .omfdir
 
 %build
 
@@ -101,6 +95,10 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Wed Sep 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-1
+- Update to 0.6.0
+- Remove patch for RH bug #254301 (fixed upstream).
+
 * Thu Aug 30 2007 Matthew Barnes <mbarnes at redhat.com> - 0.5.8-3
 - Add patch for RH bug #254301 (rarian-sk-config --omfdir).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Aug 2007 01:09:43 -0000	1.3
+++ sources	12 Sep 2007 18:45:42 -0000	1.4
@@ -1 +1 @@
-9afee4d25a10bd5310ee21e23a09d659  rarian-0.5.8.tar.bz2
+23772a3b0f882d13c86dd9fa67bb21bf  rarian-0.6.0.tar.bz2


--- rarian-0.5.8-omfdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 18:51:16 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 14:51:16 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.682, 1.683 kernel.spec, 1.159, 1.160 sources, 1.644,
	1.645 upstream, 1.566,
	1.567 linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 1.1, NONE
Message-ID: <200709121851.l8CIpG6A027661@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27546

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git1.bz2.sign 
Removed Files:
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git1



--- NEW FILE patch-2.6.23-rc6-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG549lyGugalF9Dw4RAmgyAJ9B4rsD4wngExP3q83SNgtpgVyQKwCfVI43
LUpC7rrh2Aya/8OACgxyaMA=
=sl7J
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- .cvsignore	11 Sep 2007 17:20:35 -0000	1.682
+++ .cvsignore	12 Sep 2007 18:50:43 -0000	1.683
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
+patch-2.6.23-rc6-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kernel.spec	12 Sep 2007 18:35:50 -0000	1.159
+++ kernel.spec	12 Sep 2007 18:50:43 -0000	1.160
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -670,7 +670,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
@@ -1206,9 +1205,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# fix oops in with sunrpc
-ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
-
 # fix x86_64 clock warping
 ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
@@ -1804,6 +1800,9 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git1
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - better debug message for SSB driver
 - acpi: fix EC initialization (from linux-acpi.git)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -r1.644 -r1.645
--- sources	11 Sep 2007 17:20:35 -0000	1.644
+++ sources	12 Sep 2007 18:50:43 -0000	1.645
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
+e989205bedc5a83a1d45c25f79adcb01  patch-2.6.23-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- upstream	11 Sep 2007 17:20:35 -0000	1.566
+++ upstream	12 Sep 2007 18:50:43 -0000	1.567
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
+patch-2.6.23-rc6-git1.bz2


--- linux-2.6-skb_copy_and_csum_datagram_iovec.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 19:09:36 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 15:09:36 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.19,1.20
Message-ID: <200709121909.l8CJ9ad0002709@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2615

Modified Files:
	gnash.spec 
Log Message:
- only enable gtk gui and disable opengl



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnash.spec	11 Sep 2007 18:21:35 -0000	1.19
+++ gnash.spec	12 Sep 2007 19:09:02 -0000	1.20
@@ -50,7 +50,7 @@
   --enable-sound=GST --enable-renderer=agg \
   --disable-dependency-tracking --disable-rpath \
   --with-extentions=gtk2 --disable-klash \
-  --enable-media=GST
+  --enable-media=GST --enable-gui="gtk"  --disable-glext
 
 make 
 



From fedora-extras-commits at redhat.com  Wed Sep 12 19:19:15 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Wed, 12 Sep 2007 15:19:15 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.8,1.9
Message-ID: <200709121919.l8CJJFj0003297@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3263

Modified Files:
	online-desktop.spec 
Log Message:
new upstream


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- online-desktop.spec	11 Sep 2007 21:33:22 -0000	1.8
+++ online-desktop.spec	12 Sep 2007 19:18:42 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.12
-Release:        2%{?dist}
+Version:        0.2.13
+Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
@@ -180,6 +180,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
 - require devilspie
 



From fedora-extras-commits at redhat.com  Wed Sep 12 19:19:48 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 15:19:48 -0400
Subject: rpms/ufsparse/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE sources, 1.9, NONE ufsparse.spec, 1.16, NONE
Message-ID: <200709121919.l8CJJmGg003360@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3349

Added Files:
	dead.package 
Removed Files:
	Makefile sources ufsparse.spec 
Log Message:
Making this a dead package.



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- sources DELETED ---


--- ufsparse.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 19:20:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 15:20:45 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.41,1.42
Message-ID: <200709121920.l8CJKjpL003410@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3385

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.5-76.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- em8300-kmod.spec	24 Aug 2007 06:20:35 -0000	1.41
+++ em8300-kmod.spec	12 Sep 2007 19:20:13 -0000	1.42
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-65.fc7}
+%{!?kversion: %define kversion 2.6.22.5-76.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.5-76.fc7.
+
 * Fri Aug 24 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-2
 - 0.16.3.
 - Build for kernel 2.6.22.4-65.fc7.



From fedora-extras-commits at redhat.com  Wed Sep 12 19:30:00 2007
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 12 Sep 2007 15:30:00 -0400
Subject: rpms/enigma/devel .cvsignore, 1.6, 1.7 enigma.spec, 1.18,
	1.19 sources, 1.6, 1.7
Message-ID: <200709121930.l8CJU0gB003642@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3620

Modified Files:
	.cvsignore enigma.spec sources 
Log Message:
* Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
- use the newly 64bit-clean upstream tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 May 2007 11:12:13 -0000	1.6
+++ .cvsignore	12 Sep 2007 19:29:27 -0000	1.7
@@ -1 +1 @@
-enigma-1.01.tar.gz
+enigma-1.01-64bit.tar.gz


Index: enigma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- enigma.spec	21 Aug 2007 16:13:42 -0000	1.18
+++ enigma.spec	12 Sep 2007 19:29:27 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           enigma
 Version:        1.01
-Release:        2.1
+Release:        3.1
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.nongnu.org/enigma/
-Source0:        http://download.berlios.de/enigma-game/enigma-1.01.tar.gz
+Source0:        http://download.berlios.de/enigma-game/enigma-1.01-64bit.tar.gz
 Patch0:         enigma-1.01-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +76,9 @@
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
+- use the newly 64bit-clean upstream tarball
+
 * Tue Aug 21 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-2.1
 - Remove version key from desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 May 2007 11:12:13 -0000	1.6
+++ sources	12 Sep 2007 19:29:27 -0000	1.7
@@ -1 +1 @@
-d3804534ac03425051ebfd383ed1b4ee  enigma-1.01.tar.gz
+d58af8a7201601dabc45dcedae5e2e91  enigma-1.01-64bit.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 19:50:57 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 15:50:57 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.20,1.21
Message-ID: <200709121950.l8CJovRZ004188@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4159

Modified Files:
	gnash.spec 
Log Message:
- rm -f the la files so we don';t get an error if they don't exist



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnash.spec	12 Sep 2007 19:09:02 -0000	1.20
+++ gnash.spec	12 Sep 2007 19:50:24 -0000	1.21
@@ -58,7 +58,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f \
  $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
  $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \



From fedora-extras-commits at redhat.com  Wed Sep 12 19:53:16 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 15:53:16 -0400
Subject: devel/pirut .cvsignore, 1.68, 1.69 pirut.spec, 1.71, 1.72 sources, 
	1.70, 1.71
Message-ID: <200709121953.l8CJrG7K004379@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
- Add multiple selection in package view (#266141)
- Make things like rpmnew/rpmsave more obvious to the user rather 
  than hidden (#229671)
- Use yum's transaction callback mechanism
- Show details on package list (#227362)
- Follow icon naming standard (#208698)
- Improve display of what's being downloaded with progress bar (#284301)
- Fix applying updates from puplet (#268141)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	7 Sep 2007 18:28:59 -0000	1.68
+++ .cvsignore	12 Sep 2007 19:52:44 -0000	1.69
@@ -1 +1 @@
-pirut-1.3.17.tar.gz
+pirut-1.3.18.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- pirut.spec	7 Sep 2007 18:28:59 -0000	1.71
+++ pirut.spec	12 Sep 2007 19:52:44 -0000	1.72
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.17
+Version: 1.3.18
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pygtk2 >= 2.9.2
 Requires: pygtk2-libglade, comps-extras, rhpl
-Requires: yum >= 3.2.4
+Requires: yum >= 3.2.5-2
 Requires: python-iniparse
 Requires: gnome-python2-gconf, notify-python
 Requires: usermode
@@ -68,7 +68,6 @@
 %{_datadir}/pirut/ui/*.glade
 %dir %{_datadir}/pirut/pixmaps
 %{_datadir}/pirut/pixmaps/*.png
-%{_datadir}/pixmaps/*png
 
 %{_mandir}/man8/pirut.8*
 %{_mandir}/man8/pup.8*
@@ -77,6 +76,16 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
+- Add multiple selection in package view (#266141)
+- Make things like rpmnew/rpmsave more obvious to the user rather 
+  than hidden (#229671)
+- Use yum's transaction callback mechanism
+- Show details on package list (#227362)
+- Follow icon naming standard (#208698)
+- Improve display of what's being downloaded with progress bar (#284301)
+- Fix applying updates from puplet (#268141)
+
 * Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
 - Catch another downloading error (#270201)
 - Handle errors a little better in puplet


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	7 Sep 2007 18:28:59 -0000	1.70
+++ sources	12 Sep 2007 19:52:44 -0000	1.71
@@ -1 +1 @@
-350e800d69a92d600ce76d552ebc31b7  pirut-1.3.17.tar.gz
+55618b3def8243c3d7aed4efd25a674b  pirut-1.3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 19:55:56 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 15:55:56 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 sugar-datastore.spec, 1.25, 1.26
Message-ID: <200709121955.l8CJtuBs004488@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4460

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Sep 2007 20:15:20 -0000	1.24
+++ .cvsignore	12 Sep 2007 19:55:23 -0000	1.25
@@ -1 +1 @@
-sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2
+sugar-datastore-0.2.2-git7655f4d99a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Sep 2007 20:15:20 -0000	1.24
+++ sources	12 Sep 2007 19:55:23 -0000	1.25
@@ -1 +1 @@
-b039a6ca3736f49a9c2ca305aea6446e  sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2
+f60a6cbcdccdbd84e18a39718fc3d57f  sugar-datastore-0.2.2-git7655f4d99a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-datastore.spec	11 Sep 2007 20:15:20 -0000	1.25
+++ sugar-datastore.spec	12 Sep 2007 19:55:23 -0000	1.26
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070911git
-%define commitid b0b4c4115a
+%define alphatag 20070912git
+%define commitid 7655f4d99a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.21.%{alphatag}b0b4c4115a
+Release: 0.22.%{alphatag}7655f4d99a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:00:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:00:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.49, 1.50 sources, 1.50,
	1.51 sugar.spec, 1.58, 1.59
Message-ID: <200709122000.l8CK0H0U004610@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	11 Sep 2007 20:43:40 -0000	1.49
+++ .cvsignore	12 Sep 2007 19:59:44 -0000	1.50
@@ -1 +1 @@
-sugar-0.65-git8b784a6223.tar.bz2
+sugar-0.65-git47f473189e.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	11 Sep 2007 20:43:40 -0000	1.50
+++ sources	12 Sep 2007 19:59:44 -0000	1.51
@@ -1 +1 @@
-db824af53d51c851dc8ca1d75484a317  sugar-0.65-git8b784a6223.tar.bz2
+235e143ab290c973169df6a7c195ee24  sugar-0.65-git47f473189e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sugar.spec	11 Sep 2007 20:43:40 -0000	1.58
+++ sugar.spec	12 Sep 2007 19:59:44 -0000	1.59
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070911git
-%define commitid 8b784a6223
+%define alphatag 20070912git
+%define commitid 47f473189e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.46.%{alphatag}8b784a6223
+Release: 0.47.%{alphatag}47f473189e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:03:08 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:03:08 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.20, 1.21 sources, 
	1.20, 1.21 sugar-presence-service.spec, 1.20, 1.21
Message-ID: <200709122003.l8CK38qX010706@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 Sep 2007 20:26:28 -0000	1.20
+++ .cvsignore	12 Sep 2007 20:02:34 -0000	1.21
@@ -1 +1 @@
-sugar-presence-service-0.65-gitbff163d57b.tar.bz2
+sugar-presence-service-0.65-gitb8d04713ac.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	11 Sep 2007 20:26:28 -0000	1.20
+++ sources	12 Sep 2007 20:02:34 -0000	1.21
@@ -1 +1 @@
-18de89aa92cbe6c8171113524488bb7f  sugar-presence-service-0.65-gitbff163d57b.tar.bz2
+ab6018517e2e67ab9435125ecbc1db38  sugar-presence-service-0.65-gitb8d04713ac.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar-presence-service.spec	11 Sep 2007 20:26:28 -0000	1.20
+++ sugar-presence-service.spec	12 Sep 2007 20:02:35 -0000	1.21
@@ -1,9 +1,9 @@
-%define alphatag 20070911git
-%define commitid bff163d57b
+%define alphatag 20070912git
+%define commitid b8d04713ac
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.15.%{alphatag}bff163d57b
+Release: 0.16.%{alphatag}b8d04713ac
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:08:28 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:08:28 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 sugar-artwork.spec, 1.25, 1.26
Message-ID: <200709122008.l8CK8Sa7010880@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	9 Sep 2007 05:00:09 -0000	1.24
+++ .cvsignore	12 Sep 2007 20:07:55 -0000	1.25
@@ -1,2 +1 @@
-sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
-sugar-artwork-0.34-git2e13ad392d.tar.bz2
+sugar-artwork-0.34-gite4fd20770c.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	9 Sep 2007 05:00:09 -0000	1.24
+++ sources	12 Sep 2007 20:07:55 -0000	1.25
@@ -1 +1 @@
-06860f882931ea996fd9e0af1ef0c591  sugar-artwork-0.34-git2e13ad392d.tar.bz2
+6a11672f84c158abf05c0ab4c99feb40  sugar-artwork-0.34-gite4fd20770c.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-artwork.spec	9 Sep 2007 05:00:09 -0000	1.25
+++ sugar-artwork.spec	12 Sep 2007 20:07:55 -0000	1.26
@@ -1,10 +1,10 @@
-%define alphatag 20070909git
-%define commitid 2e13ad392d
+%define alphatag 20070912git
+%define commitid e4fd20770c
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.25.%{alphatag}2e13ad392d
+Release: 0.26.%{alphatag}e4fd20770c
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:20:07 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 16:20:07 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.683, 1.684 kernel.spec, 1.160, 1.161 sources, 1.645,
	1.646 upstream, 1.567,
	1.568 linux-2.6-x86_64-vdso-fix-clock-masking.patch, 1.1,
	NONE patch-2.6.23-rc6-git1.bz2.sign, 1.1, NONE
Message-ID: <200709122020.l8CKK7JM012174@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11808

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git2.bz2.sign 
Removed Files:
	linux-2.6-x86_64-vdso-fix-clock-masking.patch 
	patch-2.6.23-rc6-git1.bz2.sign 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git2



--- NEW FILE patch-2.6.23-rc6-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6DhgyGugalF9Dw4RAmofAJkBhOfxZYxOnDTlwN+o4zvDdZS1lwCgh9nS
1+KI5dG97VSzSAk1AWHd76M=
=5wdd
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- .cvsignore	12 Sep 2007 18:50:43 -0000	1.683
+++ .cvsignore	12 Sep 2007 20:19:34 -0000	1.684
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git1.bz2
+patch-2.6.23-rc6-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kernel.spec	12 Sep 2007 18:50:43 -0000	1.160
+++ kernel.spec	12 Sep 2007 20:19:34 -0000	1.161
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -670,7 +670,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
 
@@ -1205,9 +1204,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# fix x86_64 clock warping
-ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1800,6 +1796,9 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git2
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git1
 
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -r1.645 -r1.646
--- sources	12 Sep 2007 18:50:43 -0000	1.645
+++ sources	12 Sep 2007 20:19:34 -0000	1.646
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-e989205bedc5a83a1d45c25f79adcb01  patch-2.6.23-rc6-git1.bz2
+6ecec0906f1becf844497493b14288df  patch-2.6.23-rc6-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- upstream	12 Sep 2007 18:50:43 -0000	1.567
+++ upstream	12 Sep 2007 20:19:34 -0000	1.568
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git1.bz2
+patch-2.6.23-rc6-git2.bz2


--- linux-2.6-x86_64-vdso-fix-clock-masking.patch DELETED ---


--- patch-2.6.23-rc6-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 20:21:38 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 12 Sep 2007 16:21:38 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.2,
	1.3 kernel-xen.spec, 1.52, 1.53
Message-ID: <200709122021.l8CKLcN6012697@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12115

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-xen.spec 
Log Message:
Disable CONFIG_HIGHPTE

Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
under Xen.




Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel-2.6.21-i686-xen.config	24 Jul 2007 14:13:44 -0000	1.2
+++ kernel-2.6.21-i686-xen.config	12 Sep 2007 20:21:05 -0000	1.3
@@ -212,7 +212,7 @@
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
-CONFIG_HIGHPTE=y
+# CONFIG_HIGHPTE is not set
 CONFIG_MTRR=y
 # CONFIG_SECCOMP is not set
 # CONFIG_HZ_100 is not set


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kernel-xen.spec	6 Sep 2007 19:22:17 -0000	1.52
+++ kernel-xen.spec	12 Sep 2007 20:21:05 -0000	1.53
@@ -2363,6 +2363,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
+  under Xen.
+
 * Thu Sep 06 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Include modules.block and modules.networking on the package (bug #280731)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:23:42 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 16:23:42 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.21,1.22
Message-ID: <200709122023.l8CKNghU012820@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11187

Modified Files:
	gnash.spec 
Log Message:
- fix more rm -f issues



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnash.spec	12 Sep 2007 19:50:24 -0000	1.21
+++ gnash.spec	12 Sep 2007 20:23:09 -0000	1.22
@@ -72,14 +72,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # don't package libltdl related files!
-rm \
+rm -f \
  $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
  $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
 # omf is broken
 rm -rf \
  $RPM_BUILD_ROOT/%{_datadir}/omf
 # cygnal just segfaults
-rm \
+rm -f \
  $RPM_BUILD_ROOT/%{_bindir}/cygnal
 
 %find_lang %{name}



From fedora-extras-commits at redhat.com  Wed Sep 12 20:26:38 2007
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 12 Sep 2007 16:26:38 -0400
Subject: fedora-security/audit fc7,1.99,1.100
Message-ID: <200709122026.l8CKQcKn012928@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12905

Modified Files:
	fc7 
Log Message:
Add some CVE ids



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc7	12 Sep 2007 18:24:08 -0000	1.99
+++ fc7	12 Sep 2007 20:26:35 -0000	1.100
@@ -8,6 +8,8 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
+CVE-2007-4841 ignore (mozilla suite) Windows only
+CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]



From fedora-extras-commits at redhat.com  Wed Sep 12 20:26:54 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 16:26:54 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200709122026.l8CKQs9l012940@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12876

Modified Files:
	python-memcached.spec sources 
Log Message:
Updating for 1.39 release build.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-memcached.spec	27 Jun 2007 02:45:56 -0000	1.1
+++ python-memcached.spec	12 Sep 2007 20:26:22 -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()")}
 
 Name:           python-memcached
-Version:        1.36
-Release:        3%{?dist}
+Version:        1.39
+Release:        1%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -40,6 +40,12 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
+- Update to 1.39 upstream release.
+
+* Sat Aug 11 2007 Sean Reifschneider <jafo at tummy.com> 1.38-1
+- Update to 1.38 upstream release.
+
 * Sun Jun 10 2007 Sean Reifschneider <jafo at tummy.com> 1.36-3
 - Changes based on feedback from Ruben Kerkhof:
 - Fixing license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2007 02:45:56 -0000	1.2
+++ sources	12 Sep 2007 20:26:22 -0000	1.3
@@ -1 +1 @@
-b5154b816e2dfd54dcd3264e16b3fa77  python-memcached-1.36.tar.gz
+403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 20:39:33 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 12 Sep 2007 16:39:33 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.3,
	1.4 kernel-xen.spec, 1.45, 1.46
Message-ID: <200709122039.l8CKdXIx014966@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14558

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-xen.spec 
Log Message:
Disable CONFIG_HIGHPTE

It is not reliable and causes performance loss under Xen.



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel-2.6.20-i686-xen.config	24 May 2007 16:16:28 -0000	1.3
+++ kernel-2.6.20-i686-xen.config	12 Sep 2007 20:39:00 -0000	1.4
@@ -3078,7 +3078,7 @@
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
 CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
+# CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_X86_PM_TIMER=y


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kernel-xen.spec	30 Aug 2007 22:30:57 -0000	1.45
+++ kernel-xen.spec	12 Sep 2007 20:39:00 -0000	1.46
@@ -2058,6 +2058,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable CONFIG_HIGHPTE. It is not reliable and causes performance loss
+  under Xen
+
 * Thu Aug 30 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Provides: xen-hypervisor-abi = 3.1 (bug #269581)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:49:17 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 16:49:17 -0400
Subject: devel/yum-updatesd yum-updatesd.spec,1.3,1.4
Message-ID: <200709122049.l8CKnHeN016955@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16935

Modified Files:
	yum-updatesd.spec 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-2
- require the yum-refresh-updatesd plugin so that we get kicked after 
  installs



Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-updatesd.spec	6 Sep 2007 14:33:56 -0000	1.3
+++ yum-updatesd.spec	12 Sep 2007 20:48:44 -0000	1.4
@@ -2,7 +2,7 @@
 Name: yum-updatesd
 Epoch: 1
 Version: 0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 BuildRequires: python
 Requires: python >= 2.4
 Requires: yum >= 3.2.0
+Requires: yum-refresh-updatesd
 Requires: dbus-python
 Requires: pygobject2
 Requires: gamin-python
@@ -61,6 +62,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-2
+- require the yum-refresh-updatesd plugin so that we get kicked after 
+  installs
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
 - add option for configurable SMTP server
 - fix email sending (Rich Fearn, #251196)



From fedora-extras-commits at redhat.com  Wed Sep 12 21:05:20 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 12 Sep 2007 17:05:20 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch, 1.2, 1.3 flac.spec, 1.31,
	1.32
Message-ID: <200709122105.l8CL5KdM026754@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719

Modified Files:
	flac-1.2.0-gnu-stack.patch flac.spec 
Log Message:
* Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
- Make a few functions hidden, to try and avoid textrels
- Disable optimisations on x86 for the same reason
  (#285961)


flac-1.2.0-gnu-stack.patch:

Index: flac-1.2.0-gnu-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac-1.2.0-gnu-stack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
+++ flac-1.2.0-gnu-stack.patch	12 Sep 2007 21:05:16 -0000	1.3
@@ -53,3 +53,38 @@
 -	section .note.GNU-stack noalloc
 -%endif
 +section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-07-23 17:14:35.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 18:15:30.000000000 +0100
+@@ -203,6 +203,7 @@ static FLaC__INLINE void crc16_update_wo
+ }
+ 
+ /* would be static except it needs to be called by asm routines */
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
+ {
+ 	unsigned start, end;
+diff -upr flac-1.2.0/src/libFLAC/crc.c flac-1.2.0.new/src/libFLAC/crc.c
+--- flac-1.2.0/src/libFLAC/crc.c	2007-02-02 06:58:22.000000000 +0000
++++ flac-1.2.0.new/src/libFLAC/crc.c	2007-09-12 18:13:44.000000000 +0100
+@@ -73,7 +73,7 @@ FLAC__byte const FLAC__crc8_table[256] =
+ };
+ 
+ /* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
+-
++__attribute__((__visibility__("hidden")))
+ unsigned FLAC__crc16_table[256] = {
+ 	0x0000,  0x8005,  0x800f,  0x000a,  0x801b,  0x001e,  0x0014,  0x8011,
+ 	0x8033,  0x0036,  0x003c,  0x8039,  0x0028,  0x802d,  0x8027,  0x0022,
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-09-12 18:17:56.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 19:09:00.000000000 +0100
+@@ -774,6 +774,7 @@ FLaC__INLINE FLAC__bool FLAC__bitreader_
+ }
+ #endif
+ 
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter)
+ {
+ 	FLAC__uint32 lsbs = 0, msbs = 0;
+


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- flac.spec	11 Sep 2007 14:25:48 -0000	1.31
+++ flac.spec	12 Sep 2007 21:05:16 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -36,8 +36,11 @@
 %patch1 -p1 -b .gnu-stack
 
 %build
-export XMMS_CONFIG=no # Disable XMMS
+%ifarch %{ix86}
+%configure --with-pic --disable-xmms-plugin --disable-asm-optimizations
+%else
 %configure --with-pic --disable-xmms-plugin
+%endif
 
 make %{?_smp_mflags}
 
@@ -72,6 +75,11 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
+- Make a few functions hidden, to try and avoid textrels
+- Disable optimisations on x86 for the same reason
+  (#285961)
+
 * Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
 - Update GNU stack patch to cover all the NASM sources used
 



From fedora-extras-commits at redhat.com  Wed Sep 12 21:41:10 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 17:41:10 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25, 
	1.26 telepathy-gabble.spec, 1.34, 1.35
Message-ID: <200709122141.l8CLfAxv027479@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27419

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	6 Sep 2007 19:10:58 -0000	1.25
+++ .cvsignore	12 Sep 2007 21:40:37 -0000	1.26
@@ -5,3 +5,4 @@
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
+telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	6 Sep 2007 19:10:58 -0000	1.25
+++ sources	12 Sep 2007 21:40:37 -0000	1.26
@@ -1 +1 @@
-6bf82d42255c15f819639c78765c27af  telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
+08c37009f68fe7a34f8c218a8c4ac3ca  telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- telepathy-gabble.spec	6 Sep 2007 19:10:58 -0000	1.34
+++ telepathy-gabble.spec	12 Sep 2007 21:40:37 -0000	1.35
@@ -1,19 +1,19 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070906darcs_olpctrial3a
+%define alphatag olpc_trial3a_20070912 
 
-%define telepathy_glibi_version 0.5.14
+%define telepathy_glib_version 0.5.14
 
 Name:           telepathy-gabble
 Version:        0.5.14.1
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.2.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc_trial3a_20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070912
+- New snapshot
+
 * Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:51 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:51 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLoppr002729@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora devel) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:52 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLoq7O002735@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora 7) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:55 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLouWe002741@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora 6) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Wed Sep 12 21:54:10 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Wed, 12 Sep 2007 17:54:10 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.66, 1.67 pykickstart.spec, 1.73,
	1.74 sources, 1.73, 1.74
Message-ID: <200709122154.l8CLsAWZ027881@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27854

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	4 Sep 2007 16:23:25 -0000	1.66
+++ .cvsignore	12 Sep 2007 21:53:38 -0000	1.67
@@ -1,2 +1,3 @@
 pykickstart-1.11.tar.gz
 pykickstart-1.12.tar.gz
+pykickstart-1.13.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pykickstart.spec	4 Sep 2007 16:23:25 -0000	1.73
+++ pykickstart.spec	12 Sep 2007 21:53:38 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.12
+Version: 1.13
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -38,10 +38,17 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING docs/programmers-guide
+%doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
 
 %changelog
+* Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
+- Add a function to convert URL method strings into repo objects
+  (jkeating).
+- Writer formatting fixes.
+- Add kickstart documentation from the Fedora Wiki.
+
 * Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
 - Fix lots of problems in processing the bootloader, device, network, and
   raid commands.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	4 Sep 2007 16:23:25 -0000	1.73
+++ sources	12 Sep 2007 21:53:38 -0000	1.74
@@ -1 +1 @@
-b623f52865d338ad158e3e03aac426bc  pykickstart-1.12.tar.gz
+5079ebf032b4c7f63f6fe7e3d70c81f5  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 22:07:10 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Wed, 12 Sep 2007 18:07:10 -0400
Subject: rpms/pykickstart/devel sources,1.74,1.75
Message-ID: <200709122207.l8CM7ALQ001831@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1793

Modified Files:
	sources 
Log Message:
Fix build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	12 Sep 2007 21:53:38 -0000	1.74
+++ sources	12 Sep 2007 22:06:37 -0000	1.75
@@ -1 +1 @@
-5079ebf032b4c7f63f6fe7e3d70c81f5  pykickstart-1.13.tar.gz
+806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 22:21:54 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Wed, 12 Sep 2007 18:21:54 -0400
Subject: rpms/msv/devel msv.spec,1.2,1.3
Message-ID: <200709122221.l8CMLs6g002231@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/msv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182

Modified Files:
	msv.spec 
Log Message:
Make package build with the latest gcj on ppc/ppc64



Index: msv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msv/devel/msv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- msv.spec	11 Sep 2007 23:04:28 -0000	1.2
+++ msv.spec	12 Sep 2007 22:21:21 -0000	1.3
@@ -37,7 +37,7 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.3%{?dist}
 Epoch:          1
 License:        BSD
 URL:            http://msv.dev.java.net
@@ -277,6 +277,16 @@
 
 ant release
 
+pushd msv/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
+pushd xsdlib/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -345,7 +355,7 @@
 
 %if %{gcj_support}
 #export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm --exclude usr/share/%{name}-%{version}/%{name}
+%{_bindir}/aot-compile-rpm 
 %endif
 
 %clean
@@ -473,6 +483,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matt Wringe <mwringe at redhat.com> 0:1,2-0.1.20050722.3jpp.3
+- Make package build with new gcj. Remove .class files from demo package and
+  remove demo exclude from aot-compile-rpm 
+
 * Tue Sep 11 2007 Matt Wringe <mwringe at redhat.com> 0:1.2-0.1.20050722.3jpp.2
 - Fix unowned directories
 - Change copyright files to utf-8 format



From fedora-extras-commits at redhat.com  Wed Sep 12 22:23:42 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 18:23:42 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.35,1.36
Message-ID: <200709122223.l8CMNgRV002387@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365

Modified Files:
	telepathy-gabble.spec 
Log Message:
- fix typo in tarball name



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- telepathy-gabble.spec	12 Sep 2007 21:40:37 -0000	1.35
+++ telepathy-gabble.spec	12 Sep 2007 22:23:09 -0000	1.36
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc_trial3a_20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc-trial3a-20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 22:35:04 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 18:35:04 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.36,1.37
Message-ID: <200709122235.l8CMZ4Eg002706@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2641

Modified Files:
	telepathy-gabble.spec 
Log Message:
- fix another typo



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- telepathy-gabble.spec	12 Sep 2007 22:23:09 -0000	1.36
+++ telepathy-gabble.spec	12 Sep 2007 22:34:31 -0000	1.37
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc-trial3a-20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 22:36:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 18:36:20 -0400
Subject: rpms/kernel/F-7 linux-2.6-sched-cfs-updates.patch, NONE,
	1.1 kernel-2.6.spec, 1.3339,
	1.3340 linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch, 1.2, 1.3
Message-ID: <200709122236.l8CMaKC3002792@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760

Modified Files:
	kernel-2.6.spec linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch 
Added Files:
	linux-2.6-sched-cfs-updates.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- update CFS scheduler


linux-2.6-sched-cfs-updates.patch:

--- NEW FILE linux-2.6-sched-cfs-updates.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Commit:     a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Parent:     7fd0d2dde929ead79901e389e70dbfb3c6c06986
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: fix niced_granularity() shift
    
    fix niced_granularity(). This resulted in under-scheduling for
    CPU-bound negative nice level tasks (and this in turn caused
    higher than necessary latencies in nice-0 tasks).
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index ce39282..810b52d 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -291,7 +291,7 @@ niced_granularity(struct sched_entity *curr, unsigned long granularity)
 	/*
 	 * It will always fit into 'long':
 	 */
-	return (long) (tmp >> WMULT_SHIFT);
+	return (long) (tmp >> (WMULT_SHIFT-NICE_0_SHIFT));
 }
 
 static inline void
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7fd0d2dde929ead79901e389e70dbfb3c6c06986
Commit:     7fd0d2dde929ead79901e389e70dbfb3c6c06986
Parent:     b21010ed6498391c0f359f2a89c907533fe07fec
Author:     Suresh Siddha <suresh.b.siddha at intel.com>
AuthorDate: Wed Sep 5 14:32:48 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:48 2007 +0200

    sched: fix MC/HT scheduler optimization, without breaking the FUZZ logic.
    
    First fix the check
    	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
    with this
    	if (*imbalance < busiest_load_per_task)
    
    As the current check is always false for nice 0 tasks (as
    SCHED_LOAD_SCALE_FUZZ is same as busiest_load_per_task for nice 0
    tasks).
    
    With the above change, imbalance was getting reset to 0 in the corner
    case condition, making the FUZZ logic fail. Fix it by not corrupting the
    imbalance and change the imbalance, only when it finds that the HT/MC
    optimization is needed.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index b533d6d..c8759ec 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2512,7 +2512,7 @@ group_next:
 	 * a think about bumping its value to force at least one task to be
 	 * moved
 	 */
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
+	if (*imbalance < busiest_load_per_task) {
 		unsigned long tmp, pwr_now, pwr_move;
 		unsigned int imbn;
 
@@ -2564,10 +2564,8 @@ small_imbalance:
 		pwr_move /= SCHED_LOAD_SCALE;
 
 		/* Move if we gain throughput */
-		if (pwr_move <= pwr_now)
-			goto out_balanced;
-
-		*imbalance = busiest_load_per_task;
+		if (pwr_move > pwr_now)
+			*imbalance = busiest_load_per_task;
 	}
 
 	return busiest;
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a206c07213cf6372289f189c3774c4c3255a7ae1
Commit:     a206c07213cf6372289f189c3774c4c3255a7ae1
Parent:     a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: debug: fix cfs_rq->wait_runtime accounting
    
    the cfs_rq->wait_runtime debug/statistics counter was not maintained
    properly - fix this.
    
    this also removes some code:
    
       text    data     bss     dec     hex filename
      13420     228    1204   14852    3a04 sched.o.before
      13404     228    1204   14836    39f4 sched.o.after
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
---
 kernel/sched.c      |    1 -
 kernel/sched_fair.c |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index c8759ec..97986f1 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -858,7 +858,6 @@ static void dec_nr_running(struct task_struct *p, struct rq *rq)
 
 static void set_load_weight(struct task_struct *p)
 {
-	task_rq(p)->cfs.wait_runtime -= p->se.wait_runtime;
 	p->se.wait_runtime = 0;
 
 	if (task_has_rt_policy(p)) {
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 810b52d..bac2aff 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -194,6 +194,8 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_load_add(&cfs_rq->load, se->load.weight);
 	cfs_rq->nr_running++;
 	se->on_rq = 1;
+
+	schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 }
 
 static inline void
@@ -205,6 +207,8 @@ __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_load_sub(&cfs_rq->load, se->load.weight);
 	cfs_rq->nr_running--;
 	se->on_rq = 0;
+
+	schedstat_add(cfs_rq, wait_runtime, -se->wait_runtime);
 }
 
 static inline struct rb_node *first_fair(struct cfs_rq *cfs_rq)
@@ -574,7 +578,6 @@ static void __enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
 
 	prev_runtime = se->wait_runtime;
 	__add_wait_runtime(cfs_rq, se, delta_fair);
-	schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 	delta_fair = se->wait_runtime - prev_runtime;
 
 	/*
@@ -662,7 +665,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 			if (tsk->state & TASK_UNINTERRUPTIBLE)
 				se->block_start = rq_of(cfs_rq)->clock;
 		}
-		cfs_rq->wait_runtime -= se->wait_runtime;
 #endif
 	}
 	__dequeue_entity(cfs_rq, se);
@@ -1121,10 +1123,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	 * The statistical average of wait_runtime is about
 	 * -granularity/2, so initialize the task with that:
 	 */
-	if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) {
+	if (sysctl_sched_features & SCHED_FEAT_START_DEBIT)
 		se->wait_runtime = -(sched_granularity(cfs_rq) / 2);
-		schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
-	}
 
 	__enqueue_entity(cfs_rq, se);
 }
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2491b2b89d4646e02ab51c90ab7012d124924ddc
Commit:     2491b2b89d4646e02ab51c90ab7012d124924ddc
Parent:     a206c07213cf6372289f189c3774c4c3255a7ae1
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: debug: fix sum_exec_runtime clearing
    
    when cleaning sched-stats also clear prev_sum_exec_runtime.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_debug.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index ab18f45..c3ee38b 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -283,4 +283,5 @@ void proc_sched_set_task(struct task_struct *p)
 	p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0;
 #endif
 	p->se.sum_exec_runtime = 0;
+	p->se.prev_sum_exec_runtime	= 0;
 }
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Commit:     7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Parent:     cf2ab4696ee42f895eed88c2b6e432fe03dda0db
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: simplify __check_preempt_curr_fair()
    
    Preparatory patch for fix-ideal-runtime:
    
    simplify __check_preempt_curr_fair(): get rid of the integer return.
    
       text    data     bss     dec     hex filename
      13404     228    1204   14836    39f4 sched.o.before
      13393     228    1204   14825    39e9 sched.o.after
    
    functionality is unchanged.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index bac2aff..f0dd4be 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -673,7 +673,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 /*
  * Preempt the current task with a newly woken task if needed:
  */
-static int
+static void
 __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 			  struct sched_entity *curr, unsigned long granularity)
 {
@@ -686,9 +686,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 	 */
 	if (__delta > niced_granularity(curr, granularity)) {
 		resched_task(rq_of(cfs_rq)->curr);
-		return 1;
+		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
 	}
-	return 0;
 }
 
 static inline void
@@ -764,8 +763,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	if (delta_exec > ideal_runtime)
 		gran = 0;
 
-	if (__check_preempt_curr_fair(cfs_rq, next, curr, gran))
-		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
+	__check_preempt_curr_fair(cfs_rq, next, curr, gran);
 }
 
 /**************************************************
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Commit:     4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Parent:     7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: improve prev_sum_exec_runtime setting
    
    Second preparatory patch for fix-ideal runtime:
    
    Mark prev_sum_exec_runtime at the beginning of our run, the same spot
    that adds our wait period to wait_runtime. This seems a more natural
    location to do this, and it also reduces the code a bit:
    
       text    data     bss     dec     hex filename
      13397     228    1204   14829    39ed sched.o.before
      13391     228    1204   14823    39e7 sched.o.after
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index f0dd4be..2d01bbc 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -684,10 +684,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 	 * preempt the current task unless the best task has
 	 * a larger than sched_granularity fairness advantage:
 	 */
-	if (__delta > niced_granularity(curr, granularity)) {
+	if (__delta > niced_granularity(curr, granularity))
 		resched_task(rq_of(cfs_rq)->curr);
-		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
-	}
 }
 
 static inline void
@@ -703,6 +701,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_stats_wait_end(cfs_rq, se);
 	update_stats_curr_start(cfs_rq, se);
 	set_cfs_rq_curr(cfs_rq, se);
+	se->prev_sum_exec_runtime = se->sum_exec_runtime;
 }
 
 static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq)
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1169783085adb9ac969d21103a6885e8435f7ed3
Commit:     1169783085adb9ac969d21103a6885e8435f7ed3
Parent:     4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: fix ideal_runtime calculations for reniced tasks
    
    fix ideal_runtime:
    
      - do not scale it using niced_granularity()
        it is against sum_exec_delta, so its wall-time, not fair-time.
    
      - move the whole check into __check_preempt_curr_fair()
        so that wakeup preemption can also benefit from the new logic.
    
    this also results in code size reduction:
    
       text    data     bss     dec     hex filename
      13391     228    1204   14823    39e7 sched.o.before
      13369     228    1204   14801    39d1 sched.o.after
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 2d01bbc..892616b 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -678,11 +678,31 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 			  struct sched_entity *curr, unsigned long granularity)
 {
 	s64 __delta = curr->fair_key - se->fair_key;
+	unsigned long ideal_runtime, delta_exec;
+
+	/*
+	 * ideal_runtime is compared against sum_exec_runtime, which is
+	 * walltime, hence do not scale.
+	 */
+	ideal_runtime = max(sysctl_sched_latency / cfs_rq->nr_running,
+			(unsigned long)sysctl_sched_min_granularity);
+
+	/*
+	 * If we executed more than what the latency constraint suggests,
+	 * reduce the rescheduling granularity. This way the total latency
+	 * of how much a task is not scheduled converges to
+	 * sysctl_sched_latency:
+	 */
+	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
+	if (delta_exec > ideal_runtime)
+		granularity = 0;
 
 	/*
 	 * Take scheduling granularity into account - do not
 	 * preempt the current task unless the best task has
 	 * a larger than sched_granularity fairness advantage:
+	 *
+	 * scale granularity as key space is in fair_clock.
 	 */
 	if (__delta > niced_granularity(curr, granularity))
 		resched_task(rq_of(cfs_rq)->curr);
@@ -731,7 +751,6 @@ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev)
 
 static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 {
-	unsigned long gran, ideal_runtime, delta_exec;
 	struct sched_entity *next;
 
 	/*
@@ -748,21 +767,8 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	if (next == curr)
 		return;
 
-	gran = sched_granularity(cfs_rq);
-	ideal_runtime = niced_granularity(curr,
-		max(sysctl_sched_latency / cfs_rq->nr_running,
-		    (unsigned long)sysctl_sched_min_granularity));
-	/*
-	 * If we executed more than what the latency constraint suggests,
-	 * reduce the rescheduling granularity. This way the total latency
-	 * of how much a task is not scheduled converges to
-	 * sysctl_sched_latency:
-	 */
-	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
-	if (delta_exec > ideal_runtime)
-		gran = 0;
-
-	__check_preempt_curr_fair(cfs_rq, next, curr, gran);
+	__check_preempt_curr_fair(cfs_rq, next, curr,
+			sched_granularity(cfs_rq));
 }
 
 /**************************************************


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3339
retrieving revision 1.3340
diff -u -r1.3339 -r1.3340
--- kernel-2.6.spec	12 Sep 2007 00:17:42 -0000	1.3339
+++ kernel-2.6.spec	12 Sep 2007 22:35:48 -0000	1.3340
@@ -618,7 +618,8 @@
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
-Patch901: linux-2.6-timekeeping-fixes.patch
+Patch901: linux-2.6-sched-cfs-updates.patch
+Patch902: linux-2.6-timekeeping-fixes.patch
 Patch1000: linux-2.6-dmi-based-module-autoloading.patch
 Patch1020: linux-2.6-usb-autosuspend-default-disable.patch
 Patch1030: linux-2.6-nfs-nosharecache.patch
@@ -1088,6 +1089,8 @@
 
 # Ingo's new scheduler.
 ApplyPatch linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
+# updates from 2.6.23
+ApplyPatch linux-2.6-sched-cfs-updates.patch
 # apply timekeeping updates that were in the Fedora CFS patch
 ApplyPatch linux-2.6-timekeeping-fixes.patch
 
@@ -2306,6 +2309,9 @@
 %endif
 
 %changelog
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- update CFS scheduler
+
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#248532, #267161, #284311)
 

linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch:

Index: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch	29 Aug 2007 23:42:57 -0000	1.2
+++ linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch	12 Sep 2007 22:35:48 -0000	1.3
@@ -8910,48 +8910,3 @@
  config SCHEDSTATS
  	bool "Collect scheduler statistics"
  	depends on DEBUG_KERNEL && PROC_FS
-Try to fix MC/HT scheduler optimization breakage again, with out breaking
-the FUZZ logic.
-
-First fix the check
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
-with this
-	if (*imbalance < busiest_load_per_task)
-
-As the current check is always false for nice 0 tasks (as SCHED_LOAD_SCALE_FUZZ
-is same as busiest_load_per_task for nice 0 tasks).
-
-With the above change, imbalance was getting reset to 0 in the corner case
-condition, making the FUZZ logic fail. Fix it by not corrupting the
-imbalance and change the imbalance, only when it finds that the
-HT/MC optimization is needed.
-
-Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
----
-
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 9fe473a..03e5e8d 100644
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -2511,7 +2511,7 @@ group_next:
- 	 * a think about bumping its value to force at least one task to be
- 	 * moved
- 	 */
--	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
-+	if (*imbalance < busiest_load_per_task) {
- 		unsigned long tmp, pwr_now, pwr_move;
- 		unsigned int imbn;
- 
-@@ -2563,10 +2563,8 @@ small_imbalance:
- 		pwr_move /= SCHED_LOAD_SCALE;
- 
- 		/* Move if we gain throughput */
--		if (pwr_move <= pwr_now)
--			goto out_balanced;
--
--		*imbalance = busiest_load_per_task;
-+		if (pwr_move > pwr_now)
-+			*imbalance = busiest_load_per_task;
- 	}
- 
- 	return busiest;



From fedora-extras-commits at redhat.com  Wed Sep 12 22:48:51 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 12 Sep 2007 18:48:51 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.31,1.32
Message-ID: <200709122248.l8CMmpH7003216@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.5-49.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sysprof-kmod.spec	11 Sep 2007 08:47:59 -0000	1.31
+++ sysprof-kmod.spec	12 Sep 2007 22:48:11 -0000	1.32
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-45.fc6}
+%{!?kversion: %define kversion 2.6.22.5-49.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:50:41 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 12 Sep 2007 18:50:41 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.83,1.84
Message-ID: <200709122250.l8CMofj9003320@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3296

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.5-76.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sysprof-kmod.spec	21 Aug 2007 07:19:46 -0000	1.83
+++ sysprof-kmod.spec	12 Sep 2007 22:50:08 -0000	1.84
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.1-41.fc7}
+%{!?kversion: %define kversion 2.6.22.5-76.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:56:54 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Wed, 12 Sep 2007 18:56:54 -0400
Subject: rpms/kernel/devel config-x86-generic, 1.10,
	1.11 config-x86_64-generic, 1.8, 1.9 kernel.spec, 1.161, 1.162
Message-ID: <200709122256.l8CMusBt003551@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3523

Modified Files:
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Wed Sep 12 2007 Dave Jones <davej at redhat.com>
- Change ACPI dock drivers to be built-in.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-x86-generic	31 Aug 2007 19:31:27 -0000	1.10
+++ config-x86-generic	12 Sep 2007 22:56:16 -0000	1.11
@@ -131,7 +131,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_NUMA=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-x86_64-generic	31 Aug 2007 19:31:27 -0000	1.8
+++ config-x86_64-generic	12 Sep 2007 22:56:16 -0000	1.9
@@ -67,7 +67,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kernel.spec	12 Sep 2007 20:19:34 -0000	1.161
+++ kernel.spec	12 Sep 2007 22:56:16 -0000	1.162
@@ -1795,6 +1795,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Dave Jones <davej at redhat.com>
+- Change ACPI dock drivers to be built-in.
+
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git2
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:59:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 18:59:52 -0400
Subject: rpms/deluge/devel .cvsignore, 1.12, 1.13 deluge.spec, 1.26,
	1.27 sources, 1.12, 1.13
Message-ID: <200709122259.l8CMxq2G003615@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3591

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Sep 2007 17:46:55 -0000	1.12
+++ .cvsignore	12 Sep 2007 22:59:09 -0000	1.13
@@ -1 +1 @@
-deluge-0.5.4.1.95.tar.gz
+deluge-0.5.5.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- deluge.spec	3 Sep 2007 17:46:55 -0000	1.26
+++ deluge.spec	12 Sep 2007 22:59:09 -0000	1.27
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1.95
+Version:	0.5.5
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+- Update to new upstream release (0.5.5)
+
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
 - Update to new upstream release candidate (0.5.5 RC1)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Sep 2007 17:46:55 -0000	1.12
+++ sources	12 Sep 2007 22:59:09 -0000	1.13
@@ -1 +1 @@
-4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz
+76c1f8110aef4131d2bc83a7da957c6a  deluge-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 23:13:42 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:13:42 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.11, 1.12 deluge.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <200709122313.l8CNDgH3010031@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 final (no changes from 0.5.5 RC1).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Sep 2007 03:44:20 -0000	1.11
+++ .cvsignore	12 Sep 2007 23:13:07 -0000	1.12
@@ -1,2 +1 @@
-deluge-0.5.4.1.tar.gz
-deluge-0.5.4.1.95.tar.gz
+deluge-0.5.5.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deluge.spec	5 Sep 2007 03:44:20 -0000	1.21
+++ deluge.spec	12 Sep 2007 23:13:07 -0000	1.22
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1.95
+Version:	0.5.5
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+- Update to new upstream release (0.5.5)
+
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
 - Update to new upstream release candidate (0.5.5 RC1)
 - Update License tag for new License version guidelines.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Sep 2007 03:44:20 -0000	1.11
+++ sources	12 Sep 2007 23:13:07 -0000	1.12
@@ -1,2 +1 @@
-36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
-4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz
+76c1f8110aef4131d2bc83a7da957c6a  deluge-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:43 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:43 -0400
Subject: rpms/scribes-templates/F-7 scribes-templates.spec,1.2,1.3
Message-ID: <200709122342.l8CNghgw010987@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/F-7

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/F-7/scribes-templates.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scribes-templates.spec	18 Dec 2006 05:28:31 -0000	1.2
+++ scribes-templates.spec	12 Sep 2007 23:42:10 -0000	1.3
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:46 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:46 -0400
Subject: rpms/scribes-templates/FC-6 scribes-templates.spec,1.2,1.3
Message-ID: <200709122342.l8CNgkuY010992@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/FC-6

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/FC-6/scribes-templates.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scribes-templates.spec	18 Dec 2006 05:33:07 -0000	1.2
+++ scribes-templates.spec	12 Sep 2007 23:42:13 -0000	1.3
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:49 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:49 -0400
Subject: rpms/scribes-templates/devel scribes-templates.spec,1.3,1.4
Message-ID: <200709122342.l8CNgn6s010995@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/devel

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/scribes-templates.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scribes-templates.spec	5 Jun 2007 02:54:30 -0000	1.3
+++ scribes-templates.spec	12 Sep 2007 23:42:16 -0000	1.4
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:52 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/F-7
	gnome-theme-clearlooks-bigpack.spec, 1.8, 1.9
Message-ID: <200709122342.l8CNgqVH010998@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/F-7

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/F-7/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-theme-clearlooks-bigpack.spec	11 Apr 2007 05:38:25 -0000	1.8
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:19 -0000	1.9
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:55 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6
	gnome-theme-clearlooks-bigpack.spec, 1.9, 1.10
Message-ID: <200709122342.l8CNgtJe011001@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/FC-6

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-theme-clearlooks-bigpack.spec	15 Apr 2007 21:37:40 -0000	1.9
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:23 -0000	1.10
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:58 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:58 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.8, 1.9
Message-ID: <200709122342.l8CNgwbt011004@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/devel

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-theme-clearlooks-bigpack.spec	11 Apr 2007 05:38:25 -0000	1.8
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:26 -0000	1.9
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:47:59 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 12 Sep 2007 19:47:59 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.14,1.15
Message-ID: <200709122347.l8CNlxno011141@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123

Modified Files:
	MultiLib.py 
Log Message:
warn only about non-debuginfo pkgs


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MultiLib.py	6 Sep 2007 13:23:21 -0000	1.14
+++ MultiLib.py	12 Sep 2007 23:47:57 -0000	1.15
@@ -301,7 +301,9 @@
         srcfile = os.path.join(src,f)
         destfile = os.path.join(dest,f)
         if not os.path.exists(srcfile):
-            print 'WARNING: missing', srcfile
+            if srcfile.find('-debuginfo-')<0:
+            # Don't warn about missing debuginfo pkgs.
+                print 'WARNING: missing', srcfile
             return False
         if not os.path.exists(destfile):  # silent extra-check
             print 'Adding:', destfile



From fedora-extras-commits at redhat.com  Thu Sep 13 00:33:48 2007
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Wed, 12 Sep 2007 20:33:48 -0400
Subject: rpms/pan/devel .cvsignore, 1.24, 1.25 pan.spec, 1.35, 1.36 sources, 
	1.24, 1.25
Message-ID: <200709130033.l8D0Xmbx018319@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18271

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Add patch for BZ #283241 (upstream #467446)





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	25 Aug 2007 15:14:25 -0000	1.24
+++ .cvsignore	13 Sep 2007 00:33:16 -0000	1.25
@@ -1 +1 @@
-pan-0.132.tar.bz2
+body-pane.cc.diff


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pan.spec	25 Aug 2007 15:14:25 -0000	1.35
+++ pan.spec	13 Sep 2007 00:33:16 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
 Version:	0.132
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -59,6 +59,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Thu Sep 13 2007 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.132-2
+- Add patch for BZ #283241 (upstream #467446)
+
 * Sat Aug 25 2007 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.132-1
 - Update to 0.132
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Aug 2007 15:14:25 -0000	1.24
+++ sources	13 Sep 2007 00:33:16 -0000	1.25
@@ -1 +1 @@
-2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
+dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff



From fedora-extras-commits at redhat.com  Thu Sep 13 00:50:42 2007
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Wed, 12 Sep 2007 20:50:42 -0400
Subject: rpms/pan/devel .cvsignore, 1.25, 1.26 pan.spec, 1.36, 1.37 sources, 
	1.25, 1.26
Message-ID: <200709130050.l8D0ogAv018796@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
use wrong command to add the patch, so previous build missed the pan source




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Sep 2007 00:33:16 -0000	1.25
+++ .cvsignore	13 Sep 2007 00:50:09 -0000	1.26
@@ -1 +1,2 @@
+pan-0.132.tar.bz2
 body-pane.cc.diff


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pan.spec	13 Sep 2007 00:33:16 -0000	1.36
+++ pan.spec	13 Sep 2007 00:50:09 -0000	1.37
@@ -6,6 +6,7 @@
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
+Patch0:		body-pane.cc.diff
 URL:		http://pan.rebelbase.com/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -b .pixbuf
 
 sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Sep 2007 00:33:16 -0000	1.25
+++ sources	13 Sep 2007 00:50:09 -0000	1.26
@@ -1 +1,2 @@
+2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
 dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff



From fedora-extras-commits at redhat.com  Thu Sep 13 01:42:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 12 Sep 2007 21:42:18 -0400
Subject: rpms/libbonobo/devel list-leak.patch, NONE, 1.1 libbonobo.spec, 1.61,
	1.62
Message-ID: <200709130142.l8D1gIHq026361@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26324

Modified Files:
	libbonobo.spec 
Added Files:
	list-leak.patch 
Log Message:
plug a memory leak


list-leak.patch:

--- NEW FILE list-leak.patch ---
diff -up libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak libbonobo-2.19.6/activation-server/object-directory-load.c
--- libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak	2007-09-12 18:41:20.000000000 -0400
+++ libbonobo-2.19.6/activation-server/object-directory-load.c	2007-09-12 21:33:20.000000000 -0400
@@ -483,7 +483,8 @@ od_end_element (GMarkupParseContext *con
                         info->cur_prop->v._u.value_stringv._buffer =
                                 CORBA_sequence_CORBA_string_allocbuf (len);
                         
-                        for (i = 0, p = g_list_reverse (info->cur_items); p; p = p->next, i++)
+			info->cur_items = g_list_reverse (info->cur_items);
+                        for (i = 0, p = info->cur_items; p; p = p->next, i++)
                                 info->cur_prop->v._u.
                                         value_stringv._buffer[i] = p->data;
                         g_list_free (info->cur_items);
@@ -509,7 +510,8 @@ od_end_element (GMarkupParseContext *con
                         info->cur_server->props._buffer =
                                 CORBA_sequence_Bonobo_ActivationProperty_allocbuf (len);
 
-                        for (i = 0, p = g_list_reverse (info->cur_props); p; p = p->next, i++) {
+			info->cur_props = g_list_reverse (info->cur_props);
+                        for (i = 0, p = info->cur_props; p; p = p->next, i++) {
                                 Bonobo_ActivationProperty_copy (&info->cur_server->props._buffer[i],
                                                                 (Bonobo_ActivationProperty *) p->data);
                                 CORBA_free (p->data);


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- libbonobo.spec	29 Aug 2007 04:22:53 -0000	1.61
+++ libbonobo.spec	13 Sep 2007 01:41:45 -0000	1.62
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.19.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -26,6 +26,8 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=476398
+Patch1: list-leak.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -58,6 +60,8 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .list-leak
+
 %build
 intltoolize -f
 aclocal
@@ -122,6 +126,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-5
+- Plug a memory leak in bonobo-activation-server
+
 * Tue Aug 28 2007 Jesse Keating <jkeating at redhat.com> - 2.19.6-4
 - Require popt-devel in -devel.
 - And BuildRequire popt-devel.



From fedora-extras-commits at redhat.com  Thu Sep 13 02:13:50 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 22:13:50 -0400
Subject: comps comps-f7.xml.in,1.252,1.253 comps-fe6.xml.in,1.373,1.374
Message-ID: <200709130213.l8D2DoEq000720@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv699

Modified Files:
	comps-f7.xml.in comps-fe6.xml.in 
Log Message:
comps 6,7 for xsc



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- comps-f7.xml.in	11 Sep 2007 22:42:06 -0000	1.252
+++ comps-f7.xml.in	13 Sep 2007 02:13:20 -0000	1.253
@@ -1428,6 +1428,7 @@
       <packagereq type="optional">xpilot-ng</packagereq>
       <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
+      <packagereq type="optional">xsc</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xu4</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- comps-fe6.xml.in	14 Aug 2007 00:11:34 -0000	1.373
+++ comps-fe6.xml.in	13 Sep 2007 02:13:20 -0000	1.374
@@ -566,6 +566,7 @@
       <packagereq type="optional">xpilot-ng</packagereq>
       <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
+      <packagereq type="optional">xsc</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xu4</packagereq>
       <packagereq type="optional">zasx</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 13 02:15:39 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 22:15:39 -0400
Subject: comps comps-f8.xml.in,1.105,1.106
Message-ID: <200709130215.l8D2FdvJ000767@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv740

Modified Files:
	comps-f8.xml.in 
Log Message:
comps slingshot devel



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- comps-f8.xml.in	12 Sep 2007 14:42:12 -0000	1.105
+++ comps-f8.xml.in	13 Sep 2007 02:15:08 -0000	1.106
@@ -1534,6 +1534,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 13 03:11:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 12 Sep 2007 23:11:48 -0400
Subject: rpms/gnome-vfs2/devel glob-leak.patch, NONE, 1.1 gnome-vfs2.spec,
	1.164, 1.165
Message-ID: <200709130311.l8D3Bm1x008387@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8362

Modified Files:
	gnome-vfs2.spec 
Added Files:
	glob-leak.patch 
Log Message:
fix a memory leak


glob-leak.patch:

--- NEW FILE glob-leak.patch ---
diff -up gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c.glob-leak gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c
--- gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c.glob-leak	2007-09-12 23:07:28.000000000 -0400
+++ gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c	2007-09-12 23:07:34.000000000 -0400
@@ -263,7 +263,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
 		{
 		  child = _xdg_glob_hash_node_new ();
 		  child->character = '\000';
-		  child->mime_type = mime_type;
+		  child->mime_type = strdup (mime_type);
 		  child->child = NULL;
 		  child->next = node->child;
 		  node->child = child;
@@ -272,7 +272,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
 	}
       else
 	{
-	  node->mime_type = mime_type;
+	  node->mime_type = strdup (mime_type);
 	}
     }
   else
@@ -477,7 +477,7 @@ _xdg_glob_hash_append_glob (XdgGlobHash 
       glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type));
       break;
     case XDG_GLOB_SIMPLE:
-      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, strdup (mime_type));
+      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, mime_type);
       break;
     case XDG_GLOB_FULL:
       glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type));


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-vfs2.spec	3 Sep 2007 04:26:21 -0000	1.164
+++ gnome-vfs2.spec	13 Sep 2007 03:11:15 -0000	1.165
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.19.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -72,6 +72,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=356772
 Patch8: gnome-vfs-2.16.0-no-dbus.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=427958
+Patch9: glob-leak.patch
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -124,6 +126,7 @@
 %patch201 -p0 -b .console
 
 %patch8 -p1 -b .no-dbus
+%patch9 -p1 -b .glob-leak
 
 %build
 
@@ -226,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-2
+- Fix a small memory leak
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Re-add gnome-mount dependency
 - Update to 2.19.91



From fedora-extras-commits at redhat.com  Thu Sep 13 03:36:53 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 23:36:53 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.7,1.8
Message-ID: <200709130336.l8D3arpo008944@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
delete KMail/KNode transport migration scripts which break KDE 3


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdepimlibs.spec	9 Sep 2007 12:24:54 -0000	1.7
+++ kdepimlibs.spec	13 Sep 2007 03:36:20 -0000	1.8
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -68,6 +68,10 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# delete KMail/KNode transport migration scripts which break KDE 3
+# (we should only ship these once we start to migrate to KDE 4 kdepim)
+rm -rf %{buildroot}%{_kde4_appsdir}/kconf_update
+
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
@@ -99,7 +103,6 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_appsdir}/kabc/
-%{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/libical/
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -116,6 +119,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- delete KMail/KNode transport migration scripts which break KDE 3
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:25 -0700
Subject: [pkgdb] animorph was added for kwizart
Message-ID: <200709130341.l8D3fQjw002058@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package animorph with summary 3D Animation and Morph Library
Kevin Fenzi (kevin) has approved Package animorph
Kevin Fenzi (kevin) has added a Fedora devel branch for animorph with an owner of kwizart
Kevin Fenzi (kevin) has approved animorph in Fedora devel
Kevin Fenzi (kevin) has approved Package animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, 6) updated by kevin
Message-ID: <200709130341.l8D3fgAR005281@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora 6)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, 7) updated by kevin
Message-ID: <200709130341.l8D3fhJY005290@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, devel) updated by kevin
Message-ID: <200709130341.l8D3fhXl005301@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130341.l8D3fi0v005317@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130341.l8D3fhOn005308@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:16 -0400
Subject: rpms/animorph - New directory
Message-ID: <200709130342.l8D3gGCn009175@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph

Log Message:
Directory /cvs/extras/rpms/animorph added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:18 -0400
Subject: rpms/animorph/devel - New directory
Message-ID: <200709130342.l8D3gI2L009189@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph/devel

Log Message:
Directory /cvs/extras/rpms/animorph/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:21 -0400
Subject: rpms/animorph Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709130342.l8D3gLOu009214@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph

Added Files:
	Makefile import.log 
Log Message:
Setup of module animorph


--- NEW FILE Makefile ---
# Top level Makefile for module animorph
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:23 -0400
Subject: rpms/animorph/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709130342.l8D3gNkg009230@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module animorph


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: animorph
# $Id: Makefile,v 1.1 2007/09/13 03:42:21 kevin Exp $
NAME := animorph
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 fedora-extras-commits at redhat.com  Thu Sep 13 03:44:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:20 -0700
Subject: [pkgdb] perl-Geo-IP was added for mfleming
Message-ID: <200709130344.l8D3iNx8005412@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Geo-IP with summary Efficient Perl bindings for the GeoIP location database
Kevin Fenzi (kevin) has approved Package perl-Geo-IP
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Geo-IP with an owner of mfleming
Kevin Fenzi (kevin) has approved perl-Geo-IP in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, 7) updated by kevin
Message-ID: <200709130344.l8D3iX49002102@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, 6) updated by kevin
Message-ID: <200709130344.l8D3iXBU002111@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130344.l8D3iYxx002129@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130344.l8D3iYof002120@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, devel) updated by kevin
Message-ID: <200709130344.l8D3iYaI002138@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:33 -0400
Subject: rpms/perl-Geo-IP - New directory
Message-ID: <200709130345.l8D3jXqY009627@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP

Log Message:
Directory /cvs/extras/rpms/perl-Geo-IP added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:36 -0400
Subject: rpms/perl-Geo-IP/devel - New directory
Message-ID: <200709130345.l8D3jax1009641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP/devel

Log Message:
Directory /cvs/extras/rpms/perl-Geo-IP/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:39 -0400
Subject: rpms/perl-Geo-IP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709130345.l8D3jd3O009666@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Geo-IP


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Geo-IP
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:42 -0400
Subject: rpms/perl-Geo-IP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709130345.l8D3jgG7009684@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Geo-IP


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Geo-IP
# $Id: Makefile,v 1.1 2007/09/13 03:45:39 kevin Exp $
NAME := perl-Geo-IP
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 fedora-extras-commits at redhat.com  Thu Sep 13 03:48:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:48:46 -0700
Subject: [pkgdb] keychain (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130348.l8D3mlxS005449@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for keychain
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on keychain (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on keychain (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on keychain (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 03:48:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:48:46 -0700
Subject: [pkgdb] keychain (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130348.l8D3mliJ005458@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for keychain
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on keychain (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on keychain (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on keychain (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 04:51:15 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 00:51:15 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.2, 1.1.2.3 kde4.sh, 1.1.2.2,
	1.1.2.3 kdelibs.spec, 1.223.2.19, 1.223.2.20
Message-ID: <200709130451.l8D4pFeB018554@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18369/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
set QT_PLUGIN_PATH in kde4.sh and kde4.csh


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.csh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
 
+if ( ! $?QT_PLUGIN_PATH ) then
+  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
+  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.sh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
 
+if [ -z "$QT_PLUGIN_PATH" ]; then
+  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
+  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.19
retrieving revision 1.223.2.20
diff -u -r1.223.2.19 -r1.223.2.20
--- kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
+++ kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -222,6 +222,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
+- set QT_PLUGIN_PATH in kde4.sh and kde4.csh
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
 - fix strange coloring due to incomplete changes to KColorScheme
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:05:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Sep 2007 02:05:45 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.33,1.34
Message-ID: <200709130605.l8D65jQA005330@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	em8300-kmod.spec 
Log Message:
* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.5-49.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- em8300-kmod.spec	5 Sep 2007 06:17:33 -0000	1.33
+++ em8300-kmod.spec	13 Sep 2007 06:05:09 -0000	1.34
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-45.fc6}
+%{!?kversion: %define kversion 2.6.22.5-49.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.5-49.fc6.
+
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.4-45.fc6.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:08:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 13 Sep 2007 02:08:56 -0400
Subject: rpms/libbonobo/devel notify-leak.patch, NONE, 1.1 libbonobo.spec,
	1.62, 1.63
Message-ID: <200709130608.l8D68uIi005549@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5479

Modified Files:
	libbonobo.spec 
Added Files:
	notify-leak.patch 
Log Message:
fix another leak


notify-leak.patch:

--- NEW FILE notify-leak.patch ---
diff -up libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak libbonobo-2.19.6/activation-server/activation-context-corba.c
--- libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak	2007-09-13 01:28:07.000000000 -0400
+++ libbonobo-2.19.6/activation-server/activation-context-corba.c	2007-09-13 01:27:08.000000000 -0400
@@ -324,6 +324,8 @@ activation_clients_cache_notify (void)
                 CORBA_Object_release (l2->data, &ev);
                 CORBA_exception_free (&ev);
         }
+
+	g_slist_free (notify);
 }
 
 gboolean


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libbonobo.spec	13 Sep 2007 01:41:45 -0000	1.62
+++ libbonobo.spec	13 Sep 2007 06:08:23 -0000	1.63
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.19.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -28,6 +28,8 @@
 Patch0: libbonobo-2.13.1-multishlib.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=476398
 Patch1: list-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=476448
+Patch2: notify-leak.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -61,6 +63,7 @@
 %endif
 
 %patch1 -p1 -b .list-leak
+%patch2 -p1 -b .notify-leak
 
 %build
 intltoolize -f
@@ -126,6 +129,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-6
+- Plug a memory leak in bonobo-activation-server
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-5
 - Plug a memory leak in bonobo-activation-server
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:30:31 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:30:31 -0400
Subject: rpms/perl-Geo-IP/devel Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130630.l8D6UVrO006481@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial import.


Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:29:54 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:29:54 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:32:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Thu, 13 Sep 2007 02:32:52 -0400
Subject: rpms/cadaver/devel cadaver.spec, 1.29,
	1.30 cadaver-0.22.5.tar.gz.asc, 1.1, NONE
Message-ID: <200709130632.l8D6Wq9V006713@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/cadaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6647

Modified Files:
	cadaver.spec 
Removed Files:
	cadaver-0.22.5.tar.gz.asc 
Log Message:
* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 0.23.0-2
- spec file cleanup (#225634)



Index: cadaver.spec
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cadaver.spec	23 Aug 2007 07:49:12 -0000	1.29
+++ cadaver.spec	13 Sep 2007 06:32:19 -0000	1.30
@@ -1,13 +1,13 @@
 Name: cadaver
 Version: 0.23.0
-Release: 1
+Release: 2
 Summary: Command-line WebDAV client
 License: GPLv2+
 Group: Applications/Internet
 Source: http://www.webdav.org/cadaver/%{name}-%{version}.tar.gz
 URL: http://www.webdav.org/cadaver/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: neon-devel >= 0:0.27.0-1, readline-devel, ncurses-devel
+BuildRequires: neon-devel >= 0.27.0, readline-devel, ncurses-devel
 
 %description
 cadaver is a command-line WebDAV client, with support for file upload, 
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -33,12 +33,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%{_bindir}/*
+%defattr(-,root,root,-)
 %doc NEWS FAQ THANKS TODO COPYING README ChangeLog
+%{_bindir}/*
 %{_mandir}/*/*
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 0.23.0-2
+- spec file cleanup (#225634)
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 0.23.0-1
 - update to 0.23.0
 


--- cadaver-0.22.5.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 06:35:03 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:35:03 -0400
Subject: rpms/perl-Geo-IP/F-7 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130635.l8D6Z3f7006974@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial F7 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:34:30 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:34:30 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:36:36 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:36:36 -0400
Subject: rpms/perl-Geo-IP/FC-6 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130636.l8D6aaQ1007117@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial FC6 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:36:04 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:36:04 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:40:21 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:40:21 -0400
Subject: rpms/perl-Geo-IP/EL-4 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130640.l8D6eLRO007360@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7314

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial EPEL-4 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:39:46 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:39:46 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:42:01 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:42:01 -0400
Subject: rpms/perl-Geo-IP/EL-5 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130642.l8D6g1Te007455@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial EPEL-5 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:41:28 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:41:28 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:06:27 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:06:27 -0400
Subject: rpms/mod_security/devel modsecurity_localrules.conf, NONE,
	1.1 mod_security.spec, 1.21, 1.22
Message-ID: <200709130706.l8D76RZF015167@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15110

Modified Files:
	mod_security.spec 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep  13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- Update to 2.1.3
- Update License tag per guidelines.



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_security.spec	3 Sep 2007 08:32:11 -0000	1.21
+++ mod_security.spec	13 Sep 2007 07:05:54 -0000	1.22
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
-Release: 3%{?dist}
-License: GPL
+Version: 2.1.3
+Release: 1%{?dist}
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep  13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- Update to 2.1.3
+- Update License tag per guidelines.
+
 * Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
 - rebuild for fixed 32-bit APR (#254241)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 07:09:48 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:09:48 -0400
Subject: rpms/mod_security/devel .cvsignore,1.8,1.9 sources,1.10,1.11
Message-ID: <200709130709.l8D79mdL015533@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15457

Modified Files:
	.cvsignore sources 
Log Message:
new sources uploaded


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 10:25:54 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:09:15 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 10:25:54 -0000	1.10
+++ sources	13 Sep 2007 07:09:15 -0000	1.11
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:20:51 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:20:51 -0400
Subject: rpms/python-GeoIP/devel GeoIP-Python-1.2.1-ccodes.patch,NONE,1.1
Message-ID: <200709130720.l8D7Kp9S015935@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15924

Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);



From fedora-extras-commits at redhat.com  Thu Sep 13 07:25:37 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:25:37 -0400
Subject: rpms/python-GeoIP/devel python-GeoIP.spec,1.5,1.6
Message-ID: <200709130725.l8D7PbYk016191@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16168

Modified Files:
	python-GeoIP.spec 
Log Message:
Bump and update license tag


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-GeoIP.spec	6 Sep 2007 00:35:51 -0000	1.5
+++ python-GeoIP.spec	13 Sep 2007 07:25:04 -0000	1.6
@@ -2,11 +2,11 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
 Patch0:		GeoIP-Python-1.2.1-ccodes.patch
@@ -44,9 +44,10 @@
 
 
 %changelog
-* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
+- Update License tag per new guidelines
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 07:36:46 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:36:46 -0400
Subject: rpms/mod_security/F-7 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.19, 1.20 sources,
	1.10, 1.11
Message-ID: <200709130736.l8D7ak7b016744@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16701

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 10:23:37 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:36:14 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/mod_security.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_security.spec	19 Jun 2007 10:23:37 -0000	1.19
+++ mod_security.spec	13 Sep 2007 07:36:14 -0000	1.20
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 10:23:37 -0000	1.10
+++ sources	13 Sep 2007 07:36:14 -0000	1.11
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:46:21 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:46:21 -0400
Subject: rpms/mod_security/FC-6 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.17, 1.18 sources,
	1.9, 1.10
Message-ID: <200709130746.l8D7kLsp017139@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17103

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 09:53:32 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:45:49 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/mod_security.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_security.spec	19 Jun 2007 09:53:32 -0000	1.17
+++ mod_security.spec	13 Sep 2007 07:45:49 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jun 2007 09:53:32 -0000	1.9
+++ sources	13 Sep 2007 07:45:49 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:50:09 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:50:09 -0400
Subject: rpms/mod_security/EL-5 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.17, 1.18 sources,
	1.9, 1.10
Message-ID: <200709130750.l8D7o9ho017395@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17356

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 09:59:15 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:49:36 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_security.spec	19 Jun 2007 09:59:15 -0000	1.17
+++ mod_security.spec	13 Sep 2007 07:49:36 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jun 2007 09:59:15 -0000	1.9
+++ sources	13 Sep 2007 07:49:36 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:53:46 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:53:46 -0400
Subject: rpms/mod_security/EL-4 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.14, 1.15 sources,
	1.9, 1.10
Message-ID: <200709130753.l8D7rkIk017611@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17580

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2007 00:19:09 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:53:14 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_security.spec	4 Aug 2007 00:19:09 -0000	1.14
+++ mod_security.spec	13 Sep 2007 07:53:14 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Aug 2007 00:19:09 -0000	1.9
+++ sources	13 Sep 2007 07:53:14 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 08:05:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 04:05:20 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.3, 1.1.2.4 kde4.sh, 1.1.2.3,
	1.1.2.4 kdelibs.spec, 1.223.2.20, 1.223.2.21
Message-ID: <200709130805.l8D85KZI024391@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24327/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3 (workaround for #244065 no longer needed, fixed in 3.93.0)


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 ## if not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+  fi
+fi
 
 ## if not using IP6, speeds DNS operations
 # [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.20
retrieving revision 1.223.2.21
diff -u -r1.223.2.20 -r1.223.2.21
--- kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
+++ kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -166,6 +166,9 @@
 done
 popd
 
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+
 
 %post
 /sbin/ldconfig ||:
@@ -186,6 +189,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
+%config(noreplace) %{_sysconfdir}/profile.d/*
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
@@ -222,6 +226,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
+- actually install kde4.sh and kde4.csh
+- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
+  (workaround for #244065 no longer needed, fixed in 3.93.0)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
 - set QT_PLUGIN_PATH in kde4.sh and kde4.csh
 



From fedora-extras-commits at redhat.com  Thu Sep 13 09:58:50 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 13 Sep 2007 05:58:50 -0400
Subject: rpms/scim/devel scim-1.4.7-ja-sinhala-236715.patch, NONE,
	1.1 scim.spec, 1.95, 1.96 xinput-scim, 1.12, 1.13
Message-ID: <200709130958.l8D9woA6006482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6443

Modified Files:
	scim.spec xinput-scim 
Added Files:
	scim-1.4.7-ja-sinhala-236715.patch 
Log Message:
- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
  Sinhala (#236715)
- gtk2 now owns %{_libdir}/gtk-2.0/immodules
- add Nepali meta package
- specify full paths in xinput script and use SHORT_DESC



scim-1.4.7-ja-sinhala-236715.patch:

--- NEW FILE scim-1.4.7-ja-sinhala-236715.patch ---
--- scim-1.4.7/po/ja.po~	2007-06-27 00:31:56.000000000 +1000
+++ scim-1.4.7/po/ja.po	2007-09-13 17:37:32.000000000 +1000
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-22 11:40-0700\n"
-"PO-Revision-Date: 2005-12-11 11:00+0900\n"
+"PO-Revision-Date: 2007-09-13 17:37+1000\n"
 "Last-Translator: Yukiko Bando <ybando at k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -314,7 +314,7 @@ msgstr "????????????"
 
 #: ../src/scim_utility.cpp:768
 msgid "Sinhala"
-msgstr ""
+msgstr "???????????????"
 
 #: ../src/scim_utility.cpp:769 ../src/scim_keyboard_layout_data.h:4618
 msgid "Slovak"


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- scim.spec	17 Aug 2007 02:44:09 -0000	1.95
+++ scim.spec	13 Sep 2007 09:58:17 -0000	1.96
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -38,6 +38,7 @@
 Patch12:   scim-fix-unload-segfault.patch
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch17:   scim-1.4.5-no-rpath-libdir.patch
+Patch18:   scim-1.4.7-ja-sinhala-236715.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -69,6 +70,8 @@
 %package gtk
 Summary:    Smart Common Input Method Gtk IM module
 Group:      System Environment/Libraries
+# for %{_libdir}/gtk-2.0/immodules
+Requires: gtk2 >= 2.11.6-7.fc8
 # for update-gtk-immodules
 Requires(post): gtk2 >= 2.9.1-2
 Requires(postun): gtk2 >= 2.9.1-2
@@ -121,6 +124,7 @@
 %lang_meta_pkg latin scim-m17n, m17n-db-latin
 %lang_meta_pkg malayalam scim-m17n, m17n-db-malayalam m17n-contrib-malayalam
 %lang_meta_pkg marathi scim-m17n, m17n-contrib-marathi
+%lang_meta_pkg nepali scim-m17n m17n-contrib-nepali
 %lang_meta_pkg oriya scim-m17n, m17n-db-oriya m17n-contrib-oriya
 %lang_meta_pkg punjabi scim-m17n, m17n-db-punjabi m17n-contrib-punjabi
 %lang_meta_pkg sinhalese scim-sinhala scim-m17n m17n-db-sinhala m17n-contrib-sinhala
@@ -147,6 +151,7 @@
 %patch12 -p1 -b .12-unloadsegfault~
 %patch15 -p1 -b .15-key-snooper~
 %patch17 -p1 -b .17-rpath~
+%patch18 -p1 -b .18-sinhala~
 
 %if %{snapshot}
 ./bootstrap
@@ -269,7 +274,7 @@
 
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/gtk-2.0/immodules
+%{_libdir}/gtk-2.0/immodules/im-scim.so
 
 
 %files libs
@@ -285,6 +290,13 @@
 
 
 %changelog
+* Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
+- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
+  Sinhala (#236715)
+- gtk2 now owns %{_libdir}/gtk-2.0/immodules
+- add Nepali meta package
+- specify full paths in xinput script and use SHORT_DESC
+
 * Fri Aug 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-2
 - update License field
 - modify xinput.d script to not startup scim if no IMEs are installed


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xinput-scim	17 Aug 2007 02:44:09 -0000	1.12
+++ xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
@@ -21,8 +21,10 @@
 if [ "$IMENGINE_NO" -ge 1 ]; then
 
   XIM=SCIM
-  XIM_PROGRAM=scim
+  XIM_PROGRAM=/usr/bin/scim
   XIM_ARGS="-d"
+  PREFERENCE_PROGRAM=/usr/bin/scim-setup
+  SHORT_DESC="SCIM"
 
   gtkimm_exists () {
 	# for multilib check both immodules installed



From fedora-extras-commits at redhat.com  Thu Sep 13 10:04:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 13 Sep 2007 06:04:22 -0400
Subject: comps comps-f8.xml.in,1.106,1.107
Message-ID: <200709131004.l8DA4MdN012667@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589

Modified Files:
	comps-f8.xml.in 
Log Message:
- make scim-tables-* (except chinese) optional
- add fonts-hindi and new scim-lang-nepali to Nepali Support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- comps-f8.xml.in	13 Sep 2007 02:15:08 -0000	1.106
+++ comps-f8.xml.in	13 Sep 2007 10:03:52 -0000	1.107
@@ -72,10 +72,10 @@
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-arabic</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
+      <packagereq type="optional">scim-tables-arabic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1292,8 +1292,8 @@
     <langonly>am</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ethiopic</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-amharic</packagereq>
       <packagereq type="optional">m17n-db-amharic</packagereq>
+      <packagereq type="optional">scim-tables-amharic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2703,6 +2703,21 @@
     </packagelist>
   </group>
   <group>
+    <id>nepali-support</id>
+    <_name>Nepali Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ne</langonly>
+    <packagelist>
+      <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-nepali</packagereq>
+      <packagereq type="optional">scim-tables-nepali</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>network-server</id>
     <_name>Network Servers</_name>
     <_description>These packages include network-based servers such as DHCP, Kerberos and NIS.</_description>
@@ -2753,19 +2768,6 @@
     </packagelist>
   </group>
   <group>
-    <id>nepali-support</id>
-    <_name>Nepali Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <langonly>ne</langonly>
-    <packagelist>
-      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
-      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-nepali</packagereq>
-    </packagelist>
-  </group>
-  <group>
     <id>news-server</id>
     <_name>News Server</_name>
     <_description>This group allows you to configure the system as a news server.</_description>
@@ -3030,10 +3032,10 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
       <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
+      <packagereq type="optional">scim-tables-russian</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3642,7 +3644,7 @@
       <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="xorg-x11-server-Xorg">scim-lang-thai</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-thai</packagereq>
+      <packagereq type="optional">scim-tables-thai</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3762,7 +3764,7 @@
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
       <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-vietnamese</packagereq>
+      <packagereq type="optional">scim-tables-vietnamese</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Thu Sep 13 10:32:05 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 06:32:05 -0400
Subject: rpms/animorph/devel animorph-0.2-pkgconfig.patch, NONE,
	1.1 animorph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131032.l8DAW5Yh013831@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13793/devel

Modified Files:
	.cvsignore sources 
Added Files:
	animorph-0.2-pkgconfig.patch animorph.spec 
Log Message:
Initial import


animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/animorph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:42:21 -0000	1.1
+++ .cvsignore	13 Sep 2007 10:31:33 -0000	1.2
@@ -0,0 +1 @@
+animorph-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	13 Sep 2007 10:31:33 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 10:39:03 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:39:03 -0400
Subject: rpms/bacula/F-7 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.2,1.3
Message-ID: <200709131039.l8DAd3uD014125@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14078

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-7/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:25 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:38:30 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:39:34 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 06:39:34 -0400
Subject: rpms/animorph/F-7 animorph.spec, NONE,
	1.1 animorph-0.2-pkgconfig.patch, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709131039.l8DAdYaS014152@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14117

Modified Files:
	sources 
Added Files:
	animorph.spec animorph-0.2-pkgconfig.patch 
Log Message:
Import for F-7



--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 

animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	13 Sep 2007 10:39:01 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 10:43:01 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:43:01 -0400
Subject: rpms/bacula/FC-6 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.2,1.3
Message-ID: <200709131043.l8DAh1tw014293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/FC-6/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:28 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:42:27 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:47:27 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:47:27 -0400
Subject: rpms/bacula/EL-5 2.0.3-restore.patch,NONE,1.1
Message-ID: <200709131047.l8DAlRK6014488@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14477

Added Files:
	2.0.3-restore.patch 
Log Message:
* Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
- Corrected the %post alternatives calls. Fixing #249560.


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:48:43 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:48:43 -0400
Subject: rpms/bacula/EL-5 bacula.spec,1.2,1.3
Message-ID: <200709131048.l8DAmhL1014694@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14624

Modified Files:
	bacula.spec 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:23 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:48:09 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:51:42 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:51:42 -0400
Subject: rpms/bacula/EL-4 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.3,1.4
Message-ID: <200709131051.l8DApgh3014891@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14802

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula.spec	30 Jul 2007 21:43:37 -0000	1.3
+++ bacula.spec	13 Sep 2007 10:51:09 -0000	1.4
@@ -36,6 +36,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -333,6 +334,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -923,6 +925,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:52:51 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:52:51 -0400
Subject: rpms/bacula/EL-4 bacula.spec,1.4,1.5
Message-ID: <200709131052.l8DAqpIL014944@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14911

Modified Files:
	bacula.spec 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bacula.spec	13 Sep 2007 10:51:09 -0000	1.4
+++ bacula.spec	13 Sep 2007 10:52:18 -0000	1.5
@@ -11,7 +11,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:08:57 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 13 Sep 2007 08:08:57 -0400
Subject: rpms/re2c/devel .cvsignore, 1.3, 1.4 re2c.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709131208.l8DC8v9B029558@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/re2c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29518

Modified Files:
	.cvsignore re2c.spec sources 
Log Message:
Update to 0.12.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2007 07:51:27 -0000	1.3
+++ .cvsignore	13 Sep 2007 12:08:24 -0000	1.4
@@ -1 +1 @@
-re2c-0.12.2.tar.gz
+re2c-0.12.3.tar.gz


Index: re2c.spec
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/re2c.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- re2c.spec	23 Aug 2007 07:51:27 -0000	1.2
+++ re2c.spec	13 Sep 2007 12:08:24 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Tool for generating C-based recognizers from regular expressions
 Name: re2c
-Version: 0.12.2
+Version: 0.12.3
 Release: 1%{?dist}
 License: Public Domain
 Group: Development/Tools
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 0.12.3-1
+- Update to 0.12.3.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 0.12.2-1
 - Update to 0.12.2.
 - Update URL location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Aug 2007 07:51:27 -0000	1.3
+++ sources	13 Sep 2007 12:08:24 -0000	1.4
@@ -1 +1 @@
-6e010ea443c89284e125df0898052d84  re2c-0.12.2.tar.gz
+8b8d6317c2a5ccc68ee54de19cf9893b  re2c-0.12.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:01 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:15:01 -0400
Subject: rpms/python-GeoIP/F-7 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.4, 1.5
Message-ID: <200709131215.l8DCF1L8029785@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29738

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/F-7/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	13 Sep 2007 12:14:27 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -21,6 +22,7 @@
 %prep
 %setup -q -n GeoIP-Python-%{version}
 
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +45,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:28 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:28 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFStq010870@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the approveacls acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:40 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:40 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFe1C010887@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the commit acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:42 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:42 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFgXm010896@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the watchcommits acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:45 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:45 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFjNe009178@app4.fedora.phx.redhat.com>

Anthony Green (green) has set the watchbugzilla acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:20:14 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:20:14 -0400
Subject: rpms/python-GeoIP/FC-6 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.3, 1.4
Message-ID: <200709131220.l8DCKECQ030035@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29998

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/FC-6/python-GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-GeoIP.spec	4 Sep 2006 10:14:12 -0000	1.3
+++ python-GeoIP.spec	13 Sep 2007 12:19:41 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Mon Sep 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-5
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:23:11 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:23:11 -0400
Subject: rpms/python-GeoIP/EL-4 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.4, 1.5
Message-ID: <200709131223.l8DCNBoX030273@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30175

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-4/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	13 Sep 2007 12:22:39 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,12 @@
 
 
 %changelog
+
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:29:40 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:29:40 -0400
Subject: rpms/python-GeoIP/EL-5 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.3, 1.4
Message-ID: <200709131229.l8DCTenJ030609@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30574

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/python-GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-GeoIP.spec	4 Sep 2006 10:14:12 -0000	1.3
+++ python-GeoIP.spec	13 Sep 2007 12:29:08 -0000	1.4
@@ -2,17 +2,17 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +43,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Mon Sep 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-5
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:30:11 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:30:11 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.148, 1.149 libselinux.spec,
	1.283, 1.284 sources, 1.150, 1.151
Message-ID: <200709131230.l8DCUBam030697@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30601

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	23 Aug 2007 20:56:16 -0000	1.148
+++ .cvsignore	13 Sep 2007 12:29:38 -0000	1.149
@@ -127,3 +127,4 @@
 libselinux-2.0.29.tgz
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
+libselinux-2.0.33.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- libselinux.spec	6 Sep 2007 12:37:00 -0000	1.283
+++ libselinux.spec	13 Sep 2007 12:29:38 -0000	1.284
@@ -1,12 +1,11 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.31
-Release: 4%{?dist}
+Version: 2.0.33
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -49,7 +48,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -124,6 +122,12 @@
 
 %changelog
 
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
+- Upgrade to latest from NSA
+	* Re-map a getxattr return value of 0 to a getfilecon return value of -1 with errno EOPNOTSUPP from Stephen Smalley.
+	* Fall back to the compat code for security_class_to_string and security_av_perm_to_string from Stephen Smalley.
+	* Fix swig binding for rpm_execcon from James Athey.
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
 - Apply James Athway patch to fix rpm_execcon python binding
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	23 Aug 2007 20:56:16 -0000	1.150
+++ sources	13 Sep 2007 12:29:38 -0000	1.151
@@ -1 +1 @@
-5cc13dcc33d5a9c88a625b4a49626e9b  libselinux-2.0.31.tgz
+0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:30:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:30:15 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.78, 1.79 libsemanage.spec,
	1.132, 1.133 sources, 1.80, 1.81
Message-ID: <200709131230.l8DCUFuu030738@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30627

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
- Upgrade to latest from NSA
	* Change to use getpw* function calls to the _r versions from Todd Miller.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	5 Sep 2007 18:51:36 -0000	1.78
+++ .cvsignore	13 Sep 2007 12:29:42 -0000	1.79
@@ -84,3 +84,4 @@
 libsemanage-2.0.3.tgz
 libsemanage-2.0.4.tgz
 libsemanage-2.0.5.tgz
+libsemanage-2.0.6.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- libsemanage.spec	6 Sep 2007 02:48:04 -0000	1.132
+++ libsemanage.spec	13 Sep 2007 12:29:42 -0000	1.133
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -78,6 +78,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
+- Upgrade to latest from NSA
+	* Change to use getpw* function calls to the _r versions from Todd Miller.
+
 * Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
 - Upgrade to latest from NSA
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	5 Sep 2007 18:51:36 -0000	1.80
+++ sources	13 Sep 2007 12:29:42 -0000	1.81
@@ -1 +1 @@
-9d34a0b2f3033ee90489dbb516653b49  libsemanage-2.0.5.tgz
+ee1ccbd5cb4f0a08f85dd92a861283f8  libsemanage-2.0.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:32:29 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:32:29 -0400
Subject: rpms/python-GeoIP/F-7 python-GeoIP.spec,1.5,1.6
Message-ID: <200709131232.l8DCWThf031030@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30924

Modified Files:
	python-GeoIP.spec 
Log Message:
Fix requires


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/F-7/python-GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-GeoIP.spec	13 Sep 2007 12:14:27 -0000	1.5
+++ python-GeoIP.spec	13 Sep 2007 12:31:57 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
@@ -13,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -45,10 +44,11 @@
 
 
 %changelog
-* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
 - Update License tag per guidelines.
+- Remove redundant Requires per the python packaging guidelines
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 12:32:48 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:32:48 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.159,
	1.160 policycoreutils.spec, 1.447, 1.448 sources, 1.164, 1.165
Message-ID: <200709131232.l8DCWmCC031036@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31004

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
- Upgrade version of sepolgen from NSA
	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.
	* Suppress generation of rules for non-denials from Karl MacMillan (take 3).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	25 Aug 2007 10:55:38 -0000	1.159
+++ .cvsignore	13 Sep 2007 12:32:16 -0000	1.160
@@ -157,3 +157,4 @@
 policycoreutils-2.0.23.tgz
 policycoreutils-2.0.25.tgz
 sepolgen-1.0.9.tgz
+sepolgen-1.0.10.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- policycoreutils.spec	11 Sep 2007 19:04:32 -0000	1.447
+++ policycoreutils.spec	13 Sep 2007 12:32:16 -0000	1.448
@@ -2,11 +2,11 @@
 %define	libsepolver	2.0.9-1
 %define	libsemanagever	2.0.5-1
 %define	libselinuxver	2.0.23-3
-%define	sepolgenver	1.0.9
+%define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,11 @@
 fi
 
 %changelog
+* Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
+- Upgrade version of sepolgen from NSA
+	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.
+	* Suppress generation of rules for non-denials from Karl MacMillan (take 3).
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
 - Remove bogus import libxml2 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	25 Aug 2007 10:55:38 -0000	1.164
+++ sources	13 Sep 2007 12:32:16 -0000	1.165
@@ -1,2 +1,2 @@
 43c5df63e94b6e35d1f830b5b7ee6cfc  policycoreutils-2.0.25.tgz
-75f280f7000200c4b53b1c5006f57029  sepolgen-1.0.9.tgz
+eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:46:28 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:46:28 -0400
Subject: rpms/python-GeoIP/devel python-GeoIP.spec,1.6,1.7
Message-ID: <200709131246.l8DCkSdR031617@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31587

Modified Files:
	python-GeoIP.spec 
Log Message:
Fix requires


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-GeoIP.spec	13 Sep 2007 07:25:04 -0000	1.6
+++ python-GeoIP.spec	13 Sep 2007 12:45:55 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
@@ -13,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -44,10 +43,11 @@
 
 
 %changelog
-* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-9
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
 - Update License tag per new guidelines
+- Fix requires per python packaging guidelines.
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 13:08:00 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 09:08:00 -0400
Subject: rpms/kdewebdev/devel .cvsignore, 1.14, 1.15 kdewebdev.spec, 1.37,
	1.38 sources, 1.16, 1.17
Message-ID: <200709131308.l8DD80cd006086@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdewebdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6050

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
- License: GPLv2
- update %description
- Provides: kdewebdev3 kommander 
- BR: kdelibs3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Aug 2006 16:21:11 -0000	1.14
+++ .cvsignore	13 Sep 2007 13:07:26 -0000	1.15
@@ -1,19 +1,5 @@
 css.tar.bz2
 html.tar.bz2
 javascript.tar.bz2
-kdewebdev-3.3.0.tar.bz2
 php_manual_en_20030401.tar.bz2
-kdewebdev-3.3.1.tar.bz2
-kdewebdev-3.3.2.tar.bz2
-tidy_src_041026.tgz
-kdewebdev-3.4.0-rc1.tar.bz2
-kdewebdev-3.4.0.tar.bz2
-kdewebdev-3.4.1.tar.bz2
-tidy_src_050803.tgz
-kdewebdev-3.4.2.tar.bz2
-kdewebdev-3.4.91.tar.bz2
-kdewebdev-3.4.92.tar.bz2
-kdewebdev-3.5.0.tar.bz2
-kdewebdev-3.5.1.tar.bz2
-kdewebdev-3.5.3.tar.bz2
-kdewebdev-3.5.4.tar.bz2
+kdewebdev-3.5.7.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdewebdev.spec	8 Feb 2007 10:00:19 -0000	1.37
+++ kdewebdev.spec	13 Sep 2007 13:07:26 -0000	1.38
@@ -1,20 +1,15 @@
-%define debug 0
-%define final 0
+
 %define make_cvs 1
 
-%define qt_version 3.3.7
-%define kde_version 3.5.6
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
-Version: 3.5.6
-Release: 1%{?dist}
-Summary: WEB Development package for the K Desktop Environment.
-Name: kdewebdev
-Url: http://quanta.sourceforge.net/
-Epoch: 6
-Group: Applications/Editors
-License: GPL
+Name:    kdewebdev
+Summary: Web development applications 
+Epoch:   6
+Version: 3.5.7
+Release: 2%{?dist}
+
+License: GPLv2
+Url:     http://kdewebdev.org/ 
+Group:   Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -27,37 +22,49 @@
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdesdk-devel >= %{kde_version}
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdesdk3-devel >= %{version}
+BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: perl
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
 
-Obsoletes: WebMaker
-Obsoletes: quanta
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: kdelibs3 >= %{version}
+# optional
+Requires(hint): gnupg
+Requires(hint): tidy
+
+Provides: kdewebdev3 = %{version}-%{release}
+
+Obsoletes: quanta < %{epoch}:%{version}-%{release}
+Provides:  quanta = %{epoch}:%{version}-%{release}
+
+%define kommander_ver 1.2.1
+#Obsoletes: kommander < %{kommander_ver}-%{release}
+Provides:  kommander = %{kommander_ver}-%{release}
 
 %description
-The kdewebdev package contains Quanta Plus and other applications, which are useful
-for web development. They are runtime dependencies of Quanta Plus, and it is
-highly recommended that you install them.
+%{summary}, including:
+* kfilereplace: batch search and replace tool
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* kxsldbg: xslt Debugger
+* quanta+: web development
 
 %package devel
 Group: Development/Libraries
-Summary: Header files and documentation for compiling kdewebdev applications.
-Requires: kdelibs-devel >= 1:%{qt_version}
+Summary: Header files and documentation for %{name} 
+Provides: kdewebdev3-devel = %{version}-%{release}
+Requires: kdelibs3-devel
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: quanta-devel
-
+Obsoletes: quanta-devel < %{epoch}:%{version}-%{release}
 %description devel
-This package includes the header files you will need to compile
-applications for kdewebdev.
+%{summary}.
 
 
 %prep
@@ -65,36 +72,32 @@
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
 
-%build
-QTDIR="" && . /etc/profile.d/qt.sh
-
-cp %{SOURCE5} kxsldbg/
+install -m644 -p %{SOURCE5} kxsldbg/
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
+
+%build
+unset QTDIR && . /etc/profile.d/qt.sh
+
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-gcc-hidden-visibility \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --with-qt-libraries=$QTDIR/lib
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
+## package separately?  Why doesn't upstream include this? -- Rex
 # install docs
 for i in css html javascript ; do
    pushd $i
@@ -104,19 +107,28 @@
    popd
    rm -rf $i
 done
+cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
 
-cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
-
-# fix dangling symlinks
+# make symlinks relative
 pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
-      ln -s ../common $i
+      ln -nfs ../common $i
    fi
 done
 popd
 
+
+# rpmdocs
+for dir in k* quanta; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
+
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
@@ -133,32 +145,50 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc rpmdocs/*
 %{_bindir}/*
-%{_libdir}/*.so.*
-%{_libdir}/*.la
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
 %{_libdir}/kde3/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
 %{_datadir}/apps/*
+%doc %{_datadir}/apps/quanta/doc
 %{_datadir}/config.kcfg/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
+%{_docdir}/HTML/en/*
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/*.so
-%{_includedir}/*
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/kde/*
+
 
 %changelog
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
+- License: GPLv2
+- update %%description
+- Provides: kdewebdev3 kommander 
+- BR: kdelibs3
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-1
+- 3.5.7
+- +Requires(hint): gnupg tidy
+- use Versioned Obsoletes/Provides: quanta
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Feb 2007 10:00:19 -0000	1.16
+++ sources	13 Sep 2007 13:07:26 -0000	1.17
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-fa1fc2d7c81465c7e1762014a892ced3  kdewebdev-3.5.6.tar.bz2
+1329e0aea45947a14faa3d936f9edb5d  kdewebdev-3.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 13:19:37 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 09:19:37 -0400
Subject: rpms/libselinux/F-7 libselinux-filecon.patch, NONE,
	1.1 libselinux-swig.patch, NONE, 1.1 libselinux.spec, 1.269, 1.270
Message-ID: <200709131319.l8DDJbtL006743@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6702

Modified Files:
	libselinux.spec 
Added Files:
	libselinux-filecon.patch libselinux-swig.patch 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
- Update swig bindings
- Fix getfilecon return codes


libselinux-filecon.patch:

--- NEW FILE libselinux-filecon.patch ---
--- libselinux-2.0.14/src/fgetfilecon.c	2007-04-24 10:36:20.000000000 -0400
+++ libselinux-2.0.14.new/src/fgetfilecon.c	2007-09-13 09:06:28.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	security_context_t rcontext;
 	int ret;
 
+	*context = NULL;
+
 	ret = fgetfilecon_raw(fd, &rcontext);
 
 	if (ret > 0) {
--- libselinux-2.0.14/src/getfilecon.c	2007-04-24 10:36:21.000000000 -0400
+++ libselinux-2.0.14.new/src/getfilecon.c	2007-09-13 09:06:13.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = getxattr(path, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	int ret;
 	security_context_t rcontext;
 
+	*context = NULL;
+
 	ret = getfilecon_raw(path, &rcontext);
 
 	if (ret > 0) {
--- libselinux-2.0.14/src/lgetfilecon.c	2007-04-24 10:36:20.000000000 -0400
+++ libselinux-2.0.14.new/src/lgetfilecon.c	2007-09-13 09:06:23.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	int ret;
 	security_context_t rcontext;
 
+	*context = NULL;
+
 	ret = lgetfilecon_raw(path, &rcontext);
 
 	if (ret > 0) {

libselinux-swig.patch:

--- NEW FILE libselinux-swig.patch ---
--- libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:13:49.000000000 -0400
+++ libselinux-2.0.14.new/src/selinuxswig.i	2007-09-13 09:07:20.000000000 -0400
@@ -1,7 +1,9 @@
-/* Author: Dan Walsh
+/* Authors: Dan Walsh
+ *          James Athey
  *
  * Copyright (C) 2004-2005 Red Hat
- * 
+ * Copyright (C) 2007 Tresys Technology, LLC
+ *
  *  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
@@ -17,207 +19,47 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 %module selinux
 %{
 	#include "selinux/selinux.h"
-	#include "selinux/get_context_list.h"
 %}
-%apply int *OUTPUT { int * };
+%apply int *OUTPUT { int *enforce };
 %apply int *OUTPUT { size_t * };
 
-%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) {
-	$1 = &temp;
-}
-%typemap(argout) security_context_t * (char *temp=NULL) {
-	if (*$1)
-		temp = *$1;
-	else
-		temp = "";
-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(temp));
-}
-
-%typemap(in) security_context_t {
-	$1 = (security_context_t)PyString_AsString($input);
-}
-
 %typedef unsigned mode_t;
 
-%include "../include/selinux/get_context_list.h"
-
-extern int is_selinux_enabled(void);
-extern int is_selinux_mls_enabled(void);
-extern void freecon(security_context_t con);
-extern void freeconary(security_context_t * con);
-extern int getcon(security_context_t *con);
-extern int setcon(security_context_t con);
-extern int getpidcon(int pid, security_context_t *con);
-extern int getprevcon(security_context_t *con);
-extern int getexeccon(security_context_t *con);
-extern int setexeccon(security_context_t con);
-extern int getfscreatecon(security_context_t *con);
-extern int setfscreatecon(security_context_t context);
-extern int getkeycreatecon(security_context_t *con);
-extern int setkeycreatecon(security_context_t context);
-extern int getsockcreatecon(security_context_t *con);
-extern int setsockcreatecon(security_context_t context);
-extern int getfilecon(const char *path, security_context_t *con);
-extern int lgetfilecon(const char *path, security_context_t *con);
-extern int fgetfilecon(int fd, security_context_t *con);
-extern int setfilecon(const char *path, security_context_t con);
-extern int lsetfilecon(const char *path, security_context_t con);
-extern int fsetfilecon(int fd, security_context_t con);
-extern int getpeercon(int fd, security_context_t *con);
-extern int selinux_mkload_policy(int preservebools);
-extern int selinux_init_load_policy(int *enforce);
-extern int security_set_boolean_list(size_t boolcnt, 
-				     SELboolean *boollist, 
-				     int permanent);
-extern int security_load_booleans(char *path);
-extern int security_check_context(security_context_t con);
-extern int security_canonicalize_context(security_context_t con,
-					 security_context_t *canoncon);
-extern int security_getenforce(void);
-extern int security_setenforce(int value);
-extern int security_policyvers(void);
-extern int security_get_boolean_names(char ***names, int *len);
-extern int security_get_boolean_pending(const char *name);
-extern int security_get_boolean_active(const char *name);
-extern int security_set_boolean(const char *name, int value);
-extern int security_commit_booleans(void);
-
-/* Set flags controlling operation of matchpathcon_init or matchpathcon. */
-#define MATCHPATHCON_BASEONLY 1 /* Only process the base file_contexts file. */
-#define MATCHPATHCON_NOTRANS  2 /* Do not perform any context translation. */
-extern void set_matchpathcon_flags(unsigned int flags);
-extern int matchpathcon_init(const char *path);
-extern int matchpathcon(const char *path,
-			mode_t mode,
-			security_context_t *con);
-
-extern int matchpathcon_init_prefix(const char *path,
-				    const char *prefix);
-extern void matchpathcon_fini(void);
-
-
-extern int matchmediacon(const char *media,
-		 security_context_t *con);
-
-extern int selinux_getenforcemode(int *enforce);
-extern const char *selinux_policy_root(void);
-extern const char *selinux_binary_policy_path(void);
-extern const char *selinux_failsafe_context_path(void);
-extern const char *selinux_removable_context_path(void);
-extern const char *selinux_default_context_path(void);
-extern const char *selinux_user_contexts_path(void);
-extern const char *selinux_file_context_path(void);
-extern const char *selinux_file_context_homedir_path(void);
-extern const char *selinux_file_context_local_path(void);
-extern const char *selinux_homedir_context_path(void);
-extern const char *selinux_media_context_path(void);
-extern const char *selinux_contexts_path(void);
-extern const char *selinux_securetty_types_path(void);
-extern const char *selinux_booleans_path(void);
-extern const char *selinux_customizable_types_path(void);
-extern const char *selinux_users_path(void);
-extern const char *selinux_usersconf_path(void);
-extern const char *selinux_translations_path(void);
-extern const char *selinux_netfilter_context_path(void);
-extern const char *selinux_path(void);
-#extern int selinux_check_passwd_access(access_vector_t requested);
-#extern int checkPasswdAccess(access_vector_t requested);
-
-extern int selinux_check_securetty_context(security_context_t tty_context);
-void set_selinuxmnt(char *mnt);
-
-#ifdef SWIGpython
-// This tells SWIG to treat char ** as a special case
-%typemap(in) char ** {
-  /* Check if is a list */
-  if (PyList_Check($input)) {
-    int size = PyList_Size($input);
-    int i = 0;
-    $1 = (char **) malloc((size+1)*sizeof(char *));
-    if ($1 == NULL) {
-	PyErr_SetString(PyExc_MemoryError,"Out of memory");
-	return NULL;
-    }
-    for (i = 0; i < size; i++) {
-      PyObject *o = PyList_GetItem($input,i);
-      if (PyString_Check(o))
-	$1[i] = PyString_AsString(PyList_GetItem($input,i));
-      else {
-	PyErr_SetString(PyExc_TypeError,"list must contain strings");
-	free($1);
-	return NULL;
-      }
-    }
-    $1[i] = 0;
-  } else {
-    PyErr_SetString(PyExc_TypeError,"not a list");
-    return NULL;
-  }
+%typemap(in, numinputs=0) (char ***names, int *len) (char **temp1, int temp2) {
+	$1 = &temp1;
+	$2 = &temp2;
 }
-#endif
 
-%typemap(in) char * const [] {
-	int i, size;
-	PyObject * s;
-
-	if (!PySequence_Check($input)) {
-		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
-		return NULL;
-	}
-
-	size = PySequence_Size($input);
-	
-	$1 = (char**) malloc(size + 1);
-
-	for(i = 0; i < size; i++) {
-		if (!PyString_Check(PySequence_GetItem($input, i))) {
-			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
-			return NULL;
+%typemap(freearg) (char ***names, int *len) {
+	int i;
+	if (*$1) {
+		for (i = 0; i < *$2; i++) {
+			free((*$1)[i]);
 		}
+		free(*$1);
 	}
-		
-	for(i = 0; i < size; i++) {
-		s = PySequence_GetItem($input, i);
-		$1[i] = (char*) malloc(PyString_Size(s) + 1);
-		strcpy($1[i], PyString_AsString(s));
-	}
-	$1[size] = NULL;
-}
-
-%typemap(freearg,match="in") char * const [] {
-	int i = 0;
-	while($1[i]) {
-		free($1[i]);
-		i++;
-	}
-	free($1);
 }
 
-extern int rpm_execcon(unsigned int verified,
-		       const char *filename,
-		       char *const argv[], char *const envp[]);
-
-extern int is_context_customizable (security_context_t scontext);
-
-extern int selinux_trans_to_raw_context(char *trans, 
-					security_context_t *rawp);
-extern int selinux_raw_to_trans_context(char *raw, 
-					security_context_t *transp);
-
-%typemap(in, numinputs=0) char **(char *temp=NULL) {
+%typemap(in, numinputs=0) (security_context_t **) (security_context_t *temp) {
 	$1 = &temp;
 }
 
-%typemap(argout) char ** {
-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+%typemap(freearg) (security_context_t **) {
+	if (*$1) freeconary(*$1);
 }
-extern int selinux_getpolicytype(char **enforce);
-extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
 
-int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
-int selinux_file_context_verify(const char *path, mode_t mode);
-int selinux_lsetfilecon_default(const char *path);
+/* Ignore functions that don't make sense when wrapped */
+%ignore freecon;
+%ignore freeconary;
+
+/* Ignore functions that take a function pointer as an argument */
+%ignore set_matchpathcon_printf;
+%ignore set_matchpathcon_invalidcon;
+%ignore set_matchpathcon_canoncon;
+
+%include "../include/selinux/selinux.h"
+%include "../include/selinux/get_default_type.h"
+%include "../include/selinux/get_context_list.h"
--- libselinux-2.0.14/src/selinuxswig_python.i	1969-12-31 19:00:00.000000000 -0500
+++ libselinux-2.0.14.new/src/selinuxswig_python.i	2007-09-13 09:07:28.000000000 -0400
@@ -0,0 +1,138 @@
+/* Author: James Athey
+ *
+ * Copyright (C) 2007 Tresys Technology, LLC
+ *
+ *  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
+ */
+
+%module selinux
+%{
+	#include "selinux/selinux.h"
+%}
+
+/* security_get_boolean_names() typemap */
+%typemap(argout) (char ***names, int *len) {
+	PyObject* list = PyList_New(*$2);
+	int i;
+	for (i = 0; i < *$2; i++) {
+		PyList_SetItem(list, i, PyString_FromString((*$1)[i]));
+	}
+	$result = SWIG_Python_AppendOutput($result, list);
+}
+
+/* Makes security_compute_user() return a Python list of contexts */
+%typemap(argout) (security_context_t **con) {
+	PyObject* plist;
+	int i, len = 0;
+	
+	if (*$1) {
+		while((*$1)[len])
+			len++;
+		plist = PyList_New(len);
+		for (i = 0; i < len; i++) {
+			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));
+		}
+	} else {
+		plist = PyList_New(0);
+	}
+
+	$result = SWIG_Python_AppendOutput($result, plist);
+}
+
+/* Makes functions in get_context_list.h return a Python list of contexts */
+%typemap(argout) (security_context_t **list) {
+	PyObject* plist;
+	int i;
+	
+	if (*$1) {
+		plist = PyList_New(result);
+		for (i = 0; i < result; i++) {
+			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));
+		}
+	} else {
+		plist = PyList_New(0);
+	}
+	/* Only return the Python list, don't need to return the length anymore */
+	$result = plist;
+}
+
+%typemap(in,noblock=1,numinputs=0) security_context_t * (security_context_t temp = 0) {
+	$1 = &temp;
+}
+%typemap(freearg,match="in") security_context_t * "";
+%typemap(argout,noblock=1) security_context_t * {
+	if (*$1) {
+		%append_output(SWIG_FromCharPtr(*$1));
+		freecon(*$1);
+	}
+	else {
+		Py_INCREF(Py_None);
+		%append_output(Py_None);
+	}
+}
+
+%typemap(in,noblock=1,numinputs=0) char ** (char * temp = 0) {
+	$1 = &temp;
+}
+%typemap(freearg,match="in") char ** "";
+%typemap(argout,noblock=1) char ** {
+	if (*$1) {
+		%append_output(SWIG_FromCharPtr(*$1));
+		free(*$1);
+	}
+	else {
+		Py_INCREF(Py_None);
+		%append_output(Py_None);
+	}
+}
+
+%typemap(in) char * const [] {
+	int i, size;
+	PyObject * s;
+
+	if (!PySequence_Check($input)) {
+		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
+		return NULL;
+	}
+
+	size = PySequence_Size($input);
+	
+	$1 = (char**) malloc(size + 1);
+
+	for(i = 0; i < size; i++) {
+		if (!PyString_Check(PySequence_GetItem($input, i))) {
+			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
+			return NULL;
+		}
+	}
+		
+	for(i = 0; i < size; i++) {
+		s = PySequence_GetItem($input, i);
+		$1[i] = (char*) malloc(PyString_Size(s) + 1);
+		strcpy($1[i], PyString_AsString(s));
+	}
+	$1[size] = NULL;
+}
+
+%typemap(freearg,match="in") char * const [] {
+	int i = 0;
+	while($1[i]) {
+		free($1[i]);
+		i++;
+	}
+	free($1);
+}
+
+%include "selinuxswig.i"
--- libselinux-2.0.14/Makefile	2007-09-13 09:13:49.000000000 -0400
+++ libselinux-2.0.14.new/Makefile	2007-09-13 09:08:20.000000000 -0400
@@ -2,7 +2,7 @@
 	$(MAKE) -C src 
 	$(MAKE) -C utils
 
-swigify: 
+swigify: all
 	$(MAKE) -C src swigify
 
 pywrap: 


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- libselinux.spec	7 Sep 2007 13:26:25 -0000	1.269
+++ libselinux.spec	13 Sep 2007 13:19:04 -0000	1.270
@@ -2,11 +2,13 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
 Patch: libselinux-rhat.patch
+Patch1: libselinux-swig.patch
+Patch2: libselinux-filecon.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -50,6 +52,8 @@
 %prep
 %setup -q
 %patch -p1 -b .rhat
+%patch1 -p1 -b .swig
+%patch2 -p1 -b .filecon
 
 %build
 make clean
@@ -122,6 +126,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
+- Update swig bindings
+- Fix getfilecon return codes
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
 - fix swig binding for rpm_execcon
 



From fedora-extras-commits at redhat.com  Thu Sep 13 13:43:18 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Thu, 13 Sep 2007 09:43:18 -0400
Subject: rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-newpoppler.patch, 1.1,
	1.2 ruby-gnome2.spec, 1.7, 1.8
Message-ID: <200709131343.l8DDhI9O010234@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/devel

Modified Files:
	ruby-gnome2-all-0.16.0-newpoppler.patch ruby-gnome2.spec 
Log Message:

- Newpoppler.patch updated for poppler 0.6


ruby-gnome2-all-0.16.0-newpoppler.patch:

Index: ruby-gnome2-all-0.16.0-newpoppler.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2-all-0.16.0-newpoppler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-gnome2-all-0.16.0-newpoppler.patch	3 Aug 2007 18:51:45 -0000	1.1
+++ ruby-gnome2-all-0.16.0-newpoppler.patch	13 Sep 2007 13:43:15 -0000	1.2
@@ -1,6 +1,282 @@
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2006-12-29 22:17:28.000000000 +0900
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2007-08-04 02:33:31.000000000 +0900
-@@ -136,7 +136,7 @@
+diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2007-09-13 09:19:35.000000000 -0300
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2007-09-13 09:21:32.000000000 -0300
+@@ -38,16 +38,27 @@ extern GType poppler_dest_get_type (void
+ #define REGION2RVAL(obj) (BOXED2RVAL(obj, GDK_TYPE_REGION))
+ #define RVAL2DEST(obj) ((PopplerDest *)RVAL2BOXED(obj, POPPLER_TYPE_DEST))
+ #define DEST2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_DEST))
++#define TRANS2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION))
++#define RVAL2TRANS(obj) ((PopplerPageTransition *)RVAL2BOXED(obj, POPPLER_TYPE_PAGE_TRANSITION))
++
+ #define DESTTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_DEST_TYPE))
+ #define ACTIONTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_ACTION_TYPE))
+ #define RVAL2ACTIONTYPE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_ACTION_TYPE))
++#define SELSTYLE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_SELECTION_STYLE))
++#define RVAL2SELSTYLE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_SELECTION_STYLE))
+ #define RVAL2COLOR(obj) ((GdkColor *)RVAL2BOXED(obj, GDK_TYPE_COLOR))
+ 
+ #define ACTION2RVAL(obj) (rb_poppler_ruby_object_from_action(obj))
+ #define RVAL2ACTION(obj) (rb_poppler_action_from_ruby_object(obj))
++#define FF2RVAL(obj) (rb_poppler_ruby_object_from_form_field(obj))
+ 
+ extern VALUE rb_poppler_ruby_object_from_action(PopplerAction *action);
+ extern PopplerAction *rb_poppler_action_from_ruby_object(VALUE action);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++extern VALUE rb_poppler_ruby_object_from_form_field(PopplerFormField *field);
++#endif
++
++#define RVAL2GDK_PIXBUF(pixbuf) (GDK_PIXBUF(RVAL2GOBJ(pixbuf)))
+ 
+ 
+ extern void Init_poppler_document(VALUE mPoppler);
+diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2007-09-13 09:19:47.000000000 -0300
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2007-09-13 09:21:06.000000000 -0300
+@@ -4,7 +4,7 @@
+   rbpoppler-page.c -
+ 
+   $Author$
+-  $Date$
++  $Date$
+ 
+   Copyright (C) 2006 Ruby-GNOME2 Project Team
+ 
+@@ -12,16 +12,39 @@
+ 
+ #include "rbpoppler.h"
+ 
++#define SELF(self) (POPPLER_PAGE(RVAL2GOBJ(self)))
+ #define RVAL2LM(obj) ((PopplerLinkMapping *)RVAL2BOXED(obj, POPPLER_TYPE_LINK_MAPPING))
++#define RVAL2IM(obj) ((PopplerImageMapping *)RVAL2BOXED(obj, POPPLER_TYPE_IMAGE_MAPPING))
++#define RVAL2FFM(obj) ((PopplerFormFieldMapping *)RVAL2BOXED(obj, POPPLER_TYPE_FORM_FIELD_MAPPING))
++#define RVAL2FF(obj) (POPPLER_FORM_FIELD(RVAL2GOBJ(obj)))
++#define RVAL2TF(obj) RVAL2FF(obj)
++#define RVAL2BF(obj) RVAL2FF(obj)
++#define RVAL2CF(obj) RVAL2FF(obj)
++
++#define TT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE))
++#define RVAL2TT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE))
++#define TA2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT))
++#define RVAL2TA(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT))
++#define TD2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION))
++#define RVAL2TD(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION))
++#define FFT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_FIELD_TYPE))
++#define RVAL2FFT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_FORM_FIELD_TYPE))
++#define FBT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_BUTTON_TYPE))
++#define FTT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_TEXT_TYPE))
++#define FCT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_CHOICE_TYPE))
+ 
+-static VALUE cPSFile;
++static VALUE cPSFile, cRectangle;
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++VALUE cUnknownField, cTextField, cButtonField, cChoiceField, cSignatureField;
++#endif
+ 
+ static VALUE
+ page_render_to_pixbuf(VALUE self, VALUE src_x, VALUE src_y, VALUE src_width,
+                       VALUE src_height, VALUE scale, VALUE rotation,
+                       VALUE pixbuf)
+ {
+-    poppler_page_render_to_pixbuf(RVAL2GOBJ(self), NUM2INT(src_x),
++    poppler_page_render_to_pixbuf(SELF(self), NUM2INT(src_x),
+                                   NUM2INT(src_y), NUM2INT(src_width),
+                                   NUM2INT(src_height), NUM2DBL(scale),
+                                   NUM2INT(rotation), RVAL2GOBJ(pixbuf));
+@@ -32,7 +55,7 @@ page_render_to_pixbuf(VALUE self, VALUE 
+ static VALUE
+ page_render(VALUE self, VALUE cairo)
+ {
+-    poppler_page_render(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo));
++    poppler_page_render(SELF(self), RVAL2CRCONTEXT(cairo));
+     return Qnil;
+ }
+ #endif
+@@ -40,7 +63,7 @@ page_render(VALUE self, VALUE cairo)
+ static VALUE
+ page_render_to_ps(VALUE self, VALUE ps_file)
+ {
+-    poppler_page_render_to_ps(RVAL2GOBJ(self), RVAL2GOBJ(ps_file));
++    poppler_page_render_to_ps(SELF(self), RVAL2GOBJ(ps_file));
+     return Qnil;
+ }
+ 
+@@ -48,7 +71,7 @@ static VALUE
+ page_render_generic(int argc, VALUE *argv, VALUE self)
+ {
+     if (argc == 1) {
+-        if (RTEST(rb_obj_is_kind_of(argv[0], cPSFile))) {
++        if (RVAL2CBOOL(rb_obj_is_kind_of(argv[0], cPSFile))) {
+             return page_render_to_ps(self, argv[0]);
+         } else {
+ #ifdef RB_POPPLER_CAIRO_AVAILABLE
+@@ -70,20 +93,34 @@ static VALUE
+ page_get_size(VALUE self)
+ {
+     double width, height;
+-    poppler_page_get_size(RVAL2GOBJ(self), &width, &height);
++    poppler_page_get_size(SELF(self), &width, &height);
+     return rb_ary_new3(2, rb_float_new(width), rb_float_new(height));
+ }
+ 
+ static VALUE
+ page_get_index(VALUE self)
+ {
+-    return INT2NUM(poppler_page_get_index(RVAL2GOBJ(self)));
++    return INT2NUM(poppler_page_get_index(SELF(self)));
++}
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_duration(VALUE self)
++{
++    return rb_float_new(poppler_page_get_duration(SELF(self)));
+ }
+ 
+ static VALUE
++page_get_transition(VALUE self)
++{
++    return TRANS2RVAL(poppler_page_get_transition(SELF(self)));
++}
++#endif
++
++static VALUE
+ page_get_thumbnail(VALUE self)
+ {
+-    return GOBJ2RVAL(poppler_page_get_thumbnail(RVAL2GOBJ(self)));
++    return GOBJ2RVAL(poppler_page_get_thumbnail(SELF(self)));
+ }
+ 
+ static VALUE
+@@ -91,7 +128,7 @@ page_get_thumbnail_size(VALUE self)
+ {
+     int width, height;
+ 
+-    if (poppler_page_get_thumbnail_size(RVAL2GOBJ(self), &width, &height))
++    if (poppler_page_get_thumbnail_size(SELF(self), &width, &height))
+         return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
+     else
+         return Qnil;
+@@ -100,17 +137,60 @@ page_get_thumbnail_size(VALUE self)
+ static VALUE
+ page_find_text(VALUE self, VALUE text)
+ {
+-    return GLIST2ARY2F(poppler_page_find_text(RVAL2GOBJ(self), RVAL2CSTR(text)),
++    return GLIST2ARY2F(poppler_page_find_text(SELF(self), RVAL2CSTR(text)),
+                        POPPLER_TYPE_RECTANGLE);
+ }
+ 
+ static VALUE
+-page_get_text(VALUE self, VALUE rect)
++page_get_text(int argc, VALUE *argv, VALUE self)
+ {
+     gchar *text;
+-    VALUE rb_text;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH;
++#endif
++    VALUE rb_text, arg1, arg2, rb_rect;
++    PopplerPage *page;
++
++    rb_scan_args(argc, argv, "02", &arg1, &arg2);
++
++    page = SELF(self);
++    if (NIL_P(arg1)) {
++        rb_rect = arg2;
++    } else {
++        if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) {
++            rb_rect = arg2;
++        } else {
++            rb_rect = Qnil;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++            if (!NIL_P(arg2)) {
++                style = RVAL2SELSTYLE(arg2);
++            }
++#endif
++        }
++    }
++
++    if (NIL_P(rb_rect)) {
++        PopplerRectangle rect;
++        double width, height;
++
++        rect.x1 = 0;
++        rect.y1 = 0;
++        poppler_page_get_size(page, &width, &height);
++        rect.x2 = width;
++        rect.y2 = height;
++        text = poppler_page_get_text(page,
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                     style,
++#endif
++                                     &rect);
++    } else {
++        text = poppler_page_get_text(page,
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                     style,
++#endif
++                                     RVAL2RECT(rb_rect));
++    }
+ 
+-    text = poppler_page_get_text(RVAL2GOBJ(self), RVAL2RECT(rect));
+     rb_text = CSTR2RVAL(text);
+     g_free(text);
+     return rb_text;
+@@ -119,15 +199,50 @@ page_get_text(VALUE self, VALUE rect)
+ static VALUE
+ page_get_link_mapping(VALUE self)
+ {
+-    return GLIST2ARY2F(poppler_page_get_link_mapping(RVAL2GOBJ(self)),
++    return GLIST2ARY2F(poppler_page_get_link_mapping(SELF(self)),
+                        POPPLER_TYPE_LINK_MAPPING);
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_image_mapping(VALUE self)
++{
++    return GLIST2ARY2F(poppler_page_get_image_mapping(SELF(self)),
++                       POPPLER_TYPE_IMAGE_MAPPING);
++}
++
++static VALUE
++page_get_form_field_mapping(VALUE self)
++{
++    return GLIST2ARY2F(poppler_page_get_form_field_mapping(SELF(self)),
++                       POPPLER_TYPE_FORM_FIELD_MAPPING);
++}
++#endif
++
+ static VALUE
+-page_get_selection_region(VALUE self, VALUE scale, VALUE selection)
++page_get_selection_region(int argc, VALUE *argv, VALUE self)
+ {
+-    return REGION2RVAL(poppler_page_get_selection_region(RVAL2GOBJ(self),
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH;
++#endif
++    VALUE arg2, arg3, scale, selection;
++
++    rb_scan_args(argc, argv, "21", &scale, &arg2, &arg3);
++
++    if (NIL_P(arg3)) {
++        selection = arg2;
++    } else {
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++        style = RVAL2SELSTYLE(arg2);
++#endif
++        selection = arg3;
++    }
++
++    return REGION2RVAL(poppler_page_get_selection_region(SELF(self),
+                                                          NUM2DBL(scale),
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                                         style,
++#endif
+                                                          RVAL2RECT(selection)));
+ }
+ 
+@@ -136,15 +251,16 @@ page_get_selection_region(VALUE self, VA
  static VALUE
  page_render_selection(VALUE self, VALUE cairo,
                        VALUE selection, VALUE rb_old_selection,
@@ -9,15 +285,17 @@
  {
      PopplerRectangle *old_selection = NULL;
  
-@@ -145,6 +145,7 @@
-     poppler_page_render_selection(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo),
+     if (!NIL_P(rb_old_selection))
+         old_selection = RVAL2RECT(rb_old_selection);
+-    poppler_page_render_selection(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo),
++    poppler_page_render_selection(SELF(self), RVAL2CRCONTEXT(cairo),
                                    RVAL2RECT(selection),
                                    old_selection,
 +                                  RVAL2SELSTYLE(style),
                                    RVAL2COLOR(glyph_color),
                                    RVAL2COLOR(background_color));
      return Qnil;
-@@ -159,17 +160,23 @@
+@@ -159,17 +275,24 @@ static VALUE
  page_render_selection_to_pixbuf(VALUE self, VALUE scale, VALUE rotation,
                                  VALUE pixbuf, VALUE selection,
                                  VALUE rb_old_selection,
@@ -31,7 +309,8 @@
      if (!NIL_P(rb_old_selection))
          old_selection = RVAL2RECT(rb_old_selection);
 -    poppler_page_render_selection_to_pixbuf(RVAL2GOBJ(self), NUM2DBL(scale),
-+    poppler_page_render_selection_to_pixbuf(SELF(self), NUM2DBL(scale),
++    poppler_page_render_selection_to_pixbuf(SELF(self),
++                                            NUM2DBL(scale),
                                              NUM2INT(rotation),
                                              RVAL2GOBJ(pixbuf),
                                              RVAL2RECT(selection),
@@ -42,7 +321,7 @@
                                              RVAL2COLOR(glyph_color),
                                              RVAL2COLOR(background_color));
      return Qnil;
-@@ -178,21 +185,34 @@
+@@ -178,24 +301,86 @@ page_render_selection_to_pixbuf(VALUE se
  static VALUE
  page_render_selection_generic(int argc, VALUE *argv, VALUE self)
  {
@@ -76,25 +355,525 @@
 +#else
 +                 7
 +#endif
-+        );
++                );
      }
  }
  
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2006-12-29 22:17:28.000000000 +0900
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2007-08-04 02:29:57.000000000 +0900
-@@ -33,6 +33,7 @@
- #  include <rb_cairo.h>
- #endif
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_crop_box(VALUE self)
++{
++    PopplerRectangle rect;
++
++    poppler_page_get_crop_box(SELF(self), &rect);
++    return RECT2RVAL(&rect);
++}
++#endif
++
++
++#define DEF_READER(prefix, name, member, self_to_c, member_to_rb)       \
++static VALUE                                                            \
++prefix ## _get_ ## name(VALUE self)                                     \
++{                                                                       \
++    return member_to_rb((self_to_c(self))->member);                     \
++}
++
++#define DEF_WRITER(prefix, name, member, self_to_c, value_to_c) \
++static VALUE                                                    \
++prefix ## _set_ ## name(VALUE self, VALUE value)                \
++{                                                               \
++    (self_to_c(self))->member = value_to_c(value);              \
++    return Qnil;                                                \
++}
++
++#define DEF_WRITER_WITH_SETTER(prefix, name, member,    \
++                               self_to_c, value_setter) \
++static VALUE                                            \
++prefix ## _set_ ## name(VALUE self, VALUE value)        \
++{                                                       \
++    value_setter((self_to_c(self))->member, value);     \
++    return Qnil;                                        \
++}
++
++#define DEF_ACCESSOR(prefix, member, self_to_c, member_to_rb, value_to_c) \
++    DEF_READER(prefix, member, member, self_to_c, member_to_rb)         \
++    DEF_WRITER(prefix, member, member, self_to_c, value_to_c)           \
++
++#define DEF_ACCESSOR_WITH_SETTER(prefix, member, self_to_c,             \
++                                 member_to_rb, value_setter)            \
++    DEF_READER(prefix, member, member, self_to_c, member_to_rb)         \
++    DEF_WRITER_WITH_SETTER(prefix, member, member, self_to_c, value_setter)
++
++#define DEF_ACCESSOR_WITH_NAME(prefix, name, member, self_to_c, \
++                               member_to_rb, value_to_c)        \
++    DEF_READER(prefix, name, member, self_to_c, member_to_rb)   \
++    DEF_WRITER(prefix, name, member, self_to_c, value_to_c)
  
-+#define SELF(self) (POPPLER_PAGE(RVAL2GOBJ(self)))
- #define RECT2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_RECTANGLE))
- #define RVAL2RECT(obj) ((PopplerRectangle *)RVAL2BOXED(obj, POPPLER_TYPE_RECTANGLE))
- #define REGION2RVAL(obj) (BOXED2RVAL(obj, GDK_TYPE_REGION))
-@@ -41,6 +42,7 @@
- #define DESTTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_DEST_TYPE))
- #define ACTIONTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_ACTION_TYPE))
- #define RVAL2ACTIONTYPE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_ACTION_TYPE))
-+#define RVAL2SELSTYLE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_SELECTION_STYLE))
- #define RVAL2COLOR(obj) ((GdkColor *)RVAL2BOXED(obj, GDK_TYPE_COLOR))
+ 
+ /* A rectangle on a page, with coordinates in PDF points. */
+@@ -213,107 +398,320 @@ rectangle_initialize(VALUE self, VALUE x
+     return Qnil;
+ }
  
- #define ACTION2RVAL(obj) (rb_poppler_ruby_object_from_action(obj))
++DEF_ACCESSOR(rectangle, x1, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, y1, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, x2, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, y2, RVAL2RECT, rb_float_new, NUM2DBL)
++
+ static VALUE
+-rectangle_get_x1(VALUE self)
++rectangle_to_a(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->x1);
++    PopplerRectangle *rectangle = RVAL2RECT(self);
++    return rb_ary_new3(4,
++                       rb_float_new(rectangle->x1),
++                       rb_float_new(rectangle->y1),
++                       rb_float_new(rectangle->x2),
++                       rb_float_new(rectangle->y2));
+ }
+ 
+-static VALUE
+-rectangle_get_y1(VALUE self)
++
++/* Mapping between areas on the current page and PopplerActions */
++#define RECT_ENTITY2RVAL(rect) RECT2RVAL(&(rect))
++#define RECT_ENTITY_SET(rect, rb_rect) rectangle_set(&(rect), rb_rect)
++static void
++rectangle_set(PopplerRectangle *rect, VALUE rb_rect)
+ {
+-    return rb_float_new(RVAL2RECT(self)->y1);
++    *rect = *(RVAL2RECT(rb_rect));
+ }
+ 
+-static VALUE
+-rectangle_get_x2(VALUE self)
++DEF_ACCESSOR_WITH_SETTER(link_mapping, area,
++                         RVAL2LM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(link_mapping, action, RVAL2LM, ACTION2RVAL, RVAL2ACTION)
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++
++/* Page Transition */
++DEF_ACCESSOR(page_trans, type, RVAL2TRANS, RVAL2TT, TT2RVAL)
++DEF_ACCESSOR(page_trans, alignment, RVAL2TRANS, RVAL2TA, TA2RVAL)
++DEF_ACCESSOR(page_trans, direction, RVAL2TRANS, RVAL2TD, TD2RVAL)
++DEF_ACCESSOR(page_trans, duration, RVAL2TRANS, NUM2INT, INT2NUM)
++DEF_ACCESSOR(page_trans, angle, RVAL2TRANS, NUM2INT, INT2NUM)
++DEF_ACCESSOR(page_trans, scale, RVAL2TRANS, NUM2DBL, rb_float_new)
++DEF_ACCESSOR(page_trans, rectangular, RVAL2TRANS, RVAL2CBOOL, CBOOL2RVAL)
++
++
++/* Mapping between areas on the current page and images */
++DEF_ACCESSOR_WITH_SETTER(image_mapping, area,
++                         RVAL2IM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(image_mapping, image, RVAL2IM, GOBJ2RVAL, RVAL2GDK_PIXBUF)
++
++
++/* Mapping between areas on the current page and form fields */
++VALUE
++rb_poppler_ruby_object_from_form_field(PopplerFormField *field)
++{
++    VALUE obj;
++
++    obj = rbgobj_ruby_object_from_instance2(field, FALSE);
++    if (NIL_P(obj)) {
++      switch (poppler_form_field_get_field_type(field)) {
++        case POPPLER_FORM_FIELD_UNKNOWN:
++          obj = rbgobj_create_object(cUnknownField);
++          break;
++        case POPPLER_FORM_FIELD_BUTTON:
++          obj = rbgobj_create_object(cButtonField);
++          break;
++        case POPPLER_FORM_FIELD_TEXT:
++          obj = rbgobj_create_object(cTextField);
++          break;
++        case POPPLER_FORM_FIELD_CHOICE:
++          obj = rbgobj_create_object(cChoiceField);
++          break;
++        case POPPLER_FORM_FIELD_SIGNATURE:
++          obj = rbgobj_create_object(cSignatureField);
++          break;
++      }
++      g_object_ref(field);
++      G_INITIALIZE(obj, (gpointer)field);
++    }
++
++    return obj;
++}
++
++DEF_ACCESSOR_WITH_SETTER(form_field_mapping, area,
++                         RVAL2FFM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(form_field_mapping, field, RVAL2FFM, FF2RVAL, RVAL2FF)
++
++/* FormField */
++VALUE
++form_field_get_id(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->x2);
++    return INT2NUM(poppler_form_field_get_id(RVAL2FF(self)));
+ }
+ 
+-static VALUE
+-rectangle_get_y2(VALUE self)
++VALUE
++form_field_get_font_size(VALUE self)
++{
++    return rb_float_new(poppler_form_field_get_font_size(RVAL2FF(self)));
++}
++
++VALUE
++form_field_is_read_only(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->y2);
++    return CBOOL2RVAL(poppler_form_field_is_read_only(RVAL2FF(self)));
+ }
+ 
++/* Button Field */
++VALUE
++button_field_get_button_type(VALUE self)
++{
++    return FBT2RVAL(poppler_form_field_button_get_button_type(RVAL2FF(self)));
++}
+ 
+-static VALUE
+-rectangle_set_x1(VALUE self, VALUE x1)
++VALUE
++button_field_get_state(VALUE self)
+ {
+-    RVAL2RECT(self)->x1 = NUM2DBL(x1);
++    return CBOOL2RVAL(poppler_form_field_button_get_state(RVAL2BF(self)));
++}
++
++VALUE
++button_field_set_state(VALUE self, VALUE state)
++{
++    poppler_form_field_button_set_state(RVAL2BF(self), RVAL2CBOOL(state));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_y1(VALUE self, VALUE y1)
++/* Text Field */
++VALUE
++text_field_get_text_type(VALUE self)
+ {
+-    RVAL2RECT(self)->y1 = NUM2DBL(y1);
++    return FTT2RVAL(poppler_form_field_text_get_text_type(RVAL2TF(self)));
++}
++
++VALUE
++text_field_get_text(VALUE self)
++{
++    return CSTR2RVAL(poppler_form_field_text_get_text(RVAL2TF(self)));
++}
++
++VALUE
++text_field_set_text(VALUE self, VALUE text)
++{
++    poppler_form_field_text_set_text(RVAL2TF(self), RVAL2CSTR2(text));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_x2(VALUE self, VALUE x2)
++VALUE
++text_field_get_max_length(VALUE self)
++{
++    return INT2NUM(poppler_form_field_text_get_max_len(RVAL2TF(self)));
++}
++
++VALUE
++text_field_do_spell_check(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_do_spell_check(RVAL2TF(self)));
++}
++
++VALUE
++text_field_do_scroll(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_do_scroll(RVAL2TF(self)));
++}
++
++VALUE
++text_field_is_rich_text(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_is_rich_text(RVAL2TF(self)));
++}
++
++VALUE
++text_field_is_password(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_is_password(RVAL2TF(self)));
++}
++
++
++/* Choice Field */
++VALUE
++choice_field_get_choice_type(VALUE self)
++{
++    return FCT2RVAL(poppler_form_field_choice_get_choice_type(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_is_editable(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_is_editable(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_can_select_multiple(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_can_select_multiple(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_do_spell_check(VALUE self)
+ {
+-    RVAL2RECT(self)->x2 = NUM2DBL(x2);
++    return CBOOL2RVAL(poppler_form_field_choice_do_spell_check(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_commit_on_change(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_commit_on_change(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_get_n_items(VALUE self)
++{
++    return INT2NUM(poppler_form_field_choice_get_n_items(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_get_item(VALUE self, VALUE index)
++{
++    return CSTR2RVAL(poppler_form_field_choice_get_item(RVAL2CF(self),
++                                                        NUM2INT(index)));
++}
++
++VALUE
++choice_field_is_item_selected(VALUE self, VALUE index)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_is_item_selected(RVAL2CF(self),
++                                                                 NUM2INT(index)));
++}
++
++VALUE
++choice_field_select_item(VALUE self, VALUE index)
++{
++    poppler_form_field_choice_select_item(RVAL2CF(self), NUM2INT(index));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_y2(VALUE self, VALUE y2)
++VALUE
++choice_field_unselect_all(VALUE self)
+ {
+-    RVAL2RECT(self)->y2 = NUM2DBL(y2);
++    poppler_form_field_choice_unselect_all(RVAL2CF(self));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_to_a(VALUE self)
++VALUE
++choice_field_toggle_item(VALUE self, VALUE index)
+ {
+-    PopplerRectangle *rectangle = RVAL2RECT(self);
+-    return rb_ary_new3(4,
+-                       rb_float_new(rectangle->x1),
+-                       rb_float_new(rectangle->y1),
+-                       rb_float_new(rectangle->x2),
+-                       rb_float_new(rectangle->y2));
++    poppler_form_field_choice_toggle_item(RVAL2CF(self), NUM2INT(index));
++    return Qnil;
+ }
+ 
+-
+-/* Mapping between areas on the current page and PopplerActions */
+-static VALUE
+-link_mapping_get_area(VALUE self)
++VALUE
++choice_field_set_text(VALUE self, VALUE text)
+ {
+-    return RECT2RVAL(&(RVAL2LM(self)->area));
++    poppler_form_field_choice_set_text(RVAL2CF(self), RVAL2CSTR2(text));
++    return Qnil;
+ }
+ 
+-static VALUE
+-link_mapping_get_action(VALUE self)
++VALUE
++choice_field_get_text(VALUE self)
+ {
+-    return ACTION2RVAL(RVAL2LM(self)->action);
++    return CSTR2RVAL(poppler_form_field_choice_get_text(RVAL2CF(self)));
+ }
++#endif
+ 
+ void
+ Init_poppler_page(VALUE mPoppler)
+ {
+-    VALUE cPage, cRectangle, cLinkMapping;
++    VALUE cPage, cLinkMapping;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    VALUE cPageTransition, cImageMapping, cFormFieldMapping, cFormField;
++#endif
+ 
+     cPage = G_DEF_CLASS(POPPLER_TYPE_PAGE, "Page", mPoppler);
+     cRectangle = G_DEF_CLASS(POPPLER_TYPE_RECTANGLE, "Rectangle", mPoppler);
+     cLinkMapping = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping",
+                                mPoppler);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    cPageTransition = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION,
++                                  "PageTransition", mPoppler);
++    cImageMapping = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING,
++                                "ImageMapping", mPoppler);
++    cFormFieldMapping = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING,
++                                    "FormFieldMapping", mPoppler);
++
++    cFormField = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD, "FormField", mPoppler);
++    cUnknownField = rb_define_class_under(mPoppler, "UnknownField", cFormField);
++    cTextField = rb_define_class_under(mPoppler, "TextField", cFormField);
++    cButtonField = rb_define_class_under(mPoppler, "ButtonField", cFormField);
++    cChoiceField = rb_define_class_under(mPoppler, "ChoiceField", cFormField);
++    cSignatureField = rb_define_class_under(mPoppler, "SignatureField",
++                                            cFormField);
++#endif
+     cPSFile = rb_const_get(mPoppler, rb_intern("PSFile"));
+ 
+     rb_define_method(cPage, "render", page_render_generic, -1);
+     rb_define_method(cPage, "size", page_get_size, 0);
+     rb_define_method(cPage, "index", page_get_index, 0);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "duration", page_get_duration, 0);
++    rb_define_method(cPage, "transition", page_get_transition, 0);
++#endif
+     rb_define_method(cPage, "thumbnail", page_get_thumbnail, 0);
+     rb_define_method(cPage, "thumbnail_size", page_get_thumbnail_size, 0);
+     rb_define_method(cPage, "find_text", page_find_text, 1);
+-    rb_define_method(cPage, "get_text", page_get_text, 1);
++    rb_define_method(cPage, "get_text", page_get_text, -1);
+     rb_define_method(cPage, "link_mapping", page_get_link_mapping, 0);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "image_mapping", page_get_image_mapping, 0);
++    rb_define_method(cPage, "form_field_mapping",
++                     page_get_form_field_mapping, 0);
++#endif
+     rb_define_method(cPage, "get_selection_region",
+-                     page_get_selection_region, 2);
++                     page_get_selection_region, -1);
+     rb_define_method(cPage, "render_selection",
+                      page_render_selection_generic, -1);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "crop_box", page_get_crop_box, 0);
++#endif
+ 
+     G_DEF_SETTERS(cPage);
+ 
+@@ -335,5 +733,102 @@ Init_poppler_page(VALUE mPoppler)
+     rb_define_method(cLinkMapping, "area", link_mapping_get_area, 0);
+     rb_define_method(cLinkMapping, "action", link_mapping_get_action, 0);
+ 
++    rb_define_method(cLinkMapping, "set_area", link_mapping_set_area, 1);
++    rb_define_method(cLinkMapping, "set_action", link_mapping_set_action, 1);
++
+     G_DEF_SETTERS(cLinkMapping);
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++/* Page Transition */
++    rb_define_method(cPageTransition, "type", page_trans_get_type, 0);
++    rb_define_method(cPageTransition, "alignment", page_trans_get_alignment, 0);
++    rb_define_method(cPageTransition, "direction", page_trans_get_direction, 0);
++    rb_define_method(cPageTransition, "duration", page_trans_get_duration, 0);
++    rb_define_method(cPageTransition, "angle", page_trans_get_angle, 0);
++    rb_define_method(cPageTransition, "scale", page_trans_get_scale, 0);
++    rb_define_method(cPageTransition, "rectangular",
++                     page_trans_get_rectangular, 0);
++
++    rb_define_method(cPageTransition, "set_type", page_trans_set_type, 1);
++    rb_define_method(cPageTransition, "set_alignment",
++                     page_trans_set_alignment, 1);
++    rb_define_method(cPageTransition, "set_direction",
++                     page_trans_set_direction, 1);
++    rb_define_method(cPageTransition, "set_duration",
++                     page_trans_set_duration, 1);
++    rb_define_method(cPageTransition, "set_angle", page_trans_set_angle, 1);
++    rb_define_method(cPageTransition, "set_scale", page_trans_set_scale, 1);
++    rb_define_method(cPageTransition, "set_rectangular",
++                     page_trans_set_rectangular, 1);
++
++    G_DEF_SETTERS(cPageTransition);
++
++
++/* Mapping between areas on the current page and images */
++    rb_define_method(cImageMapping, "area", image_mapping_get_area, 0);
++    rb_define_method(cImageMapping, "image", image_mapping_get_image, 0);
++
++    rb_define_method(cImageMapping, "set_area", image_mapping_set_area, 1);
++    rb_define_method(cImageMapping, "set_image", image_mapping_set_image, 1);
++
++    G_DEF_SETTERS(cImageMapping);
++
++
++/* Mapping between areas on the current page and form fields */
++    rb_define_method(cFormFieldMapping, "area", form_field_mapping_get_area, 0);
++    rb_define_method(cFormFieldMapping, "field", form_field_mapping_get_field,
++                     0);
++
++    rb_define_method(cFormFieldMapping, "set_area",
++                     form_field_mapping_set_area, 1);
++    rb_define_method(cFormFieldMapping, "set_field",
++                     form_field_mapping_set_field, 1);
++
++    G_DEF_SETTERS(cFormFieldMapping);
++
++/* FormField */
++    rb_define_method(cFormField, "id", form_field_get_id, 0);
++    rb_define_method(cFormField, "font_size", form_field_get_font_size, 0);
++    rb_define_method(cFormField, "read_only?", form_field_is_read_only, 0);
++
++    G_DEF_SETTERS(cFormField);
++
++
++    rb_define_method(cButtonField, "active?", button_field_get_state, 0);
++    rb_define_method(cButtonField, "set_active", button_field_set_state, 1);
++
++    G_DEF_SETTERS(cButtonField);
++
++
++    rb_define_method(cTextField, "type", text_field_get_text_type, 0);
++    rb_define_method(cTextField, "text", text_field_get_text, 0);
++    rb_define_method(cTextField, "set_text", text_field_set_text, 1);
++    rb_define_method(cTextField, "max_length", text_field_get_max_length, 0);
++    rb_define_method(cTextField, "spell_check?", text_field_do_spell_check, 0);
++    rb_define_method(cTextField, "scroll?", text_field_do_scroll, 0);
++    rb_define_method(cTextField, "rich_text?", text_field_is_rich_text, 0);
++    rb_define_method(cTextField, "password?", text_field_is_password, 0);
++
++    G_DEF_SETTERS(cTextField);
++
++
++    rb_define_method(cChoiceField, "type", choice_field_get_choice_type, 0);
++    rb_define_method(cChoiceField, "editable?", choice_field_is_editable, 0);
++    rb_define_method(cChoiceField, "select_multiple?",
++                     choice_field_can_select_multiple, 0);
++    rb_define_method(cChoiceField, "spell_check?",
++                     choice_field_do_spell_check, 0);
++    rb_define_method(cChoiceField, "commit_on_change?",
++                     choice_field_commit_on_change, 0);
++    rb_define_method(cChoiceField, "n_items", choice_field_get_n_items, 0);
++    rb_define_method(cChoiceField, "[]", choice_field_get_item, 1);
++    rb_define_method(cChoiceField, "selected?",
++                     choice_field_is_item_selected, 1);
++    rb_define_method(cChoiceField, "select", choice_field_select_item, 1);
++    rb_define_method(cChoiceField, "unselect_all", choice_field_unselect_all, 0);
++    rb_define_method(cChoiceField, "text", choice_field_get_text, 0);
++    rb_define_method(cChoiceField, "set_text", choice_field_set_text, 1);
++
++    G_DEF_SETTERS(cChoiceField);
++#endif
+ }


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-gnome2.spec	8 Sep 2007 14:48:48 -0000	1.7
+++ ruby-gnome2.spec	13 Sep 2007 13:43:15 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -622,6 +622,9 @@
 
 %changelog
 
+* Thu Sep 13 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-12
+- Newpoppler.patch updated for poppler 0.6
+
 * Sat Sep  8 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-11
 - Rebuild against new poppler
 - Changed license to LGPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 13 13:49:11 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 09:49:11 -0400
Subject: rpms/ginac/devel .cvsignore, 1.7, 1.8 ginac.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200709131349.l8DDnBcv010578@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10541

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release, changes to file lists.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Aug 2007 20:33:19 -0000	1.7
+++ .cvsignore	13 Sep 2007 13:48:38 -0000	1.8
@@ -1 +1 @@
-ginac-1.3.7.tar.bz2
+ginac-1.4.0.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ginac.spec	21 Aug 2007 20:33:19 -0000	1.11
+++ ginac.spec	13 Sep 2007 13:48:38 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.3.7
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -88,22 +88,21 @@
 %files devel
 %defattr(-,root,root)
 %{_infodir}/*.info*
-%{_mandir}/man?/ginac-config.1*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/ginac.pc
 %{_includedir}/ginac
-%{_bindir}/ginac-config
-%{_datadir}/aclocal/ginac.m4
 %exclude %{_libdir}/*.la
 
 %files utils
 %defattr(-,root,root)
-%{_bindir}/ginsh
-%{_bindir}/viewgar
-%{_mandir}/man?/ginsh.1*
-%{_mandir}/man?/viewgar.1*
+%{_bindir}/*
+%{_mandir}/man?/*
 
 %changelog
+* Wed Sep 12 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-1
+- New release. Changes file lists to reflect the removal of some files
+  previously in the devel package.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sf.net> 1.3.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Aug 2007 20:33:19 -0000	1.7
+++ sources	13 Sep 2007 13:48:38 -0000	1.8
@@ -1 +1 @@
-27e4a8182a4c50e4030412d091bdbc6c  ginac-1.3.7.tar.bz2
+e8eee1be68d32d5f5961afa2667928c3  ginac-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 14:32:05 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 10:32:05 -0400
Subject: rpms/cln/devel cln.spec,1.22,1.23
Message-ID: <200709131432.l8DEW5CK018377@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18336

Modified Files:
	cln.spec 
Log Message:
Add pkgconfig as a dependency of -devel.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cln.spec	21 Aug 2007 20:21:41 -0000	1.22
+++ cln.spec	13 Sep 2007 14:31:32 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -21,7 +21,7 @@
 %package devel
 Summary:        Development files for programs using the CLN library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release} gmp-devel
+Requires:       %{name} = %{version}-%{release} gmp-devel pkgconfig
 
 %description devel
 A collection of C++ math classes and functions, which are designed for
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Thu Sep 13 2007 Quentin Spencer <qspencer at users.sf.net> 1.1.13-4
+- Add pkgconfig as a dependency of -devel.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sf.net> 1.1.13-3
 - Rebuild for F8.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 14:36:38 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 10:36:38 -0400
Subject: rpms/ginac/devel ginac.spec,1.12,1.13
Message-ID: <200709131436.l8DEacbO018556@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18526

Modified Files:
	ginac.spec 
Log Message:
Add pkgconfig as a dependency of -devel.


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ginac.spec	13 Sep 2007 13:48:38 -0000	1.12
+++ ginac.spec	13 Sep 2007 14:36:05 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ginac
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
@@ -24,7 +24,7 @@
 %package devel
 Summary: GiNaC development libraries and header files
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} cln-devel
+Requires: %{name} = %{version}-%{release} cln-devel pkgconfig
 Obsoletes: GiNaC-devel < 1.3.2
 Provides:  GiNaC-devel = %{version}-%{release}
 
@@ -99,6 +99,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Thu Sep 13 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-2
+- Add pkgconfig as a dependency of -devel.
+
 * Wed Sep 12 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-1
 - New release. Changes file lists to reflect the removal of some files
   previously in the devel package.



From fedora-extras-commits at redhat.com  Thu Sep 13 14:49:49 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Thu, 13 Sep 2007 10:49:49 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.443, 1.444 anaconda.spec, 1.579, 
	1.580 sources, 1.571, 1.572
Message-ID: <200709131449.l8DEnnQT018998@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18972

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- .cvsignore	5 Sep 2007 15:35:55 -0000	1.443
+++ .cvsignore	13 Sep 2007 14:49:17 -0000	1.444
@@ -1 +1,2 @@
 anaconda-11.3.0.28.tar.bz2
+anaconda-11.3.0.29.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- anaconda.spec	5 Sep 2007 15:35:55 -0000	1.579
+++ anaconda.spec	13 Sep 2007 14:49:17 -0000	1.580
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.28
+Version: 11.3.0.29
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,29 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 13 2007 Chris Lumens <clumens at redhat.com> 11.3.0.29-1
+- On the graphical netconfig screen, only check the gateway address if
+  provided (dcantrell).
+- Don't show wireless adapters unless explicitly requested (katzj).
+- Add user and services commands and scripts to anaconda-ks.cfg
+- Fix handling of groups from the kickstart user command.
+- Support loading updates from partitioned devices.
+- Rework netlink code to support > 10 devices and not get caught in
+  an infinite loop (pjones, dcantrell).
+- Fix args passed to iscsiadm (k.georgiou AT imperial DOT ac DOT uk,
+  #283791).
+- Set flags.selinux (katzj, #244691).
+- Be more accepting when waiting for an sshd response
+  (alanm AT redhat DOT com, #286031).
+- Probe USB to make USB network installs work (H.J. Lu, #285491).
+- Rework driver package installation to be more generic.
+- Turn off swaps we didn't turn on so livecds don't blow up (katzj).
+- Add new Chinese and Japanese font packages (katzj, #279931).
+- Fix another upgrade GUI traceback (#281031).
+- Correctly identify when the VNC server doesn't start.
+- Display the correct signal name when loader exits (pjones).
+- Change method for determining maximum LV size (msivak, #242508).
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
 - Make sure we find out about all nics (dcantrell)
 - Hard drive install fixing (clumens, #287241)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- sources	5 Sep 2007 15:35:55 -0000	1.571
+++ sources	13 Sep 2007 14:49:17 -0000	1.572
@@ -1 +1 @@
-9e00bb0aebbbe4e388a77e3dcec5866d  anaconda-11.3.0.28.tar.bz2
+29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 15:14:50 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 13 Sep 2007 11:14:50 -0400
Subject: rpms/qt4/devel qtdemo-qt4.png,NONE,1.1 qt4.spec,1.62,1.63
Message-ID: <200709131514.l8DFEoLf025487@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459

Modified Files:
	qt4.spec 
Added Files:
	qtdemo-qt4.png 
Log Message:
fixed bz241452, add qtdemo/qtconfig icons



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qt4.spec	23 Aug 2007 11:57:32 -0000	1.62
+++ qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -43,6 +43,8 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
+Source30: qtdemo-qt4.png
+
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
@@ -415,6 +417,11 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
+# qtdemo/qtconfig icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
+install -p -m644 -D tools/qtconfig/images/appicon.png \
+                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
 prefix=%{_qt4_prefix}
@@ -510,6 +517,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -572,6 +580,7 @@
 %{_qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -599,6 +608,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
+- fixed bz241452, add qtdemo/qtconfig icons
+
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:15:21 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:15:21 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util-addosgimanifest.patch,
	NONE, 1.1
Message-ID: <200709131515.l8DFFLjJ025532@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25522

Added Files:
	ws-commons-util-addosgimanifest.patch 
Log Message:
* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
- maven-ify.
- Add OSGi MANIFEST information.

ws-commons-util-addosgimanifest.patch:

--- NEW FILE ws-commons-util-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 13:42:28.000000000 -0400
+++ pom.xml	2007-09-06 13:48:26.000000000 -0400
@@ -100,6 +100,24 @@
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.ws.commons.util</Bundle-SymbolicName>
+			    <Bundle-Version>1.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.0", org.apache.ws.commons.util;version="1.0.0"</Export-Package>
+			    <Import-Package>javax.xml, javax.xml.namespace, org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
         </plugins>
     </build>
     <dependencies>



From fedora-extras-commits at redhat.com  Thu Sep 13 15:15:51 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:15:51 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.1,1.2
Message-ID: <200709131515.l8DFFpXM025616@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25481

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
- maven-ify.
- Add OSGi MANIFEST information.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws-commons-util.spec	20 Mar 2007 01:49:46 -0000	1.1
+++ ws-commons-util.spec	13 Sep 2007 15:14:47 -0000	1.2
@@ -1,15 +1,24 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://apache.osuosl.org/ws/commons/util/
 Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
+Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jpackage-utils >= 1.5
+BuildRequires:  maven2
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-source
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  junit
+BuildRequires:  java-javadoc
 
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -28,25 +37,24 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
-
-cd src/main/java
-find ./ -name \*.java | xargs javac
-find ./ -name \*.class| xargs jar cvf %{name}-%{version}.jar
-mkdir html
-find ./ -name \*.java | xargs javadoc -d html
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp \
+  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  install javadoc:javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd src/main/java
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pR html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 aot-compile-rpm
@@ -70,5 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
+- maven-ify.
+- Add OSGi MANIFEST information.
+
 * Fri Mar 16 2007 Anthony Green <green at redhat.com> - 1.0.1-1
 - Created.



From fedora-extras-commits at redhat.com  Thu Sep 13 15:19:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:19:34 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.2,1.3
Message-ID: <200709131519.l8DFJYug025781@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25733

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
- Bump release.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ws-commons-util.spec	13 Sep 2007 15:14:47 -0000	1.2
+++ ws-commons-util.spec	13 Sep 2007 15:19:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
+- Bump release.
+
 * Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
 - maven-ify.
 - Add OSGi MANIFEST information.



From fedora-extras-commits at redhat.com  Thu Sep 13 15:23:46 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 13 Sep 2007 11:23:46 -0400
Subject: rpms/qt4/devel qt-x11-opensource-src-4.3.1-64bit.patch, NONE,
	1.1 qt4.spec, 1.63, 1.64 qt-x11-opensource-src-4.3.1-ppc64.patch,
	1.1, NONE
Message-ID: <200709131523.l8DFNkUS025979@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.1-64bit.patch 
Removed Files:
	qt-x11-opensource-src-4.3.1-ppc64.patch 
Log Message:
fixed bz249242, designer4 - segmentation fault on s390x



qt-x11-opensource-src-4.3.1-64bit.patch:

--- NEW FILE qt-x11-opensource-src-4.3.1-64bit.patch ---
diff -up qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64 qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h
--- qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64	2007-08-07 08:08:39.000000000 -0500
+++ qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h	2007-08-23 06:54:36.000000000 -0500
@@ -44,7 +44,7 @@
 QT_BEGIN_HEADER
 
 #if defined(Q_CC_GNU)
-#ifdef __64BIT__
+#if defined(__64BIT__) || defined(__powerpc64__) || defined(__s390x__)
 #  define LPARX "ldarx"
 #  define CMPP  "cmpd"
 #  define STPCX "stdcx."


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
+++ qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
@@ -29,8 +29,8 @@
 Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# ppc64 segfaults, http://bugzilla.redhat.com/246324
-Patch3: qt-x11-opensource-src-4.3.1-ppc64.patch
+# ppc64/s390x segfaults, http://bugzilla.redhat.com/246324,249242
+Patch3: qt-x11-opensource-src-4.3.1-64bit.patch
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -610,6 +610,7 @@
 %changelog
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
+- fixed bz249242, designer4 - segmentation fault on s390x
 
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)


--- qt-x11-opensource-src-4.3.1-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:49 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:28:49 -0400
Subject: rpms/ws-commons-util Makefile,1.1,1.2
Message-ID: <200709131528.l8DFSnog026141@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26077

Modified Files:
	Makefile 
Log Message:
Fix name once and for all.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Mar 2007 23:35:49 -0000	1.1
+++ Makefile	13 Sep 2007 15:28:16 -0000	1.2
@@ -1,4 +1,4 @@
-# Top level Makefile for module ws-common-utils
+# Top level Makefile for module ws-commons-util
 all : CVS/Root common-update
 	@cvs update
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:52 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:28:52 -0400
Subject: rpms/ws-commons-util/devel Makefile,1.1,1.2
Message-ID: <200709131528.l8DFSqXA026145@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26077/devel

Modified Files:
	Makefile 
Log Message:
Fix name once and for all.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Mar 2007 23:35:56 -0000	1.1
+++ Makefile	13 Sep 2007 15:28:19 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: ws-common-utils
+# Makefile for source rpm: ws-commons-util
 # $Id$
-NAME := ws-common-utils
+NAME := ws-commons-util
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:51 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 13 Sep 2007 11:28:51 -0400
Subject: rpms/smolt/EL-4 smolt.spec,1.24,1.25
Message-ID: <200709131528.l8DFSpxH026144@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26088

Modified Files:
	smolt.spec 
Log Message:
added proper EL-4 release for the client


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- smolt.spec	22 Jun 2007 15:35:09 -0000	1.24
+++ smolt.spec	13 Sep 2007 15:28:18 -0000	1.25
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 0.9.8.3
-Release: 1%{?dist}
+Version: 0.9.8.4
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -15,7 +15,6 @@
 BuildArch: noarch
 Requires: dbus-python
 BuildRequires: gettext
-BuildRequires: /usr/bin/msgfmt.py
 BuildRequires: desktop-file-utils
 
 Requires(post): /sbin/chkconfig
@@ -31,29 +30,6 @@
 
 This package contains the client
 
-%package server
-Summary: Fedora hardware profiler server
-Group: Applications/Internet
-Requires: smolt = %{version}-%{release}
-Requires: TurboGears
-
-%description server
-The Fedora hardware profiler is a server-client system that does a hardware
-scan against a machine and sends the results to a public Fedora Project
-turbogears server.  The sends are anonymous and should not contain any private
-information other than the physical hardware information and basic OS info.
-
-This package contains the server portion
-
-%package firstboot
-Summary: Fedora hardware profile firstboot
-Group: Applications/Internet
-Requires: smolt = %{version}-%{release}
-
-%description firstboot
-This provides firstboot integration for smolt.  It has been broken into a
-separate package so firstboot isn't a requisite to use smolt.
-
 %package gui
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
@@ -72,56 +48,59 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
+cd client
+DESTDIR=%{buildroot} make install
+cd ..
+%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
-%{__mkdir} -p %{buildroot}/%{_bindir}
-%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
+#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
+#%{__mkdir} -p %{buildroot}/%{_bindir}
 %{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_datadir}/locale/
-%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
+#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
-%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt
-%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/
+#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt
+#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/
 
-find %{buildroot} -name \*.po\* -delete
+#find %{buildroot} -name \*.po\* -delete
 
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
 
-%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/
-%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/
-%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/
+#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/
+#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/
+#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/
 
 # Icons
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
-%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
 %{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
 %{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
 %{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
 %{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
 %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
-%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/pixmaps/smolt.png
 
-%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
-%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
+#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
+#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
+
+#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py
+#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
+#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt
 
+%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
 ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
-%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py
-%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
-%{__chmod} +x %{buildroot}/%{_initrddir}/smolt
+ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
 desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
-
 %find_lang %{name}
 
+# Cleanup from the Makefile (will be cleaned up when it is finalized)
+%{__rm} -f %{buildroot}/etc/init.d/smolt
+%{__rm} -f %{buildroot}/etc/smolt/hw-uuid
+
 %clean
 rm -rf %{buildroot}
 
@@ -148,19 +127,11 @@
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
+%{_sysconfdir}/%{name}/config.*
 %{_sysconfdir}/cron.d/%{name}
 %{_initrddir}/%{name}
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid
 
-%files server
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/smoon
-
-%files firstboot
-%defattr(-,root,root,-)
-%{_datadir}/firstboot/modules/smolt.py*
-%{_datadir}/firstboot/pixmaps/smolt.png
-
 %files gui
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-smolt.desktop
@@ -168,6 +139,18 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+- Removed firstboot and server portions for EL-4
+
+* Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4
+- Rebuild to clean up 'config.py' compilations
+
+* Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-1
+- Upstream released new version (major changes)
+- New config file
+- New Makefile
+- Added deps
+
 * Fri Jun 22 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:32:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 13 Sep 2007 11:32:46 -0400
Subject: rpms/smolt/EL-4 smolt.spec,1.25,1.26 sources,1.15,1.16
Message-ID: <200709131532.l8DFWks5026357@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288

Modified Files:
	smolt.spec sources 
Log Message:
updated sources file and release bump


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- smolt.spec	13 Sep 2007 15:28:18 -0000	1.25
+++ smolt.spec	13 Sep 2007 15:32:13 -0000	1.26
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -139,7 +139,7 @@
 %{_bindir}/smoltGui
 
 %changelog
-* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
 - Removed firstboot and server portions for EL-4
 
 * Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2007 15:35:09 -0000	1.15
+++ sources	13 Sep 2007 15:32:13 -0000	1.16
@@ -1,2 +1 @@
-cd9a9b1b3424423b8695442b0e264a7c  smolt-0.9.8.1.tar.gz
-69d08a3cf15b5e42aeba2af8f376cb21  smolt-0.9.8.3.tar.gz
+2b79adbf0271160d55f4540008d0859f  smolt-0.9.8.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:35:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 11:35:23 -0400
Subject: rpms/mcstrans/devel mcstrans.spec,1.29,1.30 sources,1.19,1.20
Message-ID: <200709131535.l8DFZNwt026449@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419

Modified Files:
	mcstrans.spec sources 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
- Check for max_categories and error out



Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mcstrans.spec	1 Mar 2007 21:09:58 -0000	1.29
+++ mcstrans.spec	13 Sep 2007 15:34:50 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.2.5
+Version: 0.2.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
@@ -70,6 +70,9 @@
 %{_sysconfdir}/rc.d/init.d/mcstrans
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
+- Check for max_categories and error out
+
 * Thu Mar 1 2007 Dan Walsh <dwalsh at redhat.com> 0.2.5-1
 - Fix case where s0=""
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Mar 2007 21:09:58 -0000	1.19
+++ sources	13 Sep 2007 15:34:50 -0000	1.20
@@ -1 +1 @@
-64d7b1938b25d3eaae211e15777b1794  mcstrans-0.2.5.tgz
+85e22ebd19c93b1120003050691889fe  mcstrans-0.2.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:44:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 11:44:51 -0400
Subject: rpms/mcstrans/devel .cvsignore,1.16,1.17
Message-ID: <200709131544.l8DFipqL026657@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26624

Modified Files:
	.cvsignore 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
- Check for max_categories and error out



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Mar 2007 21:09:58 -0000	1.16
+++ .cvsignore	13 Sep 2007 15:44:18 -0000	1.17
@@ -13,3 +13,4 @@
 mcstrans-0.2.3.tgz
 mcstrans-0.2.4.tgz
 mcstrans-0.2.5.tgz
+mcstrans-0.2.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:46:02 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:46:02 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.3,1.4
Message-ID: <200709131546.l8DFk2tS026743@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26715

Modified Files:
	ws-commons-util.spec 
Log Message:
Bump again.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ws-commons-util.spec	13 Sep 2007 15:19:01 -0000	1.3
+++ ws-commons-util.spec	13 Sep 2007 15:45:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-4
+- Bump again.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
 - Bump release.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:49:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:49:51 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchcommits
Message-ID: <200709131549.l8DFnpa6010659@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libmusicbrainz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:49:55 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:49:55 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchbugzilla
Message-ID: <200709131549.l8DFnu8k010668@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libmusicbrainz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:26 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested commit
Message-ID: <200709131550.l8DFoQ55010680@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libmusicbrainz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:33 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchbugzilla
Message-ID: <200709131550.l8DFoXAV010689@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libmusicbrainz (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:35 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchcommits
Message-ID: <200709131550.l8DFoZDY014954@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libmusicbrainz (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:37 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested commit
Message-ID: <200709131550.l8DFobiI010699@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libmusicbrainz (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 15:51:37 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:51:37 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.4,1.5
Message-ID: <200709131551.l8DFpbWD027469@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27271

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
- ExcludeArch ppc64 until maven is built on ppc64.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ws-commons-util.spec	13 Sep 2007 15:45:29 -0000	1.4
+++ ws-commons-util.spec	13 Sep 2007 15:51:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -10,6 +10,9 @@
 Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+ExcludeArch:    ppc64
+
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
@@ -78,6 +81,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
+- ExcludeArch ppc64 until maven is built on ppc64.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-4
 - Bump again.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:08:08 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 12:08:08 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.26, 1.27 sources, 1.26, 
	1.27 telepathy-gabble.spec, 1.37, 1.38
Message-ID: <200709131608.l8DG88BH001372@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1329

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Sep 2007 21:40:37 -0000	1.26
+++ .cvsignore	13 Sep 2007 16:07:35 -0000	1.27
@@ -6,3 +6,4 @@
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz
+telepathy-gabble-0.5.14.1-olpc-trial3a-20070913.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	12 Sep 2007 21:40:37 -0000	1.26
+++ sources	13 Sep 2007 16:07:35 -0000	1.27
@@ -1 +1,2 @@
 08c37009f68fe7a34f8c218a8c4ac3ca  telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz
+b0495cd024967171495f29ad4b01cde7  telepathy-gabble-0.5.14.1-olpc-trial3a-20070913.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- telepathy-gabble.spec	12 Sep 2007 22:34:31 -0000	1.37
+++ telepathy-gabble.spec	13 Sep 2007 16:07:35 -0000	1.38
@@ -1,7 +1,7 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag olpc_trial3a_20070912 
+%define alphatag olpc_trial3a_20070913.1
 
 %define telepathy_glib_version 0.5.14
 
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070913.1.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070913.1
+- New snapshot
+
 * Wed Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070912
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:11:12 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Thu, 13 Sep 2007 12:11:12 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-3.15.92-cursor-position.patch, NONE,
	1.1 gtkhtml3.spec, 1.100, 1.101
Message-ID: <200709131611.l8DGBCmn001519@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1485

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.15.92-cursor-position.patch 
Log Message:

* Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
- Add patch for GNOME bug #443850 (fix cursor position after typing halant).


gtkhtml-3.15.92-cursor-position.patch:

--- NEW FILE gtkhtml-3.15.92-cursor-position.patch ---
diff -up gtkhtml-3.15.92/src/gtkhtml.c.cursor-position gtkhtml-3.15.92/src/gtkhtml.c
--- gtkhtml-3.15.92/src/gtkhtml.c.cursor-position	2007-09-13 11:01:15.000000000 -0400
+++ gtkhtml-3.15.92/src/gtkhtml.c	2007-09-13 11:02:08.000000000 -0400
@@ -3221,9 +3221,9 @@ gtk_html_im_commit_cb (GtkIMContext *con
                 D_IM (printf ("IM delete last preedit %d + %d\n", html->priv->im_pre_pos, html->priv->im_pre_len);)
                                                                                 
                 html_undo_freeze (html->engine->undo);
-                html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
+                html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
                 html_engine_set_mark (html->engine);
-                html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
+                html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
                 html_engine_delete (html->engine);
                 html->priv->im_pre_len = 0;
                 html_undo_thaw (html->engine->undo);
@@ -3283,9 +3283,9 @@ gtk_html_im_preedit_changed_cb (GtkIMCon
 	if (html->priv->im_pre_len > 0) {
 		D_IM (printf ("IM delete last preedit %d + %d\n", html->priv->im_pre_pos, html->priv->im_pre_len);)
 		
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
 		html_engine_set_mark (html->engine);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
 		html_engine_delete (html->engine);
 		deleted = html->priv->im_pre_len;
 	} else
@@ -3300,7 +3300,7 @@ gtk_html_im_preedit_changed_cb (GtkIMCon
 		cursor_pos = CLAMP (cursor_pos, 0, html->priv->im_pre_len);
 		html->priv->im_pre_pos = html->engine->cursor->position;
 		html_engine_paste_text_with_extra_attributes (html->engine, preedit_string, html->priv->im_pre_len, attrs);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + cursor_pos);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + cursor_pos);
 	} else
 		html_engine_set_font_style (html->engine, 0, html->priv->im_orig_style);
 	g_free (preedit_string);
@@ -3407,12 +3407,12 @@ gtk_html_im_delete_surrounding_cb (GtkIM
 	if (html_engine_get_editable (html->engine) && !html_engine_is_selection_active (html->engine)) {
 		gint orig_position = html->engine->cursor->position;
 
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset);
 		html_engine_set_mark (html->engine);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset + n_chars);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset + n_chars);
 		html_engine_delete (html->engine);
 		if (offset >= 0)
-			html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position);
+			html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position);
 	}
 	return TRUE;
 }
diff -up gtkhtml-3.15.92/src/htmlcursor.c.cursor-position gtkhtml-3.15.92/src/htmlcursor.c
--- gtkhtml-3.15.92/src/htmlcursor.c.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlcursor.c	2007-09-13 11:02:08.000000000 -0400
@@ -204,12 +204,20 @@ html_cursor_home (HTMLCursor *cursor,
 
 
 static gboolean
-forward (HTMLCursor *cursor, HTMLEngine *engine)
+forward (HTMLCursor *cursor,
+	 HTMLEngine *engine,
+	 gboolean    exact_position)
 {
 	gboolean retval;
+	gboolean (*forward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 
 	retval = TRUE;
-	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
+	if (exact_position)
+		forward_func = html_object_cursor_forward_one;
+	else
+		forward_func = html_object_cursor_forward;
+
+	if (!forward_func (cursor->object, cursor, engine)) {
 		HTMLObject *next;
 
 		next = html_object_next_cursor (cursor->object, (gint *) &cursor->offset);
@@ -224,8 +232,10 @@ forward (HTMLCursor *cursor, HTMLEngine 
 	return retval;
 }
 
-gboolean
-html_cursor_forward (HTMLCursor *cursor, HTMLEngine *engine)
+static gboolean
+html_cursor_real_forward (HTMLCursor *cursor,
+			  HTMLEngine *engine,
+			  gboolean    exact_position)
 {
 	gboolean retval;
 
@@ -238,20 +248,41 @@ html_cursor_forward (HTMLCursor *cursor,
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
 	cursor->have_target_x = FALSE;
-	retval = forward (cursor, engine);
+	retval = forward (cursor, engine, exact_position);
 
 	debug_location (cursor);
 
 	return retval;
 }
 
+gboolean
+html_cursor_forward (HTMLCursor *cursor,
+		     HTMLEngine *engine)
+{
+	return html_cursor_real_forward (cursor, engine, FALSE);
+}
+
+gboolean
+html_cursor_forward_one (HTMLCursor *cursor,
+			 HTMLEngine *engine)
+{
+	return html_cursor_real_forward (cursor, engine, TRUE);
+}
+
 static gboolean
-backward (HTMLCursor *cursor, HTMLEngine *engine)
+backward (HTMLCursor *cursor,
+	  HTMLEngine *engine,
+	  gboolean    exact_position)
 {
 	gboolean retval;
+	gboolean (*backward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 
 	retval = TRUE;
-	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
+	if (exact_position)
+		backward_func = html_object_cursor_backward_one;
+	else
+		backward_func = html_object_cursor_backward;
+	if (!backward_func (cursor->object, cursor, engine)) {
 		HTMLObject *prev;
 
 		prev = html_object_prev_cursor (cursor->object, (gint *) &cursor->offset);
@@ -266,9 +297,10 @@ backward (HTMLCursor *cursor, HTMLEngine
 	return retval;
 }
 
-gboolean
-html_cursor_backward (HTMLCursor *cursor,
-		      HTMLEngine *engine)
+static gboolean
+html_cursor_real_backward (HTMLCursor *cursor,
+			   HTMLEngine *engine,
+			   gboolean    exact_position)
 {
 	gboolean retval;
 
@@ -281,13 +313,27 @@ html_cursor_backward (HTMLCursor *cursor
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
 	cursor->have_target_x = FALSE;
-	retval = backward (cursor, engine);
+	retval = backward (cursor, engine, exact_position);
 
 	debug_location (cursor);
 
 	return retval;
 }
 
+gboolean
+html_cursor_backward (HTMLCursor *cursor,
+		      HTMLEngine *engine)
+{
+	return html_cursor_real_backward (cursor, engine, FALSE);
+}
+
+gboolean
+html_cursor_backward_one (HTMLCursor *cursor,
+			  HTMLEngine *engine)
+{
+	return html_cursor_real_backward (cursor, engine, TRUE);
+}
+
 
 gboolean
 html_cursor_up (HTMLCursor *cursor,
@@ -338,7 +384,7 @@ html_cursor_up (HTMLCursor *cursor,
 		prev_x = x;
 		prev_y = y;
 
-		if (! backward (cursor, engine))
+		if (! backward (cursor, engine, FALSE))
 			return FALSE;
 
 		html_object_get_cursor_base (cursor->object,
@@ -523,21 +569,12 @@ html_cursor_down (HTMLCursor *cursor,
 }
 
 
-/**
- * html_cursor_jump_to:
- * @cursor: 
- * @object: 
- * @offset: 
- * 
- * Move the cursor to the specified @offset in the specified @object.
- * 
- * Return value: %TRUE if successfull, %FALSE if failed.
- **/
-gboolean
-html_cursor_jump_to (HTMLCursor *cursor,
-		     HTMLEngine *engine,
-		     HTMLObject *object,
-		     guint offset)
+static gboolean
+html_cursor_real_jump_to (HTMLCursor *cursor,
+			  HTMLEngine *engine,
+			  HTMLObject *object,
+			  guint       offset,
+			  gboolean    exact_position)
 {
 	HTMLCursor original;
 
@@ -557,14 +594,14 @@ html_cursor_jump_to (HTMLCursor *cursor,
 
 	html_cursor_copy (&original, cursor);
 
-	while (forward (cursor, engine)) {
+	while (forward (cursor, engine, exact_position)) {
 		if (cursor->object == object && cursor->offset == offset)
 			return TRUE;
 	}
 
 	html_cursor_copy (cursor, &original);
 
-	while (backward (cursor, engine)) {
+	while (backward (cursor, engine, exact_position)) {
 		if (cursor->object == object && cursor->offset == offset)
 			return TRUE;
 	}
@@ -572,6 +609,46 @@ html_cursor_jump_to (HTMLCursor *cursor,
 	return FALSE;
 }
 
+/**
+ * html_cursor_jump_to:
+ * @cursor: 
+ * @object: 
+ * @offset: 
+ * 
+ * Move the cursor to the specified @offset in the specified @object.
+ * Where exactly move to, depends on the is_cursor_position in PangoLogAttr say.
+ * This is useful for such as Indic languages that relies on that feature.
+ * 
+ * Return value: %TRUE if successfull, %FALSE if failed.
+ **/
+gboolean
+html_cursor_jump_to (HTMLCursor *cursor,
+		     HTMLEngine *engine,
+		     HTMLObject *object,
+		     guint       offset)
+{
+	return html_cursor_real_jump_to (cursor, engine, object, offset, FALSE);
+}
+
+/**
+ * html_cursor_exactly_jump_to:
+ * @cursor:
+ * @object:
+ * @offset:
+ *
+ * Move the cursor to near the specified @offset in the specified @object.
+ *
+ * Return value: %TRUE if successful, %FALSE if failed.
+ **/
+gboolean
+html_cursor_exactly_jump_to (HTMLCursor *cursor,
+			     HTMLEngine *engine,
+			     HTMLObject *object,
+			     guint       offset)
+{
+	return html_cursor_real_jump_to (cursor, engine, object, offset, TRUE);
+}
+
 
 /* Complex cursor movement commands.  */
 
@@ -588,7 +665,7 @@ html_cursor_beginning_of_document (HTMLC
 	if (engine->need_spell_check)
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
-	while (backward (cursor, engine))
+	while (backward (cursor, engine, FALSE))
 		;
 }
 
@@ -605,7 +682,7 @@ html_cursor_end_of_document (HTMLCursor 
 	if (engine->need_spell_check)
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
-	while (forward (cursor, engine))
+	while (forward (cursor, engine, FALSE))
 		;
 }
 
@@ -617,19 +694,11 @@ html_cursor_get_position (HTMLCursor *cu
 	return cursor->position;
 }
 
-void
-html_cursor_jump_to_position_no_spell (HTMLCursor *cursor, HTMLEngine *engine, gint position)
-{
-	gboolean need_spell_check;
-
-	need_spell_check = engine->need_spell_check;
-	engine->need_spell_check = FALSE;
-	html_cursor_jump_to_position (cursor, engine, position);
-	engine->need_spell_check = need_spell_check;
-}
-
-void
-html_cursor_jump_to_position (HTMLCursor *cursor, HTMLEngine *engine, gint position)
+static void
+html_cursor_real_jump_to_position (HTMLCursor *cursor,
+				   HTMLEngine *engine,
+				   gint        position,
+				   gboolean    exact_position)
 {
 	g_return_if_fail (cursor != NULL);
 	g_return_if_fail (position >= 0);
@@ -641,17 +710,63 @@ html_cursor_jump_to_position (HTMLCursor
 
 	if (cursor->position < position) {
 		while (cursor->position < position) {
-			if (! forward (cursor, engine))
+			if (! forward (cursor, engine, exact_position))
 				break;
 		}
 	} else if (cursor->position > position) {
 		while (cursor->position > position) {
-			if (! backward (cursor, engine))
+			if (! backward (cursor, engine, exact_position))
 				break;
 		}
 	}
 }
 
+void
+html_cursor_jump_to_position (HTMLCursor *cursor,
+			      HTMLEngine *engine,
+			      gint        position)
+{
+	html_cursor_real_jump_to_position (cursor, engine, position, FALSE);
+}
+
+void
+html_cursor_exactly_jump_to_position (HTMLCursor *cursor,
+				      HTMLEngine *engine,
+				      gint        position)
+{
+	html_cursor_real_jump_to_position (cursor, engine, position, TRUE);
+}
+
+static void
+html_cursor_real_jump_to_position_no_spell (HTMLCursor *cursor,
+					    HTMLEngine *engine,
+					    gint        position,
+					    gboolean    exact_position)
+{
+	gboolean need_spell_check;
+
+	need_spell_check = engine->need_spell_check;
+	engine->need_spell_check = FALSE;
+	html_cursor_real_jump_to_position (cursor, engine, position, exact_position);
+	engine->need_spell_check = need_spell_check;
+}
+
+void
+html_cursor_jump_to_position_no_spell (HTMLCursor *cursor,
+				       HTMLEngine *engine,
+				       gint        position)
+{
+	html_cursor_real_jump_to_position_no_spell (cursor, engine, position, FALSE);
+}
+
+void
+html_cursor_exactly_jump_to_position_no_spell (HTMLCursor *cursor,
+					       HTMLEngine *engine,
+					       gint        position)
+{
+	html_cursor_real_jump_to_position_no_spell (cursor, engine, position, TRUE);
+}
+
 
 /* Comparison.  */
 
@@ -750,7 +865,7 @@ html_cursor_beginning_of_paragraph (HTML
 	while (1) {
 		if (!cursor->offset) {
 			html_cursor_copy (&copy, cursor);
-			if (backward (cursor, engine)) {
+			if (backward (cursor, engine, FALSE)) {
 				new_level = html_object_get_parent_level (cursor->object);
 				if (new_level < level
 				    || (new_level == level && flow != cursor->object->parent)) {
@@ -761,7 +876,7 @@ html_cursor_beginning_of_paragraph (HTML
 				break;
 		}
 			else
-				if (!backward (cursor, engine))
+				if (!backward (cursor, engine, FALSE))
 					break;
 		rv = TRUE;
 	}
@@ -788,7 +903,7 @@ html_cursor_end_of_paragraph (HTMLCursor
 	while (1) {
 		if (cursor->offset == html_object_get_length (cursor->object)) {
 			html_cursor_copy (&copy, cursor);
-			if (forward (cursor, engine)) {
+			if (forward (cursor, engine, FALSE)) {
 				new_level = html_object_get_parent_level (cursor->object);
 				if (new_level < level
 				    || (new_level == level && flow != cursor->object->parent)) {
@@ -799,7 +914,7 @@ html_cursor_end_of_paragraph (HTMLCursor
 				break;
 		}
 			else
-				if (!forward (cursor, engine))
+				if (!forward (cursor, engine, FALSE))
 					break;
 		rv = TRUE;
 	}
diff -up gtkhtml-3.15.92/src/htmlobject.c.cursor-position gtkhtml-3.15.92/src/htmlobject.c
--- gtkhtml-3.15.92/src/htmlobject.c.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlobject.c	2007-09-13 11:02:08.000000000 -0400
@@ -820,7 +820,9 @@ html_object_class_init (HTMLObjectClass 
 	klass->get_clear = get_clear;
 	klass->get_direction = html_object_real_get_direction;
 	klass->cursor_forward = html_object_real_cursor_forward;
+	klass->cursor_forward_one = html_object_real_cursor_forward;
 	klass->cursor_backward = html_object_real_cursor_backward;
+	klass->cursor_backward_one = html_object_real_cursor_backward;
 	klass->cursor_left = html_object_real_cursor_left;
 	klass->cursor_right = html_object_real_cursor_right;
 	klass->backspace = html_object_real_backspace;
@@ -1567,12 +1569,24 @@ html_object_cursor_forward (HTMLObject *
 }
 
 gboolean
+html_object_cursor_forward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+{
+	return (* HO_CLASS (self)->cursor_forward_one) (self, cursor, engine);
+}
+
+gboolean
 html_object_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
 {
 	return (* HO_CLASS (self)->cursor_backward) (self, cursor, engine);
 }
 
 gboolean
+html_object_cursor_backward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+{
+	return (* HO_CLASS (self)->cursor_backward_one) (self, cursor, engine);
+}
+
+gboolean
 html_object_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
 {
 	return (* HO_CLASS (self)->cursor_right) (self, painter, cursor);
diff -up gtkhtml-3.15.92/src/htmlobject.h.cursor-position gtkhtml-3.15.92/src/htmlobject.h
--- gtkhtml-3.15.92/src/htmlobject.h.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlobject.h	2007-09-13 11:02:08.000000000 -0400
@@ -263,7 +263,9 @@ struct _HTMLObjectClass {
 	HTMLDirection (*get_direction)   (HTMLObject *self);
 
 	gboolean (*cursor_forward)       (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
-	gboolean (*cursor_backward)       (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_forward_one)   (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_backward)      (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_backward_one)  (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 	gboolean (*cursor_right)         (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor);
 	gboolean (*cursor_left)          (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor);
 
@@ -465,9 +467,15 @@ HTMLObject     *html_object_check_point 
 gboolean        html_object_cursor_forward        (HTMLObject            *self,
 						   HTMLCursor            *cursor,
 						   HTMLEngine            *engine);
+gboolean        html_object_cursor_forward_one    (HTMLObject            *self,
+						   HTMLCursor            *cursor,
+						   HTMLEngine            *engine);
 gboolean        html_object_cursor_backward       (HTMLObject            *self,
 						   HTMLCursor            *cursor,
 						   HTMLEngine            *engine);
+gboolean        html_object_cursor_backward_one   (HTMLObject            *self,
+						   HTMLCursor            *cursor,
+						   HTMLEngine            *engine);
 gboolean        html_object_cursor_left           (HTMLObject            *self,
 						   HTMLPainter           *painter,
 						   HTMLCursor            *cursor);
diff -up gtkhtml-3.15.92/src/htmlcursor.h.cursor-position gtkhtml-3.15.92/src/htmlcursor.h
--- gtkhtml-3.15.92/src/htmlcursor.h.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlcursor.h	2007-09-13 11:02:08.000000000 -0400
@@ -90,6 +90,10 @@ gboolean    html_cursor_jump_to         
 						 HTMLEngine *engine,
 						 HTMLObject *obj,
 						 guint       offset);
+gboolean    html_cursor_exactly_jump_to         (HTMLCursor *cursor,
+						 HTMLEngine *engine,
+						 HTMLObject *obj,
+						 guint       offset);
 HTMLObject *html_cursor_child_of                (HTMLCursor *cursor,
 						 HTMLObject *parent);
 
@@ -97,13 +101,19 @@ HTMLObject *html_cursor_child_of        
 void  html_cursor_normalize     (HTMLCursor *cursor);
 
 /* Position handling.  */
-gint  html_cursor_get_position               (HTMLCursor *cursor);
-void  html_cursor_jump_to_position           (HTMLCursor *cursor,
-					      HTMLEngine *engine,
-					      gint        position);
-void  html_cursor_jump_to_position_no_spell  (HTMLCursor *cursor,
-					      HTMLEngine *engine,
-					      gint        position);
+gint html_cursor_get_position                       (HTMLCursor *cursor);
+void html_cursor_jump_to_position                   (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_exactly_jump_to_position           (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_jump_to_position_no_spell          (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_exactly_jump_to_position_no_spell  (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
 
 /* Retrieving the character under/before the cursor.  */
 gunichar  html_cursor_get_current_char  (const HTMLCursor *cursor);


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gtkhtml3.spec	4 Sep 2007 02:45:19 -0000	1.100
+++ gtkhtml3.spec	13 Sep 2007 16:10:39 -0000	1.101
@@ -9,7 +9,7 @@
 
 Name: gtkhtml3
 Version: 3.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -29,6 +29,9 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch4: gtkhtml-3.13.1-no-gnome-common.patch
 
+# GNOME bug #443850
+Patch5: gtkhtml-3.15.92-cursor-position.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -63,6 +66,7 @@
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .im-too-late
 %patch4 -p1 -b .no-gnome-common
+%patch5 -p1 -b .cursor-position
 
 %build
 
@@ -130,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
+- Add patch for GNOME bug #443850 (fix cursor position after typing halant).
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
 - Update to 3.15.92
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:12:24 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Thu, 13 Sep 2007 12:12:24 -0400
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.44,1.45
Message-ID: <200709131612.l8DGCOuW001604@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1565

Modified Files:
	linuxwacom.spec 
Log Message:
* adding ppc64 to the list of supported architectures




Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- linuxwacom.spec	21 Aug 2007 15:37:18 -0000	1.44
+++ linuxwacom.spec	13 Sep 2007 16:11:51 -0000	1.45
@@ -6,7 +6,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.7.8.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -20,7 +20,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	xorg-x11-server-Xorg, libX11-devel, libXi-devel, xorg-x11-server-sdk >= 1.0.99.901, ncurses-devel
 Requires:	xorg-x11-server-Xorg >= 1.0.99.901, udev >= 030-21
-ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc sparc sparc64
+ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc ppc64 sparc sparc64
 
 %description 
 The Linux Wacom Project manages the drivers, libraries, and
@@ -96,6 +96,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Sep 13 2007 Aristeu Rozanski <arozansk at redhat.com> 0.7.8.3-3.fc8
+- Adding ppc64 to list of architectures
+
 * Tue Aug 21 2007 Aristeu Rozanski <arozansk at redhat.com> 0.7.8.3-2.fc8
 - Disabling stack protector
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:14:16 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 12:14:16 -0400
Subject: rpms/telepathy-salut/OLPC-2 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-salut.spec, 1.11, 1.12
Message-ID: <200709131614.l8DGEGIN001699@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1666

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
- update to snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Sep 2007 15:16:15 -0000	1.9
+++ .cvsignore	13 Sep 2007 16:13:44 -0000	1.10
@@ -6,3 +6,4 @@
 telepathy-salut-0.1.3.1.20070720darcs.tar.gz
 telepathy-salut-0.1.4.1.20070829darcs.tar.gz
 telepathy-salut-0.1.4.1.20070910darcs.tar.gz
+telepathy-salut-0.1.4.1-olpc-trial3-20070912.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Sep 2007 15:16:15 -0000	1.9
+++ sources	13 Sep 2007 16:13:44 -0000	1.10
@@ -1 +1 @@
-97805603ffdda441c4894a69197583a1  telepathy-salut-0.1.4.1.20070910darcs.tar.gz
+5c0563d64387d4cfe6f1d58beb0de114  telepathy-salut-0.1.4.1-olpc-trial3-20070912.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-salut.spec	10 Sep 2007 15:16:15 -0000	1.11
+++ telepathy-salut.spec	13 Sep 2007 16:13:44 -0000	1.12
@@ -1,16 +1,16 @@
-%define darcsdate 20070910darcs
+%define alpha olpc_trial3_20070912
 
 %define telepathy_glib_version 0.5.14
 
 Name:           telepathy-salut
 Version:        0.1.4.1
-Release:        0.3.%{darcsdate}%{?dist}
+Release:        0.4.%{alpha}%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
-Source0:        %{name}-%{version}.%{darcsdate}.tar.gz
+Source0:        %{name}-%{version}-olpc-trial3-20070912.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 0.61
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 John (J5) Palmieri <johnp at redhat.com> - 0.1.4.1-0.4.olpc_trial3_20070912
+- update to snapshot
+
 * Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:24:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Sep 2007 12:24:46 -0400
Subject: rpms/mach/EL-5 mach-0.9.2-centos4rhel.patch, NONE, 1.1 mach.spec,
	1.12, 1.13
Message-ID: <200709131624.l8DGOk3X002027@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2004

Modified Files:
	mach.spec 
Added Files:
	mach-0.9.2-centos4rhel.patch 
Log Message:
* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3.1
- Patch to default to CentOS configs also when built on RHEL.


mach-0.9.2-centos4rhel.patch:

--- NEW FILE mach-0.9.2-centos4rhel.patch ---
diff -up mach-0.9.2/configure.in~ mach-0.9.2/configure.in
--- mach-0.9.2/configure.in~	2007-09-08 17:46:55.000000000 +0300
+++ mach-0.9.2/configure.in	2007-09-13 19:10:23.000000000 +0300
@@ -110,8 +110,11 @@ CHECK_RELEASE(redhat,    "(Psyche)",    
 CHECK_RELEASE(redhat,    "(Shrike)",     defaultroot="redhat-9-$arch")
 
 CHECK_RELEASE(redhat, "CentOS release 3",defaultroot="centos-3-$arch")
+CHECK_RELEASE(redhat,    "(Taroon)",     defaultroot="centos-3-$arch")
 CHECK_RELEASE(redhat, "CentOS release 4",defaultroot="centos-4-$arch")
+CHECK_RELEASE(redhat,    "(Nahant)",     defaultroot="centos-4-$arch")
 CHECK_RELEASE(redhat, "CentOS release 5",defaultroot="centos-5-$arch")
+CHECK_RELEASE(redhat,    "(Tikanga)",    defaultroot="centos-5-$arch")
 
 CHECK_RELEASE(yellowdog, "(Sirius)",     defaultroot="yellowdog-30-ppc")
 
diff -up mach-0.9.2/configure~ mach-0.9.2/configure
--- mach-0.9.2/configure~	2007-09-08 17:47:07.000000000 +0300
+++ mach-0.9.2/configure	2007-09-13 19:10:23.000000000 +0300
@@ -19944,6 +19944,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Taroon)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-3-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 4"
 
   if test -f /etc/$DIST-release
@@ -19963,6 +19982,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Nahant)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-4-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 5"
 
   if test -f /etc/$DIST-release
@@ -19981,6 +20019,25 @@ echo "${ECHO_T}not found" >&6; }
   fi
 
 
+  DIST=redhat
+  NAME="(Tikanga)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-5-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
 
   DIST=yellowdog
   NAME="(Sirius)"


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/mach.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mach.spec	12 Sep 2007 18:45:03 -0000	1.12
+++ mach.spec	13 Sep 2007 16:24:13 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           mach
 Version:        0.9.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Make a chroot
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.9.2-centos4rhel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires:	python
@@ -46,6 +47,9 @@
 
 %prep
 %setup -q
+touch -r configure.in configure.in.stamp
+%patch0 -p1
+touch -r configure.in.stamp configure.in
 
 %build
 %configure \
@@ -103,6 +107,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3.1
+- Patch to default to CentOS configs also when built on RHEL.
+
 * Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
 - Set default flavour to "epel" for EPEL builds.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:26:47 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Thu, 13 Sep 2007 12:26:47 -0400
Subject: rpms/keyjnote/devel .cvsignore, 1.2, 1.3 keyjnote.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709131626.l8DGQl2F002175@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/keyjnote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/devel

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

- Update to 0.10.1
- Update license to GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2007 01:14:44 -0000	1.2
+++ .cvsignore	13 Sep 2007 16:26:15 -0000	1.3
@@ -1 +1 @@
-KeyJnote-0.10.0.tar.gz
+KeyJnote-0.10.1.tar.gz


Index: keyjnote.spec
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/keyjnote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keyjnote.spec	6 Jun 2007 01:14:44 -0000	1.1
+++ keyjnote.spec	13 Sep 2007 16:26:15 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           keyjnote
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        A program that displays presentation slides
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2+
 URL:            http://keyjnote.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/KeyJnote-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +41,10 @@
 
 %changelog
 
+* Thu Sep 13 2007 Allisson Azevedo <allisson at gmail.com> 0.10.1-1
+- Update to 0.10.1
+- Update license to GPLv2+
+
 * Tue Jun 5 2007 Allisson Azevedo <allisson at gmail.com> 0.10.0-2
 - Add build section
 - Remove buildrequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 01:14:44 -0000	1.2
+++ sources	13 Sep 2007 16:26:15 -0000	1.3
@@ -1 +1 @@
-924a474081d0dc0f7975612e518b7883  KeyJnote-0.10.0.tar.gz
+6530ac31c87fb0300e15fcf481ba22b3  KeyJnote-0.10.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:30:00 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 12:30:00 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.684, 1.685 config-x86-generic, 1.11, 1.12 kernel.spec, 1.162,
	1.163 sources, 1.646, 1.647 upstream, 1.568,
	1.569 patch-2.6.23-rc6-git2.bz2.sign, 1.1, NONE
Message-ID: <200709131630.l8DGU0ru002276@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2249

Modified Files:
	.cvsignore config-x86-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git2.bz2.sign 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git3
- disable stack overflow debugging on i386



--- NEW FILE patch-2.6.23-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6ODkyGugalF9Dw4RAuD/AJ0U+uPWckQkQyVJ8TePrhStMoERBwCfZ3Yo
QyPIKRQEY/I8fQ/NWmU2m88=
=ynZO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- .cvsignore	12 Sep 2007 20:19:34 -0000	1.684
+++ .cvsignore	13 Sep 2007 16:29:27 -0000	1.685
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git2.bz2
+patch-2.6.23-rc6-git3.bz2


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-x86-generic	12 Sep 2007 22:56:16 -0000	1.11
+++ config-x86-generic	13 Sep 2007 16:29:27 -0000	1.12
@@ -209,7 +209,7 @@
 CONFIG_PM_STD_PARTITION=""
 
 CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_4KSTACKS=y
 CONFIG_DEBUG_NMI_TIMEOUT=5
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kernel.spec	12 Sep 2007 22:56:16 -0000	1.162
+++ kernel.spec	13 Sep 2007 16:29:27 -0000	1.163
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1795,6 +1795,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git3
+- disable stack overflow debugging on i386
+
 * Wed Sep 12 2007 Dave Jones <davej at redhat.com>
 - Change ACPI dock drivers to be built-in.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- sources	12 Sep 2007 20:19:34 -0000	1.646
+++ sources	13 Sep 2007 16:29:27 -0000	1.647
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-6ecec0906f1becf844497493b14288df  patch-2.6.23-rc6-git2.bz2
+436b893d0005eb90d1329a533bbf5b59  patch-2.6.23-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- upstream	12 Sep 2007 20:19:34 -0000	1.568
+++ upstream	13 Sep 2007 16:29:27 -0000	1.569
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git2.bz2
+patch-2.6.23-rc6-git3.bz2


--- patch-2.6.23-rc6-git2.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 16:46:49 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:46:49 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131646.l8DGknIl002775@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:24:48 -0000	1.1
+++ .cvsignore	13 Sep 2007 16:46:12 -0000	1.2
@@ -0,0 +1 @@
+HTML_QuickForm_advmultiselect-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:46:12 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:52:27 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:52:27 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131652.l8DGqRBn002958@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2934

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:51:48 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:54:00 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:54:00 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/F-7
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131654.l8DGs0mM003040@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3012

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:53:26 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:54:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:54:47 -0700
Subject: [pkgdb] mhgui was added for kwizart
Message-ID: <200709131654.l8DGsmKV016074@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package mhgui with summary A simple GUI library for MakeHuman
Kevin Fenzi (kevin) has approved Package mhgui
Kevin Fenzi (kevin) has added a Fedora devel branch for mhgui with an owner of kwizart
Kevin Fenzi (kevin) has approved mhgui in Fedora devel
Kevin Fenzi (kevin) has approved Package mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:07 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 12:55:07 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.5,1.6
Message-ID: <200709131655.l8DGt7og003144@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-6
- Add BR on maven surefire resources, eclipse, and install plugins.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ws-commons-util.spec	13 Sep 2007 15:51:05 -0000	1.5
+++ ws-commons-util.spec	13 Sep 2007 16:54:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -17,9 +17,13 @@
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven2-plugin-eclipse
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
@@ -81,6 +85,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-6
+- Add BR on maven surefire resources, eclipse, and install plugins.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
 - ExcludeArch ppc64 until maven is built on ppc64.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora EPEL, 4) updated by kevin
Message-ID: <200709131655.l8DGt58t011195@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, 6) updated by kevin
Message-ID: <200709131655.l8DGt5ht011204@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora 6)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, 7) updated by kevin
Message-ID: <200709131655.l8DGt6xQ011222@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora EPEL, 5) updated by kevin
Message-ID: <200709131655.l8DGt5TF011213@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, devel) updated by kevin
Message-ID: <200709131655.l8DGt6rY011231@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:25 -0400
Subject: rpms/mhgui - New directory
Message-ID: <200709131655.l8DGtPE4003226@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui

Log Message:
Directory /cvs/extras/rpms/mhgui added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:30 -0400
Subject: rpms/mhgui/devel - New directory
Message-ID: <200709131655.l8DGtUtB003240@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui/devel

Log Message:
Directory /cvs/extras/rpms/mhgui/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:35 -0400
Subject: rpms/mhgui Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709131655.l8DGtZZo003265@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui

Added Files:
	Makefile import.log 
Log Message:
Setup of module mhgui


--- NEW FILE Makefile ---
# Top level Makefile for module mhgui
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:37 -0400
Subject: rpms/mhgui/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709131655.l8DGtb5c003281@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mhgui


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mhgui
# $Id: Makefile,v 1.1 2007/09/13 16:55:35 kevin Exp $
NAME := mhgui
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 fedora-extras-commits at redhat.com  Thu Sep 13 17:00:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:26 -0700
Subject: [pkgdb] Io-language was added for jwrdegoede
Message-ID: <200709131700.l8DH0RcU016163@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package Io-language with summary Io is a small, prototype-based programming language
Kevin Fenzi (kevin) has approved Package Io-language
Kevin Fenzi (kevin) has added a Fedora devel branch for Io-language with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved Io-language in Fedora devel
Kevin Fenzi (kevin) has approved Package Io-language
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Io-language (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Io-language (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Io-language (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:35 -0700
Subject: [pkgdb] Io-language (Fedora, devel) updated by kevin
Message-ID: <200709131700.l8DH0ZQn011276@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on Io-language (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:35 -0700
Subject: [pkgdb] Io-language (Fedora, 7) updated by kevin
Message-ID: <200709131700.l8DH0aSF011285@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for Io-language
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Io-language (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:26 -0400
Subject: rpms/Io-language - New directory
Message-ID: <200709131701.l8DH1Q8J009641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language

Log Message:
Directory /cvs/extras/rpms/Io-language added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:33 -0400
Subject: rpms/Io-language/devel - New directory
Message-ID: <200709131701.l8DH1XM6009658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language/devel

Log Message:
Directory /cvs/extras/rpms/Io-language/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:38 -0400
Subject: rpms/Io-language Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709131701.l8DH1cBA009738@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language

Added Files:
	Makefile import.log 
Log Message:
Setup of module Io-language


--- NEW FILE Makefile ---
# Top level Makefile for module Io-language
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:43 -0400
Subject: rpms/Io-language/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709131701.l8DH1hav009767@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Io-language


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: Io-language
# $Id: Makefile,v 1.1 2007/09/13 17:01:38 kevin Exp $
NAME := Io-language
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 fedora-extras-commits at redhat.com  Thu Sep 13 17:02:08 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 13:02:08 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131702.l8DH28s3009880@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9677

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 17:01:34 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:28 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:28 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5S5h011337@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:27 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:27 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5T80016341@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:33 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5XGE011350@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:44 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:44 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5ikP011362@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:46 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:46 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5kRH011372@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:48 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:48 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5m96011381@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:21:05 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Thu, 13 Sep 2007 13:21:05 -0400
Subject: rpms/dbench/FC-6 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench-3.04.tar.gz,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131721.l8DHL56E010276@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10247

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench-3.04.tar.gz 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench-3.04.tar.gz ---
?
j[????Ue????u?????O???x??*/?????????~z}R???_B??o`'?.?^`???7o??,???????E?X??~V???????????l???mi??W????4???Qb7?
??-??}??3?Yj????m????????????????o????O??z??-?]?z????????O??y?z?????dp????k?????P??|4?M?\????s?/??R)}]lwe?ZW??????????1zZ,???4????$??AOG?????????????z?dz?:??Y?=}??//_????@???)w(I???r?V?ItU?H?q??$?P??????9?????X?????x3K&?F'??? `?4???:?Wi??iE??E??,+?M?W	???4?
??????d??(??????{?/1?\??
AR???N???TK?*)6???y=?g?\???j????-??p+????3?P?q??s???4?L??Q?:.c?m?(??????4???l?N[c???#h-3
??F?k???$R???iOZ??")X:???:0]KQ??|o	??M??t?wJ?-?Uo??????j]?R???R?V????????NYe??E
s???;??}??????????L?????\?z???N1,zG????OV?imr??nM????R????Q??k?????{d?H?8???q?????:?+?
???D??u?#.s@?>s?S?????	G?tI[?????{?Q?ea?'??.?u??,????U?????????Yj??:?O???PI??:7?B???;1"????xn?M
??????e??
z?2?J\???e??&?eiHR?"+?C?4Q0V
O$L????Cd'"?L?~?Gi?$?-?AY?W3y?s
\?fq??/LY?`+?x???,?R?hg??:??P?=???S$????Eq??k??fX?V????????!??!?S??J?c?zi?????W???XG?e??q?????H???????=s?+;v?^cj?y??
,?`
v
????7d?A????????|???}???3tZ???E?]?s^?T??:?R??<?????L????N!T?????Y??9?Y??.??B
c?9
?????Af!!???Ic>o+?+9?go??N?????5.?T??FN?????v|$s?I6PD?<?1L|?q?o?b2+?`??G?'??r???r??@??76 ????*I?8??a??????\ZI?28??va??
BsF?'-{)?????m]q?s??????????H???H?8??dY!?0?.9n?qEyvG??#?S?&|~B??????9Pf?s?"?&si??OiRQ??s ?C<????m.??8??m?i?
?<?BmV?$???,v?JF???u?Qr???A?
(????D?M?z?|^?E?/??@???)?,
???z?{????<o???njc???I???	?A????	?}?.B|?p??">?2-???Z'6g?????(?L??#??!?????Xr???P? ?Yc*?o???Dv?
??`	???@???&?NG5?: ?{?+??"<?!?!?r???$
(`7??r?8?
?5??4g? ?
??}????%? p?N?k?g,??Tw"?T~?|<?&?)???[???5"??0
hWp[??j?$??W?cj?;???]?3?rMN??s??'[a??????W_?{????????xG??<n0>b???$?aE?yq#???=?K?NC????]??GR??1w??yA????i
!?8?h`??PDI6??KK)?Ga?2=~=??Ab?;???T&??%E.A]JA?$?
;(??p.?n?/??Q(
???wu?e?(?=?3??K<s0?]?J{`?????(EJ?m??F??G?7??X?????m
????<?lZ=
?
_;??]??ng?h??"=???????`?ftz&?_`?&hb)??;rT)E???
???Lx??S???9???9J9?;?FsWzH????N+?
???j?????K?s?E??????a?????[?@V$? i????&????t??K%?5_??????z??B???`?Ul+????`q????S??{%?A?+?kJ?Kf?ERRd???Y??C/`??|)?W?Y?0?5;??2?GhAO????i???4????????X?	@=H]????$?di?????Q?/??j?Lr[??`6?????f?q?l?	?????J|i?v?r]K!??b?T???????7?UY??t?t?V????????????>H.?M?wr1?????k?????&??4w??q?X????nG?X?????3??\?	?
?jO?{%?u??/?(U?1?|???U8???@???D???C?????L??w{??????????ls?2??P???"3????.???3p?j?????n?M\]
w??=???
???v???1%T
?1"A??n#????4?7??o?????\??/S???'??????????????~???????M7u75rY$?!+?+????k?`Z?@??~^s??@???a??=w?8?{?6?3E?	??Q];?	?x? p?
j?i?m??#???4S??????'???F?Lu??g????z?W'?????? ??lY??{?:v
qP?o??$
1?*????l????????J??)?H???x???-??I`Z??M???H?Z?\?Z??;?)???
??;H??; ?$?[;?.W??4???E.
o????ZA?,?K?\??6??<D?cR????'??R??v?6C`??{?Y????k??#R?O?y	]&?@?.R???=?	??G??P:???<?????9?`??
??0[IV??Ax?"?/}??????M??E???t}??C?0*)h???l???????
?t??-9?%???????qXpD??D?dP??????o?;,C/?kr?$7??d43???v? ???A???j!????
b1@~
?+?
= ~??
Fw?8/??)/??y??(:I?O_??)??[Q9
5??1?r??1?.?P,?~??)????C???Rp?v??<???L???!_? 
?;it
/$&?q???#>????k"?@2?v?????J?FR!t\?i??~E^o??l?C}m???%W?{k
		??@???/(x??V?wx?k?8N?~F?m?
?.??Cb???U?~j?s?Wp;?G?????
????awL{?d?f???8??B??qj?}'CF?.?<???;+???,???p
???????j?4?#&3????=????v????}d?~G?{????w??bc????|?4m3????AI???=xL>ii???Ug???{??7;???L?)??6
?#?
???fd?bS45;}?Gf?F?WVO?]?U??XL&???3??????????P?>??d?~2????O?????p??????`?~??u?!????`?????f??L?'??l???>???6\?
????9??z?0??>GjL??@?t6????4?f??=oH????????0??NxZ?G??/???d
?
t|?n?L?LA??)?}?????????k4???a?
{???_a???0]?=?? ?v?g?8??1???????????o4\Ew?????h6?<_<???`?q?0??C"?&?$??U??	???A???=??kV??"?]?y?HY|????????fx;??E?^??1??????t??????5?L>??p?1?&9???aA?4#=??.?????}R?d??l?qtG?N??>??#?@{???H????????????W??U?g??X?>?`?gg ????Z???????dpz"&??@HE7???????#???0yOO????az???H^??#i?M?
z?L?l?????_??hr?????o??????p?"?-???x#????tt????8????~????!?
n>Fy?_?FN&c???#6??)???G?i???????/???<????k??6? 
?_?~E?wf????H??L{???R???Me??w=??l??N???%Ow?9?????$H?
H +S??V?-@ 
+??;????_~???K)??w?????~?V^????Y^??Ld?);???X????^??{{$5c,???????W??JqP&m??A)F?1???&z???#???}????z&?????e??wq?a??????
HmHo#?c???V??^|???F?~?S?????I????l???w(&rP?	??????J??w??fC?u ?B?q????)Z?k|?Z???
>?R???xu???????'??q=?7??v?D?C!?????o?:????????Zj ?????	)z??@??????>????%~?@??Z??7???M;??z??????	?>3Q?o?C>?^???????F????}La??7??[????a?R???}2N??;?V?~P?=ok*7???Tr1?6!#R?i.xu5?????0jw?6??????N)l+?]-?????/5????
t?B????:????T?K?????r??	????)??Gc??Eh?"R?n???!?E?_? ?_????G:?Q???????????
????z?Z
??i???????????????H??~3?:?^?Ki???????????~?w????~??????M??~{???????EW?0???S???Q?????7???????????b??Z6???C?u???K??k????7??N?Rj???O????U?????|l?,?2mQ?<vZ?v?X??n????Oo$?O??#??6d??????`/???ujk????W??????_?????x???y)??7??}??to????z??G????/GwJe???6^?v?\V??1?>????Lid?W??VO????Gud?7??????QS????}??o??????~??hu?}???#d?w??F???\"??;|?{??1?r7??'?w?ud?
|???5?????Fs???7y??>??hBG?co?%??;??????H???W???#J at 1
?w??7]_H?-??!??UjO??i(?????fu^??IZ??/????r???F???a?SI?F??&\??T????????D
:???c??~???????9????6?????[?bf$???xv??1??????g????O?/?>w~????o)?Y?????(???????????Wy??1???Jy?|???2r???!-o????????N??7?}???o~???????????^?-?st????Z??=??????5??dM2???{? ?^???k?????</??`?|???Q?Q?E?-W?]{]?????oR???z????O??t?4????.??bs?}|u??b????_????????????zu???g???????W??y??e??>??Z??|?????GJFW?m?????_??????G????8?????~t??t????W??^??z?????????k?????y|r??Y3??>??????W?e?<{|???d????f???????%????W????E????9????_f???'??~?V??D???Z???????m????o???\HA??????A???????H?$?Ks,???K'??Ss????}X????????k??~????>????????	<?7??7??7?O?]3???m??????B?D\?V??H??ms?t?z???~czrT???R=d'??e??s?????5?O????????
7?w??N>??/??????????;6???o??{????{??lVg??}??J??????????.????????q??N?????????3???&?/?J?&,H??/^?B.??Jq_??{????@??D???]???~?c???????<{??2????O_???????????????#cy??1???Ye?h
??m???G/_???_??????S??r/)????zW{+????????C?.???A(??
l?y??????????Zk?u*?????Ye??h????|????HL*OJ?U?M?_??????
?j??1W%9?6f_?[???Qe??_??4????k??+???Js?	??w???o_??????`?7???/??:?E?V???k??????l?????NG%/;??$???]?????I???u[ej?z?????*`?^??H??B+?P~?Ri!t??j???Bm??n?0?$E?)+
?(???L?
??f?~?;???_???H?[??+}/?HAW?}R?W-gg??b?f?QT?????+?????1>??i?'??.??F?9?D???g3?;??Oeuu?0o5?|?	?>cVTy|u????+=???ms?????~???T{U}?_???{5???"5??~?0?~??:;96??&'m=??????_>??N?z??????????5????S?i}???~????!
??J{?Y?z??1?,???(??l"???u????*??A??^k=?'@?6???????>????????{?f-?^f????????xy??ND^???$?1 ????Q??^?_??6s?I??Z?:[???????_?????????????>h?N.?K)?4?z??p
?M}L4Op???Q=S?U????????&??7:???&5???CH????cr@??d???>Fo???&??k?&?&??QC5?6 ??u/?#-Uu??T?}??7o?}s??6??_????y????/?v7??8?V?d7?????????n??zW??
1_??2???V?TiyT??~l?;j???G?????
??5?~*?M??&???4.??J?V???{IaT?r????????P??2?8???5??????}iG??>o:???+M???'~V~??
??TTw??Z~????v+i??^6??????+?#D????Q??4gZ-?)???.uT????&9S}??O???m?A?F2?6wo?x????=Vo????)7???s???k??u3J?nhI??1????Z????:FF?UV??\????T(?]???????j????t??
n?'??T?C-o=VcS?\=}Gr?,?*??? G?8>.?#???UG?b?!T???cV??j???
?uQ?Dc?3??V???BLEG?:/???????`?
H?0????G??)O?+???f?q?:?????Xd?j,?_???????f$?U7:??bB???R?H??E8?1??d?zn5???????f?G??Z?T?0????????+
????Gw/?m?[%GQbe?4T?I?z?]k????3??????f6?????5y??}[??P
S????????M	?_???^i,????h??Y?Lxz?????ro^????$?;jb???oD??^?:3oU?=???o{??Z??;?"???*????T??e?????}y?????H[???6f??Q@?\;r5?????6?4?~???Q??K)????????[#????w:?j3Z?@?/?7Z8???S{?5_??L???	?? 9??85F?????k?-Y??????:2??V?*????%??O?S?oa?F???TT????R:?6??{?G?,Sk?M????I??L???54w?k?S#u*?????]?D?
?j&o??{???d?????R?z?????o??????:6?0TK?![5??RZ??L4|?????!???w????:j1?y???U???$?3???.\-?k]?H?&5??????;?I?T%?Eq??]?I?????UI??j?R?K?
?I[?V???d?y?U??T?;??z?[?L?Xoj??_???B?????v4Vx?g?E.???T???9???6??i]{????o???????8i?,y?HIT">?,??GMo??+9????/?
???<Z'????LB??z?It?h$g??6=*[?s??N,O??w/_????7T?????OuN???yX??]???_tZ???v??>|~yu~????w??P?#?????????{????Bo~Q???l??v????_>?7??0??[??????? ?/?????d?x?E???[??c#???P?????3?V????(?
??Z??k?Y-t??[?M9??Y??]?j??~?3??9??;??W????:?????u6e8V[??????C?r4????_c]?\0????2???H???e|????=????^??QnS?Re?4nm????/?M at S???u???zV???X|k??S?g????-UI*?IJ?|??y5???#???&I?????????I????e;?}W????o?<tR?3??B???I??hG??yqdP?????/???fJ??Q?????S5???:3-???C^?*#?O/?????3??E?%n???????H???/m6V?_??r??P??????%?N?????c'"?w???Uu?^?8??9R??????_U?f}.4(????,??X<?E?:??IuR??Ry????=??_+???)Y??+E)??]|???N??yv??????<U}??j???V?~???X?>o?G??????_*=??/_?????U?|??????]???y??????_;?????????#U??????V????)????????u?WG???o???;?Ow????o?????$?????YN?R?????????????X???o??z????;v??=&UU}B??P?GQ??C?6F
L
`?3?P,OC?8EP?z?Q?P,?B1?	?>=:??@/?6????w???f??M?7u^??N????0???k??vu???	|3?4.?IZ??>Qv?#]8?D??
iOp7vB?2%??:??U6?>nlG]?6?????????3????>???}??????}??????_>9???8??H/????P??is??????????FMj-Pv?Ka????????j???A????6???s???Z?????????r????w?I?"?O????????7*???/U4????I???P??Y??N&o_??????LO????????????E?
?????????G??W?>???H?????,??C??P?Y~?o:????L???;??????????x???????Uk????????>?N"??PaR????7????????w}t,i?;?K??q|?|?R^??<?>4?S+|??g???????}?Z??w?G???????w5??i??E?QM????T~'?U??r+<???k3?z>DMGMP?h???$??~
?????g???S??_}???q?G??Iu????6????/r??????x??
?????c=??fvn?????(/%I?"3??????#??_???e?_?^????? 9??^???k???????_??+??'b??b??^?!?N	?????R:???k#'yy?\%`|?}.{&r???gj?{??????bRH????[????~??2?^t=;???v??+a???????G?o??#????>k????Z?z??]?O_??{K#???????s??>?H>??????Nt??????]????wV??>?\??u?g4???????????ZOU?????_??/?????
?j0?2?4?Q???|s??7??@?xI???j]????q??????k%Ft????f?t??^????=|k?????I??Q@??3P??.??`??/?????????3???/u?R??????p=?>,eM??????`??
?-?}?}????vs???]?I>x|y&;???v{T?A?3???qr<<i??0O?~?;????7p??(?O?wL?????K??70?)????B?2w????n^???Y??~??????????z?C???_D????|?so3???????????O^?7???w??w?????6?D???T?S??N????~ ?%??K?j???*A?H????????n4S???????????
???l?%Eal??????,k????_;???"???????????.w??#-?Y(?????d#?=&<?????<??????d???^Uy????m???/W???WR??zryv4.I??????????????X? 3?IJW?????|pLyvLr???????*+???3nF?PR??#???}X%|????~-)5j?G1&??>????????
&J?????1Q	???nF??????s+/r???+??[EJ?!?V?<+<sk7???I#V?0??MV?6Y??d~?U
??
?dU?&?6Y????MVl?*`?U
??
?dU?&?6Y??*?&?fl2??dE???d??O?M?zD????(z?)X?&S??n2	??d
??$,z?IX?&S??M?,rn?M?`??L??7??Eo2??d?Am???? qQ6o2??d??~???MF6	?d$`???MF6	?d$`???MF6	?d$`???MF?????dE?Qh4|?Q?&??M?'?(~???MF6
?d4`???MF6
?d4`???MF6
?d4`?Q?&??MfL._=??9??]?@??B??????d'gW??^.???{???????+1
???E???B4??.??t??\????$f??X8????Gb?'1 1??8??%????v;?/8"N_??/?????????????U%n?{?`?u????????????????| ??-????[?,???[Xx?_?
O?
??q??????r??\??8????? ??Z??2?V?pZ-?k?,@?e??.E?D?g???^\?	i4,\?a>???4??hX?F?(???l????WW?["?x?'r
+'r?#r?#r?'r@?O?pY?&????????dy.?3?,?p?<???,@?gxY??H
?+6<@??x?????????UFH?6<\??>???T?Wmx?j????K4???^?Rkx?Z?}j
??5???
??5.Eh|??>9???JH?)???????8????5e?^S???"
D??<???d??%?????M?SlJ?bS??2@?)???K?)??{?@<?Sq??-nH?/???'??8A???e? _?y?"8?n??\??i??_????O?/qb|???
??>??9(?A!??p)2????s-H?????)7???r#??Wn\?????.?!G??8?????#?:??q^?q)2????
?.v\?????:????#t??uB?????PW??B?\??x??pY?????*??G?H??Z??i}??	??'?>???\?????#??D	W??O?8?O??>??	????}
R??p????|N???*_??Ux???H8??9?#*H???5????U8???k|U??W?5>?"?4???1??U?
_?S?*??W??*@???
?K?p?bE?{U??W???
??Uxu?
P?*???Rd?Xq?E????W?k{?O??p?^????
W?*??W??=')?(??xe??????z??v??????{4???????????#?W ??u????T8???8U??S?u?""o7?^??P???
?W?????%?;KGTZ???????3?@?gZ????<?~??50.?R=???Juf?!??r?9{??bdU?u
??*?6`Zq???l???3??s?e?2??tW50.??
F&?2???W50.?UgM?D&???qY?02??
F????Q??F6
v??nnF????hZ?? ?-?VBH?U?q??U\??`?G?<+xy?y?i?5*
R???dY)<2???<?8y.?2?8?,?????T??)?B?D???R?F????6'?7??8:ie=?=?N[Y??qt?Jp??SWv?;??{???
Yha/&??????uD?z?p?t?????XJ???
xDQi`??b?4=O?dA?p??s
G???1????
?T???F@?l)???
v??o??4?
R????jY??R?K?8??????=P?z?X?????D?1???CwV??Z.?????2?sw??v-???K??A?p???
H<*????J)?c??F0??u??@r6????;??@B'????S???????dS???2?+????6?5u;?^?;HipimeC?
)?9??Qf???I?s??eb:Z?b???????^?t?17'?????t<>??????6?(??6!???*???8??A??z.???}??F?r?X??g=
??|?]?9t???????B?e9?1+?Wt??B?	??'??n?/t5?
i??(??k&??u? ??.	?r?H8??D???\$8"???)?HQ?>GJLe?n??JD>????B?q??0??`????C???c?????o?????kB?P??G???4???m?%?%)??????2??LR?LvPe?A
G???L9?????T?\???B?/??v?g$<?8??3?\???{?Z???c????????=v???E?`???????p??p???a\??Qx??e7??r??
in?(???LZU?2m0??????3??i?H??v?`?E3*???y?
??(M
^????????+???????|`????9a??f????J@??z????????#??U'???6??hWp?d|?bw^{?8??+?/?[??L?|??0?+N?|???X????l??}1?%J(??y??:C??5z??t??????cV_?vK??
??
A?_lF????P??ChA??	??d??e;?\t.I?
??#????p4???D?F???-??u?[??
x???'h!?n??~?q?
(?lZBO?f???????
V8???n??
??A????tvr????,??_?nQ`p^?
K???k<?f????V?l?????;??]?????
???xO?Y}Y?-	?h?|q/??????_?n?F???Kv?d???t????\'????
=!?S`?%T?>?+8????0?&????Xd?7???
??n????{?edZ+0?38??C"L??z>?????????im?g7k?t?L??5?5?5k???i?1c
RT??fT??#?$$??G?,%2?]$?&(??D@?d?
?\=????L???a ??+N)act[h??I?rG??????*????y?????_g?$P??G?g?D???A????*(c?[{]?^?????1fj??????g??;t?????4m	R?p?Tc?? ??1O???'!r?3<?+g?D??)??H7
'F?O????
?NU???=????/?'A?H&7??B????%J??z?"?=#?? ?PwkU?wk??C?  ?V(???j??X?-e?>???<k?B$??t?|l??L?I
=?e at hW??%?q??T:W??X?
C??,83?dGz??x?
()??K?S?`?w????n??????{??????
??Y??l?$'Q???|H@?4????????#??|????-
???@????
~/+????????rsI??!5?,??Vk??^?
??Q-A?F??G??%}<???H??Cx(?! y??t?????5?q??>g????????(?I??>?`?U?H???{?????t?R???{???pN at 5mBu????yT?D???/?c???)a??-???????2?XR? ???N?OB?(H??*????d????{?<P?$???>@??j?kO?W?M?s?,?I
?4?+Ef:?z?
??u????
8?j??A??a?8?Ml?!t??3n[<=???????F???"m??kSw?t? ?M???I?(H????S?????
h9?v?.??Pe,????n?lI`/{?]4?9?tW??n?<;u???r?3t????N?????]?F-????Gj?H????DQ?"e?Q?Ac??>???gR?L???;cm?2?????9M ????k?~wX??4B???iZ?t#??A?p?HV??Mg?3.??t.W
?yl???{??!?W????
??+?n?vs???U?n????
??z7W
??B??*`7W??\??
?????\?ws??+?n?????Z????*i&*?j??????$W?~PXEQ??2r????\???E?Z???,C?VU?j????yV W?dE???W?
U??W????R?R?pH?%c???j???5#? ?t????\5?ysNQ?f.????<?p????2???6????0v?X&/?????)v???T???n</?.B?U?	2????8????????Vr?#???Z??gI??D??????=4c$?\?????}??zr?M??????tni?D]??]?? gkt??"???
K?;??~??H0?b??,+???H?ba?[??/C?_1??;????[?l?`???6}G??o????=\f??? '???~n???{??3??C#5?5?N?}?/>LL???l??7?*xB_???C1?sj?]??1b?|OS_???Z\??]LB??A????F?d???O???????e~r6;?*?????E?YxE???M7??? ?wv?7
?wsssu?~??????G?Gori???4???Ln?b?)?0??p??Z?K????7?#???<?????"S????|{X?D2???????????,??W??cMVb?~Q? (?b??B???k?I?s&?????g????????????S??FyH?x????????-??v,@?S?`?CZ]{?/?????`IA?H??d??~N????d?
????-[AO?]???r?.?ra?Kz{??ls?,????????f?l??E-O????4??=?,u??c?Uc'"??v??a???5"?????A????+T;o????[?????????????8?m?a?U?l?qb???/?=??T???!?\?\???2T#??j?w?n?a!??[??gY???\U??????A????+??????c??[???";?????wZo??.v<
e?nM?X>?
??$W(?*-????Ts??U?_i???[???)??!?S????.0?c:T?w????>??D??E???#?#???nN?X??5I????f5???S;??]?x??u??E?f]?KI?P?/EB???l?f?'?5??M]?BS@?
3A??DI????

r??o?????????H???f??e$0??c?=(t#?
S???L??.?O77v??:(?gTv??J{?w???P??A????>???l	U#??:?j?V#??D?!?f?4AR?z?N???|???\a???e?<$??}hp"M?[?(??G#?8n:,'?t9^??T??Q
I#U(T;??j??T?n??s?x7RE??z?/????[B???2`???2O0B]??v?4`???M?'
?PA?'
?PE?G>?\?J^Os???w???U???????$???\???:H2??y?'
?P??m??}(a??>?
?Q???m
????Y?<g=pM??9?\??'1?}Xw?#1P??r!??wX?M??#???????+????l?Q?????????F?B;???q?gHh????"?????4~Y?w9?M?j;????+n?U?sd?`^???RG???+neY?s?6?0??bq.Pu38??#?qlf(?#??_ 2?????%??a??O??????rn??h1C.??$W(??
}??T
?R?+?h??[(D??Bx-c?p??"??B??P?;?=????c?o????????Qk??]I???????k??)G?????Xqk?????-A???]?9?,;???d????-????????Bi/?^??
E*?(??p`g?????{??]?????S??1?MuHw?!?.??dl?<d=3???N?I?G???v?d??~N??v?c?$P,??b??/\??m???]??m?tb7L??? TP??A??m??????(????
?<?PF???$ ????X??K?$????M??9??A\?2??y?'? ??????U[??3
?YO`??"?&??2??y?'????zhex??:??(w?1(?#U?????
4R?
l?uI?Q at F?}5&?J???W,???J?	(px`??W(P??5??
P??{2??r?Wv?@????6
???:V-B?\??mp??G?uO??	?nc????-?W????K8?-?BF?&??f(?]???8CEy??EyPQ?<vQ?AT?'?]?g?
??c?Dp at Ey?HEy??.O?.??#??<y??<?~????q??"8??<y??<??,O?,?
U??}UybDp??]?????=???uQ??.o??5u? ?tC???D?+i?i"??'?b???.8?E?2?xt???c???B??Gc?k"+?+??O`/^??`;~?@gk?????0H??C?!??1?EX???b????????z
?{??d?????l???????S(??#??%?CD?	| ?
/S?;???J?I??bK???!?GM>???1???;?hf?|*????j????0$??E<?g~,;M??9??$@Tu`?????P???q??
?z?Z?k?m??1x???
*";0r?	:_??:???/2?'??
$)?){?$'YI????X?H??????5?<?
?Fz?*?Uk???i?r?b EE(jF+8C????"O??x?
??*???I^?
SN??#????v~y?S??`?D?<???m???.[??-?g???W??%??[?o?pu~???????q?9??x????w???0yy?|?d?HI?x??X=\?r_??'???K??
>??m??????Q?O???G??{?q?
?????j?G_?vs;?4???QG?l??h?.?*y&P????<}?+??!?(x?????P?\p?dT+j2?"??CM??!r)?Ry?w???,????5??y0w??f??<fhnm????2??u???
???\??	??=P$m?C?)e?
]?s??????fg?:???f4???eP&?B?d?
???_??5(?i?&? H?uO?$b????????q?e?????_B}?
w??>??2+?P??????)??Ov?T?????D?u???}?:T?.??RB????n???v??^L/?	?;!u	]
?j???@%?@U?Q at x*?????
VxT?J????'O???E????8t[??H???t??3Bj?n???b??????(NB?(>?Q??0:?Q??(??
?
??V?0??I?;?;???4????,?*g?????V?>?*?O?+?!?P?C??A??=
?.??)???????R??E???N)}P???T??)}????q???????e?4??>??=*}P??????????????h)y?:G?
^?C???e??????q?M/i???^???7?D?H??P?`?^?U>?l??Ex?Z??v????T??DE}W??
?-
qQ?
?]?
j2??o???????o?????V?"?
?x??L??5??5??????d?? ?@*??f??TBe??l??j6$?|\? I??g
f???5w?]??
Z]???
8???#`)0,?X ??j?????,P{p?n6I?A??wBV~?|??1?N?g?W???JF????
bPl?a?0Dd??QD@3??'??Y?uC|??U+????j?_??p
Y:a????-??X???P?????
??>?:??^???e????e/??D?H4?&??OQC?s???????`??i?C?U??*??d +?p??
?W???v,?,??
Z?{?P??j@?n??q4$z7?n
?y*?l??z7???,??Y?f???"`7?n
?Y?w?????E??QXK"?Z%?D?\?R?|?#o y?#WK????jH&wr?*???qY??ZU)?i???TNw?j???R?
???KH??:?Aw??[2??????yv$?
?A?U#y??t<??????????[^r???VH???
*/?
?n,??n?XV?"H?\ B??<C9v?x^ BWjP?bW?x?
r?AKx?]???)|?.???<K*??!r?eM??MfFHc?|zusv}s????r?h{r??z????^??$??V???G???Ss???R????9??k?eh?J??r,?n
D???:?????????~??2Tu??fh?<????????5evaT??c?TFu3P)??U&?[+1`?`0Fr/L?0Q??@2??!5	BjD?(8y??u?{?'??Wio2~ED	X??S?M?C???<E?	D!????tP???)`??F?mp.?)w@???t???s?D?]}???^????>???Nj?a???z?T9:I?JV??Y?~d;??uCev?4=?/?
????
???????6L??v?B?T??Ps
?H?H?
?8??R8????L?t?????q?1R??(??|p?S???4gQgQgu??sH??0H?)Q?LD#????p??<~ecT?nOo?S?PD???f?[(?I???@?????`OAo&6i???9??9NJ*?
XC

V ?<W\????
5?+??JN2??J??@M%?h?Z?"?K?d??????????????????)w???KU5V?7?W???o???g??BYJx??:???aO
??,0???L=?V??|??_??e??0Nr??zl~aZr??X?bW???? ?q???y????J.S<`??X???????????v?H0??P1?????</?(??K?QE|?R??R|&/?
??JX???*??D.??L???=??t=?L???\?rT????j??$^ I?R??????R?UW7??|?????T?W????L;=v_??L?T??V[??$T??y?^? ???????C1?<?T0?q%u????????gM?I?P? ?R'????O?????y?????{l??t?P	7???Y&qF&????>9???%Y?>??0u?H?-?x??O?)??w?	??4????? ?l?K??ZQ?P???T????j`l?R=l?R?NS???iJ?*L?Y?
7A?8`+?3?6????I?e????|??n?l??*?!?n???{!?+?Z?W?p??V?0?V??/?	?,?d+0???O?" 
?F?l
8?$0?dS??dc%?????z??y.?,v?Fen??Z????0??/k??JY???}A????????\'Y??8??9??????|???a???g??'?;?????-y???????a?-???[h?DZ??????,?s?=wTk?o???Q?Po????OS?P??6?7????C?
D?
?fS??j????j?p??j?p??j?p??j??Pk?&???$^?	??cO9????$^nC???;W?vI?'??3?n???>5SF???h_???e:??0!??q????l??}w?5?N??n?;Q'?K?P}qo
5?v????????w??j?$?Ag??X???3????4K?????$w<-'?
?~????.??}"????9?!??m8?s)?E|?a;?P?a*?l;?$~?>??:??[????mHC?xxe????J^??c?oh??4??+??^????????L??2W???n??23????I?`??D??^ ??(??
?0??????T?????T??T?/??B?x?P?t8?[??
{?th?0?x?h*z"?]?5???Y?4|?FJ?/?0,B	"????i?
=?ZI??q?/p???<??@?1?3D>+?k??+??????qDz.?-n????Nu?H??!?[???I??????L?\a??A?lSp?????8?PDA=??4R??+%?*?9??Z?oQp??D?IX?<??8?pT??n9ncPD
????B?q?[1?;K?5@)n%8n??8??y?a?5*.??8??X?	{???N????b??S
??I??b??9?;"w?Z	D?Y56s8	
}/V???????N?A?????nq?)??.p? ???D(7???4C?b????p?\??J?[?
????'????k??S???!?a?!|??	????HU??6#?????RJ??}*???7:?T??z??Q??Rp?A?y
?z??????{????6???>?????F??Vu7qFk?v?/??.??h.w!S?H?s<??X??jd)?3??R??(??R?<E?J?>?Z??eS??
?cx??
?y????!??
V?P????#uu??Nv H?ZUL??z?????7??Un?~\:X??7Z?s??j?'?>?g?)??????Z??0?~??N?S?x?a?3,?H??O???rC?3?Ft??
??Ez+??
(?F6?j(?`???V?'?????$????2??6???T????N?m????C??!99?tN??U@??Q6 ?(G?Q?^?[[SB"?e*H\
L	??k)!??*;K?#y)??<?????.j
??]?`??(`t~???.?7?j??lG????@?O?t???j??/??o??iv?Lc5+?????vs??I???????tfj?QL?3?o:1??sF?????????6,?????r??!F1b?????d?pt?/??=??#?gd??J?BIt?g?
????;??Uc??E?{?????G???[????_??????{d?l!?&5?<??"nh??7nl
???W ?????T`?e??l?X??? <?ac/?T???f?^??[?
??T?5n$??<????N?,R????mH??????6??`N??C?f=s??y|????
}?f#0??H?~????2#??B??T???v??#??W???4{??:????,)t}?
Qh6s???{??9??
??2??Q-E???;G}????!??]_xDF???t?
:?t?JQ\??#jy?#???Y,?????m???????5??K?=??????Q
Y?c~A0T??4????
Y?????????Y?`??i?:???_?0H??;??\????.{?_???E???e/??@/{??2??@??'VT?????0Xq?j??Sa??C?????
?`?t?????p{@??t<z?	?XN????
?!??~73?nf
???w3????Y?nf???v3C?f??z7????????f???,`73?nf?nFa-	?)x4$?D?\?R?|:i???E?\-Q?b:'??drw!W?"y1?E?@?V???Z?j???yV WKY????5?P)?px?TC?s????8??[26????T68??]`??LW???3???b/????<?p???\_??-$t?[?????????t????)v???OT???n</??5?(2????8????????Vr?#???Z??gI??D?2y???????qx}u?9_?? ???>?????????sm?#?{6L???!??"!??|??m
B
1?c??w7n?'?$."9??????n??ec?d?<???h????o,rQ??|4t5?0x?z|~z????????}D???-
d????$???SZ?????n??OO?d???m??U?;?m??\N???D??+"w?KN?Y=?\?v?t'2?z?pc?w/(?QxH??#H?)???sj??|V?.?*2`JQ??T?L?
^N?(0??E?
??>?V?.$??
S?????,^D?????;?c5"??b?O<*V??vT?????Dg?????Iu?????5r????nn???	X?]{Uh,?
^n?L4??????*$??
????U#8O
?Zx<?1v??????@(?IQ ?'??<??501h??B?????ay?h?D?L?:iz?4p?Fk\???9? ????h??I??
????
??w????P-1??F??????6???`?(????v??Rm?t/J?"??ai?d?7q??1"u?{????3UM?????$??????
??5?`?Oe???WI???Xs?U??`?pt????????tH?+I???,0??-0ef??X?Pv
?M????08:?G????<?[???E????dH^b
??Bx??????+3k?,V??????J?-Vv}?????"???????p:"?@?M?!???>=??{]?H???)yd@??3?G[Hf"??K????A?R??I????3H??RB??6?d????b=kc?{"F??????5??m?KM???|?1#??yC?
?a??X?9o;??N{zD<:?"?8Td`?0w???+??j?$??v!=????????d?????i???^???X?b??dyt?.?t???.?????????M\???:N??
????C??M"???
gE??1vb??pf
??????9
3?}????Z?G?e??0.?B?V??c?~rqk????i??<??!h??
 ??!icuTK?U!???'??xW????)8l\??E?Ui`l\????????????Ig?(??	P?*{u??&8cnI)?U??"?'???A<?n?'??s??/??H?1h????$???mX???A5???v?8vl@@?j??bU@?Te{S?USg???????-??Er???k?
??YA??
?x{4D???/}???qjB?
JMp?@??? ????;?+2???}??e?????????9??????p???Q???8dLp??{?9?;??\<{%u??)G???????#????????X?qn??U	I`n???U?[?v'?s?????&x?-????4fx+I??DKv?\X?????f/
]n???I?_?w?`??s??T,6???s???R=?Zh?q???????ct??S??2f?p?lF??lOY?f???
#A???u?r??????w?
!?O?ww???4G?N ??3?m?=?m8hn??4???_???F2?D?Bb?+??7
?
??.?0??0.??
???
?4`?WAY)?(l??????6_??Ac?L5??????????$??W??????;OJhn??n??6??{/&N?&??_/R?c	/??????? l/~?W?"\3@??)1??/??H6???3X?Nu?k???P?G?~?v???w?z?G?????"??"^6J ?j?>?g?
??V
????U???4C)??v??#1?????y??????7??j???huyv???,X???8?`???`9????^;?x?8????????"U??????????z???????
?????? Y??=????XX?z5?hh4??i?	???L8?2?<????s??u?V???;??????h?qV??????h?=??k???KM????????????
?D"???o??#?Xf?{??N???Y?(???D]??S1E
?U`??hY?88???wU?O?F?*??U??o???hp??3[??u?Ax?hC<QT?????????h?.??DZ??"??-y?]?sg???5#F??B???=??D?}i?O??F	???z?KVO?????<???????le?|?#8?3$y????n?'_??gjM,z}?~??|?L??????mh??????????u???2?u??:V??f??yB?_~??b???a???$?4{8gN??#?T?W????s?#?9?.?Y{@?>??
????'<%{?p?R1Y?X?|???Y!PS??.??
/Q??5zQ?\p?dT+n]X6]MY?? ??tuh
X?j2?j?P'??
Nf??K???npW??F?[?nb?`W??W#??#?);527?F??a7???v???hQ???w?>)??4?ao]?Q?`AcE?N?xF???ge@?h?? et!&??3???????jF????
#?Xz?;c?@=??????X??g=?????.???R??r??(?	.???????????W"~	???'???@?Z???,C??A????#)?_GO????g?jA?q????:,?7????2@???=%???P??A?\?N?cO?2T?~@k??????JD????D??\.?LE??
7/_???eP7A?ss?BHu+?w?*R?'!Up??*?vRrV????F?-t{	??????HCn???G????a????3?\6??r?@Nk??e?]6?l"<????[??!4????????C-?????O?^9?=3??[??_???rdH?#G?:??C??
???????S#?QA?+??~??g???O
????'????_??v]	???C????S??0?????=?KR?	???oW_?????4??]???DF???Z?%?	?/?V?????~!?%?;????/>?D???aZ_?B5??????{?????{????[$?L-??H4?e9rZ?G_`?0.@?P
??a?/p/?\?Qn?w#? ????j????????	)nY??e??
???X
??c
?	???`@?
???`????u?j at L0?Dj at L0?Dj at L0??*?9????|r??:?pK7??);????r?,??R5??A?K?Q???,??,	$N?
iRl???p??ro????
?N??R-?????T@?T ?L???
xn??	8????x?:C??o5*??x?r??1?/K?%Ni?v?WZ5?X?u?cv?0OZ??c?	F????zb at nb?v at 4<FK}?c~?0?-?e?????%????t?v???\???s?`??L8?k
DRI????+?5h?{l?Au#F?/?K
nj????R?x???Rp????0??????(t?QL<?????>???d4?/K???*?E)8?"?b?10?~????w??7??|?!???&?w?O???w??}O?n???c???y|vu??,?$????}?n??4~??4J??A>???#LD??
?c??p(????9??9?6??"\IP1?)?0?:??@Z"?p??1 H?f?D??/J?P??
9?AsH?u?
m??=lC`]??	??u?????T:h????9?1eK?*????E??A%\?F???xI????W at wx???;?????f??
??wt????nI?3@;?;s??B],1?????]v??~!??????r???????m/V??'????5???3*??Wp?Ig{U????A??bg}?9{??b8m?dn????dE?V	$?<?38,???e8R?l??=X????X???L,_???????AA?
?F?F?Fdb???9?"?KA??P??
VpD(??d4?(???D??3?K$???$/??)?r???:h
;????6v?%?L??r???K?\\??n7??c??????H*yO???z ???bos????????d?????r??A?_???`???????F??59jr?E???1????pB?_?a????????Nu?+A??????@i???IW=?????v_UE?%W?]k;??Oo?2?O??F??>????:tx?'?M?*?????\ !G?HH?k??
6???7?L??7??>??8~?
?C?x?\?????p|?1?Gp????W???9
?>?????y?{???&??H|
~??GOW???j?h?G??>?aZ??@???$ ?????@86????
i??0?=~?5??&zS?<?Z??SK??Z???a?%X????a???qwH	?,??Ca?}?f???i??|?X?\*???
,g?ia?r???5n?4??A??a}'?@??%???W0??;xz|9?????n?^?4??^(?O?],????n?$'Q?5?|HH5pB4???XKH>-1?i??O?p(
C?y5p???
~/+?????X??8G8R*?e)?jy???Z/?%??Wz?E]????sG????Ca???Z?#L??n??i,?u{@???]???????D?E????/!?P?{???g?;?r??R??2?X??*???a?p????1????0?t?????_?"P?K??!3&3?;?$D??t?f?]?v???C??fa??)<?w???%|?p????9{?8??????h?6?+Efz?z???*????????R??8?!?J$hX?]AC???l?_?????Xx??M?'?
>?e
??v?(g??3L?"?>
<??JH?????#;??b??W?]6?>,=???m!?N?pa?h?????????h?m?n?hT^???sa,???Nr
?s?????k@???4]C?/?QXQ??
?yr???{??!???????s<Tn?6?3?-;2?@???C??.;	Xvl??]vl?
?^vlVi?????2(h????+.???4?
??X?r{??P?n???L????f???4`7S?n?
???w3
????i?n???Lv3E?f??)z7???L???6???$raQ?UR???
?O??2?????%?RL?;??L?.?jU$/2?jU?dr??RT???4????Z$+
D
?T?*r8?D*?wJ???i()??????/?kFh?(??`D W????l?R??[^???ny?)??[!????? *[/????[7??9???Q????3?c?????E(????]7^U'y?2??v?J?r??!?@K?,?????Y&?=S????# 
??fuv???????m??XN/'g?3?c?zR???A?O??&8~?q)bw????????9?r?????>?
?cp?/???t???c uH?+??t'?~?x??m?????????m?~PU???????????^????=f???Fjxk??=t_U?"??)???[??YO???y??n???vsj??]i???d?AH?{?
rV????????
?f??F?d???O?????NHe~r6;?*?????E?R?N'??
8?
;3?????????'?t?]V??0?y?'??3?n??x?=??Rxiy??Y{??H????w?6????r??h?R?m
~
Q??;??????O?j???9znG??/6?s"?cLah?!	??bg"??'?
???3qz?<W,???3g?g?u????=?I-,N?o??????????8!????????V?jV?Z}??62??3??gY???\,??U????/T?????w??n?6?????/???M?6??;N??????h+?[9)???E???
%Zi-wd
K?9?f?G???N?L????tb?2?????.0???:T?w/?????????;???(h7?G?X???x at S??w?+??B?^v?}???????.???W(????????????ou????vF??I?@a?	H???c??_????re?7y???sw??K??c?Q?0???xo?h?????i?5??{!???)?D?pFj?@x??J!???'?c???v??a`??=??c?R??!T???;=???Es,?MN???o
????N???	B?X????	?9?P?3???????c??'??t??Vs?????`?
??>0?[??9?
????
??23?o?F
_yC?:?F???0C??$d???????W????@x_V?C?@??#???TM??"???.?a=????$??7&??9?d???|??????nl??#H?+d/?"G???`?|?4????U??v??6m?[4???2?D??!$?!]??.??????????v??
??\?????d_???CqYC??2MFh??9	???*{?a?X1??????=?m?????|?R2??d[
?
B5?W?m
?!??$??
Q?v???????W$?q?_7?4???~????B2 ??nHi^?????!?yEv
)azZ?TA?w?8?v
?{??d?^?4?????^?D+tL1h?w?9?h>????u?8~?@'7??*I???c=?4??9?D????x8???~???8??xd?&haH?L2 ??nH?Y??(??M?<??rH?i?4?ENI?9wzq??B?^v?-;??N??N.???W(?1??t$?Ov????S????????;??4????bK????t6C?R?U?'?!?????	M?	VE?E^e???;???)??e????n??f?"^Jx?m?(?6?"?fQxm?f??E ?E??f
n??X{&,???~?:?7u?8???~??\f??/???C8B??p???[???^v?h???:???Ew??_???;????4?_(??n
I??R?!i?Pk at 7$*???._?M??p??(?v?<???J?z?5?$c??8f?P???B(??G~????z????\q?#q?????\q{??`??O??????O???:?!?{$7???9??????.T_n??OVK?:-?><Y-!?c?????j	\e??z??&???F>???}n?x?q?cK	/???SK??
*w??`3??~v{uu?=yp??Y?^Ry?u?,rP???nY?s?t?|?]8?`?r?Of?@????R1\??!????#?Rj*?e????62???D? ?????1??#????????pj7?w??.?R?+?t?7???z?A?N?>???E?S???AH?y?pjxK???!?G08?V????=]?%?!6?M4TH_+S?'?v??????^M????S?+???]?l??c???vob@?W
l?uI5N at F?Fe\q???%?
??`??k???F(D(R5???
??T?:n?p??Z
}.?h???6@?????v}??8mDD?Yf????"
M??????='<``??]?e?Fw_i?.??^e^?{??7?z4Cy?R5??tv??T3?]
	c?b5?!a?P?F7$?] P??V??@?Z5$R? v?@?j??TM????<?{???q?!???Z~wy??????@??:^?&?_I?N??j?????O????(??
?S??:4??	~?????r??uv?
_dvO,?a?5h??Dv??#HL??????????fs???bu~~"???3P?5??IQL?Y ??*?c??.???y??u?F`?????=~r12m??.??&??AV??+?????R=?II??$S????\?2 ?+?3?|??W77#k?dr?(z?(z???u!s???HQ)?G@??5#F3?8??%?K4???$/??)?r???9-???/?rJ?,?(?g???????
`
?[6???????K7????????????O?s)???O???}?[????????,???z}?z?N????!???Q????\??????y?????:?w????????/?j?????X:??#L6]_?XN?q??-

?l??X#RH@?K?d?????&?ZQ?)X??&$`Ej2,??H?y
N&*?u??|????]v0???f??<f,lm???N-??r???
???:??J?<??l??Sz?(??F?)>(?C???u&???ho??`??&?"??)??'S?????W4x??
?f???T?.1?>8????
l?I?ozJ?*??+?i???? "@??=m??;s????x????
7/_???%?????7??Q?	?GM|??@L???A?AB??k0;=Mr
Z??k??a?1?z
?????|?j
????n??#?!??I?????Z???'?=?p???C?JX|??F?????%0>?P
???*?????9???E??tu?B??x{??<???R?w?B?$5>D?>4
?????vJ?z??}8???w????d?S??xp ??c??gc`???u?|?(A?
8???q??T???]y~?=???vnW??"?zH	???6??%mx?K??????
bw?B?????f??Y??|?n?E???VXPQ?
e-
qQ?
e?
K&3?@???pZrNQ???x???&;Mb??x{Z_xx28>??2Ex?-??p()3??Ko??h????/? ??%?Qc????w1?6uY??/d?????l
K??a??Y????|hgV?=8O7?$????;+?????jx??S?5?s???r%#?_`K@??\?Kq?????H??O?.??{?+4h??f??{;???K?AU"r?+?w?f?$V???????G?????!T?k??h??????D?g?LDb?[??^d!7N?MK_
???l?$?J???????1^??z??(w3???
c"6? ???
?ap"??
???Aa??|??&L??NA??D??TrK?!
?g???]`?E??(N??+H??+X??kH?????
???APC?x3V\?AY?a?"3jH?9?????Y(o%?`??????	?$_!??&XR=??9S@lAp??????Av3:?? 
?y*k??	z7???L????f???$`7?n&
???w3	????I??QXK"?Z%?D?\?R?????????%?R \?
????\????C?!K?!W?*E?pl????\-?&`??
??????#h?B?xK???J9??gw???c????\5?g?#B:?K
?nyI	?o at 9e?u+$4"?B????uc??p???2??uc\`??4?<C9v?x^`?WDG?]7^U??Zfy??=J?r??!?@K?,?????Y&?=?f~??pP9????????W?????????kG??z?`?3??Lx99?|??#&8????GS?[????~	S??8?0yu,?R??A?5+???l??(F]CyO???`?cqyE
???1X?M(_?*????l*????L??$+1`?`0Fr/?4??)0Q??@2??!5	BjD?(8y?1?^l?i?J???#)IH????V????L???????6D"????@?T?????rn?)o@???tw??s?D?]}???^t?????p7E7??A??l!Aj???(?+?d?d?o?????`?????|????8
?9???d???Z???????[_??*L??q?~?\??????n$}?A??|??guU?!?b???????????U??K??
???9?P??????]
GY5t?????YW???Q?? ?bH???yf??3f???0??<???R~?*?? y?@Da~`0
LPev(?Q%??????myU???)H(?3??z?-?y??@ .?L!??\?Ll??G?9e9N^?*?

X?L#0?`?
e)??L?,???*???f?y?*Ps?????e.Y???$W??7???%???????P?8??c??uH?-??2
FBk?Rr,?Yf~@?2??q????FH0??R??2?RZ??????

EV?G??x$K?"??r?T?MW??*~?C?|????-????\<S{E;?}?x??)G?X)?Q??^ ??2??JYVM\?B?}e??r?R?~????S?<v???J?<S0??????
???o?*??{?M????
??{???O?/!bOU???T??y????	2,:A??&??s?&?T???? S??Da?pg?6??9S?^?;?\?w`?snG;nd?
?Z
??????v??????%????
`
???X?	?BN8??p?d?????)?0x???CiV??/????w??JY???}?????cI?wi?KO??????o?f?ou?p??U?jp??@??R???P??t?y?%??????@? =L???
2????;????/???(?/??@?ona??????7?0`xs
Q????7?Y#?t?P?o?p???
?????
?????
?ln:?Y???f?&???$^??f?cO?;??????
WnC???;W?vI?'??3?n?????u)
?Iu5i????Z3u~? `?;?????.R??9?`UJ??nC???DU??????RI
????){????!?N%?C??%??%?eZ?N?;~(??iy?m?w)
?l?}?H"q?7w??!E?!j?A????L????v???T~?v at I?}??5????B2????z??.>?{?????????S???IJ?????s???e+?G?7?N?3
??n??h,q???*P?8n??8?I	???Y0?s?I?????,n?H?y,?;?@?Q?$?!+V??????M???+1??U?
??N?B??r?"?P\?'??oY??vl?8?Hn8A??qW"??m??O?!?G?G
R?f8N?pj%??E??c????nY??H??)R???
????
?@??Ic?cP??Jr???AjX)???>n?H?C?ef?????@K)??? ?
?<R=BnH??????vk??iR???,??#?u???6?!`<??$???$?????GSFQo/?????? w??????]?????????l?
????
?????i???CehUKXN>R??/??$???Um
?7?L?:y??_?&?????????{?????}??a?@^?A?a??/`????a???1???Sff8??^
?)???:h?>K?;??=????9?5:?
??"????;lXux*`OeYZ at n??x???T^Oo	A+IN8uR9??.??J???l at N?!+'jHT5D??p?!2EG???I?QL??XV/?B??Tr?8z?8z?8?
???U????j?
W
RA??:v??#y???%??E-
???&????????'|??}?????Ucua*?aH?p?????1???A_L?P<(?H~?y????Nn.R?5^?2????7?$???9?6v`???
1(46???e??qwDb???t?"h????{U?*???X?]?<?W???4???:???A?)??#?!
?f????go?Q*????-?
^8:?J???o??p??p??Q?+???$???????#V???j4.????
!Aa???pk??????6(???4??C?
??-{?]???%z???e/??^,{?^?2`?Kl8??4AK(???1YG7a?"??4?	??`????!My,V?JD????u?p{???n?+?0?C?n7?n??,??Y?f???"`7?n
?Y?w?????E?n??,v?@?f??z7???,??Y4???$\ ?(H??
?Z??9"????E?\-Q???@A2????U??@????%???U??B?Q?"?
?j??(
??
*TB&^"U<D?
Z?=
%??A?
?T.7??]??P?j??????Mi/????<?p???\?Oqx	]???($??????"2L?2??uc\`?5iPy?r?????6?(2????8????????Vr?#???Z??gI??D???????df?Ps???fs?????>?y:??v??pu?d=wL)R???ZSlT)???)3?(qE?RBv{su?=Y?x8?????.SB???eJ?1??n??????z?YRx.?nW7??????'?????s???\?dA?p?#??^??????5?a???;K???6???nn?@??<??????W?Y??:;??[?y?????fu?????9?8s?????Pzb?hBF???!$??<?'?M@?l
?AO?v?????d?r?wUeI??}??r?W??pw4K????f??r(?Uy\????#R????A??*?0
??9?B??\???????"?R44??+6?"?>]?9??x?????f?? ?
p???M????tOGv?E?x?L!>|?}?g4?~?S?K?X?
??j?f??	?C?0)?) ??^??,?
?k???? 0c??????

??S{??)?c??RD?R??"?UgEy??XL1??=b?A
+??!?=???#G0??n??1`1R??E?????
??`4+T=X??
mq??p??nM????>S?0?7??,GGN!?
E&?P??L
S	E???
(@?	?a??+H?}
?zw? qo?$?
?-?dVb?
0-??C?????5?tD|??nC?M???QS???6@??{????????????K?m?N?????y?????i??j??????	??(f???%?h?
3???s6??A??=z?I????P???????K???6bXT>w???vf?[????????1?@
?c??3T??(_??"Yv(??m?????e?w??I	?km?)=??d???m?d????ED
?;?~,?R?/??:2????_,]?b??????
Sm?rUo???Q??1??$1??P9+??hCk??????g
zoq??r????S?
U??qW\???(?(n{?A??x??Cd?4z?B?h7,?(:??.????e#?7?Q?en?\.[j??L?s?!
s9n??_,3??-W??`QM????Je2h?????>??2?.3??q???L`k?T?i,???"???6,%?&?
y??1F?x?@R?gb?pdK?U!?g?'??wg??EEU
?wUH?]5}??#?(?y?0?????~????^]+?GPY,??$B{?,??t??2K?
??
?
???
[...8394 lines suppressed...]
?#????:z????????'.9???t?[?,p?!_??q1|5z???>???S??r4?9e}???}???gL??8gL?Q??? ?>?????kQ?m8?=UI??(?qE????qXo??[????w~u|?????????#??=?4z????+?8???z?-??"sg????*d8)#
??'P?~b???C}b{??6A??l^????y?P?????8???!Vr'??nne?
:<?`?a+:?F?P?????dJ?0???^?)?w?p
j>???[?;??????M???H?????????5	?
YZ??yv?f????{0?>=????o?7??????x?d?\???7??9?{??]_\????5?
@QSv???{e;'???????5,b?m??!??Y??	????c???????_?????	??X?8=b??7o?+??\^\?a????ka????4/Vv?xm????????e?}??????????/??????o>fP??????d?c??????????#??'\W]????W?_?
??u?cPl????
??o??p\???YW??z?(w$*??	L??%???g@?

??Ox??A???o?#?5?????v?/?Nl???@~/!C}O?O?/???/;?'??F
???3Ov:???;???????3"8??j???I@??i?+0??+???Ii?dNV?%?<?c?~d?@2~5:?????j???{rL?Wm???k????????z3G?>????e^??V^P<??!<E5B'S??g?RM??A3??8??????-???S????lt??7Es????p?;?F????????l?8>????}L??*z??e#??G????~???~8f?I??9'???6N?xq?V?vz????~????9={{$fA"g??/????5}2?T?LC???c??h2M??mo??l?@?^1???????????????e?l{?h?`???x??>?<??,????
???Y-???u9????:??,??X???,?o?l???\??^39x??q?-?R?q? q?GW0n0xW???S??oc/?=f??*?t???s&???e??1S?y?K???1?w?v?k?Gb??>2?F4nM???????w??????????kW?)????_??????????+??????~?????%???????_?a?8????JX???????i\??|w?;W???????\???????ww???e?????`??????q;C??!_w?>??F7|/*???o/?Zv???V'?Mfu0??????^?
@V????
i???6?k???k%q?x?kiEa&??/??X_?J??????:??????~r$XM??
? N/??*J??T8
?|?50?A1???9??Q6?????pGw(J??[T|Gl??F?8?bZ?\l??FY+Y????x0O?????????????-8???v?~?M??9??{~?zF"?????Tz{z?????e?????8??????????????S?!?{????-n??P<???S?(???????s????f??c?uK
i"?Z??b?s???&v??ClSKf?????`)?)????q??X6s?Q???Pn0?????3???oF?Z?k5?@=
????~?????G?3Za>???)?????|Di6
?????????e???fM
??|1?53kv??????G???_g????z????C?s(~?_?n??&????u?L?y???8K(???^.??????M??|?K????e???I?/?U?@R??z?+?(???Q*-}S?h?dQ?)?j???=[?
^??e?k/??}????????oG?[??????!?>D?;??????????????}?py?Y???y?b?R0???c???UFq{'????K???o?k@??C6>????|???5c??"?-?k??????]~,>???Q*?Qv!?????h??_f????g?1??Ra???F????O???????bu_E[??~Q>??????j?3???O?Ff`???????@??|???
??$??e??~-}S?+?????J??
??????Z?????
??_?b??B???????U?/??)?o???o??M??????j?-53?p?Nq?????????-~??????j??Y~,>?Vjvu?2?-??,>????O?????|?]???U??|??O?????????k??kZ?/n???????>1e??u?0????j??_??????'?p.$???N?`
?k????]?R?T??~Q>?????}??4?l??w????????????_??e$???C?W?)?d???3?v???N??V?I???WL?^?Z???S
???S?!???W???c?????_??L???_???_???c?)??w
f??)??#??iY??5?????_?t
fu?,N?
??V???T???^C~?_???????K~?@?_??B;?.?G??? V
??7?l~}????J?x
?
?V???Y??Vg????}s:?P?S?!?+??????7?c?)? ??+???r?T?,?????2^???J?Iu??/?g??Wo$PN?+??Is???5?$kR~?????V0?_???c?I}5??????????5???Q???{????C
?2H???E?\FR?\?O?X????|??%?Ne?J?????Z.+???????jm?T????}??E?,????^"??????|-}S????????S?!???T???V?4??Z???}/U9???+????SA3Ys?n?????,>????O??%W,A
?S??????X|???}P????g?????????c?I??}???!
?
j????|??l??????r?????()(?W
Gs?????????!???\Q?`N?$???~Y?s9nRZZ*???$'?o-?
???|??ad8,??rT??W?????Y?WU0???q?}-}S???Wy????e?*?3?*k?$%?????UY^~U?~'@?g?1????eU???p???????*???_???c?)??NV?SNz???W?E??D/?[??M??|?%1e??d??b7???????????\J|???????F???????zva?r??.??
??j?]??AA?
???[*G????P??#??+??gu?$),??u???c[????Ceib0r]:b+?X?????~s????5?E?uy|?+?Zb/???j?<v?I;?z?C?"sf?`g????????P???i??
????&U??8??????{J??
efZ????/k?]_\??UkRH?d?Ce@????Z?F????????{????,b????????

?
)\b?d?
?Z)|??(c?G
???N???l?????}?6?S???|??k|??5o?1????E????????O?/?1????K?MH??\?7???2????w????o?G???H????qI????? y,???	?s?5??X
JJ?????F.C?,??R
?*h-F?Qu???S??%?cI??US???#?
n2??M&??????&m?,*??????W??r-?<?SQ^/?T0 at Yv?;{??V????^??*??(4?*????y???k?9L??????4:X
??\b????TFY??R???????#????'|?????Zi?)??y?g??pG	??????&}?4?K??V?<?H~?T??i???c?? A
y??T?<?"?+gd????2??~?@9??"/Q,?j?7??=^?
'?^?W|?R?
?????????U??v,?3eO?$c|????/?kv??????	?Z????'?????~?+?{x?gs?}??????k*?7KE?3=e??A?????????*/?g???!?????G}~??v8?_q??})??l?^?8?p|y??6?????AEJ?zh?xq?`Z?_A???9q??.?M??j+??bZ?C|a??,b@<`$P?N??Mw????!?X????????#?
??/+??A9{WQc+^,{?g?j/???????9?U
+??-???Z????q?G???]?7?k-?.???Y??*B?u?C?'??Q:
?J[??U^^?	????!?Q??q2?M?HKc
?^rIyU
;t1?`J???[!EO>\??Z?????6RU[P?.??v??X?BK??"???+
Xm3??}??EA????=@???
?r?EL??dY??^r?Ohw?	???'n???[??eG;??e$N.2tG<\*?\???'"H???????G	?#c?fP?T?~?vn?????????
?????#??d?y????j??
?*~5??ll<????|KN??loF???O?i??2@??G?Xt?
??
aJ????
Z>??L*???3??{????K*q?f?C?1d?0?y#?fn???Ku?r??`T???zaH????5?B???A]?i???r?#?*????R&??k???U?g????Y??Z?Z?k?????=??s??/0O?????#?V"#??O<]?(?Av????c?r??G??ld1?9:?*???!?,U??&?????s$g0?=?(S-??_??2?(?Tq??U?Ri????/??(u??\?j?VuS?	?Q?`???~K)L)>?)R??By?
	??S???}???????tV??|?N????D
:?????7<??
W<?n$???M??&?:A?p?ys??%E?p?5O?????{???S?&'??zu?>2???5wx?>^???,?*??7????9???v}"A???q?w?T????[?f/x?n5mm??v?)I??zZ[?????x?.?{V?????}???9????????K??K?;W?;W?w~V??????<?????O????
hTXaR?X?_??????`)*??\PT?S?WmV?
???O*>??m=>????}?~??F?_???l?yC??y????0?6??eEN?~Wg???g*>??F??? ??5????V??
L?o??????*
?gt??????<????????_??????????_??????????????????????????????	??F????Kwm??????F5?|?n???zV???/{J?t??A?*(?s??n?y??????w
@??m????07L?zs??K?0A??}???????9??j?JHbx 1z??????????Z)????%_?Y?~???O?%]?j?Nl?c?
IqgJ??T,@?????
??
?????1?'?
???/???6d0?B?>?mwjx????
aS?#?????o??q?cn???6d ??L?~(O?S?V?!????ZZ???f~	@?e??h??5V?R?w
??<??W???G??.o>?vl?l???????????kD????-w??????	???6???V`??2?[?~??I??w??]?_?+
?g1???A????g??X????*Yc?????!5@?VU??????????????Q?????????1???<9??????2??)
*?l??S???*EJFB?*?#??6??$rT	???Fa?{;w???L????Md???????~???;
???G?Qq??.??E??.??
$?
??-??&??VJ?#Y??Vh??#W?k??RR?????3???????E??????8:??????hoV62???5??????z?s??'????9\?B??
)???_?N>}??x5?n?#?\?????x|m???????!??q?xl()i3?????9?????]GTW[nBP????????4pw??_?H?
O?AN??~??-??'?e?t??e?????p??w]??????]???????j~>dp???{?_??/fr?TXG?l?!??w+{??5? }&.Q?7??qs}
??I?`:+??	?J?yN????;u?G???_
??	???6"??'w???6x'??????;???x?????AZ??
TS??oUH??,1??J??l)?r?K??~U-?M)???4.;?)#???,wI/E?
M&????G?=Z?[??j???*h???2????=??1?????????????[??????~??2???????3rq???,T??r??wHs??-&???????9y??C?U|?;??PA??N???d??lO-/_b???=ro????T~??=??t??e??Nx?8%??q
!`????pU?????????????????qk
?`?N??w?9?z??
	???
???JJ?
${?????8??U?N?????oh?'"
???;???K1???J????	??????K????V	Y[??WV7???UF??mjd?4a?-????Qf4????jP?|?g?*L8vNC???r*Rt??d$??R??-?=>?S??6??%|b?V1d??U?7??6F<?,?<2???????<>aCy|???\lI??S??r?(??x???y)?On8-?L??!?{//>?f?????arv?&d?????&t~?\???|????=8??U^0b?|y???
???7????T???z???k?>???\W(n$???W??e????Qv?[B???t??
?=??.
(
4?*??fv?]? <??{J???y???_?j??3??
J??7???uCS????L??r??QgP?[.?>?Y??GA??*q~?=??Wp???.E^^?`?\?N??\????''w??TL`~9<??????UTk????????Q?oa????w?5d??]???????w?4?wj
?????pVQ???C?~??j???r_????^a??)?y2)?/??<?e#i3??)K???p??????1<??C?.????%?6??? "$ ???#qW??n?u??q[??[??;?.++	o?6????,??? L*???????cZ?q???c?IIx?????????1c?8?5H??_=?F?=??2^q!?H?d?8??h*???:?s???????e??OqI???k??5?????07?t9?u?]-?7??B??w??`?)
/s????jA??iQ?????{~sX?^_??~?????????)?=PT?????N?]+?{?+?h?P?W?H
?$?l"?Y:?i?8???m%k,?????????<F??HY???q~
N0?O|?K?+?1z-?r?a??N??????????j???a??&???~?3??????75 K?[?Q/??dw?5???>sj??'??1?*s[??}??(??5h5?:???;?[?J????w4????;??)"????N???r??I?)w??w?;E???M??= y?^???;:?????v??????jRq`)??<?_?j6??(?S/*7T?XA??bAq???V????_?}<f???{k?
q'?`?%Z?v?
??x?-(?7???Z???bTQ?Y??+??$??(
?r?B?rdpQ?I????f???????a???~+"X??????????qX?oNy$??@=?G??aB'?????Z\??E?QQ????T~/F????e ?G@??9K???????h?GX?)3J??v?
???-??'~9ac?
cp?~
????0&?}}?q??H?H?(fg?W??..?????'?`oB???????
??T????O????o??o???? ??'/?Mqm???{??x~?>:/?8}5??:d?y?g?|???X?l??!????)??N??????]?_?:>???TL?B???
=Um?Uhjv?zv?N?????F?ywU?o?n???e?U2????#?J	)~?s??
??~?d????^?Y?*??^T3?6???|?_??"?

???2.??+???????k?N???tU?Qs???^?*?E	
k??qGO??M?BH?|(9b?j)O??#????`'?????H@?]??F$M??V?
?Oo`?I?L*?^)?}?}Y?07?;b??????,?4???x1???J.:E????S?'?$d??Z`????.K
??[??RI??E?43?2?e?t??g3EI?|WJ'?h.??SJwo???/bCw|??/??'???
?l?-?b<??0??????`\O??W????????g?n?@m??jeC???	
??8?^????)?[??i?M?XK?"??X?g?,???(?b??\??M?r??n?,-O??K???ICLf1B?r?|Ky?T
??uB???0?G?J???v[?J??????}$?SX:N?iJ?D?6?cudf?r??t????[[??A?????)"B??w?t??f????0y
E/???f?k?t?]???w??	Di1-N???Fx?N???@R??2??N?`??o??Z??1,J?u}??}$?M
1?5?)Qn?!!?\7?{??u?NiN???Qv;_???!?@5?l??1??*??ch?3>-?=??y~,?*??W#7?NF???P?K4j??\L$
lY???C#0???VS<(??"???r [??I''???^?%???????X??q'?G?? ?V????7l?B?B=?o^????+?#? ?r??H?????:???{??{?<?'??
??A??
????m&???	?T??-??*?1??tE(?R?J?l???@?.sd&g??7??P?pC??4????N???h??7WEV?
?]4????u&?}?Vs?6?&????'?;>Z|?1Zi1?:??sm???=??8?0?
??w?X?????FU???%<?> ,????Kl?G?a?	^??~?[C
??a?b.?,jb]?j?????]???0A??KZ?:j?~???
??)??????gY?s`????h?PQ??E??3?R?~M??jyR???zF????zL???+?
;?	@?lL?.?H????e?w??'???C??$J???????Zx???P???????0???z?R?\?????|??r??\u?=?!??p?5????????V
?????l*?C???U?d`?:????#?GKG
?'???3?V???????7????????|??/???c????;t?b??Q'2?	?U>T]
?/)c?wH9a?"q??C????????5??g?}????Q?H?s?p??L??????0(?????4?|?>/?n'??W??[??re?)]?bN?6????9f?<8??sc?????+2????qP=D=s?n ?/??#g???0v?
<?
'J???Q
?N?|?8? #|??????TXzw??
y???i?\8?!qJ??:???#RxY'|b?ft~u????8????O???[?N?Do?g|???L?dh????^8"?? p?x????n7[?[?6?????R]E???|??=w???v???C?Xj??r?}?*?I*?-?j ?R?????9=?\??b???iE?????*??Y(?l?j:?|`??F??c??????????????:i0??Xt?6???IO?R?-q\U{,T??bG?)?,?&d?[???6?????s?7?!?I??O???S?s?2???dl;"+?FR`????I\?O??3?`??:??_??l5q?0????t
????5??"????_e+;??%?=??Y??# ??f?
??4???3??+_??N?hd?pU?K??}??EL:(?	Rg'/?o??1.
Qx
Fg?b??r??Q?????~?6??2?mE
`?????	X&???7???E??Q_M?c?b???s???,
??Mc?v9?9?^Q???????T??al?S?2(S?2?J?@?
??@?.?T???????D5???@?;?J?t???:}????]?">#???{??L.)???U??`??G???
w??7?x?2"?gr??????(AQ?|*Yfogl.?Y``DY5?"???o????N??E?
??_?U? ??<U??J????????|!????*'k????z/_??V'?9.?????k?EcwW??+?
?[??
:coD????0??
C??y?.&???????x??#??zx????????U????aG-????|??7TI?m2?o?+/:?=?y-??71-?4?N?e*?8?:gj8????I?????????:???7?|t??????
*???(?
?E
dg8?M?Hd?@??????U??H??D??h????x????Yu?u
???Kng?????U?m???	?I????=?`a??O???\^????&????A?	?
8???A9#??q|#?]Q?????[?l???#???2??????M6?B
?y???????rx???a?????T?Z#+?m???????F{??????n?i}?
?A??K?}h7
??k?Z?B????j9???AWw9????;????s?J?d????????]????Wr?R0r;^??3}?')LL??Y[??UHm4z??4?????@????&??H(K2*???????b??????<???J?[o?V?C??(j.??]\=d,?? q?GA????Z???C????6Em????=j?>#?V
+?8??
q(????aO??tDO??????????~???????;??Ko???5??B
?)N?N?????sg\:w??d????i?????P5d?I?a ??Nx?M???????????|bi??? ?>?2	e?[?;?HQN????fk3R?R?4???p??J???????t?'/????e8?????"]?FI?S?B?M?R?(?^?#?
??Dm?K?h??*????}????@%??"1
???u?c???m??J?b??F???F?,&<?
e??e?"?4Z??7??????
6t?}(J}L??a??<?????wi??r?V????????0??rH?xF???(r??????^?Z,p?q??-??b??IA%l?a@&?J?W~<?J??T?kgH?vV?
?;:}?l????jS?t?Y??
????
?:^??$??tt04?Hvb 
b\???Jt?E??=?????????y?)&?e?T?X??`t ??h??F??I+???n??/7	N??Z4?T>????u??A??'1?91??%?/c??	????	d
,?????k?r?o|>?a?g?4?1?k?
L???????V???????????;??	????|??g?e?(Qt????"?r$?????8l??&???|?=(?/
???j?R?M?U????	Qv???r?n $????q??QI(Z??	????d??Jy?Zb2???|?.??u"????$d?E\FP??I???(?|????2q??'?? ???u?????C?G??=h?????X<l??!<???P?I??e<?KX?????H*W?m??^?$J0?Awe?_'m?1???s??j?@'????\???X?_)hl??????A??/;<?~??o?~7!??????v??M?(??7?K??7??s	f??6,?YN?u???$??=?????#V6?M?g!^?a?s??=???yV??????4???>?ad????`?????6?v????Z????#????hW?A?7???_??/??T?_?<q??????7??gv??/M?5???i!`?p?V>g?$?'?"??'?5?t?:0?5?t??b?Q?/??B???A^??g???M?!??jw?????I?#u]?C?W???pS?????*
?*??aX?-??????S?&{3?_m-?????????????M???-F<yN!???:;n7&??o??
H	:	??y?/U?????L<?s?p?
?3 at x?\??R?i???g?M<?Uk?j?T???5S?f??L???Z3Uk?j?T???5S?f??L???Z3Uk?j?T???5??Z3Q?9?(??n2?M???T7??&S?d??Lu??n2?M???T7??&S?d??Lu??n2?M???T7?
M.?r?????u??	????<wbZI
??,}?c.?
?]?+|?Q??????3??V?8(????X??
1???!Cy)?[6?#[?1???5????m=4Z?k?mr??????3??`?v%z???%?n]?y?3????NRL7"???_Pp??j???	w?.dq?n?S?6?!??u?d?o??????
???tt???!1J?e?Mdc??I?;x
P?{??t???	????????Gg?+6?>?;[:?,OY??ifG?+????C?Zy??C??p??3
?j????????`??)?ND??3p?"?\P#L<`?8?????.?B??,?????='????M?y%?UC?????3????J???????????`???!>??f?c?s?CyN?/U?=??A??'???P??????yN?I4?????Q7????S?Y?X??	???/K????=?Q?8s?]d*xuh6!?9?Ht?Z?vN??#???3T??3????Fj*??F>??;?????;???????3'^:fHC???>%?)??o#?i?t1?c?0?H?:3n??t}?t?[-9]?e+t???????
?g??%??q????????_??y"???!e?)?NYu?t???e?????q?t_???????????;2??+?????3wc*??{1????I????0????Axr??ydf
??p*
??p*
??p*
??p*
????INpJ?b/b$?????f??????TjN??TjN??TjN??TjN??TjN????<G2????e??-?R?8??S?8??S?8??S?8??S?8???I?q?NF??)??f???u?n??{????x??T?N??T?N??T?N??T?N??T?N???=[Ta??????1!??S	9??S	9??S	9??S	9??S	??GBF?[D?w[F??THN??THN??THN??THN??THN???!9?????9H?????J????J????J????J????????<?
Gc??=q???@%??T.N??T.N??T.N??T.N??T.N???\?Zs?KP??:?
??Y?jQ????Xv?c??QgSFv7????Xw????v???`????"????????k?o?o^(???;??a??U?m???~??0??` ??ZB?.?0(?????Q???V??n?????4?m?F???h2?@f?
x?????_?P??[??vv??6????s??c)Tx+V?\??^???7?D??^?0?F)7J?Q"7j_~??
9R?F<??(Wj9_j's&dNB?p?
$???|z?J/??.>e-?N???W?H???B????????3?F!4)		???2@?'?4?BG"?	??I3?<?????O\???
wN???u?\!+?u:????\????G???'???e
%C???????O??
????3Wo???d?????{!??Fc?
J????{?'?6pqX8'????a?????R;;4???G:#?@	??^??x0?M???+F
s
????#?u%??;?i(?>????|v{??S?u?b+M>1`????:c~Y?_?????6
??9????av?^O,?+??????u?+?	P?Vf?b?.?d??m????!?E??G??e/5?,uR????Q"??.$?Vh????B?HIK?m????d??????C?Q???__???????s??v??UmN??????{4???t;?kY??#??????~??C????f??<>
?????????V????r>w????-??O????_Do?$x?QNE
?-g
P??
??wT?jYlv	-??????m?<
????fG?2?"w?F??????)?vZ?K??Uq?jgO????eUX4?~?f????2M???A=h?n?????F?? Abo?	|?i?A??K???X?vv7????G??bw????}?h6?qw?l???n???V??z??n??v??lm?`??V?ec?yt?x	??????%=?????yo?%
?;z?8??????????j?6^???/;/hJ(??????j?wJ?G?????.S??+[?$??%l
???hy?=T[X(??????
????l?? .d_W?v?*??z?j??"??????-?????r?????e? ??*?	qi?vL??(???T?-??Tee9'????M?V?^?+??$????n????j?4????7?$?T??}S????????p'???O?	w_?1+??_??
h?>~??i7?????C?9n%??eA??x?Jp?e
??r??$}YR?~?[V?;g??F??????leT
??U??{?U??0%???????????\(?I?e????[??5|(G%H??????>??+H?8?j????' ???\GX:)?H?(?rE?jBz8? ?
?s???d??????pY????w n??|????cao???W??w?
eT?	*[?!?h?
	
??:?D
??A???C?pW??S?Q???$S?.8?y ?H?9T??c<?$(???y???PA?u?$bM72p???@'6|4?0O?2Y??)sA?	Dn/G?N???kW?0??t??>@w???????fs%h?d???S :
v?]Z.ME	??w?Fq???3??>~??$??(??36/????u???b???C?%-?u??
6:?i?6'??R6?r?
??"??????????(W"?C`?ci?????????N^d88??#?d Q??w@
??Zq?x?]????Bf?|eqb??R,
A?e3?
??????????[????yW??y
?????|I??0?;9;'??????7>j?X??@?????????LT@?y??;t+???$2A???????rH?I<?)??I
?x??u?K?d? ???.YE?;}???! %?rJ?G?x?ID?????k[?6???%??????P?????lfq?Glt??>P?f???yg$J???S?????J???p?aT0?CkB#F?^g?(N??=
????uQ??v??6?.?K(b?x? ?-Z??!?Re????,)??.???h???q?c????N9?[0s???W?6??g$Fuug%?6?sU???w???J???s??qK?M?9?Y?5???F??DS.???@?? ?????"??R a?u??|%?????<?#????#+??)?:????-#?rJ&C,?!
??r?N???+ ?x?)-??1?}M???u?0 ?I????????DY>~????[!a?r????FS?a?LG????T???????m?AfSP?-?xK?J?0?8E)????KX??']dN?dK?8g??xZ9?????????Y?q?"n???G?K?/G'|???????p2?? ?!<h????????V???????]:"???????fN?cC????j??Oh?7<?;t
QE2?R?O?">k?gt???sD???E???=?????Fd#???S?????C????X?aV-?k??x????????Ek????!?mV5?s?&?:??k???3?~nd?3??x????bzZ??=
?#)???O0???9$]B???Y??U?.cE??"N< ?r?Nr5?$ct?????T?,J],A??z????A????-)8?1???o????????L*\?????c?%????f??xy??o3K?z2s?
?@3
?r?1?s?H/#)?5UE??Y?Wm<?\b&?L?d?m??0????#	?/??I??>)g?3j??s???g"d*??2?T?b>???,?7<>?ZD\??YI at sA?
???;^~[A??????;H?a]?!??o
??V??gc?M?^????i???x:efeQb+?,???l ???f??h??nR???;xZ?B
T??(k????l???Z?g3l.?!-?2;{0????e?t???
h?3?,<?k?B?ed5???si???T?\?????)?':H????????c
???kJ=6??]?7(?@???>KA?A?9?{????O??Q?S?S?K???JT*?UQ????9?FA.??}p??H)???????<?'? ??=??M????k>??|?Mp?Dhr??z??? ??+?}??r????H??+Q???te???????>[???3
+?J?9??????N?9???B?Fo?z????Y???h25????l?&?+?????8?;?A???2??Z=??D??lD?W?K!????????????????>?4@?%n????&?w>j?G=??????<??!????z??????#?-sE??#-?q???d?r????P????_?$?}??x-????a?Z?L?!??<`b??#??
{?????&[????D?i??&q?W??k??0???|D(???|f??I?L^%a\?|?!??Tc???>g?.XznCkJ9??????L?N??k??.??0?r??w=1??=??%????9[?????g5@?
??? ???????Q?om??????m??t?????n?????ak
????7V????.o?q~???%??G
????]E&w??????]0`b?????????:x$-??W8?e?rfY
>I?
k$r?????,??0??0???W??L9Q?e?LN??????x?g5? %taGgShX?n?`??.?8?{Q}?[2x??Ga
??,_Y?&??_6j?bY????e?E0????'?*40??K???{??/?S?x???x??K+2F?T"????H?B?L??C??&?.`G?4???Bf????*+???v?'Q?IJTY]??#v???O????C??G??6????Dv2?)?}G?$?^?
	?????_S???-?uO??-????R????/??*??S???x????~?R??-j?YAX?(?????I"h??xr?hP???r???4%A??~)?A05j???	V??_7?7?b
??bq?tz???/}??????uB???'?* ?V????a???y"	?~v`&[??n?n??.]?7?????n$K?????z?_???>??i??m????m?t<M????????a??<xm?????????=??Mo?t???;O6??i[w???z???s??)??>?'S??@????J?a??P???????Jz???O?????????)R??>8?~????R?r6?wZVFN???????r??i7.zl6??????????????"_??)?????Q??M???\?2????	???????s;n??????`??U??V????"?!X?6???`??|V???E??
??s??dl???S1?7vN7jP??EW5??eY???L?????I^????t7R#???2|&O?U?`?NB6u???3????g}??G????Q?}?-J?$?h;???Zq?????z???3+?\??y??b?????nV?l?#????f??6:lk_?M?#?p??????r2??Q??]?392y?5?B?'#i4K??:h?e?qA??/9i?T?oB?Tw2?/?l?
?,???:0x?^???c?J??
??$???wU?<?
^Gmc??7N?????k?U??OoW~??:??-|????x??????0peZb???F*yq???,?5???P????hY?<?[?????~'m?M???39qe/3?D\??$??'??;???}?~???QWa&2????mm?"??u???B?F?CL?++?3???Yb?7? oX????????^??7?l?eo?5w?L?P33??.?]?{N???m????72?Y
??Z^?[???JeE_A?]?????????,sA?9?M?????Q?)??]u?V????;??-f?qI??5?B?lQ????#l?i?m]J}?{O??1,???M%???$?o????L
?M??
??Qdb(?qI^?Z?"1i*?<
?Q0???????0???$???d?2c.B??
[???P
?!Hv?{?????<	R?????7?t?=uh.]6_x?A_|w??_d[
???	?B?vJ??HW??e???b???03O??<1??K1N??!??9?lN?4????!ZZ?(K?@?g??E?4u&???b?D??f?L?kbbv???\???fm????s^?3???J?O?=2Yj??0zp.]m??)??????p{IZ????6ra????mD2p7:?x???????? o?O????ms??!??Ev??3??c&????#K?U?\Rf?&RB??t??#?V????Y?"?"lP?.K?v
?8?nn??O?Y?-??>?9??t#??????q???*?n?~z???
???9??>+?c?t?S???????O??I??vNf???@???n??*? ??s?n?D5v???4L?V??????0?T??a?XRHqP??^Qz??G3?k?x?09?????T????_A????k?A?1l?L 7%?01??`?Q6}v?>bAh?@6?l?Zd]
???D?0???%????{7H)
5??	????*m7?
}?c?????(#????M?>?@Mr????$??T?C+?gR9?M/?'?5j??=?l??5!}FB????Z?D
??j?gn	#??E at Sr?q"Di:?;??;7??u???&btKi?4I??jLLVn?v+????3?+??c-?????gS?????#y???FlFy?Vd??x<kQL?&*I :??F??/Z??w_????Um????]A?b?o????K?????U{?Y?R????e??e,?]????y??:
?TdK(o?????<??G?E?BtQ??
(8=??
'C?O???7f?????bR@?T?6?????6
O??-[???PR?I?o???m^M$?\??};
]|M:??Q~??n?t?=?H?]???7?Y?l?SV?rG??=~????w????

?Q???n?+q?a?t^]$????Es?K?\??3?3
???s~????0?,'?????x?S?@?~?]k???i?"?S5n??#44???????? ,bH?????????
[?????Z??j??????p??????G???G??V!??????????Y?	??X??	?^????????_w???A?L??c???+?????_?-?d6??;{;?|
?????_-?X-??????????V#?F?w&?)????)b??W??a????{j??^?KQU???[[???@?K{8??.?7??{G???m???b??V????{?%???~x5r?
)??om??
???3F???E?/?!???:???!
{Ay? J?????,_??????_<Z?????^?J??????{??js???????2??w? ?Yl at O??w????*????>!%?oh??$M???N(?Bcf|?\?????^?????h"????W??ho????'??j?)?m y???????aX???<?z?F/y?UjFQ???o???y?????3
?t??]????#q?2??u?n??{]OArK??
S
Ty????^m?0
Q??m?` {?{???>
???1z^?L?????????j8?o??+??s8]??}?R\F?w????7?LJ'0?K?Ud7
??^?Y@???????X?"_O??+G???)0;eF?????ax?&mz??r?{|??????Ci?4Sn? ???@??K?8??B?????????=??"o0?????
??x2$(?????;?L????f??;??????u?Z7d???1?.#?u?b????y<????`?????z?q?p?Y??????k?5??9?/????<
???n4t?????{?9C^T????K???rtm????7+?Q?&?C???@(`
B??t????u?0CW?p??d8????~`????r_?#u?&
??b%t?AO?????????/`o?=9???a?v??
????W?v?
???>????v??.?bW?????????F?????38qp??+???*R>?X;d?&??6~O?
?8?
?tf??F?s?W?Q?Ib??e??P?I??@?+??2?66?b2???8?Lf?u??)?!?<Fa9q???G?}??uY??c???o?Z9????A??cy??A^"E Ss
>n????@?????????O?A\?	?g at .Ao?????F.G'?

3?R?qP?F^g????{??V?????-u[F?'?p?+y???????
??'?????XRE	"P?\F(2?%pe?#????????
[??IWN7???Pj??Z??0?0?C???K??????]e?A??4++jz8???-??"3?~?vV?????s[??@???=eQ82??QF6?wx]???~F!?5%??h:?g\\?>IPdp?AG]8s?gf<?????H?0?^0??2Z~eb2?a??T?,E?C?B UR?
?)PPO?l_??E!???7?r
???	
<?r???T'M=+?|??D??
2??R?B??q\O\o????P????`=-????2?I0??cl?#?????:??P?????>?_???,X?h(HG?J+"?@?<?@M???	?????>?V????9??NP~4??r?c??"!?CFA??H???sR?QT??;?????#yF??s?tk?j
????95x0nt?????'?A
%U?r'n??1?W^???L?7]8?dY?}?DK6?M/0g?Uy????A? ?=?????<<|?-???????w^H?Ie???('??&??????6???6??;?5???G?????????ps{k??????????I?????Z/????88?n?m?=z??L?[?%?
h(^??;???D[??aw?^??O

?aHc??? ?????Pd????N?w???vZ{?fS<????`????u??y(???
F?J???X???M??w?Z)??&	?N?????~??Cq??f??d?.5? ?k?????????E???@[?dn??tn
????MQ]????jn?3+?LVOk{??f?>????{=R
4??
????	??????{?<_???
5E%t??Su????2??????1H????;+x:0???{??e?=???Y?????TH?&
????
??????l"V??????
T?????A?@??=????[?"???d????,?D???r????J??????"k??&;[R???+<G{?q8??;??q4z"vN??:m?*n@?o?n/?`???X??j?????????Y??KK+=??????????*sQd?a?P???????Bfii??U??	A>??????$?J?r?q?w'???;??0[??!????y?w?
U???1?]ld:gJJ???,???F???w??h???;?s?????r??>L}$???)q???'W?-%["??T?cR=?w??)?????????*????&K?????O?Ev?????????=?t?????W??%????6xo??X?Nk??z[??a?t?
h,??dw??%>??yTb5c"d??_??&?????????j!>?25??+??*?jO????,j?????lYd??
???a	C?:~???2?.R?C?8????}??b???????j:???6>2=DLf
?U?l??H??G??M{0?????K:?????????G???x???!?I???GOP? R1H???E{VT??2?r?-=+?]  ??\??????.???q?t?>?=J??B???????
H??
q??w:t?????????EC???????????@?D5??V????)???5????A*,Q?9A}?0O??=V.?p:@???+?M?7|??_?+?a!??????@???AQ???EP???,????Pg??	RU:7?Qy
?B????=$0{9?[??3?&??+??oO???????.?????}+'??g???arf????J?3?X???o??*?tn{???:????Y'?? ???I?%??z	??c9?T=?v?+?
?)sL???>x?.??S?????????3?r?????,y\ll?????i??q?1 ?s2???(hkN?L?:m??i?(?x9/?.?I+??!??;??6?$3F>\
?H?;?(??<WG???yg=h??????u???????l???K????????m?? (Z??Xs????*?ZR???O????8_T=5??Pf??TN?{y.QH*??El&??9g??h<?%?H?=a)?z????;j??Jd$??t??????z??H???n???D????????
?D
?BI?"{4|????<??]?N'GR???j??)
X*?H????????H????'???b?}k)??tfiEKy4?V?{??j? B?4l?h~K?V?+?V :>?Z?T??^?Z????4XRf???F??????Q?x	??J??????&???a???E??M	?JRC?`?$?????*?A?h1Tc??$?;]??H?]j3i+8???`2???$??u???S???u????x?????W???P???/+?"J?X?9???;??@o?x8#????9??????e-???l6??h????*??Q?5???yr?u~	??g_??k???X[????j??z?????????'??c?zu?D??b?G??????9+??L?~*?#xM"	?4?mD?&C??n?,;U???;	y?s)*?/L?"??NEIB^?X?
????Y??"???L<????"?|I*?T?E?ti????r?h?5O?????	?:?N??`????N?6?P#?????V?a?J???????j?q??:l???Zm?Xs???d:???c*7f?yz?jL???d??6^?+?Bf=???*6?K?!???????{??J?K?WL)???&E????g`???/?W??_??
???u?[???)???????T??Y|??"b%m?<???(??
0???:??c??~?@????b?\?????(u????v????O?XO*_?Y?G????dXJ4?1[Hu?n?Fw+?`??x[?k????x?f?????????n???ll7??dxT??m66[
?{?r?w????d???:???k3>`?Vs???-????g???;??{??%????\?;c?????;j??v6w??{??[cM?????3?U?Q????????????Z?el?<?jo????????A???????B?t?_???-????Ee?3??M7ti+????~c?/d?????????????P
i??tDf;??v????]B%?)??????$z?=??n??z?\??9w?i??
j?????!fA??{o?\O?% !???*
s?N? ?????2'?????5?Y??????'(???Y&??g???a????~?c????????L^?G?"??????????vx????t?\C,1B????*$j}\8W????}
O??????????Q9??^?????ch3?c?Q?t?g???r?B?????{zt}7??	?[?B)t9Oh%???g?F%C??;@?Ury??`??V8?NF??N???:3C?,+*O???3??3 at g?Y???4n??z?a?.j?Qe?2???mXCg??;?tPCG??Q??mb?2i????/?7?????3?H??}o?????k)[0?Ug??mVu??O?$????????9??Q?'??n??
?a5af?3????\`??0e?O:
h@????|?}??#?y???E|?)????I????[?7?3wK?
?X?Is??????{
,?????D???L?G?????Xb'?4??R[??f	?????q?e?,
>???yp7m??dB??v?V?e?*?????Gg+5|????{??^
???G?w???!EZ?#??&5M[???? (P?`R?g'pq?%?????D???H????z&Zw?V1????E??Dz6?T,??5?;
"-
Y???E[?Z?__S9/z?f???;
@FEO,??)??????qA?%g????oH?MY!"P?Z?q%???U.???)gM]T?????U?K??G?E?En|????3?\???*???'?m?.?_\??!L[;R&?E??5G??z???H??dF"QQ_H?@?h????W??if2w???? 
}DH?5Q9?????:M?????d????`?X>~?M?"??;??+??ux???W?lr?&??08??P????^???c????G???C??F?/??Zx????j?'????2??[Y
??rm?w?7_?7	??#???j?m?Q???T?q?r$???o??-5?dbC)?????u
????F?&???/>W??)???5?hw?H?????02Le?g?(?m?%S???t????/?V={$'"AA)Q??6?;M?D??r?Q?U???]ZOW?p???t??????>?R???????09m~?C=?????UM!?o6+??{?^3K??B??~'?u?????Ky{?PQ6?pV55:??????Z_Mc?3I??U=?%Jm??D?=H?_6??????!??|??????????Tc?Q????I??\Y#2c?Ws???????	TE??0?E???r?o???b???Y$
?U???3? ??H????)[ro??T???b?1?H??G(?X??}Tz??S????s?/G??*v??&A????kj???6?h?????r?NI?!a?h?T????|?P???y/???y?g?5?7/i?V??n?(
c??
?{???[?~J??O7P??z?o@"????F?-$??2V?O4????kf)?????????????????|???X?,?cR??>w??";%?z?/.?k????????0?=l????z
????6?8
?l?^?>???"??AK? ?C??9?W?x?O??>R?>#H???x???????5}??/rc[v#?G Xy??SO???<?\? ?>;a?Acxht????????8?s????"?1<????^?^?v????n?t?1?c????K?)>??3]?7??T]?OY??????????4??
??A5? ?[ri?Z??U??	p????3????q?y??28?z:#??u@????????x????0?>?C?y???????tl??x~(!c2|????:?????????%} ??gt??????8\??==????????3>?????0x4dO9IwZT=x {I?d??35T>?\?-J=h?y??`???? ???X5&?[?7???a[????X?Te???f?J??0M?)????y?P?)?Y??K??Pu
w??=(???X^??g&??1[?Hr3 ?D
??F??
A}???e?p??Y??Rip?????i?(0?D.?@?J%??H'H'??,
???????????N??e2	???Q????/
1??z??=zf?BF?2?B\???J?6???S{????\l????(u?2|49??2?n*S\??????:?
%lw??u?'?,?,AlUFY?3? v???mb???*???
?D?=
?w?t2?W?w?"~???yEt?????}????H?#`?	?
r??#8?	??Yy??????g>*??????K???m?=??l	7'????E?Q GK
??P??wb46??J2???t_????d????T????M?+??r9?.{??S??????3Qx??;??i ?Mw??'(R?+?eC?@?w 
??x?|??V?d?????o???]Y.?A???X.??@[??(5	???#?#k??i?A\?-/M?p???
?????%:Q?\?@?]'??\T???+	9??=????????_Ns???;??,????
b(?n?r??/???+??? N??sAI??i?C
 ,1???&G?d?"??J??????y?Wr??,??9TW??e[??}??w?fYP?@?ZYN}??u?w?????<d?aq`?z=%$?Q_iJ???_?h??????r<?eTPy??a1;?F?M?X?x?7?(?f?ek?m?EcaS&?oY?$C?????)
A?|	wE??w?Y
?}
EW?q???n#??]??i?r???'?g0????Y
B<??A?uL_??e?!03?
I?*??????	?q?EWU????H??n??%,???1?,!?????????6_)???W?(??E?????.(?7l	/$?Q??J?'? r???bc/??>>?bTQDQ??`Q?8?
P:B??x`?"?shb4?l1n3??vA????!??9*Z?*U
??>Y??t??-LX
? ??*?P??FE??l3??AI???I,WK??'3??V#?T?LF6"C]5??~?_D??
|???????5x~?h???G????GS???7??C0??z????????S??8????w?t@
2sb?M{?`?Gv :???)???	?koK??i?7pA?]_]??@????.u%?'^??Y]?~???5?p/G??6E??wb?1?>??Y?1???-rsU/-I3omj?????(m<?,?=7i??m"??}q???73eIc?rU=k:??|
??#??|?}???!2{N??$???_??%??=?6;jB?f?v????xkCp?|??x??S7D?P??=?
Vm?/{????!"??G???n?9????5????KK=	??K]??/?h?um%?pc?/Wqx?"_??3?VH7!?B?e??8?k???
?n??????_????R9??2"z-???kIth?b#7 ??s1_?L?r??????v???????2ER?v??b?W&2?t[?&3??'lz????l?>o?????,???|????????????koj?nr??????4}aTLIL????f
Jj?F????_????????6.?l?1F???h??-!?~?
?x?g?Z???n?n9?(S????/b??H??|u??e??t?U???K3???$.lI?Y??????d?=???1???
(M?p???-????g??????c??gu??????Z??????Z-??}???[?I0&????L
K??A???a??3?I
??&}R?y![R?~?p?~??] 
???H?X?????[???\???????C???S?Jg9?tr-~?O?:c0"????c:?9??aY?'??
U???,`??:???????o???NK?T$?H?{?Zm??????????dRA??ve?H?????9?
?aGB??Jk????????????O7w???om??????&:\8??{?Q?Ag??^l~??k5?7???4[??|???^?X^9.T|?*
:>?LX??x?"?*,??9????Q?r'8x?-?\Id????x?O????M??+?Yd?8M?U?X?b???4XnA?+?????K#????XM?B????#?????c~9??O?:??'?*|?%?"#qC???A?????h2d??G??\aEI?????c?!??ZA%/???????^O?\???fQ??{?{??K
?$?Q??a1H?????
?@??G??@?????f[=????8?????zm?\???+?+?????s????
?M?>???~??????-~A8??????j??u?v^"????????6~???{???b???Lz???c08iO:?j;4?*???Q?!9V0z??ibV?.lb??s?#A?\'?3??'IT?\???9???Z??0??x???rY????1l?,?;?j??jN?z	-6???i?.$cd?T??E??:?(X!?????e?{U??MFT-???#0F*???????~??-??(_??k??W?>??????????O??Z?G?&%s#??{?????u?\@?>?A?hg?#?.??DE]EN?`???U??h)8?j?"?8????f?+???Ew???{b???NV?k?s??????7?U?z??????Q??9#?EO????#O?&?c???d????????O??w?OQ?Z???1.?lUT_???~SK??MO??7<???>??9??9??/tV_????????3?!cS?'?yR?'?yR?'?yR?g?????U!???A????D<??*?,???????? ?d?.H?dV?Zj?D?S%hr???)W?2???%?#{??>??B??j<,????&?????a???
????j?8????p?2?M#NO>????????????$???zF?ZP_??3
L?Ux%<??w5!s?(?WqR??w??????_?g???!?|?[???????????Q?~????U???>H?????A?V?Kz????^?????? ??uI??w??????3??+?9#z??!??e G???W?????xn4?|?|G?????n
????5?
??
u:!??&?+62???}K?c??e?/?aE?08?Ia_b?lM\?9?ZMTZ_???jMl???m?p2?~O_???????_t?Ew??e,???(??
???oH?????\????^???.????(???|???6U9??~k?E?^???%#??\??????VHS?w?1h?_???????n?=?:_z#2??4??????t?????]?????t??7v??9?j{`\?#mn?+=
`q???u"p??zn?0??x????@??M?xJ1?b???	"?/=??-?????R{P??!?L?PT?k??(u-?'??+tq@?pA??0U^???2???6
???	4???%{?????????v????????+??= ?`_l?Ag at E???????i?????????	?h?}g}X-?r??7?/?P??S=C?Z?ZY]?????=*??????????? ?`???#???[??
?35?P8Zf?
???oL(x2@?0
2`?'.6??t?????V}?.g at O??9?i?????*?????@S???*?y
,l?p???;t????]\?D$?n/d??
?$_?9]??.??????
4??;8??k=C?a??#o?R ?R?'C???w???,???0??@{`7??????????u??j???????"h??'?ABs??@?0\?D8??P?K??v5i?
?d?#?f??	???_M?c??

b?t`?j at he?&
??m???????ppc??GW???co????<o?????N??	P&2w??Z
?3?8?0?qEwA~?mC/?
?|?????D<>
????OV
??z?2yg??HU?????o???kD??sj?Y?*???t}QUc????sjV???*_?J?9Tew?nV/?n?u??G	
???d???Cc?k\?J e3?z??K???D???v???x?y??B?g'???|??>???/w?H?]?
?oQ??X?????K?????d`??a??8??&??{??<J?????y?K??x?XT????M}??>66???j????K?K??}????????xt L???{???{?m??a?:????g??h/???????mY??!H??{??,???;?r??o??
??J"W?4??i?]??G??1?~,??BA?,?m?^?*5??1d????;?<?-?^?*P:? W?zr.???1?|???R?l!?n?}PB?-????k?:????q{HW8?
nm??c?`?
?;??dO???@V????9c@\????-^W?8$?;`"???A?_(?!??O?f??&???????n.-)?V??j7????`?\)G_M?lC)????T=?"	?^"?(???0??,?v" P???&?@2??6z}z?aH?????4????????y?W??Z?YT??x??+?p?&S4?3[my????????T??

?[?%?O?B????b??T6|O( ??U?L?????B<?
???
U????|????6T]?b1????8?^+??
??d?2???
???ne?u.?p>?*[?n????V1??j5?b??5;Z??H??N??r?)^3CJ?V_?_??c?????j??8?	?}m???
??x?
-??a
/??M7?
??r<G%+???y?OR???(?'?T???rjIh(???????????'????V????qXy?
???C????W|???n?
??
y????I?T??'???U???+??tTI?f!dt????Y??????)"????L\?l???x#,q?1w?VtU??qAQ?<gG????=*?QR???G?????#?Q?m_84?"???Tr?+??:?N~
??"?????????h??;g???}8?4@??#??:???<9?4???
?????"[???_{????~?|??5?n%9'??Yj?9pw?>3( ~
?Xd?5/?*?|?DM??L?`?{,V??? ?????i???"?????=,?C*q~???/(?i?P?$??,?,jb]?H ??????s`?So<fct4p?$?????(?Os???[
??Ax%???????uq??-?'2??\?
??tb????;a?[f?o3(S5?|????m?<)?????(Q??5?4b?6E???????????J_?#U?????'}????S?????P?B?????N?Nt&?,+?9=??kz at 2??????Z?9	?0?y????<M??]?a??&9??R2?BJ????P????Z???????kuK??\??y?>I2?qb?=?^?9??m'???Bk0?4u?mM)w-????2?????????I??4]???JH1??!???ck{?????r{?F????	Q6W????>
?,???WUW?W?????U??+?(G?j??f?g?>_V?{'?\????U?&?F_???????/C?????}2a?,?
&??%Nm?L??Os?*???Q???
?\4c"kj
lwEl??FkP??&?(???Iu??W?%?.???H?W?eF>$?2??z?Y+3???m????d?:It1???M	???=C??0[?N?????d?_?ZB?e??@?
Gj???#?M@!??	!????1j??iTh?????????_?????0?8?4?|?????.c?N??1??7<???y
csrE?
uw)3????.I?+????V4Y??E?????
wzPX!.E??b%$?-PQ??//V?</+
??_w???C??$??$b??h??<J?X??????#{?{???????A?#?I??V"SI?j(??I?*?????>,?D?F:?P)??.R?*??.f?j&?>.?????KQ%?R\L??????rl?<?????}??@z??o?????;?Dz?u??x"1OV?E?U?k????v?????J?RD??8}R???9y?p<v;,e??M-P?????$?MR?'???\?^t??3????E`??????DM?W?rF?*?????$?S?1????^#&?#?)\???
???}>I? ;????tR1?t?[???E???o)n??H??c?[?&-m???????????L????????????r?>?M????%??{???w??
K??)?Ox???-?????????+4y??|?4???!?[g????????0?S>n?/??t????
B??1???X?]Z???h	x?????8p?g .H=n?????'	?8
??pD_k6A?8~??em??XY?q???(?@
y??;#???OPc?k?F&??E
???b?d?Im????V??L???	"]#?t?/???f%???????j?t????????g???s?????v??zH5?lj
?0???
??L?$t$?h?A?oo?????ktXU?)6rXc?Y???/???C0,???Ru?q???1	n-2rL-?$??????L?
?d&?;?r?G???wJ???l???/??_????_????\???s?V??????}S????z,W???[?=,??N09K=7j'???"????=X?im??;????E??Zy0?'x??
=???d??j:VD?7?_??????;&?8???????P
4??H7

?]?>{?Q9????@v?r?I??\??Eq?4?????l?W?qqK??>cl?Ox????9E??tX?)?D????m%?\[?oE]\?s?p?3??\????v??Q??54??&?
n???4Pj?.?T??+?_
s
(?3f]?_?\wl?\??????????qT?
&???hT?)L?q?3m6
;?P'qpf??????Z????.4???X??Wg?Oey?]P??
q?@.?0n?
sA??a~u-F?m?>(aj??P?u6Nh?wC?0??6????\1??_?_?v??N??	??Ji=p+?v???Y3?EdY???].?v<?/???J-?NT?71c?:r????????^?z?S]??? ?%??UPQ?>?/?x???????E?????g?)?S?#?&-??g6?6?pd\`?h-)O?`?y?h????g.j?.?????t+???????E?7?E???>_????>X{???p-???]~xXk??@{?Z?4?<?U?r?Y?????????3 at e???^x??]`???l|??????V?v+lR????J???6?1z$ewt????s?3?@??f???C?>???h?	????
M?`d
_]????U?!
????a?qE?D??Q ?}'4E???o?I?~???b????????{?~???????i???j?????????????uR?I??
???9"tl??+h?Bx?8?z
E6?????~G?????^??????8?<l?l?n??????f???.+F??1f?7?!??????aj?????c??z?l??Z???C ????[?d??C}@c
?
O7??C?~??L ??2
???j?U???igu??F ????????}????="?~s?YK???:?_??/??;??X`?UK?
?R+?j5??_\?O???r???U??????O???????S???????0dl??A?"??I???$?v+????$?;]Xh
P???
???N?k6??`z2?f6???q?S?cH?]??h?0O?:p??????.?8??
_I??e?:?i\?"??x??k?x}4??|???k??o??r@??!?	?????%?????
e??]??{?.(??(?rY?KG	???`9??A?^????n?o?
?5?????fcs{????
??(?
T?ps??0??F????
?G<2???
v?;?G???^???????????m??{X????H1>*/z{9??I????H??/?u?<?7??
?a?q0j`c#???l??n?A?v?lT???=?k??}???c?F=?x?<O?H'?????Lz]??hv??$????@J????dgt???z?????E???Y?A?}?*?9?J=P+uq?"???p?vx9M#vA??Fm|/??'V?Ai?????Y>???Zr??
?1????<?;??C_M?	??ZmA??????nv?Z?w??92?}?Yy??-?0?`??????[
?a?lY}?w]ab?(?\l???Hu?}Nu*??TMm??l?[??????,???Hu?}~?nX?&c?*??R???-?s?
?X??Ln3_??
k??(???s"?L?????f?M???k?^?1xw??:
??bV??l?@??R?&??6?E?n%)w5?????+@e?*?3???:	}2???f?g?<V???
'j
??$/tUN?{?????19????kOh1???-CE?hm??'Z2'???)ll??'???Y}??\J?bjG!=G1EJXu
d??F??"?M?'?=WIn?Z??aU?#l?NimZ
???i??0t.[/?p?W??+{?1??3p???-????+J??3?b???????d?cI??????5??.3?}f,??p? ,???U?,?HE?(??)???4?????ZT???0?!?>M?????J??k????uU`?v>#??????????
#??;?G?R?B?S?>i?????????W?0?&?:\?A7??W???#??T?????????N???ZK??????????
??
&c?SO??^???????	J*kzX?????j???LV??~q?x???:NF????2.'?tw
/?+????h?=rgS??$??*(?Y?????????V??????,??%L?\{??p?[?????v? ?aq??
?,q??dyDa??? ?????Cwo?e??????7[??b]L:j6??????k?r??u??/??b?A}?q]???Y?y@'???F?92???K?TA{p?"E?]?y 8?8V?-?T??~Q??{?g\?????PG?:??o?????
???vQ?????k??D
?]? ???????&_G?a????]??*b???]=?:h???=*??pa<?^?????sV???vmt??|??x??Z?????+$???FhuM?^?[???VC??eM*?0????"?3
?a
-?h8n)'?5w:?Hl??5?J??
Q??2m??VN???x??v? @R?v?????1W??\cf???|??G??K`V????B?<eE?????<???QO
???7?PB?????x?d??o?`	??n??P?FdWU??F??Ck2?{?!?????<?~mtY??9^
?.??
W?^?d'??nj>-???@2?wP?]e	??
?/?)?.????m?(clP"??g<?9?j????j(?#O?G?|????%??r?{2???N???/:??P?????9????`yO??jq???y?Q
???4?C????|??i????vm?*?[??}ex?OtM?bZ?}???d??]'p9??7?p??!???s?k?De?H
?"s??
???????l?$????Ly`U?Y????H?I^???*?Q?(?G???6??83ES???9P?xh???
?h??g??I??(?3????R???p?7?i??a???AQ??@??????W??'t?E?Y+2*????????k??[T}?>`?F????>?????Rd?2~]???????]R??????b?t???!%
?8;	d@??? F??3????8?!???+???~?mgww?y?????5?+
???gs<Q????`?O7??hV????
????Xyl??
\<????(?"J???!G??T??????g??.????WHG?????U?nx???
&??p??j&??????P???????p! ???S??J??*V?l????5p%<??|???t???????
?????V?W?T?I$3?Z???n??7??jB?k?x?!q????g???u??]??O???????????_?K?/???????_?K?/???????_?K?/???????_?K?/????????????#??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	13 Sep 2007 17:20:30 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	13 Sep 2007 17:20:30 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:28:27 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 13:28:27 -0400
Subject: rpms/mhgui/devel mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131728.l8DHSR8Y010606@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Initial import


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhgui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 16:55:35 -0000	1.1
+++ .cvsignore	13 Sep 2007 17:27:54 -0000	1.2
@@ -0,0 +1 @@
+mhgui-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	13 Sep 2007 17:27:54 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:30:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 13:30:30 -0400
Subject: rpms/qt4/devel .cvsignore, 1.19, 1.20 linguist.desktop, 1.3,
	1.4 qt4.spec, 1.64, 1.65 qtconfig.desktop, 1.4,
	1.5 qtdemo.desktop, 1.3, 1.4 sources, 1.15, 1.16 qtdemo-qt4.png,
	1.1, NONE
Message-ID: <200709131730.l8DHUU9G010770@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735

Modified Files:
	.cvsignore linguist.desktop qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Removed Files:
	qtdemo-qt4.png 
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
- linquist.desktop: use new linguist4 icons
- -devel,-x11: %post/%postun scriptlets (icons, mimetypes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Aug 2007 11:32:45 -0000	1.19
+++ .cvsignore	13 Sep 2007 17:29:57 -0000	1.20
@@ -1,3 +1,4 @@
 clog
-qt-x11-opensource-src-4.3.0.tar.gz
+hi128-app-qt4-logo.png
+hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.3.1.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linguist.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ linguist.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist
+Icon=linguist4
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
+++ qt4.spec	13 Sep 2007 17:29:57 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -22,7 +22,7 @@
 Source1: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -43,7 +43,9 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
-Source30: qtdemo-qt4.png
+# upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
+Source30: hi128-app-qt4-logo.png
+Source31: hi48-app-qt4-logo.png
 
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
@@ -144,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-#Requires: glib2-devel
 Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
@@ -417,10 +418,17 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
-# qtdemo/qtconfig icons
-install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
-install -p -m644 -D tools/qtconfig/images/appicon.png \
-                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+# qt4-logo (generic) icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
+install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+# linguist icons
+for icon in tools/linguist/images/icons/linguist-*-32.png ; do
+  size=$(echo $(basename ${icon}) | cut -d- -f2)
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+done
+# qtconfig icon (it's 50x50 actually, it's pretty generic as-is anyway, use qt4-logo instead -- Rex )
+#install -p -m644 -D tools/qtconfig/images/appicon.png \
+#                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig4.png
 
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
@@ -469,6 +477,24 @@
 
 %postun -p /sbin/ldconfig
 
+%post devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%post x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
@@ -517,7 +543,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -564,6 +590,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
+%{_datadir}/icons/hicolor/*/apps/linquist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -580,7 +607,6 @@
 %{_qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -608,6 +634,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
+- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
+- linquist.desktop: use new linguist4 icons
+- -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)
+
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
 - fixed bz249242, designer4 - segmentation fault on s390x


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtconfig.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtconfig.desktop	14 Jun 2007 20:41:02 -0000	1.4
+++ qtconfig.desktop	13 Sep 2007 17:29:57 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
 Exec=qtconfig-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtdemo.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtdemo.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ qtdemo.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Qt4 Demo 
 Comment=Show Qt4 demos and programming examples
 Exec=qtdemo-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Aug 2007 11:32:45 -0000	1.15
+++ sources	13 Sep 2007 17:29:57 -0000	1.16
@@ -1 +1,3 @@
+d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 ec255dcc2b30f5efe0ded85ae8a75e13  qt-x11-opensource-src-4.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:39:31 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 13:39:31 -0400
Subject: rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.6,
	1.7 initscripts.spec, 1.149, 1.150
Message-ID: <200709131739.l8DHdVd0011051@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11022

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- fix crasher bug in olpc-dm


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- initscripts-8.54.1-olpc.patch	11 Sep 2007 22:35:50 -0000	1.6
+++ initscripts-8.54.1-olpc.patch	13 Sep 2007 17:38:58 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-11 18:33:31.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-11 18:33:31.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,8 +43,8 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-09-11 11:59:20.755757520 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-09-11 18:29:19.000000000 -0400
+--- /dev/null	2007-09-13 09:21:47.113128415 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-13 13:29:21.000000000 -0400
 @@ -0,0 +1,568 @@
 +#include <unistd.h>
 +#include <stdio.h>
@@ -274,7 +274,7 @@
 +   *     seteuid 0, setuid olpc -> start X -> start pam session -> fork ->
 +   *     seteuid olpc -> start clients
 +   */ 
-+  ttyn = "/dev/tty2";
++  tty_name = "tty2";
 +  tty_number = "2";
 +
 +  /* set pgid to pid */
@@ -616,7 +616,7 @@
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-11 18:33:31.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- initscripts.spec	11 Sep 2007 22:35:50 -0000	1.149
+++ initscripts.spec	13 Sep 2007 17:38:58 -0000	1.150
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 Source: initscripts-%{version}.tar.bz2
 Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
@@ -207,6 +207,9 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Thu Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-7
+- fix crasher bug in olpc-dm
+
 * Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-6
 - clean up olpc-dm
 - make sure olpc-dm sources /etc/sysconfig/i18n



From fedora-extras-commits at redhat.com  Thu Sep 13 17:42:20 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 13:42:20 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn-unpackwebcore.patch, NONE,
	1.1 eclipse-mylyn-webcorejar.patch, NONE, 1.1 eclipse-mylyn.spec,
	1.4, 1.5
Message-ID: <200709131742.l8DHgKiF011193@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11164

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-unpackwebcore.patch 
	eclipse-mylyn-webcorejar.patch 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
- Make web.core its own jar.
- Unpack web.core so we can symlink to dependencies.
- Symlink to dependencies of web.core.
- Remove rome jar and exports from web.core.
- BR/R all the versions of dependencies that have OSGi manifests.

eclipse-mylyn-unpackwebcore.patch:

--- NEW FILE eclipse-mylyn-unpackwebcore.patch ---
diff -ur org.eclipse.mylyn-feature/feature.xml org.eclipse.mylyn-feature/feature.xml
--- org.eclipse.mylyn-feature/feature.xml	2007-09-05 17:37:56.000000000 -0400
+++ org.eclipse.mylyn-feature/feature.xml	2007-09-05 17:38:05.000000000 -0400
@@ -299,7 +299,7 @@
          download-size="0"
          install-size="0"
          version="2.0.0.v20070627-1400"
-         unpack="false"/>
+         unpack="true"/>
 
 
 </feature>

eclipse-mylyn-webcorejar.patch:

--- NEW FILE eclipse-mylyn-webcorejar.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.web.core
Index: .classpath
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/.classpath,v
retrieving revision 1.2
diff -u -r1.2 .classpath
--- .classpath	9 Jun 2007 02:10:30 -0000	1.2
+++ .classpath	7 Sep 2007 16:07:52 -0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="mylyn-webcore.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-httpclient-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-codec-1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-logging-1.0.4.jar"/>
@@ -8,7 +9,6 @@
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-client-3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-common-3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/ws-commons-util-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib-rome/rome-0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-rome/jdom-1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Index: build.properties
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/build.properties,v
retrieving revision 1.3
diff -u -r1.3 build.properties
--- build.properties	26 Jun 2007 01:16:25 -0000	1.3
+++ build.properties	7 Sep 2007 16:07:52 -0000
@@ -5,10 +5,10 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
-source.. = src/
-output.. = bin/
+source.mylyn-webcore.jar = src/
+output.mylyn-webcore.jar = bin/
 bin.includes = META-INF/,\
-               .,\
+               mylyn-webcore.jar,\
                lib-xmlrpc/,\
                lib-rome/,\
                lib-httpclient/,\
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/META-INF/MANIFEST.MF,v
retrieving revision 1.18
diff -u -r1.18 MANIFEST.MF
--- META-INF/MANIFEST.MF	28 Jun 2007 18:19:07 -0000	1.18
+++ META-INF/MANIFEST.MF	7 Sep 2007 16:07:53 -0000
@@ -8,7 +8,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.net
-Bundle-ClassPath: .,
+Bundle-ClassPath: mylyn-webcore.jar,
  lib-httpclient/commons-httpclient-3.0.1.jar,
  lib-httpclient/commons-codec-1.3.jar,
  lib-httpclient/commons-logging-1.0.4.jar,
@@ -16,21 +16,8 @@
  lib-xmlrpc/xmlrpc-client-3.0.jar,
  lib-xmlrpc/xmlrpc-common-3.0.jar,
  lib-xmlrpc/ws-commons-util-1.0.1.jar,
- lib-rome/rome-0.8.jar,
  lib-rome/jdom-1.0.jar
 Export-Package: .,
- com.sun.syndication,
- com.sun.syndication.feed,
- com.sun.syndication.feed.atom,
- com.sun.syndication.feed.impl,
- com.sun.syndication.feed.module,
- com.sun.syndication.feed.module.impl,
- com.sun.syndication.feed.rss,
- com.sun.syndication.feed.sse,
- com.sun.syndication.feed.synd,
- com.sun.syndication.feed.synd.impl,
- com.sun.syndication.io,
- com.sun.syndication.io.impl,
  org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.commons.codec.digest,



Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-mylyn.spec	24 Aug 2007 16:06:46 -0000	1.4
+++ eclipse-mylyn.spec	13 Sep 2007 17:41:47 -0000	1.5
@@ -1,10 +1,10 @@
-%define gcj_support         1
+%define gcj_support         0
 %define eclipse_base        %{_datadir}/eclipse
 
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -21,6 +21,9 @@
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
 Patch3: eclipse-mylar-createSocketworkaround.patch
+# So we can symlink to dependencies
+Patch4: %{name}-unpackwebcore.patch
+Patch5: %{name}-webcorejar.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,20 +42,20 @@
 
 BuildRequires: eclipse-pde >= 3.2.1
 BuildRequires: eclipse-cvs-client >= 3.2.1
-BuildRequires: jakarta-commons-codec
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2
+BuildRequires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 BuildRequires: jakarta-commons-logging
-BuildRequires: ws-commons-util
-BuildRequires: xmlrpc3-client
-BuildRequires: xmlrpc3-common
+BuildRequires: ws-commons-util >= 1.0.1-5
+BuildRequires: xmlrpc3-client >= 3.0-1jpp.3
+BuildRequires: xmlrpc3-common >= 3.0-1jpp.3
 Requires: eclipse-platform >= 3.2.1
 Requires: eclipse-cvs-client >= 3.2.1
-Requires: jakarta-commons-codec
-Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-codec >= 1.3-8jpp.2
+Requires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 Requires: jakarta-commons-logging
-Requires: ws-commons-util
-Requires: xmlrpc3-client
-Requires: xmlrpc3-common
+Requires: ws-commons-util >= 1.0.1-2
+Requires: xmlrpc3-client >= 3.0-1jpp.3
+Requires: xmlrpc3-common >= 3.0-1jpp.3
 Provides: eclipse-mylar = 2.0.0-1.fc7
 Obsoletes: eclipse-mylar < 2.0.0
 
@@ -128,8 +131,12 @@
 # GCJ issue
 pushd org.eclipse.mylyn.web.core
 %patch3 -p0
+%patch5
 popd
 
+# So we can symlink to dependencies
+%patch4
+
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 mkdir home
 
@@ -138,8 +145,8 @@
 rm commons-*.jar
 ln -s %{_javadir}/commons-codec-1.3.jar
 ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.0.1.jar
-ln -s %{_javadir}/commons-logging-api.jar
-ln -s %{_javadir}/commons-logging.jar
+ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
+ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
 popd
 pushd org.eclipse.mylyn.web.core/lib-xmlrpc
 rm ws-commons-*.jar
@@ -148,6 +155,10 @@
 ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar
 popd
+pushd org.eclipse.mylyn.web.core/lib-rome
+rm *.jar
+ln -s %{_javadir}/jdom-1.0.jar
+popd
 
 #sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
@@ -297,6 +308,26 @@
 unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
  build/rpmBuild/org.eclipse.mylyn.pde_feature.zip
 
+# symlink
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-httpclient
+rm commons-*.jar
+ln -s %{_javadir}/commons-codec-1.3.jar
+ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.0.1.jar
+ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
+ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
+popd
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-xmlrpc
+rm ws-commons-*.jar
+rm xmlrpc*.jar
+ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar
+ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
+ln -s %{_javadir}/ws-commons-util-1.0.1.jar
+popd
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-rome
+rm *.jar
+ln -s %{_javadir}/jdom-1.0.jar
+popd
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -385,7 +416,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.mylyn.help.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*
 %{eclipse_base}/plugins/org.eclipse.mylyn.context.core_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.tasks.ui_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.tasks.core_*.jar
@@ -416,6 +447,13 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
+- Make web.core its own jar.
+- Unpack web.core so we can symlink to dependencies.
+- Symlink to dependencies of web.core.
+- Remove rome jar and exports from web.core.
+- BR/R all the versions of dependencies that have OSGi manifests.
+
 * Fri Aug 24 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-4
 - ExcludeArch ppc64 (no xmlrpc3 on ppc64 due to rh#239123).
 



From fedora-extras-commits at redhat.com  Thu Sep 13 17:42:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 13 Sep 2007 13:42:27 -0400
Subject: rpms/gnome-panel/devel desktop-file-monitoring.patch, 1.1,
	1.2 gnome-panel.spec, 1.217, 1.218 launcher-desktop-files.patch,
	1.1, 1.2 redhat-panel-default-setup.entries, 1.14, 1.15
Message-ID: <200709131742.l8DHgRqD011259@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11191

Modified Files:
	desktop-file-monitoring.patch gnome-panel.spec 
	launcher-desktop-files.patch 
	redhat-panel-default-setup.entries 
Log Message:
fix a mem leak
update default configuration


desktop-file-monitoring.patch:

Index: desktop-file-monitoring.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/desktop-file-monitoring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop-file-monitoring.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ desktop-file-monitoring.patch	13 Sep 2007 17:42:24 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.h
 --- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-05 23:24:37.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-13 12:23:44.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include "applet.h"
@@ -20,7 +20,7 @@
  void panel_launcher_create           (PanelToplevel *toplevel,
 diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h
 --- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-05 23:24:37.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-13 12:23:44.000000000 -0400
 @@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
  				 const char       *uri);
  
@@ -32,8 +32,8 @@
  					 PanelDitemSaveUri  save_uri,
 diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.c
 --- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-06 00:33:52.000000000 -0400
-@@ -285,6 +287,8 @@ static void
++++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-13 12:23:44.000000000 -0400
+@@ -285,6 +285,8 @@ static void
  destroy_launcher (GtkWidget *widget,
  		  Launcher  *launcher)
  {
@@ -42,7 +42,7 @@
  	launcher_properties_destroy (launcher);
  	launcher_widget_destroy_open_dialogs (launcher);
  }
-@@ -458,6 +462,37 @@ drag_data_get_cb (GtkWidget        *widg
+@@ -458,6 +460,37 @@ drag_data_get_cb (GtkWidget        *widg
  
  }
  
@@ -80,7 +80,7 @@
  static Launcher *
  create_launcher (const char *location)
  {
-@@ -534,6 +569,25 @@ create_launcher (const char *location)
+@@ -534,6 +567,25 @@ create_launcher (const char *location)
  	launcher->key_file = key_file;
  	launcher->prop_dialog = NULL;
  	launcher->destroy_handler = 0;
@@ -106,7 +106,7 @@
  
  	/* Icon will be setup later */
  	launcher->button = button_widget_new (NULL /* icon */,
-@@ -662,6 +716,15 @@ static void
+@@ -662,6 +714,15 @@ static void
  launcher_changed (PanelDItemEditor *dialog,
  		  Launcher         *launcher)
  {
@@ -122,7 +122,7 @@
  	/* Setup the button look */
  	setup_button (launcher);
  }
-@@ -733,6 +796,43 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -733,6 +794,43 @@ launcher_save_uri (PanelDItemEditor *dia
  	return NULL;
  }
  
@@ -166,7 +166,7 @@
  static void
  launcher_saved (GtkWidget *dialog,
  		Launcher  *launcher)
-@@ -740,11 +840,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -740,11 +838,15 @@ launcher_saved (GtkWidget *dialog,
  	const char  *uri;
  	GConfClient *client;
  	const char  *key;
@@ -182,7 +182,7 @@
  	if (uri && launcher->location && strcmp (uri, launcher->location)) {
  		client = panel_gconf_get_client ();
  
-@@ -757,6 +861,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -757,6 +859,9 @@ launcher_saved (GtkWidget *dialog,
  		if (launcher->location)
  			g_free (launcher->location);
  		launcher->location = g_strdup (uri);
@@ -192,7 +192,7 @@
  	}
  }
  
-@@ -923,6 +1030,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -923,6 +1028,7 @@ launcher_new_saved (GtkWidget *dialog,
  	PanelWidget *panel;
  	int          pos;
  	const char  *uri;
@@ -200,7 +200,7 @@
  
  	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
  	panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -930,6 +1038,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -930,6 +1036,10 @@ launcher_new_saved (GtkWidget *dialog,
  	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
  	if (panel_launcher_get_filename (uri) != NULL)
  		uri = panel_launcher_get_filename (uri);
@@ -212,8 +212,8 @@
  }
  
 diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-05 23:24:37.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-05 23:24:37.000000000 -0400
+--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-13 12:23:44.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-13 12:31:03.000000000 -0400
 @@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
  
  	/* the directory of the theme for the icon, see bug #119208 */
@@ -248,21 +248,29 @@
  	dialog->priv->dirty = TRUE;
  	g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
  }
-@@ -1003,6 +1016,13 @@ update_editor_from_desktop_file (PanelDI
+@@ -1005,6 +1018,13 @@ update_editor_from_desktop_file (PanelDI
  		 */ 
  		setup_icon_entry (dialog, icon);
  
-+		/* We set the orig_desktop_file field to let the
-+		 * launcher know that the editor contents are coming
-+		 * directly from a desktop file.
-+		 */ 
-+		g_free (dialog->priv->orig_desktop_file);
-+		dialog->priv->orig_desktop_file = g_strdup (uri);
-+
- 		return TRUE;    
++                /* We set the orig_desktop_file field to let the
++                 * launcher know that the editor contents are coming
++                 * directly from a desktop file.
++                 */ 
++                g_free (dialog->priv->orig_desktop_file);
++                dialog->priv->orig_desktop_file = g_strdup (uri);
++
+ 		g_free (name);
+ 		g_free (comment);
+ 		g_free (icon);
+@@ -1079,6 +1099,7 @@ update_chooser_for_type (PanelDItemEdito
+ 		g_assert_not_reached ();
  	}
  
-@@ -1826,3 +1846,12 @@ panel_ditem_register_save_uri_func (Pane
++
+ 	chooser = dialog->priv->command_browse_filechooser;
+ 
+ 	gtk_window_set_title (GTK_WINDOW (chooser),
+@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane
  	dialog->priv->save_uri = save_uri;
  	dialog->priv->save_uri_data = data;
  }


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- gnome-panel.spec	10 Sep 2007 17:26:32 -0000	1.217
+++ gnome-panel.spec	13 Sep 2007 17:42:24 -0000	1.218
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -311,6 +311,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-4
+- Fix some memleaks
+- Remove OpenOffice launchers from the default configuration
+- Add Tomboy to the default configuration
+
 * Mon Sep 10 2007 Ray Strode <rstrode at redhat.com> - 2.19.92-3
 - create ~/.local/share/applications before writing out 
   preferred app launchers

launcher-desktop-files.patch:

Index: launcher-desktop-files.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/launcher-desktop-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- launcher-desktop-files.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ launcher-desktop-files.patch	13 Sep 2007 17:42:24 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file	2007-08-28 00:20:51.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c	2007-08-28 00:20:57.000000000 -0400
-@@ -973,6 +973,42 @@ panel_ditem_editor_icon_changed (PanelDI
+diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
+--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-13 12:13:36.000000000 -0400
+@@ -973,6 +973,51 @@ panel_ditem_editor_icon_changed (PanelDI
  	g_free (file);
  }
  
@@ -14,6 +14,7 @@
 +	char *comment;
 +	char *exec;
 +	char *icon;
++	gboolean retval = FALSE;
 +
 +	key_file = g_key_file_new ();
 +	if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
@@ -27,24 +28,32 @@
 +		icon = panel_util_key_file_get_locale_string (key_file, "Icon");
 +		exec = panel_util_key_file_get_string (key_file, "Exec");
 +
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");            
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");           
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");         
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");
++
 +		/* Note: we need to set the icon last, since the editor
 +		 * tries to guess the icon when the command is modified
 +		 */ 
 +		setup_icon_entry (dialog, icon);
 +
-+		return TRUE;    
++		g_free (name);
++		g_free (comment);
++		g_free (icon);
++		g_free (exec);
++
++		retval = TRUE;    
 +	}
 +
-+	return FALSE;
++	g_key_file_free (key_file);
++
++	return retval;
 +}
 +
  static void
  command_browse_chooser_response (GtkFileChooser   *chooser,
  				 gint              response_id,
-@@ -986,7 +1022,11 @@ command_browse_chooser_response (GtkFile
+@@ -986,7 +1031,11 @@ command_browse_chooser_response (GtkFile
  		case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
  		case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
  			text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
@@ -57,7 +66,7 @@
  			g_free (text);
  			break;
  		case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -996,8 +1036,9 @@ command_browse_chooser_response (GtkFile
+@@ -996,8 +1045,9 @@ command_browse_chooser_response (GtkFile
  			g_assert_not_reached ();
  		}
  


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- redhat-panel-default-setup.entries	6 Sep 2007 16:58:07 -0000	1.14
+++ redhat-panel-default-setup.entries	13 Sep 2007 17:42:24 -0000	1.15
@@ -35,15 +35,6 @@
           <value>
             <string>email_launcher</string>
           </value>
-          <value>
-            <string>wordprocessor_launcher</string>
-          </value>
-          <value>
-            <string>presentation_launcher</string>
-          </value>
-          <value>
-            <string>spreadsheet_launcher</string>
-          </value>
         </list>
       </value>
     </entry>
@@ -56,6 +47,9 @@
       <value>
         <list type="string">
           <value>
+            <string>tomboy</string>
+          </value>
+          <value>
             <string>mixer</string>
           </value>
           <value>
@@ -343,167 +337,59 @@
     <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Wordprocessor Launcher -->
+  <!-- Tomboy -->
 
     <entry>
-      <key>objects/wordprocessor_launcher/object_type</key>
+      <key>applets/tomboy/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
-        <string>launcher-object</string>
+        <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/toplevel_id</key>
+      <key>applets/tomboy/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/position</key>
+      <key>applets/tomboy/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>3</int>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/wordprocessor_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/wordprocessor_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>/usr/share/applications/openoffice.org-1.9-writer.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/wordprocessor_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/wordprocessor_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Presentation Launcher -->
-
-    <entry>
-      <key>objects/presentation_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>4</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/panel_right_stick</key>
+      <key>applets/tomboy/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>/usr/share/applications/openoffice.org-1.9-impress.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/presentation_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/presentation_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/presentation_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/presentation_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/presentation_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/presentation_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/presentation_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/presentation_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Spreadsheet Launcher -->
-
-    <entry>
-      <key>objects/spreadsheet_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>5</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>objects/spreadsheet_launcher/locked</key>
+      <key>applets/tomboy/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>objects/spreadsheet_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+      <key>applets/tomboy/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>/usr/share/applications/openoffice.org-1.9-calc.desktop</string>
+        <string>OAFIID:TomboyApplet</string>
       </value>
     </entry>
 
-    <entry><key>objects/spreadsheet_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/spreadsheet_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/tomboy/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/tomboy/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/tomboy/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/tomboy/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/tomboy/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/tomboy/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/tomboy/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/tomboy/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Mixer Applet -->
 



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:04 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:04 -0700
Subject: [pkgdb] createrepo: skvidal has requested watchbugzilla
Message-ID: <200709131754.l8DHs47W011685@app4.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the watchbugzilla acl on createrepo (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:06 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:06 -0700
Subject: [pkgdb] createrepo: skvidal has requested watchcommits
Message-ID: <200709131754.l8DHs6Rr011694@app4.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the watchcommits acl on createrepo (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:11 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:11 -0700
Subject: [pkgdb] createrepo: skvidal has requested commit
Message-ID: <200709131754.l8DHsBDS017068@app3.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the commit acl on createrepo (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:13 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:13 -0700
Subject: [pkgdb] createrepo: skvidal has requested approveacls
Message-ID: <200709131754.l8DHsD4Z017077@app3.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the approveacls acl on createrepo (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 18:05:38 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 13 Sep 2007 14:05:38 -0400
Subject: rpms/suck/F-7 README.Fedora, 1.2, 1.3 suck-4.3.2-samples.patch, 1.1,
	1.2 suck.spec, 1.12, 1.13
Message-ID: <200709131805.l8DI5c3N017858@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17763

Modified Files:
	README.Fedora suck-4.3.2-samples.patch suck.spec 
Log Message:
Allow usage of alternative sites


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.Fedora	2 Sep 2007 19:30:36 -0000	1.2
+++ README.Fedora	13 Sep 2007 18:05:03 -0000	1.3
@@ -64,6 +64,9 @@
 
 NNTP_PASS	Password for NNTP authorization (if required)
 
+NNTP_POST       yes = Posting articles to remote host (Default)
+                no  = Don't post articles to remote host
+
 Creating Newsgroups
 
 Befor you can fetch news from the remote newsserver, you have to create
@@ -125,3 +128,27 @@
 If you have posted any article in a newsgroup, you can run getnews as
 described above to transfer the new articles to the newsserver of your 
 provider.
+
+Use of alternative sites
+
+If you want to use an alternative sites, you can create a configuration
+file for each site on the directory:
+
+/etc/news/suck.d/
+
+You can use a random file name for each configuration file.
+
+The content of this file is similar of the site file in
+
+/etc/sysconfig/suck/site
+
+if you want to exchange news to an alternative site, you can call
+getnews as:
+
+getnews <filename>
+
+in this case /etc/news/suck.d/<filename> will be used instead of
+/etc/sysconfig/suck/site.
+
+If you are using several site, please avoid posting articles received
+from one site to anonther site.
\ No newline at end of file

suck-4.3.2-samples.patch:

Index: suck-4.3.2-samples.patch
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck-4.3.2-samples.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- suck-4.3.2-samples.patch	8 Nov 2004 05:23:08 -0000	1.1
+++ suck-4.3.2-samples.patch	13 Sep 2007 18:05:03 -0000	1.2
@@ -1,30 +1,6 @@
---- suck-4.3.2/sample/get.news.generic.bak	1999-02-20 00:32:57.000000000 +0100
-+++ suck-4.3.2/sample/get.news.generic	2004-03-25 19:15:48.437267328 +0100
-@@ -9,16 +9,18 @@
- REMOTE_HOST=news.pixi.com
- LOCAL_HOST=localhost
- 
--SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
--NEWSDIR=/usr/lib/news			# base directory for news binaries 
--BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
-+NEWSDIR=/var/lib/news			# base directory for news binaries 
-+BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
- 
- SHLOCK=${NEWSDIR}/bin/shlock
- 
- TMPDIR=${BASEDIR}			# location for suck.* files
- MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
- 
--OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
-+SITE=pixie
-+
-+OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
- SCRIPT=${BASEDIR}/put.news		# my filter for rpost
- OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
- LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
---- suck-4.3.2/sample/get.news.inn.bak	1997-09-27 09:29:59.000000000 +0200
-+++ suck-4.3.2/sample/get.news.inn	2004-03-25 19:16:26.430491480 +0100
+diff -up suck-4.3.2/sample/get.news.inn.samp suck-4.3.2/sample/get.news.inn
+--- suck-4.3.2/sample/get.news.inn.samp	1997-09-27 09:29:59.000000000 +0200
++++ suck-4.3.2/sample/get.news.inn	2007-09-10 17:43:34.000000000 +0200
 @@ -5,12 +5,11 @@
  #NOTE: this script probably needs to be run by root.  Most systems will
  # not let a normal user run ctlinnd 
@@ -40,7 +16,7 @@
  
  CTLINND=${NEWSDIR}/bin/ctlinnd		# location of binary
  SHLOCK=${NEWSDIR}/bin/shlock		# location of binary
-@@ -18,12 +17,7 @@
+@@ -18,12 +17,7 @@ SHLOCK=${NEWSDIR}/bin/shlock		# location
  TMPDIR=${BASEDIR}			# location for suck.* files
  MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile messages when getting them
  
@@ -54,16 +30,25 @@
  OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
  LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
  NEWSGROUP=news				# which group owns the file in out.going, typically either news or uucp.
-@@ -32,6 +26,8 @@
+@@ -32,6 +26,17 @@ TESTHOST=testhost
  RPOST=rpost
  SUCK=suck
  
-+CONFIG=/etc/sysconfig/suck/site
++if [ $# -gt 1 ]; then
++  echo "Usage: getnew [<sitename>]"
++  exit
++fi
++
++if [ -n "$1" ]; then
++  CONFIG=/etc/news/suck.d/$1
++else
++  CONFIG=/etc/sysconfig/suck/site
++fi
 +
  # if we are already running, abort 
  
  trap 'rm -f ${LOCKFILE} ; echo "Aborting" ; exit 1' 1 2 3 15
-@@ -41,18 +37,46 @@
+@@ -41,18 +46,55 @@ if [ $? -ne 0 ]; then
  	exit
  fi
  
@@ -86,7 +71,16 @@
 +
 +if [ -n "$NNTP_USER" -a -n "$NNTP_PASS" ]; then
 +    AUTHINFO="-u -Q"
-+fi;
++fi
++
++if [ -z $POST ]; then
++  POST="yes"
++fi
++
++if [ $POST != "yes" -a $POST != "no" ]; then
++  echo "Invalid value for post"
++  exit
++fi
 +
 +export NNTP_USER
 +export NNTP_PASS
@@ -112,16 +106,22 @@
  	SUCK_STATUS=$?
  
  	if [ ${SUCK_STATUS} -eq 0 ]; then
-@@ -70,7 +94,7 @@
+@@ -68,9 +110,12 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 	fi
+ 
  	# now upload messages
- 	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
+-	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
  
 -		${TESTHOST} ${REMOTE_HOST} -s
++	if [ $POST = "yes" ]; then
++
++	    if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
++
 +		${TESTHOST} ${NNTP_HOST} -s
  
  		if [ $? -ne 0 ]; then
  			echo "Remote posting host not responding"
-@@ -93,12 +117,11 @@
+@@ -93,12 +138,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
  			fi
  
  			# outgoing messages to post
@@ -135,8 +135,22 @@
  			elif [ ${ERRLEV} -eq 1 ]; then
  				echo "Error posting a message"
  			elif [ ${ERRLEV} -eq 2 ]; then
---- suck-4.3.2/sample/put.news.sm.bak	2002-06-04 15:20:16.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm	2004-03-25 19:15:48.439267024 +0100
+@@ -115,8 +159,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 				chmod 664 ${OUTGOINGNEW}
+ 			fi
+ 		fi
+-	fi	
+ 	
++	    fi	
++	
++	fi
++
+ 	echo "You can hang up the modem now"
+ 
+ fi
+diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
+--- suck-4.3.2/sample/put.news.sm.samp	2002-06-04 15:20:16.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm	2007-09-10 17:40:27.000000000 +0200
 @@ -10,15 +10,18 @@
  # this to somewhere normal users can read or write.
  
@@ -159,20 +173,36 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
---- suck-4.3.2/sample/put.news.sm.pl.bak	2002-06-04 15:20:43.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm.pl	2004-03-25 19:15:48.439267024 +0100
-@@ -26,7 +26,7 @@
- 	# rpost will then handle the error
- 	# We do this since rpost can't differentiate between
- 	# a missing file or a script file
--	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
-+	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
- #	open IFP, "<${infile}" or die "Can't read ${infile}";
- 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
+--- suck-4.3.2/sample/get.news.generic.samp	1999-02-20 00:32:57.000000000 +0100
++++ suck-4.3.2/sample/get.news.generic	2007-09-10 17:40:27.000000000 +0200
+@@ -9,16 +9,18 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
+ 
+-SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
+-NEWSDIR=/usr/lib/news			# base directory for news binaries 
+-BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
++SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
++NEWSDIR=/var/lib/news			# base directory for news binaries 
++BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
+ 
+ SHLOCK=${NEWSDIR}/bin/shlock
  
---- suck-4.3.2/sample/put.news.bak	1998-10-04 21:32:26.000000000 +0200
-+++ suck-4.3.2/sample/put.news	2004-03-25 19:15:48.440266872 +0100
-@@ -14,14 +14,17 @@
+ TMPDIR=${BASEDIR}			# location for suck.* files
+ MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
+ 
+-OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
++SITE=pixie
++
++OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
+ SCRIPT=${BASEDIR}/put.news		# my filter for rpost
+ OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
+ LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
+diff -up suck-4.3.2/sample/put.news.samp suck-4.3.2/sample/put.news
+--- suck-4.3.2/sample/put.news.samp	1998-10-04 21:32:26.000000000 +0200
++++ suck-4.3.2/sample/put.news	2007-09-10 17:40:27.000000000 +0200
+@@ -14,14 +14,17 @@ if [ $# -ne 2 ]; then
  	exit -1
  fi
  
@@ -192,3 +222,15 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
+diff -up suck-4.3.2/sample/put.news.sm.pl.samp suck-4.3.2/sample/put.news.sm.pl
+--- suck-4.3.2/sample/put.news.sm.pl.samp	2002-06-04 15:20:43.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm.pl	2007-09-10 17:40:27.000000000 +0200
+@@ -26,7 +26,7 @@ sub perl_rpost {
+ 	# rpost will then handle the error
+ 	# We do this since rpost can't differentiate between
+ 	# a missing file or a script file
+-	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
++	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
+ #	open IFP, "<${infile}" or die "Can't read ${infile}";
+ 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+ 


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- suck.spec	2 Sep 2007 19:34:05 -0000	1.12
+++ suck.spec	13 Sep 2007 18:05:03 -0000	1.13
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}.1
+Release: 18%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -30,15 +30,15 @@
 %setup -q
 %patch -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .samp
 %patch3 -p1
 %patch4 -p1
 
 cp %{SOURCE3} .
 
 autoconf
-%configure --with-inn-lib=/usr/lib/news/lib \
-           --with-inn-include=/usr/include/inn
+%configure --with-inn-lib=%{_libdir}/news/lib \
+           --with-inn-include=%{_includedir}/inn
 
 %build
 make %{?_smp_mflags}
@@ -51,6 +51,7 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/news/suck.d
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
 cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
@@ -82,11 +83,15 @@
 %{_mandir}/man1/testhost.1*
 %{_mandir}/man1/lmove.1*
 
-%dir /etc/sysconfig/suck/
+%dir %{_sysconfdir}/sysconfig/suck/
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
+%dir %{_sysconfdir}/news/suck.d/
 
 %changelog
-* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17.1
+* Mon Sep 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-18
+- Allow usage of several sites
+
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16



From fedora-extras-commits at redhat.com  Thu Sep 13 18:15:05 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 13 Sep 2007 14:15:05 -0400
Subject: rpms/Io-language/devel AddonBuilder_io_libdir.patch, NONE,
	1.1 Io-language.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131815.l8DIF50k018274@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AddonBuilder_io_libdir.patch Io-language.spec 
Log Message:
initial Io-language import


AddonBuilder_io_libdir.patch:

--- NEW FILE AddonBuilder_io_libdir.patch ---
--- Io-2007-04-30/build/AddonBuilder.io.orig	2007-04-28 15:09:52.000000000 +0200
+++ Io-2007-04-30/build/AddonBuilder.io	2007-05-29 23:01:38.000000000 +0200
@@ -58,6 +58,9 @@
 	libSearchPaths := List clone
 	appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v)))
 	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib/mysql"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64/mysql"))
 
 	debs    := Map clone
 	ebuilds := Map clone


--- NEW FILE Io-language.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

%define _version 2007-07-10
 
Name:           Io-language
Version:        20070710
Release:        2%{?dist}
Summary:        Io is a small, prototype-based programming language
Group:          System Environment/Libraries
License:        BSD
URL:            http://www.iolanguage.com/
# TnL uses a more recent snapshot then upstream has made available in snapshot
# form. TnL's version also includes some fixes which stop TnL from crashing.
Source0:        http://tnlgame.net/downloads/tnl/070827/Io-%{_version}.tar.gz
Patch0:         AddonBuilder_io_libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
BuildRequires:  libsamplerate-devel libsndfile-devel libtiff-devel
BuildRequires:  libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
BuildRequires:  portaudio-devel postgresql-devel python-devel  soundtouch-devel
BuildRequires:  sqlite-devel taglib-devel

%description
Io is a small, prototype-based programming language. The ideas in
Io are mostly inspired by Smalltalk (all values are objects), Self
(prototype-based), NewtonScript (differential inheritance), Act1
(actors and futures for concurrency), LISP (code is a runtime
inspectable/modifiable tree) and Lua (small, embeddable).


%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}.


%package graphics-and-sound
Summary:        Io graphics and sound support
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description graphics-and-sound
Io graphics and sound support, this package includes IO bindings needed to
write Io programs which want to display graphics and / or produce sound
(OpenGL, Image loading, PortAudio, etc.).


%package extras
Summary:        Io extra addons
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description extras
This package includes addons for Io which require additional libraries to be
installed. This includes the Python and Socket addons.


%package postgresql
Summary:        Io postgresql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description postgresql
Io postgresql bindings.


%package mysql
Summary:        Io mysql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description mysql
Io mysql bindings


%prep
%setup -q -n Io-%{_version}
%patch0 -p1
sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
# libstdc++.so is searched and not found ...
sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
# for %doc
rm docs/guide_files/.htmle
mv addons/OpenGL/docs OpenGL
iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
sed -i 's/\r//g' license.txt `find OpenGL -type f`


%build
make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.0"'


%install
rm -rf $RPM_BUILD_ROOT
# upstreams make install installs lots of unwanted parts of the addons, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons
mkdir -p $RPM_BUILD_ROOT%{_includedir}
install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
install -m 755 _build/dll/libiovmall.so \
  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.0
ln -s libiovmall.so.0 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
# install the addons
for i in addons/*; do
  # skip unbuild addons
  if [ -d $i/_build ]; then
    ADDON=`basename $i`
    mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -m 755 $i/_build/dll/libIo$ADDON.so \
      $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -p -m 644 $i/depends $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON
    # Io doesn't find the addon if this file isn't present
    touch $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/build.io
  fi
done


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/io
%{_libdir}/libiovmall.so.0
%dir %{_libdir}/io
%dir %{_libdir}/io/addons
%{_libdir}/io/addons/AsyncRequest
%{_libdir}/io/addons/BigNum
%{_libdir}/io/addons/Blowfish
%{_libdir}/io/addons/Box
%{_libdir}/io/addons/CGI
%{_libdir}/io/addons/ContinuedFraction
%{_libdir}/io/addons/Curses
%{_libdir}/io/addons/Flux
%{_libdir}/io/addons/Fnmatch
%{_libdir}/io/addons/LZO
%{_libdir}/io/addons/Libxml2
%{_libdir}/io/addons/Loki
%{_libdir}/io/addons/MD5
%{_libdir}/io/addons/NotificationCenter
%{_libdir}/io/addons/Random
%{_libdir}/io/addons/Range
%{_libdir}/io/addons/Rational
%{_libdir}/io/addons/Regex
%{_libdir}/io/addons/SHA1
%{_libdir}/io/addons/SQLite3
%{_libdir}/io/addons/SqlDatabase
%{_libdir}/io/addons/Syslog
%{_libdir}/io/addons/SystemCall
%{_libdir}/io/addons/Thread
%{_libdir}/io/addons/UUID
%{_libdir}/io/addons/User
%{_libdir}/io/addons/Zlib

%files devel
%defattr(-,root,root,-)
%doc docs/guide.html docs/guide.pdf docs/guide_files
%{_libdir}/libiovmall.so
%{_includedir}/io

%files graphics-and-sound
%defattr(-,root,root,-)
%doc OpenGL
%{_libdir}/io/addons/Font
%{_libdir}/io/addons/Image
%{_libdir}/io/addons/LibSndFile
%{_libdir}/io/addons/OpenGL
%{_libdir}/io/addons/PortAudio
%{_libdir}/io/addons/TagLib

%files extras
%defattr(-,root,root,-)
%{_libdir}/io/addons/Python
%{_libdir}/io/addons/SampleRateConverter
%{_libdir}/io/addons/Socket
%{_libdir}/io/addons/SoundTouch

%files postgresql
%defattr(-,root,root,-)
%{_libdir}/io/addons/Postgre*

%files mysql
%defattr(-,root,root,-)
%{_libdir}/io/addons/MySQL


%changelog
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-1
- Adapted Packman spec file for Fedora

* Sat Sep 08 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.2
- openSUSE-10.3 build, using libode(-devel)

* Sun Jun 03 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.1
- update to 20070528
- added patches for 64bit (thx Detlef)
- switched to portaudio

* Sun May 27 2007 Toni Graffy <toni at links2linux.de> 20070430-0.pm.1
- initial package 20070430


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Io-language/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 17:01:38 -0000	1.1
+++ .cvsignore	13 Sep 2007 18:14:31 -0000	1.2
@@ -0,0 +1 @@
+Io-2007-07-10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Io-language/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 17:01:38 -0000	1.1
+++ sources	13 Sep 2007 18:14:31 -0000	1.2
@@ -0,0 +1 @@
+8101f2fd8963cefedf43e188452d6249  Io-2007-07-10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 18:16:54 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 14:16:54 -0400
Subject: rpms/qt4/devel qt4.spec,1.65,1.66
Message-ID: <200709131816.l8DIGsXB018370@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320

Modified Files:
	qt4.spec 
Log Message:
fix typo, respin



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- qt4.spec	13 Sep 2007 17:29:57 -0000	1.65
+++ qt4.spec	13 Sep 2007 18:16:21 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -422,7 +422,7 @@
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
 # linguist icons
-for icon in tools/linguist/images/icons/linguist-*-32.png ; do
+for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
   install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
 done



From fedora-extras-commits at redhat.com  Thu Sep 13 18:17:46 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 13 Sep 2007 14:17:46 -0400
Subject: rpms/kernel/devel linux-2.6-lirc.patch,1.2,1.3
Message-ID: <200709131817.l8DIHkwb018435@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18414

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
Updated and massively cleaned up lirc patch, eliminates 99% of checkpatch.pl's complaints about the code (most of which is soon to be committed in upstream lirc as well)

linux-2.6-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-lirc.patch	27 Aug 2007 22:19:13 -0000	1.2
+++ linux-2.6-lirc.patch	13 Sep 2007 18:17:42 -0000	1.3
@@ -1,22 +1,3 @@
-This patch adds the lirc drivers for assorted infrared and RF receivers
-and transmitters, which when coupled with the lirc daemon and appropriate
-config files, lets you control your linux box via a remote control. Very
-useful stuff for media center boxes...
-
-Upstream
---------
-http://www.lirc.org/
-
-Work-in-progress for upstream
------------------------------
-http://git.wilsonet.com/linux-2.6-lirc.git/
-
-
--- 
-Jarod Wilson
-jwilson at redhat.com
-
-
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 2d87357..61fd0ca 100644
 --- a/drivers/input/Kconfig
@@ -204,10 +185,10 @@
 +obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
 diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
 new file mode 100644
-index 0000000..8af8da6
+index 0000000..32f46aa
 --- /dev/null
 +++ b/drivers/input/lirc/commandir.c
-@@ -0,0 +1,986 @@
+@@ -0,0 +1,999 @@
 +
 +/*
 + *
@@ -233,7 +214,7 @@
 +#include "commandir.h"
 +
 +#include <linux/kref.h>
-+#include <asm/uaccess.h>
++#include <linux/uaccess.h>
 +
 +#define DRIVER_VERSION "v1.1.2"
 +#define DRIVER_AUTHOR "Evelyn Yeung, InnovationOne"
@@ -244,65 +225,69 @@
 +#define USB_CMDIR_MINOR_BASE	192
 +
 +/* table of devices that work with this driver */
-+static struct usb_device_id cmdir_table [] = 
++static struct usb_device_id cmdir_table [] =
 +{
 +	{ USB_DEVICE(USB_CMDIR_VENDOR_ID, USB_CMDIR_PRODUCT_ID) },
 +	{ }			/* Terminating entry */
 +};
-+MODULE_DEVICE_TABLE (usb, cmdir_table);
++MODULE_DEVICE_TABLE(usb, cmdir_table);
 +
-+static int cmdir_open (struct inode *inode, struct file *file);
-+static int cmdir_probe(struct usb_interface *interface, const struct usb_device_id *id);
++static int cmdir_open(struct inode *inode, struct file *file);
++static int cmdir_probe(struct usb_interface *interface,
++		       const struct usb_device_id *id);
 +static void cmdir_disconnect(struct usb_interface *interface);
-+static int cmdir_release (struct inode *inode, struct file *file);
-+static int cmdir_check (int device_num);
-+static void init_cmdir_var (int device_num);
-+static void reset_cmdir (int device_num);
-+static void update_cmdir_string (int device_num);
-+static void print_cmdir (int device_num);
-+static ssize_t cmdir_file_read (struct file *file, char *buffer, size_t count, loff_t *ppos);
-+ssize_t cmdir_read (unsigned char *buffer, int count);
-+static ssize_t cmdir_file_write (struct file *file, const char *buffer, size_t count, loff_t *ppos);
++static int cmdir_release(struct inode *inode, struct file *file);
++static int cmdir_check(int device_num);
++static void init_cmdir_var(int device_num);
++static void reset_cmdir(int device_num);
++static void update_cmdir_string(int device_num);
++static void print_cmdir(int device_num);
++static ssize_t cmdir_file_read(struct file *file, char *buffer,
++			       size_t count, loff_t *ppos);
++ssize_t cmdir_read(unsigned char *buffer, size_t count);
++static ssize_t cmdir_file_write(struct file *file, const char *buffer,
++				size_t count, loff_t *ppos);
 +int cmdir_write(unsigned char *buffer, int count, void *callback_fct, int u);
-+int write_core(unsigned char *buffer, int count, void *callback_fct, int device_num);
-+static void cmdir_write_bulk_callback(struct urb *urb);
-+int set_tx_channels (unsigned int next_tx);
++int write_core(unsigned char *buffer, int count,
++	       void *callback_fct, int device_num);
++static void cmdir_write_bulk_callback(struct urb *urb, struct pt_regs *regs);
++int set_tx_channels(unsigned int next_tx);
 +
-+int add_cmdir_queue(unsigned char *buffer, int count, void *callback_vct, int usecdelay);
++int add_cmdir_queue(unsigned char *buffer, int count,
++		    void *callback_vct, int usecdelay);
 +int cmdir_write_queue(unsigned char *buffer, int count, void *callback_vct);
 +int send_queue(void);
 +int wait_to_tx(int usecs);
 +
-+// circular packet queue
++/* circular packet queue */
 +unsigned char ourbuffers[QUEUELENGTH][64];
 +int waitusecs[QUEUELENGTH];
 +int ourbufferlengths[QUEUELENGTH];
-+int nexttosend = 0;
-+int nexttofill = 0;
++int nexttosend;
++int nexttofill;
 +int send_status = SEND_IDLE;
-+int last_tx_sec = 0;
-+int last_tx_usec = 0; 
++int last_tx_sec;
++int last_tx_usec;
 +
-+static int curTXFill = 0;
-+struct timeval tp; 
++static int curTXFill;
++struct timeval tp;
 +
-+int debug_commandir=0;
++int debug_commandir;
 +
 +/* Structure to hold all of our device specific stuff */
-+struct usb_skel 
++struct usb_skel
 +{
-+	struct usb_device *	udev;			/* the usb device for this device */
-+	struct usb_interface *	interface;		/* the interface for this device */
-+	unsigned char *		bulk_in_buffer;		/* the buffer to receive data */
-+	int			bulk_in_size;		/* the size of the receive buffer */
-+	__u8			bulk_in_endpointAddr;	/* the address of the bulk in endpoint */
-+	__u8			bulk_out_endpointAddr;	/* the address of the bulk out endpoint */
-+	struct kref		kref;
++	struct usb_device *udev; /* the usb device for this device */
++	struct usb_interface *interface; /* the interface for this device */
++	unsigned char *bulk_in_buffer; /* the buffer to receive data */
++	size_t bulk_in_size; /* the size of the receive buffer */
++	__u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
++	__u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */
++	struct kref kref;
 +};
 +#define to_skel_dev(d) container_of(d, struct usb_skel, kref)
 +
-+static struct file_operations cmdir_fops = 
-+{
++static struct file_operations cmdir_fops = {
 +	.read =		cmdir_file_read,
 +	.write =	cmdir_file_write,
 +	.open =		cmdir_open,
@@ -311,42 +296,42 @@
 +
 +/* usb class driver info in order to get a minor number from the usb core,
 + * and to have the device registered with devfs and the driver core */
-+static struct usb_class_driver cmdir_class = 
-+{
++static struct usb_class_driver cmdir_class = {
 +	.name =		"usb/commandir%d",
 +	.fops =		&cmdir_fops,
-+	//.mode =		S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH,
++	/* .mode =	S_IFCHR | S_IRUSR | S_IWUSR |
++	 *		S_IRGRP | S_IWGRP | S_IROTH, */
 +	.minor_base =	USB_CMDIR_MINOR_BASE,
 +};
 +
-+static struct usb_driver cmdir_driver = 
-+{
++static struct usb_driver cmdir_driver = {
 +	.name =		"commandir",
 +	.probe =	cmdir_probe,
 +	.disconnect =	cmdir_disconnect,
 +	.id_table =	cmdir_table,
 +};
 +
-+static int lcd_device=0;
-+static int rx_device=0;
-+static int def_device=0;
++
++static int lcd_device;
++static int rx_device;
++static int def_device;
 +
 +#define DEFAULT_TRANSMITTERS 0x0F
-+static unsigned int transmitters=DEFAULT_TRANSMITTERS;
-+static unsigned int next_transmitters=DEFAULT_TRANSMITTERS;
++static unsigned int transmitters = DEFAULT_TRANSMITTERS;
++static unsigned int next_transmitters = DEFAULT_TRANSMITTERS;
 +
 +#define CMDIR_VAR_LEN 68
-+static char cmdir_var[] = 
-+"COMMANDIRx:\n TX Enabled: 1, 2, 3, 4\n RX: commandirx\n LCD: commandirx"; 
++static char cmdir_var[] =
[...15104 lines suppressed...]
 +	/*
 +	 * unregister from the LIRC sub-system
 +	 */
 +
-+        if (( errnum = lirc_unregister_plugin( sz->plugin.minor )) != 0) {
-+
-+                dprintk("error in lirc_unregister: (returned %d)",
-+			sz->plugin.minor, errnum );
-+        }
++	errnum = lirc_unregister_plugin(sz->plugin.minor);
++	if (errnum != 0)
++		dprintk("error in lirc_unregister: (returned %d)",
++			sz->plugin.minor, errnum);
 +
 +	lirc_buffer_free(&sz->delay_buf);
 +	lirc_buffer_free(&sz->lirc_buf);
@@ -17680,31 +17621,29 @@
 +	 * unregister from the USB sub-system
 +	 */
 +
-+	usb_free_urb( sz->urb_in );
++	usb_free_urb(sz->urb_in);
 +
-+        usb_buffer_free( sz->udev , sz->buf_in_len, sz->buf_in, sz->dma_in );
++	usb_buffer_free(sz->udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
 +
 +	minor = sz->plugin.minor;
-+	kfree( sz );
++	kfree(sz);
 +
-+        printk(KERN_INFO DRIVER_NAME "[%d]: disconnected\n", minor);
++	printk(KERN_INFO DRIVER_NAME "[%d]: disconnected\n", minor);
 +}
 +
 +static int streamzap_suspend(struct usb_interface *intf, pm_message_t message)
 +{
 +	struct usb_streamzap *sz = usb_get_intfdata(intf);
-+	
++
 +	printk(DRIVER_NAME "[%d]: suspend\n", sz->plugin.minor);
-+	if(sz->in_use)
-+	{
-+		if(sz->flush)
-+		{
++	if (sz->in_use) {
++		if (sz->flush) {
 +			sz->flush = 0;
 +			del_timer_sync(&sz->flush_timer);
 +		}
-+		
++
 +		stop_timer(sz);
-+		
++
 +		usb_kill_urb(sz->urb_in);
 +	}
 +	return 0;
@@ -17713,21 +17652,19 @@
 +static int streamzap_resume(struct usb_interface *intf)
 +{
 +	struct usb_streamzap *sz = usb_get_intfdata(intf);
-+	
-+	while(!lirc_buffer_empty(&sz->lirc_buf))
++
++	while (!lirc_buffer_empty(&sz->lirc_buf))
 +		lirc_buffer_remove_1(&sz->lirc_buf);
-+	while(!lirc_buffer_empty(&sz->delay_buf))
++	while (!lirc_buffer_empty(&sz->delay_buf))
 +		lirc_buffer_remove_1(&sz->delay_buf);
-+		
-+	if(sz->in_use)
-+	{
++
++	if (sz->in_use) {
 +		sz->flush_timer.expires = jiffies + HZ;
 +		sz->flush = 1;
 +		add_timer(&sz->flush_timer);
 +
 +		sz->urb_in->dev = sz->udev;
-+		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
-+		{
++		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC)) {
 +			dprintk("open result = -EIO error submitting urb",
 +				sz->plugin.minor);
 +			MOD_DEC_USE_COUNT;
@@ -17748,7 +17685,7 @@
 +
 +	/* register this driver with the USB subsystem */
 +
-+	result = usb_register( &streamzap_driver );
++	result = usb_register(&streamzap_driver);
 +
 +	if (result) {
 +		err("usb_register failed. Error number %d",
@@ -17770,8 +17707,8 @@
 +}
 +
 +
-+module_init (usb_streamzap_init);
-+module_exit (usb_streamzap_exit);
++module_init(usb_streamzap_init);
++module_exit(usb_streamzap_exit);
 +
 +MODULE_AUTHOR("Christoph Bartelmus, Greg Wickham, Adrian Dewhurst");
 +MODULE_DESCRIPTION(DRIVER_DESC);
@@ -17785,10 +17722,10 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
 new file mode 100644
-index 0000000..b4fbde3
+index 0000000..b80dbf8
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ttusbir.c
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,361 @@
 +/****************************************************************************
 + ** lirc_ttusbir.c ***********************************************************
 + ****************************************************************************
@@ -17812,6 +17749,7 @@
 + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + *
 + */
++#include <linux/version.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/module.h>
@@ -17830,7 +17768,7 @@
 +/* @TODO Is it enough to have only two, I guess yes */
 +#define NUM_URBS 4 /* Number of URBs used in the queue */
 +
-+#undef DEBUG
++/* #define DEBUG */
 +#ifdef DEBUG
 +#define DPRINTK printk
 +#else
@@ -17917,22 +17855,38 @@
 + */
 +const unsigned char map_table[] =
 +{
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 +};
 +
 +static void urb_complete(struct urb *urb)
@@ -17986,7 +17940,8 @@
 +
 +	DPRINTK("Module ttusbir probe\n");
 +
-+	ttusbir = (struct ttusbir_device *)kzalloc(sizeof(struct ttusbir_device), GFP_KERNEL);
++	ttusbir = (struct ttusbir_device *)
++		  kzalloc(sizeof(struct ttusbir_device), GFP_KERNEL);
 +	if (!ttusbir)
 +		return -ENOMEM;
 +	ttusbir->driver = &driver;



From fedora-extras-commits at redhat.com  Thu Sep 13 18:18:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 14:18:01 -0400
Subject: rpms/qt4/devel qt4.spec,1.66,1.67
Message-ID: <200709131818.l8DII1V8018449@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18378

Modified Files:
	qt4.spec 
Log Message:
Release++ (keep rawhide clean)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- qt4.spec	13 Sep 2007 18:16:21 -0000	1.66
+++ qt4.spec	13 Sep 2007 18:17:29 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -634,7 +634,7 @@
 
 
 %changelog
-* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-6
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
 - linquist.desktop: use new linguist4 icons
 - -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)



From fedora-extras-commits at redhat.com  Thu Sep 13 18:26:25 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 13 Sep 2007 14:26:25 -0400
Subject: rpms/Io-language/F-7 AddonBuilder_io_libdir.patch, NONE,
	1.1 Io-language.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131826.l8DIQPaD018836@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Io-language/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18810

Modified Files:
	.cvsignore sources 
Added Files:
	AddonBuilder_io_libdir.patch Io-language.spec 
Log Message:
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)


AddonBuilder_io_libdir.patch:

--- NEW FILE AddonBuilder_io_libdir.patch ---
--- Io-2007-04-30/build/AddonBuilder.io.orig	2007-04-28 15:09:52.000000000 +0200
+++ Io-2007-04-30/build/AddonBuilder.io	2007-05-29 23:01:38.000000000 +0200
@@ -58,6 +58,9 @@
 	libSearchPaths := List clone
 	appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v)))
 	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib/mysql"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64/mysql"))
 
 	debs    := Map clone
 	ebuilds := Map clone


--- NEW FILE Io-language.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

%define _version 2007-07-10
 
Name:           Io-language
Version:        20070710
Release:        2%{?dist}
Summary:        Io is a small, prototype-based programming language
Group:          System Environment/Libraries
License:        BSD
URL:            http://www.iolanguage.com/
# TnL uses a more recent snapshot then upstream has made available in snapshot
# form. TnL's version also includes some fixes which stop TnL from crashing.
Source0:        http://tnlgame.net/downloads/tnl/070827/Io-%{_version}.tar.gz
Patch0:         AddonBuilder_io_libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
BuildRequires:  libsamplerate-devel libsndfile-devel libtiff-devel
BuildRequires:  libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
BuildRequires:  portaudio-devel postgresql-devel python-devel  soundtouch-devel
BuildRequires:  sqlite-devel taglib-devel

%description
Io is a small, prototype-based programming language. The ideas in
Io are mostly inspired by Smalltalk (all values are objects), Self
(prototype-based), NewtonScript (differential inheritance), Act1
(actors and futures for concurrency), LISP (code is a runtime
inspectable/modifiable tree) and Lua (small, embeddable).


%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}.


%package graphics-and-sound
Summary:        Io graphics and sound support
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description graphics-and-sound
Io graphics and sound support, this package includes IO bindings needed to
write Io programs which want to display graphics and / or produce sound
(OpenGL, Image loading, PortAudio, etc.).


%package extras
Summary:        Io extra addons
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description extras
This package includes addons for Io which require additional libraries to be
installed. This includes the Python and Socket addons.


%package postgresql
Summary:        Io postgresql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description postgresql
Io postgresql bindings.


%package mysql
Summary:        Io mysql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description mysql
Io mysql bindings


%prep
%setup -q -n Io-%{_version}
%patch0 -p1
sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
# libstdc++.so is searched and not found ...
sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
# for %doc
rm docs/guide_files/.htmle
mv addons/OpenGL/docs OpenGL
iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
sed -i 's/\r//g' license.txt `find OpenGL -type f`


%build
make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.0"'


%install
rm -rf $RPM_BUILD_ROOT
# upstreams make install installs lots of unwanted parts of the addons, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons
mkdir -p $RPM_BUILD_ROOT%{_includedir}
install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
install -m 755 _build/dll/libiovmall.so \
  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.0
ln -s libiovmall.so.0 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
# install the addons
for i in addons/*; do
  # skip unbuild addons
  if [ -d $i/_build ]; then
    ADDON=`basename $i`
    mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -m 755 $i/_build/dll/libIo$ADDON.so \
      $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -p -m 644 $i/depends $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON
    # Io doesn't find the addon if this file isn't present
    touch $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/build.io
  fi
done


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/io
%{_libdir}/libiovmall.so.0
%dir %{_libdir}/io
%dir %{_libdir}/io/addons
%{_libdir}/io/addons/AsyncRequest
%{_libdir}/io/addons/BigNum
%{_libdir}/io/addons/Blowfish
%{_libdir}/io/addons/Box
%{_libdir}/io/addons/CGI
%{_libdir}/io/addons/ContinuedFraction
%{_libdir}/io/addons/Curses
%{_libdir}/io/addons/Flux
%{_libdir}/io/addons/Fnmatch
%{_libdir}/io/addons/LZO
%{_libdir}/io/addons/Libxml2
%{_libdir}/io/addons/Loki
%{_libdir}/io/addons/MD5
%{_libdir}/io/addons/NotificationCenter
%{_libdir}/io/addons/Random
%{_libdir}/io/addons/Range
%{_libdir}/io/addons/Rational
%{_libdir}/io/addons/Regex
%{_libdir}/io/addons/SHA1
%{_libdir}/io/addons/SQLite3
%{_libdir}/io/addons/SqlDatabase
%{_libdir}/io/addons/Syslog
%{_libdir}/io/addons/SystemCall
%{_libdir}/io/addons/Thread
%{_libdir}/io/addons/UUID
%{_libdir}/io/addons/User
%{_libdir}/io/addons/Zlib

%files devel
%defattr(-,root,root,-)
%doc docs/guide.html docs/guide.pdf docs/guide_files
%{_libdir}/libiovmall.so
%{_includedir}/io

%files graphics-and-sound
%defattr(-,root,root,-)
%doc OpenGL
%{_libdir}/io/addons/Font
%{_libdir}/io/addons/Image
%{_libdir}/io/addons/LibSndFile
%{_libdir}/io/addons/OpenGL
%{_libdir}/io/addons/PortAudio
%{_libdir}/io/addons/TagLib

%files extras
%defattr(-,root,root,-)
%{_libdir}/io/addons/Python
%{_libdir}/io/addons/SampleRateConverter
%{_libdir}/io/addons/Socket
%{_libdir}/io/addons/SoundTouch

%files postgresql
%defattr(-,root,root,-)
%{_libdir}/io/addons/Postgre*

%files mysql
%defattr(-,root,root,-)
%{_libdir}/io/addons/MySQL


%changelog
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-1
- Adapted Packman spec file for Fedora

* Sat Sep 08 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.2
- openSUSE-10.3 build, using libode(-devel)

* Sun Jun 03 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.1
- update to 20070528
- added patches for 64bit (thx Detlef)
- switched to portaudio

* Sun May 27 2007 Toni Graffy <toni at links2linux.de> 20070430-0.pm.1
- initial package 20070430


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Io-language/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 17:01:38 -0000	1.1
+++ .cvsignore	13 Sep 2007 18:25:52 -0000	1.2
@@ -0,0 +1 @@
+Io-2007-07-10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Io-language/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 17:01:38 -0000	1.1
+++ sources	13 Sep 2007 18:25:52 -0000	1.2
@@ -0,0 +1 @@
+8101f2fd8963cefedf43e188452d6249  Io-2007-07-10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:36 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:36 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgaQ2012135@app4.fedora.phx.redhat.com>

James Antill (james) has set the commit acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:37 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:37 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgbW2012144@app4.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:38 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:38 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgckl012153@app4.fedora.phx.redhat.com>

James Antill (james) has set the watchbugzilla acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:40 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:40 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgegn017856@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

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



From fedora-extras-commits at redhat.com  Thu Sep 13 19:01:26 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 15:01:26 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.19,1.263.2.20
Message-ID: <200709131901.l8DJ1Q8l025729@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19792/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
add missing BR alsa-lib-devel


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.19
retrieving revision 1.263.2.20
diff -u -r1.263.2.19 -r1.263.2.20
--- kdebase.spec	12 Sep 2007 06:52:23 -0000	1.263.2.19
+++ kdebase.spec	13 Sep 2007 19:00:52 -0000	1.263.2.20
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.93.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -33,6 +33,7 @@
 # should not conflict with d3lphin, but does with old Dolphin
 Conflicts:     dolphin <= 0.8.2
 
+BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 # needed?
 BuildRequires: cdparanoia-devel cdparanoia
@@ -247,6 +248,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- add missing BR alsa-lib-devel
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - remove files which conflict with KDE 3
 - move devel symlinks to %%{_kde4_libdir}/kde4/devel/



From fedora-extras-commits at redhat.com  Thu Sep 13 19:19:52 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 15:19:52 -0400
Subject: rpms/qt4/devel qt4.spec,1.67,1.68
Message-ID: <200709131919.l8DJJqD1026428@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26404

Modified Files:
	qt4.spec 
Log Message:
another typo: s/linquist/linguist/
Release++



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- qt4.spec	13 Sep 2007 18:17:29 -0000	1.67
+++ qt4.spec	13 Sep 2007 19:19:19 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -590,7 +590,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
-%{_datadir}/icons/hicolor/*/apps/linquist4.*
+%{_datadir}/icons/hicolor/*/apps/linguist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -634,9 +634,9 @@
 
 
 %changelog
-* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-6
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
-- linquist.desktop: use new linguist4 icons
+- linguist.desktop: use new linguist4 icons
 - -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)
 
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4



From fedora-extras-commits at redhat.com  Thu Sep 13 19:21:02 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:21:02 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.53,
	1.54 xen-compile-fix.patch, 1.2, 1.3 xen-version-strings.patch,
	1.3, 1.4
Message-ID: <200709131921.l8DJL2QS026523@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26426

Modified Files:
	kernel-xen.spec xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Make hypervisor patches relative to the xen HG tree

Make hypervisor patches relative to the xen HG tree, not only the
'xen' subdirectory. This makes easier to import patches from
upstream.



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kernel-xen.spec	12 Sep 2007 20:21:05 -0000	1.53
+++ kernel-xen.spec	13 Sep 2007 19:20:29 -0000	1.54
@@ -1438,11 +1438,12 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen
+cd xen-%{xen_hv_version}-%{xen_hv_cset}/
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
 
+cd xen/
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
 sed -i -e 's/\(^export XEN_BUILDVERSION.*$\)/\1'-%{PACKAGE_RELEASE}'/' Makefile
@@ -2363,6 +2364,11 @@
 #  - tux.
 
 %changelog
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Make hypervisor patches relative to the xen HG tree, not only the
+  hypervisor subdirectory. This makes easier to import patches from
+  upstream.
+
 * Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
   under Xen.

xen-compile-fix.patch:

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-compile-fix.patch	30 Apr 2007 22:09:41 -0000	1.2
+++ xen-compile-fix.patch	13 Sep 2007 19:20:29 -0000	1.3
@@ -1,7 +1,7 @@
-Index: xen/include/asm-x86/hvm/hvm.h
+Index: xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
 ===================================================================
---- xen.orig/include/asm-x86/hvm/hvm.h
-+++ xen/include/asm-x86/hvm/hvm.h
+--- xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
++++ xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
 @@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v)
      return hvm_funcs.long_mode_enabled(v);
  }

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-version-strings.patch	7 May 2007 18:47:08 -0000	1.3
+++ xen-version-strings.patch	13 Sep 2007 19:20:29 -0000	1.4
@@ -1,7 +1,7 @@
-Index: xen/Makefile
+Index: xen-3.1.0/xen/Makefile
 ===================================================================
---- xen.orig/Makefile
-+++ xen/Makefile
+--- xen-3.1.0/xen/Makefile
++++ xen-3.1.0/xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3



From fedora-extras-commits at redhat.com  Thu Sep 13 19:34:53 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:34:53 -0400
Subject: rpms/kernel-xen-2.6/devel xen-vpic-irqbase-mode.patch, NONE,
	1.1 kernel-xen.spec, 1.54, 1.55
Message-ID: <200709131934.l8DJYreq027021@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26992

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vpic-irqbase-mode.patch 
Log Message:
Fix for bug #248398: HVM domain hangs during (F-7) install.

Backport of fix from xen-unstable: 15239:656b8175f4f2.


xen-vpic-irqbase-mode.patch:

--- NEW FILE xen-vpic-irqbase-mode.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Node ID 656b8175f4f24b5bb3a761e62c496075510914ed
# Parent  345ae2e61ba0130cf4913fee13b378c4e21d24e7
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
xen-unstable changeset: 15239:656b8175f4f24b5bb3a761e62c496075510914ed
xen-unstable date: Fri Jun 08 11:19:55 2007 +0100

Index: xen-3.1-testing-32/xen/arch/x86/hvm/vmx/vmx.c
===================================================================
--- xen-3.1-testing-32.orig/xen/arch/x86/hvm/vmx/vmx.c
+++ xen-3.1-testing-32/xen/arch/x86/hvm/vmx/vmx.c
@@ -1878,8 +1878,8 @@ enum { VMX_ASSIST_INVOKE = 0, VMX_ASSIST
 static int vmx_assist(struct vcpu *v, int mode)
 {
     struct vmx_assist_context c;
-    u32 magic;
-    u32 cp;
+    struct hvm_hw_vpic *vpic = v->domain->arch.hvm_domain.vpic;
+    u32 magic, cp;
 
     /* make sure vmxassist exists (this is not an error) */
     if (hvm_copy_from_guest_phys(&magic, VMXASSIST_MAGIC_OFFSET,
@@ -1913,6 +1913,10 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            v->arch.hvm_vmx.pm_irqbase[0] = vpic[0].irq_base;
+            v->arch.hvm_vmx.pm_irqbase[1] = vpic[1].irq_base;
+            vpic[0].irq_base = NR_EXCEPTION_HANDLER;
+            vpic[1].irq_base = NR_EXCEPTION_HANDLER + 8;
             v->arch.hvm_vmx.vmxassist_enabled = 1;
             return 1;
         }
@@ -1931,6 +1935,13 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            if ( v->arch.hvm_vmx.irqbase_mode ) {
+                vpic[0].irq_base = c.rm_irqbase[0] & 0xf8;
+                vpic[1].irq_base = c.rm_irqbase[1] & 0xf8;
+            } else {
+                vpic[0].irq_base = v->arch.hvm_vmx.pm_irqbase[0];
+                vpic[1].irq_base = v->arch.hvm_vmx.pm_irqbase[1];
+            }
             v->arch.hvm_vmx.vmxassist_enabled = 0;
             return 1;
         }
Index: xen-3.1-testing-32/xen/arch/x86/hvm/vpic.c
===================================================================
--- xen-3.1-testing-32.orig/xen/arch/x86/hvm/vpic.c
+++ xen-3.1-testing-32/xen/arch/x86/hvm/vpic.c
@@ -174,7 +174,8 @@ static int vpic_intack(struct hvm_hw_vpi
     return irq;
 }
 
-static void vpic_ioport_write(struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
+static void vpic_ioport_write(
+    struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
 {
     int priority, cmd, irq;
     uint8_t mask;
@@ -265,6 +266,11 @@ static void vpic_ioport_write(struct hvm
             vpic->imr = val;
             break;
         case 1:
+#if 1 /* Delete me when vmxassist is retired. */
+            /* Which mode is irqbase programmed in? */
+            current->arch.hvm_vmx.irqbase_mode =
+                current->arch.hvm_vmx.vmxassist_enabled;
+#endif
             /* ICW2 */
             vpic->irq_base = val & 0xf8;
             vpic->init_state++;
Index: xen-3.1-testing-32/xen/include/asm-x86/hvm/vmx/vmcs.h
===================================================================
--- xen-3.1-testing-32.orig/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ xen-3.1-testing-32/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -77,7 +77,11 @@ struct arch_vmx_struct {
     unsigned long        cpu_cr2; /* save CR2 */
     unsigned long        cpu_cr3;
     struct vmx_msr_state msr_state;
+
+    /* Following fields are all specific to vmxassist. */
     unsigned long        vmxassist_enabled:1;
+    unsigned long        irqbase_mode:1;
+    unsigned char        pm_irqbase[2];
 };
 
 struct vmcs_struct *vmx_alloc_host_vmcs(void);
Index: xen-3.1-testing-32/xen/include/public/hvm/vmx_assist.h
===================================================================
--- xen-3.1-testing-32.orig/xen/include/public/hvm/vmx_assist.h
+++ xen-3.1-testing-32/xen/include/public/hvm/vmx_assist.h
@@ -35,6 +35,10 @@
 
 #ifndef __ASSEMBLY__
 
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
+
 union vmcs_arbytes {
     struct arbyte_fields {
         unsigned int seg_type : 4,
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kernel-xen.spec	13 Sep 2007 19:20:29 -0000	1.54
+++ kernel-xen.spec	13 Sep 2007 19:34:21 -0000	1.55
@@ -633,6 +633,9 @@
 Patch20000: xen-compile-fix.patch
 Patch20001: xen-version-strings.patch
 
+# Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
+Patch20002: xen-vpic-irqbase-mode.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1442,6 +1445,7 @@
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
+%patch20002 -p1
 
 cd xen/
 # Update the Makefile version strings
@@ -2365,6 +2369,10 @@
 
 %changelog
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix for bug #248398: HVM domain hangs during (F-7) install.
+  Backported fix from xen-unstable: 15239:656b8175f4f2
+
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Make hypervisor patches relative to the xen HG tree, not only the
   hypervisor subdirectory. This makes easier to import patches from
   upstream.



From fedora-extras-commits at redhat.com  Thu Sep 13 19:37:27 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 13 Sep 2007 15:37:27 -0400
Subject: rpms/csound/OLPC-2 csound-5.07.0-version-libcsnd.patch, NONE,
	1.1 csound.spec, 1.15, 1.16
Message-ID: <200709131937.l8DJbRUQ027412@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27376

Modified Files:
	csound.spec 
Added Files:
	csound-5.07.0-version-libcsnd.patch 
Log Message:
* Thu Sep 13 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.4.cvs20070830
- Put libcsnd.so in the right place, and version it



csound-5.07.0-version-libcsnd.patch:

--- NEW FILE csound-5.07.0-version-libcsnd.patch ---
diff -up csound5/install.py.version-libcsnd csound5/install.py
--- csound5/install.py.version-libcsnd	2007-09-13 14:50:54.000000000 -0400
+++ csound5/install.py	2007-09-13 14:51:40.000000000 -0400
@@ -256,6 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
 libList += findFiles('.', 'libcsound64\\.a')
 libList += findFiles('.', 'libcsound\\.so\\..+')
 libList += findFiles('.', 'libcsound64\\.so\\..+')
+libList += findFiles('.', 'libcsnd\\.so\\..+')
 libList += findFiles('.', '_csnd\\.so')
 libList += findFiles('.', 'lib_jcsound\\.so')
 libList += findFiles('.', 'lib_CsoundVST\\.so')
@@ -269,6 +270,8 @@ for i in libList:
     if err == 0:
         if i[:13] == 'libcsound.so.':
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
+        elif i[:11] == 'libcsnd.so.':
+            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
         elif i[:15] == 'libcsound64.so.':
             err = installLink(i, concatPath([libDir, 'libcsound64.so']))
         elif i == 'lib_CsoundVST.so':
diff -up csound5/SConstruct.version-libcsnd csound5/SConstruct
--- csound5/SConstruct.version-libcsnd	2007-09-13 13:58:28.000000000 -0400
+++ csound5/SConstruct	2007-09-13 13:58:28.000000000 -0400
@@ -1097,6 +1097,8 @@ else:
         os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so'])
         # os.symlink('lib_csnd.so', '_csnd.so')
         csoundInterfacesEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+    # Copy here to avoid poluting SHLINKFLAGS for python
+    csndPythonEnvironment = csoundInterfacesEnvironment.Copy()
     if getPlatform() == 'darwin':
         ilibName = "lib_csnd.dylib"
         ilibVersion = csoundLibraryVersion
@@ -1112,22 +1114,35 @@ else:
         csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary(
          '_csnd', csoundInterfacesSources)
     else:
-        csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary('csnd', csoundInterfacesSources)
+        if getPlatform() == 'linux':
+            # save interfaces environment before adding -soname
+            libName = 'libcsnd.so'
+            libName2 = libName + '.' + csoundLibraryVersion
+            os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', libName])
+            os.symlink(libName2, libName)
+            tmp = csoundInterfacesEnvironment['SHLINKFLAGS']
+            tmp += ['-Wl,-soname=%s' % libName2]
+            csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary(
+                libName2, csoundInterfacesSources,
+                SHLINKFLAGS = tmp, SHLIBPREFIX = '', SHLIBSUFFIX = '')
+        else:
+            csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary('csnd', csoundInterfacesSources)
+
     Depends(csoundInterfaces, csoundLibrary)
     libs.append(csoundInterfaces)
     if pythonFound:
-        csoundInterfacesEnvironment.Append(LINKFLAGS = pythonLinkFlags)
-        csoundInterfacesEnvironment.Prepend(LIBPATH = pythonLibraryPath)
-        csoundInterfacesEnvironment.Prepend(LIBS = pythonLibs)
-        csoundInterfacesEnvironment.Append(CPPPATH = pythonIncludePath)
-        csndPythonEnvironment = csoundInterfacesEnvironment.Copy()
+        csndPythonEnvironment.Append(LINKFLAGS = pythonLinkFlags)
+        csndPythonEnvironment.Prepend(LIBPATH = pythonLibraryPath)
+        csndPythonEnvironment.Prepend(LIBS = pythonLibs)
+        csndPythonEnvironment.Append(CPPPATH = pythonIncludePath)
         if getPlatform() == 'darwin':
          csndPythonEnvironment.Append(LIBS = ['_csnd'])
         else:
          csndPythonEnvironment.Append(LIBS = ['csnd'])
         csoundPythonInterface = csndPythonEnvironment.SharedObject(
             'interfaces/python_interface.i',
-            SWIGFLAGS = [swigflags, '-python', '-outdir', '.'])
+            SWIGFLAGS = [swigflags, '-python', '-outdir', '.'],
+            SHLINKFLAGS = '')
         if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and not withMSVC():
             Depends(csoundPythonInterface, pythonImportLibrary)
         csndModule = makePythonModule(csndPythonEnvironment, 'csnd', [csoundPythonInterface])


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- csound.spec	31 Aug 2007 16:05:11 -0000	1.15
+++ csound.spec	13 Sep 2007 19:36:54 -0000	1.16
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.07.0
-Release:       0.3.cvs20070830%{?dist}
+Release:       0.4.cvs20070830%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -45,6 +45,7 @@
 Patch5: csound-5.03.0-rtalsa-fix.patch
 Patch6: csound-5.07-log-segfault-fix.patch
 Patch7: csound-5.03.0-add-oggplay.patch
+Patch8: csound-5.07.0-version-libcsnd.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -191,6 +192,7 @@
 %patch5 -p1 -b .rtalsa-fix
 %patch6 -p1 -b .logfile-segfault-fix
 %patch7 -p1 -b .add-oggplay
+%patch8 -p1 -b .version-libcsnd
 
 tar xf %{SOURCE1}
 
@@ -250,6 +252,8 @@
 # This file is zero-lenth for some reason
 %{__rm} -f manual/examples/ifthen.csd
 
+%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/libcsnd.so
+
 install -dm 755 %{buildroot}%{_javadir}
 (cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
 
@@ -304,6 +308,7 @@
 %{_bindir}/pv_export
 %{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
+%{_libdir}/libcsnd.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
 %dir %{_libdir}/%{name}/plugins
@@ -312,7 +317,6 @@
 %{_libdir}/%{name}/plugins/libbarmodel.so
 %{_libdir}/%{name}/plugins/libcompress.so
 %{_libdir}/%{name}/plugins/libcontrol.so
-%{_libdir}/%{name}/plugins/libcsnd.so
 %{_libdir}/%{name}/plugins/libdate.so
 %{_libdir}/%{name}/plugins/libeqfil.so
 %{_libdir}/%{name}/plugins/libftest.so
@@ -353,6 +357,7 @@
 %defattr(-,root,root,0755)
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
+%{_libdir}/libcsnd.so
 
 %files python
 %defattr(-,root,root,0755)
@@ -420,6 +425,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Thu Sep 13 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.4.cvs20070830
+- Put libcsnd.so in the right place, and version it
+
 * Fri Aug 31 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.3.cvs20070830
 - Add oggplay patch
 



From fedora-extras-commits at redhat.com  Thu Sep 13 19:58:32 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:58:32 -0400
Subject: rpms/kernel-xen-2.6/F-7 xen-vpic-irqbase-mode.patch, NONE,
	1.1 kernel-xen.spec, 1.46, 1.47 xen-vpic-set-vector.patch, 1.2, NONE
Message-ID: <200709131958.l8DJwWjq027788@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27758

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vpic-irqbase-mode.patch 
Removed Files:
	xen-vpic-set-vector.patch 
Log Message:
HV-side of fix for bug #248398: HVM domain hangs during (F-7) install

Backport of fix from xen-unstable: 15239:656b8175f4f2.

This replaces xen-vpic-set-vector.patch, that didn't go upstream and
didn't have its user-space part added to the xen package.


xen-vpic-irqbase-mode.patch:

--- NEW FILE xen-vpic-irqbase-mode.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Node ID 656b8175f4f24b5bb3a761e62c496075510914ed
# Parent  345ae2e61ba0130cf4913fee13b378c4e21d24e7
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
xen-unstable changeset: 15239:656b8175f4f24b5bb3a761e62c496075510914ed
xen-unstable date: Fri Jun 08 11:19:55 2007 +0100

Index: xen/arch/x86/hvm/vmx/vmx.c
===================================================================
--- xen/arch/x86/hvm/vmx/vmx.c
+++ xen/arch/x86/hvm/vmx/vmx.c
@@ -1878,8 +1878,8 @@ enum { VMX_ASSIST_INVOKE = 0, VMX_ASSIST
 static int vmx_assist(struct vcpu *v, int mode)
 {
     struct vmx_assist_context c;
-    u32 magic;
-    u32 cp;
+    struct hvm_hw_vpic *vpic = v->domain->arch.hvm_domain.vpic;
+    u32 magic, cp;
 
     /* make sure vmxassist exists (this is not an error) */
     if (hvm_copy_from_guest_phys(&magic, VMXASSIST_MAGIC_OFFSET,
@@ -1913,6 +1913,10 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            v->arch.hvm_vmx.pm_irqbase[0] = vpic[0].irq_base;
+            v->arch.hvm_vmx.pm_irqbase[1] = vpic[1].irq_base;
+            vpic[0].irq_base = NR_EXCEPTION_HANDLER;
+            vpic[1].irq_base = NR_EXCEPTION_HANDLER + 8;
             v->arch.hvm_vmx.vmxassist_enabled = 1;
             return 1;
         }
@@ -1931,6 +1935,13 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            if ( v->arch.hvm_vmx.irqbase_mode ) {
+                vpic[0].irq_base = c.rm_irqbase[0] & 0xf8;
+                vpic[1].irq_base = c.rm_irqbase[1] & 0xf8;
+            } else {
+                vpic[0].irq_base = v->arch.hvm_vmx.pm_irqbase[0];
+                vpic[1].irq_base = v->arch.hvm_vmx.pm_irqbase[1];
+            }
             v->arch.hvm_vmx.vmxassist_enabled = 0;
             return 1;
         }
Index: xen/arch/x86/hvm/vpic.c
===================================================================
--- xen/arch/x86/hvm/vpic.c
+++ xen/arch/x86/hvm/vpic.c
@@ -174,7 +174,8 @@ static int vpic_intack(struct hvm_hw_vpi
     return irq;
 }
 
-static void vpic_ioport_write(struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
+static void vpic_ioport_write(
+    struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
 {
     int priority, cmd, irq;
     uint8_t mask;
@@ -265,6 +266,11 @@ static void vpic_ioport_write(struct hvm
             vpic->imr = val;
             break;
         case 1:
+#if 1 /* Delete me when vmxassist is retired. */
+            /* Which mode is irqbase programmed in? */
+            current->arch.hvm_vmx.irqbase_mode =
+                current->arch.hvm_vmx.vmxassist_enabled;
+#endif
             /* ICW2 */
             vpic->irq_base = val & 0xf8;
             vpic->init_state++;
Index: xen/include/asm-x86/hvm/vmx/vmcs.h
===================================================================
--- xen/include/asm-x86/hvm/vmx/vmcs.h
+++ xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -77,7 +77,11 @@ struct arch_vmx_struct {
     unsigned long        cpu_cr2; /* save CR2 */
     unsigned long        cpu_cr3;
     struct vmx_msr_state msr_state;
+
+    /* Following fields are all specific to vmxassist. */
     unsigned long        vmxassist_enabled:1;
+    unsigned long        irqbase_mode:1;
+    unsigned char        pm_irqbase[2];
 };
 
 struct vmcs_struct *vmx_alloc_host_vmcs(void);
Index: xen/include/public/hvm/vmx_assist.h
===================================================================
--- xen/include/public/hvm/vmx_assist.h
+++ xen/include/public/hvm/vmx_assist.h
@@ -35,6 +35,10 @@
 
 #ifndef __ASSEMBLY__
 
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
+
 union vmcs_arbytes {
     struct arbyte_fields {
         unsigned int seg_type : 4,
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kernel-xen.spec	12 Sep 2007 20:39:00 -0000	1.46
+++ kernel-xen.spec	13 Sep 2007 19:57:59 -0000	1.47
@@ -519,8 +519,8 @@
 Patch20000: xen-compile-fix.patch
 Patch20001: xen-version-strings.patch
 
-# HV part for rawhide FV booting on rawhide Xen
-Patch20002: xen-vpic-set-vector.patch
+# Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
+Patch20002: xen-vpic-irqbase-mode.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2058,6 +2058,12 @@
 #  - tux.
 
 %changelog
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Hypervisor-side of fix for bug #248398: HVM domain hangs during (F-7)
+  install. Backport of fix from xen-unstable: 15239:656b8175f4f2.
+  This replaces xen-vpic-set-vector.patch, that didn't go upstream and
+  didn't have its user-space part added to the xen package.
+
 * Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable CONFIG_HIGHPTE. It is not reliable and causes performance loss
   under Xen


--- xen-vpic-set-vector.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 20:09:21 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 16:09:21 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.22,1.23
Message-ID: <200709132009.l8DK9LCx001594@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548

Modified Files:
	gnash.spec 
Log Message:
- fixed remaining bugs in the spec file by refrencing the devel branch



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnash.spec	12 Sep 2007 20:23:09 -0000	1.22
+++ gnash.spec	13 Sep 2007 20:08:46 -0000	1.23
@@ -4,7 +4,7 @@
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,29 +58,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnash/*.la
+#rm -f \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
 
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # don't package libltdl related files!
 rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
+ $RPM_BUILD_ROOT/%{_libdir}/gnash/libltdl* \
  $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+# asspec info isn't generated rightly
+rm -f \
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
 # omf is broken
 rm -rf \
  $RPM_BUILD_ROOT/%{_datadir}/omf
 # cygnal just segfaults
-rm -f \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm -f \
+# $RPM_BUILD_ROOT/%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -101,14 +104,14 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
+%{_libdir}/gnash/
 %{_mandir}/man1/gnash*
 %{_datadir}/gnash/
 
-
 %files plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/libgnashplugin.so



From fedora-extras-commits at redhat.com  Thu Sep 13 20:10:04 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:10:04 -0400
Subject: rpms/nodoka-theme-gnome/devel .cvsignore, 1.3,
	1.4 nodoka-theme-gnome.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200709132010.l8DKA4Bb001660@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1593

Modified Files:
	.cvsignore nodoka-theme-gnome.spec sources 
Log Message:


New version.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2007 11:39:01 -0000	1.3
+++ .cvsignore	13 Sep 2007 20:09:30 -0000	1.4
@@ -1 +1 @@
-nodoka-theme-gnome-0.3.1.2.tar.gz
+nodoka-theme-gnome-0.3.2.tar.gz


Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nodoka-theme-gnome.spec	11 Aug 2007 11:39:01 -0000	1.3
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:09:30 -0000	1.4
@@ -1,13 +1,13 @@
 %define nodoka_dir %{_datadir}/themes/Nodoka
 
 Name:           nodoka-theme-gnome
-Version:        0.3.1.2
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://fedoraproject.org/wiki/Artwork/NodokaTheme
+URL:            http://hosted.fedoraproject.org/projects/nodoka
 
 # can get on a wiki, see URL
 Source0:        %{name}-%{version}.tar.gz 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1
+- new version, reworked gradients in metacity theme
+
 * Sat Aug 11 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.1.2-1
 - new version, change used icon set to fedora (in redhat-artwork pkg)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:39:01 -0000	1.3
+++ sources	13 Sep 2007 20:09:30 -0000	1.4
@@ -1 +1 @@
-2f848c5bce7d6fd72da0ec9b08643412  nodoka-theme-gnome-0.3.1.2.tar.gz
+6bd4a54194d9c981c4894fc77b254943  nodoka-theme-gnome-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 20:20:51 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:20:51 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.4,1.5
Message-ID: <200709132020.l8DKKpJ7002022@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1989

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Fix source dir name...






Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nodoka-theme-gnome.spec	13 Sep 2007 20:09:30 -0000	1.4
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:20:19 -0000	1.5
@@ -42,7 +42,7 @@
 Echoey look and feel.
 
 %prep
-%setup -q
+%setup -q -n nodoka-theme-gnome
 
 
 %build



From fedora-extras-commits at redhat.com  Thu Sep 13 20:30:40 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:30:40 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.5,1.6
Message-ID: <200709132030.l8DKUewE002215@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2194

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Bump for new build.





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nodoka-theme-gnome.spec	13 Sep 2007 20:20:19 -0000	1.5
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:30:07 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           nodoka-theme-gnome
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.1
+- fix dir name
+
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1
 - new version, reworked gradients in metacity theme
 



From fedora-extras-commits at redhat.com  Thu Sep 13 20:33:35 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:33:35 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.6,1.7
Message-ID: <200709132033.l8DKXZkq002335@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2317

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


And better changelog entry...





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nodoka-theme-gnome.spec	13 Sep 2007 20:30:07 -0000	1.6
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:33:03 -0000	1.7
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.1
+* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1



From fedora-extras-commits at redhat.com  Thu Sep 13 20:35:04 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:35:04 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.7,1.8
Message-ID: <200709132035.l8DKZ4Ur002387@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2350

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Fix typo in changelog date.




Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nodoka-theme-gnome.spec	13 Sep 2007 20:33:03 -0000	1.7
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:34:31 -0000	1.8
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
+* Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1



From fedora-extras-commits at redhat.com  Thu Sep 13 20:37:02 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 13 Sep 2007 16:37:02 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 TurboGears.spec, 1.19, 1.20 sources,
	1.7, 1.8 TurboGears-1.0.2.2-etree.patch, 1.2,
	NONE TurboGears-1.0.2.2-setuptools.patch, 1.3, NONE
Message-ID: <200709132037.l8DKb24S002521@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2468

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.3.2-setuptools.patch 
Removed Files:
	TurboGears-1.0.2.2-etree.patch 
	TurboGears-1.0.2.2-setuptools.patch 
Log Message:
* Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
- 1.0.3.2
- Remove etree patch



TurboGears-1.0.3.2-setuptools.patch:

--- NEW FILE TurboGears-1.0.3.2-setuptools.patch ---
--- setup.py.orig	2007-09-13 16:14:36.000000000 -0400
+++ setup.py	2007-09-13 16:20:51.000000000 -0400
@@ -18,32 +18,22 @@
             "TurboKid >= 1.0.2",
             "CherryPy >= 2.2.1,<3.0.0alpha",
             "simplejson >= 1.3",
-            "elementtree >= 1.2.6",
             "PasteScript >= 0.9.7",
-            "FormEncode >= 0.7.1",
             "setuptools >= 0.6c2",
             "RuleDispatch >= 0.5a0.dev-r2303",
             "DecoratorTools >= 1.4",
-            "ConfigObj >= 4.3.2"]
+]
 
-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
+tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
 
 standard = ["SQLObject>=0.8,<0.10dev"]
 
 # python 2.5 compatible list
 if sys.version_info < (2, 5):
-    install_requires.extend([
-        "cElementTree >= 1.0.5",
-        ])
     tgtesttools.extend([
         "pysqlite"
         ])
     standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
-else:
-    install_requires.extend([
-        "Cheetah >= 2.0rc7",
-        ])
-
 
 setup(
     name="TurboGears",
@@ -127,7 +117,7 @@
     extras_require = {
         "exp" : ["TGFastData"],
         "standard" : standard,
-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
+        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
         "testtools" : ["nose >= 0.9.1"],
         "tgtesttools" : tgtesttools,
     },


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 May 2007 07:52:55 -0000	1.7
+++ .cvsignore	13 Sep 2007 20:36:29 -0000	1.8
@@ -1 +1 @@
-TurboGears-1.0.2.2.tar.gz
+TurboGears-1.0.3.2.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurboGears.spec	2 Sep 2007 04:51:56 -0000	1.19
+++ TurboGears.spec	13 Sep 2007 20:36:29 -0000	1.20
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.2.2
-Release:        3%{?dist}
+Version:        1.0.3.2
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,7 +11,6 @@
 URL:            http://www.turbogears.org
 Source0:        http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-setuptools.patch
-Patch1:         %{name}-%{version}-etree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -64,12 +63,10 @@
 %prep
 %setup -q
 %patch0 -b .setuptools
-%patch1 -b .etree
 
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
@@ -87,7 +84,11 @@
 %{python_sitelib}/turbogears/
 
 %changelog
-* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+* Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
+- 1.0.3.2
+- Remove etree patch
+
+* Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
 - Update for python-setuptools changes in rawhide
 
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 May 2007 07:52:55 -0000	1.7
+++ sources	13 Sep 2007 20:36:29 -0000	1.8
@@ -1 +1 @@
-a8d79645b4ce67409026838ca360addc  TurboGears-1.0.2.2.tar.gz
+75471c1767af970479ca2d4788a30323  TurboGears-1.0.3.2.tar.gz


--- TurboGears-1.0.2.2-etree.patch DELETED ---


--- TurboGears-1.0.2.2-setuptools.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 20:38:38 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 13 Sep 2007 16:38:38 -0400
Subject: rpms/TurboGears/devel TurboGears.spec,1.20,1.21
Message-ID: <200709132038.l8DKcc1g002645@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2596

Modified Files:
	TurboGears.spec 
Log Message:
changelog fix


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurboGears.spec	13 Sep 2007 20:36:29 -0000	1.20
+++ TurboGears.spec	13 Sep 2007 20:38:06 -0000	1.21
@@ -88,7 +88,7 @@
 - 1.0.3.2
 - Remove etree patch
 
-* Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
 - Update for python-setuptools changes in rawhide
 
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2



From fedora-extras-commits at redhat.com  Thu Sep 13 20:52:57 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 13 Sep 2007 16:52:57 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.57, 1.58 fedora-logos.spec,
	1.80, 1.81 sources, 1.61, 1.62
Message-ID: <200709132052.l8DKqvej003088@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 7.92.1





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	29 Aug 2007 03:17:34 -0000	1.57
+++ .cvsignore	13 Sep 2007 20:52:24 -0000	1.58
@@ -1 +1 @@
-fedora-logos-7.92.0.tar.bz2
+fedora-logos-7.92.1.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fedora-logos.spec	5 Sep 2007 14:23:21 -0000	1.80
+++ fedora-logos.spec	13 Sep 2007 20:52:24 -0000	1.81
@@ -1,10 +1,9 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.0
-Release: 4%{?dist}
+Version: 7.92.1
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
-Source1: infinity-grub.xpm.gz
 
 # The trademarks contained in this file are the property of Red Hat, Inc.  No
 # license to these trademarks is provided or is necessary if you merely
@@ -55,8 +54,6 @@
 mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
-# FIXME: fix bad tarball
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
 for i in firstboot/* ; do
@@ -206,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
+- add the powered-by logo (#250676)
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
 - merge back changes that got lost
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	29 Aug 2007 03:17:34 -0000	1.61
+++ sources	13 Sep 2007 20:52:24 -0000	1.62
@@ -1 +1 @@
-e3c5d256b26dd0f0c31253bcf4c9adef  fedora-logos-7.92.0.tar.bz2
+7799320bef9d9adb66eb01cf7adc21c4  fedora-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 21:00:24 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 17:00:24 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.685, 1.686 kernel.spec, 1.163, 1.164 sources, 1.647,
	1.648 upstream, 1.569, 1.570 patch-2.6.23-rc6-git3.bz2.sign, 1.1, NONE
Message-ID: <200709132100.l8DL0Ori003287@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3253

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git4.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git3.bz2.sign 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git4



--- NEW FILE patch-2.6.23-rc6-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6YodyGugalF9Dw4RAu0mAKCMndFJ6CWEBcqtpv01qzblUEiNyQCeOQVc
vyEaSq54z5I6ffgW+MeL3z0=
=bRDp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -r1.685 -r1.686
--- .cvsignore	13 Sep 2007 16:29:27 -0000	1.685
+++ .cvsignore	13 Sep 2007 20:59:51 -0000	1.686
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git3.bz2
+patch-2.6.23-rc6-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kernel.spec	13 Sep 2007 16:29:27 -0000	1.163
+++ kernel.spec	13 Sep 2007 20:59:51 -0000	1.164
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1796,6 +1796,9 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git4
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git3
 - disable stack overflow debugging on i386
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- sources	13 Sep 2007 16:29:27 -0000	1.647
+++ sources	13 Sep 2007 20:59:51 -0000	1.648
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-436b893d0005eb90d1329a533bbf5b59  patch-2.6.23-rc6-git3.bz2
+cb3be21465bfff5bc14e38f5189b503a  patch-2.6.23-rc6-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- upstream	13 Sep 2007 16:29:27 -0000	1.569
+++ upstream	13 Sep 2007 20:59:51 -0000	1.570
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git3.bz2
+patch-2.6.23-rc6-git4.bz2


--- patch-2.6.23-rc6-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 21:05:04 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Thu, 13 Sep 2007 17:05:04 -0400
Subject: rpms/bouml/devel .cvsignore, 1.4, 1.5 bouml.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <200709132105.l8DL54pD009335@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9290

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.2-1 in devel.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Sep 2007 20:34:56 -0000	1.4
+++ .cvsignore	13 Sep 2007 21:04:31 -0000	1.5
@@ -1 +1 @@
-bouml_2.31.1.tar.gz
+bouml_2.31.2.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouml.spec	5 Sep 2007 20:34:56 -0000	1.5
+++ bouml.spec	13 Sep 2007 21:04:31 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.31.1
+Version: 2.31.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -73,6 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc historic.html licence.txt
 %{_bindir}/%{name}
 %{_bindir}/projectControl
 %{_bindir}/projectSynchro
@@ -96,6 +97,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
+- Version bump to 2.31.2.
+
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
 - Version bump to 2.31.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2007 20:34:56 -0000	1.6
+++ sources	13 Sep 2007 21:04:31 -0000	1.7
@@ -1 +1 @@
-51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz
+84928cceed3a7a0c78327eea002b5418  bouml_2.31.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 21:06:57 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Thu, 13 Sep 2007 17:06:57 -0400
Subject: rpms/bouml/F-7 .cvsignore, 1.6, 1.7 bouml.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200709132106.l8DL6vAK009435@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9403

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.2-1 in F-7.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Sep 2007 20:36:49 -0000	1.6
+++ .cvsignore	13 Sep 2007 21:06:24 -0000	1.7
@@ -1 +1 @@
-bouml_2.31.1.tar.gz
+bouml_2.31.2.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/bouml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouml.spec	5 Sep 2007 20:36:49 -0000	1.5
+++ bouml.spec	13 Sep 2007 21:06:24 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.31.1
+Version: 2.31.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -73,6 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc historic.html licence.txt
 %{_bindir}/%{name}
 %{_bindir}/projectControl
 %{_bindir}/projectSynchro
@@ -96,6 +97,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
+- Version bump to 2.31.2.
+
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
 - Version bump to 2.31.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2007 20:36:49 -0000	1.6
+++ sources	13 Sep 2007 21:06:24 -0000	1.7
@@ -1 +1 @@
-51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz
+84928cceed3a7a0c78327eea002b5418  bouml_2.31.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 21:43:59 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Thu, 13 Sep 2007 17:43:59 -0400
Subject: rpms/remind/devel .cvsignore, 1.4, 1.5 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709132143.l8DLhx8Y010221@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10192

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Updated to version 03.01.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2007 15:48:46 -0000	1.4
+++ .cvsignore	13 Sep 2007 21:43:25 -0000	1.5
@@ -1 +1 @@
-remind-03.01.01.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:28:26 -0000	1.1
+++ remind-nostrip.patch	13 Sep 2007 21:43:25 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- remind.spec	23 Aug 2007 15:48:46 -0000	1.3
+++ remind.spec	13 Sep 2007 21:43:25 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           remind
-Version:        03.01.01
+Version:        03.01.02
 Release:        1%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
@@ -77,9 +77,11 @@
 %{_bindir}/cm2rem.tcl
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -90,6 +92,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
 * Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
 - Updated to version 03.01.01
 - Updated license tag to GPLv2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 15:48:46 -0000	1.4
+++ sources	13 Sep 2007 21:43:25 -0000	1.5
@@ -1 +1 @@
-b73f93014b5cdae402f1641dd95f477f  remind-03.01.01.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 22:05:18 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Thu, 13 Sep 2007 18:05:18 -0400
Subject: rpms/remind/F-7 .cvsignore, 1.4, 1.5 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709132205.l8DM5IfI016608@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16524

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Updated to v03.01.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2007 20:31:59 -0000	1.4
+++ .cvsignore	13 Sep 2007 22:04:44 -0000	1.5
@@ -1 +1 @@
-remind-03.01.01.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:40:09 -0000	1.1
+++ remind-nostrip.patch	13 Sep 2007 22:04:44 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- remind.spec	23 Aug 2007 20:31:59 -0000	1.3
+++ remind.spec	13 Sep 2007 22:04:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           remind
-Version:        03.01.01
+Version:        03.01.02
 Release:        1%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
@@ -77,9 +77,11 @@
 %{_bindir}/cm2rem.tcl
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -90,6 +92,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
 * Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
 - Updated to version 03.01.01
 - Updated license tag to GPLv2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 20:31:59 -0000	1.4
+++ sources	13 Sep 2007 22:04:44 -0000	1.5
@@ -1 +1 @@
-b73f93014b5cdae402f1641dd95f477f  remind-03.01.01.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 22:12:25 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 18:12:25 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.223.2.21,1.223.2.22
Message-ID: <200709132212.l8DMCPw3016743@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16724/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
rename js to kjs because of file conflict (kde#149840)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.21
retrieving revision 1.223.2.22
diff -u -r1.223.2.21 -r1.223.2.22
--- kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
+++ kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -141,6 +141,9 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# fix file conflict with js (kde#149840)
+mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
+
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -226,6 +229,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
+- rename js to kjs because of file conflict (kde#149840)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
 - actually install kde4.sh and kde4.csh
 - sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3



From fedora-extras-commits at redhat.com  Thu Sep 13 22:53:06 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 13 Sep 2007 18:53:06 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.84,1.85
Message-ID: <200709132253.l8DMr6o6017996@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17834

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
- Resolves #288711
- Ensure that all features are unpacked.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- eclipse-cdt.spec	10 Sep 2007 22:12:19 -0000	1.84
+++ eclipse-cdt.spec	13 Sep 2007 22:52:28 -0000	1.85
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -262,6 +262,14 @@
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.master*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.debug.gdbjtag*
 
+# Unpack all existing feature jars
+for x in ${RPM_BUILD_ROOT}/%{eclipse_base}/features/*.jar; do
+  dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'`
+  mkdir -p $dirname
+  unzip $x -d $dirname
+  rm $x
+done 
+
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.testing*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.gdbjtag*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.ant*
@@ -347,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
+- Resolves #288711
+- Ensure that all features are unpacked.
+
 * Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
 - Resolves #274551, #253331, #254246, #254248
 - Rebase Autotools to 0.9.3 



From fedora-extras-commits at redhat.com  Thu Sep 13 22:56:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 18:56:03 -0400
Subject: rpms/kernel/F-7 linux-2.6-libata-pata-dma-disable-option.patch, 1.1,
	1.2
Message-ID: <200709132256.l8DMu33D018098@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074

Modified Files:
	linux-2.6-libata-pata-dma-disable-option.patch 
Log Message:
fix libata DMA patch


linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pata-dma-disable-option.patch	13 Sep 2007 22:21:49 -0000	1.1
+++ linux-2.6-libata-pata-dma-disable-option.patch	13 Sep 2007 22:55:57 -0000	1.2
@@ -20,11 +20,22 @@
 
 Signed-off-by: Alan Cox <alan at redhat.com>
 
----
- Documentation/kernel-parameters.txt |    6 ++++++
- drivers/ata/libata-core.c           |   17 +++++++++++++++++
- 2 files changed, 23 insertions(+)
 
+--- linux-2.6.22.noarch.orig/include/linux/libata.h
++++ linux-2.6.22.noarch/include/linux/libata.h
+@@ -298,6 +298,12 @@ enum {
+ 	ATA_HORKAGE_NODMA	= (1 << 1),	/* DMA problems */
+ 	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */
+ 	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */
++
++	/* DMA mask for user DMA control: User visible values do not
++	   renumber */
++	ATA_DMA_MASK_ATA	= (1 << 0),	/* DMA on ATA Disk */
++	ATA_DMA_MASK_ATAPI	= (1 << 1),	/* DMA on ATAPI */
++	ATA_DMA_MASK_CFA	= (1 << 2),	/* DMA on CF Card */
+ };
+ 
+ enum hsm_task_states {
 --- linux-2.6.22.noarch.orig/drivers/ata/libata-core.c
 +++ linux-2.6.22.noarch/drivers/ata/libata-core.c
 @@ -93,6 +93,10 @@ static int ata_ignore_hpa = 0;



From fedora-extras-commits at redhat.com  Thu Sep 13 23:14:40 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 19:14:40 -0400
Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.7, 1.8 kernel-xen.spec, 1.55,
	1.56 sources, 1.7, 1.8 linux-2.6.21.6-xen-3.1.0.patch, 1.2, NONE
Message-ID: <200709132314.l8DNEe1J024331@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286

Modified Files:
	.cvsignore kernel-xen.spec sources 
Removed Files:
	linux-2.6.21.6-xen-3.1.0.patch 
Log Message:
Rebase to Linux 2.6.21.7

Use 'make upload' and compress the Xen patch because it is too big
(2.7 MB uncompressed).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jul 2007 14:13:44 -0000	1.7
+++ .cvsignore	13 Sep 2007 23:14:06 -0000	1.8
@@ -1,3 +1,4 @@
 xen-3.1.0-rc7-7041b52471c3.tar.bz2
-patch-2.6.21.6.bz2
 linux-2.6.21.tar.bz2
+patch-2.6.21.7.bz2
+linux-2.6.21.7-xen-3.1.0.patch.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kernel-xen.spec	13 Sep 2007 19:34:21 -0000	1.55
+++ kernel-xen.spec	13 Sep 2007 23:14:06 -0000	1.56
@@ -325,7 +325,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21.6.bz2
+Patch1: patch-2.6.21.7.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -462,10 +462,10 @@
 Patch910: linux-2.6-tux.patch
 
 # 950 - 999 Xen
-# linux-2.6.21.6-xen-3.1.0.patch patch generated by
-# 'hg diff -r4edbf98e9507 -r3990a07432f0' from
+# linux-2.6.21.7-xen-3.1.0.patch patch generated by
+# 'hg diff -rd91e11100fb0 -rd610071e6045 -X .hgtags' on
 # http://hg.et.redhat.com/kernel-dev/ehabkost/linux-2.6.21.y-xen-3.1.0
-Patch950: linux-2.6.21.6-xen-3.1.0.patch
+Patch950: linux-2.6.21.7-xen-3.1.0.patch.bz2
 Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch960: linux-2.6-xen-blkfront-wait-add.patch
 Patch961: linux-2.6-xen-backwards-time.patch
@@ -2369,6 +2369,9 @@
 
 %changelog
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Rebase to 2.6.21.7
+
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Fix for bug #248398: HVM domain hangs during (F-7) install.
   Backported fix from xen-unstable: 15239:656b8175f4f2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jul 2007 14:13:45 -0000	1.7
+++ sources	13 Sep 2007 23:14:06 -0000	1.8
@@ -1,3 +1,4 @@
 b73a966a55f3907020a1a29b4e2df64d  xen-3.1.0-rc7-7041b52471c3.tar.bz2
-f6941d0ddc39726042626e027fd3ed08  patch-2.6.21.6.bz2
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
+b9c8734471a454806c77f040fcf9869b  patch-2.6.21.7.bz2
+0b7a1468bcd3353b77494cbf0e97d2e4  linux-2.6.21.7-xen-3.1.0.patch.bz2


--- linux-2.6.21.6-xen-3.1.0.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 22:22:21 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 18:22:21 -0400
Subject: rpms/kernel/F-7 linux-2.6-futex-fix-traversal.patch, NONE,
	1.1 linux-2.6-libata-pata-dma-disable-option.patch, NONE,
	1.1 linux-2.6-libata-pata_it821x-dma.patch, NONE,
	1.1 linux-2.6-libata-pata_via-cable-detect.patch, NONE,
	1.1 linux-2.6-lvm-snapshot-deadlock-fix.patch, NONE,
	1.1 linux-2.6-scsi-mpt-vmware-fix.patch, NONE,
	1.1 linux-2.6-skb_copy_and_csum_datagram_iovec.patch, NONE,
	1.1 linux-2.6-usb-allow-1-byte-replies.patch, NONE,
	1.1 linux-2.6-usb-fixup-interval-lengths.patch, NONE,
	1.1 linux-2.6-usb-linked-list-insertion.patch, NONE,
	1.1 linux-2.6-usb-storage-initialize-huawei-e220-properly.patch,
	NONE, 1.1 patch-2.6.22.6.bz2.sign, NONE, 1.1 .cvsignore, 1.631,
	1.632 kernel-2.6.spec, 1.3340, 1.3341 sources, 1.594,
	1.595 upstream, 1.518, 1.519 patch-2.6.22.5.bz2.sign, 1.1,
	NONE patch-2.6.22.6-rc1.patch, 1.1, NONE
Message-ID: <200709132222.l8DMML2W017159@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-futex-fix-traversal.patch 
	linux-2.6-libata-pata-dma-disable-option.patch 
	linux-2.6-libata-pata_it821x-dma.patch 
	linux-2.6-libata-pata_via-cable-detect.patch 
	linux-2.6-lvm-snapshot-deadlock-fix.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-usb-allow-1-byte-replies.patch 
	linux-2.6-usb-fixup-interval-lengths.patch 
	linux-2.6-usb-linked-list-insertion.patch 
	linux-2.6-usb-storage-initialize-huawei-e220-properly.patch 
	patch-2.6.22.6.bz2.sign 
Removed Files:
	patch-2.6.22.5.bz2.sign patch-2.6.22.6-rc1.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.6 (official)
- libata: add option to disable DMA on PATA devices
- libata: fix DMA on ATAPI devices with it821x (#242229)
- libata: fix cable detection on pata_via
- fix vmware's broken SCSI device emulation (#241935)
- fix init of huawei 220 modem (#253096)
- LVM: fix hang and lockups during snapshot (#269541)
- net: fix oops with zero-length packet (#253290)
- USB: three trivial fixes
- futex: fix compat list traversal


linux-2.6-futex-fix-traversal.patch:

--- NEW FILE linux-2.6-futex-fix-traversal.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=179c85ea53bef807621f335767e41e23f86f01df
Commit:     179c85ea53bef807621f335767e41e23f86f01df
Parent:     a570ab6f10462b062c28188b64377b8034235761
Author:     Arnd Bergmann <arnd at arndb.de>
AuthorDate: Tue Sep 11 15:23:49 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Tue Sep 11 17:21:20 2007 -0700

    futex_compat: fix list traversal bugs
    
    The futex list traversal on the compat side appears to have
    a bug.
    
    It's loop termination condition compares:
    
            while (compat_ptr(uentry) != &head->list)
    
    But that can't be right because "uentry" has the special
    "pi" indicator bit still potentially set at bit 0.  This
    is cleared by fetch_robust_entry() into the "entry"
    return value.
    
    What this seems to mean is that the list won't terminate
    when list iteration gets back to the the head.  And we'll
    also process the list head like a normal entry, which could
    cause all kinds of problems.
    
    So we should check for equality with "entry".  That pointer
    is of the non-compat type so we have to do a little casting
    to keep the compiler and sparse happy.
    
    The same problem can in theory occur with the 'pending'
    variable, although that has not been reported from users
    so far.
    
    Based on the original patch from David Miller.
    
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: David Miller <davem at davemloft.net>
    Signed-off-by: Arnd Bergmann <arnd at arndb.de>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 kernel/futex_compat.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index f792136..7e52eb0 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
 	if (fetch_robust_entry(&upending, &pending,
 			       &head->list_op_pending, &pip))
 		return;
-	if (upending)
+	if (pending)
 		handle_futex_death((void __user *)pending + futex_offset, curr, pip);
 
-	while (compat_ptr(uentry) != &head->list) {
+	while (entry != (struct robust_list __user *) &head->list) {
 		/*
 		 * A pending lock might already be on the list, so
 		 * dont process it twice:

linux-2.6-libata-pata-dma-disable-option.patch:

--- NEW FILE linux-2.6-libata-pata-dma-disable-option.patch ---
This is useful when debugging, handling problem systems, or for
distributions just to get the system installed so it can be sorted
out later.

This is a bit smarter than the old IDE one and lets you do

libata.pata_dma=0		Disable all PATA DMA like old IDE
libata.pata_dma=1		Disk DMA only
libata.pata_dma=2		ATAPI DMA only
libata.pata_dma=4		CF DMA only

(or combinations thereof - 0,1,3 being the useful ones I suspect)

(I've split CF as it seems to be a seperate case of pain and suffering
different to the others and caused by assorted PIO wired adapters etc)

SATA is not affected - for one its not clear it makes sense to disable
DMA for SATA if even always possible, for two we've seen no failure 
evidence to justify needing to support this kind of hammer on SATA.

Signed-off-by: Alan Cox <alan at redhat.com>

---
 Documentation/kernel-parameters.txt |    6 ++++++
 drivers/ata/libata-core.c           |   17 +++++++++++++++++
 2 files changed, 23 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ata/libata-core.c
+++ linux-2.6.22.noarch/drivers/ata/libata-core.c
@@ -93,6 +93,10 @@ static int ata_ignore_hpa = 0;
 module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
 MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
 
+static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
+module_param_named(pata_dma, ata_pata_dma, int, 0644);
+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -2821,16 +2825,29 @@ int ata_do_set_mode(struct ata_port *ap,
 	/* step 1: calculate xfer_mask */
 	for (i = 0; i < ATA_MAX_DEVICES; i++) {
 		unsigned int pio_mask, dma_mask;
+		unsigned int mode_mask;
 
 		dev = &ap->device[i];
 
 		if (!ata_dev_enabled(dev))
 			continue;
 
+		mode_mask = ATA_DMA_MASK_ATA;
+		if (dev->class == ATA_DEV_ATAPI)
+			mode_mask = ATA_DMA_MASK_ATAPI;
+		else if (ata_id_is_cfa(dev->id))
+			mode_mask = ATA_DMA_MASK_CFA;
+
 		ata_dev_xfermask(dev);
 
 		pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
 		dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+
+		if ((ata_pata_dma & mode_mask) || ap->cbl == ATA_CBL_SATA)
+			dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		else
+			dma_mask = 0;
+
 		dev->pio_mode = ata_xfer_mask2mode(pio_mask);
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
--- linux-2.6.22.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.22.noarch/Documentation/kernel-parameters.txt
@@ -853,6 +853,12 @@ and is between 256 and 4096 characters. 
 	llsc*=		[IA64] See function print_params() in
 			arch/ia64/sn/kernel/llsc4.c.
 
+	libata.pata_dma= [LIBATA]
+		libata.pata_dma=0	Disable all PATA DMA like old IDE
+		libata.pata_dma=1	Disk DMA only
+		libata.pata_dma=2	ATAPI DMA only
+		libata.pata_dma=4	CF DMA only
+
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
 			See Documentation/ramdisk.txt.
 

linux-2.6-libata-pata_it821x-dma.patch:

--- NEW FILE linux-2.6-libata-pata_it821x-dma.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bce7d5e0e1fc0c1f1251b7f21a19cb48207408b6
Commit:     bce7d5e0e1fc0c1f1251b7f21a19cb48207408b6
Parent:     08ebd43d6b9b63de681b8f255c0fabae8033527c
Author:     Jeff Norden <jnorden at math.tntech.edu>
AuthorDate: Tue Sep 4 11:07:20 2007 -0500
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Mon Sep 10 21:53:00 2007 -0400

bz 242229

    pata_it821x: fix lost interrupt with atapi devices
    
    Fix "lost" interrupt problem when using dma with CD/DVD drives in some
    configurations.  This problem can make installing linux from media
    impossible for distro's that have switched to libata-only configurations.
    
    The simple fix is to eliminate the use of dma for reading drive status, etc,
    by checking the number of bytes to transferred.
    
    This change will only affect the behavior of atapi devices, not disks.
    There is more info at http://bugzilla.redhat.com/show_bug.cgi?id=242229
    This patch is for 2.6.22.1
    
    Signed-off-by: Jeff Norden <jnorden at math.tntech.edu>
    Reviewed-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/pata_it821x.c |    4 ++++
 1 file changed, 4 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ata/pata_it821x.c
+++ linux-2.6.22.noarch/drivers/ata/pata_it821x.c
@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct
 	struct ata_port *ap = qc->ap;
 	struct it821x_dev *itdev = ap->private_data;
 
+	/* Only use dma for transfers to/from the media. */
+	if (qc->nbytes < 2048)
+		return -EOPNOTSUPP;
+
 	/* No ATAPI DMA in smart mode */
 	if (itdev->smart)
 		return -EOPNOTSUPP;

linux-2.6-libata-pata_via-cable-detect.patch:

--- NEW FILE linux-2.6-libata-pata_via-cable-detect.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=08ebd43d6b9b63de681b8f255c0fabae8033527c
Commit:     08ebd43d6b9b63de681b8f255c0fabae8033527c
Parent:     897ee77bfba12b83752027427a41009961458ee6
Author:     Laurent Riffard <laurent.riffard at free.fr>
AuthorDate: Sun Sep 2 21:01:32 2007 +0200
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Mon Sep 10 21:50:24 2007 -0400

    Fix broken pata_via cable detection
    
    via_do_set_mode overwrites 80-wire cable detection bits. Let's
    preserve them.
    
    Signed-off-by: Laurent Riffard <laurent.riffard at free.fr>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/pata_via.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/ata/pata_via.c
+++ linux-2.6.22.noarch/drivers/ata/pata_via.c
@@ -240,7 +240,6 @@ static void via_do_set_mode(struct ata_p
 	int ut;
 	int offset = 3 - (2*ap->port_no) - adev->devno;
 
-
 	/* Calculate the timing values we require */
 	ata_timing_compute(adev, mode, &t, T, UT);
 
@@ -287,9 +286,17 @@ static void via_do_set_mode(struct ata_p
 			ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
 			break;
 	}
+
 	/* Set UDMA unless device is not UDMA capable */
-	if (udma_type)
-		pci_write_config_byte(pdev, 0x50 + offset, ut);
+	if (udma_type) {
+		u8 cable80_status;
+
+		/* Get 80-wire cable detection bit */
+		pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
+		cable80_status &= 0x10;
+
+		pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
+	}
 }
 
 static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)

linux-2.6-lvm-snapshot-deadlock-fix.patch:

--- NEW FILE linux-2.6-lvm-snapshot-deadlock-fix.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fcac03abd325e4f7a4cc8fe05fea2793b1c8eb75
Commit:     fcac03abd325e4f7a4cc8fe05fea2793b1c8eb75
Parent:     596f138eede0c113aa655937c8be85fc15ccd61c
Author:     Milan Broz <mbroz at redhat.com>
AuthorDate: Thu Jul 12 17:28:00 2007 +0100
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Thu Jul 12 15:01:08 2007 -0700

bz 269541

    dm snapshot: fix invalidation deadlock
    
    Process persistent exception store metadata IOs in a separate thread.
    
    A snapshot may become invalid while inside generic_make_request().
    A synchronous write is then needed to update the metadata while still
    inside that function.  Since the introduction of
    md-dm-reduce-stack-usage-with-stacked-block-devices.patch this has to
    be performed by a separate thread to avoid deadlock.
    
    Signed-off-by: Milan Broz <mbroz at redhat.com>
    Signed-off-by: Alasdair G Kergon <agk at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/md/dm-exception-store.c |   48 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/md/dm-exception-store.c
+++ linux-2.6.22.noarch/drivers/md/dm-exception-store.c
@@ -125,6 +125,8 @@ struct pstore {
 	uint32_t callback_count;
 	struct commit_callback *callbacks;
 	struct dm_io_client *io_client;
+
+	struct workqueue_struct *metadata_wq;
 };
 
 static inline unsigned int sectors_to_pages(unsigned int sectors)
@@ -156,10 +158,24 @@ static void free_area(struct pstore *ps)
 	ps->area = NULL;
 }
 
+struct mdata_req {
+	struct io_region *where;
+	struct dm_io_request *io_req;
+	struct work_struct work;
+	int result;
+};
+
+static void do_metadata(struct work_struct *work)
+{
+	struct mdata_req *req = container_of(work, struct mdata_req, work);
+
+	req->result = dm_io(req->io_req, 1, req->where, NULL);
+}
+
 /*
  * Read or write a chunk aligned and sized block of data from a device.
  */
-static int chunk_io(struct pstore *ps, uint32_t chunk, int rw)
+static int chunk_io(struct pstore *ps, uint32_t chunk, int rw, int metadata)
 {
 	struct io_region where = {
 		.bdev = ps->snap->cow->bdev,
@@ -173,8 +189,23 @@ static int chunk_io(struct pstore *ps, u
 		.client = ps->io_client,
 		.notify.fn = NULL,
 	};
+	struct mdata_req req;
+
+	if (!metadata)
+		return dm_io(&io_req, 1, &where, NULL);
 
-	return dm_io(&io_req, 1, &where, NULL);
+	req.where = &where;
+	req.io_req = &io_req;
+
+	/*
+	 * Issue the synchronous I/O from a different thread
+	 * to avoid generic_make_request recursion.
+	 */
+	INIT_WORK(&req.work, do_metadata);
+	queue_work(ps->metadata_wq, &req.work);
+	flush_workqueue(ps->metadata_wq);
+
+	return req.result;
 }
 
 /*
@@ -189,7 +220,7 @@ static int area_io(struct pstore *ps, ui
 	/* convert a metadata area index to a chunk index */
 	chunk = 1 + ((ps->exceptions_per_area + 1) * area);
 
-	r = chunk_io(ps, chunk, rw);
+	r = chunk_io(ps, chunk, rw, 0);
 	if (r)
 		return r;
 
@@ -230,7 +261,7 @@ static int read_header(struct pstore *ps
 	if (r)
 		return r;
 
-	r = chunk_io(ps, 0, READ);
+	r = chunk_io(ps, 0, READ, 1);
 	if (r)
 		goto bad;
 
@@ -292,7 +323,7 @@ static int write_header(struct pstore *p
 	dh->version = cpu_to_le32(ps->version);
 	dh->chunk_size = cpu_to_le32(ps->snap->chunk_size);
 
-	return chunk_io(ps, 0, WRITE);
+	return chunk_io(ps, 0, WRITE, 1);
 }
 
 /*
@@ -409,6 +440,7 @@ static void persistent_destroy(struct ex
 {
 	struct pstore *ps = get_info(store);
 
+	destroy_workqueue(ps->metadata_wq);
 	dm_io_client_destroy(ps->io_client);
 	vfree(ps->callbacks);
 	free_area(ps);
@@ -589,6 +621,12 @@ int dm_create_persistent(struct exceptio
 	atomic_set(&ps->pending_count, 0);
 	ps->callbacks = NULL;
 
+	ps->metadata_wq = create_singlethread_workqueue("ksnaphd");
+	if (!ps->metadata_wq) {
+		DMERR("couldn't start header metadata update thread");
+		return -ENOMEM;
+	}
+
 	store->destroy = persistent_destroy;
 	store->read_metadata = persistent_read_metadata;
 	store->prepare_exception = persistent_prepare;

linux-2.6-scsi-mpt-vmware-fix.patch:

--- NEW FILE linux-2.6-scsi-mpt-vmware-fix.patch ---
The attached patch is a workaround for a bug in VMWare's emulated LSI
Fusion SCSI HBA.  The emulated firmware returns zero for the maximum
number of attached devices; the real firmware returns a positive
number.  Therefore, the kernel that boots and works fine on bare metal
will fail on VMWare because this firmware value is handed to the SCSI
midlayer, which then skips the entire bus scan.

F7 bz 241935

The patch below was submitted by Eric Moore of LSI to the linux-scsi
mailing list:

http://marc.info/?l=linux-scsi&m=117432237404247

then immediately rejected by Christoph Hellwig, who prefers that
VMWare fix their emulation instead.

---
 drivers/message/fusion/mptbase.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/message/fusion/mptbase.c
+++ linux-2.6.22.noarch/drivers/message/fusion/mptbase.c
@@ -2573,8 +2573,19 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
 	pfacts->MaxPersistentIDs = le16_to_cpu(pfacts->MaxPersistentIDs);
 	pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets);
 
-	max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID :
-	    pfacts->MaxDevices;
+	switch (ioc->bus_type) {
+	case SAS:
+		max_id = pfacts->PortSCSIID;
+		break;
+	case FC:
+		max_id = pfacts->MaxDevices;
+		break;
+	case SPI:
+	default:
+		max_id = MPT_MAX_SCSI_DEVICES;
+		break;
+	}
+
 	ioc->devices_per_bus = (max_id > 255) ? 256 : max_id;
 	ioc->number_of_buses = (ioc->devices_per_bus < 256) ? 1 : max_id/256;
 

linux-2.6-skb_copy_and_csum_datagram_iovec.patch:

--- NEW FILE linux-2.6-skb_copy_and_csum_datagram_iovec.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ef8aef55ce61fd0e2af798695f7386ac756ae1e7
Commit:     ef8aef55ce61fd0e2af798695f7386ac756ae1e7
Parent:     2fbe43f6f631dd7ce19fb1499d6164a5bdb34568
Author:     Herbert Xu <herbert at gondor.apana.org.au>
AuthorDate: Thu Sep 6 14:06:35 2007 +0100
Committer:  David S. Miller <davem at kimchee.(none)>
CommitDate: Tue Sep 11 10:29:07 2007 +0200

    [NET]: Do not dereference iov if length is zero
    
    When msg_iovlen is zero we shouldn't try to dereference
    msg_iov.  Right now the only thing that tries to do so
    is skb_copy_and_csum_datagram_iovec.  Since the total
    length should also be zero if msg_iovlen is zero, it's
    sufficient to check the total length there and simply
    return if it's zero.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/core/datagram.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/core/datagram.c b/net/core/datagram.c
index cb056f4..029b93e 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
 	__wsum csum;
 	int chunk = skb->len - hlen;
 
+	if (!chunk)
+		return 0;
+
 	/* Skip filled elements.
 	 * Pretty silly, look at memcpy_toiovec, though 8)
 	 */

linux-2.6-usb-allow-1-byte-replies.patch:

--- NEW FILE linux-2.6-usb-allow-1-byte-replies.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=46dede4690bbb23a2c9d60561e2e4fdc3e6bee61
Commit:     46dede4690bbb23a2c9d60561e2e4fdc3e6bee61
Parent:     f095137e799ddb6a7c2bf0e4c73cda193ab9df41
Author:     Alan Stern <stern at rowland.harvard.edu>
AuthorDate: Tue Aug 14 10:56:10 2007 -0400
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Wed Aug 22 14:27:49 2007 -0700

    USB: accept 1-byte Device Status replies, fixing some b0rken devices
    
    Some devices have a bug which causes them to send a 1-byte reply to
    Get-Device-Status requests instead of 2 bytes as required by the
    spec.  This doesn't play well with autosuspend, since we look for a
    valid status reply to make sure the device is still present when it
    resumes.  Without both bytes, we assume the device has been
    disconnected.
    
    Lack of the second byte shouldn't matter much, since the spec requires
    it always to be equal to 0.  Hence this patch (as959) causes
    finish_port_resume() to accept a 1-byte reply as valid.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Acked-by: David Brownell <david-b at pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

    [<cebbert at redhat.com>: reworked for 2.6.22]
    [<cebbert at redhat.com>: made test more careful]
---
 drivers/usb/core/hub.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/usb/core/hub.c
+++ linux-2.6.22.noarch/drivers/usb/core/hub.c
@@ -1719,7 +1719,7 @@ int usb_port_suspend(struct usb_device *
 static int finish_port_resume(struct usb_device *udev)
 {
 	int	status;
-	u16	devstatus;
+	u16	devstatus = 0;
 
 	/* caller owns the udev device lock */
 	dev_dbg(&udev->dev, "finish resume\n");
@@ -1739,7 +1739,7 @@ static int finish_port_resume(struct usb
 	 */
 	status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
 	if (status >= 0)
-		status = (status == 2 ? 0 : -ENODEV);
+		status = (status == 2 || status == 1) ? 0 : -ENODEV;
 
 	if (status)
 		dev_dbg(&udev->dev,

linux-2.6-usb-fixup-interval-lengths.patch:

--- NEW FILE linux-2.6-usb-fixup-interval-lengths.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=300871cd963e24a68aaa9b762f4a10403697d9be
Commit:     300871cd963e24a68aaa9b762f4a10403697d9be
Parent:     87d093e25d73249ae92b28ae88db92eaea7df70f
Author:     Laurent Pinchart <laurent.pinchart at skynet.be>
AuthorDate: Tue Jun 12 21:47:17 2007 +0200
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Thu Jul 12 16:34:37 2007 -0700

    USB: Fix up full-speed bInterval values in high-speed interrupt descriptor
    
    Many device manufacturers are using full-speed bInterval values in high-speed
    interrupt endpoint descriptors. If the bInterval value is greater than 16,
    assume the device uses full-speed descriptors and fix the value accordingly.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart at skynet.be>
    Acked-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/usb/core/config.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 9152e12..5e113db 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -85,15 +85,21 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
 	memcpy(&endpoint->desc, d, n);
 	INIT_LIST_HEAD(&endpoint->urb_list);
 
-	/* If the bInterval value is outside the legal range,
-	 * set it to a default value: 32 ms */
+	/* Fix up bInterval values outside the legal range. Use 32 ms if no
+	 * proper value can be guessed. */
 	i = 0;		/* i = min, j = max, n = default */
 	j = 255;
 	if (usb_endpoint_xfer_int(d)) {
 		i = 1;
 		switch (to_usb_device(ddev)->speed) {
 		case USB_SPEED_HIGH:
-			n = 9;		/* 32 ms = 2^(9-1) uframes */
+			/* Many device manufacturers are using full-speed
+			 * bInterval values in high-speed interrupt endpoint
+			 * descriptors. Try to fix those and fall back to a
+			 * 32 ms default value otherwise. */
+			n = fls(d->bInterval*8);
+			if (n == 0)
+				n = 9;	/* 32 ms = 2^(9-1) uframes */
 			j = 16;
 			break;
 		default:		/* USB_SPEED_FULL or _LOW */

linux-2.6-usb-linked-list-insertion.patch:

--- NEW FILE linux-2.6-usb-linked-list-insertion.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e5dd01154c1e9ca2400f4682602d1a4fa54c25dd
Commit:     e5dd01154c1e9ca2400f4682602d1a4fa54c25dd
Parent:     ce05916f6bf9906fba88853078715f9a4d300237
Author:     Nathael Pajani <nathael.pajani at cpe.fr>
AuthorDate: Tue Sep 4 11:46:23 2007 +0200
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Tue Sep 11 07:48:15 2007 -0700

    USB: fix linked list insertion bugfix for usb core
    
    This patch fixes the order of list_add_tail() arguments in
    usb_store_new_id() so the list can have more than one single element.
    
    Signed-off-by: Nathael Pajani <nathael.pajani at cpe.fr>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/usb/core/driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index a1ad11d..63b1243 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -60,7 +60,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
 	dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
 
 	spin_lock(&dynids->lock);
-	list_add_tail(&dynids->list, &dynid->node);
+	list_add_tail(&dynid->node, &dynids->list);
 	spin_unlock(&dynids->lock);
 
 	if (get_driver(driver)) {

linux-2.6-usb-storage-initialize-huawei-e220-properly.patch:

--- NEW FILE linux-2.6-usb-storage-initialize-huawei-e220-properly.patch ---
>From johann.wilhelm at student.tugraz.at  Sun Sep  9 08:19:38 2007
From: Johann Wilhelm <johann.wilhelm at student.tugraz.at>
Date: Wed, 05 Sep 2007 13:49:29 +0200
Subject: USB: usb-storage: Initialize Huawei E220 properly
To: linux-usb-devel at lists.sourceforge.net
Cc: greg at kroah.com, drussell at redhat.com
Message-ID: <20070905134929.5fv51ji2v40gkw0c at webmail.tugraz.at>
Content-Disposition: inline

bz 253096

From: Johann Wilhelm <johann.wilhelm at student.tugraz.at>

This is a reworked version of this patch:
http://www.mail-archive.com/linux-usb-devel%40lists.sourceforge.net/msg55094/activate_huawei_dev.patch

That properly initializes the HUAWEI E220 devices into multi-port mode.

Signed-off-by: Johann Wilhelm <johann.wilhelm at student.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/usb/storage/initializers.c |   14 ++++++++++++++
 drivers/usb/storage/initializers.h |    3 +++
 drivers/usb/storage/unusual_devs.h |   11 +++++++++++
 3 files changed, 28 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/usb/storage/initializers.c
+++ linux-2.6.22.noarch/drivers/usb/storage/initializers.c
@@ -90,3 +90,17 @@ int usb_stor_ucr61s2b_init(struct us_dat
 
 	return (res ? -1 : 0);
 }
+
+/* This places the HUAWEI E220 devices in multi-port mode */
+int usb_stor_huawei_e220_init(struct us_data *us)
+{
+	int result;
+
+	us->iobuf[0] = 0x1;
+	result = usb_stor_control_msg(us, us->send_ctrl_pipe,
+				      USB_REQ_SET_FEATURE,
+				      USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+				      0x01, 0x0, us->iobuf, 0x1, 1000);
+	US_DEBUGP("usb_control_msg performing result is %d\n", result);
+	return (result ? 0 : -1);
+}
--- linux-2.6.22.noarch.orig/drivers/usb/storage/initializers.h
+++ linux-2.6.22.noarch/drivers/usb/storage/initializers.h
@@ -47,3 +47,6 @@ int usb_stor_euscsi_init(struct us_data 
 /* This function is required to activate all four slots on the UCR-61S2B
  * flash reader */
 int usb_stor_ucr61s2b_init(struct us_data *us);
+
+/* This places the HUAWEI E220 devices in multi-port mode */
+int usb_stor_huawei_e220_init(struct us_data *us);
--- linux-2.6.22.noarch.orig/drivers/usb/storage/unusual_devs.h
+++ linux-2.6.22.noarch/drivers/usb/storage/unusual_devs.h
@@ -1394,6 +1394,17 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_IGNORE_RESIDUE ),
 
+/* Reported by fangxiaozhi <fangxiaozhi60675 at huawei.com>
+ * and by linlei <linlei83 at huawei.com>
+ * Patch reworked by Johann Wilhelm <johann.wilhelm at student.tugraz.at>
+ * This brings the HUAWEI E220 devices into multi-port mode
+ */
+UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000,
+		"HUAWEI MOBILE",
+		"Mass Storage",
+		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
+		0),
+
 /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
 UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,
 		"Minolta",


--- NEW FILE patch-2.6.22.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG17R8yGugalF9Dw4RAnFOAJ9oLLhlBcFaSr/lBib0QoQJ+2mhlwCeLrUk
j84LtxB51tt2Mxnvkl8kzUU=
=/XAz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- .cvsignore	23 Aug 2007 18:20:55 -0000	1.631
+++ .cvsignore	13 Sep 2007 22:21:49 -0000	1.632
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.5.bz2
+patch-2.6.22.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3340
retrieving revision 1.3341
diff -u -r1.3340 -r1.3341
--- kernel-2.6.spec	12 Sep 2007 22:35:48 -0000	1.3340
+++ kernel-2.6.spec	13 Sep 2007 22:21:49 -0000	1.3341
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 5
+%define stable_update 6
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -498,7 +498,8 @@
 
 %if !%{nopatches}
 
-Patch02: patch-2.6.22.6-rc1.patch
+# -stable RC
+# Patch02: patch-2.6.22.6-rc1.patch
 
 # Revert -stable pieces we get from elsewhere
 Patch05: linux-2.6-softmac-fix-essid-problem_R.patch
@@ -564,14 +565,20 @@
 Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
 Patch390: linux-2.6-dev-get-driver-properly.patch
+
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-aacraid-ioctl-security.patch
 Patch402: linux-2.6-scsi-async-scanning.patch
 Patch403: linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
+Patch404: linux-2.6-scsi-mpt-vmware-fix.patch
+
 Patch420: linux-2.6-squashfs.patch
 Patch422: linux-2.6-gfs2-update.patch
 Patch423: linux-2.6-gfs-locking-exports.patch
+
 Patch430: linux-2.6-net-silence-noisy-printks.patch
+Patch435: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -586,14 +593,21 @@
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch620: linux-2.6-defaults-unicode-vt.patch
 Patch630: linux-2.6-defaults-nonmi.patch
+
+Patch650: linux-2.6-lvm-snapshot-deadlock-fix.patch
+
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch662: linux-2.6-ata-update-noncq.patch
 Patch663: linux-2.6-ata-quirk.patch
 Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
 Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 Patch671: linux-2.6-libata-pata_ali-fix-hp-detect.patch
-Patch673: linux-2.6-libata-simplify-init.patch
-Patch674: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch672: linux-2.6-libata-pata-dma-disable-option.patch
+Patch673: linux-2.6-libata-pata_it821x-dma.patch
+Patch674: linux-2.6-libata-pata_via-cable-detect.patch
+Patch675: linux-2.6-libata-simplify-init.patch
+Patch676: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+
 Patch680: linux-2.6-rtl8187.patch
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
@@ -614,7 +628,13 @@
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
 Patch760: linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
-#Patch780: linux-2.6-clockevents-fix-resume-logic.patch
+Patch771: linux-2.6-futex-fix-traversal.patch
+
+Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
+Patch781: linux-2.6-usb-allow-1-byte-replies.patch
+Patch782: linux-2.6-usb-fixup-interval-lengths.patch
+Patch783: linux-2.6-usb-linked-list-insertion.patch
+
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
@@ -1079,8 +1099,8 @@
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
-# stable RC patch
-ApplyPatch patch-2.6.22.6-rc1.patch
+# -stable RC
+# ApplyPatch patch-2.6.22.6-rc1.patch
 
 %if !%{nopatches}
 
@@ -1237,6 +1257,8 @@
 ApplyPatch linux-2.6-scsi-async-scanning.patch
 # fix 3ware 9000 DMA fallback
 ApplyPatch linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
+# fix vmware's broken emulation of SCSI controller
+ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1249,6 +1271,8 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
+# fix oops when skb has zero length
+ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1286,6 +1310,9 @@
 # Disable NMI watchdog by default.
 ApplyPatch linux-2.6-defaults-nonmi.patch
 
+# fix LVM deadlock
+ApplyPatch linux-2.6-lvm-snapshot-deadlock-fix.patch
+
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
@@ -1299,6 +1326,12 @@
 ApplyPatch linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 # fix wrong DMI detect logic for HP notebook
 ApplyPatch linux-2.6-libata-pata_ali-fix-hp-detect.patch
+# add libata.pata_dma kernel option
+ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
+# fix DMA on ATAPI devices with it821x
+ApplyPatch linux-2.6-libata-pata_it821x-dma.patch
+# fix cable detection on pata_via
+ApplyPatch linux-2.6-libata-pata_via-cable-detect.patch
 # fix Pegasos libata glitches
 ApplyPatch linux-2.6-libata-simplify-init.patch
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
@@ -1351,9 +1384,18 @@
 ApplyPatch linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
+# futex: fix compat list traveral
+ApplyPatch linux-2.6-futex-fix-traversal.patch
 
 # USB
 #
+# fix init of huawei device
+ApplyPatch linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
+# trivial USB fixes
+ApplyPatch linux-2.6-usb-allow-1-byte-replies.patch
+ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
+ApplyPatch linux-2.6-usb-linked-list-insertion.patch
+
 
 # ACPI patches
 
@@ -2310,6 +2352,18 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.6 (official)
+- libata: add option to disable DMA on PATA devices
+- libata: fix DMA on ATAPI devices with it821x (#242229)
+- libata: fix cable detection on pata_via
+- fix vmware's broken SCSI device emulation (#241935)
+- fix init of huawei 220 modem (#253096)
+- LVM: fix hang and lockups during snapshot (#269541)
+- net: fix oops with zero-length packet (#253290)
+- USB: three trivial fixes
+- futex: fix compat list traversal
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - update CFS scheduler
 
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- sources	23 Aug 2007 18:20:55 -0000	1.594
+++ sources	13 Sep 2007 22:21:49 -0000	1.595
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-27544a58763bbd4ce497a77658af744a  patch-2.6.22.5.bz2
+f2948e364ab3e4736b9e34f02173472f  patch-2.6.22.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- upstream	23 Aug 2007 18:20:55 -0000	1.518
+++ upstream	13 Sep 2007 22:21:49 -0000	1.519
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.5.bz2
+patch-2.6.22.6.bz2


--- patch-2.6.22.5.bz2.sign DELETED ---


--- patch-2.6.22.6-rc1.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 23:34:20 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:34:20 -0400
Subject: rpms/mlton/devel mlton.spec,1.12,1.13
Message-ID: <200709132334.l8DNYKYP024583@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24565

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
- Bootstrap x86_64



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlton.spec	28 Aug 2007 00:06:24 -0000	1.12
+++ mlton.spec	13 Sep 2007 23:33:47 -0000	1.13
@@ -1,18 +1,20 @@
 %define mlton_bootstrap 0
+%ifarch x86_64
+%define mlton_bootstrap 1
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	MIT
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
 %if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1:	mlton-bootstrap.i386.tar.bz2
-Source2:	mlton-bootstrap.ppc.tar.bz2
+Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 %endif
 
 Patch0:		mlton-20070826-debuginfo.patch
@@ -27,11 +29,8 @@
 
 Requires:	gmp-devel gcc
 
-# not yet available for 64-bit arch (#198764)
-ExcludeArch:	x86_64 ppc64
-
-# triggers GCC ICE on ppc (investigating...)
-ExcludeArch:	ppc
+# triggers GCC ICE on ppc (#268281)
+ExcludeArch:	ppc ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -50,14 +49,9 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%ifarch i386
 %setup -T -D -q -a 1
-%endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
-	bootstrap/usr/bin/mlton
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
+	usr/bin/mlton
 %endif
 
 # Filter unwanted Requires:
@@ -73,8 +67,8 @@
 
 %build
 %if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
 %endif
 
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
 * Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
 - Exclude ppc for now (GCC internal compiler error!)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 23:36:19 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:36:19 -0400
Subject: rpms/mlton/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709132336.l8DNaJQa024632@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24612

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
- Bootstrap x86_64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 12:29:30 -0000	1.4
+++ .cvsignore	13 Sep 2007 23:35:47 -0000	1.5
@@ -1 +1,2 @@
+mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 12:29:30 -0000	1.4
+++ sources	13 Sep 2007 23:35:47 -0000	1.5
@@ -1 +1,2 @@
+a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 23:47:56 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:47:56 -0400
Subject: rpms/mlton/devel mlton.spec,1.13,1.14
Message-ID: <200709132347.l8DNluE3024889@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24868

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
- Do not condition bootstrap source tag



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlton.spec	13 Sep 2007 23:33:47 -0000	1.13
+++ mlton.spec	13 Sep 2007 23:47:23 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -13,9 +13,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-%if %{mlton_bootstrap}
 Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
-%endif
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -103,6 +101,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
+- Do not condition bootstrap source tag
+
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
 - Bootstrap x86_64
 



From fedora-extras-commits at redhat.com  Fri Sep 14 00:23:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 20:23:21 -0400
Subject: fedora-security/audit epel5,1.2,1.3
Message-ID: <200709140023.l8E0NLRN031469@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31447

Modified Files:
	epel5 
Log Message:
Process a bunch more epel5 packages



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epel5	5 Sep 2007 04:53:03 -0000	1.2
+++ epel5	14 Sep 2007 00:23:19 -0000	1.3
@@ -3,112 +3,115 @@
 # *CVE are items that need verification for EPEL-5
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070829
-# Up to date EPEL5 as of 
+# Up to date CVE as of CVE email 20070910
+# Up to date EPEL5 as of 20070910
 #
-*CVE-2007-4631 VULNERABLE (qgit) #268381
-*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-*CVE-2007-4560 VULNERABLE (clamav) #260583
-*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
-*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
-*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
-*CVE-2007-4400 VULNERABLE (konversation) #253545
-*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
-*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
-*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3725 ** (clamav)
-*CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
-*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
-*CVE-2007-3528 version (dar, fixed 2.3.4) #246760 [since FEDORA-2007-0904]
+*CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
+CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4631 version (qgit, fixed 1.5.7) #268381
+CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
+CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+*CVE-2007-4462 version (po4a) #253541
+CVE-2007-4400 VULNERABLE (konversation) #253545
+CVE-2007-4323 backport (denyhosts) #252291
+*CVE-2007-4321 backport (fail2ban) #252290
+CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3725 ** (clamav)
+CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
+CVE-2007-3555 version (moodle) #247528 
+CVE-2007-3528 version (dar, fixed 2.3.4) #246760
 *CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
-*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
-*CVE-2007-3025 ignore (clamav, Solaris only)
-*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
-*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
-*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
-*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
-*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
+CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
+CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3113 VULNERABLE (cacti) #243592
+CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3025 ignore (clamav, Solaris only)
+CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489
+CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
+CVE-2007-2650 VULNERABLE (clamav, fixed 0.90.3) #240395
+CVE-2007-2637 patch (moin, fixed 1.5.7-2)
+CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
 *CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
-*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
-*CVE-2007-2165 VULNERABLE (proftpd) #237533
-*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
-*CVE-2007-1997 version (clamav, fixed in 0.90.2)
-*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
-*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
-*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
+CVE-2007-2245 version (phpMyAdmin, fixed 2.10.1) #237882
+CVE-2007-2165 VULNERABLE (proftpd) #237533
+CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
+CVE-2007-1997 VULNERABLE (clamav, fixed in 0.90.2)
+CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1745 VULNERABLE (clamav, fixed in 0.90.2) #236703
+CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
+CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
 *CVE-2007-1515 version (imp, fixed 4.1.4)
 *CVE-2007-1474 version (horde, fixed 3.1.4)
 *CVE-2007-1474 ignore (imp, < 4.x only)
 *CVE-2007-1473 version (horde, fixed 3.1.4)
-*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
-*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
-*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
-*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
-*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
+CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
+CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
+CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
+CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
+CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1263 version (gpgme, fixed 1.1.4)
 *CVE-2007-1055 version (mediawiki, fixed 1.8.3)
 *CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
-*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0898 version (clamav, fixed 0.90) #229202
-*CVE-2007-0897 version (clamav, fixed 0.90) #229202
+CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
+CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
+CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229202
+CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229202
 *CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
-*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
-*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
+CVE-2007-0857 version (moin, fixed 1.5.7) #228139
+CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
 *CVE-2007-0469 version (rubygems, fixed 0.9.1)
-*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
-*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
+CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
+CVE-2007-0242 VULNERABLE (qt4, fixed 4.2.3-7)
+CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
 *CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
-*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
-*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
-*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
-*CVE-2006-6481 version (clamav, fixed 0.88.7)
-*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
+CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
+CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
+CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
+CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
+CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
+CVE-2006-6481 VULNERABLE (clamav, fixed 0.88.7)
+CVE-2006-6406 VULNERABLE (clamav, fixed 0.88.7) #219095
 *CVE-2006-6374 ** (phpMyAdmin) #218853
-*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
-*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
+CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
+CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
 *CVE-2006-6235 patch (gnupg2, fixed 2.0.1-2) #218821
-*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
-*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 *CVE-2006-6169 version (gnupg2, fixed 2.0.1) #217950
 *CVE-2006-6085 version (kile, fixed 1.9.3) #217238
-*CVE-2006-5874 version (clamav, fixed 0.88.1)
-*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
-*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
+CVE-2006-5874 version (clamav, fixed 0.88.1)
+CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355



From fedora-extras-commits at redhat.com  Fri Sep 14 00:37:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 17:37:19 -0700
Subject: [pkgdb] pyzor (Fedora EPEL, 5) updated by kevin
Message-ID: <200709140037.l8E0bMqU015004@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for pyzor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyzor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyzor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyzor (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 00:37:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 17:37:19 -0700
Subject: [pkgdb] pyzor (Fedora EPEL, 4) updated by kevin
Message-ID: <200709140037.l8E0bNsb015013@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for pyzor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyzor (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyzor (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyzor (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 00:54:18 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 20:54:18 -0400
Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.14,
	1.15 python-sqlalchemy.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <200709140054.l8E0sIYw032373@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32347

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:
- Update to 0.4beta5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Aug 2007 21:52:02 -0000	1.14
+++ .cvsignore	14 Sep 2007 00:53:48 -0000	1.15
@@ -1 +1 @@
-SQLAlchemy-0.4.0beta4.tar.gz
+SQLAlchemy-0.4.0beta5.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-sqlalchemy.spec	1 Sep 2007 04:55:09 -0000	1.21
+++ python-sqlalchemy.spec	14 Sep 2007 00:53:48 -0000	1.22
@@ -3,11 +3,11 @@
 
 
 %define srcname SQLAlchemy
-%define betaver beta4
+%define betaver beta5
 
 Name:           python-sqlalchemy
 Version:        0.4.0
-Release:        0.3.%{betaver}%{?dist}
+Release:        0.4.%{betaver}%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -44,10 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} --always-unzip dist/*.egg
-cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-mv sqlalchemy ..
-ln -s ../sqlalchemy .
+python setup.py install --root $RPM_BUILD_ROOT
+#PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} easy_install --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg 'SQLAlchemy==%{version}%{betaver}'
+#cd $RPM_BUILD_ROOT%{python_sitelib}
+#rm site.py*
+#mv easy-install.pth sqlalchemy.pth
+
+#cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
+#mv sqlalchemy ..
+#ln -s ../sqlalchemy .
 
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
@@ -59,10 +64,15 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE PKG-INFO CHANGES doc examples
-%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-%{python_sitelib}/sqlalchemy/
+%{python_sitelib}/*
 
 %changelog
+* Tue Sep 11 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta5
+- Update to 0.4beta5.
+
+* Fri Sep 06 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta4
+- setuptools has been fixed.
+
 * Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
 - setuptools seems to be broken WRT having an active and inactive version
   of an egg.  Have to make both versions inactive and manually setup a copy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Aug 2007 21:52:02 -0000	1.14
+++ sources	14 Sep 2007 00:53:48 -0000	1.15
@@ -1 +1 @@
-97b00cfba5bcb7cc947320a66c2ce085  SQLAlchemy-0.4.0beta4.tar.gz
+b00125102578a603497bfb0dcc72473c  SQLAlchemy-0.4.0beta5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 01:00:20 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 21:00:20 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.22,1.23
Message-ID: <200709140100.l8E10KQQ032564@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32526

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Remove commented egg experimenting code.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-sqlalchemy.spec	14 Sep 2007 00:53:48 -0000	1.22
+++ python-sqlalchemy.spec	14 Sep 2007 00:59:47 -0000	1.23
@@ -45,14 +45,6 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
 python setup.py install --root $RPM_BUILD_ROOT
-#PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} easy_install --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg 'SQLAlchemy==%{version}%{betaver}'
-#cd $RPM_BUILD_ROOT%{python_sitelib}
-#rm site.py*
-#mv easy-install.pth sqlalchemy.pth
-
-#cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-#mv sqlalchemy ..
-#ln -s ../sqlalchemy .
 
 # remove unnecessary scripts for building documentation
 rm -rf doc/build



From fedora-extras-commits at redhat.com  Fri Sep 14 01:15:36 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 13 Sep 2007 21:15:36 -0400
Subject: rpms/xchat-gnome/devel xchat-gnome-0.18-reconnect.patch, NONE,
	1.1 xchat-gnome.spec, 1.44, 1.45
Message-ID: <200709140115.l8E1FaRj006279@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6245

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.18-reconnect.patch 
Log Message:
* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-5
- Add patch to fix reconnect bug. (#225408)


xchat-gnome-0.18-reconnect.patch:

--- NEW FILE xchat-gnome-0.18-reconnect.patch ---
--- trunk/plugins/net-monitor/net-monitor.c	2007/09/12 22:18:13	2568
+++ trunk/plugins/net-monitor/net-monitor.c	2007/09/13 01:25:13	2569
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include "xchat-plugin.h"
 
 #define NET_MONITOR_VERSION     "0.1"
@@ -166,6 +169,13 @@
 
 		g_hash_table_foreach (networks, (GHFunc) disconnect_from_network, NULL);
 	} else {
+		/*
+		 * We need to tell the nameserver resolver to reread
+		 * /etc/resolve.conf, since the nameservers might have changed
+		 * when moving between networks.
+		 */
+		res_init();
+
 		g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL);
 	}
 }


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xchat-gnome.spec	21 Aug 2007 17:50:37 -0000	1.44
+++ xchat-gnome.spec	14 Sep 2007 01:15:03 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-config.patch
+Patch1:		%{name}-%{version}-reconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .reconnect
 
 
 %build
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-5
+- Add patch to fix reconnect bug. (#225408)
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 01:24:06 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 21:24:06 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.23,1.24
Message-ID: <200709140124.l8E1O62B006531@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6482

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Testing new getnotifylist.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-sqlalchemy.spec	14 Sep 2007 00:59:47 -0000	1.23
+++ python-sqlalchemy.spec	14 Sep 2007 01:23:34 -0000	1.24
@@ -126,11 +126,3 @@
 
 * Wed May 31 2006 Shahms E. King <shahms at shahms.com> 0.2.1-1
 - Update to new upstream version
-
-* Tue May 16 2006 Shahms E. King <shahms at shahms.com> 0.1.7-1
-- Update to new upstream version
-- Point URL to direct link, not sourceforge redirect
-- Remove unnecessary document build scripts
-
-* Fri Apr 14 2006 Shahms E. King <shahms at shahms.com> 0.1.6-1
-- Initial package



From fedora-extras-commits at redhat.com  Fri Sep 14 01:35:36 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 21:35:36 -0400
Subject: rpms/mlton/devel .cvsignore, 1.5, 1.6 mlton.spec, 1.14, 1.15 sources,
	1.5, 1.6
Message-ID: <200709140135.l8E1ZaEd006803@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6776

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
unbootstrap


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Sep 2007 23:35:47 -0000	1.5
+++ .cvsignore	14 Sep 2007 01:35:04 -0000	1.6
@@ -1,2 +1 @@
-mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlton.spec	13 Sep 2007 23:47:23 -0000	1.14
+++ mlton.spec	14 Sep 2007 01:35:04 -0000	1.15
@@ -1,11 +1,11 @@
 %define mlton_bootstrap 0
-%ifarch x86_64
-%define mlton_bootstrap 1
-%endif
+#%ifarch x86_64
+#%define mlton_bootstrap 1
+#%endif
 
 Name:		mlton
 Version:	20070826
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -13,7 +13,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
+#Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Sep 2007 23:35:47 -0000	1.5
+++ sources	14 Sep 2007 01:35:04 -0000	1.6
@@ -1,2 +1 @@
-a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 01:40:30 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 21:40:30 -0400
Subject: rpms/fvwm/F-7 .cvsignore,1.2,1.3 fvwm.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <200709140140.l8E1eUEZ006990@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963

Modified Files:
	.cvsignore fvwm.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2007 02:33:14 -0000	1.2
+++ .cvsignore	14 Sep 2007 01:39:58 -0000	1.3
@@ -1 +1 @@
-fvwm-2.5.21.tar.bz2
+fvwm-2.5.23.tar.bz2


Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/fvwm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fvwm.spec	5 Aug 2007 14:57:09 -0000	1.5
+++ fvwm.spec	14 Sep 2007 01:39:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fvwm
-Version:	2.5.21
-Release:	5%{?dist}
+Version:	2.5.23
+Release:	2%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -20,6 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
+BuildRequires:	librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -69,12 +70,6 @@
 chmod +x %{__perl_requires}
 
 
-# Work around FVWM bug #4208
-find . -name '*.in' -type f -print0 \
- | xargs -0 sed -i -e 's:@datarootdir@:@datadir@:'
-
-
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -116,8 +111,15 @@
 
 
 %changelog
-* Fri May 25 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-4.1
-- Fix build on ppc64
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
+- Don't add gnome-libs-devel to BR (not on ppc64?)
+
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+- New upstream release
+
+* Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5
+- Update license tag
+- Rebuild for buildid
 
 * Thu Mar 15 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-4
 - Don't patch configure, just patch a few files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2007 02:33:14 -0000	1.2
+++ sources	14 Sep 2007 01:39:58 -0000	1.3
@@ -1 +1 @@
-c11efef91420e686d54f772e7162e879  fvwm-2.5.21.tar.bz2
+c301f9aad1203c26818a6651e3d1afc8  fvwm-2.5.23.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 04:31:29 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 14 Sep 2007 00:31:29 -0400
Subject: rpms/gtk-vnc/devel .cvsignore, 1.2, 1.3 gtk-vnc.spec, 1.3,
	1.4 sources, 1.2, 1.3 gtk-vnc-0.1.0-clear-area.patch, 1.1,
	NONE gtk-vnc-0.1.0-colour-depth.patch, 1.1,
	NONE gtk-vnc-0.1.0-endian-bgr.patch, 1.1,
	NONE gtk-vnc-0.1.0-python-demo.patch, 1.1, NONE
Message-ID: <200709140431.l8E4VTUF028763@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Removed Files:
	gtk-vnc-0.1.0-clear-area.patch 
	gtk-vnc-0.1.0-colour-depth.patch 
	gtk-vnc-0.1.0-endian-bgr.patch gtk-vnc-0.1.0-python-demo.patch 
Log Message:
Update to 0.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2007 19:19:12 -0000	1.2
+++ .cvsignore	14 Sep 2007 04:30:57 -0000	1.3
@@ -1,3 +1,3 @@
-gtk-vnc-0.1.0.tar.gz
 *.src.rpm
 .*.log
+gtk-vnc-0.2.0.tar.gz


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-vnc.spec	29 Aug 2007 16:33:24 -0000	1.3
+++ gtk-vnc.spec	14 Sep 2007 04:30:57 -0000	1.4
@@ -2,15 +2,11 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.1.0
-Release: 5%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-clear-area.patch
-Patch2: %{name}-%{version}-endian-bgr.patch
-Patch3: %{name}-%{version}-python-demo.patch
-Patch4: %{name}-%{version}-colour-depth.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel
@@ -45,10 +41,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %configure
@@ -88,6 +80,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc8
+- Update to 0.2.0 release
+
 * Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5.fc8
 - Fixed handling of mis-matched client/server colour depths
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2007 19:19:12 -0000	1.2
+++ sources	14 Sep 2007 04:30:57 -0000	1.3
@@ -1 +1 @@
-f0781695819bd00d5ba160205723a3b4  gtk-vnc-0.1.0.tar.gz
+b1321a9e88e5309f09c4f727f5a367e6  gtk-vnc-0.2.0.tar.gz


--- gtk-vnc-0.1.0-clear-area.patch DELETED ---


--- gtk-vnc-0.1.0-colour-depth.patch DELETED ---


--- gtk-vnc-0.1.0-endian-bgr.patch DELETED ---


--- gtk-vnc-0.1.0-python-demo.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 04:35:09 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 14 Sep 2007 00:35:09 -0400
Subject: rpms/gtk-vnc/F-7 .cvsignore, 1.2, 1.3 gtk-vnc.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709140435.l8E4Z9aZ028987@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
Update to 0.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2007 20:39:57 -0000	1.2
+++ .cvsignore	14 Sep 2007 04:34:36 -0000	1.3
@@ -1 +1 @@
-gtk-vnc-0.1.0.tar.gz
+gtk-vnc-0.2.0.tar.gz


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/gtk-vnc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-vnc.spec	17 Aug 2007 20:39:57 -0000	1.1
+++ gtk-vnc.spec	14 Sep 2007 04:34:36 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.1.0
-Release: 3%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc7
+- Update to 0.2.0 release
+
 * Thu Aug 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-3.fc7
 - Tweaked post scripts
 - Removed docs from sub-packages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2007 20:39:57 -0000	1.2
+++ sources	14 Sep 2007 04:34:36 -0000	1.3
@@ -1 +1 @@
-f0781695819bd00d5ba160205723a3b4  gtk-vnc-0.1.0.tar.gz
+b1321a9e88e5309f09c4f727f5a367e6  gtk-vnc-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 05:13:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 14 Sep 2007 01:13:42 -0400
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff,1.3,1.4
Message-ID: <200709140513.l8E5Dg81003239@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3214

Modified Files:
	OpenSceneGraph-2.0.diff 
Log Message:
Rename openthreads-2.pc into openthreads.pc.

OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSceneGraph-2.0.diff	22 Aug 2007 05:04:57 -0000	1.3
+++ OpenSceneGraph-2.0.diff	14 Sep 2007 05:13:08 -0000	1.4
@@ -1,6 +1,6 @@
 diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-14 06:49:27.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
  
 diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 --- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
-+++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-14 06:49:27.000000000 +0200
 @@ -30,7 +30,7 @@
  # If a relative path is entered, it will be relative to the location 
  # where doxygen was started. If left blank the current directory will be used.
@@ -33,7 +33,7 @@
  # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
 --- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-14 06:49:27.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -45,7 +45,7 @@
      ADD_SUBDIRECTORY(osgtexture2D)
 diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc OpenSceneGraph/pkgconfig/openscenegraph-2.pc
 --- OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-08-22 06:46:46.000000000 +0200
++++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-09-14 06:49:27.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -57,13 +57,13 @@
 +Name: openscenegraph-2
 +Description: 3D scenegraph
 +Version: 2.0
-+Requires: openthreads-2
++Requires: openthreads
 +Conflicts:
 +Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
 +Cflags: -I${includedir}
-diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads-2.pc OpenSceneGraph/pkgconfig/openthreads-2.pc
---- OpenSceneGraph.orig/pkgconfig/openthreads-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openthreads-2.pc	2007-08-22 06:47:10.000000000 +0200
+diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-09-14 06:49:27.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -72,7 +72,7 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openthreads-2
++Name: openthreads
 +Description: Object-Oriented (OO) thread interface for C++ programmers
 +Version: 2.0
 +Requires:



From fedora-extras-commits at redhat.com  Fri Sep 14 05:17:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:17:10 -0400
Subject: rpms/gtk2/devel novalidate.patch, NONE, 1.1 .cvsignore, 1.73,
	1.74 gtk2.spec, 1.255, 1.256 sources, 1.81, 1.82
Message-ID: <200709140517.l8E5HAvm003382@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3322

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	novalidate.patch 
Log Message:
2.12.0


novalidate.patch:

--- NEW FILE novalidate.patch ---
diff -up gtk+-2.12.0/gtk/gtkiconcache.c.novalidate gtk+-2.12.0/gtk/gtkiconcache.c
--- gtk+-2.12.0/gtk/gtkiconcache.c.novalidate	2007-09-14 01:13:49.000000000 -0400
+++ gtk+-2.12.0/gtk/gtkiconcache.c	2007-09-14 01:13:59.000000000 -0400
@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha
   info.n_directories = 0;
   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
 
-  if (!_gtk_icon_cache_validate (&info))
+#ifdef G_ENABLE_DEBUG
+  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
     {
-      g_mapped_file_free (map);
-      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+      if (!_gtk_icon_cache_validate (&info))
+        {
+          g_mapped_file_free (map);
+          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
 
-      goto done;
+          goto done;
+        }
     }
-  
+#endif 
+
   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
 
   cache = g_new0 (GtkIconCache, 1);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Jul 2007 18:35:27 -0000	1.73
+++ .cvsignore	14 Sep 2007 05:16:37 -0000	1.74
@@ -1 +1 @@
-gtk+-2.11.6.tar.bz2
+gtk+-2.12.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- gtk2.spec	7 Sep 2007 20:15:12 -0000	1.255
+++ gtk2.spec	14 Sep 2007 05:16:37 -0000	1.256
@@ -2,7 +2,7 @@
 
 %define glib2_base_version 2.13.7
 %define glib2_version %{glib2_base_version}-1
-%define pango_base_version 1.15.3
+%define pango_base_version 1.17.3
 %define pango_version %{pango_base_version}-1
 %define atk_base_version 1.9.0
 %define atk_version %{atk_base_version}-1
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.11.6
+%define base_version 2.12.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 9%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -27,19 +27,11 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
-# use fam for recent-files
-#Patch2: gtk+-2.10.3-fam.patch
-# fixed in upstream svn
-Patch3: cups-authstring.patch
-# fixed in upstream svn
-Patch4: silence-icon-cache-validator.patch
-# fixed in upstream svn
-Patch5: systray-tooltips.patch
-# fixed in upstream svn
-Patch6: tooltip-compat.patch
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
-Patch7: workaround.patch
+Patch2: workaround.patch
+# fixed in upstream svn
+Patch3: novalidate.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -125,12 +117,8 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
-#%patch2 -p1 -b .fam
-%patch3 -p0 -b .authstring
-%patch4 -p1 -b .silence
-%patch5 -p1 -b .tooltips
-%patch6 -p1 -b .tooltip-compat
-%patch7 -p1 -b .workaround
+%patch2 -p1 -b .workaround
+%patch3 -p1 -b .novalidate
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -139,8 +127,7 @@
 %build
 libtoolize --force
 
-# Patch2 modifies gdk/Makefile.am
-# Patch3 modifies gdk-pixbuf/Makefile.am
+# Patch0 modifies gdk-pixbuf/Makefile.am
 aclocal-1.7
 automake-1.7
 autoconf
@@ -314,6 +301,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
+- Update to 2.12.0
+
 * Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-9
 - Add a workaround for the flash plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	23 Jul 2007 18:35:27 -0000	1.81
+++ sources	14 Sep 2007 05:16:37 -0000	1.82
@@ -1 +1 @@
-2b35ce357e138af23c52e4bceb1a63a0  gtk+-2.11.6.tar.bz2
+e9c280afec29b11772af5a7c807abf41  gtk+-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:31:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:31:35 -0400
Subject: rpms/gok/devel .cvsignore, 1.25, 1.26 gok.spec, 1.53, 1.54 sources, 
	1.25, 1.26
Message-ID: <200709140531.l8E5VZZR003745@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3702

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Sep 2007 04:30:23 -0000	1.25
+++ .cvsignore	14 Sep 2007 05:31:01 -0000	1.26
@@ -1 +1 @@
-gok-1.3.2.tar.bz2
+gok-1.3.3.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gok.spec	4 Sep 2007 04:30:23 -0000	1.53
+++ gok.spec	14 Sep 2007 05:31:01 -0000	1.54
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.2
+Version: 1.3.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -121,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.3-1
+- Update to 1.3.3
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.2-1
 - Update to 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Sep 2007 04:30:23 -0000	1.25
+++ sources	14 Sep 2007 05:31:01 -0000	1.26
@@ -1 +1 @@
-643a6ef0e1752b41d4a3d2415c9cb174  gok-1.3.2.tar.bz2
+be080327247c8f6a0b49118d1bfeb2a5  gok-1.3.3.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:39:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:39:34 -0400
Subject: rpms/libgsf/devel .cvsignore, 1.19, 1.20 libgsf.spec, 1.49,
	1.50 sources, 1.19, 1.20
Message-ID: <200709140539.l8E5dYQD003929@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3904

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
1.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Sep 2007 16:35:52 -0000	1.19
+++ .cvsignore	14 Sep 2007 05:39:01 -0000	1.20
@@ -1 +1 @@
-libgsf-1.14.6.tar.bz2
+libgsf-1.14.7.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgsf.spec	5 Sep 2007 16:59:04 -0000	1.49
+++ libgsf.spec	14 Sep 2007 05:39:01 -0000	1.50
@@ -3,7 +3,7 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.6
+Version: 1.14.7
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
@@ -141,6 +141,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 1.14.7-1
+- Update to 1.14.7
+
 * Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> 1.14.6-1
 - next version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Sep 2007 16:35:52 -0000	1.19
+++ sources	14 Sep 2007 05:39:01 -0000	1.20
@@ -1 +1 @@
-5939265125356730fc1d90c8ee3af7eb  libgsf-1.14.6.tar.bz2
+6612f1e57d3974d609bedd2fd8ff6317  libgsf-1.14.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:45:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:45:19 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 tomboy.spec, 1.56, 1.57
Message-ID: <200709140545.l8E5jJ8B004069@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.7.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Sep 2007 14:18:32 -0000	1.18
+++ .cvsignore	14 Sep 2007 05:44:46 -0000	1.19
@@ -1 +1 @@
-tomboy-0.7.6.tar.bz2
+tomboy-0.7.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Sep 2007 14:18:32 -0000	1.18
+++ sources	14 Sep 2007 05:44:46 -0000	1.19
@@ -1 +1 @@
-f7a7959bbfe1b67c1f5de32eb118a65a  tomboy-0.7.6.tar.bz2
+a5d87649e153d4e7a4a01846c700e66c  tomboy-0.7.8.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- tomboy.spec	4 Sep 2007 15:11:13 -0000	1.56
+++ tomboy.spec	14 Sep 2007 05:44:46 -0000	1.57
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.7.6
+Version:        0.7.8
 Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
@@ -75,6 +75,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/tomboy.schemas > /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 
 %preun
@@ -84,6 +88,14 @@
       %{_sysconfdir}/gconf/schemas/tomboy.schemas >/dev/null;
 fi
 
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
@@ -106,6 +118,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.8-1
+- Update to 0.7.8
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.6-1
 - Update to 0.7.6
 



From fedora-extras-commits at redhat.com  Fri Sep 14 05:49:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:49:45 -0400
Subject: rpms/gnome-keyring-manager/devel .cvsignore, 1.10,
	1.11 gnome-keyring-manager.spec, 1.32, 1.33 sources, 1.10, 1.11
Message-ID: <200709140549.l8E5njeA004377@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298

Modified Files:
	.cvsignore gnome-keyring-manager.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2007 04:32:51 -0000	1.10
+++ .cvsignore	14 Sep 2007 05:49:10 -0000	1.11
@@ -1 +1 @@
-gnome-keyring-manager-2.18.0.tar.bz2
+gnome-keyring-manager-2.19.92.tar.bz2


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-keyring-manager.spec	28 Aug 2007 21:36:08 -0000	1.32
+++ gnome-keyring-manager.spec	14 Sep 2007 05:49:10 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
-Version: 2.18.0
-Release: 5%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 2.19.92-1
+- Update to 2.19.92
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.18.0-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2007 04:32:51 -0000	1.10
+++ sources	14 Sep 2007 05:49:10 -0000	1.11
@@ -1 +1 @@
-05183cdea9d933cb1e9a8f4202c6ffc0  gnome-keyring-manager-2.18.0.tar.bz2
+162105ae1e4021eab4c613a4ca7e6bb9  gnome-keyring-manager-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:57:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:57:51 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.23, 1.24 gconf-editor.spec,
	1.46, 1.47 sources, 1.23, 1.24
Message-ID: <200709140557.l8E5vpif004644@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	4 Sep 2007 04:01:29 -0000	1.23
+++ .cvsignore	14 Sep 2007 05:57:15 -0000	1.24
@@ -1 +1 @@
-gconf-editor-2.18.2.tar.bz2
+gconf-editor-2.19.92.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gconf-editor.spec	4 Sep 2007 04:01:29 -0000	1.46
+++ gconf-editor.spec	14 Sep 2007 05:57:15 -0000	1.47
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.18.2
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -41,7 +41,7 @@
 
 %build
 %configure --disable-scrollkeeper
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,11 +99,14 @@
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
 %{_datadir}/pixmaps/gconf-editor
 %{_datadir}/applications/*.desktop
-%{_datadir}/man/man*/*
+%{_mandir}/man*/*
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/omf/gconf-editor
+%dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Sep 2007 04:01:29 -0000	1.23
+++ sources	14 Sep 2007 05:57:15 -0000	1.24
@@ -1 +1 @@
-e40f51b3cb2809b882c29d45b71657bd  gconf-editor-2.18.2.tar.bz2
+a248ef087ada180d53ce1317b25ed35c  gconf-editor-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:07:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 02:07:50 -0400
Subject: rpms/gedit/devel .cvsignore, 1.65, 1.66 gedit.spec, 1.138,
	1.139 sources, 1.67, 1.68
Message-ID: <200709140607.l8E67o4p010838@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10814

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	4 Sep 2007 13:12:46 -0000	1.65
+++ .cvsignore	14 Sep 2007 06:07:17 -0000	1.66
@@ -1 +1 @@
-gedit-2.19.91.tar.bz2
+gedit-2.19.92.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gedit.spec	4 Sep 2007 13:12:46 -0000	1.138
+++ gedit.spec	14 Sep 2007 06:07:17 -0000	1.139
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.91
+Version: 	2.19.92
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
+- Update to 2.19.92
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	4 Sep 2007 13:12:46 -0000	1.67
+++ sources	14 Sep 2007 06:07:17 -0000	1.68
@@ -1 +1 @@
-eb5fbd8c0f986665235cfc7fa3137e67  gedit-2.19.91.tar.bz2
+780644ec80be0938b6860de1d220d684  gedit-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:09:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 02:09:59 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.27, 1.28 gnome-mag.spec, 1.50,
	1.51 sources, 1.28, 1.29
Message-ID: <200709140609.l8E69xwS010976@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10915

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Sep 2007 05:17:36 -0000	1.27
+++ .cvsignore	14 Sep 2007 06:09:24 -0000	1.28
@@ -1 +1 @@
-gnome-mag-0.14.8.tar.bz2
+gnome-mag-0.14.9.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-mag.spec	4 Sep 2007 05:23:51 -0000	1.50
+++ gnome-mag.spec	14 Sep 2007 06:09:24 -0000	1.51
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.8
+Version: 0.14.9
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.9-1
+- Update to 0.14.9
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.8-1
 - Update to 0.14.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Sep 2007 05:17:36 -0000	1.28
+++ sources	14 Sep 2007 06:09:24 -0000	1.29
@@ -1 +1 @@
-b0d784200b99a96ecc0304095e31dd55  gnome-mag-0.14.8.tar.bz2
+36a4bb5b06ca8bfb0d7d728c3045bebe  gnome-mag-0.14.9.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:19:33 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 02:19:33 -0400
Subject: rpms/squid/devel squid-2.6.STABLE16-config.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 sources, 1.29, 1.30 squid.spec, 1.87,
	1.88 squid-2.6.STABLE14-config.patch, 1.1, NONE
Message-ID: <200709140619.l8E6JXba011193@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE16-config.patch 
Removed Files:
	squid-2.6.STABLE14-config.patch 
Log Message:
* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE16


squid-2.6.STABLE16-config.patch:

--- NEW FILE squid-2.6.STABLE16-config.patch ---
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config	2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
 #http_access allow our_networks
 
 # And finally deny all other access to this proxy
+http_access allow localhost
 http_access deny all
 NOCOMMENT_END
 DOC_END
@@ -2250,7 +2251,7 @@ DOC_END
 
 NAME: logfile_rotate
 TYPE: int
-DEFAULT: 10
+DEFAULT: 0
 LOC: Config.Log.rotateNumber
 DOC_START
 	Specifies the number of logfile rotations to make when you
@@ -2266,6 +2267,8 @@ DOC_START
 	purposes, so -k rotate uses another signal.  It is best to get
 	in the habit of using 'squid -k rotate' instead of 'kill -USR1
 	<pid>'.
+	
+logfile_rotate 0
 DOC_END
 
 NAME: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
 
 NAME: cache_mgr
 TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
 LOC: Config.adminEmail
 DOC_START
 	Email-address of local cache manager who will receive
-	mail if the cache dies. The default is "webmaster".
+	mail if the cache dies. The default is "root".
 DOC_END
 
 NAME: mail_from
@@ -3374,21 +3377,22 @@ DOC_END
 
 NAME: cache_effective_user
 TYPE: string
-DEFAULT: nobody
+DEFAULT: squid
 LOC: Config.effectiveUser
 DOC_START
 	If you start Squid as root, it will change its effective/real
 	UID/GID to the user specified below.  The default is to change
-	to UID to nobody.  If you define cache_effective_user, but not
+	to UID to squid.  If you define cache_effective_user, but not
 	cache_effective_group, Squid sets the GID to the effective
 	user's default group ID (taken from the password file) and
 	supplementary group list from the from groups membership of
 	cache_effective_user.
+cache_effective_user squid
 DOC_END
 
 NAME: cache_effective_group
 TYPE: string
-DEFAULT: none
+DEFAULT: squid
 LOC: Config.effectiveGroup
 DOC_START
 	If you want Squid to run with a specific GID regardless of
@@ -3398,6 +3402,7 @@ DOC_START
 	and only this GID is effective. If Squid is not started as
 	root the user starting Squid must be member of the specified
 	group.
+cache_effective_group squid
 DOC_END
 
 NAME: httpd_suppress_version_string
@@ -4018,12 +4023,12 @@ COMMENT_END
 NAME: snmp_port
 TYPE: ushort
 LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
 IFDEF: SQUID_SNMP
 DOC_START
 	Squid can now serve statistics and status information via SNMP.
-	By default it listens to port 3401 on the machine. If you don't
-	wish to use SNMP, set this to "0".
+	A value of "0" disables SNMP support. If you wish to use SNMP,
+	set this to "3401" to use the normal SNMP support.
 DOC_END
 
 NAME: snmp_access
@@ -4402,15 +4407,22 @@ TYPE: string
 LOC: Config.errorDirectory
 DEFAULT: @DEFAULT_ERROR_DIR@
 DOC_START
-	If you wish to create your own versions of the default
-	(English) error files, either to customize them to suit your
-	language or company copy the template English files to another
+	Directory where the error files are read from.
+	/usr/lib/squid/errors contains sets of error files
+	in different languages. The default error directory
+	is /etc/squid/errors, which is a link to one of these
+	error sets.
+
+	If you wish to create your own versions of the error files,
+	either to customize them to suit your language or company,
+	copy the template English files to another
 	directory and point this tag at them.
-
-	The squid developers are interested in making squid available in
-	a wide variety of languages. If you are making translations for a
-	langauge that Squid does not currently provide please consider
-	contributing your translation back to the project.
+	
+    The squid developers are interested in making squid available in
+    a wide variety of languages. If you are making translations for a
+    langauge that Squid does not currently provide please consider
+    contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
 DOC_END
 
 NAME: error_map


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	19 Jul 2007 20:42:07 -0000	1.27
+++ .cvsignore	14 Sep 2007 06:18:59 -0000	1.28
@@ -1 +1 @@
-squid-2.6.STABLE14.tar.bz2
+squid-2.6.STABLE16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Jul 2007 20:42:07 -0000	1.29
+++ sources	14 Sep 2007 06:18:59 -0000	1.30
@@ -1 +1 @@
-eadb138d48320df8b99349121159c6bf  squid-2.6.STABLE14.tar.bz2
+849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- squid.spec	29 Aug 2007 04:51:28 -0000	1.87
+++ squid.spec	14 Sep 2007 06:18:59 -0000	1.88
@@ -4,8 +4,8 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE14
-Release:  2%{?dist}
+Version:  2.6.STABLE16
+Release:  1%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
@@ -26,7 +26,7 @@
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-2.6.STABLE14-config.patch
+Patch201: squid-2.6.STABLE16-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
@@ -326,6 +326,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
+- upgrade to latest upstream 2.6.STABLE16
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:2.6.STABLE14-2
 - Rebuild for selinux ppc32 issue.
 


--- squid-2.6.STABLE14-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 06:43:54 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 02:43:54 -0400
Subject: rpms/jd/devel .cvsignore, 1.144, 1.145 jd.spec, 1.170, 1.171 sources,
	1.145, 1.146
Message-ID: <200709140643.l8E6hsAT011874@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11840

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
- svn 1331



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- .cvsignore	9 Sep 2007 18:10:13 -0000	1.144
+++ .cvsignore	14 Sep 2007 06:43:21 -0000	1.145
@@ -1 +1 @@
-jd-1.9.6-svn1322.tgz
+jd-1.9.6-svn1331.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- jd.spec	9 Sep 2007 18:10:13 -0000	1.170
+++ jd.spec	14 Sep 2007 06:43:21 -0000	1.171
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1322
+%define         strtag        svn1331
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -86,7 +86,7 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
-- svn 1322
+* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
+- svn 1331
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	9 Sep 2007 18:10:13 -0000	1.145
+++ sources	14 Sep 2007 06:43:21 -0000	1.146
@@ -1 +1 @@
-c2739df7a9ba803064f93beb6f87ed72  jd-1.9.6-svn1322.tgz
+d0cf5022f84597bfeb830aa6a6597ac0  jd-1.9.6-svn1331.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 06:46:12 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 02:46:12 -0400
Subject: rpms/pyzor/EL-4 patch-pyzor-debian-mbox, NONE,
	1.1 patch-pyzor-handle_unknown_encodings, NONE,
	1.1 patch-pyzor-unknowntype, NONE, 1.1 pyzor.spec, 1.8,
	1.9 pyzor-0.4.0.tar.bz2.asc, 1.1, NONE
Message-ID: <200709140646.l8E6kCQ5011975@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11944

Modified Files:
	pyzor.spec 
Added Files:
	patch-pyzor-debian-mbox patch-pyzor-handle_unknown_encodings 
	patch-pyzor-unknowntype 
Removed Files:
	pyzor-0.4.0.tar.bz2.asc 
Log Message:
* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
- Rebuild with Python 2.5.



--- NEW FILE patch-pyzor-debian-mbox ---
--- lib/pyzor/client.py	Sun Sep  8 22:37:15 2002
+++ lib/pyzor/client.py	Wed Apr 13 17:08:42 2005
@@ -8,6 +8,7 @@
 import getopt
 import tempfile
 import mimetools
+import multifile
 import sha
 
 import pyzor
@@ -58,11 +57,6 @@
         self.send(msg, address)
         return self.read_response(msg.get_thread())
 
-    def shutdown(self, address):
-        msg = ShutdownRequest()
-        self.send(msg, address)
-        return self.read_response(msg.get_thread())
-
     def build_socket(self):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
@@ -132,39 +126,50 @@
 
     def run(self):
         debug = 0
-        (options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir='])
-        if len(args) < 1:
-           self.usage()
-
         specified_homedir = None
+        options = None
+        log = None
+        
+        try:
+            (options, args) = getopt.getopt(sys.argv[1:], 'd', ['homedir=', 'log'])
+        except getopt.GetoptError:
+            self.usage()    
+
+        if len(args) < 1:
+            self.usage()
 
         for (o, v) in options:
             if o == '-d':
                 debug = 1
-            elif o == '-h':
-               self.usage()
             elif o == '--homedir':
                 specified_homedir = v
+            elif o == '--log':
+                log = 1
         
         self.output = Output(debug=debug)
-
         homedir = pyzor.get_homedir(specified_homedir)
-
+        
+        if log:
+            sys.stderr = open(homedir + "/pyzor.log", 'a')
+            sys.stderr.write("\npyzor[" + repr (os.getpid()) + "]:\n")
+        
         config = pyzor.Config(homedir)
         config.add_section('client')
 
-        defaults = {'ServersFile': 'servers',
+        defaults = {'ServersFile':        'servers',
                     'DiscoverServersURL': ServerList.inform_url,
-                    'AccountsFile' : 'accounts',
+                    'AccountsFile':       'accounts',
+                    'Timeout':            str(Client.timeout),
                     }
 
         for k, v in defaults.items():
             config.set('client', k, v)
-            
+        
         config.read(os.path.join(homedir, 'config'))
         
         servers_fn = config.get_filename('client', 'ServersFile')
-    
+        Client.timeout = config.getint('client', 'Timeout')
+        
         if not os.path.exists(homedir):
             os.mkdir(homedir)
 
@@ -197,10 +202,13 @@
     def usage(self, s=None):
         if s is not None:
             sys.stderr.write("%s\n" % s)
-        sys.stderr.write("""usage: %s [-d] [--homedir dir] command [cmd_opts]
+        sys.stderr.write("""
+usage: %s [-d] [--homedir dir] command [cmd_opts]
 command is one of: check, report, discover, ping, digest, predigest,
-                   genkey, shutdown
+                   genkey
+                   
 Data is read on standard input (stdin).
+
 """
                          % sys.argv[0])
         sys.exit(2)
@@ -208,9 +216,9 @@
 
 
     def ping(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         runner = ClientRunner(self.client.ping)
@@ -221,30 +229,23 @@
         return runner.all_ok
         
 
-    def shutdown(self, args):
-        (opts, args2) = getopt.getopt(args[1:], '')
-
-        if len(args2) > 1:
+    def info(self, args):
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-        runner = ClientRunner(self.client.shutdown)
+        do_mbox = 'msg'
 
-        for arg in args2:
-            server = Address.from_str(arg)
-            runner.run(server, (server,))
-                    
-        return runner.all_ok
-
-
-    def info(self, args):
-        getopt.getopt(args[1:], '')
-        
-        if len(args) > 1:
-            self.usage("%s does not take any non-option arguments" % args[0])
+        for (o, v) in options:
+            if o == '--mbox':
+                do_mbox = 'mbox'
 
         runner = InfoClientRunner(self.client.info)
 
-        for digest in FileDigester(sys.stdin, self.digest_spec):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             for server in self.servers:
                 response = runner.run(server, (digest, server))
 
@@ -252,34 +253,45 @@
 
 
     def check(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
+        do_mbox = 'msg'
+
+        for (o, v) in options:
+            if o == '--mbox':
+                do_mbox = 'mbox'
+
         runner = CheckClientRunner(self.client.check)
 
-        for digest in FileDigester(sys.stdin, self.digest_spec):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             for server in self.servers:
-                response = runner.run(server, (digest, server))
+                runner.run(server, (digest, server))
                 
         return (runner.found_hit and not runner.whitelisted)
 
 
     def report(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-        do_mbox = False
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
+        do_mbox = 'msg'
+
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
         all_ok = True
 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             if not self.send_digest(digest, self.digest_spec,
                                     self.client.report):
                 all_ok = False
@@ -302,20 +314,22 @@
 
 
     def whitelist(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-        do_mbox = False
+        do_mbox = 'msg'
 
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
         all_ok = True
 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             if not self.send_digest(digest, self.digest_spec,
                                     self.client.whitelist):
                 all_ok = False
@@ -324,28 +338,29 @@
 
 
     def digest(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-
-        do_mbox = False
+        do_mbox = 'msg'
 
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             sys.stdout.write("%s\n" % digest)
 
         return True
 
 
     def print_digested(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         def loop():
@@ -358,9 +373,9 @@
         return True
 
     def genkey(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         import getpass
@@ -414,7 +429,6 @@
                   'report':    report,
                   'ping' :     ping,
                   'genkey':    genkey,
-                  'shutdown':  shutdown,
                   'info':      info,
                   'whitelist': whitelist,
                   'digest':    digest,
@@ -608,31 +622,37 @@
 
 
 
-class FileDigester(BasicIterator):
-    __slots__ = ['digester']
-
-    def __init__(self, fp, spec, mbox=False):
-        self.digester = iter(get_file_digester(fp, spec, mbox))
-        self.output = pyzor.Output()
-
-    def next(self):
-        digest = self.digester.next()
-        self.output.debug("calculated digest: %s" % digest)
-        return digest
-
-
-
-def get_file_digester(fp, spec, mbox, seekable=False):
+def get_input_handler(fp, spec, style='msg', seekable=False):
     """Return an object that can be iterated over
     to get all the digests from fp according to spec.
     mbox is a boolean"""
-    if mbox:
+    if style == 'msg':
+        return filter(lambda x: x is not None,
+                      (DataDigester(rfc822BodyCleaner(fp),
+                                    spec, seekable).get_digest(),)
+                      )
+
+    elif style =='mbox':
         return MailboxDigester(fp, spec)
 
-    return (DataDigester(rfc822BodyCleaner(fp),
-                         spec, seekable).get_digest(),)
+    elif style == 'digests':
+        return JustDigestsIterator(fp)
+
+    raise ValueError, "unknown input style"
 
 
+class JustDigestsIterator(BasicIterator):
+    __slots__ = ['fp']
+    
+    def __init__(self, fp):
+        self.fp = fp
+
+    def next(self):
+        l = fp.readline()
+        if not l:
+            raise StopIteration
+        return l.rstrip()
+
 
 class MailboxDigester(BasicIterator):
     __slots__ = ['mbox', 'digest_spec', 'seekable']
@@ -645,7 +665,12 @@
         self.seekable    = seekable
 
     def next(self):
-        next_msg = self.mbox.next()
+        try:
+            next_msg = self.mbox.next()
+        except IOError:
+            print "Error: Please feed mailbox files in on stdin, i.e."
+            print "    pyzor digest --mbox < my_mbox_file"
+            next_msg = None
         if next_msg is None:
             raise StopIteration
         return DataDigester(next_msg, self.digest_spec,


--- NEW FILE patch-pyzor-handle_unknown_encodings ---
--- lib/pyzor/client.py	Sun Sep  8 22:37:15 2002
+++ lib/pyzor/client.py	Wed Aug  3 10:58:03 2005
@@ -466,7 +470,7 @@
 
         (fp, offsets) = self.get_line_offsets(fp)
         
-        # did we get an empty file?
+	# did we get an empty (parsed output)file?
         if len(offsets) == 0:
             return
 
@@ -662,39 +666,66 @@
         self.multifile = None
         self.curfile   = None
 
+	# Check if we got a mail or not. Set type to binary if there is no 'From:' header and
+	# type text/plain with encoding 7bit. 7bit is passed trough anyway so nobody cares.
+	if (not msg.has_key("From") and self.type == 'text' and msg.subtype == 'plain' and msg.getencoding() == '7bit'):
+		self.type = 'binary';
+
         if self.type == 'text':
             encoding = msg.getencoding()
-            if encoding == '7bit':
-                self.curfile = msg.fp
-            else:
-                self.curfile = tempfile.TemporaryFile()
-                mimetools.decode(msg.fp, self.curfile, encoding)
-                self.curfile.seek(0)
-                
+            self.curfile = msg.fp
+            if encoding != '7bit':
+                # fix bad encoding name
+                if encoding == '8bits':
+                    encoding = '8bit'
+                try:
+                    newcurfile = tempfile.TemporaryFile()
+                    mimetools.decode(msg.fp, newcurfile, encoding)
+                    newcurfile.seek(0)
+                    self.curfile = newcurfile
+                except:
+                    # ignore encoding on errors, pass msg as is
+                    pass
+
         elif self.type == 'multipart':
             import multifile
             self.multifile = multifile.MultiFile(msg.fp, seekable=False)
             self.multifile.push(msg.getparam('boundary'))
-            self.multifile.next()
-            self.curfile = self.__class__(self.multifile)
-
+	    try:
+		self.multifile.next()
+		self.curfile = self.__class__(self.multifile)
+	    except:
+	    	#
+	    	# Catch multipart decoding errors
+	    	#
+		fp.seek(0)
+		self.curfile = fp
+		self.type = 'binary'
 
         if self.type == 'text' or self.type == 'multipart':
             assert self.curfile is not None
+        elif self.type == 'binary':
+	    try:
+	 	fp.seek(0)
+	    except:
+	    	pass
+	    self.curfile = fp
         else:
             assert self.curfile is None
 
         
     def readline(self):
         l = ''
-        if self.type in ('text', 'multipart'):
-            l = self.curfile.readline()
-
-        if self.type == 'multipart' and not l and self.multifile.next():
-            self.curfile = self.__class__(self.multifile)
-            # recursion.  Could get messy if
-            # we get a bunch of empty multifile parts
-            l = self.readline()
+	try:
+		if self.type in ('text', 'multipart', 'binary'):
+		    l = self.curfile.readline()
+		if self.type == 'multipart' and not l and self.multifile.next():
+		    self.curfile = self.__class__(self.multifile)
+		    # recursion.  Could get messy if
+		    # we get a bunch of empty multifile parts
+		    l = self.readline()
+	except (TypeError, multifile.Error):
+		pass
         return l
 
 


--- NEW FILE patch-pyzor-unknowntype ---
--- lib/pyzor/client.py	Tue Aug 23 14:53:09 2005
+++ lib/pyzor/client.py	Tue Aug 23 14:51:36 2005
@@ -693,6 +692,9 @@
 	# type text/plain with encoding 7bit. 7bit is passed trough anyway so nobody cares.
 	if (not msg.has_key("From") and self.type == 'text' and msg.subtype == 'plain' and msg.getencoding() == '7bit'):
 		self.type = 'binary';
+	
+	if self.type is '':
+	    self.type = 'text';
 
         if self.type == 'text':
             encoding = msg.getencoding()


Index: pyzor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyzor/EL-4/pyzor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyzor.spec	10 Feb 2005 03:09:32 -0000	1.8
+++ pyzor.spec	14 Sep 2007 06:45:38 -0000	1.9
@@ -1,10 +1,10 @@
-%define pyver %(python -c 'import sys ; print sys.version[: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)")}
+%define pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:          pyzor
 Version:       0.4.0
-Release:       8
+Release:       11%{?dist}
 Summary:       Pyzor collaborative spam filtering system
 
 Group:         Applications/Internet
@@ -12,59 +12,72 @@
 URL:           http://pyzor.sourceforge.net/
 Source0:       http://easynews.dl.sourceforge.net/sourceforge/pyzor/pyzor-0.4.0.tar.bz2
 Source1:       http://easynews.dl.sourceforge.net/sourceforge/pyzor/pyzor-0.4.0.tar.bz2.asc
+Patch0:        http://antispam.imp.ch/patches/patch-pyzor-debian-mbox
+Patch1:        http://antispam.imp.ch/patches/patch-pyzor-handle_unknown_encodings
+Patch2:        http://antispam.imp.ch/patches/patch-pyzor-unknowntype
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: python >= 2.2.1
 Requires:      python-abi = %{pyver}
 
 %description
-Pyzor is a collaborative, networked system to detect 
-and block spam using identifying digests of messages. 
-Pyzor is similar to Vipul's Razor except implemented 
+Pyzor is a collaborative, networked system to detect
+and block spam using identifying digests of messages.
+Pyzor is similar to Vipul's Razor except implemented
 in python, and using fully open source servers.
 
-Pyzor can be used either standalone, or to augment the 
-spam filtering ability of spamassassin.  spamassassin 
+Pyzor can be used either standalone, or to augment the
+spam filtering ability of spamassassin.  spamassassin
 is highly recommended.
 
 %prep
-%setup -q 
+%setup -q
+# Add mbox handling support
+%patch0 -p0
+# Handle unknown encodings
+%patch1 -p0
+# Treat empty messages as text
+%patch2 -p0
+
 
 %build
 %__python setup.py build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m755 -d $RPM_BUILD_ROOT%{python_sitelib}/pyzor
-install -p -m644 build/lib/pyzor/* $RPM_BUILD_ROOT%{python_sitelib}/pyzor
-install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 build/scripts-%{pyver}/* $RPM_BUILD_ROOT%{_bindir}
-%__python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-%__python -O -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor* 
+rm -rf %{buildroot}
+install -m755 -d %{buildroot}%{python_sitelib}/pyzor
+install -p -m644 build/lib/pyzor/* %{buildroot}%{python_sitelib}/pyzor
+install -m755 -d %{buildroot}%{_bindir}
+install -p -m755 build/scripts-%{pyver}/* %{buildroot}%{_bindir}
+%__python -c 'from compileall import *; compile_dir("'%{buildroot}'/%{python_sitelib}",10,"%{python_sitelib}")'
+%__python -O -c 'from compileall import *; compile_dir("'%{buildroot}'/%{python_sitelib}",10,"%{python_sitelib}")'
+chmod -R a+rX %{buildroot}/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor*
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/pyzor
 %doc docs/usage.html COPYING ChangeLog NEWS README THANKS UPGRADING PKG-INFO
-%attr(0644,root,root)
-%{python_sitelib}/pyzor/client.py
-%{python_sitelib}/pyzor/client.pyc
-%ghost %{python_sitelib}/pyzor/client.pyo
-%{python_sitelib}/pyzor/server.py
-%{python_sitelib}/pyzor/server.pyc
-%ghost %{python_sitelib}/pyzor/server.pyo
-%{python_sitelib}/pyzor/__init__.py
-%{python_sitelib}/pyzor/__init__.pyc
-%ghost %{python_sitelib}/pyzor/__init__.pyo
-%attr(0755,root,root)
-%{_bindir}/pyzor
-%{_bindir}/pyzord
+%attr(0644,root,root) %{python_sitelib}/pyzor/client.py*
+%attr(0644,root,root) %{python_sitelib}/pyzor/server.py*
+%attr(0644,root,root) %{python_sitelib}/pyzor/__init__.py*
+%attr(0755,root,root) %{_bindir}/pyzor
+%attr(0755,root,root) %{_bindir}/pyzord
+
 
 %changelog
+* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
+- Rebuild with Python 2.5.
+
+* Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 0.9.8-10
+- FE6 Rebuild
+- Feature enhancements by including certain patches from swinog.
+
 * Mon Feb 07 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-8
 - %%ghost *.pyo files.
 


--- pyzor-0.4.0.tar.bz2.asc DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 06:54:25 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 02:54:25 -0400
Subject: rpms/pyzor/EL-4 pyzor-0.4.0.tar.bz2.asc,1.2,1.3
Message-ID: <200709140654.l8E6sPof012275@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12198

Added Files:
	pyzor-0.4.0.tar.bz2.asc 
Log Message:
readding file



Index: pyzor-0.4.0.tar.bz2.asc
===================================================================
RCS file: pyzor-0.4.0.tar.bz2.asc
diff -N pyzor-0.4.0.tar.bz2.asc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pyzor-0.4.0.tar.bz2.asc	14 Sep 2007 06:53:52 -0000	1.3
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+iEYEABECAAYFAj17tZoACgkQVv/RCiYMT6OxlQCeNk0es0dwCBE7AqC7dkmMYwg4
+0JUAn0Fug6aQOtBgixq5OcHdtTVv7U/L
+=caa7
+-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Fri Sep 14 07:10:19 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 03:10:19 -0400
Subject: rpms/pyzor/EL-5 pyzor.spec,1.11,1.12
Message-ID: <200709140710.l8E7AJXZ018594@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18571

Modified Files:
	pyzor.spec 
Log Message:
* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
- Rebuild with Python 2.5.



Index: pyzor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyzor/EL-5/pyzor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pyzor.spec	8 Sep 2006 15:44:21 -0000	1.11
+++ pyzor.spec	14 Sep 2007 07:09:46 -0000	1.12
@@ -1,11 +1,10 @@
-# 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)")}
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:          pyzor
 Version:       0.4.0
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Pyzor collaborative spam filtering system
 
 Group:         Applications/Internet
@@ -72,6 +71,9 @@
 
 
 %changelog
+* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
+- Rebuild with Python 2.5.
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 0.9.8-10
 - FE6 Rebuild
 - Feature enhancements by including certain patches from swinog.



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:10 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:10 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qAWN018295@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:16 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:16 -0700
Subject: [pkgdb] pilot-link: alexlan has given up watchbugzilla
Message-ID: <200709140752.l8E7qGao027186@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has given up the watchbugzilla acl on pilot-link (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:18 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:18 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qIbS018304@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:29 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qTCG018313@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 08:22:00 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Fri, 14 Sep 2007 04:22:00 -0400
Subject: comps comps-f7.xml.in, 1.253, 1.254 comps-f8.xml.in, 1.107,
	1.108 comps-fe5.xml.in, 1.276, 1.277 comps-fe6.xml.in, 1.374, 1.375
Message-ID: <200709140822.l8E8M0FI026907@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26874

Modified Files:
	comps-f7.xml.in comps-f8.xml.in comps-fe5.xml.in 
	comps-fe6.xml.in 
Log Message:
Added "hugin" to Graphics, it's absence from graphical installer was noted
on dailypackage:
http://dailypackage.fedorabook.com/index.php?/archives/144-Artsy-Tuesday-Hugin-Photo-stitcher.html



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- comps-f7.xml.in	13 Sep 2007 02:13:20 -0000	1.253
+++ comps-f7.xml.in	14 Sep 2007 08:21:29 -0000	1.254
@@ -1761,6 +1761,7 @@
       <packagereq type="optional">gutenprint-plugin</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- comps-f8.xml.in	13 Sep 2007 10:03:52 -0000	1.107
+++ comps-f8.xml.in	14 Sep 2007 08:21:29 -0000	1.108
@@ -1911,6 +1911,7 @@
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe5.xml.in,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- comps-fe5.xml.in	23 Jun 2007 15:10:35 -0000	1.276
+++ comps-fe5.xml.in	14 Sep 2007 08:21:29 -0000	1.277
@@ -618,6 +618,7 @@
       <packagereq type="optional">graphviz</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">kipi-plugins</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- comps-fe6.xml.in	13 Sep 2007 02:13:20 -0000	1.374
+++ comps-fe6.xml.in	14 Sep 2007 08:21:29 -0000	1.375
@@ -751,6 +751,7 @@
       <packagereq type="optional">gutenprint</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 14 09:27:30 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 05:27:30 -0400
Subject: rpms/iputils/devel iputils.spec,1.50,1.51
Message-ID: <200709140927.l8E9RUMD002395@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/iputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	iputils.spec 
Log Message:
* Fri Aug  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-4
- resolves: #236725: ping does not work for subsecond intervals for ordinary user
- resolves: #243197: RFE: Please sync ifenslave with current kernel
- resolves: #246954: Initscript Review
- resolves: #251124: can't build rdisc - OPEN_MAX undeclared



Index: iputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- iputils.spec	7 Aug 2007 10:09:32 -0000	1.50
+++ iputils.spec	14 Sep 2007 09:26:57 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20070202
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -147,6 +147,9 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-5
+- rebuild
+
 * Fri Aug  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-4
 - resolves: #236725: ping does not work for subsecond intervals for ordinary user
 - resolves: #243197: RFE: Please sync ifenslave with current kernel



From fedora-extras-commits at redhat.com  Fri Sep 14 09:42:13 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 05:42:13 -0400
Subject: rpms/quagga/devel quagga.spec,1.37,1.38
Message-ID: <200709140942.l8E9gDBi002840@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2818

Modified Files:
	quagga.spec 
Log Message:
* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
- rebuild



Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- quagga.spec	1 Aug 2007 09:54:03 -0000	1.37
+++ quagga.spec	14 Sep 2007 09:41:41 -0000	1.38
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.8
-Release:    1%{?dist}
+Release:    1.1%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
+- rebuild
+
 * Mon Jul 30 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1
 - upgrade to new upstream version 0.99.8
 - resolves: #249423: scripts in /etc/rc.d/init.d/* are marked as config files in specfile



From fedora-extras-commits at redhat.com  Fri Sep 14 10:44:59 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 06:44:59 -0400
Subject: rpms/keepalived/devel keepalived-1.1.14-genhashman.patch, NONE,
	1.1 keepalived-1.1.14-installmodes.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 keepalived.spec, 1.3, 1.4 sources, 1.2,
	1.3 keepalived.init, 1.1, NONE keepalived.sysconfig, 1.1, NONE
Message-ID: <200709141044.l8EAixgP010334@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299

Modified Files:
	.cvsignore keepalived.spec sources 
Added Files:
	keepalived-1.1.14-genhashman.patch 
	keepalived-1.1.14-installmodes.patch 
Removed Files:
	keepalived.init keepalived.sysconfig 
Log Message:
Update to 1.1.14.


keepalived-1.1.14-genhashman.patch:

--- NEW FILE keepalived-1.1.14-genhashman.patch ---
diff -Naupr keepalived-1.1.14.orig/genhash/Makefile.in keepalived-1.1.14/genhash/Makefile.in
--- keepalived-1.1.14.orig/genhash/Makefile.in	2007-09-13 16:47:12.000000000 +0200
+++ keepalived-1.1.14/genhash/Makefile.in	2007-09-13 18:48:23.000000000 +0200
@@ -39,13 +39,13 @@ distclean: clean
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-	rm -f $(DESTDIR)$(mandir)/man/man1/genhash.1
+	rm -f $(DESTDIR)$(mandir)/man1/genhash.1
 
 install:
 	install -d $(DESTDIR)$(bindir)
 	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/
-	install -d $(DESTDIR)$(mandir)/man/man1
-	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man/man1
+	install -d $(DESTDIR)$(mandir)/man1
+	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man1
 
 mrproper: clean distclean
 	rm -f config.*

keepalived-1.1.14-installmodes.patch:

--- NEW FILE keepalived-1.1.14-installmodes.patch ---
diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in
--- keepalived-1.1.14.orig/keepalived/Makefile.in	2007-09-13 15:44:39.000000000 +0200
+++ keepalived-1.1.14/keepalived/Makefile.in	2007-09-14 12:38:43.000000000 +0200
@@ -99,13 +99,13 @@ uninstall:
 
 install:
 	install -d $(DESTDIR)$(sbindir)
-	install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
+	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
 	install -d $(DESTDIR)$(init_dir)
 	install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
 	install -d $(DESTDIR)$(sysconf_dir)
-	install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+	install -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
 	install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
-	install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
+	install -m 640 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
 	install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
 	install -d $(DESTDIR)$(mandir)/man5
 	install -d $(DESTDIR)$(mandir)/man8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 17:32:27 -0000	1.2
+++ .cvsignore	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-keepalived-1.1.13.tar.gz
+keepalived-1.1.14.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keepalived.spec	22 Aug 2007 17:35:37 -0000	1.3
+++ keepalived.spec	14 Sep 2007 10:44:23 -0000	1.4
@@ -3,18 +3,18 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.13
-Release: 8%{?dist}
+Version: 1.1.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
-Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Source1: keepalived.init
-Source2: keepalived.sysconfig
-Patch0: keepalived-1.1.13-makefile.patch
-Patch1: keepalived-1.1.13-iflabel.patch
-Patch2: keepalived-1.1.13-types.patch
+Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
+Patch0: keepalived-1.1.14-genhashman.patch
+Patch1: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 BuildRequires: openssl-devel
 # We need both of these for proper LVS support
 BuildRequires: kernel, kernel-devel
@@ -34,11 +34,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .makefile
-%patch1 -p0 -b .iflabel
-%patch2 -p1 -b .types
+%patch0 -p1 -b .genhashman
+%patch1 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
+# Included as doc, so disable its dependencies
+%{__chmod} -x goodies/arpreset.pl
 
 
 %build
@@ -51,12 +52,6 @@
 %{__make} install DESTDIR=%{buildroot}
 # Remove "samples", as we include them in %%doc
 %{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
-# Init script (based on the included one, but enhanced)
-%{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/keepalived
-# Sysconfig file (used by the init script)
-%{__install} -D -p -m 0640 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/sysconfig/keepalived
 
 
 %check
@@ -90,10 +85,10 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO
-%doc doc/keepalived.conf.SYNOPSIS doc/samples/
+%doc doc/keepalived.conf.SYNOPSIS doc/samples/ goodies/arpreset.pl
 %dir %{_sysconfdir}/keepalived/
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/keepalived
+%config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/keepalived
 %{_sysconfdir}/rc.d/init.d/keepalived
 %{_bindir}/genhash
 %{_sbindir}/keepalived
@@ -103,6 +98,14 @@
 
 
 %changelog
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
+- Update to 1.1.14.
+- Remove all upstreamed patches.
+- Remove our init script and sysconfig files, use the same now provided by the
+  upstream package (will need to patch for LSB stuff soonish).
+- Include new goodies/arpreset.pl in %%doc.
+- Add missing scriplet requirements.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-8
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2007 17:32:27 -0000	1.2
+++ sources	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-578bdb8e3ff4cca50fc877893bad658c  keepalived-1.1.13.tar.gz
+5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz


--- keepalived.init DELETED ---


--- keepalived.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 10:52:44 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 06:52:44 -0400
Subject: rpms/keepalived/devel keepalived.spec,1.4,1.5
Message-ID: <200709141052.l8EAqivU010593@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556

Modified Files:
	keepalived.spec 
Log Message:
Add popt-devel for F8+.



Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- keepalived.spec	14 Sep 2007 10:44:23 -0000	1.4
+++ keepalived.spec	14 Sep 2007 10:52:08 -0000	1.5
@@ -18,6 +18,10 @@
 BuildRequires: openssl-devel
 # We need both of these for proper LVS support
 BuildRequires: kernel, kernel-devel
+# We need popt, popt-devel is split out of rpm in Fedora 8+
+%if 0%{?fedora} >= 8
+BuildRequires: popt-devel
+%endif
 
 %description
 The main goal of the keepalived project is to add a strong & robust keepalive



From fedora-extras-commits at redhat.com  Fri Sep 14 11:09:15 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 04:09:15 -0700
Subject: [pkgdb] gettext: nphilipp has requested commit
Message-ID: <200709141109.l8EB9GNj029761@app3.fedora.phx.redhat.com>

Nils Philippsen (nphilipp) has requested the commit acl on gettext (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 11:09:18 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 04:09:18 -0700
Subject: [pkgdb] gettext: nphilipp has requested commit
Message-ID: <200709141109.l8EB9JP6019818@app4.fedora.phx.redhat.com>

Nils Philippsen (nphilipp) has requested the commit acl on gettext (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 11:17:00 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 07:17:00 -0400
Subject: rpms/compat-wxGTK26/devel wxGTK-2.6.3-strconv.patch, NONE,
	1.1 compat-wxGTK26.spec, 1.8, 1.9
Message-ID: <200709141117.l8EBH0wm017328@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-strconv.patch 
Log Message:
* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
- Patch some dangerous pointer dereferences in src/common/strconv.cpp.


wxGTK-2.6.3-strconv.patch:

--- NEW FILE wxGTK-2.6.3-strconv.patch ---
diff -Nur wxGTK-2.6.3-orig/src/common/strconv.cpp wxGTK-2.6.3/src/common/strconv.cpp
--- wxGTK-2.6.3-orig/src/common/strconv.cpp	2006-03-22 00:42:11.000000000 +0100
+++ wxGTK-2.6.3/src/common/strconv.cpp	2007-09-14 12:08:01.000000000 +0200
@@ -194,7 +194,7 @@
         }
     }
 
-    wxWCharBuffer buf((wchar_t *)NULL);
+    wxWCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -215,7 +215,7 @@
         }
     }
 
-    wxCharBuffer buf((char *)NULL);
+    wxCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -773,7 +773,7 @@
             len++;
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                    && cc == L'\\' && psz[0] == L'\\' )
+                    && cc == L'\\' && *psz && psz[0] == L'\\' )
         {
             if (buf)
                 *buf++ = (char)cc;
@@ -782,6 +782,7 @@
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
                     cc == L'\\' &&
+                  *psz && *(psz+1) && *(psz+2) &&
                         isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
         {
             if (buf)


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compat-wxGTK26.spec	28 Aug 2007 09:58:52 -0000	1.8
+++ compat-wxGTK26.spec	14 Sep 2007 11:16:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        7
+Release:        8
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,6 +15,7 @@
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
 #Patch4:         wxGTK-2.6.3-tooltips.patch
 Patch5:         wxGTK-2.6.3-expat2.patch
+Patch6:         wxGTK-2.6.3-strconv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -54,6 +55,7 @@
 %patch3 -p1 -b .g_thread_init
 #patch4 -p1 -b .tooltips
 %patch5 -p1 -b .expat2
+%patch6 -p1 -b .strconv
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
+- Patch some dangerous pointer dereferences in src/common/strconv.cpp.
+
 * Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-7
 - rebuilt for new expat (#195888)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:17:28 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 14 Sep 2007 07:17:28 -0400
Subject: rpms/im-chooser/devel im-chooser.spec,1.19,1.20
Message-ID: <200709141117.l8EBHSKZ017370@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17310

Modified Files:
	im-chooser.spec 
Log Message:
* Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
- Add README into the package.


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- im-chooser.spec	10 Sep 2007 12:35:57 -0000	1.19
+++ im-chooser.spec	14 Sep 2007 11:16:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,7 +57,7 @@
 
 %files -f %{name}.lang
 %defattr (-, root, root)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
+- Add README into the package.
+
 * Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:19:13 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 14 Sep 2007 04:19:13 -0700
Subject: [pkgdb] gettext had acl change status
Message-ID: <200709141119.l8EBJEvj019863@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has set the commit acl on gettext (Fedora devel) to Approved for Nils Philippsen (nphilipp)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 11:28:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 14 Sep 2007 07:28:04 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork-7.0.0-kwin-bluecurve.patch,
	NONE, 1.1 redhat-artwork.spec, 1.194, 1.195
Message-ID: <200709141128.l8EBS4nm017663@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/redhat-artwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17642

Modified Files:
	redhat-artwork.spec 
Added Files:
	redhat-artwork-7.0.0-kwin-bluecurve.patch 
Log Message:
fix bz276731, KWin theme shows pixel noise for "sticky" icon


redhat-artwork-7.0.0-kwin-bluecurve.patch:

--- NEW FILE redhat-artwork-7.0.0-kwin-bluecurve.patch ---
--- redhat-artwork-7.0.0/art/kde/kwin/Bluecurve/bluecurveclient.cpp.orig	2007-09-14 13:23:49.000000000 +0200
+++ redhat-artwork-7.0.0/art/kde/kwin/Bluecurve/bluecurveclient.cpp	2007-09-14 13:24:43.000000000 +0200
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 
-#define BASE_BUTTON_SIZE  17
+#define BASE_BUTTON_SIZE  16
 #define BORDER_WIDTH      6
 #define CORNER_RADIUS     12
 


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- redhat-artwork.spec	12 Aug 2007 04:20:46 -0000	1.194
+++ redhat-artwork.spec	14 Sep 2007 11:27:32 -0000	1.195
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 7.0.0
-Release: 11%{?dist} 
+Release: 11%{?dist}.1 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -18,6 +18,7 @@
 Patch0: redhat-artwork-7.0.0-kdm-userlist.patch
 Patch1: redhat-artwork-7.0.0-timed-login.patch
 Patch2: default-theme.patch
+Patch3: redhat-artwork-7.0.0-kwin-bluecurve.patch
 Group: User Interface/Desktops
 License: GPL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +76,7 @@
 %patch0 -p1 -b .kdm-userlist
 %patch1 -p1 -b .timed-login
 %patch2 -p1 -b .default-theme
+%patch3 -p1 -b .kwin-bluecurve
 
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
@@ -452,6 +454,9 @@
 %{_datadir}/apps/kwin/bluecurve.desktop
 
 %changelog
+* Fri Sep 14 2007 Than Ngo <than at redhat.com> - 7.0.0-11.1
+- fix bz276731, KWin theme shows pixel noise for "sticky" icon
+
 * Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 7.0.0-11
 - Switch default theme to use Nodoka
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:58:49 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 14 Sep 2007 07:58:49 -0400
Subject: rpms/xchat-gnome/F-7 xchat-gnome-0.18-reconnect.patch, NONE,
	1.1 xchat-gnome.spec, 1.39, 1.40
Message-ID: <200709141158.l8EBwnPM018312@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.18-reconnect.patch 
Log Message:
* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-3
- Add patch to fix reconnect bug. (#225408)


xchat-gnome-0.18-reconnect.patch:

--- NEW FILE xchat-gnome-0.18-reconnect.patch ---
--- trunk/plugins/net-monitor/net-monitor.c	2007/09/12 22:18:13	2568
+++ trunk/plugins/net-monitor/net-monitor.c	2007/09/13 01:25:13	2569
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include "xchat-plugin.h"
 
 #define NET_MONITOR_VERSION     "0.1"
@@ -166,6 +169,13 @@
 
 		g_hash_table_foreach (networks, (GHFunc) disconnect_from_network, NULL);
 	} else {
+		/*
+		 * We need to tell the nameserver resolver to reread
+		 * /etc/resolve.conf, since the nameservers might have changed
+		 * when moving between networks.
+		 */
+		res_init();
+
 		g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL);
 	}
 }


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-7/xchat-gnome.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xchat-gnome.spec	3 Aug 2007 01:46:19 -0000	1.39
+++ xchat-gnome.spec	14 Sep 2007 11:58:17 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-config.patch
+Patch1:		%{name}-%{version}-reconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .reconnect
 
 
 %build
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-3
+- Add patch to fix reconnect bug. (#225408)
+
 * Thu Aug  2 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-2
 - Update license tag.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:35 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:35 -0700
Subject: [pkgdb] festival: mattdm has requested watchbugzilla
Message-ID: <200709141216.l8ECGZ1G020384@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on festival (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:45 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:45 -0700
Subject: [pkgdb] festival: mattdm has requested commit
Message-ID: <200709141216.l8ECGjaE030778@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on festival (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:44 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:44 -0700
Subject: [pkgdb] festival: mattdm has requested watchcommits
Message-ID: <200709141216.l8ECGjal030769@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on festival (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:57 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:57 -0700
Subject: [pkgdb] festival: mattdm has requested watchbugzilla
Message-ID: <200709141216.l8ECGvU5020393@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on festival (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:58 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:58 -0700
Subject: [pkgdb] festival: mattdm has requested watchcommits
Message-ID: <200709141216.l8ECGwPh020403@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on festival (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:59 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:59 -0700
Subject: [pkgdb] festival: mattdm has requested commit
Message-ID: <200709141216.l8ECGxCg030787@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on festival (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 12:18:08 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 08:18:08 -0400
Subject: rpms/libsigc++20/devel .cvsignore, 1.5, 1.6 libsigc++.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200709141218.l8ECI84R024681@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24652

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 2.0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2006 21:19:42 -0000	1.5
+++ .cvsignore	14 Sep 2007 12:17:36 -0000	1.6
@@ -1 +1 @@
-libsigc++-2.0.17.tar.bz2
+libsigc++-2.0.18.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsigc++.spec	10 Aug 2007 08:24:18 -0000	1.12
+++ libsigc++.spec	14 Sep 2007 12:17:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libsigc++20
-Version:        2.0.17
-Release:        3
+Version:        2.0.18
+Release:        1
 
 Summary:        Typesafe signal framework for C++
 
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 2.0.18-1
+- Update to 2.0.18
+
 * Fri Aug 10 2007 Denis Leroy <denis at poolshark.org> - 2.0.17-3
 - Updated License tag as per new guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Feb 2006 21:19:42 -0000	1.6
+++ sources	14 Sep 2007 12:17:36 -0000	1.7
@@ -1 +1 @@
-fde0ee69e3125e982746d9fe005763e1  libsigc++-2.0.17.tar.bz2
+ddebf5aafc8525d10366a8724abc9f28  libsigc++-2.0.18.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 12:20:06 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:20:06 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, NONE,
	1.1 gettext.spec, 1.77,
	1.78 gettext-xglade-include-expat-285701.patch, 1.1, NONE
Message-ID: <200709141220.l8ECK6tQ024812@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24788

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Removed Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
remove gettext-xglade-include-expat-285701.patch, add gettext-xglade-define-xml-major-version-285701.patch to determine XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)


gettext-xglade-define-xml-major-version-285701.patch:

--- NEW FILE gettext-xglade-define-xml-major-version-285701.patch ---
diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
--- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 13:55:28.000000000 +0200
@@ -238,6 +238,22 @@ case "$host_os" in
     LTLIBEXPAT="-ldl"
     AC_SUBST(LIBEXPAT)
     AC_SUBST(LTLIBEXPAT)
+    AC_CHECK_HEADER([expat.h],[
+        cat > xml_major_version.c << EOF
+#include <stdio.h>
+#include <expat.h>
+int main (void) { printf ("%d\n", XML_MAJOR_VERSION); }
+EOF
+        AC_MSG_CHECKING([for libexpat XML_MAJOR_VERSION])
+        $CC -o xml_major_version xml_major_version.c
+        XML_MAJOR_VERSION=$(./xml_major_version)
+        rm -f ./xml_major_version ./xml_major_version.c
+        AC_MSG_RESULT([$XML_MAJOR_VERSION])
+        AC_SUBST(XML_MAJOR_VERSION)
+        AC_DEFINE([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
+    ],[
+        AC_ERROR([cannot determine version of expat library, expat.h is missing])
+    ])
     ;;
   *)
     AC_LIB_HAVE_LINKFLAGS([expat], [],


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
+++ gettext.spec	14 Sep 2007 12:19:34 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -14,8 +14,9 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %ifarch x86_64 ppc64 s390x
-BuildRequires: automake >= 1.8, autoconf >= 2.5
+BuildRequires: automake >= 1.8
 %endif
+BuildRequires: autoconf >= 2.5
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
 # need expat for xgettext on glade
 Buildrequires: expat-devel
@@ -28,7 +29,7 @@
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
 Patch3: gettext-php-prinf-output-237241.patch
-Patch4: gettext-xglade-include-expat-285701.patch
+Patch4: gettext-xglade-define-xml-major-version-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -69,6 +70,11 @@
 
 
 %build
+pushd gettext-tools
+autoconf
+autoheader
+popd
+
 [ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
 
 export JAVAC=gcj
@@ -231,6 +237,11 @@
 
 
 %changelog
+* Fri Sep 14 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-11
+- remove gettext-xglade-include-expat-285701.patch, add
+  gettext-xglade-define-xml-major-version-285701.patch to determine
+  XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)
+
 * Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-10
 - buildrequire expat-devel
 - add gettext-xglade-include-expat-285701.patch to include expat.h


--- gettext-xglade-include-expat-285701.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 12:26:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 08:26:56 -0400
Subject: rpms/maxima/devel maxima.spec,1.82,1.83 xmaxima.desktop,1.5,1.6
Message-ID: <200709141226.l8ECQuV6025222@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25196

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
- xmaxima.desktop: Categories =- Education



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- maxima.spec	30 Aug 2007 18:29:47 -0000	1.82
+++ maxima.spec	14 Sep 2007 12:26:24 -0000	1.83
@@ -2,7 +2,7 @@
 Name: 	 maxima
 Version: 5.13.0
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -419,8 +419,12 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
+- xmaxima.desktop: Categories =- Education
+
 * Thu Aug 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-4
-- (re)--enable-gcl (#256281)
+- (re)--enable-gcl, f8+ (#256281)
+- fix inadvertant Obsoletes: maxima-runtime-gcl (f7)
 
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-3
 - until it is unborked, disable gcl support, f8+ (#256281)


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmaxima.desktop	26 Oct 2006 20:31:22 -0000	1.5
+++ xmaxima.desktop	14 Sep 2007 12:26:24 -0000	1.6
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Science;Education;Math;
+Categories=Science;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Fri Sep 14 12:30:56 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:30:56 -0400
Subject: rpms/gettext/devel gettext.spec,1.78,1.79
Message-ID: <200709141230.l8ECUuvU025368@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25343

Modified Files:
	gettext.spec 
Log Message:
fix changelog, take the blame for 0.16.1-11



Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gettext.spec	14 Sep 2007 12:19:34 -0000	1.78
+++ gettext.spec	14 Sep 2007 12:30:24 -0000	1.79
@@ -237,7 +237,7 @@
 
 
 %changelog
-* Fri Sep 14 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-11
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.16.1-11
 - remove gettext-xglade-include-expat-285701.patch, add
   gettext-xglade-define-xml-major-version-285701.patch to determine
   XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)



From fedora-extras-commits at redhat.com  Fri Sep 14 12:47:01 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:47:01 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.47,1.48 sources,1.41,1.42
Message-ID: <200709141247.l8ECl1ML025878@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25839

Modified Files:
	hwbrowser.spec sources 
Log Message:
don't buildrequire expat



Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- hwbrowser.spec	11 Sep 2007 12:26:39 -0000	1.47
+++ hwbrowser.spec	14 Sep 2007 12:46:29 -0000	1.48
@@ -12,7 +12,6 @@
 BuildRequires: automake
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
-BuildRequires: expat
 Requires: gnome-python2
 Requires: gnome-python2-canvas
 Requires: pygtk2
@@ -53,9 +52,8 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
-* Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
-- buildrequire expat to augment xgettext for glade files
 
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	11 Sep 2007 12:26:39 -0000	1.41
+++ sources	14 Sep 2007 12:46:29 -0000	1.42
@@ -1 +1 @@
-2c98067d3f3f4f91ecf4f9f321f1e984  hwbrowser-0.36.tar.bz2
+a51bf81470d82846a0cf6f185f44bc3a  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 12:55:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 08:55:35 -0400
Subject: rpms/maxima/devel maxima.spec,1.83,1.84 xmaxima.desktop,1.6,1.7
Message-ID: <200709141255.l8ECtZOn026244@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-6
- xmaxima.desktop: Categories=Development,Math



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- maxima.spec	14 Sep 2007 12:26:24 -0000	1.83
+++ maxima.spec	14 Sep 2007 12:55:02 -0000	1.84
@@ -2,7 +2,7 @@
 Name: 	 maxima
 Version: 5.13.0
 
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -21,14 +21,13 @@
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp sbcl
 %if 0%{?fedora} > 2
-%define default_lisp sbcl 
 %define _enable_clisp --enable-clisp 
-# disable until unborked, http://bugzilla.redhat.com/256281
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl
 %else
-%define default_lisp sbcl 
+# epel/rhel
 %define _enable_sbcl --enable-sbcl 
 %endif
 %endif
@@ -419,8 +418,8 @@
 
 
 %changelog
-* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
-- xmaxima.desktop: Categories =- Education
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-6
+- xmaxima.desktop: Categories=Development,Math
 
 * Thu Aug 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-4
 - (re)--enable-gcl, f8+ (#256281)


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmaxima.desktop	14 Sep 2007 12:26:24 -0000	1.6
+++ xmaxima.desktop	14 Sep 2007 12:55:02 -0000	1.7
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Science;Math;
+Categories=Development;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Fri Sep 14 13:06:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 09:06:12 -0400
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.14,1.15
Message-ID: <200709141306.l8ED6C9T032587@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32556

Modified Files:
	wxMaxima.spec 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4
- wxmaxima.desktop: Categories=Development,Math



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wxMaxima.spec	25 Aug 2007 13:55:20 -0000	1.14
+++ wxMaxima.spec	14 Sep 2007 13:05:39 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -62,10 +62,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor="" \
-  --add-category="Education" \
+  --add-category="Development" \
   --add-category="Math" \
   --remove-category="Utility" \
   wxmaxima.desktop 
@@ -105,6 +104,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4
+- wxmaxima.desktop: Categories=Development,Math
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-3
 - License: GPLv2+
 - revert to classic icon scriptlets



From fedora-extras-commits at redhat.com  Fri Sep 14 13:06:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 09:06:40 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, 1.1, 1.2
Message-ID: <200709141306.l8ED6eYN032698@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32586

Modified Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Log Message:
AC_DEFINE([XML_MAJOR_VERSION], ...) -> AC_DEFINE_UNQUOTED(...)


gettext-xglade-define-xml-major-version-285701.patch:

Index: gettext-xglade-define-xml-major-version-285701.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext-xglade-define-xml-major-version-285701.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 12:19:34 -0000	1.1
+++ gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 13:06:38 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
 --- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
-+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 13:55:28.000000000 +0200
++++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 15:03:43.000000000 +0200
 @@ -238,6 +238,22 @@ case "$host_os" in
      LTLIBEXPAT="-ldl"
      AC_SUBST(LIBEXPAT)
@@ -17,7 +17,7 @@
 +        rm -f ./xml_major_version ./xml_major_version.c
 +        AC_MSG_RESULT([$XML_MAJOR_VERSION])
 +        AC_SUBST(XML_MAJOR_VERSION)
-+        AC_DEFINE([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
++        AC_DEFINE_UNQUOTED([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
 +    ],[
 +        AC_ERROR([cannot determine version of expat library, expat.h is missing])
 +    ])



From fedora-extras-commits at redhat.com  Fri Sep 14 13:12:12 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 14 Sep 2007 09:12:12 -0400
Subject: rpms/dbus/devel dbus-1.1.2-audit-user.patch, NONE, 1.1 dbus.spec,
	1.127, 1.128
Message-ID: <200709141312.l8EDCCZo001061@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv974

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1.2-audit-user.patch 
Log Message:
* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
- Reverse we_were_root check to setpcap if we were root.  Also only init
audit if we were root.  So error dbus message will not show up when policy 
reload happens.  dbus -session will no longer try to send audit message, 
only system will.


dbus-1.1.2-audit-user.patch:

--- NEW FILE dbus-1.1.2-audit-user.patch ---
diff -up dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c.audit-user dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c
--- dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c.audit-user	2007-07-24 11:39:09.000000000 -0400
+++ dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c	2007-09-14 09:00:24.000000000 -0400
@@ -300,7 +300,7 @@ _dbus_change_to_daemon_user  (const char
    * run as ... doesn't really help. But keeps people happy.
    */
     
-  if (!we_were_root)
+  if (we_were_root)
     {
       cap_value_t new_cap_list[] = { CAP_AUDIT_WRITE };
       cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, CAP_SETGID };
@@ -376,7 +376,7 @@ _dbus_change_to_daemon_user  (const char
     }
   
 #ifdef HAVE_LIBAUDIT
-  if (!we_were_root)
+  if (we_were_root)
     {
       if (cap_set_proc (new_caps))
         {
@@ -395,6 +395,7 @@ _dbus_change_to_daemon_user  (const char
                           _dbus_strerror (errno));
           return FALSE;
         }
+      audit_init();
     }
 #endif
 
diff -up dbus-1.1.2/bus/selinux.c.audit-user dbus-1.1.2/bus/selinux.c
--- dbus-1.1.2/bus/selinux.c.audit-user	2007-07-24 11:39:08.000000000 -0400
+++ dbus-1.1.2/bus/selinux.c	2007-09-14 08:31:14.000000000 -0400
@@ -113,7 +113,7 @@ static const struct avc_lock_callback lo
 static int audit_fd = -1;
 #endif
 
-static void
+void
 audit_init(void)
 {
 #ifdef HAVE_LIBAUDIT  
@@ -350,12 +350,8 @@ bus_selinux_full_init (void)
 
   freecon (bus_context);
   
-  audit_init ();
-
-  return TRUE;
-#else
-  return TRUE;
 #endif /* HAVE_SELINUX */
+  return TRUE;
 }
 
 /**


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- dbus.spec	28 Aug 2007 21:57:03 -0000	1.127
+++ dbus.spec	14 Sep 2007 13:11:38 -0000	1.128
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -37,6 +37,7 @@
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
+Patch3: dbus-1.1.2-audit-user.patch
 
 %description
 
@@ -79,6 +80,7 @@
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .lsb
+%patch3 -p1 -b .audit-user
 
 autoreconf -f -i
 
@@ -198,6 +200,12 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
+- Reverse we_were_root check to setpcap if we were root.  Also only init
+audit if we were root.  So error dbus message will not show up when policy 
+reload happens.  dbus -session will no longer try to send audit message, 
+only system will.
+
 * Tue Aug 28 2007 David Zeuthen <davidz at redhat.com> - 1.1.2-4%{?dist}
 - Make dbus require dbus-libs (#261721)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 13:23:46 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Sep 2007 09:23:46 -0400
Subject: rpms/glpk/devel .cvsignore, 1.9, 1.10 glpk.spec, 1.14, 1.15 sources,
	1.9, 1.10
Message-ID: <200709141323.l8EDNkAr003325@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/glpk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3176

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
New release. Update license tag to GPLv3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Jul 2007 04:13:57 -0000	1.9
+++ .cvsignore	14 Sep 2007 13:23:14 -0000	1.10
@@ -1 +1 @@
-glpk-4.20.tar.gz
+glpk-4.21.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glpk.spec	23 Aug 2007 18:42:40 -0000	1.14
+++ glpk.spec	14 Sep 2007 13:23:14 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           glpk
-Version:        4.20
-Release:        3%{?dist}
+Version:        4.21
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv3
 URL:            http://www.gnu.org/software/glpk/glpk.html
 Source0:        ftp://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Quentin Spencer <qspencer at users.sf.net> 4.21-1
+- New release. Update license tag to GPLv3.
+
 * Thu Aug 23 2007 Quentin Spencer <qspencer at users.sf.net> 4.20-3
 - Rebuild for F8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2007 04:13:57 -0000	1.9
+++ sources	14 Sep 2007 13:23:14 -0000	1.10
@@ -1 +1 @@
-6dd68d9eef35c524489f3e935a0dae34  glpk-4.20.tar.gz
+a41df71415c97fc5c541d19547ced10a  glpk-4.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 14:18:28 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 10:18:28 -0400
Subject: rpms/keepalived/devel keepalived-1.1.14-include.patch, NONE,
	1.1 keepalived.spec, 1.5, 1.6
Message-ID: <200709141418.l8EEISLI016504@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16418

Modified Files:
	keepalived.spec 
Added Files:
	keepalived-1.1.14-include.patch 
Log Message:
Include patch from Shinji Tanaka to fix conf include.


keepalived-1.1.14-include.patch:

--- NEW FILE keepalived-1.1.14-include.patch ---
diff -Naupr keepalived-1.1.14.orig/lib/parser.c keepalived-1.1.14/lib/parser.c
--- keepalived-1.1.14.orig/lib/parser.c	2007-09-13 17:14:16.000000000 +0200
+++ keepalived-1.1.14/lib/parser.c	2007-09-14 16:14:26.000000000 +0200
@@ -33,6 +33,7 @@
 
 /* global vars */
 vector keywords;
+vector current_keywords;
 FILE *current_stream;
 char *current_conf_file;
 int reload = 0;
@@ -213,7 +214,7 @@ void read_conf_file(char *conf_file)
 		char *confpath = strdup(globbuf.gl_pathv[i]);
 		dirname(confpath);
 		chdir(confpath);
-		process_stream(keywords);
+		process_stream(current_keywords);
 		fclose(stream);
 
 		chdir(prev_path);
@@ -388,6 +389,8 @@ process_stream(vector keywords_vec)
 	char *str;
 	char *buf;
 	vector strvec;
+	vector prev_keywords = current_keywords;
+	current_keywords = keywords_vec;
 
 	buf = zalloc(MAXBUF);
 	while (read_line(buf, MAXBUF)) {
@@ -423,6 +426,7 @@ process_stream(vector keywords_vec)
 		free_strvec(strvec);
 	}
 
+	current_keywords = prev_keywords;
 	free(buf);
 	return;
 }
@@ -442,6 +446,7 @@ init_data(char *conf_file, vector (*init
 #endif
 
 	/* Stream handling */
+	current_keywords = keywords;
 	read_conf_file((conf_file) ? conf_file : CONF);
 	free_keywords(keywords);
 }


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- keepalived.spec	14 Sep 2007 10:52:08 -0000	1.5
+++ keepalived.spec	14 Sep 2007 14:17:56 -0000	1.6
@@ -4,13 +4,14 @@
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Patch0: keepalived-1.1.14-genhashman.patch
 Patch1: keepalived-1.1.14-installmodes.patch
+Patch2: keepalived-1.1.14-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .genhashman
 %patch1 -p1 -b .installmodes
+%patch2 -p1 -b .include
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -102,6 +104,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
+- Include patch from Shinji Tanaka to fix conf include from inside some
+  directives like vrrp_instance.
+
 * Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
 - Update to 1.1.14.
 - Remove all upstreamed patches.



From fedora-extras-commits at redhat.com  Fri Sep 14 14:24:08 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 10:24:08 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, 1.2, 1.3
Message-ID: <200709141424.l8EEO8Vh017216@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Log Message:
add missing typedefs to gettext-xglade-define-xml-major-version-285701.patch


gettext-xglade-define-xml-major-version-285701.patch:

Index: gettext-xglade-define-xml-major-version-285701.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext-xglade-define-xml-major-version-285701.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 13:06:38 -0000	1.2
+++ gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 14:24:06 -0000	1.3
@@ -24,3 +24,14 @@
      ;;
    *)
      AC_LIB_HAVE_LINKFLAGS([expat], [],
+diff -up gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~ gettext-0.16.1/gettext-tools/src/x-glade.c
+--- gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~	2006-11-27 18:02:08.000000000 +0100
++++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-14 15:46:23.000000000 +0200
+@@ -114,6 +114,7 @@ init_keywords ()
+ typedef void *XML_Parser;
+ typedef char XML_Char;
+ typedef char XML_LChar;
++typedef unsigned long XML_Size;
+ enum XML_Error { XML_ERROR_NONE };
+ typedef void (*XML_StartElementHandler) (void *userData, const XML_Char *name, const XML_Char **atts);
+ typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);



From fedora-extras-commits at redhat.com  Fri Sep 14 14:30:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 10:30:49 -0400
Subject: rpms/geomview/devel x-oogl.desktop, NONE, 1.1 x-oogl.xml, NONE,
	1.1 geomview.desktop, 1.5, 1.6 geomview.spec, 1.39, 1.40
Message-ID: <200709141430.l8EEUnfq018086@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18010

Modified Files:
	geomview.desktop geomview.spec 
Added Files:
	x-oogl.desktop x-oogl.xml 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
- use model/vrml,object/x-oogl(register) mimetypes



--- NEW FILE x-oogl.desktop ---
[Desktop Entry]
Type=MimeType
MimeType=object/x-oogl
Icon=geomview
Patterns=*.oogl;*.off;*.list;*.tlist;*;grp;*.quad;*.mesh;*.inst;*.bez;*.vect;
Comment=OOGL file
Encoding=UTF-8


--- NEW FILE x-oogl.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">

  <mime-type type="object/x-oogl">
    <comment>OOGL file</comment>
    <glob pattern="*.oogl" />
    <glob pattern="*.off" />
    <glob pattern="*.list" />
    <glob pattern="*.tlist" />
    <glob pattern="*.grp" />
    <glob pattern="*.quad" />
    <glob pattern="*.mesh" />
    <glob pattern="*.inst" />
    <glob pattern="*.bez" />
    <glob pattern="*.vect" />
    <alias type="application/x-geomview"/>
  </mime-type>

</mime-info>



Index: geomview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.desktop	16 Jul 2007 16:56:45 -0000	1.5
+++ geomview.desktop	14 Sep 2007 14:30:16 -0000	1.6
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview;
+MimeType=application/x-geomview;model/vrml;object/x-oogl;
 Type=Application
 Encoding=UTF-8
 Categories=Graphics;Math;Science;


Index: geomview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- geomview.spec	28 Aug 2007 02:51:40 -0000	1.39
+++ geomview.spec	14 Sep 2007 14:30:16 -0000	1.40
@@ -2,7 +2,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -15,6 +15,8 @@
 
 Source1: geomview.desktop
 Source2: geomview.png
+Source3: x-oogl.xml
+Source4: x-oogl.desktop
 
 BuildRequires: desktop-file-utils
 BuildRequires: byacc flex
@@ -44,6 +46,8 @@
 BuildRequires: tetex
 %endif
 
+# for %_datadir/mimelnk
+Requires: kde-filesystem
 Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -79,25 +83,31 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # .desktop entry
 desktop-file-install --vendor="fedora" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
   %{SOURCE1}
 
 # app icon
-install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+
+# mime
+install -p -m644 -D %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
+
+# mimelnk (kde3)
+install -p -m644 -D %{SOURCE4} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -105,7 +115,8 @@
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+update-desktop-database -q > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -116,21 +127,24 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+update-desktop-database -a > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%{_bindir}/*
 %{_docdir}/geomview/
 %{_datadir}/applications/*.desktop
+%{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
-%{_bindir}/*
+%{_datadir}/mimelnk/*
+%{_datadir}/mime/packages/*.xml
 %{_infodir}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
-%{_datadir}/geomview/
 %{_libdir}/libgeomview-%{version}.so
 %{_libexecdir}/geomview/
 
@@ -141,6 +155,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
+- use model/vrml,object/x-oogl(register) mimetypes
+
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-2
 - BR: gawk
 



From fedora-extras-commits at redhat.com  Fri Sep 14 14:39:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 10:39:40 -0400
Subject: comps comps-f8.xml.in,1.108,1.109
Message-ID: <200709141439.l8EEder7021289@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067

Modified Files:
	comps-f8.xml.in 
Log Message:
I should learn to type.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- comps-f8.xml.in	14 Sep 2007 08:21:29 -0000	1.108
+++ comps-f8.xml.in	14 Sep 2007 14:39:09 -0000	1.109
@@ -3158,7 +3158,7 @@
   </group>
   <group>
     <id>somali-support</id>
-    <_name>Somail Support</_name>
+    <_name>Somali Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From fedora-extras-commits at redhat.com  Fri Sep 14 14:39:41 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 10:39:41 -0400
Subject: comps/po af.po, 1.3, 1.4 am.po, 1.3, 1.4 ar.po, 1.3, 1.4 as.po, 1.3,
	1.4 be.po, 1.3, 1.4 bg.po, 1.3, 1.4 bn.po, 1.3, 1.4 bn_IN.po,
	1.3, 1.4 bs.po, 1.3, 1.4 ca.po, 1.3, 1.4 comps.pot, 1.7,
	1.8 cs.po, 1.3, 1.4 cy.po, 1.3, 1.4 da.po, 1.3, 1.4 de.po, 1.3,
	1.4 el.po, 1.4, 1.5 en_GB.po, 1.3, 1.4 es.po, 1.3, 1.4 et.po,
	1.3, 1.4 fa.po, 1.3, 1.4 fi.po, 1.3, 1.4 fr.po, 1.3, 1.4 gl.po,
	1.3, 1.4 gu.po, 1.3, 1.4 he.po, 1.3, 1.4 hi.po, 1.3, 1.4 hr.po,
	1.3, 1.4 hu.po, 1.3, 1.4 hy.po, 1.3, 1.4 id.po, 1.3, 1.4 ilo.po,
	1.3, 1.4 is.po, 1.3, 1.4 it.po, 1.3, 1.4 ja.po, 1.3, 1.4 ka.po,
	1.3, 1.4 kn.po, 1.3, 1.4 ko.po, 1.3, 1.4 ku.po, 1.3, 1.4 lo.po,
	1.3, 1.4 lv.po, 1.3, 1.4 mk.po, 1.3, 1.4 ml.po, 1.3, 1.4 mr.po,
	1.3, 1.4 ms.po, 1.3, 1.4 my.po, 1.3, 1.4 nb.po, 1.3, 1.4 nl.po,
	1.3, 1.4 no.po, 1.3, 1.4 nso.po, 1.3, 1.4 or.po, 1.3, 1.4 pa.po,
	1.3, 1.4 pl.po, 1.5, 1.6 pt.po, 1.3, 1.4 pt_BR.po, 1.4,
	1.5 ro.po, 1.3, 1.4 ru.po, 1.3, 1.4 si.po, 1.3, 1.4 sk.po, 1.3,
	1.4 sl.po, 1.3, 1.4 sq.po, 1.3, 1.4 sr.po, 1.4, 1.5 sr@Latn.po,
	1.4, 1.5 sv.po, 1.3, 1.4 ta.po, 1.3, 1.4 te.po, 1.3, 1.4 th.po,
	1.3, 1.4 tl.po, 1.3, 1.4 tr.po, 1.3, 1.4 uk.po, 1.3, 1.4 ur.po,
	1.3, 1.4 vi.po, 1.3, 1.4 zh_CN.po, 1.3, 1.4 zh_TW.po, 1.3,
	1.4 zu.po, 1.3, 1.4
Message-ID: <200709141439.l8EEdfGp021367@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067/po

Modified Files:
	af.po am.po ar.po as.po be.po bg.po bn.po bn_IN.po bs.po ca.po 
	comps.pot cs.po cy.po da.po de.po el.po en_GB.po es.po et.po 
	fa.po fi.po fr.po gl.po gu.po he.po hi.po hr.po hu.po hy.po 
	id.po ilo.po is.po it.po ja.po ka.po kn.po ko.po ku.po lo.po 
	lv.po mk.po ml.po mr.po ms.po my.po nb.po nl.po no.po nso.po 
	or.po pa.po pl.po pt.po pt_BR.po ro.po ru.po si.po sk.po sl.po 
	sq.po sr.po sr at Latn.po sv.po ta.po te.po th.po tl.po tr.po 
	uk.po ur.po vi.po zh_CN.po zh_TW.po zu.po 
Log Message:
I should learn to type.



Index: af.po
===================================================================
RCS file: /cvs/extras/comps/po/af.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- af.po	5 Sep 2007 06:20:05 -0000	1.3
+++ af.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -902,7 +902,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Tamil taalsteun"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: am.po
===================================================================
RCS file: /cvs/extras/comps/po/am.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- am.po	5 Sep 2007 06:20:05 -0000	1.3
+++ am.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "????????? ?????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ar.po
===================================================================
RCS file: /cvs/extras/comps/po/ar.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ar.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ar.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -883,7 +883,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: as.po
===================================================================
RCS file: /cvs/extras/comps/po/as.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- as.po	5 Sep 2007 06:20:05 -0000	1.3
+++ as.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: be.po
===================================================================
RCS file: /cvs/extras/comps/po/be.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- be.po	5 Sep 2007 06:20:05 -0000	1.3
+++ be.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -881,7 +881,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????????? ????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bg.po
===================================================================
RCS file: /cvs/extras/comps/po/bg.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bg.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bg.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -865,7 +865,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bn.po
===================================================================
RCS file: /cvs/extras/comps/po/bn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bn.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -883,7 +883,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "????????? ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bn_IN.po
===================================================================
RCS file: /cvs/extras/comps/po/bn_IN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bn_IN.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bn_IN.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -927,7 +927,7 @@
 # modified for RHEL
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bs.po
===================================================================
RCS file: /cvs/extras/comps/po/bs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bs.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bs.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -862,7 +862,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podr??ka za swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ca.po
===================================================================
RCS file: /cvs/extras/comps/po/ca.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ca.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ca.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suport per al swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: comps.pot
===================================================================
RCS file: /cvs/extras/comps/po/comps.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comps.pot	5 Sep 2007 06:20:05 -0000	1.7
+++ comps.pot	14 Sep 2007 14:39:10 -0000	1.8
@@ -803,7 +803,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: cs.po
===================================================================
RCS file: /cvs/extras/comps/po/cs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cs.po	5 Sep 2007 06:20:05 -0000	1.3
+++ cs.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -881,7 +881,7 @@
 # FIXME
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati (P??kist??n)"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: cy.po
===================================================================
RCS file: /cvs/extras/comps/po/cy.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cy.po	5 Sep 2007 06:20:05 -0000	1.3
+++ cy.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -865,7 +865,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Cynhaliaeth Thai"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: da.po
===================================================================
RCS file: /cvs/extras/comps/po/da.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- da.po	5 Sep 2007 06:20:05 -0000	1.3
+++ da.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -877,7 +877,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Underst??ttelse for swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: de.po
===================================================================
RCS file: /cvs/extras/comps/po/de.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.po	5 Sep 2007 06:20:05 -0000	1.3
+++ de.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -903,7 +903,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Unterst??tzung f??r Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: el.po
===================================================================
RCS file: /cvs/extras/comps/po/el.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- el.po	5 Sep 2007 06:20:05 -0000	1.4
+++ el.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -891,7 +891,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????? Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: en_GB.po
===================================================================
RCS file: /cvs/extras/comps/po/en_GB.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- en_GB.po	5 Sep 2007 06:20:05 -0000	1.3
+++ en_GB.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -860,7 +860,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Thai Support"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: es.po
===================================================================
RCS file: /cvs/extras/comps/po/es.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- es.po	5 Sep 2007 06:20:05 -0000	1.3
+++ es.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Soporte para Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: et.po
===================================================================
RCS file: /cvs/extras/comps/po/et.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- et.po	5 Sep 2007 06:20:05 -0000	1.3
+++ et.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -875,7 +875,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "tai keele toetus"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fa.po
===================================================================
RCS file: /cvs/extras/comps/po/fa.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fa.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fa.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -890,7 +890,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fi.po
===================================================================
RCS file: /cvs/extras/comps/po/fi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -871,7 +871,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Siswatin kielituki"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fr.po
===================================================================
RCS file: /cvs/extras/comps/po/fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -898,7 +898,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Support Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: gl.po
===================================================================
RCS file: /cvs/extras/comps/po/gl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ gl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -875,7 +875,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Soporte para o tai"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: gu.po
===================================================================
RCS file: /cvs/extras/comps/po/gu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ gu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -861,7 +861,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: he.po
===================================================================
RCS file: /cvs/extras/comps/po/he.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- he.po	5 Sep 2007 06:20:05 -0000	1.3
+++ he.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -803,7 +803,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hi.po
===================================================================
RCS file: /cvs/extras/comps/po/hi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hr.po
===================================================================
RCS file: /cvs/extras/comps/po/hr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podr??ka za swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hu.po
===================================================================
RCS file: /cvs/extras/comps/po/hu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati nyelvi t??mogat??s"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hy.po
===================================================================
RCS file: /cvs/extras/comps/po/hy.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hy.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hy.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -839,7 +839,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: id.po
===================================================================
RCS file: /cvs/extras/comps/po/id.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- id.po	5 Sep 2007 06:20:05 -0000	1.3
+++ id.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -860,7 +860,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Dukungan Tamil"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ilo.po
===================================================================
RCS file: /cvs/extras/comps/po/ilo.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ilo.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ilo.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -817,7 +817,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Panagsayangkat ti Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: is.po
===================================================================
RCS file: /cvs/extras/comps/po/is.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- is.po	5 Sep 2007 06:20:05 -0000	1.3
+++ is.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -845,7 +845,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: it.po
===================================================================
RCS file: /cvs/extras/comps/po/it.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- it.po	5 Sep 2007 06:20:05 -0000	1.3
+++ it.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -894,7 +894,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Supporto per lo Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ja.po
===================================================================
RCS file: /cvs/extras/comps/po/ja.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ja.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ja.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -873,7 +873,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ka.po
===================================================================
RCS file: /cvs/extras/comps/po/ka.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ka.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ka.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -823,7 +823,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: kn.po
===================================================================
RCS file: /cvs/extras/comps/po/kn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ kn.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -858,7 +858,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ko.po
===================================================================
RCS file: /cvs/extras/comps/po/ko.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ko.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ko.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ku.po
===================================================================
RCS file: /cvs/extras/comps/po/ku.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ku.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ku.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: lo.po
===================================================================
RCS file: /cvs/extras/comps/po/lo.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lo.po	5 Sep 2007 06:20:05 -0000	1.3
+++ lo.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: lv.po
===================================================================
RCS file: /cvs/extras/comps/po/lv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lv.po	5 Sep 2007 06:20:05 -0000	1.3
+++ lv.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati atbalsts"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: mk.po
===================================================================
RCS file: /cvs/extras/comps/po/mk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ mk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -874,7 +874,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ml.po
===================================================================
RCS file: /cvs/extras/comps/po/ml.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ml.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ml.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: mr.po
===================================================================
RCS file: /cvs/extras/comps/po/mr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ mr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ms.po
===================================================================
RCS file: /cvs/extras/comps/po/ms.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ms.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ms.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -872,7 +872,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Sokongan Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: my.po
===================================================================
RCS file: /cvs/extras/comps/po/my.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- my.po	5 Sep 2007 06:20:05 -0000	1.3
+++ my.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nb.po
===================================================================
RCS file: /cvs/extras/comps/po/nb.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nb.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nb.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??tte for Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nl.po
===================================================================
RCS file: /cvs/extras/comps/po/nl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -888,7 +888,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati ondersteuning"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: no.po
===================================================================
RCS file: /cvs/extras/comps/po/no.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- no.po	5 Sep 2007 06:20:05 -0000	1.3
+++ no.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -864,7 +864,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??tte for siamesisk"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nso.po
===================================================================
RCS file: /cvs/extras/comps/po/nso.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nso.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nso.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -908,7 +908,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Thekgo ya se-Tamil"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: or.po
===================================================================
RCS file: /cvs/extras/comps/po/or.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- or.po	5 Sep 2007 06:20:05 -0000	1.3
+++ or.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -873,7 +873,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pa.po
===================================================================
RCS file: /cvs/extras/comps/po/pa.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pa.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pa.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -858,7 +858,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pl.po
===================================================================
RCS file: /cvs/extras/comps/po/pl.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pl.po	10 Sep 2007 15:10:54 -0000	1.5
+++ pl.po	14 Sep 2007 14:39:10 -0000	1.6
@@ -837,7 +837,7 @@
 msgstr "Najmniejsza mo??liwa instalacja"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Obs??uga somalijskiego"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pt.po
===================================================================
RCS file: /cvs/extras/comps/po/pt.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pt.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pt.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -906,7 +906,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suporte a Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pt_BR.po	9 Sep 2007 03:07:59 -0000	1.4
+++ pt_BR.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -1141,8 +1141,8 @@
 
 #: ../comps-f7.xml.in.h:126
 #: ../comps-f8.xml.in.h:135
-msgid "Somail Support"
-msgstr "Suporte ?? Somail"
+msgid "Somali Support"
+msgstr "Suporte ?? Somali"
 
 #: ../comps-f7.xml.in.h:127
 #: ../comps-f8.xml.in.h:136


Index: ro.po
===================================================================
RCS file: /cvs/extras/comps/po/ro.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ro.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ro.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -872,7 +872,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suport pentru Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ru.po
===================================================================
RCS file: /cvs/extras/comps/po/ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ru.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ru.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -878,7 +878,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: si.po
===================================================================
RCS file: /cvs/extras/comps/po/si.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- si.po	5 Sep 2007 06:20:05 -0000	1.3
+++ si.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -849,7 +849,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sk.po
===================================================================
RCS file: /cvs/extras/comps/po/sk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -871,7 +871,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podpora swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sl.po
===================================================================
RCS file: /cvs/extras/comps/po/sl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -859,7 +859,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podpora Svat????ini"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sq.po
===================================================================
RCS file: /cvs/extras/comps/po/sq.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sq.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sq.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sr.po
===================================================================
RCS file: /cvs/extras/comps/po/sr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sr.po	8 Sep 2007 23:59:43 -0000	1.4
+++ sr.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -839,7 +839,7 @@
 msgstr "?????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sr at Latn.po
===================================================================
RCS file: /cvs/extras/comps/po/sr at Latn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sr at Latn.po	9 Sep 2007 00:00:38 -0000	1.4
+++ sr at Latn.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -839,8 +839,8 @@
 msgstr "Najmanja mogu??a instalacija"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
-msgstr "Podr??ka za somail"
+msgid "Somali Support"
+msgstr "Podr??ka za somali"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""


Index: sv.po
===================================================================
RCS file: /cvs/extras/comps/po/sv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sv.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sv.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -874,7 +874,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??d f??r siswati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ta.po
===================================================================
RCS file: /cvs/extras/comps/po/ta.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ta.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ta.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: te.po
===================================================================
RCS file: /cvs/extras/comps/po/te.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- te.po	5 Sep 2007 06:20:05 -0000	1.3
+++ te.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: th.po
===================================================================
RCS file: /cvs/extras/comps/po/th.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- th.po	5 Sep 2007 06:20:05 -0000	1.3
+++ th.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -851,7 +851,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: tl.po
===================================================================
RCS file: /cvs/extras/comps/po/tl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ tl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -823,7 +823,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suporte para sa Wikang Gales"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: tr.po
===================================================================
RCS file: /cvs/extras/comps/po/tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ tr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati Dil Deste??i"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: uk.po
===================================================================
RCS file: /cvs/extras/comps/po/uk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ uk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -856,7 +856,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ur.po
===================================================================
RCS file: /cvs/extras/comps/po/ur.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ur.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ur.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -866,7 +866,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: vi.po
===================================================================
RCS file: /cvs/extras/comps/po/vi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ vi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -886,7 +886,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "H??? tr??? ??? R???p"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zh_CN.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_CN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh_CN.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zh_CN.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -862,7 +862,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati ?????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zh_TW.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_TW.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh_TW.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zh_TW.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -847,7 +847,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zu.po
===================================================================
RCS file: /cvs/extras/comps/po/zu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -977,7 +977,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Ukuxhasa Kwesi-Arabhu"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136



From fedora-extras-commits at redhat.com  Fri Sep 14 14:41:53 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 14 Sep 2007 10:41:53 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.32,
	1.33 policycoreutils.spec, 1.448, 1.449
Message-ID: <200709141441.l8EEfr3c021597@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
- Fix calls to _admin interfaces


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- policycoreutils-gui.patch	11 Sep 2007 19:04:32 -0000	1.32
+++ policycoreutils-gui.patch	14 Sep 2007 14:41:51 -0000	1.33
@@ -8905,8 +8905,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-10 15:43:29.000000000 -0400
-@@ -0,0 +1,277 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9135,6 +9135,12 @@
 +## <summary>
 +##	All of the rules required to administrate an TEMPLATETYPE environment
 +## </summary>
++## <param name="prefix">
++##	<summary>
++##	Prefix of the domain. Example, user would be
++##	the prefix for the uder_t domain.
++##	</summary>
++## </param>
 +## <param name="domain">
 +##	<summary>
 +##	Domain allowed access.
@@ -9145,11 +9151,6 @@
 +##	The role to be allowed to manage the TEMPLATETYPE domain.
 +##	</summary>
 +## </param>
-+## <param name="terminal">
-+##	<summary>
-+##	The type of the terminal allow the dmidecode domain to use.
-+##	</summary>
-+## </param>
 +## <rolecap/>
 +#
 +interface(`TEMPLATETYPE_admin',`
@@ -9157,17 +9158,17 @@
 +		type TEMPLATETYPE_t;
 +	')
 +
-+	allow $1 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
-+	read_files_pattern($1, TEMPLATETYPE_t, TEMPLATETYPE_t)
++	allow $2 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
++	read_files_pattern($2, TEMPLATETYPE_t, TEMPLATETYPE_t)
 +	        
 +"""
 +
 +if_initscript_admin="""
 +	# Allow $1 to restart the apache service
-+	TEMPLATETYPE_script_domtrans($1)
-+	domain_system_change_exemption($1)
-+	role_transition $2 TEMPLATETYPE_script_exec_t system_r;
-+	allow $2 system_r;
++	TEMPLATETYPE_script_domtrans($2)
++	domain_system_change_exemption($2)
++	role_transition $3 TEMPLATETYPE_script_exec_t system_r;
++	allow $3 system_r;
 +"""
 +
 +if_end_admin="""
@@ -9186,7 +9187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9208,7 +9209,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9292,7 +9293,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9411,7 +9412,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_rw($1)
++	TEMPLATETYPE_manage_rw($2)
 +"""
 +
 +########################### File Context ##################################
@@ -9424,7 +9425,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-05 22:25:46.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,45 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9473,7 +9474,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9518,7 +9519,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9614,12 +9615,12 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_tmp($1)
++	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-10 11:43:28.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9747,7 +9748,7 @@
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r, { TEMPLATETYPE_tty_device_t TEMPLATETYPE_devpts_t })
++	APPLICATION_admin(TEMPLATETYPE,TEMPLATETYPE_t,TEMPLATETYPE_r)
 +')
 +"""
 +
@@ -9762,7 +9763,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9911,7 +9912,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_var_lib($1)
++	TEMPLATETYPE_manage_var_lib($2)
 +"""
 +
 +########################### File Context ##################################
@@ -9928,7 +9929,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10031,7 +10032,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_log($1)
++	TEMPLATETYPE_manage_log($2)
 +"""
 +
 +########################### File Context ##################################
@@ -10044,7 +10045,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10150,7 +10151,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_var_run($1)
++	TEMPLATETYPE_manage_var_run($2)
 +"""
 +
 +fc_file="""\
@@ -10167,7 +10168,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10289,7 +10290,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_spool($1)
++	TEMPLATETYPE_manage_spool($2)
 +"""
 +
 +########################### File Context ##################################


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- policycoreutils.spec	13 Sep 2007 12:32:16 -0000	1.448
+++ policycoreutils.spec	14 Sep 2007 14:41:51 -0000	1.449
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
+- Fix calls to _admin interfaces
+
 * Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
 - Upgrade version of sepolgen from NSA
 	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.



From fedora-extras-commits at redhat.com  Fri Sep 14 14:44:46 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 14 Sep 2007 10:44:46 -0400
Subject: devel/python python-2.5.1-sqlite-encoding.patch, NONE,
	1.1 python.spec, 1.118, 1.119
Message-ID: <200709141444.l8EEikCk021913@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21838

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-sqlite-encoding.patch 
Log Message:
* Fri Sep 14 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-11
- fix encoding of sqlite .py files to work around weird encoding problem 
  in Turkish (#283331)


python-2.5.1-sqlite-encoding.patch:

--- NEW FILE python-2.5.1-sqlite-encoding.patch ---
diff -up Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding Python-2.5.1/Lib/sqlite3/dbapi2.py
--- Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding	2007-09-14 10:41:50.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/dbapi2.py	2007-09-14 10:42:00.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
 # pysqlite2/dbapi2.py: the DB-API 2.0 interface
 #
-# Copyright (C) 2004-2005 Gerhard H?ring <gh at ghaering.de>
+# Copyright (C) 2004-2005 Gerhard Haering <gh at ghaering.de>
 #
 # This file is part of pysqlite.
 #
diff -up Python-2.5.1/Lib/sqlite3/__init__.py.encoding Python-2.5.1/Lib/sqlite3/__init__.py
--- Python-2.5.1/Lib/sqlite3/__init__.py.encoding	2007-09-14 10:41:47.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/__init__.py	2007-09-14 10:42:06.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
 # pysqlite2/__init__.py: the pysqlite2 package.
 #
-# Copyright (C) 2005 Gerhard H?ring <gh at ghaering.de>
+# Copyright (C) 2005 Gerhard Haering <gh at ghaering.de>
 #
 # This file is part of pysqlite.
 #


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- python.spec	10 Sep 2007 15:42:58 -0000	1.118
+++ python.spec	14 Sep 2007 14:44:14 -0000	1.119
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -34,6 +34,7 @@
 Patch4: python-2.5-cflags.patch
 Patch5: python-2.5.1-ctypes-exec-stack.patch
 Patch6: python-2.5.1-plural-fix.patch
+Patch7: python-2.5.1-sqlite-encoding.patch
 
 # upstreamed
 
@@ -163,6 +164,7 @@
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .ctypesexec
 %patch6 -p1 -b .plural
+%patch7 -p1
 
 %patch50 -p1 -b .egginfo
 %patch60 -p1 -b .db46
@@ -423,6 +425,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Fri Sep 14 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-11
+- fix encoding of sqlite .py files to work around weird encoding problem 
+  in Turkish (#283331)
+
 * Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
 - work around problems with multi-line plural specification (#252136)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:00:19 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 14 Sep 2007 11:00:19 -0400
Subject: rpms/gamin/devel gamin-0.1.9-poll-less.patch, NONE, 1.1 gamin.spec, 
	1.62, 1.63
Message-ID: <200709141500.l8EF0JAE023635@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23552

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.9-poll-less.patch 
Log Message:
- don't poll for non-existant watched files (bug 240385)


gamin-0.1.9-poll-less.patch:

--- NEW FILE gamin-0.1.9-poll-less.patch ---
--- gamin-0.1.9/server/inotify-path.c
+++ gamin-0.1.9/server/inotify-path.c
@@ -40,6 +40,7 @@
 #include <linux/inotify.h>
 #endif
 #endif
+#include <errno.h>
 #include <string.h>
 #include <glib.h>
 #include "inotify-kernel.h"
@@ -136,6 +137,38 @@ ip_map_wd_dir (gint32 wd, ip_watched_dir_t *dir)
 	g_hash_table_replace(wd_dir_hash, GINT_TO_POINTER(dir->wd), dir_list);
 }
 
+static gint32
+ip_watch_parent (const char *path, guint mask, int *err, char **parent_path)
+{
+	gint32 wd;
+	gchar *path_copy;
+	gchar *p;
+
+	path_copy = g_strdup (path);
+
+        wd = -1;
+        do
+        {
+                p = g_strrstr (path_copy, G_DIR_SEPARATOR_S);
+
+                if (p == NULL)
+                        return -1;
+
+                if (p != &path_copy[0])
+                        *p = '\0';
+
+                wd = ik_watch (path_copy, mask, err);
+        } 
+        while (wd < 0 && errno == ENOENT);
+
+        if (parent_path != NULL && wd >= 0)
+                *parent_path = path_copy;
+        else
+                g_free (path_copy);
+
+	return wd;
+}
+
 gboolean ip_start_watching (ih_sub_t *sub)
 {
 	gint32 wd;
@@ -156,8 +189,35 @@ gboolean ip_start_watching (ih_sub_t *sub)
 	
 	IP_W("Trying to add inotify watch ");
 	wd = ik_watch (sub->dirname, IP_INOTIFY_MASK|IN_ONLYDIR|sub->extra_flags, &err);
-	if (wd < 0) 
-	{
+
+        if (wd < 0 && errno == ENOENT)
+        {
+                char *parent_path;
+
+		IP_W("Directory '%s' does not yet exist, finding and watching existing parent\n",
+                     sub->dirname);
+
+                parent_path = NULL;
+		wd = ip_watch_parent (sub->dirname,
+                                      IP_INOTIFY_MASK|IN_ONLYDIR|sub->extra_flags,
+                                      &err, &parent_path);
+
+		if (wd < 0)
+		{
+                        g_assert (parent_path == NULL);
+			IP_W("Failed\n");
+			return FALSE;
+		}
+
+		IP_W("Found parent '%s', will watch it for now until '%s' becomes available\n",
+                     parent_path, sub->dirname);
+
+                dir = ip_watched_dir_new (parent_path, wd);
+                g_free (parent_path);
+
+		ip_map_wd_dir (wd, dir);
+		ip_map_path_dir (parent_path, dir);
+        } else if (wd < 0) {
 		IP_W("Failed\n");
 		return FALSE;
 	} else {
@@ -294,18 +354,25 @@ static void ip_wd_delete (gpointer data, gpointer user_data)
 static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t *event)
 {
 	GList *dirl;
+        GList *subl, *resubscription_list;
 
 	if (!event)
 		return;
 
 	/* TODO:
 	 *
 	 * Figure out how we will deliver move events
 	 */
+
+        resubscription_list = NULL;
 	for (dirl = dir_list; dirl; dirl = dirl->next)
 	{
-		GList *subl;
 		ip_watched_dir_t *dir = dirl->data;
+                char *event_path;
+
+                event_path = g_build_filename (dir->path, event->name, NULL);
+
+
 
 		for (subl = dir->subs; subl; subl = subl->next)
 		{
@@ -315,23 +382,61 @@ static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t
 			 * they need to match before the event could be delivered.
 			 */
 			if (event->name && sub->filename) {
-				if (strcmp (event->name, sub->filename))
+
+                               if (strcmp (event->name, sub->filename))
+                                {
 					continue;
+                                }
+
 			/* If the event doesn't have a filename, but the subscription does
 			 * we shouldn't deliever the event */
 			} else if (sub->filename)
 				continue;
 
+                        if (g_str_has_prefix (sub->dirname, event_path)) {
+
+                            IP_W("Adding directory %s to resubscription list (because of event %s)", 
+                                 sub->dirname, event_path);
+
+                            resubscription_list = g_list_prepend (resubscription_list, sub);
+
+                            if (strcmp (sub->dirname, event_path) == 0) {
+                                        char *subscription_dir;
+
+                                        IP_W("directory '%s' is now available!", 
+                                             sub->dirname);
+
+                                        /* Normally, the subscription directory name,
+                                         * matches the directory getting watched.  This 
+                                         * isn't necessarily true, though, if we're watching
+                                         * a parent since the directory we're actually interested 
+                                         * in doesn't exist anymore.  When the directory we *are*
+                                         * interested in shows up, we find out relative to the
+                                         * directory we're watching.  We need to fudge our subscription
+                                         * temporarily to account for that.
+                                         *
+                                         * FIXME: This is a hack, we should send the dirname that the 
+                                         * event came from, along with the subscription, or store a 
+                                         * full path in the event structure
+                                         */
+                                        subscription_dir = sub->dirname;
+                                        sub->dirname = dir->path;
+                                        event_callback (event, sub);
+                                        sub->dirname = subscription_dir;
+                            }
+
+                            continue;
+                        }
+
 			event_callback (event, sub);
 		}
+
+                g_free (event_path);
 	}
 
-	if (!event->pair)
-		return;
-
+	if (event->pair)
 	for (dirl = pair_dir_list; dirl; dirl = dirl->next)
 	{
-		GList *subl;
 		ip_watched_dir_t *dir = dirl->data;
 
 		for (subl = dir->subs; subl; subl = subl->next)
@@ -352,6 +457,13 @@ static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t
 			event_callback (event->pair, sub);
 		}
 	}
+
+        for (subl = resubscription_list; subl; subl = subl->next)
+        {
+            ip_stop_watching (subl->data);
+            ip_start_watching (subl->data);
+        }
+        g_list_free (resubscription_list);
 }
 
 static void
@@ -371,8 +483,10 @@ ip_event_callback (ik_event_t *event)
 	if (event->pair)
 		pair_dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER(event->pair->wd));
 
-	if (event->mask & IP_INOTIFY_MASK)
+	if (event->mask & IP_INOTIFY_MASK) {
 		ip_event_dispatch (dir_list, pair_dir_list, event);
+	        dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER(event->wd));
+        }
 
 	/* We have to manage the missing list when we get a DELETE event. */
 	if (event->mask & IN_DELETE_SELF || event->mask & IN_MOVE_SELF)


Index: gamin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gamin.spec	28 Aug 2007 20:59:34 -0000	1.62
+++ gamin.spec	14 Sep 2007 14:59:46 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -12,6 +12,8 @@
 BuildRequires: glib2-devel python python-devel
 BuildRequires: automake, libtool
 
+Patch0: gamin-0.1.9-poll-less.patch
+
 %description
 This C library provides an API and ABI compatible file alteration
 monitor mechanism compatible with FAM but not dependent on a system wide
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .poll-less
 
 %build
 autoreconf --force --install
@@ -89,6 +92,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Sep 14 2007 Ray Strode <rstrode at redhat.com> - 0.1.9-3
+- don't poll for non-existant watched files (bug 240385)
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.1.9-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:17:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 11:17:54 -0400
Subject: rpms/gamin/devel gamin-0.1.9-filesystem-leak.patch, NONE,
	1.1 gamin.spec, 1.63, 1.64
Message-ID: <200709141517.l8EFHsvv030766@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30738

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.9-filesystem-leak.patch 
Log Message:
fix a memory leak


gamin-0.1.9-filesystem-leak.patch:

--- NEW FILE gamin-0.1.9-filesystem-leak.patch ---
diff -up gamin-0.1.9/server/gam_fs.c.filesystem-leak gamin-0.1.9/server/gam_fs.c
--- gamin-0.1.9/server/gam_fs.c.filesystem-leak	2007-09-13 00:21:18.000000000 -0400
+++ gamin-0.1.9/server/gam_fs.c	2007-09-13 00:21:25.000000000 -0400
@@ -40,13 +40,13 @@ gam_fs_free_filesystems (void)
 	{
 		fs = iterator->data;
 
+		iterator = g_list_next (iterator);
+
 		filesystems = g_list_remove (filesystems, fs);
 
 		g_free (fs->path);
 		g_free (fs->fsname);
 		g_free (fs);
-
-		iterator = g_list_next (filesystems);
 	}
 }
 


Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gamin.spec	14 Sep 2007 14:59:46 -0000	1.63
+++ gamin.spec	14 Sep 2007 15:17:21 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -13,6 +13,8 @@
 BuildRequires: automake, libtool
 
 Patch0: gamin-0.1.9-poll-less.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=403158
+Patch1: gamin-0.1.9-filesystem-leak.patch
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -44,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .poll-less
+%patch1 -p1 -b .filesystem-leak
 
 %build
 autoreconf --force --install
@@ -92,6 +95,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.1.9-4
+- Fix a memory leak
+
 * Fri Sep 14 2007 Ray Strode <rstrode at redhat.com> - 0.1.9-3
 - don't poll for non-existant watched files (bug 240385)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:19:18 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 14 Sep 2007 11:19:18 -0400
Subject: rpms/gamin/devel gamin.spec,1.64,1.65
Message-ID: <200709141519.l8EFJIld030916@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30864

Modified Files:
	gamin.spec 
Log Message:
add bug reference



Index: gamin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gamin.spec	14 Sep 2007 15:17:21 -0000	1.64
+++ gamin.spec	14 Sep 2007 15:18:45 -0000	1.65
@@ -12,6 +12,7 @@
 BuildRequires: glib2-devel python python-devel
 BuildRequires: automake, libtool
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=476938
 Patch0: gamin-0.1.9-poll-less.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=403158
 Patch1: gamin-0.1.9-filesystem-leak.patch



From fedora-extras-commits at redhat.com  Fri Sep 14 15:26:58 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 11:26:58 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.21, 1.22 hal-cups-utils.spec,
	1.61, 1.62 sources, 1.21, 1.22
Message-ID: <200709141526.l8EFQw1O031304@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31278

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-1
- 0.6.13:
  - Enable/disable fix.
  - Speed improvements.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	3 Aug 2007 16:12:46 -0000	1.21
+++ .cvsignore	14 Sep 2007 15:26:26 -0000	1.22
@@ -9,3 +9,4 @@
 hal-cups-utils-0.6.10.tar.gz
 hal-cups-utils-0.6.11.tar.gz
 hal-cups-utils-0.6.12.tar.gz
+hal-cups-utils-0.6.13.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- hal-cups-utils.spec	29 Aug 2007 15:24:13 -0000	1.61
+++ hal-cups-utils.spec	14 Sep 2007 15:26:26 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.12
-Release: 3%{?dist}
+Version: 0.6.13
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -60,6 +60,11 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-1
+- 0.6.13:
+  - Enable/disable fix.
+  - Speed improvements.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.6.12-3
 - More specific license tag.
 - Better buildroot tag.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	3 Aug 2007 16:12:46 -0000	1.21
+++ sources	14 Sep 2007 15:26:26 -0000	1.22
@@ -1 +1 @@
-9430f5f9101d6c19875c82ceed9208e5  hal-cups-utils-0.6.12.tar.gz
+1fda4618efbde9a2101101853af3d7ee  hal-cups-utils-0.6.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 15:33:25 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 11:33:25 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec, 1.62,
	1.63 hal-cups-utils-description.patch, 1.1, NONE
Message-ID: <200709141533.l8EFXPeO031576@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31558

Modified Files:
	hal-cups-utils.spec 
Removed Files:
	hal-cups-utils-description.patch 
Log Message:
No longer need this patch.


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- hal-cups-utils.spec	14 Sep 2007 15:26:26 -0000	1.62
+++ hal-cups-utils.spec	14 Sep 2007 15:32:53 -0000	1.63
@@ -6,7 +6,6 @@
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
-Patch0: hal-cups-utils-description.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -28,7 +27,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch0 -p1 -b .description
 
 %build
 


--- hal-cups-utils-description.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 16:24:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 12:24:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-edd.patch, NONE,
	1.1 linux-2.6-x86-edd-maxdrive.patch, NONE, 1.1 kernel.spec,
	1.164, 1.165 linux-2.6-libata-pata-dma-disable-option.patch, 1.1, 1.2
Message-ID: <200709141624.l8EGOKaR006356@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246

Modified Files:
	kernel.spec linux-2.6-libata-pata-dma-disable-option.patch 
Added Files:
	linux-2.6-x86-debug-edd.patch linux-2.6-x86-edd-maxdrive.patch 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- x86 setup: limit number of EDD devices scanned
- x86 setup: print number of EDD device during scan
- libata: change boot option name to "libata.dma"
  (still only affects PATA drives)


linux-2.6-x86-debug-edd.patch:

--- NEW FILE linux-2.6-x86-debug-edd.patch ---
---
 arch/i386/boot/edd.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.22.noarch.orig/arch/i386/boot/edd.c
+++ linux-2.6.22.noarch/arch/i386/boot/edd.c
@@ -151,6 +151,7 @@ void query_edd(void)
 		 * Scan the BIOS-supported hard disks and query EDD
 		 * information...
 		 */
+		putchar('0' + (devno - 0x80) % 10);
 		get_edd_info(devno, &ei);
 
 		if (boot_params.eddbuf_entries < EDDMAXNR) {

linux-2.6-x86-edd-maxdrive.patch:

--- NEW FILE linux-2.6-x86-edd-maxdrive.patch ---
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index bd138e4..fad5f6b 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -129,7 +129,7 @@ void query_edd(void)
 	char eddarg[8];
 	int do_mbr = 1;
 	int do_edd = 1;
-	int devno;
+	int devno, maxdrive;
 	struct edd_info ei, *edp;
 	u32 *mbrptr;
 
@@ -145,8 +145,22 @@ void query_edd(void)
 
 	if (!do_edd)
 		return;
-
-	for (devno = 0x80; devno < 0x80+EDD_MBR_SIG_MAX; devno++) {
+	
+	/* Query the number of drives.  This prevents the probe
+	   from wandering into CD-ROMs and nonexistent devices;
+	   some machines have been known to hang if nonexistent
+	   devices are probed.
+
+	   Ralf Brown (inter61) seems to imply that BIOS location
+	   40:75 is more reliable than the return value from INT 13h,
+	   AH=08h, so go with that. */
+
+	set_fs(0);
+	maxdrive = rdfs8(0x475)|0x80;
+	if (maxdrive > 0x80+EDD_MBR_SIG_MAX)
+		maxdrive = 0x80+EDD_MBR_SIG_MAX;
+
+	for (devno = 0x80; devno < maxdrive; devno++) {
 		/*
 		 * Scan the BIOS-supported hard disks and query EDD
 		 * information...


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kernel.spec	13 Sep 2007 20:59:51 -0000	1.164
+++ kernel.spec	14 Sep 2007 16:23:47 -0000	1.165
@@ -580,6 +580,7 @@
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
+Patch76: linux-2.6-x86-debug-edd.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -671,6 +672,8 @@
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
+Patch1600: linux-2.6-x86-edd-maxdrive.patch 
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1004,6 +1007,7 @@
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # debug early boot
 ApplyPatch linux-2.6-x86-debug-boot.patch
+ApplyPatch linux-2.6-x86-debug-edd.patch
 
 #
 # PowerPC
@@ -1204,6 +1208,9 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
+# EDD fix
+ApplyPatch linux-2.6-x86-edd-maxdrive.patch 
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1796,6 +1803,12 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86 setup: limit number of EDD devices scanned
+- x86 setup: print number of EDD device during scan
+- libata: change boot option name to "libata.dma"
+  (still only affects PATA drives)
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git4
 
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pata-dma-disable-option.patch	11 Sep 2007 21:25:51 -0000	1.1
+++ linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 16:23:47 -0000	1.2
@@ -44,8 +44,8 @@
  MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
  
 +static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
-+module_param_named(pata_dma, ata_pata_dma, int, 0644);
-+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
++module_param_named(dma, ata_pata_dma, int, 0644);
++MODULE_PARM_DESC(dma, "Use DMA on PATA devices");
 +
  static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
  module_param(ata_probe_timeout, int, 0444);



From fedora-extras-commits at redhat.com  Fri Sep 14 16:24:42 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 12:24:42 -0400
Subject: rpms/international-time/devel international-time-current-time.patch,
	NONE, 1.1 international-time.spec, 1.4, 1.5
Message-ID: <200709141624.l8EGOgEU006369@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6286

Modified Files:
	international-time.spec 
Added Files:
	international-time-current-time.patch 
Log Message:
* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.0.2-4
- Use the current time (bug #291151).


international-time-current-time.patch:

--- NEW FILE international-time-current-time.patch ---
diff -up international-time-0.0.2/international-time.py~ international-time-0.0.2/international-time.py
--- international-time-0.0.2/international-time.py~	2006-10-18 16:05:06.000000000 +0100
+++ international-time-0.0.2/international-time.py	2007-09-14 17:21:46.000000000 +0100
@@ -22,6 +22,9 @@ class MainWin:
         self.hourspinbutton = xml.get_widget ('hourspinbutton')
         self.minspinbutton = xml.get_widget ('minspinbutton')
         self.on_changed (None)
+        (_, _, _, h, m, _, _, _, _) = time.localtime ()
+        self.hourspinbutton.set_value (h)
+        self.minspinbutton.set_value ((5 * ((m + 4) / 5)) % 60)
         gtk.main ()
 
     def on_changed(self, obj):


Index: international-time.spec
===================================================================
RCS file: /cvs/pkgs/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- international-time.spec	6 Dec 2006 11:53:28 -0000	1.4
+++ international-time.spec	14 Sep 2007 16:24:09 -0000	1.5
@@ -1,10 +1,11 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
+Patch0:		international-time-current-time.patch
 Url:            http://cyberelk.net/tim/data/international-time/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .current-time
 
 %build
 
@@ -66,6 +68,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.0.2-4
+- Use the current time (bug #291151).
+
 * Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-3
 - Built for devel.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:00:09 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 13:00:09 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.50, 1.51 sources, 1.51,
	1.52 sugar.spec, 1.59, 1.60
Message-ID: <200709141700.l8EH09k5007087@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	12 Sep 2007 19:59:44 -0000	1.50
+++ .cvsignore	14 Sep 2007 16:59:33 -0000	1.51
@@ -1 +1 @@
-sugar-0.65-git47f473189e.tar.bz2
+sugar-0.65-git0a666e23cf.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	12 Sep 2007 19:59:44 -0000	1.51
+++ sources	14 Sep 2007 16:59:33 -0000	1.52
@@ -1 +1 @@
-235e143ab290c973169df6a7c195ee24  sugar-0.65-git47f473189e.tar.bz2
+24f98c6505d6f626e1806dc0c8311ef8  sugar-0.65-git0a666e23cf.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sugar.spec	12 Sep 2007 19:59:44 -0000	1.59
+++ sugar.spec	14 Sep 2007 16:59:33 -0000	1.60
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070912git
-%define commitid 47f473189e
+%define alphatag 20070914git
+%define commitid 0a666e23cf
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.47.%{alphatag}47f473189e
+Release: 0.48.%{alphatag}0a666e23cf
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:06:42 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 13:06:42 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 sugar-artwork.spec, 1.26, 1.27
Message-ID: <200709141706.l8EH6gGg013162@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13133

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.28.20070914git2aac89b4fe
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Sep 2007 20:07:55 -0000	1.25
+++ .cvsignore	14 Sep 2007 17:06:10 -0000	1.26
@@ -1 +1 @@
-sugar-artwork-0.34-gite4fd20770c.tar.bz2
+sugar-artwork-0.34-git2aac89b4fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Sep 2007 20:07:55 -0000	1.25
+++ sources	14 Sep 2007 17:06:10 -0000	1.26
@@ -1 +1 @@
-6a11672f84c158abf05c0ab4c99feb40  sugar-artwork-0.34-gite4fd20770c.tar.bz2
+32a32bdfd37210ca483f0f349b68d504  sugar-artwork-0.34-git2aac89b4fe.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar-artwork.spec	12 Sep 2007 20:07:55 -0000	1.26
+++ sugar-artwork.spec	14 Sep 2007 17:06:10 -0000	1.27
@@ -1,10 +1,10 @@
-%define alphatag 20070912git
-%define commitid e4fd20770c
+%define alphatag 20070914git
+%define commitid 2aac89b4fe
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.26.%{alphatag}e4fd20770c
+Release: 0.28.%{alphatag}2aac89b4fe
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.28.20070914git2aac89b4fe
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:27:56 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 14 Sep 2007 13:27:56 -0400
Subject: fedora-release fedora-development.repo, 1.13,
	1.14 fedora-release.spec, 1.52,
	1.53 fedora-updates-testing.repo, 1.8, 1.9 fedora-updates.repo,
	1.13, 1.14 fedora.repo, 1.11, 1.12
Message-ID: <200709141727.l8EHRu7Z013649@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13624

Modified Files:
	fedora-development.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo fedora.repo 
Log Message:
Use failovermethod=priority in yum configs.



Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-development.repo	30 May 2007 14:14:30 -0000	1.13
+++ fedora-development.repo	14 Sep 2007 17:27:54 -0000	1.14
@@ -21,6 +21,7 @@
 
 [development]
 name=Fedora - Development
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 enabled=1
@@ -28,6 +29,7 @@
 
 [development-debuginfo]
 name=Fedora - Development - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
 enabled=0
@@ -35,6 +37,7 @@
 
 [development-source]
 name=Fedora - Development - Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 enabled=0


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- fedora-release.spec	30 Aug 2007 10:22:26 -0000	1.52
+++ fedora-release.spec	14 Sep 2007 17:27:54 -0000	1.53
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	7.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -77,6 +77,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
+- Use failovermethod=priority in yum configs (243698)
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 7.91-1
 - Provide system-release, useful for spinoffs.
 - Also link system-release to fedora-release for file level checks


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-updates-testing.repo	21 May 2007 20:26:28 -0000	1.8
+++ fedora-updates-testing.repo	14 Sep 2007 17:27:54 -0000	1.9
@@ -1,5 +1,6 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-updates.repo	30 May 2007 14:14:30 -0000	1.13
+++ fedora-updates.repo	14 Sep 2007 17:27:54 -0000	1.14
@@ -1,5 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [updates-source]
 name=Fedora $releasever - Updates Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora.repo	30 May 2007 14:14:30 -0000	1.11
+++ fedora.repo	14 Sep 2007 17:27:54 -0000	1.12
@@ -1,5 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [fedora-source]
 name=Fedora $releasever - Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 enabled=0



From fedora-extras-commits at redhat.com  Fri Sep 14 17:29:44 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 14 Sep 2007 13:29:44 -0400
Subject: rpms/fedora-release/devel fedora-release.spec, 1.59, 1.60 sources, 
	1.47, 1.48
Message-ID: <200709141729.l8EHTiKB013717@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13697

Modified Files:
	fedora-release.spec sources 
Log Message:
* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
- Use failovermethod=priority in yum configs (243698)



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fedora-release.spec	30 Aug 2007 10:27:31 -0000	1.59
+++ fedora-release.spec	14 Sep 2007 17:29:12 -0000	1.60
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	7.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -77,6 +77,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
+- Use failovermethod=priority in yum configs (243698)
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 7.91-1
 - Provide system-release, useful for spinoffs.
 - Also link system-release to fedora-release for file level checks


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	30 Aug 2007 10:27:31 -0000	1.47
+++ sources	14 Sep 2007 17:29:12 -0000	1.48
@@ -1 +1 @@
-e1369de67fa8d66da8764e01d7128cbd  fedora-release-7.91.tar.gz
+1692ee19be5132c951ca19297b22e227  fedora-release-7.91.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 17:44:58 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 13:44:58 -0400
Subject: rpms/glibmm24/devel .cvsignore, 1.19, 1.20 glibmm.spec, 1.27,
	1.28 sources, 1.20, 1.21
Message-ID: <200709141744.l8EHiwhd014062@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14032

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to new stable tree 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	31 Jul 2007 22:25:12 -0000	1.19
+++ .cvsignore	14 Sep 2007 17:44:25 -0000	1.20
@@ -1 +1 @@
-glibmm-2.13.9.tar.bz2
+glibmm-2.14.0.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- glibmm.spec	6 Sep 2007 09:05:52 -0000	1.27
+++ glibmm.spec	14 Sep 2007 17:44:25 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.13.9
-Release:        3%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 2.14.0-1
+- Update to new stable tree 2.14.0
+
 * Thu Sep  6 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-3
 - Removed Perl code autogeneration tools (#278191)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	31 Jul 2007 22:25:12 -0000	1.20
+++ sources	14 Sep 2007 17:44:25 -0000	1.21
@@ -1 +1 @@
-1fa5cf54cbecadc68e8be5b25f5b11ea  glibmm-2.13.9.tar.bz2
+e4ae55323d50bb77db0099ae93eddcd3  glibmm-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 17:50:56 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 13:50:56 -0400
Subject: rpms/compiz/devel compiz.spec,1.99,1.100
Message-ID: <200709141750.l8EHouEI014319@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14296

Modified Files:
	compiz.spec 
Log Message:
compiz-gnome: install core schema so it actually works



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- compiz.spec	28 Aug 2007 16:51:04 -0000	1.99
+++ compiz.spec	14 Sep 2007 17:50:23 -0000	1.100
@@ -1,7 +1,7 @@
 %define		snapshot	0ec3ec
 %define		dialogversion	0.7.7
 
-%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
+%define		core_plugins	blur clone core cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
 
 %define		gnome_plugins	annotate gconf glib svg
 
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        9.%{snapshot}%{?dist}
+Release:        10.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-10
+- compiz-gnome: install core schema so it actually works
+
 * Tue Aug 28 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-9
 - Make compiz-gnome Obsolete the older compiz package so yum/anaconda
   will pull it in (thans to Adel Gadllah).



From fedora-extras-commits at redhat.com  Fri Sep 14 17:55:49 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 13:55:49 -0400
Subject: rpms/kernel/devel kernel.spec, 1.165,
	1.166 linux-2.6-libata-pata-dma-disable-option.patch, 1.2, 1.3
Message-ID: <200709141755.l8EHtnGd014573@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548

Modified Files:
	kernel.spec linux-2.6-libata-pata-dma-disable-option.patch 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- leave boot option as "libata.pata_dma" for now



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kernel.spec	14 Sep 2007 16:23:47 -0000	1.165
+++ kernel.spec	14 Sep 2007 17:55:15 -0000	1.166
@@ -1803,6 +1803,9 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- leave boot option as "libata.pata_dma" for now
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 setup: limit number of EDD devices scanned
 - x86 setup: print number of EDD device during scan
 - libata: change boot option name to "libata.dma"

linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 16:23:47 -0000	1.2
+++ linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 17:55:15 -0000	1.3
@@ -44,8 +44,8 @@
  MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
  
 +static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
-+module_param_named(dma, ata_pata_dma, int, 0644);
-+MODULE_PARM_DESC(dma, "Use DMA on PATA devices");
++module_param_named(pata_dma, ata_pata_dma, int, 0644);
++MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
 +
  static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
  module_param(ata_probe_timeout, int, 0444);



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:07 -0700
Subject: [pkgdb] libzzub was added for akahl
Message-ID: <200709141756.l8EHu8Z9023740@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libzzub with summary Powerful music sequencing library
Kevin Fenzi (kevin) has approved Package libzzub
Kevin Fenzi (kevin) has added a Fedora devel branch for libzzub with an owner of akahl
Kevin Fenzi (kevin) has approved libzzub in Fedora devel
Kevin Fenzi (kevin) has approved Package libzzub
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libzzub (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libzzub (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libzzub (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:16 -0700
Subject: [pkgdb] libzzub (Fedora, devel) updated by kevin
Message-ID: <200709141756.l8EHuHnb003133@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on libzzub (Fedora devel) for mtasaka
Kevin Fenzi (kevin) approved watchcommits on libzzub (Fedora devel) for mtasaka
Kevin Fenzi (kevin) Approved cvsextras for commit access on libzzub (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:16 -0700
Subject: [pkgdb] libzzub (Fedora, 7) updated by kevin
Message-ID: <200709141756.l8EHuIlR003143@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libzzub
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on libzzub (Fedora 7) for mtasaka
Kevin Fenzi (kevin) approved watchcommits on libzzub (Fedora 7) for mtasaka
Kevin Fenzi (kevin) Approved cvsextras for commit access on libzzub (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:42 -0400
Subject: rpms/libzzub - New directory
Message-ID: <200709141756.l8EHug0r014615@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub

Log Message:
Directory /cvs/extras/rpms/libzzub added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:47 -0400
Subject: rpms/libzzub/devel - New directory
Message-ID: <200709141756.l8EHul1r014630@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub/devel

Log Message:
Directory /cvs/extras/rpms/libzzub/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:49 -0400
Subject: rpms/libzzub Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709141756.l8EHun64014655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub

Added Files:
	Makefile import.log 
Log Message:
Setup of module libzzub


--- NEW FILE Makefile ---
# Top level Makefile for module libzzub
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:51 -0400
Subject: rpms/libzzub/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709141756.l8EHupGV014676@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libzzub


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libzzub
# $Id: Makefile,v 1.1 2007/09/14 17:56:49 kevin Exp $
NAME := libzzub
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 fedora-extras-commits at redhat.com  Fri Sep 14 17:57:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 13:57:56 -0400
Subject: rpms/qt4/devel qt4.spec,1.68,1.69
Message-ID: <200709141757.l8EHvuQc014833@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14810

Modified Files:
	qt4.spec 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- qt4.spec	13 Sep 2007 19:19:19 -0000	1.68
+++ qt4.spec	14 Sep 2007 17:57:23 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -146,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %if "%{name}" != "qt4"
@@ -213,6 +212,7 @@
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: redhat-rpm-config rpm
 
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
@@ -529,6 +529,7 @@
 
 %files x11 
 %defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.*
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
 %{_qt4_libdir}/libQtDesigner.so.*
@@ -548,7 +549,6 @@
 %files devel
 %defattr(-,root,root,-)
 #config /etc/profile.d/*
-%{_sysconfdir}/rpm/macros.*
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
@@ -634,6 +634,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
+- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)
+
 * Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
 - linguist.desktop: use new linguist4 icons



From fedora-extras-commits at redhat.com  Fri Sep 14 18:11:12 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 14:11:12 -0400
Subject: rpms/gstreamer-python/devel gstreamer-python-0.10.8-exit.patch, NONE,
	1.1 gstreamer-python.spec, 1.18, 1.19
Message-ID: <200709141811.l8EIBC7v021072@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21049

Modified Files:
	gstreamer-python.spec 
Added Files:
	gstreamer-python-0.10.8-exit.patch 
Log Message:
Added patch to avoid crash on exit

gstreamer-python-0.10.8-exit.patch:

--- NEW FILE gstreamer-python-0.10.8-exit.patch ---
--- gst-python-0.10.8/gst/gstmodule.c	2007/07/28 14:26:54	1.46
+++ gst-python-0.10.8/gst/gstmodule.c	2007/09/11 11:49:50	1.47
@@ -266,8 +266,6 @@
 
      g_timeout_add_full (0, 100, python_do_pending_calls, NULL, NULL);
 
-     atexit(gst_deinit);
-     
      if (PyErr_Occurred ()) {
 	  Py_FatalError ("can't initialize module gst");
      }


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gstreamer-python.spec	20 Aug 2007 13:19:38 -0000	1.18
+++ gstreamer-python.spec	14 Sep 2007 18:10:39 -0000	1.19
@@ -2,13 +2,14 @@
 
 Name:           gstreamer-python
 Version:        0.10.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
+Patch0:         gstreamer-python-0.10.8-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2.3
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q -n gst-python-%{version}
+%patch0 -p1 -b .exit
 %{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
 
 
@@ -71,6 +73,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 0.10.8-2
+- Added patch to avoid crash on exit
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 0.10.8-1
 - Update to upstream 0.10.8
 - License tag update



From fedora-extras-commits at redhat.com  Fri Sep 14 18:14:26 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 14:14:26 -0400
Subject: rpms/nfs-utils/F-7 nfs-utils-1.1.0-smnotify-path.patch, NONE,
	1.1 nfs-utils.spec, 1.160, 1.161
Message-ID: <200709141814.l8EIEQF2021230@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21186

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
 Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)


nfs-utils-1.1.0-smnotify-path.patch:

--- NEW FILE nfs-utils-1.1.0-smnotify-path.patch ---
diff -up nfs-utils-1.1.0/utils/statd/sm-notify.c.orig nfs-utils-1.1.0/utils/statd/sm-notify.c
--- nfs-utils-1.1.0/utils/statd/sm-notify.c.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.c	2007-09-14 13:54:28.000000000 -0400
@@ -24,11 +24,13 @@
 #include <errno.h>
 #include <grp.h>
 
+#define STATD_PATH_XTN "statd/"
+
 #ifndef BASEDIR
 # ifdef NFS_STATEDIR
-#  define BASEDIR		NFS_STATEDIR
+#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
 # else
-#  define BASEDIR		"/var/lib/nfs"
+#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
 # endif
 #endif
 
diff -up nfs-utils-1.1.0/utils/statd/sm-notify.man.orig nfs-utils-1.1.0/utils/statd/sm-notify.man
--- nfs-utils-1.1.0/utils/statd/sm-notify.man.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.man	2007-09-14 14:01:36.000000000 -0400
@@ -33,7 +33,7 @@ but this is configurable.
 For each NFS client or server machine to be monitored,
 .B rpc.statd
 creates a file in
-.BR /var/lib/nfs/sm ", "
+.BR /var/lib/nfs/statd/sm ", "
 and removes the file if monitoring is no longer required.
 .PP
 When the machine is rebooted,
@@ -47,7 +47,7 @@ Each machine has an
 which is basically an integer counter that is incremented
 each time the machine reboots. This counter is stored
 in
-.BR /var/lib/nfs/state ,
+.BR /var/lib/nfs/statd/state ,
 and updated by
 .BR sm-notify .
 .SS Security
@@ -149,13 +149,13 @@ By default,
 .B sm-notify
 forks and puts itself in the background after obtaining the
 list of hosts from
-.BR /var/lib/nfs/sm .
+.BR /var/lib/nfs/statd/sm .
 .SH FILES
-.BR /var/lib/nfs/state
+.BR /var/lib/nfs/statd/state
 .br
-.BR /var/lib/nfs/sm/*
+.BR /var/lib/nfs/statd/sm/*
 .br
-.BR /var/lib/nfs/sm.bak/*
+.BR /var/lib/nfs/statd/sm.bak/*
 .br
 .BR /var/run/sm-notify.pid
 .SH SEE ALSO
diff -up nfs-utils-1.1.0/utils/exportfs/exportfs.man.orig nfs-utils-1.1.0/utils/exportfs/exportfs.man


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- nfs-utils.spec	13 Aug 2007 15:21:04 -0000	1.160
+++ nfs-utils.spec	14 Sep 2007 18:13:54 -0000	1.161
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,7 @@
 Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
+Patch10: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -94,6 +95,7 @@
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -264,6 +266,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
+- Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)
+
 * Mon Aug 13 2007 Steve Dickson <steved at redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables
   rw/ro mounts to the same server (bz 243913).



From fedora-extras-commits at redhat.com  Fri Sep 14 18:14:50 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:14:50 -0400
Subject: rpms/nsd/devel nsd.init,1.5,1.6
Message-ID: <200709141814.l8EIEofX021239@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190

Modified Files:
	nsd.init 
Log Message:
Fix pid file location. Remove NOTIFY state on stop.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	14 Sep 2007 18:14:17 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	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



From fedora-extras-commits at redhat.com  Fri Sep 14 18:16:52 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:16:52 -0400
Subject: rpms/nsd/devel sources,1.9,1.10
Message-ID: <200709141816.l8EIGqWN021274@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21247

Modified Files:
	sources 
Log Message:
update sources.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Sep 2007 20:40:27 -0000	1.9
+++ sources	14 Sep 2007 18:16:20 -0000	1.10
@@ -1,6 +1,6 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-e64633bb4e6eb46e8e16049e87333cb9  nsd.init
+02fd7cfe4c455f180a2178da78b6cd21  nsd.init
 a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
 73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
 ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 18:17:53 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:17:53 -0400
Subject: rpms/nsd/devel nsd.spec,1.21,1.22
Message-ID: <200709141817.l8EIHrFt021316@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292

Modified Files:
	nsd.spec 
Log Message:
* 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.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nsd.spec	11 Sep 2007 20:40:27 -0000	1.21
+++ nsd.spec	14 Sep 2007 18:17:20 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -20,8 +20,10 @@
 %setup -q 
 
 %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}
@@ -32,6 +34,7 @@
 install -d -m 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
 mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
@@ -51,6 +54,7 @@
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -74,6 +78,14 @@
 fi
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Fri Sep 14 18:20:03 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 14:20:03 -0400
Subject: rpms/jd/devel .cvsignore, 1.145, 1.146 jd.spec, 1.171, 1.172 sources,
	1.146, 1.147
Message-ID: <200709141820.l8EIK33e021408@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21380

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
- svn 1335



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	14 Sep 2007 06:43:21 -0000	1.145
+++ .cvsignore	14 Sep 2007 18:19:31 -0000	1.146
@@ -1 +1 @@
-jd-1.9.6-svn1331.tgz
+jd-1.9.6-svn1335.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- jd.spec	14 Sep 2007 06:43:21 -0000	1.171
+++ jd.spec	14 Sep 2007 18:19:31 -0000	1.172
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1331
+%define         strtag        svn1335
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
-- svn 1331
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
+- svn 1335
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	14 Sep 2007 06:43:21 -0000	1.146
+++ sources	14 Sep 2007 18:19:31 -0000	1.147
@@ -1 +1 @@
-d0cf5022f84597bfeb830aa6a6597ac0  jd-1.9.6-svn1331.tgz
+f43bf179bb382e60ed4fd07f5a43a965  jd-1.9.6-svn1335.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 18:34:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 14 Sep 2007 14:34:02 -0400
Subject: rpms/libtheora/devel libtheora-1.0alpha8-textreloc.patch, NONE,
	1.1 libtheora.spec, 1.18, 1.19
Message-ID: <200709141834.l8EIY22r022482@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444

Modified Files:
	libtheora.spec 
Added Files:
	libtheora-1.0alpha8-textreloc.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)


libtheora-1.0alpha8-textreloc.patch:

--- NEW FILE libtheora-1.0alpha8-textreloc.patch ---
diff -up libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c
--- libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~	2007-09-14 19:27:07.000000000 +0200
+++ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c	2007-09-14 19:27:07.000000000 +0200
@@ -21,6 +21,9 @@
 
 #if defined(USE_ASM)
 
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
+
 static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
 static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
 
@@ -173,12 +176,17 @@ static void FilterVert__mmx(unsigned cha
     );
 }
 
+#endif
+
 /* install our implementation in the function table */
 void dsp_mmx_dct_decode_init(DspFunctions *funcs)
 {
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
   TH_DEBUG("enabling accelerated x86_32 mmx dct decode functions.\n");
   funcs->FilterVert = FilterVert__mmx;
   funcs->FilterHoriz = FilterHoriz__mmx;
+#endif
 }
 
 #endif /* USE_ASM */


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtheora.spec	22 Aug 2007 09:39:29 -0000	1.18
+++ libtheora.spec	14 Sep 2007 18:33:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha8
-Release: 0.2.svn13393%{?dist}
+Release: 0.3.svn13393%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 # svn snapshot (svn revision 13393) no url
 Source0: %{name}-%{version}.tar.gz
 Patch0: libtheora-1.0alpha8-version-info.patch
+Patch1: libtheora-1.0alpha8-textreloc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -53,6 +54,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 aclocal -I m4
 libtoolize --automake
 autoheader
@@ -101,6 +103,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
+- Fix textrelocations on i386 (bz 253591)
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.2.svn13393
 - Fix Source0 URL
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:36:48 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Fri, 14 Sep 2007 14:36:48 -0400
Subject: rpms/flow-tools/devel flow-capture.init, NONE,
	1.1 flow-capture.sysconfig, NONE, 1.1 flow-tools.spec, 1.18, 1.19
Message-ID: <200709141836.l8EIamnF022763@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22692

Modified Files:
	flow-tools.spec 
Added Files:
	flow-capture.init flow-capture.sysconfig 
Log Message:
Add user and init scripts



--- NEW FILE flow-capture.init ---
#!/bin/sh
#
# flow-capture Capture traffic flow data
#
# chkconfig: - 90 10
# description: Capture traffic flow data

### BEGIN INIT INFO
# Provides: flow-capture
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Capture traffic flow data
# Description: Capture traffic flow data
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

prog="flow-capture"
exec="/usr/bin/$prog"
config="/etc/sysconfig/$prog"
lockfile=/var/lock/subsys/$prog

[ -e $config ] && . $config

# Define the flow-tools username
FLOWTOOLS_USER="${FLOWTOOLS_USER:-flow-tools}"

# Add pidfile
OPTIONS="-p /var/run/flow-capture.pid $OPTIONS"

# Check that networking is up.
if [ "$NETWORKING" = "no" ]
then
        exit 0
fi

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon --user=$FLOWTOOLS_USER $exec $OPTIONS
    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() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

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|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE flow-capture.sysconfig ---
# Change the source IP and port to what is used on your network
OPTIONS="-n 287 -N 0 -w /var/flow-tools -S 5 0/0/8818"


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- flow-tools.spec	5 Aug 2007 10:20:27 -0000	1.18
+++ flow-tools.spec	14 Sep 2007 18:36:16 -0000	1.19
@@ -1,15 +1,32 @@
+%bcond_without  fedora
+
+%global uid 40
+%global username flow-tools
+%global homedir %{_localstatedir}/%{name}
+%global gecos "Network flow monitoring"
+
 Version: 0.68.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
 Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source1: flow-capture.init
+Source2: flow-capture.sysconfig
 Requires: rrdtool-python
 BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel 
 BuildRequires: bison flex tcp_wrappers
+BuildRequires: fedora-usermgmt-devel
+%{?FE_USERADD_REQ}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires(post): initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): initscripts
+Provides: group(%username) = %uid
+Provides: user(%username) = %uid
+
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -56,13 +73,37 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+install -d $RPM_BUILD_ROOT%{_initrddir}
+install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/flow-capture
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%pre
+%__fe_groupadd %uid -r %username &>/dev/null || :
+%__fe_useradd  %uid -r -s /sbin/nologin -d %homedir -M          \
+                    -c '%gecos' -g %username %username &>/dev/null || :
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add flow-capture
+
+%preun
+if [ $1 = 0 ]; then
+        /sbin/service flow-capture stop >/dev/null 2>&1
+        /sbin/chkconfig --del flow-capture
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+        /sbin/service flow-capture condrestart >/dev/null 2>&1 || :
+fi
 
-%postun -p /sbin/ldconfig
+%__fe_userdel  %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
 
 %files 
 %defattr(-,root,root)
@@ -76,7 +117,9 @@
 %dir %{_sysconfdir}/%{name}/sym/
 %config(noreplace) %{_sysconfdir}/%{name}/cfg/*
 %config(noreplace) %{_sysconfdir}/%{name}/sym/*
-%{_localstatedir}/%{name}/
+%config(noreplace) %{_sysconfdir}/sysconfig/flow-capture
+%{_initrddir}/flow-capture
+%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 
@@ -86,6 +129,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Sep 13 2007 Orion Poplawski <orion at cora.nwra.com> - 0.68.1-2
+- Add user and init scripts
+
 * Sun Aug  5 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:38:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 14 Sep 2007 14:38:11 -0400
Subject: rpms/libtheora/F-7 libtheora-1.0alpha8-textreloc.patch, NONE,
	1.1 libtheora.spec, 1.17, 1.18
Message-ID: <200709141838.l8EIcBiL022817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22794

Modified Files:
	libtheora.spec 
Added Files:
	libtheora-1.0alpha8-textreloc.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)


libtheora-1.0alpha8-textreloc.patch:

--- NEW FILE libtheora-1.0alpha8-textreloc.patch ---
diff -up libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c
--- libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~	2007-09-14 19:27:07.000000000 +0200
+++ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c	2007-09-14 19:27:07.000000000 +0200
@@ -21,6 +21,9 @@
 
 #if defined(USE_ASM)
 
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
+
 static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
 static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
 
@@ -173,12 +176,17 @@ static void FilterVert__mmx(unsigned cha
     );
 }
 
+#endif
+
 /* install our implementation in the function table */
 void dsp_mmx_dct_decode_init(DspFunctions *funcs)
 {
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
   TH_DEBUG("enabling accelerated x86_32 mmx dct decode functions.\n");
   funcs->FilterVert = FilterVert__mmx;
   funcs->FilterHoriz = FilterHoriz__mmx;
+#endif
 }
 
 #endif /* USE_ASM */


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/F-7/libtheora.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libtheora.spec	16 Aug 2007 19:45:15 -0000	1.17
+++ libtheora.spec	14 Sep 2007 18:37:38 -0000	1.18
@@ -1,13 +1,15 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha8
-Release: 0.1.svn13393%{?dist}
+Release: 0.3.svn13393%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.theora.org
-Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.gz
+# svn snapshot (svn revision 13393) no url
+Source0: %{name}-%{version}.tar.gz
 Patch0: libtheora-1.0alpha8-version-info.patch
+Patch1: libtheora-1.0alpha8-textreloc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -52,6 +54,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 aclocal -I m4
 libtoolize --automake
 autoheader
@@ -100,6 +103,12 @@
 %{_bindir}/*
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
+- Fix textrelocations on i386 (bz 253591)
+
+* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.2.svn13393
+- Fix Source0 URL
+
 * Sun Jul 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.1.svn13393
 - Update to 1.0alpha8 svn (revision 13393) snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:45:29 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 14:45:29 -0400
Subject: rpms/compiz/devel compiz.spec,1.100,1.101
Message-ID: <200709141845.l8EIjTUN022971@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22935

Modified Files:
	compiz.spec 
Log Message:
- compiz-gnome: install core schema so it actually works
  REALLY, THIS TIME!
- remove unnecessary gconf stuff from %%install




Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- compiz.spec	14 Sep 2007 17:50:23 -0000	1.100
+++ compiz.spec	14 Sep 2007 18:44:56 -0000	1.101
@@ -1,7 +1,7 @@
 %define		snapshot	0ec3ec
 %define		dialogversion	0.7.7
 
-%define		core_plugins	blur clone core cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
+%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
 
 %define		gnome_plugins	annotate gconf glib svg
 
@@ -161,10 +161,6 @@
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-for f in %{core_plugins} %{gnome_plugins}; do
-  gconftool-2 --makefile-uninstall-rule $f >& /dev/null || :
-done
-
 %find_lang compiz
 %find_lang desktop-effects
 
@@ -189,7 +185,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-for f in %{core_plugins} %{gnome_plugins}; do
+for f in %{core_plugins} %{gnome_plugins} core; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
 done
 
@@ -202,7 +198,7 @@
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins}; do
+  for f in %{core_plugins} %{gnome_plugins} core; do
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
   done
 fi
@@ -211,7 +207,7 @@
 %preun gnome
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins}; do
+  for f in %{core_plugins} %{gnome_plugins} core; do
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
   done
 fi
@@ -277,8 +273,9 @@
 
 
 %changelog
-* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-10
+* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-11
 - compiz-gnome: install core schema so it actually works
+- remove unnecessary gconf stuff from %%install
 
 * Tue Aug 28 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-9
 - Make compiz-gnome Obsolete the older compiz package so yum/anaconda



From fedora-extras-commits at redhat.com  Fri Sep 14 18:48:31 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 14:48:31 -0400
Subject: rpms/compiz/devel compiz.spec,1.101,1.102
Message-ID: <200709141848.l8EImVZ8023071@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045

Modified Files:
	compiz.spec 
Log Message:
bump



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- compiz.spec	14 Sep 2007 18:44:56 -0000	1.101
+++ compiz.spec	14 Sep 2007 18:47:59 -0000	1.102
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        10.%{snapshot}%{?dist}
+Release:        11.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Fri Sep 14 19:09:36 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:09:36 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-smnotify-path.patch, NONE,
	1.1 nfs-utils.spec, 1.154, 1.155
Message-ID: <200709141909.l8EJ9amr029455@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
- Changed the default paths in sm-notify to 
  /var/lib/nfs/statd (bz 258461)


nfs-utils-1.1.0-smnotify-path.patch:

--- NEW FILE nfs-utils-1.1.0-smnotify-path.patch ---
commit 02968aa55972b680fa00273188da281d7612ca3e
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 14:19:50 2007 -0400

    Changed the default paths in sm-notify to
    /var/lib/nfs/statd which is where the locking
    state is kept in Red Hat distros.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 98c03f9..862889f 100644
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -24,11 +24,13 @@
 #include <errno.h>
 #include <grp.h>
 
+#define STATD_PATH_XTN "statd/"
+
 #ifndef BASEDIR
 # ifdef NFS_STATEDIR
-#  define BASEDIR		NFS_STATEDIR
+#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
 # else
-#  define BASEDIR		"/var/lib/nfs"
+#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
 # endif
 #endif
 
diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man
index dd03b8d..69b7059 100644
--- a/utils/statd/sm-notify.man
+++ b/utils/statd/sm-notify.man
@@ -33,7 +33,7 @@ but this is configurable.
 For each NFS client or server machine to be monitored,
 .B rpc.statd
 creates a file in
-.BR /var/lib/nfs/sm ", "
+.BR /var/lib/nfs/statd/sm ", "
 and removes the file if monitoring is no longer required.
 .PP
 When the machine is rebooted,
@@ -47,7 +47,7 @@ Each machine has an
 which is basically an integer counter that is incremented
 each time the machine reboots. This counter is stored
 in
-.BR /var/lib/nfs/state ,
+.BR /var/lib/nfs/statd/state ,
 and updated by
 .BR sm-notify .
 .SS Security
@@ -149,13 +149,13 @@ By default,
 .B sm-notify
 forks and puts itself in the background after obtaining the
 list of hosts from
-.BR /var/lib/nfs/sm .
+.BR /var/lib/nfs/statd/sm .
 .SH FILES
-.BR /var/lib/nfs/state
+.BR /var/lib/nfs/statd/state
 .br
-.BR /var/lib/nfs/sm/*
+.BR /var/lib/nfs/statd/sm/*
 .br
-.BR /var/lib/nfs/sm.bak/*
+.BR /var/lib/nfs/statd/sm.bak/*
 .br
 .BR /var/run/sm-notify.pid
 .SH SEE ALSO


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- nfs-utils.spec	16 Aug 2007 02:50:26 -0000	1.154
+++ nfs-utils.spec	14 Sep 2007 19:09:03 -0000	1.155
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -33,6 +33,7 @@
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-exportfs-open.patch
+Patch11: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -65,7 +66,7 @@
 BuildRequires: libgssapi-devel >= 0.11 libevent-devel >= 1.3b
 BuildRequires: nfs-utils-lib-devel >= 1.1.0
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool
+BuildRequires: automake, libtool, glibc-headers
 BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
@@ -96,6 +97,7 @@
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -266,6 +268,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-5
+- Changed the default paths in sm-notify to 
+  /var/lib/nfs/statd (bz 258461)
+
 * Wed Aug 15 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses
   mode bits when creating the etab file (bz 252440).



From fedora-extras-commits at redhat.com  Fri Sep 14 19:21:15 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:21:15 -0400
Subject: rpms/rpcbind/F-7 rpcbind.init,1.4,1.5 rpcbind.spec,1.16,1.17
Message-ID: <200709141921.l8EJLFnl029619@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Changed init script to start service in runlevel 2 (bz 251568)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcbind.init	25 May 2007 08:59:28 -0000	1.4
+++ rpcbind.init	14 Sep 2007 19:20:43 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # rpcbind       Start/Stop RPCbind
 #
-# chkconfig: 345 13 87
+# chkconfig: 2345 13 87
 # description: The rpcbind utility is a server that converts RPC program \
 #              numbers into universal addresses. It must be running on the \
 #              host to be able to make RPC calls on a server on that machine.


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpcbind.spec	25 May 2007 09:01:14 -0000	1.16
+++ rpcbind.spec	14 Sep 2007 19:20:43 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -121,6 +121,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-2
+- Changed init script to start service in runlevel 2 (bz 251568)
+
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:23:03 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:23:03 -0400
Subject: rpms/rpcbind/devel rpcbind.init,1.4,1.5 rpcbind.spec,1.15,1.16
Message-ID: <200709141923.l8EJN3sA029763@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29666

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Changed init script to start service in runlevel 2 (bz 251568)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcbind.init	25 May 2007 09:02:12 -0000	1.4
+++ rpcbind.init	14 Sep 2007 19:22:31 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # rpcbind       Start/Stop RPCbind
 #
-# chkconfig: 345 13 87
+# chkconfig: 2345 13 87
 # description: The rpcbind utility is a server that converts RPC program \
 #              numbers into universal addresses. It must be running on the \
 #              host to be able to make RPC calls on a server on that machine.


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpcbind.spec	25 May 2007 09:02:12 -0000	1.15
+++ rpcbind.spec	14 Sep 2007 19:22:31 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -121,6 +121,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Changed init script to start service in runlevel 2 (bz 251568)
+
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:09 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 15:27:09 -0400
Subject: rpms/verbiste/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 verbiste.spec, 1.17, 1.18
Message-ID: <200709141927.l8EJR99Z029947@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/verbiste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29870

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Upstream release, plus update license to GPLv2+.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Apr 2007 22:18:14 -0000	1.11
+++ .cvsignore	14 Sep 2007 19:26:37 -0000	1.12
@@ -1 +1 @@
-verbiste-0.1.20.tar.gz
+verbiste-0.1.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Apr 2007 22:18:14 -0000	1.11
+++ sources	14 Sep 2007 19:26:37 -0000	1.12
@@ -1 +1 @@
-f3d46647505d8d02bf513691a2d7cc29  verbiste-0.1.20.tar.gz
+a9905f429304962137f8fcd710159513  verbiste-0.1.21.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- verbiste.spec	1 Apr 2007 22:18:14 -0000	1.17
+++ verbiste.spec	14 Sep 2007 19:26:37 -0000	1.18
@@ -1,10 +1,10 @@
 Name:           verbiste
-Version:        0.1.20
+Version:        0.1.21
 Release:        1%{?dist}
 Summary:        French conjugation system
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://sarrazip.com/dev/verbiste.html
 Source:         http://www3.sympatico.ca/sarrazip/dev/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -42,6 +42,11 @@
 
 %prep
 %setup -q
+# convert doc files to unicode
+for DOCFILE in README NEWS HACKING LISEZMOI; do
+    iconv -f ISO8859-15 -t UTF8 < $DOCFILE > $DOCFILE.tmp
+    mv -f $DOCFILE.tmp $DOCFILE
+done
 
 
 %build
@@ -86,7 +91,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ABOUT-NLS AUTHORS HACKING NEWS README THANKS
+%doc COPYING ABOUT-NLS AUTHORS HACKING NEWS README THANKS LISEZMOI
 %{_libdir}/*so.*
 %{_mandir}/man*/*
 %{_mandir}/*/man*/*
@@ -111,6 +116,11 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.21-1
+- Upstream 0.1.21
+- Adjust license to match expected standard
+- Make sure docs are utf-8
+
 * Sun Apr 01 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.20-1
 - Upstream 0.1.20
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:29 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 15:27:29 -0400
Subject: extras-buildsys/utils/pushscript epel4-createrepo, NONE,
	1.1 Config_EPEL.py, 1.10, 1.11
Message-ID: <200709141927.l8EJRTeg030030@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29939

Modified Files:
	Config_EPEL.py 
Added Files:
	epel4-createrepo 
Log Message:
For EPEL4 add a script that calls createrepo + yum-arch.



--- NEW FILE epel4-createrepo ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

import errno, sys
import Utils

createrepo = '/usr/bin/createrepo'
yumarch = '/usr/bin/yum-arch'

args = sys.argv[1:]

cmd = createrepo+' '+' '.join(args)
Utils.run_and_check(cmd)

# Delete some args when executing yum-arch.
newargs = []
c = 0
while c<len(args):
    a = args[c]
    if a=='-g' or a=='-c':
        c += 2
    else:
        newargs.append(a)
        c += 1
cmd = yumarch+' '+' '.join(newargs)
Utils.run_and_check(cmd)

sys.exit(0)


Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Config_EPEL.py	8 Sep 2007 17:40:17 -0000	1.10
+++ Config_EPEL.py	14 Sep 2007 19:27:27 -0000	1.11
@@ -126,6 +126,10 @@
 
 createrepo = '/usr/bin/createrepo -q'
 
+createrepo_dict = { '4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q',
+                    'testing/4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q',
+                    }
+
 cr_cachedir = '/tmp/repomd-cache-epel'  # createrepo cachedir
 
 #repoview = '/usr/bin/repoview'



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:48 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:27:48 -0400
Subject: rpms/rubygems/F-7 .cvsignore, 1.4, 1.5 rubygems.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709141927.l8EJRmTd030040@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29953

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
Version 0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:45:49 -0000	1.4
+++ .cvsignore	14 Sep 2007 19:27:15 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:45:49 -0000	1.3
+++ rubygems.spec	14 Sep 2007 19:27:15 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:45:49 -0000	1.4
+++ sources	14 Sep 2007 19:27:15 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:31:38 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:31:38 -0400
Subject: rpms/rubygems/F-7 no-rdoc.patch,NONE,1.1
Message-ID: <200709141931.l8EJVcL7030182@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30169

Added Files:
	no-rdoc.patch 
Log Message:
Forgot to add patches

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:35:11 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 15:35:11 -0400
Subject: rpms/dbus/devel dbus-1.1.2-no-abort.patch, NONE, 1.1 dbus.spec,
	1.128, 1.129
Message-ID: <200709141935.l8EJZBke030274@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30252

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1.2-no-abort.patch 
Log Message:
don't abort on selinux messages. (#283231)


dbus-1.1.2-no-abort.patch:

--- NEW FILE dbus-1.1.2-no-abort.patch ---
diff -up dbus-1.1.2/bus/bus.c.foo dbus-1.1.2/bus/bus.c
--- dbus-1.1.2/bus/bus.c.foo	2007-09-14 15:26:08.000000000 -0400
+++ dbus-1.1.2/bus/bus.c	2007-09-14 15:26:08.000000000 -0400
@@ -1206,7 +1206,7 @@ bus_context_check_security_policy (BusCo
 				    dest ? dest : DBUS_SERVICE_DBUS, error))
         {
 
-	  if (dbus_error_is_set (error) &&
+	  if (error != NULL && dbus_error_is_set (error) &&
 	      dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
 	    {
 	      return FALSE;


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- dbus.spec	14 Sep 2007 13:11:38 -0000	1.128
+++ dbus.spec	14 Sep 2007 19:34:38 -0000	1.129
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -38,6 +38,7 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
 Patch3: dbus-1.1.2-audit-user.patch
+Patch4: dbus-1.1.2-no-abort.patch
 
 %description
 
@@ -81,6 +82,7 @@
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .lsb
 %patch3 -p1 -b .audit-user
+%patch4 -p1 -b .abort
 
 autoreconf -f -i
 
@@ -200,6 +202,9 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 1.1.2-6%{?dist}
+- fix daemon abort when SELinux denies passing on a message (#283231)
+
 * Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
 - Reverse we_were_root check to setpcap if we were root.  Also only init
 audit if we were root.  So error dbus message will not show up when policy 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:40:22 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:40:22 -0400
Subject: rpms/rubygems/devel no-rdoc.patch,NONE,1.1
Message-ID: <200709141940.l8EJeMAx030476@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30465

Added Files:
	no-rdoc.patch 
Log Message:
Forgot to add patches

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:42:29 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:42:29 -0400
Subject: rpms/rubygems/EL-5 no-rdoc.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 rubygems.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709141942.l8EJgTDS030605@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30554

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	no-rdoc.patch 
Log Message:
Version 0.9.4

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:58:24 -0000	1.4
+++ .cvsignore	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:58:24 -0000	1.3
+++ rubygems.spec	14 Sep 2007 19:41:57 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:58:24 -0000	1.4
+++ sources	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:43:00 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 15:43:00 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 sugar-datastore.spec, 1.26, 1.27
Message-ID: <200709141943.l8EJh0R8030626@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30597

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Sep 2007 19:55:23 -0000	1.25
+++ .cvsignore	14 Sep 2007 19:42:28 -0000	1.26
@@ -1 +1 @@
-sugar-datastore-0.2.2-git7655f4d99a.tar.bz2
+sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Sep 2007 19:55:23 -0000	1.25
+++ sources	14 Sep 2007 19:42:28 -0000	1.26
@@ -1 +1 @@
-f60a6cbcdccdbd84e18a39718fc3d57f  sugar-datastore-0.2.2-git7655f4d99a.tar.bz2
+d2eb27bb21ceea2ac55b718547160803  sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar-datastore.spec	12 Sep 2007 19:55:23 -0000	1.26
+++ sugar-datastore.spec	14 Sep 2007 19:42:28 -0000	1.27
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070912git
-%define commitid 7655f4d99a
+%define alphatag 20070914git
+%define commitid ea13f75d6a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.22.%{alphatag}7655f4d99a
+Release: 0.23.%{alphatag}ea13f75d6a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:48:56 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 15:48:56 -0400
Subject: rpms/python-setuptools/devel .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200709141948.l8EJmuaZ030933@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30902

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Attempt to further resolve #251645.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:58 -0000	1.10
+++ .cvsignore	14 Sep 2007 19:48:23 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-setuptools.spec	27 Aug 2007 23:26:53 -0000	1.13
+++ python-setuptools.spec	14 Sep 2007 19:48:23 -0000	1.14
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
-Release:        2%{?dist}
+Version:        0.6c7
+Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Applications/System
@@ -74,17 +74,24 @@
 %files
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt pkg_resources.txt
-%{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/*
+%exclude %{python_sitelib}/easy_install*
+%exclude %{python_sitelib}/setuptools/command
 
 %files devel
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
-%{python_sitelib}/*
-%exclude %{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/easy_install*
+%{python_sitelib}/setuptools/command
 %{_bindir}/*
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Move some things from devel into runtime, in order to not break other
+  projects.
+
 * Sat Aug 18 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-2
 - Make license tag conform to the new Licensing Guidelines
 - Move everything except pkg_resources.py into a separate -devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:58 -0000	1.10
+++ sources	14 Sep 2007 19:48:23 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:59:02 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 15:59:02 -0400
Subject: rpms/nsd/devel nsd.spec,1.22,1.23
Message-ID: <200709141959.l8EJx2kB031217@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	nsd.spec 
Log Message:
* 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.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nsd.spec	14 Sep 2007 18:17:20 -0000	1.22
+++ nsd.spec	14 Sep 2007 19:58:30 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -21,7 +21,7 @@
 
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
-	--with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
+           --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
 
@@ -37,10 +37,9 @@
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.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 "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -78,6 +77,10 @@
 fi
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:16 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:16 -0400
Subject: rpms/python-setuptools/EL-4 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBGHr005132@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/EL-4

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:35 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:44 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/python-setuptools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-setuptools.spec	10 Jun 2007 22:25:35 -0000	1.12
+++ python-setuptools.spec	14 Sep 2007 20:10:44 -0000	1.13
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:35 -0000	1.10
+++ sources	14 Sep 2007 20:10:44 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:19 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:19 -0400
Subject: rpms/python-setuptools/EL-5 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBJaW005139@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/EL-5

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:41 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:47 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/python-setuptools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-setuptools.spec	10 Jun 2007 22:25:41 -0000	1.11
+++ python-setuptools.spec	14 Sep 2007 20:10:47 -0000	1.12
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:41 -0000	1.10
+++ sources	14 Sep 2007 20:10:47 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:22 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:22 -0400
Subject: rpms/python-setuptools/F-7 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBMeS005145@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/F-7

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:46 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:50 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/python-setuptools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-setuptools.spec	10 Jun 2007 22:25:46 -0000	1.12
+++ python-setuptools.spec	14 Sep 2007 20:10:50 -0000	1.13
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:46 -0000	1.10
+++ sources	14 Sep 2007 20:10:50 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:25 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:25 -0400
Subject: rpms/python-setuptools/FC-6 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBPoQ005175@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/FC-6

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:52 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:52 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/python-setuptools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-setuptools.spec	10 Jun 2007 22:25:52 -0000	1.11
+++ python-setuptools.spec	14 Sep 2007 20:10:52 -0000	1.12
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:52 -0000	1.10
+++ sources	14 Sep 2007 20:10:52 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:13:55 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 16:13:55 -0400
Subject: extras-buildsys/utils/pushscript epel4-createrepo,1.1,1.2
Message-ID: <200709142013.l8EKDtFZ005369@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5317

Modified Files:
	epel4-createrepo 
Log Message:
wildcard protection needed here, too


Index: epel4-createrepo
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/epel4-createrepo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel4-createrepo	14 Sep 2007 19:27:27 -0000	1.1
+++ epel4-createrepo	14 Sep 2007 20:13:53 -0000	1.2
@@ -7,7 +7,10 @@
 createrepo = '/usr/bin/createrepo'
 yumarch = '/usr/bin/yum-arch'
 
-args = sys.argv[1:]
+# Protect wildcards from expansion.
+def f(a):
+    return a.replace('*','\*')
+args = map(lambda a: f(a),sys.argv[1:])
 
 cmd = createrepo+' '+' '.join(args)
 Utils.run_and_check(cmd)



From fedora-extras-commits at redhat.com  Fri Sep 14 20:18:07 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 16:18:07 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.81, 1.82 sources, 1.62,
	1.63
Message-ID: <200709142018.l8EKI7IE005537@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5510

Modified Files:
	fedora-logos.spec sources 
Log Message:
regen tarball



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fedora-logos.spec	13 Sep 2007 20:52:24 -0000	1.81
+++ fedora-logos.spec	14 Sep 2007 20:17:34 -0000	1.82
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 7.92.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 
@@ -203,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-2-
+- regen tarball
+
 * Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
 - add the powered-by logo (#250676)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	13 Sep 2007 20:52:24 -0000	1.62
+++ sources	14 Sep 2007 20:17:34 -0000	1.63
@@ -1 +1 @@
-7799320bef9d9adb66eb01cf7adc21c4  fedora-logos-7.92.1.tar.bz2
+e598b9fd821a022d4e7185c1ff8653c9  fedora-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 20:47:07 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 14 Sep 2007 16:47:07 -0400
Subject: rpms/gcc/devel gcc41-builtin-va-arg-pack-len.patch, NONE,
	1.1 gcc41-pr27954.patch, NONE, 1.1 gcc41.spec, 1.172, 1.173
Message-ID: <200709142047.l8EKl7Vg006119@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6078

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-va-arg-pack-len.patch gcc41-pr27954.patch 
Log Message:
4.1.2-24

gcc41-builtin-va-arg-pack-len.patch:

--- NEW FILE gcc41-builtin-va-arg-pack-len.patch ---
2007-09-11  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK_LEN): New builtin.
	* builtins.c (expand_builtin) <case BUILT_IN_VA_ARG_PACK_LEN>: Issue
	error if __builtin_va_arg_pack_len () wasn't optimized out during
	inlining.
	* tree-inline.c (copy_bb): Replace __builtin_va_arg_pack_len ()
	with the number of inline's anonymous arguments.
	* doc/extend.texi: Document __builtin_va_arg_pack_len ().

	* gcc.dg/va-arg-pack-len-1.c: New test.
	* g++.dg/va-arg-pack-len-1.C: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:24.000000000 +0200
+++ gcc/builtins.def	2007-09-14 21:07:41.000000000 +0200
@@ -666,6 +666,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK_LEN, "va_arg_pack_len", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/builtins.c.jj	2007-09-06 11:04:56.000000000 +0200
+++ gcc/builtins.c	2007-09-14 21:07:41.000000000 +0200
@@ -5985,6 +5985,12 @@ expand_builtin (tree exp, rtx target, rt
       error ("invalid use of %<__builtin_va_arg_pack ()%>");
       return const0_rtx;
 
+    case BUILT_IN_VA_ARG_PACK_LEN:
+      /* All valid uses of __builtin_va_arg_pack_len () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
--- gcc/tree-inline.c.jj	2007-09-06 12:35:57.000000000 +0200
+++ gcc/tree-inline.c	2007-09-14 21:22:48.000000000 +0200
@@ -741,6 +741,37 @@ copy_bb (copy_body_data *id, basic_block
 	      *a = copy_list (arglist);
 	      CALL_EXPR_VA_ARG_PACK (call) = 0;
 	    }
+	  else if (call
+		   && id->call_expr
+		   && (decl = get_callee_fndecl (call))
+		   && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL
+		   && DECL_FUNCTION_CODE (decl)
+		      == BUILT_IN_VA_ARG_PACK_LEN)
+	    {
+	      /* __builtin_va_arg_pack_len () should be replaced by
+		 the number of anonymous arguments.  */
+	      int nargs;
+	      tree count, *call_ptr, p, a;
+
+	      a = TREE_OPERAND (id->call_expr, 1);
+	      for (p = DECL_ARGUMENTS (id->src_fn); p; p = TREE_CHAIN (p))
+		a = TREE_CHAIN (a);
+
+              for (nargs = 0; a; a = TREE_CHAIN (a))
+		nargs++;
+
+	      count = build_int_cst (integer_type_node, nargs);
+	      call_ptr = &stmt;
+	      if (TREE_CODE (*call_ptr) == MODIFY_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 1);
+	      if (TREE_CODE (*call_ptr) == WITH_SIZE_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 0);
+	      gcc_assert (*call_ptr == call && call_ptr != &stmt);
+	      *call_ptr = count;
+	      update_stmt (stmt);
+	      call = NULL_TREE;
+	    }
+
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
--- gcc/doc/extend.texi.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-14 21:07:41.000000000 +0200
@@ -578,6 +578,41 @@ myprintf (FILE *f, const char *format, .
 @end smallexample
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack_len ()
+This built-in function returns the number of anonymous arguments of
+an inline function.  It can be used only in inline functions which
+will be always inlined, never compiled as a separate function, such
+as those using @code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+For example following will do link or runtime checking of open
+arguments for optimized code:
+ at smallexample
+#ifdef __OPTIMIZE__
+extern inline __attribute__((__gnu_inline__)) int
+myopen (const char *path, int oflag, ...)
+@{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    @{
+      if ((oflag & O_CREAT) != 0 && __builtin_va_arg_pack_len () < 1)
+        @{
+          warn_open_missing_mode ();
+          return __open_2 (path, oflag);
+        @}
+      return open (path, oflag, __builtin_va_arg_pack ());
+    @}
+    
+  if (__builtin_va_arg_pack_len () < 1)
+    return __open_2 (path, oflag);
+
+  return open (path, oflag, __builtin_va_arg_pack ());
+@}
+#endif
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int warn_open_missing_mode (void);
+extern int warn_open_too_many_arguments (void);
+extern void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      /* In real __open_2 this would terminate the program:
+	 open with O_CREAT without third argument.  */
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  /* Invalid use of myopen, but only detectable at runtime.  */
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+// { dg-do run }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern "C" int warn_open_missing_mode (void);
+extern "C" int warn_open_too_many_arguments (void);
+extern "C" void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      // In real __open_2 this would terminate the program:
+      // open with O_CREAT without third argument.
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  // Invalid use of myopen, but only detectable at runtime.
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}

gcc41-pr27954.patch:

--- NEW FILE gcc41-pr27954.patch ---
2006-10-27  Jerry DeLisle  <jvdelisle at gcc.gnu.org>

	PR fortran/27954
	* decl.c (gfc_free_data_all): New function to free all data structures
	after errors in DATA statements and declarations.
	(top_var_list): Use new function.(top_val_list): Use new function.
	(gfc_match_data_decl): Use new function.

	PR libgfortran/27954
	* gfortran.dg/error_recovery_2.f90: New test.

--- gcc/fortran/decl.c	(revision 118083)
+++ gcc/fortran/decl.c	(revision 118086)
@@ -128,6 +128,21 @@ gfc_free_data (gfc_data * p)
 }
 
 
+/* Free all data in a namespace.  */
+static void
+gfc_free_data_all (gfc_namespace * ns)
+{
+  gfc_data *d;
+
+  for (;ns->data;)
+    {
+      d = ns->data->next;
+      gfc_free (ns->data);
+      ns->data = d;
+    }
+}
+
+
 static match var_element (gfc_data_variable *);
 
 /* Match a list of variables terminated by an iterator and a right
@@ -262,6 +277,7 @@ top_var_list (gfc_data * d)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -374,6 +390,7 @@ top_val_list (gfc_data * data)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -2368,6 +2385,8 @@ ok:
   gfc_error ("Syntax error in data declaration at %C");
   m = MATCH_ERROR;
 
+  gfc_free_data_all (gfc_current_ns);
+
 cleanup:
   gfc_free_array_spec (current_as);
   current_as = NULL;
--- gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 118086)
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! PR27954 Internal compiler error on bad statements
+! Derived from test case submitted in PR.
+subroutine bad1
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+end subroutine bad1
+
+subroutine bad2
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case."
+end subroutine bad2
+
+subroutine bad3
+  implicit none
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case that segfaults without patch."
+end subroutine bad3
+


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- gcc41.spec	7 Sep 2007 07:12:55 -0000	1.172
+++ gcc41.spec	14 Sep 2007 20:46:35 -0000	1.173
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 23
+%define gcc_release 24
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -150,6 +150,8 @@
 Patch34: gcc41-builtin-chk-anticipated.patch
 Patch35: gcc41-builtin-throw.patch
 Patch36: gcc41-builtin-va-arg-pack.patch
+Patch37: gcc41-builtin-va-arg-pack-len.patch
+Patch38: gcc41-pr27954.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -469,6 +471,8 @@
 %patch34 -p0 -b .builtin-chk-anticipated~
 %patch35 -p0 -b .builtin-throw~
 %patch36 -p0 -b .builtin-va-arg-pack~
+%patch37 -p0 -b .builtin-va-arg-pack-len~
+%patch38 -p0 -b .pr27954~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1623,6 +1627,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24
+- backport __builtin_va_arg_pack_len () support
+- fix Fortran error recovery with DATA (Jerry DeLisle, #281331,
+  PR fortran/27954)
+
 * Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23
 - fix __builtin_va_arg_pack () support for C++
 



From fedora-extras-commits at redhat.com  Fri Sep 14 20:56:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 16:56:20 -0400
Subject: rpms/kernel/devel kernel.spec,1.166,1.167
Message-ID: <200709142056.l8EKuKig006367@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6347

Modified Files:
	kernel.spec 
Log Message:
Fix dates in changelog



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kernel.spec	14 Sep 2007 17:55:15 -0000	1.166
+++ kernel.spec	14 Sep 2007 20:55:47 -0000	1.167
@@ -1802,10 +1802,10 @@
 
 
 %changelog
-* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+* Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - leave boot option as "libata.pata_dma" for now
 
-* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+* Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 setup: limit number of EDD devices scanned
 - x86 setup: print number of EDD device during scan
 - libata: change boot option name to "libata.dma"



From fedora-extras-commits at redhat.com  Fri Sep 14 21:09:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 14 Sep 2007 17:09:35 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.25, 1.26 bigboard.spec, 1.34,
	1.35 sources, 1.26, 1.27
Message-ID: <200709142109.l8EL9Z72012630@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12570

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Sep 2007 19:31:21 -0000	1.25
+++ .cvsignore	14 Sep 2007 21:09:03 -0000	1.26
@@ -1 +1 @@
-bigboard-0.5.15.tar.gz
+bigboard-0.5.16.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bigboard.spec	11 Sep 2007 19:31:21 -0000	1.34
+++ bigboard.spec	14 Sep 2007 21:09:03 -0000	1.35
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.15
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
+- new upstream
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 Sep 2007 19:31:21 -0000	1.26
+++ sources	14 Sep 2007 21:09:03 -0000	1.27
@@ -1 +1 @@
-bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz
+43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:10:04 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 14 Sep 2007 17:10:04 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.19,1.20 sources,1.15,1.16
Message-ID: <200709142110.l8ELA46I012683@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12609

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bigboard.spec	11 Sep 2007 21:09:42 -0000	1.19
+++ bigboard.spec	14 Sep 2007 21:09:31 -0000	1.20
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.15
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
+- new upstream
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Sep 2007 21:09:42 -0000	1.15
+++ sources	14 Sep 2007 21:09:31 -0000	1.16
@@ -1 +1 @@
-bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz
+43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:03 -0700
Subject: [pkgdb] python-GnuPGInterface was added for robert
Message-ID: <200709142122.l8ELM4EG010324@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package python-GnuPGInterface with summary A Python module to interface with GnuPG
Kevin Fenzi (kevin) has approved Package python-GnuPGInterface
Kevin Fenzi (kevin) has added a Fedora devel branch for python-GnuPGInterface with an owner of robert
Kevin Fenzi (kevin) has approved python-GnuPGInterface in Fedora devel
Kevin Fenzi (kevin) has approved Package python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora EPEL, 5) updated by kevin
Message-ID: <200709142122.l8ELMRgE010451@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, 6) updated by kevin
Message-ID: <200709142122.l8ELMS15010463@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, devel) updated by kevin
Message-ID: <200709142122.l8ELMSec010476@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, 7) updated by kevin
Message-ID: <200709142122.l8ELMTcN010488@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora EPEL, 4) updated by kevin
Message-ID: <200709142122.l8ELMTPV010501@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:07 -0400
Subject: rpms/python-GnuPGInterface - New directory
Message-ID: <200709142123.l8ELN79G013154@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface

Log Message:
Directory /cvs/extras/rpms/python-GnuPGInterface added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:10 -0400
Subject: rpms/python-GnuPGInterface/devel - New directory
Message-ID: <200709142123.l8ELNAR7013170@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface/devel

Log Message:
Directory /cvs/extras/rpms/python-GnuPGInterface/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:14 -0400
Subject: rpms/python-GnuPGInterface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709142123.l8ELNEoh013196@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-GnuPGInterface


--- NEW FILE Makefile ---
# Top level Makefile for module python-GnuPGInterface
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:16 -0400
Subject: rpms/python-GnuPGInterface/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709142123.l8ELNGL3013218@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-GnuPGInterface


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-GnuPGInterface
# $Id: Makefile,v 1.1 2007/09/14 21:23:14 kevin Exp $
NAME := python-GnuPGInterface
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 fedora-extras-commits at redhat.com  Fri Sep 14 21:25:09 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:09 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPAlc032024@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora devel was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:13 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:13 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPDRI011241@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 7 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:16 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:16 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPGdc032051@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 5 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:18 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:18 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPISj011270@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 6 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:53 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:53 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPrLJ011417@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora devel is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:56 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPuIF011431@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 7 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:57 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:57 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPvu8032201@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 5 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:58 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:58 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPwQH032215@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 6 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:35 -0400
Subject: rpms/cacti/EL-4 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQZB7013816@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/EL-4

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:37 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:37 -0400
Subject: rpms/cacti/EL-5 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQbZd013823@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/EL-5

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:40 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:40 -0400
Subject: rpms/cacti/F-7 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQeXF013830@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/F-7

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:43 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:43 -0400
Subject: rpms/cacti/FC-6 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQh1p013835@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/FC-6

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:37 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:41 -0700
Subject: [pkgdb] eclipse-egit was added for bkonrath
Message-ID: <200709142126.l8ELQfvf032408@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-egit with summary Eclipse Git plugin
Kevin Fenzi (kevin) has approved Package eclipse-egit
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-egit with an owner of bkonrath
Kevin Fenzi (kevin) has approved eclipse-egit in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-egit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-egit (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-egit (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-egit (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:46 -0400
Subject: rpms/cacti/devel CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142126.l8ELQkSu013840@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/devel

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Patches for bug#243592

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	9 Sep 2007 02:36:14 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:26:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:46 -0700
Subject: [pkgdb] eclipse-egit (Fedora, 7) updated by kevin
Message-ID: <200709142126.l8ELQkeV032438@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for eclipse-egit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-egit (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:46 -0700
Subject: [pkgdb] eclipse-egit (Fedora, devel) updated by kevin
Message-ID: <200709142126.l8ELQleG032448@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-egit (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:01 -0400
Subject: rpms/eclipse-egit - New directory
Message-ID: <200709142127.l8ELR1fF013917@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit

Log Message:
Directory /cvs/extras/rpms/eclipse-egit added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:04 -0400
Subject: rpms/eclipse-egit/devel - New directory
Message-ID: <200709142127.l8ELR4NL013933@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-egit/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:07 -0400
Subject: rpms/eclipse-egit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709142127.l8ELR70k013955@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-egit


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-egit
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:11 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709142127.l8ELRBI6013981@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-egit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-egit
# $Id: Makefile,v 1.1 2007/09/14 21:27:08 kevin Exp $
NAME := eclipse-egit
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 fedora-extras-commits at redhat.com  Fri Sep 14 21:27:23 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 17:27:23 -0400
Subject: rpms/dcraw/devel dcraw.spec,1.16,1.17 sources,1.7,1.8
Message-ID: <200709142127.l8ELRNDF014117@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/dcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13834

Modified Files:
	dcraw.spec sources 
Log Message:
rebuild with pristine source tarball



Index: dcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dcraw.spec	6 Aug 2007 07:53:44 -0000	1.16
+++ dcraw.spec	14 Sep 2007 21:26:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Tool for decoding raw image data from digital cameras
 Name: dcraw
 Version: 8.77
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://cybercom.net/~dcoffin/dcraw
@@ -62,6 +62,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Feb 05 2007 Nils Philippsen <nphilipp at redhat.com> - 8.77-2
+- rebuild with pristine source tarball
+
 * Mon Feb 05 2007 Nils Philippsen <nphilipp at redhat.com> - 8.77-1
 - version 8.77
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Aug 2007 07:53:44 -0000	1.7
+++ sources	14 Sep 2007 21:26:50 -0000	1.8
@@ -1 +1 @@
-001e0754cdf8bc2d514f67567be872ba  dcraw-8.77.tar.gz
+bcf6b477f46b99059f383a93f9f75e05  dcraw-8.77.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:43 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:43 -0400
Subject: rpms/cacti/EL-4 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUhbS014585@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/EL-4

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:02 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:46 -0400
Subject: rpms/cacti/EL-5 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUkiV014592@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/EL-5

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:05 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:49 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:49 -0400
Subject: rpms/cacti/F-7 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUnp3014599@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/F-7

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:07 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:52 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:52 -0400
Subject: rpms/cacti/FC-6 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUqua014602@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/FC-6

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:10 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:20 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:55 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:55 -0400
Subject: rpms/cacti/devel cacti.spec,1.12,1.13
Message-ID: <200709142130.l8ELUtWE014613@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/devel

Modified Files:
	cacti.spec 
Log Message:
Release bump because Its friday and I'm stupid


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:26:13 -0000	1.12
+++ cacti.spec	14 Sep 2007 21:30:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:10 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:10 -0400
Subject: rpms/python-GnuPGInterface/EL-4 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgACC015717@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:38 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:38 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:14 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:14 -0400
Subject: rpms/python-GnuPGInterface/F-7 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgEq3015727@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:42 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:42 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:12 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:12 -0400
Subject: rpms/python-GnuPGInterface/EL-5 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgC7Z015721@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:40 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:40 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:17 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:17 -0400
Subject: rpms/python-GnuPGInterface/FC-6 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgHgZ015731@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:45 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:45 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:19 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:19 -0400
Subject: rpms/python-GnuPGInterface/devel python-GnuPGInterface.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgJCN015735@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:47 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:47 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 22:06:07 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:06:07 -0400
Subject: rpms/duplicity/devel .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142206.l8EM67u5025448@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25400

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:05:34 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:27:20 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:05:34 -0000	1.15
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:05:34 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:08:03 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:08:03 -0400
Subject: rpms/duplicity/F-7 .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142208.l8EM83d6025681@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25582

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:07:30 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:27:20 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:07:30 -0000	1.15
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:07:30 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:09:04 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 18:09:04 -0400
Subject: rpms/dbus/devel dbus.spec,1.129,1.130
Message-ID: <200709142209.l8EM942Q025793@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25738

Modified Files:
	dbus.spec 
Log Message:
add bug refs



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- dbus.spec	14 Sep 2007 19:34:38 -0000	1.129
+++ dbus.spec	14 Sep 2007 22:08:30 -0000	1.130
@@ -37,7 +37,9 @@
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=12429
 Patch3: dbus-1.1.2-audit-user.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=12430
 Patch4: dbus-1.1.2-no-abort.patch
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep 14 22:09:45 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:09:45 -0400
Subject: rpms/duplicity/FC-6 .cvsignore, 1.4, 1.5 duplicity.spec, 1.13,
	1.14 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142209.l8EM9jx2025855@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25804

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:09:12 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/duplicity.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- duplicity.spec	7 May 2007 18:29:24 -0000	1.13
+++ duplicity.spec	14 Sep 2007 22:09:12 -0000	1.14
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:09:12 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:12:19 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:12:19 -0400
Subject: rpms/duplicity/EL-5 .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142212.l8EMCJZn026054@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26015

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:11:46 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:33:39 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:11:46 -0000	1.15
@@ -2,37 +2,35 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+%if 0%{?rhel} <= 4
+Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +54,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:11:46 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:14:23 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:14:23 -0400
Subject: rpms/duplicity/EL-4 .cvsignore, 1.3, 1.4 duplicity.spec, 1.10,
	1.11 sources, 1.3, 1.4 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142214.l8EMENeB026206@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Dec 2006 13:34:43 -0000	1.3
+++ .cvsignore	14 Sep 2007 22:13:50 -0000	1.4
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- duplicity.spec	7 May 2007 18:32:13 -0000	1.10
+++ duplicity.spec	14 Sep 2007 22:13:50 -0000	1.11
@@ -2,37 +2,35 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+%if 0%{?rhel} <= 4
+Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +54,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Dec 2006 13:34:43 -0000	1.3
+++ sources	14 Sep 2007 22:13:50 -0000	1.4
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:45:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 18:45:40 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.13,1.14
Message-ID: <200709142245.l8EMje7s028969@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937

Modified Files:
	rss-glx.spec 
Log Message:
replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7, RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
license is GPLv2
run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rss-glx.spec	3 Sep 2007 14:35:48 -0000	1.13
+++ rss-glx.spec	14 Sep 2007 22:45:06 -0000	1.14
@@ -36,11 +36,14 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9.1%{?dist}
-License: GPL
+Release: 10%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# We ship a tarball with one questionable hack patched out.
+# The original URL is the following without %%patchext:
+# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.8.1-0.8.1.p.diff
@@ -80,10 +83,10 @@
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if %modular_xss
-Requires(post): xscreensaver-base >= 1:5.03-2
-Requires(preun): xscreensaver-base >= 1:5.03-2
+Requires(post): xscreensaver-base >= 1:5.03-3
+Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
-Requires: xscreensaver-base < 1:5.03-2
+Requires: xscreensaver-base < 1:5.03-3
 %endif
 
 %description xscreensaver
@@ -112,7 +115,11 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
-Requires: %{_bindir}/kxsconfig
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -237,13 +244,13 @@
 rm -rf %buildroot
 
 %post xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks
 fi
 
-%preun xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks || :
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -276,6 +283,14 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+  RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
+- license is GPLv2
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+  xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
 * Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
 - implement revamped modular xscreensaver configuration (#200881)
 - require post/preun xscreensaver-base min/max EVR
@@ -289,7 +304,7 @@
 
 * Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
 - build xscreensaver hack description files (#200881)
-- require %{bindir}/kxsconfig (#219106)
+- require %{_bindir}/kxsconfig (#219106)
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sat Sep 15 01:21:51 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 21:21:51 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.51, 1.52 sources, 1.52,
	1.53 sugar.spec, 1.60, 1.61
Message-ID: <200709150121.l8F1Lpag027911@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Sep 2007 16:59:33 -0000	1.51
+++ .cvsignore	15 Sep 2007 01:21:18 -0000	1.52
@@ -1 +1 @@
-sugar-0.65-git0a666e23cf.tar.bz2
+sugar-0.65-git8ef6c57f8b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	14 Sep 2007 16:59:33 -0000	1.52
+++ sources	15 Sep 2007 01:21:18 -0000	1.53
@@ -1 +1 @@
-24f98c6505d6f626e1806dc0c8311ef8  sugar-0.65-git0a666e23cf.tar.bz2
+51e6b25d6ff96e63533b2a10b0ffdb58  sugar-0.65-git8ef6c57f8b.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sugar.spec	14 Sep 2007 16:59:33 -0000	1.60
+++ sugar.spec	15 Sep 2007 01:21:18 -0000	1.61
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070914git
-%define commitid 0a666e23cf
+%define alphatag 20070915git
+%define commitid 8ef6c57f8b
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.48.%{alphatag}0a666e23cf
+Release: 0.49.%{alphatag}8ef6c57f8b
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
+- New snapshot
+
 * Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep 15 01:42:44 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:42:44 -0400
Subject: rpms/xscreensaver/F-7 xscreensaver.spec,1.40,1.41
Message-ID: <200709150142.l8F1girD028276@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28241/F-7

Modified Files:
	xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
- Add some comments on update script.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xscreensaver.spec	28 Aug 2007 19:18:45 -0000	1.40
+++ xscreensaver.spec	15 Sep 2007 01:42:12 -0000	1.41
@@ -2,7 +2,13 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%if 0%{?fedora} <= 6
+%define modular_conf  0
+%define fedora_rel    1.1
+%else
+%define modular_conf  1
+%define fedora_rel    4
+%endif
 
 %define extrarel      %{nil}
 
@@ -28,6 +34,7 @@
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+Source10:        update-xscreensaver-hacks
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
@@ -272,6 +279,29 @@
 
 make %{?_smp_mflags}
 
+%if %{modular_conf}
+# Make XScreenSavar.ad modular
+CONFD=xscreensaver
+rm -rf $CONFD
+mkdir $CONFD
+
+# preserve the original adfile
+cp -p driver/XScreenSaver.ad $CONFD
+
+# First split XScreenSaver.ad into 3 parts
+cat driver/XScreenSaver.ad | \
+   sed -n -e '1,/\*programs/p' > $CONFD/XScreenSaver.ad.header
+cat driver/XScreenSaver.ad | sed -e '1,/\*programs/d' | \
+   sed -n -e '1,/\\n$/p' > $CONFD/XScreenSaver.ad.hacks
+cat driver/XScreenSaver.ad | sed -e '1,/\\n$/d' > $CONFD/XScreenSaver.ad.tail
+
+# Seperate XScreenSaver.ad.hacks into each hacks
+cd $CONFD
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
+
+%endif
+
 %install
 archdir=`./config.guess`
 cd $archdir
@@ -323,6 +353,47 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+%if %{modular_conf}
+# install update script
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
+echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
+
+# make hack conf modular
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
+cp -p xscreensaver/XScreenSaver.ad* \
+   $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
+   $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
+
+for adfile in xscreensaver/XScreenSaver.ad.* ; do
+   filen=`basename $adfile`
+   echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
+done
+echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
+echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+   $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+   >> $dd/base.files
+
+# check symlink
+rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+pushd ../../../..
+if [ ! $(pwd) == $RPM_BUILD_ROOT ] ; then
+   echo "Possibly symlink broken"
+   exit 1
+fi
+popd
+popd
+
+ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
+   $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+%endif
+
 # add documents
 pushd $dd &> /dev/null
 for f in README* ; do
@@ -332,7 +403,7 @@
 
 # add directory
 pushd $RPM_BUILD_ROOT
-for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+for dir in `find . -type d | grep xscreensaver` ; do
    echo "%%dir ${dir#.}" >> $dd/base.files
 done
 popd
@@ -414,6 +485,12 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%if %{modular_conf}
+%post base
+%{_sbindir}/update-xscreensaver-hacks
+exit 0
+%endif
+
 %files
 %defattr(-,root,root,-)
 
@@ -433,6 +510,18 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+- Add some comments on update script.
+
+* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
+- Don't split hack part of XScreenSaver.ad into each hack piece
+  and make update script allow multiple hacks in one config file
+  (along with rss-glx, bug 200881)
+- move hack update scripts to %%_sbindir
+
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
+- Try to make XScreenSaver.ad modular (bug 200881)
+
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
 
@@ -441,7 +530,7 @@
   - Don't use include-directory patch anymore
   - Make all xscreensaver related directories owned by -base subpackage
     because now -extras and -gl-extras subpackage require it.
-  - Mark man files as %%doc explicitly, because %_mandir is expanded
+  - Mark man files as %%doc explicitly, because %%_mandir is expanded
     in files list
 - Fix write_long() (actually no_malloc_number_to_string())
 



From fedora-extras-commits at redhat.com  Sat Sep 15 01:42:47 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:42:47 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.2,
	1.3 xscreensaver.spec, 1.46, 1.47
Message-ID: <200709150142.l8F1glHL028280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28241/devel

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
- Add some comments on update script.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update-xscreensaver-hacks	3 Sep 2007 15:24:07 -0000	1.2
+++ update-xscreensaver-hacks	15 Sep 2007 01:42:15 -0000	1.3
@@ -60,7 +60,12 @@
 done
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
-cat $ADDIR/XScreenSaver.ad.header > $tmpfile
+
+echo "! Don't edit this file by yourself!!" > $tmpfile
+echo "! This file will be updated automatically." >> $tmpfile
+echo >> $tmpfile
+
+cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
 
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xscreensaver.spec	3 Sep 2007 15:34:39 -0000	1.46
+++ xscreensaver.spec	15 Sep 2007 01:42:15 -0000	1.47
@@ -2,7 +2,13 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%if 0%{?fedora} <= 6
+%define modular_conf  0
+%define fedora_rel    1.1
+%else
+%define modular_conf  1
+%define fedora_rel    4
+%endif
 
 %define extrarel      %{nil}
 
@@ -16,7 +22,6 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
-%define modular_conf  1
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -505,6 +510,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+- Add some comments on update script.
+
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
 - Don't split hack part of XScreenSaver.ad into each hack piece
   and make update script allow multiple hacks in one config file



From fedora-extras-commits at redhat.com  Sat Sep 15 01:53:36 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:53:36 -0400
Subject: rpms/xscreensaver/F-7 xscreensaver.spec,1.41,1.42
Message-ID: <200709150153.l8F1rajp028514@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28475/F-7

Modified Files:
	xscreensaver.spec 
Log Message:
More comments


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xscreensaver.spec	15 Sep 2007 01:42:12 -0000	1.41
+++ xscreensaver.spec	15 Sep 2007 01:53:04 -0000	1.42
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 %endif
 
 %define extrarel      %{nil}
@@ -510,7 +510,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3



From fedora-extras-commits at redhat.com  Sat Sep 15 01:53:39 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:53:39 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.3,
	1.4 xscreensaver.spec, 1.47, 1.48
Message-ID: <200709150153.l8F1rdJc028518@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28475/devel

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
More comments


Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- update-xscreensaver-hacks	15 Sep 2007 01:42:15 -0000	1.3
+++ update-xscreensaver-hacks	15 Sep 2007 01:53:07 -0000	1.4
@@ -61,8 +61,12 @@
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
 
-echo "! Don't edit this file by yourself!!" > $tmpfile
+echo "! Don't edit this file directly by yourself!!" > $tmpfile
 echo "! This file will be updated automatically." >> $tmpfile
+echo "!" >> $tmpfile
+echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
+echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
+echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
 echo >> $tmpfile
 
 cat $ADDIR/XScreenSaver.ad.header >> $tmpfile


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xscreensaver.spec	15 Sep 2007 01:42:15 -0000	1.47
+++ xscreensaver.spec	15 Sep 2007 01:53:07 -0000	1.48
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 %endif
 
 %define extrarel      %{nil}
@@ -510,7 +510,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3



From fedora-extras-commits at redhat.com  Sat Sep 15 02:08:32 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 22:08:32 -0400
Subject: rpms/xscreensaver/F-7 update-xscreensaver-hacks, NONE,
	1.1 xscreensaver.spec, 1.42, 1.43
Message-ID: <200709150208.l8F28WUo002290@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	xscreensaver.spec 
Added Files:
	update-xscreensaver-hacks 
Log Message:
Again I forgot to add sources. orz


--- NEW FILE update-xscreensaver-hacks ---
#!/bin/bash

_SYSCONFDIR=${sysconfdir:-/etc}
_PREFIX=${prefix:-/usr}
_DATADIR=${datadir:-${_PREFIX}/share}

ADDIR=${ADDIR:-${install_prefix}${_SYSCONFDIR}/xscreensaver}
CONFDIR=${CONFDIR:-${install_prefix}${_DATADIR}/xscreensaver/hacks.conf.d}
ADFILE=${ADFILE:-$ADDIR/XScreenSaver.ad}

fix_hackconf ()
{
	if [ ! -s $1 ] ; then
		echo "$1 is empty" >&2
		echo ""
		return 1
	fi

	tmpconf=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_1=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_2=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_3=`mktemp /tmp/hackconf.XXXXXXXX`
	sed -n -e '$p' $1 > $tmpconf_1
	sed -e '$d' $1 > $tmpconf_2
	for file in $tmpconf_1 $tmpconf_2 ; do
		if ( [ -s $file ] && grep -q '\\n\(\|\\\)[^\\].*$' $file ) ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
	done
	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
	fi
	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
	while [ -s $tmpconf_2 ] ; do
		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
		sed -i -e '1d' $tmpconf_2
		if ! grep -q '\([ \t]\\$\|\\n\\$\)' $tmpconf_3 ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
		cat $tmpconf_3 >> $tmpconf
	done
	cat $tmpconf_1 >> $tmpconf
	rm -f $tmpconf_1 $tmpconf_2 $tmpconf_3
	echo $tmpconf
	return 0
	
}

for suffix in header tail ; do
	if [ ! -r $ADDIR/XScreenSaver.ad.$suffix ] ; then
		echo "$ADDIR/XScreenSaver.ad.$suffix missing"
		exit 1
	fi
done

tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`

echo "! Don't edit this file directly by yourself!!" > $tmpfile
echo "! This file will be updated automatically." >> $tmpfile
echo "!" >> $tmpfile
echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
echo >> $tmpfile

cat $ADDIR/XScreenSaver.ad.header >> $tmpfile

for hackconf in $CONFDIR/*.conf ; do
	hackconf_fixed=`fix_hackconf $hackconf`
	if [ -n "$hackconf_fixed" ] ; then
		cat $hackconf >> $tmpfile
		rm -f $hackconf_fixed
	fi
done
sed -i -e '$s|\\n\\$|\\n|' $tmpfile

cat $ADDIR/XScreenSaver.ad.tail >> $tmpfile
install -c -p -m 644 $tmpfile $ADFILE
rm -f $tmpfile




Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xscreensaver.spec	15 Sep 2007 01:53:04 -0000	1.42
+++ xscreensaver.spec	15 Sep 2007 02:08:00 -0000	1.43
@@ -28,7 +28,7 @@
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{version}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}
+Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics



From fedora-extras-commits at redhat.com  Sat Sep 15 02:31:26 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 14 Sep 2007 22:31:26 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, NONE,
	1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709150231.l8F2VQIv002737@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2706

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


eclipse-egit-add-feature.patch:

--- NEW FILE eclipse-egit-add-feature.patch ---
diff -ruN egit.orig/org.spearce.egit/build.properties egit/org.spearce.egit/build.properties
--- egit.orig/org.spearce.egit/build.properties	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/build.properties	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff -ruN egit.orig/org.spearce.egit/feature.xml egit/org.spearce.egit/feature.xml
--- egit.orig/org.spearce.egit/feature.xml	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/feature.xml	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.spearce.egit"
+      label="Eclipse Git Feature"
+      version="0.2.2"
+      provider-name="spearce.org">
+
+   <description>
+      The Eclipse Git plugin allows developers to interact with Git
+      repositories from within Eclipse.
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      GPLv2 EPL
+   </license>
+
+   <plugin
+         id="org.spearce.egit.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.jgit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -ruN egit.orig/org.spearce.egit/.project egit/org.spearce.egit/.project
--- egit.orig/org.spearce.egit/.project	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/.project	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>


--- NEW FILE eclipse-egit.spec ---

%define gcj_support     1

Summary:          Eclipse Git plug-in
Name:             eclipse-egit
Version:          0.2.2
Release:          0.git20070826%{?dist}
License:          EPL GPLv2
URL:              http://repo.or.cz/w/egit.git
Group:            Development/Tools

# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=522c3046b3b7e4af1a13ca17912e0bfe8b0983e4;sf=tgz
Source0:          egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
Patch0:           %{name}-add-feature.patch

Requires:         eclipse-platform > 1:3.3.0
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.1.2
BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
Requires(post):   java-1.5.0-gcj >= 1.5.0
Requires(postun): java-1.5.0-gcj >= 1.5.0
%else
BuildRequires:    java-devel >= 1.6.0
%endif

BuildRequires:    eclipse-pde
BuildRequires:    jpackage-utils >= 0:1.5

%if %{gcj_support}
%else
BuildArch:        noarch
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The eclipse-egit package contains Eclipse plugins for
interacting with Git repositories.

%prep
%setup -q -c 
%patch0 -p0

%build
# Copy the SDK for build
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

# build the main egit feature
java -cp $SDK/startup.jar                              \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=feature                                    \
     -Did=org.spearce.egit                             \
     -DbaseLocation=$SDK                               \
     -DjavacSource=1.5  -DjavacTarget=1.5              \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse

# egit main feature
unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
            build/rpmBuild/org.spearce.egit.zip

%if %{gcj_support}
aot-compile-rpm
%endif

%clean 
rm -rf $RPM_BUILD_ROOT

%if %{gcj_support}
%post -p /usr/bin/rebuild-gcj-db
%postun -p /usr/bin/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_datadir}/eclipse/features/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit.core*
%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
%{_datadir}/eclipse/plugins/org.spearce.jgit*
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif

%changelog
* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:27:08 -0000	1.1
+++ .cvsignore	15 Sep 2007 02:30:53 -0000	1.2
@@ -0,0 +1 @@
+egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:27:08 -0000	1.1
+++ sources	15 Sep 2007 02:30:53 -0000	1.2
@@ -0,0 +1 @@
+fbbbb7b7366d5a9f397f521837fe3e19  egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 07:13:59 2007
From: fedora-extras-commits at redhat.com (Navid Sheikhol-Eslami (navid))
Date: Sat, 15 Sep 2007 03:13:59 -0400
Subject: rpms/sos/devel sos.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709150713.l8F7Dxdk004291@cvs-int.fedora.redhat.com>

Author: navid

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4262/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sos.spec 
Log Message:
initial cvs import of sos project



--- NEW FILE sos.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define name sos
%define version 1.6
%define release 5
%define topdir build/rpm-%{name}-%{version}

Summary: A set of tools to gather troubleshooting information from a system
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
# The source for this package was pulled from upstream's svn.  Use the
# following commands to generate the tarball:
#  svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-6 sos-1.6
#  tar -czvf sos-1.6.tar.gz sos-1.6
Source0: %{name}-%{version}.tar.gz
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://sos.108.redhat.com/
BuildRequires: python-devel

%description
Sos is a set of tools that gathers information about system
hardware and configuration. The information can then be used for
diagnostic purposes and debugging. Sos is commonly used to help
support technicians and developers.

%prep
%setup -q

%build
python setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%{_sbindir}/sosreport
%{python_sitelib}/sos/
%{_mandir}/man1/sosreport.1*
%doc README TODO LICENSE ChangeLog

%changelog
* Mon Jul  5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-5
- Yet more fixes to make package Fedora compliant.

* Mon Jul  5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-4
- More fixes to make package Fedora compliant.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-3
- Other fixes to make package Fedora compliant.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-2
- Minor fixes.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-1
- Beautified output of --list-plugins.
- GPL licence is now included in the package.
- added python-devel requirement for building package
- fixed incompatibility with python from RHEL4

* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.5-1
- Bumped version

* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-2
- Fixed a backtrace on nonexistent file in kernel plugin (thanks, David Robinson)

* Mon Apr 30 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-1
- Fixed an error in option handling
- Forced the file generated by traceroute to not end in .com
- Fixed a problem with manpage
- Added optional traceroute collection to networking plugin
- Added clalance's patch to gather iptables info.
- Fixes to the device-mapper plugin
- Fixed a problem with installation of man page

* Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3
- including patches to fix the following:
- Resolves: bz219745 sosreport needs a man page
- Resolves: bz219667 sosreport does not terminate cleanly on ^C
- Resolves: bz233375 Make SOS flag the situation when running on a fully virtu...
- Resolves: bz234873 rhel5 sos needs to include rpm-va by default
- Resolves: bz219669 sosreport multi-threaded option sometimes fails
- Resolves: bz219671 RFE for sosreport - allow specification of plugins to be run
- Resolves: bz219672 RFE - show progress while sosreport is running
- Resolves: bz219673 Add xen information gathering to sosreport
- Resolves: bz219675 Collect information related to the new driver update model
- Resolves: bz219877 'Cancel' button during option selection only cancels sele...

* Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 1.3-2
- Add man page

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.3-1
- really fixed bz_219654

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.2-1
- fixed a build problem

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.1-1
- Tighten permissions of tmp directory so only readable by creator bz_219657
- Don't print message 'Problem at path ...'  bz_219654
- Removed useless message bz_219670
- Preserve file modification times bz_219674
- Removed unneeded message about files on copyProhibitedList bz_219712

* Wed Aug 30 2006 Steve Conklin <sconklin at redhat dot com> - 1.0-1
- Seperated upstream and RPM versioning

* Mon Aug 21 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-11
- Code cleanup, fixed a regression in threading

* Mon Aug 14 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-10
- minor bugfixes, added miltithreading option, setup now quiet

* Mon Jul 17 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-9
- migrated to svn on 108.redhat.com, fixed a problem with command output linking in report

* Mon Jun 19 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-6
- Added LICENSE file containing GPL

* Wed May 31 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-5
- Added fixes to network plugin and prepped for Fedora submission

* Wed May 31 2006 John Berninger <jwb at redhat dot com> - 0.1-4
- Reconsolidated subpackages into one package per discussion with sconklin

* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-3
- Added ftp, ldap, mail, named, samba, squid SOS plugins
- Fixed various errors in kernel and hardware plugins

* Mon May 22 2006 John Benringer <jwb at redhat dot com> - 0.1-2
- split off cluster plugin into subpackage
- correct file payload lists

* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-1
- initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Jul 2007 16:43:41 -0000	1.1
+++ .cvsignore	15 Sep 2007 07:13:26 -0000	1.2
@@ -0,0 +1 @@
+sos-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Jul 2007 16:43:41 -0000	1.1
+++ sources	15 Sep 2007 07:13:26 -0000	1.2
@@ -0,0 +1 @@
+fb195dd86f020159eb1da86cf48bb3f2  sos-1.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 08:08:47 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 15 Sep 2007 04:08:47 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-va-arg-pack-len.patch, NONE,
	1.1 gcc41-pr27954.patch, NONE, 1.1 gcc41.spec, 1.164, 1.165
Message-ID: <200709150808.l8F88lW3011542@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11514

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-va-arg-pack-len.patch gcc41-pr27954.patch 
Log Message:
4.1.2-23.fc7

gcc41-builtin-va-arg-pack-len.patch:

--- NEW FILE gcc41-builtin-va-arg-pack-len.patch ---
2007-09-11  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK_LEN): New builtin.
	* builtins.c (expand_builtin) <case BUILT_IN_VA_ARG_PACK_LEN>: Issue
	error if __builtin_va_arg_pack_len () wasn't optimized out during
	inlining.
	* tree-inline.c (copy_bb): Replace __builtin_va_arg_pack_len ()
	with the number of inline's anonymous arguments.
	* doc/extend.texi: Document __builtin_va_arg_pack_len ().

	* gcc.dg/va-arg-pack-len-1.c: New test.
	* g++.dg/va-arg-pack-len-1.C: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:24.000000000 +0200
+++ gcc/builtins.def	2007-09-14 21:07:41.000000000 +0200
@@ -666,6 +666,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK_LEN, "va_arg_pack_len", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/builtins.c.jj	2007-09-06 11:04:56.000000000 +0200
+++ gcc/builtins.c	2007-09-14 21:07:41.000000000 +0200
@@ -5985,6 +5985,12 @@ expand_builtin (tree exp, rtx target, rt
       error ("invalid use of %<__builtin_va_arg_pack ()%>");
       return const0_rtx;
 
+    case BUILT_IN_VA_ARG_PACK_LEN:
+      /* All valid uses of __builtin_va_arg_pack_len () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
--- gcc/tree-inline.c.jj	2007-09-06 12:35:57.000000000 +0200
+++ gcc/tree-inline.c	2007-09-14 21:22:48.000000000 +0200
@@ -741,6 +741,37 @@ copy_bb (copy_body_data *id, basic_block
 	      *a = copy_list (arglist);
 	      CALL_EXPR_VA_ARG_PACK (call) = 0;
 	    }
+	  else if (call
+		   && id->call_expr
+		   && (decl = get_callee_fndecl (call))
+		   && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL
+		   && DECL_FUNCTION_CODE (decl)
+		      == BUILT_IN_VA_ARG_PACK_LEN)
+	    {
+	      /* __builtin_va_arg_pack_len () should be replaced by
+		 the number of anonymous arguments.  */
+	      int nargs;
+	      tree count, *call_ptr, p, a;
+
+	      a = TREE_OPERAND (id->call_expr, 1);
+	      for (p = DECL_ARGUMENTS (id->src_fn); p; p = TREE_CHAIN (p))
+		a = TREE_CHAIN (a);
+
+              for (nargs = 0; a; a = TREE_CHAIN (a))
+		nargs++;
+
+	      count = build_int_cst (integer_type_node, nargs);
+	      call_ptr = &stmt;
+	      if (TREE_CODE (*call_ptr) == MODIFY_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 1);
+	      if (TREE_CODE (*call_ptr) == WITH_SIZE_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 0);
+	      gcc_assert (*call_ptr == call && call_ptr != &stmt);
+	      *call_ptr = count;
+	      update_stmt (stmt);
+	      call = NULL_TREE;
+	    }
+
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
--- gcc/doc/extend.texi.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-14 21:07:41.000000000 +0200
@@ -578,6 +578,41 @@ myprintf (FILE *f, const char *format, .
 @end smallexample
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack_len ()
+This built-in function returns the number of anonymous arguments of
+an inline function.  It can be used only in inline functions which
+will be always inlined, never compiled as a separate function, such
+as those using @code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+For example following will do link or runtime checking of open
+arguments for optimized code:
+ at smallexample
+#ifdef __OPTIMIZE__
+extern inline __attribute__((__gnu_inline__)) int
+myopen (const char *path, int oflag, ...)
+@{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    @{
+      if ((oflag & O_CREAT) != 0 && __builtin_va_arg_pack_len () < 1)
+        @{
+          warn_open_missing_mode ();
+          return __open_2 (path, oflag);
+        @}
+      return open (path, oflag, __builtin_va_arg_pack ());
+    @}
+    
+  if (__builtin_va_arg_pack_len () < 1)
+    return __open_2 (path, oflag);
+
+  return open (path, oflag, __builtin_va_arg_pack ());
+@}
+#endif
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int warn_open_missing_mode (void);
+extern int warn_open_too_many_arguments (void);
+extern void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      /* In real __open_2 this would terminate the program:
+	 open with O_CREAT without third argument.  */
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  /* Invalid use of myopen, but only detectable at runtime.  */
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+// { dg-do run }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern "C" int warn_open_missing_mode (void);
+extern "C" int warn_open_too_many_arguments (void);
+extern "C" void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      // In real __open_2 this would terminate the program:
+      // open with O_CREAT without third argument.
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  // Invalid use of myopen, but only detectable at runtime.
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}

gcc41-pr27954.patch:

--- NEW FILE gcc41-pr27954.patch ---
2006-10-27  Jerry DeLisle  <jvdelisle at gcc.gnu.org>

	PR fortran/27954
	* decl.c (gfc_free_data_all): New function to free all data structures
	after errors in DATA statements and declarations.
	(top_var_list): Use new function.(top_val_list): Use new function.
	(gfc_match_data_decl): Use new function.

	PR libgfortran/27954
	* gfortran.dg/error_recovery_2.f90: New test.

--- gcc/fortran/decl.c	(revision 118083)
+++ gcc/fortran/decl.c	(revision 118086)
@@ -128,6 +128,21 @@ gfc_free_data (gfc_data * p)
 }
 
 
+/* Free all data in a namespace.  */
+static void
+gfc_free_data_all (gfc_namespace * ns)
+{
+  gfc_data *d;
+
+  for (;ns->data;)
+    {
+      d = ns->data->next;
+      gfc_free (ns->data);
+      ns->data = d;
+    }
+}
+
+
 static match var_element (gfc_data_variable *);
 
 /* Match a list of variables terminated by an iterator and a right
@@ -262,6 +277,7 @@ top_var_list (gfc_data * d)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -374,6 +390,7 @@ top_val_list (gfc_data * data)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -2368,6 +2385,8 @@ ok:
   gfc_error ("Syntax error in data declaration at %C");
   m = MATCH_ERROR;
 
+  gfc_free_data_all (gfc_current_ns);
+
 cleanup:
   gfc_free_array_spec (current_as);
   current_as = NULL;
--- gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 118086)
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! PR27954 Internal compiler error on bad statements
+! Derived from test case submitted in PR.
+subroutine bad1
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+end subroutine bad1
+
+subroutine bad2
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case."
+end subroutine bad2
+
+subroutine bad3
+  implicit none
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case that segfaults without patch."
+end subroutine bad3
+


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gcc41.spec	7 Sep 2007 07:13:59 -0000	1.164
+++ gcc41.spec	15 Sep 2007 08:08:15 -0000	1.165
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 22
+%define gcc_release 23
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -148,6 +148,8 @@
 Patch34: gcc41-builtin-chk-anticipated.patch
 Patch35: gcc41-builtin-throw.patch
 Patch36: gcc41-builtin-va-arg-pack.patch
+Patch37: gcc41-builtin-va-arg-pack-len.patch
+Patch38: gcc41-pr27954.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -467,6 +469,8 @@
 %patch34 -p0 -b .builtin-chk-anticipated~
 %patch35 -p0 -b .builtin-throw~
 %patch36 -p0 -b .builtin-va-arg-pack~
+%patch37 -p0 -b .builtin-va-arg-pack-len~
+%patch38 -p0 -b .pr27954~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1621,6 +1625,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23.fc7
+- backport __builtin_va_arg_pack_len () support
+- fix Fortran error recovery with DATA (Jerry DeLisle, #281331,
+  PR fortran/27954)
+
 * Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22.fc7
 - fix __builtin_va_arg_pack () support for C++
 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:13 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:13 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MD1o025080@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 1 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:17 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MH5s013735@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 3 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:16 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MH41013728@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 2 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:21 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MMiG025109@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 4 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:23 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MNrE025123@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 5 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:26 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MQYQ013769@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 6 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:29 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MTTr013784@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:24:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:24:35 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150824.l8F8OZwU025590@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora devel was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:24:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:24:37 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150824.l8F8Obso014245@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 7 was orphaned by Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 08:25:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:25:40 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.14,1.15
Message-ID: <200709150825.l8F8Pebo011961@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11940

Modified Files:
	rss-glx.spec 
Log Message:
enable modular xscreensaver support for Fedora 7 and later (#200881)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rss-glx.spec	14 Sep 2007 22:45:06 -0000	1.14
+++ rss-glx.spec	15 Sep 2007 08:25:08 -0000	1.15
@@ -17,7 +17,7 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
-%if "%{fedora}" >= "8"
+%if "%{fedora}" >= "7"
 %define modular_xss 0%{?!_without_modular_xss:1}
 %else
 %define modular_xss 0%{?_with_modular_xss:1}
@@ -36,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -283,6 +283,9 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
+- enable modular xscreensaver support for Fedora 7 and later (#200881)
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
   RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:32:03 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:32:03 -0400
Subject: rpms/rss-glx/F-7 rss-glx.spec,1.8,1.9
Message-ID: <200709150832.l8F8W3pC012139@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052

Modified Files:
	rss-glx.spec 
Log Message:
enable modular xscreensaver support for Fedora 7 and later (#200881)
replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7, RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
license is GPLv2
run %{_sbindir}/update-xscreensaver-hacks in %post, %postun, require xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail
Buildrequire gawk.
build xscreensaver hack description files (#200881)
require %{_bindir}/kxsconfig (#219106)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss-glx.spec	28 Aug 2006 13:54:50 -0000	1.8
+++ rss-glx.spec	15 Sep 2007 08:31:31 -0000	1.9
@@ -1,4 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %define xssbindir %{_libexecdir}/xscreensaver
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
@@ -16,9 +17,15 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
+%if "%{fedora}" >= "7"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
+%define modular_xss 0%{?!_without_modular_xss:1}
 %define gss 0%{?!_without_gss:1}
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
@@ -29,11 +36,14 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 6%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# We ship a tarball with one questionable hack patched out.
+# The original URL is the following without %%patchext:
+# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.8.1-0.8.1.p.diff
@@ -42,11 +52,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
 %if %with_matrixview
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
+%if %modular_x
+BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -58,6 +68,7 @@
 BuildRequires: freealut-devel
 BuildRequires: autoconf
 BuildRequires: libtool
+BuildRequires: gawk
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -71,7 +82,12 @@
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %modular_xss
+Requires(post): xscreensaver-base >= 1:5.03-3
+Requires(postun): xscreensaver-base >= 1:5.03-3
+%else
+Requires: xscreensaver-base < 1:5.03-3
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -99,6 +115,11 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -175,7 +196,11 @@
         awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop"
         rm -f "${trycmd}.desktop.orig"
         popd >& /dev/null
-        # symlinks for XScreenSaver
+        # external hacks description and symlinks for XScreenSaver
+        cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+GL:     "${name}" \\
+        ${cmd} -r \\n\\
+EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
 }
@@ -188,6 +213,7 @@
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
 mkdir -p %{buildroot}%{xssbindir}
+mkdir -p %{buildroot}%{xssexthacksconfdir}
 %endif
 cat << EOF | generate_fix_desktop_files_links
 BioF??biof??This is an attempt to recreate some of the work of William Latham.
@@ -217,6 +243,16 @@
 %clean
 rm -rf %buildroot
 
+%post xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks
+fi
+
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks || :
+fi
+
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL README README.xscreensaver
@@ -226,6 +262,8 @@
 
 %files xscreensaver
 %defattr(-, root, root)
+# xscreensaver-base provides %{xssexthacksconfdir}
+%config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
 %{xssbindir}/*
@@ -245,6 +283,32 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
+- enable modular xscreensaver support for Fedora 7 and later (#200881)
+
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+  RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
+- license is GPLv2
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+  xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
+- Buildrequire gawk.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-8
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
+- build xscreensaver hack description files (#200881)
+- require %{_bindir}/kxsconfig (#219106)
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:35:41 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:35:41 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.15,1.16
Message-ID: <200709150835.l8F8Zfok012217@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12167

Modified Files:
	rss-glx.spec 
Log Message:
include %post/%postun scripts only with modular xscreensaver support



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rss-glx.spec	15 Sep 2007 08:25:08 -0000	1.15
+++ rss-glx.spec	15 Sep 2007 08:35:08 -0000	1.16
@@ -147,6 +147,11 @@
 %else
 - without matrixview hack
 %endif
+%if %modular_xss
+- with modular xscreensaver support
+%else
+- without modular xscreensaver support
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -243,6 +248,7 @@
 %clean
 rm -rf %buildroot
 
+%if %modular_xss
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks
@@ -252,6 +258,7 @@
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks || :
 fi
+%endif
 
 %files
 %defattr(-, root, root)
@@ -285,6 +292,7 @@
 %changelog
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
 - enable modular xscreensaver support for Fedora 7 and later (#200881)
+- include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,



From fedora-extras-commits at redhat.com  Sat Sep 15 08:36:07 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:36:07 -0400
Subject: rpms/rss-glx/F-7 rss-glx.spec,1.9,1.10
Message-ID: <200709150836.l8F8a7cn012294@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12199

Modified Files:
	rss-glx.spec 
Log Message:
include %post/%postun scripts only with modular xscreensaver support



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rss-glx.spec	15 Sep 2007 08:31:31 -0000	1.9
+++ rss-glx.spec	15 Sep 2007 08:35:35 -0000	1.10
@@ -147,6 +147,11 @@
 %else
 - without matrixview hack
 %endif
+%if %modular_xss
+- with modular xscreensaver support
+%else
+- without modular xscreensaver support
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -243,6 +248,7 @@
 %clean
 rm -rf %buildroot
 
+%if %modular_xss
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks
@@ -252,6 +258,7 @@
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks || :
 fi
+%endif
 
 %files
 %defattr(-, root, root)
@@ -285,6 +292,7 @@
 %changelog
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
 - enable modular xscreensaver support for Fedora 7 and later (#200881)
+- include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,



From fedora-extras-commits at redhat.com  Sat Sep 15 10:43:13 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:43:13 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.67, 1.68 sources, 1.71, 
	1.72 system-config-date.spec, 1.77, 1.78
Message-ID: <200709151043.l8FAhDR7026846@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26801

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
pick up updated translations
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	27 Aug 2007 14:37:20 -0000	1.67
+++ .cvsignore	15 Sep 2007 10:42:40 -0000	1.68
@@ -1 +1 @@
-system-config-date-1.9.7.tar.bz2
+system-config-date-1.9.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	27 Aug 2007 14:37:20 -0000	1.71
+++ sources	15 Sep 2007 10:42:40 -0000	1.72
@@ -1 +1 @@
-8e77157a0581f0387e417d33d4b0abbf  system-config-date-1.9.7.tar.bz2
+4d58698983ec95318faa6a5e9f1b75da  system-config-date-1.9.8.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- system-config-date.spec	27 Aug 2007 14:37:20 -0000	1.77
+++ system-config-date.spec	15 Sep 2007 10:42:40 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.7
+Version: 1.9.8
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPLv2+
@@ -100,6 +100,12 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.8
+- pick up updated translations
+
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
+- make use of force tagging (since mercurial 0.9.4)
+
 * Mon Aug 27 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.7
 - replace "timezone" by "time zone" where visible (#253428)
 - updated translations (#253829)



From fedora-extras-commits at redhat.com  Sat Sep 15 10:43:22 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:43:22 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47 system-config-samba.spec, 1.50, 1.51
Message-ID: <200709151043.l8FAhMEs026889@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	10 Sep 2007 07:36:56 -0000	1.45
+++ .cvsignore	15 Sep 2007 10:42:50 -0000	1.46
@@ -1 +1 @@
-system-config-samba-1.2.51.tar.bz2
+system-config-samba-1.2.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	10 Sep 2007 07:36:56 -0000	1.46
+++ sources	15 Sep 2007 10:42:50 -0000	1.47
@@ -1 +1 @@
-2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2
+f8f645cc3f41eb82df750d0d52023b43  system-config-samba-1.2.52.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-samba.spec	10 Sep 2007 07:36:56 -0000	1.50
+++ system-config-samba.spec	15 Sep 2007 10:42:50 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.51
+Version: 1.2.52
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52
+- pick up updated translations
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
 - update Polish, Serbian translations
 - $RPM_BUILD_ROOT -> %%{buildroot}



From fedora-extras-commits at redhat.com  Sat Sep 15 10:46:58 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 03:46:58 -0700
Subject: [pkgdb] rusers: steved has requested commit
Message-ID: <200709151046.l8FAkwU0013866@app3.fedora.phx.redhat.com>

Steve Dickson (steved) has requested the commit acl on rusers (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 10:47:12 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 03:47:12 -0700
Subject: [pkgdb] rusers: steved has requested commit
Message-ID: <200709151047.l8FAlCQa025097@app4.fedora.phx.redhat.com>

Steve Dickson (steved) has requested the commit acl on rusers (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sat Sep 15 10:49:00 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:49:00 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.53, 1.54 sources, 1.57,
	1.58 system-config-users.spec, 1.62, 1.63
Message-ID: <200709151049.l8FAn03C027052@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27013

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
pick up updated translations
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	18 Aug 2007 09:08:02 -0000	1.53
+++ .cvsignore	15 Sep 2007 10:48:27 -0000	1.54
@@ -1 +1 @@
-system-config-users-1.2.65.tar.bz2
+system-config-users-1.2.66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	18 Aug 2007 09:08:02 -0000	1.57
+++ sources	15 Sep 2007 10:48:27 -0000	1.58
@@ -1 +1 @@
-2da93ec6158cda312371c15697ae9588  system-config-users-1.2.65.tar.bz2
+04bfb7a789afbf244f0e379f7e982d1c  system-config-users-1.2.66.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- system-config-users.spec	18 Aug 2007 09:08:02 -0000	1.62
+++ system-config-users.spec	15 Sep 2007 10:48:27 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.65
+Version: 1.2.66
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,12 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.66
+- pick up updated translations
+
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
+- make use of force tagging (since mercurial 0.9.4)
+
 * Sat Aug 18 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.65
 - avoid more duplicate shortcuts (#253319)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 10:51:22 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Sep 2007 06:51:22 -0400
Subject: rpms/ogre/devel .cvsignore, 1.6, 1.7 ogre.spec, 1.13, 1.14 sources, 
	1.6, 1.7 ogre-1.2.5-ppc64.patch, 1.1, NONE
Message-ID: <200709151051.l8FApMDB027140@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118

Modified Files:
	.cvsignore ogre.spec sources 
Removed Files:
	ogre-1.2.5-ppc64.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.4-1
- New upstream release 1.4.4 (bz 291481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jul 2007 20:26:43 -0000	1.6
+++ .cvsignore	15 Sep 2007 10:50:49 -0000	1.7
@@ -1 +1 @@
-ogre-linux-osx-v1-4-2.tar.bz2
+ogre-linux_osx-v1-4-4.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ogre.spec	15 Aug 2007 08:37:54 -0000	1.13
+++ ogre.spec	15 Sep 2007 10:50:49 -0000	1.14
@@ -1,14 +1,13 @@
 Name:           ogre
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://downloads.sourceforge.net/ogre/ogre-linux-osx-v%(echo %{version} | tr . -).tar.bz2
+Source0:        http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.2.5-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -60,14 +59,16 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .ppc64
-# Don't try to build SSE optimised code on ppc64
-sed -i 's/\tpowerpc)$/\tpowerpc|powerpc64)/g' configure
+# building ogre while ogre-devel is installed results in binaries getting
+# linked against the installed version, instead of the just build one <sigh>
+if [ -f /usr/include/OGRE/Ogre.h ]; then
+  echo "Error building ogre while ogre-devel is installed does not work!"
+  exit 1
+fi
 # stop some CVS stuff from getting installed
-rm -r `find Docs Samples/Media -name CVS` 'Docs/manual/.#manual_16.html.1.47' \
-  Docs/manual/manual_16.html.rej
+rm -r `find Docs Samples/Media -name CVS`
 # fix line-endings of Docs
-sed -i 's/\r//g' Docs/manual/*.html
+sed -i 's/\r//g' Docs/ChangeLog.html Docs/manual/*.html
 # 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
@@ -80,6 +81,17 @@
   Samples/Media/gui/TaharezLook.looknfeel \
   Samples/Media/gui/Falagard.xsd \
   Samples/Media/materials/scripts/Example-DynTex.material
+# create a clean version of the api docs for %%doc
+mkdir api
+cp Docs/api/html/*.html Docs/api/html/*.gif Docs/api/html/*.png \
+  Docs/api/html/*.css api
+for i in api/OgreParticleEmitter_8h-source.html \
+         api/classOgre_1_1ParticleSystem.html \
+         api/classOgre_1_1DynLib.html \
+         api/classOgre_1_1ParticleEmitter.html; do
+  iconv -f ISO_8859-2 -t UTF8 $i > api/tmp
+  mv api/tmp $i
+done
 
 
 %build
@@ -144,7 +156,7 @@
 
 %files devel-doc
 %defattr(-,root,root,-)
-%doc LINUX.DEV Docs/api Docs/manual Docs/vbo-update Docs/style.css
+%doc LINUX.DEV api Docs/manual Docs/vbo-update Docs/style.css
 
 %files samples
 %defattr(-,root,root)
@@ -154,6 +166,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.4-1
+- New upstream release 1.4.4 (bz 291481)
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.2-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jul 2007 20:26:43 -0000	1.6
+++ sources	15 Sep 2007 10:50:49 -0000	1.7
@@ -1 +1 @@
-52eea0cf5fc659d9ca63491348e0e0ec  ogre-linux-osx-v1-4-2.tar.bz2
+456b75d21bc09d9cee937e3ccf9fbced  ogre-linux_osx-v1-4-4.tar.bz2


--- ogre-1.2.5-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 10:53:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Sep 2007 06:53:59 -0400
Subject: rpms/chess/devel chess.spec,1.10,1.11
Message-ID: <200709151053.l8FArxHU027302@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27279

Modified Files:
	chess.spec 
Log Message:
* Sat Sep 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-9
- Rebuild for new ogre



Index: chess.spec
===================================================================
RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- chess.spec	21 Aug 2007 20:48:23 -0000	1.10
+++ chess.spec	15 Sep 2007 10:53:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-9
+- Rebuild for new ogre
+
 * Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-8
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Sat Sep 15 11:46:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 15 Sep 2007 07:46:59 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.9,1.10
Message-ID: <200709151146.l8FBkx1Q001621@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1589

Modified Files:
	zabbix.spec 
Log Message:
* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Add a patch required for finding net-snmp libs on x86_64



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	11 Sep 2007 05:37:14 -0000	1.9
+++ zabbix.spec	15 Sep 2007 11:46:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-netsnmp-x86_64.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +78,9 @@
 
 %prep
 %setup -q
+%ifarch x86_64
+%patch0
+%endif
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Add a patch required for finding net-snmp libs on x86_64
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 - built without WWW monitoring support due old libcurl



From fedora-extras-commits at redhat.com  Sat Sep 15 11:47:44 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 15 Sep 2007 07:47:44 -0400
Subject: rpms/zabbix/EL-4 zabbix-1.4.2-netsnmp-x86_64.patch,NONE,1.1
Message-ID: <200709151147.l8FBliKJ001644@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Added Files:
	zabbix-1.4.2-netsnmp-x86_64.patch 
Log Message:
* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Add a patch required for finding net-snmp libs on x86_64


zabbix-1.4.2-netsnmp-x86_64.patch:

--- NEW FILE zabbix-1.4.2-netsnmp-x86_64.patch ---
--- configure.orig	2007-08-20 21:22:56.000000000 +0200
+++ configure	2007-09-15 13:29:13.000000000 +0200
@@ -10419,6 +10419,7 @@
 			;;
 			esac
 		done
+		SNMP_LDFLAGS="${SNMP_LDFLAGS} -lcrypto"
 
 		if test "x$enable_static" = "xyes"; then
 			for i in $_full_libnetsnmp_libs; do



From fedora-extras-commits at redhat.com  Sat Sep 15 14:48:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 15 Sep 2007 10:48:01 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.4,
	1.5 xscreensaver.spec, 1.48, 1.49
Message-ID: <200709151448.l8FEm1qk024354@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24296

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
  correctly.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- update-xscreensaver-hacks	15 Sep 2007 01:53:07 -0000	1.4
+++ update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
@@ -30,8 +30,8 @@
 			return 1
 		fi
 	done
-	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
-		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
+	if ! grep -q '\\n[\\]*$' $tmpconf_1 ; then
+		sed -i -e 's|\(^.*$\)|\1 \\n\\|' $tmpconf_1
 	fi
 	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
 	while [ -s $tmpconf_2 ] ; do
@@ -74,7 +74,7 @@
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`
 	if [ -n "$hackconf_fixed" ] ; then
-		cat $hackconf >> $tmpfile
+		cat $hackconf_fixed >> $tmpfile
 		rm -f $hackconf_fixed
 	fi
 done


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xscreensaver.spec	15 Sep 2007 01:53:07 -0000	1.48
+++ xscreensaver.spec	15 Sep 2007 14:47:28 -0000	1.49
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 %endif
 
 %define extrarel      %{nil}
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
+- Fix update script to treat the ending character of conf file
+  correctly.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 



From fedora-extras-commits at redhat.com  Sat Sep 15 14:48:30 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 15 Sep 2007 10:48:30 -0400
Subject: rpms/xscreensaver/F-7 update-xscreensaver-hacks, 1.1,
	1.2 xscreensaver.spec, 1.43, 1.44
Message-ID: <200709151448.l8FEmUZC024399@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24331

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
  correctly.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/update-xscreensaver-hacks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-xscreensaver-hacks	15 Sep 2007 02:08:00 -0000	1.1
+++ update-xscreensaver-hacks	15 Sep 2007 14:47:58 -0000	1.2
@@ -30,8 +30,8 @@
 			return 1
 		fi
 	done
-	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
-		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
+	if ! grep -q '\\n[\\]*$' $tmpconf_1 ; then
+		sed -i -e 's|\(^.*$\)|\1 \\n\\|' $tmpconf_1
 	fi
 	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
 	while [ -s $tmpconf_2 ] ; do
@@ -74,7 +74,7 @@
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`
 	if [ -n "$hackconf_fixed" ] ; then
-		cat $hackconf >> $tmpfile
+		cat $hackconf_fixed >> $tmpfile
 		rm -f $hackconf_fixed
 	fi
 done


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xscreensaver.spec	15 Sep 2007 02:08:00 -0000	1.43
+++ xscreensaver.spec	15 Sep 2007 14:47:58 -0000	1.44
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 %endif
 
 %define extrarel      %{nil}
@@ -28,7 +28,7 @@
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{version}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
+- Fix update script to treat the ending character of conf file
+  correctly.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 



From fedora-extras-commits at redhat.com  Sat Sep 15 15:40:25 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:40:25 -0400
Subject: rpms/rpcbind/F-7 rpcbind-0.1.4-libwrap.patch, NONE, 1.1 rpcbind.spec,
	1.17, 1.18
Message-ID: <200709151540.l8FFePFi031855@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31448

Modified Files:
	rpcbind.spec 
Added Files:
	rpcbind-0.1.4-libwrap.patch 
Log Message:
- Added autoconf rules to turn on secure host checking 
  via libwrap. Also turned on host check by default (bz 248284)


rpcbind-0.1.4-libwrap.patch:

--- NEW FILE rpcbind-0.1.4-libwrap.patch ---
commit 29827c82fbb78725478eaf53b140e14a77fad42f
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Sep 15 11:32:57 2007 -0400

    Added autoconf rules to turn on secure host checking via libwrap.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/configure.in b/configure.in
index dfe5907..2bdf830 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,14 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
 
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([tirpc], [clnt_create])
+AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking], 
+	[case "${enableval}" in
+		yes) libwarp=true 
+			AC_CHECK_LIB([wrap],  [hosts_access]) ;;
+		no)  libwarp=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
+	esac],[libwarp=false])
+AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
 
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT()
diff --git a/src/Makefile.am b/src/Makefile.am
index fd80847..d66b43f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,10 @@ if WARMSTART
 INCLUDES +=	-DWARMSTART
 endif
 
+if LIBWRAP
+INCLUDES +=	-DLIBWRAP
+endif
+
 
 bin_PROGRAMS = rpcbind rpcinfo
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpcbind.spec	14 Sep 2007 19:20:43 -0000	1.17
+++ rpcbind.spec	15 Sep 2007 15:39:53 -0000	1.18
@@ -28,6 +28,7 @@
 Patch3: rpcbind-0.1.4-warmstarts.patch
 Patch4: rpcbind-0.1.4-rpcuser.patch
 Patch5: rpcbind-0.1.4-iff_up.patch
+Patch6: rpcbind-0.1.4-libwrap.patch
 
 %description
 The rpcbind utility is a server that converts RPC program numbers into
@@ -43,6 +44,8 @@
 %patch4 -p1
 # 240873: rpcbind segfaults on startup - ipv6 related
 %patch5 -p1
+# 248284: rpcbind ignores libwrap files
+%patch6 -p1
 
 %build
 %ifarch s390 s390x
@@ -61,6 +64,7 @@
     --enable-warmstarts \
     --with-statedir="$RPCBDIR" \
     --with-rpcuser="$RPCBUSR" \
+    --enable-libwrap \
     --enable-debug
 
 make all
@@ -121,7 +125,11 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-2
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-9
+- Added autoconf rules to turn on secure host checking
+  via libwrap. Also turned on host check by default (bz 248284)
+
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:48:27 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:48:27 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.18,1.19
Message-ID: <200709151548.l8FFmRd0000654@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv552

Modified Files:
	rpcbind.spec 
Log Message:
Fixed typo in spec file.



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpcbind.spec	15 Sep 2007 15:39:53 -0000	1.18
+++ rpcbind.spec	15 Sep 2007 15:47:55 -0000	1.19
@@ -125,11 +125,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-9
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
-
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:53:08 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:53:08 -0400
Subject: rpms/rpcbind/devel rpcbind-0.1.4-libwrap.patch, NONE,
	1.1 rpcbind.spec, 1.16, 1.17
Message-ID: <200709151553.l8FFr8p1001558@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1435

Modified Files:
	rpcbind.spec 
Added Files:
	rpcbind-0.1.4-libwrap.patch 
Log Message:
Added autoconf rules to turn on secure host checking
via libwrap. Also turned on host check by default (bz 248284)


rpcbind-0.1.4-libwrap.patch:

--- NEW FILE rpcbind-0.1.4-libwrap.patch ---
commit 29827c82fbb78725478eaf53b140e14a77fad42f
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Sep 15 11:32:57 2007 -0400

    Added autoconf rules to turn on secure host checking via libwrap.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/configure.in b/configure.in
index dfe5907..2bdf830 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,14 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
 
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([tirpc], [clnt_create])
+AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking], 
+	[case "${enableval}" in
+		yes) libwarp=true 
+			AC_CHECK_LIB([wrap],  [hosts_access]) ;;
+		no)  libwarp=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
+	esac],[libwarp=false])
+AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
 
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT()
diff --git a/src/Makefile.am b/src/Makefile.am
index fd80847..d66b43f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,10 @@ if WARMSTART
 INCLUDES +=	-DWARMSTART
 endif
 
+if LIBWRAP
+INCLUDES +=	-DLIBWRAP
+endif
+
 
 bin_PROGRAMS = rpcbind rpcinfo
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpcbind.spec	14 Sep 2007 19:22:31 -0000	1.16
+++ rpcbind.spec	15 Sep 2007 15:52:37 -0000	1.17
@@ -28,6 +28,7 @@
 Patch3: rpcbind-0.1.4-warmstarts.patch
 Patch4: rpcbind-0.1.4-rpcuser.patch
 Patch5: rpcbind-0.1.4-iff_up.patch
+Patch6: rpcbind-0.1.4-libwrap.patch
 
 %description
 The rpcbind utility is a server that converts RPC program numbers into
@@ -43,6 +44,8 @@
 %patch4 -p1
 # 240873: rpcbind segfaults on startup - ipv6 related
 %patch5 -p1
+# 248284: rpcbind ignores libwrap files
+%patch6 -p1
 
 %build
 %ifarch s390 s390x
@@ -61,6 +64,7 @@
     --enable-warmstarts \
     --with-statedir="$RPCBDIR" \
     --with-rpcuser="$RPCBUSR" \
+    --enable-libwrap \
     --enable-debug
 
 make all
@@ -121,7 +125,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Added autoconf rules to turn on secure host checking
+  via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:58:44 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:58:44 -0400
Subject: rpms/rpcbind/F-7 rpcbind.init,1.5,1.6 rpcbind.spec,1.19,1.20
Message-ID: <200709151558.l8FFwiAb002476@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2335

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Fixed typo in init script (bz 248285)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpcbind.init	14 Sep 2007 19:20:43 -0000	1.5
+++ rpcbind.init	15 Sep 2007 15:58:12 -0000	1.6
@@ -9,7 +9,7 @@
 #
 # processname: rpcbind
 # probe: true
-# config: /etc/sysconfig/nfs
+# config: /etc/sysconfig/rpcbind
 
 
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpcbind.spec	15 Sep 2007 15:47:55 -0000	1.19
+++ rpcbind.spec	15 Sep 2007 15:58:13 -0000	1.20
@@ -126,6 +126,7 @@
 
 %changelog
 * Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Fixed typo in init script (bz 248285)
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)



From fedora-extras-commits at redhat.com  Sat Sep 15 15:58:54 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:58:54 -0400
Subject: rpms/rpcbind/devel rpcbind.init,1.5,1.6 rpcbind.spec,1.17,1.18
Message-ID: <200709151558.l8FFwsNc002510@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Fixed typo in init script (bz 248285)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpcbind.init	14 Sep 2007 19:22:31 -0000	1.5
+++ rpcbind.init	15 Sep 2007 15:58:21 -0000	1.6
@@ -9,7 +9,7 @@
 #
 # processname: rpcbind
 # probe: true
-# config: /etc/sysconfig/nfs
+# config: /etc/sysconfig/rpcbind
 
 
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpcbind.spec	15 Sep 2007 15:52:37 -0000	1.17
+++ rpcbind.spec	15 Sep 2007 15:58:21 -0000	1.18
@@ -126,6 +126,7 @@
 
 %changelog
 * Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Fixed typo in init script (bz 248285)
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)



From fedora-extras-commits at redhat.com  Sat Sep 15 16:02:02 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 15 Sep 2007 12:02:02 -0400
Subject: rpms/mod_fcgid/devel .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200709151602.l8FG22BO009071@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8921

Modified Files:
	.cvsignore mod_fcgid.spec sources 
Log Message:
Update to version 2.2
Make sure docs are encoded as UTF-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 14:20:03 -0000	1.4
+++ .cvsignore	15 Sep 2007 16:01:29 -0000	1.5
@@ -1 +1 @@
-mod_fcgid.2.1.tar.gz
+mod_fcgid.2.2.tar.gz


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_fcgid.spec	3 Sep 2007 08:30:33 -0000	1.7
+++ mod_fcgid.spec	15 Sep 2007 16:01:29 -0000	1.8
@@ -10,8 +10,8 @@
 %endif
 
 Name:		mod_fcgid
-Version:	2.1
-Release:	6%{?dist}
+Version:	2.2
+Release:	1%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -75,6 +75,8 @@
 %{__cp} -p %{SOURCE7} README.SELinux
 %patch0 -p1
 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm
+/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
+%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
@@ -155,6 +157,10 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Paul Howarth <paul at city-fan.org> 2.2-1
+- Update to version 2.2
+- Make sure docs are encoded as UTF-8
+
 * Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
 - rebuild for fixed 32-bit APR (#254241)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2007 09:32:38 -0000	1.5
+++ sources	15 Sep 2007 16:01:29 -0000	1.6
@@ -1 +1 @@
-0bc036276e378463c80617ff57e853dc  mod_fcgid.2.1.tar.gz
+ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 16:05:58 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 15 Sep 2007 12:05:58 -0400
Subject: rpms/mod_fcgid/F-7 .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709151605.l8FG5wWa009346@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314

Modified Files:
	.cvsignore mod_fcgid.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 14:20:03 -0000	1.4
+++ .cvsignore	15 Sep 2007 16:05:24 -0000	1.5
@@ -1 +1 @@
-mod_fcgid.2.1.tar.gz
+mod_fcgid.2.2.tar.gz


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/mod_fcgid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_fcgid.spec	15 Jun 2007 17:14:10 -0000	1.5
+++ mod_fcgid.spec	15 Sep 2007 16:05:24 -0000	1.6
@@ -9,26 +9,26 @@
 %define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
 %endif
 
-Name:           mod_fcgid
-Version:        2.1
-Release:        3%{?dist}
-Summary:        Apache2 module for high-performance server-side scripting 
-Group:          System Environment/Daemons
-License:        GPL
-URL:            http://fastcgi.coremail.cn/
-Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
-Source1:        fcgid.conf
-Source2:        fastcgi.te
-Source3:        fastcgi.fc
-Source4:        mod_fcgid-2.1-README.RPM
-Source5:        http://fastcgi.coremail.cn/doc.htm
-Source6:        http://fastcgi.coremail.cn/configuration.htm
-Source7:        mod_fcgid-2.1-README.SELinux
-Source8:        fastcgi-2.5.te
-Patch0:         mod_fcgid.2.1-docurls.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  httpd-devel >= 2.0
-Requires:       httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
+Name:		mod_fcgid
+Version:	2.2
+Release:	1%{?dist}
+Summary:	Apache2 module for high-performance server-side scripting 
+Group:		System Environment/Daemons
+License:	GPL+
+URL:		http://fastcgi.coremail.cn/
+Source0:	http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
+Source1:	fcgid.conf
+Source2:	fastcgi.te
+Source3:	fastcgi.fc
+Source4:	mod_fcgid-2.1-README.RPM
+Source5:	http://fastcgi.coremail.cn/doc.htm
+Source6:	http://fastcgi.coremail.cn/configuration.htm
+Source7:	mod_fcgid-2.1-README.SELinux
+Source8:	fastcgi-2.5.te
+Patch0:		mod_fcgid.2.1-docurls.patch
+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)
 
 %description
 mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@@ -40,9 +40,9 @@
 %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 }')
 %package selinux
-Summary:          SELinux policy module supporting FastCGI applications with mod_fcgid
-Group:            System Environment/Base
-BuildRequires:    %{selinux_buildreqs}
+Summary:	  SELinux policy module supporting FastCGI applications with mod_fcgid
+Group:		  System Environment/Base
+BuildRequires:	  %{selinux_buildreqs}
 # selinux-policy is required for directory ownership of %{_datadir}/selinux/*
 # Modules built against one version of a policy may not work with older policy
 # versions, as noted on fedora-selinux-list:
@@ -50,10 +50,10 @@
 # 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}
+Requires:	  selinux-policy >= %{selinux_policyver}
 %endif
-Requires:         %{name} = %{version}-%{release}
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon
+Requires:	  %{name} = %{version}-%{release}
+Requires(post):	  /usr/sbin/semodule, /sbin/restorecon
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon
 
 %description selinux
@@ -75,6 +75,8 @@
 %{__cp} -p %{SOURCE7} README.SELinux
 %patch0 -p1
 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm
+/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
+%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
@@ -82,9 +84,9 @@
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-  %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-  %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
-  %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+	%{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
+	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
 done
 %endif
 
@@ -92,10 +94,10 @@
 %{__rm} -rf %{buildroot}
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
 %{__make} \
-  top_dir=${topdir} \
-  DESTDIR=%{buildroot} \
-  MKINSTALLDIRS="%{__mkdir_p}" \
-  install
+	top_dir=${topdir} \
+	DESTDIR=%{buildroot} \
+	MKINSTALLDIRS="%{__mkdir_p}" \
+	install
 %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
 %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
 
@@ -103,9 +105,9 @@
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-  %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-  %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
-    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
+	%{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+	%{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
+		%{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
 done
 # Hardlink identical policy module packages together
 /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
@@ -119,8 +121,8 @@
 # Install SELinux policy modules
 for selinuxvariant in %{selinux_variants}
 do
-  /usr/sbin/semodule -s ${selinuxvariant} -i \
-    %{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
+	/usr/sbin/semodule -s ${selinuxvariant} -i \
+		%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
 done
 # Fix up non-standard directory context
 /sbin/restorecon %{_localstatedir}/run/mod_fcgid || :
@@ -128,15 +130,15 @@
 %postun selinux
 # Clean up after package removal
 if [ $1 -eq 0 ]; then
-  # Remove SELinux policy modules
-  for selinuxvariant in %{selinux_variants}
-  do
-    /usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
-  done
-  # Clean up any remaining file contexts (shouldn't be any really)
-  [ -d %{_localstatedir}/run/mod_fcgid ] && \
-    /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
+	# Remove SELinux policy modules
+	for selinuxvariant in %{selinux_variants}; do
+		/usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
+	done
+	# Clean up any remaining file contexts (shouldn't be any really)
+	[ -d %{_localstatedir}/run/mod_fcgid ] && \
+		/sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
 fi
+exit 0
 %endif
 
 %files
@@ -155,6 +157,26 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Paul Howarth <paul at city-fan.org> 2.2-1
+- Update to version 2.2
+- Make sure docs are encoded as UTF-8
+
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
+- rebuild for fixed 32-bit APR (#254241)
+
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 2.1-5
+- Update source URL to point to downloads.sf.net rather than dl.sf.net
+- Upstream released new tarball without changing version number, though the
+  only change was in arch/win32/fcgid_pm_win.c, which is not used to build the
+  RPM package
+- Clarify license as GPL (unspecified/any version)
+- Unexpand tabs in spec
+- Add buildreq of gawk
+
+* Fri Aug  3 2007 Paul Howarth <paul at city-fan.org> 2.1-4
+- Add buildreq of pkgconfig, a missing dependency of both apr-devel and
+  apr-util-devel on FC5
+
 * Fri Jun 15 2007 Paul Howarth <paul at city-fan.org> 2.1-3
 - Major update of SELinux policy, supporting accessing data on NFS/CIFS shares
   and a new boolean, httpd_fastcgi_can_sendmail, to allow connections to SMTP
@@ -208,9 +230,9 @@
 * Tue Jul  4 2006 Paul Howarth <paul at city-fan.org> 1.09-10
 - SELinux policy update:
   * allow httpd to read httpd_fastcgi_content_t without having the
-    httpd_builtin_scripting boolean set
+  | httpd_builtin_scripting boolean set
   * allow httpd_fastcgi_script_t to read /etc/resolv.conf without
-    having the httpd_can_network_connect boolean set
+  | having the httpd_can_network_connect boolean set
 
 * Sun Jun 18 2006 Paul Howarth <paul at city-fan.org> 1.09-9
 - Discard output of semodule in %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Feb 2007 14:20:03 -0000	1.4
+++ sources	15 Sep 2007 16:05:24 -0000	1.5
@@ -1 +1 @@
-68a6479e398a20577334f16a8b06c418  mod_fcgid.2.1.tar.gz
+ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 16:07:35 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Sat, 15 Sep 2007 12:07:35 -0400
Subject: rpms/pv/devel .cvsignore,1.3,1.4 pv.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200709151607.l8FG7Z91009487@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9419

Modified Files:
	.cvsignore pv.spec sources 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
- Bump to the latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2007 13:13:55 -0000	1.3
+++ .cvsignore	15 Sep 2007 16:07:02 -0000	1.4
@@ -1 +1 @@
-pv-1.0.1.tar.gz
+pv-1.1.0.tar.gz


Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/pv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pv.spec	13 Aug 2007 12:32:41 -0000	1.2
+++ pv.spec	15 Sep 2007 16:07:02 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: Artistic (modified)
 Group: Development/Tools
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
+- Bump to the latest upstream
+
 * Mon Aug 13 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.0.1-1
 - Bump to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2007 13:13:55 -0000	1.3
+++ sources	15 Sep 2007 16:07:02 -0000	1.4
@@ -1 +1 @@
-f4ca9b3e3f476b8934fc70a97e637361  pv-1.0.1.tar.gz
+1b76116d4cc70b0f12553a94d834d9bb  pv-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 17:28:30 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:28:30 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.20,1.21
Message-ID: <200709151728.l8FHSUZD017133@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17079

Modified Files:
	rpcbind.spec 
Log Message:
Added a couple missing Requires(pre) (bz 247134)



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpcbind.spec	15 Sep 2007 15:58:13 -0000	1.20
+++ rpcbind.spec	15 Sep 2007 17:27:56 -0000	1.21
@@ -17,6 +17,8 @@
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
 BuildRequires: libtirpc-devel quota
+Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel 
+Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel 
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 
@@ -130,6 +132,7 @@
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
+- Added a couple missing Requires(pre) (bz 247134)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)



From fedora-extras-commits at redhat.com  Sat Sep 15 17:28:52 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:28:52 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.18,1.19
Message-ID: <200709151728.l8FHSqE7017136@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17111

Modified Files:
	rpcbind.spec 
Log Message:
Added a couple missing Requires(pre) (bz 247134)



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpcbind.spec	15 Sep 2007 15:58:21 -0000	1.18
+++ rpcbind.spec	15 Sep 2007 17:28:20 -0000	1.19
@@ -17,6 +17,8 @@
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
 BuildRequires: libtirpc-devel quota
+Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
+Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 
@@ -130,6 +132,7 @@
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
+- Added a couple missing Requires(pre) (bz 247134)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)



From fedora-extras-commits at redhat.com  Sat Sep 15 17:37:26 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:37:26 -0400
Subject: rpms/ypserv/devel ypserv-yppasswdd.init, 1.4, 1.5 ypserv-ypserv.init,
	1.6, 1.7 ypserv-ypxfrd.init, 1.3, 1.4 ypserv.spec, 1.36, 1.37
Message-ID: <200709151737.l8FHbQaT017345@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypserv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17240

Modified Files:
	ypserv-yppasswdd.init ypserv-ypserv.init ypserv-ypxfrd.init 
	ypserv.spec 
Log Message:
Fixed init scripts to return correct exit code on
'service status' (bz 248097)



Index: ypserv-yppasswdd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-yppasswdd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ypserv-yppasswdd.init	9 Sep 2004 15:15:29 -0000	1.4
+++ ypserv-yppasswdd.init	15 Sep 2007 17:36:54 -0000	1.5
@@ -64,6 +64,7 @@
 	;;
   status)
 	status rpc.yppasswdd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypserv.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-ypserv.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ypserv-ypserv.init	9 Sep 2004 15:15:29 -0000	1.6
+++ ypserv-ypserv.init	15 Sep 2007 17:36:54 -0000	1.7
@@ -59,6 +59,7 @@
 	;;
   status)
 	status ypserv
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypxfrd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-ypxfrd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-ypxfrd.init	25 Jul 2006 20:28:41 -0000	1.3
+++ ypserv-ypxfrd.init	15 Sep 2007 17:36:54 -0000	1.4
@@ -46,6 +46,7 @@
 	;;
   status)
 	status rpc.ypxfrd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ypserv.spec	31 Jul 2007 13:14:11 -0000	1.36
+++ ypserv.spec	15 Sep 2007 17:36:54 -0000	1.37
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,10 @@
 %{_includedir}/*/*
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 2.19-6
+- Fixed init scripts to return correct exit code on
+ 'service status' (bz 248097)
+
 * Tue Jul 31 2007 Steve Dickson <steved at redhat.com> 2.19-5
 - Changed install process to create an useful debuginfo package (bz 249961)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 17:37:44 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:37:44 -0400
Subject: rpms/ypserv/F-7 ypserv-yppasswdd.init, 1.4, 1.5 ypserv-ypserv.init, 
	1.6, 1.7 ypserv-ypxfrd.init, 1.3, 1.4 ypserv.spec, 1.36, 1.37
Message-ID: <200709151737.l8FHbiMY017358@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypserv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	ypserv-yppasswdd.init ypserv-ypserv.init ypserv-ypxfrd.init 
	ypserv.spec 
Log Message:
Fixed init scripts to return correct exit code on
'service status' (bz 248097)



Index: ypserv-yppasswdd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-yppasswdd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ypserv-yppasswdd.init	9 Sep 2004 15:15:29 -0000	1.4
+++ ypserv-yppasswdd.init	15 Sep 2007 17:37:13 -0000	1.5
@@ -64,6 +64,7 @@
 	;;
   status)
 	status rpc.yppasswdd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypserv.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-ypserv.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ypserv-ypserv.init	9 Sep 2004 15:15:29 -0000	1.6
+++ ypserv-ypserv.init	15 Sep 2007 17:37:13 -0000	1.7
@@ -59,6 +59,7 @@
 	;;
   status)
 	status ypserv
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypxfrd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-ypxfrd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-ypxfrd.init	25 Jul 2006 20:28:41 -0000	1.3
+++ ypserv-ypxfrd.init	15 Sep 2007 17:37:13 -0000	1.4
@@ -46,6 +46,7 @@
 	;;
   status)
 	status rpc.ypxfrd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ypserv.spec	31 Jul 2007 13:20:37 -0000	1.36
+++ ypserv.spec	15 Sep 2007 17:37:13 -0000	1.37
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,10 @@
 %{_includedir}/*/*
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 2.19-6
+- Fixed init scripts to return correct exit code on
+ 'service status' (bz 248097)
+
 * Tue Jul 31 2007 Steve Dickson <steved at redhat.com> 2.19-5
 - Changed install process to create an useful debuginfo package (bz 249961)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 18:16:35 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Sat, 15 Sep 2007 14:16:35 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.2,
	1.3 eclipse-egit-add-feature.patch, 1.1, 1.2 eclipse-egit.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709151816.l8FIGZBT024275@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24245

Modified Files:
	.cvsignore eclipse-egit-add-feature.patch eclipse-egit.spec 
	sources 
Log Message:
* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
- Update to git20070911.
- Update feature and accosicated branding plugin.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2007 02:30:53 -0000	1.2
+++ .cvsignore	15 Sep 2007 18:16:03 -0000	1.3
@@ -1 +1,2 @@
-egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+egit.png
+egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz

eclipse-egit-add-feature.patch:

Index: eclipse-egit-add-feature.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit-add-feature.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit-add-feature.patch	15 Sep 2007 02:30:53 -0000	1.1
+++ eclipse-egit-add-feature.patch	15 Sep 2007 18:16:03 -0000	1.2
@@ -1,31 +1,60 @@
-diff -ruN egit.orig/org.spearce.egit/build.properties egit/org.spearce.egit/build.properties
---- egit.orig/org.spearce.egit/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/build.properties	2007-08-30 12:33:14.000000000 -0400
+diff --git a/org.spearce.egit-feature/.project b/org.spearce.egit-feature/.project
+new file mode 100644
+index 0000000..dac8f65
+--- /dev/null
++++ egit/org.spearce.egit-feature/.project
+@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<projectDescription>
++	<name>org.spearce.egit-feature</name>
++	<comment></comment>
++	<projects>
++	</projects>
++	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.pde.FeatureBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++	</buildSpec>
++	<natures>
++		<nature>org.eclipse.pde.FeatureNature</nature>
++	</natures>
++</projectDescription>
+diff --git a/org.spearce.egit-feature/build.properties b/org.spearce.egit-feature/build.properties
+new file mode 100644
+index 0000000..64f93a9
+--- /dev/null
++++ egit/org.spearce.egit-feature/build.properties
 @@ -0,0 +1 @@
 +bin.includes = feature.xml
-diff -ruN egit.orig/org.spearce.egit/feature.xml egit/org.spearce.egit/feature.xml
---- egit.orig/org.spearce.egit/feature.xml	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/feature.xml	2007-08-30 12:33:14.000000000 -0400
-@@ -0,0 +1,42 @@
+diff --git a/org.spearce.egit-feature/feature.xml b/org.spearce.egit-feature/feature.xml
+new file mode 100644
+index 0000000..01c53cd
+--- /dev/null
++++ egit/org.spearce.egit-feature/feature.xml
+@@ -0,0 +1,44 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<feature
 +      id="org.spearce.egit"
 +      label="Eclipse Git Feature"
 +      version="0.2.2"
-+      provider-name="spearce.org">
++      provider-name="spearce.org"
++      plugin="org.spearce.egit">
 +
-+   <description>
-+      The Eclipse Git plugin allows developers to interact with Git
-+      repositories from within Eclipse.
-+   </description>
-+
-+   <copyright url="http://www.example.com/copyright">
-+      [Enter Copyright Description here.]
-+   </copyright>
-+
-+   <license url="http://www.example.com/license">
-+      GPLv2 EPL
-+   </license>
++   <requires>
++      <import plugin="org.eclipse.core.runtime"/>
++      <import plugin="org.eclipse.team.core"/>
++      <import plugin="org.eclipse.core.resources"/>
++      <import plugin="org.eclipse.core.filesystem"/>
++      <import plugin="org.eclipse.ui"/>
++      <import plugin="org.eclipse.team.ui"/>
++      <import plugin="org.eclipse.jface.text"/>
++      <import plugin="org.eclipse.ui.ide"/>
++      <import plugin="org.eclipse.ui.workbench.texteditor"/>
++      <import plugin="org.eclipse.compare"/>
++      <import plugin="org.junit"/>
++   </requires>
 +
 +   <plugin
 +         id="org.spearce.egit.core"
@@ -49,10 +78,24 @@
 +         unpack="false"/>
 +
 +</feature>
-diff -ruN egit.orig/org.spearce.egit/.project egit/org.spearce.egit/.project
---- egit.orig/org.spearce.egit/.project	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/.project	2007-08-30 12:33:14.000000000 -0400
-@@ -0,0 +1,17 @@
+diff --git a/org.spearce.egit/.classpath b/org.spearce.egit/.classpath
+new file mode 100644
+index 0000000..acad1c2
+--- /dev/null
++++ egit/org.spearce.egit/.classpath
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<classpath>
++	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
++	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
++	<classpathentry kind="output" path="bin"/>
++</classpath>
+diff --git a/org.spearce.egit/.project b/org.spearce.egit/.project
+new file mode 100644
+index 0000000..bbdc4e3
+--- /dev/null
++++ egit/org.spearce.egit/.project
+@@ -0,0 +1,28 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<projectDescription>
 +	<name>org.spearce.egit</name>
@@ -61,12 +104,81 @@
 +	</projects>
 +	<buildSpec>
 +		<buildCommand>
-+			<name>org.eclipse.pde.FeatureBuilder</name>
++			<name>org.eclipse.jdt.core.javabuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.eclipse.pde.ManifestBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.eclipse.pde.SchemaBuilder</name>
 +			<arguments>
 +			</arguments>
 +		</buildCommand>
 +	</buildSpec>
 +	<natures>
-+		<nature>org.eclipse.pde.FeatureNature</nature>
++		<nature>org.eclipse.pde.PluginNature</nature>
++		<nature>org.eclipse.jdt.core.javanature</nature>
 +	</natures>
 +</projectDescription>
+diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.spearce.egit/META-INF/MANIFEST.MF
+new file mode 100644
+index 0000000..40da4e0
+--- /dev/null
++++ egit/org.spearce.egit/META-INF/MANIFEST.MF
+@@ -0,0 +1,7 @@
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Java Git / Eclipse Git
++Bundle-SymbolicName: org.spearce.egit
++Bundle-Version: 0.2.2
++Bundle-Vendor: spearce.org
++Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff --git a/org.spearce.egit/about.ini b/org.spearce.egit/about.ini
+new file mode 100644
+index 0000000..dcab31a
+--- /dev/null
++++ egit/org.spearce.egit/about.ini
+@@ -0,0 +1,28 @@
++# about.ini
++# contains information about a feature
++# java.io.Properties file (ISO 8859-1 with "\" escapes)
++# "%key" are externalized strings defined in about.properties
++# This file does not need to be translated.
++
++# Property "aboutText" contains blurb for "About" dialog (translated)
++aboutText=Java Git / Eclipse Git (by Shawn Pearce) is a Java Git library and plugin for the Eclipse IDE.
++
++# Property "windowImage" contains path to window icon (16x16)
++# needed for primary features only
++
++# Property "featureImage" contains path to feature image (32x32)
++featureImage=egit.png
++
++# Property "aboutImage" contains path to product image (500x330 or 115x164)
++# needed for primary features only
++
++# Property "appName" contains name of the application (not translated)
++# needed for primary features only
++
++# Property "welcomePerspective" contains the id of the perspective in which the
++# welcome page is to be opened.
++# optional
++
++# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
++# optional
++# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
+\ No newline at end of file
+diff --git a/org.spearce.egit/build.properties b/org.spearce.egit/build.properties
+new file mode 100644
+index 0000000..34d2e4d
+--- /dev/null
++++ egit/org.spearce.egit/build.properties
+@@ -0,0 +1,4 @@
++source.. = src/
++output.. = bin/
++bin.includes = META-INF/,\
++               .


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit.spec	15 Sep 2007 02:30:53 -0000	1.1
+++ eclipse-egit.spec	15 Sep 2007 18:16:03 -0000	1.2
@@ -4,13 +4,14 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          0.git20070826%{?dist}
+Release:          0.git20070911%{?dist}
 License:          EPL GPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=522c3046b3b7e4af1a13ca17912e0bfe8b0983e4;sf=tgz
-Source0:          egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
+Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+Source1:          egit.png
 Patch0:           %{name}-add-feature.patch
 
 Requires:         eclipse-platform > 1:3.3.0
@@ -39,6 +40,7 @@
 %prep
 %setup -q -c 
 %patch0 -p0
+cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -95,5 +97,9 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
+- Update to git20070911.
+- Update feature and accosicated branding plugin.
+
 * Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
 - Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2007 02:30:53 -0000	1.2
+++ sources	15 Sep 2007 18:16:03 -0000	1.3
@@ -1 +1,2 @@
-fbbbb7b7366d5a9f397f521837fe3e19  egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+5d1082d9db40f01c5de094ac8769514b  egit.png
+d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 18:58:59 2007
From: fedora-extras-commits at redhat.com (Mads Villadsen (maxx))
Date: Sat, 15 Sep 2007 14:58:59 -0400
Subject: rpms/pdfcube/devel pdfcube.spec,1.2,1.3
Message-ID: <200709151858.l8FIwxXp025109@cvs-int.fedora.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/pdfcube/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071

Modified Files:
	pdfcube.spec 
Log Message:
Rebuild because of new poppler library


Index: pdfcube.spec
===================================================================
RCS file: /cvs/extras/rpms/pdfcube/devel/pdfcube.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdfcube.spec	5 Aug 2007 18:35:27 -0000	1.2
+++ pdfcube.spec	15 Sep 2007 18:58:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pdfcube
 Version:        0.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PDF presentation viewer with a spinning cube
 
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-5
+- Rebuild because of new poppler library
+
 * Thu Aug 2 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-4
 - Updated License field per new Licensing Guidelines
 



From fedora-extras-commits at redhat.com  Sat Sep 15 19:02:08 2007
From: fedora-extras-commits at redhat.com (Mads Villadsen (maxx))
Date: Sat, 15 Sep 2007 15:02:08 -0400
Subject: rpms/pdfcube/devel pdfcube.spec,1.3,1.4
Message-ID: <200709151902.l8FJ28sk031137@cvs-int.fedora.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/pdfcube/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31103

Modified Files:
	pdfcube.spec 
Log Message:
Messed up tagging - trying again


Index: pdfcube.spec
===================================================================
RCS file: /cvs/extras/rpms/pdfcube/devel/pdfcube.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdfcube.spec	15 Sep 2007 18:58:27 -0000	1.3
+++ pdfcube.spec	15 Sep 2007 19:01:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pdfcube
 Version:        0.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PDF presentation viewer with a spinning cube
 
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-6
+- Messed up tagging - trying again.
+
 * Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-5
 - Rebuild because of new poppler library
 



From fedora-extras-commits at redhat.com  Sat Sep 15 19:40:12 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Sat, 15 Sep 2007 15:40:12 -0400
Subject: rpms/librtas/devel librtas-1.3.2-mode.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 librtas.spec, 1.11, 1.12 sources, 1.5,
	1.6 librtas-1.2.4-no_syscall1.patch, 1.1, NONE
Message-ID: <200709151940.l8FJeCH7032078@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/librtas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	.cvsignore librtas.spec sources 
Added Files:
	librtas-1.3.2-mode.patch 
Removed Files:
	librtas-1.2.4-no_syscall1.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 1.3.2-1
- Upgraded to librtas-1.3.2
- Cleaned up spec file to conform to Fedora packaging guidelines


librtas-1.3.2-mode.patch:

--- NEW FILE librtas-1.3.2-mode.patch ---
diff -up librtas-1.3.2/librtas_src/syscall_rmo.c.mode librtas-1.3.2/librtas_src/syscall_rmo.c
--- librtas-1.3.2/librtas_src/syscall_rmo.c.mode	2007-08-06 12:02:34.000000000 -0400
+++ librtas-1.3.2/librtas_src/syscall_rmo.c	2007-09-05 17:03:10.000000000 -0400
@@ -117,7 +117,7 @@ static int acquire_file_lock(off_t start
 
 	/* Lazily open lock file */
 	if (wa_config.lockfile_fd < 0) {
-		wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR);
+		wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR, 0600);
 		if (wa_config.lockfile_fd < 0) {
 			dbg1("could not open lockfile %s\n", lockfile_path);
 			return RTAS_IO_ASSERT;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2007 02:53:39 -0000	1.4
+++ .cvsignore	15 Sep 2007 19:39:40 -0000	1.5
@@ -1 +1 @@
-librtas-1.2.4.tar.gz
+librtas-1.3.2.tar.gz


Index: librtas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librtas.spec	21 Aug 2007 15:56:30 -0000	1.11
+++ librtas.spec	15 Sep 2007 19:39:40 -0000	1.12
@@ -1,14 +1,16 @@
-Summary: Libraries to provide access to RTAS calls and RTAS events.
-Name: librtas
-Version: 1.2.4
-Release: 4%{?dist}
-URL: http://librtas.ozlabs.org
-License: IBM Common Public License (CPL) v1.0
-Group: System Environment/Libraries
-Source: http://librtas.ozlabs.org/releases/librtas-%{version}.tar.gz
-Patch0: librtas-1.2.4-no_syscall1.patch
+Summary: Libraries to provide access to RTAS calls and RTAS events
+Name:    librtas
+Version: 1.3.2
+Release: 1%{?dist}
+URL:     http://librtas.ozlabs.org
+License: IBM
+Group:   System Environment/Libraries
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source: http://librtas.ozlabs.org/releases/%{name}-%{version}.tar.gz
+
+Patch0: %{name}-1.3.2-mode.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 
 %description
@@ -22,48 +24,52 @@
 the contents of RTAS events.
 
 %package devel
-Summary: Static libraries and header files for librtas development.
-Group: Development/Libraries
-Requires: librtas = %{version}
+Summary:  C header files for development with librtas
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-
-The librtas-devel packages contains the header files and static libraries
-necessary for developing programs using libdaemon.
+The librtas-devel packages contains the header files necessary for
+developing programs using libdaemon.
 
 %prep
-%setup 
-%patch0 -p1 -b .no_syscall
+%setup
+%patch0 -p1 -b .mode
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
-
+%{__make} CFLAGS="%{optflags} -fPIC -DPIC" %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} install
-rm -rf $RPM_BUILD_ROOT/usr/share/doc
+%{__make} install DESTDIR=%{buildroot} LIB_DIR=%{_libdir}
+%{__rm} -rf %{buildroot}%{_datadir}/doc
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc COPYRIGHT README
+%doc COPYRIGHT README Changelog
 %{_libdir}/librtas.so.%{version}
 %{_libdir}/librtasevent.so.%{version}
 
 %files devel
 %defattr(-, root, root, -)
-%doc COPYRIGHT README
-%{_libdir}/*.so
-%{_libdir}/*.a
-/usr/include/*
+%{_libdir}/librtas.so
+%{_libdir}/librtasevent.so
+%{_includedir}/librtas.h
+%{_includedir}/librtasevent.h
+%{_includedir}/librtasevent_v4.h
+%{_includedir}/librtasevent_v6.h
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 1.3.2-1
+- Upgraded to librtas-1.3.2
+- Cleaned up spec file to conform to Fedora packaging guidelines
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 1.2.4-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 02:58:02 -0000	1.5
+++ sources	15 Sep 2007 19:39:40 -0000	1.6
@@ -1 +1 @@
-2e2a2b10ee65deb9b99f88f1502656ce  librtas-1.2.4.tar.gz
+0a3705d4983fbb18a1b98cbe15032318  librtas-1.3.2.tar.gz


--- librtas-1.2.4-no_syscall1.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 21:14:02 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Sat, 15 Sep 2007 17:14:02 -0400
Subject: rpms/ppc64-utils/devel .cvsignore, 1.6, 1.7 ppc64-utils.spec, 1.27, 
	1.28 sources, 1.13, 1.14
Message-ID: <200709152114.l8FLE2Y3016033@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/ppc64-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16011

Modified Files:
	.cvsignore ppc64-utils.spec sources 
Log Message:
* Sat Sep 15 2007 David Cantrell <dcantrell at redhat.com> - 0.12-1
- Upgraded to powerpc-utils-1.0.6 and powerpc-utils-papr-1.0.4
- Updated license tag to reflect licenses of all included components



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Apr 2007 04:37:24 -0000	1.6
+++ .cvsignore	15 Sep 2007 21:13:30 -0000	1.7
@@ -1,10 +1,8 @@
 pmac-utils-2.1.tar.gz
 ppc64-utils-0.4.tar.gz
 zImage-boot.tar.gz
-powerpc-utils-1.0.2.tar.gz
-powerpc-utils-papr-1.0.2.tar.gz
-powerpc-utils-1.0.3.tar.gz
-powerpc-utils-papr-1.0.3.tar.gz
 ps3pf_utils-1.0.9.tar.bz2
 zImage-wrapper.tar.gz
 ps3.dtb
+powerpc-utils-1.0.6.tar.gz
+powerpc-utils-papr-1.0.4.tar.gz


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ppc64-utils.spec	27 Aug 2007 17:45:21 -0000	1.27
+++ ppc64-utils.spec	15 Sep 2007 21:13:30 -0000	1.28
@@ -1,12 +1,20 @@
 %define pmacutilsver 2.1
-%define powerpcutilsver 1.0.3
+%define powerpcutilsver 1.0.6
+%define powerpcutilspaprver 1.0.4
 %define ps3pfutilsver 1.0.9
 
 Summary: Linux/PPC64 specific utilities
 Name:    ppc64-utils
-Version: 0.11
-Release: 5%{?dist}
-License: GPL and OSL
+Version: 0.12
+Release: 1%{?dist}
+
+# The things that do not have URLs in the source entry are Red Hat creations,
+# except pmac-utils, which just isn't available upstream anymore.
+# The licensing of these things are all different.  The Red Hat
+# creations are either GPLv2 or GPLv2+, pmac-utils is GPLv2, and
+# powerpc-utils and powerpc-utils-papr are IBM
+License: GPLv2 and GPLv2+ and IBM
+
 Group:   System Environment/Base
 
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
@@ -15,7 +23,7 @@
 Source3: mkzimage
 Source5: pmac-utils-%{pmacutilsver}.tar.gz
 Source6: zImage-boot.tar.gz
-Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilsver}.tar.gz
+Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilspaprver}.tar.gz
 Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
 Source9: zImage-wrapper.tar.gz
 Source10: ps3.dts
@@ -24,7 +32,7 @@
 Patch1: ppc64-utils-1.1-64k.patch
 Patch2: ps3pf_utils-1.0.9-types.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 Requires: binutils yaboot
 BuildRequires: linuxdoc-tools librtas-devel kernel-devel dtc
@@ -52,7 +60,7 @@
 
 %{__make} -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
 
-CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilsver}
+CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilspaprver}
 
 %{__make} %{?_smp_mflags} -C zImage-boot zImage.stub
 
@@ -79,7 +87,7 @@
 %{__install} -m 755 nvsetenv %{buildroot}/sbin
 %{__install} -m 755 nvsetenv.8 %{buildroot}/%{_mandir}/man8
 popd
-pushd powerpc-utils-papr-%{powerpcutilsver}
+pushd powerpc-utils-papr-%{powerpcutilspaprver}
 %{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}/etc/init.d
 %{__install} -m 0644 scripts/ibmvscsis.sh %{buildroot}%{_datadir}/%{name}
@@ -102,6 +110,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sat Sep 15 2007 David Cantrell <dcantrell at redhat.com> - 0.12-1
+- Upgraded to powerpc-utils-1.0.6 and powerpc-utils-papr-1.0.4
+- Updated license tag to reflect licenses of all included components
+
 * Mon Aug 27 2007 David Cantrell <dcantrell at redhat.com> - 0.11-5
 - Spec file style cleanup
 - BR dtc now for ps3.dtb since Core/Extras merge is complete


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Apr 2007 08:52:45 -0000	1.13
+++ sources	15 Sep 2007 21:13:30 -0000	1.14
@@ -1,7 +1,7 @@
 afbdcb97cd036f0c55204e05bac5f38e  pmac-utils-2.1.tar.gz
 1e3f958ea6d0b7313a3aee174e472138  zImage-boot.tar.gz
-ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
-19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
 787839c782f8ab9812903cfb501455c8  ps3.dtb
 cbef15544b5335e8a646d497456f3313  zImage-wrapper.tar.gz
+33de4697b9dc36be070ae67d545fd4fe  powerpc-utils-1.0.6.tar.gz
+1472a4b2c6929a5bfe0d29ff30e8b559  powerpc-utils-papr-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 21:32:45 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:32:45 -0400
Subject: rpms/zope/FC-6 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 sources, 1.18, 1.19 zope.spec, 1.34,
	1.35 zope-2.7.3-config.patch, 1.2, NONE
Message-ID: <200709152132.l8FLWj8I018644@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18617/FC-6

Modified Files:
	.cvsignore sources zope.spec 
Added Files:
	zope-2.10.4-config.patch 
Removed Files:
	zope-2.7.3-config.patch 
Log Message:
Update Zope to 2.10.4 for use with Plone 3


zope-2.10.4-config.patch:

--- NEW FILE zope-2.10.4-config.patch ---
--- skel/etc/zope.conf.in.orig	2007-08-14 00:14:05.000000000 -0600
+++ skel/etc/zope.conf.in	2007-08-14 00:14:49.000000000 -0600
@@ -148,6 +148,7 @@
 #
 #    effective-user chrism
 
+effective-user zope
 
 # Directive: enable-product-installation
 #
@@ -288,6 +289,7 @@
 #
 #     mime-types  $INSTANCE/etc/mime.types
 
+mime-types  /etc/mime.types
 
 # Directive: structured-text-header-level
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Aug 2007 16:27:18 -0000	1.18
+++ .cvsignore	15 Sep 2007 21:32:12 -0000	1.19
@@ -1 +1 @@
-Zope-2.9.8-final.tgz
+Zope-2.10.4-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Aug 2007 16:27:18 -0000	1.18
+++ sources	15 Sep 2007 21:32:12 -0000	1.19
@@ -1 +1 @@
-ad7acd2378568264cc301657ee79d361  Zope-2.9.8-final.tgz
+07dde81bdfe42ca00f73912b3d73e0ec  Zope-2.10.4-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zope.spec	6 Aug 2007 16:27:18 -0000	1.34
+++ zope.spec	15 Sep 2007 21:32:12 -0000	1.35
@@ -1,4 +1,4 @@
-%define python_minver 2.4.2
+%define python_minver 2.4.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -14,12 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.8
-Release: 1%{?dist}
+Version: 2.10.4
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz
+Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,13 +28,10 @@
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz
-Patch0:  zope-2.7.3-config.patch
-#Patch1:  zope.configure-2.9.5.patch
-
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
-Requires:      python >= %{python_minver}
+Patch0: zope-2.10.4-config.patch
+
+BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} 
+Requires:      python >= %{python_minver}, libxml2-python, python-elementtree
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -50,10 +47,7 @@
 
 %prep
 %setup -q -n Zope-%{version}-final
-%patch0 -p2 -b .config
-#%patch1 -p1
-# remove the backup, or we'll install it too...
-rm -f skel/etc/zope.conf.in.config
+%patch0 -p0
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -107,10 +101,14 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
-#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+chmod 750 $RPM_BUILD_ROOT%{instance_home}
+
+# Set needed permissions
+# We might go as far as to only allow zope r/w to the .pyc files
+for dir in %{instance_home}/{Products,log,lib,var}; do
+    chmod 775 $RPM_BUILD_ROOT$dir
+done
 
-chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # included in %%doc
@@ -156,7 +154,7 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc doc/* README.Fedora
+%doc doc/* README.Fedora ZopePublicLicense.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
@@ -174,187 +172,17 @@
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
-%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
-%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+%attr(-, root, %{zope_group}) %{instance_home}/*
 %{python_sitearch}/zope.pth
 
 
 %changelog
-* Mon Aug 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.8-1
-- Updated to 2.9.8
+* Mon Sep 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-3
+- Updated Requires for libxml2-python and python-elementtree
 
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-2
-- Added zope.pth to fix misc. zope scripts including some zeo stuff
+* Tue Aug 14 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-2
+- Added config patch
 
-* Mon Apr 2 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-1
-- Removed hotfix 20070320
-- Updated to 2.9.7
-- Removed no longer needed patch for acceptable python version
-
-* Wed Mar 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-2
-- Added hotfix 20070320 (#233378)
-
-* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
-- Updated to 2.9.6 added Five back into Zope (#221252)
-
-* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
-- Updated to 2.9.5 and removed not needed patches
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
-- Removed Five from zope package (plone 2.5.1 now provides the needed
-  version.)
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-2
-- fix path on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-1
-- update to 2.9.4
-
-* Wed Aug  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.9.3-4
-- Security: fix world-writable permissions on logrotate config files
-  and README.Fedora (#200794).
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-3
-- try to fix build on x86_64 (take 2)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-2
-- try to fix build on x86_64 (take 1)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-1
-- version 2.9.3
-- add Hotfix_20060705
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
-- version 2.9.2
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
-- version 2.8.5
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
-- rebuild
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
-- add warning about zope 2.8 & python 2.4 (bug 171681)
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
-- version 2.8.3
-
-* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
-- version 2.8.2
-
-* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
-- version 2.8.1
-
-* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
-- rebuild
-
-* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
-- version 2.8.0
-
-* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-2
-- don't remove the zope user un postun (to keep the Data.fs to the
-  correct owner after removal)
-
-* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1%{?dist}
-- version 2.7.6
-- use disttag
-
-* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
-- add hotfix
-
-* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
-- version 2.7.5
-- drop Epoch
-- change release tag for FC4
-- convert some tabs into spaces
-
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
-- version 2.7.4
-- flag the documentation as %%doc
-- make %%zope_home go+rx to allow users to create instances and to allow
-  access to docs
-- add a logrotate cron job
-- flag config files as %%config even in %%zope_home and %%instance_home
-
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
-- activate "security-policy-implementation python" in zope.conf
-
-* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
-- revert to zope's default directory tree to allow multiple instances
-- make the zopectl script multiple-instaces-aware.
-- add README.Fedora
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.4
-- compile scripts in %zope_home/bin too
-- keep skel dir in %zope_home to fix mkzopeinstance
-- BuildRequire python, since python-devel doesn't require it.
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.3
-- compile .pyc instead of just touch-ing them
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
-- deal with leftover .pyc files
-- minor spec cleanups
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.1
-- fix scriptlets requirements
-- use standard buildroot
-- replace %%buildroot by RPM_BUILD_ROOT
-- update to 2.7.3
-- drop Hotfix
-- drop patch 1, fixed upstream
-
-* Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
-  http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
-- add patch to warn the user that the initial user cannot be added while
-  Zope is running (from Chris McDonough)
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.1
-- version 2.7.2
-- remove leftover byte-compilation in %%post
-- Zope 2.7.x really requires python >= 2.3.3
-
-* Wed Jul 14 2004 Rex Dieter <rexdieter at sf.net> 2.7.1-0.fdr.1
-- 2.7.1
-- move files created in %%post back into rpm.  Unowned files are bad.
-- make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
-- don't use Requires(preun,postun)
-- use %%_smp_mflags
-
-* Tue Apr 28 2004 Chris McDonough <chrism at plope.com> 2.7.0-0.fdr.1
-- Prep for submission to Fedora.us by revising work done by Matthias
-- Refer to source files by URL instead of by name
-- Write version.txt into software home in post
-- Don't ship byte-compiled files, instead compile them in post
-- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup)
-- Add patch for objectmanager bug that could effect sites that depend
-  on userid/username separation
-- Improved init script (OK and FAILED now are printed at the appropriate
-  times)
-- Remove runzope workaround by adding a <zoperunner> stanza to the
-  config file.
-- Start in runlevels 345.
-- Known issues:
-  - zopectl is started and runs as the root user at boot time,
-    (although Zope itself runs as the zope user)
-  - no distro-specific docs telling people which port the software
-    runs on or how to add a user via zopectl adduser.
-
-* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6.fr
-- Initial RPM release.
-- The startup/stop needs to be modified further.
-- Currently "zopectl" returns an error although Zope does start...
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-1
+- Initial Package
 


--- zope-2.7.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 21:38:47 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sat, 15 Sep 2007 17:38:47 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, NONE,
	1.1 evolution.spec, 1.289, 1.290
Message-ID: <200709152138.l8FLclUk018758@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18733

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.11.92-icon-names.patch 
Log Message:

* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
- Add patch for GNOME bug #477045 (use standard icon names).


evolution-2.11.92-icon-names.patch:

--- NEW FILE evolution-2.11.92-icon-names.patch ---
diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-15 16:53:46.000000000 -0400
@@ -206,7 +206,7 @@ enum {
 /* Options for View */
 static EMFBSearchBarItem emfb_view_items[] = {
 	{{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL},
-	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"},
+	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"},
 	{{ NULL, 0, 0 }, NULL},
 	{{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL},
 	{{ NULL, -1, 0 }, NULL}
@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items
 /* TODO: Following options should be  customizable */
 static EMFBSearchBarItem temp_view_items[] = {
 	{{ NULL, 0, 0 }, NULL},
-	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
+	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"},
 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
 	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
-	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
+	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"},
 /* 	{ NULL, 0, NULL }, */
 /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
 	{{ NULL, -1, 0 }, NULL}
diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
--- evolution-2.11.92/mail/em-folder-tree.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-tree.c	2007-09-15 16:53:46.000000000 -0400
@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
 	guint32 flags;
 	
 	if (!initialised) {
-		folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
-		folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
-		folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU);
@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[]
 	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
 	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
 	{ E_POPUP_BAR, "10.emc" },
-	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 },
+	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
 };
 
 static void
@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = {
 	
 	{ E_POPUP_BAR, "20.emc" },
 	/* FIXME: need to disable for nochildren folders */
-	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS },
+	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
 	/* FIXME: need to disable for undeletable folders */
-	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
 	{ E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
-	{ E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
-	{ E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
+	{ E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
+	{ E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
 
 	
 	{ E_POPUP_BAR, "80.emc" },
diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
--- evolution-2.11.92/mail/mail.error.xml.icon-names	2007-07-28 17:08:12.000000000 -0400
+++ evolution-2.11.92/mail/mail.error.xml	2007-09-15 16:53:46.000000000 -0400
@@ -16,14 +16,14 @@
     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
 {0}
 Send anyway?</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
     <_primary>Are you sure you want to send a message without a subject?</_primary>
     <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
@@ -32,14 +32,14 @@ Send anyway?</_secondary>
     <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
 
 Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
     <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
     <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
@@ -51,36 +51,36 @@ Many email systems add an Apparently-To 
   <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
     <_primary>Use default drafts folder?</_primary>
     <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to open {0} messages at once?</_primary>
     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
     <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
     <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="application-exit" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="async-error" type="error">
@@ -99,8 +99,8 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="session-message-warning" type="warning">
@@ -109,8 +109,8 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="session-message-error" type="info">
@@ -119,15 +119,15 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
     <_primary>Enter password.</_primary>
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="filter-load-error" type="error">
@@ -179,15 +179,15 @@ Many email systems add an Apparently-To 
     <_title>Delete &quot;{0}&quot;?</_title>
     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
[...2080 lines suppressed...]
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	
 	E_PIXMAP_END
 };
diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
--- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-table.c	2007-09-15 16:53:46.000000000 -0400
@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
 	{ E_POPUP_BAR, "70.bar" },
 
 	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE },
 	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
 	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
 	{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
@@ -1494,7 +1494,7 @@ e_day_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
--- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
 }
 
 static EPopupItem ecv_main_items [] = {
-	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
+	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 },
 	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
 	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
 	{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
@@ -1691,9 +1691,9 @@ static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 	{ E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
 	{ E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
-	{ E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
 
 	{ E_POPUP_BAR, "50." },
 
diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
--- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/tasks-component.c	2007-09-15 16:53:46.000000000 -0400
@@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
 static EPopupItem etc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
--- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/calendar-commands.c	2007-09-15 16:53:46.000000000 -0400
@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/Toolbar/DayView",	      "stock_calendar-view-day",       E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WorkWeekView",    "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WeekView",	      "stock_calendar-view-week",      E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MonthView",	      "stock_calendar-view-month",     E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/ListView",	      "stock_calendar-view-list",      E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/Prev",             "stock_previous",                   E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/Next",             "stock_next",                   E_ICON_SIZE_LARGE_TOOLBAR),
+static EPixmap pixmaps [] = {
+	E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/MonthView",	"stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
 
 	E_PIXMAP_END
 };
diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
--- evolution-2.11.92/calendar/gui/memos-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/memos-control.c	2007-09-15 16:53:46.000000000 -0400
@@ -39,6 +39,7 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-print.h>
+#include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
 
 #include "calendar-config.h"
@@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
+static EPixmap pixmaps [] = {
+	E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+
+	E_PIXMAP_END
+};
+
 void
 memos_control_activate (BonoboControl *control, EMemos *memos)
 {
@@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *c
 			       NULL);
 	g_free (xmlfile);
 
+	e_pixmaps_update (uic, pixmaps);
+
 	e_memos_setup_view_menus (memos, uic);
 
 	/* Signals from the memos widget; also sensitize the menu items as appropriate */
diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
--- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-cal-popup.c	2007-09-15 16:53:46.000000000 -0400
@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
 static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
 
 static ECalPopupItem ecalp_attachment_object_popups[] = {
-	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
+	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
 	{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE },
-	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
+	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
 	{ E_POPUP_BAR, "05.attach", },
 };
 
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- evolution.spec	12 Sep 2007 01:14:37 -0000	1.289
+++ evolution.spec	15 Sep 2007 21:38:15 -0000	1.290
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -124,6 +124,9 @@
 # GNOME bug #476040
 Patch35: evolution-2.11.92-mail-attachment.patch
 
+# GNOME bug #477045
+Patch36: evolution-2.11.92-icon-names.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -264,6 +267,7 @@
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
 %patch35 -p1 -b .mail-attachment
+%patch36 -p1 -b .icon-names
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -713,6 +717,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
+- Add patch for GNOME bug #477045 (use standard icon names).
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
 - Add patch for GNOME bug #476040 (fix attachment icon).
 



From fedora-extras-commits at redhat.com  Sat Sep 15 21:39:56 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:39:56 -0400
Subject: rpms/plone/FC-6 .cvsignore, 1.15, 1.16 plone.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <200709152139.l8FLduou018812@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18787/FC-6

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 May 2007 22:07:25 -0000	1.15
+++ .cvsignore	15 Sep 2007 21:39:24 -0000	1.16
@@ -1 +1 @@
-Plone-2.5.3-final.tar.gz
+Plone-3.0.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plone.spec	23 May 2007 22:29:19 -0000	1.28
+++ plone.spec	15 Sep 2007 21:39:24 -0000	1.29
@@ -1,17 +1,18 @@
-%define python_minver 2.4.2
-%define zope_minver 2.9.4
+%define python_minver 2.4.3
+%define zope_minver 2.10.4
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
+%define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        2.5.3
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://plone.googlecode.com/files/Plone-%{version}-final.tar.gz
+Source0:        http://plone.googlecode.com/files/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,12 +21,12 @@
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
-It is easy to use, translated into over 30 languages and carefully follows
+It is easy to use, translated into over 35 languages and carefully follows
 standards. It's under active development and easily extensible with add-on
 products.
 
 %prep
-%setup -q -n Plone-%{version}-final
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -37,15 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{software_home}/Products
-cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
-
-# Remove Five because Zope provides the correct verison of Five
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
-
-# Avoid conflicts, put those in %%doc
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
-
+install -d $RPM_BUILD_ROOT%{software_home}/lib/python
+cp -pr Products/* $RPM_BUILD_ROOT%{software_home}/Products
+cp -pr lib/python/* $RPM_BUILD_ROOT%{software_home}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,88 +53,19 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt CONTENTS.txt
-%{software_home}/Products/*
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyc
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyo
-
+%doc README.txt RELEASENOTES.txt INSTALL.txt
+%{software_home}/*
 
 %changelog
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.3-1
-- Fixed CacheFu squid scripts (removed pyc and pyo)
-- Updated to 2.5.3
-
-* Sun Jan 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.2-1
-- Updated to 2.5.2
-- Removed Plone Hotfix 20061031
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-6
-- Retag
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-5
-- Updated so zope now provides Five
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-4
-- Updated so plone now provides the correct version of the Five product
-
-* Sat Nov 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-3
-- add Plone Hotfix 20061031 (bug 213983)
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- rebuild
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- version 2.5.1
-
-* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
-- Update PasswordResetTool to fix CVE-2006-4247
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
-- Zope 2.9.4 went back to zope/lib/python on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-2
-- fix path on x86_64
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-1
-- Version 2.5
-- Drop Hotfix, included
-- condrestart Zope on %%post
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
-- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
-- restart Zope on upgrade (will migrate it to %%postun for the
-  next release, but we need to make sure zope is restarted for
-  this one (security)
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
-- version 2.1.2
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
-- version 2.1.1
-
-* Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
-- version 2.1 final
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr>
-- rebuild
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.3.rc2
-- update to rc2
-- drop buildarch: noarch since _libdir depends on arch (on x86_64)
-- put readmes in %%doc
-
-* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.2.rc1
-- update to rc1
-
-* Wed Jun 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.1.alpha2
-- update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
+* Fri Sep 14 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0.1-1
+- Update to Plone 3.0.1
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
+- Moved plone install back to software_home
+- Updated to Plone 3.0 final release
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.5-2
-- apply Matthias' suggestions: cleanup %%description, drop Epoch, and
-  use a better Group.
+* Wed Aug 2 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.2rc2
+- Moved plone install from software_home to instance_home (workaround)
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.5-1
-- initial Fedora Extras RPM
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.1rc2
+- Initial Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 May 2007 22:07:25 -0000	1.15
+++ sources	15 Sep 2007 21:39:24 -0000	1.16
@@ -1 +1 @@
-36117b0757982d66d445b6c6b9df0e25  Plone-2.5.3-final.tar.gz
+cf54c017ae383688112f2a4e45a150df  Plone-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 21:49:14 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:49:14 -0400
Subject: rpms/plone/EL-5 .cvsignore, 1.16, 1.17 plone.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <200709152149.l8FLnEOp023304@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282/EL-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Sep 2007 22:16:42 -0000	1.16
+++ .cvsignore	15 Sep 2007 21:48:41 -0000	1.17
@@ -1 +1 @@
-Plone-3.0.tar.gz
+Plone-3.0.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/plone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plone.spec	6 Sep 2007 22:16:43 -0000	1.29
+++ plone.spec	15 Sep 2007 21:48:41 -0000	1.30
@@ -6,7 +6,7 @@
 %define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        3.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
@@ -57,6 +57,9 @@
 %{software_home}/*
 
 %changelog
+* Fri Sep 14 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0.1-1
+- Update to Plone 3.0.1
+
 * Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
 - Moved plone install back to software_home
 - Updated to Plone 3.0 final release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2007 22:16:43 -0000	1.16
+++ sources	15 Sep 2007 21:48:41 -0000	1.17
@@ -1 +1 @@
-84a4513fdabd191c85e364e159979590  Plone-3.0.tar.gz
+cf54c017ae383688112f2a4e45a150df  Plone-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 22:12:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 18:12:29 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.68, 1.69 sources, 1.72, 
	1.73 system-config-date.spec, 1.78, 1.79
Message-ID: <200709152212.l8FMCTmF029984@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29962

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	15 Sep 2007 10:42:40 -0000	1.68
+++ .cvsignore	15 Sep 2007 22:11:57 -0000	1.69
@@ -1 +1 @@
-system-config-date-1.9.8.tar.bz2
+system-config-date-1.9.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	15 Sep 2007 10:42:40 -0000	1.72
+++ sources	15 Sep 2007 22:11:57 -0000	1.73
@@ -1 +1 @@
-4d58698983ec95318faa6a5e9f1b75da  system-config-date-1.9.8.tar.bz2
+58c7c971e7dd0790a3832bcf3f0da88f  system-config-date-1.9.9.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- system-config-date.spec	15 Sep 2007 10:42:40 -0000	1.78
+++ system-config-date.spec	15 Sep 2007 22:11:57 -0000	1.79
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.8
+Version: 1.9.9
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPLv2+
@@ -100,6 +100,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.9
+- pick up updated translations
+
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.8
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Sat Sep 15 22:15:38 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 18:15:38 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.54, 1.55 sources, 1.58,
	1.59 system-config-users.spec, 1.63, 1.64
Message-ID: <200709152215.l8FMFcA0030090@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30066

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	15 Sep 2007 10:48:27 -0000	1.54
+++ .cvsignore	15 Sep 2007 22:15:06 -0000	1.55
@@ -1 +1 @@
-system-config-users-1.2.66.tar.bz2
+system-config-users-1.2.67.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	15 Sep 2007 10:48:27 -0000	1.58
+++ sources	15 Sep 2007 22:15:06 -0000	1.59
@@ -1 +1 @@
-04bfb7a789afbf244f0e379f7e982d1c  system-config-users-1.2.66.tar.bz2
+abf42a04901188e1cf2dc36378b0e035  system-config-users-1.2.67.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- system-config-users.spec	15 Sep 2007 10:48:27 -0000	1.63
+++ system-config-users.spec	15 Sep 2007 22:15:06 -0000	1.64
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.66
+Version: 1.2.67
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,9 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.67
+- pick up updated translations
+
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.66
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Sun Sep 16 00:52:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 15 Sep 2007 20:52:53 -0400
Subject: rpms/dbus-glib/devel dbus-glib.spec,1.15,1.16
Message-ID: <200709160052.l8G0qrY2012096@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/dbus-glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12076

Modified Files:
	dbus-glib.spec 
Log Message:
rebuild



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbus-glib.spec	2 Aug 2007 02:25:16 -0000	1.15
+++ dbus-glib.spec	16 Sep 2007 00:52:20 -0000	1.16
@@ -8,7 +8,7 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
@@ -114,6 +114,9 @@
 %endif
 
 %changelog
+* Sat Sep 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-3
+- Rebuild against new expat
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-2
 - Fix a bug in introspection support (#248150)
 



From fedora-extras-commits at redhat.com  Sun Sep 16 00:54:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 15 Sep 2007 20:54:41 -0400
Subject: rpms/glob2/F-7 glob2.spec,1.4,1.5
Message-ID: <200709160054.l8G0sfXB012176@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12156

Modified Files:
	glob2.spec 
Log Message:
new install method


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/glob2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glob2.spec	8 Sep 2007 15:43:01 -0000	1.4
+++ glob2.spec	16 Sep 2007 00:54:09 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -36,6 +36,9 @@
 %patch1 -p0
 
 chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
+%if "%{?fedora}" > "7"
+sed -i 's|boost_thread|boost_thread-mt|' SConstruct
+%endif
 
 
 %build
@@ -44,8 +47,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
+#scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/glob2/{data/fonts,data/gfx/cursor,data/gui,data/icons,data/zik,maps,scripts,campaigns}
+cp -rp {data,campaigns,scripts,maps} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp src/glob2 $RPM_BUILD_ROOT%{_bindir}/
+
+find $RPM_BUILD_ROOT -name SConscript -exec rm -f {} \;
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
@@ -84,6 +94,8 @@
 
 
 %changelog
+* Sun Sep 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-2
+- new install method
 * Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
 - update to 0.9.1
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3



From fedora-extras-commits at redhat.com  Sun Sep 16 00:59:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 15 Sep 2007 20:59:54 -0400
Subject: rpms/glob2/devel glob2.spec,1.4,1.5
Message-ID: <200709160059.l8G0xsNT012303@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12259

Modified Files:
	glob2.spec 
Log Message:
new install method



Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glob2.spec	8 Sep 2007 15:51:25 -0000	1.4
+++ glob2.spec	16 Sep 2007 00:59:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -36,6 +36,9 @@
 %patch1 -p0
 
 chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
+%if "%{?fedora}" > "7"
+sed -i 's|boost_thread|boost_thread-mt|' SConstruct
+%endif
 
 
 %build
@@ -44,8 +47,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
+#scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/glob2/{data/fonts,data/gfx/cursor,data/gui,data/icons,data/zik,maps,scripts,campaigns}
+cp -rp {data,campaigns,scripts,maps} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp src/glob2 $RPM_BUILD_ROOT%{_bindir}/
+
+find $RPM_BUILD_ROOT -name SConscript -exec rm -f {} \;
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
@@ -84,6 +94,8 @@
 
 
 %changelog
+* Sun Sep 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-2
+- new install method
 * Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
 - update to 0.9.1
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-4



From fedora-extras-commits at redhat.com  Sun Sep 16 07:34:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 03:34:37 -0400
Subject: comps comps-f8.xml.in,1.109,1.110
Message-ID: <200709160734.l8G7YbtA029636@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29616

Modified Files:
	comps-f8.xml.in 
Log Message:
strumbahnfahrer got renamed to stormbaancoureur


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- comps-f8.xml.in	14 Sep 2007 14:39:09 -0000	1.109
+++ comps-f8.xml.in	16 Sep 2007 07:34:06 -0000	1.110
@@ -1538,7 +1538,7 @@
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
-      <packagereq type="optional">sturmbahnfahrer</packagereq>
+      <packagereq type="optional">stormbaancoureur</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">taxipilot</packagereq>



From fedora-extras-commits at redhat.com  Sun Sep 16 07:45:31 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Sep 2007 03:45:31 -0400
Subject: rpms/wine/F-7 .cvsignore, 1.40, 1.41 sources, 1.41, 1.42 wine.spec, 
	1.59, 1.60
Message-ID: <200709160745.l8G7jVnU029791@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29727/F-7

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Aug 2007 08:27:58 -0000	1.40
+++ .cvsignore	16 Sep 2007 07:44:58 -0000	1.41
@@ -1 +1 @@
-wine-0.9.44-fe.tar.bz2
+wine-0.9.45-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Aug 2007 08:27:58 -0000	1.41
+++ sources	16 Sep 2007 07:44:58 -0000	1.42
@@ -1 +1 @@
-3dd2dbd3f82126d4dffe8749a8a01296  wine-0.9.44-fe.tar.bz2
+4ec2ac353fa955365de58c7b0db344de  wine-0.9.45-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/wine.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- wine.spec	25 Aug 2007 08:27:58 -0000	1.59
+++ wine.spec	16 Sep 2007 07:44:58 -0000	1.60
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.44
+Version:	0.9.45
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -18,7 +18,7 @@
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.44-fe.tar.bz2
+Source0:        wine-0.9.45-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -559,6 +559,7 @@
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
@@ -757,6 +758,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Sep 16 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.45-1
+- version upgrade
+
 * Sat Aug 25 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.44-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Sep 16 07:45:35 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Sep 2007 03:45:35 -0400
Subject: rpms/wine/devel .cvsignore, 1.40, 1.41 sources, 1.41, 1.42 wine.spec,
	1.60, 1.61
Message-ID: <200709160745.l8G7jZqR029798@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29727/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Aug 2007 08:28:03 -0000	1.40
+++ .cvsignore	16 Sep 2007 07:45:02 -0000	1.41
@@ -1 +1 @@
-wine-0.9.44-fe.tar.bz2
+wine-0.9.45-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Aug 2007 08:28:03 -0000	1.41
+++ sources	16 Sep 2007 07:45:02 -0000	1.42
@@ -1 +1 @@
-3dd2dbd3f82126d4dffe8749a8a01296  wine-0.9.44-fe.tar.bz2
+4ec2ac353fa955365de58c7b0db344de  wine-0.9.45-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- wine.spec	25 Aug 2007 08:28:03 -0000	1.60
+++ wine.spec	16 Sep 2007 07:45:02 -0000	1.61
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.44
+Version:	0.9.45
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -18,7 +18,7 @@
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.44-fe.tar.bz2
+Source0:        wine-0.9.45-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -559,6 +559,7 @@
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
@@ -757,6 +758,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Sep 16 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.45-1
+- version upgrade
+
 * Sat Aug 25 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.44-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Sep 16 08:31:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 16 Sep 2007 04:31:21 -0400
Subject: upgradecheck upgradecheck.py,1.38,1.39 upgradecheckspam.py,1.5,1.6
Message-ID: <200709160831.l8G8VLv4001309@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1289

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Add option -T for disabling "testing" repos


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- upgradecheck.py	8 Sep 2007 17:21:09 -0000	1.38
+++ upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upgradecheckspam.py	8 Sep 2007 17:21:09 -0000	1.5
+++ upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()



From fedora-extras-commits at redhat.com  Sun Sep 16 08:50:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 16 Sep 2007 04:50:21 -0400
Subject: upgradecheck upgradecheck.py,1.39,1.40 upgradecheckspam.py,1.6,1.7
Message-ID: <200709160850.l8G8oLmL002537@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2504

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Include list of enabled repoids in report


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
+++ upgradecheck.py	16 Sep 2007 08:50:19 -0000	1.40
@@ -32,6 +32,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_to = "fedora-devel-list at redhat.com"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -240,7 +256,7 @@
         report.append('')
     report += oldreport
 
-    report = "\n".join(report)
+    report = report_header + "\n\n" + "\n".join(report)
     if report:
         if mail_to and not opts.nomail:
             msg = MIMEText(report)


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
+++ upgradecheckspam.py	16 Sep 2007 08:50:19 -0000	1.7
@@ -33,6 +33,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
 smtp_server = None
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -227,7 +243,7 @@
             s.connect()
 
     for owner,report in reports.iteritems():
-        mailbody = "\n".join(report)
+        mailbody = report_header + "\n\n" + "\n".join(report)
 
         if not opts.nomail:
             msg = MIMEText(mailbody)



From fedora-extras-commits at redhat.com  Sun Sep 16 09:57:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 05:57:15 -0400
Subject: rpms/blobwars/devel blobwars-1.07-es.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 blobwars.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709160957.l8G9vFZV012384@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobwars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12321

Modified Files:
	.cvsignore blobwars.spec sources 
Added Files:
	blobwars-1.07-es.patch 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
- New upstream version 1.07 (bz 292391)


blobwars-1.07-es.patch:

--- NEW FILE blobwars-1.07-es.patch ---
--- locale/es.po.old	2007-06-03 16:27:27.000000000 +0200
+++ locale/es.po	2007-06-04 09:33:51.000000000 +0200
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: blobwars 1.06\n"
-"PO-Revision-Date: 2007-04-13 12:47+0100\n"
+"PO-Revision-Date: 2007-06-04 09:33+0100\n"
 "Last-Translator: Pacho Ramos <pacho at condmat1.ciencias.uniovi.es>\n"
 "Language-Team: Catalan Localization <debian-l10n-catalan at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@
 msgstr "Activar 4 Puntos de Seguridad"
 
 msgid "Battle Galdov"
-msgstr "Combate contra Galdov"
+msgstr "Lucha contra Galdov"
 
 msgid "Collect 10 Cherry Plants"
 msgstr "Recolectar 10 Plantas de Cerezas"
@@ -187,28 +187,28 @@
 msgstr "Desactivar Sistemas de Seguridad"
 
 msgid "Defeat 10 Hard Hide Blobs"
-msgstr "Derrotar 10 Blobs de Piel Dura"
+msgstr "Derrotar a 10 Blobs de Piel Dura"
 
 msgid "Defeat 15 Machine Gun Droids"
-msgstr "Derrotar 15 Androides con Ametralladora"
+msgstr "Derrotar a 15 Androides con Ametralladora"
 
 msgid "Defeat 25 Machine Gun Droids"
-msgstr "Derrotar 25 Androides con Ametralladora"
+msgstr "Derrotar a 25 Androides con Ametralladora"
 
 msgid "Defeat 30 enemies"
-msgstr "Derrotar 30 enemigos"
+msgstr "Derrotar a 30 enemigos"
 
 msgid "Defeat 50 Enemies"
-msgstr "Derrotar 50 Enemigos"
+msgstr "Derrotar a 50 Enemigos"
 
 msgid "Defeat 100 Enemies"
-msgstr "Derrotar 100 Enemigos"
+msgstr "Derrotar a 100 Enemigos"
 
 msgid "Defeat 200 Enemies"
-msgstr "Derrotar 200 Enemigos"
+msgstr "Derrotar a 200 Enemigos"
 
 msgid "Defeat BioMech Jetpack Blob"
-msgstr "Derrotar Blob BioMec con la Mochila a Propulsi??n"
+msgstr "Derrotar a Blob BioMec con la Mochila a Propulsi??n"
 
 msgid "Defeat Galdov"
 msgstr "Derrotar a Galdov"
@@ -247,7 +247,7 @@
 msgstr "Inhabilitar el Ca????n Autom??tico"
 
 msgid "Enter Ancient Tomb"
-msgstr "Entrar a la Tumba Antigua"
+msgstr "Entrar en la Tumba Antigua"
 
 msgid "Exit the Ice Caves"
 msgstr "Salir de las Cuevas de Hielo"
@@ -268,7 +268,7 @@
 msgstr "Encontrar 2 cartuchos de dinamita"
 
 msgid "Find 2nd Cypher Piece"
-msgstr "encontrar la segunda Pieza Clave"
+msgstr "Encontrar la segunda Pieza Clave"
 
 msgid "Find 3 Ancient Cogs"
 msgstr "Encontrar 3 Antiguas Ruedas Dentadas"
@@ -314,25 +314,25 @@
 msgstr "Encontrar Fragmentos de la Esfera del Agua"
 
 msgid "Get the Ancient Fire Crystal"
-msgstr "Toma el Antiguo Cristal de Fuego"
+msgstr "Consigue el Antiguo Cristal de Fuego"
 
 msgid "Get the Ancient Reality Crystal"
-msgstr "Toma el Antiguo Cristal de la Realidad"
+msgstr "Consigue el Antiguo Cristal de la Realidad"
 
 msgid "Get the Ancient Space Crystal"
-msgstr "Toma el Antiguo Cristal del Espacio"
+msgstr "Consigue el Antiguo Cristal del Espacio"
 
 msgid "Get the Ancient Time Crystal"
-msgstr "Toma el Antiguo Cristal del Tiempo"
+msgstr "Consigue el Antiguo Cristal del Tiempo"
 
 msgid "Get the Aqua Lung"
-msgstr "Toma el Pulm??n Acu??tico"
+msgstr "Consigue el Pulm??n Acu??tico"
 
 msgid "Get the Jetpack"
-msgstr "Toma la Mochila a Propulsi??n"
+msgstr "Consigue la Mochila a Propulsi??n"
 
 msgid "Get the Reality Crystal"
-msgstr "Toma el Cristal de la Realidad"
+msgstr "Consigue el Cristal de la Realidad"
 
 msgid "Get to the Exit"
 msgstr "Llega a la Salida"
@@ -375,16 +375,16 @@
 
 # Picked up...
 msgid "Picked up an Ancient Cog"
-msgstr "Has tomado una Rueda Dentada"
+msgstr "Has adquirido una Rueda Dentada"
 
 msgid "Picked up an Ancient Key"
-msgstr "Has tomado una Llave Antigua"
+msgstr "Has adquirido una Llave Antigua"
 
 msgid "Picked up a Blue Keycard"
-msgstr "Has tomado una Tarjeta Azul"
+msgstr "Has adquirido una Tarjeta Azul"
 
 msgid "Picked up a Bronze Key"
-msgstr "Has tomado una Llave de Bronce"
+msgstr "Has adquirido una Llave de Bronce"
 
 msgid "Picked up a bunch of Cherries"
 msgstr "Has tomado un racimo de Cerezas"
@@ -393,28 +393,28 @@
 msgstr "Has tomado una Cereza"
 
 msgid "Picked up a Crystal Shard"
-msgstr "Has tomado un Fragmento de Cristal"
+msgstr "Has adquirido un Fragmento de Cristal"
 
 msgid "Picked up a Cyan Keycard"
-msgstr "Has tomado una Tarjeta Cian"
+msgstr "Has adquirido una Tarjeta Cian"
 
 msgid "Picked up a Gold Key"
-msgstr "Has tomado una Llave de Oro"
+msgstr "Has adquirido una Llave de Oro"
 
 msgid "Picked up a Green Keycard"
-msgstr "Has tomado una Tarjeta Verde"
+msgstr "Has adquirido una Tarjeta Verde"
 
 msgid "Picked up a Grenades"
 msgstr "Has conseguido Granadas"
 
 msgid "Picked up a Keycard"
-msgstr "Has tomado una Tarjeta"
+msgstr "Has adquirido una Tarjeta"
 
 msgid "Picked up a Laser Gun"
 msgstr "Has conseguido un Ca????n L??ser"
 
 msgid "Picked up a Machine Gun"
-msgstr "Has aconseguido una Ametralladora"
+msgstr "Has conseguido una Ametralladora"
 
 msgid "Picked up a pair of Cherries"
 msgstr "Has tomado un par de Cerezas"
@@ -423,16 +423,16 @@
 msgstr "Has conseguido una Pistola"
 
 msgid "Picked up a Purple Keycard"
-msgstr "Has tomado una Tarjeta Morada"
+msgstr "Has adquirido una Tarjeta Morada"
 
 msgid "Picked up a Red Keycard"
-msgstr "Has tomado una Tarjeta Roja"
+msgstr "Has adquirido una Tarjeta Roja"
 
 msgid "Picked up a set of Grenades"
 msgstr "Has conseguido un juego de Granadas"
 
 msgid "Picked up a Silver Key"
-msgstr "Has tomado una Llave de Plata"
+msgstr "Has adquirido una Llave de Plata"
 
 msgid "Picked up a Three Way Spread"
 msgstr "Has conseguido un Rifle a Tres Bandas"
@@ -506,7 +506,7 @@
 msgstr "????qu?? era eso?!"
 
 msgid "Galdov: And this is the best the Blob Army can offer?"
-msgstr "Galdov: Y esto es lo mejor que la Armada Blob puede ofrecer?"
+msgstr "Galdov: ??Y esto es lo mejor que la Armada Blob puede ofrecer?"
 
 msgid "Galdov: Stupid creature!! Give up and join us!"
 msgstr "Galdov: ????Criatura est??pida!! ????Abandona y ??nete a nosotros!!"
@@ -531,7 +531,7 @@
 msgstr "Precisi??n"
 
 msgid "All Required Objectives Met - Mission Complete"
-msgstr "Todos los Objeticos requeridos alcanzados - Misi??n Completada"
+msgstr "Todos los Objetivos requeridos alcanzados - Misi??n Completada"
 
 msgid "Ammo Used"
 msgstr "Munici??n Usada"
@@ -564,7 +564,7 @@
 msgstr "Tanque BioMec V2.6"
 
 msgid "Blob Wars : Episode I"
-msgstr "Blob Wars : Episodio II"
+msgstr "Blob Wars : Episodio I"
 
 msgid "Bonuses Picked Up:"
 msgstr "Bonificaciones Obtenidas:"
@@ -670,7 +670,7 @@
 msgstr "El Cuarto Piso ya es accesible"
 
 msgid "Galdov has dropped the crystal! Quick! Get it!!"
-msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??A cogerlo!"
+msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??Hay que conseguirlo!"
 
 msgid "Got the Aqua Lung! You can now swim forever!"
 msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar para siempre??"
@@ -703,13 +703,13 @@
 msgstr "++ Inventario ++"
 
 msgid "Items"
-msgstr "Objectos"
+msgstr "Objetos"
 
 msgid "Items Collected"
-msgstr "Objectos Recolectados"
+msgstr "Objetos Recolectados"
 
 msgid "Items Collected:"
-msgstr "Objectos Recolectados:"
+msgstr "Objetos Recolectados:"
 
 msgid "Jetpack"
 msgstr "Mochila a Propulsi??n"
@@ -763,7 +763,7 @@
 msgstr "Metal Blob Solid : Estad??sticas"
 
 msgid "MIA Statistics"
-msgstr "Estad??sicadas de Perdidos En Acci??n"
+msgstr "Estad??sticas de Perdidos En Acci??n"
 
 msgid "MIAs"
 msgstr "PEAs"
@@ -820,7 +820,7 @@
 msgstr "%s - Objectivo Completado - ??Punto de Control Alcanzado!"
 
 msgid "Objectives Completed:"
-msgstr "Objectivos Completados:"
+msgstr "Objetivos Completados:"
 
 msgid "Obstacles Reset"
 msgstr "Obst??culos Reiniciados"
@@ -850,7 +850,7 @@
 msgstr "Presenta"
 
 msgid "Press Button to Continue..."
-msgstr "Presiona Bot??n para Continuar..."
+msgstr "Presiona Tabulador para Continuar..."
 
 msgid "Press Fire to Continue"
 msgstr "Presiona Fuego para Continuar"
@@ -862,16 +862,16 @@
 msgstr "Rescatar %d PEAs - Objectivo Completado - ??Punto de Control Alcanzado!"
 
 msgid "Rescued %s!"
-msgstr "??Has rescatado %s!"
+msgstr "??Has rescatado a %s!"
 
 msgid "Rescued %s - Checkpoint Reached!"
-msgstr "??Has rescatado %s - Punto de Control Alcanzado!"
+msgstr "??Has rescatado a %s - Punto de Control Alcanzado!"
 
 msgid "Save Complete"
 msgstr "Salvado Completado"
 
 msgid "Saving Game to Save Slot #%d. Please Wait..."
-msgstr "Salvando el Juego a la Ranura #%d. Un Momento..."
+msgstr "Salvando el Juego en la Ranura #%d. Un Momento..."
 
 msgid "Score:"
 msgstr "Puntuaci??n:"
@@ -991,7 +991,7 @@
 msgstr "??Ya tienes la Mochila a Propulsi??n!"
 
 msgid "You'll need to 'Kill Two Birds with One Stone' here..."
-msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Pedrada\"..."
+msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Tiro\"..."
 
 # Keys
 msgid "backspace"
--- data/es/introText.old	2007-06-02 11:27:48.000000000 +0200
+++ data/es/introText	2007-06-03 16:54:22.000000000 +0200
@@ -8,7 +8,9 @@
 
 0 0 10
 @none@
-Los Blobs eran una raza feliz y amigable. No necesitaban nada m??s. Pasaban sus d??as criando los hijos, recogiendo Cerezas y estudiando astrof??sica y f??sica cu??ntica.
+Los Blobs eran una raza feliz y amigable. No necesitaban nada m??s. 
+Pasaban sus d??as criando a sus hijos, recogiendo Cerezas y 
+estudiando astrof??sica y f??sica cu??ntica.
 
 600 0 1
 @none@
@@ -18,7 +20,9 @@
 
 0 0 10
 @none@
-Las guerras y conflictos eran leyendas para los Blobs. Muchos de ellos nunca hab??an visto un arma y algunos incluso dudaban de su existencia. Eran vidas felices, m??s todav??a por su mundo limpio, climas excelentes y lugares de vacaciones.
+Las guerras y conflictos eran leyendas para los Blobs. Muchos de ellos nunca 
+hab??an visto un arma y algunos incluso dudaban de su existencia. Eran vidas 
+felices, a??n m??s por su mundo limpio, climas excelentes y lugares de vacaciones.
 
 -600 0 1
 @none@
@@ -40,7 +44,8 @@
 
 300 0 0
 @none@
-Las bombas de los invasores alien??genas llovieron sobre su mundo, los peores temores de los Blobs se hicieron realidad... 
+Las bombas de los invasores alien??genas llovieron sobre su mundo, 
+los peores temores de los Blobs se hicieron realidad... 
 @none@
 
 200 0 0
--- data/es/titleWidgets.old	2007-06-03 17:39:49.000000000 +0200
+++ data/es/titleWidgets	2007-06-03 17:40:02.000000000 +0200
@@ -5,8 +5,8 @@
 BUTTON help mainMenu "Ayuda" "*" -1 360 0 0
 BUTTON quit mainMenu "Salir" "*" -1 390 0 0
 
-LABEL label help "Para las instrucciones del juego, mira el manual de" "*" -1 260 0 0
-LABEL label help "instalado en la siguiente localizaci??n," "*" -1 290 0 0
+LABEL label help "Para las instrucciones del juego, mira el manual del" "*" -1 260 0 0
+LABEL label help "juego instalado en la siguiente localizaci??n," "*" -1 290 0 0
 LABEL labelManual help "/usr/share/doc/blobwars/manual.html" "*" -1 320 0 0
 LABEL labelManual help "(actualmente s??lo en ingl??s)" "*" -1 350 0 0
 
--- data/es/optionWidgets.old	2007-06-03 17:03:59.000000000 +0200
+++ data/es/optionWidgets	2007-06-03 17:09:07.000000000 +0200
@@ -1,11 +1,11 @@
 RADIO fullscreen options "Pantalla Completa" "No|S??" 100 65 0 1
 SMOOTH_SLIDER soundvol options "Volumen de Sonido" "*" 100 100 0 128
 SMOOTH_SLIDER musicvol options "Volumen de M??sica" "*" 100 135 0 128
-RADIO output options "Tipus de Sortida" "Mudo|Mono|Est??reo" 100 170 0 2
+RADIO output options "Tipo de Sonido" "Mudo|Mono|Est??reo" 100 170 0 2
 SLIDER gamma options "Brillo" "*" 100 205 1 20
 RADIO gore options "Derramamiento de Sangre" "No|S??" 100 240 0 1
-BUTTON keys options "Configura Teclas..." "*" 100 275 0 100
-BUTTON joysticks options "Configura JoyStick..." "*" 100 310 0 100
+BUTTON keys options "Configura las Teclas..." "*" 100 275 0 100
+BUTTON joysticks options "Configura el JoyStick..." "*" 100 310 0 100
 
 BUTTON cheats options "Trucos..." "*" 100 345 0 100
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2007 20:19:00 -0000	1.3
+++ .cvsignore	16 Sep 2007 09:56:43 -0000	1.4
@@ -1 +1 @@
-blobwars-1.06-2.tar.gz
+blobwars-1.07-1.tar.gz


Index: blobwars.spec
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blobwars.spec	5 Aug 2007 18:42:09 -0000	1.4
+++ blobwars.spec	16 Sep 2007 09:56:43 -0000	1.5
@@ -1,14 +1,15 @@
 Name:           blobwars
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.07
+Release:        1%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.parallelrealities.co.uk/blobWars.php
 # no full URL as it gets downloaded through a php script, GRRR
-Source0:        %{name}-%{version}-2.tar.gz
+Source0:        %{name}-%{version}-1.tar.gz
 Patch0:         blobwars-1.05-debian.patch
 Patch1:         blobwars-1.05-desktop.patch
+Patch2:         blobwars-1.07-es.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@
 %setup -q
 %patch0 -p1 -z .debian
 %patch1 -p1 -z .dsktop
+%patch2 -p0
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
+- New upstream version 1.07 (bz 292391)
+
 * Sun Aug  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.06-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2007 20:19:00 -0000	1.3
+++ sources	16 Sep 2007 09:56:43 -0000	1.4
@@ -1 +1 @@
-f50002a3a2d5daae090c882d2ccf41d1  blobwars-1.06-2.tar.gz
+877d8075ce3f01557be35e7b1da11eec  blobwars-1.07-1.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 10:14:33 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 16 Sep 2007 06:14:33 -0400
Subject: rpms/php/devel php-5.2.4-easter.patch, NONE,
	1.1 php-5.2.4-embed.patch, NONE, 1.1 php-5.2.4-gnusrc.patch, NONE,
	1.1 php-5.2.4-norpath.patch, NONE, 1.1 php-5.2.4-odbc.patch,
	NONE, 1.1 php-5.2.4-tests-dashn.patch, NONE, 1.1 .cvsignore,
	1.31, 1.32 php.spec, 1.147, 1.148 sources, 1.33,
	1.34 php-4.3.1-odbc.patch, 1.1, NONE php-5.0.0-easter.patch, 1.4,
	NONE php-5.0.4-norpath.patch, 1.1,
	NONE php-5.0.4-tests-dashn.patch, 1.6,
	NONE php-5.1.4-gnusrc.patch, 1.3, NONE php-5.2.3-brigade.patch,
	1.1, NONE php-5.2.3-embed.patch, 1.1, NONE
Message-ID: <200709161014.l8GAEXuh018776@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.4-easter.patch php-5.2.4-embed.patch 
	php-5.2.4-gnusrc.patch php-5.2.4-norpath.patch 
	php-5.2.4-odbc.patch php-5.2.4-tests-dashn.patch 
Removed Files:
	php-4.3.1-odbc.patch php-5.0.0-easter.patch 
	php-5.0.4-norpath.patch php-5.0.4-tests-dashn.patch 
	php-5.1.4-gnusrc.patch php-5.2.3-brigade.patch 
	php-5.2.3-embed.patch 
Log Message:
* Sun Sep 16 2007 Joe Orton <jorton at redhat.com> 5.2.4-2
- update to 5.2.4


php-5.2.4-easter.patch:

--- NEW FILE php-5.2.4-easter.patch ---
--- php-5.2.4/main/logos.h.easter
+++ php-5.2.4/main/logos.h
@@ -491,386 +491,3 @@ static const unsigned char php_logo[] = 
 	102,  63, 251, 220, 139,  16,  65,  26,  16, 112, 
 	 21, 116, 187, 251, 221, 240, 142, 119, 188,   3, 
 	  1,   0,  59,   0 };
-
-static const unsigned char php_egg_logo[] = {
-	 71,  73,  70,  56,  57,  97, 120,   0,  67,   0, 
-	247,   0,   0,   0, 255,   0, 107, 114, 178,   0, 
-	  0,   0,  31,  31,  31, 255, 255, 255, 106, 113, 
-	176,  63,  63,  63, 127, 127, 127, 106, 112, 174, 
-	191, 191, 191, 105, 111, 171, 223, 223, 223, 239, 
-	239, 239, 144, 149, 197, 106, 111, 173, 245, 246, 
-	250, 105, 110, 170, 218, 219, 235,  47,  47,  47, 
-	162, 166, 206,  35,  36,  40, 153, 158, 202,  95, 
-	 95,  95, 175, 175, 175,  88,  93, 141, 159, 159, 
-	159, 116, 122, 182, 125, 131, 187, 143, 143, 143, 
-	 38,  38,  41, 104, 108, 167, 171, 175, 211, 105, 
-	109, 168, 102, 102, 153, 104, 108, 165,  45,  46, 
-	 58, 181, 184, 216, 111, 111, 111, 134, 140, 192, 
-	102, 108, 168,  79,  79,  79, 199, 202, 226,  40, 
-	 41,  49,  92,  98, 150,  53,  53,  63, 236, 237, 
-	245, 130, 130, 171, 122, 122, 160, 104, 107, 163, 
-	 50,  51,  67,  45,  45,  52, 207, 207, 207,  69, 
-	 72, 104,  15,  15,  15,  61,  61,  74, 227, 228, 
-	240,  59,  62,  86, 103, 106, 162, 107, 107, 139, 
-	 73,  77, 113, 102, 103, 156,  54,  56,  76,  97, 
-	103, 159, 137, 137, 182,  35,  35,  38, 190, 193, 
-	221, 145, 145, 193, 103, 105, 159,  78,  82, 122, 
-	 76,  76,  95, 147, 148, 200,  92,  92, 117, 105, 
-	105, 156, 103, 105, 160, 150, 150, 202,  64,  67, 
-	 95, 114, 114, 149, 108, 108, 159, 143, 143, 194, 
-	 84,  84, 106, 140, 140, 191, 102, 104, 157,  48, 
-	 48,  61,  27,  29,  42, 114, 114, 165,  83,  88, 
-	132, 153, 153, 204, 121, 126, 186, 127, 127, 178, 
-	208, 210, 230, 149, 149, 200, 146, 146, 197, 141, 
-	143, 197,  55,  55,  67, 144, 145, 199, 133, 133, 
-	184, 124, 124, 175, 110, 115, 171, 130, 133, 191, 
-	 88,  91, 137,  86,  92, 144, 154, 156, 172,  87, 
-	 92, 139,  85,  86, 125, 118, 123, 184, 121, 122, 
-	172, 124, 128, 187,  82,  86, 130,  39,  39,  46, 
-	 99,  99, 128,  69,  69,  85,  97, 101, 153,  75, 
-	 75, 107, 115, 121, 182, 135, 138, 194, 101, 107, 
-	165,  82,  84, 101, 102, 102, 140,  53,  57,  89, 
-	 69,  71, 101, 137, 137, 188, 109, 116, 179, 130, 
-	130, 182,  57,  57,  76,  93,  99, 155, 117, 117, 
-	168,  62,  63,  86,  84,  84, 122,  79,  79, 114, 
-	112, 117, 177,  58,  58,  71, 127, 131, 189, 106, 
-	106, 150,  76,  76, 101, 134, 135, 187,  20,  20, 
-	 31,  66,  71, 111, 125, 129, 182, 172, 173, 180, 
-	 86,  88, 131, 229, 230, 234, 108, 112, 171, 100, 
-	105, 161, 161, 165, 203,  53,  53,  70,  95,  97, 
-	146,  58,  60,  81, 217, 219, 234, 195, 196, 208, 
-	 82,  85, 125, 112, 118, 181,  82,  82, 106, 114, 
-	117, 175, 154, 157, 195, 134, 134, 179, 111, 111, 
-	162,   6,   7,  11, 110, 111, 146,  93,  93, 138, 
-	 77,  79, 116, 115, 119, 179, 103, 108, 161,  60, 
-	 64, 100,  98,  98, 145,  40,  40,  47,  51,  51, 
-	 63,  69,  69,  95,  73,  78, 122, 197, 198, 202, 
-	 54,  54,  58,  13,  14,  22, 108, 114, 174, 149, 
-	152, 184, 101, 108, 167,  88,  88, 130, 106, 108, 
-	162,  86,  91, 141,  84,  84, 116,  86,  86,  90, 
-	129, 131, 186, 132, 135, 181, 160, 163, 183, 211, 
-	212, 224,  91,  91, 123, 109, 109, 117, 104, 104, 
-	135,  86,  86, 115,  90,  92, 108,  81,  83, 122, 
-	103, 106, 130,  70,  70,  99, 121, 126, 170, 139, 
-	139, 186,  73,  74,  94, 109, 109, 148, 139, 140, 
-	189, 135, 138, 162, 176, 179, 199, 115, 115, 115, 
-	106, 106, 144,  59,  63,  98,  67,  69,  96, 241, 
-	241, 241, 102, 105, 149, 120, 120, 162,  68,  68, 
-	 90,  89,  89, 115,  51,  52,  79, 113, 113, 152, 
-	 33,  35,  55, 189, 190, 215,  79,  79, 104, 213, 
-	214, 218,  94,  95, 142, 163, 164, 176,  86,  89, 
-	133, 112, 112, 156,  80,  81, 118,  63,  65,  90, 
-	102, 103, 124, 126, 129, 157,  72,  72,  98, 150, 
-	150, 154,  72,  74, 100, 112, 112, 151, 138, 139, 
-	192, 122, 125, 180,  49,  50,  64,  78,  78, 110, 
-	119, 119, 157, 125, 126, 174,  77,  81, 119, 125, 
-	126, 180,  56,  56,  72, 118, 120, 173,  46,  49, 
-	 77,  92,  96, 132, 188, 189, 197,  65,  65,  81, 
-	165, 168, 200,  49,  51,  66, 143, 147, 194,  80, 
-	 82, 111, 192, 195, 215, 235, 235, 242, 105, 111, 
-	170,  74,  77, 107, 183, 186, 210, 109, 111, 165, 
-	117, 120, 152,  65,  66,  90, 182, 182, 186, 104, 
-	104, 137, 123, 127, 163, 170, 171, 187, 110, 113, 
-	163,  33, 249,   4,   1,   0,   0,   0,   0,  44, 
-	  0,   0,   0,   0, 120,   0,  67,   0,   0,   8, 
-	255,   0,   1,   8,  28,  72, 176, 160, 193, 131, 
-	  8,  19,  42,  92, 200, 176, 161, 195, 135,  16, 
-	 35,  74, 156,  72, 177, 162, 197, 139,  24,  51, 
-	106, 220, 200, 209, 162, 145,  43, 104, 188, 116, 
-	 28,  73, 210, 160,  23, 145,   8, 141,  24,  84, 
-	 50,  40, 128,  75,  17, 122, 228, 112,  65, 200, 
-	 69, 140, 146, 146,  56,  83, 170,   9, 144,   6, 
-	192,  11,  38,  69, 190, 209,  88,  82, 196, 134, 
-	141,   1,  44,   6,  40,  29,  64,  65,  30,  19, 
-	 29,  71, 138, 250, 137, 129, 163, 202, 157, 107, 
-	 99,  48,  96, 128, 246,  67, 200, 139,  23,  66, 
-	 62, 186, 212, 224,  36, 103, 206,  31,  58,  92, 
-	 56,  75, 214,  35, 198, 210, 183, 112, 153, 142, 
-	 88,  58, 231, 207,  11,  67, 113,  86, 172,  56, 
-	 65,  68,  91, 219, 185,  61, 226, 142, 160,  65, 
-	163, 199, 167,  81, 102,  71,   2,  69,  26, 119, 
-	169,  10,  28,  59, 180, 210, 216,  17, 137, 138, 
-	152,  60,   1, 180, 250,  72, 194,   3, 148,  75, 
-	151,   5,  16, 124, 254, 188,  98,   7, 156, 127, 
-	 24, 118, 196,  24, 209,  67, 138,  10,  32,  54, 
-	 92,   0, 224, 162,  50, 241,  68, 175,  79,  58, 
-	188, 165,  16,  99, 201, 142,  49, 145,  68, 143, 
-	254,  12,   1, 134, 112, 151,  30, 120, 136,  24, 
-	206, 252, 115,   1,  15,  10,  70,  43, 200,  17, 
-	125, 133, 190,  14,  29, 112,  84, 194,  99, 251, 
-	161, 144,  35,  50,  88, 232, 255,  30,  32, 136, 
-	 70,  21,  31, 159,  65,  68, 111,  94,  64, 196, 
-	122, 151,   8, 134, 228,  56, 222, 124, 180,   3, 
-	  8, 163, 219, 131,  24,  45,  26,   3, 133,   1, 
-	108,   0, 211,  29,  67,  58, 188, 213, 193,  17, 
-	226,  96, 246,  25,   2, 248, 213, 167,  64, 131, 
-	 38, 144,  16, 128,   7,  73,  68, 247, 203,  61, 
-	100, 212,   7, 154,   2,   5,  72, 231,  65, 135, 
-	205,  33, 176, 199,   0,  50,  44,  51, 224,  65, 
-	 46,  28,  17, 204,  82,  29,  20,   1, 134,  37, 
-	195,  21,   0,  34, 115,   5,  56,   0,  98,   5, 
-	  4,  16, 176, 205,  51, 235,  76,  33,  64,   2, 
-	 11, 112, 163, 161, 141, 252, 121,  64, 223, 112, 
-	 34, 240, 160, 128,  15,  49, 168, 224, 206,  15, 
-	 39,  10, 132, 214, 120,  20, 220,  81, 135,  17, 
-	104, 104, 200, 222, 140,   1,  68, 144, 163,   4, 
-	 40,  24,  80,   2,   7,  12,  92,  96,  71, 125, 
-	 92,   6, 160, 128,   3,  67,  14, 225, 193, 104, 
-	107,  12, 208, 129,  14,  39, 230, 166,  20,   5, 
-	 75, 180, 194,  67,  35,  90, 246, 233, 146,   3, 
-	  4, 160,  34,  64,   6,  18,  28,  48,  64,  13, 
-	  7,  28, 128, 136, 159,   8, 176, 137,  38,  12, 
-	 57, 164, 169, 192,  24,  50,  12,  96, 195,  11, 
-	 98,  92, 129, 210,  72,  66,  60, 241,  22,  14, 
-	 39,  40,  32,  66, 154, 126,  50,   7,  65,  38, 
-	  4,  36,  32, 192, 170, 172,  94,  96,  64, 134, 
-	 26, 202, 255,  72, 234, 103, 211,  57, 202, 220, 
-	 42, 216,  28, 161, 212,   8,  24,   4, 242, 197, 
-	108,  55, 105, 228,  66,  82, 187,  98, 160, 230, 
-	145, 165,  14, 135,  64, 116,  94,  30, 192,  42, 
-	171,  51, 164, 146,  44, 123,  48,  52,  88, 159, 
-	  8,  81, 160, 225, 131, 106,  20,   0,  81, 138, 
-	 61,  43,  88, 178,   5,  70,  46, 216,  57,   0, 
-	 17, 206, 185,  52,  65,   5,  13,  76, 240, 129, 
-	 75,  13, 108,  80, 170, 140,   1, 108, 240, 229, 
-	179, 171,  18,  48, 197, 180,  46, 201,  27,  64, 
-	 60,  31, 126, 166, 193,   6, 241, 194, 151, 196, 
-	126,  11, 230,  64,  68,  96,   3, 224,  64, 142, 
-	 38,  22, 233,  48,  94, 195,  39,  12,  23,  68, 
-	142,  24,  63, 144, 241,   3,  17, 100,  65, 194, 
-	186, 239,  54, 215,  64, 170, 248,  10,  32, 193, 
-	 12, 103,  38, 107, 130, 151,  26,  19, 112,  67, 
-	203,  45, 231, 248,  64,  11, 244,  68, 160, 193, 
-	103,  30,  32,  28, 128,  15, 107, 248,  81,  41, 
-	 11, 109,  12, 163,   6,  26, 181,  49,  36,  68, 
-	 17,  75,  45,  81,  49, 115,  24,  99,  60, 131, 
-	 53, 138,  36, 144, 128, 151,  77,  19, 208, 194, 
-	  4,  19, 220, 252, 153, 151,  18, 148,  92, 194, 
-	 12, 167,  36, 187,  65, 204,  78,  75, 157, 192, 
-	 62, 101, 164, 173,   8,   3,  26, 183, 240,  64, 
-	 10, 180, 164,  25,   5,  18, 122, 180, 161,  27, 
-	  5,  59,   4,  16,  70,  89,  11,  13, 255, 187, 
-	 20, 186, 245, 229,  24, 230,   0,  37,  11, 112, 
-	200,  20, 116, 224, 114,   0, 153,  24, 167, 208, 
-	 64,   0,  56, 102,  80, 248,   0,  12,  80,  18, 
-	  1,  49, 249, 188,  67,  66,  10,  17, 180, 144, 
-	227,  13,  89,  76,   0,  57,   1,  12,  36, 144, 
-	193,   1,   6, 212,  80, 248, 179,   6,  44, 128, 
-	113,  11, 143, 127,  38,   2,  22,  86, 200,  81, 
-	 15,  13,  74, 173,  17,  69,  31, 125, 143, 183, 
-	  3, 224,  34,  19, 176, 192, 234, 171, 215, 144, 
-	193,   2, 174,  63,  80, 193,   4,   4, 200, 178, 
-	186,   1,  82,  51,  48,  67, 244,  57,  74, 125, 
-	 64,   2,  86, 147,  64, 128, 179, 196, 175, 110, 
-	193,   1,  12,  48, 208, 130, 115,  81, 224,  19, 
-	199, 103,  59,  12, 160, 130,  35, 220,  37,  36, 
-	 68, 165,  20,  24, 171,  37, 243, 220, 119,  63, 
-	 57,  10,   4,   4, 113, 177,   5, 246, 219, 127, 
-	 64, 142,  11,  80,  93, 255, 188,  71,   0, 151, 
-	 64,  32,  10,  58, 251,  12,  96,  54, 161,  16, 
-	 55, 168, 111, 105,  90, 202, 130, 170,   6, 184, 
-	186,  11,  20, 227,   3,   4,  48,   0,   5, 137, 
-	231,  58,  13, 110, 176, 100,  23,  56,   0,  44, 
-	146,  48, 170, 230, 156,  64,   5,   3,   0,  68, 
-	 66, 152, 160, 148, 188, 245, 201,  94, 245, 251, 
-	224, 170,  36,  80,   2,   1, 148, 129,   0, 116, 
-	144,  33, 190, 106, 224,  58,  29, 226, 235,   0, 
-	 22,  56,   4, 178, 255, 136, 195,  11,  10, 140, 
-	 32,  33, 149, 194,  65, 169,  82, 176, 189, 146, 
-	 89,  32,  71,  28, 176,  31,  13,  19,  69, 128, 
-	 93, 248, 144,  85,   6, 200, 209, 234,  74, 144, 
-	168,  68,  89,  64,   2, 252,  43, 220,  12,   4, 
-	176,  40, 230,  32,   0,  58,  39,   8, 204,  49, 
-	 14, 210, 137,   7, 150, 170,   2,  15, 136, 161, 
-	  0,   6, 208, 180,   4, 132, 201,   2,   9, 224, 
-	 64,   6,   8, 199,  42, 227,  93,   0, 135, 221, 
-	 59,  64,   6, 164,  70, 168, 194, 145, 169, 112, 
-	 25, 168,  26, 198,  22, 144,   0,  62, 178, 202, 
-	  2,   6,  80, 133, 169, 172, 181, 130,   1,  72, 
-	161,  32,  74,  80, 131,  91,  98,   0, 154,  62, 
-	153,  32, 142,  37,  91,  64,   4, 194,  64,  53, 
-	140, 205, 131,  17,  12, 112, 164,   0, 178, 168, 
-	175, 213, 161, 192, 117, 110, 187,   1,   1,  46, 
-	 80,  50, 202, 209,  50, 148,   4, 200,  68,   5, 
-	150,  87, 129,  15,  76, 128,  21,  11, 136, 226, 
-	179,   6, 160,  42,  62,  56, 135,  67, 206, 201, 
-	193,   0, 186,  64,  16,  35, 196, 161,  10,  74, 
-	 89, 129,   3, 134,  56,  28,  38, 170,  50,  95, 
-	 65,   8, 128,   6,  76, 128, 181, 130, 137, 130, 
-	  3, 194, 100,  85,  15,  87, 103, 181,  10, 184, 
-	  4,  71,  97, 124,  22,   7,   8, 208, 181,  80, 
-	222, 160,  57, 124,  64, 193,  45, 159, 149,   1, 
-	  3, 172, 225,  79, 244,  81,  64,   8,  66, 208, 
-	255, 133,   1,  64,  73,  32,  87,   8,  64,  96, 
-	128,   0, 130,  89,  13,   7,  71,  99, 220,  33, 
-	  1,  98, 215,  28,  78,  44,  64, 149, 210,  91, 
-	157,   4,   8,  16, 178,   0,  92, 236, 154,   2, 
-	 32,  29,  57, 179, 201,  28, 100, 160,  32, 156, 
-	172, 170, 167,  29, 232,  21, 163,  38,  64, 193, 
-	  5,   3, 160, 147,  64,  90, 178, 201, 100, 121, 
-	169, 134, 248, 202, 162,   9, 234, 195, 135,  31, 
-	 61,  11, 127, 146,  43,  92,   9,  22, 250, 153, 
-	 27,  48, 160, 112,  36, 171,  37,   1, 180, 198, 
-	 31,  81, 212,  96, 158, 226, 148,   0, 172, 154, 
-	 19, 130,  45, 164, 161,  20,  69,  32, 136,  58, 
-	148, 178,   4, 246,  12, 199,  94, 236,  44,  89, 
-	 13, 120, 122, 213,   6, 244, 194,   0,  72, 237, 
-	 96,   5,   9,  48,  83, 151,   4, 149, 117, 194, 
-	 43,  92,  22, 253,  37, 176,  10, 212, 194,   2, 
-	 72,  21, 128,   5, 102,  16, 141, 250, 196, 103, 
-	  8, 129,  56, 129, 250, 248,   6,   0,  77,  40, 
-	165,  10, 195, 153,  38, 115,  48,  56, 188, 146, 
-	101,  81,  66,   7, 157, 101,   9,  60,  40,   0, 
-	252,  77, 176, 112,  12,  40, 224, 103,  64,  25, 
-	 83,  45, 150, 108, 162,  12,  29, 139, 240,  12, 
-	208, 206,  86, 149,  96, 169, 163, 241,   0,   2, 
-	 93, 162, 215,   1,  80,  97,  32,  47,  80, 138, 
-	 25,  62, 115, 159,  52, 117,  72, 150,  32, 197, 
-	 34,   1, 204,  57, 154,  13, 255, 120,  41, 174, 
-	255, 235, 172,  66,  37, 235, 146,   7, 164,  83, 
-	182,   4,  80, 235, 108, 135,  35, 203, 194, 226, 
-	139,   1, 251,  82,  22,   9, 103,  84,   0, 165, 
-	212,   1, 181,  74, 169, 134, 140, 220, 147,  31, 
-	 71, 105, 224,  94, 134, 165, 104,  53,   9, 224, 
-	141, 146,  97, 143, 120,  89, 140, 192, 104,  50, 
-	232,  53, 203,  86, 150, 182, 218, 212,  94,  59, 
-	 10, 247,  63, 118,  12, 199,   3, 243,  25,  13, 
-	  4,  66, 160,  20,  38,  64, 119,   0,  80, 248, 
-	  2,  12, 152, 171, 128, 227, 140, 236, 167, 133, 
-	123,  98,  10,  76, 240,   1,  13,  84,  64, 150, 
-	182, 224,   4, 190, 240,  23, 220,  45,  18,  64, 
-	188, 240, 106,  48, 190, 254, 104, 220, 103, 253, 
-	239,   3,  38, 104,  64,   3,  60, 247,   0,  31, 
-	225, 139, 114, 148, 200,  15, 117, 237,  51, 132, 
-	 38, 116, 129,   5,   4,  73, 237,   0, 172,  32, 
-	  6, 249,  38,  48,   0, 218, 203, 169, 119, 101, 
-	214,  52,  70, 232, 118,  85, 137, 148, 240, 140, 
-	 57,  26, 128, 145,   1, 117, 150, 144, 205, 145, 
-	231, 114, 196,   0, 198, 222, 148,   1, 161, 160, 
-	149, 181,  98, 244,   5,  22, 216, 128,  32, 186, 
-	 90, 113,  64, 213, 100,  28, 230, 104,  79, 142, 
-	143,  44,  93,   6,  46, 144,  72,   6, 220, 120, 
-	 85, 216, 211,  49, 190, 114,  84,  81,  31,  87, 
-	182, 137, 184,   4,  18,   7,  92, 247,  91, 122, 
-	166,   0, 255,  52,  68, 178, 171,  47,   6, 240, 
-	  4,  40,  15, 192,  13,  86,  80,  66,  24,  96, 
-	240, 166, 230, 104, 175, 205, 196, 147, 128,   0, 
-	241, 181, 211,  28,  97, 116, 149,  57,  42, 107, 
-	  0, 152,  87, 178, 117, 146, 183, 150,  95,  22, 
-	174, 232,  72, 234,  32,  30, 176,  97,   0,  71, 
-	 32,  72,  27, 148, 226,   2,  43, 204, 194, 160, 
-	 48, 126, 244,  21,  89,  41,  56, 246,  90, 109, 
-	 52, 102, 126, 150, 235, 196, 172,  67, 215,  17, 
-	245,  81,  33, 128, 131,  82,  84,  42,  16,  21, 
-	243,  99, 202,  26, 194, 145, 145, 101,  72, 185, 
-	252, 229,   8, 203,  63,  34,   0,  98,  63,  35, 
-	102,  58, 158, 213, 135,  59, 125, 179, 150,  20, 
-	192, 131,  16, 128,  33,  23,  36,  42, 200,  15, 
-	148,   2,  60,  13, 141, 108, 215,   3,  52, 192, 
-	245,   8, 240, 128, 172, 253, 250, 199, 108,  53, 
-	235, 153, 129,  77, 193, 137,  62,  32, 220, 102, 
-	228,   1,  18,  78,  90,  41,  55,  96,  82,  41, 
-	 52, 232, 100, 125, 236, 133, 109,  11, 112, 160, 
-	139, 248,  30, 228, 235,  10, 108,  86,   2,   0, 
-	 58, 139, 239,  28, 141,   9,  26,  60,   0,  49, 
-	133,  25,   5,  37,  67, 193,   1,  34, 221, 199, 
-	255, 221, 224, 213,  14, 130, 130,  21, 142,  50, 
-	  0, 217,  16,  36,  20,  74, 193,   1,   2, 168, 
-	169, 174, 172, 170,  83, 145,  85, 123, 155, 162, 
-	251, 205, 129, 107, 174, 179, 162,  17, 255,   6, 
-	185, 199,  89,  85, 104, 225, 113,  96, 112, 171, 
-	 50, 128,   5,  50,  16,  89, 101, 251,   9,   2, 
-	 77, 120, 129, 110,  80,  92, 144,  60,  40, 133, 
-	 20, 160, 118, 137, 151,  74, 150, 163, 126, 132, 
-	 97, 166,  19, 120,  68,  34, 208,  61, 156, 166, 
-	205, 224, 229,   6, 104,  29, 111,  71,  67, 130, 
-	  8, 164, 128,   4,  13, 208, 192, 134,   1, 252, 
-	172, 200, 222, 192,  31, 212,  80,  57, 183, 179, 
-	 86,  42,  16, 132, 160,   9,  72,  43, 130,  16, 
-	 12, 194,   5,  72,  68, 179,  79,  17, 120, 236, 
-	170, 182, 202,  85,   6,   5, 221,  37,   4, 214, 
-	192,   7, 200,  38, 236, 100,  61,  64, 238, 249, 
-	226, 170, 134, 179,  16, 129,  32, 124, 128,   4, 
-	 31, 168,   0, 196,  53,   4, 131,  16, 108,   2, 
-	 28,  74, 249, 167,  65, 152, 145, 241, 252,  28, 
-	105,  18, 128, 103, 165,   9,  10, 160,  30, 126, 
-	225, 253,   6,  17,  32,  48, 122, 251,  52,  50, 
-	152,  62,  43,  71, 139, 247, 188,  75, 134, 224, 
-	108,  38,  36, 229, 201,   9, 241, 212, 185,   2, 
-	 80,  35,  46,  41,   0,   6, 152, 175, 108,  11, 
-	 64, 208, 103, 213, 251,  62,   0, 214,  36, 122, 
-	 22, 126, 207,  28,  71, 196, 130,  88,  44,  88, 
-	123,  66,  92,  80, 169,   1, 220,  97,  14, 252, 
-	201,   1, 126, 254,  94,  89, 105, 216, 138, 248, 
-	252, 178, 151, 140,  79, 111, 115, 236, 175,  96, 
-	 46,  74, 177, 129, 255, 242,  21, 242, 131, 241, 
-	196,  96,   7,  39,  40,   0,  12, 246, 171,  77, 
-	 32, 163,  85, 116,  67, 194, 126, 125, 152, 136, 
-	237, 140,  14, 219, 247,  39, 160,   1,   5, 254, 
-	 35, 167,  54,  60, 228,  12, 252, 199,  20, 158, 
-	176,  28,  17, 102, 122,  49,  71,   0,  76, 247, 
-	 39, 215,  39, 127, 163,  17,   1,  92, 119,  83, 
-	  4,   0, 127, 190, 167, 127,  75, 193,   2,  76, 
-	 32, 121,  12, 225,   5,  59,   3, 126,  74, 161, 
-	  2,  61,  96,  44,  21, 144,  74, 171,  50,   0, 
-	112,  21,  89,  35,   7,  31,  16, 192,  37, 148, 
-	 38, 127, 204, 179,   0,  23, 176,   0, 211, 115, 
-	 58, 216, 147, 128, 125, 178,   2,  40, 180,  20, 
-	 50,  64, 107,  16, 161,   6,  10, 240,   6, 128, 
-	 32,   5, 112, 161,   2,  15,  48,   3, 139,  51, 
-	  3, 220,  22,   1, 133,  23,  35, 157, 231,  28, 
-	113,  22,  34, 170, 215,  46, 136,  87,   1, 143, 
-	192,  57,  17,  32, 129, 201,  98, 131,  75,   1, 
-	  4, 133, 208,   9,  22,  65,   5,  72, 128,   5, 
-	 90, 240,   2, 196, 162,  20, 198, 160,  12,   4, 
-	 16,  58,  52, 232,   1, 189, 231,  18, 107, 162, 
-	 33, 141, 130, 125,  10, 240,  30, 158, 151, 127, 
-	 55,   8,   4, 166,  96,  14,  35, 225,   2, 151, 
-	 64,  10, 111,  49,  24,  85,  96,   6,  24, 176, 
-	  2, 180,  82, 101,  74, 230, 134, 200, 244, 123, 
-	  8,  32,   2,  11,  56,  45,  62,   0, 126,  64, 
-	255,   0,   8,  96, 160,   5,  56, 145,   6, 127, 
-	 80,   8,  19,   3,  23,  49, 240,   9, 139, 160, 
-	 21, 198, 114,  70, 139,   8,  26,  75, 104,  87, 
-	 28, 215,  30, 107,  56,  47,  13, 178,   2, 252, 
-	183,   7, 132,  48,  46, 182, 225,   2,  20, 215, 
-	 24, 187, 225,   7, 130, 216,  28, 188, 167,  37, 
-	111, 168,  33,  32, 144,   4, 159, 168,  37,  32, 
-	192,   3,  67, 112,   2,  56, 192, 127, 205,   0, 
-	  5,  81,   2,   0, 104,  81,   4,  93,  32,   5, 
-	 50, 176,   7, 240,   0, 139,  31,  40,  29,  57, 
-	176, 139, 180, 215, 134,  14,  50,   4,   4,  56, 
-	 45,  10, 192, 122, 174,   0,   9, 252, 151,  14, 
-	194,  80, 140,   5, 177,   5,  84, 208,   7,  80, 
-	 32,   7,   1, 240,   6, 103, 144,  13,  56, 192, 
-	129,   3,  48,   2,  68,  48,   7, 124, 166,  37, 
-	 16, 240,  98, 249, 145,   3,  81, 112, 125,  43, 
-	 48,   6,  39, 128,  30,  39,  96,   6, 128,  40, 
-	 63,   5, 144,   3, 163,   0,   7, 151, 166,  20, 
-	 82,  64,   8, 146,   8, 142,   9, 129,   5,  33, 
-	128,   4, 232,  64,  90,  68, 192, 129,  64,  32, 
-	  9,  26, 114, 123,  28,  39,   2,  33, 144,   4, 
-	 46,  65,   4,  85,  16, 140,  76, 225,  22, 176, 
-	 40,   3,  64, 240,  22, 130, 112,   9, 124, 165, 
-	144,   9, 193, 138, 225, 160,  51, 139,  80, 144, 
-	187, 178,   4, 242, 227,   3,   8,  80,  45, 204, 
-	 33,  63,  16, 208, 108, 103, 190,  48,  14,  20, 
-	160,   2,  32,   9, 139,  62, 249,   4,  24, 136, 
-	146,  14,  97,   8, 129,   0,   1,  67, 192,   3, 
-	  5, 128,  59,  65, 200,  20,  75, 176,   4,  52, 
-	192, 142, 112,   1,   4, 205,  23, 132,  43,  80, 
-	  9, 158,  16,   2, 124, 114, 142, 103, 240,   7, 
-	221, 160,   3,  58, 192,   4,  47,  32, 148,  21, 
-	225,   4,  72, 128,   4, 152, 224,  18,  62,  32, 
-	  9,   1, 232, 147,  62, 217,   1,  70,  49,  13, 
-	186,  80,  14, 137, 160,   0,  73, 112, 118,  95, 
-	160,   4, 152, 144,   3,  13, 137,   5,  98, 201, 
-	 17,  70,   0,  10,  55,  25,   2,   8, 224,   3, 
-	231,  32,   5,  82, 208,   5,  50, 208,   1, 196, 
-	  2,   4, 130,  96,   3,  71, 224,   6, 183,  80, 
-	  7,  47,  96, 113,   7,   1,   6,  84,   0, 134, 
-	  2, 225,   4, 125, 144,   6,   9, 217, 151,  27, 
-	225,   4,  77, 208,   4, 119, 249,  10,  13, 169, 
-	  7,   4, 129,   5,  84, 208,  62, 158, 185, 154, 
-	  8, 177,   5,  80, 208, 153, 172,  25, 155, 178, 
-	 57, 155, 180,  41, 148,   1,   1,   0,  59,   0 };
--- php-5.2.4/main/php_logos.c.easter
+++ php-5.2.4/main/php_logos.c
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
 		return FAILURE;
 
 	php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
-	php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
 	php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
 
 	return SUCCESS;
--- php-5.2.4/ext/standard/info.c.easter
+++ php-5.2.4/ext/standard/info.c
@@ -1058,21 +1058,7 @@ PHP_FUNCTION(phpcredits)
  */
 PHPAPI char *php_logo_guid(void)
 {
-	char *logo_guid;
-
-	time_t the_time;
-	struct tm *ta, tmbuf;
-
-	the_time = time(NULL);
-	ta = php_localtime_r(&the_time, &tmbuf);
-
-	if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
-		logo_guid = PHP_EGG_LOGO_GUID;
-	} else {
-		logo_guid = PHP_LOGO_GUID;
-	}
-
-	return estrdup(logo_guid);
+	return estrdup(PHP_LOGO_GUID);
 
 }
 /* }}} */
@@ -1103,18 +1089,6 @@ PHP_FUNCTION(php_real_logo_guid)
 }
 /* }}} */
 
-/* {{{ proto string php_egg_logo_guid(void)
-   Return the special ID used to request the PHP logo in phpinfo screens*/
-PHP_FUNCTION(php_egg_logo_guid)
-{
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
-	}
-
-	RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
-}
-/* }}} */
-
 /* {{{ proto string zend_logo_guid(void)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
--- php-5.2.4/ext/standard/info.h.easter
+++ php-5.2.4/ext/standard/info.h
@@ -51,7 +51,6 @@
 #endif /* HAVE_CREDITS_DEFS */
 
 #define PHP_LOGO_GUID		  "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
-#define PHP_EGG_LOGO_GUID	"PHPE9568F36-D428-11d2-A769-00AA001ACF42"
 #define ZEND_LOGO_GUID		"PHPE9568F35-D428-11d2-A769-00AA001ACF42"
 #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
 
@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
 PHP_FUNCTION(php_logo_guid);
 PHP_FUNCTION(php_real_logo_guid);
 PHP_FUNCTION(zend_logo_guid);
-PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
--- php-5.2.4/ext/standard/basic_functions.c.easter
+++ php-5.2.4/ext/standard/basic_functions.c
@@ -1753,10 +1753,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_real_log
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
-ZEND_END_ARG_INFO()
-
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
@@ -3135,7 +3131,6 @@ zend_function_entry basic_functions[] = 
 	PHP_FE(phpcredits,														arginfo_phpcredits)
 	PHP_FE(php_logo_guid,													arginfo_php_logo_guid)
 	PHP_FE(php_real_logo_guid,												arginfo_php_real_logo_guid)
-	PHP_FE(php_egg_logo_guid,												arginfo_php_egg_logo_guid)
 	PHP_FE(zend_logo_guid,													arginfo_zend_logo_guid)
 	PHP_FE(php_sapi_name,													arginfo_php_sapi_name)
 	PHP_FE(php_uname,														arginfo_php_uname)

php-5.2.4-embed.patch:

--- NEW FILE php-5.2.4-embed.patch ---
--- php-5.2.4/sapi/embed/config.m4.embed
+++ php-5.2.4/sapi/embed/config.m4
@@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
     yes|shared)
       PHP_EMBED_TYPE=shared
-      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
+      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(INSTALL) -m 0755 libs/libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir); \$(LN_S) libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir)/libphp$(PHP_MAJOR_VERSION).$SHLIB_DL_SUFFIX_NAME"
       ;;
     static)
       PHP_EMBED_TYPE=static
--- php-5.2.4/Makefile.global.embed
+++ php-5.2.4/Makefile.global
@@ -14,7 +14,7 @@ all: $(all_targets) 
 build-modules: $(PHP_MODULES)
 
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -release $(PHP_VERSION) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 
 libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -25,13 +25,9 @@ install: $(all_targets) $(install_target
 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
-		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
-				break; \
-			fi; \
-		done; \
+	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME) -a \
+		-r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+		$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
 	fi
 	@$(INSTALL_IT)
 

php-5.2.4-gnusrc.patch:

--- NEW FILE php-5.2.4-gnusrc.patch ---
--- php-5.2.4/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.4/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
--- php-5.2.4/main/streams/streams.c.gnusrc
+++ php-5.2.4/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/cast.c.gnusrc
+++ php-5.2.4/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/memory.c.gnusrc
+++ php-5.2.4/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.4/main/php.h.gnusrc
+++ php-5.2.4/main/php.h
@@ -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"
--- php-5.2.4/ext/standard/file.c.gnusrc
+++ php-5.2.4/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- php-5.2.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- php-5.2.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.4 2007/05/08 12:08:17 dmitry Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.h"
--- php-5.2.4/ext/interbase/interbase.c.gnusrc
+++ php-5.2.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- php-5.2.4/configure.in.gnusrc
+++ php-5.2.4/configure.in
@@ -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 -------------------------------------------------------------------------
 

php-5.2.4-norpath.patch:

--- NEW FILE php-5.2.4-norpath.patch ---
--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/acinclude.m4
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
 dnl internal, don't use
 AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
   PHP_RUN_ONCE(LIBPATH, $1, [
+    test "x$PHP_RPATH" != "xno" &&
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
     LDFLAGS="$LDFLAGS -L$1"
     PHP_RPATHS="$PHP_RPATHS $1"
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
     ],[
       if test "$ext_shared" = "yes"; then
         $2="-L$ai_p [$]$2"
+        test "x$PHP_RPATH" != "xno" && \
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
       else
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])

php-5.2.4-odbc.patch:

--- NEW FILE php-5.2.4-odbc.patch ---
--- php-5.2.4/ext/odbc/config.m4.odbc
+++ php-5.2.4/ext/odbc/config.m4
@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,,
     PHP_ODBC_CHECK_HEADER(sqlext.h)
     AC_DEFINE(HAVE_UNIXODBC,1,[ ])
     AC_MSG_RESULT([$ext_output])
+    ODBC_SHARED_LIBADD="-lodbc -lodbcpsql"
+    PHP_SUBST(ODBC_SHARED_LIBADD)
   fi
 fi
 

php-5.2.4-tests-dashn.patch:

--- NEW FILE php-5.2.4-tests-dashn.patch ---
--- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
 $out = array();
 $status = -1;
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
 } else {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
 }
 print_r($out);
 ?>
--- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
 	die("no php executable defined");
 } 
 $proc = proc_open(
-	$php,
+	$php . " -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
 	$pipes
 );
--- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($php . ' -r \'' 
+	exec($php . ' -n -r \'' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
 	     . '  print "\n";'
 	     . '}\'', $out, $status);
 } else {
-	exec($php . ' -r "' 
+	exec($php . ' -n -r "' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
--- php-5.2.4/Makefile.global.tests-dashn
+++ php-5.2.4/Makefile.global
@@ -63,7 +63,7 @@ install-headers:
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	8 Jun 2007 15:15:07 -0000	1.31
+++ .cvsignore	16 Sep 2007 10:14:01 -0000	1.32
@@ -1,2 +1,3 @@
 php-5.2.3
 clog
+php-5.2.4.tar.gz


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- php.spec	2 Sep 2007 14:05:18 -0000	1.147
+++ php.spec	16 Sep 2007 10:14:01 -0000	1.148
@@ -5,8 +5,8 @@
 
 Summary: The PHP HTML-embedded scripting language
 Name: php
-Version: 5.2.3
-Release: 9
+Version: 5.2.4
+Release: 2
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -16,25 +16,25 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.1.4-gnusrc.patch
+Patch1: php-5.2.4-gnusrc.patch
 Patch2: php-4.3.3-install.patch
-Patch3: php-5.0.4-norpath.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.3-embed.patch
+Patch9: php-5.2.4-embed.patch
 
 # Fixes for extension modules
-Patch21: php-4.3.1-odbc.patch
+Patch21: php-5.2.4-odbc.patch
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.2.2-pdosym.patch
 Patch24: php-5.2.3-macropen.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.0.0-easter.patch
+Patch31: php-5.2.4-easter.patch
 
 # Fixes for tests
-Patch50: php-5.0.4-tests-dashn.patch
+Patch50: php-5.2.4-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -716,6 +716,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Sun Sep 16 2007 Joe Orton <jorton at redhat.com> 5.2.4-2
+- update to 5.2.4
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
 - rebuild for fixed APR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	8 Jun 2007 15:15:07 -0000	1.33
+++ sources	16 Sep 2007 10:14:01 -0000	1.34
@@ -1 +1 @@
-df79b04d63fc4c1ccb6d8ea58a9cf3ac  php-5.2.3.tar.gz
+0826e231c3148b29fd039d7a8c893ad3  php-5.2.4.tar.gz


--- php-4.3.1-odbc.patch DELETED ---


--- php-5.0.0-easter.patch DELETED ---


--- php-5.0.4-norpath.patch DELETED ---


--- php-5.0.4-tests-dashn.patch DELETED ---


--- php-5.1.4-gnusrc.patch DELETED ---


--- php-5.2.3-brigade.patch DELETED ---


--- php-5.2.3-embed.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 10:38:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 06:38:23 -0400
Subject: rpms/blobwars/devel blobwars.spec,1.5,1.6
Message-ID: <200709161038.l8GAcNp6019232@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobwars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19214

Modified Files:
	blobwars.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
- New upstream version 1.07 (bz 292391)



Index: blobwars.spec
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blobwars.spec	16 Sep 2007 09:56:43 -0000	1.5
+++ blobwars.spec	16 Sep 2007 10:37:48 -0000	1.6
@@ -12,7 +12,7 @@
 Patch2:         blobwars-1.07-es.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  gettext desktop-file-utils
 Requires:       hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 16 10:40:28 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 06:40:28 -0400
Subject: rpms/bochs/devel .cvsignore, 1.9, 1.10 bochs-config.patch, 1.2,
	1.3 bochs.spec, 1.26, 1.27 sources, 1.9,
	1.10 bochs-CVE-2007-2893.patch, 1.1,
	NONE bochs-CVE-2007-2894.patch, 1.1, NONE
Message-ID: <200709161040.l8GAeS8x019325@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19285

Modified Files:
	.cvsignore bochs-config.patch bochs.spec sources 
Removed Files:
	bochs-CVE-2007-2893.patch bochs-CVE-2007-2894.patch 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
- New upstream release 2.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2006 11:33:41 -0000	1.9
+++ .cvsignore	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-bochs-2.3.tar.gz
+bochs-2.3.5.tar.gz
 dlxlinux4.tar.gz

bochs-config.patch:

Index: bochs-config.patch
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bochs-config.patch	28 May 2005 15:36:35 -0000	1.2
+++ bochs-config.patch	16 Sep 2007 10:39:55 -0000	1.3
@@ -1,5 +1,14 @@
 --- dlxlinux/bochsrc.txt~	2005-03-27 16:29:54.000000000 +0300
 +++ dlxlinux/bochsrc.txt	2005-05-28 17:51:14.000000000 +0300
+@@ -6,7 +6,7 @@
+ megs: 32
+ 
+ # filename of ROM images
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
++romimage: file=$BXSHARE/BIOS-bochs-legacy, address=0xf0000
+ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
+ 
+ # what disk images will be used 
 @@ -27,3 +27,4 @@
  #display_library: x
 -# other choices: win32 sdl wx carbon amigaos beos macintosh nogui rfb term svga


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bochs.spec	22 Aug 2007 07:48:53 -0000	1.26
+++ bochs.spec	16 Sep 2007 10:39:55 -0000	1.27
@@ -1,30 +1,26 @@
 Name:           bochs
-Version:        2.3
-Release:        7%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-wx28.patch
-Patch3:         %{name}-CVE-2007-2893.patch
-Patch4:         %{name}-CVE-2007-2894.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  SDL-devel
+BuildRequires:  readline-devel
 #BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
-%if %{with debugger}
-BuildRequires:  readline-devel
-%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -68,8 +64,6 @@
 %setup -q
 %patch0 -p0 -z .nonet
 %patch2 -p1 -z .wx28
-%patch3 -p1 -z .cve-2007-2893
-%patch4 -p1 -z .cve-2007-2894
 cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
@@ -78,6 +72,9 @@
   doc/man/*.*
 # remove executable bits from sources to make rpmlint happy with the debuginfo
 chmod -x `find -name '*.cc' -o -name '*.h' -o -name '*.inc'`
+# Fix CHANGES encoding
+iconv -f ISO_8859-2 -t UTF8 CHANGES > CHANGES.tmp
+mv CHANGES.tmp CHANGES
 
 
 %build
@@ -168,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
+- New upstream release 2.3.5
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-7
 - Fix CVE-2007-2894 (really fix bz 241799)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2006 11:33:41 -0000	1.9
+++ sources	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-100c02fbcd402c2b4862d0251be539fd  bochs-2.3.tar.gz
+2d9b2c1e17b4eba2d46b208be09df4a9  bochs-2.3.5.tar.gz
 379269841ae5aef95e4ec56d6d186532  dlxlinux4.tar.gz


--- bochs-CVE-2007-2893.patch DELETED ---


--- bochs-CVE-2007-2894.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 13:58:52 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 16 Sep 2007 09:58:52 -0400
Subject: rpms/ekg2/devel filter-provides.sh,NONE,1.1 ekg2.spec,1.2,1.3
Message-ID: <200709161358.l8GDwqaU007286@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7259

Modified Files:
	ekg2.spec 
Added Files:
	filter-provides.sh 
Log Message:
- filter bad Provides: (fixes bug 278181)



--- NEW FILE filter-provides.sh ---
#!/bin/sh

if [ -x /usr/lib/rpm/redhat/find-provides ]; then
   FINDPROV=/usr/lib/rpm/redhat/find-provides
else
   FINDPROV=/usr/lib/rpm/find-provides
fi

$FINDPROV $* | sed -e '/(python|perl|ncurses|gsm|gpg|xosd)(\(\)\(64bit\))?/d'


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ekg2.spec	28 Aug 2007 21:39:51 -0000	1.2
+++ ekg2.spec	16 Sep 2007 13:58:20 -0000	1.3
@@ -5,10 +5,13 @@
 Summary(pl):	Wieloprotoko??owy komunikator internetowy
 Name:		ekg2
 Version:	0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}.tar.gz
+Source99:	filter-provides.sh
+%define		_use_internal_dependency_generator 0
+%define		__find_provides %{SOURCE99}
 Patch1:		%{name}-rpm.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
@@ -346,6 +349,9 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
 
 %changelog
+* Sun Sep 16 2007 Dominik Mierzejewski <rpm at greysector.net> 0.1-2
+- filter bad Provides: (fixes bug 278181)
+
 * Tue Aug 28 2007 Dominik Mierzejewski <rpm at greysector.net> 0.1-1
 - switch to released version
 - update license tag



From fedora-extras-commits at redhat.com  Sun Sep 16 15:14:21 2007
From: fedora-extras-commits at redhat.com (Igor Pires Soares (igor))
Date: Sun, 16 Sep 2007 11:14:21 -0400
Subject: comps/po pt_BR.po,1.5,1.6
Message-ID: <200709161514.l8GFELJA020747@cvs-int.fedora.redhat.com>

Author: igor

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726

Modified Files:
	pt_BR.po 
Log Message:
Revision



Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pt_BR.po	14 Sep 2007 14:39:10 -0000	1.5
+++ pt_BR.po	16 Sep 2007 15:13:51 -0000	1.6
@@ -16,7 +16,7 @@
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-09-09 00:04-0300\n"
+"PO-Revision-Date: 2007-09-16 12:11-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"
@@ -324,7 +324,7 @@
 #: ../comps-el4.xml.in.h:32
 #: ../comps-el5.xml.in.h:32
 msgid "KDE (K Desktop Environment)"
-msgstr "KDE (Ambiente de Trabalho K)"
+msgstr "Ambiente de Trabalho KDE"
 
 #: ../comps-fe5.xml.in.h:36
 #: ../comps-fe6.xml.in.h:35
@@ -419,7 +419,7 @@
 #: ../comps-el4.xml.in.h:43
 #: ../comps-el5.xml.in.h:43
 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 Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
 #: ../comps-fe5.xml.in.h:47
 #: ../comps-fe6.xml.in.h:46
@@ -546,7 +546,7 @@
 #: ../comps-el4.xml.in.h:58
 #: ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "Este grupo inclui clientes gr??ficos de email, Web e chat."
+msgstr "Este grupo inclui clientes gr??ficos de e-mail, Web e chat."
 
 #: ../comps-fe5.xml.in.h:62
 #: ../comps-fe6.xml.in.h:59
@@ -573,7 +573,7 @@
 #: ../comps-el4.xml.in.h:61
 #: ../comps-el5.xml.in.h:59
 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System."
-msgstr "Este grupo inclui clientes de email em modo texto, de Web e de chat. Estas aplica????es n??o necessitam do X Window System."
+msgstr "Este grupo inclui clientes de e-mail em modo texto, de Web e de chat. Estas aplica????es n??o necessitam do X Window System."
 
 #: ../comps-fe5.xml.in.h:65
 #: ../comps-fe6.xml.in.h:62
@@ -813,7 +813,7 @@
 #: ../comps-f7.xml.in.h:25
 #: ../comps-f8.xml.in.h:26
 msgid "Clustering Support"
-msgstr "Suporte a Clusters."
+msgstr "Suporte a Clusters"
 
 #: ../comps-f7.xml.in.h:26
 #: ../comps-f8.xml.in.h:27
@@ -1206,7 +1206,7 @@
 #: ../comps-f7.xml.in.h:146
 #: ../comps-f8.xml.in.h:154
 msgid "These packages allow you to develop applications for the X Window System."
-msgstr "Este pacotes permitem desenvolver aplica????es para o X Window System."
+msgstr "Estes pacotes permitem desenvolver aplica????es para o X Window System."
 
 #: ../comps-f7.xml.in.h:148
 #: ../comps-f8.xml.in.h:156
@@ -1246,7 +1246,7 @@
 #: ../comps-f7.xml.in.h:159
 #: ../comps-f8.xml.in.h:167
 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example."
-msgstr "Este grupo inclui um conjunto m??nimo de pacotes. ??til, por exemplo, para a cria????o de pequenas caixas de roteador/firewall."
+msgstr "Este grupo inclui um conjunto m??nimo de pacotes. ??til, por exemplo, para a cria????o de pequenas caixas de roteadores/firewalls."
 
 #: ../comps-f7.xml.in.h:168
 #: ../comps-f8.xml.in.h:176



From fedora-extras-commits at redhat.com  Sun Sep 16 16:01:09 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Sun, 16 Sep 2007 12:01:09 -0400
Subject: rpms/pv/F-7 pv.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200709161601.l8GG19Bk027116@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21398

Modified Files:
	pv.spec sources 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
- Bump to the latest upstream



Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/F-7/pv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pv.spec	17 Aug 2007 12:28:41 -0000	1.3
+++ pv.spec	16 Sep 2007 16:00:36 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: Artistic (modified)
 Group: Development/Tools
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
+- Bump to the latest upstream
+
 * Mon Aug 13 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.0.1-1
 - Bump to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pv/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 12:28:41 -0000	1.3
+++ sources	16 Sep 2007 16:00:36 -0000	1.4
@@ -1 +1 @@
-f4ca9b3e3f476b8934fc70a97e637361  pv-1.0.1.tar.gz
+1b76116d4cc70b0f12553a94d834d9bb  pv-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 16:45:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:45:57 -0400
Subject: rpms/lesstif/devel lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.16, 1.17
Message-ID: <200709161645.l8GGjvqn030361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30338

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:46:05 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:45:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lesstif.spec	2 Sep 2007 20:46:05 -0000	1.16
+++ lesstif.spec	16 Sep 2007 16:45:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 16:47:53 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:47:53 -0400
Subject: rpms/lesstif/FC-6 lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.10, 1.11
Message-ID: <200709161647.l8GGlrmI030487@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444/FC-6

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:56:37 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:47:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lesstif.spec	2 Sep 2007 20:56:37 -0000	1.10
+++ lesstif.spec	16 Sep 2007 16:47:50 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 16:48:21 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:48:21 -0400
Subject: rpms/lesstif/F-7 lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.12, 1.13
Message-ID: <200709161648.l8GGmLDZ030491@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444/F-7

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:49:12 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:47:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lesstif.spec	2 Sep 2007 20:51:12 -0000	1.12
+++ lesstif.spec	16 Sep 2007 16:47:46 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 17:16:23 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 16 Sep 2007 13:16:23 -0400
Subject: rpms/xfce4-places-plugin/devel xfce4-places-plugin.spec,1.4,1.5
Message-ID: <200709161716.l8GHGNY0004589@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4561

Modified Files:
	xfce4-places-plugin.spec 
Log Message:
* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
- Update to 0.9.992



Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/xfce4-places-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-places-plugin.spec	24 Aug 2007 22:24:06 -0000	1.4
+++ xfce4-places-plugin.spec	16 Sep 2007 17:15:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		xfce4-places-plugin
-Version:	0.9.991
+Version:	0.9.992
 Release:	1%{?dist}
 Summary:	Places menu for the Xfce panel
 
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
+- Update to 0.9.992
+
 * Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.991-1
 - Update to 0.9.991
 - Update license tag



From fedora-extras-commits at redhat.com  Sun Sep 16 17:21:04 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 16 Sep 2007 13:21:04 -0400
Subject: rpms/xfce4-places-plugin/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709161721.l8GHL4Vw004736@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4708

Modified Files:
	.cvsignore sources 
Log Message:
upload new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2007 22:24:06 -0000	1.4
+++ .cvsignore	16 Sep 2007 17:20:31 -0000	1.5
@@ -1 +1 @@
-xfce4-places-plugin-0.9.991.tar.bz2
+xfce4-places-plugin-0.9.992.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Aug 2007 22:24:06 -0000	1.4
+++ sources	16 Sep 2007 17:20:31 -0000	1.5
@@ -1 +1 @@
-e6b4ffb260cc81a8388a32f4302091f4  xfce4-places-plugin-0.9.991.tar.bz2
+83728df00963920310ba21a76359d7cb  xfce4-places-plugin-0.9.992.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 18:25:42 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 16 Sep 2007 14:25:42 -0400
Subject: rpms/farsight/devel .cvsignore, 1.10, 1.11 farsight.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200709161825.l8GIPgHb011820@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11790

Modified Files:
	.cvsignore farsight.spec sources 
Log Message:
* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.25-1
- Update to 0.1.25.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2007 20:06:00 -0000	1.10
+++ .cvsignore	16 Sep 2007 18:25:10 -0000	1.11
@@ -1 +1 @@
-farsight-0.1.24.tar.gz
+farsight-0.1.25.tar.gz


Index: farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- farsight.spec	22 Aug 2007 20:06:00 -0000	1.17
+++ farsight.spec	16 Sep 2007 18:25:10 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		farsight
-Version:	0.1.24
+Version:	0.1.25
 Release:	1%{?dist}
 Summary:	A audio/video conferencing framework
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.25-1
+- Update to 0.1.25.
+
 * Wed Aug 22 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.24-1
 - Update to 0.1.24.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2007 20:06:00 -0000	1.10
+++ sources	16 Sep 2007 18:25:10 -0000	1.11
@@ -1 +1 @@
-95304bf22e9967c68c1c14db5b8914a4  farsight-0.1.24.tar.gz
+3023e5013e612c7debc5763e14c78123  farsight-0.1.25.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:12:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:12:55 -0400
Subject: rpms/crossvc/devel crossvc-1.5.2-nocreate.patch, 1.2, 1.3 .cvsignore,
	1.5, 1.6 crossvc.spec, 1.11, 1.12 sources, 1.5,
	1.6 crossvc-1.5.1-nocreate.patch, 1.3, NONE
Message-ID: <200709161912.l8GJCtQB025157@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25114

Modified Files:
	.cvsignore crossvc.spec sources 
Added Files:
	crossvc-1.5.2-nocreate.patch 
Removed Files:
	crossvc-1.5.1-nocreate.patch 
Log Message:
New upstream release

crossvc-1.5.2-nocreate.patch:

Index: crossvc-1.5.2-nocreate.patch
===================================================================
RCS file: crossvc-1.5.2-nocreate.patch
diff -N crossvc-1.5.2-nocreate.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.2-nocreate.patch	16 Sep 2007 19:12:53 -0000	1.3
@@ -0,0 +1,137 @@
+diff -up CrossVC/src/ImportDialog.ui.nocreate CrossVC/src/ImportDialog.ui
+--- CrossVC/src/ImportDialog.ui.nocreate	2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialog.ui	2007-09-16 20:59:55.000000000 +0200
+@@ -657,17 +657,6 @@ enter the appropriate value or leave thi
+                 <property name="spacing">
+                     <number>2</number>
+                 </property>
+-                <widget class="QCheckBox" row="1" column="0">
+-                    <property name="name">
+-                        <cstring>m_CreateDirs</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Create CVS directories while importing (needs CVSNT)</string>
+-                    </property>
+-                    <property name="whatsThis" stdset="0">
+-                        <string>Activate this option if you want to convert your import folder into a working copy while importing.&lt;br&gt;Please note that this option is only available if &lt;b&gt;CVSNT&lt;/b&gt; is used on both client and server!</string>
+-                    </property>
+-                </widget>
+                 <widget class="QCheckBox" row="0" column="0">
+                     <property name="name">
+                         <cstring>m_KeepFTime</cstring>
+diff -up CrossVC/src/ImportDialogImpl.h.nocreate CrossVC/src/ImportDialogImpl.h
+--- CrossVC/src/ImportDialogImpl.h.nocreate	2006-11-05 11:40:30.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.h	2007-09-16 20:59:55.000000000 +0200
+@@ -129,8 +129,6 @@ class ImportDialogImpl : public ImportDi
+    int mode();
+    int rshMode();
+    bool getKeepFTime();
+-   bool getCreateDirs();
+-
+ 
+  public slots:
+ 
+diff -up CrossVC/src/Import.cpp.nocreate CrossVC/src/Import.cpp
+--- CrossVC/src/Import.cpp.nocreate	2007-09-16 21:06:04.000000000 +0200
++++ CrossVC/src/Import.cpp	2007-09-16 21:08:33.000000000 +0200
+@@ -171,7 +171,6 @@ void Import::acceptCvs() {
+    int rshMode = dlg->rshMode();
+    m_sshAccess = dlg->getSshPreset();
+    bool keepFTime = dlg->getKeepFTime();
+-   m_bCreateCvsDirs = dlg->getCreateDirs();
+    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
+    QStringList binaryWildcards = dlg->getBinaryWildcards();
+ 
+@@ -236,8 +235,6 @@ void Import::acceptCvs() {
+    files += " import ";
+    
+    if (keepFTime) files += "-d ";
+-   if (m_bCreateCvsDirs) files += "-C ";
+-    
+   
+    //ignore files:
+    QString sIgnore = "-I ! ";
+@@ -307,57 +304,6 @@ void Import::afterCall(int cmd, CvsBuffe
+             return;
+          }
+ 
+-         if (m_bCreateCvsDirs) {
+-            //cvs dir is already in workbench?
+-            QString topProjectDir = "";
+-            QString subProjectDir = "";
+-            bool found = false;
+-            DirBase * myChild = NULL;
+-               
+-            QString importDir = m_localDir;
+-            int pos = importDir.length();
+-            do {
+-                  
+-               pos = importDir.findRev("/");
+-               importDir.truncate(pos);
+-                  
+-               if ( (myChild = m_workBench->find(importDir)) ) {
+-                     
+-                  if (myChild->isAnalyzed()) {
+-                        
+-                     QString dirToAdd = m_localDir;
+-                     dirToAdd = dirToAdd.left(dirToAdd.find("/",myChild->fullName().length()+1));
+-                     DirBase * unanalyzedDir = myChild->addDir(dirToAdd);
+-                     if (unanalyzedDir && myChild->isOpen()) {//will not be analyzed on open() because it is already open
+-                        myChild->setOpen(TRUE);
+-                     }
+-                     if (myChild->isSelected()) {
+-                        myChild->activateItem(TRUE);//reread files
+-                     } else {
+-                        m_workBench->setSelected(myChild,TRUE);//reread files
+-                     }
+-                  }
+-                     
+-                  emit showInfo( tr("Import Info"), tr("This project subdir has been added.") );
+-                  topProjectDir = myChild->topDir()->shortName();
+-                  DirBase * tmp = m_workBench->find(m_localDir);
+-                  if (tmp) {
+-                     subProjectDir = tmp->topControlledDir()->relativeName();
+-                     projectSettings->set(subProjectDir, SSHACCESS, m_sshAccess);
+-                  }
+-                  found = true;
+-               }
+-                  
+-            } while ( !found && (pos > -1));
+-               
+-            if ( !found) {
+-               QString path = m_localDir.left(m_localDir.findRev("/"));
+-               QString name = m_localDir.mid(m_localDir.findRev("/") + 1);
+-               emit addCheckedOutProject(path, name, m_sshAccess);
+-            }
+-         
+-         }
+-         
+          break;
+       }
+       default: {
+diff -up CrossVC/src/ImportDialogImpl.cpp.nocreate CrossVC/src/ImportDialogImpl.cpp
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.cpp	2007-09-16 20:59:55.000000000 +0200
+@@ -231,11 +231,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
+    if (m_ignoreString.find("!") > -1) m_ignoreString = m_ignoreString.mid(m_ignoreString.findRev("!", -1) + 1);
+ 
+    m_binaryList = BINARYFILESPECLIST;
+-
+-   if (CVSVERSION != "cvsnt") {
+-      m_CreateDirs->setEnabled(false);
+-      m_CreateDirs->setChecked(false);
+-   }
+    
+    if (!m_defaultProfile->isEmpty()) {
+       setDefaultProfile(*m_defaultProfile);
+@@ -696,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
+ 	return m_KeepFTime->isChecked();
+ }
+ 
+-bool ImportDialogImpl::getCreateDirs() {
+-	return m_CreateDirs->isChecked();
+-}
+-
+ void ImportDialogImpl::getAndSetModule() {
+    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
+    m_ModuleBrowser = NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 20:03:27 -0000	1.5
+++ .cvsignore	16 Sep 2007 19:12:53 -0000	1.6
@@ -1 +1 @@
-crossvc-1.5.1-0-generic-src.tgz
+crossvc-1.5.2-0-generic-src.tgz


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- crossvc.spec	9 Sep 2007 20:20:23 -0000	1.11
+++ crossvc.spec	16 Sep 2007 19:12:53 -0000	1.12
@@ -1,18 +1,15 @@
 Name:             crossvc
-Version:          1.5.1
-Release:          7%{?dist}
+Version:          1.5.2
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 
 Group:            Development/Tools
 License:          GPLv2
 URL:              http://www.lincvs.org
-# This is a prerelease of crossvc-1.5.2 which I have got
-# from upstream via mail. This should contains a workaroud
-# for a bug in qt-3.3.8
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.1-nocreate.patch
+Patch1:		  crossvc-1.5.2-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -88,6 +85,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-1
+- New upstream release
+
 * Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-7
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2007 20:03:27 -0000	1.5
+++ sources	16 Sep 2007 19:12:53 -0000	1.6
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz
+4fb196e4e5fb5b6c5d901601869308b2  crossvc-1.5.2-0-generic-src.tgz


--- crossvc-1.5.1-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 19:17:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:17:55 -0400
Subject: rpms/highlight/devel .cvsignore, 1.10, 1.11 highlight.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200709161917.l8GJHtHp031076@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29897

Modified Files:
	.cvsignore highlight.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Sep 2007 19:29:48 -0000	1.10
+++ .cvsignore	16 Sep 2007 19:17:22 -0000	1.11
@@ -1 +1 @@
-highlight-2.6.3.tar.gz
+highlight-2.6.4.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- highlight.spec	11 Sep 2007 19:29:48 -0000	1.22
+++ highlight.spec	16 Sep 2007 19:17:22 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.3
+Version:	2.6.4
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
 * Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Sep 2007 19:29:48 -0000	1.11
+++ sources	16 Sep 2007 19:17:22 -0000	1.12
@@ -1 +1 @@
-0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz
+3f06b113b2b82319b936040ca9b2e597  highlight-2.6.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:40:03 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:40:03 -0400
Subject: rpms/crossvc/F-7 crossvc-1.5.2-nocreate.patch, NONE,
	1.1 crossvc.spec, 
	1.7, 1.8 sources, 1.3, 1.4 crossvc-1.5.1-nocreate.patch, 1.1, NONE
Message-ID: <200709161940.l8GJe30X001011@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv956

Modified Files:
	crossvc.spec sources 
Added Files:
	crossvc-1.5.2-nocreate.patch 
Removed Files:
	crossvc-1.5.1-nocreate.patch 
Log Message:
New upstream release

crossvc-1.5.2-nocreate.patch:

--- NEW FILE crossvc-1.5.2-nocreate.patch ---
diff -up CrossVC/src/ImportDialog.ui.nocreate CrossVC/src/ImportDialog.ui
--- CrossVC/src/ImportDialog.ui.nocreate	2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialog.ui	2007-09-16 20:59:55.000000000 +0200
@@ -657,17 +657,6 @@ enter the appropriate value or leave thi
                 <property name="spacing">
                     <number>2</number>
                 </property>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>m_CreateDirs</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Create CVS directories while importing (needs CVSNT)</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Activate this option if you want to convert your import folder into a working copy while importing.&lt;br&gt;Please note that this option is only available if &lt;b&gt;CVSNT&lt;/b&gt; is used on both client and server!</string>
-                    </property>
-                </widget>
                 <widget class="QCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>m_KeepFTime</cstring>
diff -up CrossVC/src/ImportDialogImpl.h.nocreate CrossVC/src/ImportDialogImpl.h
--- CrossVC/src/ImportDialogImpl.h.nocreate	2006-11-05 11:40:30.000000000 +0100
+++ CrossVC/src/ImportDialogImpl.h	2007-09-16 20:59:55.000000000 +0200
@@ -129,8 +129,6 @@ class ImportDialogImpl : public ImportDi
    int mode();
    int rshMode();
    bool getKeepFTime();
-   bool getCreateDirs();
-
 
  public slots:
 
diff -up CrossVC/src/Import.cpp.nocreate CrossVC/src/Import.cpp
--- CrossVC/src/Import.cpp.nocreate	2007-09-16 21:06:04.000000000 +0200
+++ CrossVC/src/Import.cpp	2007-09-16 21:08:33.000000000 +0200
@@ -171,7 +171,6 @@ void Import::acceptCvs() {
    int rshMode = dlg->rshMode();
    m_sshAccess = dlg->getSshPreset();
    bool keepFTime = dlg->getKeepFTime();
-   m_bCreateCvsDirs = dlg->getCreateDirs();
    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
    QStringList binaryWildcards = dlg->getBinaryWildcards();
 
@@ -236,8 +235,6 @@ void Import::acceptCvs() {
    files += " import ";
    
    if (keepFTime) files += "-d ";
-   if (m_bCreateCvsDirs) files += "-C ";
-    
   
    //ignore files:
    QString sIgnore = "-I ! ";
@@ -307,57 +304,6 @@ void Import::afterCall(int cmd, CvsBuffe
             return;
          }
 
-         if (m_bCreateCvsDirs) {
-            //cvs dir is already in workbench?
-            QString topProjectDir = "";
-            QString subProjectDir = "";
-            bool found = false;
-            DirBase * myChild = NULL;
-               
-            QString importDir = m_localDir;
-            int pos = importDir.length();
-            do {
-                  
-               pos = importDir.findRev("/");
-               importDir.truncate(pos);
-                  
-               if ( (myChild = m_workBench->find(importDir)) ) {
-                     
-                  if (myChild->isAnalyzed()) {
-                        
-                     QString dirToAdd = m_localDir;
-                     dirToAdd = dirToAdd.left(dirToAdd.find("/",myChild->fullName().length()+1));
-                     DirBase * unanalyzedDir = myChild->addDir(dirToAdd);
-                     if (unanalyzedDir && myChild->isOpen()) {//will not be analyzed on open() because it is already open
-                        myChild->setOpen(TRUE);
-                     }
-                     if (myChild->isSelected()) {
-                        myChild->activateItem(TRUE);//reread files
-                     } else {
-                        m_workBench->setSelected(myChild,TRUE);//reread files
-                     }
-                  }
-                     
-                  emit showInfo( tr("Import Info"), tr("This project subdir has been added.") );
-                  topProjectDir = myChild->topDir()->shortName();
-                  DirBase * tmp = m_workBench->find(m_localDir);
-                  if (tmp) {
-                     subProjectDir = tmp->topControlledDir()->relativeName();
-                     projectSettings->set(subProjectDir, SSHACCESS, m_sshAccess);
-                  }
-                  found = true;
-               }
-                  
-            } while ( !found && (pos > -1));
-               
-            if ( !found) {
-               QString path = m_localDir.left(m_localDir.findRev("/"));
-               QString name = m_localDir.mid(m_localDir.findRev("/") + 1);
-               emit addCheckedOutProject(path, name, m_sshAccess);
-            }
-         
-         }
-         
          break;
       }
       default: {
diff -up CrossVC/src/ImportDialogImpl.cpp.nocreate CrossVC/src/ImportDialogImpl.cpp
--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialogImpl.cpp	2007-09-16 20:59:55.000000000 +0200
@@ -231,11 +231,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
    if (m_ignoreString.find("!") > -1) m_ignoreString = m_ignoreString.mid(m_ignoreString.findRev("!", -1) + 1);
 
    m_binaryList = BINARYFILESPECLIST;
-
-   if (CVSVERSION != "cvsnt") {
-      m_CreateDirs->setEnabled(false);
-      m_CreateDirs->setChecked(false);
-   }
    
    if (!m_defaultProfile->isEmpty()) {
       setDefaultProfile(*m_defaultProfile);
@@ -696,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
 	return m_KeepFTime->isChecked();
 }
 
-bool ImportDialogImpl::getCreateDirs() {
-	return m_CreateDirs->isChecked();
-}
-
 void ImportDialogImpl::getAndSetModule() {
    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
    m_ModuleBrowser = NULL;


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/crossvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crossvc.spec	9 Sep 2007 20:14:33 -0000	1.7
+++ crossvc.spec	16 Sep 2007 19:39:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:             crossvc
-Version:          1.5.1
-Release:          5%{?dist}
+Version:          1.5.2
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.1-nocreate.patch
+Patch1:		  crossvc-1.5.2-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> - 1.5.2-1
+- New upstream release
+
 * Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
 - Add Req to qt-3.3.8-6 (#246024)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2007 20:20:02 -0000	1.3
+++ sources	16 Sep 2007 19:39:31 -0000	1.4
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz
+4fb196e4e5fb5b6c5d901601869308b2  crossvc-1.5.2-0-generic-src.tgz


--- crossvc-1.5.1-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 19:40:06 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 16 Sep 2007 15:40:06 -0400
Subject: rpms/freeciv/devel freeciv-2.0.9-open.patch, NONE, 1.1 freeciv.spec,
	1.27, 1.28
Message-ID: <200709161940.l8GJe6MS001016@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv981

Modified Files:
	freeciv.spec 
Added Files:
	freeciv-2.0.9-open.patch 
Log Message:
* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-4
- Add patch to fix open function build bug.


freeciv-2.0.9-open.patch:

--- NEW FILE freeciv-2.0.9-open.patch ---
diff -ur freeciv-2.0.9.OLD/client/connectdlg_common.c freeciv-2.0.9/client/connectdlg_common.c
--- freeciv-2.0.9.OLD/client/connectdlg_common.c	2007-02-09 21:08:04.000000000 -0500
+++ freeciv-2.0.9/client/connectdlg_common.c	2007-09-16 15:15:44.000000000 -0400
@@ -266,7 +266,7 @@
 
     /* include the port to avoid duplication */
     if (logfile) {
-      fd = open(logfile, O_WRONLY | O_CREAT);
+      fd = open(logfile, O_WRONLY | O_CREAT,0644);
 
       if (fd != 1) {
         dup2(fd, 1);


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freeciv.spec	21 Aug 2007 21:50:36 -0000	1.27
+++ freeciv.spec	16 Sep 2007 19:39:34 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           freeciv
 Version:        2.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -12,6 +12,7 @@
 Source3:	%{name}.xpm
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-aifill.patch
+Patch3:		%{name}-%{version}-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -37,6 +38,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .desktop
 %patch2 -p0 -b .aifill
+%patch3 -p1 -b .open
 
 
 %build
@@ -95,6 +97,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-4
+- Add patch to fix open function build bug.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-3
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep 16 19:42:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:42:07 -0400
Subject: rpms/highlight/F-7 highlight.spec,1.21,1.22 sources,1.11,1.12
Message-ID: <200709161942.l8GJg70h001138@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1110

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/highlight.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- highlight.spec	11 Sep 2007 19:44:09 -0000	1.21
+++ highlight.spec	16 Sep 2007 19:41:35 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.3
+Version:	2.6.4
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
 * Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Sep 2007 19:44:09 -0000	1.11
+++ sources	16 Sep 2007 19:41:35 -0000	1.12
@@ -1 +1 @@
-0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz
+3f06b113b2b82319b936040ca9b2e597  highlight-2.6.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:46:48 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 16 Sep 2007 15:46:48 -0400
Subject: rpms/source-highlight/devel .cvsignore, 1.9,
	1.10 source-highlight.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200709161946.l8GJkmdG001287@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1265

Modified Files:
	.cvsignore source-highlight.spec sources 
Log Message:
* Sun Sep 16 2007 Adrian Reber <adrian at lisas.de> - 2.7-1
- updated to 2.7
- updated files section
- updated license



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Sep 2006 21:45:46 -0000	1.9
+++ .cvsignore	16 Sep 2007 19:46:15 -0000	1.10
@@ -1,2 +1,2 @@
-source-highlight-2.4.tar.gz
-source-highlight-2.4.tar.gz.sig
+source-highlight-2.7.tar.gz.sig
+source-highlight-2.7.tar.gz


Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- source-highlight.spec	20 Aug 2007 10:14:02 -0000	1.15
+++ source-highlight.spec	16 Sep 2007 19:46:15 -0000	1.16
@@ -1,11 +1,11 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 2.4
-Release: 2%{?dist}
+Version: 2.7
+Release: 1%{?dist}
 Group: Development/Tools
-License: GPL
-Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.4.tar.gz
-Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.4.tar.gz.sig
+License: GPLv2+
+Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.7.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.7.tar.gz.sig
 URL: http://www.gnu.org/software/src-highlite/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison, flex, boost-devel
@@ -54,12 +54,18 @@
 %{_bindir}/cpp2html
 %{_bindir}/java2html
 %{_bindir}/source-highlight
+%{_bindir}/check-regexp
 %{_bindir}/src-hilite-lesspipe.sh
 %{_datadir}/%{name}
 %{_mandir}/man1/*
 %{_infodir}/source-highlight.info*
 
 %changelog
+* Sun Sep 16 2007 Adrian Reber <adrian at lisas.de> - 2.7-1
+- updated to 2.7
+- updated files section
+- updated license
+
 * Mon Aug 20 2007 Caolan McNamara <caolanm at redhat.com> - 2.4-2
 - rebuild for boost rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Sep 2006 21:45:46 -0000	1.9
+++ sources	16 Sep 2007 19:46:15 -0000	1.10
@@ -1,2 +1,2 @@
-bb8f38d9447c8b1f1ad4357290d4fcd1  source-highlight-2.4.tar.gz.sig
-6140791b4696b14890bf60c16edaf501  source-highlight-2.4.tar.gz
+ed75f25037aff81819ce4f092483af86  source-highlight-2.7.tar.gz.sig
+654df5a7c3d9a20063d6220979c04550  source-highlight-2.7.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 20:08:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 16:08:34 -0400
Subject: rpms/glib2/devel .cvsignore, 1.74, 1.75 glib2.spec, 1.138,
	1.139 sources, 1.74, 1.75
Message-ID: <200709162008.l8GK8YHI007903@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/glib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7851

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	4 Aug 2007 04:14:32 -0000	1.74
+++ .cvsignore	16 Sep 2007 20:08:01 -0000	1.75
@@ -1 +1 @@
-glib-2.14.0.tar.bz2
+glib-2.14.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- glib2.spec	4 Aug 2007 04:29:36 -0000	1.138
+++ glib2.spec	16 Sep 2007 20:08:01 -0000	1.139
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.14.0
+Version: 2.14.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Sat Aug  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	4 Aug 2007 04:14:32 -0000	1.74
+++ sources	16 Sep 2007 20:08:01 -0000	1.75
@@ -1 +1 @@
-6fabf21f68631043bc6924e01398e3af  glib-2.14.0.tar.bz2
+196d7944a8ddc1f7c3d1e9c7146dd560  glib-2.14.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 20:41:40 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 16 Sep 2007 16:41:40 -0400
Subject: rpms/freedroidrpg/devel .cvsignore, 1.8, 1.9 freedroidrpg.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709162041.l8GKfeMf008371@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/freedroidrpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8345

Modified Files:
	.cvsignore freedroidrpg.spec sources 
Log Message:
Update to 0.10.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2007 20:48:31 -0000	1.8
+++ .cvsignore	16 Sep 2007 20:41:08 -0000	1.9
@@ -1 +1 @@
-freedroidrpg-0.10.2.tar.bz2
+freedroidrpg-0.10.3.tar.bz2


Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freedroidrpg.spec	28 Aug 2007 18:59:16 -0000	1.18
+++ freedroidrpg.spec	16 Sep 2007 20:41:08 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           freedroidrpg
-Version:        0.10.2
+Version:        0.10.3
 Release:        1%{?dist}
 Summary:        Role playing game with Freedroid theme and Tux as the hero
 
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Wart <wart at kobold.org> - 0.10.3-1
+- Update to 0.10.3
+
 * Tue Aug 28 2007 Wart <wart at kobold.org> - 0.10.2-2
 - License tag clarification
 - Use correct .desktop file version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2007 20:48:31 -0000	1.8
+++ sources	16 Sep 2007 20:41:08 -0000	1.9
@@ -1 +1 @@
-553a6dfe947895f75cdf43ffed1c1872  freedroidrpg-0.10.2.tar.bz2
+4455c82ff65f8ff7d58853d8aff76d5b  freedroidrpg-0.10.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 20:46:52 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sun, 16 Sep 2007 16:46:52 -0400
Subject: rpms/bluez-libs/devel .cvsignore, 1.26, 1.27 bluez-libs.spec, 1.41, 
	1.42 sources, 1.26, 1.27
Message-ID: <200709162046.l8GKkqLV008512@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8479

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Sep 2007 08:41:45 -0000	1.26
+++ .cvsignore	16 Sep 2007 20:46:20 -0000	1.27
@@ -1 +1 @@
-bluez-libs-3.18.tar.gz
+bluez-libs-3.19.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- bluez-libs.spec	12 Sep 2007 08:41:45 -0000	1.41
+++ bluez-libs.spec	16 Sep 2007 20:46:20 -0000	1.42
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.18
+Version: 3.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Sun Sep 16 2007 David Woodhouse <dwmw2 at infradead.org> - 3.19-1
+- Update to bluez-libs 3.19
+
 * Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> - 3.18-1
 - Update to bluez-libs 3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	12 Sep 2007 08:41:45 -0000	1.26
+++ sources	16 Sep 2007 20:46:20 -0000	1.27
@@ -1 +1 @@
-9e091f2ce00b906c4c456fff24e69e55  bluez-libs-3.18.tar.gz
+40106bf5263e75c47d5033ae5085b6e2  bluez-libs-3.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 21:01:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:01:02 -0400
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.26,1.27
Message-ID: <200709162101.l8GL129F009611@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-lvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8734

Modified Files:
	system-config-lvm.spec 
Log Message:
fix desktop file categories



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- system-config-lvm.spec	1 May 2007 16:05:49 -0000	1.26
+++ system-config-lvm.spec	16 Sep 2007 21:00:29 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
 Version: 1.1.1
-Release: 1.0%{?dist}
+Release: 2.0%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -31,6 +31,15 @@
 rm -rf %{buildroot}
 %makeinstall
 
+desktop-file-install --vendor system --delete-original		\
+  --dir %{buildroot}%{_datadir}/applications			\
+  --remove-category Application					\
+  --remove-category SystemSetup					\
+  --remove-category X-Red-Hat-Base				\
+  --add-category Settings					\
+  --add-category System						\
+  %{buildroot}%{_datadir}/applications/system-config-lvm.desktop
+
 #Uncomment this when translations are done
 %find_lang %name
 
@@ -53,6 +62,10 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 1.1.1-2.0
+- Use desktop-file-install to install the desktop file
+- Move the application to the right spot in the menus
+
 * Tue May 01 2007 Stanko Kupcevic <kupcevic at redhat.com> 1.1.1-1.0
   - Update pam file
   - Update translation files



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:12 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:12 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchbugzilla
Message-ID: <200709162104.l8GL4DEU018943@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchbugzilla acl on vorbis-tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:15 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:15 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchcommits
Message-ID: <200709162104.l8GL4Fhr018961@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchcommits acl on vorbis-tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:20 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:20 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested commit
Message-ID: <200709162104.l8GL4Lxt012675@app3.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the commit acl on vorbis-tools (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:30 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:30 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchbugzilla
Message-ID: <200709162104.l8GL4UeZ019021@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchbugzilla acl on vorbis-tools (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:31 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:31 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchcommits
Message-ID: <200709162104.l8GL4VPP012714@app3.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchcommits acl on vorbis-tools (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:32 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:32 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested commit
Message-ID: <200709162104.l8GL4Wkc019034@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the commit acl on vorbis-tools (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:06:37 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:06:37 -0400
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.27,1.28
Message-ID: <200709162106.l8GL6bZf014909@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-lvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887

Modified Files:
	system-config-lvm.spec 
Log Message:
fix BRs



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- system-config-lvm.spec	16 Sep 2007 21:00:29 -0000	1.27
+++ system-config-lvm.spec	16 Sep 2007 21:06:04 -0000	1.28
@@ -16,6 +16,7 @@
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
 BuildRequires: perl(XML::Parser) gettext
+BuildRequires: desktop-file-utils
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.



From fedora-extras-commits at redhat.com  Sun Sep 16 21:11:11 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sun, 16 Sep 2007 17:11:11 -0400
Subject: rpms/bluez-utils/devel .cvsignore, 1.24, 1.25 bluez-utils.spec, 1.76,
	1.77 sources, 1.24, 1.25
Message-ID: <200709162111.l8GLBB0w015080@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049

Modified Files:
	.cvsignore bluez-utils.spec sources 
Log Message:
3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Sep 2007 08:53:54 -0000	1.24
+++ .cvsignore	16 Sep 2007 21:10:39 -0000	1.25
@@ -1 +1 @@
-bluez-utils-3.18.tar.gz
+bluez-utils-3.19.tar.gz


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- bluez-utils.spec	12 Sep 2007 08:53:54 -0000	1.76
+++ bluez-utils.spec	16 Sep 2007 21:10:39 -0000	1.77
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.18
+Version: 3.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -153,6 +153,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sun Sep 16 2007 David Woodhouse <dwmw2 at infradead.org> 3.19-1
+- Update to bluez-utils 3.19
+
 * Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> 3.18-1
 - Update to bluez-utils 3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Sep 2007 08:53:54 -0000	1.24
+++ sources	16 Sep 2007 21:10:39 -0000	1.25
@@ -1 +1 @@
-2b6b4d519b8f75ef3990122934e660ba  bluez-utils-3.18.tar.gz
+3b4fd0b255a0f83f692557c3b7a1a506  bluez-utils-3.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 21:14:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:14:51 -0400
Subject: rpms/metacity/devel .cvsignore, 1.59, 1.60 metacity.spec, 1.131,
	1.132 sources, 1.59, 1.60
Message-ID: <200709162114.l8GLEpCV015190@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15168

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	8 Aug 2007 00:38:01 -0000	1.59
+++ .cvsignore	16 Sep 2007 21:14:18 -0000	1.60
@@ -1 +1 @@
-metacity-2.19.55.tar.bz2
+metacity-2.20.0.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- metacity.spec	11 Sep 2007 20:06:58 -0000	1.131
+++ metacity.spec	16 Sep 2007 21:14:18 -0000	1.132
@@ -1,18 +1,16 @@
 %define gettext_package metacity
 
-%define metacity_version 2.19.55
+%define metacity_version 2.20.0
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=433253
-Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +64,6 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
-%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -153,6 +150,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.19.55-4
 - fix crash on logout (and on the subsequent login, bug 243761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	8 Aug 2007 00:38:01 -0000	1.59
+++ sources	16 Sep 2007 21:14:18 -0000	1.60
@@ -1 +1 @@
-1d9b30f8c7aff29777f28196957a1b46  metacity-2.19.55.tar.bz2
+e9c6317c85db019ac2d832dd9f45f536  metacity-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 21:16:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:16:35 -0700
Subject: [pkgdb] homebank was added for trasher
Message-ID: <200709162116.l8GLGatW015214@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package homebank with summary Free easy personal accounting for all
Kevin Fenzi (kevin) has approved Package homebank
Kevin Fenzi (kevin) has added a Fedora devel branch for homebank with an owner of trasher
Kevin Fenzi (kevin) has approved homebank in Fedora devel
Kevin Fenzi (kevin) has approved Package homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank summary updated by kevin
Message-ID: <200709162117.l8GLHJPP021693@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package homebank summary to Free easy personal accounting for all

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, 6) updated by kevin
Message-ID: <200709162117.l8GLHKkj021704@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) changed owner of homebank in Fedora 6 to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora 6)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, 7) updated by kevin
Message-ID: <200709162117.l8GLHKTQ021714@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) changed owner of homebank in Fedora 7 to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora 7)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, devel) updated by kevin
Message-ID: <200709162117.l8GLHLxY021723@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of homebank in Fedora devel to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora devel)

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



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:53 -0400
Subject: rpms/homebank - New directory
Message-ID: <200709162117.l8GLHrD5015291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank

Log Message:
Directory /cvs/extras/rpms/homebank added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:57 -0400
Subject: rpms/homebank/devel - New directory
Message-ID: <200709162117.l8GLHvs9015305@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank/devel

Log Message:
Directory /cvs/extras/rpms/homebank/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:59 -0400
Subject: rpms/homebank Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709162117.l8GLHxni015330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank

Added Files:
	Makefile import.log 
Log Message:
Setup of module homebank


--- NEW FILE Makefile ---
# Top level Makefile for module homebank
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 16 21:18:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:18:01 -0400
Subject: rpms/homebank/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709162118.l8GLI1xT015346@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module homebank


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: homebank
# $Id: Makefile,v 1.1 2007/09/16 21:17:59 kevin Exp $
NAME := homebank
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 fedora-extras-commits at redhat.com  Sun Sep 16 22:06:33 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 18:06:33 -0400
Subject: rpms/pygobject2/devel .cvsignore, 1.11, 1.12 pygobject2.spec, 1.29, 
	1.30 sources, 1.11, 1.12
Message-ID: <200709162206.l8GM6XLq026615@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26277

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

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc8
- Update to 2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Jul 2007 02:04:33 -0000	1.11
+++ .cvsignore	16 Sep 2007 22:06:00 -0000	1.12
@@ -1 +1 @@
-pygobject-2.13.2.tar.bz2
+pygobject-2.14.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pygobject2.spec	29 Aug 2007 04:55:29 -0000	1.29
+++ pygobject2.spec	16 Sep 2007 22:06:00 -0000	1.30
@@ -8,8 +8,8 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.13.2
-Release: 3%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -97,6 +97,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc8
+- Update to 2.14.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.13.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Jul 2007 02:04:33 -0000	1.11
+++ sources	16 Sep 2007 22:06:00 -0000	1.12
@@ -1 +1 @@
-98122d47749ecf1d52bde3b9fa306bd4  pygobject-2.13.2.tar.bz2
+de781a21f483c941a73009a9f68f150e  pygobject-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 22:26:38 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 16 Sep 2007 18:26:38 -0400
Subject: rpms/totem/devel .cvsignore, 1.44, 1.45 sources, 1.44,
	1.45 totem.spec, 1.119, 1.120
Message-ID: <200709162226.l8GMQcBk028999@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28975

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Sun Sep 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
- Update for 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	17 Aug 2007 17:53:59 -0000	1.44
+++ .cvsignore	16 Sep 2007 22:26:05 -0000	1.45
@@ -1 +1 @@
-totem-2.19.90.tar.bz2
+totem-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	17 Aug 2007 17:53:59 -0000	1.44
+++ sources	16 Sep 2007 22:26:05 -0000	1.45
@@ -1 +1 @@
-0855cb16f426550619f3549854888063  totem-2.19.90.tar.bz2
+e7f289179b8ac304738d599d4a5c14a9  totem-2.20.0.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- totem.spec	17 Aug 2007 17:53:59 -0000	1.119
+++ totem.spec	16 Sep 2007 22:26:05 -0000	1.120
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 2.19.90
+Version: 2.20.0
 Release: 1%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
@@ -74,6 +74,7 @@
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Totem
 Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description lirc
 A plugin to add LIRC (Infrared remote) support to Totem.
@@ -81,6 +82,7 @@
 %package galago
 Summary: Galago (Instant Messenger status) plugin for Totem
 Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description galago
 A plugin to allow Totem to set Instant Messenger statuses when
@@ -118,8 +120,6 @@
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
 %configure 			\
 	--enable-gstreamer 	\
-	--disable-lirc 		\
-	--disable-vanity 	\
 	--enable-mozilla 	\
 	--enable-nautilus	\
 	--disable-scrollkeeper  \
@@ -233,6 +233,9 @@
 %{_libdir}/*so
 
 %changelog
+* Sun Sep 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
+- Update for 2.20.0
+
 * Fri Aug 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.90-1
 - Update for 2.19.90
 



From fedora-extras-commits at redhat.com  Sun Sep 16 22:32:50 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 18:32:50 -0400
Subject: rpms/pygtk2/devel .cvsignore, 1.36, 1.37 pygtk2.spec, 1.7,
	1.8 sources, 1.36, 1.37
Message-ID: <200709162232.l8GMWo3e029124@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29097

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

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	27 Aug 2007 18:01:03 -0000	1.36
+++ .cvsignore	16 Sep 2007 22:32:18 -0000	1.37
@@ -1 +1 @@
-pygtk-2.11.0.tar.bz2
+pygtk-2.12.0.tar.bz2


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pygtk2.spec	27 Aug 2007 18:01:03 -0000	1.7
+++ pygtk2.spec	16 Sep 2007 22:32:18 -0000	1.8
@@ -5,7 +5,7 @@
 ### Abstract ###
 
 Name: pygtk2
-Version: 2.11.0
+Version: 2.12.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -144,6 +144,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Mon Aug 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.0-1.fc8
 - Update to 2.11.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	27 Aug 2007 18:01:03 -0000	1.36
+++ sources	16 Sep 2007 22:32:18 -0000	1.37
@@ -1 +1 @@
-99443c6224b6b07ebb19c8fd03157e6e  pygtk-2.11.0.tar.bz2
+3c1a42b774600c353342cfa3782a7d77  pygtk-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 22:34:38 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sun, 16 Sep 2007 18:34:38 -0400
Subject: rpms/gdb/devel gdb-6.6-bz233852-attach-signalled.patch, 1.1,
	1.2 gdb.spec, 1.243, 1.244
Message-ID: <200709162234.l8GMYcDO029217@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29194

Modified Files:
	gdb-6.6-bz233852-attach-signalled.patch gdb.spec 
Log Message:
* Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
- Fix attaching to stopped processes and/or pending signals.


gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.6-bz233852-attach-signalled.patch	20 Jun 2007 14:25:46 -0000	1.1
+++ gdb-6.6-bz233852-attach-signalled.patch	16 Sep 2007 22:34:35 -0000	1.2
@@ -1,94 +1,151 @@
-diff -u -rup gdb-6.6-orig/gdb/inf-ptrace.c gdb-6.6/gdb/inf-ptrace.c
---- gdb-6.6-orig/gdb/inf-ptrace.c	2006-01-24 23:34:34.000000000 +0100
-+++ gdb-6.6/gdb/inf-ptrace.c	2007-06-06 13:33:11.000000000 +0200
-@@ -38,6 +38,9 @@
- 
- /* HACK: Save the ptrace ops returned by inf_ptrace_target.  */
- static struct target_ops *ptrace_ops_hack;
-+
-+/* Stored PID of the process being stopped during attach.  */
-+static pid_t stopped_pid;
- 
- 
- #ifdef PT_GET_PROCESS_STATE
-@@ -69,14 +72,20 @@ inf_ptrace_follow_fork (struct target_op
+2007-07-01  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* linux-nat.h (struct lwp_info): New field WAS_STOPPED.
+	* linux-nat.c (STRINGIFY, STRINGIFY_ARG): New macros.
+	(kill_lwp): New declaration.
+	(linux_ptrace_post_attach, pid_is_stopped): New function.
+	(linux_child_follow_fork): New comment about WAS_STOPPED.
+	(lin_lwp_attach_lwp): Variable PID removed.  Part replaced by a call to
+	LINUX_PTRACE_POST_ATTACH.
+	(linux_nat_attach): Likewise.
+	(linux_nat_detach): Optionally stop the detached process.
+	(linux_nat_resume): Clear WAS_STOPPED if appropriate.
+	* NEWS: Document the new behaviour.
+
+2007-06-30  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.threads/attach-into-signal.c, gdb.threads/attach-into-signal.exp,
+	gdb.threads/attach-stopped.c, gdb.threads/attach-stopped.exp: New files.
+
+2007-06-30  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.texinfo (Attach): Document the ATTACH and DETACH commands for
+	stopped processes.  Document the messages on the seen pending signals.
+
+[ Backport for GDB-6.6. ]
+
+--- ./gdb/NEWS	21 Jun 2007 15:18:50 -0000	1.232
++++ ./gdb/NEWS	30 Jun 2007 16:27:37 -0000
+@@ -44,6 +44,9 @@ segment base addresses (rather than offs
+ * The /i format now outputs any trailing branch delay slot instructions 
+ immediately following the last instruction within the count specified.
+ 
++* On GNU/Linux, stopped processes may get attached to now.  Signals being
++delivered at the time of the attach command no longer get lost.
++
+ * New commands
+ 
+ set remoteflow
+--- gdb-6.6/gdb/linux-nat.c-orig-orig	2007-09-16 20:57:13.000000000 +0200
++++ gdb-6.6/gdb/linux-nat.c	2007-09-16 21:02:28.000000000 +0200
+@@ -87,6 +87,12 @@
+ #define __WALL          0x40000000 /* Wait for any child.  */
+ #endif
  
-   if (follow_child)
-     {
-+      unsigned long sig = 0;
++#define STRINGIFY_ARG(x) #x
++#define STRINGIFY(x) STRINGIFY_ARG (x)
 +
-       inferior_ptid = pid_to_ptid (fpid);
-       detach_breakpoints (pid);
++static int linux_ptrace_post_attach (struct lwp_info *lp);
++static int kill_lwp (int lwpid, int signo);
++
+ /* The single-threaded native GNU/Linux target_ops.  We save a pointer for
+    the use of the multi-threaded target.  */
+ static struct target_ops *linux_ops;
+@@ -533,6 +539,11 @@ child_follow_fork (struct target_ops *op
+ 	}
+       else
+ 	{
++	  /* We should check LP->WAS_STOPPED and detach it stopped accordingly.
++	     In this point of code it cannot be 1 as we would not get FORK
++	     executed without CONTINUE first which resets LP->WAS_STOPPED.
++	     We would have to first TARGET_STOP and WAITPID it as with running
++	     inferior PTRACE_DETACH, SIGSTOP will ignore the signal.  */
+ 	  target_detach (NULL, 0);
+ 	}
+ 
+@@ -992,7 +1003,6 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+      to happen.  */
+   if (GET_LWP (ptid) != GET_PID (ptid) && lp == NULL)
+     {
+-      pid_t pid;
+       int status;
  
-       /* Reset breakpoints in the child as appropriate.  */
-       follow_inferior_reset_breakpoints ();
+       if (ptrace (PTRACE_ATTACH, GET_LWP (ptid), 0, 0) < 0)
+@@ -1002,45 +1012,23 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+ 	     creation is interrupted; as of Linux 2.6.19, a kernel
+ 	     bug may place threads in the thread list and then fail
+ 	     to create them.  */
+-	  warning (_("Can't attach %s: %s"), target_pid_to_str (ptid),
+-		   safe_strerror (errno));
+-	  return -1;
++	  error (_("Can't attach %s: %s"), target_pid_to_str (ptid),
++		 safe_strerror (errno));
+ 	}
  
--      if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
--	perror_with_name (("ptrace"));
-+      /* Stop the process again if it was stopped during the attachment.  */
-+      if (pid == stopped_pid)
-+	sig = target_signal_to_host (TARGET_SIGNAL_STOP));
-+
-+      if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, (void *) sig) == -1)
-+	perror_with_name (("ptrace PT_DETACH"));
+       if (lp == NULL)
+ 	lp = add_lwp (ptid);
+ 
+-      if (debug_linux_nat)
+-	fprintf_unfiltered (gdb_stdlog,
+-			    "LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
+-			    target_pid_to_str (ptid));
+-
+-      pid = my_waitpid (GET_LWP (ptid), &status, 0);
+-      if (pid == -1 && errno == ECHILD)
+-	{
+-	  /* Try again with __WCLONE to check cloned processes.  */
+-	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
+-	  if (pid == -1 && errno == ECHILD)
+-	    error (_("Can't attach %s (%s) - possible SELinux denial,"
+-		     " check your /var/log/messages for `avc: denied'"),
+-		   target_pid_to_str (ptid), safe_strerror (errno));
+-	  lp->cloned = 1;
++      status = linux_ptrace_post_attach (lp);
++      if (status != 0)
++        {
++	  error (_("Thread %s exited: %s"), target_pid_to_str (ptid),
++		 status_to_str (status));
+ 	}
+ 
+-      gdb_assert (pid == GET_LWP (ptid)
+-		  && WIFSTOPPED (status) && WSTOPSIG (status));
+-
+-      target_post_attach (pid);
++      target_post_attach (GET_LWP (ptid));
+ 
+       lp->stopped = 1;
+-
+-      if (debug_linux_nat)
+-	{
+-	  fprintf_unfiltered (gdb_stdlog,
+-			      "LLAL: waitpid %s received %s\n",
+-			      target_pid_to_str (ptid),
+-			      status_to_str (status));
+-	}
      }
    else
      {
-@@ -173,6 +182,21 @@ inf_ptrace_mourn_inferior (void)
-   generic_mourn_inferior ();
+@@ -1061,11 +1049,172 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+   return 0;
  }
  
-+/* Wrapper function for waitpid which handles EINTR.  */
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
 +
 +static int
-+my_waitpid (int pid, int *status, int flags)
++pid_is_stopped (pid_t pid)
 +{
-+  int ret;
-+  do
-+    {
-+      ret = waitpid (pid, status, flags);
-+    }
-+  while (ret == -1 && errno == EINTR);
-+
-+  return ret;
-+}
-+
- /* Attach to the process specified by ARGS.  If FROM_TTY is non-zero,
-    be chatty about it.  */
- 
-@@ -180,8 +204,14 @@ static void
- inf_ptrace_attach (char *args, int from_tty)
- {
-   char *exec_file;
--  pid_t pid;
-+  pid_t pid, got_pid;
-   char *dummy;
-+  int status;
-+  unsigned long sig;
 +  FILE *status_file;
-+  char name[40];
 +  char buf[100]; 
-+  int sigstop = target_signal_to_host (TARGET_SIGNAL_STOP);
- 
-   if (!args)
-     error_no_arg (_("process-id to attach"));
-@@ -210,11 +240,64 @@ inf_ptrace_attach (char *args, int from_
-     }
- 
- #ifdef PT_ATTACH
-+  stopped_pid = 0;
-+  /* There is a small moment after PTRACE_ATTACH where PTRACE_CONT will
-+     succeed only for originally stopped processes.  Unfortunately in a moment
-+     PTRACE_ATTACH will deliver its SIGSTOP and PTRACE_CONT shows no difference
-+     since that moment.
-+     "/proc/%d/status" is also a race but it is safe for unstopped cases.  */
-+  sprintf (name, "/proc/%d/status", (int) pid);
-+  status_file = fopen (name, "r");
++  int retval = 0;
++
++  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
++  status_file = fopen (buf, "r");
 +  if (status_file != NULL)
 +    {
 +      int have_state = 0;
 +
-+      while (fgets (buf, 100, status_file))
++      while (fgets (buf, sizeof (buf), status_file))
 +	{
 +	  if (strncmp (buf, "State:", 6) == 0)
 +	    {
@@ -96,199 +153,153 @@
 +	      break;
 +	    }
 +	} 
-+      if (have_state != 0 && strstr (buf, "T (stopped)") != NULL)
-+	stopped_pid = pid;
++      if (have_state && strstr (buf, "T (stopped)") != NULL)
++	retval = 1;
 +      fclose (status_file);
 +    }
++  return retval;
++}
++
++/* Handle the processing after PTRACE_ATTACH, the first WAITPID -> SIGSTOP.
++   Returns STATUS if the thread has exited, 0 otherwise.
++   Sets LP->WAS_STOPPED if the process was originally stopped.
++   Sets LP->CLONED if the given LWP is not the thread leader.
++
++   Scenario for a standard unstopped inferior:
++    * `S (sleeping)' or `R (running)' or similiar states.
++    * PTRACE_ATTACH is called.
++    * `S (sleeping)' (or similiar) for some while.
++    * `T (tracing stop)'.
++    * WAITPID succeeds here returning SIGSTOP (signalled by PTRACE_ATTACH).
++
++   Scenario for a formerly stopped inferior:
++    * `T (stopped)'.
++    * PTRACE_ATTACH is called.
++    * `T (stopped)' would stay indefinitely
++      Note since this moment the `TracerPid' field gets filled
++      (by PTRACE_ATTACH), it is no longer just the common `T (stopped)' state.
++       * If no one did WAITPID since sending SIGSTOP our WAITPID would return
++         SIGSTOP.  The state still would not turn to `T (tracing stop)'.
++       * Usually its original parent (before PTRACE_ATTACH was applied) already
++         did WAITPID.  The original parent already received our SIGSTOP
++         sinalled by our PTRACE_ATTACH.
++         In this case our own WAITPID would hang.  Therefore...
++    * ... we do artificial: tkill (SIGCONT);
++      `PTRACE_CONT, SIGSTOP' does not work in 100% cases as sometimes SIGSTOP
++      gets remembered by kernel during the first PTRACE_CONT later and we get
++      spurious SIGSTOP event.  Expecting the signal may get delivered to
++      a different task of the thread group.
++      `kill_lwp (SIGSTOP)' has no effect in this moment (it is already stopped).
++    * WAITPID returns the artifical SIGCONT.
++      (The possibly pending SIGSTOP gets vanished by specifically SIGCONT.)
++    * State turns `T (tracing stop)'.
++   In this moment everything is almost fine but we need a workaround as final
++   `PTRACE_DETACH, SIGSTOP' would leave the process unstopped otherwise:
++    * tkill (SIGSTOP);
++    * `PTRACE_CONT, 0'
++    * WAITPID returns the artifical SIGSTOP.
++
++   With the pending (unwaited for) SIGSTOP the artifical signal effects are:
++   kill (SIGSTOP)
++   PTRACE_ATTACH
++    /-tkill (SIGCONT), WAITPID: SIGCONT, WAITPID: hang !
++   //-tkill (SIGCONT), WAITPID: SIGCONT, PTRACE_CONT (SIG_0), WAITPID: wait (OK)
++   \\-tkill (SIGALRM), WAITPID: SIGSTOP, WAITPID: hang !
++    \-tkill (SIGALRM), WAITPID: SIGSTOP, PTRACE_CONT (SIG_0), WAITPID: SIGALRM !
++   Therefore we signal artifical SIGCONT and stop waiting after its reception.
++
++   For the detection whether the process was formerly stopped we need to
++   read `/proc/PID/status'.  `PTRACE_CONT, SIGSTOP' returns ESRCH
++   for `S (sleeping)' and succeeds for `T (stopped)' but it unfortunately
++   succeeds even for `T (tracing stop)'.  Depending on PTRACE_CONT, SIGSTOP
++   success value for formerly stopped processes would mean a race condition
++   as we would get false stopped processes detection if we get too slow.
++
++   `waitid (..., WSTOPPED)' hangs the same way as WAITPID.
++
++   Signals get queued for WAITPID.  PTRACE_ATTACH (or TKILL) enqueues SIGSTOP
++   there but WAITPID may return an already pending signal.
++   Redeliver it by PTRACE_CONT, SIGxxx as otherwise it would get lost.
++   Similiar processing is being done in this file by WAIT_LWP.  */
++
++static int
++linux_ptrace_post_attach (struct lwp_info *lp)
++{
++  ptid_t ptid = lp->ptid;
++  unsigned long sig;
++
++  if (debug_linux_nat)
++    fprintf_unfiltered (gdb_stdlog,
++			"LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
++			target_pid_to_str (ptid));
++
++  lp->was_stopped = pid_is_stopped (GET_LWP (ptid));
++  if (lp->was_stopped)
++    {
++      if (kill_lwp (GET_LWP (ptid), SIGCONT) != 0)
++	perror_with_name (("kill_lwp (SIGCONT)"));
++    }
 +
-   errno = 0;
-   ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
-   if (errno != 0)
-     perror_with_name (("ptrace"));
-   attach_flag = 1;
-+
-+  /* Deliver one SIGSTOP just for sure.
-+     If the process was already stopped AND some other process (like shell)
-+     has already waited for it we would get stuck in waitpid ().  */
-+  sig = sigstop;
-+  do
++  for (;;)
 +    {
-+      if (sig != sigstop)
-+	printf_unfiltered (_("Redelivering pending %s.\n"),
-+		       target_signal_to_string (target_signal_from_host (sig)));
-+      errno = 0;
-+      ptrace (PT_CONTINUE, pid, (PTRACE_TYPE_ARG3)1, (void *) sig);
-+      /* For unstopped processes the preventive signal may ESRCH.  */
-+      if (errno != 0 && sig != sigstop)
-+	perror_with_name ("ptrace PT_CONTINUE");
++      pid_t pid;
++      int status;
++
++      pid = my_waitpid (GET_LWP (ptid), &status, 0);
++      if (pid == -1 && errno == ECHILD)
++	{
++	  /* Try again with __WCLONE to check cloned processes.  */
++	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
++	  lp->cloned = 1;
++	}
++      gdb_assert (pid == GET_LWP (ptid));
 +
-+      got_pid = my_waitpid (pid, &status, 0);
-+      gdb_assert (got_pid == pid);
++      if (debug_linux_nat)
++	{
++	  fprintf_unfiltered (gdb_stdlog,
++			      "LLAL: waitpid %s received %s\n",
++			      target_pid_to_str (ptid),
++			      status_to_str (status));
++	}
 +
 +      /* Check if the thread has exited.  */
 +      if (WIFEXITED (status) || WIFSIGNALED (status))
-+	error (_("Program %s exited.\n"),
-+	       target_pid_to_str (pid_to_ptid (pid)));
++        return status;
 +      gdb_assert (WIFSTOPPED (status));
 +      sig = WSTOPSIG (status);
 +      gdb_assert (sig != 0);
-+    }
-+  while (sig != sigstop);
- #else
-   error (_("This system does not support attaching to a process"));
- #endif
-@@ -240,14 +323,16 @@ inf_ptrace_post_attach (int pid)
- 
- #endif
- 
--/* Detach from the inferior, optionally passing it the signal
--   specified by ARGS.  If FROM_TTY is non-zero, be chatty about it.  */
-+/* Detach from the inferior.  If FROM_TTY is non-zero, be chatty about it.  */
- 
- static void
- inf_ptrace_detach (char *args, int from_tty)
- {
-   pid_t pid = ptid_get_pid (inferior_ptid);
--  int sig = 0;
-+  unsigned long sig = 0;
++      if (sig == SIGSTOP)
++        break;
 +
-+  if (args)
-+    error (_("Too many arguments"));
- 
-   if (from_tty)
-     {
-@@ -258,18 +343,19 @@ inf_ptrace_detach (char *args, int from_
- 			 target_pid_to_str (pid_to_ptid (pid)));
-       gdb_flush (gdb_stdout);
-     }
--  if (args)
--    sig = atoi (args);
- 
- #ifdef PT_DETACH
-   /* We'd better not have left any breakpoints in the program or it'll
-      die when it hits one.  Also note that this may only work if we
-      previously attached to the inferior.  It *might* work if we
-      started the process ourselves.  */
-+  /* Stop the process again if it was stopped during the attachment.  */
-+  if (pid == stopped_pid)
-+    sig = target_signal_to_host (TARGET_SIGNAL_STOP);
-   errno = 0;
--  ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
-+  ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, (void *) sig);
-   if (errno != 0)
--    perror_with_name (("ptrace"));
-+    perror_with_name (("ptrace PT_DETACH"));
-   attach_flag = 0;
- #else
-   error (_("This system does not support detaching from a process"));
-@@ -324,6 +410,12 @@ inf_ptrace_resume (ptid_t ptid, int step
-        single-threaded processes, so simply resume the inferior.  */
-     pid = ptid_get_pid (inferior_ptid);
- 
-+  /* At this point, we are going to resume the inferior and if we
-+     have attached to a stopped process, we no longer should leave
-+     it as stopped if the user detaches.  */
-+  if (!step && pid == stopped_pid)
-+    stopped_pid = 0;
-+
-   if (step)
-     {
-       /* If this system does not support PT_STEP, a higher level
-diff -u -rup gdb-6.6-orig/gdb/linux-nat.c gdb-6.6/gdb/linux-nat.c
---- gdb-6.6-orig/gdb/linux-nat.c	2007-06-06 13:30:52.000000000 +0200
-+++ gdb-6.6/gdb/linux-nat.c	2007-06-06 13:57:18.000000000 +0200
-@@ -994,6 +994,7 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
-     {
-       pid_t pid;
-       int status;
-+      unsigned long sig;
- 
-       if (ptrace (PTRACE_ATTACH, GET_LWP (ptid), 0, 0) < 0)
- 	{
-@@ -1015,32 +1016,54 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
- 			    "LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
- 			    target_pid_to_str (ptid));
- 
--      pid = my_waitpid (GET_LWP (ptid), &status, 0);
--      if (pid == -1 && errno == ECHILD)
-+      sig = SIGSTOP;
-+      do
- 	{
--	  /* Try again with __WCLONE to check cloned processes.  */
--	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
-+	  if (sig != SIGSTOP)
-+	    printf_unfiltered (_("Redelivering pending %s.\n"),
-+		       target_signal_to_string (target_signal_from_host (sig)));
-+	  /* For unstopped processes the preventive signal may ESRCH.  */
-+	  if (ptrace (PTRACE_CONT, GET_LWP (ptid), (PTRACE_TYPE_ARG3)1,
-+		      (void *) sig) != 0 && sig != SIGSTOP)
-+	    perror_with_name ("ptrace");
++      /* As the second signal for stopped processes we send SIGSTOP.  */
++      if (lp->was_stopped && sig == SIGCONT)
++	sig = SIGSTOP;
++
++      printf_unfiltered (_("Redelivering pending %s.\n"),
++		 target_signal_to_string (target_signal_from_host (sig)));
++      if (sig == SIGSTOP)
++	{
++	  if (kill_lwp (GET_LWP (ptid), sig) != 0)
++	    perror_with_name (("kill_lwp"));
++	  /* We now must resume the inferior to get SIGSTOP delivered.  */
++	  sig = 0;
++	}
++      if (ptrace (PTRACE_CONT, GET_LWP (ptid), NULL, (void *) sig) != 0)
++	perror_with_name (("ptrace"));
++    }
 +
-+	  pid = my_waitpid (GET_LWP (ptid), &status, 0);
- 	  if (pid == -1 && errno == ECHILD)
--	    error (_("Can't attach %s (%s) - possible SELinux denial,"
--		     " check your /var/log/messages for `avc: denied'"),
--		   target_pid_to_str (ptid), safe_strerror (errno));
--	  lp->cloned = 1;
--	}
-+	    {
-+	      /* Try again with __WCLONE to check cloned processes.  */
-+	      pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
-+	      if (pid == -1 && errno == ECHILD)
-+		error (_("Can't attach %s (%s) - possible SELinux denial,"
-+			 " check your /var/log/messages for `avc: denied'"),
-+		       target_pid_to_str (ptid), safe_strerror (errno));
-+	      lp->cloned = 1;
-+	    }
-+	  gdb_assert (pid == GET_LWP (ptid));
- 
--      gdb_assert (pid == GET_LWP (ptid)
--		  && WIFSTOPPED (status) && WSTOPSIG (status));
-+	  if (debug_linux_nat)
-+	    {
-+	      fprintf_unfiltered (gdb_stdlog,
-+				  "LLAL: waitpid %s received %s\n",
-+				  target_pid_to_str (ptid),
-+				  status_to_str (status));
-+	    }
++  return 0;
++}
 +
-+	  /* Check if the thread has exited.  */
-+	  if (WIFEXITED (status) || WIFSIGNALED (status))
-+	    {
-+	      warning (_("Thread %s exited: %s"), target_pid_to_str (ptid),
-+		       status_to_str (status));
-+	      return -1;
-+	    }
-+	  gdb_assert (WIFSTOPPED (status));
-+	  sig = WSTOPSIG (status);
-+	  gdb_assert (sig != 0);
-+	}
-+      while (sig != SIGSTOP);
- 
-       target_post_attach (pid);
- 
-       lp->stopped = 1;
--
--      if (debug_linux_nat)
--	{
--	  fprintf_unfiltered (gdb_stdlog,
--			      "LLAL: waitpid %s received %s\n",
--			      target_pid_to_str (ptid),
--			      status_to_str (status));
--	}
-     }
-   else
-     {
-@@ -1065,8 +1088,6 @@ static void
+ static void
  linux_nat_attach (char *args, int from_tty)
  {
    struct lwp_info *lp;
 -  pid_t pid;
--  int status;
+   int status;
  
    /* FIXME: We should probably accept a list of process id's, and
-      attach all of them.  */
-@@ -1076,22 +1097,6 @@ linux_nat_attach (char *args, int from_t
+@@ -1076,21 +1225,12 @@ linux_nat_attach (char *args, int from_t
    inferior_ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid));
    lp = add_lwp (inferior_ptid);
  
@@ -307,11 +318,16 @@
 -
 -  gdb_assert (pid == GET_PID (inferior_ptid)
 -	      && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP);
--
++  status = linux_ptrace_post_attach (lp);
++  if (status != 0)
++    error (_("Program %s exited: %s\n"), target_pid_to_str (inferior_ptid),
++	   status_to_str (status));
++  if (lp->cloned)
++    warning (_("%s is a cloned process"), target_pid_to_str (inferior_ptid));
+ 
    lp->stopped = 1;
  
-   /* Fake the SIGSTOP that core GDB expects.  */
-@@ -1099,8 +1104,8 @@ linux_nat_attach (char *args, int from_t
+@@ -1099,8 +1239,8 @@ linux_nat_attach (char *args, int from_t
    lp->resumed = 1;
    if (debug_linux_nat)
      {
@@ -322,26 +338,44 @@
      }
  }
  
-diff -u -rup gdb-6.6-orig/gdb/target.h gdb-6.6/gdb/target.h
---- gdb-6.6-orig/gdb/target.h	2007-06-06 13:30:52.000000000 +0200
-+++ gdb-6.6/gdb/target.h	2007-06-06 13:33:11.000000000 +0200
-@@ -529,9 +529,9 @@ void target_close (struct target_ops *ta
-    to the `attach' command by the user.  This routine can be called
-    when the target is not on the target-stack, if the target_can_run
-    routine returns 1; in that case, it must push itself onto the stack.
--   Upon exit, the target should be ready for normal operations, and
--   should be ready to deliver the status of the process immediately
--   (without waiting) to an upcoming target_wait call.  */
-+   Upon exit, the target should be ready for normal operations.
-+   The status of the inferior is already processed and possibly pending
-+   signals redelivered.  */
- 
- #define	target_attach(args, from_tty)	\
-      (*current_target.to_attach) (args, from_tty)
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.c gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.c
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.c	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.c	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,65 @@
+@@ -1173,6 +1313,9 @@ linux_nat_detach (char *args, int from_t
+ 
+   trap_ptid = null_ptid;
+ 
++  if (lwp_list->was_stopped)
++    args = STRINGIFY (SIGSTOP);
++
+   /* Destroy LWP info; it's no longer valid.  */
+   init_lwp_list ();
+ 
+@@ -1310,6 +1453,12 @@ linux_nat_resume (ptid_t ptid, int step_
+       lp->stopped = 0;
+     }
+ 
++  /* At this point, we are going to resume the inferior and if we
++     have attached to a stopped process, we no longer should leave
++     it as stopped if the user detaches.  */
++  if (!step && lp != NULL)
++    lp->was_stopped = 0;
++
+   if (resume_all)
+     iterate_over_lwps (resume_callback, NULL);
+ 
+--- ./gdb/linux-nat.h	10 May 2007 21:36:00 -0000	1.18
++++ ./gdb/linux-nat.h	29 Jun 2007 22:06:05 -0000
+@@ -42,6 +42,9 @@ struct lwp_info
+   /* Non-zero if this LWP is stopped.  */
+   int stopped;
+ 
++  /* Non-zero if this LWP was stopped by SIGSTOP before attaching.  */
++  int was_stopped;
++
+   /* Non-zero if this LWP will be/has been resumed.  Note that an LWP
+      can be marked both as stopped and resumed at the same time.  This
+      happens if we try to resume an LWP that has a wait status
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-into-signal.c	29 Jun 2007 22:06:05 -0000
+@@ -0,0 +1,70 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2007 Free Software Foundation, Inc.
@@ -385,6 +419,11 @@
 +
 +  raise (SIGALRM);
 +
++  /* It is an upstream kernel bug (2.6.22-rc4-git7.x86_64, PREEMPT, SMP).
++     We never get here without ptrace(2) but we get while under ptrace(2).  */
++  for (;;)
++    pause ();
++
 +  abort ();
 +  /* NOTREACHED */
 +  return NULL;
@@ -407,10 +446,9 @@
 +
 +  return 0;
 +}
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.exp gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.exp
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.exp	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.exp	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,153 @@
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-into-signal.exp	29 Jun 2007 22:06:06 -0000
+@@ -0,0 +1,176 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -472,12 +510,33 @@
 +
 +    # linux-2.6.20.4.x86_64 had maximal attempt # 20 in 4 test runs.
 +    set attempts 100
-+    set attempt 0
++    set attempt 1
 +    set passes 1
-+    while { $passes < 3 && $attempt < $attempts } {
++    while { $passes < 3 && $attempt <= $attempts } {
 +
 +	# Start with clean gdb
 +	gdb_exit
++
++	set stoppedtry 0
++	while { $stoppedtry < 10 } {
++	    set fileid [open /proc/${testpid}/status r];
++	    gets $fileid line1;
++	    gets $fileid line2;
++	    close $fileid;
++
++	    if {![string match "*(stopped)*" $line2]} {
++		# No PASS message as we may be looping in multiple attempts.
++		break
++	    }
++	    sleep 1
++	    set stoppedtry [expr $stoppedtry + 1]
++	}
++	if { $stoppedtry >= 10 } {
++	    verbose -log $line2
++	    set test "$threadtype: process is still running on the attempt # $attempt of $attempts"
++	    break
++	}
++
 +	gdb_start
 +	gdb_reinitialize_dir $srcdir/$subdir
 +	gdb_load ${binfile}
@@ -528,7 +587,11 @@
 +	}
 +    }
 +    if {$passes < 3} {
-+	fail $test
++	if {$attempt > $attempts} {
++	    unresolved $test
++	} else {
++	    fail $test
++	}
 +    }
 +
 +    # Exit and detach the process.
@@ -555,18 +618,15 @@
 +
 +corefunc nonthreaded
 +
-+# build the test case first without threads
++# build the test case also with threads
 +#
 +if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DUSE_THREADS}] != "" } {
 +    gdb_suppress_entire_file "Testcase threaded compile failed, so all tests in this file will automatically fail."
 +}
 +
 +corefunc threaded
-+
-+return 0
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.c gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.c
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.c	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.c	2007-06-06 13:33:11.000000000 +0200
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-stopped.c	29 Jun 2007 22:06:06 -0000
 @@ -0,0 +1,51 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -619,10 +679,9 @@
 +
 +  return 0;
 +}
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.exp gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.exp
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.exp	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,208 @@
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-stopped.exp	29 Jun 2007 22:06:06 -0000
+@@ -0,0 +1,213 @@
 +# Copyright 2005-2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -682,8 +741,10 @@
 +    # that it can be attached to.
 +
 +    set testpid [eval exec $binfile &]
-+    exec sleep 2
-+       
++
++    # Avoid some race:
++    sleep 2
++
 +    # Stop the program 
 +    remote_exec build "kill -s STOP ${testpid}"
 +
@@ -725,6 +786,9 @@
 +       
 +    gdb_exit
 +
++    # Avoid some race:
++    sleep 2
++
 +    set fileid [open /proc/${testpid}/status r];
 +    gets $fileid line1;
 +    gets $fileid line2;
@@ -790,7 +854,7 @@
 +    gdb_exit
 +
 +    # Avoid some race:
-+    exec sleep 2
++    sleep 2
 +
 +    # At this point, the process should be sleeping
 +
@@ -831,3 +895,41 @@
 +corefunc threaded
 +
 +return 0
+--- ./gdb/doc/gdb.texinfo	1 Jul 2007 09:13:05 -0000	1.418
++++ ./gdb/doc/gdb.texinfo	1 Jul 2007 09:55:14 -0000
+@@ -2167,16 +2167,29 @@ can step and continue; you can modify st
+ process continue running, you may use the @code{continue} command after
+ attaching @value{GDBN} to the process.
+ 
++For a process already being stopped before the @code{attach} command executed
++you get the informational message below.  Other signals may be occasionally
++shown if they were being delivered right the time the @code{attach} command
++executed.  Such process is left still stopped after the @code{detach} command
++as long as you have not used the @code{continue} command (or similiar one)
++during your debugging session.
++
++ at smallexample
++Attaching to program: /bin/sleep, process 16289
++Redelivering pending Stopped (signal).
++ at end smallexample
++
+ @table @code
+ @kindex detach
+ @item detach
+ When you have finished debugging the attached process, you can use the
+- at code{detach} command to release it from @value{GDBN} control.  Detaching
+-the process continues its execution.  After the @code{detach} command,
+-that process and @value{GDBN} become completely independent once more, and you
+-are ready to @code{attach} another process or start one with @code{run}.
+- at code{detach} does not repeat if you press @key{RET} again after
+-executing the command.
++ at code{detach} command to release it from @value{GDBN} control.  Detaching the
++process continues its execution unless it was already stopped before the
++attachment and a @code{continue} type command has not been executed.  After the
++ at code{detach} command, that process and @value{GDBN} become completely
++independent once more, and you are ready to @code{attach} another process or
++start one with @code{run}.  @code{detach} does not repeat if you press
++ at key{RET} again after executing the command.
+ @end table
+ 
+ If you exit @value{GDBN} while you have an attached process, you detach


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gdb.spec	28 Aug 2007 14:46:38 -0000	1.243
+++ gdb.spec	16 Sep 2007 22:34:35 -0000	1.244
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 26%{?dist}
+Release: 27%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -345,7 +345,7 @@
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 Patch254: gdb-6.6-testsuite-timeouts.patch
 
-# Fix attaching a stopped nonthreaded/threaded process (BZ 219118, 233852).
+# Fix attaching to stopped processes (BZ 219118, 233852).
 # Fix attaching during a pending signal being delivered.
 Patch256: gdb-6.6-bz233852-attach-signalled.patch
 
@@ -683,6 +683,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
+- Fix attaching to stopped processes and/or pending signals.
+
 * Tue Aug 28 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-26
 - New fast verification whether the .debug file matches its peer (build-id).
 - New locating of the matching binaries from the pure core file (build-id).



From fedora-extras-commits at redhat.com  Mon Sep 17 00:15:17 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 20:15:17 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.29, 1.30 gnome-python2.spec, 
	1.10, 1.11 sources, 1.29, 1.30
Message-ID: <200709170015.l8H0FHs5010803@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10779

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	31 Jul 2007 03:30:59 -0000	1.29
+++ .cvsignore	17 Sep 2007 00:14:44 -0000	1.30
@@ -1 +1 @@
-gnome-python-2.19.2.tar.bz2
+gnome-python-2.20.0.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python2.spec	29 Aug 2007 04:54:41 -0000	1.10
+++ gnome-python2.spec	17 Sep 2007 00:14:44 -0000	1.11
@@ -20,8 +20,8 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.19.2
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
@@ -187,6 +187,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
+- Update to 2.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	31 Jul 2007 03:30:59 -0000	1.29
+++ sources	17 Sep 2007 00:14:44 -0000	1.30
@@ -1 +1 @@
-5efaa0de2ef14ce56c0a702ee655fc07  gnome-python-2.19.2.tar.bz2
+b5f17b65333f1cf6a8c0de914eb06191  gnome-python-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 00:30:58 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 20:30:58 -0400
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.15,
	1.16 gnome-python2-desktop.spec, 1.19, 1.20 sources, 1.15, 1.16
Message-ID: <200709170030.l8H0UwvE011234@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11208

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Jul 2007 03:57:23 -0000	1.15
+++ .cvsignore	17 Sep 2007 00:30:25 -0000	1.16
@@ -1 +1 @@
-gnome-python-desktop-2.19.2.tar.bz2
+gnome-python-desktop-2.20.0.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-python2-desktop.spec	29 Aug 2007 04:53:52 -0000	1.19
+++ gnome-python2-desktop.spec	17 Sep 2007 00:30:25 -0000	1.20
@@ -23,8 +23,8 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.19.2
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -281,6 +281,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
+- Update to 2.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.2-4
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Jul 2007 03:57:23 -0000	1.15
+++ sources	17 Sep 2007 00:30:25 -0000	1.16
@@ -1 +1 @@
-721c44d315bd76f003c0325323d89913  gnome-python-desktop-2.19.2.tar.bz2
+02b177f488091d27bf0648ec4660d8f7  gnome-python-desktop-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 00:40:16 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 16 Sep 2007 20:40:16 -0400
Subject: rpms/flac/devel .cvsignore, 1.6, 1.7 flac.spec, 1.32, 1.33 sources, 
	1.7, 1.8
Message-ID: <200709170040.l8H0eGWo011446@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371

Modified Files:
	.cvsignore flac.spec sources 
Log Message:
* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
- Update to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Sep 2007 21:59:47 -0000	1.6
+++ .cvsignore	17 Sep 2007 00:39:41 -0000	1.7
@@ -1 +1 @@
-flac-1.2.0.tar.gz
+flac-1.2.1.tar.gz


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- flac.spec	12 Sep 2007 21:05:16 -0000	1.32
+++ flac.spec	17 Sep 2007 00:39:41 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
 - Make a few functions hidden, to try and avoid textrels
 - Disable optimisations on x86 for the same reason


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Sep 2007 21:59:47 -0000	1.7
+++ sources	17 Sep 2007 00:39:41 -0000	1.8
@@ -1 +1 @@
-ea176bfb291707b46a537b091c226ae7  flac-1.2.0.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 01:14:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:14:26 -0400
Subject: rpms/intltool/devel .cvsignore, 1.20, 1.21 intltool.spec, 1.37,
	1.38 sources, 1.20, 1.21
Message-ID: <200709170114.l8H1EQlg018004@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/intltool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982

Modified Files:
	.cvsignore intltool.spec sources 
Log Message:
0.36.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Aug 2007 22:27:22 -0000	1.20
+++ .cvsignore	17 Sep 2007 01:13:51 -0000	1.21
@@ -1 +1 @@
-intltool-0.36.1.tar.bz2
+intltool-0.36.2.tar.bz2


Index: intltool.spec
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- intltool.spec	13 Aug 2007 22:27:22 -0000	1.37
+++ intltool.spec	17 Sep 2007 01:13:51 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
-Version: 0.36.1
+Version: 0.36.2
 Release: 1%{?dist}
 License: GPLv2 with exception
 Group: Development/Tools
@@ -30,7 +30,7 @@
 %build
 %configure
 
-make
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +49,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 0.36.2-1
+- Update to 0.36.2
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 0.36.1-1
 - Update to 0.36.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Aug 2007 22:27:22 -0000	1.20
+++ sources	17 Sep 2007 01:13:51 -0000	1.21
@@ -1 +1 @@
-1822943ce6745596b2510d2b425cb90d  intltool-0.36.1.tar.bz2
+e41b8d791775fbd683784408f0e336a4  intltool-0.36.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 01:34:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:34:59 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.53, 1.54 gnome-applets.spec, 
	1.239, 1.240 sources, 1.56, 1.57
Message-ID: <200709170134.l8H1Yx5j018286@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18260

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	4 Sep 2007 05:30:53 -0000	1.53
+++ .cvsignore	17 Sep 2007 01:34:23 -0000	1.54
@@ -1 +1 @@
-gnome-applets-2.19.91.tar.bz2
+gnome-applets-2.20.0.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- gnome-applets.spec	4 Sep 2007 05:30:53 -0000	1.239
+++ gnome-applets.spec	17 Sep 2007 01:34:23 -0000	1.240
@@ -33,7 +33,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.19.91
+Version:	2.20.0
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
@@ -334,6 +334,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	4 Sep 2007 05:30:53 -0000	1.56
+++ sources	17 Sep 2007 01:34:23 -0000	1.57
@@ -1 +1 @@
-76f4e9cafe36de383de6ce7da9586d02  gnome-applets-2.19.91.tar.bz2
+985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 01:42:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:42:09 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.37, 1.38 libgtop2.spec, 1.56,
	1.57 sources, 1.37, 1.38 libgtop-2.0.2-prog_as.patch, 1.1, NONE
Message-ID: <200709170142.l8H1g9kU018427@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgtop2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405

Modified Files:
	.cvsignore libgtop2.spec sources 
Removed Files:
	libgtop-2.0.2-prog_as.patch 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	4 Sep 2007 03:32:24 -0000	1.37
+++ .cvsignore	17 Sep 2007 01:41:33 -0000	1.38
@@ -1 +1 @@
-libgtop-2.19.92.tar.bz2
+libgtop-2.20.0.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libgtop2.spec	4 Sep 2007 03:32:24 -0000	1.56
+++ libgtop2.spec	17 Sep 2007 01:41:33 -0000	1.57
@@ -6,12 +6,12 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.19.92
+Version: 	2.20.0
 Release: 	1%{?dist}
 License: 	GPLv2+
-URL:            http://download.gnome.org/sources/libgtop/2.19
+URL:            http://download.gnome.org/sources/libgtop/2.20
 Group:          System Environment/Libraries
-Source: 	http://download.gnome.org/sources/libgtop/2.19/libgtop-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/libgtop/2.20/libgtop-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	glib2 >= %{glib2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
@@ -21,8 +21,6 @@
 BuildRequires:  automake 
 BuildRequires:  gtk-doc
 
-Patch: libgtop-2.0.2-prog_as.patch
-
 %description
 libgtop is a library for portably obtaining information about processes, 
 such as their PID, memory usage, etc.
@@ -33,6 +31,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= %{glib2_version}
 Requires: 	pkgconfig
+Requires:	gtk-doc
 
 %description devel
 This package provides the necessary development libraries and include
@@ -40,16 +39,8 @@
 
 %prep
 %setup -q -n libgtop-%{version}
-%patch -p1 -b .prog_as
 
 %build
-# prog_as patches configure.in
-libtoolize --force
-aclocal
-automake --add-missing
-autoconf
-autoheader
-
 %configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -84,6 +75,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	4 Sep 2007 03:32:24 -0000	1.37
+++ sources	17 Sep 2007 01:41:33 -0000	1.38
@@ -1 +1 @@
-12edde75a0b7cf92ac89206f89f9e275  libgtop-2.19.92.tar.bz2
+ddc05ffe9499294801cbd5fdac949045  libgtop-2.20.0.tar.bz2


--- libgtop-2.0.2-prog_as.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 01:51:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:51:24 -0400
Subject: rpms/orca/devel .cvsignore, 1.19, 1.20 orca.spec, 1.31, 1.32 sources,
	1.20, 1.21
Message-ID: <200709170151.l8H1pOmk018700@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Sep 2007 14:02:48 -0000	1.19
+++ .cvsignore	17 Sep 2007 01:50:47 -0000	1.20
@@ -1 +1 @@
-orca-2.19.92.tar.bz2
+orca-2.20.0.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- orca.spec	4 Sep 2007 14:02:48 -0000	1.31
+++ orca.spec	17 Sep 2007 01:50:47 -0000	1.32
@@ -15,14 +15,14 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.19.92
+Version:	2.20.0
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
 Group:		User Interface/Desktops
 License:	LGPLv2+
 URL:		http://www.gnome.org/projects/orca/
-Source0:	http://download.gnome.org/sources/orca/2.19/orca-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/orca/2.20/orca-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel >= %{python_version}
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Sep 2007 14:02:48 -0000	1.20
+++ sources	17 Sep 2007 01:50:47 -0000	1.21
@@ -1 +1 @@
-d41a3d88509537f7674285d8a564f6b6  orca-2.19.92.tar.bz2
+00b47210528c6e00ff681c4ddbe2ec74  orca-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 04:41:58 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:41:58 -0400
Subject: rpms/homebank/devel homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170441.l8H4fwk9003351@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3330/devel

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:41:25 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:41:25 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 04:44:09 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:44:09 -0400
Subject: rpms/homebank/F-7 homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170444.l8H4i956003446@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3417/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:43:36 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:43:36 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 04:45:36 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:45:36 -0400
Subject: rpms/homebank/FC-6 homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170445.l8H4jaP1003543@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:45:04 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:45:04 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 05:59:03 2007
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 17 Sep 2007 01:59:03 -0400
Subject: rpms/orpie/devel orpie.spec,1.4,1.5
Message-ID: <200709170559.l8H5x3vS010752@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/orpie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726

Modified Files:
	orpie.spec 
Log Message:
New spec for the new version of orpie.  Unfortunately, whereas before it didn't
compile because fedora 7 was too new, it won't compile now because it needs gsl
version 1.9 or greater (f-7 only has 1.8).



Index: orpie.spec
===================================================================
RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orpie.spec	8 Sep 2006 21:01:03 -0000	1.4
+++ orpie.spec	17 Sep 2007 05:58:29 -0000	1.5
@@ -3,8 +3,8 @@
 #
 
 Name:           orpie
-Version:        1.4.3
-Release:        5%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        A fullscreen console-based RPN calculator
 
 Group:          Applications/Engineering
@@ -20,11 +20,11 @@
 ################################################################################
 
 BuildRequires:  camlp4
-BuildRequires:  gsl-devel
+BuildRequires:  gsl-devel >= 1.9
 BuildRequires:  ncurses-devel
 
 Requires:       ocaml >= 3.07
-Requires:       gsl   >= 1.4
+Requires:       gsl   >= 1.9
 Requires:       camlp4
 
 ################################################################################
@@ -81,6 +81,9 @@
 
 %changelog
 
+* Sun Sep 16 2007   Chris Petersen <rpm at forevermore.net>                 1.5.1-1
+- Update to version 1.5.1
+
 * Fri Sep  8 2006   Chris Petersen <rpm at forevermore.net>                 1.4.3-5
 - Rebuild for FC6 glibc update
 



From fedora-extras-commits at redhat.com  Mon Sep 17 06:00:45 2007
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 17 Sep 2007 02:00:45 -0400
Subject: rpms/orpie/devel sources,1.2,1.3
Message-ID: <200709170600.l8H60jFc010826@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/orpie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10779

Modified Files:
	sources 
Log Message:
Upload the tarball for orpie 1.5.1 on the off chance that fedora 7 or 8 will update to gsl 1.9



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orpie/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 00:07:38 -0000	1.2
+++ sources	17 Sep 2007 06:00:12 -0000	1.3
@@ -1 +1 @@
-1c9d87cf3f8d982a9a3662d48e13de55  orpie-1.4.3.tar.gz
+4511626ed853354af1b4b5dbbf143a1f  orpie-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 06:20:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 02:20:50 -0400
Subject: rpms/fast-user-switch-applet/devel error-dialog.patch, NONE,
	1.1 many-users.patch, NONE, 1.1 throttle.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.15, 1.16
Message-ID: <200709170620.l8H6KoXc017311@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17254

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	error-dialog.patch many-users.patch throttle.patch 
Log Message:
Some bug fixes


error-dialog.patch:

--- NEW FILE error-dialog.patch ---
diff -up fast-user-switch-applet-2.18.0/src/applet.c.error-dialog fast-user-switch-applet-2.18.0/src/applet.c
--- fast-user-switch-applet-2.18.0/src/applet.c.error-dialog	2007-09-16 23:51:41.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/applet.c	2007-09-16 23:51:41.000000000 -0400
@@ -2147,6 +2147,7 @@ show_error_dialog (FusaAppletData *adata
 
       dialog = glade_xml_get_widget (xml, "error_dialog");
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
 
       if (is_fatal)
 	bonobo_main_quit ();
diff -up fast-user-switch-applet-2.18.0/data/ui.glade.error-dialog fast-user-switch-applet-2.18.0/data/ui.glade
--- fast-user-switch-applet-2.18.0/data/ui.glade.error-dialog	2007-09-16 23:57:08.000000000 -0400
+++ fast-user-switch-applet-2.18.0/data/ui.glade	2007-04-09 12:01:04.000000000 -0400
@@ -726,7 +726,7 @@
 		<widget class="GtkExpander" id="details_expander">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="expanded">True</property>
+		  <property name="expanded">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>

many-users.patch:

--- NEW FILE many-users.patch ---
diff -up fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users fast-user-switch-applet-2.18.0/src/fusa-manager.c
--- fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users	2007-09-17 01:56:45.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-manager.c	2007-09-17 02:08:59.000000000 -0400
@@ -129,11 +129,13 @@ struct _FusaManager
 
   GHashTable *shells;
   GHashTable *exclusions;
+  GHashTable *inclusions;
   gchar *global_face_dir;
   uid_t minimal_uid;
   gsize user_max_file;
   gint max_icon_size;
 
+  guint8 include_all : 1;
   guint8 allow_root  : 1;
   guint8 relax_group : 1;
   guint8 relax_other : 1;
@@ -341,6 +343,8 @@ fusa_manager_init (FusaManager *manager)
   /* GDM config file */
   manager->exclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       g_free, NULL);
+  manager->inclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
   reload_gdm_config (manager, FALSE);
   error = NULL;
   uri = g_filename_to_uri (GDMCONFIGFILE, NULL, &error);
@@ -645,6 +649,38 @@ merge_gdm_exclusions (FusaManager  *mana
   return TRUE;
 }
 
+/* Returns TRUE if changed */
+static gboolean
+merge_gdm_inclusions (FusaManager  *manager,
+		      gchar       **includev,
+		      const gchar  *include_default[])
+{
+  gint i;
+
+  if (strv_equals_string_table (includev, manager->inclusions))
+    return FALSE;
+
+  g_hash_table_foreach_remove (manager->inclusions,
+			       clear_hash_table_hrfunc, NULL);
+
+  if (include_default)
+    {
+      for (i = 0; include_default[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (include_default[i]),
+			     GUINT_TO_POINTER (TRUE));
+    }
+
+  if (includev)
+    {
+      for (i = 0; includev[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (includev[i]), GUINT_TO_POINTER (TRUE));
+    }
+
+  return TRUE;
+}
+
 static void resolve_dirty_flags(GdmResultState dummy1, const gchar *dummy2, gpointer data)
 {
   FusaManager *manager = data;
@@ -687,6 +723,27 @@ static void handler_Exclude(GdmResultSta
     manager->users_dirty = TRUE;
 }
 
+static void handler_Include(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gchar** includev = g_strsplit (value, ",", G_MAXINT);
+  
+  if (merge_gdm_inclusions (manager, includev, NULL))
+    manager->users_dirty = TRUE;
+}
+
+static void handler_IncludeAll(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gboolean tmp_include_all = strcasecmp(value, "false") != 0;
+  
+  if (tmp_include_all != manager->include_all)
+    {
+      manager->include_all = tmp_include_all;
+      manager->users_dirty = TRUE;
+    }
+}
+
 static void handler_GlobalFaceDir(GdmResultState is_ok, const gchar *value, gpointer data)
 {
   FusaManager *manager = data;
@@ -744,6 +801,8 @@ struct SettingsHandler {
 } settings_handlers[] = {
   { "greeter/MinimalUID", handler_MinimalUID },
   { "greeter/Exclude", handler_Exclude },
+  { "greeter/Include", handler_Include },
+  { "greeter/IncludeAll", handler_IncludeAll },
   { "greeter/GlobalFaceDir", handler_GlobalFaceDir },
   { "security/UserMaxFile", handler_UserMaxFile },
   { "security/AllowRoot", handler_AllowRoot },
@@ -798,27 +857,76 @@ reload_shells (FusaManager *manager)
   endusershell ();
 }
 
-static void
-reload_passwd (FusaManager *manager)
+#define OLD_FLAG 1
+#define NEW_FLAG 2
+
+static void set_flag (GObject *obj, int flag)
 {
-  struct passwd *pwent;
-  GSList *old_users, *new_users, *list;
-  
-  old_users = NULL;
-  new_users = NULL;
+  int flags;
+
+  flags = GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+  flags |= flag;
+  g_object_set_data (obj, "fusa-user-flags", GINT_TO_POINTER (flags));  
+}
+
+static int get_flags (GObject *obj)
+{
+  return GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+}
+
+static void clear_flags (GObject *obj)
+{
+  g_object_set_data (obj, "fusa-user-flags", NULL);
+}
 
-  g_hash_table_foreach (manager->users, listify_hash_values_hfunc, &old_users);
-  g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+static void mark_as_old (gpointer key, gpointer value, gpointer data)
+{
+  GObject *user = value;
 
+  set_flag (user, OLD_FLAG);  
   /* Make sure we keep users who are logged in no matter what. */
-  for (list = old_users; list; list = list->next)
+  if (fusa_user_get_n_displays (FUSA_USER (user)))
     {
-      if (fusa_user_get_n_displays (list->data))
-	{
-	  g_object_freeze_notify (G_OBJECT (list->data));
-	  new_users = g_slist_prepend (new_users, g_object_ref (list->data));
-	}
+      set_flag (user, NEW_FLAG);
+      g_object_freeze_notify (user);
+    }
+}
+
+static gboolean emit_add_or_remove (gpointer key, gpointer value, gpointer data)
+{
+  FusaManager *manager = data;
+  int flags;
+
+  flags = get_flags (value);
+  clear_flags (value);
+
+  if (flags == NEW_FLAG) 
+    { 
+      g_signal_emit (manager, signals[USER_ADDED], 0, value);
+      return FALSE;
+    }
+  else if (flags == OLD_FLAG)
+    {
+      g_signal_emit (manager, signals[USER_REMOVED], 0, value);
+      g_hash_table_remove (manager->users_by_uid,
+			   GINT_TO_POINTER (fusa_user_get_uid (value)));
+      return TRUE;
     }
+  else
+    return FALSE;
+}
+
+static void thaw (gpointer key, gpointer value, gpointer data)
+{
+  g_object_thaw_notify (value);
+}
+
+static void
+reload_passwd (FusaManager *manager)
+{
+  struct passwd *pwent;
+  
+  g_hash_table_foreach (manager->users, mark_as_old, NULL);
 
   setpwent ();
 
@@ -841,65 +949,36 @@ reload_passwd (FusaManager *manager)
       if (g_hash_table_lookup (manager->exclusions, pwent->pw_name))
 	continue;
 
+      if (g_hash_table_size (manager->inclusions) > 0)
+        {
+          if (!g_hash_table_lookup (manager->inclusions, pwent->pw_name))
+            continue;
+        }
+      else if (!manager->include_all)
+        continue;
+      
       user = g_hash_table_lookup (manager->users, pwent->pw_name);
 
-      /* Update users already in the *new* list */
-      if (g_slist_find (new_users, user))
-	{
-	  _fusa_user_update (user, pwent);
-	  continue;
-	}
-
-      if (!user)
-	user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
-      else
-	g_object_ref (user);
+      if (!user) 
+        {
+	  user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
+          g_hash_table_insert (manager->users,
+	  		       g_strdup (pwent->pw_name),
+			       user);
+          g_hash_table_insert (manager->users_by_uid,
+			       GINT_TO_POINTER (pwent->pw_uid),
+			       g_object_ref (user));
+        }
 
-      /* Freeze & update users not already in the new list */
       g_object_freeze_notify (G_OBJECT (user));
       _fusa_user_update (user, pwent);
-
-      new_users = g_slist_prepend (new_users, user);
+      set_flag (G_OBJECT (user), NEW_FLAG);
     }
   
   endpwent ();
 
-  /* Go through and handle added users */
-  for (list = new_users; list; list = list->next)
-    {
-      if (!g_slist_find (old_users, list->data))
-	{
-	  g_hash_table_insert (manager->users,
-			       g_strdup (fusa_user_get_user_name (list->data)),
-			       g_object_ref (list->data));
-	  g_hash_table_insert (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)),
-			       list->data);
-	  g_signal_emit (manager, signals[USER_ADDED], 0, list->data);
-	}
-    }
-
-  /* Go through and handle removed users */
-  for (list = old_users; list; list = list->next)
-    {
-      if (!g_slist_find (new_users, list->data))
-	{
-	  g_signal_emit (manager, signals[USER_REMOVED], 0, list->data);
-	  g_hash_table_remove (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)));
-	  g_hash_table_remove (manager->users,
-			       fusa_user_get_user_name (list->data));
-          /* FIXME: signals[USER_REMOVED]??? Why not? */
-	}
-    }
-
-  /* Cleanup */
-  g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
-  g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (new_users);
-
-  g_slist_foreach (old_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (old_users);
+  g_hash_table_foreach_remove (manager->users, emit_add_or_remove, manager);
+  g_hash_table_foreach (manager->users, thaw, NULL);
 }
 
 
diff -up fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users fast-user-switch-applet-2.18.0/src/fusa-user.c
--- fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users	2007-04-09 12:01:02.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-user.c	2007-09-17 01:56:45.000000000 -0400
@@ -81,6 +81,7 @@ struct _FusaUser
   gchar *display_name;
   gchar *home_dir;
   gchar *shell;
+  gchar *key;
 
   GSList *displays;
 };
@@ -444,6 +445,9 @@ _fusa_user_update (FusaUser            *
       g_object_notify (G_OBJECT (user), "shell");
     }
 
+  g_free (user->key);
+  user->key = NULL;
+
   g_object_thaw_notify (G_OBJECT (user));
 }
 
@@ -684,12 +688,28 @@ fusa_user_render_icon (FusaUser  *user,
   return _fusa_manager_render_icon (user->manager, user, widget, icon_size);
 }
 
+static gchar *
+get_collate_key (FusaUser *user)
+{
+  if (!user->key)
+    {
+      gchar *str;
+
+      if (user->display_name)
+        str = user->display_name;
+      else
+        str = user->username;
+
+      user->key = g_utf8_collate_key (str, -1);
+    }
+
+  return user->key;
+}
+
 gint
 fusa_user_collate (FusaUser *user1,
 		   FusaUser *user2)
 {
-  const gchar *str1, *str2;
-
   g_return_val_if_fail (user1 == NULL || FUSA_IS_USER (user1), 0);
   g_return_val_if_fail (user2 == NULL || FUSA_IS_USER (user2), 0);
 
@@ -702,24 +722,5 @@ fusa_user_collate (FusaUser *user1,
   if (!user1 && !user2)
     return 0;
 
-  if (user1->display_name)
-    str1 = user1->display_name;
-  else
-    str1 = user1->username;
-
-  if (user2->display_name)
-    str2 = user2->display_name;
-  else
-    str2 = user2->username;
-
-  if (!str1 && str2)
-    return -1;
-
-  if (str1 && !str2)
-    return 1;
-
-  if (!str1 && !str2)
-    return 0;
-
-  return g_utf8_collate (str1, str2);
+  return strcmp (get_collate_key (user1), get_collate_key (user2));
 }

throttle.patch:

--- NEW FILE throttle.patch ---
diff -up fast-user-switch-applet-2.18.0/src/applet.c.throttle fast-user-switch-applet-2.18.0/src/applet.c
--- fast-user-switch-applet-2.18.0/src/applet.c.throttle	2007-09-16 23:28:17.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/applet.c	2007-09-16 23:29:07.000000000 -0400
@@ -2347,18 +2347,16 @@ maybe_lock_screen (FusaAppletData *adata
 	  g_error_free (err);
 	}
 
-      if (use_gscreensaver)
-	args[1] = "--throttle";
-      else
-	args[1] = "-throttle";
+      args[1] = "-throttle";
 
-      if (!gdk_spawn_on_screen (screen, g_get_home_dir (), args, NULL,
+      if (use_gscreensaver ||
+          !gdk_spawn_on_screen (screen, g_get_home_dir (), args, NULL,
 				(G_SPAWN_STDERR_TO_DEV_NULL |
 				 G_SPAWN_STDOUT_TO_DEV_NULL),
 				NULL, NULL, NULL, &err))
 	{
 	  g_warning (_("Can't temporarily set screensaver to blank screen: %s"),
-		     err->message);
+		     err ? err->message : "");
 	  g_error_free (err);
 	}
 


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fast-user-switch-applet.spec	6 Aug 2007 06:00:13 -0000	1.15
+++ fast-user-switch-applet.spec	17 Sep 2007 06:20:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
 Version:        2.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -16,6 +16,12 @@
 Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477639
+Patch6:		throttle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477656
+Patch7:		error-dialog.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477666
+Patch8:		many-users.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +61,9 @@
 %patch3 -p1 -b .no-session
 %patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
+%patch6 -p1 -b .throttle
+%patch7 -p1 -b .error-dialog
+%patch8 -p1 -b .many-users
 
 %build
 %configure --disable-scrollkeeper \
@@ -97,7 +106,7 @@
 fi
  
 %postun
-scrollkeeper-update -q || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -109,6 +118,11 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3
+- Don't try to throttle gnome-screensaver (#246188)
+- Make the close button on the error dialog work
+- Make the handling of large numbers of users more efficient (#353831)
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-2
 - Use %%find_lang for help files, too
 



From fedora-extras-commits at redhat.com  Mon Sep 17 07:08:39 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 03:08:39 -0400
Subject: rpms/procps/F-7 procps-3.2.7-top-cpu0.patch, NONE, 1.1 procps.spec, 
	1.63, 1.64
Message-ID: <200709170708.l8H78dUx024067@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24042

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-top-cpu0.patch 
Log Message:
* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16
- fix #185994 - top "Cpu0" line never updates when using
  "Single Cpu = Off" option on single processor machine


procps-3.2.7-top-cpu0.patch:

--- NEW FILE procps-3.2.7-top-cpu0.patch ---
--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
+++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
@@ -959,8 +959,15 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
 
    // now value each separate cpu's tics


Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/F-7/procps.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- procps.spec	20 Aug 2007 13:03:01 -0000	1.63
+++ procps.spec	17 Sep 2007 07:08:04 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -60,6 +60,8 @@
 Patch28: procps-3.2.7-ps-eip64.patch
 #244960 - ps manpage formatted incorrectly
 Patch29: procps-3.2.7-psman.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch30: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -114,6 +116,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 cp %SOURCE1 .
 
@@ -151,6 +154,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-15
 - fix #244960 - ps manpage formatted incorrectly
 - update license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 07:31:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 03:31:44 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.134,
	1.135 openoffice.org.spec, 1.1305, 1.1306 sources, 1.249, 1.250
Message-ID: <200709170731.l8H7Via9024573@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24537

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
release candidate OOG680_m5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- .cvsignore	6 Sep 2007 08:06:15 -0000	1.134
+++ .cvsignore	17 Sep 2007 07:31:11 -0000	1.135
@@ -4,4 +4,3 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
-OOG680_m4.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -r1.1305 -r1.1306
--- openoffice.org.spec	12 Sep 2007 13:55:49 -0000	1.1305
+++ openoffice.org.spec	17 Sep 2007 07:31:11 -0000	1.1306
@@ -1,5 +1,5 @@
 %define oootag OOG680
-%define ooomilestone 4
+%define ooomilestone 5
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2779,6 +2779,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.0-5.1
+- release candidate
+
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
 - next version
 - ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p to


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- sources	6 Sep 2007 08:06:15 -0000	1.249
+++ sources	17 Sep 2007 07:31:11 -0000	1.250
@@ -4,4 +4,3 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-913fa35cd89e620a2b6ac9315c632721  OOG680_m4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 07:38:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 03:38:24 -0400
Subject: rpms/tk/devel tk-gifoverflow.patch,NONE,1.1 tk.spec,1.43,1.44
Message-ID: <200709170738.l8H7cOTg024900@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24864

Modified Files:
	tk.spec 
Added Files:
	tk-gifoverflow.patch 
Log Message:
CVE-2007-4851 Tk GIF processing buffer overflow


tk-gifoverflow.patch:

--- NEW FILE tk-gifoverflow.patch ---
--- tk8.4.15/generic/tkImgGIF.c.old	2006-03-27 14:13:56.000000000 +0200
+++ tk8.4.15/generic/tkImgGIF.c	2007-09-17 09:28:42.000000000 +0200
@@ -995,7 +995,7 @@
 	 */
 	if (interlace) {
 	    ypos += interlaceStep[pass];
-	    while (ypos >= height) {
+	    while (ypos >= rows) {
 		pass++;
 		if (pass > 3) {
 		    return TCL_OK;


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- tk.spec	31 Aug 2007 17:59:06 -0000	1.43
+++ tk.spec	17 Sep 2007 07:37:51 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -18,6 +18,7 @@
 # panedwindow.n from itcl conflicts
 Conflicts: itcl <= 3.2
 Patch1: tk-confi.patch
+Patch2: tk-gifoverflow.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -39,7 +40,8 @@
 %prep
 %setup -n %{name}%{version} -q
 
-%patch1  -p1 -b .confi
+%patch1 -p1 -b .confi
+%patch2 -p1 -b .buffer
 
 %build
 cd unix
@@ -107,6 +109,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 17 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-5
+- CVE-2007-4851 Tk GIF processing buffer overflow
+- Resolves: rhbz#290991
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 1:8.4.15-4
 - BR gawk to unbreak things
 



From fedora-extras-commits at redhat.com  Mon Sep 17 07:42:23 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 03:42:23 -0400
Subject: rpms/libzzub/devel libzzub-buildfix.patch, NONE,
	1.1 libzzub-internalflacfix.patch, NONE,
	1.1 libzzub-sonamefix.patch, NONE, 1.1 libzzub.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709170742.l8H7gNkA025124@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libzzub-buildfix.patch libzzub-internalflacfix.patch 
	libzzub-sonamefix.patch libzzub.spec 
Log Message:
initial import


libzzub-buildfix.patch:

--- NEW FILE libzzub-buildfix.patch ---
diff -up libzzub-0.2.3/SConstruct.buildfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.buildfix	2007-09-11 21:51:01.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-11 21:51:30.000000000 +0200
@@ -70,6 +70,7 @@ opts.Add("LUNARTARGET", 'Target for Luna
 opts.Add("SSE", "Support SSE instructions", False, None, bool_converter)
 opts.Add("SSE2", "Support SSE2 instructions", False, None, bool_converter)
 opts.Add("MP3", "Support loading of MP3 samples", linux, None, bool_converter)
+opts.Add("JOBS", "Number of threads to compile with", '2')
 
 env = Environment(ENV = os.environ, options=opts)
 
@@ -105,9 +106,12 @@ env['ROOTPATH'] = os.getcwd()
 env.Append(CCFLAGS=['-D__SCONS__'])
 env.Append(LIBPATH=['${ROOTPATH}/lib'])
 
+SetOption('num_jobs', env['JOBS'].replace('-j', ''))
+
 if posix:
 	env.Append(CCFLAGS=[
 		'-DPOSIX',
+		'-fPIC',
 	])
 	env.Append(LINKFLAGS=[
 		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
@@ -139,12 +143,8 @@ cl = env['CC'] == 'cl'
 if gcc:
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=[
-			'-O3',
-			'-fomit-frame-pointer',
-			'-funroll-loops',
-			'-DNDEBUG',
-		])
+		env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS'))
+		env.Append(CCFLAGS=['-DNDEBUG'])
 	else:
 		env.Append(CCFLAGS=[
 			'-g',
@@ -152,19 +152,11 @@ if gcc:
 			'-D_DEBUG',
 		])
 	if env['SSE2'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse2',
 		])
 	elif env['SSE'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse',

libzzub-internalflacfix.patch:

--- NEW FILE libzzub-internalflacfix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.internalflacfix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-11 23:40:04.000000000 +0200
@@ -54,16 +54,8 @@ files = [
 	'input.cpp',
 ]
 
-# we build from our private flac,
-# since some are using 1.1.3, and that
-# one breaks a few things.
-localenv.Append(CPPPATH=[
-	"${ROOTPATH}/src/flac/include"
-])
-localenv.Append(CCFLAGS=[
-	'-DFLAC__NO_DLL',
-])
-env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript")
+# use internal flac support
+localenv.ParseConfig('pkg-config --libs flac')
 
 # minizip, zlib and flac dependencies
 files += [
@@ -82,8 +74,8 @@ if win32:
 	])
 	
 localenv.Append(LIBS=[
-	'FLAC',
 	'z',
+	'c',
 ])
 
 localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB'])
diff -up libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix libzzub-0.2.3/src/libzzub/ccm.cpp
--- libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/ccm.cpp	2007-09-11 23:40:38.000000000 +0200
@@ -1089,7 +1089,7 @@ bool CcmWriter::save(std::string fileNam
 }
 
 
-static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) {
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) {
     StreamWriter* writer=(StreamWriter*)client_data;
 
     writer->writeBytes(buffer, sizeof(FLAC__byte)*bytes);
@@ -1126,7 +1126,7 @@ struct DecoderInfo {
 // buffer can hold. The callback may choose to supply less data and modify the byte count
 // but must be careful not to overflow the buffer. The callback then returns a status code
 // chosen from FLAC__StreamDecoderReadStatus.
-static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) {
     DecoderInfo* info=(DecoderInfo*)client_data;
     StreamReader* reader=info->reader;
 
@@ -1180,19 +1180,21 @@ void flac_stream_decoder_error_callback(
 void decodeFLAC(StreamReader* reader, wave_info_ex& info, int level) {
 
     FLAC__StreamDecoder* stream=FLAC__stream_decoder_new();
-    FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback);
-    FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback);
-    FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback);
-    FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback);
 
     DecoderInfo decoder_info;
     decoder_info.reader=reader;
-    FLAC__stream_decoder_set_client_data(stream, &decoder_info);
+    //FLAC__stream_decoder_set_client_data(stream, &decoder_info);
 
     // we're not intersted in meitadeita
     FLAC__stream_decoder_set_metadata_ignore_all(stream);
 
-    FLAC__stream_decoder_init(stream);
+    FLAC__stream_decoder_init_stream(stream,
+				     flac_stream_decoder_read_callback,
+				     NULL, NULL, NULL, NULL,
+				     flac_stream_decoder_write_callback,
+				     flac_stream_decoder_metadata_callback,
+				     flac_stream_decoder_error_callback,
+				     &decoder_info);
 //    FLAC__stream_decoder_process_single(stream);
     FLAC__stream_decoder_process_until_end_of_stream(stream);
     
@@ -1255,11 +1257,16 @@ bool encodeFLAC(StreamWriter* writer, wa
 	FLAC__stream_encoder_set_bits_per_sample(stream, bps);
 	FLAC__stream_encoder_set_sample_rate(stream, sample_rate);
 	FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples);
-	FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
-	FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
-	FLAC__stream_encoder_set_client_data(stream, writer);
+	// FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
+	// FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
+	// FLAC__stream_encoder_set_client_data(stream, writer);
+
+	int result = FLAC__stream_encoder_init_stream(stream,
+						      flac_stream_encoder_write_callback,
+						      NULL,
+						      NULL,
+						      flac_stream_encoder_metadata_callback, writer);
 
-	int result = FLAC__stream_encoder_init(stream);
 	// if this fails, we want it to crash hard - or else will cause dataloss
 	assert(result == FLAC__STREAM_ENCODER_OK);
 

libzzub-sonamefix.patch:

--- NEW FILE libzzub-sonamefix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.sonamefix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.sonamefix	2007-02-01 04:11:33.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-03 16:15:02.000000000 +0200
@@ -153,6 +153,10 @@ if posix:
 			'-DNEWBUFFER'
 		])
 
+	localenv.Append(LINKFLAGS=[
+		'-Wl,-soname,libzzub.so.0.2.3'
+	])
+
 elif win32:
 	localenv.Append(LIBS=[
 		'portmidi',			


--- NEW FILE libzzub.spec ---
Name:		libzzub
Version:	0.2.3
Release:	5%{?dist}
Summary:	Powerful music sequencing library

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/zzub/
Source0:	%{name}-%{version}-fe.tar.bz2
# The original source code is from:
# http://downloads.sourceforge.net/aldrin/%{name}-%{version}.tar.bz2
#
# To comply with Fedora's Free Software Principles, MP3 support parts had to be
# removed:
# - src/libmad: completely removed
# - src/libzzub/libzzub.cpp: removed MP3 support part

Patch0:		libzzub-buildfix.patch
Patch1:		libzzub-sonamefix.patch
Patch2:		libzzub-internalflacfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64
BuildRequires:	scons >= 0.96.94
BuildRequires:	zlib-devel
BuildRequires:	libsndfile-devel >= 1.0.17
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	alsa-lib-devel
BuildRequires:	dos2unix
BuildRequires:	flac-devel >= 1.1.4
Requires:	libsndfile >= 1.0.17

%description
If you are searching for a foundation for your next Soundtracker, libzzub is
what you want. libzzub provides an extensible DSP plugin system, a
wavetable, instruments, a multitrack sequencer and support for major soundcard
APIs.


%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
mac2unix SConstruct
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .sonamefix
mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
%patch2 -p1 -b .internalflacfix


%build
find \
	-regextype posix-egrep \
	-regex '.*\.(h|html|c|cpp)' \
	-exec mac2unix '{}' \; \
	-exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS.txt > CREDITS
%{__rm} CREDITS.txt

scons configure \
	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
	LIBDIR=/%{_lib} \
	DEBUG=false \
	JOBS=%{?_smp_mflags} \
	MP3=false

scons CCFLAGS="%{optflags}"


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install CCFLAGS="%{optflags}"

cd $RPM_BUILD_ROOT%{_docdir}
%{__mv} zzub %{name}-%{version}

%{__mkdir_p} %{name}-devel-%{version}/examples
cd %{name}-devel-%{version}/examples
%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
%{__rm} -f */*.so
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS LICENCE REVISION
%{_bindir}/ccmplayer
%{_libdir}/liblunarstd.so
%{_libdir}/*.so.*
%{_libdir}/zzub
%{_libdir}/lunar

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libzzub.so
%{_defaultdocdir}/%{name}-devel-%{version}

%changelog
* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 17:56:49 -0000	1.1
+++ .cvsignore	17 Sep 2007 07:41:51 -0000	1.2
@@ -0,0 +1 @@
+libzzub-0.2.3-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 17:56:49 -0000	1.1
+++ sources	17 Sep 2007 07:41:51 -0000	1.2
@@ -0,0 +1 @@
+e524a3cf16500849c988a702918fe33e  libzzub-0.2.3-fe.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 07:43:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Mon, 17 Sep 2007 00:43:29 -0700
Subject: [pkgdb] rusers had acl change status
Message-ID: <200709170743.l8H7hUsS029394@app4.fedora.phx.redhat.com>

Ji?? Moskov??k (jmoskovc) has set the commit acl on rusers (Fedora 7) to Approved for Steve Dickson (steved)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 07:43:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Mon, 17 Sep 2007 00:43:28 -0700
Subject: [pkgdb] rusers had acl change status
Message-ID: <200709170743.l8H7hTZQ029383@app4.fedora.phx.redhat.com>

Ji?? Moskov??k (jmoskovc) has set the commit acl on rusers (Fedora devel) to Approved for Steve Dickson (steved)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 07:53:34 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 03:53:34 -0400
Subject: fedora-security/audit fc6,1.255,1.256 fc7,1.100,1.101
Message-ID: <200709170753.l8H7rYr4025487@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25374/audit

Modified Files:
	fc6 fc7 
Log Message:
Add ekiga, wordpress
Track updates release to FC6 & F7



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- fc6	11 Sep 2007 17:49:30 -0000	1.255
+++ fc6	17 Sep 2007 07:53:32 -0000	1.256
@@ -4,9 +4,10 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070910
-# Up to date FC6 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date FC6 as of 20070916
 
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc7	12 Sep 2007 20:26:35 -0000	1.100
+++ fc7	17 Sep 2007 07:53:32 -0000	1.101
@@ -5,16 +5,19 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070910
-# Up to date FC7 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date FC7 as of 20070916
 
+CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
+CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
+CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051
-CVE-2007-4727 VULNERABLE (lighttpd) #284511
+CVE-2007-4727 version (lighttpd) #284511 [since FEDORA-2007-2132]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -58,7 +61,7 @@
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
-CVE-2007-4138 VULNERABLE (samba, fixed 3.0.26) #286311
+CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]



From fedora-extras-commits at redhat.com  Mon Sep 17 07:53:59 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 03:53:59 -0400
Subject: rpms/libzzub/F-7 libzzub-buildfix.patch, NONE,
	1.1 libzzub-internalflacfix.patch, NONE,
	1.1 libzzub-sonamefix.patch, NONE, 1.1 libzzub.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709170753.l8H7rxfB025491@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25390/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	libzzub-buildfix.patch libzzub-internalflacfix.patch 
	libzzub-sonamefix.patch libzzub.spec 
Log Message:
initial import


libzzub-buildfix.patch:

--- NEW FILE libzzub-buildfix.patch ---
diff -up libzzub-0.2.3/SConstruct.buildfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.buildfix	2007-09-11 21:51:01.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-11 21:51:30.000000000 +0200
@@ -70,6 +70,7 @@ opts.Add("LUNARTARGET", 'Target for Luna
 opts.Add("SSE", "Support SSE instructions", False, None, bool_converter)
 opts.Add("SSE2", "Support SSE2 instructions", False, None, bool_converter)
 opts.Add("MP3", "Support loading of MP3 samples", linux, None, bool_converter)
+opts.Add("JOBS", "Number of threads to compile with", '2')
 
 env = Environment(ENV = os.environ, options=opts)
 
@@ -105,9 +106,12 @@ env['ROOTPATH'] = os.getcwd()
 env.Append(CCFLAGS=['-D__SCONS__'])
 env.Append(LIBPATH=['${ROOTPATH}/lib'])
 
+SetOption('num_jobs', env['JOBS'].replace('-j', ''))
+
 if posix:
 	env.Append(CCFLAGS=[
 		'-DPOSIX',
+		'-fPIC',
 	])
 	env.Append(LINKFLAGS=[
 		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
@@ -139,12 +143,8 @@ cl = env['CC'] == 'cl'
 if gcc:
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=[
-			'-O3',
-			'-fomit-frame-pointer',
-			'-funroll-loops',
-			'-DNDEBUG',
-		])
+		env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS'))
+		env.Append(CCFLAGS=['-DNDEBUG'])
 	else:
 		env.Append(CCFLAGS=[
 			'-g',
@@ -152,19 +152,11 @@ if gcc:
 			'-D_DEBUG',
 		])
 	if env['SSE2'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse2',
 		])
 	elif env['SSE'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse',

libzzub-internalflacfix.patch:

--- NEW FILE libzzub-internalflacfix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.internalflacfix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-11 23:40:04.000000000 +0200
@@ -54,16 +54,8 @@ files = [
 	'input.cpp',
 ]
 
-# we build from our private flac,
-# since some are using 1.1.3, and that
-# one breaks a few things.
-localenv.Append(CPPPATH=[
-	"${ROOTPATH}/src/flac/include"
-])
-localenv.Append(CCFLAGS=[
-	'-DFLAC__NO_DLL',
-])
-env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript")
+# use internal flac support
+localenv.ParseConfig('pkg-config --libs flac')
 
 # minizip, zlib and flac dependencies
 files += [
@@ -82,8 +74,8 @@ if win32:
 	])
 	
 localenv.Append(LIBS=[
-	'FLAC',
 	'z',
+	'c',
 ])
 
 localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB'])
diff -up libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix libzzub-0.2.3/src/libzzub/ccm.cpp
--- libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/ccm.cpp	2007-09-11 23:40:38.000000000 +0200
@@ -1089,7 +1089,7 @@ bool CcmWriter::save(std::string fileNam
 }
 
 
-static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) {
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) {
     StreamWriter* writer=(StreamWriter*)client_data;
 
     writer->writeBytes(buffer, sizeof(FLAC__byte)*bytes);
@@ -1126,7 +1126,7 @@ struct DecoderInfo {
 // buffer can hold. The callback may choose to supply less data and modify the byte count
 // but must be careful not to overflow the buffer. The callback then returns a status code
 // chosen from FLAC__StreamDecoderReadStatus.
-static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) {
     DecoderInfo* info=(DecoderInfo*)client_data;
     StreamReader* reader=info->reader;
 
@@ -1180,19 +1180,21 @@ void flac_stream_decoder_error_callback(
 void decodeFLAC(StreamReader* reader, wave_info_ex& info, int level) {
 
     FLAC__StreamDecoder* stream=FLAC__stream_decoder_new();
-    FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback);
-    FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback);
-    FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback);
-    FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback);
 
     DecoderInfo decoder_info;
     decoder_info.reader=reader;
-    FLAC__stream_decoder_set_client_data(stream, &decoder_info);
+    //FLAC__stream_decoder_set_client_data(stream, &decoder_info);
 
     // we're not intersted in meitadeita
     FLAC__stream_decoder_set_metadata_ignore_all(stream);
 
-    FLAC__stream_decoder_init(stream);
+    FLAC__stream_decoder_init_stream(stream,
+				     flac_stream_decoder_read_callback,
+				     NULL, NULL, NULL, NULL,
+				     flac_stream_decoder_write_callback,
+				     flac_stream_decoder_metadata_callback,
+				     flac_stream_decoder_error_callback,
+				     &decoder_info);
 //    FLAC__stream_decoder_process_single(stream);
     FLAC__stream_decoder_process_until_end_of_stream(stream);
     
@@ -1255,11 +1257,16 @@ bool encodeFLAC(StreamWriter* writer, wa
 	FLAC__stream_encoder_set_bits_per_sample(stream, bps);
 	FLAC__stream_encoder_set_sample_rate(stream, sample_rate);
 	FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples);
-	FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
-	FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
-	FLAC__stream_encoder_set_client_data(stream, writer);
+	// FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
+	// FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
+	// FLAC__stream_encoder_set_client_data(stream, writer);
+
+	int result = FLAC__stream_encoder_init_stream(stream,
+						      flac_stream_encoder_write_callback,
+						      NULL,
+						      NULL,
+						      flac_stream_encoder_metadata_callback, writer);
 
-	int result = FLAC__stream_encoder_init(stream);
 	// if this fails, we want it to crash hard - or else will cause dataloss
 	assert(result == FLAC__STREAM_ENCODER_OK);
 

libzzub-sonamefix.patch:

--- NEW FILE libzzub-sonamefix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.sonamefix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.sonamefix	2007-02-01 04:11:33.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-03 16:15:02.000000000 +0200
@@ -153,6 +153,10 @@ if posix:
 			'-DNEWBUFFER'
 		])
 
+	localenv.Append(LINKFLAGS=[
+		'-Wl,-soname,libzzub.so.0.2.3'
+	])
+
 elif win32:
 	localenv.Append(LIBS=[
 		'portmidi',			


--- NEW FILE libzzub.spec ---
Name:		libzzub
Version:	0.2.3
Release:	5%{?dist}
Summary:	Powerful music sequencing library

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/zzub/
Source0:	%{name}-%{version}-fe.tar.bz2
# The original source code is from:
# http://downloads.sourceforge.net/aldrin/%{name}-%{version}.tar.bz2
#
# To comply with Fedora's Free Software Principles, MP3 support parts had to be
# removed:
# - src/libmad: completely removed
# - src/libzzub/libzzub.cpp: removed MP3 support part

Patch0:		libzzub-buildfix.patch
Patch1:		libzzub-sonamefix.patch
Patch2:		libzzub-internalflacfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64
BuildRequires:	scons >= 0.96.94
BuildRequires:	zlib-devel
BuildRequires:	libsndfile-devel >= 1.0.17
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	alsa-lib-devel
BuildRequires:	dos2unix
BuildRequires:	flac-devel >= 1.1.4
Requires:	libsndfile >= 1.0.17

%description
If you are searching for a foundation for your next Soundtracker, libzzub is
what you want. libzzub provides an extensible DSP plugin system, a
wavetable, instruments, a multitrack sequencer and support for major soundcard
APIs.


%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
mac2unix SConstruct
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .sonamefix
mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
%patch2 -p1 -b .internalflacfix


%build
find \
	-regextype posix-egrep \
	-regex '.*\.(h|html|c|cpp)' \
	-exec mac2unix '{}' \; \
	-exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS.txt > CREDITS
%{__rm} CREDITS.txt

scons configure \
	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
	LIBDIR=/%{_lib} \
	DEBUG=false \
	JOBS=%{?_smp_mflags} \
	MP3=false

scons CCFLAGS="%{optflags}"


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install CCFLAGS="%{optflags}"

cd $RPM_BUILD_ROOT%{_docdir}
%{__mv} zzub %{name}-%{version}

%{__mkdir_p} %{name}-devel-%{version}/examples
cd %{name}-devel-%{version}/examples
%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
%{__rm} -f */*.so
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS LICENCE REVISION
%{_bindir}/ccmplayer
%{_libdir}/liblunarstd.so
%{_libdir}/*.so.*
%{_libdir}/zzub
%{_libdir}/lunar

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libzzub.so
%{_defaultdocdir}/%{name}-devel-%{version}

%changelog
* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 17:56:49 -0000	1.1
+++ .cvsignore	17 Sep 2007 07:53:27 -0000	1.2
@@ -0,0 +1 @@
+libzzub-0.2.3-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 17:56:49 -0000	1.1
+++ sources	17 Sep 2007 07:53:27 -0000	1.2
@@ -0,0 +1 @@
+e524a3cf16500849c988a702918fe33e  libzzub-0.2.3-fe.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:01:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 04:01:48 -0400
Subject: rpms/groff/devel groff.spec,1.53,1.54
Message-ID: <200709170801.l8H81m4H031658@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25652

Modified Files:
	groff.spec 
Log Message:
Fix license tag.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- groff.spec	12 Sep 2007 10:16:28 -0000	1.53
+++ groff.spec	17 Sep 2007 08:01:15 -0000	1.54
@@ -3,8 +3,8 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 8%{?dist}
-License: GPLv2 and FDL
+Release: 9%{?dist}
+License: GPLv2 and GFDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -237,6 +237,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-9
+- fix license
+
 * Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-8
 - another change in spec for review
 



From fedora-extras-commits at redhat.com  Mon Sep 17 08:12:16 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 04:12:16 -0400
Subject: rpms/aspell-no/devel .cvsignore, 1.6, 1.7 aspell-no.spec, 1.23,
	1.24 sources, 1.6, 1.7
Message-ID: <200709170812.l8H8CGLh032612@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-no/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32576

Modified Files:
	.cvsignore aspell-no.spec sources 
Log Message:
- remove useles souce file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2004 07:46:37 -0000	1.6
+++ .cvsignore	17 Sep 2007 08:11:39 -0000	1.7
@@ -1,2 +1 @@
-aspell-no-0.50-2.tar.bz2
 aspell-nb-0.50.1-0.tar.bz2


Index: aspell-no.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/aspell-no.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- aspell-no.spec	24 Aug 2007 11:52:51 -0000	1.23
+++ aspell-no.spec	17 Sep 2007 08:11:39 -0000	1.24
@@ -4,7 +4,7 @@
 Name: aspell-no
 Epoch: 50
 Version: 0.50.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
@@ -41,6 +41,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50.1-12
+- remove useles souce file
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50.1-11
 - add documentation
 - use configure script to create Makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2004 07:46:37 -0000	1.6
+++ sources	17 Sep 2007 08:11:39 -0000	1.7
@@ -1,2 +1 @@
-b24b20ad02ce2a569f71f949b48823cc  aspell-no-0.50-2.tar.bz2
 d1173a5ce04f39e9c93183da691e7ce8  aspell-nb-0.50.1-0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:19:47 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 04:19:47 -0400
Subject: rpms/lftp/devel .cvsignore, 1.30, 1.31 lftp.spec, 1.60, 1.61 sources,
	1.30, 1.31
Message-ID: <200709170819.l8H8JlRj000464@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
- rebase



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	4 Apr 2007 13:52:30 -0000	1.30
+++ .cvsignore	17 Sep 2007 08:19:16 -0000	1.31
@@ -1 +1 @@
-lftp-3.5.10.tar.gz
+lftp-3.5.14.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- lftp.spec	6 Sep 2007 09:03:42 -0000	1.60
+++ lftp.spec	17 Sep 2007 08:19:16 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.5.10
-Release: 	4%{?dist}
+Version: 	3.5.14
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
+- rebase
+
 * Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	4 Apr 2007 13:52:30 -0000	1.30
+++ sources	17 Sep 2007 08:19:16 -0000	1.31
@@ -1 +1 @@
-8ba21d5264224136eb3ab562a3150a3e  lftp-3.5.10.tar.gz
+dfb019355ad7f7ed347e64b39e4d1d3c  lftp-3.5.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 08:33:16 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 04:33:16 -0400
Subject: rpms/gnomebaker/devel .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.13,
	1.14 sources, 1.4, 1.5 gnomebaker-0.6.1-gthreads.patch, 1.1,
	NONE gnomebaker-0.6.1-wodim.patch, 1.2, NONE
Message-ID: <200709170833.l8H8XGPP000899@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv872

Modified Files:
	.cvsignore gnomebaker.spec sources 
Removed Files:
	gnomebaker-0.6.1-gthreads.patch gnomebaker-0.6.1-wodim.patch 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:30:39 -0000	1.4
+++ .cvsignore	17 Sep 2007 08:32:44 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomebaker.spec	31 Aug 2007 13:12:28 -0000	1.13
+++ gnomebaker.spec	17 Sep 2007 08:32:44 -0000	1.14
@@ -1,14 +1,12 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gnomebaker-0.6.1-gthreads.patch
-Patch1:         gnomebaker-0.6.1-wodim.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -36,8 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gthreads
-%patch1 -p1 -b .wodim
 chmod 644 AUTHORS TODO
 
 
@@ -88,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
 - fix blanking CDRWs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:30:39 -0000	1.4
+++ sources	17 Sep 2007 08:32:44 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz


--- gnomebaker-0.6.1-gthreads.patch DELETED ---


--- gnomebaker-0.6.1-wodim.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 08:36:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:36:10 -0400
Subject: rpms/openoffice.org/devel sources,1.250,1.251
Message-ID: <200709170836.l8H8aA9Y000995@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv960

Modified Files:
	sources 
Log Message:
next version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- sources	17 Sep 2007 07:31:11 -0000	1.250
+++ sources	17 Sep 2007 08:35:37 -0000	1.251
@@ -4,3 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
+6dc9f4734c1ef5794b5e240e5e5270f8  OOG680_m5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:38:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:38:52 -0400
Subject: rpms/openoffice.org/devel .cvsignore,1.135,1.136
Message-ID: <200709170838.l8H8cqSM001135@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1107

Modified Files:
	.cvsignore 
Log Message:
next version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- .cvsignore	17 Sep 2007 07:31:11 -0000	1.135
+++ .cvsignore	17 Sep 2007 08:38:19 -0000	1.136
@@ -4,3 +4,4 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
+OOG680_m5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:43:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:43:24 -0400
Subject: rpms/openoffice.org/F-7 openoffice.org.spec,1.1189,1.1190
Message-ID: <200709170843.l8H8hOJB001304@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -u -r1.1189 -r1.1190
--- openoffice.org.spec	26 Jul 2007 20:16:50 -0000	1.1189
+++ openoffice.org.spec	17 Sep 2007 08:42:51 -0000	1.1190
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 18
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -143,6 +143,7 @@
 Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
 Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
 Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch88: workspace.tipatch8.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1082,6 +1083,7 @@
 %patch85 -p1 -b .ooo79481.sw.rowordcount.patch
 %patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
 %patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
+%patch88 -p1 -b .workspace.tipatch8.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2678,6 +2680,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.2.1-18.2
+- Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch
+
 * Thu Jul 26 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
 - Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
 - Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch



From fedora-extras-commits at redhat.com  Mon Sep 17 08:44:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:44:24 -0400
Subject: rpms/openoffice.org/F-7 workspace.tipatch8.patch,NONE,1.1
Message-ID: <200709170844.l8H8iOue001347@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1333

Added Files:
	workspace.tipatch8.patch 
Log Message:
Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch


workspace.tipatch8.patch:

--- NEW FILE workspace.tipatch8.patch ---
Index: source/filter.vcl/itiff/itiff.cxx
===================================================================
RCS file: /cvs/graphics/goodies/source/filter.vcl/itiff/itiff.cxx,v
retrieving revision 1.13
retrieving revision 1.13.72.1
diff -u -r1.13 -r1.13.72.1
--- openoffice.org.orig/goodies/source/filter.vcl/itiff/itiff.cxx	14 Nov 2006 16:17:15 -0000	1.13
+++ openoffice.org/goodies/source/filter.vcl/itiff/itiff.cxx	20 Jun 2007 14:21:15 -0000	1.13.72.1
@@ -132,7 +132,7 @@
 	double	ReadDoubleData();
 
 	void	ReadHeader();
-	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
+	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
 
 	BOOL	ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
 		// Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
@@ -290,7 +290,7 @@
 
 // ---------------------------------------------------------------------------------
 
-void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
+void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
 {
 	if ( bStatus == FALSE )
 		return;
@@ -353,16 +353,25 @@
 		case 0x0111: { // Strip Offset(s)
 			ULONG nOldNumSO, i, * pOldSO;
 			pOldSO = pStripOffsets;
-			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
+			if ( pOldSO == NULL )
+				nNumStripOffsets = 0;
 			nOldNumSO = nNumStripOffsets;
-			nNumStripOffsets += nDataLen;
-			pStripOffsets = new ULONG[ nNumStripOffsets ];
-			for ( i = 0; i < nOldNumSO; i++ )
-				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
-			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
-				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
-			if ( pOldSO != NULL )
+			nDataLen += nOldNumSO;
+			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
+			{
+				nNumStripOffsets = nDataLen;
+				pStripOffsets = new ULONG[ nNumStripOffsets ];
+				if ( !pStripOffsets )
+					nNumStripOffsets = 0;
+				else
+				{
+					for ( i = 0; i < nOldNumSO; i++ )
+						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
+					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
+						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
+				}
 				delete[] pOldSO;
+			}
 			OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
 			break;
 		}
@@ -384,16 +393,25 @@
 		case 0x0117: { // Strip Byte Counts
 			ULONG nOldNumSBC, i, * pOldSBC;
 			pOldSBC = pStripByteCounts;
-			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
+			if ( pOldSBC == NULL )
+				nNumStripByteCounts = 0; // Sicherheitshalber
 			nOldNumSBC = nNumStripByteCounts;
-			nNumStripByteCounts += nDataLen;
-			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
-			for ( i = 0; i < nOldNumSBC; i++ )
-				pStripByteCounts[ i ] = pOldSBC[ i ];
-			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
-				pStripByteCounts[ i ] = ReadIntData();
-			if ( pOldSBC != NULL )
+			nDataLen += nOldNumSBC;
+			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
+			{		
+				nNumStripByteCounts = nDataLen;
+				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
+				if ( !nNumStripByteCounts )
+					nNumStripByteCounts = 0;
+				else
+				{
+					for ( i = 0; i < nOldNumSBC; i++ )
+						pStripByteCounts[ i ] = pOldSBC[ i ];
+					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
+						pStripByteCounts[ i ] = ReadIntData();
+				}
 				delete[] pOldSBC;
+			}
 			OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
 			break;
 		}



From fedora-extras-commits at redhat.com  Mon Sep 17 08:51:16 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 04:51:16 -0400
Subject: rpms/tack/devel tack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709170851.l8H8pGLt001564@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tack.spec 
Log Message:
- initial release



--- NEW FILE tack.spec ---
Name:           tack
Version:        1.06
Release:        1%{?dist}
Summary:        Terminfo action checker

Group:          Development/Tools
License:        GPLv2+
URL:            http://invisible-island.net/ncurses/ncurses.html
Source0:        ftp://invisible-island.net/ncurses/tack-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
# tack was packaged in ncurses before 5.6-3.20070203.fc7
Requires:       ncurses >= 5.6-3.20070203

%description
The tack program has three purposes: to help you build a new terminfo
entry describing an unknown terminal, to test the correctness of an
existing entry, and to develop the correct pad timings needed to ensure
that screen updates don't fall behind the incoming data stream.

%prep
%setup -q

%build
%configure --with-ncurses
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 CHANGES COPYING HISTORY README
%{_bindir}/tack
%{_mandir}/man1/tack.1*

%changelog
* Tue Sep 11 2007 Miroslav Lichvar <mlichvar at redhat.com> 1.06-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	17 Sep 2007 08:50:44 -0000	1.2
@@ -0,0 +1 @@
+tack-1.06.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:39:41 -0000	1.1
+++ sources	17 Sep 2007 08:50:44 -0000	1.2
@@ -0,0 +1 @@
+8c1e0aa72c189781499cbe96b66bb4f5  tack-1.06.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 08:52:17 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 04:52:17 -0400
Subject: rpms/gnomebaker/F-7 .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.11,
	1.12 sources, 1.4, 1.5 gnomebaker-0.6.1-gthreads.patch, 1.1,
	NONE gnomebaker-0.6.1-wodim.patch, 1.2, NONE
Message-ID: <200709170852.l8H8qHC4001731@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655

Modified Files:
	.cvsignore gnomebaker.spec sources 
Removed Files:
	gnomebaker-0.6.1-gthreads.patch gnomebaker-0.6.1-wodim.patch 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:39:13 -0000	1.4
+++ .cvsignore	17 Sep 2007 08:51:45 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnomebaker.spec	31 Aug 2007 13:15:43 -0000	1.11
+++ gnomebaker.spec	17 Sep 2007 08:51:45 -0000	1.12
@@ -1,14 +1,12 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gnomebaker-0.6.1-gthreads.patch
-Patch1:         gnomebaker-0.6.1-wodim.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -36,8 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gthreads
-%patch1 -p1 -b .wodim
 chmod 644 AUTHORS TODO
 
 
@@ -88,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
 - fix CDRW blanking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:39:13 -0000	1.4
+++ sources	17 Sep 2007 08:51:45 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz


--- gnomebaker-0.6.1-gthreads.patch DELETED ---


--- gnomebaker-0.6.1-wodim.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:11:38 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 05:11:38 -0400
Subject: rpms/gnomebaker/FC-6 .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200709170911.l8H9BcGv008082@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8056

Modified Files:
	.cvsignore gnomebaker.spec sources 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:45:35 -0000	1.4
+++ .cvsignore	17 Sep 2007 09:11:06 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/gnomebaker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnomebaker.spec	28 Aug 2007 08:15:13 -0000	1.9
+++ gnomebaker.spec	17 Sep 2007 09:11:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
@@ -21,8 +21,8 @@
 Requires:	cdrecord
 Requires:	mkisofs
 Requires:	cdda2wav
-Requires:	gstreamer-plugins-base
-Requires:	gstreamer-plugins-good
+Requires:	gstreamer-plugins-base >= 0.10
+Requires:	gstreamer-plugins-good >= 0.10
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -38,7 +38,6 @@
 
 
 %build
-export LDFLAGS="-export-dynamic"
 %configure --enable-libnotify=no
 make %{?_smp_mflags}
 
@@ -84,6 +83,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Tue Aug 28 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-2
 - rebuild with -export-dynamic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:45:35 -0000	1.4
+++ sources	17 Sep 2007 09:11:06 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 09:22:22 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 05:22:22 -0400
Subject: rpms/aspell-fo/devel .cvsignore, 1.2, 1.3 aspell-fo.spec, 1.11,
	1.12 sources, 1.2, 1.3 aspell-fo-0.51-0.utf-filename.patch, 1.1, NONE
Message-ID: <200709170922.l8H9MMbS008343@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-fo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316

Modified Files:
	.cvsignore aspell-fo.spec sources 
Removed Files:
	aspell-fo-0.51-0.utf-filename.patch 
Log Message:
- update to 0.2.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 03:08:57 -0000	1.2
+++ .cvsignore	17 Sep 2007 09:21:50 -0000	1.3
@@ -1 +1 @@
-aspell-fo-0.51-0.tar.bz2
+aspell5-fo-0.2.16-1.tar.bz2


Index: aspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-fo.spec	23 Aug 2007 13:52:02 -0000	1.11
+++ aspell-fo.spec	17 Sep 2007 09:21:50 -0000	1.12
@@ -1,15 +1,15 @@
 %define lang fo
-%define langrelease 0
+%define langrelease 1
+%define aspellversion 5
 Summary: Faeroese dictionaries for Aspell
 Name: aspell-%{lang}
 Epoch: 50
-Version: 0.51
+Version: 0.2.16
 Release: 6%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2
-Patch: aspell-fo-0.51-0.utf-filename.patch
+Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,9 +20,7 @@
 Provides the word list/dictionaries for the following: Faeroese
 
 %prep
-%setup -q -n aspell-%{lang}-%{version}-%{langrelease}
-%patch -p1 -b .utf-filename
-mv $(echo -e 'f\0370royskt.alias') $(echo -e 'f\0303\0270royskt.alias')
+%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}
 
 %build
 ./configure
@@ -41,6 +39,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-1
+- update to 0.2.16
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.51-6
 - add documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 03:08:57 -0000	1.2
+++ sources	17 Sep 2007 09:21:50 -0000	1.3
@@ -1 +1 @@
-5cc9168ad88ceb1b5531a5452527728b  aspell-fo-0.51-0.tar.bz2
+a57e8870c272931da41cd1fc5a291f3d  aspell5-fo-0.2.16-1.tar.bz2


--- aspell-fo-0.51-0.utf-filename.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:31:34 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 17 Sep 2007 05:31:34 -0400
Subject: rpms/keepalived/devel .cvsignore, 1.3, 1.4 keepalived.spec, 1.6,
	1.7 sources, 1.3, 1.4 keepalived-1.1.14-genhashman.patch, 1.1,
	NONE keepalived-1.1.14-include.patch, 1.1, NONE
Message-ID: <200709170931.l8H9VYHT008690@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8657

Modified Files:
	.cvsignore keepalived.spec sources 
Removed Files:
	keepalived-1.1.14-genhashman.patch 
	keepalived-1.1.14-include.patch 
Log Message:
Update to 1.1.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Sep 2007 10:44:23 -0000	1.3
+++ .cvsignore	17 Sep 2007 09:31:01 -0000	1.4
@@ -1 +1 @@
-keepalived-1.1.14.tar.gz
+keepalived-1.1.15.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- keepalived.spec	14 Sep 2007 14:17:56 -0000	1.6
+++ keepalived.spec	17 Sep 2007 09:31:01 -0000	1.7
@@ -3,15 +3,13 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.14
-Release: 2%{?dist}
+Version: 1.1.15
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Patch0: keepalived-1.1.14-genhashman.patch
-Patch1: keepalived-1.1.14-installmodes.patch
-Patch2: keepalived-1.1.14-include.patch
+Patch0: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,9 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .genhashman
-%patch1 -p1 -b .installmodes
-%patch2 -p1 -b .include
+%patch0 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -104,6 +100,10 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-1
+- Update to 1.1.15.
+- Remove merged genhashman and include patches.
+
 * Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
 - Include patch from Shinji Tanaka to fix conf include from inside some
   directives like vrrp_instance.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Sep 2007 10:44:23 -0000	1.3
+++ sources	17 Sep 2007 09:31:01 -0000	1.4
@@ -1 +1 @@
-5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz
+b47f94bfcf5d77976c3068608a8680a5  keepalived-1.1.15.tar.gz


--- keepalived-1.1.14-genhashman.patch DELETED ---


--- keepalived-1.1.14-include.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:37:02 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 17 Sep 2007 05:37:02 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.42, 1.43 sources, 1.43, 
	1.44 system-config-samba.spec, 1.47, 1.48
Message-ID: <200709170937.l8H9b2SU008814@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8777

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	10 Sep 2007 07:43:04 -0000	1.42
+++ .cvsignore	17 Sep 2007 09:36:30 -0000	1.43
@@ -1 +1 @@
-system-config-samba-1.2.51.tar.bz2
+system-config-samba-1.2.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	10 Sep 2007 07:43:04 -0000	1.43
+++ sources	17 Sep 2007 09:36:30 -0000	1.44
@@ -1 +1 @@
-2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2
+f8f645cc3f41eb82df750d0d52023b43  system-config-samba-1.2.52.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- system-config-samba.spec	10 Sep 2007 07:43:04 -0000	1.47
+++ system-config-samba.spec	17 Sep 2007 09:36:30 -0000	1.48
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.51
+Version: 1.2.52
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52
+- pick up updated translations
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
 - update Polish, Serbian translations
 - $RPM_BUILD_ROOT -> %%{buildroot}



From fedora-extras-commits at redhat.com  Mon Sep 17 09:39:12 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 17 Sep 2007 05:39:12 -0400
Subject: rpms/gnutls/F-7 gnutls-1.6.3-incompat-pointers.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 gnutls.spec, 1.27, 1.28 sources, 1.11, 1.12
Message-ID: <200709170939.l8H9dC1X008908@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8874

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-1.6.3-incompat-pointers.patch 
Log Message:
- update to gnutls-1.6.3

gnutls-1.6.3-incompat-pointers.patch:

--- NEW FILE gnutls-1.6.3-incompat-pointers.patch ---
--- gnutls-1.6.3/doc/examples/ex-pkcs12.c.incompat	2006-06-16 17:35:46.000000000 +0200
+++ gnutls-1.6.3/doc/examples/ex-pkcs12.c	2007-06-06 22:14:04.000000000 +0200
@@ -23,7 +23,7 @@
   int ret, bag_index;
   gnutls_pkcs12_bag_t bag, key_bag;
   char pkcs12_struct[10 * 1024];
-  int pkcs12_struct_size;
+  size_t pkcs12_struct_size;
   FILE *fd;
 
   /* A good idea might be to use gnutls_x509_privkey_get_key_id()
--- gnutls-1.6.3/doc/examples/ex-crq.c.incompat	2006-06-16 17:35:46.000000000 +0200
+++ gnutls-1.6.3/doc/examples/ex-crq.c	2007-06-06 22:14:46.000000000 +0200
@@ -19,7 +19,7 @@
   gnutls_x509_crq_t crq;
   gnutls_x509_privkey_t key;
   unsigned char buffer[10 * 1024];
-  int buffer_size = sizeof (buffer);
+  size_t buffer_size = sizeof (buffer);
 
   gnutls_global_init ();
 
--- gnutls-1.6.3/lib/gnutls_x509.c.incompat	2007-05-25 14:26:19.000000000 +0200
+++ gnutls-1.6.3/lib/gnutls_x509.c	2007-06-06 21:42:57.000000000 +0200
@@ -1884,6 +1884,7 @@
   gnutls_x509_crt_t cert = NULL;
   gnutls_x509_crl_t crl = NULL;
   int ret;
+  size_t size;
 
   ret = gnutls_pkcs12_init (&p12);
   if (ret < 0)
@@ -1892,7 +1893,8 @@
       return ret;
     }
 
-  p12blob.data = read_binary_file (pkcs12file, &p12blob.size);
+  p12blob.data = read_binary_file (pkcs12file, &size);
+  p12blob.size = (unsigned int)size;
   if (p12blob.data == NULL)
     {
       gnutls_assert ();
--- gnutls-1.6.3/lib/gnutls_psk.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/lib/gnutls_psk.c	2007-06-06 21:51:05.000000000 +0200
@@ -117,8 +117,9 @@
     }
   else
     {				/* HEX key */
-      res->key.size = key->size / 2;
-      res->key.data = gnutls_malloc (res->key.size);
+      size_t size;
+      size = res->key.size = key->size / 2;
+      res->key.data = gnutls_malloc (size);
       if (res->key.data == NULL)
 	{
 	  gnutls_assert ();
@@ -126,7 +127,8 @@
 	  goto error;
 	}
 
-      ret = gnutls_hex_decode (key, (char *) res->key.data, &res->key.size);
+      ret = gnutls_hex_decode (key, (char *) res->key.data, &size);
+      res->key.size = (unsigned int)size;
       if (ret < 0)
 	{
 	  gnutls_assert ();
--- gnutls-1.6.3/lib/auth_psk_passwd.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/lib/auth_psk_passwd.c	2007-06-06 21:47:10.000000000 +0200
@@ -48,6 +48,7 @@
 {
   char *p;
   int len, ret;
+  size_t size;
 
   p = strchr (str, ':');
   if (p == NULL)
@@ -68,15 +69,16 @@
   if (p[len - 1] == '\n' || p[len - 1] == ' ')
     len--;
 
-  psk->size = len / 2;
-  psk->data = gnutls_malloc (psk->size);
+  size = psk->size = len / 2;
+  psk->data = gnutls_malloc (size);
   if (psk->data == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_MEMORY_ERROR;
     }
 
-  ret = _gnutls_hex2bin ((opaque *) p, len, psk->data, &psk->size);
+  ret = _gnutls_hex2bin ((opaque *) p, len, psk->data, &size);
+  psk->size = (unsigned int)size;
   if (ret < 0)
     {
       gnutls_assert ();
--- gnutls-1.6.3/libextra/gnutls_openpgp.c.incompat	2006-09-26 10:17:11.000000000 +0200
+++ gnutls-1.6.3/libextra/gnutls_openpgp.c	2007-06-06 22:03:31.000000000 +0200
@@ -728,6 +728,7 @@
   struct stat statbuf;
   int rc = 0;
   gnutls_datum_t key, cert;
+  size_t size;
 
   if (!res || !keyfile || !certfile)
     {
@@ -741,14 +742,16 @@
       return GNUTLS_E_FILE_ERROR;
     }
 
-  cert.data = read_binary_file (certfile, &cert.size);
+  cert.data = read_binary_file (certfile, &size);
+  cert.size = (unsigned int)size;
   if (cert.data == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_FILE_ERROR;
     }
 
-  key.data = read_binary_file (keyfile, &key.size);
+  key.data = read_binary_file (keyfile, &size);
+  key.size = (unsigned int)size;
   if (key.data == NULL)
     {
       gnutls_assert ();
--- gnutls-1.6.3/libextra/openssl_compat.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/libextra/openssl_compat.c	2007-06-06 22:05:55.000000000 +0200
@@ -537,6 +537,7 @@
 {
   gnutls_x509_crt_t xcert;
   int result;
+  size_t size;
 
   result = gnutls_x509_crt_init (&xcert);
   if (result < 0)
@@ -549,10 +550,11 @@
       return result;
     }
 
+  size = sizeof_buf;
   if (!issuer)
-    result = gnutls_x509_crt_get_dn (xcert, buf, &sizeof_buf);
+    result = gnutls_x509_crt_get_dn (xcert, buf, &size);
   else
-    result = gnutls_x509_crt_get_issuer_dn (xcert, buf, &sizeof_buf);
+    result = gnutls_x509_crt_get_issuer_dn (xcert, buf, &size);
 
   gnutls_x509_crt_deinit (xcert);
 
--- gnutls-1.6.3/libextra/opencdk/read-packet.c.incompat	2006-10-26 16:17:23.000000000 +0200
+++ gnutls-1.6.3/libextra/opencdk/read-packet.c	2007-06-06 21:55:22.000000000 +0200
@@ -876,7 +876,7 @@
 
 static void
 read_new_length( cdk_stream_t inp,
-                 size_t *r_len, size_t *r_size, size_t *r_partial )
+                 size_t *r_len, size_t *r_size, int *r_partial )
 {
     int c, c1;
   
--- gnutls-1.6.3/libextra/opencdk/seskey.c.incompat	2006-10-26 16:17:23.000000000 +0200
+++ gnutls-1.6.3/libextra/opencdk/seskey.c	2007-06-06 22:01:57.000000000 +0200
@@ -95,7 +95,8 @@
     byte * p, * frame;
     size_t n = 0;
     u16 chksum = 0;
-    int i = 0, nframe = 0;
+    int i = 0;
+    size_t nframe = 0;
     int rc = 0;
 
     if( !r_esk || !dek )
--- gnutls-1.6.3/src/tests.c.incompat	2006-09-21 13:27:59.000000000 +0200
+++ gnutls-1.6.3/src/tests.c	2007-06-06 22:10:43.000000000 +0200
@@ -50,7 +50,7 @@
 /* keep session info */
 static char *session_data = NULL;
 static char session_id[32];
-static int session_data_size = 0, session_id_size = 0;
+static size_t session_data_size = 0, session_id_size = 0;
 static int sfree = 0;
 static int handshake_output = 0;
 
--- gnutls-1.6.3/src/common.c.incompat	2006-07-05 23:32:53.000000000 +0200
+++ gnutls-1.6.3/src/common.c	2007-06-06 22:09:10.000000000 +0200
@@ -88,7 +88,7 @@
 {
   gnutls_x509_crt crt;
   const gnutls_datum *cert_list;
-  size_t cert_list_size = 0;
+  int cert_list_size = 0;
   int ret;
   char digest[20];
   char serial[40];


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Feb 2007 18:56:37 -0000	1.11
+++ .cvsignore	17 Sep 2007 09:38:39 -0000	1.12
@@ -1 +1 @@
-gnutls-1.4.5-nosrp.tar.bz2
+gnutls-1.6.3-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/gnutls.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnutls.spec	21 Aug 2007 19:39:30 -0000	1.27
+++ gnutls.spec	17 Sep 2007 09:38:39 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 1.4.5
+Version: 1.6.3
 Release: 2%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv2+
 License: GPLv2+ and LGPLv2+
@@ -17,6 +17,8 @@
 Source1: libgnutls-config
 Patch0: gnutls-1.4.0-nosrp.patch
 Patch1: gnutls-1.4.1-enable-psk.patch
+Patch2: gnutls-1.6.3-incompat-pointers.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
 
@@ -58,6 +60,7 @@
 %setup -q
 %patch0 -p1 -b .nosrp
 %patch1 -p1 -b .enable-psk
+%patch2 -p1 -b .incompat
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -124,6 +127,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 21 2007 Tomas Mraz <tmraz at redhat.com> 1.6.3-2
+- license tag fix
+
+* Wed Jun  6 2007 Tomas Mraz <tmraz at redhat.com> 1.6.3-1
+- upgrade to latest upstream (#232445)
+
 * Tue Apr 10 2007 Tomas Mraz <tmraz at redhat.com> 1.4.5-2
 - properly require install-info (patch by Ville Skytt??)
 - standard buildroot and use dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Feb 2007 18:56:37 -0000	1.11
+++ sources	17 Sep 2007 09:38:39 -0000	1.12
@@ -1 +1 @@
-12ca4ef81d34fe350b1cdfe50851cdb4  gnutls-1.4.5-nosrp.tar.bz2
+2c4372bd1e282f9697f0a3a6b0ea7977  gnutls-1.6.3-nosrp.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 09:52:19 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 05:52:19 -0400
Subject: rpms/tack/F-7 tack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709170952.l8H9qJ4I009288@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9207

Modified Files:
	.cvsignore sources 
Added Files:
	tack.spec 
Log Message:
- initial release



--- NEW FILE tack.spec ---
Name:           tack
Version:        1.06
Release:        1%{?dist}
Summary:        Terminfo action checker

Group:          Development/Tools
License:        GPLv2+
URL:            http://invisible-island.net/ncurses/ncurses.html
Source0:        ftp://invisible-island.net/ncurses/tack-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
# tack was packaged in ncurses before 5.6-3.20070203.fc7
Requires:       ncurses >= 5.6-3.20070203

%description
The tack program has three purposes: to help you build a new terminfo
entry describing an unknown terminal, to test the correctness of an
existing entry, and to develop the correct pad timings needed to ensure
that screen updates don't fall behind the incoming data stream.

%prep
%setup -q

%build
%configure --with-ncurses
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 CHANGES COPYING HISTORY README
%{_bindir}/tack
%{_mandir}/man1/tack.1*

%changelog
* Tue Sep 11 2007 Miroslav Lichvar <mlichvar at redhat.com> 1.06-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tack/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	17 Sep 2007 09:51:46 -0000	1.2
@@ -0,0 +1 @@
+tack-1.06.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tack/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:39:41 -0000	1.1
+++ sources	17 Sep 2007 09:51:46 -0000	1.2
@@ -0,0 +1 @@
+8c1e0aa72c189781499cbe96b66bb4f5  tack-1.06.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 09:52:57 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 05:52:57 -0400
Subject: fedora-security/audit fc6,1.256,1.257 fc7,1.101,1.102
Message-ID: <200709170952.l8H9qvd5009322@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9302

Modified Files:
	fc6 fc7 
Log Message:
QT is not embargoed anymore, track for fedora



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- fc6	17 Sep 2007 07:53:32 -0000	1.256
+++ fc6	17 Sep 2007 09:52:54 -0000	1.257
@@ -27,6 +27,7 @@
 CVE-2007-4225 ignore (kdebase) caused by fix to CVE-2007-3820 which we never shipped
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
+CVE-2007-4137 VULNERABLE (qt) #292951
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
 CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc7	17 Sep 2007 07:53:32 -0000	1.101
+++ fc7	17 Sep 2007 09:52:54 -0000	1.102
@@ -62,6 +62,7 @@
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
+CVE-2007-4137 VULNERABLE (qt) #292941
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]



From fedora-extras-commits at redhat.com  Mon Sep 17 10:09:37 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 06:09:37 -0400
Subject: fedora-security/audit fc6,1.257,1.258 fc7,1.102,1.103
Message-ID: <200709171009.l8HA9bRj015545@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15525

Modified Files:
	fc6 fc7 
Log Message:
wpa_supplicant



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- fc6	17 Sep 2007 09:52:54 -0000	1.257
+++ fc6	17 Sep 2007 10:09:34 -0000	1.258
@@ -7,6 +7,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc7	17 Sep 2007 09:52:54 -0000	1.102
+++ fc7	17 Sep 2007 10:09:34 -0000	1.103
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Mon Sep 17 10:41:14 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 06:41:14 -0400
Subject: fedora-security/audit fc7,1.103,1.104
Message-ID: <200709171041.l8HAfEBj020673@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20654

Modified Files:
	fc7 
Log Message:
nx



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc7	17 Sep 2007 10:09:34 -0000	1.103
+++ fc7	17 Sep 2007 10:41:12 -0000	1.104
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Mon Sep 17 11:01:41 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 07:01:41 -0400
Subject: fedora-security/audit fc7,1.104,1.105
Message-ID: <200709171101.l8HB1f7c029062@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28843

Modified Files:
	fc7 
Log Message:
Our libextractor is too new (libextractor-0.5.17a-1.fc7), xpdf code
not used since 0.5.12



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc7	17 Sep 2007 10:41:12 -0000	1.104
+++ fc7	17 Sep 2007 11:01:38 -0000	1.105
@@ -132,7 +132,7 @@
 CVE-2007-3387 backport (kdegraphics) #251509 [since FEDORA-2007-1594]
 CVE-2007-3387 backport (koffice) #251522 [since FEDORA-2007-1614]
 CVE-2007-3387 backport (cups) #251518 [since FEDORA-2007-1541]
-CVE-2007-3387 ** (libextractor)
+CVE-2007-3387 ignore (libextractor) http://bugs.gentoo.org/show_bug.cgi?id=188169
 CVE-2007-3384 ignore (tomcat) only affects 3.3.x and just affects an example
 CVE-2007-3381 version (gdm, fixed 2.18.4) #250277 [since FEDORA-2007-1362]
 CVE-2007-3378 ignore (php) safe mode escape



From fedora-extras-commits at redhat.com  Mon Sep 17 11:10:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 07:10:32 -0400
Subject: rpms/groff/devel groff.spec,1.54,1.55
Message-ID: <200709171110.l8HBAWWV029269@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29167

Modified Files:
	groff.spec 
Log Message:
Change license tag and libdir macro change on prefix/lib again.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- groff.spec	17 Sep 2007 08:01:15 -0000	1.54
+++ groff.spec	17 Sep 2007 11:09:57 -0000	1.55
@@ -195,7 +195,7 @@
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
 mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff



From fedora-extras-commits at redhat.com  Mon Sep 17 11:10:50 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 07:10:50 -0400
Subject: devel/automake16 automake16.spec,1.16,1.17
Message-ID: <200709171110.l8HBAolv029274@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake16
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29238

Modified Files:
	automake16.spec 
Log Message:
- update licenses
- clarify BR autoconf for 'make check' only




Index: automake16.spec
===================================================================
RCS file: /cvs/extras/devel/automake16/automake16.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- automake16.spec	28 Aug 2007 10:08:12 -0000	1.16
+++ automake16.spec	17 Sep 2007 11:10:18 -0000	1.17
@@ -3,15 +3,17 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake16
 Version:    %{api_version}.3
-Release:    13
-License:    GPLv2+ and MIT
+Release:    14
+License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source10:   filter-provides-automake.sh
 Source11:   filter-requires-automake.sh
 URL:        http://sources.redhat.com/automake
 Obsoletes:  automake = 1.6.3
-Buildrequires:  autoconf >= 2.52 bison flex texinfo
+# Required for tests:
+Buildrequires:  autoconf >= 2.52
+Buildrequires:  bison flex texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildArch:  noarch
@@ -89,6 +91,10 @@
 %{_infodir}/*
 
 %changelog
+* Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-14
+- update licenses
+- clarify BR autoconf for 'make check' only
+
 * Tue Aug 28 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-13
 - fix license tag
 - add missing patch (#225300)



From fedora-extras-commits at redhat.com  Mon Sep 17 11:24:01 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 07:24:01 -0400
Subject: rpms/aspell-ga/devel .cvsignore, 1.2, 1.3 aspell-ga.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <200709171124.l8HBO1EG029695@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-ga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576

Modified Files:
	.cvsignore aspell-ga.spec sources 
Log Message:
- update to 4.1-1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 03:09:24 -0000	1.2
+++ .cvsignore	17 Sep 2007 11:23:27 -0000	1.3
@@ -1 +1 @@
-aspell-ga-0.50-4.tar.bz2
+aspell5-ga-4.1-0.tar.bz2


Index: aspell-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/aspell-ga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-ga.spec	24 Aug 2007 09:06:58 -0000	1.11
+++ aspell-ga.spec	17 Sep 2007 11:23:27 -0000	1.12
@@ -1,14 +1,15 @@
 %define lang ga
-%define langrelease 4
+%define langrelease 0
+%define aspellversion 5
 Summary: Irish dictionaries for Aspell
 Name: aspell-%{lang}
 Epoch: 50
-Version: 0.50
-Release: 6%{?dist}
+Version: 4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://aspell.net/
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +20,7 @@
 Provides the word list/dictionaries for the following: Irish
 
 %prep
-%setup -q -n aspell-%{lang}-%{version}-%{langrelease}
+%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}
 
 %build
 ./configure
@@ -38,6 +39,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:4.1-1
+- update to 4.1-1
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50-6
 - add documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 03:09:24 -0000	1.2
+++ sources	17 Sep 2007 11:23:27 -0000	1.3
@@ -1 +1 @@
-6bc9da57557f6d63ecd1dd65b8a184a4  aspell-ga-0.50-4.tar.bz2
+e5f4e3a1925f7cdc7f2f65a8ab990c94  aspell5-ga-4.1-0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 11:40:17 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 07:40:17 -0400
Subject: rpms/cowsay/devel cowsay-3.03-help.patch, NONE, 1.1 cowsay.spec, 1.1,
	1.2
Message-ID: <200709171140.l8HBeHJX029994@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/cowsay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29965

Modified Files:
	cowsay.spec 
Added Files:
	cowsay-3.03-help.patch 
Log Message:
Bugzilla Bug 293061: Cowsay doesn't let Getopt::Std support --help correctly.


cowsay-3.03-help.patch:

--- NEW FILE cowsay-3.03-help.patch ---
diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay
--- cowsay-3.03.orig/cowsay	2007-09-17 13:27:32.000000000 +0200
+++ cowsay-3.03/cowsay	2007-09-17 13:28:04.000000000 +0200
@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey
           [-l] [-n] [-T tongue] [-W wrapcolumn] [message]
 EOF
 }
+
+sub main::HELP_MESSAGE {
+	display_usage;
+}


Index: cowsay.spec
===================================================================
RCS file: /cvs/extras/rpms/cowsay/devel/cowsay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cowsay.spec	2 Jan 2007 19:05:28 -0000	1.1
+++ cowsay.spec	17 Sep 2007 11:39:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           cowsay
 Version:        3.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Configurable speaking/thinking cow
 Group:          Amusements/Games
 License:        Artistic or GPL
@@ -8,6 +8,7 @@
 Source0:        http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz
 Source1:        cowsay.bashcomp
 Source2:        animalsay
+Patch0:         cowsay-3.03-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .help
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
          -e 's#%BANGPERL%#!%{__perl}#' -i %{name}
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
@@ -57,6 +59,9 @@
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Mon Sep 17 2007 Lubomir Kundrak <lkundrak at redhat.com> - 3.03-3
+- Make --help be a bit more sane (#293061)
+
 * Tue Jan 02 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 3.03-2
 - Use cp -p to keep timestamps
 - Fix paths in manpage



From fedora-extras-commits at redhat.com  Mon Sep 17 11:47:20 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 17 Sep 2007 07:47:20 -0400
Subject: rpms/gtkmm24/devel .cvsignore, 1.18, 1.19 gtkmm.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <200709171147.l8HBlKVI030144@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30108

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to new stable branch 2.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Aug 2007 21:47:01 -0000	1.18
+++ .cvsignore	17 Sep 2007 11:46:47 -0000	1.19
@@ -1 +1 @@
-gtkmm-2.11.7.tar.bz2
+gtkmm-2.12.0.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gtkmm.spec	28 Aug 2007 21:47:01 -0000	1.30
+++ gtkmm.spec	17 Sep 2007 11:46:47 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.11.7
+Version:        2.12.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -10,10 +10,10 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.13.1
+BuildRequires:  glibmm24-devel >= 2.14.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
-BuildRequires:  gtk2-devel >= 2.11.1
+BuildRequires:  gtk2-devel >= 2.12.0
 BuildRequires:  glib2-devel >= 2.8.0
 BuildRequires:  cairomm-devel >= 1.1.12
 
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.12.0-1
+- Update to new stable branch 2.12.0
+
 * Tue Aug 28 2007 Denis Leroy <denis at poolshark.org> - 2.11.7-1
 - Update to 2.11.7
 - License tag update


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	28 Aug 2007 21:47:01 -0000	1.20
+++ sources	17 Sep 2007 11:46:47 -0000	1.21
@@ -1 +1 @@
-c8943bab5801280681834adea821c6b0  gtkmm-2.11.7.tar.bz2
+b7a6adb1c9c7e1b6464b4240a4b7ba19  gtkmm-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 12:01:25 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 08:01:25 -0400
Subject: devel/automake17 automake-1.7.9-info.patch, NONE,
	1.1 automake17.spec, 1.11, 1.12
Message-ID: <200709171201.l8HC1Pmi004115@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	automake17.spec 
Added Files:
	automake-1.7.9-info.patch 
Log Message:
- fix licenses
- add README AUTHORS THANKS  to %%doc
- add comment about using ./configure
- fix automake17 info page and install it


automake-1.7.9-info.patch:

--- NEW FILE automake-1.7.9-info.patch ---
diff -urN automake-1.7.9/automake.texi automake-1.7.9_new/automake.texi
--- automake-1.7.9/automake.texi	2003-11-09 19:57:13.000000000 +0100
+++ automake-1.7.9_new/automake.texi	2007-09-17 13:37:58.000000000 +0200
@@ -1,7 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
- at setfilename automake.info
- at settitle automake
+ at setfilename automake17.info
+ at settitle automake17
 @setchapternewpage off
 @c %**end of header
 
@@ -9,12 +9,12 @@
 
 @dircategory Software development
 @direntry
-* automake: (automake).		Making Makefile.in's.
+* automake17: (automake17).		Making Makefile.in's.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* aclocal-1.7: (automake17)Invoking aclocal.          Generating aclocal.m4.
 @end direntry
 
 @ifinfo
@@ -5303,7 +5303,7 @@
 
 @example
 ETAGS_ARGS = automake.in --lang=none \
- --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake.texi
+ --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake17.texi
 @end example
 
 If you add filenames to @samp{ETAGS_ARGS}, you will probably also
diff -urN automake-1.7.9/Makefile.am automake-1.7.9_new/Makefile.am
--- automake-1.7.9/Makefile.am	2003-07-29 22:27:41.000000000 +0200
+++ automake-1.7.9_new/Makefile.am	2007-09-17 13:28:58.000000000 +0200
@@ -25,7 +25,7 @@
 SUBDIRS = . m4 lib tests
 
 bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
 
 CLEANFILES = $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
@@ -34,8 +34,8 @@
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
+TAGS_DEPENDENCIES = automake17.texi
 
 EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
   $(AUTOMAKESOURCES)
diff -urN automake-1.7.9/Makefile.in automake-1.7.9_new/Makefile.in
--- automake-1.7.9/Makefile.in	2003-11-09 20:29:57.000000000 +0100
+++ automake-1.7.9_new/Makefile.in	2007-09-17 13:32:46.000000000 +0200
@@ -97,7 +97,7 @@
 SUBDIRS = . m4 lib tests
 
 bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
 
 CLEANFILES = $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
@@ -106,9 +106,9 @@
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
 
-TAGS_DEPENDENCIES = automake.texi
+TAGS_DEPENDENCIES = automake17.texi
 
 EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
   $(AUTOMAKESOURCES)
@@ -143,11 +143,11 @@
 DIST_SOURCES =
 TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
-INFO_DEPS = automake.info
-DVIS = automake.dvi
-PDFS = automake.pdf
-PSS = automake.ps
-TEXINFOS = automake.texi
+INFO_DEPS = automake17.info
+DVIS = automake17.dvi
+PDFS = automake17.pdf
+PSS = automake17.ps
+TEXINFOS = automake17.texi
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
@@ -213,13 +213,13 @@
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-automake.info: automake.texi version.texi
-automake.dvi: automake.texi version.texi
-automake.pdf: automake.texi version.texi
+automake17.info: automake17.texi version.texi
+automake17.dvi: automake17.texi version.texi
+automake17.pdf: automake17.texi version.texi
 version.texi:  stamp-vti
-stamp-vti: automake.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
+stamp-vti: automake17.texi $(top_srcdir)/configure
+	@(dir=.; test -f ./automake17.texi || dir=$(srcdir); \
+	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake17.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -276,11 +276,11 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \
-	  automake.fn automake.ky automake.kys automake.log automake.op \
-	  automake.ov automake.pg automake.pgs automake.tmp \
-	  automake.toc automake.tp automake.tps automake.tr automake.vr \
-	  automake.vrs automake.dvi automake.pdf automake.ps
+	-rm -f automake17.aux automake17.cm automake17.cp automake17.cps automake17.cv \
+	  automake17.fn automake17.ky automake17.kys automake17.log automake17.op \
+	  automake17.ov automake17.pg automake17.pgs automake17.tmp \
+	  automake17.toc automake17.tp automake17.tps automake17.tr automake17.vr \
+	  automake17.vrs automake17.dvi automake17.pdf automake17.ps
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake17.spec	20 Feb 2007 17:07:14 -0000	1.11
+++ automake17.spec	17 Sep 2007 12:00:53 -0000	1.12
@@ -3,20 +3,25 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    8
-License:    GPL
+Release:    9
+License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source10:   filter-provides-automake.sh
 Source11:   filter-requires-automake.sh
 #Patch0:     automake-1.7.9-dvi.patch
 Patch1:     automake-1.7.9-check.patch
+Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.8
+Conflicts:  Obsoletes = 1.7.8
 Requires:   autoconf >= 2.54
-Buildrequires:  autoconf >= 2.54, texinfo, texinfo-tex
+Buildrequires:  autoconf >= 2.54, texinfo
+# Required for 'make check':
+Buildrequires:  texinfo-tex
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %define _use_internal_dependency_generator 0
 %define __find_provides %{SOURCE10}
@@ -38,8 +43,13 @@
 %setup -q -n automake-%{version}
 #patch0 -p1
 %patch1 -p1
+%patch2 -p1
+rm -f automake.info*
+mv automake.texi automake17.texi
 
 %build
+# don't use %%configure here as we'd use config.{sub,guess} from the rpm package
+# instead of our own
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir}
 
@@ -52,7 +62,7 @@
 
 # create this dir empty so we can own it
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
 # KH: FIXME  This needs to be looked at, exdir2 gettext gettext2 subcond fail
 # gettext probably because the gettext.m4 isn't compatible with automake <1.9
@@ -60,20 +70,36 @@
 # make check  # VERBOSE=x
 #endif
 
+%post
+/sbin/install-info %{_infodir}/automake17.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/automake17.info %{_infodir}/dir || :
+fi
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING README AUTHORS THANKS 
 %{_bindir}/*-%{api_version}
 %exclude %{_bindir}/automake
 %exclude %{_bindir}/aclocal
 %{_datadir}/automake-%{api_version}
 %{_datadir}/aclocal-%{api_version}
+%{_infodir}/*
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-9
+- fix licenses
+- add README AUTHORS THANKS  to %%doc
+- add comment about using ./configure
+- fix automake17 info page and install it
+
+
 * Mon Feb 19 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-8
 - misc. cleanups for review
 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:02:11 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 08:02:11 -0400
Subject: fedora-security/audit fc7,1.105,1.106
Message-ID: <200709171202.l8HC2B4e004254@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4197

Modified Files:
	fc7 
Log Message:
Duplicity



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc7	17 Sep 2007 11:01:38 -0000	1.105
+++ fc7	17 Sep 2007 12:02:09 -0000	1.106
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:04:18 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 08:04:18 -0400
Subject: devel/automake17 automake17.spec,1.12,1.13
Message-ID: <200709171204.l8HC4IHF004458@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391

Modified Files:
	automake17.spec 
Log Message:
fix typo


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake17.spec	17 Sep 2007 12:00:53 -0000	1.12
+++ automake17.spec	17 Sep 2007 12:03:45 -0000	1.13
@@ -13,7 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  Obsoletes = 1.7.8
+Conflicts:  automake = 1.7.8
+Obsoletes:  automake = 1.7.8
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':



From fedora-extras-commits at redhat.com  Mon Sep 17 12:18:16 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 08:18:16 -0400
Subject: rpms/curl/F-7 curl.spec,1.49,1.50 sources,1.25,1.26
Message-ID: <200709171218.l8HCIG5R006175@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6116

Modified Files:
	curl.spec sources 
Log Message:
update to 7.16.4 (fixes rhbz#288971 and other issues)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-7/curl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- curl.spec	11 May 2007 12:07:53 -0000	1.49
+++ curl.spec	17 Sep 2007 12:17:44 -0000	1.50
@@ -2,8 +2,8 @@
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.2
-Release: 3%{?dist}
+Version: 7.16.4
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-1
+- update to 7.16.4 (fixes rhbz#288971 and other issues)
+
 * Fri May 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-3
 - add automake BR to curl-devel to fix aclocal dir. ownership,
   thanks to Patrice Dumas


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-7/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Apr 2007 18:20:54 -0000	1.25
+++ sources	17 Sep 2007 12:17:44 -0000	1.26
@@ -1,2 +1 @@
-acdab0b0467c55e10ed02d2afed80575  curl-7.16.1.tar.bz2
-37a1de15c4300ca9413d39d2bcea9b36  curl-7.16.2.tar.bz2
+ffa6d1f4e28ca493a43f9dc17882c4d8  curl-7.16.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 12:20:54 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 08:20:54 -0400
Subject: rpms/mutt/devel mutt-1.5.16-md5.patch,1.1,1.2 mutt.spec,1.48,1.49
Message-ID: <200709171220.l8HCKswt006449@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416

Modified Files:
	mutt-1.5.16-md5.patch mutt.spec 
Log Message:
- fix md5 on big-endian systems


mutt-1.5.16-md5.patch:

Index: mutt-1.5.16-md5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt-1.5.16-md5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mutt-1.5.16-md5.patch	28 Aug 2007 14:24:52 -0000	1.1
+++ mutt-1.5.16-md5.patch	17 Sep 2007 12:20:52 -0000	1.2
@@ -1144,3 +1144,21 @@
 +  md5_process_bytes (response, MD5_DIGEST_LEN, &ctx);
 +  md5_finish_ctx (&ctx, response);
  }
+# HG changeset patch
+# User Emanuele Giaquinta
+# Date 1189794927 25200
+# Node ID c699e5847630f6c9a2207d87d7f933a06b9d9e87
+# Parent  154417d57b9da5e488108887b3061a5322de8dbd
+The new MD5 code needs AC_C_BIGENDIAN on big-endian systems
+
+diff -r 154417d57b9d -r c699e5847630 configure.ac
+--- a/configure.ac	Thu Sep 13 09:39:47 2007 -0700
++++ b/configure.ac	Fri Sep 14 11:35:27 2007 -0700
+@@ -39,6 +39,7 @@ AC_CHECK_TOOL(AR, ar, ar)
+ 
+ AC_C_INLINE
+ AC_C_CONST
++AC_C_BIGENDIAN
+ 
+ AC_SYS_LARGEFILE
+ AC_FUNC_FSEEKO


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mutt.spec	28 Aug 2007 14:24:52 -0000	1.48
+++ mutt.spec	17 Sep 2007 12:20:52 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.16
-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
@@ -101,6 +101,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.16-4
+- fix md5 on big-endian systems
+
 * Tue Aug 28 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.16-3
 - replace md5 implementation
 - update license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 12:24:59 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:24:59 -0400
Subject: rpms/rusers/F-7 netkit-rusers-0.17-rusersd-droppriv.patch, NONE,
	1.1 rusers.spec, 1.23, 1.24 rusersd.init, 1.2, 1.3
Message-ID: <200709171224.l8HCOxX8006947@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6871

Modified Files:
	rusers.spec rusersd.init 
Added Files:
	netkit-rusers-0.17-rusersd-droppriv.patch 
Log Message:
- Removed portmap dependency and re-worked when the user
  privilege are drop; allowing port registration with
  rpcbind. (#247985)


netkit-rusers-0.17-rusersd-droppriv.patch:

--- NEW FILE netkit-rusers-0.17-rusersd-droppriv.patch ---
diff -up netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig netkit-rusers-0.17/rpc.rusersd/rusersd.c
--- netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig	2000-07-23 00:09:28.000000000 -0400
+++ netkit-rusers-0.17/rpc.rusersd/rusersd.c	2007-09-15 06:30:12.000000000 -0400
@@ -74,23 +74,6 @@ main(void)
  
 	/* Open syslog */
 	openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
- 
-	/* Drop privilege */
-	if (getuid() == 0) {
-		struct passwd	*pw;
- 
-		if ((pw = getpwnam("nobody")) == NULL) {
-			syslog(LOG_WARNING, "Unable to find user nobody: %m");
-			exit(1);
-		}
-		if (setgroups(1, &pw->pw_gid) < 0
-		 || setgid(pw->pw_gid) < 0
-		 || setuid(pw->pw_uid) < 0) {
-			syslog(LOG_WARNING, "Failed to drop privilege: %m");
-			exit(1);
-		}
-	}
- 
 	
 	/*
 	 * See if inetd started us
@@ -128,6 +111,23 @@ main(void)
 		syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_IDLE, %s).", proto?"udp":"(inetd)");
 		exit(1);
 	}
+ 
+	/* Drop privilege */
+	if (getuid() == 0) {
+		struct passwd	*pw;
+ 
+		if ((pw = getpwnam("nobody")) == NULL) {
+			syslog(LOG_WARNING, "Unable to find user nobody: %m");
+			exit(1);
+		}
+		if (setgroups(1, &pw->pw_gid) < 0
+		 || setgid(pw->pw_gid) < 0
+		 || setuid(pw->pw_uid) < 0) {
+			syslog(LOG_WARNING, "Failed to drop privilege: %m");
+			exit(1);
+		}
+	}
+ 
 
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");


Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusers.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rusers.spec	9 Aug 2006 12:39:57 -0000	1.23
+++ rusers.spec	17 Sep 2007 12:24:27 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 47
+Release: 48
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
 Patch14: netkit-rusers-0.17-procdiskstats.patch
+Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -72,6 +73,7 @@
 %patch12 -p1 -b .bigendian
 %patch13 -p1 -b .return
 %patch14 -p1 -b .procdiskstats
+%patch15 -p1 -b .dropprivs
 
 %build
 cat > MCONFIG <<EOF
@@ -144,6 +146,11 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17.48
+- Removed portmap dependency and re-worked when the user
+  privilege are drop; allowing port registration with
+  rpcbind. (#247985)
+
 * Wed Aug 09 2006 Phil Knirsch <pknirsch at redhat.com> 0.17-47
 - Modified the RHEL3 procpartitions patch to work on recent 2.6 kernels (#201839)
 


Index: rusersd.init
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusersd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rusersd.init	9 Sep 2004 11:56:00 -0000	1.2
+++ rusersd.init	17 Sep 2007 12:24:27 -0000	1.3
@@ -20,9 +20,6 @@
 RETVAL=0
 
 start() {
-	status portmap > /dev/null
-	RETVAL=$?
-	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/portmap start
 	echo -n $"Starting rusers services: "
 	daemon rpc.rusersd
 	RETVAL=$?



From fedora-extras-commits at redhat.com  Mon Sep 17 12:26:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Mon, 17 Sep 2007 08:26:33 -0400
Subject: rpms/openldap/devel ldap.sysconfig, NONE, 1.1 ldap.init, 1.24,
	1.25 openldap.spec, 1.92, 1.93
Message-ID: <200709171226.l8HCQX5e007113@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7056

Modified Files:
	ldap.init openldap.spec 
Added Files:
	ldap.sysconfig 
Log Message:
skeleton /etc/sysconfig/ldap added
new SLAPD_LDAP option to turn off listening on ldap:///
fixed checking of SSL
Resolves: #292591, #273581


--- NEW FILE ldap.sysconfig ---
# options of slapd (see man slapd)
#SLAPD_OPTIONS=

# options of slurpd (see man slurpd)
#   
#SLURPD_OPTIONS=

# run slapd with -h "... ldap:/// ..."
#   yes/no, default: yes
#SLAPD_LDAP=yes

# run slapd with -h "... ldapi:/// ..."
#   yes/no, default: no
#SLAPD_LDAPI=no

# run slapd with -h "... ldaps:/// ..."
#   yes/no, default: no
#SLAPD_LDAPS=no


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ldap.init	25 Jun 2007 09:18:53 -0000	1.24
+++ ldap.init	17 Sep 2007 12:26:02 -0000	1.25
@@ -19,9 +19,13 @@
 	[ ${NETWORKING} = "no" ] && exit 1
 fi
 
-# Source an auxiliary options file if we have one, and pick up OPTIONS,
-# SLAPD_OPTIONS, SLURPD_OPTIONS, SLAPD_LDAPS, SLAPD_LDAPI, and maybe
-# KRB5_KTNAME.
+# Define default values of options allowed in /etc/sysconfig/ldap
+SLAPD_LDAP="yes"
+SLAPD_LDAPI="no"
+SLAPD_LDAPS="no"
+# OPTIONS, SLAPD_OPTIONS, SLURPD_OPTIONS and KTB5_KTNAME are not defined
+
+# Source an auxiliary options file if we have one
 if [ -r /etc/sysconfig/ldap ] ; then
 	. /etc/sysconfig/ldap
 fi
@@ -149,8 +153,11 @@
 	# Define a couple of local variables which we'll need. Maybe.
 	user=ldap
 	prog=`basename ${slapd}`
-	harg="ldap:///"
-	if grep -q ^TLS /etc/openldap/slapd.conf || test x$SLAPD_LDAPS = xyes ; then
+	harg=""
+	if test x$LDAPD_LDAP = xyes ; then
+	    harg="ldap:///"
+	fi
+	if test x$SLAPD_LDAPS = xyes ; then
 	    harg="$harg ldaps:///"
 	fi
 	if test x$SLAPD_LDAPI = xyes ; then
@@ -170,7 +177,7 @@
 		    if [ "$replogfile" != "replogfile" ]
 		    then
 			echo -n $"Starting $prog: "
-			daemon ${slurpd} -r $replogfile -n $i
+			daemon ${slurpd} -r $replogfile -n $i $SLURPD_OPTIONS
 			# make the return value nozero if any of the slurpd failed
 			RET=$?
 			if [ $RET -ne 0 ] ; then


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- openldap.spec	6 Sep 2007 10:19:28 -0000	1.92
+++ openldap.spec	17 Sep 2007 12:26:02 -0000	1.93
@@ -25,6 +25,7 @@
 Source7: README.upgrading
 Source8: http://www.OpenLDAP.org/doc/admin/guide.html
 Source9: README.evolution
+Source10: ldap.sysconfig
 
 # Patches that are still valid for 2.3
 Patch0: openldap-2.3.34-config.patch
@@ -455,6 +456,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 755 $RPM_SOURCE_DIR/ldap.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap
 
+# Install syconfig/ldap
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 644 $RPM_SOURCE_DIR/ldap.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldap
+
 # Add some more schema for the sake of migration scripts.
 install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
 install -m644 \
@@ -616,7 +621,9 @@
 %doc openldap-%{version_23}/doc/guide/admin/*.gif
 %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
 %attr(0640,root,ldap) %{_sysconfdir}/openldap/DB_CONFIG.example
 %attr(0755,root,root) %dir %{_sysconfdir}/openldap/schema
 %attr(0644,root,root) %dir %{_sysconfdir}/openldap/schema/README*
@@ -669,6 +676,11 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Sep 17 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-2%{?dist}
+- skeleton /etc/sysconfig/ldap added
+- new SLAPD_LDAP option to turn off listening on ldap:/// (#292591)
+- fixed checking of SSL (#292611)
+
 * Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-1%{?dist}
 - new upstream version
 - added images to the guide.html (#273581)



From fedora-extras-commits at redhat.com  Mon Sep 17 12:30:14 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:30:14 -0400
Subject: rpms/rusers/F-7 rusers.spec,1.24,1.25
Message-ID: <200709171230.l8HCUEi5007540@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463

Modified Files:
	rusers.spec 
Log Message:
Added dist tag to get around tagging problem



Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusers.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rusers.spec	17 Sep 2007 12:24:27 -0000	1.24
+++ rusers.spec	17 Sep 2007 12:29:42 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 48
+Release: 48%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,7 +146,7 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
-* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17.48
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-48
 - Removed portmap dependency and re-worked when the user
   privilege are drop; allowing port registration with
   rpcbind. (#247985)



From fedora-extras-commits at redhat.com  Mon Sep 17 12:31:46 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Mon, 17 Sep 2007 08:31:46 -0400
Subject: rpms/quagga/devel .cvsignore, 1.17, 1.18 quagga.spec, 1.38,
	1.39 sources, 1.17, 1.18
Message-ID: <200709171231.l8HCVku9007722@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7663

Modified Files:
	.cvsignore quagga.spec sources 
Log Message:
* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
- upgrade to new upstream 0.99.9
- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Aug 2007 09:54:02 -0000	1.17
+++ .cvsignore	17 Sep 2007 12:31:13 -0000	1.18
@@ -1 +1 @@
-quagga-0.99.8.tar.gz
+quagga-0.99.9.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- quagga.spec	14 Sep 2007 09:41:41 -0000	1.38
+++ quagga.spec	17 Sep 2007 12:31:13 -0000	1.39
@@ -31,8 +31,8 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.8
-Release:    1.1%{?dist}
+Version:	0.99.9
+Release:    1%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -347,6 +347,10 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
+- upgrade to new upstream 0.99.9
+- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS
+
 * Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Aug 2007 09:54:03 -0000	1.17
+++ sources	17 Sep 2007 12:31:13 -0000	1.18
@@ -1 +1 @@
-0a53fb579033fa57ca0e5c3ff0b52105  quagga-0.99.8.tar.gz
+4dbdaf91bf6609803819d97d5fccc4c9  quagga-0.99.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 12:40:10 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:40:10 -0400
Subject: rpms/rusers/devel netkit-rusers-0.17-rusersd-droppriv.patch, NONE, 
	1.1 rusers.spec, 1.26, 1.27
Message-ID: <200709171240.l8HCeAr9008401@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8329

Modified Files:
	rusers.spec 
Added Files:
	netkit-rusers-0.17-rusersd-droppriv.patch 
Log Message:
Removed portmap dependency and re-worked when the user
privilege are drop; allowing port registration with
rpcbind. (#247985)


netkit-rusers-0.17-rusersd-droppriv.patch:

--- NEW FILE netkit-rusers-0.17-rusersd-droppriv.patch ---
diff -up netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig netkit-rusers-0.17/rpc.rusersd/rusersd.c
--- netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig	2000-07-23 00:09:28.000000000 -0400
+++ netkit-rusers-0.17/rpc.rusersd/rusersd.c	2007-09-15 06:30:12.000000000 -0400
@@ -74,23 +74,6 @@ main(void)
  
 	/* Open syslog */
 	openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
- 
-	/* Drop privilege */
-	if (getuid() == 0) {
-		struct passwd	*pw;
- 
-		if ((pw = getpwnam("nobody")) == NULL) {
-			syslog(LOG_WARNING, "Unable to find user nobody: %m");
-			exit(1);
-		}
-		if (setgroups(1, &pw->pw_gid) < 0
-		 || setgid(pw->pw_gid) < 0
-		 || setuid(pw->pw_uid) < 0) {
-			syslog(LOG_WARNING, "Failed to drop privilege: %m");
-			exit(1);
-		}
-	}
- 
 	
 	/*
 	 * See if inetd started us
@@ -128,6 +111,23 @@ main(void)
 		syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_IDLE, %s).", proto?"udp":"(inetd)");
 		exit(1);
 	}
+ 
+	/* Drop privilege */
+	if (getuid() == 0) {
+		struct passwd	*pw;
+ 
+		if ((pw = getpwnam("nobody")) == NULL) {
+			syslog(LOG_WARNING, "Unable to find user nobody: %m");
+			exit(1);
+		}
+		if (setgroups(1, &pw->pw_gid) < 0
+		 || setgid(pw->pw_gid) < 0
+		 || setuid(pw->pw_uid) < 0) {
+			syslog(LOG_WARNING, "Failed to drop privilege: %m");
+			exit(1);
+		}
+	}
+ 
 
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");


Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rusers.spec	29 Aug 2007 04:33:59 -0000	1.26
+++ rusers.spec	17 Sep 2007 12:39:38 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 50%{?dist}
+Release: 51%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
 Patch14: netkit-rusers-0.17-procdiskstats.patch
+Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -72,6 +73,7 @@
 %patch12 -p1 -b .bigendian
 %patch13 -p1 -b .return
 %patch14 -p1 -b .procdiskstats
+%patch15 -p1 -b .dropprivs
 
 %build
 cat > MCONFIG <<EOF
@@ -144,6 +146,11 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-51
+- Removed portmap dependency and re-worked when the user
+  privilege are drop; allowing port registration with
+  rpcbind. (#247985)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.17-50
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:58:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 08:58:41 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.218,1.219
Message-ID: <200709171258.l8HCwfUV009833@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9731

Modified Files:
	gnome-panel.spec 
Log Message:
drop hard fast-user-switch-applet dependency



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- gnome-panel.spec	13 Sep 2007 17:42:24 -0000	1.218
+++ gnome-panel.spec	17 Sep 2007 12:58:08 -0000	1.219
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,7 +39,6 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
-Requires: fast-user-switch-applet
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -311,6 +310,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-5
+- Drop the requires for fast-user-switch-applet (#253831)
+
 * Thu Sep 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-4
 - Fix some memleaks
 - Remove OpenOffice launchers from the default configuration



From fedora-extras-commits at redhat.com  Mon Sep 17 13:02:40 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 09:02:40 -0400
Subject: rpms/lftp/devel lftp.spec,1.61,1.62
Message-ID: <200709171302.l8HD2eUk016120@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16054

Modified Files:
	lftp.spec 
Log Message:
* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-2
- rebase
- deleted symlinks liblftp-jobs.so & liblftp-tasks.so



Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- lftp.spec	17 Sep 2007 08:19:16 -0000	1.61
+++ lftp.spec	17 Sep 2007 13:02:08 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.14
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -44,6 +44,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-*.so
 %find_lang %{name}
 %if %{DEBUG}
 %{_libdir}/rpm/brp-compress
@@ -85,8 +86,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
-* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
+* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-2
 - rebase
+- deleted symlinks liblftp-jobs.so & liblftp-tasks.so
 
 * Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
 - rebuild



From fedora-extras-commits at redhat.com  Mon Sep 17 13:04:11 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 09:04:11 -0400
Subject: rpms/ypbind/devel ypbind.init,1.17,1.18 ypbind.spec,1.43,1.44
Message-ID: <200709171304.l8HD4Bin016324@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16257

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Fixed a couple of typos in initscript (bz 281951)



Index: ypbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ypbind.init	17 Apr 2007 19:50:58 -0000	1.17
+++ ypbind.init	17 Sep 2007 13:03:39 -0000	1.18
@@ -51,7 +51,7 @@
 start() {
 	DOMAINNAME=`domainname`
 	if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
-		echo -n $"Setting  NIS domain: "
+		echo -n $"Setting NIS domain: "
 		if [ -n "$NISDOMAIN" ]; then
 			action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN
 		else # See if the domain is set in config file
@@ -77,7 +77,7 @@
 	    logger -t ypbind "failed to start!"
 	    return $RETVAL
 	fi
-	echo -n $"Binding  NIS service: "
+	echo -n $"Binding NIS service: "
 	# the following fixes problems with the init scripts continuing
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
@@ -145,6 +145,7 @@
 	;;
   status)
 	status ypbind
+	RETVAL=$?
 	;;
   restart|reload)
 	restart


Index: ypbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ypbind.spec	18 May 2007 20:17:41 -0000	1.43
+++ ypbind.spec	17 Sep 2007 13:03:39 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.20.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -91,6 +91,9 @@
 %doc README NEWS
 
 %changelog
+* Mon Sep 17 2007 Steve Dickson <steved at redhat.com> - 3:1.20.4-2
+- Fixed a couple of typos in initscript (bz 281951)
+
 * Wed May  3 2007 Steve Dickson <steved at redhat.com> - 3:1.20.4-1
 - updated to latest upstream version ypbind-mt-1.20.4
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:12:00 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Mon, 17 Sep 2007 09:12:00 -0400
Subject: rpms/quagga/F-7 .cvsignore, 1.16, 1.17 quagga.spec, 1.36,
	1.37 sources, 1.16, 1.17
Message-ID: <200709171312.l8HDC0fr017103@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17025

Modified Files:
	.cvsignore quagga.spec sources 
Log Message:
* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
- upgrade to new upstream 0.99.9
- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Jul 2007 13:30:12 -0000	1.16
+++ .cvsignore	17 Sep 2007 13:11:28 -0000	1.17
@@ -1 +1 @@
-quagga-0.99.7.tar.gz
+quagga-0.99.9.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/quagga.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- quagga.spec	3 Jul 2007 13:30:12 -0000	1.36
+++ quagga.spec	17 Sep 2007 13:11:28 -0000	1.37
@@ -31,7 +31,7 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.7
+Version:	0.99.9
 Release:    1%{?dist}
 Epoch:      0
 License:	GPL
@@ -340,6 +340,10 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
+- upgrade to new upstream 0.99.9
+- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS
+
 * Tue Jul  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.7-1
 - upgrade to new upstream 0.99.7
 - resolves: #240488: CVE-2007-1995 Quagga bgpd DoS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Jul 2007 13:30:12 -0000	1.16
+++ sources	17 Sep 2007 13:11:28 -0000	1.17
@@ -1 +1 @@
-f448281c50007408ce92c5d8e2107abc  quagga-0.99.7.tar.gz
+4dbdaf91bf6609803819d97d5fccc4c9  quagga-0.99.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 13:13:25 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 09:13:25 -0400
Subject: rpms/pcre/devel .cvsignore, 1.9, 1.10 pcre.spec, 1.22, 1.23 sources,
	1.10, 1.11
Message-ID: <200709171313.l8HDDPFd017273@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17163

Modified Files:
	.cvsignore pcre.spec sources 
Log Message:
bz292501, update to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2006 19:43:55 -0000	1.9
+++ .cvsignore	17 Sep 2007 13:12:53 -0000	1.10
@@ -3,3 +3,4 @@
 pcre-6.3.tar.bz2
 pcre-6.6.tar.bz2
 pcre-6.7.tar.bz2
+pcre-7.3.tar.bz2


Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pcre.spec	22 Jan 2007 10:59:48 -0000	1.22
+++ pcre.spec	17 Sep 2007 13:12:53 -0000	1.23
@@ -1,13 +1,12 @@
 Name: pcre
-Version: 7.0
-Release: 2
+Version: 7.3
+Release: 1
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
 Patch1: pcre-6.6-multilib.patch
 License: BSD
 Group: System Environment/Libraries
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /sbin/ldconfig
 BuildPrereq: sed
@@ -82,6 +81,9 @@
 %{_bindir}/pcre-config
 
 %changelog
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 7.3-1
+- bz292501, update to 7.3
+
 * Mon Jan 22 2007 Than Ngo <than at redhat.com> - 7.0-1
 - 7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Jan 2007 10:15:40 -0000	1.10
+++ sources	17 Sep 2007 13:12:53 -0000	1.11
@@ -1 +1 @@
-b97e3bb84bd665e0fbb7a90344d65a43  pcre-7.0.tar.bz2
+08b48bf97ff84a9dea07d6be518f0046  pcre-7.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 13:29:47 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 09:29:47 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.2,1.3
Message-ID: <200709171329.l8HDTl6R018765@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18694

Modified Files:
	eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
- Require eclipse-platform >= 3.2.1 



Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-egit.spec	15 Sep 2007 18:16:03 -0000	1.2
+++ eclipse-egit.spec	17 Sep 2007 13:29:15 -0000	1.3
@@ -4,8 +4,8 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          0.git20070911%{?dist}
-License:          EPL GPLv2
+Release:          1.git20070911%{?dist}
+License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
@@ -14,7 +14,7 @@
 Source1:          egit.png
 Patch0:           %{name}-add-feature.patch
 
-Requires:         eclipse-platform > 1:3.3.0
+Requires:         eclipse-platform >= 1:3.2.1
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
@@ -97,6 +97,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
+- Require eclipse-platform >= 3.2.1 
+
 * Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
 - Update to git20070911.
 - Update feature and accosicated branding plugin.



From fedora-extras-commits at redhat.com  Mon Sep 17 13:30:25 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 09:30:25 -0400
Subject: rpms/netatalk/devel netatalk-2.0.3-open_call.patch, NONE,
	1.1 netatalk.spec, 1.37, 1.38 netatalk-2.0.3-build_open.patch,
	1.1, NONE
Message-ID: <200709171330.l8HDUPmo018891@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-open_call.patch 
Removed Files:
	netatalk-2.0.3-build_open.patch 
Log Message:
* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-15
- patch to build on FC, bad open call 


netatalk-2.0.3-open_call.patch:

--- NEW FILE netatalk-2.0.3-open_call.patch ---
diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c
--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call	2007-09-17 15:21:26.000000000 +0200
+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c	2007-09-17 15:21:43.000000000 +0200
@@ -131,9 +131,9 @@ static int  my_associate (DB *p, DB *s,
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags, mode);
+    return (p->open)(p, NULL, f, d, t, flags, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha
     }
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
 	LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc));
 	/* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */
         if (rc == DB_RUNRECOVERY) {
@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }
diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c
--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call	2007-09-17 15:14:36.000000000 +0200
+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c	2007-09-17 15:15:06.000000000 +0200
@@ -133,9 +133,9 @@ static int my_yield(void)
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode);
+    return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha
 #endif /* DB_VERSION_MINOR > 1 */
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
         if (rc == DB_RUNRECOVERY) {
             /* This is the mother of all errors.  We _must_ fail here. */
             LOG(log_error, logtype_default,
@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }
diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c
--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call	2007-09-17 15:14:49.000000000 +0200
+++ netatalk-2.0.3/bin/cnid/cnid_index.c	2007-09-17 15:15:35.000000000 +0200
@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char *
     int ret;
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); 
 #else
-    ret = db->open(db,       file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db,       file, name, type, DB_CREATE, mode); 
 #endif
 
     if (ret) {
@@ -353,7 +353,7 @@ static int dbif_env_init(void)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
     db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
@@ -379,7 +379,7 @@ static int dbif_env_init(void)
     }
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
         db_env->close(db_env, 0);
diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c
--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call	2007-09-17 15:14:59.000000000 +0200
+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c	2007-09-17 15:16:54.000000000 +0200
@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char *
     int ret;
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); 
 #else
-    ret = db->open(db,       file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db,       file, name, type, DB_CREATE, mode); 
 #endif
 
     if (ret) {
@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
     db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp)
     
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
         db_env->close(db_env, 0);


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- netatalk.spec	12 Sep 2007 11:09:00 -0000	1.37
+++ netatalk.spec	17 Sep 2007 13:29:53 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -16,7 +16,7 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
-Patch5:  netatalk-2.0.3-build_open.patch
+Patch5:  netatalk-2.0.3-open_call.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -49,7 +49,7 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
-%patch5  -p1 -b .build_open
+%patch5  -p1 -b .open_call
 
 ln -s ./NEWS ChangeLog
 
@@ -188,7 +188,7 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
-* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-14
+* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-15
 - patch to build on FC, bad open call 
 
 * Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13


--- netatalk-2.0.3-build_open.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 13:38:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 09:38:27 -0400
Subject: rpms/pcre/devel pcre.spec, 1.23, 1.24 pcre-6.6-multilib.patch, 1.1, 
	NONE pcre-6.6-stack.patch, 1.1, NONE
Message-ID: <200709171338.l8HDcREO019699@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19640

Modified Files:
	pcre.spec 
Removed Files:
	pcre-6.6-multilib.patch pcre-6.6-stack.patch 
Log Message:
bz292501, update to 7.3



Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pcre.spec	17 Sep 2007 13:12:53 -0000	1.23
+++ pcre.spec	17 Sep 2007 13:37:55 -0000	1.24
@@ -4,7 +4,6 @@
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
-Patch1: pcre-6.6-multilib.patch
 License: BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root


--- pcre-6.6-multilib.patch DELETED ---


--- pcre-6.6-stack.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 13:43:04 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 17 Sep 2007 09:43:04 -0400
Subject: rpms/libglademm24/devel libglademm.spec,1.12,1.13
Message-ID: <200709171343.l8HDh4QV020105@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20047

Modified Files:
	libglademm.spec 
Log Message:
Update to 2.6.4, license tag update, long needed rebuild


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libglademm.spec	28 Aug 2007 22:27:39 -0000	1.12
+++ libglademm.spec	17 Sep 2007 13:42:31 -0000	1.13
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.6.4-1
+- Update to 2.6.4
+- License tag update
+
 * Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
 - Added dist tag
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:48:45 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 09:48:45 -0400
Subject: rpms/curl/devel curl.spec,1.59,1.60
Message-ID: <200709171348.l8HDmjre020726@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20656

Modified Files:
	curl.spec 
Log Message:
add zlib-devel BR to enable gzip compressed transfers in curl (#292211)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- curl.spec	10 Sep 2007 07:12:49 -0000	1.59
+++ curl.spec	17 Sep 2007 13:48:13 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -15,7 +15,7 @@
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
 BuildRequires: nss-devel >= 3.11.7-7
 
 %description
@@ -103,6 +103,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-7
+- add zlib-devel BR to enable gzip compressed transfers in curl (#292211)
+
 * Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
 - provide webclient (#225671)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:51:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 09:51:08 -0400
Subject: rpms/libX11/devel libX11-1.1.2-GetMotionEvents.patch, NONE,
	1.1 libX11.spec, 1.37, 1.38
Message-ID: <200709171351.l8HDp8NI021052@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20941

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
  to match the argument order in the headers. (#274671)


libX11-1.1.2-GetMotionEvents.patch:

--- NEW FILE libX11-1.1.2-GetMotionEvents.patch ---
diff -up libX11-1.1.2/src/GetMoEv.c.jx libX11-1.1.2/src/GetMoEv.c
--- libX11-1.1.2/src/GetMoEv.c.jx	2007-06-02 13:46:55.000000000 -0400
+++ libX11-1.1.2/src/GetMoEv.c	2007-09-17 09:30:24.000000000 -0400
@@ -33,9 +33,9 @@ in this Software without prior written a
 
 XTimeCoord *XGetMotionEvents(
     register Display *dpy,
+    Window w,
     Time start, 
     Time stop,
-    Window w,
     int *nEvents)  /* RETURN */
 {       
     xGetMotionEventsReply rep;


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libX11.spec	21 Aug 2007 20:07:04 -0000	1.37
+++ libX11.spec	17 Sep 2007 13:50:36 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,6 +15,7 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
+Patch4: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -56,6 +57,7 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
+%patch4 -p1 -b .getmoev
 
 %build
 %configure \
@@ -245,6 +247,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
+- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
+  to match the argument order in the headers. (#274671)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.2-2
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:54:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 09:54:10 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.219,1.220
Message-ID: <200709171354.l8HDsAjX022529@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21925

Modified Files:
	gnome-panel.spec 
Log Message:
add requires for applets in the default config again



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- gnome-panel.spec	17 Sep 2007 12:58:08 -0000	1.219
+++ gnome-panel.spec	17 Sep 2007 13:53:37 -0000	1.220
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,6 +39,8 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
+Requires: fast-user-switch-applet
+Requires: tomboy
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -310,6 +312,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-6
+- Turns out we need requires for applets in the default config (#293261)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-5
 - Drop the requires for fast-user-switch-applet (#253831)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 14:05:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 10:05:27 -0400
Subject: rpms/pcre/devel pcre-7.3-multilib.patch, NONE, 1.1 pcre.spec, 1.24,
	1.25
Message-ID: <200709171405.l8HE5RdW030432@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305

Modified Files:
	pcre.spec 
Added Files:
	pcre-7.3-multilib.patch 
Log Message:
update to 7.3


pcre-7.3-multilib.patch:

--- NEW FILE pcre-7.3-multilib.patch ---
--- pcre-7.3/pcre-config.in.orig	2007-09-17 15:58:11.000000000 +0200
+++ pcre-7.3/pcre-config.in	2007-09-17 16:02:50.000000000 +0200
@@ -12,16 +12,6 @@
       exit 1
 fi
 
-libR=
-case `uname -s` in
-  *SunOS*)
-  libR=" -R at libdir@"
-  ;;
-  *BSD*)
-  libR=" -Wl,-R at libdir@"
-  ;;
-esac
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -55,10 +45,10 @@
       echo $includes
       ;;
     --libs-posix)
-      echo -L at libdir@$libR -lpcreposix -lpcre
+      echo -lpcreposix -lpcre
       ;;
     --libs)
-      echo -L at libdir@$libR -lpcre
+      echo -lpcre
       ;;
     *)
       echo "${usage}" 1>&2


Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pcre.spec	17 Sep 2007 13:37:55 -0000	1.24
+++ pcre.spec	17 Sep 2007 14:04:55 -0000	1.25
@@ -4,6 +4,7 @@
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
+Patch: pcre-7.3-multilib.patch
 License: BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,7 +29,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .multilib
+%patch -p1 -b .multilib
 
 %build
 %configure --enable-utf8 --enable-unicode-properties
@@ -68,7 +69,8 @@
 %{_mandir}/man1/*
 %{_bindir}/pcregrep
 %{_bindir}/pcretest
-%doc LICENCE AUTHORS
+%doc %{_docdir}/pcre/LICENCE
+%doc %{_docdir}/pcre/AUTHORS
 
 %files devel
 %defattr(-,root,root)
@@ -78,6 +80,10 @@
 %{_includedir}/*.h
 %{_mandir}/man3/*
 %{_bindir}/pcre-config
+%doc %{_docdir}/pcre
+%exclude %{_docdir}/pcre/LICENCE
+%exclude %{_docdir}/pcre/AUTHORS
+
 
 %changelog
 * Mon Sep 17 2007 Than Ngo <than at redhat.com> - 7.3-1



From fedora-extras-commits at redhat.com  Mon Sep 17 14:17:22 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 17 Sep 2007 10:17:22 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.686, 1.687 kernel.spec, 1.167,
	1.168 linux-2.6-smarter-relatime.patch, 1.1, 1.2 sources, 1.648,
	1.649 upstream, 1.570, 1.571 patch-2.6.23-rc6-git4.bz2.sign, 1.1, NONE
Message-ID: <200709171417.l8HEHMWx031482@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31398

Modified Files:
	.cvsignore kernel.spec linux-2.6-smarter-relatime.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc6-git7.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git4.bz2.sign 
Log Message:
* Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git7



--- NEW FILE patch-2.6.23-rc6-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG7iaqyGugalF9Dw4RAnTUAJ4tkdDJ1MNQmBRLqubr6Vmcwk1pWgCfW2Tj
SDF2GZ5gdMf4aQMJT/g+vzo=
=SS8p
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -r1.686 -r1.687
--- .cvsignore	13 Sep 2007 20:59:51 -0000	1.686
+++ .cvsignore	17 Sep 2007 14:16:49 -0000	1.687
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git4.bz2
+patch-2.6.23-rc6-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kernel.spec	14 Sep 2007 20:55:47 -0000	1.167
+++ kernel.spec	17 Sep 2007 14:16:49 -0000	1.168
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 4
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git7
+
 * Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - leave boot option as "libata.pata_dma" for now
 

linux-2.6-smarter-relatime.patch:

Index: linux-2.6-smarter-relatime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-smarter-relatime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-smarter-relatime.patch	12 Aug 2007 04:19:44 -0000	1.1
+++ linux-2.6-smarter-relatime.patch	17 Sep 2007 14:16:49 -0000	1.2
@@ -52,7 +52,7 @@
  			Set system-wide default UTF-8 mode for all tty's.
 @@ -1468,6 +1472,10 @@ and is between 256 and 4096 characters. 
  			Format: <reboot_mode>[,<reboot_mode2>[,...]]
- 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c			
+ 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c
  
 +	relatime_interval=
 +			[FS] relative atime update frequency, in seconds.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- sources	13 Sep 2007 20:59:51 -0000	1.648
+++ sources	17 Sep 2007 14:16:49 -0000	1.649
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-cb3be21465bfff5bc14e38f5189b503a  patch-2.6.23-rc6-git4.bz2
+4f3845c3e912bc93c09b0dec08719232  patch-2.6.23-rc6-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- upstream	13 Sep 2007 20:59:51 -0000	1.570
+++ upstream	17 Sep 2007 14:16:49 -0000	1.571
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git4.bz2
+patch-2.6.23-rc6-git7.bz2


--- patch-2.6.23-rc6-git4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:18 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:18 -0700
Subject: [pkgdb] radeontool: ajax has requested watchcommits
Message-ID: <200709171432.l8HEWJ8w021158@app4.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on radeontool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:18 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:18 -0700
Subject: [pkgdb] radeontool: ajax has requested commit
Message-ID: <200709171432.l8HEWJ8D018652@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on radeontool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:34 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:34 -0700
Subject: [pkgdb] vbetool: ajax has requested watchcommits
Message-ID: <200709171432.l8HEWZ1M018734@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on vbetool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:36 -0700
Subject: [pkgdb] vbetool: ajax has requested commit
Message-ID: <200709171432.l8HEWau6021246@app4.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on vbetool (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:51:55 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 10:51:55 -0400
Subject: rpms/eclipse-egit/F-7 eclipse-egit-add-feature.patch, NONE,
	1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709171451.l8HEptbu001105@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
- Pull in build from rawhide.


eclipse-egit-add-feature.patch:

--- NEW FILE eclipse-egit-add-feature.patch ---
diff --git a/org.spearce.egit-feature/.project b/org.spearce.egit-feature/.project
new file mode 100644
index 0000000..dac8f65
--- /dev/null
+++ egit/org.spearce.egit-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.spearce.egit-feature/build.properties b/org.spearce.egit-feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ egit/org.spearce.egit-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.spearce.egit-feature/feature.xml b/org.spearce.egit-feature/feature.xml
new file mode 100644
index 0000000..01c53cd
--- /dev/null
+++ egit/org.spearce.egit-feature/feature.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.spearce.egit"
+      label="Eclipse Git Feature"
+      version="0.2.2"
+      provider-name="spearce.org"
+      plugin="org.spearce.egit">
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.team.ui"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.junit"/>
+   </requires>
+
+   <plugin
+         id="org.spearce.egit.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.jgit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.spearce.egit/.classpath b/org.spearce.egit/.classpath
new file mode 100644
index 0000000..acad1c2
--- /dev/null
+++ egit/org.spearce.egit/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.spearce.egit/.project b/org.spearce.egit/.project
new file mode 100644
index 0000000..bbdc4e3
--- /dev/null
+++ egit/org.spearce.egit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.spearce.egit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..40da4e0
--- /dev/null
+++ egit/org.spearce.egit/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Java Git / Eclipse Git
+Bundle-SymbolicName: org.spearce.egit
+Bundle-Version: 0.2.2
+Bundle-Vendor: spearce.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.spearce.egit/about.ini b/org.spearce.egit/about.ini
new file mode 100644
index 0000000..dcab31a
--- /dev/null
+++ egit/org.spearce.egit/about.ini
@@ -0,0 +1,28 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=Java Git / Eclipse Git (by Shawn Pearce) is a Java Git library and plugin for the Eclipse IDE.
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egit.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
\ No newline at end of file
diff --git a/org.spearce.egit/build.properties b/org.spearce.egit/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ egit/org.spearce.egit/build.properties
@@ -0,0 +1,3 @@
+bin.includes = META-INF/,\
+               egit.png,\
+               about.ini


--- NEW FILE eclipse-egit.spec ---

%define gcj_support     1

Summary:          Eclipse Git plug-in
Name:             eclipse-egit
Version:          0.2.2
Release:          1.git20070911%{?dist}
License:          EPL GPLv2 LGPLv2
URL:              http://repo.or.cz/w/egit.git
Group:            Development/Tools

# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
Source1:          egit.png
Patch0:           %{name}-add-feature.patch

Requires:         eclipse-platform >= 1:3.2.1
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.1.2
BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
Requires(post):   java-1.5.0-gcj >= 1.5.0
Requires(postun): java-1.5.0-gcj >= 1.5.0
%else
BuildRequires:    java-devel >= 1.6.0
%endif

BuildRequires:    eclipse-pde
BuildRequires:    jpackage-utils >= 0:1.5

%if %{gcj_support}
%else
BuildArch:        noarch
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The eclipse-egit package contains Eclipse plugins for
interacting with Git repositories.

%prep
%setup -q -c 
%patch0 -p0
cp %{SOURCE1} egit/org.spearce.egit

%build
# Copy the SDK for build
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

# build the main egit feature
java -cp $SDK/startup.jar                              \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=feature                                    \
     -Did=org.spearce.egit                             \
     -DbaseLocation=$SDK                               \
     -DjavacSource=1.5  -DjavacTarget=1.5              \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse

# egit main feature
unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
            build/rpmBuild/org.spearce.egit.zip

%if %{gcj_support}
aot-compile-rpm
%endif

%clean 
rm -rf $RPM_BUILD_ROOT

%if %{gcj_support}
%post -p /usr/bin/rebuild-gcj-db
%postun -p /usr/bin/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_datadir}/eclipse/features/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit.core*
%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
%{_datadir}/eclipse/plugins/org.spearce.jgit*
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif

%changelog
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
- Pull in build from rawhide.
- Require eclipse-platform >= 3.2.1. 

* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
- Update to git20070911.
- Update feature and accosicated branding plugin.

* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:27:08 -0000	1.1
+++ .cvsignore	17 Sep 2007 14:51:23 -0000	1.2
@@ -0,0 +1,2 @@
+egit.png
+egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:27:08 -0000	1.1
+++ sources	17 Sep 2007 14:51:23 -0000	1.2
@@ -0,0 +1,2 @@
+5d1082d9db40f01c5de094ac8769514b  egit.png
+d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 14:51:59 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:51:59 -0700
Subject: [pkgdb] vbetool had acl change status
Message-ID: <200709171451.l8HEpxwb024088@app3.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on vbetool (Fedora devel) to Approved for Adam Jackson (ajax)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:04 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:04 -0700
Subject: [pkgdb] vbetool had acl change status
Message-ID: <200709171452.l8HEq4Vi026528@app4.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on vbetool (Fedora devel) to Approved for Adam Jackson (ajax)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:12 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 10:52:12 -0400
Subject: devel/yum yum-3.2.5-close.patch,NONE,1.1 yum.spec,1.178,1.179
Message-ID: <200709171452.l8HEqCAm001119@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1037

Modified Files:
	yum.spec 
Added Files:
	yum-3.2.5-close.patch 
Log Message:
* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
- fix traceback with closing repos 


yum-3.2.5-close.patch:

--- NEW FILE yum-3.2.5-close.patch ---
commit 217b37b73a1767ea696e2589b4c99afda07f2df3
Author: Jeremy Katz <katzj at redhat.com>
Date:   Mon Sep 17 10:50:11 2007 -0400

    don't delete objects multiple times

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 88b63f7..c6877bd 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -222,16 +222,16 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                        self.filelistsdb.values() + \
                        self.otherdb.values():
             dataobj.close()
-            self.primarydb = {}
-            self.filelistsdb = {}
-            self.otherdb = {}
-            self.excludes = {}
-            self._search_cache = {
-                'provides' : { },
-                'requires' : { },
-                }
-            del self.pkgobjlist
-            del self.pkglist
+        self.primarydb = {}
+        self.filelistsdb = {}
+        self.otherdb = {}
+        self.excludes = {}
+        self._search_cache = {
+            'provides' : { },
+            'requires' : { },
+            }
+        del self.pkgobjlist
+        del self.pkglist
 
         yumRepo.YumPackageSack.close(self)
 


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- yum.spec	12 Sep 2007 14:55:06 -0000	1.178
+++ yum.spec	17 Sep 2007 14:51:39 -0000	1.179
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
 Patch2: yum-trans-display-object.patch
+Patch3: yum-3.2.5-close.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -50,6 +51,7 @@
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .showdep
 %patch2 -p1 -b .transdisp
+%patch3 -p1 -b .close
 
 %build
 make
@@ -95,6 +97,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
+- fix traceback with closing repos 
+
 * Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
 - add upstream patch to improve RPMTransaction display
 



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:17 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:17 -0700
Subject: [pkgdb] radeontool had acl change status
Message-ID: <200709171452.l8HEqHbU026600@app4.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on radeontool (Fedora devel) to Approved for Adam Jackson (ajax)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:18 -0700
Subject: [pkgdb] radeontool had acl change status
Message-ID: <200709171452.l8HEqIXT024196@app3.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on radeontool (Fedora devel) to Approved for Adam Jackson (ajax)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 14:54:13 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 10:54:13 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, 1.2,
	1.3 eclipse-egit.spec, 1.3, 1.4
Message-ID: <200709171454.l8HEsDsg001299@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1275

Modified Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
- Update add feature and plugin patch.


eclipse-egit-add-feature.patch:

Index: eclipse-egit-add-feature.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit-add-feature.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-egit-add-feature.patch	15 Sep 2007 18:16:03 -0000	1.2
+++ eclipse-egit-add-feature.patch	17 Sep 2007 14:54:11 -0000	1.3
@@ -33,7 +33,7 @@
 index 0000000..01c53cd
 --- /dev/null
 +++ egit/org.spearce.egit-feature/feature.xml
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,51 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<feature
 +      id="org.spearce.egit"
@@ -71,6 +71,13 @@
 +         unpack="false"/>
 +
 +   <plugin
++         id="org.spearce.egit"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
 +         id="org.spearce.jgit"
 +         download-size="0"
 +         install-size="0"
@@ -177,8 +184,7 @@
 index 0000000..34d2e4d
 --- /dev/null
 +++ egit/org.spearce.egit/build.properties
-@@ -0,0 +1,4 @@
-+source.. = src/
-+output.. = bin/
+@@ -0,0 +1,3 @@
 +bin.includes = META-INF/,\
-+               .
++               egit.png,\
++               about.ini


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-egit.spec	17 Sep 2007 13:29:15 -0000	1.3
+++ eclipse-egit.spec	17 Sep 2007 14:54:11 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          1.git20070911%{?dist}
+Release:          2.git20070911%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
@@ -97,6 +97,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
+- Update add feature and plugin patch.
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
 - Require eclipse-platform >= 3.2.1 
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:03:18 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 11:03:18 -0400
Subject: fedora-security/audit fc6,1.258,1.259 fc7,1.106,1.107
Message-ID: <200709171503.l8HF3IkC007590@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7566/audit

Modified Files:
	fc6 fc7 
Log Message:
Add quagga bgpd DoS



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- fc6	17 Sep 2007 10:09:34 -0000	1.258
+++ fc6	17 Sep 2007 15:03:16 -0000	1.259
@@ -9,6 +9,7 @@
 
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
+CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc7	17 Sep 2007 12:02:09 -0000	1.106
+++ fc7	17 Sep 2007 15:03:16 -0000	1.107
@@ -17,6 +17,7 @@
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Mon Sep 17 15:04:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Mon, 17 Sep 2007 11:04:22 -0400
Subject: rpms/cvs/devel cvs-1.11.22-diff-rm.patch, 1.1, 1.2 cvs.spec, 1.57,
	1.58
Message-ID: <200709171504.l8HF4MUW007639@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7546

Modified Files:
	cvs-1.11.22-diff-rm.patch cvs.spec 
Log Message:
Fixed problem with cvs diff when diffing removed files.


cvs-1.11.22-diff-rm.patch:

Index: cvs-1.11.22-diff-rm.patch
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs-1.11.22-diff-rm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvs-1.11.22-diff-rm.patch	22 Aug 2007 13:33:21 -0000	1.1
+++ cvs-1.11.22-diff-rm.patch	17 Sep 2007 15:04:20 -0000	1.2
@@ -1,12 +1,18 @@
-diff -urp cvs-1.11.22/src/diff.c cvs-1.11.22mzk/src/diff.c
---- cvs-1.11.22/src/diff.c	2007-07-30 10:35:13.000000000 +0200
-+++ cvs-1.11.22mzk/src/diff.c	2007-07-30 10:27:34.000000000 +0200
-@@ -503,7 +503,7 @@ diff_fileproc (callerdat, finfo)
+--- cvs-1.11.22/src/diff.c	2007-09-17 16:55:18.000000000 +0200
++++ cvs-1.11.22/src/diff.c.usercheck	2007-09-17 16:55:28.000000000 +0200
+@@ -502,13 +502,8 @@ diff_fileproc (callerdat, finfo)
+ 
      user_file_rev = 0;
      vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
- 
+-
 -    if (diff_rev2 != NULL || diff_date2 != NULL)
-+    if ((diff_rev2 != NULL || diff_date2 != NULL) && strcmp(diff_rev1,TAG_BASE)!=0 && strcmp(diff_rev2,TAG_BASE)!=0)
+-    {
+-	/* Skip all the following checks regarding the user file; we're
+-	   not using it.  */
+-    }
+-    else if (vers->vn_user == NULL)
++    
++    if (vers->vn_user == NULL)
      {
- 	/* Skip all the following checks regarding the user file; we're
- 	   not using it.  */
+ 	/* The file does not exist in the working directory.  */
+ 	if ((diff_rev1 != NULL || diff_date1 != NULL)


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cvs.spec	22 Aug 2007 13:33:21 -0000	1.57
+++ cvs.spec	17 Sep 2007 15:04:20 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -161,6 +161,10 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Sep 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-12
+- rewriten previous patch when trying to diff  removed files
+- Resolves: #277501, #242049
+
 * Mon Jul 30 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-11
 - fix diff on removed file when "-r BASE" tag is used
 - Resolves: #242049



From fedora-extras-commits at redhat.com  Mon Sep 17 15:09:32 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:09:32 -0400
Subject: rpms/qt/devel qt-3.3.6-bz#292941-CVE-2007-4137.patch, NONE,
	1.1 qt.spec, 1.140, 1.141
Message-ID: <200709171509.l8HF9Wg0007925@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7885

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-bz#292941-CVE-2007-4137.patch 
Log Message:
CVE-2007-4137


qt-3.3.6-bz#292941-CVE-2007-4137.patch:

--- NEW FILE qt-3.3.6-bz#292941-CVE-2007-4137.patch ---
--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -165,7 +165,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	result.setLength( len ); // worst case
+	result.setLength( len + 1 ); // worst case
 	QChar *qch = (QChar *)result.unicode();
 	uchar ch;
         int error = -1;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- qt.spec	29 Aug 2007 17:21:39 -0000	1.140
+++ qt.spec	17 Sep 2007 15:08:59 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 7%{?dist}.1
+Release: 8%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -57,7 +57,6 @@
 Patch104: qt-font-default-subst.diff
 patch105: 0073-xinerama-aware-qpopup.patch
 Patch106: 0076-fix-qprocess.diff
-Patch107: 0077-utf8-decoder-fixes.diff
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
@@ -66,6 +65,7 @@
 # security patces
 Patch300: qt3-CVE-2007-3388.patch
 Patch301: utf8-bug-qt3-CVE-2007-0242.diff
+Patch302: qt-3.3.6-bz#292941-CVE-2007-4137.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -299,7 +299,6 @@
 %patch104 -p0 -b .qt-font-default-subst
 %patch105 -p0 -b .0073-xinerama-aware-qpopup
 %patch106 -p0 -b .0076-fix-qprocess
-%patch107 -p0 -b .0077-utf8-decoder-fixes
 
 %patch200 -p1 -b .fullscreen
 %patch201 -p1 -b .bz#243722-mysql
@@ -307,6 +306,7 @@
 # security patches
 %patch300 -p1 -b .CVE-2007-3388
 %patch301 -p0 -b .CVE-2007-0242
+%patch302 -p0 -b .CVE-2007-4137
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -577,6 +577,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 3.3.8-8
+- CVE-2007-4137
+
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7.fc7.1
 - CVE-2007-0242
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:09:42 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:09:42 -0400
Subject: rpms/freeradius/F-7 freeradius-1.1.7-lsb.patch, 1.1,
	1.2 freeradius.spec, 1.44, 1.45
Message-ID: <200709171509.l8HF9gV4007968@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- fixed initscript problem (rhbz#292521)



freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeradius-1.1.7-lsb.patch	28 Aug 2007 15:19:00 -0000	1.1
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:09:39 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-08-28 15:21:59.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -40,7 +40,7 @@
  	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
  	;;
    stop)
-+	[ $running -ne 0 ] || exit 0
++	[ $running -eq 0 ] || exit 0
  	echo -n $"Stopping RADIUS server: "
  	killproc $RADIUSD
  	RETVAL=$?
@@ -48,7 +48,7 @@
  	RETVAL=$?
          ;;
    reload)
-+	[ $running -ne 0 ] && exit 7
++	[ $running -eq 0 ] || exit 7
  	echo -n $"Reloading RADIUS server: "
  	killproc $RADIUSD -HUP
  	RETVAL=$?
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ ! -f $LOCKF ] && exit 7
++	[ $running -eq 0 ] || exit 7
 +	$0 stop
 +	sleep 3
 +	$0 start


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- freeradius.spec	28 Aug 2007 15:19:00 -0000	1.44
+++ freeradius.spec	17 Sep 2007 15:09:39 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
+- fixed initscript problem (rhbz#292521)
+
 * Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-2
 - fixed initscript for LSB (rhbz#243671, rhbz#243928)
 - fixed license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 15:10:49 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:10:49 -0400
Subject: rpms/freeradius/devel freeradius-1.1.7-lsb.patch, 1.1,
	1.2 freeradius.spec, 1.46, 1.47
Message-ID: <200709171510.l8HFAnQ6008109@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- fixed initscript problem (rhbz#292521)



freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeradius-1.1.7-lsb.patch	28 Aug 2007 14:18:45 -0000	1.1
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:10:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-08-28 15:21:59.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -40,7 +40,7 @@
  	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
  	;;
    stop)
-+	[ $running -ne 0 ] || exit 0
++	[ $running -eq 0 ] || exit 0
  	echo -n $"Stopping RADIUS server: "
  	killproc $RADIUSD
  	RETVAL=$?
@@ -48,7 +48,7 @@
  	RETVAL=$?
          ;;
    reload)
-+	[ $running -ne 0 ] && exit 7
++	[ $running -eq 0 ] || exit 7
  	echo -n $"Reloading RADIUS server: "
  	killproc $RADIUSD -HUP
  	RETVAL=$?
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ ! -f $LOCKF ] && exit 7
++	[ $running -eq 0 ] || exit 7
 +	$0 stop
 +	sleep 3
 +	$0 start


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- freeradius.spec	28 Aug 2007 14:19:19 -0000	1.46
+++ freeradius.spec	17 Sep 2007 15:10:47 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
+- fixed initscript problem (rhbz#292521)
+
 * Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-2
 - fixed initscript for LSB (rhbz#243671, rhbz#243928)
 - fixed license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 15:13:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:13:04 -0400
Subject: rpms/qt/F-7 qt-3.3.6-bz#292941-CVE-2007-4137.patch, NONE,
	1.1 qt.spec, 1.141, 1.142
Message-ID: <200709171513.l8HFD4Q1008319@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8272

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-bz#292941-CVE-2007-4137.patch 
Log Message:
CVE-2007-4137


qt-3.3.6-bz#292941-CVE-2007-4137.patch:

--- NEW FILE qt-3.3.6-bz#292941-CVE-2007-4137.patch ---
--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -165,7 +165,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	result.setLength( len ); // worst case
+	result.setLength( len + 1 ); // worst case
 	QChar *qch = (QChar *)result.unicode();
 	uchar ch;
         int error = -1;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-7/qt.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- qt.spec	29 Aug 2007 17:39:02 -0000	1.141
+++ qt.spec	17 Sep 2007 15:12:32 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 6%{?dist}.1
+Release: 7%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -65,6 +65,7 @@
 # security patces
 Patch300: qt3-CVE-2007-3388.patch
 Patch301: utf8-bug-qt3-CVE-2007-0242.diff
+Patch302: qt-3.3.6-bz#292941-CVE-2007-4137.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -305,6 +306,7 @@
 # security patches
 %patch300 -p1 -b .CVE-2007-3388
 %patch301 -p0 -b .CVE-2007-0242
+%patch302 -p0 -b .CVE-2007-4137
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -576,6 +578,9 @@
 
 
 %changelog
+* Mo Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
+- CVE-2007-4137
+
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-6.fc7.1
 - cleanup security patch
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:14:26 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:14:26 -0400
Subject: rpms/qt/F-7 qt.spec,1.142,1.143
Message-ID: <200709171514.l8HFEQ3v008434@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8408

Modified Files:
	qt.spec 
Log Message:
bz292941, CVE-2007-4137



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-7/qt.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- qt.spec	17 Sep 2007 15:12:32 -0000	1.142
+++ qt.spec	17 Sep 2007 15:13:54 -0000	1.143
@@ -578,8 +578,8 @@
 
 
 %changelog
-* Mo Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
-- CVE-2007-4137
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
+- bz292941, CVE-2007-4137
 
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-6.fc7.1
 - cleanup security patch



From fedora-extras-commits at redhat.com  Mon Sep 17 15:27:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:27:14 -0400
Subject: rpms/atk/devel .cvsignore, 1.32, 1.33 atk.spec, 1.52, 1.53 sources, 
	1.32, 1.33
Message-ID: <200709171527.l8HFREhB008864@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/atk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8777

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jul 2007 18:19:28 -0000	1.32
+++ .cvsignore	17 Sep 2007 15:26:41 -0000	1.33
@@ -1 +1 @@
-atk-1.19.6.tar.bz2
+atk-1.20.0.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/atk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- atk.spec	15 Aug 2007 23:20:52 -0000	1.52
+++ atk.spec	17 Sep 2007 15:26:41 -0000	1.53
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.19.6
-Release: 3%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.19/atk-%{version}.tar.bz2 
+Source: http://download.gnome.org/sources/atk/1.20/atk-%{version}.tar.bz2 
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +72,9 @@
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 1.19.6-3
 - Small fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 18:19:28 -0000	1.32
+++ sources	17 Sep 2007 15:26:41 -0000	1.33
@@ -1 +1 @@
-198c96bbe5fc2d66832f4e25d3f6a678  atk-1.19.6.tar.bz2
+b1a9e28d9f54ea306bd85a4c84b25fb8  atk-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:28:28 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:28:28 -0400
Subject: rpms/freeradius/F-7 freeradius-1.1.7-lsb.patch, 1.2,
	1.3 freeradius.spec, 1.45, 1.46
Message-ID: <200709171528.l8HFSSa4008971@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8942

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- made init script fully lsb conform


freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeradius-1.1.7-lsb.patch	17 Sep 2007 15:09:39 -0000	1.2
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:28:25 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:20:07.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ $running -eq 0 ] || exit 7
++	[ $running -eq 0 ] || exit 0
 +	$0 stop
 +	sleep 3
 +	$0 start
@@ -78,7 +78,7 @@
    *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 -	exit 1
-+	RETVAL=3
++	RETVAL=2
  esac
  
  exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- freeradius.spec	17 Sep 2007 15:09:39 -0000	1.45
+++ freeradius.spec	17 Sep 2007 15:28:25 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3.1
+- made init script fully lsb conform
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
 - fixed initscript problem (rhbz#292521)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:29:09 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:29:09 -0400
Subject: rpms/freeradius/devel freeradius-1.1.7-lsb.patch, 1.2,
	1.3 freeradius.spec, 1.47, 1.48
Message-ID: <200709171529.l8HFT9AS009057@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9034

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- made init script fully lsb conform


freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeradius-1.1.7-lsb.patch	17 Sep 2007 15:10:47 -0000	1.2
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:29:06 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:20:07.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ $running -eq 0 ] || exit 7
++	[ $running -eq 0 ] || exit 0
 +	$0 stop
 +	sleep 3
 +	$0 start
@@ -78,7 +78,7 @@
    *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 -	exit 1
-+	RETVAL=3
++	RETVAL=2
  esac
  
  exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- freeradius.spec	17 Sep 2007 15:10:47 -0000	1.47
+++ freeradius.spec	17 Sep 2007 15:29:06 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3.1
+- made init script fully lsb conform
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
 - fixed initscript problem (rhbz#292521)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:30:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:30:25 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.40, 1.41 at-spi.spec, 1.75,
	1.76 sources, 1.40, 1.41
Message-ID: <200709171530.l8HFUPXe009142@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9103

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	10 Jul 2007 15:33:55 -0000	1.40
+++ .cvsignore	17 Sep 2007 15:29:52 -0000	1.41
@@ -1 +1 @@
-at-spi-1.19.5.tar.bz2
+at-spi-1.20.0.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- at-spi.spec	6 Aug 2007 04:23:34 -0000	1.75
+++ at-spi.spec	17 Sep 2007 15:29:52 -0000	1.76
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.20/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> - 1.19.5-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	10 Jul 2007 15:33:55 -0000	1.40
+++ sources	17 Sep 2007 15:29:52 -0000	1.41
@@ -1 +1 @@
-d54afafc22c5e40508c85978e824d366  at-spi-1.19.5.tar.bz2
+fd1f916463f379b435399e2b2075742f  at-spi-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:34:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:34:05 -0400
Subject: rpms/gail/devel .cvsignore, 1.32, 1.33 gail.spec, 1.64, 1.65 sources,
	1.32, 1.33
Message-ID: <200709171534.l8HFY5GD009217@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jul 2007 18:22:38 -0000	1.32
+++ .cvsignore	17 Sep 2007 15:33:32 -0000	1.33
@@ -1 +1 @@
-gail-1.19.6.tar.bz2
+gail-1.20.0.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/gail.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gail.spec	29 Aug 2007 04:57:06 -0000	1.64
+++ gail.spec	17 Sep 2007 15:33:32 -0000	1.65
@@ -4,10 +4,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.19.6
-Release: 3%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
-Source0: http://download.gnome.org/sources/gail/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gail/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.19.6-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 18:22:38 -0000	1.32
+++ sources	17 Sep 2007 15:33:32 -0000	1.33
@@ -1 +1 @@
-5ba765ceb192c0903742043c48677483  gail-1.19.6.tar.bz2
+697f83db831816946bb8944b8d34ec17  gail-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:38:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:38:56 -0400
Subject: rpms/libgail-gnome/devel .cvsignore, 1.8, 1.9 libgail-gnome.spec,
	1.26, 1.27 sources, 1.8, 1.9
Message-ID: <200709171538.l8HFcu6S009400@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgail-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9378

Modified Files:
	.cvsignore libgail-gnome.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jul 2007 15:39:11 -0000	1.8
+++ .cvsignore	17 Sep 2007 15:38:23 -0000	1.9
@@ -1 +1 @@
-libgail-gnome-1.19.5.tar.bz2
+libgail-gnome-1.20.0.tar.bz2


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libgail-gnome.spec	29 Aug 2007 04:58:39 -0000	1.26
+++ libgail-gnome.spec	17 Sep 2007 15:38:23 -0000	1.27
@@ -6,10 +6,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
-Source0: http://download.gnome.org/source/libgail-gnome/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/source/libgail-gnome/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.19.5-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jul 2007 15:39:11 -0000	1.8
+++ sources	17 Sep 2007 15:38:23 -0000	1.9
@@ -1 +1 @@
-30cdcc9b9c43cc9d5e22caffae045e41  libgail-gnome-1.19.5.tar.bz2
+5a7662e3d637c86baa95a50adb225e56  libgail-gnome-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:42:30 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 11:42:30 -0400
Subject: fedora-security/audit fc6,1.259,1.260 fc7,1.107,1.108
Message-ID: <200709171542.l8HFgUvp009592@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9548/audit

Modified Files:
	fc6 fc7 
Log Message:
OOo tiff heap overflow is public now



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- fc6	17 Sep 2007 15:03:16 -0000	1.259
+++ fc6	17 Sep 2007 15:42:28 -0000	1.260
@@ -91,6 +91,7 @@
 CVE-2007-2869 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2868 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2867 version (mozilla) #241840 [since FEDORA-2007-549]
+CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293371
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-538]
 CVE-2007-2797 version (xterm)
 CVE-2007-2453 version (kernel) [since FEDORA-2007-600]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc7	17 Sep 2007 15:03:16 -0000	1.107
+++ fc7	17 Sep 2007 15:42:28 -0000	1.108
@@ -187,6 +187,7 @@
 CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
 CVE-2007-2844 ignore (php) #241641
 CVE-2007-2843 ignore (konqueror) safari specific
+CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293361
 CVE-2007-2821 version (wordpress, fixed 2.2) #245211 [since FEDORA-2007-0894]
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-0836]
 CVE-2007-2798 version (krb5, 1.6.1) [since FEDORA-2007-0740]



From fedora-extras-commits at redhat.com  Mon Sep 17 15:42:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:42:32 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.62, 1.63 gnome-utils.spec,
	1.154, 1.155 sources, 1.66, 1.67
Message-ID: <200709171542.l8HFgWYg009597@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9546

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	6 Sep 2007 18:55:24 -0000	1.62
+++ .cvsignore	17 Sep 2007 15:41:59 -0000	1.63
@@ -1 +1 @@
-gnome-utils-2.19.92.tar.bz2
+gnome-utils-2.20.0.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-utils.spec	6 Sep 2007 19:24:00 -0000	1.154
+++ gnome-utils.spec	17 Sep 2007 15:41:59 -0000	1.155
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.92
+Version:        2.20.0
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -17,7 +17,7 @@
 Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-utils/2.18/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.20/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	6 Sep 2007 18:55:24 -0000	1.66
+++ sources	17 Sep 2007 15:41:59 -0000	1.67
@@ -1 +1 @@
-87d0ebb61b53f5a5011cb4b380e1cf86  gnome-utils-2.19.92.tar.bz2
+f58f05a1eac5b04d2ebd66fcc2606251  gnome-utils-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:44:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:44:54 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.6, 1.7 gtksourceview2.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200709171544.l8HFisfw009710@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9675

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 16:47:32 -0000	1.6
+++ .cvsignore	17 Sep 2007 15:44:22 -0000	1.7
@@ -1 +1 @@
-gtksourceview-1.90.5.tar.bz2
+gtksourceview-2.0.0.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtksourceview2.spec	11 Sep 2007 16:47:32 -0000	1.8
+++ gtksourceview2.spec	17 Sep 2007 15:44:22 -0000	1.9
@@ -5,13 +5,13 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.5
+Version: 2.0.0
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
-Source0: http://download.gnome.org/sources/gtksourceview/1.90/gtksourceview-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtksourceview/2.0/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
 - Update to 1.90.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 16:47:32 -0000	1.6
+++ sources	17 Sep 2007 15:44:22 -0000	1.7
@@ -1 +1 @@
-4d439022469b25f8c944751bcf787db3  gtksourceview-1.90.5.tar.bz2
+f1d0cce82401801feb477bf30daab07e  gtksourceview-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:46:37 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:46:37 -0400
Subject: rpms/iptables/devel iptables.init, 1.13, 1.14 iptables.spec, 1.50,
	1.51
Message-ID: <200709171546.l8HFkbVc009846@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9775

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not use lock file for condrestart test



Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iptables.init	23 Aug 2007 14:54:50 -0000	1.13
+++ iptables.init	17 Sep 2007 15:46:05 -0000	1.14
@@ -316,7 +316,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- iptables.spec	23 Aug 2007 15:33:24 -0000	1.50
+++ iptables.spec	17 Sep 2007 15:46:05 -0000	1.51
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
+- do not use lock file for condrestart test
+
 * Thu Aug 23 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2
 - fixed initscript for LSB conformance (rhbz#246953, rhbz#242459)
 - provide iptc interface again, but unsupported (rhbz#216733)



From fedora-extras-commits at redhat.com  Mon Sep 17 15:48:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:48:06 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.35, 1.36 sound-juicer.spec,
	1.80, 1.81 sources, 1.37, 1.38
Message-ID: <200709171548.l8HFm6qW010003@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9920

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Aug 2007 19:00:26 -0000	1.35
+++ .cvsignore	17 Sep 2007 15:47:33 -0000	1.36
@@ -1 +1 @@
-sound-juicer-2.19.3.tar.bz2
+sound-juicer-2.20.0.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sound-juicer.spec	25 Aug 2007 13:42:23 -0000	1.80
+++ sound-juicer.spec	17 Sep 2007 15:47:33 -0000	1.81
@@ -12,11 +12,11 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.19.3
-Release:	3%{?dist}
+Version:	2.20.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.19/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	cdparanoia
@@ -117,6 +117,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.3-3
 - Remove work-around for gst-inspect crashing
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	13 Aug 2007 19:00:26 -0000	1.37
+++ sources	17 Sep 2007 15:47:33 -0000	1.38
@@ -1 +1 @@
-fc710ae4a4989755a23a75a10612b421  sound-juicer-2.19.3.tar.bz2
+906079dba98770f5185fd43359c9459d  sound-juicer-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:49:37 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:49:37 -0400
Subject: rpms/sendmail/devel sendmail.init, 1.17, 1.18 sendmail.spec, 1.87,
	1.88
Message-ID: <200709171549.l8HFnbUo010098@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10065

Modified Files:
	sendmail.init sendmail.spec 
Log Message:
- made init script fully lsb conform




Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sendmail.init	29 Aug 2007 14:54:57 -0000	1.17
+++ sendmail.init	17 Sep 2007 15:49:05 -0000	1.18
@@ -137,12 +137,12 @@
 	RETVAL=$?
 	;;
     stop)
-	[ $running -ne 0 ] || exit 0
+	[ $running -eq 0 ] || exit 0
 	stop
 	RETVAL=$?
 	;;
     reload)
-	[ $running -ne 0 ] && exit 7
+	[ $running -eq 0 ] || exit 7
 	reload
 	RETVAL=$?
 	;;
@@ -152,7 +152,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -f /var/lock/subsys/sendmail ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	stop
 	start
 	RETVAL=$?
@@ -165,7 +165,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	RETVAL=3
+	RETVAL=2
 esac
 
 exit $RETVAL


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sendmail.spec	29 Aug 2007 14:54:57 -0000	1.87
+++ sendmail.spec	17 Sep 2007 15:49:05 -0000	1.88
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -539,6 +539,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.2
+- made init script fully lsb conform
+
 * Wed Aug 29 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.1
 - fixed condrestart in init script to use exit instead of return
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:50:38 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:50:38 -0400
Subject: rpms/libgnomekbd/devel .cvsignore, 1.9, 1.10 libgnomekbd.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <200709171550.l8HFocLH010184@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2007 03:21:08 -0000	1.9
+++ .cvsignore	17 Sep 2007 15:50:04 -0000	1.10
@@ -1 +1 @@
-libgnomekbd-2.19.91.tar.bz2
+libgnomekbd-2.20.0.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libgnomekbd.spec	4 Sep 2007 03:21:08 -0000	1.25
+++ libgnomekbd.spec	17 Sep 2007 15:50:04 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           libgnomekbd
-Version:       	2.19.91
+Version:       	2.20.0
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
-Source0:        http://download.gnome.org/sources/libgnomekbd/2.18/libgnomekbd-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgnomekbd/2.20/libgnomekbd-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=365590
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2007 03:21:08 -0000	1.9
+++ sources	17 Sep 2007 15:50:04 -0000	1.10
@@ -1 +1 @@
-9ca7372fba612b99d1e085e648e6c232  libgnomekbd-2.19.91.tar.bz2
+0b495d355e25c3531419cb3996be7e28  libgnomekbd-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:52:17 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:52:17 -0400
Subject: rpms/sendmail/F-7 sendmail.init,1.16,1.17 sendmail.spec,1.82,1.83
Message-ID: <200709171552.l8HFqHtf010315@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/sendmail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226

Modified Files:
	sendmail.init sendmail.spec 
Log Message:
- made init script fully lsb conform




Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-7/sendmail.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sendmail.init	29 Aug 2007 16:13:04 -0000	1.16
+++ sendmail.init	17 Sep 2007 15:51:45 -0000	1.17
@@ -137,12 +137,12 @@
 	RETVAL=$?
 	;;
     stop)
-	[ $running -ne 0 ] || exit 0
+	[ $running -eq 0 ] || exit 0
 	stop
 	RETVAL=$?
 	;;
     reload)
-	[ $running -ne 0 ] && exit 7
+	[ $running -eq 0 ] || exit 7
 	reload
 	RETVAL=$?
 	;;
@@ -152,7 +152,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -f /var/lock/subsys/sendmail ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	stop
 	start
 	RETVAL=$?
@@ -165,7 +165,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	RETVAL=3
+	RETVAL=2
 esac
 
 exit $RETVAL


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-7/sendmail.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sendmail.spec	29 Aug 2007 16:13:04 -0000	1.82
+++ sendmail.spec	17 Sep 2007 15:51:45 -0000	1.83
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -537,6 +537,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.2
+- made init script fully lsb conform
+
 * Wed Aug 29 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.1
 - fixed condrestart in init script to use exit instead of return
 - dropped glibc-2.6.90+ patch for F-7



From fedora-extras-commits at redhat.com  Mon Sep 17 15:52:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:52:31 -0400
Subject: rpms/vino/devel .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 vino.spec,
	1.56, 1.57
Message-ID: <200709171552.l8HFqVWM010366@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10293

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Sep 2007 14:13:05 -0000	1.25
+++ .cvsignore	17 Sep 2007 15:51:58 -0000	1.26
@@ -1 +1 @@
-vino-2.19.92.tar.bz2
+vino-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Sep 2007 14:13:05 -0000	1.25
+++ sources	17 Sep 2007 15:51:58 -0000	1.26
@@ -1 +1 @@
-6589eb5b2f9e5e3f2dfd516ff48158a8  vino-2.19.92.tar.bz2
+e9560ff2e135a5eec645593fc6c22150  vino-2.20.0.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vino.spec	4 Sep 2007 14:13:05 -0000	1.56
+++ vino.spec	17 Sep 2007 15:51:58 -0000	1.57
@@ -8,10 +8,10 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/vino/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/vino/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:55:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:55:29 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.6, 1.7 pygtksourceview.spec,
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200709171555.l8HFtTXY010614@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10588

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 16:49:18 -0000	1.6
+++ .cvsignore	17 Sep 2007 15:54:57 -0000	1.7
@@ -1 +1 @@
-pygtksourceview-1.90.5.tar.bz2
+pygtksourceview-2.0.0.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygtksourceview.spec	11 Sep 2007 16:49:18 -0000	1.10
+++ pygtksourceview.spec	17 Sep 2007 15:54:57 -0000	1.11
@@ -5,14 +5,14 @@
 %define gtksourceview_version 1.90.5
 
 Name:           pygtksourceview
-Version:        1.90.5
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
 Group:          Development/Languages
 License:        LGPL 
 URL:            http://download.gnome.org/sources/pygtksourceview/
-Source0:        http://download.gnome.org/sources/pygtksourceview/1.90/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.0/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
 - Update to 1.90.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 16:49:18 -0000	1.6
+++ sources	17 Sep 2007 15:54:57 -0000	1.7
@@ -1 +1 @@
-e26be6d014b5f091af5c4250bb63c2ff  pygtksourceview-1.90.5.tar.bz2
+a4947108e7a669b67ff0ff157a132728  pygtksourceview-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:02:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:02:23 -0400
Subject: rpms/libIDL/devel .cvsignore, 1.10, 1.11 libIDL.spec, 1.28,
	1.29 sources, 1.10, 1.11
Message-ID: <200709171602.l8HG2N0j016728@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libIDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16687

Modified Files:
	.cvsignore libIDL.spec sources 
Log Message:
0.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Feb 2007 23:00:09 -0000	1.10
+++ .cvsignore	17 Sep 2007 16:01:50 -0000	1.11
@@ -1 +1 @@
-libIDL-0.8.8.tar.bz2
+libIDL-0.8.9.tar.bz2


Index: libIDL.spec
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libIDL.spec	8 Aug 2007 04:37:27 -0000	1.28
+++ libIDL.spec	17 Sep 2007 16:01:50 -0000	1.29
@@ -1,8 +1,8 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
-Version: 0.8.8
-Release: 2%{?dist}
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
+Version: 0.8.9
+Release: 1%{?dist}
+Source: ftp://download.gnome.org/sources/libIDL/0.8/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -75,6 +75,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.9-1
+- Update to 0.8.9
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.8-2
 - Update the license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2007 23:00:09 -0000	1.10
+++ sources	17 Sep 2007 16:01:50 -0000	1.11
@@ -1 +1 @@
-187c17f42533d76da435e90afb7b48cf  libIDL-0.8.8.tar.bz2
+a4f84903e289bb874ae2fbe92d80e656  libIDL-0.8.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:04:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:04:20 -0400
Subject: rpms/ORBit2/devel .cvsignore, 1.23, 1.24 ORBit2.spec, 1.58,
	1.59 sources, 1.23, 1.24
Message-ID: <200709171604.l8HG4Kwa016838@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ORBit2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16779

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.14.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Feb 2007 17:09:24 -0000	1.23
+++ .cvsignore	17 Sep 2007 16:03:47 -0000	1.24
@@ -1 +1 @@
-ORBit2-2.14.7.tar.bz2
+ORBit2-2.14.9.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ORBit2.spec	29 Aug 2007 05:00:13 -0000	1.58
+++ ORBit2.spec	17 Sep 2007 16:03:47 -0000	1.59
@@ -3,8 +3,8 @@
 
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
-Version: 2.14.7
-Release: 6%{?dist}
+Version: 2.14.9
+Release: 1%{?dist}
 Source: http://download.gnome.org/sources/ORBit/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPLv2 and GPLv2
@@ -137,6 +137,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.9-1
+- Update to 2.14.9
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.14.7-6
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Feb 2007 17:09:24 -0000	1.23
+++ sources	17 Sep 2007 16:03:47 -0000	1.24
@@ -1 +1 @@
-3440c44aaef14dd96e4ccd7ce22a7e6e  ORBit2-2.14.7.tar.bz2
+c7e7080ef27aca22f26ac21fcb5613a5  ORBit2-2.14.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:10:59 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 17 Sep 2007 12:10:59 -0400
Subject: rpms/cups/devel cups-lspp.patch, 1.25, 1.26 cups.spec, 1.355,
	1.356 sources, 1.36, 1.37
Message-ID: <200709171610.l8HGAx5x017129@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087

Modified Files:
	cups-lspp.patch cups.spec sources 
Log Message:
* Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
- 1.3.1.


cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cups-lspp.patch	31 Jul 2007 12:28:40 -0000	1.25
+++ cups-lspp.patch	17 Sep 2007 16:10:57 -0000	1.26
@@ -1,5 +1,177 @@
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/config-scripts/cups-lspp.m4	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/filter/common.c.lspp cups-1.3.1/filter/common.c
+--- cups-1.3.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.1/filter/common.c	2007-09-17 16:48:23.000000000 +0100
+@@ -30,6 +30,12 @@
+  * Include necessary headers...
+  */
+ 
++#include "config.h"
++#ifdef WITH_LSPP
++#define _GNU_SOURCE
++#include <string.h>
++#endif /* WITH_LSPP */
++
+ #include "common.h"
+ #include <locale.h>
+ 
+@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label,	/* I
+ {
+   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 */
+ 
+ 
+  /*
+@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label,	/* I
+     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...
+   */
+@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label,	/* I
+   printf("  %.0f moveto ESPpl show\n", top - 14.0);
+   puts("pop");
+   puts("}bind put");
++  }
++#ifdef WITH_LSPP
+ }
++#endif /* WITH_LSPP */
+ 
+ 
+ /*
+diff -up /dev/null cups-1.3.1/config-scripts/cups-lspp.m4
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/config-scripts/cups-lspp.m4	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -37,33 +209,9 @@
 +            ;;
 +    esac
 +fi
---- cups-1.3rc2/cups/cups.h.lspp	2007-07-13 02:13:26.000000000 +0100
-+++ cups-1.3rc2/cups/cups.h	2007-07-31 12:28:32.000000000 +0100
-@@ -15,6 +15,9 @@
-  *   This file is subject to the Apple OS-Developed Software exception.
-  */
- 
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
- #ifndef _CUPS_CUPS_H_
- #  define _CUPS_CUPS_H_
- 
-@@ -66,6 +69,12 @@
- #  define CUPS_DATE_ANY		-1
- 
- 
-+# ifdef WITH_LSPP
-+# define MLS_CONFIG "mls"
-+# define TE_CONFIG "te"
-+# define SELINUX_CONFIG "SELinux"
-+# define UNKNOWN_SL "UNKNOWN SL"
-+# endif /* WITH_LSPP */
- /*
-  * Types and structures...
-  */
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/mls	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/mls
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/mls	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -326,8 +474,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/selinux	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/selinux
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/selinux	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -590,9 +739,10 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- cups-1.3rc2/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/data/Makefile	2007-07-31 12:28:32.000000000 +0100
-@@ -25,7 +25,10 @@
+diff -up cups-1.3.1/data/Makefile.lspp cups-1.3.1/data/Makefile
+--- cups-1.3.1/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.1/data/Makefile	2007-09-17 16:48:23.000000000 +0100
+@@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
  		topsecret \
@@ -604,8 +754,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/te	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/te
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/te	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -868,178 +1019,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- cups-1.3rc2/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/filter/common.c	2007-07-31 12:28:32.000000000 +0100
-@@ -30,6 +30,12 @@
-  * Include necessary headers...
-  */
- 
-+#include "config.h"
-+#ifdef WITH_LSPP
-+#define _GNU_SOURCE
-+#include <string.h>
-+#endif /* WITH_LSPP */
-+
- #include "common.h"
- #include <locale.h>
- 
-@@ -312,6 +318,18 @@
- {
-   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 */
- 
- 
-  /*
-@@ -334,6 +352,124 @@
-     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...
-   */
-@@ -414,7 +550,10 @@
-   printf("  %.0f moveto ESPpl show\n", top - 14.0);
-   puts("pop");
-   puts("}bind put");
-+  }
-+#ifdef WITH_LSPP
- }
-+#endif /* WITH_LSPP */
- 
- 
- /*
---- cups-1.3rc2/scheduler/client.h.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/scheduler/client.h	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/client.h.lspp cups-1.3.1/scheduler/client.h
+--- cups-1.3.1/scheduler/client.h.lspp	2007-09-12 22:09:49.000000000 +0100
++++ cups-1.3.1/scheduler/client.h	2007-09-17 16:48:23.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1054,7 +1036,7 @@
  /*
   * HTTP client structure...
   */
-@@ -62,6 +69,10 @@
+@@ -61,6 +68,10 @@ struct cupsd_client_s
  #ifdef HAVE_AUTHORIZATION_H
    AuthorizationRef	authref;	/* Authorization ref */
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1065,7 +1047,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -127,6 +138,9 @@
+@@ -128,6 +139,9 @@ extern void	cupsdStartListening(void);
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1075,8 +1057,9 @@
  
  
  /*
---- cups-1.3rc2/scheduler/conf.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/conf.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/conf.c.lspp cups-1.3.1/scheduler/conf.c
+--- cups-1.3.1/scheduler/conf.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/conf.c	2007-09-17 16:50:08.000000000 +0100
 @@ -26,6 +26,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1095,9 +1078,9 @@
  
  /*
   * Configuration variable structure...
-@@ -158,6 +162,10 @@
+@@ -160,6 +164,10 @@ static cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
-   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
+   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 +#ifdef WITH_LSPP
 +  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
@@ -1105,18 +1088,18 @@
 +#endif /* WITH_LSPP */
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
-   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_STRING },
-@@ -348,6 +356,9 @@
- 		*old_requestroot;	/* Old RequestRoot */
+   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
+@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
+   cupsd_policy_t *p;			/* Policy */
 +#ifdef WITH_LSPP
 +  char		*audit_message;		/* Audit message string */
 +#endif /* WITH_LSPP */
  
  
   /*
-@@ -609,6 +620,25 @@
+@@ -616,6 +627,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1142,7 +1125,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -883,11 +913,23 @@
+@@ -890,11 +920,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1167,7 +1150,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3343,6 +3385,18 @@
+@@ -3393,6 +3435,18 @@ read_policy(cups_file_t *fp,		/* I - Con
    return (0);
  }
  
@@ -1186,8 +1169,9 @@
  
  /*
   * End of "$Id$".
---- cups-1.3rc2/scheduler/client.c.lspp	2007-07-26 20:08:40.000000000 +0100
-+++ cups-1.3rc2/scheduler/client.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/client.c.lspp cups-1.3.1/scheduler/client.c
+--- cups-1.3.1/scheduler/client.c.lspp	2007-08-15 19:36:14.000000000 +0100
++++ cups-1.3.1/scheduler/client.c	2007-09-17 16:48:23.000000000 +0100
 @@ -39,12 +39,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1203,7 +1187,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@
+@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1216,7 +1200,7 @@
  
  /*
   * Local functions...
-@@ -335,6 +343,57 @@
+@@ -339,6 +347,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1274,7 +1258,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -717,6 +776,13 @@
+@@ -721,6 +780,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 */
@@ -1288,7 +1272,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -1989,6 +2055,67 @@
+@@ -1993,6 +2059,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);
@@ -1356,7 +1340,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4157,6 +4284,50 @@
+@@ -4197,6 +4324,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1407,8 +1391,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
---- cups-1.3rc2/scheduler/main.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/main.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/main.c.lspp cups-1.3.1/scheduler/main.c
+--- cups-1.3.1/scheduler/main.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/main.c	2007-09-17 16:48:23.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -1428,7 +1413,7 @@
  
  /*
   * Local functions...
-@@ -150,6 +155,9 @@
+@@ -150,6 +155,9 @@ main(int  argc,				/* I - Number of comm
    int			launchd_idle_exit;
  					/* Idle exit on select timeout? */
  #endif	/* HAVE_LAUNCHD */
@@ -1437,8 +1422,8 @@
 +#endif /* WITH_LSPP */
  
  
-  /*
-@@ -368,6 +376,25 @@
+ #ifdef HAVE_GETEUID
+@@ -385,6 +393,25 @@ main(int  argc,				/* I - Number of comm
  #endif /* DEBUG */
    }
  
@@ -1464,7 +1449,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1019,6 +1046,11 @@
+@@ -1094,6 +1121,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -1476,9 +1461,10 @@
    return (!stop_scheduler);
  }
  
---- cups-1.3rc2/scheduler/conf.h.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/conf.h	2007-07-31 12:28:32.000000000 +0100
-@@ -190,6 +190,12 @@
+diff -up cups-1.3.1/scheduler/conf.h.lspp cups-1.3.1/scheduler/conf.h
+--- cups-1.3.1/scheduler/conf.h.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/conf.h	2007-09-17 16:48:23.000000000 +0100
+@@ -190,6 +190,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1491,7 +1477,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -208,6 +214,9 @@
+@@ -208,6 +214,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1501,8 +1487,9 @@
  
  /*
   * Prototypes...
---- cups-1.3rc2/scheduler/ipp.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/ipp.c	2007-07-31 12:29:34.000000000 +0100
+diff -up cups-1.3.1/scheduler/ipp.c.lspp cups-1.3.1/scheduler/ipp.c
+--- cups-1.3.1/scheduler/ipp.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/ipp.c	2007-09-17 16:48:23.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1511,7 +1498,7 @@
   *   check_quotas()              - Check quotas for a printer and user.
   *   copy_attribute()            - Copy a single attribute.
   *   copy_attrs()                - Copy attributes from one request to another.
-@@ -93,6 +94,9 @@
+@@ -94,6 +95,9 @@
   *   validate_user()             - Validate the user for the request.
   */
  
@@ -1521,7 +1508,7 @@
  /*
   * Include necessary headers...
   */
-@@ -120,6 +124,14 @@
+@@ -117,6 +121,14 @@ extern int mbr_check_membership_by_id(uu
  #  endif /* HAVE_MEMBERSHIPPRIV_H */
  #endif /* __APPLE__ */
  
@@ -1536,7 +1523,7 @@
  
  /*
   * Local functions...
-@@ -144,6 +156,9 @@
+@@ -141,6 +153,9 @@ static void	authenticate_job(cupsd_clien
  static void	cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_subscription(cupsd_client_t *con, int id);
@@ -1546,7 +1533,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);
-@@ -1235,6 +1250,21 @@
+@@ -1237,6 +1252,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1568,7 +1555,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1421,6 +1451,104 @@
+@@ -1423,6 +1453,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1673,7 +1660,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1429,6 +1557,32 @@
+@@ -1431,6 +1559,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -1706,7 +1693,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1645,6 +1799,29 @@
+@@ -1647,6 +1801,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]);
      }
@@ -1736,7 +1723,7 @@
  
      job->job_sheets = attr;
  
-@@ -1675,6 +1852,9 @@
+@@ -1677,6 +1854,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1746,7 +1733,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1693,6 +1873,9 @@
+@@ -1695,6 +1875,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);
@@ -1756,7 +1743,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1713,6 +1896,9 @@
+@@ -1715,6 +1898,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);
@@ -1766,7 +1753,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1753,9 +1939,52 @@
+@@ -1755,9 +1941,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1819,7 +1806,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3317,6 +3546,103 @@
+@@ -3333,6 +3562,103 @@ cancel_subscription(
  }
  
  
@@ -1923,7 +1910,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -3845,6 +4171,15 @@
+@@ -3861,6 +4187,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -1939,7 +1926,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
-@@ -3879,6 +4214,81 @@
+@@ -3895,6 +4230,81 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2021,7 +2008,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -3973,6 +4383,24 @@
+@@ -3989,6 +4399,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2046,7 +2033,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5694,6 +6122,22 @@
+@@ -5858,6 +6286,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2069,7 +2056,7 @@
   /*
    * Copy attributes...
    */
-@@ -5893,6 +6337,11 @@
+@@ -6057,6 +6501,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2081,7 +2068,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -9881,6 +10330,11 @@
+@@ -10080,6 +10529,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2093,8 +2080,9 @@
   /*
    * Check the username against the owner...
    */
---- cups-1.3rc2/scheduler/job.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/job.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/job.c.lspp cups-1.3.1/scheduler/job.c
+--- cups-1.3.1/scheduler/job.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/job.c	2007-09-17 16:48:23.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2120,7 +2108,7 @@
  
  /*
   * Local globals...
-@@ -1063,6 +1074,23 @@
+@@ -1077,6 +1088,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
      return;
    }
  
@@ -2144,7 +2132,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1416,6 +1444,13 @@
+@@ -1430,6 +1458,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2158,7 +2146,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1434,6 +1469,76 @@
+@@ -1448,6 +1483,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2235,7 +2223,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2446,6 +2551,21 @@
+@@ -2456,6 +2561,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 */
@@ -2257,7 +2245,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2697,6 +2817,106 @@
+@@ -2707,6 +2827,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2364,7 +2352,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2837,6 +3057,18 @@
+@@ -2851,6 +3071,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2383,7 +2371,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3053,6 +3285,67 @@
+@@ -3067,6 +3299,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      envp[envc ++] = final_content_type;
    }
  
@@ -2451,8 +2439,9 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
---- cups-1.3rc2/scheduler/printers.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/printers.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/printers.c.lspp cups-1.3.1/scheduler/printers.c
+--- cups-1.3.1/scheduler/printers.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/printers.c	2007-09-17 16:48:23.000000000 +0100
 @@ -50,6 +50,8 @@
   *                                 printing desktop tools.
   */
@@ -2462,7 +2451,7 @@
  /*
   * Include necessary headers...
   */
-@@ -73,6 +75,10 @@
+@@ -73,6 +75,10 @@ static void	write_irix_config(cupsd_prin
  static void	write_irix_state(cupsd_printer_t *p);
  #endif /* __sgi */
  
@@ -2473,7 +2462,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1700,6 +1706,13 @@
+@@ -1709,6 +1715,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
  		{			/* No authentication */
  		  "none"
  		};
@@ -2487,7 +2476,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1843,6 +1856,44 @@
+@@ -1852,6 +1865,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2532,8 +2521,9 @@
    }
  
    p->raw    = 0;
---- cups-1.3rc2/scheduler/job.h.lspp	2007-07-12 23:58:17.000000000 +0100
-+++ cups-1.3rc2/scheduler/job.h	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/job.h.lspp cups-1.3.1/scheduler/job.h
+--- cups-1.3.1/scheduler/job.h.lspp	2007-08-01 20:02:47.000000000 +0100
++++ cups-1.3.1/scheduler/job.h	2007-09-17 16:48:23.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2548,8 +2538,8 @@
  /*
   * Job request structure...
   */
-@@ -59,6 +66,10 @@
- #ifdef HAVE_GSSAPI
+@@ -60,6 +67,10 @@ typedef struct cupsd_job_s
+   krb5_ccache		ccache;		/* Kerberos credential cache */
    char			*ccname;	/* KRB5CCNAME environment variable */
  #endif /* HAVE_GSSAPI */
 +#ifdef WITH_LSPP
@@ -2559,9 +2549,36 @@
  } cupsd_job_t;
  
  
---- cups-1.3rc2/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
-+++ cups-1.3rc2/Makedefs.in	2007-07-31 12:28:32.000000000 +0100
-@@ -134,7 +134,7 @@
+diff -up cups-1.3.1/cups/cups.h.lspp cups-1.3.1/cups/cups.h
+--- cups-1.3.1/cups/cups.h.lspp	2007-08-27 22:13:35.000000000 +0100
++++ cups-1.3.1/cups/cups.h	2007-09-17 16:48:23.000000000 +0100
+@@ -15,6 +15,9 @@
+  *   This file is subject to the Apple OS-Developed Software exception.
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
+ #ifndef _CUPS_CUPS_H_
+ #  define _CUPS_CUPS_H_
+ 
+@@ -66,6 +69,12 @@ extern "C" {
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
++# ifdef WITH_LSPP
++# define MLS_CONFIG "mls"
++# define TE_CONFIG "te"
++# define SELINUX_CONFIG "SELinux"
++# define UNKNOWN_SL "UNKNOWN SL"
++# endif /* WITH_LSPP */
+ /*
+  * Types and structures...
+  */
+diff -up cups-1.3.1/Makedefs.in.lspp cups-1.3.1/Makedefs.in
+--- cups-1.3.1/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
++++ cups-1.3.1/Makedefs.in	2007-09-17 16:48:23.000000000 +0100
+@@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
@@ -2570,9 +2587,10 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
---- cups-1.3rc2/config.h.in.lspp	2007-07-25 01:40:03.000000000 +0100
-+++ cups-1.3rc2/config.h.in	2007-07-31 12:28:32.000000000 +0100
-@@ -537,6 +537,13 @@
+diff -up cups-1.3.1/config.h.in.lspp cups-1.3.1/config.h.in
+--- cups-1.3.1/config.h.in.lspp	2007-09-08 01:28:06.000000000 +0100
++++ cups-1.3.1/config.h.in	2007-09-17 16:48:23.000000000 +0100
+@@ -552,6 +552,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -2586,9 +2604,10 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
---- cups-1.3rc2/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3rc2/configure.in	2007-07-31 12:28:32.000000000 +0100
-@@ -42,6 +42,8 @@
+diff -up cups-1.3.1/configure.in.lspp cups-1.3.1/configure.in
+--- cups-1.3.1/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.1/configure.in	2007-09-17 16:48:23.000000000 +0100
+@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- cups.spec	29 Aug 2007 15:30:15 -0000	1.355
+++ cups.spec	17 Sep 2007 16:10:57 -0000	1.356
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.0
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -172,7 +172,8 @@
 %if %lspp
 	--enable-lspp \
 %endif
-	--with-log-file-perm=0600 --enable-pie --enable-relro
+	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -362,7 +363,7 @@
 /etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %dir %{_docdir}/cups-%{version}
-%{_docdir}/cups-%{version}/favicon.ico
+%{_docdir}/cups-%{version}/favicon.*
 %{_docdir}/cups-%{version}/images
 %{_docdir}/cups-%{version}/de
 %{_docdir}/cups-%{version}/es
@@ -438,6 +439,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
+- 1.3.1.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.0-2
 - More specific license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Aug 2007 22:31:26 -0000	1.36
+++ sources	17 Sep 2007 16:10:57 -0000	1.37
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-ae2855d5d1ab5b5fcbb8a2613cefec14  cups-1.3.0-source.tar.bz2
+89ec473d48598cde9b2030743b15448b  cups-1.3.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:11:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:11:27 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.220,1.221
Message-ID: <200709171611.l8HGBRmW017186@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085

Modified Files:
	gnome-panel.spec 
Log Message:
fix requires



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- gnome-panel.spec	17 Sep 2007 13:53:37 -0000	1.220
+++ gnome-panel.spec	17 Sep 2007 16:10:55 -0000	1.221
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -40,7 +40,11 @@
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
 Requires: fast-user-switch-applet
+
+# Mono isn't available for s390 or ppc64 apparently
+%ifnarch s390 s390x ppc64
 Requires: tomboy
+%endif
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -312,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-7
+- Can't require tomboy where there's no mono
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-6
 - Turns out we need requires for applets in the default config (#293261)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:15:31 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 17 Sep 2007 12:15:31 -0400
Subject: rpms/widelands/F-7 widelands.spec,1.3,1.4
Message-ID: <200709171615.l8HGFVJk017327@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17280/widelands/F-7

Modified Files:
	widelands.spec 
Log Message:
Fix update problems


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.spec	10 Sep 2007 14:56:58 -0000	1.3
+++ widelands.spec	17 Sep 2007 16:14:59 -0000	1.4
@@ -1,7 +1,7 @@
 %define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.6.build11%{?dist}
+Release:        0.7.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -66,6 +66,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# preparing system before update
+cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
+Checkmate
+Dry Riverbed
+Elven Forests
+Enemy in sight
+Finlakes
+Firegames
+Four Castles
+Glacier Lake
+Golden Peninsula
+Lake of tranquility
+Plateau
+Riverlands
+The Oasis Triangle
+The big lake
+The long way
+Two frontiers
+War of the Valleys
+EOF
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -89,6 +111,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 17 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.7.build11
+- Fix update problems
 * Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
 - Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10



From fedora-extras-commits at redhat.com  Mon Sep 17 16:15:34 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 17 Sep 2007 12:15:34 -0400
Subject: rpms/widelands/devel widelands.spec,1.4,1.5
Message-ID: <200709171615.l8HGFY4F017330@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17280/widelands/devel

Modified Files:
	widelands.spec 
Log Message:
Fix update problems


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- widelands.spec	10 Sep 2007 14:57:01 -0000	1.4
+++ widelands.spec	17 Sep 2007 16:15:01 -0000	1.5
@@ -1,7 +1,7 @@
 %define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.6.build11%{?dist}
+Release:        0.7.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -66,6 +66,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# preparing system before update
+cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
+Checkmate
+Dry Riverbed
+Elven Forests
+Enemy in sight
+Finlakes
+Firegames
+Four Castles
+Glacier Lake
+Golden Peninsula
+Lake of tranquility
+Plateau
+Riverlands
+The Oasis Triangle
+The big lake
+The long way
+Two frontiers
+War of the Valleys
+EOF
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -89,6 +111,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 17 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.7.build11
+- Fix update problems
 * Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
 - Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10



From fedora-extras-commits at redhat.com  Mon Sep 17 16:17:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:17:32 -0400
Subject: rpms/libbonobo/devel .cvsignore, 1.26, 1.27 libbonobo.spec, 1.63,
	1.64 sources, 1.26, 1.27
Message-ID: <200709171617.l8HGHWsN017424@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17355

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	30 Jul 2007 21:49:31 -0000	1.26
+++ .cvsignore	17 Sep 2007 16:16:58 -0000	1.27
@@ -1 +1 @@
-libbonobo-2.19.6.tar.bz2
+libbonobo-2.20.0.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libbonobo.spec	13 Sep 2007 06:08:23 -0000	1.63
+++ libbonobo.spec	17 Sep 2007 16:16:58 -0000	1.64
@@ -5,10 +5,10 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.19.6
-Release: 6%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
-Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonobo/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 # bonobo-activation-server, bonobo-activation-sysconf and bonobo-slay are GPL 
 # libbonobo and libbonobo-activation are LGPLv2+
@@ -129,6 +129,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-6
 - Plug a memory leak in bonobo-activation-server
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	30 Jul 2007 21:49:31 -0000	1.26
+++ sources	17 Sep 2007 16:16:58 -0000	1.27
@@ -1 +1 @@
-78ebc03b60ebf2a2c4b3ebcefdf9f730  libbonobo-2.19.6.tar.bz2
+5656fc628f2b327cfdcab493a8f95f7f  libbonobo-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:19:38 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 12:19:38 -0400
Subject: rpms/libzzub/devel libzzub.spec,1.1,1.2
Message-ID: <200709171619.l8HGJcGA017597@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17562/devel

Modified Files:
	libzzub.spec 
Log Message:
update to revision 7



Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub.spec	17 Sep 2007 07:41:51 -0000	1.1
+++ libzzub.spec	17 Sep 2007 16:19:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -47,6 +47,19 @@
 developing applications that use %{name}.
 
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n	pyzzub
+Summary:	Python Bindings For libzzub
+Group:		Development/Libraries
+
+BuildRequires:	python-devel
+Requires:	%{name} = %{version}-%{release}
+
+%description -n	pyzzub
+These are the Python bindings For libzzub, allowing you to use it from within
+Python scripts.
+
+
 %prep
 %setup -q
 mac2unix SConstruct
@@ -75,11 +88,17 @@
 
 scons CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 scons install CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 cd $RPM_BUILD_ROOT%{_docdir}
 %{__mv} zzub %{name}-%{version}
 
@@ -114,7 +133,18 @@
 %{_libdir}/libzzub.so
 %{_defaultdocdir}/%{name}-devel-%{version}
 
+%files -n pyzzub
+%defattr(-,root,root,-)
+%{python_sitelib}/zzub
+
 %changelog
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
+- re-added pyzzub python-devel build requirement
+- explicitly nailed the name of pyzzub
+
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
+- added pyzzub as an internal extra package
+
 * Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
 - removed redundant explicit flac requirement
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:22:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 12:22:16 -0400
Subject: rpms/xulrunner/OLPC-2 sources,1.7,1.8 xulrunner.spec,1.24,1.25
Message-ID: <200709171622.l8HGMGMG017771@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713

Modified Files:
	sources xulrunner.spec 
Log Message:
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.
+- Downgrade the source to pre6, add a patch for XdndDirectSave support




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Aug 2007 20:32:13 -0000	1.7
+++ sources	17 Sep 2007 16:21:44 -0000	1.8
@@ -1 +1,2 @@
 fbe32af32bb5bd160a36b467bcf98784  xulrunner-1.9.20070820cvs.tar.bz2
+00dbfb4d548309951f12f352ba0f26ea  xulrunner-1.9a6.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xulrunner.spec	23 Aug 2007 08:30:49 -0000	1.24
+++ xulrunner.spec	17 Sep 2007 16:21:44 -0000	1.25
@@ -1,22 +1,22 @@
 %define nss_version 3.10
 %define cairo_version 1.3.12
-%define alpha 20070820cvs 
-%define prerelease a8pre
+%define prerelease a6pre
 
 Summary:        XUL Runner
 Name:           xulrunner
 Version:        1.9
-Release:        0.8.%{alpha}%{?dist}
+Release:        0.9.%{?dist}
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}.%{alpha}.tar.bz2
+Source0:        xulrunner-%{version}.tar.bz2
 Source10:       xulrunner-mozconfig
 Source12:       xulrunner-olpc-default-prefs.js
 
 Patch1:         xulrunner-1.9a6-no-native-theme.patch
 Patch2:         xulrunner-1.9a3pre-dpi.patch
 Patch3:         xulrunner-1.9a5pre-build.patch
+Patch4:         xulrunner-1.9a6-xds.patch
 
 # ---------------------------------------------------
 
@@ -59,11 +59,12 @@
 XUL Runner devel is...
 
 %prep
-%setup -q -n xulrunner-%{version}.%{alpha}
+%setup -q -n xulrunner-%{version}
 
 %patch1 -p0 -b .no-native-theme
 %patch2 -p0 -b .dpi
 %patch3 -p0 -b .build
+%patch4 -p0 -b .xds
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -121,6 +122,9 @@
 %{_includedir}/xulrunner-%{version}%{prerelease}
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.
+- Downgrade the source to pre6, add a patch for XdndDirectSave support
+
 * Thu Aug 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.8.20070820cvs
 - Own mozilla plugin dir
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:22:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:22:42 -0400
Subject: rpms/libbonoboui/devel .cvsignore, 1.31, 1.32 libbonoboui.spec, 1.57,
	1.58 sources, 1.32, 1.33
Message-ID: <200709171622.l8HGMgYs017785@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17745

Modified Files:
	.cvsignore libbonoboui.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Jul 2007 22:19:34 -0000	1.31
+++ .cvsignore	17 Sep 2007 16:22:09 -0000	1.32
@@ -1 +1 @@
-libbonoboui-2.19.6.tar.bz2
+libbonoboui-2.20.0.tar.bz2


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libbonoboui.spec	8 Sep 2007 20:39:40 -0000	1.57
+++ libbonoboui.spec	17 Sep 2007 16:22:09 -0000	1.58
@@ -13,10 +13,10 @@
 
 Summary: Bonobo user interface components
 Name: libbonoboui
-Version: 2.19.6
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libbonoboui/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonoboui/2.20/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=125046
 Patch0: help-error.patch
 License: GPLv2+ and LGPLv2+
@@ -122,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-4
 - Display a dialog if help cannot be found
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 22:19:34 -0000	1.32
+++ sources	17 Sep 2007 16:22:09 -0000	1.33
@@ -1 +1 @@
-7442b2b32515b405d35691f785a13e2f  libbonoboui-2.19.6.tar.bz2
+14427a459f6ca355de5f5e47ce95c1c4  libbonoboui-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:23:26 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 12:23:26 -0400
Subject: rpms/libzzub/F-7 libzzub.spec,1.1,1.2
Message-ID: <200709171623.l8HGNQLQ017889@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17782/F-7

Modified Files:
	libzzub.spec 
Log Message:
update to revision 7



Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub.spec	17 Sep 2007 07:53:27 -0000	1.1
+++ libzzub.spec	17 Sep 2007 16:22:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -47,6 +47,19 @@
 developing applications that use %{name}.
 
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n	pyzzub
+Summary:	Python Bindings For libzzub
+Group:		Development/Libraries
+
+BuildRequires:	python-devel
+Requires:	%{name} = %{version}-%{release}
+
+%description -n	pyzzub
+These are the Python bindings For libzzub, allowing you to use it from within
+Python scripts.
+
+
 %prep
 %setup -q
 mac2unix SConstruct
@@ -75,11 +88,17 @@
 
 scons CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 scons install CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 cd $RPM_BUILD_ROOT%{_docdir}
 %{__mv} zzub %{name}-%{version}
 
@@ -114,7 +133,18 @@
 %{_libdir}/libzzub.so
 %{_defaultdocdir}/%{name}-devel-%{version}
 
+%files -n pyzzub
+%defattr(-,root,root,-)
+%{python_sitelib}/zzub
+
 %changelog
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
+- re-added pyzzub python-devel build requirement
+- explicitly nailed the name of pyzzub
+
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
+- added pyzzub as an internal extra package
+
 * Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
 - removed redundant explicit flac requirement
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:29:49 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:29:49 -0400
Subject: rpms/libgnome/devel .cvsignore, 1.37, 1.38 libgnome.spec, 1.98,
	1.99 sources, 1.37, 1.38
Message-ID: <200709171629.l8HGTnYE018244@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18222

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	30 Jul 2007 21:59:49 -0000	1.37
+++ .cvsignore	17 Sep 2007 16:29:16 -0000	1.38
@@ -1 +1 @@
-libgnome-2.19.1.tar.bz2
+libgnome-2.20.0.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- libgnome.spec	29 Aug 2007 01:28:33 -0000	1.98
+++ libgnome.spec	17 Sep 2007 16:29:16 -0000	1.99
@@ -12,10 +12,10 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.19.1
-Release: 9%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnome/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnome/2.20/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -184,6 +184,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Aug 28 2007 M??ir??n Duffy <duffy at redhat.com> - 2.19.1-9
 - Change default background to Infinity
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	30 Jul 2007 21:59:49 -0000	1.37
+++ sources	17 Sep 2007 16:29:16 -0000	1.38
@@ -1 +1 @@
-01524cf242063759f4abd0800bf776f2  libgnome-2.19.1.tar.bz2
+a52049befc0e8d91ff6c735d45552d78  libgnome-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:43:51 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 17 Sep 2007 12:43:51 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.38, 1.39 gnome-media.spec,
	1.106, 1.107 sources, 1.37, 1.38
Message-ID: <200709171643.l8HGhpxX018709@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18670

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	7 Sep 2007 10:56:48 -0000	1.38
+++ .cvsignore	17 Sep 2007 16:43:17 -0000	1.39
@@ -1 +1 @@
-gnome-media-2.19.92.tar.gz
+gnome-media-2.20.0.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-media.spec	7 Sep 2007 12:43:46 -0000	1.106
+++ gnome-media.spec	17 Sep 2007 16:43:17 -0000	1.107
@@ -11,7 +11,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.19.92
+Version:        2.20.0
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
@@ -187,6 +187,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 - Remove upstreamed/obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Sep 2007 10:56:48 -0000	1.37
+++ sources	17 Sep 2007 16:43:17 -0000	1.38
@@ -1 +1 @@
-f095fceca0175e04afb966e0366a9bc4  gnome-media-2.19.92.tar.gz
+4c98d9e745d98cb1ff314027b198a511  gnome-media-2.20.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:36 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGoatk025618@app3.fedora.phx.redhat.com>

Package micq in Fedora devel was orphaned by J?n ONDREJ (ondrejj)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:43 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGoiWA025662@app3.fedora.phx.redhat.com>

Package micq in Fedora 6 was orphaned by J?n ONDREJ (ondrejj)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:46 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGolTb026388@app4.fedora.phx.redhat.com>

Package micq in Fedora 7 was orphaned by J?n ONDREJ (ondrejj)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 16:51:53 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 12:51:53 -0400
Subject: rpms/nfs-utils/F-7 nfs-utils-1.1.0-exportfs-man-update.patch, NONE, 
	1.1 nfs-utils.spec, 1.161, 1.162
Message-ID: <200709171651.l8HGprRs018919@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18847

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-exportfs-man-update.patch 
Log Message:
Updated exportfs manpage (bz 262861)


nfs-utils-1.1.0-exportfs-man-update.patch:

--- NEW FILE nfs-utils-1.1.0-exportfs-man-update.patch ---
commit 0647ed30739b9867a4657bd69467925c868640b3
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 13:21:08 2007 -0400

    Updated exportfs man to talk about /var/lib/nfs/etab
    instead of /var/lib/nfs/xtab
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/exportfs/exportfs.man b/utils/exportfs/exportfs.man
index 2bd8e31..9cfe7b8 100644
--- a/utils/exportfs/exportfs.man
+++ b/utils/exportfs/exportfs.man
@@ -22,14 +22,14 @@ The
 .B exportfs
 command is used to maintain the current table of exported file systems for
 NFS. This list is kept in a separate file named
-.BR /var/lib/nfs/xtab
+.BR /var/lib/nfs/etab
 which is read by
 .B mountd
 when a remote host requests access to mount a file tree, and parts of
 the list which are active are kept in the kernel's export table.
 .P
 Normally this 
-.B xtab
+.B etab
 file is initialized with the list of all file systems named in
 .B /etc/exports 
 by invoking
@@ -59,7 +59,7 @@ In the new mode,
 does not give any information to the kernel but only provides it to
 .B mountd
 through the
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 file.
 .B mountd
 will listen to requests from the kernel and will provide information
@@ -69,7 +69,7 @@ In the legacy mode,
 any export requests which identify a specific host (rather than a
 subnet or netgroup etc) are entered directly into the kernel's export
 table as well as being written to
-.BR /var/lib/nfs/xtab .
+.BR /var/lib/nfs/etab .
 Further, any mount points listed in
 .B /var/lib/nfs/rmtab
 which match a non host-specific export request will cause an
@@ -93,8 +93,8 @@ file, so that only default options and options given on the command
 line are used.
 .TP
 .B -r
-Reexport all directories. It synchronizes /var/lib/nfs/xtab
-with /etc/exports. It removes entries in /var/lib/nfs/xtab
+Reexport all directories. It synchronizes /var/lib/nfs/etab
+with /etc/exports. It removes entries in /var/lib/nfs/etab
 which are deleted from /etc/exports, and remove any entries from the
 kernel export table which are no longer valid.
 .TP
@@ -120,7 +120,7 @@ entries to the export table.  When using
 all directories in
 .B exports(5)
 are added to
-.B xtab
+.B etab
 and the resulting list is pushed into the kernel.
 .P
 The
@@ -152,7 +152,7 @@ directory.
 Modifications of the kernel export table used by
 .B nfsd(8)
 take place immediately after parsing the command line and updating the
-.B xtab
+.B etab
 file.
 .P
 The default export options are
@@ -163,14 +163,14 @@ The third synopsis shows how to unexported a currently exported directory.
 When using
 .BR "exportfs -ua" ,
 all entries listed in
-.B xtab
+.B etab
 are removed from the kernel export tables, and the file is cleared. This
 effectively shuts down all NFS activity.
 .P
 To remove individual export entries, one can specify a
 .I host:/path
 pair. This deletes the specified entry from
-.B xtab
+.B etab
 and removes the corresponding kernel entry (if any).
 .P
 .\" -------------------- Dumping the Export Table -----------------
@@ -186,7 +186,7 @@ option, the list of flags pertaining to each export are shown in addition.
 The following adds all directories listed in
 .B /etc/exports
 to
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 and pushes the resulting export entries into the kernel:
 .P
 .nf


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- nfs-utils.spec	14 Sep 2007 18:13:54 -0000	1.161
+++ nfs-utils.spec	17 Sep 2007 16:51:19 -0000	1.162
@@ -33,6 +33,7 @@
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-smnotify-path.patch
+Patch11: nfs-utils-1.1.0-exportfs-man-update.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -96,6 +97,7 @@
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -268,6 +270,7 @@
 %changelog
 * Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)
+- Updated exportfs manpage (bz 262861)
 
 * Mon Aug 13 2007 Steve Dickson <steved at redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:54:18 -0400
Subject: rpms/pygtksourceview/devel pygtksourceview.spec,1.11,1.12
Message-ID: <200709171654.l8HGsIle019070@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19041

Modified Files:
	pygtksourceview.spec 
Log Message:
fix requires



Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pygtksourceview.spec	17 Sep 2007 15:54:57 -0000	1.11
+++ pygtksourceview.spec	17 Sep 2007 16:53:43 -0000	1.12
@@ -2,7 +2,7 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.5
+%define gtksourceview_version 2.0.0
 
 Name:           pygtksourceview
 Version:        2.0.0



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Mon, 17 Sep 2007 09:54:20 -0700
Subject: [pkgdb] kde-filesystem: kkofler has requested commit
Message-ID: <200709171654.l8HGsNeS026658@app3.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kde-filesystem (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:22 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Mon, 17 Sep 2007 09:54:22 -0700
Subject: [pkgdb] kde-filesystem: kkofler has requested commit
Message-ID: <200709171654.l8HGsNBp027389@app4.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kde-filesystem (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:48 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 12:54:48 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.4,1.5
Message-ID: <200709171654.l8HGsmKl019106@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19062

Modified Files:
	eclipse-egit.spec 
Log Message:
fix files listing


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-egit.spec	17 Sep 2007 14:54:11 -0000	1.4
+++ eclipse-egit.spec	17 Sep 2007 16:54:16 -0000	1.5
@@ -89,6 +89,7 @@
 %files
 %defattr(-,root,root,-)
 %{_datadir}/eclipse/features/org.spearce.egit*
+%{_datadir}/eclipse/plugins/org.spearce.egit*
 %{_datadir}/eclipse/plugins/org.spearce.egit.core*
 %{_datadir}/eclipse/plugins/org.spearce.egit.ui*
 %{_datadir}/eclipse/plugins/org.spearce.jgit*



From fedora-extras-commits at redhat.com  Mon Sep 17 16:55:35 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 12:55:35 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-exportfs-man-update.patch, NONE,
	1.1 nfs-utils.spec, 1.155, 1.156
Message-ID: <200709171655.l8HGtZjx019175@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-exportfs-man-update.patch 
Log Message:
Updated exportfs manpage (bz 262861)


nfs-utils-1.1.0-exportfs-man-update.patch:

--- NEW FILE nfs-utils-1.1.0-exportfs-man-update.patch ---
commit 0647ed30739b9867a4657bd69467925c868640b3
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 13:21:08 2007 -0400

    Updated exportfs man to talk about /var/lib/nfs/etab
    instead of /var/lib/nfs/xtab
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/exportfs/exportfs.man b/utils/exportfs/exportfs.man
index 2bd8e31..9cfe7b8 100644
--- a/utils/exportfs/exportfs.man
+++ b/utils/exportfs/exportfs.man
@@ -22,14 +22,14 @@ The
 .B exportfs
 command is used to maintain the current table of exported file systems for
 NFS. This list is kept in a separate file named
-.BR /var/lib/nfs/xtab
+.BR /var/lib/nfs/etab
 which is read by
 .B mountd
 when a remote host requests access to mount a file tree, and parts of
 the list which are active are kept in the kernel's export table.
 .P
 Normally this 
-.B xtab
+.B etab
 file is initialized with the list of all file systems named in
 .B /etc/exports 
 by invoking
@@ -59,7 +59,7 @@ In the new mode,
 does not give any information to the kernel but only provides it to
 .B mountd
 through the
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 file.
 .B mountd
 will listen to requests from the kernel and will provide information
@@ -69,7 +69,7 @@ In the legacy mode,
 any export requests which identify a specific host (rather than a
 subnet or netgroup etc) are entered directly into the kernel's export
 table as well as being written to
-.BR /var/lib/nfs/xtab .
+.BR /var/lib/nfs/etab .
 Further, any mount points listed in
 .B /var/lib/nfs/rmtab
 which match a non host-specific export request will cause an
@@ -93,8 +93,8 @@ file, so that only default options and options given on the command
 line are used.
 .TP
 .B -r
-Reexport all directories. It synchronizes /var/lib/nfs/xtab
-with /etc/exports. It removes entries in /var/lib/nfs/xtab
+Reexport all directories. It synchronizes /var/lib/nfs/etab
+with /etc/exports. It removes entries in /var/lib/nfs/etab
 which are deleted from /etc/exports, and remove any entries from the
 kernel export table which are no longer valid.
 .TP
@@ -120,7 +120,7 @@ entries to the export table.  When using
 all directories in
 .B exports(5)
 are added to
-.B xtab
+.B etab
 and the resulting list is pushed into the kernel.
 .P
 The
@@ -152,7 +152,7 @@ directory.
 Modifications of the kernel export table used by
 .B nfsd(8)
 take place immediately after parsing the command line and updating the
-.B xtab
+.B etab
 file.
 .P
 The default export options are
@@ -163,14 +163,14 @@ The third synopsis shows how to unexported a currently exported directory.
 When using
 .BR "exportfs -ua" ,
 all entries listed in
-.B xtab
+.B etab
 are removed from the kernel export tables, and the file is cleared. This
 effectively shuts down all NFS activity.
 .P
 To remove individual export entries, one can specify a
 .I host:/path
 pair. This deletes the specified entry from
-.B xtab
+.B etab
 and removes the corresponding kernel entry (if any).
 .P
 .\" -------------------- Dumping the Export Table -----------------
@@ -186,7 +186,7 @@ option, the list of flags pertaining to each export are shown in addition.
 The following adds all directories listed in
 .B /etc/exports
 to
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 and pushes the resulting export entries into the kernel:
 .P
 .nf


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- nfs-utils.spec	14 Sep 2007 19:09:03 -0000	1.155
+++ nfs-utils.spec	17 Sep 2007 16:55:03 -0000	1.156
@@ -34,6 +34,7 @@
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-exportfs-open.patch
 Patch11: nfs-utils-1.1.0-smnotify-path.patch
+Patch12: nfs-utils-1.1.0-exportfs-man-update.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -98,6 +99,7 @@
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -271,6 +273,7 @@
 * Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-5
 - Changed the default paths in sm-notify to 
   /var/lib/nfs/statd (bz 258461)
+- Updated exportfs manpage (bz 262861)
 
 * Wed Aug 15 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses



From fedora-extras-commits at redhat.com  Mon Sep 17 17:01:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 13:01:03 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 tomboy.spec, 1.57, 1.58
Message-ID: <200709171701.l8HH13sX023597@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19433

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	14 Sep 2007 05:44:46 -0000	1.19
+++ .cvsignore	17 Sep 2007 17:00:29 -0000	1.20
@@ -1 +1 @@
-tomboy-0.7.8.tar.bz2
+tomboy-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Sep 2007 05:44:46 -0000	1.19
+++ sources	17 Sep 2007 17:00:29 -0000	1.20
@@ -1 +1 @@
-a5d87649e153d4e7a4a01846c700e66c  tomboy-0.7.8.tar.bz2
+b95c8ce7da7571583f33e80d25ac87e6  tomboy-0.8.0.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tomboy.spec	14 Sep 2007 05:44:46 -0000	1.57
+++ tomboy.spec	17 Sep 2007 17:00:29 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.7.8
+Version:        0.8.0
 Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1
+- Update to 0.8.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.8-1
 - Update to 0.7.8
 



From fedora-extras-commits at redhat.com  Mon Sep 17 17:09:08 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:09:08 -0400
Subject: rpms/goffice04/devel .cvsignore, 1.3, 1.4 goffice04.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709171709.l8HH97Gn025738@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice04/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703

Modified Files:
	.cvsignore goffice04.spec sources 
Log Message:
* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
- Updated to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2007 15:31:51 -0000	1.3
+++ .cvsignore	17 Sep 2007 17:08:34 -0000	1.4
@@ -1 +1 @@
-goffice-0.4.2.tar.bz2
+goffice-0.4.3.tar.bz2


Index: goffice04.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/goffice04.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goffice04.spec	26 Aug 2007 07:46:30 -0000	1.4
+++ goffice04.spec	17 Sep 2007 17:08:34 -0000	1.5
@@ -1,8 +1,8 @@
 %define         upstreamname goffice
 
 Name:           goffice04         
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.4.3
+Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
+- Updated to 0.4.3
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-2
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2007 15:31:51 -0000	1.3
+++ sources	17 Sep 2007 17:08:34 -0000	1.4
@@ -1 +1 @@
-eb72fe8caf7cb4e526671323f6bd4819  goffice-0.4.2.tar.bz2
+f299e3a469e11609910d72d007420aa7  goffice-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:11:20 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:11:20 -0400
Subject: rpms/goffice04/F-7 .cvsignore, 1.3, 1.4 goffice04.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709171711.l8HHBKj7025826@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice04/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25800

Modified Files:
	.cvsignore goffice04.spec sources 
Log Message:
* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
- Updated to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2007 15:33:46 -0000	1.3
+++ .cvsignore	17 Sep 2007 17:10:48 -0000	1.4
@@ -1 +1 @@
-goffice-0.4.2.tar.bz2
+goffice-0.4.3.tar.bz2


Index: goffice04.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/goffice04.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goffice04.spec	5 Aug 2007 15:33:46 -0000	1.3
+++ goffice04.spec	17 Sep 2007 17:10:48 -0000	1.4
@@ -1,11 +1,11 @@
 %define         upstreamname goffice
 
 Name:           goffice04         
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
-License:        GPL  
+License:        GPLv2
 URL:            http://freshmeat.net/projects/goffice/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.4/%{upstreamname}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,12 @@
 
 
 %changelog
+* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
+- Updated to 0.4.3
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-2
+- Adjusted License tag as per latest guidelines
+
 * Sun Aug  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-1
 - Updated to 0.4.2
 - Added libgsf-gnome-devel to BuildRequires (RH #245604)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2007 15:33:46 -0000	1.3
+++ sources	17 Sep 2007 17:10:48 -0000	1.4
@@ -1 +1 @@
-eb72fe8caf7cb4e526671323f6bd4819  goffice-0.4.2.tar.bz2
+f299e3a469e11609910d72d007420aa7  goffice-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:13:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 10:13:32 -0700
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <200709171713.l8HHDWQ4031742@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kde-filesystem (Fedora devel) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 17:13:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 10:13:35 -0700
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <200709171713.l8HHDaig000634@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kde-filesystem (Fedora 7) to Approved for Kevin Kofler (kkofler)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 17:15:30 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:15:30 -0400
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.5,
	1.6 gnome-chemistry-utils.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200709171715.l8HHFUMp025914@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25887

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Aug 2007 14:31:03 -0000	1.5
+++ .cvsignore	17 Sep 2007 17:14:58 -0000	1.6
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.2.tar.bz2
+gnome-chemistry-utils-0.8.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-chemistry-utils.spec	26 Aug 2007 07:42:19 -0000	1.10
+++ gnome-chemistry-utils.spec	17 Sep 2007 17:14:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.2
-Release:        4%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-4
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Aug 2007 14:31:03 -0000	1.5
+++ sources	17 Sep 2007 17:14:58 -0000	1.6
@@ -1 +1 @@
-804946c5a6f9587e9707918f7f1b4d06  gnome-chemistry-utils-0.8.2.tar.bz2
+621f28050385acbde80ddd88cd11b0b2  gnome-chemistry-utils-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:17:48 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:17:48 -0400
Subject: rpms/gnome-chemistry-utils/F-7 .cvsignore, 1.5,
	1.6 gnome-chemistry-utils.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200709171717.l8HHHmif026012@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25973

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Aug 2007 14:35:35 -0000	1.5
+++ .cvsignore	17 Sep 2007 17:17:15 -0000	1.6
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.2.tar.bz2
+gnome-chemistry-utils-0.8.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/gnome-chemistry-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-chemistry-utils.spec	6 Aug 2007 13:40:42 -0000	1.9
+++ gnome-chemistry-utils.spec	17 Sep 2007 17:17:15 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -204,6 +204,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-4
+- Adjusted License tag as per latest guidelines
+
 * Mon Aug  6 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
 - Added goffice04-devel to -devel subpackage Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Aug 2007 14:35:35 -0000	1.5
+++ sources	17 Sep 2007 17:17:15 -0000	1.6
@@ -1 +1 @@
-804946c5a6f9587e9707918f7f1b4d06  gnome-chemistry-utils-0.8.2.tar.bz2
+621f28050385acbde80ddd88cd11b0b2  gnome-chemistry-utils-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:27:35 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 13:27:35 -0400
Subject: rpms/slang/devel slang-2.1.2-makefile.patch, NONE, 1.1 slang.spec, 
	1.46, 1.47 slang-2.1.0-makefile.patch, 1.3, NONE
Message-ID: <200709171727.l8HHRZIT026229@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26206

Modified Files:
	slang.spec 
Added Files:
	slang-2.1.2-makefile.patch 
Removed Files:
	slang-2.1.0-makefile.patch 
Log Message:
- update to 2.1.2


slang-2.1.2-makefile.patch:

--- NEW FILE slang-2.1.2-makefile.patch ---
diff -up slang-2.1.2/modules/Makefile.in.makefile slang-2.1.2/modules/Makefile.in
--- slang-2.1.2/modules/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/modules/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
 MODULE_INSTALL_DIR = @libdir@/slang/v at slang_major_version@/modules
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_MODULE	= @INSTALL_MODULE@
+INSTALL_MODULE	= @INSTALL@
 MKINSDIR	= ../autoconf/mkinsdir.sh
 SLSH_DIR	= $(prefix)/share/slsh
 CMAPS_DIR	= $(SLSH_DIR)/cmaps
@@ -67,7 +67,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
 DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
 #---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
 
 LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
 #LIBS = $(RPATH) $(DL_LIB) -lm
diff -up slang-2.1.2/slsh/Makefile.in.makefile slang-2.1.2/slsh/Makefile.in
--- slang-2.1.2/slsh/Makefile.in.makefile	2007-09-09 03:39:18.000000000 +0200
+++ slang-2.1.2/slsh/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I at SRCDIR@
 SLANG_SRCLIB	= -L at ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
-RPATH		= @RPATH@
+RPATH		= 
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
 #----------------------------------------------------------------------------
 @SET_MAKE@
 SHELL = /bin/sh
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
 DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
diff -up slang-2.1.2/src/Makefile.in.makefile slang-2.1.2/src/Makefile.in
--- slang-2.1.2/src/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/src/Makefile.in	2007-09-17 18:07:25.000000000 +0200
@@ -137,17 +137,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
 # Rules
 #---------------------------------------------------------------------------
 all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -158,10 +162,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
 	@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
 	-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+	touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
 	-$(MKDIR) $(ELFDIR)
+	touch $(ELFDIR)/stamp
 $(CONFIG_H) : sysconf.h
 	-$(CP) sysconf.h $(CONFIG_H)
 
@@ -192,9 +198,9 @@ install-elf-and-links:
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.
diff -up slang-2.1.2/autoconf/Makefile.in.makefile slang-2.1.2/autoconf/Makefile.in
--- slang-2.1.2/autoconf/Makefile.in.makefile	2007-08-30 05:14:55.000000000 +0200
+++ slang-2.1.2/autoconf/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -18,8 +18,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: Makefile
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: Makefile
+elf: Makefile static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- slang.spec	23 Aug 2007 10:36:48 -0000	1.46
+++ slang.spec	17 Sep 2007 17:27:03 -0000	1.47
@@ -1,11 +1,11 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
-Patch1: slang-2.1.0-makefile.patch
+Patch1: slang-2.1.2-makefile.patch
 Patch2: slang-nointerlibc2.patch
 Patch3: slang-LANG.patch
 URL: http://www.jedsoft.org/slang/
@@ -68,8 +68,8 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install-all INSTALL="install -p" \
-	DESTDIR=$RPM_BUILD_ROOT install_doc_dir=%{_docdir}/%{name}-%{version}
+make install-all INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/{slang,slsh}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -85,6 +85,7 @@
 
 %files slsh
 %defattr(-,root,root)
+%doc slsh/doc/html/slsh*.html
 %config(noreplace) %{_sysconfdir}/slsh.rc
 %{_bindir}/slsh
 %{_libdir}/slang
@@ -93,7 +94,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc doc/*/cslang*.txt
+%doc doc/*/cslang*.txt doc/*/cref.txt
 %{_libdir}/libslang*.so
 %{_includedir}/slang
 
@@ -102,6 +103,9 @@
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-1
+- update to 2.1.2
+
 * Thu Aug 23 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.1-2
 - update license tag
 - buildrequire gawk


--- slang-2.1.0-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 17:33:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 10:33:30 -0700
Subject: [pkgdb] aspell-sk Orphaned
Message-ID: <200709171733.l8HHXUAI004224@app3.fedora.phx.redhat.com>

Package aspell-sk in Fedora EPEL 4 was orphaned by J?n ONDREJ (ondrejj)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 17:49:11 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 13:49:11 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.60, 1.61 gtkhtml3.spec, 1.101,
	1.102 sources, 1.60, 1.61
Message-ID: <200709171749.l8HHnBw5028990@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28960

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

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 3.16.0-1.fc8
- Update to 3.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	4 Sep 2007 02:45:19 -0000	1.60
+++ .cvsignore	17 Sep 2007 17:48:38 -0000	1.61
@@ -1 +1 @@
-gtkhtml-3.15.92.tar.bz2
+gtkhtml-3.16.0.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gtkhtml3.spec	13 Sep 2007 16:10:39 -0000	1.101
+++ gtkhtml3.spec	17 Sep 2007 17:48:38 -0000	1.102
@@ -8,8 +8,8 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.15.92
-Release: 2%{?dist}
+Version: 3.16.0
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -134,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 3.16.0-1.fc8
+- Update to 3.16.0
+
 * Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
 - Add patch for GNOME bug #443850 (fix cursor position after typing halant).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	4 Sep 2007 02:45:19 -0000	1.60
+++ sources	17 Sep 2007 17:48:38 -0000	1.61
@@ -1 +1 @@
-a37457a6de11ae2fa6661ecf2ae33958  gtkhtml-3.15.92.tar.bz2
+0b3b2d27671671ec0680984fe5d8ab9b  gtkhtml-3.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:06:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:06:41 -0400
Subject: rpms/libgnome/devel default-background.patch, NONE,
	1.1 libgnome.spec, 1.99, 1.100
Message-ID: <200709171806.l8HI6fUe003487@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	libgnome.spec 
Added Files:
	default-background.patch 
Log Message:
update patch


default-background.patch:

--- NEW FILE default-background.patch ---
diff -up libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
--- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background	2007-09-17 08:25:50.000000000 -0400
+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in	2007-09-17 14:04:41.000000000 -0400
@@ -16,7 +16,7 @@
         <applyto>/desktop/gnome/background/picture_options</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>zoom</default>
+        <default>stretched</default>
         <locale name="C">
         <short>Picture Options</short>
         <long>Determines how the image set by wallpaper_filename is
@@ -29,7 +29,7 @@
         <applyto>/desktop/gnome/background/picture_filename</applyto>
         <owner>gnome</owner>
         <type>string</type>
-	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
+	<default>/usr/share/backgrounds/infinity/infinity.xml</default>
         <locale name="C">
         <short>Picture Filename</short>
         <long>File to use for the background image</long>
@@ -51,7 +51,7 @@
         <applyto>/desktop/gnome/background/primary_color</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>#66ba00</default>
+        <default>#224B68</default>
         <locale name="C">
         <short>Primary Color</short>
         <long>Left or Top color when drawing gradients, or the solid color.</long>
@@ -62,7 +62,7 @@
         <applyto>/desktop/gnome/background/secondary_color</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>#66ba00</default>
+        <default>#142C3D</default>
         <locale name="C">
         <short>Secondary Color</short>
         <long>Right or Bottom color when drawing gradients, not used for solid color.</long>
@@ -73,7 +73,7 @@
         <applyto>/desktop/gnome/background/color_shading_type</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>solid</default>
+        <default>vertical-gradient</default>
         <locale name="C">
         <short>Color Shading Type</short>
         <long>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid"</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libgnome.spec	17 Sep 2007 16:29:16 -0000	1.99
+++ libgnome.spec	17 Sep 2007 18:06:08 -0000	1.100
@@ -52,7 +52,7 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  popt-devel
 
-Patch1: libgnome-2.16.0-default-background.patch
+Patch1: default-background.patch
 Patch2: libgnome-2.11.1-scoreloc.patch
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch



From fedora-extras-commits at redhat.com  Mon Sep 17 18:15:47 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 14:15:47 -0400
Subject: comps comps-f8.xml.in,1.110,1.111
Message-ID: <200709171815.l8HIFlOU003782@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3739

Modified Files:
	comps-f8.xml.in 
Log Message:
make f-spot default per the desktop SIG meeting last week



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- comps-f8.xml.in	16 Sep 2007 07:34:06 -0000	1.110
+++ comps-f8.xml.in	17 Sep 2007 18:15:17 -0000	1.111
@@ -1885,6 +1885,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">f-spot</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gimp-help</packagereq>
       <packagereq type="default">xsane</packagereq>
@@ -1897,7 +1898,6 @@
       <packagereq type="optional">dcraw</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">digikam-doc</packagereq>
-      <packagereq type="optional">f-spot</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fonttools</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 17 18:16:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:16:26 -0400
Subject: rpms/jasper/devel jasper.spec,1.25,1.26
Message-ID: <200709171816.l8HIGQxQ003822@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3788

Modified Files:
	jasper.spec 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
- (main) drop Requires: %name-libs
- -devel: Provides: libjasper-devel
- drop (unused) geojasper bits



Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jasper.spec	22 Aug 2007 15:39:20 -0000	1.25
+++ jasper.spec	17 Sep 2007 18:15:53 -0000	1.26
@@ -4,25 +4,15 @@
 # kdelibs
 # netpbm
 
-# define to use GeoJasper
-#define geo 1
-
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: JasPer
-%if "%{?geo:1}" == "1"
-%define  geojasper_ver 1.2.9
-URL:	 http://www.dimin.net/software/utils.html
-Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
@@ -37,8 +27,6 @@
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
-Requires: %{name}-libs = %{version}-%{release}
-
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
@@ -47,6 +35,7 @@
 %package devel
 Summary: JasPer header files, libraries and developer documentation.
 Group:   Development/Libraries
+Provides: libjasper-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
 %description devel
@@ -69,22 +58,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
-
 
 %build
 
@@ -120,7 +98,6 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/imginfo
 %{_bindir}/jasper
@@ -135,6 +112,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
 %{_libdir}/lib*.so.*
 
 %files utils
@@ -145,6 +123,11 @@
 
 
 %changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
+- (main) drop Requires: %%name-libs
+- -devel: Provides: libjasper-devel
+- drop (unused) geojasper bits
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
 - -libs subpkg to be multilib friendlier
 - -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)



From fedora-extras-commits at redhat.com  Mon Sep 17 18:17:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:17:29 -0400
Subject: rpms/libgnomeprint22/devel .cvsignore, 1.21,
	1.22 libgnomeprint22.spec, 1.54, 1.55 sources, 1.21, 1.22
Message-ID: <200709171817.l8HIHTUN003899@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomeprint22/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872

Modified Files:
	.cvsignore libgnomeprint22.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	9 Aug 2007 05:26:52 -0000	1.21
+++ .cvsignore	17 Sep 2007 18:16:56 -0000	1.22
@@ -1 +1 @@
-libgnomeprint-2.18.1.tar.bz2
+libgnomeprint-2.18.2.tar.bz2


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libgnomeprint22.spec	23 Aug 2007 17:23:39 -0000	1.54
+++ libgnomeprint22.spec	17 Sep 2007 18:16:56 -0000	1.55
@@ -12,8 +12,8 @@
 
 Summary: Printing library for GNOME
 Name:		libgnomeprint22
-Version: 	2.18.1
-Release:	2%{?dist}
+Version: 	2.18.2
+Release:	1%{?dist}
 License:	LGPL+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
@@ -122,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.1-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	9 Aug 2007 05:26:52 -0000	1.21
+++ sources	17 Sep 2007 18:16:56 -0000	1.22
@@ -1 +1 @@
-be87a17490c4976a85488537f22bcfde  libgnomeprint-2.18.1.tar.bz2
+b1f6c95a8dbb8ce17ab00fc2eea2aa91  libgnomeprint-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:18:04 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 14:18:04 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.71,
	1.72 evolution-data-server.spec, 1.186, 1.187 sources, 1.71, 1.72
Message-ID: <200709171818.l8HII4Re003972@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3896

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.12.0-1.fc8
- Update to 1.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	4 Sep 2007 03:16:15 -0000	1.71
+++ .cvsignore	17 Sep 2007 18:17:31 -0000	1.72
@@ -1 +1 @@
-evolution-data-server-1.11.92.tar.bz2
+evolution-data-server-1.12.0.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- evolution-data-server.spec	4 Sep 2007 03:16:15 -0000	1.186
+++ evolution-data-server.spec	17 Sep 2007 18:17:31 -0000	1.187
@@ -26,7 +26,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.11.92
+Version: 1.12.0
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -381,6 +381,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.12.0-1.fc8
+- Update to 1.12.0
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
 - Update to 1.11.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	4 Sep 2007 03:16:15 -0000	1.71
+++ sources	17 Sep 2007 18:17:31 -0000	1.72
@@ -1 +1 @@
-51fc0b011c240eaefeadbdbcc9517af7  evolution-data-server-1.11.92.tar.bz2
+787cfe9d652f46395a9adce056bdb286  evolution-data-server-1.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:20:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:20:31 -0400
Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.21,
	1.22 libgnomeprintui22.spec, 1.45, 1.46 sources, 1.21, 1.22
Message-ID: <200709171820.l8HIKVTH004105@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeprintui22/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4051

Modified Files:
	.cvsignore libgnomeprintui22.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Mar 2007 17:33:39 -0000	1.21
+++ .cvsignore	17 Sep 2007 18:19:58 -0000	1.22
@@ -1 +1 @@
-libgnomeprintui-2.18.0.tar.bz2
+libgnomeprintui-2.18.1.tar.bz2


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libgnomeprintui22.spec	23 Aug 2007 17:24:45 -0000	1.45
+++ libgnomeprintui22.spec	17 Sep 2007 18:19:58 -0000	1.46
@@ -5,8 +5,8 @@
 
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/2.18/libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprintui
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Mar 2007 17:33:39 -0000	1.21
+++ sources	17 Sep 2007 18:19:58 -0000	1.22
@@ -1 +1 @@
-bea9871059cabee9d108bab32d58d2af  libgnomeprintui-2.18.0.tar.bz2
+4f9a09372a5fa2cd5c35be30dff3fcd6  libgnomeprintui-2.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:20:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:20:57 -0400
Subject: rpms/jasper/devel jasper.spec,1.26,1.27
Message-ID: <200709171820.l8HIKvb1004128@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4080

Modified Files:
	jasper.spec 
Log Message:
ok, try again...
make -libs not Requires: %%name



Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jasper.spec	17 Sep 2007 18:15:53 -0000	1.26
+++ jasper.spec	17 Sep 2007 18:20:25 -0000	1.27
@@ -8,7 +8,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -27,6 +27,8 @@
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
@@ -44,7 +46,6 @@
 %package libs 
 Summary: JasPer runtime libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
 %description libs 
 %{summary}.
 
@@ -123,9 +124,9 @@
 
 
 %changelog
-* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
-- (main) drop Requires: %%name-libs
-- -devel: Provides: libjasper-devel
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-6
+- -libs: -Requires: %%name
+- -devel: +Provides: libjasper-devel
 - drop (unused) geojasper bits
 
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4



From fedora-extras-commits at redhat.com  Mon Sep 17 18:23:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:23:32 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.26, 1.27 gcalctool.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <200709171823.l8HINWVk004473@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Sep 2007 04:26:59 -0000	1.26
+++ .cvsignore	17 Sep 2007 18:22:59 -0000	1.27
@@ -1 +1 @@
-gcalctool-5.19.92.tar.bz2
+gcalctool-5.20.0.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gcalctool.spec	4 Sep 2007 15:56:25 -0000	1.48
+++ gcalctool.spec	17 Sep 2007 18:22:59 -0000	1.49
@@ -1,12 +1,12 @@
 Name:           gcalctool
-Version:        5.19.92
+Version:        5.20.0
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://directory.fsf.org/gcalctool.html
-Source0:        http://download.gnome.org/sources/gcalctool/5.19/gcalctool-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gcalctool/5.20/gcalctool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: atk-devel >= 1.5
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 5.20.0-1
+- Update to 5.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.92-1
 - Update to 5.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2007 04:26:59 -0000	1.27
+++ sources	17 Sep 2007 18:22:59 -0000	1.28
@@ -1 +1 @@
-1b2a327311134d830a4b3628b51468f0  gcalctool-5.19.92.tar.bz2
+fefe44a52465eae39c5bf9a9669a0aa6  gcalctool-5.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:23:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:23:39 -0400
Subject: rpms/OpenEXR/devel OpenEXR.spec,1.14,1.15
Message-ID: <200709171823.l8HINda1004478@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/OpenEXR/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4356

Modified Files:
	OpenEXR.spec 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-6
- libs: -Requires: %name



Index: OpenEXR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OpenEXR.spec	22 Aug 2007 23:33:30 -0000	1.14
+++ OpenEXR.spec	17 Sep 2007 18:23:07 -0000	1.15
@@ -4,7 +4,7 @@
 
 Name:	 OpenEXR
 Version: %{ver}%{?beta} 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
@@ -45,7 +45,6 @@
 %package libs
 Summary: %{name} runtime libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -104,7 +103,6 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
 %exclude %{_bindir}/exrdisplay
 
@@ -118,6 +116,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog LICENSE NEWS README
 %{_libdir}/lib*.so.*
 
 %files utils
@@ -126,7 +125,10 @@
 
 
 %changelog
-* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject> 1.4.0a-5
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-6
+- libs: -Requires: %%name
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-5
 - -libs: new subpkg to be multilib friendly
 - -utils: package exrdisplay separately (separate fltk dep)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 18:25:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:25:42 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.28, 1.29 gnome-mag.spec, 1.51,
	1.52 sources, 1.29, 1.30
Message-ID: <200709171825.l8HIPgAK005634@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5148

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	14 Sep 2007 06:09:24 -0000	1.28
+++ .cvsignore	17 Sep 2007 18:25:09 -0000	1.29
@@ -1 +1 @@
-gnome-mag-0.14.9.tar.bz2
+gnome-mag-0.14.10.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-mag.spec	14 Sep 2007 06:09:24 -0000	1.51
+++ gnome-mag.spec	17 Sep 2007 18:25:09 -0000	1.52
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.9
+Version: 0.14.10
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.10-1
+- Update to 0.14.10
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.9-1
 - Update to 0.14.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	14 Sep 2007 06:09:24 -0000	1.29
+++ sources	17 Sep 2007 18:25:09 -0000	1.30
@@ -1 +1 @@
-36a4bb5b06ca8bfb0d7d728c3045bebe  gnome-mag-0.14.9.tar.bz2
+e3e498c7df873ecc7acabd52a7b4ddc7  gnome-mag-0.14.10.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:31:58 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 14:31:58 -0400
Subject: rpms/gcstar/devel .cvsignore, 1.5, 1.6 gcstar.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200709171831.l8HIVw82007072@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7040

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 17:19:01 -0000	1.5
+++ .cvsignore	17 Sep 2007 18:31:25 -0000	1.6
@@ -1 +1 @@
-gcstar-1.2.0.tar.gz
+gcstar-1.2.2.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcstar.spec	10 Sep 2007 16:41:54 -0000	1.7
+++ gcstar.spec	17 Sep 2007 18:31:25 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:19:01 -0000	1.4
+++ sources	17 Sep 2007 18:31:25 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:32:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:32:49 -0400
Subject: rpms/ctapi-cyberjack/devel .cvsignore, 1.13,
	1.14 ctapi-cyberjack.spec, 1.33, 1.34 sources, 1.13, 1.14
Message-ID: <200709171832.l8HIWnex007135@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7076

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Jul 2007 06:54:50 -0000	1.13
+++ .cvsignore	17 Sep 2007 18:32:17 -0000	1.14
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ctapi-cyberjack.spec	6 Aug 2007 17:48:26 -0000	1.33
+++ ctapi-cyberjack.spec	17 Sep 2007 18:32:17 -0000	1.34
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Jul 2007 06:54:50 -0000	1.13
+++ sources	17 Sep 2007 18:32:17 -0000	1.14
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:34:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:34:40 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.51, 1.52 gnome-vfs2.spec, 1.165,
	1.166 sources, 1.53, 1.54
Message-ID: <200709171834.l8HIYefg007230@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7188

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	3 Sep 2007 04:26:21 -0000	1.51
+++ .cvsignore	17 Sep 2007 18:34:07 -0000	1.52
@@ -1 +1 @@
-gnome-vfs-2.19.91.tar.bz2
+gnome-vfs-2.20.0.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-vfs2.spec	13 Sep 2007 03:11:15 -0000	1.165
+++ gnome-vfs2.spec	17 Sep 2007 18:34:07 -0000	1.166
@@ -13,13 +13,13 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.19.91
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
 Group: System Environment/Libraries
-Source0: http://download.gnome.org/source/gnome-vfs/2.19/gnome-vfs-%{version}.tar.bz2
+Source0: http://download.gnome.org/source/gnome-vfs/2.20/gnome-vfs-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
@@ -229,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-2
 - Fix a small memory leak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	3 Sep 2007 04:26:21 -0000	1.53
+++ sources	17 Sep 2007 18:34:07 -0000	1.54
@@ -1 +1 @@
-6a08abf1f6f0188d7f4ae1e21a9b9551  gnome-vfs-2.19.91.tar.bz2
+b9fe0a066d0e693e74a000e55338235b  gnome-vfs-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:37:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:37:26 -0400
Subject: rpms/ctapi-cyberjack/FC-6 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709171837.l8HIbQji007346@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7309

Modified Files:
	.cvsignore sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jul 2007 06:59:35 -0000	1.10
+++ .cvsignore	17 Sep 2007 18:36:53 -0000	1.11
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Jul 2007 06:59:35 -0000	1.10
+++ sources	17 Sep 2007 18:36:53 -0000	1.11
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:38:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 14:38:16 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.25,1.26
Message-ID: <200709171838.l8HIcGRK007396@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7359

Modified Files:
	xulrunner.spec 
Log Message:
Fix some paths


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xulrunner.spec	17 Sep 2007 16:21:44 -0000	1.25
+++ xulrunner.spec	17 Sep 2007 18:37:44 -0000	1.26
@@ -1,11 +1,11 @@
 %define nss_version 3.10
 %define cairo_version 1.3.12
-%define prerelease a6pre
+%define prerelease a6
 
 Summary:        XUL Runner
 Name:           xulrunner
 Version:        1.9
-Release:        0.9.%{?dist}
+Release:        0.9.%{prerelease}%{?dist}
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -59,7 +59,7 @@
 XUL Runner devel is...
 
 %prep
-%setup -q -n xulrunner-%{version}
+%setup -q -n xulrunner-%{version}%{prerelease}
 
 %patch1 -p0 -b .no-native-theme
 %patch2 -p0 -b .dpi



From fedora-extras-commits at redhat.com  Mon Sep 17 18:38:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:38:51 -0400
Subject: rpms/ctapi-cyberjack/FC-6 ctapi-cyberjack.spec,1.29,1.30
Message-ID: <200709171838.l8HIcp2m007474@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393

Modified Files:
	ctapi-cyberjack.spec 
Log Message:
add the right spec file:)



Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/ctapi-cyberjack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ctapi-cyberjack.spec	6 Aug 2007 17:50:30 -0000	1.29
+++ ctapi-cyberjack.spec	17 Sep 2007 18:38:18 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 



From fedora-extras-commits at redhat.com  Mon Sep 17 18:39:15 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 14:39:15 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.19,1.20
Message-ID: <200709171839.l8HIdFf5007523@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7422

Modified Files:
	rpcbind.spec 
Log Message:
Added tcp_wrappers-devel to BuildReq.



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpcbind.spec	15 Sep 2007 17:28:20 -0000	1.19
+++ rpcbind.spec	17 Sep 2007 18:38:43 -0000	1.20
@@ -16,7 +16,7 @@
 Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
-BuildRequires: libtirpc-devel quota
+BuildRequires: libtirpc-devel, quota, tcp_wrappers-devel
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(post): /sbin/chkconfig



From fedora-extras-commits at redhat.com  Mon Sep 17 18:39:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:39:50 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.31, 1.32 gnome-keyring.spec, 
	1.54, 1.55 sources, 1.31, 1.32
Message-ID: <200709171839.l8HIdosp007588@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7521

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Sep 2007 05:07:06 -0000	1.31
+++ .cvsignore	17 Sep 2007 18:39:17 -0000	1.32
@@ -1 +1 @@
-gnome-keyring-2.19.91.tar.bz2
+gnome-keyring-2.20.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-keyring.spec	4 Sep 2007 05:07:06 -0000	1.54
+++ gnome-keyring.spec	17 Sep 2007 18:39:17 -0000	1.55
@@ -2,11 +2,11 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Sep 2007 05:07:06 -0000	1.31
+++ sources	17 Sep 2007 18:39:17 -0000	1.32
@@ -1 +1 @@
-31859dc08b8034fe95a32d461904ce52  gnome-keyring-2.19.91.tar.bz2
+f37c71974323cc79f59e274d97110047  gnome-keyring-2.20.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:40:40 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 14:40:40 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.21,1.22
Message-ID: <200709171840.l8HIeeQb007659@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7594

Modified Files:
	rpcbind.spec 
Log Message:
Added tcp_wrappers-devel to BuildReq



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rpcbind.spec	15 Sep 2007 17:27:56 -0000	1.21
+++ rpcbind.spec	17 Sep 2007 18:40:08 -0000	1.22
@@ -16,7 +16,7 @@
 Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
-BuildRequires: libtirpc-devel quota
+BuildRequires: libtirpc-devel, quota, tcp_wrappers-devel
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel 
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel 
 Requires(post): /sbin/chkconfig



From fedora-extras-commits at redhat.com  Mon Sep 17 18:42:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:42:07 -0400
Subject: rpms/ctapi-cyberjack/F-7 .cvsignore, 1.11, 1.12 ctapi-cyberjack.spec,
	1.30, 1.31 sources, 1.11, 1.12
Message-ID: <200709171842.l8HIg7bB007754@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7722

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Jul 2007 07:01:51 -0000	1.11
+++ .cvsignore	17 Sep 2007 18:41:34 -0000	1.12
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/ctapi-cyberjack.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ctapi-cyberjack.spec	6 Aug 2007 17:52:24 -0000	1.30
+++ ctapi-cyberjack.spec	17 Sep 2007 18:41:34 -0000	1.31
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jul 2007 07:01:51 -0000	1.11
+++ sources	17 Sep 2007 18:41:34 -0000	1.12
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:44:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:44:48 -0400
Subject: rpms/evince/devel .cvsignore, 1.37, 1.38 evince.spec, 1.92,
	1.93 sources, 1.36, 1.37
Message-ID: <200709171844.l8HIimAp007884@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7829

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	4 Sep 2007 16:41:10 -0000	1.37
+++ .cvsignore	17 Sep 2007 18:44:15 -0000	1.38
@@ -1 +1 @@
-evince-2.19.92.tar.bz2
+evince-2.20.0.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- evince.spec	4 Sep 2007 16:41:10 -0000	1.92
+++ evince.spec	17 Sep 2007 18:44:15 -0000	1.93
@@ -4,14 +4,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.19.92
+Version:	2.20.0
 Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
 Group:		Applications/Publishing
 URL:		http://www.gnome.org/projects/evince/
-Source0: 	http://download.gnome.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2
+Source0: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 Patch0:		evince-0.6.0-print-error.patch
 #Patch1:		evince-0.9.0-comics-compile-fixes.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
 - Update to 2.19.92.  Evince now follows GNOME version numbers.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 16:41:10 -0000	1.36
+++ sources	17 Sep 2007 18:44:15 -0000	1.37
@@ -1 +1 @@
-274db35fee7c46b7d081e1ae86f495c2  evince-2.19.92.tar.bz2
+f9414b4dbfdff9a8f7f2f146a351e05a  evince-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:44:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:44:59 -0400
Subject: rpms/ctapi-cyberjack/EL-5 .cvsignore, 1.10,
	1.11 ctapi-cyberjack.spec, 1.28, 1.29 sources, 1.10, 1.11
Message-ID: <200709171844.l8HIixOo007889@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7836

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jul 2007 07:04:13 -0000	1.10
+++ .cvsignore	17 Sep 2007 18:44:27 -0000	1.11
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/ctapi-cyberjack.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ctapi-cyberjack.spec	6 Aug 2007 17:54:17 -0000	1.28
+++ ctapi-cyberjack.spec	17 Sep 2007 18:44:27 -0000	1.29
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Jul 2007 07:04:13 -0000	1.10
+++ sources	17 Sep 2007 18:44:27 -0000	1.11
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:47:14 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:47:14 -0400
Subject: rpms/ctapi-cyberjack/EL-4 .cvsignore, 1.11,
	1.12 ctapi-cyberjack.spec, 1.29, 1.30 sources, 1.11, 1.12
Message-ID: <200709171847.l8HIlEDI009378@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8388

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Jul 2007 07:06:19 -0000	1.11
+++ .cvsignore	17 Sep 2007 18:46:41 -0000	1.12
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/ctapi-cyberjack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ctapi-cyberjack.spec	6 Aug 2007 17:56:45 -0000	1.29
+++ ctapi-cyberjack.spec	17 Sep 2007 18:46:41 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jul 2007 07:06:19 -0000	1.11
+++ sources	17 Sep 2007 18:46:41 -0000	1.12
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:51:14 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 14:51:14 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.26,1.27
Message-ID: <200709171851.l8HIpEsk010964@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330

Modified Files:
	xulrunner.spec 
Log Message:
fix source


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xulrunner.spec	17 Sep 2007 18:37:44 -0000	1.26
+++ xulrunner.spec	17 Sep 2007 18:50:41 -0000	1.27
@@ -9,7 +9,7 @@
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}.tar.bz2
+Source0:        xulrunner-%{version}%{prerelease}.tar.bz2
 Source10:       xulrunner-mozconfig
 Source12:       xulrunner-olpc-default-prefs.js
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:01:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:01:54 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.100,1.101
Message-ID: <200709171901.l8HJ1sro018770@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913

Modified Files:
	libgnome.spec 
Log Message:
don't ship backgrounds in libgnome



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- libgnome.spec	17 Sep 2007 18:06:08 -0000	1.100
+++ libgnome.spec	17 Sep 2007 19:01:15 -0000	1.101
@@ -137,6 +137,10 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnome2
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=477846
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 %find_lang %{po_package}
 
 %clean



From fedora-extras-commits at redhat.com  Mon Sep 17 19:03:07 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 17 Sep 2007 15:03:07 -0400
Subject: rpms/httpd/devel httpd-2.2.6-ssllibver.patch, NONE, 1.1 httpd.conf, 
	1.24, 1.25 httpd.spec, 1.115, 1.116 index.html, 1.24,
	1.25 powered_by_fedora.png, 1.2, NONE
Message-ID: <200709171903.l8HJ37mf018868@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18804

Modified Files:
	httpd.conf httpd.spec index.html 
Added Files:
	httpd-2.2.6-ssllibver.patch 
Removed Files:
	powered_by_fedora.png 
Log Message:
* Mon Sep 17 2007 Joe Orton <jorton at redhat.com> 2.2.6-3
- add fix for SSL library string regression (PR 43334)
- use powered-by logo from system-logos (#250676)
- preserve timestamps for installed config files


httpd-2.2.6-ssllibver.patch:

--- NEW FILE httpd-2.2.6-ssllibver.patch ---
--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_private.h
@@ -648,7 +648,7 @@ void         ssl_die(void);
 void         ssl_log_ssl_error(const char *, int, int, server_rec *);
 
 /**  Variables  */
-void         ssl_var_register(void);
+void         ssl_var_register(apr_pool_t *p);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
 
--- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
+++ httpd-2.2.6/modules/ssl/mod_ssl.c
@@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
     ap_hook_insert_filter (ssl_hook_Insert_Filter, NULL,NULL, APR_HOOK_MIDDLE);
 /*    ap_hook_handler       (ssl_hook_Upgrade,       NULL,NULL, APR_HOOK_MIDDLE); */
 
-    ssl_var_register();
+    ssl_var_register(p);
 
     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
--- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
@@ -58,12 +58,30 @@ static int ssl_is_https(conn_rec *c)
     return sslconn && sslconn->ssl;
 }
 
-void ssl_var_register(void)
+static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
+static char var_library_interface[] = SSL_LIBRARY_TEXT;
+static char *var_library = NULL;
+
+void ssl_var_register(apr_pool_t *p)
 {
     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
     APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
-    return;
+
+    /* Perform once-per-process library version determination: */
+    var_library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
+    
+    if ((cp = strchr(var_library, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+                *cp2 = NUL;
+    }
+
+    if ((cp = strchr(var_library_interface, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+            *cp2 = NUL;
+    }
 }
 
 /* This function must remain safe to use for a non-SSL connection. */
@@ -635,34 +653,14 @@ static void ssl_var_lookup_ssl_cipher_bi
 
 static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
 {
-    static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
-    static char library_interface[] = SSL_LIBRARY_TEXT;
-    static char *library = NULL;
-    char *result;
-  
-    if (!library) {
-        char *cp, *cp2;
-        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-        if ((cp = strchr(library, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-        if ((cp = strchr(library_interface, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-    }
-
     if (strEQ(var, "INTERFACE")) {
-        result = apr_pstrdup(p, interface);
+        result = apr_pstrdup(p, var_interface);
     }
     else if (strEQ(var, "LIBRARY_INTERFACE")) {
-        result = apr_pstrdup(p, library_interface);
+        result = apr_pstrdup(p, var_library_interface);
     }
     else if (strEQ(var, "LIBRARY")) {
-        result = apr_pstrdup(p, library);
+        result = apr_pstrdup(p, var_library);
     }
     else {
         result = NULL;


Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- httpd.conf	3 Feb 2006 10:06:08 -0000	1.24
+++ httpd.conf	17 Sep 2007 19:02:35 -0000	1.25
@@ -538,7 +538,7 @@
 Alias /icons/ "/var/www/icons/"
 
 <Directory "/var/www/icons">
-    Options Indexes MultiViews
+    Options Indexes MultiViews FollowSymLinks
     AllowOverride None
     Order allow,deny
     Allow from all


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- httpd.spec	7 Sep 2007 18:48:27 -0000	1.115
+++ httpd.spec	17 Sep 2007 19:02:35 -0000	1.116
@@ -6,14 +6,13 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.6
-Release: 2
+Release: 3
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
 Source3: httpd.logrotate
 Source4: httpd.init
 Source5: httpd.sysconf
-Source7: powered_by_fedora.png
 Source10: httpd.conf
 Source11: ssl.conf
 Source12: welcome.conf
@@ -37,13 +36,14 @@
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
 Patch55: httpd-2.2.4-oldflush.patch
+Patch56: httpd-2.2.6-ssllibver.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, pkgconfig, findutils, ed
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36, /etc/mime.types
+Requires: initscripts >= 8.36, /etc/mime.types, system-logos >= 7.92.1-1
 Obsoletes: httpd-suexec
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
@@ -124,6 +124,7 @@
 
 %patch54 -p1 -b .authnoprov
 %patch55 -p1 -b .oldflush
+%patch56 -p1 -b .ssllibver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -226,15 +227,16 @@
 install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
 for f in ssl.conf welcome.conf manual.conf proxy_ajp.conf; do
-  install -m 644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
+  install -m 644 -p $RPM_SOURCE_DIR/$f \
+        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
 done
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
-install -m 644 $RPM_SOURCE_DIR/httpd.conf \
+install -m -p 644 $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 $RPM_SOURCE_DIR/httpd.sysconf \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.sysconf \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/httpd
 
 # for holding mod_dav lock database
@@ -256,8 +258,7 @@
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
-install -m 644 $RPM_SOURCE_DIR/index.html \
-	$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
+install -m 644 noindex.html $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 
 # remove manual sources
 find $RPM_BUILD_ROOT%{contentdir}/manual \( \
@@ -274,8 +275,9 @@
 done
 set -x
 
-install -m 644 $RPM_SOURCE_DIR/powered_by_fedora.png \
-	$RPM_BUILD_ROOT%{contentdir}/icons
+# Symlink for the powered-by-$DISTRO image:
+ln -s ../../..%{_datadir}/pixmaps/poweredby.png \
+        $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
 
 # logs
 rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
@@ -293,7 +295,7 @@
 
 # install log rotation stuff
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m644 $RPM_SOURCE_DIR/httpd.logrotate \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
 	$RPM_BUILD_ROOT/etc/logrotate.d/httpd
 
 # fix man page paths
@@ -476,6 +478,11 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Sep 17 2007 Joe Orton <jorton at redhat.com> 2.2.6-3
+- add fix for SSL library string regression (PR 43334)
+- use powered-by logo from system-logos (#250676)
+- preserve timestamps for installed config files
+
 * Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
 - update to 2.2.6 (#250757, #282761)
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/index.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- index.html	9 May 2007 10:18:59 -0000	1.24
+++ index.html	17 Sep 2007 19:02:35 -0000	1.25
@@ -115,7 +115,7 @@
 					<div class="logos">
 						<p>You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!</p>
 
-						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
+						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/poweredby.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
 					</div>
 				</div>
 			</div>



From fedora-extras-commits at redhat.com  Mon Sep 17 19:10:19 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 17 Sep 2007 15:10:19 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-edd.patch,1.1,1.2
Message-ID: <200709171910.l8HJAJ1A019088@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19067

Modified Files:
	linux-2.6-x86-debug-edd.patch 
Log Message:
Better EDD debugging


linux-2.6-x86-debug-edd.patch:

Index: linux-2.6-x86-debug-edd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-debug-edd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-debug-edd.patch	14 Sep 2007 16:23:47 -0000	1.1
+++ linux-2.6-x86-debug-edd.patch	17 Sep 2007 19:10:14 -0000	1.2
@@ -1,14 +1,62 @@
----
- arch/i386/boot/edd.c |    1 +
- 1 file changed, 1 insertion(+)
-
 --- linux-2.6.22.noarch.orig/arch/i386/boot/edd.c
 +++ linux-2.6.22.noarch/arch/i386/boot/edd.c
-@@ -151,6 +151,7 @@ void query_edd(void)
- 		 * Scan the BIOS-supported hard disks and query EDD
- 		 * information...
- 		 */
-+		putchar('0' + (devno - 0x80) % 10);
- 		get_edd_info(devno, &ei);
+@@ -26,6 +26,7 @@ static int read_mbr(u8 devno, void *buf)
+ {
+ 	u16 ax, bx, cx, dx;
  
- 		if (boot_params.eddbuf_entries < EDDMAXNR) {
++	printf("Calling Int 13 Fn 0x0201 with buffer @%x ...\n", buf);
+ 	ax = 0x0201;		/* Legacy Read, one sector */
+ 	cx = 0x0001;		/* Sector 0-0-1 */
+ 	dx = devno;
+@@ -33,6 +34,7 @@ static int read_mbr(u8 devno, void *buf)
+ 	asm volatile("pushfl; stc; int $0x13; setc %%al; popfl"
+ 		     : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
+ 		     : : "esi", "edi", "memory");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x\n", ax, bx, cx, dx);
+ 
+ 	return -(u8)ax;		/* 0 or -1 */
+ }
+@@ -75,12 +77,14 @@ static int get_edd_info(u8 devno, struct
+ 
+ 	/* Check Extensions Present */
+ 
++	printf("\nDevice %x: calling Int 13 Fn 0x4100 ...\n", dx);
+ 	ax = 0x4100;
+ 	bx = EDDMAGIC1;
+ 	dx = devno;
+ 	asm("pushfl; stc; int $0x13; setc %%al; popfl"
+ 	    : "+a" (ax), "+b" (bx), "=c" (cx), "+d" (dx)
+ 	    : : "esi", "edi");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x\n", ax, bx, cx, dx);
+ 
+ 	if ((u8)ax)
+ 		return -1;	/* No extended information */
+@@ -94,6 +98,7 @@ static int get_edd_info(u8 devno, struct
+ 
+ 	/* Extended Get Device Parameters */
+ 
++	printf("Calling Int 13 Fn 0x4800 with buffer @%x ...\n", &ei->params);
+ 	ei->params.length = sizeof(ei->params);
+ 	ax = 0x4800;
+ 	dx = devno;
+@@ -101,10 +106,12 @@ static int get_edd_info(u8 devno, struct
+ 	    : "+a" (ax), "+d" (dx), "=m" (ei->params)
+ 	    : "S" (&ei->params)
+ 	    : "ebx", "ecx", "edi");
++	printf(" result: ax=%x dx=%x\n", ax, dx);
+ 
+ 	/* Get legacy CHS parameters */
+ 
+ 	/* Ralf Brown recommends setting ES:DI to 0:0 */
++	printf("Calling Int 13 Fn 0x0800 ...\n");
+ 	ax = 0x0800;
+ 	dx = devno;
+ 	di = 0;
+@@ -114,6 +121,7 @@ static int get_edd_info(u8 devno, struct
+ 	    "popw %%es"
+ 	    : "+a" (ax), "=b" (bx), "=c" (cx), "+d" (dx), "+D" (di)
+ 	    : : "esi");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x di=%x\n", ax, bx, cx, dx, di);
+ 
+ 	if ((u8)ax == 0) {
+ 		ei->legacy_max_cylinder = (cx >> 8) + ((cx & 0xc0) << 2);



From fedora-extras-commits at redhat.com  Mon Sep 17 19:10:52 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:10:52 -0400
Subject: comps/po ne.po,NONE,1.1 pt_BR.po,1.6,1.7
Message-ID: <200709171910.l8HJAqOD019110@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19020

Modified Files:
	pt_BR.po 
Added Files:
	ne.po 
Log Message:
add ne.po, refresh-po



--- NEW FILE ne.po ---
# translation of ne.po to Nepali
# Nabin Gautam <nabin at mpp.org.np>, 2007.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
msgid ""
msgstr ""
"Project-Id-Version: ne\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-05 02:14-0400\n"
"PO-Revision-Date: 2007-08-16 16:07+0545\n"
"Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
"Language-Team: Nepali <info at mpp.org.np>\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"
"\n"
"\n"
"\n"
"X-Generator: KBabel 1.11.4\n"

#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
#: ../comps-f8.xml.in.h:1
msgid "A lightweight desktop environment that works well on low end machines."
msgstr "??????????????? ?????????????????? ???????????? ????????????????????? ??????????????????????????? ??????????????? ??????????????? ??????????????? ????????????????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
msgid "Administration Tools"
msgstr "????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
msgid "Applications"
msgstr "???????????????????????????"

#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
#: ../comps-el5.xml.in.h:3
msgid "Applications for a variety of tasks"
msgstr "????????????????????? ??????????????????????????? ???????????? ???????????????????????????"

#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
msgid "Arabic Support"
msgstr "???????????? ??????????????????"

#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
msgid "Armenian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
msgid "Authoring and Publishing"
msgstr "???????????? ????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
msgid "Base System"
msgstr "???????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
msgid "Desktop Environments"
msgstr "????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
msgid "Desktop environments"
msgstr "????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
msgid "Development"
msgstr "???????????????"

#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
msgid "Development Tools"
msgstr "??????????????? ???????????????"

#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
#: ../comps-el5.xml.in.h:13
msgid "Dialup Networking Support"
msgstr "?????????????????? ?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
msgid "Editors"
msgstr "?????????????????????"

#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
msgid "Educational Software"
msgstr "????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
msgid "Educational software for learning"
msgstr "???????????????????????? ???????????? ????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
msgid "Engineering and Scientific"
msgstr "????????????????????????????????? ??? ???????????????????????????"

#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
msgid "FTP Server"
msgstr "FTP ???????????????"

#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51
#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
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 ""
"???????????? ???????????????????????? ???????????? ??????????????? ???????????? ??? ????????????????????????????????? ???????????? ???????????? ????????????, ?????? ????????????????????? ?????????????????? ??????????????????????????? "
"???????????????????????? ??????????????? ??? ??????????????????????????? ??????????????? ???????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
msgid "GNOME Desktop Environment"
msgstr "??????????????? ????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53
#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
msgid "GNOME Software Development"
msgstr "??????????????? ???????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21
#: ../comps-el5.xml.in.h:22
msgid ""
"GNOME is a powerful, graphical user interface which includes a panel, "
"desktop, system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57
#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23
msgid "Games and Entertainment"
msgstr "????????? ??? ????????????????????????"

#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60
#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
msgid "Graphical Internet"
msgstr "???????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61
#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
msgid "Graphics"
msgstr "???????????????????????????"

#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64
#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
msgid "Hardware Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
#: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
msgid "Hebrew Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70
#: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
msgid ""
"Install these packages in order to develop GTK+ and GNOME graphical "
"applications."
msgstr "GTK+ ??? ??????????????? ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
#: ../comps-f8.xml.in.h:74
msgid ""
"Install these packages in order to develop GTK+ and XFCE graphical "
"applications."
msgstr "GTK+ ??? XFCE ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
#: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
msgid "Install these packages to develop QT and KDE graphical applications."
msgstr "?????????????????? ??? ??????????????? ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
#: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
msgid ""
"Install this group of packages to use the base graphical (X) user interface."
msgstr ""
"???????????? ???????????????????????? (X) ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ?????? ??????????????????????????? ???????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
#: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
msgid "Japanese Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83
#: ../comps-el4.xml.in.h:30
msgid "Java"
msgstr "????????????"

#: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84
#: ../comps-el4.xml.in.h:31
msgid "Java Development"
msgstr "???????????? ???????????????"

#: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
#: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
msgid "KDE (K Desktop Environment)"
msgstr "??????????????? (??????????????? ????????????????????? ??????????????????)"

#: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
#: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
msgid "KDE Software Development"
msgstr "??????????????? ???????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34
#: ../comps-el5.xml.in.h:34
msgid ""
"KDE is a powerful, graphical user interface which includes a panel, desktop, "
"system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94
#: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
msgid "Mail Server"
msgstr "???????????? ???????????????"

#: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100
#: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
msgid "Network Servers"
msgstr "?????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101
#: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
msgid "News Server"
msgstr "?????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104
#: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
msgid "Office/Productivity"
msgstr "????????????????????????/??????????????????????????????"

#: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106
#: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
msgid ""
"Packages which provide functionality for developing and building "
"applications."
msgstr "??????????????????????????? ??????????????? ???????????? ??? ????????????????????? ???????????? ???????????????????????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:43 ../comps-fe6.xml.in.h:42 ../comps-f7.xml.in.h:119
#: ../comps-f8.xml.in.h:128 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
msgid "Servers"
msgstr "???????????????"

#: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
#: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
msgid ""
"Simple window managers that aren't part of a larger desktop environment."
msgstr "???????????? ????????????????????? ???????????????????????? ????????? ??????????????? ????????????????????? ???????????????????????? ???????????????????????? ???"

#: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
#: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
msgid "Software used for running network servers"
msgstr "?????????????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:46 ../comps-fe6.xml.in.h:45 ../comps-el4.xml.in.h:43
#: ../comps-el5.xml.in.h:43
msgid ""
"Sometimes called text editors, these are programs that allow you to create "
"and edit files. These include Emacs and Vi."
msgstr ""
"?????????????????????????????? ?????? ?????????????????? ????????? ?????????????????????, ???????????????????????? ???????????? ????????????????????? ???????????? ??? ????????????????????? ???????????? ?????????????????? "
"???????????? ??????????????????????????? ???????????? ??? ??????????????????????????? ?????????????????? ??? Vi ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128
#: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
msgid "Sound and Video"
msgstr "??????????????? ??? ??????????????????"

#: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
#: ../comps-el4.xml.in.h:45
msgid "Support for developing programs in the Java programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
#: ../comps-el4.xml.in.h:46
msgid "Support for running programs written in the Java programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ????????????????????? ??????????????????????????? ????????????????????? ???????????? ?????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136
#: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45
msgid "System Tools"
msgstr "????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140
#: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
msgid "Text-based Internet"
msgstr "?????????-?????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49
#: ../comps-el5.xml.in.h:47
msgid "The XEmacs text editor."
msgstr "???????????? ?????????????????? ????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143
#: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
msgid "The applications include office suites, PDF viewers, and more."
msgstr "?????? ????????????????????????????????? ???????????? ?????????, PDF ??????????????? ??? ????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
#: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
msgid "These packages allow you to configure an IMAP or SMTP mail server."
msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
#: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
msgid ""
"These packages are helpful when developing web applications or web pages."
msgstr "?????? ????????????????????? ????????? ??????????????????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
#: ../comps-el5.xml.in.h:51
msgid ""
"These tools allow you to create documentation in the DocBook format and "
"convert them to HTML, PDF, Postscript, and text."
msgstr ""
"?????? ????????????????????? ???????????????????????? DocBook ????????????????????? ??????????????????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ??? "
"?????????????????????????????? ????????????????????????, ??????????????????, ??????????????????????????????????????????, ??? ??????????????? ??????????????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
#: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
msgid "These tools allow you to run a Web server on the system."
msgstr "?????? ????????????????????? ???????????????????????? ??????????????????????????? ????????? ??????????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
#: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
msgid "These tools allow you to run an FTP server on the system."
msgstr "?????? ????????????????????? ???????????????????????? ??????????????????????????? FTP ??????????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
#: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
msgid ""
"These tools include core development tools such as automake, gcc, perl, "
"python, and debuggers."
msgstr ""
"?????? ????????????????????? ??????????????????, gcc, ????????????, ??????????????????, ??? ?????????????????????????????? ??????????????? ??????????????? ??????????????? ??????????????? ?????????????????? "
"????????????????????? ???"

#: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
#: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
msgid "This group allows you to configure the system as a news server."
msgstr "?????? ?????????????????? ???????????????????????? ????????????????????? ???????????? ????????????????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
#: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
msgid "This group includes graphical email, Web, and chat clients."
msgstr "?????? ?????????????????? ???????????????????????? ????????????, ?????????, ??? ??????????????? ???????????????????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
#: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
msgid ""
"This group includes packages for performing mathematical and scientific "
"computations and plotting, as well as unit conversion."
msgstr ""
"?????? ?????????????????? ?????????????????? ??? ??????????????????????????? ???????????? ??? ??????????????????, ????????????????????? ???????????? ????????????????????????????????? ???????????? ????????????????????? ?????????????????? "
"??????????????? ???"

#: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
#: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
msgid "This group includes packages to help you manipulate and scan images."
msgstr "?????? ?????????????????? ???????????????????????? ????????? ????????????????????????????????? ??? ????????????????????? ???????????? ??????????????? ??????????????? ????????????????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
#: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
msgid ""
"This group includes text-based email, Web, and chat clients. These "
"applications do not require the X Window System."
msgstr ""
"?????? ?????????????????? ??????????????? ?????????????????? ????????????, ????????? ??? ??????????????? ???????????????????????? ?????????????????? ??????????????? ??? ?????? ???????????????????????????????????? X "
"???????????????????????? ????????????????????? ?????????????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
#: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
msgid ""
"This group is a collection of graphical administration tools for the system, "
"such as for managing user accounts and configuring system hardware."
msgstr ""
"?????? ????????????, ????????????????????????????????? ???????????? ????????????????????? ??????????????? ??? ????????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ??????????????????????????? "
"???????????? ???????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
#: ../comps-el5.xml.in.h:61
#, fuzzy
msgid "This group is a collection of network servers for specific purposes"
msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
#: ../comps-el5.xml.in.h:62
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Arabic environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
#: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
msgid ""
"This group is a collection of tools and resources of Armenian environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
#: ../comps-el5.xml.in.h:65
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Hebrew environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
#: ../comps-el5.xml.in.h:66
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Japanese environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
#: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
msgid ""
"This group is a collection of tools for various hardware specific utilities."
msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
#: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
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 ""
"?????? ????????????, ????????????????????????????????? SMB ?????????????????????????????? ???????????? ??????????????? ??? ?????????????????? ????????????????????? ?????????????????? ??????????????? ??????????????? ??????????????? "
"??????????????????????????? ???????????? ????????????????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179
#: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
msgid "Various core pieces of the system."
msgstr "??????????????????????????? ????????????????????? ????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
#: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
msgid "Various ways to relax and spend your free time."
msgstr "??????????????? ??????????????? ??? ????????????????????? ?????????????????? ????????? ????????????????????? ????????????????????? ???????????????????????? ???"

#: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
#: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
msgid "Web Development"
msgstr "????????? ???????????????"

#: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
#: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
msgid "Web Server"
msgstr "????????? ???????????????"

#: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187
#: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
msgid "Window Managers"
msgstr "???????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
#: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
msgid "X Window System"
msgstr "X ???????????????????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75
#: ../comps-el5.xml.in.h:75
msgid "XEmacs"
msgstr "X ??????????????????"

#: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
#: ../comps-f8.xml.in.h:199
msgid "XFCE"
msgstr "XFCE"

#: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192
#: ../comps-f8.xml.in.h:200
msgid "XFCE Software Development"
msgstr "XFCE ???????????????????????? ???????????????"

#: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29
#: ../comps-el5.xml.in.h:8
msgid "Czech Support"
msgstr "????????? ??????????????????"

#: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Czech environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
msgid "Afrikaans Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
#, fuzzy
msgid "Albanian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
msgid "Applications to perform a variety of tasks"
msgstr "????????????????????? ????????????????????? ????????????????????? ??????????????? ???????????????????????????"

#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9
msgid "Assamese Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11
msgid "Base"
msgstr "????????????"

#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13
msgid "Basic support for the Ruby programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ???????????? ????????????????????? ?????????????????? ???"

#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14
msgid "Basque Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
#, fuzzy
msgid "Belarusian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
msgid "Bengali Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
#, fuzzy
msgid "Bhutanese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
#, fuzzy
msgid "Bosnian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
msgid "Brazilian Portuguese Support"
msgstr "?????????????????????????????? ?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
msgid "Breton Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22
msgid "Bulgarian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23
msgid "Catalan Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24
msgid "Chinese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25
msgid "Clustering"
msgstr "?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26
msgid "Clustering Support"
msgstr "?????????????????? ?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27
msgid "Core"
msgstr "?????????"

#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28
msgid "Croatian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
msgid "DNS Name Server"
msgstr "DNS ????????? ???????????????"

#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
msgid "Danish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35
msgid "Development Libraries"
msgstr "??????????????? ???????????????????????????"

#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37
msgid "Dial-up Networking Support"
msgstr "????????????-?????? ??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38
msgid "Dutch Support"
msgstr "?????? ??????????????????"

#: ../comps-f7.xml.in.h:38
msgid "Eclipse"
msgstr "????????????????????????"

#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43
msgid "English (UK) Support"
msgstr "??????????????????????????? (?????????????????????) ??????????????????"

#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44
msgid "Estonian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45
msgid "Ethiopic Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47
msgid "Faeroese Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
#, fuzzy
msgid "Filipino Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
msgid "Finnish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53
msgid "French Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57
msgid ""
"GNOME is a powerful graphical user interface which includes a panel, "
"desktop, system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????? "
"??????????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58
msgid "Gaelic Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59
msgid "Galician Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
#, fuzzy
msgid "Georgian Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
msgid "German Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65
msgid "Greek Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66
msgid "Gujarati Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69
msgid "Hindi Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70
msgid "Hungarian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71
msgid "Icelandic Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72
msgid "Indonesian Support"
msgstr "??????????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
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:79
#, fuzzy
msgid "Inuktitut Support"
msgstr "???????????? ??????????????????"

#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
msgid "Irish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81
msgid "Italian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87
msgid ""
"KDE is a powerful graphical user interface which includes a panel, desktop, "
"system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88
msgid "Kannada Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
#, fuzzy
msgid "Khmer Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
msgid "Korean Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91
msgid "Languages"
msgstr "????????????"

#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
#, fuzzy
msgid "Lao Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
#, fuzzy
msgid "Latvian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
msgid "Legacy Network Server"
msgstr "?????????????????? ?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96
msgid "Legacy Software Development"
msgstr "?????????????????? ???????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97
msgid "Legacy Software Support"
msgstr "?????????????????? ???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98
msgid "Lithuanian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101
msgid "Malay Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102
msgid "Malayalam Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
#, fuzzy
msgid "Maori Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
msgid "Marathi Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106
msgid "MySQL Database"
msgstr "MySQL ?????????????????????"

#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110
msgid "Northern Sotho Support"
msgstr "?????????????????? ???????????? ??????????????????"

#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111
msgid "Norwegian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114
msgid "Oriya Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
#, fuzzy
msgid "Persian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
msgid "Polish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118
msgid "Portuguese Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119
msgid "PostgreSQL Database"
msgstr "??????????????????????????? SQL ?????????????????????"

#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120
msgid "Printing Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121
msgid "Punjabi Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122
msgid "Romanian Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123
msgid "Ruby"
msgstr "????????????"

#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124
msgid "Russian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
#, fuzzy
msgid "Samoan Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
msgid "Serbian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127
msgid "Server Configuration Tools"
msgstr "??????????????? ?????????????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130
msgid "Sinhala Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131
msgid "Slovak Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132
msgid "Slovenian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133
msgid "Smallest possible installation"
msgstr "???????????????????????? ???????????????????????? ???????????? ?????????????????????"

#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
#, fuzzy
msgid "Somali Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
msgid ""
"Sometimes called text editors, these are programs that allow you to create "
"and edit text files. This includes Emacs and Vi."
msgstr ""
"?????? ??????????????????????????? ???????????????????????? ????????? ???????????? ????????????????????? ???????????? ??? ????????????????????? ???????????? ?????????????????? ????????????, ??????????????????????????? ?????? "
"??????????????? ????????? ????????????????????? ???????????? ??? ???????????? ?????????????????? ??? Vi ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138
msgid "Southern Ndebele Support"
msgstr "????????????????????? ?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139
msgid "Southern Sotho Support"
msgstr "????????????????????? ???????????? ??????????????????"

#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140
msgid "Spanish Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143
msgid "Swati Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144
msgid "Swedish Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
#, fuzzy
msgid "Tagalog Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
msgid "Tamil Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148
msgid "Telugu Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150
msgid "Thai Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:142
msgid "The Eclipse Integrated Development Environment."
msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
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
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
msgid ""
"These packages include network-based servers such as DHCP, Kerberos and NIS."
msgstr "?????? ???????????????????????????????????? ?????????????????? ?????????????????? DHCP, ??????????????????????????? ??? NIS ??????????????? ??????????????? ???????????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
msgid ""
"These packages include servers for old network protocols such as rsh and "
"telnet."
msgstr ""
"?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
msgid "These packages provide a virtualization environment."
msgstr "?????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
msgid "These packages provide compatibility with previous releases."
msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
msgid ""
"These packages provide support for various locales including fonts and input "
"methods."
msgstr ""
"?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
msgid ""
"These tools allow you to create documents in the DocBook format and convert "
"them into HTML, PDF, Postscript, and text."
msgstr ""
"?????? ????????????????????? ???????????????????????? DocBook ????????????????????? ?????????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ??? ?????????????????????????????? "
"????????????????????????, ??????????????????, ??????????????????????????????????????????, ??? ??????????????? ??????????????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
msgid "This group contains all of Red Hat's custom server configuration tools."
msgstr "?????? ?????????????????? ????????? ????????? ????????????????????? ?????????????????? ??????????????? ?????????????????????????????? ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
msgid ""
"This group includes a minimal set of packages. Useful for creating small "
"router/firewall boxes, for example."
msgstr ""
"?????? ?????????????????? ??????????????????????????? ????????????????????? ????????? ???????????????????????? ??????????????? ??? ???????????????????????? ????????????, ???????????? ???????????????/????????????????????? "
"???????????? ????????????????????? ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
msgid ""
"This package group allows you to run a DNS name server (BIND) on the system."
msgstr "?????? ????????????????????? ?????????????????? ???????????????????????? ??????????????????????????? DNS ????????? ??????????????? (BIND) ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
msgid ""
"This package group allows you to share files between Linux and MS Windows"
"(tm) systems."
msgstr ""
"?????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ??? ????????????????????????????????? ?????????????????????(tm) ????????????????????? ??????????????? ???????????? ???????????????????????? "
"???????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178
msgid "This package group contains packages useful for use with MySQL."
msgstr "?????? ????????????????????? ?????????????????? MySQL ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
msgid "This package group includes packages useful for use with Postgresql."
msgstr ""
"?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
msgid "Tibetan Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
#, fuzzy
msgid "Tonga Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
msgid "Tsonga Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183
msgid "Tswana Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184
msgid "Turkish Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185
msgid "Ukrainian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
msgid "Urdu Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
msgid "Venda Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
#, fuzzy
msgid "Vietnamese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
msgid "Virtualization"
msgstr "???????????????????????????????????????"

#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194
msgid "Welsh Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196
msgid "Windows File Server"
msgstr "????????????????????? ???????????? ???????????????"

#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197
msgid "X Software Development"
msgstr "X ???????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201
msgid "Xhosa Support"
msgstr "???????????? ??????????????????"

#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202
msgid "Zulu Support"
msgstr "???????????? ??????????????????"

#: ../comps-f8.xml.in.h:21
msgid "Buildsystem building group"
msgstr ""

#: ../comps-f8.xml.in.h:48
#, fuzzy
msgid "Fedora Eclipse"
msgstr "????????????????????????"

#: ../comps-f8.xml.in.h:51
msgid "Fonts"
msgstr ""

#: ../comps-f8.xml.in.h:52
msgid "Fonts packages for rendering text on the desktop."
msgstr ""

#: ../comps-f8.xml.in.h:78
#, fuzzy
msgid "Integrated Development Environments based on Eclipse."
msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"

#: ../comps-f8.xml.in.h:94
msgid "Legacy Fonts"
msgstr ""

#: ../comps-f8.xml.in.h:99
#, fuzzy
msgid "Low Saxon Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:105
#, fuzzy
msgid "Mongolian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:107
#, fuzzy
msgid "Nepali Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:113
msgid "Older bitmap and vector fonts packages"
msgstr ""

#~ msgid "JBoss Enterprise Application Platform"
#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"

#~ msgid "Packages which comprise the JBoss Enterprise Application Platform"
#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ??????????????? ?????????????????????"

#~ msgid "Brazilian Support"
#~ msgstr "?????????????????????????????? ??????????????????"

#~ msgid "British Support"
#~ msgstr "????????????????????? ??????????????????"

#~ msgid "Compatibility Arch Development Support"
#~ msgstr "??????????????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "Compatibility Arch Mozilla Support"
#~ msgstr "??????????????????????????? ???????????? ?????????????????? ??????????????????"

#~ msgid "Compatibility Arch Support"
#~ msgstr "??????????????????????????? ???????????? ??????????????????"

#~ msgid "Cyrillic Support"
#~ msgstr "????????????????????? ??????????????????"

#~ msgid "Desktops"
#~ msgstr "?????????????????????"

#~ msgid "Emacs"
#~ msgstr "????????????????????????"

#~ msgid "GNOME"
#~ msgstr "???????????????"

#~ msgid "ISO8859-14 Support"
#~ msgstr "ISO8859-14 ??????????????????"

#~ msgid "ISO8859-15 Support"
#~ msgstr "ISO8859-15 ??????????????????"

#~ msgid "ISO8859-2 Support"
#~ msgstr "ISO8859-2 ??????????????????"

#~ msgid "ISO8859-9 Support"
#~ msgstr "ISO8859-9 ??????????????????"

#~ msgid "Install these packages to recompile the kernel."
#~ msgstr "?????????????????? ???????????? ????????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#~ msgid "KDE"
#~ msgstr "???????????????"

#~ msgid "KDE Desktop Environment"
#~ msgstr "??????????????? ????????????????????? ??????????????????"

#~ msgid "Kernel Development"
#~ msgstr "?????????????????? ???????????????"

#~ msgid "Miscellaneous Included Packages"
#~ msgstr "??????????????? ???????????????????????? ?????????????????????"

#~ msgid "Mozilla packages for the x86 platform"
#~ msgstr "x86 ????????????????????????????????? ???????????? ?????????????????? ?????????????????????"

#~ msgid "Multilib support packages"
#~ msgstr "???????????????????????? ?????????????????? ?????????????????????"

#~ msgid "SQL Database"
#~ msgstr "SQL ?????????????????????"

#~ msgid "Server"
#~ msgstr "???????????????"

#~ msgid "Support for developing packages for the non-primary architecture"
#~ msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ???????????? ??????????????????"

#~ msgid "Syriac Support"
#~ msgstr "???????????????????????? ??????????????????"

#~ msgid "System"
#~ msgstr "?????????????????????"

#~ msgid "The GNU Emacs text editor."
#~ msgstr "GNU ?????????????????? ????????? ????????????????????? ???"

#~ msgid ""
#~ "These packages allow you to configure an IMAP or Postfix mail server."
#~ msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? Postfix ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "These packages provide compatibility support for previous releases of Red "
#~ "Hat Enterprise Linux."
#~ msgstr ""
#~ "?????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? "
#~ "?????????????????? ????????????????????? ???"

#~ msgid "Unsupported Development Libraries"
#~ msgstr "???????????????????????? ??????????????? ???????????????????????????"

#~ msgid "Workstation Common"
#~ msgstr "???????????? ??????????????????????????????"

#~ msgid "ppc64 Compatibility Arch Support"
#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????????"

#~ msgid "x86 Compatibility Arch Development Support"
#~ msgstr "x86 ?????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "x86 Compatibility Arch Support"
#~ msgstr "x86 ?????????????????? ???????????? ??????????????????"

#~ msgid "Brazilian Portuguese"
#~ msgstr "?????????????????????????????? ??????????????????????????????"

#~ msgid "English"
#~ msgstr "???????????????????????????"

#~ msgid "French"
#~ msgstr "??????????????????????????????"

#~ msgid "German"
#~ msgstr "??????????????????"

#~ msgid "Italian"
#~ msgstr "?????????????????????"

#~ msgid "Red Hat Enterprise Linux 3 Documentation"
#~ msgstr "????????? ???????????? ??????????????????????????????????????? ?????????????????? 3 ???????????????????????????"

#~ msgid "Spanish"
#~ msgstr "??????????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Brazilian Portuguese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? "
#~ "??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "English language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "French language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "German language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Italian language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Spanish language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid "Japanese"
#~ msgstr "??????????????????"

#~ msgid "Korean"
#~ msgstr "????????????????????????"

#~ msgid "Simplified Chinese"
#~ msgstr "????????????????????? ?????????????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Japanese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Korean language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Simplified Chinese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? "
#~ "???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Traditional Chinese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? "
#~ "??????????????? ???"

#~ msgid "Traditional Chinese"
#~ msgstr "??????????????????????????? ?????????????????????"

#~ msgid "ppc64 Compatibility Arch Development Support"
#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "Bengali"
#~ msgstr "?????????????????????"

#~ msgid "Gujarati"
#~ msgstr "?????????????????????"

#~ msgid "Hindi"
#~ msgstr "??????????????????"

#~ msgid "Punjabi"
#~ msgstr "?????????????????????"

#~ msgid "Red Hat Enterprise Linux 4 Documentation"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? 4 ???????????????????????????"

#~ msgid "Tamil"
#~ msgstr "???????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Bengali language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Gujarati language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Hindi language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Punjabi language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Tamil language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid "Cluster Storage"
#~ msgstr "???????????? ?????????????????????"

#~ msgid "Clustering Support."
#~ msgstr "?????????????????? ?????????????????? ???"

#~ msgid "Packages which provide support for cluster storage."
#~ msgstr "???????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#~ msgid "Packages which provide support for single-node GFS."
#~ msgstr "????????? ????????? GFS ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#~ msgid "Single Node GFS Support"
#~ msgstr "????????? ????????? GFS ??????????????????"

#~ msgid "These packages provide compatibility support with previous releases."
#~ msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#~ msgid "Java Runtime Environments and Development Kits"
#~ msgstr "???????????? ?????????????????? ?????????????????? ??? ??????????????? ?????????"

#~ msgid "Misc"
#~ msgstr "???????????????"

#~ msgid "Misc packages"
#~ msgstr "??????????????? ?????????????????????"

#~ msgid "Multimedia"
#~ msgstr "?????????????????????????????????"

#~ msgid "Multimedia applications"
#~ msgstr "????????????????????????????????? ???????????????????????????"

#~ msgid ""
#~ "Packages which provide additional functionality for Red Hat Enterprise "
#~ "Linux"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ???????????????????????? ???????????? ?????? ???????????????????????????????????? ?????????????????? ??????????????? ?????????????????????"

#~ msgid "Red Hat Enterprise Linux Extras"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? ???????????????????????????"

#~ msgid "Workstation"
#~ msgstr "??????????????????????????????"

#~ msgid "Workstation applications and utilities."
#~ msgstr "?????????????????????????????? ??????????????????????????? ??? ???????????????????????? ???"

#~ msgid "Virtualization Support."
#~ msgstr "??????????????????????????????????????? ?????????????????? ???"


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pt_BR.po	16 Sep 2007 15:13:51 -0000	1.6
+++ pt_BR.po	17 Sep 2007 19:10:21 -0000	1.7
@@ -26,827 +26,594 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-fe5.xml.in.h:1
-#: ../comps-fe6.xml.in.h:1
-#: ../comps-f7.xml.in.h:1
+#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2
-#: ../comps-fe6.xml.in.h:2
-#: ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2
-#: ../comps-el4.xml.in.h:1
-#: ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas Administrativas"
 
-#: ../comps-fe5.xml.in.h:3
-#: ../comps-fe6.xml.in.h:3
-#: ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5
-#: ../comps-el4.xml.in.h:2
-#: ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica????es"
 
-#: ../comps-fe5.xml.in.h:4
-#: ../comps-fe6.xml.in.h:4
-#: ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../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-fe5.xml.in.h:5
-#: ../comps-fe6.xml.in.h:5
-#: ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7
-#: ../comps-el4.xml.in.h:4
-#: ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ?? ??rabe"
 
-#: ../comps-fe5.xml.in.h:6
-#: ../comps-fe6.xml.in.h:6
-#: ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8
-#: ../comps-el4.xml.in.h:5
-#: ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ?? Arm??nio"
 
-#: ../comps-fe5.xml.in.h:7
-#: ../comps-fe6.xml.in.h:7
-#: ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10
-#: ../comps-el4.xml.in.h:6
-#: ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e Publica????o"
 
-#: ../comps-fe5.xml.in.h:8
-#: ../comps-fe6.xml.in.h:8
-#: ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12
-#: ../comps-el4.xml.in.h:7
-#: ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema B??sico"
 
-#: ../comps-fe5.xml.in.h:9
-#: ../comps-fe6.xml.in.h:10
-#: ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32
-#: ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Ambientes de Trabalho"
 
-#: ../comps-fe5.xml.in.h:10
-#: ../comps-fe6.xml.in.h:11
-#: ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33
-#: ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Ambientes de trabalho"
 
-#: ../comps-fe5.xml.in.h:11
-#: ../comps-fe6.xml.in.h:12
-#: ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34
-#: ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:12
-#: ../comps-fe6.xml.in.h:13
-#: ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36
-#: ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Ferramentas de Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:13
-#: ../comps-fe6.xml.in.h:14
-#: ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-fe5.xml.in.h:14
-#: ../comps-fe6.xml.in.h:15
-#: ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39
-#: ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editores"
 
-#: ../comps-fe5.xml.in.h:15
-#: ../comps-fe6.xml.in.h:16
-#: ../comps-f7.xml.in.h:40
-#: ../comps-f8.xml.in.h:40
-#: ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:15
+#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
+#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Softwares Educacionais"
 
-#: ../comps-fe5.xml.in.h:16
-#: ../comps-fe6.xml.in.h:17
-#: ../comps-f7.xml.in.h:41
-#: ../comps-f8.xml.in.h:41
-#: ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:16
+#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
+#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Softwares educacionais para aprendizado"
 
-#: ../comps-fe5.xml.in.h:17
-#: ../comps-fe6.xml.in.h:18
-#: ../comps-f7.xml.in.h:42
-#: ../comps-f8.xml.in.h:42
-#: ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:17
+#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
+#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Engenharia e Ci??ncia"
 
-#: ../comps-fe5.xml.in.h:18
-#: ../comps-fe6.xml.in.h:19
-#: ../comps-f7.xml.in.h:46
-#: ../comps-f8.xml.in.h:46
-#: ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:18
+#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
+#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
[...2376 lines suppressed...]
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4728,6 +4587,7 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>telugu-support</id> <_name>Suporte??????Telugu</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -4748,6 +4608,7 @@
 #~ "x11-server-Xorg\">scim-m17n</packagereq> <packagereq type=\"conditional\" "
 #~ "requires=\"qt\">scim-qtimm</packagereq> </packagelist> </group> <group> "
 #~ "<id>turkish-support</id> <_name>Suporte??????Turco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"optional\">compat-db</packagereq> "
@@ -4778,6 +4639,7 @@
 #~ "<packagereq type=\"optional\">qt4</packagereq> </packagelist> </group> "
 #~ "<group> <id>lithuanian-support</id> <_name>Suporte??????Lituano</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>as</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4804,6 +4666,7 @@
 #~ "<_name>Autoria??e??Publica????o</_name> "
 #~ "<_description>Estas??ferramentas??permitem??criar??documenta????o??no??formato??DocBook??e??convert??-"
 #~ "la??para??HTML,??PDF,??PostScript??e??texto."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bg</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4824,6 +4687,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-"
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> <id>catalan-"
 #~ "support</id> <_name>Suporte??????Catal??o</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4846,6 +4710,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>brazilian-support</id> "
 #~ "<_name>Suporte??????Portugu??s??Brasileiro</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>br</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4858,6 +4723,7 @@
 #~ "requires=\"aspell\">aspell-br</packagereq> </packagelist> </group> "
 #~ "<group> <id>british-support</id> <_name>Suporte??????Ingl??s??Brit??nico</"
 #~ "_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>de</langonly> <packagelist> <packagereq type=\"default"
@@ -4878,6 +4744,7 @@
 #~ "packagelist> </group> <group> <id>graphical-internet</id> "
 #~ "<_name>Internet??em??Modo??Gr??fico</_name> "
 #~ "<_description>Este??grupo??inclui??clientes??gr??ficos??de??email,??Web??e??chat."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>es</langonly> <packagelist> <packagereq type=\"default"
@@ -4896,6 +4763,7 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-es</packagereq> </"
 #~ "packagelist> </group> <group> <id>swedish-support</id> "
 #~ "<_name>Suporte??????Sueco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>et</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4914,6 +4782,7 @@
 #~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
 #~ "\">kde-i18n-Estonian</packagereq> </packagelist> </group> <group> "
 #~ "<id>ethiopic-support</id> <_name>Suporte??????Et??ope</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fi</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4926,6 +4795,7 @@
 #~ "requires=\"kdelibs\">kde-i18n-Finnish</packagereq> </packagelist> </"
 #~ "group> <group> <id>faeroese-support</id> <_name>Suporte??????Faro??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fr</langonly> <packagelist> <packagereq type=\"default"
@@ -4947,6 +4817,7 @@
 #~ "packagelist> </group> <group> <id>gnome-desktop</id> "
 #~ "<_name>Ambiente??de????rea??de??Trabalho??GNOME</_name> <_description>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."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>he</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4959,6 +4830,7 @@
 #~ "\">fonts-hebrew</packagereq> <packagereq type=\"conditional\" requires="
 #~ "\"kdelibs\">kde-i18n-Hebrew</packagereq> </packagelist> </group> <group> "
 #~ "<id>hindi-support</id> <_name>Suporte??????Hindu</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hr</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4977,6 +4849,7 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
 #~ "75dpi</packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>Suporte??????Checo</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hu</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4996,6 +4869,7 @@
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> "
 #~ "<id>icelandic-support</id> <_name>Suporte??????Island??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>it</langonly> <packagelist> <packagereq type=\"default"
@@ -5014,6 +4888,7 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-it</packagereq> </"
 #~ "packagelist> </group> <group> <id>japanese-support</id> "
 #~ "<_name>Suporte??????Japon??s</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ml</langonly> <packagelist> <packagereq type=\"default"
@@ -5036,6 +4911,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>marathi-support</id> "
 #~ "<_name>Suporte??????Marati</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>or</langonly> <packagelist> <packagereq type=\"default"
@@ -5058,6 +4934,7 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>polish-support</id> <_name>Suporte??????Polon??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
@@ -5082,6 +4959,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>romanian-support</id> "
 #~ "<_name>Suporte??????Romeno</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
@@ -5110,6 +4988,7 @@
 #~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
 #~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
 #~ "support</id> <_name>Suporte??????S??rvio</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
@@ -5134,6 +5013,7 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
 #~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
 #~ "<_name>Suporte??????Eslovaco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -5158,6 +5038,7 @@
 #~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
 #~ "<id>sound-and-video</id> <_name>Som??e??V??deo</_name> "
 #~ "<_description>De??grava????o??de??CDs??at????a??reprodu????o??de??CDs??de????udio??e??arquivos??multim??dia,??este??grupo??de??pacotes??permite??lidar??com??som??e??v??deo??no??sistema."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
@@ -5182,6 +5063,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>telugu-support</id> "
 #~ "<_name>Suporte??????Telugu</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -5200,6 +5082,7 @@
 #~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
 #~ "packagelist> </group> <group> <id>turkish-support</id> "
 #~ "<_name>Suporte??????Turco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
@@ -5244,4 +5127,3 @@
 #~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
 #~ "group> <group> <id>core</id> <_name>Core</_name> "
 #~ "<_description>A??menor??instala????o??poss??vel"
-



From fedora-extras-commits at redhat.com  Mon Sep 17 19:15:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:15:24 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.29, 1.30 gnome-menus.spec, 1.66,
	1.67 sources, 1.29, 1.30
Message-ID: <200709171915.l8HJFO8T019237@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19209

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Sep 2007 18:48:02 -0000	1.29
+++ .cvsignore	17 Sep 2007 19:14:51 -0000	1.30
@@ -1 +1 @@
-gnome-menus-2.19.92.tar.bz2
+gnome-menus-2.20.0.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-menus.spec	4 Sep 2007 18:48:02 -0000	1.66
+++ gnome-menus.spec	17 Sep 2007 19:14:51 -0000	1.67
@@ -5,12 +5,13 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-menus/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-menus/2.20/%{name}-%{version}.tar.bz2
+Patch0: debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .debug
 
 %build
 %configure \
@@ -98,6 +100,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	4 Sep 2007 18:48:02 -0000	1.29
+++ sources	17 Sep 2007 19:14:51 -0000	1.30
@@ -1 +1 @@
-ba03799545df6d7258e9b7b6c5b78aff  gnome-menus-2.19.92.tar.bz2
+7c3580c7c59f36a49f6624932a743d31  gnome-menus-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:18:58 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:18:58 -0400
Subject: comps comps-f7.xml.in,1.254,1.255
Message-ID: <200709171918.l8HJIwD8019399@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19260

Modified Files:
	comps-f7.xml.in 
Log Message:
fix typo



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- comps-f7.xml.in	14 Sep 2007 08:21:29 -0000	1.254
+++ comps-f7.xml.in	17 Sep 2007 19:18:28 -0000	1.255
@@ -2949,7 +2949,7 @@
   </group>
   <group>
     <id>somali-support</id>
-    <_name>Somail Support</_name>
+    <_name>Somali Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From fedora-extras-commits at redhat.com  Mon Sep 17 19:21:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:21:25 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.43, 1.44 gnome-session.spec, 
	1.139, 1.140 sources, 1.43, 1.44
Message-ID: <200709171921.l8HJLPp7019564@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19533

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Sep 2007 19:27:48 -0000	1.43
+++ .cvsignore	17 Sep 2007 19:20:51 -0000	1.44
@@ -1 +1 @@
-gnome-session-2.19.92.tar.bz2
+gnome-session-2.20.0.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-session.spec	11 Sep 2007 12:58:58 -0000	1.139
+++ gnome-session.spec	17 Sep 2007 19:20:51 -0000	1.140
@@ -11,10 +11,10 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.19.92
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
 Source2: gnome.desktop
 License: GPLv2+
@@ -189,6 +189,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-3
 - Plug memory leaks in the ICE code
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	4 Sep 2007 19:27:48 -0000	1.43
+++ sources	17 Sep 2007 19:20:51 -0000	1.44
@@ -1 +1 @@
-52e05bcb16fbd904e01a5aebb2ce75d1  gnome-session-2.19.92.tar.bz2
+3ef5601a46ee6c382bf6288ced8b06a5  gnome-session-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:22:43 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:22:43 -0400
Subject: comps/po af.po, 1.4, 1.5 am.po, 1.4, 1.5 ar.po, 1.4, 1.5 as.po, 1.4,
	1.5 be.po, 1.4, 1.5 bg.po, 1.4, 1.5 bn.po, 1.4, 1.5 bn_IN.po,
	1.4, 1.5 bs.po, 1.4, 1.5 ca.po, 1.4, 1.5 comps.pot, 1.8,
	1.9 cs.po, 1.4, 1.5 cy.po, 1.4, 1.5 da.po, 1.4, 1.5 de.po, 1.4,
	1.5 el.po, 1.5, 1.6 en_GB.po, 1.4, 1.5 es.po, 1.4, 1.5 et.po,
	1.4, 1.5 fa.po, 1.4, 1.5 fi.po, 1.4, 1.5 fr.po, 1.4, 1.5 gl.po,
	1.4, 1.5 gu.po, 1.4, 1.5 he.po, 1.4, 1.5 hi.po, 1.4, 1.5 hr.po,
	1.4, 1.5 hu.po, 1.4, 1.5 hy.po, 1.4, 1.5 id.po, 1.4, 1.5 ilo.po,
	1.4, 1.5 is.po, 1.4, 1.5 it.po, 1.4, 1.5 ja.po, 1.4, 1.5 ka.po,
	1.4, 1.5 kn.po, 1.4, 1.5 ko.po, 1.4, 1.5 ku.po, 1.4, 1.5 lo.po,
	1.4, 1.5 lv.po, 1.4, 1.5 mk.po, 1.4, 1.5 ml.po, 1.4, 1.5 mr.po,
	1.4, 1.5 ms.po, 1.4, 1.5 my.po, 1.4, 1.5 nb.po, 1.4, 1.5 ne.po,
	1.1, 1.2 nl.po, 1.4, 1.5 no.po, 1.4, 1.5 nso.po, 1.4, 1.5 or.po,
	1.4, 1.5 pa.po, 1.4, 1.5 pl.po, 1.6, 1.7 pt.po, 1.4,
	1.5 pt_BR.po, 1.7, 1.8 ro.po, 1.4, 1.5 ru.po, 1.4, 1.5 si.po,
	1.4, 1.5 sk.po, 1.4, 1.5 sl.po, 1.4, 1.5 sq.po, 1.4, 1.5 sr.po,
	1.5, 1.6 sr@Latn.po, 1.5, 1.6 sv.po, 1.4, 1.5 ta.po, 1.4,
	1.5 te.po, 1.4, 1.5 th.po, 1.4, 1.5 tl.po, 1.4, 1.5 tr.po, 1.4,
	1.5 uk.po, 1.4, 1.5 ur.po, 1.4, 1.5 vi.po, 1.4, 1.5 zh_CN.po,
	1.4, 1.5 zh_TW.po, 1.4, 1.5 zu.po, 1.4, 1.5
Message-ID: <200709171922.l8HJMhCq019783@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	af.po am.po ar.po as.po be.po bg.po bn.po bn_IN.po bs.po ca.po 
	comps.pot cs.po cy.po da.po de.po el.po en_GB.po es.po et.po 
	fa.po fi.po fr.po gl.po gu.po he.po hi.po hr.po hu.po hy.po 
	id.po ilo.po is.po it.po ja.po ka.po kn.po ko.po ku.po lo.po 
	lv.po mk.po ml.po mr.po ms.po my.po nb.po ne.po nl.po no.po 
	nso.po or.po pa.po pl.po pt.po pt_BR.po ro.po ru.po si.po 
	sk.po sl.po sq.po sr.po sr at Latn.po sv.po ta.po te.po th.po 
	tl.po tr.po uk.po ur.po vi.po zh_CN.po zh_TW.po zu.po 
Log Message:
refresh after fixed typo



Index: af.po
===================================================================
RCS file: /cvs/extras/comps/po/af.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- af.po	14 Sep 2007 14:39:10 -0000	1.4
+++ af.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-02-15 13:30+0200\n"
 "Last-Translator: Translate.org.za <info at translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af at lists.sourceforge.net>\n"
@@ -1174,6 +1174,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Tamil taalsteun"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: am.po
===================================================================
RCS file: /cvs/extras/comps/po/am.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- am.po	14 Sep 2007 14:39:10 -0000	1.4
+++ am.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-05-12 07:02+EST\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales at geez.org>\n"
 "Language-Team: Amharic <am-translate at geez.org>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "????????? ?????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????"
 


Index: ar.po
===================================================================
RCS file: /cvs/extras/comps/po/ar.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ar.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ar.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-12 08:54+0200\n"
 "Last-Translator: Ali Ghareb <ali.gareb at gmail.com>\n"
 "Language-Team: Arabic <en at li.org>\n"
@@ -1136,6 +1136,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????? ????????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????"
 


Index: as.po
===================================================================
RCS file: /cvs/extras/comps/po/as.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- as.po	14 Sep 2007 14:39:10 -0000	1.4
+++ as.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-22 19:32+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
 "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
@@ -1102,6 +1102,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????? ??????????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: be.po
===================================================================
RCS file: /cvs/extras/comps/po/be.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- be.po	14 Sep 2007 14:39:10 -0000	1.4
+++ be.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-09-25 13:19+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
 "Language-Team: Belorussian\n"
@@ -1135,6 +1135,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????????? ????????"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: bg.po
===================================================================
RCS file: /cvs/extras/comps/po/bg.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bg.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bg.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-29 11:11+0300\n"
 "Last-Translator: Miroslav Ivanov <satyr at globalnet.bg>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
@@ -1109,6 +1109,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???? ??????????"
+
 #~ msgid "Emacs"
 #~ msgstr "??????????"
 


Index: bn.po
===================================================================
RCS file: /cvs/extras/comps/po/bn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bn.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bn.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-09-23 00:21+0600\n"
 "Last-Translator: Mahay Alam Khan (???????????? ?????????) <makl10n at yahoo.com>\n"
 "Language-Team: Bangla <redhat-translation at bengalinux.org>\n"
@@ -1145,6 +1145,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "????????? ??????????????????????????? ???????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????????????????"
 


Index: bn_IN.po
===================================================================
RCS file: /cvs/extras/comps/po/bn_IN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bn_IN.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bn_IN.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 11:43+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
 "Language-Team: Bengali India\n"
@@ -1190,6 +1190,11 @@
 msgstr ""
 
 # modified for RHEL
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
+
+# modified for RHEL
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: bs.po
===================================================================
RCS file: /cvs/extras/comps/po/bs.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bs.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bs.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-23 13:24+0100\n"
 "Last-Translator: Adnan Hodzic <AbsintheSyringe at gmail.com>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -1104,6 +1104,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: ca.po
===================================================================
RCS file: /cvs/extras/comps/po/ca.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ca.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ca.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-18 11:11+0100\n"
 "Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
@@ -1133,6 +1133,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suport per al swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: comps.pot
===================================================================
RCS file: /cvs/extras/comps/po/comps.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps.pot	14 Sep 2007 14:39:10 -0000	1.8
+++ comps.pot	17 Sep 2007 19:22:12 -0000	1.9
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"


Index: cs.po
===================================================================
RCS file: /cvs/extras/comps/po/cs.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cs.po	14 Sep 2007 14:39:10 -0000	1.4
+++ cs.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 01:38+0100\n"
 "Last-Translator: Milan Kerslager <kerslage at linux.cz>\n"
 "Language-Team: Czech\n"
@@ -1140,6 +1140,11 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+# FIXME
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati (P??kist??n)"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: cy.po
===================================================================
RCS file: /cvs/extras/comps/po/cy.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cy.po	14 Sep 2007 14:39:10 -0000	1.4
+++ cy.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-15 18:00+0100\n"
 "Last-Translator: Rhys Jones <rhys at sucs.org>\n"
 "Language-Team: Cymraeg <Cy at li.org>\n"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Cynhaliaeth Thai"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: da.po
===================================================================
RCS file: /cvs/extras/comps/po/da.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- da.po	14 Sep 2007 14:39:10 -0000	1.4
+++ da.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\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"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Underst??ttelse for swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: de.po
===================================================================
RCS file: /cvs/extras/comps/po/de.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- de.po	14 Sep 2007 14:39:10 -0000	1.4
+++ de.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -23,7 +23,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-26 08:19+1000\n"
 "Last-Translator: PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
@@ -1155,6 +1155,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Unterst??tzung f??r Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: el.po
===================================================================
RCS file: /cvs/extras/comps/po/el.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- el.po	14 Sep 2007 14:39:10 -0000	1.5
+++ el.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-16 19:25+0300\n"
 "Last-Translator: Nikos Charonitakis <nikosx at gmail.com>\n"
 "Language-Team: Greek <fedora-trans-el at redhat.com>\n"
@@ -1144,6 +1144,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????? Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: en_GB.po
===================================================================
RCS file: /cvs/extras/comps/po/en_GB.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- en_GB.po	14 Sep 2007 14:39:10 -0000	1.4
+++ en_GB.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-01-04 12:50+0000\n"
 "Last-Translator: Alan Cox <alan at redhat.com>\n"
 "Language-Team: en_GB\n"
@@ -1115,6 +1115,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Thai Support"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: es.po
===================================================================
RCS file: /cvs/extras/comps/po/es.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- es.po	14 Sep 2007 14:39:10 -0000	1.4
+++ es.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 11:35-0300\n"
 "Last-Translator: Domingo Becker <beckerde at hotmail.com>\n"
 "Language-Team: Spanish <en at li.org>\n"
@@ -1134,6 +1134,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Soporte para Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: et.po
===================================================================
RCS file: /cvs/extras/comps/po/et.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- et.po	14 Sep 2007 14:39:10 -0000	1.4
+++ et.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-07-27 13:42+0200\n"
 "Last-Translator: Allan Sims <allan.sims at eau.ee>\n"
 "Language-Team: Estonian <Eesti>\n"
@@ -1130,6 +1130,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "tai keele toetus"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: fa.po
===================================================================
RCS file: /cvs/extras/comps/po/fa.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fa.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fa.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-14 14:31+0430\n"
 "Last-Translator: Meelad Zakaria <meelad at farsiweb.info>\n"
 "Language-Team: Persian <farsi at lists.sharif.edu>\n"
@@ -1151,6 +1151,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????? ????????????"
 


Index: fi.po
===================================================================
RCS file: /cvs/extras/comps/po/fi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-07 21:43+0200\n"
 "Last-Translator: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -1121,6 +1121,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Siswatin kielituki"
+
 # Mik?? kieli t??m?? t??llainen on? ...
 #~ msgid "Brazilian Support"
 #~ msgstr "Brasilianportugalin kielituki"


Index: fr.po
===================================================================
RCS file: /cvs/extras/comps/po/fr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-27 21:23+0100\n"
 "Last-Translator: Thomas Canniot <thomas.canniot at laposte.net>\n"
 "Language-Team: Francais <fedora-trans-fr at redhat.com>\n"
@@ -1153,6 +1153,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Support Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Support br??silien"
 


Index: gl.po
===================================================================
RCS file: /cvs/extras/comps/po/gl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ gl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-07-19 22:34+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <gl at li.org>\n"
@@ -1118,6 +1118,10 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Soporte para o tai"
+
+#, fuzzy
 #~ msgid "Brazilian Support"
 #~ msgstr "Soporte Brasileiro"
 


Index: gu.po
===================================================================
RCS file: /cvs/extras/comps/po/gu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ gu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-26 11:10+0530\n"
 "Last-Translator: Ankit Patel <ankit at redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
@@ -1096,6 +1096,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????? ????????????"
 


Index: he.po
===================================================================
RCS file: /cvs/extras/comps/po/he.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- he.po	14 Sep 2007 14:39:10 -0000	1.4
+++ he.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: hi.po
===================================================================
RCS file: /cvs/extras/comps/po/hi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-16 16:46+0530\n"
 "Last-Translator: hi <rranjan at redhat.com>\n"
 "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????????????? ??????????????????"
 


Index: hr.po
===================================================================
RCS file: /cvs/extras/comps/po/hr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: comps 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-18 13:06+0100\n"
 "Last-Translator: Renato Pavicic <renato at translator-shop.org>\n"
 "Language-Team: Renato Pavicic <renato at translator-shop.org>\n"
@@ -1105,6 +1105,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Podr??ka za brazilski"
 


Index: hu.po
===================================================================
RCS file: /cvs/extras/comps/po/hu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-18 19:56+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad at yahoo.com>\n"
 "Language-Team: \n"
@@ -1139,6 +1139,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati nyelvi t??mogat??s"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazil lokaliz??ci??s t??mogat??s"
 


Index: hy.po
===================================================================
RCS file: /cvs/extras/comps/po/hy.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hy.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hy.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: hy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-08 19:07+0400\n"
 "Last-Translator: Suren Karapetyan <surenkarapetyan at gmail.com>\n"
 "Language-Team: Armenian\n"
@@ -1072,6 +1072,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????? ????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????? ????????????????????"
 


Index: id.po
===================================================================
RCS file: /cvs/extras/comps/po/id.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- id.po	14 Sep 2007 14:39:10 -0000	1.4
+++ id.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-24 14:17+0700\n"
 "Last-Translator: Teguh DC <dheche at bradjamoesti.or.id>\n"
 "Language-Team: Bahasa Indonesia <viribus at traderweb.net>\n"
@@ -1116,6 +1116,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Dukungan Tamil"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Dukungan Brasil"
 


Index: ilo.po
===================================================================
RCS file: /cvs/extras/comps/po/ilo.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ilo.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ilo.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Iloko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-12 14:10+0800\n"
 "Last-Translator: rva <rvaragon at gmail.com>\n"
 "Language-Team: \n"
@@ -1044,6 +1044,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Panagsayangkat ti Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Panagsayangkat ti Portuges a Brasilenio"
 


Index: is.po
===================================================================
RCS file: /cvs/extras/comps/po/is.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- is.po	14 Sep 2007 14:39:10 -0000	1.4
+++ is.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-07 12:00+0000\n"
 "Last-Translator: Richard Allen <ra at ra.is>\n"
 "Language-Team: is <kde-isl at molar.is>\n"
@@ -1088,6 +1088,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Bras??l??ska"
 


Index: it.po
===================================================================
RCS file: /cvs/extras/comps/po/it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- it.po	14 Sep 2007 14:39:10 -0000	1.4
+++ it.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 00:33+0100\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
 "Language-Team: italiano <fedora-trans-it at redhat.com>\n"
@@ -1146,6 +1146,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Supporto per lo Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Supporto per il brasiliano"
 


Index: ja.po
===================================================================
RCS file: /cvs/extras/comps/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ja.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ja.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-01 14:53+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -1127,6 +1127,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????????"
 


Index: ka.po
===================================================================
RCS file: /cvs/extras/comps/po/ka.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ka.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ka.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ka\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 20:36+0400\n"
 "Last-Translator: George Machitidze <giomac at gmail.com>\n"
 "Language-Team: Georgian <guiasher at mes.gov.ge>\n"
@@ -1051,6 +1051,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????????????????? ??????????????????????????????"
+
 #~ msgid "British Support"
 #~ msgstr "?????????????????????????????? ???????????????????????????"
 


Index: kn.po
===================================================================
RCS file: /cvs/extras/comps/po/kn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kn.po	14 Sep 2007 14:39:10 -0000	1.4
+++ kn.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-17 18:53+0530\n"
 "Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
 "Language-Team: Kannada <en at li.org>\n"
@@ -1103,6 +1103,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ?????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ?????????????????????"
 


Index: ko.po
===================================================================
RCS file: /cvs/extras/comps/po/ko.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ko.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ko.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-08 10:51+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -1102,6 +1102,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????? ??????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????? ??????"
 


Index: ku.po
===================================================================
RCS file: /cvs/extras/comps/po/ku.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ku.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ku.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: lo.po
===================================================================
RCS file: /cvs/extras/comps/po/lo.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lo.po	14 Sep 2007 14:39:10 -0000	1.4
+++ lo.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: lv.po
===================================================================
RCS file: /cvs/extras/comps/po/lv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lv.po	14 Sep 2007 14:39:10 -0000	1.4
+++ lv.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-21 06:57+0200\n"
 "Last-Translator: Gatis Kalnins <gatis.kalnins at metatrons.lv>\n"
 "Language-Team: Latvian <locale at laka.lv>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati atbalsts"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braz????u valodas atbalsts"
 


Index: mk.po
===================================================================
RCS file: /cvs/extras/comps/po/mk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ mk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-05-02 11:44+0200\n"
 "Last-Translator: Tomislav Markovski <herrera at users.sourceforge.net>\n"
 "Language-Team: Macedonian <ossm-members at hedona.on.net.mk>\n"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????? ???? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????? ???? ??????????????????"
 


Index: ml.po
===================================================================
RCS file: /cvs/extras/comps/po/ml.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ml.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ml.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-02 11:47+0530\n"
 "Last-Translator: Ani Peter <apeter at redhat.com>\n"
 "Language-Team: Malayalam <en at li.org>\n"
@@ -1103,6 +1103,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ????????????????????????????????????"
 


Index: mr.po
===================================================================
RCS file: /cvs/extras/comps/po/mr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ mr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-08 14:48+0530\n"
 "Last-Translator: Rahul Bhalerao <b.rahul.pm at gmail.com>\n"
 "Language-Team: Marathi\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????????????? ??????????????????"
 


Index: ms.po
===================================================================
RCS file: /cvs/extras/comps/po/ms.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ms.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ms.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-08 18:53+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms at lists.sourceforge.net>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Sokongan Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Sokongan Brazil"
 


Index: my.po
===================================================================
RCS file: /cvs/extras/comps/po/my.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- my.po	14 Sep 2007 14:39:10 -0000	1.4
+++ my.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-30 13:38-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: nb.po
===================================================================
RCS file: /cvs/extras/comps/po/nb.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nb.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nb.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-14 13:30+0100\n"
 "Last-Translator: Espen Stefansen <espenas at gmail.com>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
@@ -1108,6 +1108,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??tte for Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??tte for brasiliensk"
 


Index: ne.po
===================================================================
RCS file: /cvs/extras/comps/po/ne.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ne.po	17 Sep 2007 19:10:21 -0000	1.1
+++ ne.po	17 Sep 2007 19:22:12 -0000	1.2
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-08-16 16:07+0545\n"
 "Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "JBoss Enterprise Application Platform"
 #~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"
 


Index: nl.po
===================================================================
RCS file: /cvs/extras/comps/po/nl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-05 23:20+0100\n"
 "Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -1136,6 +1136,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati ondersteuning"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braziliaanse ondersteuning"
 


Index: no.po
===================================================================
RCS file: /cvs/extras/comps/po/no.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- no.po	14 Sep 2007 14:39:10 -0000	1.4
+++ no.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-01-18 14:23+0100\n"
 "Last-Translator: guru <215487 at gmail.com>\n"
 "Language-Team: Norwegian\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??tte for siamesisk"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??tte for portugisisk(Brasil)"
 


Index: nso.po
===================================================================
RCS file: /cvs/extras/comps/po/nso.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nso.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nso.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-01-24 13:30+0200\n"
 "Last-Translator: Translate.org.za <info at translate.org.za>\n"
 "Language-Team: Northern Sotho <translate-discuss-nso at lists.sourceforge.net>\n"
@@ -1181,6 +1181,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Thekgo ya se-Tamil"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Thekgo ya se-Brazil"
 


Index: or.po
===================================================================
RCS file: /cvs/extras/comps/po/or.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- or.po	14 Sep 2007 14:39:10 -0000	1.4
+++ or.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-02 12:17+0530\n"
 "Last-Translator: Subhransu Behera <sbehera at redhat.com>\n"
 "Language-Team: Oriya <oriya-group at lists.sarovar.org>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????? ??????????????????"
 


Index: pa.po
===================================================================
RCS file: /cvs/extras/comps/po/pa.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pa.po	14 Sep 2007 14:39:10 -0000	1.4
+++ pa.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-06 13:44+0530\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
@@ -1097,6 +1097,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????? ??????????????????"
 


Index: pl.po
===================================================================
RCS file: /cvs/extras/comps/po/pl.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pl.po	14 Sep 2007 14:39:10 -0000	1.6
+++ pl.po	17 Sep 2007 19:22:12 -0000	1.7
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-10 17:10+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -1074,3 +1074,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Obs??uga somalijskiego"


Index: pt.po
===================================================================
RCS file: /cvs/extras/comps/po/pt.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pt.po	14 Sep 2007 14:39:10 -0000	1.4
+++ pt.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 10:47+0000\n"
 "Last-Translator: Pedro Morais <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -1155,6 +1155,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte a Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suporte a Portugu??s do Brasil"
 


Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pt_BR.po	17 Sep 2007 19:10:21 -0000	1.7
+++ pt_BR.po	17 Sep 2007 19:22:12 -0000	1.8
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-16 12:11-0300\n"
 "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
@@ -1100,6 +1100,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr "Pacotes de fontes vetoriais e bitmaps antigos"
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte ?? Somali"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suporte ?? Portugu??s Brasileiro"
 


Index: ro.po
===================================================================
RCS file: /cvs/extras/comps/po/ro.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ro.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ro.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 23:49+0200\n"
 "Last-Translator: Alexandru Szasz <alexxed at gmail.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suport pentru Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suport pentru brazilian??"
 


Index: ru.po
===================================================================
RCS file: /cvs/extras/comps/po/ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ru.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ru.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 20:17+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1121,6 +1121,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ?????????? ??????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????? ???????????????????????? ??????????"
 


Index: si.po
===================================================================
RCS file: /cvs/extras/comps/po/si.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- si.po	14 Sep 2007 14:39:10 -0000	1.4
+++ si.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-10-18 23:50+0530\n"
 "Last-Translator: Tyronne Wickramarathne <tywickra at redhat.com>\n"
 "Language-Team: Sinhala <en at li.org>\n"
@@ -1091,6 +1091,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????????????????????????? ???????????? ??????????????????"
 


Index: sk.po
===================================================================
RCS file: /cvs/extras/comps/po/sk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comp-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-10 09:21+0200\n"
 "Last-Translator: J??n Ondrej <ondrejj at salstar.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -1120,6 +1120,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podpora swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braz??lska podpora"
 


Index: sl.po
===================================================================
RCS file: /cvs/extras/comps/po/sl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-09 19:22+0200\n"
 "Last-Translator: Rok Papez <rok.papez at lugos.si>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -1105,6 +1105,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podpora Svat????ini"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilska podpora"
 


Index: sq.po
===================================================================
RCS file: /cvs/extras/comps/po/sq.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sq.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sq.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-14 20:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: sr.po
===================================================================
RCS file: /cvs/extras/comps/po/sr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sr.po	14 Sep 2007 14:39:10 -0000	1.5
+++ sr.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-09 00:55-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -1072,3 +1072,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????? ???? ????????????"


Index: sr at Latn.po
===================================================================
RCS file: /cvs/extras/comps/po/sr at Latn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sr at Latn.po	14 Sep 2007 14:39:10 -0000	1.5
+++ sr at Latn.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-09 00:58-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -1072,3 +1072,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Stariji paketi batmapiranih i vektorskih fontova"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za somali"


Index: sv.po
===================================================================
RCS file: /cvs/extras/comps/po/sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sv.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sv.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-09 10:21-0500\n"
 "Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
 "Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??d f??r siswati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??d f??r brasiliansk portugisiska"
 


Index: ta.po
===================================================================
RCS file: /cvs/extras/comps/po/ta.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ta.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ta.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-17 16:29+0530\n"
 "Last-Translator: I felix <ifelix at redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
@@ -1109,6 +1109,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ????????????"
 


Index: te.po
===================================================================
RCS file: /cvs/extras/comps/po/te.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- te.po	14 Sep 2007 14:39:10 -0000	1.4
+++ te.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-07 17:17+0530\n"
 "Last-Translator: Sree Ganesh <sthottem at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
@@ -1094,6 +1094,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilian ??????????????????"
 


Index: th.po
===================================================================
RCS file: /cvs/extras/comps/po/th.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- th.po	14 Sep 2007 14:39:10 -0000	1.4
+++ th.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: th\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\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"
@@ -1096,6 +1096,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????????????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilian Support"
 


Index: tl.po
===================================================================
RCS file: /cvs/extras/comps/po/tl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ tl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Tagalog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-23 04:15-0800\n"
 "Last-Translator: Joseph S. Maza <joemaza at comcast.net>\n"
 "Language-Team: \n"
@@ -1054,6 +1054,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte para sa Wikang Gales"
+
 #~ msgid "ISO8859-14 Support"
 #~ msgstr "Pagsasang-ayong ISO8859-14 "
 


Index: tr.po
===================================================================
RCS file: /cvs/extras/comps/po/tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ tr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-16 12:22+0200\n"
 "Last-Translator: Egemen Metin Turan <mturan at aegee-ankara.org>\n"
 "Language-Team: Turkish <fedora-trans-tr at redhat.com>\n"
@@ -1097,6 +1097,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati Dil Deste??i"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brezilya Dili Dsete??i"
 


Index: uk.po
===================================================================
RCS file: /cvs/extras/comps/po/uk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ uk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-23 10:05+0200\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko at gmail.com>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -1098,6 +1098,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????? ??????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????? ???????????????????????? ????????"
 


Index: ur.po
===================================================================
RCS file: /cvs/extras/comps/po/ur.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ur.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ur.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-03-11 21:36+0500\n"
 "Last-Translator: Usman Siraj Sheikh <usman.siraj at gmail.com>\n"
 "Language-Team: SCS GIFT UNIVERSITY (http://cs.gift.edu.pk) <urdu.scs."
@@ -1120,6 +1120,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????? ???? ????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr " ?????????????? ????????"
 


Index: vi.po
===================================================================
RCS file: /cvs/extras/comps/po/vi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ vi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-18 20:38+0700\n"
 "Last-Translator: pclouds <pclouds at gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list at lists.sourceforge.net>\n"
@@ -1144,6 +1144,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "H??? tr??? ??? R???p"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "H??? tr??? Brazil"
 


Index: zh_CN.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zh_CN.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zh_CN.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-07 09:08+1000\n"
 "Last-Translator: Tony Fu <tfu at redhat.com>\n"
 "Language-Team:  <zh at li.org>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati ?????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????"
 


Index: zh_TW.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zh_TW.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zh_TW.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-11 10:14+1000\n"
 "Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
 "Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
@@ -1080,6 +1080,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????????????????"
 


Index: zu.po
===================================================================
RCS file: /cvs/extras/comps/po/zu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-21 12:12+0200\n"
 "Last-Translator: Thobile Mhlongo <thobile at translate.org.za>\n"
 "Language-Team: Zulu <zulu at translate.org.za>\n"
@@ -1247,6 +1247,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Ukuxhasa Kwesi-Arabhu"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Ukuxhasa Kwase-Brazil"
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:27:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:27:17 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.55,
	1.56 gnome-system-monitor.spec, 1.95, 1.96 sources, 1.55, 1.56
Message-ID: <200709171927.l8HJRHbQ019972@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19949

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	4 Sep 2007 13:23:58 -0000	1.55
+++ .cvsignore	17 Sep 2007 19:26:45 -0000	1.56
@@ -1 +1 @@
-gnome-system-monitor-2.19.91.1.tar.bz2
+gnome-system-monitor-2.20.0.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-system-monitor.spec	4 Sep 2007 13:23:58 -0000	1.95
+++ gnome-system-monitor.spec	17 Sep 2007 19:26:45 -0000	1.96
@@ -10,12 +10,12 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.19.91.1
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-system-monitor/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-system-monitor/2.20/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: GConf2-devel
 BuildRequires: gnome-vfs2-devel
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/gnome-system-monitor/
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	4 Sep 2007 13:23:58 -0000	1.55
+++ sources	17 Sep 2007 19:26:45 -0000	1.56
@@ -1 +1 @@
-2f63214c75995014046d3c401e64fd4d  gnome-system-monitor-2.19.91.1.tar.bz2
+52d02162cecd0174536148197024126d  gnome-system-monitor-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:28:38 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 15:28:38 -0400
Subject: rpms/hulahop/OLPC-2 .cvsignore, 1.6, 1.7 hulahop.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200709171928.l8HJScVQ020080@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/hulahop/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20051

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.6.20070917git61d001479c
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2007 20:02:45 -0000	1.6
+++ .cvsignore	17 Sep 2007 19:28:06 -0000	1.7
@@ -1 +1 @@
-hulahop-0.2-git57693bd828.tar.bz2
+hulahop-0.2-git61d001479c.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/hulahop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hulahop.spec	22 Aug 2007 20:02:45 -0000	1.6
+++ hulahop.spec	17 Sep 2007 19:28:06 -0000	1.7
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070822git
-%define commitid 57693bd828
+%define alphatag 20070917git
+%define commitid 61d001479c
 
 Name: hulahop
 Version: 0.2
-Release: 0.5.%{alphatag}57693bd828
+Release: 0.6.%{alphatag}61d001479c
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.6.20070917git61d001479c
+- New snapshot
+
 * Wed Aug 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.5.20070822git57693bd828
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2007 20:02:45 -0000	1.6
+++ sources	17 Sep 2007 19:28:06 -0000	1.7
@@ -1 +1 @@
-4065bb46938f2786eea3ebf3ca4b026d  hulahop-0.2-git57693bd828.tar.bz2
+078093f51bc20dd9eecd2fb2082d0915  hulahop-0.2-git61d001479c.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:31:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:31:53 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.36,
	1.37 gnome-power-manager.spec, 1.96, 1.97 sources, 1.36, 1.37
Message-ID: <200709171931.l8HJVrlO020181@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Sep 2007 20:00:05 -0000	1.36
+++ .cvsignore	17 Sep 2007 19:31:20 -0000	1.37
@@ -1 +1 @@
-gnome-power-manager-2.19.92.tar.bz2
+gnome-power-manager-2.20.0.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-power-manager.spec	4 Sep 2007 20:00:05 -0000	1.96
+++ gnome-power-manager.spec	17 Sep 2007 19:31:20 -0000	1.97
@@ -4,11 +4,11 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.19/gnome-power-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.20/gnome-power-manager-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -118,6 +118,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog 
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 20:00:05 -0000	1.36
+++ sources	17 Sep 2007 19:31:20 -0000	1.37
@@ -1 +1 @@
-4fa8c70075ac56a22824b2d751df2302  gnome-power-manager-2.19.92.tar.bz2
+881f012dcbdff38a85603393cb9d39bb  gnome-power-manager-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:39:17 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 15:39:17 -0400
Subject: rpms/gcstar/F-7 .cvsignore, 1.5, 1.6 gcstar.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200709171939.l8HJdHle020419@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20338

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 17:16:59 -0000	1.5
+++ .cvsignore	17 Sep 2007 19:38:45 -0000	1.6
@@ -1 +1 @@
-gcstar-1.2.0.tar.gz
+gcstar-1.2.2.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/gcstar.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcstar.spec	9 Sep 2007 17:16:59 -0000	1.9
+++ gcstar.spec	17 Sep 2007 19:38:45 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:16:59 -0000	1.4
+++ sources	17 Sep 2007 19:38:45 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 19:40:15 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 17 Sep 2007 15:40:15 -0400
Subject: rpms/python-TurboMail/FC-6 .cvsignore, 1.2,
	1.3 python-TurboMail.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709171940.l8HJeFcx020531@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-TurboMail/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20438

Modified Files:
	.cvsignore python-TurboMail.spec sources 
Log Message:
2.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2006 02:56:11 -0000	1.2
+++ .cvsignore	17 Sep 2007 19:39:42 -0000	1.3
@@ -1 +1 @@
-TurboMail-2.0.3.tar.gz
+TurboMail-2.0.4.tar.gz


Index: python-TurboMail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/python-TurboMail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-TurboMail.spec	19 Jan 2007 06:58:16 -0000	1.2
+++ python-TurboMail.spec	17 Sep 2007 19:39:42 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-TurboMail
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Multi-threaded mail queue manager for TurboGears applications
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  TurboGears
+BuildRequires:  TurboGears python-devel
 Requires:       TurboGears
 
 
@@ -50,6 +50,9 @@
 %{python_sitelib}/turbomail/*.py*
 
 %changelog
+* Mon Sep 17 2007 Luke Macken <lmacken at redhat.com> 2.0.4-1
+- Latest upstream release
+
 * Fri Jan 19 2007 Luke Macken <lmacken at redhat.com> 2.0.3-3
 - Remove superfluous build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2006 02:56:11 -0000	1.2
+++ sources	17 Sep 2007 19:39:42 -0000	1.3
@@ -1 +1 @@
-a4474e3767c83d9a1c14134673fe1a57  TurboMail-2.0.3.tar.gz
+7f82ae5f72f7d98dfab23efd956ede24  TurboMail-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 19:41:03 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 15:41:03 -0400
Subject: rpms/dev86/devel dev86.spec,1.23,1.24
Message-ID: <200709171941.l8HJf3OQ020631@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/dev86/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20584

Modified Files:
	dev86.spec 
Log Message:
don't ifarch patch definition


Index: dev86.spec
===================================================================
RCS file: /cvs/extras/rpms/dev86/devel/dev86.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dev86.spec	27 Aug 2007 08:25:38 -0000	1.23
+++ dev86.spec	17 Sep 2007 19:40:31 -0000	1.24
@@ -1,15 +1,13 @@
 Summary: A real mode 80x86 assembler and linker
 Name: dev86
 Version: 0.16.17
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://homepage.ntlworld.com/robert.debath/
 Source: http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-%{version}.tar.gz
 Patch0: dev86-noelks.patch
-%ifarch x86_64
 Patch1: dev86-x86_64.patch
-%endif
 Patch2: dev86-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: bin86
@@ -81,6 +79,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> - 0.16.17-7
+- don't ifarch patch definition
+
 * Thu Aug 27 2007 Jindrich Novy <jnovy at redhat.com> - 0.16.17-6
 - add missing BR on gawk
 - rebuild (#249952)



From fedora-extras-commits at redhat.com  Mon Sep 17 19:41:15 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:41:15 -0400
Subject: rpms/control-center/devel .cvsignore, 1.62, 1.63 control-center.spec,
	1.301, 1.302 sources, 1.65, 1.66
Message-ID: <200709171941.l8HJfFRn020668@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20605

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	4 Sep 2007 16:29:59 -0000	1.62
+++ .cvsignore	17 Sep 2007 19:40:42 -0000	1.63
@@ -1 +1 @@
-gnome-control-center-2.19.92.tar.bz2
+gnome-control-center-2.20.0.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- control-center.spec	4 Sep 2007 16:29:59 -0000	1.301
+++ control-center.spec	17 Sep 2007 19:40:42 -0000	1.302
@@ -21,12 +21,12 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/gnome-control-center/2.19/gnome-control-center-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-control-center/2.20/gnome-control-center-%{version}.tar.bz2
 
 # Remove "Apply" button and just have "Close" instead
 # FIXME: figure out how this applies to the new appearance capplet
@@ -386,6 +386,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	4 Sep 2007 16:29:59 -0000	1.65
+++ sources	17 Sep 2007 19:40:42 -0000	1.66
@@ -1 +1 @@
-c7019c6351c46a413a90256762c33e57  gnome-control-center-2.19.92.tar.bz2
+a3d5f41cd9e30e8f777c5ae43070557b  gnome-control-center-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:42:01 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 15:42:01 -0400
Subject: rpms/lapack/EL-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE Makefile.blas, 1.5, NONE Makefile.lapack, 1.4,
	NONE blas-bz143340.patch, 1.3, NONE blasqr.ps, 1.1, NONE branch,
	1.1, NONE lapack-20010525.patch, 1.1,
	NONE lapack-3.1.0-make.inc.patch, 1.1,
	NONE lapack-3.1.0-no-external-etime.patch, 1.1,
	NONE lapack-3.1.1-make.inc.patch, 1.1,
	NONE lapack-fixlwork.patch, 1.1, NONE lapack.spec, 1.17,
	NONE lapackqref.ps, 1.1, NONE sources, 1.5, NONE
Message-ID: <200709171942.l8HJg1Ma020742@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733

Added Files:
	dead.package 
Removed Files:
	Makefile Makefile.blas Makefile.lapack blas-bz143340.patch 
	blasqr.ps branch lapack-20010525.patch 
	lapack-3.1.0-make.inc.patch 
	lapack-3.1.0-no-external-etime.patch 
	lapack-3.1.1-make.inc.patch lapack-fixlwork.patch lapack.spec 
	lapackqref.ps sources 
Log Message:

Dead package lapack in EL-5.



--- NEW FILE dead.package ---
lapack is already in RHEL 5. My mistake.


--- Makefile DELETED ---


--- Makefile.blas DELETED ---


--- Makefile.lapack DELETED ---


--- blas-bz143340.patch DELETED ---


--- blasqr.ps DELETED ---


--- branch DELETED ---


--- lapack-20010525.patch DELETED ---


--- lapack-3.1.0-make.inc.patch DELETED ---


--- lapack-3.1.0-no-external-etime.patch DELETED ---


--- lapack-3.1.1-make.inc.patch DELETED ---


--- lapack-fixlwork.patch DELETED ---


--- lapack.spec DELETED ---


--- lapackqref.ps DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 19:50:29 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 15:50:29 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner-1.9a6-xds.patch,NONE,1.1
Message-ID: <200709171950.l8HJoTZi020991@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20982

Added Files:
	xulrunner-1.9a6-xds.patch 
Log Message:
Actually add xds patch

xulrunner-1.9a6-xds.patch:

--- NEW FILE xulrunner-1.9a6-xds.patch ---
Index: content/base/src/nsContentAreaDragDrop.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsContentAreaDragDrop.cpp,v
retrieving revision 1.69
diff -u -r1.69 nsContentAreaDragDrop.cpp
--- content/base/src/nsContentAreaDragDrop.cpp	8 Jul 2007 07:08:07 -0000	1.69
+++ content/base/src/nsContentAreaDragDrop.cpp	16 Sep 2007 20:11:36 -0000
@@ -855,9 +855,6 @@
     return NS_ERROR_NO_INTERFACE;
   }
 
-  rv = inDestFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // we rely on the fact that the WPB is refcounted by the channel etc,
   // so we don't keep a ref to it. It will die when finished.
   nsCOMPtr<nsIWebBrowserPersist> persist =
@@ -921,21 +918,32 @@
     if (targetFilename.IsEmpty())
       return NS_ERROR_FAILURE;
 
-    // get the target directory from the kFilePromiseDirectoryMime
-    // flavor
-    nsCOMPtr<nsISupports> dirPrimitive;
+    nsCOMPtr<nsIFile> file;
+
+    nsCOMPtr<nsISupports> fullpathPrimitive;
     dataSize = 0;
-    aTransferable->GetTransferData(kFilePromiseDirectoryMime,
-                                   getter_AddRefs(dirPrimitive), &dataSize);
-    nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
-    if (!destDirectory)
-      return NS_ERROR_FAILURE;
+    aTransferable->GetTransferData(kFilePromiseFullpathMime,
+                                   getter_AddRefs(fullpathPrimitive), &dataSize);
+    file = do_QueryInterface(fullpathPrimitive);
+    if (!file) {
+      // get the target directory from the kFilePromiseDirectoryMime
+      // flavor
+      nsCOMPtr<nsISupports> dirPrimitive;
+      dataSize = 0;
+      aTransferable->GetTransferData(kFilePromiseDirectoryMime,
+                                     getter_AddRefs(dirPrimitive), &dataSize);
+      nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
+      if (!destDirectory)
+        return NS_ERROR_FAILURE;
 
-    nsCOMPtr<nsIFile> file;
-    rv = destDirectory->Clone(getter_AddRefs(file));
-    NS_ENSURE_SUCCESS(rv, rv);
+      rv = destDirectory->Clone(getter_AddRefs(file));
+      NS_ENSURE_SUCCESS(rv, rv);
 
-    file->Append(targetFilename);
+      file->Append(targetFilename);
+
+      rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
 
     // now save the file
     rv = SaveURIToFile(sourceURLString, file);
Index: widget/public/nsITransferable.idl
===================================================================
RCS file: /cvsroot/mozilla/widget/public/nsITransferable.idl,v
retrieving revision 1.12
diff -u -r1.12 nsITransferable.idl
--- widget/public/nsITransferable.idl	12 Jun 2006 17:30:22 -0000	1.12
+++ widget/public/nsITransferable.idl	16 Sep 2007 20:12:24 -0000
@@ -70,6 +70,7 @@
 #define kFilePromiseMime            "application/x-moz-file-promise"
 // a synthetic flavor, put into the transferable once we know the destination directory of a file drag
 #define kFilePromiseDirectoryMime   "application/x-moz-file-promise-dir"
+#define kFilePromiseFullpathMime    "application/x-moz-file-promise-fullpath"
 
 %}
 
Index: widget/src/gtk2/nsDragService.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
retrieving revision 1.19
diff -u -r1.19 nsDragService.cpp
--- widget/src/gtk2/nsDragService.cpp	7 Aug 2007 15:18:38 -0000	1.19
+++ widget/src/gtk2/nsDragService.cpp	16 Sep 2007 20:12:26 -0000
@@ -60,11 +60,16 @@
 #include "gfxASurface.h"
 #include "nsImageToPixbuf.h"
 
+#define XDS_ATOM   gdk_atom_intern("XdndDirectSave0", FALSE)
+#define TEXT_ATOM  gdk_atom_intern("text/plain", FALSE)
+#define MAX_XDS_ATOM_VAL_LEN 4096
+
 static PRLogModuleInfo *sDragLm = NULL;
 
 static const char gMimeListType[] = "application/x-moz-internal-item-list";
 static const char gMozUrlType[] = "_NETSCAPE_URL";
 static const char gTextUriListType[] = "text/uri-list";
+static const char gDirectSaveType[] = "XdndDirectSave0";
 
 static void
 invisibleSourceDragEnd(GtkWidget        *aWidget,
@@ -79,6 +84,11 @@
                            guint32           aTime,
                            gpointer          aData);
 
+void
+invisibleSourceDragBegin(GtkWidget        *aWidget,
+                         GdkDragContext   *aContext,
+                         gpointer          aData);
+
 nsDragService::nsDragService()
 {
     // We have to destroy the hidden widget before the event loop stops
@@ -96,6 +106,8 @@
     // from our drag source
     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_data_get",
                        GTK_SIGNAL_FUNC(invisibleSourceDragDataGet), this);
+    gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_begin",
+                       GTK_SIGNAL_FUNC(invisibleSourceDragBegin), this);
     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_end",
                        GTK_SIGNAL_FUNC(invisibleSourceDragEnd), this);
 
@@ -989,6 +1001,21 @@
                                    id %ld\n", urlTarget->target, urlAtom));
                             targetArray.AppendElement(urlTarget);
                         }
+                        // XdndDirectSave
+                        if (strcmp(flavorStr, kFilePromiseMime) == 0) {
+                            // get the atom for the unicode string
+                            GdkAtom directsaveAtom =
+                              gdk_atom_intern(gDirectSaveType, FALSE);
+                            GtkTargetEntry *directsaveTarget =
+                             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                            directsaveTarget->target = g_strdup(gDirectSaveType);
+                            directsaveTarget->flags = 0;
+                            directsaveTarget->info = GPOINTER_TO_UINT(directsaveAtom);
+                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                   ("automatically adding target %s with \
+                                   id %ld\n", directsaveTarget->target, directsaveAtom));
+                            targetArray.AppendElement(directsaveTarget);
+                        }
                     }
                 } // foreach flavor in item
             } // if valid flavor list
@@ -1024,6 +1051,52 @@
 }
 
 void
+nsDragService::SourceBeginDrag(GdkDragContext *context)
+{
+    nsCOMPtr<nsISupports> genericItem;
+    mSourceDataItems->GetElementAt(0, getter_AddRefs(genericItem));
+    nsCOMPtr<nsITransferable> transferable(do_QueryInterface(genericItem));
+
+    nsresult rv;
+    nsCOMPtr<nsISupportsArray> flavorList;
+    rv = transferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
+    NS_ENSURE_SUCCESS(rv,);
+
+    PRUint32 cnt;
+    flavorList->Count(&cnt);
+
+    for (PRUint32 i = 0; i < cnt; ++i) {
+        nsCOMPtr<nsISupports> genericWrapper;
+        flavorList->GetElementAt(i, getter_AddRefs(genericWrapper));
+        nsCOMPtr<nsISupportsCString> currentFlavor(do_QueryInterface(genericWrapper, &rv));
+        NS_ENSURE_SUCCESS(rv,);
+
+        nsXPIDLCString flavorStr;
+        currentFlavor->ToString(getter_Copies(flavorStr));
+        if (strcmp(flavorStr, kFilePromiseDestFilename) == 0) {
+            PRUint32 dataSize = 0;
+            nsCOMPtr<nsISupports> tmp;
+            transferable->GetTransferData(kFilePromiseDestFilename,
+                                          getter_AddRefs(tmp), &dataSize);
+            nsCOMPtr<nsISupportsString> fileName = do_QueryInterface(tmp, &rv);
+            NS_ENSURE_SUCCESS(rv,);
+
+            nsAutoString filenameStr;
+            fileName->GetData(filenameStr);
+
+            nsCString filenameCStr;
+            CopyUTF16toUTF8(filenameStr, filenameCStr);
+
+            gdk_property_change(context->source_window,
+                                XDS_ATOM, TEXT_ATOM,
+                                8, GDK_PROP_MODE_REPLACE,
+                                (guchar *)filenameCStr.get(),
+                                filenameCStr.Length());
+        }
+    }
+}
+
+void
 nsDragService::SourceEndDrag(void)
 {
     // this just releases the list of data items that we provide
@@ -1106,6 +1179,8 @@
                              guint32           aTime)
 {
     PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet"));
+    nsresult rv;
+
     GdkAtom atom = (GdkAtom)aInfo;
     nsXPIDLCString mimeFlavor;
     gchar *typeName = 0;
@@ -1134,6 +1209,7 @@
         // we can convert it.
         PRBool needToDoConversionToPlainText = PR_FALSE;
         const char* actualFlavor = mimeFlavor;
+printf("%s\n", actualFlavor);
         if (strcmp(mimeFlavor,kTextMime) == 0) {
             actualFlavor = kUnicodeMime;
             needToDoConversionToPlainText = PR_TRUE;
@@ -1150,16 +1226,60 @@
             actualFlavor = gTextUriListType;
             needToDoConversionToPlainText = PR_TRUE;
         }
+        else if (strcmp(mimeFlavor, gTextUriListType) == 0) {
+            actualFlavor = gTextUriListType;
+            needToDoConversionToPlainText = PR_TRUE;
+        }
+        else if (strcmp(mimeFlavor, gDirectSaveType) == 0) {
+            guchar *propText;
+            gint propLen;
+
+            if (!gdk_property_get(aContext->source_window,
+                                 XDS_ATOM, TEXT_ATOM,
+                                 0, MAX_XDS_ATOM_VAL_LEN,
+                                 FALSE, NULL, NULL, &propLen,
+                                 (unsigned char **)&propText))
+                return;
+
+            /* Zero-terminate the string */
+            propText = (guchar *)g_realloc(propText, propLen + 1);
+            propText[propLen] = '\0';
+
+            char *fullpath;
+            fullpath = g_filename_from_uri((gchar *)propText, NULL, NULL);
+            if (!fullpath)
+                return;
+
+            nsCOMPtr<nsILocalFile> file;
+            rv = NS_NewNativeLocalFile(nsDependentCString(fullpath),
+                                       PR_FALSE, getter_AddRefs(file));
+            NS_ENSURE_SUCCESS(rv,);
+
+            item->SetTransferData(kFilePromiseFullpathMime, file,
+                                  sizeof(nsILocalFile*));
+
+            actualFlavor = kFilePromiseMime;
+
+            g_free(fullpath);
+        }
         else
             actualFlavor = mimeFlavor;
 
         PRUint32 tmpDataLen = 0;
         void    *tmpData = NULL;
-        nsresult rv;
         nsCOMPtr<nsISupports> data;
         rv = item->GetTransferData(actualFlavor,
                                    getter_AddRefs(data),
                                    &tmpDataLen);
+
+        if (strcmp(actualFlavor, kFilePromiseMime) == 0) {
+            const char *result = NS_SUCCEEDED(rv) ? "S" : "F";
+            gtk_selection_data_set(aSelectionData,
+                                   aSelectionData->target,
+                                   8, (guchar *)result, 1);
+            return;
+        }
+
         if (NS_SUCCEEDED(rv)) {
             nsPrimitiveHelpers::CreateDataFromPrimitive (actualFlavor, data,
                                                          &tmpData, tmpDataLen);
@@ -1224,6 +1344,18 @@
 
 /* static */
 void
+invisibleSourceDragBegin(GtkWidget        *aWidget,
+                         GdkDragContext   *aContext,
+                         gpointer          aData)
+{
+    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleDragBegin"));
+    nsDragService *dragService = (nsDragService *)aData;
+    // The drag has ended.  Release the hostages!
+    dragService->SourceBeginDrag(aContext);
+}
+
+/* static */
+void
 invisibleSourceDragEnd(GtkWidget        *aWidget,
                        GdkDragContext   *aContext,
                        gpointer          aData)
Index: widget/src/gtk2/nsDragService.h
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.h,v
retrieving revision 1.4
diff -u -r1.4 nsDragService.h
--- widget/src/gtk2/nsDragService.h	12 Apr 2007 04:37:40 -0000	1.4
+++ widget/src/gtk2/nsDragService.h	16 Sep 2007 20:12:26 -0000
@@ -101,6 +101,7 @@
     // This is called when the drag started with the invisible widget
     // finishes.  It's called from within the drag service code but from
     // a callback - it needs to be public.
+    void           SourceBeginDrag(GdkDragContext *context);
     void           SourceEndDrag(void);
     void           SourceDataGet(GtkWidget        *widget,
                                  GdkDragContext   *context,



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:53 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:53 -0400
Subject: rpms/ipe/F-7 ipe-6.0pre28-patch1.patch,NONE,1.1 ipe.spec,1.13,1.14
Message-ID: <200709171955.l8HJtrms021347@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/F-7

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/F-7/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:37 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:20 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:56 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:56 -0400
Subject: rpms/ipe/FC-6 ipe-6.0pre28-patch1.patch, NONE, 1.1 ipe.spec, 1.13,
	1.14
Message-ID: <200709171955.l8HJtu6f021350@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/FC-6

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/FC-6/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:40 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:24 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:59 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:59 -0400
Subject: rpms/ipe/devel ipe-6.0pre28-patch1.patch, NONE, 1.1 ipe.spec, 1.13,
	1.14
Message-ID: <200709171955.l8HJtxLj021353@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/devel

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:44 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:27 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, devel) updated by katzj
Message-ID: <200709172000.l8HK0OCN013511@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora devel to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora devel) for davidz

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, 7) updated by katzj
Message-ID: <200709172000.l8HK0PQi013522@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora 7 to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora 7) for davidz

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, 6) updated by katzj
Message-ID: <200709172000.l8HK0PLK013534@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora 6 to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora 6) for davidz

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:02:40 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 16:02:40 -0400
Subject: rpms/gcstar/FC-6 gcstar.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <200709172002.l8HK2eHF027509@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481

Modified Files:
	gcstar.spec sources 
Log Message:
New upstream version


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcstar.spec	9 Sep 2007 17:15:14 -0000	1.6
+++ gcstar.spec	17 Sep 2007 20:02:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:15:14 -0000	1.4
+++ sources	17 Sep 2007 20:02:07 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:05:54 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 16:05:54 -0400
Subject: rpms/evolution/devel .cvsignore, 1.77,
	1.78 evolution-2.10.0-e-source-combo-box.patch, 1.5,
	1.6 evolution.spec, 1.290, 1.291 sources, 1.77,
	1.78 evolution-2.9.1-first-ascii.patch, 1.1, NONE
Message-ID: <200709172005.l8HK5s74027654@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27582

Modified Files:
	.cvsignore evolution-2.10.0-e-source-combo-box.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.9.1-first-ascii.patch 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0
- Remove patch for RH bug #182247 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	4 Sep 2007 03:23:24 -0000	1.77
+++ .cvsignore	17 Sep 2007 20:05:20 -0000	1.78
@@ -1 +1 @@
-evolution-2.11.92.tar.bz2
+evolution-2.12.0.tar.bz2

evolution-2.10.0-e-source-combo-box.patch:

Index: evolution-2.10.0-e-source-combo-box.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.0-e-source-combo-box.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.10.0-e-source-combo-box.patch	21 Aug 2007 02:45:51 -0000	1.5
+++ evolution-2.10.0-e-source-combo-box.patch	17 Sep 2007 20:05:20 -0000	1.6
@@ -1,5 +1,6 @@
---- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-07-05 02:11:06.000000000 -0400
-+++ evolution-2.11.90/widgets/misc/e-pilot-settings.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.12.0/widgets/misc/e-pilot-settings.c
+--- evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-09-16 15:33:23.000000000 -0400
++++ evolution-2.12.0/widgets/misc/e-pilot-settings.c	2007-09-17 14:31:05.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtk.h>
@@ -40,8 +41,9 @@
  }
  
  gboolean
---- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-08-09 02:46:59.000000000 -0400
-+++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-formatter.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-formatter.c	2007-09-17 14:31:05.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <camel/camel-store.h>
  #include <libecal/e-cal.h>
@@ -51,8 +53,9 @@
  #include <libedataserverui/e-source-selector.h>
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <mail/em-format-hook.h>
---- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-07-28 15:37:56.000000000 -0400
-+++ evolution-2.11.90/plugins/itip-formatter/itip-view.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-view.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-view.c	2007-09-17 14:31:05.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-mime-message.h>
  #include <libedataserver/e-time-utils.h>
@@ -177,8 +180,9 @@
  }
  
  void
---- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/gaimbuddies.c
+--- evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/gaimbuddies.c	2007-09-17 14:31:05.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <string.h>
  
@@ -188,8 +192,9 @@
  
  #include <sys/time.h>
  #include <sys/stat.h>
---- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box	2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/bbdb.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/bbdb.c
+--- evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box	2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/bbdb.c	2007-09-17 14:31:05.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <string.h>
  
@@ -408,8 +413,9 @@
  	gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
  	gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0);
  	stuff->gaim_option_menu = gaim_option;
---- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-07-05 02:06:54.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -158,9 +158,9 @@
  		  </child>
  
@@ -422,8 +428,9 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
---- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-07-05 02:06:54.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-09-17 14:31:05.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -539,8 +546,9 @@
  		gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
  		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
  	}
---- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-07-08 22:46:43.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -356,9 +356,9 @@
  		      </child>
  
@@ -553,8 +561,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
---- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-08-09 02:46:47.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c	2007-09-17 14:31:05.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <text/e-entry.h>
  
@@ -667,8 +676,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-07-28 15:38:05.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-09-17 14:31:05.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <libgnomeui/gnome-app.h>
  #include <libebook/e-book.h>
@@ -717,8 +727,9 @@
  	
  	g_object_unref (source_list);	
  
---- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -194,7 +194,7 @@
  		  <child>
  		    <widget class="Custom" id="source">
@@ -728,8 +739,9 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -827,7 +827,7 @@
  		      <child>
  			<widget class="Custom" id="source">
@@ -739,8 +751,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -671,7 +671,7 @@
  			<widget class="Custom" id="source">
  			  <property name="height_request">24</property>
@@ -750,8 +763,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.c	2007-09-17 14:31:44.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -761,16 +775,16 @@
  #include <libedataserverui/e-name-selector.h>
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
-@@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage *
- 	ECalComponentDateTime d;
+@@ -352,7 +352,6 @@ memo_page_fill_widgets (CompEditorPage *
  	GSList *l;
  	const char *categories;
+ 	gchar *backend_addr = NULL;
 -	ESource *source;
  
  	mpage = MEMO_PAGE (page);
  	priv = mpage->priv;
-@@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage *
- 	}
+@@ -451,8 +450,9 @@ memo_page_fill_widgets (CompEditorPage *
+ 		g_free (backend_addr);
  
  	/* Source */
 -	source = e_cal_get_source (page->client);
@@ -781,7 +795,7 @@
  
  	priv->updating = FALSE;
  
-@@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -893,13 +893,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -799,7 +813,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -911,8 +910,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -811,7 +825,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage)
+@@ -1055,7 +1055,7 @@ init_widgets (MemoPage *mpage)
  			    G_CALLBACK (categories_clicked_cb), mpage);
  
  	/* Source selector */
@@ -820,7 +834,7 @@
  			 G_CALLBACK (source_changed_cb), mpage);
  	
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void)
+@@ -1271,22 +1271,23 @@ memo_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -851,8 +865,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/event-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.c	2007-09-17 14:31:05.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <glib/gi18n.h>
@@ -862,7 +877,7 @@
  #include "common/authentication.h"
  #include "e-util/e-categories-config.h"
  #include "e-util/e-dialog-widgets.h"
-@@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage 
+@@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage 
  	const char *location, *uid = NULL;
  	const char *categories;
  	gchar *backend_addr = NULL;
@@ -870,7 +885,7 @@
  	GSList *l;
  	gboolean validated = TRUE;
  	
-@@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage 
+@@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage 
  	e_dialog_editable_set (priv->categories, categories);
  	
  	/* Source */
@@ -882,7 +897,7 @@
  
  	e_cal_component_get_uid (comp, &uid);
  	if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) 
-@@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event
+@@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (Event
  
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
@@ -892,7 +907,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
  		priv->sod->data->initialized = TRUE;
  	}	
-@@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -910,7 +925,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -922,7 +937,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage)
+@@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage)
  			    G_CALLBACK (categories_clicked_cb), epage);
  	
  	/* Source selector */
@@ -931,7 +946,7 @@
  			    G_CALLBACK (source_changed_cb), epage);
  	/* Alarms */
  	priv->alarm_list_store = e_alarm_list_new ();
-@@ -3315,24 +3316,25 @@ make_timezone_entry (void)
+@@ -3306,24 +3307,25 @@ make_timezone_entry (void)
  	return w;
  }
  
@@ -964,8 +979,9 @@
  }
  
  GtkWidget *make_status_icons (void);
---- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/task-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.c	2007-09-17 14:31:58.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -975,15 +991,15 @@
  #include <misc/e-dateedit.h>
  #include <e-util/e-dialog-utils.h>
  #include "common/authentication.h"
-@@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage *
- 	icalcomponent *icalcomp;
+@@ -533,7 +533,6 @@ task_page_fill_widgets (CompEditorPage *
  	const char *categories, *uid;
  	icaltimezone *zone, *default_zone;
+ 	gchar *backend_addr = NULL;
 -	ESource *source;
  
  	tpage = TASK_PAGE (page);
  	priv = tpage->priv;
-@@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage *
+@@ -677,8 +676,9 @@ task_page_fill_widgets (CompEditorPage *
  	e_dialog_editable_set (priv->categories, categories);
  
  	/* Source */
@@ -993,9 +1009,9 @@
 +		E_SOURCE_COMBO_BOX (priv->source_selector),
 +		e_cal_get_source (page->client));
  
- 	if (priv->is_assignment) {
- 		ECalComponentOrganizer organizer;	
-@@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo
+ 	e_cal_get_cal_address (COMP_EDITOR_PAGE (tpage)->client, &backend_addr, NULL);
+ 	set_subscriber_info_string (tpage, backend_addr);
+@@ -1688,13 +1688,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -1013,7 +1029,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1713,8 +1712,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -1025,7 +1041,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1726,7 +1726,7 @@ source_changed_cb (GtkWidget *widget, ES
  			comp_editor_notify_client_changed (
  				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
  				client);
@@ -1034,7 +1050,7 @@
  			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
  				task_page_show_options (tpage);
  			else
-@@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa
+@@ -1778,7 +1778,8 @@ task_page_sendoptions_clicked_cb (TaskPa
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
  		priv->sod->data->initialized = TRUE;
@@ -1044,7 +1060,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
  	}
  	
-@@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage)
+@@ -1836,7 +1837,7 @@ init_widgets (TaskPage *tpage)
  			    G_CALLBACK (categories_clicked_cb), tpage);
  	
  	/* Source selector */
@@ -1053,7 +1069,7 @@
  			 G_CALLBACK (source_changed_cb), tpage);
  
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -2093,22 +2094,23 @@ task_page_create_date_edit (void)
+@@ -2081,22 +2082,23 @@ task_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -1084,8 +1100,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box	2007-07-05 02:11:20.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/e-itip-control.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.12.0/calendar/gui/e-itip-control.c
+--- evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-itip-control.c	2007-09-17 14:31:05.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- evolution.spec	15 Sep 2007 21:38:15 -0000	1.290
+++ evolution.spec	17 Sep 2007 20:05:20 -0000	1.291
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.92
-Release: 4%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -103,9 +103,6 @@
 # RH bug #176400
 Patch27: evolution-2.9.1-im-context-reset.patch
 
-# RH bug #182247
-Patch28: evolution-2.9.1-first-ascii.patch
-
 # RH bug #216537 / GNOME bug #383047
 #Patch29: evolution-2.9.3-view-attachment-uri.patch
 
@@ -260,7 +257,6 @@
 %patch25 -p1 -b .kill-ethread
 %patch26 -p1 -b .kill-ememory
 %patch27 -p1 -b .im-context-reset
-%patch28 -p1 -b .first-ascii
 #%patch29 -p1 -b .view-attachment-uri
 %patch30 -p1 -b .source-path-entry
 %patch31 -p1 -b .meeting-list-view
@@ -674,7 +670,6 @@
 %{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 %{evo_plugin_dir}/org-gnome-publish-calendar.xml
-%{evo_plugin_dir}/publish-calendar.glade
 
 %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
@@ -717,6 +712,10 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+- Remove patch for RH bug #182247 (fixed upstream).
+
 * Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
 - Add patch for GNOME bug #477045 (use standard icon names).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	4 Sep 2007 03:23:24 -0000	1.77
+++ sources	17 Sep 2007 20:05:20 -0000	1.78
@@ -1 +1 @@
-4149faf2ee5f0b0ed10114b076fb0ade  evolution-2.11.92.tar.bz2
+aaa378a63477b56de214ea9eaa7f8560  evolution-2.12.0.tar.bz2


--- evolution-2.9.1-first-ascii.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:06:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 16:06:10 -0400
Subject: rpms/qt4/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.14,
	NONE 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE Trolltech.conf,
	1.1, NONE assistant.desktop, 1.3, NONE designer.desktop, 1.2,
	NONE linguist.desktop, 1.2, NONE qconfig-multilib.h, 1.2,
	NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2,
	NONE qt-x11-opensource-src-4.2.2-multilib.patch, 1.1,
	NONE qt4-wrapper.sh, 1.3, NONE qt4.csh, 1.1, NONE qt4.macros,
	1.1, NONE qt4.sh, 1.1, NONE qt4.spec, 1.31,
	NONE qtconfig.desktop, 1.3, NONE qtdemo.desktop, 1.2,
	NONE sources, 1.12, NONE
Message-ID: <200709172006.l8HK6AR9027679@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670

Added Files:
	dead.package 
Removed Files:
	.cvsignore 0154-qdbuscpp2xml-moc_path.diff Trolltech.conf 
	assistant.desktop designer.desktop linguist.desktop 
	qconfig-multilib.h 
	qt-x11-opensource-src-4.1.2-assistant4.patch 
	qt-x11-opensource-src-4.2.2-multilib.patch qt4-wrapper.sh 
	qt4.csh qt4.macros qt4.sh qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Log Message:
qt4 included in rhel5



--- NEW FILE dead.package ---
qt4 included in rhel5


--- .cvsignore DELETED ---


--- 0154-qdbuscpp2xml-moc_path.diff DELETED ---


--- Trolltech.conf DELETED ---


--- assistant.desktop DELETED ---


--- designer.desktop DELETED ---


--- linguist.desktop DELETED ---


--- qconfig-multilib.h DELETED ---


--- qt-x11-opensource-src-4.1.2-assistant4.patch DELETED ---


--- qt-x11-opensource-src-4.2.2-multilib.patch DELETED ---


--- qt4-wrapper.sh DELETED ---


--- qt4.csh DELETED ---


--- qt4.macros DELETED ---


--- qt4.sh DELETED ---


--- qt4.spec DELETED ---


--- qtconfig.desktop DELETED ---


--- qtdemo.desktop DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:42 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:42 -0400
Subject: rpms/ntfs-3g/F-7 ntfs-3g.spec,1.17,1.18 sources,1.13,1.14
Message-ID: <200709172007.l8HK7g0x027784@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/F-7

Modified Files:
	ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/ntfs-3g.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ntfs-3g.spec	26 Aug 2007 14:45:53 -0000	1.17
+++ ntfs-3g.spec	17 Sep 2007 20:07:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Aug 2007 14:45:53 -0000	1.13
+++ sources	17 Sep 2007 20:07:09 -0000	1.14
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:45 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:45 -0400
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.18,1.19 sources,1.14,1.15
Message-ID: <200709172007.l8HK7jIZ027788@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/FC-6

Modified Files:
	ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	26 Aug 2007 14:45:56 -0000	1.18
+++ ntfs-3g.spec	17 Sep 2007 20:07:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Aug 2007 14:45:56 -0000	1.14
+++ sources	17 Sep 2007 20:07:12 -0000	1.15
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:51 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:51 -0400
Subject: rpms/ntfs-3g/devel .cvsignore, 1.12, 1.13 ntfs-3g.spec, 1.17,
	1.18 sources, 1.13, 1.14
Message-ID: <200709172007.l8HK7pNc027798@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/devel

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Aug 2007 14:45:58 -0000	1.12
+++ .cvsignore	17 Sep 2007 20:07:17 -0000	1.13
@@ -3,3 +3,4 @@
 ntfs-3g-1.710.tgz
 ntfs-3g-1.810.tgz
 ntfs-3g-1.826.tgz
+ntfs-3g-1.913.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ntfs-3g.spec	26 Aug 2007 14:45:58 -0000	1.17
+++ ntfs-3g.spec	17 Sep 2007 20:07:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Aug 2007 14:45:58 -0000	1.13
+++ sources	17 Sep 2007 20:07:17 -0000	1.14
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:10:53 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:10:53 -0700
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <200709172010.l8HKAsJw017344@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:10:59 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:10:59 -0700
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <200709172011.l8HKB0Bo017392@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:02 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:02 -0700
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <200709172012.l8HKC3pl017705@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on lvm2 (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:07 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:07 -0700
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <200709172012.l8HKC8s2018818@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on lvm2 (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:33 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:33 -0700
Subject: [pkgdb] dmraid had acl change status
Message-ID: <200709172012.l8HKCXPM017869@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on dmraid (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:36 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:36 -0700
Subject: [pkgdb] dmraid had acl change status
Message-ID: <200709172012.l8HKCaj4018961@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on dmraid (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:14:23 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:14:23 -0700
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <200709172014.l8HKENYW018375@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper-multipath (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From fedora-extras-commits at redhat.com  Mon Sep 17 20:14:26 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:14:26 -0700
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <200709172014.l8HKER0k019467@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper-multipath (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From fedora-extras-commits at redhat.com  Mon Sep 17 20:17:36 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 16:17:36 -0400
Subject: rpms/mash/devel .cvsignore, 1.15, 1.16 mash.spec, 1.13, 1.14 sources,
	1.16, 1.17
Message-ID: <200709172017.l8HKHaQk028035@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28000

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Sep 2007 14:27:19 -0000	1.15
+++ .cvsignore	17 Sep 2007 20:17:03 -0000	1.16
@@ -1 +1 @@
-mash-0.2.3.tar.gz
+mash-0.2.4.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mash.spec	6 Sep 2007 14:27:19 -0000	1.13
+++ mash.spec	17 Sep 2007 20:17:03 -0000	1.14
@@ -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.2.3
+Version:        0.2.4
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Mon Sep 17 2007 Bill Nottingham <notting at redhat.com> 0.2.4-1
+- repoview support (<jkeating at redhat.com>)
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.2.3-1
 - blacklist java-1.7.0-icedtea-devel (#271761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2007 14:27:19 -0000	1.16
+++ sources	17 Sep 2007 20:17:03 -0000	1.17
@@ -1 +1 @@
-e3da610758f7d1c7ce5568dc44746541  mash-0.2.3.tar.gz
+03ab739b45298a4db6e5d56eb549b6bc  mash-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:31:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:31:06 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.21, 1.22 sources, 
	1.21, 1.22 sugar-presence-service.spec, 1.21, 1.22
Message-ID: <200709172031.l8HKV6xv028542@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28501

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Sep 2007 20:02:34 -0000	1.21
+++ .cvsignore	17 Sep 2007 20:30:33 -0000	1.22
@@ -1 +1 @@
-sugar-presence-service-0.65-gitb8d04713ac.tar.bz2
+sugar-presence-service-0.65-git46898a3e00.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Sep 2007 20:02:34 -0000	1.21
+++ sources	17 Sep 2007 20:30:33 -0000	1.22
@@ -1 +1 @@
-ab6018517e2e67ab9435125ecbc1db38  sugar-presence-service-0.65-gitb8d04713ac.tar.bz2
+0af58d6647aef1a3c606c447db4164ec  sugar-presence-service-0.65-git46898a3e00.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar-presence-service.spec	12 Sep 2007 20:02:35 -0000	1.21
+++ sugar-presence-service.spec	17 Sep 2007 20:30:33 -0000	1.22
@@ -1,9 +1,9 @@
-%define alphatag 20070912git
-%define commitid b8d04713ac
+%define alphatag 20070917git
+%define commitid 46898a3e00
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.16.%{alphatag}b8d04713ac
+Release: 0.17.%{alphatag}46898a3e00
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:39:44 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:39:44 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.52, 1.53 sources, 1.53,
	1.54 sugar.spec, 1.61, 1.62
Message-ID: <200709172039.l8HKdieQ030667@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30645

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	15 Sep 2007 01:21:18 -0000	1.52
+++ .cvsignore	17 Sep 2007 20:39:12 -0000	1.53
@@ -1 +1 @@
-sugar-0.65-git8ef6c57f8b.tar.bz2
+sugar-0.65-gited22733941.tar.bz2







From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:37 -0700
Subject: [pkgdb] climm was added for ondrejj
Message-ID: <200709172041.l8HKfe96026476@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package climm with summary Text/line based ICQ client with many features
Kevin Fenzi (kevin) has approved Package climm
Kevin Fenzi (kevin) has added a Fedora devel branch for climm with an owner of ondrejj
Kevin Fenzi (kevin) has approved climm in Fedora devel
Kevin Fenzi (kevin) has approved Package climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, 7) updated by kevin
Message-ID: <200709172041.l8HKfnAl025735@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, devel) updated by kevin
Message-ID: <200709172041.l8HKfnf4025755@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora devel)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, 6) updated by kevin
Message-ID: <200709172041.l8HKfnY7025746@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora 6)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:11 -0400
Subject: rpms/climm - New directory
Message-ID: <200709172042.l8HKgBq0030902@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm

Log Message:
Directory /cvs/extras/rpms/climm added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:15 -0400
Subject: rpms/climm/devel - New directory
Message-ID: <200709172042.l8HKgFMM030915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm/devel

Log Message:
Directory /cvs/extras/rpms/climm/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:17 -0400
Subject: rpms/climm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709172042.l8HKgH95030940@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm

Added Files:
	Makefile import.log 
Log Message:
Setup of module climm


--- NEW FILE Makefile ---
# Top level Makefile for module climm
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:19 -0400
Subject: rpms/climm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709172042.l8HKgJHB030956@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module climm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: climm
# $Id: Makefile,v 1.1 2007/09/17 20:42:17 kevin Exp $
NAME := climm
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 fedora-extras-commits at redhat.com  Mon Sep 17 20:42:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:42:34 -0400
Subject: rpms/krb5/F-7 kadmind.init,1.11,1.12 krb5.spec,1.115,1.116
Message-ID: <200709172042.l8HKgYtN031103@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30836

Modified Files:
	kadmind.init krb5.spec 
Log Message:
- fix incorrect call to "test" in the kadmin init script (#287291)


Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/kadmind.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadmind.init	6 Sep 2007 20:06:44 -0000	1.11
+++ kadmind.init	17 Sep 2007 20:42:00 -0000	1.12
@@ -34,8 +34,8 @@
 	    # then we don't know for sure that this is an error.
   	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
+	        exit 0
 	    fi
-	    exit 0
 	fi
   	if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
 	    echo $"Error. This appears to be a slave server, found kpropd.acl"


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- krb5.spec	6 Sep 2007 20:07:45 -0000	1.115
+++ krb5.spec	17 Sep 2007 20:42:00 -0000	1.116
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -198,9 +198,11 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-5
+- fix incorrect call to "test" in the kadmin init script (#287291)
+
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
 - incorporate updated fix for CVE-2007-3999
-- fix incorrect call to "test" in the kadmin init script
 
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)



From fedora-extras-commits at redhat.com  Mon Sep 17 20:43:04 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:43:04 -0400
Subject: rpms/sugar/OLPC-2 sugar.spec,1.62,1.63
Message-ID: <200709172043.l8HKh40j031191@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31096

Modified Files:
	sugar.spec 
Log Message:
Add changelog


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sugar.spec	17 Sep 2007 20:39:12 -0000	1.62
+++ sugar.spec	17 Sep 2007 20:42:31 -0000	1.63
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.50.20070917gited22733941
+- New snapshot
+
 * Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:43:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:43:33 -0700
Subject: [pkgdb] filezilla (Fedora, 7) updated by kevin
Message-ID: <200709172043.l8HKhYrT026950@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for filezilla
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on filezilla (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on filezilla (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on filezilla (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 20:46:24 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:46:24 -0400
Subject: rpms/krb5/devel krb5-1.6.1-selinux-label.patch,1.3,1.4
Message-ID: <200709172046.l8HKkOvU031500@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31420/devel

Modified Files:
	krb5-1.6.1-selinux-label.patch 
Log Message:
- undef functions that we override before redefining them; ultimately this
  will have to be completely reworked to not use preprocessor magic because
  it's gotten way uglier than originally planned


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krb5-1.6.1-selinux-label.patch	11 Sep 2007 14:12:03 -0000	1.3
+++ krb5-1.6.1-selinux-label.patch	17 Sep 2007 20:46:21 -0000	1.4
@@ -291,7 +291,7 @@
  
 --- krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:19:00.000000000 -0400
 +++ krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:00:02.000000000 -0400
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,39 @@
 +#ifndef _KRB5_LABEL_H
 +#define _KRB5_LABEL_H
 +/* Wrapper functions which help us create files and directories with the right
@@ -308,10 +308,25 @@
 +int krb5int_labeled_mkdir(const char *path, mode_t mode);
 +int krb5int_labeled_mknod(const char *path, mode_t mode, dev_t device);
 +#ifndef USE_SELINUX_UNWRAPPED
++#ifdef fopen
++#undef fopen
++#endif
 +#define fopen krb5int_labeled_fopen
++#ifdef open
++#undef open
++#endif
 +#define open krb5int_labeled_open
++#ifdef creat
++#undef creat
++#endif
 +#define creat krb5int_labeled_creat
++#ifdef mkdir
++#undef mkdir
++#endif
 +#define mkdir krb5int_labeled_mkdir
++#ifdef mknod
++#undef mknod
++#endif
 +#define mknod krb5int_labeled_mknod
 +#endif
 +#endif



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:31 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:47:31 -0400
Subject: rpms/krb5/F-7 krb5.spec,1.116,1.117
Message-ID: <200709172047.l8HKlVkl031625@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31506/F-7

Modified Files:
	krb5.spec 
Log Message:
- add the bug ID to the kadmind fixes, note Fran's patch was identical to
  the one I thought we were already using in the F-7 branch



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- krb5.spec	17 Sep 2007 20:42:00 -0000	1.116
+++ krb5.spec	17 Sep 2007 20:46:59 -0000	1.117
@@ -199,7 +199,7 @@
 
 %changelog
 * Mon Sep 17 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-5
-- fix incorrect call to "test" in the kadmin init script (#287291)
+- fix incorrect call to "test" in the kadmin init script (Fran Taylor, #287291)
 
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
 - incorporate updated fix for CVE-2007-3999



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:47:34 -0400
Subject: rpms/krb5/devel krb5.spec,1.136,1.137
Message-ID: <200709172047.l8HKlYWG031628@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31506/devel

Modified Files:
	krb5.spec 
Log Message:
- add the bug ID to the kadmind fixes, note Fran's patch was identical to
  the one I thought we were already using in the F-7 branch



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- krb5.spec	11 Sep 2007 20:52:15 -0000	1.136
+++ krb5.spec	17 Sep 2007 20:47:02 -0000	1.137
@@ -219,7 +219,7 @@
 
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
 - incorporate updated fix for CVE-2007-3999
-- fix incorrect call to "test" in the kadmin init script
+- fix incorrect call to "test" in the kadmin init script (#287291)
 
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:47:56 -0700
Subject: [pkgdb] ladspa-amb-plugins was added for jwrdegoede
Message-ID: <200709172047.l8HKlv3H028193@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-amb-plugins with summary Ambisonics LADSPA plugins
Kevin Fenzi (kevin) has approved Package ladspa-amb-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-amb-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-amb-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-amb-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:48:02 -0700
Subject: [pkgdb] ladspa-amb-plugins (Fedora, 7) updated by kevin
Message-ID: <200709172048.l8HKm3KN027320@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-amb-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-amb-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:48:02 -0700
Subject: [pkgdb] ladspa-amb-plugins (Fedora, devel) updated by kevin
Message-ID: <200709172048.l8HKm30r027334@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-amb-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:39 -0400
Subject: rpms/ladspa-amb-plugins - New directory
Message-ID: <200709172048.l8HKmdgr031683@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-amb-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:43 -0400
Subject: rpms/ladspa-amb-plugins/devel - New directory
Message-ID: <200709172048.l8HKmh3d031697@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-amb-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:47 -0400
Subject: rpms/ladspa-amb-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709172048.l8HKmlG3031722@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-amb-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-amb-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:50 -0400
Subject: rpms/ladspa-amb-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709172048.l8HKmof2031738@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-amb-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-amb-plugins
# $Id: Makefile,v 1.1 2007/09/17 20:48:47 kevin Exp $
NAME := ladspa-amb-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 fedora-extras-commits at redhat.com  Mon Sep 17 20:56:38 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Mon, 17 Sep 2007 16:56:38 -0400
Subject: rpms/devilspie/devel devilspie-0.20.2-manpage.patch, NONE,
	1.1 devilspie.spec, 1.7, 1.8
Message-ID: <200709172056.l8HKucKj032268@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32184

Modified Files:
	devilspie.spec 
Added Files:
	devilspie-0.20.2-manpage.patch 
Log Message:
Fix some minor issue in manpage (#293731)

devilspie-0.20.2-manpage.patch:

--- NEW FILE devilspie-0.20.2-manpage.patch ---
diff -Naur devilspie-0.20.2.orig/devilspie.1 devilspie-0.20.2/devilspie.1
--- devilspie-0.20.2.orig/devilspie.1	2007-09-17 22:25:19.000000000 +0200
+++ devilspie-0.20.2/devilspie.1	2007-09-17 22:27:27.000000000 +0200
@@ -12,8 +12,7 @@
 is a program which can detect windows as they are created, and perform
 actions on them if they match as set of criteria.
 
-The configuration files are a set of s-expressions.  For documentation and
-examples, see /usr/share/doc/devilspie/.
+The configuration files are a set of s-expressions. 
 
 Command-lines options:
 .TP


Index: devilspie.spec
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/devilspie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- devilspie.spec	28 Aug 2007 20:55:46 -0000	1.7
+++ devilspie.spec	17 Sep 2007 20:56:06 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           devilspie
 Version:        0.20.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A window-matching utility
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/devilspie
 Source0:        http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch1:         devilspie-0.20.2-manpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libwnck-devel
 BuildRequires:  libpng-devel
@@ -24,6 +25,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .manpage
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -44,6 +47,9 @@
 %{_mandir}/man1/devilspie.1.gz
 
 %changelog
+* Mon Sep 17 2007 Sebastian Vahl <fedora at deadbabylon.de> 0.20.2-5
+- Fix some minor issue in manpage (#293731)
+
 * Tue Aug 28 2007 Sebastian Vahl <fedora at deadbabylon.de> 0.20.2-4
 - Change License to GPLv2+
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:04:25 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Mon, 17 Sep 2007 17:04:25 -0400
Subject: rpms/gcc/devel gcc41-pr33423.patch, NONE,
	1.1 gcc41-scanf-fmt-check.patch, NONE, 1.1 gcc41.spec, 1.173, 1.174
Message-ID: <200709172104.l8HL4PCe006037@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5978

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33423.patch gcc41-scanf-fmt-check.patch 
Log Message:
4.1.2-25

gcc41-pr33423.patch:

--- NEW FILE gcc41-pr33423.patch ---
2007-09-15  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/33423
	* builtins.c (expand_builtin_memory_chk): Handle COMPOUND_EXPRs
	returned by build_call_expr.

	* gcc.c-torture/compile/20070915-1.c: New test.

--- gcc/builtins.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/builtins.c	2007-09-16 22:31:40.000000000 +0200
@@ -10383,6 +10383,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	return 0;
 
       fn = build_function_call_expr (fn, arglist);
+      STRIP_TYPE_NOPS (fn);
+      while (TREE_CODE (fn) == COMPOUND_EXPR)
+	{
+	  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+		       EXPAND_NORMAL);
+	  fn = TREE_OPERAND (fn, 1);
+	}
       if (TREE_CODE (fn) == CALL_EXPR)
 	CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
       return expand_expr (fn, target, mode, EXPAND_NORMAL);
@@ -10432,6 +10439,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	      if (!fn)
 		return 0;
 	      fn = build_function_call_expr (fn, arglist);
+	      STRIP_TYPE_NOPS (fn);
+	      while (TREE_CODE (fn) == COMPOUND_EXPR)
+		{
+		  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+			       EXPAND_NORMAL);
+		  fn = TREE_OPERAND (fn, 1);
+		}
 	      if (TREE_CODE (fn) == CALL_EXPR)
 		CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
 	      return expand_expr (fn, target, mode, EXPAND_NORMAL);
--- gcc/testsuite/gcc.c-torture/compile/20070915-1.c.jj	2007-09-16 22:29:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070915-1.c	2007-09-16 22:29:37.000000000 +0200
@@ -0,0 +1,20 @@
+/* PR middle-end/33423 */
+
+static struct
+{
+  char buf[15];
+} u2;
+
+void
+test6 (void)
+{
+  int len;
+  char *p;
+
+  for (len = 0; len < 2; len++)
+    {
+      p = __builtin___memset_chk (u2.buf, '\0', len, 15);
+      if (p != u2.buf)
+	return;
+    }
+}

gcc41-scanf-fmt-check.patch:

--- NEW FILE gcc41-scanf-fmt-check.patch ---
2007-09-17  Jakub Jelinek  <jakub at redhat.com>

	* c-format.h (format_kind_info): Add alloc_char field.
	* c-format.c (scanf_flag_specs): Add 'm'.
	(scanf_flag_pairs): Add 'a', 'm' pair.
	(scan_char_table): Allow 'm' modifier for c, s, [, C and S.
	(format_types_orig): Add alloc_char fields.
	(check_format_info_main): Rename aflag to alloc_flag.
	Handle fki->alloc_char. modifier after width and before length
	modifiers.  Move FMT_FLAG_SCANF_A_KLUDGE handling before
	length modifiers as well.
	* config/sol2-c.c (solaris_format_types): Add alloc_char field.

	* gcc.dg/format/c90-scanf-5.c: New test.
	* gcc.dg/format/c99-scanf-4.c: New test.
	* gcc.dg/format/ext-7.c: New test.
	* gcc.dg/format/ext-8.c: New test.

--- gcc/c-format.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.h	2007-09-17 22:44:17.000000000 +0200
@@ -234,6 +234,8 @@ typedef struct
      specifiers, but is used to check for bad combinations such as length
      modifier with assignment suppression in scanf.  */
   int length_code_char;
+  /* Assignment-allocation flag character ('m' in scanf), otherwise 0.  */
+  int alloc_char;
   /* Pointer to type of argument expected if '*' is used for a width,
      or NULL if '*' not used for widths.  */
   tree *width_type;
--- gcc/c-format.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.c	2007-09-17 22:51:08.000000000 +0200
@@ -423,6 +423,7 @@ static const format_flag_spec scanf_flag
 {
   { '*',  0, 0, N_("assignment suppression"), N_("the assignment suppression scanf feature"), STD_C89 },
   { 'a',  0, 0, N_("'a' flag"),               N_("the 'a' scanf flag"),                       STD_EXT },
+  { 'm',  0, 0, N_("'m' flag"),               N_("the 'm' scanf flag"),                       STD_EXT },
   { 'w',  0, 0, N_("field width"),            N_("field width in scanf format"),              STD_C89 },
   { 'L',  0, 0, N_("length modifier"),        N_("length modifier in scanf format"),          STD_C89 },
   { '\'', 0, 0, N_("''' flag"),               N_("the ''' scanf flag"),                       STD_EXT },
@@ -434,6 +435,7 @@ static const format_flag_spec scanf_flag
 static const format_flag_pair scanf_flag_pairs[] =
 {
   { '*', 'L', 0, 0 },
+  { 'a', 'm', 0, 0 },
   { 0, 0, 0, 0 }
 };
 
@@ -648,16 +650,16 @@ static const format_char_info scan_char_
   { "u",     1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w'I", "W",   NULL },
   { "oxX",   1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w",   "W",   NULL },
   { "efgEG", 1, STD_C89, { T89_F,   BADLEN,  BADLEN,  T89_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
-  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "cW",  NULL },
-  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW",  NULL },
-  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW[", NULL },
+  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "cW",  NULL },
+  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW",  NULL },
+  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW[", NULL },
   { "p",     2, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
   { "n",     1, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  BADLEN,  T99_SST, T99_PD,  T99_IM  }, "",     "W",   NULL },
   /* C99 conversion specifiers.  */
   { "FaA",   1, STD_C99, { T99_F,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
   /* X/Open conversion specifiers.  */
-  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
-  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "W",   NULL },
+  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "W",   NULL },
+  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "W",   NULL },
   { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
 };
 
@@ -700,59 +702,59 @@ static const format_kind_info format_typ
   { "printf",   printf_length_specs,  print_char_table, " +#0-'I", NULL, 
     printf_flag_specs, printf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     &integer_type_node, &integer_type_node
   },
   { "asm_fprintf",   asm_fprintf_length_specs,  asm_fprintf_char_table, " +#0-", NULL, 
     asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     NULL, NULL
   },
   { "gcc_diag",   gcc_diag_length_specs,  gcc_diag_char_table, "q+", NULL, 
     gcc_diag_flag_specs, gcc_diag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_tdiag",   gcc_tdiag_length_specs,  gcc_tdiag_char_table, "q+", NULL, 
     gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cdiag",   gcc_cdiag_length_specs,  gcc_cdiag_char_table, "q+", NULL, 
     gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cxxdiag",   gcc_cxxdiag_length_specs,  gcc_cxxdiag_char_table, "q+#", NULL, 
     gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_gfc", NULL, gcc_gfc_char_table, "", NULL, 
     NULL, gcc_gfc_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "scanf",    scanf_length_specs,   scan_char_table,  "*'I", NULL, 
     scanf_flag_specs, scanf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
-    'w', 0, 0, '*', 'L',
+    'w', 0, 0, '*', 'L', 'm',
     NULL, NULL
   },
   { "strftime", NULL,                 time_char_table,  "_-0^#", "EO",
     strftime_flag_specs, strftime_flag_pairs,
-    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
+    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "strfmon",  strfmon_length_specs, monetary_char_table, "=^+(!-", NULL, 
     strfmon_flag_specs, strfmon_flag_pairs,
-    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
+    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
     NULL, NULL
   }
 };
@@ -1462,7 +1464,7 @@ check_format_info_main (format_check_res
       const format_length_info *fli = NULL;
       const format_char_info *fci = NULL;
       char flag_chars[256];
-      int aflag = 0;
+      int alloc_flag = 0;
       const char *format_start = format_chars;
       if (*format_chars == 0)
 	{
@@ -1721,6 +1723,31 @@ check_format_info_main (format_check_res
 	    }
 	}
 
+      if (fki->alloc_char && fki->alloc_char == *format_chars)
+	{
+	  i = strlen (flag_chars);
+	  flag_chars[i++] = fki->alloc_char;
+	  flag_chars[i] = 0;
+	  format_chars++;
+	}
+
+      /* Handle the scanf allocation kludge.  */
+      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
+	{
+	  if (*format_chars == 'a' && !flag_isoc99)
+	    {
+	      if (format_chars[1] == 's' || format_chars[1] == 'S'
+		  || format_chars[1] == '[')
+		{
+		  /* 'a' is used as a flag.  */
+		  i = strlen (flag_chars);
+		  flag_chars[i++] = 'a';
+		  flag_chars[i] = 0;
+		  format_chars++;
+		}
+	    }
+	}
+
       /* Read any length modifier, if this kind of format has them.  */
       fli = fki->length_char_specs;
       length_chars = NULL;
@@ -1783,23 +1810,6 @@ check_format_info_main (format_check_res
 	    }
 	}
 
-      /* Handle the scanf allocation kludge.  */
-      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
-	{
-	  if (*format_chars == 'a' && !flag_isoc99)
-	    {
-	      if (format_chars[1] == 's' || format_chars[1] == 'S'
-		  || format_chars[1] == '[')
-		{
-		  /* 'a' is used as a flag.  */
-		  i = strlen (flag_chars);
-		  flag_chars[i++] = 'a';
-		  flag_chars[i] = 0;
-		  format_chars++;
-		}
-	    }
-	}
-
       format_char = *format_chars;
       if (format_char == 0
 	  || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
@@ -1872,7 +1882,9 @@ check_format_info_main (format_check_res
 
       if ((fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
 	  && strchr (flag_chars, 'a') != 0)
-	aflag = 1;
+	alloc_flag = 1;
+      if (fki->alloc_char && strchr (flag_chars, fki->alloc_char) != 0)
+	alloc_flag = 1;
 
       if (fki->suppression_char
 	  && strchr (flag_chars, fki->suppression_char) != 0)
@@ -2044,13 +2056,13 @@ check_format_info_main (format_check_res
 
 	      wanted_type_ptr->wanted_type = wanted_type;
 	      wanted_type_ptr->wanted_type_name = wanted_type_name;
-	      wanted_type_ptr->pointer_count = fci->pointer_count + aflag;
+	      wanted_type_ptr->pointer_count = fci->pointer_count + alloc_flag;
 	      wanted_type_ptr->char_lenient_flag = 0;
 	      if (strchr (fci->flags2, 'c') != 0)
 		wanted_type_ptr->char_lenient_flag = 1;
 	      wanted_type_ptr->writing_in_flag = 0;
 	      wanted_type_ptr->reading_from_flag = 0;
-	      if (aflag)
+	      if (alloc_flag)
 		wanted_type_ptr->writing_in_flag = 1;
 	      else
 		{
--- gcc/config/sol2-c.c.jj	2007-02-20 22:39:11.000000000 +0100
+++ gcc/config/sol2-c.c	2007-09-17 22:44:17.000000000 +0200
@@ -74,7 +74,7 @@ const format_kind_info solaris_format_ty
   { "cmn_err",  cmn_err_length_specs,  cmn_err_char_table, "", NULL,
     cmn_err_flag_specs, cmn_err_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 0, 0, 'L',
+    'w', 0, 0, 0, 'L', 0,
     &integer_type_node, &integer_type_node
   }
 };
--- gcc/testsuite/gcc.dg/format/c90-scanf-5.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c90-scanf-5.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/c99-scanf-4.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c99-scanf-4.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-7.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-7.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,85 @@
+/* Test for scanf formats.  %a and %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu89 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp, double *dp)
+{
+  /* %a formats for allocation, only recognized in C90 mode, are a
+     GNU extension.  Followed by other characters, %a is not treated
+     specially.
+  */
+  scanf ("%as", sp);
+  scanf ("%aS", lsp);
+  scanf ("%las", dp);
+  scanf ("%la", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%las", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%a[bcd]", sp);
+  scanf ("%la[bcd]", dp);
+  scanf ("%*as");
+  scanf ("%*aS");
+  scanf ("%*las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*a[bcd]");
+  scanf ("%*la[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%10as", sp);
+  scanf ("%5aS", lsp);
+  scanf ("%9las", dp);
+  scanf ("%25a[bcd]", sp);
+  scanf ("%48la[bcd]", dp);
+  scanf ("%*10as");
+  scanf ("%*5aS");
+  scanf ("%*9las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25a[bcd]");
+  scanf ("%*48la[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+
+  scanf ("%mas", sp);	/* { dg-warning "flag together" } */
+  scanf ("%maS", lsp);	/* { dg-warning "flag together" } */
+  scanf ("%ma[bcd]", sp);	/* { dg-warning "flag together" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-8.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-8.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,56 @@
+/* Test for scanf formats.  %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%ma", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mA", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gcc41.spec	14 Sep 2007 20:46:35 -0000	1.173
+++ gcc41.spec	17 Sep 2007 21:03:53 -0000	1.174
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 24
+%define gcc_release 25
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -152,6 +152,8 @@
 Patch36: gcc41-builtin-va-arg-pack.patch
 Patch37: gcc41-builtin-va-arg-pack-len.patch
 Patch38: gcc41-pr27954.patch
+Patch39: gcc41-pr33423.patch
+Patch40: gcc41-scanf-fmt-check.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -473,6 +475,8 @@
 %patch36 -p0 -b .builtin-va-arg-pack~
 %patch37 -p0 -b .builtin-va-arg-pack-len~
 %patch38 -p0 -b .pr27954~
+%patch39 -p0 -b .pr33423~
+%patch40 -p0 -b .scanf-fmt-check~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1627,6 +1631,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
+- fix ICE on __builtin_mem*_chk if it couldn't be folded until
+  expand time and at that point it can avoid a call (PR middle-end/33423)
+- handle the upcoming POSIX 'm' *scanf allocation modifier in
+  GCC format checking, fix up some details about %as/%aS/%a[
+
 * Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24
 - backport __builtin_va_arg_pack_len () support
 - fix Fortran error recovery with DATA (Jerry DeLisle, #281331,



From fedora-extras-commits at redhat.com  Mon Sep 17 21:26:51 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:26:51 -0400
Subject: rpms/gai/devel gai.spec,1.24,1.25
Message-ID: <200709172126.l8HLQp0c006719@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6693

Modified Files:
	gai.spec 
Log Message:
Update license field


Index: gai.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gai/devel/gai.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gai.spec	21 Jan 2007 23:37:46 -0000	1.24
+++ gai.spec	17 Sep 2007 21:26:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name:		gai
 Version:	0.5.10
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
-License:	LGPL
+License:	LGPLv2+
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-%{version}.tar.bz2
 Patch0:		gai-0.5.9-pkgconfig.patch
@@ -70,6 +70,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.5.10-11
+- License field updated
+
 * Sun Jan 21 2007 Michel Salim <michel.salim at gmail.com>
 - Remove unnecessary BR on mesa-libGLU-devel (added to gtkglext-devel)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:33:34 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 17 Sep 2007 17:33:34 -0400
Subject: rpms/openssh/devel openssh-4.7p1-revert-wsize.patch, NONE,
	1.1 openssh.spec, 1.113, 1.114
Message-ID: <200709172133.l8HLXYmI006914@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6878

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.7p1-revert-wsize.patch 
Log Message:
* Mon Sep 17 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-2
- revert default window size adjustments (#286181)


openssh-4.7p1-revert-wsize.patch:

--- NEW FILE openssh-4.7p1-revert-wsize.patch ---
Written-by: Jan Kratochvil <jkratoch at redhat.com>
Reviewed-by: Tomas Mraz <tmraz at redhat.com>

diff -up openssh-4.7p1/channels.h.revert-wsize openssh-4.7p1/channels.h
--- openssh-4.7p1/channels.h.revert-wsize	2007-06-12 15:38:54.000000000 +0200
+++ openssh-4.7p1/channels.h	2007-09-17 23:21:32.000000000 +0200
@@ -122,9 +122,9 @@ struct Channel {
 
 /* default window/packet sizes for tcp/x11-fwd-channel */
 #define CHAN_SES_PACKET_DEFAULT	(32*1024)
-#define CHAN_SES_WINDOW_DEFAULT	(64*CHAN_SES_PACKET_DEFAULT)
+#define CHAN_SES_WINDOW_DEFAULT	(4*CHAN_SES_PACKET_DEFAULT)
 #define CHAN_TCP_PACKET_DEFAULT	(32*1024)
-#define CHAN_TCP_WINDOW_DEFAULT	(64*CHAN_TCP_PACKET_DEFAULT)
+#define CHAN_TCP_WINDOW_DEFAULT	(4*CHAN_TCP_PACKET_DEFAULT)
 #define CHAN_X11_PACKET_DEFAULT	(16*1024)
 #define CHAN_X11_WINDOW_DEFAULT	(4*CHAN_X11_PACKET_DEFAULT)
 


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openssh.spec	6 Sep 2007 19:49:16 -0000	1.113
+++ openssh.spec	17 Sep 2007 21:33:02 -0000	1.114
@@ -63,7 +63,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.7p1
-Release: 1%{?dist}%{?rescue_rel}
+Release: 2%{?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
@@ -95,6 +95,7 @@
 Patch49: openssh-4.3p2-gssapi-canohost.patch
 Patch51: openssh-4.7p1-nss-keys.patch
 Patch52: openssh-4.7p1-sftp-drain-acks.patch
+Patch53: openssh-4.7p1-revert-wsize.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -228,6 +229,7 @@
 %patch49 -p1 -b .canohost
 %patch51 -p1 -b .nss-keys
 %patch52 -p1 -b .drain-acks
+%patch53 -p1 -b .revert-wsize
 
 autoreconf
 
@@ -480,6 +482,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-2
+- revert default window size adjustments (#286181)
+
 * Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
 - upgrade to latest upstream
 - use libedit in sftp (#203009)



From fedora-extras-commits at redhat.com  Mon Sep 17 21:37:59 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:37:59 -0400
Subject: rpms/vala/F-7 vala.spec,1.6,1.7
Message-ID: <200709172137.l8HLbxHx007153@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072/F-7

Modified Files:
	vala.spec 
Log Message:
Add missing Require: on perl-XML-Twig for vala-vapigen



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vala.spec	8 Sep 2007 17:26:50 -0000	1.6
+++ vala.spec	17 Sep 2007 21:37:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -45,7 +45,7 @@
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
 License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl-XML-LibXML
+Requires:       perl-XML-Twig
 
 %description    vapigen
 Tools to generate Vala API bindings from existing C libraries, allowing access
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-5
+- vapigen subpackage: add missing Require: on perl-XML-Twig
+
 * Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
 - Split -vapigen subpackage. It is functionally self-contained and the license
   is more restricted



From fedora-extras-commits at redhat.com  Mon Sep 17 21:38:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:38:02 -0400
Subject: rpms/vala/devel vala.spec,1.10,1.11
Message-ID: <200709172138.l8HLc2T8007156@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072/devel

Modified Files:
	vala.spec 
Log Message:
Add missing Require: on perl-XML-Twig for vala-vapigen



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vala.spec	8 Sep 2007 17:12:52 -0000	1.10
+++ vala.spec	17 Sep 2007 21:37:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -45,7 +45,7 @@
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
 License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl-XML-LibXML
+Requires:       perl-XML-Twig
 
 %description    vapigen
 Tools to generate Vala API bindings from existing C libraries, allowing access
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-5
+- vapigen subpackage: add missing Require: on perl-XML-Twig
+
 * Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
 - Split -vapigen subpackage. It is functionally self-contained and the license
   is more restricted



From fedora-extras-commits at redhat.com  Mon Sep 17 21:38:10 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 17 Sep 2007 17:38:10 -0400
Subject: rpms/pungi/devel .cvsignore, 1.24, 1.25 pungi.spec, 1.26,
	1.27 sources, 1.25, 1.26
Message-ID: <200709172138.l8HLcA29007163@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7100/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New release to fix up some bugs and make things better



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	30 Aug 2007 21:02:31 -0000	1.24
+++ .cvsignore	17 Sep 2007 21:37:38 -0000	1.25
@@ -1 +1 @@
-pungi-1.0.2.tar.gz
+pungi-1.1.0.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pungi.spec	30 Aug 2007 21:02:31 -0000	1.26
+++ pungi.spec	17 Sep 2007 21:37:38 -0000	1.27
@@ -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:        1.0.2
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -10,7 +10,7 @@
 URL:            http://hosted.fedoraproject.org/projects/pungi
 Source0:        http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       anaconda-runtime, yum => 3.0.3
+Requires:       anaconda-runtime, yum => 3.0.3, repoview
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -31,6 +31,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 %{__install} -d $RPM_BUILD_ROOT/var/cache/pungi
+%{__install} -d $RPM_BUILD_ROOT/%{_mandir}/man8
+%{__install} doc/pungi.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 
  
 %clean
@@ -39,15 +41,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Authors Changelog COPYING GPL README ToDo
+%doc Authors Changelog COPYING GPL ToDo doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
 %{_bindir}/pungi
 %{_datadir}/pungi
+%{_mandir}/man8/pungi.8.gz
 /var/cache/pungi
 
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 1.1.0-1
+- Create repoview content in the tree
+- Move the .composeinfo file into the directory we actually publish
+- Remove python2.5 needs (Mark McLoughlin)
+- Consolidate the download code for easier maint. (Mark McLoughlin)
+- Create a config class that can make using pungi modules easier. (Mark 
+McLoughlin)
+- Use url line in kickstart files as a repo
+- Fix a bug with default dest dir (notting)
+- Include a man page (dcantrell)
+- Fix a bug with file:// based repos
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 1.0.2-1
 - Fix some bugs with source iso creation
 - Add source repo to kickstart file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Aug 2007 21:02:31 -0000	1.25
+++ sources	17 Sep 2007 21:37:38 -0000	1.26
@@ -1 +1 @@
-ae788d7cf010263064cc66f02cff1b2b  pungi-1.0.2.tar.gz
+b3b7fc5296b9d4c7d9a18c81142baff1  pungi-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 21:48:07 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:48:07 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.249,
	1.250 xserver-1.3.0-edid-quirk-backports.patch, 1.1, 1.2
Message-ID: <200709172148.l8HLm7VG007363@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7333

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-edid-quirk-backports.patch 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
- xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
  to match current git.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- xorg-x11-server.spec	6 Sep 2007 21:25:33 -0000	1.249
+++ xorg-x11-server.spec	17 Sep 2007 21:47:33 -0000	1.250
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   23%{?dist}
+Release:   24%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -608,6 +608,10 @@
 
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
+- xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
+  to match current git.
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
 - xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
   stop working after several hours. (Marius Gedminas, #273801)

xserver-1.3.0-edid-quirk-backports.patch:

Index: xserver-1.3.0-edid-quirk-backports.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-edid-quirk-backports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-edid-quirk-backports.patch	12 Jul 2007 14:08:32 -0000	1.1
+++ xserver-1.3.0-edid-quirk-backports.patch	17 Sep 2007 21:47:33 -0000	1.2
@@ -1,18 +1,42 @@
-diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx	2007-04-18 00:33:14.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-07-12 09:45:38.000000000 -0400
-@@ -71,6 +71,10 @@ static Bool quirk_dt_sync_hm_vp (int scr
-     if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
- 	DDC->vendor.prod_id == 58653)
- 	return TRUE;
-+    /* Samsung SyncMaster 205BW */
-+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-+	DDC->vendor.prod_id == 541)
-+	return TRUE;
+diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.edid-quirks xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
+--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.edid-quirks	2007-04-18 00:33:14.000000000 -0400
++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-09-17 14:37:36.000000000 -0400
+@@ -49,32 +49,12 @@
  
-     return FALSE;
- }
-@@ -87,9 +91,10 @@ static Bool quirk_prefer_large_60 (int s
+ typedef enum {
+     DDC_QUIRK_NONE = 0,
+-    /* Force detailed sync polarity to -h +v */
+-    DDC_QUIRK_DT_SYNC_HM_VP = 1 << 0,
+     /* First detailed mode is bogus, prefer largest mode at 60hz */
+-    DDC_QUIRK_PREFER_LARGE_60 = 1 << 1,
++    DDC_QUIRK_PREFER_LARGE_60 = 1 << 0,
+     /* 135MHz clock is too high, drop a bit */
+-    DDC_QUIRK_135_CLOCK_TOO_HIGH = 1 << 2
++    DDC_QUIRK_135_CLOCK_TOO_HIGH = 1 << 1
+ } ddc_quirk_t;
+ 
+-static Bool quirk_dt_sync_hm_vp (int scrnIndex, xf86MonPtr DDC)
+-{
+-    /* Belinea 1924S1W */
+-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
+-	DDC->vendor.prod_id == 1932)
+-	return TRUE;
+-    /* Belinea 10 20 30W */
+-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
+-	DDC->vendor.prod_id == 2007)
+-	return TRUE;
+-    /* ViewSonic VX2025wm (bug #9941) */
+-    if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
+-	DDC->vendor.prod_id == 58653)
+-	return TRUE;
+-
+-    return FALSE;
+-}
+-
+ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
+ {
+     /* Belinea 10 15 55 */
+@@ -87,9 +67,10 @@ static Bool quirk_prefer_large_60 (int s
  	DDC->vendor.prod_id == 44358)
  	return TRUE;
  
@@ -25,3 +49,42 @@
  	return TRUE;
      
      return FALSE;
+@@ -112,10 +93,6 @@ typedef struct {
+ } ddc_quirk_map_t;
+ 
+ static const ddc_quirk_map_t ddc_quirks[] = {
+-    { 
+-	quirk_dt_sync_hm_vp,	DDC_QUIRK_DT_SYNC_HM_VP,
+-	"Set detailed timing sync polarity to -h +v"
+-    },
+     {
+ 	quirk_prefer_large_60,   DDC_QUIRK_PREFER_LARGE_60,
+ 	"Detailed timing is not preferred, use largest mode at 60Hz"
+@@ -251,20 +228,15 @@ DDCModeFromDetailedTiming(int scrnIndex,
+     if (timing->interlaced)
+         Mode->Flags |= V_INTERLACE;
+ 
+-    if (quirks & DDC_QUIRK_DT_SYNC_HM_VP)
+-	Mode->Flags |= V_NHSYNC | V_PVSYNC;
++    if (timing->misc & 0x02)
++	Mode->Flags |= V_PVSYNC;
+     else
+-    {
+-	if (timing->misc & 0x02)
+-	    Mode->Flags |= V_PHSYNC;
+-	else
+-	    Mode->Flags |= V_NHSYNC;
++	Mode->Flags |= V_NVSYNC;
+     
+-	if (timing->misc & 0x01)
+-	    Mode->Flags |= V_PVSYNC;
+-	else
+-	    Mode->Flags |= V_NVSYNC;
+-    }
++    if (timing->misc & 0x01)
++	Mode->Flags |= V_PHSYNC;
++    else
++	Mode->Flags |= V_NHSYNC;
+ 
+     return Mode;
+ }



From fedora-extras-commits at redhat.com  Mon Sep 17 21:51:12 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:51:12 -0400
Subject: rpms/libFS/devel libFS.spec,1.27,1.28
Message-ID: <200709172151.l8HLpCha007527@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libFS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7468

Modified Files:
	libFS.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
- Rebuild for abstract socket support.



Index: libFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libFS.spec	21 Aug 2007 19:50:51 -0000	1.27
+++ libFS.spec	17 Sep 2007 21:50:40 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.0-4
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:51:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:51:56 -0400
Subject: rpms/libICE/devel libICE.spec,1.19,1.20
Message-ID: <200709172151.l8HLpuLG007629@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561

Modified Files:
	libICE.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- Rebuild for abstract socket support.



Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libICE.spec	21 Aug 2007 20:00:13 -0000	1.19
+++ libICE.spec	17 Sep 2007 21:51:23 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.3-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:52:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:52:36 -0400
Subject: rpms/libSM/devel libSM.spec,1.19,1.20
Message-ID: <200709172152.l8HLqaxp007685@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libSM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7663

Modified Files:
	libSM.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
- Rebuild for abstract socket support.



Index: libSM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libSM.spec	21 Aug 2007 20:01:18 -0000	1.19
+++ libSM.spec	17 Sep 2007 21:52:03 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libICE-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-2
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:53:16 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:53:16 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.35,1.36
Message-ID: <200709172153.l8HLrGkK007756@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7719

Modified Files:
	libXfont.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
- Rebuild for abstract socket support.



Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libXfont.spec	22 Aug 2007 19:02:09 -0000	1.35
+++ libXfont.spec	17 Sep 2007 21:52:44 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,7 +14,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -93,6 +93,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
+- Rebuild for abstract socket support.
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.2.9-3
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 17 22:08:12 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Mon, 17 Sep 2007 18:08:12 -0400
Subject: rpms/openswan/devel .cvsignore, 1.12, 1.13 openswan.spec, 1.39,
	1.40 sources, 1.12, 1.13 openswan-2.4.5.tar.gz.asc, 1.1,
	NONE openswan-typofix.patch, 1.1, NONE upstream, 1.2,
	NONE upstream-key.gpg, 1.1, NONE
Message-ID: <200709172208.l8HM8CS2014152@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14081

Modified Files:
	.cvsignore openswan.spec sources 
Removed Files:
	openswan-2.4.5.tar.gz.asc openswan-typofix.patch upstream 
	upstream-key.gpg 
Log Message:
Latest upstream brought in, and cleaned up some unused files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jan 2007 10:08:50 -0000	1.12
+++ .cvsignore	17 Sep 2007 22:07:40 -0000	1.13
@@ -1 +1,2 @@
 openswan-2.4.7.tar.gz
+openswan-2.4.9.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openswan.spec	20 Mar 2007 22:08:09 -0000	1.39
+++ openswan.spec	17 Sep 2007 22:07:40 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.4.7
+Version: 2.4.9
 #%define srcpkgver	%(echo %{version} | tr -s '_' '-')
 %define srcpkgver %{version}
 
@@ -24,7 +24,7 @@
 
 
 %define debug_package %{nil}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jan 2007 10:08:50 -0000	1.12
+++ sources	17 Sep 2007 22:07:40 -0000	1.13
@@ -1 +1 @@
-70f22e8adc39e07a165f75eccb7cd079  openswan-2.4.7.tar.gz
+845f12d80d443cfa1a52f2b53b987bee  openswan-2.4.9.tar.gz


--- openswan-2.4.5.tar.gz.asc DELETED ---


--- openswan-typofix.patch DELETED ---


--- upstream DELETED ---


--- upstream-key.gpg DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 22:10:50 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Mon, 17 Sep 2007 18:10:50 -0400
Subject: rpms/gcc/F-7 gcc41-pr33423.patch, NONE,
	1.1 gcc41-scanf-fmt-check.patch, NONE, 1.1 gcc41.spec, 1.165, 1.166
Message-ID: <200709172210.l8HMAoEw014312@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14282

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33423.patch gcc41-scanf-fmt-check.patch 
Log Message:
4.1.2-24.fc7

gcc41-pr33423.patch:

--- NEW FILE gcc41-pr33423.patch ---
2007-09-15  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/33423
	* builtins.c (expand_builtin_memory_chk): Handle COMPOUND_EXPRs
	returned by build_call_expr.

	* gcc.c-torture/compile/20070915-1.c: New test.

--- gcc/builtins.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/builtins.c	2007-09-16 22:31:40.000000000 +0200
@@ -10383,6 +10383,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	return 0;
 
       fn = build_function_call_expr (fn, arglist);
+      STRIP_TYPE_NOPS (fn);
+      while (TREE_CODE (fn) == COMPOUND_EXPR)
+	{
+	  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+		       EXPAND_NORMAL);
+	  fn = TREE_OPERAND (fn, 1);
+	}
       if (TREE_CODE (fn) == CALL_EXPR)
 	CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
       return expand_expr (fn, target, mode, EXPAND_NORMAL);
@@ -10432,6 +10439,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	      if (!fn)
 		return 0;
 	      fn = build_function_call_expr (fn, arglist);
+	      STRIP_TYPE_NOPS (fn);
+	      while (TREE_CODE (fn) == COMPOUND_EXPR)
+		{
+		  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+			       EXPAND_NORMAL);
+		  fn = TREE_OPERAND (fn, 1);
+		}
 	      if (TREE_CODE (fn) == CALL_EXPR)
 		CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
 	      return expand_expr (fn, target, mode, EXPAND_NORMAL);
--- gcc/testsuite/gcc.c-torture/compile/20070915-1.c.jj	2007-09-16 22:29:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070915-1.c	2007-09-16 22:29:37.000000000 +0200
@@ -0,0 +1,20 @@
+/* PR middle-end/33423 */
+
+static struct
+{
+  char buf[15];
+} u2;
+
+void
+test6 (void)
+{
+  int len;
+  char *p;
+
+  for (len = 0; len < 2; len++)
+    {
+      p = __builtin___memset_chk (u2.buf, '\0', len, 15);
+      if (p != u2.buf)
+	return;
+    }
+}

gcc41-scanf-fmt-check.patch:

--- NEW FILE gcc41-scanf-fmt-check.patch ---
2007-09-17  Jakub Jelinek  <jakub at redhat.com>

	* c-format.h (format_kind_info): Add alloc_char field.
	* c-format.c (scanf_flag_specs): Add 'm'.
	(scanf_flag_pairs): Add 'a', 'm' pair.
	(scan_char_table): Allow 'm' modifier for c, s, [, C and S.
	(format_types_orig): Add alloc_char fields.
	(check_format_info_main): Rename aflag to alloc_flag.
	Handle fki->alloc_char. modifier after width and before length
	modifiers.  Move FMT_FLAG_SCANF_A_KLUDGE handling before
	length modifiers as well.
	* config/sol2-c.c (solaris_format_types): Add alloc_char field.

	* gcc.dg/format/c90-scanf-5.c: New test.
	* gcc.dg/format/c99-scanf-4.c: New test.
	* gcc.dg/format/ext-7.c: New test.
	* gcc.dg/format/ext-8.c: New test.

--- gcc/c-format.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.h	2007-09-17 22:44:17.000000000 +0200
@@ -234,6 +234,8 @@ typedef struct
      specifiers, but is used to check for bad combinations such as length
      modifier with assignment suppression in scanf.  */
   int length_code_char;
+  /* Assignment-allocation flag character ('m' in scanf), otherwise 0.  */
+  int alloc_char;
   /* Pointer to type of argument expected if '*' is used for a width,
      or NULL if '*' not used for widths.  */
   tree *width_type;
--- gcc/c-format.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.c	2007-09-17 22:51:08.000000000 +0200
@@ -423,6 +423,7 @@ static const format_flag_spec scanf_flag
 {
   { '*',  0, 0, N_("assignment suppression"), N_("the assignment suppression scanf feature"), STD_C89 },
   { 'a',  0, 0, N_("'a' flag"),               N_("the 'a' scanf flag"),                       STD_EXT },
+  { 'm',  0, 0, N_("'m' flag"),               N_("the 'm' scanf flag"),                       STD_EXT },
   { 'w',  0, 0, N_("field width"),            N_("field width in scanf format"),              STD_C89 },
   { 'L',  0, 0, N_("length modifier"),        N_("length modifier in scanf format"),          STD_C89 },
   { '\'', 0, 0, N_("''' flag"),               N_("the ''' scanf flag"),                       STD_EXT },
@@ -434,6 +435,7 @@ static const format_flag_spec scanf_flag
 static const format_flag_pair scanf_flag_pairs[] =
 {
   { '*', 'L', 0, 0 },
+  { 'a', 'm', 0, 0 },
   { 0, 0, 0, 0 }
 };
 
@@ -648,16 +650,16 @@ static const format_char_info scan_char_
   { "u",     1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w'I", "W",   NULL },
   { "oxX",   1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w",   "W",   NULL },
   { "efgEG", 1, STD_C89, { T89_F,   BADLEN,  BADLEN,  T89_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
-  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "cW",  NULL },
-  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW",  NULL },
-  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW[", NULL },
+  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "cW",  NULL },
+  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW",  NULL },
+  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW[", NULL },
   { "p",     2, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
   { "n",     1, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  BADLEN,  T99_SST, T99_PD,  T99_IM  }, "",     "W",   NULL },
   /* C99 conversion specifiers.  */
   { "FaA",   1, STD_C99, { T99_F,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
   /* X/Open conversion specifiers.  */
-  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
-  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "W",   NULL },
+  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "W",   NULL },
+  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "W",   NULL },
   { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
 };
 
@@ -700,59 +702,59 @@ static const format_kind_info format_typ
   { "printf",   printf_length_specs,  print_char_table, " +#0-'I", NULL, 
     printf_flag_specs, printf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     &integer_type_node, &integer_type_node
   },
   { "asm_fprintf",   asm_fprintf_length_specs,  asm_fprintf_char_table, " +#0-", NULL, 
     asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     NULL, NULL
   },
   { "gcc_diag",   gcc_diag_length_specs,  gcc_diag_char_table, "q+", NULL, 
     gcc_diag_flag_specs, gcc_diag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_tdiag",   gcc_tdiag_length_specs,  gcc_tdiag_char_table, "q+", NULL, 
     gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cdiag",   gcc_cdiag_length_specs,  gcc_cdiag_char_table, "q+", NULL, 
     gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cxxdiag",   gcc_cxxdiag_length_specs,  gcc_cxxdiag_char_table, "q+#", NULL, 
     gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_gfc", NULL, gcc_gfc_char_table, "", NULL, 
     NULL, gcc_gfc_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "scanf",    scanf_length_specs,   scan_char_table,  "*'I", NULL, 
     scanf_flag_specs, scanf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
-    'w', 0, 0, '*', 'L',
+    'w', 0, 0, '*', 'L', 'm',
     NULL, NULL
   },
   { "strftime", NULL,                 time_char_table,  "_-0^#", "EO",
     strftime_flag_specs, strftime_flag_pairs,
-    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
+    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "strfmon",  strfmon_length_specs, monetary_char_table, "=^+(!-", NULL, 
     strfmon_flag_specs, strfmon_flag_pairs,
-    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
+    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
     NULL, NULL
   }
 };
@@ -1462,7 +1464,7 @@ check_format_info_main (format_check_res
       const format_length_info *fli = NULL;
       const format_char_info *fci = NULL;
       char flag_chars[256];
-      int aflag = 0;
+      int alloc_flag = 0;
       const char *format_start = format_chars;
       if (*format_chars == 0)
 	{
@@ -1721,6 +1723,31 @@ check_format_info_main (format_check_res
 	    }
 	}
 
+      if (fki->alloc_char && fki->alloc_char == *format_chars)
+	{
+	  i = strlen (flag_chars);
+	  flag_chars[i++] = fki->alloc_char;
+	  flag_chars[i] = 0;
+	  format_chars++;
+	}
+
+      /* Handle the scanf allocation kludge.  */
+      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
+	{
+	  if (*format_chars == 'a' && !flag_isoc99)
+	    {
+	      if (format_chars[1] == 's' || format_chars[1] == 'S'
+		  || format_chars[1] == '[')
+		{
+		  /* 'a' is used as a flag.  */
+		  i = strlen (flag_chars);
+		  flag_chars[i++] = 'a';
+		  flag_chars[i] = 0;
+		  format_chars++;
+		}
+	    }
+	}
+
       /* Read any length modifier, if this kind of format has them.  */
       fli = fki->length_char_specs;
       length_chars = NULL;
@@ -1783,23 +1810,6 @@ check_format_info_main (format_check_res
 	    }
 	}
 
-      /* Handle the scanf allocation kludge.  */
-      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
-	{
-	  if (*format_chars == 'a' && !flag_isoc99)
-	    {
-	      if (format_chars[1] == 's' || format_chars[1] == 'S'
-		  || format_chars[1] == '[')
-		{
-		  /* 'a' is used as a flag.  */
-		  i = strlen (flag_chars);
-		  flag_chars[i++] = 'a';
-		  flag_chars[i] = 0;
-		  format_chars++;
-		}
-	    }
-	}
-
       format_char = *format_chars;
       if (format_char == 0
 	  || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
@@ -1872,7 +1882,9 @@ check_format_info_main (format_check_res
 
       if ((fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
 	  && strchr (flag_chars, 'a') != 0)
-	aflag = 1;
+	alloc_flag = 1;
+      if (fki->alloc_char && strchr (flag_chars, fki->alloc_char) != 0)
+	alloc_flag = 1;
 
       if (fki->suppression_char
 	  && strchr (flag_chars, fki->suppression_char) != 0)
@@ -2044,13 +2056,13 @@ check_format_info_main (format_check_res
 
 	      wanted_type_ptr->wanted_type = wanted_type;
 	      wanted_type_ptr->wanted_type_name = wanted_type_name;
-	      wanted_type_ptr->pointer_count = fci->pointer_count + aflag;
+	      wanted_type_ptr->pointer_count = fci->pointer_count + alloc_flag;
 	      wanted_type_ptr->char_lenient_flag = 0;
 	      if (strchr (fci->flags2, 'c') != 0)
 		wanted_type_ptr->char_lenient_flag = 1;
 	      wanted_type_ptr->writing_in_flag = 0;
 	      wanted_type_ptr->reading_from_flag = 0;
-	      if (aflag)
+	      if (alloc_flag)
 		wanted_type_ptr->writing_in_flag = 1;
 	      else
 		{
--- gcc/config/sol2-c.c.jj	2007-02-20 22:39:11.000000000 +0100
+++ gcc/config/sol2-c.c	2007-09-17 22:44:17.000000000 +0200
@@ -74,7 +74,7 @@ const format_kind_info solaris_format_ty
   { "cmn_err",  cmn_err_length_specs,  cmn_err_char_table, "", NULL,
     cmn_err_flag_specs, cmn_err_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 0, 0, 'L',
+    'w', 0, 0, 0, 'L', 0,
     &integer_type_node, &integer_type_node
   }
 };
--- gcc/testsuite/gcc.dg/format/c90-scanf-5.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c90-scanf-5.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/c99-scanf-4.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c99-scanf-4.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-7.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-7.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,85 @@
+/* Test for scanf formats.  %a and %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu89 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp, double *dp)
+{
+  /* %a formats for allocation, only recognized in C90 mode, are a
+     GNU extension.  Followed by other characters, %a is not treated
+     specially.
+  */
+  scanf ("%as", sp);
+  scanf ("%aS", lsp);
+  scanf ("%las", dp);
+  scanf ("%la", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%las", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%a[bcd]", sp);
+  scanf ("%la[bcd]", dp);
+  scanf ("%*as");
+  scanf ("%*aS");
+  scanf ("%*las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*a[bcd]");
+  scanf ("%*la[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%10as", sp);
+  scanf ("%5aS", lsp);
+  scanf ("%9las", dp);
+  scanf ("%25a[bcd]", sp);
+  scanf ("%48la[bcd]", dp);
+  scanf ("%*10as");
+  scanf ("%*5aS");
+  scanf ("%*9las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25a[bcd]");
+  scanf ("%*48la[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+
+  scanf ("%mas", sp);	/* { dg-warning "flag together" } */
+  scanf ("%maS", lsp);	/* { dg-warning "flag together" } */
+  scanf ("%ma[bcd]", sp);	/* { dg-warning "flag together" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-8.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-8.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,56 @@
+/* Test for scanf formats.  %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%ma", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mA", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gcc41.spec	15 Sep 2007 08:08:15 -0000	1.165
+++ gcc41.spec	17 Sep 2007 22:10:17 -0000	1.166
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 23
+%define gcc_release 24
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -150,6 +150,8 @@
 Patch36: gcc41-builtin-va-arg-pack.patch
 Patch37: gcc41-builtin-va-arg-pack-len.patch
 Patch38: gcc41-pr27954.patch
+Patch39: gcc41-pr33423.patch
+Patch40: gcc41-scanf-fmt-check.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -471,6 +473,8 @@
 %patch36 -p0 -b .builtin-va-arg-pack~
 %patch37 -p0 -b .builtin-va-arg-pack-len~
 %patch38 -p0 -b .pr27954~
+%patch39 -p0 -b .pr33423~
+%patch40 -p0 -b .scanf-fmt-check~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1625,6 +1629,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24.fc7
+- fix ICE on __builtin_mem*_chk if it couldn't be folded until
+  expand time and at that point it can avoid a call (PR middle-end/33423)
+- handle the upcoming POSIX 'm' *scanf allocation modifier in
+  GCC format checking, fix up some details about %as/%aS/%a[
+
 * Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23.fc7
 - backport __builtin_va_arg_pack_len () support
 - fix Fortran error recovery with DATA (Jerry DeLisle, #281331,



From fedora-extras-commits at redhat.com  Mon Sep 17 22:20:18 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 18:20:18 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.27,1.28
Message-ID: <200709172220.l8HMKIJj014629@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	xulrunner.spec 
Log Message:
Fix files



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xulrunner.spec	17 Sep 2007 18:50:41 -0000	1.27
+++ xulrunner.spec	17 Sep 2007 22:19:45 -0000	1.28
@@ -1,3 +1,5 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 %define nss_version 3.10
 %define cairo_version 1.3.12
 %define prerelease a6
@@ -95,6 +97,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f %{buildroot}%{_libdir}/xulrunner-%{version}%{prerelease}/sdk/*.so
 
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
@@ -110,16 +113,36 @@
 %defattr(-,root,root,-)
 %doc LICENSE LEGAL
 %{_bindir}/xulrunner
-%{_sysconfdir}/gre.d/*.system.conf
 %{_libdir}/mozilla
-%{_libdir}/xulrunner-%{version}%{prerelease}
+%{_libdir}/xulrunner-%{version}%{prerelease}/chrome
+%{_libdir}/xulrunner-%{version}%{prerelease}/components
+%{_libdir}/xulrunner-%{version}%{prerelease}/defaults
+%{_libdir}/xulrunner-%{version}%{prerelease}/dictionaries
+%{_libdir}/xulrunner-%{version}%{prerelease}/greprefs
+%{_libdir}/xulrunner-%{version}%{prerelease}/icons
+%{_libdir}/xulrunner-%{version}%{prerelease}/modules
+%{_libdir}/xulrunner-%{version}%{prerelease}/plugins
+%{_libdir}/xulrunner-%{version}%{prerelease}/res
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.so
+%{_libdir}/xulrunner-%{version}%{prerelease}/mozilla-xremote-client
+%{_libdir}/xulrunner-%{version}%{prerelease}/regxpcom
+%{_libdir}/xulrunner-%{version}%{prerelease}/run-mozilla.sh
+%{_libdir}/xulrunner-%{version}%{prerelease}/updater
+%{_libdir}/xulrunner-%{version}%{prerelease}/xp*
+%{_libdir}/xulrunner-%{version}%{prerelease}/xulrunner*
+%{_libdir}/xulrunner-%{version}%{prerelease}/crashreporter
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.chk
+
+%{python_sitearch}/xpcom
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/idl/xulrunner-%{version}%{prerelease}
-%{_libdir}/xulrunner-devel-%{version}%{prerelease}
+%{_bindir}/xulrunner-config
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.a
+%{_libdir}/pkgconfig/*
 %{_includedir}/xulrunner-%{version}%{prerelease}
+%{_datadir}/idl/xulrunner-%{version}%{prerelease}
+%{_datadir}/aclocal/nspr.m4
 
 %changelog
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.



From fedora-extras-commits at redhat.com  Mon Sep 17 22:26:06 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 17 Sep 2007 18:26:06 -0400
Subject: rpms/perl-Imager/devel .cvsignore, 1.10, 1.11 perl-Imager.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200709172226.l8HMQ6bi016986@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Imager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16956

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Jun 2007 23:54:44 -0000	1.10
+++ .cvsignore	17 Sep 2007 22:25:34 -0000	1.11
@@ -1 +1 @@
-Imager-0.59.tar.gz
+Imager-0.60.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Imager.spec	29 Aug 2007 05:52:37 -0000	1.12
+++ perl-Imager.spec	17 Sep 2007 22:25:34 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Imager
-Version:        0.59
-Release:        2%{?dist}
+Version:        0.60
+Release:        1%{?dist}
 Summary:        Perl extension for Generating 24 bit Images
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 0.60-1
+- Update to 0.60.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.59-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Jun 2007 23:54:44 -0000	1.10
+++ sources	17 Sep 2007 22:25:34 -0000	1.11
@@ -1 +1 @@
-1604d6317ff6401fd3495a9fd1ce4db1  Imager-0.59.tar.gz
+938eae83ea3ed8d6349692c98d079534  Imager-0.60.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 22:32:55 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 17 Sep 2007 18:32:55 -0400
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.7, 1.8 perl-HTML-Mason.spec,
	1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200709172232.l8HMWtUN017183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17161

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.37.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Jun 2007 21:15:54 -0000	1.7
+++ .cvsignore	17 Sep 2007 22:32:23 -0000	1.8
@@ -1 +1 @@
-HTML-Mason-1.36.tar.gz
+HTML-Mason-1.37.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-HTML-Mason.spec	27 Jun 2007 21:15:54 -0000	1.11
+++ perl-HTML-Mason.spec	17 Sep 2007 22:32:23 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Mason
-Version:        1.36
+Version:        1.37
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
@@ -96,6 +96,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 1:1.37-1
+- Update to 1.37.
+
 * Tue Jun 26 2007 Steven Pritchard <steve at kspei.com> 1:1.36-1
 - Update to 1.36.
 - BR Test::Pod.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Jun 2007 21:15:54 -0000	1.7
+++ sources	17 Sep 2007 22:32:23 -0000	1.8
@@ -1 +1 @@
-8b46e7250df88eee9b05378ec1e93dd3  HTML-Mason-1.36.tar.gz
+5df5ca4e11890b7d9143c4869703ceb0  HTML-Mason-1.37.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 22:43:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 18:43:42 -0400
Subject: rpms/linux-libertine-fonts/devel linux-libertine-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
Message-ID: <200709172243.l8HMhgFW017483@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/linux-libertine-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17460

Modified Files:
	linux-libertine-fonts.spec sources .cvsignore 
Log Message:
Updated to 2.6.9
Update License tag



Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/linux-libertine-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-libertine-fonts.spec	17 Mar 2007 07:22:24 -0000	1.6
+++ linux-libertine-fonts.spec	17 Sep 2007 22:43:08 -0000	1.7
@@ -2,13 +2,13 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.4.9
+Version:       2.6.9
 Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       OFL/GPL
+License:       GPL+ with exceptions or OFL
 URL:           http://linuxlibertine.sf.net
-Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
+Source:        http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: fontforge
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Sun Sep 16 2007 Kevin Fenzi <kevin at tummy.com> - 2.6.9-1
+- Updated to 2.6.9
+- Update License tag
+
 * Sat Mar 17 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 2.4.9-1
 - Updated to 2.4.9
 - Reenabled generation of PDF files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2007 07:22:24 -0000	1.6
+++ sources	17 Sep 2007 22:43:08 -0000	1.7
@@ -1 +1 @@
-aa55aa7c3c6925f3fb7b07ba0e89d6ad  LinLibertineSRC-2.4.9.tgz
+449c862d3e46b1c187d2bbbce5d79b77  LinLibertineSRC-2.6.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2007 07:22:24 -0000	1.6
+++ .cvsignore	17 Sep 2007 22:43:08 -0000	1.7
@@ -1 +1 @@
-LinLibertineSRC-2.4.9.tgz
+LinLibertineSRC-2.6.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 23:06:15 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:06:15 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.53, 1.54 sources, 1.54,
	1.55 sugar.spec, 1.63, 1.64
Message-ID: <200709172306.l8HN6F6q023925@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	17 Sep 2007 20:39:12 -0000	1.53
+++ .cvsignore	17 Sep 2007 23:05:41 -0000	1.54
@@ -1 +1 @@
-sugar-0.65-gited22733941.tar.bz2
+sugar-0.65-gitb8ce5083b7.tar.bz2







From fedora-extras-commits at redhat.com  Mon Sep 17 23:11:08 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:11:08 -0400
Subject: rpms/sugar/OLPC-2 sugar-0.65-jabberserver.patch, NONE,
	1.1 sugar.spec, 1.64, 1.65
Message-ID: <200709172311.l8HNB8l7024046@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24017

Modified Files:
	sugar.spec 
Added Files:
	sugar-0.65-jabberserver.patch 
Log Message:
Add a patch to set jabber server


sugar-0.65-jabberserver.patch:

--- NEW FILE sugar-0.65-jabberserver.patch ---
--- sugar-0.65/sugar/profile.py.bak	2007-09-18 01:05:53.000000000 +0200
+++ sugar-0.65/sugar/profile.py	2007-09-18 01:06:06.000000000 +0200
@@ -24,7 +24,7 @@
 from sugar import util
 from sugar.graphics.xocolor import XoColor
 
-DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
+DEFAULT_JABBER_SERVER = 'jabber.laptop.org'
 
 _profile = None
 


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sugar.spec	17 Sep 2007 23:05:41 -0000	1.64
+++ sugar.spec	17 Sep 2007 23:10:35 -0000	1.65
@@ -16,6 +16,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: sugar-0.65-jabberserver.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: perl-XML-Parser
@@ -49,6 +51,8 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .jabberserver
+
 %build
 %configure
 make
@@ -81,6 +85,7 @@
 %changelog
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
 - New snapshot
+- Add a patch to set the jabber server to jabber.laptop.org
 
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.50.20070917gited22733941
 - New snapshot



From fedora-extras-commits at redhat.com  Mon Sep 17 23:14:46 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:14:46 -0400
Subject: rpms/sugar/OLPC-2 sugar.spec,1.65,1.66
Message-ID: <200709172314.l8HNEkcT024150@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24120

Modified Files:
	sugar.spec 
Log Message:
Fix patch level


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sugar.spec	17 Sep 2007 23:10:35 -0000	1.65
+++ sugar.spec	17 Sep 2007 23:14:14 -0000	1.66
@@ -51,7 +51,7 @@
 %prep
 %setup -q
 
-%patch1 -p0 -b .jabberserver
+%patch1 -p1 -b .jabberserver
 
 %build
 %configure



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora EPEL, 4) updated by kevin
Message-ID: <200709172316.l8HNGcac029718@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora, 7) updated by kevin
Message-ID: <200709172316.l8HNGc2U029729@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora 7)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora EPEL, 5) updated by kevin
Message-ID: <200709172316.l8HNGdX4029739@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Mon Sep 17 23:17:18 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 19:17:18 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, NONE,
	1.1 kdenetwork.spec, 1.101, 1.102
Message-ID: <200709172317.l8HNHIh2024465@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.7-ppp.patch 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
- +Requires: jasper (kopete yahoo support)


kdenetwork-3.5.7-ppp.patch:

--- NEW FILE kdenetwork-3.5.7-ppp.patch ---
diff -up kdenetwork-3.5.7/kppp/pppstats.cpp.ppp kdenetwork-3.5.7/kppp/pppstats.cpp
--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 05:12:34.000000000 -0500
+++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-08-29 09:15:50.000000000 -0400
@@ -69,6 +69,7 @@
  #ifndef HAVE_NET_IF_PPP_H
   #ifdef HAVE_LINUX_IF_PPP_H
    #include <linux/if.h>
+   #include <linux/ppp_defs.h>
    #include <linux/if_ppp.h>
   #endif
  #else
diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
--- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/configure.in.in	2007-08-29 09:13:21.000000000 -0400
@@ -26,6 +26,8 @@ AC_TRY_LINK([
   #ifndef STREAMS 
 
     #if defined(linux)
+      #include <linux/if.h>
+      #include <linux/ppp_defs.h>
       #include <linux/if_ppp.h>
     #else
       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
diff -up kdenetwork-3.5.7/kppp/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/opener.cpp	2007-08-29 09:14:29.000000000 -0400
@@ -69,6 +69,8 @@ extern "C" int _Precvmsg(int, void*, int
 
 #ifndef HAVE_NET_IF_PPP_H
 #  ifdef HAVE_LINUX_IF_PPP_H
+#    include <linux/if.h>
+#    include <linux/ppp_defs.h>
 #    include <linux/if_ppp.h>
 #  endif
 #else


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdenetwork.spec	29 Aug 2007 11:51:42 -0000	1.101
+++ kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -39,6 +39,8 @@
 Patch2: kdenetwork-3.1-buildroot.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
+# include more/proper ppp headers
+Patch5: kdenetwork-3.5.7-ppp.patch
 
 Requires(preun):  chkconfig
 Requires(post):   /sbin/ldconfig chkconfig
@@ -77,6 +79,8 @@
 # sametime
 %{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
+# yahoo
+Requires(hint): jasper
 
 
 %description
@@ -129,6 +133,7 @@
 %patch3 -p1 -b .kppp
 %endif
 %patch4 -p1 -b .resolv
+%patch5 -p1 -b .ppp
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -421,6 +426,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
+- +Requires: jasper (kopete yahoo support)
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-4
+- ppp patch (to enable kppp build again)
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-3
 - License: GPLv2
 - Provides: kdenetwork3(-devel)



From fedora-extras-commits at redhat.com  Mon Sep 17 23:20:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 17 Sep 2007 19:20:01 -0400
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.17,1.18
Message-ID: <200709172320.l8HNK1wS024672@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24620

Modified Files:
	bluez-gnome.spec 
Log Message:
* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
- Split out the analyzer so it's not installed by default
- Don't prefix the properties .desktop with fedora for no reason



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bluez-gnome.spec	31 Aug 2007 17:30:36 -0000	1.17
+++ bluez-gnome.spec	17 Sep 2007 23:19:26 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -27,6 +27,17 @@
 The bluez-gnome package contains Bluetooth helper applets and tools for
 the GNOME desktop environment.
 
+%package analyzer
+Summary: Bluetooth protocol analyzer
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
+%description analyzer
+The bluez-gnome package contains Bluetooth helper applets and tools for
+the GNOME desktop environment.
+
+This package contains the Bluetooth protocol analyzer.
+
 %prep
 %setup -q
 sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop.in
@@ -41,7 +52,7 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor=fedora				\
+desktop-file-install --vendor=""				\
 	--add-category=X-GNOME-NetworkSettings			\
 	--delete-original					\
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
@@ -91,16 +102,26 @@
 
 %files -f bluetooth-manager.lang
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/bluetooth-applet
+%{_bindir}/bluetooth-properties
 %config %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
-%{_datadir}/man/man1/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/man/man1/bluetooth-applet.1.gz
+%{_datadir}/man/man1/bluetooth-properties.1.gz
+%{_datadir}/applications/bluetooth-properties.desktop
 %{_datadir}/mime/packages/bluetooth-manager.xml
 %doc README COPYING AUTHORS ChangeLog
 
+%files analyzer
+%{_datadir}/applications/bluetooth-analyzer.desktop
+%{_bindir}/bluetooth-analyzer
+%{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
+- Split out the analyzer so it's not installed by default
+- Don't prefix the properties .desktop with fedora for no reason
+
 * Fri Aug 31 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-2
 - Remove the obex BR, we're not using it yet
 - Build with HAL support



From fedora-extras-commits at redhat.com  Mon Sep 17 23:27:32 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 17 Sep 2007 19:27:32 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.55,
	1.56 selinux-policy.spec, 1.521, 1.522
Message-ID: <200709172327.l8HNRWdb025034@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24952

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.55 -r 1.56 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- policy-20070703.patch	11 Sep 2007 20:05:08 -0000	1.55
+++ policy-20070703.patch	17 Sep 2007 23:26:58 -0000	1.56
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -26,32 +26,32 @@
 +system_r:sysadm_su_t:s0		system_r:unconfined_t:s0
 +system_r:unconfined_t:s0	system_r:unconfined_t:s0
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.8/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/default_type	2007-09-17 16:20:18.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
  staff_r:staff_t
 -unconfined_r:unconfined_t
  user_r:user_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/failsafe_context	2007-09-17 16:20:18.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/guest_u_default_contexts	2007-09-17 16:20:18.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/root_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -71,17 +71,17 @@
 -#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 user_r:user_t:s0
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.8/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/seusers	2007-09-17 16:20:18.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +__default__:system_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -92,15 +92,15 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/userhelper_context	2007-09-17 16:20:18.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/user_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -109,18 +109,18 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_su_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/xguest_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,5 @@
 +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_crond_t:s0
 +system_r:xdm_t		xguest_r:xguest_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.8/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -148,29 +148,17 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +staff_r:staff_sudo_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
---- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-09-06 15:43:06.000000000 -0400
-@@ -1,6 +1,5 @@
--auditadm_r:auditadm_t
--secadm_r:secadm_t
- sysadm_r:sysadm_t
-+secadm_r:secadm_t
- staff_r:staff_t
--unconfined_r:unconfined_t
- user_r:user_t
-+auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mls/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/guest_u_default_contexts	2007-09-17 16:20:18.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.8/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/root_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -189,9 +177,9 @@
  #
 -#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 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -202,9 +190,9 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.8/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/user_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -213,17 +201,17 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 +user_r:user_su_t:s0		user_r:user_t:s0
 +user_r:user_sudo_t:s0		user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-standard/guest_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-standard/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
[...7168 lines suppressed...]
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -265,7 +272,7 @@
+@@ -265,7 +265,7 @@
  # Xen store local policy
  #
  
@@ -15521,7 +14334,7 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -318,12 +325,13 @@
+@@ -318,12 +318,13 @@
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
  
  # internal communication is often done using fifo and unix sockets.
@@ -15536,7 +14349,7 @@
  files_search_var_lib(xm_t)
  
  allow xm_t xen_image_t:dir rw_dir_perms;
-@@ -336,6 +344,7 @@
+@@ -336,6 +337,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -15544,7 +14357,7 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -353,6 +362,7 @@
+@@ -353,6 +355,7 @@
  
  term_use_all_terms(xm_t)
  
@@ -15552,7 +14365,7 @@
  init_rw_script_stream_sockets(xm_t)
  init_use_fds(xm_t)
  
-@@ -366,3 +376,14 @@
+@@ -366,3 +369,14 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)
@@ -15567,19 +14380,19 @@
 +	fs_manage_nfs_files(xend_t)
 +	fs_read_nfs_symlinks(xend_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.8/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.8/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.8/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.te	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -15590,20 +14403,20 @@
 +optional_policy(`
 +	hal_dbus_chat(xguest_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.8/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/logadm.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.8/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/logadm.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.8/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-09-06 15:43:06.000000000 -0400
-@@ -0,0 +1,33 @@
++++ serefpolicy-3.0.8/policy/modules/users/logadm.te	2007-09-17 16:20:18.000000000 -0400
+@@ -0,0 +1,12 @@
 +policy_module(logadm,1.0.0)
 +
 +########################################
@@ -15614,47 +14427,26 @@
 +
 +allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
 +
-+logging_etc_filetrans_syslog_conf(logadm_t)
-+logging_manage_syslog_config(logadm_t)
-+logging_manage_all_logs(logadm_t)
-+
-+seutil_run_runinit(logadm_t, logadm_r, { logadm_tty_device_t logadm_devpts_t })
-+
-+domain_kill_all_domains(logadm_t)
-+seutil_read_bin_policy(logadm_t)
-+corecmd_exec_shell(logadm_t)
-+logging_send_syslog_msg(logadm_t)
-+logging_read_generic_logs(logadm_t)
-+logging_manage_audit_log(logadm_t)
-+logging_manage_audit_config(logadm_t)
-+logging_run_auditctl(logadm_t,logadm_r,{ logadm_tty_device_t logadm_devpts_t })
-+logging_run_auditd(logadm_t, logadm_r, { logadm_tty_device_t logadm_devpts_t })
-+userdom_dontaudit_read_sysadm_home_content_files(logadm_t)
-+consoletype_exec(logadm_t)
-+
-+kernel_read_ring_buffer(logadm_t)
-+dmesg_exec(logadm_t)
-+
-+files_dontaudit_search_all_dirs(logadm_t)
-+files_dontaudit_getattr_all_files(logadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
++logging_syslog_admin(logadm, logadm_t, logadm_r)
++logging_audit_admin(logadm, logadm_t, logadm_r)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.8/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/metadata.xml	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.8/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.8/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.8/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.te	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -15691,16 +14483,16 @@
 +userdom_dontaudit_search_sysadm_home_dirs(webadm_t)
 +userdom_dontaudit_search_generic_user_home_dirs(webadm_t)
 +
-+apache_admin(webadm_t, webadm_r, { webadm_tty_device_t webadm_devpts_t })
++apache_admin(webadm, webadm_t, webadm_r)
 +
 +gen_require(`
 +	type gadmin_t;
 +')
 +allow gadmin_t webadm_t:process transition;
 +allow webadm_t gadmin_t:dir getattr;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/support/obj_perm_sets.spt	2007-09-17 16:20:18.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -15724,9 +14516,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.8/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/users	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/users	2007-09-17 16:20:18.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -15761,9 +14553,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, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/Rules.modular	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/Rules.modular	2007-09-17 16:20:18.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- selinux-policy.spec	11 Sep 2007 20:05:08 -0000	1.521
+++ selinux-policy.spec	17 Sep 2007 23:26:58 -0000	1.522
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.0.7
-Release: 10%{?dist}
+Version: 3.0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
+- Allow cron to search nfs and samba homedirs
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
 - Allow NetworkManager to dbus chat with yum-updated
 



From fedora-extras-commits at redhat.com  Mon Sep 17 23:30:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 19:30:47 -0400
Subject: rpms/linux-libertine-fonts/F-7 linux-libertine-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
Message-ID: <200709172330.l8HNUlbs025277@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/linux-libertine-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25251

Modified Files:
	linux-libertine-fonts.spec sources .cvsignore 
Log Message:
Updated to 2.6.9
Update License tag



Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/linux-libertine-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-libertine-fonts.spec	17 Mar 2007 07:22:24 -0000	1.6
+++ linux-libertine-fonts.spec	17 Sep 2007 23:30:13 -0000	1.7
@@ -2,13 +2,13 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.4.9
+Version:       2.6.9
 Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       OFL/GPL
+License:       GPL+ with exceptions or OFL
 URL:           http://linuxlibertine.sf.net
-Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
+Source:        http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: fontforge
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Sun Sep 16 2007 Kevin Fenzi <kevin at tummy.com> - 2.6.9-1
+- Updated to 2.6.9
+- Update License tag
+
 * Sat Mar 17 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 2.4.9-1
 - Updated to 2.4.9
 - Reenabled generation of PDF files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2007 07:22:24 -0000	1.6
+++ sources	17 Sep 2007 23:30:13 -0000	1.7
@@ -1 +1 @@
-aa55aa7c3c6925f3fb7b07ba0e89d6ad  LinLibertineSRC-2.4.9.tgz
+449c862d3e46b1c187d2bbbce5d79b77  LinLibertineSRC-2.6.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2007 07:22:24 -0000	1.6
+++ .cvsignore	17 Sep 2007 23:30:13 -0000	1.7
@@ -1 +1 @@
-LinLibertineSRC-2.4.9.tgz
+LinLibertineSRC-2.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 00:50:57 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 17 Sep 2007 20:50:57 -0400
Subject: rpms/deskbar-applet/devel .cvsignore, 1.26, 1.27 deskbar-applet.spec,
	1.53, 1.54 sources, 1.26, 1.27
Message-ID: <200709180050.l8I0ovrb000385@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv361

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	21 Aug 2007 21:08:38 -0000	1.26
+++ .cvsignore	18 Sep 2007 00:50:23 -0000	1.27
@@ -1 +1 @@
-deskbar-applet-2.19.90.1.tar.bz2
+deskbar-applet-2.20.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- deskbar-applet.spec	21 Aug 2007 21:08:38 -0000	1.53
+++ deskbar-applet.spec	18 Sep 2007 00:50:23 -0000	1.54
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.19.90.1
+Version:        2.20.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.17/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.20/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,10 +44,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
-adir="${adir#*=}"
-install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
-install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
+#adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+#adir="${adir#*=}"
+mdir="$(grep "^modulesdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+mdir="${mdir#*=}"
+install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT$mdir
+install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/art
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
 
@@ -100,6 +102,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Luke Macken <lmacken at redhat.com> - 2.20.0-1
+- 2.20.0
+
+* Sun Sep  9 2007 Luke Macken <lmacken at redhat.com> - 2.19.92-1
+- 2.19.92
+
 * Sat Aug 21 2007 Luke Macken <lmacken at redhat.com> - 2.19.90.1-1
 - 2.19.90.1
 - Remove all patches, as they are all upstream now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	21 Aug 2007 21:08:38 -0000	1.26
+++ sources	18 Sep 2007 00:50:23 -0000	1.27
@@ -1 +1 @@
-796449483182bb9929a97c9596fa8a2b  deskbar-applet-2.19.90.1.tar.bz2
+3b7ae77476f7b11e53e50c8751e4ca1f  deskbar-applet-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 00:52:11 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Mon, 17 Sep 2007 20:52:11 -0400
Subject: rpms/openswan/devel openswan.spec,1.40,1.41
Message-ID: <200709180052.l8I0qBdr000520@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv437

Modified Files:
	openswan.spec 
Log Message:
Forgot changelog entry



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openswan.spec	17 Sep 2007 22:07:40 -0000	1.40
+++ openswan.spec	18 Sep 2007 00:51:38 -0000	1.41
@@ -24,7 +24,7 @@
 
 
 %define debug_package %{nil}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -234,6 +234,12 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Sep 17 2007 Steve Conklin <sconklin at redhat.com> - 2.4.9-2
+- Forgot changelog on last entry
+
+* Mon Sep 17 2007 Steve Conklin <sconklin at redhat.com> - 2.4.9-1
+- sync to upstream latest
+
 * Tue Mar 20 2007 Florian La Roche <laroche at redhat.com> - 2.4.7-3
 - do not use epoch macro, it is unset
 



From fedora-extras-commits at redhat.com  Tue Sep 18 01:23:10 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 17 Sep 2007 21:23:10 -0400
Subject: rpms/seahorse/devel seahorse.spec,1.30,1.31
Message-ID: <200709180123.l8I1NA0B007772@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746

Modified Files:
	seahorse.spec 
Log Message:

correct url



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- seahorse.spec	22 Aug 2007 23:55:21 -0000	1.30
+++ seahorse.spec	18 Sep 2007 01:22:38 -0000	1.31
@@ -7,7 +7,7 @@
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://seahorse.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/1.0/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils



From fedora-extras-commits at redhat.com  Tue Sep 18 01:38:58 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 17 Sep 2007 21:38:58 -0400
Subject: rpms/kde-filesystem/devel macros.kde4, 1.1, 1.2 kde-filesystem.spec,
	1.8, 1.9
Message-ID: <200709180138.l8I1cwEL008220@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8198/devel

Modified Files:
	kde-filesystem.spec 
Added Files:
	macros.kde4 
Log Message:
Merge changes from kde-filesystem-kde4-branch.

kde-filesystem now contains the required directories and RPM macros for both KDE 3 and 4, which allows adding parallel-installable KDE 4 development platform packages. (No dependency on KDE 4 is introduced, so there should be no noticeable changes for KDE 3 only users.)


Index: macros.kde4
===================================================================
RCS file: macros.kde4
diff -N macros.kde4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros.kde4	18 Sep 2007 01:38:25 -0000	1.2
@@ -0,0 +1,19 @@
+
+# api = 1
+# initial try, including only items that vary from defaults
+
+%cmake_kde4 \
+  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 ; \
+  %{__cmake} \\\
+  %if "%{_lib}" == "lib64" \
+    -DLIB_SUFFIX=64 \\\
+  %endif \
+  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
+  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
+  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
+  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
+  -DDATA_INSTALL_DIR=%{_kde4_appsdir}


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde-filesystem.spec	27 Aug 2007 15:51:59 -0000	1.8
+++ kde-filesystem.spec	18 Sep 2007 01:38:25 -0000	1.9
@@ -1,23 +1,41 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/kde4/apps
+%define _kde4_docdir %_kde4_prefix/share/doc
+%define _kde4_bindir %_kde4_prefix/bin
+%define _kde4_sbindir %_kde4_prefix/sbin
+%define _kde4_includedir %_kde4_prefix/include
+%define _kde4_debug RelWithDebInfo
+%define _kde4_macros_api 1
 
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 13%{?dist}
+Name: kde-filesystem
+Version: 3.92
+Release: 9%{?dist}
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Consider -- Rex
-#Provides: kde3-filesystem = %{version}-%{release}
-
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
 
+Source2: macros.kde4
+# increment whenever dirs change in an incompatible way
+# kde4 apps built using macros.kde4 should
+# Requires: kde4-macros(api) = %{_kde4_macros_api}
+Provides: kde4-macros(api) = %{_kde4_macros_api} 
+
 BuildRequires: gawk
 
 Requires:  filesystem
+Requires:  rpm
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -33,6 +51,7 @@
 rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
+## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
@@ -46,13 +65,72 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+## KDE4
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
+      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
+
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+# rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/kde4/apps
+%%_kde4_docdir %_kde4_prefix/share/doc
+%%_kde4_bindir %%_kde4_prefix/bin
+%%_kde4_sbindir %%_kde4_prefix/sbin
+%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_debug RelWithDebInfo
+%%_kde4_macros_api 1
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+
+# KDE3
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -71,22 +149,59 @@
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
+# KDE4
+%config /etc/rpm/macros.kde4
+%{_kde4_sysconfdir}/kde4/
+%{_kde4_libdir}
+%{_kde4_datadir}/applications/kde4/
+%{_kde4_appsdir}/
+%{_kde4_configdir}/
+%{_kde4_sharedir}/config.kcfg/
+%{_kde4_sharedir}/desktop-directories/
+%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/icons/locolor
+%{_kde4_sharedir}/services/
+%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/templates/
+%{_kde4_datadir}/wallpapers/
+%{_kde4_datadir}/sounds/
+%dir %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
+
 
 %changelog
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-13
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
-
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-12
 - - %%_prefix/{env,shutdown} (non-FHS)
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-11
-- fix templates.source typo
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
+- kde4-macros(api), %%_kde4_macros_api
+
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
+- use macros
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-4
+- fix kde4 macro
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-3
+- cleanup macros.kde4 (mostly use _kde4_ prefix)
+- Requires: rpm
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 3.92-2
+- add missing macros.kde4
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-10
-- +disttag
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
 
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
-- +%%_datadir/{sounds,templates,source,wallpapers}
+- +%%_datadir/{sounds,templates/.source,wallpapers}
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-8
 - +%%_datadir/{autostart,emoticons,mimelnk/*}



From fedora-extras-commits at redhat.com  Tue Sep 18 01:45:02 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 17 Sep 2007 21:45:02 -0400
Subject: rpms/nsd/F-7 nsd.init,1.5,1.6 nsd.spec,1.20,1.21 sources,1.8,1.9
Message-ID: <200709180145.l8I1j2uW008362@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8320

Modified Files:
	nsd.init nsd.spec sources 
Log Message:

Pulled in from devel branch after testing.

* 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




Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	18 Sep 2007 01:44:30 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	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


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	13 Jul 2007 18:47:21 -0000	1.20
+++ nsd.spec	18 Sep 2007 01:44:30 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -20,8 +20,10 @@
 %setup -q 
 
 %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}
@@ -30,14 +32,14 @@
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d -m 0755 %{buildroot}%{_initrddir}
-install -d -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.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 "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,6 +53,7 @@
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -74,6 +77,22 @@
 fi
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2007 04:27:39 -0000	1.8
+++ sources	18 Sep 2007 01:44:30 -0000	1.9
@@ -1,6 +1,2 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
-72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-e64633bb4e6eb46e8e16049e87333cb9  nsd.init
-a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
-73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
-ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz
+02fd7cfe4c455f180a2178da78b6cd21  nsd.init
+db964272bb653f3691cdae6932953432  nsd-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 01:50:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 21:50:01 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.6, 1.7 ConsoleKit.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200709180150.l8I1o1dY008552@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8530

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Apr 2007 16:34:29 -0000	1.6
+++ .cvsignore	18 Sep 2007 01:49:28 -0000	1.7
@@ -1,5 +1 @@
-console-kit-0.1.0.tar.gz
-ConsoleKit-0.1.3.git20070301.tar.gz
-ConsoleKit-0.2.0.tar.gz
-ConsoleKit-0.2.1.git20070204.tar.gz
-ConsoleKit-0.2.1.tar.gz
+ConsoleKit-0.2.2.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ConsoleKit.spec	6 Aug 2007 04:51:09 -0000	1.12
+++ ConsoleKit.spec	18 Sep 2007 01:49:28 -0000	1.13
@@ -4,8 +4,8 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.1
-Release: 4%{?dist}
+Version: 0.2.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
@@ -141,6 +141,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.2-1
+- Update to 0.2.2
+
 * Mon Aug  6 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.1-4
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Apr 2007 16:34:29 -0000	1.6
+++ sources	18 Sep 2007 01:49:28 -0000	1.7
@@ -1 +1 @@
-8bf5e83931a8a3c2abcd541781e1554c  ConsoleKit-0.2.1.tar.gz
+700128f32c2e3c087684f4c28a312764  ConsoleKit-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 02:18:15 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 22:18:15 -0400
Subject: rpms/yelp/devel yelp.spec,1.110,1.111
Message-ID: <200709180218.l8I2IFgL015441@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15402

Modified Files:
	yelp.spec 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- yelp.spec	28 Aug 2007 19:00:15 -0000	1.110
+++ yelp.spec	18 Sep 2007 02:17:40 -0000	1.111
@@ -19,8 +19,8 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.19.90
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -148,6 +148,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.90-3
 - Remove --add-only-show-in from desktop-file-install (RH bug #258821).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 02:24:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:24:27 -0400
Subject: rpms/gedit/devel .cvsignore, 1.66, 1.67 gedit.spec, 1.139,
	1.140 sources, 1.68, 1.69
Message-ID: <200709180224.l8I2OR8j015765@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15728

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	14 Sep 2007 06:07:17 -0000	1.66
+++ .cvsignore	18 Sep 2007 02:23:42 -0000	1.67
@@ -1 +1 @@
-gedit-2.19.92.tar.bz2
+gedit-2.20.0.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gedit.spec	14 Sep 2007 06:07:17 -0000	1.139
+++ gedit.spec	18 Sep 2007 02:23:42 -0000	1.140
@@ -6,10 +6,10 @@
 %define libgnomeprintui_version 2.12.1
 %define desktop_file_utils_version 0.9
 %define gail_version 1.2.0
-%define gtksourceview_version 1.90.3
+%define gtksourceview_version 2.0.0
 %define pygtk_version 2.9.7
 %define pygobject_version 2.11.5
-%define pygtksourceview_version 1.90.3
+%define pygtksourceview_version 2.0.0
 %define gnome_python_desktop_version 2.15.90
 %define gnome_doc_utils_version 0.3.2
 %define gconf_version 2.14
@@ -18,12 +18,12 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.92
+Version: 	2.20.0
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
 Group:		Applications/Editors
-Source0:	http://download.gnome.org/sources/gedit/2.19/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.20/gedit-%{version}.tar.bz2
 
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	14 Sep 2007 06:07:17 -0000	1.68
+++ sources	18 Sep 2007 02:23:42 -0000	1.69
@@ -1 +1 @@
-780644ec80be0938b6860de1d220d684  gedit-2.19.92.tar.bz2
+6c14d4f3583c921bdd551df6cd822289  gedit-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:26:40 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 22:26:40 -0400
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.12.0-warnings.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 evolution-exchange.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <200709180226.l8I2Qe5W015897@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Added Files:
	evolution-exchange-2.12.0-warnings.patch 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0


evolution-exchange-2.12.0-warnings.patch:

--- NEW FILE evolution-exchange-2.12.0-warnings.patch ---
diff -up evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c.warnings evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c
--- evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c.warnings	2007-09-17 22:01:29.000000000 -0400
+++ evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c	2007-09-17 22:02:11.000000000 -0400
@@ -1687,7 +1687,7 @@ start_book_view (EBookBackend  *backend,
 	GNOME_Evolution_Addressbook_CallStatus status;
 	GList *contacts;
 	char *ldap_query;
-	int ldap_err;
+	int ldap_err = LDAP_SUCCESS;
 	int search_msgid;
 	int view_limit;
 	GList *l;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2007 03:54:17 -0000	1.8
+++ .cvsignore	18 Sep 2007 02:26:08 -0000	1.9
@@ -1 +1 @@
-evolution-exchange-2.11.92.tar.bz2
+evolution-exchange-2.12.0.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- evolution-exchange.spec	4 Sep 2007 04:49:10 -0000	1.11
+++ evolution-exchange.spec	18 Sep 2007 02:26:08 -0000	1.12
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.11.92
+Version: 2.12.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -52,6 +52,7 @@
 
 # The usual compilation breakage...
 Patch16: evolution-exchange-2.11.92-compilation-breakage.patch
+Patch17: evolution-exchange-2.12.0-warnings.patch
 
 ### Dependencies ###
 
@@ -93,6 +94,7 @@
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
 %patch16 -p1 -b .compilation-breakage
+%patch17 -p1 -b .warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -166,6 +168,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2007 03:54:17 -0000	1.8
+++ sources	18 Sep 2007 02:26:08 -0000	1.9
@@ -1 +1 @@
-34383a2be637b3baeb058072ef584ca7  evolution-exchange-2.11.92.tar.bz2
+3b0cf703a034255a123823f318a89d26  evolution-exchange-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:32:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:32:10 -0400
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.13,1.14
Message-ID: <200709180232.l8I2WAHp016017@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15994

Modified Files:
	ConsoleKit.spec 
Log Message:
fix file lists



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConsoleKit.spec	18 Sep 2007 01:49:28 -0000	1.13
+++ ConsoleKit.spec	18 Sep 2007 02:31:37 -0000	1.14
@@ -115,6 +115,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
 %{_sysconfdir}/rc.d/init.d/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit/seats.d
+%config %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
 %{_sbindir}/console-kit-daemon
 %{_bindir}/ck-list-sessions
 



From fedora-extras-commits at redhat.com  Tue Sep 18 02:33:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:33:22 -0400
Subject: rpms/gok/devel .cvsignore, 1.26, 1.27 gok.spec, 1.54, 1.55 sources, 
	1.26, 1.27
Message-ID: <200709180233.l8I2XMRw016092@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 05:31:01 -0000	1.26
+++ .cvsignore	18 Sep 2007 02:32:50 -0000	1.27
@@ -1 +1 @@
-gok-1.3.3.tar.bz2
+gok-1.3.4.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gok.spec	14 Sep 2007 05:31:01 -0000	1.54
+++ gok.spec	18 Sep 2007 02:32:50 -0000	1.55
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.3
+Version: 1.3.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -121,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.4-1
+- Update to 1.3.4
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.3-1
 - Update to 1.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Sep 2007 05:31:01 -0000	1.26
+++ sources	18 Sep 2007 02:32:50 -0000	1.27
@@ -1 +1 @@
-be080327247c8f6a0b49118d1bfeb2a5  gok-1.3.3.tar.bz2
+b304eb500800c0b359d2e3c361be5282  gok-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:44:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:44:54 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.61, 1.62 epiphany.spec, 1.160,
	1.161 sources, 1.62, 1.63
Message-ID: <200709180244.l8I2isUn016395@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	4 Sep 2007 13:51:44 -0000	1.61
+++ .cvsignore	18 Sep 2007 02:44:21 -0000	1.62
@@ -1 +1 @@
-epiphany-2.19.91.tar.bz2
+epiphany-2.20.0.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- epiphany.spec	4 Sep 2007 13:51:44 -0000	1.160
+++ epiphany.spec	18 Sep 2007 02:44:21 -0000	1.161
@@ -7,12 +7,12 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://download.gnome.org/sources/epiphany/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires(post): scrollkeeper
@@ -190,6 +190,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Sep 2007 13:51:44 -0000	1.62
+++ sources	18 Sep 2007 02:44:21 -0000	1.63
@@ -1 +1 @@
-9bd85a26913b90b8c81ec6b300f9ecf8  epiphany-2.19.91.tar.bz2
+651beab72c7a3c0b42b45f5087d4e9b0  epiphany-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:53:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:53:25 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.52, 1.53 libwnck.spec, 1.83,
	1.84 sources, 1.52, 1.53
Message-ID: <200709180253.l8I2rPYt017253@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17138

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	4 Sep 2007 19:16:14 -0000	1.52
+++ .cvsignore	18 Sep 2007 02:52:52 -0000	1.53
@@ -1 +1 @@
-libwnck-2.19.92.tar.bz2
+libwnck-2.20.0.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libwnck.spec	4 Sep 2007 19:16:14 -0000	1.83
+++ libwnck.spec	18 Sep 2007 02:52:52 -0000	1.84
@@ -5,10 +5,10 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
-Source0: http://download.gnome.org/sources/libwnck/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libwnck/2.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92 (translations)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	4 Sep 2007 19:16:14 -0000	1.52
+++ sources	18 Sep 2007 02:52:52 -0000	1.53
@@ -1 +1 @@
-bab1a1f8b635d9c76aa13f388138a600  libwnck-2.19.92.tar.bz2
+9b8aa03b6706c38f91c4120567f78d78  libwnck-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:57:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:57:00 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.52, 1.53 gnome-desktop.spec, 
	1.98, 1.99 sources, 1.52, 1.53
Message-ID: <200709180257.l8I2v0nF017846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17739

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	4 Sep 2007 19:09:30 -0000	1.52
+++ .cvsignore	18 Sep 2007 02:56:28 -0000	1.53
@@ -1 +1 @@
-gnome-desktop-2.19.92.tar.bz2
+gnome-desktop-2.20.0.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-desktop.spec	4 Sep 2007 19:09:30 -0000	1.98
+++ gnome-desktop.spec	18 Sep 2007 02:56:28 -0000	1.99
@@ -11,10 +11,10 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -125,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92 (translation updates)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	4 Sep 2007 19:09:30 -0000	1.52
+++ sources	18 Sep 2007 02:56:28 -0000	1.53
@@ -1 +1 @@
-b56187d2724b6715fbc9b2da7279d2bf  gnome-desktop-2.19.92.tar.bz2
+530244e27a4a2426f833561c4b573a42  gnome-desktop-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:59:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:59:10 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.39, 1.40 gtk2-engines.spec,
	1.77, 1.78 sources, 1.40, 1.41
Message-ID: <200709180259.l8I2xAJv018223@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18117

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	4 Sep 2007 03:29:19 -0000	1.39
+++ .cvsignore	18 Sep 2007 02:58:37 -0000	1.40
@@ -1 +1 @@
-gtk-engines-2.11.7.tar.bz2
+gtk-engines-2.12.0.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gtk2-engines.spec	4 Sep 2007 03:25:55 -0000	1.77
+++ gtk2-engines.spec	18 Sep 2007 02:58:37 -0000	1.78
@@ -1,11 +1,11 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.11.7
+Version:        2.12.0
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
-Source:         http://download.gnome.org/sources/gtk-engines/2.11/gtk-engines-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtk-engines/2.12/gtk-engines-%{version}.tar.bz2
 Patch0:		gtk-engines-2.10.2-keep-default-tooltip-color.patch
 
 Conflicts:  	gnome-themes < 2.9.0
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
+- Update to 2.12.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.7-1
 - Update to 2.11.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	4 Sep 2007 03:29:19 -0000	1.40
+++ sources	18 Sep 2007 02:58:37 -0000	1.41
@@ -1 +1 @@
-fa962bb9be3d50d2d5006696637f4e9a  gtk-engines-2.11.7.tar.bz2
+8f17f5ab09f9f8e17db3101c0133b811  gtk-engines-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:06:36 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:06:36 -0400
Subject: rpms/gedit/devel gedit.spec,1.140,1.141
Message-ID: <200709180306.l8I36aXA025320@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25207

Modified Files:
	gedit.spec 
Log Message:
fix file lists



Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gedit.spec	18 Sep 2007 02:23:42 -0000	1.140
+++ gedit.spec	18 Sep 2007 03:06:03 -0000	1.141
@@ -189,8 +189,8 @@
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gedit-2.16
-%{_libdir}/pkgconfig/gedit-2.16.pc
+%{_includedir}/gedit-2.20
+%{_libdir}/pkgconfig/gedit-2.20.pc
 %{_datadir}/gtk-doc/html/gedit/
 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 03:07:45 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 23:07:45 -0400
Subject: rpms/yelp/devel .cvsignore,1.37,1.38 sources,1.39,1.40
Message-ID: <200709180307.l8I37ja4025577@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25438

Modified Files:
	.cvsignore sources 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	14 Aug 2007 01:27:09 -0000	1.37
+++ .cvsignore	18 Sep 2007 03:07:12 -0000	1.38
@@ -1 +1 @@
-yelp-2.19.90.tar.bz2
+yelp-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	14 Aug 2007 01:27:09 -0000	1.39
+++ sources	18 Sep 2007 03:07:12 -0000	1.40
@@ -1 +1 @@
-6a60a0c07d8c391de7c806747fcaaedf  yelp-2.19.90.tar.bz2
+8902618c343093b1c64ee6d647ec41ed  yelp-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:08:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:08:03 -0400
Subject: rpms/eog/devel .cvsignore, 1.50, 1.51 eog.spec, 1.96, 1.97 sources, 
	1.50, 1.51
Message-ID: <200709180308.l8I383Mt025691@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	4 Sep 2007 03:54:28 -0000	1.50
+++ .cvsignore	18 Sep 2007 03:07:30 -0000	1.51
@@ -1 +1 @@
-eog-2.19.92.tar.bz2
+eog-2.20.0.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- eog.spec	4 Sep 2007 04:04:28 -0000	1.96
+++ eog.spec	18 Sep 2007 03:07:30 -0000	1.97
@@ -13,10 +13,10 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/eog/2.20/%{name}-%{version}.tar.bz2
 Patch0: eog-2.19.4-svgz.patch
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
@@ -151,6 +151,9 @@
 %{_libdir}/pkgconfig/eog.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	4 Sep 2007 03:54:28 -0000	1.50
+++ sources	18 Sep 2007 03:07:30 -0000	1.51
@@ -1 +1 @@
-773960d53b71b4e3c539c139db3bd277  eog-2.19.92.tar.bz2
+c60bae13a84bca33d303c63d31e63e54  eog-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:11:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:11:35 -0400
Subject: rpms/zenity/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 zenity.spec, 1.33, 1.34
Message-ID: <200709180311.l8I3BZ5R026278@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26160

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Aug 2007 22:49:51 -0000	1.19
+++ .cvsignore	18 Sep 2007 03:11:01 -0000	1.20
@@ -1 +1 @@
-zenity-2.19.2.tar.bz2
+zenity-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Aug 2007 22:49:51 -0000	1.19
+++ sources	18 Sep 2007 03:11:01 -0000	1.20
@@ -1 +1 @@
-e72dc92169ecdb5b32bf0839b91055b9  zenity-2.19.2.tar.bz2
+64992cdbb38c9f8ea8cd9ea07c1dfc38  zenity-2.20.0.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- zenity.spec	16 Aug 2007 04:44:39 -0000	1.33
+++ zenity.spec	18 Sep 2007 03:11:01 -0000	1.34
@@ -1,11 +1,11 @@
 Name:		zenity
-Version:	2.19.2
-Release:	2%{?dist}
+Version:	2.20.0
+Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
-Source:		http://download.gnome.org/sources/zenity/2.19/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.20/zenity-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-2
 - Drop gdialog and the perl dependency
 



From fedora-extras-commits at redhat.com  Tue Sep 18 03:13:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:13:58 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.59, 1.60 file-roller.spec,
	1.101, 1.102 sources, 1.60, 1.61
Message-ID: <200709180313.l8I3DwPr026692@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26554

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	4 Sep 2007 03:05:36 -0000	1.59
+++ .cvsignore	18 Sep 2007 03:13:26 -0000	1.60
@@ -1 +1 @@
-file-roller-2.19.92.tar.bz2
+file-roller-2.20.0.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- file-roller.spec	4 Sep 2007 03:05:36 -0000	1.101
+++ file-roller.spec	18 Sep 2007 03:13:26 -0000	1.102
@@ -10,12 +10,12 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.92
+Version:	2.20.0
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
-Source:		http://download.gnome.org/sources/file-roller/2.19/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.20/file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	4 Sep 2007 03:05:36 -0000	1.60
+++ sources	18 Sep 2007 03:13:26 -0000	1.61
@@ -1 +1 @@
-f19d29d7406e5773202da1782d7d1d0b  file-roller-2.19.92.tar.bz2
+f8b6490114da7d39ee0b239cf0216d0c  file-roller-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:22:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:22:08 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.50,
	1.51 nautilus-cd-burner.spec, 1.92, 1.93 sources, 1.50, 1.51
Message-ID: <200709180322.l8I3M8tC028092@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27973

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	31 Jul 2007 02:01:24 -0000	1.50
+++ .cvsignore	18 Sep 2007 03:21:36 -0000	1.51
@@ -1 +1 @@
-nautilus-cd-burner-2.19.6.tar.bz2
+nautilus-cd-burner-2.20.0.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nautilus-cd-burner.spec	28 Aug 2007 21:40:49 -0000	1.92
+++ nautilus-cd-burner.spec	18 Sep 2007 03:21:36 -0000	1.93
@@ -12,9 +12,9 @@
 
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.19.6
-Release: 2%{?dist}
-Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.19/%{name}-%{version}.tar.bz2
+Version: 2.20.0
+Release: 1%{?dist}
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/20/%{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	31 Jul 2007 02:01:24 -0000	1.50
+++ sources	18 Sep 2007 03:21:36 -0000	1.51
@@ -1 +1 @@
-b783f16ac6cba60c07b889f2a007e318  nautilus-cd-burner-2.19.6.tar.bz2
+a7ddb02c33be107f6c9c1874b7703e9e  nautilus-cd-burner-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:23:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:23:03 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.59, 1.60 gnome-panel.spec,
	1.221, 1.222 sources, 1.59, 1.60
Message-ID: <200709180323.l8I3N3g0028251@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28136

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	4 Sep 2007 19:35:44 -0000	1.59
+++ .cvsignore	18 Sep 2007 03:22:30 -0000	1.60
@@ -1 +1 @@
-gnome-panel-2.19.92.tar.bz2
+gnome-panel-2.20.0.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- gnome-panel.spec	17 Sep 2007 16:10:55 -0000	1.221
+++ gnome-panel.spec	18 Sep 2007 03:22:30 -0000	1.222
@@ -21,10 +21,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.19.92
-Release: 7%{?dist} 
+Version: 2.20.0
+Release: 1%{?dist} 
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
 Source2: gnome-compiler-flags.m4
 Source3: redhat-panel-backwards-compat-config.schemas
@@ -316,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-7
 - Can't require tomboy where there's no mono
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	4 Sep 2007 19:35:44 -0000	1.59
+++ sources	18 Sep 2007 03:22:30 -0000	1.60
@@ -1 +1 @@
-698ff684d9c6ca02191e302b12ac94e1  gnome-panel-2.19.92.tar.bz2
+d48c13d4c9935278b29a557d89b33a45  gnome-panel-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:30:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:30:35 -0400
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.20,
	1.21 gnome-user-docs.spec, 1.31, 1.32 sources, 1.20, 1.21
Message-ID: <200709180330.l8I3UZ1k029627@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-user-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Jul 2007 20:15:19 -0000	1.20
+++ .cvsignore	18 Sep 2007 03:30:02 -0000	1.21
@@ -1 +1 @@
-gnome-user-docs-2.18.2.tar.bz2
+gnome-user-docs-2.20.0.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-user-docs.spec	7 Aug 2007 17:52:39 -0000	1.31
+++ gnome-user-docs.spec	18 Sep 2007 03:30:02 -0000	1.32
@@ -1,9 +1,9 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.18.2
-Release:	2%{?dist}
+Version:        2.20.0
+Release:	1%{?dist}
 License:        GFDL+
-Source:         http://download.gnome.org/sources/gnome-user-docs/2.18/gnome-user-docs-%{version}.tar.bz2 
+Source:         http://download.gnome.org/sources/gnome-user-docs/2.20/gnome-user-docs-%{version}.tar.bz2 
 Group:          Documentation
 
 BuildArch:      noarch
@@ -48,11 +48,14 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root,-)
-%{_datadir}/omf/user-guide
-%{_datadir}/omf/system-admin-guide
-%{_datadir}/omf/gnome-access-guide
+%dir %{_datadir}/omf/user-guide
+%dir %{_datadir}/omf/system-admin-guide
+%dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
 - Update the license field
 - Use %%find_lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Jul 2007 20:15:19 -0000	1.20
+++ sources	18 Sep 2007 03:30:02 -0000	1.21
@@ -1 +1 @@
-4d3b5c8bd3cc8008f2a44d98efaa2502  gnome-user-docs-2.18.2.tar.bz2
+60a2b6267f1f6ef7b7f1a6c706d7b938  gnome-user-docs-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:34:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:34:55 -0400
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.8,
	1.9 gnome-backgrounds.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200709180334.l8I3YtDn030349@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Aug 2007 05:55:59 -0000	1.8
+++ .cvsignore	18 Sep 2007 03:34:22 -0000	1.9
@@ -1 +1 @@
-gnome-backgrounds-2.18.3.tar.bz2
+gnome-backgrounds-2.20.0.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-backgrounds.spec	15 Aug 2007 23:44:09 -0000	1.12
+++ gnome-backgrounds.spec	18 Sep 2007 03:34:22 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.18.3
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.20/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -52,6 +52,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.3-2
 - Small fixes from package review
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Aug 2007 05:56:00 -0000	1.8
+++ sources	18 Sep 2007 03:34:22 -0000	1.9
@@ -1 +1 @@
-d91b925d358d2cbc705b4a033e7d5c2e  gnome-backgrounds-2.18.3.tar.bz2
+391c0c64407c5bd2a52207b0298beac4  gnome-backgrounds-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:39:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:39:07 -0400
Subject: rpms/libgnomecanvas/devel .cvsignore, 1.24, 1.25 libgnomecanvas.spec,
	1.41, 1.42 sources, 1.24, 1.25
Message-ID: <200709180339.l8I3d73h031090@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomecanvas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30973

Modified Files:
	.cvsignore libgnomecanvas.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	15 Aug 2007 02:53:45 -0000	1.24
+++ .cvsignore	18 Sep 2007 03:38:34 -0000	1.25
@@ -1 +1 @@
-libgnomecanvas-2.19.2.tar.bz2
+libgnomecanvas-2.20.0.tar.bz2


Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgnomecanvas.spec	25 Aug 2007 17:07:50 -0000	1.41
+++ libgnomecanvas.spec	18 Sep 2007 03:38:34 -0000	1.42
@@ -7,10 +7,10 @@
 
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
-Version: 2.19.2
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -91,6 +91,9 @@
 %{_datadir}/gtk-doc/html/libgnomecanvas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
 * Sat Aug 25 2007 Ray Strode <rstrode at redhat.com> - 2.19.2-2
 - Apply patch from Federico Mena Quintero to avoid
   tearing during scrolls and such


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	15 Aug 2007 02:53:45 -0000	1.24
+++ sources	18 Sep 2007 03:38:34 -0000	1.25
@@ -1 +1 @@
-fd14cd97dbd9d626cf2a7c0b7e7ac2ee  libgnomecanvas-2.19.2.tar.bz2
+109b71b02e0c976d65b46129d0ad69d1  libgnomecanvas-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:41:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:41:42 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.26,
	1.27 gnome-doc-utils.spec, 1.42, 1.43 sources, 1.26, 1.27
Message-ID: <200709180341.l8I3fgEj031555@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31437

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Sep 2007 03:15:41 -0000	1.26
+++ .cvsignore	18 Sep 2007 03:41:09 -0000	1.27
@@ -1 +1 @@
-gnome-doc-utils-0.11.2.tar.bz2
+gnome-doc-utils-0.12.0.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-doc-utils.spec	4 Sep 2007 03:15:41 -0000	1.42
+++ gnome-doc-utils.spec	18 Sep 2007 03:41:09 -0000	1.43
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.11.2
+Version: 0.12.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: http://download.gnome.org/sources/gnome-doc-utils/0.11/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.12/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.12.0-1
+- Update to 0.12.0
+
 * Mon Sep  3 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.2-1
 - Update to 0.11.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Sep 2007 03:15:41 -0000	1.26
+++ sources	18 Sep 2007 03:41:09 -0000	1.27
@@ -1 +1 @@
-6999661ccbca9b0f409f6a735821e447  gnome-doc-utils-0.11.2.tar.bz2
+5934c08d12407d8233416343cd73df24  gnome-doc-utils-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:46:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:46:41 -0400
Subject: rpms/dasher/devel .cvsignore, 1.29, 1.30 dasher.spec, 1.68,
	1.69 sources, 1.29, 1.30
Message-ID: <200709180346.l8I3kfaf032418@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/dasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32312

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
0.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	9 Jul 2007 21:59:24 -0000	1.29
+++ .cvsignore	18 Sep 2007 03:46:08 -0000	1.30
@@ -1 +1 @@
-dasher-4.5.2.tar.bz2
+dasher-4.6.0.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- dasher.spec	6 Aug 2007 04:57:12 -0000	1.68
+++ dasher.spec	18 Sep 2007 03:46:08 -0000	1.69
@@ -1,11 +1,11 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.5.2
-Release: 2%{?dist} 
+Version: 4.6.0
+Release: 1%{?dist} 
 License: GPLv2
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/dasher/4.5/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/dasher/4.6/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-speech-devel
@@ -100,13 +100,16 @@
 %{_datadir}/dasher/
 %{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/omf/dasher/*
+%dir %{_datadir}/omf/dasher
 %{_datadir}/applications/gnome-dasher.desktop
 %{_bindir}/dasher
 %{_mandir}/*/dasher.1.gz
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 4.6.0-1
+- Update to 4.6.0
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> - 4.5.2-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	9 Jul 2007 21:59:24 -0000	1.29
+++ sources	18 Sep 2007 03:46:08 -0000	1.30
@@ -1 +1 @@
-59317850c12064ced3eb76c753be7c71  dasher-4.5.2.tar.bz2
+ab9fce024bb2b1ea3cb479e82819d57d  dasher-4.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:49:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:49:01 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.42,
	1.43 gnome-screensaver.spec, 1.163, 1.164 sources, 1.45, 1.46
Message-ID: <200709180349.l8I3n1HN000370@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32733

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	4 Sep 2007 05:21:47 -0000	1.42
+++ .cvsignore	18 Sep 2007 03:48:28 -0000	1.43
@@ -1 +1 @@
-gnome-screensaver-2.19.7.tar.bz2
+gnome-screensaver-2.20.0.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-screensaver.spec	4 Sep 2007 05:21:47 -0000	1.163
+++ gnome-screensaver.spec	18 Sep 2007 03:48:28 -0000	1.164
@@ -12,11 +12,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.19.7
+Version: 2.20.0
 Release: 1%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://download.gnome.org/sources/gnome-screensaver/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
 - Update to 2.19.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	4 Sep 2007 05:21:47 -0000	1.45
+++ sources	18 Sep 2007 03:48:28 -0000	1.46
@@ -1 +1 @@
-d70d424b3406b8cde5300cea8cff75af  gnome-screensaver-2.19.7.tar.bz2
+d166a3ebf69289331b2ebcf5c0187fd9  gnome-screensaver-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:53:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:53:29 -0400
Subject: rpms/icon-naming-utils/devel .cvsignore, 1.2,
	1.3 icon-naming-utils.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709180353.l8I3rT3B001183@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/icon-naming-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1060

Modified Files:
	.cvsignore icon-naming-utils.spec sources 
Log Message:
0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2007 05:02:15 -0000	1.2
+++ .cvsignore	18 Sep 2007 03:52:55 -0000	1.3
@@ -1 +1 @@
-icon-naming-utils-0.8.3.tar.gz
+icon-naming-utils-0.8.6.tar.gz


Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icon-naming-utils.spec	14 Aug 2007 05:09:18 -0000	1.13
+++ icon-naming-utils.spec	18 Sep 2007 03:52:55 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.8.3
+Version:        0.8.6
 Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -53,6 +53,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.6-1
+- Update to 0.8.6
+
 * Tue Aug 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.3-1
 - Update to 0.8.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Aug 2007 05:02:15 -0000	1.9
+++ sources	18 Sep 2007 03:52:55 -0000	1.10
@@ -1 +1 @@
-7469293f4fa690f1f9f92a0d0bc00cdb  icon-naming-utils-0.8.3.tar.gz
+22bd13295d42ff886f6ea355d00e036b  icon-naming-utils-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 03:56:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:56:46 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.48,
	1.49 gnome-icon-theme.spec, 1.74, 1.75 sources, 1.51, 1.52
Message-ID: <200709180356.l8I3ukiO001754@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1645

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	4 Sep 2007 03:43:08 -0000	1.48
+++ .cvsignore	18 Sep 2007 03:56:13 -0000	1.49
@@ -1 +1 @@
-gnome-icon-theme-2.19.91.tar.bz2
+gnome-icon-theme-2.20.0.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-icon-theme.spec	4 Sep 2007 03:43:08 -0000	1.74
+++ gnome-icon-theme.spec	18 Sep 2007 03:56:13 -0000	1.75
@@ -1,8 +1,8 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
-Source0: http://download.gnome.org/sources/gnome-icon-theme/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-icon-theme/2.20/%{name}-%{version}.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	4 Sep 2007 03:43:08 -0000	1.51
+++ sources	18 Sep 2007 03:56:13 -0000	1.52
@@ -1 +1 @@
-8885d86e508185f1fd807e99f0d1f4fe  gnome-icon-theme-2.19.91.tar.bz2
+56857a6d5f26c236b48fcf6760549d1b  gnome-icon-theme-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:02:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:02:33 -0400
Subject: rpms/pango/devel .cvsignore, 1.63, 1.64 pango.spec, 1.124,
	1.125 sources, 1.63, 1.64
Message-ID: <200709180402.l8I42Xxk008825@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	4 Sep 2007 04:16:52 -0000	1.63
+++ .cvsignore	18 Sep 2007 04:02:00 -0000	1.64
@@ -1 +1 @@
-pango-1.18.1.tar.bz2
+pango-1.18.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- pango.spec	4 Sep 2007 04:16:52 -0000	1.124
+++ pango.spec	18 Sep 2007 04:02:00 -0000	1.125
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.18.1
+Version: 1.18.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.2-1
+- Update to 1.18.2
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
 - Update to 1.18.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	4 Sep 2007 04:16:52 -0000	1.63
+++ sources	18 Sep 2007 04:02:00 -0000	1.64
@@ -1 +1 @@
-282dcff56292359f6a5c75be0b4fe3df  pango-1.18.1.tar.bz2
+81efeac639977ed3f56c82f16ee0be74  pango-1.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:07:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:07:52 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.36, 1.37 bug-buddy.spec, 1.82,
	1.83 sources, 1.36, 1.37
Message-ID: <200709180407.l8I47qjh009954@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9838

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Sep 2007 18:08:03 -0000	1.36
+++ .cvsignore	18 Sep 2007 04:07:17 -0000	1.37
@@ -1 +1 @@
-bug-buddy-2.19.91.svn20070904.tar.bz2
+bug-buddy-2.20.0.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- bug-buddy.spec	4 Sep 2007 19:01:33 -0000	1.82
+++ bug-buddy.spec	18 Sep 2007 04:07:17 -0000	1.83
@@ -4,17 +4,15 @@
 %define gnome_doc_utils_version 0.2.0
 %define gconf_version 2.14
 
-%define alphatag svn20070904
-
 Name: bug-buddy
-Version: 2.19.91
-Release: 1%{?dist}.%{alphatag}
+Version: 2.20.0
+Release: 1%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
 License: GPLv2 and BSD
 Group: Applications/System
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/bug-buddy/2.19/%{name}-%{version}.%{alphatag}.tar.bz2
+Source: http://download.gnome.org/sources/bug-buddy/2.20/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,7 +58,7 @@
 supports the GNOME, KDE, Debian, and Ximian bug tracking systems.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q 
 
 %build
 %configure --disable-scrollkeeper
@@ -135,6 +133,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91.fc8.svn20070904-1
 - Update to a post-2.19.91 snapshot 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 18:08:03 -0000	1.36
+++ sources	18 Sep 2007 04:07:17 -0000	1.37
@@ -1 +1 @@
-0f08f484de7870771b4e4fc494a99c4c  bug-buddy-2.19.91.svn20070904.tar.bz2
+bce8b08a14d123ecfeefb3902031d773  bug-buddy-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:10:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:10:23 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.24, 1.25 gconf-editor.spec,
	1.47, 1.48 sources, 1.24, 1.25
Message-ID: <200709180410.l8I4ANF9010328@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Sep 2007 05:57:15 -0000	1.24
+++ .cvsignore	18 Sep 2007 04:09:50 -0000	1.25
@@ -1 +1 @@
-gconf-editor-2.19.92.tar.bz2
+gconf-editor-2.20.0.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gconf-editor.spec	14 Sep 2007 05:57:15 -0000	1.47
+++ gconf-editor.spec	18 Sep 2007 04:09:50 -0000	1.48
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -104,6 +104,9 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Sep 2007 05:57:15 -0000	1.24
+++ sources	18 Sep 2007 04:09:50 -0000	1.25
@@ -1 +1 @@
-a248ef087ada180d53ce1317b25ed35c  gconf-editor-2.19.92.tar.bz2
+b686677878b5754ffa8d0a2cc1129988  gconf-editor-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:12:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:12:24 -0400
Subject: rpms/gnome-keyring-manager/devel .cvsignore, 1.11,
	1.12 gnome-keyring-manager.spec, 1.33, 1.34 sources, 1.11, 1.12
Message-ID: <200709180412.l8I4COEi010414@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	.cvsignore gnome-keyring-manager.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Sep 2007 05:49:10 -0000	1.11
+++ .cvsignore	18 Sep 2007 04:11:51 -0000	1.12
@@ -1 +1 @@
-gnome-keyring-manager-2.19.92.tar.bz2
+gnome-keyring-manager-2.20.0.tar.bz2


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-keyring-manager.spec	14 Sep 2007 05:49:10 -0000	1.33
+++ gnome-keyring-manager.spec	18 Sep 2007 04:11:51 -0000	1.34
@@ -1,11 +1,11 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-keyring-manager/2.18/gnome-keyring-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring-manager/2.20/gnome-keyring-manager-%{version}.tar.bz2
 Patch0: gnome-keyring-manager-2.18.0-categories.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Sep 2007 05:49:10 -0000	1.11
+++ sources	18 Sep 2007 04:11:51 -0000	1.12
@@ -1 +1 @@
-162105ae1e4021eab4c613a4ca7e6bb9  gnome-keyring-manager-2.19.92.tar.bz2
+61d701888f00c02490c0cd551bf3fcb1  gnome-keyring-manager-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:15:26 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 18 Sep 2007 00:15:26 -0400
Subject: rpms/scim/devel scim.spec,1.96,1.97 xinput-scim,1.13,1.14
Message-ID: <200709180415.l8I4FQcX010649@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	scim.spec xinput-scim 
Log Message:
source none.conf in xinput script when skipping scim startup



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- scim.spec	13 Sep 2007 09:58:17 -0000	1.96
+++ scim.spec	18 Sep 2007 04:14:54 -0000	1.97
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -290,6 +290,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
+- source none.conf in xinput script when skipping scim startup
+
 * Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
 - add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
   Sinhala (#236715)


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
+++ xinput-scim	18 Sep 2007 04:14:54 -0000	1.14
@@ -59,5 +59,6 @@
   fi
 
 else
-  echo No SCIM IMEs found: SCIM startup was skipped.
+  echo "No SCIM IMEs found: SCIM startup was skipped."
+  . /etc/X11/xinit/xinput.d/none.conf
 fi



From fedora-extras-commits at redhat.com  Tue Sep 18 04:16:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:16:41 -0400
Subject: rpms/vte/devel .cvsignore, 1.61, 1.62 sources, 1.61, 1.62 vte.spec, 
	1.119, 1.120
Message-ID: <200709180416.l8I4GfUe010835@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vte/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10664

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.16.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	30 Jul 2007 22:24:37 -0000	1.61
+++ .cvsignore	18 Sep 2007 04:16:08 -0000	1.62
@@ -1 +1 @@
-vte-0.16.8.tar.bz2
+vte-0.16.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	30 Jul 2007 22:24:37 -0000	1.61
+++ sources	18 Sep 2007 04:16:08 -0000	1.62
@@ -1 +1 @@
-65344de3023c41c8dda2b35a415bf969  vte-0.16.8.tar.bz2
+a42c893a01e3d9818789be373e529422  vte-0.16.9.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/vte.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vte.spec	23 Aug 2007 17:07:19 -0000	1.119
+++ vte.spec	18 Sep 2007 04:16:08 -0000	1.120
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.16.8
-Release: 3%{?dist}
+Version: 0.16.9
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.16.9-1
+- Update to 0.16.9
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 0.16.8-3
 - Rebuild for PPC toolchain bug
 - Fix %%doc listing



From fedora-extras-commits at redhat.com  Tue Sep 18 04:19:19 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 18 Sep 2007 00:19:19 -0400
Subject: rpms/evolution-webcal/devel .cvsignore, 1.19,
	1.20 evolution-webcal.spec, 1.35, 1.36 sources, 1.19, 1.20
Message-ID: <200709180419.l8I4JJgU010932@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-webcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910

Modified Files:
	.cvsignore evolution-webcal.spec sources 
Log Message:

* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Sep 2007 10:32:13 -0000	1.19
+++ .cvsignore	18 Sep 2007 04:18:46 -0000	1.20
@@ -1 +1 @@
-evolution-webcal-2.11.91.tar.bz2
+evolution-webcal-2.12.0.tar.bz2


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- evolution-webcal.spec	31 Aug 2007 21:31:20 -0000	1.35
+++ evolution-webcal.spec	18 Sep 2007 04:18:46 -0000	1.36
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: evolution-webcal
-Version: 2.11.91
+Version: 2.12.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Fri Aug 31 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.91-1.fc8
 - Update to 2.11.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Sep 2007 10:32:13 -0000	1.19
+++ sources	18 Sep 2007 04:18:46 -0000	1.20
@@ -1 +1 @@
-c5b38d451808e48bfb6b072893441ac5  evolution-webcal-2.11.91.tar.bz2
+21e77fa081decb87ce641f3a77245864  evolution-webcal-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:21:12 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:21:12 -0400
Subject: rpms/gucharmap/devel .cvsignore, 1.5, 1.6 gucharmap.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200709180421.l8I4LCHk011030@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gucharmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10997

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
1.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Mar 2007 05:35:12 -0000	1.5
+++ .cvsignore	18 Sep 2007 04:20:39 -0000	1.6
@@ -1 +1 @@
-gucharmap-1.10.0.tar.bz2
+gucharmap-1.10.1.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gucharmap.spec	7 Aug 2007 20:59:13 -0000	1.11
+++ gucharmap.spec	18 Sep 2007 04:20:39 -0000	1.12
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        1.10.0
+Version:        1.10.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.1-1
+- Update to 1.10.1
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.0-2
 - Update license field
 - Use %%find_lang for help files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Mar 2007 05:35:12 -0000	1.5
+++ sources	18 Sep 2007 04:20:39 -0000	1.6
@@ -1 +1 @@
-a0e01bcff2bc5e35ec88f60a383051d3  gucharmap-1.10.0.tar.bz2
+2b65ae7bef1b11048e77b287a2051020  gucharmap-1.10.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:25:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:25:16 -0400
Subject: rpms/gnome-terminal/devel .cvsignore, 1.36, 1.37 gnome-terminal.spec,
	1.82, 1.83 sources, 1.37, 1.38
Message-ID: <200709180425.l8I4PGUH011198@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11165

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Jun 2007 00:07:41 -0000	1.36
+++ .cvsignore	18 Sep 2007 04:24:43 -0000	1.37
@@ -1 +1 @@
-gnome-terminal-2.18.1.tar.bz2
+gnome-terminal-2.18.2.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-terminal.spec	23 Aug 2007 16:16:44 -0000	1.82
+++ gnome-terminal.spec	18 Sep 2007 04:24:43 -0000	1.83
@@ -9,8 +9,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.18.1
-Release: 3%{?dist}
+Version: 2.18.2
+Release: 1%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-terminal/2.18/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
@@ -117,6 +117,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 2.18.1-3
 - Rebuild for PPC toolchain bug
 - Fix build for rarian


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Jun 2007 00:07:41 -0000	1.37
+++ sources	18 Sep 2007 04:24:43 -0000	1.38
@@ -1 +1 @@
-c1902cf4727f4cd976d6cc0beb1c03fe  gnome-terminal-2.18.1.tar.bz2
+a54b010cdeb1e908cad6085bf9de87c4  gnome-terminal-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:29:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:29:16 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.65, 1.66 gnome-games.spec,
	1.146, 1.147 sources, 1.69, 1.70
Message-ID: <200709180429.l8I4TGoq011300@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11276

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	4 Sep 2007 05:36:14 -0000	1.65
+++ .cvsignore	18 Sep 2007 04:28:43 -0000	1.66
@@ -1 +1 @@
-gnome-games-2.19.92.tar.bz2
+gnome-games-2.20.0.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-games.spec	4 Sep 2007 05:36:14 -0000	1.146
+++ gnome-games.spec	18 Sep 2007 04:28:43 -0000	1.147
@@ -43,12 +43,12 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games/2.19/gnome-games-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games/2.20/gnome-games-%{version}.tar.bz2
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
 - 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	4 Sep 2007 05:36:14 -0000	1.69
+++ sources	18 Sep 2007 04:28:43 -0000	1.70
@@ -1 +1 @@
-ae47893206f44c97333eb8f6b56716aa  gnome-games-2.19.92.tar.bz2
+a34eda66c6e09dc8f3a0fb720788f9bd  gnome-games-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:32:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:32:19 -0400
Subject: rpms/gnome-games-extra-data/devel .cvsignore, 1.5,
	1.6 gnome-games-extra-data.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709180432.l8I4WJQC011450@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games-extra-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11388

Modified Files:
	.cvsignore gnome-games-extra-data.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Jul 2007 20:58:21 -0000	1.5
+++ .cvsignore	18 Sep 2007 04:31:47 -0000	1.6
@@ -1 +1 @@
-gnome-games-extra-data-2.19.2.tar.bz2
+gnome-games-extra-data-2.20.0.tar.bz2


Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-games-extra-data.spec	31 Jul 2007 20:58:21 -0000	1.6
+++ gnome-games-extra-data.spec	18 Sep 2007 04:31:47 -0000	1.7
@@ -4,11 +4,11 @@
 
 Summary: GNOME games extra data
 Name: gnome-games-extra-data
-Version: 2.19.2
+Version: 2.20.0
 Release: 1
 License: GPL
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games-extra-data/2.19/gnome-games-extra-data-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games-extra-data/2.20/gnome-games-extra-data-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArch: noarch
@@ -44,7 +44,7 @@
 
 
 %files
-%doc AUTHORS COPYING MAINTAINERS README NEWS ChangeLog
+%doc AUTHORS COPYING MAINTAINERS README NEWS 
 %{_datadir}/pixmaps/glines/*
 %{_datadir}/pixmaps/gnobots2/*
 %{_datadir}/pixmaps/iagno/*
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Jul 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Jul 2007 20:58:21 -0000	1.5
+++ sources	18 Sep 2007 04:31:47 -0000	1.6
@@ -1 +1 @@
-55a844b73004cfc07b62a2fc7871a338  gnome-games-extra-data-2.19.2.tar.bz2
+adecbe76d2f45f6471b8bf0f6943f6ca  gnome-games-extra-data-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:37:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:37:45 -0400
Subject: rpms/climm/devel climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180437.l8I4bjJd011818@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
Initial import of climm.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:37:13 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:37:13 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:39:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:39:46 -0400
Subject: rpms/climm/FC-6 climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180439.l8I4dkpA013091@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
Initial climm for FC-6 branch.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:39:14 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:39:14 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:41:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:41:39 -0400
Subject: rpms/climm/F-7 climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180441.l8I4fd5f014226@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14157/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
climm for F-7 branch.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:41:07 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:41:07 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:55:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:55:06 -0400
Subject: rpms/gnome-nettool/devel .cvsignore, 1.11, 1.12 gnome-nettool.spec, 
	1.26, 1.27 sources, 1.12, 1.13
Message-ID: <200709180455.l8I4t6st016612@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-nettool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16590

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Aug 2007 03:58:49 -0000	1.11
+++ .cvsignore	18 Sep 2007 04:54:31 -0000	1.12
@@ -1 +1 @@
-gnome-nettool-2.19.90.tar.bz2
+gnome-nettool-2.20.0.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-nettool.spec	24 Aug 2007 14:52:29 -0000	1.26
+++ gnome-nettool.spec	18 Sep 2007 04:54:31 -0000	1.27
@@ -5,10 +5,10 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-nettool/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-nettool/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -88,6 +88,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Aug 2007 04:11:03 -0000	1.12
+++ sources	18 Sep 2007 04:54:31 -0000	1.13
@@ -1 +1 @@
-5f3a1c3f2ad639494dc4c98cfa1f1b1c  gnome-nettool-2.19.90.tar.bz2
+8f16e4207655ccf1e7af679fc0f58bbd  gnome-nettool-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:06:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:06:26 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.55,1.56
Message-ID: <200709180506.l8I56QRd022873@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22846

Modified Files:
	gnome-keyring.spec 
Log Message:
fix version



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-keyring.spec	17 Sep 2007 18:39:17 -0000	1.55
+++ gnome-keyring.spec	18 Sep 2007 05:05:52 -0000	1.56
@@ -2,7 +2,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.20.0
+Version: 2.20
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -102,8 +102,8 @@
 
 
 %changelog
-* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
-- Update to 2.20.0
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20-1
+- Update to 2.20
 
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91



From fedora-extras-commits at redhat.com  Tue Sep 18 05:07:57 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:07:57 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.67,1.68
Message-ID: <200709180507.l8I57v3T022956@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927

Modified Files:
	gnome-menus.spec 
Log Message:
remove debug stuff



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-menus.spec	17 Sep 2007 19:14:51 -0000	1.67
+++ gnome-menus.spec	18 Sep 2007 05:07:23 -0000	1.68
@@ -11,7 +11,6 @@
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-menus/2.20/%{name}-%{version}.tar.bz2
-Patch0: debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -44,7 +43,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .debug
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Tue Sep 18 05:09:28 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:09:28 -0400
Subject: rpms/gdm/devel .cvsignore, 1.55, 1.56 gdm.spec, 1.286, 1.287 sources,
	1.58, 1.59
Message-ID: <200709180509.l8I59Se2023052@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22964

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Sep 2007 14:26:58 -0000	1.55
+++ .cvsignore	18 Sep 2007 05:08:54 -0000	1.56
@@ -1 +1 @@
-gdm-2.19.8.tar.bz2
+gdm-2.20.0.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- gdm.spec	12 Sep 2007 17:16:53 -0000	1.286
+++ gdm.spec	18 Sep 2007 05:08:54 -0000	1.287
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.8
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
-Source: http://download.gnome.org/sources/gdm/2.19/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.20/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdmsetup-pam
@@ -351,6 +351,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-4
 - Change default password character back to circle instead of
   asterisk (bug 287951)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	7 Sep 2007 14:26:58 -0000	1.58
+++ sources	18 Sep 2007 05:08:54 -0000	1.59
@@ -1,2 +1 @@
-65eb454eef0b9fc9d4abf9de3d2c9b45  gdm-2.19.8.tar.bz2
-7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2
+cf374113a1f837b0df916572625b5078  gdm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:14:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:14:59 -0400
Subject: rpms/gdm/devel sources,1.59,1.60
Message-ID: <200709180514.l8I5ExbY023258@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23201

Modified Files:
	sources 
Log Message:
re-add faces to sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	18 Sep 2007 05:08:54 -0000	1.59
+++ sources	18 Sep 2007 05:14:26 -0000	1.60
@@ -1 +1,2 @@
 cf374113a1f837b0df916572625b5078  gdm-2.20.0.tar.bz2
+7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:24:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:24:13 -0400
Subject: rpms/eog/devel eog.spec,1.97,1.98
Message-ID: <200709180524.l8I5ODbA023470@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435

Modified Files:
	eog.spec 
Log Message:
drop the svgz patch for now



Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- eog.spec	18 Sep 2007 03:07:30 -0000	1.97
+++ eog.spec	18 Sep 2007 05:23:39 -0000	1.98
@@ -17,7 +17,8 @@
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.20/%{name}-%{version}.tar.bz2
-Patch0: eog-2.19.4-svgz.patch
+# needs to be redone
+#Patch0: eog-2.19.4-svgz.patch
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -70,8 +71,7 @@
 
 %prep
 %setup -q
-
-%patch0 -p1 -b .svgz
+#%patch0 -p1 -b .svgz
 
 echo "NoDisplay=true" >> data/eog.desktop.in
 # just in case



From fedora-extras-commits at redhat.com  Tue Sep 18 05:52:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:52:17 -0400
Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.75,1.76
Message-ID: <200709180552.l8I5qH6f024170@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24103

Modified Files:
	gnome-icon-theme.spec 
Log Message:
Rebuild



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gnome-icon-theme.spec	18 Sep 2007 03:56:13 -0000	1.75
+++ gnome-icon-theme.spec	18 Sep 2007 05:51:44 -0000	1.76
@@ -1,13 +1,13 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.20/%{name}-%{version}.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: icon-naming-utils >= 0.8.1
+BuildRequires: icon-naming-utils >= 0.8.6
 BuildRequires: perl(XML::Parser)
 BuildRequires: pkgconfig
 BuildRequires: gettext
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Rebuild with newer icon-naming-utils
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 07:49:34 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:49:34 -0400
Subject: rpms/httpd/devel httpd-2.2.6-ssllibver.patch, 1.1, 1.2 httpd.spec, 
	1.116, 1.117
Message-ID: <200709180749.l8I7nYM3013710@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671

Modified Files:
	httpd-2.2.6-ssllibver.patch httpd.spec 
Log Message:
- fixes for previous commit


httpd-2.2.6-ssllibver.patch:

Index: httpd-2.2.6-ssllibver.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.6-ssllibver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.6-ssllibver.patch	17 Sep 2007 19:02:35 -0000	1.1
+++ httpd-2.2.6-ssllibver.patch	18 Sep 2007 07:48:57 -0000	1.2
@@ -1,14 +1,3 @@
---- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
-+++ httpd-2.2.6/modules/ssl/ssl_private.h
-@@ -648,7 +648,7 @@ void         ssl_die(void);
- void         ssl_log_ssl_error(const char *, int, int, server_rec *);
- 
- /**  Variables  */
--void         ssl_var_register(void);
-+void         ssl_var_register(apr_pool_t *p);
- char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
- const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
- 
 --- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/mod_ssl.c
 @@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
@@ -22,7 +11,7 @@
      APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 --- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
-@@ -58,12 +58,30 @@ static int ssl_is_https(conn_rec *c)
+@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
      return sslconn && sslconn->ssl;
  }
  
@@ -33,6 +22,8 @@
 +
 +void ssl_var_register(apr_pool_t *p)
  {
++    char *cp, *cp2;
++
      APR_REGISTER_OPTIONAL_FN(ssl_is_https);
      APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
      APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
@@ -55,7 +46,7 @@
  }
  
  /* This function must remain safe to use for a non-SSL connection. */
-@@ -635,34 +653,14 @@ static void ssl_var_lookup_ssl_cipher_bi
+@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
  
  static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
  {
@@ -81,15 +72,33 @@
 -
      if (strEQ(var, "INTERFACE")) {
 -        result = apr_pstrdup(p, interface);
-+        result = apr_pstrdup(p, var_interface);
++        return apr_pstrdup(p, var_interface);
      }
      else if (strEQ(var, "LIBRARY_INTERFACE")) {
 -        result = apr_pstrdup(p, library_interface);
-+        result = apr_pstrdup(p, var_library_interface);
++        return apr_pstrdup(p, var_library_interface);
      }
      else if (strEQ(var, "LIBRARY")) {
 -        result = apr_pstrdup(p, library);
-+        result = apr_pstrdup(p, var_library);
+-    }
+-    else {
+-        result = NULL;
++        return apr_pstrdup(p, var_library);
      }
-     else {
-         result = NULL;
+-    return result;
++
++    return NULL;
+ }
+   
+ 
+--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
++++ httpd-2.2.6/modules/ssl/ssl_private.h
+@@ -648,7 +648,7 @@ void         ssl_die(void);
+ void         ssl_log_ssl_error(const char *, int, int, server_rec *);
+ 
+ /**  Variables  */
+-void         ssl_var_register(void);
++void         ssl_var_register(apr_pool_t *p);
+ char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
+ const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
+ 


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- httpd.spec	17 Sep 2007 19:02:35 -0000	1.116
+++ httpd.spec	18 Sep 2007 07:48:57 -0000	1.117
@@ -232,7 +232,7 @@
 done
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
-install -m -p 644 $RPM_SOURCE_DIR/httpd.conf \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -258,7 +258,8 @@
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
-install -m 644 noindex.html $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
+install -m 644 -p $RPM_SOURCE_DIR/index.html \
+        $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 
 # remove manual sources
 find $RPM_BUILD_ROOT%{contentdir}/manual \( \



From fedora-extras-commits at redhat.com  Tue Sep 18 08:02:16 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 18 Sep 2007 04:02:16 -0400
Subject: rpms/ladspa-amb-plugins/devel ladspa-amb-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180802.l8I82G8m020108@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19950/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-amb-plugins.spec 
Log Message:
initial ladspa-amb-plugins import



--- NEW FILE ladspa-amb-plugins.spec ---
Name:           ladspa-amb-plugins
Version:        0.3.0
Release:        1%{?dist}
Summary:        Ambisonics LADSPA plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/AMB-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      amb-plugins <= 0.0.2
Provides:       amb-plugins = %{version}-%{release}

%description
A set of first order Ambisonics plugins to use with Ardour. Included
are: mono and stereo input panner, horizontal rotation, and square and
hexagon horizontal decoders. See the README for more.


%prep
%setup -q -n AMB-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# use the system version of ladspa.h
%{__rm} ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="-I. -fPIC -D_REENTRANT $RPM_OPT_FLAGS"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-amb-plugins
- updated to 0.1.0

* Sat May 13 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- update to 0.0.2

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:48:47 -0000	1.1
+++ .cvsignore	18 Sep 2007 08:01:43 -0000	1.2
@@ -0,0 +1 @@
+AMB-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:48:47 -0000	1.1
+++ sources	18 Sep 2007 08:01:43 -0000	1.2
@@ -0,0 +1 @@
+39a38b23a5f3a3e3009da37976660081  AMB-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:07:32 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Tue, 18 Sep 2007 04:07:32 -0400
Subject: rpms/bc/devel bc.spec,1.31,1.32
Message-ID: <200709180807.l8I87WGa020636@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20456

Modified Files:
	bc.spec 
Log Message:
update of source URI



Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bc.spec	22 Aug 2007 06:50:27 -0000	1.31
+++ bc.spec	18 Sep 2007 08:06:56 -0000	1.32
@@ -1,11 +1,11 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator)
 Name: bc
 Version: 1.06
-Release: 28
+Release: 29
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
-Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
 Patch1: bc-1.06-readline42.patch
 Patch2: bc-1.06-s390.patch
 Patch3: bc-1.06-info_exp_bessel.patch
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Sep 18 2007 Zdenek Prikryl <zprikryl at redhat.com> 1.06-29
+- update of source URI
+
 * Wed Aug 22 2007 Zdenek Prikryl <zprikryl at redhat.com> 1.06-28
 - fixed incorrect processing of decimal separator
 - Resolves: #253729



From fedora-extras-commits at redhat.com  Tue Sep 18 08:07:48 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 18 Sep 2007 04:07:48 -0400
Subject: rpms/gd/devel gd-2.0.35-AALineThick.patch, NONE,
	1.1 gd-2.0.35-overflow.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gd.spec, 1.44, 1.45 sources, 1.11,
	1.12 gd-2.0.33-AALineThick.patch, 1.1,
	NONE gd-2.0.33-overflow.patch, 1.1, NONE
Message-ID: <200709180807.l8I87m2o020644@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20582

Modified Files:
	.cvsignore gd.spec sources 
Added Files:
	gd-2.0.35-AALineThick.patch gd-2.0.35-overflow.patch 
Removed Files:
	gd-2.0.33-AALineThick.patch gd-2.0.33-overflow.patch 
Log Message:
- update to 2.0.35


gd-2.0.35-AALineThick.patch:

--- NEW FILE gd-2.0.35-AALineThick.patch ---
--- gd-2.0.35/gd.c.pom	2007-06-19 22:25:51.000000000 +0200
+++ gd-2.0.35/gd.c	2007-09-05 11:25:16.000000000 +0200
@@ -3474,6 +3474,8 @@ static void gdImageAALine (gdImagePtr im
 	/* keep them as 32bits */
 	long x, y, inc;
 	long dx, dy,tmp;
+	int w, wid, wstart; 
+	int thick = im->thick; 
 
 	if (!im->trueColor) {
 		/* TBB: don't crash when the image is of the wrong type */
@@ -3502,6 +3504,25 @@ static void gdImageAALine (gdImagePtr im
 		gdImageSetAAPixelColor(im, x1, y1, col, 0xFF);
 		return;
 	}
+	else { 
+	    double ag; 
+	    if (dy < dx)  
+		ag  = cos (atan2 (dy, dx)); 
+	    else  
+		ag = sin (atan2 (dy, dx)); 
+	    if (ag != 0)
+	    {
+		wid = thick / ag; 
+	    }
+	    else
+	    {
+		wid = 1;
+	    } 
+	    if (wid == 0)
+	    {
+		wid = 1;
+	    } 
+	} 
 	if (abs(dx) > abs(dy)) {
 		if (dx < 0) {
 			tmp = x1;
@@ -3518,8 +3539,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dy * 65536) / dx;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((x >> 16) <= x2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (y >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, x >> 16, (y >> 16) + 1,col, (~y >> 8) & 0xFF);
+			wstart = (y >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) {    
+			    gdImageSetAAPixelColor(im, (x >> 16) , w , col , (y >> 8) & 0xFF); 
+			    gdImageSetAAPixelColor(im, (x >> 16) , w + 1 , col, (~y >> 8) & 0xFF); 
+			} 
 			x += (1 << 16);
 			y += inc;
 		}
@@ -3539,8 +3563,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dx * 65536) / dy;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((y>>16) <= y2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (x >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, (x >> 16) + 1, (y >> 16),col, (~x >> 8) & 0xFF);
+			wstart = (x >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) { 
+			    gdImageSetAAPixelColor(im, w , y >> 16  , col, (x >> 8) & 0xFF);                    
+			    gdImageSetAAPixelColor(im, w + 1, y >> 16, col, (~x >> 8) & 0xFF);   
+			}
 			x += inc;
 			y += (1<<16);
 		}

gd-2.0.35-overflow.patch:

--- NEW FILE gd-2.0.35-overflow.patch ---
--- gd-2.0.35/gd_gd.c.pom	2006-04-05 17:52:22.000000000 +0200
+++ gd-2.0.35/gd_gd.c	2007-09-05 11:31:39.000000000 +0200
@@ -149,6 +149,10 @@ _gdCreateFromFile (gdIOCtx * in, int *sx
     {
       im = gdImageCreate (*sx, *sy);
     }
+  if (!im) 
+    { 
+      goto fail1; 
+    } 
   if (!_gdGetColors (in, im, gd2xFlag))
     {
       goto fail2;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2007 13:09:04 -0000	1.12
+++ .cvsignore	18 Sep 2007 08:07:15 -0000	1.13
@@ -1 +1 @@
-gd-2.0.34.tar.bz2
+gd-2.0.35.tar.bz2


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gd.spec	4 Sep 2007 14:08:31 -0000	1.44
+++ gd.spec	18 Sep 2007 08:07:15 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.0.34
-Release:       3%{?dist}
+Version:       2.0.35
+Release:       1%{?dist}
 Group:         System Environment/Libraries
 License:       MIT and GPL
 URL:           http://www.libgd.org/Main_Page
@@ -10,8 +10,8 @@
 Patch3:        gd-2.0.34-multilib.patch
 Patch4:        gd-loop.patch
 Patch5:        gd-2.0.34-sparc64.patch
-Patch6:        gd-2.0.33-overflow.patch
-Patch7:        gd-2.0.33-AALineThick.patch
+Patch6:        gd-2.0.35-overflow.patch
+Patch7:        gd-2.0.35-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
 Patch9:	       gd-2.0.34-fonts.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Ivana Varekova <varekova at redhat.com> 2.0.35-1
+- update to 2.0.35
+
 * Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-3
 - fix font paths (#225786#5)
 - fix pkgconfig Libs flag (#225786#4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2007 13:09:04 -0000	1.11
+++ sources	18 Sep 2007 08:07:15 -0000	1.12
@@ -1 +1 @@
-8c25c322f12030b1c24488efd577fec0  gd-2.0.34.tar.bz2
+6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  gd-2.0.35.tar.bz2


--- gd-2.0.33-AALineThick.patch DELETED ---


--- gd-2.0.33-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 08:12:22 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Tue, 18 Sep 2007 04:12:22 -0400
Subject: rpms/bc/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709180812.l8I8CMlj020855@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799

Modified Files:
	.cvsignore sources 
Log Message:
update of source URI



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 03:26:56 -0000	1.4
+++ .cvsignore	18 Sep 2007 08:11:50 -0000	1.5
@@ -1 +1 @@
-bc-1.06.tar.bz2
+bc-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 03:26:56 -0000	1.4
+++ sources	18 Sep 2007 08:11:50 -0000	1.5
@@ -1 +1 @@
-8cf9bd2fb29340a34582f15a6c8b13b3  bc-1.06.tar.bz2
+d44b5dddebd8a7a7309aea6c36fda117  bc-1.06.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 08:12:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 18 Sep 2007 04:12:31 -0400
Subject: rpms/ladspa-amb-plugins/F-7 ladspa-amb-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180812.l8I8CVA2020861@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-amb-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20829

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-amb-plugins.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-amb-plugins.spec ---
Name:           ladspa-amb-plugins
Version:        0.3.0
Release:        1%{?dist}
Summary:        Ambisonics LADSPA plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/AMB-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      amb-plugins <= 0.0.2
Provides:       amb-plugins = %{version}-%{release}

%description
A set of first order Ambisonics plugins to use with Ardour. Included
are: mono and stereo input panner, horizontal rotation, and square and
hexagon horizontal decoders. See the README for more.


%prep
%setup -q -n AMB-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# use the system version of ladspa.h
%{__rm} ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="-I. -fPIC -D_REENTRANT $RPM_OPT_FLAGS"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-amb-plugins
- updated to 0.1.0

* Sat May 13 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- update to 0.0.2

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:48:47 -0000	1.1
+++ .cvsignore	18 Sep 2007 08:11:58 -0000	1.2
@@ -0,0 +1 @@
+AMB-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:48:47 -0000	1.1
+++ sources	18 Sep 2007 08:11:58 -0000	1.2
@@ -0,0 +1 @@
+39a38b23a5f3a3e3009da37976660081  AMB-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:18:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:18:38 -0400
Subject: rpms/hexedit/devel .cvsignore, 1.6, 1.7 hexedit.spec, 1.23,
	1.24 sources, 1.6, 1.7
Message-ID: <200709180818.l8I8IccW021070@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/hexedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21020

Modified Files:
	.cvsignore hexedit.spec sources 
Log Message:
changed source tarbal to new upstream version with some minor fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2005 09:31:34 -0000	1.6
+++ .cvsignore	18 Sep 2007 08:18:06 -0000	1.7
@@ -1,2 +1 @@
-hexedit-1.2.10.src.tgz
 hexedit-1.2.12.src.tgz


Index: hexedit.spec
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hexedit.spec	6 Apr 2007 14:40:24 -0000	1.23
+++ hexedit.spec	18 Sep 2007 08:18:06 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A hexadecimal file viewer and editor
 Name: hexedit
 Version: 1.2.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://merd.sourceforge.net/pixel/hexedit.html
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovc at redhat.com> 1.2.12-6
+- changed to new upstream source tarbal with some minor fixes
+
 * Fri Apr 06 2007 Jindrich Novy <jnovy at redhat.com> 1.2.12-5
 - spec fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2005 09:31:34 -0000	1.6
+++ sources	18 Sep 2007 08:18:06 -0000	1.7
@@ -1 +1 @@
-dd31ed490baed49ae50e13e0984c8848  hexedit-1.2.12.src.tgz
+0d2f48610006278cd93359fea9a06d5c  hexedit-1.2.12.src.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 08:19:17 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 18 Sep 2007 04:19:17 -0400
Subject: rpms/slang/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <200709180819.l8I8JHNA021090@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21063

Modified Files:
	.cvsignore sources 
Log Message:
- update to 2.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Jul 2007 14:04:45 -0000	1.11
+++ .cvsignore	18 Sep 2007 08:18:38 -0000	1.12
@@ -1 +1 @@
-slang-2.1.1.tar.bz2
+slang-2.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Jul 2007 14:04:45 -0000	1.11
+++ sources	18 Sep 2007 08:18:38 -0000	1.12
@@ -1 +1 @@
-4465440c158a32aaebed6ef07e7408ac  slang-2.1.1.tar.bz2
+99534ae667ed1a50c863ce9a08912ccc  slang-2.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:33:15 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 04:33:15 -0400
Subject: rpms/cups/devel cups-str2512.patch,NONE,1.1 cups.spec,1.356,1.357
Message-ID: <200709180833.l8I8XFiX021576@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553

Modified Files:
	cups.spec 
Added Files:
	cups-str2512.patch 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
- Avoid write printcap unnecessarily (bug #290831).


cups-str2512.patch:

--- NEW FILE cups-str2512.patch ---
diff -up cups-1.3.1/scheduler/dirsvc.c.str2512 cups-1.3.1/scheduler/dirsvc.c
--- cups-1.3.1/scheduler/dirsvc.c.str2512	2007-09-08 01:28:06.000000000 +0100
+++ cups-1.3.1/scheduler/dirsvc.c	2007-09-18 09:31:23.000000000 +0100
@@ -91,7 +91,7 @@ static void	process_browse_data(const ch
 				    ipp_pstate_t state, const char *location,
 				    const char *info, const char *make_model,
 				    int num_attrs, cups_option_t *attrs);
-static void	process_implicit_classes(void);
+static void	process_implicit_classes(int *write_printcap);
 static void	send_cups_browse(cupsd_printer_t *p);
 #ifdef HAVE_LDAP
 static void	send_ldap_browse(cupsd_printer_t *p);
@@ -609,7 +609,7 @@ cupsdLoadRemoteCache(void)
   * Do auto-classing if needed...
   */
 
-  process_implicit_classes();
+  process_implicit_classes(NULL);
 }
 
 
@@ -1685,7 +1685,8 @@ process_browse_data(
     cups_option_t *attrs)		/* I - Attributes */
 {
   int		i;			/* Looping var */
-  int		update;			/* Update printer attributes? */
+  int		update,			/* Update printer attributes? */
+		write_printcap;		/* Write the printcap file? */
   char		finaluri[HTTP_MAX_URI],	/* Final URI for printer */
 		name[IPP_MAX_NAME],	/* Name of printer */
 		newname[IPP_MAX_NAME],	/* New name of printer */
@@ -1772,11 +1773,12 @@ process_browse_data(
   * See if we already have it listed in the Printers list, and add it if not...
   */
 
-  type   |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
-  type   &= ~CUPS_PRINTER_IMPLICIT;
-  update = 0;
-  hptr   = strchr(host, '.');
-  sptr   = strchr(ServerName, '.');
+  type           |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
+  type           &= ~CUPS_PRINTER_IMPLICIT;
+  update         = 0;
+  write_printcap = 0;
+  hptr           = strchr(host, '.');
+  sptr           = strchr(ServerName, '.');
 
   if (!ServerNameIsIP && sptr != NULL && hptr != NULL)
   {
@@ -1899,7 +1901,8 @@ process_browse_data(
       cupsdSetString(&p->device_uri, uri);
       cupsdSetString(&p->hostname, host);
 
-      update = 1;
+      update         = 1;
+      write_printcap = 1;
     }
   }
   else
@@ -2005,7 +2008,8 @@ process_browse_data(
       cupsdSetString(&p->uri, uri);
       cupsdSetString(&p->device_uri, uri);
 
-      update = 1;
+      write_printcap = 1;
+      update         = 1;
     }
   }
 
@@ -2064,7 +2068,8 @@ process_browse_data(
   if (info && (!p->info || strcmp(p->info, info)))
   {
     cupsdSetString(&p->info, info);
-    update = 1;
+    update         = 1;
+    write_printcap = 1;
   }
 
   if (!make_model || !make_model[0])
@@ -2153,6 +2158,7 @@ process_browse_data(
       if (p->type & CUPS_PRINTER_DEFAULT)
       {
         DefaultPrinter = p;
+	write_printcap = 1;
 	break;
       }
   }
@@ -2161,13 +2167,14 @@ process_browse_data(
   * Do auto-classing if needed...
   */
 
-  process_implicit_classes();
+  process_implicit_classes(&write_printcap);
 
  /*
   * Update the printcap file...
   */
 
-  cupsdWritePrintcap();
+  if (write_printcap)
+    cupsdWritePrintcap();
 }
 
 
@@ -2657,7 +2664,8 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
  */
 
 static void
-process_implicit_classes(void)
+process_implicit_classes(
+    int *write_printcap)		/* O - Write printcap file? */
 {
   int		i;			/* Looping var */
   int		update;			/* Update printer attributes? */
@@ -2738,6 +2746,9 @@ process_implicit_classes(void)
 
         update = 1;
 
+	if (write_printcap)
+	  *write_printcap = 1;
+
         cupsdLogMessage(CUPSD_LOG_DEBUG, "Added implicit class \"%s\"...",
 	                name);
 	cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
diff -up cups-1.3.1/scheduler/printers.c.str2512 cups-1.3.1/scheduler/printers.c
--- cups-1.3.1/scheduler/printers.c.str2512	2007-09-17 17:06:26.000000000 +0100
+++ cups-1.3.1/scheduler/printers.c	2007-09-18 09:31:23.000000000 +0100
@@ -3045,7 +3045,8 @@ cupsdWritePrintcap(void)
   * data has come from...
   */
 
-  cupsFilePuts(fp, "# This file was automatically generated by cupsd(8) from the\n");
+  cupsFilePuts(fp,
+               "# This file was automatically generated by cupsd(8) from the\n");
   cupsFilePrintf(fp, "# %s/printers.conf file.  All changes to this file\n",
                  ServerRoot);
   cupsFilePuts(fp, "# will be lost.\n");
@@ -3071,14 +3072,15 @@ cupsdWritePrintcap(void)
 
           if (DefaultPrinter)
 	    cupsFilePrintf(fp, "%s|%s:rm=%s:rp=%s:\n", DefaultPrinter->name,
-	            DefaultPrinter->info, ServerName, DefaultPrinter->name);
+	                   DefaultPrinter->info, ServerName,
+			   DefaultPrinter->name);
 
 	  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
 	       p;
 	       p = (cupsd_printer_t *)cupsArrayNext(Printers))
 	    if (p != DefaultPrinter)
 	      cupsFilePrintf(fp, "%s|%s:rm=%s:rp=%s:\n", p->name, p->info,
-	              ServerName, p->name);
+	                     ServerName, p->name);
           break;
 
       case PRINTCAP_SOLARIS:
@@ -3116,9 +3118,10 @@ cupsdWritePrintcap(void)
 	       p;
 	       p = (cupsd_printer_t *)cupsArrayNext(Printers))
 	    cupsFilePrintf(fp, "%s:\\\n"
-	        	"\t:bsdaddr=%s,%s:\\\n"
-			"\t:description=%s:\n",
-		    p->name, ServerName, p->name, p->info ? p->info : "");
+	        	       "\t:bsdaddr=%s,%s:\\\n"
+			       "\t:description=%s:\n",
+		           p->name, ServerName, p->name,
+			   p->info ? p->info : "");
           break;
     }
   }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- cups.spec	17 Sep 2007 16:10:57 -0000	1.356
+++ cups.spec	18 Sep 2007 08:32:42 -0000	1.357
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -37,6 +37,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
+Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
@@ -146,6 +147,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
+%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
@@ -439,6 +441,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
+- Avoid write printcap unnecessarily (bug #290831).
+
 * Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
 - 1.3.1.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 08:42:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:42:41 -0400
Subject: rpms/openobex/devel openobex.spec,1.24,1.25
Message-ID: <200709180842.l8I8gfI0021892@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21801

Modified Files:
	openobex.spec 
Log Message:
Updated sources URL to point to the right location



Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openobex.spec	28 Aug 2007 14:43:46 -0000	1.24
+++ openobex.spec	18 Sep 2007 08:42:09 -0000	1.25
@@ -5,7 +5,7 @@
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
-Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz
+Source: http://mesh.dl.sourceforge.net/sourceforge/openobex/openobex-%{version}.tar.gz
 Patch: openobex-apps-flush.patch
 Patch1: openobex-1.3-push.patch
 Patch2: openobex-1.3-ipv6.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 08:47:23 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:47:23 -0400
Subject: rpms/openobex/devel openobex.spec,1.25,1.26
Message-ID: <200709180847.l8I8lNB6021975@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21943

Modified Files:
	openobex.spec 
Log Message:
Changed sources URL in spec file to point to the right location



Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openobex.spec	18 Sep 2007 08:42:09 -0000	1.25
+++ openobex.spec	18 Sep 2007 08:46:50 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovcak at redhat.com> 1.3-8
+- Changed sources in specfile URL to point to the right location
+
 * Fri Aug 24 2007 Jiri Moskovcak <jmoskovc at redhat.com> 1.3-7
 - Added ipv6 support
 - Resolves: #198396



From fedora-extras-commits at redhat.com  Tue Sep 18 08:48:02 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 04:48:02 -0400
Subject: rpms/hulahop/OLPC-2 hulahop.spec,1.7,1.8
Message-ID: <200709180848.l8I8m2tN021996@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/hulahop/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21974

Modified Files:
	hulahop.spec 
Log Message:
Bump version



Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/hulahop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hulahop.spec	17 Sep 2007 19:28:06 -0000	1.7
+++ hulahop.spec	18 Sep 2007 08:47:30 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name: hulahop
 Version: 0.2
-Release: 0.6.%{alphatag}61d001479c
+Release: 0.7.%{alphatag}61d001479c
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Sep 18 09:11:56 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:11:56 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested watchbugzilla
Message-ID: <200709180911.l8I9BwxI017182@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on e2fsprogs (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:11:56 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:11:56 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested commit
Message-ID: <200709180911.l8I9BwCd017244@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on e2fsprogs (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:12:02 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:12:02 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested watchcommits
Message-ID: <200709180912.l8I9C2CM017210@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on e2fsprogs (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:18:22 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 05:18:22 -0400
Subject: extras-buildsys/utils certhelper.py,1.4,1.5
Message-ID: <200709180918.l8I9IMH4028667@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28648

Modified Files:
	certhelper.py 
Log Message:
fix typo in certhelper examples


Index: certhelper.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/certhelper.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- certhelper.py	4 Oct 2005 17:10:09 -0000	1.4
+++ certhelper.py	18 Sep 2007 09:18:20 -0000	1.5
@@ -33,7 +33,7 @@
     print "Examples:\n"
     print "    %s ca --outdir=/etc/plague/ca --name=my_ca" % prog
     print "    %s normal --outdir=/etc/plague/server/certs --name=server --cadir=/etc/plague/ca --caname=my_ca" % prog
-    print "    %s normal --outdir=/etc/plague/builder/certs --name=builder1 --cadir=/etc/plage/ca --caname=my_ca" % prog
+    print "    %s normal --outdir=/etc/plague/builder/certs --name=builder1 --cadir=/etc/plague/ca --caname=my_ca" % prog
     print "\n"
 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 09:19:11 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 05:19:11 -0400
Subject: extras-buildsys README,1.11,1.12
Message-ID: <200709180919.l8I9JBIc028721@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28703

Modified Files:
	README 
Log Message:
fix typo in 1st line


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- README	8 Aug 2005 19:11:24 -0000	1.11
+++ README	18 Sep 2007 09:19:09 -0000	1.12
@@ -1,4 +1,4 @@
-fFedora Extras Build System
+Fedora Extras Build System
 
 System Requirements:
     - Python 2.3 or 2.4



From fedora-extras-commits at redhat.com  Tue Sep 18 09:19:12 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 18 Sep 2007 05:19:12 -0400
Subject: rpms/man-pages/devel .cvsignore, 1.40, 1.41 man-pages.spec, 1.86,
	1.87 sources, 1.39, 1.40
Message-ID: <200709180919.l8I9JCHv028726@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28649

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
 update to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	14 Aug 2007 10:53:44 -0000	1.40
+++ .cvsignore	18 Sep 2007 09:18:40 -0000	1.41
@@ -2,4 +2,4 @@
 man2.tar.gz
 man2_sys2.1.tar.gz
 man-suid-bins.tar.bz2
-man-pages-2.64.tar.bz2
+man-pages-2.65.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- man-pages.spec	28 Aug 2007 09:23:13 -0000	1.86
+++ man-pages.spec	18 Sep 2007 09:18:40 -0000	1.87
@@ -1,6 +1,6 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 2.64
+Version: 2.65
 Release: 1%{?dist}
 License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE
 Group: Documentation
@@ -177,6 +177,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Tue Sep 18 2007 Ivana Varekova <varekova at redhat.com> - 2.65-1
+- update to 2.65
+
 * Tue Aug 14 2007 Ivana Varekova <varekova at redhat.com> - 2.64-1
 - update to 2.64
 - remove obsolete patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	14 Aug 2007 10:53:44 -0000	1.39
+++ sources	18 Sep 2007 09:18:40 -0000	1.40
@@ -2,4 +2,4 @@
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 fbc03fdbc665e24961d30dad3ed8596d  man2_sys2.1.tar.gz
 a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
-80683dd76cd4eb5aed36ac4401aef4d6  man-pages-2.64.tar.bz2
+8b31a273186c8cae42fdf66a77d6679f  man-pages-2.65.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:44 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:44 -0700
Subject: [pkgdb] apr: oliver has requested watchbugzilla
Message-ID: <200709180923.l8I9Nj6L020880@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on apr (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:47 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:47 -0700
Subject: [pkgdb] apr: oliver has requested watchcommits
Message-ID: <200709180923.l8I9NnFu020905@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on apr (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:50 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:50 -0700
Subject: [pkgdb] apr: oliver has requested commit
Message-ID: <200709180923.l8I9NoVf020914@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on apr (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:41:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 05:41:42 -0400
Subject: rpms/rusers/devel rusers.spec,1.27,1.28 rusersd.init,1.3,1.4
Message-ID: <200709180941.l8I9fgpY031359@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/rusers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31336

Modified Files:
	rusers.spec rusersd.init 
Log Message:
Fixed init script to work propery with rpcbind



Index: rusers.spec
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rusers.spec	17 Sep 2007 12:39:38 -0000	1.27
+++ rusers.spec	18 Sep 2007 09:41:09 -0000	1.28
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 51%{?dist}
+Release: 52%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,6 +146,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovc at redhat.com> 0.17-52
+- Fixed init script to work properly with rpcbind
+
 * Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-51
 - Removed portmap dependency and re-worked when the user
   privilege are drop; allowing port registration with


Index: rusersd.init
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/rusersd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rusersd.init	24 Jul 2007 11:39:34 -0000	1.3
+++ rusersd.init	18 Sep 2007 09:41:09 -0000	1.4
@@ -34,9 +34,9 @@
     then
 	  exit 0
     fi
-	status portmap > /dev/null
+	status rpcbind > /dev/null
 	RETVAL=$?
-	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/portmap start
+	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/rpcbind start
 	echo -n $"Starting rusers services: "
 	daemon rpc.rusersd
 	RETVAL=$?



From fedora-extras-commits at redhat.com  Tue Sep 18 09:56:15 2007
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 18 Sep 2007 05:56:15 -0400
Subject: rpms/awstats/EL-5 .cvsignore, 1.6, 1.7 awstats.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200709180956.l8I9uFp6002042@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1914

Modified Files:
	.cvsignore awstats.spec sources 
Log Message:
Bring up to latest version (sync'd with Fedora devel) before initial build for EL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 May 2006 08:17:10 -0000	1.6
+++ .cvsignore	18 Sep 2007 09:55:42 -0000	1.7
@@ -1 +1,2 @@
 awstats-6.6.tar.gz
+awstats-6.7-xmlhistory.patch


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- awstats.spec	7 Jan 2007 21:24:41 -0000	1.18
+++ awstats.spec	18 Sep 2007 09:55:42 -0000	1.19
@@ -1,19 +1,25 @@
 Name:       awstats
-Version:    6.6
+Version:    6.7
 Release:    1%{?dist}
 Summary:    Advanced Web Statistics
-License:    GPL
+License:    GPLv2
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-%{version}.tar.gz
 #Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
 Source1:    awstats.README.SELinux
+
+# Fix pb in xml output for history files
+# http://awstats.cvs.sourceforge.net/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.892&r2=1.894&view=patch
+Patch0:     awstats-6.7-xmlhistory.patch
+
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: checkpolicy, selinux-policy-devel
 Requires:   httpd
 Requires:   perl
-Requires(post): perl, policycoreutils
-Requires(postun): /sbin/service, policycoreutils
+Requires(post): perl
+Requires(postun): /sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -31,9 +37,23 @@
 With the default configuration, the statistics are available:
 http://localhost/awstats/awstats.pl
 
+%package    selinux
+Summary:    SELinux support for Awstats
+Group:      Applications/Internet
+Requires:   %{name} = %{version}
+Requires(post): policycoreutils
+Requires(preun): policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+This package adds SELinux enforcement to AWstats.
+
 
 %prep
 %setup -q
+# No backup or it will be installed
+#%%patch0 -p0 -b .xmlhistory
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -43,6 +63,7 @@
 perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
+mkdir selinux
 
 
 %install
@@ -111,6 +132,15 @@
 # Cron job
 install -m 0755 awstats.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
 
+# SELinux support
+cd selinux
+echo 'policy_module(%{name}, 1.0)' > %{name}.te
+echo '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)? system_u:object_r:httpd_sys_script_exec_t:s0' > %{name}.fc
+echo '%{_localstatedir}/lib/awstats(/.*)? system_u:object_r:httpd_sys_script_rw_t:s0' >> %{name}.fc
+touch %{name}.if
+make -f %{_datadir}/selinux/devel/Makefile
+install -p -m 644 -D %{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,27 +155,29 @@
                       ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || :
   fi
 fi
-### SELinux support ###
-# Set SELinux file_context
-semanage fcontext -a -t httpd_sys_script_exec_t \
-    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
-# Actually change the context
-chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || :
-chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || :
-
 
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
-# SELinux support
-if [ $1 -eq 0 ]; then
-  semanage fcontext -d -t httpd_sys_script_exec_t \
-    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-  semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
+
+%post selinux
+if [ "$1" -le "1" ]; then # Fist install
+    semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || :
+    fixfiles -R %{name} restore
+fi
+
+%preun selinux
+if [ "$1" -lt "1" ]; then # Final removal
+    semodule -r %{name} 2>/dev/null || :
+    fixfiles -R %{name} restore
 fi
 
+%postun selinux
+if [ "$1" -ge "1" ]; then # Upgrade
+    # Replaces the module if it is already loaded
+    semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || :
+fi
 
 
 %files
@@ -161,7 +193,7 @@
 %{_datadir}/%{name}/wwwroot/cgi-bin
 # Different defattr to fix lots of files which should not be +x.
 %defattr(644,root,root,755)
-%doc README.TXT docs/* README.SELinux
+%doc README.TXT docs/*
 %{_datadir}/%{name}/lang
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/plugins
@@ -171,111 +203,12 @@
 %{_datadir}/%{name}/wwwroot/js
 
 
+%files selinux
+%defattr(644, root, root, 755)
+%doc README.SELinux
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
 
-%changelog
-* Sun Jan 07 2007 Aurelien Bompard <abompard at fedoraproject.org> 6.6-1
-- version 6.6 final
-
-* Fri Nov 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.4.beta
-- fix typo in the cron job (bug 213803)
 
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
-- fix DOS encoding on logresolvemerge.pl
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
-- rebuild
-
-* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
-- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
-
-* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
-- SELinux support: use semanage to label the cgi and the database files
-- Only allow access from localhost by default (this app has a security history)
-
-* Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
-- rebuild for FC5
-
-* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
-- version 6.5 final
-
-* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
-- version 6.5 (beta), fixes CAN-2005-1527
-
-* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1
-- version 6.4 final
-- change release tag (following Owen's scheme)
-- convert tabs into spaces
-
-* Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
-- update to 6.4pre to fix a vulnerability
-
-* Thu Feb 10 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-1
-- version 6.3 final
-
-* Thu Jan 27 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-0.1.20050122
-- update to 6.3pre to fix vulnerability
-
-* Sun Nov 28 2004 Aurelien Bompard <gauret[AT]free.fr> 6.2-0.fdr.1
-- version 6.2
-
-* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.6
-- remove redundant substitution
-
-* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.5
-- be closer to upstream default configuration
-- use the included apache conf file
-- merge changes from Michael Schwendt (bug 1608)
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.4
-- fix cron job for relocated tools
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.3
-- keep the tools in the tools subdirectory
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.2
-- fix scripts in /usr/bin
-- rename configure.pl to awstats_configure.pl
-
-* Sun May 16 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.1
-- version 6.1
-
-* Wed Mar 03 2004 Aurelien Bompard <gauret[AT]free.fr> 6.0.0.fdr.2
-- requires perl without version to fix build on rh9
-
-* Tue Feb 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.0-0.fdr.1
-- version 6.0
-
-* Mon Dec 22 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.5
-- solve stupid bug in %%install
-- only create the preconfigured config file on install, not on upgrade
-
-* Mon Dec 22 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.4
-- post scriptlet doesn't overwrite user configuration now
-  be careful if you upgrade from 5.9-0.fdr.3
-- replace _DATADIR in apache configuration in the install stage
-  (was in the post scriptlet before)
-- remove 'noreplace' tag from the apache config file
-- various cleanups in the %%install stage
-- Thanks to Mickael Schwendt.
-
-* Sun Dec 07 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.3
-- %%post et %%postun now use condrestart instead of restart
-- only restart apache if we are upgrading
-- install and cp use the "-p" switch
-- use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job 
-- don't brutally recode HTML pages
-- the scan is now done hourly instead of daily
-- *.pm files are not executable any more
-- tools are in %%bindir
-- various other improvements
-- many thanks to Michael Schwendt and Dag Wieers.
-
-* Sat Nov 29 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.2
-- Set the hostname in %%post (thanks to Michael Koziarski)
-- Improved customization in %%post
-
-* Sun Nov 16 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.1
-- fix /etc/cron.daily/awstats permissions
-- fix log name in conf file
-- port to fedora (from Mandrake)
+%changelog
+* Tue Sep 18 2007 Tim Jackson <rpm at timj.co.uk> 6.7-1
+- initial import to EPEL-5, from Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Jan 2007 21:24:41 -0000	1.10
+++ sources	18 Sep 2007 09:55:42 -0000	1.11
@@ -1 +1,2 @@
-38e393edb530d409fdf7f79127a7548e  awstats-6.6.tar.gz
+512cd146247eb178ef023c924f7bb766  awstats-6.7.tar.gz
+cbf319b3472a022cd2452d612ac28117  awstats-6.7-xmlhistory.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:08 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:08 -0700
Subject: [pkgdb] fish: oliver has requested watchbugzilla
Message-ID: <200709180957.l8I9v9fF030693@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on fish (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:09 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:09 -0700
Subject: [pkgdb] fish: oliver has requested watchcommits
Message-ID: <200709180957.l8I9v9ZA030360@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on fish (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:09 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:09 -0700
Subject: [pkgdb] fish: oliver has requested watchbugzilla
Message-ID: <200709180957.l8I9v9Bv030705@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on fish (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:10 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:10 -0700
Subject: [pkgdb] fish: oliver has requested watchcommits
Message-ID: <200709180957.l8I9vAes030717@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on fish (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:11 -0700
Subject: [pkgdb] fish: oliver has requested commit
Message-ID: <200709180957.l8I9vBQx030378@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on fish (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:11 -0700
Subject: [pkgdb] fish: oliver has requested commit
Message-ID: <200709180957.l8I9vCAc030389@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on fish (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:13 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:13 -0700
Subject: [pkgdb] fish: oliver has requested approveacls
Message-ID: <200709180957.l8I9vDaa030737@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the approveacls acl on fish (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:14 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:14 -0700
Subject: [pkgdb] fish: oliver has requested approveacls
Message-ID: <200709180957.l8I9vErc030753@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the approveacls acl on fish (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 10:15:57 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:15:57 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181015.l8IAFwDI004032@app3.fedora.phx.redhat.com>

Joe Orton (jorton) has set the commit acl on apr (Fedora devel) to Denied for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 10:16:00 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:16:00 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181016.l8IAG2iw004056@app4.fedora.phx.redhat.com>

Joe Orton (jorton) has set the watchcommits acl on apr (Fedora devel) to Approved for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 10:16:02 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:16:02 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181016.l8IAG3SV004074@app4.fedora.phx.redhat.com>

Joe Orton (jorton) has set the watchbugzilla acl on apr (Fedora devel) to Approved for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 10:20:26 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 18 Sep 2007 06:20:26 -0400
Subject: rpms/kbd/devel .cvsignore, 1.6, 1.7 kbd.spec, 1.43, 1.44 sources,
	1.8, 1.9
Message-ID: <200709181020.l8IAKQSD008459@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8428

Modified Files:
	.cvsignore kbd.spec sources 
Log Message:
add new romanian keymap, resolves: #253892


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Jul 2007 08:43:38 -0000	1.6
+++ .cvsignore	18 Sep 2007 10:19:55 -0000	1.7
@@ -2,3 +2,4 @@
 kbd-latsun-fonts.tar.bz2
 sun12x22-fixed.psfu
 kbd-sun12x22-fixed.tar.bz2
+ro.map


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kbd.spec	27 Aug 2007 12:43:13 -0000	1.43
+++ kbd.spec	18 Sep 2007 10:19:55 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 24%{?dist}
+Release: 25%{?dist}
 # Except possibly for the restrictions mentioned in the directory consolefonts
 License: GPL+
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source3: kbdrate.pam
 Source4: kbd-latsun-fonts.tar.bz2
 Source5: kbd-sun12x22-fixed.tar.bz2
+Source6: ro.map
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
@@ -68,6 +69,9 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
+# add new romanian keymap
+cp ../ro.map data/keymaps/i386/qwerty
+
 # Default to latarcyrheb-sun16 font for unicode
 perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
 
@@ -140,6 +144,10 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep 18 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-25
+- Add new romanian keymap
+  Resolves: #253892
+
 * Mon Aug 27 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-24
 - Fix license
 - Symlink sr-cy layout to sr-latin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jul 2007 08:43:38 -0000	1.8
+++ sources	18 Sep 2007 10:19:55 -0000	1.9
@@ -1,3 +1,4 @@
 069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
 e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
+b7ea916f350df2dfedfd306ff54a6f65  ro.map



From fedora-extras-commits at redhat.com  Tue Sep 18 10:30:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 18 Sep 2007 06:30:22 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec, 1.32, 1.33 sources, 1.11,
	1.12
Message-ID: <200709181030.l8IAUMSL008743@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8715

Modified Files:
	man-pages-fr.spec sources 
Log Message:
Add correct files from upstream.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- man-pages-fr.spec	10 Sep 2007 11:57:03 -0000	1.32
+++ man-pages-fr.spec	18 Sep 2007 10:29:50 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.40.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -106,6 +106,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Tue Sep 18 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-10
+- rebuild with correct sources
+
 * Mon Sep 10 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-9
 - 273941 doesn't install linkchecker man page
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Aug 2007 13:10:48 -0000	1.11
+++ sources	18 Sep 2007 10:29:50 -0000	1.12
@@ -1,2 +1,2 @@
-57109f5fec7005b0fd49dc84529244c1  mansupfr.tar.bz2
 7e5a09c07ceae5c547b8d62fe58d9c43  man-pages-fr-2.40.0.tar.bz2
+c320c19a827c7003da5eb7bf99742c56  mansupfr.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:39:05 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 06:39:05 -0400
Subject: rpms/libieee1284/devel .cvsignore, 1.3, 1.4 libieee1284.spec, 1.13, 
	1.14 sources, 1.4, 1.5
Message-ID: <200709181039.l8IAd5L3008987@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/libieee1284/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8948

Modified Files:
	.cvsignore libieee1284.spec sources 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
- 0.2.11 (bug #246406).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jan 2005 14:51:27 -0000	1.3
+++ .cvsignore	18 Sep 2007 10:38:33 -0000	1.4
@@ -1,2 +1,3 @@
 libieee1284-0.2.8.tar.bz2
 libieee1284-0.2.9.tar.bz2
+libieee1284-0.2.11.tar.bz2


Index: libieee1284.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/libieee1284.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libieee1284.spec	29 Aug 2007 14:33:14 -0000	1.13
+++ libieee1284.spec	18 Sep 2007 10:38:33 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A library for interfacing IEEE 1284-compatible devices
 Name: libieee1284
-Version: 0.2.9
-Release: 5%{?dist}
+Version: 0.2.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
@@ -72,6 +72,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
+- 0.2.11 (bug #246406).
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.2.9-5
 - Added dist tag.
 - Fixed summary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 16:50:18 -0000	1.4
+++ sources	18 Sep 2007 10:38:33 -0000	1.5
@@ -1 +1 @@
-83ea1d5463a8f47ba5121cf38973b4a4  libieee1284-0.2.9.tar.bz2
+b8fff9f3d121531bc17430e3f4ea6ed0  libieee1284-0.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:40:09 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 18 Sep 2007 06:40:09 -0400
Subject: rpms/kbd/devel .cvsignore, 1.7, 1.8 kbd.spec, 1.44, 1.45 sources,
	1.9, 1.10
Message-ID: <200709181040.l8IAe9Zm009091@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9040

Modified Files:
	.cvsignore kbd.spec sources 
Log Message:
better solution:)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2007 10:19:55 -0000	1.7
+++ .cvsignore	18 Sep 2007 10:39:36 -0000	1.8
@@ -3,3 +3,4 @@
 sun12x22-fixed.psfu
 kbd-sun12x22-fixed.tar.bz2
 ro.map
+ro.tar.bz2


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kbd.spec	18 Sep 2007 10:19:55 -0000	1.44
+++ kbd.spec	18 Sep 2007 10:39:36 -0000	1.45
@@ -11,7 +11,7 @@
 Source3: kbdrate.pam
 Source4: kbd-latsun-fonts.tar.bz2
 Source5: kbd-sun12x22-fixed.tar.bz2
-Source6: ro.map
+Source6: ro.tar.bz2
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,7 +41,7 @@
 
 %prep
 
-%setup -q -a 4 -a 5
+%setup -q -a 4 -a 5 -a 6
 %patch0 -p1 -b .sparc
 %patch1 -p1
 %patch2 -p1 -b .terminal
@@ -69,9 +69,6 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
-# add new romanian keymap
-cp ../ro.map data/keymaps/i386/qwerty
-
 # Default to latarcyrheb-sun16 font for unicode
 perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Sep 2007 10:19:55 -0000	1.9
+++ sources	18 Sep 2007 10:39:36 -0000	1.10
@@ -1,4 +1,4 @@
 069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
 e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
-b7ea916f350df2dfedfd306ff54a6f65  ro.map
+cc29253d2189758705547d0ea9574abe  ro.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:41:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 06:41:39 -0400
Subject: rpms/openldap/devel ldap.init, 1.25, 1.26 ldap.sysconfig, 1.1,
	1.2 openldap.spec, 1.93, 1.94
Message-ID: <200709181041.l8IAfdjD009271@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223

Modified Files:
	ldap.init ldap.sysconfig openldap.spec 
Log Message:
fixed upgrade with empty database
fixed /etc/sysconfig/ldap handling


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ldap.init	17 Sep 2007 12:26:02 -0000	1.25
+++ ldap.init	18 Sep 2007 10:41:07 -0000	1.26
@@ -154,7 +154,7 @@
 	user=ldap
 	prog=`basename ${slapd}`
 	harg=""
-	if test x$LDAPD_LDAP = xyes ; then
+	if test x$SLAPD_LDAP = xyes ; then
 	    harg="ldap:///"
 	fi
 	if test x$SLAPD_LDAPS = xyes ; then







From fedora-extras-commits at redhat.com  Tue Sep 18 10:42:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 06:42:19 -0400
Subject: rpms/openldap/devel openldap.spec,1.94,1.95
Message-ID: <200709181042.l8IAgJrY009324@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9280

Modified Files:
	openldap.spec 
Log Message:
version++


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- openldap.spec	18 Sep 2007 10:41:07 -0000	1.94
+++ openldap.spec	18 Sep 2007 10:41:47 -0000	1.95
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 10:43:31 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 06:43:31 -0400
Subject: rpms/libieee1284/F-7 .cvsignore, 1.3, 1.4 libieee1284.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200709181043.l8IAhVep009471@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/libieee1284/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9402

Modified Files:
	.cvsignore libieee1284.spec sources 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
- 0.2.11 (bug #246406).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jan 2005 14:51:27 -0000	1.3
+++ .cvsignore	18 Sep 2007 10:42:58 -0000	1.4
@@ -1,2 +1,3 @@
 libieee1284-0.2.8.tar.bz2
 libieee1284-0.2.9.tar.bz2
+libieee1284-0.2.11.tar.bz2


Index: libieee1284.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/libieee1284.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libieee1284.spec	7 Dec 2006 15:43:48 -0000	1.12
+++ libieee1284.spec	18 Sep 2007 10:42:58 -0000	1.13
@@ -1,13 +1,13 @@
-Summary: A library for interfacing IEEE 1284-compatible devices.
+Summary: A library for interfacing IEEE 1284-compatible devices
 Name: libieee1284
-Version: 0.2.9
-Release: 4
-License: GPL
+Version: 0.2.11
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
 Source0: ftp://cyberelk.net/tim/data/%{name}/devel/%{name}-%{version}.tar.bz2
 Prereq: /sbin/ldconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xmlto, python-devel
 
 %description
@@ -72,6 +72,15 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
+- 0.2.11 (bug #246406).
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.2.9-5
+- Added dist tag.
+- Fixed summary.
+- Better buildroot tag.
+- More specific license tag.
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 0.2.9-4
 - rebuild against python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 16:50:18 -0000	1.4
+++ sources	18 Sep 2007 10:42:58 -0000	1.5
@@ -1 +1 @@
-83ea1d5463a8f47ba5121cf38973b4a4  libieee1284-0.2.9.tar.bz2
+b8fff9f3d121531bc17430e3f4ea6ed0  libieee1284-0.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:46:54 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:46:54 -0400
Subject: rpms/totem/devel totem.spec,1.120,1.121
Message-ID: <200709181046.l8IAksjM009654@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9620

Modified Files:
	totem.spec 
Log Message:
Fix URL



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- totem.spec	16 Sep 2007 22:26:05 -0000	1.120
+++ totem.spec	18 Sep 2007 10:46:18 -0000	1.121
@@ -9,7 +9,7 @@
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.18/totem-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.20/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14



From fedora-extras-commits at redhat.com  Tue Sep 18 10:48:46 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:48:46 -0400
Subject: rpms/gnome-audio/devel gnome-audio.spec,1.12,1.13
Message-ID: <200709181048.l8IAmkhS009736@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-audio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9694

Modified Files:
	gnome-audio.spec 
Log Message:
Fix URL



Index: gnome-audio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-audio/devel/gnome-audio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-audio.spec	5 Feb 2007 13:20:48 -0000	1.12
+++ gnome-audio.spec	18 Sep 2007 10:48:13 -0000	1.13
@@ -4,7 +4,7 @@
 Release: 4
 License: LGPL
 Group: Applications/Multimedia
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-audio-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-audio/2.0/gnome-audio-%{version}.tar.bz2
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArchitectures: noarch



From fedora-extras-commits at redhat.com  Tue Sep 18 10:49:20 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:49:20 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.107,1.108
Message-ID: <200709181049.l8IAnKGF009869@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9726

Modified Files:
	gnome-media.spec 
Log Message:
Fix URL



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-media.spec	17 Sep 2007 16:43:17 -0000	1.107
+++ gnome-media.spec	18 Sep 2007 10:48:46 -0000	1.108
@@ -15,7 +15,7 @@
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.gz
+Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 



From fedora-extras-commits at redhat.com  Tue Sep 18 10:49:52 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:49:52 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.130,1.131
Message-ID: <200709181049.l8IAnqru009908@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9863

Modified Files:
	rhythmbox.spec 
Log Message:
Fix URL



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- rhythmbox.spec	24 Aug 2007 17:17:36 -0000	1.130
+++ rhythmbox.spec	18 Sep 2007 10:49:18 -0000	1.131
@@ -7,7 +7,7 @@
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
-Source: ftp://download.gnome.org/sources/rhythmbox/0.10/%{name}-%{version}.tar.bz2
+Source: ftp://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
 Source1: rhythmbox-iradio-initial.pls
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0



From fedora-extras-commits at redhat.com  Tue Sep 18 10:55:26 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:55:26 -0400
Subject: rpms/speex/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 speex.spec, 
	1.18, 1.19
Message-ID: <200709181055.l8IAtQ77010265@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/speex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10219

Modified Files:
	.cvsignore sources speex.spec 
Log Message:
* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2-0.3.beta2
- Update to Beta 2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 16:25:13 -0000	1.5
+++ .cvsignore	18 Sep 2007 10:54:46 -0000	1.6
@@ -1 +1 @@
-speex-1.2beta1.tar.gz
+speex-1.2beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 16:25:13 -0000	1.5
+++ sources	18 Sep 2007 10:54:46 -0000	1.6
@@ -1 +1 @@
-aac2e4ba42122b885c787ea280acb3d9  speex-1.2beta1.tar.gz
+5480fa53a7451603ecb57ff815c87ac0  speex-1.2beta2.tar.gz


Index: speex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/speex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- speex.spec	24 Oct 2006 19:06:18 -0000	1.18
+++ speex.spec	18 Sep 2007 10:54:46 -0000	1.19
@@ -1,11 +1,11 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
 Version: 	1.2
-Release:	0.2.beta1 
+Release:	0.3.beta2
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
-Source0: 	http://www.speex.org/download/%{name}-1.2beta1.tar.gz
+Source0:	http://downloads.us.xiph.org/releases/speex/%{name}-1.2beta2.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libogg-devel
 
@@ -31,7 +31,7 @@
 speech. This package contains development files for %{name}
 
 %prep
-%setup -q -n speex-1.2beta1
+%setup -q -n speex-1.2beta2
 %patch0 -p1 -b .test-progs
 
 %build
@@ -69,6 +69,9 @@
 %{_libdir}/libspeex.a
 
 %changelog
+* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2-0.3.beta2
+- Update to Beta 2
+
 * Tue Oct 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.2-0.2.beta1
 - Rebuild 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 10:57:47 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 06:57:47 -0400
Subject: rpms/anthy/devel .cvsignore, 1.28,
	1.29 anthy-enable-dict-gtankan.patch, 1.1, 1.2 anthy.spec, 1.43,
	1.44 sources, 1.29, 1.30
Message-ID: <200709181057.l8IAvllW010439@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10394

Modified Files:
	.cvsignore anthy-enable-dict-gtankan.patch anthy.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	8 Aug 2007 09:46:26 -0000	1.28
+++ .cvsignore	18 Sep 2007 10:57:14 -0000	1.29
@@ -32,3 +32,4 @@
 anthy-9011.tar.gz
 anthy-9100.tar.gz
 alt-cannadic-070805.tar.bz2
+anthy-9100b.tar.gz

anthy-enable-dict-gtankan.patch:

Index: anthy-enable-dict-gtankan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy-enable-dict-gtankan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anthy-enable-dict-gtankan.patch	8 Aug 2007 10:00:22 -0000	1.1
+++ anthy-enable-dict-gtankan.patch	18 Sep 2007 10:57:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN anthy-9100.orig/mkworddic/dict.args.in anthy-9100/mkworddic/dict.args.in
---- anthy-9100.orig/mkworddic/dict.args.in	2007-04-04 20:00:03.000000000 +0900
-+++ anthy-9100/mkworddic/dict.args.in	2007-08-08 18:14:41.000000000 +0900
+diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in
+--- anthy-9100b.orig/mkworddic/dict.args.in	2007-09-16 21:38:40.000000000 +0900
++++ anthy-9100b/mkworddic/dict.args.in	2007-09-18 19:53:52.000000000 +0900
 @@ -10,9 +10,9 @@
  read @top_srcdir@/alt-cannadic/gcanna.ctd
  #
@@ -8,8 +8,8 @@
 -#read @top_srcdir@/alt-cannadic/gtankan.ctd
 +read @top_srcdir@/alt-cannadic/gtankan.ctd
  #
--read @top_srcdir@/mkworddic/tankanji.t
-+#read @top_srcdir@/mkworddic/tankanji.t
+-read @top_srcdir@/mkworddic/gtankan.ctd
++#read @top_srcdir@/mkworddic/gtankan.ctd
  read @top_srcdir@/mkworddic/adjust.t
  read @top_srcdir@/mkworddic/name.t
  read @top_srcdir@/mkworddic/compound.t


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- anthy.spec	23 Aug 2007 07:29:03 -0000	1.43
+++ anthy.spec	18 Sep 2007 10:57:14 -0000	1.44
@@ -1,8 +1,8 @@
 %define		altcannadicver	070805
 
 Name:		anthy
-Version:	9100
-Release:	3%{?dist}
+Version:	9100b
+Release:	1%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -117,6 +117,9 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
+- New upstream release.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 9100-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Aug 2007 09:46:26 -0000	1.29
+++ sources	18 Sep 2007 10:57:14 -0000	1.30
@@ -1,2 +1,2 @@
-00c2b8d7b722650b0088944e833077ad  anthy-9100.tar.gz
 17f849584baa5ae025542035b429f1b4  alt-cannadic-070805.tar.bz2
+0ad3873646255a2ca1c8576350fabb27  anthy-9100b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 11:00:51 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 07:00:51 -0400
Subject: rpms/apr/devel apr.spec,1.72,1.73
Message-ID: <200709181100.l8IB0poN010691@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629

Modified Files:
	apr.spec 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
- fix %check for non-multilib 64-bit platforms



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- apr.spec	11 Sep 2007 09:50:48 -0000	1.72
+++ apr.spec	18 Sep 2007 11:00:19 -0000	1.73
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.11
-Release: 1
+Release: 2
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -85,15 +85,14 @@
       $RPM_BUILD_ROOT%{_libdir}/libapr-*.a
 
 %check
-%if "%{_lib}" == "lib"
-# Fail if LFS support isn't preent in a 32-bit build, since this
+# Fail if LFS support isn't present in a 32-bit build, since this
 # breaks ABI and the soname doesn't change: see #254241
-if ! grep off64_t include/apr.h; then
+if grep 'define SIZEOF_VOIDP 4' include/apr.h \
+   && ! grep off64_t include/apr.h; then
   cat config.log
   : LFS support not present in 32-bit build
   exit 1
 fi
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,6 +121,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
+- fix %%check for non-multilib 64-bit platforms
+
 * Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
 - bump up to 1.2.11
 - drop openlfs patch (fixed upstream)



From fedora-extras-commits at redhat.com  Tue Sep 18 11:04:30 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:04:30 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.11, 1.12 im-chooser.spec, 1.20, 
	1.21 sources, 1.10, 1.11
Message-ID: <200709181104.l8IB4Ul2016867@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16829

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
- New upstream release.
  - Fix to allow users disabling IM.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Sep 2007 12:35:57 -0000	1.11
+++ .cvsignore	18 Sep 2007 11:03:58 -0000	1.12
@@ -11,3 +11,4 @@
 im-chooser-0.4.1.tar.gz
 im-chooser-0.5.0.tar.gz
 im-chooser-0.5.1.tar.gz
+im-chooser-0.5.2.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- im-chooser.spec	14 Sep 2007 11:16:56 -0000	1.20
+++ im-chooser.spec	18 Sep 2007 11:03:58 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		im-chooser
-Version:	0.5.1
-Release:	2%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,10 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
+- New upstream release.
+  - Fix to allow users disabling IM.
+
 * Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
 - Add README into the package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Sep 2007 12:35:57 -0000	1.10
+++ sources	18 Sep 2007 11:03:58 -0000	1.11
@@ -1 +1 @@
-4c2b6eba1dd41ff0c5baaca5dc15f2a4  im-chooser-0.5.1.tar.gz
+84bd1b15b6c1ea4deda39cf94f3a3523  im-chooser-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 11:12:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 07:12:52 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.49,1.50
Message-ID: <200709181112.l8IBCqfO017144@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17121

Modified Files:
	xinetd.spec 
Log Message:
version++


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xinetd.spec	6 Sep 2007 09:05:59 -0000	1.49
+++ xinetd.spec	18 Sep 2007 11:12:18 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2



From fedora-extras-commits at redhat.com  Tue Sep 18 11:18:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:18:29 -0400
Subject: rpms/anthy/F-7 .cvsignore, 1.26, 1.27 anthy.spec, 1.40, 1.41 sources,
	1.27, 1.28
Message-ID: <200709181118.l8IBITOc017289@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17266

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	3 Jul 2007 12:20:08 -0000	1.26
+++ .cvsignore	18 Sep 2007 11:17:56 -0000	1.27
@@ -29,3 +29,5 @@
 anthy-8622.tar.gz
 anthy-8706.tar.gz
 anthy-9100.tar.gz
+anthy-9100b.tar.gz
+alt-cannadic-070805.tar.bz2


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/anthy.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- anthy.spec	3 Jul 2007 12:20:08 -0000	1.40
+++ anthy.spec	18 Sep 2007 11:17:56 -0000	1.41
@@ -1,9 +1,10 @@
-%define	gcanna_ver	20051002
+%define		altcannadicver	070805
 
 Name:		anthy
-Version:	9100
+Version:	9100b
 Release:	1%{?dist}
-License:	GPL
+# The entire source code is LGPLv2+ and dictionaries is GPLv2.
+License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	automake autoconf
@@ -12,6 +13,8 @@
 
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
+Source2:	http://prdownloads.sourceforge.jp/alt-cannadic/26595/alt-cannadic-%{altcannadicver}.tar.bz2
+Patch0:		anthy-enable-dict-gtankan.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -50,7 +53,9 @@
 character set on XEmacs.
 
 %prep
-%setup -q
+%setup -q -a 2
+%patch0 -p1 -b .gtankan
+cp alt-cannadic-%{altcannadicver}/* alt-cannadic/
 
 %build
 %configure --disable-static
@@ -112,6 +117,17 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
+- New upstream release.
+
+* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 9100-3
+- Rebuild
+
+* Wed Aug  8 2007 Akira TAGOH <tagoh at redhat.com> - 9100-2
+- Update alt-cannadic to 070805.
+- Use gtankan.ctd instead of tankanji.t.
+- Update License tag.
+
 * Tue Jul  3 2007 Akira TAGOH <tagoh at redhat.com> - 9100-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	3 Jul 2007 12:20:08 -0000	1.27
+++ sources	18 Sep 2007 11:17:56 -0000	1.28
@@ -1 +1,2 @@
-00c2b8d7b722650b0088944e833077ad  anthy-9100.tar.gz
+0ad3873646255a2ca1c8576350fabb27  anthy-9100b.tar.gz
+17f849584baa5ae025542035b429f1b4  alt-cannadic-070805.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 11:21:43 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:21:43 -0400
Subject: rpms/anthy/F-7 anthy-enable-dict-gtankan.patch,NONE,1.1
Message-ID: <200709181121.l8IBLhQh017366@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17357

Added Files:
	anthy-enable-dict-gtankan.patch 
Log Message:


anthy-enable-dict-gtankan.patch:

--- NEW FILE anthy-enable-dict-gtankan.patch ---
diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in
--- anthy-9100b.orig/mkworddic/dict.args.in	2007-09-16 21:38:40.000000000 +0900
+++ anthy-9100b/mkworddic/dict.args.in	2007-09-18 19:53:52.000000000 +0900
@@ -10,9 +10,9 @@
 read @top_srcdir@/alt-cannadic/gcanna.ctd
 #
 read @top_srcdir@/alt-cannadic/gcannaf.ctd
-#read @top_srcdir@/alt-cannadic/gtankan.ctd
+read @top_srcdir@/alt-cannadic/gtankan.ctd
 #
-read @top_srcdir@/mkworddic/gtankan.ctd
+#read @top_srcdir@/mkworddic/gtankan.ctd
 read @top_srcdir@/mkworddic/adjust.t
 read @top_srcdir@/mkworddic/name.t
 read @top_srcdir@/mkworddic/compound.t



From fedora-extras-commits at redhat.com  Tue Sep 18 11:26:01 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 18 Sep 2007 07:26:01 -0400
Subject: rpms/traceroute/devel .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 traceroute.spec, 1.33, 1.34
Message-ID: <200709181126.l8IBQ15L017554@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/traceroute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17510

Modified Files:
	.cvsignore sources traceroute.spec 
Log Message:
* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 3:2.0.8-1
- upgrade to new upstream traceroute-2.0.8
- fixed traceroute.8 install source path and traceroute6.8 link source
- fixed typo in Source0 URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Aug 2007 14:56:47 -0000	1.10
+++ .cvsignore	18 Sep 2007 11:25:28 -0000	1.11
@@ -1 +1 @@
-traceroute-2.0.7.tar.gz
+traceroute-2.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Aug 2007 14:56:47 -0000	1.11
+++ sources	18 Sep 2007 11:25:28 -0000	1.12
@@ -1 +1 @@
-40011b06c5b83116dcf140878def8810  traceroute-2.0.7.tar.gz
+d3dedd19c4d72d3251384ff9d53476ad  traceroute-2.0.8.tar.gz


Index: traceroute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- traceroute.spec	28 Aug 2007 12:24:35 -0000	1.33
+++ traceroute.spec	18 Sep 2007 11:25:28 -0000	1.34
@@ -1,12 +1,12 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.0.7
+Version: 2.0.8
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL:  http://traceroute.sourceforge.net
-Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tag.gz
+Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -41,8 +41,10 @@
 popd
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m644 traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8
+install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
+pushd $RPM_BUILD_ROOT%{_mandir}/man8
+ln -s traceroute.8 traceroute6.8
+popd
 
 
 %clean
@@ -57,6 +59,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 3:2.0.8-1
+- upgrade to new upstream traceroute-2.0.8
+- fixed traceroute.8 install source path and traceroute6.8 link source
+- fixed typo in Source0 URL
+
 * Tue Aug 28 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
 - Change URL and Source0 (upstream is at SourceForge now)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 11:26:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 18 Sep 2007 07:26:30 -0400
Subject: rpms/iptraf/devel iptraf.spec,1.26,1.27
Message-ID: <200709181126.l8IBQUcO017594@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iptraf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17531

Modified Files:
	iptraf.spec 
Log Message:
Remove / in the url.



Index: iptraf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- iptraf.spec	24 Aug 2007 07:59:28 -0000	1.26
+++ iptraf.spec	18 Sep 2007 11:25:58 -0000	1.27
@@ -4,7 +4,7 @@
 Release: 7%{?dist}
 Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 Source1: iptraf 
-URL: http://iptraf.seul.org/
+URL: http://iptraf.seul.org
 Patch0: iptraf-2.4.0-Makefile.patch
 Patch1: iptraf-2.7.0-install.patch
 Patch2: iptraf-2.7.0-doc.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 12:31:22 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 08:31:22 -0400
Subject: rpms/plague/devel plague.spec,1.30,1.31
Message-ID: <200709181231.l8ICVMmS024762@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24690

Modified Files:
	plague.spec 
Log Message:
* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
- Add dirs /etc/plague and /usr/share/plague to plague-common
  since "plague-builder" and "plague" use them (#233904).



Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plague.spec	17 Dec 2006 18:18:25 -0000	1.30
+++ plague.spec	18 Sep 2007 12:30:49 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -125,6 +125,8 @@
 %files common
 %defattr(-, root, root)
 %doc README ChangeLog
+%dir %{_sysconfdir}/%{name}
+%dir %{_datadir}/%{name}
 %dir /usr/lib/python?.?/site-packages/%{name}
 /usr/lib/python?.?/site-packages/%{name}/*.py*
 
@@ -150,6 +152,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
+- Add dirs /etc/plague and /usr/share/plague to plague-common
+  since "plague-builder" and "plague" use them (#233904).
+
 * Fri Dec 15 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.4.1-4
 - Small fix for a change in python 2.5's xmlrpc library.  The patch has been
   upstreamed.



From fedora-extras-commits at redhat.com  Tue Sep 18 12:37:29 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 08:37:29 -0400
Subject: rpms/pwlib/devel .cvsignore, 1.19, 1.20 pwlib.spec, 1.47,
	1.48 sources, 1.19, 1.20
Message-ID: <200709181237.l8ICbT4k024971@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24924

Modified Files:
	.cvsignore pwlib.spec sources 
Log Message:
- Update to 1.10.10
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	15 Apr 2007 20:38:04 -0000	1.19
+++ .cvsignore	18 Sep 2007 12:36:57 -0000	1.20
@@ -4,3 +4,4 @@
 pwlib-1.10.5.tar.gz
 pwlib-1.10.6.tar.gz
 pwlib-1.10.7.tar.gz
+pwlib-1.10.10.tar.gz


Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pwlib.spec	15 Apr 2007 20:38:04 -0000	1.47
+++ pwlib.spec	18 Sep 2007 12:36:57 -0000	1.48
@@ -1,6 +1,6 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.7
+Version:	1.10.10
 Release:        1%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
+- Update to 1.10.10
+
 * Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 1.10.7-1
 - Update to 1.10.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Apr 2007 20:38:04 -0000	1.19
+++ sources	18 Sep 2007 12:36:57 -0000	1.20
@@ -1 +1 @@
-29c061328e93bda77423edb8bdabbddd  pwlib-1.10.7.tar.gz
+abebf45332e70772ffa876d31975d4b9  pwlib-1.10.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 12:38:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 08:38:52 -0400
Subject: rpms/php/F-7 php-5.2.4-easter.patch, NONE,
	1.1 php-5.2.4-gnusrc.patch, 
	NONE, 1.1 php-5.2.4-norpath.patch, NONE,
	1.1 php-5.2.4-odbc.patch, NONE, 1.1 php-5.2.4-tests-dashn.patch,
	NONE, 1.1 .cvsignore, 1.30, 1.31 php.spec, 1.140, 1.141 sources,
	1.33, 1.34 php-4.3.1-odbc.patch, 1.1,
	NONE php-5.0.0-easter.patch, 1.4, NONE php-5.0.4-norpath.patch,
	1.1, NONE php-5.0.4-tests-dashn.patch, 1.6,
	NONE php-5.1.4-gnusrc.patch, 1.3, NONE
Message-ID: <200709181238.l8ICcqjw025114@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25031

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.4-easter.patch php-5.2.4-gnusrc.patch 
	php-5.2.4-norpath.patch php-5.2.4-odbc.patch 
	php-5.2.4-tests-dashn.patch 
Removed Files:
	php-4.3.1-odbc.patch php-5.0.0-easter.patch 
	php-5.0.4-norpath.patch php-5.0.4-tests-dashn.patch 
	php-5.1.4-gnusrc.patch 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
- update to 5.2.4


php-5.2.4-easter.patch:

--- NEW FILE php-5.2.4-easter.patch ---
--- php-5.2.4/main/logos.h.easter
+++ php-5.2.4/main/logos.h
@@ -491,386 +491,3 @@ static const unsigned char php_logo[] = 
 	102,  63, 251, 220, 139,  16,  65,  26,  16, 112, 
 	 21, 116, 187, 251, 221, 240, 142, 119, 188,   3, 
 	  1,   0,  59,   0 };
-
-static const unsigned char php_egg_logo[] = {
-	 71,  73,  70,  56,  57,  97, 120,   0,  67,   0, 
-	247,   0,   0,   0, 255,   0, 107, 114, 178,   0, 
-	  0,   0,  31,  31,  31, 255, 255, 255, 106, 113, 
-	176,  63,  63,  63, 127, 127, 127, 106, 112, 174, 
-	191, 191, 191, 105, 111, 171, 223, 223, 223, 239, 
-	239, 239, 144, 149, 197, 106, 111, 173, 245, 246, 
-	250, 105, 110, 170, 218, 219, 235,  47,  47,  47, 
-	162, 166, 206,  35,  36,  40, 153, 158, 202,  95, 
-	 95,  95, 175, 175, 175,  88,  93, 141, 159, 159, 
-	159, 116, 122, 182, 125, 131, 187, 143, 143, 143, 
-	 38,  38,  41, 104, 108, 167, 171, 175, 211, 105, 
-	109, 168, 102, 102, 153, 104, 108, 165,  45,  46, 
-	 58, 181, 184, 216, 111, 111, 111, 134, 140, 192, 
-	102, 108, 168,  79,  79,  79, 199, 202, 226,  40, 
-	 41,  49,  92,  98, 150,  53,  53,  63, 236, 237, 
-	245, 130, 130, 171, 122, 122, 160, 104, 107, 163, 
-	 50,  51,  67,  45,  45,  52, 207, 207, 207,  69, 
-	 72, 104,  15,  15,  15,  61,  61,  74, 227, 228, 
-	240,  59,  62,  86, 103, 106, 162, 107, 107, 139, 
-	 73,  77, 113, 102, 103, 156,  54,  56,  76,  97, 
-	103, 159, 137, 137, 182,  35,  35,  38, 190, 193, 
-	221, 145, 145, 193, 103, 105, 159,  78,  82, 122, 
-	 76,  76,  95, 147, 148, 200,  92,  92, 117, 105, 
-	105, 156, 103, 105, 160, 150, 150, 202,  64,  67, 
-	 95, 114, 114, 149, 108, 108, 159, 143, 143, 194, 
-	 84,  84, 106, 140, 140, 191, 102, 104, 157,  48, 
-	 48,  61,  27,  29,  42, 114, 114, 165,  83,  88, 
-	132, 153, 153, 204, 121, 126, 186, 127, 127, 178, 
-	208, 210, 230, 149, 149, 200, 146, 146, 197, 141, 
-	143, 197,  55,  55,  67, 144, 145, 199, 133, 133, 
-	184, 124, 124, 175, 110, 115, 171, 130, 133, 191, 
-	 88,  91, 137,  86,  92, 144, 154, 156, 172,  87, 
-	 92, 139,  85,  86, 125, 118, 123, 184, 121, 122, 
-	172, 124, 128, 187,  82,  86, 130,  39,  39,  46, 
-	 99,  99, 128,  69,  69,  85,  97, 101, 153,  75, 
-	 75, 107, 115, 121, 182, 135, 138, 194, 101, 107, 
-	165,  82,  84, 101, 102, 102, 140,  53,  57,  89, 
-	 69,  71, 101, 137, 137, 188, 109, 116, 179, 130, 
-	130, 182,  57,  57,  76,  93,  99, 155, 117, 117, 
-	168,  62,  63,  86,  84,  84, 122,  79,  79, 114, 
-	112, 117, 177,  58,  58,  71, 127, 131, 189, 106, 
-	106, 150,  76,  76, 101, 134, 135, 187,  20,  20, 
-	 31,  66,  71, 111, 125, 129, 182, 172, 173, 180, 
-	 86,  88, 131, 229, 230, 234, 108, 112, 171, 100, 
-	105, 161, 161, 165, 203,  53,  53,  70,  95,  97, 
-	146,  58,  60,  81, 217, 219, 234, 195, 196, 208, 
-	 82,  85, 125, 112, 118, 181,  82,  82, 106, 114, 
-	117, 175, 154, 157, 195, 134, 134, 179, 111, 111, 
-	162,   6,   7,  11, 110, 111, 146,  93,  93, 138, 
-	 77,  79, 116, 115, 119, 179, 103, 108, 161,  60, 
-	 64, 100,  98,  98, 145,  40,  40,  47,  51,  51, 
-	 63,  69,  69,  95,  73,  78, 122, 197, 198, 202, 
-	 54,  54,  58,  13,  14,  22, 108, 114, 174, 149, 
-	152, 184, 101, 108, 167,  88,  88, 130, 106, 108, 
-	162,  86,  91, 141,  84,  84, 116,  86,  86,  90, 
-	129, 131, 186, 132, 135, 181, 160, 163, 183, 211, 
-	212, 224,  91,  91, 123, 109, 109, 117, 104, 104, 
-	135,  86,  86, 115,  90,  92, 108,  81,  83, 122, 
-	103, 106, 130,  70,  70,  99, 121, 126, 170, 139, 
-	139, 186,  73,  74,  94, 109, 109, 148, 139, 140, 
-	189, 135, 138, 162, 176, 179, 199, 115, 115, 115, 
-	106, 106, 144,  59,  63,  98,  67,  69,  96, 241, 
-	241, 241, 102, 105, 149, 120, 120, 162,  68,  68, 
-	 90,  89,  89, 115,  51,  52,  79, 113, 113, 152, 
-	 33,  35,  55, 189, 190, 215,  79,  79, 104, 213, 
-	214, 218,  94,  95, 142, 163, 164, 176,  86,  89, 
-	133, 112, 112, 156,  80,  81, 118,  63,  65,  90, 
-	102, 103, 124, 126, 129, 157,  72,  72,  98, 150, 
-	150, 154,  72,  74, 100, 112, 112, 151, 138, 139, 
-	192, 122, 125, 180,  49,  50,  64,  78,  78, 110, 
-	119, 119, 157, 125, 126, 174,  77,  81, 119, 125, 
-	126, 180,  56,  56,  72, 118, 120, 173,  46,  49, 
-	 77,  92,  96, 132, 188, 189, 197,  65,  65,  81, 
-	165, 168, 200,  49,  51,  66, 143, 147, 194,  80, 
-	 82, 111, 192, 195, 215, 235, 235, 242, 105, 111, 
-	170,  74,  77, 107, 183, 186, 210, 109, 111, 165, 
-	117, 120, 152,  65,  66,  90, 182, 182, 186, 104, 
-	104, 137, 123, 127, 163, 170, 171, 187, 110, 113, 
-	163,  33, 249,   4,   1,   0,   0,   0,   0,  44, 
-	  0,   0,   0,   0, 120,   0,  67,   0,   0,   8, 
-	255,   0,   1,   8,  28,  72, 176, 160, 193, 131, 
-	  8,  19,  42,  92, 200, 176, 161, 195, 135,  16, 
-	 35,  74, 156,  72, 177, 162, 197, 139,  24,  51, 
-	106, 220, 200, 209, 162, 145,  43, 104, 188, 116, 
-	 28,  73, 210, 160,  23, 145,   8, 141,  24,  84, 
-	 50,  40, 128,  75,  17, 122, 228, 112,  65, 200, 
-	 69, 140, 146, 146,  56,  83, 170,   9, 144,   6, 
-	192,  11,  38,  69, 190, 209,  88,  82, 196, 134, 
-	141,   1,  44,   6,  40,  29,  64,  65,  30,  19, 
-	 29,  71, 138, 250, 137, 129, 163, 202, 157, 107, 
-	 99,  48,  96, 128, 246,  67, 200, 139,  23,  66, 
-	 62, 186, 212, 224,  36, 103, 206,  31,  58,  92, 
-	 56,  75, 214,  35, 198, 210, 183, 112, 153, 142, 
-	 88,  58, 231, 207,  11,  67, 113,  86, 172,  56, 
-	 65,  68,  91, 219, 185,  61, 226, 142, 160,  65, 
-	163, 199, 167,  81, 102,  71,   2,  69,  26, 119, 
-	169,  10,  28,  59, 180, 210, 216,  17, 137, 138, 
-	152,  60,   1, 180, 250,  72, 194,   3, 148,  75, 
-	151,   5,  16, 124, 254, 188,  98,   7, 156, 127, 
-	 24, 118, 196,  24, 209,  67, 138,  10,  32,  54, 
-	 92,   0, 224, 162,  50, 241,  68, 175,  79,  58, 
-	188, 165,  16,  99, 201, 142,  49, 145,  68, 143, 
-	254,  12,   1, 134, 112, 151,  30, 120, 136,  24, 
-	206, 252, 115,   1,  15,  10,  70,  43, 200,  17, 
-	125, 133, 190,  14,  29, 112,  84, 194,  99, 251, 
-	161, 144,  35,  50,  88, 232, 255,  30,  32, 136, 
-	 70,  21,  31, 159,  65,  68, 111,  94,  64, 196, 
-	122, 151,   8, 134, 228,  56, 222, 124, 180,   3, 
-	  8, 163, 219, 131,  24,  45,  26,   3, 133,   1, 
-	108,   0, 211,  29,  67,  58, 188, 213, 193,  17, 
-	226,  96, 246,  25,   2, 248, 213, 167,  64, 131, 
-	 38, 144,  16, 128,   7,  73,  68, 247, 203,  61, 
-	100, 212,   7, 154,   2,   5,  72, 231,  65, 135, 
-	205,  33, 176, 199,   0,  50,  44,  51, 224,  65, 
-	 46,  28,  17, 204,  82,  29,  20,   1, 134,  37, 
-	195,  21,   0,  34, 115,   5,  56,   0,  98,   5, 
-	  4,  16, 176, 205,  51, 235,  76,  33,  64,   2, 
-	 11, 112, 163, 161, 141, 252, 121,  64, 223, 112, 
-	 34, 240, 160, 128,  15,  49, 168, 224, 206,  15, 
-	 39,  10, 132, 214, 120,  20, 220,  81, 135,  17, 
-	104, 104, 200, 222, 140,   1,  68, 144, 163,   4, 
-	 40,  24,  80,   2,   7,  12,  92,  96,  71, 125, 
-	 92,   6, 160, 128,   3,  67,  14, 225, 193, 104, 
-	107,  12, 208, 129,  14,  39, 230, 166,  20,   5, 
-	 75, 180, 194,  67,  35,  90, 246, 233, 146,   3, 
-	  4, 160,  34,  64,   6,  18,  28,  48,  64,  13, 
-	  7,  28, 128, 136, 159,   8, 176, 137,  38,  12, 
-	 57, 164, 169, 192,  24,  50,  12,  96, 195,  11, 
-	 98,  92, 129, 210,  72,  66,  60, 241,  22,  14, 
-	 39,  40,  32,  66, 154, 126,  50,   7,  65,  38, 
-	  4,  36,  32, 192, 170, 172,  94,  96,  64, 134, 
-	 26, 202, 255,  72, 234, 103, 211,  57, 202, 220, 
-	 42, 216,  28, 161, 212,   8,  24,   4, 242, 197, 
-	108,  55, 105, 228,  66,  82, 187,  98, 160, 230, 
-	145, 165,  14, 135,  64, 116,  94,  30, 192,  42, 
-	171,  51, 164, 146,  44, 123,  48,  52,  88, 159, 
-	  8,  81, 160, 225, 131, 106,  20,   0,  81, 138, 
-	 61,  43,  88, 178,   5,  70,  46, 216,  57,   0, 
-	 17, 206, 185,  52,  65,   5,  13,  76, 240, 129, 
-	 75,  13, 108,  80, 170, 140,   1, 108, 240, 229, 
-	179, 171,  18,  48, 197, 180,  46, 201,  27,  64, 
-	 60,  31, 126, 166, 193,   6, 241, 194, 151, 196, 
-	126,  11, 230,  64,  68,  96,   3, 224,  64, 142, 
-	 38,  22, 233,  48,  94, 195,  39,  12,  23,  68, 
-	142,  24,  63, 144, 241,   3,  17, 100,  65, 194, 
-	186, 239,  54, 215,  64, 170, 248,  10,  32, 193, 
-	 12, 103,  38, 107, 130, 151,  26,  19, 112,  67, 
-	203,  45, 231, 248,  64,  11, 244,  68, 160, 193, 
-	103,  30,  32,  28, 128,  15, 107, 248,  81,  41, 
-	 11, 109,  12, 163,   6,  26, 181,  49,  36,  68, 
-	 17,  75,  45,  81,  49, 115,  24,  99,  60, 131, 
-	 53, 138,  36, 144, 128, 151,  77,  19, 208, 194, 
-	  4,  19, 220, 252, 153, 151,  18, 148,  92, 194, 
-	 12, 167,  36, 187,  65, 204,  78,  75, 157, 192, 
-	 62, 101, 164, 173,   8,   3,  26, 183, 240,  64, 
-	 10, 180, 164,  25,   5,  18, 122, 180, 161,  27, 
-	  5,  59,   4,  16,  70,  89,  11,  13, 255, 187, 
-	 20, 186, 245, 229,  24, 230,   0,  37,  11, 112, 
-	200,  20, 116, 224, 114,   0, 153,  24, 167, 208, 
-	 64,   0,  56, 102,  80, 248,   0,  12,  80,  18, 
-	  1,  49, 249, 188,  67,  66,  10,  17, 180, 144, 
-	227,  13,  89,  76,   0,  57,   1,  12,  36, 144, 
-	193,   1,   6, 212,  80, 248, 179,   6,  44, 128, 
-	113,  11, 143, 127,  38,   2,  22,  86, 200,  81, 
-	 15,  13,  74, 173,  17,  69,  31, 125, 143, 183, 
-	  3, 224,  34,  19, 176, 192, 234, 171, 215, 144, 
-	193,   2, 174,  63,  80, 193,   4,   4, 200, 178, 
-	186,   1,  82,  51,  48,  67, 244,  57,  74, 125, 
-	 64,   2,  86, 147,  64, 128, 179, 196, 175, 110, 
-	193,   1,  12,  48, 208, 130, 115,  81, 224,  19, 
-	199, 103,  59,  12, 160, 130,  35, 220,  37,  36, 
-	 68, 165,  20,  24, 171,  37, 243, 220, 119,  63, 
-	 57,  10,   4,   4, 113, 177,   5, 246, 219, 127, 
-	 64, 142,  11,  80,  93, 255, 188,  71,   0, 151, 
-	 64,  32,  10,  58, 251,  12,  96,  54, 161,  16, 
-	 55, 168, 111, 105,  90, 202, 130, 170,   6, 184, 
-	186,  11,  20, 227,   3,   4,  48,   0,   5, 137, 
-	231,  58,  13, 110, 176, 100,  23,  56,   0,  44, 
-	146,  48, 170, 230, 156,  64,   5,   3,   0,  68, 
-	 66, 152, 160, 148, 188, 245, 201,  94, 245, 251, 
-	224, 170,  36,  80,   2,   1, 148, 129,   0, 116, 
-	144,  33, 190, 106, 224,  58,  29, 226, 235,   0, 
-	 22,  56,   4, 178, 255, 136, 195,  11,  10, 140, 
-	 32,  33, 149, 194,  65, 169,  82, 176, 189, 146, 
-	 89,  32,  71,  28, 176,  31,  13,  19,  69, 128, 
-	 93, 248, 144,  85,   6, 200, 209, 234,  74, 144, 
-	168,  68,  89,  64,   2, 252,  43, 220,  12,   4, 
-	176,  40, 230,  32,   0,  58,  39,   8, 204,  49, 
-	 14, 210, 137,   7, 150, 170,   2,  15, 136, 161, 
-	  0,   6, 208, 180,   4, 132, 201,   2,   9, 224, 
-	 64,   6,   8, 199,  42, 227,  93,   0, 135, 221, 
-	 59,  64,   6, 164,  70, 168, 194, 145, 169, 112, 
-	 25, 168,  26, 198,  22, 144,   0,  62, 178, 202, 
-	  2,   6,  80, 133, 169, 172, 181, 130,   1,  72, 
-	161,  32,  74,  80, 131,  91,  98,   0, 154,  62, 
-	153,  32, 142,  37,  91,  64,   4, 194,  64,  53, 
-	140, 205, 131,  17,  12, 112, 164,   0, 178, 168, 
-	175, 213, 161, 192, 117, 110, 187,   1,   1,  46, 
-	 80,  50, 202, 209,  50, 148,   4, 200,  68,   5, 
-	150,  87, 129,  15,  76, 128,  21,  11, 136, 226, 
-	179,   6, 160,  42,  62,  56, 135,  67, 206, 201, 
-	193,   0, 186,  64,  16,  35, 196, 161,  10,  74, 
-	 89, 129,   3, 134,  56,  28,  38, 170,  50,  95, 
-	 65,   8, 128,   6,  76, 128, 181, 130, 137, 130, 
-	  3, 194, 100,  85,  15,  87, 103, 181,  10, 184, 
-	  4,  71,  97, 124,  22,   7,   8, 208, 181,  80, 
-	222, 160,  57, 124,  64, 193,  45, 159, 149,   1, 
-	  3, 172, 225,  79, 244,  81,  64,   8,  66, 208, 
-	255, 133,   1,  64,  73,  32,  87,   8,  64,  96, 
-	128,   0, 130,  89,  13,   7,  71,  99, 220,  33, 
-	  1,  98, 215,  28,  78,  44,  64, 149, 210,  91, 
-	157,   4,   8,  16, 178,   0,  92, 236, 154,   2, 
-	 32,  29,  57, 179, 201,  28, 100, 160,  32, 156, 
-	172, 170, 167,  29, 232,  21, 163,  38,  64, 193, 
-	  5,   3, 160, 147,  64,  90, 178, 201, 100, 121, 
-	169, 134, 248, 202, 162,   9, 234, 195, 135,  31, 
-	 61,  11, 127, 146,  43,  92,   9,  22, 250, 153, 
-	 27,  48, 160, 112,  36, 171,  37,   1, 180, 198, 
-	 31,  81, 212,  96, 158, 226, 148,   0, 172, 154, 
-	 19, 130,  45, 164, 161,  20,  69,  32, 136,  58, 
-	148, 178,   4, 246,  12, 199,  94, 236,  44,  89, 
-	 13, 120, 122, 213,   6, 244, 194,   0,  72, 237, 
-	 96,   5,   9,  48,  83, 151,   4, 149, 117, 194, 
-	 43,  92,  22, 253,  37, 176,  10, 212, 194,   2, 
-	 72,  21, 128,   5, 102,  16, 141, 250, 196, 103, 
-	  8, 129,  56, 129, 250, 248,   6,   0,  77,  40, 
-	165,  10, 195, 153,  38, 115,  48,  56, 188, 146, 
-	101,  81,  66,   7, 157, 101,   9,  60,  40,   0, 
-	252,  77, 176, 112,  12,  40, 224, 103,  64,  25, 
-	 83,  45, 150, 108, 162,  12,  29, 139, 240,  12, 
-	208, 206,  86, 149,  96, 169, 163, 241,   0,   2, 
-	 93, 162, 215,   1,  80,  97,  32,  47,  80, 138, 
-	 25,  62, 115, 159,  52, 117,  72, 150,  32, 197, 
-	 34,   1, 204,  57, 154,  13, 255, 120,  41, 174, 
-	255, 235, 172,  66,  37, 235, 146,   7, 164,  83, 
-	182,   4,  80, 235, 108, 135,  35, 203, 194, 226, 
-	139,   1, 251,  82,  22,   9, 103,  84,   0, 165, 
-	212,   1, 181,  74, 169, 134, 140, 220, 147,  31, 
-	 71, 105, 224,  94, 134, 165, 104,  53,   9, 224, 
-	141, 146,  97, 143, 120,  89, 140, 192, 104,  50, 
-	232,  53, 203,  86, 150, 182, 218, 212,  94,  59, 
-	 10, 247,  63, 118,  12, 199,   3, 243,  25,  13, 
-	  4,  66, 160,  20,  38,  64, 119,   0,  80, 248, 
-	  2,  12, 152, 171, 128, 227, 140, 236, 167, 133, 
-	123,  98,  10,  76, 240,   1,  13,  84,  64, 150, 
-	182, 224,   4, 190, 240,  23, 220,  45,  18,  64, 
-	188, 240, 106,  48, 190, 254, 104, 220, 103, 253, 
-	239,   3,  38, 104,  64,   3,  60, 247,   0,  31, 
-	225, 139, 114, 148, 200,  15, 117, 237,  51, 132, 
-	 38, 116, 129,   5,   4,  73, 237,   0, 172,  32, 
-	  6, 249,  38,  48,   0, 218, 203, 169, 119, 101, 
-	214,  52,  70, 232, 118,  85, 137, 148, 240, 140, 
-	 57,  26, 128, 145,   1, 117, 150, 144, 205, 145, 
-	231, 114, 196,   0, 198, 222, 148,   1, 161, 160, 
-	149, 181,  98, 244,   5,  22, 216, 128,  32, 186, 
-	 90, 113,  64, 213, 100,  28, 230, 104,  79, 142, 
-	143,  44,  93,   6,  46, 144,  72,   6, 220, 120, 
-	 85, 216, 211,  49, 190, 114,  84,  81,  31,  87, 
-	182, 137, 184,   4,  18,   7,  92, 247,  91, 122, 
-	166,   0, 255,  52,  68, 178, 171,  47,   6, 240, 
-	  4,  40,  15, 192,  13,  86,  80,  66,  24,  96, 
-	240, 166, 230, 104, 175, 205, 196, 147, 128,   0, 
-	241, 181, 211,  28,  97, 116, 149,  57,  42, 107, 
-	  0, 152,  87, 178, 117, 146, 183, 150,  95,  22, 
-	174, 232,  72, 234,  32,  30, 176,  97,   0,  71, 
-	 32,  72,  27, 148, 226,   2,  43, 204, 194, 160, 
-	 48, 126, 244,  21,  89,  41,  56, 246,  90, 109, 
-	 52, 102, 126, 150, 235, 196, 172,  67, 215,  17, 
-	245,  81,  33, 128, 131,  82,  84,  42,  16,  21, 
-	243,  99, 202,  26, 194, 145, 145, 101,  72, 185, 
-	252, 229,   8, 203,  63,  34,   0,  98,  63,  35, 
-	102,  58, 158, 213, 135,  59, 125, 179, 150,  20, 
-	192, 131,  16, 128,  33,  23,  36,  42, 200,  15, 
-	148,   2,  60,  13, 141, 108, 215,   3,  52, 192, 
-	245,   8, 240, 128, 172, 253, 250, 199, 108,  53, 
-	235, 153, 129,  77, 193, 137,  62,  32, 220, 102, 
-	228,   1,  18,  78,  90,  41,  55,  96,  82,  41, 
-	 52, 232, 100, 125, 236, 133, 109,  11, 112, 160, 
-	139, 248,  30, 228, 235,  10, 108,  86,   2,   0, 
-	 58, 139, 239,  28, 141,   9,  26,  60,   0,  49, 
-	133,  25,   5,  37,  67, 193,   1,  34, 221, 199, 
-	255, 221, 224, 213,  14, 130, 130,  21, 142,  50, 
-	  0, 217,  16,  36,  20,  74, 193,   1,   2, 168, 
-	169, 174, 172, 170,  83, 145,  85, 123, 155, 162, 
-	251, 205, 129, 107, 174, 179, 162,  17, 255,   6, 
-	185, 199,  89,  85, 104, 225, 113,  96, 112, 171, 
-	 50, 128,   5,  50,  16,  89, 101, 251,   9,   2, 
-	 77, 120, 129, 110,  80,  92, 144,  60,  40, 133, 
-	 20, 160, 118, 137, 151,  74, 150, 163, 126, 132, 
-	 97, 166,  19, 120,  68,  34, 208,  61, 156, 166, 
-	205, 224, 229,   6, 104,  29, 111,  71,  67, 130, 
-	  8, 164, 128,   4,  13, 208, 192, 134,   1, 252, 
-	172, 200, 222, 192,  31, 212,  80,  57, 183, 179, 
-	 86,  42,  16, 132, 160,   9,  72,  43, 130,  16, 
-	 12, 194,   5,  72,  68, 179,  79,  17, 120, 236, 
-	170, 182, 202,  85,   6,   5, 221,  37,   4, 214, 
-	192,   7, 200,  38, 236, 100,  61,  64, 238, 249, 
-	226, 170, 134, 179,  16, 129,  32, 124, 128,   4, 
-	 31, 168,   0, 196,  53,   4, 131,  16, 108,   2, 
-	 28,  74, 249, 167,  65, 152, 145, 241, 252,  28, 
-	105,  18, 128, 103, 165,   9,  10, 160,  30, 126, 
-	225, 253,   6,  17,  32,  48, 122, 251,  52,  50, 
-	152,  62,  43,  71, 139, 247, 188,  75, 134, 224, 
-	108,  38,  36, 229, 201,   9, 241, 212, 185,   2, 
-	 80,  35,  46,  41,   0,   6, 152, 175, 108,  11, 
-	 64, 208, 103, 213, 251,  62,   0, 214,  36, 122, 
-	 22, 126, 207,  28,  71, 196, 130,  88,  44,  88, 
-	123,  66,  92,  80, 169,   1, 220,  97,  14, 252, 
-	201,   1, 126, 254,  94,  89, 105, 216, 138, 248, 
-	252, 178, 151, 140,  79, 111, 115, 236, 175,  96, 
-	 46,  74, 177, 129, 255, 242,  21, 242, 131, 241, 
-	196,  96,   7,  39,  40,   0,  12, 246, 171,  77, 
-	 32, 163,  85, 116,  67, 194, 126, 125, 152, 136, 
-	237, 140,  14, 219, 247,  39, 160,   1,   5, 254, 
-	 35, 167,  54,  60, 228,  12, 252, 199,  20, 158, 
-	176,  28,  17, 102, 122,  49,  71,   0,  76, 247, 
-	 39, 215,  39, 127, 163,  17,   1,  92, 119,  83, 
-	  4,   0, 127, 190, 167, 127,  75, 193,   2,  76, 
-	 32, 121,  12, 225,   5,  59,   3, 126,  74, 161, 
-	  2,  61,  96,  44,  21, 144,  74, 171,  50,   0, 
-	112,  21,  89,  35,   7,  31,  16, 192,  37, 148, 
-	 38, 127, 204, 179,   0,  23, 176,   0, 211, 115, 
-	 58, 216, 147, 128, 125, 178,   2,  40, 180,  20, 
-	 50,  64, 107,  16, 161,   6,  10, 240,   6, 128, 
-	 32,   5, 112, 161,   2,  15,  48,   3, 139,  51, 
-	  3, 220,  22,   1, 133,  23,  35, 157, 231,  28, 
-	113,  22,  34, 170, 215,  46, 136,  87,   1, 143, 
-	192,  57,  17,  32, 129, 201,  98, 131,  75,   1, 
-	  4, 133, 208,   9,  22,  65,   5,  72, 128,   5, 
-	 90, 240,   2, 196, 162,  20, 198, 160,  12,   4, 
-	 16,  58,  52, 232,   1, 189, 231,  18, 107, 162, 
-	 33, 141, 130, 125,  10, 240,  30, 158, 151, 127, 
-	 55,   8,   4, 166,  96,  14,  35, 225,   2, 151, 
-	 64,  10, 111,  49,  24,  85,  96,   6,  24, 176, 
-	  2, 180,  82, 101,  74, 230, 134, 200, 244, 123, 
-	  8,  32,   2,  11,  56,  45,  62,   0, 126,  64, 
-	255,   0,   8,  96, 160,   5,  56, 145,   6, 127, 
-	 80,   8,  19,   3,  23,  49, 240,   9, 139, 160, 
-	 21, 198, 114,  70, 139,   8,  26,  75, 104,  87, 
-	 28, 215,  30, 107,  56,  47,  13, 178,   2, 252, 
-	183,   7, 132,  48,  46, 182, 225,   2,  20, 215, 
-	 24, 187, 225,   7, 130, 216,  28, 188, 167,  37, 
-	111, 168,  33,  32, 144,   4, 159, 168,  37,  32, 
-	192,   3,  67, 112,   2,  56, 192, 127, 205,   0, 
-	  5,  81,   2,   0, 104,  81,   4,  93,  32,   5, 
-	 50, 176,   7, 240,   0, 139,  31,  40,  29,  57, 
-	176, 139, 180, 215, 134,  14,  50,   4,   4,  56, 
-	 45,  10, 192, 122, 174,   0,   9, 252, 151,  14, 
-	194,  80, 140,   5, 177,   5,  84, 208,   7,  80, 
-	 32,   7,   1, 240,   6, 103, 144,  13,  56, 192, 
-	129,   3,  48,   2,  68,  48,   7, 124, 166,  37, 
-	 16, 240,  98, 249, 145,   3,  81, 112, 125,  43, 
-	 48,   6,  39, 128,  30,  39,  96,   6, 128,  40, 
-	 63,   5, 144,   3, 163,   0,   7, 151, 166,  20, 
-	 82,  64,   8, 146,   8, 142,   9, 129,   5,  33, 
-	128,   4, 232,  64,  90,  68, 192, 129,  64,  32, 
-	  9,  26, 114, 123,  28,  39,   2,  33, 144,   4, 
-	 46,  65,   4,  85,  16, 140,  76, 225,  22, 176, 
-	 40,   3,  64, 240,  22, 130, 112,   9, 124, 165, 
-	144,   9, 193, 138, 225, 160,  51, 139,  80, 144, 
-	187, 178,   4, 242, 227,   3,   8,  80,  45, 204, 
-	 33,  63,  16, 208, 108, 103, 190,  48,  14,  20, 
-	160,   2,  32,   9, 139,  62, 249,   4,  24, 136, 
-	146,  14,  97,   8, 129,   0,   1,  67, 192,   3, 
-	  5, 128,  59,  65, 200,  20,  75, 176,   4,  52, 
-	192, 142, 112,   1,   4, 205,  23, 132,  43,  80, 
-	  9, 158,  16,   2, 124, 114, 142, 103, 240,   7, 
-	221, 160,   3,  58, 192,   4,  47,  32, 148,  21, 
-	225,   4,  72, 128,   4, 152, 224,  18,  62,  32, 
-	  9,   1, 232, 147,  62, 217,   1,  70,  49,  13, 
-	186,  80,  14, 137, 160,   0,  73, 112, 118,  95, 
-	160,   4, 152, 144,   3,  13, 137,   5,  98, 201, 
-	 17,  70,   0,  10,  55,  25,   2,   8, 224,   3, 
-	231,  32,   5,  82, 208,   5,  50, 208,   1, 196, 
-	  2,   4, 130,  96,   3,  71, 224,   6, 183,  80, 
-	  7,  47,  96, 113,   7,   1,   6,  84,   0, 134, 
-	  2, 225,   4, 125, 144,   6,   9, 217, 151,  27, 
-	225,   4,  77, 208,   4, 119, 249,  10,  13, 169, 
-	  7,   4, 129,   5,  84, 208,  62, 158, 185, 154, 
-	  8, 177,   5,  80, 208, 153, 172,  25, 155, 178, 
-	 57, 155, 180,  41, 148,   1,   1,   0,  59,   0 };
--- php-5.2.4/main/php_logos.c.easter
+++ php-5.2.4/main/php_logos.c
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
 		return FAILURE;
 
 	php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
-	php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
 	php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
 
 	return SUCCESS;
--- php-5.2.4/ext/standard/info.c.easter
+++ php-5.2.4/ext/standard/info.c
@@ -1058,21 +1058,7 @@ PHP_FUNCTION(phpcredits)
  */
 PHPAPI char *php_logo_guid(void)
 {
-	char *logo_guid;
-
-	time_t the_time;
-	struct tm *ta, tmbuf;
-
-	the_time = time(NULL);
-	ta = php_localtime_r(&the_time, &tmbuf);
-
-	if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
-		logo_guid = PHP_EGG_LOGO_GUID;
-	} else {
-		logo_guid = PHP_LOGO_GUID;
-	}
-
-	return estrdup(logo_guid);
+	return estrdup(PHP_LOGO_GUID);
 
 }
 /* }}} */
@@ -1103,18 +1089,6 @@ PHP_FUNCTION(php_real_logo_guid)
 }
 /* }}} */
 
-/* {{{ proto string php_egg_logo_guid(void)
-   Return the special ID used to request the PHP logo in phpinfo screens*/
-PHP_FUNCTION(php_egg_logo_guid)
-{
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
-	}
-
-	RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
-}
-/* }}} */
-
 /* {{{ proto string zend_logo_guid(void)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
--- php-5.2.4/ext/standard/info.h.easter
+++ php-5.2.4/ext/standard/info.h
@@ -51,7 +51,6 @@
 #endif /* HAVE_CREDITS_DEFS */
 
 #define PHP_LOGO_GUID		  "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
-#define PHP_EGG_LOGO_GUID	"PHPE9568F36-D428-11d2-A769-00AA001ACF42"
 #define ZEND_LOGO_GUID		"PHPE9568F35-D428-11d2-A769-00AA001ACF42"
 #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
 
@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
 PHP_FUNCTION(php_logo_guid);
 PHP_FUNCTION(php_real_logo_guid);
 PHP_FUNCTION(zend_logo_guid);
-PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
--- php-5.2.4/ext/standard/basic_functions.c.easter
+++ php-5.2.4/ext/standard/basic_functions.c
@@ -1753,10 +1753,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_real_log
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
-ZEND_END_ARG_INFO()
-
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
@@ -3135,7 +3131,6 @@ zend_function_entry basic_functions[] = 
 	PHP_FE(phpcredits,														arginfo_phpcredits)
 	PHP_FE(php_logo_guid,													arginfo_php_logo_guid)
 	PHP_FE(php_real_logo_guid,												arginfo_php_real_logo_guid)
-	PHP_FE(php_egg_logo_guid,												arginfo_php_egg_logo_guid)
 	PHP_FE(zend_logo_guid,													arginfo_zend_logo_guid)
 	PHP_FE(php_sapi_name,													arginfo_php_sapi_name)
 	PHP_FE(php_uname,														arginfo_php_uname)

php-5.2.4-gnusrc.patch:

--- NEW FILE php-5.2.4-gnusrc.patch ---
--- php-5.2.4/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.4/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
--- php-5.2.4/main/streams/streams.c.gnusrc
+++ php-5.2.4/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/cast.c.gnusrc
+++ php-5.2.4/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/memory.c.gnusrc
+++ php-5.2.4/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.4/main/php.h.gnusrc
+++ php-5.2.4/main/php.h
@@ -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"
--- php-5.2.4/ext/standard/file.c.gnusrc
+++ php-5.2.4/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- php-5.2.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- php-5.2.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.4 2007/05/08 12:08:17 dmitry Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.h"
--- php-5.2.4/ext/interbase/interbase.c.gnusrc
+++ php-5.2.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- php-5.2.4/configure.in.gnusrc
+++ php-5.2.4/configure.in
@@ -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 -------------------------------------------------------------------------
 

php-5.2.4-norpath.patch:

--- NEW FILE php-5.2.4-norpath.patch ---
--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/acinclude.m4
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
 dnl internal, don't use
 AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
   PHP_RUN_ONCE(LIBPATH, $1, [
+    test "x$PHP_RPATH" != "xno" &&
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
     LDFLAGS="$LDFLAGS -L$1"
     PHP_RPATHS="$PHP_RPATHS $1"
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
     ],[
       if test "$ext_shared" = "yes"; then
         $2="-L$ai_p [$]$2"
+        test "x$PHP_RPATH" != "xno" && \
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
       else
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])

php-5.2.4-odbc.patch:

--- NEW FILE php-5.2.4-odbc.patch ---
--- php-5.2.4/ext/odbc/config.m4.odbc
+++ php-5.2.4/ext/odbc/config.m4
@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,,
     PHP_ODBC_CHECK_HEADER(sqlext.h)
     AC_DEFINE(HAVE_UNIXODBC,1,[ ])
     AC_MSG_RESULT([$ext_output])
+    ODBC_SHARED_LIBADD="-lodbc -lodbcpsql"
+    PHP_SUBST(ODBC_SHARED_LIBADD)
   fi
 fi
 

php-5.2.4-tests-dashn.patch:

--- NEW FILE php-5.2.4-tests-dashn.patch ---
--- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
 $out = array();
 $status = -1;
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
 } else {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
 }
 print_r($out);
 ?>
--- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
 	die("no php executable defined");
 } 
 $proc = proc_open(
-	$php,
+	$php . " -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
 	$pipes
 );
--- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($php . ' -r \'' 
+	exec($php . ' -n -r \'' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
 	     . '  print "\n";'
 	     . '}\'', $out, $status);
 } else {
-	exec($php . ' -r "' 
+	exec($php . ' -n -r "' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
--- php-5.2.4/Makefile.global.tests-dashn
+++ php-5.2.4/Makefile.global
@@ -63,7 +63,7 @@ install-headers:
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	8 May 2007 12:06:37 -0000	1.30
+++ .cvsignore	18 Sep 2007 12:38:19 -0000	1.31
@@ -5,5 +5,5 @@
 XML_RPC-1.4.4.tgz
 XML_Parser-1.2.7.tgz
 Mail-1.1.9.tgz
-php-5.2.2
-php-5.2.2.tar.gz
+php-5.2.4
+php-5.2.4.tar.gz


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- php.spec	10 Jul 2007 16:31:27 -0000	1.140
+++ php.spec	18 Sep 2007 12:38:19 -0000	1.141
@@ -5,7 +5,7 @@
 
 Summary: The PHP HTML-embedded scripting language
 Name: php
-Version: 5.2.3
+Version: 5.2.4
 Release: 1%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
@@ -16,23 +16,23 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.1.4-gnusrc.patch
+Patch1: php-5.2.4-gnusrc.patch
 Patch2: php-4.3.3-install.patch
-Patch3: php-5.0.4-norpath.patch
+Patch3: php-5.2.4-norpath.patch
 Patch5: php-5.0.2-phpize64.patch
 Patch8: php-5.2.0-includedir.patch
 
 # Fixes for extension modules
-Patch21: php-4.3.1-odbc.patch
+Patch21: php-5.2.4-odbc.patch
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.2.2-pdosym.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.0.0-easter.patch
+Patch31: php-5.2.4-easter.patch
 
 # Fixes for tests
-Patch50: php-5.0.4-tests-dashn.patch
+Patch50: php-5.2.4-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -678,6 +678,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
+- update to 5.2.4
+
 * Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7
 - obsolete php-dbase
 - add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	10 Jul 2007 16:31:27 -0000	1.33
+++ sources	18 Sep 2007 12:38:19 -0000	1.34
@@ -1 +1 @@
-df79b04d63fc4c1ccb6d8ea58a9cf3ac  php-5.2.3.tar.gz
+0826e231c3148b29fd039d7a8c893ad3  php-5.2.4.tar.gz


--- php-4.3.1-odbc.patch DELETED ---


--- php-5.0.0-easter.patch DELETED ---


--- php-5.0.4-norpath.patch DELETED ---


--- php-5.0.4-tests-dashn.patch DELETED ---


--- php-5.1.4-gnusrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:15 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 08:39:15 -0400
Subject: rpms/php/F-7 php.spec,1.141,1.142
Message-ID: <200709181239.l8ICdFLI025154@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25089

Modified Files:
	php.spec 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4-1.fc7
- update to 5.2.4



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- php.spec	18 Sep 2007 12:38:19 -0000	1.141
+++ php.spec	18 Sep 2007 12:38:43 -0000	1.142
@@ -678,7 +678,7 @@
 %files mssql -f files.mssql
 
 %changelog
-* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4-1.fc7
 - update to 5.2.4
 
 * Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:37 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Tue, 18 Sep 2007 08:39:37 -0400
Subject: rpms/ocaml-pcre/devel .cvsignore, 1.2, 1.3 ocaml-pcre.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709181239.l8ICdbRh025216@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25120/devel

Modified Files:
	.cvsignore ocaml-pcre.spec sources 
Log Message:
* Tue Sep 18 2007 Richard W.M. Jones <rjones at redhat.com> - 5.12.2-1
- New upstream version 5.12.2.
- Clarified license is LGPLv2.
- Strip .so file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Aug 2007 17:40:11 -0000	1.2
+++ .cvsignore	18 Sep 2007 12:39:04 -0000	1.3
@@ -1 +1 @@
-pcre-ocaml-5.11.4.tar.gz
+pcre-ocaml-5.12.2.tar.gz


Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-pcre.spec	6 Sep 2007 15:33:11 -0000	1.4
+++ ocaml-pcre.spec	18 Sep 2007 12:39:04 -0000	1.5
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-pcre
-Version:        5.11.4
-Release:        9%{?dist}
+Version:        5.12.2
+Release:        1%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://www.ocaml.info/home/ocaml_sources.html
-Source0:        http://www.ocaml.info/ocaml_sources/pcre-ocaml-5.11.4.tar.gz
+Source0:        http://www.ocaml.info/ocaml_sources/pcre-ocaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
@@ -46,6 +46,7 @@
 %else
 make -C lib byte-code-library
 %endif
+strip lib/dll*.so
 
 
 %install
@@ -88,6 +89,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Richard W.M. Jones <rjones at redhat.com> - 5.12.2-1
+- New upstream version 5.12.2.
+- Clarified license is LGPLv2.
+- Strip .so file.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
 - Force rebuild because of updated requires/provides scripts in OCaml.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Aug 2007 17:40:11 -0000	1.2
+++ sources	18 Sep 2007 12:39:04 -0000	1.3
@@ -1 +1 @@
-6d5b1f4073b8a8b08cb323112df542d2  pcre-ocaml-5.11.4.tar.gz
+18a257c0b4ec00510f93b6bf4951d545  pcre-ocaml-5.12.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:46 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 18 Sep 2007 08:39:46 -0400
Subject: rpms/psutils/devel psutils.spec,1.16,1.17
Message-ID: <200709181239.l8ICdkCE025260@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/psutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148

Modified Files:
	psutils.spec 
Log Message:
* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.17-27
- fixed Source url pointing to non-existing site



Index: psutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- psutils.spec	12 Jul 2006 07:53:57 -0000	1.16
+++ psutils.spec	18 Sep 2007 12:39:14 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 26.1
+Release: 27%{dist}
 License: distributable
 Group: Applications/Publishing
-Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz
+Source: psutils-p17.tar.gz
 Patch0: psutils-p17-Makefile.patch
 Patch1: psutils-p17-misc.patch
 Patch2: psutils-p17-paper.patch
@@ -48,6 +48,9 @@
 /usr/lib/psutils
 
 %changelog
+* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.17-27
+- fixed Source url pointing to non-existing site
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.17-26.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 12:49:55 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 08:49:55 -0400
Subject: rpms/opal/devel .cvsignore, 1.9, 1.10 opal.spec, 1.20, 1.21 sources,
	1.10, 1.11 ekiga-429076-42.patch, 1.1,
	NONE ekiga-429076-50.patch, 1.1, NONE
Message-ID: <200709181249.l8ICntdA025712@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25680

Modified Files:
	.cvsignore opal.spec sources 
Removed Files:
	ekiga-429076-42.patch ekiga-429076-50.patch 
Log Message:
- upstream release of 2.2.10
- includes the 2 cisco patches
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Apr 2007 20:41:57 -0000	1.9
+++ .cvsignore	18 Sep 2007 12:49:23 -0000	1.10
@@ -4,3 +4,4 @@
 opal-2.2.6.tar.gz
 opal-2.2.7.tar.gz
 opal-2.2.8.tar.gz
+opal-2.2.10.tar.gz


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- opal.spec	22 Aug 2007 10:00:15 -0000	1.20
+++ opal.spec	18 Sep 2007 12:49:23 -0000	1.21
@@ -1,22 +1,18 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.8
-Release: 5%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.7
-BuildRequires: pwlib-devel >= 1.10.7
+Requires: pwlib >= 1.10.10
+BuildRequires: pwlib-devel >= 1.10.10
 BuildRequires: openldap-devel
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
 
-# workaround problems with CISCO server
-Patch0: ekiga-429076-42.patch
-Patch1: ekiga-429076-50.patch
-
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
 teleconferencing protocol, and successor of the openh323 library.
@@ -25,15 +21,13 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.7
+Requires: pwlib-devel >= 1.10.10
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p0
 
 %build
 %configure --enable-localspeex
@@ -65,6 +59,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.10-1
+- upstream release of 2.2.10
+- includes the 2 cisco patches
+
 * Wed Aug 22 2007 Daniel Veillard <veillard at redhat.com> - 2.2.8-5.fc8
 - added 2 patches needed when using a CISCO server
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Apr 2007 20:41:57 -0000	1.10
+++ sources	18 Sep 2007 12:49:23 -0000	1.11
@@ -1 +1 @@
-700b0c3a7606afc0dc6c9d3c12fcb23b  opal-2.2.8.tar.gz
+ef8b858c666afc375830f6cd216a0601  opal-2.2.10.tar.gz


--- ekiga-429076-42.patch DELETED ---


--- ekiga-429076-50.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:01 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:01 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq16j016870@app3.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the watchbugzilla acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:01 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:01 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq2q0016880@app3.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the watchcommits acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:05 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:05 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq71Z016654@app4.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 13:07:30 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Tue, 18 Sep 2007 09:07:30 -0400
Subject: rpms/bind/F-7 bind.spec,1.192,1.193
Message-ID: <200709181307.l8ID7UG3032207@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32175

Modified Files:
	bind.spec 
Log Message:
- moved caching-nameserver chroot files to bind-chroot (#287321)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- bind.spec	6 Sep 2007 12:04:26 -0000	1.192
+++ bind.spec	18 Sep 2007 13:06:58 -0000	1.193
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.3.%{RELEASEVER}%{?dist}
+Release: 	0.3.1.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -706,19 +706,13 @@
 %files -n caching-nameserver
 %defattr(0640,root,named,0750)
 %config %verify(not link) /etc/named.caching-nameserver.conf
-%ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
 %config %verify(not link) /etc/named.rfc1912.zones
-%ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
 %config %verify(not link) /var/named/named.ca
-%ghost  %config %{chroot_prefix}/var/named/named.ca
 %config %verify(not link) /var/named/named.localhost
-%ghost  %config %{chroot_prefix}/var/named/named.localhost
 %config %verify(not link) /var/named/named.loopback
-%ghost  %config %{chroot_prefix}/var/named/named.loopback
 %config %verify(not link) /var/named/named.empty
-%ghost  %config %{chroot_prefix}/var/named/named.empty
 %defattr(0644,root,root,0755)
 %doc Copyright
 %doc rfc1912.txt
@@ -734,6 +728,12 @@
 %ghost %config(noreplace) %prefix/etc/named.conf
 %ghost %config(noreplace) %prefix/etc/named.caching-nameserver.conf
 %ghost %config(noreplace) %prefix/etc/rndc.key
+%ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
+%ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
+%ghost %config %{chroot_prefix}/var/named/named.ca
+%ghost %config %{chroot_prefix}/var/named/named.localhost
+%ghost %config %{chroot_prefix}/var/named/named.loopback
+%ghost %config %{chroot_prefix}/var/named/named.empty
 %defattr(0660,named,named,0770)
 %dir %prefix/var/named/slaves
 %dir %prefix/var/named/data
@@ -783,6 +783,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.1.b1
+- moved caching-nameserver chroot files to bind-chroot (#287321)
+
 * Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
 - patches bind-9.4-2119_revert.patch and
   libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by



From fedora-extras-commits at redhat.com  Tue Sep 18 13:10:06 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 09:10:06 -0400
Subject: devel/e2fsprogs blkid_types-wrapper.h, 1.1, 1.2 e2fsprogs.spec, 1.79,
	1.80 ext2_types-wrapper.h, 1.1, 1.2
Message-ID: <200709181310.l8IDA6LO032275@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/devel/e2fsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245

Modified Files:
	blkid_types-wrapper.h e2fsprogs.spec ext2_types-wrapper.h 
Log Message:

* Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
- Add alpha to the header wrappers  



Index: blkid_types-wrapper.h
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/blkid_types-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blkid_types-wrapper.h	7 Sep 2007 20:20:43 -0000	1.1
+++ blkid_types-wrapper.h	18 Sep 2007 13:09:34 -0000	1.2
@@ -17,6 +17,8 @@
 #include "blkid_types-s390.h"
 #elif defined(__x86_64__)
 #include "blkid_types-x86_64.h"
+#elif defined(__alpha__)
+#include "blkid_types-alpha.h"
 #else
 #error "This e2fsprogs-devel package does not work your architecture?"
 #endif


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/e2fsprogs.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- e2fsprogs.spec	7 Sep 2007 20:20:43 -0000	1.79
+++ e2fsprogs.spec	18 Sep 2007 13:09:34 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -260,6 +260,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
+- Add alpha to the header wrappers 
+
 * Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
 - wrap a couple headers to fix multilib issues (#270441)
 


Index: ext2_types-wrapper.h
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/ext2_types-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ext2_types-wrapper.h	7 Sep 2007 20:20:43 -0000	1.1
+++ ext2_types-wrapper.h	18 Sep 2007 13:09:34 -0000	1.2
@@ -17,6 +17,8 @@
 #include "ext2_types-s390.h"
 #elif defined(__x86_64__)
 #include "ext2_types-x86_64.h"
+#elif defined(__alpha__)
+#include "ext2_types-alpha.h"
 #else
 #error "This e2fsprogs-devel package does not work your architecture?"
 #endif



From fedora-extras-commits at redhat.com  Tue Sep 18 13:16:40 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 18 Sep 2007 09:16:40 -0400
Subject: devel/automake17 automake17.spec,1.13,1.14
Message-ID: <200709181316.l8IDGeMk032452@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32428

Modified Files:
	automake17.spec 
Log Message:
- fix obsoletes
- mv check into %%check




Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- automake17.spec	17 Sep 2007 12:03:45 -0000	1.13
+++ automake17.spec	18 Sep 2007 13:16:08 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    9
+Release:    10
 License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -13,8 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.8
-Obsoletes:  automake = 1.7.8
+Conflicts:  automake = 1.7.9
+Obsoletes:  automake = 1.7.9
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':
@@ -65,9 +65,10 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
+%check
 # KH: FIXME  This needs to be looked at, exdir2 gettext gettext2 subcond fail
 # gettext probably because the gettext.m4 isn't compatible with automake <1.9
-##if ! %{_without_check}
+#if ! %{_without_check}
 # make check  # VERBOSE=x
 #endif
 
@@ -94,6 +95,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-10
+- fix obsoletes
+- mv check into %%check
+
 * Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-9
 - fix licenses
 - add README AUTHORS THANKS  to %%doc



From fedora-extras-commits at redhat.com  Tue Sep 18 13:34:47 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 09:34:47 -0400
Subject: rpms/httpd/F-7 httpd-2.2.4-oldflush.patch, NONE,
	1.1 httpd-2.2.6-ssllibver.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 httpd.spec, 1.109, 1.110 sources, 1.15,
	1.16 httpd-2.2.3-CVE-2006-5752.patch, 1.1,
	NONE httpd-2.2.3-CVE-2007-1863.patch, 1.1,
	NONE httpd-2.2.3-CVE-2007-3304.patch, 1.1,
	NONE httpd-2.2.4-CVE-2007-1862.patch, 1.1, NONE
Message-ID: <200709181334.l8IDYl2U001139@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792

Modified Files:
	.cvsignore httpd.spec sources 
Added Files:
	httpd-2.2.4-oldflush.patch httpd-2.2.6-ssllibver.patch 
Removed Files:
	httpd-2.2.3-CVE-2006-5752.patch 
	httpd-2.2.3-CVE-2007-1863.patch 
	httpd-2.2.3-CVE-2007-3304.patch 
	httpd-2.2.4-CVE-2007-1862.patch 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 2.2.6-1.fc7
- update to 2.2.6
- require /etc/mime.types (#249223)


httpd-2.2.4-oldflush.patch:

--- NEW FILE httpd-2.2.4-oldflush.patch ---

http://issues.apache.org/bugzilla/show_bug.cgi?id=36780

--- httpd-2.2.4/server/util_filter.c.oldflush
+++ httpd-2.2.4/server/util_filter.c
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
                                                 void *ctx)
 {
     ap_filter_t *f = ctx;
+    apr_status_t rv;
 
-    return ap_pass_brigade(f, bb);
+    rv = ap_pass_brigade(f, bb);
+
+    /* apr_brigade_write* require that the flush function ensures that
+     * the brigade is empty upon return; otherwise the brigade may be
+     * left with a transient bucket whose contents have fallen out of
+     * scope.  Call cleanup here unconditionally to avoid the issue in
+     * all cases. */
+    apr_brigade_cleanup(bb);
+
+    return rv;
 }
 
 AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)

httpd-2.2.6-ssllibver.patch:

--- NEW FILE httpd-2.2.6-ssllibver.patch ---
--- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
+++ httpd-2.2.6/modules/ssl/mod_ssl.c
@@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
     ap_hook_insert_filter (ssl_hook_Insert_Filter, NULL,NULL, APR_HOOK_MIDDLE);
 /*    ap_hook_handler       (ssl_hook_Upgrade,       NULL,NULL, APR_HOOK_MIDDLE); */
 
-    ssl_var_register();
+    ssl_var_register(p);
 
     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
--- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
     return sslconn && sslconn->ssl;
 }
 
-void ssl_var_register(void)
+static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
+static char var_library_interface[] = SSL_LIBRARY_TEXT;
+static char *var_library = NULL;
+
+void ssl_var_register(apr_pool_t *p)
 {
+    char *cp, *cp2;
+
     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
     APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
-    return;
+
+    /* Perform once-per-process library version determination: */
+    var_library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
+    
+    if ((cp = strchr(var_library, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+                *cp2 = NUL;
+    }
+
+    if ((cp = strchr(var_library_interface, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+            *cp2 = NUL;
+    }
 }
 
 /* This function must remain safe to use for a non-SSL connection. */
@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
 
 static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
 {
-    static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
-    static char library_interface[] = SSL_LIBRARY_TEXT;
-    static char *library = NULL;
-    char *result;
-  
-    if (!library) {
-        char *cp, *cp2;
-        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-        if ((cp = strchr(library, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-        if ((cp = strchr(library_interface, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-    }
-
     if (strEQ(var, "INTERFACE")) {
-        result = apr_pstrdup(p, interface);
+        return apr_pstrdup(p, var_interface);
     }
     else if (strEQ(var, "LIBRARY_INTERFACE")) {
-        result = apr_pstrdup(p, library_interface);
+        return apr_pstrdup(p, var_library_interface);
     }
     else if (strEQ(var, "LIBRARY")) {
-        result = apr_pstrdup(p, library);
-    }
-    else {
-        result = NULL;
+        return apr_pstrdup(p, var_library);
     }
-    return result;
+
+    return NULL;
 }
   
 
--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_private.h
@@ -648,7 +648,7 @@ void         ssl_die(void);
 void         ssl_log_ssl_error(const char *, int, int, server_rec *);
 
 /**  Variables  */
-void         ssl_var_register(void);
+void         ssl_var_register(apr_pool_t *p);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Jun 2007 13:48:30 -0000	1.19
+++ .cvsignore	18 Sep 2007 13:34:14 -0000	1.20
@@ -1,2 +1,4 @@
 httpd-2.2.4.tar.gz
 httpd-2.2.4
+httpd-2.2.6
+clog


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/httpd.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- httpd.spec	26 Jun 2007 13:48:30 -0000	1.109
+++ httpd.spec	18 Sep 2007 13:34:14 -0000	1.110
@@ -5,8 +5,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.4
-Release: 4.1%{?dist}
+Version: 2.2.6
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -36,18 +36,15 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-# Security fixes
-Patch70: httpd-2.2.3-CVE-2006-5752.patch
-Patch71: httpd-2.2.3-CVE-2007-1863.patch
-Patch72: httpd-2.2.3-CVE-2007-3304.patch
-Patch73: httpd-2.2.4-CVE-2007-1862.patch
+Patch55: httpd-2.2.4-oldflush.patch
+Patch56: httpd-2.2.6-ssllibver.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, pkgconfig, findutils, ed
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36
+Requires: initscripts >= 8.36, /etc/mime.types
 Obsoletes: httpd-suexec
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
@@ -117,11 +114,8 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
-
-%patch70 -p1 -b .cve5752
-%patch71 -p1 -b .cve1863
-%patch72 -p1 -b .cve3304
-%patch73 -p1 -b .cve1862
+%patch55 -p1 -b .oldflush
+%patch56 -p1 -b .ssllibver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -471,6 +465,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 2.2.6-1.fc7
+- update to 2.2.6
+- require /etc/mime.types (#249223)
+
 * Tue Jun 26 2007 Joe Orton <jorton at redhat.com> 2.2.4-4.1.fc7
 - add security fixes for CVE-2007-1863, CVE-2007-3304,
   and CVE-2006-5752 (#244665)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Mar 2007 13:29:57 -0000	1.15
+++ sources	18 Sep 2007 13:34:14 -0000	1.16
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz


--- httpd-2.2.3-CVE-2006-5752.patch DELETED ---


--- httpd-2.2.3-CVE-2007-1863.patch DELETED ---


--- httpd-2.2.3-CVE-2007-3304.patch DELETED ---


--- httpd-2.2.4-CVE-2007-1862.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 13:37:39 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 09:37:39 -0400
Subject: comps/po ne.po,1.2,1.3
Message-ID: <200709181337.l8IDbdYn001283@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1250

Modified Files:
	ne.po 
Log Message:
update



Index: ne.po
===================================================================
RCS file: /cvs/extras/comps/po/ne.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ne.po	17 Sep 2007 19:22:12 -0000	1.2
+++ ne.po	18 Sep 2007 13:37:09 -0000	1.3
@@ -7,13 +7,13 @@
 "Project-Id-Version: ne\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-08-16 16:07+0545\n"
+"PO-Revision-Date: 2007-09-18 13:31+0545\n"
 "Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\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\n"
 "\n"
 "\n"
 "\n"
@@ -183,10 +183,8 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
@@ -256,8 +254,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
@@ -316,8 +313,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -392,41 +388,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"
+msgstr "?????? ???????????? ????????????????????? ?????????????????????????????? ?????????????????? ????????????????????? ?????????????????? ??????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
@@ -489,19 +476,16 @@
 msgstr "????????? ??????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "?????? ???????????? ????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -524,23 +508,20 @@
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "???????????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -619,9 +600,8 @@
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -648,9 +628,8 @@
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -681,15 +660,12 @@
 msgstr "??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"?????????????????? ????????????????????? ??????????????? ???????????????????????? ?????????????????? ?????? ??????????????? ???????????? ??????????????? ??????????????? ?????? ??????????????? ????????????????????? ??????????????????????????? ???"
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -712,9 +688,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -725,14 +700,12 @@
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????? ??????????????????"
+msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "????????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -759,9 +732,8 @@
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "??????????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -784,9 +756,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -821,9 +792,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -850,9 +820,8 @@
 msgstr "???????????????????????? ???????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -883,9 +852,8 @@
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -904,27 +872,22 @@
 msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????? ???????????????????????????????????? ???????????????????????? X ???????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ??????????????? ???????????? ?????????????????? ????????????????????? ???"
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ???????????????????????????????????? ?????????????????? ?????????????????? DHCP, ??????????????????????????? ??? NIS ??????????????? ??????????????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"
+msgstr "?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
 msgid "These packages provide a virtualization environment."
@@ -938,8 +901,7 @@
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr ""
-"?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"
+msgstr "?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
 msgid ""
@@ -962,8 +924,7 @@
 "???????????? ????????????????????? ??????????????? ?????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ????????????????????? ?????????????????? ???????????????????????? ??????????????????????????? DNS ????????? ??????????????? (BIND) ??????????????? ?????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
@@ -980,17 +941,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr ""
-"?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"
+msgstr "?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1017,9 +976,8 @@
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1047,352 +1005,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "????????????????????? ????????????????????? ????????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "????????????????????????"
+msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "??????????????????????????? ????????? ?????????????????????????????? ???????????? ???????????? ????????????????????? ???"
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"
+msgstr "?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ?????????????????? ???"
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "?????? ????????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ??????????????????"
-
-#~ msgid "JBoss Enterprise Application Platform"
-#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"
-
-#~ msgid "Packages which comprise the JBoss Enterprise Application Platform"
-#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ??????????????? ?????????????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????????????????????? ??????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "??????????????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "??????????????????????????? ???????????? ?????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????? ???????????? ??????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "????????????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "???????????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ??????????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ??????????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ??????????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ??????????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "?????????????????? ???????????? ????????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"
-
-#~ msgid "KDE"
-#~ msgstr "???????????????"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "??????????????? ????????????????????? ??????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "?????????????????? ???????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "??????????????? ???????????????????????? ?????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ????????????????????????????????? ???????????? ?????????????????? ?????????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????????????????? ?????????????????? ?????????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ?????????????????????"
-
-#~ msgid "Server"
-#~ msgstr "???????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ???????????? ??????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????????? ??????????????????"
-
-#~ msgid "System"
-#~ msgstr "?????????????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU ?????????????????? ????????? ????????????????????? ???"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? Postfix ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "?????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? "
-#~ "?????????????????? ????????????????????? ???"
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????? ??????????????? ???????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????? ??????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ?????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ?????????????????? ???????????? ??????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????????????? ??????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????????"
-
-#~ msgid "Italian"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "????????? ???????????? ??????????????????????????????????????? ?????????????????? 3 ???????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? "
-#~ "??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "????????????????????? ?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? "
-#~ "???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? "
-#~ "??????????????? ???"
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "??????????????????????????? ?????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????????????"
-
-#~ msgid "Punjabi"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? 4 ???????????????????????????"
-
-#~ msgid "Tamil"
-#~ msgstr "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????? ?????????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????? ?????????????????? ???"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????????? ????????? GFS ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????? ????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "???????????? ?????????????????? ?????????????????? ??? ??????????????? ?????????"
-
-#~ msgid "Misc"
-#~ msgstr "???????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "??????????????? ?????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ???????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ???????????????????????? ???????????? ?????? ???????????????????????????????????? ?????????????????? ??????????????? ?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? ???????????????????????????"
-
-#~ msgid "Workstation"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????????????????? ??????????????????????????? ??? ???????????????????????? ???"
+msgstr "?????????????????? ???????????????????????? ??? ?????????????????? ???????????? ?????????????????????"
 
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????????????????????????? ?????????????????? ???"



From fedora-extras-commits at redhat.com  Tue Sep 18 13:41:54 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 09:41:54 -0400
Subject: comps comps-f8.xml.in,1.111,1.112
Message-ID: <200709181341.l8IDfs6e001468@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1444

Modified Files:
	comps-f8.xml.in 
Log Message:
Switch default bittorrent client to transmission, move bittorrent-gui to
optional



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- comps-f8.xml.in	17 Sep 2007 18:15:17 -0000	1.111
+++ comps-f8.xml.in	18 Sep 2007 13:41:24 -0000	1.112
@@ -1802,17 +1802,18 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">bittorrent-gui</packagereq>
       <packagereq type="default">ekiga</packagereq>
       <packagereq type="default">evolution</packagereq>
       <packagereq type="default">evolution-help</packagereq>
       <packagereq type="default">evolution-webcal</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">pidgin</packagereq>
+      <packagereq type="default">transmission</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">azureus</packagereq>
       <packagereq type="optional">balsa</packagereq>
+      <packagereq type="optional">bittorrent-gui</packagereq>
       <packagereq type="optional">blam</packagereq>
       <packagereq type="optional">blogtk</packagereq>
       <packagereq type="optional">bluefish</packagereq>
@@ -1868,7 +1869,6 @@
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
-      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>
       <packagereq type="optional">valknut</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 18 13:44:41 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 18 Sep 2007 09:44:41 -0400
Subject: rpms/c2070/devel c2070.spec,1.2,1.3
Message-ID: <200709181344.l8IDifDo001565@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/c2070/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532

Modified Files:
	c2070.spec 
Log Message:
Download mirror is no longer available



Index: c2070.spec
===================================================================
RCS file: /cvs/extras/rpms/c2070/devel/c2070.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c2070.spec	3 Aug 2007 12:03:54 -0000	1.2
+++ c2070.spec	18 Sep 2007 13:44:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           c2070
 Version:        0.99
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Converts bitcmyk data to Lexmark 2070 printer language
 
 Group:          System Environment/Libraries
@@ -10,8 +10,7 @@
 # ...and as the original upstream author did not respond to e-mails,
 # here is at least some reference:
 URL:            http://www.linuxprinting.org/show_driver.cgi?driver=%{name}
-# Again, the source URL is not original
-Source0:        ftp://mirror.linuxsoft.cz/pool/5865/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,6 +39,9 @@
 %doc README
 
 %changelog
+* Tue Sep 18 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.99-3
+- The source for the package had died away
+
 * Fri Aug 3 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.99-2
 - Modify the License tag in accordance with the new guidelines
 



From fedora-extras-commits at redhat.com  Tue Sep 18 13:46:56 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:46:56 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.126, 1.127 jd.spec, 1.145, 1.146 sources, 
	1.127, 1.128
Message-ID: <200709181346.l8IDkudg001706@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	3 Sep 2007 16:45:33 -0000	1.126
+++ .cvsignore	18 Sep 2007 13:46:23 -0000	1.127
@@ -1 +1 @@
-jd-1.9.6-svn1311.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- jd.spec	3 Sep 2007 16:45:33 -0000	1.145
+++ jd.spec	18 Sep 2007 13:46:23 -0000	1.146
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1311
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+#BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -119,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
-- svn 1311
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	3 Sep 2007 16:45:33 -0000	1.127
+++ sources	18 Sep 2007 13:46:23 -0000	1.128
@@ -1 +1 @@
-ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:46:58 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:46:58 -0400
Subject: rpms/jd/FC-6 .cvsignore, 1.29, 1.30 jd.spec, 1.35, 1.36 sources,
	1.30, 1.31
Message-ID: <200709181346.l8IDkwWG001711@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Aug 2007 14:11:15 -0000	1.29
+++ .cvsignore	18 Sep 2007 13:46:26 -0000	1.30
@@ -1 +1 @@
-jd-1.9.6-beta070804.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jd.spec	5 Aug 2007 09:31:26 -0000	1.35
+++ jd.spec	18 Sep 2007 13:46:26 -0000	1.36
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070804
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+#BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -90,15 +93,14 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 %{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
-
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   %{name}.desktop
+   --delete-original \
+   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -116,9 +118,13 @@
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{vendorname}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
+
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Aug 2007 09:31:26 -0000	1.30
+++ sources	18 Sep 2007 13:46:26 -0000	1.31
@@ -1 +1 @@
-e9b12a4fea009de825f6cc424a6dbd1c  jd-1.9.6-beta070804.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:47:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:47:01 -0400
Subject: rpms/jd/devel .cvsignore, 1.146, 1.147 jd.spec, 1.172, 1.173 sources,
	1.147, 1.148
Message-ID: <200709181347.l8IDl1LH001716@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	14 Sep 2007 18:19:31 -0000	1.146
+++ .cvsignore	18 Sep 2007 13:46:29 -0000	1.147
@@ -1 +1 @@
-jd-1.9.6-svn1335.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- jd.spec	14 Sep 2007 18:19:31 -0000	1.172
+++ jd.spec	18 Sep 2007 13:46:29 -0000	1.173
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1335
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -73,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -86,7 +87,6 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-#find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
-- svn 1335
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	14 Sep 2007 18:19:31 -0000	1.147
+++ sources	18 Sep 2007 13:46:29 -0000	1.148
@@ -1 +1 @@
-f43bf179bb382e60ed4fd07f5a43a965  jd-1.9.6-svn1335.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:51:18 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 18 Sep 2007 09:51:18 -0400
Subject: rpms/lilypond/devel lilypond.spec,1.19,1.20
Message-ID: <200709181351.l8IDpIjN002152@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	lilypond.spec 
Log Message:
License and URL update.


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lilypond.spec	21 Aug 2007 14:59:10 -0000	1.19
+++ lilypond.spec	18 Sep 2007 13:50:46 -0000	1.20
@@ -1,12 +1,12 @@
 Name:		lilypond
 Version:	2.10.29
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
-License:	GPL
+License:	GPLv2
 URL:		http://www.lilypond.org
-Source0:	http://download.linuxaudio.org/download/sources/v2.10/%{name}-%{version}.tar.gz
+Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-2
+- Fix source URL. Change licence from GPL to GPLv2.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1
 - New release. Remove old patch.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 13:54:37 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 18 Sep 2007 09:54:37 -0400
Subject: rpms/eclipse-subclipse/F-7 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709181354.l8IDsbot002299@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2242

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
Update to upstream version 1.2.4



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 16:02:39 -0000	1.5
+++ .cvsignore	18 Sep 2007 13:54:04 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 16:02:39 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	18 Sep 2007 13:54:04 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 16:02:39 -0000	1.5
+++ eclipse-subclipse.spec	18 Sep 2007 13:54:04 -0000	1.6
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,16 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 16:02:39 -0000	1.5
+++ sources	18 Sep 2007 13:54:04 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:01:43 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Tue, 18 Sep 2007 10:01:43 -0400
Subject: rpms/kernel/devel linux-2.6-wireless.patch, 1.6,
	1.7 git-wireless-dev.patch, 1.35, 1.36 kernel.spec, 1.168,
	1.169 linux-2.6-wireless-pending.patch, 1.3,
	1.4 linux-2.6-iwlwifi-fw-name-compat.patch, 1.1, NONE
Message-ID: <200709181401.l8IE1hPo008575@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577

Modified Files:
	git-wireless-dev.patch kernel.spec 
	linux-2.6-wireless-pending.patch 
Added Files:
	linux-2.6-wireless.patch 
Removed Files:
	linux-2.6-iwlwifi-fw-name-compat.patch 
Log Message:
wireless update

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: linux-2.6-wireless.patch
diff -N linux-2.6-wireless.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-wireless.patch	18 Sep 2007 14:01:35 -0000	1.7
@@ -0,0 +1,66 @@
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 09:35:22.000000000 -0400
+@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void)
+ }
+ 
+ 
+-module_init(ieee80211_init);
++subsys_initcall(ieee80211_init);
+ module_exit(ieee80211_exit);
+ 
+ MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
+--- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 09:35:22.000000000 -0400
+@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
+ 		skb_queue_head_init(&q->requeued[i]);
+ 		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+ 						 qd->handle);
+-		if (q->queues[i] == 0) {
++		if (!q->queues[i]) {
+ 			q->queues[i] = &noop_qdisc;
+ 			printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+ 		}
+diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
+--- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 09:35:22.000000000 -0400
+@@ -431,7 +431,7 @@ static void __exit rate_control_simple_e
+ }
+ 
+ 
+-module_init(rate_control_simple_init);
++subsys_initcall(rate_control_simple_init);
+ module_exit(rate_control_simple_exit);
+ 
+ MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
+--- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 09:35:22.000000000 -0400
+@@ -213,7 +213,7 @@ out_fail_notifier:
+ out_fail_sysfs:
+ 	return err;
+ }
+-module_init(cfg80211_init);
++subsys_initcall(cfg80211_init);
+ 
+ static void cfg80211_exit(void)
+ {
+diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
+--- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 09:35:22.000000000 -0400
+@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
+ 	cfg80211_dev_free(rdev);
+ }
+ 
++#ifdef CONFIG_HOTPLUG
+ static int wiphy_uevent(struct device *dev, char **envp,
+ 			int num_envp, char *buf, int size)
+ {
+ 	/* TODO, we probably need stuff here */
+ 	return 0;
+ }
++#endif
+ 
+ struct class ieee80211_class = {
+ 	.name = "ieee80211",

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.35 -r 1.36 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- git-wireless-dev.patch	1 Sep 2007 00:32:49 -0000	1.35
+++ git-wireless-dev.patch	18 Sep 2007 14:01:35 -0000	1.36
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-08-30 16:13:50.000000000 -0400
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-18 09:42:44.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-18 09:44:18.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -66,8 +67,9 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
 --- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +329,9 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig linux-2.6.22.noarch/include/linux/mod_devicetable.h
+--- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-09-18 09:44:19.000000000 -0400
 @@ -340,4 +340,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID	0xffff
  #define PA_SVERSION_ANY_ID	0xffffffff
@@ -349,8 +352,9 @@
 +#define SSB_ANY_REV		0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-18 09:42:53.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -649,8 +653,9 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,396 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1048,8 +1053,9 @@
 +#endif /* CONFIG_SSB_SERIAL */
 +
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1255,8 +1261,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_EXTIF */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,46 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1304,8 +1311,9 @@
 +#endif /* CONFIG_SSB_DRIVER_MIPS */
 +
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,292 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1599,8 +1607,9 @@
 +
 +
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,106 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1708,8 +1717,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,424 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2135,8 +2145,9 @@
 +
 +
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2279,11 +2290,12 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 16:13:31.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 16:13:51.000000000 -0400
-@@ -539,6 +539,9 @@ struct ieee80211_hw {
- 	 * per-packet RC4 key with each TX frame when doing hwcrypto */
- #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 09:42:58.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 09:44:19.000000000 -0400
+@@ -563,6 +563,9 @@ struct ieee80211_hw {
+ 	 * specified in the device's EEPROM */
+ #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
  
 +	/* The device capable of supporting 11n */
 +#define IEEE80211_HW_SUPPORT_HT_MODE (1<<15)
@@ -2291,7 +2303,7 @@
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -691,8 +694,7 @@ struct ieee80211_ops {
+@@ -708,8 +711,7 @@ struct ieee80211_ops {
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -2301,7 +2313,7 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -752,8 +754,9 @@ struct ieee80211_ops {
+@@ -769,8 +771,9 @@ struct ieee80211_ops {
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -2313,7 +2325,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -769,6 +772,22 @@ struct ieee80211_ops {
+@@ -786,6 +789,22 @@ struct ieee80211_ops {
  	 * TSF synchronization. */
  	void (*reset_tsf)(struct ieee80211_hw *hw);
  
@@ -2336,8 +2348,9 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
+diff -up linux-2.6.22.noarch/include/net/iw_handler.h.orig linux-2.6.22.noarch/include/net/iw_handler.h
 --- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-09-18 09:44:19.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2353,9 +2366,10 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-08-30 16:13:50.000000000 -0400
-@@ -283,6 +283,14 @@ M:	corentin.labbe at geomatys.fr
+diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
[...111839 lines suppressed...]
++static void rs_clear(void *priv)
++{
++	return;
 +}
 +
++
 +static void *rs_alloc_sta(void *priv, gfp_t gfp)
 +{
 +	struct iwl_rate_scale_priv *rs_priv;
@@ -123243,11 +131884,6 @@
 +	IWL_DEBUG_RATE("leave\n");
 +}
 +
-+static void rs_clear(void *priv)
-+{
-+	IWL_DEBUG_RATE("NOP\n");
-+}
-+
 +/**
 + * rs_tx_status - Update rate control values based on Tx results
 + *
@@ -123742,8 +132378,7 @@
 +
 +	if (!local->rate_ctrl->ops->name ||
 +	    strcmp(local->rate_ctrl->ops->name, RS_NAME)) {
-+		IWL_WARNING("iwl-3945-rs not selected as rate control "
-+			    "aglo!\n");
++		IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");
 +		IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");
 +		return;
 +	}
@@ -123797,19 +132432,20 @@
 +		       iwl_rates[rs_priv->start_rate].plcp);
 +}
 +
-+void iwl_rate_control_register(void)
++void iwl_rate_control_register(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_register(&rs_ops);
 +}
 +
-+void iwl_rate_control_unregister(void)
++void iwl_rate_control_unregister(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,46 @@
 +/*
 + * Broadcom 43xx PCI-SSB bridge module
@@ -123857,8 +132493,9 @@
 +{
 +	ssb_pcihost_unregister(&b43_pci_bridge_driver);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Makefile
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,18 @@
 +# core
 +ssb-y					+= main.o scan.o
@@ -123878,8 +132515,9 @@
 +ssb-$(CONFIG_SSB_PCIHOST)		+= b43_pci_bridge.o
 +
 +obj-$(CONFIG_SSB)			+= ssb.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcmcia.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,271 @@
 +/*
 + * Sonics Silicon Backplane
@@ -124152,8 +132790,9 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/main.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,1162 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125317,8 +133956,9 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125424,8 +134064,9 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,223 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125650,8 +134291,9 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/ssb_private.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,136 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -125789,8 +134431,9 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pci.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,740 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -126532,8 +135175,9 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,446 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126981,8 +135625,9 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Kconfig
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,117 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -127101,8 +135746,9 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/scan.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
@@ -127517,8 +136163,9 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_extif.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,129 @@
 +/*
 + * Sonics Silicon Backplane
@@ -127649,8 +136296,9 @@
 +				   mask, value);
 +}
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,576 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kernel.spec	17 Sep 2007 14:16:49 -0000	1.168
+++ kernel.spec	18 Sep 2007 14:01:35 -0000	1.169
@@ -628,10 +628,9 @@
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
-#Patch680: linux-2.6-wireless.patch
+Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch690: git-wireless-dev.patch
-Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1131,13 +1130,11 @@
 ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
-#ApplyPatch linux-2.6-wireless.patch
+ApplyPatch linux-2.6-wireless.patch
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
 # Add the wireless stack updates and drivers from wireless-dev
 ApplyPatch git-wireless-dev.patch
-# temp compat patch for iwlwifi firmware filenames
-ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
 
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1802,6 +1799,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
 * Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git7
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch	30 Aug 2007 20:27:32 -0000	1.3
+++ linux-2.6-wireless-pending.patch	18 Sep 2007 14:01:35 -0000	1.4
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 15:51:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 09:36:24.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 09:38:01.000000000 -0400
 @@ -1,7 +1,9 @@
  /*
 - * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -11,10 +12,49 @@
   *
   * 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
-@@ -192,13 +194,19 @@ struct ieee80211_tx_control {
+@@ -71,14 +73,13 @@ struct ieee80211_channel {
+ #define IEEE80211_RATE_SUPPORTED 0x00000010
+ #define IEEE80211_RATE_OFDM 0x00000020
+ #define IEEE80211_RATE_CCK 0x00000040
+-#define IEEE80211_RATE_TURBO 0x00000080
+ #define IEEE80211_RATE_MANDATORY 0x00000100
+ 
+ #define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+ #define IEEE80211_RATE_MODULATION(f) \
+ 	(f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+ 
+-/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
++/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
+  * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+  * configuration. */
+ struct ieee80211_rate {
+@@ -99,12 +100,10 @@ struct ieee80211_rate {
+ 
+ /* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+  * actually be both in 11b and 11g modes at the same time. */
+-enum {
++enum ieee80211_phymode {
+ 	MODE_IEEE80211A, /* IEEE 802.11a */
+ 	MODE_IEEE80211B, /* IEEE 802.11b only */
+-	MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+ 	MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+-	MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+ 
+ 	/* keep last */
+ 	NUM_IEEE80211_MODES
+@@ -165,7 +164,6 @@ struct ieee80211_low_level_stats {
+ /* Transmit control fields. This data structure is passed to low-level driver
+  * with each TX frame. The low-level driver is responsible for configuring
+  * the hardware to use given values (depending on what is supported). */
+-#define HW_KEY_IDX_INVALID -1
+ 
+ struct ieee80211_tx_control {
+ 	int tx_rate; /* Transmit rate, given as the hw specific value for the
+@@ -191,17 +189,21 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_REQUEUE		(1<<7)
  #define IEEE80211_TXCTL_FIRST_FRAGMENT	(1<<8) /* this is a first fragment of
  						* the frame */
- #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
 +#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
 +						  * using the through
 +						  * set_retry_limit configured
@@ -22,6 +62,8 @@
  	u32 flags;			       /* tx control flags defined
  						* above */
 -	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, .. */
++	u8 key_idx;		/* keyidx from hw->set_key(), undefined if
++				 * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
 +	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, ..
 +				 * This could be used when set_retry_limit
 +				 * is not implemented by the driver */
@@ -29,12 +71,78 @@
  	u8 antenna_sel_tx; 	/* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
 -	s8 key_idx;		/* -1 = do not encrypt, >= 0 keyidx from
 -				 * hw->set_key() */
-+	s8 key_idx;		/* HW_KEY_IDX_INVALID = do not encrypt,
-+				 * other values: keyidx from hw->set_key() */
  	u8 icv_len;		/* length of the ICV/MIC field in octets */
  	u8 iv_len;		/* length of the IV field in octets */
- 	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
-@@ -288,28 +296,10 @@ struct ieee80211_conf {
+-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+ 	u8 queue;		/* hardware queue to use for this frame;
+ 				 * 0 = highest, hw->queues-1 = lowest */
+ 	u8 sw_retry_attempt;	/* number of times hw has tried to
+@@ -219,22 +221,56 @@ struct ieee80211_tx_control {
+ 	int ifindex;	/* internal */
+ };
+ 
+-/* Receive status. The low-level driver should provide this information
+- * (the subset supported by hardware) to the 802.11 code with each received
+- * frame. */
++
++/**
++ * enum mac80211_rx_flags - receive flags
++ *
++ * These flags are used with the @flag member of &struct ieee80211_rx_status.
++ * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
++ *	Use together with %RX_FLAG_MMIC_STRIPPED.
++ * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
++ * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
++ * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
++ *	verification has been done by the hardware.
++ * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
++ *	If this flag is set, the stack cannot do any replay detection
++ *	hence the driver or hardware will have to do that.
++ */
++enum mac80211_rx_flags {
++	RX_FLAG_MMIC_ERROR	= 1<<0,
++	RX_FLAG_DECRYPTED	= 1<<1,
++	RX_FLAG_RADIOTAP	= 1<<2,
++	RX_FLAG_MMIC_STRIPPED	= 1<<3,
++	RX_FLAG_IV_STRIPPED	= 1<<4,
++};
++
++/**
++ * struct ieee80211_rx_status - receive status
++ *
++ * The low-level driver should provide this information (the subset
++ * supported by hardware) to the 802.11 code with each received
++ * frame.
++ * @mactime: MAC timestamp as defined by 802.11
++ * @freq: frequency the radio was tuned to when receiving this frame, in MHz
++ * @channel: channel the radio was tuned to
++ * @phymode: active PHY mode
++ * @ssi: signal strength when receiving this frame
++ * @signal: used as 'qual' in statistics reporting
++ * @noise: PHY noise when receiving this frame
++ * @antenna: antenna used
++ * @rate: data rate
++ * @flag: %RX_FLAG_*
++ */
+ struct ieee80211_rx_status {
+ 	u64 mactime;
+-	int freq; /* receive frequency in Mhz */
++	int freq;
+ 	int channel;
+ 	int phymode;
+ 	int ssi;
+-	int signal; /* used as qual in statistics reporting */
++	int signal;
+ 	int noise;
+ 	int antenna;
+ 	int rate;
+-#define RX_FLAG_MMIC_ERROR	(1<<0)
+-#define RX_FLAG_DECRYPTED	(1<<1)
+-#define RX_FLAG_RADIOTAP	(1<<2)
+ 	int flag;
+ };
+ 
+@@ -288,28 +324,10 @@ struct ieee80211_conf {
  	u8 power_level;			/* transmit power limit for current
  					 * regulatory domain; in dBm */
  	u8 antenna_max;			/* maximum antenna gain */
@@ -63,39 +171,69 @@
  };
  
  /**
-@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+@@ -402,40 +420,86 @@ struct ieee80211_if_conf {
  	struct ieee80211_tx_control *beacon_control;
  };
  
 -typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
 -ieee80211_key_alg;
-+typedef enum {
++/**
++ * enum ieee80211_key_alg - key algorithm
++ * @ALG_NONE: Unset key algorithm, will never be passed to the driver
++ * @ALG_WEP: WEP40 or WEP104
++ * @ALG_TKIP: TKIP
++ * @ALG_CCMP: CCMP (AES)
++ */
++typedef enum ieee80211_key_alg {
 +	ALG_NONE,
 +	ALG_WEP,
 +	ALG_TKIP,
 +	ALG_CCMP,
 +} ieee80211_key_alg;
  
-+/*
-+ * This flag indiciates that the station this key is being
-+ * configured for may use QoS. If your hardware cannot handle
-+ * that situation it should reject that key.
-+ */
-+#define IEEE80211_KEY_FLAG_WMM_STA	(1<<0)
  
- struct ieee80211_key_conf {
-+	/*
-+	 * To be set by the driver to the key index it would like to
-+	 * get in the ieee80211_tx_control.key_idx which defaults
-+	 * to HW_KEY_IDX_INVALID so that shouldn't be used.
-+	 */
[...4086 lines suppressed...]
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-09-18 09:37:00.000000000 -0400
 @@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
   */
  static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -24651,8 +25194,9 @@
  	}
  }
  EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-08-30 16:06:06.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -0,0 +1,961 @@
 +/*
 +
@@ -25615,8 +26159,9 @@
 +
 +module_init(if_cs_init);
 +module_exit(if_cs_exit);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-08-30 16:07:03.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-09-18 09:37:00.000000000 -0400
 @@ -1,52 +0,0 @@
 -#ifndef	__WLAN_THREAD_H_
 -#define	__WLAN_THREAD_H_
@@ -25670,8 +26215,9 @@
 -}
 -
 -#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-09-18 09:37:00.000000000 -0400
 @@ -38,7 +38,7 @@ struct bootcmdrespStr
  
  /* read callback private data */
@@ -25706,8 +26252,9 @@
 -int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
 -
  #endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-09-18 09:37:00.000000000 -0400
 @@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(s
  
  //      mutex_lock(&priv->mutex);
@@ -25741,8 +26288,9 @@
  
  	if (ret) {
  		ret = 0;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-09-18 09:37:00.000000000 -0400
 @@ -15,14 +15,9 @@ struct wlan_private;
  struct sk_buff;
  struct net_device;
@@ -25799,8 +26347,9 @@
 +int libertas_reset_device(wlan_private *priv);
  
  #endif				/* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-09-18 09:37:00.000000000 -0400
 @@ -67,6 +67,7 @@ struct rtl8187_priv {
  	struct rtl818x_csr *map;
  	void (*rf_init)(struct ieee80211_hw *);
@@ -25809,8 +26358,9 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 09:37:00.000000000 -0400
 @@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
  	int rvalue;
  	enum oid_num_t n = dwrq->flags;
@@ -25838,8 +26388,9 @@
  }
  
  void
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-09-18 09:37:00.000000000 -0400
 @@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
  	/* Alloc the cache */
  	for (i = 0; i < OID_NUM_LAST; i++) {
@@ -25855,8 +26406,9 @@
  		} else
  			priv->mib[i] = NULL;
  	}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-18 09:37:00.000000000 -0400
 @@ -63,11 +63,6 @@ config WAVELAN
  	  a Radio LAN (wireless Ethernet-like Local Area Network) using the
  	  radio frequencies 900 MHz and 2.4 GHz.
@@ -25991,8 +26543,9 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
  
  static void wl3501_online(struct net_device *dev)
@@ -26297,8 +26850,30 @@
  	if (link->open) {
  		wl3501_reset(dev);
  		netif_device_attach(dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-09-18 09:36:26.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 09:40:20.000000000 -0400
+@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm4
+ 		goto err_gpio_cleanup;
+ 	bcm43xx_radio_turn_on(bcm);
+ 	bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+-	dprintk(KERN_INFO PFX "Radio %s by hardware\n",
++	printk(KERN_INFO PFX "Radio %s by hardware\n",
+ 		(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
+ 
+ 	bcm43xx_write16(bcm, 0x03E6, 0x0000);
+@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(s
+ 	radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+ 	if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+ 		bcm->radio_hw_enable = radio_hw_enable;
+-		dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
++		printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ 		       (radio_hw_enable == 0) ? "disabled" : "enabled");
+ 		bcm43xx_leds_update(bcm, 0);
+ 	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c
 --- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-09-18 09:37:00.000000000 -0400
 @@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
  		goto final;
  	}
@@ -26362,8 +26937,9 @@
  		arlan_command(arlan_device[devnum], ARLAN_COMMAND_CLEAN_AND_RESET);
  
  	} else
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-09-18 09:37:00.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/wireless.h>
@@ -26381,8 +26957,9 @@
  	u16 infofid; /* MAC buffer id for info frame */
  	/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
  	 * txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
  {
  	int res, ret = 0;
@@ -26392,8 +26969,9 @@
  	local_info_t *local = iface->local;
  	tuple_t tuple;
  	cisparse_t *parse = NULL;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-09-18 09:37:00.000000000 -0400
 @@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
  	    local->hw_downloading)
  		return -ENODEV;
@@ -26463,8 +27041,9 @@
  	local = iface->local;
  
  	/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 09:37:00.000000000 -0400
 @@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
  static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
  				     size_t len)


--- linux-2.6-iwlwifi-fw-name-compat.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:03:48 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:03:48 -0400
Subject: rpms/perl-DateTime/devel .cvsignore, 1.16, 1.17 perl-DateTime.spec, 
	1.20, 1.21 sources, 1.16, 1.17
Message-ID: <200709181403.l8IE3mcE008704@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8660

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Log Message:
Update to DateTime 0.41.
Update to DateTime::Locale 0.35.
Update to DateTime::TimeZone 0.67.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	22 Jul 2007 19:38:54 -0000	1.16
+++ .cvsignore	18 Sep 2007 14:02:57 -0000	1.17
@@ -1,3 +1,3 @@
-DateTime-0.39.tar.gz
-DateTime-Locale-0.34.tar.gz
-DateTime-TimeZone-0.6603.tar.gz
+DateTime-0.41.tar.gz
+DateTime-Locale-0.35.tar.gz
+DateTime-TimeZone-0.67.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-DateTime.spec	29 Aug 2007 05:51:03 -0000	1.20
+++ perl-DateTime.spec	18 Sep 2007 14:02:57 -0000	1.21
@@ -1,9 +1,9 @@
-%define DTTimeZone_version 0.6603
-%define DTLocale_version 0.34
+%define DTTimeZone_version 0.67
+%define DTLocale_version 0.35
 
 Name:           perl-DateTime
-Version:        0.39
-Release:        2%{?dist}
+Version:        0.41
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL or Artistic
@@ -143,11 +143,16 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 1:0.41-1
+- Update to DateTime 0.41.
+- Update to DateTime::Locale 0.35.
+- Update to DateTime::TimeZone 0.67.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1:0.39-2
 - Rebuild for selinux ppc32 issue.
 
 * Sun Jul 22 2007 Steven Pritchard <steve at kspei.com> 1:0.39-1
-- Update to DateTIme 0.39.
+- Update to DateTime 0.39.
 - Update to DateTime::TimeZone 0.6603.
 
 * Thu Jul 05 2007 Steven Pritchard <steve at kspei.com> 1:0.38-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	22 Jul 2007 19:38:54 -0000	1.16
+++ sources	18 Sep 2007 14:02:57 -0000	1.17
@@ -1,3 +1,3 @@
-89af4113ddc943e9deaef4cfb11c19dd  DateTime-0.39.tar.gz
-18753fcc10e72f0a63f926f8790e7fc3  DateTime-Locale-0.34.tar.gz
-178b126286a00ad9871908c2e6efcff0  DateTime-TimeZone-0.6603.tar.gz
+cbd27b0d9a3eee5ffa6afb9211b19a9e  DateTime-0.41.tar.gz
+857b23381a1a8e7dc2e7d0caa285827d  DateTime-Locale-0.35.tar.gz
+4684adbdf78d863a3526d5d9a52b4d79  DateTime-TimeZone-0.67.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:08:46 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 18 Sep 2007 10:08:46 -0400
Subject: devel/automake17 automake17.spec,1.14,1.15
Message-ID: <200709181408.l8IE8kL6009382@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9353

Modified Files:
	automake17.spec 
Log Message:
- next attempt of getting the conflicts/obsoletes right (Stepan Kasal)


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- automake17.spec	18 Sep 2007 13:16:08 -0000	1.14
+++ automake17.spec	18 Sep 2007 14:08:13 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    10
+Release:    11
 License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -13,8 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.9
-Obsoletes:  automake = 1.7.9
+Conflicts:  automake < 1.8
+Obsoletes:  automake < 1.8
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':
@@ -95,6 +95,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-11
+- next attempt of getting the conflicts/obsoletes right (Stepan Kasal)
+
 * Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-10
 - fix obsoletes
 - mv check into %%check



From fedora-extras-commits at redhat.com  Tue Sep 18 14:17:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:17:51 -0700
Subject: [pkgdb] ncompress (Fedora, devel) updated by jkeating
Message-ID: <200709181417.l8IEHqHI010486@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of ncompress in Fedora devel to rbrich

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:17:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:17:51 -0700
Subject: [pkgdb] ncompress (Fedora, 7) updated by jkeating
Message-ID: <200709181417.l8IEHqIV010498@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of ncompress in Fedora 7 to rbrich

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:01 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:01 -0700
Subject: [pkgdb] uucp (Fedora, devel) updated by jkeating
Message-ID: <200709181418.l8IEI2oe010538@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of uucp in Fedora devel to rbrich

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:01 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:01 -0700
Subject: [pkgdb] uucp (Fedora, 7) updated by jkeating
Message-ID: <200709181418.l8IEI3Uu010553@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of uucp in Fedora 7 to rbrich

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:12 -0700
Subject: [pkgdb] system-config-netboot (Fedora, devel) updated by jkeating
Message-ID: <200709181418.l8IEICTP010602@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of system-config-netboot in Fedora devel to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:12 -0700
Subject: [pkgdb] system-config-netboot (Fedora, 7) updated by jkeating
Message-ID: <200709181418.l8IEIDW0010614@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of system-config-netboot in Fedora 7 to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From fedora-extras-commits at redhat.com  Tue Sep 18 14:23:47 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 10:23:47 -0400
Subject: rpms/xulrunner/devel add-gecko-provides.in, NONE,
	1.1 xulrunner-mozconfig, 1.1, 1.2 xulrunner.spec, 1.13, 1.14
Message-ID: <200709181423.l8IENlLv009962@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9863

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Added Files:
	add-gecko-provides.in 
Log Message:
* Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
- build fixes




--- NEW FILE add-gecko-provides.in ---
#!/bin/sh
#
# Use the internal provides generator"
#
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
provides=`echo $filelist | /usr/lib/rpm/find-provides`
echo $provides

#
# Now output the stuff we want to add
#
core_files=`echo $filelist | grep "libxpcom\.so" | wc -l`
devel_files=`echo $filelist | grep "firefox\-xpcom\.pc" | wc -l`
debug_files=`echo $filelist | grep "libxpcom\.so\.debug" | wc -l`
if [ $debug_files -eq 0 ]; then
  if [ $devel_files -gt 0 ]; then
    echo "gecko-devel = @GECKO_VERSION@"
  elif [ $core_files -gt 0 ]; then
    echo "gecko-libs = @GECKO_VERSION@"
  fi
fi


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-mozconfig	31 Aug 2007 04:34:18 -0000	1.1
+++ xulrunner-mozconfig	18 Sep 2007 14:23:14 -0000	1.2
@@ -1,5 +1,7 @@
 . $topsrcdir/xulrunner/config/mozconfig
 
+ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -22,7 +24,7 @@
 ac_add_options --disable-gnomeui
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-extensions=default,cookie
-ac_add_options --prefix=/usr
+
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xulrunner.spec	6 Sep 2007 04:07:04 -0000	1.13
+++ xulrunner.spec	18 Sep 2007 14:23:14 -0000	1.14
@@ -1,5 +1,3 @@
-%define indexhtml file:///usr/share/doc/HTML/index.html
-%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define desktop_file_utils_version 0.9
 %define nspr_version 4.6
 %define nss_version 3.11.1
@@ -14,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.1%{?dist}
+Release:        0.alpha7.2%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -28,14 +26,14 @@
 Source12:       %{name}-redhat-default-prefs.js
 #Source20:       %{name}.desktop
 #Source21:       %{name}.sh.in
-#Source22:       firefox.png
 Source23:       %{name}.1
-#Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
+Source101:      add-gecko-provides.in
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         camellia256.patch
+Patch3:         xulrunner-compile.patch
 
 # customization patches
 Patch21:        firefox-0.7.3-psfonts.patch
@@ -123,23 +121,8 @@
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
 %patch2   -R -p1 -b .camellia256
-#%patch3  -p1
-#%patch4  -p1
-#%patch5  -p1 -b .visibility
-
-#%patch20 -p0
-#%patch21 -p1 -b .psfonts
-#%patch22 -p0 -b .default-applications
-#%patch40 -p1 -b .bullet-bill
-#%patch41 -p1 -b .undo-uriloader
-#%patch42 -p0 -b .uriloader
-#%patch81 -p1 -b .nopangoxft
-#%patch82 -p1 -b .pango-mathml
-#%patch83 -p1 -b .pango-cursor-position
-#%patch84 -p0 -b .pango-printing
+%patch3   -p1
 
-#%patch100 -p1 -b .thread-cleanup
-#%patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 
 # For branding specific patches.
@@ -160,10 +143,6 @@
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
-# set up our default bookmarks
-cp %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
-
-
 #---------------------------------------------------------------------
 
 %build
@@ -197,7 +176,8 @@
 INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
 MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
 
-#DESTDIR=$RPM_BUILD_ROOT make install
+DESTDIR=$RPM_BUILD_ROOT make install
+
 %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
              $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_NAME} \
              $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_NAME}
@@ -208,34 +188,17 @@
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-#%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
 #desktop-file-install --vendor mozilla \
 #  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
 #  --add-category WebBrowser \
 #  --add-category Network \
 #  %{SOURCE20} 
 
-%if 0
-# set up the xulrunner start script
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \
-  $RPM_BUILD_ROOT%{_bindir}/xulrunner
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/xulrunner
-%endif
-
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
 %{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
-# set up our default bookmarks
-%{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/defaults/profile/bookmarks.html
-ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT${MOZ_APP_DIR}/defaults/profile/bookmarks.html
-
-%{__cat} %{SOURCE50} | %{__sed} -e "s,FFDIR,${MOZ_APP_DIR},g" -e 's,LIBDIR,%{_libdir},g' > \
-  $RPM_BUILD_ROOT${MOZ_APP_DIR}/firefox-xremote-client
-
-%{__chmod} 755 $RPM_BUILD_ROOT${MOZ_APP_DIR}/firefox-xremote-client
 %{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config
@@ -286,10 +249,16 @@
 GRE_PATH=${MOZ_APP_DIR}
 EOF
 
+GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
+%{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
+                        %{_builddir}/add-gecko-provides
+chmod 700 %{_builddir}/add-gecko-provides
+                        
 # Copy over the LICENSE
 install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
 
 # ghost files
+%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/components
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
 
@@ -316,7 +285,6 @@
 %defattr(-,root,root,-)
 %{_bindir}/xulrunner
 %exclude %{_bindir}/xulrunner-config
-%{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/*
 %{_libdir}/mozilla
 %dir /etc/gre.d
@@ -332,7 +300,6 @@
 %{_libdir}/%{name}-*/components/*.so
 %{_libdir}/%{name}-*/components/*.xpt
 %{_libdir}/%{name}-*/components/*.js
-%{_libdir}/%{name}-*/crashreporter
 %{_libdir}/%{name}-*/defaults
 %{_libdir}/%{name}-*/greprefs
 %{_libdir}/%{name}-*/icons
@@ -340,12 +307,12 @@
 %{_libdir}/%{name}-*/plugins
 %{_libdir}/%{name}-*/res
 %{_libdir}/%{name}-*/*.so
-%{_libdir}/%{name}-*/firefox-xremote-client
 %{_libdir}/%{name}-*/mozilla-xremote-client
 %{_libdir}/%{name}-*/run-mozilla.sh
 %{_libdir}/%{name}-*/regxpcom
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
+%{_libdir}/%{name}-*/platform.ini
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*
@@ -360,6 +327,7 @@
 %{_libdir}/%{name}-*/xpidl
 %{_libdir}/%{name}-*/xpt_dump
 %{_libdir}/%{name}-*/xpt_link
+%{_libdir}/%{name}-*/*.a
 %{_libdir}/pkgconfig/%{name}-xpcom.pc
 %{_libdir}/pkgconfig/%{name}-plugin.pc
 %{_libdir}/pkgconfig/%{name}-js.pc
@@ -370,6 +338,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
+- build fixes
+
 * Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
 - Initial cut at XULRunner 1.9 Alpha 7
 - Temporarily revert camellia 256 support since our nss doesn't support it yet



From fedora-extras-commits at redhat.com  Tue Sep 18 14:25:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhZGVrIFZva8OhbCIgPHJ2b2thbEByZWRoYXQuY29tPg==?=))
Date: Tue, 18 Sep 2007 07:25:34 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181425.l8IEPY8Y012846@app4.fedora.phx.redhat.com>

Package micq in Fedora devel is now owned by Radek Vok?l (rvokal)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:25:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhZGVrIFZva8OhbCIgPHJ2b2thbEByZWRoYXQuY29tPg==?=))
Date: Tue, 18 Sep 2007 07:25:58 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709181425.l8IEPwMm013623@app3.fedora.phx.redhat.com>

Package micq in Fedora devel was orphaned by Radek Vok?l (rvokal)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:54 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQt3k013208@app4.fedora.phx.redhat.com>

Package micq in Fedora devel is now owned by Ji?? Moskov??k (jmoskovc)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:57 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQvkB013895@app3.fedora.phx.redhat.com>

Package micq in Fedora 6 is now owned by Ji?? Moskov??k (jmoskovc)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:58 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQwlW013907@app3.fedora.phx.redhat.com>

Package micq in Fedora 7 is now owned by Ji?? Moskov??k (jmoskovc)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:27:18 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 10:27:18 -0400
Subject: rpms/xulrunner/devel xulrunner-compile.patch,NONE,1.1
Message-ID: <200709181427.l8IERIv7010073@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10061

Added Files:
	xulrunner-compile.patch 
Log Message:
added a compile patch

xulrunner-compile.patch:

--- NEW FILE xulrunner-compile.patch ---
diff -up mozilla/toolkit/xre/Makefile.in.old mozilla/toolkit/xre/Makefile.in
--- mozilla/toolkit/xre/Makefile.in.old	2007-09-17 17:13:01.000000000 +0200
+++ mozilla/toolkit/xre/Makefile.in	2007-09-17 17:12:33.000000000 +0200
@@ -263,5 +263,5 @@ platform.ini: FORCE
 libs:: platform.ini
 	$(INSTALL) $^ $(DIST)/bin
 
-install::
-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
+install:: platform.ini
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)



From fedora-extras-commits at redhat.com  Tue Sep 18 14:28:35 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Sep 2007 10:28:35 -0400
Subject: rpms/libkdcraw/devel .cvsignore, 1.3, 1.4 libkdcraw.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709181428.l8IESZLf010159@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/libkdcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10107

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
- Update to 0.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jun 2007 20:57:25 -0000	1.3
+++ .cvsignore	18 Sep 2007 14:28:02 -0000	1.4
@@ -1 +1 @@
-libkdcraw-0.1.1.tar.bz2
+libkdcraw-0.1.2.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/libkdcraw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libkdcraw.spec	31 Aug 2007 09:17:32 -0000	1.4
+++ libkdcraw.spec	18 Sep 2007 14:28:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libkdcraw
-Version:	0.1.1
-Release:	3%{?dist}
+Version:	0.1.2
+Release:	1%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -46,8 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# hack, 0.1.1 is missing translations -- Rex
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
 
@@ -74,7 +73,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw1/
+%{_libdir}/libkdcraw2/
 %{_datadir}/icons/hicolor/*/apps/kdcraw.png
 
 %files devel
@@ -84,6 +83,9 @@
 %{_libdir}/libkdcraw.so
 
 %changelog
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
+- Update to 0.1.2
+
 * Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-3
 - Fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jun 2007 20:57:25 -0000	1.3
+++ sources	18 Sep 2007 14:28:02 -0000	1.4
@@ -1 +1 @@
-46108744a7d8b0b9b0eaa9737c5e1fba  libkdcraw-0.1.1.tar.bz2
+38ed88e8b7387526113f150c349c8eb4  libkdcraw-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 14:34:12 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 10:34:12 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.48,1.49
Message-ID: <200709181434.l8IEYCr1010508@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10467

Modified Files:
	pwlib.spec 
Log Message:
- rebuild for chain-build
Daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pwlib.spec	18 Sep 2007 12:36:57 -0000	1.48
+++ pwlib.spec	18 Sep 2007 14:33:39 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 License: MPL
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-2
+- rebuild for chain-build
+
 * Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
 - Update to 1.10.10
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:35:31 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 18 Sep 2007 10:35:31 -0400
Subject: rpms/tcpdump/devel tcpdump-3.9.7-ikev2.patch, NONE, 1.1 tcpdump.spec,
	1.64, 1.65
Message-ID: <200709181435.l8IEZVht010547@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10524

Modified Files:
	tcpdump.spec 
Added Files:
	tcpdump-3.9.7-ikev2.patch 
Log Message:
- support decoding IKEv2 packets


tcpdump-3.9.7-ikev2.patch:

--- NEW FILE tcpdump-3.9.7-ikev2.patch ---
Index: tcpdump/interface.h
===================================================================
RCS file: /tcpdump/master/tcpdump/interface.h,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- tcpdump/interface.h	8 Aug 2007 17:20:58 -0000	1.278
+++ tcpdump/interface.h	29 Aug 2007 12:31:00 -0000	1.279
@@ -356,6 +356,7 @@
 
 /* forward compatibility */
 
+#ifndef NETDISSECT_REWORKED
 extern netdissect_options *gndo;
 
 #define eflag gndo->ndo_eflag 
@@ -389,3 +390,4 @@
 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend
 
+#endif
Index: tcpdump/isakmp.h
===================================================================
RCS file: /tcpdump/master/tcpdump/isakmp.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tcpdump/isakmp.h	11 Dec 2002 07:13:54 -0000	1.10
+++ tcpdump/isakmp.h	29 Aug 2007 02:38:14 -0000	1.11
@@ -81,7 +81,7 @@
 #define ISAKMP_TIMER_DEFAULT     10 /* seconds */
 #define ISAKMP_TRY_DEFAULT        3 /* times */
 
-/* 3.1 ISAKMP Header Format
+/* 3.1 ISAKMP Header Format (IKEv1 and IKEv2)
          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         !                          Initiator                            !
@@ -128,8 +128,11 @@
 #define ISAKMP_NPTYPE_D     12 /* Delete */
 #define ISAKMP_NPTYPE_VID   13 /* Vendor ID */
 
-#define ISAKMP_MAJOR_VERSION  1
-#define ISAKMP_MINOR_VERSION  0
+#define IKEv1_MAJOR_VERSION  1
+#define IKEv1_MINOR_VERSION  0
+
+#define IKEv2_MAJOR_VERSION  2
+#define IKEv2_MINOR_VERSION  0
 
 /* Exchange Type */
 #define ISAKMP_ETYPE_NONE   0 /* NONE */
@@ -142,6 +145,13 @@
 /* Flags */
 #define ISAKMP_FLAG_E 0x01 /* Encryption Bit */
 #define ISAKMP_FLAG_C 0x02 /* Commit Bit */
+#define ISAKMP_FLAG_extra 0x04
+
+/* IKEv2 */
+#define ISAKMP_FLAG_I (1 << 3)  /* (I)nitiator */
+#define ISAKMP_FLAG_V (1 << 4)  /* (V)ersion   */
+#define ISAKMP_FLAG_R (1 << 5)  /* (R)esponse  */
+
 
 /* 3.2 Payload Generic Header
          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -151,7 +161,7 @@
 */
 struct isakmp_gen {
 	u_int8_t  np;       /* Next Payload */
-	u_int8_t  reserved; /* RESERVED, unused, must set to 0 */
+	u_int8_t  critical; /* bit 7 - critical, rest is RESERVED */
 	u_int16_t len;      /* Payload Length */
 };
 
@@ -188,7 +198,7 @@
 	message of a Base Exchange (see Section 4.4) and the value "0" in the
 	first message of an Identity Protect Exchange (see Section 4.5).
 	*/
-struct isakmp_pl_sa {
+struct ikev1_pl_sa {
 	struct isakmp_gen h;
 	u_int32_t doi; /* Domain of Interpretation */
 	u_int32_t sit; /* Situation */
@@ -202,7 +212,7 @@
 	last within the security association proposal, then this field will
 	be 0.
 	*/
-struct isakmp_pl_p {
+struct ikev1_pl_p {
 	struct isakmp_gen h;
 	u_int8_t p_no;      /* Proposal # */
 	u_int8_t prot_id;   /* Protocol */
@@ -218,7 +228,7 @@
 	then this field will be 3.  If the current Transform payload is the
 	last within the proposal, then this field will be 0.
 	*/
-struct isakmp_pl_t {
+struct ikev1_pl_t {
 	struct isakmp_gen h;
 	u_int8_t  t_no;     /* Transform # */
 	u_int8_t  t_id;     /* Transform-Id */
@@ -227,14 +237,14 @@
 };
 
 /* 3.7 Key Exchange Payload */
-struct isakmp_pl_ke {
+struct ikev1_pl_ke {
 	struct isakmp_gen h;
 	/* Key Exchange Data */
 };
 
 /* 3.8 Identification Payload */
 	/* MUST NOT to be used, because of being defined in ipsec-doi. */
-struct isakmp_pl_id {
+struct ikev1_pl_id {
 	struct isakmp_gen h;
 	union {
 		u_int8_t  id_type;   /* ID Type */
@@ -244,7 +254,7 @@
 };
 
 /* 3.9 Certificate Payload */
-struct isakmp_pl_cert {
+struct ikev1_pl_cert {
 	struct isakmp_gen h;
 	u_int8_t encode; /* Cert Encoding */
 	char   cert;   /* Certificate Data */
@@ -268,7 +278,7 @@
 #define ISAKMP_CERT_SPKI   9
 
 /* 3.10 Certificate Request Payload */
-struct isakmp_pl_cr {
+struct ikev1_pl_cr {
 	struct isakmp_gen h;
 	u_int8_t num_cert; /* # Cert. Types */
 	/*
@@ -283,27 +293,27 @@
 
 /* 3.11 Hash Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_hash {
+struct ikev1_pl_hash {
 	struct isakmp_gen h;
 	/* Hash Data */
 };
 
 /* 3.12 Signature Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_sig {
+struct ikev1_pl_sig {
 	struct isakmp_gen h;
 	/* Signature Data */
 };
 
 /* 3.13 Nonce Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_nonce {
+struct ikev1_pl_nonce {
 	struct isakmp_gen h;
 	/* Nonce Data */
 };
 
 /* 3.14 Notification Payload */
-struct isakmp_pl_n {
+struct ikev1_pl_n {
 	struct isakmp_gen h;
 	u_int32_t doi;      /* Domain of Interpretation */
 	u_int8_t  prot_id;  /* Protocol-ID */
@@ -347,7 +357,7 @@
 #define ISAKMP_LOG_RETRY_LIMIT_REACHED           65530
 
 /* 3.15 Delete Payload */
-struct isakmp_pl_d {
+struct ikev1_pl_d {
 	struct isakmp_gen h;
 	u_int32_t doi;      /* Domain of Interpretation */
 	u_int8_t  prot_id;  /* Protocol-Id */
@@ -357,15 +367,15 @@
 };
 
 
-struct isakmp_ph1tab {
-	struct isakmp_ph1 *head;
-	struct isakmp_ph1 *tail;
+struct ikev1_ph1tab {
+	struct ikev1_ph1 *head;
+	struct ikev1_ph1 *tail;
 	int len;
 };
 
 struct isakmp_ph2tab {
-	struct isakmp_ph2 *head;
-	struct isakmp_ph2 *tail;
+	struct ikev1_ph2 *head;
+	struct ikev1_ph2 *tail;
 	int len;
 };
 
[...2245 lines suppressed...]
+		ND_PRINT((ndo,"%s", NPSTR(np)));
+		cp += item_len;
+	}
+
+	return cp;
+trunc:
+	ND_PRINT((ndo," [|isakmp]"));
+	return NULL;
+}
+
+static const u_char *
+ikev2_sub_print(netdissect_options *ndo,
+		u_char np, const struct isakmp_gen *ext, const u_char *ep,
+		u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+{
+	const u_char *cp;
+	int i;
+	int pcount;
+	struct isakmp_gen e;
+
+	cp = (const u_char *)ext;
+	pcount = 0;						
+	while (np) {
+		pcount++;
+		ND_TCHECK(*ext);
+		
+		safememcpy(&e, ext, sizeof(e));
+
+		ND_TCHECK2(*ext, ntohs(e.len));
+
+		depth++;
+		ND_PRINT((ndo,"\n"));
+		for (i = 0; i < depth; i++)
+			ND_PRINT((ndo,"    "));
+		ND_PRINT((ndo,"("));
+		cp = ikev2_sub0_print(ndo, np, pcount,
+				      ext, ep, phase, doi, proto, depth);
+		ND_PRINT((ndo,")"));
+		depth--;
+
+		if (cp == NULL) {
+			/* Zero-length subitem */
+			return NULL;
 		}
 
-		printf(":");
+		np = e.np;
+		ext = (struct isakmp_gen *)cp;
+	}
+	return cp;
+trunc:
+	ND_PRINT((ndo," [|%s]", NPSTR(np)));
+	return NULL;
+}
+
+static void
+ikev2_print(netdissect_options *ndo,
+	    const u_char *bp,  u_int length,
+	    const u_char *bp2 _U_, struct isakmp *base)
+{
+	const struct isakmp *p;
+	const u_char *ep;
+	u_char np;
+	int phase;
+
+	p = (const struct isakmp *)bp;
+	ep = ndo->ndo_snapend;
+
+	phase = (*(u_int32_t *)base->msgid == 0) ? 1 : 2;
+	if (phase == 1)
+		ND_PRINT((ndo, " parent_sa"));
+	else
+		ND_PRINT((ndo, " child_sa "));
+
+	ND_PRINT((ndo, " %s", ETYPESTR(base->etype)));
+	if (base->flags) {
+		ND_PRINT((ndo, "[%s%s]",
+			  base->flags & ISAKMP_FLAG_I ? "I" : "",
+			  base->flags & ISAKMP_FLAG_V ? "V" : "",
+			  base->flags & ISAKMP_FLAG_R ? "R" : ""));
+	}
+
+	if (ndo->ndo_vflag) {
+		const struct isakmp_gen *ext;
+		int nparen;
+
+		ND_PRINT((ndo, ":"));
 
 		/* regardless of phase... */
-		if (base.flags & ISAKMP_FLAG_E) {
+		if (base->flags & ISAKMP_FLAG_E) {
 			/*
 			 * encrypted, nothing we can do right now.
 			 * we hope to decrypt the packet in the future...
 			 */
-			printf(" [encrypted %s]", NPSTR(base.np));
+			ND_PRINT((ndo, " [encrypted %s]", NPSTR(base->np)));
 			goto done;
 		}
 
 		nparen = 0;
-		CHECKLEN(p + 1, base.np)
+		CHECKLEN(p + 1, base->np)
 
-		np = base.np;
+		np = base->np;
 		ext = (struct isakmp_gen *)(p + 1);
-		isakmp_sub_print(np, ext, ep, phase, 0, 0, 0);
+		ikev2_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);
 	}
 
 done:
-	if (vflag) {
-		if (ntohl(base.len) != length) {
-			printf(" (len mismatch: isakmp %u/ip %u)",
-				(u_int32_t)ntohl(base.len), length);
+	if (ndo->ndo_vflag) {
+		if (ntohl(base->len) != length) {
+			ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",
+				  (u_int32_t)ntohl(base->len), length));
 		}
 	}
 }
 
 void
+isakmp_print(netdissect_options *ndo,
+	     const u_char *bp, u_int length,
+	     const u_char *bp2)
+{
+	const struct isakmp *p;
+	struct isakmp base;
+	const u_char *ep;
+	int major, minor;
+
+	p = (const struct isakmp *)bp;
+	ep = ndo->ndo_snapend;
+
+	if ((struct isakmp *)ep < p + 1) {
+		ND_PRINT((ndo,"[|isakmp]"));
+		return;
+	}
+
+	safememcpy(&base, p, sizeof(base));
+
+	ND_PRINT((ndo,"isakmp"));
+	major = (base.vers & ISAKMP_VERS_MAJOR)
+		>> ISAKMP_VERS_MAJOR_SHIFT;
+	minor = (base.vers & ISAKMP_VERS_MINOR)
+		>> ISAKMP_VERS_MINOR_SHIFT;
+
+	if (ndo->ndo_vflag) {
+		ND_PRINT((ndo," %d.%d", major, minor));
+	}
+
+	if (ndo->ndo_vflag) {
+		ND_PRINT((ndo," msgid "));
+		rawprint(ndo, (caddr_t)&base.msgid, sizeof(base.msgid));
+	}
+
+	if (1 < ndo->ndo_vflag) {
+		ND_PRINT((ndo," cookie "));
+		rawprint(ndo, (caddr_t)&base.i_ck, sizeof(base.i_ck));
+		ND_PRINT((ndo,"->"));
+		rawprint(ndo, (caddr_t)&base.r_ck, sizeof(base.r_ck));
+	}
+	ND_PRINT((ndo,":"));
+
+	switch(major) {
+	case IKEv1_MAJOR_VERSION:
+		ikev1_print(ndo, bp, length, bp2, &base);
+		break;
+
+	case IKEv2_MAJOR_VERSION:
+		ikev2_print(ndo, bp, length, bp2, &base);
+		break;
+	}
+}
+
+void
 isakmp_rfc3948_print(netdissect_options *ndo,
 		     const u_char *bp, u_int length,
 		     const u_char *bp2)
@@ -1429,7 +2355,7 @@
 	if(length < 4) {
 		goto trunc;
 	}
-
+	
 	/*
 	 * see if this is an IKE packet
 	 */
@@ -1459,7 +2385,7 @@
 	}
 
 trunc:
-	printf("[|isakmp]");
+	ND_PRINT((ndo,"[|isakmp]"));
 	return;
 }
 


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- tcpdump.spec	22 Aug 2007 12:24:32 -0000	1.64
+++ tcpdump.spec	18 Sep 2007 14:34:58 -0000	1.65
@@ -2,7 +2,7 @@
 Name: tcpdump
 Epoch: 14
 Version: 3.9.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 Patch1: tcpdump-3.9.7-droproot.patch
 Patch2: tcpdump-3.6.1-portnumbers.patch
 Patch3: tcpdump-3.9.7-crypto.patch
+Patch4: tcpdump-3.9.7-ikev2.patch
 Patch5: tcpslice-1.2a3-time.patch
 Patch6: tcpslice-CVS.20010207-bpf.patch
 
@@ -34,6 +35,7 @@
 %patch1 -p1 -b .droproot
 %patch2 -p1 -b .portnumbers
 %patch3 -p1 -b .crypto
+%patch4 -p1 -b .ikev2
 
 pushd %{tcpslice_dir}
 %patch5 -p1 -b .time
@@ -89,6 +91,9 @@
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Tue Sep 18 2007 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.7-5
+- support decoding IKEv2 packets
+
 * Wed Aug 22 2007 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.7-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:39:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 10:39:04 -0400
Subject: rpms/exiv2/devel exiv2.spec,1.12,1.13
Message-ID: <200709181439.l8IEd4Nj010720@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10647

Modified Files:
	exiv2.spec 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-4
- -libs: -Requires: %name



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- exiv2.spec	22 Aug 2007 15:09:56 -0000	1.12
+++ exiv2.spec	18 Sep 2007 14:38:31 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.15
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -44,7 +44,8 @@
 Summary: Exif and Iptc metadata manipulation library
 Group: System Environment/Libraries
 # not *strictly* required, but runtime may expect presence of exiv2 binary
-Requires: %{name} = %{version}-%{release}
+# we'll try removing it, and see... -- Rex
+#Requires: %{name} = %{version}-%{release}
 %description libs
 A C++ library to access image metadata, supporting full read and write access
 to the Exif and Iptc metadata, Exif MakerNote support, extract and delete 
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-4
+- -libs: -Requires: %%name
+
 * Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-3
 - -libs subpkg to be multilib-friendlier
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:39:19 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 10:39:19 -0400
Subject: rpms/opal/devel .cvsignore, 1.10, 1.11 opal.spec, 1.21, 1.22 sources,
	1.11, 1.12
Message-ID: <200709181439.l8IEdJRI010763@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10643

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- upstream release of 2.2.11
Daniel




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Sep 2007 12:49:23 -0000	1.10
+++ .cvsignore	18 Sep 2007 14:38:47 -0000	1.11
@@ -5,3 +5,4 @@
 opal-2.2.7.tar.gz
 opal-2.2.8.tar.gz
 opal-2.2.10.tar.gz
+opal-2.2.11.tar.gz


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- opal.spec	18 Sep 2007 12:49:23 -0000	1.21
+++ opal.spec	18 Sep 2007 14:38:47 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.10
+Version: 2.2.11
 Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.11-1
+- upstream release of 2.2.11
+
 * Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.10-1
 - upstream release of 2.2.10
 - includes the 2 cisco patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Sep 2007 12:49:23 -0000	1.11
+++ sources	18 Sep 2007 14:38:47 -0000	1.12
@@ -1 +1 @@
-ef8b858c666afc375830f6cd216a0601  opal-2.2.10.tar.gz
+eb4a9c0c9ea93ec95c876aaeadf83936  opal-2.2.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:19 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfJAk018195@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:21 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfLui017512@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:22 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfMnw018215@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:24 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfOE8018228@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:26 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfQwi017546@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:28 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfSwI017557@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:29 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfT3c018258@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:45 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 10:41:45 -0400
Subject: rpms/libkexiv2/devel .cvsignore, 1.5, 1.6 libkexiv2.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200709181441.l8IEfjIN011897@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkexiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10814

Modified Files:
	.cvsignore libkexiv2.spec sources 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.6-1
- libkexiv2-0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2007 13:49:57 -0000	1.5
+++ .cvsignore	18 Sep 2007 14:41:13 -0000	1.6
@@ -1,3 +1,2 @@
 clog
-libkexiv2-0.1.4.tar.bz2
-libkexiv2-0.1.5.tar.bz2
+libkexiv2-0.1.6.tar.bz2


Index: libkexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/libkexiv2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libkexiv2.spec	12 Aug 2007 02:34:14 -0000	1.6
+++ libkexiv2.spec	18 Sep 2007 14:41:13 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary: A library to manipulate EXIF/IPTC information 
 Name:	 libkexiv2
-Version: 0.1.5
-Release: 2%{?dist}
+Version: 0.1.6
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -14,7 +14,7 @@
 
 BuildRequires: gettext
 BuildRequires: exiv2-devel >= 0.14
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs-devel
 
 %description
 A wrapper for Exiv2 library to manipulate picture metadata, used by 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.6-1
+- libkexiv2-0.1.6
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.5-2
 - License: GPLv2+
 - BR: kdelibs3-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 May 2007 13:49:57 -0000	1.5
+++ sources	18 Sep 2007 14:41:13 -0000	1.6
@@ -1 +1 @@
-4171b8e929b11ffd82e31bf00f359a19  libkexiv2-0.1.5.tar.bz2
+8a256ac6a3895720a88b29eaf932917c  libkexiv2-0.1.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:50 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:50 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfpQ6018374@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:49 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfoxr017663@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:51 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfq33017686@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:52 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfr5a018390@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:56 -0700
Subject: [pkgdb] nc6: jsafrane has given up watchcommits
Message-ID: <200709181441.l8IEfuMa018415@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has given up the watchcommits acl on nc6 (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:55 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfu56017709@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:58 -0700
Subject: [pkgdb] nc6: jsafrane has requested watchcommits
Message-ID: <200709181441.l8IEfwA2017727@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has requested the watchcommits acl on nc6 (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:59 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfxHT018435@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:42:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:42:00 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181442.l8IEg0CF017750@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:42:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:42:01 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181442.l8IEg1xS018453@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 14:43:27 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:43:27 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.56,1.57
Message-ID: <200709181443.l8IEhRB7013081@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13047

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- policy-20070703.patch	17 Sep 2007 23:26:58 -0000	1.56
+++ policy-20070703.patch	18 Sep 2007 14:42:55 -0000	1.57
@@ -4736,7 +4736,7 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 10:39:32.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4754,7 +4754,15 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -52,3 +51,4 @@
+@@ -26,6 +25,7 @@
+ /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
+ /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
+ /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
+ /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
+@@ -52,3 +52,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)



From fedora-extras-commits at redhat.com  Tue Sep 18 14:44:56 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 18 Sep 2007 10:44:56 -0400
Subject: rpms/emacs/devel emacs.spec, 1.98, 1.99 python-mode-init.el, 1.1,
	NONE python-mode.el, 1.3, NONE
Message-ID: <200709181444.l8IEiuHN013168@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13140

Modified Files:
	emacs.spec 
Removed Files:
	python-mode-init.el python-mode.el 
Log Message:
* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-5
- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
- drop broken python mode (Resolves: bz262801)




Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- emacs.spec	11 Sep 2007 17:56:57 -0000	1.98
+++ emacs.spec	18 Sep 2007 14:44:24 -0000	1.99
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -12,12 +12,10 @@
 Source2: emacs.png
 Source3: dotemacs.el
 Source4: site-start.el
-Source5: http://www.python.org/emacs/python-mode/python-mode.el
 Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
 Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz
 Source8: php-mode-init.el
 Source9: ssl.el
-Source10: python-mode-init.el
 Source11: rpm-spec-mode-init.el
 Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch
 Source13: focus-init.el
@@ -34,7 +32,7 @@
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
 Requires: emacs-common = %{version}-%{release}
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
@@ -105,7 +103,7 @@
 
 # install rest of site-lisp files
 ( cd site-lisp
-  cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
+  cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
   tar xfz %SOURCE7  # php-mode
   # xemacs compat patch for rpm-spec-mode
   patch < %SOURCE12
@@ -301,6 +299,10 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-5
+- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
+- drop broken python mode (Resolves: bz262801)
+
 * Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
 - fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
 - use macro instead of variable style for buildroot.


--- python-mode-init.el DELETED ---


--- python-mode.el DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:45:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:45:36 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.57,1.58
Message-ID: <200709181445.l8IEja4u013206@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- policy-20070703.patch	18 Sep 2007 14:42:55 -0000	1.57
+++ policy-20070703.patch	18 Sep 2007 14:45:04 -0000	1.58
@@ -4769,7 +4769,7 @@
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 10:43:40.000000000 -0400
 @@ -81,12 +81,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
@@ -4847,7 +4847,15 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -221,17 +228,37 @@
+@@ -202,6 +209,7 @@
+ files_dontaudit_getattr_all_tmp_files(cupsd_t)
+ 
+ selinux_compute_access_vector(cupsd_t)
++selinux_validate_context(cupsd_t)
+ 
+ init_exec_script_files(cupsd_t)
+ 
+@@ -221,17 +229,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -4885,7 +4893,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +290,16 @@
+@@ -263,16 +291,16 @@
  ')
  
  optional_policy(`
@@ -4906,7 +4914,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +404,14 @@
+@@ -377,6 +405,14 @@
  ')
  
  optional_policy(`
@@ -4921,7 +4929,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -560,7 +595,7 @@
+@@ -560,7 +596,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -4930,7 +4938,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +622,6 @@
+@@ -587,8 +623,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  



From fedora-extras-commits at redhat.com  Tue Sep 18 14:46:31 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Tue, 18 Sep 2007 10:46:31 -0400
Subject: rpms/libX11/F-7 libX11-1.1.2-GetMotionEvents.patch, NONE,
	1.1 libX11.spec, 1.35, 1.36
Message-ID: <200709181446.l8IEkVss013325@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13244

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 1.0.3-10
- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
  to match the argument order in the headers. (#274671)


libX11-1.1.2-GetMotionEvents.patch:

--- NEW FILE libX11-1.1.2-GetMotionEvents.patch ---
diff -up libX11-1.1.2/src/GetMoEv.c.jx libX11-1.1.2/src/GetMoEv.c
--- libX11-1.1.2/src/GetMoEv.c.jx	2007-06-02 13:46:55.000000000 -0400
+++ libX11-1.1.2/src/GetMoEv.c	2007-09-17 09:30:24.000000000 -0400
@@ -33,9 +33,9 @@ in this Software without prior written a
 
 XTimeCoord *XGetMotionEvents(
     register Display *dpy,
+    Window w,
     Time start, 
     Time stop,
-    Window w,
     int *nEvents)  /* RETURN */
 {       
     xGetMotionEventsReply rep;


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-7/libX11.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libX11.spec	22 Apr 2007 01:56:53 -0000	1.35
+++ libX11.spec	18 Sep 2007 14:45:58 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,6 +18,7 @@
 Patch3: bug-201284.patch
 Patch4: libX11-fd-leak.patch
 Patch5: libX11-cve-2007-1667.patch
+Patch6: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -61,6 +62,7 @@
 %patch3 -p1 -b .3-bug201284
 %patch4 -p1 -b .xim-fd-leak
 %patch5 -p1 -b .cve-2007-1667
+%patch6 -p1 -b .getmoev
 
 %build
 %configure \
@@ -245,6 +247,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 1.0.3-10
+- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
+  to match the argument order in the headers. (#274671)
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-9
 - Don't install INSTALL
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:47:19 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:47:19 -0400
Subject: rpms/perl-Module-Load-Conditional/devel .cvsignore, 1.6,
	1.7 perl-Module-Load-Conditional.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200709181447.l8IElJjO013403@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367

Modified Files:
	.cvsignore perl-Module-Load-Conditional.spec sources 
Log Message:
Update to 0.18.
BR Test::More.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Jan 2007 21:07:33 -0000	1.6
+++ .cvsignore	18 Sep 2007 14:46:46 -0000	1.7
@@ -1 +1 @@
-Module-Load-Conditional-0.16.tar.gz
+Module-Load-Conditional-0.18.tar.gz


Index: perl-Module-Load-Conditional.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/perl-Module-Load-Conditional.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Module-Load-Conditional.spec	18 Apr 2007 16:53:59 -0000	1.7
+++ perl-Module-Load-Conditional.spec	18 Sep 2007 14:46:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Module-Load-Conditional
-Version:        0.16
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Looking up module information / loading at runtime
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load)
 BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(version) >= 0.69
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.18-1
+- Update to 0.18.
+- BR Test::More.
+
 * Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.16-2
 - BR ExtUtils::MakeMaker.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Jan 2007 21:07:33 -0000	1.6
+++ sources	18 Sep 2007 14:46:46 -0000	1.7
@@ -1 +1 @@
-fae73541e0b1d87d0bbe6e1676e5e738  Module-Load-Conditional-0.16.tar.gz
+8c5c2b0ae465cbbcca433bd8a2040ec3  Module-Load-Conditional-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:47:54 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 10:47:54 -0400
Subject: rpms/Maelstrom/devel sources,1.2,1.3
Message-ID: <200709181447.l8IElsTi013481@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/Maelstrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13397

Modified Files:
	sources 
Log Message:
update new upstream tarball with license tweak



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2005 20:45:11 -0000	1.2
+++ sources	18 Sep 2007 14:47:22 -0000	1.3
@@ -1 +1 @@
-8aab0e75ca52808fd6777535ebb1f1c4  Maelstrom-3.0.6.tar.gz
+4fbeb6070eebdf161bd156b083b8804e  Maelstrom-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:49:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:49:31 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.123, 1.124 sources, 1.134,
	1.135
Message-ID: <200709181449.l8IEnV9M013546@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13522

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	27 Aug 2007 21:43:05 -0000	1.123
+++ .cvsignore	18 Sep 2007 14:48:59 -0000	1.124
@@ -125,3 +125,4 @@
 serefpolicy-3.0.5.tgz
 serefpolicy-3.0.6.tgz
 serefpolicy-3.0.7.tgz
+serefpolicy-3.0.8.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	27 Aug 2007 21:43:05 -0000	1.134
+++ sources	18 Sep 2007 14:48:59 -0000	1.135
@@ -1 +1 @@
-cf3ad58b7f285398e7b19a9f2d097f8e  serefpolicy-3.0.7.tgz
+df2a00dede379f39b537889ace0b85cb  serefpolicy-3.0.8.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:50:47 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 10:50:47 -0400
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.4,1.5
Message-ID: <200709181450.l8IEol0M013750@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13704

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
fix download url


Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Finance-Quote.spec	3 Aug 2007 18:13:05 -0000	1.4
+++ perl-Finance-Quote.spec	18 Sep 2007 14:50:13 -0000	1.5
@@ -5,7 +5,7 @@
 Group:          Development/Libraries
 License:        GPLv2+
 URL:		http://finance-quote.sourceforge.net/
-Source0:	http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/Finance-Quote-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/finance-quote/Finance-Quote-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -43,8 +43,10 @@
 %{perl_vendorlib}/Finance/
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com>
+- fix source download URL
+
 * Fri Aug  3 2007 Bill Nottingham <notting at redhat.com>
 - tweak license tag
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:52:18 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:52:18 -0400
Subject: rpms/perl-Test-Deep/devel .cvsignore, 1.5, 1.6 perl-Test-Deep.spec, 
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709181452.l8IEqIO8013936@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.098.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2007 18:30:04 -0000	1.5
+++ .cvsignore	18 Sep 2007 14:51:45 -0000	1.6
@@ -1 +1 @@
-Test-Deep-0.097.tar.gz
+Test-Deep-0.098.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-Deep.spec	12 Aug 2007 18:30:04 -0000	1.6
+++ perl-Test-Deep.spec	18 Sep 2007 14:51:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.097
+Version:        0.098
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.098-1
+- Update to 0.098.
+
 * Fri Aug 10 2007 Steven Pritchard <steve at kspei.com> 0.097-1
 - Update to 0.097.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2007 18:30:04 -0000	1.5
+++ sources	18 Sep 2007 14:51:45 -0000	1.6
@@ -1 +1 @@
-87a1f6c05009baaa5513f14c328ce367  Test-Deep-0.097.tar.gz
+61cb7357d39b173d1a29080079f471df  Test-Deep-0.098.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:53:44 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:53:44 -0400
Subject: rpms/perl-YAML-Syck/devel .cvsignore, 1.6, 1.7 perl-YAML-Syck.spec, 
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200709181453.l8IEriTH014057@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-YAML-Syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14002

Modified Files:
	.cvsignore perl-YAML-Syck.spec sources 
Log Message:
Update to 0.97.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Aug 2007 18:35:38 -0000	1.6
+++ .cvsignore	18 Sep 2007 14:53:11 -0000	1.7
@@ -1 +1 @@
-YAML-Syck-0.96.tar.gz
+YAML-Syck-0.97.tar.gz


Index: perl-YAML-Syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-YAML-Syck.spec	12 Aug 2007 18:35:38 -0000	1.7
+++ perl-YAML-Syck.spec	18 Sep 2007 14:53:11 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-YAML-Syck
-Version:        0.96
+Version:        0.97
 Release:        1%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
 License:        MIT
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.97-1
+- Update to 0.97.
+
 * Sun Aug 12 2007 Steven Pritchard <steve at kspei.com> 0.96-1
 - Update to 0.96.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Aug 2007 18:35:38 -0000	1.6
+++ sources	18 Sep 2007 14:53:11 -0000	1.7
@@ -1 +1 @@
-69d7526a845c014d92059f9e368c34d0  YAML-Syck-0.96.tar.gz
+14c5459f8a09e98f8d11e0367e489787  YAML-Syck-0.97.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:54:33 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 18 Sep 2007 10:54:33 -0400
Subject: rpms/koan/devel koan.spec,1.22,1.23
Message-ID: <200709181454.l8IEsXIJ014138@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14100

Modified Files:
	koan.spec 
Log Message:
Update specfile to fix EVR (thought I already did this?)




Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	10 Sep 2007 14:32:04 -0000	1.22
+++ koan.spec	18 Sep 2007 14:54:01 -0000	1.23
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.2
-Release: 1%{?dist}
+Version: 0.6.1
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -49,9 +49,6 @@
 
 %changelog
 
-* Mon Sep 04 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-1
-- Upstream changes (see CHANGELOG)
-
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:01:59 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 11:01:59 -0400
Subject: rpms/apr-util/F-7 apr-util-1.2.8-dbddso.patch, 1.3,
	1.4 apr-util.spec, 
	1.36, 1.37 apr_dbd_mysql.c, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <200709181501.l8IF1xhf020256@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224

Modified Files:
	apr-util-1.2.8-dbddso.patch apr-util.spec apr_dbd_mysql.c 
	sources 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
- update to 1.2.10


apr-util-1.2.8-dbddso.patch:

Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-util-1.2.8-dbddso.patch	23 Mar 2007 09:45:59 -0000	1.3
+++ apr-util-1.2.8-dbddso.patch	18 Sep 2007 15:01:55 -0000	1.4
@@ -229,7 +229,7 @@
  #if APU_HAVE_MYSQL
      DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
  #endif
-@@ -94,62 +92,68 @@
+@@ -94,64 +92,70 @@
  #if APU_HAVE_SOME_OTHER_BACKEND
      DRIVER_LOAD("firebird", apr_dbd_other_driver, pool);
  #endif
@@ -285,16 +285,18 @@
 +    pool = apr_hash_pool_get(drivers);
  
  #ifdef WIN32
-     sprintf(path, "apr_dbd_%s.dll", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
+ #elif defined(NETWARE)
+     apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
  #else
--    sprintf(path, "apr_dbd_%s.so", name);
+-    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
 +    apr_snprintf(path, sizeof path, APU_DSO_LIBDIR "/apr_dbd_%s.so", name);
  #endif
      rv = apr_dso_load(&dlhandle, path, pool);
      if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
          goto unlock;
      }
-     sprintf(path, "apr_dbd_%s_driver", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
 -    rv = apr_dso_sym((void*)driver, dlhandle, path);
 +    rv = apr_dso_sym(&symbol, dlhandle, path);
      if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */


Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- apr-util.spec	5 Apr 2007 16:10:00 -0000	1.36
+++ apr-util.spec	18 Sep 2007 15:01:55 -0000	1.37
@@ -3,12 +3,12 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.8
-Release: 7
+Version: 1.2.10
+Release: 1%{?dist}
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Source1: http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c
 Patch0: apr-util-1.2.2-exports.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
+- update to 1.2.10
+
 * Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
 - remove old Conflicts, doxygen BR (#225254)
 


Index: apr_dbd_mysql.c
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr_dbd_mysql.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_dbd_mysql.c	28 Feb 2007 12:52:44 -0000	1.1
+++ apr_dbd_mysql.c	18 Sep 2007 15:01:55 -0000	1.2
@@ -1,50 +1,19 @@
-/*
-         Copyright (c) 2003-7, WebThing Ltd and other contributors
- 
-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.  Alternatively, where this program
-is aggregated with the Apache APR-UTIL package version 1.2 or later,
-you can distribute and/or modify it under the terms of the Apache
-License 2.0 as published by the Apache Software Foundation.
- 
-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
-applicable 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.
-You may obtain a copy of the Apache License 2.0 at:
-http://www.apache.org/licenses/LICENSE-2.0
- 
-*/
-
-/* LICENSE NOTE
- *
- * The current GPL satisfies MySQL licensing terms without
- * invoking any exceptions.  ASF policy doesn't permit GPL
- * software to be distributed by apache.org, but this should
- * not be a problem for third-parties who wish to distribute
- * it alongside the APR and other Apache software.
- * 
- * It is updated to dual license after discussion with Debian
- * and taking into account MySQL's FOSS exception.
- * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
- * http://www.mysql.com/company/legal/licensing/foss-exception.html
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * MAINTAINERS
- *
- * This code was originally written by Nick Kew for MySQL 4.1.
- * and subsequently updated by others to support MySQL 5.0.
- * The current lead maintainer is Bojan Smojver, with others
- * contributing via the developer list at apr.apache.org.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
 #include "apu.h"
 #define HAVE_MYSQL_MYSQL_H
 
@@ -74,17 +43,9 @@
 
 struct apr_dbd_prepared_t {
     MYSQL_STMT* stmt;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int nargs;
-    int nvals;
-    apr_dbd_type_e *types;
-#endif
 };
 
 struct apr_dbd_transaction_t {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int mode;
-#endif
     int errnum;
     apr_dbd_t *handle;
 };
@@ -100,156 +61,12 @@
     MYSQL_RES *res;
     MYSQL_STMT *statement;
     MYSQL_BIND *bind;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    apr_pool_t *pool;
-#endif
 };
 struct apr_dbd_row_t {
     MYSQL_ROW row;
     apr_dbd_results_t *res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    unsigned long *len;
-#endif
-};
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-/* MySQL specific bucket for BLOB types */
-typedef struct apr_bucket_lob apr_bucket_lob;
-/**
- * A bucket referring to a MySQL BLOB
- */
-struct apr_bucket_lob {
-    /** Number of buckets using this memory */
-    apr_bucket_refcount  refcount;
-    /** The row this bucket refers to */
-    const apr_dbd_row_t *row;
-    /** The column this bucket refers to */
-    int col;
-    /** The pool into which any needed structures should
-     *  be created while reading from this bucket */
-    apr_pool_t *readpool;
 };
 
-static void lob_bucket_destroy(void *data);
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block);
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p);
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list);
-
-static const apr_bucket_type_t apr_bucket_type_lob = {
-    "LOB", 5, APR_BUCKET_DATA,
-    lob_bucket_destroy,
-    lob_bucket_read,
-    apr_bucket_setaside_notimpl,
-    apr_bucket_shared_split,
-    apr_bucket_shared_copy
-};
-
-static void lob_bucket_destroy(void *data)
-{
-    apr_bucket_lob *f = data;
-
-    if (apr_bucket_shared_destroy(f)) {
-        /* no need to destroy database objects here; it will get
-         * done automatically when the pool gets cleaned up */
-        apr_bucket_free(f);
-    }
-}
-
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block)
-{
-    apr_bucket_lob *a = e->data;
-    const apr_dbd_row_t *row = a->row;
-    apr_dbd_results_t *res = row->res;
-    int col = a->col;
-    apr_bucket *b = NULL;
-    int rv;
-    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
-    apr_off_t boffset = e->start;
-    MYSQL_BIND *bind = &res->bind[col];
-
-    *str = NULL;  /* in case we die prematurely */
-
-    /* fetch from offset if not at the beginning */
-    if (boffset > 0) {
-        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
-        if (rv != 0) {
-            return APR_EGENERAL;
-        }
-    }
-    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
-    *len = e->length - blength;
-    *str = bind->buffer;
-
-    /* allocate new buffer, since we used this one for the bucket */
-    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
-
-    /*
-     * Change the current bucket to refer to what we read,
-     * even if we read nothing because we hit EOF.
-     */
-    apr_bucket_pool_make(e, *str, *len, res->pool);
-
-    /* If we have more to read from the field, then create another bucket */
-    if (blength > 0) {
-        /* for efficiency, we can just build a new apr_bucket struct
-         * to wrap around the existing LOB bucket */
-        b = apr_bucket_alloc(sizeof(*b), e->list);
-        b->start  = boffset + *len;
-        b->length = blength;
-        b->data   = a;
-        b->type   = &apr_bucket_type_lob;
-        b->free   = apr_bucket_free;
-        b->list   = e->list;
-        APR_BUCKET_INSERT_AFTER(e, b);
-    }
-    else {
-        lob_bucket_destroy(a);
-    }
-
-    return APR_SUCCESS;
-}
-
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p)
-{
-    apr_bucket_lob *f;
-
-    f = apr_bucket_alloc(sizeof(*f), b->list);
-    f->row = row;
-    f->col = col;
-    f->readpool = p;
-
-    b = apr_bucket_shared_make(b, f, offset, len);
-    b->type = &apr_bucket_type_lob;
-
-    return b;
-}
-
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list)
-{
-    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
-    APR_BUCKET_INIT(b);
-    b->free = apr_bucket_free;
-    b->list = list;
-    return apr_bucket_lob_make(b, row, col, offset, len, p);
-}
-
-#endif
-
 static apr_status_t free_result(void *data)
 {
     mysql_free_result(data);
@@ -273,9 +90,6 @@
             }
             (*results)->random = seek;
             (*results)->statement = NULL;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-            (*results)->pool = pool;
-#endif
             if (seek) {
                 (*results)->res = mysql_store_result(sql->conn);
             }
@@ -289,27 +103,12 @@
         ret = mysql_errno(sql->conn);
     }
     
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
-{
-    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
-        return NULL;
-    }
-
-    return mysql_fetch_fields(res->res)[n].name;
-}
-#endif
-
 static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **row, int rownum)
 {
@@ -352,9 +151,6 @@
         }
         (*row)->row = r;
         (*row)->res = res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        (*row)->len = mysql_fetch_lengths(res->res);
-#endif
     }
     else {
         apr_pool_cleanup_run(pool, res->res, free_result);
@@ -412,160 +208,6 @@
 }
 #endif
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
-                                        apr_dbd_type_e type, void *data)
-{
-    if (row->res->statement) {
-        MYSQL_BIND *bind = &row->res->bind[n];
-        unsigned long len = *bind->length;
-
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return APR_EGENERAL;
-        }
-
-        if (*bind->is_null) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
-            *(char**)data = bind->buffer;
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_lob_create(row, n, 0, len,
-                                      row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    else {
-        if (row->row[n] == NULL) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *(char**)data = row->row[n];
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_pool_create(row->row[n], row->len[n],
-                                       row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    return 0;
-}
-#endif
-
 static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
 {
     return mysql_error(sql->conn);
@@ -582,11 +224,7 @@
         ret = mysql_errno(sql->conn);
     }
     *nrows = mysql_affected_rows(sql->conn);
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
@@ -607,467 +245,6 @@
     return APR_SUCCESS;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             int nargs, int nvals, apr_dbd_type_e *types,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    int ret;
-
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        (*statement)->nargs = nargs;
-        (*statement)->nvals = nvals;
-        (*statement)->types = types;
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
-                           const char **values, MYSQL_BIND *bind)
-{
-    int i, j;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_unsigned = 0;
-        bind[i].is_null = NULL;
-
-        if (values[j] == NULL) {
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-        }
-        else {
-            switch (statement->types[i]) {
-            case APR_DBD_TYPE_BLOB:
-            case APR_DBD_TYPE_CLOB:
-                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = atol(values[++j]);
-
-                /* skip table and column */
-                j += 2;
-                break;
-            default:
-                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = strlen(values[j]);
-                break;
-            }
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                     int *nrows, apr_dbd_prepared_t *statement,
-                                     MYSQL_BIND *bind)
-{
-    int ret;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            const char **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                      apr_dbd_results_t **res,
-                                      apr_dbd_prepared_t *statement,
-                                      int random, MYSQL_BIND *bind)
-{
-    int nfields, i;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            (*res)->pool = pool;
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                    }
-                    else {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    }
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             const char **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
-}
-
-static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
-                            const void **values, MYSQL_BIND *bind)
-{
-    void *arg;
-    int i, j;
-    apr_dbd_type_e type;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        arg = (void *)values[j];
-
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = NULL;
-
-        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UTINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_SHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_USHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_INT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UINT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONG:
-            if (sizeof(int) == sizeof(long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(int));
-                *(int*)bind[i].buffer = *(long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONG:
-            if (sizeof(unsigned int) == sizeof(unsigned long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
-                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            if (sizeof(long long) == sizeof(apr_int64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(long long));
-                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
-                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = strlen((const char *)arg);
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            bind[i].buffer = (void *)arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = *(apr_size_t*)values[++j];
-
-            /* skip table and column */
-            j += 2;
-            break;
-        case APR_DBD_TYPE_NULL:
-        default:
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-            break;
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
-                             int *nrows, apr_dbd_prepared_t *statement,
-                             const void **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                              apr_dbd_prepared_t *statement, va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              const void **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                               apr_dbd_results_t **res,
-                               apr_dbd_prepared_t *statement, int random,
-                               va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
-}
-#else
 static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
                              apr_dbd_prepared_t **statement)
@@ -1368,18 +545,12 @@
     }
     return ret;
 }
-#endif
 
 static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
 {
     int ret = -1;
     if (trans) {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        /* rollback on error or explicit rollback request */
-        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
-#else
         if (trans->errnum) {
-#endif
             trans->errnum = 0;
             ret = mysql_rollback(trans->handle->conn);
         }
@@ -1412,25 +583,6 @@
     return (*trans)->errnum;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode;
-}
-
-static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
-                                          int mode)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode = (mode & TXN_MODE_BITS);
-}
-#endif
-
 static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
 {
     static const char *const delims = " \r\n\t;|,";
@@ -1608,18 +760,6 @@
     dbd_mysql_pvselect,
     dbd_mysql_pquery,
     dbd_mysql_pselect
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    ,
-    dbd_mysql_get_name,
-    dbd_mysql_transaction_mode_get,
-    dbd_mysql_transaction_mode_set,
-    "?",
-    dbd_mysql_pvbquery,
-    dbd_mysql_pvbselect,
-    dbd_mysql_pbquery,
-    dbd_mysql_pbselect,
-    dbd_mysql_datum_get
-#endif
 };
 
 #endif


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Dec 2006 16:01:27 -0000	1.9
+++ sources	18 Sep 2007 15:01:55 -0000	1.10
@@ -1 +1 @@
-a2e2e54d65e9eae961f7171335cf2550  apr-util-1.2.8.tar.gz
+9277c21fe41065bd359db98c474aa998  apr-util-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:05:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 11:05:52 -0400
Subject: rpms/apr-util/F-7 apr-util.spec,1.37,1.38
Message-ID: <200709181505.l8IF5qKH020430@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20396

Modified Files:
	apr-util.spec 
Log Message:
- credit Bojan since this is a C&P



Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- apr-util.spec	18 Sep 2007 15:01:55 -0000	1.37
+++ apr-util.spec	18 Sep 2007 15:05:19 -0000	1.38
@@ -137,7 +137,7 @@
 
 %changelog
 * Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
-- update to 1.2.10
+- update to 1.2.10 (Bojan Smojver)
 
 * Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
 - remove old Conflicts, doxygen BR (#225254)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:08:23 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:08:23 -0400
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.23,1.24
Message-ID: <200709181508.l8IF8N7p020529@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20501

Modified Files:
	docbook-utils.spec 
Log Message:
fixed wrong source URL


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- docbook-utils.spec	24 May 2007 11:02:58 -0000	1.23
+++ docbook-utils.spec	18 Sep 2007 15:07:49 -0000	1.24
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -18,7 +18,7 @@
 BuildRequires: perl-SGMLSpm, openjade, docbook-style-dsssl
 
 BuildArch: noarch
-Source0: ftp://sources.redhat.com/pub/docbook-tols/new-trials/SOURCES/%{name}-%{version}.tar.gz
+Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
 
@@ -119,7 +119,10 @@
 %{_mandir}/*/docbook2dvi.*
 %{_mandir}/*/docbook2ps.*
 
-%changelog
+%changelog 
+* Tue Sep 18 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-9
+- fixed typo in Source URL
+
 * Mon May 21 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-8
 - Added more fixes for handling spaces in directory name
 - SGML_FILE variable is factored out of SGML_ARGUMENTS



From fedora-extras-commits at redhat.com  Tue Sep 18 15:08:32 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Tue, 18 Sep 2007 11:08:32 -0400
Subject: rpms/kernel/F-7 git-wireless-dev.patch, 1.24, 1.25 kernel-2.6.spec, 
	1.3341, 1.3342 linux-2.6-wireless-pending.patch, 1.2,
	1.3 linux-2.6-wireless.patch, 1.9,
	1.10 linux-2.6-iwlwifi-fw-name-compat.patch, 1.1, NONE
Message-ID: <200709181508.l8IF8WJc020602@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20526

Modified Files:
	git-wireless-dev.patch kernel-2.6.spec 
	linux-2.6-wireless-pending.patch linux-2.6-wireless.patch 
Removed Files:
	linux-2.6-iwlwifi-fw-name-compat.patch 
Log Message:
wireless updates

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/git-wireless-dev.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- git-wireless-dev.patch	30 Aug 2007 21:54:14 -0000	1.24
+++ git-wireless-dev.patch	18 Sep 2007 15:08:24 -0000	1.25
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-18 10:53:37.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -66,8 +67,9 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +329,9 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig linux-2.6.22.noarch/include/linux/mod_devicetable.h
+--- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-09-18 10:53:37.000000000 -0400
 @@ -333,4 +333,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID	0xffff
  #define PA_SVERSION_ANY_ID	0xffffffff
@@ -349,8 +352,9 @@
 +#define SSB_ANY_REV		0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -649,8 +653,9 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,396 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1048,8 +1053,9 @@
 +#endif /* CONFIG_SSB_SERIAL */
 +
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1255,8 +1261,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_EXTIF */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,46 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1304,8 +1311,9 @@
 +#endif /* CONFIG_SSB_DRIVER_MIPS */
 +
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,292 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1599,8 +1607,9 @@
 +
 +
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,106 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1708,8 +1717,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,424 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2135,8 +2145,9 @@
 +
 +
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2279,11 +2290,12 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:37:10.000000000 -0400
-@@ -539,6 +539,9 @@ struct ieee80211_hw {
- 	 * per-packet RC4 key with each TX frame when doing hwcrypto */
- #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:53:37.000000000 -0400
+@@ -563,6 +563,9 @@ struct ieee80211_hw {
+ 	 * specified in the device's EEPROM */
+ #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
  
 +	/* The device capable of supporting 11n */
 +#define IEEE80211_HW_SUPPORT_HT_MODE (1<<15)
@@ -2291,7 +2303,7 @@
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -691,8 +694,7 @@ struct ieee80211_ops {
+@@ -708,8 +711,7 @@ struct ieee80211_ops {
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -2301,7 +2313,7 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -752,8 +754,9 @@ struct ieee80211_ops {
+@@ -769,8 +771,9 @@ struct ieee80211_ops {
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -2313,7 +2325,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -769,6 +772,22 @@ struct ieee80211_ops {
+@@ -786,6 +789,22 @@ struct ieee80211_ops {
  	 * TSF synchronization. */
  	void (*reset_tsf)(struct ieee80211_hw *hw);
  
@@ -2336,8 +2348,9 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
---- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/iw_handler.h.orig linux-2.6.22.noarch/include/net/iw_handler.h
+--- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-09-18 10:53:37.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2353,8 +2366,9 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-08-30 17:37:10.000000000 -0400
[...90097 lines suppressed...]
++static void rs_clear(void *priv)
++{
++	return;
 +}
 +
++
 +static void *rs_alloc_sta(void *priv, gfp_t gfp)
 +{
 +	struct iwl_rate_scale_priv *rs_priv;
@@ -121750,11 +130388,6 @@
 +	IWL_DEBUG_RATE("leave\n");
 +}
 +
-+static void rs_clear(void *priv)
-+{
-+	IWL_DEBUG_RATE("NOP\n");
-+}
-+
 +/**
 + * rs_tx_status - Update rate control values based on Tx results
 + *
@@ -122249,8 +130882,7 @@
 +
 +	if (!local->rate_ctrl->ops->name ||
 +	    strcmp(local->rate_ctrl->ops->name, RS_NAME)) {
-+		IWL_WARNING("iwl-3945-rs not selected as rate control "
-+			    "aglo!\n");
++		IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");
 +		IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");
 +		return;
 +	}
@@ -122304,19 +130936,20 @@
 +		       iwl_rates[rs_priv->start_rate].plcp);
 +}
 +
-+void iwl_rate_control_register(void)
++void iwl_rate_control_register(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_register(&rs_ops);
 +}
 +
-+void iwl_rate_control_unregister(void)
++void iwl_rate_control_unregister(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,46 @@
 +/*
 + * Broadcom 43xx PCI-SSB bridge module
@@ -122364,8 +130997,9 @@
 +{
 +	ssb_pcihost_unregister(&b43_pci_bridge_driver);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Makefile
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,18 @@
 +# core
 +ssb-y					+= main.o scan.o
@@ -122385,8 +131019,9 @@
 +ssb-$(CONFIG_SSB_PCIHOST)		+= b43_pci_bridge.o
 +
 +obj-$(CONFIG_SSB)			+= ssb.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcmcia.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,271 @@
 +/*
 + * Sonics Silicon Backplane
@@ -122659,8 +131294,9 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/main.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,1162 @@
 +/*
 + * Sonics Silicon Backplane
@@ -123824,8 +132460,9 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -123931,8 +132568,9 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,223 @@
 +/*
 + * Sonics Silicon Backplane
@@ -124157,8 +132795,9 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/ssb_private.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,136 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -124296,8 +132935,9 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pci.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,740 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -125039,8 +133679,9 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,446 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125488,8 +134129,9 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Kconfig
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,117 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -125608,8 +134250,9 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/scan.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126024,8 +134667,9 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_extif.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,129 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126156,8 +134800,9 @@
 +				   mask, value);
 +}
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,576 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3341
retrieving revision 1.3342
diff -u -r1.3341 -r1.3342
--- kernel-2.6.spec	13 Sep 2007 22:21:49 -0000	1.3341
+++ kernel-2.6.spec	18 Sep 2007 15:08:25 -0000	1.3342
@@ -613,9 +613,8 @@
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
 Patch690: git-wireless-dev.patch
-Patch700: linux-2.6-iwlwifi-fw-name-compat.patch
-Patch701: linux-2.6-b43-module-alias.patch
-Patch702: linux-2.6-b43-use-old-fw.patch
+Patch700: linux-2.6-b43-module-alias.patch
+Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
 Patch711: linux-2.6-netdev-forcedeth-realtek-oui.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
@@ -1345,8 +1344,6 @@
 
 # Add wireless stack and driver updates from wireless-dev
 ApplyPatch git-wireless-dev.patch
-# temp compat patch for iwlwifi firmware filenames
-ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -2351,6 +2348,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.6 (official)
 - libata: add option to disable DMA on PATA devices

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-wireless-pending.patch	30 Aug 2007 21:54:14 -0000	1.2
+++ linux-2.6-wireless-pending.patch	18 Sep 2007 15:08:25 -0000	1.3
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:29:55.000000000 -0400
 @@ -1,7 +1,9 @@
  /*
 - * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -11,10 +12,49 @@
   *
   * 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
-@@ -192,13 +194,19 @@ struct ieee80211_tx_control {
+@@ -71,14 +73,13 @@ struct ieee80211_channel {
+ #define IEEE80211_RATE_SUPPORTED 0x00000010
+ #define IEEE80211_RATE_OFDM 0x00000020
+ #define IEEE80211_RATE_CCK 0x00000040
+-#define IEEE80211_RATE_TURBO 0x00000080
+ #define IEEE80211_RATE_MANDATORY 0x00000100
+ 
+ #define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+ #define IEEE80211_RATE_MODULATION(f) \
+ 	(f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+ 
+-/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
++/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
+  * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+  * configuration. */
+ struct ieee80211_rate {
+@@ -99,12 +100,10 @@ struct ieee80211_rate {
+ 
+ /* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+  * actually be both in 11b and 11g modes at the same time. */
+-enum {
++enum ieee80211_phymode {
+ 	MODE_IEEE80211A, /* IEEE 802.11a */
+ 	MODE_IEEE80211B, /* IEEE 802.11b only */
+-	MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+ 	MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+-	MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+ 
+ 	/* keep last */
+ 	NUM_IEEE80211_MODES
+@@ -165,7 +164,6 @@ struct ieee80211_low_level_stats {
+ /* Transmit control fields. This data structure is passed to low-level driver
+  * with each TX frame. The low-level driver is responsible for configuring
+  * the hardware to use given values (depending on what is supported). */
+-#define HW_KEY_IDX_INVALID -1
+ 
+ struct ieee80211_tx_control {
+ 	int tx_rate; /* Transmit rate, given as the hw specific value for the
+@@ -191,17 +189,21 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_REQUEUE		(1<<7)
  #define IEEE80211_TXCTL_FIRST_FRAGMENT	(1<<8) /* this is a first fragment of
  						* the frame */
- #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
 +#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
 +						  * using the through
 +						  * set_retry_limit configured
@@ -22,6 +62,8 @@
  	u32 flags;			       /* tx control flags defined
  						* above */
 -	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, .. */
++	u8 key_idx;		/* keyidx from hw->set_key(), undefined if
++				 * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
 +	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, ..
 +				 * This could be used when set_retry_limit
 +				 * is not implemented by the driver */
@@ -29,12 +71,78 @@
  	u8 antenna_sel_tx; 	/* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
 -	s8 key_idx;		/* -1 = do not encrypt, >= 0 keyidx from
 -				 * hw->set_key() */
-+	s8 key_idx;		/* HW_KEY_IDX_INVALID = do not encrypt,
-+				 * other values: keyidx from hw->set_key() */
  	u8 icv_len;		/* length of the ICV/MIC field in octets */
  	u8 iv_len;		/* length of the IV field in octets */
- 	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
-@@ -288,28 +296,10 @@ struct ieee80211_conf {
+-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+ 	u8 queue;		/* hardware queue to use for this frame;
+ 				 * 0 = highest, hw->queues-1 = lowest */
+ 	u8 sw_retry_attempt;	/* number of times hw has tried to
+@@ -219,22 +221,56 @@ struct ieee80211_tx_control {
+ 	int ifindex;	/* internal */
+ };
+ 
+-/* Receive status. The low-level driver should provide this information
+- * (the subset supported by hardware) to the 802.11 code with each received
+- * frame. */
++
++/**
++ * enum mac80211_rx_flags - receive flags
++ *
++ * These flags are used with the @flag member of &struct ieee80211_rx_status.
++ * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
++ *	Use together with %RX_FLAG_MMIC_STRIPPED.
++ * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
++ * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
++ * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
++ *	verification has been done by the hardware.
++ * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
++ *	If this flag is set, the stack cannot do any replay detection
++ *	hence the driver or hardware will have to do that.
++ */
++enum mac80211_rx_flags {
++	RX_FLAG_MMIC_ERROR	= 1<<0,
++	RX_FLAG_DECRYPTED	= 1<<1,
++	RX_FLAG_RADIOTAP	= 1<<2,
++	RX_FLAG_MMIC_STRIPPED	= 1<<3,
++	RX_FLAG_IV_STRIPPED	= 1<<4,
++};
++
++/**
++ * struct ieee80211_rx_status - receive status
++ *
++ * The low-level driver should provide this information (the subset
++ * supported by hardware) to the 802.11 code with each received
++ * frame.
++ * @mactime: MAC timestamp as defined by 802.11
++ * @freq: frequency the radio was tuned to when receiving this frame, in MHz
++ * @channel: channel the radio was tuned to
++ * @phymode: active PHY mode
++ * @ssi: signal strength when receiving this frame
++ * @signal: used as 'qual' in statistics reporting
++ * @noise: PHY noise when receiving this frame
++ * @antenna: antenna used
++ * @rate: data rate
++ * @flag: %RX_FLAG_*
++ */
+ struct ieee80211_rx_status {
+ 	u64 mactime;
+-	int freq; /* receive frequency in Mhz */
++	int freq;
+ 	int channel;
+ 	int phymode;
+ 	int ssi;
+-	int signal; /* used as qual in statistics reporting */
++	int signal;
+ 	int noise;
+ 	int antenna;
+ 	int rate;
+-#define RX_FLAG_MMIC_ERROR	(1<<0)
+-#define RX_FLAG_DECRYPTED	(1<<1)
+-#define RX_FLAG_RADIOTAP	(1<<2)
+ 	int flag;
+ };
+ 
+@@ -288,28 +324,10 @@ struct ieee80211_conf {
  	u8 power_level;			/* transmit power limit for current
  					 * regulatory domain; in dBm */
  	u8 antenna_max;			/* maximum antenna gain */
@@ -63,39 +171,69 @@
  };
  
  /**
-@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+@@ -402,40 +420,86 @@ struct ieee80211_if_conf {
  	struct ieee80211_tx_control *beacon_control;
  };
  
 -typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
 -ieee80211_key_alg;
-+typedef enum {
++/**
++ * enum ieee80211_key_alg - key algorithm
++ * @ALG_NONE: Unset key algorithm, will never be passed to the driver
++ * @ALG_WEP: WEP40 or WEP104
++ * @ALG_TKIP: TKIP
++ * @ALG_CCMP: CCMP (AES)
++ */
++typedef enum ieee80211_key_alg {
 +	ALG_NONE,
 +	ALG_WEP,
 +	ALG_TKIP,
 +	ALG_CCMP,
 +} ieee80211_key_alg;
  
-+/*
-+ * This flag indiciates that the station this key is being
-+ * configured for may use QoS. If your hardware cannot handle
-+ * that situation it should reject that key.
-+ */
-+#define IEEE80211_KEY_FLAG_WMM_STA	(1<<0)
  
- struct ieee80211_key_conf {
-+	/*
-+	 * To be set by the driver to the key index it would like to
-+	 * get in the ieee80211_tx_control.key_idx which defaults
-+	 * to HW_KEY_IDX_INVALID so that shouldn't be used.
-+	 */
[...4085 lines suppressed...]
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-09-18 10:29:46.000000000 -0400
 @@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
   */
  static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -24651,8 +25194,9 @@
  	}
  }
  EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -0,0 +1,961 @@
 +/*
 +
@@ -25615,8 +26159,9 @@
 +
 +module_init(if_cs_init);
 +module_exit(if_cs_exit);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-09-18 10:29:46.000000000 -0400
 @@ -1,52 +0,0 @@
 -#ifndef	__WLAN_THREAD_H_
 -#define	__WLAN_THREAD_H_
@@ -25670,8 +26215,9 @@
 -}
 -
 -#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-09-18 10:29:46.000000000 -0400
 @@ -38,7 +38,7 @@ struct bootcmdrespStr
  
  /* read callback private data */
@@ -25706,8 +26252,9 @@
 -int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
 -
  #endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-09-18 10:29:46.000000000 -0400
 @@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(s
  
  //      mutex_lock(&priv->mutex);
@@ -25741,8 +26288,9 @@
  
  	if (ret) {
  		ret = 0;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-09-18 10:29:46.000000000 -0400
 @@ -15,14 +15,9 @@ struct wlan_private;
  struct sk_buff;
  struct net_device;
@@ -25799,8 +26347,9 @@
 +int libertas_reset_device(wlan_private *priv);
  
  #endif				/* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-09-18 10:29:46.000000000 -0400
 @@ -67,6 +67,7 @@ struct rtl8187_priv {
  	struct rtl818x_csr *map;
  	void (*rf_init)(struct ieee80211_hw *);
@@ -25809,8 +26358,9 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:29:46.000000000 -0400
 @@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
  	int rvalue;
  	enum oid_num_t n = dwrq->flags;
@@ -25838,8 +26388,9 @@
  }
  
  void
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-09-18 10:29:46.000000000 -0400
 @@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
  	/* Alloc the cache */
  	for (i = 0; i < OID_NUM_LAST; i++) {
@@ -25855,8 +26406,9 @@
  		} else
  			priv->mib[i] = NULL;
  	}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-18 10:29:46.000000000 -0400
 @@ -63,11 +63,6 @@ config WAVELAN
  	  a Radio LAN (wireless Ethernet-like Local Area Network) using the
  	  radio frequencies 900 MHz and 2.4 GHz.
@@ -25991,8 +26543,9 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
  
  static void wl3501_online(struct net_device *dev)
@@ -26297,8 +26850,30 @@
  	if (link->open) {
  		wl3501_reset(dev);
  		netif_device_attach(dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:30:24.000000000 -0400
+@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm4
+ 		goto err_gpio_cleanup;
+ 	bcm43xx_radio_turn_on(bcm);
+ 	bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+-	dprintk(KERN_INFO PFX "Radio %s by hardware\n",
++	printk(KERN_INFO PFX "Radio %s by hardware\n",
+ 		(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
+ 
+ 	bcm43xx_write16(bcm, 0x03E6, 0x0000);
+@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(s
+ 	radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+ 	if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+ 		bcm->radio_hw_enable = radio_hw_enable;
+-		dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
++		printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ 		       (radio_hw_enable == 0) ? "disabled" : "enabled");
+ 		bcm43xx_leds_update(bcm, 0);
+ 	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c
 --- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-09-18 10:29:46.000000000 -0400
 @@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
  		goto final;
  	}
@@ -26362,8 +26937,9 @@
  		arlan_command(arlan_device[devnum], ARLAN_COMMAND_CLEAN_AND_RESET);
  
  	} else
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-09-18 10:29:46.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/wireless.h>
@@ -26381,8 +26957,9 @@
  	u16 infofid; /* MAC buffer id for info frame */
  	/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
  	 * txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
  {
  	int res, ret = 0;
@@ -26392,8 +26969,9 @@
  	local_info_t *local = iface->local;
  	tuple_t tuple;
  	cisparse_t *parse = NULL;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-09-18 10:29:46.000000000 -0400
 @@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
  	    local->hw_downloading)
  		return -ENODEV;
@@ -26463,8 +27041,9 @@
  	local = iface->local;
  
  	/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:29:46.000000000 -0400
 @@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
  static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
  				     size_t len)

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-wireless.patch	30 Aug 2007 21:54:14 -0000	1.9
+++ linux-2.6-wireless.patch	18 Sep 2007 15:08:25 -0000	1.10
@@ -1,5 +1,6 @@
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
 --- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -227,6 +227,17 @@ struct ieee80211_cts {
  #define WLAN_CAPABILITY_SHORT_SLOT_TIME	(1<<10)
  #define WLAN_CAPABILITY_DSSS_OFDM	(1<<13)
@@ -18,8 +19,9 @@
  /* Status codes */
  enum ieee80211_statuscode {
  	WLAN_STATUS_SUCCESS = 0,
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
 --- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 17:22:48.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -11,6 +11,44 @@
   * Copyright 2006 Johannes Berg <johannes at sipsolutions.net>
   */
@@ -65,8 +67,9 @@
  /* from net/wireless.h */
  struct wiphy;
  
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
 --- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -347,9 +347,16 @@ enum ieee80211_if_types {
   * @mac_addr: pointer to MAC address of the interface. This pointer is valid
   *	until the interface is removed (i.e. it cannot be used after
@@ -113,8 +116,9 @@
  /* Given an sk_buff with a raw 802.11 header at the data pointer this function
   * returns the 802.11 header length in bytes (not including encryption
   * headers). If the data in the sk_buff is too short to contain a valid 802.11
+diff -up linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c
 --- linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(st
  	}
  
@@ -132,8 +136,9 @@
  	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
  
  	/* Add encryption capability */
---- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-08-30 17:18:45.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-08-30 17:19:20.000000000 -0400
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-18 10:09:24.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-18 10:10:25.000000000 -0400
 @@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_
  			 */
  			dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
@@ -147,8 +152,9 @@
  			goto out;
  		} else {
  			mac->associnfo.associating = 0;
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c
 --- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-18 10:10:25.000000000 -0400
 @@ -456,18 +456,13 @@ void
  ieee80211softmac_add_network_locked(struct ieee80211softmac_device *mac,
  	struct ieee80211softmac_network *add_net)
@@ -208,8 +214,9 @@
  		if (softmac_net->essid.len == essid->len &&
  			!memcmp(softmac_net->essid.data, essid->data, essid->len))
  			return softmac_net;
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-18 10:10:25.000000000 -0400
 @@ -157,6 +157,8 @@ void ieee80211_if_set_type(struct net_de
  	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
  	int oldtype = sdata->type;
@@ -227,8 +234,9 @@
  		break;
  	default:
  		printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -27,20 +27,6 @@
  #include "aes_ccm.h"
  #include "debugfs_key.h"
@@ -739,8 +747,9 @@
  	(iw_handler) ieee80211_ioctl_siwrts,		/* SIOCSIWRTS */
  	(iw_handler) ieee80211_ioctl_giwrts,		/* SIOCGIWRTS */
  	(iw_handler) ieee80211_ioctl_siwfrag,		/* SIOCSIWFRAG */
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-18 10:10:25.000000000 -0400
 @@ -24,11 +24,10 @@ int ieee80211_rate_control_register(stru
  {
  	struct rate_control_alg *alg;
@@ -754,8 +763,9 @@
  	alg->ops = ops;
  
  	mutex_lock(&rate_ctrl_mutex);
+diff -up linux-2.6.22.noarch/net/mac80211/Makefile.orig linux-2.6.22.noarch/net/mac80211/Makefile
 --- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -13,6 +13,7 @@ mac80211-objs := \
  	ieee80211_iface.o \
  	ieee80211_rate.o \
@@ -764,8 +774,9 @@
  	tkip.o \
  	aes_ccm.o \
  	wme.o \
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-08-30 17:19:20.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/net/mac80211/regdomain.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,158 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -925,8 +936,9 @@
 +		channel_range = ieee80211_mkk_channels;
 +}
 +
+diff -up linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h
 --- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-18 10:10:25.000000000 -0400
 @@ -26,24 +26,16 @@
   * mess shall be deleted completely. */
  enum {
@@ -952,8 +964,9 @@
  	PRISM2_PARAM_TX_POWER_REDUCTION = 1022,
  	PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,
  	PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_common.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-18 10:10:25.000000000 -0400
 @@ -47,21 +47,16 @@ enum ieee80211_msg_type {
  	ieee80211_msg_normal = 0,
  	ieee80211_msg_tx_callback_ack = 1,
@@ -978,8 +991,9 @@
  struct ieee80211_msg_key_notification {
  	int tx_rx_count;
  	char ifname[IFNAMSIZ];
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-08-30 17:26:39.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 10:11:06.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <linux/compiler.h>
  #include <linux/bitmap.h>
@@ -1663,8 +1677,30 @@
  
  	return 0;
  }
+@@ -4981,7 +5259,7 @@ static void __exit ieee80211_exit(void)
+ }
+ 
+ 
+-module_init(ieee80211_init);
++subsys_initcall(ieee80211_init);
+ module_exit(ieee80211_exit);
+ 
+ MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
+--- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 10:11:06.000000000 -0400
+@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
+ 		skb_queue_head_init(&q->requeued[i]);
+ 		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+ 						 qd->handle);
+-		if (q->queues[i] == 0) {
++		if (!q->queues[i]) {
+ 			q->queues[i] = &noop_qdisc;
+ 			printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+ 		}
+diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
 --- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 10:11:06.000000000 -0400
 @@ -187,9 +187,13 @@ static void rate_control_simple_tx_statu
  		}
  #endif
@@ -1703,8 +1739,18 @@
  	}
  }
  
+@@ -425,7 +431,7 @@ static void __exit rate_control_simple_e
+ }
+ 
+ 
+-module_init(rate_control_simple_init);
++subsys_initcall(rate_control_simple_init);
+ module_exit(rate_control_simple_exit);
+ 
+ MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_i.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-18 10:10:25.000000000 -0400
 @@ -99,6 +99,12 @@ struct ieee80211_sta_bss {
  	int probe_resp;
  	unsigned long last_update;
@@ -1787,8 +1833,9 @@
  /* for wiphy privid */
  extern void *mac80211_wiphy_privid;
  
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-08-30 17:26:39.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-18 10:10:25.000000000 -0400
 @@ -25,7 +25,6 @@
  #include <linux/wireless.h>
  #include <linux/random.h>
@@ -2026,8 +2073,9 @@
  	return -1;
  }
  
+diff -up linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c
 --- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-18 10:10:25.000000000 -0400
 @@ -118,7 +118,7 @@ static ssize_t ieee80211_if_fmt_flags(
  			 sdata->u.sta.authenticated ? "AUTH\n" : "",
  			 sdata->u.sta.associated ? "ASSOC\n" : "",
@@ -2076,16 +2124,18 @@
  
  	return 0;
  }
+diff -up linux-2.6.22.noarch/net/wireless/Makefile.orig linux-2.6.22.noarch/net/wireless/Makefile
 --- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile	2007-08-30 17:21:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -1,4 +1,4 @@
  obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
  
 -cfg80211-y += core.o sysfs.o
 +cfg80211-y += core.o sysfs.o radiotap.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-08-30 17:21:49.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/net/wireless/radiotap.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,257 @@
 +/*
 + * Radiotap parser
@@ -2344,8 +2394,39 @@
 +	return -ENOENT;
 +}
 +EXPORT_SYMBOL(ieee80211_radiotap_iterator_next);
+diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
+--- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 10:11:06.000000000 -0400
+@@ -213,7 +213,7 @@ out_fail_notifier:
+ out_fail_sysfs:
+ 	return err;
+ }
+-module_init(cfg80211_init);
++subsys_initcall(cfg80211_init);
+ 
+ static void cfg80211_exit(void)
+ {
+diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
+--- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 10:11:06.000000000 -0400
+@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
+ 	cfg80211_dev_free(rdev);
+ }
+ 
++#ifdef CONFIG_HOTPLUG
+ static int wiphy_uevent(struct device *dev, char **envp,
+ 			int num_envp, char *buf, int size)
+ {
+ 	/* TODO, we probably need stuff here */
+ 	return 0;
+ }
++#endif
+ 
+ struct class ieee80211_class = {
+ 	.name = "ieee80211",
+diff -up linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig linux-2.6.22.noarch/drivers/net/wireless/airo.c
 --- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-18 10:10:25.000000000 -0400
 @@ -52,6 +52,8 @@
  
  #include "airo.h"
@@ -2961,8 +3042,9 @@
  			return -EIO;
  		return 0;
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-18 10:10:25.000000000 -0400
 @@ -49,8 +49,9 @@ void zd_chip_clear(struct zd_chip *chip)
  	ZD_MEMCLEAR(chip, sizeof(*chip));
  }
@@ -3143,8 +3225,9 @@
  		return 0;
  
  	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -3,7 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o
  zd1211rw-objs := zd_chip.o zd_ieee80211.o \
  		zd_mac.o zd_netdev.o \
@@ -3154,8 +3237,9 @@
  		zd_rf.o zd_usb.o zd_util.o
  
  ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-18 10:10:25.000000000 -0400
 @@ -26,7 +26,7 @@
  #define AL2210_RF			0x7
  #define MAXIM_NEW_RF			0x8
@@ -3217,8 +3301,9 @@
 +int zd_rf_init_uw2453(struct zd_rf *rf);
  
  #endif /* _ZD_RF_H */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-18 10:10:25.000000000 -0400
 @@ -608,6 +608,9 @@ enum {
  #define CR_ZD1211B_TXOP			CTL_REG(0x0b20)
  #define CR_ZD1211B_RETRY_MAX		CTL_REG(0x0b28)
@@ -3272,8 +3357,9 @@
  int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr);
  int zd_chip_switch_radio_on(struct zd_chip *chip);
  int zd_chip_switch_radio_off(struct zd_chip *chip);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-18 10:10:25.000000000 -0400
 @@ -21,6 +21,8 @@
  #include "zd_usb.h"
  #include "zd_chip.h"
@@ -3335,8 +3421,9 @@
 +	rf->patch_cck_gain = 1;
  	return 0;
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-18 10:10:25.000000000 -0400
 @@ -265,7 +265,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -3346,8 +3433,9 @@
  		dev_err(zd_chip_dev(chip),
  		       "RF2959 is currently not supported for ZD1211B"
  		       " devices\n");
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-18 10:10:25.000000000 -0400
 @@ -188,6 +188,7 @@ struct zd_usb {
  	struct zd_usb_rx rx;
  	struct zd_usb_tx tx;
@@ -3365,8 +3453,9 @@
  extern struct workqueue_struct *zd_workqueue;
  
  #endif /* _ZD_USB_H */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-18 10:10:25.000000000 -0400
 @@ -34,7 +34,7 @@ static const char * const rfs[] = {
  	[AL2210_RF]	= "AL2210_RF",
  	[MAXIM_NEW_RF]	= "MAXIM_NEW_RF",
@@ -3433,8 +3522,9 @@
  	rf->type = type;
  
  	r = zd_chip_lock_phy_regs(chip);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-08-30 17:19:20.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -3970,8 +4060,9 @@
 +	return 0;
 +}
 +
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-18 10:10:25.000000000 -0400
 @@ -189,7 +189,8 @@ int zd_mac_init(struct zd_mac *mac,
  		struct usb_interface *intf);
  void zd_mac_clear(struct zd_mac *mac);
@@ -3982,8 +4073,9 @@
  
  int zd_mac_open(struct net_device *netdev);
  int zd_mac_stop(struct net_device *netdev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-18 10:10:25.000000000 -0400
 @@ -473,7 +473,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -4001,8 +4093,9 @@
  	}
  
  	rf->switch_radio_off = al7230b_switch_radio_off;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-18 10:10:25.000000000 -0400
 @@ -15,7 +15,6 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
@@ -4214,8 +4307,9 @@
  	if (r) {
  		dev_dbg_f(&intf->dev,
  		         "couldn't initialize mac. Error number %d\n", r);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-18 10:10:25.000000000 -0400
 @@ -86,38 +86,46 @@ out:
  	return r;
  }
@@ -4337,8 +4431,9 @@
  			packet_length - frag_len : packet_length);
  
  	/*
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1719,9 +1719,6 @@ static int wlan_set_encodeext(struct net
  			pkey->type = KEY_TYPE_ID_TKIP;
  		} else if (alg == IW_ENCODE_ALG_CCMP) {
@@ -4349,8 +4444,9 @@
  		}
  
  		/* If WPA isn't enabled yet, do that now */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wl
  	ret = 0;
  
@@ -4359,8 +4455,9 @@
  	lbs_deb_leave_args(LBS_DEB_RX, "ret %d", ret);
  	return ret;
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-18 10:10:25.000000000 -0400
 @@ -613,6 +613,7 @@ static int wlan_service_main_thread(void
  
  	init_waitqueue_entry(&wait, current);
@@ -4369,8 +4466,9 @@
  	for (;;) {
  		lbs_deb_thread( "main-thread 111: intcounter=%d "
  		       "currenttxskb=%p dnld_sent=%d\n",
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-18 10:10:25.000000000 -0400
 @@ -240,7 +240,7 @@ static int wlan_cmd_802_11_enable_rsn(wl
  		if (*enable)
  			penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
@@ -4380,8 +4478,9 @@
  	}
  
  	lbs_deb_leave(LBS_DEB_CMD);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1768,7 +1768,8 @@ static int ipw2100_up(struct ipw2100_pri
  
  		if (priv->stop_rf_kill) {
@@ -4443,8 +4542,9 @@
  			break;
  		default:
  			timeout = timeout_duration[level - 1] / 1000;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-18 10:10:25.000000000 -0400
 @@ -87,7 +87,6 @@ static struct pci_driver prism54_driver 
  	.remove = prism54_remove,
  	.suspend = prism54_suspend,
@@ -4453,8 +4553,9 @@
  };
  
  /******************************************************************************
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev,
  	islpci_private *priv = netdev_priv(ndev);
  	struct islpci_acl *acl = &priv->acl;
@@ -4528,8 +4629,9 @@
  		kfree(bss);
  	}
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-18 10:10:25.000000000 -0400
 @@ -70,7 +70,7 @@
  #define VQ
  #endif
@@ -4611,8 +4713,9 @@
  		goto none;
  	}
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1011,7 +1011,7 @@ static inline void wl3501_md_ind_interru
  	} else {
  		skb->dev = dev;
@@ -4622,8 +4725,111 @@
  		wl3501_receive(this, skb->data, pkt_len);
  		skb_put(skb, pkt_len);
  		skb->protocol	= eth_type_trans(skb, dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:25:25.000000000 -0400
+@@ -3183,6 +3183,9 @@ static void bcm43xx_periodic_work_handle
+ 	unsigned long orig_trans_start = 0;
+ 
+ 	mutex_lock(&bcm->mutex);
++	/* keep from doing and rearming periodic work if shutting down */
++	if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
++		goto unlock_mutex;
+ 	if (unlikely(bcm->periodic_state % 60 == 0)) {
+ 		/* Periodic work will take a long time, so we want it to
+ 		 * be preemtible.
+@@ -3228,14 +3231,10 @@ static void bcm43xx_periodic_work_handle
+ 	mmiowb();
+ 	bcm->periodic_state++;
+ 	spin_unlock_irqrestore(&bcm->irq_lock, flags);
++unlock_mutex:
+ 	mutex_unlock(&bcm->mutex);
+ }
+ 
+-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
+-{
+-	cancel_rearming_delayed_work(&bcm->periodic_work);
+-}
+-
+ void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
+ {
+ 	struct delayed_work *work = &bcm->periodic_work;
+@@ -3285,6 +3284,14 @@ static int bcm43xx_rng_init(struct bcm43
+ 	return err;
+ }
+ 
++void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
++{
++	/* The system must be unlocked when this routine is entered.
++	 * If not, the next 2 steps may deadlock */
++	cancel_work_sync(&bcm->restart_work);
++	cancel_rearming_delayed_work(&bcm->periodic_work);
++}
++
+ static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
+ {
+ 	int ret = 0;
+@@ -3321,7 +3328,12 @@ static void bcm43xx_free_board(struct bc
+ {
+ 	bcm43xx_rng_exit(bcm);
+ 	bcm43xx_sysfs_unregister(bcm);
+-	bcm43xx_periodic_tasks_delete(bcm);
++
++	mutex_lock(&(bcm)->mutex);
++	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
++	mutex_unlock(&(bcm)->mutex);
++
++	bcm43xx_cancel_work(bcm);
+ 
+ 	mutex_lock(&(bcm)->mutex);
+ 	bcm43xx_shutdown_all_wireless_cores(bcm);
+@@ -4018,7 +4030,7 @@ static int bcm43xx_net_stop(struct net_d
+ 	err = bcm43xx_disable_interrupts_sync(bcm);
+ 	assert(!err);
+ 	bcm43xx_free_board(bcm);
+-	flush_scheduled_work();
++	bcm43xx_cancel_work(bcm);
+ 
+ 	return 0;
+ }
+@@ -4150,9 +4162,9 @@ static void bcm43xx_chip_reset(struct wo
+ 	struct bcm43xx_phyinfo *phy;
+ 	int err = -ENODEV;
+ 
++	bcm43xx_cancel_work(bcm);
+ 	mutex_lock(&(bcm)->mutex);
+ 	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
+-		bcm43xx_periodic_tasks_delete(bcm);
+ 		phy = bcm43xx_current_phy(bcm);
+ 		err = bcm43xx_select_wireless_core(bcm, phy->type);
+ 		if (!err)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c	2007-09-18 10:11:13.000000000 -0400
+@@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_stor
+ 		goto out;
+ 	}
+ 
+-	bcm43xx_periodic_tasks_delete(bcm);
++	bcm43xx_cancel_work(bcm);
+ 	mutex_lock(&(bcm)->mutex);
+ 	err = bcm43xx_select_wireless_core(bcm, phytype);
+ 	if (!err)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h	2007-09-18 10:11:13.000000000 -0400
+@@ -122,7 +122,7 @@ void bcm43xx_wireless_core_reset(struct 
+ void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
+ void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
+ 
+-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm);
++void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
+ void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
+ 
+ void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400
 @@ -326,7 +326,6 @@ static int ap_control_proc_read(char *pa
  	char *p = page;
  	struct ap_data *ap = (struct ap_data *) data;
@@ -4748,8 +4954,9 @@
  		if (sta->ap)
  			hostap_wds_link_oper(local, sta->addr, WDS_ADD);
  	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-18 10:10:25.000000000 -0400
 @@ -1,8 +1,6 @@
  #ifndef HOSTAP_CONFIG_H
  #define HOSTAP_CONFIG_H
@@ -4759,8 +4966,9 @@
  /* In the previous versions of Host AP driver, support for user space version
   * of IEEE 802.11 management (hostapd) used to be disabled in the default
   * configuration. From now on, support for hostapd is always included and it is
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-18 10:10:25.000000000 -0400
 @@ -20,7 +20,6 @@
  #include "hostap_wlan.h"
  
@@ -4801,8 +5009,9 @@
  }
  
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:10:25.000000000 -0400
 @@ -22,7 +22,6 @@
  #include "hostap_wlan.h"
  
@@ -4834,8 +5043,9 @@
  }
  
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-18 10:10:25.000000000 -0400
 @@ -37,7 +37,6 @@
  MODULE_AUTHOR("Jouni Malinen");
  MODULE_DESCRIPTION("Host AP common routines");
@@ -4844,8 +5054,9 @@
  
  #define TX_TIMEOUT (2 * HZ)
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct ne
  	local = iface->local;
  
@@ -4855,8 +5066,9 @@
  	snprintf(info->fw_version, sizeof(info->fw_version) - 1,
  		 "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
  		 (local->sta_fw_ver >> 8) & 0xff,
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -23,7 +23,6 @@
  #include "hostap_wlan.h"
  
@@ -4898,8 +5110,57 @@
  }
  
  
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-08-30 17:21:26.000000000 -0400
+diff -up linux-2.6.22.noarch/fs/compat_ioctl.c.orig linux-2.6.22.noarch/fs/compat_ioctl.c
+--- linux-2.6.22.noarch/fs/compat_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-18 10:11:13.000000000 -0400
+@@ -2306,8 +2306,10 @@ static int do_wireless_ioctl(unsigned in
+ 	struct iwreq __user *iwr_u;
+ 	struct iw_point __user *iwp;
+ 	struct compat_iw_point __user *iwp_u;
+-	compat_caddr_t pointer;
++	compat_caddr_t pointer_u;
++	void __user *pointer;
+ 	__u16 length, flags;
++	int ret;
+ 
+ 	iwr_u = compat_ptr(arg);
+ 	iwp_u = (struct compat_iw_point __user *) &iwr_u->u.data;
+@@ -2325,17 +2327,29 @@ static int do_wireless_ioctl(unsigned in
+ 			   sizeof(iwr->ifr_ifrn.ifrn_name)))
+ 		return -EFAULT;
+ 
+-	if (__get_user(pointer, &iwp_u->pointer) ||
++	if (__get_user(pointer_u, &iwp_u->pointer) ||
+ 	    __get_user(length, &iwp_u->length) ||
+ 	    __get_user(flags, &iwp_u->flags))
+ 		return -EFAULT;
+ 
+-	if (__put_user(compat_ptr(pointer), &iwp->pointer) ||
++	if (__put_user(compat_ptr(pointer_u), &iwp->pointer) ||
+ 	    __put_user(length, &iwp->length) ||
+ 	    __put_user(flags, &iwp->flags))
+ 		return -EFAULT;
+ 
+-	return sys_ioctl(fd, cmd, (unsigned long) iwr);
++	ret = sys_ioctl(fd, cmd, (unsigned long) iwr);
++
++	if (__get_user(pointer, &iwp->pointer) ||
++	    __get_user(length, &iwp->length) ||
++	    __get_user(flags, &iwp->flags))
++		return -EFAULT;
++
++	if (__put_user(ptr_to_compat(pointer), &iwp_u->pointer) ||
++	    __put_user(length, &iwp_u->length) ||
++	    __put_user(flags, &iwp_u->flags))
++		return -EFAULT;
++
++	return ret;
+ }
+ 
+ /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
+diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,59 @@
 +How to use packet injection with mac80211
 +=========================================
@@ -4960,8 +5221,9 @@
 +http://penumbra.warmcat.com/_twk/tiki-index.php?page=packetspammer
 +
 +Andy Green <andy at warmcat.com>
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-08-30 17:21:26.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,152 @@
 +How to use radiotap headers
 +===========================


--- linux-2.6-iwlwifi-fw-name-compat.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 15:09:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 11:09:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.58,1.59
Message-ID: <200709181509.l8IF9E4t020690@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- policy-20070703.patch	18 Sep 2007 14:45:04 -0000	1.58
+++ policy-20070703.patch	18 Sep 2007 15:09:11 -0000	1.59
@@ -10634,7 +10634,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-17 16:37:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-18 11:07:20.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -10694,7 +10694,7 @@
  	userdom_shell_domtrans_sysadm(init_t)
 +',`
 +	optional_policy(`
-+		unconfined_shell_domtrans_sysadm(init_t)
++		unconfined_shell_domtrans(init_t)
 +	')
  ')
  
@@ -10827,7 +10827,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
 @@ -65,11 +65,12 @@
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -10860,7 +10860,7 @@
  /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # vmware 
-@@ -284,3 +289,9 @@
+@@ -284,3 +289,8 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -10868,7 +10868,6 @@
 +/usr/lib64/mozilla/plugins/libvlcplugin.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/var/cache/ldconfig(/.*)?		    	gen_context(system_u:object_r:ldconfig_cache_t,s0)
-+/usr/lib/libtheora\.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)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400



From fedora-extras-commits at redhat.com  Tue Sep 18 15:12:58 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:12:58 -0400
Subject: rpms/pidgin/F-7 .cvsignore, 1.8, 1.9 pidgin.spec, 1.22, 1.23 sources,
	1.8, 1.9
Message-ID: <200709181512.l8IFCw2Z020950@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20917

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Aug 2007 20:22:31 -0000	1.8
+++ .cvsignore	18 Sep 2007 15:12:26 -0000	1.9
@@ -1 +1 @@
-pidgin-2.1.1.tar.bz2
+pidgin-2.2.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pidgin.spec	20 Aug 2007 20:22:31 -0000	1.22
+++ pidgin.spec	18 Sep 2007 15:12:26 -0000	1.23
@@ -28,9 +28,9 @@
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.1.1
+Version:	2.2.0
 Release:	1%{?dist}
-License:	GPL
+License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -442,6 +442,7 @@
 %{_libdir}/libpurple.so.*
 %{_datadir}/pixmaps/purple/
 %{_datadir}/sounds/purple/
+%{_datadir}/purple/ca-certs/
 %{_sysconfdir}/purple/
 %if %{dbus_integration}
 %{_bindir}/purple-client-example
@@ -495,6 +496,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-0
+- 2.2.0
+
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1
 - 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Aug 2007 20:22:31 -0000	1.8
+++ sources	18 Sep 2007 15:12:26 -0000	1.9
@@ -1 +1 @@
-eb29fecb2f3a6d4790f47ce8e658c07c  pidgin-2.1.1.tar.bz2
+d71cd4de6ef1459ba9b504d0c06d8d04  pidgin-2.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:14:23 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:14:23 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.48,1.49
Message-ID: <200709181514.l8IFENQG021042@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/gnome-bluetooth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21004

Modified Files:
	gnome-bluetooth.spec 
Log Message:
fixed wrong Source URL


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-bluetooth.spec	23 Aug 2007 12:29:06 -0000	1.48
+++ gnome-bluetooth.spec	18 Sep 2007 15:13:50 -0000	1.49
@@ -1,12 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
 #Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
-Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.7/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.9/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
@@ -131,6 +131,9 @@
 %{_libdir}/libgnomebt.so
 
 %changelog
+* Tue Sep 18 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.1-3
+- fixed wrong source URL
+
 * Thu Aug 23 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.1-2
 - rebuilt for F8
 - changed license tag to GPLv2 and LGPLv2+



From fedora-extras-commits at redhat.com  Tue Sep 18 15:15:58 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 11:15:58 -0400
Subject: rpms/dnsmasq/devel .cvsignore, 1.12, 1.13 dnsmasq.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <200709181515.l8IFFwOV021114@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041

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

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-1
- Finalized upstream release
- Removing URLs from patch lines (CVS is the authoritative source)
- Added more magic to make spinning rc/test packages more seamless

(thanks to Kevin Fenzi for inspiring the latter two ;-)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Aug 2007 21:40:07 -0000	1.12
+++ .cvsignore	18 Sep 2007 15:15:26 -0000	1.13
@@ -1 +1 @@
-dnsmasq-2.40rc2.tar.gz
+dnsmasq-2.40.tar.gz


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dnsmasq.spec	27 Aug 2007 21:40:07 -0000	1.21
+++ dnsmasq.spec	18 Sep 2007 15:15:26 -0000	1.22
@@ -1,17 +1,20 @@
-%define extraversion rc2
+#%define extrapath release-candidates/
+#%define extrapath test-releases/
+#%define extraversion rc2
+#%define extraversion test2
 
 Name:           dnsmasq
 Version:        2.40
-Release:        0.1.%{extraversion}%{?dist}
+Release:        1%{extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://www.thekelleys.org.uk/dnsmasq/
-Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}%{?extraversion}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
-Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
+Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
+Patch0:         %{name}-2.33-initscript.patch
+Patch1:         %{name}-2.33-enable-dbus.patch
+Patch2:         %{name}-2.35-conf-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -94,6 +97,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-1
+- Finalized upstream release
+- Removing URLs from patch lines (CVS is the authoritative source)
+- Added more magic to make spinning rc/test packages more seamless
+
 * Sun Aug 26 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-0.1.rc2
 - New upstream release candidate (feature-frozen), thanks Simon!
 - License clarification


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Aug 2007 21:40:07 -0000	1.12
+++ sources	18 Sep 2007 15:15:26 -0000	1.13
@@ -1 +1 @@
-45b3ca53556e99b1edaef2142fb0e306  dnsmasq-2.40rc2.tar.gz
+91b6063ae81146b9d70b4381b2f3e44f  dnsmasq-2.40.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:18:48 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:18:48 -0400
Subject: rpms/libbtctl/devel libbtctl.spec,1.48,1.49
Message-ID: <200709181518.l8IFImN9021186@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/libbtctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21135

Modified Files:
	libbtctl.spec 
Log Message:
Fixed wrong Source URL


Index: libbtctl.spec
===================================================================
RCS file: /cvs/extras/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libbtctl.spec	23 Aug 2007 08:13:18 -0000	1.48
+++ libbtctl.spec	18 Sep 2007 15:18:16 -0000	1.49
@@ -8,11 +8,11 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
-Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.8/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.9/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 0:2.57, bluez-libs-devel, glib2-devel, gtk-doc
@@ -102,6 +102,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.0-3
+- fixed wrong Source URL 
+
 * Thu Aug 23 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.0-2
 - rebuilt for F8
 - changed License tag to GPL+



From fedora-extras-commits at redhat.com  Tue Sep 18 15:27:49 2007
From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot))
Date: Tue, 18 Sep 2007 11:27:49 -0400
Subject: rpms/pidgin/devel pidgin-2.2.0-fix-proxy-settings.patch, NONE,
	1.1 pidgin-2.2.0-fix-status-scores.patch, NONE,
	1.1 pidgin-2.2.0-plug-more-memleaks.patch, NONE,
	1.1 pidgin-2.2.0-plug_memleaks.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 pidgin.spec, 1.32, 1.33 sources, 1.8, 1.9
Message-ID: <200709181527.l8IFRnTS022994@cvs-int.fedora.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22911

Modified Files:
	.cvsignore pidgin.spec sources 
Added Files:
	pidgin-2.2.0-fix-proxy-settings.patch 
	pidgin-2.2.0-fix-status-scores.patch 
	pidgin-2.2.0-plug-more-memleaks.patch 
	pidgin-2.2.0-plug_memleaks.patch 
Log Message:
-2.2.0
- License clarification
- Backport patches to fix memory leaks
- Backport patches to fix proxy settings & status scores



pidgin-2.2.0-fix-proxy-settings.patch:

--- NEW FILE pidgin-2.2.0-fix-proxy-settings.patch ---
-----------------------------------------------------------------
Revision: 6be36979d022284283217c2a32f2b812740cbbf3
Ancestor: 81e26f1e56d65a68394405ff0727feba9206ff6f
Author: datallah at pidgin.im
Date: 2007-09-14T17:55:05
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c pidgin/gtkprefs.c

ChangeLog: 

Fix proxy settings to be loaded correctly when libpurple is initialized.  This was broken because it relied on the prefs being loaded after proxy initialization so that the pref callbacks would be triggered and I changed the prefs loading to happen right at the beginning to fix other issues. Fixes #3092.

============================================================
--- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
+++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
@@ -400,7 +400,7 @@ socket_ready_cb(gpointer data, gint sour
  	 */
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
-	
+
 	purple_debug_info("proxy", "Connected to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
 		proxy_pref_cb, NULL);
+
+	/* Load the initial proxy settings */
+	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
+	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
+	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
+	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
+	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
 }
 
 void
============================================================
--- pidgin/gtkprefs.c	fee039ede95c6ae3460bcf222f60305eb0bd2671
+++ pidgin/gtkprefs.c	5a7f1837f163b8d345b590d1509604d30e3c6c1c
@@ -1093,7 +1093,7 @@ proxy_changed_cb(const char *name, Purpl
 	const char *proxy = value;
 
 	if (strcmp(proxy, "none") && strcmp(proxy, "envvar"))
-	        gtk_widget_show_all(frame);
+		gtk_widget_show_all(frame);
 	else
 		gtk_widget_hide(frame);
 }

pidgin-2.2.0-fix-status-scores.patch:

--- NEW FILE pidgin-2.2.0-fix-status-scores.patch ---
-----------------------------------------------------------------
Revision: 240d37f3b465527200f862ff3c0da77618ae32ae
Ancestor: 6be36979d022284283217c2a32f2b812740cbbf3
Author: datallah at pidgin.im
Date: 2007-09-14T18:26:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c libpurple/status.c

ChangeLog: 

Apply a similar fix to the proxy prefs loading fix to the status scores.

============================================================
--- libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
+++ libpurple/proxy.c	dcb73f3b56ee37fd1b03d306be342bce5167037f
@@ -1994,11 +1994,11 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 
 	/* Load the initial proxy settings */
-	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
-	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
-	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
-	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
-	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
+	purple_prefs_trigger_callback("/purple/proxy/type");
+	purple_prefs_trigger_callback("/purple/proxy/host");
+	purple_prefs_trigger_callback("/purple/proxy/port");
+	purple_prefs_trigger_callback("/purple/proxy/username");
+	purple_prefs_trigger_callback("/purple/proxy/password");
 }
 
 void
============================================================
--- libpurple/status.c	1eb4a9526f9b26fa096f6ff8c8205f092b126b1e
+++ libpurple/status.c	a0e82882e37ae83691ee52bc46682db953f7cf96
@@ -1668,6 +1668,14 @@ purple_status_init(void)
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
+
+	purple_prefs_trigger_callback("/purple/status/scores/offline");
+	purple_prefs_trigger_callback("/purple/status/scores/available");
+	purple_prefs_trigger_callback("/purple/status/scores/invisible");
+	purple_prefs_trigger_callback("/purple/status/scores/away");
+	purple_prefs_trigger_callback("/purple/status/scores/extended_away");
+	purple_prefs_trigger_callback("/purple/status/scores/idle");
+	purple_prefs_trigger_callback("/purple/status/scores/offline_msg");
 }
 
 void

pidgin-2.2.0-plug-more-memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug-more-memleaks.patch ---
-----------------------------------------------------------------
Revision: 41389df89a4a6a007d41cec33e33043cd41ea159
Ancestor: 326d6e6c8c6a955cdba84f1f802fc21ec3e6b662
Author: datallah at pidgin.im
Date: 2007-09-17T16:24:24
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

more leak fixes.

============================================================
--- libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
+++ libpurple/protocols/jabber/message.c	3bc876da8fe16d41770af8d980dce8457b3ac61a
@@ -41,7 +41,10 @@ void jabber_message_free(JabberMessage *
 	g_free(jm->body);
 	g_free(jm->xhtml);
 	g_free(jm->password);
+	g_free(jm->error);
+	g_free(jm->thread_id);
 	g_list_free(jm->etc);
+	g_list_free(jm->eventitems);
 
 	g_free(jm);
 }

pidgin-2.2.0-plug_memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug_memleaks.patch ---
-----------------------------------------------------------------
Revision: db4583bc475b46b7cb9baa38229f12473d331870
Ancestor: 73d2587302ffbbe62f6b7f3e745508c0687813ba
Author: sadrul at pidgin.im
Date: 2007-09-15T18:27:01
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c

ChangeLog: 

Plug some memory leaks.

============================================================
--- libpurple/protocols/jabber/adhoccommands.c	d0b52a470cdc4c95503037ba92f51f87e61bdd10
+++ libpurple/protocols/jabber/adhoccommands.c	1f8c9a282612f146d5e43e994629da3817e88f48
@@ -151,8 +151,11 @@ static void jabber_adhoc_parse(JabberStr
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 		
-		if(note)
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL);
+		if(note) {
+			char *data = xmlnode_get_data(note);
+			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			g_free(data);
+		}
 		
 		if(xdata)
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
============================================================
--- libpurple/protocols/jabber/buddy.c	6fee8dda0f8e37a98fab4a18606447fa29792fd5
+++ libpurple/protocols/jabber/buddy.c	490b348e2662e107a450a4e9b08db1437c260d03
@@ -1455,10 +1455,13 @@ static void do_buddy_avatar_update_data(
 		return;
 	
 	img = purple_base64_decode(b64data, &size);
-	if(!img)
+	if(!img) {
+		g_free(b64data);
 		return;
+	}
 	
 	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
 }
 
 void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
============================================================
--- libpurple/protocols/jabber/jabber.c	8211a80fdca963e6b51e9a4a9d5b096225a57711
+++ libpurple/protocols/jabber/jabber.c	121e708c2e28ec3ff0da92cbf9e82a89f8d1a3b1
@@ -813,7 +813,7 @@ jabber_register_cancel_cb(JabberRegister
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 		jabber_connection_schedule_close(cbdata->js);
-}
+	}
 	g_free(cbdata->who);
 	g_free(cbdata);
 }
@@ -882,12 +882,12 @@ void jabber_register_parse(JabberStream 
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
-				if(js->registration) {
-					js->gc->wants_to_die = TRUE;
-					if(account->registration_cb) /* succeeded, but we have no login info */
-						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
-					jabber_connection_schedule_close(js);
-				}
+					if(js->registration) {
+						js->gc->wants_to_die = TRUE;
+						if(account->registration_cb) /* succeeded, but we have no login info */
+							(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+						jabber_connection_schedule_close(js);
+					}
 					return;
 				}
 			}
@@ -987,14 +987,14 @@ void jabber_register_parse(JabberStream 
 		purple_request_field_group_add_field(group, field);
 	}
 
-		if((y = xmlnode_get_child(query, "instructions")))
-			instructions = xmlnode_get_data(y);
+	if((y = xmlnode_get_child(query, "instructions")))
+		instructions = xmlnode_get_data(y);
 	else if(registered)
 		instructions = g_strdup(_("Please fill out the information below "
 					"to change your account registration."));
-		else
-			instructions = g_strdup(_("Please fill out the information below "
-						"to register your new account."));
+	else
+		instructions = g_strdup(_("Please fill out the information below "
+					"to register your new account."));
 
 	cbdata = g_new0(JabberRegisterCBData, 1);
 	cbdata->js = js;
@@ -1019,8 +1019,8 @@ void jabber_register_parse(JabberStream 
 		g_free(title);
 	}
 
-		g_free(instructions);
-	}
+	g_free(instructions);
+}
 
 void jabber_register_start(JabberStream *js)
 {
============================================================
--- libpurple/protocols/jabber/message.c	309b575a8bd728be0fb2b41edf1362c2911b8367
+++ libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
@@ -324,7 +324,7 @@ void jabber_message_parse(JabberStream *
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-	else if(!strcmp(type, "chat"))
+		else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
============================================================
--- libpurple/protocols/jabber/presence.c	64aa78ce207c12bf4c35e137cfa344ba6b0e9926
+++ libpurple/protocols/jabber/presence.c	2b25212d8c6b6df2aeef8dd484660bff573c3511
@@ -192,16 +192,11 @@ void jabber_presence_send(PurpleAccount 
 		jabber_tune_set(js->gc, &tuneinfo);
 		
 		/* update old values */
-		if(js->old_artist)
-			g_free(js->old_artist);
-		if(js->old_title)
-			g_free(js->old_title);
-		if(js->old_source)
-			g_free(js->old_source);
-		if(js->old_uri)
-			g_free(js->old_uri);
-		if(js->old_track)
-			g_free(js->old_track);
+		g_free(js->old_artist);
+		g_free(js->old_title);
+		g_free(js->old_source);
+		g_free(js->old_uri);
+		g_free(js->old_track);
 		js->old_artist = g_strdup(artist);
 		js->old_title = g_strdup(title);
 		js->old_source = g_strdup(source);
============================================================
--- libpurple/protocols/jabber/usernick.c	5817ece1551b32a06a815751ec2d0c6e73fce836
+++ libpurple/protocols/jabber/usernick.c	e0e09357277521664d7f14ecf84033d6e84aa564
@@ -33,7 +33,7 @@ static void jabber_nick_cb(JabberStream 
 	xmlnode *item = xmlnode_get_child(items, "item");
 	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	xmlnode *nick;
-	const char *nickname = NULL;
+	char *nickname = NULL;
 	
 	/* ignore the tune of people not on our buddy list */
 	if (!buddy || !item)
@@ -43,8 +43,8 @@ static void jabber_nick_cb(JabberStream 
 	if (!nick)
 		return;
 	nickname = xmlnode_get_data(nick);
-
 	serv_got_alias(js->gc, from, nickname);
+	g_free(nickname);
 }
 
 static void do_nick_set(JabberStream *js, const char *nick) {
@@ -64,7 +64,7 @@ static void do_nick_got_own_nick_cb(Jabb
 }
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
-	const char *oldnickname = NULL;
+	char *oldnickname = NULL;
 	xmlnode *item = xmlnode_get_child(items,"item");
 	
 	if(item) {
@@ -77,6 +77,7 @@ static void do_nick_got_own_nick_cb(Jabb
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
 		purple_connection_get_account(js->gc), NULL, NULL, js);
+	g_free(oldnickname);
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
============================================================
--- libpurple/protocols/jabber/usertune.c	cdfd425e9ed68eae4aee8d95addd93c093833093
+++ libpurple/protocols/jabber/usertune.c	a20360876437c9c69c30dd9bf3b78c192d47cc79
@@ -41,48 +41,61 @@ static void jabber_tune_cb(JabberStream 
 	if (!buddy || !item)
 		return;
 	
-	tuneinfodata.artist = "";
-	tuneinfodata.title = "";
-	tuneinfodata.album = "";
-	tuneinfodata.track = "";
+	tuneinfodata.artist = NULL;
+	tuneinfodata.title = NULL;
+	tuneinfodata.album = NULL;
+	tuneinfodata.track = NULL;
 	tuneinfodata.time = -1;
-	tuneinfodata.url = "";
-	
+	tuneinfodata.url = NULL;
+
 	tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune");
 	if (!tune)
 		return;
+	resource = jabber_buddy_find_resource(buddy, NULL);
+	if(!resource)
+		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
 			if (!strcmp(tuneinfo->name, "artist")) {
-				if (tuneinfodata.artist[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
 						tuneinfodata.time = strtol(length, NULL, 10);
+					g_free(length);
 				}
 			} else if (!strcmp(tuneinfo->name, "source")) {
-				if (tuneinfodata.album[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "title")) {
-				if (tuneinfodata.title[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "track")) {
-				if (tuneinfodata.track[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "uri")) {
-				if (tuneinfodata.url[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 			}
 		}
 	}
-	resource = jabber_buddy_find_resource(buddy, NULL);
-	if(!resource)
-		return; /* huh? */
 	status_id = jabber_buddy_state_get_status_id(resource->state);
 
-	purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+	purple_prpl_got_user_status(js->gc->account, from, status_id,
+			PURPLE_TUNE_ARTIST, tuneinfodata.artist,
+			PURPLE_TUNE_TITLE, tuneinfodata.title,
+			PURPLE_TUNE_ALBUM, tuneinfodata.album,
+			PURPLE_TUNE_TRACK, tuneinfodata.track,
+			PURPLE_TUNE_TIME, tuneinfodata.time,
+			PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+
+	g_free(tuneinfodata.artist);
+	g_free(tuneinfodata.title);
+	g_free(tuneinfodata.album);
+	g_free(tuneinfodata.track);
+	g_free(tuneinfodata.url);
 }
 
 void jabber_tune_init(void) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Aug 2007 20:06:30 -0000	1.8
+++ .cvsignore	18 Sep 2007 15:27:17 -0000	1.9
@@ -1 +1 @@
-pidgin-2.1.1.tar.bz2
+pidgin-2.2.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pidgin.spec	21 Aug 2007 15:08:32 -0000	1.32
+++ pidgin.spec	18 Sep 2007 15:27:17 -0000	1.33
@@ -28,9 +28,12 @@
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.1.1
-Release:	1%{?dist}
-License:	GPLv2+
+Version:	2.2.0
+Release:	2%{?dist}
+License:        GPLv2+ and GPLv2 and MIT
+# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
+# GPLv2 - silc & novell prpls
+# MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -55,6 +58,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:         pidgin-2.2.0-plug_memleaks.patch 
+Patch101:         pidgin-2.2.0-fix-proxy-settings.patch
+Patch102:         pidgin-2.2.0-fix-status-scores.patch
+Patch103:         pidgin-2.2.0-plug-more-memleaks.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -283,6 +290,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -442,6 +453,7 @@
 %{_libdir}/libpurple.so.*
 %{_datadir}/pixmaps/purple/
 %{_datadir}/sounds/purple/
+%{_datadir}/purple/ca-certs/
 %{_sysconfdir}/purple/
 %if %{dbus_integration}
 %{_bindir}/purple-client-example
@@ -495,6 +507,14 @@
 
 
 %changelog
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
+- License clarification
+- Backport patches to fix memory leaks
+- Backport patches to fix proxy settings & status scores
+
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-1
+- 2.2.0
+
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1
 - 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Aug 2007 20:06:31 -0000	1.8
+++ sources	18 Sep 2007 15:27:17 -0000	1.9
@@ -1 +1 @@
-eb29fecb2f3a6d4790f47ce8e658c07c  pidgin-2.1.1.tar.bz2
+d71cd4de6ef1459ba9b504d0c06d8d04  pidgin-2.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:28:17 2007
From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot))
Date: Tue, 18 Sep 2007 11:28:17 -0400
Subject: rpms/pidgin/F-7 pidgin-2.2.0-fix-proxy-settings.patch, NONE,
	1.1 pidgin-2.2.0-fix-status-scores.patch, NONE,
	1.1 pidgin-2.2.0-plug-more-memleaks.patch, NONE,
	1.1 pidgin-2.2.0-plug_memleaks.patch, NONE, 1.1 pidgin.spec,
	1.23, 1.24
Message-ID: <200709181528.l8IFSHbP023070@cvs-int.fedora.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22961

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.2.0-fix-proxy-settings.patch 
	pidgin-2.2.0-fix-status-scores.patch 
	pidgin-2.2.0-plug-more-memleaks.patch 
	pidgin-2.2.0-plug_memleaks.patch 
Log Message:
- License clarification
- Backport patches to fix memory leaks
- Backport patches to fix proxy settings & status scores



pidgin-2.2.0-fix-proxy-settings.patch:

--- NEW FILE pidgin-2.2.0-fix-proxy-settings.patch ---
-----------------------------------------------------------------
Revision: 6be36979d022284283217c2a32f2b812740cbbf3
Ancestor: 81e26f1e56d65a68394405ff0727feba9206ff6f
Author: datallah at pidgin.im
Date: 2007-09-14T17:55:05
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c pidgin/gtkprefs.c

ChangeLog: 

Fix proxy settings to be loaded correctly when libpurple is initialized.  This was broken because it relied on the prefs being loaded after proxy initialization so that the pref callbacks would be triggered and I changed the prefs loading to happen right at the beginning to fix other issues. Fixes #3092.

============================================================
--- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
+++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
@@ -400,7 +400,7 @@ socket_ready_cb(gpointer data, gint sour
  	 */
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
-	
+
 	purple_debug_info("proxy", "Connected to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
 		proxy_pref_cb, NULL);
+
+	/* Load the initial proxy settings */
+	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
+	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
+	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
+	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
+	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
 }
 
 void
============================================================
--- pidgin/gtkprefs.c	fee039ede95c6ae3460bcf222f60305eb0bd2671
+++ pidgin/gtkprefs.c	5a7f1837f163b8d345b590d1509604d30e3c6c1c
@@ -1093,7 +1093,7 @@ proxy_changed_cb(const char *name, Purpl
 	const char *proxy = value;
 
 	if (strcmp(proxy, "none") && strcmp(proxy, "envvar"))
-	        gtk_widget_show_all(frame);
+		gtk_widget_show_all(frame);
 	else
 		gtk_widget_hide(frame);
 }

pidgin-2.2.0-fix-status-scores.patch:

--- NEW FILE pidgin-2.2.0-fix-status-scores.patch ---
-----------------------------------------------------------------
Revision: 240d37f3b465527200f862ff3c0da77618ae32ae
Ancestor: 6be36979d022284283217c2a32f2b812740cbbf3
Author: datallah at pidgin.im
Date: 2007-09-14T18:26:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c libpurple/status.c

ChangeLog: 

Apply a similar fix to the proxy prefs loading fix to the status scores.

============================================================
--- libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
+++ libpurple/proxy.c	dcb73f3b56ee37fd1b03d306be342bce5167037f
@@ -1994,11 +1994,11 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 
 	/* Load the initial proxy settings */
-	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
-	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
-	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
-	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
-	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
+	purple_prefs_trigger_callback("/purple/proxy/type");
+	purple_prefs_trigger_callback("/purple/proxy/host");
+	purple_prefs_trigger_callback("/purple/proxy/port");
+	purple_prefs_trigger_callback("/purple/proxy/username");
+	purple_prefs_trigger_callback("/purple/proxy/password");
 }
 
 void
============================================================
--- libpurple/status.c	1eb4a9526f9b26fa096f6ff8c8205f092b126b1e
+++ libpurple/status.c	a0e82882e37ae83691ee52bc46682db953f7cf96
@@ -1668,6 +1668,14 @@ purple_status_init(void)
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
+
+	purple_prefs_trigger_callback("/purple/status/scores/offline");
+	purple_prefs_trigger_callback("/purple/status/scores/available");
+	purple_prefs_trigger_callback("/purple/status/scores/invisible");
+	purple_prefs_trigger_callback("/purple/status/scores/away");
+	purple_prefs_trigger_callback("/purple/status/scores/extended_away");
+	purple_prefs_trigger_callback("/purple/status/scores/idle");
+	purple_prefs_trigger_callback("/purple/status/scores/offline_msg");
 }
 
 void

pidgin-2.2.0-plug-more-memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug-more-memleaks.patch ---
-----------------------------------------------------------------
Revision: 41389df89a4a6a007d41cec33e33043cd41ea159
Ancestor: 326d6e6c8c6a955cdba84f1f802fc21ec3e6b662
Author: datallah at pidgin.im
Date: 2007-09-17T16:24:24
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

more leak fixes.

============================================================
--- libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
+++ libpurple/protocols/jabber/message.c	3bc876da8fe16d41770af8d980dce8457b3ac61a
@@ -41,7 +41,10 @@ void jabber_message_free(JabberMessage *
 	g_free(jm->body);
 	g_free(jm->xhtml);
 	g_free(jm->password);
+	g_free(jm->error);
+	g_free(jm->thread_id);
 	g_list_free(jm->etc);
+	g_list_free(jm->eventitems);
 
 	g_free(jm);
 }

pidgin-2.2.0-plug_memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug_memleaks.patch ---
-----------------------------------------------------------------
Revision: db4583bc475b46b7cb9baa38229f12473d331870
Ancestor: 73d2587302ffbbe62f6b7f3e745508c0687813ba
Author: sadrul at pidgin.im
Date: 2007-09-15T18:27:01
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c

ChangeLog: 

Plug some memory leaks.

============================================================
--- libpurple/protocols/jabber/adhoccommands.c	d0b52a470cdc4c95503037ba92f51f87e61bdd10
+++ libpurple/protocols/jabber/adhoccommands.c	1f8c9a282612f146d5e43e994629da3817e88f48
@@ -151,8 +151,11 @@ static void jabber_adhoc_parse(JabberStr
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 		
-		if(note)
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL);
+		if(note) {
+			char *data = xmlnode_get_data(note);
+			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			g_free(data);
+		}
 		
 		if(xdata)
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
============================================================
--- libpurple/protocols/jabber/buddy.c	6fee8dda0f8e37a98fab4a18606447fa29792fd5
+++ libpurple/protocols/jabber/buddy.c	490b348e2662e107a450a4e9b08db1437c260d03
@@ -1455,10 +1455,13 @@ static void do_buddy_avatar_update_data(
 		return;
 	
 	img = purple_base64_decode(b64data, &size);
-	if(!img)
+	if(!img) {
+		g_free(b64data);
 		return;
+	}
 	
 	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
 }
 
 void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
============================================================
--- libpurple/protocols/jabber/jabber.c	8211a80fdca963e6b51e9a4a9d5b096225a57711
+++ libpurple/protocols/jabber/jabber.c	121e708c2e28ec3ff0da92cbf9e82a89f8d1a3b1
@@ -813,7 +813,7 @@ jabber_register_cancel_cb(JabberRegister
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 		jabber_connection_schedule_close(cbdata->js);
-}
+	}
 	g_free(cbdata->who);
 	g_free(cbdata);
 }
@@ -882,12 +882,12 @@ void jabber_register_parse(JabberStream 
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
-				if(js->registration) {
-					js->gc->wants_to_die = TRUE;
-					if(account->registration_cb) /* succeeded, but we have no login info */
-						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
-					jabber_connection_schedule_close(js);
-				}
+					if(js->registration) {
+						js->gc->wants_to_die = TRUE;
+						if(account->registration_cb) /* succeeded, but we have no login info */
+							(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+						jabber_connection_schedule_close(js);
+					}
 					return;
 				}
 			}
@@ -987,14 +987,14 @@ void jabber_register_parse(JabberStream 
 		purple_request_field_group_add_field(group, field);
 	}
 
-		if((y = xmlnode_get_child(query, "instructions")))
-			instructions = xmlnode_get_data(y);
+	if((y = xmlnode_get_child(query, "instructions")))
+		instructions = xmlnode_get_data(y);
 	else if(registered)
 		instructions = g_strdup(_("Please fill out the information below "
 					"to change your account registration."));
-		else
-			instructions = g_strdup(_("Please fill out the information below "
-						"to register your new account."));
+	else
+		instructions = g_strdup(_("Please fill out the information below "
+					"to register your new account."));
 
 	cbdata = g_new0(JabberRegisterCBData, 1);
 	cbdata->js = js;
@@ -1019,8 +1019,8 @@ void jabber_register_parse(JabberStream 
 		g_free(title);
 	}
 
-		g_free(instructions);
-	}
+	g_free(instructions);
+}
 
 void jabber_register_start(JabberStream *js)
 {
============================================================
--- libpurple/protocols/jabber/message.c	309b575a8bd728be0fb2b41edf1362c2911b8367
+++ libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
@@ -324,7 +324,7 @@ void jabber_message_parse(JabberStream *
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-	else if(!strcmp(type, "chat"))
+		else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
============================================================
--- libpurple/protocols/jabber/presence.c	64aa78ce207c12bf4c35e137cfa344ba6b0e9926
+++ libpurple/protocols/jabber/presence.c	2b25212d8c6b6df2aeef8dd484660bff573c3511
@@ -192,16 +192,11 @@ void jabber_presence_send(PurpleAccount 
 		jabber_tune_set(js->gc, &tuneinfo);
 		
 		/* update old values */
-		if(js->old_artist)
-			g_free(js->old_artist);
-		if(js->old_title)
-			g_free(js->old_title);
-		if(js->old_source)
-			g_free(js->old_source);
-		if(js->old_uri)
-			g_free(js->old_uri);
-		if(js->old_track)
-			g_free(js->old_track);
+		g_free(js->old_artist);
+		g_free(js->old_title);
+		g_free(js->old_source);
+		g_free(js->old_uri);
+		g_free(js->old_track);
 		js->old_artist = g_strdup(artist);
 		js->old_title = g_strdup(title);
 		js->old_source = g_strdup(source);
============================================================
--- libpurple/protocols/jabber/usernick.c	5817ece1551b32a06a815751ec2d0c6e73fce836
+++ libpurple/protocols/jabber/usernick.c	e0e09357277521664d7f14ecf84033d6e84aa564
@@ -33,7 +33,7 @@ static void jabber_nick_cb(JabberStream 
 	xmlnode *item = xmlnode_get_child(items, "item");
 	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	xmlnode *nick;
-	const char *nickname = NULL;
+	char *nickname = NULL;
 	
 	/* ignore the tune of people not on our buddy list */
 	if (!buddy || !item)
@@ -43,8 +43,8 @@ static void jabber_nick_cb(JabberStream 
 	if (!nick)
 		return;
 	nickname = xmlnode_get_data(nick);
-
 	serv_got_alias(js->gc, from, nickname);
+	g_free(nickname);
 }
 
 static void do_nick_set(JabberStream *js, const char *nick) {
@@ -64,7 +64,7 @@ static void do_nick_got_own_nick_cb(Jabb
 }
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
-	const char *oldnickname = NULL;
+	char *oldnickname = NULL;
 	xmlnode *item = xmlnode_get_child(items,"item");
 	
 	if(item) {
@@ -77,6 +77,7 @@ static void do_nick_got_own_nick_cb(Jabb
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
 		purple_connection_get_account(js->gc), NULL, NULL, js);
+	g_free(oldnickname);
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
============================================================
--- libpurple/protocols/jabber/usertune.c	cdfd425e9ed68eae4aee8d95addd93c093833093
+++ libpurple/protocols/jabber/usertune.c	a20360876437c9c69c30dd9bf3b78c192d47cc79
@@ -41,48 +41,61 @@ static void jabber_tune_cb(JabberStream 
 	if (!buddy || !item)
 		return;
 	
-	tuneinfodata.artist = "";
-	tuneinfodata.title = "";
-	tuneinfodata.album = "";
-	tuneinfodata.track = "";
+	tuneinfodata.artist = NULL;
+	tuneinfodata.title = NULL;
+	tuneinfodata.album = NULL;
+	tuneinfodata.track = NULL;
 	tuneinfodata.time = -1;
-	tuneinfodata.url = "";
-	
+	tuneinfodata.url = NULL;
+
 	tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune");
 	if (!tune)
 		return;
+	resource = jabber_buddy_find_resource(buddy, NULL);
+	if(!resource)
+		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
 			if (!strcmp(tuneinfo->name, "artist")) {
-				if (tuneinfodata.artist[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
 						tuneinfodata.time = strtol(length, NULL, 10);
+					g_free(length);
 				}
 			} else if (!strcmp(tuneinfo->name, "source")) {
-				if (tuneinfodata.album[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "title")) {
-				if (tuneinfodata.title[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "track")) {
-				if (tuneinfodata.track[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "uri")) {
-				if (tuneinfodata.url[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 			}
 		}
 	}
-	resource = jabber_buddy_find_resource(buddy, NULL);
-	if(!resource)
-		return; /* huh? */
 	status_id = jabber_buddy_state_get_status_id(resource->state);
 
-	purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+	purple_prpl_got_user_status(js->gc->account, from, status_id,
+			PURPLE_TUNE_ARTIST, tuneinfodata.artist,
+			PURPLE_TUNE_TITLE, tuneinfodata.title,
+			PURPLE_TUNE_ALBUM, tuneinfodata.album,
+			PURPLE_TUNE_TRACK, tuneinfodata.track,
+			PURPLE_TUNE_TIME, tuneinfodata.time,
+			PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+
+	g_free(tuneinfodata.artist);
+	g_free(tuneinfodata.title);
+	g_free(tuneinfodata.album);
+	g_free(tuneinfodata.track);
+	g_free(tuneinfodata.url);
 }
 
 void jabber_tune_init(void) {


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pidgin.spec	18 Sep 2007 15:12:26 -0000	1.23
+++ pidgin.spec	18 Sep 2007 15:27:45 -0000	1.24
@@ -29,8 +29,11 @@
 
 Name:		pidgin
 Version:	2.2.0
-Release:	1%{?dist}
-License:	GPLv2+
+Release:	2%{?dist}
+License:        GPLv2+ and GPLv2 and MIT
+# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
+# GPLv2 - silc & novell prpls
+# MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -55,6 +58,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:         pidgin-2.2.0-plug_memleaks.patch 
+Patch101:         pidgin-2.2.0-fix-proxy-settings.patch
+Patch102:         pidgin-2.2.0-fix-status-scores.patch
+Patch103:         pidgin-2.2.0-plug-more-memleaks.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -283,6 +290,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -496,7 +507,12 @@
 
 
 %changelog
-* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-0
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
+- License clarification
+- Backport patches to fix memory leaks
+- Backport patches to fix proxy settings & status scores
+
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-1
 - 2.2.0
 
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1



From fedora-extras-commits at redhat.com  Tue Sep 18 15:33:18 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 18 Sep 2007 11:33:18 -0400
Subject: rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.7,
	1.8 initscripts.spec, 1.150, 1.151
Message-ID: <200709181533.l8IFXI8j023303@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23252

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- don't crash if /etc/sysconfig/i18n does not exist


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- initscripts-8.54.1-olpc.patch	13 Sep 2007 17:38:58 -0000	1.7
+++ initscripts-8.54.1-olpc.patch	18 Sep 2007 15:33:15 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-13 13:31:32.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-13 13:31:32.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,9 +43,9 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-09-13 09:21:47.113128415 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-09-13 13:29:21.000000000 -0400
-@@ -0,0 +1,568 @@
+--- /dev/null	2007-09-18 09:50:57.766542723 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-18 11:30:44.000000000 -0400
+@@ -0,0 +1,571 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -220,6 +220,9 @@
 +  char *line;
 +
 +  f = fopen("/etc/sysconfig/i18n", "r");
++  if (!f)
++    return;
++
 +  while(fscanf(f, "%as", &line)==1)
 +    {
 +      char *sline;
@@ -616,7 +619,7 @@
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-13 13:31:32.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- initscripts.spec	13 Sep 2007 17:38:58 -0000	1.150
+++ initscripts.spec	18 Sep 2007 15:33:15 -0000	1.151
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 Source: initscripts-%{version}.tar.bz2
 Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
@@ -207,6 +207,9 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Tue Sep 18 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-8
+- don't crash if /etc/sysconfig/i18n does not exist
+
 * Thu Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-7
 - fix crasher bug in olpc-dm
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:33:46 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 11:33:46 -0400
Subject: rpms/cups/devel cups-str2512-printcap.patch, NONE, 1.1 cups.spec,
	1.357, 1.358
Message-ID: <200709181533.l8IFXkjE023356@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23254

Modified Files:
	cups.spec 
Added Files:
	cups-str2512-printcap.patch 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
- Write printcap when a remote queue is deleted (bug #290831).


cups-str2512-printcap.patch:

--- NEW FILE cups-str2512-printcap.patch ---
diff -up cups-1.3.1/scheduler/dirsvc.c.printcap cups-1.3.1/scheduler/dirsvc.c
--- cups-1.3.1/scheduler/dirsvc.c.printcap	2007-09-18 16:29:18.000000000 +0100
+++ cups-1.3.1/scheduler/dirsvc.c	2007-09-18 16:29:19.000000000 +0100
@@ -2134,6 +2134,7 @@ process_browse_data(
  
     cupsdDeletePrinter(p, 1);
     cupsdUpdateImplicitClasses();
+    write_printcap = 1;
   }
   else if (update)
   {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- cups.spec	18 Sep 2007 08:32:42 -0000	1.357
+++ cups.spec	18 Sep 2007 15:33:14 -0000	1.358
@@ -39,6 +39,7 @@
 Patch14: cups-lpr-help.patch
 Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
+Patch17: cups-str2512-printcap.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -149,6 +150,7 @@
 %patch14 -p1 -b .lpr-help
 %patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
+%patch17 -p1 -b .str2512-printcap
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -441,6 +443,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
+- Write printcap when a remote queue is deleted (bug #290831).
+
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
 - Avoid write printcap unnecessarily (bug #290831).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:34:38 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 11:34:38 -0400
Subject: rpms/cups/devel cups.spec,1.358,1.359
Message-ID: <200709181534.l8IFYcxs023476@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23406

Modified Files:
	cups.spec 
Log Message:
1.3.1-3


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- cups.spec	18 Sep 2007 15:33:14 -0000	1.358
+++ cups.spec	18 Sep 2007 15:34:06 -0000	1.359
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:34:49 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 11:34:49 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.7, 1.8 ConsoleKit.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200709181534.l8IFYnrk023521@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
2.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2007 01:49:28 -0000	1.7
+++ .cvsignore	18 Sep 2007 15:34:15 -0000	1.8
@@ -1 +1 @@
-ConsoleKit-0.2.2.tar.gz
+ConsoleKit-0.2.3.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ConsoleKit.spec	18 Sep 2007 02:31:37 -0000	1.14
+++ ConsoleKit.spec	18 Sep 2007 15:34:15 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -144,6 +144,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.3-1
+- Update to 0.2.3
+
 * Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.2-1
 - Update to 0.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Sep 2007 01:49:28 -0000	1.7
+++ sources	18 Sep 2007 15:34:15 -0000	1.8
@@ -1 +1 @@
-700128f32c2e3c087684f4c28a312764  ConsoleKit-0.2.2.tar.gz
+dc4b3194ec583b03747ffc909a5571da  ConsoleKit-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:37:11 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 11:37:11 -0400
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.22,1.23
Message-ID: <200709181537.l8IFbBcd023648@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23603

Modified Files:
	dnsmasq.spec 
Log Message:
oops, broken magic :-)


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dnsmasq.spec	18 Sep 2007 15:15:26 -0000	1.22
+++ dnsmasq.spec	18 Sep 2007 15:36:39 -0000	1.23
@@ -1,11 +1,17 @@
-#%define extrapath release-candidates/
-#%define extrapath test-releases/
-#%define extraversion rc2
-#%define extraversion test2
+%define testrelease 0
+%define releasecandidate 0
+%if 0%{testrelease}
+  %define extrapath test-releases/
+  %define extraversion test2
+%endif
+%if 0%{releasecandidate}
+  %define extrapath release-candidates/
+  %define extraversion rc2
+%endif
 
 Name:           dnsmasq
 Version:        2.40
-Release:        1%{extraversion}%{?dist}
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Sep 18 15:37:44 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 11:37:44 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.126,
	1.127 libselinux.spec, 1.284, 1.285
Message-ID: <200709181537.l8IFbiLc023721@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23698

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- libselinux-rhat.patch	6 Sep 2007 12:37:00 -0000	1.126
+++ libselinux-rhat.patch	18 Sep 2007 15:37:42 -0000	1.127
@@ -1,46 +1,25 @@
-Index: libselinux/src/selinuxswig_python.i
-===================================================================
---- libselinux/src/selinuxswig_python.i	(revision 2549)
-+++ libselinux/src/selinuxswig_python.i	(working copy)
-@@ -98,4 +98,41 @@
- 	}
- }
- 
-+%typemap(in) char * const [] {
-+	int i, size;
-+	PyObject * s;
-+
-+	if (!PySequence_Check($input)) {
-+		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
-+		return NULL;
-+	}
-+
-+	size = PySequence_Size($input);
-+	
-+	$1 = (char**) malloc(size + 1);
-+
-+	for(i = 0; i < size; i++) {
-+		if (!PyString_Check(PySequence_GetItem($input, i))) {
-+			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
-+			return NULL;
-+		}
-+	}
-+		
-+	for(i = 0; i < size; i++) {
-+		s = PySequence_GetItem($input, i);
-+		$1[i] = (char*) malloc(PyString_Size(s) + 1);
-+		strcpy($1[i], PyString_AsString(s));
-+	}
-+	$1[size] = NULL;
-+}
-+
-+%typemap(freearg,match="in") char * const [] {
-+	int i = 0;
-+	while($1[i]) {
-+		free($1[i]);
-+		i++;
-+	}
-+	free($1);
-+}
-+
- %include "selinuxswig.i"
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c	2007-08-10 11:58:34.000000000 -0400
++++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 11:28:07.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <syslog.h>
+ #include "selinux_internal.h"
+ #include "label_internal.h"
+ #include "callbacks.h"
+@@ -55,10 +56,12 @@
+ #endif
+     default_printf(const char *fmt, ...)
+ {
++	char buf[BUFSIZ];
+ 	va_list ap;
+ 	va_start(ap, fmt);
+-	vfprintf(stderr, fmt, ap);
++	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+ 	va_end(ap);
++	syslog(LOG_ERR, buf, strlen(buf));
+ }
+ 
+ void


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- libselinux.spec	13 Sep 2007 12:29:38 -0000	1.284
+++ libselinux.spec	18 Sep 2007 15:37:42 -0000	1.285
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -122,6 +124,9 @@
 
 %changelog
 
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-2
+- Change matchpatcon to use syslog instead of syserror
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
 - Upgrade to latest from NSA
 	* Re-map a getxattr return value of 0 to a getfilecon return value of -1 with errno EOPNOTSUPP from Stephen Smalley.



From fedora-extras-commits at redhat.com  Tue Sep 18 15:40:27 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:40:27 -0400
Subject: rpms/qgit/EL-4 qgit.spec,1.18,1.19
Message-ID: <200709181540.l8IFeRLh023802@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:56:43 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:39:54 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:42:00 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:42:00 -0400
Subject: rpms/qgit/EL-5 qgit.spec,1.18,1.19
Message-ID: <200709181542.l8IFg0KK023847@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23822

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:58:55 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:41:27 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:43:25 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 18 Sep 2007 11:43:25 -0400
Subject: fedora-security/audit fc6,1.260,1.261 fc7,1.108,1.109
Message-ID: <200709181543.l8IFhPZr023894@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23869/audit

Modified Files:
	fc6 fc7 
Log Message:
Vulnerable rpc code also part of nfs-utils-lib and libtirpc.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- fc6	17 Sep 2007 15:42:28 -0000	1.260
+++ fc6	18 Sep 2007 15:43:23 -0000	1.261
@@ -36,6 +36,8 @@
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-614]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
+CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294911
+CVE-2007-3999 VULNERABLE (libtirpc) #294931
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc7	17 Sep 2007 15:42:28 -0000	1.108
+++ fc7	18 Sep 2007 15:43:23 -0000	1.109
@@ -74,6 +74,8 @@
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
+CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294901
+CVE-2007-3999 VULNERABLE (libtirpc) #294921
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252295 [since FEDORA-2007-1697]



From fedora-extras-commits at redhat.com  Tue Sep 18 15:44:19 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:44:19 -0400
Subject: rpms/mash/F-7 mash-multilib.patch,1.1,1.2
Message-ID: <200709181544.l8IFiJpD023948@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927

Modified Files:
	mash-multilib.patch 
Log Message:
update for valgrind (#294761)


mash-multilib.patch:

Index: mash-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mash-multilib.patch	6 Sep 2007 15:05:07 -0000	1.1
+++ mash-multilib.patch	18 Sep 2007 15:44:16 -0000	1.2
@@ -1,5 +1,23 @@
 --- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
 +++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
+@@ -5,7 +5,7 @@ class MultilibMethod:
+     def __init__(self):
+         self.name = 'base'
+     def select(self, po):
+-        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace', 'valgrind']
++        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace' ]
+         if po.arch.find('64') != -1:
+             if po.name in prefer_64:
+                 return True
+@@ -54,7 +54,7 @@ class RuntimeMultilibMethod(MultilibMeth
+     
+     def select(self, po):
+         libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
+-        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts' ]
++        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts', 'valgrind' ]
+         if po.name in whitelist:
+             return True
+         if MultilibMethod.select(self,po):
 @@ -87,18 +109,18 @@
          self.name = 'devel'
      



From fedora-extras-commits at redhat.com  Tue Sep 18 15:47:23 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:47:23 -0400
Subject: rpms/mash/F-7 mash.spec,1.7,1.8
Message-ID: <200709181547.l8IFlNbq024008@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23979

Modified Files:
	mash.spec 
Log Message:
bump for build



Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mash.spec	6 Sep 2007 15:05:07 -0000	1.7
+++ mash.spec	18 Sep 2007 15:46:51 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -45,6 +45,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.1.18-3
+- more multilib fixes from head (#294761)
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.1.18-2
 - backport some multilib fixes from HEAD (#247321, #271761)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:50:02 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:50:02 -0400
Subject: rpms/mash/devel .cvsignore, 1.16, 1.17 mash.spec, 1.14, 1.15 sources,
	1.17, 1.18
Message-ID: <200709181550.l8IFo2kb024155@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24120

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Sep 2007 20:17:03 -0000	1.16
+++ .cvsignore	18 Sep 2007 15:49:30 -0000	1.17
@@ -1 +1 @@
-mash-0.2.4.tar.gz
+mash-0.2.5.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mash.spec	17 Sep 2007 20:17:03 -0000	1.14
+++ mash.spec	18 Sep 2007 15:49:30 -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:           mash
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.2.5-1
+- handle valgrind for multilib differently (#294761)
+
 * Mon Sep 17 2007 Bill Nottingham <notting at redhat.com> 0.2.4-1
 - repoview support (<jkeating at redhat.com>)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Sep 2007 20:17:03 -0000	1.17
+++ sources	18 Sep 2007 15:49:30 -0000	1.18
@@ -1 +1 @@
-03ab739b45298a4db6e5d56eb549b6bc  mash-0.2.4.tar.gz
+73e37a8340bb6d9356d0ce18eea485f2  mash-0.2.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:52:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 11:52:27 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.14,1.15
Message-ID: <200709181552.l8IFqRco024368@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24271

Modified Files:
	xulrunner.spec 
Log Message:
added crashreporter


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xulrunner.spec	18 Sep 2007 14:23:14 -0000	1.14
+++ xulrunner.spec	18 Sep 2007 15:51:55 -0000	1.15
@@ -313,6 +313,7 @@
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
+%{_libdir}/%{name}-*/crashreporter
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*



From fedora-extras-commits at redhat.com  Tue Sep 18 15:52:56 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:52:56 -0400
Subject: rpms/qgit/F-7 qgit.spec,1.18,1.19
Message-ID: <200709181552.l8IFquw8024472@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24350

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:48:22 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:52:23 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:53:28 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 18 Sep 2007 11:53:28 -0400
Subject: rpms/lagan/devel lagan20-chris.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 lagan.spec, 1.4, 1.5 sources, 1.2, 1.3 lagan12-chris.patch,
	1.1, NONE
Message-ID: <200709181553.l8IFrSll024538@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24465

Modified Files:
	.cvsignore lagan.spec sources 
Added Files:
	lagan20-chris.patch 
Removed Files:
	lagan12-chris.patch 
Log Message:
New upstream release.

lagan20-chris.patch:

--- NEW FILE lagan20-chris.patch ---
diff -up lagan20/Readmes/README.FIRST.chris lagan20/Readmes/README.FIRST
--- lagan20/Readmes/README.FIRST.chris	2006-09-14 23:23:08.000000000 +0200
+++ lagan20/Readmes/README.FIRST	2007-09-18 17:27:46.000000000 +0200
@@ -30,8 +30,7 @@ This will create the executable files ch
 glocal, prolagan as well as many tools in the utils directory. 
 
 You may also need to go into all the .pl file, and change the first line
-to call your perl interpreter. You must also specify an environment
-variable $LAGAN_DIR to point to the directory where you installed LAGAN.
+to call your perl interpreter.
 
 Because LAGAN uses no system-dependent or implementation dependent 
 libraries it should compile on all platforms and ANSI C compilers. 
diff -up lagan20/Readmes/README.shuffle.chris lagan20/Readmes/README.shuffle
--- lagan20/Readmes/README.shuffle.chris	2006-09-15 01:14:40.000000000 +0200
+++ lagan20/Readmes/README.shuffle	2007-09-18 17:27:46.000000000 +0200
@@ -13,14 +13,13 @@ unpublished.
 1. Installation
 
 If you received Shuffle-LAGAN as part of the LAGAN toolkit it is installed 
-automatically with the rest of the package. The code assumes $LAGAN_DIR 
-has been set. 
+automatically with the rest of the package.
 
 
 2. Running
 Just give it two sequences and let it roll:
 
-#slagan.pl seq1.fa seq2.fa 
+#slagan seq1.fa seq2.fa 
 
 3. Input
 
diff -up lagan20/Readmes/README.chaos.chris lagan20/Readmes/README.chaos
--- lagan20/Readmes/README.chaos.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/Readmes/README.chaos	2007-09-18 17:27:46.000000000 +0200
@@ -29,13 +29,7 @@ connecting CHAOS with DIALIGN. Both thes
 
 Because CHAOS uses no system-dependent or implementation dependent libraries
 it should compile on all platforms and ANSI C compilers. If you have problems
-compiling the sources please e-mail the author. You will need to also set the
-environment variable LAGAN_DIR to the directory where you installed CHAOS. in
-c-shell this can be done by executing
-
-% setenv LAGAN_DIR `pwd`
-
-on the prompt. For other shells the command differs.
+compiling the sources please e-mail the author.
 
 II Description
    CHAOS is a heuristic local alignment tool optimized for non-coding 
diff -up lagan20/Readmes/README.lagan.chris lagan20/Readmes/README.lagan
--- lagan20/Readmes/README.lagan.chris	2006-09-15 01:12:53.000000000 +0200
+++ lagan20/Readmes/README.lagan	2007-09-18 17:27:46.000000000 +0200
@@ -22,7 +22,7 @@ using the anchors program.
 3. Doing global alignment in a limited area of thw NW matrix given the set of 
 anchors (order tool).
 
-lagan.pl is the main executable that calls the three steps.
+lagan is the main executable that calls the three steps.
 
 II Usage
 
diff -up lagan20/src/utils/scorealign.c.chris lagan20/src/utils/scorealign.c
--- lagan20/src/utils/scorealign.c.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/scorealign.c	2007-09-18 17:27:46.000000000 +0200
@@ -402,10 +402,6 @@ void readScoreMatrix (char *filename){
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
diff -up lagan20/src/utils/Glue.cpp.chris lagan20/src/utils/Glue.cpp
--- lagan20/src/utils/Glue.cpp.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/Glue.cpp	2007-09-18 17:27:46.000000000 +0200
@@ -30,10 +30,6 @@ void readScoreMatrix (char *filename){
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
diff -up lagan20/src/utils/mrun.pl.chris lagan20/src/utils/mrun.pl
--- lagan20/src/utils/mrun.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrun.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
diff -up lagan20/src/utils/mrunfile.pl.chris lagan20/src/utils/mrunfile.pl
--- lagan20/src/utils/mrunfile.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrunfile.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
 if (@ARGV < 1) {
     print ("usage:\n mrunfile.pl filename [-pairwise] [-vista]\n\n");
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@ while ($line = <PARAMFILE>) {
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
diff -up lagan20/src/utils/mrunpairs.pl.chris lagan20/src/utils/mrunpairs.pl
--- lagan20/src/utils/mrunpairs.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrunpairs.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
diff -up lagan20/src/utils/mviz.pl.chris lagan20/src/utils/mviz.pl
--- lagan20/src/utils/mviz.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mviz.pl	2007-09-18 17:27:46.000000000 +0200
@@ -2,9 +2,9 @@
 
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@ while ($line = <PARAMFILE>) {
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
diff -up lagan20/src/mlagan.c.chris lagan20/src/mlagan.c
--- lagan20/src/mlagan.c.chris	2006-09-15 17:57:48.000000000 +0200
+++ lagan20/src/mlagan.c	2007-09-18 17:27:46.000000000 +0200
@@ -950,10 +950,6 @@ int main(int argc, char** argv) {
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
diff -up lagan20/src/prolagan.c.chris lagan20/src/prolagan.c
--- lagan20/src/prolagan.c.chris	2006-09-14 23:17:32.000000000 +0200
+++ lagan20/src/prolagan.c	2007-09-18 17:27:46.000000000 +0200
@@ -968,10 +968,6 @@ int main(int argc, char** argv) {
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
diff -up lagan20/src/slagan-mfa.pl.chris lagan20/src/slagan-mfa.pl
--- lagan20/src/slagan-mfa.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/slagan-mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -4,7 +4,6 @@ use strict;
 
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
 my $LAGAN_DIR = $ENV{LAGAN_DIR};
 
 my ($outfile, $base);
diff -up lagan20/src/supermap.pl.chris lagan20/src/supermap.pl
--- lagan20/src/supermap.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/supermap.pl	2007-09-18 17:27:46.000000000 +0200
@@ -18,7 +18,6 @@ my $max_job_size = 50000; # Maximum job 
 my $erode_align = 15; # Amount by which to erode the coords of each align loaded (to avoid overlap problems when chaining)
 my ($c1, $c2, $c3, $c4) = (100, 50, 400, 25); # BLAT->CHAOS score conversion parameters
 #my $max_dist_y = 10000; # Join x-monotonic into same single-chain only if at most that apart in y-species.
-my $default_lagan_dir = "/home/genome/glocal";
 my $glocal_name = (0 ? "SLAGAN" : "glocal");
 
 use Getopt::Long;
@@ -93,12 +92,7 @@ my $supermapexec = $0; my $mycwd = getcw
 die("$0: Problem resolving my name, \'$supermapexec\' is not a file") unless -f $supermapexec or $ARGV[0] eq "worker";
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-$lagan_dir = $ENV{"LAGAN_DIR"} if defined $ENV{"LAGAN_DIR"};
-$lagan_dir = $ENV{"LAGAN_DIR"} = $default_lagan_dir unless defined $ENV{"LAGAN_DIR"};
-$lagan_dir =~ s/^\.\./$mycwd\/\.\./;
-$lagan_dir =~ s/^\./$mycwd\//;
-$ENV{"LAGAN_DIR"} = $lagan_dir;
-print STDERR "$0: Warning: LAGAN_DIR=$lagan_dir is not a valid directory\n" unless -d $lagan_dir;
+$lagan_dir = $ENV{LAGAN_DIR};
 push @INC, $lagan_dir;
 
 my $SLAGAN = $lagan_dir."/".$glocal_name;
diff -up lagan20/src/xmfa2mfa.pl.chris lagan20/src/xmfa2mfa.pl
--- lagan20/src/xmfa2mfa.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/xmfa2mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -9,8 +9,6 @@ my ($line, $line_in, $type);
 
 my $mode = ($ARGV[0] eq "1" ? "M1" : ($ARGV[0] eq "2" ? "M2" : die("$0: Invalid base genome argument (expected 1 or 2)")));
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
-
 while (<STDIN>) {
 	$line_in = $_;
 	if ($line_in =~ /^\=.*(DM|M1|M2)$/) {
@@ -47,7 +45,7 @@ open(OUT, "> tmp.xmfa");
 foreach my $line (@filt_lines) { print OUT $line; }
 close OUT;
 
-system($ENV{"LAGAN_DIR"}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
+system($ENV{LAGAN_DIR}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
 
 open(IN, "< glue.out");
 my @glue_out = <IN>;
diff -up lagan20/utils/mrunpairs.pl.chris lagan20/utils/mrunpairs.pl
--- lagan20/utils/mrunpairs.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrunpairs.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -189,7 +179,7 @@ for($i=1; $i<@targets; $i+=2) {
 	$mparams = "$mparams $s";
     }
     
-    $mlagan = "$lagandir/mlagan$mfiles$mparams > $outprefix.out";
+    $mlagan = "mlagan$mfiles$mparams > $outprefix.out";
     print "\n$mlagan\n\n";
     if(`$mlagan`) { print "\n\n"; exit(1); }
 
diff -up lagan20/utils/draft.pl.chris lagan20/utils/draft.pl
--- lagan20/utils/draft.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/draft.pl	2007-09-18 17:27:46.000000000 +0200
@@ -109,7 +109,7 @@ for ($i = 0; $i < @contigs; $i++){
     $skip1 = $skip2 = 0;
     # make alignments
     if (!$lazyflag || !(-e "$contigs[$i].mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
@@ -128,7 +128,7 @@ for ($i = 0; $i < @contigs; $i++){
     }
 
     if (!$lazyflag || !(-e "$contigs[$i].rc.mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
diff -up lagan20/utils/mrunfile.pl.chris lagan20/utils/mrunfile.pl
--- lagan20/utils/mrunfile.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrunfile.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
 if (@ARGV < 1) {
     print ("usage:\n mrunfile.pl filename [-pairwise] [-vista]\n\n");
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@ while ($line = <PARAMFILE>) {
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
diff -up lagan20/utils/mviz.pl.chris lagan20/utils/mviz.pl
--- lagan20/utils/mviz.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mviz.pl	2007-09-18 17:27:46.000000000 +0200
@@ -2,9 +2,9 @@
 
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@ while ($line = <PARAMFILE>) {
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
diff -up lagan20/utils/mrun.pl.chris lagan20/utils/mrun.pl
--- lagan20/utils/mrun.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrun.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -169,7 +159,7 @@ foreach $s (@params) {
     $mparams = "$mparams $s";
 }
 
-$mlagan = "$lagandir/mlagan$mfiles$mparams > $prefix.out";
+$mlagan = "mlagan$mfiles$mparams > $prefix.out";
 print STDERR "\n$mlagan\n\n";
 if(`$mlagan`) { print "\n\n"; exit(1); }
 
diff -up lagan20/slagan.pl.chris lagan20/slagan.pl
--- lagan20/slagan.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/slagan.pl	2007-09-18 17:27:46.000000000 +0200
@@ -5,7 +5,7 @@ use strict;
 my $lagandir = $ENV{LAGAN_DIR};
 
 if (@ARGV < 2) {
-	print ("Usage:\n slagan.pl seqfile1 seqfile2 [-glocal \"glocal flags\"] [-chaos \"chaos flags\"] [-order \"order flags\"] [-recurse \"(wl1,nd1,co1),(wl2,nd2,co2),...\"] [-mfa] [-out \"filename\"] [-maskedonly] [-debug] [-translate] [-fastreject]\n");
+	print ("Usage:\n slagan seqfile1 seqfile2 [-glocal \"glocal flags\"] [-chaos \"chaos flags\"] [-order \"order flags\"] [-recurse \"(wl1,nd1,co1),(wl2,nd2,co2),...\"] [-mfa] [-out \"filename\"] [-maskedonly] [-debug] [-translate] [-fastreject]\n");
 	exit(1);
 }
 
@@ -85,7 +85,7 @@ if ($lazy && -e "${outName1}_$outName2.c
     `cp ${outName1}_$outName2.chaos chaos.$$`;
 }
 else {
-    `$lagandir/chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
+    `chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
     if ($?) { exit(1); }
     `cat chaos.$$ > ${outName1}_$outName2.chaos`;
 }
@@ -123,8 +123,8 @@ for (my $k = 0; $k < @regs; $k++) {
 	if ($extra1) { `$lagandir/utils/fa2xfa $seq1 $startreg1 $endreg1 1 > seq1$k.$$.masked\n`; }
 	if ($extra2) { `$lagandir/utils/fa2xfa $seq2 $startreg2 $endreg2 2 $rcf > seq2$k.$$.masked\n`; }
 
-#print "$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n";
-	`$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
+#print "lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n";
+	`lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
 
 	my $suff = "";
 	if ($outfile) { $suff = " >> $outfile"; }
diff -up lagan20/lagan.pl.chris lagan20/lagan.pl
--- lagan20/lagan.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/lagan.pl	2007-09-18 17:27:46.000000000 +0200
@@ -105,13 +105,13 @@ for ($i = 2; $i < @ARGV; $i++) {
 	$rundraft = 1;
     }
     elsif ($ARGV[$i] =~ /-cons/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-draftskipfr/){
-	$draftparams = $draftparams." -skipfr $ARGV[$++i]";
+	$draftparams = $draftparams." -skipfr ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-lazy/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
 
     else {
@@ -233,7 +233,7 @@ if ($infofile == 3){
 #    `$lagandir/utils/rm $infofilename` if ($binfile);
 }
 
-`rm $secondName` if ($rcflag);
+`rm $secondName` if ($rcFlag);
 `rm $$.*`;
 if ($?) { exit(1); }
 
diff -up lagan20/rechaos.pl.chris lagan20/rechaos.pl
--- lagan20/rechaos.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/rechaos.pl	2007-09-18 17:28:54.000000000 +0200
@@ -182,12 +182,12 @@ while (1) {
 #    print STDERR "-----------------\n";
 #    print STDERR `cat $$.anchs.pairs`;
 #    print STDERR "-----------------\n";
-#    print STDERR "$lagandir/chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+#    print STDERR "chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
 
 # PERFORM THE ALIGNMENTS USING CHAOS
     
-    $saver = "$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
-    `$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
+    $saver = "chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+    `chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
     if ($?) { 
 	print STDERR "$saver\n";
 	exit(1); 
@@ -216,7 +216,7 @@ while (1) {
 
 # FIND MAXIMAL-SCORING CONSISTENT CHAIN
 
-    `$lagandir/anchors $$.anchtemp $gfc $anchparams | sort -n +1 > $$.anchs.sorted`;
+    `$lagandir/anchors $$.anchtemp $gfc $anchparams | sort -n -k 2 > $$.anchs.sorted`;
     if ($?) { exit(1); }
 
 # IF WE'RE DONE, THEN QUIT!
@@ -243,7 +243,6 @@ while (1) {
     @b2new = 0;
     @e1new = 0;
     @e2new = 0;
-    @scores = 0;
 
     $app_str = "";
     
@@ -357,7 +356,7 @@ while (1) {
     $i++;
 }
 
-$res = `sort -nr +1 $$.anchs.sorted`;
+$res = `sort -nr -k 2 $$.anchs.sorted`;
 if ($?) { exit(1); }
 
 `rm $$.*`;
diff -up lagan20/slagan-mfa.pl.chris lagan20/slagan-mfa.pl
--- lagan20/slagan-mfa.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/slagan-mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -4,7 +4,6 @@ use strict;
 
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
 my $LAGAN_DIR = $ENV{LAGAN_DIR};
 
 my ($outfile, $base);
diff -up lagan20/supermap.pl.chris lagan20/supermap.pl
--- lagan20/supermap.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/supermap.pl	2007-09-18 17:27:46.000000000 +0200
@@ -18,7 +18,6 @@ my $max_job_size = 50000; # Maximum job 
 my $erode_align = 15; # Amount by which to erode the coords of each align loaded (to avoid overlap problems when chaining)
 my ($c1, $c2, $c3, $c4) = (100, 50, 400, 25); # BLAT->CHAOS score conversion parameters
 #my $max_dist_y = 10000; # Join x-monotonic into same single-chain only if at most that apart in y-species.
-my $default_lagan_dir = "/home/genome/glocal";
 my $glocal_name = (0 ? "SLAGAN" : "glocal");
 
 use Getopt::Long;
@@ -93,12 +92,7 @@ my $supermapexec = $0; my $mycwd = getcw
 die("$0: Problem resolving my name, \'$supermapexec\' is not a file") unless -f $supermapexec or $ARGV[0] eq "worker";
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-$lagan_dir = $ENV{"LAGAN_DIR"} if defined $ENV{"LAGAN_DIR"};
-$lagan_dir = $ENV{"LAGAN_DIR"} = $default_lagan_dir unless defined $ENV{"LAGAN_DIR"};
-$lagan_dir =~ s/^\.\./$mycwd\/\.\./;
-$lagan_dir =~ s/^\./$mycwd\//;
-$ENV{"LAGAN_DIR"} = $lagan_dir;
-print STDERR "$0: Warning: LAGAN_DIR=$lagan_dir is not a valid directory\n" unless -d $lagan_dir;
+$lagan_dir = $ENV{LAGAN_DIR};
 push @INC, $lagan_dir;
 
 my $SLAGAN = $lagan_dir."/".$glocal_name;
diff -up lagan20/xmfa2mfa.pl.chris lagan20/xmfa2mfa.pl
--- lagan20/xmfa2mfa.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/xmfa2mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -9,8 +9,6 @@ my ($line, $line_in, $type);
 
 my $mode = ($ARGV[0] eq "1" ? "M1" : ($ARGV[0] eq "2" ? "M2" : die("$0: Invalid base genome argument (expected 1 or 2)")));
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
-
 while (<STDIN>) {
 	$line_in = $_;
 	if ($line_in =~ /^\=.*(DM|M1|M2)$/) {
@@ -47,7 +45,7 @@ open(OUT, "> tmp.xmfa");
 foreach my $line (@filt_lines) { print OUT $line; }
 close OUT;
 
-system($ENV{"LAGAN_DIR"}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
+system($ENV{LAGAN_DIR}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
 
 open(IN, "< glue.out");
 my @glue_out = <IN>;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jan 2006 00:16:20 -0000	1.2
+++ .cvsignore	18 Sep 2007 15:52:55 -0000	1.3
@@ -1 +1 @@
-lagan12.tar.gz
+lagan20.tar.gz


Index: lagan.spec
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/lagan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lagan.spec	22 Aug 2007 12:46:52 -0000	1.4
+++ lagan.spec	18 Sep 2007 15:52:55 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           lagan
-Version:        1.21
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Local, global, and multiple alignment of DNA sequences
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://lagan.stanford.edu
-Source0:        http://lagan.stanford.edu/lagan_web/lagan12.tar.gz
-Patch0:         lagan12-chris.patch
+Source0:        http://lagan.stanford.edu/lagan_web/lagan20.tar.gz
+Patch0:         lagan20-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,17 +25,20 @@
 
 
 %prep
-%setup -q -n lagan12
+%setup -q -n lagan20
 %patch0 -p1 -b .chris
 sed -i 's/^CC .*$/CC = gcc $(RPM_OPT_FLAGS)/;
-	s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
-sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' *.c* utils/*.c*
-sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl utils/*.pl
-sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle
+        s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
+sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' src/*.c src/utils/*.c
+sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' src/utils/*.cpp
+sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl src/*.pl utils/*.pl src/utils/*.pl
+sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle src/*.c
+rm prolagan
+chmod -x src/glocal/*
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -43,18 +46,20 @@
 mkdir -p $RPM_BUILD_ROOT/%_bindir $RPM_BUILD_ROOT/%_libdir/lagan/utils
 install -m755 chaos ${RPM_BUILD_ROOT}%{_bindir}
 install -m755 mlagan ${RPM_BUILD_ROOT}%{_bindir}
+install -m755 prolagan ${RPM_BUILD_ROOT}%{_bindir}
 install -m755 lagan.pl ${RPM_BUILD_ROOT}%{_bindir}/lagan
 install -m755 slagan.pl ${RPM_BUILD_ROOT}%{_bindir}/slagan
-for f in anal_gloc.pl anchors glocal order rechaos.pl; do
+for f in anal_gloc.pl anchors glocal order rechaos.pl \
+  supermap.pl xmfa2mfa.pl; do
   install -m755 $f $RPM_BUILD_ROOT/%_libdir/lagan
 done
 for f in bin2bl bin2mf cextract cmerge2.pl contigorder cstat dotplot \
   draft.pl fa2xfa getbounds getcontigpos getlength getoverlap Glue \
   mextract.pl mf2bin.pl mpretty.pl mproject.pl mrunfile.pl mrunpairs.pl \
-  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge; do
+  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge overlay; do
   install -m755 utils/$f $RPM_BUILD_ROOT/%_libdir/lagan/utils
 done
-install -m644 *.txt $RPM_BUILD_ROOT/%_libdir/lagan
+install -m644 *.txt *.score $RPM_BUILD_ROOT/%_libdir/lagan
 rm -f Readmes/*.chris
 
 
@@ -69,11 +74,15 @@
 %_bindir/lagan
 %_bindir/mlagan
 %_bindir/slagan
+%_bindir/prolagan
 %_libdir/lagan/
 
 
 
 %changelog
+* Tue Sep 18 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream release.
+
 * Wed Aug 22 2007 Christian Iseli <Christian.Iseli at licr.org> 1.21-4
  - Fix License tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jan 2006 00:16:20 -0000	1.2
+++ sources	18 Sep 2007 15:52:55 -0000	1.3
@@ -1 +1 @@
-e45c9287d04b31924115869588f1fb61  lagan12.tar.gz
+da0948fbd76c2c92ae587d3a5db510fa  lagan20.tar.gz


--- lagan12-chris.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 15:56:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 08:56:33 -0700
Subject: [pkgdb] nut (Fedora EPEL, 4) updated by kevin
Message-ID: <200709181556.l8IFuYSV007628@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for nut
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nut (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nut (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nut (Fedora EPEL 4)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 15:56:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 08:56:33 -0700
Subject: [pkgdb] nut (Fedora EPEL, 5) updated by kevin
Message-ID: <200709181556.l8IFuZ6N007639@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for nut
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nut (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nut (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nut (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 15:57:21 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 11:57:21 -0400
Subject: comps comps-f8.xml.in,1.112,1.113
Message-ID: <200709181557.l8IFvLvf024738@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623

Modified Files:
	comps-f8.xml.in 
Log Message:
Add Mylyn, Subclipse, ChangeLog editor, and specfile editor to Fedora Eclipse group.


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- comps-f8.xml.in	18 Sep 2007 13:41:24 -0000	1.112
+++ comps-f8.xml.in	18 Sep 2007 15:56:50 -0000	1.113
@@ -1097,9 +1097,17 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">eclipse-cdt</packagereq>
-      <packagereq type="default">eclipse-pydev</packagereq>
+      <packagereq type="default">eclipse-changelog</packagereq>
       <packagereq type="default">eclipse-jdt</packagereq>
+      <packagereq type="default">eclipse-mylyn</packagereq>
+      <packagereq type="default">eclipse-mylyn-bugzilla</packagereq>
+      <packagereq type="default">eclipse-mylyn-ide</packagereq>
+      <packagereq type="default">eclipse-mylyn-java</packagereq>
       <packagereq type="default">eclipse-pde</packagereq>
+      <packagereq type="default">eclipse-pydev</packagereq>
+      <packagereq type="default">eclipse-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-subclipse</packagereq>
+      <packagereq type="optional">eclipse-mylyn-trac</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Tue Sep 18 15:57:29 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 11:57:29 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.485,1.486
Message-ID: <200709181557.l8IFvTOl024746@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24645

Modified Files:
	eclipse.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- eclipse.spec	10 Sep 2007 13:36:32 -0000	1.485
+++ eclipse.spec	18 Sep 2007 15:56:57 -0000	1.486
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        19%{?dist} 
+Release:        20%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -224,18 +224,6 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-# no CDT -> no changelog -> no rpm-editor
-# (upstream does not support ppc64)
-%ifnarch ppc64 alpha
-Requires: eclipse-subclipse
-Requires: eclipse-changelog
-Requires: eclipse-rpm-editor
-Requires: eclipse-mylyn
-Requires: eclipse-mylyn-ide
-Requires: eclipse-mylyn-bugzilla
-Requires: eclipse-mylyn-trac
 %endif
 
 %description    platform
@@ -260,11 +248,6 @@
 %else
 Requires:       java-javadoc >= 1.6.0
 %endif
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-java
-%endif
 %if %{gcj_support}
 Requires(post):     java-gcj-compat >= 1.0.64
 Requires(postun):   java-gcj-compat >= 1.0.64
@@ -296,11 +279,6 @@
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-pde
-%endif
 Requires(post):    %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(post):    %{name}-jdt = %{epoch}:%{version}-%{release}
@@ -1579,6 +1557,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 16:02:02 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 12:02:02 -0400
Subject: rpms/qgit/FC-6 qgit.spec,1.18,1.19
Message-ID: <200709181602.l8IG22e0031013@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30923

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:52:03 -0000	1.18
+++ qgit.spec	18 Sep 2007 16:01:25 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 16:03:56 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 12:03:56 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.5,1.6
Message-ID: <200709181603.l8IG3uHq031101@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31055

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
- Re-add gcj support (accidentally removed the flag).


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-mylyn.spec	13 Sep 2007 17:41:47 -0000	1.5
+++ eclipse-mylyn.spec	18 Sep 2007 16:02:49 -0000	1.6
@@ -1,10 +1,10 @@
-%define gcj_support         0
+%define gcj_support         1
 %define eclipse_base        %{_datadir}/eclipse
 
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -447,6 +447,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
+- Re-add gcj support (accidentally removed the flag).
+
 * Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
 - Make web.core its own jar.
 - Unpack web.core so we can symlink to dependencies.



From fedora-extras-commits at redhat.com  Tue Sep 18 16:04:40 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 12:04:40 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.486,1.487
Message-ID: <200709181604.l8IG4eoL031164@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31146/devel

Modified Files:
	eclipse.spec 
Log Message:
Remove endif that should have been removed in last commit.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- eclipse.spec	18 Sep 2007 15:56:57 -0000	1.486
+++ eclipse.spec	18 Sep 2007 16:04:08 -0000	1.487
@@ -224,7 +224,6 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-%endif
 
 %description    platform
 The Fedora Eclipse Platform is the base of all IDE plugins.  This does not include the



From fedora-extras-commits at redhat.com  Tue Sep 18 16:09:40 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 12:09:40 -0400
Subject: rpms/qgit/devel qgit.spec,1.19,1.20
Message-ID: <200709181609.l8IG9ema031279@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31260

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qgit.spec	8 Sep 2007 19:42:20 -0000	1.19
+++ qgit.spec	18 Sep 2007 16:09:07 -0000	1.20
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 16:18:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 09:18:06 -0700
Subject: [pkgdb] system-config-rootpassword: mclasen has requested commit
Message-ID: <200709181618.l8IGI7T3012898@app4.fedora.phx.redhat.com>

Matthias Clasen (mclasen) has requested the commit acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 16:19:05 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 12:19:05 -0400
Subject: rpms/clusterssh/devel clusterssh.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709181619.l8IGJ5Wa031519@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/clusterssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31444

Modified Files:
	clusterssh.spec sources 
Log Message:

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 3.19.1-3
- License clarification
- Switch back to unmodified, upstream-provided tarball



Index: clusterssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clusterssh/devel/clusterssh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clusterssh.spec	29 Aug 2006 19:25:48 -0000	1.1
+++ clusterssh.spec	18 Sep 2007 16:18:33 -0000	1.2
@@ -1,10 +1,10 @@
 Name:          clusterssh
 Version:       3.19.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Secure concurrent multi-server terminal control
 
 Group:         Applications/Productivity
-License:       GPL
+License:       GPLv2+
 URL:           http://clusterssh.sourceforge.net
 Source0:       http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +66,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 3.19.1-3
+- License clarification
+- Switch back to unmodified, upstream-provided tarball
 
 * Tue Aug 15 2006 Duncan Ferguson <duncan_ferguson at users.sf.net> - 3.19.1-2
 - Tidyups as per https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199173


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clusterssh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2006 19:25:48 -0000	1.2
+++ sources	18 Sep 2007 16:18:33 -0000	1.3
@@ -1 +1 @@
-12363dead309dca70bb6d45f4410246c  clusterssh-3.19.1.tar.gz
+578208faf944100a233ae216fa230350  clusterssh-3.19.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:20:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:20:32 -0400
Subject: rpms/eel2/devel .cvsignore, 1.51, 1.52 eel2.spec, 1.76, 1.77 sources,
	1.51, 1.52
Message-ID: <200709181620.l8IGKW6F031638@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eel2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31577

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 02:20:51 -0000	1.51
+++ .cvsignore	18 Sep 2007 16:19:59 -0000	1.52
@@ -1 +1 @@
-eel-2.19.90.tar.bz2
+eel-2.20.0.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- eel2.spec	14 Aug 2007 02:20:51 -0000	1.76
+++ eel2.spec	18 Sep 2007 16:19:59 -0000	1.77
@@ -15,7 +15,7 @@
 
 Name:        eel2
 Summary:     Eazel Extensions Library
-Version:     2.19.90
+Version:     2.20.0
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
@@ -118,6 +118,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 02:20:51 -0000	1.51
+++ sources	18 Sep 2007 16:19:59 -0000	1.52
@@ -1 +1 @@
-446e3240aa4ddfc44ef43ab6dc8891d9  eel-2.19.90.tar.bz2
+691734dc1078e05e726b4f5b8646dadf  eel-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:21:06 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 18 Sep 2007 12:21:06 -0400
Subject: rpms/octave/devel .cvsignore, 1.13, 1.14 octave.spec, 1.57,
	1.58 sources, 1.13, 1.14
Message-ID: <200709181621.l8IGL6Se031736@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31630

Modified Files:
	.cvsignore octave.spec sources 
Log Message:
New release. Fix bug 274431. Update licence tag. Add new dependency.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jul 2007 04:59:42 -0000	1.13
+++ .cvsignore	18 Sep 2007 16:20:31 -0000	1.14
@@ -1 +1 @@
-octave-2.9.13.tar.bz2
+octave-2.9.14.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- octave.spec	10 Sep 2007 16:06:58 -0000	1.57
+++ octave.spec	18 Sep 2007 16:20:31 -0000	1.58
@@ -1,14 +1,14 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v25
+%define octave_api api-v26
 
 Name:           octave
-Version:        2.9.13
-Release:        2%{?dist}
+Version:        2.9.14
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
@@ -17,7 +17,7 @@
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/install-info
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
-BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo
+BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
 BuildRequires:  suitesparse-devel glpk-devel gnuplot desktop-file-utils
 Provides:       octave(api) = %{octave_api}
@@ -137,8 +137,11 @@
 
 
 %changelog
-* Mon Sep 10 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-3
+* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1
+- New release.
 - Remove redundant menu category in desktop file (bug 274431).
+- Update license tag.
+- Add qhull-devel as new build dependency.
 
 * Thu Jul 26 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-1
 - New release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jul 2007 04:59:42 -0000	1.13
+++ sources	18 Sep 2007 16:20:31 -0000	1.14
@@ -1 +1 @@
-e78bf9c2a8d6f56e51415a4b1d70eb7a  octave-2.9.13.tar.bz2
+9c258c9320709c9ea78d24bd3d45e45f  octave-2.9.14.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:22:08 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 12:22:08 -0400
Subject: rpms/ekiga/devel .cvsignore, 1.10, 1.11 ekiga.spec, 1.39,
	1.40 sources, 1.12, 1.13
Message-ID: <200709181622.l8IGM8rR031816@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31751

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Upgrade to ekiga-2.0.11
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Apr 2007 20:46:54 -0000	1.10
+++ .cvsignore	18 Sep 2007 16:21:36 -0000	1.11
@@ -3,3 +3,4 @@
 ekiga-2.0.5.tar.gz
 ekiga-2.0.7.tar.gz
 ekiga-2.0.9.tar.gz
+ekiga-2.0.11.tar.gz


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ekiga.spec	15 Apr 2007 21:11:03 -0000	1.39
+++ ekiga.spec	18 Sep 2007 16:21:36 -0000	1.40
@@ -1,14 +1,14 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 2.0.9
+Version: 2.0.11
 Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.7
-Requires: opal >= 2.2.8
+Requires: pwlib >= 1.10.10
+Requires: opal >= 2.2.11
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -23,8 +23,8 @@
 BuildRequires: avahi-devel >= 0.6.9
 BuildRequires: avahi-glib-devel >= 0.6.9
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.7
-BuildRequires: opal-devel >= 2.2.8
+BuildRequires: pwlib-devel >= 1.10.10
+BuildRequires: opal-devel >= 2.2.11
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -93,7 +93,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
-* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9.1
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.0.11-1
+- Upgrade to ekiga-2.0.11
+
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9-1
 - Upgrade to ekiga-2.0.9
 
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.0.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Apr 2007 20:46:54 -0000	1.12
+++ sources	18 Sep 2007 16:21:36 -0000	1.13
@@ -1 +1 @@
-7dd9f812ce3b940839b12486ddee7e80  ekiga-2.0.9.tar.gz
+684865225d77898e10e960f3a286b894  ekiga-2.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:23:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:23:50 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.60, 1.61 nautilus.spec, 1.164,
	1.165 sources, 1.64, 1.65
Message-ID: <200709181623.l8IGNoU7031973@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31895

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	3 Sep 2007 05:06:08 -0000	1.60
+++ .cvsignore	18 Sep 2007 16:23:17 -0000	1.61
@@ -1 +1 @@
-nautilus-2.19.91.tar.bz2
+nautilus-2.20.0.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- nautilus.spec	3 Sep 2007 05:06:08 -0000	1.164
+++ nautilus.spec	18 Sep 2007 16:23:17 -0000	1.165
@@ -18,11 +18,11 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.19.91
+Version: 	2.20.0
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -221,6 +221,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	3 Sep 2007 05:06:08 -0000	1.64
+++ sources	18 Sep 2007 16:23:17 -0000	1.65
@@ -1 +1 @@
-0fe63741bbd8052ee0329b3312a2724c  nautilus-2.19.91.tar.bz2
+3856ec2ffeba786d12f8f6622e398c33  nautilus-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:24:28 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Tue, 18 Sep 2007 12:24:28 -0400
Subject: rpms/cyrus-sasl/devel cyrus-sasl-db-4.6.18-glibc.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 cyrus-sasl.spec, 1.59, 1.60 sources,
	1.18, 1.19
Message-ID: <200709181624.l8IGOSvQ032099@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31828

Modified Files:
	.cvsignore cyrus-sasl.spec sources 
Added Files:
	cyrus-sasl-db-4.6.18-glibc.patch 
Log Message:
Changed to db version 4.6.19


cyrus-sasl-db-4.6.18-glibc.patch:

--- NEW FILE cyrus-sasl-db-4.6.18-glibc.patch ---
--- db-4.6.18/tcl/tcl_db_pkg.c.glibc	2007-07-09 19:38:45.000000000 +0200
+++ db-4.6.18/tcl/tcl_db_pkg.c	2007-08-06 16:25:43.000000000 +0200
@@ -1377,7 +1377,7 @@ bdb_EnvOpen(interp, objc, objv, ip, env)
 	 * Now open the environment.
 	 */
 	_debug_check();
-	ret = (*env)->open(*env, home, open_flags, mode);
+	ret = ((*env)->open)(*env, home, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "env open");
 
 	if (rep_flags != 0 && result == TCL_OK) {
@@ -2215,7 +2215,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
 	_debug_check();
 
 	/* Open the database. */
-	ret = (*dbp)->open(*dbp, txn, db, subdb, type, open_flags, mode);
+	ret = ((*dbp)->open)(*dbp, txn, db, subdb, type, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "db open");
 
 error:
@@ -2476,7 +2476,7 @@ bdb_SeqOpen(interp, objc, objv, ip, seqp
 		    ret, DB_RETOK_STD(ret), "sequence init")) != TCL_OK)
 			goto error;
 	}
-	ret = (*seqp)->open(*seqp, txn, &key, oflags);
+	ret = ((*seqp)->open)(*seqp, txn, &key, oflags);
 	if ((result = _ReturnSetup(interp,
 	    ret, DB_RETOK_STD(ret), "sequence open")) != TCL_OK)
 		goto error;
--- db-4.6.18/tcl/tcl_mp.c.glibc	2007-06-22 19:41:45.000000000 +0200
+++ db-4.6.18/tcl/tcl_mp.c	2007-08-06 16:26:17.000000000 +0200
@@ -275,7 +275,7 @@ tcl_Mp(interp, objc, objv, envp, envip)
 	 * XXX
 	 * Interface doesn't currently support DB_MPOOLFILE configuration.
 	 */
-	if ((ret = mpf->open(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
+	if ((ret = (mpf->open)(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
 		result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "mpool");
 		_DeleteInfo(ip);
 
--- db-4.6.18/dbm/dbm.c.glibc	2007-05-17 17:15:07.000000000 +0200
+++ db-4.6.18/dbm/dbm.c	2007-08-06 15:26:11.000000000 +0200
@@ -230,7 +230,7 @@ __db_ndbm_open(file, oflags, mode)
 	if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
 		__os_set_errno(ret);
 		return (NULL);
--- db-4.6.18/db_hotbackup/db_hotbackup.c.glibc	2007-05-17 17:15:01.000000000 +0200
+++ db-4.6.18/db_hotbackup/db_hotbackup.c	2007-08-06 15:26:11.000000000 +0200
@@ -418,9 +418,9 @@ env_init(dbenvp, home, log_dirp, data_di
 		 * We try to attach to a pre-existing environment; if that
 		 * fails, we create a private environment and try again.
 		 */
-		if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+		if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home, DB_CREATE |
+		    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON,
 		    0)) != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ -445,7 +445,7 @@ env_init(dbenvp, home, log_dirp, data_di
 			     ret, "DB_ENV->set_cachesize: %s", home);
 			return (1);
 		}
-		if ((ret = dbenv->open(dbenv, home, DB_CREATE |
+		if ((ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE |
 		    DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
--- db-4.6.18/db_checkpoint/db_checkpoint.c.glibc	2007-05-17 17:14:58.000000000 +0200
+++ db-4.6.18/db_checkpoint/db_checkpoint.c	2007-08-06 15:26:11.000000000 +0200
@@ -141,9 +141,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (!once || ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.6.18/db_deadlock/db_deadlock.c.glibc	2007-05-17 19:17:42.000000000 +0200
+++ db-4.6.18/db_deadlock/db_deadlock.c	2007-08-06 15:26:11.000000000 +0200
@@ -157,7 +157,7 @@ main(argc, argv)
 	}
 
 	/* An environment is required. */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
 		dbenv->err(dbenv, ret, "open");
 		goto shutdown;
 	}
--- db-4.6.18/libdb_java/db_java_wrap.c.glibc	2007-06-28 16:23:38.000000000 +0200
+++ db-4.6.18/libdb_java/db_java_wrap.c	2007-08-06 15:59:38.000000000 +0200
@@ -2501,7 +2501,7 @@ SWIGINTERN db_ret_t Db_key_range(struct 
 		return self->key_range(self, txnid, key, key_range, flags);
 	}
 SWIGINTERN db_ret_t Db_open(struct Db *self,DB_TXN *txnid,char const *file,char const *database,DBTYPE type,u_int32_t flags,int mode){
-		return self->open(self, txnid, file, database,
+		return (self->open)(self, txnid, file, database,
 		    type, flags, mode);
 	}
 SWIGINTERN int Db_pget(struct Db *self,DB_TXN *txnid,DBT *key,DBT *pkey,DBT *data,u_int32_t flags){
@@ -2723,7 +2723,7 @@ SWIGINTERN db_ret_t DbEnv_lsn_reset(stru
 		return self->lsn_reset(self, file, flags);
 	}
 SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,char const *db_home,u_int32_t flags,int mode){
-		return self->open(self, db_home, flags, mode);
+		return (self->open)(self, db_home, flags, mode);
 	}
 SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *self,char const *db_home,u_int32_t flags){
 		return self->remove(self, db_home, flags);
@@ -3278,7 +3278,7 @@ SWIGINTERN db_ret_t DbSequence_initial_v
 		return self->initial_value(self, val);
 	}
 SWIGINTERN db_ret_t DbSequence_open(struct DbSequence *self,DB_TXN *txnid,DBT *key,u_int32_t flags){
-		return self->open(self, txnid, key, flags);
+		return (self->open)(self, txnid, key, flags);
 	}
 SWIGINTERN db_ret_t DbSequence_remove(struct DbSequence *self,DB_TXN *txnid,u_int32_t flags){
 		return self->remove(self, txnid, flags);
--- db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp.glibc	2007-06-28 16:01:21.000000000 +0200
+++ db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp	2007-08-06 16:36:12.000000000 +0200
@@ -336,7 +336,7 @@ __env_open_proc(
 		replyp->envcl_id = new_ctp->ct_id;
 		ret = __env_close_int(dbenvcl_id, 0, 0);
 	} else {
-		ret = dbenv->open(fullhome->home, newflags, mode);
+		ret = (dbenv->open)(fullhome->home, newflags, mode);
 		dbenv_ctp->ct_envdp.home = fullhome;
 		dbenv_ctp->ct_envdp.envflags = shareflags;
 	}
@@ -1187,7 +1187,7 @@ __db_open_proc(
 		ret = __db_close_int(dbpcl_id, 0);
 		goto out;
 	}
-	ret = dbp->open(txnp, name, subdb, (DBTYPE)type, flags, mode);
+	ret = (dbp->open)(txnp, name, subdb, (DBTYPE)type, flags, mode);
 	if (ret == 0) {
 		(void)dbp->get_type(&dbtype);
 		replyp->type = dbtype;
--- db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp.glibc	2007-05-17 17:15:52.000000000 +0200
+++ db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp	2007-08-06 16:36:26.000000000 +0200
@@ -730,7 +730,7 @@ env_recover(char *progname)
 			printf("Running recovery on %s\n", hp->home);
 		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 		    DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(hp->home, flags, 0)) != 0) {
+		if ((ret = (dbenv->open)(hp->home, flags, 0)) != 0) {
 			dbenv->err(ret, "DbEnv->open");
 			goto error;
 		}
--- db-4.6.18/rpc_server/c/db_server_util.c.glibc	2007-05-17 17:15:52.000000000 +0200
+++ db-4.6.18/rpc_server/c/db_server_util.c	2007-08-06 16:35:47.000000000 +0200
@@ -802,7 +802,7 @@ env_recover(progname)
 			printf("Running recovery on %s\n", hp->home);
 		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 		    DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) {
+		if ((ret = (dbenv->open)(dbenv, hp->home, flags, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto error;
 		}
--- db-4.6.18/rpc_server/c/db_server_proc.c.glibc	2007-06-28 15:59:24.000000000 +0200
+++ db-4.6.18/rpc_server/c/db_server_proc.c	2007-08-06 16:35:28.000000000 +0200
@@ -394,7 +394,7 @@ __env_open_proc(dbenvcl_id, home, flags,
 		replyp->envcl_id = new_ctp->ct_id;
 		ret = __env_close_int(dbenvcl_id, 0, 0);
 	} else {
-		ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
+		ret = (dbenv->open)(dbenv, fullhome->home, newflags, mode);
 		dbenv_ctp->ct_envdp.home = fullhome;
 		dbenv_ctp->ct_envdp.envflags = shareflags;
 	}
@@ -1392,7 +1392,7 @@ __db_open_proc(dbpcl_id, txnpcl_id, name
 		ret = __db_close_int(dbpcl_id, 0);
 		goto out;
 	}
-	ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
+	ret = (dbp->open)(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
 	if (ret == 0) {
 		(void)dbp->get_type(dbp, &dbtype);
 		replyp->type = dbtype;
--- db-4.6.18/db_dump/db_dump.c.glibc	2007-05-17 17:14:59.000000000 +0200
+++ db-4.6.18/db_dump/db_dump.c	2007-08-06 15:26:11.000000000 +0200
@@ -199,7 +199,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 		goto done;
 	}
 
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 		dbp->err(dbp, ret, "open: %s", argv[0]);
 		goto err;
@@ -296,7 +296,7 @@ db_init(dbenv, home, is_salvage, cache, 
 	 * before we create our own.
 	 */
 	*is_privatep = 0;
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
@@ -314,7 +314,7 @@ db_init(dbenv, home, is_salvage, cache, 
 	 */
 	*is_privatep = 1;
 	if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 
@@ -367,7 +367,7 @@ dump_sub(dbenv, parent_dbp, parent_name,
 			free(subdb);
 			return (1);
 		}
-		if ((ret = dbp->open(dbp, NULL,
+		if ((ret = (dbp->open)(dbp, NULL,
 		    parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
 			dbp->err(dbp, ret,
 			    "DB->open: %s:%s", parent_name, subdb);
--- db-4.6.18/db_codegen/code_capi.c.glibc	2007-06-05 16:06:25.000000000 +0200
+++ db-4.6.18/db_codegen/code_capi.c	2007-08-06 15:26:11.000000000 +0200
@@ -368,7 +368,7 @@ static int\nbdb_env_startup(env_list_t *
 \tif (ep->transaction)\n\
 \t	open_flags |= DB_INIT_LOCK |\n\
 \t	    DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;\n\
-\tif ((ret = dbenv->open(dbenv, ep->home, open_flags, 0)) != 0) {\n\
+\tif ((ret = (dbenv->open)(dbenv, ep->home, open_flags, 0)) != 0) {\n\
 \t	dbenv->err(dbenv, ret, \"DB_ENV->open: %%s\",  ep->home);\n\
 \t	goto err;\n\
 \t}\n\
@@ -487,7 +487,7 @@ api_c_db()
 
 	fprintf(of, "\
 \n\
-\tif ((ret = dbp->open(dbp, NULL, dp->name, NULL, dp->type,\n\
+\tif ((ret = (dbp->open)(dbp, NULL, dp->name, NULL, dp->type,\n\
 \t    (dp->transaction ? DB_AUTO_COMMIT : 0) |\n\
 \t    DB_CREATE | DB_THREAD, 0)) != 0) {\n\
 \t\tdbp->err(dbp, ret, \"DB->open: %%s\", dp->name);\n\
--- db-4.6.18/db_upgrade/db_upgrade.c.glibc	2007-05-17 17:15:04.000000000 +0200
+++ db-4.6.18/db_upgrade/db_upgrade.c	2007-08-06 15:26:11.000000000 +0200
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
 	    0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
--- db-4.6.18/db_archive/db_archive.c.glibc	2007-05-17 17:14:58.000000000 +0200
+++ db-4.6.18/db_archive/db_archive.c	2007-08-06 15:26:11.000000000 +0200
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home, DB_CREATE |
+	    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 	    DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.6.18/db_printlog/db_printlog.c.glibc	2007-06-01 17:36:50.000000000 +0200
+++ db-4.6.18/db_printlog/db_printlog.c	2007-08-06 15:26:11.000000000 +0200
@@ -173,18 +173,18 @@ main(argc, argv)
 	 * with logging, because we don't want to log the opens.
 	 */
 	if (repflag) {
-		if ((ret = dbenv->open(dbenv, home,
+		if ((ret = (dbenv->open)(dbenv, home,
 		    DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home,
+		    (ret = (dbenv->open)(dbenv, home,
 		    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
 		    != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto shutdown;
 		}
-	} else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	} else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
@@ -544,7 +544,7 @@ open_rep_db(dbenv, dbpp, dbcp)
 
 	dbp = *dbpp;
 	if ((ret =
-	    dbp->open(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
+	    (dbp->open)(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open");
 		goto err;
 	}
--- db-4.6.18/hsearch/hsearch.c.glibc	2007-05-17 17:15:39.000000000 +0200
+++ db-4.6.18/hsearch/hsearch.c	2007-08-06 15:26:11.000000000 +0200
@@ -75,7 +75,7 @@ __db_hcreate(nel)
 	if ((ret = dbp->set_pagesize(dbp, 512)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 16)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    NULL, NULL, DB_HASH, DB_CREATE, __db_omode(OWNER_RW))) != 0)
 		__os_set_errno(ret);
 
--- db-4.6.18/db_recover/db_recover.c.glibc	2007-05-17 17:15:03.000000000 +0200
+++ db-4.6.18/db_recover/db_recover.c	2007-08-06 15:26:11.000000000 +0200
@@ -138,7 +138,7 @@ main(argc, argv)
 	    DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
 	LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
 	LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE);
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
 	}
--- db-4.6.18/db185/db185.c.glibc	2007-05-17 17:14:57.000000000 +0200
+++ db-4.6.18/db185/db185.c	2007-08-06 15:37:39.000000000 +0200
@@ -227,7 +227,7 @@ __db185_open(file, oflags, mode, type, o
 	dbp->api_internal = db185p;
 
 	/* Open the database. */
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    file, NULL, type, __db_oflags(oflags), mode)) != 0)
 		goto err;
 
--- db-4.6.18/db_stat/db_stat.c.glibc	2007-07-06 17:43:57.000000000 +0200
+++ db-4.6.18/db_stat/db_stat.c	2007-08-06 15:26:11.000000000 +0200
@@ -282,9 +282,9 @@ retry:	if ((ret = db_env_create(&dbenv, 
 		 * hash databases for which we don't know the hash function).
 		 */
 		dbenv->set_errfile(dbenv, NULL);
-		ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
+		ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
 		dbenv->set_errfile(dbenv, stderr);
-		if (ret != 0 && (ret = dbp->open(
+		if (ret != 0 && (ret = (dbp->open)(
 		    dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB->open: %s", db);
 			goto err;
@@ -392,7 +392,7 @@ db_init(dbenv, home, ttype, cache, is_pr
 	 * error, I think.
 	 */
 	*is_private = 0;
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -422,7 +422,7 @@ db_init(dbenv, home, ttype, cache, is_pr
 		oflags |= DB_INIT_MPOOL;
 	if (ttype == T_LOG)
 		oflags |= DB_INIT_LOG;
-	if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.6.18/db_verify/db_verify.c.glibc	2007-05-17 17:15:05.000000000 +0200
+++ db-4.6.18/db_verify/db_verify.c	2007-08-06 15:26:11.000000000 +0200
@@ -129,7 +129,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 	 */
 	private = 0;
 	if ((ret =
-	    dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
+	    (dbenv->open)(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
 		if (ret != DB_VERSION_MISMATCH) {
 			if ((ret =
 			    dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) {
@@ -137,7 +137,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 				goto shutdown;
 			}
 			private = 1;
-			ret = dbenv->open(dbenv, home, DB_CREATE |
+			ret = (dbenv->open)(dbenv, home, DB_CREATE |
 			    DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0);
 		}
 		if (ret != 0) {
@@ -186,7 +186,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 				goto shutdown;
 			}
 
-			ret = dbp1->open(dbp1,
+			ret = (dbp1->open)(dbp1,
 			    NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
 
 			/*
--- db-4.6.18/db_load/db_load.c.glibc	2007-05-17 19:17:42.000000000 +0200
+++ db-4.6.18/db_load/db_load.c	2007-08-06 15:26:11.000000000 +0200
@@ -394,7 +394,7 @@ retry_db:
 #endif
 
 	/* Open the DB file. */
-	if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
+	if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype,
 	    DB_CREATE | (TXN_ON(dbenv) ? DB_AUTO_COMMIT : 0),
 	    __db_omode("rw-rw-rw-"))) != 0) {
 		dbp->err(dbp, ret, "DB->open: %s", name);
@@ -608,7 +608,7 @@ db_init(dbenv, home, cache, is_private)
 	/* We may be loading into a live environment.  Try and join. */
 	flags = DB_USE_ENVIRON |
 	    DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -632,7 +632,7 @@ db_init(dbenv, home, cache, is_private)
 		dbenv->err(dbenv, ret, "set_cachesize");
 		return (1);
 	}
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.6.18/xa/xa_db.c.glibc	2007-05-17 17:16:00.000000000 +0200
+++ db-4.6.18/xa/xa_db.c	2007-08-06 15:49:57.000000000 +0200
@@ -131,7 +131,7 @@ __xa_open(dbp, txn, name, subdb, type, f
 	if ((ret =
 	    __xa_set_txn(dbp, &txn, LF_ISSET(DB_AUTO_COMMIT) ? 1 : 0)) != 0)
 		return (ret);
-	if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
+	if ((ret = (xam->open)(dbp, txn, name, subdb, type, flags, mode)) != 0)
 		return (ret);
 
 	/* Wrap any DB handle method that takes a TXN ID as an argument. */
--- db-4.6.18/xa/xa.c.glibc	2007-06-29 02:25:02.000000000 +0200
+++ db-4.6.18/xa/xa.c	2007-08-06 15:43:44.000000000 +0200
@@ -206,7 +206,7 @@ __db_xa_open(xa_info, rmid, arg_flags)
 	/* Open a new environment. */
 	if (db_env_create(&dbenv, 0) != 0)
 		return (XAER_RMERR);
-	if (dbenv->open(dbenv, xa_info, XA_FLAGS, 0) != 0)
+	if ((dbenv->open)(dbenv, xa_info, XA_FLAGS, 0) != 0)
 		goto err;
 
 	/* Create the mapping. */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Sep 2006 21:08:25 -0000	1.15
+++ .cvsignore	18 Sep 2007 16:23:56 -0000	1.16
@@ -10,3 +10,4 @@
 cyrus-sasl-2.1.22.tar.gz
 cyrus-sasl-2.1.22.tar.gz.sig
 cyrus-sasl-2.1.22-nodlcompat.tar.gz
+db-4.6.19.tar.gz


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- cyrus-sasl.spec	26 Feb 2007 21:23:11 -0000	1.59
+++ cyrus-sasl.spec	18 Sep 2007 16:23:56 -0000	1.60
@@ -1,11 +1,11 @@
 %define _plugindir2 %{_libdir}/sasl2
-%define db_version 4.5.20
+%define db_version 4.6.19
 %define bootstrap_cyrus_sasl 0
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 6
+Release: 7
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -28,6 +28,7 @@
 Patch26: cyrus-sasl-2.1.22-digest-commas.patch
 Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
 Patch28: cyrus-sasl-2.1.21-keytab.patch
+Patch29: cyrus-sasl-db-4.6.18-glibc.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
@@ -128,6 +129,10 @@
 %patch27 -p1 -b .automake-1.10
 %patch28 -p1 -b .keytab
 
+pushd db-%{db_version}
+%patch29 -p1 -b .glibc27
+popd
+
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
 rm -f config/config.guess config/config.sub 
@@ -372,6 +377,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Sep 18 2007 Steve Conklin <sconklin at redhat.com> 2.1.22-7
+- use db4 version 4.6.19 bz#249737
+
 * Mon Feb 26 2007 Nalin Dahyabhai <nalin at redhat.com> 2.1.22-6
 - install config files and init scripts using -p
 - pull in patch to build with current automake (#229010, Jacek Konieczny


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	26 Feb 2007 21:23:11 -0000	1.18
+++ sources	18 Sep 2007 16:23:56 -0000	1.19
@@ -1,2 +1,2 @@
 c5c56c86a1397443d3b75b6864cb630d  cyrus-sasl-2.1.22-nodlcompat.tar.gz
-b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:27:20 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:27:20 -0400
Subject: rpms/pguiman/devel pguiman.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709181627.l8IGRKQc032278@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32230/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pguiman.spec 
Log Message:
Importing srpm




--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pguiman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:30:43 -0000	1.1
+++ .cvsignore	18 Sep 2007 16:26:48 -0000	1.2
@@ -0,0 +1 @@
+pguiman-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:26:48 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:37:09 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:37:09 -0400
Subject: rpms/pguiman/F-7 pguiman.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181637.l8IGb9cU032606@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32576

Modified Files:
	sources 
Added Files:
	pguiman.spec 
Log Message:
added spec file and edited sources file


--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:36:35 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:38:43 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:38:43 -0400
Subject: rpms/pguiman/FC-6 pguiman.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181638.l8IGchvm032707@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32665

Modified Files:
	sources 
Added Files:
	pguiman.spec 
Log Message:
added spec file and edited sources file


--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:38:11 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:38:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:38:58 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.63, 1.64 gnome-utils.spec,
	1.155, 1.156 sources, 1.67, 1.68
Message-ID: <200709181638.l8IGcwPp032712@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32687

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	17 Sep 2007 15:41:59 -0000	1.63
+++ .cvsignore	18 Sep 2007 16:38:25 -0000	1.64
@@ -1 +1 @@
-gnome-utils-2.20.0.tar.bz2
+gnome-utils-2.20.0.1.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-utils.spec	17 Sep 2007 15:41:59 -0000	1.155
+++ gnome-utils.spec	18 Sep 2007 16:38:25 -0000	1.156
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.20.0
+Version:        2.20.0.1
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	17 Sep 2007 15:41:59 -0000	1.67
+++ sources	18 Sep 2007 16:38:25 -0000	1.68
@@ -1 +1 @@
-f58f05a1eac5b04d2ebd66fcc2606251  gnome-utils-2.20.0.tar.bz2
+2d4385df2fb566b437b283bd2ce70190  gnome-utils-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:45:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:45:55 -0400
Subject: rpms/fast-user-switch-applet/devel .cvsignore, 1.4,
	1.5 fast-user-switch-applet.spec, 1.16, 1.17 sources, 1.4,
	1.5 fast-user-switch-applet-2.17.4-bug-buddy.patch, 1.2, NONE
Message-ID: <200709181645.l8IGjtuQ000541@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv508

Modified Files:
	.cvsignore fast-user-switch-applet.spec sources 
Removed Files:
	fast-user-switch-applet-2.17.4-bug-buddy.patch 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2007 15:45:17 -0000	1.4
+++ .cvsignore	18 Sep 2007 16:45:18 -0000	1.5
@@ -1 +1 @@
-fast-user-switch-applet-2.18.0.tar.bz2
+fast-user-switch-applet-2.20.0.tar.bz2


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fast-user-switch-applet.spec	17 Sep 2007 06:20:11 -0000	1.16
+++ fast-user-switch-applet.spec	18 Sep 2007 16:45:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
-Version:        2.18.0
-Release:        3%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -12,8 +12,6 @@
 Patch2:		startx.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=421090
 Patch3:		no-session.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=424615
-Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=477639
@@ -59,7 +57,6 @@
 %patch1 -p1 -b .defaults
 %patch2 -p1 -b .startx
 %patch3 -p1 -b .no-session
-%patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
 %patch6 -p1 -b .throttle
 %patch7 -p1 -b .error-dialog
@@ -118,7 +115,10 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
-* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3 
 - Don't try to throttle gnome-screensaver (#246188)
 - Make the close button on the error dialog work
 - Make the handling of large numbers of users more efficient (#353831)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2007 15:45:17 -0000	1.4
+++ sources	18 Sep 2007 16:45:18 -0000	1.5
@@ -1 +1 @@
-aefe9ea3aecc908336ae909aeee385b5  fast-user-switch-applet-2.18.0.tar.bz2
+1d1fd25b5599f7656e3fa89aa913137c  fast-user-switch-applet-2.20.0.tar.bz2


--- fast-user-switch-applet-2.17.4-bug-buddy.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 16:48:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:48:05 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.60, 1.61 gnome-panel.spec,
	1.222, 1.223 sources, 1.60, 1.61
Message-ID: <200709181648.l8IGm5uu000678@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv614

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	18 Sep 2007 03:22:30 -0000	1.60
+++ .cvsignore	18 Sep 2007 16:47:30 -0000	1.61
@@ -1 +1 @@
-gnome-panel-2.20.0.tar.bz2
+gnome-panel-2.20.0.1.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- gnome-panel.spec	18 Sep 2007 03:22:30 -0000	1.222
+++ gnome-panel.spec	18 Sep 2007 16:47:30 -0000	1.223
@@ -21,7 +21,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
@@ -316,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	18 Sep 2007 03:22:30 -0000	1.60
+++ sources	18 Sep 2007 16:47:30 -0000	1.61
@@ -1 +1 @@
-d48c13d4c9935278b29a557d89b33a45  gnome-panel-2.20.0.tar.bz2
+bead455015de6bd86bb7259e6276af9e  gnome-panel-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:25 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:25 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3P1i024869@app4.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the watchbugzilla acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:26 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:26 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3RvD024892@app4.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the watchcommits acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:34 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:34 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3aaM026364@app3.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the commit acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:04:40 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:04:40 -0400
Subject: rpms/mencal/devel mencal.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709181704.l8IH4eL2007329@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7205/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mencal.spec 
Log Message:
Commiting sources



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:43:25 -0000	1.1
+++ .cvsignore	18 Sep 2007 17:04:07 -0000	1.2
@@ -0,0 +1 @@
+mencal-2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:04:07 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:15:09 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 18 Sep 2007 13:15:09 -0400
Subject: rpms/emacs/F-7 emacs.desktop, 1.8, 1.9 emacs.spec, 1.97,
	1.98 python-mode-init.el, 1.1, NONE python-mode.el, 1.3, NONE
Message-ID: <200709181715.l8IHF9IT007612@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587

Modified Files:
	emacs.desktop emacs.spec 
Removed Files:
	python-mode-init.el python-mode.el 
Log Message:
* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
- drop broken python mode (Resolves: bz262801)
- use macro instead of variable style for buildroot.
- add pkgconfig file.

* Mon Aug 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176)
- glibc-open-macro.patch to deal with glibc turning "open" into a macro.
- leave emacs info pages in default section (Resolves: bz199008) 

* Fri Jul 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-2
- change group from Development to Utility




Index: emacs.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-7/emacs.desktop,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emacs.desktop	16 May 2005 13:11:07 -0000	1.8
+++ emacs.desktop	18 Sep 2007 17:14:37 -0000	1.9
@@ -29,6 +29,6 @@
 Icon=emacs.png
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;X-Red-Hat-Base;
+Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
 Encoding=UTF-8
 StartupWMClass=Emacs


Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-7/emacs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- emacs.spec	22 Jun 2007 20:57:04 -0000	1.97
+++ emacs.spec	18 Sep 2007 17:14:37 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -12,12 +12,10 @@
 Source2: emacs.png
 Source3: dotemacs.el
 Source4: site-start.el
-Source5: http://www.python.org/emacs/python-mode/python-mode.el
 Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
 Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz
 Source8: php-mode-init.el
 Source9: ssl.el
-Source10: python-mode-init.el
 Source11: rpm-spec-mode-init.el
 Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch
 Source13: focus-init.el
@@ -33,15 +31,20 @@
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
 Requires: emacs-common = %{version}-%{release}
 Conflicts: gettext < 0.10.40
+Provides: emacs(bin)
 
 # C and build patches
 
 # Lisp and doc patches
 
 %define paranoid 1
+%define expurgate 0
+
+%define site_lisp %{_datadir}/emacs/site-lisp
+%define pkgconfig %{_datadir}/pkgconfig
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -55,6 +58,7 @@
 Summary: GNU Emacs text editor without X support
 Group: Applications/Editors
 Requires: emacs-common = %{version}-%{release}
+Provides: emacs(bin)
 
 %description nox
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -97,7 +101,7 @@
 
 # install rest of site-lisp files
 ( cd site-lisp
-  cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
+  cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
   tar xfz %SOURCE7  # php-mode
   # xemacs compat patch for rpm-spec-mode
   patch < %SOURCE12
@@ -110,6 +114,10 @@
   rm -f tetris.el tetris.elc )
 %endif
 
+%if %{expurgate}
+rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
+%endif
+
 %build
 export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS"
 
@@ -134,13 +142,23 @@
 
 %__make %{?_smp_mflags} -C lisp updates
 
+# Create pkgconfig file
+cat > emacs.pc << EOF
+sitepkglispdir=%{site_lisp}
+sitestartdir=%{site_lisp}/site-start.d
+
+Name: emacs
+Description: GNU Emacs text editor
+Version: %{version}
+EOF
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall
 
 # let alternatives manage the symlink
-rm $RPM_BUILD_ROOT%{_bindir}/emacs
+rm %{buildroot}%{_bindir}/emacs
 
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
@@ -149,40 +167,42 @@
 %__make %{?_smp_mflags}
 
 # install the emacs without X
-install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox
+install -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
 
 # make sure movemail isn't setgid
-chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail
-
-%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{site_lisp}
-install -m 0644 %SOURCE4 %{site_lisp}/site-start.el
-install -m 0644 %SOURCE18 %{site_lisp}
-
-mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs}
-mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1}
-mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags}
+mkdir -p %{buildroot}%{site_lisp}
+install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
+install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
+
+mv %{buildroot}%{_bindir}/{etags,etags.emacs}
+mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
+mv %{buildroot}%{_bindir}/{ctags,gctags}
 
 # GNOME / KDE files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/gnu-emacs.desktop
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/pixmaps/
 
 # install site-lisp files
-install -m 0644 site-lisp/*.el{,c} %{site_lisp}
+install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
 
-mkdir -p %{site_lisp}/site-start.d
-install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d
+mkdir -p %{buildroot}%{site_lisp}/site-start.d
+install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
 
 # default initialization file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs
+mkdir -p %{buildroot}%{_sysconfdir}/skel
+install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
+
+# install pkgconfig file
+mkdir -p %{buildroot}/%{pkgconfig}
+install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # after everything is installed, remove info dir
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/*
+rm -f %{buildroot}%{_infodir}/dir
+rm %{buildroot}%{_localstatedir}/games/emacs/*
 
 #
 # create file lists
@@ -190,7 +210,7 @@
 rm -f *-filelist {common,el}-*-files
 
 ( TOPDIR=${PWD}
-  cd $RPM_BUILD_ROOT
+  cd %{buildroot}
 
   find .%{_datadir}/emacs/%{version}/lisp \
     .%{_datadir}/emacs/%{version}/leim \
@@ -204,7 +224,7 @@
 cat el-*-files common-lisp-dir-files > el-filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
@@ -226,15 +246,14 @@
 
 %post common
 for f in %{info_files}; do
-  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir --section="GNU Emacs" 2> /dev/null || :
+  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
 done
 alternatives --install %{_bindir}/etags etags %{_bindir}/etags.emacs 80
 
 %preun common
 if [ "$1" = 0 ]; then
   for f in %{info_files}; do
-    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir \
-      --section="GNU Emacs" 2> /dev/null || :
+    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
   done
   alternatives --remove etags %{_bindir}/etags.emacs
 fi
@@ -273,10 +292,25 @@
 
 %files -f el-filelist el
 %defattr(-,root,root)
+%{pkgconfig}/emacs.pc
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
+- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
+- drop broken python mode (Resolves: bz262801)
+- use macro instead of variable style for buildroot.
+- add pkgconfig file.
+
+* Mon Aug 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
+- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176)
+- glibc-open-macro.patch to deal with glibc turning "open" into a macro.
+- leave emacs info pages in default section (Resolves: bz199008) 
+
+* Fri Jul 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-2
+- change group from Development to Utility
+
 * Fri Jun  6 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-1
 - move alternatives install to posttrans scriptlet (Resolves: bz239745)
 - new release tarball from FSF (Resolves: bz245303)


--- python-mode-init.el DELETED ---


--- python-mode.el DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 17:20:15 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:20:15 -0400
Subject: rpms/zenity/devel zenity.spec,1.34,1.35
Message-ID: <200709181720.l8IHKFTl007730@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7707

Modified Files:
	zenity.spec 
Log Message:
drop yelp dependency



Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zenity.spec	18 Sep 2007 03:11:01 -0000	1.34
+++ zenity.spec	18 Sep 2007 17:19:42 -0000	1.35
@@ -19,8 +19,10 @@
 BuildRequires: which
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
-# for /usr/share/gnome/help 
-Requires: yelp
+# for /usr/share/gnome/help, we should require yelp
+# but we don't to avoid forcing firefox and libbeagle on live cds
+# via anaconda -> zenity -> ...
+#Requires: yelp
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Drop yelp dependency to avoid exploding live cds (#295091)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 17:23:18 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:23:18 -0400
Subject: rpms/mencal/F-7 mencal.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181723.l8IHNIcu007915@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7865

Modified Files:
	sources 
Added Files:
	mencal.spec 
Log Message:
Uploading for Fedora 7



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:23:24 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 13:23:24 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.15,1.16
Message-ID: <200709181723.l8IHNOKS007918@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7897

Modified Files:
	xulrunner.spec 
Log Message:
removed the crashreporter


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xulrunner.spec	18 Sep 2007 15:51:55 -0000	1.15
+++ xulrunner.spec	18 Sep 2007 17:22:52 -0000	1.16
@@ -313,7 +313,6 @@
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
-%{_libdir}/%{name}-*/crashreporter
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*



From fedora-extras-commits at redhat.com  Tue Sep 18 17:25:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:25:11 -0400
Subject: rpms/zenity/devel zenity.spec,1.35,1.36
Message-ID: <200709181725.l8IHPBJU008141@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8085

Modified Files:
	zenity.spec 
Log Message:
bump rev



Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- zenity.spec	18 Sep 2007 17:19:42 -0000	1.35
+++ zenity.spec	18 Sep 2007 17:24:38 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		zenity
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+



From fedora-extras-commits at redhat.com  Tue Sep 18 17:34:36 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 13:34:36 -0400
Subject: rpms/perl-X11-Protocol/devel .cvsignore, 1.3,
	1.4 perl-X11-Protocol.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709181734.l8IHYaDD008409@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8376

Modified Files:
	.cvsignore perl-X11-Protocol.spec sources 
Log Message:

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.56-1
- New upstream release (bugfix)
- Added BR for perl(ExtUtils::MakeMaker)
- License clarification
- Minor spec cleanup, mainly to suppress rpmlint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2006 18:07:02 -0000	1.3
+++ .cvsignore	18 Sep 2007 17:34:02 -0000	1.4
@@ -1 +1 @@
-X11-Protocol-0.55.tar.gz
+X11-Protocol-0.56.tar.gz


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-X11-Protocol.spec	15 Sep 2006 20:28:00 -0000	1.5
+++ perl-X11-Protocol.spec	18 Sep 2007 17:34:02 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           perl-X11-Protocol
-Version:        0.55
-Release:        5%{?dist}
+Version:        0.56
+Release:        1%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/X11-Protocol/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
+BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,7 +31,7 @@
 # Testing requires X - use "rpmbuild --with X"
 %if 0%{!?_with_X:1}
 %{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
-			if /Insert your test code below/;' test.pl 
+    if /Insert your test code below/;' test.pl 
 %endif
 
 perldoc -t perlartistic > Artistic
@@ -69,6 +70,12 @@
 
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.56-1
+- New upstream release (bugfix)
+- Added BR for perl(ExtUtils::MakeMaker)
+- License clarification
+- Minor spec cleanup, mainly to suppress rpmlint warnings
+
 * Fri Sep 15 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-5
 - FC-6 rebuild requests
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2006 18:07:02 -0000	1.3
+++ sources	18 Sep 2007 17:34:02 -0000	1.4
@@ -1 +1 @@
-3d914cb8945105a8b96ec1497dee47e2  X11-Protocol-0.55.tar.gz
+2260bad68d373b201b17c60d761e0f0a  X11-Protocol-0.56.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:38:40 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:38:40 -0400
Subject: rpms/mencal/FC-6 mencal.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181738.l8IHcePZ008664@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8645

Modified Files:
	sources 
Added Files:
	mencal.spec 
Log Message:
Build for FC6.



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:38:08 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:40:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:40:34 -0400
Subject: rpms/system-config-rootpassword/devel
	system-config-rootpassword.spec, 1.16, 1.17
Message-ID: <200709181740.l8IHeY6a008757@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-rootpassword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8722

Modified Files:
	system-config-rootpassword.spec 
Log Message:
fix menu categories



Index: system-config-rootpassword.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-rootpassword/devel/system-config-rootpassword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- system-config-rootpassword.spec	23 Aug 2007 17:14:14 -0000	1.16
+++ system-config-rootpassword.spec	18 Sep 2007 17:40:01 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the rootpassword
 Name: system-config-rootpassword
 Version: 1.1.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedora.redhat.com/
 License: GPL+
 ExclusiveOS: Linux
@@ -34,8 +34,9 @@
 make INSTROOT=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base                             \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+  --add-category Settings                                    \
+  --remove-category Application		                     \
   $RPM_BUILD_ROOT%{_datadir}/applications/system-config-rootpassword.desktop
 
 %find_lang %name
@@ -74,6 +75,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-rootpassword
 
 %changelog
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.1.10-4
+- Fix menu categories
+
 * Thu Aug 23 2007 Pete Graner <pgraner at redhat.com> - 1.1.10-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 17:47:47 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 18 Sep 2007 13:47:47 -0400
Subject: rpms/e2fsprogs/devel
	e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch,
	NONE, 1.1 e2fsprogs.spec, 1.80, 1.81
Message-ID: <200709181747.l8IHllf5008958@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8930

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch 
Log Message:
* Tue Sep 18 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-7
- Fix blkid fat probe when there is a real MBR (#290951)


e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch:

--- NEW FILE e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch ---
>From 3a493033ce3867a2561d60c1016dd0c03999e5eb Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Tue, 18 Sep 2007 15:29:59 +0200
Subject: [PATCH] libblkid: FAT magic is not on strict position when there is a real MBR

There is _optional_ reserved space before FAT:

   boot  | reserved | FAT | FAT | root |  data
  sector |  space   |  1  |  2  |  dir | region

for more details see:
  http://en.wikipedia.org/wiki/File_Allocation_Table

The probe_fat() code already expects reserved space and other optional
junk in MBR+FAT, but the blkid_magic array expects strictly defined
positions of FAT magic strings. That's correct for 99% partitions, but
not for situation when on the same partition is real MBR. We need to check
for FAT filesystem also when we detect MBR signature (0x55AA on address 510).

The blkid is not able to detect vfat on USB Disks where is only one
bootable partition with vfat, for example:

  # file -s /dev/sdc1
  /dev/sdc1: x86 boot sector; GRand Unified Bootloader, stage1 version
  0x3, 1st sector stage2 0x44ae, code offset 0x48, sectors/cluster 8,
  Media descriptor 0xf8, heads 4, sectors 3901408 (volumes > 32 MB) ,
  physical drive 0xdb, physical drive 0x5b, reserved 0xe, dos < 4.0
  BootSector (0x0)

  # vol_id /dev/sdc1
  ID_FS_USAGE=filesystem
  ID_FS_TYPE=vfat
  ID_FS_VERSION=FAT32
  ID_FS_UUID=0044-AE80
  ID_FS_UUID_ENC=0044-AE80
  ID_FS_LABEL=Mdv_Flash
  ID_FS_LABEL_ENC=Mdv_Flash
  ID_FS_LABEL_SAFE=Mdv_Flash

old version:
  # blkid /dev/sdc1

fixed version:
  # blkid /dev/sdc1
  /dev/sdc1: LABEL="MDV_FLASH" UUID="0044-AE80" TYPE="vfat"

Signed-off-by: Karel Zak <kzak at redhat.com>
---
 lib/blkid/probe.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index d56292e..42ec234 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -849,6 +849,7 @@ static struct blkid_magic type_array[] = {
   { "vfat",      0,   0x36,  8, "FAT12   ",             probe_fat },
   { "vfat",      0,      0,  2, "\353\220",             probe_fat_nomagic },
   { "vfat",      0,      0,  1, "\351",                 probe_fat_nomagic },
+  { "vfat",      0,  0x1fe,  2, "\125\252",             probe_fat },
   { "minix",     1,   0x10,  2, "\177\023",             0 },
   { "minix",     1,   0x10,  2, "\217\023",             0 },
   { "minix",	 1,   0x10,  2, "\150\044",		0 },
-- 
1.5.2.4




Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- e2fsprogs.spec	18 Sep 2007 13:09:34 -0000	1.80
+++ e2fsprogs.spec	18 Sep 2007 17:47:14 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -22,6 +22,7 @@
 Patch64: e2fsprogs-1.40.2-swapfs.patch
 Patch65: e2fsprogs-1.40.2-fix-open-create-modes.patch
 Patch66: e2fsprogs-1.40.2-protect-open-ops.patch
+Patch67: e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +101,9 @@
 %patch65 -p1 -b .creatmode
 # protect ->open ops from glibc open-create-mode-checker
 %patch66 -p1 -b .open
+# fix fat probe when there is a real MBR
+%patch67 -p1 -b .blkid-fat
+
 %build
 aclocal
 autoconf
@@ -260,6 +264,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Sep 18 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-7
+- Fix blkid fat probe when there is a real MBR (#290951)
+
 * Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
 - Add alpha to the header wrappers 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:05:42 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 18 Sep 2007 14:05:42 -0400
Subject: rpms/libgnome/devel libgnome-2.16.0-default-background.patch, 1.2, 
	NONE libgnome-2.18.0-default-settings.patch, 1.4, NONE
Message-ID: <200709181805.l8II5gqC015547@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15540

Removed Files:
	libgnome-2.16.0-default-background.patch 
	libgnome-2.18.0-default-settings.patch 
Log Message:
drop unused patches



--- libgnome-2.16.0-default-background.patch DELETED ---


--- libgnome-2.18.0-default-settings.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:10:18 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 18 Sep 2007 14:10:18 -0400
Subject: rpms/libgnome/devel default-background.patch, 1.1, 1.2 libgnome.spec,
	1.101, 1.102
Message-ID: <200709181810.l8IIAIpD015659@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15634

Modified Files:
	default-background.patch libgnome.spec 
Log Message:
- the location of the default background setting changed, 
  update correct schema input file


default-background.patch:

Index: default-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/default-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-background.patch	17 Sep 2007 18:06:08 -0000	1.1
+++ default-background.patch	18 Sep 2007 18:10:15 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
---- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background	2007-09-17 08:25:50.000000000 -0400
-+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in	2007-09-17 14:04:41.000000000 -0400
+--- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in.default-background	2007-09-17 08:25:50.000000000 -0400
++++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in	2007-09-17 14:04:41.000000000 -0400
 @@ -16,7 +16,7 @@
          <applyto>/desktop/gnome/background/picture_options</applyto>
          <owner>gnome</owner>
@@ -14,8 +14,8 @@
          <applyto>/desktop/gnome/background/picture_filename</applyto>
          <owner>gnome</owner>
          <type>string</type>
--	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>/usr/share/backgrounds/infinity/infinity.xml</default>
+-	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
++	<default>@datadir@/backgrounds/infinity/infinity.xml</default>
          <locale name="C">
          <short>Picture Filename</short>
          <long>File to use for the background image</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- libgnome.spec	17 Sep 2007 19:01:15 -0000	1.101
+++ libgnome.spec	18 Sep 2007 18:10:15 -0000	1.102
@@ -13,7 +13,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.20/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -188,6 +188,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 18 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- the location of the default background setting changed, 
+  update correct schema input file
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:16:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 14:16:16 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.66, 1.67 gnome-games.spec,
	1.147, 1.148 sources, 1.70, 1.71
Message-ID: <200709181816.l8IIGGpc015805@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15783

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	18 Sep 2007 04:28:43 -0000	1.66
+++ .cvsignore	18 Sep 2007 18:15:42 -0000	1.67
@@ -1 +1 @@
-gnome-games-2.20.0.tar.bz2
+gnome-games-2.20.0.1.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gnome-games.spec	18 Sep 2007 04:28:43 -0000	1.147
+++ gnome-games.spec	18 Sep 2007 18:15:42 -0000	1.148
@@ -43,7 +43,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0.1-1
+- Update to 2.20.0.1
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	18 Sep 2007 04:28:43 -0000	1.70
+++ sources	18 Sep 2007 18:15:42 -0000	1.71
@@ -1 +1 @@
-a34eda66c6e09dc8f3a0fb720788f9bd  gnome-games-2.20.0.tar.bz2
+9b30bc49e65b00fe56e3c6d7238a2e2a  gnome-games-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 18:19:51 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 14:19:51 -0400
Subject: extras-buildsys/etc plague-builder.init, 1.10,
	1.11 plague-server.init, 1.5, 1.6
Message-ID: <200709181819.l8IIJpUY015879@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15854/etc

Modified Files:
	plague-builder.init plague-server.init 
Log Message:
fix the initscript usage help output


Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plague-builder.init	12 Mar 2006 05:44:30 -0000	1.10
+++ plague-builder.init	18 Sep 2007 18:19:49 -0000	1.11
@@ -67,7 +67,7 @@
 		[ -f /var/lock/subsys/$servicename ] && restart || :
 		;;
 	*)
-		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		echo "Usage: $0 {start|stop|status|restart|condrestart}"
 		exit 1
 		;;
 esac


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plague-server.init	12 Mar 2006 05:44:30 -0000	1.5
+++ plague-server.init	18 Sep 2007 18:19:49 -0000	1.6
@@ -67,7 +67,7 @@
 		[ -f /var/lock/subsys/$servicename ] && restart || :
 		;;
 	*)
-		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		echo "Usage: $0 {start|stop|status|restart|condrestart}"
 		exit 1
 		;;
 esac



From fedora-extras-commits at redhat.com  Tue Sep 18 18:20:22 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 14:20:22 -0400
Subject: rpms/libtorrent/devel .cvsignore, 1.7, 1.8 libtorrent.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <200709181820.l8IIKMTT015903@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15850

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
Rebuilding to new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 14:06:31 -0000	1.7
+++ .cvsignore	18 Sep 2007 18:19:49 -0000	1.8
@@ -1 +1 @@
-libtorrent-0.11.4.tar.gz
+libtorrent-0.11.8.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libtorrent.spec	28 Aug 2007 21:52:14 -0000	1.15
+++ libtorrent.spec	18 Sep 2007 18:19:49 -0000	1.16
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.11.4
-Release:       2%{?dist}
+Version:       0.11.8
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut at fedoraproject dot org> - 0.11.8-1
+- New upstream version
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.11.4-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Jun 2007 14:06:31 -0000	1.8
+++ sources	18 Sep 2007 18:19:49 -0000	1.9
@@ -1 +1 @@
-cdfe5a0d9ce5d8cd8985f3fa4bd82dfd  libtorrent-0.11.4.tar.gz
+1e50de4a4f0ee6d9c643993aea9bdbf0  libtorrent-0.11.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 18:24:48 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 14:24:48 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.6,1.7
Message-ID: <200709181824.l8IIOme8016220@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
- Fix filename of webcore jar.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-mylyn.spec	18 Sep 2007 16:02:49 -0000	1.6
+++ eclipse-mylyn.spec	18 Sep 2007 18:24:16 -0000	1.7
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -434,7 +434,7 @@
 %{eclipse_base}/plugins/org.eclipse.mylyn.resources.ui_*.jar
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.help.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.web.core_*
+%{_libdir}/gcj/%{name}/mylyn-webcore*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.core_*
@@ -447,6 +447,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
+- Fix filename of webcore jar.
+
 * Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
 - Re-add gcj support (accidentally removed the flag).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:25:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 14:25:14 -0400
Subject: rpms/policycoreutils/F-7 policycoreutils-gui.patch, 1.19,
	1.20 policycoreutils-rhat.patch, 1.308,
	1.309 policycoreutils.spec, 1.421, 1.422
Message-ID: <200709181825.l8IIPElC016294@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16266

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
- Update to latest upstream policycoreutils gui


policycoreutils-gui.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-gui.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policycoreutils-gui.patch	25 Jun 2007 10:12:43 -0000	1.19
+++ policycoreutils-gui.patch	18 Sep 2007 18:25:11 -0000	1.20
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.22/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/booleansPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,227 @@
++++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
+@@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
 +#
@@ -27,7 +27,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -229,10 +228,10 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.22/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/fcontextPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,210 @@
++++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
+@@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -254,7 +253,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import seobject
 +import commands
@@ -443,10 +441,10 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.22/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/loginsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,180 @@
++++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
+@@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -469,7 +467,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands
@@ -627,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.22/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/Makefile	2007-06-22 09:31:53.000000000 -0400
++++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -665,10 +662,10 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.22/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/mappingsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,57 @@
++++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
+@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -691,7 +688,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -726,10 +722,10 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.22/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/modulesPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,182 @@
++++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
+@@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -753,7 +749,6 @@
 +import gtk.glade
 +import os
 +import commands
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -912,21 +907,102 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.22/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/polgen.glade	2007-06-25 06:05:48.000000000 -0400
-@@ -0,0 +1,1168 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-18 14:02:32.000000000 -0400
+@@ -0,0 +1,2385 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
 +<glade-interface>
 +<requires lib="gnome"/>
 +
++<widget class="GtkFileChooserDialog" id="filechooserdialog">
++  <property name="border_width">5</property>
++  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
++  <property name="local_only">True</property>
++  <property name="select_multiple">True</property>
++  <property name="show_hidden">True</property>
++  <property name="do_overwrite_confirmation">False</property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_MOUSE</property>
++  <property name="modal">False</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
++
++  <child internal-child="vbox">
++    <widget class="GtkVBox" id="dialog-vbox1">
++      <property name="visible">True</property>
++      <property name="homogeneous">False</property>
++      <property name="spacing">24</property>
++
++      <child internal-child="action_area">
++	<widget class="GtkHButtonBox" id="dialog-action_area1">
++	  <property name="visible">True</property>
++	  <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++	  <child>
++	    <widget class="GtkButton" id="button5">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-cancel</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-6</property>
++	    </widget>
++	  </child>
++
++	  <child>
++	    <widget class="GtkButton" id="button6">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="has_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-add</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-5</property>
++	    </widget>
[...4193 lines suppressed...]
 +if_stream_rules="""
@@ -7839,6 +9910,10 @@
 +')
 +"""
 +
++if_admin_rules="""
++	TEMPLATETYPE_manage_var_lib($2)
++"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
@@ -7851,10 +9926,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.22/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_log.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,89 @@
++++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7934,6 +10009,29 @@
 +	allow $1 TEMPLATETYPE_log_t:file { getattr append };
 +')
 +
++########################################
++## <summary>
++##	Allow domain to manage TEMPLATETYPE log files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_log',`
++	gen_require(`
++		type TEMPLATETYPE_log_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_file_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++')
++"""
++
++if_admin_rules="""
++	TEMPLATETYPE_manage_log($2)
 +"""
 +
 +########################### File Context ##################################
@@ -7944,10 +10042,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.22/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_run.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,95 @@
++++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8007,6 +10105,26 @@
 +	allow $1 TEMPLATETYPE_var_run_t:file r_file_perms;
 +')
 +
++########################################
++## <summary>
++##	Manage TEMPLATETYPE var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_var_run',`
++	gen_require(`
++		type TEMPLATETYPE_var_run_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_file_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++')
++
 +"""
 +
 +if_stream_rules="""\
@@ -8031,6 +10149,10 @@
 +')
 +"""
 +
++if_admin_rules="""
++	TEMPLATETYPE_manage_var_run($2)
++"""
++
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
@@ -8043,10 +10165,10 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.22/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_spool.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,105 @@
++++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8143,7 +10265,33 @@
 +	allow $1 TEMPLATETYPE_spool_t:dir rw_dir_perms;
 +	files_search_spool($1)
 +')
++
++########################################
++## <summary>
++##	Allow domain to manage TEMPLATETYPE spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_spool',`
++	gen_require(`
++		type TEMPLATETYPE_spool_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_file_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++')
++
++"""
++
++if_admin_rules="""
++	TEMPLATETYPE_manage_spool($2)
 +"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
@@ -8152,10 +10300,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.22/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/translationsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,119 @@
++++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
+@@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -8178,7 +10326,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -8275,10 +10422,10 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.22/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/usersPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,173 @@
++++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
+@@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -8301,7 +10448,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-rhat.patch,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- policycoreutils-rhat.patch	23 Jul 2007 14:31:19 -0000	1.308
+++ policycoreutils-rhat.patch	18 Sep 2007 18:25:11 -0000	1.309
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.16/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/audit2allow/Makefile	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/audit2allow/Makefile	2007-09-18 14:18:45.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -20,16 +20,55 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.16/Makefile
 --- nsapolicycoreutils/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/Makefile	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/Makefile	2007-09-18 14:18:45.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.1 policycoreutils-2.0.16/newrole/newrole.1
+--- nsapolicycoreutils/newrole/newrole.1	2007-05-04 09:14:50.000000000 -0400
++++ policycoreutils-2.0.16/newrole/newrole.1	2007-09-18 14:20:13.000000000 -0400
+@@ -47,6 +47,12 @@
+ In particular, an argument of -- -c will cause the next argument to be
+ treated as a command by most command interpreters.
+ .PP
++If a command argument is specified to newrole and the command name is found
++in /etc/selinux/newrole_pam.conf, then the pam service name listed in that
++file for the command will be used rather than the normal newrole pam
++configuration.  This allows for per-command pam configuration when
++invoked via newrole, e.g. to skip the interactive re-authentication phase.
++.PP
+ The new shell will be the shell specified in the user's entry in the 
+ .I /etc/passwd
+ file.
+@@ -81,14 +87,22 @@
+    # id -Z
+    staff_u:sysadm_r:sysadm_t:Secret
+ 
++.PP
++Running a program in a given role or level:
++   # newrole -r sysadm_r -- -c "/path/to/app arg1 arg2..."
++   # newrole -l Secret -- -c "/path/to/app arg1 arg2..."
++
+ .SH FILES
+ /etc/passwd - user account information
+ .br
+ /etc/shadow - encrypted passwords and age information
+ .br
+ /etc/selinux/<policy>/contexts/default_type - default types for roles
++.br
+ /etc/selinux/<policy>/contexts/securetty_types - securetty types for level changes
+ .br
++/etc/selinux/newrole_pam.conf - optional mapping of commands to separate pam service names
++.br
+ .SH SEE ALSO
+ .B runcon
+ (1)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.16/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-09-18 14:18:45.000000000 -0400
 @@ -16,6 +16,7 @@
   * -v	Show changes in file labels.  
   * -o	filename save list of files with incorrect context
@@ -87,7 +126,7 @@
  			break;
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.16/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-05-04 09:14:47.000000000 -0400
-+++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-09-18 14:18:45.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -116,7 +155,7 @@
  	close(fd);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.16/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/chcat	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/scripts/chcat	2007-09-18 14:18:45.000000000 -0400
 @@ -77,7 +77,7 @@
              
          if len(cats) > 0:
@@ -137,7 +176,16 @@
          if add_ind:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.16/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/fixfiles	2007-07-23 10:29:53.000000000 -0400
++++ policycoreutils-2.0.16/scripts/fixfiles	2007-09-18 14:21:45.000000000 -0400
+@@ -88,7 +88,7 @@
+                   esac; \
+                fi; \
+             done | \
+-	while read pattern ; do find $pattern \
++	while read pattern ; do sh -c "find $pattern" \
+ 		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
+ 		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
+ 		      done 2> /dev/null | \
 @@ -108,6 +108,7 @@
  
  rpmlist() {
@@ -148,7 +196,7 @@
  # 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.16/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/genhomedircon	2007-07-06 09:48:36.000000000 -0400
++++ policycoreutils-2.0.16/scripts/genhomedircon	2007-09-18 14:18:45.000000000 -0400
 @@ -193,7 +193,7 @@
  		return prefix
  		
@@ -178,7 +226,7 @@
  			    continue
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.16/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/semanage/seobject.py	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/semanage/seobject.py	2007-09-18 14:18:45.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -205,7 +253,7 @@
  			
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-2.0.16/setsebool/setsebool.c
 --- nsapolicycoreutils/setsebool/setsebool.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-09-18 14:18:45.000000000 -0400
 @@ -160,6 +160,8 @@
  		goto err;
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- policycoreutils.spec	23 Jul 2007 14:31:19 -0000	1.421
+++ policycoreutils.spec	18 Sep 2007 18:25:11 -0000	1.422
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
+- Update to latest upstream policycoreutils gui
+
 * Mon Jul 23 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-11
 - Add checkpoliicy requires
 - Fix fixfiles to report incorrect rpm



From fedora-extras-commits at redhat.com  Tue Sep 18 18:26:21 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 14:26:21 -0400
Subject: extras-buildsys ChangeLog,1.219,1.220
Message-ID: <200709181826.l8IIQLb5016378@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16360

Modified Files:
	ChangeLog 
Log Message:
fix the initscript usage help output


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- ChangeLog	20 May 2007 10:17:59 -0000	1.219
+++ ChangeLog	18 Sep 2007 18:26:18 -0000	1.220
@@ -1,3 +1,8 @@
+2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
+
+	* etc/plague-builder.init, etc/plague-server.init
+	   - Fix usage help output
+
 2007-05-20  Ville Skytt??  <ville.skytta at iki.fi>
 
     * common/AuthedXMLRPCServer.py



From fedora-extras-commits at redhat.com  Tue Sep 18 18:36:45 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:36:45 -0700
Subject: [pkgdb] xorg-x11-drv-avivo was added for ajax
Message-ID: <200709181836.l8IIakS7018606@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package xorg-x11-drv-avivo with summary Xorg driver for ATI R500+ chipsets
Warren Togami (wtogami) has approved Package xorg-x11-drv-avivo
Warren Togami (wtogami) has added a Fedora devel branch for xorg-x11-drv-avivo with an owner of ajax
Warren Togami (wtogami) has approved xorg-x11-drv-avivo in Fedora devel
Warren Togami (wtogami) has approved Package xorg-x11-drv-avivo
Warren Togami (wtogami) has set commit to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-avivo



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:20 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:20 -0700
Subject: [pkgdb] grsync was added for svahl
Message-ID: <200709181837.l8IIbLH4020323@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package grsync with summary grsync - A Gtk+ GUI for rsync
Warren Togami (wtogami) has approved Package grsync
Warren Togami (wtogami) has added a Fedora devel branch for grsync with an owner of svahl
Warren Togami (wtogami) has approved grsync in Fedora devel
Warren Togami (wtogami) has approved Package grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:35 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:35 -0700
Subject: [pkgdb] grsync (Fedora, 7) updated by wtogami
Message-ID: <200709181837.l8IIbaAh018828@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) added a Fedora 7 branch for grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora 7)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora 7)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora 7)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:36 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:36 -0700
Subject: [pkgdb] grsync (Fedora, 6) updated by wtogami
Message-ID: <200709181837.l8IIbgmf018859@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) added a Fedora 6 branch for grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora 6)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora 6)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora 6)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 18:38:16 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:38:16 -0700
Subject: [pkgdb] compiz-fusion-extras was added for drago01
Message-ID: <200709181838.l8IIcGqt020547@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package compiz-fusion-extras with summary Additional Compiz Fusion plugins for Compiz
Warren Togami (wtogami) has approved Package compiz-fusion-extras
Warren Togami (wtogami) has added a Fedora devel branch for compiz-fusion-extras with an owner of drago01
Warren Togami (wtogami) has approved compiz-fusion-extras in Fedora devel
Warren Togami (wtogami) has approved Package compiz-fusion-extras
Warren Togami (wtogami) has set commit to Approved for cvsextras on compiz-fusion-extras (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on compiz-fusion-extras (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on compiz-fusion-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-extras



From fedora-extras-commits at redhat.com  Tue Sep 18 18:38:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:38:17 -0700
Subject: [pkgdb] compiz-fusion-extras (Fedora, devel) updated by wtogami
Message-ID: <200709181838.l8IIcIOB019013@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) approved watchbugzilla on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved watchcommits on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved commit on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved build on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved approveacls on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved checkout on compiz-fusion-extras (Fedora devel) for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-extras



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 14:39:33 -0400
Subject: rpms/fast-user-switch-applet/devel
	fast-user-switch-applet-2.20.0-username.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.17, 1.18
Message-ID: <200709181839.l8IIdXlx016693@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16666

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	fast-user-switch-applet-2.20.0-username.patch 
Log Message:
fix up a patch


fast-user-switch-applet-2.20.0-username.patch:

--- NEW FILE fast-user-switch-applet-2.20.0-username.patch ---
diff -up fast-user-switch-applet-2.20.0/src/applet.c.username fast-user-switch-applet-2.20.0/src/applet.c
--- fast-user-switch-applet-2.20.0/src/applet.c.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/applet.c	2007-09-18 14:30:33.000000000 -0400
@@ -237,6 +237,7 @@ static void      sort_menu              
 static GladeXML *get_glade_xml                (const gchar    *root);
 static void      run_switch                   (FusaAppletData *adata,
 					       FusaDisplay    *display,
+					       FusaUser       *user,
 					       gboolean        use_xnest);
 static void      maybe_lock_screen            (FusaAppletData *adata,
 					       FusaDisplay    *display);
@@ -1780,12 +1781,12 @@ user_item_activate_cb (GtkWidget *menuit
 	  if (g_slist_length (unique_displays) > 1)
 	    show_display_selector_dialog (adata, unique_displays);
 	  else
-	    run_switch (adata, unique_displays->data, FALSE);
+	    run_switch (adata, unique_displays->data, user, FALSE);
 
 	  g_slist_free (unique_displays);
 	}
       else
-	run_switch (adata, displays->data, FALSE);
+	run_switch (adata, displays->data, user, FALSE);
 
       g_slist_free (displays);
     }
@@ -1801,7 +1802,7 @@ user_item_activate_cb (GtkWidget *menuit
       /* Only one display open (this one), so create a new one */
       if (g_slist_length (displays) == 1)
 	{
-	  run_switch (adata, NULL, use_xnest);
+	  run_switch (adata, NULL, user, use_xnest);
 	  g_slist_free (displays);
 	}
       /* Iterate through to find an open display */
@@ -1815,7 +1816,7 @@ user_item_activate_cb (GtkWidget *menuit
 	      if (!fusa_display_get_user (displays->data) &&
 		  (use_xnest == !!fusa_display_get_nested (displays->data)))
 		{
-		  run_switch (adata, displays->data, FALSE);
+		  run_switch (adata, displays->data, user, FALSE);
 		  /* The pointer will be invalid but !NULL after this */
 		  g_slist_free (displays);
 		  break;
@@ -1825,7 +1826,7 @@ user_item_activate_cb (GtkWidget *menuit
 	    }
 
 	  if (!displays)
-	    run_switch (adata, NULL, use_xnest);
+	    run_switch (adata, NULL, user, use_xnest);
 	}
     }
 }
@@ -1855,7 +1856,7 @@ login_screen_activate_cb (GtkMenuItem *i
     }
   g_slist_free (displays);
 
-  run_switch (adata, target, FALSE);
+  run_switch (adata, target, NULL, FALSE);
 }
 
 static void
@@ -1891,7 +1892,7 @@ login_window_activate_cb (GtkMenuItem *i
     }
   else
     {
-      run_switch (adata, target, TRUE);
+      run_switch (adata, target, NULL, TRUE);
     }
 }
 
@@ -1962,6 +1963,7 @@ selector_dialog_response_cb (GtkWidget *
 	      run_switch (res_data->adata,
 			  g_object_get_data (G_OBJECT (rbuttons->data),
 					     "fusa-applet-radio-display"),
+			  NULL,
 			  FALSE);
 	      break;
 	    }
@@ -2278,6 +2280,7 @@ get_glade_xml (const gchar *root)
 static void
 run_switch (FusaAppletData *adata,
 	    FusaDisplay    *display,
+	    FusaUser       *user,
 	    gboolean        use_xnest)
 {
   GdkScreen *screen;
@@ -2295,10 +2298,10 @@ run_switch (FusaAppletData *adata,
     }
 
   if (use_xnest)
-    fusa_manager_new_xnest (adata->manager, screen,
+    fusa_manager_new_xnest (adata->manager, screen, user,
 			    manager_new_xnest_cb, adata, NULL);
   else
-    fusa_manager_new_console (adata->manager, screen,
+    fusa_manager_new_console (adata->manager, screen, user,
 			      manager_new_console_cb, adata, NULL);
 }
 
diff -up fast-user-switch-applet-2.20.0/src/gdm-queue.h.username fast-user-switch-applet-2.20.0/src/gdm-queue.h
--- fast-user-switch-applet-2.20.0/src/gdm-queue.h.username	2007-09-18 14:31:40.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/gdm-queue.h	2007-09-18 14:36:48.000000000 -0400
@@ -35,7 +35,9 @@ G_BEGIN_DECLS
 #define GDM_CMD_VERSION			"VERSION"
 #define GDM_CMD_AUTH_LOCAL		"AUTH_LOCAL %s"
 #define GDM_CMD_FLEXI_XSERVER		"FLEXI_XSERVER"
+#define GDM_CMD_FLEXI_XSERVER_USER	"FLEXI_XSERVER_USER %s"
 #define GDM_CMD_FLEXI_XNEST		"FLEXI_XNEST %s %d %s %s"
+#define GDM_CMD_FLEXI_XNEST_USER	"FLEXI_XNEST_USER %s %s %d %s %s"
 #define GDM_CMD_CONSOLE_SERVERS		"CONSOLE_SERVERS"
 #define GDM_CMD_GET_CONFIG       	"GET_CONFIG %s" 
 #define GDM_CMD_GET_CONFIG_FILE		"GET_CONFIG_FILE"
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.h.username fast-user-switch-applet-2.20.0/src/fusa-manager.h
--- fast-user-switch-applet-2.20.0/src/fusa-manager.h.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.h	2007-09-18 14:30:33.000000000 -0400
@@ -107,11 +107,13 @@ void         fusa_manager_activate_displ
 						 GDestroyNotify              notify);
 void         fusa_manager_new_console           (FusaManager                *manager,
 						 GdkScreen                  *screen,
+						 FusaUser                   *user,
 						 FusaManagerDisplayCallback  func,
 						 gpointer                    data,
 						 GDestroyNotify              notify);
 void         fusa_manager_new_xnest             (FusaManager                *manager,
 						 GdkScreen                  *screen,
+						 FusaUser                   *user,
 						 FusaManagerDisplayCallback  func,
 						 gpointer                    data,
 						 GDestroyNotify              notify);
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.c.username fast-user-switch-applet-2.20.0/src/fusa-manager.c
--- fast-user-switch-applet-2.20.0/src/fusa-manager.c.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.c	2007-09-18 14:30:33.000000000 -0400
@@ -1686,6 +1686,7 @@ fusa_manager_activate_display (FusaManag
 void
 fusa_manager_new_console (FusaManager                *manager,
 			  GdkScreen                  *screen,
+			  FusaUser                   *user,
 			  FusaManagerDisplayCallback  func,
 			  gpointer                    data,
 			  GDestroyNotify              notify)
@@ -1694,9 +1695,14 @@ fusa_manager_new_console (FusaManager   
 
   queue_authentication (screen);
 
-  ask_gdm (gdm_callback_activate_display,
-      new_fusa_manager_with_callback (manager, func, NULL, data),
-      GDM_CMD_FLEXI_XSERVER);
+  if (user)
+    ask_gdm (gdm_callback_activate_display,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XSERVER_USER, fusa_user_get_user_name (user));
+  else
+    ask_gdm (gdm_callback_activate_display,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XSERVER);
 }
 
 /**
@@ -1710,6 +1716,7 @@ fusa_manager_new_console (FusaManager   
 void
 fusa_manager_new_xnest (FusaManager                *manager,
 			GdkScreen                  *screen,
+			FusaUser                   *user,
 			FusaManagerDisplayCallback  func,
 			gpointer                    data,
 			GDestroyNotify              notify)
@@ -1722,13 +1729,23 @@ fusa_manager_new_xnest (FusaManager     
   
   queue_authentication (screen);
 
-  ask_gdm (gdm_callback_update_displays,
-      new_fusa_manager_with_callback (manager, func, NULL, data),
-      GDM_CMD_FLEXI_XNEST,
-      gdk_display_get_name (gdk_screen_get_display (screen)),
-      (int) getuid (),
-      mit_cookie,
-      XauFileName ());
+  if (user)
+    ask_gdm (gdm_callback_update_displays,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XNEST_USER,
+	fusa_user_get_user_name (user),
+        gdk_display_get_name (gdk_screen_get_display (screen)),
+        (int) getuid (),
+        mit_cookie,
+        XauFileName ());
+  else
+    ask_gdm (gdm_callback_update_displays,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XNEST,
+        gdk_display_get_name (gdk_screen_get_display (screen)),
+        (int) getuid (),
+        mit_cookie,
+        XauFileName ());
 
   g_free (mit_cookie);
 


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fast-user-switch-applet.spec	18 Sep 2007 16:45:18 -0000	1.17
+++ fast-user-switch-applet.spec	18 Sep 2007 18:39:00 -0000	1.18
@@ -6,7 +6,7 @@
 License:        GPLv2+
 Source0:        ftp://download.gnome.org/sources/fast-user-switch-applet/2.18/fast-user-switch-applet-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=402475
-Patch0:         fast-user-switch-applet-2.17.3-username.patch
+Patch0:         fast-user-switch-applet-2.20.0-username.patch
 Patch1:         fast-user-switch-applet-2.17.3-defaults.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=421080
 Patch2:		startx.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:28 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:39:28 -0700
Subject: [pkgdb] compiz-fusion was added for drago01
Message-ID: <200709181839.l8IIdT4Y020893@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package compiz-fusion with summary Collection of Compiz Fusion plugins for Compiz
Warren Togami (wtogami) has approved Package compiz-fusion
Warren Togami (wtogami) has added a Fedora devel branch for compiz-fusion with an owner of drago01
Warren Togami (wtogami) has approved compiz-fusion in Fedora devel
Warren Togami (wtogami) has approved Package compiz-fusion
Warren Togami (wtogami) has set commit to Approved for cvsextras on compiz-fusion (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on compiz-fusion (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on compiz-fusion (Fedora devel)

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



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:30 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:39:30 -0700
Subject: [pkgdb] compiz-fusion (Fedora, devel) updated by wtogami
Message-ID: <200709181839.l8IIdU3E019365@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) approved watchbugzilla on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved watchcommits on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved commit on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved build on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved approveacls on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved checkout on compiz-fusion (Fedora devel) for krh

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



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:24 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:24 -0400
Subject: rpms/compiz-fusion - New directory
Message-ID: <200709181840.l8IIeORZ016743@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion

Log Message:
Directory /cvs/extras/rpms/compiz-fusion added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:27 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:27 -0400
Subject: rpms/compiz-fusion/devel - New directory
Message-ID: <200709181840.l8IIeRZg016757@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion/devel

Log Message:
Directory /cvs/extras/rpms/compiz-fusion/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:31 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:31 -0400
Subject: rpms/compiz-fusion Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181840.l8IIeVUo016782@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion

Added Files:
	Makefile import.log 
Log Message:
Setup of module compiz-fusion


--- NEW FILE Makefile ---
# Top level Makefile for module compiz-fusion
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:33 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:33 -0400
Subject: rpms/compiz-fusion/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709181840.l8IIeXPF016808@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compiz-fusion


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: compiz-fusion
# $Id: Makefile,v 1.1 2007/09/18 18:40:32 wtogami Exp $
NAME := compiz-fusion
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:40:40 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:40 -0400
Subject: rpms/compiz-fusion-extras - New directory
Message-ID: <200709181840.l8IIeeDg016896@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras

Log Message:
Directory /cvs/extras/rpms/compiz-fusion-extras added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:44 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:44 -0400
Subject: rpms/compiz-fusion-extras/devel - New directory
Message-ID: <200709181840.l8IIeiDA016909@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras/devel

Log Message:
Directory /cvs/extras/rpms/compiz-fusion-extras/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:49 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:49 -0400
Subject: rpms/compiz-fusion-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181840.l8IIengj016965@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras

Added Files:
	Makefile import.log 
Log Message:
Setup of module compiz-fusion-extras


--- NEW FILE Makefile ---
# Top level Makefile for module compiz-fusion-extras
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:50 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:50 -0400
Subject: rpms/compiz-fusion-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709181840.l8IIeoxc016983@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compiz-fusion-extras


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: compiz-fusion-extras
# $Id: Makefile,v 1.1 2007/09/18 18:40:49 wtogami Exp $
NAME := compiz-fusion-extras
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:40:58 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:58 -0400
Subject: rpms/grsync - New directory
Message-ID: <200709181840.l8IIew5v017037@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync

Log Message:
Directory /cvs/extras/rpms/grsync added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:02 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:02 -0400
Subject: rpms/grsync/devel - New directory
Message-ID: <200709181841.l8IIf2Co017048@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync/devel

Log Message:
Directory /cvs/extras/rpms/grsync/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:07 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:07 -0400
Subject: rpms/grsync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181841.l8IIf7D0017080@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync

Added Files:
	Makefile import.log 
Log Message:
Setup of module grsync


--- NEW FILE Makefile ---
# Top level Makefile for module grsync
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:10 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:10 -0400
Subject: rpms/grsync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709181841.l8IIfAjt017102@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grsync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: grsync
# $Id: Makefile,v 1.1 2007/09/18 18:41:08 wtogami Exp $
NAME := grsync
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:41:42 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:42 -0400
Subject: rpms/xorg-x11-drv-avivo - New directory
Message-ID: <200709181841.l8IIfgmj017324@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo

Log Message:
Directory /cvs/extras/rpms/xorg-x11-drv-avivo added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:47 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:47 -0400
Subject: rpms/xorg-x11-drv-avivo/devel - New directory
Message-ID: <200709181841.l8IIfl0H017338@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo/devel

Log Message:
Directory /cvs/extras/rpms/xorg-x11-drv-avivo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:49 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:49 -0400
Subject: rpms/xorg-x11-drv-avivo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181841.l8IIfnAP017363@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo

Added Files:
	Makefile import.log 
Log Message:
Setup of module xorg-x11-drv-avivo


--- NEW FILE Makefile ---
# Top level Makefile for module xorg-x11-drv-avivo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:51 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:51 -0400
Subject: rpms/xorg-x11-drv-avivo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709181841.l8IIfp74017381@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xorg-x11-drv-avivo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xorg-x11-drv-avivo
# $Id: Makefile,v 1.1 2007/09/18 18:41:49 wtogami Exp $
NAME := xorg-x11-drv-avivo
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:48:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 14:48:16 -0400
Subject: rpms/sugar/OLPC-2 sources,1.55,1.56 sugar.spec,1.66,1.67
Message-ID: <200709181848.l8IImGe7017487@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17456

Modified Files:
	sources sugar.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	17 Sep 2007 23:05:41 -0000	1.55
+++ sources	18 Sep 2007 18:47:43 -0000	1.56
@@ -1 +1 @@
-ccc378990246b007e967fb5301c685b4  sugar-0.65-gitb8ce5083b7.tar.bz2
+8a8612c93c6e9a8283f002f10a48665c  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sugar.spec	17 Sep 2007 23:14:14 -0000	1.66
+++ sugar.spec	18 Sep 2007 18:47:43 -0000	1.67
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070917git
+%define alphatag 20070918git
 %define commitid b8ce5083b7
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.51.%{alphatag}b8ce5083b7
+Release: 0.52.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
 - New snapshot
 - Add a patch to set the jabber server to jabber.laptop.org



From fedora-extras-commits at redhat.com  Tue Sep 18 18:50:54 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 14:50:54 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 sugar-datastore.spec, 1.27, 1.28
Message-ID: <200709181850.l8IIosPb017622@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17585

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 19:42:28 -0000	1.26
+++ .cvsignore	18 Sep 2007 18:50:22 -0000	1.27
@@ -1 +1 @@
-sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2
+sugar-datastore-0.2.2-git48ab782a01.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Sep 2007 19:42:28 -0000	1.26
+++ sources	18 Sep 2007 18:50:22 -0000	1.27
@@ -1 +1 @@
-d2eb27bb21ceea2ac55b718547160803  sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2
+442e68e24e4d8ae5dd161733efb66852  sugar-datastore-0.2.2-git48ab782a01.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sugar-datastore.spec	14 Sep 2007 19:42:28 -0000	1.27
+++ sugar-datastore.spec	18 Sep 2007 18:50:22 -0000	1.28
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070914git
-%define commitid ea13f75d6a
+%define alphatag 20070918git
+%define commitid 48ab782a01
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.23.%{alphatag}ea13f75d6a
+Release: 0.24.%{alphatag}48ab782a01
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
+- New snapshot
+
 * Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 18 19:03:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Sep 2007 15:03:37 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.34,1.35
Message-ID: <200709181903.l8IJ3bIE023916@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- em8300-kmod.spec	22 Aug 2007 05:57:16 -0000	1.34
+++ em8300-kmod.spec	18 Sep 2007 19:03:04 -0000	1.35
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.124.rc3.git2.fc8}
+%{!?kversion: %define kversion 2.6.23-0.186.rc6.git7.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.
+
 * Wed Aug 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-5
 - 0.16.3, build for kernel 2.6.23-0.124.rc3.git2.fc8.
 - Fix build with recent 2.6.23 rc kernels.



From fedora-extras-commits at redhat.com  Tue Sep 18 19:07:09 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 15:07:09 -0400
Subject: rpms/php/devel php-5.2.4-embed.patch,1.1,1.2 php.spec,1.148,1.149
Message-ID: <200709181907.l8IJ7992024109@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24047

Modified Files:
	php-5.2.4-embed.patch php.spec 
Log Message:
- fix embedded SAPI build


php-5.2.4-embed.patch:

Index: php-5.2.4-embed.patch
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php-5.2.4-embed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.2.4-embed.patch	16 Sep 2007 10:14:01 -0000	1.1
+++ php-5.2.4-embed.patch	18 Sep 2007 19:06:36 -0000	1.2
@@ -1,39 +1,12 @@
 --- php-5.2.4/sapi/embed/config.m4.embed
 +++ php-5.2.4/sapi/embed/config.m4
-@@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
+@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then
    case "$PHP_EMBED" in
      yes|shared)
        PHP_EMBED_TYPE=shared
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
-+      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(INSTALL) -m 0755 libs/libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir); \$(LN_S) libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir)/libphp$(PHP_MAJOR_VERSION).$SHLIB_DL_SUFFIX_NAME"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION)"
++      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
        ;;
      static)
        PHP_EMBED_TYPE=static
---- php-5.2.4/Makefile.global.embed
-+++ php-5.2.4/Makefile.global
-@@ -14,7 +14,7 @@ all: $(all_targets) 
- build-modules: $(PHP_MODULES)
- 
- libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -release $(PHP_VERSION) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
- 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
- 
- libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,13 +25,9 @@ install: $(all_targets) $(install_target
- install-sapi: $(OVERALL_TARGET)
- 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
- 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
--		for i in 0.0.0 0.0 0; do \
--			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
--				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
--				break; \
--			fi; \
--		done; \
-+	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME) -a \
-+		-r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
-+		$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
- 	fi
- 	@$(INSTALL_IT)
- 


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- php.spec	16 Sep 2007 10:14:01 -0000	1.148
+++ php.spec	18 Sep 2007 19:06:36 -0000	1.149
@@ -643,7 +643,8 @@
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
        $RPM_BUILD_ROOT%{_bindir}/{phptar} \
-       $RPM_BUILD_ROOT%{_datadir}/pear
+       $RPM_BUILD_ROOT%{_datadir}/pear \
+       $RPM_BUILD_ROOT%{_libdir}/libphp5.la
 
 # Remove irrelevant docs
 rm -f README.{Zeus,QNX,CVS-RULES}



From fedora-extras-commits at redhat.com  Tue Sep 18 19:07:15 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Tue, 18 Sep 2007 15:07:15 -0400
Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709181907.l8IJ7FHm024124@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23992/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion-extras.spec 
Log Message:


Initial Import



--- NEW FILE compiz-fusion-extras.spec ---
%define plugins addhelper bench crashhandler cubecaps cubereflex extrawm fadedesktop firepaint gears goto-viewport group mblur reflex scalefilter showdesktop splash trailfocus widget

Name: compiz-fusion-extras
Version: 0.5.2       
Release: 5%{?dist}
Summary: Additional Compiz Fusion plugins for Compiz      

Group: User Interface/Desktops        
License: GPLv2+       
URL: http://compiz-fusion.org            
Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{version}.tar.bz2   
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x ppc64

BuildRequires: compiz-fusion-devel = %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: gettext-devel
BuildRequires: perl(XML::Parser)
BuildRequires: mesa-libGLU-devel
BuildRequires: libXrender-devel
BuildRequires: GConf2
BuildRequires: libjpeg-devel
BuildRequires: gawk
Requires: compiz-fusion = %{version} 


%description
The Compiz Fusion Project brings 3D desktop visual effects that improve
usability of the X Window System and provide increased productivity
though plugins and themes contributed by the community giving a
rich desktop experience.

This package contains additional plugins from the Compiz Fusion Project

%package gnome
Summary: Compiz Fusion Extras gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for
Compiz Fusion Extras


%prep
%setup -q -n compiz-fusion-plugins-extra-%{version}

%build
%configure --enable-schemas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a

%find_lang compiz-fusion-plugins-extra


%post gnome
export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

for p in in %{plugins}; do
%{_bindir}/gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
done

%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
  done
fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
  done
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f compiz-fusion-plugins-extra.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml
%{_datadir}/compiz/reflection.png

%files gnome
%defattr(-,root,root,-)
%{_sysconfdir}/gconf/schemas/*.schemas

%changelog
* Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
- Fix gconf schemas install (RH #53692)
- Some build fixes

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-4
- Remove redundant buildrequires

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-3
- BuildRequire gawk

* Wed Aug 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-2
- Fix gconf schemas (un)installation

* Sat Aug 18 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-1
- Initial build




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:40:49 -0000	1.1
+++ .cvsignore	18 Sep 2007 19:06:43 -0000	1.2
@@ -0,0 +1 @@
+compiz-fusion-plugins-extra-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:40:49 -0000	1.1
+++ sources	18 Sep 2007 19:06:43 -0000	1.2
@@ -0,0 +1 @@
+866a4e5decb8b40df6bd0161dbd24a53  compiz-fusion-plugins-extra-0.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:08:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 15:08:04 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, 1.1,
	1.2 kdenetwork.spec, 1.102, 1.103
Message-ID: <200709181908.l8IJ84t2024232@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24209

Modified Files:
	kdenetwork-3.5.7-ppp.patch kdenetwork.spec 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
- fix ppp patch


kdenetwork-3.5.7-ppp.patch:

Index: kdenetwork-3.5.7-ppp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork-3.5.7-ppp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdenetwork-3.5.7-ppp.patch	17 Sep 2007 23:16:45 -0000	1.1
+++ kdenetwork-3.5.7-ppp.patch	18 Sep 2007 19:08:01 -0000	1.2
@@ -1,35 +1,39 @@
 diff -up kdenetwork-3.5.7/kppp/pppstats.cpp.ppp kdenetwork-3.5.7/kppp/pppstats.cpp
---- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 05:12:34.000000000 -0500
-+++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-08-29 09:15:50.000000000 -0400
-@@ -69,6 +69,7 @@
+--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 04:12:34.000000000 -0600
++++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-09-18 13:49:36.000000000 -0500
+@@ -69,6 +69,9 @@
   #ifndef HAVE_NET_IF_PPP_H
    #ifdef HAVE_LINUX_IF_PPP_H
     #include <linux/if.h>
-+   #include <linux/ppp_defs.h>
++   #ifndef aligned_u64
++    #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++   #endif
     #include <linux/if_ppp.h>
    #endif
   #else
-diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
---- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 04:20:37.000000000 -0400
-+++ kdenetwork-3.5.7/kppp/configure.in.in	2007-08-29 09:13:21.000000000 -0400
-@@ -26,6 +26,8 @@ AC_TRY_LINK([
-   #ifndef STREAMS 
- 
-     #if defined(linux)
-+      #include <linux/if.h>
-+      #include <linux/ppp_defs.h>
-       #include <linux/if_ppp.h>
-     #else
-       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
 diff -up kdenetwork-3.5.7/kppp/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
---- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 04:20:37.000000000 -0400
-+++ kdenetwork-3.5.7/kppp/opener.cpp	2007-08-29 09:14:29.000000000 -0400
-@@ -69,6 +69,8 @@ extern "C" int _Precvmsg(int, void*, int
+--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/opener.cpp	2007-09-18 13:46:39.000000000 -0500
+@@ -69,6 +69,9 @@ extern "C" int _Precvmsg(int, void*, int
  
  #ifndef HAVE_NET_IF_PPP_H
  #  ifdef HAVE_LINUX_IF_PPP_H
-+#    include <linux/if.h>
-+#    include <linux/ppp_defs.h>
++#    ifndef aligned_u64
++#      define aligned_u64 unsigned long long __attribute__((aligned(8)))
++#    endif
  #    include <linux/if_ppp.h>
  #  endif
  #else
+diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
+--- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/configure.in.in	2007-09-18 13:46:39.000000000 -0500
+@@ -26,6 +26,9 @@ AC_TRY_LINK([
+   #ifndef STREAMS 
+ 
+     #if defined(linux)
++      #ifndef aligned_u64
++        #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++      #endif
+       #include <linux/if_ppp.h>
+     #else
+       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
+++ kdenetwork.spec	18 Sep 2007 19:08:01 -0000	1.103
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -426,6 +426,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
+- fix ppp patch
+
 * Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
 - +Requires: jasper (kopete yahoo support)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:00 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Tue, 18 Sep 2007 15:11:00 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709181911.l8IJB0hm024435@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24397/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion.spec 
Log Message:


Initial Import



--- NEW FILE compiz-fusion.spec ---
%define plugins colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds

Name: compiz-fusion
Version: 0.5.2       
Release: 5%{?dist}
Summary: Collection of Compiz Fusion plugins for Compiz      

Group: User Interface/Desktops        
License: GPLv2+       
URL: http://compiz-fusion.org            
Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{version}.tar.bz2   
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x ppc64

BuildRequires: compiz-devel = %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: gettext-devel
BuildRequires: perl(XML::Parser)
BuildRequires: mesa-libGLU-devel
BuildRequires: libXrender-devel
BuildRequires: GConf2
BuildRequires: libjpeg-devel
BuildRequires: gawk
Requires: compiz = %{version}      



%description
The Compiz Fusion Project brings 3D desktop visual effects that improve
usability of the X Window System and provide increased productivity
though plugins and themes contributed by the community giving a
rich desktop experience


%package gnome
Summary: Compiz Fusion gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for Compiz
Fusion

%package devel
Group: Development/Libraries
Summary: Development files for Compiz-Fusion
Requires: compiz-devel >= %{version}
Requires: %{name} = %{version}

%description devel
This package contain development files required for developing other plugins


%prep
%setup -q -n %{name}-plugins-main-%{version}

%build
%configure --enable-schemas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a

#something in mock is broken?
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_bindir}/install -c -m 644 compiz-text.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/compiz-text.pc

%find_lang %{name}-plugins-main


%post gnome
export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
for p in in %{plugins}; do
%{_bindir}/gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
done

%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
  done
fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
  done
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}-plugins-main.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml

%files  gnome
%defattr(-,root,root,-)
%{_sysconfdir}/gconf/schemas/*.schemas

%files devel
%defattr(-,root,root,-)
%{_includedir}/compiz/text.h
%{_libdir}/pkgconfig/compiz-text.pc


%changelog
* Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
- Fix gconf schemas install (RH #53692)

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-4
- Remove redundant buildrequires

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-3
- BuildRequire gawk

* Wed Aug 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-2
- Fix gconf schemas (un)installation

* Sat Aug 18 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:40:32 -0000	1.1
+++ .cvsignore	18 Sep 2007 19:10:29 -0000	1.2
@@ -0,0 +1 @@
+compiz-fusion-plugins-main-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:40:32 -0000	1.1
+++ sources	18 Sep 2007 19:10:29 -0000	1.2
@@ -0,0 +1 @@
+cb5703d8e59697dd6c7b075c483e81cc  compiz-fusion-plugins-main-0.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:01 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Tue, 18 Sep 2007 12:11:01 -0700
Subject: [pkgdb] control-center (Fedora, devel) updated by toshio
Message-ID: <200709181911.l8IJB1Dc031560@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of control-center in Fedora devel to ctrl-center-team
Toshio Ernie Kuratomi (toshio) approved watchbugzilla on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved watchcommits on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved commit on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved build on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved approveacls on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved checkout on control-center (Fedora devel) for rstrode

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



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:01 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Tue, 18 Sep 2007 12:11:01 -0700
Subject: [pkgdb] control-center (Fedora, 7) updated by toshio
Message-ID: <200709181911.l8IJB2QI031576@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of control-center in Fedora 7 to ctrl-center-team
Toshio Ernie Kuratomi (toshio) approved watchbugzilla on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved watchcommits on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved commit on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved build on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved approveacls on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved checkout on control-center (Fedora 7) for rstrode

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



From fedora-extras-commits at redhat.com  Tue Sep 18 19:17:40 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Tue, 18 Sep 2007 15:17:40 -0400
Subject: comps/po sr.po,1.6,1.7
Message-ID: <200709181917.l8IJHehe024624@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24602

Modified Files:
	sr.po 
Log Message:
Updated Serbian translation


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sr.po	17 Sep 2007 19:22:12 -0000	1.6
+++ sr.po	18 Sep 2007 19:17:10 -0000	1.7
@@ -9,7 +9,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-09 00:55-0000\n"
+"PO-Revision-Date: 2007-09-18 20:14-0000\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"
@@ -840,7 +840,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 msgid "Somali Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -1072,7 +1072,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????? ???? ????????????"



From fedora-extras-commits at redhat.com  Tue Sep 18 19:19:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Tue, 18 Sep 2007 15:19:25 -0400
Subject: comps/po sr@Latn.po,1.6,1.7
Message-ID: <200709181919.l8IJJPoi024778@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24751

Modified Files:
	sr at Latn.po 
Log Message:
Updated Serbian Latin translation


Index: sr at Latn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at Latn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sr at Latn.po	17 Sep 2007 19:22:12 -0000	1.6
+++ sr at Latn.po	18 Sep 2007 19:18:54 -0000	1.7
@@ -9,7 +9,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-09 00:58-0000\n"
+"PO-Revision-Date: 2007-09-18 20:14-0000\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"
@@ -840,7 +840,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 msgid "Somali Support"
-msgstr "Podr??ka za somali"
+msgstr "Podr??ka za somalski"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -1072,7 +1072,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Stariji paketi batmapiranih i vektorskih fontova"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Podr??ka za somali"



From fedora-extras-commits at redhat.com  Tue Sep 18 19:21:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 15:21:48 -0400
Subject: rpms/gnome-games/devel sources,1.71,1.72
Message-ID: <200709181921.l8IJLmAw024875@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	sources 
Log Message:
grr



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	18 Sep 2007 18:15:42 -0000	1.71
+++ sources	18 Sep 2007 19:21:15 -0000	1.72
@@ -1 +1 @@
-9b30bc49e65b00fe56e3c6d7238a2e2a  gnome-games-2.20.0.1.tar.bz2
+b852cfe1f65c076b8af4fa9c7383a35f  gnome-games-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:23:51 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 18 Sep 2007 15:23:51 -0400
Subject: devel/pirut .cvsignore, 1.69, 1.70 pirut.spec, 1.72, 1.73 sources, 
	1.71, 1.72
Message-ID: <200709181923.l8IJNpdW025061@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24988

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
- Make reboot vs warnings clearer (#292011)
- Select on row activation in lists (#292261)
- Don't show the (truncated) URL being downloaded (#292271)
- Fix handling of already mounted volumes
- Search improvements (skvidal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	12 Sep 2007 19:52:44 -0000	1.69
+++ .cvsignore	18 Sep 2007 19:23:19 -0000	1.70
@@ -1 +1 @@
-pirut-1.3.18.tar.gz
+pirut-1.3.19.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pirut.spec	12 Sep 2007 19:52:44 -0000	1.72
+++ pirut.spec	18 Sep 2007 19:23:19 -0000	1.73
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.18
+Version: 1.3.19
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -76,6 +76,13 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
+- Make reboot vs warnings clearer (#292011)
+- Select on row activation in lists (#292261)
+- Don't show the (truncated) URL being downloaded (#292271)
+- Fix handling of already mounted volumes
+- Search improvements (skvidal)
+
 * Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
 - Add multiple selection in package view (#266141)
 - Make things like rpmnew/rpmsave more obvious to the user rather 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	12 Sep 2007 19:52:44 -0000	1.71
+++ sources	18 Sep 2007 19:23:19 -0000	1.72
@@ -1 +1 @@
-55618b3def8243c3d7aed4efd25a674b  pirut-1.3.18.tar.gz
+f2b2b5821814c6d78ce0ee92ccc5226e  pirut-1.3.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 19:31:52 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 18 Sep 2007 15:31:52 -0400
Subject: rpms/dclib/devel 01-dclib-0.3.10-remove-cmd4.patch, NONE,
	1.1 02-dclib-0.3.10-use-gnulib-md5.patch, NONE,
	1.1 03-dclib-0.3.10-use-new-md5-api.patch, NONE,
	1.1 04-dclib-0.3.10-gnulib-md5-configure-test.patch, NONE,
	1.1 dclib.spec, 1.12, 1.13 dclib-0.3.8-cconfig-use-cfile.patch,
	1.1, NONE
Message-ID: <200709181931.l8IJVqCg025255@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25221

Modified Files:
	dclib.spec 
Added Files:
	01-dclib-0.3.10-remove-cmd4.patch 
	02-dclib-0.3.10-use-gnulib-md5.patch 
	03-dclib-0.3.10-use-new-md5-api.patch 
	04-dclib-0.3.10-gnulib-md5-configure-test.patch 
Removed Files:
	dclib-0.3.8-cconfig-use-cfile.patch 
Log Message:
* Tue Sep 18 2007 Luke Macken <lmacken at redhat.com> 0.3.10-2
- Remove RSA MD5 implementation in favor of the gnulib implementation.  Patches
  taken from upstream ticket:
  https://sourceforge.net/tracker/?func=detail&atid=897767&aid=1796674&group_id
=181579



01-dclib-0.3.10-remove-cmd4.patch:

--- NEW FILE 01-dclib-0.3.10-remove-cmd4.patch ---
diff -Naur dclib-0.3.10.orig/dclib/core/cmd4.cpp dclib-0.3.10/dclib/core/cmd4.cpp
--- dclib-0.3.10.orig/dclib/core/cmd4.cpp	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd4.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,286 +0,0 @@
-/*
- **********************************************************************
- ** md4.c							     **
- ** RSA Data Security, Inc. MD4 Message Digest Algorithm	     **
- ** Created: 2/17/90 RLR					     **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version		     **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **								     **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD4 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.					     **
- **								     **
- ** License is also granted to make and use derivative works	     **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD4 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.	     **
- **								     **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **								     **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.				     **
- **********************************************************************
- */
-
-#include <string.h>
-#include "cmd4.h"
-
-static unsigned char PADDING[64] = {
-  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/* F, G and H are basic MD4 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG and HH are MD4 transformations for rounds 1, 2 and 3 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s)  {(a) += F ((b), (c), (d)) + (x);  (a) = ROTATE_LEFT ((a), (s));}
-#define GG(a, b, c, d, x, s)   {(a) += G ((b), (c), (d)) + (x) + (UINT4)013240474631;    (a) = ROTATE_LEFT ((a), (s));}
-#define HH(a, b, c, d, x, s) {(a) += H ((b), (c), (d)) + (x) + (UINT4)015666365641; (a) = ROTATE_LEFT ((a), (s));}
-
-MD4::MD4()
-{
-	init();
-}
-
-void MD4::init()
-{
-  mdContext.i[0] = mdContext.i[1] = (UINT4)0;
-
-  /* Load magic initialization constants.
-   */
-  mdContext.buf[0] = (UINT4)0x67452301;
-  mdContext.buf[1] = (UINT4)0xefcdab89;
-  mdContext.buf[2] = (UINT4)0x98badcfe;
-  mdContext.buf[3] = (UINT4)0x10325476;
-}
-
-void MD4::update(FILE *file){
-
-  unsigned char buffer[1024*1024];
-  int len;
-
-  while ( (len=fread(buffer, 1, 1024*1024, file)) > 0)
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-void MD4::update(unsigned char *inBuf,unsigned int inLen)
-{
-  UINT4 in[16];
-  int mdi;
-  unsigned int i, ii;
-
-  /* compute number of bytes mod 64 */
-  mdi = (int)((mdContext.i[0] >> 3) & 0x3F);
-
-  /* update number of bits */
-  if ((mdContext.i[0] + ((UINT4)inLen << 3)) < mdContext.i[0])
-    mdContext.i[1]++;
-  mdContext.i[0] += ((UINT4)inLen << 3);
-  mdContext.i[1] += ((UINT4)inLen >> 29);
-
-  while (inLen--) {
-    /* add new character to buffer, increment mdi */
-    mdContext.in[mdi++] = *inBuf++;
-
-    /* transform if necessary */
-    if (mdi == 0x40) {
-      for (i = 0, ii = 0; i < 16; i++, ii += 4)
-	in[i] = (((UINT4)mdContext.in[ii+3]) << 24) |
-		(((UINT4)mdContext.in[ii+2]) << 16) |
-		(((UINT4)mdContext.in[ii+1]) << 8) |
-		((UINT4)mdContext.in[ii]);
-      transform (mdContext.buf, in);
-      mdi = 0;
-    }
-  }
-}
-
-void MD4::finalize ()
-{
-  UINT4 in[16];
-  int mdi;
-  unsigned int i, ii;
-  unsigned int padLen;
-
-  /* save number of bits */
-  in[14] = mdContext.i[0];
-  in[15] = mdContext.i[1];
-
-  /* compute number of bytes mod 64 */
-  mdi = (int)((mdContext.i[0] >> 3) & 0x3F);
-
-  /* pad out to 56 mod 64 */
-  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
-  update ( PADDING, padLen);
-
-  /* append length in bits and transform */
-  for (i = 0, ii = 0; i < 14; i++, ii += 4)
-    in[i] = (((UINT4)mdContext.in[ii+3]) << 24) |
-	    (((UINT4)mdContext.in[ii+2]) << 16) |
-	    (((UINT4)mdContext.in[ii+1]) << 8) |
-	    ((UINT4)mdContext.in[ii]);
-  transform (mdContext.buf, in);
-  /* store buffer in digest */
-  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-    mdContext.digest[ii] = (unsigned char)(mdContext.buf[i] & 0xFF);
-
-
-    mdContext.digest[ii+1] =
-      (unsigned char)((mdContext.buf[i] >> 8) & 0xFF);
-    mdContext.digest[ii+2] =
-      (unsigned char)((mdContext.buf[i] >> 16) & 0xFF);
-    mdContext.digest[ii+3] =
-      (unsigned char)((mdContext.buf[i] >> 24) & 0xFF);
-  }
-}
-
-/* Basic MD4 step. Transform buf based on in.
- */
-void MD4::transform (UINT4 *buf,UINT4 *in)
-{
-  UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
-  /* Round 1 */
-  FF (a, b, c, d, in[ 0],  3);
-  FF (d, a, b, c, in[ 1],  7);
-  FF (c, d, a, b, in[ 2], 11);
-  FF (b, c, d, a, in[ 3], 19);
-  FF (a, b, c, d, in[ 4],  3);
-  FF (d, a, b, c, in[ 5],  7);
-  FF (c, d, a, b, in[ 6], 11);
-  FF (b, c, d, a, in[ 7], 19);
-  FF (a, b, c, d, in[ 8],  3);
-  FF (d, a, b, c, in[ 9],  7);
-  FF (c, d, a, b, in[10], 11);
-  FF (b, c, d, a, in[11], 19);
-  FF (a, b, c, d, in[12],  3);
-  FF (d, a, b, c, in[13],  7);
-  FF (c, d, a, b, in[14], 11);
-  FF (b, c, d, a, in[15], 19);
-
-  /* Round 2 */
-  GG (a, b, c, d, in[ 0],  3);
-  GG (d, a, b, c, in[ 4],  5);
-  GG (c, d, a, b, in[ 8],  9);
-  GG (b, c, d, a, in[12], 13);
-  GG (a, b, c, d, in[ 1],  3);
-  GG (d, a, b, c, in[ 5],  5);
-  GG (c, d, a, b, in[ 9],  9);
-  GG (b, c, d, a, in[13], 13);
-  GG (a, b, c, d, in[ 2],  3);
-  GG (d, a, b, c, in[ 6],  5);
-  GG (c, d, a, b, in[10],  9);
-  GG (b, c, d, a, in[14], 13);
-  GG (a, b, c, d, in[ 3],  3);
-  GG (d, a, b, c, in[ 7],  5);
-  GG (c, d, a, b, in[11],  9);
-  GG (b, c, d, a, in[15], 13);
-
-  /* Round 3 */
-  HH (a, b, c, d, in[ 0],  3);
-  HH (d, a, b, c, in[ 8],  9);
-  HH (c, d, a, b, in[ 4], 11);
-  HH (b, c, d, a, in[12], 15);
-  HH (a, b, c, d, in[ 2],  3);
-  HH (d, a, b, c, in[10],  9);
-  HH (c, d, a, b, in[ 6], 11);
-  HH (b, c, d, a, in[14], 15);
-  HH (a, b, c, d, in[ 1],  3);
-  HH (d, a, b, c, in[ 9],  9);
-  HH (c, d, a, b, in[ 5], 11);
-  HH (b, c, d, a, in[13], 15);
-  HH (a, b, c, d, in[ 3],  3);
-  HH (d, a, b, c, in[11],  9);
-  HH (c, d, a, b, in[ 7], 11);
-  HH (b, c, d, a, in[15], 15);
-
-  buf[0] += a;
-  buf[1] += b;
-  buf[2] += c;
-  buf[3] += d;
-}
-
-/** */
-unsigned char *MD4::raw_digest()
-{
-
-  unsigned char *s = new unsigned char[16];
-/*
-  if (!finalized){
-    cerr << "MD4::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-*/
-  memcpy(s, mdContext.digest, 16);
-  return s;
-}
-
-/** */
-void MD4::raw_digest( unsigned char * s )
-{
-/*
-  if (!finalized){
-    cerr << "MD4::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-*/
-  memcpy(s, mdContext.digest, 16);
-}
-
-/** */
-CString MD4::hex_digest( unsigned char * p )
-{
-	CString s;
-	int i;
-	char c[3];
-	unsigned char *dig;
-
-/*
-  if (!finalized){
-    cerr << "MD4::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return "";
-  }
-*/
-
-	if ( p == 0 )
-		dig = mdContext.digest;
-	else
-		dig = p;
-
-	for (i=0; i<16; i++)
-	{
-		sprintf(c, "%02x", dig[i]);
-		c[2] = 0;
-		s += c;
-	}
-
-	return s;
-}
diff -Naur dclib-0.3.10.orig/dclib/core/cmd4.h dclib-0.3.10/dclib/core/cmd4.h
--- dclib-0.3.10.orig/dclib/core/cmd4.h	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd4.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-/*
- **********************************************************************
- ** md4.h -- Header file for implementation of MD4		     **
- ** RSA Data Security, Inc. MD4 Message Digest Algorithm	     **
- ** Created: 2/17/90 RLR					     **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version 	     **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **								     **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD4 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.					     **
- **								     **
- ** License is also granted to make and use derivative works	     **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD4 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.	     **
- **								     **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **								     **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.				     **
- **********************************************************************
- */
-
-#ifndef CMD4_H
-#define CMD4_H
-
-#include <stdio.h>
-#include <dclib/dcos.h>
-#include <dclib/core/cstring.h>
-
-#ifndef WIN32
-#include <fstream>
-#include <iostream>
-using namespace std;
-#else
-#include <fstream.h>
-#include <iostream.h>
-#endif
-
-/* typedef a 32 bit type */
-typedef unsigned long int UINT4;
-
-/* Data structure for MD4 (Message Digest) computation */
-typedef struct {
-  UINT4 i[2];			/* number of _bits_ handled mod 2^64 */
-  UINT4 buf[4]; 				   /* scratch buffer */
-  unsigned char in[64]; 			     /* input buffer */
-  unsigned char digest[16];	/* actual digest after MD4Final call */
-} MD4_CTX;
-
-class MD4 {
-
-public:
-	MD4();
-	virtual ~MD4() {};
-	void init ();
-	void update(unsigned char *inBuf,unsigned int inLen);
-	void  update     (FILE *file);
-	void finalize ();
-
-	unsigned char *raw_digest ();  // digest as a 16-byte binary array
-	void raw_digest( unsigned char * s );  // digest as a 16-byte binary array
-
-	CString hex_digest(  unsigned char * p = 0 );  // digest as a 33-byte ascii-hex string
-private:
-	void transform (UINT4 *buf,UINT4 *in);
-	MD4_CTX mdContext;
-};
-
-#endif
diff -Naur dclib-0.3.10.orig/dclib/core/Makefile.am dclib-0.3.10/dclib/core/Makefile.am
--- dclib-0.3.10.orig/dclib/core/Makefile.am	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/Makefile.am	2007-09-18 10:25:39.000000000 +0100
@@ -8,7 +8,7 @@
 cdir.cpp cdir.h cfile.cpp cfile.h che3.cpp che3.h \
 clist.cpp clist.h clisten.cpp \
 clisten.h clogfile.cpp clogfile.h cmanager.cpp cmanager.h \
-cmd4.cpp cmd4.h cmd5.cpp cmd5.h cobject.cpp cobject.h \
+cmd5.cpp cmd5.h cobject.cpp cobject.h \
 cplugin.cpp cplugin.h csingleton.cpp csingleton.h \
 csocket.cpp csocket.h cssl.cpp cssl.h cstring.cpp \
 cstring.h cstringlist.cpp cstringlist.h cthread.cpp \
@@ -25,7 +25,7 @@
 library_includedir=$(includedir)/dclib/core
 library_include_HEADERS = casyncdns.h cbase32.h cbase64.h cbytearray.h cbz.h ccallback.h \
 cconnection.h cdir.h cfile.h che3.h clist.h \
-clisten.h clogfile.h cmanager.h cmd4.h cmd5.h cobject.h \
+clisten.h clogfile.h cmanager.h cmd5.h cobject.h \
 cplugin.h csingleton.h csocket.h cssl.h cstring.h \
 cstringlist.h cthread.h cxml.h filecopy.h types.h \
 platform.h czlib.h

02-dclib-0.3.10-use-gnulib-md5.patch:

--- NEW FILE 02-dclib-0.3.10-use-gnulib-md5.patch ---
--- dclib-0.3.10.orig/dclib/core/cmd5.h	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd5.h	2007-09-18 13:20:32.000000000 +0100
@@ -1,124 +1,124 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
+/* Declaration of functions and data types used for MD5 sum computing
+   library functions.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+      Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5.H - header file for MD5C.C
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-#ifndef CMD5_H
-#define CMD5_H
+#ifndef _MD5_H
+#define _MD5_H 1
 
 #include <stdio.h>
-#include <dclib/dcos.h>
-#include <dclib/core/cstring.h>
-
-#ifndef WIN32
-#include <fstream>
-#include <iostream>
-using namespace std;
-#else
-#include <fstream.h>
-#include <iostream.h>
-#endif
+#include <stdint.h>
 
-class CMD5 {
-
-public:
-// methods for controlled operation:
-  CMD5              ();  // simple initializer
-  virtual ~CMD5() {};
-  void  update     (unsigned char *input, unsigned int input_length);
-  void  update     (istream& stream);
-  void  update     (FILE *file);
-  void  update     (ifstream& stream);
-  void  finalize   ();
-
-// constructors for special circumstances.  All these constructors finalize
-// the MD5 context.
-  CMD5              (unsigned char *string); // digest string, finalize
-  CMD5              (istream& stream);       // digest stream, finalize
-  CMD5              (FILE *file);            // digest file, close, finalize
-  CMD5              (ifstream& stream);      // digest stream, close, finalize
-
-// methods to acquire finalized result
-  unsigned char    *raw_digest ();  // digest as a 16-byte binary array
-  CString           hex_digest ();  // digest as a 33-byte ascii-hex string
-  friend ostream&   operator<< (ostream&, CMD5 context);
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
 
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min)					\
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
 
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
 
-private:
-
-// first, some types:
-  typedef unsigned       int uint4; // assumes integer is 4 words long
-  typedef unsigned short int uint2; // assumes short integer is 2 words long
-  typedef unsigned      char uint1; // assumes char is 1 word long
-
-// next, the private data:
-  uint4 state[4];
-  uint4 count[2];     // number of *bits*, mod 2^64
-  uint1 buffer[64];   // input buffer
-  uint1 digest[16];
-  uint1 finalized;
-
-// last, the private methods, mostly static:
-  void init             ();               // called by all constructors
-  void transform        (uint1 *buffer);  // does the real update work.  Note 
-                                          // that length is implied to be 64.
-
-  static void encode    (uint1 *dest, uint4 *src, uint4 length);
-  static void decode    (uint4 *dest, uint1 *src, uint4 length);
-  static void memcpy    (uint1 *dest, uint1 *src, uint4 length);
-  static void memset    (uint1 *start, uint1 val, uint4 length);
-
-  static inline uint4  rotate_left (uint4 x, uint4 n);
-  static inline uint4  F           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  G           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  H           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  I           (uint4 x, uint4 y, uint4 z);
-  static inline void   FF  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   GG  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   HH  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   II  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
 
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  uint32_t A;
+  uint32_t B;
+  uint32_t C;
+  uint32_t D;
+
+  uint32_t total[2];
+  uint32_t buflen;
+  uint32_t buffer[32];
 };
 
-#endif
+/*
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
+ */
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *__md5_buffer (const char *buffer, size_t len,
+			   void *resblock) __THROW;
+
+#endif /* md5.h */
--- dclib-0.3.10.orig/dclib/core/cmd5.cpp	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd5.cpp	2007-09-18 11:24:43.000000000 +0100
@@ -1,544 +1,451 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
+/* Functions to compute MD5 message digest of files or memory blocks.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
 
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
+#include <config.h>
 
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
+#include "cmd5.h"
 
-These notices must be retained in any copies of any part of this
-documentation and/or software.
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 
- */
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
-#include "cmd5.h"
+#ifdef _LIBC
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN 1
+# endif
+/* We need to keep the namespace clean so define the MD5 function
+   protected using leading __ .  */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
 
-#ifndef WIN32
-#include <strings.h>
-#include <iostream>
+#ifdef WORDS_BIGENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
-#include <iostream.h>
+# define SWAP(n) (n)
 #endif
 
-#include <assert.h>
-
-// MD5 simple initialization method
-
-CMD5::CMD5(){
-
-  init();
-
-}
-
-
-
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block, and updating the
-// context.
-
-void CMD5::update (uint1 *input, uint4 input_length) {
-
-  uint4 input_index, buffer_index;
-  uint4 buffer_space;                // how much space is left in buffer
-
-  if (finalized){  // so we can't update!
-    cerr << "MD5::update:  Can't update a finalized digest!" << endl;
-    return;
-  }
-
-  // Compute number of bytes mod 64
-  buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
-
-  // Update number of bits
-  if (  (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
-    count[1]++;
-
-  count[1] += ((uint4)input_length >> 29);
-
-
-  buffer_space = 64 - buffer_index;  // how much space is left in buffer
-
-  // Transform as many times as possible.
-  if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
-    // fill the rest of the buffer and transform
-    memcpy (buffer + buffer_index, input, buffer_space);
-    transform (buffer);
-
-    // now, transform each 64-byte piece of the input, bypassing the buffer
-    for (input_index = buffer_space; input_index + 63 < input_length; 
-	 input_index += 64)
-      transform (input+input_index);
-
-    buffer_index = 0;  // so we can buffer remaining
-  }
-  else
-    input_index=0;     // so we can buffer the whole input
-
-
-  // and here we do the buffering:
-  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);
-}
-
-
-
-// MD5 update for files.
-// Like above, except that it works on files (and uses above as a primitive.)
-
-void CMD5::update(FILE *file){
-
-  unsigned char buffer[1024*1024];
-  int len;
-
-  while ( (len=fread(buffer, 1, 1024*1024, file)) > 0)
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-
-
-
-
-
-// MD5 update for istreams.
-// Like update for files; see above.
-
-void CMD5::update(istream& stream){
-
-  unsigned char buffer[1024];
-  int len;
-
-  while (stream.good()){
-    stream.read((char*)buffer, 1024); // note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
-
-}
-
-
-
-
-
-
-// MD5 update for ifstreams.
-// Like update for files; see above.
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
 
-void CMD5::update(ifstream& stream){
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 
-  unsigned char buffer[1024];
-  int len;
 
-  while (stream.good()){
-    stream.read((char*)buffer, 1024); // note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+void
+md5_init_ctx (struct md5_ctx *ctx)
+{
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
+}
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+  ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+  ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+  ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
 
+  return resbuf;
 }
 
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
 
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  uint32_t bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
 
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
 
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
 
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
 
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-
-
-void CMD5::finalize (){
-
-  unsigned char bits[8];
-  unsigned int index, padLen;
-  static uint1 PADDING[64]={
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-
-  if (finalized){
-    cerr << "MD5::finalize:  Already finalized this digest!" << endl;
-    return;
-  }
-
-  // Save number of bits
-  encode (bits, count, 8);
-
-  // Pad out to 56 mod 64.
-  index = (uint4) ((count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  update (PADDING, padLen);
-
-  // Append length (before padding)
-  update (bits, 8);
-
-  // Store state in digest
-  encode (digest, state, 16);
-
-  // Zeroize sensitive information
-  memset (buffer, 0, sizeof(*buffer));
-
-  finalized=1;
-
-}
-
-
-
-
-CMD5::CMD5(FILE *file){
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, size * 4, ctx);
 
-  init();  // must be called be all constructors
-  update(file);
-  finalize ();
+  return md5_read_ctx (ctx, resbuf);
 }
 
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
+{
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+         computation function processes the whole buffer so that with the
+         next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
 
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
 
+	  sum += n;
 
-CMD5::CMD5(istream& stream){
+	  if (sum == BLOCKSIZE)
+	    break;
 
-  init();  // must called by all constructors
-  update (stream);
-  finalize();
-}
+	  if (n == 0)
+	    {
+	      /* Check for the error flag IFF N == 0, so that we don't
+	         exit the loop after a partial read due to e.g., EAGAIN
+	         or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
+	    }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
 
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+         BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+process_partial_block:
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
 
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
 
-CMD5::CMD5(ifstream& stream){
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
 
-  init();  // must called by all constructors
-  update (stream);
-  finalize();
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
 }
 
 
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
 
-unsigned char *CMD5::raw_digest(){
-
-  uint1 *s = new uint1[16];
-
-  if (!finalized){
-    cerr << "MD5::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-
-  memcpy(s, digest, 16);
-  return s;
-}
-
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
 
+      if (ctx->buflen > 64)
+	{
+	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
 
-CString CMD5::hex_digest()
-{
-	int i;
-	CString s;
-	char c[3];
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
 
-	if (!finalized)
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
 	{
-		cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-		"finalized the digest!" <<endl;
-		return "";
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
 	}
+    }
 
-	for (i=0; i<16; i++)
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
 	{
-		sprintf(c, "%02x", digest[i]);
-		c[2]=0;
-		s += c;
+	  md5_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
 	}
-
-	return s;
-}
-
-
-
-
-
-ostream& operator<<(ostream &stream, CMD5 context){
-
-  stream << context.hex_digest().Data();
-  return stream;
-}
-
-
-
-// PRIVATE METHODS:
-
-
-
-void CMD5::init(){
-  finalized=0;  // we just started!
-
-  // Nothing counted, so count=0
-  count[0] = 0;
-  count[1] = 0;
-
-  // Load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
+      ctx->buflen = left_over;
+    }
 }
 
 
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
 
-// Constants for MD5Transform routine.
-// Although we could use C++ style constants, defines are actually better,
-// since they let us easily evade scope clashes.
-
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-
-
-
-// MD5 basic transformation. Transforms state based on block.
-void CMD5::transform (uint1 block[64]){
-
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  decode (x, block, 64);
-
-  assert(!finalized);  // not just a user error, since the method is private
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset ( (uint1 *) x, 0, sizeof(x));
-
-}
-
-
-
-// Encodes input (UINT4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void CMD5::encode (uint1 *output, uint4 *input, uint4 len) {
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j]   = (uint1)  (input[i] & 0xff);
-    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
-    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
-    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
-  }
-}
-
-
-
-
-// Decodes input (unsigned char) into output (UINT4). Assumes len is
-// a multiple of 4.
-void CMD5::decode (uint4 *output, uint1 *input, uint4 len){
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
-
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
 
-
-
-
-// Note: Replace "for loop" with standard memcpy if possible.
-void CMD5::memcpy (uint1 *output, uint1 *input, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = input[i];
-}
-
-
-
-// Note: Replace "for loop" with standard memset if possible.
-void CMD5::memset (uint1 *output, uint1 value, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = value;
-}
-
-
-
-// ROTATE_LEFT rotates x left n bits.
-
-inline unsigned int CMD5::rotate_left  (uint4 x, uint4 n){
-  return (x << n) | (x >> (32-n))  ;
-}
-
-
-
-
-// F, G, H and I are basic MD5 functions.
-
-inline unsigned int CMD5::F            (uint4 x, uint4 y, uint4 z){
-  return (x & y) | (~x & z);
-}
-
-inline unsigned int CMD5::G            (uint4 x, uint4 y, uint4 z){
-  return (x & z) | (y & ~z);
-}
-
-inline unsigned int CMD5::H            (uint4 x, uint4 y, uint4 z){
-  return x ^ y ^ z;
-}
-
-inline unsigned int CMD5::I            (uint4 x, uint4 y, uint4 z){
-  return y ^ (x | ~z);
-}
-
-
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-
-
-inline void CMD5::FF(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4  s, uint4 ac){
- a += F(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::GG(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += G(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::HH(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += H(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::II(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			     uint4 s, uint4 ac){
- a += I(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  uint32_t correct_words[16];
+  const uint32_t *words = (const uint32_t*) buffer;
+  size_t nwords = len / sizeof (uint32_t);
+  const uint32_t *endp = words + nwords;
+  uint32_t A = ctx->A;
+  uint32_t B = ctx->B;
+  uint32_t C = ctx->C;
+  uint32_t D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      uint32_t *cwp = correct_words;
+      uint32_t A_save = A;
+      uint32_t B_save = B;
+      uint32_t C_save = C;
+      uint32_t D_save = D;
+
+      /* First round: using the given function, the context and a constant
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+         cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+         They are defined in RFC 1321 as
+
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+         Here is an equivalent invocation using Perl:
+
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D, 7, 0xd76aa478);
+      OP (D, A, B, C, 12, 0xe8c7b756);
+      OP (C, D, A, B, 17, 0x242070db);
+      OP (B, C, D, A, 22, 0xc1bdceee);
+      OP (A, B, C, D, 7, 0xf57c0faf);
+      OP (D, A, B, C, 12, 0x4787c62a);
+      OP (C, D, A, B, 17, 0xa8304613);
+      OP (B, C, D, A, 22, 0xfd469501);
+      OP (A, B, C, D, 7, 0x698098d8);
+      OP (D, A, B, C, 12, 0x8b44f7af);
+      OP (C, D, A, B, 17, 0xffff5bb1);
+      OP (B, C, D, A, 22, 0x895cd7be);
+      OP (A, B, C, D, 7, 0x6b901122);
+      OP (D, A, B, C, 12, 0xfd987193);
+      OP (C, D, A, B, 17, 0xa679438e);
+      OP (B, C, D, A, 22, 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)					\
+      do								\
+	{								\
+	  a += f (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+      /* Round 2.  */
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
+      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+      /* Round 3.  */
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+      /* Round 4.  */
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
 }

03-dclib-0.3.10-use-new-md5-api.patch:

--- NEW FILE 03-dclib-0.3.10-use-new-md5-api.patch ---
--- dclib-0.3.10.orig/dclib/cdownloadmanager.cpp	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/cdownloadmanager.cpp	2007-09-18 14:05:33.000000000 +0100
@@ -1513,7 +1513,11 @@
 	CByteArray ba;
 	DCTransferFileObject * TransferFileObject;
 	DCFileChunkObject * FileChunkObject;
-	CMD5 context;
+	md5_ctx * context = 0;
+	unsigned char resbuf[16];
+	char c[3];
+	int i = 0;
+	CString result = "";
 
 	if ( (TransferFileObject = m_pDownloadQueue->GetUserFileObject( Transfer->GetDstNick(), Transfer->GetHubName(), Transfer->GetHubHost(), Transfer->GetDstFilename() )) != 0 )
 	{
@@ -1522,10 +1526,23 @@
 			if ( (TransferFileObject->m_stHash == "") && (TransferFileObject->m_bMulti == TRUE) )
 			{
 				// calc hash
-				context.update( ba.Data(), ba.Size() );
-				context.finalize();
+				context = new md5_ctx();
+				
+				md5_init_ctx( context );
+				md5_process_bytes( ba.Data(), ba.Size(), context );
+				md5_finish_ctx( context, &resbuf );
+				
+				delete context;
+				
+				// convert digest to hexadecimal
+				for ( i = 0; i < 16; i++ )
+				{
+					sprintf( c, "%02x", resbuf[i] );
+					c[2] = 0;
+					result += c;
+				}
 
-				TransferFileObject->m_stHash = context.hex_digest();
+				TransferFileObject->m_stHash = result;
 
 				DPRINTF("hash is :'%s'\n",TransferFileObject->m_stHash.Data());
 

04-dclib-0.3.10-gnulib-md5-configure-test.patch:

--- NEW FILE 04-dclib-0.3.10-gnulib-md5-configure-test.patch ---
--- dclib-0.3.10.orig/configure.in	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/configure.in	2007-09-18 11:57:21.000000000 +0100
@@ -90,6 +90,18 @@
 jm_FILE_SYSTEM_USAGE( [], )
 jm_FSTYPENAME
 
+dnl copied and pasted from md5.m4
+AC_DEFUN([gl_MD5],
+[
+  AC_LIBOBJ([md5])
+
+  dnl Prerequisites of lib/md5.c.
+  AC_REQUIRE([AC_C_BIGENDIAN])
+  :
+])
+
+gl_MD5
+
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
 # If <sys/vfs.h> exists and struct statfs has a member named f_spare,
 # enable the work-around code in fsusage.c.


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dclib.spec	27 Aug 2007 12:46:36 -0000	1.12
+++ dclib.spec	18 Sep 2007 19:31:19 -0000	1.13
@@ -7,8 +7,13 @@
 License:        GPLv2
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+Patch0:         01-%{name}-%{version}-remove-cmd4.patch
+Patch1:         02-%{name}-%{version}-use-gnulib-md5.patch
+Patch2:         03-%{name}-%{version}-use-new-md5-api.patch
+Patch3:         04-%{name}-%{version}-gnulib-md5-configure-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
+BuildRequires:  automake, autoconf
 
 %description
 This library implements the Direct Connect file sharing protocol.  The package
@@ -30,9 +35,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
+aclocal
+automake
+autoconf
+make -f admin/Makefile.common
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -65,6 +78,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Luke Macken <lmacken at redhat.com> 0.3.10-2
+- Remove RSA MD5 implementation in favor of the gnulib implementation.  Patches
+  taken from upstream ticket:
+  https://sourceforge.net/tracker/?func=detail&atid=897767&aid=1796674&group_id=181579
+
 * Tue Aug 27 2007 Luke Macken <lmacken at redhat.com> 0.3.10-1
 - 0.3.10
 - Update License to GPLv2


--- dclib-0.3.8-cconfig-use-cfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 19:32:55 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 18 Sep 2007 15:32:55 -0400
Subject: rpms/dclib/devel dclib.spec,1.13,1.14
Message-ID: <200709181932.l8IJWtf0025310@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25277

Modified Files:
	dclib.spec 
Log Message:
bump the release


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dclib.spec	18 Sep 2007 19:31:19 -0000	1.13
+++ dclib.spec	18 Sep 2007 19:32:23 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Tue Sep 18 19:33:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 15:33:27 -0400
Subject: rpms/xulrunner/devel xulrunner-mozconfig,1.2,1.3
Message-ID: <200709181933.l8IJXR8A025364@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25304

Modified Files:
	xulrunner-mozconfig 
Log Message:
disabled airbag


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-mozconfig	18 Sep 2007 14:23:14 -0000	1.2
+++ xulrunner-mozconfig	18 Sep 2007 19:32:53 -0000	1.3
@@ -24,6 +24,7 @@
 ac_add_options --disable-gnomeui
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-extensions=default,cookie
+ac_add_options --disable-airbag
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1



From fedora-extras-commits at redhat.com  Tue Sep 18 19:40:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Tue, 18 Sep 2007 15:40:33 -0400
Subject: rpms/postgresql-pgpool-ha/devel postgresql-pgpool-ha.spec,1.1,1.2
Message-ID: <200709181940.l8IJeX35025619@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-ha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25539

Modified Files:
	postgresql-pgpool-ha.spec 
Log Message:
- Revert ocf path change.
- Make package noarch.




Index: postgresql-pgpool-ha.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-ha/devel/postgresql-pgpool-ha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-pgpool-ha.spec	9 Jul 2007 17:25:37 -0000	1.1
+++ postgresql-pgpool-ha.spec	18 Sep 2007 19:39:58 -0000	1.2
@@ -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:	4%{?dist}
+Release:	5%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -11,6 +11,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	heartbeat >= 2.0
 BuildRequires:	heartbeat-devel >= 2.0 postgresql-pgpool-II
+BuildArch:	noarch
 
 %description
 Pgpool-HA combines pgpool with heartbeat. Pgpool is a replication
@@ -30,10 +31,10 @@
 cd src
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/
-install -d %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
+install -d %{buildroot}%{_libdir}/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}%{_datadir}/ocf/resource.d/heartbeat/
+install -m 755 pgpool %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
 
 %clean
 rm -rf %{buildroot}
@@ -46,6 +47,10 @@
 %doc AUTHORS COPYING INSTALL README.ja ChangeLog doc README 
 
 %changelog
+* Tue Sep 18 2007 Devrim GUNDUZ <devrim at CommandPrompt.com> 1.1.0-5
+- Revert ocf path change.
+- Make package noarch.
+
 * Mon Jul 9 2007 Devrim GUNDUZ <devrim at CommandPrompt.com> 1.1.0-4
 - Made package arch, per bz review.
 - Move ocf path back to datadir/ocf/resource.d .



From fedora-extras-commits at redhat.com  Tue Sep 18 19:59:55 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 18 Sep 2007 15:59:55 -0400
Subject: rpms/evolution-sharp/devel .cvsignore, 1.11,
	1.12 evolution-sharp.spec, 1.41, 1.42 sources, 1.11, 1.12
Message-ID: <200709181959.l8IJxt9D026100@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26078

Modified Files:
	.cvsignore evolution-sharp.spec sources 
Log Message:

* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 0.14.0.1-1.fc8
- Update to 0.14.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Aug 2007 01:29:30 -0000	1.11
+++ .cvsignore	18 Sep 2007 19:59:22 -0000	1.12
@@ -1 +1 @@
-evolution-sharp-0.13.3.tar.bz2
+evolution-sharp-0.14.0.1.tar.bz2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- evolution-sharp.spec	24 Aug 2007 01:29:30 -0000	1.41
+++ evolution-sharp.spec	18 Sep 2007 19:59:22 -0000	1.42
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.13.3
+Version: 0.14.0.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -85,6 +85,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 0.14.0.1-1.fc8
+- Update to 0.14.0.1
+
 * Thu Aug 23 2007 Matthew Barnes <mbarnes at redhat.com> - 0.13.3-1.fc8
 - Update to 0.13.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Aug 2007 01:29:30 -0000	1.11
+++ sources	18 Sep 2007 19:59:22 -0000	1.12
@@ -1 +1 @@
-af580e61bc03ee4f6c74d00d990c4a47  evolution-sharp-0.13.3.tar.bz2
+ca44b64db3edaa248b03bdf00ea662fd  evolution-sharp-0.14.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:01:16 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:01:16 -0400
Subject: rpms/gchempaint/devel .cvsignore, 1.6, 1.7 gchempaint.spec, 1.10,
	1.11 sources, 1.6, 1.7 gchempaint-0.8.2-themedirfix.patch, 1.1, NONE
Message-ID: <200709182001.l8IK1GY2032132@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26141

Modified Files:
	.cvsignore gchempaint.spec sources 
Removed Files:
	gchempaint-0.8.2-themedirfix.patch 
Log Message:
* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3
- Dropped upstreamed patches
- Made the License tag more precise
- Changed the way rpaths are dealt with, previous one was breaking the build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2007 13:17:52 -0000	1.6
+++ .cvsignore	18 Sep 2007 20:00:43 -0000	1.7
@@ -1 +1 @@
-gchempaint-0.8.2.tar.bz2
+gchempaint-0.8.3.tar.bz2


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gchempaint.spec	26 Aug 2007 07:33:51 -0000	1.10
+++ gchempaint.spec	18 Sep 2007 20:00:43 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           gchempaint
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A 2D chemical formulae drawing tool
 
 Group:          Applications/Engineering
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+
+# Everything is GPLv2+, except libgcpcanvas, which is LGPLv2+
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
-Patch0:         gchempaint-0.8.2-themedirfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -18,6 +18,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
+BuildRequires:  automake
+
 Requires:       hicolor-icon-theme
 
 Requires(pre):  GConf2
@@ -37,15 +39,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .themedirfix
 
 %build
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper
-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}
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
 %install
@@ -57,11 +56,14 @@
 %find_lang %{name}
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.2/plugins/gchempaint/gchempaint.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.3/plugins/gchempaint/gchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
 
+#kill static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +136,7 @@
 %{_libdir}/libgcpcanvas-%{version}.so
 %{_libdir}/libgcpcanvas.so
 %{_libdir}/libgchempaint.so
-%{_libdir}/goffice/0.4.2/plugins/gchempaint
+%{_libdir}/goffice/0.4.3/plugins/gchempaint
 %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
 %{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
@@ -148,6 +150,12 @@
 
 
 %changelog
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+- Dropped upstreamed patches
+- Made the License tag more precise
+- Changed the way rpaths are dealt with, previous one was breaking the build
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2007 13:17:52 -0000	1.6
+++ sources	18 Sep 2007 20:00:43 -0000	1.7
@@ -1 +1 @@
-b02820894bff474ed1d5861ac644a767  gchempaint-0.8.2.tar.bz2
+a05abcc0a13415883438411ab3b2b9a8  gchempaint-0.8.3.tar.bz2


--- gchempaint-0.8.2-themedirfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:06:09 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 16:06:09 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.79, 1.80 firstboot.spec, 1.106, 
	1.107 sources, 1.103, 1.104
Message-ID: <200709182006.l8IK69x9032379@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	9 Aug 2007 20:11:58 -0000	1.79
+++ .cvsignore	18 Sep 2007 20:05:37 -0000	1.80
@@ -51,3 +51,4 @@
 firstboot-1.4.34.tar.bz2
 firstboot-1.4.35.tar.bz2
 firstboot-1.4.36.tar.bz2
+firstboot-1.4.37.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- firstboot.spec	9 Aug 2007 20:11:58 -0000	1.106
+++ firstboot.spec	18 Sep 2007 20:05:37 -0000	1.107
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.36
+Version: 1.4.37
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/FirstBoot
 License: GPLv2+
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 1.4.37-1
+- Remove sound card module (#294101).
+
 * Thu Aug 09 2007 Chris Lumens <clumens at redhat.com> 1.4.36-1
 - Remove unused images (#250354).
 - Require libuser-python instead of libuser (#251356).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	9 Aug 2007 20:11:58 -0000	1.103
+++ sources	18 Sep 2007 20:05:37 -0000	1.104
@@ -1 +1 @@
-3535f4398f6c891ceed2da448e6c802b  firstboot-1.4.36.tar.bz2
+6129f9227a15af22a11cd877b9614361  firstboot-1.4.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:12:05 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:12:05 -0400
Subject: rpms/gchempaint/F-7 .cvsignore, 1.6, 1.7 gchempaint.spec, 1.9,
	1.10 sources, 1.6, 1.7 gchempaint-0.8.2-themedirfix.patch, 1.1, NONE
Message-ID: <200709182012.l8IKC5MP032588@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559

Modified Files:
	.cvsignore gchempaint.spec sources 
Removed Files:
	gchempaint-0.8.2-themedirfix.patch 
Log Message:
* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3
- Dropped upstreamed patches
- Made the License tag more precise
- Changed the way rpaths are dealt with, previous one was breaking the build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2007 13:20:07 -0000	1.6
+++ .cvsignore	18 Sep 2007 20:11:32 -0000	1.7
@@ -1 +1 @@
-gchempaint-0.8.2.tar.bz2
+gchempaint-0.8.3.tar.bz2


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/gchempaint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gchempaint.spec	6 Aug 2007 14:56:56 -0000	1.9
+++ gchempaint.spec	18 Sep 2007 20:11:32 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           gchempaint
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A 2D chemical formulae drawing tool
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+ and LGPLv2+
+# Everything is GPLv2+, except libgcpcanvas, which is LGPLv2+
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
-Patch0:         gchempaint-0.8.2-themedirfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -18,6 +18,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
+BuildRequires:  automake
+
 Requires:       hicolor-icon-theme
 
 Requires(pre):  GConf2
@@ -37,15 +39,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .themedirfix
 
 %build
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper
-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}
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
 %install
@@ -57,11 +56,14 @@
 %find_lang %{name}
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.2/plugins/gchempaint/gchempaint.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.3/plugins/gchempaint/gchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
 
+#kill static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +136,7 @@
 %{_libdir}/libgcpcanvas-%{version}.so
 %{_libdir}/libgcpcanvas.so
 %{_libdir}/libgchempaint.so
-%{_libdir}/goffice/0.4.2/plugins/gchempaint
+%{_libdir}/goffice/0.4.3/plugins/gchempaint
 %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
 %{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
@@ -148,6 +150,15 @@
 
 
 %changelog
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+- Dropped upstreamed patches
+- Made the License tag more precise
+- Changed the way rpaths are dealt with, previous one was breaking the build
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
+- Adjusted License tag as per latest guidelines
+
 * Mon Aug  6 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-2
 - Adjusted for new goffice
 - Delete the goffice plugin libtool archive as well


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2007 13:20:07 -0000	1.6
+++ sources	18 Sep 2007 20:11:32 -0000	1.7
@@ -1 +1 @@
-b02820894bff474ed1d5861ac644a767  gchempaint-0.8.2.tar.bz2
+a05abcc0a13415883438411ab3b2b9a8  gchempaint-0.8.3.tar.bz2


--- gchempaint-0.8.2-themedirfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:13:00 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:13:00 -0400
Subject: rpms/glibc import.log,1.17,1.18
Message-ID: <200709182013.l8IKD083032689@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32647

Modified Files:
	import.log 
Log Message:
2.6.90-14



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	27 Aug 2007 21:13:21 -0000	1.17
+++ import.log	18 Sep 2007 20:12:28 -0000	1.18
@@ -14,3 +14,4 @@
 glibc-2_6_90-11:HEAD:glibc-2.6.90-11.src.rpm:1187302854
 glibc-2_6_90-12:HEAD:glibc-2.6.90-12.src.rpm:1188070253
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
+glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332



From fedora-extras-commits at redhat.com  Tue Sep 18 20:13:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:13:03 -0400
Subject: rpms/glibc/devel .cvsignore, 1.215, 1.216 glibc-fedora.patch, 1.236,
	1.237 glibc.spec, 1.326, 1.327 sources, 1.239, 1.240
Message-ID: <200709182013.l8IKD3kR032698@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32647/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- .cvsignore	27 Aug 2007 21:13:25 -0000	1.215
+++ .cvsignore	18 Sep 2007 20:12:30 -0000	1.216
@@ -1,2 +1,2 @@
-glibc-20070827T2032.tar.bz2
-glibc-fedora-20070827T2032.tar.bz2
+glibc-20070918T1931.tar.bz2
+glibc-fedora-20070918T1931.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- glibc-fedora.patch	27 Aug 2007 21:13:25 -0000	1.236
+++ glibc-fedora.patch	18 Sep 2007 20:12:30 -0000	1.237
@@ -1,21 +1,6 @@
---- glibc-20070827T2032/ChangeLog	27 Aug 2007 20:10:36 -0000	1.10832
-+++ glibc-20070827T2032-fedora/ChangeLog	27 Aug 2007 20:42:21 -0000	1.8782.2.270
-@@ -1,3 +1,14 @@
-+2007-08-26  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/i386/Makefile (sysdep_routines): Add
-+	call_fallocate in misc subdir.
-+	* sysdeps/unix/sysv/linux/i386/call_fallocate.S: New file.
-+	* sysdeps/unix/sysv/linux/i386/syscalls.list (fallocate64): Remove.
-+	* sysdeps/unix/sysv/linux/i386/posix_fallocate.c: Use __call_fallocate
-+	instead of __fallocate64.
-+	* sysdeps/unix/sysv/linux/i386/posix_fallocate64.c: Use __call_fallocate
-+	instead of __fallocate64.
-+
- 2007-08-27  Jakub Jelinek  <jakub at redhat.com>
- 
- 	* sysdeps/unix/sysv/linux/syscalls.list
-@@ -1831,6 +1842,13 @@
+--- glibc-20070918T1931/ChangeLog	18 Sep 2007 19:29:44 -0000	1.10852
++++ glibc-20070918T1931-fedora/ChangeLog	18 Sep 2007 19:57:14 -0000	1.8782.2.271
+@@ -2208,6 +2208,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -29,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -2126,6 +2144,10 @@
+@@ -2503,6 +2510,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -40,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -3383,6 +3405,15 @@
+@@ -3760,6 +3771,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -56,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20070827T2032/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070827T2032-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070918T1931/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070918T1931-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>
@@ -123,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20070827T2032/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070827T2032-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070918T1931/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070918T1931-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.
@@ -296,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20070827T2032/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070827T2032-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070918T1931/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070918T1931-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 $@
@@ -308,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20070827T2032/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070827T2032-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070918T1931/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070918T1931-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;
@@ -334,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20070827T2032/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20070827T2032-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20070918T1931/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
++++ glibc-20070918T1931-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -346,7 +331,7 @@
  #include <assert.h>
  #include <fcntl.h>
  #include <locale.h>
-@@ -232,7 +235,7 @@ do_test (void)
+@@ -238,7 +241,7 @@ do_test (void)
    if (memcmp (a.buf1, "aabcdabcjj", 10))
      FAIL ();
  
@@ -355,17 +340,17 @@
    /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
       and sufficient GCC support, as the string operations overflow
       from a.buf1 into a.buf2.  */
-@@ -337,7 +340,7 @@ do_test (void)
+@@ -345,7 +348,7 @@ do_test (void)
    memset (a.buf1 + 9, 'j', l0 + 2);
    CHK_FAIL_END
  
--#if __USE_FORTIFY_LEVEL >= 2
-+#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
- # define O 0
- #else
- # define O 1
---- glibc-20070827T2032/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070827T2032-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+-# if __USE_FORTIFY_LEVEL >= 2
++# if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
+ #  define O 0
+ # else
+ #  define O 1
+--- glibc-20070918T1931/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070918T1931-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -447,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070827T2032/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070827T2032-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070918T1931/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070918T1931-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;
@@ -473,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070827T2032/include/features.h	19 Jul 2007 17:27:30 -0000	1.47
-+++ glibc-20070827T2032-fedora/include/features.h	31 Jul 2007 17:45:50 -0000	1.35.2.16
+--- glibc-20070918T1931/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070918T1931-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -490,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070827T2032/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070918T1931/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070918T1931/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070827T2032-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070918T1931/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070918T1931-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -509,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070827T2032/libio/stdio.h	17 Feb 2007 18:26:15 -0000	1.89
-+++ glibc-20070827T2032-fedora/libio/stdio.h	21 Feb 2007 11:15:50 -0000	1.78.2.11
+--- glibc-20070918T1931/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070918T1931-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -524,40 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070827T2032/libio/bits/stdio2.h	17 Mar 2007 17:04:08 -0000	1.5
-+++ glibc-20070827T2032-fedora/libio/bits/stdio2.h	17 Mar 2007 21:52:49 -0000	1.1.2.7
-@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
- extern int __vprintf_chk (int __flag, __const char *__restrict __format,
- 			  _G_va_list __ap);
- 
--# define printf(...) \
-+# if __GNUC_PREREQ (4, 0)
-+#  define printf(...) \
-   __printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
--# define fprintf(stream, ...) \
-+#  define fprintf(stream, ...) \
-   __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
--# define vprintf(format, ap) \
-+#  define vprintf(format, ap) \
-   __vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
--# define vfprintf(stream, format, ap) \
-+#  define vfprintf(stream, format, ap) \
-   __vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
-+# else
-+#  define printf(...) \
-+  __builtin___printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-+#  define fprintf(stream, ...) \
-+  __builtin___fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-+#  define vprintf(format, ap) \
-+  __builtin___vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
-+#  define vfprintf(stream, format, ap) \
-+  __builtin___vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
-+# endif
- 
- #endif
- 
---- glibc-20070827T2032/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070827T2032-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070918T1931/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070918T1931-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 !!!
@@ -649,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070827T2032/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070827T2032-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070918T1931/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070918T1931-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,
@@ -682,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070827T2032/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070827T2032-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070918T1931/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070918T1931-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -692,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070827T2032/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070827T2032-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070918T1931/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070918T1931-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -735,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070827T2032/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070827T2032-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070918T1931/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070918T1931-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>"
@@ -751,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070827T2032/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070827T2032-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070918T1931/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070918T1931-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -764,8 +717,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-20070827T2032/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070918T1931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -836,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070827T2032/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070827T2032-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070918T1931/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070918T1931-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -865,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070827T2032/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070827T2032-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070918T1931/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070918T1931-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>
@@ -942,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070827T2032/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070827T2032-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070918T1931/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070918T1931-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -999,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070827T2032/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070827T2032-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070918T1931/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070918T1931-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1010,17 +963,43 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070827T2032/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070827T2032-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070918T1931/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
++++ glibc-20070918T1931-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
+@@ -282,7 +282,10 @@
+ 
+ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+    inline semantics, unless -fgnu89-inline is used.  */
+-#if !defined __cplusplus || __GNUC_PREREQ (4,3)
++#if !defined __cplusplus || __GNUC_PREREQ (4,3) \
++    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
++	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
++	&& __GNUC_RH_RELEASE__ >= 24)
+ # if defined __GNUC_STDC_INLINE__ || defined __cplusplus
+ #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+ #  define __extern_always_inline \
+@@ -295,7 +298,10 @@
+ 
+ /* GCC 4.3 and above allow passing all anonymous arguments of an
+    __extern_always_inline function to some other vararg function.  */
+-#if __GNUC_PREREQ (4,3)
++#if __GNUC_PREREQ (4,3) \
++    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
++	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
++	&& __GNUC_RH_RELEASE__ >= 24)
+ # define __va_arg_pack() __builtin_va_arg_pack ()
+ # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
+ #endif
+--- glibc-20070918T1931/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070918T1931-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-20070827T2032/nptl/ChangeLog	21 Aug 2007 23:55:36 -0000	1.1031
-+++ glibc-20070827T2032-fedora/nptl/ChangeLog	25 Aug 2007 18:55:03 -0000	1.706.2.138
-@@ -2935,6 +2935,15 @@
+--- glibc-20070918T1931/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070918T1931-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+@@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1036,7 +1015,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -3671,6 +3680,11 @@
+@@ -3678,6 +3687,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1048,7 +1027,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -5745,6 +5759,11 @@
+@@ -5752,6 +5766,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1060,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070827T2032/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070827T2032-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070918T1931/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070918T1931-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1094,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070827T2032/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070827T2032-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070918T1931/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070918T1931-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;
@@ -1120,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070827T2032/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070918T1931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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>
 +
@@ -1129,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070827T2032/nscd/connections.c	22 Aug 2007 03:39:59 -0000	1.101
-+++ glibc-20070827T2032-fedora/nscd/connections.c	25 Aug 2007 18:55:04 -0000	1.55.2.32
+--- glibc-20070918T1931/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070918T1931-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1139,7 +1118,7 @@
  
  static pthread_attr_t attr;
  
-@@ -1379,6 +1380,10 @@ nscd_run (void *p)
+@@ -1384,6 +1385,10 @@ nscd_run (void *p)
  	      if (readylist == NULL && to == ETIMEDOUT)
  		{
  		  --nready;
@@ -1150,7 +1129,7 @@
  		  pthread_mutex_unlock (&readylist_lock);
  		  goto only_prune;
  		}
-@@ -1388,6 +1393,34 @@ nscd_run (void *p)
+@@ -1393,6 +1398,34 @@ nscd_run (void *p)
  	    pthread_cond_wait (&readylist_cond, &readylist_lock);
  	}
  
@@ -1185,7 +1164,7 @@
        struct fdlist *it = readylist->next;
        if (readylist->next == readylist)
  	/* Just one entry on the list.  */
-@@ -1963,3 +1996,10 @@ finish_drop_privileges (void)
+@@ -1968,3 +2001,10 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
  }
@@ -1196,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070827T2032/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070827T2032-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070918T1931/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070918T1931-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1216,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070827T2032/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070827T2032-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070918T1931/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070918T1931-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1229,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070827T2032/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070827T2032-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070918T1931/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070918T1931-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1271,22 +1250,26 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070827T2032/posix/Makefile	4 Aug 2007 20:48:38 -0000	1.201
-+++ glibc-20070827T2032-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
-@@ -300,7 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+--- glibc-20070918T1931/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070918T1931-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+@@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
  
 -$(objpfx)getconf.speclist: $(objpfx)getconf
+-ifeq (no,$(cross-compiling))
 -	LC_ALL=C GETCONF_DIR=/dev/null \
 -	$(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new
+-else
+-	> $@.new
+-endif
 +$(objpfx)getconf.speclist: getconf.speclist.h
 +	$(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070827T2032/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070918T1931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1303,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070827T2032/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070827T2032-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070918T1931/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070918T1931-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
@@ -1320,8 +1303,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-20070827T2032/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070827T2032-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070918T1931/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070918T1931-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1335,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070827T2032/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070918T1931/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070918T1931-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))
@@ -1348,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070827T2032/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070918T1931/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070918T1931-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.  */
@@ -1701,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070827T2032/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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.
@@ -1788,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070827T2032/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070827T2032-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070918T1931/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070918T1931-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
@@ -1798,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070827T2032/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070827T2032-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070918T1931/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070918T1931-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);
      }
@@ -1814,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/check_pf.c	16 Jun 2007 16:54:40 -0000	1.11
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/check_pf.c	31 Jul 2007 17:46:12 -0000	1.3.2.8
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1831,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Aug 2007 03:19:44 -0000	1.25
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Aug 2007 07:38:40 -0000	1.14.2.11
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1880,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070918T1931-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;
@@ -1924,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070918T1931-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>
@@ -1951,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070918T1931-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"
@@ -1962,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070918T1931-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;
@@ -2009,27 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/Makefile	21 Jan 2006 08:14:17 -0000	1.28
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/Makefile	27 Aug 2007 20:42:22 -0000	1.26.2.3
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),misc)
--sysdep_routines += ioperm iopl vm86 call_pselect6
-+sysdep_routines += ioperm iopl vm86 call_pselect6 call_fallocate
- sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
- endif
- 
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/call_fallocate.S 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/call_fallocate.S	27 Aug 2007 20:42:22 -0000	1.1.2.1
-@@ -0,0 +1,7 @@
-+#include <sysdep.h>
-+
-+#ifdef __NR_fallocate
-+PSEUDO_ERRVAL (__call_fallocate, fallocate, 6)
-+ ret_ERRVAL
-+PSEUDO_END_ERRVAL(__call_fallocate)
-+#endif
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070918T1931-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
  
@@ -2048,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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.
@@ -2110,55 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/posix_fallocate.c	1 Aug 2007 15:50:52 -0000	1.1
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/posix_fallocate.c	27 Aug 2007 20:42:22 -0000	1.1.2.2
-@@ -28,7 +28,7 @@
- int __have_fallocate attribute_hidden;
- #endif
- 
--extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
-+extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
-      attribute_hidden;
- 
- /* Reserve storage for the data of the file associated with FD.  */
-@@ -40,7 +40,7 @@ posix_fallocate (int fd, __off_t offset,
-   if (__builtin_expect (__have_fallocate >= 0, 1))
- # endif
-     {
--      int res = __fallocate64 (fd, 0, offset, len);
-+      int res = __call_fallocate (fd, 0, offset, len);
-       if (! res)
- 	return 0;
- 
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c	1 Aug 2007 15:50:38 -0000	1.1
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c	27 Aug 2007 20:42:22 -0000	1.1.2.2
-@@ -30,7 +30,7 @@ extern int __posix_fallocate64_l64 (int 
- extern int __have_fallocate attribute_hidden;
- #endif
- 
--extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
-+extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
-      attribute_hidden;
- 
- /* Reserve storage for the data of the file associated with FD.  */
-@@ -42,7 +42,7 @@ __posix_fallocate64_l64 (int fd, __off64
-   if (__builtin_expect (__have_fallocate >= 0, 1))
- # endif
-     {
--      int res = __fallocate64 (fd, 0, offset, len);
-+      int res = __call_fallocate (fd, 0, offset, len);
- 
-       if (! res)
- 	return 0;
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/syscalls.list	24 Aug 2007 17:21:50 -0000	1.22
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/syscalls.list	27 Aug 2007 20:42:22 -0000	1.19.2.4
-@@ -6,4 +6,3 @@ vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2
- oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit at GLIBC_2.0
- oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit at GLIBC_2.0
- waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
--fallocate64	-	fallocate	Vi:iiiiii	__fallocate64
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070918T1931-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)
@@ -2191,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070918T1931-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.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- glibc.spec	27 Aug 2007 21:13:25 -0000	1.326
+++ glibc.spec	18 Sep 2007 20:12:30 -0000	1.327
@@ -1,9 +1,9 @@
-%define glibcdate 20070827T2032
+%define glibcdate 20070918T1931
 %define glibcname glibc
-%define glibcsrcdir glibc-20070827T2032
+%define glibcsrcdir glibc-20070918T1931
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 13
+%define glibcrelease 14
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,21 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-14
+- -D_FORTIFY_SOURCE{,=2} support for C++
+- fortification of fread{,_unlocked}
+- support *scanf m allocation modifier (%ms, %mls, %mc, ...)
+- in -std=c99 or -D_XOPEN_SOURCE=600 mode don't recognize
+  %as, %aS and %a[ as a GNU extension for *scanf
+- fix splice, vmsplice, tee return value, make them cancellation
+  points
+- mq_open checking
+- use inline function rather than function-like macro
+  for open{,at}{,64} checking
+- IFA_F_OPTIMISTIC handling in getaddrinfo (#259681)
+- fix an ABBA deadlock in ld.so (#284171)
+- remove sparc{32,64} unwind info from _start and clone
+
 * Mon Aug 27 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-13
 - fix personality on x86_64/ppc/ppc64 (#256281)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- sources	27 Aug 2007 21:13:25 -0000	1.239
+++ sources	18 Sep 2007 20:12:30 -0000	1.240
@@ -1,2 +1,2 @@
-8360c475f687d64903e8569f3b0911db  glibc-20070827T2032.tar.bz2
-2c9055be62ad8d0ef9db44d348a6f3d9  glibc-fedora-20070827T2032.tar.bz2
+0bdea16fe09191ac97c4132ebdc9b7db  glibc-20070918T1931.tar.bz2
+4af6fdc8cfac8f9fc8f4eca5acf812f6  glibc-fedora-20070918T1931.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:19:19 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 16:19:19 -0400
Subject: rpms/gnupg2/devel .cvsignore, 1.23, 1.24 gnupg2.spec, 1.73,
	1.74 sources, 1.25, 1.26 gnupg-2.0.5-no_close.patch, 1.1, NONE
Message-ID: <200709182019.l8IKJJ6a000487@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-2.0.5-no_close.patch 
Log Message:
* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-1
- gnupg-2.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Aug 2007 02:07:59 -0000	1.23
+++ .cvsignore	18 Sep 2007 20:18:46 -0000	1.24
@@ -1,7 +1,7 @@
 clog
-gnupg-2.0.4.tar.bz2
-gnupg-2.0.4.tar.bz2.sig
 gnupg-2.0.5.tar.bz2
 gnupg-2.0.5.tar.bz2.sig
 gnupg-2.0.6.tar.bz2
 gnupg-2.0.6.tar.bz2.sig
+gnupg-2.0.7.tar.bz2
+gnupg-2.0.7.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnupg2.spec	17 Aug 2007 02:07:59 -0000	1.73
+++ gnupg2.spec	18 Sep 2007 20:18:46 -0000	1.74
@@ -9,7 +9,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.6
+Version: 2.0.7
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -31,7 +31,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 1.0.2
+BuildRequires: libassuan-devel >= 1.0.3
 BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
@@ -51,7 +51,7 @@
 
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: fileutils util-linux
-Requires: pinentry >= 0.7.1
+Requires: pinentry
 
 Provides: gpg
 Provides: openpgp
@@ -104,7 +104,7 @@
   --disable-rpath \
   --enable-selinux-support \
 %ifarch x86_64
-  --disable-optimization 
+#  --disable-optimization 
 %endif
 
 # not smp-safe
@@ -132,7 +132,7 @@
 
 
 %check
-# some gpg2 tests (still) FAIL
+# some gpg2 tests (still) FAIL on non i386 platforms
 make -k check ||:
 
 
@@ -177,6 +177,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-1
+- gnupg-2.0.7
+
+* Fri Aug 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-2
+- respin (libassuan)
+
 * Thu Aug 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-1
 - gnupg-2.0.6
 - License: GPLv3+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Aug 2007 02:07:59 -0000	1.25
+++ sources	18 Sep 2007 20:18:46 -0000	1.26
@@ -1,2 +1,2 @@
-f2bbbfaa320a359a28122e224ff660ce  gnupg-2.0.6.tar.bz2
-317dfb5ce7d6d6d36dbc85917d7bb070  gnupg-2.0.6.tar.bz2.sig
+9c51dfa42cb83102f4d005dc1ed54f0e  gnupg-2.0.7.tar.bz2.sig
+433de7aca1f5d4342121ea09d98a2360  gnupg-2.0.7.tar.bz2


--- gnupg-2.0.5-no_close.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:20:44 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 18 Sep 2007 16:20:44 -0400
Subject: rpms/xorg-x11-drv-amd/OLPC-2 .cvsignore, 1.13, 1.14 sources, 1.14, 
	1.15 xorg-x11-drv-amd.spec, 1.21, 1.22 amd-build-fixes.patch,
	1.1, NONE fix-potential-CPU-GP-race-in-lx_get_source_color.patch,
	1.1, NONE
Message-ID: <200709182020.l8IKKiUM000606@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv559

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Removed Files:
	amd-build-fixes.patch 
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch 
Log Message:
* Tue Sep 18 2007 Dan Williams <dcbw at redhat.com> 0.0-24.20070918
- New snapshot; disable EXA pixmap upload and download acceleration to
    work around segfault of the X server in certain situations (#3352)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Aug 2007 22:52:30 -0000	1.13
+++ .cvsignore	18 Sep 2007 20:20:12 -0000	1.14
@@ -5,3 +5,4 @@
 xf86-video-amd-0.0-git20070711.tar.bz2
 xf86-video-amd-0.0-git20070718.tar.bz2
 xf86-video-amd-0.0-git20070807.tar.bz2
+xf86-video-amd-0.0-git20070918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Aug 2007 22:52:30 -0000	1.14
+++ sources	18 Sep 2007 20:20:12 -0000	1.15
@@ -1 +1 @@
-21dbe589b49f71b189d40f6aa5e0aab9  xf86-video-amd-0.0-git20070807.tar.bz2
+54b45c7ef10bd053f1d61c5343478f2a  xf86-video-amd-0.0-git20070918.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/xorg-x11-drv-amd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-amd.spec	7 Aug 2007 22:52:30 -0000	1.21
+++ xorg-x11-drv-amd.spec	18 Sep 2007 20:20:12 -0000	1.22
@@ -2,13 +2,13 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070807
+%define gitdate 20070918
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   23.%{gitdate}%{?dist}
-URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
+Release:   24.%{gitdate}%{?dist}
+URL:       http://dev.laptop.org/xf86-amd-devel
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
 License:   MIT/X11
@@ -36,10 +36,6 @@
 %endif
 
 Patch0: lx-disable-compression.patch
-Patch1: amd-build-fixes.patch
-
-# HACK HACK HACK (always stalls the pipeline or something like that)
-Patch2: fix-potential-CPU-GP-race-in-lx_get_source_color.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -47,8 +43,6 @@
 %prep
 %setup -q -n %{tarball}-2.7.6.5
 %patch0 -p1 -b .jx
-%patch1 -p1 -b .build-fix
-%patch2 -p1 -b .fix-color-race-HACK
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -82,6 +76,10 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Sep 18 2007 Dan Williams <dcbw at redhat.com> 0.0-24.20070918
+- New snapshot; disable EXA pixmap upload and download acceleration to
+    work around segfault of the X server in certain situations (#3352)
+
 * Tue Aug  7 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070807
 - Fix GX RGB overlay
 


--- amd-build-fixes.patch DELETED ---


--- fix-potential-CPU-GP-race-in-lx_get_source_color.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:24:00 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 18 Sep 2007 16:24:00 -0400
Subject: rpms/pam/devel pam-0.99.8.1-unix-blankpass.patch, 1.1,
	1.2 pam-0.99.8.1-unix-update-helper.patch, 1.1, 1.2 pam.spec,
	1.156, 1.157
Message-ID: <200709182024.l8IKO03o000766@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737

Modified Files:
	pam-0.99.8.1-unix-blankpass.patch 
	pam-0.99.8.1-unix-update-helper.patch pam.spec 
Log Message:
* Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
- when SELinux enabled always run the helper binary instead of
  direct shadow access (#293181)


pam-0.99.8.1-unix-blankpass.patch:

Index: pam-0.99.8.1-unix-blankpass.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-unix-blankpass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-unix-blankpass.patch	24 Aug 2007 13:15:01 -0000	1.1
+++ pam-0.99.8.1-unix-blankpass.patch	18 Sep 2007 20:23:57 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c
---- Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass	2007-08-22 18:45:17.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c	2007-08-24 10:21:54.000000000 +0200
-@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
+--- Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass	2007-09-18 13:50:40.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c	2007-09-18 13:50:40.000000000 +0200
+@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
  	char pass[MAXPASS + 1];
  	char *option;
  	int npass, nullok;
@@ -10,7 +10,7 @@
  	int retval = PAM_AUTH_ERR;
  	char *user;
  	char *passwords[] = { pass };
-@@ -113,6 +113,10 @@ int main(int argc, char *argv[])
+@@ -115,6 +115,10 @@ int main(int argc, char *argv[])
  	if (npass != 1) {	/* is it a valid password? */
  		_log_err(LOG_DEBUG, "no valid password supplied");
  	}
@@ -21,7 +21,7 @@
  
  	retval = _unix_verify_password(user, pass, nullok);
  
-@@ -120,8 +124,11 @@ int main(int argc, char *argv[])
+@@ -122,8 +126,11 @@ int main(int argc, char *argv[])
  
  	/* return pass or fail */
  
@@ -36,11 +36,11 @@
  	} else {
  	    return PAM_SUCCESS;
 diff -up Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass Linux-PAM-0.99.8.1/modules/pam_unix/support.c
---- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass	2007-08-22 18:45:17.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-08-24 10:38:09.000000000 +0200
-@@ -36,6 +36,9 @@
- #define SELINUX_ENABLED 0
- #endif
+--- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass	2007-09-18 13:50:40.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-09-18 17:56:57.000000000 +0200
+@@ -38,6 +38,9 @@
+ 
+ const char app_name[]="pam_unix";
  
 +static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd,
 +				   unsigned int ctrl, const char *user);
@@ -48,18 +48,17 @@
  /* this is a front-end for module-application conversations */
  
  int _make_remark(pam_handle_t * pamh, unsigned int ctrl,
-@@ -441,6 +444,14 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+@@ -442,6 +445,13 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+ 			 * ...and shadow password file entry for this user,
  			 * if shadowing is enabled
  			 */
- 			spwdent = pam_modutil_getspnam(pamh, name);
-+			if (spwdent == NULL && (geteuid() || SELINUX_ENABLED)) {
-+				/* we are not root perhaps this is the reason? Run helper */
++			if (geteuid() || SELINUX_ENABLED) {
++				/* We do not have direct access to shadow. Run helper. */
 +				D(("running helper binary"));
 +				if (_unix_run_helper_binary(pamh, "", ctrl, name) == PAM_SUCCESS)
 +					return 1;
-+				else
-+					return 0;
++				return 0;
 +			}
+ 			spwdent = pam_modutil_getspnam(pamh, name);
  		}
  		if (spwdent)
- 			salt = x_strdup(spwdent->sp_pwdp);

pam-0.99.8.1-unix-update-helper.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 pam-0.99.8.1-unix-update-helper.patch
Index: pam-0.99.8.1-unix-update-helper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-unix-update-helper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-unix-update-helper.patch	23 Jul 2007 18:46:31 -0000	1.1
+++ pam-0.99.8.1-unix-update-helper.patch	18 Sep 2007 20:23:57 -0000	1.2
@@ -1,846 +1,224 @@
---- /dev/null	2007-07-08 21:11:04.052436262 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/passupdate.c	2007-07-23 13:40:56.000000000 +0200
-@@ -0,0 +1,560 @@
-+/*
-+ * Main coding by Elliot Lee <sopwith at redhat.com>, Red Hat Software.
-+ * Copyright (C) 1996.
-+ * Copyright (c) Jan R?korajski, 1999.
-+ * Copyright (c) Red Hat, Inc., 2007
-+ *
-+ * 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, and the entire permission notice in its entirety,
-+ *    including the disclaimer of warranties.
-+ * 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. The name of the author may not be used to endorse or promote
-+ *    products derived from this software without specific prior
-+ *    written permission.
-+ *
-+ * ALTERNATIVELY, this product may be distributed under the terms of
-+ * the GNU Public License, in which case the provisions of the GPL are
-+ * required INSTEAD OF the above restrictions.  (This clause is
-+ * necessary due to a potential bad interaction between the GPL and
-+ * the restrictions contained in a BSD-style copyright.)
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``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 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 will be included from module and update helper */
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c
+--- Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c.update-helper	2007-04-30 12:47:30.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c	2007-09-18 09:52:43.000000000 +0200
+@@ -2,6 +2,7 @@
+  * Main coding by Elliot Lee <sopwith at redhat.com>, Red Hat Software.
+  * Copyright (C) 1996.
+  * Copyright (c) Jan R?korajski, 1999.
++ * Copyright (c) Red Hat, Inc., 2007.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -92,15 +93,6 @@ extern int getrpcport(const char *host, 
+ #endif				/* GNU libc 2.1 */
+ 
+ /*
+- * PAM framework looks for these entry-points to pass control to the
+- * password changing module.
+- */
+-
+-#if defined(USE_LCKPWDF) && !defined(HAVE_LCKPWDF)
+-# include "./lckpwdf.-c"
+-#endif
+-
+-/*
+    How it works:
+    Gets in username (has to be done) from the calling program
+    Does authentication of user (only if we are not running as root)
+@@ -108,82 +100,15 @@ extern int getrpcport(const char *host, 
+    Sets it.
+  */
+ 
+-/* passwd/salt conversion macros */
+-
+-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
+-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
+-
+ /* data tokens */
+ 
+ #define _UNIX_OLD_AUTHTOK	"-UN*X-OLD-PASS"
+ #define _UNIX_NEW_AUTHTOK	"-UN*X-NEW-PASS"
+ 
+ #define MAX_PASSWD_TRIES	3
+-#define PW_TMPFILE		"/etc/npasswd"
+-#define SH_TMPFILE		"/etc/nshadow"
+ #ifndef CRACKLIB_DICTS
+ #define CRACKLIB_DICTS		NULL
+ #endif
+-#define OPW_TMPFILE		"/etc/security/nopasswd"
+-#define OLD_PASSWORDS_FILE	"/etc/security/opasswd"
+-
+-/*
+- * i64c - convert an integer to a radix 64 character
+- */
+-static int i64c(int i)
+-{
+-	if (i < 0)
+-		return ('.');
+-	else if (i > 63)
+-		return ('z');
+-	if (i == 0)
+-		return ('.');
+-	if (i == 1)
+-		return ('/');
+-	if (i >= 2 && i <= 11)
+-		return ('0' - 2 + i);
+-	if (i >= 12 && i <= 37)
+-		return ('A' - 12 + i);
+-	if (i >= 38 && i <= 63)
+-		return ('a' - 38 + i);
+-	return ('\0');
+-}
+-
+-static char *crypt_md5_wrapper(const char *pass_new)
+-{
+-	/*
+-	 * Code lifted from Marek Michalkiewicz's shadow suite. (CG)
+-	 * removed use of static variables (AGM)
+-	 */
+-
+-	struct timeval tv;
+-	MD5_CTX ctx;
+-	unsigned char result[16];
+-	char *cp = (char *) result;
+-	unsigned char tmp[16];
+-	int i;
+-	char *x = NULL;
+-
+-	GoodMD5Init(&ctx);
+-	gettimeofday(&tv, (struct timezone *) 0);
+-	GoodMD5Update(&ctx, (void *) &tv, sizeof tv);
+-	i = getpid();
+-	GoodMD5Update(&ctx, (void *) &i, sizeof i);
+-	i = clock();
+-	GoodMD5Update(&ctx, (void *) &i, sizeof i);
+-	GoodMD5Update(&ctx, result, sizeof result);
+-	GoodMD5Final(tmp, &ctx);
+-	strcpy(cp, "$1$");	/* magic for the MD5 */
+-	cp += strlen(cp);
+-	for (i = 0; i < 8; i++)
+-		*cp++ = i64c(tmp[i] & 077);
+-	*cp = '\0';
+-
+-	/* no longer need cleartext */
+-	x = Goodcrypt_md5(pass_new, (const char *) result);
+-
+-	return x;
+-}
+ 
+ static char *getNISserver(pam_handle_t *pamh)
+ {
+@@ -217,7 +142,8 @@ static char *getNISserver(pam_handle_t *
+ 
+ #ifdef WITH_SELINUX
+ 
+-static int _unix_run_shadow_binary(pam_handle_t *pamh, unsigned int ctrl, const char *user, const char *fromwhat, const char *towhat)
++static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const char *user,
++    const char *fromwhat, const char *towhat, int remember)
+ {
+     int retval, child, fds[2];
+     void (*sighandler)(int) = NULL;
+@@ -247,7 +173,8 @@ static int _unix_run_shadow_binary(pam_h
+         size_t i=0;
+         struct rlimit rlim;
+ 	static char *envp[] = { NULL };
+-	char *args[] = { NULL, NULL, NULL, NULL };
++	char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL };
++        char buffer[16];
+ 
+ 	/* XXX - should really tidy up PAM here too */
+ 
+@@ -270,11 +197,18 @@ static int _unix_run_shadow_binary(pam_h
+         }
+ 
+ 	/* exec binary helper */
+-	args[0] = x_strdup(CHKPWD_HELPER);
++	args[0] = x_strdup(UPDATE_HELPER);
+ 	args[1] = x_strdup(user);
+-	args[2] = x_strdup("shadow");
++	args[2] = x_strdup("update");
++	if (on(UNIX_SHADOW, ctrl))
++		args[3] = x_strdup("1");
++	else
++		args[3] = x_strdup("0");
+ 
+-	execve(CHKPWD_HELPER, args, envp);
++        snprintf(buffer, sizeof(buffer), "%d", remember);
++        args[4] = x_strdup(buffer);
++	
++	execve(UPDATE_HELPER, args, envp);
[...1746 lines suppressed...]
++      if (getfscreatecon(&prev_context)<0) {
++	freecon(shadow_context);
++	return PAM_AUTHTOK_ERR;
++      }
++      if (setfscreatecon(shadow_context)) {
++	freecon(shadow_context);
++	freecon(prev_context);
++	return PAM_AUTHTOK_ERR;
++      }
++      freecon(shadow_context);
++    }
++#endif
++    pwfile = fopen(SH_TMPFILE, "w");
++    umask(oldmask);
++    if (pwfile == NULL) {
++	err = 1;
++	goto done;
++    }
++
++    opwfile = fopen("/etc/shadow", "r");
++    if (opwfile == NULL) {
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    if (fstat(fileno(opwfile), &st) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    if (fchown(fileno(pwfile), st.st_uid, st.st_gid) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++    if (fchmod(fileno(pwfile), st.st_mode) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    stmpent = fgetspent(opwfile);
++    while (stmpent) {
++
++	if (!strcmp(stmpent->sp_namp, forwho)) {
++	    stmpent->sp_pwdp = towhat;
++	    stmpent->sp_lstchg = time(NULL) / (60 * 60 * 24);
++	    err = 0;
++	    D(("Set password %s for %s", stmpent->sp_pwdp, forwho));
++	}
++
++	if (putspent(stmpent, pwfile)) {
++	    D(("error writing entry to shadow file: %m"));
++	    err = 1;
++	    break;
++	}
++
++	stmpent = fgetspent(opwfile);
++    }
++    fclose(opwfile);
++
++    if (fclose(pwfile)) {
++	D(("error writing entries to shadow file: %m"));
++	err = 1;
++    }
++
++ done:
++    if (!err) {
++	if (!rename(SH_TMPFILE, "/etc/shadow"))
++#ifdef HELPER_COMPILE
++	    _log_err(
++#else
++	    pam_syslog(pamh, 
++#endif
++		LOG_NOTICE, "password changed for %s", forwho);
++	else
++	    err = 1;
++    }
++
++#ifdef WITH_SELINUX
++    if (SELINUX_ENABLED) {
++      if (setfscreatecon(prev_context)) {
++	err = 1;
++      }
++      if (prev_context)
++	freecon(prev_context);
++      prev_context=NULL;
++    }
++#endif
++
++    if (!err) {
++	return PAM_SUCCESS;
++    } else {
++	unlink(SH_TMPFILE);
++	return PAM_AUTHTOK_ERR;
++    }
++}
+diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_unix/unix_update.c
+--- /dev/null	2007-09-17 08:57:19.474470099 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_update.c	2007-09-18 10:16:36.000000000 +0200
+@@ -0,0 +1,264 @@
 +/*
 + * This program is designed to run setuid(root) or with sufficient
 + * privilege to read all of the unix password databases. It is designed
@@ -1984,6 +2009,8 @@
 +        _pam_drop(xx);          \
 +}
 +
++const char app_name[] = "unix_update";
++
 +static int
 +_unix_shadowed(const struct passwd *pwd)
 +{
@@ -2194,8 +2221,9 @@
 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 + * OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
---- /dev/null	2007-07-08 21:11:04.052436262 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c	2007-07-23 13:40:56.000000000 +0200
+diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c
+--- /dev/null	2007-09-17 08:57:19.474470099 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c	2007-09-18 10:15:19.000000000 +0200
 @@ -0,0 +1,308 @@
 +/*
 + * This program is designed to run setuid(root) or with sufficient
@@ -2242,7 +2270,7 @@
 +	va_list args;
 +
 +	va_start(args, format);
-+	openlog("unix_chkpwd", LOG_CONS | LOG_PID, LOG_AUTHPRIV);
++	openlog(app_name, LOG_CONS | LOG_PID, LOG_AUTHPRIV);
 +	vsyslog(err, format, args);
 +	va_end(args);
 +	closelog();
@@ -2505,9 +2533,40 @@
 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 + * OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/support.c.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/support.c
+--- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.update-helper	2007-02-06 17:06:45.000000000 +0100
++++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-09-18 12:05:31.000000000 +0200
+@@ -36,6 +36,8 @@
+ #define SELINUX_ENABLED 0
+ #endif
+ 
++const char app_name[]="pam_unix";
++
+ /* this is a front-end for module-application conversations */
+ 
+ int _make_remark(pam_handle_t * pamh, unsigned int ctrl,
+@@ -627,7 +629,7 @@ int _unix_verify_password(pam_handle_t *
+ 				setreuid( save_uid, -1 );
+ 				setreuid( -1, save_euid );
+ 			}
+-		} else if (_unix_shadowed(pwd)) {
++		} else if (_unix_shadowed(pwd) && !SELINUX_ENABLED) {
+ 			/*
+ 			 * ...and shadow password file entry for this user,
+ 			 * if shadowing is enabled
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am
 --- Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am.update-helper	2006-12-18 19:50:50.000000000 +0100
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am	2007-07-23 13:40:56.000000000 +0200
-@@ -16,7 +16,8 @@
++++ Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am	2007-09-18 12:54:44.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ CLEANFILES = *~
+ 
+-EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \
++EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c passupdate.c $(MANS) CHANGELOG \
+ 		tst-pam_unix $(XMLS) 
+ 
+ man_MANS = pam_unix.8 unix_chkpwd.8
+@@ -16,7 +16,8 @@ securelibdir = $(SECUREDIR)
  secureconfdir = $(SCONFIGDIR)
  
  AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
@@ -2517,7 +2576,7 @@
  
  if HAVE_LIBSELINUX
    AM_CFLAGS += -D"WITH_SELINUX"
-@@ -34,9 +35,9 @@
+@@ -34,9 +35,9 @@ endif
  
  securelib_LTLIBRARIES = pam_unix.la
  
@@ -2529,7 +2588,7 @@
  
  noinst_PROGRAMS = bigcrypt
  
-@@ -48,11 +49,16 @@
+@@ -48,11 +49,16 @@ bigcrypt_SOURCES = bigcrypt.c bigcrypt_m
  bigcrypt_CFLAGS = $(AM_CFLAGS)
  bigcrypt_LDFLAGS = @LIBCRYPT@
  


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- pam.spec	24 Aug 2007 13:15:01 -0000	1.156
+++ pam.spec	18 Sep 2007 20:23:57 -0000	1.157
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 6%{?dist}
+Release: 7%{?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
@@ -397,6 +397,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
+- when SELinux enabled always run the helper binary instead of
+  direct shadow access (#293181)
+
 * Fri Aug 24 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-6
 - do not ask for blank password when SELinux confined (#254044)
 - initialize homedirs in namespace init script (original patch by dwalsh)



From fedora-extras-commits at redhat.com  Tue Sep 18 20:28:35 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:28:35 -0400
Subject: rpms/gchempaint/devel gchempaint.spec,1.11,1.12
Message-ID: <200709182028.l8IKSZWs000903@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv868

Modified Files:
	gchempaint.spec 
Log Message:
BR: libtool


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gchempaint.spec	18 Sep 2007 20:00:43 -0000	1.11
+++ gchempaint.spec	18 Sep 2007 20:28:03 -0000	1.12
@@ -19,6 +19,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
 BuildRequires:  automake
+BuildRequires:  libtool
 
 Requires:       hicolor-icon-theme
 



From fedora-extras-commits at redhat.com  Tue Sep 18 20:29:59 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Tue, 18 Sep 2007 16:29:59 -0400
Subject: rpms/filezilla/F-7 filezilla.spec,1.1,1.2
Message-ID: <200709182029.l8IKTxq0001067@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv955

Modified Files:
	filezilla.spec 
Log Message:
Add Requires to have gnutls >= 1.5.4



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/filezilla.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filezilla.spec	10 Sep 2007 20:30:10 -0000	1.1
+++ filezilla.spec	18 Sep 2007 20:29:27 -0000	1.2
@@ -25,6 +25,8 @@
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
+Requires:  gnutls >= 1.5.4
+
 
 %description
 FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.



From fedora-extras-commits at redhat.com  Tue Sep 18 20:30:13 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:30:13 -0400
Subject: rpms/gchempaint/F-7 gchempaint.spec,1.10,1.11
Message-ID: <200709182030.l8IKUDgn001076@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1023

Modified Files:
	gchempaint.spec 
Log Message:
BR: libtool


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/gchempaint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gchempaint.spec	18 Sep 2007 20:11:32 -0000	1.10
+++ gchempaint.spec	18 Sep 2007 20:29:41 -0000	1.11
@@ -19,6 +19,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
 BuildRequires:  automake
+BuildRequires:  libtool
 
 Requires:       hicolor-icon-theme
 



From fedora-extras-commits at redhat.com  Tue Sep 18 20:30:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 16:30:23 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.122, 1.123 libsepol.spec, 1.164, 
	1.165 sources, 1.123, 1.124
Message-ID: <200709182030.l8IKUN7d001089@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
- Upgrade to latest from NSA
	* Merged support for the handle_unknown policydb flag from Eric Paris.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	31 Aug 2007 12:42:21 -0000	1.122
+++ .cvsignore	18 Sep 2007 20:29:51 -0000	1.123
@@ -122,3 +122,4 @@
 libsepol-2.0.6.tgz
 libsepol-2.0.7.tgz
 libsepol-2.0.9.tgz
+libsepol-2.0.10.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- libsepol.spec	31 Aug 2007 14:16:54 -0000	1.164
+++ libsepol.spec	18 Sep 2007 20:29:51 -0000	1.165
@@ -1,7 +1,7 @@
 
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -86,6 +86,10 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
+- Upgrade to latest from NSA
+	* Merged support for the handle_unknown policydb flag from Eric Paris.
+
 * Fri Aug 31 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-1
 - Upgrade to latest from NSA
 	* Moved next_entry and put_entry out-of-line to reduce code size from Ulrich Drepper.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	31 Aug 2007 12:42:21 -0000	1.123
+++ sources	18 Sep 2007 20:29:51 -0000	1.124
@@ -1 +1 @@
-2e5233bb16cb3d23c8ea226c85085d6d  libsepol-2.0.9.tgz
+0183e0fed49daa76c059d11fa2949ff6  libsepol-2.0.10.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:31:33 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 16:31:33 -0400
Subject: rpms/rtorrent/devel .cvsignore, 1.8, 1.9 rtorrent.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709182031.l8IKVXvh001208@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1160

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
Updating to last upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jun 2007 14:44:00 -0000	1.8
+++ .cvsignore	18 Sep 2007 20:31:00 -0000	1.9
@@ -1,2 +1 @@
-rtorrent-0.7.4.tar.gz
-rtorrent.rc.example
+rtorrent-0.7.8.tar.gz


Index: rtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rtorrent.spec	28 Aug 2007 21:53:49 -0000	1.18
+++ rtorrent.spec	18 Sep 2007 20:31:00 -0000	1.19
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.7.4
-Release:       3%{?dist}
+Version:       0.7.8
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.11.4, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.11.4
+Requires:      libtorrent >= 0.11.8
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -44,6 +44,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0.7.8-1
+- New upstream release
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.7.4-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Jun 2007 14:44:00 -0000	1.8
+++ sources	18 Sep 2007 20:31:00 -0000	1.9
@@ -1,2 +1 @@
-6a846c129c1b3d0d08478faa4c3d8339  rtorrent-0.7.4.tar.gz
-e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example
+50886a98fa2ae16ae33367ef61772e1e  rtorrent-0.7.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:35:54 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:35:54 -0400
Subject: rpms/glibc/devel glibc-fedora.patch,1.237,1.238
Message-ID: <200709182035.l8IKZsDk001365@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	glibc-fedora.patch 
Log Message:
2.6.90-14

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- glibc-fedora.patch	18 Sep 2007 20:12:30 -0000	1.237
+++ glibc-fedora.patch	18 Sep 2007 20:35:52 -0000	1.238
@@ -2149,3 +2149,17 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/misc/bits/syslog.h	18 Sep 2007 19:57:16 -0000	1.1.2.2
++++ libc/misc/bits/syslog.h	18 Sep 2007 20:33:39 -0000
+@@ -27,9 +27,9 @@ extern void __syslog_chk (int __pri, int
+ 
+ #ifdef __va_arg_pack
+ __extern_always_inline void
+-syslog (int __pri, int __flag, __const char *__fmt, ...)
++syslog (int __pri, __const char *__fmt, ...)
+ {
+-  return __syslog_chk (__pri, __flag, __fmt, __va_arg_pack ());
++  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
+ }
+ #elif !defined __cplusplus
+ # define syslog(pri, ...) \



From fedora-extras-commits at redhat.com  Tue Sep 18 20:41:33 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 18 Sep 2007 16:41:33 -0400
Subject: rpms/gphoto2/devel gphoto2-storage.patch, NONE, 1.1 gphoto2.spec,
	1.83, 1.84
Message-ID: <200709182041.l8IKfXLn001707@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1480

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-storage.patch 
Log Message:
avoid tagging mass storage devices as cameras (#295051)

gphoto2-storage.patch:

--- NEW FILE gphoto2-storage.patch ---
--- gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig	2007-09-18 11:36:19.000000000 -0400
+++ gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c	2007-09-18 11:52:42.000000000 -0400
@@ -799,6 +799,8 @@
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
 	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("   <!-- skip USB Mass Storage Devices -->\n");
+	printf("   <match key=\"usb.interface_class\" compare_ne=\"8\">\n");
 	return 0;
 }
 
@@ -838,52 +840,52 @@
 			return 0;
 		}
 		if (a->usb_vendor) { /* usb product id might be 0! */
-			printf("   <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
-			printf("    <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
+			printf("    <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
+			printf("     <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
 			if (a->device_type & GP_DEVICE_AUDIO_PLAYER) {
-				printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
-				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
-				printf("     <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
+				printf("      <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+				printf("      <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
+				printf("      <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
 				
 				/* FIXME: needs true formats ... But all of them can do MP3 */
-				printf("     <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
+				printf("      <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
 			} else {
-				printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+				printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 				
 				/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
 				if (NULL!=strstr(a->library,"ptp"))
-					printf("     <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
+					printf("      <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
 				else
-					printf("     <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+					printf("      <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
 			}
 			/* leave them here even for audio players */
-			printf("     <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
-			printf("     <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("      <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
+			printf("      <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 			
 		} else if ((a->usb_class) && (a->usb_class != 666)) {
-			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
-			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
-			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
-			printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-			printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
+			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
+			printf("      <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
+			printf("       <merge key=\"info.category\" type=\"string\">camera</merge>\n");
+			printf("       <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 			if (a->usb_class == 6) {
-				printf("      <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
+				printf("       <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
 			} else {
 				if (a->usb_class == 8) {
-					printf("      <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
+					printf("       <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
 				} else {
-					printf("      <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+					printf("       <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
 				}
 			}
-			printf("      <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
-			printf("      <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("       <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
+			printf("       <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("      </match>\n");
 			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 	} /* camera has USB connection */
 	return 0;
@@ -892,6 +894,7 @@
 static int
 fdi_end_func (const func_params_t *params, void *data)
 {
+	printf("   </match>\n");
 	printf("  </match>\n");
 	printf(" </device>\n");
 	printf("</deviceinfo>\n");
@@ -918,6 +921,8 @@
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
 	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("   <!-- skip USB Mass Storage Devices -->\n");
+	printf("   <match key=\"usb.interface_class\" compare_ne=\"8\">\n");
 	return 0;
 }
 
@@ -961,28 +966,28 @@
 			/* do not set category. We don't really know what this device really is.
 			 * But we do now that is capable of being a camera, so add to capabilities
 			 */
-			printf("   <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
-			printf("    <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
+			printf("    <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
+			printf("     <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
 			if (params->add_comments) {
 				printf("     <!-- %s -->\n", a->model);
 			}
 			if (a->device_type & GP_DEVICE_AUDIO_PLAYER)
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
 			else
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 #if 0
 		/* would need to be able to merge upwards ... but cannot currently */
 		else if ((a->usb_class) && (a->usb_class != 666)) {
-			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
-			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
-			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
-			printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
+			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
+			printf("      <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
+			printf("       <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("      </match>\n");
 			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 #endif
 	}
@@ -992,6 +997,7 @@
 static int
 fdi_device_end_func (const func_params_t *params, void *data)
 {
+	printf("   </match>\n");
 	printf("  </match>\n");
 	printf(" </device>\n");
 	printf("</deviceinfo>\n");


Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gphoto2.spec	23 Aug 2007 06:29:42 -0000	1.83
+++ gphoto2.spec	18 Sep 2007 20:41:01 -0000	1.84
@@ -8,13 +8,14 @@
 %define libpkg libgphoto2
 %define libver 2.4.0
 Version: %{pkgver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
 Patch1: gphoto2-pkgcfg.patch
+Patch2: gphoto2-storage.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 Provides: libgphoto2 = %{libver}
@@ -68,6 +69,7 @@
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .pkgcfg
+%patch2 -p1 -b .storage
 
 # write pkg-config stuff 
 cat > gphoto2.pc.in << EOF
@@ -197,6 +199,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Sep 18 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-3
+- avoid tagging mass storage devices as cameras (#295051)
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-2
 - update License
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Tue Sep 18 20:45:19 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 16:45:19 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.149, 1.150 libselinux-rhat.patch,
	1.127, 1.128 libselinux.spec, 1.285, 1.286 sources, 1.151, 1.152
Message-ID: <200709182045.l8IKjJZ6001878@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- .cvsignore	13 Sep 2007 12:29:38 -0000	1.149
+++ .cvsignore	18 Sep 2007 20:44:47 -0000	1.150
@@ -128,3 +128,4 @@
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
+libselinux-2.0.34.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- libselinux-rhat.patch	18 Sep 2007 15:37:42 -0000	1.127
+++ libselinux-rhat.patch	18 Sep 2007 20:44:47 -0000	1.128
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2007-08-10 11:58:34.000000000 -0400
-+++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 11:28:07.000000000 -0400
+--- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
++++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 15:45:42.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -9,17 +9,41 @@
  #include "selinux_internal.h"
  #include "label_internal.h"
  #include "callbacks.h"
-@@ -55,10 +56,12 @@
- #endif
-     default_printf(const char *fmt, ...)
+@@ -57,7 +58,7 @@
  {
-+	char buf[BUFSIZ];
  	va_list ap;
  	va_start(ap, fmt);
 -	vfprintf(stderr, fmt, ap);
-+	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
++	vsyslog(LOG_ERR, fmt, ap);
  	va_end(ap);
-+	syslog(LOG_ERR, buf, strlen(buf));
  }
  
- void
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.33/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
++++ libselinux-2.0.33/utils/matchpathcon.c	2007-09-18 15:50:31.000000000 -0400
+@@ -17,10 +17,24 @@
+ 	exit(1);
+ }
+ 
++static void
++#ifdef __GNUC__
++    __attribute__ ((format(printf, 1, 2)))
++#endif
++    myprintf(const char *fmt, ...)
++{
++	va_list ap;
++	va_start(ap, fmt);
++	vfprintf(stderr, fmt, ap);
++	va_end(ap);
++}
++
+ int printmatchpathcon(char *path, int header, int mode)
+ {
+ 	char *buf;
+-	int rc = matchpathcon(path, mode, &buf);
++	int rc;
++	set_matchpathcon_printf(myprintf);
++	rc = matchpathcon(path, mode, &buf);
+ 	if (rc < 0) {
+ 		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
+ 			strerror(errno));


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- libselinux.spec	18 Sep 2007 15:37:42 -0000	1.285
+++ libselinux.spec	18 Sep 2007 20:44:47 -0000	1.286
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.1-1
+%define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.33
-Release: 2%{?dist}
+Version: 2.0.34
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,10 @@
 
 %changelog
 
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-1
+- Upgrade to latest from NSA
+	* Fix selabel option flag setting for 64-bit from Stephen Smalley.
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-2
 - Change matchpatcon to use syslog instead of syserror
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	13 Sep 2007 12:29:38 -0000	1.151
+++ sources	18 Sep 2007 20:44:47 -0000	1.152
@@ -1 +1 @@
-0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz
+e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:45:40 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 16:45:40 -0400
Subject: rpms/pungi/devel .cvsignore, 1.25, 1.26 pungi.spec, 1.27,
	1.28 sources, 1.26, 1.27
Message-ID: <200709182045.l8IKjeM2001924@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New release to create media repo file.  Used by yum/pirut post install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	17 Sep 2007 21:37:38 -0000	1.25
+++ .cvsignore	18 Sep 2007 20:45:07 -0000	1.26
@@ -1 +1 @@
-pungi-1.1.0.tar.gz
+pungi-1.1.1.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pungi.spec	17 Sep 2007 21:37:38 -0000	1.27
+++ pungi.spec	18 Sep 2007 20:45:07 -0000	1.28
@@ -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:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jesse Keating <jkeating at redhat.com> - 1.1.1-1
+- Create a media.repo file on the first iso
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 1.1.0-1
 - Create repoview content in the tree
 - Move the .composeinfo file into the directory we actually publish


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	17 Sep 2007 21:37:38 -0000	1.26
+++ sources	18 Sep 2007 20:45:07 -0000	1.27
@@ -1 +1 @@
-b3b7fc5296b9d4c7d9a18c81142baff1  pungi-1.1.0.tar.gz
+60e42213c8e0fc5d8306f6b32d468397  pungi-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:51:24 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 16:51:24 -0400
Subject: rpms/polyester/F-7 .cvsignore, 1.3, 1.4 polyester.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709182051.l8IKpO6U002146@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106/F-7

Modified Files:
	.cvsignore polyester.spec sources 
Log Message:
Update to new version on F-7 and FC-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2007 08:43:51 -0000	1.3
+++ .cvsignore	18 Sep 2007 20:50:51 -0000	1.4
@@ -1 +1 @@
-polyester-1.0.1.tar.bz2
+polyester-1.0.2.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/polyester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- polyester.spec	16 Aug 2007 10:08:21 -0000	1.3
+++ polyester.spec	18 Sep 2007 20:50:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           polyester
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        KDE style and window decoration
 
 Group:          User Interface/Desktops
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Aug 21 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.2-1
+- new upstream version: 1.0.2
+
 * Thu Aug 16 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.1-2
 - Change License to LGPLv2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2007 08:43:51 -0000	1.3
+++ sources	18 Sep 2007 20:50:51 -0000	1.4
@@ -1 +1 @@
-ad446cbaa846f660670315bad7c07dc0  polyester-1.0.1.tar.bz2
+6b85333e774567e69c741b35a54a4df5  polyester-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:51:26 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 16:51:26 -0400
Subject: rpms/polyester/FC-6 .cvsignore, 1.3, 1.4 polyester.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709182051.l8IKpQ44002151@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106/FC-6

Modified Files:
	.cvsignore polyester.spec sources 
Log Message:
Update to new version on F-7 and FC-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2007 08:44:23 -0000	1.3
+++ .cvsignore	18 Sep 2007 20:50:54 -0000	1.4
@@ -1 +1 @@
-polyester-1.0.1.tar.bz2
+polyester-1.0.2.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/polyester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- polyester.spec	16 Aug 2007 10:08:24 -0000	1.3
+++ polyester.spec	18 Sep 2007 20:50:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           polyester
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        KDE style and window decoration
 
 Group:          User Interface/Desktops
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Aug 21 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.2-1
+- new upstream version: 1.0.2
+
 * Thu Aug 16 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.1-2
 - Change License to LGPLv2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2007 08:44:23 -0000	1.3
+++ sources	18 Sep 2007 20:50:54 -0000	1.4
@@ -1 +1 @@
-ad446cbaa846f660670315bad7c07dc0  polyester-1.0.1.tar.bz2
+6b85333e774567e69c741b35a54a4df5  polyester-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:59:23 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 18 Sep 2007 16:59:23 -0400
Subject: rpms/kernel/devel
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch,
	NONE, 1.1
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch,
	NONE, 1.1 linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch,
	NONE, 1.1 linux-2.6-xfs-filesize-updates.patch, NONE,
	1.1 linux-2.6-xfs-setfattr-32bit-compat.patch, NONE,
	1.1 kernel.spec, 1.169, 1.170
Message-ID: <200709182059.l8IKxNbV002491@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2437

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch 
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch 
	linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch 
	linux-2.6-xfs-filesize-updates.patch 
	linux-2.6-xfs-setfattr-32bit-compat.patch 
Log Message:
* Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
- ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
  handle dx directory corruption gracefully, w/o BUG (#236464).
- xfs bugfixes: setfattr/getfattr/getversion 32-bit compat fixes (#291981),
  log replay vs. filesize update fixes from sgi.


linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch:

--- NEW FILE linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch ---
The patch titled
     dir_index: error out instead of BUG on corrupt dx dirs
has been added to the -mm tree.  Its filename is
     dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch

Index: linux-2.6.22.noarch/fs/ext3/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext3/namei.c
+++ linux-2.6.22.noarch/fs/ext3/namei.c
@@ -379,13 +379,28 @@ dx_probe(struct dentry *dentry, struct i
 
 	entries = (struct dx_entry *) (((char *)&root->info) +
 				       root->info.info_length);
-	assert(dx_get_limit(entries) == dx_root_limit(dir,
-						      root->info.info_length));
+
+	if (dx_get_limit(entries) != dx_root_limit(dir,
+						   root->info.info_length)) {
+		ext3_warning(dir->i_sb, __FUNCTION__,
+			     "dx entry: limit != root limit");
+		brelse(bh);
+		*err = ERR_BAD_DX_DIR;
+		goto fail;
+	}
+
 	dxtrace (printk("Look up %x", hash));
 	while (1)
 	{
 		count = dx_get_count(entries);
-		assert (count && count <= dx_get_limit(entries));
+		if (!count || count > dx_get_limit(entries)) {
+			ext3_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: no count or count > limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
+
 		p = entries + 1;
 		q = entries + count - 1;
 		while (p <= q)
@@ -423,8 +438,15 @@ dx_probe(struct dentry *dentry, struct i
 		if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
 			goto fail2;
 		at = entries = ((struct dx_node *) bh->b_data)->entries;
-		assert (dx_get_limit(entries) == dx_node_limit (dir));
+		if (dx_get_limit(entries) != dx_node_limit (dir)) {
+			ext3_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: limit != node limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
 		frame++;
+		frame->bh = NULL;
 	}
 fail2:
 	while (frame >= frame_in) {
@@ -432,6 +454,10 @@ fail2:
 		frame--;
 	}
 fail:
+	if (*err == ERR_BAD_DX_DIR)
+		ext3_warning(dir->i_sb, __FUNCTION__,
+			     "Corrupt dir inode %ld, running e2fsck is "
+			     "recommended.", dir->i_ino);
 	return NULL;
 }
 
Index: linux-2.6.22.noarch/fs/ext4/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext4/namei.c
+++ linux-2.6.22.noarch/fs/ext4/namei.c
@@ -379,13 +379,28 @@ dx_probe(struct dentry *dentry, struct i
 
 	entries = (struct dx_entry *) (((char *)&root->info) +
 				       root->info.info_length);
-	assert(dx_get_limit(entries) == dx_root_limit(dir,
-						      root->info.info_length));
+
+	if (dx_get_limit(entries) != dx_root_limit(dir,
+						   root->info.info_length)) {
+		ext4_warning(dir->i_sb, __FUNCTION__,
+			     "dx entry: limit != root limit");
+		brelse(bh);
+		*err = ERR_BAD_DX_DIR;
+		goto fail;
+	}
+
 	dxtrace (printk("Look up %x", hash));
 	while (1)
 	{
 		count = dx_get_count(entries);
-		assert (count && count <= dx_get_limit(entries));
+		if (!count || count > dx_get_limit(entries)) {
+			ext4_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: no count or count > limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
+
 		p = entries + 1;
 		q = entries + count - 1;
 		while (p <= q)
@@ -423,8 +438,15 @@ dx_probe(struct dentry *dentry, struct i
 		if (!(bh = ext4_bread (NULL,dir, dx_get_block(at), 0, err)))
 			goto fail2;
 		at = entries = ((struct dx_node *) bh->b_data)->entries;
-		assert (dx_get_limit(entries) == dx_node_limit (dir));
+		if (dx_get_limit(entries) != dx_node_limit (dir)) {
+			ext4_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: limit != node limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
 		frame++;
+		frame->bh = NULL;
 	}
 fail2:
 	while (frame >= frame_in) {
@@ -432,6 +454,10 @@ fail2:
 		frame--;
 	}
 fail:
+	if (*err == ERR_BAD_DX_DIR)
+		ext4_warning(dir->i_sb, __FUNCTION__,
+			     "Corrupt dir inode %ld, running e2fsck is "
+			     "recommended.", dir->i_ino);
 	return NULL;
 }
 

linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch:

--- NEW FILE linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch ---
The patch titled
     ext34: ensure do_split leaves enough free space in both blocks
has been added to the -mm tree.  Its filename is
     ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch

Index: linux-2.6.22.noarch/fs/ext3/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext3/namei.c
+++ linux-2.6.22.noarch/fs/ext3/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
 	u32 hash;
-	u32 offs;
+	u16 offs;
+	u16 size;
 };
 
 #ifdef CONFIG_EXT3_INDEX
@@ -697,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
 			struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -710,7 +715,8 @@ static int dx_make_map (struct ext3_dir_
 			ext3fs_dirhash(de->name, de->name_len, &h);
 			map_tail--;
 			map_tail->hash = h.hash;
-			map_tail->offs = (u32) ((char *) de - base);
+			map_tail->offs = (u16) ((char *) de - base);
+			map_tail->size = le16_to_cpu(de->rec_len);
 			count++;
 			cond_resched();
 		}
@@ -720,6 +726,7 @@ static int dx_make_map (struct ext3_dir_
 	return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
         struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1117,6 +1124,10 @@ static inline void ext3_set_de_type(stru
 }
 
 #ifdef CONFIG_EXT3_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext3_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1135,6 +1146,10 @@ dx_move_dirents(char *from, char *to, st
 	return (struct ext3_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 static struct ext3_dir_entry_2* dx_pack_dirents(char *base, int size)
 {
 	struct ext3_dir_entry_2 *next, *to, *prev, *de = (struct ext3_dir_entry_2 *) base;
@@ -1157,6 +1172,11 @@ static struct ext3_dir_entry_2* dx_pack_
 	return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
 			struct buffer_head **bh,struct dx_frame *frame,
 			struct dx_hash_info *hinfo, int *error)
@@ -1168,7 +1188,7 @@ static struct ext3_dir_entry_2 *do_split
 	u32 hash2;
 	struct dx_map_entry *map;
 	char *data1 = (*bh)->b_data, *data2;
-	unsigned split;
+	unsigned split, move, size, i;
 	struct ext3_dir_entry_2 *de = NULL, *de2;
 	int	err = 0;
 
@@ -1196,8 +1216,19 @@ static struct ext3_dir_entry_2 *do_split
 	count = dx_make_map ((struct ext3_dir_entry_2 *) data1,
 			     blocksize, hinfo, map);
 	map -= count;
-	split = count/2; // need to adjust to actual middle
 	dx_sort_map (map, count);
+	/* Split the existing block in the middle, size-wise */
+	size = 0;
+	move = 0;
+	for (i = count-1; i >= 0; i--) {
+		/* is more than half of this entry in 2nd half of the block? */
+		if (size + map[i].size/2 > blocksize/2)
+			break;
+		size += map[i].size;
+		move++;
+	}
+	/* map index at which we will split */
+	split = count - move;
 	hash2 = map[split].hash;
 	continued = hash2 == map[split - 1].hash;
 	dxtrace(printk("Split block %i at %x, %i/%i\n",
Index: linux-2.6.22.noarch/fs/ext4/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext4/namei.c
+++ linux-2.6.22.noarch/fs/ext4/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
 	u32 hash;
-	u32 offs;
+	u16 offs;
+	u16 size;
 };
 
 #ifdef CONFIG_EXT4_INDEX
@@ -697,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext4_dir_entry_2 *de, int size,
 			struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -710,7 +715,8 @@ static int dx_make_map (struct ext4_dir_
 			ext4fs_dirhash(de->name, de->name_len, &h);
 			map_tail--;
 			map_tail->hash = h.hash;
-			map_tail->offs = (u32) ((char *) de - base);
+			map_tail->offs = (u16) ((char *) de - base);
+			map_tail->size = le16_to_cpu(de->rec_len);
 			count++;
 			cond_resched();
 		}
@@ -720,6 +726,7 @@ static int dx_make_map (struct ext4_dir_
 	return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
 	struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1115,6 +1122,10 @@ static inline void ext4_set_de_type(stru
 }
 
 #ifdef CONFIG_EXT4_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext4_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1133,6 +1144,10 @@ dx_move_dirents(char *from, char *to, st
 	return (struct ext4_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 static struct ext4_dir_entry_2* dx_pack_dirents(char *base, int size)
 {
 	struct ext4_dir_entry_2 *next, *to, *prev, *de = (struct ext4_dir_entry_2 *) base;
@@ -1155,6 +1170,11 @@ static struct ext4_dir_entry_2* dx_pack_
 	return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
 			struct buffer_head **bh,struct dx_frame *frame,
 			struct dx_hash_info *hinfo, int *error)
@@ -1166,7 +1186,7 @@ static struct ext4_dir_entry_2 *do_split
 	u32 hash2;
 	struct dx_map_entry *map;
 	char *data1 = (*bh)->b_data, *data2;
-	unsigned split;
+	unsigned split, move, size, i;
 	struct ext4_dir_entry_2 *de = NULL, *de2;
 	int	err = 0;
 
@@ -1194,8 +1214,19 @@ static struct ext4_dir_entry_2 *do_split
 	count = dx_make_map ((struct ext4_dir_entry_2 *) data1,
 			     blocksize, hinfo, map);
 	map -= count;
-	split = count/2; // need to adjust to actual middle
 	dx_sort_map (map, count);
+	/* Split the existing block in the middle, size-wise */
+	size = 0;
+	move = 0;
+	for (i = count-1; i >= 0; i--) {
+		/* is more than half of this entry in 2nd half of the block? */
+		if (size + map[i].size/2 > blocksize/2)
+			break;
+		size += map[i].size;
+		move++;
+	}
+	/* map index at which we will split */
+	split = count - move;
 	hash2 = map[split].hash;
 	continued = hash2 == map[split - 1].hash;
 	dxtrace(printk("Split block %i at %x, %i/%i\n",

linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch:

--- NEW FILE linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch ---
From: Lachlan McIlroy <lachlan at sgi.com>
Date: Fri, 14 Sep 2007 05:23:04 +0000 (+1000)
Subject: [XFS] Avoid replaying inode buffer initialisation log items if on-disk
X-Git-Url: http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs%2Fxfs-2.6.git;a=commitdiff_plain;h=4a5fd6f64de88906ceba164e9b002a87f3e55894;hp=8e04f1324e37bd317502c4393d381e5060323c08

[XFS] Avoid replaying inode buffer initialisation log items if on-disk
version is newer.

SGI-PV: 969656
SGI-Modid: xfs-linux-melb:xfs-kern:29676a

Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
---

Index: linux-2.6.22.noarch/fs/xfs/xfs_buf_item.h
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_buf_item.h
+++ linux-2.6.22.noarch/fs/xfs/xfs_buf_item.h
@@ -52,6 +52,11 @@ typedef struct xfs_buf_log_format_t {
 #define	XFS_BLI_UDQUOT_BUF	0x4
 #define XFS_BLI_PDQUOT_BUF	0x8
 #define	XFS_BLI_GDQUOT_BUF	0x10
+/*
+ * This flag indicates that the buffer contains newly allocated
+ * inodes.
+ */
+#define	XFS_BLI_INODE_NEW_BUF	0x20
 
 #define	XFS_BLI_CHUNK		128
 #define	XFS_BLI_SHIFT		7
Index: linux-2.6.22.noarch/fs/xfs/xfs_log_recover.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_log_recover.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_log_recover.c
@@ -1874,6 +1874,7 @@ xlog_recover_do_inode_buffer(
 /*ARGSUSED*/
 STATIC void
 xlog_recover_do_reg_buffer(
+	xfs_mount_t		*mp,
 	xlog_recover_item_t	*item,
 	xfs_buf_t		*bp,
 	xfs_buf_log_format_t	*buf_f)
@@ -1884,6 +1885,50 @@ xlog_recover_do_reg_buffer(
 	unsigned int		*data_map = NULL;
 	unsigned int		map_size = 0;
 	int                     error;
+	int			stale_buf = 1;
+
+	/*
+	 * Scan through the on-disk inode buffer and attempt to
+	 * determine if it has been written to since it was logged.
+	 *
+	 * - If any of the magic numbers are incorrect then the buffer is stale
+	 * - If any of the modes are non-zero then the buffer is not stale
+	 * - If all of the modes are zero and at least one of the generation
+	 *   counts is non-zero then the buffer is stale
+	 *
+	 * If the end result is a stale buffer then the log buffer is replayed
+	 * otherwise it is skipped.
+	 *
+	 * This heuristic is not perfect.  It can be improved by scanning the
+	 * entire inode chunk for evidence that any of the inode clusters have
+	 * been updated.  To fix this problem completely we will need a major
+	 * architectural change to the logging system.
+	 */
+	if (buf_f->blf_flags & XFS_BLI_INODE_NEW_BUF) {
+		xfs_dinode_t    *dip;
+		int             inodes_per_buf;
+		int		mode_count = 0;
+		int		gen_count = 0;
+
+		stale_buf = 0;
+		inodes_per_buf = XFS_BUF_COUNT(bp) >> mp->m_sb.sb_inodelog;
+		for (i = 0; i < inodes_per_buf; i++) {
+			dip = (xfs_dinode_t *)xfs_buf_offset(bp,
+				i * mp->m_sb.sb_inodesize);
+			if (be16_to_cpu(dip->di_core.di_magic) !=
+					XFS_DINODE_MAGIC) {
+				stale_buf = 1;
+				break;
+			}
+			if (be16_to_cpu(dip->di_core.di_mode))
+				mode_count++;
+			if (be16_to_cpu(dip->di_core.di_gen))
+				gen_count++;
+		}
+
+		if (!mode_count && gen_count)
+			stale_buf = 1;
+	}
 
 	switch (buf_f->blf_type) {
 	case XFS_LI_BUF:
@@ -1917,7 +1962,7 @@ xlog_recover_do_reg_buffer(
 					       -1, 0, XFS_QMOPT_DOWARN,
 					       "dquot_buf_recover");
 		}
-		if (!error)
+		if (!error && stale_buf)
 			memcpy(xfs_buf_offset(bp,
 				(uint)bit << XFS_BLI_SHIFT),	/* dest */
 				item->ri_buf[i].i_addr,		/* source */
@@ -2089,7 +2134,7 @@ xlog_recover_do_dquot_buffer(
 	if (log->l_quotaoffs_flag & type)
 		return;
 
-	xlog_recover_do_reg_buffer(item, bp, buf_f);
+	xlog_recover_do_reg_buffer(mp, item, bp, buf_f);
 }
 
 /*
@@ -2190,7 +2235,7 @@ xlog_recover_do_buffer_trans(
 		  (XFS_BLI_UDQUOT_BUF|XFS_BLI_PDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) {
 		xlog_recover_do_dquot_buffer(mp, log, item, bp, buf_f);
 	} else {
-		xlog_recover_do_reg_buffer(item, bp, buf_f);
+		xlog_recover_do_reg_buffer(mp, item, bp, buf_f);
 	}
 	if (error)
 		return XFS_ERROR(error);
Index: linux-2.6.22.noarch/fs/xfs/xfs_trans_buf.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_trans_buf.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_trans_buf.c
@@ -966,6 +966,7 @@ xfs_trans_inode_alloc_buf(
 	ASSERT(atomic_read(&bip->bli_refcount) > 0);
 
 	bip->bli_flags |= XFS_BLI_INODE_ALLOC_BUF;
+	bip->bli_format.blf_flags |= XFS_BLI_INODE_NEW_BUF;
 }
 
 

linux-2.6-xfs-filesize-updates.patch:

--- NEW FILE linux-2.6-xfs-filesize-updates.patch ---
From: Lachlan McIlroy <lachlan at sgi.com>
Date: Fri, 14 Sep 2007 05:22:50 +0000 (+1000)
Subject: [XFS] Ensure file size updates have been completed before writing inode to
X-Git-Url: http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs%2Fxfs-2.6.git;a=commitdiff_plain;h=8e04f1324e37bd317502c4393d381e5060323c08;hp=ef6567a363c5f301c0bc885068d93cd9b3c05cc9

[XFS] Ensure file size updates have been completed before writing inode to
disk.

SGI-PV: 968767
SGI-Modid: xfs-linux-melb:xfs-kern:29675a

Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
---

Index: linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_aops.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/linux-2.6/xfs_aops.c
+++ linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_aops.c
@@ -181,6 +181,7 @@ xfs_setfilesize(
 		ip->i_d.di_size = isize;
 		ip->i_update_core = 1;
 		ip->i_update_size = 1;
+		mark_inode_dirty_sync(vn_to_inode(ioend->io_vnode));
 	}
 
 	xfs_iunlock(ip, XFS_ILOCK_EXCL);
Index: linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/linux-2.6/xfs_super.c
+++ linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_super.c
@@ -415,8 +415,10 @@ xfs_fs_write_inode(
 
 	if (vp) {
 		vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
-		if (sync)
+		if (sync) {
+			filemap_fdatawait(inode->i_mapping);
 			flags |= FLUSH_SYNC;
+		}
 		error = bhv_vop_iflush(vp, flags);
 		if (error == EAGAIN)
 			error = sync? bhv_vop_iflush(vp, flags | FLUSH_LOG) : 0;
Index: linux-2.6.22.noarch/fs/xfs/xfs_vnodeops.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_vnodeops.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_vnodeops.c
@@ -1082,6 +1082,9 @@ xfs_fsync(
 	if (XFS_FORCED_SHUTDOWN(ip->i_mount))
 		return XFS_ERROR(EIO);
 
+	if (flag & FSYNC_DATA)
+		filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping);
+
 	/*
 	 * We always need to make sure that the required inode state
 	 * is safe on disk.  The vnode might be clean but because
@@ -3769,12 +3772,16 @@ xfs_inode_flush(
 			sync_lsn = log->l_last_sync_lsn;
 			GRANT_UNLOCK(log, s);
 
-			if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) <= 0))
-				return 0;
+			if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) > 0)) {
+				if (flags & FLUSH_SYNC)
+					log_flags |= XFS_LOG_SYNC;
+				error = xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+				if (error)
+					return error;
+			}
 
-			if (flags & FLUSH_SYNC)
-				log_flags |= XFS_LOG_SYNC;
-			return xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+			if (ip->i_update_core == 0)
+				return 0;
 		}
 	}
 
@@ -3788,9 +3795,6 @@ xfs_inode_flush(
 	if (flags & FLUSH_INODE) {
 		int	flush_flags;
 
-		if (xfs_ipincount(ip))
-			return EAGAIN;
-
 		if (flags & FLUSH_SYNC) {
 			xfs_ilock(ip, XFS_ILOCK_SHARED);
 			xfs_iflock(ip);

linux-2.6-xfs-setfattr-32bit-compat.patch:

--- NEW FILE linux-2.6-xfs-setfattr-32bit-compat.patch ---
Date: Mon, 17 Sep 2007 12:36:02 -0500
From: Eric Sandeen <sandeen at sandeen.net>
To: Eric Sandeen <sandeen at sandeen.net>
CC: xfs-oss <xfs at oss.sgi.com>
Subject: [PATCH V2] fix 32-bit compat ioctls for GETXFLAGS, SETXFLAGS, GETVERSION

In Red Hat bugzilla #291981, Sami Farin notes that 32-bit-compat
lsattr/chattr does not work on xfs.  After investigation, I found:

XFS_IOC_GETVERSION, XFS_IOC_GETXFLAGS and XFS_IOC_SETXFLAGS all
take a "long" which changes size between 32 and 64 bit platforms.

So, the ioctl cmds that come in from a 32-bit app aren't as expected, 
for example on GETXFLAGS,

	unknown cmd fd(3) cmd(80046601){t:'f';sz:4}

due to the size mismatch.

So, use instead the 32-bit version of the commands for compat ioctls,
and other than that it doesn't take any more manipulation.

Also, for both native and compat versions, just define them to
the values as defined in fs.h

Signed-off-by: Eric Sandeen <sandeen at sandeen.net>

Index: linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
===================================================================
--- linux-2.6.22.orig/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -376,9 +376,6 @@ xfs_compat_ioctl(
 	switch (cmd) {
 	case XFS_IOC_DIOINFO:
 	case XFS_IOC_FSGEOMETRY:
-	case XFS_IOC_GETVERSION:
-	case XFS_IOC_GETXFLAGS:
-	case XFS_IOC_SETXFLAGS:
 	case XFS_IOC_FSGETXATTR:
 	case XFS_IOC_FSSETXATTR:
 	case XFS_IOC_FSGETXATTRA:
@@ -404,6 +401,11 @@ xfs_compat_ioctl(
 	case XFS_IOC_ERROR_CLEARALL:
 		break;
 
+	case XFS_IOC32_GETXFLAGS:
+	case XFS_IOC32_SETXFLAGS:
+	case XFS_IOC32_GETVERSION:
+		cmd = _NATIVE_IOC(cmd, long);
+		break;
 #ifdef BROKEN_X86_ALIGNMENT
 	/* xfs_flock_t has wrong u32 vs u64 alignment */
 	case XFS_IOC_ALLOCSP_32:
Index: linux-2.6.22/fs/xfs/xfs_fs.h
===================================================================
--- linux-2.6.22.orig/fs/xfs/xfs_fs.h
+++ linux-2.6.22/fs/xfs/xfs_fs.h
@@ -436,9 +436,13 @@ typedef struct xfs_handle {
 /*
  * ioctl commands that are used by Linux filesystems
  */
-#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
-#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
-#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
+#define XFS_IOC_GETXFLAGS	FS_IOC_GETFLAGS
+#define XFS_IOC_SETXFLAGS	FS_IOC_SETFLAGS
+#define XFS_IOC_GETVERSION	FS_IOC_GETVERSION
+/* 32-bit compat counterparts */
+#define XFS_IOC32_GETXFLAGS	FS_IOC32_GETFLAGS
+#define XFS_IOC32_SETXFLAGS	FS_IOC32_SETFLAGS
+#define XFS_IOC32_GETVERSION	FS_IOC32_GETVERSION
 
 /*

  * ioctl commands that replace IRIX fcntl()'s






Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kernel.spec	18 Sep 2007 14:01:35 -0000	1.169
+++ kernel.spec	18 Sep 2007 20:58:50 -0000	1.170
@@ -668,7 +668,12 @@
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-Patch1508: linux-2.6-firewire-multi-lun.patch
+Patch1507: linux-2.6-xfs-filesize-updates.patch
+Patch1508: linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
+Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
+Patch1510: linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
+Patch1511: linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
+Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch 
@@ -1175,6 +1180,13 @@
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
 ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
+ApplyPatch linux-2.6-xfs-filesize-updates.patch
+ApplyPatch linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
+ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
+
+# ext3 bugfixes
+ApplyPatch linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
+ApplyPatch linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
 
 #
 # misc small stuff to make things compile
@@ -1799,6 +1811,12 @@
 
 
 %changelog
+* Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
+- ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
+  handle dx directory corruption gracefully, w/o BUG (#236464).
+- xfs bugfixes: setfattr/getfattr/getversion 32-bit compat fixes (#291981),
+  log replay vs. filesize update fixes from sgi.
+
 * Tue Sep 18 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 



From fedora-extras-commits at redhat.com  Tue Sep 18 21:17:54 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 18 Sep 2007 17:17:54 -0400
Subject: rpms/xfce4-places-plugin/F-7 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-places-plugin.spec, 1.4, 1.5
Message-ID: <200709182117.l8ILHsGg009491@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9454

Modified Files:
	.cvsignore sources xfce4-places-plugin.spec 
Log Message:
* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
- Update to 0.9.992



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Aug 2007 13:10:06 -0000	1.4
+++ .cvsignore	18 Sep 2007 21:17:21 -0000	1.5
@@ -1 +1 @@
-xfce4-places-plugin-0.9.991.tar.bz2
+xfce4-places-plugin-0.9.992.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Aug 2007 13:10:06 -0000	1.4
+++ sources	18 Sep 2007 21:17:21 -0000	1.5
@@ -1 +1 @@
-e6b4ffb260cc81a8388a32f4302091f4  xfce4-places-plugin-0.9.991.tar.bz2
+83728df00963920310ba21a76359d7cb  xfce4-places-plugin-0.9.992.tar.bz2


Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/xfce4-places-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-places-plugin.spec	25 Aug 2007 13:10:06 -0000	1.4
+++ xfce4-places-plugin.spec	18 Sep 2007 21:17:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		xfce4-places-plugin
-Version:	0.9.991
+Version:	0.9.992
 Release:	1%{?dist}
 Summary:	Places menu for the Xfce panel
 
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
+- Update to 0.9.992
+
 * Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.991-1
 - Update to 0.9.991
 - Update license tag



From fedora-extras-commits at redhat.com  Tue Sep 18 21:28:08 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:28:08 -0400
Subject: rpms/grsync/devel grsync.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709182128.l8ILS8jN010015@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9990/devel

Modified Files:
	.cvsignore sources 
Added Files:
	grsync.spec 
Log Message:



--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:33:01 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:33:01 -0400
Subject: rpms/grsync/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709182133.l8ILX1XN010215@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/F-7

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:32:27 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:32:27 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:33:05 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:33:05 -0400
Subject: rpms/grsync/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709182133.l8ILX5wv010222@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:32:32 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:32:32 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:37:14 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 17:37:14 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.444, 1.445 anaconda.spec, 1.580, 
	1.581 sources, 1.572, 1.573
Message-ID: <200709182137.l8ILbEHH010359@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10317

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- .cvsignore	13 Sep 2007 14:49:17 -0000	1.444
+++ .cvsignore	18 Sep 2007 21:36:42 -0000	1.445
@@ -1,2 +1,3 @@
 anaconda-11.3.0.28.tar.bz2
 anaconda-11.3.0.29.tar.bz2
+anaconda-11.3.0.31.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- anaconda.spec	13 Sep 2007 14:49:17 -0000	1.580
+++ anaconda.spec	18 Sep 2007 21:36:42 -0000	1.581
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.29
+Version: 11.3.0.31
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,22 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 11.3.0.31-1
+- Really include new Japanese font (katzj, #279931).
+- Use /dev/live-osimg-min if it exists (katzj).
+- Copy driver disk contents to /root (#289751).
+- Write out /root/anaconda-ks.cfg earlier (#292571).
+
+* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.30-1
+- Firewire module names changed again (#292421)
+- Some liveinst improvements (Douglas McClendon)
+- Create tape devices (dlehman)
+- Fix traceback on no more mirrors (dlehman)
+- Fix treeinfo path to stage2 (wwoods)
+- Remove unused graphics (notting)
+- Look at root path for kernels (Douglas McClendon)
+- Netlink fixes (pjones)
+
 * Thu Sep 13 2007 Chris Lumens <clumens at redhat.com> 11.3.0.29-1
 - On the graphical netconfig screen, only check the gateway address if
   provided (dcantrell).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- sources	13 Sep 2007 14:49:17 -0000	1.572
+++ sources	18 Sep 2007 21:36:42 -0000	1.573
@@ -1 +1,2 @@
 29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2
+1342d67a3b75cb941207a8e47d102d0c  anaconda-11.3.0.31.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 21:43:34 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:43:34 -0400
Subject: rpms/grsync/F-7 grsync.spec,NONE,1.1
Message-ID: <200709182143.l8ILhYTB010617@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10608/F-7

Added Files:
	grsync.spec 
Log Message:
add forgotten grsync.spec for FC6 and F7


--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release



From fedora-extras-commits at redhat.com  Tue Sep 18 21:43:37 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:43:37 -0400
Subject: rpms/grsync/FC-6 grsync.spec,NONE,1.1
Message-ID: <200709182143.l8ILhb2X010634@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10608/FC-6

Added Files:
	grsync.spec 
Log Message:
add forgotten grsync.spec for FC6 and F7


--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release



From fedora-extras-commits at redhat.com  Tue Sep 18 22:06:24 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 18:06:24 -0400
Subject: rpms/anaconda/devel sources,1.573,1.574
Message-ID: <200709182206.l8IM6OTS017231@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213

Modified Files:
	sources 
Log Message:
Trying the new build again.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- sources	18 Sep 2007 21:36:42 -0000	1.573
+++ sources	18 Sep 2007 22:05:50 -0000	1.574
@@ -1,2 +1 @@
-29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2
-1342d67a3b75cb941207a8e47d102d0c  anaconda-11.3.0.31.tar.bz2
+9786fb11aba1ac3d387490e1fcb2ba2c  anaconda-11.3.0.31.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:12:02 2007
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 18 Sep 2007 18:12:02 -0400
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.37, 1.38 dejavu-fonts.spec,
	1.67, 1.68 sources, 1.37, 1.38
Message-ID: <200709182212.l8IMC2Lo017382@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
2.20 - bugfix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	11 Aug 2007 11:07:37 -0000	1.37
+++ .cvsignore	18 Sep 2007 22:11:30 -0000	1.38
@@ -1 +1 @@
-dejavu-sfd-2.19.tar.bz2
+dejavu-sfd-2.20.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- dejavu-fonts.spec	11 Aug 2007 11:07:37 -0000	1.67
+++ dejavu-fonts.spec	18 Sep 2007 22:11:30 -0000	1.68
@@ -16,14 +16,15 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      %{fontname}-fonts
-Version:   2.19
+Version:   2.20
 Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 
 Group:     User Interface/X
 License:   Modifiable & redistributable, with naming restrictions
 URL:       http://%{fontname}.sf.net/
-Source0:   http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}.tar.bz2
+Source0:   %{?!alphatag:http://prdownloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
+
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 Source2:   %{name}-fontconfig-unhint-small.conf
@@ -159,6 +160,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+??? 2.20-1
+??? 2.20 final
+??? bugfix release (Hebrew fixes mostly)
+
 * Sat Aug 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ??? 2.19-1
 ??? 2.19 final


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	11 Aug 2007 11:07:37 -0000	1.37
+++ sources	18 Sep 2007 22:11:30 -0000	1.38
@@ -1 +1 @@
-28d65cd8e2ba992bb4974a02407e76de  dejavu-sfd-2.19.tar.bz2
+9633569289671481b328becd09f0e72b  dejavu-sfd-2.20.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:17:20 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 18 Sep 2007 18:17:20 -0400
Subject: rpms/libnetfilter_queue/devel .cvsignore, 1.2,
	1.3 libnetfilter_queue.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709182217.l8IMHKMu017622@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_queue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17577

Modified Files:
	.cvsignore libnetfilter_queue.spec sources 
Log Message:
libnetfilter_queue-0.0.15-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2007 21:20:30 -0000	1.2
+++ .cvsignore	18 Sep 2007 22:16:47 -0000	1.3
@@ -1 +1 @@
-libnetfilter_queue-0.0.13.tar.bz2
+libnetfilter_queue-0.0.15.tar.bz2


Index: libnetfilter_queue.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/libnetfilter_queue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnetfilter_queue.spec	25 Mar 2007 21:20:30 -0000	1.1
+++ libnetfilter_queue.spec	18 Sep 2007 22:16:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libnetfilter_queue
-Version:        0.0.13
-Release:        3%{?dist}
+Version:        0.0.15
+Release:        1%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
 License:        GPL
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Sep 18 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.15-1
+- new upstream version
+
 * Mon Mar 26 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.13-3
 - own some directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2007 21:20:30 -0000	1.2
+++ sources	18 Sep 2007 22:16:47 -0000	1.3
@@ -1 +1 @@
-660cbfd3dc8c10bf9b1803cd2b688256  libnetfilter_queue-0.0.13.tar.bz2
+d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:26:08 2007
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 18 Sep 2007 18:26:08 -0400
Subject: rpms/lzop/devel lzop.spec,1.12,1.13
Message-ID: <200709182226.l8IMQ8Rq018183@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18163/devel

Modified Files:
	lzop.spec 
Log Message:
License fix


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lzop.spec	2 Sep 2006 15:00:04 -0000	1.12
+++ lzop.spec	18 Sep 2007 22:25:35 -0000	1.13
@@ -2,12 +2,12 @@
 
 Name: lzop
 Version: 1.02
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
-License: GPL
+License: GPL+
 URL: http://www.%{name}.org/
 Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,10 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
-%changelog
+* Tue Sep 18 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+??? 1.02-0.5.rc1
+??? License fix
+
 * Sat Sep 02 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.02-0.4.rc1
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Tue Sep 18 22:28:08 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 18 Sep 2007 18:28:08 -0400
Subject: rpms/libnetfilter_queue/F-7 .cvsignore, 1.2,
	1.3 libnetfilter_queue.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709182228.l8IMS8ia018299@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_queue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18243

Modified Files:
	.cvsignore libnetfilter_queue.spec sources 
Log Message:
libnetfilter_queue-0.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2007 21:20:30 -0000	1.2
+++ .cvsignore	18 Sep 2007 22:27:35 -0000	1.3
@@ -1 +1 @@
-libnetfilter_queue-0.0.13.tar.bz2
+libnetfilter_queue-0.0.15.tar.bz2


Index: libnetfilter_queue.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/libnetfilter_queue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnetfilter_queue.spec	25 Mar 2007 21:20:30 -0000	1.1
+++ libnetfilter_queue.spec	18 Sep 2007 22:27:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libnetfilter_queue
-Version:        0.0.13
-Release:        3%{?dist}
+Version:        0.0.15
+Release:        1%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
 License:        GPL
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Sep 18 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.15-1
+- new upstream version
+
 * Mon Mar 26 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.13-3
 - own some directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2007 21:20:30 -0000	1.2
+++ sources	18 Sep 2007 22:27:35 -0000	1.3
@@ -1 +1 @@
-660cbfd3dc8c10bf9b1803cd2b688256  libnetfilter_queue-0.0.13.tar.bz2
+d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 23:20:13 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 18 Sep 2007 19:20:13 -0400
Subject: rpms/gstreamer-plugins-farsight/devel .cvsignore, 1.5,
	1.6 gstreamer-plugins-farsight.spec, 1.8, 1.9 sources, 1.5,
	1.6 gstreamer-plugins-farsight-0.12.2-memset.patch, 1.1, NONE
Message-ID: <200709182320.l8INKD3p025150@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25121

Modified Files:
	.cvsignore gstreamer-plugins-farsight.spec sources 
Removed Files:
	gstreamer-plugins-farsight-0.12.2-memset.patch 
Log Message:
* Tue Sep 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.5-1
- Update to 0.12.5.
- Drop memset patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Jul 2007 01:04:34 -0000	1.5
+++ .cvsignore	18 Sep 2007 23:19:41 -0000	1.6
@@ -1 +1 @@
-gst-plugins-farsight-0.12.2.tar.gz
+gst-plugins-farsight-0.12.5.tar.gz


Index: gstreamer-plugins-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/gstreamer-plugins-farsight.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-plugins-farsight.spec	21 Aug 2007 16:12:04 -0000	1.8
+++ gstreamer-plugins-farsight.spec	18 Sep 2007 23:19:41 -0000	1.9
@@ -1,22 +1,21 @@
 %define         gst_majorminor	0.10
 
 Name:           gstreamer-plugins-farsight
-Version:        0.12.2
-Release:        3%{?dist}
+Version:        0.12.5
+Release:        1%{?dist}
 Summary:        GStreamer plug-ins for farsight protocol
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://projects.collabora.co.uk/darcs/farsight/
 Source0:        http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-%{version}.tar.gz
-Patch0:		%{name}-%{version}-memset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= 0.10.11
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	libjingle-devel
 BuildRequires:	jasper-devel
-BuildRequires:	jrtplib-devel
+BuildRequires:	jrtplib-devel >= 3.3.0
 BuildRequires:	gsm-devel
 BuildRequires:	GConf2-devel
 
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n gst-plugins-farsight-%{version}
-%patch0 -p1 -b .memset
 
 
 %build
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.5-1
+- Update to 0.12.5.
+- Drop memset patch, fixed upstream.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Jul 2007 01:04:34 -0000	1.5
+++ sources	18 Sep 2007 23:19:41 -0000	1.6
@@ -1 +1 @@
-70e09e8e38cb37b0c883fe14d07d263a  gst-plugins-farsight-0.12.2.tar.gz
+aacffef047b70ffbb3b6db775a1b84a1  gst-plugins-farsight-0.12.5.tar.gz


--- gstreamer-plugins-farsight-0.12.2-memset.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 23:31:32 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 18 Sep 2007 19:31:32 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.21,
	1.22 epiphany-extensions.spec, 1.35, 1.36 sources, 1.21, 1.22
Message-ID: <200709182331.l8INVWWL025486@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25407

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Sep 2007 22:21:58 -0000	1.21
+++ .cvsignore	18 Sep 2007 23:30:59 -0000	1.22
@@ -1 +1 @@
-epiphany-extensions-2.19.90.tar.bz2
+epiphany-extensions-2.20.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- epiphany-extensions.spec	4 Sep 2007 22:21:58 -0000	1.35
+++ epiphany-extensions.spec	18 Sep 2007 23:30:59 -0000	1.36
@@ -1,9 +1,9 @@
-%global	ephy_major		2.19
+%global	ephy_major		2.20
 %global	ephy_min_version	%{ephy_major}.0
 %global gecko_version		1.8.1.6
 
 Name:		epiphany-extensions
-Version:	%{ephy_major}.90
+Version:	%{ephy_major}.0
 Release:	1%{?dist}
 Summary:	Extensions for Epiphany, the GNOME web browser
 
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Peter Gordon <peter at thecodergeek.com> - 2.20.0-1
+- Update to new upstream release (2.20.0). 
+
 * Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 2.19.90-1
 - Update to new upstream release (2.19.90), which contains reworked
   installation rules for the icons and a fix for the Greasemonkey


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Sep 2007 22:21:58 -0000	1.21
+++ sources	18 Sep 2007 23:30:59 -0000	1.22
@@ -1 +1 @@
-67b210fa2048a5fa0a7ccc317eea9f32  epiphany-extensions-2.19.90.tar.bz2
+8405528808ec2cc287d1ba6547203c75  epiphany-extensions-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 23:36:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 19:36:02 -0400
Subject: rpms/gtk2/devel libtracker.patch,NONE,1.1 gtk2.spec,1.256,1.257
Message-ID: <200709182336.l8INa2gP025617@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25542

Modified Files:
	gtk2.spec 
Added Files:
	libtracker.patch 
Log Message:
fix tracker search


libtracker.patch:

--- NEW FILE libtracker.patch ---
diff -up gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker gtk+-2.12.0/gtk/gtksearchenginetracker.c
--- gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker	2007-09-18 19:29:57.000000000 -0400
+++ gtk+-2.12.0/gtk/gtksearchenginetracker.c	2007-09-18 19:30:54.000000000 -0400
@@ -71,10 +71,16 @@ open_libtracker (void)
     {
       int i;
       GModule *tracker;
+      GModuleFlags flags;
       
       done = TRUE;
- 
-      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+      flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
+
+      tracker = g_module_open ("libtrackerclient.so.0", flags);
+
+      if (!tracker)
+        tracker = g_module_open ("libtracker.so.0", flags);
+
       if (!tracker)
 	return;
       


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- gtk2.spec	14 Sep 2007 05:16:37 -0000	1.256
+++ gtk2.spec	18 Sep 2007 23:35:30 -0000	1.257
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch2: workaround.patch
 # fixed in upstream svn
 Patch3: novalidate.patch
+Patch4: libtracker.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,6 +120,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
+%patch4 -p1 -b .libtracker
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +303,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
+- Adapt to tracker ABI changes
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 23:46:39 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 19:46:39 -0400
Subject: rpms/perl-Test-Tester/devel .cvsignore, 1.3,
	1.4 perl-Test-Tester.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709182346.l8INkded025930@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25794

Modified Files:
	.cvsignore perl-Test-Tester.spec sources 
Log Message:
Update to 0.106.
BR Test::Builder.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Dec 2006 18:35:55 -0000	1.3
+++ .cvsignore	18 Sep 2007 23:46:07 -0000	1.4
@@ -1 +1 @@
-Test-Tester-0.104.tar.gz
+Test-Tester-0.106.tar.gz


Index: perl-Test-Tester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/perl-Test-Tester.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Tester.spec	18 Apr 2007 16:59:30 -0000	1.4
+++ perl-Test-Tester.spec	18 Sep 2007 23:46:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-Tester
-Version:        0.104
-Release:        2%{?dist}
+Version:        0.106
+Release:        1%{?dist}
 Summary:        Ease testing test modules built with Test::Builder
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::Builder)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.106-1
+- Update to 0.106.
+- BR Test::Builder.
+
 * Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.104-2
 - BR ExtUtils::MakeMaker.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Dec 2006 18:35:55 -0000	1.3
+++ sources	18 Sep 2007 23:46:07 -0000	1.4
@@ -1 +1 @@
-3339108ed79bf8dbb51fc34ca7816c49  Test-Tester-0.104.tar.gz
+6324d0f99eab4710f0acfe9355d8d769  Test-Tester-0.106.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 00:19:04 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 20:19:04 -0400
Subject: rpms/policycoreutils/F-7 policycoreutils-gui.patch, 1.20,
	1.21 policycoreutils.spec, 1.422, 1.423
Message-ID: <200709190019.l8J0J4vR032593@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32570

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-13
- More changes to gui


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-gui.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policycoreutils-gui.patch	18 Sep 2007 18:25:11 -0000	1.20
+++ policycoreutils-gui.patch	19 Sep 2007 00:19:01 -0000	1.21
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
++++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,9 +228,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
++++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -441,9 +441,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
++++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -624,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -662,9 +662,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
++++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -722,9 +722,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
++++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -907,10 +907,10 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-18 14:02:32.000000000 -0400
-@@ -0,0 +1,2385 @@
++++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
+@@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -2007,7 +2007,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_tcp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user binds to. </property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2139,7 +2139,7 @@
 +				  <child>
 +				    <widget class="GtkCheckButton" id="in_udp_unreserved_checkbutton">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="label" translatable="yes">Unreserved Ports (&gt;1024)</property>
 +				      <property name="use_underline">True</property>
@@ -2197,7 +2197,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_udp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user binds to. </property>
++				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2289,7 +2289,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="out_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Enter network ports that application/user connects to</property>
++	      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user connects to. </property>
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox7">
 +		  <property name="border_width">16</property>
@@ -2387,7 +2387,8 @@
 +				      <child>
 +					<widget class="GtkEntry" id="out_tcp_entry">
 +					  <property name="visible">True</property>
-+					  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that application/user connects to.</property>
++					  <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
++
 +					  <property name="can_focus">True</property>
 +					  <property name="editable">True</property>
 +					  <property name="visibility">True</property>
@@ -2519,7 +2520,7 @@
 +			      <child>
 +				<widget class="GtkEntry" id="out_udp_entry">
 +				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that application/user connects to.</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
 +				  <property name="can_focus">True</property>
 +				  <property name="editable">True</property>
 +				  <property name="visibility">True</property>
@@ -3296,10 +3297,10 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
+@@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3499,6 +3500,14 @@
 +            if self.on_select_type_page_next():
 +                return
 +
++        if self.pages[type][self.current_page] == self.IN_NET_PAGE:
++            if self.on_in_net_page_next():
++                return
++
++        if self.pages[type][self.current_page] == self.OUT_NET_PAGE:
++            if self.on_out_net_page_next():
++                return
++
 +        if self.pages[type][self.current_page] == self.APP_PAGE:
 +            if self.on_name_page_next():
 +                return
@@ -3720,6 +3729,22 @@
 +            return
 +        self.output_entry.set_text(self.file_dialog.get_filename())
 +        
++    def on_in_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.in_tcp_entry.get_text())
++            polgen.verify_ports(self.in_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
++    def on_out_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.out_tcp_entry.get_text())
++            polgen.verify_ports(self.out_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
 +    def on_select_type_page_next(self, *args):
 +        self.exec_entry.set_sensitive(self.confine_application())
 +        self.exec_button.set_sensitive(self.confine_application())
@@ -3752,10 +3777,10 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
-@@ -0,0 +1,727 @@
++++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
+@@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3841,6 +3866,34 @@
 +APPLICATIONS = [ DAEMON, INETD, USER, CGI ]
 +USERS = [ XUSER, TUSER, RUSER ]
 +
++def verify_ports(ports):
++    if ports == "":
++        return []
++    max_port=2**16
++    try:
++        temp = []
++        for a in ports.split(","):
++            r =  a.split("-")
++            if len(r) > 2:
++                raise  ValueError
++            if len(r) == 1:
++                begin = int (r[0])
++                end = int (r[0])
++            else:
++                begin = int (r[0])
++                end = int (r[1]) + 1
++                
++                if begin > end:
++                    raise  ValueError
++                
++                for p in range(begin, end):
++                    if p < 1 or p > max_port:
++                        raise  ValueError
++                    temp.append(p)
++                return temp
++    except ValueError:
++        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
++
 +class policy:
 +
 +	def __init__(self, name, type):
@@ -3924,21 +3977,6 @@
 +                    return self.dict[begin,end]
 +            return  None
 +
-+	def __verify_ports(self, ports):
-+		if ports == "":
-+			return []
-+		max_port=2**16
-+		try:
-+			temp = []
-+			for p in ports.split(","):
-+				i = int(p.strip())
-+				if i < 1 or i > max_port:
-+					raise  ValueError()
-+				temp.append(i)
-+			return temp
-+		except ValueError:
-+			raise  ValueError(_("Ports must be be numbers from 1 to %d " % max_port ))
-+
 +	def set_program(self, program):
 +                if self.type not in APPLICATIONS:
 +                    raise ValueError(_("USER Types are not allowed executables"))
@@ -3952,16 +3990,16 @@
 +		self.initscript = initscript
 +
 +	def set_in_tcp(self, all, reserved, unreserved, ports):
-+		self.in_tcp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_tcp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_in_udp(self, all, reserved, unreserved, ports):
-+		self.in_udp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_udp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_out_tcp(self, all, ports):
-+		self.out_tcp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_tcp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_out_udp(self, all, ports):
-+		self.out_udp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_udp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_use_syslog(self, val):
 +		if val != True and val != False:
@@ -4410,7 +4448,7 @@
 +if __name__ == '__main__':
 +    mypolicy = policy("mycgi", CGI)
 +    mypolicy.set_program("/var/www/cgi-bin/cgi")
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
++    mypolicy.set_in_tcp(1, 0, 0, "512, 55000-55000")
 +    mypolicy.set_in_udp(1, 0, 0, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_tmp(False)
@@ -4483,9 +4521,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
++++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4734,9 +4772,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.25/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/selinux.tbl	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,296 @@
 +allow_console_login _("Login") _("Allow direct login to the console device. Requiered for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5034,9 +5072,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivledged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivledged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
++++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5174,9 +5212,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
++++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5397,9 +5435,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.25/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.glade	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,3326 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8727,9 +8765,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
@@ -8902,9 +8940,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9184,9 +9222,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9206,9 +9244,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9290,9 +9328,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9422,10 +9460,10 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
-@@ -0,0 +1,45 @@
++++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
+@@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9451,6 +9489,11 @@
 +########################### tmp Template File #############################
 +compile="""
 +#!/bin/sh
++if [ ! -f /usr/share/selinux/devel/Makefile ]; then
++echo 'selinux-policy-devel not installed, package required for building policy'
++echo '# yum install selinux-policy-devel'
++exit 1
++fi
 +make -f /usr/share/selinux/devel/Makefile
 +/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
@@ -9471,9 +9514,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9516,9 +9559,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9617,9 +9660,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9760,9 +9803,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9926,9 +9969,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10042,9 +10085,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10165,9 +10208,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10300,9 +10343,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
++++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10422,9 +10465,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
++++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- policycoreutils.spec	18 Sep 2007 18:25:11 -0000	1.422
+++ policycoreutils.spec	19 Sep 2007 00:19:01 -0000	1.423
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-13
+- More changes to gui
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
 - Update to latest upstream policycoreutils gui
 



From fedora-extras-commits at redhat.com  Wed Sep 19 00:20:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 20:20:36 -0400
Subject: rpms/checkpolicy/devel .cvsignore, 1.71, 1.72 checkpolicy.spec,
	1.116, 1.117 sources, 1.72, 1.73
Message-ID: <200709190020.l8J0KaMT032721@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/checkpolicy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32690

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
	* Merged handle unknown policydb flag support from Eric Paris.
	  Adds new command line options -U {allow, reject, deny} for selecting
	  the flag when a base module or kernel policy is built.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	4 Jun 2007 19:21:50 -0000	1.71
+++ .cvsignore	19 Sep 2007 00:20:03 -0000	1.72
@@ -57,3 +57,4 @@
 checkpolicy-2.0.1.tgz
 checkpolicy-2.0.2.tgz
 checkpolicy-2.0.3.tgz
+checkpolicy-2.0.4.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- checkpolicy.spec	29 Aug 2007 04:03:17 -0000	1.116
+++ checkpolicy.spec	19 Sep 2007 00:20:03 -0000	1.117
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.3-1
+%define libsepolver 2.0.10-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,11 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
+	* Merged handle unknown policydb flag support from Eric Paris.
+	  Adds new command line options -U {allow, reject, deny} for selecting
+	  the flag when a base module or kernel policy is built.
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.3-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	4 Jun 2007 19:21:50 -0000	1.72
+++ sources	19 Sep 2007 00:20:03 -0000	1.73
@@ -1 +1 @@
-fb843b14d280e5fd4216eb34495ad533  checkpolicy-2.0.3.tgz
+4f80d0bdec361300e80395dcaa4b685d  checkpolicy-2.0.4.tgz



From fedora-extras-commits at redhat.com  Wed Sep 19 01:11:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 21:11:33 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.59,
	1.60 selinux-policy.spec, 1.522, 1.523
Message-ID: <200709190111.l8J1BXHj007331@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7306

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
- Remove hplip_etc_t change back to etc_t.


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- policy-20070703.patch	18 Sep 2007 15:09:11 -0000	1.59
+++ policy-20070703.patch	19 Sep 2007 01:11:31 -0000	1.60
@@ -2425,6 +2425,17 @@
 +		kernel_udp_recvfrom_unlabeled(domain)
 +	')
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2007-09-12 10:34:49.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-18 20:56:27.000000000 -0400
+@@ -210,6 +210,7 @@
+ /usr/lost\+found/.*		<<none>>
+ 
+ /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
++/usr/share/doc(/.*)?/README.*	gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
+ /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.8/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/files.if	2007-09-17 16:20:18.000000000 -0400
@@ -2686,7 +2697,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.8/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/files.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/files.te	2007-09-18 12:11:13.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(files,1.6.1)
@@ -2694,16 +2705,17 @@
  
  ########################################
  #
-@@ -55,6 +55,8 @@
+@@ -55,6 +55,9 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
  typealias etc_t alias snmpd_etc_t;
 +typealias etc_t alias gconf_etc_t;
 +typealias etc_t alias soundd_etc_t;
++typealias etc_t alias hplip_etc_t;
  
  #
  # etc_runtime_t is the type of various
-@@ -188,6 +190,7 @@
+@@ -188,6 +191,7 @@
  fs_associate(file_type)
  fs_associate_noxattr(file_type)
  fs_associate_tmpfs(file_type)
@@ -4240,6 +4252,17 @@
  corenet_sendrecv_rndc_client_packets(ndc_t)
  
  fs_getattr_xattr_fs(ndc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.0.8/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-08-02 08:17:27.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/bluetooth.te	2007-09-18 13:32:50.000000000 -0400
+@@ -128,6 +128,7 @@
+ 	dbus_system_bus_client_template(bluetooth,bluetooth_t)
+ 	dbus_connect_system_bus(bluetooth_t)
+ 	dbus_send_system_bus(bluetooth_t)
++	allow bluetooth_t self:dbus send_msg;
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.8/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-09-12 10:34:50.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/clamav.te	2007-09-17 16:20:18.000000000 -0400
@@ -4736,8 +4759,8 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 10:39:32.000000000 -0400
-@@ -8,6 +8,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 12:31:53.000000000 -0400
+@@ -8,17 +8,14 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/printers\.conf.* --	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4745,7 +4768,9 @@
  /etc/cups/certs		-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
-@@ -17,8 +18,6 @@
+-/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
+-
+ /etc/printcap.* 	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
  /usr/bin/cups-config-daemon --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  
@@ -4754,11 +4779,13 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -26,6 +25,7 @@
+@@ -26,6 +23,9 @@
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
 +/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/lib(64)?/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
  /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
@@ -4769,8 +4796,18 @@
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 10:43:40.000000000 -0400
-@@ -81,12 +81,11 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 12:15:12.000000000 -0400
+@@ -49,9 +49,6 @@
+ type hplip_exec_t;
+ init_daemon_domain(hplip_t,hplip_exec_t)
+ 
+-type hplip_etc_t;
+-files_config_file(hplip_etc_t)
+-
+ type hplip_var_run_t;
+ files_pid_file(hplip_var_run_t)
+ 
+@@ -81,12 +78,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
@@ -4784,7 +4821,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;
-@@ -105,7 +104,7 @@
+@@ -105,7 +101,7 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -4793,7 +4830,14 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
  
  manage_files_pattern(cupsd_t,cupsd_log_t,cupsd_log_t)
-@@ -129,6 +128,8 @@
+@@ -122,13 +118,13 @@
+ manage_sock_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
+ files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
+ 
+-read_files_pattern(cupsd_t,hplip_etc_t,hplip_etc_t)
+-
+ allow cupsd_t hplip_var_run_t:file { read getattr };
+ 
  stream_connect_pattern(cupsd_t,ptal_var_run_t,ptal_var_run_t,ptal_t)
  allow cupsd_t ptal_var_run_t : sock_file setattr;
  
@@ -4802,7 +4846,7 @@
  kernel_read_system_state(cupsd_t)
  kernel_read_network_state(cupsd_t)
  kernel_read_all_sysctls(cupsd_t)
-@@ -150,21 +151,26 @@
+@@ -150,21 +146,26 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -4830,7 +4874,7 @@
  mls_file_downgrade(cupsd_t)
  mls_file_write_all_levels(cupsd_t)
  mls_file_read_all_levels(cupsd_t)
-@@ -174,6 +180,7 @@
+@@ -174,6 +175,7 @@
  term_search_ptys(cupsd_t)
  
  auth_domtrans_chk_passwd(cupsd_t)
@@ -4838,7 +4882,7 @@
  auth_dontaudit_read_pam_pid(cupsd_t)
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
-@@ -187,7 +194,7 @@
+@@ -187,7 +189,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -4847,7 +4891,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -202,6 +209,7 @@
+@@ -202,6 +204,7 @@
  files_dontaudit_getattr_all_tmp_files(cupsd_t)
  
  selinux_compute_access_vector(cupsd_t)
@@ -4855,7 +4899,7 @@
  
  init_exec_script_files(cupsd_t)
  
-@@ -221,17 +229,37 @@
+@@ -221,17 +224,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -4893,7 +4937,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +291,16 @@
+@@ -263,16 +286,16 @@
  ')
  
  optional_policy(`
@@ -4914,7 +4958,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +405,14 @@
+@@ -377,6 +400,14 @@
  ')
  
  optional_policy(`
@@ -4929,7 +4973,19 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -560,7 +596,7 @@
+@@ -526,11 +557,6 @@
+ 
+ cups_stream_connect(hplip_t)
+ 
+-allow hplip_t hplip_etc_t:dir list_dir_perms;
+-read_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
+-read_lnk_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
+-files_search_etc(hplip_t)
+-
+ manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
+ files_pid_filetrans(hplip_t,hplip_var_run_t,file)
+ 
+@@ -560,7 +586,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -4938,7 +4994,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +623,6 @@
+@@ -587,8 +613,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- selinux-policy.spec	17 Sep 2007 23:26:58 -0000	1.522
+++ selinux-policy.spec	19 Sep 2007 01:11:31 -0000	1.523
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
+- Remove hplip_etc_t change back to etc_t.
+
+
 * Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
 - Allow cron to search nfs and samba homedirs
 



From fedora-extras-commits at redhat.com  Wed Sep 19 02:19:28 2007
From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma))
Date: Tue, 18 Sep 2007 22:19:28 -0400
Subject: rpms/kflickr/devel .cvsignore, 1.2, 1.3 kflickr.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709190219.l8J2JSNI014323@cvs-int.fedora.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/kflickr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14301

Modified Files:
	.cvsignore kflickr.spec sources 
Log Message:
Moving devel to new version upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2007 04:29:33 -0000	1.2
+++ .cvsignore	19 Sep 2007 02:18:56 -0000	1.3
@@ -1 +1 @@
-kflickr-0.8.tar.gz
+kflickr-0.9.tar.gz


Index: kflickr.spec
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/kflickr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kflickr.spec	6 Jun 2007 04:29:33 -0000	1.1
+++ kflickr.spec	19 Sep 2007 02:18:56 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kflickr
-Version:        0.8
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Standalone Flickr Uploader for KDE
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://kflickr.sourceforge.net 
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Michael Stahnke <mastahnke at gmail.com> - 0.9-1
+- License updated per new guidelines 
+- Bump for upstream release (0.9)
+
 * Mon May 14 2007 Michael Stahnke <mastahnke at gmail.com> - 0.8-3
 - Final touch-up for review bug # 237355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 04:29:33 -0000	1.2
+++ sources	19 Sep 2007 02:18:56 -0000	1.3
@@ -1 +1 @@
-cdda0c42b8e492a1c762014187dbfe63  kflickr-0.8.tar.gz
+01b7a6d3c87464a55bbbf25686fd53c2  kflickr-0.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 02:30:19 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 22:30:19 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.160,
	1.161 policycoreutils-gui.patch, 1.33,
	1.34 policycoreutils-rhat.patch, 1.322,
	1.323 policycoreutils.spec, 1.449, 1.450 sources, 1.165, 1.166
Message-ID: <200709190230.l8J2UJcq014630@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14595

Modified Files:
	.cvsignore policycoreutils-gui.patch 
	policycoreutils-rhat.patch policycoreutils.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
- Update to upstream
  * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- .cvsignore	13 Sep 2007 12:32:16 -0000	1.160
+++ .cvsignore	19 Sep 2007 02:29:47 -0000	1.161
@@ -158,3 +158,4 @@
 policycoreutils-2.0.25.tgz
 sepolgen-1.0.9.tgz
 sepolgen-1.0.10.tgz
+policycoreutils-2.0.26.tgz

policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policycoreutils-gui.patch	14 Sep 2007 14:41:51 -0000	1.33
+++ policycoreutils-gui.patch	19 Sep 2007 02:29:47 -0000	1.34
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
++++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,9 +228,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
++++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -441,9 +441,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
++++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -624,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -662,9 +662,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
++++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -722,9 +722,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
++++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -907,9 +907,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 15:42:48.000000000 -0400
++++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
 @@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1074,7 +1074,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="select_type_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select application or user role to be confined.</property>
++	      <property name="title" translatable="yes">Select type of the application/user to be confined</property>
 +	      <signal name="next" handler="on_select_type_page_next" last_modification_time="Sat, 04 Aug 2007 11:39:15 GMT"/>
 +
 +	      <child internal-child="vbox">
@@ -1395,7 +1395,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="app_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Name of application to be confined</property>
++	      <property name="title" translatable="yes">Enter name of application/user to be confined</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox5">
@@ -1644,7 +1644,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="transition_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select additional user domain(s) for transition</property>
++	      <property name="title" translatable="yes">Select additional domains to which this user will transition</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1718,7 +1718,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="admin_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select the domain(s) that this user will administer</property>
++	      <property name="title" translatable="yes">Select additional domains that this user will administer</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1792,7 +1792,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="roles_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
++	      <property name="title" translatable="yes">Select additioanl roles for this user</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1866,7 +1866,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="in_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Incoming Network Port Connections</property>
++	      <property name="title" translatable="yes">Enter network ports that application/user listens to</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox6">
@@ -2007,7 +2007,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_tcp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that this application binds to. </property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2139,7 +2139,7 @@
 +				  <child>
 +				    <widget class="GtkCheckButton" id="in_udp_unreserved_checkbutton">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="label" translatable="yes">Unreserved Ports (&gt;1024)</property>
 +				      <property name="use_underline">True</property>
@@ -2197,7 +2197,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_udp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that this application binds to. </property>
++				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2289,8 +2289,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="out_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Outgoing Network Port Connections</property>
-+
++	      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user connects to. </property>
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox7">
 +		  <property name="border_width">16</property>
@@ -2388,7 +2387,8 @@
 +				      <child>
 +					<widget class="GtkEntry" id="out_tcp_entry">
 +					  <property name="visible">True</property>
-+					  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that this application/user connects to.</property>
++					  <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
++
 +					  <property name="can_focus">True</property>
 +					  <property name="editable">True</property>
 +					  <property name="visibility">True</property>
@@ -2520,7 +2520,7 @@
 +			      <child>
 +				<widget class="GtkEntry" id="out_udp_entry">
 +				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that this application/user connects to.</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
 +				  <property name="can_focus">True</property>
 +				  <property name="editable">True</property>
 +				  <property name="visibility">True</property>
@@ -2605,7 +2605,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="common_apps_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Common Application Traits</property>
++	      <property name="title" translatable="yes">Select common application traits</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox8">
@@ -2737,7 +2737,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="files_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Files and Directories</property>
++	      <property name="title" translatable="yes">Select files/directories that the application manages</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox9">
@@ -2992,7 +2992,7 @@
 +					      <child>
 +						<widget class="GtkTreeView" id="write_treeview">
 +						  <property name="visible">True</property>
-+						  <property name="tooltip" translatable="yes">Add Files/Directories that this application will need to &quot;Write&quot; to. Pid Files, Log Files, /var/lib Files ...</property>
++						  <property name="tooltip" translatable="yes">Add Files/Directories that application will need to &quot;Write&quot; to. Pid Files, Log Files, /var/lib Files ...</property>
 +						  <property name="can_focus">True</property>
 +						  <property name="headers_visible">False</property>
 +						  <property name="rules_hint">False</property>
@@ -3067,7 +3067,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="gen_policy_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Generate policy in this directory</property>
++	      <property name="title" translatable="yes">Select directory to generate policy in</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox10">
@@ -3297,10 +3297,10 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
+@@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3500,6 +3500,14 @@
 +            if self.on_select_type_page_next():
 +                return
 +
++        if self.pages[type][self.current_page] == self.IN_NET_PAGE:
++            if self.on_in_net_page_next():
++                return
++
++        if self.pages[type][self.current_page] == self.OUT_NET_PAGE:
++            if self.on_out_net_page_next():
++                return
++
 +        if self.pages[type][self.current_page] == self.APP_PAGE:
 +            if self.on_name_page_next():
 +                return
@@ -3721,6 +3729,22 @@
 +            return
 +        self.output_entry.set_text(self.file_dialog.get_filename())
 +        
++    def on_in_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.in_tcp_entry.get_text())
++            polgen.verify_ports(self.in_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
++    def on_out_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.out_tcp_entry.get_text())
++            polgen.verify_ports(self.out_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
 +    def on_select_type_page_next(self, *args):
 +        self.exec_entry.set_sensitive(self.confine_application())
 +        self.exec_button.set_sensitive(self.confine_application())
@@ -3753,10 +3777,10 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
-@@ -0,0 +1,727 @@
++++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
+@@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3842,6 +3866,34 @@
 +APPLICATIONS = [ DAEMON, INETD, USER, CGI ]
 +USERS = [ XUSER, TUSER, RUSER ]
 +
++def verify_ports(ports):
++    if ports == "":
++        return []
++    max_port=2**16
++    try:
++        temp = []
++        for a in ports.split(","):
++            r =  a.split("-")
++            if len(r) > 2:
++                raise  ValueError
++            if len(r) == 1:
++                begin = int (r[0])
++                end = int (r[0])
++            else:
++                begin = int (r[0])
++                end = int (r[1]) + 1
++                
++                if begin > end:
++                    raise  ValueError
++                
++                for p in range(begin, end):
++                    if p < 1 or p > max_port:
++                        raise  ValueError
++                    temp.append(p)
++                return temp
++    except ValueError:
++        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
++
 +class policy:
 +
 +	def __init__(self, name, type):
@@ -3925,21 +3977,6 @@
 +                    return self.dict[begin,end]
 +            return  None
 +
-+	def __verify_ports(self, ports):
-+		if ports == "":
-+			return []
-+		max_port=2**16
-+		try:
-+			temp = []
-+			for p in ports.split(","):
-+				i = int(p.strip())
-+				if i < 1 or i > max_port:
-+					raise  ValueError()
-+				temp.append(i)
-+			return temp
-+		except ValueError:
-+			raise  ValueError(_("Ports must be be numbers from 1 to %d " % max_port ))
-+
 +	def set_program(self, program):
 +                if self.type not in APPLICATIONS:
 +                    raise ValueError(_("USER Types are not allowed executables"))
@@ -3953,16 +3990,16 @@
 +		self.initscript = initscript
 +
 +	def set_in_tcp(self, all, reserved, unreserved, ports):
-+		self.in_tcp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_tcp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_in_udp(self, all, reserved, unreserved, ports):
-+		self.in_udp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_udp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_out_tcp(self, all, ports):
-+		self.out_tcp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_tcp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_out_udp(self, all, ports):
-+		self.out_udp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_udp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_use_syslog(self, val):
 +		if val != True and val != False:
@@ -4411,7 +4448,7 @@
 +if __name__ == '__main__':
 +    mypolicy = policy("mycgi", CGI)
 +    mypolicy.set_program("/var/www/cgi-bin/cgi")
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
++    mypolicy.set_in_tcp(1, 0, 0, "512, 55000-55000")
 +    mypolicy.set_in_udp(1, 0, 0, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_tmp(False)
@@ -4484,9 +4521,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
++++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4735,9 +4772,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.25/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/selinux.tbl	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,296 @@
 +allow_console_login _("Login") _("Allow direct login to the console device. Requiered for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5035,9 +5072,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivledged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivledged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
++++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5175,9 +5212,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
++++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5398,9 +5435,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.25/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.glade	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,3326 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8728,9 +8765,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
@@ -8903,9 +8940,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9185,9 +9222,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9207,9 +9244,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9291,9 +9328,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9423,10 +9460,10 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
-@@ -0,0 +1,45 @@
++++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
+@@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9452,6 +9489,11 @@
 +########################### tmp Template File #############################
 +compile="""
 +#!/bin/sh
++if [ ! -f /usr/share/selinux/devel/Makefile ]; then
++echo 'selinux-policy-devel not installed, package required for building policy'
++echo '# yum install selinux-policy-devel'
++exit 1
++fi
 +make -f /usr/share/selinux/devel/Makefile
 +/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
@@ -9472,9 +9514,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9517,9 +9559,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9618,9 +9660,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9761,9 +9803,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9927,9 +9969,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10043,9 +10085,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10166,9 +10208,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10301,9 +10343,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
++++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10423,9 +10465,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
++++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- policycoreutils-rhat.patch	23 Aug 2007 21:00:38 -0000	1.322
+++ policycoreutils-rhat.patch	19 Sep 2007 02:29:47 -0000	1.323
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.23/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.25/Makefile
 --- nsapolicycoreutils/Makefile	2007-07-16 14:20:43.000000000 -0400
-+++ policycoreutils-2.0.23/Makefile	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/Makefile	2007-08-28 09:22:16.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.23/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.25/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.23/restorecond/restorecond.c	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/restorecond/restorecond.c	2007-08-28 09:22:16.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,526 +36,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.23/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.23/scripts/genhomedircon	2007-08-23 10:08:04.000000000 -0400
-@@ -0,0 +1,404 @@
-+#! /usr/bin/python -E
-+# Copyright (C) 2004 Tresys Technology, LLC
-+# see file 'COPYING' for use and warranty information
-+#
-+# genhomedircon - this script is used to generate file context
-+# configuration entries for user home directories based on their
-+# default prefixes and is run when building the policy. Specifically, we
-+# replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files with
-+# generic and user-specific values.
-+#
-+# Based off original script by Dan Walsh, <dwalsh at redhat.com>
-+#
-+# ASSUMPTIONS:
-+#
-+# The file CONTEXTDIR/files/homedir_template exists.  This file is used to
-+# set up the home directory context for each real user.
-+# 
-+# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, prefix user
-+#
-+# "Real" users (as opposed to system users) are those whose UID is greater than
-+#  or equal STARTING_UID (usually 500) and whose login is not a member of
-+#  EXCLUDE_LOGINS.  Users who are explicitly defined in CONTEXTDIR/seusers
-+#  are always "real" (including root, in the default configuration).
-+#
-+#  
-+
-+import sys, os, pwd, string, getopt, re
-+from semanage import *;
-+import selinux
-+import gettext
-+gettext.install('policycoreutils')
-+
-+def grep(file, var):
-+	ret = ""
-+	fd = open(file, 'r')
-+
-+	for i in  fd.readlines():
-+	    if re.search(var, i, 0) != None:
-+	        ret = i
-+                break
-+	fd.close()
-+	return ret
-+
-+def findval(file, var, delim = ""):
-+	val = ""
-+	try:
-+		fd = open(file, 'r')
-+		for i in  fd.readlines():
-+			if i.startswith(var) == 1:
-+				if delim == "":
-+					val = i.split()[1]
-+				else:
-+					val = i.split(delim)[1]
-+				val = val.split("#")[0]
-+				val = val.strip()
-+		fd.close()
-+	except:
-+		val = ""
-+	return val
-+
-+def getStartingUID():
-+	starting_uid = sys.maxint
-+	uid_min =  findval("/etc/login.defs", "UID_MIN")
-+	if uid_min != "":
-+		uid_min = uid_min.split("#")[0]
-+		uid_min = uid_min.strip()
-+		if int(uid_min) < starting_uid:
-+			starting_uid = int(uid_min)
-+
-+	uid_min =  findval("/etc/libuser.conf", "LU_UIDNUMBER", "=")
-+	if uid_min != "":
-+		uid_min = uid_min.split("#")[0]
-+		uid_min = uid_min.strip()
-+		if int(uid_min) < starting_uid:
-+			starting_uid = int(uid_min)
-+
-+	if starting_uid == sys.maxint:
-+		starting_uid = 500
-+	return starting_uid
-+
-+def getDefaultHomeDir():
-+	ret = []
-+	homedir = findval("/etc/default/useradd", "HOME", "=")
-+	if homedir != "" and not homedir in ret:
-+		ret.append(homedir)
-+	
-+	homedir = findval("/etc/libuser.conf", "LU_HOMEDIRECTORY", "=")
-+	if homedir != "" and not homedir in ret:
-+		ret.append(homedir)
-+	
-+	if ret == []:
-+		ret.append("/home")
-+
-+	# Add /export/home if it exists
-+	# Some customers use this for automounted homedirs
-+	if os.path.exists("/export/home"):
-+		ret.append("/export/home")
-+
-+	return ret
-+
-+def getSELinuxType(directory):
-+	val = findval(directory+"/config", "SELINUXTYPE", "=")
-+	if val != "":
-+		return val
-+	return "targeted"
-+
-+def usage(rc=0, error = ""):
-+	if error != "":
-+		sys.stderr.write("%s\n" % error)
-+		rc = 1
-+	sys.stderr.write("Usage: %s [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ]\n" % sys.argv[0])
-+	sys.stderr.flush()
-+	sys.exit(rc)
-+
-+def warning(warning = ""):
-+	sys.stderr.write("%s\n" % warning)
-+	sys.stderr.flush()
-+	
-+def errorExit(error):
-+	sys.stderr.write("%s exiting for: " % sys.argv[0])
-+	sys.stderr.write("%s\n" % error)
-+	sys.stderr.flush()
-+	sys.exit(1)
-+
-+class selinuxConfig:
-+	def __init__(self, selinuxdir = "/etc/selinux", type = "targeted", usepwd = 1):
-+		self.semanageHandle = semanage_handle_create()
-+		self.semanaged = semanage_is_managed(self.semanageHandle)
-+		if self.semanaged:
-+			rc = semanage_connect(self.semanageHandle)
-+			if rc:
-+				errorExit("Unable to connect to semanage")
-+			(status, self.ulist) = semanage_user_list(self.semanageHandle)
-+		self.type = type
-+		self.selinuxdir = selinuxdir +"/"
-+		self.contextdir = "/contexts"
-+		self.filecontextdir = self.contextdir+"/files"
-+		self.usepwd = usepwd
-+		self.default_user = "user_u"
-+		self.default_prefix = "user"
-+		self.users = self.getUsers()
-+		fd = open(self.getFileContextFile())
-+		self.fclines=[]
-+		for i in fd.readlines():
-+		    try:
-+			    regex = i.split()[0]
-+			    #match a trailing .+
-+			    regex = re.sub("\.+$", "", regex)
-+			    regex = re.sub("\.\*$", "", regex)
-+			    regex = re.sub("\(\/\.\*\)\?", "", regex)
-+			    regex = regex + "/*$"
-+			    self.fclines.append(re.compile(regex))
-+		    except:
-+			    continue
-+
-+		fd.close()
-+		
-+	def getFileContextDir(self):
-+		return self.selinuxdir+self.type+self.filecontextdir
-+
-+	def getFileContextFile(self):
-+		return self.getFileContextDir()+"/file_contexts"
-+	
-+	def getContextDir(self):
-+		return self.selinuxdir+self.type+self.contextdir
-+
-+	def getHomeDirTemplate(self):
-+		return self.getFileContextDir()+"/homedir_template"
-+
-+	def getHomeRootContext(self, homedir):
-+		ret = ""
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+
-+		for i in  fd.readlines():
-+			if i.find("HOME_ROOT") == 0:
-+				i = i.replace("HOME_ROOT", homedir)
-+				ret += i
-+		fd.close()
-+		if ret == "":
-+			errorExit("No Home Root Context Found")
-+		return ret
-+
-+	def heading(self):
-+		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
-+		if self.semanaged:
-+			ret += "# use semanage command to manage system users in order to change the file_context\n#\n#\n"
-+		else:
-+			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
-+		return ret
-+
-+	def get_default_prefix(self, name):
-+		for user in self.ulist:
-+			if semanage_user_get_name(user) == name:
-+				return semanage_user_get_prefix(user)
-+		return name
-+
-+	def get_old_prefix(self, user):
-+		rc = grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % user)
-+		if rc == "":					    
-+			rc = grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % user)
-+		if rc != "":
-+			user = rc.split()
-+			prefix  =  user[3]
-+			if prefix == "{":
-+				prefix = user[4]
-+		if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
-+			prefix = prefix[:-2]
-+		return prefix
-+		
-+	def adduser(self, udict, user, seuser, prefix):
-+		if seuser == self.default_user or user == "__default__" or user == "system_u":
-+			return
-+		# !!! chooses first prefix in the list to use in the file context !!!
-+		try:
-+			home = pwd.getpwnam(user)[5]
-+			if home == "/":
-+				# Probably install so hard code to /root
-+				if user == "root":
-+					home = "/root"
-+				else:
-+					return
-+		except KeyError:
-+			if user == "root":
-+				home = "/root"
-+			else:
-+				sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user)
-+				return
-+		prefs = {}
-+		prefs["seuser"] = seuser
-+		prefs["prefix"] = prefix
-+		prefs["home"] = home
-+		udict[user] = prefs
-+			
-+	def setDefaultUser(self, user, prefix):
-+		self.default_user = user
-+		self.default_prefix = prefix
-+		
-+	def getUsers(self):
-+		udict = {}
-+		if self.semanaged:
-+			(status, list) = semanage_seuser_list(self.semanageHandle)
-+			for seuser in list:
-+				user = []
-+				seusername = semanage_seuser_get_sename(seuser)
-+				prefix = self.get_default_prefix(seusername)
-+				if semanage_seuser_get_name(seuser) == "__default__":
-+					self.setDefaultUser(seusername, prefix)
-+
-+				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, prefix)
-+				
-+		else:
-+			try:
-+				fd = open(self.selinuxdir+self.type+"/seusers")
-+				for u in  fd.readlines():
-+					u = u.strip()
-+					if len(u) == 0 or u[0] == "#":
-+						continue
-+					user = u.split(":")
-+					if len(user) < 2:
-+						continue
-+					
-+					prefix = self.get_old_prefix(user[1])
-+					self.adduser(udict, user[0], user[1], prefix)
-+				fd.close()
-+			except IOError, error:
-+				# Must be install so force add of root
-+				self.adduser(udict, "root", "root", "root")
-+
-+		return udict
-+
-+	def getHomeDirContext(self, user, seuser, home, prefix):
-+		ret = "\n\n#\n# Home Context for user %s\n#\n\n" % user
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+		for i in  fd.readlines():
-+			if i.startswith("HOME_DIR") == 1:
-+				i = i.replace("HOME_DIR", home)
-+				i = i.replace("ROLE", prefix)
-+				i = i.replace("system_u", seuser)
-+				# Validate if the generated context exists.  Some user types may not exist
-+				scon = i.split()[-1]
-+				if selinux.is_selinux_enabled() < 1 or selinux.security_check_context(scon) == 0:
-+					ret = ret+i
-+		fd.close()
-+		return ret
-+
-+	def getUserContext(self, user, sel_user, prefix):
-+		ret = ""
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+		for i in  fd.readlines():
-+			if i.find("USER") > 0:
-+				i = i.replace("USER", user)
-+				i = i.replace("ROLE", prefix)
-+				i = i.replace("system_u", sel_user)
-+				ret = ret+i
-+		fd.close()
-+		return ret
-+
-+	def genHomeDirContext(self):
-+		ret = ""
-+		# Fill in HOME and prefix for users that are defined
-+		for u in self.users.keys():
-+			ret += self.getHomeDirContext (u, self.users[u]["seuser"], self.users[u]["home"], self.users[u]["prefix"])
-+			ret += self.getUserContext (u, self.users[u]["seuser"], self.users[u]["prefix"])
-+		return ret+"\n"
-+
-+	def checkExists(self, home):
-+		for i in self.fclines:
-+		    try:
-+			    if i.match(home):
-+				    return 1
-+		    except:
-+			    continue
-+		return 0
-+
-+	def getHomeDirs(self):
-+		homedirs = getDefaultHomeDir()
-+		starting_uid = getStartingUID()
-+		if self.usepwd == 0:
-+			return homedirs
-+		ulist = pwd.getpwall()
-+		for u in ulist:
-+			if u[2] >= starting_uid and \
-+					u[6] in VALID_SHELLS and \
-+					u[5] != "/" and \
-+					string.count(u[5], "/") > 1:
-+				homedir = u[5][:string.rfind(u[5], "/")]
-+				if not homedir in homedirs:
-+					if self.checkExists(homedir) == 1:
-+						warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context. This usually indicates an incorrectly defined system account.  If it is a system account please make sure its login shell is /sbin/nologin." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
-+					else:
-+						homedirs.append(homedir)
-+
-+		homedirs.sort()
-+		return homedirs
-+ 
-+	def genoutput(self):
-+		ret = self.heading()
-+		for h in self.getHomeDirs():
-+			ret += self.getHomeDirContext (self.default_user, self.default_user, h+'/[^/]*', self.default_prefix)
-+			ret += self.getHomeRootContext(h)
-+		ret += self.getUserContext(".*", self.default_user, self.default_prefix) + "\n"
-+		ret += self.genHomeDirContext()
-+		return ret
-+
-+	def printout(self):
-+		print self.genoutput()
-+
-+	def write(self):
-+		fd = open(self.getFileContextDir()+"/file_contexts.homedirs", "w")
-+		fd.write(self.genoutput())
-+		fd.close()
-+
-+if os.getuid() > 0 or os.geteuid() > 0:
-+	print _("You must be root to run %s.") % sys.argv[0]
-+	sys.exit(1)
-+
-+try:
-+	fd = open("/etc/shells", 'r')
-+	VALID_SHELLS = fd.read().split("\n")
-+	fd.close()
-+	if "/sbin/nologin" in VALID_SHELLS:
-+		VALID_SHELLS.remove("/sbin/nologin")
-+	if "" in VALID_SHELLS:
-+		VALID_SHELLS.remove("")
-+except:
-+	VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh']
-+
-+#
-+# This script will generate home dir file context
-+# based off the homedir_template file, entries in the password file, and
-+#
-+try:
-+	usepwd = 1
-+	directory = "/etc/selinux"
-+	type = None
-+	gopts, cmds = getopt.getopt(sys.argv[1:], 'hnd:t:', ['help',
-+						'type=',
-+						'nopasswd',
-+						'dir='])
-+	for o,a in gopts:
-+		if o == '--type' or o == "-t":
-+			type = a
-+		if o == '--nopasswd'  or o == "-n":
-+			usepwd = 0
-+		if o == '--dir'  or o == "-d":
-+			directory = a
-+		if o == '--help'  or o == "-h":
-+			usage()
-+except getopt.error, error:
-+	errorExit(_("Options Error %s ") % error)
-+
-+if type == None:
-+	type = getSELinuxType(directory)
-+
-+if len(cmds) != 0:
-+	usage(1)
-+
-+selconf = selinuxConfig(directory, type, usepwd)
-+try:
-+	selconf.write()
-+except IOError, error:
-+	sys.stderr.write("%s: %s\n" % ( sys.argv[0], error ))
-+	sys.exit(1)
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon.8 policycoreutils-2.0.23/scripts/genhomedircon.8
---- nsapolicycoreutils/scripts/genhomedircon.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.23/scripts/genhomedircon.8	2007-08-20 19:16:35.000000000 -0400
-@@ -0,0 +1,82 @@
-+.\" Hey, Emacs! This is an -*- nroff -*- source file.
-+.\" Copyright (c) 2005 Manoj Srivastava <srivasta at debian.org>
-+.\"
-+.\" This is free documentation; 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.
-+.\"
-+.\" The GNU General Public License's references to "object code"
-+.\" and "executables" are to be interpreted as the output of any
-+.\" document formatting or typesetting system, including
-+.\" intermediate and printed output.
-+.\"
-+.\" This manual 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 manual; if not, write to the Free
-+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-+.\" USA.
-+.\"
-+.\"
-+.TH GENHOMEDIRCON "8" "January 2005" "Security Enhanced Linux" ""
-+.SH NAME
-+genhomedircon \- generate SELinux file context configuration entries for user home directories 
-+.SH SYNOPSIS
-+.B genhomedircon [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ] [-h]
-+
-+.SH OPTIONS
-+.TP
-+.B "\-h"
-+Print a short usage message
-+.TP
-+.B "\-d selinuxdir (\-\-directory)"
-+Directory where selinux files are installed defaults to /etc/selinux
-+.TP
-+.B 
-+\-n \-\-nopasswd
-+Indicates to the utility not to read homedirectories out of the password database.  
-+.TP
-+\-t selinuxtype (\-\-type)
-+Indicates the selinux type of this install.  Defaults to "targeted".
-+.SH DESCRIPTION
-+.PP
-+This utility is used to generate file context configuration entries for 
-+user home directories based on their 
-+.B prefix 
-+entry in the the 
-+.B semanage user record.  
-+genhomedircon is run when building 
-+the policy. It is also run automaticaly when ever the 
-+.B semanage 
-+utility modifies 
-+.B user
-+or
-+.B login
-+records.
-+Specifically, we replace HOME_ROOT, HOME_DIR, and ROLE macros in the 
-+.I /etc/selinux/<<SELINUXTYPE>>/contexts/files/homedir_template 
-+file with generic and user-specific values.  HOME_ROOT and HOME_DIR is replaced with each distinct location where login users homedirectories are located.  Defaults to /home. ROLE is replaced based on the prefix entry in the 
-+.B user
-+record.
-+.PP 
-+genhomedircon searches through all password entires for all "login" user home directories, (as opposed
-+to system users).  Login users are those whose UID is greater than or equal 
-+.I STARTING_UID
-+(default 500) and whose login shell is not "/sbin/nologin", or
-+"/bin/false". 
-+.PP 
-+.SH AUTHOR
-+This manual page was originally written by 
-+.I Manoj Srivastava <srivasta at debian.org>,
-+for the Debian GNU/Linux system, based on the comments and the code
-+in the utility, and then updated by Dan Walsh of Red Hat. The 
-+.B genhomedircon
-+utility was originally written by 
-+.I Dan Walsh of Red Hat 
-+with some modifications by 
-+.I Tresys Technology, LLC.
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.23/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2007-08-23 16:52:26.000000000 -0400
-+++ policycoreutils-2.0.23/scripts/Makefile	2007-08-20 19:16:35.000000000 -0400
-@@ -5,14 +5,18 @@
- MANDIR ?= $(PREFIX)/share/man
- LOCALEDIR ?= /usr/share/locale
- 
--all: fixfiles
-+TARGETS=genhomedircon 
-+
-+all: $(TARGETS) fixfiles
- 
- install: all
- 	-mkdir -p $(BINDIR)
-+	install -m 755 $(TARGETS) $(SBINDIR)
- 	install -m 755 chcat $(BINDIR)
- 	install -m 755 fixfiles $(DESTDIR)/sbin
- 	-mkdir -p $(MANDIR)/man8
- 	install -m 644 fixfiles.8 $(MANDIR)/man8/
-+	install -m 644 genhomedircon.8 $(MANDIR)/man8/
- 	install -m 644 chcat.8 $(MANDIR)/man8/
- 
- clean:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.23/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.25/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.23/semanage/seobject.py	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/semanage/seobject.py	2007-08-28 09:22:17.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -713,9 +196,9 @@
  
  		return ddict
  			
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.23/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.25/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.23/semodule/semodule.8	2007-08-23 10:18:35.000000000 -0400
++++ policycoreutils-2.0.25/semodule/semodule.8	2007-08-28 09:22:17.000000000 -0400
 @@ -23,6 +23,9 @@
  .B \-B, \-\-build		
  force a rebuild of policy (also reloads unless -n is used)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- policycoreutils.spec	14 Sep 2007 14:41:51 -0000	1.449
+++ policycoreutils.spec	19 Sep 2007 02:29:47 -0000	1.450
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.9-1
+%define	libsepolver	2.0.10-1
 %define	libsemanagever	2.0.5-1
-%define	libselinuxver	2.0.23-3
+%define	libselinuxver	2.0.34-1
 %define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.25
-Release: 14%{?dist}
+Version: 2.0.26
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -107,6 +107,7 @@
 Requires: usermode, rhpl
 Requires: python >= 2.4
 BuildRequires: desktop-file-utils
+Requires: selinux-policy
 
 %description gui
 system-config-selinux is a utility for managing the SELinux environment
@@ -138,7 +139,6 @@
 %{_sbindir}/semodule
 %{_sbindir}/semanage
 %{_sbindir}/load_policy
-%{_sbindir}/genhomedircon
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
@@ -165,7 +165,6 @@
 %{_mandir}/man8/fixfiles.8.gz
 %{_mandir}/man8/load_policy.8.gz
 %{_mandir}/man8/audit2why.8.gz
-%{_mandir}/man8/genhomedircon.8.gz
 %{_mandir}/man8/open_init_pty.8.gz
 %{_mandir}/man8/setsebool.8.gz
 %{_mandir}/man8/run_init.8.gz
@@ -200,6 +199,13 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
+- Update to upstream
+  * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.
+
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-15
+- Fix wording in policy generation tool
+
 * Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
 - Fix calls to _admin interfaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	13 Sep 2007 12:32:16 -0000	1.165
+++ sources	19 Sep 2007 02:29:47 -0000	1.166
@@ -1,2 +1,2 @@
-43c5df63e94b6e35d1f830b5b7ee6cfc  policycoreutils-2.0.25.tgz
 eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz
+109975b307c6992ff721ba644b4fb718  policycoreutils-2.0.26.tgz



From fedora-extras-commits at redhat.com  Wed Sep 19 03:02:01 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 18 Sep 2007 23:02:01 -0400
Subject: rpms/slingshot/FC-6 slingshot, NONE, 1.1 slingshot-font-path.patch, 
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709190302.l8J32129021278@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21242

Modified Files:
	sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	19 Sep 2007 03:01:26 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 03:15:47 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 23:15:47 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.49,1.50
Message-ID: <200709190315.l8J3Flku021508@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21490

Modified Files:
	xscreensaver.spec 
Log Message:
* Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
- Remove noreplace flag from XScreenSaver.ad as this is updated
  automatically.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xscreensaver.spec	15 Sep 2007 14:47:28 -0000	1.49
+++ xscreensaver.spec	19 Sep 2007 03:15:15 -0000	1.50
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    6
+%define fedora_rel    7
 %endif
 
 %define extrarel      %{nil}
@@ -372,7 +372,7 @@
    echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
 done
 echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
-echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+echo "%%config %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
    $dd/base.files
 echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
    >> $dd/base.files
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
+- Remove noreplace flag from XScreenSaver.ad as this is updated
+  automatically.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
 - Fix update script to treat the ending character of conf file
   correctly.



From fedora-extras-commits at redhat.com  Wed Sep 19 03:56:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:56:55 -0700
Subject: [pkgdb] perl-Test-Script was added for corsepiu
Message-ID: <200709190356.l8J3uuhl011980@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Test-Script with summary Cross-platform basic tests for scripts
Kevin Fenzi (kevin) has approved Package perl-Test-Script
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Test-Script with an owner of corsepiu
Kevin Fenzi (kevin) has approved perl-Test-Script in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, 6) updated by kevin
Message-ID: <200709190357.l8J3vIDG006990@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora 6) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora 6) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, devel) updated by kevin
Message-ID: <200709190357.l8J3vId2007000@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora devel) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora devel) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, 7) updated by kevin
Message-ID: <200709190357.l8J3vJRQ007009@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora 7) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora 7) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:46 -0400
Subject: rpms/perl-Test-Script - New directory
Message-ID: <200709190357.l8J3vk3I022295@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script

Log Message:
Directory /cvs/extras/rpms/perl-Test-Script added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:49 -0400
Subject: rpms/perl-Test-Script/devel - New directory
Message-ID: <200709190357.l8J3vn2q022309@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Script/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:51 -0400
Subject: rpms/perl-Test-Script Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709190357.l8J3vpAN022334@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Script


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Script
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:53 -0400
Subject: rpms/perl-Test-Script/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709190357.l8J3vrYp022350@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Script


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Script
# $Id: Makefile,v 1.1 2007/09/19 03:57:51 kevin Exp $
NAME := perl-Test-Script
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 fedora-extras-commits at redhat.com  Wed Sep 19 04:00:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:29 -0700
Subject: [pkgdb] rt61pci-firmware was added for kwizart
Message-ID: <200709190400.l8J40TRm013082@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package rt61pci-firmware with summary Firmware for Ralink? RT2561/RT2661 A/B/G network adaptor
Kevin Fenzi (kevin) has approved Package rt61pci-firmware
Kevin Fenzi (kevin) has added a Fedora devel branch for rt61pci-firmware with an owner of kwizart
Kevin Fenzi (kevin) has approved rt61pci-firmware in Fedora devel
Kevin Fenzi (kevin) has approved Package rt61pci-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt61pci-firmware (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt61pci-firmware (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt61pci-firmware (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:41 -0700
Subject: [pkgdb] rt61pci-firmware (Fedora, 7) updated by kevin
Message-ID: <200709190400.l8J40fE9013177@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for rt61pci-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on rt61pci-firmware (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:41 -0700
Subject: [pkgdb] rt61pci-firmware (Fedora, devel) updated by kevin
Message-ID: <200709190400.l8J40gNI013189@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on rt61pci-firmware (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:00:59 -0400
Subject: rpms/rt61pci-firmware - New directory
Message-ID: <200709190400.l8J40x6T022581@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware

Log Message:
Directory /cvs/extras/rpms/rt61pci-firmware added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:06 -0400
Subject: rpms/rt61pci-firmware/devel - New directory
Message-ID: <200709190401.l8J416SU027734@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware/devel

Log Message:
Directory /cvs/extras/rpms/rt61pci-firmware/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:09 -0400
Subject: rpms/rt61pci-firmware Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709190401.l8J419Op028354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware

Added Files:
	Makefile import.log 
Log Message:
Setup of module rt61pci-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module rt61pci-firmware
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:12 -0400
Subject: rpms/rt61pci-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709190401.l8J41Cji028551@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rt61pci-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rt61pci-firmware
# $Id: Makefile,v 1.1 2007/09/19 04:01:10 kevin Exp $
NAME := rt61pci-firmware
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 fedora-extras-commits at redhat.com  Wed Sep 19 04:07:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:07:24 -0400
Subject: rpms/perl-Test-Script/devel perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190407.l8J47OdU028855@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28826

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:06:50 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:06:50 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:09:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:09:59 -0400
Subject: rpms/perl-Test-Script/F-7 perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190409.l8J49xcI028944@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28923

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:09:26 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:09:26 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:11:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:11:18 -0400
Subject: rpms/perl-Test-Script/FC-6 perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190411.l8J4BImf029038@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:10:46 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:10:46 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:21:38 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 00:21:38 -0400
Subject: rpms/python-memcached/F-7 .cvsignore, 1.1, 1.2 python-memcached.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709190421.l8J4Lc7Q029439@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29322

Modified Files:
	.cvsignore python-memcached.spec sources 
Log Message:
Updated to 1.40 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jun 2007 23:33:03 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:21:06 -0000	1.2
@@ -0,0 +1 @@
+python-memcached-1.40.tar.gz


Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-memcached.spec	12 Sep 2007 08:29:29 -0000	1.2
+++ python-memcached.spec	19 Sep 2007 04:21:06 -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:           python-memcached
-Version:        1.39
+Version:        1.40
 Release:        1%{?dist}
 Summary:        A Python memcached client library
 
@@ -29,6 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/python_memcached-*egg-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
+- Update to 1.40 upstream release.
+
 * Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
 - Update to 1.39 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2007 08:27:53 -0000	1.3
+++ sources	19 Sep 2007 04:21:06 -0000	1.4
@@ -1 +1 @@
-403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz
+fa551479291679871ac64ab74d1a52d0  python-memcached-1.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:24:31 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 00:24:31 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <200709190424.l8J4OVsq029620@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29579

Modified Files:
	python-memcached.spec sources 
Log Message:
Updating to 1.40 upstream release.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-memcached.spec	12 Sep 2007 20:26:22 -0000	1.2
+++ python-memcached.spec	19 Sep 2007 04:23:59 -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:           python-memcached
-Version:        1.39
+Version:        1.40
 Release:        1%{?dist}
 Summary:        A Python memcached client library
 
@@ -29,6 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/python_memcached-*egg-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
+- Update to 1.40 upstream release.
+
 * Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
 - Update to 1.39 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2007 20:26:22 -0000	1.3
+++ sources	19 Sep 2007 04:23:59 -0000	1.4
@@ -1 +1 @@
-403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz
+fa551479291679871ac64ab74d1a52d0  python-memcached-1.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:35:20 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Wed, 19 Sep 2007 00:35:20 -0400
Subject: rpms/ragel/devel .cvsignore, 1.4, 1.5 ragel.spec, 1.4, 1.5 sources, 
	1.4, 1.5
Message-ID: <200709190435.l8J4ZKEB029892@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29863

Modified Files:
	.cvsignore ragel.spec sources 
Log Message:
- update to upstream 5.24
- fix License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Jul 2007 02:28:08 -0000	1.4
+++ .cvsignore	19 Sep 2007 04:34:48 -0000	1.5
@@ -1 +1 @@
-ragel-5.23.tar.gz
+ragel-5.24.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ragel.spec	29 Aug 2007 04:30:07 -0000	1.4
+++ ragel.spec	19 Sep 2007 04:34:48 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           ragel   
-Version:        5.23
-Release:        2%{?dist}
+Version:        5.24
+Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
-License:        GPL 
+License:        GPLv2+
 URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
 Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.24-1
+- update to 5.24
+- update License tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.23-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jul 2007 02:28:08 -0000	1.4
+++ sources	19 Sep 2007 04:34:48 -0000	1.5
@@ -1 +1 @@
-e60fd87d80a34e2e8f063781e02c8142  ragel-5.23.tar.gz
+efd6e7f659ce4ca52b02ca4b5084ac30  ragel-5.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:39:52 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Wed, 19 Sep 2007 00:39:52 -0400
Subject: rpms/ragel/F-7 .cvsignore, 1.4, 1.5 ragel.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200709190439.l8J4dqSX030040@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30003

Modified Files:
	.cvsignore ragel.spec sources 
Log Message:
- update to upstream 5.24
- fix License:




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Jul 2007 02:31:20 -0000	1.4
+++ .cvsignore	19 Sep 2007 04:39:20 -0000	1.5
@@ -1 +1 @@
-ragel-5.23.tar.gz
+ragel-5.24.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/ragel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ragel.spec	25 Jul 2007 02:31:20 -0000	1.3
+++ ragel.spec	19 Sep 2007 04:39:20 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           ragel   
-Version:        5.23
+Version:        5.24
 Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
-License:        GPL 
+License:        GPLv2+
 URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
 Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,13 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.24-1
+- update to 5.24
+- update License tag
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.23-2
+- Rebuild for selinux ppc32 issue.
+
 * Tue Jul 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.23-1
 - update to 5.23
 - removed ragel-rlcodegen-replace.patch - it was applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jul 2007 02:31:20 -0000	1.4
+++ sources	19 Sep 2007 04:39:20 -0000	1.5
@@ -1 +1 @@
-e60fd87d80a34e2e8f063781e02c8142  ragel-5.23.tar.gz
+efd6e7f659ce4ca52b02ca4b5084ac30  ragel-5.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 05:03:13 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 01:03:13 -0400
Subject: comps comps-f8.xml.in,1.113,1.114
Message-ID: <200709190503.l8J53D2v004143@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30259

Modified Files:
	comps-f8.xml.in 
Log Message:
- make im-chooser optional for gnome and kde
- remove old packages: FreeWnn and m17n-db-georgian 
- renamed evolution-connector to evolution-exchange
- rename Democracy to Miro
- add w3m



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- comps-f8.xml.in	18 Sep 2007 15:56:50 -0000	1.113
+++ comps-f8.xml.in	19 Sep 2007 05:02:43 -0000	1.114
@@ -356,7 +356,6 @@
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
-      <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -1594,7 +1593,6 @@
       <packagereq type="mandatory">dejavu-fonts</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ka</packagereq>
       <packagereq type="default">dejavu-fonts-experimental</packagereq>
-      <packagereq type="optional">m17n-db-georgian</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1665,7 +1663,6 @@
       <packagereq type="default">gok</packagereq>
       <packagereq type="default">gthumb</packagereq>
       <packagereq type="default">gtk2-engines</packagereq>
-      <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">nautilus-cd-burner</packagereq>
       <packagereq type="default">nautilus-sendto</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
@@ -1704,6 +1701,7 @@
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">hal-gnome</packagereq>
+      <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">istanbul</packagereq>
       <packagereq type="optional">lock-keys-applet</packagereq>
       <packagereq type="optional">nautilus-actions</packagereq>
@@ -1834,7 +1832,7 @@
       <packagereq type="optional">drivel</packagereq>
       <packagereq type="optional">epiphany</packagereq>
       <packagereq type="optional">epiphany-extensions</packagereq>
-      <packagereq type="optional">evolution-connector</packagereq>
+      <packagereq type="optional">evolution-exchange</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>
@@ -1865,6 +1863,7 @@
       <packagereq type="optional">linphone</packagereq>
       <packagereq type="optional">logjam</packagereq>
       <packagereq type="optional">mail-notification</packagereq>
+      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mugshot</packagereq>
       <packagereq type="optional">ochusha</packagereq>
       <packagereq type="optional">pan</packagereq>
@@ -2347,7 +2346,6 @@
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">gpgme</packagereq>
-      <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeaddons</packagereq>
@@ -2374,6 +2372,7 @@
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
+      <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">kasablanca</packagereq>
       <packagereq type="optional">katapult</packagereq>
       <packagereq type="optional">kbackup</packagereq>
@@ -3216,7 +3215,6 @@
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
-      <packagereq type="optional">Democracy</packagereq>
       <packagereq type="optional">dvdauthor</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
       <packagereq type="optional">dvgrab</packagereq>
@@ -3245,6 +3243,7 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
+      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
@@ -3635,6 +3634,7 @@
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tftp</packagereq>
       <packagereq type="optional">tin</packagereq>
+      <packagereq type="optional">w3m</packagereq>
       <packagereq type="optional">websec</packagereq>
       <packagereq type="optional">xprobe2</packagereq>
       <packagereq type="optional">yafc</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 19 05:25:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Wed, 19 Sep 2007 01:25:24 -0400
Subject: comps/po pl.po,1.7,1.8
Message-ID: <200709190525.l8J5POgI004528@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4510/comps/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pl.po	17 Sep 2007 19:22:12 -0000	1.7
+++ pl.po	19 Sep 2007 05:24:54 -0000	1.8
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-10 17:10+0200\n"
+"PO-Revision-Date: 2007-09-19 07:21+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1074,7 +1074,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Obs??uga somalijskiego"



From fedora-extras-commits at redhat.com  Wed Sep 19 05:26:41 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 19 Sep 2007 01:26:41 -0400
Subject: rpms/gphoto2/devel gphoto2.spec,1.84,1.85
Message-ID: <200709190526.l8J5QfNH004599@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535

Modified Files:
	gphoto2.spec 
Log Message:
add missing BR popt-devel


Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gphoto2.spec	18 Sep 2007 20:41:01 -0000	1.84
+++ gphoto2.spec	19 Sep 2007 05:26:08 -0000	1.85
@@ -25,7 +25,7 @@
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel, readline-devel
 BuildRequires: libtool, pkgconfig, sharutils
-BuildRequires: libtool-ltdl-devel
+BuildRequires: libtool-ltdl-devel, popt-devel
 
 ####################################
 %description
@@ -201,6 +201,7 @@
 %changelog
 * Tue Sep 18 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-3
 - avoid tagging mass storage devices as cameras (#295051)
+- add missing BR popt-devel
 
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-2
 - update License



From fedora-extras-commits at redhat.com  Wed Sep 19 05:38:57 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 01:38:57 -0400
Subject: rpms/python-memcached/F-7 python-memcached.spec,1.3,1.4
Message-ID: <200709190538.l8J5cve6004954@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4914

Modified Files:
	python-memcached.spec 
Log Message:
Adding python-setuptools buildreq.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-memcached.spec	19 Sep 2007 04:21:06 -0000	1.3
+++ python-memcached.spec	19 Sep 2007 05:38:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-memcached
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 
 %description
 This software is a 100% Python interface to the memcached memory cache
@@ -41,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-2
+- Adding setuptools to the buildreqs.
+
 * Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
 - Update to 1.40 upstream release.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 05:40:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 01:40:09 -0400
Subject: rpms/gnome-media/devel icons.patch, NONE, 1.1 gnome-media.spec,
	1.108, 1.109
Message-ID: <200709190540.l8J5e9tj005038@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992

Modified Files:
	gnome-media.spec 
Added Files:
	icons.patch 
Log Message:
- Don't add extra categories to volume control, since
  upstream has moved it to Hardware  (#295251)
- Make icons show up again  (#295171)



icons.patch:

--- NEW FILE icons.patch ---
diff -up gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons gnome-media-2.20.0/gnome-cd/gnome-cd.c
--- gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons	2007-08-09 09:52:53.000000000 -0400
+++ gnome-media-2.20.0/gnome-cd/gnome-cd.c	2007-09-19 01:36:51.000000000 -0400
@@ -294,15 +294,18 @@ make_button_from_widget (GnomeCD *gcd,
 }
 
 static GtkWidget *
-make_button_from_icon_name (GnomeCD *gcd,
-			    const char *icon_name,
+make_button_from_stock     (GnomeCD *gcd,
+			    const char *stock,
 			    GCallback func,
 			    const char *tooltip, 
 			    const char *shortname)
 {
 	GtkWidget *pixmap;
 
-	pixmap = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+	if (gtk_icon_factory_lookup_default (stock))
+		pixmap = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
+	else
+		pixmap = gtk_image_new_from_icon_name (stock, GTK_ICON_SIZE_BUTTON);
 
 	return make_button_from_widget (gcd, pixmap, func, tooltip, shortname);
 }
@@ -401,7 +404,10 @@ make_popup_menu (GnomeCD *gcd, GdkEventB
 		        icon_name = menuitems[i].icon;
 		
 		if (icon_name != NULL) {
-			image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+			if (gtk_icon_factory_lookup_default (icon_name))
+				image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
+			else
+				image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 		}
 		
 		if (image != NULL) {
@@ -717,7 +723,7 @@ init_player (const char *device_override
 	option_hbox = gtk_hbox_new (FALSE, 2);
 
 	/* Create app controls */
-	button = make_button_from_icon_name (gcd, GTK_STOCK_PREFERENCES,
+	button = make_button_from_stock     (gcd, GTK_STOCK_PREFERENCES,
 					     G_CALLBACK(open_preferences),
 					     _("Open preferences"),
 					     _("Preferences"));
@@ -732,7 +738,7 @@ init_player (const char *device_override
 	gnome_cd_build_track_list_menu (gcd);
 	gtk_box_pack_start (GTK_BOX (option_hbox), gcd->tracks, TRUE, TRUE, 0);
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_INDEX,
+	button = make_button_from_stock         (gcd, GTK_STOCK_INDEX,
 					     G_CALLBACK(open_track_editor),
 					     _("Open track editor"),
 					     _("Track editor"));
@@ -769,15 +775,15 @@ init_player (const char *device_override
 	gcd->play_b = button;
 	gcd->current_image = gcd->play_image;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->stop_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->back_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
 	g_signal_connect (G_OBJECT (button), "button-press-event",
 			  G_CALLBACK (rewind_press_cb), gcd);
 	g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -785,7 +791,7 @@ init_player (const char *device_override
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->rewind_b = button;
 	
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
 	g_signal_connect (G_OBJECT (button), "button-press-event",
 			  G_CALLBACK (ffwd_press_cb), gcd);
 	g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -793,11 +799,11 @@ init_player (const char *device_override
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->ffwd_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->next_b = button;
 
-	button = make_button_from_icon_name (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
+	button = make_button_from_stock (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->eject_b = button;
 


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-media.spec	18 Sep 2007 10:48:46 -0000	1.108
+++ gnome-media.spec	19 Sep 2007 05:39:32 -0000	1.109
@@ -12,11 +12,12 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
+Patch1:		icons.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -75,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
+%patch1 -p1 -b .icons
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -98,13 +100,11 @@
 ## only show in GNOME
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-cd.desktop 
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
-  --add-category X-GNOME-PersonalSettings                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-volume-control.desktop
 
 # show in all
@@ -164,7 +164,7 @@
 %files -f %{gettext_package}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 
 %{_libexecdir}/*
@@ -187,6 +187,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Don't add extra categories to volume control, since
+  upstream has moved it to Hardware  (#295251)
+- Make icons show up again  (#295171)
+
 * Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 19 05:47:09 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 01:47:09 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec,1.3,1.4
Message-ID: <200709190547.l8J5l9aF005407@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342

Modified Files:
	python-memcached.spec 
Log Message:
Adding python-setuptools buildreq.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-memcached.spec	19 Sep 2007 04:23:59 -0000	1.3
+++ python-memcached.spec	19 Sep 2007 05:46:36 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-memcached
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 
 %description
 This software is a 100% Python interface to the memcached memory cache
@@ -41,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-2
+- Adding setuptools to the buildreqs.
+
 * Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
 - Update to 1.40 upstream release.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 06:28:20 2007
From: fedora-extras-commits at redhat.com (Subhransu Behera (sbehera))
Date: Wed, 19 Sep 2007 02:28:20 -0400
Subject: rpms/nabi/devel Makefile, 1.2, 1.3 nabi-makefile.patch, NONE,
	1.1 nabi.spec, 1.5, 1.6 sources, 1.3, 1.4 theme-removal.sh, NONE,
	1.1 xinput.d-nabi, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709190628.l8J6SKnJ012617@cvs-int.fedora.redhat.com>

Author: sbehera

Update of /cvs/pkgs/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12580/devel

Added Files:
	Makefile nabi-makefile.patch nabi.spec sources 
	theme-removal.sh xinput.d-nabi 
Removed Files:
	dead.package 
Log Message:
initial import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Sep 2007 06:27:48 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: nabi
+# $Id$
+NAME := nabi
+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)

nabi-makefile.patch:

--- NEW FILE nabi-makefile.patch ---
--- themes/Makefile.am	2007-03-21 19:19:46.000000000 +0530
+++ themes/Makefile.am-modified	2007-09-03 16:17:37.000000000 +0530
@@ -1,15 +1,6 @@
 simplyreddir= @NABI_THEMES_DIR@/SimplyRed
 simplyred_DATA = SimplyRed/none.png SimplyRed/hangul.png SimplyRed/english.png
 
-mswindowsdir= @NABI_THEMES_DIR@/MSWindows
-mswindows_DATA = MSWindows/none.png MSWindows/hangul.png MSWindows/english.png
-
-mswindowsxpdir= @NABI_THEMES_DIR@/MSWindowsXP
-mswindowsxp_DATA = MSWindowsXP/none.png MSWindowsXP/hangul.png MSWindowsXP/english.png
-
-macdir= @NABI_THEMES_DIR@/Mac
-mac_DATA = Mac/README Mac/none.png Mac/hangul.png Mac/english.png
-
 oniondir= @NABI_THEMES_DIR@/Onion
 onion_DATA = Onion/README Onion/none.png Onion/hangul.png Onion/english.png
 
@@ -28,9 +19,6 @@
 
 EXTRA_DIST = \
 	$(simplyred_DATA) \
-	$(mswindows_DATA) \
-	$(mswindowsxp_DATA) \
-	$(mac_DATA) \
 	$(onion_DATA) \
 	$(keyboard_DATA) \
 	$(kingsejong_DATA) \


Index: nabi.spec
===================================================================
RCS file: nabi.spec
diff -N nabi.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nabi.spec	19 Sep 2007 06:27:48 -0000	1.6
@@ -0,0 +1,175 @@
+Summary: Hangul X Input Method
+Name: nabi
+Version: 0.18
+Release: 7%{?dist}
+
+Group: User Interface/X
+License: GPLv2+
+URL: http://nabi.kldp.net/
+Source0: nabi-%{version}_fedora.tar.gz
+
+# The upstream tarball
+# http://download.kldp.net/%{name}/Nabi/%{version}/%{name}-%{version}.tar.gz
+# currently contains some themes with images based on propriety desktops.
+# Hence, we use the following script to remove them before shipping.
+# Download the upstream tarball and invoke this script while in the
+# tarball directory:
+# ./theme-removal.sh %{version}
+# (Upstream will probably remove the said themes from a feature release.)
+
+Source1: theme-removal.sh
+Source2: xinput.d-%{name}
+Patch0: nabi-makefile.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gtk2-devel >= 2.2.0
+BuildRequires: libhangul-devel >= 0.0.6
+BuildRequires: gettext, desktop-file-utils
+
+Requires:      libhangul >= 0.0.6
+Requires:      im-chooser
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
+
+%description
+Nabi is a XIM for Korean, implemented with GTK+2.
+It shows its status in the notification area.
+
+%prep
+%setup -q -n %{name}-%{version}_fedora
+%patch0 -p0
+
+%build
+aclocal
+automake
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
+mkdir -p 644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+install -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ko_KR xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf 30
+
+%postun
+if [ "$1" = 0 ]; then
+   %{_sbindir}/alternatives --remove xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+fi
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README
+%{_bindir}/nabi
+%{_datadir}/nabi
+%config (noreplace) %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+
+
+%changelog
+* Mon Sep 03 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-7
+- Removed non-free themes from source
+
+* Fri Aug 10 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-6
+- Removed unnecessary desktop file
+- Tidy doc filelist
+
+* Wed Aug 08 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-5
+- Updated license to GPLv2+
+- No need to clean buildroot in prep
+
+* Tue Aug 07 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-4
+- Supported parallel make
+- Used the full path for alternatives
+
+* Mon Aug 06 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-3
+- improved desktop file installation
+- fixed xinput.d filename  
+
+* Mon Jul 30 2007 Jens Petersen <petersen at dhcp-65.brisbane.redhat.com> - 0.18-2
+- move desktop file to a source file
+- drop themeRemove.sh and remove problematic themes at install time
+- update description
+- fix location of xinput file
+
+* Thu Jul 26 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-1
+- Upgraded to 0.18 release
+
+* Thu Jul 05 2007 Subhransu Behera <sbehera at redhat.com> - 0.17-2
+- upgraded to 0.17 release
+
+* Wed Mar 16 2005 Warren Togami <wtogami at redhat.com> -  0.14-4
+- many spec fixes
+
+* Tue Oct 12 2004 Leon Ho <llch at redhat.com>
+- add NoDisplay=true to .desktop to hide desktop entry
+
+* Wed Sep 29 2004 Lawrence Lim <llim at redhat.com>
+- upgraded to 0.14
+- fix bug 131586
+  - Trademaked icons in nabi themes
+- fix bug 131866
+  - Upgrade nabi to 0.14
+
+* Tue Jul 06 2004 Leon Ho <llch at redhat.com>
+- upgraded to 0.13
+- added support to xinitrc-4.0.1
+  - added xinput-nabi
+  - added alternativies on post and preun
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Dec 02 2003 David Joo <djoo at redhat.com> 0.11-3
+- Packaged against Fedora Core2
+
+* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.11-1pdc
+- updated to 0.11 release
+
+* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-2pdc
+- fixed BuildRequires
+
+* Sun Nov 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-1pdc
+- updated to 0.10 release
+
+* Mon Oct 20 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-2pdc
+- added RedHat/Mandrake specific entries
+
+* Wed Oct 15 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-1pdc
+- updated to 0.9 release
+
+* Thu Oct 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.8-1pdc
+- updated to 0.8 release
+
+* Fri Sep 26 2003 DongCheon Park <pdc at kaist.ac.kr> 0.7-1pdc
+- updated to 0.7 release
+
+* Tue Sep 16 2003 DongCheon Park <pdc at kaist.ac.kr> 0.6-1pdc
+- updated to 0.6 release
+
+* Mon Sep 08 2003 DongCheon Park <pdc at kaist.ac.kr> 0.5-1pdc
+- updated to 0.5 release
+
+* Wed Sep 03 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-2pdc
+- cleaned up nabi.spec
+
+* Wed Aug 27 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-1pdc
+- updated to 0.4 release
+
+* Mon Aug 11 2003 DongCheon Park <pdc at kaist.ac.kr> 0.3-1pdc
+- updated to 0.3 release
+
+* Sat Aug 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.2-1pdc
+- updated to 0.2 release
+
+* Thu Aug 07 2003 DongCheon Park <pdc at kaist.ac.kr> 0.1-1pdc
+- initial build


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Sep 2007 06:27:48 -0000	1.4
@@ -0,0 +1 @@
+9e01930256f1b2540088ec118d7b9f4a  nabi-0.18_fedora.tar.gz


--- NEW FILE theme-removal.sh ---
#!/bin/bash

set -e

VERSION=$1
SUFFIX=_fedora

OLD=nabi-$VERSION
NEW=$OLD$SUFFIX

tar zxf $OLD.tar.gz
mv $OLD $NEW
rm -r $NEW/themes/{MSWindows,MSWindowsXP,Mac}
tar zcf $NEW.tar.gz $NEW


Index: xinput.d-nabi
===================================================================
RCS file: xinput.d-nabi
diff -N xinput.d-nabi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xinput.d-nabi	19 Sep 2007 06:27:48 -0000	1.3
@@ -0,0 +1,3 @@
+XIM=nabi
+XIM_PROGRAM=nabi
+GTK_IM_MODULE=xim


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 06:43:43 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:43:43 -0400
Subject: rpms/Pound/devel Pound.spec,1.18,1.19
Message-ID: <200709190643.l8J6hh4I013011@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930

Modified Files:
	Pound.spec 
Log Message:
Modify URL and Source0 (thanks nirik)



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Pound.spec	16 Aug 2007 18:43:28 -0000	1.18
+++ Pound.spec	19 Sep 2007 06:43:11 -0000	1.19
@@ -10,7 +10,7 @@
 
 Group:       System Environment/Daemons
 License:     GPLv3
-URL:         http://apsis.ch/pound
+URL:         http://www.apsis.ch/pound
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -27,7 +27,7 @@
 Requires(preun):  /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
-Source0:  http://apsis.ch/pound/%{name}-%{version}%{alpha}.tgz
+Source0:  http://www.apsis.ch/pound/%{name}-%{version}%{alpha}.tgz
 Source1:  pound.init
 Source2:  pound.cfg
 Patch0:   pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:46:00 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:46:00 -0400
Subject: rpms/Pound/F-7 Pound.spec,1.15,1.16
Message-ID: <200709190646.l8J6k04e013190@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13156

Modified Files:
	Pound.spec 
Log Message:
Fix URL and Source0 to an address that resolves in dns



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-7/Pound.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Pound.spec	25 May 2007 17:44:25 -0000	1.15
+++ Pound.spec	19 Sep 2007 06:45:27 -0000	1.16
@@ -9,7 +9,7 @@
 
 Group:		System Environment/Daemons
 License:	GPL        
-URL:		http://apsis.ch/pound
+URL:		http://www.apsis.ch/pound
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, pcre-devel
@@ -19,7 +19,7 @@
 Requires(preun):	/sbin/chkconfig, /sbin/service
 Requires(postun):	/sbin/service
 
-Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
+Source0:	http://www.apsis.ch/pound/%{name}-%{version}.tgz       
 Source1:	pound.init
 Source2:	pound.cfg
 Patch0:		pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:48:31 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 02:48:31 -0400
Subject: rpms/nut/devel nut-2.2.0-wrongssl.patch, NONE, 1.1 nut.spec, 1.47,
	1.48
Message-ID: <200709190648.l8J6mVmj013273@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
- fix wrong libssl flags in devel, fix devel package dependencies


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 06:47:58 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,6 +22,7 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib
 Requires(post): fileutils /sbin/chkconfig /sbin/service
@@ -78,7 +79,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +91,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -277,6 +279,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 06:50:54 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:50:54 -0400
Subject: rpms/Pound/FC-6 Pound.spec,1.6,1.7
Message-ID: <200709190650.l8J6ospB013397@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13360

Modified Files:
	Pound.spec 
Log Message:
Change URL and Source0 to a host that resolves in DNS



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/FC-6/Pound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Pound.spec	11 Apr 2007 21:48:31 -0000	1.6
+++ Pound.spec	19 Sep 2007 06:50:19 -0000	1.7
@@ -9,7 +9,7 @@
 
 Group:		System Environment/Daemons
 License:	GPL        
-URL:		http://apsis.ch/pound
+URL:		http://www.apsis.ch/pound
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, pcre-devel
@@ -19,7 +19,7 @@
 Requires(preun):	/sbin/chkconfig, /sbin/service
 Requires(postun):	/sbin/service
 
-Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
+Source0:	http://www.apsis.ch/pound/%{name}-%{version}.tgz       
 Source1:	pound.init
 Source2:	pound.cfg
 Patch0:		pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:52:00 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 02:52:00 -0400
Subject: comps comps-f8.xml.in,1.114,1.115
Message-ID: <200709190652.l8J6q02w013482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13465

Modified Files:
	comps-f8.xml.in 
Log Message:
add nabi



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- comps-f8.xml.in	19 Sep 2007 05:02:43 -0000	1.114
+++ comps-f8.xml.in	19 Sep 2007 06:51:30 -0000	1.115
@@ -2478,6 +2478,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-korean</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
+      <packagereq type="optional">nabi</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Wed Sep 19 07:13:28 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Wed, 19 Sep 2007 03:13:28 -0400
Subject: rpms/php/devel php-5.2.4-embed.patch,1.2,1.3
Message-ID: <200709190713.l8J7DSrN019876@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19855

Modified Files:
	php-5.2.4-embed.patch 
Log Message:
- fix soname


php-5.2.4-embed.patch:

Index: php-5.2.4-embed.patch
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php-5.2.4-embed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.2.4-embed.patch	18 Sep 2007 19:06:36 -0000	1.2
+++ php-5.2.4-embed.patch	19 Sep 2007 07:13:26 -0000	1.3
@@ -5,7 +5,7 @@
      yes|shared)
        PHP_EMBED_TYPE=shared
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
-+      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION)"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_VERSION)"
 +      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
        ;;
      static)



From fedora-extras-commits at redhat.com  Wed Sep 19 07:20:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal))
Date: Wed, 19 Sep 2007 03:20:04 -0400
Subject: rpms/wireshark/devel wireshark.spec,1.22,1.23
Message-ID: <200709190720.l8J7K4S8020069@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20039

Modified Files:
	wireshark.spec 
Log Message:
fixed URL


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wireshark.spec	23 Aug 2007 15:01:40 -0000	1.22
+++ wireshark.spec	19 Sep 2007 07:19:32 -0000	1.23
@@ -5,13 +5,13 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.6
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
-Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz
+Source0:	http://wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz
 %else
-Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
+Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.gz
 %endif
 Source1:	wireshark.pam
 Source2:	wireshark.console
@@ -186,6 +186,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Radek Vok??l <rvokal at redhat.com> 0.99.6-3
+- fixed URL
+
 * Thu Aug 23 2007 Radek Vok??l <rvokal at redhat.com> 0.99.6-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Sep 19 07:26:54 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 03:26:54 -0400
Subject: rpms/nut/EL-5 nut-2.2.0-wrongssl.patch,NONE,1.1 nut.spec,1.47,1.48
Message-ID: <200709190726.l8J7Qsrg020683@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20657

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-4
- fix manpages encodings
- run ldconfig after client (un)install


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 07:26:22 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,10 +22,11 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
-Requires: nut-client => 2.0.0 hal dbus-glib
-Requires(post): fileutils /sbin/chkconfig /sbin/service
-Requires(postun): fileutils /sbin/chkconfig /sbin/service
+Requires: nut-client => 2.0.0 hal dbus-glib shadow-utils
+Requires(post): fileutils chkconfig /sbin/service
+Requires(postun): fileutils chkconfig /sbin/service
 
 BuildRequires: gd-devel
 BuildRequires: freetype-devel
@@ -58,8 +59,6 @@
 %package client
 Group: Applications/System
 Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
 
 %description client
 This package includes the client utilities that are required to monitor a
@@ -78,7 +77,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +89,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -102,14 +102,23 @@
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
     --with-all \
-	--with-ipv6 \
+    --with-ipv6 \
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
-	--with-pkgconfig-dir=%{_libdir}/pkgconfig \
-	--disable-static
+    --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+    --disable-static
 
 make %{?_smp_mflags}
 
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
+rm -f man/*.iso
+
 %install
 rm -rf %{buildroot}
 
@@ -152,6 +161,7 @@
 
 %post client
 /sbin/chkconfig --add ups
+/sbin/ldconfig
 exit 0
 
 %preun client
@@ -159,6 +169,7 @@
     /sbin/service ups stop > /dev/null 2>&1
     /sbin/chkconfig --del ups
 fi
+/sbin/ldconfig
 exit 0
 
 %postun client
@@ -277,6 +288,13 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-4
+- fix manpages encodings
+- run ldconfig after client (un)install
+
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 07:48:26 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:48:26 -0400
Subject: rpms/ekiga/F-7 ekiga.spec,1.39,1.40 sources,1.12,1.13
Message-ID: <200709190748.l8J7mQxi021197@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/ekiga/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177

Modified Files:
	ekiga.spec sources 
Log Message:
- Upgrade to ekiga-2.0.11
Daniel



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-7/ekiga.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ekiga.spec	15 Apr 2007 21:11:03 -0000	1.39
+++ ekiga.spec	19 Sep 2007 07:47:53 -0000	1.40
@@ -1,14 +1,14 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 2.0.9
+Version: 2.0.11
 Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.7
-Requires: opal >= 2.2.8
+Requires: pwlib >= 1.10.10
+Requires: opal >= 2.2.11
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -23,8 +23,8 @@
 BuildRequires: avahi-devel >= 0.6.9
 BuildRequires: avahi-glib-devel >= 0.6.9
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.7
-BuildRequires: opal-devel >= 2.2.8
+BuildRequires: pwlib-devel >= 1.10.10
+BuildRequires: opal-devel >= 2.2.11
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -93,7 +93,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
-* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9.1
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.0.11-1
+- Upgrade to ekiga-2.0.11
+
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9-1
 - Upgrade to ekiga-2.0.9
 
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.0.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Apr 2007 20:46:54 -0000	1.12
+++ sources	19 Sep 2007 07:47:53 -0000	1.13
@@ -1 +1 @@
-7dd9f812ce3b940839b12486ddee7e80  ekiga-2.0.9.tar.gz
+684865225d77898e10e960f3a286b894  ekiga-2.0.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 07:51:29 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 03:51:29 -0400
Subject: rpms/nut/EL-4 nut-2.2.0-wrongssl.patch,NONE,1.1 nut.spec,1.47,1.48
Message-ID: <200709190751.l8J7pTk8021416@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21339

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
- fix manpages encodings
- run ldconfig after client (un)install
- remove hal support for EL4


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 07:50:56 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,10 +22,11 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
-Requires: nut-client => 2.0.0 hal dbus-glib
-Requires(post): fileutils /sbin/chkconfig /sbin/service
-Requires(postun): fileutils /sbin/chkconfig /sbin/service
+Requires: nut-client => 2.0.0 dbus-glib shadow-utils
+Requires(post): fileutils chkconfig /sbin/service
+Requires(postun): fileutils chkconfig /sbin/service
 
 BuildRequires: gd-devel
 BuildRequires: freetype-devel
@@ -33,13 +34,11 @@
 BuildRequires: libpng-devel
 BuildRequires: net-snmp-devel
 BuildRequires: elfutils-devel
-BuildRequires: libX11-devel
-BuildRequires: libXpm-devel
+BuildRequires: xorg-x11-devel
 BuildRequires: libjpeg-devel
 BuildRequires: fontconfig-devel
 BuildRequires: pkgconfig
-BuildRequires: hal-devel
-BuildRequires: dbus-glib-devel
+BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 
 %ifnarch s390 s390x
@@ -58,8 +57,6 @@
 %package client
 Group: Applications/System
 Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
 
 %description client
 This package includes the client utilities that are required to monitor a
@@ -78,7 +75,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +87,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -101,15 +99,29 @@
     --sysconfdir=%{_sysconfdir}/ups \
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
-    --with-all \
-	--with-ipv6 \
+    --with-serial \
+    --with-usb \
+    --with-snmp \
+    --with-cgi \
+    --with-lib \
+    --with-ssl \
+    --with-ipv6 \
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
-	--with-pkgconfig-dir=%{_libdir}/pkgconfig \
-	--disable-static
+    --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+    --disable-static
 
 make %{?_smp_mflags}
 
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
+rm -f man/*.iso
+
 %install
 rm -rf %{buildroot}
 
@@ -152,6 +164,7 @@
 
 %post client
 /sbin/chkconfig --add ups
+/sbin/ldconfig
 exit 0
 
 %preun client
@@ -159,6 +172,7 @@
     /sbin/service ups stop > /dev/null 2>&1
     /sbin/chkconfig --del ups
 fi
+/sbin/ldconfig
 exit 0
 
 %postun client
@@ -178,6 +192,7 @@
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/hotplug/usb/*
 %{modeldir}/*
 %{_sbindir}/upsd
 %{_bindir}/upslog
@@ -277,6 +292,14 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
+- fix manpages encodings
+- run ldconfig after client (un)install
+- remove hal support for EL4
+
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 07:52:28 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:52:28 -0400
Subject: rpms/opal/F-7 opal.spec, 1.20, 1.21 sources, 1.10,
	1.11 ekiga-429076-42.patch, 1.1, NONE ekiga-429076-50.patch, 1.1, NONE
Message-ID: <200709190752.l8J7qSlp021469@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21426

Modified Files:
	opal.spec sources 
Removed Files:
	ekiga-429076-42.patch ekiga-429076-50.patch 
Log Message:
- upstream release of 2.2.11
- includes the 2 cisco patches
Daniel



Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-7/opal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- opal.spec	22 Aug 2007 10:26:19 -0000	1.20
+++ opal.spec	19 Sep 2007 07:51:56 -0000	1.21
@@ -1,22 +1,18 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.8
-Release: 5%{?dist}
+Version: 2.2.11
+Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.7
-BuildRequires: pwlib-devel >= 1.10.7
+Requires: pwlib >= 1.10.10
+BuildRequires: pwlib-devel >= 1.10.10
 BuildRequires: openldap-devel
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
 
-# workaround problems with CISCO server
-Patch0: ekiga-429076-42.patch
-Patch1: ekiga-429076-50.patch
-
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
 teleconferencing protocol, and successor of the openh323 library.
@@ -25,15 +21,13 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.7
+Requires: pwlib-devel >= 1.10.10
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p0
 
 %build
 %configure --enable-localspeex
@@ -65,6 +59,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.11-1
+- upstream release of 2.2.11
+- includes the 2 cisco patches
+
 * Wed Aug 22 2007 Daniel Veillard <veillard at redhat.com> - 2.2.8-5.fc7
 - added 2 patches needed when using a CISCO server
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Apr 2007 20:41:57 -0000	1.10
+++ sources	19 Sep 2007 07:51:56 -0000	1.11
@@ -1 +1 @@
-700b0c3a7606afc0dc6c9d3c12fcb23b  opal-2.2.8.tar.gz
+eb4a9c0c9ea93ec95c876aaeadf83936  opal-2.2.11.tar.gz


--- ekiga-429076-42.patch DELETED ---


--- ekiga-429076-50.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 07:54:52 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:54:52 -0400
Subject: rpms/pwlib/devel c++_crack.patch, 1.2,
	NONE pwlib-1.6.5-debuginfo.patch, 1.3,
	NONE pwlib-1.8.7-gcc4.patch, 1.1, NONE pwlib-1.8.7-gcc41.patch,
	1.1, NONE pwlib-1.9.2.ldap.patch, 1.1, NONE
Message-ID: <200709190754.l8J7sq5U021589@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21582

Removed Files:
	c++_crack.patch pwlib-1.6.5-debuginfo.patch 
	pwlib-1.8.7-gcc4.patch pwlib-1.8.7-gcc41.patch 
	pwlib-1.9.2.ldap.patch 
Log Message:
remove old patches, Daniel



--- c++_crack.patch DELETED ---


--- pwlib-1.6.5-debuginfo.patch DELETED ---


--- pwlib-1.8.7-gcc4.patch DELETED ---


--- pwlib-1.8.7-gcc41.patch DELETED ---


--- pwlib-1.9.2.ldap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 07:56:27 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 03:56:27 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.49,1.50
Message-ID: <200709190756.l8J7uRAC021650@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21630

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bad source URL


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- tog-pegasus.spec	30 Aug 2007 10:33:37 -0000	1.49
+++ tog-pegasus.spec	19 Sep 2007 07:55:55 -0000	1.50
@@ -53,7 +53,7 @@
 #
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n)
 #
-Source:    		http://www.openpegasus.org/uploads/40/10123/pegasus-%{version}.tar.gz
+Source:			http://www.openpegasus.org/uploads/40/14280/pegasus-%{version}.tar.gz
 Source1:        	README.RedHat.Security
 Source2:		genOpenPegasusSSLCerts
 Source3:		pegasus_arch_alternatives



From fedora-extras-commits at redhat.com  Wed Sep 19 07:57:45 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:57:45 -0400
Subject: rpms/pwlib/F-7 pwlib.spec,1.47,1.48 sources,1.19,1.20
Message-ID: <200709190757.l8J7vjJ1021728@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21671

Modified Files:
	pwlib.spec sources 
Log Message:
- Update to 1.10.10
Daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/F-7/pwlib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pwlib.spec	15 Apr 2007 20:38:04 -0000	1.47
+++ pwlib.spec	19 Sep 2007 07:57:13 -0000	1.48
@@ -1,6 +1,6 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.7
+Version:	1.10.10
 Release:        1%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
+- Update to 1.10.10
+
 * Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 1.10.7-1
 - Update to 1.10.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Apr 2007 20:38:04 -0000	1.19
+++ sources	19 Sep 2007 07:57:13 -0000	1.20
@@ -1 +1 @@
-29c061328e93bda77423edb8bdabbddd  pwlib-1.10.7.tar.gz
+abebf45332e70772ffa876d31975d4b9  pwlib-1.10.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 07:58:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 03:58:05 -0400
Subject: rpms/talk/devel talk.spec,1.20,1.21
Message-ID: <200709190758.l8J7w5Rs021738@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/talk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21708

Modified Files:
	talk.spec 
Log Message:
fix bad source URL


Index: talk.spec
===================================================================
RCS file: /cvs/extras/rpms/talk/devel/talk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- talk.spec	23 Aug 2007 12:34:04 -0000	1.20
+++ talk.spec	19 Sep 2007 07:57:33 -0000	1.21
@@ -4,7 +4,7 @@
 Release: 29.2.3
 License: BSD
 Group: Applications/Internet
-Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ntalk-%{version}.tar.gz
+Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-%{version}.tar.gz
 Source1: talk-xinetd
 Source2: ntalk-xinetd
 Patch0: netkit-ntalk-0.17-pre20000412-time.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 07:58:25 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:58:25 -0400
Subject: rpms/pwlib/F-7 c++_crack.patch, 1.2,
	NONE pwlib-1.6.5-debuginfo.patch, 
	1.3, NONE pwlib-1.8.7-gcc4.patch, 1.1,
	NONE pwlib-1.8.7-gcc41.patch, 1.1, NONE pwlib-1.9.2.ldap.patch,
	1.1, NONE
Message-ID: <200709190758.l8J7wPOm021788@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21749

Removed Files:
	c++_crack.patch pwlib-1.6.5-debuginfo.patch 
	pwlib-1.8.7-gcc4.patch pwlib-1.8.7-gcc41.patch 
	pwlib-1.9.2.ldap.patch 
Log Message:
remove old patches, Daniel



--- c++_crack.patch DELETED ---


--- pwlib-1.6.5-debuginfo.patch DELETED ---


--- pwlib-1.8.7-gcc4.patch DELETED ---


--- pwlib-1.8.7-gcc41.patch DELETED ---


--- pwlib-1.9.2.ldap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 08:08:53 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 04:08:53 -0400
Subject: rpms/gsl/devel gsl-1.10-lib64.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gsl.spec, 1.27, 1.28 sources, 1.12,
	1.13 gsl-1.9-lib64.patch, 1.1, NONE
Message-ID: <200709190808.l8J88rlB028594@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28559

Modified Files:
	.cvsignore gsl.spec sources 
Added Files:
	gsl-1.10-lib64.patch 
Removed Files:
	gsl-1.9-lib64.patch 
Log Message:
update to 1.10


gsl-1.10-lib64.patch:

--- NEW FILE gsl-1.10-lib64.patch ---
--- gsl-1.10/configure.lib64	2007-09-13 17:41:52.000000000 +0200
+++ gsl-1.10/configure	2007-09-19 09:35:14.000000000 +0200
@@ -853,6 +853,7 @@ RANLIB
 LIBTOOL
 GSL_CFLAGS
 GSL_LIBS
+GSL_LIB
 MINGW32_HOST_TRUE
 MINGW32_HOST_FALSE
 LIBOBJS
@@ -10333,7 +10334,7 @@ fi
 
 GSL_CFLAGS="-I$includedir"
 GSL_LIBS="-L$libdir -lgsl"
-
+GSL_LIB="-L$libdir" 
 
 
 
@@ -13275,6 +13276,7 @@ RANLIB!$RANLIB$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
 GSL_CFLAGS!$GSL_CFLAGS$ac_delim
 GSL_LIBS!$GSL_LIBS$ac_delim
+GSL_LIB!$GSL_LIB$ac_delim
 MINGW32_HOST_TRUE!$MINGW32_HOST_TRUE$ac_delim
 MINGW32_HOST_FALSE!$MINGW32_HOST_FALSE$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -13283,8 +13285,7 @@ HAVE_GNUM68K_IEEE_INTERFACE!$HAVE_GNUM68
 HAVE_GNUPPC_IEEE_INTERFACE!$HAVE_GNUPPC_IEEE_INTERFACE$ac_delim
 HAVE_GNUX86_IEEE_INTERFACE!$HAVE_GNUX86_IEEE_INTERFACE$ac_delim
 _ACEOF
-
-  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
--- gsl-1.10/gsl-config.in.lib64	2007-09-19 09:21:20.000000000 +0200
+++ gsl-1.10/gsl-config.in	2007-09-19 09:21:20.000000000 +0200
@@ -63,7 +63,7 @@ while test $# -gt 0; do
 
     --libs)
         : ${GSL_CBLAS_LIB=-lgslcblas}
-       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|-L/usr/lib||g"
+       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|@GSL_LIB@||g"
        	;;
 
     --libs-without-cblas)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 May 2007 10:29:33 -0000	1.12
+++ .cvsignore	19 Sep 2007 08:08:21 -0000	1.13
@@ -1 +1 @@
-gsl-1.9.tar.gz
+gsl-1.10.tar.gz


Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gsl.spec	27 Aug 2007 10:06:22 -0000	1.27
+++ gsl.spec	19 Sep 2007 08:08:21 -0000	1.28
@@ -5,7 +5,7 @@
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
-Patch1: gsl-1.9-lib64.patch
+Patch1: gsl-1.10-lib64.patch
 # info part of this package is under GFDL license
 # eigen/nonsymmv.c and eigen/schur.c
 # contains rutiens which are part of LAPACK - under BSD style license
@@ -98,6 +98,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-1
+- update to 1.10
+- change license tag
+
 * Tue May 22 2007 Ivana Varekova <varekova at redhat.com> - 1.9-1
 - update  to 1.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 May 2007 10:29:33 -0000	1.12
+++ sources	19 Sep 2007 08:08:21 -0000	1.13
@@ -1 +1 @@
-81dca4362ae8d2aa1547b7d010881e43  gsl-1.9.tar.gz
+faf5e178855ec952fe745a03d815da1d  gsl-1.10.tar.gz


--- gsl-1.9-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 08:10:40 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 04:10:40 -0400
Subject: rpms/gsl/devel gsl.spec,1.28,1.29
Message-ID: <200709190810.l8J8AeMm028690@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28647

Modified Files:
	gsl.spec 
Log Message:
update version tag



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gsl.spec	19 Sep 2007 08:08:21 -0000	1.28
+++ gsl.spec	19 Sep 2007 08:10:08 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
-Version: 1.9
+Version: 1.10
 Release: 1%{?dist}
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 08:42:45 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:42:45 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.29,1.30
Message-ID: <200709190842.l8J8gjYf029526@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29499

Modified Files:
	xmlto.spec 
Log Message:
fixed wrong source URL


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xmlto.spec	23 Aug 2007 08:02:06 -0000	1.29
+++ xmlto.spec	19 Sep 2007 08:42:12 -0000	1.30
@@ -3,11 +3,11 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 14
+Release: 15
 License: GPLv2
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
-Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 Patch0: xmlto-basename.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Wed Sep 19 2007 Ondrej Vasik <ovasik at redhat.com> - 0.0.18-15
+- fixed wrong source URL
+
 * Thu Aug 23 2007 Ondrej Vasik <ovasik at redhat.com> - 0.0.18-14
 - rebuilt for F8
 - changed License tag to GPLv2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:00:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:00:00 -0400
Subject: rpms/fslint/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200709190900.l8J900Zr030106@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30034

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:01:26 -0000	1.7
+++ .cvsignore	19 Sep 2007 08:59:28 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:01:27 -0000	1.7
+++ sources	19 Sep 2007 08:59:28 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:02:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:02:52 -0400
Subject: rpms/fslint/devel fslint.spec,1.13,1.14
Message-ID: <200709190902.l8J92qRF003787@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	fslint.spec 
Log Message:
Update to 2.24


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:39 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:02:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:10:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:10:59 -0400
Subject: rpms/fslint/FC-5 .cvsignore, 1.7, 1.8 fslint.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200709190910.l8J9AxNH004166@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4100

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:28:42 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:10:26 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fslint.spec	3 Aug 2007 09:37:33 -0000	1.12
+++ fslint.spec	19 Sep 2007 09:10:26 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:28:42 -0000	1.7
+++ sources	19 Sep 2007 09:10:26 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:11:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:11:52 -0400
Subject: rpms/fslint/FC-6 .cvsignore, 1.7, 1.8 fslint.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200709190911.l8J9Bqru004247@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4225

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:35:02 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:11:19 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:36 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:11:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:35:02 -0000	1.7
+++ sources	19 Sep 2007 09:11:19 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:12:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:12:47 -0400
Subject: rpms/fslint/F-7 .cvsignore, 1.7, 1.8 fslint.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200709190912.l8J9Cl1d004358@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:45:22 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:12:14 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:30 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:12:14 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:45:22 -0000	1.7
+++ sources	19 Sep 2007 09:12:14 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:18:42 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 19 Sep 2007 05:18:42 -0400
Subject: rpms/uucp/devel uucp.spec,1.34,1.35
Message-ID: <200709190918.l8J9IgCJ004732@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/uucp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4714

Modified Files:
	uucp.spec 
Log Message:
license tag


Index: uucp.spec
===================================================================
RCS file: /cvs/extras/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- uucp.spec	4 Apr 2007 10:24:28 -0000	1.34
+++ uucp.spec	19 Sep 2007 09:18:10 -0000	1.35
@@ -7,8 +7,8 @@
 Summary: The uucp utility for copying files between systems
 Name: uucp
 Version: 1.07
-Release: 15%{?dist}
-License: GPL
+Release: 16%{?dist}
+License: GPLv2+
 Group: Applications/Communications
 Url: http://www.airs.com/ian/uucp.html
 Source0: ftp://ftp.gnu.org/pub/gnu/uucp/uucp-%{version}.tar.gz
@@ -157,6 +157,9 @@
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Wed Sep 19 2007 Radek Brich <rbrich at redhat.com> 1.07-16
+- updated license tag
+
 * Wed Apr 04 2007 Lukas Vrabel <lvrabel at redhat.com> 1.07-15
 - fix crashes with SIGFPE (#150978) (from Wolfgang Ocker)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:36:14 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 05:36:14 -0400
Subject: rpms/alsa-lib/F-7 alsa-lib-1.0.14-lfloat.patch, NONE,
	1.1 alsa-lib.spec, 1.56, 1.57
Message-ID: <200709190936.l8J9aEUV005235@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5213

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.14-lfloat.patch 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-4
- added fix for #294841 - alsa-lib has a configure bug which 
  causes it not to build the lfloat plugin



alsa-lib-1.0.14-lfloat.patch:

--- NEW FILE alsa-lib-1.0.14-lfloat.patch ---

--- a/configure.in	Mon Jun 11 10:52:17 2007 +0200
+++ b/configure.in	Thu Jun 28 13:26:25 2007 +0200
@@ -414,7 +414,7 @@ if test "$HAVE_LIBPTHREAD" != "yes"; the
   build_pcm_share="no"
 fi
 
-if test "$softfloat" != "yes"; then
+if test "$softfloat" = "yes"; then
   build_pcm_lfloat="no"
 fi
 






Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-7/alsa-lib.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- alsa-lib.spec	16 Aug 2007 14:36:23 -0000	1.56
+++ alsa-lib.spec	19 Sep 2007 09:35:41 -0000	1.57
@@ -4,12 +4,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
 Patch0:   alsa-lib-1.0.14rc1-config.patch
 Patch2:   alsa-lib-1.0.14-glibc-open.patch
+Patch3:   alsa-lib-1.0.14-lfloat.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -39,6 +40,7 @@
 %setup -q -n %{name}-%{version_main}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
+%patch3 -p1 -b .lfloat
 
 %build
 %configure \
@@ -93,6 +95,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-4
+- added fix for #294841 - alsa-lib has a configure bug which 
+  causes it not to build the lfloat plugin
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-3
 - updated to 1.0.14a
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:37:41 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 05:37:41 -0400
Subject: rpms/gmp/devel .cvsignore, 1.13, 1.14 gmp.spec, 1.43, 1.44 sources, 
	1.13, 1.14
Message-ID: <200709190937.l8J9bfma005342@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305

Modified Files:
	.cvsignore gmp.spec sources 
Log Message:
update to 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Aug 2007 13:56:38 -0000	1.13
+++ .cvsignore	19 Sep 2007 09:37:09 -0000	1.14
@@ -1,2 +1 @@
-mpfr-2.2.1.tar.bz2
-gmp-4.2.1.tar.bz2
+gmp-4.2.2.tar.bz2


Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gmp.spec	20 Aug 2007 07:55:22 -0000	1.43
+++ gmp.spec	19 Sep 2007 09:37:09 -0000	1.44
@@ -7,8 +7,8 @@
 
 Summary: A GNU arbitrary precision library
 Name: gmp
-Version: 4.2.1
-Release: 3%{dist}
+Version: 4.2.2
+Release: 1%{dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -100,9 +100,9 @@
 install -m 755 .libs/libgmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libgmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmp.so.3
-install -m 755 .libs/libgmpxx.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
-cp -a .libs/libgmpxx.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.3
+install -m 755 .libs/libgmpxx.so.4.* $RPM_BUILD_ROOT%{_libdir}/sse2
+cp -a .libs/libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/sse2
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.4
 install -m 755 .libs/libmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libmp.so.3
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-1
+- update to 4.2.2
+
 * Mon Aug 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.1-3
 - spec file cleanup (#253439)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Aug 2007 13:56:38 -0000	1.13
+++ sources	19 Sep 2007 09:37:09 -0000	1.14
@@ -1,2 +1 @@
-40bf06f8081461d8db7d6f4ad5b9f6bd  mpfr-2.2.1.tar.bz2
-091c56e0e1cca6b09b17b69d47ef18e3  gmp-4.2.1.tar.bz2
+7ce52531644e6d12f16911b7e3151f3f  gmp-4.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:41:12 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 19 Sep 2007 05:41:12 -0400
Subject: rpms/rt61pci-firmware/F-7 rt61pci-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190941.l8J9fC0M005525@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/rt61pci-firmware/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5485/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	rt61pci-firmware.spec 
Log Message:
Initial import



--- NEW FILE rt61pci-firmware.spec ---
Name:		rt61pci-firmware
Version:	1.2
Release:	4
Summary:	Firmware for Ralink?? RT2561/RT2661 A/B/G network adaptors
Group:		System Environment/Kernel
License:	Redistributable, no modification permitted
URL:		http://www.ralinktech.com
Source0:	http://www.ralinktech.com.tw/data/RT61_Firmware_V%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Obsoletes: rt61-firmware < %{version}-%{release}
Provides: rt61-firmware = %{version}-%{release}


%description
This package contains the firmware required by the rt61pci driver for Linux.
Usage of the firmware is subject to the terms and conditions contained
inside the provided LICENSE.ralink-firmware.txt file.
Please read it carefully.


%prep
%setup -q -n RT61_Firmware_V%{version}
sed -i 's/\r//' LICENSE.ralink-firmware.txt

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
install -pm 0644 *.bin $RPM_BUILD_ROOT/lib/firmware

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.ralink-firmware.txt
/lib/firmware/*


%changelog
* Mon Sep 17 2007 kwizart < kwizart at gmail.com > - 1.2-4
- Disable dist tag
- Preserve timestamp
- Add license from Ralink
- Improved summary and description

* Mon Mar 19 2007 kwizart < kwizart at gmail.com > - 1.2-3
- Update Source url (uses .com.tw instead of .com)
- Fix License field

* Mon Feb 26 2007 kwizart < kwizat at gmail.com > - 1.2-2
- Update the download link

* Tue Sep 13 2006 kwizart < kwizart at gmail.com > - 1.2-1_FC5
- inital release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt61pci-firmware/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 04:01:10 -0000	1.1
+++ .cvsignore	19 Sep 2007 09:40:40 -0000	1.2
@@ -0,0 +1 @@
+RT61_Firmware_V1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt61pci-firmware/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 04:01:10 -0000	1.1
+++ sources	19 Sep 2007 09:40:40 -0000	1.2
@@ -0,0 +1 @@
+d4c690c93b470bc9a681297c2adc6281  RT61_Firmware_V1.2.zip



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:20 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:20 -0700
Subject: [pkgdb] libwvstreams Orphaned
Message-ID: <200709190946.l8J9kKYb012962@app4.fedora.phx.redhat.com>

Package libwvstreams in Fedora devel was orphaned by Harald Hoyer (harald)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:22 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:22 -0700
Subject: [pkgdb] libwvstreams Orphaned
Message-ID: <200709190946.l8J9kM6k019664@app3.fedora.phx.redhat.com>

Package libwvstreams in Fedora 7 was orphaned by Harald Hoyer (harald)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:31 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:31 -0700
Subject: [pkgdb] wvdial Orphaned
Message-ID: <200709190946.l8J9kVJb013020@app4.fedora.phx.redhat.com>

Package wvdial in Fedora devel was orphaned by Harald Hoyer (harald)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:32 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:32 -0700
Subject: [pkgdb] wvdial Orphaned
Message-ID: <200709190946.l8J9kW1w019712@app3.fedora.phx.redhat.com>

Package wvdial in Fedora 7 was orphaned by Harald Hoyer (harald)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 09:54:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 05:54:56 -0400
Subject: rpms/alsa-lib/devel .cvsignore, 1.28, 1.29 alsa-lib.spec, 1.57,
	1.58 sources, 1.31, 1.32
Message-ID: <200709190954.l8J9suBr005944@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
- updated to 1.0.15rc2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Aug 2007 14:31:06 -0000	1.28
+++ .cvsignore	19 Sep 2007 09:54:21 -0000	1.29
@@ -15,3 +15,4 @@
 alsa-lib-1.0.14rc3.tar.bz2
 alsa-lib-1.0.14.tar.bz2
 alsa-lib-1.0.14a.tar.bz2
+alsa-lib-1.0.15rc2.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- alsa-lib.spec	16 Aug 2007 14:31:06 -0000	1.57
+++ alsa-lib.spec	19 Sep 2007 09:54:21 -0000	1.58
@@ -1,10 +1,11 @@
-%define  version_main   1.0.14
-%define  postver        a
+%define  version_main   1.0.15
+%define  prever         rc2
+%define  prever_dot     .rc2
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3%{?dist}
+Release: 0.1%{?prever_dot}%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
@@ -93,6 +94,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
+- updated to 1.0.15rc2
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-3
 - updated to 1.0.14a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	16 Aug 2007 14:31:06 -0000	1.31
+++ sources	19 Sep 2007 09:54:21 -0000	1.32
@@ -1 +1 @@
-72dc63821ce33f2b97a151a909b06ff8  alsa-lib-1.0.14a.tar.bz2
+102c8aebe1d6245683ab2233c1124a06  alsa-lib-1.0.15rc2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:59:38 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 19 Sep 2007 05:59:38 -0400
Subject: rpms/sylpheed/devel .cvsignore, 1.29, 1.30 sources, 1.29,
	1.30 sylpheed.spec, 1.56, 1.57
Message-ID: <200709190959.l8J9xctO006055@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6033

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
* Wed Sep 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-1
- Update to 2.4.6 (bug-fixes, but also minor feature additions
  and rewrites).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	31 Aug 2007 10:32:56 -0000	1.29
+++ .cvsignore	19 Sep 2007 09:59:04 -0000	1.30
@@ -1,2 +1,2 @@
-sylpheed-2.4.5.tar.bz2.asc
-sylpheed-2.4.5.tar.bz2
+sylpheed-2.4.6.tar.bz2.asc
+sylpheed-2.4.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	31 Aug 2007 10:32:57 -0000	1.29
+++ sources	19 Sep 2007 09:59:04 -0000	1.30
@@ -1,2 +1,2 @@
-6481115afea2d47d521dfed7d71b9043  sylpheed-2.4.5.tar.bz2.asc
-27e7c802f9af3e3c58e4457aadd36a91  sylpheed-2.4.5.tar.bz2
+0101ab7fcfb945722952ce77b07036f9  sylpheed-2.4.6.tar.bz2.asc
+361908337111957c911026a07d1e0e44  sylpheed-2.4.6.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sylpheed.spec	31 Aug 2007 10:32:57 -0000	1.56
+++ sylpheed.spec	19 Sep 2007 09:59:04 -0000	1.57
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.4.5
+Version: 2.4.6
 Release: 1
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
@@ -84,6 +84,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-1
+- Update to 2.4.6 (bug-fixes, but also minor feature additions
+  and rewrites).
+
 * Fri Aug 31 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.5-1
 - Update to 2.4.5 (accumulated bug-fixes).
 



From fedora-extras-commits at redhat.com  Wed Sep 19 10:10:41 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 06:10:41 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.39, 1.40 gnome-media.spec,
	1.109, 1.110 sources, 1.38, 1.39 icons.patch, 1.1, NONE
Message-ID: <200709191010.l8JAAfg0012377@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12327

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	icons.patch 
Log Message:
* Wed Sep 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-1
- Update to 2.20.1
- Remove obsolete icons patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	17 Sep 2007 16:43:17 -0000	1.39
+++ .cvsignore	19 Sep 2007 10:10:05 -0000	1.40
@@ -1 +1 @@
-gnome-media-2.20.0.tar.gz
+gnome-media-2.20.1.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-media.spec	19 Sep 2007 05:39:32 -0000	1.109
+++ gnome-media.spec	19 Sep 2007 10:10:05 -0000	1.110
@@ -17,7 +17,6 @@
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
-Patch1:		icons.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -76,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
-%patch1 -p1 -b .icons
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -187,6 +185,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-1
+- Update to 2.20.1
+- Remove obsolete icons patch
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Don't add extra categories to volume control, since
   upstream has moved it to Hardware  (#295251)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Sep 2007 16:43:17 -0000	1.38
+++ sources	19 Sep 2007 10:10:05 -0000	1.39
@@ -1 +1 @@
-4c98d9e745d98cb1ff314027b198a511  gnome-media-2.20.0.tar.gz
+e123bc1d79f0e2f926677663ab5745c7  gnome-media-2.20.1.tar.gz


--- icons.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:19:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:19:28 -0400
Subject: rpms/micq/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191019.l8JAJS6x012555@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12546

Added Files:
	dead.package 
Removed Files:
	Makefile micq-glibc-open.patch micq.spec sources 
Log Message:
Packge dropped - renamed to climm.



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:21:54 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Wed, 19 Sep 2007 06:21:54 -0400
Subject: rpms/authd/devel authd-1.4.3-longopt-identifier.patch, NONE,
	1.1 authd.spec, 1.39, 1.40
Message-ID: <200709191021.l8JALsZc012679@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/authd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12650

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-longopt-identifier.patch 
Log Message:
fixed bug #245436

authd-1.4.3-longopt-identifier.patch:

--- NEW FILE authd-1.4.3-longopt-identifier.patch ---
--- authd-1.4.3/authd.c.old	2007-09-19 11:39:25.000000000 +0200
+++ authd-1.4.3/authd.c	2007-09-19 11:40:02.000000000 +0200
@@ -203,7 +203,7 @@ static char *created_pton_hex(const char
 }
 
 static void create_opt(int argc, char *argv[]) {
-    enum { $_LONGOPT = UCHAR_MAX,       // no short opt value overlap
+    enum { PRE_FIRST_LONGOPT = UCHAR_MAX,       // no short opt value overlap
         CODESET_LONGOPT, IDENT_LONGOPT, FN_LONGOPT, LANG_LONGOPT,
         MAPPED_LONGOPT, OS_LONGOPT, PASSWD_LONGOPT, USERNAME_LONGOPT
     };


Index: authd.spec
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- authd.spec	24 Jul 2006 12:51:59 -0000	1.39
+++ authd.spec	19 Sep 2007 10:21:21 -0000	1.40
@@ -1,8 +1,8 @@
-Summary: a RFC 1413 ident protocol daemon
+Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 9
-License: GPL
+Release: 10
+License: GPLv2
 Group: System Environment/Daemons
 Obsoletes: pidentd
 Provides: pidentd = 3.2
@@ -12,6 +12,7 @@
 Patch1: authd-1.4.3-disable.patch
 Patch2: authd-1.4.3-ipv6-mapping.patch
 Patch3: authd-1.4.3-locale.patch
+Patch4: authd-1.4.3-longopt-identifier.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel gettext
 Prereq: xinetd
@@ -28,6 +29,7 @@
 %patch1 -p1
 %patch2 -p1 -b .ipv6map
 %patch3 -p1 -b .locale
+%patch4 -p1
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -68,6 +70,10 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Wed Sep 19 2007 Ondrej Dvoracek <odvorace at redhat.com> - 1.4.3-10
+- corrected illegal identifier in longopt enumeration (#245436)
+- corrected summary and license
+
 * Mon Jul 24 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-9
 - added locale patch (#199721)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 10:23:14 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 06:23:14 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.110,1.111
Message-ID: <200709191023.l8JANEHa012782@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12709

Modified Files:
	gnome-media.spec 
Log Message:
Fix version/release



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-media.spec	19 Sep 2007 10:10:05 -0000	1.110
+++ gnome-media.spec	19 Sep 2007 10:22:40 -0000	1.111
@@ -11,8 +11,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.20.0
-Release:        2%{?dist}
+Version:        2.20.1
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 10:33:24 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 06:33:24 -0400
Subject: rpms/gsl/devel gsl.spec,1.29,1.30
Message-ID: <200709191033.l8JAXOWY013121@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13073

Modified Files:
	gsl.spec 
Log Message:
update license tag



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gsl.spec	19 Sep 2007 08:10:08 -0000	1.29
+++ gsl.spec	19 Sep 2007 10:32:50 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
@@ -9,7 +9,7 @@
 # info part of this package is under GFDL license
 # eigen/nonsymmv.c and eigen/schur.c
 # contains rutiens which are part of LAPACK - under BSD style license
-License: GPLv2 and GFDL and BSD license 
+License: GPLv3 and GFDL and BSD license 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-2
+- update license tag
+
 * Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-1
 - update to 1.10
 - change license tag



From fedora-extras-commits at redhat.com  Wed Sep 19 10:39:00 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 19 Sep 2007 06:39:00 -0400
Subject: rpms/iptables/F-7 iptables.init,1.13,1.14 iptables.spec,1.48,1.49
Message-ID: <200709191039.l8JAd0uv013342@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13275

Modified Files:
	iptables.init iptables.spec 
Log Message:
- dropped lsb header from init script, delayes start after network
- fixed return values in init script




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iptables.init	28 Aug 2007 15:15:49 -0000	1.13
+++ iptables.init	19 Sep 2007 10:38:26 -0000	1.14
@@ -8,15 +8,6 @@
 # config: /etc/sysconfig/iptables
 # config: /etc/sysconfig/iptables-config
 #
-### BEGIN INIT INFO
-# Provides: iptables
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop iptables firewall
-# Description: Start, stop and save iptables firewall
-### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
@@ -316,7 +307,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	restart
 	RETVAL=$?
 	;;
@@ -335,7 +326,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status|panic|save}"
-	RETVAL=3
+	RETVAL=2
 	;;
 esac
 


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- iptables.spec	28 Aug 2007 15:15:49 -0000	1.48
+++ iptables.spec	19 Sep 2007 10:38:26 -0000	1.49
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
+- dropped lsb header from init script, delayes start after network
+- fixed return values in init script
+
 * Thu Aug 23 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2
 - fixed initscript for LSB conformance (rhbz#246953, rhbz#242459)
 - provide iptc interface again, but unsupported (rhbz#216733)



From fedora-extras-commits at redhat.com  Wed Sep 19 10:45:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:45:49 -0400
Subject: rpms/micq/F-7 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191045.l8JAjnpb013524@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13516

Added Files:
	dead.package 
Removed Files:
	Makefile branch micq-glibc-open.patch micq.spec sources 
Log Message:
Package dropped - renamed to climm



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- branch DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:47:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:47:59 -0400
Subject: rpms/micq/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191047.l8JAlxq0013633@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13626

Added Files:
	dead.package 
Removed Files:
	Makefile branch micq-glibc-open.patch micq.spec sources 
Log Message:
ckage dropped - renamed to climm



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- branch DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 11:02:51 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 07:02:51 -0400
Subject: rpms/cups/devel .cvsignore, 1.34, 1.35 cups-lspp.patch, 1.26,
	1.27 cups.spec, 1.359, 1.360 sources, 1.37,
	1.38 cups-str2512-printcap.patch, 1.1, NONE cups-str2512.patch,
	1.1, NONE
Message-ID: <200709191102.l8JB2pLJ020035@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989

Modified Files:
	.cvsignore cups-lspp.patch cups.spec sources 
Removed Files:
	cups-str2512-printcap.patch cups-str2512.patch 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
- 1.3.2.
- No longer need str2512 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Aug 2007 22:31:26 -0000	1.34
+++ .cvsignore	19 Sep 2007 11:02:14 -0000	1.35
@@ -26,3 +26,4 @@
 cups-1.3rc1-source.tar.bz2
 cups-1.3rc2-source.tar.bz2
 cups-1.3.0-source.tar.bz2
+cups-1.3.2-source.tar.bz2

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cups-lspp.patch	17 Sep 2007 16:10:57 -0000	1.26
+++ cups-lspp.patch	19 Sep 2007 11:02:14 -0000	1.27
@@ -1,177 +1,5 @@
-diff -up cups-1.3.1/filter/common.c.lspp cups-1.3.1/filter/common.c
---- cups-1.3.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.1/filter/common.c	2007-09-17 16:48:23.000000000 +0100
-@@ -30,6 +30,12 @@
-  * Include necessary headers...
-  */
- 
-+#include "config.h"
-+#ifdef WITH_LSPP
-+#define _GNU_SOURCE
-+#include <string.h>
-+#endif /* WITH_LSPP */
-+
- #include "common.h"
- #include <locale.h>
- 
-@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label,	/* I
- {
-   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 */
- 
- 
-  /*
-@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label,	/* I
-     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...
-   */
-@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label,	/* I
-   printf("  %.0f moveto ESPpl show\n", top - 14.0);
-   puts("pop");
-   puts("}bind put");
-+  }
-+#ifdef WITH_LSPP
- }
-+#endif /* WITH_LSPP */
- 
- 
- /*
-diff -up /dev/null cups-1.3.1/config-scripts/cups-lspp.m4
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/config-scripts/cups-lspp.m4	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/config-scripts/cups-lspp.m4	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -209,9 +37,33 @@
 +            ;;
 +    esac
 +fi
-diff -up /dev/null cups-1.3.1/data/mls
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/mls	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/cups/cups.h.lspp	2007-07-13 02:13:26.000000000 +0100
++++ cups-1.3rc2/cups/cups.h	2007-07-31 12:28:32.000000000 +0100
+@@ -15,6 +15,9 @@
+  *   This file is subject to the Apple OS-Developed Software exception.
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
+ #ifndef _CUPS_CUPS_H_
+ #  define _CUPS_CUPS_H_
+ 
+@@ -66,6 +69,12 @@
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
++# ifdef WITH_LSPP
++# define MLS_CONFIG "mls"
++# define TE_CONFIG "te"
++# define SELINUX_CONFIG "SELinux"
++# define UNKNOWN_SL "UNKNOWN SL"
++# endif /* WITH_LSPP */
+ /*
+  * Types and structures...
+  */
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/mls	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -474,9 +326,8 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.1/data/selinux
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/selinux	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/selinux	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -739,10 +590,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.1/data/Makefile.lspp cups-1.3.1/data/Makefile
---- cups-1.3.1/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.1/data/Makefile	2007-09-17 16:48:23.000000000 +0100
-@@ -25,7 +25,10 @@ BANNERS	=	\
+--- cups-1.3rc2/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/data/Makefile	2007-07-31 12:28:32.000000000 +0100
+@@ -25,7 +25,10 @@
  		secret \
  		standard \
  		topsecret \
@@ -754,9 +604,8 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.1/data/te
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/te	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/te	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1019,9 +868,178 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.1/scheduler/client.h.lspp cups-1.3.1/scheduler/client.h
---- cups-1.3.1/scheduler/client.h.lspp	2007-09-12 22:09:49.000000000 +0100
-+++ cups-1.3.1/scheduler/client.h	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/filter/common.c	2007-07-31 12:28:32.000000000 +0100
+@@ -30,6 +30,12 @@
+  * Include necessary headers...
+  */
+ 
++#include "config.h"
++#ifdef WITH_LSPP
++#define _GNU_SOURCE
++#include <string.h>
++#endif /* WITH_LSPP */
++
+ #include "common.h"
+ #include <locale.h>
+ 
+@@ -312,6 +318,18 @@
+ {
+   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 */
+ 
+ 
+  /*
+@@ -334,6 +352,124 @@
+     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...
+   */
+@@ -414,7 +550,10 @@
+   printf("  %.0f moveto ESPpl show\n", top - 14.0);
+   puts("pop");
+   puts("}bind put");
++  }
++#ifdef WITH_LSPP
+ }
++#endif /* WITH_LSPP */
+ 
+ 
+ /*
+--- cups-1.3rc2/scheduler/client.h.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/scheduler/client.h	2007-07-31 12:28:32.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1036,7 +1054,7 @@
  /*
   * HTTP client structure...
   */
-@@ -61,6 +68,10 @@ struct cupsd_client_s
+@@ -62,6 +69,10 @@
  #ifdef HAVE_AUTHORIZATION_H
    AuthorizationRef	authref;	/* Authorization ref */
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1047,7 +1065,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -128,6 +139,9 @@ extern void	cupsdStartListening(void);
+@@ -127,6 +138,9 @@
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1057,9 +1075,8 @@
  
  
  /*
-diff -up cups-1.3.1/scheduler/conf.c.lspp cups-1.3.1/scheduler/conf.c
---- cups-1.3.1/scheduler/conf.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/conf.c	2007-09-17 16:50:08.000000000 +0100
+--- cups-1.3rc2/scheduler/conf.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/conf.c	2007-07-31 12:28:32.000000000 +0100
 @@ -26,6 +26,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1078,9 +1095,9 @@
  
  /*
   * Configuration variable structure...
-@@ -160,6 +164,10 @@ static cupsd_var_t	variables[] =
+@@ -158,6 +162,10 @@
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
-   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
+   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 +#ifdef WITH_LSPP
 +  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
@@ -1088,18 +1105,18 @@
 +#endif /* WITH_LSPP */
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
-   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
+   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_STRING },
+@@ -348,6 +356,9 @@
+ 		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
-   cupsd_policy_t *p;			/* Policy */
 +#ifdef WITH_LSPP
 +  char		*audit_message;		/* Audit message string */
 +#endif /* WITH_LSPP */
  
  
   /*
-@@ -616,6 +627,25 @@ cupsdReadConfiguration(void)
+@@ -609,6 +620,25 @@
  
    RunUser = getuid();
  
@@ -1125,7 +1142,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -890,11 +920,23 @@ cupsdReadConfiguration(void)
+@@ -883,11 +913,23 @@
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1150,7 +1167,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3393,6 +3435,18 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3343,6 +3385,18 @@
    return (0);
  }
  
@@ -1169,9 +1186,8 @@
  
  /*
   * End of "$Id$".
-diff -up cups-1.3.1/scheduler/client.c.lspp cups-1.3.1/scheduler/client.c
---- cups-1.3.1/scheduler/client.c.lspp	2007-08-15 19:36:14.000000000 +0100
-+++ cups-1.3.1/scheduler/client.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/client.c.lspp	2007-07-26 20:08:40.000000000 +0100
++++ cups-1.3rc2/scheduler/client.c	2007-07-31 12:28:32.000000000 +0100
 @@ -39,12 +39,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1187,7 +1203,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
+@@ -76,6 +78,12 @@
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1200,7 +1216,7 @@
  
  /*
   * Local functions...
-@@ -339,6 +347,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -335,6 +343,57 @@
      }
    }
  
@@ -1258,7 +1274,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -721,6 +780,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -717,6 +776,13 @@
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1272,7 +1288,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -1993,6 +2059,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -1989,6 +2055,67 @@
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1340,7 +1356,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4197,6 +4324,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4157,6 +4284,50 @@
  #endif /* HAVE_SSL */
  
  
@@ -1391,9 +1407,8 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.3.1/scheduler/main.c.lspp cups-1.3.1/scheduler/main.c
---- cups-1.3.1/scheduler/main.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/main.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/main.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/main.c	2007-07-31 12:28:32.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -1413,7 +1428,7 @@
  
  /*
   * Local functions...
-@@ -150,6 +155,9 @@ main(int  argc,				/* I - Number of comm
+@@ -150,6 +155,9 @@
    int			launchd_idle_exit;
  					/* Idle exit on select timeout? */
  #endif	/* HAVE_LAUNCHD */
@@ -1422,8 +1437,8 @@
 +#endif /* WITH_LSPP */
  
  
- #ifdef HAVE_GETEUID
-@@ -385,6 +393,25 @@ main(int  argc,				/* I - Number of comm
+  /*
+@@ -368,6 +376,25 @@
  #endif /* DEBUG */
    }
  
@@ -1449,7 +1464,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1094,6 +1121,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1019,6 +1046,11 @@
  
    cupsdStopSelect();
  
@@ -1461,10 +1476,9 @@
    return (!stop_scheduler);
  }
  
-diff -up cups-1.3.1/scheduler/conf.h.lspp cups-1.3.1/scheduler/conf.h
---- cups-1.3.1/scheduler/conf.h.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/conf.h	2007-09-17 16:48:23.000000000 +0100
-@@ -190,6 +190,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.3rc2/scheduler/conf.h.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/conf.h	2007-07-31 12:28:32.000000000 +0100
+@@ -190,6 +190,12 @@
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1477,7 +1491,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -208,6 +214,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -208,6 +214,9 @@
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1487,9 +1501,8 @@
  
  /*
   * Prototypes...
-diff -up cups-1.3.1/scheduler/ipp.c.lspp cups-1.3.1/scheduler/ipp.c
---- cups-1.3.1/scheduler/ipp.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/ipp.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/ipp.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/ipp.c	2007-07-31 12:29:34.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1498,7 +1511,7 @@
   *   check_quotas()              - Check quotas for a printer and user.
   *   copy_attribute()            - Copy a single attribute.
   *   copy_attrs()                - Copy attributes from one request to another.
-@@ -94,6 +95,9 @@
+@@ -93,6 +94,9 @@
   *   validate_user()             - Validate the user for the request.
   */
  
@@ -1508,7 +1521,7 @@
  /*
   * Include necessary headers...
   */
-@@ -117,6 +121,14 @@ extern int mbr_check_membership_by_id(uu
+@@ -120,6 +124,14 @@
  #  endif /* HAVE_MEMBERSHIPPRIV_H */
  #endif /* __APPLE__ */
  
@@ -1523,7 +1536,7 @@
  
  /*
   * Local functions...
-@@ -141,6 +153,9 @@ static void	authenticate_job(cupsd_clien
+@@ -144,6 +156,9 @@
  static void	cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_subscription(cupsd_client_t *con, int id);
@@ -1533,7 +1546,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);
-@@ -1237,6 +1252,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1235,6 +1250,21 @@
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1555,7 +1568,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1423,6 +1453,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1421,6 +1451,104 @@
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1660,7 +1673,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1431,6 +1559,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1429,6 +1557,32 @@
      return (NULL);
    }
  
@@ -1693,7 +1706,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1647,6 +1801,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1645,6 +1799,29 @@
        attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
      }
@@ -1723,7 +1736,7 @@
  
      job->job_sheets = attr;
  
-@@ -1677,6 +1854,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1675,6 +1852,9 @@
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1733,7 +1746,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1695,6 +1875,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1693,6 +1873,9 @@
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, attr->values[0].string.text,
  			 attr->values[1].string.text, job->username);
@@ -1743,7 +1756,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1715,6 +1898,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1713,6 +1896,9 @@
  			    "job-originating-user-name=\"%s\"",
  	        	    job->id, attr->values[0].string.text,
  			    attr->values[1].string.text, job->username);
@@ -1753,7 +1766,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1755,9 +1941,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1753,9 +1939,52 @@
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1806,7 +1819,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3333,6 +3562,103 @@ cancel_subscription(
+@@ -3317,6 +3546,103 @@
  }
  
  
@@ -1910,7 +1923,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -3861,6 +4187,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3845,6 +4171,15 @@
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -1926,7 +1939,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
-@@ -3895,6 +4230,81 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3879,6 +4214,81 @@
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2008,7 +2021,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -3989,6 +4399,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3973,6 +4383,24 @@
        else
          s = attrname;
  
@@ -2033,7 +2046,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5858,6 +6286,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5694,6 +6122,22 @@
      return;
    }
  
@@ -2056,7 +2069,7 @@
   /*
    * Copy attributes...
    */
-@@ -6057,6 +6501,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -5893,6 +6337,11 @@
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2068,7 +2081,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10080,6 +10529,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -9881,6 +10330,11 @@
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2080,9 +2093,8 @@
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.3.1/scheduler/job.c.lspp cups-1.3.1/scheduler/job.c
---- cups-1.3.1/scheduler/job.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/job.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/job.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/job.c	2007-07-31 12:28:32.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2108,7 +2120,7 @@
  
  /*
   * Local globals...
-@@ -1077,6 +1088,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+@@ -1063,6 +1074,23 @@
      return;
    }
  
@@ -2132,7 +2144,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1430,6 +1458,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1416,6 +1444,13 @@
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2146,7 +2158,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1448,6 +1483,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1434,6 +1469,76 @@
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2223,7 +2235,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2456,6 +2561,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2446,6 +2551,21 @@
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2245,7 +2257,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2707,6 +2827,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2697,6 +2817,106 @@
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2352,7 +2364,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2851,6 +3071,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2837,6 +3057,18 @@
  	  banner_page)
          continue;
  
@@ -2371,7 +2383,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3067,6 +3299,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3053,6 +3285,67 @@
      envp[envc ++] = final_content_type;
    }
  
@@ -2439,9 +2451,8 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -up cups-1.3.1/scheduler/printers.c.lspp cups-1.3.1/scheduler/printers.c
---- cups-1.3.1/scheduler/printers.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/printers.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/printers.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/printers.c	2007-07-31 12:28:32.000000000 +0100
 @@ -50,6 +50,8 @@
   *                                 printing desktop tools.
   */
@@ -2451,7 +2462,7 @@
  /*
   * Include necessary headers...
   */
-@@ -73,6 +75,10 @@ static void	write_irix_config(cupsd_prin
+@@ -73,6 +75,10 @@
  static void	write_irix_state(cupsd_printer_t *p);
  #endif /* __sgi */
  
@@ -2462,7 +2473,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1709,6 +1715,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1700,6 +1706,13 @@
  		{			/* No authentication */
  		  "none"
  		};
@@ -2476,7 +2487,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1852,6 +1865,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1843,6 +1856,44 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2521,9 +2532,8 @@
    }
  
    p->raw    = 0;
-diff -up cups-1.3.1/scheduler/job.h.lspp cups-1.3.1/scheduler/job.h
---- cups-1.3.1/scheduler/job.h.lspp	2007-08-01 20:02:47.000000000 +0100
-+++ cups-1.3.1/scheduler/job.h	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/job.h.lspp	2007-07-12 23:58:17.000000000 +0100
++++ cups-1.3rc2/scheduler/job.h	2007-07-31 12:28:32.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2538,8 +2548,8 @@
  /*
   * Job request structure...
   */
-@@ -60,6 +67,10 @@ typedef struct cupsd_job_s
-   krb5_ccache		ccache;		/* Kerberos credential cache */
+@@ -59,6 +66,10 @@
+ #ifdef HAVE_GSSAPI
    char			*ccname;	/* KRB5CCNAME environment variable */
  #endif /* HAVE_GSSAPI */
 +#ifdef WITH_LSPP
@@ -2549,36 +2559,9 @@
  } cupsd_job_t;
  
  
-diff -up cups-1.3.1/cups/cups.h.lspp cups-1.3.1/cups/cups.h
---- cups-1.3.1/cups/cups.h.lspp	2007-08-27 22:13:35.000000000 +0100
-+++ cups-1.3.1/cups/cups.h	2007-09-17 16:48:23.000000000 +0100
-@@ -15,6 +15,9 @@
-  *   This file is subject to the Apple OS-Developed Software exception.
-  */
- 
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
- #ifndef _CUPS_CUPS_H_
- #  define _CUPS_CUPS_H_
- 
-@@ -66,6 +69,12 @@ extern "C" {
- #  define CUPS_DATE_ANY		-1
- 
- 
-+# ifdef WITH_LSPP
-+# define MLS_CONFIG "mls"
-+# define TE_CONFIG "te"
-+# define SELINUX_CONFIG "SELinux"
-+# define UNKNOWN_SL "UNKNOWN SL"
-+# endif /* WITH_LSPP */
- /*
-  * Types and structures...
-  */
-diff -up cups-1.3.1/Makedefs.in.lspp cups-1.3.1/Makedefs.in
---- cups-1.3.1/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
-+++ cups-1.3.1/Makedefs.in	2007-09-17 16:48:23.000000000 +0100
-@@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
+--- cups-1.3rc2/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
++++ cups-1.3rc2/Makedefs.in	2007-07-31 12:28:32.000000000 +0100
+@@ -134,7 +134,7 @@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
@@ -2587,10 +2570,9 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
-diff -up cups-1.3.1/config.h.in.lspp cups-1.3.1/config.h.in
---- cups-1.3.1/config.h.in.lspp	2007-09-08 01:28:06.000000000 +0100
-+++ cups-1.3.1/config.h.in	2007-09-17 16:48:23.000000000 +0100
-@@ -552,6 +552,13 @@
+--- cups-1.3rc2/config.h.in.lspp	2007-07-25 01:40:03.000000000 +0100
++++ cups-1.3rc2/config.h.in	2007-07-31 12:28:32.000000000 +0100
+@@ -537,6 +537,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -2604,10 +2586,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up cups-1.3.1/configure.in.lspp cups-1.3.1/configure.in
---- cups-1.3.1/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.1/configure.in	2007-09-17 16:48:23.000000000 +0100
-@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
+--- cups-1.3rc2/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3rc2/configure.in	2007-07-31 12:28:32.000000000 +0100
+@@ -42,6 +42,8 @@
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- cups.spec	18 Sep 2007 15:34:06 -0000	1.359
+++ cups.spec	19 Sep 2007 11:02:14 -0000	1.360
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -37,9 +37,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
-Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
-Patch17: cups-str2512-printcap.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -148,9 +146,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
-%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
-%patch17 -p1 -b .str2512-printcap
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -443,6 +439,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
+- 1.3.2.
+- No longer need str2512 patches.
+
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
 - Write printcap when a remote queue is deleted (bug #290831).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	17 Sep 2007 16:10:57 -0000	1.37
+++ sources	19 Sep 2007 11:02:14 -0000	1.38
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-89ec473d48598cde9b2030743b15448b  cups-1.3.1-source.tar.bz2
+0f5f95847d7ca209da25936e47699bfe  cups-1.3.2-source.tar.bz2


--- cups-str2512-printcap.patch DELETED ---


--- cups-str2512.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 11:07:50 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 07:07:50 -0400
Subject: rpms/nut/EL-4 nut.spec,1.48,1.49
Message-ID: <200709191107.l8JB7oZQ020110@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20084

Modified Files:
	nut.spec 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.2
- fix building of cgi package on x86_64



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nut.spec	19 Sep 2007 07:50:56 -0000	1.48
+++ nut.spec	19 Sep 2007 11:07:11 -0000	1.49
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 3.1%{?dist}
+Release: 3.2%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,6 @@
 BuildRequires: libjpeg-devel
 BuildRequires: fontconfig-devel
 BuildRequires: pkgconfig
-BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 
 %ifnarch s390 s390x
@@ -110,6 +109,9 @@
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
     --disable-static
+%ifarch x86_64
+    --with-gd-libs="-L/usr/X11R6/lib64 -lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+%endif
 
 make %{?_smp_mflags}
 
@@ -292,6 +294,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.2
+- fix building of cgi package on x86_64
+
 * Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
 - fix manpages encodings
 - run ldconfig after client (un)install



From fedora-extras-commits at redhat.com  Wed Sep 19 11:18:32 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 07:18:32 -0400
Subject: rpms/nut/EL-4 nut.spec,1.49,1.50
Message-ID: <200709191118.l8JBIW6s020363@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20344

Modified Files:
	nut.spec 
Log Message:
fix typo in spec file


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nut.spec	19 Sep 2007 11:07:11 -0000	1.49
+++ nut.spec	19 Sep 2007 11:17:58 -0000	1.50
@@ -108,7 +108,7 @@
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
-    --disable-static
+    --disable-static \
 %ifarch x86_64
     --with-gd-libs="-L/usr/X11R6/lib64 -lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
 %endif



From fedora-extras-commits at redhat.com  Wed Sep 19 11:28:46 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 07:28:46 -0400
Subject: rpms/cups/devel dnssd,NONE,1.1 cups.spec,1.360,1.361
Message-ID: <200709191128.l8JBSkVL020607@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20582

Modified Files:
	cups.spec 
Added Files:
	dnssd 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
- Include Till Kamppeter's dnssd backend.



--- NEW FILE dnssd ---
#!/usr/bin/perl
# The above Perl path may vary on your system; fix it!!! -*- perl -*-

# dnssd - Search for network printers with the avahi-browse command
#         (Zeroconf, DNS-SD)

# Printer discovery CUPS backend (like the SNMP backend)
# See also http://qa.mandriva.com/show_bug.cgi?id=21812

# Copyright 2007 Till Kamppeter <till.kamppeter at gmail.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
#  USA.

# Usage: 
#
# cp dnssd /usr/lib/cups/backend/
# chmod 755 /usr/lib/cups/backend/dnssd
# killall -HUP cupsd (or "/etc/init.d/cups restart", CUPS 1.1.x only)
# lpinfo -v (or use any printer setup tool)

#use strict;

$0 =~ m!^(.*)/([^/]+)\s*$!;
my $progname = ($2 || $0 || "dnssd");
my $progpath = ($1 || "/usr/lib/cups/backend");

if ($ARGV[0]){
    die "This backend is only for printer discovery, not for actual printing.\n";
}

my $avahicmd = "avahi-browse -k -t -v -r -a 2> /dev/null";

# IPs which are for computers, consider their printer entries as queues
# set up with the local printing system (CUPS, LPD, Windows/Samba SMB, ...)
my @ipblacklist = ();
my $output;
my ($interface, $nettype, $ip, $host, $make, $model, $description, $cmd, $makemodel, $deviceid, $protocol, $port, $uriext, $uri);

open (AVAHI, "$avahicmd |") or die "Could not call \"$avahicmd\"\n";
while (my $line = <AVAHI>) {
    chomp ($line);
    if ($line =~ /^\s*=\s+(\S+)\s+(\S+)\s+(.*?)\s+(\S+)\s+(\S+)\s*$/) {
	# New item
	$interface = $1;
	$nettype = $2;
	my $itemname = $3;
	my $protocolinfo = $4;
        if ($protocolinfo =~ /_workstation/) {
	    $protocol = "computer";
	} elsif ($protocolinfo =~ /_pdl-datastream/) {
	    $protocol = "socket";
	} elsif ($protocolinfo =~ /_printer/) {
	    $protocol = "lpd";
	} elsif ($protocolinfo =~ /_ipp/) {
	    $protocol = "ipp";
	}
    } elsif ($line =~ /^\s*hostname\s*=\s*\[([^\]]+)\]\s*$/) {
	$host = $1;
	$host =~ s/\.local\.?$//;
    } elsif ($line =~ /^\s*address\s*=\s*\[([^\]]+)\]\s*$/) {
	$ip = $1;
	if ($protocol eq "computer") {
	    push (@ipblacklist, $ip);
	    $protocol = "";
	}
    } elsif ($line =~ /^\s*port\s*=\s*\[([^\]]+)\]\s*$/) {
	$port = $1;
    } elsif ($line =~ /^\s*txt\s*=\s*\[(.+)\]\s*$/) {
	my $info = $1;
	if ($protocol) {
	    my ($ty, $product, $pdls, $usb_MFG, $usb_MDL, $usb_DES, $usb_CMD) = 
		("", "", "", "", "", "", "");
	    while ($info =~ s/^\s*\"([^\"]+)\"\s*//) {
		my $infoitem = $1;
		if ($infoitem =~ /^([^=]*)=(.*)$/) {
		    my $field = $1;
		    my $content = $2;
		    if ($field eq "ty") {
			$ty = $content;
		    } elsif ($field eq "product") {
			$product = $content;
			$product =~ s/^\((.*)\)$/$1/;
		    } elsif ($field eq "usb_MFG") {
			$usb_MFG = $content;
		    } elsif ($field eq "usb_MDL") {
			$usb_MDL = $content;
		    } elsif ($field eq "usb_DES") {
			$usb_DES = $content;
		    } elsif ($field eq "usb_CMD") {
			$usb_CMD = $content;
		    } elsif ($field eq "rp") {
			$uriext = $content;
		    } elsif ($field eq "pdl") {
			while ($content =~ s/^\s*([^\,]+?)\s*\,\s*//) {
			    my $i = $1;
			    if ($i =~ m!\b(postscript|ps)\b!i) {
				$pdls .= "POSTSCRIPT,";
			    } elsif ($i =~ m!\b(pdf)\b!i) {
				$pdls .= "PDF,";
			    } elsif ($i =~ m!\b(pcl6|pclxl|pxl)\b!i) {
				$pdls .= "PCLXL,";
			    } elsif ($i =~ m!\b(pcl[345][ce]?|pcl)\b!i) {
				$pdls .= "PCL,";
			    }
			}
			$pdls =~ s/\,$//;
		    }
		}
	    }
	    $usb_MDL ||= $ty;
	    $usb_DES ||= $product;
	    if ($usb_MFG) {
		$make = $usb_MFG;
	    } elsif ($usb_DES =~ /^KONICA\s+MINOLTA\b/i) { 
		$make = "KONICA MINOLTA";
	    } elsif ($usb_DES) {
		$usb_DES =~ /^\s*(\S*)\b/;
		$make = $1;
	    }
	    $model = $usb_MDL;
	    if (!$model) {
		$usb_DES =~ /^\s*\S*\s*(.*)$/;
		$model = $1;
	    }
	    $usb_CMD ||= $pdls;
	    my $extra;
	    if ($protocol eq "socket") {
		$uri = "socket://$ip:$port";
		$extra = "Port $port";
	    } elsif ($protocol eq "lpd") {
		$uri = "lpd://$ip" . ($uriext ? "/$uriext" : "");
		$extra = ($uriext ? "Queue: $uriext" : "Default queue");
	    } elsif ($protocol eq "ipp") {
		$uri = "ipp://$ip:$port" . ($uriext ? "/$uriext" : "");
		$extra = ($uriext ? "Queue: $uriext" : "Default queue");
	    }
	    if ($make && $model) {
		$make =~ s/Hewlett.?Packard/HP/i;
		$make =~ s/Lexmark.?International/Lexmark/i;
		$model =~ s/Hewlett.?Packard/HP/i;
		$model =~ s/Lexmark.?International/Lexmark/i;
		while ($model =~ s/^\s*$make\s*//i) {};
		$makemodel = "$make $model";
	    } elsif ($usb_DES) {
		$makemodel = $usb_DES;
	    } else {
		$makemodel = "Unknown";
	    }
	    $deviceid = ($usb_MFG ? "MFG:$usb_MFG;" : "") .
		($usb_MDL ? "MDL:$usb_MDL;" : "") .
		($usb_DES ? "DES:$usb_DES;" : "") .
		($usb_CMD ? "CMD:$usb_CMD;" : "");
	    $deviceid .= "CLS:PRINTER;" if $deviceid;
	    $output->{$ip}{$protocol}{$extra} =
		"network $uri \"$makemodel\" \"$makemodel $ip ($extra)\" \"$deviceid\"\n";
	    ($interface, $nettype, $ip, $host, $make, $model, $description, $cmd, $makemodel, $deviceid, $protocol, $port, $uriext, $uri) =
		("", "", "", "", "", "", "", "", "", "", "", "", "", "");
	}
    }
}

foreach my $ip (keys(%{$output})) {
    next if member($ip, @ipblacklist);
    if ($output->{$ip}{"socket"}) {
	foreach my $extra (keys(%{$output->{$ip}{"socket"}})) {
	    if (keys(%{$output->{$ip}{"socket"}}) = 1) {
		$output->{$ip}{"socket"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"\(]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"socket"}{$extra};
	}
    } elsif ($output->{$ip}{"lpd"}) {
	foreach my $extra (keys(%{$output->{$ip}{"lpd"}})) {
	    if (keys(%{$output->{$ip}{"lpd"}}) = 1) {
		$output->{$ip}{"lpd"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"\(]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"lpd"}{$extra};
	}
    } elsif ($output->{$ip}{"ipp"}) {
	foreach my $extra (keys(%{$output->{$ip}{"ipp"}})) {
	    if (keys(%{$output->{$ip}{"ipp"}}) == 1) {
		$output->{$ip}{"ipp"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"ipp"}{$extra};
	}
    }
}

exit 0;

# member( $a, @b ) returns 1 if $a is in @b, 0 otherwise.
sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 };


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- cups.spec	19 Sep 2007 11:02:14 -0000	1.360
+++ cups.spec	19 Sep 2007 11:28:11 -0000	1.361
@@ -12,6 +12,7 @@
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: http://www.openprinting.org/download/printing/dnssd
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -184,6 +185,9 @@
 
 make BUILDROOT=$RPM_BUILD_ROOT install 
 
+# Include Till Kamppeter's dnssd backend.
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{cups_serverbin}/backend/dnssd
+
 # Serial backend needs to run as root (bug #212577).
 chmod 700 $RPM_BUILD_ROOT%{cups_serverbin}/backend/serial
 
@@ -440,6 +444,7 @@
 
 %changelog
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
+- Include Till Kamppeter's dnssd backend.
 - 1.3.2.
 - No longer need str2512 patches.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:12 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:12 -0700
Subject: [pkgdb] wvdial Owned
Message-ID: <200709191129.l8JBTDC3011873@app4.fedora.phx.redhat.com>

Package wvdial in Fedora devel is now owned by Ondrej Vasik (ovasik)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:14 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:14 -0700
Subject: [pkgdb] wvdial Owned
Message-ID: <200709191129.l8JBTEbH019185@app3.fedora.phx.redhat.com>

Package wvdial in Fedora 7 is now owned by Ondrej Vasik (ovasik)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:33 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:33 -0700
Subject: [pkgdb] libwvstreams Owned
Message-ID: <200709191129.l8JBTXpS019268@app3.fedora.phx.redhat.com>

Package libwvstreams in Fedora devel is now owned by Ondrej Vasik (ovasik)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:35 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:35 -0700
Subject: [pkgdb] libwvstreams Owned
Message-ID: <200709191129.l8JBTZUf011989@app4.fedora.phx.redhat.com>

Package libwvstreams in Fedora 7 is now owned by Ondrej Vasik (ovasik)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 11:39:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 07:39:30 -0400
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.40,1.41
Message-ID: <200709191139.l8JBdUAG020972@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20954

Modified Files:
	kipi-plugins.spec 
Log Message:
* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-4
- rebuild against libkdcraw libkexiv2



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kipi-plugins.spec	25 Aug 2007 12:31:27 -0000	1.40
+++ kipi-plugins.spec	19 Sep 2007 11:38:57 -0000	1.41
@@ -4,7 +4,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -15,9 +15,9 @@
 BuildRequires: gettext
 BuildRequires: kdelibs-devel
 BuildRequires: libkipi-devel >= 0.1.5
-BuildRequires: libkdcraw-devel >= 0.1.1
-BuildRequires: libkexiv2-devel >= 0.1.5
-BuildRequires: exiv2-devel >= 0.14
+BuildRequires: libkdcraw-devel >= 0.1.2
+BuildRequires: libkexiv2-devel >= 0.1.6
+BuildRequires: exiv2-devel 
 %if 0%{?fedora} > 6
 %define _with_libgpod --with-libgpod
 BuildRequires: libgpod-devel >= 0.4.2, glib2-devel
@@ -36,7 +36,7 @@
 ## jpeglossless plugin 
 Requires: ImageMagick 
 
-## Technically, optional bits, but nice to have
+## optional bits
 # wallpaper plugin
 #Requires(hint): kdebase 
 # cdarchiver plugin
@@ -170,7 +170,10 @@
 
 
 %changelog
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org>  0.1.4-3
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-4
+- rebuild against libkdcraw libkexiv2
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-3
 - License: GPLv2+
 
 * Tue Aug 21 2007 Todd Zullinger <tmz at pobox.com> 0.1.4-2



From fedora-extras-commits at redhat.com  Wed Sep 19 11:50:02 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 07:50:02 -0400
Subject: rpms/texinfo/devel texinfo-4.11-zlib.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 sources, 1.11, 1.12 texinfo.spec, 1.43,
	1.44 texinfo-4.8-0xA0.patch, 1.1, NONE texinfo-4.8-zlib.patch,
	1.1, NONE texinfo-4.9-texindex.patch, 1.1, NONE
Message-ID: <200709191150.l8JBo2sl021236@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202

Modified Files:
	.cvsignore sources texinfo.spec 
Added Files:
	texinfo-4.11-zlib.patch 
Removed Files:
	texinfo-4.8-0xA0.patch texinfo-4.8-zlib.patch 
	texinfo-4.9-texindex.patch 
Log Message:
Rebase to upstream texinfo-4.11, Resolves: #295441

texinfo-4.11-zlib.patch:

--- NEW FILE texinfo-4.11-zlib.patch ---
--- texinfo-4.11/util/Makefile.in_old	2007-09-10 02:37:45.000000000 +0200
+++ texinfo-4.11/util/Makefile.in	2007-09-19 10:29:06.000000000 +0200
@@ -110,7 +110,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
 am__DEPENDENCIES_1 =
 ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
 	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
--- texinfo-4.11/util/install-info.c_old	2007-07-01 23:20:33.000000000 +0200
+++ texinfo-4.11/util/install-info.c	2007-09-19 10:40:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "system.h"
 #include <getopt.h>
 #include <regex.h>
+#include <zlib.h>
 
 static char *progname = "install-info";
 
@@ -559,7 +560,7 @@
    COMPRESSION_PROGRAM.  The compression program is determined by the
    magic number, not the filename.  */
 
-FILE *
+void *
 open_possibly_compressed_file (char *filename,
     void (*create_callback) (char *),
     char **opened_filename, char **compression_program, int *is_pipe) 
@@ -567,7 +568,7 @@
   char *local_opened_filename, *local_compression_program;
   int nread;
   char data[4];
-  FILE *f;
+  gzFile *f;
 
   /* We let them pass NULL if they don't want this info, but it's easier
      to always determine it.  */
@@ -575,16 +576,16 @@
     opened_filename = &local_opened_filename;
 
   *opened_filename = filename;
-  f = fopen (*opened_filename, FOPEN_RBIN);
+  f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       *opened_filename = concat (filename, ".gz", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       free (*opened_filename);
       *opened_filename = concat (filename, ".bz2", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
     }
 
 #ifdef __MSDOS__
@@ -592,13 +593,13 @@
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".igz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
       if (!f)
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".inz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
 #endif
       if (!f)
@@ -610,7 +611,7 @@
               /* And try opening it again.  */
               free (*opened_filename);
               *opened_filename = filename;
-              f = fopen (*opened_filename, FOPEN_RBIN);
+              f = gzopen (*opened_filename, FOPEN_RBIN);
               if (!f)
                 pfatal_with_name (filename);
             }
@@ -621,12 +622,12 @@
 
   /* Read first few bytes of file rather than relying on the filename.
      If the file is shorter than this it can't be usable anyway.  */
-  nread = fread (data, sizeof (data), 1, f);
-  if (nread != 1)
+  nread = gzread (f, data, sizeof (data));
+  if (nread != sizeof (data))
     {
       /* Empty files don't set errno, so we get something like
          "install-info: No error for foo", which is confusing.  */
-      if (nread == 0)
+      if (nread >= 0)
         fatal (_("%s: empty file"), *opened_filename, 0);
       pfatal_with_name (*opened_filename);
     }
@@ -659,20 +660,22 @@
 
   if (*compression_program)
     { /* It's compressed, so fclose the file and then open a pipe.  */
+      FILE *p;
       char *command = concat (*compression_program," -cd <", *opened_filename);
-      if (fclose (f) < 0)
+      if (gzclose (f) < 0)
         pfatal_with_name (*opened_filename);
-      f = popen (command, "r");
-      if (f)
+      p = popen (command, "r");
+      if (p)
         *is_pipe = 1;
       else
         pfatal_with_name (command);
+      return p;
     }
   else
     { /* It's a plain file, seek back over the magic bytes.  */
-      if (fseek (f, 0, 0) < 0)
+      if (gzseek (f, 0, SEEK_SET) < 0)
         pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
       /* Since this is a text file, and we opened it in binary mode,
          switch back to text mode.  */
       f = freopen (*opened_filename, "r", f);
@@ -697,7 +700,7 @@
     char **compression_program)
 {
   char *real_name;
-  FILE *f;
+  void *f;
   int pipe_p;
   int filled = 0;
   int data_size = 8192;
@@ -711,7 +714,12 @@
 
   for (;;)
     {
-      int nread = fread (data + filled, 1, data_size - filled, f);
+      int nread;
+      
+      if (pipe_p)
+       nread = fread (data + filled, 1, data_size - filled, f);
+      else
+       nread = gzread (f, data + filled, data_size - filled);
       if (nread < 0)
         pfatal_with_name (real_name);
       if (nread == 0)
@@ -733,7 +741,7 @@
   if (pipe_p)
     pclose (f);
   else
-    fclose (f);
+    gzclose (f);
 
   *sizep = filled;
   return data;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Jul 2007 08:24:25 -0000	1.11
+++ .cvsignore	19 Sep 2007 11:49:29 -0000	1.12
@@ -1,3 +1,4 @@
 texinfo-4.7.tar.bz2
 texinfo-4.8.tar.bz2
 texinfo-4.9.tar.bz2
+texinfo-4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Jul 2007 08:24:25 -0000	1.11
+++ sources	19 Sep 2007 11:49:29 -0000	1.12
@@ -1 +1 @@
-f4458e4b81e5469fa0815c35654141ab  texinfo-4.9.tar.bz2
+c6bf13df4fbeff8ce874aacd6a51e814  texinfo-4.11.tar.bz2


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- texinfo.spec	28 Aug 2007 11:08:32 -0000	1.43
+++ texinfo.spec	19 Sep 2007 11:49:29 -0000	1.44
@@ -1,16 +1,14 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 4.9
-Release: 2%{?dist}
+Version: 4.11
+Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
 Source1: info-dir
 Source2: texi2pdf.man
-Patch0: texinfo-4.8-zlib.patch
-Patch1: texinfo-4.9-texindex.patch
-Patch2: texinfo-4.8-0xA0.patch
+Patch0: texinfo-4.11-zlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -61,8 +59,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .zlib
-%patch1 -p1 -b .texindex
-%patch2 -p1 -b .0xA0
 
 %build
 
@@ -140,6 +136,11 @@
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Wed Sep 19 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
+- Rebase to upstream texinfo-4.11 (update zlib.patch, drop
+  texindex.patch and 0xA0.patch -- both included in upstream)
+  Resolves: #295441
+
 * Tue Aug 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.9-2
 - Fix license
 - Rebuild


--- texinfo-4.8-0xA0.patch DELETED ---


--- texinfo-4.8-zlib.patch DELETED ---


--- texinfo-4.9-texindex.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 12:00:37 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 08:00:37 -0400
Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.6,
	1.7 libgnomecanvasmm.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <200709191200.l8JC0bVh021844@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21813

Modified Files:
	.cvsignore libgnomecanvasmm.spec sources 
Log Message:
Update to new stable branch 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2006 18:16:41 -0000	1.6
+++ .cvsignore	19 Sep 2007 12:00:04 -0000	1.7
@@ -1 +1 @@
-libgnomecanvasmm-2.16.0.tar.bz2
+libgnomecanvasmm-2.20.0.tar.bz2


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libgnomecanvasmm.spec	28 Aug 2007 22:30:32 -0000	1.14
+++ libgnomecanvasmm.spec	19 Sep 2007 12:00:04 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libgnomecanvasmm26
-Version:        2.16.0
-Release:        3%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable branch 2.20
+
 * Tue Aug 28 2007 Stepan Kasal <skasal at redhat.com> - 2.16.0-3
 - Fix typo in description.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2006 18:16:41 -0000	1.6
+++ sources	19 Sep 2007 12:00:04 -0000	1.7
@@ -1 +1 @@
-fe54d7f437d03044f863672d6dd38e9f  libgnomecanvasmm-2.16.0.tar.bz2
+2a7cdcfd093db49c41e455e7b744e1c2  libgnomecanvasmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 12:03:56 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 08:03:56 -0400
Subject: rpms/texinfo/devel texinfo.spec,1.44,1.45
Message-ID: <200709191203.l8JC3uJx027909@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27864

Modified Files:
	texinfo.spec 
Log Message:
add pdftexi2dvi to files


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- texinfo.spec	19 Sep 2007 11:49:29 -0000	1.44
+++ texinfo.spec	19 Sep 2007 12:03:24 -0000	1.45
@@ -131,6 +131,7 @@
 %{_bindir}/texindex
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
+%{_bindir}/pdftexi2dvi
 %{_mandir}/man1/texindex.1*
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*



From fedora-extras-commits at redhat.com  Wed Sep 19 12:06:30 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 19 Sep 2007 08:06:30 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, 1.1,
	1.2 evolution.spec, 1.291, 1.292
Message-ID: <200709191206.l8JC6UgP028004@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27977

Modified Files:
	evolution-2.11.92-icon-names.patch evolution.spec 
Log Message:

* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
- Revise patch for GNOME bug #477045 (less-zealous icon renaming).


evolution-2.11.92-icon-names.patch:

Index: evolution-2.11.92-icon-names.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.11.92-icon-names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.11.92-icon-names.patch	15 Sep 2007 21:38:15 -0000	1.1
+++ evolution-2.11.92-icon-names.patch	19 Sep 2007 12:06:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
---- evolution-2.11.92/mail/em-folder-browser.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-browser.c.icon-names evolution-2.12.0/mail/em-folder-browser.c
+--- evolution-2.12.0/mail/em-folder-browser.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-browser.c	2007-09-19 07:14:51.000000000 -0400
 @@ -206,7 +206,7 @@ enum {
  /* Options for View */
  static EMFBSearchBarItem emfb_view_items[] = {
@@ -25,9 +25,9 @@
  /* 	{ NULL, 0, NULL }, */
  /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
  	{{ NULL, -1, 0 }, NULL}
-diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
---- evolution-2.11.92/mail/em-folder-tree.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-tree.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-tree.c.icon-names evolution-2.12.0/mail/em-folder-tree.c
+--- evolution-2.12.0/mail/em-folder-tree.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-tree.c	2007-09-19 07:14:51.000000000 -0400
 @@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
  	guint32 flags;
  	
@@ -69,201 +69,9 @@
  
  	
  	{ E_POPUP_BAR, "80.emc" },
-diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
---- evolution-2.11.92/mail/mail.error.xml.icon-names	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.92/mail/mail.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -16,14 +16,14 @@
-     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
- {0}
- Send anyway?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message without a subject?</_primary>
-     <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -32,14 +32,14 @@ Send anyway?</_secondary>
-     <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
- 
- Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
-     <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -51,36 +51,36 @@ Many email systems add an Apparently-To 
-   <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Use default drafts folder?</_primary>
-     <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to open {0} messages at once?</_primary>
-     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
-     <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
-     <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+    <button stock="application-exit" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="async-error" type="error">
-@@ -99,8 +99,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-warning" type="warning">
-@@ -109,8 +109,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-error" type="info">
-@@ -119,15 +119,15 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
-     <_primary>Enter password.</_primary>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="filter-load-error" type="error">
-@@ -179,15 +179,15 @@ Many email systems add an Apparently-To 
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
-     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="no-rename-folder-exists" type="error">
-@@ -239,7 +239,7 @@ Many email systems add an Apparently-To 
-     <_title>Delete account?</_title>
-     <_primary>Are you sure you want to delete this account?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not d_elete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -248,7 +248,7 @@ Many email systems add an Apparently-To 
-     <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information and
- all proxy information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -275,8 +275,8 @@ all proxy information will be deleted pe
-     <_primary>Do you wish to save your changes?</_primary>
-     <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
-     <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="document-save" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="vfolder-notexist" type="error">
-@@ -329,9 +329,9 @@ Either by selecting the folders individu
-     <_secondary xml:space="preserve">A non-empty folder at &quot;{1}&quot; already exists.
- 
- You can choose to ignore this folder, overwrite or append its contents, or quit.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Ignore" response="GTK_RESPONSE_REJECT"/>
--    <button stock="gtk-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-+    <button stock="edit-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-     <button _label="_Append" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-@@ -344,7 +344,7 @@ You can choose to ignore this folder, ov
-     <_title>Querying server</_title>
-     <_primary>Please wait.</_primary>
-     <_secondary xml:space="preserve">Querying server for a list of supported authentication mechanisms.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   </error>
- 
-   <error id="gw-accountsetup-error" type="error">
-diff -up evolution-2.11.92/mail/message-list.c.icon-names evolution-2.11.92/mail/message-list.c
---- evolution-2.11.92/mail/message-list.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/message-list.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/message-list.c.icon-names evolution-2.12.0/mail/message-list.c
+--- evolution-2.12.0/mail/message-list.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/message-list.c	2007-09-19 07:14:51.000000000 -0400
 @@ -217,9 +217,9 @@ static struct {
  	char *icon_name;
  	GdkPixbuf  *pixbuf;
@@ -277,9 +85,9 @@
  	{ "stock_mail-unread-multiple",        NULL },
  	{ "stock_mail-open-multiple",          NULL },
  	{ NULL,                                NULL },
-diff -up evolution-2.11.92/mail/mail-mt.c.icon-names evolution-2.11.92/mail/mail-mt.c
---- evolution-2.11.92/mail/mail-mt.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-mt.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/mail-mt.c.icon-names evolution-2.12.0/mail/mail-mt.c
+--- evolution-2.12.0/mail/mail-mt.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-mt.c	2007-09-19 07:14:51.000000000 -0400
 @@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m
  			data->activity_state = 1;
  			
@@ -289,9 +97,9 @@
  			
  			MAIL_MT_UNLOCK (mail_msg_lock);
  			if (msg->info->desc)
-diff -up evolution-2.11.92/mail/em-folder-view.c.icon-names evolution-2.11.92/mail/em-folder-view.c
---- evolution-2.11.92/mail/em-folder-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-view.c.icon-names evolution-2.12.0/mail/em-folder-view.c
+--- evolution-2.12.0/mail/em-folder-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-view.c	2007-09-19 07:17:18.000000000 -0400
 @@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current
  /* TODO: Move some of these to be 'standard' menu's */
  
@@ -416,9 +224,9 @@
  
  	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
  	{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
-diff -up evolution-2.11.92/mail/em-popup.c.icon-names evolution-2.11.92/mail/em-popup.c
---- evolution-2.11.92/mail/em-popup.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-popup.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-popup.c.icon-names evolution-2.12.0/mail/em-popup.c
+--- evolution-2.12.0/mail/em-popup.c.icon-names	2007-09-16 15:17:46.000000000 -0400
++++ evolution-2.12.0/mail/em-popup.c	2007-09-19 07:17:27.000000000 -0400
 @@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop
  }
  
@@ -460,13 +268,13 @@
 -	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO },
 -	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO },
 +	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO },
-+	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "list-add", EM_POPUP_URI_MAILTO },
++	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "edit-add", EM_POPUP_URI_MAILTO },
  };
  
  /* ********************************************************************** */
-diff -up evolution-2.11.92/mail/mail-send-recv.c.icon-names evolution-2.11.92/mail/mail-send-recv.c
---- evolution-2.11.92/mail/mail-send-recv.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-send-recv.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/mail-send-recv.c.icon-names evolution-2.12.0/mail/mail-send-recv.c
+--- evolution-2.12.0/mail/mail-send-recv.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-send-recv.c	2007-09-19 07:14:51.000000000 -0400
 @@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca
  	gtk_widget_show (cancel_button);
  	gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
@@ -485,61 +293,10 @@
  		pretty_url = format_url (destination, NULL);
  		label = gtk_label_new (NULL);
  		gtk_label_set_ellipsize (
-diff -up evolution-2.11.92/mail/em-format-html-display.c.icon-names evolution-2.11.92/mail/em-format-html-display.c
---- evolution-2.11.92/mail/em-format-html-display.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-format-html-display.c	2007-09-15 16:53:46.000000000 -0400
-@@ -2322,7 +2322,7 @@ efhd_add_bar(EMFormatHTML *efh, GtkHTMLE
- 	priv->label = gtk_label_new(_("No Attachment"));
- 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->label), priv->arrow);
- 	save = gtk_button_new();
--	image = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
-+	image = gtk_image_new_from_stock ("document-save", GTK_ICON_SIZE_BUTTON);
- 	txt = gtk_label_new_with_mnemonic(_("S_ave"));
- 	priv->save_txt = txt;
- 	hbox1 = gtk_hbox_new(FALSE, 0);
-diff -up evolution-2.11.92/mail/em-mailer-prefs.c.icon-names evolution-2.11.92/mail/em-mailer-prefs.c
---- evolution-2.11.92/mail/em-mailer-prefs.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-mailer-prefs.c	2007-09-15 16:53:46.000000000 -0400
-@@ -783,7 +783,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 			void *status = e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if ((gboolean)status == TRUE) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -791,7 +791,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -836,7 +836,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 			status = (gboolean)e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if (status) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */				
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-@@ -845,7 +845,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/mail/mail-component.c
---- evolution-2.11.92/mail/mail-component.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -881,7 +881,7 @@ impl__get_userCreatableItems (PortableSe
+diff -up evolution-2.12.0/mail/mail-component.c.icon-names evolution-2.12.0/mail/mail-component.c
+--- evolution-2.12.0/mail/mail-component.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-component.c	2007-09-19 07:14:51.000000000 -0400
+@@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Mail Message");
  	list->_buffer[0].tooltip = _("Compose a new mail message");
  	list->_buffer[0].menuShortcut = 'm';
@@ -548,7 +305,7 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "folder";
-@@ -889,7 +889,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[1].menuDescription = _("Mail _Folder");
  	list->_buffer[1].tooltip = _("Create a new mail folder");
  	list->_buffer[1].menuShortcut = '\0';
@@ -557,9 +314,9 @@
  	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
  
  	return list;
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder.c
+--- evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder.c	2007-09-19 07:14:51.000000000 -0400
 @@ -63,7 +63,7 @@ static void exchange_get_folder (char *u
  
  
@@ -587,9 +344,9 @@
  };
  
  void
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names	2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c
+--- evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names	2007-09-16 15:16:25.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c	2007-09-19 07:14:51.000000000 -0400
 @@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss
  gchar *selected_exchange_folder_uri = NULL;
  
@@ -599,9 +356,9 @@
  };
  
  static void
-diff -up evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
---- evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names	2007-07-05 02:09:22.000000000 -0400
-+++ evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
+--- evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names	2007-09-16 15:16:26.000000000 -0400
++++ evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -8,10 +8,10 @@
  	
  		<hook class="org.gnome.evolution.calendar.popup:1.0">
@@ -615,33 +372,9 @@
  			</menu>
  		</hook>
  	</e-plugin>
-diff -up evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
---- evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names	2007-07-05 02:09:19.000000000 -0400
-+++ evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -14,7 +14,7 @@
- 	<item
- 	  type="item"
- 	  path="80.test"
--	  icon="gtk-copy"
-+	  icon="edit-copy"
- 	  _label="Copy _Email Address"
- 	  visible="mailto"
- 	  activate="org_gnome_copy_tool_copy_address"/>
-diff -up evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
---- evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names	2007-07-05 02:09:24.000000000 -0400
-+++ evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -18,7 +18,7 @@
- You should receive an answer from the mailing list shortly after the message has been sent.</_secondary>
-   <button _label="_Send message" response="GTK_RESPONSE_YES"/>
-   <button _label="_Edit message" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="malformed-header" type="error">
-diff -up evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.11.92/plugins/groupwise-features/share-folder-common.c
---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.12.0/plugins/groupwise-features/share-folder-common.c
+--- evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/groupwise-features/share-folder-common.c	2007-09-19 07:14:51.000000000 -0400
 @@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e
  }
  
@@ -651,93 +384,9 @@
  };
  
  static void 
-diff -up evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
---- evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names	2007-07-05 02:09:21.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -17,7 +17,7 @@ You cannot share folder with specified u
- <error id="recurrence" type="question" default="GTK_RESPONSE_YES">
- <primary>This is a recurring meeting</primary>
- <secondary>What would you like to {0}?</secondary>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="This instance" response="GTK_RESPONSE_NO"/>
-  <button label="All instances" response="GTK_RESPONSE_YES"/>
- </error>
-diff -up evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
---- evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names	2007-08-24 02:49:39.000000000 -0400
-+++ evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
- 		<_title>Attachment Reminder</_title>
- 		<_primary>Message has no attachments</_primary>
- 		<_secondary>Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one.</_secondary>
--		<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
-+		<button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
- 		<button response="GTK_RESPONSE_YES" _label="_Send"></button>
- 	</error>
- </error-list> 
-diff -up evolution-2.11.92/e-util/e-error.c.icon-names evolution-2.11.92/e-util/e-error.c
---- evolution-2.11.92/e-util/e-error.c.icon-names	2007-09-02 14:56:59.000000000 -0400
-+++ evolution-2.11.92/e-util/e-error.c	2007-09-15 16:53:46.000000000 -0400
-@@ -79,7 +79,7 @@ static GSList *ee_parent_list;
- /* ********************************************************************** */
- 
- static struct _e_error_button default_ok_button = {
--	NULL, "gtk-ok", NULL, GTK_RESPONSE_OK
-+	NULL, "dialog-ok", NULL, GTK_RESPONSE_OK
- };
- 
- static struct _e_error default_errors[] = {
-diff -up evolution-2.11.92/e-util/e-system.error.xml.icon-names evolution-2.11.92/e-util/e-system.error.xml
---- evolution-2.11.92/e-util/e-system.error.xml.icon-names	2007-07-05 02:10:56.000000000 -0400
-+++ evolution-2.11.92/e-util/e-system.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
-   <_title>Overwrite file?</_title>
-   <_primary>File exists &quot;{0}&quot;.</_primary>
-   <_secondary>Do you wish to overwrite it?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Overwrite" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-diff -up evolution-2.11.92/addressbook/addressbook.error.xml.icon-names evolution-2.11.92/addressbook/addressbook.error.xml
---- evolution-2.11.92/addressbook/addressbook.error.xml.icon-names	2007-07-05 02:06:57.000000000 -0400
-+++ evolution-2.11.92/addressbook/addressbook.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -35,8 +35,8 @@
-  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete address book '{0}'?</_primary>
-   <_secondary>This address book will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="edit-categories" type="error">
-@@ -67,8 +67,8 @@
-   <_primary>Would you like to save your changes?</_primary>
-   <_secondary>You have made modifications to this contact. Do you want to save these changes?</_secondary>
-   <button _label="_Discard" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="document-save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
-@@ -98,8 +98,8 @@
-  <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Address '{0}' already exists.</_primary>
-   <_secondary>A contact already exists with this address. Would you like to add a new card with the same address anyway?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-component.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-component.c
+--- evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names	2007-09-16 14:52:56.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Contact");
  	list->_buffer[0].tooltip = _("Create a new contact");
@@ -747,9 +396,9 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "contact_list";
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-view.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-view.c
+--- evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names	2007-09-16 14:52:56.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -71,7 +71,7 @@
  static GObjectClass *parent_class = NULL;
  
@@ -827,9 +476,9 @@
  	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
  	gtk_widget_show (priv->info_widget);
  
-diff -up evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c
---- evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c
+--- evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names	2007-09-16 14:53:27.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem,
  static EPopupItem eabv_popup_items[] = {
  	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
@@ -870,9 +519,9 @@
  };
  
  static void
-diff -up evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c
---- evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c
+--- evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names	2007-09-16 14:53:27.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c	2007-09-19 07:17:05.000000000 -0400
 @@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid
  
  static EPopupItem eab_uri_popups[] = {
@@ -886,9 +535,9 @@
          };
  
  
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-09-19 07:14:51.000000000 -0400
 @@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContact
  	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
  	g_object_unref(widget);
@@ -898,9 +547,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-09-19 07:14:51.000000000 -0400
 @@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactE
  	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
  	g_object_unref(widget);
@@ -910,9 +559,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-09-19 07:14:51.000000000 -0400
 @@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor
  	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
  
@@ -922,9 +571,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/ui/evolution.xml.icon-names evolution-2.11.92/ui/evolution.xml
---- evolution-2.11.92/ui/evolution.xml.icon-names	2007-07-08 22:46:51.000000000 -0400
-+++ evolution-2.11.92/ui/evolution.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution.xml.icon-names evolution-2.12.0/ui/evolution.xml
+--- evolution-2.12.0/ui/evolution.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -7,10 +7,10 @@
      <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/>
  
@@ -962,9 +611,9 @@
      </submenu>
  
      <submenu name="Edit" _label="_Edit">
-diff -up evolution-2.11.92/ui/evolution-event-editor.xml.icon-names evolution-2.11.92/ui/evolution-event-editor.xml
---- evolution-2.11.92/ui/evolution-event-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-event-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-event-editor.xml.icon-names evolution-2.12.0/ui/evolution-event-editor.xml
+--- evolution-2.12.0/ui/evolution-event-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-event-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -45,13 +45,15 @@
  		_tip="Make this a recurring event" pixtype="pixbuf"/>
  
@@ -1003,9 +652,9 @@
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-memos.xml.icon-names evolution-2.11.92/ui/evolution-memos.xml
---- evolution-2.11.92/ui/evolution-memos.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-memos.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-memos.xml.icon-names evolution-2.12.0/ui/evolution-memos.xml
+--- evolution-2.12.0/ui/evolution-memos.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-memos.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1049,9 +698,9 @@
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names evolution-2.11.92/ui/evolution-composer-entries.xml
---- evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-composer-entries.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names evolution-2.12.0/ui/evolution-composer-entries.xml
+--- evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-composer-entries.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -3,15 +3,15 @@
  
      <cmd name="EditCut"
@@ -1078,9 +727,9 @@
 -</Root>
 \ No newline at end of file
 +</Root>
-diff -up evolution-2.11.92/ui/evolution-mail-list.xml.icon-names evolution-2.11.92/ui/evolution-mail-list.xml
---- evolution-2.11.92/ui/evolution-mail-list.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-list.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-mail-list.xml.icon-names evolution-2.12.0/ui/evolution-mail-list.xml
+--- evolution-2.12.0/ui/evolution-mail-list.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-list.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -4,15 +4,15 @@
  
      <cmd name="EditCut"
@@ -1111,9 +760,9 @@
  
   	  <separator f="" name="FolderOps1"/>
            <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
-diff -up evolution-2.11.92/ui/evolution-subscribe.xml.icon-names evolution-2.11.92/ui/evolution-subscribe.xml
---- evolution-2.11.92/ui/evolution-subscribe.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-subscribe.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-subscribe.xml.icon-names evolution-2.12.0/ui/evolution-subscribe.xml
+--- evolution-2.12.0/ui/evolution-subscribe.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-subscribe.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -3,7 +3,7 @@
      <submenu name="File" _label="_File">
  
@@ -1123,9 +772,9 @@
  
      </submenu>
  
-diff -up evolution-2.11.92/ui/evolution-tasks.xml.icon-names evolution-2.11.92/ui/evolution-tasks.xml
---- evolution-2.11.92/ui/evolution-tasks.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-tasks.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-tasks.xml.icon-names evolution-2.12.0/ui/evolution-tasks.xml
+--- evolution-2.12.0/ui/evolution-tasks.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-tasks.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,20 +1,20 @@
  <Root>
    <commands>
@@ -1183,9 +832,9 @@
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-addressbook.xml.icon-names evolution-2.11.92/ui/evolution-addressbook.xml
---- evolution-2.11.92/ui/evolution-addressbook.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-addressbook.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-addressbook.xml.icon-names evolution-2.12.0/ui/evolution-addressbook.xml
+--- evolution-2.12.0/ui/evolution-addressbook.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-addressbook.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,18 +1,17 @@
  <Root>
    <commands>
@@ -1350,9 +999,9 @@
  
      <toolitem name="ContactStop" verb=""
  	      _label="Stop"/>
-diff -up evolution-2.11.92/ui/evolution-editor.xml.icon-names evolution-2.11.92/ui/evolution-editor.xml
---- evolution-2.11.92/ui/evolution-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-editor.xml.icon-names evolution-2.12.0/ui/evolution-editor.xml
+--- evolution-2.12.0/ui/evolution-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1395,9 +1044,9 @@
      <separator f="" name="editor1"/>
  
      <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/>
-diff -up evolution-2.11.92/ui/evolution-mail-message.xml.icon-names evolution-2.11.92/ui/evolution-mail-message.xml
---- evolution-2.11.92/ui/evolution-mail-message.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-message.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-mail-message.xml.icon-names evolution-2.12.0/ui/evolution-mail-message.xml
+--- evolution-2.12.0/ui/evolution-mail-message.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-message.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -11,15 +11,15 @@
  
      <cmd name="EditCut"
@@ -1524,9 +1173,9 @@
  
        <toolitem name="MessageDelete" verb=""
         _label="Delete"
-diff -up evolution-2.11.92/ui/evolution-task-editor.xml.icon-names evolution-2.11.92/ui/evolution-task-editor.xml
---- evolution-2.11.92/ui/evolution-task-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-task-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-task-editor.xml.icon-names evolution-2.12.0/ui/evolution-task-editor.xml
+--- evolution-2.12.0/ui/evolution-task-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-task-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -61,7 +61,7 @@
  		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
  		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
@@ -1536,9 +1185,9 @@
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-message-composer.xml.icon-names evolution-2.11.92/ui/evolution-message-composer.xml
---- evolution-2.11.92/ui/evolution-message-composer.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-message-composer.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-message-composer.xml.icon-names evolution-2.12.0/ui/evolution-message-composer.xml
+--- evolution-2.12.0/ui/evolution-message-composer.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-message-composer.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -2,22 +2,22 @@
  	<commands>
  
@@ -1606,9 +1255,9 @@
  			<separator/>
  			<menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
  			<separator/>
-diff -up evolution-2.11.92/ui/evolution-calendar.xml.icon-names evolution-2.11.92/ui/evolution-calendar.xml
---- evolution-2.11.92/ui/evolution-calendar.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-calendar.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-calendar.xml.icon-names evolution-2.12.0/ui/evolution-calendar.xml
+--- evolution-2.12.0/ui/evolution-calendar.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-calendar.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,14 +1,14 @@
  <Root>
    <commands>
@@ -1668,9 +1317,9 @@
  
      <separator f="" name="ecal4"/>
  
-diff -up evolution-2.11.92/composer/e-msg-composer.c.icon-names evolution-2.11.92/composer/e-msg-composer.c
---- evolution-2.11.92/composer/e-msg-composer.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/composer/e-msg-composer.c.icon-names evolution-2.12.0/composer/e-msg-composer.c
+--- evolution-2.12.0/composer/e-msg-composer.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer.c	2007-09-19 07:14:51.000000000 -0400
 @@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -1732,30 +1381,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/composer/mail-composer.error.xml.icon-names evolution-2.11.92/composer/mail-composer.error.xml
---- evolution-2.11.92/composer/mail-composer.error.xml.icon-names	2007-07-05 02:09:41.000000000 -0400
-+++ evolution-2.11.92/composer/mail-composer.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -37,7 +37,7 @@
-   <error id="ask-send-message-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to send the mail?</_primary>
-   <_secondary xml:space="preserve"> There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -46,7 +46,7 @@
-   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
-   <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-diff -up evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names evolution-2.11.92/composer/e-msg-composer-select-file.c
---- evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer-select-file.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names evolution-2.12.0/composer/e-msg-composer-select-file.c
+--- evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names	2007-09-16 15:18:00.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer-select-file.c	2007-09-19 07:14:51.000000000 -0400
 @@ -126,7 +126,7 @@ get_selector(struct _EMsgComposer *compo
  	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer");
  	gtk_window_set_modal ((GtkWindow *) selection, FALSE);
@@ -1765,9 +1393,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/shell/e-shell-window-commands.c.icon-names evolution-2.11.92/shell/e-shell-window-commands.c
---- evolution-2.11.92/shell/e-shell-window-commands.c.icon-names	2007-09-03 04:52:04.000000000 -0400
-+++ evolution-2.11.92/shell/e-shell-window-commands.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/shell/e-shell-window-commands.c.icon-names evolution-2.12.0/shell/e-shell-window-commands.c
+--- evolution-2.12.0/shell/e-shell-window-commands.c.icon-names	2007-09-16 14:56:25.000000000 -0400
++++ evolution-2.12.0/shell/e-shell-window-commands.c	2007-09-19 07:14:51.000000000 -0400
 @@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = {
  };
  
@@ -1787,309 +1415,9 @@
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/shell/shell.error.xml.icon-names evolution-2.11.92/shell/shell.error.xml
---- evolution-2.11.92/shell/shell.error.xml.icon-names	2007-07-05 02:07:01.000000000 -0400
-+++ evolution-2.11.92/shell/shell.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -4,7 +4,7 @@
-  <error id="importing" type="info">
-     <_title>Importing...</_title>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-nospace" type="error">
-@@ -12,7 +12,7 @@
-   <_secondary xml:space="preserve">Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.
- 
- You will need to make more space available in your home directory before you can continue.</_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-failed" type="error">
-@@ -22,8 +22,8 @@ You will need to make more space availab
- 
- If you choose to continue, you may not have access to some of your old data.
- </_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
-@@ -35,7 +35,7 @@ If you choose to remove this data, the e
- </_secondary>
-   <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-@@ -47,8 +47,8 @@ It is suggested you manually verify that
- 
- Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
- </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="noshell" type="error">
-@@ -58,7 +58,7 @@ Once deleted, you cannot downgrade to th
- 
- Click help for details</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="noshell-reason" type="error">
-@@ -70,13 +70,13 @@ Click help for details</_secondary>
- 
- Click help for details.</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="forget-passwords" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to forget all remembered passwords?</_primary>
-   <_secondary xml:space="preserve">Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Forget" response="GTK_RESPONSE_OK"/>
-  </error>
-  
-diff -up evolution-2.11.92/calendar/calendar.error.xml.icon-names evolution-2.11.92/calendar/calendar.error.xml
---- evolution-2.11.92/calendar/calendar.error.xml.icon-names	2007-08-24 02:50:09.000000000 -0400
-+++ evolution-2.11.92/calendar/calendar.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -11,8 +11,8 @@
-  <error id="prompt-delete-meeting" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this meeting?</_primary>
-   <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-task" type="question" default="GTK_RESPONSE_YES">
-@@ -25,8 +25,8 @@
-  <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-memo" type="question" default="GTK_RESPONSE_YES">
-@@ -39,57 +39,57 @@
-  <error id="prompt-delete-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this memo?</_primary>
-   <_secondary>All information on this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the appointment titled '{0}'?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to delete this appointment?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the '{0}' task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the memo '{0}'?</_primary>
-   <_secondary>All information in this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} appointments?</_primary>
-   <_secondary>All information on these appointments will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} tasks?</_primary>
-   <_secondary>All information on these tasks will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memos" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} memos?</_primary>
-   <_secondary>All information in these memos will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
-@@ -97,7 +97,7 @@
-   <_primary>Would you like to save your changes to this appointment?</_primary>
-   <_secondary>You have changed this appointment, but not yet saved it.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -106,7 +106,7 @@
-  <_primary>Would you like to save your changes to this task?</_primary>
-  <_secondary>You have changed this task, but not yet saved it.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -115,7 +115,7 @@
-  <_primary>Would you like to save your changes to this memo?</_primary>
-  <_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 	      
-@@ -143,14 +143,14 @@
-  <error id="ask-send-task-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the task?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the task would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-   <error id="ask-send-event-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the appointment?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -184,66 +184,66 @@
-  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete calendar '{0}'?</_primary>
-   <_secondary>This calendar will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete task list '{0}'?</_primary>
-   <_secondary>This task list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memo-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete memo list '{0}'?</_primary>
-   <_secondary>This memo list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the appointment without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the task without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your task will give your recipients an idea of what your task is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-memo" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to save the memo without a summary?</_primary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading calendar</_primary>
-   <_secondary>The calendar is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Cannot create a new event</_primary>
-   <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading task list</_primary>
-   <_secondary>The task list is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-memos" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading memo list</_primary>
-   <_secondary>The memo list is not marked for offline usage</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names evolution-2.11.92/calendar/gui/e-memo-table.c
---- evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-memo-table.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names evolution-2.12.0/calendar/gui/e-memo-table.c
+--- evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-memo-table.c	2007-09-19 07:14:51.000000000 -0400
 @@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] =
  
  	{ E_POPUP_BAR, "70.bar" },
@@ -2099,9 +1427,9 @@
  
  	{ E_POPUP_BAR, "90.bar" },
  
-diff -up evolution-2.11.92/calendar/gui/memos-component.c.icon-names evolution-2.11.92/calendar/gui/memos-component.c
---- evolution-2.11.92/calendar/gui/memos-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/memos-component.c.icon-names evolution-2.12.0/calendar/gui/memos-component.c
+--- evolution-2.12.0/calendar/gui/memos-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/memos-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -463,7 +463,7 @@ edit_memo_list_cb (EPopup *ep, EPopupIte
  static EPopupItem emc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
@@ -2111,18 +1439,9 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/event-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/event-editor.c	2007-09-15 16:53:46.000000000 -0400
-@@ -368,7 +368,7 @@ create_schedule_page (EventEditor *ee)
- 
- 	priv->sched_window = gtk_dialog_new_with_buttons (_("Free/Busy"),
- 			(GtkWindow *) ee, GTK_DIALOG_MODAL,
--			"gtk-close", GTK_RESPONSE_CLOSE,
-+			"dialog-close", GTK_RESPONSE_CLOSE,
- 			NULL);
- 	priv->sched_page = schedule_page_new (priv->model);
- 	g_object_ref_sink (priv->sched_page);
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/event-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
  	 * icons is filled in at run-time in event_editor_init() are
  	 * updated, too.
@@ -2163,18 +1482,9 @@
  	}
  	e_pixmaps_update (editor->uic, pixmaps);
  
-@@ -604,7 +605,7 @@ event_editor_construct (EventEditor *ee,
- 
- 	priv->recur_window = gtk_dialog_new_with_buttons (_("Recurrence"),
- 							  (GtkWindow *) ee, GTK_DIALOG_MODAL,
--							  "gtk-close", GTK_RESPONSE_CLOSE,
-+							  "dialog-close", GTK_RESPONSE_CLOSE,
- 							  NULL);
- 	g_signal_connect (priv->recur_window, "response", G_CALLBACK (gtk_widget_hide), NULL);
- 	g_signal_connect ((GtkWidget *) priv->recur_window, "delete-event", G_CALLBACK(window_delete_event), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/task-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/task-editor.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/task-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2188,18 +1498,9 @@
  	
  	E_PIXMAP_END
  };
-@@ -427,7 +429,7 @@ task_editor_construct (TaskEditor *te, E
- 
- 	priv->task_details_window = gtk_dialog_new_with_buttons (_("Task Details"),
- 								(GtkWindow *) te, GTK_DIALOG_MODAL,
--							  	"gtk-close", GTK_RESPONSE_CLOSE,
-+							  	"dialog-close", GTK_RESPONSE_CLOSE,
- 							  	NULL);
- 	g_signal_connect (priv->task_details_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
- 	g_signal_connect (priv->task_details_window, "delete-event", G_CALLBACK(gtk_widget_hide), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c
---- evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c
+--- evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c	2007-09-19 07:14:51.000000000 -0400
 @@ -123,7 +123,7 @@ run_selector(CompEditor *editor, const c
  	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
  	gtk_window_set_modal ((GtkWindow *) selection, TRUE);
@@ -2209,9 +1510,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/comp-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/comp-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2240,10 +1541,10 @@
  	case E_CAL_COMPONENT_TODO:
  		return "stock_task";
  	case E_CAL_COMPONENT_JOURNAL:
-diff -up evolution-2.11.92/calendar/gui/calendar-component.c.icon-names evolution-2.11.92/calendar/gui/calendar-component.c
---- evolution-2.11.92/calendar/gui/calendar-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -601,7 +601,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
+diff -up evolution-2.12.0/calendar/gui/calendar-component.c.icon-names evolution-2.12.0/calendar/gui/calendar-component.c
+--- evolution-2.12.0/calendar/gui/calendar-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/calendar-component.c	2007-09-19 07:14:51.000000000 -0400
+@@ -604,7 +604,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
  static EPopupItem ecc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
  	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
@@ -2252,7 +1553,7 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-@@ -1579,7 +1579,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Appointment");
  	list->_buffer[0].tooltip = _("Create a new appointment");
  	list->_buffer[0].menuShortcut = 'a';
@@ -2261,9 +1562,9 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = CREATE_MEETING_ID;
-diff -up evolution-2.11.92/calendar/gui/tasks-control.c.icon-names evolution-2.11.92/calendar/gui/tasks-control.c
---- evolution-2.11.92/calendar/gui/tasks-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-control.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/tasks-control.c.icon-names evolution-2.12.0/calendar/gui/tasks-control.c
+--- evolution-2.12.0/calendar/gui/tasks-control.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/tasks-control.c	2007-09-19 07:14:51.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2294,10 +1595,10 @@
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
---- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-table.c	2007-09-15 16:53:46.000000000 -0400
-@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
+diff -up evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-table.c
+--- evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-table.c	2007-09-19 07:14:51.000000000 -0400
+@@ -1365,7 +1365,7 @@ static EPopupItem tasks_popup_items [] =
  	{ E_POPUP_BAR, "70.bar" },
  
  	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
@@ -2306,9 +1607,9 @@
  	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
  	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
  	{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
-diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
---- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-day-view.c.icon-names evolution-2.12.0/calendar/gui/e-day-view.c
+--- evolution-2.12.0/calendar/gui/e-day-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-day-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */
@@ -2327,9 +1628,9 @@
  	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
  	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
  	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
-diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
---- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-view.c
+--- evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
  }
  
@@ -2352,9 +1653,9 @@
  
  	{ E_POPUP_BAR, "50." },
  
-diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
---- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/tasks-component.c.icon-names evolution-2.12.0/calendar/gui/tasks-component.c
+--- evolution-2.12.0/calendar/gui/tasks-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/tasks-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
  static EPopupItem etc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
@@ -2364,9 +1665,9 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
---- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-commands.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names evolution-2.12.0/calendar/gui/calendar-commands.c
+--- evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/calendar-commands.c	2007-09-19 07:14:51.000000000 -0400
 @@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
  	BONOBO_UI_VERB_END
  };
@@ -2406,9 +1707,9 @@
  
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
---- evolution-2.11.92/calendar/gui/memos-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-control.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/memos-control.c.icon-names evolution-2.12.0/calendar/gui/memos-control.c
+--- evolution-2.12.0/calendar/gui/memos-control.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/memos-control.c	2007-09-19 07:14:51.000000000 -0400
 @@ -39,6 +39,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2450,9 +1751,9 @@
  	e_memos_setup_view_menus (memos, uic);
  
  	/* Signals from the memos widget; also sensitize the menu items as appropriate */
-diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
---- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-cal-popup.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.0/calendar/gui/e-cal-popup.c
+--- evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-cal-popup.c	2007-09-19 07:14:51.000000000 -0400
 @@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
  static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
  
@@ -2465,9 +1766,9 @@
  	{ E_POPUP_BAR, "05.attach", },
  };
  
-diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
---- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-week-view.c.icon-names evolution-2.12.0/calendar/gui/e-week-view.c
+--- evolution-2.12.0/calendar/gui/e-week-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-week-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- evolution.spec	17 Sep 2007 20:05:20 -0000	1.291
+++ evolution.spec	19 Sep 2007 12:06:27 -0000	1.292
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -712,6 +712,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
+- Revise patch for GNOME bug #477045 (less-zealous icon renaming).
+
 * Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0
 - Remove patch for RH bug #182247 (fixed upstream).



From fedora-extras-commits at redhat.com  Wed Sep 19 12:11:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 08:11:20 -0400
Subject: rpms/uw-imap/devel .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 uw-imap.spec, 1.36, 1.37
Message-ID: <200709191211.l8JCBKDe028140@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28118

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-0.1.0709171900
- imap-2006k.DEV.SNAP-0709171900



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jul 2007 12:21:32 -0000	1.14
+++ .cvsignore	19 Sep 2007 12:10:47 -0000	1.15
@@ -1,3 +1,2 @@
 imap-2006i.tar.Z
-imap-2006j1.tar.Z
-imap-2006j2.tar.Z
+imap-2006k.DEV.SNAP-0709171900.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2007 12:21:32 -0000	1.15
+++ sources	19 Sep 2007 12:10:47 -0000	1.16
@@ -1 +1 @@
-d7900691c415bcc725c1bf2b15e4fb99  imap-2006j2.tar.Z
+a6968eb8fcdfabcde370eb8a1bf35a3f  imap-2006k.DEV.SNAP-0709171900.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- uw-imap.spec	21 Aug 2007 12:59:06 -0000	1.36
+++ uw-imap.spec	19 Sep 2007 12:10:47 -0000	1.37
@@ -1,19 +1,21 @@
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-%define beta 2 
+#define beta
+%define dev .DEV.SNAP-
+%define snap 0709171900
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006j
-Release: 3%{?dist}
+Version: 2006k
+Release: 0.1.%{?snap}%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}%{?dev}%{?snap}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -110,7 +112,7 @@
 
 
 %prep
-%setup -q -n imap-%{version}
+%setup -q -n imap-%{version}%{?dev}%{?snap}
 
 %patch1 -p1 -b .paths
 %patch2 -p1 -b .doc
@@ -287,6 +289,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-0.1.0709171900
+- imap-2006k.DEV.SNAP-0709171900
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2006j-3
 - fix License
 



From fedora-extras-commits at redhat.com  Wed Sep 19 12:18:11 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 08:18:11 -0400
Subject: rpms/cups/devel cups.spec,1.361,1.362
Message-ID: <200709191218.l8JCIBFV028383@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28354

Modified Files:
	cups.spec 
Log Message:
Fixed typo in changelog.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- cups.spec	19 Sep 2007 11:28:11 -0000	1.361
+++ cups.spec	19 Sep 2007 12:17:39 -0000	1.362
@@ -452,7 +452,7 @@
 - Write printcap when a remote queue is deleted (bug #290831).
 
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
-- Avoid write printcap unnecessarily (bug #290831).
+- Avoid writing printcap unnecessarily (bug #290831).
 
 * Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
 - 1.3.1.



From fedora-extras-commits at redhat.com  Wed Sep 19 12:27:25 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 08:27:25 -0400
Subject: rpms/alsa-utils/devel .cvsignore, 1.21, 1.22 alsa-utils.spec, 1.57, 
	1.58 alsaunmute.c, 1.15, 1.16 salsa.c, 1.6, 1.7 sources, 1.24, 1.25
Message-ID: <200709191227.l8JCRP13028997@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28915

Modified Files:
	.cvsignore alsa-utils.spec alsaunmute.c salsa.c sources 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
- new upstream
- moved saved volume settings to /var/lib (#293301)
- patched alsactl for that (#255421)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Jun 2007 10:18:41 -0000	1.21
+++ .cvsignore	19 Sep 2007 12:26:53 -0000	1.22
@@ -14,3 +14,4 @@
 alsa-utils-1.0.14rc1.tar.bz2
 alsa-utils-1.0.14rc2.tar.bz2
 alsa-utils-1.0.14.tar.bz2
+alsa-utils-1.0.15rc1.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- alsa-utils.spec	16 Aug 2007 11:43:55 -0000	1.57
+++ alsa-utils.spec	19 Sep 2007 12:26:53 -0000	1.58
@@ -1,7 +1,10 @@
+%define 	prever		rc1
+%define 	prever_dot	.rc1
+
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
-Version: 	1.0.14
-Release: 	2%{?prever_dot}%{?dist}
+Version: 	1.0.15
+Release: 	0.1%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -11,6 +14,7 @@
 Source4: 	alsaunmute.c
 Source10:	alsa.rules
 Patch:		alsa-utils-1.0.14-alsaconf.patch
+Patch1:         alsa-utils-1.0.14-statedir.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -23,7 +27,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch -p1
+%patch 	-p1
+%patch1 -p1 -b .statedir
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
@@ -50,6 +55,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
+# Create a place for volume configuration
+mkdir -p $RPM_BUILD_ROOT/var/lib/alsa
+touch $RPM_BUILD_ROOT/var/lib/alsa/asound.state
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -69,8 +78,16 @@
 %dir %{_datadir}/alsa/speaker-test
 %{_datadir}/alsa/speaker-test/*
 /usr/share/locale/*
+/var/lib/alsa
+%ghost /var/lib/alsa/asound.state
+
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
+- new upstream
+- moved saved volume settings to /var/lib (#293301)
+- patched alsactl for that (#255421)
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-2
 - added an entry to alsaunmute for HP xw4550 (#252171)
 


Index: alsaunmute.c
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsaunmute.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alsaunmute.c	16 Aug 2007 11:43:55 -0000	1.15
+++ alsaunmute.c	19 Sep 2007 12:26:53 -0000	1.16
@@ -16,7 +16,12 @@
  *
  */
 
-#define  VERSION  "0.2"
+/*
+    TODO 
+    -> external unmute table
+*/
+
+#define  VERSION  "0.3"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +34,7 @@
 #define FALSE (1!=1)
 
 int verbose = 0;
+int help = 0;
 
 typedef struct _CHANNEL {
 
@@ -280,17 +286,45 @@
   }
 }
 
-void usage(char *p_name)
+int get_card_device(const char *p_device)
+{
+  int err;
+  snd_ctl_t *handle;
+  snd_ctl_card_info_t *info;
+  int card = 0;
+
+  snd_ctl_card_info_alloca(&info);
+
+  if ((err = snd_ctl_open(&handle, "default", 0)) < 0) {
+    fprintf(stderr,"Open error: %s\n", snd_strerror(err));
+    return(0);
+  }
+  if ((err = snd_ctl_card_info(handle, info)) < 0) {
+    fprintf(stderr,"HW info error: %s\n", snd_strerror(err));
+    return(0);
+  }
+
+  card = snd_ctl_card_info_get_card(info);
+
+  snd_ctl_close(handle);
+
+  return(card);
+}
+
+void usage(void)
 {
   printf("Alsa Unmute utility, Version %s, Copyright 2005 Red Hat, Inc.\n",VERSION);
   printf("This software may be freely redistributed under the terms of the GNU\n");
   printf("public license.\n\n");
 
-  printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n");
-  printf("  card_number       - number of unmuted card\n");
+  printf("Usage: alsaunmute [options]\n\n");
+  printf("  [card_number]     - sound card number. If this parameter is not given,\n");
+  printf("                      the \"default\" sound device is unmuted.\n");
+  printf("  [-D device]       - unmute specified alsa device (like \"default\")\n");
   printf("  [-v]              - verbose mode\n");
   printf("  [-s volume]       - set this volume level instead of the default (75%%)\n");
-  printf("                      the volume is number from 0 to 100\n\n");
+  printf("                      the volume is number from 0 to 100\n");
+  printf("  [-h]              - this help\n\n");
   exit(0);
 }
 
@@ -301,31 +335,54 @@
 int main(int argc, char **argv)
 {
   const char *p_driver;
-  int index;
+  char *p_device = "default";
+  int index = -1;
   int volume = 75;
   int param;
-
-  if (argc < 2) {
-    usage(argv[0]);
-    exit(0);
-  }
-
-  index = atoi(argv[1]);
-  p_driver = get_card_driver(index);
   
-  for(param = 2; param < argc; param++) {  
-    if (!strcmp(argv[param],"-v") || !strcmp(argv[param],"-V")) {
+  for(param = 1; param < argc; param++) {  
+    if (argv[param][0] >= '0' && argv[param][0] <= '9') {
+      index = atoi(argv[param]);
+      continue;
+    }
+    if (!strcmp(argv[param],"-v")) {
       verbose = TRUE;
       continue;
     }
-
-    if (param+1 < argc && (!strcmp(argv[param],"-s") || !strcmp(argv[param],"-S"))) {
+    if (!strcmp(argv[param],"-h") || !strcmp(argv[param],"--help")) {
+      help = TRUE;
+      continue;
+    }
+    if (param+1 < argc && !strcmp(argv[param],"-s")) {
       param++;
       volume = atoi(argv[param]);
+      continue;
+    }
+    if (param+1 < argc && !strcmp(argv[param],"-D")) {
+      param++;
+      p_device = argv[param];
+      continue;
     }
   }
 
-  
+  if(help) {
+    usage();
+  }
+
+
+  if(index == -1) {
+    if(verbose) {
+       fprintf(stderr,"Unmuting ALSA device '%s'...\n",p_device);
+    }
+    index = get_card_device(p_device);
+  }
+  else {
+    if(verbose) {
+       fprintf(stderr,"Unmuting ALSA card %d...\n",index);
+    }  
+  }
+
+  p_driver = get_card_driver(index);  
   if(!p_driver) {
     fprintf(stderr,"Wrong card index %d...\n",index);
     return(1);  


Index: salsa.c
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- salsa.c	18 Apr 2007 12:28:22 -0000	1.6
+++ salsa.c	19 Sep 2007 12:26:53 -0000	1.7
@@ -20,7 +20,7 @@
 
 #include <alsa/asoundlib.h>
 
-#define ALSA_CONFIG_PATH	"/etc/alsa/asound.state"
+#define ALSA_CONFIG_PATH	"/var/lib/alsa/asound.state"
 #define ALL_CARDS         	(-1)
 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Jun 2007 10:18:41 -0000	1.24
+++ sources	19 Sep 2007 12:26:53 -0000	1.25
@@ -1 +1 @@
-6d3009c157ac6fc803696d6590a48366  alsa-utils-1.0.14.tar.bz2
+f272e7681acc98d79b56909b935b7878  alsa-utils-1.0.15rc1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 12:32:17 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 08:32:17 -0400
Subject: rpms/perl-Test-Inline/devel .cvsignore, 1.3,
	1.4 perl-Test-Inline.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200709191232.l8JCWHdR029162@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29131

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
- Upstream update.
- Disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 04:22:23 -0000	1.3
+++ .cvsignore	19 Sep 2007 12:31:45 -0000	1.4
@@ -1 +1 @@
-Test-Inline-2.201.tar.gz
+Test-Inline-2.207.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Inline.spec	18 Jan 2007 04:43:16 -0000	1.8
+++ perl-Test-Inline.spec	19 Sep 2007 12:31:45 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-Inline
-Version: 	2.201
-Release: 	2%{?dist}
+Version: 	2.207
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-Inline/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Inline-%{version}.tar.gz
@@ -16,7 +16,8 @@
 BuildRequires:	perl(File::Spec) >= 0.80
 BuildRequires:	perl(List::Util) >= 1.11
 BuildRequires:	perl(Getopt::Long) >= 2.34
-BuildRequires:	perl(File::Remove)
+BuildRequires:	perl(File::chmod)
+BuildRequires:	perl(File::Remove) >= 0.34
 BuildRequires:	perl(File::Slurp) >= 9999.04
 BuildRequires:	perl(File::Find::Rule) >= 0.26
 BuildRequires:	perl(Config::Tiny) >= 2.00
@@ -26,6 +27,7 @@
 BuildRequires:	perl(File::Flat) >= 1.00
 BuildRequires:	perl(Pod::Tests) >= 0.18
 BuildRequires:	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(Test::Script)
 
 # RPM misses these deps
 Requires:	perl(File::Flat)
@@ -61,7 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test AUTOMATED_TESTING=1
+# Something is broken with AUTOMATED_TESTING
+# make test AUTOMATED_TESTING=1
+make test
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +76,16 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
+- Upstream update.
+- Disable AUTOMATED_TESTING.
+
+* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.205-1
+- Upstream update.
+
+* Tue Jul 10 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.202-1
+- Upstream update.
+
 * Wed Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.201-2
 - BR: perl(File::Remove).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2007 04:22:23 -0000	1.3
+++ sources	19 Sep 2007 12:31:45 -0000	1.4
@@ -1 +1 @@
-6c6a444c2044f11776dab50ae0030121  Test-Inline-2.201.tar.gz
+7530c2dee1d9547acd78dd4ca17ffbb3  Test-Inline-2.207.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 12:48:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 08:48:19 -0400
Subject: rpms/esound/devel remove-confusing-spew.patch, NONE, 1.1 esound.spec,
	1.39, 1.40
Message-ID: <200709191248.l8JCmJoU029525@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/esound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29471

Modified Files:
	esound.spec 
Added Files:
	remove-confusing-spew.patch 
Log Message:
remove confusing spew


remove-confusing-spew.patch:

--- NEW FILE remove-confusing-spew.patch ---
diff -up esound-0.2.38/esdlib.c.spew esound-0.2.38/esdlib.c
--- esound-0.2.38/esdlib.c.spew	2007-04-19 10:43:59.000000000 -0400
+++ esound-0.2.38/esdlib.c	2007-09-19 08:45:44.000000000 -0400
@@ -479,7 +479,6 @@ esd_connect_tcpip(const char *host)
          strcpy ( connect_host, "localhost" );
 
        if ( getaddrinfo ( connect_host, NULL, &hints, &result ) != 0 ) {
-         printf ("Usage:program_name [address][:port]");
          return (-1);
        }
 


Index: esound.spec
===================================================================
RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- esound.spec	24 Aug 2007 12:22:53 -0000	1.39
+++ esound.spec	19 Sep 2007 12:47:46 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
 Version: 0.2.38
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:   1
 License: LGPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -15,6 +15,7 @@
 Patch4: esound-0.2.38-drain.patch
 Patch5: esound-0.2.38-multi-user.patch
 Patch6: esound-0.2.38-fix-open-macro.patch
+Patch7: remove-confusing-spew.patch
 BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
 BuildRequires: alsa-lib-devel
@@ -70,6 +71,7 @@
 %patch4 -p1 -b .drain-race
 %patch5 -p1 -b .multi-user
 %patch6 -p1 -b .open-macro
+%patch7 -p1 -b .spew
 
 %build
 %configure --disable-static
@@ -132,6 +134,9 @@
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.2.38-5
+- Don't spew confusing warnings to stdout 
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1:0.2.38-4
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Wed Sep 19 12:52:37 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 19 Sep 2007 08:52:37 -0400
Subject: rpms/digikam/devel digikam.spec,1.40,1.41
Message-ID: <200709191252.l8JCqbnx029693@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29669

Modified Files:
	digikam.spec 
Log Message:
- Rebuild



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- digikam.spec	29 Aug 2007 14:10:07 -0000	1.40
+++ digikam.spec	19 Sep 2007 12:52:04 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -141,6 +141,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-5
+- Rebuild
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
 - License: GPLv2+
 - lcms patch (kde bug #148930)



From fedora-extras-commits at redhat.com  Wed Sep 19 12:57:10 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 08:57:10 -0400
Subject: rpms/gnomebaker/devel gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.14, 1.15
Message-ID: <200709191257.l8JCvAoF029822@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnomebaker.spec	17 Sep 2007 08:32:44 -0000	1.14
+++ gnomebaker.spec	19 Sep 2007 12:56:38 -0000	1.15
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:			gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:01:20 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 09:01:20 -0400
Subject: rpms/gnomebaker/F-7 gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.12, 1.13
Message-ID: <200709191301.l8JD1KdO003422@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29921

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnomebaker.spec	17 Sep 2007 08:51:45 -0000	1.12
+++ gnomebaker.spec	19 Sep 2007 13:00:47 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:			gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:07:03 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 09:07:03 -0400
Subject: rpms/gnomebaker/FC-6 gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.10, 1.11
Message-ID: <200709191307.l8JD73YI003528@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3505

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/gnomebaker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnomebaker.spec	17 Sep 2007 09:11:06 -0000	1.10
+++ gnomebaker.spec	19 Sep 2007 13:06:28 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:		http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p1
 chmod 644 AUTHORS TODO
 
 
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:11:34 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:11:34 -0400
Subject: rpms/system-config-printer/F-7 pycups-1.9.27.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.130, 1.131 sources, 1.135,
	1.136 system-config-printer.spec, 1.107,
	1.108 pycups-1.9.24.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191311.l8JDBYFT003728@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3702

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.27.tar.bz2.sig 
Removed Files:
	pycups-1.9.24.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.27.



--- NEW FILE pycups-1.9.27.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore	9 Aug 2007 15:16:17 -0000	1.130
+++ .cvsignore	19 Sep 2007 13:11:02 -0000	1.131
@@ -112,3 +112,4 @@
 system-config-printer-0.7.63.2.tar.bz2
 pycups-1.9.24.tar.bz2
 system-config-printer-0.7.63.3.tar.bz2
+pycups-1.9.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	9 Aug 2007 15:16:17 -0000	1.135
+++ sources	19 Sep 2007 13:11:02 -0000	1.136
@@ -1,2 +1,2 @@
-5038e4c6945c5183ad7061d6ee061205  pycups-1.9.24.tar.bz2
 3aeb83e328d383c7f57f3311ec9a9a42  system-config-printer-0.7.63.3.tar.bz2
+20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- system-config-printer.spec	9 Aug 2007 15:20:26 -0000	1.107
+++ system-config-printer.spec	19 Sep 2007 13:11:02 -0000	1.108
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.24
+%define pycups_version 1.9.27
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -129,6 +129,9 @@
 fi
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.27.
+
 * Thu Aug  9 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.3-1
 - 0.7.63.3:
   - Don't allow deletion of browsed printers (bug #250385).


--- pycups-1.9.24.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:24:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed, 19 Sep 2007 09:24:53 -0400
Subject: fedora-security/audit fc6,1.261,1.262 fc7,1.109,1.110
Message-ID: <200709191324.l8JDOr93004137@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4111

Modified Files:
	fc6 fc7 
Log Message:
wpa_supplicant was no problem.
added libsndfile.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- fc6	18 Sep 2007 15:43:23 -0000	1.261
+++ fc6	19 Sep 2007 13:24:50 -0000	1.262
@@ -7,7 +7,6 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
-GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc7	18 Sep 2007 15:43:23 -0000	1.109
+++ fc7	19 Sep 2007 13:24:50 -0000	1.110
@@ -8,9 +8,9 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Wed Sep 19 13:31:44 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:31:44 -0400
Subject: rpms/kanatest/devel .cvsignore, 1.3, 1.4 kanatest.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200709191331.l8JDViW9004312@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Update to upstream release 0.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 14:49:25 -0000	1.3
+++ .cvsignore	19 Sep 2007 13:31:12 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/kanatest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kanatest.spec	29 Aug 2007 05:36:06 -0000	1.7
+++ kanatest.spec	19 Sep 2007 13:31:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kanatest
-Version:        0.4.2
-Release:        3%{?dist}
+Version:        0.4.4
+Release:        1%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-1
+- Update to upstream release 0.4.4
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 14:49:25 -0000	1.3
+++ sources	19 Sep 2007 13:31:12 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 13:37:20 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:37:20 -0400
Subject: rpms/system-config-printer/F-7
	system-config-printer-0.7.63.4.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.131, 1.132 sources, 1.136, 1.137 system-config-printer.spec,
	1.108, 1.109 system-config-printer-0.7.63.3.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191337.l8JDbKKu004498@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4458

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.63.4.tar.bz2.sig 
Removed Files:
	system-config-printer-0.7.63.3.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.4-1
- Updated to pycups-1.9.27.
- 0.7.63.4:
  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).



--- NEW FILE system-config-printer-0.7.63.4.tar.bz2.sig ---
??
4i???

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	19 Sep 2007 13:11:02 -0000	1.131
+++ .cvsignore	19 Sep 2007 13:36:48 -0000	1.132
@@ -113,3 +113,4 @@
 pycups-1.9.24.tar.bz2
 system-config-printer-0.7.63.3.tar.bz2
 pycups-1.9.27.tar.bz2
+system-config-printer-0.7.63.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	19 Sep 2007 13:11:02 -0000	1.136
+++ sources	19 Sep 2007 13:36:48 -0000	1.137
@@ -1,2 +1,2 @@
-3aeb83e328d383c7f57f3311ec9a9a42  system-config-printer-0.7.63.3.tar.bz2
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
+32e238af2a1e86478df541a407b973ee  system-config-printer-0.7.63.4.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- system-config-printer.spec	19 Sep 2007 13:11:02 -0000	1.108
+++ system-config-printer.spec	19 Sep 2007 13:36:48 -0000	1.109
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.63.3
+Version: 0.7.63.4
 Release: 1%{?dist}
 License: GPL
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -129,8 +129,10 @@
 fi
 
 %changelog
-* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.4-1
 - Updated to pycups-1.9.27.
+- 0.7.63.4:
+  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).
 
 * Thu Aug  9 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.3-1
 - 0.7.63.3:


--- system-config-printer-0.7.63.3.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:50:40 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:50:40 -0400
Subject: rpms/kanatest/F-7 .cvsignore, 1.3, 1.4 kanatest.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200709191350.l8JDoegn004970@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4893

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Fix file not packaged



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 14:51:39 -0000	1.3
+++ .cvsignore	19 Sep 2007 13:50:08 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/kanatest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanatest.spec	21 Jun 2007 14:51:39 -0000	1.6
+++ kanatest.spec	19 Sep 2007 13:50:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           kanatest
-Version:        0.4.2
+Version:        0.4.4
 Release:        2%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-2
+- Update to upstream release 0.4.4
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jun 21 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.2-2
 - Update to upstream release 0.4.2 - Bug 245177
 - URL changed - Bug 245177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 14:51:39 -0000	1.3
+++ sources	19 Sep 2007 13:50:08 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 13:51:24 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:51:24 -0400
Subject: rpms/kanatest/devel kanatest.spec,1.8,1.9
Message-ID: <200709191351.l8JDpODs005078@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4976

Modified Files:
	kanatest.spec 
Log Message:
Fix file not packaged



Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/kanatest.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kanatest.spec	19 Sep 2007 13:31:12 -0000	1.8
+++ kanatest.spec	19 Sep 2007 13:50:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.4.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,10 +54,11 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
-* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-1
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
 - Update to upstream release 0.4.4
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3



From fedora-extras-commits at redhat.com  Wed Sep 19 13:51:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 09:51:34 -0400
Subject: rpms/fast-user-switch-applet/F-7 many-users.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.13, 1.14
Message-ID: <200709191351.l8JDpYDq005120@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	many-users.patch 
Log Message:
improve experience with many users


many-users.patch:

--- NEW FILE many-users.patch ---
diff -up fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users fast-user-switch-applet-2.18.0/src/fusa-manager.c
--- fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users	2007-09-17 01:56:45.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-manager.c	2007-09-17 02:08:59.000000000 -0400
@@ -129,11 +129,13 @@ struct _FusaManager
 
   GHashTable *shells;
   GHashTable *exclusions;
+  GHashTable *inclusions;
   gchar *global_face_dir;
   uid_t minimal_uid;
   gsize user_max_file;
   gint max_icon_size;
 
+  guint8 include_all : 1;
   guint8 allow_root  : 1;
   guint8 relax_group : 1;
   guint8 relax_other : 1;
@@ -341,6 +343,8 @@ fusa_manager_init (FusaManager *manager)
   /* GDM config file */
   manager->exclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       g_free, NULL);
+  manager->inclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
   reload_gdm_config (manager, FALSE);
   error = NULL;
   uri = g_filename_to_uri (GDMCONFIGFILE, NULL, &error);
@@ -645,6 +649,38 @@ merge_gdm_exclusions (FusaManager  *mana
   return TRUE;
 }
 
+/* Returns TRUE if changed */
+static gboolean
+merge_gdm_inclusions (FusaManager  *manager,
+		      gchar       **includev,
+		      const gchar  *include_default[])
+{
+  gint i;
+
+  if (strv_equals_string_table (includev, manager->inclusions))
+    return FALSE;
+
+  g_hash_table_foreach_remove (manager->inclusions,
+			       clear_hash_table_hrfunc, NULL);
+
+  if (include_default)
+    {
+      for (i = 0; include_default[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (include_default[i]),
+			     GUINT_TO_POINTER (TRUE));
+    }
+
+  if (includev)
+    {
+      for (i = 0; includev[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (includev[i]), GUINT_TO_POINTER (TRUE));
+    }
+
+  return TRUE;
+}
+
 static void resolve_dirty_flags(GdmResultState dummy1, const gchar *dummy2, gpointer data)
 {
   FusaManager *manager = data;
@@ -687,6 +723,27 @@ static void handler_Exclude(GdmResultSta
     manager->users_dirty = TRUE;
 }
 
+static void handler_Include(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gchar** includev = g_strsplit (value, ",", G_MAXINT);
+  
+  if (merge_gdm_inclusions (manager, includev, NULL))
+    manager->users_dirty = TRUE;
+}
+
+static void handler_IncludeAll(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gboolean tmp_include_all = strcasecmp(value, "false") != 0;
+  
+  if (tmp_include_all != manager->include_all)
+    {
+      manager->include_all = tmp_include_all;
+      manager->users_dirty = TRUE;
+    }
+}
+
 static void handler_GlobalFaceDir(GdmResultState is_ok, const gchar *value, gpointer data)
 {
   FusaManager *manager = data;
@@ -744,6 +801,8 @@ struct SettingsHandler {
 } settings_handlers[] = {
   { "greeter/MinimalUID", handler_MinimalUID },
   { "greeter/Exclude", handler_Exclude },
+  { "greeter/Include", handler_Include },
+  { "greeter/IncludeAll", handler_IncludeAll },
   { "greeter/GlobalFaceDir", handler_GlobalFaceDir },
   { "security/UserMaxFile", handler_UserMaxFile },
   { "security/AllowRoot", handler_AllowRoot },
@@ -798,27 +857,76 @@ reload_shells (FusaManager *manager)
   endusershell ();
 }
 
-static void
-reload_passwd (FusaManager *manager)
+#define OLD_FLAG 1
+#define NEW_FLAG 2
+
+static void set_flag (GObject *obj, int flag)
 {
-  struct passwd *pwent;
-  GSList *old_users, *new_users, *list;
-  
-  old_users = NULL;
-  new_users = NULL;
+  int flags;
+
+  flags = GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+  flags |= flag;
+  g_object_set_data (obj, "fusa-user-flags", GINT_TO_POINTER (flags));  
+}
+
+static int get_flags (GObject *obj)
+{
+  return GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+}
+
+static void clear_flags (GObject *obj)
+{
+  g_object_set_data (obj, "fusa-user-flags", NULL);
+}
 
-  g_hash_table_foreach (manager->users, listify_hash_values_hfunc, &old_users);
-  g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+static void mark_as_old (gpointer key, gpointer value, gpointer data)
+{
+  GObject *user = value;
 
+  set_flag (user, OLD_FLAG);  
   /* Make sure we keep users who are logged in no matter what. */
-  for (list = old_users; list; list = list->next)
+  if (fusa_user_get_n_displays (FUSA_USER (user)))
     {
-      if (fusa_user_get_n_displays (list->data))
-	{
-	  g_object_freeze_notify (G_OBJECT (list->data));
-	  new_users = g_slist_prepend (new_users, g_object_ref (list->data));
-	}
+      set_flag (user, NEW_FLAG);
+      g_object_freeze_notify (user);
+    }
+}
+
+static gboolean emit_add_or_remove (gpointer key, gpointer value, gpointer data)
+{
+  FusaManager *manager = data;
+  int flags;
+
+  flags = get_flags (value);
+  clear_flags (value);
+
+  if (flags == NEW_FLAG) 
+    { 
+      g_signal_emit (manager, signals[USER_ADDED], 0, value);
+      return FALSE;
+    }
+  else if (flags == OLD_FLAG)
+    {
+      g_signal_emit (manager, signals[USER_REMOVED], 0, value);
+      g_hash_table_remove (manager->users_by_uid,
+			   GINT_TO_POINTER (fusa_user_get_uid (value)));
+      return TRUE;
     }
+  else
+    return FALSE;
+}
+
+static void thaw (gpointer key, gpointer value, gpointer data)
+{
+  g_object_thaw_notify (value);
+}
+
+static void
+reload_passwd (FusaManager *manager)
+{
+  struct passwd *pwent;
+  
+  g_hash_table_foreach (manager->users, mark_as_old, NULL);
 
   setpwent ();
 
@@ -841,65 +949,36 @@ reload_passwd (FusaManager *manager)
       if (g_hash_table_lookup (manager->exclusions, pwent->pw_name))
 	continue;
 
+      if (g_hash_table_size (manager->inclusions) > 0)
+        {
+          if (!g_hash_table_lookup (manager->inclusions, pwent->pw_name))
+            continue;
+        }
+      else if (!manager->include_all)
+        continue;
+      
       user = g_hash_table_lookup (manager->users, pwent->pw_name);
 
-      /* Update users already in the *new* list */
-      if (g_slist_find (new_users, user))
-	{
-	  _fusa_user_update (user, pwent);
-	  continue;
-	}
-
-      if (!user)
-	user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
-      else
-	g_object_ref (user);
+      if (!user) 
+        {
+	  user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
+          g_hash_table_insert (manager->users,
+	  		       g_strdup (pwent->pw_name),
+			       user);
+          g_hash_table_insert (manager->users_by_uid,
+			       GINT_TO_POINTER (pwent->pw_uid),
+			       g_object_ref (user));
+        }
 
-      /* Freeze & update users not already in the new list */
       g_object_freeze_notify (G_OBJECT (user));
       _fusa_user_update (user, pwent);
-
-      new_users = g_slist_prepend (new_users, user);
+      set_flag (G_OBJECT (user), NEW_FLAG);
     }
   
   endpwent ();
 
-  /* Go through and handle added users */
-  for (list = new_users; list; list = list->next)
-    {
-      if (!g_slist_find (old_users, list->data))
-	{
-	  g_hash_table_insert (manager->users,
-			       g_strdup (fusa_user_get_user_name (list->data)),
-			       g_object_ref (list->data));
-	  g_hash_table_insert (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)),
-			       list->data);
-	  g_signal_emit (manager, signals[USER_ADDED], 0, list->data);
-	}
-    }
-
-  /* Go through and handle removed users */
-  for (list = old_users; list; list = list->next)
-    {
-      if (!g_slist_find (new_users, list->data))
-	{
-	  g_signal_emit (manager, signals[USER_REMOVED], 0, list->data);
-	  g_hash_table_remove (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)));
-	  g_hash_table_remove (manager->users,
-			       fusa_user_get_user_name (list->data));
-          /* FIXME: signals[USER_REMOVED]??? Why not? */
-	}
-    }
-
-  /* Cleanup */
-  g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
-  g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (new_users);
-
-  g_slist_foreach (old_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (old_users);
+  g_hash_table_foreach_remove (manager->users, emit_add_or_remove, manager);
+  g_hash_table_foreach (manager->users, thaw, NULL);
 }
 
 
diff -up fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users fast-user-switch-applet-2.18.0/src/fusa-user.c
--- fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users	2007-04-09 12:01:02.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-user.c	2007-09-17 01:56:45.000000000 -0400
@@ -81,6 +81,7 @@ struct _FusaUser
   gchar *display_name;
   gchar *home_dir;
   gchar *shell;
+  gchar *key;
 
   GSList *displays;
 };
@@ -444,6 +445,9 @@ _fusa_user_update (FusaUser            *
       g_object_notify (G_OBJECT (user), "shell");
     }
 
+  g_free (user->key);
+  user->key = NULL;
+
   g_object_thaw_notify (G_OBJECT (user));
 }
 
@@ -684,12 +688,28 @@ fusa_user_render_icon (FusaUser  *user,
   return _fusa_manager_render_icon (user->manager, user, widget, icon_size);
 }
 
+static gchar *
+get_collate_key (FusaUser *user)
+{
+  if (!user->key)
+    {
+      gchar *str;
+
+      if (user->display_name)
+        str = user->display_name;
+      else
+        str = user->username;
+
+      user->key = g_utf8_collate_key (str, -1);
+    }
+
+  return user->key;
+}
+
 gint
 fusa_user_collate (FusaUser *user1,
 		   FusaUser *user2)
 {
-  const gchar *str1, *str2;
-
   g_return_val_if_fail (user1 == NULL || FUSA_IS_USER (user1), 0);
   g_return_val_if_fail (user2 == NULL || FUSA_IS_USER (user2), 0);
 
@@ -702,24 +722,5 @@ fusa_user_collate (FusaUser *user1,
   if (!user1 && !user2)
     return 0;
 
-  if (user1->display_name)
-    str1 = user1->display_name;
-  else
-    str1 = user1->username;
-
-  if (user2->display_name)
-    str2 = user2->display_name;
-  else
-    str2 = user2->username;
-
-  if (!str1 && str2)
-    return -1;
-
-  if (str1 && !str2)
-    return 1;
-
-  if (!str1 && !str2)
-    return 0;
-
-  return g_utf8_collate (str1, str2);
+  return strcmp (get_collate_key (user1), get_collate_key (user2));
 }


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/F-7/fast-user-switch-applet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fast-user-switch-applet.spec	30 Mar 2007 20:10:54 -0000	1.13
+++ fast-user-switch-applet.spec	19 Sep 2007 13:51:01 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
 Version:        2.17.4 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPL
@@ -16,6 +16,8 @@
 Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477666
+Patch6:		many-users.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +52,7 @@
 %patch3 -p1 -b .no-session
 %patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
+%patch6 -p1 -b .many-users
 
 %build
 %configure --disable-scrollkeeper \
@@ -105,6 +108,9 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-5
+- Make the handling of large numbers of users more efficient (#353831)
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-4
 - Add bugzilla information to the .server file
 - Fix a bug in the gdm socket check 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:56:24 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:56:24 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.27.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.141, 1.142 sources, 1.146,
	1.147 system-config-printer.spec, 1.129,
	1.130 pycups-1.9.26.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191356.l8JDuOiu005315@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.27.tar.bz2.sig 
Removed Files:
	pycups-1.9.26.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.27.



--- NEW FILE pycups-1.9.27.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	12 Sep 2007 13:13:31 -0000	1.141
+++ .cvsignore	19 Sep 2007 13:55:51 -0000	1.142
@@ -137,3 +137,4 @@
 system-config-printer-0.7.74.tar.bz2
 system-config-printer-0.7.74.1.tar.bz2
 pycups-1.9.26.tar.bz2
+pycups-1.9.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	12 Sep 2007 13:13:31 -0000	1.146
+++ sources	19 Sep 2007 13:55:51 -0000	1.147
@@ -1,2 +1,2 @@
 b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
-7819b0749172f01162c11e9a9f01dea2  pycups-1.9.26.tar.bz2
+20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- system-config-printer.spec	12 Sep 2007 13:13:31 -0000	1.129
+++ system-config-printer.spec	19 Sep 2007 13:55:51 -0000	1.130
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.26
+%define pycups_version 1.9.27
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -128,6 +128,9 @@
 fi
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.27.
+
 * Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
 - Updated pycups to 1.9.26.
 - Build requires epydoc.  Ship HTML documentation.


--- pycups-1.9.26.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:58:35 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 19 Sep 2007 09:58:35 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.22, 1.23 sources, 
	1.22, 1.23 sugar-presence-service.spec, 1.22, 1.23
Message-ID: <200709191358.l8JDwZe4005494@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Wed Sep 19 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.18.20070918git6df1f3eca5
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2007 20:30:33 -0000	1.22
+++ .cvsignore	19 Sep 2007 13:58:03 -0000	1.23
@@ -1 +1,2 @@
 sugar-presence-service-0.65-git46898a3e00.tar.bz2
+sugar-presence-service-0.65-git6df1f3eca5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Sep 2007 20:30:33 -0000	1.22
+++ sources	19 Sep 2007 13:58:03 -0000	1.23
@@ -1 +1 @@
-0af58d6647aef1a3c606c447db4164ec  sugar-presence-service-0.65-git46898a3e00.tar.bz2
+4de90bb058164e15438fa7358fd43c9e  sugar-presence-service-0.65-git6df1f3eca5.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-presence-service.spec	17 Sep 2007 20:30:33 -0000	1.22
+++ sugar-presence-service.spec	19 Sep 2007 13:58:03 -0000	1.23
@@ -1,9 +1,9 @@
-%define alphatag 20070917git
-%define commitid 46898a3e00
+%define alphatag 20070919git
+%define commitid 6df1f3eca5
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.17.%{alphatag}46898a3e00
+Release: 0.18.%{alphatag}6df1f3eca5
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Wed Sep 19 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.18.20070918git6df1f3eca5
+- New snapshot
+
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 14:01:12 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 10:01:12 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.2.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.142, 1.143 sources, 1.147, 1.148 system-config-printer.spec,
	1.130, 1.131
Message-ID: <200709191401.l8JE1CBe011650@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5676

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.2.tar.bz2.sig 
Log Message:
- 0.7.74.2:
  - When a class is removed on the server, remove it from the UI.
  - When deleting a printer, select the default printer again.
  - Select newly-copied printer.
  - Updated translation (fi).
  - Better --help message.
  - Use strcoll to sort manufacturer names.
  - Avoid duplicate 'recommended' marks.
  - Remove duplicate device URIs.
  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).


--- NEW FILE system-config-printer-0.7.74.2.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- .cvsignore	19 Sep 2007 13:55:51 -0000	1.142
+++ .cvsignore	19 Sep 2007 14:00:40 -0000	1.143
@@ -138,3 +138,4 @@
 system-config-printer-0.7.74.1.tar.bz2
 pycups-1.9.26.tar.bz2
 pycups-1.9.27.tar.bz2
+system-config-printer-0.7.74.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	19 Sep 2007 13:55:51 -0000	1.147
+++ sources	19 Sep 2007 14:00:40 -0000	1.148
@@ -1,2 +1,2 @@
-b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
+f5f78d97282eab2e33a302025f31f74e  system-config-printer-0.7.74.2.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- system-config-printer.spec	19 Sep 2007 13:55:51 -0000	1.130
+++ system-config-printer.spec	19 Sep 2007 14:00:40 -0000	1.131
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74.1
+Version: 0.7.74.2
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -128,8 +128,18 @@
 fi
 
 %changelog
-* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-1
 - Updated pycups to 1.9.27.
+- 0.7.74.2:
+  - When a class is removed on the server, remove it from the UI.
+  - When deleting a printer, select the default printer again.
+  - Select newly-copied printer.
+  - Updated translation (fi).
+  - Better --help message.
+  - Use strcoll to sort manufacturer names.
+  - Avoid duplicate 'recommended' marks.
+  - Remove duplicate device URIs.
+  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).
 
 * Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
 - Updated pycups to 1.9.26.



From fedora-extras-commits at redhat.com  Wed Sep 19 14:01:18 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 10:01:18 -0400
Subject: rpms/kanatest/F-7 kanatest.spec,1.7,1.8
Message-ID: <200709191401.l8JE1I4w011714@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5674

Modified Files:
	kanatest.spec 
Log Message:
Update to 0.4.4



Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/kanatest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kanatest.spec	19 Sep 2007 13:50:08 -0000	1.7
+++ kanatest.spec	19 Sep 2007 14:00:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,10 +54,11 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
-* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-2
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
 - Update to upstream release 0.4.4
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3



From fedora-extras-commits at redhat.com  Wed Sep 19 14:07:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 10:07:55 -0400
Subject: rpms/kanatest/FC-6 .cvsignore, 1.3, 1.4 kanatest.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200709191407.l8JE7tPd012253@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Update to upstream 0.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 15:04:42 -0000	1.3
+++ .cvsignore	19 Sep 2007 14:07:22 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/kanatest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanatest.spec	21 Jun 2007 15:04:42 -0000	1.6
+++ kanatest.spec	19 Sep 2007 14:07:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kanatest
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.4.4
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,9 +54,16 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
+- Update to upstream release 0.4.4
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jun 21 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.2-2
 - Update to upstream release 0.4.2 - Bug 245177
 - URL changed - Bug 245177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 15:04:42 -0000	1.3
+++ sources	19 Sep 2007 14:07:22 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 14:54:18 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 19 Sep 2007 10:54:18 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, 1.2,
	1.3 evolution.spec, 1.292, 1.293
Message-ID: <200709191454.l8JEsIXF013620@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13590

Modified Files:
	evolution-2.11.92-icon-names.patch evolution.spec 
Log Message:

* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-3.fc8
- Re-enable the inline audio plugin since it now uses GStreamer 0.10.


evolution-2.11.92-icon-names.patch:

Index: evolution-2.11.92-icon-names.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.11.92-icon-names.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.11.92-icon-names.patch	19 Sep 2007 12:06:27 -0000	1.2
+++ evolution-2.11.92-icon-names.patch	19 Sep 2007 14:53:43 -0000	1.3
@@ -1329,7 +1329,7 @@
 -	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 +	E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU),
@@ -1409,7 +1409,7 @@
  	E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU),
  	E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/menu/File/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU),
  	
@@ -1518,7 +1518,7 @@
  
  static EPixmap pixmaps[] = {
 +	E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
@@ -1526,7 +1526,7 @@
 +	E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
 +
 +	E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
-+	E_PIXMAP ("/Toolbar/FileClose", "dialog-close", E_ICON_SIZE_LARGE_TOOLBAR),
++	E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
  	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
 -	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
  


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- evolution.spec	19 Sep 2007 12:06:27 -0000	1.292
+++ evolution.spec	19 Sep 2007 14:53:43 -0000	1.293
@@ -19,7 +19,7 @@
 %define evo_major 2.12
 
 %define exchange_support 1
-%define inline_audio_support 0
+%define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
 %define krb5_support 1
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -185,7 +185,7 @@
 
 %if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
-BuildRequires: gstreamer08-devel
+BuildRequires: gstreamer-devel
 %endif
 
 %if %{ldap_support} 
@@ -708,10 +708,10 @@
 %files help -f help.lang
 %dir %{_datadir}/omf/evolution
 
-# Look into re-enabling the inline-audio plugin once 2.12 ships.
-# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
-
 %changelog
+* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-3.fc8
+- Re-enable the inline audio plugin since it now uses GStreamer 0.10.
+
 * Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
 - Revise patch for GNOME bug #477045 (less-zealous icon renaming).
 



From fedora-extras-commits at redhat.com  Wed Sep 19 14:56:48 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 10:56:48 -0400
Subject: rpms/alsa-utils/devel alsa-utils-1.0.14-statedir.patch,NONE,1.1
Message-ID: <200709191456.l8JEumYA013718@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13708

Added Files:
	alsa-utils-1.0.14-statedir.patch 
Log Message:
added missing path

alsa-utils-1.0.14-statedir.patch:

--- NEW FILE alsa-utils-1.0.14-statedir.patch ---
--- alsa-utils-1.0.14/alsaconf/alsaconf.in~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/alsaconf.in	2007-08-26 22:40:21.000000000 +0300
@@ -938,8 +938,8 @@ If you have a big amplifier, lower your 
 	  aplay -N $TESTSOUND
       fi
     fi
-    if [ ! -r /etc/asound.state ]; then
-	xecho "Saving the mixer setup used for this in /etc/asound.state."
+    if [ ! -r /var/lib/alsa/asound.state ]; then
+	xecho "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
 	$sbindir/alsactl store
     fi
     clear
--- alsa-utils-1.0.14/alsaconf/po/ja.po~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/po/ja.po	2007-08-26 22:40:43.000000000 +0300
@@ -203,8 +203,8 @@ msgstr ""
 "  ??????????????????????????????????????????????????????????????????\n"
 
 #: ../alsaconf.in:932
-msgid "Saving the mixer setup used for this in /etc/asound.state."
-msgstr "???????????????????????? /etc/asound.state ??????????????????"
+msgid "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
+msgstr "???????????????????????? /var/lib/alsa/asound.state ??????????????????"
 
 #: ../alsaconf.in:936
 msgid ""
--- alsa-utils-1.0.14/alsaconf/po/ru.po~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/po/ru.po	2007-08-26 22:40:34.000000000 +0300
@@ -211,8 +211,8 @@ msgstr ""
 "  ?? ???????????????????????????? ?????? ???? ?????????????? ???????????????? ????????????.\n"
 
 #: ../alsaconf.in:932
-msgid "Saving the mixer setup used for this in /etc/asound.state."
-msgstr "?????????????????? ?????????????????? ?????????????? ?? /etc/asound.state."
+msgid "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
+msgstr "?????????????????? ?????????????????? ?????????????? ?? /var/lib/alsa/asound.state."
 
 #: ../alsaconf.in:936
 msgid ""
--- alsa-utils-1.0.14/alsactl/alsactl.1~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsactl/alsactl.1	2007-08-26 22:40:03.000000000 +0300
@@ -35,7 +35,7 @@ Help: show available flags and commands.
 
 .TP
 \fI\-f, \-\-file\fP
-Select the configuration file to use. The default is /etc/asound.state or
+Select the configuration file to use. The default is /var/lib/alsa/asound.state or
 /etc/asound.names (for the \fInames\fP command).
 
 .TP
@@ -52,7 +52,7 @@ Use debug mode: a bit more verbose.
 Print alsactl version number.
 
 .SH FILES
-\fI/etc/asound.state\fP (or whatever file you specify with the
+\fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the
 \fB\-f\fP flag) is used to store current settings for your
 soundcards. The settings include all the usual soundcard mixer
 settings.  More importantly, alsactl is
--- alsa-utils-1.0.14/alsactl/alsactl.c~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsactl/alsactl.c	2007-08-26 22:40:10.000000000 +0300
@@ -30,7 +30,7 @@
 #include <alsa/asoundlib.h>
 #include "alsactl.h"
 
-#define SYS_ASOUNDRC "/etc/asound.state"
+#define SYS_ASOUNDRC "/var/lib/alsa/asound.state"
 #define SYS_ASOUNDNAMES "/etc/asound.names"
 
 int debugflag = 0;



From fedora-extras-commits at redhat.com  Wed Sep 19 15:09:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 19 Sep 2007 11:09:12 -0400
Subject: rpms/iproute/devel iproute2-ss050901-opt_flags.patch,1.2,1.3
Message-ID: <200709191509.l8JF9CRf020198@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20123

Added Files:
	iproute2-ss050901-opt_flags.patch 
Log Message:
Remove correct patch and readd one.


iproute2-ss050901-opt_flags.patch:

Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: iproute2-ss050901-opt_flags.patch
diff -N iproute2-ss050901-opt_flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ iproute2-ss050901-opt_flags.patch	19 Sep 2007 15:09:09 -0000	1.3
@@ -0,0 +1,11 @@
+--- iproute2-ss050901/Makefile.opt_flags	2005-09-23 11:49:01.000000000 +0200
++++ iproute2-ss050901/Makefile	2005-09-23 11:49:31.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ CC = gcc
+ HOSTCC = gcc
+-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS)
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:09:32 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 19 Sep 2007 11:09:32 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.59,1.60
Message-ID: <200709191509.l8JF9WSp020204@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/libdhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156

Modified Files:
	libdhcp.spec 
Log Message:
* Wed Sep 19 2007 David Cantrell <dcantrell at redhat.com> - 1.27-3
- static package Requires libdhcp6client-static



Index: libdhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libdhcp.spec	21 Aug 2007 17:25:58 -0000	1.59
+++ libdhcp.spec	19 Sep 2007 15:09:00 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A library for network interface configuration with DHCP
 Name:    libdhcp
 Version: 1.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   Development/Libraries
 URL:     http://dcantrel.fedorapeople.org/%{name}
@@ -32,7 +32,8 @@
 %package static
 Summary:  Static archive of libdhcp
 Group:    Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}, libdhcp4client-static
+Requires: %{name}-devel = %{version}-%{release}
+Requires: libdhcp4client-static libdhcp6client-static
 
 %description static
 The libdhcp-static package contains the static archive for libdhcp.
@@ -70,6 +71,9 @@
 %{_libdir}/libdhcp.a
 
 %changelog
+* Wed Sep 19 2007 David Cantrell <dcantrell at redhat.com> - 1.27-3
+- static package Requires libdhcp6client-static
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 1.27-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:10:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:10:25 -0400
Subject: rpms/gdm/devel hang.patch,NONE,1.1 gdm.spec,1.287,1.288
Message-ID: <200709191510.l8JFAPIN020290@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20210

Modified Files:
	gdm.spec 
Added Files:
	hang.patch 
Log Message:
fix a hang


hang.patch:

--- NEW FILE hang.patch ---
--- trunk/gui/gdmcommon.c	2007/09/18 14:48:25	5279
+++ trunk/gui/gdmcommon.c	2007/09/18 18:39:42	5280
@@ -681,7 +681,9 @@
 	g_spawn_async (".",
 		       pre_fetch_prog_argv,
 		       NULL,
-		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
+		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH | 
+                              G_SPAWN_STDOUT_TO_DEV_NULL |
+                              G_SPAWN_STDERR_TO_DEV_NULL),
 		       NULL,
 		       NULL,
 		       &pid,
@@ -710,7 +712,9 @@
 	g_spawn_async (".",
 		       atspi_prog_argv,
 		       NULL,
-		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
+		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH |
+                              G_SPAWN_STDOUT_TO_DEV_NULL |
+                              G_SPAWN_STDERR_TO_DEV_NULL),
 		       NULL,
 		       NULL,
 		       &pid,


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- gdm.spec	18 Sep 2007 05:08:54 -0000	1.287
+++ gdm.spec	19 Sep 2007 15:09:52 -0000	1.288
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -55,6 +55,9 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.8-selinux.patch
 
+# fixed in upstream svn
+Patch38: hang.patch
+
 Patch100: gdm-2.19.8-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -139,6 +142,7 @@
 %patch33 -p1 -b .pass-ats-to-session
 %patch35 -p1 -b .gdmsetup-path
 %patch37 -p1 -b .selinux
+%patch38 -p1 -b .hang
 
 %patch100 -p1 -b .change-defaults
 
@@ -351,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-2
+- Fix a hang on restart (#240853)
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:10:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 19 Sep 2007 11:10:47 -0400
Subject: rpms/iproute/devel cbq-0.7.1-avpkt-enhancement.patch,1.1,NONE
Message-ID: <200709191510.l8JFAlAi020316@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Removed Files:
	cbq-0.7.1-avpkt-enhancement.patch 
Log Message:
Now really remove unused patch.



--- cbq-0.7.1-avpkt-enhancement.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:18:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:18:22 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.41, 1.42 libgnomeui.spec, 1.78, 
	1.79 sources, 1.41, 1.42
Message-ID: <200709191518.l8JFIMoW020581@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20552

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	30 Jul 2007 22:30:26 -0000	1.41
+++ .cvsignore	19 Sep 2007 15:17:49 -0000	1.42
@@ -1 +1 @@
-libgnomeui-2.19.1.tar.bz2
+libgnomeui-2.20.0.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- libgnomeui.spec	23 Aug 2007 18:16:52 -0000	1.78
+++ libgnomeui.spec	19 Sep 2007 15:17:49 -0000	1.79
@@ -17,10 +17,10 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.19.1
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnomeui/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnomeui/2.20/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -142,6 +142,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.1-3
 - Rebuild for ppc toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	30 Jul 2007 22:30:26 -0000	1.41
+++ sources	19 Sep 2007 15:17:49 -0000	1.42
@@ -1 +1 @@
-a579b176321f55325135bcd8593243b1  libgnomeui-2.19.1.tar.bz2
+1b4e98c8c34f69e456378316eab9289b  libgnomeui-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:26:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:26:08 -0400
Subject: rpms/GConf2/devel .cvsignore, 1.29, 1.30 GConf2.spec, 1.64,
	1.65 sources, 1.29, 1.30
Message-ID: <200709191526.l8JFQ8kh021156@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21072

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	25 Jun 2007 21:48:06 -0000	1.29
+++ .cvsignore	19 Sep 2007 15:25:35 -0000	1.30
@@ -1 +1 @@
-GConf-2.19.1.tar.bz2
+GConf-2.20.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- GConf2.spec	11 Sep 2007 19:54:13 -0000	1.64
+++ GConf2.spec	19 Sep 2007 15:25:35 -0000	1.65
@@ -4,11 +4,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.19.1
-Release: 5%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
-Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 
@@ -131,6 +131,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-5
 - Some more leak fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	25 Jun 2007 21:48:06 -0000	1.29
+++ sources	19 Sep 2007 15:25:35 -0000	1.30
@@ -1 +1 @@
-78373f2a461354c7e0b32c0dc9c586b3  GConf-2.19.1.tar.bz2
+a6d82dee79df11b6e38b19cb42197d32  GConf-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:39:20 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 19 Sep 2007 11:39:20 -0400
Subject: fedora-security/audit fc6,1.262,1.263 fc7,1.110,1.111
Message-ID: <200709191539.l8JFdKiF024682@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24650/audit

Modified Files:
	fc6 fc7 
Log Message:
Few more issues.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- fc6	19 Sep 2007 13:24:50 -0000	1.262
+++ fc6	19 Sep 2007 15:39:17 -0000	1.263
@@ -7,7 +7,10 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
-CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
+CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8
+CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
@@ -21,6 +24,8 @@
 CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
+CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
+CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc7	19 Sep 2007 13:24:50 -0000	1.110
+++ fc7	19 Sep 2007 15:39:17 -0000	1.111
@@ -11,11 +11,14 @@
 GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
+CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
+CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
 CVE-2007-4752 VULNERABLE (openssh) #280461
@@ -36,7 +39,7 @@
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
-CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
+CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]



From fedora-extras-commits at redhat.com  Wed Sep 19 15:39:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:39:55 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.12,1.13
Message-ID: <200709191539.l8JFdtoo024756@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24656

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-subclipse.spec	10 Sep 2007 15:18:16 -0000	1.12
+++ eclipse-subclipse.spec	19 Sep 2007 15:39:22 -0000	1.13
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 15:44:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:44:29 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.50, 1.51 gnome-themes.spec,
	1.96, 1.97 sources, 1.55, 1.56
Message-ID: <200709191544.l8JFiTTZ025320@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25229

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	4 Sep 2007 03:47:07 -0000	1.50
+++ .cvsignore	19 Sep 2007 15:43:56 -0000	1.51
@@ -1 +1 @@
-gnome-themes-2.19.92.tar.bz2
+gnome-themes-2.20.0.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-themes.spec	4 Sep 2007 03:47:07 -0000	1.96
+++ gnome-themes.spec	19 Sep 2007 15:43:56 -0000	1.97
@@ -2,10 +2,10 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
-Source: http://download.gnome.org/sources/gnome-themes/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-themes/2.20/%{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
 Patch1: clearlooks-0.5-inherit-bluecurve.patch
 Patch2: gnome-themes-2.17.92-clearlooks.patch
@@ -105,6 +105,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	4 Sep 2007 03:47:07 -0000	1.55
+++ sources	19 Sep 2007 15:43:56 -0000	1.56
@@ -1,2 +1,2 @@
-b556ea726a1adbe2bf5f20cea14a9e89  gnome-themes-2.19.92.tar.bz2
+862b436d77ff4dcf14849524d33c296c  gnome-themes-2.20.0.tar.bz2
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:47:04 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:47:04 -0400
Subject: rpms/javasvn/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191547.l8JFl40f025674@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, renamed to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:47:56 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:47:56 -0400
Subject: rpms/javasvn/F-7 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191547.l8JFluqh025844@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25801

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, remaned to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:48:21 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:48:21 -0400
Subject: rpms/javasvn/FC-6 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191548.l8JFmL8A025942@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25921

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, remaned to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:49:01 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:49:01 -0400
Subject: rpms/javasvn/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200709191549.l8JFn1b2026125@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26083

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, renamed to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:52:16 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Wed, 19 Sep 2007 11:52:16 -0400
Subject: rpms/wdaemon/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wdaemon.spec, 1.1, 1.2
Message-ID: <200709191552.l8JFqGMf026605@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503

Modified Files:
	.cvsignore sources wdaemon.spec 
Log Message:
* updating to upstream version 0.12




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2007 12:58:58 -0000	1.2
+++ .cvsignore	19 Sep 2007 15:51:44 -0000	1.3
@@ -1 +1,2 @@
 wdaemon-0.11.tar.bz2
+wdaemon-0.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2007 12:58:58 -0000	1.2
+++ sources	19 Sep 2007 15:51:44 -0000	1.3
@@ -1 +1,2 @@
 ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2
+3ca0ff8aad51a12a6deb1fe0734da33c  wdaemon-0.12.tar.bz2


Index: wdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/wdaemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wdaemon.spec	11 Sep 2007 12:58:58 -0000	1.1
+++ wdaemon.spec	19 Sep 2007 15:51:44 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		wdaemon
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	Hotplug helper for Wacom X.org driver
 
@@ -63,6 +63,9 @@
 %{_sysconfdir}/udev/scripts/is_uinput.sh
 
 %changelog
+* Wed Sep 19 2007 Aristeu Rozanski <arozansk at redhat.com> 0.12-1
+- Updated to version 0.12
+
 * Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
 - Updated to version 0.11
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:04:24 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:04:24 -0400
Subject: rpms/eclipse-subclipse/F-7 eclipse-subclipse.spec,1.6,1.7
Message-ID: <200709191604.l8JG4OIc000919@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv890

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-subclipse.spec	18 Sep 2007 13:54:04 -0000	1.6
+++ eclipse-subclipse.spec	19 Sep 2007 16:03:36 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 16:07:11 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:07:11 -0400
Subject: rpms/ganymed-ssh2/EL-5 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709191607.l8JG7Btt001009@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv978

Modified Files:
	ganymed-ssh2.spec 
Log Message:
Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/EL-5/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	19 Sep 2007 16:06:38 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:08:21 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 12:08:21 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 sugar-datastore.spec, 1.28, 1.29
Message-ID: <200709191608.l8JG8LVj001100@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1070

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	18 Sep 2007 18:50:22 -0000	1.27
+++ .cvsignore	19 Sep 2007 16:07:48 -0000	1.28
@@ -1 +1 @@
-sugar-datastore-0.2.2-git48ab782a01.tar.bz2
+sugar-datastore-0.2.2-git11013dc3ca.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Sep 2007 18:50:22 -0000	1.27
+++ sources	19 Sep 2007 16:07:48 -0000	1.28
@@ -1 +1 @@
-442e68e24e4d8ae5dd161733efb66852  sugar-datastore-0.2.2-git48ab782a01.tar.bz2
+8e3bae187edcaaef8ca3d69976d6a331  sugar-datastore-0.2.2-git11013dc3ca.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sugar-datastore.spec	18 Sep 2007 18:50:22 -0000	1.28
+++ sugar-datastore.spec	19 Sep 2007 16:07:48 -0000	1.29
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070918git
-%define commitid 48ab782a01
+%define alphatag 20070919git
+%define commitid 11013dc3ca
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.24.%{alphatag}48ab782a01
+Release: 0.25.%{alphatag}11013dc3ca
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:08:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:08:55 -0400
Subject: rpms/svnkit/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.1, 1.2
Message-ID: <200709191608.l8JG8tZx001168@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1097

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 15:16:23 -0000	1.2
+++ .cvsignore	19 Sep 2007 16:08:22 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 15:16:23 -0000	1.2
+++ sources	19 Sep 2007 16:08:22 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 15:16:23 -0000	1.1
+++ svnkit.spec	19 Sep 2007 16:08:22 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:14:26 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 12:14:26 -0400
Subject: rpms/sugar/OLPC-2 sources,1.56,1.57 sugar.spec,1.67,1.68
Message-ID: <200709191614.l8JGEQTr001405@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1324

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	18 Sep 2007 18:47:43 -0000	1.56
+++ sources	19 Sep 2007 16:13:54 -0000	1.57
@@ -1 +1 @@
-8a8612c93c6e9a8283f002f10a48665c  sugar-0.65-gitb8ce5083b7.tar.bz2
+cfe2b46a134d04f3fe439e397bc311fa  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sugar.spec	18 Sep 2007 18:47:43 -0000	1.67
+++ sugar.spec	19 Sep 2007 16:13:54 -0000	1.68
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070918git
+%define alphatag 20070919git
 %define commitid b8ce5083b7
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.52.%{alphatag}b8ce5083b7
+Release: 0.53.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:28:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:28:48 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.58, 1.59 fedora-logos.spec,
	1.82, 1.83 sources, 1.63, 1.64
Message-ID: <200709191628.l8JGSmvw001967@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1907

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
add infinity lock dialog



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	13 Sep 2007 20:52:24 -0000	1.58
+++ .cvsignore	19 Sep 2007 16:28:15 -0000	1.59
@@ -1 +1 @@
-fedora-logos-7.92.1.tar.bz2
+fedora-logos-7.92.2.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fedora-logos.spec	14 Sep 2007 20:17:34 -0000	1.82
+++ fedora-logos.spec	19 Sep 2007 16:28:15 -0000	1.83
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.1
-Release: 2%{?dist}
+Version: 7.92.2
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 
@@ -203,8 +203,8 @@
 # end i386 bits
 
 %changelog
-* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-2-
-- regen tarball
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.2-1
+- Add infinity lock dialog
 
 * Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
 - add the powered-by logo (#250676)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	14 Sep 2007 20:17:34 -0000	1.63
+++ sources	19 Sep 2007 16:28:15 -0000	1.64
@@ -1 +1 @@
-e598b9fd821a022d4e7185c1ff8653c9  fedora-logos-7.92.1.tar.bz2
+f2a6536f710f5dda2b5505dbaf0faafc  fedora-logos-7.92.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 16:30:48 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 19 Sep 2007 12:30:48 -0400
Subject: rpms/iptables/devel iptables.init, 1.14, 1.15 iptables.spec, 1.51,
	1.52
Message-ID: <200709191630.l8JGUm0H002099@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2065

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not depend on local_fs in lsb header - this delayes start after network
- fixed exit code for initscript usage




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iptables.init	17 Sep 2007 15:46:05 -0000	1.14
+++ iptables.init	19 Sep 2007 16:30:16 -0000	1.15
@@ -10,8 +10,6 @@
 #
 ### BEGIN INIT INFO
 # Provides: iptables
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
 # Default-Start:  2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: start and stop iptables firewall
@@ -335,7 +333,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status|panic|save}"
-	RETVAL=3
+	RETVAL=2
 	;;
 esac
 


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- iptables.spec	17 Sep 2007 15:46:05 -0000	1.51
+++ iptables.spec	19 Sep 2007 16:30:16 -0000	1.52
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-3
+- do not depend on local_fs in lsb header - this delayes start after network
+- fixed exit code for initscript usage
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
 - do not use lock file for condrestart test
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:39:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:39:39 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.59, 1.60 fedora-logos.spec,
	1.83, 1.84 sources, 1.64, 1.65
Message-ID: <200709191639.l8JGddxt002350@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
add gdm infinity theme



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	19 Sep 2007 16:28:15 -0000	1.59
+++ .cvsignore	19 Sep 2007 16:39:06 -0000	1.60
@@ -1 +1 @@
-fedora-logos-7.92.2.tar.bz2
+fedora-logos-7.92.3.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fedora-logos.spec	19 Sep 2007 16:28:15 -0000	1.83
+++ fedora-logos.spec	19 Sep 2007 16:39:06 -0000	1.84
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.2
+Version: 7.92.3
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -203,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.3-1
+- Add infinity gdm theme
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.2-1
 - Add infinity lock dialog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	19 Sep 2007 16:28:15 -0000	1.64
+++ sources	19 Sep 2007 16:39:06 -0000	1.65
@@ -1 +1 @@
-f2a6536f710f5dda2b5505dbaf0faafc  fedora-logos-7.92.2.tar.bz2
+6f5fa87bd54b34b2614799b78b05f5a9  fedora-logos-7.92.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 16:44:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:44:18 -0400
Subject: rpms/gdm/devel gdm-2.20.0-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.288, 1.289
Message-ID: <200709191644.l8JGiIuc002543@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2457

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.0-change-defaults.patch 
Log Message:
FedoraInfinity


gdm-2.20.0-change-defaults.patch:

--- NEW FILE gdm-2.20.0-change-defaults.patch ---
diff -up gdm-2.19.8/config/gdm.conf.in.change-defaults gdm-2.19.8/config/gdm.conf.in
--- gdm-2.19.8/config/gdm.conf.in.change-defaults	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/config/gdm.conf.in	2007-09-12 13:14:39.000000000 -0400
@@ -66,9 +66,9 @@ TimedLoginDelay=30
 # should leave this alone.
 #Chooser=@libexecdir@/gdmchooser
 
-# The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
-# to get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+# The greeter for attached (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@libexecdir@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,23 +78,23 @@ TimedLoginDelay=30
 # This is useful for enabling additional feature support e.g. GNOME
 # accessibility framework. Only "trusted" modules should be allowed to minimize
 # security holes
-#AddGtkModules=false
+AddGtkModules=true
 # By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
 # Default path for root.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # If you are having trouble with using a single server for a long time and want
 # GDM to kill/restart the server, turn this on.  On Solaris, this value is
 # always true and this configuration setting is ignored.
-#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@
+AlwaysRestartServer=true
 
 # User and group used for running GDM GUI applications.  By default this is set
 # to user "gdm" and group "gdm".  This user/group should have very limited
@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
 #
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-RebootCommand=@REBOOT_COMMAND@
-HaltCommand=@HALT_COMMAND@
-SuspendCommand=@SUSPEND_COMMAND@
+#
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
 
 # The following options specify how GDM system commands are supported.
 #
@@ -158,14 +158,14 @@ ServAuthDir=@authdir@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@gdmconfdir@/Xsession
+BaseXsession=/etc/X11/xinit/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
 # like /tmp if you don't want the authorizations to be in home directories.
@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession
 # is the home directory the UserAuthFBDir will still be used in case the home
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
 # behavior.
-UserAuthDir=
+UserAuthDir=/tmp
 # Fallback directory for writing authorization file if user's home directory
 # is not writable.
 UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
+#UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
-StandardXServer=@X_SERVER@
+StandardXServer=@X_SERVER@ -br
 # The maximum number of flexible X servers to run.
 #FlexibleXServers=5
 # And after how many minutes should we reap the flexible server if there is no
@@ -209,7 +209,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_
 #DoubleLoginWarning=true
 # Should a second login always resume the current session and switch VT's on
 # Linux and FreeBSD systems for console logins
-#AlwaysLoginCurrentSession=true
+AlwaysLoginCurrentSession=true
 
 # If true then the last login information is printed to the user before being
 # prompted for password.  While this gives away some info on what users are on
@@ -246,7 +246,7 @@ SecurityTokensDriver=
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
-AllowRoot=true
+AllowRoot=false
 # Allow login as root via XDMCP.  This value will be overridden and set to
 # false if the /etc/default/login file exists and contains
 # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
@@ -356,7 +356,7 @@ Enable=false
 #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
-#GtkTheme=Default
+GtkTheme=Clearlooks
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
 # this only affects the standard greeter as the graphical greeter does not yet
 # have this ability.
@@ -377,7 +377,7 @@ Enable=false
 # themed login (gdmgreeter).
 #
 # The standard login has a title bar that the user can move.
-#TitleBar=true
+TitleBar=false
 # Don't allow user to move the standard login window.  Only makes sense if
 # TitleBar is on.
 #LockPosition=false
@@ -395,13 +395,13 @@ Enable=false
 # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
 # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
 # greeter.
-Browser=false
+Browser=true
 # The default picture in the browser.
 #DefaultFace=@pixmapdir@/nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=500
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
 # by commas.
@@ -418,7 +418,7 @@ Browser=false
 # large numbers of users and this feature should not be used in such
 # environments.  The setting of IncludeAll does nothing if Include is set to a
 # non-empty value.
-#IncludeAll=false
+IncludeAll=true
 # If user or user.png exists in this dir it will be used as his picture.
 #GlobalFaceDir=@datadir@/pixmaps/faces/
 
@@ -427,7 +427,7 @@ Browser=false
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -474,8 +474,9 @@ DefaultRemoteWelcome=true
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
 # as the background color.
-BackgroundColor=#76848F
-GraphicalThemedColor=#76848F
+BackgroundColor=#20305a
+GraphicalThemedColor=#000000
+
 # XDMCP session should only get a color, this is the sanest setting since you
 # don't want to take up too much bandwidth
 #BackgroundRemoteOnlyColor=true
@@ -496,8 +497,8 @@ GraphicalThemedColor=#76848F
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
 # use this rather then just running an xterm from a script.
-#ShowGnomeFailsafeSession=true
-#ShowXtermFailsafeSession=true
+ShowGnomeFailsafeSession=false
+ShowXtermFailsafeSession=false
 # Normally there is a session type called 'Last' that is shown which refers to
 # the last session the user used.  If off, we will be in 'switchdesk' mode
 # where the session saving stuff is disabled in GDM
@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
 #Use24Clock=auto
 # Use circles in the password field.  Looks kind of cool actually, but only
 # works with certain fonts.
-#UseCirclesInEntry=false
+UseCirclesInEntry=true
 # Do not show any visible feedback in the password field. This is standard for
 # instance in console, xdm and ssh.
 #UseInvisibleInEntry=false
@@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
 # list then provide a list that is delimited by /: to the GraphicalThemes
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
+GraphicalTheme=FedoraInfinity
 #GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
@@ -633,7 +634,7 @@ Gestures=false
 
 [server-Standard]
 name=Standard server
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
 flexible=true
 # Indicates that the X server should be started at a different process
 # priority.  Values can be any integer value accepted by the setpriority C


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- gdm.spec	19 Sep 2007 15:09:52 -0000	1.288
+++ gdm.spec	19 Sep 2007 16:43:40 -0000	1.289
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -58,7 +58,7 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
-Patch100: gdm-2.19.8-change-defaults.patch
+Patch100: gdm-2.20.0-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -355,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
+- Change default theme to FedoraInfinity
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-2
 - Fix a hang on restart (#240853)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:57:26 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:57:26 -0400
Subject: rpms/eclipse-subclipse/FC-6 eclipse-subclipse.spec,1.6,1.7
Message-ID: <200709191657.l8JGvQ44004176@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-subclipse.spec	10 Sep 2007 17:46:42 -0000	1.6
+++ eclipse-subclipse.spec	19 Sep 2007 16:56:53 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 16:58:04 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:58:04 -0400
Subject: rpms/eclipse-subclipse/EL-5 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709191658.l8JGw4uh004402@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4150

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
- Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core
- Update to upstream 1.2.4
- Build for all supported arquitectures
- Change MANIFEST.MF patch to be applied on prep stage




--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 18:25:12 -0000	1.5
+++ .cvsignore	19 Sep 2007 16:57:31 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 18:25:12 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	19 Sep 2007 16:57:31 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 18:25:12 -0000	1.5
+++ eclipse-subclipse.spec	19 Sep 2007 16:57:31 -0000	1.6
@@ -15,7 +15,7 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
+Version:        1.2.4
 Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -83,6 +80,7 @@
 %if 0%{disable_javahl}
 %patch -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,20 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 18:25:12 -0000	1.5
+++ sources	19 Sep 2007 16:57:31 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 17:07:12 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 13:07:12 -0400
Subject: rpms/galeon/devel galeon-2.0.3-imgload.patch, NONE,
	1.1 galeon-2.0.3-printdial.patch, NONE, 1.1 galeon.spec, 1.34, 1.35
Message-ID: <200709191707.l8JH7Cgr011835@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11542

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-imgload.patch galeon-2.0.3-printdial.patch 
Log Message:
- Added patch to fix image load preference (#292361)
- Added patch to fix print dialog crash (#285661)


galeon-2.0.3-imgload.patch:

--- NEW FILE galeon-2.0.3-imgload.patch ---
--- galeon-2.0.3/mozilla/mozilla-notifiers.cpp.orig	2007-09-19 12:17:01.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-notifiers.cpp	2007-09-19 12:19:08.000000000 +0200
@@ -139,7 +139,7 @@
 {
 	{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
 	{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
+	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
 	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
 	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
 	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
--- galeon-2.0.3/src/galeon-window.c.orig	2007-09-19 12:22:57.000000000 +0200
+++ galeon-2.0.3/src/galeon-window.c	2007-09-19 13:04:26.000000000 +0200
@@ -115,8 +115,8 @@
 static gint GaleonWindowSignals[LAST_SIGNAL];
 
 /* These are the values of in gconf for these items */
-#define VIEW_IMAGES_ALWAYS	0
-#define VIEW_IMAGES_CURRENT	1
+#define VIEW_IMAGES_ALWAYS	1
+#define VIEW_IMAGES_CURRENT	3
 #define VIEW_IMAGES_NEVER	2
 #define ACCEPT_COOKIES_ALWAYS	0
 #define ACCEPT_COOKIES_CURRENT	1
@@ -468,7 +468,6 @@
 
 static guint n_toggle_entries = G_N_ELEMENTS(toggle_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry image_radio_entries[] = {
 	{ "ViewImagesAlwaysAction", NULL, N_("_Always"), NULL,
 	  N_("View all images"), VIEW_IMAGES_ALWAYS },
@@ -480,7 +479,6 @@
 
 static guint n_image_radio_entries = G_N_ELEMENTS (image_radio_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry cookie_radio_entries[] = {
 	{ "WebCookiesAlwaysAction", NULL, N_("A_lways Allow"), NULL,
 	  N_("Always accept cookies"), ACCEPT_COOKIES_ALWAYS },
@@ -1160,12 +1158,21 @@
 radio_group_set_from_value (GaleonWindow *window, GtkRadioActionEntry *entries,
 			    int n_entries, GConfValue *value)
 {
-	GtkAction *action;
+	GtkAction *action = NULL;
 	int val = gconf_value_get_int(value);
-	g_return_if_fail (val < n_entries);
-	g_return_if_fail (entries[val].value == val);
+	int i;
+
+	/* Figure out with GtkRadioActionEntry has our value. These
+	   lists are always very short, just iterate rather than use a
+	   reverse-lookup static table. */
+	for (i = 0; i < n_entries; i++) {
+	    if (entries[i].value == val) {
+		action = gtk_action_group_get_action(window->priv->action_group, entries[i].name);
+		break;
+	    }
+	}
 
-	action = gtk_action_group_get_action(window->priv->action_group, entries[val].name);
+	g_return_if_fail (action != NULL);
 
 	if (! gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{

galeon-2.0.3-printdial.patch:

--- NEW FILE galeon-2.0.3-printdial.patch ---
--- galeon-2.0.3/embed/print-dialog.c.orig	2007-09-19 18:25:35.000000000 +0200
+++ galeon-2.0.3/embed/print-dialog.c	2007-09-19 18:51:01.000000000 +0200
@@ -665,15 +665,20 @@
 	GtkTreeModel *model;
 	GPtrArray *paper_array;
 	guint i;
+	gint combo_selection;
 
 	name_combo = galeon_dialog_get_control(dialog, NAME_PROP);
 	command_entry = galeon_dialog_get_control(dialog, COMMAND_PROP);
 
-	priv->selected_printer =
-			gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	/* Ignore callback if combo box was not yet initialized */
+	combo_selection = gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	if (combo_selection < 0)
+		return;
 
+	priv->selected_printer = combo_selection;
 	info = (EmbedPrintInfo *)g_list_nth_data(priv->printers,
 	                                         priv->selected_printer);
+	g_return_if_fail (info != NULL);
 
 	gtk_widget_set_sensitive(command_entry, info->can_change_command);
 


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- galeon.spec	22 Aug 2007 09:29:06 -0000	1.34
+++ galeon.spec	19 Sep 2007 17:06:37 -0000	1.35
@@ -3,13 +3,15 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 Patch0:		galeon-2.0.3-flashfix.patch
 Patch1:		galeon-2.0.3-plugins.patch
+Patch2:		galeon-2.0.3-imgload.patch
+Patch3:		galeon-2.0.3-printdial.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -41,6 +43,8 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
 %patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
+%patch3 -p1 -b .printdial
 
 
 %build
@@ -115,6 +119,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-12
+- Added patch to fix image load preference (#292361)
+- Added patch to fix print dialog crash (#285661)
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
 - F-8 rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:25 -0700
Subject: [pkgdb] roxterm was added for svahl
Message-ID: <200709191708.l8JH8Su2000879@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package roxterm with summary A fast terminal emulator
Kevin Fenzi (kevin) has approved Package roxterm
Kevin Fenzi (kevin) has added a Fedora devel branch for roxterm with an owner of svahl
Kevin Fenzi (kevin) has approved roxterm in Fedora devel
Kevin Fenzi (kevin) has approved Package roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, 6) updated by kevin
Message-ID: <200709191708.l8JH8kfO024551@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora 6)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, 7) updated by kevin
Message-ID: <200709191708.l8JH8lFv024563@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, devel) updated by kevin
Message-ID: <200709191708.l8JH8lIR024574@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:28 -0400
Subject: rpms/roxterm - New directory
Message-ID: <200709191709.l8JH9S7C012587@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm

Log Message:
Directory /cvs/extras/rpms/roxterm added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:30 -0400
Subject: rpms/roxterm/devel - New directory
Message-ID: <200709191709.l8JH9U0F012614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm/devel

Log Message:
Directory /cvs/extras/rpms/roxterm/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:33 -0400
Subject: rpms/roxterm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709191709.l8JH9XKm012652@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm

Added Files:
	Makefile import.log 
Log Message:
Setup of module roxterm


--- NEW FILE Makefile ---
# Top level Makefile for module roxterm
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:35 -0400
Subject: rpms/roxterm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709191709.l8JH9ZSq012682@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module roxterm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: roxterm
# $Id: Makefile,v 1.1 2007/09/19 17:09:33 kevin Exp $
NAME := roxterm
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 fedora-extras-commits at redhat.com  Wed Sep 19 17:14:27 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 19 Sep 2007 13:14:27 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.1,1.2
Message-ID: <200709191714.l8JHER2I014420@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14177

Modified Files:
	compiz-fusion.spec 
Log Message:
add animation to pluginlist


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-fusion.spec	18 Sep 2007 19:10:29 -0000	1.1
+++ compiz-fusion.spec	19 Sep 2007 17:13:54 -0000	1.2
@@ -1,8 +1,8 @@
-%define plugins colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
+%define plugins animation colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
 
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6
+- Add animation to plugin list
+
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
 - Fix gconf schemas install (RH #53692)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:19:25 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 13:19:25 -0400
Subject: rpms/galeon/F-7 galeon-2.0.3-imgload.patch, NONE, 1.1 galeon.spec, 
	1.33, 1.34
Message-ID: <200709191719.l8JHJPob016208@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16187

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-imgload.patch 
Log Message:
Added patch to fix image loading preference

galeon-2.0.3-imgload.patch:

--- NEW FILE galeon-2.0.3-imgload.patch ---
--- galeon-2.0.3/mozilla/mozilla-notifiers.cpp.orig	2007-09-19 12:17:01.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-notifiers.cpp	2007-09-19 12:19:08.000000000 +0200
@@ -139,7 +139,7 @@
 {
 	{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
 	{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
+	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
 	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
 	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
 	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
--- galeon-2.0.3/src/galeon-window.c.orig	2007-09-19 12:22:57.000000000 +0200
+++ galeon-2.0.3/src/galeon-window.c	2007-09-19 13:04:26.000000000 +0200
@@ -115,8 +115,8 @@
 static gint GaleonWindowSignals[LAST_SIGNAL];
 
 /* These are the values of in gconf for these items */
-#define VIEW_IMAGES_ALWAYS	0
-#define VIEW_IMAGES_CURRENT	1
+#define VIEW_IMAGES_ALWAYS	1
+#define VIEW_IMAGES_CURRENT	3
 #define VIEW_IMAGES_NEVER	2
 #define ACCEPT_COOKIES_ALWAYS	0
 #define ACCEPT_COOKIES_CURRENT	1
@@ -468,7 +468,6 @@
 
 static guint n_toggle_entries = G_N_ELEMENTS(toggle_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry image_radio_entries[] = {
 	{ "ViewImagesAlwaysAction", NULL, N_("_Always"), NULL,
 	  N_("View all images"), VIEW_IMAGES_ALWAYS },
@@ -480,7 +479,6 @@
 
 static guint n_image_radio_entries = G_N_ELEMENTS (image_radio_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry cookie_radio_entries[] = {
 	{ "WebCookiesAlwaysAction", NULL, N_("A_lways Allow"), NULL,
 	  N_("Always accept cookies"), ACCEPT_COOKIES_ALWAYS },
@@ -1160,12 +1158,21 @@
 radio_group_set_from_value (GaleonWindow *window, GtkRadioActionEntry *entries,
 			    int n_entries, GConfValue *value)
 {
-	GtkAction *action;
+	GtkAction *action = NULL;
 	int val = gconf_value_get_int(value);
-	g_return_if_fail (val < n_entries);
-	g_return_if_fail (entries[val].value == val);
+	int i;
+
+	/* Figure out with GtkRadioActionEntry has our value. These
+	   lists are always very short, just iterate rather than use a
+	   reverse-lookup static table. */
+	for (i = 0; i < n_entries; i++) {
+	    if (entries[i].value == val) {
+		action = gtk_action_group_get_action(window->priv->action_group, entries[i].name);
+		break;
+	    }
+	}
 
-	action = gtk_action_group_get_action(window->priv->action_group, entries[val].name);
+	g_return_if_fail (action != NULL);
 
 	if (! gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-7/galeon.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- galeon.spec	18 Jul 2007 14:15:53 -0000	1.33
+++ galeon.spec	19 Sep 2007 17:18:53 -0000	1.34
@@ -3,13 +3,14 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 Patch0:		galeon-2.0.3-flashfix.patch
 Patch1:		galeon-2.0.3-plugins.patch
+Patch2:         galeon-2.0.3-imgload.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -41,6 +42,7 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
 %patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
+- Added patch to fix image loading preference
+
 * Wed Jul 18 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-10
 - Rebuild with gecko-libs 1.8.1.5
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:41:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 13:41:06 -0400
Subject: rpms/sugar/OLPC-2 sources,1.57,1.58 sugar.spec,1.68,1.69
Message-ID: <200709191741.l8JHf6kA018786@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18727

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	19 Sep 2007 16:13:54 -0000	1.57
+++ sources	19 Sep 2007 17:40:33 -0000	1.58
@@ -1 +1 @@
-cfe2b46a134d04f3fe439e397bc311fa  sugar-0.65-gitb8ce5083b7.tar.bz2
+a34b08643ff76b03dbe26ab98a92f7e7  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sugar.spec	19 Sep 2007 16:13:54 -0000	1.68
+++ sugar.spec	19 Sep 2007 17:40:33 -0000	1.69
@@ -5,7 +5,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.53.%{alphatag}b8ce5083b7
+Release: 0.54.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:41:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 19 Sep 2007 13:41:31 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.60,
	1.61 selinux-policy.spec, 1.523, 1.524
Message-ID: <200709191741.l8JHfV8H018829@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18763

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
- Allow xserver to search devpts_t
- Dontaudit ldconfig output to homedir


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policy-20070703.patch	19 Sep 2007 01:11:31 -0000	1.60
+++ policy-20070703.patch	19 Sep 2007 17:40:59 -0000	1.61
@@ -302,8 +302,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.8/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.fc	2007-09-17 16:20:18.000000000 -0400
-@@ -1,4 +1,7 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.fc	2007-09-19 10:53:23.000000000 -0400
+@@ -1,4 +1,8 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
 +/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -311,10 +311,19 @@
  
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
++/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-17 16:20:18.000000000 -0400
-@@ -19,20 +19,24 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-19 10:54:14.000000000 -0400
+@@ -14,25 +14,35 @@
+ type alsa_etc_rw_t;
+ files_type(alsa_etc_rw_t)
+ 
++type alsa_var_lib_t;
++files_type(alsa_var_lib_t)
++
+ ########################################
+ #
  # Local policy
  #
  
@@ -333,6 +342,9 @@
  manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  
++manage_dirs_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
++manage_files_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
++
 +files_search_home(alsa_t)
  files_read_etc_files(alsa_t)
  
@@ -342,7 +354,7 @@
  
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
-@@ -43,7 +47,13 @@
+@@ -43,7 +53,13 @@
  
  userdom_manage_unpriv_user_semaphores(alsa_t)
  userdom_manage_unpriv_user_shared_mem(alsa_t)
@@ -5978,8 +5990,17 @@
  /var/run/vbestate 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.8/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-17 16:20:18.000000000 -0400
-@@ -293,6 +293,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-19 13:28:57.000000000 -0400
+@@ -155,6 +155,8 @@
+ selinux_compute_relabel_context(hald_t)
+ selinux_compute_user_contexts(hald_t)
+ 
++dev_read_raw_memory(hald_t)
++
+ storage_raw_read_removable_device(hald_t)
+ storage_raw_write_removable_device(hald_t)
+ storage_raw_read_fixed_disk(hald_t)
+@@ -293,6 +295,7 @@
  #
  
  allow hald_acl_t self:capability { dac_override fowner };
@@ -9321,7 +9342,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-19 11:59:57.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9331,7 +9352,7 @@
  
  	domain_mmap_low($1_xserver_t)
  
-@@ -141,7 +143,7 @@
+@@ -141,10 +143,11 @@
  	fs_getattr_xattr_fs($1_xserver_t)
  	fs_search_nfs($1_xserver_t)
  	fs_search_auto_mountpoints($1_xserver_t)
@@ -9340,7 +9361,11 @@
  
  	init_getpgid($1_xserver_t)
  
-@@ -353,12 +355,6 @@
++	term_search_ptys($1_xserver_t)
+ 	term_setattr_unallocated_ttys($1_xserver_t)
+ 	term_use_unallocated_ttys($1_xserver_t)
+ 
+@@ -353,12 +356,6 @@
  	# allow ps to show xauth
  	ps_process_pattern($2,$1_xauth_t)
  
@@ -9353,7 +9378,7 @@
  	domain_use_interactive_fds($1_xauth_t)
  
  	files_read_etc_files($1_xauth_t)
-@@ -387,6 +383,14 @@
+@@ -387,6 +384,14 @@
  	')
  
  	optional_policy(`
@@ -9368,7 +9393,7 @@
  		nis_use_ypbind($1_xauth_t)
  	')
  
-@@ -537,16 +541,14 @@
+@@ -537,16 +542,14 @@
  
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
@@ -9387,7 +9412,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +557,46 @@
+@@ -555,25 +558,46 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9443,7 +9468,7 @@
  	')
  ')
  
-@@ -626,6 +649,24 @@
+@@ -626,6 +650,24 @@
  
  ########################################
  ## <summary>
@@ -9468,7 +9493,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +700,73 @@
+@@ -659,6 +701,73 @@
  
  ########################################
  ## <summary>
@@ -9542,7 +9567,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -987,6 +1095,37 @@
+@@ -987,6 +1096,37 @@
  
  ########################################
  ## <summary>
@@ -9580,7 +9605,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1275,7 @@
+@@ -1136,7 +1276,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9589,7 +9614,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1464,62 @@
+@@ -1325,3 +1465,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9654,7 +9679,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-19 11:59:42.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -10927,7 +10952,7 @@
 +/usr/lib/libFLAC\.so.* 	  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-19 13:33:20.000000000 -0400
 @@ -23,6 +23,9 @@
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -10964,7 +10989,15 @@
  files_search_var_lib(ldconfig_t)
  files_read_etc_files(ldconfig_t)
  files_search_tmp(ldconfig_t)
-@@ -96,4 +104,11 @@
+@@ -79,6 +87,7 @@
+ logging_send_syslog_msg(ldconfig_t)
+ 
+ userdom_use_all_users_fds(ldconfig_t)
++userdom_dontaudit_write_unpriv_user_home_content_files(ldconfig_t)
+ 
+ ifdef(`hide_broken_symptoms',`
+ 	optional_policy(`
+@@ -96,4 +105,11 @@
  	# and executes ldconfig on it.  If you dont allow this kernel installs 
  	# blow up.
  	rpm_manage_script_tmp_files(ldconfig_t)
@@ -12959,7 +12992,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-19 13:32:51.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13699,12 +13732,13 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4599,7 +4718,25 @@
- 
- ########################################
- ## <summary>
--##	Search all users home directories.
-+##	Search all users home directories.
+@@ -4615,6 +4734,24 @@
+ 	files_list_home($1)
+ 	allow $1 home_dir_type:dir search_dir_perms;
+ ')
++########################################
++## <summary>
++##	Read all users home directories symlinks.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -13712,36 +13746,17 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_search_all_users_home_dirs',`
++interface(`userdom_read_all_users_home_dirs_symlinks',`
 +	gen_require(`
 +		attribute home_dir_type;
 +	')
 +
 +	files_list_home($1)
-+	allow $1 home_dir_type:dir search_dir_perms;
-+')
-+########################################
-+## <summary>
-+##	Read all users home directories symlinks.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -4607,13 +4744,13 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_search_all_users_home_dirs',`
-+interface(`userdom_read_all_users_home_dirs_symlinks',`
- 	gen_require(`
- 		attribute home_dir_type;
- 	')
- 
- 	files_list_home($1)
--	allow $1 home_dir_type:dir search_dir_perms;
 +	allow $1 home_dir_type:lnk_file read_lnk_file_perms;
- ')
++')
  
  ########################################
+ ## <summary>
 @@ -4633,6 +4770,14 @@
  
  	files_list_home($1)
@@ -13766,7 +13781,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5704,318 @@
+@@ -5559,3 +5704,336 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14067,6 +14082,24 @@
 +	allow $1 user_home_type:file execute;
 +')
 +
++########################################
++## <summary>
++##	dontaudit attempts to write to user home dir files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_write_unpriv_user_home_content_files',`
++	gen_require(`
++		attribute user_home_type;
++	')
++
++	allow $1 user_home_type:file write;
++')
++
 +
 +########################################
 +## <summary>


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- selinux-policy.spec	19 Sep 2007 01:11:31 -0000	1.523
+++ selinux-policy.spec	19 Sep 2007 17:40:59 -0000	1.524
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
+- Allow xserver to search devpts_t
+- Dontaudit ldconfig output to homedir
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
 - Remove hplip_etc_t change back to etc_t.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 18:02:25 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 14:02:25 -0400
Subject: rpms/bcel/devel bcel-5.2-build.xml, NONE,
	1.1 bcel-5.2-jpp-depmap.xml, 
	NONE, 1.1 bcel-5.2-project_properties.patch, NONE,
	1.1 bcel-5.2.pom, NONE, 1.1 .cvsignore, 1.9, 1.10 bcel.spec,
	1.29, 1.30 sources, 1.8, 1.9
Message-ID: <200709191802.l8JI2Ptp025226@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/bcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25162

Modified Files:
	.cvsignore bcel.spec sources 
Added Files:
	bcel-5.2-build.xml bcel-5.2-jpp-depmap.xml 
	bcel-5.2-project_properties.patch bcel-5.2.pom 
Log Message:
Update to 5.2




--- NEW FILE bcel-5.2-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!--build.xml generated by maven from project.xml version 5.2
  on date June 26 2007, time 1708-->
<project default="jar" name="bcel" basedir=".">
  <!--Load local and user build preferences-->
  <property file="build.properties"></property>
  <!--Build properties-->
  <property name="defaulttargetdir" value="${basedir}/target"></property>
  <property name="libdir" value="${basedir}/lib"></property>
  <property name="classesdir" value="${basedir}/target/classes"></property>
  <property name="distdir" value="${basedir}/dist"></property>
  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
  <property name="final.name" value="bcel-5.2"></property>
  <property name="proxy.host" value=""></property>
  <property name="proxy.port" value=""></property>
  <property name="proxy.username" value=""></property>
  <property name="proxy.password" value=""></property>
  <path id="build.classpath">
    <pathelement location="${libdir}/regexp.jar"></pathelement>
  </path>
  <target name="init" description="o Initializes some properties">
    <mkdir dir="${libdir}"></mkdir>
    <condition property="noget">
      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
    </condition>
    <!--Test if JUNIT is present in ANT classpath-->
    <available property="Junit.present" classname="junit.framework.Test"></available>
    <!--Test if user defined a proxy-->
    <condition property="useProxy">
      <and>
        <isset property="proxy.host"></isset>
        <not>
          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
        </not>
      </and>
    </condition>
  </target>
  <target name="compile" description="o Compile the code" depends="get-deps">
    <mkdir dir="${classesdir}"></mkdir>
    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
      <src>
        <pathelement location="${basedir}/src/java"></pathelement>
      </src>
      <classpath refid="build.classpath"></classpath>
    </javac>
    <mkdir dir="${classesdir}/META-INF"></mkdir>
    <copy todir="${classesdir}/META-INF">
      <fileset dir="${basedir}/.">
        <include name="NOTICE.txt"></include>
      </fileset>
    </copy>
  </target>
  <target name="jar" description="o Create the jar" depends="compile,test">
    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
  </target>
  <target name="clean" description="o Clean up the generated directories">
    <delete dir="${defaulttargetdir}"></delete>
    <delete dir="${distdir}"></delete>
  </target>
  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
    <mkdir dir="dist"></mkdir>
    <copy todir="dist">
      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
    </copy>
  </target>
  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
    <fail message="There were test failures."></fail>
  </target>
  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
  <target name="junit-present" unless="Junit.present" depends="init">
    <echo>================================= WARNING ================================</echo>
    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="2002-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
    <property name="title" value="jakarta-bcel 5.2 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
  <target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/regexp.jar"></get>
  </target>
  <target name="get-custom-dep-regexp.jar" if="regexp.jar" depends="init,setProxy,noProxy">
    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="${regexp.jar}"></get>
  </target>
  <target name="get-deps" unless="noget" depends="get-dep-regexp.jar"></target>
  <target name="setProxy" if="useProxy" depends="init">
    <!--Proxy settings works only with a JDK 1.2 and higher.-->
    <echo>Proxy used :</echo>
    <echo>Proxy host [${proxy.host}]</echo>
    <echo>Proxy port [${proxy.port}]</echo>
    <echo>Proxy user [${proxy.username}]</echo>
    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
  </target>
  <target name="noProxy" unless="useProxy" depends="init">
    <echo>Proxy not used.</echo>
  </target>
  <target name="install-maven">
    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
  </target>
  <!-- can rename this target when we get the docs sorted out -->

  <!-- ================================================================== -->
  <!-- D O C S                                                            -->
  <!-- ================================================================== -->
  
  <target 
    name="check_for_jdom">
    
    <available 
      property="jdom.present"
      classname="org.jdom.JDOMException">
      <classpath>
        <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
      </classpath>
    </available>
  </target>
    
  <target 
    depends="check_for_jdom" 
    name="docs-prepare-error" 
    unless="jdom.present">
    
    <echo>
      The Jakarta-Site2 module is not present! Please check
      to make sure that you have checked it out from CVS.

      &lt;http://jakarta.apache.org/site/jakarta-site2.html&gt;
    </echo>
  </target>

  <target 
    name="xdocs"
    depends="docs-prepare-error"
    description="--> generates the HTML documentation"
    if="jdom.present">

    <taskdef 
      name="anakia"
      classname="org.apache.velocity.anakia.AnakiaTask">
      <classpath>
        <fileset dir="${jakarta.site2}/lib">
          <include name="*.jar"/>
        </fileset>
      </classpath>
    </taskdef>
        
    <anakia 
      basedir="${docs.src}" 
      destdir="${docs.dest}/"
      extension=".html" 
      style="./site.vsl"
      projectFile="stylesheets/project.xml"
      excludes="**/stylesheets/** empty.xml"
      includes="**/*.xml"
      lastModifiedCheck="true"
      templatePath="${jakarta.site2}/xdocs/stylesheets">
    </anakia>

    <copy 
      todir="${docs.dest}/images" 
      filtering="no">
      
      <fileset dir="${docs.src}/images">
        <include name="**/*.gif"/>
        <include name="**/*.jpeg"/>
        <include name="**/*.jpg"/>
      </fileset>
    </copy>
  </target>

</project>


--- NEW FILE bcel-5.2-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>regexp</groupId>
         <artifactId>regexp</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>regexp</artifactId>
         <jar>regexp.jar</jar>
         <version>1.2</version>
      </jpp>
   </dependency>
</depset>
bcel-5.2-project_properties.patch:

--- NEW FILE bcel-5.2-project_properties.patch ---
--- project.properties.sav	2007-06-26 15:21:10.000000000 +0200
+++ project.properties	2007-06-26 15:21:35.000000000 +0200
@@ -42,7 +42,7 @@
 
 maven.changes.issue.template = %URL%/bugzilla/show_bug.cgi?id=%ISSUE%
 
-maven.xdoc.jsl = ../commons-build/commons-site.jsl
+maven.xdoc.jsl = file:${basedir}/commons-build/commons-site.jsl
 maven.xdoc.date = left
 maven.xdoc.poweredby.image = maven-feather.png
 maven.xdoc.version = ${pom.currentVersion}


--- NEW FILE bcel-5.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>bcel</groupId>
  <artifactId>bcel</artifactId>
  <version>5.2</version>
  <dependencies>
    <groupId>regexp</groupId>
    <artifactId>regexp</artifactId>
    <version>1.4</version>
  </dependencies>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Apr 2007 18:41:33 -0000	1.9
+++ .cvsignore	19 Sep 2007 18:01:52 -0000	1.10
@@ -1,3 +1,2 @@
-bcel-5.1-src.tar.gz
-jakarta-site2.tar.gz
+bcel-5.2-src.tar.gz
 bcel-jakarta-site2.tar.gz


Index: bcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bcel.spec	14 Aug 2007 15:40:08 -0000	1.29
+++ bcel.spec	19 Sep 2007 18:01:52 -0000	1.30
@@ -32,12 +32,9 @@
 %define _with_gcj_support 1
 #Fedora currently does not support maven
 %define _without_maven 1
-%define _without_bootstrap 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
@@ -45,22 +42,24 @@
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
 Name:           bcel
-Version:        5.1
-Release:        10jpp.4%{?dist}
+Version:        5.2
+Release:        2jpp.1%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
-License:        Apache Software License
-Source0:        bcel-5.1-src.tar.gz
-#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
-#tar czvf bcel-5.1-src.tar.gz BCEL_5_1
+License:        ASL 2.0
+Source0:        %{name}-%{version}-src.tar.gz
+#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_2
+#tar czvf bcel-5.2-src.tar.gz BCEL_5_2
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        bcel-5.1-jpp-depmap.xml
+Source4:        %{name}-%{version}-jpp-depmap.xml
+#Source5:        commons-build.tar.gz
 Source5:        bcel-jakarta-site2.tar.gz
+Source6:        %{name}-%{version}-build.xml
+Source7:        %{name}-%{version}.pom
 
-Patch0:         bcel-5.1-build.patch
-Patch1:         bcel-5.1-project_xml.patch
+Patch0:         %{name}-%{version}-project_properties.patch
 URL:            http://jakarta.apache.org/%{name}/
 Group:          Development/Libraries/Java
 Requires:       regexp
@@ -69,8 +68,18 @@
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
-%endif
-%if ! %{bootstrap}
+BuildRequires:  maven-plugins-base
+BuildRequires:  maven-plugin-changelog
+BuildRequires:  maven-plugin-changes
+BuildRequires:  maven-plugin-developer-activity
+BuildRequires:  maven-plugin-jxr
+BuildRequires:  maven-plugin-license
+BuildRequires:  maven-plugin-pmd
+BuildRequires:  maven-plugin-test
+BuildRequires:  maven-plugin-xdoc
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+%else
 BuildRequires:  jdom
 BuildRequires:  velocity
 BuildRequires:  jakarta-commons-collections
@@ -81,16 +90,16 @@
 #BuildRequires:  ant-apache-regexp
 %endif
 BuildRequires:  regexp
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  jpackage-utils >= 0:1.7.2
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
 %endif
 
 %description
@@ -123,14 +132,6 @@
 %description manual
 %{summary}.
 
-%package demo
-Summary:        Examples for %{name}
-Group:          Development/Libraries/Java
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-%{summary}.
-
 %prep
 #cat <<EOT
 #
@@ -139,14 +140,14 @@
 #
 #EOT
 
-%setup -q -n BCEL_5_1
+%setup -q -n BCEL_5_2
+gzip -dc %{SOURCE5} | tar xf -
 # remove all binary libs
 #find . -name "*.jar" -exec rm -f {} \;
 for j in $(find . -name "*.jar"); do
-    mv $j $j.no
+    %{__mv} $j ${j}.no
 done
-gzip -dc %{SOURCE5} | tar xf -
-%if ! %{bootstrap}
+%if %{without_maven}
 mkdir jakarta-site2/lib
 pushd jakarta-site2/lib/
   build-jar-repository -s -p . jdom
@@ -156,178 +157,165 @@
   build-jar-repository -s -p . werken-xpath
 popd
 %endif
-pushd lib
-  ln -sf $(build-classpath regexp) Regex.jar
-popd
-%patch0 -p1
-%patch1 -b .sav
-
-# very broken build
-perl -p -i -e 's| depends=\"examples\"||g;' build.xml
-touch manifest.txt
+cp %{SOURCE6} build.xml
+%patch0 -b .sav
 
 # fix wrong-file-end-of-line-encoding
 sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
 
 %build
 %if %{with_maven}
-export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
+export DEPCAT="$(pwd)/%{name}-%{version}-depcat.new.xml"
 echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
 echo '<depset>' >> $DEPCAT
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
-    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+        /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
     popd
 done
 echo >> $DEPCAT
 echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > bcel-5.1-depmap.new.xml
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{name}-%{version}-depmap.new.xml
 
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
-    cp -pr project.xml project.xml.orig
-    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+        %{__cp} -pr project.xml project.xml.orig
+        /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} \
+            map="%{SOURCE4}"
     popd
 done
 
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
+export MAVEN_HOME_LOCAL="$(pwd)/.maven"
 
-maven \
+maven -e \
         -Dmaven.repo.remote=file:/usr/share/maven/repository \
         -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
         jar:jar javadoc:generate xdoc:transform
 %else
-ant     -Dbuild.dest=build/classes -Dbuild.dir=build \
+#ant -Dregexp.jar="file://$(build-classpath regexp)" jar javadoc
+ant     -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
         -Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
-        compile jar apidocs xdocs
+        -Dregexp.jar="file://$(build-classpath regexp)" \
+        jar javadoc xdocs
 %endif
 
 %install
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 # jars
-%__mkdir_p %{buildroot}%{_javadir}
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__install} -m 0644 target/%{name}-%{version}.jar \
+    %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(
+    cd %{buildroot}%{_javadir}
+    for jar in *-%{version}*; do 
+        %{__ln_s} ${jar} `echo $jar | %{__sed}  "s|-%{version}||g"`
+    done
+)
+# depmap frags
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+# pom
 %if %{with_maven}
-%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%else
-%__install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
+%{__install} -m 0644 %{SOURCE7} \
+    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
 %endif
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
 %if %{with_maven}
-%__cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf target/docs/apidocs
+%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf target/docs/apidocs
 %else
-%__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf docs/api
+%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf dist/docs/api
 %endif
-
-# samples
-%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}/demo
-%__cp -pr examples/ %{buildroot}%{_datadir}/%{name}-%{version}/demo/
-#TODO: need some kind of doc for the demo package for instructions on how to
-# build and run the demos. 
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 # manual
-%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
 %if %{with_maven}
-%__cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
 %else
-%__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
 %endif
-%__cp -pr LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
+%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
 
 %clean
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+    %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+    %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
 %files
 %defattr(0644,root,root,0755)
-%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt 
 %{_javadir}/*
-
+%if %{with_maven}
+%{_datadir}/maven2/poms/*
+%endif
+%{_mavendepmapfragdir}
 %if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bcel-5.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc %{_docdir}/%{name}-%{version}
 
-%files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}/demo
-
-# -----------------------------------------------------------------------------
-
 %changelog
-* Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.4
-- Fixed another unowned directory
-
-* Mon Jul 09 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.3
-- Fixed unowned directory
+* Wed Sep 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
 
-* Thu Apr 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.2
-- Rebuild
-
-* Fri Apr 13 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
-- Merge with upstream version and rpmlint cleanup, fix BR
+* Mon Sep  4 2007 Jason Corley <jason.corley at gmail.com> 0:5.2-2jpp
+- use official 5.2 release tarballs and location
+- change vendor and distribution to macros
+- add missing requires on and maven-plugin-test, maven-plugins-base, and
+  maven-plugin-xdoc 
+- macro bracket fixes
+- remove demo subpackage (examples are not included in the distribution tarball)
+- build in mock
+
+* Wed Jun 27 2007 Ralph Apel <r.apel at r-apel.de> 0:5.2-1jpp
+- Upgrade to 5.2
+- Drop bootstrap option: not necessary any more
+- Add pom and depmap frags
 
 * Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> 0:5.1-10jpp
-- Fix empty-post and empty-postun
+- Fix empty-%%post and empty-%%postun
 - Fix no-cleaning-of-buildroot
 
 * Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> 0:5.1-9jpp
 - Optionally build without maven
 - Add bootstrap option
 
-* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
-- Merge with upstream version:
- - Add missing javadoc requires
-
-* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 5.1-7jpp_334fc
-- last release was 333 (typo), need to build 334 now
-- Requires(post/postun): coreutils
-
-* Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp-3fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_2fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_1fc
-- Merged with upstream version
-- set to build with Ant instead of Maven
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp
+- Add missing requires for Javadoc task
 
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+- Add conditional native compilation
+- Change spec file encoding from ISO-8859-1 to UTF-8
 - Add missing BR werken.xpath and ant-apache-regexp
-- Added conditional native compilation
-- Changed spec file encoding from ISO-8859-1 to UTF-8 
 
 * Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> 0:5.1-6jpp
 - First JPP-1.7 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Apr 2007 18:41:33 -0000	1.8
+++ sources	19 Sep 2007 18:01:52 -0000	1.9
@@ -1,2 +1,2 @@
-f32a91243963d601aa34194657a53d60  bcel-5.1-src.tar.gz
+15c882886f67f90ee773cb526b84b4fa  bcel-5.2-src.tar.gz
 2c511b30e00109b501c6f3bd757a1ce1  bcel-jakarta-site2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:03:47 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:03:47 -0400
Subject: rpms/roxterm/devel roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191803.l8JI3lfw025255@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:



--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:03:13 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:03:13 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:09:52 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:09:52 -0400
Subject: rpms/roxterm/F-7 roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191809.l8JI9q8E025810@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:
import also on fc6, f7


--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:09:20 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:09:20 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:09:55 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:09:55 -0400
Subject: rpms/roxterm/FC-6 roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191809.l8JI9tEc025814@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:
import also on fc6, f7


--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:09:23 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:09:23 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:12:15 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 19 Sep 2007 14:12:15 -0400
Subject: rpms/pam/devel pam-0.99.8.1-selinux-permit.patch, NONE,
	1.1 pam-0.99.8.1-succif-in-operator.patch, NONE, 1.1 pam.spec,
	1.157, 1.158
Message-ID: <200709191812.l8JICFGu025907@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25879

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.8.1-selinux-permit.patch 
	pam-0.99.8.1-succif-in-operator.patch 
Log Message:
* Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
- add pam_selinux_permit module
- pam_succeed_if: fix in operator (#295151)


pam-0.99.8.1-selinux-permit.patch:

--- NEW FILE pam-0.99.8.1-selinux-permit.patch ---
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 17:18:43.000000000 +0200
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<refentry id="pam_selinux_permit">
+
+  <refmeta>
+    <refentrytitle>pam_selinux_permit</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
+  </refmeta>
+
+  <refnamediv id="pam_selinux_permit-name">
+    <refname>pam_selinux_permit</refname>
+    <refpurpose>PAM module to allow/deny login depending on SELinux enforcement state</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis id="pam_selinux_permit-cmdsynopsis">
+      <command>pam_selinux_permit.so</command>
+      <arg choice="opt">
+	debug
+      </arg>
+      <arg choice="opt">
+	conf=<replaceable>/path/to/config/file</replaceable>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id="pam_selinux_permit-description">
+    <title>DESCRIPTION</title>
+    <para>
+      The pam_selinux module allows or denies login depending on SELinux enforcement
+      state.
+    </para>
+    <para>
+      When the user which is logging in matches an entry in the config file
+      he is allowed access only when the SELinux is in enforcing mode. Otherwise
+      he is denied access. For users not matching any entry in the config file
+      the pam_selinux_permit module returns PAM_IGNORE return value.
+    </para>
+    <para>
+      The config file contains a simple list of user names one per line. If the
+      <replaceable>name</replaceable> is prefixed with @ character it means that all
+      users in the group <replaceable>name</replaceable> match. If it is prefixed
+      with a % character the SELinux user is used to match against the <replaceable>name</replaceable>
+      instead of the account name. Note that when SELinux is disabled the
+      SELinux user assigned to the account cannot be determined. This means that
+      such entries are never matched when SELinux is disabled and pam_selinux_permit
+      will return PAM_IGNORE.
+    </para>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-options">
+    <title>OPTIONS</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>debug</option>
+        </term>
+        <listitem>
+          <para>
+           Turns on debugging via
+	    <citerefentry>
+              <refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum>
+            </citerefentry>.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>conf=<replaceable>/path/to/config/file</replaceable></option>
+        </term>
+        <listitem>
+          <para>
+            Path to alternative config file overriding the default.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-services">
+    <title>MODULE SERVICES PROVIDED</title>
+    <para>
+      Only the <option>auth</option> and <option>account</option>
+      services are supported.
+    </para>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-return_values'>
+    <title>RETURN VALUES</title>
+    <variablelist>
+      <varlistentry>
+        <term>PAM_AUTH_ERR</term>
+        <listitem>
+          <para>
+            SELinux is disabled or in the permissive mode and the user
+            matches.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SUCCESS</term>
+        <listitem>
+          <para>
+            SELinux is in the enforcing mode and the user matches.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_IGNORE</term>
+        <listitem>
+          <para>
+            The user does not match any entry in the config file.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_USER_UNKNOWN</term>
+        <listitem>
+          <para>
+            The module was unable to determine the user's name.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SERVICE_ERR</term>
+        <listitem>
+          <para>
+            Error during reading or parsing the config file.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/security/sepermit.conf</filename></term>
+        <listitem>
+          <para>Default configuration file</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-examples'>
+    <title>EXAMPLES</title>
+    <programlisting>
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth     required  pam_unix.so
+account  required  pam_unix.so
+session  required  pam_permit.so
+    </programlisting>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-see_also'>
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-author'>
+    <title>AUTHOR</title>
+      <para>
+        pam_selinux_permit was written by Tomas Mraz &lt;tmraz at redhat.com&gt;.
+      </para>
+  </refsect1>
+
+</refentry>
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 18:14:36.000000000 +0200
@@ -0,0 +1,222 @@
+/******************************************************************************
+ * A module for Linux-PAM that allows/denies acces based on SELinux state.
+ *
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Written by Tomas Mraz <tmraz at redhat.com>
+ *
+ * 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, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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.
+ *
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <ctype.h>
+
+#define PAM_SM_AUTH
+#define PAM_SM_ACCOUNT
+
+#include <security/pam_modules.h>
+#include <security/_pam_macros.h>
+#include <security/pam_modutil.h>
+#include <security/pam_ext.h>
+
+#include <selinux/selinux.h>
+
+/* return 0 when matched, -1 when unmatched, pam error otherwise */
+static int
+sepermit_match(pam_handle_t *pamh, const char *cfgfile, const char *user,
+	       const char *seuser, int debug)
+{
+	FILE *f;
+	char *line = NULL;
+	char *start;
+	size_t n = 0;
+	int matched = 0;
+	
+	f = fopen(cfgfile, "r");
+	
+	if (!f) {
+		pam_syslog(pamh, LOG_ERR, "Failed to open config file %s: %m", cfgfile);
+		return PAM_SERVICE_ERR;
+	}
+	
+	while (!matched && getline(&line, &n, f) != -1) {
+		if (line[0] == '#')
+			goto cleanup;
+		
+		start = line;
+		while (isspace(*start))
+			++start;
+		n = strlen(start);
+		while (n > 0 && isspace(start[n-1])) {
+			--n;
+		}
+		if (n == 0)
+			goto cleanup;
+		
+		start[n] = '\0';
+		
+		switch (start[0]) {
+			case '@': 
+				++start;
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching user %s against group %s", user, start);
+				if (pam_modutil_user_in_group_nam_nam(pamh, user, start)) {
+					matched = 1;
+				}
+				break;
+			case '%':
+				++start;
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching seuser %s against seuser %s", seuser, start);
+				if (strcmp(seuser, start) == 0) {
+					matched = 1;					
+				}
+				break;
+			default:
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching user %s against user %s", user, start);
+				if (strcmp(user, start) == 0) {
+					matched = 1;
+				}
+		}		
+cleanup:
+		free(line);
+		line = NULL;
+	}
+	
+	fclose(f);
+	return matched ? 0 : -1;
+}
+
+PAM_EXTERN int
+pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
+		    int argc, const char **argv)
+{
+	int i;
+	int rv;
+	int debug = 0;
+	int sense = PAM_AUTH_ERR;
+	const char *user = NULL;
+	char *seuser = NULL;
+	char *level = NULL;
+	const char *cfgfile = SEPERMIT_CONF_FILE;
+
+	/* Parse arguments. */
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "debug") == 0) {
+			debug = 1;
+		}
+		if (strcmp(argv[i], "conf=") == 0) {
+			cfgfile = argv[i] + 5;
+		}
+	}
+	
+	if (debug)
+		pam_syslog(pamh, LOG_NOTICE, "Parsing config file: %s", cfgfile);
+
+	if (pam_get_user(pamh, &user, NULL) != PAM_SUCCESS || user == NULL
+		|| *user == '\0') {
+		pam_syslog(pamh, LOG_ERR, "Cannot determine the user's name");
+		return PAM_USER_UNKNOWN;
+	}
+
+	if (is_selinux_enabled() > 0) {
+		if (security_getenforce() == 1) {
+			if (debug)
+				pam_syslog(pamh, LOG_NOTICE, "Enforcing mode, access will be allowed on match");
+			sense = PAM_SUCCESS;		
+		}
+		
+		if (getseuserbyname(user, &seuser, &level) != 0) {
+			seuser = NULL;
+			level = NULL;
+			pam_syslog(pamh, LOG_ERR, "getseuserbyname failed: %m");
+		}
+	}
+	
+	if (debug && sense != PAM_SUCCESS)
+		pam_syslog(pamh, LOG_NOTICE, "Access will not be allowed on match");
+
+	rv = sepermit_match(pamh, cfgfile, user, seuser, debug);
+
+	if (debug)
+		pam_syslog(pamh, LOG_NOTICE, "sepermit_match returned: %d", rv);
+	
+	free(seuser);
+	free(level);
+	
+	switch (rv) {
+		case -1:
+			return PAM_IGNORE;
+		case 0:
+			return sense;
+	}
+
+	return rv;
+}
+
+PAM_EXTERN int
+pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED,
+                int argc UNUSED, const char **argv UNUSED)
+{
+	return PAM_IGNORE;
+}
+
+PAM_EXTERN int
+pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
+		     int argc, const char **argv)
+{
+	return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+#ifdef PAM_STATIC
+    
+/* static module data */
+    
+struct pam_module _pam_access_modstruct = {
+    "pam_access",
+    pam_sm_authenticate,
+    pam_sm_setcred,
+    pam_sm_acct_mgmt,
+    NULL,
+    NULL,
+    NULL
+};
+#endif
+
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 17:18:43.000000000 +0200
@@ -0,0 +1,6 @@
+# /etc/security/sepermit.conf
+#
+# Each line contains either:
+#        - an user name
+#        - a group name, with @group syntax
+#        - a SELinux user name, with %seuser syntax
diff -up Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am
--- Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit	2007-01-23 11:09:25.000000000 +0100
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 18:19:42.000000000 +0200
@@ -5,20 +5,21 @@
 CLEANFILES = *~
 
 EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
-		tst-pam_selinux
+		pam_seliux_permit.8 sepermit.conf tst-pam_selinux
 
 if HAVE_LIBSELINUX
   TESTS = tst-pam_selinux
-  man_MANS = pam_selinux.8 
+  man_MANS = pam_selinux.8 pam_selinux_permit.8
 endif
 
-XMLS = README.xml pam_selinux.8.xml
+XMLS = README.xml pam_selinux.8.xml pam_selinux_permit.8.xml
 
 securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
-	-I$(top_srcdir)/libpam_misc/include
+	-I$(top_srcdir)/libpam_misc/include \
+	-D SEPERMIT_CONF_FILE=\"$(SCONFIGDIR)/sepermit.conf\"
 AM_LDFLAGS = -no-undefined \
 	-L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
@@ -30,12 +31,16 @@ if HAVE_VERSIONING
 	-Wl,--version-script=$(srcdir)/../modules.map
 endif
 
+pam_selinux_permit_la_LDFLAGS= $(pam_selinux_la_LDFLAGS)
+
+secureconf_DATA = sepermit.conf
+
 if HAVE_LIBSELINUX
-  securelib_LTLIBRARIES = pam_selinux.la
+  securelib_LTLIBRARIES = pam_selinux.la pam_selinux_permit.la
   noinst_PROGRAMS = pam_selinux_check
 endif
 if ENABLE_REGENERATE_MAN
-noinst_DATA = README pam_selinux.8
+noinst_DATA = README pam_selinux.8 pam_selinux_permit.8
 README: pam_selinux.8.xml
 -include $(top_srcdir)/Make.xml.rules
 endif

pam-0.99.8.1-succif-in-operator.patch:

--- NEW FILE pam-0.99.8.1-succif-in-operator.patch ---
diff -up Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c
--- Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator	2006-08-31 12:20:39.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c	2007-09-19 19:36:22.000000000 +0200
@@ -191,13 +191,19 @@ static int
 evaluate_inlist(const char *left, const char *right)
 {
 	char *p;
-	if ((p=strstr(right, left)) == NULL)
-		return PAM_AUTH_ERR;
-	if (p == right || *(p-1) == ':') { /* ':' is a list separator */
-		p += strlen(left);
-		if (*p == '\0' || *p == ':') {
-		    return PAM_SUCCESS;
+	/* Don't care about left containing ':'. */
+	while ((p=strstr(right, left)) != NULL) {
+		if (p == right || *(p-1) == ':') { /* ':' is a list separator */
+			p += strlen(left);
+			if (*p == '\0' || *p == ':') {
+				return PAM_SUCCESS;
+			}
 		}
+		right = strchr(p, ':');
+		if (right == NULL)
+			break;
+		else
+			++right;
 	}
 	return PAM_AUTH_ERR;
 }


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- pam.spec	18 Sep 2007 20:23:57 -0000	1.157
+++ pam.spec	19 Sep 2007 18:11:42 -0000	1.158
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 7%{?dist}
+Release: 8%{?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
@@ -41,6 +41,8 @@
 Patch42: pam-0.99.8.1-console-hal-handled.patch
 Patch43: pam-0.99.8.1-console-mfd-scanners.patch
 Patch44: pam-0.99.7.1-namespace-homedir.patch
+Patch45: pam-0.99.8.1-selinux-permit.patch
+Patch46: pam-0.99.8.1-succif-in-operator.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -107,6 +109,8 @@
 %patch42 -p1 -b .hal-handled
 %patch43 -p1 -b .mfd-scanners
 %patch44 -p1 -b .homedir
+%patch45 -p1 -b .permit
+%patch46 -p1 -b .in-operator
 
 autoreconf
 
@@ -346,6 +350,7 @@
 /%{_lib}/security/pam_rootok.so
 /%{_lib}/security/pam_rps.so
 /%{_lib}/security/pam_selinux.so
+/%{_lib}/security/pam_selinux_permit.so
 /%{_lib}/security/pam_securetty.so
 /%{_lib}/security/pam_shells.so
 /%{_lib}/security/pam_stress.so
@@ -375,6 +380,7 @@
 %config(noreplace) %{_sysconfdir}/security/namespace.conf
 %attr(755,root,root) %config(noreplace) %{_sysconfdir}/security/namespace.init
 %config(noreplace) %{_sysconfdir}/security/pam_env.conf
+%config(noreplace) %{_sysconfdir}/security/sepermit.conf
 %config(noreplace) %{_sysconfdir}/security/time.conf
 %config(noreplace) %{_sysconfdir}/security/opasswd
 %dir %{_sysconfdir}/security/console.apps
@@ -397,6 +403,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
+- add pam_selinux_permit module
+- pam_succeed_if: fix in operator (#295151)
+
 * Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
 - when SELinux enabled always run the helper binary instead of
   direct shadow access (#293181)



From fedora-extras-commits at redhat.com  Wed Sep 19 18:30:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 14:30:51 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.35,1.36
Message-ID: <200709191830.l8JIUprP026495@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26466

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- em8300-kmod.spec	18 Sep 2007 19:03:04 -0000	1.35
+++ em8300-kmod.spec	19 Sep 2007 18:30:19 -0000	1.36
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.186.rc6.git7.fc8}
+%{!?kversion: %define kversion 2.6.23-0.187.rc6.git7.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.
+
 * Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:04:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:04:57 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.11,1.12
Message-ID: <200709191904.l8JJ4vPq000903@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv869/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
- Move XCB plugins to the main package.
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
  time in preparation for the first EPEL build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine-lib.spec	10 Sep 2007 15:35:50 -0000	1.11
+++ xine-lib.spec	19 Sep 2007 19:04:25 -0000	1.12
@@ -23,18 +23,19 @@
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
-%define         with_dfb    %{?_without_directfb:0}%{!?_without_directfb:1}
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -64,9 +65,9 @@
 %if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif # dfb
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
 %endif # imagemagick
@@ -76,7 +77,10 @@
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  wavpack-devel libmpcdec-devel
+BuildRequires:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
 %if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
 %endif # pa
@@ -116,7 +120,8 @@
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
 (some default values depend on target distribution): aalib, caca, directfb,
-imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -146,12 +151,9 @@
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif # dfb
-%if %{with_xcb}
-  - XCB output
-%endif # xcb
+%endif # directfb
 
 
 %prep
@@ -177,9 +179,9 @@
 %configure \
     --disable-dependency-tracking \
     --enable-ipv6 \
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif # dfb
+%endif # directfb
     --disable-a52dec \
     --disable-mad \
     --disable-dvdnavtest --with-external-dvdnav \
@@ -201,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -328,13 +332,16 @@
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
 %endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif # xcb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
-
 %files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
@@ -360,16 +367,11 @@
 %if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif # dfb
+%endif # directfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-%if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif # xcb
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -384,8 +386,10 @@
 
 
 %changelog
-* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
-- Adjust default -extras feature set for EPEL-5.
+* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
 
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to



From fedora-extras-commits at redhat.com  Wed Sep 19 19:05:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:05:00 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.24,1.25
Message-ID: <200709191905.l8JJ50Fd000906@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv869/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
- Move XCB plugins to the main package.
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
  time in preparation for the first EPEL build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xine-lib.spec	9 Sep 2007 14:50:02 -0000	1.24
+++ xine-lib.spec	19 Sep 2007 19:04:27 -0000	1.25
@@ -9,20 +9,33 @@
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
-%define         have_vidix 1
+    %define     have_vidix  1
 %else
-%define         have_vidix 0
+    %define     have_vidix  0
 %endif
 %if 0%{?fedora} >= 8
-%define         with_xcb 1
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
-%define         with_xcb 0
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
+%endif
+%if 0%{?fedora}
+    %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
+    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
+%else
+    %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
+    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
+    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
+    %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -43,25 +56,37 @@
 BuildRequires:  libGLU-devel
 %if %{with_xcb}
 BuildRequires:  libxcb-devel
-%endif
+%endif # xcb
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
+%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
 %if 0%{?_with_freetype:1}
 BuildRequires:  fontconfig-devel
-%endif
+%endif # freetype
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
+%if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires:  jack-audio-connection-kit-devel
+%endif # jack
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -93,11 +118,10 @@
 It can play back various media. It also decodes multimedia files from local
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  Non-default rpmbuild options:
---without imagemagick:  Disable ImageMagick support
---without directfb:     Disable DirectFB support
---with    freetype:     Enable FreeType/Fontconfig support
---with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too.  --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -108,23 +132,28 @@
 %description extras
 This package contains extra plugins for xine-lib:
   - EsounD
+%if %{with_jack}
   - JACK
+%endif # jack
+%if %{with_pa}
   - Pulseaudio
+%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
   - SDL
+%if %{with_aalib}
   - AA-lib
+%endif # aalib
+%if %{with_caca}
   - Libcaca
+%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
-%endif
+%endif # imagemagick
 %if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif
-%if %{with_xcb}
-  - XCB output
-%endif
+%endif # directfb
 
 
 %prep
@@ -174,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -241,7 +272,7 @@
 %{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -252,7 +283,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
@@ -262,7 +293,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
@@ -300,14 +331,17 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif # xcb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
-
 %files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
@@ -315,26 +349,29 @@
 %files extras
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%endif # directfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-%if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -349,6 +386,11 @@
 
 
 %changelog
+* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
+
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to
   provide an upgrade path



From fedora-extras-commits at redhat.com  Wed Sep 19 19:22:35 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 19 Sep 2007 15:22:35 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.300.0-transient-qemu.patch, NONE,
	1.1 python-virtinst.spec, 1.25, 1.26
Message-ID: <200709191922.l8JJMZlg001328@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1298

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.300.0-transient-qemu.patch 
Log Message:
Fix post-install CDROM config

python-virtinst-0.300.0-transient-qemu.patch:

--- NEW FILE python-virtinst-0.300.0-transient-qemu.patch ---
diff -rup virtinst-0.300.0.orig/virtinst/FullVirtGuest.py virtinst-0.300.0.new/virtinst/FullVirtGuest.py
--- virtinst-0.300.0.orig/virtinst/FullVirtGuest.py	2007-09-19 15:19:16.000000000 -0400
+++ virtinst-0.300.0.new/virtinst/FullVirtGuest.py	2007-09-19 15:19:28.000000000 -0400
@@ -273,10 +273,13 @@ class FullVirtGuest(Guest.XenGuest):
         for d in self.disks:
             saved_path = None
             if d.device == Guest.VirtualDisk.DEVICE_CDROM and d.transient and not install:
-                # XXX hack. libvirt can't currently handle QEMU having an empty disk path
+                # XXX hack. libvirt can't currently handle QEMU having an empty disk path..
                 if self.type == "xen":
                     saved_path = d.path
                     d.path = None
+                else:
+                    # .. so simply remove CDROM device completely in non-Xen
+                    continue
 
             ret += d.get_xml_config(d.target)
             if saved_path != None:


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-virtinst.spec	12 Sep 2007 03:47:19 -0000	1.25
+++ python-virtinst.spec	19 Sep 2007 19:22:03 -0000	1.26
@@ -11,10 +11,11 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{name}-%{version}-fedora8-distro.patch
 Patch2: %{name}-0.200.0-default-arch.patch
+Patch3: %{name}-%{version}-transient-qemu.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,7 @@
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -68,6 +70,9 @@
 %{_bindir}/virt-image
 
 %changelog
+* Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-4.fc8
+- Fix post install CDROM config for KVM guests
+
 * Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-3.fc8
 - Fixed default architecture. Again.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:25:27 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 19 Sep 2007 15:25:27 -0400
Subject: rpms/pam/devel pam-0.99.8.1-selinux-permit.patch, 1.1,
	1.2 pam-0.99.8.1-succif-in-operator.patch, 1.1, 1.2
Message-ID: <200709191925.l8JJPRmm001532@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1506

Modified Files:
	pam-0.99.8.1-selinux-permit.patch 
	pam-0.99.8.1-succif-in-operator.patch 
Log Message:
- review
- don't free/malloc when unnecessary


pam-0.99.8.1-selinux-permit.patch:

Index: pam-0.99.8.1-selinux-permit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-selinux-permit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-selinux-permit.patch	19 Sep 2007 18:11:42 -0000	1.1
+++ pam-0.99.8.1-selinux-permit.patch	19 Sep 2007 19:25:24 -0000	1.2
@@ -1,6 +1,9 @@
+Written-by: Tomas Mraz <tmraz at redhat.com>
+Reviewed-by: Karel Zak <kzak at redhat.com>
+
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 17:18:43.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 19:37:26.000000000 +0200
 @@ -0,0 +1,182 @@
 +<?xml version="1.0" encoding='UTF-8'?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -186,7 +189,7 @@
 +</refentry>
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 18:14:36.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 20:29:47.000000000 +0200
 @@ -0,0 +1,222 @@
 +/******************************************************************************
 + * A module for Linux-PAM that allows/denies acces based on SELinux state.
@@ -255,7 +258,7 @@
 +	FILE *f;
 +	char *line = NULL;
 +	char *start;
-+	size_t n = 0;
++	size_t len = 0;
 +	int matched = 0;
 +	
 +	f = fopen(cfgfile, "r");
@@ -264,11 +267,13 @@
 +		pam_syslog(pamh, LOG_ERR, "Failed to open config file %s: %m", cfgfile);
 +		return PAM_SERVICE_ERR;
 +	}
-+	
-+	while (!matched && getline(&line, &n, f) != -1) {
++
++	while (!matched && getline(&line, &len, f) != -1) {
++		size_t n;
++
 +		if (line[0] == '#')
-+			goto cleanup;
-+		
++			continue;
++
 +		start = line;
 +		while (isspace(*start))
 +			++start;
@@ -277,10 +282,10 @@
 +			--n;
 +		}
 +		if (n == 0)
-+			goto cleanup;
-+		
++			continue;
++
 +		start[n] = '\0';
-+		
++
 +		switch (start[0]) {
 +			case '@': 
 +				++start;
@@ -304,12 +309,10 @@
 +				if (strcmp(user, start) == 0) {
 +					matched = 1;
 +				}
-+		}		
-+cleanup:
-+		free(line);
-+		line = NULL;
++		}
 +	}
-+	
++
++	free(line);
 +	fclose(f);
 +	return matched ? 0 : -1;
 +}
@@ -336,7 +339,7 @@
 +			cfgfile = argv[i] + 5;
 +		}
 +	}
-+	
++
 +	if (debug)
 +		pam_syslog(pamh, LOG_NOTICE, "Parsing config file: %s", cfgfile);
 +
@@ -350,16 +353,16 @@
 +		if (security_getenforce() == 1) {
 +			if (debug)
 +				pam_syslog(pamh, LOG_NOTICE, "Enforcing mode, access will be allowed on match");
-+			sense = PAM_SUCCESS;		
++			sense = PAM_SUCCESS;
 +		}
-+		
++
 +		if (getseuserbyname(user, &seuser, &level) != 0) {
 +			seuser = NULL;
 +			level = NULL;
 +			pam_syslog(pamh, LOG_ERR, "getseuserbyname failed: %m");
 +		}
 +	}
-+	
++
 +	if (debug && sense != PAM_SUCCESS)
 +		pam_syslog(pamh, LOG_NOTICE, "Access will not be allowed on match");
 +
@@ -367,10 +370,10 @@
 +
 +	if (debug)
 +		pam_syslog(pamh, LOG_NOTICE, "sepermit_match returned: %d", rv);
-+	
++
 +	free(seuser);
 +	free(level);
-+	
++
 +	switch (rv) {
 +		case -1:
 +			return PAM_IGNORE;
@@ -412,7 +415,7 @@
 +
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 17:18:43.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 19:37:26.000000000 +0200
 @@ -0,0 +1,6 @@
 +# /etc/security/sepermit.conf
 +#
@@ -422,7 +425,7 @@
 +#        - a SELinux user name, with %seuser syntax
 diff -up Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am
 --- Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit	2007-01-23 11:09:25.000000000 +0100
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 18:19:42.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 19:37:26.000000000 +0200
 @@ -5,20 +5,21 @@
  CLEANFILES = *~
  

pam-0.99.8.1-succif-in-operator.patch:

Index: pam-0.99.8.1-succif-in-operator.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-succif-in-operator.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-succif-in-operator.patch	19 Sep 2007 18:11:42 -0000	1.1
+++ pam-0.99.8.1-succif-in-operator.patch	19 Sep 2007 19:25:24 -0000	1.2
@@ -1,3 +1,6 @@
+Written-by: Tomas Mraz <tmraz at redhat.com>
+Reviewed-by: Karel Zak <kzak at redhat.com>
+
 diff -up Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c
 --- Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator	2006-08-31 12:20:39.000000000 +0200
 +++ Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c	2007-09-19 19:36:22.000000000 +0200



From fedora-extras-commits at redhat.com  Wed Sep 19 19:32:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 15:32:28 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.3, 1.4 eclipse-egit.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709191932.l8JJWSSd001791@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1703

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Log Message:
* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
- 0.2.99 git20070919



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2007 18:16:03 -0000	1.3
+++ .cvsignore	19 Sep 2007 19:31:56 -0000	1.4
@@ -1,2 +1 @@
-egit.png
-egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-egit.spec	17 Sep 2007 16:54:16 -0000	1.5
+++ eclipse-egit.spec	19 Sep 2007 19:31:56 -0000	1.6
@@ -3,16 +3,14 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.2
-Release:          2.git20070911%{?dist}
+Version:          0.2.99
+Release:          0.git20070919%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
-Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
-Source1:          egit.png
-Patch0:           %{name}-add-feature.patch
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
 %if %{gcj_support}
@@ -39,8 +37,6 @@
 
 %prep
 %setup -q -c 
-%patch0 -p0
-cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -98,6 +94,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
+- 0.2.99 git20070919
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
 - Update add feature and plugin patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2007 18:16:03 -0000	1.3
+++ sources	19 Sep 2007 19:31:56 -0000	1.4
@@ -1,2 +1 @@
-5d1082d9db40f01c5de094ac8769514b  egit.png
-d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 19:33:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:33:29 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.12,1.13
Message-ID: <200709191933.l8JJXTjf001930@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
- Fix "--without wavpack" build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xine-lib.spec	19 Sep 2007 19:04:25 -0000	1.12
+++ xine-lib.spec	19 Sep 2007 19:32:56 -0000	1.13
@@ -35,7 +35,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -340,7 +340,9 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
+%if %{with_wpack}
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%endif # wpack
 
 %files arts
 %defattr(-,root,root,-)
@@ -386,6 +388,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
 * Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
 - Move XCB plugins to the main package.
 - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build



From fedora-extras-commits at redhat.com  Wed Sep 19 19:33:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:33:31 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.25,1.26
Message-ID: <200709191933.l8JJXVnw001933@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
- Fix "--without wavpack" build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xine-lib.spec	19 Sep 2007 19:04:27 -0000	1.25
+++ xine-lib.spec	19 Sep 2007 19:32:59 -0000	1.26
@@ -35,7 +35,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -340,7 +340,9 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
+%if %{with_wpack}
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%endif # wpack
 
 %files arts
 %defattr(-,root,root,-)
@@ -386,6 +388,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
 * Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
 - Move XCB plugins to the main package.
 - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build



From fedora-extras-commits at redhat.com  Wed Sep 19 19:34:46 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 15:34:46 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.6,1.7
Message-ID: <200709191934.l8JJYkaG002052@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1987

Modified Files:
	eclipse-egit.spec 
Log Message:
add requires: git


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-egit.spec	19 Sep 2007 19:31:56 -0000	1.6
+++ eclipse-egit.spec	19 Sep 2007 19:34:14 -0000	1.7
@@ -13,6 +13,7 @@
 Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
+Requires:         git
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:34 -0700
Subject: [pkgdb] kaffeine: scop has requested watchcommits
Message-ID: <200709191937.l8JJbZY5002843@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on kaffeine (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:37 -0700
Subject: [pkgdb] kaffeine: scop has requested commit
Message-ID: <200709191937.l8JJbcaL013415@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on kaffeine (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:32 -0700
Subject: [pkgdb] kaffeine: scop has requested watchbugzilla
Message-ID: <200709191937.l8JJbXB6013388@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on kaffeine (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:43:42 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 15:43:42 -0400
Subject: rpms/remind/devel remind.spec,1.4,1.5
Message-ID: <200709191943.l8JJhgE0002333@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2315

Modified Files:
	remind.spec 
Log Message:
Fixes bz #290761



Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- remind.spec	13 Sep 2007 21:43:25 -0000	1.4
+++ remind.spec	19 Sep 2007 19:43:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           remind
 Version:        03.01.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -92,6 +93,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
 * Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
 - Updated to version 03.01.02
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:45:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:45:52 -0700
Subject: [pkgdb] qimageblitz was added for kkofler
Message-ID: <200709191945.l8JJjreg005323@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qimageblitz with summary Interim image effect library for KDE 4.0
Kevin Fenzi (kevin) has approved Package qimageblitz
Kevin Fenzi (kevin) has added a Fedora devel branch for qimageblitz with an owner of kkofler
Kevin Fenzi (kevin) has approved qimageblitz in Fedora devel
Kevin Fenzi (kevin) has approved Package qimageblitz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qimageblitz (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qimageblitz (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qimageblitz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:46:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:46:02 -0700
Subject: [pkgdb] qimageblitz (Fedora, devel) updated by kevin
Message-ID: <200709191946.l8JJk3TF005389@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on qimageblitz (Fedora devel)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:46:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:46:02 -0700
Subject: [pkgdb] qimageblitz (Fedora, 7) updated by kevin
Message-ID: <200709191946.l8JJk4f8005408@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qimageblitz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on qimageblitz (Fedora 7)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:26 -0400
Subject: rpms/qimageblitz - New directory
Message-ID: <200709191947.l8JJlQPi002514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz

Log Message:
Directory /cvs/extras/rpms/qimageblitz added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:30 -0400
Subject: rpms/qimageblitz/devel - New directory
Message-ID: <200709191947.l8JJlUPv002532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz/devel

Log Message:
Directory /cvs/extras/rpms/qimageblitz/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:32 -0400
Subject: rpms/qimageblitz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709191947.l8JJlWLF002557@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz

Added Files:
	Makefile import.log 
Log Message:
Setup of module qimageblitz


--- NEW FILE Makefile ---
# Top level Makefile for module qimageblitz
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:35 -0400
Subject: rpms/qimageblitz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709191947.l8JJlZY3002573@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qimageblitz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qimageblitz
# $Id: Makefile,v 1.1 2007/09/19 19:47:33 kevin Exp $
NAME := qimageblitz
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 fedora-extras-commits at redhat.com  Wed Sep 19 19:53:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 19 Sep 2007 15:53:12 -0400
Subject: rpms/gnumeric/devel gnumeric-1.6.3-gpl-md5.patch, NONE,
	1.1 gnumeric.spec, 1.32, 1.33
Message-ID: <200709191953.l8JJrCrR002796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.6.3-gpl-md5.patch 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
- Replace GPL incompatible licensed md5 code with GPL compatible code from
  gnulib


gnumeric-1.6.3-gpl-md5.patch:

--- NEW FILE gnumeric-1.6.3-gpl-md5.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.c
--- gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.c	2007-09-19 16:20:34.000000000 +0200
@@ -16,6 +16,7 @@
 
 #include "ms-biff.h"
 #include "biff-types.h"
+#include "md5.h"
 
 #include <gsf/gsf-input.h>
 #include <gsf/gsf-output.h>
@@ -154,39 +155,17 @@ ms_biff_pre_biff8_query_set_decrypt  (Bi
 	return TRUE;
 }
 
-/* 
-this is just cut out of wvMD5Final to get the byte order correct
-under MSB systems, the previous code was woefully tied to intel
-x86
-
-C.
-*/
-static void
-wvMD5StoreDigest (MD5_CTX *mdContext)
-{
-	unsigned int i, ii;
-	/* store buffer in digest */
-	for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-		mdContext->digest[ii] = (unsigned char) (mdContext->buf[i] & 0xFF);
-		mdContext->digest[ii + 1] =
-			(unsigned char) ((mdContext->buf[i] >> 8) & 0xFF);
-		mdContext->digest[ii + 2] =
-			(unsigned char) ((mdContext->buf[i] >> 16) & 0xFF);
-		mdContext->digest[ii + 3] =
-			(unsigned char) ((mdContext->buf[i] >> 24) & 0xFF);
-	}
-}
-
 static void
-makekey (guint32 block, RC4_KEY *key, MD5_CTX *valContext)
+makekey (guint32 block, RC4_KEY *key, const unsigned char *valDigest)
 {
-	MD5_CTX mdContext;
+	struct md5_ctx ctx;
+	unsigned char digest[16];
 	guint8 pwarray[64];
 
 	memset (pwarray, 0, 64);
 
 	/* 40 bit of hashed password, set by verify_password () */
-	memcpy (pwarray, valContext->digest, 5);
+	memcpy (pwarray, valDigest, 5);
 
 	/* put block number in byte 6...9 */
 	pwarray[5] = (guint8) (block & 0xFF);
@@ -197,12 +176,13 @@ makekey (guint32 block, RC4_KEY *key, MD
 	pwarray[9] = 0x80;
 	pwarray[56] = 0x48;
 
-	wvMD5Init (&mdContext);
-	wvMD5Update (&mdContext, pwarray, 64);
-	wvMD5StoreDigest (&mdContext);
-	prepare_key (mdContext.digest, 16, key);
+	md5_init_ctx (&ctx);
+	md5_process_block (pwarray, 64, &ctx);
+	md5_read_ctx (&ctx, digest);
+	prepare_key (digest, 16, key);
 
-	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (&ctx, sizeof (ctx));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (pwarray, sizeof (pwarray));
 }
 
@@ -214,10 +193,11 @@ makekey (guint32 block, RC4_KEY *key, MD
 static gboolean
 verify_password (guint8 const *password, guint8 const *docid,
 		 guint8 const *salt_data, guint8 const *hashedsalt_data,
-		 MD5_CTX *valContext)
+		 unsigned char *valDigest)
 {
 	guint8 pwarray [64], salt [64], hashedsalt [16];
-	MD5_CTX mdContext1, mdContext2;
+	struct md5_ctx mdContext;
+	unsigned char digest[16];
 	RC4_KEY key;
 	int offset, keyoffset, i;
 	unsigned int tocopy;
@@ -238,24 +218,24 @@ verify_password (guint8 const *password,
 	pwarray[2 * i] = 0x80;
 	pwarray[56] = (i << 4);
 
-	wvMD5Init (&mdContext1);
-	wvMD5Update (&mdContext1, pwarray, 64);
-	wvMD5StoreDigest (&mdContext1);
+	md5_init_ctx (&mdContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
 	offset = 0;
 	keyoffset = 0;
 	tocopy = 5;
 
-	wvMD5Init (valContext);
+	md5_init_ctx (&mdContext);
 	while (offset != 16) {
 		if ((64 - offset) < 5)
 			tocopy = 64 - offset;
 
-		memcpy (pwarray + offset, mdContext1.digest + keyoffset, tocopy);
+		memcpy (pwarray + offset, digest + keyoffset, tocopy);
 		offset += tocopy;
 
 		if (offset == 64) {
-			wvMD5Update (valContext, pwarray, 64);
+			md5_process_block (pwarray, 64, &mdContext);
 			keyoffset = tocopy;
 			tocopy = 5 - tocopy;
 			offset = 0;
@@ -274,11 +254,11 @@ verify_password (guint8 const *password,
 	pwarray[56] = 0x80;
 	pwarray[57] = 0x0A;
 
-	wvMD5Update (valContext, pwarray, 64);
-	wvMD5StoreDigest (valContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, valDigest);
 
 	/* Generate 40-bit RC4 key from 128-bit hashed password */
-	makekey (0, &key, valContext);
+	makekey (0, &key, valDigest);
 
 	memcpy (salt, salt_data, 16);
 	rc4 (salt, 16, &key);
@@ -289,17 +269,17 @@ verify_password (guint8 const *password,
 	memset (salt + 17, 0, 47);
 	salt[56] = 0x80;
 
-	wvMD5Init (&mdContext2);
-	wvMD5Update (&mdContext2, salt, 64);
-	wvMD5StoreDigest (&mdContext2);
+	md5_init_ctx (&mdContext);
+	md5_process_block (salt, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
-	res = memcmp (mdContext2.digest, hashedsalt, 16) == 0;
+	res = memcmp (digest, hashedsalt, 16) == 0;
 
 	destroy_sensitive (pwarray, sizeof (pwarray));
 	destroy_sensitive (salt, sizeof (salt));
 	destroy_sensitive (hashedsalt, sizeof (hashedsalt));
-	destroy_sensitive (&mdContext1, sizeof (mdContext1));
-	destroy_sensitive (&mdContext2, sizeof (mdContext2));
+	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (&key, sizeof (key));
 
 	return res;
@@ -315,7 +294,7 @@ skip_bytes (BiffQuery *q, int start, int
 	block = (start + count) / REKEY_BLOCK;
 
 	if (block != q->block) {
-		makekey (q->block = block, &q->rc4_key, &q->md5_ctxt);
+		makekey (q->block = block, &q->rc4_key, q->md5_digest);
 		count = (start + count) % REKEY_BLOCK;
 	}
 
@@ -343,7 +322,7 @@ ms_biff_query_set_decrypt (BiffQuery *q,
 	g_return_val_if_fail (q->length == sizeof_BIFF_8_FILEPASS, FALSE);
 
 	if (!verify_password (password, q->data + 6,
-			      q->data + 22, q->data + 38, &q->md5_ctxt))
+			      q->data + 22, q->data + 38, q->md5_digest))
 		return FALSE;
 
 	q->encryption = MS_BIFF_CRYPTO_RC4;
@@ -484,7 +463,7 @@ ms_biff_query_next (BiffQuery *q)
 				data += step;
 				pos += step;
 				len -= step;
-				makekey (++q->block, &q->rc4_key, &q->md5_ctxt);
+				makekey (++q->block, &q->rc4_key, q->md5_digest);
 			}
 
 			rc4 (data, len, &q->rc4_key);
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.h
--- gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.h	2007-09-19 16:01:04.000000000 +0200
@@ -14,7 +14,6 @@
 
 #include <gsf/gsf.h>
 #include "rc4.h"
-#include "md5.h"
 
 typedef enum { MS_BIFF_CRYPTO_NONE = 0,
 	       MS_BIFF_CRYPTO_XOR,
@@ -51,7 +50,7 @@ typedef struct {
 	MsBiffCrypto encryption;
 	guint8   xor_key[16];
 	RC4_KEY	 rc4_key;
-	MD5_CTX  md5_ctxt;
+	unsigned char md5_digest[16];
 	int	 block;
 	gboolean dont_decrypt_next_record;
 } BiffQuery;
diff -up gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.h
--- gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5	2005-05-07 19:22:41.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.h	2007-09-19 16:01:04.000000000 +0200
@@ -1,66 +1,124 @@
-/* vim: set sw=8 ts=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef GNM_EXCEL_MD5_H
-#define GNM_EXCEL_MD5_H
+/* Declaration of functions and data types used for MD5 sum computing
+   library functions.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+      Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+#include <stdint.h>
+
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min)					\
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
+
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  uint32_t A;
+  uint32_t B;
+  uint32_t C;
+  uint32_t D;
+
+  uint32_t total[2];
+  uint32_t buflen;
+  uint32_t buffer[32];
+};
 
 /*
- **********************************************************************
- ** md5.h -- Header file for implementation of MD5                   **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version              **
- ** Revised (for MD5): RLR 4/27/91                                   **
- **   -- G modified to have y&~z instead of y&z                      **
- **   -- FF, GG, HH modified to add in last register done            **
- **   -- Access pattern: round 2 works mod 5, round 3 works mod 3    **
- **   -- distinct additive constant for each step                    **
- **   -- round 4 added, working mod 7                                **
- **********************************************************************
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
  */
 
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
-
-/* typedef a 32 bit type */
-#include <glib.h>
-typedef guint32 UINT4;
-
-/* Data structure for MD5 (Message Digest) computation */
-typedef struct {
-    UINT4 i[2];			/* number of _bits_ handled mod 2^64 */
-    UINT4 buf[4];		/* scratch buffer */
-    unsigned char in[64];	/* input buffer */
-    unsigned char digest[16];	/* actual digest after MD5Final call */
-} MD5_CTX;
-
-void wvMD5Init   (MD5_CTX *mdContext);
-void wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-/* void wvMD5Final (); */
-
-/*
- **********************************************************************
- ** End of md5.h                                                     **
- ******************************* (cut) ********************************
- */
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *__md5_buffer (const char *buffer, size_t len,
+			   void *resblock) __THROW;
 
-#endif /* GNM_EXCEL_MD5_H */
+#endif /* md5.h */
diff -up gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.c
--- gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5	2004-08-31 17:25:21.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.c	2007-09-19 16:01:04.000000000 +0200
@@ -1,221 +1,448 @@
-/*
- **********************************************************************
- ** md5.c                                                            **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version                  **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
+/* Functions to compute MD5 message digest of files or memory blocks.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
+
+
 
-/* -- include the following line if the md5.h header file is separate -- */
 #include "md5.h"
 
-/* F, G and H are basic MD5 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s, ac) \
-  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) \
-  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) \
-  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) \
-  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-
-
-/* Basic MD5 step. Transform buf based on in.  */
-static void
-Transform (UINT4 *buf, UINT4 *in)
-{
-    UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
-    /* Round 1 */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-    FF (a, b, c, d, in[0], S11, 3614090360UL);	/* 1 */
-    FF (d, a, b, c, in[1], S12, 3905402710UL);	/* 2 */
-    FF (c, d, a, b, in[2], S13, 606105819UL);	/* 3 */
-    FF (b, c, d, a, in[3], S14, 3250441966UL);	/* 4 */
-    FF (a, b, c, d, in[4], S11, 4118548399UL);	/* 5 */
-    FF (d, a, b, c, in[5], S12, 1200080426UL);	/* 6 */
-    FF (c, d, a, b, in[6], S13, 2821735955UL);	/* 7 */
-    FF (b, c, d, a, in[7], S14, 4249261313UL);	/* 8 */
-    FF (a, b, c, d, in[8], S11, 1770035416UL);	/* 9 */
-    FF (d, a, b, c, in[9], S12, 2336552879UL);	/* 10 */
-    FF (c, d, a, b, in[10], S13, 4294925233UL);	/* 11 */
-    FF (b, c, d, a, in[11], S14, 2304563134UL);	/* 12 */
-    FF (a, b, c, d, in[12], S11, 1804603682UL);	/* 13 */
-    FF (d, a, b, c, in[13], S12, 4254626195UL);	/* 14 */
-    FF (c, d, a, b, in[14], S13, 2792965006UL);	/* 15 */
-    FF (b, c, d, a, in[15], S14, 1236535329UL);	/* 16 */
-
-    /* Round 2 */
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-    GG (a, b, c, d, in[1], S21, 4129170786UL);	/* 17 */
-    GG (d, a, b, c, in[6], S22, 3225465664UL);	/* 18 */
-    GG (c, d, a, b, in[11], S23, 643717713UL);	/* 19 */
-    GG (b, c, d, a, in[0], S24, 3921069994UL);	/* 20 */
-    GG (a, b, c, d, in[5], S21, 3593408605UL);	/* 21 */
-    GG (d, a, b, c, in[10], S22, 38016083UL);	/* 22 */
-    GG (c, d, a, b, in[15], S23, 3634488961UL);	/* 23 */
-    GG (b, c, d, a, in[4], S24, 3889429448UL);	/* 24 */
-    GG (a, b, c, d, in[9], S21, 568446438UL);	/* 25 */
-    GG (d, a, b, c, in[14], S22, 3275163606UL);	/* 26 */
-    GG (c, d, a, b, in[3], S23, 4107603335UL);	/* 27 */
-    GG (b, c, d, a, in[8], S24, 1163531501UL);	/* 28 */
-    GG (a, b, c, d, in[13], S21, 2850285829UL);	/* 29 */
-    GG (d, a, b, c, in[2], S22, 4243563512UL);	/* 30 */
-    GG (c, d, a, b, in[7], S23, 1735328473UL);	/* 31 */
-    GG (b, c, d, a, in[12], S24, 2368359562UL);	/* 32 */
-
-    /* Round 3 */
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-    HH (a, b, c, d, in[5], S31, 4294588738UL);	/* 33 */
-    HH (d, a, b, c, in[8], S32, 2272392833UL);	/* 34 */
-    HH (c, d, a, b, in[11], S33, 1839030562UL);	/* 35 */
-    HH (b, c, d, a, in[14], S34, 4259657740UL);	/* 36 */
-    HH (a, b, c, d, in[1], S31, 2763975236UL);	/* 37 */
-    HH (d, a, b, c, in[4], S32, 1272893353UL);	/* 38 */
-    HH (c, d, a, b, in[7], S33, 4139469664UL);	/* 39 */
-    HH (b, c, d, a, in[10], S34, 3200236656UL);	/* 40 */
-    HH (a, b, c, d, in[13], S31, 681279174UL);	/* 41 */
-    HH (d, a, b, c, in[0], S32, 3936430074UL);	/* 42 */
-    HH (c, d, a, b, in[3], S33, 3572445317UL);	/* 43 */
-    HH (b, c, d, a, in[6], S34, 76029189UL);	/* 44 */
-    HH (a, b, c, d, in[9], S31, 3654602809UL);	/* 45 */
-    HH (d, a, b, c, in[12], S32, 3873151461UL);	/* 46 */
-    HH (c, d, a, b, in[15], S33, 530742520UL);	/* 47 */
-    HH (b, c, d, a, in[2], S34, 3299628645UL);	/* 48 */
-
-    /* Round 4 */
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-    II (a, b, c, d, in[0], S41, 4096336452UL);	/* 49 */
-    II (d, a, b, c, in[7], S42, 1126891415UL);	/* 50 */
-    II (c, d, a, b, in[14], S43, 2878612391UL);	/* 51 */
-    II (b, c, d, a, in[5], S44, 4237533241UL);	/* 52 */
-    II (a, b, c, d, in[12], S41, 1700485571UL);	/* 53 */
-    II (d, a, b, c, in[3], S42, 2399980690UL);	/* 54 */
-    II (c, d, a, b, in[10], S43, 4293915773UL);	/* 55 */
-    II (b, c, d, a, in[1], S44, 2240044497UL);	/* 56 */
-    II (a, b, c, d, in[8], S41, 1873313359UL);	/* 57 */
-    II (d, a, b, c, in[15], S42, 4264355552UL);	/* 58 */
-    II (c, d, a, b, in[6], S43, 2734768916UL);	/* 59 */
-    II (b, c, d, a, in[13], S44, 1309151649UL);	/* 60 */
-    II (a, b, c, d, in[4], S41, 4149444226UL);	/* 61 */
-    II (d, a, b, c, in[11], S42, 3174756917UL);	/* 62 */
-    II (c, d, a, b, in[2], S43, 718787259UL);	/* 63 */
-    II (b, c, d, a, in[9], S44, 3951481745UL);	/* 64 */
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
-}
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <endian.h>
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifdef _LIBC
+/* We need to keep the namespace clean so define the MD5 function
+   protected using leading __ .  */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define SWAP(n) (n)
+#endif
+
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
 void
-wvMD5Init (MD5_CTX *mdContext)
+md5_init_ctx (struct md5_ctx *ctx)
 {
-    mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
 
-    /* Load magic initialization constants.
-     */
-    mdContext->buf[0] = (UINT4) 0x67452301;
-    mdContext->buf[1] = (UINT4) 0xefcdab89;
-    mdContext->buf[2] = (UINT4) 0x98badcfe;
-    mdContext->buf[3] = (UINT4) 0x10325476;
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
 }
 
-void
-wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+  ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+  ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+  ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  uint32_t bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, size * 4, ctx);
+
+  return md5_read_ctx (ctx, resbuf);
+}
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
 {
-    UINT4 in[16];
-    int mdi;
-    unsigned int i, ii;
-
-    /* compute number of bytes mod 64 */
-    mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
-
-    /* update number of bits */
-    if ((mdContext->i[0] + ((UINT4) inLen << 3)) < mdContext->i[0])
-	mdContext->i[1]++;
-    mdContext->i[0] += ((UINT4) inLen << 3);
-    mdContext->i[1] += ((UINT4) inLen >> 29);
-
-    while (inLen--)
-      {
-	  /* add new character to buffer, increment mdi */
-	  mdContext->in[mdi++] = *inBuf++;
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+         computation function processes the whole buffer so that with the
+         next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
 
-	  /* transform if necessary */
-	  if (mdi == 0x40)
+	  sum += n;
+
+	  if (sum == BLOCKSIZE)
+	    break;
+
+	  if (n == 0)
 	    {
-		for (i = 0, ii = 0; i < 16; i++, ii += 4)
-		    in[i] = (((UINT4) mdContext->in[ii + 3]) << 24) |
-			(((UINT4) mdContext->in[ii + 2]) << 16) |
-			(((UINT4) mdContext->in[ii + 1]) << 8) |
-			((UINT4) mdContext->in[ii]);
-		Transform (mdContext->buf, in);
-		mdi = 0;
+	      /* Check for the error flag IFF N == 0, so that we don't
+	         exit the loop after a partial read due to e.g., EAGAIN
+	         or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
 	    }
-      }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+         BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+process_partial_block:
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (ctx->buflen > 64)
+	{
+	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
+
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
+	{
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
+	}
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
+	{
+	  md5_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+	}
+      ctx->buflen = left_over;
+    }
 }
 
-/*
- **********************************************************************
- ** End of md5.c                                                     **
- ******************************* (cut) ********************************
- */
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
+
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  uint32_t correct_words[16];
+  const uint32_t *words = buffer;
+  size_t nwords = len / sizeof (uint32_t);
+  const uint32_t *endp = words + nwords;
+  uint32_t A = ctx->A;
+  uint32_t B = ctx->B;
+  uint32_t C = ctx->C;
+  uint32_t D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      uint32_t *cwp = correct_words;
+      uint32_t A_save = A;
+      uint32_t B_save = B;
+      uint32_t C_save = C;
+      uint32_t D_save = D;
+
+      /* First round: using the given function, the context and a constant
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+         cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+         They are defined in RFC 1321 as
+
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+         Here is an equivalent invocation using Perl:
+
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D, 7, 0xd76aa478);
+      OP (D, A, B, C, 12, 0xe8c7b756);
+      OP (C, D, A, B, 17, 0x242070db);
+      OP (B, C, D, A, 22, 0xc1bdceee);
+      OP (A, B, C, D, 7, 0xf57c0faf);
+      OP (D, A, B, C, 12, 0x4787c62a);
+      OP (C, D, A, B, 17, 0xa8304613);
+      OP (B, C, D, A, 22, 0xfd469501);
+      OP (A, B, C, D, 7, 0x698098d8);
+      OP (D, A, B, C, 12, 0x8b44f7af);
+      OP (C, D, A, B, 17, 0xffff5bb1);
+      OP (B, C, D, A, 22, 0x895cd7be);
+      OP (A, B, C, D, 7, 0x6b901122);
+      OP (D, A, B, C, 12, 0xfd987193);
+      OP (C, D, A, B, 17, 0xa679438e);
+      OP (B, C, D, A, 22, 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)					\
+      do								\
+	{								\
+	  a += f (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+      /* Round 2.  */
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
+      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+      /* Round 3.  */
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+      /* Round 4.  */
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
+}


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnumeric.spec	31 Aug 2007 08:52:05 -0000	1.32
+++ gnumeric.spec	19 Sep 2007 19:52:40 -0000	1.33
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.6.3
-Release:          11%{?dist}
+Release:          12%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -13,6 +13,7 @@
 Patch1:           gnumeric-1.4.1-excelcrash.patch
 Patch2:           gnumeric-1.6.3-helppath.patch
 Patch3:           gnumeric-1.6.3-gda3.patch
+Patch4:           gnumeric-1.6.3-gpl-md5.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -50,6 +51,7 @@
 %patch1 -p1 -b .excelcrash
 %patch2 -p1 -b .helppath
 %patch3 -p1 -b .gda3
+%patch4 -p1 -b .gpl-md5
 chmod -x plugins/excel/rc4.?
 
 
@@ -158,7 +160,8 @@
 %exclude %{_datadir}/%{name}/%{version}/idl
 %{_datadir}/mime-info
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/omf/%{name}
+# The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
+%dir %{_datadir}/omf/%{name}
 %{_mandir}/man1/*
 
 %files devel
@@ -168,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
+- Replace GPL incompatible licensed md5 code with GPL compatible code from
+  gnulib
+
 * Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-11
 - Fix Source0 URL
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:03:51 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 16:03:51 -0400
Subject: rpms/remind/F-7 remind.spec,1.4,1.5
Message-ID: <200709192003.l8JK3pNc009054@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9028

Modified Files:
	remind.spec 
Log Message:
Fixes bz #290761



Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- remind.spec	13 Sep 2007 22:04:44 -0000	1.4
+++ remind.spec	19 Sep 2007 20:03:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           remind
 Version:        03.01.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -92,6 +93,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
 * Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
 - Updated to version 03.01.02
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:10:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 16:10:51 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.60, 1.61 fedora-logos.spec,
	1.84, 1.85 sources, 1.65, 1.66
Message-ID: <200709192010.l8JKAp9K009402@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9240

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
gdm theme for real



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	19 Sep 2007 16:39:06 -0000	1.60
+++ .cvsignore	19 Sep 2007 20:10:17 -0000	1.61
@@ -1 +1 @@
-fedora-logos-7.92.3.tar.bz2
+fedora-logos-7.92.4.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fedora-logos.spec	19 Sep 2007 16:39:06 -0000	1.84
+++ fedora-logos.spec	19 Sep 2007 20:10:17 -0000	1.85
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.3
+Version: 7.92.4
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -135,6 +135,11 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraDNA
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraInfinity
+for i in gdm/FedoraInfinity/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraInfinity
+done
+
 
 # kdmtheme
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/Bluecurve
@@ -203,6 +208,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.4-1
+- Acutally install the gdm theme
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.3-1
 - Add infinity gdm theme
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	19 Sep 2007 16:39:06 -0000	1.65
+++ sources	19 Sep 2007 20:10:17 -0000	1.66
@@ -1 +1 @@
-6f5fa87bd54b34b2614799b78b05f5a9  fedora-logos-7.92.3.tar.bz2
+98be98d69f938dc7524a0a166b990e48  fedora-logos-7.92.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:47 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:47 -0400
Subject: rpms/util-vserver/devel util-vserver.spec,1.32,1.33
Message-ID: <200709192011.l8JKBlpL009531@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/devel

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- util-vserver.spec	3 Sep 2007 17:42:38 -0000	1.32
+++ util-vserver.spec	19 Sep 2007 20:11:14 -0000	1.33
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,10 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+# TODO: remove in FC9...
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +365,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:50 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:50 -0400
Subject: rpms/util-vserver/FC-6 util-vserver.spec,1.28,1.29
Message-ID: <200709192011.l8JKBo1c009536@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/FC-6

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util-vserver.spec	3 Sep 2007 17:56:55 -0000	1.28
+++ util-vserver.spec	19 Sep 2007 20:11:18 -0000	1.29
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,9 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +364,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:53 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:53 -0400
Subject: rpms/util-vserver/F-7 util-vserver.spec,1.28,1.29
Message-ID: <200709192011.l8JKBrs2009539@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/F-7

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util-vserver.spec	3 Sep 2007 17:56:53 -0000	1.28
+++ util-vserver.spec	19 Sep 2007 20:11:21 -0000	1.29
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,9 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +364,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:17:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 16:17:02 -0400
Subject: rpms/kaffeine/devel kaffeine.spec,1.8,1.9
Message-ID: <200709192017.l8JKH25p009826@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9805

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
- Avoid autotools re-run after configure (unclean upstream tarball?)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kaffeine.spec	25 Aug 2007 14:25:38 -0000	1.8
+++ kaffeine.spec	19 Sep 2007 20:16:29 -0000	1.9
@@ -8,7 +8,7 @@
 #define nonfree 1
 
 Version: 0.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -87,6 +87,8 @@
 #  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
@@ -185,6 +187,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
 * Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
 - respin (BuildID)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:19:23 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 16:19:23 -0400
Subject: rpms/remind/FC-6 .cvsignore, 1.3, 1.4 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709192019.l8JKJNU4009954@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9909

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Version bump to 03.01.02 and fix bz #290761



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 16:14:36 -0000	1.3
+++ .cvsignore	19 Sep 2007 20:18:50 -0000	1.4
@@ -1 +1 @@
-remind-03.01.00.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:38:14 -0000	1.1
+++ remind-nostrip.patch	19 Sep 2007 20:18:50 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/remind.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remind.spec	21 Aug 2007 16:14:36 -0000	1.2
+++ remind.spec	19 Sep 2007 20:18:50 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           remind
-Version:        03.01.00
-Release:        1%{?dist}
+Version:        03.01.02
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2
 URL:            http://www.roaringpenguin.com/en/penguin/openSourceProducts/remind
 Source0:        http://www.roaringpenguin.com/files/download/remind-%{version}.tar.gz
 Source1:        tkremind.desktop
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -75,15 +76,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/cm2rem.tcl
-%{_bindir}/kall
-%{_bindir}/rem
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
-%{_mandir}/man1/kall.1.gz
-%{_mandir}/man1/rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -94,6 +93,16 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
+* Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
+- Updated to version 03.01.01
+- Updated license tag to GPLv2
+
 * Wed Aug 15 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.00-1
 - Updated to version 03.01.00
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 16:14:36 -0000	1.3
+++ sources	19 Sep 2007 20:18:50 -0000	1.4
@@ -1 +1 @@
-976046423402a403f4972c04d96456b2  remind-03.01.00.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 20:26:48 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 19 Sep 2007 16:26:48 -0400
Subject: rpms/xen/devel xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.183,
	1.184
Message-ID: <200709192026.l8JKQmmO010280@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix VIF type attribute handling
Resolves: rhbz #296061

xen-clobber-vif-type.patch:

--- NEW FILE xen-clobber-vif-type.patch ---
diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py	2007-09-19 14:24:34.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py	2007-09-19 14:25:28.000000000 -0400
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             mac = randomMAC()
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge:


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xen.spec	28 Aug 2007 23:16:53 -0000	1.183
+++ xen.spec	19 Sep 2007 20:26:16 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -27,6 +27,7 @@
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch31: xen-tpm-functions.patch
+Patch32: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -129,6 +130,7 @@
 %patch30 -p1
 
 %patch31 -p1
+%patch32 -p1
 
 # config patches
 %patch100 -p1
@@ -279,6 +281,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-6.fc8
+- Don't clobber the VIF type attribute in FV guests (rhbz #296061)
+
 * Tue Aug 28 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc8
 - Added dep on openssl for blktap-qcow
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:54:29 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 19 Sep 2007 16:54:29 -0400
Subject: rpms/qimageblitz/devel qimageblitz.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709192054.l8JKsTEO011178@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11139/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qimageblitz.spec 
Log Message:
New package qimageblitz - Interim image effect library for KDE 4.0



--- NEW FILE qimageblitz.spec ---
%define revision 706674

Summary: Interim image effect library for KDE 4.0
Name:    qimageblitz
Version: 0.0.4
Release: 0.2.svn%{revision}%{?dist}

Group:   System Environment/Libraries
License: BSD and ImageMagick
URL:     http://www.kde.org
Source0: http://ftp.debian.org/debian/pool/main/q/qimageblitz/qimageblitz_0.0.%{revision}.orig.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: qt4-devel

%description
Blitz is an interim image effect library that people can use until KDE 4.1 is
released. KImageEffect, the old image effect class is being dropped for KDE 4.0
and the replacement, Quasar, won't be ready until KDE 4.1. Blitz gives people
something to use in the meantime.

%package devel
Summary: Developer files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel pkgconfig
%description devel
%{summary}.

%package examples
Summary: Example programs for %{name}
Group:   System Environment/Libraries
%description examples
This package contains the blitztest example program for %{name}.

%prep
%setup -q -n qimageblitz-0.0.%{revision}

%build
%cmake .
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir $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,-)
%doc Changelog README*
%{_libdir}/libqimageblitz.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libqimageblitz.so
%{_libdir}/pkgconfig/qimageblitz.pc
%{_includedir}/qimageblitz/

%files examples
%defattr(-,root,root,-)
%{_bindir}/blitztest

%changelog
* Wed Sep 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.2.svn706674
- Move blitztest example to its own subpackage.

* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.1.svn706674
- First Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 19:47:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 20:53:57 -0000	1.2
@@ -0,0 +1 @@
+qimageblitz_0.0.706674.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 19:47:33 -0000	1.1
+++ sources	19 Sep 2007 20:53:57 -0000	1.2
@@ -0,0 +1 @@
+7a1f4f25a653fd09a4a2f19e2eb10de7  qimageblitz_0.0.706674.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:27 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4SiL007945@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:28 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4Uih029123@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:29 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4Vdw029132@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

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



From fedora-extras-commits at redhat.com  Wed Sep 19 21:14:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 19 Sep 2007 17:14:20 -0400
Subject: rpms/qimageblitz/F-7 qimageblitz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709192114.l8JLEKIH017855@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qimageblitz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17739/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qimageblitz.spec 
Log Message:
New package qimageblitz - Interim image effect library for KDE 4.0


--- NEW FILE qimageblitz.spec ---
%define revision 706674

Summary: Interim image effect library for KDE 4.0
Name:    qimageblitz
Version: 0.0.4
Release: 0.2.svn%{revision}%{?dist}

Group:   System Environment/Libraries
License: BSD and ImageMagick
URL:     http://www.kde.org
Source0: http://ftp.debian.org/debian/pool/main/q/qimageblitz/qimageblitz_0.0.%{revision}.orig.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: qt4-devel

%description
Blitz is an interim image effect library that people can use until KDE 4.1 is
released. KImageEffect, the old image effect class is being dropped for KDE 4.0
and the replacement, Quasar, won't be ready until KDE 4.1. Blitz gives people
something to use in the meantime.

%package devel
Summary: Developer files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel pkgconfig
%description devel
%{summary}.

%package examples
Summary: Example programs for %{name}
Group:   System Environment/Libraries
%description examples
This package contains the blitztest example program for %{name}.

%prep
%setup -q -n qimageblitz-0.0.%{revision}

%build
%cmake .
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir $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,-)
%doc Changelog README*
%{_libdir}/libqimageblitz.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libqimageblitz.so
%{_libdir}/pkgconfig/qimageblitz.pc
%{_includedir}/qimageblitz/

%files examples
%defattr(-,root,root,-)
%{_bindir}/blitztest

%changelog
* Wed Sep 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.2.svn706674
- Move blitztest example to its own subpackage.

* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.1.svn706674
- First Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 19:47:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+qimageblitz_0.0.706674.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 19:47:33 -0000	1.1
+++ sources	19 Sep 2007 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+7a1f4f25a653fd09a4a2f19e2eb10de7  qimageblitz_0.0.706674.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 21:16:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 17:16:39 -0400
Subject: rpms/kaffeine/EL-5 .cvsignore, 1.3, 1.4 kaffeine.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709192116.l8JLGdRm017904@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17880

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
+++ .cvsignore	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,2 +1,4 @@
 kaffeine-0.8.2.tar.bz2
 kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.5.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/kaffeine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kaffeine.spec	29 Nov 2006 18:40:14 -0000	1.3
+++ kaffeine.spec	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,36 +1,27 @@
 
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define _with_gstreamer --with-gstreamer
-%endif
-
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
-%define gst 08 
-BuildRequires: libXtst-devel libXinerama-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 %endif
 
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.3
-Release: 2%{?dist}
+Version: 0.8.5
+Release: 4%{?dist}
 
-%if "%{?nonfree:1}" == "1"
-Name:    kaffeine-extras-nonfree
-%define  _with_lame --with-lame
-Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
-# split occurred here
-Conflicts: kaffeine < 0.8.2-2
-%else
+%if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
+%else
+Name:    kaffeine-extras-nonfree
 %endif
 
-License: GPL
+License: GPLv2+
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -38,23 +29,19 @@
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-%{!?_without_dvb:BuildRequires: glibc-kernheaders }
-%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
-# not included in Extras, disabled
-%{?_with_lame:BuildRequires: lame-devel}
-
-## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
-## everybondy should be using kde >= 3.5.4 by now... (:
-#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
-#if "%{?kdelibs_ver}" >= "3.5.4"
-%define x_mplayer2_hack 1
-Requires: kdelibs >= 6:3.5.4
-#or
-#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
-#endif
+%if 0%{?fedora} > 7
+BuildRequires: libxcb-devel
+%endif
+# dvb
+BuildRequires: glibc-kernheaders 
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
 
 %if "%{?nonfree:1}" == "1" 
-%if "%{?fedora}" > "4"
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+%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/nonfree codec support
@@ -96,16 +83,17 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+# easier than patching, and using 
+#  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --disable-final \
-  %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
 
@@ -146,7 +134,7 @@
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 %endif
 
 
@@ -177,7 +165,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
@@ -191,15 +180,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
 %endif
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
 
 * Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2006 15:12:29 -0000	1.3
+++ sources	19 Sep 2007 21:16:06 -0000	1.4
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2
+71814e7612f1f7e1b6cd954d352e4201  kaffeine-0.8.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:27:23 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Wed, 19 Sep 2007 17:27:23 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.155, 1.156 mkinitrd.spec, 1.220, 
	1.221 sources, 1.198, 1.199
Message-ID: <200709192127.l8JLRNbG018454@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18357

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.17-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	11 Sep 2007 15:32:19 -0000	1.155
+++ .cvsignore	19 Sep 2007 21:26:40 -0000	1.156
@@ -1 +1 @@
-mkinitrd-6.0.16.tar.bz2
+mkinitrd-6.0.17.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- mkinitrd.spec	11 Sep 2007 15:32:19 -0000	1.220
+++ mkinitrd.spec	19 Sep 2007 21:26:40 -0000	1.221
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.16
+Version: 6.0.17
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,14 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Wed Sep 19 2007 Peter Jones <pjones at redhat.com> - 6.0.17-1
+- Fix missing quotes causing failure to detect erroneous "--with" command line
+  arguments (#249163)
+- Use open64 in losetup so large files work (#220687)
+- Fix sysfs paths for fw-sbp2 (#231708)
+- Handle spaces in kernel command line better (#240785)
+- Fix handling of --omit-lvm-modules and --omit-dmraid
+
 * Fri Sep 11 2007 Peter Jones <pjones at redhat.com> - 6.0.16-1
 - Fix handling of CCISS one more time (bz#274201)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- sources	11 Sep 2007 15:32:19 -0000	1.198
+++ sources	19 Sep 2007 21:26:40 -0000	1.199
@@ -1 +1 @@
-55b1ec0cb506085eaca5612c09a5d61b  mkinitrd-6.0.16.tar.bz2
+4c0e08dbdd1f6af4606676de1817863a  mkinitrd-6.0.17.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:37:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 17:37:53 -0400
Subject: rpms/sabayon/devel .cvsignore, 1.15, 1.16 sabayon.spec, 1.41,
	1.42 sources, 1.15, 1.16
Message-ID: <200709192137.l8JLbrNZ019038@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18909

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Aug 2007 20:11:45 -0000	1.15
+++ .cvsignore	19 Sep 2007 21:37:20 -0000	1.16
@@ -1 +1 @@
-sabayon-2.19.2.tar.bz2
+sabayon-2.20.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sabayon.spec	17 Aug 2007 03:32:36 -0000	1.41
+++ sabayon.spec	19 Sep 2007 21:37:20 -0000	1.42
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.19.2
+Version: 2.20.0
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnome.org/projects/sabayon
-Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.20/sabayon-%{version}.tar.bz2
 Source2: sabayon.pam
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -272,6 +272,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Aug 2007 20:11:45 -0000	1.15
+++ sources	19 Sep 2007 21:37:20 -0000	1.16
@@ -1 +1 @@
-5adc2e7e24f48e004ef45caa0480bc89  sabayon-2.19.2.tar.bz2
+50165894e576fb80d2b3a4bc0294fc5b  sabayon-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:39:59 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 19 Sep 2007 17:39:59 -0400
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.36,1.37
Message-ID: <200709192139.l8JLdx3T019160@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19120

Modified Files:
	epiphany-extensions.spec 
Log Message:
Force building against Firefox as a temporary compilation fix.


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- epiphany-extensions.spec	18 Sep 2007 23:30:59 -0000	1.36
+++ epiphany-extensions.spec	19 Sep 2007 21:39:26 -0000	1.37
@@ -50,7 +50,10 @@
 
 
 %build
+## XXX: We're forcibly building against Firefox until the XULrunner
+## obsoletes/upgrade-path issues can be properly fixed. 
 %configure --disable-compiler-warnings --disable-scrollkeeper	\
+	--with-gecko=firefox					\
 	--with-extensions=really-all
 %{__make} %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Wed Sep 19 21:45:50 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 17:45:50 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.16,
	1.17
Message-ID: <200709192145.l8JLjo9L020239@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20049

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
Fix bugzilla 242917




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-daemon.spec	16 Mar 2007 20:03:46 -0000	1.16
+++ jakarta-commons-daemon.spec	19 Sep 2007 21:45:18 -0000	1.17
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,18 +32,18 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define native      %{?_with_native:1}%{!?_with_native:0}
+%define native      %{?_without_native:0}%{!?_without_native:1}
 
 %define base_name   daemon
 %define short_name  commons-%{base_name}
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        6jpp.2%{?dist}
+Release:        6jpp.3%{?dist}
 Epoch:          1
 Summary:        Defines API to support an alternative invocation mechanism
-License:        Apache Software License
-Group:          System/Boot
+License:        ASL 2.0
+Group:          Applications/System
 URL:            http://jakarta.apache.org/commons/daemon/
 Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
 Patch:          %{name}-crosslink.patch
@@ -51,12 +51,12 @@
 
 %if %{native}
 BuildRequires:  java-devel
-%else
+BuildRequires:  xmlto
+%endif
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRequires:  ant, java-javadoc
-%endif
 BuildRequires:  jpackage-utils >= 0:1.6
 Provides:       %{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
@@ -77,7 +77,7 @@
 
 %package        jsvc
 Summary:        Java daemon launcher
-Group:          System/Boot
+Group:          Applications/System
 Provides:       jsvc = %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
@@ -91,7 +91,7 @@
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -103,23 +103,28 @@
 %setup -q -n %{base_name}-%{version}
 %patch0 -p0
 chmod 644 src/samples/*
+%if %{native}
+pushd src/native/unix
+xmlto man man/jsvc.1.xml
+popd
+%endif
 
 
 %build
+ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %if %{native}
 cd src/native/unix
 %configure --with-java=%{java_home}
 make %{?_smp_mflags}
-%else
-ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{native}
-install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_sbindir}/jsvc
-%else
+install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
+install -Dpm 0644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
+%endif
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 dist/%{short_name}.jar \
@@ -130,18 +135,14 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
 
-%if ! %{native}
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if ! %{native}
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -157,14 +158,14 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
-%endif
 
 %if %{native}
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
-%{_sbindir}/jsvc
-%else
+%{_bindir}/jsvc
+%{_mandir}/man1/jsvc.1*
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -174,7 +175,6 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -184,6 +184,16 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 James Ralston <ralston at pobox.com> - 1:1.0.1-6jpp.3
+- update License tag to reflect new acceptable licenses
+- update main Group tag (old value "System/Boot" is invalid)
+- update jsvc Group tag as well
+- update javadoc Group tag as well
+- building jsvc is no longer mutually exclusive with building javadoc
+- jsvc is built by default (use "--without native" to disable)
+- build jsvc man page from DocBook source via xmlto; install
+- move jsvc from sbindir to bindir (man page is section 1)
+
 * Fri Jan 26 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0.1-6jpp.2
 - Added versioning to provides and obsoletes and rpmlint cleanup
 



From fedora-extras-commits at redhat.com  Wed Sep 19 22:20:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 19 Sep 2007 18:20:20 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git8.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.687, 1.688 config-powerpc-generic, 1.8, 1.9 config-powerpc64,
	1.4, 1.5 config-sparc64-generic, 1.7, 1.8 config-x86-generic,
	1.12, 1.13 config-x86_64-generic, 1.9, 1.10 kernel.spec, 1.170,
	1.171 linux-2.6-smarter-relatime.patch, 1.2, 1.3 sources, 1.649,
	1.650 upstream, 1.571, 1.572
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch,
	1.1, NONE
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch,
	1.1, NONE linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch,
	1.1, NONE linux-2.6-xfs-filesize-updates.patch, 1.1,
	NONE linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch, 1.1,
	NONE patch-2.6.23-rc6-git7.bz2.sign, 1.1, NONE
Message-ID: <200709192220.l8JMKKjl005732@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5656

Modified Files:
	.cvsignore config-powerpc-generic config-powerpc64 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-smarter-relatime.patch sources upstream 
Added Files:
	patch-2.6.23-rc6-git8.bz2.sign 
Removed Files:
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch 
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch 
	linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch 
	linux-2.6-xfs-filesize-updates.patch 
	linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch 
	patch-2.6.23-rc6-git7.bz2.sign 
Log Message:
* Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git8
- Enable Secure Computing (CONFIG_SECCOMP) (#295841)



--- NEW FILE patch-2.6.23-rc6-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8XKoyGugalF9Dw4RAilQAJ0eK+DhHnue4nODKTblg7EyOmeH7QCgkfE/
jP9NlgRMxY4clbRp19AvUMc=
=jlzh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- .cvsignore	17 Sep 2007 14:16:49 -0000	1.687
+++ .cvsignore	19 Sep 2007 22:19:45 -0000	1.688
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git7.bz2
+patch-2.6.23-rc6-git8.bz2


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-powerpc-generic	15 Aug 2007 21:06:26 -0000	1.8
+++ config-powerpc-generic	19 Sep 2007 22:19:45 -0000	1.9
@@ -11,7 +11,7 @@
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc64	9 Aug 2007 15:29:41 -0000	1.4
+++ config-powerpc64	19 Sep 2007 22:19:45 -0000	1.5
@@ -133,4 +133,4 @@
 
 CONFIG_SCSI_IBMVSCSIS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-sparc64-generic	17 Aug 2007 21:40:29 -0000	1.7
+++ config-sparc64-generic	19 Sep 2007 22:19:45 -0000	1.8
@@ -1,6 +1,6 @@
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-x86-generic	13 Sep 2007 16:29:27 -0000	1.12
+++ config-x86-generic	19 Sep 2007 22:19:45 -0000	1.13
@@ -92,7 +92,7 @@
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CAPI_EICON=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-x86_64-generic	12 Sep 2007 22:56:16 -0000	1.9
+++ config-x86_64-generic	19 Sep 2007 22:19:45 -0000	1.10
@@ -35,7 +35,7 @@
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kernel.spec	18 Sep 2007 20:58:50 -0000	1.170
+++ kernel.spec	19 Sep 2007 22:19:45 -0000	1.171
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 7
+%define gitrev 8
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -663,16 +663,11 @@
 Patch1230: linux-2.6-powerpc-spu-vicinity.patch
 Patch1300: linux-2.6-usb-suspend-classes.patch
 Patch1400: linux-2.6-smarter-relatime.patch
-Patch1501: linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-Patch1507: linux-2.6-xfs-filesize-updates.patch
-Patch1508: linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
-Patch1510: linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
-Patch1511: linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
@@ -1175,22 +1170,16 @@
 ApplyPatch linux-2.6-smarter-relatime.patch
 
 # xfs bugfixes & stack reduction
-ApplyPatch linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
 ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-ApplyPatch linux-2.6-xfs-filesize-updates.patch
-ApplyPatch linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
 ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
 
-# ext3 bugfixes
-ApplyPatch linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
-ApplyPatch linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
-
 #
 # 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
@@ -1811,6 +1800,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git8
+- Enable Secure Computing (CONFIG_SECCOMP) (#295841)
+
 * Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
 - ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
   handle dx directory corruption gracefully, w/o BUG (#236464).

linux-2.6-smarter-relatime.patch:

Index: linux-2.6-smarter-relatime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-smarter-relatime.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-smarter-relatime.patch	17 Sep 2007 14:16:49 -0000	1.2
+++ linux-2.6-smarter-relatime.patch	19 Sep 2007 22:19:45 -0000	1.3
@@ -52,7 +52,7 @@
  			Set system-wide default UTF-8 mode for all tty's.
 @@ -1468,6 +1472,10 @@ and is between 256 and 4096 characters. 
  			Format: <reboot_mode>[,<reboot_mode2>[,...]]
- 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c
+ 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c			
  
 +	relatime_interval=
 +			[FS] relative atime update frequency, in seconds.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- sources	17 Sep 2007 14:16:49 -0000	1.649
+++ sources	19 Sep 2007 22:19:45 -0000	1.650
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-4f3845c3e912bc93c09b0dec08719232  patch-2.6.23-rc6-git7.bz2
+7af060af2f67d1bc774c40025d3b5f4f  patch-2.6.23-rc6-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- upstream	17 Sep 2007 14:16:49 -0000	1.571
+++ upstream	19 Sep 2007 22:19:46 -0000	1.572
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git7.bz2
+patch-2.6.23-rc6-git8.bz2


--- linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch DELETED ---


--- linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch DELETED ---


--- linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch DELETED ---


--- linux-2.6-xfs-filesize-updates.patch DELETED ---


--- linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch DELETED ---


--- patch-2.6.23-rc6-git7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 22:31:48 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 19 Sep 2007 18:31:48 -0400
Subject: rpms/eclipse-mylyn/devel
	eclipse-mylyn-addfedoracustomizations.patch, 
	NONE, 1.1 eclipse-mylyn.spec, 1.7, 1.8
Message-ID: <200709192231.l8JMVm62008761@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8447/devel

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-addfedoracustomizations.patch 
Log Message:
* Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
- Add patch and source to have common bugzilla servers by default.

eclipse-mylyn-addfedoracustomizations.patch:

--- NEW FILE eclipse-mylyn-addfedoracustomizations.patch ---
### 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.335
diff -u -r1.335 feature.xml
--- feature.xml	28 Jun 2007 18:19:54 -0000	1.335
+++ feature.xml	19 Sep 2007 19:05:41 -0000
@@ -252,4 +252,11 @@
          version="2.0.0.v20070627-1400"
          unpack="false"/>
 
+   <plugin
+         id="org.fedoraproject.mylyn.bugzilla"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-mylyn.spec	18 Sep 2007 18:24:16 -0000	1.7
+++ eclipse-mylyn.spec	19 Sep 2007 22:31:16 -0000	1.8
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -17,6 +17,7 @@
 # tar cjf org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2 org.eclipse.mylyn
 Source0: org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
 Source1: fetch-mylar.sh
+Source2: fedoraeclipse-mylynbugzilla-0.0.1.zip
 
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
@@ -24,6 +25,7 @@
 # So we can symlink to dependencies
 Patch4: %{name}-unpackwebcore.patch
 Patch5: %{name}-webcorejar.patch
+Patch6: %{name}-addfedoracustomizations.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +124,7 @@
 
 %prep
 %setup -q -n org.eclipse.mylyn
+unzip -q %{SOURCE2}
 
 # GCJ issue
 sed --in-place "s/@Override//" \
@@ -160,6 +163,10 @@
 ln -s %{_javadir}/jdom-1.0.jar
 popd
 
+pushd org.eclipse.mylyn.bugzilla-feature
+%patch6
+popd
+
 #sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
 sed --in-place -e "304,456d" org.eclipse.mylyn-feature/feature.xml 
@@ -353,6 +360,7 @@
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.core_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar
+%{eclipse_base}/plugins/org.fedoraproject.mylyn.bugzilla_*.jar
 %dir %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*
 %doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/license.html
 %doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/about.html
@@ -360,6 +368,7 @@
 %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/feature.xml
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla*
+%{_libdir}/gcj/%{name}/org.fedoraproject.mylyn.bugzilla*
 %endif
 
 %files ide
@@ -447,6 +456,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
+- Add patch and source to have common bugzilla servers by default.
+
 * Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
 - Fix filename of webcore jar.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 22:32:53 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 19 Sep 2007 18:32:53 -0400
Subject: rpms/eclipse-mylyn/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709192232.l8JMWron009203@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9097

Modified Files:
	.cvsignore sources 
Log Message:
Add new source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2007 16:36:04 -0000	1.2
+++ .cvsignore	19 Sep 2007 22:32:20 -0000	1.3
@@ -1 +1,2 @@
 org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
+fedoraeclipse-mylynbugzilla-0.0.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2007 16:36:04 -0000	1.2
+++ sources	19 Sep 2007 22:32:20 -0000	1.3
@@ -1 +1,2 @@
 d78a53cf41bb98ccffe7ed5307c146ee  org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
+91ddb27b37165f94622e18964e3d6717  fedoraeclipse-mylynbugzilla-0.0.1.zip



From fedora-extras-commits at redhat.com  Wed Sep 19 22:34:12 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 18:34:12 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.17,
	1.18
Message-ID: <200709192234.l8JMYCm8009511@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9248

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
fix ppc64 build




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-daemon.spec	19 Sep 2007 21:45:18 -0000	1.17
+++ jakarta-commons-daemon.spec	19 Sep 2007 22:33:40 -0000	1.18
@@ -108,6 +108,7 @@
 xmlto man man/jsvc.1.xml
 popd
 %endif
+sed -i -e '2425s/powerpc/powerpc*/' src/native/unix/configure
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Sep 19 22:47:34 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 19 Sep 2007 18:47:34 -0400
Subject: comps comps-f7.xml.in,1.255,1.256 comps-fe6.xml.in,1.375,1.376
Message-ID: <200709192247.l8JMlY9l014505@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14114

Modified Files:
	comps-f7.xml.in comps-fe6.xml.in 
Log Message:
slingshot 6/7 comps.



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- comps-f7.xml.in	17 Sep 2007 19:18:28 -0000	1.255
+++ comps-f7.xml.in	19 Sep 2007 22:47:04 -0000	1.256
@@ -1393,6 +1393,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- comps-fe6.xml.in	14 Sep 2007 08:21:29 -0000	1.375
+++ comps-fe6.xml.in	19 Sep 2007 22:47:04 -0000	1.376
@@ -531,6 +531,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 19 23:11:11 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 19:11:11 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch,1.3,NONE
Message-ID: <200709192311.l8JNBBfr029131@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29112

Removed Files:
	eclipse-egit-add-feature.patch 
Log Message:
remove egit feature patch


--- eclipse-egit-add-feature.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:14:39 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 19:14:39 -0400
Subject: rpms/eclipse-egit/F-7 .cvsignore, 1.2, 1.3 eclipse-egit.spec, 1.1, 
	1.2 sources, 1.2, 1.3 eclipse-egit-add-feature.patch, 1.1, NONE
Message-ID: <200709192314.l8JNEdBL029855@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Removed Files:
	eclipse-egit-add-feature.patch 
Log Message:
* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc7
- 0.2.99 git20070919



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2007 14:51:23 -0000	1.2
+++ .cvsignore	19 Sep 2007 23:14:07 -0000	1.3
@@ -1,2 +1 @@
-egit.png
-egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/eclipse-egit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit.spec	17 Sep 2007 14:51:23 -0000	1.1
+++ eclipse-egit.spec	19 Sep 2007 23:14:07 -0000	1.2
@@ -3,18 +3,17 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.2
-Release:          1.git20070911%{?dist}
+Version:          0.2.99
+Release:          0.git20070919%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
-Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
-Source1:          egit.png
-Patch0:           %{name}-add-feature.patch
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
+Requires:         git
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
@@ -39,8 +38,6 @@
 
 %prep
 %setup -q -c 
-%patch0 -p0
-cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -98,9 +95,12 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc7
+- 0.2.99 git20070919
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
 - Pull in build from rawhide.
-- Require eclipse-platform >= 3.2.1. 
+- Require eclipse-platform >= 3.2.1.
 
 * Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
 - Update to git20070911.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2007 14:51:23 -0000	1.2
+++ sources	19 Sep 2007 23:14:07 -0000	1.3
@@ -1,2 +1 @@
-5d1082d9db40f01c5de094ac8769514b  egit.png
-d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


--- eclipse-egit-add-feature.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:16:01 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:16:01 -0400
Subject: rpms/pm-utils/devel pm-utils.spec, 1.79,
	1.80 pm-utils-0.19-vidhooks.patch, 1.6, NONE
Message-ID: <200709192316.l8JNG1PD030143@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30027

Modified Files:
	pm-utils.spec 
Removed Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
- remove unused patch (vidhooks)
- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
  to keep selinux context
- simplify spec
- restore selinux context of logfile in %post 
- use rpmmacros more often



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pm-utils.spec	11 Sep 2007 08:01:08 -0000	1.79
+++ pm-utils.spec	19 Sep 2007 23:15:28 -0000	1.80
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,8 +29,8 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
-#Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-cfg.patch
+Patch3: pm-utils-0.99.4-logfile.patch
 
 
 %description
@@ -41,8 +41,8 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
-#%patch1 -p1 -b .vidhooks
 %patch2 -p1 -b .cfg
+%patch3 -p1 -b .logfile
 
 
 %build
@@ -70,29 +70,33 @@
 	ln -sf consolehelper $x
 done
 popd
-install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/pm-suspend.log
+install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
+
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %pre
-if [ -f /etc/sysconfig/pm ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig
+if [ -f %{_sysconfdir}/sysconfig/pm ]; then
+	mkdir -p %{_sysconfdir}/pm/config.d
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
 fi
 
+
 %post
-if [ -f /etc/pm/config.rpmsave ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig
+if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
 fi
-if [ ! -a /var/log/pm-suspend.log ] ; then
-	install -m 600 /dev/null /var/log/pm-suspend.log
+if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
+	chmod 0600 %{_localstatedir}/log/pm-suspend.log
+	[ -x /sbin/restorecon ] && restorecon  %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1
 fi
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
@@ -109,9 +113,17 @@
 %{_sbindir}/pm-suspend-hybrid
 
 %{_mandir}/man*/*
-%ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
+%ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
+- remove unused patch (vidhooks)
+- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
+  to keep selinux context
+- simplify spec
+- restore selinux context of logfile in %%post 
+- use rpmmacros more often
+
 * Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
 - Require vbetool not on ppc and ppc64
 


--- pm-utils-0.19-vidhooks.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:17:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:17:18 -0400
Subject: rpms/pm-utils/devel pm-utils-0.99.4-logfile.patch,NONE,1.1
Message-ID: <200709192317.l8JNHIK1030290@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30276

Added Files:
	pm-utils-0.99.4-logfile.patch 
Log Message:
missing patch


pm-utils-0.99.4-logfile.patch:

--- NEW FILE pm-utils-0.99.4-logfile.patch ---
There is no need to remove the logfile, because the ">" after exec in the next line
already truncates the logfile to zero length. Also removing is wrong, because it
destroys the selinux context of the logfile. Bugzilla Reports:
https://bugzilla.redhat.com/show_bug.cgi?id=237840
https://bugzilla.redhat.com/show_bug.cgi?id=238068

diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
--- pm-utils-0.99.4/pm/functions.logfile	2007-05-15 16:55:58.000000000 +0200
+++ pm-utils-0.99.4/pm/functions	2007-09-20 00:53:51.000000000 +0200
@@ -137,7 +137,6 @@ do_suspend_hybrid()
 pm_main()
 {
 	if [ -n "$PM_LOGFILE" ]; then
-		[ -f "$PM_LOGFILE" ] && rm -f "$PM_LOGFILE"
 		exec > "$PM_LOGFILE" 2>&1
 	fi
 	take_suspend_lock || exit 1



From fedora-extras-commits at redhat.com  Wed Sep 19 23:26:21 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:26:21 -0400
Subject: rpms/pm-utils/F-7 pm-utils-0.99.4-logfile.patch, NONE,
	1.1 pm-utils.spec, 1.66, 1.67 pm-utils-0.19-vidhooks.patch, 1.6, NONE
Message-ID: <200709192326.l8JNQLVL031716@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31586

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.4-logfile.patch 
Removed Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
sync with devel


pm-utils-0.99.4-logfile.patch:

--- NEW FILE pm-utils-0.99.4-logfile.patch ---
There is no need to remove the logfile, because the ">" after exec in the next line
already truncates the logfile to zero length. Also removing is wrong, because it
destroys the selinux context of the logfile. Bugzilla Reports:
https://bugzilla.redhat.com/show_bug.cgi?id=237840
https://bugzilla.redhat.com/show_bug.cgi?id=238068

diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
--- pm-utils-0.99.4/pm/functions.logfile	2007-05-15 16:55:58.000000000 +0200
+++ pm-utils-0.99.4/pm/functions	2007-09-20 00:53:51.000000000 +0200
@@ -137,7 +137,6 @@ do_suspend_hybrid()
 pm_main()
 {
 	if [ -n "$PM_LOGFILE" ]; then
-		[ -f "$PM_LOGFILE" ] && rm -f "$PM_LOGFILE"
 		exec > "$PM_LOGFILE" 2>&1
 	fi
 	take_suspend_lock || exit 1


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- pm-utils.spec	11 Sep 2007 14:11:56 -0000	1.66
+++ pm-utils.spec	19 Sep 2007 23:25:48 -0000	1.67
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,8 +29,8 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
-#Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-cfg.patch
+Patch3: pm-utils-0.99.4-logfile.patch
 
 
 %description
@@ -41,8 +41,8 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
-#%patch1 -p1 -b .vidhooks
 %patch2 -p1 -b .cfg
+%patch3 -p1 -b .logfile
 
 
 %build
@@ -70,29 +70,33 @@
 	ln -sf consolehelper $x
 done
 popd
-install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/pm-suspend.log
+install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
+
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %pre
-if [ -f /etc/sysconfig/pm ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig
+if [ -f %{_sysconfdir}/sysconfig/pm ]; then
+	mkdir -p %{_sysconfdir}/pm/config.d
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
 fi
 
+
 %post
-if [ -f /etc/pm/config.rpmsave ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig
+if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
 fi
-if [ ! -a /var/log/pm-suspend.log ] ; then
-	install -m 600 /dev/null /var/log/pm-suspend.log
+if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
+	chmod 0600 %{_localstatedir}/log/pm-suspend.log
+	[ -x /sbin/restorecon ] && restorecon  %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1
 fi
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
@@ -109,9 +113,17 @@
 %{_sbindir}/pm-suspend-hybrid
 
 %{_mandir}/man*/*
-%ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
+%ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
+- remove unused patch (vidhooks)
+- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
+  to keep selinux context
+- simplify spec
+- restore selinux context of logfile in %%post 
+- use rpmmacros more often
+
 * Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
 - Require vbetool not on ppc and ppc64
 


--- pm-utils-0.19-vidhooks.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:45:15 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:45:15 -0400
Subject: rpms/kernel/devel drm-mm-git.patch, NONE, 1.1 kernel.spec, 1.171,
	1.172 nouveau-drm.patch, 1.4, 1.5
Message-ID: <200709192345.l8JNjFGx002398@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2236

Modified Files:
	kernel.spec nouveau-drm.patch 
Added Files:
	drm-mm-git.patch 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
- drm-mm-git.patch - pull in DRM git queue
- nouveau-drm.patch - update nouveau patch on top of drm git queue


drm-mm-git.patch:

--- NEW FILE drm-mm-git.patch ---
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 2d6f2d0..82fb3d0 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -63,27 +63,9 @@
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
 #endif
 
-#define XFREE86_VERSION(major,minor,patch,snap) \
-		((major << 16) | (minor << 8) | patch)
-
-#ifndef CONFIG_XFREE86_VERSION
-#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
-#endif
-
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-#define DRM_PROC_DEVICES "/proc/devices"
-#define DRM_PROC_MISC	 "/proc/misc"
-#define DRM_PROC_DRM	 "/proc/drm"
-#define DRM_DEV_DRM	 "/dev/drm"
-#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
-#define DRM_DEV_UID	 0
-#define DRM_DEV_GID	 0
-#endif
-
-#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
 #define DRM_MAJOR       226
 #define DRM_MAX_MINOR   15
-#endif
+
 #define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */
 #define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */
 #define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0df87fc..9dd0760 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -80,6 +80,9 @@
 #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
 #define __OS_HAS_MTRR (defined(CONFIG_MTRR))
 
+struct drm_file;
+struct drm_device;
+
 #include "drm_os_linux.h"
 #include "drm_hashtab.h"
 
@@ -231,12 +234,13 @@
  * \param dev DRM device.
  * \param filp file pointer of the caller.
  */
-#define LOCK_TEST_WITH_RETURN( dev, filp )				\
+#define LOCK_TEST_WITH_RETURN( dev, file_priv )				\
 do {									\
 	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
-	     dev->lock.filp != filp ) {				\
-		DRM_ERROR( "%s called without lock held\n",		\
-			   __FUNCTION__ );				\
+	     dev->lock.file_priv != file_priv )	{			\
+		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
+			   __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
+			   dev->lock.file_priv, file_priv );		\
 		return -EINVAL;						\
 	}								\
 } while (0)
@@ -257,12 +261,12 @@ do {									\
  * Ioctl function type.
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private pointer.
  * \param cmd command.
  * \param arg argument.
  */
-typedef int drm_ioctl_t(struct inode *inode, struct file *filp,
-			unsigned int cmd, unsigned long arg);
+typedef int drm_ioctl_t(struct drm_device *dev, void *data,
+			struct drm_file *file_priv);
 
 typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 			       unsigned long arg);
@@ -271,10 +275,18 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 #define	DRM_MASTER	0x2
 #define DRM_ROOT_ONLY	0x4
 
-typedef struct drm_ioctl_desc {
+struct drm_ioctl_desc {
+	unsigned int cmd;
 	drm_ioctl_t *func;
 	int flags;
-} drm_ioctl_desc_t;
+};
+
+/**
+ * Creates a driver or general drm_ioctl_desc array entry for the given
+ * ioctl, for use by drm_ioctl().
+ */
+#define DRM_IOCTL_DEF(ioctl, func, flags) \
+	[DRM_IOCTL_NR(ioctl)] = {ioctl, func, flags}
 
 struct drm_magic_entry {
 	struct list_head head;
@@ -304,7 +316,7 @@ struct drm_buf {
 	__volatile__ int waiting;      /**< On kernel DMA queue */
 	__volatile__ int pending;      /**< On hardware DMA queue */
 	wait_queue_head_t dma_wait;    /**< Processes waiting */
-	struct file *filp;	       /**< Pointer to holding file descr */
+	struct drm_file *file_priv;    /**< Private of holding file descr */
 	int context;		       /**< Kernel queue for this buffer */
 	int while_locked;	       /**< Dispatch this buffer while locked */
 	enum {
@@ -377,6 +389,7 @@ struct drm_file {
 	int remove_auth_on_close;
 	unsigned long lock_count;
 	void *driver_priv;
+	struct file *filp;
 };
 
 /** Wait queue */
@@ -403,7 +416,7 @@ struct drm_queue {
  */
 struct drm_lock_data {
 	struct drm_hw_lock *hw_lock;	/**< Hardware lock */
-	struct file *filp;		/**< File descr of lock holder (0=kernel) */
+	struct drm_file *file_priv;	/**< File descr of lock holder (0=kernel) */
 	wait_queue_head_t lock_queue;	/**< Queue of blocked processes */
 	unsigned long lock_time;	/**< Time of last lock in jiffies */
 	spinlock_t spinlock;
@@ -552,11 +565,11 @@ struct drm_driver {
 	int (*load) (struct drm_device *, unsigned long flags);
 	int (*firstopen) (struct drm_device *);
 	int (*open) (struct drm_device *, struct drm_file *);
-	void (*preclose) (struct drm_device *, struct file * filp);
+	void (*preclose) (struct drm_device *, struct drm_file *file_priv);
 	void (*postclose) (struct drm_device *, struct drm_file *);
 	void (*lastclose) (struct drm_device *);
 	int (*unload) (struct drm_device *);
-	int (*dma_ioctl) (DRM_IOCTL_ARGS);
+	int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
 	void (*dma_ready) (struct drm_device *);
 	int (*dma_quiescent) (struct drm_device *);
 	int (*context_ctor) (struct drm_device *dev, int context);
@@ -587,11 +600,12 @@ struct drm_driver {
 	void (*irq_preinstall) (struct drm_device *dev);
 	void (*irq_postinstall) (struct drm_device *dev);
 	void (*irq_uninstall) (struct drm_device *dev);
-	void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);
+	void (*reclaim_buffers) (struct drm_device *dev,
+				 struct drm_file * file_priv);
 	void (*reclaim_buffers_locked) (struct drm_device *dev,
-					struct file *filp);
+					struct drm_file *file_priv);
 	void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
-					struct file * filp);
+					    struct drm_file *file_priv);
 	unsigned long (*get_map_ofs) (struct drm_map * map);
 	unsigned long (*get_reg_ofs) (struct drm_device *dev);
 	void (*set_version) (struct drm_device *dev,
@@ -606,7 +620,7 @@ struct drm_driver {
 
 	u32 driver_features;
 	int dev_priv_size;
-	drm_ioctl_desc_t *ioctls;
+	struct drm_ioctl_desc *ioctls;
 	int num_ioctls;
 	struct file_operations fops;
 	struct pci_driver pci_driver;
@@ -850,70 +864,70 @@ extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
 extern int drm_unbind_agp(DRM_AGP_MEM * handle);
 
 				/* Misc. IOCTL support (drm_ioctl.h) */
-extern int drm_irq_by_busid(struct inode *inode, struct file *filp,
-			    unsigned int cmd, unsigned long arg);
-extern int drm_getunique(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_setunique(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_getmap(struct inode *inode, struct file *filp,
-		      unsigned int cmd, unsigned long arg);
-extern int drm_getclient(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_getstats(struct inode *inode, struct file *filp,
-			unsigned int cmd, unsigned long arg);
-extern int drm_setversion(struct inode *inode, struct file *filp,
-			  unsigned int cmd, unsigned long arg);
-extern int drm_noop(struct inode *inode, struct file *filp,
-		    unsigned int cmd, unsigned long arg);
+extern int drm_irq_by_busid(struct drm_device *dev, void *data,
+			    struct drm_file *file_priv);
+extern int drm_getunique(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_setunique(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_getmap(struct drm_device *dev, void *data,
+		      struct drm_file *file_priv);
+extern int drm_getclient(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_getstats(struct drm_device *dev, void *data,
+			struct drm_file *file_priv);
[...12031 lines suppressed...]
-	dev_priv->vram_offset = fb.offset;
+	dev_priv->vram_offset = fb->offset;
 
 	mutex_unlock(&dev->struct_mutex);
-	DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
+	DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size);
 
 	return 0;
 
@@ -121,80 +115,71 @@ void via_lastclose(struct drm_device *dev)
 	mutex_unlock(&dev->struct_mutex);
 }	
 
-int via_mem_alloc(DRM_IOCTL_ARGS)
+int via_mem_alloc(struct drm_device *dev, void *data,
+		  struct drm_file *file_priv)
 {
-	DRM_DEVICE;
-
-	drm_via_mem_t mem;
+	drm_via_mem_t *mem = data;
 	int retval = 0;
 	struct drm_memblock_item *item;
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	unsigned long tmpSize;
 
-	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
-				 sizeof(mem));
-
-	if (mem.type > VIA_MEM_AGP) {
+	if (mem->type > VIA_MEM_AGP) {
 		DRM_ERROR("Unknown memory type allocation\n");
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	mutex_lock(&dev->struct_mutex);
-	if (0 == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
+	if (0 == ((mem->type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
 		      dev_priv->agp_initialized)) {
 		DRM_ERROR
 		    ("Attempt to allocate from uninitialized memory manager.\n");
 		mutex_unlock(&dev->struct_mutex);
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 
-	tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
-	item = drm_sman_alloc(&dev_priv->sman, mem.type, tmpSize, 0,
-			      (unsigned long)priv);
+	tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
+	item = drm_sman_alloc(&dev_priv->sman, mem->type, tmpSize, 0,
+			      (unsigned long)file_priv);
 	mutex_unlock(&dev->struct_mutex);
 	if (item) {
-		mem.offset = ((mem.type == VIA_MEM_VIDEO) ?
+		mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
 			      dev_priv->vram_offset : dev_priv->agp_offset) +
 		    (item->mm->
 		     offset(item->mm, item->mm_info) << VIA_MM_ALIGN_SHIFT);
-		mem.index = item->user_hash.key;
+		mem->index = item->user_hash.key;
 	} else {
-		mem.offset = 0;
-		mem.size = 0;
-		mem.index = 0;
+		mem->offset = 0;
+		mem->size = 0;
+		mem->index = 0;
 		DRM_DEBUG("Video memory allocation failed\n");
-		retval = DRM_ERR(ENOMEM);
+		retval = -ENOMEM;
 	}
-	DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem));
 
 	return retval;
 }
 
-int via_mem_free(DRM_IOCTL_ARGS)
+int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-	DRM_DEVICE;
 	drm_via_private_t *dev_priv = dev->dev_private;
-	drm_via_mem_t mem;
+	drm_via_mem_t *mem = data;
 	int ret;
 
-	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
-				 sizeof(mem));
-
 	mutex_lock(&dev->struct_mutex);
-	ret = drm_sman_free_key(&dev_priv->sman, mem.index);
+	ret = drm_sman_free_key(&dev_priv->sman, mem->index);
 	mutex_unlock(&dev->struct_mutex);
-	DRM_DEBUG("free = 0x%lx\n", mem.index);
+	DRM_DEBUG("free = 0x%lx\n", mem->index);
 
 	return ret;
 }
 
 
-void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
+void via_reclaim_buffers_locked(struct drm_device * dev,
+				struct drm_file *file_priv)
 {
 	drm_via_private_t *dev_priv = dev->dev_private;
-	struct drm_file *priv = filp->private_data;
 
 	mutex_lock(&dev->struct_mutex);
-	if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
+	if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)file_priv)) {
 		mutex_unlock(&dev->struct_mutex);
 		return;
 	}
@@ -203,7 +188,7 @@ void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
 		dev->driver->dma_quiescent(dev);
 	}
 
-	drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv);
+	drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
 	mutex_unlock(&dev->struct_mutex);
 	return;
 }
diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c
index 832d483..46a5791 100644
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/char/drm/via_verifier.c
@@ -1026,12 +1026,12 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
 		case state_error:
 		default:
 			*hc_state = saved_state;
-			return DRM_ERR(EINVAL);
+			return -EINVAL;
 		}
 	}
 	if (state == state_error) {
 		*hc_state = saved_state;
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	return 0;
 }
@@ -1082,11 +1082,11 @@ via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
 			break;
 		case state_error:
 		default:
-			return DRM_ERR(EINVAL);
+			return -EINVAL;
 		}
 	}
 	if (state == state_error) {
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	return 0;
 }
diff --git a/drivers/char/drm/via_video.c b/drivers/char/drm/via_video.c
index 300ac61..c15e75b 100644
--- a/drivers/char/drm/via_video.c
+++ b/drivers/char/drm/via_video.c
@@ -65,10 +65,9 @@ void via_release_futex(drm_via_private_t * dev_priv, int context)
 	}
 }
 
-int via_decoder_futex(DRM_IOCTL_ARGS)
+int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-	DRM_DEVICE;
-	drm_via_futex_t fx;
+	drm_via_futex_t *fx = data;
 	volatile int *lock;
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
@@ -76,21 +75,18 @@ int via_decoder_futex(DRM_IOCTL_ARGS)
 
 	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t __user *) data,
-				 sizeof(fx));
-
-	if (fx.lock > VIA_NR_XVMC_LOCKS)
+	if (fx->lock > VIA_NR_XVMC_LOCKS)
 		return -EFAULT;
 
-	lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx.lock);
+	lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock);
 
-	switch (fx.func) {
+	switch (fx->func) {
 	case VIA_FUTEX_WAIT:
-		DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx.lock],
-			    (fx.ms / 10) * (DRM_HZ / 100), *lock != fx.val);
+		DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
+			    (fx->ms / 10) * (DRM_HZ / 100), *lock != fx->val);
 		return ret;
 	case VIA_FUTEX_WAKE:
-		DRM_WAKEUP(&(dev_priv->decoder_queue[fx.lock]));
+		DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock]));
 		return 0;
 	}
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kernel.spec	19 Sep 2007 22:19:45 -0000	1.171
+++ kernel.spec	19 Sep 2007 23:44:41 -0000	1.172
@@ -418,7 +418,7 @@
 Provides: kernel = %{rpmversion}-%{pkg_release}\
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}\
 Provides: kernel-drm = 4.3.0\
-Provides: kernel-drm-nouveau = 6\
+Provides: kernel-drm-nouveau = 10\
 Requires(pre): %{kernel_prereq}\
 Conflicts: %{kernel_dot_org_conflicts}\
 Conflicts: %{package_conflicts}\
@@ -575,7 +575,6 @@
 Patch36: linux-2.6-utrace-ptrace-compat-s390.patch
 Patch37: linux-2.6-utrace-ptrace-compat-avr32.patch
 
-Patch40: nouveau-drm.patch
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
@@ -673,6 +672,10 @@
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch 
 
+#nouveau
+Patch1800: drm-mm-git.patch
+Patch1801: nouveau-drm.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -993,7 +996,8 @@
 ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
 # Nouveau DRM
-#ApplyPatch nouveau-drm.patch
+ApplyPatch drm-mm-git.patch
+ApplyPatch nouveau-drm.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1800,6 +1804,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
+- drm-mm-git.patch - pull in DRM git queue
+- nouveau-drm.patch - update nouveau patch on top of drm git queue
+
 * Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git8
 - Enable Secure Computing (CONFIG_SECCOMP) (#295841)

nouveau-drm.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 nouveau-drm.patch
Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/nouveau-drm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nouveau-drm.patch	12 Apr 2007 19:16:23 -0000	1.4
+++ nouveau-drm.patch	19 Sep 2007 23:44:41 -0000	1.5
@@ -1,56 +1,179 @@
+From f4e9f548d49b0bc9fbbfbee635f96e79a2f472ae Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at voynix.(none)>
+Date: Thu, 6 Sep 2007 00:10:19 +1000
+Subject: [PATCH] drm: add nouveau latest code
+
+---
+ drivers/char/drm/Kconfig            |    5 +
+ drivers/char/drm/Makefile           |   12 +
+ drivers/char/drm/drmP.h             |    4 +-
+ drivers/char/drm/drm_bufs.c         |    6 +-
+ drivers/char/drm/drm_irq.c          |    3 +-
+ drivers/char/drm/drm_pciids.h       |  262 ++++
+ drivers/char/drm/nouveau_dma.c      |  177 +++
+ drivers/char/drm/nouveau_dma.h      |   98 ++
+ drivers/char/drm/nouveau_drm.h      |  166 ++
+ drivers/char/drm/nouveau_drv.c      |   96 ++
+ drivers/char/drm/nouveau_drv.h      |  584 +++++++
+ drivers/char/drm/nouveau_fifo.c     |  557 +++++++
+ drivers/char/drm/nouveau_ioc32.c    |   72 +
+ drivers/char/drm/nouveau_irq.c      |  430 ++++++
+ drivers/char/drm/nouveau_mem.c      |  616 ++++++++
+ drivers/char/drm/nouveau_notifier.c |  173 +++
+ drivers/char/drm/nouveau_object.c   | 1148 ++++++++++++++
+ drivers/char/drm/nouveau_reg.h      |  538 +++++++
+ drivers/char/drm/nouveau_sgdma.c    |  311 ++++
+ drivers/char/drm/nouveau_state.c    |  569 +++++++
+ drivers/char/drm/nv04_fb.c          |   24 +
+ drivers/char/drm/nv04_fifo.c        |  129 ++
+ drivers/char/drm/nv04_graph.c       |  415 +++++
+ drivers/char/drm/nv04_instmem.c     |  160 ++
+ drivers/char/drm/nv04_mc.c          |   23 +
+ drivers/char/drm/nv04_timer.c       |   45 +
+ drivers/char/drm/nv10_fb.c          |   26 +
+ drivers/char/drm/nv10_fifo.c        |  160 ++
+ drivers/char/drm/nv10_graph.c       |  777 ++++++++++
+ drivers/char/drm/nv20_graph.c       |  249 +++
+ drivers/char/drm/nv30_graph.c       | 2911 +++++++++++++++++++++++++++++++++++
+ drivers/char/drm/nv40_fb.c          |   56 +
+ drivers/char/drm/nv40_fifo.c        |  208 +++
+ drivers/char/drm/nv40_graph.c       | 1906 +++++++++++++++++++++++
+ drivers/char/drm/nv40_mc.c          |   39 +
+ drivers/char/drm/nv50_fifo.c        |  327 ++++
+ drivers/char/drm/nv50_graph.c       |  316 ++++
+ drivers/char/drm/nv50_instmem.c     |  320 ++++
+ drivers/char/drm/nv50_mc.c          |   43 +
+ 39 files changed, 13957 insertions(+), 4 deletions(-)
+ create mode 100644 drivers/char/drm/nouveau_dma.c
+ create mode 100644 drivers/char/drm/nouveau_dma.h
+ create mode 100644 drivers/char/drm/nouveau_drm.h
+ create mode 100644 drivers/char/drm/nouveau_drv.c
+ create mode 100644 drivers/char/drm/nouveau_drv.h
+ create mode 100644 drivers/char/drm/nouveau_fifo.c
+ create mode 100644 drivers/char/drm/nouveau_ioc32.c
+ create mode 100644 drivers/char/drm/nouveau_irq.c
+ create mode 100644 drivers/char/drm/nouveau_mem.c
+ create mode 100644 drivers/char/drm/nouveau_notifier.c
+ create mode 100644 drivers/char/drm/nouveau_object.c
+ create mode 100644 drivers/char/drm/nouveau_reg.h
+ create mode 100644 drivers/char/drm/nouveau_sgdma.c
+ create mode 100644 drivers/char/drm/nouveau_state.c
+ create mode 100644 drivers/char/drm/nv04_fb.c
+ create mode 100644 drivers/char/drm/nv04_fifo.c
+ create mode 100644 drivers/char/drm/nv04_graph.c
+ create mode 100644 drivers/char/drm/nv04_instmem.c
+ create mode 100644 drivers/char/drm/nv04_mc.c
+ create mode 100644 drivers/char/drm/nv04_timer.c
+ create mode 100644 drivers/char/drm/nv10_fb.c
+ create mode 100644 drivers/char/drm/nv10_fifo.c
+ create mode 100644 drivers/char/drm/nv10_graph.c
+ create mode 100644 drivers/char/drm/nv20_graph.c
+ create mode 100644 drivers/char/drm/nv30_graph.c
+ create mode 100644 drivers/char/drm/nv40_fb.c
+ create mode 100644 drivers/char/drm/nv40_fifo.c
+ create mode 100644 drivers/char/drm/nv40_graph.c
+ create mode 100644 drivers/char/drm/nv40_mc.c
+ create mode 100644 drivers/char/drm/nv50_fifo.c
+ create mode 100644 drivers/char/drm/nv50_graph.c
+ create mode 100644 drivers/char/drm/nv50_instmem.c
+ create mode 100644 drivers/char/drm/nv50_mc.c
+
 diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
-index ef833a1..065f499 100644
+index 0b7ffa5..0220619 100644
 --- a/drivers/char/drm/Kconfig
 +++ b/drivers/char/drm/Kconfig
-@@ -106,3 +106,9 @@ config DRM_SAVAGE
+@@ -106,3 +106,8 @@ config DRM_SAVAGE
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
  
 +config DRM_NOUVEAU
 +	tristate "Nvidia video cards"
-+	depends on DRM && PCI
++	depends on DRM
 +	help
-+	  Choose this option if you want to enable nouveau reverse engineered
-+          driver for nvidia chipset. The module will be called nouveau.
++		Choose this for nvidia open source 3d driver
 diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
-index 6915a05..20b79d5 100644
+index 6915a05..f798916 100644
 --- a/drivers/char/drm/Makefile
 +++ b/drivers/char/drm/Makefile
-@@ -14,6 +14,14 @@ mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+@@ -14,6 +14,16 @@ mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
  i810-objs   := i810_drv.o i810_dma.o
  i830-objs   := i830_drv.o i830_dma.o i830_irq.o
  i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 +nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
-+                nouveau_object.o nouveau_irq.o \
++		nouveau_object.o nouveau_irq.o nouveau_notifier.o \
++		nouveau_sgdma.o nouveau_dma.o \
 +		nv04_timer.o \
-+		nv04_mc.o nv40_mc.o \
++		nv04_mc.o nv40_mc.o nv50_mc.o \
 +		nv04_fb.o nv10_fb.o nv40_fb.o \
++		nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
 +		nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \
-+		nv40_graph.o
-+
++		nv40_graph.o nv50_graph.o \
++		nv04_instmem.o nv50_instmem.o
  radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
  sis-objs    := sis_drv.o sis_mm.o
  savage-objs := savage_drv.o savage_bci.o savage_state.o
-@@ -25,6 +33,7 @@ radeon-objs += radeon_ioc32.o
+@@ -25,6 +35,7 @@ radeon-objs += radeon_ioc32.o
  mga-objs    += mga_ioc32.o
  r128-objs   += r128_ioc32.o
  i915-objs   += i915_ioc32.o
-+nouveau-objs += nouveau_ioc32.o
++nouveau-objs   += nouveau_ioc32.o
  endif
  
  obj-$(CONFIG_DRM)	+= drm.o
-@@ -38,5 +47,6 @@ obj-$(CONFIG_DRM_I915)  += i915.o
+@@ -35,6 +46,7 @@ obj-$(CONFIG_DRM_MGA)	+= mga.o
+ obj-$(CONFIG_DRM_I810)	+= i810.o
+ obj-$(CONFIG_DRM_I830)	+= i830.o
+ obj-$(CONFIG_DRM_I915)  += i915.o
++obj-$(CONFIG_DRM_NOUVEAU)   += nouveau.o
  obj-$(CONFIG_DRM_SIS)   += sis.o
  obj-$(CONFIG_DRM_SAVAGE)+= savage.o
  obj-$(CONFIG_DRM_VIA)	+=via.o
-+obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
- 
- 
+diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
+index 9dd0760..d539c96 100644
+--- a/drivers/char/drm/drmP.h
++++ b/drivers/char/drm/drmP.h
+@@ -967,7 +967,8 @@ extern unsigned long drm_get_resource_start(struct drm_device *dev,
+ 					    unsigned int resource);
+ extern unsigned long drm_get_resource_len(struct drm_device *dev,
+ 					  unsigned int resource);
+-
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++					   drm_local_map_t *map);
+ 				/* DMA support (drm_dma.h) */
+ extern int drm_dma_setup(struct drm_device *dev);
+ extern void drm_dma_takedown(struct drm_device *dev);
+@@ -979,6 +980,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
+ extern int drm_control(struct drm_device *dev, void *data,
+ 		       struct drm_file *file_priv);
+ extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
++extern int drm_irq_install(struct drm_device * dev);
+ extern int drm_irq_uninstall(struct drm_device *dev);
+ extern void drm_driver_irq_preinstall(struct drm_device *dev);
+ extern void drm_driver_irq_postinstall(struct drm_device *dev);
 diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
-index a6828cc..f3da5c4 100644
+index 856774f..7890e08 100644
 --- a/drivers/char/drm/drm_bufs.c
 +++ b/drivers/char/drm/drm_bufs.c
-@@ -400,6 +400,7 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
+@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource
+ 
+ EXPORT_SYMBOL(drm_get_resource_len);
+ 
+-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+-					     drm_local_map_t *map)
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++					   drm_local_map_t *map)
+ {
+ 	struct drm_map_list *entry;
+ 	list_for_each_entry(entry, &dev->maplist, head) {
+@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(drm_find_matching_map);
[...12804 lines suppressed...]
++	/* Assume that praying isn't enough, check that we can re-read the
++	 * entire fake channel back from the PRAMIN BAR */
++	for (i = 0; i < c_size; i+=4) {
++		if (NV_READ(NV_RAMIN + i) != NV_RI32(i)) {
++			DRM_ERROR("Error reading back PRAMIN at 0x%08x\n", i);
++			return -EINVAL;
++		}
++	}
++
++	/* Global PRAMIN heap */
++	if (nouveau_mem_init_heap(&dev_priv->ramin_heap,
++				  c_size, dev_priv->ramin->size - c_size)) {
++		dev_priv->ramin_heap = NULL;
++		DRM_ERROR("Failed to init RAMIN heap\n");
++	}
++
++	/*XXX: incorrect, but needed to make hash func "work" */
++	dev_priv->ramht_offset = 0x10000;
++	dev_priv->ramht_bits   = 9;
++	dev_priv->ramht_size   = (1 << dev_priv->ramht_bits);
++	return 0;
++}
++
++void
++nv50_instmem_takedown(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	struct nouveau_channel *chan = dev_priv->fifos[0];
++	int i;
++
++	DRM_DEBUG("\n");
++
++	if (!priv)
++		return;
++
++	/* Restore state from before init */
++	for (i = 0x1700; i <= 0x1710; i+=4)
++		NV_WRITE(i, priv->save1700[(i-0x1700)/4]);
++
++	nouveau_gpuobj_ref_del(dev, &priv->pramin_bar);
++	nouveau_gpuobj_ref_del(dev, &priv->pramin_pt);
++
++	/* Destroy dummy channel */
++	if (chan) {
++		nouveau_gpuobj_del(dev, &chan->vm_pd);
++		nouveau_gpuobj_ref_del(dev, &chan->ramfc);
++		nouveau_gpuobj_ref_del(dev, &chan->ramin);
++		nouveau_mem_takedown(&chan->ramin_heap);
++
++		dev_priv->fifos[0] = dev_priv->fifos[127] = NULL;
++		drm_free(chan, sizeof(*chan), DRM_MEM_DRIVER);
++	}
++
++	dev_priv->Engine.instmem.priv = NULL;
++	drm_free(priv, sizeof(*priv), DRM_MEM_DRIVER);
++}
++
++int
++nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
++{
++	if (gpuobj->im_backing)
++		return -EINVAL;
++
++	*sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1);
++	if (*sz == 0)
++		return -EINVAL;
++
++	gpuobj->im_backing = nouveau_mem_alloc(dev, NV50_INSTMEM_PAGE_SIZE,
++					       *sz, NOUVEAU_MEM_FB,
++					       (struct drm_file *)-2);
++	if (!gpuobj->im_backing) {
++		DRM_ERROR("Couldn't allocate vram to back PRAMIN pages\n");
++		return -ENOMEM;
++	}
++
++	return 0;
++}
++
++void
++nv50_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	if (gpuobj && gpuobj->im_backing) {
++		if (gpuobj->im_bound)
++			dev_priv->Engine.instmem.unbind(dev, gpuobj);
++		nouveau_mem_free(dev, gpuobj->im_backing);
++		gpuobj->im_backing = NULL;
++	}	
++}
++
++int
++nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	uint32_t pte, pte_end, vram;
++
++	if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
++		return -EINVAL;
++
++	DRM_DEBUG("st=0x%0llx sz=0x%0llx\n",
++		  gpuobj->im_pramin->start, gpuobj->im_pramin->size);
++
++	pte     = (gpuobj->im_pramin->start >> 12) << 3;
++	pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte;
++	vram    = gpuobj->im_backing->start;
++
++	DRM_DEBUG("pramin=0x%llx, pte=%d, pte_end=%d\n",
++		  gpuobj->im_pramin->start, pte, pte_end);
++	DRM_DEBUG("first vram page: 0x%llx\n",
++		  gpuobj->im_backing->start);
++
++	while (pte < pte_end) {
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, vram | 1);
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000);
++
++		pte += 8;
++		vram += NV50_INSTMEM_PAGE_SIZE;
++	}
++
++	gpuobj->im_bound = 1;
++	return 0;
++}
++
++int
++nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	uint32_t pte, pte_end;
++
++	if (gpuobj->im_bound == 0)
++		return -EINVAL;
++
++	pte     = (gpuobj->im_pramin->start >> 12) << 3;
++	pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte;
++	while (pte < pte_end) {
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, 0x00000009);
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000);
++		pte += 8;
++	}
++
++	gpuobj->im_bound = 0;
++	return 0;
++}
++
+diff --git a/drivers/char/drm/nv50_mc.c b/drivers/char/drm/nv50_mc.c
+new file mode 100644
+index 0000000..b111826
+--- /dev/null
++++ b/drivers/char/drm/nv50_mc.c
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2007 Ben Skeggs.
++ * 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:
++ *
++ * 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.
++ *
++ */
++
++#include "drmP.h"
++#include "drm.h"
++#include "nouveau_drv.h"
++
++int
++nv50_mc_init(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);
++
++	return 0;
++}
++
++void nv50_mc_takedown(struct drm_device *dev)
++{
++}
+-- 
+1.5.2.5
+



From fedora-extras-commits at redhat.com  Wed Sep 19 23:48:52 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:48:52 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.80,1.81
Message-ID: <200709192348.l8JNmqjS003168@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2984

Modified Files:
	pm-utils.spec 
Log Message:
* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-4
- fix manpage cut and paste mistake (RH #286201)



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pm-utils.spec	19 Sep 2007 23:15:28 -0000	1.80
+++ pm-utils.spec	19 Sep 2007 23:48:19 -0000	1.81
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,6 +29,7 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
+Patch1: pm-utils-0.99.4-manpage-typo.patch
 Patch2: pm-utils-0.99.3-cfg.patch
 Patch3: pm-utils-0.99.4-logfile.patch
 
@@ -41,6 +42,7 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
+%patch1 -p1 -b .manpage-typo
 %patch2 -p1 -b .cfg
 %patch3 -p1 -b .logfile
 
@@ -116,6 +118,9 @@
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-4
+- fix manpage cut and paste mistake (RH #286201)
+
 * Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
 - remove unused patch (vidhooks)
 - add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 



From fedora-extras-commits at redhat.com  Wed Sep 19 23:57:19 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:57:19 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.26,1.27 nouveau.patch,1.2,1.3
Message-ID: <200709192357.l8JNvJv3004318@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4235

Modified Files:
	libdrm.spec nouveau.patch 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> - 2.3.0-7
- Update nouveau patch.



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libdrm.spec	21 Aug 2007 18:44:07 -0000	1.26
+++ libdrm.spec	19 Sep 2007 23:56:46 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> - 2.3.0-7
+- Update nouveau patch.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.3.0-6
 - Rebuild for build id
 

nouveau.patch:

Index: nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau.patch	30 Mar 2007 18:57:37 -0000	1.2
+++ nouveau.patch	19 Sep 2007 23:56:46 -0000	1.3
@@ -1,6 +1,7 @@
---- /dev/null	2007-03-29 16:01:53.376400525 -0400
-+++ libdrm-2.3.0/shared-core/nouveau_drm.h	2007-03-29 19:02:49.000000000 -0400
-@@ -0,0 +1,152 @@
+diff -up /dev/null libdrm-2.3.0/shared-core/nouveau_drm.h
+--- /dev/null	2007-08-31 14:38:01.267001567 +1000
++++ libdrm-2.3.0/shared-core/nouveau_drm.h	2007-09-20 08:23:08.000000000 +1000
+@@ -0,0 +1,164 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -28,9 +29,12 @@
 +#ifndef __NOUVEAU_DRM_H__
 +#define __NOUVEAU_DRM_H__
 +
-+#define NOUVEAU_DRM_HEADER_PATCHLEVEL 6
++#define NOUVEAU_DRM_HEADER_PATCHLEVEL 10
++
++struct drm_nouveau_channel_alloc {
++	uint32_t     fb_ctxdma_handle;
++	uint32_t     tt_ctxdma_handle;
 +
-+typedef struct drm_nouveau_fifo_alloc {
 +	int          channel;
 +	uint32_t     put_base;
 +	/* FIFO control regs */
@@ -39,52 +43,61 @@
 +	/* DMA command buffer */
 +	drm_handle_t cmdbuf;
 +	int          cmdbuf_size;
-+}
-+drm_nouveau_fifo_alloc_t;
++	/* Notifier memory */
++	drm_handle_t notifier;
++	int          notifier_size;
++};
 +
-+typedef struct drm_nouveau_object_init {
++struct drm_nouveau_channel_free {
++	int channel;
++};
++
++struct drm_nouveau_grobj_alloc {
 +	int      channel;
 +	uint32_t handle;
 +	int      class;
-+}
-+drm_nouveau_object_init_t;
++};
 +
 +#define NOUVEAU_MEM_ACCESS_RO	1
 +#define NOUVEAU_MEM_ACCESS_WO	2
 +#define NOUVEAU_MEM_ACCESS_RW	3
-+typedef struct drm_nouveau_dma_object_init {
++struct drm_nouveau_notifierobj_alloc {
 +	int      channel;
 +	uint32_t handle;
-+	int      class;
-+	int      access;
-+	int      target;
++	int      count;
++
 +	uint32_t offset;
-+	int      size;
-+}
-+drm_nouveau_dma_object_init_t;
++};
++
++struct drm_nouveau_gpuobj_free {
++	int      channel;
++	uint32_t handle;
++};
 +
 +#define NOUVEAU_MEM_FB			0x00000001
 +#define NOUVEAU_MEM_AGP			0x00000002
 +#define NOUVEAU_MEM_FB_ACCEPTABLE	0x00000004
 +#define NOUVEAU_MEM_AGP_ACCEPTABLE	0x00000008
-+#define NOUVEAU_MEM_PINNED		0x00000010
-+#define NOUVEAU_MEM_USER_BACKED		0x00000020
-+#define NOUVEAU_MEM_MAPPED		0x00000040
-+#define NOUVEAU_MEM_INSTANCE		0x00000080 /* internal */
++#define NOUVEAU_MEM_PCI			0x00000010
++#define NOUVEAU_MEM_PCI_ACCEPTABLE	0x00000020
++#define NOUVEAU_MEM_PINNED		0x00000040
++#define NOUVEAU_MEM_USER_BACKED		0x00000080
++#define NOUVEAU_MEM_MAPPED		0x00000100
++#define NOUVEAU_MEM_INSTANCE		0x00000200 /* internal */
++#define NOUVEAU_MEM_NOTIFIER            0x00000400 /* internal */
 +
-+typedef struct drm_nouveau_mem_alloc {
++struct drm_nouveau_mem_alloc {
 +	int flags;
 +	int alignment;
 +	uint64_t size;	// in bytes
-+	uint64_t region_offset;
-+}
-+drm_nouveau_mem_alloc_t;
++	uint64_t offset;
++	drm_handle_t map_handle;
++};
 +
-+typedef struct drm_nouveau_mem_free {
-+	uint64_t region_offset;
++struct drm_nouveau_mem_free {
++	uint64_t offset;
 +	int flags;
-+}
-+drm_nouveau_mem_free_t;
++};
 +
 +/* FIXME : maybe unify {GET,SET}PARAMs */
 +#define NOUVEAU_GETPARAM_PCI_VENDOR      3
@@ -94,30 +107,28 @@
 +#define NOUVEAU_GETPARAM_AGP_PHYSICAL    7
 +#define NOUVEAU_GETPARAM_FB_SIZE         8
 +#define NOUVEAU_GETPARAM_AGP_SIZE        9
-+typedef struct drm_nouveau_getparam {
++#define NOUVEAU_GETPARAM_PCI_PHYSICAL    10
++#define NOUVEAU_GETPARAM_CHIPSET_ID      11
++struct drm_nouveau_getparam {
 +	uint64_t param;
 +	uint64_t value;
-+}
-+drm_nouveau_getparam_t;
++};
 +
 +#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1
 +#define NOUVEAU_SETPARAM_CMDBUF_SIZE     2
-+typedef struct drm_nouveau_setparam {
++struct drm_nouveau_setparam {
 +	uint64_t param;
 +	uint64_t value;
-+}
-+drm_nouveau_setparam_t;
++};
 +
 +enum nouveau_card_type {
 +	NV_UNKNOWN =0,
-+	NV_01      =1,
-+	NV_03      =3,
 +	NV_04      =4,
 +	NV_05      =5,
 +	NV_10      =10,
-+	NV_11      =10,
-+	NV_15      =10,
-+	NV_17      =10,
++	NV_11      =11,
++	NV_15      =11,
++	NV_17      =17,
 +	NV_20      =20,
 +	NV_25      =20,
 +	NV_30      =30,
@@ -136,30 +147,33 @@
 +
 +#define NOUVEAU_MAX_SAREA_CLIPRECTS 16
 +
-+typedef struct drm_nouveau_sarea {
++struct drm_nouveau_sarea {
 +	/* the cliprects */
-+	drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
++	struct drm_clip_rect boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
 +	unsigned int nbox;
-+}
-+drm_nouveau_sarea_t;
++};
 +
-+#define DRM_NOUVEAU_FIFO_ALLOC      0x00
-+#define DRM_NOUVEAU_OBJECT_INIT     0x01
-+#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02
-+#define DRM_NOUVEAU_MEM_ALLOC       0x03
-+#define DRM_NOUVEAU_MEM_FREE        0x04
-+#define DRM_NOUVEAU_GETPARAM        0x05
-+#define DRM_NOUVEAU_SETPARAM        0x06
++#define DRM_NOUVEAU_CARD_INIT          0x00
++#define DRM_NOUVEAU_GETPARAM           0x01
++#define DRM_NOUVEAU_SETPARAM           0x02
++#define DRM_NOUVEAU_CHANNEL_ALLOC      0x03
++#define DRM_NOUVEAU_CHANNEL_FREE       0x04
++#define DRM_NOUVEAU_GROBJ_ALLOC        0x05
++#define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC  0x06
++#define DRM_NOUVEAU_GPUOBJ_FREE        0x07
++#define DRM_NOUVEAU_MEM_ALLOC          0x08
++#define DRM_NOUVEAU_MEM_FREE           0x09
 +
 +#endif /* __NOUVEAU_DRM_H__ */
 +
---- libdrm-2.3.0/shared-core/Makefile.am.nouveau	2006-11-07 23:03:26.000000000 -0500
-+++ libdrm-2.3.0/shared-core/Makefile.am	2007-03-29 19:00:35.000000000 -0400
-@@ -27,6 +27,7 @@
-                          drm.h \
-                          drm_sarea.h \
+diff -up libdrm-2.3.0/shared-core/Makefile.am.nouveau libdrm-2.3.0/shared-core/Makefile.am
+--- libdrm-2.3.0/shared-core/Makefile.am.nouveau	2006-11-08 14:03:26.000000000 +1000
++++ libdrm-2.3.0/shared-core/Makefile.am	2007-07-27 13:09:08.000000000 +1000
+@@ -29,6 +29,7 @@ klibdrminclude_HEADERS = \
                           i915_drm.h \
-+			 nouveau_drm.h \
                           mach64_drm.h \
                           mga_drm.h \
++                         nouveau_drm.h \
                           r128_drm.h \
+                          radeon_drm.h \
+                          savage_drm.h \



From fedora-extras-commits at redhat.com  Wed Sep 19 23:59:48 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:59:48 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.24, 1.25 sources, 1.25,
	1.26 xorg-x11-drv-nv.spec, 1.52, 1.53
Message-ID: <200709192359.l8JNxmfm004683@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4552

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
- update nouveau



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 Aug 2007 14:21:24 -0000	1.24
+++ .cvsignore	19 Sep 2007 23:59:16 -0000	1.25
@@ -1,2 +1,3 @@
 nouveau-20070330.tar.bz2
 xf86-video-nv-2.1.3.tar.bz2
+nouveau-20070920.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Aug 2007 14:21:24 -0000	1.25
+++ sources	19 Sep 2007 23:59:16 -0000	1.26
@@ -1,2 +1,2 @@
-cf1f7a86307e691f4b82ec8aadbd9087  nouveau-20070330.tar.bz2
 f9b38e24157c3aac6014119ac18d76da  xf86-video-nv-2.1.3.tar.bz2
+00ba97f704d775c1ed83e104d4f089be  nouveau-20070920.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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-drv-nv.spec	17 Aug 2007 14:21:24 -0000	1.52
+++ xorg-x11-drv-nv.spec	19 Sep 2007 23:59:16 -0000	1.53
@@ -4,12 +4,12 @@
 
 # The snapshot is commit e0e90f427581929fd01c96f1958a1292982dee83,
 # verify tarball using bzip2 -cd <tarball> | git-get-tar-commit-id
-%define gitdate 20070330
+%define gitdate 20070920
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -23,7 +23,7 @@
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
-BuildRequires: libdrm-devel >= 2.3.0-5
+BuildRequires: libdrm-devel >= 2.3.0-7
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
@@ -37,7 +37,7 @@
 Summary:   Xorg X11 nouveau video driver
 Group:     User Interface/X Hardware Support
 Requires:  xorg-x11-server-Xorg >= 1.1.0-12
-Requires:  kernel-drm-nouveau = 6
+Requires:  kernel-drm-nouveau = 10
 %description -n xorg-x11-drv-nouveau
 X.Org X11 nouveau video driver.
 
@@ -88,6 +88,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
+- update nouveau
+
 * Fri Aug 17 2007 Adam Jackson <ajax at redhat.com> 2.1.3-1
 - xf86-video-nv 2.1.3.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:03:44 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 20:03:44 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.20.0-mixer-out-of-sync.patch, 
	NONE, 1.1 gnome-applets.spec, 1.240, 1.241
Message-ID: <200709200003.l8K03ij2011620@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
- Add patch to avoid the volume scale getting out-of sync with the 
  real hardware volume


gnome-applets-2.20.0-mixer-out-of-sync.patch:

--- NEW FILE gnome-applets-2.20.0-mixer-out-of-sync.patch ---
Index: applet.c
===================================================================
--- applet.c	(revision 10436)
+++ applet.c	(working copy)
@@ -79,7 +79,12 @@
 						 PanelAppletOrient orient);
 
 static void	gnome_volume_applet_refresh	(GnomeVolumeApplet *applet,
-						 gboolean           force_refresh);
+						 gboolean           force_refresh,
+						 gdouble            volume,
+						 gint               mute);
+
+static void     cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
+
 static gboolean	cb_check			(gpointer   data);
 
 static void	cb_volume			(GtkAdjustment *adj,
@@ -242,6 +247,12 @@
   /* i18n */
   ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
   atk_object_set_name (ao, _("Volume Control"));
+
+  /* Bus for notifications */
+  applet->bus = gst_bus_new ();
+  gst_bus_add_signal_watch (applet->bus);
+  g_signal_connect (G_OBJECT (applet->bus), "message::element", 
+       (GCallback) cb_notify_message, applet);
 }
 
 /* Parse the list of tracks that are stored in GConf */
@@ -368,12 +379,33 @@
     return FALSE;
 
   applet->mixer = g_object_ref (active_element);
+  gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
   applet->tracks = active_tracks;
   g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
 
   return TRUE;
 }
 
+static void
+gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
+{
+  gboolean need_timeout = TRUE;
+  need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
+      GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
+
+  if (need_timeout) {
+    if (applet->timeout == 0) {
+      applet->timeout = g_timeout_add (100, cb_check, applet);
+    }
+  }
+  else {
+    if (applet->timeout != 0) {
+      g_source_remove (applet->timeout);
+      applet->timeout = 0;
+    }
+  }
+}
+
 gboolean
 gnome_volume_applet_setup (GnomeVolumeApplet *applet,
 			   GList *elements)
@@ -435,10 +467,9 @@
   component = panel_applet_get_popup_component (PANEL_APPLET (applet));
   g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
 
-  gnome_volume_applet_refresh (applet, TRUE);
-  if (res) {
-    applet->timeout = g_timeout_add (100, cb_check, applet);
-  }
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+  if (res)
+    gnome_volume_applet_setup_timeout (applet);
 
   if (res) {
     /* gconf */
@@ -479,6 +510,11 @@
     g_list_free (applet->elements);
     applet->elements = NULL;
   }
+  gst_bus_remove_signal_watch (applet->bus);
+  if (applet->bus) {
+    gst_object_unref (applet->bus);
+    applet->bus = NULL;
+  }
 
   if (applet->tracks) {
     g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
@@ -677,7 +713,7 @@
 
   /* update graphic - this should happen automagically after the next
    * idle call, but apparently doesn't for some people... */
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, mute);
 }
 
 /*
@@ -940,7 +976,7 @@
   }
 
   init_pixbufs (applet);
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
 }
 
 static void
@@ -990,15 +1026,23 @@
 {
   int range = track->max_volume - track->min_volume;
   gdouble scale = ((gdouble) range) / 100;
-  int *volumes, n;
+  int *volumes, n, volint;
 
-  volume *= scale;
-  volume += track->min_volume;
+  if (volume == 1.0) {
+    volint = track->max_volume;
+  } else if (volume == 0.0) {
+    volint = track->min_volume;
+  } else {
+    volume *= scale;
+    volume += track->min_volume;
+    volint = lrint (volume);
+  }
 
   volumes = g_new (gint, track->num_channels);
   for (n = 0; n < track->num_channels; n++)
-    volumes[n] = lrint (volume);
+    volumes[n] = volint;
   gst_mixer_set_volume (mixer, track, volumes);
+
   g_free (volumes);
 }
 
@@ -1049,6 +1093,8 @@
 
   applet->lock = FALSE;
   applet->force_next_update = TRUE;
+
+  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
 }
 
 /*
@@ -1059,31 +1105,40 @@
 
 static void
 gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-			     gboolean           force_refresh)
+			     gboolean           force_refresh,
+			     gdouble            volume,
+			     gint               mute)
 {
   BonoboUIComponent *component;
   GdkPixbuf *pixbuf;
   gint n;
-  gdouble volume;
-  gboolean mute, did_change;
+  gboolean show_mute, did_change;
   gchar *tooltip_str;
   GstMixerTrack *first_track;
   GString *track_names;
   GList *iter;
 
+  show_mute = 0;
+
   if (!applet->mixer) {
     n = 0;
-    mute = FALSE;
+    show_mute = 1;
+    mute = 0;
   } else if (!applet->tracks) {
     return;
   } else {
-    /* only first track */
     first_track = g_list_first (applet->tracks)->data;
-    volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-    mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-				     GST_MIXER_TRACK_MUTE);
+
+    if (volume == -1) {
+      /* only first track */
+      volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
+    }
+    if (mute == -1) {
+      mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
+				       GST_MIXER_TRACK_MUTE) ? 1 : 0;
+    }
     if (volume <= 0) {
-	mute = TRUE;
+	show_mute = 1;
 	n = 0;
     }
     else {
@@ -1101,7 +1156,7 @@
   applet->force_next_update = FALSE;
 
   if (did_change) {
-    if (mute) {
+    if (show_mute) {
       pixbuf = applet->pix[0];
     } else {
       pixbuf = applet->pix[n];
@@ -1125,7 +1180,7 @@
       track_names = g_string_append (track_names, track->label);
   }
 
-  if (mute) {
+  if (show_mute) {
     tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
   } else {
     /* Translator comment: I'm not all too sure if this makes sense
@@ -1152,10 +1207,53 @@
 				"state", mute ? "1" : "0", NULL);
 }
 
+static void
+cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
+{
+  GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
+  GstMixerMessageType type;
+  GstMixerTrack *first_track;
+  GstMixerTrack *track = NULL;
+  gint mute;
+  gdouble volume;
+
+  if (applet->tracks == NULL || 
+      GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
+    /* No tracks, or not from our mixer - can't update anything anyway */
+    return; 
+  }
+
+  volume = mute = -1;
+
+  first_track = g_list_first (applet->tracks)->data;
+
+  /* This code only calls refresh if the first_track changes, because the
+   * refresh code only retrieves the current value from that track anyway */
+  type = gst_mixer_message_get_type (message);
+  if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
+    gboolean muted;
+    gst_mixer_message_parse_mute_toggled (message, &track, &muted);
+    mute = muted ? 1 : 0;
+  }
+  else {
+    gint n, num_channels, *vols;
+    volume = 0.0;
+
+    gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
+    for (n = 0; n < num_channels; n++)
+      volume += vols[n];
+    volume /= track->num_channels;
+    volume = 100 * volume / (track->max_volume - track->min_volume);
+  }
+
+  if (first_track == track)
+    gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
+}
+
 static gboolean
 cb_check (gpointer data)
 {
-  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
+  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, -1, -1);
 
   return TRUE;
 }
@@ -1214,6 +1312,8 @@
             /* save */
             gst_object_replace ((GstObject **) &applet->mixer, item->data);
             gst_element_set_state (old_element, GST_STATE_NULL);
+
+            gnome_volume_applet_setup_timeout (applet);
             newdevice = TRUE;
           }
           break;
@@ -1374,7 +1474,7 @@
   GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
 
   init_pixbufs (applet);
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
 }
 
 /*
Index: applet.h
===================================================================
--- applet.h	(revision 10436)
+++ applet.h	(working copy)
@@ -71,6 +71,7 @@
 
   /* element */
   GstMixer *mixer;
+  GstBus *bus;
   gboolean lock;
   gint state;
   GList *tracks;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- gnome-applets.spec	17 Sep 2007 01:34:23 -0000	1.240
+++ gnome-applets.spec	20 Sep 2007 00:02:46 -0000	1.241
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -58,7 +58,9 @@
 Patch33:	gnome-applets-2.18.0-node-leak.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=370937
-Patch34:	mixer-wakeups.patch
+# Patch34:	mixer-wakeups.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
+Patch35:	gnome-applets-2.20.0-mixer-out-of-sync.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -156,7 +158,7 @@
 %patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
-%patch34 -p1 -b .mixer-wakeups
+%patch35 -p1 -b .mixer-sync
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -334,6 +336,10 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
+- Add patch to avoid the volume scale getting out-of sync with the 
+  real hardware volume
+
 * Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:11:38 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 20:11:38 -0400
Subject: comps comps-f8.xml.in,1.115,1.116
Message-ID: <200709200011.l8K0BcKQ013665@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13185

Modified Files:
	comps-f8.xml.in 
Log Message:
add gcin to chinese-support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- comps-f8.xml.in	19 Sep 2007 06:51:30 -0000	1.115
+++ comps-f8.xml.in	20 Sep 2007 00:11:08 -0000	1.116
@@ -668,6 +668,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-pinyin</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-chinese</packagereq>
       <packagereq type="default">wqy-bitmap-fonts</packagereq>
+      <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">stardict</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 00:17:49 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 20:17:49 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.241,1.242
Message-ID: <200709200017.l8K0Hnaq015685@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15585

Modified Files:
	gnome-applets.spec 
Log Message:
Fix patch application



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- gnome-applets.spec	20 Sep 2007 00:02:46 -0000	1.241
+++ gnome-applets.spec	20 Sep 2007 00:17:15 -0000	1.242
@@ -158,7 +158,9 @@
 %patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
-%patch35 -p1 -b .mixer-sync
+pushd mixer/
+%patch35 -p0 -b .mixer-sync
+popd
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:30:26 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Wed, 19 Sep 2007 20:30:26 -0400
Subject: rpms/glibc import.log,1.18,1.19
Message-ID: <200709200030.l8K0UQQZ017329@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281

Modified Files:
	import.log 
Log Message:
2.6.90-15



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	18 Sep 2007 20:12:28 -0000	1.18
+++ import.log	20 Sep 2007 00:29:54 -0000	1.19
@@ -15,3 +15,4 @@
 glibc-2_6_90-12:HEAD:glibc-2.6.90-12.src.rpm:1188070253
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
 glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332
+glibc-2_6_90-15:HEAD:glibc-2.6.90-15.src.rpm:1190248175



From fedora-extras-commits at redhat.com  Thu Sep 20 00:30:29 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Wed, 19 Sep 2007 20:30:29 -0400
Subject: rpms/glibc/devel .cvsignore, 1.216, 1.217 glibc-fedora.patch, 1.238,
	1.239 glibc.spec, 1.327, 1.328 sources, 1.240, 1.241
Message-ID: <200709200030.l8K0UTSC017338@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- .cvsignore	18 Sep 2007 20:12:30 -0000	1.216
+++ .cvsignore	20 Sep 2007 00:29:56 -0000	1.217
@@ -1,2 +1,2 @@
-glibc-20070918T1931.tar.bz2
-glibc-fedora-20070918T1931.tar.bz2
+glibc-20070920T0007.tar.bz2
+glibc-fedora-20070920T0007.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- glibc-fedora.patch	18 Sep 2007 20:35:52 -0000	1.238
+++ glibc-fedora.patch	20 Sep 2007 00:29:56 -0000	1.239
@@ -1,6 +1,6 @@
---- glibc-20070918T1931/ChangeLog	18 Sep 2007 19:29:44 -0000	1.10852
-+++ glibc-20070918T1931-fedora/ChangeLog	18 Sep 2007 19:57:14 -0000	1.8782.2.271
-@@ -2208,6 +2208,13 @@
+--- glibc-20070920T0007/ChangeLog	19 Sep 2007 22:22:51 -0000	1.10857
++++ glibc-20070920T0007-fedora/ChangeLog	20 Sep 2007 00:11:36 -0000	1.8782.2.272
+@@ -2244,6 +2244,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
-@@ -2503,6 +2510,10 @@
+@@ -2539,6 +2546,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]
-@@ -3760,6 +3771,15 @@
+@@ -3796,6 +3807,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-20070918T1931/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070918T1931-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070920T0007/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070918T1931-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070920T0007/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070918T1931-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070920T0007/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070920T0007-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-20070918T1931/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070918T1931-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070920T0007/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070920T0007-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-20070918T1931/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
-+++ glibc-20070918T1931-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
+--- glibc-20070920T0007/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
++++ glibc-20070920T0007-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
 @@ -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-20070918T1931/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070918T1931-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+--- glibc-20070920T0007/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070920T0007-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070918T1931/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070918T1931-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070920T0007/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
-+++ glibc-20070918T1931-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
+--- glibc-20070920T0007/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070920T0007-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -475,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070918T1931/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070920T0007/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070920T0007/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070918T1931-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070920T0007/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070920T0007-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -494,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070918T1931/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
-+++ glibc-20070918T1931-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
+--- glibc-20070920T0007/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070920T0007-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -509,8 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070918T1931/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070918T1931-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070920T0007/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070920T0007-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 !!!
@@ -602,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070918T1931/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070918T1931-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070920T0007/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070920T0007-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,
@@ -635,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070918T1931/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070918T1931-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070920T0007/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070920T0007-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -645,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070918T1931/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070918T1931-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070920T0007/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070920T0007-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -688,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070918T1931/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070918T1931-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070920T0007/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070920T0007-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>"
@@ -704,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070918T1931/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070918T1931-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070920T0007/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070920T0007-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -717,8 +717,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-20070918T1931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070920T0007/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -789,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070918T1931/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070918T1931-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070920T0007/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070920T0007-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -818,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070918T1931/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070918T1931-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070920T0007/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070920T0007-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>
@@ -895,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070918T1931/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070918T1931-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070920T0007/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070920T0007-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -952,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070918T1931/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070918T1931-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070920T0007/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070920T0007-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -963,8 +963,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070918T1931/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
-+++ glibc-20070918T1931-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
+--- glibc-20070920T0007/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
++++ glibc-20070920T0007-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
 @@ -282,7 +282,10 @@
  
  /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
@@ -989,16 +989,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20070918T1931/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070918T1931-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070920T0007/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070920T0007-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-20070918T1931/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
-+++ glibc-20070918T1931-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+--- glibc-20070920T0007/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070920T0007-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
 @@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1039,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070918T1931/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070918T1931-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070920T0007/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070920T0007-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1073,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070918T1931/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070918T1931-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070920T0007/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070920T0007-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;
@@ -1099,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070918T1931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070920T0007/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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>
 +
@@ -1108,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070918T1931/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
-+++ glibc-20070918T1931-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
+--- glibc-20070920T0007/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070920T0007-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1175,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070918T1931/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070918T1931-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070920T0007/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070920T0007-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1195,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070918T1931/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070918T1931-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070920T0007/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070920T0007-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1208,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070918T1931/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070918T1931-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070920T0007/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070920T0007-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1250,8 +1250,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070918T1931/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
-+++ glibc-20070918T1931-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+--- glibc-20070920T0007/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070920T0007-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
 @@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1268,8 +1268,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070918T1931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070920T0007/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1286,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070918T1931/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070918T1931-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070920T0007/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070920T0007-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
@@ -1303,8 +1303,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-20070918T1931/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070918T1931-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070920T0007/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070920T0007-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1318,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070918T1931/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070920T0007/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070920T0007-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))
@@ -1331,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070918T1931/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070920T0007/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070920T0007-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.  */
@@ -1684,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070918T1931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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.
@@ -1771,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070918T1931/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070918T1931-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070920T0007/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070920T0007-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
@@ -1781,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070918T1931/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070918T1931-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070920T0007/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070920T0007-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);
      }
@@ -1797,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1814,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1863,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070920T0007-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;
@@ -1907,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070920T0007-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>
@@ -1934,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070920T0007-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"
@@ -1945,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070920T0007-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;
@@ -1992,8 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070920T0007-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
  
@@ -2012,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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.
@@ -2074,8 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070920T0007-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)
@@ -2108,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070920T0007-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
  
@@ -2149,17 +2149,3 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- libc/misc/bits/syslog.h	18 Sep 2007 19:57:16 -0000	1.1.2.2
-+++ libc/misc/bits/syslog.h	18 Sep 2007 20:33:39 -0000
-@@ -27,9 +27,9 @@ extern void __syslog_chk (int __pri, int
- 
- #ifdef __va_arg_pack
- __extern_always_inline void
--syslog (int __pri, int __flag, __const char *__fmt, ...)
-+syslog (int __pri, __const char *__fmt, ...)
- {
--  return __syslog_chk (__pri, __flag, __fmt, __va_arg_pack ());
-+  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
- }
- #elif !defined __cplusplus
- # define syslog(pri, ...) \


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- glibc.spec	18 Sep 2007 20:12:30 -0000	1.327
+++ glibc.spec	20 Sep 2007 00:29:56 -0000	1.328
@@ -1,9 +1,9 @@
-%define glibcdate 20070918T1931
+%define glibcdate 20070920T0007
 %define glibcname glibc
-%define glibcsrcdir glibc-20070918T1931
+%define glibcsrcdir glibc-20070920T0007
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 14
+%define glibcrelease 15
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,10 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-15
+- $5$ (SHA-256) and $6$ (SHA-512) support in crypt
+  (#228697, #249477, #173834)
+
 * Tue Sep 18 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-14
 - -D_FORTIFY_SOURCE{,=2} support for C++
 - fortification of fread{,_unlocked}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- sources	18 Sep 2007 20:12:30 -0000	1.240
+++ sources	20 Sep 2007 00:29:56 -0000	1.241
@@ -1,2 +1,2 @@
-0bdea16fe09191ac97c4132ebdc9b7db  glibc-20070918T1931.tar.bz2
-4af6fdc8cfac8f9fc8f4eca5acf812f6  glibc-fedora-20070918T1931.tar.bz2
+68c585139617d926f94df1b5b2f57d13  glibc-20070920T0007.tar.bz2
+2ebd905d6bb60c826db1d0fd99dcec02  glibc-fedora-20070920T0007.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 00:38:21 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 20:38:21 -0400
Subject: comps comps-f8.xml.in,1.116,1.117
Message-ID: <200709200038.l8K0cL1u017717@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17682

Modified Files:
	comps-f8.xml.in 
Log Message:
move kinput2 to japanese-support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- comps-f8.xml.in	20 Sep 2007 00:11:08 -0000	1.116
+++ comps-f8.xml.in	20 Sep 2007 00:37:51 -0000	1.117
@@ -356,7 +356,6 @@
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
-      <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
       <packagereq type="optional">lineakd</packagereq>
@@ -2170,6 +2169,7 @@
       <packagereq type="optional">ddskk-xemacs</packagereq>
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
+      <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">kcc</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-japanese</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 00:38:58 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 20:38:58 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xorg-x11-drv-ati.spec, 1.59, 1.60
Message-ID: <200709200038.l8K0cwGG017795@cvs-int.fedora.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
- xf86-video-ati 6.7.193



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Aug 2007 15:43:28 -0000	1.17
+++ .cvsignore	20 Sep 2007 00:38:25 -0000	1.18
@@ -1 +1 @@
-xf86-video-ati-6.7.192.tar.bz2
+xf86-video-ati-6.7.193.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Aug 2007 15:43:28 -0000	1.17
+++ sources	20 Sep 2007 00:38:25 -0000	1.18
@@ -1 +1 @@
-b3207c1df5f6f8cf344efe4842bb2db7  xf86-video-ati-6.7.192.tar.bz2
+316ebbe95834c5120c302cc004363f92  xf86-video-ati-6.7.193.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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-x11-drv-ati.spec	27 Aug 2007 15:43:28 -0000	1.59
+++ xorg-x11-drv-ati.spec	20 Sep 2007 00:38:25 -0000	1.60
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.7.192
+Version:   6.7.193
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -81,6 +81,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
+- xf86-video-ati 6.7.193
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 6.7.192-1
 - xf86-video-ati 6.7.192
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:51:20 2007
From: fedora-extras-commits at redhat.com (Benjamin Kosnik (bkoz))
Date: Wed, 19 Sep 2007 20:51:20 -0400
Subject: rpms/boost/devel boost.spec,1.38,1.39
Message-ID: <200709200051.l8K0pKGI018207@cvs-int.fedora.redhat.com>

Author: bkoz

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18184

Modified Files:
	boost.spec 
Log Message:

* Wed Sep 19 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-5
- (#283771: Linking against boost libraries fails).



Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- boost.spec	21 Aug 2007 16:20:04 -0000	1.38
+++ boost.spec	20 Sep 2007 00:50:48 -0000	1.39
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.34.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Boost Software License (GPL-Compatible, Free Software License)
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -199,6 +199,9 @@
 %doc %{_docdir}/boost-%{version}
 
 %changelog
+* Wed Sep 19 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-5
+- (#283771: Linking against boost libraries fails).
+
 * Tue Aug 21 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:58:13 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 19 Sep 2007 20:58:13 -0400
Subject: rpms/gcin/EL-5 gcin.spec,1.20,1.21
Message-ID: <200709200058.l8K0wDeS019136@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19014

Modified Files:
	gcin.spec 
Log Message:
update license field to LGPLv2
add im-chooser to require



Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/EL-5/gcin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcin.spec	17 Apr 2007 02:21:12 -0000	1.20
+++ gcin.spec	20 Sep 2007 00:57:40 -0000	1.21
@@ -1,10 +1,10 @@
 Name:           gcin
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://cle.linux.org.tw/gcin/
 Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
@@ -21,7 +21,7 @@
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  libXtst-devel
-Requires:       gtk2
+Requires:       gtk2, im-chooser
 Requires(post): %{_sbindir}/alternatives, desktop-file-utils
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): desktop-file-utils
@@ -112,6 +112,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Sep 20 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-3
+- update license field to LGPLv2
+- add im-chooser to require
+
 * Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-2
 - disable i18n and do not make po
 



From fedora-extras-commits at redhat.com  Thu Sep 20 01:02:34 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 19 Sep 2007 21:02:34 -0400
Subject: rpms/gcin/devel gcin.spec,1.21,1.22
Message-ID: <200709200102.l8K12YhZ025862@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722

Modified Files:
	gcin.spec 
Log Message:
update license field to LGPLv2
add im-chooser to require



Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gcin.spec	17 Apr 2007 02:23:56 -0000	1.21
+++ gcin.spec	20 Sep 2007 01:01:59 -0000	1.22
@@ -1,10 +1,10 @@
 Name:           gcin
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://cle.linux.org.tw/gcin/
 Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
@@ -21,7 +21,7 @@
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  libXtst-devel
-Requires:       gtk2
+Requires:       gtk2, im-chooser
 Requires(post): %{_sbindir}/alternatives, desktop-file-utils
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): desktop-file-utils
@@ -112,6 +112,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Sep 20 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-3
+- update license field to LGPLv2
+- add im-chooser to require
+
 * Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-2
 - disable i18n and do not make po
 



From fedora-extras-commits at redhat.com  Thu Sep 20 02:02:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 22:02:33 -0400
Subject: rpms/perl-Test-Inline/F-7 .cvsignore, 1.3, 1.4 perl-Test-Inline.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200709200202.l8K22XFc010198@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Inline/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10087

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
- Upstream update.
- Disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 04:22:23 -0000	1.3
+++ .cvsignore	20 Sep 2007 02:01:59 -0000	1.4
@@ -1 +1 @@
-Test-Inline-2.201.tar.gz
+Test-Inline-2.207.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/perl-Test-Inline.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Inline.spec	18 Jan 2007 04:43:16 -0000	1.8
+++ perl-Test-Inline.spec	20 Sep 2007 02:01:59 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-Inline
-Version: 	2.201
-Release: 	2%{?dist}
+Version: 	2.207
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-Inline/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Inline-%{version}.tar.gz
@@ -16,7 +16,8 @@
 BuildRequires:	perl(File::Spec) >= 0.80
 BuildRequires:	perl(List::Util) >= 1.11
 BuildRequires:	perl(Getopt::Long) >= 2.34
-BuildRequires:	perl(File::Remove)
+BuildRequires:	perl(File::chmod)
+BuildRequires:	perl(File::Remove) >= 0.34
 BuildRequires:	perl(File::Slurp) >= 9999.04
 BuildRequires:	perl(File::Find::Rule) >= 0.26
 BuildRequires:	perl(Config::Tiny) >= 2.00
@@ -26,6 +27,7 @@
 BuildRequires:	perl(File::Flat) >= 1.00
 BuildRequires:	perl(Pod::Tests) >= 0.18
 BuildRequires:	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(Test::Script)
 
 # RPM misses these deps
 Requires:	perl(File::Flat)
@@ -61,7 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test AUTOMATED_TESTING=1
+# Something is broken with AUTOMATED_TESTING
+# make test AUTOMATED_TESTING=1
+make test
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +76,16 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
+- Upstream update.
+- Disable AUTOMATED_TESTING.
+
+* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.205-1
+- Upstream update.
+
+* Tue Jul 10 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.202-1
+- Upstream update.
+
 * Wed Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.201-2
 - BR: perl(File::Remove).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2007 04:22:23 -0000	1.3
+++ sources	20 Sep 2007 02:01:59 -0000	1.4
@@ -1 +1 @@
-6c6a444c2044f11776dab50ae0030121  Test-Inline-2.201.tar.gz
+7530c2dee1d9547acd78dd4ca17ffbb3  Test-Inline-2.207.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:31:23 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 22:31:23 -0400
Subject: rpms/dkms/devel .cvsignore, 1.9, 1.10 dkms.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200709200231.l8K2VNuq014722@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14625

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
upgrade to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Feb 2007 15:52:10 -0000	1.9
+++ .cvsignore	20 Sep 2007 02:30:51 -0000	1.10
@@ -1 +1 @@
-dkms-2.0.16.tar.gz
+dkms-2.0.17.4.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dkms.spec	28 Feb 2007 15:52:10 -0000	1.13
+++ dkms.spec	20 Sep 2007 02:30:51 -0000	1.14
@@ -1,16 +1,18 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.16
+Version: 2.0.17.4
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
-Provides: dkms-minimal
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# when building for Fedora, uncomment this Requires
 Requires: kernel-devel
 
 %description
@@ -21,12 +23,13 @@
 %prep
 
 %setup -q
+%build
 
-%triggerpostun -- dkms < 1.90.00-1
-for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
-	mv -f $dir /var/lib/dkms
+%triggerpostun -- %{name} < 1.90.00-1
+for dir in `find %{_localstatedir}/%{name} -type d -maxdepth 1 -mindepth 1`; do
+	mv -f $dir %{_localstatedir}/lib/%{name}
 done
-[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
+[ -e %{_sysconfdir}/dkms_framework.conf ] && ! [ -e %{_sysconfdir}/%{name}/framework.conf ] && mkdir %{_sysconfdir}/%{name} && cp -a %{_sysconfdir}/dkms_framework.conf %{_sysconfdir}/%{name}/framework.conf
 arch_used=""
 [ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
 echo ""
@@ -37,10 +40,10 @@
 echo ""
 echo "The upgrade will assume all built modules are for arch: $arch_used"
 current_kernel=`uname -r`
-dkms_tree="/var/lib/dkms"
-source_tree="/usr/src"
+dkms_tree="%{_localstatedir}/lib/%{name}"
+source_tree="%{_prefix}/src"
 tmp_location="/tmp"
-dkms_frameworkconf="/etc/dkms/framework.conf"
+dkms_frameworkconf="%{_sysconfdir}/%{name}/framework.conf"
 . $dkms_frameworkconf 2>/dev/null
 echo ""
 echo "Fixing directories."
@@ -48,18 +51,18 @@
 	dir_to_fix=`echo $directory | sed 's#/module$##'`
 	echo "Creating $dir_to_fix/$arch_used..."
 	mkdir $dir_to_fix/$arch_used
-	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
+	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
 done
 echo ""
-echo "Fixing symlinks."	
+echo "Fixing symlinks."
 for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
 	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
 	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
 	cd $dir_of_symlink
-        read_link="$symlink"
-        while [ -L "$read_link" ]; do
-            read_link=`ls -l $read_link | sed 's/.*-> //'`
-        done
+	read_link="$symlink"
+	while [ -L "$read_link" ]; do
+		read_link=`ls -l $read_link | sed 's/.*-> //'`
+	done
 	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
 		echo "Updating $symlink..."
 		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
@@ -71,43 +74,59 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
-install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
-gzip -c -9 dkms.8 > $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-chmod 644 $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
-install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
-install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
-install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
-install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth
+make install-redhat DESTDIR=$RPM_BUILD_ROOT \
+    SBIN=$RPM_BUILD_ROOT%{_sbindir} \
+    VAR=$RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} \
+    MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
+    ETC=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+    BASHDIR=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d \
+    LIBDIR=$RPM_BUILD_ROOT%{_prefix}/lib/%{name}
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/sbin/dkms
-%attr(0755,root,root) /var/lib/dkms
-%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
-%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
-%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
-%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING README.dkms
-%doc %attr (-,root,root) sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-%dir /etc/dkms
-%config(noreplace) /etc/dkms/framework.conf
-%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec
+%{_sbindir}/%{name}
+%{_localstatedir}/lib/%{name}
+/etc/init.d/dkms_autoinstaller
+%{_prefix}/lib/dkms/*
+%{_mandir}/*/*
+%doc sample.spec sample.conf AUTHORS COPYING README.dkms
+%doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/framework.conf
+%config(noreplace) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
+%{_sysconfdir}/bash_completion.d/%{name}
 
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
-/sbin/chkconfig dkms_autoinstaller on
+# enable on initial install
+[ $1 -lt 2 ] && /sbin/chkconfig dkms_autoinstaller on ||:
 
+%preun
+# remove on uninstall
+[ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
-* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16-1
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.4
+- upgrade to latest upstream
+
+* Wed Jun 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.2
+- updated for Ubuntu support, other bugfixes.
+
+* Tue Mar 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.1
+- spec file cleanups per re-review in Fedora
+- add bash completion, rpmbuild check, pinit, pass-arch patches from
+  Mandriva.  These are generic.  The other Mandriva patches appear to
+  be distro-specific.
+- Look for /etc/sysconfig/module-init-tools to get some values.
+
+* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16
 - fix override_dest_module_location() for historical distro versions
 - don't run weak-modules if it doesn't exist
 
-* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15-1
+* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15
 - release with no changes
 
 * Fri Feb 23 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14.1
@@ -152,7 +171,7 @@
 - fix version comparison for all 2.6 kernels
 
 * Mon Apr 10 2006 Matt Domsch <Matt_Domsch at dell.com>
-- add README.dkms to %doc
+- add README.dkms to doc
 
 * Wed Mar 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11-1
 - use -n <val> to all head and tail calls
@@ -190,10 +209,10 @@
 - mkrpm now is built with -ba, not -bb (creates source RPM)
 
 * Fri Nov 4 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8
-- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper 
+- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.7
-- Repackaged 2.0.6.2 as 2.0.7 
+- Repackaged 2.0.6.2 as 2.0.7
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.2
 - Updated dkms_mkkerneldoth to know about VMWare kernel
@@ -271,7 +290,7 @@
 
 * Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
 - Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
-- Andreas Gruenbacher's removal of IFS usage 
+- Andreas Gruenbacher's removal of IFS usage
 - Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
 - Andreas Gruenbacher's patch to cut down on line length by using $base_dir
 - fixed $base_dir so it gets set after setup_kernels_arches
@@ -279,7 +298,7 @@
 * Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
 - patch to remove tick usage
 - patch to rewrite version comparison code
-- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
+- patch to switch to usage of case, remove use of grep -c, remove use of IFS
 - patch to change handling of stderr
 
 * Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
@@ -645,7 +664,7 @@
 - Added --no-prepare-kernel cli option
 
 * Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
-- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
+- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
 - Added Fred Treasure to the AUTHORS list
 - Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout
 
@@ -694,7 +713,7 @@
 
 * Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
 - Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
-- Redid handling of modifying modules.conf 
+- Redid handling of modifying modules.conf
 - Added MODULE_CONF_ALIAS_TYPE to specs
 
 * Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2007 15:52:10 -0000	1.9
+++ sources	20 Sep 2007 02:30:51 -0000	1.10
@@ -1 +1 @@
-d44d881da8f7d5355de9ddfc6bf0e66c  dkms-2.0.16.tar.gz
+0c9bf87e75c320a9e7c8640a2eb7895d  dkms-2.0.17.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:45:36 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 22:45:36 -0400
Subject: rpms/dkms/F-7 .cvsignore, 1.9, 1.10 dkms.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200709200245.l8K2jaId015594@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15563

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
upgrade to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Feb 2007 15:52:10 -0000	1.9
+++ .cvsignore	20 Sep 2007 02:45:04 -0000	1.10
@@ -1 +1 @@
-dkms-2.0.16.tar.gz
+dkms-2.0.17.4.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/dkms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dkms.spec	28 Feb 2007 15:52:10 -0000	1.13
+++ dkms.spec	20 Sep 2007 02:45:04 -0000	1.14
@@ -1,16 +1,18 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.16
+Version: 2.0.17.4
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
-Provides: dkms-minimal
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# when building for Fedora, uncomment this Requires
 Requires: kernel-devel
 
 %description
@@ -21,12 +23,13 @@
 %prep
 
 %setup -q
+%build
 
-%triggerpostun -- dkms < 1.90.00-1
-for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
-	mv -f $dir /var/lib/dkms
+%triggerpostun -- %{name} < 1.90.00-1
+for dir in `find %{_localstatedir}/%{name} -type d -maxdepth 1 -mindepth 1`; do
+	mv -f $dir %{_localstatedir}/lib/%{name}
 done
-[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
+[ -e %{_sysconfdir}/dkms_framework.conf ] && ! [ -e %{_sysconfdir}/%{name}/framework.conf ] && mkdir %{_sysconfdir}/%{name} && cp -a %{_sysconfdir}/dkms_framework.conf %{_sysconfdir}/%{name}/framework.conf
 arch_used=""
 [ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
 echo ""
@@ -37,10 +40,10 @@
 echo ""
 echo "The upgrade will assume all built modules are for arch: $arch_used"
 current_kernel=`uname -r`
-dkms_tree="/var/lib/dkms"
-source_tree="/usr/src"
+dkms_tree="%{_localstatedir}/lib/%{name}"
+source_tree="%{_prefix}/src"
 tmp_location="/tmp"
-dkms_frameworkconf="/etc/dkms/framework.conf"
+dkms_frameworkconf="%{_sysconfdir}/%{name}/framework.conf"
 . $dkms_frameworkconf 2>/dev/null
 echo ""
 echo "Fixing directories."
@@ -48,18 +51,18 @@
 	dir_to_fix=`echo $directory | sed 's#/module$##'`
 	echo "Creating $dir_to_fix/$arch_used..."
 	mkdir $dir_to_fix/$arch_used
-	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
+	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
 done
 echo ""
-echo "Fixing symlinks."	
+echo "Fixing symlinks."
 for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
 	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
 	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
 	cd $dir_of_symlink
-        read_link="$symlink"
-        while [ -L "$read_link" ]; do
-            read_link=`ls -l $read_link | sed 's/.*-> //'`
-        done
+	read_link="$symlink"
+	while [ -L "$read_link" ]; do
+		read_link=`ls -l $read_link | sed 's/.*-> //'`
+	done
 	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
 		echo "Updating $symlink..."
 		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
@@ -71,43 +74,59 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
-install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
-gzip -c -9 dkms.8 > $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-chmod 644 $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
-install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
-install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
-install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
-install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth
+make install-redhat DESTDIR=$RPM_BUILD_ROOT \
+    SBIN=$RPM_BUILD_ROOT%{_sbindir} \
+    VAR=$RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} \
+    MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
+    ETC=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+    BASHDIR=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d \
+    LIBDIR=$RPM_BUILD_ROOT%{_prefix}/lib/%{name}
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/sbin/dkms
-%attr(0755,root,root) /var/lib/dkms
-%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
-%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
-%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
-%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING README.dkms
-%doc %attr (-,root,root) sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-%dir /etc/dkms
-%config(noreplace) /etc/dkms/framework.conf
-%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec
+%{_sbindir}/%{name}
+%{_localstatedir}/lib/%{name}
+/etc/init.d/dkms_autoinstaller
+%{_prefix}/lib/dkms/*
+%{_mandir}/*/*
+%doc sample.spec sample.conf AUTHORS COPYING README.dkms
+%doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/framework.conf
+%config(noreplace) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
+%{_sysconfdir}/bash_completion.d/%{name}
 
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
-/sbin/chkconfig dkms_autoinstaller on
+# enable on initial install
+[ $1 -lt 2 ] && /sbin/chkconfig dkms_autoinstaller on ||:
 
+%preun
+# remove on uninstall
+[ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
-* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16-1
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.4
+- upgrade to latest upstream
+
+* Wed Jun 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.2
+- updated for Ubuntu support, other bugfixes.
+
+* Tue Mar 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.1
+- spec file cleanups per re-review in Fedora
+- add bash completion, rpmbuild check, pinit, pass-arch patches from
+  Mandriva.  These are generic.  The other Mandriva patches appear to
+  be distro-specific.
+- Look for /etc/sysconfig/module-init-tools to get some values.
+
+* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16
 - fix override_dest_module_location() for historical distro versions
 - don't run weak-modules if it doesn't exist
 
-* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15-1
+* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15
 - release with no changes
 
 * Fri Feb 23 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14.1
@@ -152,7 +171,7 @@
 - fix version comparison for all 2.6 kernels
 
 * Mon Apr 10 2006 Matt Domsch <Matt_Domsch at dell.com>
-- add README.dkms to %doc
+- add README.dkms to doc
 
 * Wed Mar 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11-1
 - use -n <val> to all head and tail calls
@@ -190,10 +209,10 @@
 - mkrpm now is built with -ba, not -bb (creates source RPM)
 
 * Fri Nov 4 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8
-- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper 
+- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.7
-- Repackaged 2.0.6.2 as 2.0.7 
+- Repackaged 2.0.6.2 as 2.0.7
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.2
 - Updated dkms_mkkerneldoth to know about VMWare kernel
@@ -271,7 +290,7 @@
 
 * Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
 - Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
-- Andreas Gruenbacher's removal of IFS usage 
+- Andreas Gruenbacher's removal of IFS usage
 - Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
 - Andreas Gruenbacher's patch to cut down on line length by using $base_dir
 - fixed $base_dir so it gets set after setup_kernels_arches
@@ -279,7 +298,7 @@
 * Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
 - patch to remove tick usage
 - patch to rewrite version comparison code
-- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
+- patch to switch to usage of case, remove use of grep -c, remove use of IFS
 - patch to change handling of stderr
 
 * Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
@@ -645,7 +664,7 @@
 - Added --no-prepare-kernel cli option
 
 * Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
-- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
+- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
 - Added Fred Treasure to the AUTHORS list
 - Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout
 
@@ -694,7 +713,7 @@
 
 * Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
 - Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
-- Redid handling of modifying modules.conf 
+- Redid handling of modifying modules.conf
 - Added MODULE_CONF_ALIAS_TYPE to specs
 
 * Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2007 15:52:10 -0000	1.9
+++ sources	20 Sep 2007 02:45:04 -0000	1.10
@@ -1 +1 @@
-d44d881da8f7d5355de9ddfc6bf0e66c  dkms-2.0.16.tar.gz
+0c9bf87e75c320a9e7c8640a2eb7895d  dkms-2.0.17.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:47:59 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 19 Sep 2007 22:47:59 -0400
Subject: rpms/uim/devel uim.spec,1.45,1.46
Message-ID: <200709200247.l8K2lxWq015698@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	uim.spec 
Log Message:
* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
- Correct License tag. (Todd Zullinger)


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- uim.spec	10 Sep 2007 07:18:14 -0000	1.45
+++ uim.spec	20 Sep 2007 02:47:27 -0000	1.46
@@ -3,12 +3,12 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
-# pixmaps/*.{svg,png} is licensed under BSD or LGPL+
-License:	BSD and LGPLv2+ and (BSD or LGPL+)
+# pixmaps/*.{svg,png} is licensed under BSD or LGPLv2
+License:	BSD and LGPLv2+ and (BSD or LGPLv2)
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
@@ -33,7 +33,7 @@
 Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
-Requires:	xorg-x11-xinit >= 1.0.2-5.fc6
+Requires:	im-chooser >= 0.4.1-2.fc8
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -292,7 +292,7 @@
 %exclude %{_datadir}/uim/canna*.scm
 %exclude %{_datadir}/uim/skk*.scm
 %exclude %{_datadir}/uim/m17nlib.scm
-## pixmaps are licensed under BSD or LGPL+
+## pixmaps are licensed under BSD or LGPLv2
 %exclude %{_datadir}/uim/pixmaps/anthy.png
 %exclude %{_datadir}/uim/pixmaps/canna.png
 %exclude %{_datadir}/uim/pixmaps/m17n*png
@@ -357,7 +357,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
 %{_datadir}/uim/anthy*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/anthy.png
 %dir %{_datadir}/uim
 
@@ -365,7 +365,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-canna.so
 %{_datadir}/uim/canna*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/canna.png
 %dir %{_datadir}/uim
 
@@ -379,11 +379,15 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim//pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %changelog
+* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
+- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
+- Correct License tag. (Todd Zullinger)
+
 * Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
 - Update the xinput script to support the new im-chooser.
   - bring up uim-toolbar-gtk-systray as the auxiliary program



From fedora-extras-commits at redhat.com  Thu Sep 20 02:57:18 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 19 Sep 2007 22:57:18 -0400
Subject: rpms/referencer/devel referencer-new_poppler.patch, NONE,
	1.1 referencer.spec, 1.6, 1.7
Message-ID: <200709200257.l8K2vIWx015986@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15955

Modified Files:
	referencer.spec 
Added Files:
	referencer-new_poppler.patch 
Log Message:
* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
- Patch to build against newer poppler library


referencer-new_poppler.patch:

--- NEW FILE referencer-new_poppler.patch ---
--- src/Document.C	2007/09/02 07:29:29	547
+++ src/Document.C	2007/09/08 18:30:24	548
@@ -18,9 +18,10 @@
 #include <libgnomevfsmm.h>
 #include <glibmm/i18n.h>
 #include "ucompose.hpp"
-
 #include <poppler.h>
 
+#include "config.h"
+
 #include "Utility.h"
 #include "Library.h"
 #include "TagList.h"
@@ -28,6 +29,7 @@
 
 #include "Document.h"
 
+
 Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
 Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
 Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
@@ -393,7 +395,13 @@
 		rect->y2 = height;
 
 		// FIXME: add something before/after appending text to signal pagebreak?
-		textdump += poppler_page_get_text (page, rect);
+		#ifdef OLD_POPPLER
+			#warning Using poppler <= 0.5
+			textdump += poppler_page_get_text (page, rect);
+		#else
+			#warning Using poppler >= 0.6
+			textdump += poppler_page_get_text (page, POPPLER_SELECTION_GLYPH, rect);
+		#endif
 
 		poppler_rectangle_free (rect);
 		g_object_unref (page);


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- referencer.spec	6 Sep 2007 00:34:20 -0000	1.6
+++ referencer.spec	20 Sep 2007 02:56:46 -0000	1.7
@@ -1,11 +1,12 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.0.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
+Patch0:		referencer-new_poppler.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .poppler
 
 %build
 %configure --disable-update-mime-database
@@ -68,6 +70,9 @@
 %{_datadir}/referencer/
 
 %changelog
+* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
+- Patch to build against newer poppler library
+
 * Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
 - Rebuild against newer poppler library
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:15:43 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 19 Sep 2007 23:15:43 -0400
Subject: devel/anaconda .cvsignore, 1.445, 1.446 anaconda.spec, 1.581,
	1.582 sources, 1.574, 1.575
Message-ID: <200709200315.l8K3FhPg022335@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22310

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
- spec file cleanups (dcantrell)
- lots of pychecker fixes (clumens)
- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
- Fix upgrade traceback (clumens, #296571)
- Few live install fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- .cvsignore	18 Sep 2007 21:36:42 -0000	1.445
+++ .cvsignore	20 Sep 2007 03:15:09 -0000	1.446
@@ -1,3 +1 @@
-anaconda-11.3.0.28.tar.bz2
-anaconda-11.3.0.29.tar.bz2
-anaconda-11.3.0.31.tar.bz2
+anaconda-11.3.0.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- anaconda.spec	18 Sep 2007 21:36:42 -0000	1.581
+++ anaconda.spec	20 Sep 2007 03:15:09 -0000	1.582
@@ -1,69 +1,124 @@
 %define livearches %{ix86} x86_64
 
-Name: anaconda
-Version: 11.3.0.31
-Release: 1
-License: GPL
 Summary: Graphical system installer
-Group: Applications/System
-Source: anaconda-%{version}.tar.bz2
-BuildRequires: kudzu-devel >= 1.2.68, pciutils-devel
-BuildRequires: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
-BuildRequires: rpm-python >= 4.2-0.61, rpm-devel, gettext >= 0.11
-BuildRequires: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
-BuildRequires: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
-BuildRequires: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber
-BuildRequires: pykickstart >= 0.96, yum >= 2.9.2,
+Name:    anaconda
+Version: 11.3.0.32
+Release: 1
+License: GPLv2
+Group:   Applications/System
+URL:     http://fedoraproject.org/wiki/Anaconda
+
+Source0: anaconda-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Versions of required components (done so we make sure the buildrequires
+# match the requires versions of things).
 %define dmver 1.02.17-6
+%define gettextver 0.11
+%define glib2ver 2.11.1-5
+%define intltoolver 0.31.2-3
+%define kudzuver 1.2.68
+%define libdhcpver 1.27-3
+%define libselinuxver 1.6
+%define mkinitrdver 5.1.2-1
+%define pykickstartver 0.96
+%define rpmpythonver 4.2-0.61
+%define slangver 2.0.6-2
+%define yumver 2.9.2
+%define rhplver 0.170
+%define partedver 1.8.1
+%define pirutver 1.1.0
+%define syscfgdatever 1.9.0
+%define pythonpyblockver 0.24-1
+%define libbdevidver 5.1.2-1
+%define rhpxlver 0.25
+%define desktopfileutilsver 0.8
+
+BuildRequires: audit-libs-devel
+BuildRequires: beecrypt-devel
+BuildRequires: booty
+BuildRequires: bzip2-devel
 BuildRequires: device-mapper-devel >= %{dmver}
+BuildRequires: e2fsprogs-devel
+BuildRequires: elfutils-devel
+BuildRequires: gettext >= %{gettextver}
+BuildRequires: glib2-static >= %{glib2ver}
+BuildRequires: gtk2-devel
+BuildRequires: intltool >= %{intltoolver}
+BuildRequires: kudzu-devel >= %{kudzuver}
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libdhcp-static >= %{libdhcpver}
+BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: libsepol-devel
-BuildRequires: pango-devel, pirut, libXt-devel
-BuildRequires: slang-devel >= 2.0.6-2, slang-static
-BuildRequires: newt-devel, newt-static
-BuildRequires: glib2-devel >= 2.11.1-5, glib2-static, libdhcp6client-static
-BuildRequires: libdhcp-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1
-BuildRequires: audit-libs-devel
-BuildRequires: popt-devel, popt-static
+BuildRequires: libxml2-python
+BuildRequires: mkinitrd-devel >= %{mkinitrdver}
+BuildRequires: newt-static
+BuildRequires: pango-devel
+BuildRequires: pciutils-devel
+BuildRequires: pirut
+BuildRequires: popt-static
+BuildRequires: pykickstart >= %{pykickstartver}
+BuildRequires: python-devel
+BuildRequires: python-urlgrabber
+BuildRequires: rhpl
+BuildRequires: rpm-devel
+BuildRequires: rpm-python >= %{rpmpythonver}
+BuildRequires: slang-static >= %{slangver}
+BuildRequires: yum >= %{yumver}
+BuildRequires: zlib-devel
 %ifarch %livearches
 BuildRequires: desktop-file-utils
 %endif
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
-Requires: parted >= 1.8.1, pyparted >= 1.8.1
-Requires: kudzu >= 1.2.68, yum >= 2.9.2, pirut >= 1.1.0
-Requires: libxml2-python, python-urlgrabber
-Requires: system-logos, pykickstart >= 0.96, system-config-date >= 1.9.0
-Requires: device-mapper >= %{dmver}, device-mapper-libs >= %{dmver}
-Requires: dosfstools e2fsprogs
-Requires: python-pyblock >= 0.24-1
-Requires: libbdevid >= 5.1.2-1, libbdevid-python
+
+Requires: rpm-python >= %{rpmpythonver}
+Requires: rhpl >= %{rhplver}
+Requires: booty
+Requires: parted >= %{partedver}
+Requires: pyparted >= %{partedver}
+Requires: kudzu >= %{kudzuver}
+Requires: yum >= %{yumver}
+Requires: pirut >= %{pirutver}
+Requires: libxml2-python
+Requires: python-urlgrabber
+Requires: system-logos
+Requires: pykickstart >= %{pykickstartver}
+Requires: system-config-date >= %{syscfgdatever}
+Requires: device-mapper >= %{dmver}
+Requires: device-mapper-libs >= %{dmver}
+Requires: dosfstools
+Requires: e2fsprogs
+Requires: python-pyblock >= %{pythonpyblockver}
+Requires: libbdevid >= %{libbdevidver}
+Requires: libbdevid-python
 Requires: audit-libs
-Requires: libuser-python, newt-python
+Requires: libuser-python
+Requires: newt-python
 Requires: authconfig
 Requires: gnome-python2-gtkhtml2
 Requires: system-config-securitylevel
 %ifnarch s390 s390x ppc64
-Requires: rhpxl >= 0.25
+Requires: rhpxl >= %{rhpxlver}
 Requires: system-config-keyboard
 %endif
 %ifarch %livearches
 Requires: usermode
 Requires: zenity
-Requires(post): desktop-file-utils >= 0.8
-Requires(postun): desktop-file-utils >= 0.8
+Requires(post): desktop-file-utils >= %{desktopfileutilsver}
+Requires(postun): desktop-file-utils >= %{desktopfileutilsver}
 %endif
 Obsoletes: anaconda-images <= 10
-Url: http://fedoraproject.org/wiki/Anaconda
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The anaconda package contains the program which was used to install your 
 system.  These files are of little use on an already installed system.
 
 %package runtime
-Summary: Graphical system installer portions needed only for fresh installs.
-Group: Applications/System
-Requires: libxml2-python, python, rpm-python >= 4.2-0.61
+Summary: Graphical system installer portions needed only for fresh installs
+Group:   Applications/System
+Requires: libxml2-python, python, rpm-python >= %{rpmpythonver}
 Requires: anaconda = %{version}-%{release}
 Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs
 %ifarch %{ix86} x86_64
@@ -93,21 +148,21 @@
 %setup -q
 
 %build
-make depend
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%{__make} depend
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %ifarch %livearches
-desktop-file-install --vendor="" --dir=$RPM_BUILD_ROOT/%{_datadir}/applications  $RPM_BUILD_ROOT/%{_datadir}/applications/liveinst.desktop
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
 %endif
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %ifarch %livearches
 %post
@@ -115,7 +170,7 @@
 %endif
 
 %ifarch %livearches
-%postun 
+%postun
 /usr/bin/update-desktop-database %{_datadir}/applications
 %endif
 
@@ -128,13 +183,13 @@
 %doc docs/kickstart-docs.txt
 %doc docs/mediacheck.txt
 %doc docs/anaconda-release-notes.txt
-/usr/bin/mini-wm
-/usr/sbin/anaconda
+%{_bindir}/mini-wm
+%{_sbindir}/anaconda
 %ifarch i386 x86_64
-/usr/sbin/gptsync
+%{_sbindir}/gptsync
 %endif
-/usr/share/anaconda
-/usr/lib/anaconda
+%{_datadir}/anaconda
+%{_prefix}/lib/anaconda
 %ifarch %livearches
 %{_bindir}/liveinst
 %{_sbindir}/liveinst
@@ -146,7 +201,7 @@
 
 %files runtime
 %defattr(-,root,root)
-/usr/lib/anaconda-runtime
+%{_prefix}/lib/anaconda-runtime
 
 %files -n isomd5sum
 %defattr(-,root,root)
@@ -158,6 +213,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
+- spec file cleanups (dcantrell)
+- lots of pychecker fixes (clumens)
+- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
+- Fix upgrade traceback (clumens, #296571)
+- Few live install fixes
+
 * Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 11.3.0.31-1
 - Really include new Japanese font (katzj, #279931).
 - Use /dev/live-osimg-min if it exists (katzj).


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- sources	18 Sep 2007 22:05:50 -0000	1.574
+++ sources	20 Sep 2007 03:15:09 -0000	1.575
@@ -1 +1 @@
-9786fb11aba1ac3d387490e1fcb2ba2c  anaconda-11.3.0.31.tar.bz2
+4bd27095e1ac6fe29efa20ab7b9a20f2  anaconda-11.3.0.32.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 03:33:13 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 19 Sep 2007 23:33:13 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.15,1.16
Message-ID: <200709200333.l8K3XDgK022778@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22739

Modified Files:
	kinput2.spec 
Log Message:
* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
- Add the versioned dependency for im-chooser.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kinput2.spec	5 Sep 2007 00:48:01 -0000	1.15
+++ kinput2.spec	20 Sep 2007 03:32:40 -0000	1.16
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -66,7 +66,7 @@
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
 Requires(triggerpostun): %{_sbindir}/alternatives
-Requires: im-chooser
+Requires: im-chooser >= 0.4.1-2.fc8
 Obsoletes: kinput2-canna, kinput2-wnn4, kinput2-wnn6, kinput2-canna-wnn4, kinput2-canna-wnn6
 
 %description 
@@ -253,6 +253,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
+- Add the versioned dependency for im-chooser.
+
 * Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
 - Add QT_IM_MODULE=xim to the xinput script.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:43:20 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 23:43:20 -0400
Subject: rpms/ttywatch/devel ttywatch.init-lsb.patch, NONE, 1.1 ttywatch.spec,
	1.5, 1.6
Message-ID: <200709200343.l8K3hKSm022974@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952

Modified Files:
	ttywatch.spec 
Added Files:
	ttywatch.init-lsb.patch 
Log Message:
add LSB initscript header (BZ#247080)

ttywatch.init-lsb.patch:

--- NEW FILE ttywatch.init-lsb.patch ---
--- ttywatch-0.14/ttywatch.init.orig	2007-09-19 22:26:19.000000000 -0500
+++ ttywatch-0.14/ttywatch.init	2007-09-19 22:29:52.000000000 -0500
@@ -9,6 +9,17 @@
 # pidfile: /var/run/ttywatch.pid
 # config: /etc/ttywatch.conf
 # config: /etc/ttywatch.d/*
+### BEGIN INIT INFO
+# Provides: ttywatch
+# Default-Start: 
+# Default-Stop: 
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Short-Description: The ttywatch device output logging facility
+# Description: The ttywatch device output logging facility
+### END INIT INFO
+
+
 
 
 # Source function library.
@@ -75,9 +86,15 @@ case "$1" in
     reload)
 	reload
 	;;
+    force-reload)
+	reload
+	;;
     condrestart)
 	condrestart
 	;;
+    try-restart)
+	condrestart
+	;;
     *)
 	echo "Usage: ttywatch {start|stop|status|restart|condrestart|reload}"
 	RETVAL=1


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttywatch.spec	13 Aug 2007 13:24:17 -0000	1.5
+++ ttywatch.spec	20 Sep 2007 03:42:48 -0000	1.6
@@ -1,11 +1,12 @@
 Name: ttywatch
 Version: 0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.danlj.org/mkj/ttywatch/
 Source: http://www.danlj.org/mkj/ttywatch/%{name}-%{version}.tar.bz2
+Patch0: ttywatch.init-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel popt lockdev-devel
 Requires(post): /sbin/chkconfig
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-9
+- add LSB initscript header (BZ#247080)
+
 * Mon Aug 13 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-8
 - License tag GPLv2+
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:58:06 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 23:58:06 -0400
Subject: rpms/ttywatch/devel ttywatch.spec,1.6,1.7
Message-ID: <200709200358.l8K3w69N023244@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224

Modified Files:
	ttywatch.spec 
Log Message:
BR: popt-devel instead of popt


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttywatch.spec	20 Sep 2007 03:42:48 -0000	1.6
+++ ttywatch.spec	20 Sep 2007 03:57:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name: ttywatch
 Version: 0.14
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPLv2+
 Group: System Environment/Daemons
@@ -8,7 +8,7 @@
 Source: http://www.danlj.org/mkj/ttywatch/%{name}-%{version}.tar.bz2
 Patch0: ttywatch.init-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel popt lockdev-devel
+BuildRequires: glib2-devel popt-devel lockdev-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -83,8 +83,9 @@
 
 
 %changelog
-* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-9
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-10
 - add LSB initscript header (BZ#247080)
+- BR: popt-devel instead of popt now that it's split out
 
 * Mon Aug 13 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-8
 - License tag GPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 20 04:37:01 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 20 Sep 2007 00:37:01 -0400
Subject: rpms/pgp-tools/devel .cvsignore, 1.7, 1.8 pgp-tools.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200709200437.l8K4b1KC030132@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30096

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to latest upstream, fix BZ246433


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2006 19:21:12 -0000	1.7
+++ .cvsignore	20 Sep 2007 04:36:29 -0000	1.8
@@ -1 +1 @@
-signing-party_0.4.9.orig.tar.gz
+signing-party_0.4.12.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pgp-tools.spec	2 Nov 2006 19:21:12 -0000	1.6
+++ pgp-tools.spec	20 Sep 2007 04:36:29 -0000	1.7
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.9
+Version:        0.4.12
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -60,9 +60,13 @@
 	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+rm -rf __fedora_docs
+mkdir __fedora_docs
+cp -a caff gpg-key2ps gpg-mailkeys gpgsigs keylookup __fedora_docs/
+
 #  cleanup to leave docs only...
-find . -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
-mv keylookup/COPYING .
+find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+mv __fedora_docs/keylookup/COPYING .
 
 
 %clean
@@ -71,12 +75,16 @@
 %files
 %defattr(-,root,root,-)
 %doc README TODO COPYING copyright
-%doc caff gpg-key2ps gpg-mailkeys gpgsigs keylookup
+%doc __fedora_docs/*
 %{_bindir}/*
 %{_mandir}/*/*
 
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.4.12-1
+- upgrade to 0.4.12
+- cleanup doc installation (BZ#246433)
+
 * Thu Nov 02 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.9-1
 - upgrade to 0.4.9
   - Fix a bug with checking if we have exactly one or more keys that failed downloading.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2006 19:21:12 -0000	1.7
+++ sources	20 Sep 2007 04:36:29 -0000	1.8
@@ -1 +1 @@
-da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz
+88d44fb63c3d941acb6e8d4a450717cd  signing-party_0.4.12.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 04:45:50 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 20 Sep 2007 00:45:50 -0400
Subject: rpms/aiccu/devel aiccu.spec,1.7,1.8
Message-ID: <200709200445.l8K4joVa030473@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444

Modified Files:
	aiccu.spec 
Log Message:
rebuild


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aiccu.spec	31 Jan 2007 15:34:10 -0000	1.7
+++ aiccu.spec	20 Sep 2007 04:45:15 -0000	1.8
@@ -9,7 +9,7 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2007.01.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
@@ -70,6 +70,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <matt at domsch.com> 2007.01.15-2
+- rebuild
+
 * Wed Jan 31 2007 Matt Domsch <matt at domsch.com> 2007.01.15-1
 - upgrade to latest upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 20 06:33:57 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Thu, 20 Sep 2007 02:33:57 -0400
Subject: rpms/system-config-language/devel sources,1.24,1.25
Message-ID: <200709200633.l8K6XvWR012389@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12359

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.10



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Sep 2007 06:54:41 -0000	1.24
+++ sources	20 Sep 2007 06:33:24 -0000	1.25
@@ -1 +1 @@
-8a33fab49fed83a462312a146b3ce11c  system-config-language-1.2.9.tar.bz2
+66c97c10249fd9a70f5886a88293c9b0  system-config-language-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 06:35:36 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Thu, 20 Sep 2007 02:35:36 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.31,
	1.32
Message-ID: <200709200635.l8K6Za9w012423@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12401

Modified Files:
	system-config-language.spec 
Log Message:
- fix bug288851 and bug297461.
- add the Nepali support.




Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-language.spec	10 Sep 2007 06:56:32 -0000	1.31
+++ system-config-language.spec	20 Sep 2007 06:35:04 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,6 +73,10 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Thu Sep 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.10
+- fix bug288851 and bug297461.
+- add the Nepali support.
+
 * Mon Sep 10 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.9
 - fix bug275711 and bug284331.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 07:27:57 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 03:27:57 -0400
Subject: rpms/scim/devel scim.spec,1.97,1.98
Message-ID: <200709200727.l8K7Rv8O019427@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	scim.spec 
Log Message:
- drop %{_xinputdir}
- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
- no longer require xorg-x11-xinit



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- scim.spec	18 Sep 2007 04:14:54 -0000	1.97
+++ scim.spec	20 Sep 2007 07:27:20 -0000	1.98
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -23,8 +23,6 @@
 BuildRequires: doxygen
 %endif
 Requires:  %{name}-libs = %{version}-%{release}
-# for xinputrc (fc6)
-Requires: xorg-x11-xinit >= 1.0.2-5
 Requires: im-chooser
 Requires(post): %{_sbindir}/alternatives
 Requires(postun): %{_sbindir}/alternatives
@@ -136,8 +134,7 @@
 
 %define scim_api 1.4.0
 
-%define _xinputdir %{_sysconfdir}/X11/xinit/xinput.d
-%define _xinputconf %{_xinputdir}/scim.conf
+%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/scim.conf
 
 
 %prep
@@ -190,7 +187,7 @@
 rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
 # install xinput config file
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_xinputdir}
+mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
 
 %find_lang %{name}
@@ -256,7 +253,6 @@
 %{_libdir}/scim-1.0/%{scim_api}/SetupUI
 %{_datadir}/scim
 %{_datadir}/pixmaps/*
-%dir %{_xinputdir}
 %config(noreplace) %{_xinputconf}
 
 %files devel
@@ -290,6 +286,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-5
+- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
+- no longer require xorg-x11-xinit
+
 * Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
 - source none.conf in xinput script when skipping scim startup
 



From fedora-extras-commits at redhat.com  Thu Sep 20 07:47:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 20 Sep 2007 03:47:54 -0400
Subject: rpms/rlwrap/devel rlwrap.spec,1.2,1.3
Message-ID: <200709200747.l8K7lsAe019877@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19857

Modified Files:
	rlwrap.spec 
Log Message:
License field updated


Index: rlwrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlwrap/devel/rlwrap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rlwrap.spec	5 Feb 2007 06:09:14 -0000	1.2
+++ rlwrap.spec	20 Sep 2007 07:47:21 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           rlwrap
 Version:        0.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Wrapper for GNU readline
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://utopia.knoware.nl/~hlub/rlwrap/
 Source0:        http://utopia.knoware.nl/~hlub/rlwrap/rlwrap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Michel Salim <michel.sylvan at gmail.com> 0.28-3
+- License field updated
+
 * Mon Feb  5 2007 Michel Salim <michel.salim at gmail.com> 0.28-2
 - Rebuild for Fedora 7, removing dependency on libtermcap
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:26:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 04:26:04 -0400
Subject: rpms/darcs/devel darcs.spec,1.24,1.25
Message-ID: <200709200826.l8K8Q44J027557@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27478

Modified Files:
	darcs.spec 
Log Message:
set selinux file-context for %{_bindir}/darcs (reported by Jim Radford, #295351)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- darcs.spec	10 Aug 2007 04:36:30 -0000	1.24
+++ darcs.spec	20 Sep 2007 08:25:31 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        1.0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -76,7 +76,9 @@
 
 
 %post
-/usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1
+|| :
+restorecon -v %{_bindir}/darcs
 
 
 %files
@@ -94,6 +96,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-5
+- set selinux file-context for %{_bindir}/darcs
+  (reported by Jim Radford, #295351)
+
 * Fri Aug 10 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-4
 - specify license is GPL 2 or later
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:36:06 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 04:36:06 -0400
Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.7, 1.8 gnome-vfsmm.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200709200836.l8K8a66h028525@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28482

Modified Files:
	.cvsignore gnome-vfsmm.spec sources 
Log Message:
Update to new stable tree 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2007 14:50:19 -0000	1.7
+++ .cvsignore	20 Sep 2007 08:35:33 -0000	1.8
@@ -1 +1 @@
-gnome-vfsmm-2.18.0.tar.bz2
+gnome-vfsmm-2.20.0.tar.bz2


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-vfsmm.spec	28 Aug 2007 22:24:23 -0000	1.14
+++ gnome-vfsmm.spec	20 Sep 2007 08:35:33 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           gnome-vfsmm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for gnome-vfs
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable tree 2.20.0
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow gnome-vfs2 version
 - Added dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2007 14:50:20 -0000	1.8
+++ sources	20 Sep 2007 08:35:33 -0000	1.9
@@ -1 +1 @@
-1c5c0ef2ffcf52e682375fa11facebbf  gnome-vfsmm-2.18.0.tar.bz2
+3da9908850655031a383998d0cda1f85  gnome-vfsmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 08:41:27 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 04:41:27 -0400
Subject: rpms/libgnomemm26/devel .cvsignore, 1.9, 1.10 libgnomemm.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709200841.l8K8fRAb028767@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28727

Modified Files:
	.cvsignore libgnomemm.spec sources 
Log Message:
Update to new stable branch 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Mar 2007 14:53:05 -0000	1.9
+++ .cvsignore	20 Sep 2007 08:40:55 -0000	1.10
@@ -1 +1 @@
-libgnomemm-2.18.0.tar.bz2
+libgnomemm-2.20.0.tar.bz2


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgnomemm.spec	28 Aug 2007 22:32:18 -0000	1.16
+++ libgnomemm.spec	20 Sep 2007 08:40:55 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           libgnomemm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable branch 2.20
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow libgnome2 version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Mar 2007 14:53:05 -0000	1.10
+++ sources	20 Sep 2007 08:40:55 -0000	1.11
@@ -1 +1 @@
-da6d481fc4a7fb0084d0e48f5c182112  libgnomemm-2.18.0.tar.bz2
+6263d15a96c34a73964be37c4e9a261f  libgnomemm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 08:48:35 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 20 Sep 2007 04:48:35 -0400
Subject: rpms/gmp/devel gmp.spec,1.44,1.45
Message-ID: <200709200848.l8K8mZwv029052@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29020

Modified Files:
	gmp.spec 
Log Message:
fix dist tag



Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gmp.spec	19 Sep 2007 09:37:09 -0000	1.44
+++ gmp.spec	20 Sep 2007 08:48:03 -0000	1.45
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.2.2
-Release: 1%{dist}
+Release: 2%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-2
+- fix check tag
+
 * Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-1
 - update to 4.2.2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:53:37 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Thu, 20 Sep 2007 04:53:37 -0400
Subject: fedora-security/audit fc6,1.263,1.264 fc7,1.111,1.112
Message-ID: <200709200853.l8K8rbU1029405@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356/audit

Modified Files:
	fc6 fc7 
Log Message:
ekiga / opal tracking bugs.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- fc6	19 Sep 2007 15:39:17 -0000	1.263
+++ fc6	20 Sep 2007 08:53:35 -0000	1.264
@@ -8,8 +8,8 @@
 # Up to date FC6 as of 20070916
 
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
-CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
-CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297561
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8 #297561
 CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc7	19 Sep 2007 15:39:17 -0000	1.111
+++ fc7	20 Sep 2007 08:53:35 -0000	1.112
@@ -12,7 +12,7 @@
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
-CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Thu Sep 20 09:06:14 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Thu, 20 Sep 2007 05:06:14 -0400
Subject: rpms/mrtg/F-7 filter-provides-mrtg.sh,NONE,1.1 mrtg.spec,1.36,1.37
Message-ID: <200709200906.l8K96E5a003149@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3128

Modified Files:
	mrtg.spec 
Added Files:
	filter-provides-mrtg.sh 
Log Message:
Fix bad provides, Resolves: #247113


--- NEW FILE filter-provides-mrtg.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'


Index: mrtg.spec
===================================================================
RCS file: /cvs/extras/rpms/mrtg/F-7/mrtg.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mrtg.spec	8 Jun 2007 08:43:55 -0000	1.36
+++ mrtg.spec	20 Sep 2007 09:05:41 -0000	1.37
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.15.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg
@@ -14,6 +14,7 @@
 Source3:   filter-requires-mrtg.sh
 Source4:   mrtg.crond.in
 Source5:   mrtg-httpd.conf
+Source6:   filter-provides-mrtg.sh
 Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
 License:   GPL
@@ -26,6 +27,7 @@
 BuildRequires: gd-devel, libpng-devel
 
 %define __find_requires %{SOURCE3}
+%define __find_provides %{SOURCE6}
 
 %description
 The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
@@ -115,6 +117,10 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Thu Sep 20 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.15.1-3
+- Fix bad provides
+  Resolves: #247113
+
 * Thu Jun  8 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.15.1-2
 - Specfile update, because upstream decides to install mrtg-traffic-sum
   Resolves: #243112



From fedora-extras-commits at redhat.com  Thu Sep 20 09:16:20 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 20 Sep 2007 05:16:20 -0400
Subject: rpms/mpfr/devel mpfr-2.3.0-upstream.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 mpfr.spec, 1.4, 1.5 sources, 1.2,
	1.3 mpfr-2.2.1-upstream.patch, 1.1, NONE
Message-ID: <200709200916.l8K9GKSC003485@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mpfr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453

Modified Files:
	.cvsignore mpfr.spec sources 
Added Files:
	mpfr-2.3.0-upstream.patch 
Removed Files:
	mpfr-2.2.1-upstream.patch 
Log Message:
- update to 2.3.0
- fix license flag


mpfr-2.3.0-upstream.patch:

--- NEW FILE mpfr-2.3.0-upstream.patch ---
diff -Naurd mpfr-2.3.0-a/Makefile.am mpfr-2.3.0-b/Makefile.am
--- mpfr-2.3.0-a/Makefile.am	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/Makefile.am	2007-09-02 23:19:32.000000000 +0000
@@ -32,8 +32,13 @@
 
 MAKEINFOFLAGS = --enable-encoding
 
-get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+# Important note: If for some reason, srcdir is read-only at build time
+# (and you use objdir != srcdir), then you need to rebuild get_patches.c
+# (with "make get_patches.c") just after patching the MPFR source. This
+# should not be a problem in practice, in particular because "make dist"
+# automatically rebuilds get_patches.c before generating the archives.
+$(srcdir)/get_patches.c: PATCHES get_patches.sh
+	(cd $(srcdir) && ./get_patches.sh) > $@ || rm -f $@
 
 # Do not add get_patches.c to CLEANFILES so that this file doesn't
 # need to be (re)built as long as no patches are applied. Anyway the
diff -Naurd mpfr-2.3.0-a/Makefile.in mpfr-2.3.0-b/Makefile.in
--- mpfr-2.3.0-a/Makefile.in	2007-08-29 10:27:18.000000000 +0000
+++ mpfr-2.3.0-b/Makefile.in	2007-09-02 23:59:30.000000000 +0000
@@ -1665,8 +1665,13 @@
 	uninstall-info-am uninstall-libLTLIBRARIES
 
 
-get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+# Important note: If for some reason, srcdir is read-only at build time
+# (and you use objdir != srcdir), then you need to rebuild get_patches.c
+# (with "make get_patches.c") just after patching the MPFR source. This
+# should not be a problem in practice, in particular because "make dist"
+# automatically rebuilds get_patches.c before generating the archives.
+$(srcdir)/get_patches.c: PATCHES get_patches.sh
+	(cd $(srcdir) && ./get_patches.sh) > $@ || rm -f $@
 
 tune:
 	$(MAKE) $(AM_MAKEFLAGS) tuneup$(EXEEXT)
diff -Naurd mpfr-2.3.0-a/PATCHES mpfr-2.3.0-b/PATCHES
--- mpfr-2.3.0-a/PATCHES	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/PATCHES	2007-09-02 23:59:50.000000000 +0000
@@ -0,0 +1 @@
+get_patches
diff -Naurd mpfr-2.3.0-a/VERSION mpfr-2.3.0-b/VERSION
--- mpfr-2.3.0-a/VERSION	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/VERSION	2007-09-02 23:55:55.000000000 +0000
@@ -1 +1 @@
-2.3.0
+2.3.0-p1
diff -Naurd mpfr-2.3.0-a/mpfr.h mpfr-2.3.0-b/mpfr.h
--- mpfr-2.3.0-a/mpfr.h	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/mpfr.h	2007-09-02 23:55:55.000000000 +0000
@@ -27,7 +27,7 @@
 #define MPFR_VERSION_MAJOR 2
 #define MPFR_VERSION_MINOR 3
 #define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "2.3.0"
+#define MPFR_VERSION_STRING "2.3.0-p1"
 
 /* Macros dealing with MPFR VERSION */
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
diff -Naurd mpfr-2.3.0-a/tests/tversion.c mpfr-2.3.0-b/tests/tversion.c
--- mpfr-2.3.0-a/tests/tversion.c	2007-08-29 10:18:10.000000000 +0000
+++ mpfr-2.3.0-b/tests/tversion.c	2007-09-02 23:55:55.000000000 +0000
@@ -46,7 +46,7 @@
   version = mpfr_get_version ();
 
   /* This test is disabled when a suffix (e.g. -dev) has been defined. */
-#if 1
+#if 0
   sprintf (buffer, "%d.%d.%d", MPFR_VERSION_MAJOR, MPFR_VERSION_MINOR,
            MPFR_VERSION_PATCHLEVEL);
   if (strcmp (buffer, version) != 0)
diff -Naurd mpfr-2.3.0-a/version.c mpfr-2.3.0-b/version.c
--- mpfr-2.3.0-a/version.c	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/version.c	2007-09-02 23:55:55.000000000 +0000
@@ -25,5 +25,5 @@
 const char *
 mpfr_get_version (void)
 {
-  return "2.3.0";
+  return "2.3.0-p1";
 }
diff -Naurd mpfr-2.3.0-a/PATCHES mpfr-2.3.0-b/PATCHES
--- mpfr-2.3.0-a/PATCHES	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/PATCHES	2007-09-03 00:03:46.000000000 +0000
@@ -0,0 +1 @@
+mpfr_acosh
diff -Naurd mpfr-2.3.0-a/VERSION mpfr-2.3.0-b/VERSION
--- mpfr-2.3.0-a/VERSION	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/VERSION	2007-09-03 00:02:12.000000000 +0000
@@ -1 +1 @@
-2.3.0-p1
+2.3.0-p2
diff -Naurd mpfr-2.3.0-a/acosh.c mpfr-2.3.0-b/acosh.c
--- mpfr-2.3.0-a/acosh.c	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/acosh.c	2007-08-31 17:20:08.000000000 +0000
@@ -73,7 +73,7 @@
     /* Declaration of the size variables */
     mp_prec_t Ny = MPFR_PREC(y);   /* Precision of output variable */
     mp_prec_t Nt;                  /* Precision of the intermediary variable */
-    mp_exp_t  err, exp_te, exp_ti; /* Precision of error */
+    mp_exp_t  err, exp_te, d;      /* Precision of error */
     MPFR_ZIV_DECL (loop);
 
     /* compute the precision of intermediary variable */
@@ -91,13 +91,35 @@
         mpfr_mul (t, x, x, GMP_RNDD);      /* x^2 */
         exp_te = MPFR_GET_EXP (t);
         mpfr_sub_ui (t, t, 1, GMP_RNDD);   /* x^2-1 */
-        exp_ti = MPFR_GET_EXP (t);
-        mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
-        mpfr_add (t, t, x, GMP_RNDN);      /* sqrt(x^2-1)+x */
-        mpfr_log (t, t, GMP_RNDN);         /* ln(sqrt(x^2-1)+x)*/
+        if (MPFR_UNLIKELY (MPFR_IS_ZERO (t)))
+          {
+            mpfr_t z;
+
+            /* This means that x is very close to 1: x = 1 + z with
+               z < 2^(-Nt). Instead of increasing the precision, let's
+               compute x^2-1 by (x+1)(x-1) with an accuracy of about
+               Nt bits. */
+            mpfr_init2 (z, Nt);
+            mpfr_add_ui (t, x, 1, GMP_RNDD);
+            mpfr_sub_ui (z, x, 1, GMP_RNDD);
+            mpfr_mul (t, t, z, GMP_RNDD);
+            d = 2;
+            mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
+            mpfr_add (t, t, z, GMP_RNDN);      /* sqrt(x^2-1)+z */
+            mpfr_clear (z);
+            mpfr_log1p (t, t, GMP_RNDN);       /* log1p(sqrt(x^2-1)+z) */
+          }
+        else
+          {
+            d = exp_te - MPFR_GET_EXP (t);
+            d = MAX (1, d);
+            mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
+            mpfr_add (t, t, x, GMP_RNDN);      /* sqrt(x^2-1)+x */
+            mpfr_log (t, t, GMP_RNDN);         /* ln(sqrt(x^2-1)+x) */
+          }
 
         /* error estimate -- see algorithms.tex */
-        err = 3 + MAX (1, exp_te - exp_ti) - MPFR_GET_EXP(t);
+        err = 3 + d - MPFR_GET_EXP (t);
         /* error is bounded by 1/2 + 2^err <= 2^(1+max(-1,err)) */
         err = 1 + MAX (-1, err);
         if (MPFR_LIKELY (MPFR_CAN_ROUND (t, Nt - err, Ny, rnd_mode)))
@@ -117,9 +139,3 @@
   MPFR_SAVE_EXPO_FREE (expo);
   return mpfr_check_range (y, inexact, rnd_mode);
 }
-
-
-
-
-
-
diff -Naurd mpfr-2.3.0-a/mpfr.h mpfr-2.3.0-b/mpfr.h
--- mpfr-2.3.0-a/mpfr.h	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/mpfr.h	2007-09-03 00:02:12.000000000 +0000
@@ -27,7 +27,7 @@
 #define MPFR_VERSION_MAJOR 2
 #define MPFR_VERSION_MINOR 3
 #define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "2.3.0-p1"
+#define MPFR_VERSION_STRING "2.3.0-p2"
 
 /* Macros dealing with MPFR VERSION */
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
diff -Naurd mpfr-2.3.0-a/tests/tacosh.c mpfr-2.3.0-b/tests/tacosh.c
--- mpfr-2.3.0-a/tests/tacosh.c	2007-08-29 10:18:10.000000000 +0000
+++ mpfr-2.3.0-b/tests/tacosh.c	2007-08-31 17:20:00.000000000 +0000
@@ -123,12 +123,40 @@
   mpfr_clear (y);
 }
 
+/* With MPFR 2.3.0, this yields an assertion failure in mpfr_acosh. */
+static void
+bug20070831 (void)
+{
+  mpfr_t x, y, z;
+  int inex;
+
+  mpfr_init2 (x, 256);
+  mpfr_init2 (y, 32);
+  mpfr_init2 (z, 32);
+  mpfr_set_ui (x, 1, GMP_RNDN);
+  mpfr_nextabove (x);
+  inex = mpfr_acosh (y, x, GMP_RNDZ);
+  mpfr_set_ui_2exp (z, 1, -127, GMP_RNDN);
+  mpfr_nextbelow (z);
+  MPFR_ASSERTN (inex < 0);
+  if (!mpfr_equal_p (y, z))
+    {
+      printf ("Error in bug20070831:\nexpected ");
+      mpfr_dump (z);
+      printf ("got      ");
+      mpfr_dump (y);
+      exit (1);
+    }
+  mpfr_clears (x, y, z, (void *) 0);
+}
+
 int
 main (int argc, char *argv[])
 {
   tests_start_mpfr ();
 
   special ();
+  bug20070831 ();
 
   test_generic (2, 100, 25);
 
diff -Naurd mpfr-2.3.0-a/version.c mpfr-2.3.0-b/version.c
--- mpfr-2.3.0-a/version.c	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/version.c	2007-09-03 00:02:12.000000000 +0000
@@ -25,5 +25,5 @@
 const char *
 mpfr_get_version (void)
 {
-  return "2.3.0-p1";
+  return "2.3.0-p2";
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Aug 2007 13:08:47 -0000	1.2
+++ .cvsignore	20 Sep 2007 09:15:48 -0000	1.3
@@ -1 +1 @@
-mpfr-2.2.1.tar.bz2
+mpfr-2.3.0.tar.bz2


Index: mpfr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpfr.spec	28 Aug 2007 10:24:15 -0000	1.4
+++ mpfr.spec	20 Sep 2007 09:15:48 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
-Version: 2.2.1
-Release: 2%{dist}
+Version: 2.3.0
+Release: 1%{dist}
 URL: http://www.mpfr.org/
 Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2
-Patch0: mpfr-2.2.1-upstream.patch
+Patch0: mpfr-2.3.0-upstream.patch
 License: LGPLv2+ and GPLv2+ and GFDL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@
 
 %build
 
-%configure --disable-assert --enable-shared
+%configure --disable-assert
 make %{?_smp_mflags}
 
 %install
@@ -85,6 +85,10 @@
 %{_infodir}/mpfr.info*
 
 %changelog
+* Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 2.3.0-1
+- update to 2.3.0
+- fix license flag
+
 * Mon Aug 20 2007 Ivana Varekova <varekova at redhat.com> 2.2.1-2
 - spec file cleanup (#253440)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Aug 2007 13:08:47 -0000	1.2
+++ sources	20 Sep 2007 09:15:48 -0000	1.3
@@ -1 +1 @@
-40bf06f8081461d8db7d6f4ad5b9f6bd  mpfr-2.2.1.tar.bz2
+cf7c743e4be122e63eb6f372fc58b657  mpfr-2.3.0.tar.bz2


--- mpfr-2.2.1-upstream.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 09:19:39 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 20 Sep 2007 05:19:39 -0400
Subject: rpms/telnet/devel telnet-0.17-errno_test_sys_bsd.patch, 1.1,
	1.2 telnet.spec, 1.30, 1.31
Message-ID: <200709200919.l8K9JdtV003596@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553

Modified Files:
	telnet-0.17-errno_test_sys_bsd.patch telnet.spec 
Log Message:
- improved patch to #274991


telnet-0.17-errno_test_sys_bsd.patch:

Index: telnet-0.17-errno_test_sys_bsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet-0.17-errno_test_sys_bsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telnet-0.17-errno_test_sys_bsd.patch	22 Aug 2007 14:46:24 -0000	1.1
+++ telnet-0.17-errno_test_sys_bsd.patch	20 Sep 2007 09:19:07 -0000	1.2
@@ -1,11 +1,21 @@
---- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-08-01 11:37:27.000000000 +0200
-+++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-08-01 11:39:23.000000000 +0200
-@@ -407,6 +407,11 @@
+diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
+--- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-09-20 10:57:58.000000000 +0200
++++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-09-20 11:10:08.000000000 +0200
+@@ -375,6 +375,7 @@ TerminalNewMode(int f)
+     int onoff;
+     int old;
+     cc_t esc;
++    int err;
+ 
+     globalmode = f&~MODE_FORCE;
+     if (prevmode == f)
+@@ -407,6 +408,12 @@ TerminalNewMode(int f)
  	    tcsetattr(tin, TCSADRAIN, &tmp_tc);
  #endif	/* USE_TERMIO */
  	    old = ttyflush(SYNCHing|flushout);
 +            if (old < 0) {
-+              if (! ((errno == EINTR) || (errno == EAGAIN) || (errno == ENOSPC))) {
++	      err = errno;
++              if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
 +                break;
 +              }
 +            }


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- telnet.spec	22 Aug 2007 14:37:32 -0000	1.30
+++ telnet.spec	20 Sep 2007 09:19:07 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
+- improved patch to #274991
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 1:0.17-39
 - added patch to prevent a rare loop in the client
 



From fedora-extras-commits at redhat.com  Thu Sep 20 09:21:45 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Thu, 20 Sep 2007 05:21:45 -0400
Subject: rpms/mrtg/devel filter-provides-mrtg.sh, NONE, 1.1 mrtg.spec, 1.38,
	1.39
Message-ID: <200709200921.l8K9LjYO003698@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3679

Modified Files:
	mrtg.spec 
Added Files:
	filter-provides-mrtg.sh 
Log Message:
Fix bad provides


--- NEW FILE filter-provides-mrtg.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'


Index: mrtg.spec
===================================================================
RCS file: /cvs/extras/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mrtg.spec	23 Aug 2007 11:32:06 -0000	1.38
+++ mrtg.spec	20 Sep 2007 09:21:13 -0000	1.39
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.15.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg
@@ -14,6 +14,7 @@
 Source3:   filter-requires-mrtg.sh
 Source4:   mrtg.crond.in
 Source5:   mrtg-httpd.conf
+Source6:   filter-provides-mrtg.sh
 Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
 License:   GPL+
@@ -26,6 +27,7 @@
 BuildRequires: gd-devel, libpng-devel
 
 %define __find_requires %{SOURCE3}
+%define __find_provides %{SOURCE6}
 
 %description
 The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
@@ -115,6 +117,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Thu Sep 20 2007 Vitezslav Crhonek <vcrhonek at redhat.com> 2.15.1-5
+- Fix bad provides
+
 * Thu Aug 23 2007 Vitezslav Crhonek <vcrhonek at redhat.com> 2.15.1-4
 - fix license
 - rebuild



From fedora-extras-commits at redhat.com  Thu Sep 20 09:28:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Thu, 20 Sep 2007 05:28:53 -0400
Subject: fedora-security/audit fc7,1.112,1.113
Message-ID: <200709200928.l8K9Srtb004066@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4025

Modified Files:
	fc7 
Log Message:
Libsndfile got a CVE
add balsa



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc7	20 Sep 2007 08:53:35 -0000	1.112
+++ fc7	20 Sep 2007 09:28:51 -0000	1.113
@@ -8,9 +8,10 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
-GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
+GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
+CVE-2007-4974 VULNERABLE (libsndfile) #296221
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8



From fedora-extras-commits at redhat.com  Thu Sep 20 09:55:08 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 05:55:08 -0400
Subject: rpms/pstoedit/devel pstoedit-3.45-quiet.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 pstoedit.spec, 1.6, 1.7 sources, 1.2,
	1.3 pstoedit-3.44-quiet.patch, 1.1, NONE
Message-ID: <200709200955.l8K9t8VV004602@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pstoedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4523

Modified Files:
	.cvsignore pstoedit.spec sources 
Added Files:
	pstoedit-3.45-quiet.patch 
Removed Files:
	pstoedit-3.44-quiet.patch 
Log Message:
- Update to new upstream 3.45, bugfix release
- Updated quiet patch for 3.45


pstoedit-3.45-quiet.patch:

--- NEW FILE pstoedit-3.45-quiet.patch ---
--- pstoedit-3.45/src/pstoedit.cpp.orig	2007-07-22 13:27:38.000000000 +0200
+++ pstoedit-3.45/src/pstoedit.cpp	2007-09-20 11:08:32.000000000 +0200
@@ -352,14 +352,16 @@
 	#endif
 #endif
 
+	const unsigned int remaining = options.parseoptions(errstream,argc,argv);
+
+	if (!options.quiet) {
 	errstream << "pstoedit: version " << version << " / DLL interface " <<
 		drvbaseVersion << " (build " << __DATE__ << " - " << buildtype << " - " << compversion << ")" 
 		" : Copyright (C) 1993 - 2007 Wolfgang Glunz\n";
+	}
 	// int arg = 1;
 	drvbase::SetVerbose( false );	// init
 
-
-	const unsigned int remaining = options.parseoptions(errstream,argc,argv);
 	//  handling of derived parameters
 	drvbase::SetVerbose(options.verbose);
 	closerObject.fromgui = (bool) options.fromgui;
--- pstoedit-3.45/src/pstoeditoptions.h.orig	2007-09-20 11:07:14.000000000 +0200
+++ pstoedit-3.45/src/pstoeditoptions.h	2007-09-20 11:06:49.000000000 +0200
@@ -156,6 +156,7 @@
 
 	Option < bool, BoolTrueExtractor > splitpages ;//= false;
 	Option < bool, BoolTrueExtractor > verbose ;//= false;
+	Option < bool, BoolTrueExtractor > quiet ;//= false;
 	Option < bool, BoolTrueExtractor > useBBfrominput; //= false;
 	Option < bool, BoolTrueExtractor > simulateSubPaths ;//= false;
 	Option < RSString, RSStringValueExtractor> unmappablecharstring ;//= 0;
@@ -333,6 +334,9 @@
 		"Switch on verbose mode. Some additional information is shown "
 		"during processing. ",
 		false),
+	quiet				(true, "-quiet",noArgument,b_t,"turns on quiet mode", 
+		"Switch on quiet mode. Version information is not shown. ",
+		false),
 	useBBfrominput		(true, "-usebbfrominput",noArgument,g_t,"extract BoundingBox from input file rather than determining it during processing", 
 		"If specified, pstoedit uses the BoundingBox as is (hopefully) found in the input file instead of one that is calculated by its own. ",
 		false),
@@ -573,6 +577,7 @@
 
 	ADD(splitpages);
 	ADD(verbose );
+	ADD(quiet);
 	ADD(useBBfrominput);
 	ADD(simulateSubPaths);
 	ADD(unmappablecharstring);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2006 15:31:09 -0000	1.2
+++ .cvsignore	20 Sep 2007 09:54:36 -0000	1.3
@@ -1 +1 @@
-pstoedit-3.44.tar.gz
+pstoedit-3.45.tar.gz


Index: pstoedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pstoedit.spec	20 Aug 2007 14:35:15 -0000	1.6
+++ pstoedit.spec	20 Sep 2007 09:54:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pstoedit
-Version:        3.44
-Release:        7%{?dist}
+Version:        3.45
+Release:        1%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -8,7 +8,7 @@
 URL:            http://www.pstoedit.net/
 Source0:        http://download.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz
 Patch0:		pstoedit-3.44-cxxflags.patch
-Patch1:		pstoedit-3.44-quiet.patch
+Patch1:		pstoedit-3.45-quiet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	ghostscript
 BuildRequires:	gd-devel
@@ -86,6 +86,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 3.45-1
+- Update to new upstream 3.45, bugfix release
+- Updated quiet patch for 3.45
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 3.44-7
 - License tag update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2006 15:31:09 -0000	1.2
+++ sources	20 Sep 2007 09:54:36 -0000	1.3
@@ -1 +1 @@
-13f24cb070da3f6af82ed84f4e53f049  pstoedit-3.44.tar.gz
+071efc64d9edf5d942b407348ac7451d  pstoedit-3.45.tar.gz


--- pstoedit-3.44-quiet.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 10:30:59 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 20 Sep 2007 06:30:59 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.5, 1.6 ocaml-libvirt.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200709201030.l8KAUxtv011293@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11258/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
- New upstream release 0.3.2.7.
- Ship the upstream ChangeLog file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2007 17:24:16 -0000	1.5
+++ .cvsignore	20 Sep 2007 10:30:27 -0000	1.6
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.6.tar.gz
+ocaml-libvirt-0.3.2.7.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-libvirt.spec	6 Sep 2007 17:27:10 -0000	1.5
+++ ocaml-libvirt.spec	20 Sep 2007 10:30:27 -0000	1.6
@@ -8,8 +8,8 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.6
-Release:        2%{?dist}
+Version:        0.3.2.7
+Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -155,7 +155,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB README
+%doc COPYING.LIB README ChangeLog
 %{_libdir}/ocaml/libvirt
 %if %opt
 %exclude %{_libdir}/ocaml/libvirt/*.a
@@ -169,7 +169,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LIB README TODO.libvirt html/*
+%doc COPYING.LIB README TODO.libvirt ChangeLog html/*
 %if %opt
 %{_libdir}/ocaml/libvirt/*.a
 %{_libdir}/ocaml/libvirt/*.cmxa
@@ -181,7 +181,7 @@
 %if %build_mlvirsh
 %files -n mlvirsh
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README ChangeLog
 %{_bindir}/mlvirsh
 %endif
 
@@ -189,7 +189,7 @@
 %if %build_mlvirtmanager
 %files -n mlvirtmanager
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README ChangeLog
 %{_bindir}/mlvirtmanager
 %endif
 
@@ -197,13 +197,17 @@
 %if %build_virt_top
 %files -n virt-top
 %defattr(-,root,root,-)
-%doc COPYING README TODO.virt-top
+%doc COPYING README TODO.virt-top ChangeLog
 %{_bindir}/virt-top
 %{_mandir}/man1/*.1.gz
 %endif
 
 
 %changelog
+* Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
+- New upstream release 0.3.2.7.
+- Ship the upstream ChangeLog file.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
 - Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
   scripts.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2007 17:24:16 -0000	1.5
+++ sources	20 Sep 2007 10:30:27 -0000	1.6
@@ -1 +1 @@
-9e58cf2cb88d0db8e50915e147054e52  ocaml-libvirt-0.3.2.6.tar.gz
+0124c74d23767dc3b4dffefaae9995e9  ocaml-libvirt-0.3.2.7.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 10:39:48 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 06:39:48 -0400
Subject: rpms/libsndfile/devel libsndfile.spec,1.13,1.14
Message-ID: <200709201039.l8KAdm1V011540@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11514

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221



Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 10:39:15 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch.bz2
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 10:44:20 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 06:44:20 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.7, 1.8 libxml++.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200709201044.l8KAiKfP011709@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Update to new 2.20 stable branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2007 14:51:48 -0000	1.7
+++ .cvsignore	20 Sep 2007 10:43:45 -0000	1.8
@@ -1 +1 @@
-libxml++-2.18.2.tar.bz2
+libxml++-2.20.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libxml++.spec	16 Aug 2007 15:08:34 -0000	1.18
+++ libxml++.spec	20 Sep 2007 10:43:45 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libxml++
-Version:        2.18.2
-Release:        2%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new 2.20 stable branch
+
 * Thu Aug 16 2007 Denis Leroy <denis at poolshark.org> - 2.18.2-2
 - Update to upstream 2.18.2 (mem leak fix)
 - Fixed License tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2007 14:51:48 -0000	1.7
+++ sources	20 Sep 2007 10:43:45 -0000	1.8
@@ -1 +1 @@
-11ea24cad96b4465816e9a4eb2b0e2d2  libxml++-2.18.2.tar.bz2
+4fe6ae1344e523ea4756733be71f9af3  libxml++-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 11:04:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 07:04:56 -0400
Subject: rpms/xulrunner/devel mozilla-firefox-head.ppc64.patch, NONE,
	1.1 xulrunner.spec, 1.16, 1.17
Message-ID: <200709201104.l8KB4uhG018298@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18272

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-firefox-head.ppc64.patch 
Log Message:
* Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
- removed conflicts with the current gecko-based apps
- added updated ppc64 patch



mozilla-firefox-head.ppc64.patch:

--- NEW FILE mozilla-firefox-head.ppc64.patch ---
Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v
retrieving revision 1.92
diff -u -B -u -p -r1.92 Makefile.in
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in	14 Dec 2006 19:13:43 -0000	1.92
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	29 Jan 2007 17:49:54 -0000
@@ -275,6 +275,15 @@ AS		:= $(CC) -c -x assembler-with-cpp
 endif
 
 #
+# Linux/PPC64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
+CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+AS             := $(CC) -c -x assembler-with-cpp
+endif
+
+#
 # NetBSD/PPC
 #
 ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp,v
retrieving revision 1.3
diff -u -B -u -p -r1.3 xptcinvoke_ppc_netbsd.cpp
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	18 Apr 2004 14:18:18 -0000	1.3
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	29 Jan 2007 17:49:55 -0000
@@ -44,7 +44,7 @@
 // indepenpent call to the platform ABI. To do that,
 // XPTC_InvokeByIndex() has to determine the method to call via vtable
 // access. The parameters for the method are read from the
-// nsXPTCVariant* and prepared for th native ABI.  For the Linux/PPC
+// nsXPTCVariant* and prepared for the native ABI.  For the Linux/PPC
 // ABI this means that the first 8 integral and floating point
 // parameters are passed in registers.
 
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,164 @@
+## ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ #
+ # The Initial Developer of the Original Code is
+ # dwmw2 at infradead.org (David Woodhouse).
+ # Portions created by the Initial Developer are Copyright (C) 2006
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+ #
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 2 or later (the "GPL"), or
+ # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ # in which case the provisions of the GPL or the LGPL are applicable instead
+ # of those above. If you wish to allow use of your version of this file only
+ # under the terms of either the GPL or the LGPL, and not to allow others to
+ # use your version of this file under the terms of the MPL, indicate your
+ # decision by deleting the provisions above and replace them with the notice
+ # and other provisions required by the GPL or the LGPL. If you do not delete
+ # the provisions above, a recipient may use your version of this file under
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+
+.set r0,0; .set r1,1; .set r2,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+
+#
+# NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+#                  PRUint32 paramCount, nsXPTCVariant* params)
+#
+
+        .section ".toc","aw"
+        .section ".text"
+        .align 2
+        .globl  NS_InvokeByIndex
+        .section ".opd","aw"
+        .align 3
+NS_InvokeByIndex:
+        .quad   .NS_InvokeByIndex,.TOC. at tocbase
+        .previous
+        .type   NS_InvokeByIndex, at function
+.NS_InvokeByIndex:
+        mflr    0
+        std     0,16(r1)
+
+        std     r29,-24(r1)
+        std     r30,-16(r1)
+        std     r31,-8(r1)
+
+        mr      r29,r3                  # Save 'that' in r29
+        mr      r30,r4                  # Save 'methodIndex' in r30
+        mr      r31,r1                  # Save old frame
+
+        # Allocate stack frame with space for params. Since at least the
+        # first 7 parameters (not including 'that') will be in registers,
+        # we don't actually need stack space for those. We must ensure
+        # that the stack remains 16-byte aligned.
+        #
+        #  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
+        #  |               |(params)........| regs | regs  | regs |
+        # (r1)...........(+112)....(+128)
+        #                               (-23*8).(-16*8).(-3*8)..(r31)
+
+        # +stack frame, -unused stack params, +regs storage, +1 for alignment
+        addi    r7,r5,((112/8)-7+7+13+3+1)
+        rldicr  r7,r7,3,59              # multiply by 8 and mask with ~15
+        neg     r7,r7
+        stdux   r1,r1,r7
+
+
+        # Call invoke_copy_to_stack(PRUint64* gpregs, double* fpregs,
+        #                           PRUint32 paramCount, nsXPTCVariant* s, 
+        #                           PRUint64* d))
+
+        # r5, r6 are passed through intact (paramCount, params)
+        # r7 (d) has to be r1+112 -- where parameters are passed on the stack.
+        # r3, r4 are above that, easier to address from r31 than from r1
+
+        subi    r3,r31,(23*8)           # r3 --> GPRS
+        subi    r4,r31,(16*8)           # r4 --> FPRS
+        addi    r7,r1,112               # r7 --> params
+        bl      invoke_copy_to_stack
+        nop
+
+        # Set up to invoke function
+
+        ld      r9,0(r29)               # vtable (r29 is 'that')
+        mr      r3,r29                  # self is first arg, obviously
+
+        sldi    r30,r30,3               # Find function descriptor 
+        add     r9,r9,r30
+        ld      r9,0(r9)
+
+        ld      r0,0(r9)                # Actual address from fd.
+        std     r2,40(r1)               # Save r2 (TOC pointer)
+
+        mtctr   0
+        ld      r11,16(r9)              # Environment pointer from fd.
+        ld      r2,8(r9)                # TOC pointer from fd.
+
+        # Load FP and GP registers as required
+        ld      r4, -(23*8)(r31) 
+        ld      r5, -(22*8)(r31) 
+        ld      r6, -(21*8)(r31) 
+        ld      r7, -(20*8)(r31) 
+        ld      r8, -(19*8)(r31) 
+        ld      r9, -(18*8)(r31) 
+        ld      r10, -(17*8)(r31) 
+
+        lfd     f1, -(16*8)(r31)
+        lfd     f2, -(15*8)(r31)
+        lfd     f3, -(14*8)(r31)
+        lfd     f4, -(13*8)(r31)
+        lfd     f5, -(12*8)(r31)
+        lfd     f6, -(11*8)(r31)
+        lfd     f7, -(10*8)(r31)
+        lfd     f8, -(9*8)(r31)
+        lfd     f9, -(8*8)(r31)
+        lfd     f10, -(7*8)(r31)
+        lfd     f11, -(6*8)(r31)
+        lfd     f12, -(5*8)(r31)
+        lfd     f13, -(4*8)(r31)
+
+        bctrl                           # Do it
+
+        ld      r2,40(r1)               # Load our own TOC pointer
+        ld      r1,0(r1)                # Revert stack frame
+        ld      0,16(r1)                # Reload lr
+        ld      29,-24(r1)              # Restore NVGPRS
+        ld      30,-16(r1)
+        ld      31,-8(r1)
+        mtlr    0
+        blr
+
+        .size   NS_InvokeByIndex,.-.NS_InvokeByIndex
+
+        # Magic indicating no need for an executable stack
+        .section .note.GNU-stack, "", @progbits ; .previous
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,131 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2 at infradead.org (David Woodhouse)
+ *   Franz.Sirl-kernel at lauterbach.com (Franz Sirl)
+ *   beard at netscape.com (Patrick Beard)
+ *   waterson at netscape.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Platform specific code to invoke XPCOM methods on native objects
+
+// The purpose of NS_InvokeByIndex() is to map a platform
+// independent call to the platform ABI. To do that,
+// NS_InvokeByIndex() has to determine the method to call via vtable
+// access. The parameters for the method are read from the
+// nsXPTCVariant* and prepared for the native ABI.
+
+// The PowerPC64 platform ABI can be found here:
+// http://www.freestandards.org/spec/ELF/ppc64/
+// and in particular:
+// http://www.freestandards.org/spec/ELF/ppc64/PPC-elf64abi-1.9.html#FUNC-CALL
+
+#include <stdio.h>
+#include "xptcprivate.h"
+
+// 8 integral parameters are passed in registers, not including 'that'
+#define GPR_COUNT     7
+
+// 8 floating point parameters are passed in registers, floats are
+// promoted to doubles when passed in registers
+#define FPR_COUNT     13
+
+extern "C" PRUint32
+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+{
+    return PRUint32(((paramCount * 2) + 3) & ~3);
+}
+
+extern "C" void
+invoke_copy_to_stack(PRUint64* gpregs,
+                     double* fpregs,
+                     PRUint32 paramCount,
+                     nsXPTCVariant* s, 
+                     PRUint64* d)
+{
+    PRUint64 tempu64;
+
+    for(uint32 i = 0; i < paramCount; i++, s++) {
+        if(s->IsPtrData())
+            tempu64 = (PRUint64) s->ptr;
+        else {
+            switch(s->type) {
+            case nsXPTType::T_FLOAT:                                  break;
+            case nsXPTType::T_DOUBLE:                                 break;
+            case nsXPTType::T_I8:     tempu64 = s->val.i8;            break;
+            case nsXPTType::T_I16:    tempu64 = s->val.i16;           break;
+            case nsXPTType::T_I32:    tempu64 = s->val.i32;           break;
+            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
+            case nsXPTType::T_U8:     tempu64 = s->val.u8;            break;
+            case nsXPTType::T_U16:    tempu64 = s->val.u16;           break;
+            case nsXPTType::T_U32:    tempu64 = s->val.u32;           break;
+            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
+            case nsXPTType::T_BOOL:   tempu64 = s->val.b;             break;
+            case nsXPTType::T_CHAR:   tempu64 = s->val.c;             break;
+            case nsXPTType::T_WCHAR:  tempu64 = s->val.wc;            break;
+            default:                  tempu64 = (PRUint64) s->val.p;  break;
+            }
+        }
+
+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                fpregs[i]    = s->val.d;
+            else
+                *(double *)d = s->val.d;
+        }
+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT) {
+                fpregs[i]   = s->val.f; // if passed in registers, floats are promoted to doubles
+            } else {
+                float *p = (float *)d;
+                p++;
+                *p = s->val.f;
+            }
+        }
+        else {
+            if (i < GPR_COUNT)
+                gpregs[i] = tempu64;
+            else
+                *d = tempu64;
+        }
+        if (i >= 7)
+            d++;
+    }
+}
+
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                 PRUint32 paramCount, nsXPTCVariant* params);
+
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,113 @@
+## ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ #
+ # The Initial Developer of the Original Code is
+ # dwmw2 at infradead.org (David Woodhouse).
+ # Portions created by the Initial Developer are Copyright (C) 2006
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+ #
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 2 or later (the "GPL"), or
+ # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ # in which case the provisions of the GPL or the LGPL are applicable instead
+ # of those above. If you wish to allow use of your version of this file only
+ # under the terms of either the GPL or the LGPL, and not to allow others to
+ # use your version of this file under the terms of the MPL, indicate your
+ # decision by deleting the provisions above and replace them with the notice
+ # and other provisions required by the GPL or the LGPL. If you do not delete
+ # the provisions above, a recipient may use your version of this file under
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+
+.set r0,0; .set r1,1; .set RTOC,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+        .section ".text"
+        .align 2
+        .globl SharedStub
+        .section ".opd","aw"
+        .align 3
+
+SharedStub:
+        .quad   .SharedStub,.TOC. at tocbase
+        .previous
+        .type   SharedStub, at function
+
+.SharedStub:
+        mflr    r0
+
+        std     r4, -56(r1)                     # Save all GPRS
+        std     r5, -48(r1)
+        std     r6, -40(r1)
+        std     r7, -32(r1)
+        std     r8, -24(r1)
+        std     r9, -16(r1)
+        std     r10, -8(r1)
+
+        stfd    f13, -64(r1)                    # ... and FPRS
+        stfd    f12, -72(r1)
+        stfd    f11, -80(r1)
+        stfd    f10, -88(r1)
+        stfd    f9, -96(r1)
+        stfd    f8, -104(r1)
+        stfd    f7, -112(r1)
+        stfd    f6, -120(r1)
+        stfd    f5, -128(r1)
+        stfd    f4, -136(r1)
+        stfd    f3, -144(r1)
+        stfd    f2, -152(r1)
+        stfd    f1, -160(r1)
+
+        subi    r6,r1,56                        # r6 --> gprData
+        subi    r7,r1,160                       # r7 --> fprData
+        addi    r5,r1,112                       # r5 --> extra stack args
+
+        std     r0, 16(r1)
+	
+        stdu    r1,-288(r1)
+                                                # r3 has the 'self' pointer
+                                                # already
+
+        mr      r4,r11                          # r4 is methodIndex selector,
+                                                # passed via r11 in the
+                                                # nsNSStubBase::StubXX() call
+
+        bl      PrepareAndDispatch
+        nop
+
+        ld      1,0(r1)                         # restore stack
+        ld      r0,16(r1)                       # restore LR
+        mtlr    r0
+        blr
+
+        .size   SharedStub,.-.SharedStub
+
+        # Magic indicating no need for an executable stack
+        .section .note.GNU-stack, "", @progbits ; .previous
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,245 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2 at infradead.org (David Woodhouse)
+ *   Franz.Sirl-kernel at lauterbach.com (Franz Sirl)
+ *   beard at netscape.com (Patrick Beard)
+ *   waterson at netscape.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Implement shared vtbl methods.
+
+#include "xptcprivate.h"
+#include "xptiprivate.h"
+
+// The Linux/PPC64 ABI passes the first 8 integral
+// parameters and the first 13 floating point parameters in registers
+// (r3-r10 and f1-f13), no stack space is allocated for these by the
+// caller.  The rest of the parameters are passed in the caller's stack
+// area. The stack pointer has to retain 16-byte alignment.
+
+// The PowerPC64 platform ABI can be found here:
+// http://www.freestandards.org/spec/ELF/ppc64/
+// and in particular:
+// http://www.freestandards.org/spec/ELF/ppc64/PPC-elf64abi-1.9.html#FUNC-CALL
+
+#define PARAM_BUFFER_COUNT      16
+#define GPR_COUNT                7
+#define FPR_COUNT               13
+
+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
+//
+// - 'args[]' contains the arguments passed on stack
+// - 'gprData[]' contains the arguments passed in integer registers
+// - 'fprData[]' contains the arguments passed in floating point registers
+// 
+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
+// and then the method gets called.
+#include <stdio.h>
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self,
+                   PRUint64 methodIndex,
+                   PRUint64* args,
+                   PRUint64 *gprData,
+                   double *fprData)
+{
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    const nsXPTMethodInfo* info;
+    PRUint32 paramCount;
+    PRUint32 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self,"no self");
+
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no method info");
+    if (! info)
+        return NS_ERROR_UNEXPECTED;
+
+    paramCount = info->GetParamCount();
+
+    // setup variant array pointer
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+
+    NS_ASSERTION(dispatchParams,"no place for params");
+    if (! dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    PRUint64* ap = args;
+    PRUint64 tempu64;
+
+    for(i = 0; i < paramCount; i++) {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+	
+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                dp->val.d = fprData[i];
+            else
+                dp->val.d = *(double*) ap;
+        } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT)
+                dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
+            else {
+                float *p = (float *)ap;
+                p++;
+                dp->val.f = *p;
+            }
+        } else { /* integer type or pointer */
+            if (i < GPR_COUNT)
+                tempu64 = gprData[i];
+            else
+                tempu64 = *ap;
+
+            if (param.IsOut() || !type.IsArithmetic())
+                dp->val.p = (void*) tempu64;
+            else if (type ==nsXPTType::T_I8)
+                dp->val.i8  = (PRInt8)   tempu64;
+            else if (type ==nsXPTType::T_I16)
+                dp->val.i16 = (PRInt16)  tempu64;
+            else if (type ==nsXPTType::T_I32)
+                dp->val.i32 = (PRInt32)  tempu64;
+            else if (type ==nsXPTType::T_I64)
+                dp->val.i64 = (PRInt64)  tempu64;
+            else if (type ==nsXPTType::T_U8)
+                dp->val.u8  = (PRUint8)  tempu64;
+            else if (type ==nsXPTType::T_U16)
+                dp->val.u16 = (PRUint16) tempu64;
+            else if (type ==nsXPTType::T_U32)
+                dp->val.u32 = (PRUint32) tempu64;
+            else if (type ==nsXPTType::T_U64)
+                dp->val.u64 = (PRUint64) tempu64;
+            else if (type ==nsXPTType::T_BOOL)
+                dp->val.b   = (PRBool)   tempu64;
+            else if (type ==nsXPTType::T_CHAR)
+                dp->val.c   = (char)     tempu64;
+            else if (type ==nsXPTType::T_WCHAR)
+                dp->val.wc  = (wchar_t)  tempu64;
+            else
+                NS_ASSERTION(0, "bad type");
+        }
+
+        if (i >= 7)
+            ap++;
+    }
+
+    result = self->mOuter->CallMethod((PRUint16) methodIndex, info,
+                                      dispatchParams);
+
+    if (dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+// Load r11 with the constant 'n' and branch to SharedStub().
+//
+// XXX Yes, it's ugly that we're relying on gcc's name-mangling here;
+// however, it's quick, dirty, and'll break when the ABI changes on
+// us, which is what we want ;-).
+
+#if __GXX_ABI_VERSION < 100
+#error Prehistoric GCC not supported here
+#else
+// gcc-3 version
+//
+// As G++3 ABI contains the length of the functionname in the mangled
+// name, it is difficult to get a generic assembler mechanism like
+// in the G++ 2.95 case.
+// Create names would be like:
+// _ZN14nsXPTCStubBase5Stub1Ev
+// _ZN14nsXPTCStubBase6Stub12Ev
+// _ZN14nsXPTCStubBase7Stub123Ev
+// _ZN14nsXPTCStubBase8Stub1234Ev
+// etc.
+// Use assembler directives to get the names right...
+
+# define STUB_ENTRY(n)                                                  \
+__asm__ (                                                               \
+        ".section \".toc\",\"aw\" \n\t"                                 \
+        ".section \".text\" \n\t"                                       \
+        ".align 2 \n\t"                                                 \
+        ".if "#n" < 10 \n\t"                                            \
+        ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase5Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase5Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".elseif "#n" < 100 \n\t"                                       \
+        ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase6Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase6Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".elseif "#n" < 1000 \n\t"                                      \
+        ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase7Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase7Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".else  \n\t"                                                   \
+        ".err   \"stub number "#n" >= 1000 not yet supported\"\n"       \
+        ".endif \n\t"                                                   \
+                                                                        \
+        "li     11,"#n" \n\t"                                           \
+        "b      SharedStub \n"                                          \
+);
+#endif
+
+#define SENTINEL_ENTRY(n)                                               \
+nsresult nsXPTCStubBase::Sentinel##n()                                  \
+{                                                                       \
+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called");                  \
+    return NS_ERROR_NOT_IMPLEMENTED;                                    \
+}
+
+#include "xptcstubsdef.inc"


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xulrunner.spec	18 Sep 2007 17:22:52 -0000	1.16
+++ xulrunner.spec	20 Sep 2007 11:04:21 -0000	1.17
@@ -7,12 +7,12 @@
 
 %define official_branding 0
 
-ExcludeArch: ppc64 ppc
+#ExcludeArch: ppc64 ppc
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.2%{?dist}
+Release:        0.alpha7.3%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -45,7 +45,8 @@
 # font system fixes
 
 # Other
-Patch104:       firefox-1.5-ppc64.patch
+#Patch104:       firefox-1.5-ppc64.patch
+Patch105:       mozilla-firefox-head.ppc64.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -84,8 +85,8 @@
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 Requires:       system-bookmarks
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
-Obsoletes:      mozilla <= 37:1.7.13
-Obsoletes:      firefox < 2.1
+#Obsoletes:      mozilla <= 37:1.7.13
+#Obsoletes:      firefox < 2.1
 Provides:       webclient
 Provides:       gecko-libs = %{version}
 
@@ -104,8 +105,8 @@
 %package devel
 Summary: Development files for Gecko
 Group: Development/Libraries
-Obsoletes: mozilla-devel
-Obsoletes: firefox-devel < 2.1
+#Obsoletes: mozilla-devel
+#Obsoletes: firefox-devel < 2.1
 Requires: xulrunner = %{version}-%{release}
 Requires: nspr-devel >= %{nspr_version}
 Requires: nss-devel >= %{nss_version}
@@ -123,7 +124,8 @@
 %patch2   -R -p1 -b .camellia256
 %patch3   -p1
 
-%patch104 -p1 -b .ppc64
+#%patch104 -p1 -b .ppc64
+%patch105 -p0 -b .ppc64
 
 # For branding specific patches.
 
@@ -237,17 +239,17 @@
 %endif
 
 # GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
-%define gre_conf_file gre64.conf
-%else
-%define gre_conf_file gre.conf
-%endif
-
-%{__mkdir_p} $RPM_BUILD_ROOT/etc/gre.d/
-%{__cat} > $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} << EOF
-[%{version}]
-GRE_PATH=${MOZ_APP_DIR}
-EOF
+#%ifarch x86_64 ia64 ppc64 s390x
+#%define gre_conf_file gre64.conf
+#%else
+#%define gre_conf_file gre.conf
+#%endif
+
+#%{__mkdir_p} $RPM_BUILD_ROOT/etc/gre.d/
+#%{__cat} > $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} << EOF
+#[%{version}]
+#GRE_PATH=${MOZ_APP_DIR}
+#EOF
 
 GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
 %{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
@@ -287,8 +289,8 @@
 %exclude %{_bindir}/xulrunner-config
 %{_mandir}/man1/*
 %{_libdir}/mozilla
-%dir /etc/gre.d
-/etc/gre.d/%{gre_conf_file}
+#%dir /etc/gre.d
+#/etc/gre.d/%{gre_conf_file}
 
 %dir %{_libdir}/%{name}-*
 %{_libdir}/%{name}-*/LICENSE
@@ -338,6 +340,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
+- removed conflicts with the current gecko-based apps
+- added updated ppc64 patch
+
 * Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
 - build fixes
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:08:03 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 20 Sep 2007 07:08:03 -0400
Subject: rpms/bind/devel .cvsignore, 1.33, 1.34 bind-9.3.1rc1-sdb.patch, 1.5,
	1.6 bind-chroot-admin.in, 1.25, 1.26 bind.spec, 1.215,
	1.216 sources, 1.42, 1.43
Message-ID: <200709201108.l8KB832Z018603@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566

Modified Files:
	.cvsignore bind-9.3.1rc1-sdb.patch bind-chroot-admin.in 
	bind.spec sources 
Log Message:
- build with O2
- removed "autotools" patch
- bugfixing in bind-chroot-admin (#279901)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	28 Aug 2007 17:55:41 -0000	1.33
+++ .cvsignore	20 Sep 2007 11:07:30 -0000	1.34
@@ -2,4 +2,3 @@
 bind-chroot.tar.bz2
 config.tar
 libbind-man.tar.gz
-bind-9.5.0a6-2.autotools.tar.bz2

bind-9.3.1rc1-sdb.patch:

Index: bind-9.3.1rc1-sdb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.1rc1-sdb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-9.3.1rc1-sdb.patch	23 Jul 2007 17:55:02 -0000	1.5
+++ bind-9.3.1rc1-sdb.patch	20 Sep 2007 11:07:30 -0000	1.6
@@ -1,5 +1,5 @@
---- bind-9.4.0/configure.ac.sdb	2007-03-06 12:59:32.000000000 +0100
-+++ bind-9.4.0/configure.ac	2007-03-06 12:59:32.000000000 +0100
+--- bind-9.4.0/configure.in.sdb	2007-03-06 12:59:32.000000000 +0100
++++ bind-9.4.0/configure.in	2007-03-06 12:59:32.000000000 +0100
 @@ -2478,6 +2478,7 @@
  	bin/tests/system/tkey/Makefile
  	bin/tests/headerdep_test.sh


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bind-chroot-admin.in	20 Jul 2007 12:53:34 -0000	1.25
+++ bind-chroot-admin.in	20 Sep 2007 11:07:30 -0000	1.26
@@ -217,10 +217,10 @@
     changed=`/bin/mktemp /tmp/XXXXXX`;
     rm -f $changed
     if [ $ENABLED -eq 0 ] ; then # chroot is enabled
-	/usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}}  -maxdepth 0 -type f |
+	/usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}} /var/log/named.log  -maxdepth 0 -type f |
 	while read f;
         do
-	    replace_with_link ${BIND_CHROOT_PREFIX}/$f $f;
+	    replace_with_link ${BIND_CHROOT_PREFIX}$f $f;
 	    [ ! -e $changed ] && touch $changed;
 	done;
 	/usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave  -maxdepth 0 -type l 2>/dev/null |
@@ -228,7 +228,6 @@
 	do
 	    /bin/rm -f $f >/dev/null 2>&1;
 	done
-	ln -sf ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
 	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 |
@@ -254,9 +253,12 @@
     chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
     chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
     chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
+    chown -h named:named /var/log/named.log >/dev/null 2>&1;
+    chown -h named:named ${BIND_CHROOT_PREFIX}/var/log/named.log >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
+    chmod 660 ${pfx}/var/log/named.log >/dev/null 2>&1;
     chown -h named:named /var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1;
     chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves,dynamic} >/dev/null 2>&1;
@@ -264,18 +266,11 @@
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
-	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
-	      /usr/bin/restorecon ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
-	   fi;		
+	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
-	   /sbin/restorecon /var/named{/,/*} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/{slaves,data,dynamic}{/,/*} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
-	   /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/named.ca >/dev/null 2>&1;
+	   /sbin/restorecon -R /var/named   >/dev/null 2>&1;
 	fi;
 	/sbin/service named try-restart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- bind.spec	6 Sep 2007 11:36:13 -0000	1.215
+++ bind.spec	20 Sep 2007 11:07:30 -0000	1.216
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	12.%{RELEASEVER}%{?dist}
+Release: 	12.4.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +47,6 @@
 Source24:	libbind.pc
 Source25:	named.conf.sample
 Source28:	config.tar
-Source29:	bind-%{version}%{RELEASEVER}-2.autotools.tar.bz2
 Source30:	ldap2zone.c
 
 # Common patches
@@ -185,9 +184,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{RELEASEVER}
 
-tar -xvf %{SOURCE29}
-patch -p1 -b < patch
-
 # Common patches
 %patch -p1 -b .varrun
 %patch1 -p1 -b .key
@@ -254,7 +250,7 @@
 
 
 %build
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
@@ -312,6 +308,7 @@
 mkdir -p ${RPM_BUILD_ROOT}/var/named/dynamic
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
 mkdir -p ${RPM_BUILD_ROOT}/var/run/named
+mkdir -p ${RPM_BUILD_ROOT}/var/log
 #chroot
 mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}
 tar --no-same-owner -jxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix}
@@ -384,7 +381,8 @@
 # /usr/lib/rpm/brp-compress
 #
 # Ghost config files:
-touch ${RPM_BUILD_ROOT}/etc/named.conf
+touch ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
+touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 # configuration files:
 tar -C ${RPM_BUILD_ROOT} -xf %{SOURCE28}
 for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
@@ -512,6 +510,7 @@
 %dir %{_localstatedir}/named/data
 %dir %{_localstatedir}/named/dynamic
 %dir %{_localstatedir}/run/named
+%ghost %{_localstatedir}/log/named.log
 %defattr(0754,root,root,0750)
 %config %{_sysconfdir}/rc.d/init.d/named
 %defattr(0640,root,named,0750)
@@ -646,6 +645,11 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.4.a6
+- build with O2
+- removed "autotools" patch
+- bugfixing in bind-chroot-admin (#279901)
+
 * Thu Sep 06 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.a6
 - bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
   obsoleted by upstream bind-9.5-_res_errno.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	23 Aug 2007 12:57:57 -0000	1.42
+++ sources	20 Sep 2007 11:07:30 -0000	1.43
@@ -2,4 +2,3 @@
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 bdea8168751a29e61525f11e8195ad48  config.tar
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
-ae1b6fde3133a8dad425e0ec9dc6d576  bind-9.5.0a6-2.autotools.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 11:24:28 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:24:28 -0400
Subject: rpms/libsndfile/devel libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.14, 1.15
Message-ID: <200709201124.l8KBOSeT019112@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsndfile.spec	20 Sep 2007 10:39:15 -0000	1.14
+++ libsndfile.spec	20 Sep 2007 11:23:55 -0000	1.15
@@ -6,7 +6,7 @@
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
-Patch0:         libsndfile-1.0.17+flac-1.1.3.patch.bz2
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
 Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:28:29 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:28:29 -0400
Subject: rpms/libsndfile/F-7 libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.13, 1.14
Message-ID: <200709201128.l8KBSTFR019293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19256

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/F-7/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 11:27:56 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:38:35 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:38:35 -0400
Subject: rpms/libsndfile/FC-6 libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.13, 1.14
Message-ID: <200709201138.l8KBcZwG019515@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19491

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/FC-6/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 11:38:03 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:52:52 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:52:52 -0400
Subject: rpms/php-extras/devel dead.package,NONE,1.1
Message-ID: <200709201152.l8KBqq3O019729@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19722

Added Files:
	dead.package 
Log Message:



--- NEW FILE dead.package ---
Merged with the main PHP package



From fedora-extras-commits at redhat.com  Thu Sep 20 11:53:25 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:53:25 -0400
Subject: rpms/php-extras/F-7 dead.package,NONE,1.1
Message-ID: <200709201153.l8KBrPWW019757@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19750

Added Files:
	dead.package 
Log Message:



--- NEW FILE dead.package ---
Merged with the main PHP package



From fedora-extras-commits at redhat.com  Thu Sep 20 11:55:32 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:55:32 -0400
Subject: rpms/php-extras/devel .cvsignore, 1.6, NONE Makefile, 1.1,
	NONE php-extras.spec, 1.10, NONE sources, 1.6, NONE
Message-ID: <200709201155.l8KBtWZ7019856@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849

Removed Files:
	.cvsignore Makefile php-extras.spec sources 
Log Message:



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- php-extras.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 11:56:35 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:56:35 -0400
Subject: rpms/php-extras/F-7 .cvsignore, 1.6, NONE Makefile, 1.1, NONE branch,
	1.1, NONE php-extras.spec, 1.10, NONE sources, 1.6, NONE
Message-ID: <200709201156.l8KBuZFK019931@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924

Removed Files:
	.cvsignore Makefile branch php-extras.spec sources 
Log Message:



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- php-extras.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 12:27:44 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 08:27:44 -0400
Subject: rpms/udev/devel
	0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch,
	NONE, 1.1 0002-rules-fix-two-trivial-typos.patch, NONE,
	1.1 0003-rules-random-and-urandom-are-0666.patch, NONE,
	1.1 0004-rules-add-REMOVE_CMD-rule.patch, NONE,
	1.1 0005-track-move-events-to-rename-database-and-failed-fi.patch,
	NONE, 1.1 0006-rules-Gentoo-update.patch, NONE,
	1.1 0007-rules-add-i2o-driver-rule.patch, NONE,
	1.1 0008-man-recreate-man-pages.patch, NONE,
	1.1 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch,
	NONE, 1.1 0010-rules-Gentoo-update.patch, NONE,
	1.1 0011-add-name-substitution.patch, NONE,
	1.1 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch,
	NONE, 1.1 0013-print-warning-for-invalid-TEST-operations.patch, NONE, 
	1.1 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch, NONE,
	1.1 0015-rules-remove-broken-nvram-group-assignment-without.patch,
	NONE, 1.1 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch, 
	NONE, 1.1 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch,
	NONE, 1.1 0018-correct-includes-in-udev_selinux.c.patch, NONE,
	1.1 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch, NONE,
	1.1 0020-path_id-fix-for-stacked-class-devices.patch, NONE,
	1.1 0021-check-line-length-after-comment-check-and-whitespace.patch, 
	NONE, 1.1 0022-only-install-.rules.patch, NONE,
	1.1 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch, 
	NONE, 1.1 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch,
	NONE, 1.1 0025-rules-add-memstick-module-loading.patch, NONE,
	1.1 0026-Removed-extra-space-from-udevinfo-symlink-output.patch,
	NONE, 1.1 Makefile.git, NONE, 1.1 start_udev, 1.64,
	1.65 udev.spec, 1.219, 1.220 udev-115-git-20070907.patch, 1.1,
	NONE udev-115-looplast.patch, 1.1,
	NONE udev-115-rulesinstall.patch, 1.1, NONE
Message-ID: <200709201227.l8KCRixL026590@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26457

Modified Files:
	start_udev udev.spec 
Added Files:
	0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch 
	0002-rules-fix-two-trivial-typos.patch 
	0003-rules-random-and-urandom-are-0666.patch 
	0004-rules-add-REMOVE_CMD-rule.patch 
	0005-track-move-events-to-rename-database-and-failed-fi.patch 
	0006-rules-Gentoo-update.patch 
	0007-rules-add-i2o-driver-rule.patch 
	0008-man-recreate-man-pages.patch 
	0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch 
	0010-rules-Gentoo-update.patch 
	0011-add-name-substitution.patch 
	0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch 
	0013-print-warning-for-invalid-TEST-operations.patch 
	0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch 
	0015-rules-remove-broken-nvram-group-assignment-without.patch 
	0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch 
	0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch 
	0018-correct-includes-in-udev_selinux.c.patch 
	0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch 
	0020-path_id-fix-for-stacked-class-devices.patch 
	0021-check-line-length-after-comment-check-and-whitespace.patch 
	0022-only-install-.rules.patch 
	0023-ignore-device-node-names-while-restoring-symlinks-fr.patch 
	0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch 
	0025-rules-add-memstick-module-loading.patch 
	0026-Removed-extra-space-from-udevinfo-symlink-output.patch 
	Makefile.git 
Removed Files:
	udev-115-git-20070907.patch udev-115-looplast.patch 
	udev-115-rulesinstall.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
- some upstream fixes from git
- removed last_rule for loop rules
- added "udevinfo udevtrace" kernel command line options for better debugging


0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch:

--- NEW FILE 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch ---
>From 1f7a36f2c0953c60a8d7acadc281285a0b84fb46 Mon Sep 17 00:00:00 2001
From: Michael Morony <michael.morony at gmail.com>
Date: Fri, 24 Aug 2007 08:14:21 +0200
Subject: [PATCH] set buffer size if strlcpy/strlcat indicate truncation

---
 udev_rules.c  |    4 +++-
 udev_sysfs.c  |    2 ++
 udevinfo.c    |    2 ++
 udevmonitor.c |    4 ----
 udevtrigger.c |    2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 0dcbf15..35db958 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -475,10 +475,12 @@ static int pass_env_to_socket(const char *sockname, const char *devpath, const c
 
 	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
 	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
 		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
 		bufpos++;
 	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
 
 	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
 	if (count < 0)
diff --git a/udev_sysfs.c b/udev_sysfs.c
index 34ae9ac..d5b04c3 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -355,6 +355,8 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
 
 	dbg("open '%s'/'%s'", devpath, attr_name);
 	sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+	if(sysfs_len >= sizeof(path_full))
+		sysfs_len = sizeof(path_full) - 1;
 	path = &path_full[sysfs_len];
 	strlcat(path_full, devpath, sizeof(path_full));
 	strlcat(path_full, "/", sizeof(path_full));
diff --git a/udevinfo.c b/udevinfo.c
index d0b1c44..be9aa76 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -79,6 +79,8 @@ static void print_all_attributes(const char *devpath, const char *key)
 			if (attr_value == NULL)
 				continue;
 			len = strlcpy(value, attr_value, sizeof(value));
+			if(len >= sizeof(value))
+				len = sizeof(value) - 1;
 			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
 			/* remove trailing newlines */
diff --git a/udevmonitor.c b/udevmonitor.c
index a9cc061..644a955 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -43,7 +43,6 @@ static int init_udev_monitor_socket(void)
 {
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
-	const int feature_on = 1;
 	int retval;
 
 	memset(&saddr, 0x00, sizeof(saddr));
@@ -67,9 +66,6 @@ static int init_udev_monitor_socket(void)
 		return -1;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
 	return 0;
 }
 
diff --git a/udevtrigger.c b/udevtrigger.c
index cf8f209..309c54a 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -435,6 +435,8 @@ static void scan_failed(void)
 				continue;
 
 			start = strlcpy(device, sysfs_path, sizeof(device));
+			if(start >= sizeof(device))
+				start = sizeof(device) - 1;
 			strlcat(device, dent->d_name, sizeof(device));
 			path_decode(&device[start]);
 			device_list_insert(device);
-- 
1.5.2.4


0002-rules-fix-two-trivial-typos.patch:

--- NEW FILE 0002-rules-fix-two-trivial-typos.patch ---
>From d98c6dfebc2186b841c92eeb002c03938f28cdc6 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 24 Aug 2007 20:34:44 +0200
Subject: [PATCH] rules: fix two trivial typos

Thanks to: Alexander E. Patrakov <patrakov at ums.usu.ru>
---
 etc/udev/rules.d/50-udev-default.rules |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index bff2fe5..b3c0cfc 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -58,7 +58,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{
 KERNEL=="parport[0-9]*",	GROUP="lp"
 SUBSYSTEM=="printer",		KERNEL=="lp*", GROUP="lp"
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*",		GROUP="lp" SYMLINK+="par%n"
+KERNEL=="lp[0-9]*",		GROUP="lp", SYMLINK+="par%n"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
 
 # block, tapes, block-releated
@@ -71,7 +71,7 @@ KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
 KERNEL=="sch[0-9]*",		GROUP="disk"
 KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk""
+KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
-- 
1.5.2.4


0003-rules-random-and-urandom-are-0666.patch:

--- NEW FILE 0003-rules-random-and-urandom-are-0666.patch ---
>From b6e4b08dc14444790c1560108e93a67e57e1148b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sat, 25 Aug 2007 14:07:02 +0200
Subject: [PATCH] rules: random and urandom are 0666

Thanks to: Alexander E. Patrakov <patrakov at ums.usu.ru>.
---
 etc/udev/rules.d/50-udev-default.rules |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index b3c0cfc..f869f51 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -17,18 +17,16 @@ KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # mem
-KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
 KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
-KERNEL=="urandom",		MODE="0644"
-KERNEL=="full",			MODE="0666"
 
 # input
 KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0600"
 KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644", SYMLINK+="%k"
 
 # video4linux
-- 
1.5.2.4


0004-rules-add-REMOVE_CMD-rule.patch:

--- NEW FILE 0004-rules-add-REMOVE_CMD-rule.patch ---
>From 3f781cab37dbee76340c65602555a524ffea96f9 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 00:48:49 +0200
Subject: [PATCH] rules: add REMOVE_CMD rule

---
 etc/udev/rules.d/95-udev-late.rules |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/95-udev-late.rules b/etc/udev/rules.d/95-udev-late.rules
index 1755d08..4a015b9 100644
--- a/etc/udev/rules.d/95-udev-late.rules
+++ b/etc/udev/rules.d/95-udev-late.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"
 
-- 
1.5.2.4


0005-track-move-events-to-rename-database-and-failed-fi.patch:

--- NEW FILE 0005-track-move-events-to-rename-database-and-failed-fi.patch ---
>From a2f2270eef499f6f60075a149011e3e3851ab5ef Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 05:22:35 +0200
Subject: [PATCH] track "move" events to rename database and failed files

---
 udev.h        |    2 ++
 udev_db.c     |   10 ++++++++++
 udev_device.c |    4 ++++
 udevd.c       |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 udevd.h       |    1 +
 5 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/udev.h b/udev.h
index f13eb83..33b39aa 100644
--- a/udev.h
+++ b/udev.h
@@ -69,6 +69,7 @@ struct udevice {
 	struct sysfs_device dev_local;
 	struct sysfs_device *dev_parent;	/* current parent device used for matching */
 	char action[NAME_SIZE];
+	char *devpath_old;
 
 	/* node */
 	char name[PATH_SIZE];
@@ -131,6 +132,7 @@ extern int udev_node_remove(struct udevice *udev);
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
+extern int udev_db_rename(const char *devpath_old, const char *devpath);
 extern int udev_db_get_device(struct udevice *udev, const char *devpath);
 extern int udev_db_get_devices_by_name(const char *name, struct list_head *name_list);
 extern int udev_db_get_all_entries(struct list_head *name_list);
diff --git a/udev_db.c b/udev_db.c
index abc1e5a..29aa031 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -117,6 +117,16 @@ out:
 	return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+	char filename[PATH_SIZE];
+	char filename_old[PATH_SIZE];
+
+	devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+	devpath_to_db_path(devpath, filename, sizeof(filename));
+	return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
diff --git a/udev_device.c b/udev_device.c
index 23ba313..2b7ffe0 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -168,6 +168,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
diff --git a/udevd.c b/udevd.c
index 8f56de6..3c46617 100644
--- a/udevd.c
+++ b/udevd.c
@@ -130,6 +130,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
 	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+	udev->devpath_old = msg->devpath_old;
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -156,14 +157,14 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	struct udevd_uevent_msg *loop_msg;
 	int fd;
 
-	/* add location of queue files */
+	/* location of queue file */
 	strlcpy(filename, udev_root, sizeof(filename));
 	strlcat(filename, "/", sizeof(filename));
 	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
 	strlcat(filename, msg->devpath, sizeof(filename));
 	path_encode(&filename[start], sizeof(filename) - start);
 
-	/* add location of failed files */
+	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
@@ -174,6 +175,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	case EVENT_QUEUED:
 		unlink(filename_failed);
 		delete_path(filename_failed);
+
 		create_path(filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
@@ -181,10 +183,25 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		return;
 	case EVENT_FINISHED:
 	case EVENT_FAILED:
-		unlink(filename_failed);
-		delete_path(filename_failed);
+		if (msg->devpath_old != NULL) {
+			/* "move" event - rename failed file to current name, do not delete failed */
+			char filename_failed_old[PATH_SIZE];
+
+			strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+			strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+			start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+			strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+			path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+			if (rename(filename_failed_old, filename_failed) == 0)
+				info("renamed devpath, moved failed state of '%s' to %s'",
+				     msg->devpath_old, msg->devpath);
+		} else {
+			unlink(filename_failed);
+			delete_path(filename_failed);
+		}
 
-		/* don't remove, if events for the same path are still pending */
+		/* skip if events for the same path are still pending */
 		list_for_each_entry(loop_msg, &running_list, node)
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
@@ -193,7 +210,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
 
-		/* move failed events to the failed directory */
+		/* move failed event to the failed directory */
 		if (state == EVENT_FAILED) {
 			create_path(filename_failed);
 			rename(filename, filename_failed);
@@ -201,7 +218,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			unlink(filename);
 		}
 
-		/* clean up the queue directory */
+		/* clean up possibly empty queue directory */
 		delete_path(filename);
 
 		return;
@@ -212,7 +229,7 @@ static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
 	list_del(&msg->node);
 
-	/* mark as failed, if add event returns non-zero */
+	/* mark as failed, if "add" event returns non-zero */
 	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
 		export_event_state(msg, EVENT_FAILED);
 	else
@@ -280,6 +297,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
+	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
@@ -469,11 +487,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 		if (loop_msg->seqnum >= msg->seqnum)
 			break;
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still pending %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -481,7 +504,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still pending %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 
@@ -492,11 +515,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			return 1;
 		}
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still running %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -504,7 +532,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still running %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 	return 0;
@@ -588,6 +616,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
+		else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+			msg->devpath_old = &key[12];
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
 			msg->physdevpath = &key[12];
 		else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
diff --git a/udevd.h b/udevd.h
index 4ca6d1d..9be34cb 100644
--- a/udevd.h
+++ b/udevd.h
@@ -66,6 +66,7 @@ struct udevd_uevent_msg {
 	char *driver;
 	dev_t devt;
 	unsigned long long seqnum;
+	char *devpath_old;
 	char *physdevpath;
 	unsigned int timeout;
 	char *envp[UEVENT_NUM_ENVP+1];
-- 
1.5.2.4


0006-rules-Gentoo-update.patch:

--- NEW FILE 0006-rules-Gentoo-update.patch ---
>From 2bf0a506bc13abc5632079232bee6f8784934633 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 13:54:32 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/05-udev-early.rules |    7 ++--
 etc/udev/gentoo/50-udev.rules       |    8 +----
 etc/udev/gentoo/80-drivers.rules    |   44 ++++++++++++++++++++++++++++
 etc/udev/gentoo/80-hotplug.rules    |   54 -----------------------------------
 etc/udev/gentoo/90-network.rules    |    8 +++++
 etc/udev/gentoo/95-udev-late.rules  |   18 -----------
 6 files changed, 57 insertions(+), 82 deletions(-)
 create mode 100644 etc/udev/gentoo/80-drivers.rules
 delete mode 100644 etc/udev/gentoo/80-hotplug.rules
 create mode 100644 etc/udev/gentoo/90-network.rules
 delete mode 100644 etc/udev/gentoo/95-udev-late.rules

diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
index ee349dc..fc15e2b 100644
--- a/etc/udev/gentoo/05-udev-early.rules
+++ b/etc/udev/gentoo/05-udev-early.rules
@@ -1,9 +1,8 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
-SUBSYSTEM=="module",	OPTIONS="ignore_device"
+# do not edit this file, it will be overwritten on update
 
 # sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index dd32971..9e06029 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -1,13 +1,9 @@
+# do not edit this file, it will be overwritten on update
+
 # /etc/udev/rules/50-udev.rules:  device naming rules for udev
 #
 # Gentoo specific rules
 #
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
 
 # Net devices can have arbitrary names, even
 # ones set by the user. Not try to match normal
diff --git a/etc/udev/gentoo/80-drivers.rules b/etc/udev/gentoo/80-drivers.rules
new file mode 100644
index 0000000..df6c880
--- /dev/null
+++ b/etc/udev/gentoo/80-drivers.rules
@@ -0,0 +1,44 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="drivers_end"
+
+# check if the device has already been claimed by a driver
+ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="drivers_end"
+
+# this driver is broken and should not be loaded automatically
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="drivers_end"
+
+# Autoload modules that lack aliases but have them defined in autoload modules
+ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
+
+# /etc/modprobe.conf.
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
+# needed aliases are defined in /etc/modprobe.d/pnp-aliases
+
+
+SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
+SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
+SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
+SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
+SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
+
+# Load driver for scsi-device
+SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+LABEL="hotplug_scsi_end"
+
+LABEL="drivers_end"
+
diff --git a/etc/udev/gentoo/80-hotplug.rules b/etc/udev/gentoo/80-hotplug.rules
deleted file mode 100644
index 0637dbc..0000000
--- a/etc/udev/gentoo/80-hotplug.rules
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/udev/rules/80-hotplug.rules:  module loading rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Module autoloading
-ACTION!="add", GOTO="hotplug_load_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="hotplug_load_end"
-
diff --git a/etc/udev/gentoo/90-network.rules b/etc/udev/gentoo/90-network.rules
new file mode 100644
index 0000000..50903af
--- /dev/null
+++ b/etc/udev/gentoo/90-network.rules
@@ -0,0 +1,8 @@
+# do not edit this file, it will be overwritten on update
+
+# /etc/udev/rules/90-network.rules:  triggering network init-scripts
+
+# Activate our network if we can
+SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
+SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
+
diff --git a/etc/udev/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
deleted file mode 100644
index 40ada28..0000000
--- a/etc/udev/gentoo/95-udev-late.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/udev/rules/95-udev-late.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
-# event to be catched by udevmonitor
-RUN+="socket:/org/kernel/udev/monitor"
-
-- 
1.5.2.4


0007-rules-add-i2o-driver-rule.patch:

--- NEW FILE 0007-rules-add-i2o-driver-rule.patch ---
>From 79ef8431c952349d9f31c899adb579c3ff83a80b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 28 Aug 2007 04:16:54 +0200
Subject: [PATCH] rules: add i2o driver rule

---
 etc/udev/rules.d/80-drivers.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index e71f135..3388266 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -7,6 +7,7 @@ SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 
-- 
1.5.2.4


0008-man-recreate-man-pages.patch:

--- NEW FILE 0008-man-recreate-man-pages.patch ---
>From dbb2c414d77362a9279f4fc50458054f71ffb7e2 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 28 Aug 2007 04:24:08 +0200
Subject: [PATCH] man: recreate man pages

---
 extras/volume_id/vol_id.8 |   28 ++++----
 udev.7                    |  182 ++++++++++++++++++++++-----------------------
 udevd.8                   |   38 +++++-----
 udevinfo.8                |   28 ++++----
 udevmonitor.8             |   16 ++--
 udevsettle.8              |   12 ++--
 udevstart.8               |    8 +-
 udevtest.8                |    8 +-
 udevtrigger.8             |   28 ++++----
 9 files changed, 172 insertions(+), 176 deletions(-)

diff --git a/extras/volume_id/vol_id.8 b/extras/volume_id/vol_id.8
index 7594253..daa583b 100644
--- a/extras/volume_id/vol_id.8
+++ b/extras/volume_id/vol_id.8
@@ -1,6 +1,6 @@
 .\"     Title: vol_id
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: vol_id
 .\"    Source: volume_id
@@ -11,69 +11,69 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-vol_id \- probe filesystem type and read label and uuid
+vol_id - probe filesystem type and read label and uuid
 .SH "SYNOPSIS"
 .HP 7
 \fBvol_id\fR [\fB\-\-export\fR] [\fB\-\-type\fR] [\fB\-\-label\fR] [\fB\-\-label\-raw\fR] [\fB\-\-uuid\fR] [\fB\-\-skip\-raid\fR] [\fB\-\-probe\-all\fR] [\fB\-\-help\fR] [\fIdevice\fR]
 .SH "DESCRIPTION"
 .PP
 \fBvol_id\fR
-is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem.
+is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume\. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem\.
 .SH "OPTIONS"
 .PP
 \fB\-\-export\fR
 .RS 4
-Print all values in key/value format to import them into the environment.
+Print all values in key/value format to import them into the environment\.
 .RE
 .PP
 \fB\-\-type\fR
 .RS 4
-Print the filesystem type.
+Print the filesystem type\.
 .RE
 .PP
 \fB\-\-label\fR
 .RS 4
-Print the safe version of volume label suitable for use as filename.
+Print the safe version of volume label suitable for use as filename\.
 .RE
 .PP
 \fB\-\-label\-raw\fR
 .RS 4
-Print the raw volume label.
+Print the raw volume label\.
 .RE
 .PP
 \fB\-\-uuid\fR
 .RS 4
-Print the uuid of a volume.
+Print the uuid of a volume\.
 .RE
 .PP
 \fB\-\-skip\-raid\fR
 .RS 4
-Skip detection of raid metadata.
+Skip detection of raid metadata\.
 .RE
 .PP
 \fB\-\-probe\-all\fR
 .RS 4
-Probe for all types and print all matches.
+Probe for all types and print all matches\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Set the syslog priority.
+Set the syslog priority\.
 .RE
 .SH "EXIT STATUS"
 .PP
 \fBvol_id\fR
-will only return successful if the value asked for is not empty. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored.
+will only return successful if the value asked for is not empty\. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored\.
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udev.7 b/udev.7
index 821a476..5f0ebb9 100644
--- a/udev.7
+++ b/udev.7
@@ -1,6 +1,6 @@
 .\"     Title: udev
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udev
 .\"    Source: udev
@@ -11,213 +11,213 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udev \- dynamic device management
+udev - dynamic device management
 .SH "DESCRIPTION"
 .PP
-udev provides a dynamic device directory containing only the files for actually present devices. It creates or removes device node files in the
+udev provides a dynamic device directory containing only the files for actually present devices\. It creates or removes device node files in the
 \fI/dev\fR
-directory, or it renames network interfaces.
+directory, or it renames network interfaces\.
 .PP
 Usually udev runs as
 \fBudevd\fR(8)
-and receives uevents directly from the kernel if a device is added or removed from the system.
+and receives uevents directly from the kernel if a device is added or removed from the system\.
 .PP
-If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling.
+If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device\. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling\.
 .SH "CONFIGURATION"
 .PP
 All udev configuration files are placed in
-\fI/etc/udev/*\fR. Every file consists of a set of lines of text. All empty lines or lines beginning with '#' will be ignored.
+\fI/etc/udev/*\fR\. Every file consists of a set of lines of text\. All empty lines or lines beginning with \'#\' will be ignored\.
 .SS "Configuration file"
 .PP
 udev expects its main configuration file at
-\fI/etc/udev/udev.conf\fR. It consists of a set of variables allowing the user to override default udev values. The following variables can be set:
+\fI/etc/udev/udev\.conf\fR\. It consists of a set of variables allowing the user to override default udev values\. The following variables can be set:
 .PP
 \fBudev_root\fR
 .RS 4
-Specifies where to place the device nodes in the filesystem. The default value is
-\fI/dev\fR.
+Specifies where to place the device nodes in the filesystem\. The default value is
+\fI/dev\fR\.
 .RE
 .PP
 \fBudev_rules\fR
 .RS 4
 The name of the udev rules file or directory to look for files with the suffix
-\fI.rules\fR. Multiple rule files are read in lexical order. The default value is
-\fI/etc/udev/rules.d\fR.
+\fI\.rules\fR\. Multiple rule files are read in lexical order\. The default value is
+\fI/etc/udev/rules\.d\fR\.
 .RE
 .PP
 \fBudev_log\fR
 .RS 4
-The logging priority. Valid values are the numerical syslog priorities or their textual representations:
+The logging priority\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .SS "Rules files"
 .PP
 The udev rules are read from the files located in the
-\fI/etc/udev/rules.d\fR
-directory or at the location specified value in the configuration file. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned.
+\fI/etc/udev/rules\.d\fR
+directory or at the location specified value in the configuration file\. Every line in the rules file contains at least one key value pair\. There are two kind of keys, match and assignment keys\. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned\.
 .PP
-A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling. If no matching rule is found, the default device node name is used.
+A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling\. If no matching rule is found, the default device node name is used\.
 .PP
-A rule may consist of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are:
+A rule may consist of a list of one or more key value pairs separated by a comma\. Each key has a distinct operation, depending on the used operator\. Valid operators are:
 .PP
 \fB==\fR
 .RS 4
-Compare for equality.
+Compare for equality\.
 .RE
 .PP
 \fB!=\fR
 .RS 4
-Compare for non\-equality.
+Compare for non\-equality\.
 .RE
 .PP
 \fB=\fR
 .RS 4
-Assign a value to a key. Keys that represent a list, are reset and only this single value is assigned.
+Assign a value to a key\. Keys that represent a list, are reset and only this single value is assigned\.
 .RE
 .PP
 \fB+=\fR
 .RS 4
-Add the value to a key that holds a list of entries.
+Add the value to a key that holds a list of entries\.
 .RE
 .PP
 \fB:=\fR
 .RS 4
-Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules.
+Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules\.
 .RE
 .PP
-The following key names can be used to match against device properties. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device.
+The following key names can be used to match against device properties\. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event\. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device\.
 .PP
 \fBACTION\fR
 .RS 4
-Match the name of the event action.
+Match the name of the event action\.
 .RE
 .PP
 \fBDEVPATH\fR
 .RS 4
-Match the devpath of the event device.
+Match the devpath of the event device\.
 .RE
 .PP
 \fBKERNEL\fR
 .RS 4
-Match the name of the event device.
+Match the name of the event device\.
 .RE
 .PP
 \fBSUBSYSTEM\fR
 .RS 4
-Match the subsystem of the event device.
+Match the subsystem of the event device\.
 .RE
 .PP
 \fBDRIVER\fR
 .RS 4
-Match the driver name of the event device. Only set for devices which are bound to a driver at the time the event is generated.
+Match the driver name of the event device\. Only set for devices which are bound to a driver at the time the event is generated\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Match sysfs attribute values of the event device. Up to five
+Match sysfs attribute values of the event device\. Up to five
 \fBATTR\fR
-keys can be specified per rule. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself. Depending on the type of operator, this key is also used to set the value of a sysfs attribute.
+keys can be specified per rule\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\. Depending on the type of operator, this key is also used to set the value of a sysfs attribute\.
 .RE
 .PP
 \fBKERNELS\fR
 .RS 4
-Search the devpath upwards for a matching device name.
+Search the devpath upwards for a matching device name\.
 .RE
 .PP
 \fBSUBSYSTEMS\fR
 .RS 4
-Search the devpath upwards for a matching device subsystem name.
+Search the devpath upwards for a matching device subsystem name\.
 .RE
 .PP
 \fBDRIVERS\fR
 .RS 4
-Search the devpath upwards for a matching device driver name.
+Search the devpath upwards for a matching device driver name\.
 .RE
 .PP
 \fBATTRS{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Search the devpath upwards for a device with matching sysfs attribute values. Up to five
+Search the devpath upwards for a device with matching sysfs attribute values\. Up to five
 \fBATTRS\fR
-keys can be specified per rule, but all of them must match on the same device. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself.
+keys can be specified per rule, but all of them must match on the same device\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Match against the value of an environment variable. Up to five
+Match against the value of an environment variable\. Up to five
 \fBENV\fR
-keys can be specified per rule. Depending on the type of operator, this key is also used to export a variable to the environment.
+keys can be specified per rule\. Depending on the type of operator, this key is also used to export a variable to the environment\.
 .RE
 .PP
 \fBTEST{\fR\fB\fIoctal mode mask\fR\fR\fB}\fR
 .RS 4
-Test the existence of a file. An octal mode mask can be specified if needed.
+Test the existence of a file\. An octal mode mask can be specified if needed\.
 .RE
 .PP
 \fBPROGRAM\fR
 .RS 4
-Execute external program. The key is true, if the program returns with exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout, is available in the RESULT key.
+Execute external program\. The key is true, if the program returns with exit code zero\. The whole event environment is available to the executed program\. The program\'s output printed to stdout, is available in the RESULT key\.
 .RE
 .PP
 \fBRESULT\fR
 .RS 4
-Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call.
+Match the returned string of the last PROGRAM call\. This key can be used in the same or in any later rule after a PROGRAM call\.
 .RE
 .PP
-Most of the fields support a shell style pattern matching. The following pattern characters are supported:
+Most of the fields support a shell style pattern matching\. The following pattern characters are supported:
 .PP
 \fB*\fR
 .RS 4
-Matches zero, or any number of characters.
+Matches zero, or any number of characters\.
 .RE
 .PP
 \fB?\fR
 .RS 4
-Matches any single character.
+Matches any single character\.
 .RE
 .PP
 \fB[]\fR
 .RS 4
-Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched.
+Matches any single character specified within the brackets\. For example, the pattern string \'tty[SR]\' would match either \'ttyS\' or \'ttyR\'\. Ranges are also supported within this match with the \'\-\' character\. For example, to match on the range of all digits, the pattern [0\-9] would be used\. If the first character following the \'[\' is a \'!\', any characters not enclosed are matched\.
 .RE
 .PP
 The following keys can get values assigned:
 .PP
 \fBNAME\fR
 .RS 4
-The name of the node to be created, or the name the network interface should be renamed to. Only one rule can set the node name, all later rules with a NAME key will be ignored.
+The name of the node to be created, or the name the network interface should be renamed to\. Only one rule can set the node name, all later rules with a NAME key will be ignored\.
 .RE
 .PP
 \fBSYMLINK\fR
 .RS 4
-The name of a symlink targeting the node. Every matching rule can add this value to the list of symlinks to be created along with the device node. Multiple symlinks may be specified by separating the names by the space character.
+The name of a symlink targeting the node\. Every matching rule can add this value to the list of symlinks to be created along with the device node\. Multiple symlinks may be specified by separating the names by the space character\.
 .RE
 .PP
 \fBOWNER, GROUP, MODE\fR
 .RS 4
-The permissions for the device node. Every specified value overwrites the compiled\-in default value.
+The permissions for the device node\. Every specified value overwrites the compiled\-in default value\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value that should be written to a sysfs attribute of the event device. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute.
+The value that should be written to a sysfs attribute of the event device\. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Export a variable to the environment. Depending on the type of operator, this key is also to match against an environment variable.
+Export a variable to the environment\. Depending on the type of operator, this key is also to match against an environment variable\.
 .RE
 .PP
 \fBRUN\fR
 .RS 4
-Add a program to the list of programs to be executed for a specific device. This can only be used for very short running tasks. Running an event process for a long period of time may block all further events for this or a dependent device. Long running tasks need to be immediately detached from the event process itself.
+Add a program to the list of programs to be executed for a specific device\. This can only be used for very short running tasks\. Running an event process for a long period of time may block all further events for this or a dependent device\. Long running tasks need to be immediately detached from the event process itself\.
 .RE
 .PP
 \fBLABEL\fR
 .RS 4
-Named label where a GOTO can jump to.
+Named label where a GOTO can jump to\.
 .RE
 .PP
 \fBGOTO\fR
@@ -229,72 +229,68 @@ Jumps to the next LABEL with a matching name
 .RS 4
 Import a set of variables into the event environment, depending on
 \fItype\fR:
-.RS 4
 .PP
 \fBprogram\fR
 .RS 4
-Execute an external program specified as the assigned value and import its output, which must be in environment key format.
+Execute an external program specified as the assigned value and import its output, which must be in environment key format\.
 .RE
 .PP
 \fBfile\fR
 .RS 4
-Import a text file specified as the assigned value, which must be in environment key format.
+Import a text file specified as the assigned value, which must be in environment key format\.
 .RE
 .PP
 \fBparent\fR
 .RS 4
-Import the stored keys from the parent device by reading the database entry of the parent device. The value assigned to
+Import the stored keys from the parent device by reading the database entry of the parent device\. The value assigned to
 \fBIMPORT{parent}\fR
-is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons).
-.RE
+is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons)\.
 .RE
-.IP "" 4
+.sp
 If no option is given, udev will choose between
 \fBprogram\fR
 and
 \fBfile\fR
-based on the executable bit of the file permissions.
+based on the executable bit of the file permissions\.
 .RE
 .PP
 \fBWAIT_FOR_SYSFS\fR
 .RS 4
-Wait for the specified sysfs file of the device to be created. Can be used to fight against kernel sysfs timing issues.
+Wait for the specified sysfs file of the device to be created\. Can be used to fight against kernel sysfs timing issues\.
 .RE
 .PP
 \fBOPTIONS\fR
 .RS 4
 Rule and device options:
-.RS 4
 .PP
 \fBlast_rule\fR
 .RS 4
-Stops further rules application. No later rules will have any effect.
+Stops further rules application\. No later rules will have any effect\.
 .RE
 .PP
 \fBignore_device\fR
 .RS 4
-Ignore this event completely.
+Ignore this event completely\.
 .RE
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device. This may be useful as a workaround for broken device drivers.
+Ignore any later remove event for this device\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Specify the priority of the created symlinks. Devices with higher priorities overwrite existing symlinks of other devices.
+Specify the priority of the created symlinks\. Devices with higher priorities overwrite existing symlinks of other devices\.
 .RE
 .PP
 \fBall_partitions\fR
 .RS 4
-Create the device nodes for all available partitions of a block device. This may be useful for removable media devices where media changes are not detected.
+Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
 .RE
 .PP
 \fBstring_escape=\fR\fB\fInone|replace\fR\fR
 .RS 4
-Usually control and other possibly unsafe characters are replaced in strings used for device naming. The mode of replacement can be specified with this option.
-.RE
+Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
 .RE
 .RE
 .PP
@@ -306,23 +302,23 @@ The
 \fBGROUP\fR
 and
 \fBRUN\fR
-fields support simple printf\-like string substitutions. The
+fields support simple printf\-like string substitutions\. The
 \fBRUN\fR
-format chars gets applied after all rules have been processed, right before the program is executed. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are:
+format chars gets applied after all rules have been processed, right before the program is executed\. It allows the use of the complete environment set by earlier matching rules\. For all other fields, substitutions are applied while the individual rule is being processed\. The available substitutions are:
 .PP
 \fB$kernel\fR, \fB%k\fR
 .RS 4
-The kernel name for this device.
+The kernel name for this device\.
 .RE
 .PP
 \fB$number\fR, \fB%n\fR
 .RS 4
-The kernel number for this device. For example, 'sda3' has kernel number of '3'
+The kernel number for this device\. For example, \'sda3\' has kernel number of \'3\'
 .RE
 .PP
 \fB$devpath\fR, \fB%p\fR
 .RS 4
-The devpath of the device.
+The devpath of the device\.
 .RE
 .PP
 \fB$id\fR, \fB%b\fR
@@ -332,7 +328,7 @@ The name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$driver\fR, \fB%d\fR
@@ -342,75 +338,75 @@ The driver name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 .RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute. If the attribute is a symlink, the last element of the symlink target is returned as the value.
+The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
 .RE
 .PP
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value of an environment variable.
+The value of an environment variable\.
 .RE
 .PP
 \fB$major\fR, \fB%M\fR
 .RS 4
-The kernel major number for the device.
+The kernel major number for the device\.
 .RE
 .PP
 \fB$minor\fR, \fB%m\fR
 .RS 4
-The kernel minor number for the device.
+The kernel minor number for the device\.
 .RE
 .PP
 \fB$result\fR, \fB%c\fR
 .RS 4
-The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
-\fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted:
+The string returned by the external program requested with PROGRAM\. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
+\fB%c{N}\fR\. If the number is followed by the \'+\' char this part plus all remaining parts of the result string are substituted:
 \fB%c{N+}\fR
 .RE
 .PP
 \fB$parent\fR, \fB%P\fR
 .RS 4
-The node name of the parent device.
+The node name of the parent device\.
 .RE
 .PP
 \fB$root\fR, \fB%r\fR
 .RS 4
-The udev_root value.
+The udev_root value\.
 .RE
 .PP
 \fB$sys\fR, \fB%S\fR
 .RS 4
-The sysfs mount point.
+The sysfs mount point\.
 .RE
 .PP
 \fB$tempnode\fR, \fB%N\fR
 .RS 4
-The name of a created temporary device node to provide access to the device from a external program before the real node is created.
+The name of a created temporary device node to provide access to the device from a external program before the real node is created\.
 .RE
 .PP
 \fB%%\fR
 .RS 4
-The '%' character itself.
+The \'%\' character itself\.
 .RE
 .PP
 \fB$$\fR
 .RS 4
-The '$' character itself.
+The \'$\' character itself\.
 .RE
 .PP
-The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute
+The count of characters to be substituted may be limited by specifying the format length value\. For example, \'%3s{file}\' will only insert the first three characters of the sysfs attribute
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>
+<greg at kroah\.com>
 and Kay Sievers
-<kay.sievers at vrfy.org>. With much help from Dan Stekloff
-<dsteklof at us.ibm.com>
-and many others.
+<kay\.sievers at vrfy\.org>\. With much help from Dan Stekloff
+<dsteklof at us\.ibm\.com>
+and many others\.
 .SH "SEE ALSO"
 .PP
 \fBudevd\fR(8),
diff --git a/udevd.8 b/udevd.8
index 25996d1..46edde4 100644
--- a/udevd.8
+++ b/udevd.8
@@ -1,6 +1,6 @@
 .\"     Title: udevd
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevd, udevcontrol
 .\"    Source: udev
@@ -11,7 +11,7 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevd \- event managing daemon
+udevd - event managing daemon
 .SH "SYNOPSIS"
 .HP 6
 \fBudevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\-trace\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
@@ -19,87 +19,87 @@ udevd \- event managing daemon
 \fBudevcontrol \fR\fB\fIcommand\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevd listens to kernel uevents and passes the incoming events to udev. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling.
+udevd listens to kernel uevents and passes the incoming events to udev\. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling\.
 .SH "OPTIONS"
 .PP
 \fB\-\-daemon\fR
 .RS 4
-Detach and run in the background.
+Detach and run in the background\.
 .RE
 .PP
 \fB\-\-debug\-trace\fR
 .RS 4
-Run all events completely serialized. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel.
+Run all events completely serialized\. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel\.
 .RE
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print log messages to stdout.
+Print log messages to stdout\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version number.
+Print version number\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .PP
 \fBlog_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set the internal log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
+Set the internal log level of udevd\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .PP
 \fBstop_exec_queue\fR
 .RS 4
-Signal udevd to stop executing new events. Incoming events will be queued.
+Signal udevd to stop executing new events\. Incoming events will be queued\.
 .RE
 .PP
 \fBstart_exec_queue\fR
 .RS 4
-Signal udevd to enable the execution of events.
+Signal udevd to enable the execution of events\.
 .RE
 .PP
 \fBreload_rules\fR
 .RS 4
-Signal udevd to reload the rules from the config.
+Signal udevd to reload the rules from the config\.
 .RE
 .PP
 \fBenv \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set global variable.
+Set global variable\.
 .RE
 .PP
 \fBmax_childs\fR
 .RS 4
-Set the maximum number of events, udevd will handle at the same time.
+Set the maximum number of events, udevd will handle at the same time\.
 .RE
 .PP
 \fBmax_childs_running\fR
 .RS 4
-Set the maximum number of events, which are allowed to run at the same time.
+Set the maximum number of events, which are allowed to run at the same time\.
 .RE
 .PP
 \fBhelp\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevinfo.8 b/udevinfo.8
index 337f206..6115f29 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -1,6 +1,6 @@
 .\"     Title: udevinfo
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevinfo
 .\"    Source: udev
@@ -11,32 +11,32 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevinfo \- query udev device information
+udevinfo - query udev device information
 .SH "SYNOPSIS"
 .HP 9
 \fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevinfo queries the udev database for device information stored in the udev database. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device.
+udevinfo queries the udev database for device information stored in the udev database\. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\.
 .SH "OPTIONS"
 .PP
 \fB\-\-query=\fR\fB\fItype\fR\fR
 .RS 4
-Query the database for specified type of device data. It needs the
+Query the database for specified type of device data\. It needs the
 \fB\-\-path\fR
 or
 \fB\-\-name\fR
-to identify the specified device. Valid queries are:
+to identify the specified device\. Valid queries are:
 \fBname\fR,
 \fBsymlink\fR,
 \fBpath\fR,
 \fBenv\fR,
-\fBall\fR.
+\fBall\fR\.
 .RE
 .PP
 \fB\-\-path=\fR\fB\fIdevpath\fR\fR
 .RS 4
-The devpath of the device to query.
+The devpath of the device to query\.
 .RE
 .PP
 \fB\-\-name=\fR\fB\fInode\fR\fR
@@ -47,36 +47,36 @@ The name of the device node or a symlink to query
 \fB\-\-root\fR
 .RS 4
 The udev root directory:
-\fI/dev\fR. If used in conjunction with a
+\fI/dev\fR\. If used in conjunction with a
 \fBname\fR
 or
 \fBsymlink\fR
-query, the query returns the absolute path including the root directory.
+query, the query returns the absolute path including the root directory\.
 .RE
 .PP
 \fB\-\-attribute\-walk\fR
 .RS 4
-Print all sysfs properties of the specified device that can be used in udev rules to match the specified device. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules.
+Print all sysfs properties of the specified device that can be used in udev rules to match the specified device\. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules\.
 .RE
 .PP
 \fB\-\-export\-db\fR
 .RS 4
-Export the content of the udev database.
+Export the content of the udev database\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version.
+Print version\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevmonitor.8 b/udevmonitor.8
index 0adb998..5b624a7 100644
--- a/udevmonitor.8
+++ b/udevmonitor.8
@@ -1,6 +1,6 @@
 .\"     Title: udevmonitor
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevmonitor
 .\"    Source: udev
@@ -11,38 +11,38 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevmonitor \- print the kernel and udev event sequence to the console
+udevmonitor - print the kernel and udev event sequence to the console
 .SH "SYNOPSIS"
 .HP 12
 \fBudevmonitor\fR [\fB\-\-environment\fR] [\fB\-\-kernel\fR] [\fB\-\-udev\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event.
+udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\.
 .SH "OPTIONS"
 .PP
 \fB\-\-environment\fR
 .RS 4
-Print the complete environment for all events. Can be used to compare the kernel supplied and the udev added environment values.
+Print the complete environment for all events\. Can be used to compare the kernel supplied and the udev added environment values\.
 .RE
 .PP
 \fB\-\-kernel\fR
 .RS 4
-Print the kernel uevents.
+Print the kernel uevents\.
 .RE
 .PP
 \fB\-\-udev\fR
 .RS 4
-Print the udev event after the rule processing.
+Print the udev event after the rule processing\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevsettle.8 b/udevsettle.8
index 818a7ff..39054d9 100644
--- a/udevsettle.8
+++ b/udevsettle.8
@@ -1,6 +1,6 @@
 .\"     Title: udevsettle
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevsettle
 .\"    Source: udev
@@ -11,29 +11,29 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevsettle \- wait until queued kernel/udev events are handled
+udevsettle - wait until queued kernel/udev events are handled
 .SH "SYNOPSIS"
 .HP 11
 \fBudevsettle\fR [\fB\-\-timeout=\fR\fB\fIseconds\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Waits watching the udev event queue and exits if all current events are handled.
+Waits watching the udev event queue and exits if all current events are handled\.
 .SH "OPTIONS"
 .PP
 \fB\-\-timeout=\fR\fB\fIseconds\fR\fR
 .RS 4
-maximum seconds to wait for the queue to become empty.
+maximum seconds to wait for the queue to become empty\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevstart.8 b/udevstart.8
index ac7d070..6b463cf 100644
--- a/udevstart.8
+++ b/udevstart.8
@@ -1,6 +1,6 @@
 .\"     Title: udevstart
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevstart
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevstart \- populate initial device directory
+udevstart - populate initial device directory
 .SH "SYNOPSIS"
 .HP 10
 \fBudevstart\fR
 .SH "DESCRIPTION"
 .PP
-udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules. udevstart is used to create the initial device directory after system bootup.
+udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules\. udevstart is used to create the initial device directory after system bootup\.
 .SH "AUTHOR"
 .PP
 Written by Harald Hoyer
-<harald at redhat.com>.
+<harald at redhat\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtest.8 b/udevtest.8
index 9ab9249..a090465 100644
--- a/udevtest.8
+++ b/udevtest.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtest
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevtest
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtest \- simulate a udev run and print the action to the console
+udevtest - simulate a udev run and print the action to the console
 .SH "SYNOPSIS"
 .HP 21
 \fBudevtest \fR\fB\fIdevice\-path\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed.
+udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed\.
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>.
+<greg at kroah\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.8 b/udevtrigger.8
index 5ef9e8f..06c7e45 100644
--- a/udevtrigger.8
+++ b/udevtrigger.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtrigger
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevtrigger
 .\"    Source: udev
@@ -11,66 +11,66 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtrigger \- request kernel devices events for coldplug
+udevtrigger - request kernel devices events for coldplug
 .SH "SYNOPSIS"
 .HP 12
 \fBudevtrigger\fR [\fB\-\-verbose\fR] [\fB\-\-dry\-run\fR] [\fB\-\-retry\-failed\fR] [\fB\-\-help\fR] [\fB\-\-action=\fR\fB\fIaction\fR\fR] [\fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR] [\fB\-\-attr\-nomatch=\fR\fB\fIattribute=value\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Trigger kernel device uevents to replay missing events at system coldplug.
+Trigger kernel device uevents to replay missing events at system coldplug\.
 .SH "OPTIONS"
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print the list of devices which will be triggered.
+Print the list of devices which will be triggered\.
 .RE
 .PP
 \fB\-\-dry\-run\fR
 .RS 4
-Do not actually trigger the event.
+Do not actually trigger the event\.
 .RE
 .PP
 \fB\-\-retry\-failed\fR
 .RS 4
-Trigger only the events which are failed during a previous run.
+Trigger only the events which are failed during a previous run\.
 .RE
 .PP
 \fB\-\-action=\fR\fB\fIaction\fR\fR
 .RS 4
-Type of event to be triggered. The default value is "add".
+Type of event to be triggered\. The default value is "add"\.
 .RE
 .PP
 \fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Do not trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .PP
 \fB\-\-attr\-nomatch\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Do not trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 and Hannes Reinecke
-<hare at suse.de>.
+<hare at suse\.de>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
-- 
1.5.2.4


0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch:

--- NEW FILE 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch ---
>From 7b6fd01651ce89e4985f9afc344b7d49c4e5fcd7 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 06:06:00 +0200
Subject: [PATCH] volume_id: fix linux_raid metadata version 1.0 detection

Fixes:
  https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773
---
 extras/volume_id/lib/linux_raid.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6d1d19c..ff2c47c 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -142,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-	uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+	uint64_t sboff;
 
 	/* version 0 at the end of the device */
+	sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
 	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
 		return 0;
 
 	/* version 1.0 at the end of the device */
+	sboff = (size & ~(0x1000 - 1)) - 0x2000;
 	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
 		return 0;
 
-- 
1.5.2.4


0010-rules-Gentoo-update.patch:

--- NEW FILE 0010-rules-Gentoo-update.patch ---
>From 739b614721580b95aebdfd295eebb0a6246803ad Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam at gentoo.org>
Date: Wed, 29 Aug 2007 13:19:16 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/05-udev-early.rules    |    8 -----
 etc/udev/gentoo/30-kernel-compat.rules |   47 ++++++++++++++++++++++++++++++++
 etc/udev/gentoo/50-udev.rules          |    4 ---
 etc/udev/gentoo/80-drivers.rules       |   44 -----------------------------
 4 files changed, 47 insertions(+), 56 deletions(-)
 delete mode 100644 etc/udev/gentoo/05-udev-early.rules
 create mode 100644 etc/udev/gentoo/30-kernel-compat.rules
 delete mode 100644 etc/udev/gentoo/80-drivers.rules

diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
deleted file mode 100644
index fc15e2b..0000000
--- a/etc/udev/gentoo/05-udev-early.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# sysfs is populated after the event is sent
-ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
-
diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
new file mode 100644
index 0000000..7bc55c6
--- /dev/null
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -0,0 +1,47 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="kernel_compat_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+
+# needed for kernels <2.6.16
+SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+
+# needed for kernels <2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
+
+
+# needed for kernels <2.6.22
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+
+
+
+# this driver is broken and should not be loaded automatically
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
+# needed for kernels <2.6.21
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
+
+# No need for more code, as MODALIAS is present
+ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
+
+# needed for kernels <2.6.22
+SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+
+LABEL="kernel_compat_end"
+
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index 9e06029..7c2ac81 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -237,10 +237,6 @@ KERNEL=="umad*",	NAME="infiniband/%k"
 KERNEL=="issm*",	NAME="infiniband/%k"
 
 
-# usbfs-like device nodes
-# the way to go up to kernel 2.6.21 (and above if setting USB_DEVICE_CLASS=y)
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
-# starting from kernel 2.6.22 use this rule
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
 	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
 
diff --git a/etc/udev/gentoo/80-drivers.rules b/etc/udev/gentoo/80-drivers.rules
deleted file mode 100644
index df6c880..0000000
--- a/etc/udev/gentoo/80-drivers.rules
+++ /dev/null
@@ -1,44 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add", GOTO="drivers_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="drivers_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="drivers_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="drivers_end"
-
-- 
1.5.2.4


0011-add-name-substitution.patch:

--- NEW FILE 0011-add-name-substitution.patch ---
>From 1113044be205f9d78642744ffaa01329a77bee79 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 14:04:55 +0200
Subject: [PATCH] add $name substitution

---
 udev.7       |    7 ++++++-
 udev.xml     |   10 +++++++++-
 udev_rules.c |    6 ++++++
 udevd.c      |    2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/udev.7 b/udev.7
index 5f0ebb9..0ea5549 100644
--- a/udev.7
+++ b/udev.7
@@ -331,7 +331,7 @@ and
 \fBATTRS\fR\.
 .RE
 .PP
-\fB$driver\fR, \fB%d\fR
+\fB$driver\fR
 .RS 4
 The driver name of the device matched while searching the devpath upwards for
 \fBSUBSYSTEMS\fR,
@@ -373,6 +373,11 @@ The string returned by the external program requested with PROGRAM\. A single pa
 The node name of the parent device\.
 .RE
 .PP
+\fB$name\fR
+.RS 4
+The name of the device node\. The value is only set if an earlier rule assigned a value, or during a remove events\.
+.RE
+.PP
 \fB$root\fR, \fB%r\fR
 .RS 4
 The udev_root value\.
diff --git a/udev.xml b/udev.xml
index b43abb7..9fb6152 100644
--- a/udev.xml
+++ b/udev.xml
@@ -488,7 +488,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>$driver</option>, <option>%d</option></term>
+              <term><option>$driver</option></term>
               <listitem>
                 <para>The driver name of the device matched while searching the devpath upwards for
                   <option>SUBSYSTEMS</option>, <option>KERNELS</option>, <option>DRIVERS</option> and <option>ATTRS</option>.
@@ -548,6 +548,14 @@
             </varlistentry>
 
             <varlistentry>
+              <term><option>$name</option></term>
+              <listitem>
+                <para>The name of the device node. The value is only set if an earlier
+                rule assigned a value, or during a remove events.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
               <term><option>$root</option>, <option>%r</option></term>
               <listitem>
                 <para>The udev_root value.</para>
diff --git a/udev_rules.c b/udev_rules.c
index 35db958..01fb211 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -606,6 +606,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
 		SUBST_SYS,
 		SUBST_ENV,
@@ -627,6 +628,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
 		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
 		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
 		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
 		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
@@ -845,6 +847,10 @@ found:
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
diff --git a/udevd.c b/udevd.c
index 3c46617..5ff5d3f 100644
--- a/udevd.c
+++ b/udevd.c
@@ -508,7 +508,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			}
 	}
 
-	/* check runing-queue for still running events */
+	/* check run queue for still running events */
 	list_for_each_entry(loop_msg, &running_list, node) {
 		if (limit && childs_count++ > limit) {
 			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
-- 
1.5.2.4


0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch:

--- NEW FILE 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch ---
>From a75689bad504e35e346b84960b2b604532b1d6b5 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 14:11:37 +0200
Subject: [PATCH] do not delete the device node with ignore_remove, but handle the event

---
 udev.7        |    2 +-
 udev.xml      |    4 ++--
 udev_device.c |    8 ++++----
 udev_rules.c  |   15 ++++++++++++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/udev.7 b/udev.7
index 0ea5549..874c9ab 100644
--- a/udev.7
+++ b/udev.7
@@ -275,7 +275,7 @@ Ignore this event completely\.
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device\. This may be useful as a workaround for broken device drivers\.
+Do not remove the device node when the device goes away\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
diff --git a/udev.xml b/udev.xml
index 9fb6152..83a9d75 100644
--- a/udev.xml
+++ b/udev.xml
@@ -416,8 +416,8 @@
                   <varlistentry>
                     <term><option>ignore_remove</option></term>
                     <listitem>
-                      <para>Ignore any later remove event for this device. This may be useful
-                      as a workaround for broken device drivers.</para>
+                      <para>Do not remove the device node when the device goes away. This may be
+                      useful as a workaround for broken device drivers.</para>
                     </listitem>
                   </varlistentry>
                   <varlistentry>
diff --git a/udev_device.c b/udev_device.c
index 2b7ffe0..62217ff 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -266,10 +266,6 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* import database entry, and delete it */
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
-			if (udev->ignore_remove) {
-				info("ignore_remove for '%s'", udev->name);
-				goto exit;
-			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
@@ -285,6 +281,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'", udev->name);
+			goto exit;
+		}
 		/* remove the node */
 		retval = udev_node_remove(udev);
 
diff --git a/udev_rules.c b/udev_rules.c
index 01fb211..364d1b7 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1472,9 +1472,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET ||
-		    rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
@@ -1485,6 +1490,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				struct name_entry *entry;
-- 
1.5.2.4


0013-print-warning-for-invalid-TEST-operations.patch:

--- NEW FILE 0013-print-warning-for-invalid-TEST-operations.patch ---
>From a506e6298cffed4576f9cea8df15b2f8945fc731 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 22:19:28 +0200
Subject: [PATCH] print warning for invalid TEST operations

---
 udev_rules.c       |    3 ++-
 udev_rules_parse.c |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 364d1b7..ef352ca 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -994,7 +994,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
-	if (rule->test.operation != KEY_OP_UNSET) {
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
 		char filename[PATH_SIZE];
 		char devpath[PATH_SIZE];
 		char *attr;
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 3afc31a..9e43581 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -469,6 +469,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid TEST operation");
+				goto invalid;
+			}
 			attr = get_key_attribute(key + sizeof("TEST")-1);
 			if (attr != NULL)
 				rule->test_mode_mask = strtol(attr, NULL, 8);
-- 
1.5.2.4


0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch:

--- NEW FILE 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch ---
>From b5bc27029a82ff37c36f6e9d06f23c3005fe3382 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 14:14:54 +0200
Subject: [PATCH] rules: do not delete /lib/udev/devices/ nodes on "remove"

---
 etc/udev/rules.d/50-udev-default.rules |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index f869f51..76f0976 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -101,3 +101,6 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 
+# do not delete static device nodes
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+
-- 
1.5.2.4


0015-rules-remove-broken-nvram-group-assignment-without.patch:

--- NEW FILE 0015-rules-remove-broken-nvram-group-assignment-without.patch ---
>From 9d1f93803f166149b3c467a465a126b2fb31e93c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 14:25:17 +0200
Subject: [PATCH] rules: remove broken nvram group assignment without any permission

---
 etc/udev/rules.d/50-udev-default.rules |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 76f0976..633e2e7 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -20,7 +20,6 @@ KERNEL=="lirc0",		SYMLINK+="lirc"
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
-KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
 
-- 
1.5.2.4


0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch:

--- NEW FILE 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch ---
>From 89e0a02226cbadf6a58c4d234e31c7111eed20bc Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 15:03:21 +0200
Subject: [PATCH] add /dev/rtc symlink if new rtc drivers are used

---
 etc/udev/rules.d/50-udev-default.rules |    3 ++-
 udev_node.c                            |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 633e2e7..854809a 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -88,7 +88,8 @@ KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",			MODE="0666"
-KERNEL=="rtc",			MODE="0644"
+KERNEL=="rtc|rtc0",		MODE="0644"
+KERNEL=="rtc0",			SYMLINK+="rtc"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
 KERNEL=="mmtimer",		MODE="0644"
diff --git a/udev_node.c b/udev_node.c
index fcd52d0..25eed86 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -133,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
 				    stats.st_rdev == stats2.st_rdev) {
 					info("replace device node '%s' with symlink to our node '%s'", slink, node);
 				} else {
-					err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+					err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
 					goto exit;
 				}
 			}
-- 
1.5.2.4


0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch:

--- NEW FILE 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch ---
>From 39ea7c6c67de69379b603196a0eff6f7ce2e469a Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 31 Aug 2007 11:01:35 +0200
Subject: [PATCH] increase WAIT_FOR_SYSFS timeout to 10 seconds

We see SCSI disks where it takes 6.5 seconds to populate the
sysfs attributes.
---
 udev_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index ef352ca..dcd0914 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1040,7 +1040,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
 		int found;
 
-		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
 		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
-- 
1.5.2.4


0018-correct-includes-in-udev_selinux.c.patch:

--- NEW FILE 0018-correct-includes-in-udev_selinux.c.patch ---
>From 07acdb0f7413eeb261bdb52eba6abe75371cc202 Mon Sep 17 00:00:00 2001
From: maximilian attems <max at stro.at>
Date: Thu, 6 Sep 2007 13:12:48 +0200
Subject: [PATCH] correct includes in udev_selinux.c

---
 udev_selinux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_selinux.c b/udev_selinux.c
index 1ad6e8a..3fa84a0 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
-- 
1.5.2.4


0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch:

--- NEW FILE 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch ---
>From 8aab4ce40b821d7b759b98bb97afcd3e0b7c80d8 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 7 Sep 2007 04:01:21 +0200
Subject: [PATCH] rules: put bsd nodes in /dev/bsd/ directory

---
 etc/udev/rules.d/50-udev-default.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 854809a..bdce004 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -77,6 +77,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="qft0",			SYMLINK+="ftape"
+SUBSYSTEM=="bsg"		NAME="bsg/%k"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
-- 
1.5.2.4


0020-path_id-fix-for-stacked-class-devices.patch:

--- NEW FILE 0020-path_id-fix-for-stacked-class-devices.patch ---
>From b1ac36ff5e3756cefc79967a26280056da31bf6f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Mon, 10 Sep 2007 00:59:07 +0200
Subject: [PATCH] path_id: fix for stacked class devices

---
 extras/path_id/path_id |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index 57879b5..a3a627e 100755
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -456,7 +456,11 @@ handle_device () {
 					return
 				fi
 			fi
-			cd $full_sysfs_path/device
+			if [ -L $full_sysfs_path/device/device ]; then
+				cd $full_sysfs_path/device/device
+			else
+				cd $full_sysfs_path/device
+			fi
 			;;
 	esac
 	full_sysfs_device_path="`pwd -P`"
-- 
1.5.2.4


0021-check-line-length-after-comment-check-and-whitespace.patch:

--- NEW FILE 0021-check-line-length-after-comment-check-and-whitespace.patch ---
>From 16511863d928e7fd82f15ae64850ab21e74f0f16 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 11 Sep 2007 17:17:29 +0200
Subject: [PATCH] check line length after comment check and whitespace strip

---
 udev_config.c |   10 +++++-----
 udev_rules.c  |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/udev_config.c b/udev_config.c
index 3f226b9..2f2a69e 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -111,11 +111,6 @@ static int parse_config_file(void)
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -128,6 +123,11 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		if (count >= sizeof(line)) {
+			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
diff --git a/udev_rules.c b/udev_rules.c
index dcd0914..3ec8477 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -349,11 +349,6 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -366,6 +361,11 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		if (count >= sizeof(line)) {
+			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
-- 
1.5.2.4


0022-only-install-.rules.patch:

--- NEW FILE 0022-only-install-.rules.patch ---
>From 554074c9ca2f1b8876176887e4656d06b870f2cd Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 11 Sep 2007 17:20:54 +0200
Subject: [PATCH] only install *.rules

---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 39ffc7d..92ca846 100644
--- a/Makefile
+++ b/Makefile
@@ -230,9 +230,9 @@ install-config:
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@ for i in $(shell ls -1 etc/udev/rules.d); do \
-		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
-			$(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+	@ for i in etc/udev/rules.d/*.rules; do \
+		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+			$(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
 		fi \
 	done
 	@ extras="$(EXTRAS)"; for target in $$extras; do \
-- 
1.5.2.4


0023-ignore-device-node-names-while-restoring-symlinks-fr.patch:

--- NEW FILE 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch ---
>From 25c208d659cf0f8bc887a1f7c62e9d2e0c546aec Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 12 Sep 2007 00:21:53 +0200
Subject: [PATCH] ignore device node names while restoring symlinks from the stack

---
 udev_node.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/udev_node.c b/udev_node.c
index 25eed86..556a442 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -230,11 +230,15 @@ static int update_link(struct udevice *udev, const char *name)
 		if (udev_db == NULL)
 			continue;
 		if (udev_db_get_device(udev_db, device->name) == 0) {
-			info("compare priority of '%s' %i > %i",
-			     udev_db->dev->devpath, udev_db->link_priority, priority);
-			if (target[0] == '\0' || udev_db->link_priority > priority) {
-				priority = udev_db->link_priority;
-				strlcpy(target, udev_db->name, sizeof(target));
+			if (strcmp(udev_db->name, name) == 0) {
+				info("'%s' is a device node of '%s', skip link update", udev_db->name, device->name);
+			} else {
+				info("compare priority of '%s' %i > %i",
+				     udev_db->dev->devpath, udev_db->link_priority, priority);
+				if (target[0] == '\0' || udev_db->link_priority > priority) {
+					priority = udev_db->link_priority;
+					strlcpy(target, udev_db->name, sizeof(target));
+				}
 			}
 		}
 		udev_device_cleanup(udev_db);
@@ -242,8 +246,8 @@ static int update_link(struct udevice *udev, const char *name)
 	name_list_cleanup(&name_list);
 
 	if (target[0] == '\0') {
-		err("missing target for '%s'", name);
-		rc = -1;
+		info("no current target for '%s' found", name);
+		rc = 1;
 		goto out;
 	}
 
-- 
1.5.2.4


0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch:

--- NEW FILE 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch ---
>From ce39874580829dc97f77b78114874b5086056e5c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 00:41:54 +0200
Subject: [PATCH] use SEQNUM in /dev/.udev/queue/ instead of devpath

---
 udevd.c |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/udevd.c b/udevd.c
index 5ff5d3f..eb311df 100644
--- a/udevd.c
+++ b/udevd.c
@@ -154,22 +154,16 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	char filename[PATH_SIZE];
 	char filename_failed[PATH_SIZE];
 	size_t start;
-	struct udevd_uevent_msg *loop_msg;
-	int fd;
 
 	/* location of queue file */
-	strlcpy(filename, udev_root, sizeof(filename));
-	strlcat(filename, "/", sizeof(filename));
-	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
-	strlcat(filename, msg->devpath, sizeof(filename));
-	path_encode(&filename[start], sizeof(filename) - start);
+	snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
 
 	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
 	strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
-	path_encode(&filename_failed[start], sizeof(filename) - start);
+	path_encode(&filename_failed[start], sizeof(filename_failed) - start);
 
 	switch (state) {
 	case EVENT_QUEUED:
@@ -177,12 +171,9 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		delete_path(filename_failed);
 
 		create_path(filename);
-		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
-		if (fd > 0)
-			close(fd);
-		return;
+		symlink(msg->devpath, filename);
+		break;
 	case EVENT_FINISHED:
-	case EVENT_FAILED:
 		if (msg->devpath_old != NULL) {
 			/* "move" event - rename failed file to current name, do not delete failed */
 			char filename_failed_old[PATH_SIZE];
@@ -201,28 +192,20 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			delete_path(filename_failed);
 		}
 
-		/* skip if events for the same path are still pending */
-		list_for_each_entry(loop_msg, &running_list, node)
-			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-				return;
-
-		list_for_each_entry(loop_msg, &exec_list, node)
-			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-				return;
-
+		unlink(filename);
+		delete_path(filename);
+		break;
+	case EVENT_FAILED:
 		/* move failed event to the failed directory */
-		if (state == EVENT_FAILED) {
-			create_path(filename_failed);
-			rename(filename, filename_failed);
-		} else {
-			unlink(filename);
-		}
+		create_path(filename_failed);
+		rename(filename, filename_failed);
 
 		/* clean up possibly empty queue directory */
 		delete_path(filename);
-
-		return;
+		break;
 	}
+
+	return;
 }
 
 static void msg_queue_delete(struct udevd_uevent_msg *msg)
@@ -297,7 +280,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
-	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
+	info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
-- 
1.5.2.4


0025-rules-add-memstick-module-loading.patch:

--- NEW FILE 0025-rules-add-memstick-module-loading.patch ---
>From 3a58ef80dfbc08fd8722af5408a26abe12fe053c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 00:46:44 +0200
Subject: [PATCH] rules: add memstick module loading

---
 etc/udev/rules.d/80-drivers.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index 3388266..5340565 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -6,6 +6,7 @@ DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODAL
 SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
 SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-- 
1.5.2.4


0026-Removed-extra-space-from-udevinfo-symlink-output.patch:

--- NEW FILE 0026-Removed-extra-space-from-udevinfo-symlink-output.patch ---
>From 1e3ee197983daecbe78ff5cf7e4dc8f431ccf185 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Sep 2007 13:53:26 +0200
Subject: [PATCH] Removed extra space from udevinfo symlink output.
See also https://bugzilla.redhat.com/show_bug.cgi?id=173001
---
 udevinfo.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index be9aa76..8e54705 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -389,10 +389,16 @@ int main(int argc, char *argv[], char *envp[])
 				goto exit;
 			if (root)
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s/%s ", udev_root, name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s/%s ", udev_root, name_loop->name);
+					else
+						printf("%s/%s", udev_root, name_loop->name);
 			else
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s ", name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s ", name_loop->name);
+					else
+						printf("%s", name_loop->name);
 			printf("\n");
 			break;
 		case QUERY_PATH:
-- 
1.5.2.4



--- NEW FILE Makefile.git ---
Patch:
	@for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "Patch$$n: $$i";done

patch:
	@for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "%patch$$n -p1 -b .git$$n";done



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- start_udev	27 Jul 2007 16:51:38 -0000	1.64
+++ start_udev	20 Sep 2007 12:27:11 -0000	1.65
@@ -94,6 +94,7 @@
 		pushd $devdir &> "$udev_root/null"
 		set *
 		if [ "$1" != "*" ]; then
+			echo "Warning: $devdir is deprecated. Please use /etc/udev/makedev.d/."
         		cp -ar "$@" $udev_root/ 
 			pushd "$udev_root" &> "$udev_root/null"
 			[ -x /sbin/restorecon ] && /sbin/restorecon "$@" 
@@ -180,6 +181,7 @@
 make_extra_nodes
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
+UDEV_OPTS=""
 if [ -f "/sys/class/tty/console/uevent" ]; then
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
@@ -194,9 +196,12 @@
 	if strstr "$cmdline" udevdebug; then
 		/sbin/udevcontrol log_priority=debug
 	fi
-        if strstr "$cmdline" fastudev; then
-		/sbin/udevcontrol env FASTUDEV=1
-        fi
+	if strstr "$cmdline" udevinfo; then
+		/sbin/udevcontrol log_priority=info
+	fi
+	if strstr "$cmdline" udevtrace; then
+		UDEV_OPTS="$UDEV_OPTS --debug-trace"
+	fi
 	if strstr "$cmdline" udevchilds; then
 		/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
 	fi
@@ -211,7 +216,7 @@
 	/sbin/udevcontrol env MODPROBE_DEBUG=
 else
 	echo -n " kernel too old for this udev version "
-	/sbin/udevd -d
+	/sbin/udevd -d $UDEV_OPTS
 	ret=10
 
 fi


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- udev.spec	7 Sep 2007 12:52:05 -0000	1.219
+++ udev.spec	20 Sep 2007 12:27:11 -0000	1.220
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 2%{?dist}
+Release: 3.20070920git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,11 +18,35 @@
 Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
 
-Patch1: udev-089-nopie.patch
-Patch2: udev-091-lib64.patch
-Patch3: udev-115-git-20070907.patch
-Patch4: udev-115-looplast.patch
-Patch5: udev-115-rulesinstall.patch
+Patch1: 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch
+Patch2: 0002-rules-fix-two-trivial-typos.patch
+Patch3: 0003-rules-random-and-urandom-are-0666.patch
+Patch4: 0004-rules-add-REMOVE_CMD-rule.patch
+Patch5: 0005-track-move-events-to-rename-database-and-failed-fi.patch
+Patch6: 0006-rules-Gentoo-update.patch
+Patch7: 0007-rules-add-i2o-driver-rule.patch
+Patch8: 0008-man-recreate-man-pages.patch
+Patch9: 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch
+Patch10: 0010-rules-Gentoo-update.patch
+Patch11: 0011-add-name-substitution.patch
+Patch12: 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch
+Patch13: 0013-print-warning-for-invalid-TEST-operations.patch
+Patch14: 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch
+Patch15: 0015-rules-remove-broken-nvram-group-assignment-without.patch
+Patch16: 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch
+Patch17: 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch
+Patch18: 0018-correct-includes-in-udev_selinux.c.patch
+Patch19: 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch
+Patch20: 0020-path_id-fix-for-stacked-class-devices.patch
+Patch21: 0021-check-line-length-after-comment-check-and-whitespace.patch
+Patch22: 0022-only-install-.rules.patch
+Patch23: 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch
+Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
+Patch25: 0025-rules-add-memstick-module-loading.patch
+Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
+
+Patch100: udev-089-nopie.patch
+Patch101: udev-091-lib64.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -70,13 +94,34 @@
 
 %prep
 %setup -q  
-%patch1 -p1 -b .nopie
-%patch2 -p1 -b .lib64
-%patch3 -p1 -b .git20070907
-%patch4 -p1 -b .looplast
-%patch5 -p1 -b .rulesinstall
+%patch1 -p1 -b .git1
+%patch2 -p1 -b .git2
+%patch3 -p1 -b .git3
+%patch4 -p1 -b .git4
+%patch5 -p1 -b .git5
+%patch6 -p1 -b .git6
+%patch7 -p1 -b .git7
+%patch8 -p1 -b .git8
+%patch9 -p1 -b .git9
+%patch10 -p1 -b .git10
+%patch11 -p1 -b .git11
+%patch12 -p1 -b .git12
+%patch13 -p1 -b .git13
+%patch14 -p1 -b .git14
+%patch15 -p1 -b .git15
+%patch16 -p1 -b .git16
+%patch17 -p1 -b .git17
+%patch18 -p1 -b .git18
+%patch19 -p1 -b .git19
+%patch20 -p1 -b .git20
+%patch21 -p1 -b .git21
+%patch22 -p1 -b .git22
+%patch25 -p1 -b .git25
+%patch26 -p1 -b .git26
+
+%patch100 -p1 -b .nopie
+%patch101 -p1 -b .lib64
 
-rm -f etc/udev/redhat/51-hotplug.rules etc/udev/redhat/50* etc/udev/redhat/06*
 %build
 
 %if %{with_static}
@@ -189,11 +234,16 @@
 
 for i in \
 	etc/udev/redhat/*.rules \
+%ifarch ia64
 	etc/udev/packages/40-ia64.rules \
-	etc/udev/packages/40-alsa.rules \
+%endif
+%ifarch ppc ppc64
 	etc/udev/packages/40-ppc.rules \
+%endif
+%ifarch s390 s390x
 	etc/udev/packages/40-s390.rules \
-	etc/udev/packages/40-zaptel.rules \
+%endif
+	etc/udev/packages/40-alsa.rules \
 	etc/udev/packages/64-md-raid.rules \
 	etc/udev/packages/64-device-mapper.rules \
 	; do
@@ -352,6 +402,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
+- some upstream fixes from git
+- removed last_rule for loop rules
+- added "udevinfo udevtrace" kernel command line options for better debugging
+
 * Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
 - some upstream fixes from git
 - last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)


--- udev-115-git-20070907.patch DELETED ---


--- udev-115-looplast.patch DELETED ---


--- udev-115-rulesinstall.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 12:35:04 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:35:04 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchbugzilla
Message-ID: <200709201235.l8KCZ4sg004952@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchbugzilla acl on bluez-gnome (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:56 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:56 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchcommits
Message-ID: <200709201240.l8KCeugs026142@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchcommits acl on bluez-gnome (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:57 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:57 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested commit
Message-ID: <200709201240.l8KCevVx026154@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the commit acl on bluez-gnome (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:58 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:58 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested approveacls
Message-ID: <200709201240.l8KCewMU026172@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the approveacls acl on bluez-gnome (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:01 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchbugzilla
Message-ID: <200709201241.l8KCf1lT026207@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchbugzilla acl on bluez-gnome (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:03 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:03 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchcommits
Message-ID: <200709201241.l8KCf3qF026221@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchcommits acl on bluez-gnome (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:05 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:05 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested commit
Message-ID: <200709201241.l8KCf54R026239@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the commit acl on bluez-gnome (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:07 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:07 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested approveacls
Message-ID: <200709201241.l8KCf73i026256@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the approveacls acl on bluez-gnome (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:21 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfLqt026336@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:24 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:24 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfOee026354@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:26 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:26 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfQFH026373@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:28 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:28 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfSXn007188@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the approveacls acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:31 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:31 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfVlA026413@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:33 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfXtv007227@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:35 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:35 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfZNO007244@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:37 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:37 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfblO026455@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the approveacls acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 12:45:07 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 08:45:07 -0400
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.18,1.19
Message-ID: <200709201245.l8KCj7AW027105@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27087

Modified Files:
	bluez-gnome.spec 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
- Only show and start the bluez-gnome bits in GNOME (#258721)



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bluez-gnome.spec	17 Sep 2007 23:19:26 -0000	1.18
+++ bluez-gnome.spec	20 Sep 2007 12:44:33 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -40,18 +40,19 @@
 
 %prep
 %setup -q
-sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop.in
 
 %build
 %configure --disable-mime-update --disable-desktop-update
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+
 desktop-file-install --vendor=""				\
 	--add-category=X-GNOME-NetworkSettings			\
 	--delete-original					\
@@ -105,7 +106,7 @@
 %{_bindir}/bluetooth-applet
 %{_bindir}/bluetooth-properties
 %config %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+%{_sysconfdir}/xdg/gnome/autostart/bluetooth-applet.desktop
 %{_datadir}/man/man1/bluetooth-applet.1.gz
 %{_datadir}/man/man1/bluetooth-properties.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
@@ -118,6 +119,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
+- Only show and start the bluez-gnome bits in GNOME (#258721)
+
 * Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
 - Split out the analyzer so it's not installed by default
 - Don't prefix the properties .desktop with fedora for no reason



From fedora-extras-commits at redhat.com  Thu Sep 20 12:47:33 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 08:47:33 -0400
Subject: rpms/svnkit/devel svnkit.spec,1.5,1.6
Message-ID: <200709201247.l8KClX3d027186@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27162

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svnkit.spec	10 Sep 2007 13:27:20 -0000	1.5
+++ svnkit.spec	20 Sep 2007 12:47:01 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:05:01 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 09:05:01 -0400
Subject: rpms/svnkit/FC-6 svnkit.spec,1.2,1.3
Message-ID: <200709201305.l8KD51Ej001040@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/svnkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svnkit.spec	10 Sep 2007 17:22:59 -0000	1.2
+++ svnkit.spec	20 Sep 2007 13:04:28 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:09:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 09:09:53 -0400
Subject: rpms/system-config-boot/devel .cvsignore, 1.13, 1.14 sources, 1.13, 
	1.14 system-config-boot.spec, 1.19, 1.20
Message-ID: <200709201309.l8KD9roZ001198@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1176

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 0.2.17-1
- translation update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Aug 2007 10:51:55 -0000	1.13
+++ .cvsignore	20 Sep 2007 13:09:20 -0000	1.14
@@ -1 +1 @@
-system-config-boot-0.2.16.tar.gz
+system-config-boot-0.2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Aug 2007 10:51:55 -0000	1.13
+++ sources	20 Sep 2007 13:09:20 -0000	1.14
@@ -1 +1 @@
-d2064da94197552b9158fa3a064a86f4  system-config-boot-0.2.16.tar.gz
+c1ef572a5618c081a0ef59eb6f9c8c05  system-config-boot-0.2.17.tar.gz


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- system-config-boot.spec	13 Aug 2007 10:51:55 -0000	1.19
+++ system-config-boot.spec	20 Sep 2007 13:09:20 -0000	1.20
@@ -3,7 +3,7 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.2.16
+Version: 0.2.17
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPL
@@ -66,6 +66,9 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 0.2.17-1
+- translation update
+
 * Mon Aug 13 2007 Harald Hoyer <harald at redhat.com> - 0.2.16-1
 - translation update
 - updated URL



From fedora-extras-commits at redhat.com  Thu Sep 20 13:18:52 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 09:18:52 -0400
Subject: rpms/gnash/devel gnash.spec,1.10,1.11
Message-ID: <200709201318.l8KDIq1V001510@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
- omf/scrollkeeper doc is broken, remove it



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnash.spec	7 Sep 2007 06:44:43 -0000	1.10
+++ gnash.spec	20 Sep 2007 13:18:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -116,9 +116,10 @@
 # asspec info isn't generated rightly
 rm \
  $RPM_BUILD_ROOT%{_infodir}/asspec.info
-# omf was broken
-#rm -rf \
-# $RPM_BUILD_ROOT%{_datadir}/omf
+# omf/scrollkeeper related files are broken, some files are missing, and
+# omf files are wrong
+rm -rf \
+ $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
@@ -133,7 +134,7 @@
 
 %post 
 /sbin/ldconfig
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 # the info is empty, but doesn't hurt
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
@@ -165,7 +166,7 @@
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-%{_datadir}/omf/gnash/
+#%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -184,6 +185,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
+- omf/scrollkeeper doc is broken, remove it
+
 * Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
 - better documentation generation
 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:19:12 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 09:19:12 -0400
Subject: rpms/svnkit/F-7 svnkit.spec,1.2,1.3
Message-ID: <200709201319.l8KDJCIu001552@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1490

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/svnkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svnkit.spec	10 Sep 2007 16:56:47 -0000	1.2
+++ svnkit.spec	20 Sep 2007 13:18:39 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:39:56 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 09:39:56 -0400
Subject: rpms/lilypond/devel .cvsignore, 1.18, 1.19 lilypond.spec, 1.20,
	1.21 sources, 1.18, 1.19
Message-ID: <200709201339.l8KDduQI002116@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2094

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Aug 2007 14:59:10 -0000	1.18
+++ .cvsignore	20 Sep 2007 13:39:23 -0000	1.19
@@ -1 +1 @@
-lilypond-2.10.29.tar.gz
+lilypond-2.10.33.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lilypond.spec	18 Sep 2007 13:50:46 -0000	1.20
+++ lilypond.spec	20 Sep 2007 13:39:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.10.29
-Release:	2%{?dist}
+Version:	2.10.33
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -92,7 +92,8 @@
 
 
 %changelog
-* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-2
+* Thu Sep 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
+- New release.
 - Fix source URL. Change licence from GPL to GPLv2.
 
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Aug 2007 14:59:10 -0000	1.18
+++ sources	20 Sep 2007 13:39:23 -0000	1.19
@@ -1 +1 @@
-201044efcff6e9eb8a9d8a960c9d8181  lilypond-2.10.29.tar.gz
+86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 13:41:20 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 09:41:20 -0400
Subject: rpms/lilypond/devel lilypond.spec,1.21,1.22
Message-ID: <200709201341.l8KDfKTR002173@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2155

Modified Files:
	lilypond.spec 
Log Message:
New release.


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lilypond.spec	20 Sep 2007 13:39:23 -0000	1.21
+++ lilypond.spec	20 Sep 2007 13:40:47 -0000	1.22
@@ -94,7 +94,8 @@
 %changelog
 * Thu Sep 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
 - New release.
-- Fix source URL. Change licence from GPL to GPLv2.
+- Fix source URL.
+- Change licence from GPL to GPLv2.
 
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1
 - New release. Remove old patch.



From fedora-extras-commits at redhat.com  Thu Sep 20 13:53:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 09:53:37 -0400
Subject: rpms/acl/devel acl-2.2.39-path_max.patch, 1.1, 1.2 acl.spec, 1.43,
	1.44
Message-ID: <200709201353.l8KDrbgR002649@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600

Modified Files:
	acl-2.2.39-path_max.patch acl.spec 
Log Message:
Rewritten path_max patch to support long UTF8 names


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-path_max.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acl-2.2.39-path_max.patch	5 Jul 2006 19:32:12 -0000	1.1
+++ acl-2.2.39-path_max.patch	20 Sep 2007 13:53:35 -0000	1.2
@@ -18,7 +18,7 @@
 +	  bytes for "#file:". Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[PATH_MAX+6];
++	char linebuf[(4*PATH_MAX)+6];
  	char *cp;
  	char *p;
  	int comments_read = 0;


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- acl.spec	31 Aug 2007 18:33:41 -0000	1.43
+++ acl.spec	20 Sep 2007 13:53:35 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -107,6 +107,10 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Sep 20 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-10
+- Rewriten path_max patch to support long UTF8 names
+- Resolves #287701, #183181
+
 * Fri Aug 31 2007 Steve Dickson <steved at redhat.com> - 2.2.39-9
 - Removed NFS4 ACL patch since it was rejected by upstream.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:07:17 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 10:07:17 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.43,
	1.44 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.4,
	1.5 NetworkManager-0.7.0-missing-includes.patch, 1.2,
	1.3 NetworkManager.spec, 1.164, 1.165 sources, 1.62,
	1.63 NetworkManager-0.7.0-ppp-manager-fpic.patch, 1.2,
	NONE nm-applet-0.7.0-fixes.patch, 1.2, NONE
Message-ID: <200709201407.l8KE7Hkf009014@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8967

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager-0.7.0-missing-includes.patch 
	NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.7.0-ppp-manager-fpic.patch 
	nm-applet-0.7.0-fixes.patch 
Log Message:
* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
- New SVN snapshot of 0.7 that sucks less




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	30 Aug 2007 22:03:19 -0000	1.43
+++ .cvsignore	20 Sep 2007 14:06:41 -0000	1.44
@@ -2,3 +2,5 @@
 NetworkManager-0.6.5.tar.bz2
 NetworkManager-0.7.0.svn2736.tar.gz
 nm-applet-0.7.0.svn129.tar.gz
+NetworkManager-0.7.0.svn2833.tar.gz
+nm-applet-0.7.0.svn186.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	30 Aug 2007 22:29:47 -0000	1.4
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	20 Sep 2007 14:06:41 -0000	1.5
@@ -1,5 +1,6 @@
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-08-30 15:04:50.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-08-30 18:23:07.000000000 -0400
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-19 22:10:17.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-20 08:11:45.000000000 -0400
 @@ -18,10 +18,10 @@ dnl
  dnl This doesn't depend on gnome support, only on gnome-common, autogen already
  dnl uses gnome-autogen
@@ -15,7 +16,7 @@
  
  dnl
  dnl Required headers
-@@ -62,8 +62,6 @@ AC_CHECK_LIB(nm-util, ieee_802_11_cipher
+@@ -60,8 +60,6 @@ AC_C_BIGENDIAN
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
  		 glib-2.0 >= 2.10
@@ -24,8 +25,54 @@
  		 gtk+-2.0 >= 2.6
  		 libglade-2.0
  		 gconf-2.0
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-08-30 15:02:27.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-08-30 15:45:44.000000000 -0400
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2007-09-19 22:53:14.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-20 08:15:42.000000000 -0400
+@@ -1,8 +1,15 @@
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ noinst_LTLIBRARIES = libgconf-helpers.la
+ 
+ libgconf_helpers_la_SOURCES = gconf-helpers.h gconf-helpers.c
+ 
+ libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
+ 
+-libgconf_helpers_la_LIBADD = $(NMA_LIBS)
++libgconf_helpers_la_LIBADD = $(NMA_LIBS) \
++	-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/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2007-09-20 07:40:37.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-20 08:16:10.000000000 -0400
+@@ -2,6 +2,10 @@ NULL=
+ 
+ bin_PROGRAMS = nm-connection-editor
+ 
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ nm_connection_editor_CPPFLAGS =			\
+ 	$(NMA_CFLAGS)				\
+ 	-DICONDIR=\""$(datadir)/icons"\"	\
+@@ -25,7 +29,9 @@ nm_connection_editor_SOURCES =	\
+ 
+ nm_connection_editor_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
++	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+ 
+ gladedir = $(datadir)/nm-applet
+ glade_DATA = nm-connection-editor.glade
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-09-20 07:43:02.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-20 08:11:45.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -37,12 +84,12 @@
  nm_applet_CPPFLAGS =									\
  	$(NMA_CFLAGS)										\
  	-DICONDIR=\""$(datadir)/icons"\"						\
-@@ -89,7 +93,9 @@ if WITH_NOTIFY
- nm_applet_SOURCES += applet-notifications.c applet-notifications.h
- endif
+@@ -62,7 +66,9 @@ endif
  
--nm_applet_LDADD = $(NMA_LIBS)
-+nm_applet_LDADD = $(NMA_LIBS) \
+ nm_applet_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NetworkManager-0.7.0-missing-includes.patch	31 Aug 2007 04:15:07 -0000	1.2
+++ NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:06:41 -0000	1.3
@@ -1,35 +1,3 @@
---- NetworkManager-0.7.0/src/ppp-manager/nm-ppp-manager.c.missing-includes	2007-08-31 00:04:26.000000000 -0400
-+++ NetworkManager-0.7.0/src/ppp-manager/nm-ppp-manager.c	2007-08-31 00:05:19.000000000 -0400
-@@ -4,6 +4,8 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <string.h>
-+#include <sys/types.h>
-+#include <unistd.h>
- 
- #include "nm-ppp-manager.h"
- #include "nm-dbus-manager.h"
---- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-08-30 14:45:49.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-netlink.c	2007-08-30 23:58:58.000000000 -0400
-@@ -19,6 +19,11 @@
-  * (C) Copyright 2007 Red Hat, Inc.
-  */
- 
-+#include <signal.h>
-+#include <pthread.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #include "nm-netlink.h"
- #include "nm-utils.h"
- 
---- NetworkManager-0.7.0/src/nm-hal-manager.c.missing-includes	2007-08-30 14:45:49.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-hal-manager.c	2007-08-30 23:58:58.000000000 -0400
-@@ -1,3 +1,4 @@
-+#include <signal.h>
- #include <string.h>
- #include <stdlib.h>
- #include <libhal.h>
 --- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-08-30 14:45:35.000000000 -0400
 +++ NetworkManager-0.7.0/test/Makefile.am	2007-08-30 23:58:58.000000000 -0400
 @@ -45,5 +45,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- NetworkManager.spec	31 Aug 2007 04:27:23 -0000	1.164
+++ NetworkManager.spec	20 Sep 2007 14:06:41 -0000	1.165
@@ -7,22 +7,20 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2736
+%define snapshot svn2833
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.1.%{snapshot}%{?dist}
+Release: 0.2.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn129.tar.gz
+Source1: nm-applet-%{version}.svn186.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.7.0-missing-includes.patch
-Patch3: NetworkManager-0.7.0-ppp-manager-fpic.patch
-Patch4: nm-applet-0.7.0-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -122,12 +120,10 @@
 %prep
 %setup -q
 %patch2 -p1 -b .missing-includes
-%patch3 -p1 -b .fpic
 
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch4 -p1 -b .fixes
 
 %build
 # Even though we don't require named, we still build with it
@@ -232,9 +228,10 @@
 
 %files gnome
 %defattr(-,root,root,0755)
-%config %{_sysconfdir}/dbus-1/system.d/nm-applet.conf
+%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_bindir}/nm-applet
 %{_bindir}/nm-vpn-properties
+%{_bindir}/nm-connection-editor
 %{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
 %{_datadir}/nm-applet/
 %{_datadir}/icons/hicolor/22x22/apps/*.png
@@ -252,14 +249,19 @@
 %files glib
 %defattr(-,root,root,0755)
 %{_libdir}/libnm_glib.so.*
+%{_libdir}/libnm_glib_vpn.so.*
 
 %files glib-devel
 %{_includedir}/libnm-glib/*.h
 %{_libdir}/pkgconfig/libnm_glib.pc
 %{_libdir}/libnm_glib.so
+%{_libdir}/libnm_glib_vpn.so
 
 
 %changelog
+* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
+- New SVN snapshot of 0.7 that sucks less
+
 * Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2736
 - Update to SVN snapshot of 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	30 Aug 2007 22:03:19 -0000	1.62
+++ sources	20 Sep 2007 14:06:41 -0000	1.63
@@ -1,2 +1,2 @@
-29fcb5b6f13bf40e806a1a7a81e0f105  NetworkManager-0.7.0.svn2736.tar.gz
-63540152eb1482cdcd68bc1b806672d4  nm-applet-0.7.0.svn129.tar.gz
+da84c73ca684fd3abb154ea51c9a06fe  NetworkManager-0.7.0.svn2833.tar.gz
+98fefe2757a8be652e315b251941ed66  nm-applet-0.7.0.svn186.tar.gz


--- NetworkManager-0.7.0-ppp-manager-fpic.patch DELETED ---


--- nm-applet-0.7.0-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 14:13:58 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 10:13:58 -0400
Subject: rpms/bluez-gnome/devel
	bluez-gnome-0.14-disable-class-selection-with-hal.patch, NONE,
	1.1 bluez-gnome.spec, 1.19, 1.20
Message-ID: <200709201413.l8KEDw2P009342@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	bluez-gnome.spec 
Added Files:
	bluez-gnome-0.14-disable-class-selection-with-hal.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-5
- Don't allow class of the device to be changed if HAL is being
  used (#244261)


bluez-gnome-0.14-disable-class-selection-with-hal.patch:

--- NEW FILE bluez-gnome-0.14-disable-class-selection-with-hal.patch ---
? .deps
? Makefile
? Makefile.in
? bluetooth-manager.schemas
? bluetooth-properties
? bluetooth-properties.desktop
? foo
Index: adapter.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/adapter.c,v
retrieving revision 1.17
diff -u -p -r1.17 adapter.c
--- adapter.c	29 Aug 2007 15:41:49 -0000	1.17
+++ adapter.c	20 Sep 2007 14:09:27 -0000
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include <gconf/gconf-client.h>
+
 #include <dbus/dbus-glib.h>
 
 #include <glib/gi18n.h>
@@ -509,6 +511,21 @@ GtkWidget *create_tree(GtkTreeModel *mod
 	return tree;
 }
 
+static void gconf_callback(GConfClient *client, guint cnxn_id,
+					GConfEntry *entry, gpointer user_data)
+{
+	GConfValue *value;
+
+	if (g_ascii_strcasecmp(entry->key, PREF_USE_HAL) != 0)
+		return;
+
+	value = gconf_entry_get_value(entry);
+	if (value == NULL)
+		return;
+
+	gtk_widget_set_sensitive(GTK_WIDGET(user_data), !gconf_value_get_bool(value));
+}
+
 static void create_adapter(struct adapter_data *adapter)
 {
 	DBusGProxy *object;
@@ -530,8 +547,10 @@ static void create_adapter(struct adapte
 	GtkTreeModel *model;
 	GtkTreeSelection *selection;
 	GSList *group = NULL;
+	GConfClient *gconf;
 	gdouble value;
 	gint index;
+	gboolean use_hal;
 
 	object = dbus_g_proxy_new_for_name(connection, "org.bluez",
 					adapter->path, "org.bluez.Adapter");
@@ -726,6 +745,16 @@ static void create_adapter(struct adapte
 	g_signal_connect(G_OBJECT(combobox), "changed",
 					G_CALLBACK(class_callback), adapter);
 
+	/* Monitor the use_hal preference */
+	gconf = gconf_client_get_default();
+	use_hal = gconf_client_get_bool(gconf, PREF_USE_HAL, NULL);
+	gtk_widget_set_sensitive(combobox, !use_hal);
+
+	gconf_client_add_dir(gconf, PREF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+	gconf_client_notify_add(gconf, PREF_DIR,
+					gconf_callback, combobox, NULL, NULL);
+	g_object_unref(gconf);
+
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
 
Index: general.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/general.c,v
retrieving revision 1.2
diff -u -p -r1.2 general.c
--- general.c	29 Jul 2007 11:28:48 -0000	1.2
+++ general.c	20 Sep 2007 14:09:27 -0000
@@ -32,6 +32,7 @@
 
 #include <gtk/gtk.h>
 
+#include "general.h"
 #include "client.h"
 
 typedef enum {
@@ -42,11 +43,6 @@ typedef enum {
 
 static int icon_policy = ICON_POLICY_PRESENT;
 
-#define PREF_DIR		"/apps/bluetooth-manager"
-#define PREF_USE_HAL		PREF_DIR "/use_hal"
-#define PREF_ICON_POLICY	PREF_DIR "/icon_policy"
-#define PREF_AUTO_AUTHORIZE	PREF_DIR "/auto_authorize"
-
 static GConfEnumStringPair icon_policy_enum_map [] = {
 	{ ICON_POLICY_NEVER,	"never"		},
 	{ ICON_POLICY_ALWAYS,	"always"	},
Index: general.h
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/general.h,v
retrieving revision 1.1
diff -u -p -r1.1 general.h
--- general.h	29 Jul 2007 11:11:03 -0000	1.1
+++ general.h	20 Sep 2007 14:09:27 -0000
@@ -22,6 +22,11 @@
  *
  */
 
+#define PREF_DIR		"/apps/bluetooth-manager"
+#define PREF_USE_HAL		PREF_DIR "/use_hal"
+#define PREF_ICON_POLICY	PREF_DIR "/icon_policy"
+#define PREF_AUTO_AUTHORIZE	PREF_DIR "/auto_authorize"
+
 GtkWidget *create_label(const gchar *str);
 GtkWidget *create_general(void);
 void setup_general(void);


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bluez-gnome.spec	20 Sep 2007 12:44:33 -0000	1.19
+++ bluez-gnome.spec	20 Sep 2007 14:13:25 -0000	1.20
@@ -1,12 +1,13 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
+Patch1:		bluez-gnome-0.14-disable-class-selection-with-hal.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +41,9 @@
 
 %prep
 %setup -q
+pushd properties
+%patch1 -p0 -b .use-hal
+popd
 
 %build
 %configure --disable-mime-update --disable-desktop-update
@@ -119,6 +123,10 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-5
+- Don't allow class of the device to be changed if HAL is being
+  used (#244261)
+
 * Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
 - Only show and start the bluez-gnome bits in GNOME (#258721)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:15:10 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Thu, 20 Sep 2007 10:15:10 -0400
Subject: rpms/tig/devel .cvsignore,1.3,1.4 sources,1.3,1.4 tig.spec,1.4,1.5
Message-ID: <200709201415.l8KEFAPH009473@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/tig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9443

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
tig-0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jun 2007 13:35:43 -0000	1.3
+++ .cvsignore	20 Sep 2007 14:14:37 -0000	1.4
@@ -1 +1 @@
-tig-0.8.tar.gz
+tig-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jun 2007 13:35:43 -0000	1.3
+++ sources	20 Sep 2007 14:14:37 -0000	1.4
@@ -1 +1 @@
-4f74cd15f0c132e060088fbd9fe92a4b  tig-0.8.tar.gz
+29576aee510e0cd1a16702560cf487ce  tig-0.9.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/tig.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tig.spec	24 Aug 2007 00:49:01 -0000	1.4
+++ tig.spec	20 Sep 2007 14:14:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           tig
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 James Bowes <jbowes at redhat.com> - 0.9-1
+- tig-0.9
+
 * Thu Aug 23 2007 James Bowes <jbowes at redhat.com> - 0.8-2
 - Mark license as GPLv2+
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:25:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:25:05 -0400
Subject: rpms/kdelibs/devel .cvsignore, 1.40.2.3, 1.40.2.4 kde4.csh, 1.1.2.4,
	1.1.2.5 kde4.sh, 1.1.2.4, 1.1.2.5 kdelibs.spec, 1.223.2.22,
	1.223.2.23 sources, 1.51.2.2, 1.51.2.3
Message-ID: <200709201425.l8KEP5Ql011986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603

Modified Files:
      Tag: kdelibs-kde4-branch
	.cvsignore kde4.csh kde4.sh kdelibs.spec sources 
Log Message:
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -u -r1.40.2.3 -r1.40.2.4
--- .cvsignore	29 Jul 2007 00:44:09 -0000	1.40.2.3
+++ .cvsignore	20 Sep 2007 14:24:32 -0000	1.40.2.4
@@ -1,3 +1,3 @@
 clog
-kdelibs-3.91.0.tar.bz2
 kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,12 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
+#if ( -f /etc/sysconfig/prelink ) then
+#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+#   if ( "$PRELINKING" == "yes" )  then
       if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-endif
+#   endif
+#endif
 
 ## if not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,11 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+#if [ -f /etc/sysconfig/prelink ]; then
+#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
-fi
+#  fi
+#fi
 
 ## if not using IP6, speeds DNS operations
 # [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.22
retrieving revision 1.223.2.23
diff -u -r1.223.2.22 -r1.223.2.23
--- kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
+++ kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,11 +95,12 @@
 %endif
 Requires: qt4-devel
 Requires: openssl-devel
+Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 ## FIXME/TODO: trim these down  -- Rex
 #Requires: libxslt-devel aspell-devel giflib-devel
-#Requires: libpng-devel bzip2-devel libacl-devel gettext-devel
+#Requires: libpng-devel gettext-devel
 #Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
-#Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
+#Requires: krb5-devel
 #Requires: alsa-lib-devel avahi-devel
 %description devel
 This package includes the header files you will need to compile
@@ -123,7 +124,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
@@ -229,6 +230,11 @@
 
 
 %changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
+- update sources
+- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
+
 * Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
 - rename js to kjs because of file conflict (kde#149840)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -r1.51.2.2 -r1.51.2.3
--- sources	29 Jul 2007 00:44:09 -0000	1.51.2.2
+++ sources	20 Sep 2007 14:24:32 -0000	1.51.2.3
@@ -1 +1 @@
-1a32d2892c9a7ac4a7fd4d77a86f720b  kdelibs-3.92.0.tar.bz2
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:27:15 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 10:27:15 -0400
Subject: rpms/lilypond/F-7 .cvsignore, 1.16, 1.17 lilypond.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <200709201427.l8KERF2s012071@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release. Fix licence tag and source URL.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Mar 2007 15:12:11 -0000	1.16
+++ .cvsignore	20 Sep 2007 14:26:39 -0000	1.17
@@ -1 +1 @@
-lilypond-2.10.20.tar.gz
+lilypond-2.10.33.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/lilypond.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lilypond.spec	20 Mar 2007 15:12:11 -0000	1.16
+++ lilypond.spec	20 Sep 2007 14:26:39 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		lilypond
-Version:	2.10.20
+Version:	2.10.33
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
-License:	GPL
+License:	GPLv2
 URL:		http://www.lilypond.org
-Source0:	http://www.lilypond.org/download/sources/v2.10/%{name}-%{version}.tar.gz
+Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -92,6 +92,11 @@
 
 
 %changelog
+* Thu Aug 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
+- New release (closes bug 297911).
+- Fix licence tag.
+- Fix source URL.
+
 * Tue Mar 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.20-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Mar 2007 15:12:11 -0000	1.16
+++ sources	20 Sep 2007 14:26:39 -0000	1.17
@@ -1 +1 @@
-7d6b8476d0d23b97945c579402794c20  lilypond-2.10.20.tar.gz
+86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 14:28:04 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Thu, 20 Sep 2007 10:28:04 -0400
Subject: rpms/elinks/F-7 .cvsignore, 1.19, 1.20 elinks-0.11.1-negotiate.patch,
	1.2, 1.3 elinks.spec, 1.39, 1.40 sources, 1.19, 1.20
Message-ID: <200709201428.l8KES4kr012147@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore elinks-0.11.1-negotiate.patch elinks.spec sources 
Log Message:
update to latest upstream version(#297981 security issue)+changes already done in devel(licensing,package review updates)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Mar 2007 11:13:51 -0000	1.19
+++ .cvsignore	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-elinks-0.11.2.tar.bz2
+elinks-0.11.3.tar.bz2

elinks-0.11.1-negotiate.patch:

Index: elinks-0.11.1-negotiate.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks-0.11.1-negotiate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elinks-0.11.1-negotiate.patch	12 Jun 2006 21:11:25 -0000	1.2
+++ elinks-0.11.1-negotiate.patch	20 Sep 2007 14:27:31 -0000	1.3
@@ -352,28 +352,18 @@
  
  struct http_version {
  	int major;
-@@ -551,7 +554,7 @@
- 	int trace = get_opt_bool("protocol.http.trace");
- 	struct string header;
- 	unsigned char *post_data = NULL;
--	struct auth_entry *entry;
-+	struct auth_entry *entry = NULL;
- 	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
- 	unsigned char *optstr;
- 	int use_connect, talking_to_proxy;
-@@ -808,7 +811,11 @@
- 		add_crlf_to_string(&header);
+@@ -846,7 +849,11 @@
  	}
  
--	entry = find_auth(uri);
+  	/* CONNECT: The Authorization header is for the origin server only.  */
 +#ifdef CONFIG_GSSAPI
-+	if (http_negotiate_output(uri, &header) != 0)
++	if (http_negotiate_output(uri, &header) != 0) {
++#else
+  	if (!use_connect) {
 +#endif
-+		entry = find_auth(uri);
-+	
+ 		entry = find_auth(uri);
+  	}
  	if (entry) {
- 		if (entry->digest) {
- 			unsigned char *response;
 @@ -1327,12 +1334,13 @@
  	return 0;
  }


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elinks.spec	26 Mar 2007 11:13:51 -0000	1.39
+++ elinks.spec	20 Sep 2007 14:27:31 -0000	1.40
@@ -1,18 +1,14 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.11.2
+Version:   0.11.3
 Release:   1%{?dist}
-License:   GPL
+License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}.tar.bz2
+Source:    http://elinks.or.cz/download/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: pkgconfig
 BuildRequires: openssl-devel
-BuildRequires: krb5-devel
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: libidn-devel
@@ -29,7 +25,7 @@
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.1-negotiate.patch
-Patch8: elinks-0.11.1-badproxy.patch
+Patch8: elinks-0.11.3-macropen.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -55,7 +51,7 @@
 %patch6 -p1
 # Fix #194096 ??? elinks should support negotiate-auth
 %patch7 -p1
-# Fix #210103 - elinks crashes when given bad HTTP_PROXY
+# Fix for open macro in new glibc 
 %patch8 -p1
 
 %build
@@ -78,7 +74,7 @@
 
 %files -f elinks.lang
 %defattr(-,root,root)
-%doc README SITES TODO
+%doc README SITES TODO COPYING
 %{_bindir}/links
 %{_bindir}/elinks
 %{_mandir}/man1/links.1*
@@ -86,6 +82,15 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 20 2007 Ondrej Vasik <ovasik at redhat.com> 0.11.3-1
+- update to new upstream version (required for #297981)
+- removed patch for #210103 , included in upstream release
+- updated patch elinks-0.11.1-negotiate.patch to pass build
+- fix of open macro(new glibc) by Joe Orton
+- changed license tag to GPLv2
+- added License file to doc, cleanup of dups in buildreq
+- (from package review by Tyler Owen(#225725))
+
 * Mon Mar 26 2007 Karel Zak <kzak at redhat.com> 0.11.2-1
 - update to new upstream version
 - cleanup spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Mar 2007 11:13:52 -0000	1.19
+++ sources	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-5a8f83afb527cf443f58b372136a81fc  elinks-0.11.2.tar.bz2
+a0eb50e18a2ac8e77d6b0df8f94bb5a6  elinks-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:28:50 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Thu, 20 Sep 2007 10:28:50 -0400
Subject: rpms/elinks/F-7 elinks-0.11.3-macropen.patch,NONE,1.1
Message-ID: <200709201428.l8KESotR012178@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12169

Added Files:
	elinks-0.11.3-macropen.patch 
Log Message:
forgot to add patch in last commit

elinks-0.11.3-macropen.patch:

--- NEW FILE elinks-0.11.3-macropen.patch ---
--- elinks-0.11.3/src/encoding/encoding.c.macropen
+++ elinks-0.11.3/src/encoding/encoding.c
@@ -117,7 +117,7 @@
	if (!stream) return NULL;

	stream->encoding = encoding;
-	if (decoding_backends[stream->encoding]->open(stream, fd) >= 0)
+	if ((decoding_backends[stream->encoding]->open)(stream, fd) >= 0)
		return stream;

	mem_free(stream);



From fedora-extras-commits at redhat.com  Thu Sep 20 14:32:43 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 10:32:43 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-missing-includes.patch, 1.3, 1.4
Message-ID: <200709201432.l8KEWh8J012384@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12363

Modified Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
Fix build error due to missing include on ppc

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:06:41 -0000	1.3
+++ NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:32:38 -0000	1.4
@@ -1,7 +1,19 @@
---- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-08-30 14:45:35.000000000 -0400
-+++ NetworkManager-0.7.0/test/Makefile.am	2007-08-30 23:58:58.000000000 -0400
-@@ -45,5 +45,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
- 			$(top_builddir)/utils/libnmutils.la \
+diff -up NetworkManager-0.7.0/src/nm-netlink.c.missing-includes NetworkManager-0.7.0/src/nm-netlink.c
+--- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-09-20 10:29:48.000000000 -0400
++++ NetworkManager-0.7.0/src/nm-netlink.c	2007-09-20 10:29:59.000000000 -0400
+@@ -23,6 +23,7 @@
+ #include "nm-utils.h"
+ 
+ #include <glib.h>
++#include <signal.h>
+ #include <pthread.h>
+ #include <unistd.h>
+ 
+diff -up NetworkManager-0.7.0/test/Makefile.am.missing-includes NetworkManager-0.7.0/test/Makefile.am
+--- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-09-13 07:43:42.000000000 -0400
++++ NetworkManager-0.7.0/test/Makefile.am	2007-09-20 09:08:57.000000000 -0400
+@@ -38,5 +38,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
+ 			$(top_builddir)/libnm-glib/libnm_glib.la \
  			$(top_builddir)/libnm-util/libnm-util.la
  
 -nm_supplicant_test_SOURCES = nm-supplicant-test.c



From fedora-extras-commits at redhat.com  Thu Sep 20 14:38:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:38:08 -0400
Subject: rpms/kdelibs/devel kde.csh,1.5,1.6 kde.sh,1.7,1.8
Message-ID: <200709201438.l8KEc8nE012679@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12646

Modified Files:
	kde.csh kde.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde.csh	3 Aug 2007 14:23:17 -0000	1.5
+++ kde.csh	20 Sep 2007 14:37:35 -0000	1.6
@@ -1,17 +1,17 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
+## Make sure KDEDIRS is set
+if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
+
 ##  When/if using prelinking, avoids (some) use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 ## if not using IPv6, speeds DNS operations
 # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
 
-## Make sure KDEDIRS is set
-if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde.sh	3 Aug 2007 14:23:17 -0000	1.7
+++ kde.sh	20 Sep 2007 14:37:35 -0000	1.8
@@ -1,15 +1,12 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
-## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -f /etc/sysconfig/prelink ]; then
-#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#  fi
-#fi
-
-## if not using IPv6, speeds DNS operations
-#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
 ## Make sure KDEDIRS is set
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
+
+## When/if using prelinking, avoids (some) use of kdeinit
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+  fi
+fi



From fedora-extras-commits at redhat.com  Thu Sep 20 14:39:47 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:39:47 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.61,
	1.62 selinux-policy.spec, 1.524, 1.525
Message-ID: <200709201439.l8KEdljU012761@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12707

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
- Allow xserver to search devpts_t
- Dontaudit ldconfig output to homedir


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- policy-20070703.patch	19 Sep 2007 17:40:59 -0000	1.61
+++ policy-20070703.patch	20 Sep 2007 14:39:14 -0000	1.62
@@ -1145,7 +1145,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.0.8/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/usermanage.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/usermanage.te	2007-09-19 16:12:56.000000000 -0400
 @@ -92,6 +92,7 @@
  dev_read_urand(chfn_t)
  
@@ -1154,7 +1154,15 @@
  auth_dontaudit_read_shadow(chfn_t)
  
  # allow checking if a shell is executable
-@@ -520,6 +521,10 @@
+@@ -297,6 +298,7 @@
+ term_use_all_user_ttys(passwd_t)
+ term_use_all_user_ptys(passwd_t)
+ 
++auth_domtrans_chk_passwd(passwd_t)
+ auth_manage_shadow(passwd_t)
+ auth_relabel_shadow(passwd_t)
+ auth_etc_filetrans_shadow(passwd_t)
+@@ -520,6 +522,10 @@
  mta_manage_spool(useradd_t)
  
  optional_policy(`
@@ -1165,7 +1173,7 @@
  	dpkg_use_fds(useradd_t)
  	dpkg_rw_pipes(useradd_t)
  ')
-@@ -529,6 +534,12 @@
+@@ -529,6 +535,12 @@
  ')
  
  optional_policy(`
@@ -1452,7 +1460,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 08:56:23.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1472,7 +1480,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,53 @@
+@@ -166,6 +165,57 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1515,6 +1523,10 @@
 +	domain_type($1_java_t)
 +	domain_entry_file($1_java_t,java_exec_t)
 +	role $3 types $1_java_t;
++	
++	domain_interactive_fd($1_java_t)
++
++	userdom_unpriv_usertype($1, $1_java_t)
 +
 +	allow $1_java_t self:process { execheap execmem };
 +
@@ -1526,7 +1538,7 @@
  ')
  
  ########################################
-@@ -219,3 +265,66 @@
+@@ -219,3 +269,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -1606,8 +1618,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-17 16:20:18.000000000 -0400
-@@ -18,3 +18,98 @@
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 08:56:35.000000000 -0400
+@@ -18,3 +18,102 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
  ')
@@ -1698,6 +1710,10 @@
 +	domain_entry_file($1_mono_t,mono_exec_t)
 +	role $3 types $1_mono_t;
 +
++	domain_interactive_fd($1_mono_t)
++
++	userdom_unpriv_usertype($1, $1_mono_t)
++
 +	allow $1_mono_t self:process { execheap execmem };
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
@@ -2105,8 +2121,8 @@
  allow vmware_host_t self:rawip_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.0.8/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/wine.if	2007-09-17 16:20:18.000000000 -0400
-@@ -18,3 +18,34 @@
++++ serefpolicy-3.0.8/policy/modules/apps/wine.if	2007-09-20 08:56:45.000000000 -0400
+@@ -18,3 +18,84 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, wine_exec_t, wine_t)
  ')
@@ -2141,9 +2157,59 @@
 +	role $2 types wine_t;
 +	allow wine_t $3:chr_file rw_term_perms;
 +')
++
++#######################################
++## <summary>
++##	The per role template for the wine module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for wine applications.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++#
++template(`wine_per_role_template',`
++	gen_require(`
++		type wine_exec_t;
++	')
++
++	type $1_wine_t;
++	domain_type($1_wine_t)
++	domain_entry_file($1_wine_t,wine_exec_t)
++	role $3 types $1_wine_t;
++
++	domain_interactive_fd($1_wine_t)
++
++	userdom_unpriv_usertype($1, $1_wine_t)
++
++	allow $1_wine_t self:process { execheap execmem };
++
++	domtrans_pattern($2, wine_exec_t, $1_wine_t)
++
++	optional_policy(`
++		xserver_xdm_rw_shm($1_wine_t)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.0.8/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/wine.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/wine.te	2007-09-20 09:45:04.000000000 -0400
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -2166,7 +2232,7 @@
 +')
 +
 +optional_policy(`
-+	xserver_xdm_rw_shm(mono_t)
++	xserver_xdm_rw_shm(wine_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
@@ -4294,6 +4360,34 @@
 +optional_policy(`
 +	mailscanner_manage_spool(clamscan_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.0.8/policy/modules/services/consolekit.if
+--- nsaserefpolicy/policy/modules/services/consolekit.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/consolekit.if	2007-09-20 08:49:41.000000000 -0400
+@@ -38,3 +38,24 @@
+ 	allow $1 consolekit_t:dbus send_msg;
+ 	allow consolekit_t $1:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++##	dontaudit  send and receive messages from
++##	consolekit over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`consolekit_dontaudit_dbus_chat',`
++	gen_require(`
++		type consolekit_t;
++		class dbus send_msg;
++	')
++
++	dontaudit $1 consolekit_t:dbus send_msg;
++	dontaudit consolekit_t $1:dbus send_msg;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.0.8/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/consolekit.te	2007-09-17 16:20:18.000000000 -0400
@@ -6788,9 +6882,37 @@
  
  ########################################
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.8/policy/modules/services/networkmanager.if
+--- nsaserefpolicy/policy/modules/services/networkmanager.if	2007-06-15 14:54:33.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2007-09-20 08:50:57.000000000 -0400
+@@ -97,3 +97,24 @@
+ 	allow $1 NetworkManager_t:dbus send_msg;
+ 	allow NetworkManager_t $1:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++##	dontaudit  send and receive messages from
++##	NetworkManager over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`networkmanager_dontaudit_dbus_chat',`
++	gen_require(`
++		type NetworkManager_t;
++		class dbus send_msg;
++	')
++
++	dontaudit $1 NetworkManager_t:dbus send_msg;
++	dontaudit NetworkManager_t $1:dbus send_msg;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-20 08:50:29.000000000 -0400
 @@ -20,7 +20,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -9342,7 +9464,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-19 11:59:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 09:43:06.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9412,7 +9534,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,46 @@
+@@ -555,25 +558,49 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9426,10 +9548,12 @@
  	userdom_search_user_home_dirs($1,$2)
 -	# for .xsession-errors
 -	userdom_dontaudit_write_user_home_content_files($1,$2)
--
 +	userdom_manage_user_home_content_dirs($1, xdm_t)
 +	userdom_manage_user_home_content_files($1, xdm_t)
 +	userdom_user_home_dir_filetrans_user_home_content($1, xdm_t, { dir file })
++	userdom_manage_user_tmp_dirs($1, xdm_t)
++	userdom_manage_user_tmp_files($1, xdm_t)
+ 
  	xserver_ro_session_template(xdm,$2,$3)
 -	xserver_rw_session_template($1,$2,$3)
 -	xserver_use_user_fonts($1,$2)
@@ -9468,7 +9592,7 @@
  	')
  ')
  
-@@ -626,6 +650,24 @@
+@@ -626,6 +653,24 @@
  
  ########################################
  ## <summary>
@@ -9493,7 +9617,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +701,73 @@
+@@ -659,6 +704,73 @@
  
  ########################################
  ## <summary>
@@ -9567,7 +9691,15 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -987,6 +1096,37 @@
+@@ -927,6 +1039,7 @@
+ 	files_search_tmp($1)
+ 	allow $1 xdm_tmp_t:dir list_dir_perms;
+ 	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
++	allow $1 xdm_tmp_t:sock_file unlink;
+ ')
+ 
+ ########################################
+@@ -987,6 +1100,37 @@
  
  ########################################
  ## <summary>
@@ -9605,7 +9737,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1276,7 @@
+@@ -1136,7 +1280,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9614,7 +9746,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1465,62 @@
+@@ -1325,3 +1469,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9894,7 +10026,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 09:08:43.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -9905,16 +10037,17 @@
  	allow $1_chkpwd_t self:process getattr;
  
  	files_list_etc($1_chkpwd_t)
-@@ -107,7 +108,7 @@
+@@ -106,9 +107,6 @@
+ 	role $3 types $1_chkpwd_t;
  	role $3 types system_chkpwd_t;
  
- 	# cjp: is this really needed?
+-	# cjp: is this really needed?
 -	allow $2 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
-+	logging_send_audit_msgs($2)
- 
+-
  	dontaudit $2 shadow_t:file { getattr read };
  
-@@ -169,6 +170,9 @@
+ 	# Transition from the user domain to this domain.
+@@ -169,6 +167,9 @@
  ## </param>
  #
  interface(`auth_login_pgm_domain',`
@@ -9924,7 +10057,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +180,23 @@
+@@ -176,11 +177,23 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -9948,7 +10081,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +212,33 @@
+@@ -196,22 +209,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -9983,7 +10116,7 @@
  	')
  ')
  
-@@ -309,9 +336,6 @@
+@@ -309,9 +333,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -9993,7 +10126,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +353,7 @@
+@@ -329,6 +350,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10001,7 +10134,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +372,37 @@
+@@ -347,6 +369,37 @@
  
  ########################################
  ## <summary>
@@ -10039,7 +10172,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +751,24 @@
+@@ -695,6 +748,24 @@
  
  ########################################
  ## <summary>
@@ -10064,7 +10197,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1392,9 @@
+@@ -1318,14 +1389,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10079,7 +10212,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1450,163 @@
+@@ -1381,3 +1447,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -11970,7 +12103,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 09:37:08.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -12022,12 +12155,12 @@
 +#
 +interface(`seutil_domtrans_setsebool',`
 +	gen_require(`
-+		type semanage_t, setsebool_exec_t;
++		type setsebool_t, setsebool_exec_t;
 +	')
 +
 +	files_search_usr($1)
 +	corecmd_search_bin($1)
-+	domtrans_pattern($1,setsebool_exec_t,semanage_t)
++	domtrans_pattern($1,setsebool_exec_t,setsebool_t)
 +')
 +
 +########################################
@@ -12084,7 +12217,7 @@
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1058,3 +1134,120 @@
+@@ -1058,3 +1134,124 @@
  	files_search_etc($1)
  	rw_files_pattern($1,selinux_config_t,semanage_trans_lock_t)
  ')
@@ -12157,6 +12290,9 @@
 +	allow $1 self:unix_dgram_socket create_socket_perms;
 +	logging_send_audit_msgs($1)
 +
++	# Running genhomedircon requires this for finding all users
++	auth_use_nsswitch($1)
++
 +	allow $1 policy_config_t:file { read write };
 +
 +	allow $1 semanage_tmp_t:dir manage_dir_perms;
@@ -12197,6 +12333,7 @@
 +
 +	miscfiles_read_localization($1)
 +
++	seutil_search_default_contexts($1)
 +	seutil_domtrans_loadpolicy($1)
 +	seutil_read_config($1)
 +	seutil_manage_bin_policy($1)
@@ -12207,7 +12344,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 09:31:29.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12349,6 +12486,8 @@
  #
 +seutil_semanage_policy(setsebool_t)
 +selinux_set_boolean(setsebool_t)
++# Bug in semanage
++seutil_domtrans_setfiles(setsebool_t)
  
 -allow semanage_t self:capability { dac_override audit_write };
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
@@ -12383,25 +12522,25 @@
 -selinux_getattr_fs(semanage_t)
 -# for setsebool:
 -selinux_set_boolean(semanage_t)
+-
+-term_use_all_terms(semanage_t)
+-
+-# Running genhomedircon requires this for finding all users
+-auth_use_nsswitch(semanage_t)
+-
+-libs_use_ld_so(semanage_t)
+-libs_use_shared_libs(semanage_t)
+-
+-locallogin_use_fds(semanage_t)
 +########################################
 +#
 +# semodule local policy
 +#
  
--term_use_all_terms(semanage_t)
+-logging_send_syslog_msg(semanage_t)
 +seutil_semanage_policy(semanage_t)
 +can_exec(semanage_t, semanage_exec_t)
  
- # Running genhomedircon requires this for finding all users
- auth_use_nsswitch(semanage_t)
--
--libs_use_ld_so(semanage_t)
--libs_use_shared_libs(semanage_t)
--
--locallogin_use_fds(semanage_t)
--
--logging_send_syslog_msg(semanage_t)
--
 -miscfiles_read_localization(semanage_t)
 +# Admins are creating pp files in random locations
 +auth_read_all_files_except_shadow(semanage_t)
@@ -12992,39 +13131,151 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-19 13:32:51.000000000 -0400
-@@ -45,7 +45,7 @@
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 09:09:10.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	')
+ 
+ 	attribute $1_file_type;
++	attribute $1_usertype;
+ 
+-	type $1_t, userdomain;
++	type $1_t, userdomain, $1_usertype;
+ 	domain_type($1_t)
+ 	corecmd_shell_entry_type($1_t)
+ 	corecmd_bin_entry_type($1_t)
+@@ -45,65 +46,69 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
  
 -	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession };
-+	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
- 	allow $1_t self:fd use;
- 	allow $1_t self:fifo_file rw_fifo_file_perms;
- 	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -62,6 +62,10 @@
- 
- 	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
- 
-+	application_exec_all($1_t)
-+
-+	auth_use_nsswitch($1_t)
-+
- 	kernel_read_kernel_sysctls($1_t)
- 	kernel_dontaudit_list_unlabeled($1_t)
- 	kernel_dontaudit_getattr_unlabeled_files($1_t)
-@@ -114,6 +118,10 @@
+-	allow $1_t self:fd use;
+-	allow $1_t self:fifo_file rw_fifo_file_perms;
+-	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
+-	allow $1_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-	allow $1_t self:shm create_shm_perms;
+-	allow $1_t self:sem create_sem_perms;
+-	allow $1_t self:msgq create_msgq_perms;
+-	allow $1_t self:msg { send receive };
+-	allow $1_t self:context contains;
+-	dontaudit $1_t self:socket create;
+-
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+-	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
+-
+-	kernel_read_kernel_sysctls($1_t)
+-	kernel_dontaudit_list_unlabeled($1_t)
+-	kernel_dontaudit_getattr_unlabeled_files($1_t)
+-	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
+-	kernel_dontaudit_getattr_unlabeled_pipes($1_t)
+-	kernel_dontaudit_getattr_unlabeled_sockets($1_t)
+-	kernel_dontaudit_getattr_unlabeled_blk_files($1_t)
+-	kernel_dontaudit_getattr_unlabeled_chr_files($1_t)
++	allow $1_t $1_usertype:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
++	allow $1_usertype $1_usertype:fd use;
++	allow $1_usertype $1_usertype:fifo_file rw_fifo_file_perms;
++	allow $1_usertype $1_usertype:unix_dgram_socket { create_socket_perms sendto };
++	allow $1_usertype $1_usertype:unix_stream_socket { create_stream_socket_perms connectto };
++	allow $1_usertype $1_usertype:shm create_shm_perms;
++	allow $1_usertype $1_usertype:sem create_sem_perms;
++	allow $1_usertype $1_usertype:msgq create_msgq_perms;
++	allow $1_usertype $1_usertype:msg { send receive };
++	allow $1_usertype $1_usertype:context contains;
++	dontaudit $1_usertype $1_usertype:socket create;
++
++	allow $1_usertype $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
++	term_create_pty($1_usertype,$1_devpts_t)
++
++	allow $1_usertype $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
++
++	application_exec_all($1_usertype)
++
++	auth_use_nsswitch($1_usertype)
++
++	kernel_read_kernel_sysctls($1_usertype)
++	kernel_dontaudit_list_unlabeled($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_files($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_symlinks($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_pipes($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_sockets($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_blk_files($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_chr_files($1_usertype)
+ 
+ 	# When the user domain runs ps, there will be a number of access
+ 	# denials when ps tries to search /proc.  Do not audit these denials.
+-	domain_dontaudit_read_all_domains_state($1_t)
+-	domain_dontaudit_getattr_all_domains($1_t)
+-	domain_dontaudit_getsession_all_domains($1_t)
+-
+-	files_read_etc_files($1_t)
+-	files_read_etc_runtime_files($1_t)
+-	files_read_usr_files($1_t)
++	domain_dontaudit_read_all_domains_state($1_usertype)
++	domain_dontaudit_getattr_all_domains($1_usertype)
++	domain_dontaudit_getsession_all_domains($1_usertype)
++
++	files_read_etc_files($1_usertype)
++	files_read_etc_runtime_files($1_usertype)
++	files_read_usr_files($1_usertype)
+ 	# Read directories and files with the readable_t type.
+ 	# This type is a general type for "world"-readable files.
+-	files_list_world_readable($1_t)
+-	files_read_world_readable_files($1_t)
+-	files_read_world_readable_symlinks($1_t)
+-	files_read_world_readable_pipes($1_t)
+-	files_read_world_readable_sockets($1_t)
++	files_list_world_readable($1_usertype)
++	files_read_world_readable_files($1_usertype)
++	files_read_world_readable_symlinks($1_usertype)
++	files_read_world_readable_pipes($1_usertype)
++	files_read_world_readable_sockets($1_usertype)
+ 	# old broswer_domain():
+-	files_dontaudit_list_non_security($1_t)
+-	files_dontaudit_getattr_non_security_files($1_t)
+-	files_dontaudit_getattr_non_security_symlinks($1_t)
+-	files_dontaudit_getattr_non_security_pipes($1_t)
+-	files_dontaudit_getattr_non_security_sockets($1_t)
+-	files_dontaudit_getattr_non_security_blk_files($1_t)
+-	files_dontaudit_getattr_non_security_chr_files($1_t)
+-
+-	libs_use_ld_so($1_t)
+-	libs_use_shared_libs($1_t)
+-	libs_exec_ld_so($1_t)
++	files_dontaudit_list_non_security($1_usertype)
++	files_dontaudit_getattr_non_security_files($1_usertype)
++	files_dontaudit_getattr_non_security_symlinks($1_usertype)
++	files_dontaudit_getattr_non_security_pipes($1_usertype)
++	files_dontaudit_getattr_non_security_sockets($1_usertype)
++	files_dontaudit_getattr_non_security_blk_files($1_usertype)
++	files_dontaudit_getattr_non_security_chr_files($1_usertype)
++
++	libs_use_ld_so($1_usertype)
++	libs_use_shared_libs($1_usertype)
++	libs_exec_ld_so($1_usertype)
+ 
+-	miscfiles_read_localization($1_t)
+-	miscfiles_read_certs($1_t)
++	miscfiles_read_localization($1_usertype)
++	miscfiles_read_certs($1_usertype)
+ 
+-	sysnet_read_config($1_t)
++	sysnet_read_config($1_usertype)
+ 
+ 	tunable_policy(`allow_execmem',`
+ 		# Allow loading DSOs that require executable stack.
+@@ -114,6 +119,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
  	')
 +
 +	optional_policy(`
-+		ssh_rw_stream_sockets($1_t)
++		ssh_rw_stream_sockets($1_usertype)
 +	')
  ')
  
  #######################################
-@@ -184,7 +192,7 @@
+@@ -184,7 +193,7 @@
  	files_list_home($1_t)
  
  	tunable_policy(`use_nfs_home_dirs',`
@@ -13033,7 +13284,7 @@
  		fs_read_nfs_files($1_t)
  		fs_read_nfs_symlinks($1_t)
  		fs_read_nfs_named_sockets($1_t)
-@@ -195,7 +203,7 @@
+@@ -195,7 +204,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
@@ -13042,41 +13293,133 @@
  		fs_read_cifs_files($1_t)
  		fs_read_cifs_symlinks($1_t)
  		fs_read_cifs_named_sockets($1_t)
-@@ -315,13 +323,19 @@
+@@ -262,42 +271,42 @@
+ 
+ 	# full control of the home directory
+ 	allow $1_t $1_home_t:file entrypoint;
+-	manage_dirs_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_lnk_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_sock_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_fifo_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_dirs_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_lnk_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_sock_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_fifo_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	filetrans_pattern($1_t,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
+-	files_list_home($1_t)
++	manage_dirs_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_lnk_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_sock_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_fifo_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_dirs_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_lnk_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_sock_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_fifo_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	filetrans_pattern($1_usertype,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
++	files_list_home($1_usertype)
+ 
+ 	# cjp: this should probably be removed:
+-	allow $1_t $1_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
++	allow $1_usertype $1_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
+ 
+ 	tunable_policy(`use_nfs_home_dirs',`
+-		fs_manage_nfs_dirs($1_t)
+-		fs_manage_nfs_files($1_t)
+-		fs_manage_nfs_symlinks($1_t)
+-		fs_manage_nfs_named_sockets($1_t)
+-		fs_manage_nfs_named_pipes($1_t)
++		fs_manage_nfs_dirs($1_usertype)
++		fs_manage_nfs_files($1_usertype)
++		fs_manage_nfs_symlinks($1_usertype)
++		fs_manage_nfs_named_sockets($1_usertype)
++		fs_manage_nfs_named_pipes($1_usertype)
+ 	',`
+-		fs_dontaudit_manage_nfs_dirs($1_t)
+-		fs_dontaudit_manage_nfs_files($1_t)
++		fs_dontaudit_manage_nfs_dirs($1_usertype)
++		fs_dontaudit_manage_nfs_files($1_usertype)
+ 	')
+ 
+ 	tunable_policy(`use_samba_home_dirs',`
+-		fs_manage_cifs_dirs($1_t)
+-		fs_manage_cifs_files($1_t)
+-		fs_manage_cifs_symlinks($1_t)
+-		fs_manage_cifs_named_sockets($1_t)
+-		fs_manage_cifs_named_pipes($1_t)
++		fs_manage_cifs_dirs($1_usertype)
++		fs_manage_cifs_files($1_usertype)
++		fs_manage_cifs_symlinks($1_usertype)
++		fs_manage_cifs_named_sockets($1_usertype)
++		fs_manage_cifs_named_pipes($1_usertype)
+ 	',`
+-		fs_dontaudit_manage_cifs_dirs($1_t)
+-		fs_dontaudit_manage_cifs_files($1_t)
++		fs_dontaudit_manage_cifs_dirs($1_usertype)
++		fs_dontaudit_manage_cifs_files($1_usertype)
+ 	')
+ ')
+ 
+@@ -315,14 +324,20 @@
  ## <rolebase/>
  #
  template(`userdom_exec_home_template',`
 -	can_exec($1_t,$1_home_t)
  
 -	tunable_policy(`use_nfs_home_dirs',`
+-		fs_exec_nfs_files($1_t)
 +	tunable_policy(`allow_$1_exec_content', `
-+		can_exec($1_t,$1_home_t)
++		can_exec($1_usertype,$1_home_t)
 +	',`
-+		dontaudit $1_t $1_home_t:file execute;
-+	')
-+
-+
-+	tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
- 		fs_exec_nfs_files($1_t)
++		dontaudit $1_usertype $1_home_t:file execute;
  	')
  
 -	tunable_policy(`use_samba_home_dirs',`
+-		fs_exec_cifs_files($1_t)
++
++	tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
++		fs_exec_nfs_files($1_usertype)
++	')
++
 +	tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
- 		fs_exec_cifs_files($1_t)
++		fs_exec_cifs_files($1_usertype)
  	')
  ')
-@@ -395,7 +409,9 @@
+ 
+@@ -374,12 +389,12 @@
+ 	type $1_tmp_t, $1_file_type;
+ 	files_tmp_file($1_tmp_t)
+ 
+-	manage_dirs_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_lnk_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_sock_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_fifo_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	files_tmp_filetrans($1_t, $1_tmp_t, { dir file lnk_file sock_file fifo_file })
++	manage_dirs_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_lnk_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_sock_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_fifo_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	files_tmp_filetrans($1_usertype, $1_tmp_t, { dir file lnk_file sock_file fifo_file })
+ ')
+ 
+ #######################################
+@@ -395,7 +410,9 @@
  ## <rolebase/>
  #
  template(`userdom_exec_tmp_template',`
 -	exec_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
 +	tunable_policy(`allow_$1_exec_content', `
-+		exec_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
++		exec_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
 +	')
  ')
  
  #######################################
-@@ -509,10 +525,6 @@
+@@ -509,10 +526,6 @@
  ## <rolebase/>
  #
  template(`userdom_exec_generic_pgms_template',`
@@ -13087,7 +13430,7 @@
  	corecmd_exec_bin($1_t)
  ')
  
-@@ -530,9 +542,6 @@
+@@ -530,9 +543,6 @@
  ## <rolebase/>
  #
  template(`userdom_basic_networking_template',`
@@ -13097,7 +13440,7 @@
  
  	allow $1_t self:tcp_socket create_stream_socket_perms;
  	allow $1_t self:udp_socket create_socket_perms;
-@@ -563,32 +572,29 @@
+@@ -563,32 +573,29 @@
  #
  template(`userdom_xwindows_client_template',`
  	gen_require(`
@@ -13151,7 +13494,7 @@
  ')
  
  #######################################
-@@ -664,67 +670,39 @@
+@@ -664,67 +671,39 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -13222,7 +13565,7 @@
  	files_exec_etc_files($1_t)
  	files_search_locks($1_t)
  	# Check to see if cdrom is mounted
-@@ -737,12 +715,6 @@
+@@ -737,12 +716,6 @@
  	# Stat lost+found.
  	files_getattr_lost_found_dirs($1_t)
  
@@ -13235,7 +13578,7 @@
  	# cjp: some of this probably can be removed
  	selinux_get_fs_mount($1_t)
  	selinux_validate_context($1_t)
-@@ -755,31 +727,16 @@
+@@ -755,31 +728,16 @@
  	storage_getattr_fixed_disk_dev($1_t)
  
  	auth_read_login_records($1_t)
@@ -13269,7 +13612,7 @@
  	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
  	seutil_exec_checkpolicy($1_t)
  	seutil_exec_setfiles($1_t)
-@@ -794,19 +751,12 @@
+@@ -794,19 +752,12 @@
  		files_read_default_symlinks($1_t)
  		files_read_default_sockets($1_t)
  		files_read_default_pipes($1_t)
@@ -13289,7 +13632,7 @@
  	optional_policy(`
  		alsa_read_rw_config($1_t)
  	')
-@@ -821,11 +771,6 @@
+@@ -821,11 +772,6 @@
  	')
  
  	optional_policy(`
@@ -13301,7 +13644,7 @@
  		allow $1_t self:dbus send_msg;
  		dbus_system_bus_client_template($1,$1_t)
  
-@@ -834,21 +779,18 @@
+@@ -834,21 +780,18 @@
  		')
  
  		optional_policy(`
@@ -13327,7 +13670,7 @@
  	')
  
  	optional_policy(`
-@@ -876,17 +818,17 @@
+@@ -876,17 +819,17 @@
  	')
  
  	optional_policy(`
@@ -13353,7 +13696,7 @@
  	')
  
  	optional_policy(`
-@@ -900,16 +842,6 @@
+@@ -900,16 +843,6 @@
  	')
  
  	optional_policy(`
@@ -13370,7 +13713,7 @@
  		resmgr_stream_connect($1_t)
  	')
  
-@@ -919,11 +851,6 @@
+@@ -919,11 +852,6 @@
  	')
  
  	optional_policy(`
@@ -13382,7 +13725,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +881,163 @@
+@@ -954,21 +882,163 @@
  ##	</summary>
  ## </param>
  #
@@ -13457,66 +13800,66 @@
 -	userdom_common_user_template($1)
 +	auth_dontaudit_write_login_records($1_t)
 +
-+	dev_read_sysfs($1_t)
-+	dev_read_urand($1_t)
++	dev_read_sysfs($1_usertype)
++	dev_read_urand($1_usertype)
 +
-+	kernel_dontaudit_read_system_state($1_t)
++	kernel_dontaudit_read_system_state($1_usertype)
 +
-+	domain_use_interactive_fds($1_t)
++	domain_use_interactive_fds($1_usertype)
 +	# Command completion can fire hundreds of denials
-+	domain_dontaudit_exec_all_entry_files($1_t)
++	domain_dontaudit_exec_all_entry_files($1_usertype)
 +
 +	# Stat lost+found.
-+	files_getattr_lost_found_dirs($1_t)
++	files_getattr_lost_found_dirs($1_usertype)
 +
-+	fs_get_all_fs_quotas($1_t)
-+	fs_getattr_all_fs($1_t)
-+	fs_getattr_all_dirs($1_t)
-+	fs_search_auto_mountpoints($1_t)
-+	fs_list_inotifyfs($1_t)
++	fs_get_all_fs_quotas($1_usertype)
++	fs_getattr_all_fs($1_usertype)
++	fs_getattr_all_dirs($1_usertype)
++	fs_search_auto_mountpoints($1_usertype)
++	fs_list_inotifyfs($1_usertype)
 +
 +	# Stop warnings about access to /dev/console
-+	init_dontaudit_rw_utmp($1_t)
-+	init_dontaudit_use_fds($1_t)
-+	init_dontaudit_use_script_fds($1_t)
++	init_dontaudit_rw_utmp($1_usertype)
++	init_dontaudit_use_fds($1_usertype)
++	init_dontaudit_use_script_fds($1_usertype)
 +
-+	libs_exec_lib_files($1_t)
++	libs_exec_lib_files($1_usertype)
 +
-+	logging_dontaudit_getattr_all_logs($1_t)
++	logging_dontaudit_getattr_all_logs($1_usertype)
 +
-+	miscfiles_read_man_pages($1_t)
++	miscfiles_read_man_pages($1_usertype)
 +	# for running TeX programs
-+	miscfiles_read_tetex_data($1_t)
-+	miscfiles_exec_tetex_data($1_t)
++	miscfiles_read_tetex_data($1_usertype)
++	miscfiles_exec_tetex_data($1_usertype)
 +
-+	seutil_read_config($1_t)
++	seutil_read_config($1_usertype)
 +
-+	files_dontaudit_list_default($1_t)
-+	files_dontaudit_read_default_files($1_t)
++	files_dontaudit_list_default($1_usertype)
++	files_dontaudit_read_default_files($1_usertype)
 +
 +	userdom_poly_home_template($1)
 +	userdom_poly_tmp_template($1)
 +
 +	optional_policy(`
-+		cups_stream_connect($1_t)
-+		cups_stream_connect_ptal($1_t)
++		cups_stream_connect($1_usertype)
++		cups_stream_connect_ptal($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		kerberos_use($1_t)
++		kerberos_use($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		mta_dontaudit_read_spool_symlinks($1_t)
++		mta_dontaudit_read_spool_symlinks($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		quota_dontaudit_getattr_db($1_t)
++		quota_dontaudit_getattr_db($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		rpm_read_db($1_t)
-+		rpm_dontaudit_manage_db($1_t)
++		rpm_read_db($1_usertype)
++		rpm_dontaudit_manage_db($1_usertype)
 +	')
 +')
 +
@@ -13552,7 +13895,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1046,51 @@
+@@ -977,23 +1047,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -13615,7 +13958,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1126,7 @@
+@@ -1029,15 +1127,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -13632,7 +13975,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1143,6 @@
+@@ -1054,17 +1144,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -13650,7 +13993,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1180,8 @@
+@@ -1102,6 +1181,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -13659,7 +14002,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1207,7 @@
+@@ -1127,7 +1208,7 @@
  	# $1_t local policy
  	#
  
@@ -13668,7 +14011,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1219,11 @@
+@@ -1139,7 +1220,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -13681,7 +14024,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1902,6 +1986,41 @@
+@@ -1902,6 +1987,41 @@
  
  ########################################
  ## <summary>
@@ -13723,7 +14066,7 @@
  ##	Do not audit attempts to set the
  ##	attributes of user home files.
  ## </summary>
-@@ -3078,7 +3197,7 @@
+@@ -3078,7 +3198,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -13732,7 +14075,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4734,24 @@
+@@ -4615,6 +4735,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -13757,7 +14100,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4770,14 @@
+@@ -4633,6 +4771,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -13772,7 +14115,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5468,7 @@
+@@ -5323,7 +5469,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -13781,7 +14124,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5704,336 @@
+@@ -5559,3 +5705,372 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -13977,31 +14320,35 @@
 +
 +userdom_xwindows_client_template($1)
 +
-+logging_send_syslog_msg($1_t)
++logging_send_syslog_msg($1_usertype)
 +
 +optional_policy(`
-+	alsa_read_rw_config($1_t)
++	alsa_read_rw_config($1_usertype)
 +')
 +
 +authlogin_per_role_template($1, $1_t, $1_r)
 +
-+auth_search_pam_console_data($1_t)
++auth_search_pam_console_data($1_usertype)
 +
-+dev_read_sound($1_t)
-+dev_write_sound($1_t)
++dev_read_sound($1_usertype)
++dev_write_sound($1_usertype)
 +
 +optional_policy(`
-+	dbus_per_role_template($1, $1_t, $1_r)
-+	dbus_system_bus_client_template($1, $1_t)
-+	allow $1_t self:dbus send_msg;
++	dbus_per_role_template($1, $1_usertype, $1_r)
++	dbus_system_bus_client_template($1, $1_usertype)
++	allow $1_usertype $1_usertype:dbus send_msg;
 +
 +	optional_policy(`
-+		cups_dbus_chat($1_t)
++		cups_dbus_chat($1_usertype)
 +	')
 +
 +')
 +
 +optional_policy(`
++	consolekit_dontaudit_dbus_chat($1_usertype)
++')
++
++optional_policy(`
 +	java_per_role_template($1, $1_t, $1_r)
 +')
 +
@@ -14010,11 +14357,15 @@
 +')
 +
 +optional_policy(`
-+	setroubleshoot_dontaudit_stream_connect($1_t)
++	networkmanager_dontaudit_dbus_chat($1_usertype)
++')
++
++optional_policy(`
++	setroubleshoot_dontaudit_stream_connect($1_usertype)
 +')
 +
 +# gnome keyring wants to read this. Needs to be exlicitly granted
-+dev_dontaudit_read_rand($1_t)
++dev_dontaudit_read_rand($1_usertype)
 +
 +')
 +
@@ -14118,6 +14469,34 @@
 +	allow $1 userdomain:process rlimitinh;
 +')
 +
++########################################
++## <summary>
++##	Define this type as a Allow apps to set rlimits on userdomain
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++template(`userdom_unpriv_usertype',`
++	gen_require(`
++		attribute unpriv_userdomain, userdomain;
++	')
++	typeattribute $2  $1_usertype, unpriv_userdomain, userdomain;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-09-12 10:34:51.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/userdomain.te	2007-09-17 16:20:18.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- selinux-policy.spec	19 Sep 2007 17:40:59 -0000	1.524
+++ selinux-policy.spec	20 Sep 2007 14:39:14 -0000	1.525
@@ -288,7 +288,7 @@
 semodule -s targeted -r moilscanner 2>/dev/null
 %loadpolicy targeted
 %relabel targeted
-if [ $1 = 0 ]; then
+if [ $1 = 1 ]; then
 semanage login -m -s "system_u" __default__ 2> /dev/null
 semanage user -a -P unconfined -R "unconfined_r system_r" unconfined_u 
 semanage user -a -P guest -R guest_r guest_u



From fedora-extras-commits at redhat.com  Thu Sep 20 14:40:17 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:40:17 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.5, 1.1.2.6 kde4.sh, 1.1.2.5,
	1.1.2.6
Message-ID: <200709201440.l8KEeHrB012816@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12747

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.csh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,19 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
-
-## if not using IP6, speeds DNS operations
-# # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-
-## fork io slaves from prog, not kdeinit.  may help selinux. (experimental)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 if ( ! $?QT_PLUGIN_PATH ) then
   set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.sh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,18 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -f /etc/sysconfig/prelink ]; then
-#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#  fi
-#fi
-
-## if not using IP6, speeds DNS operations
-# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
-## fork io slaves from prog, not kdeinit. may help selinux (experimetal)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
+  fi
+fi
 
 if [ -z "$QT_PLUGIN_PATH" ]; then
   KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:00 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:41:00 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.525,1.526
Message-ID: <200709201441.l8KEf0oH012860@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12822

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- selinux-policy.spec	20 Sep 2007 14:39:14 -0000	1.525
+++ selinux-policy.spec	20 Sep 2007 14:40:24 -0000	1.526
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
+- Fix to add xguest account when inititial install
+
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
 - Allow xserver to search devpts_t
 - Dontaudit ldconfig output to homedir



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:33 2007
From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood))
Date: Thu, 20 Sep 2007 10:41:33 -0400
Subject: rpms/perl-TimeDate/EL-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE perl-TimeDate.spec, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200709201441.l8KEfXNx012959@cvs-int.fedora.redhat.com>

Author: rnorwood

Update of /cvs/pkgs/rpms/perl-TimeDate/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12952

Added Files:
	dead.package 
Removed Files:
	Makefile branch perl-TimeDate.spec sources 
Log Message:
perl-DateTime in now included in RHEL.


--- NEW FILE dead.package ---
perl-TimeDate was released as an update to RHEL5.


--- Makefile DELETED ---


--- branch DELETED ---


--- perl-TimeDate.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:35 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 20 Sep 2007 10:41:35 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.46,1.47
Message-ID: <200709201441.l8KEfZtM012972@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12859

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- fix symlinks again



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- desktop-backgrounds.spec	6 Sep 2007 19:43:55 -0000	1.46
+++ desktop-backgrounds.spec	20 Sep 2007 14:41:01 -0000	1.47
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 4
+Release: 5
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -89,6 +89,7 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
+ ln -sf ../infinity/am00.png default.jpg;
  ln -sf ../infinity/am00.png default.png;
  ln -sf ../infinity/am00.png default-wide.png;
  ln -sf ../infinity/am00.png default-5_4.png)
@@ -134,6 +135,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Thu Sep 20 2007 Ray Strode <rstrode at redhat.com> - 7.92-5
+- fix symlinks again
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> - 7.92-4
 - fix symlinks
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:41:49 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.223.2.23,1.223.2.24
Message-ID: <200709201441.l8KEfnUX013018@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12905

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
don't use %%kde4_bindir in scriptets



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.23
retrieving revision 1.223.2.24
diff -u -r1.223.2.23 -r1.223.2.24
--- kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
+++ kdelibs.spec	20 Sep 2007 14:41:16 -0000	1.223.2.24
@@ -142,7 +142,7 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-# fix file conflict with js (kde#149840)
+# fix file conflict with mozilla's js (kde#149840)
 mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
 
 # remove files which conflict with KDE 3
@@ -176,13 +176,13 @@
 
 %post
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Sep 20 14:47:43 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:47:43 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.8,1.9
Message-ID: <200709201447.l8KElhrk013223@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191

Modified Files:
	kdepimlibs.spec 
Log Message:
cosmetics



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdepimlibs.spec	13 Sep 2007 03:36:20 -0000	1.8
+++ kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
@@ -57,7 +57,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}



From fedora-extras-commits at redhat.com  Thu Sep 20 14:48:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 10:48:12 -0400
Subject: rpms/acl/F-7 acl-2.2.39-path_max.patch,1.1,1.2 acl.spec,1.32,1.33
Message-ID: <200709201448.l8KEmCVe013321@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13222

Modified Files:
	acl-2.2.39-path_max.patch acl.spec 
Log Message:
Rewriten path_max patch to support long UTF8 names


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-7/acl-2.2.39-path_max.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acl-2.2.39-path_max.patch	5 Jul 2006 19:32:12 -0000	1.1
+++ acl-2.2.39-path_max.patch	20 Sep 2007 14:48:10 -0000	1.2
@@ -14,11 +14,11 @@
  	int c;
 -	char linebuf[1024];
 +	/*
-+	  Max PATH_MAX bytes even for UTF-8 path names and additional 6 
-+	  bytes for "#file:". Not a good solution but for now it is the 
++	  Max PATH_MAX bytes even for UTF-8 path names and additional 9 
++	  bytes for "# file: ".Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[PATH_MAX+6];
++	char linebuf[(4*PATH_MAX)+9];
  	char *cp;
  	char *p;
  	int comments_read = 0;


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-7/acl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- acl.spec	21 Mar 2007 10:36:08 -0000	1.32
+++ acl.spec	20 Sep 2007 14:48:10 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 3.1%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
@@ -102,6 +102,10 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Sep 20 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-4
+- Rewriten path_max patch to support long UTF8 names
+- Resolves #287701, #183181
+
 * Wed Mar 21 2007 Thomas Woerner <twoerner at redhat.com> 2.2.39-3.1
 - new improved walk patch with fixed getfacl exit code (rhbz#232884)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:49:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:49:08 -0400
Subject: rpms/kdepimlibs/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200709201449.l8KEn8bL013409@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13370

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2007 02:18:56 -0000	1.3
+++ .cvsignore	20 Sep 2007 14:48:35 -0000	1.4
@@ -1,2 +1,2 @@
-kdepimlibs-3.91.0.tar.bz2
 kdepimlibs-3.92.0.tar.bz2
+kdepimlibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2007 02:18:56 -0000	1.3
+++ sources	20 Sep 2007 14:48:35 -0000	1.4
@@ -1 +1 @@
-0fa2ff6f04f5176717776dec6753edba  kdepimlibs-3.92.0.tar.bz2
+488e70022a2f0a3922621de2af9b7ddd  kdepimlibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:51:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:51:11 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.20,1.263.2.21
Message-ID: <200709201451.l8KEpBEa013489@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
costmetics



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.20
retrieving revision 1.263.2.21
diff -u -r1.263.2.20 -r1.263.2.21
--- kdebase.spec	13 Sep 2007 19:00:52 -0000	1.263.2.20
+++ kdebase.spec	20 Sep 2007 14:50:38 -0000	1.263.2.21
@@ -104,7 +104,7 @@
 
 mkdir -p %{_target_platform} 
 pushd %{_target_platform}
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}



From fedora-extras-commits at redhat.com  Thu Sep 20 14:53:26 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 10:53:26 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.58,1.59
Message-ID: <200709201453.l8KErQqj013582@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13554

Modified Files:
	alsa-lib.spec 
Log Message:
- added changes from review request (#225241)

* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc2
- Update License field.
- Use configdir instead of sysconfdir hacks (cleaner).
- Remove redundant optflags overriding.
- Switch to using main "version", and merge "postver" since this is the right
  way of doing things (see NamingGuidelines#NonNumericRelease).
- Remove static library.
- Mark all of /etc/alsa as config, but not "noreplace".
- Remove useless rpath on 64bit archs.





Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- alsa-lib.spec	19 Sep 2007 09:54:21 -0000	1.58
+++ alsa-lib.spec	20 Sep 2007 14:52:53 -0000	1.59
@@ -1,20 +1,19 @@
-%define  version_main   1.0.15
 %define  prever         rc2
 %define  prever_dot     .rc2
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
-Version: %{version_main}
-Release: 0.1%{?prever_dot}%{?dist}
-License: LGPL
+Version: 1.0.15
+Release: 0.2%{?prever_dot}%{?dist}
+License: LGPLv2+
 Group:   System Environment/Libraries
-Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
-Patch0:   alsa-lib-1.0.14rc1-config.patch
-Patch2:   alsa-lib-1.0.14-glibc-open.patch
+Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+Patch0:	 alsa-lib-1.0.14rc1-config.patch
+Patch2:	 alsa-lib-1.0.14-glibc-open.patch
 URL:     http://www.alsa-project.org/
-BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
-Prereq:  /sbin/ldconfig, coreutils
+Requires(post): /sbin/ldconfig, coreutils
 
 %description
 The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
@@ -25,10 +24,11 @@
 the older OSS API, providing binary compatibility for most OSS programs.
 
 %package devel
-Summary: Static libraries and header files from the ALSA library.
+Summary: Development files from the ALSA library
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 functionality to the Linux operating system.
@@ -37,15 +37,15 @@
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version_main}%{?prever}%{?postver}
+%setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 
 %build
-%configure \
-    CFLAGS="$RPM_OPT_FLAGS"\
-    --enable-static=yes \
-    --datadir=/etc
+%configure --with-configdir=%{_sysconfdir}/alsa
+# Remove useless /usr/lib64 rpath on 64bit archs
+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}
 make doc
 
@@ -53,14 +53,11 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_datadir}
+# We need the library to be available even before /usr might be mounted
 mkdir -p %{buildroot}/%{_lib}
-
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
-mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
-
 %clean
 rm -rf %{buildroot}
 
@@ -72,28 +69,34 @@
 ln -snf ../../etc/alsa %{_datadir}/alsa
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%{_bindir}/aserver
+%config %{_sysconfdir}/alsa/
 /%{_lib}/libasound.so.*
-%{_libdir}/alsa-lib/smixer/*
-%{_sysconfdir}/alsa
-%config %{_sysconfdir}/alsa/alsa.conf
-%dir %{_libdir}/alsa-lib
-%dir %{_libdir}/alsa-lib/smixer
+%{_bindir}/aserver
+%{_libdir}/alsa-lib/
 
 %files devel
-%defattr(-, root, root)
-%doc doc/doxygen
-%{_includedir}/alsa
+%defattr(-,root,root,-)
+%doc doc/doxygen/
+%{_includedir}/alsa/
 %{_includedir}/sys/asoundlib.h
 %{_libdir}/libasound.so
-%{_libdir}/libasound.a
 %exclude %{_libdir}/libasound.la
 %{_libdir}/pkgconfig/alsa.pc
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc2
+- Update License field.
+- Use configdir instead of sysconfdir hacks (cleaner).
+- Remove redundant optflags overriding.
+- Switch to using main "version", and merge "postver" since this is the right
+  way of doing things (see NamingGuidelines#NonNumericRelease).
+- Remove static library.
+- Mark all of /etc/alsa as config, but not "noreplace".
+- Remove useless rpath on 64bit archs.
+
 * Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
 - updated to 1.0.15rc2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:55:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:55:01 -0400
Subject: rpms/kdebase/devel .cvsignore, 1.57.2.3, 1.57.2.4 sources, 1.78.2.2,
	1.78.2.3
Message-ID: <200709201455.l8KEt12G013674@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13647

Modified Files:
      Tag: kdebase-kde4-branch
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.57.2.3
retrieving revision 1.57.2.4
diff -u -r1.57.2.3 -r1.57.2.4
--- .cvsignore	29 Jul 2007 02:27:21 -0000	1.57.2.3
+++ .cvsignore	20 Sep 2007 14:54:29 -0000	1.57.2.4
@@ -1,2 +1,2 @@
-kdebase-3.91.0.tar.bz2
 kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.78.2.2
retrieving revision 1.78.2.3
diff -u -r1.78.2.2 -r1.78.2.3
--- sources	29 Jul 2007 02:27:21 -0000	1.78.2.2
+++ sources	20 Sep 2007 14:54:29 -0000	1.78.2.3
@@ -1 +1 @@
-7a8731fc696512044463537314b75281  kdebase-3.92.0.tar.bz2
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:58:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:58:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.62,1.63
Message-ID: <200709201458.l8KEwESM013761@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13740

Modified Files:
	policy-20070703.patch 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- policy-20070703.patch	20 Sep 2007 14:39:14 -0000	1.62
+++ policy-20070703.patch	20 Sep 2007 14:58:12 -0000	1.63
@@ -1239,7 +1239,7 @@
  /usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.0.8/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/gnome.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/gnome.if	2007-09-20 10:51:59.000000000 -0400
 @@ -33,6 +33,51 @@
  ## </param>
  #
@@ -7945,7 +7945,7 @@
  manage_files_pattern(rpcbind_t,rpcbind_var_run_t,rpcbind_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.0.8/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rpc.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rpc.if	2007-09-20 10:47:23.000000000 -0400
 @@ -89,8 +89,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -7959,6 +7959,31 @@
  
  	fs_rw_rpc_named_pipes($1_t) 
  	fs_search_auto_mountpoints($1_t)
+@@ -214,6 +217,24 @@
+ 
+ ########################################
+ ## <summary>
++##      Execute domain in nfsd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##      The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpc_domtrans_rpcd',`
++	gen_require(`
++		type rpcd_t, rpcd_exec_t;
++	')
++
++	domtrans_pattern($1,rpcd_exec_t,rpcd_t)
++')
++
++########################################
++## <summary>
+ ##      Read NFS exported content.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-17 16:20:18.000000000 -0400
@@ -9464,7 +9489,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 09:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 10:52:36.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9534,7 +9559,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,49 @@
+@@ -555,25 +558,52 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9553,6 +9578,9 @@
 +	userdom_user_home_dir_filetrans_user_home_content($1, xdm_t, { dir file })
 +	userdom_manage_user_tmp_dirs($1, xdm_t)
 +	userdom_manage_user_tmp_files($1, xdm_t)
++
++	# Handling of pam_keyring
++	gnome_manage_user_gnome_config($1, xdm_t)
  
  	xserver_ro_session_template(xdm,$2,$3)
 -	xserver_rw_session_template($1,$2,$3)
@@ -9592,7 +9620,7 @@
  	')
  ')
  
-@@ -626,6 +653,24 @@
+@@ -626,6 +656,24 @@
  
  ########################################
  ## <summary>
@@ -9617,7 +9645,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +704,73 @@
+@@ -659,6 +707,73 @@
  
  ########################################
  ## <summary>
@@ -9691,7 +9719,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1039,7 @@
+@@ -927,6 +1042,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9699,7 +9727,7 @@
  ')
  
  ########################################
-@@ -987,6 +1100,37 @@
+@@ -987,6 +1103,37 @@
  
  ########################################
  ## <summary>
@@ -9737,7 +9765,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1280,7 @@
+@@ -1136,7 +1283,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9746,7 +9774,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1469,62 @@
+@@ -1325,3 +1472,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9811,7 +9839,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-19 11:59:42.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 10:44:00.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9882,16 +9910,19 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +324,8 @@
+@@ -306,6 +324,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
 +	dbus_system_bus_client_template(xdm, xdm_t)
 +	dbus_send_system_bus(xdm_t)
++	optional_policy(`
++		hal_dbus_chat(xdm_t)
++	')
  ')
  
  optional_policy(`
-@@ -348,12 +368,8 @@
+@@ -348,12 +371,8 @@
  ')
  
  optional_policy(`
@@ -9905,7 +9936,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +401,7 @@
+@@ -385,7 +404,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9914,7 +9945,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +441,10 @@
+@@ -425,6 +444,10 @@
  ')
  
  optional_policy(`
@@ -9925,7 +9956,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +454,19 @@
+@@ -434,47 +457,19 @@
  ')
  
  optional_policy(`
@@ -11922,7 +11953,7 @@
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.0.8/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/mount.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/mount.te	2007-09-20 10:47:39.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -12020,7 +12051,7 @@
  ')
  
  optional_policy(`
-@@ -159,13 +176,8 @@
+@@ -159,13 +176,9 @@
  
  	fs_search_rpc(mount_t)
  
@@ -12031,10 +12062,11 @@
 -	optional_policy(`
 -		nis_use_ypbind(mount_t)
 -	')
++	rpc_domtrans_rpcd(mount_t)
  ')
  
  optional_policy(`
-@@ -189,10 +201,6 @@
+@@ -189,10 +202,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -12045,7 +12077,7 @@
  ########################################
  #
  # Unconfined mount local policy
-@@ -201,4 +209,29 @@
+@@ -201,4 +210,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -13131,7 +13163,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 09:09:10.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 10:55:37.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14124,7 +14156,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5705,372 @@
+@@ -5559,3 +5705,375 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14493,8 +14525,11 @@
 +template(`userdom_unpriv_usertype',`
 +	gen_require(`
 +		attribute unpriv_userdomain, userdomain;
++		attribute $1_usertype;
 +	')
-+	typeattribute $2  $1_usertype, unpriv_userdomain, userdomain;
++	typeattribute $2  $1_usertype;
++	typeattribute $2  unpriv_userdomain;
++	typeattribute $2  userdomain;
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.8/policy/modules/system/userdomain.te



From fedora-extras-commits at redhat.com  Thu Sep 20 15:09:58 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 11:09:58 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.58,1.59
Message-ID: <200709201509.l8KF9wZh020256@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20206

Modified Files:
	alsa-utils.spec 
Log Message:
* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
- Update License field.
- Mark udev rule as config.
- Use find_lang macro again to include translations (why was it removed?).

review request (#225242)




Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- alsa-utils.spec	19 Sep 2007 12:26:53 -0000	1.58
+++ alsa-utils.spec	20 Sep 2007 15:09:25 -0000	1.59
@@ -4,8 +4,8 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.15
-Release: 	0.1%{?prever_dot}%{?dist}
-License: 	GPL
+Release: 	0.2%{?prever_dot}%{?dist}
+License: 	GPLv2+
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
 Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
@@ -40,16 +40,15 @@
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 # Install ALSA udev rules
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
+install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -m 755 alsaunmute  %{buildroot}/bin
-install -m 755 alsacard  %{buildroot}/bin
-install -m 755 salsa %{buildroot}/sbin
+install -p -m 755 salsa alsacard alsaunmute %{buildroot}/bin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
@@ -62,27 +61,27 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
-/etc/udev/rules.d/*
+%config /etc/udev/rules.d/*
 /bin/*
 /sbin/*
 %{_bindir}/*
 %{_sbindir}/*
+%{_datadir}/alsa/
+%{_datadir}/sounds/
 %{_mandir}/man?/*
-%dir %{_datadir}/sounds
-%dir %{_datadir}/sounds/alsa
-%{_datadir}/sounds/alsa/*
-%dir %{_datadir}/alsa
-%dir %{_datadir}/alsa/speaker-test
-%{_datadir}/alsa/speaker-test/*
-/usr/share/locale/*
 /var/lib/alsa
 %ghost /var/lib/alsa/asound.state
 
 
 %changelog
+* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
+- Update License field.
+- Mark udev rule as config.
+- Use find_lang macro again to include translations (why was it removed?).
+
 * Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
 - new upstream
 - moved saved volume settings to /var/lib (#293301)
@@ -201,7 +200,7 @@
 
 * Mon Apr 25 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - New upstream version
-- add %find_lang macro (#155719)
+- add %%find_lang macro (#155719)
 
 * Fri Apr 1 2005 Bill Nottingham <notting at redhat.com> 1.0.8-4
 - replace the dev.d script with a program that calls alsactl to



From fedora-extras-commits at redhat.com  Thu Sep 20 15:11:43 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 11:11:43 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.81,1.82
Message-ID: <200709201511.l8KFBhxg020376@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20340

Modified Files:
	sound-juicer.spec 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-2
- Fix crasher when editing profiles and the profile gets unref'ed
  (#278861)



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sound-juicer.spec	17 Sep 2007 15:47:33 -0000	1.81
+++ sound-juicer.spec	20 Sep 2007 15:11:10 -0000	1.82
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
@@ -22,6 +22,8 @@
 Requires:	cdparanoia
 Requires:	nautilus-cd-burner >= %{nautilus_cd_burner_version}
 
+Patch1:		sound-juicer-2.20.0-profile-editing.patch
+
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
@@ -53,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .no-profile-crash
 
 %build
 # work around a gstreamer problem where it 
@@ -117,6 +120,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-2
+- Fix crasher when editing profiles and the profile gets unref'ed
+  (#278861)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:12:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 11:12:21 -0400
Subject: rpms/sound-juicer/devel sound-juicer-2.20.0-profile-editing.patch, 
	NONE, 1.1
Message-ID: <200709201512.l8KFCLUi020449@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20391

Added Files:
	sound-juicer-2.20.0-profile-editing.patch 
Log Message:
Add really add the patch


sound-juicer-2.20.0-profile-editing.patch:

--- NEW FILE sound-juicer-2.20.0-profile-editing.patch ---
--- trunk/libjuicer/sj-extractor.c	2007/07/05 11:41:07	1825
+++ trunk/libjuicer/sj-extractor.c	2007/09/19 08:13:54	1882
@@ -241,7 +241,8 @@
 sj_extractor_init (SjExtractor *extractor)
 {
   extractor->priv = EXTRACTOR_PRIVATE (extractor);
-  extractor->priv->profile = gm_audio_profile_lookup (DEFAULT_AUDIO_PROFILE_NAME);
+  extractor->priv->profile =
+    g_object_ref (gm_audio_profile_lookup (DEFAULT_AUDIO_PROFILE_NAME));
   extractor->priv->rebuild_pipeline = TRUE;
   extractor->priv->paranoia_mode = 8; /* TODO: replace with construct params */
 }



From fedora-extras-commits at redhat.com  Thu Sep 20 15:21:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Thu, 20 Sep 2007 11:21:52 -0400
Subject: rpms/neon/devel mirrors, NONE, 1.1 neon-0.27.0-gssapi.patch, NONE, 
	1.1 neon.spec, 1.34, 1.35
Message-ID: <200709201521.l8KFLqU1021059@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21030

Modified Files:
	neon.spec 
Added Files:
	mirrors neon-0.27.0-gssapi.patch 
Log Message:
* Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
- fix Negotiate response verification



--- NEW FILE mirrors ---
http://www.webdav.org/neon/

neon-0.27.0-gssapi.patch:

--- NEW FILE neon-0.27.0-gssapi.patch ---
--- neon-0.27.0/src/ne_auth.c.gssapi
+++ neon-0.27.0/src/ne_auth.c
@@ -532,7 +532,7 @@ static int verify_negotiate_response(str
     char *duphdr = ne_strdup(hdr);
     char *sep, *ptr = strchr(duphdr, ' ');
     int ret;
-    ne_buffer *errmsg;
+    ne_buffer *errmsg = NULL;
 
     if (strncmp(hdr, "Negotiate", ptr - duphdr) != 0) {
         ne_set_error(sess->sess, _("Negotiate response verification failed: "
@@ -560,8 +560,10 @@ static int verify_negotiate_response(str
         ne_set_error(sess->sess, _("Negotiate response verification failure: %s"),
                      errmsg->data);
     }
-    ne_buffer_destroy(errmsg);
+
+    if (errmsg) ne_buffer_destroy(errmsg);
     ne_free(duphdr);
+
     return ret ? NE_ERROR : NE_OK;
 }
 #endif


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- neon.spec	30 Aug 2007 12:53:29 -0000	1.34
+++ neon.spec	20 Sep 2007 15:21:20 -0000	1.35
@@ -1,12 +1,13 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.27.0
-Release: 2
+Release: 3
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
+Patch1: neon-0.27.0-gssapi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
@@ -32,16 +33,17 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .gssapi
 
 %build
 export CC="%{__cc} -pthread"
-%configure --with-ssl --with-expat --enable-shared --enable-warnings \
-        --enable-threadsafe-ssl=posix
+%configure --with-expat --enable-shared --enable-warnings \
+        --with-ssl=openssl --enable-threadsafe-ssl=posix
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -68,6 +70,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
+- fix Negotiate response verification
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 0.27.0-2
 - enable OpenSSL thread-safety hooks
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:23:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 11:23:01 -0400
Subject: rpms/acl/devel acl-2.2.39-path_max.patch,1.2,1.3
Message-ID: <200709201523.l8KFN1EY021179@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21109

Modified Files:
	acl-2.2.39-path_max.patch 
Log Message:


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-path_max.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acl-2.2.39-path_max.patch	20 Sep 2007 13:53:35 -0000	1.2
+++ acl-2.2.39-path_max.patch	20 Sep 2007 15:22:59 -0000	1.3
@@ -14,11 +14,11 @@
  	int c;
 -	char linebuf[1024];
 +	/*
-+	  Max PATH_MAX bytes even for UTF-8 path names and additional 6 
-+	  bytes for "#file:". Not a good solution but for now it is the 
++	  Max PATH_MAX bytes even for UTF-8 path names and additional 9 
++	  bytes for "# file: ".Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[(4*PATH_MAX)+6];
++	char linebuf[(4*PATH_MAX)+9];
  	char *cp;
  	char *p;
  	int comments_read = 0;



From fedora-extras-commits at redhat.com  Thu Sep 20 15:23:50 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 11:23:50 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7.bz2.sign, NONE, 1.1 .cvsignore, 
	1.688, 1.689 kernel.spec, 1.172, 1.173 sources, 1.650,
	1.651 upstream, 1.572, 1.573 patch-2.6.23-rc6-git8.bz2.sign, 1.1, NONE
Message-ID: <200709201523.l8KFNoxM021301@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21187

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git8.bz2.sign 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7



--- NEW FILE patch-2.6.23-rc7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8bGbyGugalF9Dw4RAh12AJ40FZMWEhJFE0iYd1VZPKyJXInYJQCfcUyV
KtDeLHOLKgJm8GWVs9MJK7M=
=43IR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- .cvsignore	19 Sep 2007 22:19:45 -0000	1.688
+++ .cvsignore	20 Sep 2007 15:23:18 -0000	1.689
@@ -3,5 +3,5 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc6.bz2
+patch-2.6.23-rc7.bz2
 patch-2.6.23-rc6-git8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kernel.spec	19 Sep 2007 23:44:41 -0000	1.172
+++ kernel.spec	20 Sep 2007 15:23:18 -0000	1.173
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 8
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
 - drm-mm-git.patch - pull in DRM git queue
 - nouveau-drm.patch - update nouveau patch on top of drm git queue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -r1.650 -r1.651
--- sources	19 Sep 2007 22:19:45 -0000	1.650
+++ sources	20 Sep 2007 15:23:18 -0000	1.651
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-7af060af2f67d1bc774c40025d3b5f4f  patch-2.6.23-rc6-git8.bz2
+828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- upstream	19 Sep 2007 22:19:46 -0000	1.572
+++ upstream	20 Sep 2007 15:23:18 -0000	1.573
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git8.bz2
+patch-2.6.23-rc7.bz2


--- patch-2.6.23-rc6-git8.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 15:26:29 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:26:29 -0400
Subject: rpms/cdrkit/F-7 genisoimage-dlength.patch, NONE, 1.1 cdrkit.spec,
	1.4, 1.5
Message-ID: <200709201526.l8KFQTAj021509@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21481

Modified Files:
	cdrkit.spec 
Added Files:
	genisoimage-dlength.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
- fixed rhbz#248262
- switched to alternatives


genisoimage-dlength.patch:

--- NEW FILE genisoimage-dlength.patch ---
diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
--- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
@@ -1596,12 +1602,10 @@
 		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
 		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
 		!S_ISDIR(lstatbuf.st_mode)) {
-        if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
-            fprintf(stderr,
-                    "Unknown file type (%s) %s - ignoring and continuing.\n",
-                    filetype((int) lstatbuf.st_mode), whole_path);
-            return (0);
-        }
+		fprintf(stderr,
+		"Unknown file type (%s) %s - ignoring and continuing.\n",
+			filetype((int) lstatbuf.st_mode), whole_path);
+		return (0);
 	}
 	/* Who knows what trash this is - ignore and continue */
 



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrkit.spec	21 Jun 2007 09:04:13 -0000	1.4
+++ cdrkit.spec	20 Sep 2007 15:25:57 -0000	1.5
@@ -1,11 +1,14 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
+
+Patch1: genisoimage-dlength.patch
+
 BuildRequires: cmake libcap-devel zlib-devel perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +23,9 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives 
+Requires(post): %{_sbindir}/alternatives  
+Requires(postun): %{_sbindir}/alternatives 
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -32,6 +38,9 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -49,6 +58,9 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -59,6 +71,7 @@
 
 %prep
 %setup -q 
+%patch1 -p1 -b .dlength
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -78,27 +91,58 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
-ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
-ln -s readom $RPM_BUILD_ROOT%{_bindir}/readcd
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n wodim
+%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
+		%{_bindir}/wodim 50 \
+	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/dvdrecord cdrecord-dvdrecord %{_bindir}/wodim \
+	--slave %{_mandir}/man1/dvdrecord.1.gz cdrecord-dvdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
+	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
+		%{_mandir}/man1/readcd.1.gz 
+
+%preun -n wodim
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
+fi
+
+%post -n genisoimage
+%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
+		%{_bindir}/genisoimage 50 \
+	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
+		%{_mandir}/man1/genisoimage.1.gz \
+	--slave %{_bindir}/mkhybrid mkisofs-mkhybrid %{_bindir}/genisoimage
+
+%preun -n genisoimage
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
+fi
+
+%post -n icedax
+%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
+		%{_bindir}/icedax 50 \
+	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
+		%{_mandir}/man1/icedax.1.gz 
+
+%preun -n icedax
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
+fi
+
 %files -n wodim
 %defattr(-,root,root)
 %doc Changelog COPYING FAQ FORK START
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
-%{_bindir}/cdrecord
-%{_bindir}/dvdrecord
 %{_bindir}/readom
-%{_bindir}/readcd
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
 %{_mandir}/man1/wodim.*
@@ -108,7 +152,6 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
-%{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -118,8 +161,6 @@
 %files -n genisoimage
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
-%{_bindir}/mkisofs
-%{_bindir}/mkhybrid
 %{_bindir}/genisoimage
 %{_bindir}/isodebug
 %{_bindir}/isodump
@@ -139,6 +180,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+- fixed rhbz#248262
+- switched to alternatives
+
 * Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-1
 - version 1.1.6
 - added readcd symlink



From fedora-extras-commits at redhat.com  Thu Sep 20 15:31:15 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:31:15 -0400
Subject: rpms/zabbix/EL-4 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.10, 1.11
Message-ID: <200709201531.l8KFVF1u021770@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21697

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 15:30:42 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 15:30:42 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	15 Sep 2007 11:46:26 -0000	1.10
+++ zabbix.spec	20 Sep 2007 15:30:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -252,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
 - Add a patch required for finding net-snmp libs on x86_64
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:32:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:32:53 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.5,1.6
Message-ID: <200709201532.l8KFWrvK021914@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21892

Modified Files:
	cdrkit.spec 
Log Message:
- changed license to GPLv2
- same specfile as rawhide



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cdrkit.spec	20 Sep 2007 15:25:57 -0000	1.5
+++ cdrkit.spec	20 Sep 2007 15:32:20 -0000	1.6
@@ -1,8 +1,8 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
@@ -180,10 +180,13 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
-* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives
 
+* Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+- changed license to GPLv2
+
 * Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-1
 - version 1.1.6
 - added readcd symlink



From fedora-extras-commits at redhat.com  Thu Sep 20 15:35:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:35:28 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.11,1.12
Message-ID: <200709201535.l8KFZS48022000@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21979

Modified Files:
	zabbix.spec 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zabbix.spec	20 Sep 2007 15:30:42 -0000	1.11
+++ zabbix.spec	20 Sep 2007 15:34:55 -0000	1.12
@@ -12,6 +12,8 @@
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
 Patch0:		zabbix-1.4.2-netsnmp-x86_64.patch
+Patch1:		zabbix-1.4.2-include.patch
+Patch2:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -81,6 +83,8 @@
 %ifarch x86_64
 %patch0
 %endif
+%patch1 -p1 -b .include
+%patch2 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}



From fedora-extras-commits at redhat.com  Thu Sep 20 15:47:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:47:28 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.12,1.13
Message-ID: <200709201547.l8KFlSY4022298@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22269

Modified Files:
	zabbix.spec 
Log Message:
 - update Source0 to match current guidelines


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zabbix.spec	20 Sep 2007 15:34:55 -0000	1.12
+++ zabbix.spec	20 Sep 2007 15:46:55 -0000	1.13
@@ -6,7 +6,7 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init



From fedora-extras-commits at redhat.com  Thu Sep 20 15:52:21 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:52:21 -0400
Subject: rpms/zabbix/EL-5 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-server.init,
	1.1, 1.2 zabbix.spec, 1.10, 1.11
Message-ID: <200709201552.l8KFqLiC022529@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485

Modified Files:
	zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 15:51:49 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	11 Sep 2007 05:38:55 -0000	1.10
+++ zabbix.spec	20 Sep 2007 15:51:49 -0000	1.11
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:54:41 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:54:41 -0400
Subject: rpms/zabbix/EL-5 zabbix-agent.init,1.1,1.2
Message-ID: <200709201554.l8KFsfr9022639@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22612

Modified Files:
	zabbix-agent.init 
Log Message:
 - really fix the script


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 15:54:08 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:01:40 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 20 Sep 2007 12:01:40 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.8,1.9
Message-ID: <200709201601.l8KG1eHQ028959@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28062

Modified Files:
	eclipse-mylyn.spec 
Log Message:
Add full URL for Fedora customizations source zip.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-mylyn.spec	19 Sep 2007 22:31:16 -0000	1.8
+++ eclipse-mylyn.spec	20 Sep 2007 16:01:06 -0000	1.9
@@ -17,7 +17,7 @@
 # tar cjf org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2 org.eclipse.mylyn
 Source0: org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
 Source1: fetch-mylar.sh
-Source2: fedoraeclipse-mylynbugzilla-0.0.1.zip
+Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.1.zip
 
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626



From fedora-extras-commits at redhat.com  Thu Sep 20 16:13:14 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:13:14 -0400
Subject: rpms/zabbix/FC-6 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.9, 1.10
Message-ID: <200709201613.l8KGDEts029302@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29270

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 16:12:41 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 16:12:41 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	11 Sep 2007 05:27:04 -0000	1.9
+++ zabbix.spec	20 Sep 2007 16:12:41 -0000	1.10
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:16:07 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:16:07 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.7, 1.8 online-desktop.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709201616.l8KGG7vo029570@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29433

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Sep 2007 20:16:20 -0000	1.7
+++ .cvsignore	20 Sep 2007 16:15:35 -0000	1.8
@@ -1 +1 @@
-online-desktop-0.2.12.tar.gz
+online-desktop-0.2.14.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- online-desktop.spec	12 Sep 2007 19:18:42 -0000	1.9
+++ online-desktop.spec	20 Sep 2007 16:15:35 -0000	1.10
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.13
+Version:        0.2.14
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -12,7 +12,6 @@
 #X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
@@ -75,6 +74,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 
 desktop-file-install --vendor="fedora"                  \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -86,19 +86,21 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/od-*
+%{_bindir}/*
 # not used yet
 %dir %{_datadir}/online-desktop
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
+%{_libdir}/pidgin/*.so
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
 %dir %{python_sitelib}/ddm
 %{python_sitelib}/ddm/*
+%{python_sitelib}/*.so
 %doc COPYING README
 
 %files flickr
@@ -180,6 +182,10 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
+- new upstream
+- become an arch package since we have binaries
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Sep 2007 20:16:20 -0000	1.7
+++ sources	20 Sep 2007 16:15:35 -0000	1.8
@@ -1 +1 @@
-f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz
+0e1d8cbbcd931641c5c8dcbe9c4fae64  online-desktop-0.2.14.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:17:27 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:17:27 -0400
Subject: rpms/zabbix/F-7 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.11, 1.12
Message-ID: <200709201617.l8KGHRV8029700@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29653

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 16:16:54 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 16:16:54 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zabbix.spec	11 Sep 2007 05:33:09 -0000	1.11
+++ zabbix.spec	20 Sep 2007 16:16:54 -0000	1.12
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:31:25 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:31:25 -0400
Subject: rpms/cdrkit/devel genisoimage-dlength.patch, NONE, 1.1 cdrkit.spec, 
	1.4, 1.5
Message-ID: <200709201531.l8KFVP12021777@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21734

Modified Files:
	cdrkit.spec 
Added Files:
	genisoimage-dlength.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
- fixed rhbz#248262
- switched to alternatives


genisoimage-dlength.patch:

--- NEW FILE genisoimage-dlength.patch ---
diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
--- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
@@ -1596,12 +1602,10 @@
 		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
 		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
 		!S_ISDIR(lstatbuf.st_mode)) {
-        if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
-            fprintf(stderr,
-                    "Unknown file type (%s) %s - ignoring and continuing.\n",
-                    filetype((int) lstatbuf.st_mode), whole_path);
-            return (0);
-        }
+		fprintf(stderr,
+		"Unknown file type (%s) %s - ignoring and continuing.\n",
+			filetype((int) lstatbuf.st_mode), whole_path);
+		return (0);
 	}
 	/* Who knows what trash this is - ignore and continue */
 



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrkit.spec	17 Aug 2007 12:14:56 -0000	1.4
+++ cdrkit.spec	20 Sep 2007 15:30:53 -0000	1.5
@@ -1,11 +1,14 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
+
+Patch1: genisoimage-dlength.patch
+
 BuildRequires: cmake libcap-devel zlib-devel perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +23,9 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives 
+Requires(post): %{_sbindir}/alternatives  
+Requires(postun): %{_sbindir}/alternatives 
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -32,6 +38,9 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -49,6 +58,9 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -59,6 +71,7 @@
 
 %prep
 %setup -q 
+%patch1 -p1 -b .dlength
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -78,27 +91,58 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
-ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
-ln -s readom $RPM_BUILD_ROOT%{_bindir}/readcd
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n wodim
+%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
+		%{_bindir}/wodim 50 \
+	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/dvdrecord cdrecord-dvdrecord %{_bindir}/wodim \
+	--slave %{_mandir}/man1/dvdrecord.1.gz cdrecord-dvdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
+	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
+		%{_mandir}/man1/readcd.1.gz 
+
+%preun -n wodim
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
+fi
+
+%post -n genisoimage
+%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
+		%{_bindir}/genisoimage 50 \
+	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
+		%{_mandir}/man1/genisoimage.1.gz \
+	--slave %{_bindir}/mkhybrid mkisofs-mkhybrid %{_bindir}/genisoimage
+
+%preun -n genisoimage
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
+fi
+
+%post -n icedax
+%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
+		%{_bindir}/icedax 50 \
+	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
+		%{_mandir}/man1/icedax.1.gz 
+
+%preun -n icedax
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
+fi
+
 %files -n wodim
 %defattr(-,root,root)
 %doc Changelog COPYING FAQ FORK START
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
-%{_bindir}/cdrecord
-%{_bindir}/dvdrecord
 %{_bindir}/readom
-%{_bindir}/readcd
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
 %{_mandir}/man1/wodim.*
@@ -108,7 +152,6 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
-%{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -118,8 +161,6 @@
 %files -n genisoimage
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
-%{_bindir}/mkisofs
-%{_bindir}/mkhybrid
 %{_bindir}/genisoimage
 %{_bindir}/isodebug
 %{_bindir}/isodump
@@ -139,6 +180,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
+- fixed rhbz#248262
+- switched to alternatives
+
 * Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
 - changed license to GPLv2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:18:02 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:18:02 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.26, 1.27 bigboard.spec, 1.35,
	1.36 sources, 1.27, 1.28
Message-ID: <200709201618.l8KGI2PU029764@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29707

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 21:09:03 -0000	1.26
+++ .cvsignore	20 Sep 2007 16:17:30 -0000	1.27
@@ -1 +1 @@
-bigboard-0.5.16.tar.gz
+bigboard-0.5.17.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- bigboard.spec	14 Sep 2007 21:09:03 -0000	1.35
+++ bigboard.spec	20 Sep 2007 16:17:30 -0000	1.36
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.16
+Version:        0.5.17
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
+- new upstream
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Sep 2007 21:09:03 -0000	1.27
+++ sources	20 Sep 2007 16:17:30 -0000	1.28
@@ -1 +1 @@
-43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz
+1fdf687a8ed9eb1f8f6f6003773cb9ad  bigboard-0.5.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:23:41 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:23:41 -0400
Subject: rpms/zabbix/devel zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix.spec, 1.13, 1.14
Message-ID: <200709201623.l8KGNfaT030029@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29961

Modified Files:
	zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zabbix.spec	22 Aug 2007 02:16:28 -0000	1.13
+++ zabbix.spec	20 Sep 2007 16:23:08 -0000	1.14
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:         zabbix-1.4.2-include.patch
+Patch1:         zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,10 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Aug 21 2007 Jarod Wilson <jwilson at redhat.com> 1.4.2-2
 - Account for binaries moving from %%_bindir to %%_sbindir
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:25:00 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:25:00 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.10,1.11
Message-ID: <200709201625.l8KGP0mj030077@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30059

Modified Files:
	online-desktop.spec 
Log Message:
add some brs


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- online-desktop.spec	20 Sep 2007 16:15:35 -0000	1.10
+++ online-desktop.spec	20 Sep 2007 16:24:28 -0000	1.11
@@ -21,6 +21,10 @@
 BuildRequires:	python-devel
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libpurple-devel
 
 %description
 
@@ -185,6 +189,7 @@
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
 - new upstream
 - become an arch package since we have binaries
+- add some brs
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:29:08 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:29:08 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.36,1.37
Message-ID: <200709201629.l8KGT8De030273@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245

Modified Files:
	bigboard.spec 
Log Message:
add some brs


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bigboard.spec	20 Sep 2007 16:17:30 -0000	1.36
+++ bigboard.spec	20 Sep 2007 16:28:36 -0000	1.37
@@ -28,6 +28,7 @@
 BuildRequires:	pygtk2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:	gnome-keyring-devel
 BuildRequires:  mugshot-devel >= 1.1.52
 
@@ -95,6 +96,7 @@
 %changelog
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
 - new upstream
+- add br
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:31:36 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:31:36 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.11,1.12
Message-ID: <200709201631.l8KGVaaH030439@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30393

Modified Files:
	online-desktop.spec 
Log Message:
fix python install dir


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- online-desktop.spec	20 Sep 2007 16:24:28 -0000	1.11
+++ online-desktop.spec	20 Sep 2007 16:31:03 -0000	1.12
@@ -100,11 +100,11 @@
 %{_libdir}/pidgin/*.so
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
-%dir %{python_sitelib}/pyonlinedesktop
-%{python_sitelib}/pyonlinedesktop/*
-%dir %{python_sitelib}/ddm
-%{python_sitelib}/ddm/*
-%{python_sitelib}/*.so
+%dir %{python_sitearch}/pyonlinedesktop
+%{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/ddm
+%{python_sitearch}/ddm/*
+%{python_sitearch}/*.so
 %doc COPYING README
 
 %files flickr
@@ -190,6 +190,7 @@
 - new upstream
 - become an arch package since we have binaries
 - add some brs
+- use pythonsitearch
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:44 -0700
Subject: [pkgdb] calc was added for mattdm
Message-ID: <200709201638.l8KGci9w000629@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package calc with summary Arbitrary precision arithmetic system and calculator
Kevin Fenzi (kevin) has approved Package calc
Kevin Fenzi (kevin) has added a Fedora devel branch for calc with an owner of mattdm
Kevin Fenzi (kevin) has approved calc in Fedora devel
Kevin Fenzi (kevin) has approved Package calc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on calc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:51 -0700
Subject: [pkgdb] calc (Fedora, 7) updated by kevin
Message-ID: <200709201638.l8KGcqx7018018@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for calc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on calc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:51 -0700
Subject: [pkgdb] calc (Fedora, devel) updated by kevin
Message-ID: <200709201638.l8KGcqea018030@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:32 -0400
Subject: rpms/calc - New directory
Message-ID: <200709201639.l8KGdWXu030773@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc

Log Message:
Directory /cvs/extras/rpms/calc added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:36 -0400
Subject: rpms/calc/devel - New directory
Message-ID: <200709201639.l8KGdaEk030789@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc/devel

Log Message:
Directory /cvs/extras/rpms/calc/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:41 -0400
Subject: rpms/calc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709201639.l8KGdfLE030815@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc

Added Files:
	Makefile import.log 
Log Message:
Setup of module calc


--- NEW FILE Makefile ---
# Top level Makefile for module calc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:43 -0400
Subject: rpms/calc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709201639.l8KGdhO0030832@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module calc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: calc
# $Id: Makefile,v 1.1 2007/09/20 16:39:41 kevin Exp $
NAME := calc
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 fedora-extras-commits at redhat.com  Thu Sep 20 16:40:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:40:20 -0700
Subject: [pkgdb] jack-audio-connection-kit (Fedora EPEL, 5) updated by kevin
Message-ID: <200709201640.l8KGeKiZ001068@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for jack-audio-connection-kit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jack-audio-connection-kit



From fedora-extras-commits at redhat.com  Thu Sep 20 16:40:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:40:20 -0700
Subject: [pkgdb] jack-audio-connection-kit (Fedora EPEL, 4) updated by kevin
Message-ID: <200709201640.l8KGeMDL001079@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for jack-audio-connection-kit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jack-audio-connection-kit



From fedora-extras-commits at redhat.com  Thu Sep 20 16:42:39 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Thu, 20 Sep 2007 12:42:39 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.7-dupsplit.patch, NONE,
	1.1 ipsec-tools-0.7-iface.patch, NONE, 1.1 p1_up_down, NONE,
	1.1 racoon.init, NONE, 1.1 ipsec-tools.spec, 1.44,
	1.45 racoon.conf, 1.1, 1.2
Message-ID: <200709201642.l8KGgdEN031273@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31062

Modified Files:
	ipsec-tools.spec racoon.conf 
Added Files:
	ipsec-tools-0.7-dupsplit.patch ipsec-tools-0.7-iface.patch 
	p1_up_down racoon.init 
Log Message:
Added patches from Gabriel Somlo


ipsec-tools-0.7-dupsplit.patch:

--- NEW FILE ipsec-tools-0.7-dupsplit.patch ---
diff -NarU5 ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp_unity.c ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp_unity.c
--- ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp_unity.c	2006-10-09 02:17:20.000000000 -0400
+++ ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp_unity.c	2007-08-22 13:07:29.000000000 -0400
@@ -303,36 +303,45 @@
 int  splitnet_list_add(list, network, count)
 	struct unity_netentry ** list;
 	struct unity_network * network;
 	int *count;
 {
-	struct unity_netentry * newentry;
+	struct unity_netentry * nentry;
+
+	/*
+	 * search for network in current list
+	 * to avoid adding duplicates
+	 */
+	for (nentry = *list; nentry != NULL; nentry = nentry->next)
+		if (memcmp(&nentry->network, network,
+			   sizeof(struct unity_network)) == 0)
+			return 0;	/* it's a dupe */
 
 	/*
 	 * allocate new netentry and copy
-         * new splitnet network data
+	 * new splitnet network data
 	 */
-	newentry = (struct unity_netentry *)
+	nentry = (struct unity_netentry *)
 		racoon_malloc(sizeof(struct unity_netentry));
-	if (newentry == NULL)
+	if (nentry == NULL)
 		return -1;
 
-	memcpy(&newentry->network,network,
+	memcpy(&nentry->network,network,
 		sizeof(struct unity_network));
-	newentry->next = NULL;
+	nentry->next = NULL;
 
 	/*
 	 * locate the last netentry in our
 	 * splitnet list and add our entry
 	 */
 	if (*list == NULL)
-		*list = newentry;
+		*list = nentry;
 	else {
 		struct unity_netentry * tmpentry = *list;
 		while (tmpentry->next != NULL)
 			tmpentry = tmpentry->next;
-		tmpentry->next = newentry;
+		tmpentry->next = nentry;
 	}
 
 	(*count)++;
 
 	return 0;

ipsec-tools-0.7-iface.patch:

--- NEW FILE ipsec-tools-0.7-iface.patch ---
diff -NarU5 ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp.c ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp.c
--- ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp.c	2007-07-18 08:07:51.000000000 -0400
+++ ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp.c	2007-08-22 13:04:33.000000000 -0400
@@ -1722,10 +1722,24 @@
 			    strerror(errno));
 			return -1;
 		}
 #endif
 
+		if (setsockopt(p->sock, SOL_SOCKET,
+#ifdef __linux__
+					 SO_REUSEADDR,
+#else
+					 SO_REUSEPORT,
+#endif
+					 (void *)&yes, sizeof(yes)) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"failed to set REUSE flag on %s (%s).\n",
+				saddr2str(p->addr), strerror(errno));
+			close(p->sock);
+			goto err_and_next;
+		}
+
 		if (setsockopt_bypass(p->sock, p->addr->sa_family) < 0)
 			goto err_and_next;
 
 		if (bind(p->sock, p->addr, sysdep_sa_len(p->addr)) < 0) {
 			plog(LLV_ERROR, LOCATION, p->addr,


--- NEW FILE p1_up_down ---
#!/bin/bash

#
# manipulate IPSec SA database on behalf of the racoon daemon
# Gabriel Somlo <somlo at cmu edu>, 08/27/2007
#

#FIXME: read this from, e.g., /etc/sysconfig/racoon
NAT_T="yes"


shopt -s nocasematch
umask 0022

PATH=/bin:/sbin:/usr/bin:/usr/sbin

case "${NAT_T}" in
  yes|true|on|enable*|1)
    LOCAL="${LOCAL_ADDR}[${LOCAL_PORT}]"
    REMOTE="${REMOTE_ADDR}[${REMOTE_PORT}]"
    ;;
  *)
    LOCAL="${LOCAL_ADDR}"
    REMOTE="${REMOTE_ADDR}"
    ;;
esac

DFLT_RT=$(ip route list | awk '($1 == "default"){print $3 ";" $5}')
DFLT_IF=${DFLT_RT#*;}
DFLT_GW=${DFLT_RT%;*}


# convert something like '192.168.123.0/255.255.255.0' into '192.168.123.0/24'
# FIXME: convince racoon folks to return SPLIT_INCLUDE in the latter form ?
to_cidr() {
  local IP_ADDR=${1%/*}
  local NETMASK=${1#*/}
  local PREFIX_STR=$(ipcalc -p ${IP_ADDR} ${NETMASK})
  local PREFIX=${PREFIX_STR#*=}
  echo ${IP_ADDR}/${PREFIX}
}


phase1_up() {
  [ -f /etc/resolv.conf.prevpn ] || cp /etc/resolv.conf /etc/resolv.conf.prevpn
  {
    echo "# Generated by racoon on $(date)"
    echo "search ${DEFAULT_DOMAIN}"
    for NS in ${INTERNAL_DNS4_LIST}; do
      echo "nameserver ${NS}"
    done
  } > /etc/resolv.conf

  ip addr add dev ${DFLT_IF} ${INTERNAL_ADDR4}/32
  ip route add ${REMOTE_ADDR} via ${DFLT_GW} dev ${DFLT_IF}

  if [ -n "${SPLIT_INCLUDE}" ]; then
    for N in ${SPLIT_INCLUDE}; do
      ip route add $(to_cidr ${N}) via ${DFLT_GW} dev ${DFLT_IF} \
                                   src ${INTERNAL_ADDR4}
    done
  else
    for N in ${SPLIT_LOCAL}; do
      ip route add $(to_cidr ${N}) via ${DFLT_GW} dev ${DFLT_IF}
    done
    ip route del default
    ip route add default via ${DFLT_GW} dev ${DFLT_IF} src ${INTERNAL_ADDR4}
  fi

  setkey -c << EOT
spdadd ${INTERNAL_ADDR4}/32[any] 0.0.0.0/0[any] any -P out ipsec
       esp/tunnel/${LOCAL}-${REMOTE}/require;
spdadd 0.0.0.0/0[any] ${INTERNAL_ADDR4}[any] any -P in ipsec
       esp/tunnel/${REMOTE}-${LOCAL}/require;
EOT
}


phase1_down() {
  [ -f /etc/resolv.conf.prevpn ] && mv /etc/resolv.conf.prevpn /etc/resolv.conf

  if [ -n "${SPLIT_INCLUDE}" ]; then
    for N in ${SPLIT_INCLUDE}; do
      ip route del $(to_cidr ${N})
    done
  else
    for N in ${SPLIT_LOCAL}; do
      ip route del $(to_cidr ${N})
    done
    ip route del default
    ip route add default via ${DFLT_GW} dev ${DFLT_IF}
  fi

  ip route del ${REMOTE_ADDR}
  ip addr del dev ${DFLT_IF} ${INTERNAL_ADDR4}/32

  setkey -c << EOT
spddelete ${INTERNAL_ADDR4}/32[any] 0.0.0.0/0[any] any -P out ipsec
          esp/tunnel/${LOCAL}-${REMOTE}/require;
spddelete 0.0.0.0/0[any] ${INTERNAL_ADDR4}[any] any -P in ipsec
          esp/tunnel/${REMOTE}-${LOCAL}/require;
deleteall ${REMOTE_ADDR} ${LOCAL_ADDR} esp;
deleteall ${LOCAL_ADDR} ${REMOTE_ADDR} esp; 
# linux won't honor a 'deleteall', so we use flush (bad, but necessary for now)
flush;
EOT
}



echo "p1_up_down: $1 starting..."
echo "p1_up_down: LOCAL_ADDR = ${LOCAL_ADDR}"
echo "p1_up_down: LOCAL_PORT = ${LOCAL_PORT}"
echo "p1_up_down: REMOTE_ADDR = ${REMOTE_ADDR}"
echo "p1_up_down: REMOTE_PORT = ${REMOTE_PORT}"
echo "p1_up_down: DFLT_GW = ${DFLT_GW}"
echo "p1_up_down: DFLT_IF = ${DFLT_IF}"
echo "p1_up_down: INTERNAL_ADDR4 = ${INTERNAL_ADDR4}"
echo "p1_up_down: INTERNAL_DNS4 = ${INTERNAL_DNS4}"
echo "p1_up_down: DEFAULT_DOMAIN = ${DEFAULT_DOMAIN}"
echo "p1_up_down: SPLIT_INCLUDE = ${SPLIT_INCLUDE}"
echo "p1_up_down: SPLIT_LOCAL = ${SPLIT_LOCAL}"

echo ${INTERNAL_ADDR4} | grep -q '[0-9]' || {
  echo "p1_up_down: error: invalid INTERNAL_ADDR4."
  exit 1
}

echo ${DFLT_GW} | grep -q '[0-9]' || {
  echo "p1_up_down: error: invalid DFLT_GW."
  exit 2
}

case "$1" in
  phase1_up)
    phase1_up
    ;;
  phase1_down)
    phase1_down
    ;;
  *)
    echo "p1_up_down: error: must be called by racoon w. arg=phase1_[up|down]"
    exit 3
    ;;
esac

echo "p1_up_down: $1 completed successfully."
exit 0


--- NEW FILE racoon.init ---
#!/bin/sh
#
# chkconfig: - 15 85
# description: racoon is an IKE (ISAKMP/Oakley) key management daemon
# processname: racoon
# config: /etc/racoon/racoon.conf
#

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

prog=racoon
lockfile=/var/lock/subsys/$prog

RETVAL=0

start() {
	echo -n $"Starting $prog: "
	daemon $prog
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	RETVAL=$?
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	echo
	return $RETVAL
}

dostatus() {
	status $prog
}

restart() {
	stop
	start
}

condrestart() {
	[ -e $lockfile ] && restart || :
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart|reload)
	restart
	;;
  condrestart)
	condrestart
	;;
  status)
	dostatus
	;;
  *)
	echo "Usage: $prog {start|stop|restart|reload|condrestart|status}"
	exit 1
esac

exit $RETVAL


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ipsec-tools.spec	29 Aug 2007 04:53:14 -0000	1.44
+++ ipsec-tools.spec	20 Sep 2007 16:42:06 -0000	1.45
@@ -1,21 +1,22 @@
 Name: ipsec-tools
 Version: 0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
 URL: http://ipsec-tools.sourceforge.net/
 Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2
-Source1: ipsec.h
-Source2: pfkeyv2.h
-Source3: racoon.conf
-Source4: psk.txt
-Source5: xfrm.h
-Source6: udp.h
+Source1: racoon.conf
+Source2: psk.txt
+Source3: p1_up_down
+Source4: racoon.init
 Patch: ipsec-tools-0.7-libs.patch
 Patch2: isakmp.c.diff
 Patch3: ipsec-tools-0.7-acquires.patch
 Patch4: ipsec-tools-0.7-loopback.patch
+# the following three patches were also submitted upstream:
+Patch5: ipsec-tools-0.7-iface.patch
+Patch6: ipsec-tools-0.7-dupsplit.patch
  
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
@@ -37,15 +38,15 @@
 %patch2 -p1
 %patch3 -p1 -b .acquires
 %patch4 -p1 -b .loopback
+%patch5 -p1 -b .iface
+%patch6 -p1 -b .dupsplit
 
-mkdir -p kernel-headers/linux
-cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
 ./bootstrap
 
 %build
 sed -i 's|-Werror||g' configure
 CFLAGS="$RPM_OPT_FLAGS" %configure \
- --with-kernel-headers=`pwd`/kernel-headers \
+ --with-kernel-headers=/usr/include \
  --sysconfdir=/etc/racoon \
  --without-readline \
  --enable-adminport \
@@ -70,18 +71,33 @@
 	$RPM_BUILD_ROOT/%{_includedir} \
 	$RPM_BUILD_ROOT/%{_mandir}/man3
 
-install -m 600 %{SOURCE3} \
+install -m 600 %{SOURCE1} \
   $RPM_BUILD_ROOT/etc/racoon/racoon.conf
-install -m 600 %{SOURCE4} \
+install -m 600 %{SOURCE2} \
   $RPM_BUILD_ROOT/etc/racoon/psk.txt
 
 mv $RPM_BUILD_ROOT%{_sbindir}/setkey $RPM_BUILD_ROOT/sbin
 
 mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs
+mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/scripts
+install -m 700 %{SOURCE3} \
+  $RPM_BUILD_ROOT/etc/racoon/scripts/p1_up_down
+install -D -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/racoon
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ $1 = 1 ]; then
+        chkconfig --add racoon
+fi
+
+%preun
+if [ $1 = 0 ]; then
+        service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del racoon
+fi
+
 %files
 %defattr(-,root,root)
 %doc src/racoon/samples/racoon.conf src/racoon/samples/psk.txt
@@ -90,13 +106,23 @@
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man*/*
+%{_sysconfdir}/racoon/scripts/*
+%{_initrddir}/racoon
 %dir /etc/racoon
 %dir /etc/racoon/certs
+%dir /etc/racoon/scripts
 %dir /var/racoon
 %config(noreplace) /etc/racoon/psk.txt
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Thu Sep 20 2007 Steve Conklin <sconklin at redhat.com> - 0.7-3
+- Applied the following patches from Gabriel Somlo
+- Patches for connecting to Cisco ASA in remote-access (road-warrior) mode
+- Added phase1_up_down mode config script
+- Including our own .h files (ipsec, pfkeyv2, xfrm, udp) no longer necessary
+- Added init script for racoon daemon
+
 * Tue Aug 28 2007 Steve Conklin <sconklin at redhat.com> - 0.7-2
 - Fixed the loopback patch
 


Index: racoon.conf
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/racoon.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- racoon.conf	9 Sep 2004 06:18:45 -0000	1.1
+++ racoon.conf	20 Sep 2007 16:42:06 -0000	1.2
@@ -5,12 +5,31 @@
 path include "/etc/racoon";
 path pre_shared_key "/etc/racoon/psk.txt";
 path certificate "/etc/racoon/certs";
+path script "/etc/racoon/scripts";
 
 sainfo anonymous
 {
-	pfs_group 2;
+	#pfs_group 2;
 	lifetime time 1 hour ;
 	encryption_algorithm 3des, blowfish 448, rijndael ;
 	authentication_algorithm hmac_sha1, hmac_md5 ;
 	compression_algorithm deflate ;
 }
+
+#remote <IP-of-Cisco-ASA>
+#{
+#	exchange_mode main;
+#	my_identifier fqdn "host.name.of.vpn.client";
+#	certificate_type x509 "client.crt" "client.key";
+#	ca_type x509 "ca.crt";
+#	mode_cfg on;
+#	script "p1_up_down" phase1_up;
+#	script "p1_up_down" phase1_down;
+#	proposal
+#	{
+#		encryption_algorithm 3des;
+#		hash_algorithm sha1;
+#		authentication_method xauth_rsa_client;
+#		dh_group 2;
+#	}
+#}



From fedora-extras-commits at redhat.com  Thu Sep 20 16:48:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Thu, 20 Sep 2007 12:48:53 -0400
Subject: rpms/ksudoku/F-7 .cvsignore, 1.2, 1.3 ksudoku.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200709201648.l8KGmrpR031575@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/ksudoku/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514

Modified Files:
	.cvsignore ksudoku.spec sources 
Log Message:
update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2007 16:41:29 -0000	1.2
+++ .cvsignore	20 Sep 2007 16:48:20 -0000	1.3
@@ -1 +1 @@
-ksudoku-0.3.tar.gz
+ksudoku-0.4.tar.gz


Index: ksudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/ksudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ksudoku.spec	19 Aug 2007 22:32:10 -0000	1.2
+++ ksudoku.spec	20 Sep 2007 16:48:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ksudoku
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Sudoku game
 
 Group:          Amusements/Games
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils,kdelibs-devel
+BuildRequires:  desktop-file-utils,kdelibs-devel,cmake
 Requires:       hicolor-icon-theme
 
 %description
@@ -20,24 +20,28 @@
 %prep
 %setup -q
 #.desktop file fix
-%{__sed} -i 's/DocPath\=ksudoku\/ksudoku.html/Categories\=Game\;LogicGame\;KDE\;Qt\;/' src/ksudoku.desktop
+sed -e 's#DocPath\=ksudoku\/ksudoku.html#Categories\=Game\;LogicGame\;KDE\;Qt\;#' -e '15d' -i src/gui/ksudoku.desktop
 
 %build
-%configure --disable-dependency-tracking
-#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
+%cmake .
 make %{?_smp_mflags}
-
-%check
-make check
+meinproc --check --cache index.cache.bz2 doc/en/index.docbook
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT%{_libdir}
+cp src/gui/libksudoku_gui.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/libksudoku_export.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/draw/libksudoku_draw.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/views/libksudoku_views.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/logic/libksudoku_logic.so $RPM_BUILD_ROOT%{_libdir}/
+
+install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 index.cache.bz2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 doc/en/index.docbook $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
 #make symlink relative
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
 cd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
 ln -s ../common common
 
@@ -45,30 +49,40 @@
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --delete-original                               \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README VERSION doc/en/index*
+%doc AUTHORS ChangeLog COPYING README VERSION TODO
 %{_bindir}/*
+%{_libdir}/*
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*/*.png
-%doc %{_docdir}/HTML/en/%{name}
+%{_datadir}/config/ksudokurc
+%{_docdir}/HTML/en/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Sep 17 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.4-1
+- update to 0.4
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-3
 - License tag update
 * Tue Jan 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2007 16:41:29 -0000	1.2
+++ sources	20 Sep 2007 16:48:20 -0000	1.3
@@ -1 +1 @@
-d5fe20e9deda671dd15340f43ab4c4a3  ksudoku-0.3.tar.gz
+418f9ecac5756f7bc79863596dee7f34  ksudoku-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Thu, 20 Sep 2007 12:55:08 -0400
Subject: rpms/ksudoku/devel .cvsignore, 1.2, 1.3 ksudoku.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200709201655.l8KGt8BG032218@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/ksudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998

Modified Files:
	.cvsignore ksudoku.spec sources 
Log Message:
update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2007 16:41:29 -0000	1.2
+++ .cvsignore	20 Sep 2007 16:54:35 -0000	1.3
@@ -1 +1 @@
-ksudoku-0.3.tar.gz
+ksudoku-0.4.tar.gz


Index: ksudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/ksudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ksudoku.spec	25 Aug 2007 14:49:56 -0000	1.3
+++ ksudoku.spec	20 Sep 2007 16:54:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ksudoku
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Sudoku game
 
 Group:          Amusements/Games
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils,kdelibs-devel
+BuildRequires:  desktop-file-utils,kdelibs-devel,cmake
 Requires:       hicolor-icon-theme
 
 %description
@@ -20,24 +20,28 @@
 %prep
 %setup -q
 #.desktop file fix
-%{__sed} -i 's/DocPath\=ksudoku\/ksudoku.html/Categories\=Game\;LogicGame\;KDE\;Qt\;/' src/ksudoku.desktop
+sed -e 's#DocPath\=ksudoku\/ksudoku.html#Categories\=Game\;LogicGame\;KDE\;Qt\;#' -e '15d' -i src/gui/ksudoku.desktop
 
 %build
-%configure --disable-dependency-tracking
-#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
+%cmake .
 make %{?_smp_mflags}
-
-%check
-make check
+meinproc --check --cache index.cache.bz2 doc/en/index.docbook
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT%{_libdir}
+cp src/gui/libksudoku_gui.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/libksudoku_export.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/draw/libksudoku_draw.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/views/libksudoku_views.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/logic/libksudoku_logic.so $RPM_BUILD_ROOT%{_libdir}/
+
+install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 index.cache.bz2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 doc/en/index.docbook $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
 #make symlink relative
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
 cd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
 ln -s ../common common
 
@@ -45,30 +49,40 @@
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --delete-original                               \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README VERSION doc/en/index*
+%doc AUTHORS ChangeLog COPYING README VERSION TODO
 %{_bindir}/*
+%{_libdir}/*
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*/*.png
-%doc %{_docdir}/HTML/en/%{name}
+%{_datadir}/config/ksudokurc
+%{_docdir}/HTML/en/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Sep 17 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.4-1
+- update to 0.4
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-4
 - BuildID rebuild
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2007 16:41:29 -0000	1.2
+++ sources	20 Sep 2007 16:54:35 -0000	1.3
@@ -1 +1 @@
-d5fe20e9deda671dd15340f43ab4c4a3  ksudoku-0.3.tar.gz
+418f9ecac5756f7bc79863596dee7f34  ksudoku-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:11 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:11 -0700
Subject: [pkgdb] calc: mattdm has requested watchbugzilla
Message-ID: <200709201655.l8KGtBW4005518@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:11 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:11 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201655.l8KGtBAl005526@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:14 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:14 -0700
Subject: [pkgdb] calc: mattdm has requested watchcommits
Message-ID: <200709201655.l8KGtEpV022655@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:16 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:16 -0700
Subject: [pkgdb] calc: mattdm has requested approveacls
Message-ID: <200709201655.l8KGtGnj005542@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the approveacls acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:24 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:24 -0700
Subject: [pkgdb] calc: mattdm has requested watchbugzilla
Message-ID: <200709201655.l8KGtOi0005580@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on calc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:26 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:26 -0700
Subject: [pkgdb] calc: mattdm has requested watchcommits
Message-ID: <200709201655.l8KGtQUG022712@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on calc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:28 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:28 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201655.l8KGtSvJ005602@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:29 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:29 -0700
Subject: [pkgdb] calc: mattdm has requested approveacls
Message-ID: <200709201655.l8KGtTLK005612@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the approveacls acl on calc (Fedora 7)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:32 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:32 -0700
Subject: [pkgdb] calc: mattdm has given up commit
Message-ID: <200709201656.l8KGuWZ0005887@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has given up the commit acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:35 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:35 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuZru005905@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the commit acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:33 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:33 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201656.l8KGuXUb023060@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:37 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:37 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGubVP023077@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchcommits acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:40 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:40 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGue0D023090@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the approveacls acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:43 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:43 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuhNb023107@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchbugzilla acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:38 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:38 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuc8W005918@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchbugzilla acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:44 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:44 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuiYY005947@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchcommits acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:46 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:46 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGukur023127@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the commit acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:48 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:48 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGumvV005967@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the approveacls acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 17:05:27 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:05:27 -0400
Subject: rpms/calc/F-7 calc-2.12.2.1-entangled-readline.patch, NONE,
	1.1 calc-2.12.2.1-no-custom-means-no-custom.patch, NONE,
	1.1 calc-COPYING-GPL, NONE, 1.1 calc-converted-to-gpl.txt, NONE,
	1.1 calc.spec, NONE, 1.1
Message-ID: <200709201705.l8KH5RC4006240@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6224

Added Files:
	calc-2.12.2.1-entangled-readline.patch 
	calc-2.12.2.1-no-custom-means-no-custom.patch calc-COPYING-GPL 
	calc-converted-to-gpl.txt calc.spec 
Log Message:
initial package

calc-2.12.2.1-entangled-readline.patch:

--- NEW FILE calc-2.12.2.1-entangled-readline.patch ---
diff -ur calc-2.12.2.1.linkingisfun/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.linkingisfun/Makefile	2007-09-06 04:08:39.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-18 16:50:23.000000000 -0400
@@ -806,7 +806,9 @@
 #USE_READLINE= -DUSE_READLINE
 #
 READLINE_LIB=
-#READLINE_LIB= -lreadline -lhistory -lncurses
+READLINE_EXTRAS=
+#READLINE_LIB= -lreadline 
+#READLINE_EXTRAS= -lhistory -lncurses
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
@@ -1838,10 +1840,10 @@
 calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
 	${RM} -f $@
 	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-	      ${READLINE_LIB} -o $@
+	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
 libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
-	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
+	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} ${READLINE_LIB} -o libcalc${LIB_EXT_VERSION}
 
 libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
 	${Q} ${RM} -f $@

calc-2.12.2.1-no-custom-means-no-custom.patch:

--- NEW FILE calc-2.12.2.1-no-custom-means-no-custom.patch ---
Common subdirectories: calc-2.12.2.1.no-means-no/cal and calc-2.12.2.1/cal
Common subdirectories: calc-2.12.2.1.no-means-no/cscript and calc-2.12.2.1/cscript
Common subdirectories: calc-2.12.2.1.no-means-no/custom and calc-2.12.2.1/custom
Common subdirectories: calc-2.12.2.1.no-means-no/help and calc-2.12.2.1/help
diff -u calc-2.12.2.1.no-means-no/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.no-means-no/Makefile	2007-09-19 13:39:17.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-19 14:09:08.000000000 -0400
@@ -767,12 +767,29 @@
 MANMODE= 0444
 CATMODE= 0444
 
+# By default, custom builtin functions may only be executed if calc
+# is given the -C option.  This is because custom builtin functions
+# may invoke non-standard or non-portable code.	 One may completely
+# disable custom builtin functions by not compiling any of code
+#
+# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
+# ALLOW_CUSTOM=			# disable custom even if -C is given
+#
+# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
+#
+ALLOW_CUSTOM= -DCUSTOM
+#ALLOW_CUSTOM=
+
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
 # Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+else
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
+endif
 #CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 # If the $CALCRC environment variable is not defined, then the following
@@ -925,18 +942,6 @@
 #	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
 #	  MALLOC_CLEAR_MALLOC=1 LD_LIBRARY_PATH=.:./custom
 
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
 
 # The install rule uses:
 #
@@ -1280,7 +1285,11 @@
 CFLAGS= ${ICFLAGS} ${CCOPT}
 #
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+else
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC}
+endif
 #
 #if 0	/* start of skip for non-Gnu makefiles */
 endif
@@ -1691,6 +1700,7 @@
 #
 OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
 
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 # static library build
 #
 CALC_STATIC_LIBS= libcalc.a libcustcalc.a
@@ -1705,6 +1715,20 @@
 	libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
 	libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
 	libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
+else
+# static library build
+#
+CALC_STATIC_LIBS= libcalc.a
+
+# Libaraies created and used to build calc
+#
+CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION}
+
+# Symlinks of dymanic shared libraries
+#
+SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
+	libcalc${LIB_EXT_VERS}
+endif
 
 # list of sample programs to that need to be built to satisfy sample rule
 #
@@ -1735,7 +1759,11 @@
 
 # early targets - things needed before the main build phase can begin
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 EARLY_TARGETS= custom/Makefile hsrc .hsrc custom/.all
+else
+EARLY_TARGETS= hsrc .hsrc
+endif
 
 # late targets - things needed after the main build phase is complete
 #
Common subdirectories: calc-2.12.2.1.no-means-no/win32 and calc-2.12.2.1/win32


--- NEW FILE calc-COPYING-GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library General
Public License instead of this License.


--- NEW FILE calc-converted-to-gpl.txt ---
This copy of Calc is linked against the GNU Readline library. Normally, Calc
is distributed under the LGPL, and for this copy, section 3 of the LGPL has
been applied:

      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.

Thus, this copy and all subsequent copies and derivative works are under the
terms of the GNU General Public License version 2.

The original "COPYING" document distributed with calc has been removed, as
it is not licensed in a way which permits the changes necessary to make this
conversion. You can find the relevant information in the source RPM or on
the web site at <http://isthe.com/chongo/tech/comp/calc/calc-download.html>.

NOTE: This is intended as a short-term fix; hopefully in the future the
command-line program and the calc libraries will be split in a way that
makes this unnecessary.


--- NEW FILE calc.spec ---
# Enabling this option invokes section 3 of the LGPL, applying the terms of
# the ordinary GNU General Public License version 2 instead of the LGPL.
# See the included "calc-converted-to-gpl.txt" source file for details.
%define with_readline 1

# This is disabled right now because it prevents correct linking. The issues
# here are related to the issues with linking with readline, in that the 
# split between libraries is poorly defined.
%define with_custom_interface 0

%if %{with_readline}
License:       GPLv2
%else
License:       LGPLv2
%endif

Name:          calc
Version:       2.12.2.1
Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
Summary:       Arbitrary precision arithmetic system and calculator

Group:         Applications/Engineering
URL:           http://isthe.com/chongo/tech/comp/calc/
Source0:       http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
Source1:       calc-converted-to-gpl.txt
Source2:       calc-COPYING-GPL
Patch0:        calc-2.12.2.1-entangled-readline.patch
Patch1:        calc-2.12.2.1-no-custom-means-no-custom.patch

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed

%if %{with_readline}
BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
%endif

Requires:      less >= 358

# Temporary! This is due to a build bug; should be fixed shortly.
ExcludeArch:   ppc

%description
Calc is an arbitrary precision C-like arithmetic system that is a
calculator, an algorithm-prototyper, and a mathematical research tool. Calc
comes with a rich set of built-in mathematical and programmatic functions.


%package libs
Summary:       Libraries for the calc arithmetic system
Group:         System Environment/Libraries

%description libs
Shared libraries used by the calc command line calculator and other programs
using its arbitrary precision arithmetic routines.


%package devel
Summary:        Development files for the calc arithmetic system
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
This package contains files necessary to build applications which use the
calc arbitrary precision arithmetic system.


%package stdrc
Summary:      Standard resource files the calc arithmetic system
Group:        Applications/Engineering
Requires:     %{name} = %{version}-%{release}

%description stdrc
This package contains the standard calc resource files and several calc
shell scripts. They serve as examples of the calc language and may also be
useful in themselves.



%prep
%setup -q

%patch0 -p1 -b .link
%patch1 -p1 -b .nomeansno

%if %{with_readline}
  for f in help.c version.c calc.man cal/* $( ls help/*|grep  '^help/credit$' ) ; do
    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
  done
  cp -p %{SOURCE1} COPYING
  cp -p %{SOURCE2} COPYING-GPL
%endif


%build
# note parallel make (-j3, or whatever) doesn't work correctly.
make DEBUG="%{optflags}" \
%if %{with_custom_interface}
     ALLOW_CUSTOM="-DCUSTOM" \
%else
     ALLOW_CUSTOM="" \
%endif
     LD_SHARE="" \
%if %{with_readline}
     USE_READLINE="-DUSE_READLINE" \
     READLINE_LIB="-lreadline" \
     READLINE_EXTRAS="-lhistory -lncurses" \
%else
     USE_READLINE="" \
%endif
     T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     Q="" V="@" \
     all


%install
rm -rf %{buildroot}

make T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     install

%if %{with_readline} 
  rm -f %{buildroot}/%{_datadir}/%{name}/help/COPYING-LGPL
  # mode 444 to match the other files
  install -p -m 444 COPYING-GPL %{buildroot}/%{_datadir}/%{name}/help/
  rm -f %{buildroot}/%{_datadir}/%{name}/bindings
%endif

%if ! %{with_custom_interface}
  # if we don't enable the custom interface, don't ship it.
  rm -f %{buildroot}/%{_libdir}/libcustcalc.so*
  rm -f %{buildroot}/%{_datadir}/%{name}/custom/*
  rmdir %{buildroot}/%{_datadir}/%{name}/custom/
%endif

# Changing permissions of executables to 755 to shut up rpmlint.
chmod 755 %{buildroot}%{_datadir}/%{name}/cscript/*
chmod 755 %{buildroot}%{_bindir}/calc

# move these so the doc macro can find them
mv %{buildroot}%{_datadir}/%{name}/README README-standard-resource
mv cscript/README README-cscript


%check
make chk
     

%clean
rm -rf %{buildroot}


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_bindir}/calc
%{_mandir}/man1/calc.1*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/help
%{_datadir}/%{name}/help/*
%dir %{_datadir}/%{name}/custhelp
%{_datadir}/%{name}/custhelp/*
%if ! %{with_readline}
%{_datadir}/%{name}/bindings
%endif

%files libs
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_libdir}/libcalc.so.*
%if %{with_custom_interface}
%{_libdir}/libcustcalc.so.*
%endif

%files devel
%defattr(-, root, root, -)
%doc LIBRARY
%{_libdir}/libcalc.so
%if %{with_custom_interface}    
%{_libdir}/libcustcalc.so
%endif
%dir %{_includedir}/calc
%{_includedir}/calc/*.h

%files stdrc
%defattr(-, root, root, -)
%doc README-standard-resource README-cscript
%dir %{_datadir}/%{name}/cscript
%{_datadir}/%{name}/cscript/*
%if %{with_custom_interface}
%dir %{_datadir}/%{name}/custom
%{_datadir}/%{name}/custom/*
%endif
%{_datadir}/%{name}/*.cal
%{_datadir}/%{name}/*.line


%changelog
* Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
- initial package for Fedora
- clear old and long pre-fedora changelog
- review request rhbug #227570



From fedora-extras-commits at redhat.com  Thu Sep 20 17:06:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Thu, 20 Sep 2007 13:06:59 -0400
Subject: rpms/aria2/devel .cvsignore, 1.6, 1.7 aria2.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <200709201706.l8KH6xa4006351@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/aria2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6275

Modified Files:
	.cvsignore aria2.spec sources 
Log Message:
* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
- 0.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Aug 2007 12:18:01 -0000	1.6
+++ .cvsignore	20 Sep 2007 17:06:25 -0000	1.7
@@ -1 +1 @@
-aria2-0.11.2.tar.bz2
+aria2-0.11.3.tar.bz2


Index: aria2.spec
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/aria2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aria2.spec	24 Aug 2007 12:18:01 -0000	1.5
+++ aria2.spec	20 Sep 2007 17:06:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           aria2
-Version:        0.11.2
+Version:        0.11.3
 Release:        1%{?dist}
 Summary:        High speed download utility with resuming and segmented downloading
 Group:          Applications/Internet
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
+- 0.11.3
+
 * Fri Aug 24 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.2-1
 - 0.11.2
 - Fix License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Aug 2007 12:18:01 -0000	1.6
+++ sources	20 Sep 2007 17:06:25 -0000	1.7
@@ -1 +1 @@
-4b58849f0bf7f2abab1675ce2e8958ec  aria2-0.11.2.tar.bz2
+93d77ba3238d3954df39157fc77349d3  aria2-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 17:08:57 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:08:57 -0400
Subject: rpms/calc/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709201708.l8KH8vk4006469@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432

Modified Files:
	.cvsignore sources 
Log Message:
it works better if you include the actual source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	20 Sep 2007 17:08:24 -0000	1.2
@@ -0,0 +1 @@
+calc-2.12.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Sep 2007 16:39:41 -0000	1.1
+++ sources	20 Sep 2007 17:08:24 -0000	1.2
@@ -0,0 +1 @@
+c399c7b7d71d756c5eaef77e414a732b  calc-2.12.2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 17:17:17 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:17:17 -0400
Subject: rpms/calc/devel calc-2.12.2.1-entangled-readline.patch, NONE,
	1.1 calc-2.12.2.1-no-custom-means-no-custom.patch, NONE,
	1.1 calc-COPYING-GPL, NONE, 1.1 calc-converted-to-gpl.txt, NONE,
	1.1 calc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709201717.l8KHHHhi006747@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6712

Modified Files:
	.cvsignore sources 
Added Files:
	calc-2.12.2.1-entangled-readline.patch 
	calc-2.12.2.1-no-custom-means-no-custom.patch calc-COPYING-GPL 
	calc-converted-to-gpl.txt calc.spec 
Log Message:
initial package

calc-2.12.2.1-entangled-readline.patch:

--- NEW FILE calc-2.12.2.1-entangled-readline.patch ---
diff -ur calc-2.12.2.1.linkingisfun/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.linkingisfun/Makefile	2007-09-06 04:08:39.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-18 16:50:23.000000000 -0400
@@ -806,7 +806,9 @@
 #USE_READLINE= -DUSE_READLINE
 #
 READLINE_LIB=
-#READLINE_LIB= -lreadline -lhistory -lncurses
+READLINE_EXTRAS=
+#READLINE_LIB= -lreadline 
+#READLINE_EXTRAS= -lhistory -lncurses
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
@@ -1838,10 +1840,10 @@
 calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
 	${RM} -f $@
 	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-	      ${READLINE_LIB} -o $@
+	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
 libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
-	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
+	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} ${READLINE_LIB} -o libcalc${LIB_EXT_VERSION}
 
 libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
 	${Q} ${RM} -f $@

calc-2.12.2.1-no-custom-means-no-custom.patch:

--- NEW FILE calc-2.12.2.1-no-custom-means-no-custom.patch ---
Common subdirectories: calc-2.12.2.1.no-means-no/cal and calc-2.12.2.1/cal
Common subdirectories: calc-2.12.2.1.no-means-no/cscript and calc-2.12.2.1/cscript
Common subdirectories: calc-2.12.2.1.no-means-no/custom and calc-2.12.2.1/custom
Common subdirectories: calc-2.12.2.1.no-means-no/help and calc-2.12.2.1/help
diff -u calc-2.12.2.1.no-means-no/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.no-means-no/Makefile	2007-09-19 13:39:17.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-19 14:09:08.000000000 -0400
@@ -767,12 +767,29 @@
 MANMODE= 0444
 CATMODE= 0444
 
+# By default, custom builtin functions may only be executed if calc
+# is given the -C option.  This is because custom builtin functions
+# may invoke non-standard or non-portable code.	 One may completely
+# disable custom builtin functions by not compiling any of code
+#
+# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
+# ALLOW_CUSTOM=			# disable custom even if -C is given
+#
+# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
+#
+ALLOW_CUSTOM= -DCUSTOM
+#ALLOW_CUSTOM=
+
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
 # Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+else
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
+endif
 #CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 # If the $CALCRC environment variable is not defined, then the following
@@ -925,18 +942,6 @@
 #	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
 #	  MALLOC_CLEAR_MALLOC=1 LD_LIBRARY_PATH=.:./custom
 
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
 
 # The install rule uses:
 #
@@ -1280,7 +1285,11 @@
 CFLAGS= ${ICFLAGS} ${CCOPT}
 #
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+else
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC}
+endif
 #
 #if 0	/* start of skip for non-Gnu makefiles */
 endif
@@ -1691,6 +1700,7 @@
 #
 OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
 
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 # static library build
 #
 CALC_STATIC_LIBS= libcalc.a libcustcalc.a
@@ -1705,6 +1715,20 @@
 	libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
 	libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
 	libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
+else
+# static library build
+#
+CALC_STATIC_LIBS= libcalc.a
+
+# Libaraies created and used to build calc
+#
+CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION}
+
+# Symlinks of dymanic shared libraries
+#
+SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
+	libcalc${LIB_EXT_VERS}
+endif
 
 # list of sample programs to that need to be built to satisfy sample rule
 #
@@ -1735,7 +1759,11 @@
 
 # early targets - things needed before the main build phase can begin
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 EARLY_TARGETS= custom/Makefile hsrc .hsrc custom/.all
+else
+EARLY_TARGETS= hsrc .hsrc
+endif
 
 # late targets - things needed after the main build phase is complete
 #
Common subdirectories: calc-2.12.2.1.no-means-no/win32 and calc-2.12.2.1/win32


--- NEW FILE calc-COPYING-GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library General
Public License instead of this License.


--- NEW FILE calc-converted-to-gpl.txt ---
This copy of Calc is linked against the GNU Readline library. Normally, Calc
is distributed under the LGPL, and for this copy, section 3 of the LGPL has
been applied:

      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.

Thus, this copy and all subsequent copies and derivative works are under the
terms of the GNU General Public License version 2.

The original "COPYING" document distributed with calc has been removed, as
it is not licensed in a way which permits the changes necessary to make this
conversion. You can find the relevant information in the source RPM or on
the web site at <http://isthe.com/chongo/tech/comp/calc/calc-download.html>.

NOTE: This is intended as a short-term fix; hopefully in the future the
command-line program and the calc libraries will be split in a way that
makes this unnecessary.


--- NEW FILE calc.spec ---
# Enabling this option invokes section 3 of the LGPL, applying the terms of
# the ordinary GNU General Public License version 2 instead of the LGPL.
# See the included "calc-converted-to-gpl.txt" source file for details.
%define with_readline 1

# This is disabled right now because it prevents correct linking. The issues
# here are related to the issues with linking with readline, in that the 
# split between libraries is poorly defined.
%define with_custom_interface 0

%if %{with_readline}
License:       GPLv2
%else
License:       LGPLv2
%endif

Name:          calc
Version:       2.12.2.1
Release:       7%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
Summary:       Arbitrary precision arithmetic system and calculator

Group:         Applications/Engineering
URL:           http://isthe.com/chongo/tech/comp/calc/
Source0:       http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
Source1:       calc-converted-to-gpl.txt
Source2:       calc-COPYING-GPL
Patch0:        calc-2.12.2.1-entangled-readline.patch
Patch1:        calc-2.12.2.1-no-custom-means-no-custom.patch

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed

%if %{with_readline}
BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
%endif

Requires:      less >= 358

# Temporary! This is due to a build bug; should be fixed shortly.
ExcludeArch:   ppc

%description
Calc is an arbitrary precision C-like arithmetic system that is a
calculator, an algorithm-prototyper, and a mathematical research tool. Calc
comes with a rich set of built-in mathematical and programmatic functions.


%package libs
Summary:       Libraries for the calc arithmetic system
Group:         System Environment/Libraries

%description libs
Shared libraries used by the calc command line calculator and other programs
using its arbitrary precision arithmetic routines.


%package devel
Summary:        Development files for the calc arithmetic system
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
This package contains files necessary to build applications which use the
calc arbitrary precision arithmetic system.


%package stdrc
Summary:      Standard resource files the calc arithmetic system
Group:        Applications/Engineering
Requires:     %{name} = %{version}-%{release}

%description stdrc
This package contains the standard calc resource files and several calc
shell scripts. They serve as examples of the calc language and may also be
useful in themselves.



%prep
%setup -q

%patch0 -p1 -b .link
%patch1 -p1 -b .nomeansno

%if %{with_readline}
  for f in help.c version.c calc.man cal/* $( ls help/*|grep  '^help/credit$' ) ; do
    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
  done
  cp -p %{SOURCE1} COPYING
  cp -p %{SOURCE2} COPYING-GPL
%endif


%build
# note parallel make (-j3, or whatever) doesn't work correctly.
make DEBUG="%{optflags}" \
%if %{with_custom_interface}
     ALLOW_CUSTOM="-DCUSTOM" \
%else
     ALLOW_CUSTOM="" \
%endif
     LD_SHARE="" \
%if %{with_readline}
     USE_READLINE="-DUSE_READLINE" \
     READLINE_LIB="-lreadline" \
     READLINE_EXTRAS="-lhistory -lncurses" \
%else
     USE_READLINE="" \
%endif
     T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     Q="" V="@" \
     all


%install
rm -rf %{buildroot}

make T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     install

%if %{with_readline} 
  rm -f %{buildroot}/%{_datadir}/%{name}/help/COPYING-LGPL
  # mode 444 to match the other files
  install -p -m 444 COPYING-GPL %{buildroot}/%{_datadir}/%{name}/help/
  rm -f %{buildroot}/%{_datadir}/%{name}/bindings
%endif

%if ! %{with_custom_interface}
  # if we don't enable the custom interface, don't ship it.
  rm -f %{buildroot}/%{_libdir}/libcustcalc.so*
  rm -f %{buildroot}/%{_datadir}/%{name}/custom/*
  rmdir %{buildroot}/%{_datadir}/%{name}/custom/
%endif

# Changing permissions of executables to 755 to shut up rpmlint.
chmod 755 %{buildroot}%{_datadir}/%{name}/cscript/*
chmod 755 %{buildroot}%{_bindir}/calc

# move these so the doc macro can find them
mv %{buildroot}%{_datadir}/%{name}/README README-standard-resource
mv cscript/README README-cscript


%check
make chk
     

%clean
rm -rf %{buildroot}


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_bindir}/calc
%{_mandir}/man1/calc.1*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/help
%{_datadir}/%{name}/help/*
%dir %{_datadir}/%{name}/custhelp
%{_datadir}/%{name}/custhelp/*
%if ! %{with_readline}
%{_datadir}/%{name}/bindings
%endif

%files libs
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_libdir}/libcalc.so.*
%if %{with_custom_interface}
%{_libdir}/libcustcalc.so.*
%endif

%files devel
%defattr(-, root, root, -)
%doc LIBRARY
%{_libdir}/libcalc.so
%if %{with_custom_interface}    
%{_libdir}/libcustcalc.so
%endif
%dir %{_includedir}/calc
%{_includedir}/calc/*.h

%files stdrc
%defattr(-, root, root, -)
%doc README-standard-resource README-cscript
%dir %{_datadir}/%{name}/cscript
%{_datadir}/%{name}/cscript/*
%if %{with_custom_interface}
%dir %{_datadir}/%{name}/custom
%{_datadir}/%{name}/custom/*
%endif
%{_datadir}/%{name}/*.cal
%{_datadir}/%{name}/*.line


%changelog
* Wed Sep 19 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-7
- disable libcustcalc/calc -C -- there's some Serious Linking Correctness
  Issues which need to be resolved.
- Ditch the parts of the patch that attempted to make linking libcustcalc
  work; rename to "entangled-readline" to reflect reduced scope.
- Make new calc-2.12.2.1-no-custom-means-no-custom.patch to make
  ALLOW_CUSTOM actually control whether the custom code is built, not just
  whether there's a code path which allows its use.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-6
- revise calc-2.12.2.1-everything-interlinked.patch to be more fine-grained

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-5
- set Q and V make variables to not-quiet and verbose build modes to 
  aid in debugging PPC build problem; also, doesn't seem like a bad
  idea in general.
- add calc-2.12.2.1-everything-interlinked.patch to fix
  undefined-non-weak-signal problems: need to link libcalc against readline
  (if readline enabled) and need to link libcustomcalc against libcalc.
- put docs in the libs subpackage.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-4
- temporarily ExcludeArch ppc due to a build problem. This 
  should be fixed shortly.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-3
- add LIBRARY doc to devel subpackage
- spec file cleanups as suggested by Mamoru Tasaka:
- use cp/install -p to preserve timestamp when copying files.
- note that make with smp_mflags fails.
- explicitly set defattr's dir mode to - to keep defaults. 

* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-2
- allow customlib functions with -DCUSTOM.
- made stdrc subpackage for standard resource files and scripts.
- only ship internal line-editor keybindings file if we're not using
  readline
- fix some packaging issues as follows (thanks Till Maas).
- Prefix COPYING-GPL source file with "calc" to avoid file conflicts. 
  Just in case. :)
- defattr for all files sections.
- make the devel package rely on calc-libs, not calc. This is largely
  academic since the calc libs and binaries are not as clearly separated
  as they should be -- a future upstream version will improve this, though,
  so we might as well do the right thing.
- make calc-libs not require calc proper; theoretically this should be true.

* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-1
- updated to 2.12.2.1

* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.5
- minor spec file cleanup for package review

* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.4
- fix (i.e., remove) rpath by setting LD_SHARE to "".

* Tue Sep  4 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.3
- minor correction to LGPL-GPL conversion

* Mon Sep  3 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.2
- LGPL/GPL -> explicit LGPLv2/GPLv2
- make the LGPL->GPL conversion via spec file script, not a patch
- now that we're building dynamic libraries, make libs and devel subpackages

* Sun Sep  2 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.1
- update to 2.12.2
- yay -- patches to build dynamically are now upstream. so build
  dynamically.

* Thu Jul 12 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.13-1
- Update to 2.12.1.13
- Remove calc-2.12.1.6_remove-bad-snprintf-replacement.patch, which is now
  now upstream.
- Added calc-2.12.1.13-removemd5.patch due to licensing issues (md5 code
  is distributable, but not lgpl compatible).
- Added switch to enable readline and convert to gpl, or to not.
  see comment in Feb 8 2007 changelog entry for more.

* Thu Feb  8 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-2
- disable linking against readline to avoid converting from LGPL to GPL.
  This is insignificant for this release of the package which doesn't
  actually include any libraries, but is something I want to preserve for
  the future when we're building dynamic libs. I'm working with upstream in
  getting this resolved -- ideally, the library remains LGPL but the
  command-line tool is separated to the point where it alone links with
  readline and can be relicensed as GPL without affecting the rest. If the
  outcome isn't positive, I'm probably going to bite the bullet and make a
  GPL-fork patch.
 
* Wed Feb  7 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-1
- update to 2.12.1.8
- invalid comments problem now fixed upstream -- drop that patch.
- patching out custom completely isn't really necessary -- just unsetting
  the config variable and removing the built library is sufficient.
- make sure to set the "DEBUG" variable correctly (not -O3 -g3)
- actually use the system readline library
- don't need to pass so many variables into make chk.
- chmod executables to 755 instead of 555 to placate rpmlint

* Tue Feb  6 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-3
- include fix for invalid sample files (# is not a comment character).

* Mon Feb  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-2
- create Fedora package from existing BU Linux package (clearing BU Linux
  changelog).
- add patch to use the system snprintf -- sheesh.
- move the "cscript" stuff to be under datadir instead of bin.
- list calc binary and man page explicitly in the files section.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	20 Sep 2007 17:16:44 -0000	1.2
@@ -0,0 +1 @@
+calc-2.12.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Sep 2007 16:39:41 -0000	1.1
+++ sources	20 Sep 2007 17:16:44 -0000	1.2
@@ -0,0 +1 @@
+c399c7b7d71d756c5eaef77e414a732b  calc-2.12.2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 17:19:50 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:19:50 -0400
Subject: rpms/calc/devel calc.spec,1.1,1.2
Message-ID: <200709201719.l8KHJoIY006780@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6760

Modified Files:
	calc.spec 
Log Message:
no, wait, actually I want to start here


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calc.spec	20 Sep 2007 17:16:44 -0000	1.1
+++ calc.spec	20 Sep 2007 17:19:17 -0000	1.2
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       7%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -213,111 +213,7 @@
 
 
 %changelog
-* Wed Sep 19 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-7
-- disable libcustcalc/calc -C -- there's some Serious Linking Correctness
-  Issues which need to be resolved.
-- Ditch the parts of the patch that attempted to make linking libcustcalc
-  work; rename to "entangled-readline" to reflect reduced scope.
-- Make new calc-2.12.2.1-no-custom-means-no-custom.patch to make
-  ALLOW_CUSTOM actually control whether the custom code is built, not just
-  whether there's a code path which allows its use.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-6
-- revise calc-2.12.2.1-everything-interlinked.patch to be more fine-grained
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-5
-- set Q and V make variables to not-quiet and verbose build modes to 
-  aid in debugging PPC build problem; also, doesn't seem like a bad
-  idea in general.
-- add calc-2.12.2.1-everything-interlinked.patch to fix
-  undefined-non-weak-signal problems: need to link libcalc against readline
-  (if readline enabled) and need to link libcustomcalc against libcalc.
-- put docs in the libs subpackage.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-4
-- temporarily ExcludeArch ppc due to a build problem. This 
-  should be fixed shortly.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-3
-- add LIBRARY doc to devel subpackage
-- spec file cleanups as suggested by Mamoru Tasaka:
-- use cp/install -p to preserve timestamp when copying files.
-- note that make with smp_mflags fails.
-- explicitly set defattr's dir mode to - to keep defaults. 
-
-* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-2
-- allow customlib functions with -DCUSTOM.
-- made stdrc subpackage for standard resource files and scripts.
-- only ship internal line-editor keybindings file if we're not using
-  readline
-- fix some packaging issues as follows (thanks Till Maas).
-- Prefix COPYING-GPL source file with "calc" to avoid file conflicts. 
-  Just in case. :)
-- defattr for all files sections.
-- make the devel package rely on calc-libs, not calc. This is largely
-  academic since the calc libs and binaries are not as clearly separated
-  as they should be -- a future upstream version will improve this, though,
-  so we might as well do the right thing.
-- make calc-libs not require calc proper; theoretically this should be true.
-
-* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-1
-- updated to 2.12.2.1
-
-* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.5
-- minor spec file cleanup for package review
-
-* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.4
-- fix (i.e., remove) rpath by setting LD_SHARE to "".
-
-* Tue Sep  4 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.3
-- minor correction to LGPL-GPL conversion
-
-* Mon Sep  3 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.2
-- LGPL/GPL -> explicit LGPLv2/GPLv2
-- make the LGPL->GPL conversion via spec file script, not a patch
-- now that we're building dynamic libraries, make libs and devel subpackages
-
-* Sun Sep  2 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.1
-- update to 2.12.2
-- yay -- patches to build dynamically are now upstream. so build
-  dynamically.
-
-* Thu Jul 12 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.13-1
-- Update to 2.12.1.13
-- Remove calc-2.12.1.6_remove-bad-snprintf-replacement.patch, which is now
-  now upstream.
-- Added calc-2.12.1.13-removemd5.patch due to licensing issues (md5 code
-  is distributable, but not lgpl compatible).
-- Added switch to enable readline and convert to gpl, or to not.
-  see comment in Feb 8 2007 changelog entry for more.
-
-* Thu Feb  8 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-2
-- disable linking against readline to avoid converting from LGPL to GPL.
-  This is insignificant for this release of the package which doesn't
-  actually include any libraries, but is something I want to preserve for
-  the future when we're building dynamic libs. I'm working with upstream in
-  getting this resolved -- ideally, the library remains LGPL but the
-  command-line tool is separated to the point where it alone links with
-  readline and can be relicensed as GPL without affecting the rest. If the
-  outcome isn't positive, I'm probably going to bite the bullet and make a
-  GPL-fork patch.
- 
-* Wed Feb  7 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-1
-- update to 2.12.1.8
-- invalid comments problem now fixed upstream -- drop that patch.
-- patching out custom completely isn't really necessary -- just unsetting
-  the config variable and removing the built library is sufficient.
-- make sure to set the "DEBUG" variable correctly (not -O3 -g3)
-- actually use the system readline library
-- don't need to pass so many variables into make chk.
-- chmod executables to 755 instead of 555 to placate rpmlint
-
-* Tue Feb  6 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-3
-- include fix for invalid sample files (# is not a comment character).
-
-* Mon Feb  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-2
-- create Fedora package from existing BU Linux package (clearing BU Linux
-  changelog).
-- add patch to use the system snprintf -- sheesh.
-- move the "cscript" stuff to be under datadir instead of bin.
-- list calc binary and man page explicitly in the files section.
+* Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
+- initial package for Fedora
+- clear old and long pre-fedora changelog
+- review request rhbug #227570



From fedora-extras-commits at redhat.com  Thu Sep 20 17:21:46 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 13:21:46 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.63,
	1.64 selinux-policy.spec, 1.526, 1.527
Message-ID: <200709201721.l8KHLkqG006875@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6850

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install
- Allow mono, java, wine to run in userdomains


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- policy-20070703.patch	20 Sep 2007 14:58:12 -0000	1.63
+++ policy-20070703.patch	20 Sep 2007 17:21:13 -0000	1.64
@@ -1618,7 +1618,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 08:56:35.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 11:42:05.000000000 -0400
 @@ -18,3 +18,102 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -1714,7 +1714,7 @@
 +
 +	userdom_unpriv_usertype($1, $1_mono_t)
 +
-+	allow $1_mono_t self:process { execheap execmem };
++	allow $1_mono_t self:process { signal getsched execheap execmem };
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
 +
@@ -1724,7 +1724,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.0.8/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/mono.te	2007-09-20 11:41:50.000000000 -0400
+@@ -15,7 +15,7 @@
+ # Local policy
+ #
+ 
+-allow mono_t self:process { execheap execmem };
++allow mono_t self:process { signal getsched execheap execmem };
+ 
+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(mono_t,{ dir file lnk_file fifo_file sock_file })
+ 
 @@ -46,3 +46,7 @@
  	unconfined_dbus_chat(mono_t)
  	unconfined_dbus_connect(mono_t)
@@ -4206,6 +4215,31 @@
  dev_read_sound(entropyd_t)
  
  fs_getattr_all_fs(entropyd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.0.8/policy/modules/services/automount.if
+--- nsaserefpolicy/policy/modules/services/automount.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/automount.if	2007-09-20 11:17:32.000000000 -0400
+@@ -74,3 +74,21 @@
+ 
+ 	dontaudit $1 automount_tmp_t:dir getattr;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to file descriptors for automount.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`automount_dontaudit_use_fds',`
++	gen_require(`
++		type automount_t;
++	')
++
++	dontaudit $1 automount_t:fd use;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.0.8/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/automount.te	2007-09-17 16:20:18.000000000 -0400
@@ -5150,7 +5184,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 12:01:41.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5172,7 +5206,7 @@
  	allow $1_dbusd_t self:file { getattr read write };
  	allow $1_dbusd_t self:fifo_file rw_fifo_file_perms;
  	allow $1_dbusd_t self:dbus { send_msg acquire_svc };
-@@ -135,6 +142,19 @@
+@@ -135,7 +142,21 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
  
@@ -5190,9 +5224,11 @@
 +	userdom_read_user_home_content_files($1, $1_dbusd_t)
 +
  	auth_read_pam_console_data($1_dbusd_t)
++	auth_use_nsswitch($1_dbusd_t)
  
  	libs_use_ld_so($1_dbusd_t)
-@@ -193,6 +213,7 @@
+ 	libs_use_shared_libs($1_dbusd_t)
+@@ -193,6 +214,7 @@
  	gen_require(`
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t;
@@ -5200,7 +5236,7 @@
  		class dbus send_msg;
  	')
  
-@@ -202,9 +223,12 @@
+@@ -202,9 +224,12 @@
  	# SE-DBus specific permissions
  	allow $1_dbusd_system_t { system_dbusd_t self }:dbus send_msg;
  
@@ -5213,7 +5249,7 @@
  ')
  
  #######################################
-@@ -271,6 +295,32 @@
+@@ -271,6 +296,32 @@
  	allow $2 $1_dbusd_t:dbus send_msg;
  ')
  
@@ -5246,7 +5282,7 @@
  ########################################
  ## <summary>
  ##	Read dbus configuration.
-@@ -286,6 +336,7 @@
+@@ -286,6 +337,7 @@
  		type dbusd_etc_t;
  	')
  
@@ -5254,7 +5290,7 @@
  	allow $1 dbusd_etc_t:file read_file_perms;
  ')
  
-@@ -346,3 +397,23 @@
+@@ -346,3 +398,23 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -5280,7 +5316,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-20 12:01:29.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -7986,7 +8022,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-20 11:18:24.000000000 -0400
 @@ -59,10 +59,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -8002,7 +8038,7 @@
  
  fs_list_rpc(rpcd_t)
  fs_read_rpc_files(rpcd_t)
-@@ -76,9 +80,11 @@
+@@ -76,9 +80,16 @@
  miscfiles_read_certs(rpcd_t)
  
  seutil_dontaudit_search_config(rpcd_t)
@@ -8011,10 +8047,15 @@
  optional_policy(`
  	nis_read_ypserv_config(rpcd_t)
 +	nis_use_ypbind(rpcd_t)
++')
++
++# automount -> mount -> rpcd
++optional_policy(`
++	automount_dontaudit_use_fds(rpcd_t)
  ')
  
  ########################################
-@@ -91,9 +97,13 @@
+@@ -91,9 +102,13 @@
  allow nfsd_t exports_t:file { getattr read };
  allow nfsd_t { nfsd_rw_t nfsd_ro_t }:dir list_dir_perms;
  
@@ -8028,7 +8069,7 @@
  
  corenet_tcp_bind_all_rpc_ports(nfsd_t)
  corenet_udp_bind_all_rpc_ports(nfsd_t)
-@@ -123,6 +133,7 @@
+@@ -123,6 +138,7 @@
  tunable_policy(`nfs_export_all_rw',`
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
@@ -8036,7 +8077,7 @@
  ')
  
  tunable_policy(`nfs_export_all_ro',`
-@@ -143,6 +154,9 @@
+@@ -143,6 +159,9 @@
  manage_files_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t)
  files_tmp_filetrans(gssd_t, gssd_tmp_t, { file dir })
  
@@ -8046,7 +8087,7 @@
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
-@@ -158,6 +172,9 @@
+@@ -158,6 +177,9 @@
  
  miscfiles_read_certs(gssd_t)
  
@@ -9489,7 +9530,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 10:52:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 12:07:15.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9512,7 +9553,15 @@
  	term_setattr_unallocated_ttys($1_xserver_t)
  	term_use_unallocated_ttys($1_xserver_t)
  
-@@ -353,12 +356,6 @@
+@@ -282,6 +285,7 @@
+ 	domtrans_pattern($1_xserver_t, xauth_exec_t, $1_xauth_t)
+ 
+ 	allow $1_xserver_t $1_xauth_home_t:file { getattr read };
++	allow xdm_t $1_xauth_home_t:file append_file_perms;
+ 
+ 	domtrans_pattern($2, xserver_exec_t, $1_xserver_t)
+ 	allow $1_xserver_t $2:process signal;
+@@ -353,12 +357,6 @@
  	# allow ps to show xauth
  	ps_process_pattern($2,$1_xauth_t)
  
@@ -9525,7 +9574,7 @@
  	domain_use_interactive_fds($1_xauth_t)
  
  	files_read_etc_files($1_xauth_t)
-@@ -387,6 +384,14 @@
+@@ -387,6 +385,14 @@
  	')
  
  	optional_policy(`
@@ -9540,16 +9589,19 @@
  		nis_use_ypbind($1_xauth_t)
  	')
  
-@@ -537,16 +542,14 @@
+@@ -537,16 +543,14 @@
  
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
 -		type $1_xauth_home_t, $1_iceauth_home_t, $1_xserver_t, $1_xserver_tmpfs_t;
  	')
  
- 	allow $2 self:shm create_shm_perms;
- 	allow $2 self:unix_dgram_socket create_socket_perms;
- 	allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
+-	allow $2 self:shm create_shm_perms;
+-	allow $2 self:unix_dgram_socket create_socket_perms;
+-	allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
++	allow $2 $2:shm create_shm_perms;
++	allow $2 $2:unix_dgram_socket create_socket_perms;
++	allow $2 $2:unix_stream_socket { connectto create_stream_socket_perms };
  
 -	# Read .Xauthority file
 -	allow $2 $1_xauth_home_t:file { getattr read };
@@ -9559,7 +9611,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,52 @@
+@@ -555,25 +559,52 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9620,7 +9672,7 @@
  	')
  ')
  
-@@ -626,6 +656,24 @@
+@@ -626,6 +657,24 @@
  
  ########################################
  ## <summary>
@@ -9645,7 +9697,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +707,73 @@
+@@ -659,6 +708,73 @@
  
  ########################################
  ## <summary>
@@ -9719,7 +9771,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1042,7 @@
+@@ -927,6 +1043,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9727,7 +9779,7 @@
  ')
  
  ########################################
-@@ -987,6 +1103,37 @@
+@@ -987,6 +1104,37 @@
  
  ########################################
  ## <summary>
@@ -9765,7 +9817,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1283,7 @@
+@@ -1136,7 +1284,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9774,7 +9826,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1472,62 @@
+@@ -1325,3 +1473,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -10057,7 +10109,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 09:08:43.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 11:14:45.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10088,7 +10140,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,23 @@
+@@ -176,11 +177,24 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10098,6 +10150,7 @@
 +
 +	auth_keyring_domain($1)
 +	allow $1 keyring_type:key { search link };
++	auth_domtrans_chk_passwd($1)
 +
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
@@ -10112,7 +10165,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +209,33 @@
+@@ -196,22 +210,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10147,7 +10200,7 @@
  	')
  ')
  
-@@ -309,9 +333,6 @@
+@@ -309,9 +334,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10157,7 +10210,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +350,7 @@
+@@ -329,6 +351,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10165,7 +10218,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +369,37 @@
+@@ -347,6 +370,37 @@
  
  ########################################
  ## <summary>
@@ -10203,7 +10256,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +748,24 @@
+@@ -695,6 +749,24 @@
  
  ########################################
  ## <summary>
@@ -10228,7 +10281,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1389,9 @@
+@@ -1318,14 +1390,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10243,7 +10296,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1447,163 @@
+@@ -1381,3 +1448,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -12135,7 +12188,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 09:37:08.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 11:56:27.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -12249,7 +12302,7 @@
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1058,3 +1134,124 @@
+@@ -1058,3 +1134,133 @@
  	files_search_etc($1)
  	rw_files_pattern($1,selinux_config_t,semanage_trans_lock_t)
  ')
@@ -12300,6 +12353,15 @@
 +	corecmd_search_bin($2)
 +	domtrans_pattern($2,setsebool_exec_t,$1_setsebool_t)
 +	seutil_semanage_policy($1_setsebool_t)
++
++	# Need to define per type booleans
++	selinux_set_boolean($1_setsebool_t)
++
++	# Bug in semanage
++	seutil_domtrans_setfiles($1_setsebool_t)
++	seutil_manage_file_contexts($1_setsebool_t)
++	seutil_manage_default_contexts($1_setsebool_t)
++	seutil_manage_selinux_config($1_setsebool_t)
 +')
 +
 +#######################################
@@ -12376,7 +12438,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 09:31:29.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 11:55:54.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12506,7 +12568,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  corecmd_exec_bin(run_init_t)
-@@ -423,77 +426,50 @@
+@@ -423,77 +426,53 @@
  	nscd_socket_use(run_init_t)
  ')	
  
@@ -12520,6 +12582,9 @@
 +selinux_set_boolean(setsebool_t)
 +# Bug in semanage
 +seutil_domtrans_setfiles(setsebool_t)
++seutil_manage_file_contexts(setsebool_t)
++seutil_manage_default_contexts(setsebool_t)
++seutil_manage_selinux_config(setsebool_t)
  
 -allow semanage_t self:capability { dac_override audit_write };
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
@@ -12610,7 +12675,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -521,6 +497,8 @@
+@@ -521,6 +500,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -12619,7 +12684,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -537,6 +515,7 @@
+@@ -537,6 +518,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -12627,7 +12692,7 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -592,6 +571,10 @@
+@@ -592,6 +574,10 @@
  
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
@@ -13163,7 +13228,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 10:55:37.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 12:06:52.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -13503,26 +13568,26 @@
 -		# Needed for escd, remove if we get escd policy
 -		xserver_manage_xdm_tmp_files($1_t)
 -	')
-+	dev_rw_xserver_misc($1_t)
-+	dev_rw_power_management($1_t)
-+	dev_read_input($1_t)
-+	dev_read_misc($1_t)
-+	dev_write_misc($1_t)
++	dev_rw_xserver_misc($1_usertype)
++	dev_rw_power_management($1_usertype)
++	dev_read_input($1_usertype)
++	dev_read_misc($1_usertype)
++	dev_write_misc($1_usertype)
 +	# open office is looking for the following
-+	dev_getattr_agp_dev($1_t)
-+	dev_dontaudit_rw_dri($1_t)
++	dev_getattr_agp_dev($1_usertype)
++	dev_dontaudit_rw_dri($1_usertype)
 +	# GNOME checks for usb and other devices:
-+	dev_rw_usbfs($1_t)
-+	xserver_user_client_template($1,$1_t,$1_tmpfs_t)
-+	xserver_xsession_entry_type($1_t)
-+	xserver_dontaudit_write_log($1_t)
-+	xserver_stream_connect_xdm($1_t)
++	dev_rw_usbfs($1_usertype)
++	xserver_user_client_template($1,$1_usertype,$1_tmpfs_t)
++	xserver_xsession_entry_type($1_usertype)
++	xserver_dontaudit_write_log($1_usertype)
++	xserver_stream_connect_xdm($1_usertype)
 +	# certain apps want to read xdm.pid file
-+	xserver_read_xdm_pid($1_t)
++	xserver_read_xdm_pid($1_usertype)
 +	# gnome-session creates socket under /tmp/.ICE-unix/
-+	xserver_create_xdm_tmp_sockets($1_t)
++	xserver_create_xdm_tmp_sockets($1_usertype)
 +	# Needed for escd, remove if we get escd policy
-+	xserver_manage_xdm_tmp_files($1_t)
++	xserver_manage_xdm_tmp_files($1_usertype)
  ')
  
  #######################################
@@ -14056,10 +14121,20 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1902,6 +1987,41 @@
+@@ -1894,10 +1979,46 @@
+ template(`userdom_manage_user_home_content_dirs',`
+ 	gen_require(`
+ 		type $1_home_dir_t, $1_home_t;
++		attribute user_home_type;
+ 	')
  
- ########################################
- ## <summary>
+ 	files_search_home($2)
+-	manage_dirs_pattern($2,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_dirs_pattern($2,{ $1_home_dir_t user_home_type },$1_home_t)
++')
++
++########################################
++## <summary>
 +##	dontaudit attemps to Create files
 +##	in a user home subdirectory.
 +## </summary>
@@ -14091,14 +14166,10 @@
 +	')
 +
 +	dontaudit $2 $1_home_dir_t:file create;
-+')
-+
-+########################################
-+## <summary>
- ##	Do not audit attempts to set the
- ##	attributes of user home files.
- ## </summary>
-@@ -3078,7 +3198,7 @@
+ ')
+ 
+ ########################################
+@@ -3078,7 +3199,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14107,7 +14178,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4735,24 @@
+@@ -4615,6 +4736,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14132,7 +14203,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4771,14 @@
+@@ -4633,6 +4772,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14147,7 +14218,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5469,7 @@
+@@ -5323,7 +5470,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14156,7 +14227,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5705,375 @@
+@@ -5559,3 +5706,375 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- selinux-policy.spec	20 Sep 2007 14:40:24 -0000	1.526
+++ selinux-policy.spec	20 Sep 2007 17:21:13 -0000	1.527
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -364,6 +364,7 @@
 %changelog
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
 - Fix to add xguest account when inititial install
+- Allow mono, java, wine to run in userdomains
 
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
 - Allow xserver to search devpts_t



From fedora-extras-commits at redhat.com  Thu Sep 20 17:24:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Thu, 20 Sep 2007 13:24:18 -0400
Subject: rpms/aria2/F-7 .cvsignore, 1.6, 1.7 aria2.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200709201724.l8KHOIEA007015@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/aria2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979

Modified Files:
	.cvsignore aria2.spec sources 
Log Message:
* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
- 0.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Aug 2007 19:50:20 -0000	1.6
+++ .cvsignore	20 Sep 2007 17:23:46 -0000	1.7
@@ -1 +1 @@
-aria2-0.11.2.tar.bz2
+aria2-0.11.3.tar.bz2


Index: aria2.spec
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/aria2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aria2.spec	25 Aug 2007 19:50:20 -0000	1.5
+++ aria2.spec	20 Sep 2007 17:23:46 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           aria2
-Version:        0.11.2
+Version:        0.11.3
 Release:        1%{?dist}
 Summary:        High speed download utility with resuming and segmented downloading
 Group:          Applications/Internet
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
+- 0.11.3
+
 * Fri Aug 24 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.2-1
 - 0.11.2
 - Fix License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Aug 2007 19:50:20 -0000	1.6
+++ sources	20 Sep 2007 17:23:46 -0000	1.7
@@ -1 +1 @@
-4b58849f0bf7f2abab1675ce2e8958ec  aria2-0.11.2.tar.bz2
+93d77ba3238d3954df39157fc77349d3  aria2-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 17:53:12 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 20 Sep 2007 10:53:12 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by katzj
Message-ID: <200709201753.l8KHrCiX020859@app4.fedora.phx.redhat.com>

Jeremy Katz (katzj) approved watchbugzilla on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved watchcommits on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved commit on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved build on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved approveacls on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved checkout on xulrunner (Fedora devel) for dwmw2

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



From fedora-extras-commits at redhat.com  Thu Sep 20 17:53:48 2007
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Thu, 20 Sep 2007 13:53:48 -0400
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.2, 1.3 nss_compat_ossl.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709201753.l8KHrmOL007934@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Log Message:
0.9.2-1
- update to 0.9.2 
- Enable loading the NSS PKCS#11 pem module
- Add a URL
- Specify the license as LGPLv2+ instead of just LGPL



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2007 18:28:36 -0000	1.2
+++ .cvsignore	20 Sep 2007 17:53:14 -0000	1.3
@@ -1 +1 @@
-nss_compat_ossl-0.9.1.tar.gz
+nss_compat_ossl-0.9.2.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nss_compat_ossl.spec	29 Aug 2007 05:29:03 -0000	1.3
+++ nss_compat_ossl.spec	20 Sep 2007 17:53:15 -0000	1.4
@@ -1,14 +1,17 @@
 Name:           nss_compat_ossl
-Version:        0.9.1
-Release:        5%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
+URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  nss-devel, nspr-devel
+# Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
+BuildRequires:  nss-devel > 3.11.7-7
+BuildRequires:  nspr-devel
 
 %description
 This library provides a source-level compatibility layer to aid porting
@@ -28,6 +31,9 @@
 
 %build
 
+CFLAGS="$RPM_OPT_FLAGS -DPKCS11_PEM_MODULE"
+export CFLAGS
+
 %configure --prefix=/usr --disable-static
 make %{?_smp_mflags}
 
@@ -59,6 +65,12 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 20 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-1
+- update to 0.9.2
+- Enable loading the NSS PKCS#11 pem module
+- Add a URL
+- Specify the license as LGPLv2+ instead of just LGPL
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.1-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2007 18:28:36 -0000	1.2
+++ sources	20 Sep 2007 17:53:15 -0000	1.3
@@ -1 +1 @@
-765c1426fc61b5c67c17fca0a87405cb  nss_compat_ossl-0.9.1.tar.gz
+84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 18:02:41 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Thu, 20 Sep 2007 14:02:41 -0400
Subject: rpms/xulrunner/devel firefox-1.5-ppc64.patch, 1.1,
	1.2 mozilla-firefox-head.ppc64.patch, 1.1, 1.2 xulrunner.spec,
	1.17, 1.18
Message-ID: <200709201802.l8KI2f1w014465@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12292

Modified Files:
	firefox-1.5-ppc64.patch mozilla-firefox-head.ppc64.patch 
	xulrunner.spec 
Log Message:
fix ppc/ppc64 build

firefox-1.5-ppc64.patch:

Index: firefox-1.5-ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/firefox-1.5-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-ppc64.patch	31 Aug 2007 04:34:18 -0000	1.1
+++ firefox-1.5-ppc64.patch	20 Sep 2007 18:02:04 -0000	1.2
@@ -4,11 +4,17 @@
 unchanged:
 --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-21 17:09:28.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-20 10:13:38.000000000 +0000
-@@ -267,6 +267,11 @@
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
  endif
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
 +CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
 +ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
 +AS		:= $(CC) -c -x assembler-with-cpp

mozilla-firefox-head.ppc64.patch:

Index: mozilla-firefox-head.ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-firefox-head.ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-firefox-head.ppc64.patch	20 Sep 2007 11:04:21 -0000	1.1
+++ mozilla-firefox-head.ppc64.patch	20 Sep 2007 18:02:04 -0000	1.2
@@ -5,22 +5,24 @@
 diff -u -B -u -p -r1.92 Makefile.in
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in	14 Dec 2006 19:13:43 -0000	1.92
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	29 Jan 2007 17:49:54 -0000
-@@ -275,6 +275,15 @@ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
  endif
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
++ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
++AS		:= $(CC) -c -x assembler-with-cpp
++endif
  
  #
-+# Linux/PPC64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
-+CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
-+ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
-+AS             := $(CC) -c -x assembler-with-cpp
-+endif
-+
-+#
  # NetBSD/PPC
- #
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
 Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp,v
@@ -93,21 +95,21 @@
 +
 +
 +#
-+# NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 +#                  PRUint32 paramCount, nsXPTCVariant* params)
 +#
 +
 +        .section ".toc","aw"
 +        .section ".text"
 +        .align 2
-+        .globl  NS_InvokeByIndex
++        .globl  NS_InvokeByIndex_P
 +        .section ".opd","aw"
 +        .align 3
-+NS_InvokeByIndex:
-+        .quad   .NS_InvokeByIndex,.TOC. at tocbase
++NS_InvokeByIndex_P:
++        .quad   .NS_InvokeByIndex_P,.TOC. at tocbase
 +        .previous
-+        .type   NS_InvokeByIndex, at function
-+.NS_InvokeByIndex:
++        .type   NS_InvokeByIndex_P, at function
++.NS_InvokeByIndex_P:
 +        mflr    0
 +        std     0,16(r1)
 +
@@ -200,7 +202,7 @@
 +        mtlr    0
 +        blr
 +
-+        .size   NS_InvokeByIndex,.-.NS_InvokeByIndex
++        .size   NS_InvokeByIndex_P,.-.NS_InvokeByIndex_P
 +
 +        # Magic indicating no need for an executable stack
 +        .section .note.GNU-stack, "", @progbits ; .previous
@@ -250,9 +252,9 @@
 +
 +// Platform specific code to invoke XPCOM methods on native objects
 +
-+// The purpose of NS_InvokeByIndex() is to map a platform
++// The purpose of NS_InvokeByIndex_P() is to map a platform
 +// independent call to the platform ABI. To do that,
-+// NS_InvokeByIndex() has to determine the method to call via vtable
++// NS_InvokeByIndex_P() has to determine the method to call via vtable
 +// access. The parameters for the method are read from the
 +// nsXPTCVariant* and prepared for the native ABI.
 +
@@ -335,7 +337,7 @@
 +}
 +
 +EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 +                 PRUint32 paramCount, nsXPTCVariant* params);
 +
 --- /dev/null	2000-10-22 01:01:00.000000000 +0000


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xulrunner.spec	20 Sep 2007 11:04:21 -0000	1.17
+++ xulrunner.spec	20 Sep 2007 18:02:04 -0000	1.18
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.3%{?dist}
+Release:        0.alpha7.4%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -340,6 +340,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 David Woodhouse <dwmw2 at infradead.org> 1.9-0.alpha7.4
+- build fixes for ppc/ppc64
+
 * Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
 - removed conflicts with the current gecko-based apps
 - added updated ppc64 patch



From fedora-extras-commits at redhat.com  Thu Sep 20 18:04:50 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 14:04:50 -0400
Subject: rpms/mercurial/EL-4 mercurial-0.9.4.tar.gz, NONE,
	1.1 mercurial-install-contrib.patch, NONE, 1.1 mercurial.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709201804.l8KI4o0x014648@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14545

Modified Files:
	mercurial.spec sources 
Added Files:
	mercurial-0.9.4.tar.gz mercurial-install-contrib.patch 
Log Message:
Update to mercurial-0.9.4, add mercurial-install-contrib.patch



--- NEW FILE mercurial-0.9.4.tar.gz ---
??w?Fmercurial-0.9.4.tar
???:?+?>#-????_>I?)???'U?????h=wAp'?G??t6???^???A????e?K???VS?]N;y???????i)?e?
zr????A????H???6??LnN?[?{??? ????R?_?T?9??rk?s?.o???A??/?0?<E	?J?M??sqt?W?I??
!_??W/???V??CW~?~??n5?q~???????)\??=???F?T??? ??lK.?????Z?ZKi'??
!??k??F?yo?_dJ^8???,a?6
3?\3?{?t??????Xz??
??8?????x???5$h?<?@2?4?
?????o???????????O?????????????Q?g???Y??M?]a?r????????????&)F??Cu.?[\
????Z?b:?.??wiN????*??v?	???*???.ZQ????????7??4J?
d?\
??s?????'go?w??M?0w???E?X???|u???z?R?tjS???iA?B{]?????
]???G?oz???????1~???~???u?>??T????????z??SR{??^??n?^0K???b???h*E-lR??C??(????"
2???
??f??L????}D???????tQ???mn$?,???%	'x????$~???'?6?????
??d?S(
y?? 2?????g?QQ%W???(????M??AE?0??G?????y??)??ZP????XE?s0@&?_6?G??ejs]
c=?f?????ga{
?fM??+??HW9%??*??0C/???i?H?w???1JR?m?dS?_??y?$?q??qO???r?of7K\??????????V??v?
??!J?p6k? 4??d6????????k4*OQ?}? ????:3
Z`???????B????????b+??.??E??????"???I??P6?:??W?}????|?t?f??Og?i????M?8?f???#??T??????QG????g??jG????x????????????'?????K???S???B????c7u4?T??b??????	??W? `??E[#Q???d??b??)Ty?o?
?T???????1#>EUR?
?????Z???u:E???z??????$??de?g
89O"??????
?Gu????Sf?????4j????*???k??H?)????@5`?????3w?k9
[??z??I????????"4jh
?!9TS7?
?[??2??gA	
?Qy?
???*?\\`x,WKK?f[9?R?l?????~?????+*?V???+???h??$i?U??x????,?3?j?Y_????s????"H???,?]I?H?t??d??]?/??/T8C???9w?0?`???
?Uwr!
?kCQ<a??Y???g?H??X?vH?@?|r?_?s
i?_???)?`?b???n???}?p5?2????????~???=?????????xw<????4??y?????????O??|?z|v?????goN???]?
?b???	???LT~i+?8?77??]S?_	8???&???4?Ijv??????`?5?Xi?(???B&K^?^?7
?,
?W~???jn??????d??<K?`?m0??????%????M?S??d?????
???R??????](a?U??????y?w4????jMx?????dH??#?
+???3??|2(+?	???z?????4??+F?[???????d:??????'??MB@{F????|0?[A?H?|?@#?f?F??????,$u??????<Jk??.ycQ1|??pIDr??[?????8?#w???.?Sin?g???,|3#?H?p??b?7D??&M?i"??2?I?Y)=?2u??n7J?8?4??*?*n???`?R?Y?!mRF~Hw??C>?2%n&S;???$???`?E???76???"?????????????n?Zr at Ps4V???j
?
#??Fe???;?????Z??p7?x??%<f????9????T?a?[R?4?z??HOP????.????.I?\?:?2??@?s?&??$C??????B?s?3\?m?v-?[\??????k?E?l??8}"?ZQ?*??hto.`?kW????
@*??7??????U!9?`???
q2?Sc????0?g?v????Y????f?? ??????s??N;????G??????q-?
0\D???(M?,?iG?D+???Og?M-lIt;]y?nz??????DMohB?5JKo?c?Q????r+g??"?y???c%??9w????E??r?hZ??$?v??r"?M<??c_???G???<?D?@???M??,lfv?x?f???rX?$??C??????nP??e??_209V??}?r}* ?d?O?O??r???mr????F????.?\???????????g?ZR?I
?????w'???-^x?m???!] ??G???d???
	??K?632??L@?5????4?+?i????H???pa?m:]z?2h|?:??^?D??s??????a????>????=?=?d?E??cF?Z@??t?"w?
?V???L??0?
???????;R??Z?67b?RV???0??
?C????.c\????fb,?[,H?MxE*?x???D at S???6d??Ml???4
?????YF????yS*???).?c??z?=?!0	@(?^	X?KB2?$??"d??O%?2*kj?p?????s????,?????mRvHG?C?????Ut	:`??	n?x???? i4??"?;???7?????W?]	217????? ????;
8?;Y??&Z?vqu?I?_NW????p?9
??j?L?tq???	6'?F?I ??C??-?
H5e5EcR?9?s9|WJ
t??2?]??f3?"J?$?V????O??!A`?] ?W?f|???R??#????y??c?l?t at kD??a,??????f?	???u???a*o%?t?Z?T;_Gj?Z???k??
??
@???Z?DNr2?t??i???=??AZYG(X?Z? ??/ ?
}?M?6?f???/@?e?BvE ???'X???Y?_fNgeUV????????????????s?j?z?2OV????d???????HB?!??	d??p?@r?P`??6?&lB?a?0X?x?#^ ?H^??=?dfuW?????w*3??{???????E??? ?n?????B?S????1??=?\J?????T????YH?L???"??}?{k8?^>#|?Y???=V'?K}?????"?
?1c
?g%?T.fZ ??==T???F!?Y<??d?????-??$>??EL	l[I???x??y??????^?&Pc???-?y??i??????y??tA??Q?

Ra??????c}sb!T??????f9kD?$???4K?????k?:7??1?~?s??&??p-????q&qQ??T	??????I?eY+?YR??0??*'?????s?????a???&??`?????#mW?????"f??????T|xk?<?y???M????????P ??R?uj??0?J?v4Q?M!??)l?d??I?h?%#???13??9?B&D????S?Y?gD?P?uS5!?c9?$hvg.?a?Z??#?e?
??0????_2b???;@???EV?Q???R$???C??-???n?E3Tg'?PeB!?	C??r8????18???f6?
?}
SqH*?N?=Ib??Tp?????dN???,tL??8?????/v????
??k??|p@?<&R,??u?5?D??IT???????&j??y??m??????????Y?0?x`?p?4??????(`?U?S??=??~tD(}??wF??n????
??]}5V?e?????L?j?@??^E:????&?,b?!BW?_??6??^kI?w??\??ED?[m???'j??eR?VW[?h[y????	?	'?dR`n?NP?
g)}J)?z?4i??0Z?e|(????%x??Q?6??????6c??xdPxb??,Qk,?T?U?RKx??b@????????#r?????27X??????O?e}R?
??V=????????Xp??NDT#i6?|?m?P|h1???C??K??T *3L?`;K?D??$???#?$|?O?<C??	??q???SZ?$GSkm?S;@?8???	?kN??IT?OI??}?.????vB]???5???<c?wA?36?0????!?|???dD?1?3^?
?>?,%S??8?=?? ]???@?U?? #?$??h{	A?r2">?S?	?x????c?8?S+(?'?ca?a?#>
???D;Uw
???U?78???xQ???-???*???Q???-1?*-?:?i???)???Po.??le?a???
?????|2?ti???Ge?j??J?'d????B-D??`????F:b<b?{???????jNZHC}h}???????\?y}?\8?q?????}?????x7
??h?U|T???4????n:{?#???,
?;o?????}?t'????Oot?q??7
5-?????g????/????'<+p?~?s\Ex @????84???dxq?=P{???e???????<|??
yr;???????{`??8??s??Gp?????<????(5/???????D?}x??'??*?1h?!L!????Dm???6?????????e?"??~}K??=(v????#??vjp??9y(d	?qX?\>`????X?c6??M?(KX????@??
x??}?0k'7?c??	Q,?_x?tVs????&9?M?T+???Py?)??l????F??7???H?+T?C?X???d?G:&|#:????E??m)z?????x/?L3??d???FqH??"?~?????=???*???
?)Y??@??t ?F??a???&?'?W?4
?"?????b????????	??E?\g??h?pZP?(?????_j99????ntV??_??????g???Xf?????	%?H?n???O?2?#b?V??2??	O???6??zf2?VPzXN~????	??]??!?B???bP?t?? ?{&w?k?qB????*9?-???B???u{_C
?N???GXjL3??F??c	L?}???+???j E?????i
?Y"?????4?`@????0>=?=s
?<?????*?q???w?>edZ??r3FN?T8??p?1??(
[B???}??m?8?i6Ae????c|n? ??????
???[?N??4>@?1???U??9??u[V?]XX?-,@??Pa6?U?n?j)?q?a???h?z?\???u?a????V
?K6??G?????+z?????i?}]?G_???y??kV??
??|???&???????
?????^????????g?=?????$??0??a4??$?????`??
?:?w??`2
???xt?????_?`??
??????????u??????!???H4???+???Nz
x`??????|?)?]8lk?_?E
??v??????]??~?????? ?%?,?????S >????|
uz??`?'D3:z???O?PW_?E???/?{m?i?&?<?~2?J??"?nu???/@a?K(?f???>??A??I??]?I?????????*\???????%?g??H???W????#??Hz??bLj^0?Xn\??h?<?77?N
kG??i????????<[?>[or:^?T_????_?X????(???[?_??o!?o??T??v?=O?S?j?_??????????9?7???f????~?????I???????%?????>??????E??T???ol???????O??????n?#???xc??<%????mn???gD????|??d????? ??P??????????A??+?-j=?pZ#4[&??o??t?t??#?A?7~vd?????/????J??+???????\????,h??h{s?
k%??G??????Y:Y?????VG???0^??Q?r??$?Js?F?m?4?f?A??3??:??'}???z`??????k>??z?B?????
?r????z???U???~T?|???=D?uc?p?U
??X????i?Bjbb??`???X?~c??j4w1-???kz*?uT???V???U????2????+????????M?SfC|nXk:??!????G??7????^?e?????)AvV?*?+?0???c
???
c????D?gz??f?????l?.(??????`z?|????)????l?????/1f?O?rg>??q??F??y?kC?Qzb?^p??K?)??Y???^)???W6/??[??y??[k?????`?WG??#r]Ik?XY-?Q??BYt?g?3?????
9G~sF?@J???%?O?u????W8)??_Z???8?k??Y??S????W???H????[?-GY????3VT?/??@???X???K???V?-??[e????????M??????N?Q???-Ok?_??J@?h??
T_?Qh*NA???/???5U????V2????M?'g??b??E@O????????$?x>?E?QCS??????
??F???^?g??6?????~?????/????????Oo]y?
?kB?s}?x??????&????&1?c??/?????2?B?d?f???^??S-_M?H-??\??*8??|?H0????y?GFf??	?H(?9???'|(?
M??<N?@mz?J?xV??V?????`)?,?-????[R??XK?
????ap?7?GFm??R???8??e?;A??????????h6?Z?[???
?s?P??81?k????$?Rz?BL|??R????M~=?U6??
??q"D?Z?^??????????6F??<?^??pe?????
???}?7????T?(?z?v?
?)?G?S?I???K???%P?g??'B7f??3???9??:?
?l?LGN?
??e<
?R^,???r??t????>?????[!????9??67ot}??????_o??/\?M?/?u????z?????q!0?`|,?SFY?y?
A????VP?#???G?oj????????????R????????}._?????
?P??(?'??jl?D???????N??D???C?????w?	??1?+?????[+w??^>?v???\?Z^?Y^?l?7~??
?
??l???	(}???"!??Q<-.?@5????|Yy=
??#?g3>^W{jq?X6?S??"????F+x<????n?w?????b???????H?????Hg???Y??<}??kW?_????V????K??+??z????????O??????^??????}?L.?&???H_?5?????k'??u??#??*s?j?S?8i?????p???%:?~?S??
i??c{<?|<??'?7?|+??d??u??e??=?U?"???~u??W??K
[Qn?bZ????,?V??S???^???x??G/
(???l?>?????7???????????O????{?y??Gu*?Jl?
v!??j?*???w?
?@I??m??^??2???????"??????;?w=p???O?n???qr{?F???u?X?	?T*?
????3#??U?R?q
?WR?c?#??(1???Fy??????G(
?Q??
???_?????_???????`
?O?[?
????3?0&??ru>0???? ??*,\?+?pK???
?????Om<G(]?&_????*?x????
?s??C?"?????Y????G.r??4?????J??r?1?J_?^7??e
?}#?^"?x??Q????????'?????W???????6???j?y???!???????u*??s???????????MxA??@???8?l?O_??W?H??%???p????????r?V????Z?S=??(???Ov??r&????cc(^?%5????
?????Z??W?????????7?\-?????????1??????_4?o???(?????y2=?s??

??G??fp
???zh:'?"??k??W??:????_????l????o?????N8?]???~?e<?@M?	mu|??\??????S:1?T??o_??J??n?K*?w?Q~u?????????]???????????^?&1?yE,???=?YL?3NlM?C????5Z]?#??W??H??X:yVt?s_?L?G???2???E??.R?$N=^w?Z?(?f?(?W9??x??{l?????V??]??????F?
?a<Q?Ja5f?????W?{3u????1ZRb?)?N"/??	???**[@'Ea??^??????1?i??8e??????????Tdue{???i9?#??????#???
?:??~??/?W??FJ?WM8Y?????B_??R?????\,J
??Y????._0?)?5QDy???x???	???N??D?7jv?iu?^?S????(8?$????EJ?}?K\???????q???0{B??d2??*??Q>??mn??????}P<?
?8?*!????,??*????????????r?????8??&?j???????+#?|q5F9????e8to????????p@????)????T??9?P?V?p~???v???c}I?8???B?:|????V:?^?????og_?.???????p;}?8P?
]??T??x[??BOO??:|?Y?????0???(?o?@T???7
D?>??0???Z@?W.??x\?j?^?????o?4!~??p?e|E??????+,?????I??Q?g?????????/???-C?
jv ?z??????+??_?b?]??c?f????????M?,??s?g?*`;r???X?G]??h~???^??S????V81@?Y
???????N?i?gk?A?++f??(]
??{K??e??4???|&???M;g???R?g#Rd???????k+(4p?
?5???????=l?m??M(???y>K2?
">????h&??+??H|?l??rgw???Ra??S	<_2y?6??	2o?? 
7ba_?+??t???????L5{pj?
A??|?F????F.?fi?<GZ????+?
?c\+??Z??}'??4/x^?????R??+[?_o???2?????CK<P?i"???T??sg)????i??]?y??+??"??[???y%?.<??D??VJ??oG6??O??????9Ep?P?G?g??G???D???	?uk~??4???xHy?Q+yG?????????Z.g???????)hg&WkjH???B?-?V???]?^?v+???F?JnL??X?????]?????_?;????????
????d6t???Yb]???l?R????SU????Z??????j:f?=!w+????
??m?jJ?+?X
N????Uz??t<w???+???f\6^,?t?W?uYW^u???e??H|*T????j?sv?B??}?y???v^????\??????yu?"?????$I??a??	???	&C????nu"???N?uG^??????<???????q?B??6???m????6???????????v*A?`U????MoeW%?/?????N?????f??3??UJ<?&q9:?????Y??]??ws?^j???E??)?????	?.R??????z??b?Fj??s`?????????N??p?F??????l?n????H?j?o?i?7???q??c?"??7????+BTQ????V?K?G??HL?GVE?c?[?? ?a???.~??-?????????0???Z?)[??][??21|??w??)??
T????@???????????B??wC??/????m^??~+???R??????>'"?-?
MD??6???F?????????q<Y??ht???	??9?W?[>??q?"???g?Pj??Y???e?K@??1?$??????????
?'?nt???L?Am?@???,???#'z5????
Ok	y^??W????g??S???[ (?rw?????????O^??????R	O??Q#;6??w?:Z??u|?????v?????w/??[??92GE?&?3?I??+G?y???9???`Oi|??<X?v???=3?????X????#t?A???q:9]U??????3l??nN?-l?3????%?
?????j?S??L?<??o^?q???u!?{3??%?8?z????D5e?P

??k?]???]??ox?U????
???[%??kW/??o??Oa???1S
qy????????{???_)ew??Zg2??[?V)g??
?
P=??????????+?????+?????m`?
	??G???s?0|&????#T?????nY?w?B??f?9???F?	D?????(A???bJ< (? L?X'~?7?]?'o?xA??d
%??p?k????$=??H?
?c/??A2R_????K?4?A=#?????$???Ec??G?????*??MGD_?uN?N??	??F-???[?:?A\?Y ??
??,P?????;???~??T=O-}s
Zi"?%E??????S"??/JG????!R	??????
j-?
??????[4o?&??p??qB/L???i^?2?S???'??h??V?'nB????w?j
}m?N?o?B???
?^-2??&?V?NG?fm
)???_????T?*Ma???O??	???AG????
*?*?T
K??\?B?h?N
??z4??????????9O???8O?U?5?????????~?j?f?$?}??O??v?n??W?]??}#????m<?~??<????
?K??C?6??=?2z?????w#U0??????1??/?1??[?}m<J?^???#	??N?{?d?????_??????8???????????t2??T,??P??,R]?
??0???]?8l????&3?-%h??7ud???	t%?
??8?F???????BgV7???Cm??:?#
??_h??Cx?Dw?K??????d??>??)??Y????U?]?r??U?????,????X0Fk??o^
N?(?g???bH&??=?Q2??q?yK?????4????P??"?7>?<%
?	??P`??u7
C?Jay?{=;T;]u0C?(????)?7p??Y>??as??y???~K4~}?tif?0??0
tD[f??J?iON?`v?????^?~6Xe~?sU?cC???Zn??$v??|?=????T?t?c?[GE?
:6v??|?9??P???????(?/K???Tc??a8?]??I??Q??-?|Q?*8??H*:J?c?????>:???^??398?M???????????????????~c???M??|?|?<????:?????????M>???????G???????????~?_??????????7?????#???wo?i???_~????????_?????O????i|'?????W??_o?3????????SQ????????_?Q?o??????_??~???????7~????????????_???????_???????????????????_???w?????????????????&??????m???k????o????k'????K??{????_?????????W???>:??????????????????????T????'??O?????????g????7????4??????????????v????????&??_=J???????o????'????????????/;??O?????????s?O??o????????????w?{????/??????}?{????/??O????q?????????????o???_?????{?o??8??_??_?_????????_??????'?????~?v????@????Y???????~?????????7?????????????????????????;?G??????x???]w???p??6?????o~?G????????j???????~?????_?}?????????}?W~??????O??????{???!
 ???????/???H???_????`????????????????/~?g~????c?????????'7???????????G??_???????o??[?????_?o]????n?H??=??o}?+???H?;??????d??
?\???p?W?{??????${?
K???T0Q?pW???r?????????????
(???????kr?J??w&??G=M?2?????r??n??X????aiT?6???3???*# /?@[?{W?cC?`N?Hz???suuTm??
?:?v*%????????k?&J?(?x??<8????Wy?$
:?)+
??Y'?*?????^?Te???5+??????F?
???
F;??EM??)???J
<drL^<?/?w<7l???B)??E?7Q?N?B??*?????t???+???????Q?????v????\??o?????%????e	?/?}????^?t??/???y!?{??_ea?5?????}??L???r????????????f?P??g??G?????Y??x?"?????q?/????o??s<????n????????{???e??@1
????5M#?????t??PQ'?`?q????N?e??;_z0H0??P?fdE44??????????7???????????o???>??
?9?
?????n???/b[??2??0?????w???????L?>???k^??????M??U??-???<?????l4?l0u,??Z??:v????*$?[??(?kz???U?"??1/??l?hN?mA3?C??Q???zu?\??\$??????@2?B??MB?????&U???w????_.??????#?3vO? ????#?	b?vF[?^ ?s??g??y???f???B???????????W?=4??&??5????@j?Tz!?;?7????#e????X?????<MB????S?\????Uw?q?]?????.?????-???z?{A???V?o?7Y??[????
??????\/??a????_?=???u?;?????4????gzqV????@{?N??Z&z???J,?z?J ???z|???Ng?[Ff????/f???]|i????????????P???E???`"?a?M?:?j?B??t???qz
?R??????*Fm??z,J?S?4?qC??FA_(?
??_{P=??u???7]??sFU??????????S?__???}??y??Q????Sn
???B\?g???]??/?n?^w?5~yS?^?%??3=G?3?w?9??$?oa?h??
???+U????xw??~?/6~??
?=6JU_u????=seX??%J+z???]y?(??Y??u]ET?????v?ro3?*`?i??/?C|?@????t!?!??7z?p??f??????IsM??q`N?7??B??Y?v???~?????c?bH??
??i-?_?d?*?dQ??
?o=z?????\??	r????e???uY???,?p??PSk???
?	?W=??Y??Jq??MO?????t?I??*????+1?|t
???#h?????+????n)???E????[?v???	?????c??l??t?J?p?2?a?S????Q?>ps??M?O?1??????????E?lNn[*??????l-K?[?????
????d???*W}?K?
?????????,9?#????RC??;????9?-X??G? G%?a2?n???
?z?
?$G??D
{2?`e`[M??!|???e"
U???F??Q?G?~???????? s?????E????`N1??1??????f(v0
?6/
??>Ng?i??."??f??;0????T?o:<??E?????9???t?w??kDa??BNl?J?????!*??tD??#???l?#??3i,"J
???:?K?,@?&tZ?b2`=??????'?Zz???f??O=
???????$&
??y?R?t??s?o????i'?$?????lP??e????>sW???????d?O*>????g?Io.??8X???DP'??4?????PIq
?m	h??:>??z4L
???db[????M>?:tj???QeVW?ftc????{<?b????S??p?m?I????t??,??_"??^???T????|???z[Na??AM???x????>=y???6x
????`ty??
?4wB;j`???xD?Z????E?	????)????K??[??G+???`????%@?5U????Z?'o?eC?RV?p???Yk-:?$??\4?d??
2x??]*?\?-???K??Y?]rZ?????m?OB3?7?4?w"8?M^?V?k??????.?m???????v?????6?F???Jl??????????:????k???o???i2
?l????????;???A	8~??????????Y?
pR'q?l?(????G%z??????W?Z?
?w??_?<?7??;?+$???d?w}?C??6??????0F??}?+d&n4???????????Dt/??E?>_O?????R?i????(O??5?.?*&??1\??????q?????=A7E+?w??]?S?F4p???7?i????^???Q??	????h?j?Fs'??*u2d??x??Cb??I?4????/]?T\?T?!T??g???WM???9?>???`??&'???pa?I?U?8?]?L0?k??K=??(?ho6??X??eT????X??L?	?D???m?
?u?]??R?y?%?Q?I
lg?????r?N?? ?/???????#???1?%?<??????DG?t???x?p6i?c???5?V?lL?y?)
??/?Pu???b?	A????
5D?&/p??k4/?%?u???t`p?h??N?~izX4?w?Q^$?K?"?}?45q????s?/?>?????m@?K??ls??5????=kB?Z?D[v?
#????!o?V?aOs???Y??|h???{_m?????M]g????i????4?l????h??~?gY??M??`? ?D?$3
V"??"j?????BT&??
^$d5?????????K???Ie_Ep^}?9w?\??+?[?D???H?=['B????V????(???-K????e???????s??fd"???=F\??#?)?????x????????rx?y?k?m??>?????Z???\?6?P???e??`
?????????X{?_i?k??E??|???7???a
<?I??????
??dB??U????ED?v?>??????G???~|?j?X?c?m????e?F????7?$/^?????'??7	c?tqg;T?	???Lq3QK%Wm8?hS?2??q'?|6?7???????C??f??????G:?4???k?? /wr)]o?P?K??eY?%[?\?j?}Y%?<??p?p!?[???C???9?m??O}?H?>R??q??J?&??f?aR????"?1
??s$??"?3?r?;?;.C0??0!M??h0??g?????e???c????'PP???r?x>??[?fy{??B?"?fc#?<??/\??????? ~??/w{????W??~??V4K??$?^<Y'???6?'?%U??????X%?19??nZ-W?1?????????d8m??+B:2Z?\???1?<2?i???????6????|?*?e?I???y??2?u??
J??9?M?vW?Z?3=]?	&??$?M|????s >???Se?????e d????????n?l?Dl??F&???	k?o/?6t??????@??v?g?|??J?\
?`[o??,?<????[?:??????$?????????X?2????!e????| k
4Zk*J?M?????L?Hq???A?
?d?
1??cB???C??
?29?????F?~<R??cc?b?? ???!
??
?q???1yK??=?V ,??	??a?2~??E?@?Z???K??
j???s?????5?h???sa?h?V?yd??W?zGb`!A?@?????H????rL?*???C?M??^???n??????????;??e?_ot?????\????????ZG?d>?
 ?$2???3??S?r??L??CEO??#?
?
m/?\:??w ?y?M?w	q??&???20?>>?@?N>=?`Q!?????=?
??vws?%?x??#Z'?	'`?B??1JN}???'m?=???}???`4?`?_?va?7S*#????%3???Q?r??)&}Q]??;jn????j???GD9?.????d?NbJ8??
?f?
t?AG^?
v???
c@j??7???
??[??S?5??R?:Mpf??o?w(??
???AN?0??m<?/???Z??wal????='?\???"U1??bZ?"?????\OGe?8z?*b??a(OT???FF`?B??vT?????U?j?@#?KE??\???5R4?24?S?c1OH?????Pl?????JB?y?y6O}?4?E???d%d?`???
???\L\Qy"?????p?2???????y1??4?@?b?????????*I?????)N??=IQ}?GA?[????X????"???}?ein(?z???????g
???[?\y?Dn???o
?W?L at X?
A#9?&?y??i2???}?b?h?b?l??????mK?Z;?k?5k??U$ ?]???????&O?@Q??W);??d??vC?X
	.LwU?;r???c[	ul-?&?I5-??Q?,?C???c????g?l?#??FM??a2???)?"P?a??TTc+??+C?v[???-??%????A??H?KSv?a????????u	?	??cS?<?VE??????!?????
???\L?q?????`??3#?????-{????????;??????J3^X?H?_j??4??+?FT??L???q?b??????&?$??V??G?3A!&???0_??X????i???bX?Z?UG?????N>???@
[A
I??????????L??p???I??&?yv?qU?1j??0???(UG?Q.?%w????????O`n?38i???d?#`??R?I?x
??Z?????4?????`:?8?+4??6???d??????A?
J?8?@?+??X??e?=??s??(?.???E??
L???Cu??x  ??
;|????"7??~?n?u????(i??0r???"N??!0Vtd???????s?d??2`0U>?N???DQ????A???C???R!???????W??]6??????????_?"1D?+_(?k\,e?j??I_??
??Eis5p?|??t?????'?h???/h???<E??4}?ww??????J????!=?N{a`????Q??
=}??k????????<8?%???muK??7?_???y3????1b F?`?gZz??????
????\????^??th???GP??ihM???'??????	!?????q{?k6????M:5?9??????~>
H???L?/u????N??7O9??Rk=?vT????8?1n????H?A=Hf???a*?iK???o?pI,???{?<o>o??{NA??]??d>?}oG?????????X????v5?J?)?/?m???^?b??b??3????'d
&?>O?
DN~]x?Gg??	C ^??M?P0!?C?1Q&8??"=hv???S!?`
??5|???z>?O}?Yrl??1
??????mO??GJ??u??w??.M?=???4???T?????0?U?p5?4?Ah?S?.Z@??~y????|Q????bA?H7??m????n?F?4?0}?8w??H?.?O)?}??w??Y??Z
???S?X??u?S_~^?TG???p6??pr?????????
'??Q?O?<????????ZT::?E??^???]o?? ??Vo_?7???(?ka?H1??v???3f???d
?[?Y?p?u
	??[??Z\g???N
?>???{t??3??U?Eu#2???b?&S?Y????\m???=b?)?]V???oR???t?????????????eG?(?+?}?w?W??f_??_??_?EJ?[o???8#???F??ubp?*Zp?6??!~?r}s`??????l?-??.cn(cJx{?p?X?k?#???2Rlc??]????[(??.v?????F???-??xq??u?????
u??,"?&q$??6?S
?
?????%#??]%??????Haa???G????e=`2??8?>??T3t?8?I7????xt???-???J?u???r)(?=,	?@?g??W???	
???z}k??????????Yk???a>M??,z|?S????<\[??7?O?????b??????}?Y??????Zd!o?
??*|;<?w(???#~wx??2?1,?I????}??U???????r????V???Z??????????=?e!?????
Ag&OQ??7S?c&{8??kW???;?\p?oV??e?Z???)O!??hK??l???R??=0?B?????rY?VX???4?X!??X?????
)?
G?4G>_]??
??GH??zW????c?je??G?????}6?SHS?!????z?2??????4j??????m
??6???Z}??2???C8?t ????A?`6?xz?.?B(?fC?Pcy/uR?U&I??x??<??????u:~?h'??L?&:??lca?J???f??3???2?ZI?L!72????B?4v??_???????)&/??X?d?qH?O,?l?X?L????}a?
?d?eF?p?u??????OL2;?~G?#z??wvKh?LR??
????'????l? lf???
o+??*?FO?3?????????z?*e??????.????
^ou???$'??]3h????k3??X+d???]i??'
t????'?#?x????u?Z??xF???9?s-?Mf?{?? k???????K4??????M???b?h??=?`
)V??f?9?Ts??4H?L*??Q?O_?,??????)glJUx?6??x'f??z?UYK??????????8~?????]?$?v1?r?VR??4U?v??,??Z??}+??i??????M????p??a??*3b1???(vU?gL?L
Rbil?r?9???@?f9&/?RL??
YA?w????hTzS?r???$????????j?????O???$?a*S5??N?k???p4/R?b??^??n?$??8??Y?5~?!?dq2]?!?? Wfs???K??2???:m?T?V???I?????v???#??hR;?
?? [W????m1~\f~?'b??:K???n?H???S?a???u?????
z????
??????z7???*o??????Kgm<???H\E{?MW	?OSp/?>???Z?i)Y?G%?I>???r??E????????k ?i?GKu?|I?LJrl?q? ??5??f/?h? &`?Y5h}0?? k?q?$????1?	ZX?!?????[fr?x????V???
?!?2?$?@P?/+ ?????XD9?=0????A??n??(??_??
?D???S
4A}E/Y?????i????)??????O??%?????? ?&??????????es^`?Cb?y?:???9?z???;H?B*?EW,?Z??A??
t`??i??^?<?U??0???K??Pd+?????V???C
??C??????8FWF???U4
??4??jK?P?\G?+1*
/??U??5???f?-???
?n%so[???JS?:|]^?#qA?y?{??3?}?n%??R???Dm????????4D*?
??DH?|Kvd?3?????(-?lX???s???(??E
h?????Y???LM?o????
?FPFy?;???????9<?`Wb?;KQYi?f????S??M?xD??????H?R?.???$?)??y?7?v`?ris?B??7??????n?[znU`q
?J'
5`8?QgK??)?????>?d?(????)r;w?#??)??v????}?}>??E<V+4?????p?????????ZJ?N!_?Y????b?k?<P??????r^??A???lpBK ??????)U}4????|?XQ??D??k&=<?N?0K???<R????0?? e??@'x?5??}-??$??f???8y??2????6h??-??
?4'7?????S??V
?????
????W??V???t?h??Z*???1 ?u?|L????R8?????O?a??1????D??x?~E?82??)??4y6O???K$???GC? ??rJ? ???J?%(???????w????=
?ZFS?Us?oK?/&??
?4Of'??XW????pQ'?+X?x?p?RZ?A%,?Od:??U??2?S?????*?x?:?&??o?U/|[??6??o????.?????u????/BG????d?+
???|)hV????4??*ZbZT?/?J%#??968?!E?-?0??v?p"jLV?kF?????Nq??*h???Lw??l?|?w????P??pd?????????M*??J??i????tAFJ{_?D?N??i M?Rb???P????t?^?s???'???????i?????????-&_?x?????+??????7g?KV??K????-$???a??[7e at I??e????Ci?lGOH??????4"??+?`???b@20(?Q???iQ0?$??????
?>Z?K ??g0?{????ufI)<?P??2?u?^???
????4l??????8??\???J?Yu?
??u?????;???F?L??u?/
???s4_MF#??I???bhhI3??e?(>u????hMOy?a!AZ??fb?{????S?$??x??C?]ns$?M?????
?<u7Nb??????l?x??[?? <?|5??1
??iQ0:*??u?#??Pe???*|_)???s?kA?^/???c???'????0????
??m??h?2!q???m???Pp??S?n???'%=?YA?U
?:???B?????%??D=] ?????P?g7e???VG???????h}???gEK??,?G??
v/Z#?*?V??????]?'?`g8??b?`!?/?p?B???2?X???{????w??N????hJ?q????K????????
uR??n6z???nowa???L???QgC??2?o7Z????M6?nE]?6??UH???c?0M??Z?q??Q?t??u? ?	%W??O???S??]???(???^?[???
?V?3
??i2?????Y??S?9?+gw?;??K?"???E1??Is?:???y??T?????U?	??nU,S??j?2??%???[<?8????nV??hCt?<?
?~0 at b}??N?.? ??
?)]O#?z?zX??(e&~??m?R8~
ok??l???+BS8??????A?????S?Q?QgJ?.<y|???^?:?Q?h??
z??9LY??H???[u'|c
???]???u\?[?(????A+]Ml?TQ?~.&?mj?f?T?????$?z???"???{N5??
m?9???I??C?!?????c??O??<wJ??F??????>?[?????D????????.L?[< lf??????4>s6?)?????nh$p? 9??+#9?T???W???a<<*?M?=?Iv?N?l????O?Q?<e?^A?hfl2\?@??{????x??%??????????1 ?it???o?????/??,.o?
????????Vu1????BsF?R?GoE?q
vpQa?w?\??<?%?)?Y/??&????S???"?t?"H??v?m???
?,4,?bw?????????O>??????=~R?s?v??J?t????A??????.?h??fw?-???G?<???????W????
%T??5B?8q?
??Y??'C???
]?O??4???]?y??'2!?;??;??F?T?^ya???V?????????.??xn??dn ?????Zy?!?;c?????l?????????;???A^Pd???
?W)????a???S?_dM??dP??~??
?&?n??G???S?`?<7?W??>P(??Q?m
y??d??????*?&m?,)y?V???????????O?B@)?G?-(?#??Xg?????iD1-"??P??"?x???V?>?>?O?l?^t?0
?;X?{?????sv?Y3?
?G??H
????bei3?vm6SO?&?Y?L?C?NH8??m?(x????????y?|???\_???]??jW)y?.??/????C?s?aS?[?q+u?.p?????w?????4??=??????>?t??:?mh?'???G????????ZesV??t-nK*u}??/??w?kI????s????{????? ???x?+A
7;]Yz???$G?0? \???nYa??MB??A???S~Nj0dX???w0U??????????e???|???.?,?8???'&tQJ?????V???u??!????$-??1??%??p?4??*???5i??j?l?jm?vWm?????F+?W+M2??/???U??-??I????G?b?O??T????{??v?????L??DD;V
??????????C????d5????0k???e?N???H?e;pi?m1S??S
?Gv???'?-???OUR5GC?8?Z????dVZ2MC\f?mW???~X`??j:<9?????l]???^??^???z3?_z???(A?!?A?c???d??????#82???<?_?O???????r?#k?????????$?1???[?0??Zdb2?m.??&'???}
??r?P????AO?^R?WzR??|?f?c?P??	?R6L?S
l???:??^$????pV??|gS??;?s\
4g??(????]z@?#??U)?.)??kx???>N:E1?SDe?c
/?????g??A?z?Y\b?????x?R<??`"d??eHp?Js<.~??s???4k	.t?}???B??????q??~;????:???AW[??b
?????a at 3?N????j???? ?????k?9?)?!*Fqq??`i?????*? ??6l????y??Ik?]*??t???????t?_?W	????? ??i??@X?o?Y3/????f%?%?6????.?!Y`??vi
b?????@?????v???"n%????3???)\?????h???????7?QA??????Q??`;a
^hli??n-?r`???7@
|??????L??LU?cm9>??p`GU??,8?u???R??d????!rm????M?(&??G?v???1????o?6????^?gFe0X`(?D`0.\}????QD%?w??3???H??lSz@91???{b?%?0V???G?k?\~LGD?
lv?/T??
Sn????A??????7
5?t/b??!?Cb???????'?
U?
????j[?;F?
,h?)???*M
?F{W??Y?f!???VY?;?
\???*??&?:i???~?I?2??;f?v???J????RE?T
??v>C?Yx???\??m??k^?S???6?v?8L?????0????Y?#?=ft??Sgd?8c?,/{?4a???? ???????a???
?^?j?????x<{I?Pm??p?@9?/u#??mk
? ???}9?.?????
?.?p:#D???1?????+8w?:????t??
@????[,?F'?r?????p??,??)=?%??V;5?
?u???xOOJkISFaUo
?a]??^T?7?V?&????@
??@D5::?X?O	+
???2???H???s?vG4?2?h??4?	G?E!???M(%nS ,?L-_H~??yt?~,?s?????e??/o????mv?	MhV7?E?A??t;??~??(Z4 D-??V??^?(?.??S???Q???Fp?w?Tu?m?p5????xT$V?%?]?S?9C?@???
/??%?@?*??????vkK!?????h?3=??p?o{?0????[??,I???%?08??????&<??d??????a8???"&???
????????V???:v?A?Ts\???/l?????h??????-????Q?C?N??e?=p?5??Y?C3???9bT??
w??p?Z<Q??J"-X????????N/???5?o?/X$`?"?)?e*~??p-P???????0cREQ?????q?D?s?[???7@???? ??q?,0??????4??#5?
?%????#??B}??^???N????7"v??fB?^??$???GK?F+t?N{EV??"5?p>V?????
??^?A9SdZ??pU?)FH
??%???????'*?AJFH
/G`??s??k5?-?????{?6=?E ???J?_???Kq???????I}%(??
?V+D3??X??}*???O??>X`IKh?
#"?E:zP|&??????A?s?(?F~?q???s??????h`???V/??????z\e?0H?/?P?NJ??l?
??;COr?????(R[?\Rl:U???.w???????#W?P ??
???xT?
;?;c]???? ?A?B??{?~{??=:-H??.?9?K:+2B^????n?T]m?M
Bha???????@????	?	?(&.??3h!??WER????J???#???Sd???l	?????Y?K?$*??O???-<??tlv?gdC?)n?R?&?h???,?U{Y???"???6?H??C=U?d]?R?
4???>/t??:?b?btM5??_,???
?r?e??R?I??X???)y?^c???::?quE9?gF??????????;`?y%???U?+?N?eQ?E$?o???p?E??
?????*?U??????;???2&????N???S???9?E
A-???|4J??q??T?Z,?]?i=????N?f??UG?^?'?'??K????=???l.0????s??z%d???

v??p??CF????R$i??i??N?'F*?!W&?2|BK?i?0??c85EO?????????ZVm??3??L?i?(?i?H?R???~???N?=? ?++3h?C?|
?B2"k??,6??c?I???l$????W?Sf?U?????44]x?
???^?????b?Q????w??r<???*z?-??W???~???????7??2wl?n?? -"3y>?`Q+?????"?+?R??E?|?2??.
!??????v?%?ul?ED?J~86+k???W
?RCsf??o????Eg?@Ox??U-??P???TU-_H{_??W^?AZLF?	????Zq?i?a??)z??L?<8???p?v?0?{
y=?5????A??*??{Q????;^?y
??4????????(??-?z?S??k~??1???(0??~'bag???g???M>k?$m???As?&?[-???wO)8?????
?????$??1 ???y???#?h??q?????N?p????^M?jv???7?"?5?*?^	/+N?<??Y??T?$??e???/c/?be??????p???	?*qj?V?2?????:L??T?M?.??[??p?
?????O???!?r?8??x?$???????T??V???Sm????????a?r
Ya???"^???????u_????*Y??"?`-l???j????hZ?U3*O??Q?"?k??J??-z?p??j??3????????]?????
E???R?%?D,?d??;???X`j????d?ZN?,9?k?G>?v?0?)dJ?????? ??2gH?'mx<?>???4x???(?U6r????4Ex?\???|$V?%?????m?}?f_ZG??#$
Kh?Y\?
???t??v?~?k??V????|H?7`??????o?{G??dvHJ
??=a??h??M??u1x?lZ????ze?t?F?$???0M
???
lZ?=????i??J?E??DB?????Q????.
??h(:??>gYVPj?V?,??????H??/I?o??S'??UR?C?4?`J??ri]???
[?&??=?Hg_?d??&??k?%?2<?F?b?(
???b@>???????P?Y??/??%??RB?????0?v??1?H?????O(?1
LD?l?tj?9?
?-??b63?1?Z??#Vc????Y??I?Z?uZ7NKF?{??@<????i)???????+;!?????@
w????-}$?gx???^???2?9i???????s????^_o???d??9y?Y>*?_PZ\5????.?,?iQ*?%??8EWP??0F?t?:*?)?m?
+?Em
?~?KO4
??{e?k?+?????????????\
??BDL!oN3????f????????;?A?7????}?? *	w???=?+Q?_?Ep_??v??F^??vzo;i?1?
B????W??M8??v??d^????reB??H??????]*??"U=W???:\???????.?????M???????{??k

&)??i??^????A??????GX?e??A1??4?????V??9??%'B??Q'=???-o?6#2??g??????o?>Uvf???$iG;????`???
?5-???????5?H?Bkp?8&????@??x=?[????+K??1
???}???W?^???o
?~???s?????????????/???^??????W?_?8?o??????(*?
N???|zn o???x??????4?p? ???+2 
???
9	C?d?G?4?X]ic?\vV[??f??9h$1?N??J<H?)_e?CO??h?X???4=	$??l??:??~oN`??????[??b??b>?'??1?C??7P^Y?8?o?????????~?1????????"{s??G?????F??A2]?.n9??Q?x?T:??y?[?????TfFZ%Y???mZ??Mjb?Rp#?D???Yn???-?6;?\??k6=?'`???](^p?V?	?????A ??;???uG?0b????-???N??????O+??A6?`?>?p?4?U?Ye?'-r??g??,d?3rb?
Y??pD	??L????I?=z|??T???8?%?Bx?QXP?h&d???????y???w+?^sVN???????e?;g?U???Nw3? ??v????????|???????{_?\?????p`H?VI??@?????h?????_?j??Q??Q??s??g???
?sY?8?N?r?m?X??&Yr??Dp???Of??Dn2v??BF?G???#??
T????!f??????
??a#??
?N?	.??\???+9? ?t?-???N?q<z????8?y?c??s<??@????h????|>yuS"??-?????qR?{l,??-u???:e\J??)1???l????nUuzA??"??Q?Y??.A?
#???
?sy[?N?#???a?;?8[????#??*??a??G????????Sh?$y??Qq???^dRYlk???,&b???x??{S???x??'!????a?l?D????fbI?h???
???3|q??=+?R!G??	??s|[?6'???	Uh	?
????N?????V?_54??t?!???`8?Zk?7??(1d:?X?,f&?N)5?KZ?E?3`=???qmP??s?g???w	?????za?????\
????U?n?L4A;[???/??r?/?
$?????O?uM?=???UE????@@???W?G
?sJ?F?S???v='u?k?"???w??'???|]V?~}?+?F?{?<?&/??_JN<??i???R?	SI?
>???????Jl??Z?x?=??.?Y#,?$?k?X?;??I???+B???^h???y???V|(z?sn????q????|???AO$7d[$8?-?*?HU??/?_?,r???8?S????U6u????
????a!?/?<K??K?/='U?w0d??oM??4???W:?t[:????E???????p-GW?nh?>?y??L
-u?D?9????B?Lf?$??g?NY+s? ??{?6Y??hoD`dzO?",???&q(V?????*1G?I?YKm8x??? ???.UB??U?f?$?"T*???l??????.??)?k????????wG??E?
D?Y?p??(?.?'?R? X5????2?"\????????
??-{?ek%4CC???+???`?S?=KF)J=?????????e????dc'??6??:7?Y+t???e??X?7S?????????i?mG
?k??n?????H7?w??:T????bZ?AN?:???N???????Y??? ????p?
G"#D?t?u)?8???a?[&Z_?????@?????T????6???????????V
ewt?]?'4??xt??^p?F??!??6?"?????H?,?)r?{??^f??????*B???v?Vj??h??$?U??2h??????	?l	??0*??6IrD?CR?(??Jc??q<?+
%?O???	M;?l????^go???f??L0?i???D????????R?
<Tvu??'H?C?s?:?_	B??u?6?A.>?????!??Vw
?)r??D?M???R?
EV???k??>?1???
?.i
??R??X5
??&?????|??j?ZU?????pN?]L?????????_?1?u"????(???g?????X?UN??J???~???0?+?Wggx????+[76=????7?]?????0iBdV?TV`??
?F????j?;s$Pn???????G1???[????
??
{/N5/~i&N??A???????h-??
	?%*????'????????ch??\?p?t??2?)??}x????x??l???<???$?^4????0?? 2a???-?
??P??Y???<D??Ou??'vf?8bE6??F??KHV>#???/+????f??O\?Lq??????????,?yP????J?E?q???T
q????U1l)?????!*?????x???X???????7m??????)H)??
Bk???h(PlY?joB??"?2J??f?
????h??qe?)W?$?4???B?Yk?pv??tYXSm!?d??h?QZ???S:???sLk???@???LV??????)??&??a?2???????S?B?????0D;3??FH??BO??v???????Rp\?[n?d?7.?pV??#?o???4
xU??%P?/^???Ag?Y??#
wB??EHRN??$?\???f?9{G3?.?-u?hP&??xD?&??8????	:cTEv?&,?#Y???S??a?n??^??&,%~9r?ea??D????q????jh????V?V-dX?r?8??[???
??P???ahf?/????NkqP??Ky+We=?
`i,Y?B?*??89???vD????cr"'??F!??~:/f?c?t??r	?1?Y??"'?????????I?T?%*???nac?}???,???<?j?WN?l*tDf???J???6???-6G?Tb??u4?",???y[M?G'|?xq?+c???Y6&n0??nn??e?]?k?>?l_?`9
??-?b$??D?+-8?-$????40??ms=????????v??=]?,?WC?u?d??????&W????k??Qg<m2m?j??CYu"??s?
???4J?kw?????3W?I??(-????J???????%?;38
?K??"??I?t??@?e????j;'??????? ???4?????
??????dDo~m9???Z??
[...1795 lines suppressed...]
???^w??7&???s???1??KV???G????XB?GlN???????????3#a?n?????3??x?E!BCG??ot?F?rf??H0???]t????t???0?????20?$a?HN??(?G'???9???f????G???(L?F?]?????%???k?RS?x
???3??????d???Ar?LPE??[s??L???G??X?fg???
'
eZ4?A/?]??!(c?&E?L??I??M?(???KCl???????su?qa?W
?sF???)J??1??	%???q???"?u<Z?rJ1h3??A????*?F??`???SV04?f????Y??mh??\??gR|{?k?w??@/Yx?
b???1z8??????p????b??r$mXa?<?>??T?l??g?x,??q\-HNW??w	???????v??FV?Q??l?s?!?h????%????xha09:?P]???;????*/???L????Sy>2?????????`?fL????B??x???G??}?F?d??????????G?i??E.??"?2?RB	9G???????????,a?????~p????T?!?U??0/LySe&??)?7???1????N???8???Y?6???d??????7ir?????~??Z??(X???	lm?
?zH(??e?P??07?,!??6??B????M????:/??@nG}Z;8??b??)*???B?(?%?E?$
???`?|???yn??>???f?i5

??%'???%4"?Z??a???|Ly<[{M???6r??)sgJ???????f?X^??m???i6m???%??	?i;?!D?en?i???????A????`??TC????1M:?R?N ??;?$q?)?????J2X???w?l*?`F?7?T???1:????Ke??+x}i?f	??[??~??_w?2?(;t?T?}?m?h??? ??????
??!?(??E?h{h?@lJYk???e?U
[=;K?)???J?????;?h?
??"??????$?0??'??~?@Y8??q??????SM?',????
???????#68h P?|?Bj:?7?T?\p??^????3?`?????RzN????0Y\$??(6?2????Y<x??V8?V?EY??/B?????x?
#?@?)#^O???????8?af#?*[?6?pz?/??6?L?R?9"????O#X?aE??	J?p???{?r?/?sx??!??v??????X~Hao??OuJ?O??\??Q??$?o?[??2}????V1???G
<j%??H???4??!3?????L?
Qbb?T)
n??????x??@?????G+??????be?FA?9B?N]?mlr*???H?/N-??AO_5H?dI9?HC5C?w??????,2?????1?V??f$????^puEXl\?\??i???????JP??Ta?~J???Je?^???????f	U??`W?R???C(?/gP??H?Dw)O
?\9;e????Jg<?M?	G?x?"????q????4???I4?V^?R?G'qZ<???(??;q????8??*
?+V??D?6@`%????t.?	???
0rN?'gO?U??????????%?SAW?S??$\aj?`?????&????q?<'?]??d??a?A]?nx??pkh???~?z:?&&???<? )?EP??"?v5????X?
<?B>,,1a'?????E,|???a????>?G??S??
ZdwmW????hJ??????"?? ??`cz0??J?e?#T?Gs??P???&46$?????0??D;z?O???&/)????$?]?c???T????l8L?H]????J2A9vi?\<?7??+Y??(	'?P??Sd??q???E	???Yirx?J?????w??X??}_????;^??n1??O???06w???
G?G?h??<L&?lC?dh?oPu'I???HM.>?&??k?a???? ?????II?%??P??[=?w?Z????x??B????$?f?{z?C??X??sGj??[?'?!?i??j???Mt???s??i6?Y???A??#?|???#e???GO?a?v?????Bm(x??s?c'p??\??!w????v???07z"S?2??K? ? ?\+ry?
???????[j?S?#uU??????'?&?BcK?/???!=??P?N?B????D??H?f??	n??&??v????????1J????_?b??PV??????????=?)?s???????????(\W?????

??E?-A?#?E5??{?B???"2?Z8???r%?T??e???U?uA??kk{?GLR`??
Xn??????
{??n??LR?U???g,?W????T@?$D7?G?k??$
s?0?HC?F?
?2??K?XF=
H???|AP?????\?X$c?????y????N?^`?????A?t?????5????G?bZ'??~?<??Y?LPqJ?E????j?`?	??.?$?3kE"?Q_??#??????W?C?????S??+(C#?????;5?!?L8??@??F?!I???%z?H??????Jd?????%?9+???vM??-9k9:?v3?x?k KU?????K??o????????~??5d?n?a??_*??D?'sf?B?m/?T"ny?????4m"?]?/HD???F
?Y?v
???1r???N}??,????s??d?h?SV?c)
P?y6????XPn1?r????
??U??m?UZr(?d?R?	ng?N??-]\\	???6Q%VR'+???~??r??>K??I?????zp2DE?@??9*8??i?????mIUF;'1??H2Rrj???l?gS??/^Cs{\???5Cz????}-J??x??q([Ai??#$?ME6??	t???P????Nn?.?a??????<QFV~?>l??
b???*?\y?x?f??fR?CA?)???:?bB{?,H?b'K?=Fv??^?2__?O?gG?v?`?:\?bE??D?+?#
?	L?wL[1ijX2kG?^?????yg3?>lc??#??n^?k^?2n???????Es5b??????^]?? ^?+????'T??X%g??nW??1??jLM*a#sc4????#VY
<U	yk????k5
???????,?????	?f??1???q??UeJ??$/n???V??9;?P??[S?????*M?n?O?+?n>]Z?g\83?(??dR???w?
?"???????J?'YvZ?=c??"??p?Gd??+?N?h???M:N???????Sr??#???????e?s??Q???93^.?)???????d,??YkT?????1W?m????:??V???Y)??rn???P????\{[???qS?????,??Vv?F??????????
????n???????
??<???"v|Y????????
y?)??XvO?o??@.
??t?O???????????????5w?????GE?????9V
VgS?'?`j2%)???bn!????n?m??????)?q>+J?jK??s1???w??GI0?????p??O????(??????@\?Z???(O
??????x(f?+?|??<)??I?6?????9?
????L?DAS??6???????e??'A??3A??n}~???v?7?,????Z?7?C??$????wZl?s??='??Z??
02?x??<`$4C?q??xP?D3???x?	???bD?l?^????m????k?t:L z????%????Qx??????H?9?$????dMIT-w??{)?Qk)?{'?&E?a??m2??N??S?}?t&??#??h??-???*"i@???0V(G??2?Z?Tl???6???V??W????.;
!o`B?-T??b???5$??\??10??d6?S@|?{??[???7?y??&I$??????l???????????K?t????QTE??qfb?p?,
?E<O<m??v12?|?????'????????C?z,?i	??(?!%S???.?????H:????????;8??8????10?#j???ub8???ttq?aK??q?\??	p?}???!????????Q??|.?H??`?\Y;?OM,?????!???n???H????7????~S??????????*????6?F?2p??D????%W!X.?6r??N96*;??????Q@?j?,?+>?w?:r?u=??????3?2G']?k??u?^?????-1???q?E??4?????????Vr?i???._??_Aw?ld??3*??j?l?/?lFq#`???????l?????????et?

??3??P?~?d??1??B.
? 5n??-?4?;??B)?~?&???8c???	]H?]?`???~?lqS???^qu?M??????/_??g??
/
q?Mdi?v???[???g???T2??_?}?'???????S!Dj~??4L5???";?????5?*`b?z???}r\2?W/_?w?3k?$t????h~???E<5<?')???d#k?C?w???MN&??'?#???g7??h??=[qb}]+????2pf??????t??!e(,
??????C_f??!r??,???????<?B ?{2?1???????oz??? a+?
@(??j??`5????-V???EU???a???m?????g?b4???Pt5@"#?	Cc?f?!c>??????A??iP?
??h3':????'Wk?RC??/^??-??????Z:?d??-y'????~??????yq????-?R???F?bN?X?t?)?1N???c<????=?9aVX??a????7?(?714????#? ;????^?J\	??????-???3L??
?3???@T#	(??0??U??????BS"?)?#X???x?H???i?b??N$M???XQA4Wor?0?$???Q?7???G2????`??s????(???u?;4??&?=????h???
?
F3??U?? m?O?)??????~S??????@?WPzR????T??~G??<???{'16??;q6???G???8
??SYY3?Z?44?g3:;?????$?u?????s?????/?D:;:?1%??,tN??????c&???7?????b?"?? ?WDaE????
??.?my#???|???????Dp??????????
???K??x|?F? \.`??J?fn?TlZ at L????l??4_???5???0?w4?M?/?3????v?oF??<???,w??b???=????
?L?g?t$?Z?f?<?A?[??
????P??%??$9????4????d??c#>???b??1}?zzY??p???;l0??f?;T;?F?5??o?x??Ci?!???
c????z?d???(??4??2???9?[?{???M?4??7???%?8?16??Eb?7G??e????q??n`_??b??
)')???FSIF)??????_]?7?W?1?l??{?I2-?\?P?????f=?S?k%"?2I4!??M?????5m??_??&?K)???/Q?)@?HO at p??m?l?p??E??????Y??(??M?G?+???S??c??{??????ebnL??&?Q<=?&??iS?E??K\8?rFr??z`??'e ?W5@???48W5N+?????A????x??N??p????	?d???>?R?	?P?=????l? ?U]?]???4???@?N)-)??in"?????#????n?3A?!?	1jlYeP9??&d?9???Z+??D?)k??????,??$??PZ*???pEu??????0???!????1??q3?????K3????s?q(RC???S??[?	5
????~????8?L=`???VI+????G????-??????:?;&C=?y???"????7?^ ?j?gX?'??<bV??s?/???m??J7????P9K???wo~y??i?B????????btBKk???S???k[?????o?7???z?'_(G?????????x?@D?`X?j?U????????Ja?&X?7????9??E????`(
??????????z?????t?
?????????A Z??u"_Rn?Y?H???*?[#G??Z?*????-?$I??]??l???,?<?6?@???|???????????o??????h??R??b?P???c?????????JED?R-??B??4QVI??2??G"Qk9e??<P???(CK?V,ua????1?=
?M?$JpN
%VA????????s?8??(T????????2?N9K?#????G?
?k??U?????G??u'9?K???????b

!?
????U??R8?i<?r?$?@????f4I??5CW????i,<<??S???????d?fX&?:?g.@????94t???????
????????N?
?s??A???:??M?D?V???fP?"|???6?? @??ii???_uE6
?^K?
??[z???~I??k?????l^-??u.???M?S<??b???[?RT???4P??????,?h/?<??#?szR?kr?A???	?????????>??P~6?F?x9O?J?t?Z???	a|?'??M???~z9?L?p
?Z???????b2??z????N??L??q/??|???{????n????z}????O?????Q???????{{O?<??:?^?fOs?C?????????
???
??y4??y~P7?P? }??w????????y?_IR??,?S??H???????vD????Mv9{f?N??%??????	?q???N????\??????`/}?`f??????????"CEr?????|u??A3	?????[?$???S??.$I4?????O??kD??0???k??%[???*t/E?F??????c?p?r|?X<?_?
/8??????u??X????:?M????U+????t????7)F???J?>??.??9^D??t?`b????2x
[@9:???????}
?9??????_nd.??KhN5???|???FO?Yb????X
??i?;"?U?K
?????=?????j[?t?`)j???????Y4z??9t4?[????(????lJ?\uxQ?r?Ag6
M????g
??/??jM?mJ:?h??-n^??.O(??n4?,1X?B??G??n?U?g????????c!1????J1?Ln?3=5??qh??x???So-jl?ir????$1?z9m?p?????s>?7???-
?'/?N?D????T'T??Ghi??&??c*?9Qs??????+S at H*J?`??3
l}?
?X?0>???.)7???	j?0?m??&@???w??C?~??????K=??m=???|??t?????KK?a??s??Q?U??x??b?7|??$1i?????#?;
KXZb?????P??O?4Y???????A?d??]
??*
?c?????
?
1??
w<]K??????lBZ???b??????1?v^n??????/?]C!??F2??XM$?}369]c???-????j????????$?%6????L+S?^@W????|h?4@?^\!??&2_?s?????S+???D??D?N0??? 7???/G?b???V????Il?r>??C??
?U????P?z?+r ?C??=???z???????e:?q?_??w????=???S????yc?.????R??!6?Y????Y??P?????M????e?p6??????.?K?*??s???<????m?)??OW@??Z%f?wp???G?????w?u??C?:gy?m?????S*?w=??s?????9X;?<&V???W?V??ya{??6?&-?Q?`b????i?K?????????????,?C????8??O.)??b?
K@
U????s???-c??$5??yA??O?=?#???
????I????x????T??.A~?"???"?4??l_y??|m(???????%TM??(Z5??%-?N?l??
-u(L???t????????Hf9??a`???,?`5?sI@H?2????I	?DN?O!?D?B???&??????	?	Bj2%[??=
??????????????????????`?
?????5??q?}??(?U?e??=J???s?WAy?????x\????d?b??????
?MV?W5?~????#
??L?I?????d;$>??.OY??:??
??E?*g?? ???'E?S?8=L8<?:?k
L????8P??6?r?vr?:n*5?+???)c????\?
??mTx????n	?%@"?vu?% ?v`?cL5kFX{????~?|?????`????NZ??????????'??Kr???>V??????U?`?w?O???????????V??(b?YvcI???
b?*uE??R?w'???"?
s??R?~?b?@3D?=??M???6$?z?v????????E??#?6??de????;????????O??I?rF"l?7??
?????e?????{+hf???fwV?F????W??kd ?z?j?rqPo??????3?Fy]?E?~?+?Q??O?a<
)^ls
??????R'???>??N?m?>?03?W?NoP?????9??z?7Lu?0???

???64?#?{?s??????Ho?????)}b?
??Og4?~g_????m?0?0?!?? ?5??
g
?n????nY#?5r&B?'d?6?I?6?L??3???y?pZ|??????V?JA?ZA?J?T?????????}}???j????
	???p??Y8??>J?p??1c????P????[?)L?">R??{????m?o-?:"?_I??????89??b?5]M
??X?
???[?CM??? @???w??#&?!#???b ??????^????"???r?????4c?J??/QC???^)-??/O?*?Y???<??????'????????????>??:?
??&?\ku?'~=?y,?6g	9890?|
t?q??/?v?W`?f(??L????Q??z?????4TCu?????????w?"?"??????M]C(U?????Y???????/???
??q?x?Y??Z??1?L????u???" ??y??'\N}w??NPX??y?_G??=?Q?9
???Q?`4?????????o-??u?#?@H_?]+?FA??FX??d36
)?????????z???7???RI5???????o?G?q?{???K?6?m?UoZ?6]?????;N?~???'???m35??r:?$??=?M7T&???aU??j?
z?C??V@?U?0?u?|???`??c??n??
g??r???!?7M?$?*7???X???9??yx?w?B?,?S?u4???{????`?m?P?
?(?
x??Q?FK8??Yq??z??&7??4D?RR??????-,IW;?o?B?p+???}X??A:K?????(??up?b?`?\R-??@"<????Z??_?????????????????????m????\?d?????:M.???????Rxb?[L?q????
??@%?0???F1?a%???G
?\?F??U>p?	?}?????7?p2?k??X?????????
+??+?P3?bL?b
5?'X?d?qi>?`?C??Z??>?0? ?o9?(??	???????#??
,
????c???R
???;?n?<???????h?????c???7j?
Clb??Y'c??
-#c
?:????n?%??&r??CH?FD?/??<?-k9?@??fr????iO?a??E Z???`??????w?6??*?
?????3D2y%??
?e^?>?6?v?hU??e3?????g?m?????#????-w???N'??*?9j???x?uy|V??h?4W??_?6???????j?Y5??G??hW??????(?k?s88??!??j???=a?j??jQ?1???%??=?)???
?Z??@
!??
?????*??????|b%&??A{?
-?!|F<????kEZe??A_FDBX[f??????hq?{?DW!??e?eL?`????,
|7]u*??5%???g?Pu???
?L3I????4??????i????)?V???p?&Y?s`?4?k???3???]??q?R)M??8X3?X??PR6??????"???e???0OG?8k?_??4???z??-?G?<????>{z?c
Q?h}_?????O?2{FG?G?G????,??"????O0J!??1??x?Q??Z?O?o?r??????
??}8"o??z???X?|L?*?????I??jd8[~??qg?4E_m3 ??Vr?????>?????
?gg
?G??????@!XEj?#??k?j??l????$&}?iQF??????8WP???3??r5?I???:c7B?c????(AF?P|?f?
?
?)0XgG?:H?nH?????L???????_??\MY????Z?????IV1)do??MqP at .)?????????O?/??S???c>J:???i??
?5_2Wj?u?9PaZK??????Y at h*d4Q???X????S??f??D?????{Bi??k3 ~	?K??9???????+?!'??A???,?iA?G??q???^?5h-?G?Z????p
M?am??h#??M??]	)??%?d?

??J!???'????;? E~??U??
w!??n?l??#?P?o?-3
4??0:6r??+_??R???i??
??5\??????8P???????f?9?4??e???/??w??Q?m??XKY?y
?i???p??????f???3??/??N??9al??\{k#????>????s6A?O???Pm+??OQ?J??V???6???-???zn?????Y?1????d?&?}cx
??????????Zo?I<7??W9???E?ndn?0??????L*??y2???hB?x&?W???u?
????.27fE?/?d2?gsj?)???L$??j?^m??8N?.Y???9?h?sT"*a~???&ar	m?
?b?????=?%k??'?Xlw???WdK
???N???_x???9??
??
???`???x?V????
?$??1?U??Ql?>*?i?.?
???^ez5?????8??
&a4I??R{v?U??
??.??2??O?
e?*'??
<??9?}?A???D???]??
???6>_N3?|Q??
x?????={U?DX??!????W??
k
??	??j?R?I??O?q???h????L???k?B???@??|?X
*???x?xv??[?q?F???+?c?$?hb?A??'%??ks}?XjP`?R???T[?)????&)??vaS???L??>??`#w?D?d
r??O? ????xXk?
?'?D?[?t?d?M??????}?I?3=;??k????2???????????B??}?????????c6???2??]i8??Ac?
?7M????2??_????4H??\?????
b#vc????H?Ft???==??1???G?ety4?,????????5]??%???g?
??F????!?????
???&???????????X?-3`uwU_f~???}?c??E????g4?:?cNp?????mJ~I=?5????I.??A???`?1T4?t	@>?0??'??y at Hv??.??:???~?w+OPq%?T?
??9??)	???? ?3???p??4??yL6U??5????????????Y??6
mf??]7?X?a??)?L)???kc?'?:?f??C6x\??:??`?1
e??)??$??K??:T:]?gvl?c?qZ?
%??a0?????b?O??b='c??$]v?{Gw??S????x+????????L?????]?"??M?N?A?6??X?d?????|??r???????r??B?n8N?/{???X7Z~T?k0N.8????x??D??0???mMe???'??N??P?raA&????p\`?@??d?^J???`??Rt??1_????h?7?>?????c?2?X?2??????$'?p????3?????V???X?
?%wO??"???g??t?t=P}jtIj????d?????o?Dz??h.??-????"??=?????G??6??s????????f[??????e??J:?.?RV?????,.2?z??lRIk???h;3mg??^??????|wp??u?!35?:U~.!^?????o??U?k?hO???
	??t?T??$???C??DU]r???k~?u??"???W??h????b?oD?&??BW~
????
&??r?|????VjzWG?eo???C?c	??????
???,9?t.
?2s>c?g?t????L????;&&v?<?;????k??51~-T?q??}{'??e????v>,v?;???{????1!?8t???hJgl?wV?h>g?1X????<??N?q??.???4c#?]?p??T?p???H_?bZ"i??~???c{??S??,!?]Ke0???Y!~7??ZV?m?sY??q??$?;????8??FF??????c??;??p?P?#C[????0i6K???1?G???Q??x}/V??????k?;^??UJP
???t????!??
?{=-????j?????????O[5c?z?[??l	J?[??)R- ??`?,?g"???li??`D_?*??Ri|?????^
B????L"?<?{x???????e?S?Ul{??e
??^'??E#????
%?b??M?+
b???cg	?R??"?Q'?Z&??L?an(?$?Z?b??N;H???4	?4?????l????[M?H$??9J??&
?H\????9"????p*?H??????	/^???ui???8\?ed???????????e
D(Y???U7>??_P?f??T??]?Mt???6??(??8?D0?0?=?F??V?|z)(?R????8?-????m?x??+9U??q???AOyj???D???2??'p?n?.p3<??fMv?????-E89^??[KDZ?!?v?????????2}?????????3?C?F??H? ????6@??? ??ZP{?
?z?4?z-?B???Y?nX???O?g
?v?]???J??	?x?????!?JF?$X?????N?F??Ti6???)t!???x??9????BB??b?l{????wf$?Vl????&|?'I?iOv?n??????a?j??m??]?V`??@?z1?????U??.a?{Q?q\????\???on!?.R???????1
?+?S$&#w"Ln??q?H?5 6?*3?tx9???Km??>8?g2??/??"
n#!?Yh??????7<B???O??
??C]???CX`????J?E?????
s i??X?b??|????)?Tj8?N8?44?????
?Gq
z\1q???
???"?zh???P?Jh?l?"4b?:#??<?'?????V
&??V?U$a+???{'??????H?NR3?*???c??Cg6Oql?????	m
1?????
?o?'?_?1,{@sT??
O
??L???":???8???,%?????*??#??C?
w#Y?????S??? ??????"j?|??GY???u??jS?;h??s????=H?u??Ma?JS?X]?p?I?E.T6q??Bh?J[d$auM??6i??
g??U?H?+?????p??\/qy???/?y???N?????P?r&F???ta!z??m?if?????HF???7???5?TY????~}?|)D[??h??6(u?u
?0?=?K <k0$zsx:
???#h?????!L_@?=?Yf??_x???J?Y??\??xO??SxJ???W??en1
D??[???BEiW??Y8?a???????*??L	???????QE???Zt??
?ey??V)????\??3*W??R?
???Q?"?_?????#6?-?2(v!???W|??8Wy?????,W??,??,
??Nk?6yH???B??&?5??H`??L????K???my???????Y?s??[c?|??\????g?8q<z?L
????????"N
K????&Z2???TU???{V??q???>????????U?y??9?}W??9P/??????,???????*??????-??s??uf????[m=C??? ?e?)??K???F?H??H8F???r?u???K*?{???$x?@?????nq?_??H??T?2?1??}?[y!?h?X&?g<?~E%J??"?s1d
?$|QpE,??f?y????????3J?vj?ZYdw??*??{?4SSa???T??C??OGn?vJph??z?2
?]B???Z?V?H?
)?-/???h? gK?9????:????H?:????G????S?w??`x????s ?;5????
?O0
?<??#j)\?
?J\p=??fj?@s?qs????|??.`??N[?V??HC?6?B??e? z?P??v??+Z}???g?c??"??x?=E??Ip?QBW?g3nF?+??????JL9L???vi
\?Vx
?1zmii TuB?L\!????>IF???	qF)????6?V?=1?q??????"??L$ :?????)`????S2?<h |?M
D5?V?
1+r??B?7>
?#?^Le??t?e,?????
??u????z??C$??????Fe?4V????3[]pJp|?f?U?????e???S0?
?G?6???\???k?????4?4N????y??V????Er???W??E6???????-?
sBYi?'???4?????`?t?^?S>?vs
i>?2J\+?]-}?
??I??8?8???p?????i
???09???????s?
?Ks-???:9?z?????C????<????%?????T???2r(CVH??m???~??`?x?H??8?m ?????m5?k?H???=???U???M_:??Bg{????-G'???IWHt?/?I?????\S-????0L2?4??!Z??k??5=X??n??8n]?g????;??cM?1aQ?4?	hL?P%?h???A?,?:????,??U]bz????ufj?V?#e?R?????0=?e?????-??P#?
?)LhN?k.??'5ip???H\/??8lG??k?)?aHJ at w?!g?pp4??8?_?o0y>?H8??????mh}cKy??q?I7??????F3B????G 7???@F?@?g?M??????@?Y?Tlg?{?>????7???|???r?=?6 ?
q???F?F2?(?7;?{:#?
:b:U??0dfA?W?????*?M:??g*+R???2???0??Z!??
|R?67?d?XI?ml4??i???????4MgF?????
?????]??????axZo/??
???<???Ga??2???.u?Z%??>?????????C?6oZ=?????g?7k?f????????K??4?
/<;:??W??"?SX_a76%B5?????	???b8;?A???X&_M????aC???#???Vl???
???????S??????|~?XPr4??a??b?a?Q?4v
co?np^??i??Yl?????????#?+B2?5??q?U??7?
j?cPo0?{?wSc3??kz?B?4??]^??+?3?c"?f??}z????v>=?????@+_?j?+????w??Xnzg??-???M?z??]???F??????fClZ????????u'7??ko?????l???m?8???_??mkv?<vh??5??\?o????|???x>?sr??vr?>?17T??w??5????|~aa!?0?k?????<??H??????k??m?m???0?,<?BS??V/???
?
`??
H?????voc???c?8z?6|-,RP??1mp??J?6?
????;??????u}??9????????????k??:0GncT??Zg???*?.rT6??k??i???&????p?????6?YO?A?????
???0 +7kj-????Mz?"??0edCU?D??????ab"?????:m,?-O???g??VjV??%?????Y???}[i?5
??z??%X?V??0?mw=??+???n?`[??.(?R?bct#'`Zt!-???9??+??$^?b7????????X>?:??????
??,????T?n???<	?\??DQI
?)?M0??;?u8?x??O{????u?i8[????6	A????fP?(+{6o?jN????BY????/cv6?d?C?py?r??3v$?+??p?~/0???P??{???=???H?t\?]???^??d?R?9???f???s n?%?;Bdm??????????@]`<??p???	??-of?>???Q?o?6UKY
"&????????
???????2???E?X?R?l????g^j????????????qx(??
o^???"x???+-ry?[??cf?4%i?????O??#Uq?=a???p?????:P??????iR?-?-Y'??9?7?j?t?4)???????*Y?5[v?9??k\H?M?2??@?;33X?j?V?"???SC????
ah??
?????gE
O?:G?
???9n4??4?E?L6?'W???????l?Q??1????js?x?3??
Lx??????3bp????k????sz???Is???c???rA?9H",??[?Nt?W2???3???(?j???u??g???????f???Y?_~?X?g<p
m??|^=??_g??UVh?J????L?n>H?}??>???^??yMSu/??B???????v?~???7?b??????_???'??*(<??QIL?!
?????k?B?)"?Z??S??<%?%?????????YX?X?S[?\?Ny?)Rx?????sh??x!?kR?????\?????9?|?:P?1b,?p??e#/??O?S?,J?f???	Nn???!=?[?A??????t	?F???Y"?F????????xo??
?????<?pPVP?:?D't???1y???h?E???`J???dX03-?]#?7?'??vxr???3g??t?d?D???
?|?,qC???????Sd?Vou?Ai lq
p?/:?:m?Q?{?@????>??
e?{P?K???U<8?
??A9???bA?q?6
??''???-3\P6?-DX4pd??=??d?T%?????-??-a?Ja
?
?W	?A?c??^?\l?`????^??fK>????@t7??m?C?&B?????w~????d???G??/?l???CW??+u?'??Rm]??>y???3`G=:^??i???????&z????????)?x??r?????f
??M/Wu??B%???b???c??@w????
????IJ??-?*dEk??c???????O??
????v?S?????t??$??u?E?DH?1?????B????????d?'?????>??9
?b???a??"R??e??E~?}??s#?$
??Y??XA??v0X????(??
+?
yK?:_??m?D??%?I?
(???V?C?%?T?^??P??e2xV?vq???^?,e????????????????u??Hyr=?~?'\Z??R???????K4ZYD?r?
?,????H?????h?ai#b??TEY?? CH
????D?-|??<m?6?5S?,?? q??a??E???r4???e)?Z???(? jd??`P?v?.??S??????D ??V3\
?]?????m?#???&?Y??CejU???>zpb?aYNF;PNaCrTV?
??????G"??
??e{X?,?????J?+??????8$?r?R?-y??8??G??????3~?J,?????
?	9?h?F"n7CZ?;?&??-_?????????l	?,?O",??)wjk0m
?XB??????Si????%????Y?.???C???????_=5j???Q???????????u? ?1?3?
&1=!?4H????/?????!????u?????@????hMlJa?I?|c
?V>?f?/lX?%Y??
8~r??[??P??S?J??(????|
6??O????cC?y??0??e??N?c??b??6?Dl??V?n???????q??lH???S?-?fL????b
?p\D?????blL\??@??iYFkb
s%
!UO\?W????_?z?
?
??Nq.D?.?R?N??|?*??$??/,?Y?Ih?
32mSxy-???/?@LK>?l[??EmD?T]??n??g@?!?#q/0*?
?5??}\?;??2ip??9DYd?[?B}?0??Zq??9??e???2??"
?%?B??j????:.4t?CvP4?jtF??<H14`?{
?Y0?o?Z?r'?JE?N?? ?@?V??/ ???#??R???V-?\;??"?$!Q0?W???hxk??6??[??;?^!
M?????Kn???t?*?l????Z?$?k???u?????S????DL?O?	S?z?yp$nZ?
I?V
<ZH?DED?L3
?Ir/????eek????1?W?)JY4?{L?x???{??
?3???b??
(NV{?????B@?0???a??????{??p_sH?L@?I?p????O???d??S??F??#???P?E?]B?????8?}&?L0??`;????&???\??	_.I??>??.??@?^?u?:???q???b[i;??i'?HE
Su??(?hlq?.0?qr?????R?bN,?	
W??8????S_:m^?????\???T?.?t????Z?>?Z??-?0???F+	????wM????y-V????M?rv38???89???%D6?`?5h???iJ?M}(?u?K????y3ivK?????P?* ??>K????!W?v?2%\?????d9?"?`????Rq??L??X??m?`#?vRd,?H&?1?????(?5??qRm'????I@?(?oD?f3F?c3^SP?d????Li?? ??V???,???`Ce???-???VL?R'.??D8r????i?
\"?????EIb??Q??_A:?$ 8?x?????*?
?jH?!<???J??k	["?/???|p1e???`^U??????R?Nd???;>R??L-?q]J?~<B_!?b??A?|W;??????h???p?B?t?'s?|*?C?fl0??M???/:?????>~?R???T*Y?Ag?e?
?t???-dY[?hy???	??N{?q{?????5J\???H"???$?^??=$$H	s??N2j]'??(?????V?n??)????(??*'igQ??????R?~??y&?gK.?y??v???.??#?6????4?k]?on??du?R???h?V?????????fi0?H?R?R?"??f??q?????h?}i????8(?ck???L????H#?$?{PxBv
?t???v??>??9{>??
>J?r?
\p8TF?"e9??U)???lB?U?jB??@??&?jZ??,??h???g???qQ?F)?#?%S?????X??R???Y? ????
???cK??Je*?s??????g???
Y???

??4T???V??
6h???
2?P?%P??1??e?y????E?b?d??nJ?k0??l??????????
L??-2O?NH???K?E?@??h????r/????P??r??????Xc??9g?????1M?#/??4?r??M?7sh?MK???%l???)??A	V??x??)b?OT????????<\X=?????l?_l?`??P?6?i???p?p???~?!?????5w.?I????????????L?4??Y?7?E?E?2??J?
~??????6???c||???{?q?u????78`\??????199i9r?????o??8v????'<?8q??155e?<y????6N?:e?E?T*?r??T*??8????Q?V???Y?u]???n2????Z?f??u??h?f?h?Z?????n?
?????N?c?>}?XXX0??9c,..7?|?q??Y???s?????[n??x??h<?IO2n??V??O~????<?x?S?j?v?m????4??O?q????x?3?g>??????,??;?0???N???~?q?]w?y?s??>??????<????6??????s?????x?_h??E/2???^????3???~??/~???>????C.\0.^?h???/5^???/???W???+_?J?U?z???W??x?k^c????5^???????7??
???F?Moz???7??x?[?b???o5????o???w???;??N?]?z???w??x?{?c????5????????|????A?C???????G>b|??5>???????O|??'??I?S?????O???g>c|???5>????????/|????E?K_????/???W?b|??_5????_????o|??7??M?[?????o???w?c|???5?????????????C?G?????????O~b????5~????????_???/?K?W?????_????o~c????5~??????????????G?O?????????_?b???]%?W??b???b???|??O??5??????p??w??\\h???[n??V?>???=??n???=?B???[{??n?x?????z????}~???Z??r?c??W????|??\wq~??/?>?o??/???%s??v?M???/??7?????{f????}????r_r??????%??p???P~??.0?????\u???5????v!??[6<?Q?{?????????w?q?3K?x??????
\P?????6\?????N????p????#?3}???>???Iw_???6??????z???o???4?{???????!u?
{g???G7e?7=?y#?m????|??=?w???[?O???????????1??^??u?????????
???M#?`}pS*???_3>???k?]???1?z? ????xwf?W)???P??n?(?*QU5]U? YRkXl*
$???2??z?#???u?D?;l?w=???????|????/??"?y???s?=?<??????}j?o|?3?O??/?|???/??'???q????????x????<???e????~v???x???_?E?[?8???g????I??????O????????????????????_????????G??????oG??????????]???t??????_?~????g????7??????????_???|??????#~?<???o????_????/?#?x????=????#???7????????????????????r?_????????????y??E????????W????p?Q>?????#$&
?????????=??b?<???B?s?????Z??S?J??????x2?&????????g???Q?p?O????????????O4??!y??V	?9??a?$??MSV?a??d???Y,$?F??f????00???
?>l?f????*T??j?A #G?h5a?ZU?#? ??'?O at g??????;
[??L;??
?9V??E?W????g?	e?Q?e?m???)B?-E<???7??W?7??????????? [?=?N/??????{%??u????????v??
?di?????Fl<K?*??????wTv?L?c?u???AAD?=
?5?Z?s???W?e??~v?N ???b???x??t?F?????{??	??g?????_?'????CQr#?1?$e????Qw????d?1?i????+	?Q??.?gS??V?W????bk??????? ?t?z???G?4^?m=??_A?l?f?*Q?G???????&??i8??I??;e[[??J???r?t???I
f????p??E??Dgi?Nuh?y.?U?%?b#???
<????P????
?1?Kg`:K????#?l>??wph4??8B???|}<]*?e@?GD?m?4?
?OM???ZJ?"?????Cb?y2???3?Q??1?DJ?a?9b?$3??;}????`??S?}?TY{??u??*??Z??7F?KLq@?e?bC??Ad?a?a?"??U]?4?????9??a???;?x$;??hP?_??
?~
N?S???yhZ???
?O???+?X?S??@??b???u?
CM?"<??G??X[?7?4?DH6nY?????`??8?:?<???????+??R>??`?#Y?Gd@??	j???&A???????<???:?pg??ySb???h?????&?????c?m???	?%?`1 %? 	??7l?P
U??????
???m
`S$???o@??S""NQm??2????+?n?rnP?
c	*
??*?*gpz"?k?b?????A??$??~?6QI?;?}?;??I?d??|Xq?h??B??m???<????3?V??x??F]	????,~n
???[.??o4,?]WB??t???oG1pW^?g)S????+<??L????
?????????5?<????????2S????|BB$??r??4?>n???u??sV??BS
h????^8n=kJ??]{??Wf???T~?J?Mw?:?yj??bz??Eb?nrQ??%?x???
??;?fH#??*?`c??;c~??ttD?????::
`????u???v_c????15????B!??
:m5q??Q??%????"????^?\?%?"???7??n?XX?m?
?.????cX?	\s)0#4??	[?>??'???!?T?-!p-?T?,??^M??a,?y?Y?U6?)??)??C?h?i&6y???<?????+v?E(?/C?T???%?o<?U?+6??0??2A??_?????j?'??????FsI??QiF?H??&?c??????%??u???P	T2??
)????&?`??@C|0????K??d????F?*??b????????$??O??)?=?%?<G?kk???u?_??[?:W??o????_<z?????(G??????????dac???!?Ss?????p??????f??e?r65?
????3????3]?7??Y[?fbB???U?????UO1??&I{
??/?????S_???-?|kw???O?v????w??%?$?*?X4???:3?T?c?93?????w??eH?????k??Fh}L?;rg
?{?6???M???P??gX?A????R??H???Q?60{s???Z[}?f9?|????^?w{?#??1?????"???`VM\*?n??Q??et?????????v?
P??
cK???nnk2?;M?????5~?0???r?	?Q?pkhV@
???b????????????j??????@?$.?????"????????O?&B???Z????=19??K??/wu???ta???S?\??????m?#|?'??Jd?????D????7}?????	p???"??m.'??Wh????\??c?????F??.?K@?,.?g=??????gG?P???_??????}x`?????F\a?????56?tYS?6)*:?9?A?X??PH?b?i??n?n)??8?#e?>???????<?????GIt?M???????3?""??a??Sd?n??V ???fow??KE?h(??.???z?L}????V;???w?j???=? ?1??????????XS?G+?+m?R??;?l?5?ol??W???M
&???
?d>?P??N&g-??9179J?7*?'k?
e<H??l??JR???&??v!Z?~?xqk??T4Z?B?Rh??P????m??7??
??@?|v????U??7??%????????]???7Yy???[UM?l?O??????}?hd?????????:??i?
I2?tm?LPf?t???o-?C??????4?E
N?T?????e
?S?[^5utF$~????^h?I???? ,?D?e?~?"E????(v??:	??Qm????@???
?pe?4??????Ve????i:$*?9?G??<?p'=&)?]?h??????RQ??;??&@?i5???????)%y??<?yu	6??g??/????G?$	<q????????A???????hr(2L{??y????#?b?i?CAv9???2b????1???????p|t DY2?r?('??????1?#?@?j?dE??$?j?????H???^???W?N?b?]?0??z?F????m?

??Rts???$??,?C9?????????????}??7(Q!?????#=????k1e?q?YU
@?R????_?%74?H'?V??^?h??X?_??8?G^;t]?O???e??2?W???????{????{9?jV??
??~?p?$U??Y??k
<??k?????3?6R??
T???d??>??=??2WO+???f6UGC?36?P????1F????\???,H{??Q?>y0?p???_.?#]f??U????Ze?	\?????ba?_Q??~fT?'1J??nv???WY?lr?zk??\^??W!? &??c?????>?????
????}?w7.3????U\l54?.??????~?{??K2jK????n'y,?5u????_RE?O??l??4O+??b?$:5????????K???02??<?2Sd??g\???]?B~pJ?????
??x(I)3"???X4?_#???G?-???P?l/??sEp.?? ?	2?c*b?
??0??h$r??H?????p??????????????)??[$??	L?m_???[k?2???{	?0??8????F"??"
?Qq}>?xZ???)B?d?I?~??n??I?M?H???Z#/??rH+????N??$??TA)Z
,??]S?_,WQp?????*???F??o?k?+j??kD????Ma,?{????????
?2???c???????????e8???Z???/???D?
?
Y?r\?C
???H?LZ7?z4??<&/??????][????D??XG4M$?????q?"?#?"?3}?qL????n???????l&??7lb???%?JA??F????n???????(l?_??????*?v??
??.x??"?G???R??Q??G??{B??m8?????}????????/[?
?Q?Ozn?qIV	-??S???=??zb^[V?????
x?I?f?#?X/P???m??????2#??
????-&	?`a??2?/ni??j?F??????|???3_s?c??R?>}?1??
 ??E?[???3	???.?Dp.?D!???"??????b?0u&8C?|u???????r???@??o?!??T%q;??I?????)RAiiwK??hm????}@6?.?`?|?W

?m???3-?7	%?
8????eC?C5?????c?i?2?U?:1?#,c?K`???u
?*????l?/???4???P???!?\?5????i???!?6p*????E????1tU??5/??Y?}???'??T??A9??????%"?(?????????????|?H??Y1`Ma??}?n???b??Wr>I?0?K?p_m??=?y??uo?O
?lN1???????uoPnW?g??A?t??????Ag?????y???HoY???#?2??(???W
??f#l?X|hX&?'?V??z?`mub?P?
8???6w
?&Yg??????aQ?I???	Y??c??&??????u??w?r??c??:???!p5[u
???7?K??"??3?Yk??????P}??%????f#?h??M???&7??j1?}F?GM???c???{W??W5F?M?;???1v
c?+Fy?rX??z????{u???????????Pn?G?s?^t?????G?;?#?p?Q??A@??
s???4U
??.???%????D?????v????o4??#G
??~?j???	
K?[??$??#<S??!51%?q+?#???????:g?9???o?|???????K??{]????e??e?????1?tAGz??????*????GT??xpqXx?
x??'6???x???F??F?????????h?v?{??(9?&T?S?n?^???4??q??f?)N?N?n?i@??k?L?B??#?????Nw+?????????E?h??V??qJ???????G? N?hw?T?p?\?M_?VYS|?`??7??=D0??:??Ag?D???W??.?F(?X??Sl???nc?i??%??.B?A	-?G??|
?Hcif?????Xc?%??x?`DS??a'??:???
P?/?~?0??	GL??w?d?
??f?Y??Q?
???&??r?
fv?N?iSL?g?I?NO:(???^?,?????Xxb??- 7Bay?.?]|:g3sB?I6Md??in??FhI?n??8;??_E??4?3?????#L???w{?7d
	?#???>?7?2??????o?? ?
p^??3x
????Vry???G$&?c
4?wr[!?s?7?D???'9?h
?%??????c?5?.4?S?F??2??wB0?j?
1???4???n???w????	???(i??b????	??<?073?????2???K?3?g?a??%???E??A4?D??b?40??
????"?+?LV???????TI?g???=b40f
5
???????`x?t?4?	????:???r???^i*p?uN?????G?N"N?
???I@??^\?p?????RMq???[Dz)9???9????z?L	????????vaJg?=???A~?N(???????????
?-?~????<J-????Lr?[u???3O?&????>qN???????G????HD??|_??)??\do?2F??PJ??$??3??iL?o?Y?R??
(?0?????$J???b?????v9?7??D0]???>?o?=?M:r???Qv0>C?zkkz???E2?????3??????oU)!?\???H\W??|r??
a???9??;6?r?B@?k????d??n?????@?D?N???m???<n?X#?i??)???L2???????)c?$?D?????;:]?n????BL?
]Z???g	QOB?2?H$???D?&??1t$??pi3p????Lva??5??s?e?T??Q???N??Hk6?,Q:??
??.?U??L??i??a???M?$	??f?m??i?M3???
M?g??l)K?F?s*|
|U8?^?
??GW????J?]??	lm???V
?-??S?W???NR??6??h?5?TpZs?\?$?O?kK:?P????????&Lq?b????D?}?M?b??Um?-??OU??Nn?MJ??f??b???W???
?.?	%Cr????g?+:?7q?Tj?c 
7l???!?{t?5?&??EoR??r??>u(,)?$???s?>?d???0?*??)
&Zi???OU??Pr
?t?E??}?8,?y?><?
jJ%Rj8?)0?????p
?DNRF%Q?],<?nVp?e??7?
E?,?.*??9_u????2?
??rGB	????,???u!T?W?V??}=d*?nsg??????,z??3???@?_?~~?!_???\'???m?c?x???r)???????????;?????'PvZS?S.?I?k?n?=?d???/k?DWm?A?n)?<??p@??ueN?d??1?????f^v0s@?%??c??q??= 8+??,??Z?_??U?I`???0??)??I?????y:Y????+,????8??????6??
?H????b? (MP???;??Z???2?????????v{K?W^?WI-]!?[M\?<U???????Yf???2????9a???Q75??d~4NL??IBO?q??
?(Z??"s?09.(
TQ)@?Z<K???'MG?????Zz}L?z??r??5oS???b?&????s???q????'^`?????ko?n#??????9??????????6vm?_hC?V??????o?n=
Nv?A
?8?&h3IQ~?
?:J?`??11?}?KPTq?x??5M)>&?O?!I?NP?????6?n?YbYI??\uRq+?O??
????s**",?
PZ@
1B?Fk?G?Gq4??2?Y???GM^qt?? ??Y??O?W?
f~<<P/s?r???&????`?????
?????N??X?????c?tw??????&?B?9?t?#4?_X?J(??sF?????????O??}??=???_???<??bnS????b??????8????}?G??????Re|%I-?>?b?"M?8?T?@U??7VT??{V????r?<?i??gxa??
????h6?X(????r?a??71POGc?? ^??????2??T??#Z???r?<?MW??PQ\~C<[<????w??$?????s}??,???_$?V$`(R-Jg?
????????,F???QmOj~
?=???I??.?*??=!?
??O?&???n?@????av????S+???-- ???_g?W?????b?;N?????:??C Z???m?yn??S!daB??-<?0???T=o`$\?n?+???????"-????GF?`9??Wh??p??H??~???6f????0V????=??3
d9J-?:???Q??5`x?BS?]Y??????(t??????ry?6
?V?AP????????!?H]!bn?/?????nBUW?????????C????{?????V??U9??0e?(??A??q"3?1?????0??3??K?$?X??"w6???j??~%?h?D?-n??',??
0??q?f}2j?????O?Z)&???P?l?]D????acM??Q?R????rS?+?,???]]???????7?n9?????= ?t?)}b?x?/??x/B????Y???@TS??0k?
/E?Tb
gD??o?
e8??a???5???.???y?2<??&?oZ????_???? ??1t??j??Dp:??$??=????? ??2??P<????
Xw
^????u?q??K????Q?+,???????Vh????????g????"t?*??????E???\(M??~??x??y???????|??_?`??r???}K'?\8CS?????v???:t??+-?{u?????"?
??????N????$??4? b????a??<I(???Q?hM?2?
??DfK???S?5?	?E??bx??????
??r??e?$v?N?F4g???lff???G?[??Bq???p?????q???0'X??!a?]??
?be?n?L&??n???+fO
???#p?v^??$??]y?q??Z??f?p@??{?i?Ff%?%?????HK
??????W?a????Y2?kr??I?\??????,??d?^Y???h?(??|
?v?????sa??Q?R????Y[D??)??Z^?\}z??>?CLx?????X?p?Al??&<??_?5?D7??MHw?Y<???T}/"????4/o?X?lr??:[?????$???6{e ?v??z;?????
?d?W??]d?g>?i????8??|?(E???(`??vR???)0g?9x9?8,???u
QP?~??=!???l?`9@?	????[?!?T?o3?5???
Z7T??T???;? ?$O?YV??,X:?????S}!??(?>"????S\u??,??po<?????9?k??FA??j?????&?A?&v??T??8^Z6????????}H?????X?bV$????!Ka??ONe??v??Vi-?&??)??S?DML??@??????mE??0????????????????;??%?)^?a4-G??U?t.??WOj6????q???D???Y?))p?JWd?Z???d?O?gcwX?G?^????O?C??Sn/?/OG??R??K~?r{?`?R?V]?xf?v????????w2{??I???tJ???%?-???3??a?(*?[?3???tf????t?S
??laH?%??[?7?-k???t?V?U?X?VZ)??W????????>????K??????f???-J8_u?O
?S.??W?. .??>??????_w/?%??????J;???P*/P{R??????H?w??TXy?&?{??k?&^p??-sL?k?`??????Y???Z?T<d??%????;c???????@???~@???m
??#?{?'???????l5?$;????_~???m????N??I?F??So@(
?q??????eo?d?;?f?-\CmQGsa??????????9n??N?y??UP[?=?k?,
?a??J?
3U???W8us???GX
1????A?kc?>K?i??+o?T???Fh??????/????U ??j???V??t?:??????eH>???o?	?+??4??]?Rk?h?1?????A?S?????q,i?X?3S?l?????>?=???6?c)W?n??yB9Z??Yt?c1P?*?????XE?????/x???J?
??%?8 07Ow?brc???e?W???$??04??o4A?Fp?????rv???A???????0'????????s4???h????????
?`??<?3??EL&?&?tx???c??R??????q%?x}??
,?i?????X???m??EQHX?L??A1}$n????Ll???:Fb??????A3??Qw??7?a`C??N<
??????l??1?9]kg"3?<?
??y?1??W??chYbE??u????YYN??p4????l?zd???G=g?eJ??+"?W??K????????z?ad/?V??????+?+-??n?!?l?	?@??d?
???M???FtdT@l?//p?bh?
I\|:sS?|9%?>~?ylB`??q?r?)??
M)?h?????e ??J??': ??f6?E42nF???6???O]?Q??y??????*?.????d???<!_??|eQfk?-?hM??C?V??v???S?K!Z?z_??
{??|re9YYcE??4????-?hhq?????i~??b?^'?/96?FT	?M?k?)t)	"]y
?_??:p???7?A?ON8p3
????}c???ulc at 8????P ?(?@ssq?k?o?z???H?(3F@?I?D??($?+?Ng
??>????J=?] #?<??????7t{??[l?
=U??O}.?"?n??g(???g1*???G??y%y
z.?s??????=AH~?x
?%?z?gn?x
K?/????
?eB???7??M	I
?c
??????}???m??8,?????Q?q???frh??????-????`d?????????(????'?(8?????
:T?j??31?w?y=?5???dqW?IGC?{?H-?>??n,?~?
?z@???]l??m??>?P4?c????K9 ?y#"D{???i????h???F????Q}dGF?A"|???:[o??r???yf???;1????????)VZ?Q??aHX{w{?Yr??z0O???1?q?#??:6?Q?? ???@????$???ZH?X+?wEN??0????R??N?(9)?*7+???C??????v?1???7????!W?)?????*??d?J??z??t?:???&?s?I1?J????j????n}??h P/_v???@$z??/?hLT????????c~????v?L???H(???6?f?????&T??H?[?V??,S
??v?T; ?9??C?n)??????9]?s?a,??|Ex	7`?
1?C	????U?"P??*?=I?6,??Te?*??L\y??.4?8?{GFj??BK?'{???q?u(0,?@?<???(G8???}???s?POs?&
vjc0U?8?Y??l??S?I(Yl???U??*Q??C????g??]??????rL??_%?RZ??d?v??U?A??B???%??VK????hgJ??(?y?M&????
|?
?O3???9??.??????d????\r??1J
?tS???3?1?=?O??????n?;?.??r
1-??woV?k?qU?iHU4T??H?pt??(???0?K????&?/??I???/?<-Ze??N/$-?
Z???R???6Z???@??1 ?FU?E?Wd? ?r=??<?
??:?????#?R??^???Y???}C?K??\F?I??????.>-????^?b?SZ
??"?q?0	?k???Y???X?IZ????f2x%z's??/?oif??5gD?6??7
??J?R??+5?????6??8???
<??xN3?w?7%???????(?'g????H?Q?????:?????
?"	
5??	Iq??P{a?W?9????m??.? ??N?@?#?p?????????????m?(?<??????f?S?TAT?X?? ??!???n?a??"f??(j??>?G@??}?C?????/????F??3it	??!F?!?!?WVF6~e?7Y?Sr?|yP?WV?v$dT?J?6?r???{)`D???DT9
?u??F??TE?om?eT??k???I]?1?I*?>??l?(???*????8??K?i?aq???:?<?t?I?v????dv*
cm???????d?I???
??
t????Ug[?q????????Z
??5/?t?????????>??D}?g????O?8b/???????JW?C?h6*??.K?K?9?1???????????g?
??]o??cC??^?n? ??M+l5?
a!???????&?2+?&?^f?-?%~?0???V$
Tl
???N?G at s??J<p??<?n???>?m*kg?+M?????@+G?{???* W??Us
,-6wGw?x?:???:??499a????y?E?P????4?]???$?h??=?????k!??Mkq?\|????Y????t?p?d??^?^??V7?b ???d???\?]??czV_?&??=?!????f?x:xa?C???G-q1??X
?????{??\"O? 9?0???d?v???+_???M??5H??3i?Zd??;fG?~|?%?U????Hp&??_???q?os[Q???????$????@L~?4#R??O? ????U???D??kg??*Dp*???n6@????T??"d`??????=U^IS?~??????????7??`)?m??2?L?I?1??+?F?1CJw?x????
???
\????q?P??-?(
{	X?(??`???s
????.?\?cb(??$?U?%??^:?*M??????R''??H????2mM]????1N?
=@?<n??R?q?`A????,?f>??:b??R?{	I?=Mk??;ym?`4
#?????8 ??????
S?{??L??\?8?1?p?7
ue?????.???????xuO_??
???G_c?-X???	??????O?f?????
??j?Ew???[?????-?u
??k???"???t
??"??W4?`?L?%?N?????H?5????#?r?j???8XR?-???M?b??$k??A H?K)_?W??I?tX(?????/2x?t?????#@?lZ#?tTr?l???C?"J?@[????E??? "?X?b
??l?qF)?d?y?@?????????????
q#????q??Vg??6~?Je??V?z.?mm\n?j??v-??
'V???v?v??? h
~?R?..R?W_.y?9????6???=???Z$4c:??#}/??q3?????&Xd????????	??Q???????'?????????
??a?*?	???????Z??F??b?L-??&??????>T????6?sM?e?d?4??C:??W?????.8?&H????#W??K?lsP,??o????????
Z???
<??-Nfa*nkr*	????2gLP?U???#ody????h????Q)J???U??F?L?
?g|O????>???Z???;?h?&?[???????g
>??K?S?{{}??^o??(u????{k?;????Z{?G??Q???{?W??]???????o???-???????^?????A?? ?^rn?????m??]y?z?7????#u?1>?_???
?????poP???hF??(?N?3???????-????\?Z?p???
????%	?"{?b{????4??*??t???A?%ZO?E?n?Q?[Sv?w???i?????A?C??p????DNj4?Av???+2????
??0?	L???T?????o???M?	????0??k????7??
???:??60?'G???P??????hg???????=?y?t????j~????R???#q-???????f????H??=?????m?I????o??????????9l???4?~??\$oz?Lo??2a???E?	???f??????8???ccX(8??????HV<???
???a?!???	iB??P?!J?
8=??F	\?????????N(????~???k????m?????????{?????B??????m????;???[?[?????v??????????F#?n~?A??Z?????\jn???? ?????_??<?\}?NU??g?5?????'???oO????z???????^??y?????L:????^???T?cJ??\?>?5?*u??W?!????)???4????F??{?????ab1?????N??~JZ`?&??V?FO0?????
?;g???
FOn=????????%???9?/M???^MM?r???1T=v??+?&?.$???o?)f????[t?Ju??P????R}x??M??2 ?O??/{???8???;?]????????????>???_???_?????????
?S?f1?r?*?h8{?4~???~L??_e??;???-%????Q0S??c?????t8b?????dJ???u?x???A0?s?x%?O??????????&?_L???$???
??y????	?G?0?,????v7CX????1?k?e?????K?Y~?^H!??????.?.?ZzS?5??u?T\?&O?.Nkx????]H??[h?????O??????^US?l?7y6??I??F0?p??(?C??p??zY?????N?I??6J?k$??d?T?*????/??????T?ZH??`?+?a??&??????W5Eq?????o?????????^?=a2?{b#??T=[G?R?0=???[@:??????????m?????]?6?r?B??????V??*N^M?s?Ni?k"??V?9? D??t?;t????%:???
?4BRB5]:????%igM??8?????{??5?
O????????z?y????Z???y/?-?Z at 0?r??!?5?Gw2???O??	????Q???6??CNh?.?#?????????4[j??
?{&Mmw?zC??:~m???%Ar
???SU???????zNA=?? <????f?m\~????M?????
[f??Ga?CQ?f??#????	]L?q#??zt?C??7??D?????<hfq
g,?????`?T???]Q7)??
?:\?U<???????m??)!?s??"?????0?mc?fN?xX??O
????Cy
#????S????.#??]JQ?X at 0?:%?bnU???????*?
I9~???????-+??<k?Dy`???.??
F? ?Agf=?hs?3v??o]??	???Z|???\?????????s???\?????????s???\?????????s???\?????????s???\???????????|???jAY
mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mercurial.spec	15 Oct 2006 22:10:08 -0000	1.13
+++ mercurial.spec	20 Sep 2007 18:04:17 -0000	1.14
@@ -1,13 +1,15 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.9.1
+Version: 0.9.4
 Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
+Provides: hg = %{version}-%{release}
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -15,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -31,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,11 +49,28 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
+* Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
+- update to 0.9.4
+
+* Wed Jan  3 2007 Jeremy Katz <katzj at redhat.com> - 0.9.3-1
+- update to 0.9.3
+- remove asciidoc files now that we have them as manpages
+
+* Mon Dec 11 2006 Jeremy Katz <katzj at redhat.com> - 0.9.2-1
+- update to 0.9.2
+
 * Mon Aug 28 2006 Jeremy Katz <katzj at redhat.com> - 0.9.1-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jul 2006 18:57:45 -0000	1.9
+++ sources	20 Sep 2007 18:04:17 -0000	1.10
@@ -1 +1 @@
-9ed3962bba640a686c37faa47739270c  mercurial-0.9.1.tar.gz
+2e5ac6ddf434534938d4fc27dc9797c9  mercurial-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 18:10:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 20 Sep 2007 14:10:02 -0400
Subject: rpms/maniadrive/devel maniadrive.spec,1.1,1.2
Message-ID: <200709201810.l8KIA2il015168@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15130

Modified Files:
	maniadrive.spec 
Log Message:
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
- Rebuild for new php version



Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive.spec	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive.spec	20 Sep 2007 18:09:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
+- Rebuild for new php version
+
 * Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
 - Improved and spell-fixed raydium description
 - Fix a number of unused direct shlib dependencies in libraydium-1.2.so



From fedora-extras-commits at redhat.com  Thu Sep 20 18:10:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 14:10:33 -0400
Subject: rpms/kdepim/devel .cvsignore, 1.35, 1.35.6.1 kdepim.spec, 1.131,
	1.131.4.1 sources, 1.40, 1.40.6.1 cr16-app-kandy.png, 1.1,
	NONE cr32-app-kandy.png, 1.1, NONE cr48-app-kandy.png, 1.1, NONE
Message-ID: <200709201810.l8KIAX9u015243@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15120

Modified Files:
      Tag: kdepim-enterprise-branch
	.cvsignore kdepim.spec sources 
Removed Files:
      Tag: kdepim-enterprise-branch
	cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png 
Log Message:
initial import, still (probably) needswork to actually build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.35.6.1
diff -u -r1.35 -r1.35.6.1
--- .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
+++ .cvsignore	20 Sep 2007 18:10:00 -0000	1.35.6.1
@@ -1,16 +1,4 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
-kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn_r714749.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.131.4.1
diff -u -r1.131 -r1.131.4.1
--- kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
+++ kdepim.spec	20 Sep 2007 18:10:00 -0000	1.131.4.1
@@ -1,25 +1,36 @@
 
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders 
-%define final 0
+
+# enterprise branch
+%define ent_date 20070920
+%define ent_rev 714749
+
+#define debug 1 
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
+#define final 1 
 
 %define make_cvs 1
 
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
+
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn_r%{ent_rev}.tar.bz2
+Release: 8.%{ent_date}.%{ent_rev}.ent
+%else
+Release: 8
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%endif
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
@@ -106,39 +117,34 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
+%setup -q %{?ent_date: -n %{name}}
 
 %ifarch s390 s390x
 %patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
 %patch140549 -p1 -b .kde#140549
 
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+   %{?debug:--disable-debug --disable-warnings} \
+   %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
    --with-gpgsm=%{_bindir}/gpgsm \
@@ -167,18 +173,6 @@
 done
 popd
 
-
-## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
-## some of these gems.  -- Rex
-%if 0
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
-   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
-   fi
-done
-%endif
-
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -247,6 +241,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch r714749, 20070920 snapshot
+
 * Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
 - drop OnlyShowIn=KDE munging
 - update %%description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.40.6.1
diff -u -r1.40 -r1.40.6.1
--- sources	16 Jun 2007 19:14:32 -0000	1.40
+++ sources	20 Sep 2007 18:10:00 -0000	1.40.6.1
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
+23d93b3a795d7dd84331549fa3e95c29  kdepim-enterprise-svn_r714749.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 18:18:56 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 20 Sep 2007 14:18:56 -0400
Subject: rpms/kernel-xen-2.6/devel xen-vmx-fpu-ts-fix.patch, NONE,
	1.1 kernel-xen.spec, 1.56, 1.57
Message-ID: <200709201818.l8KIIuIq015470@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15447

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vmx-fpu-ts-fix.patch 
Log Message:
Add fix for bug #294011 (floating point corruption)

Changeset 8c24767501ff from Xen 3.1.1


xen-vmx-fpu-ts-fix.patch:

--- NEW FILE xen-vmx-fpu-ts-fix.patch ---
# HG changeset patch
# User Steven Hand <steven at xensource.com>
# Date 1189784017 -3600
# Node ID 8c24767501ff25f28a0dab638116b560de294da7
# Parent  eec47edb2a25fde7075e2e17dee638216d2e5582
Ensure CR0.TS is set for VMX domains regardless of the current
state of the real TS bit. This fixes a number of subtle FP
corruption issues within PV domains when running alongside VMX ones.

Signed-off-by: Steven Hand <steven at xensource.com>
xen-unstable changeset: 15216:6f13c3be08fa4c044868144672783f7b1341999a
xen-unstable date: Mon Jun 04 16:47:48 2007 +0100

diff -r eec47edb2a25 -r 8c24767501ff xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
@@ -338,7 +338,7 @@ static void construct_vmcs(struct vcpu *
 #endif
 
     /* Host control registers. */
-    __vmwrite(HOST_CR0, read_cr0());
+    __vmwrite(HOST_CR0, read_cr0() | X86_CR0_TS);
     __vmwrite(HOST_CR4, read_cr4());
 
     /* Host CS:RIP. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kernel-xen.spec	13 Sep 2007 23:14:06 -0000	1.56
+++ kernel-xen.spec	20 Sep 2007 18:18:24 -0000	1.57
@@ -636,6 +636,12 @@
 # Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
 Patch20002: xen-vpic-irqbase-mode.patch
 
+# Fix bz#294011: floating point corruption issues
+# changeset 8c24767501ff from Xen 3.1.1
+Patch20003: xen-vmx-fpu-ts-fix.patch
+
+
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1446,6 +1452,7 @@
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
+%patch20003 -p1
 
 cd xen/
 # Update the Makefile version strings
@@ -2368,6 +2375,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Add fix for bug #294011 (floating point corruption)
+  (changeset 8c24767501ff from Xen 3.1.1)
+
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Rebase to 2.6.21.7
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:22:27 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 14:22:27 -0400
Subject: rpms/rhythmbox/devel rhythmbox-upnp-assert.patch, NONE,
	1.1 rhythmbox.spec, 1.131, 1.132
Message-ID: <200709201822.l8KIMRQS015623@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15576

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-upnp-assert.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-6
- Init pygobject threads early (GNOME #469852)


rhythmbox-upnp-assert.patch:

--- NEW FILE rhythmbox-upnp-assert.patch ---
Index: plugins/rb-python-module.c
===================================================================
--- plugins/rb-python-module.c	(revision 5356)
+++ plugins/rb-python-module.c	(working copy)
@@ -173,6 +173,8 @@
 	/* import gtk */
 	init_pygtk ();
 
+	pyg_enable_threads ();
+
 	gtk = PyImport_ImportModule ("gtk");
 	if (gtk == NULL) {
 		g_warning ("Could not import gtk");


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- rhythmbox.spec	18 Sep 2007 10:49:18 -0000	1.131
+++ rhythmbox.spec	20 Sep 2007 18:21:53 -0000	1.132
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -45,6 +45,7 @@
 
 ExcludeArch:    s390 s390x
 
+Patch1: rhythmbox-upnp-assert.patch
 Patch2: rhythmbox-enable-stores.patch
 
 %description
@@ -74,6 +75,7 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .upnp-assert
 pushd data/
 %patch2 -p0 -b .enable-stores
 popd
@@ -187,6 +189,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-6
+- Init pygobject threads early (GNOME #469852)
+
 * Tue Aug 24 2007 Todd Zullinger <tmz at pobox.com> - 0.11.2-5
 - Rebuild against new libgpod
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:26:39 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 14:26:39 -0400
Subject: rpms/calc/devel calc.spec,1.2,1.3
Message-ID: <200709201826.l8KIQdej015805@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780

Modified Files:
	calc.spec 
Log Message:
* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
- Remove extra license choice information from package release field to
  properly comply with the packaging guidelines so as to not make Spot sad.
  Put a note in the description instead.
- Today is Thursday.



Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calc.spec	20 Sep 2007 17:19:17 -0000	1.2
+++ calc.spec	20 Sep 2007 18:26:06 -0000	1.3
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       9%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -43,6 +43,11 @@
 Calc is an arbitrary precision C-like arithmetic system that is a
 calculator, an algorithm-prototyper, and a mathematical research tool. Calc
 comes with a rich set of built-in mathematical and programmatic functions.
+%if %{with_readline}
+Note: this copy of Calc is linked against the GNU Readline library and has
+been converted to the ordinary GPL as per section 3 of the LGPL. See the
+included calc-converted-to-gpl.txt document for details.
+%endif
 
 
 %package libs
@@ -213,6 +218,12 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
+- Remove extra license choice information from package release field to
+  properly comply with the packaging guidelines so as to not make Spot sad.
+  Put a note in the description instead.
+- Today is Thursday.
+
 * Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
 - initial package for Fedora
 - clear old and long pre-fedora changelog



From fedora-extras-commits at redhat.com  Thu Sep 20 18:27:31 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 14:27:31 -0400
Subject: rpms/calc/F-7 calc.spec,1.1,1.2
Message-ID: <200709201827.l8KIRVGd015920@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816

Modified Files:
	calc.spec 
Log Message:
* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
- Remove extra license choice information from package release field to
  properly comply with the packaging guidelines so as to not make Spot sad.
  Put a note in the description instead.
- Today is Thursday.



Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/calc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calc.spec	20 Sep 2007 17:05:24 -0000	1.1
+++ calc.spec	20 Sep 2007 18:26:58 -0000	1.2
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       9%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -43,6 +43,11 @@
 Calc is an arbitrary precision C-like arithmetic system that is a
 calculator, an algorithm-prototyper, and a mathematical research tool. Calc
 comes with a rich set of built-in mathematical and programmatic functions.
+%if %{with_readline}
+Note: this copy of Calc is linked against the GNU Readline library and has
+been converted to the ordinary GPL as per section 3 of the LGPL. See the
+included calc-converted-to-gpl.txt document for details.
+%endif
 
 
 %package libs
@@ -213,6 +218,12 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
+- Remove extra license choice information from package release field to
+  properly comply with the packaging guidelines so as to not make Spot sad.
+  Put a note in the description instead.
+- Today is Thursday.
+
 * Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
 - initial package for Fedora
 - clear old and long pre-fedora changelog



From fedora-extras-commits at redhat.com  Thu Sep 20 18:30:45 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Sep 2007 14:30:45 -0400
Subject: rpms/syck/devel syck.spec,1.15,1.16
Message-ID: <200709201830.l8KIUjcM016170@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16092

Modified Files:
	syck.spec 
Log Message:

* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>        - 0.61-2
- Rebuild against new PHP



Index: syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syck/devel/syck.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- syck.spec	21 Aug 2007 16:18:59 -0000	1.15
+++ syck.spec	20 Sep 2007 18:29:59 -0000	1.16
@@ -5,7 +5,7 @@
 Summary:	YAML for C, Python, and PHP
 
 Version:	0.61
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	BSD
 Group:		System Environment/Libraries
@@ -181,6 +181,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-2
+- Rebuild against new PHP
+
 * Tue Aug 21 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-1
 - Update
 - Clean up spec a bit



From fedora-extras-commits at redhat.com  Thu Sep 20 18:31:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 14:31:50 -0400
Subject: rpms/gdm/devel gdm-2.20.0-change-defaults.patch, 1.1, 1.2 gdm.spec, 
	1.289, 1.290
Message-ID: <200709201831.l8KIVofd016245@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16164

Modified Files:
	gdm-2.20.0-change-defaults.patch gdm.spec 
Log Message:
reenable root login


gdm-2.20.0-change-defaults.patch:

Index: gdm-2.20.0-change-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm-2.20.0-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.20.0-change-defaults.patch	19 Sep 2007 16:43:40 -0000	1.1
+++ gdm-2.20.0-change-defaults.patch	20 Sep 2007 18:31:17 -0000	1.2
@@ -99,15 +99,6 @@
  
  # If true then the last login information is printed to the user before being
  # prompted for password.  While this gives away some info on what users are on
-@@ -246,7 +246,7 @@ SecurityTokensDriver=
- [security]
- # Allow root to login.  It makes sense to turn this off for kiosk use, when
- # you want to minimize the possibility of break in.
--AllowRoot=true
-+AllowRoot=false
- # Allow login as root via XDMCP.  This value will be overridden and set to
- # false if the /etc/default/login file exists and contains
- # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
 @@ -356,7 +356,7 @@ Enable=false
  #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
  


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- gdm.spec	19 Sep 2007 16:43:40 -0000	1.289
+++ gdm.spec	20 Sep 2007 18:31:17 -0000	1.290
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-4
+- Reenable root login due to popular demand
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
 - Change default theme to FedoraInfinity
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:49:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 14:49:14 -0400
Subject: rpms/sabayon/devel .cvsignore, 1.16, 1.17 sabayon.spec, 1.42,
	1.43 sources, 1.16, 1.17
Message-ID: <200709201849.l8KInELc017613@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17589

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Sep 2007 21:37:20 -0000	1.16
+++ .cvsignore	20 Sep 2007 18:48:41 -0000	1.17
@@ -1 +1 @@
-sabayon-2.20.0.tar.bz2
+sabayon-2.20.1.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sabayon.spec	19 Sep 2007 21:37:20 -0000	1.42
+++ sabayon.spec	20 Sep 2007 18:48:41 -0000	1.43
@@ -7,7 +7,7 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.20.0
+Version: 2.20.1
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
@@ -272,8 +272,8 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
-* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
-- Update to 2.20.0
+* Wed Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-1
+- Update to 2.20.1
 
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Sep 2007 21:37:20 -0000	1.16
+++ sources	20 Sep 2007 18:48:41 -0000	1.17
@@ -1 +1 @@
-50165894e576fb80d2b3a4bc0294fc5b  sabayon-2.20.0.tar.bz2
+1d3217ddffa413651d918844e5f5a7d9  sabayon-2.20.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 18:58:57 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 14:58:57 -0400
Subject: rpms/mercurial/devel mercurial-install-contrib.patch, NONE,
	1.1 mercurial.spec, 1.18, 1.19
Message-ID: <200709201858.l8KIwvDg017899@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761

Modified Files:
	mercurial.spec 
Added Files:
	mercurial-install-contrib.patch 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	23 Aug 2007 16:08:19 -0000	1.18
+++ mercurial.spec	20 Sep 2007 18:58:24 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -16,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -32,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,10 +50,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
 * Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
 - update to 0.9.4
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:04:05 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 15:04:05 -0400
Subject: rpms/mercurial/F-7 mercurial-install-contrib.patch, NONE,
	1.1 mercurial.spec, 1.18, 1.19
Message-ID: <200709201904.l8KJ45Rm024612@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24514

Modified Files:
	mercurial.spec 
Added Files:
	mercurial-install-contrib.patch 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	24 Aug 2007 00:00:47 -0000	1.18
+++ mercurial.spec	20 Sep 2007 19:03:30 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -16,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -32,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,10 +50,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
 * Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
 - update to 0.9.4
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:04:55 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 15:04:55 -0400
Subject: rpms/mercurial/EL-4 mercurial-install-contrib.patch, 1.1,
	1.2 mercurial.spec, 1.14, 1.15
Message-ID: <200709201904.l8KJ4t7h024734@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24687

Modified Files:
	mercurial-install-contrib.patch mercurial.spec 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

Index: mercurial-install-contrib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial-install-contrib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercurial-install-contrib.patch	20 Sep 2007 18:04:17 -0000	1.1
+++ mercurial-install-contrib.patch	20 Sep 2007 19:04:49 -0000	1.2
@@ -17,7 +17,7 @@
 +    contrib_files = [(os.path.join('/usr/share/mercurial', root),
 +                      [os.path.join(root, file_) for file_ in files])
 +                     for root, dirs, files in os.walk('contrib')]
-+    contrib_files = contrib_files + [('/usr/share/mercurial',
++    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
 +                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
 +
  setup(name='mercurial',


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mercurial.spec	20 Sep 2007 18:04:17 -0000	1.14
+++ mercurial.spec	20 Sep 2007 19:04:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -55,6 +55,9 @@
 %{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
 * Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
 - update to 0.9.4-2
 - install contrib directory



From fedora-extras-commits at redhat.com  Thu Sep 20 19:06:57 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:06:57 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-initgroups-minimum_uid.patch, NONE,
	1.1
Message-ID: <200709201906.l8KJ6vVV025065@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Added Files:
	nss_ldap-257-initgroups-minimum_uid.patch 
Log Message:
- attempt at implementing a minimum UID for initgroups, so that I can avoid
  maintaining a list of excluded users for evar


nss_ldap-257-initgroups-minimum_uid.patch:

--- NEW FILE nss_ldap-257-initgroups-minimum_uid.patch ---
diff -ur nss_ldap/ldap-grp.c nss_ldap/ldap-grp.c
--- nss_ldap/ldap-grp.c	2007-08-03 00:51:09.000000000 -0400
+++ nss_ldap/ldap-grp.c	2007-09-20 14:32:14.000000000 -0400
@@ -1068,6 +1069,13 @@
       return NSS_NOTFOUND;
     }
 
+  if (_nss_ldap_test_initgroups_minimum_uid(LA_STRING (a)))
+    {
+      debug ("<== " NSS_LDAP_INITGROUPS_FUNCTION " (user id below configured minimum)");
+      return NSS_NOTFOUND;
+    }
+
+
   lia.backlink = _nss_ldap_test_config_flag (NSS_LDAP_FLAGS_INITGROUPS_BACKLINK);
 
   if (lia.backlink != 0)
diff -ur nss_ldap/ldap-nss.c nss_ldap/ldap-nss.c
--- nss_ldap/ldap-nss.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/ldap-nss.c	2007-09-20 14:33:01.000000000 -0400
@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <pwd.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/param.h>
@@ -4245,6 +4246,33 @@
 }
 
 int
+_nss_ldap_test_initgroups_minimum_uid (const char *user)
+{
+  struct passwd passwd, *pwd;
+  char *buf = NULL;
+  size_t size = 0x40;
+  uid_t uid;
+  NSS_STATUS status;
+
+  do {
+    if ((buf = malloc(size)) == NULL)
+      return 0;
+    pwd = NULL;
+    errno = 0;
+    status = getpwnam_r(user, &passwd, buf, size, &pwd);
+    uid = passwd.pw_uid;
+    free(buf);
+    if ((status != 0) && (errno == ERANGE))
+      size *= 2;
+    if ((status == 0) && (pwd == &passwd))
+      return (uid < __config->ldc_initgroups_minimum_uid);
+    if (size > 0x40000)
+      return 0;
+  } while ((status != 0) && (errno == ERANGE));
+  return 0;
+}
+
+int
 _nss_ldap_get_ld_errno (char **m, char **s)
 {
 #ifdef HAVE_LDAP_GET_OPTION
diff -ur nss_ldap/ldap-nss.h nss_ldap/ldap-nss.h
--- nss_ldap/ldap-nss.h	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/ldap-nss.h	2007-09-20 14:33:24.000000000 -0400
@@ -390,6 +390,7 @@
   time_t ldc_mtime;
 
   char **ldc_initgroups_ignoreusers;
+  int ldc_initgroups_minimum_uid;
 };
 
 typedef struct ldap_config ldap_config_t;
@@ -897,6 +898,7 @@
 
 int _nss_ldap_test_config_flag (unsigned int flag);
 int _nss_ldap_test_initgroups_ignoreuser (const char *user);
+int _nss_ldap_test_initgroups_minimum_uid (const char *user);
 int _nss_ldap_get_ld_errno (char **m, char **s);
 
 #endif /* _LDAP_NSS_LDAP_LDAP_NSS_H */
diff -ur nss_ldap/util.c nss_ldap/util.c
--- nss_ldap/util.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/util.c	2007-09-20 14:29:49.000000000 -0400
@@ -660,6 +660,7 @@
   result->ldc_reconnect_maxsleeptime = LDAP_NSS_MAXSLEEPTIME;
   result->ldc_reconnect_maxconntries = LDAP_NSS_MAXCONNTRIES;
   result->ldc_initgroups_ignoreusers = NULL;
+  result->ldc_initgroups_minimum_uid = 0;
 
   for (i = 0; i <= LM_NONE; i++)
     {
@@ -1137,6 +1138,10 @@
 	      break;
 	    }
 	}
+      else if (!strcasecmp (k, NSS_LDAP_KEY_INITGROUPS_MINIMUM_UID))
+	{
+	  result->ldc_initgroups_minimum_uid = atoi (v);
+	}
       else if (!strcasecmp (k, NSS_LDAP_KEY_CONNECT_POLICY))
         {
 	  if (!strcasecmp (v, "oneshot"))
diff -ur nss_ldap/util.h nss_ldap/util.h
--- nss_ldap/util.h	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/util.h	2007-09-20 14:25:28.000000000 -0400
@@ -83,6 +83,7 @@
 #define NSS_LDAP_KEY_PAGESIZE		"pagesize"
 #define NSS_LDAP_KEY_INITGROUPS		"nss_initgroups"
 #define NSS_LDAP_KEY_INITGROUPS_IGNOREUSERS	"nss_initgroups_ignoreusers"
+#define NSS_LDAP_KEY_INITGROUPS_MINIMUM_UID	"nss_initgroups_minimum_uid"
 
 /* more reconnect policy fine-tuning */
 #define NSS_LDAP_KEY_RECONNECT_TRIES		"nss_reconnect_tries"
--- nss_ldap/nss_ldap.5	2007-08-03 00:51:09.000000000 -0400
+++ nss_ldap/nss_ldap.5	2007-09-20 14:44:59.000000000 -0400
@@ -442,9 +442,17 @@
 .B nss_ldap
 implementation of
 .BR initgroups(3)
-to return NSS_STATUS_NOTFOUND if called with a listed users as
+to return NSS_STATUS_NOTFOUND if called with one of the listed users as
 its argument.
 .TP
+.B nss_initgroups_minimum_uid <uid>
+This option directs the
+.B nss_ldap
+implementation of
+.BR initgroups(3)
+to return NSS_STATUS_NOTFOUND if called with a users whose user ID
+is below the specified value.
+.TP
 .B nss_srv_domain <domain>
 This option determines the DNS domain used for performing SRV
 lookups.



From fedora-extras-commits at redhat.com  Thu Sep 20 19:07:39 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:07:39 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-over-recursion.patch,NONE,1.1
Message-ID: <200709201907.l8KJ7doO025214@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25093

Added Files:
	nss_ldap-257-over-recursion.patch 
Log Message:
- attempt to avoid over-recursion from nss_ldap ending up needing to call
  itself during initialization, preferable to infinite-recurse-then-crash


nss_ldap-257-over-recursion.patch:

--- NEW FILE nss_ldap-257-over-recursion.patch ---
This isn't particularly elegant or exhaustive, and the maximum recursion depth
is purely an arbitrary value, but keeping a per-thread depth count manages to
avoid infinite recursion crashes which happen when we hit nesting through
nss_ldap->libldap->gethostbyXXX->nss_ldap calls.

diff -ur nss_ldap/configure.in nss_ldap/configure.in
--- nss_ldap/configure.in	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/configure.in	2007-09-20 13:43:49.000000000 -0400
@@ -243,6 +243,17 @@
 	],
 	AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING(for thread-local storage)
+AC_TRY_COMPILE([#ifdef HAVE_PTHREAD_H
+	#include <pthread.h>
+	#endif],
+	[static __thread int foo = 1;],
+	[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_THREAD_LOCAL_STORAGE,1,[Define if your toolchain supports thread-local storage.])
+	],
+	AC_MSG_RESULT(no))
+
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE([#include <sys/types.h>
 	#include <sys/socket.h>],
diff -ur nss_ldap/ldap-nss.c nss_ldap/ldap-nss.c
--- nss_ldap-257/ldap-nss.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap-257/ldap-nss.c	2007-09-20 14:33:01.000000000 -0400
@@ -119,6 +120,11 @@
 
 NSS_LDAP_DEFINE_LOCK (__lock);
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+static __thread int _nss_ldap_init_recursion_depth;
+static __thread int _nss_ldap_search_recursion_depth;
+#endif
+
 /*
  * the configuration is read by the first call to do_open().
  * Pointers to elements of the list are passed around but should not
@@ -1100,6 +1106,19 @@
   NSS_STATUS stat;
   int sd=-1;
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  if (_nss_ldap_init_recursion_depth > 5)
+    {
+      /* the reasoning here is just a guess, but why else? */
+      syslog (LOG_ERR, "nss_ldap: unable to connect to DSA without "
+	      "information which may need to be retrieved from the DSA");
+      debug ("<=> do_init: recursed too far, failing");
+      return NSS_NOTFOUND;
+    }
+
+  _nss_ldap_init_recursion_depth++;
+#endif
+
   debug ("==> do_init");
 
   if (_nss_ldap_validateconfig (__config) != NSS_SUCCESS)
@@ -1227,6 +1246,9 @@
       if (__session.ls_state == LS_CONNECTED_TO_DSA)
 	{
 	  debug ("<== do_init (cached session)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+	  _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_SUCCESS;
 	}
     }
@@ -1239,6 +1261,9 @@
   if (pthread_once (&__once, do_atfork_setup) != 0)
     {
       debug ("<== do_init (pthread_once failed)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+      _nss_ldap_init_recursion_depth--;
+#endif
       return NSS_UNAVAIL;
     }
 #elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) )
@@ -1280,6 +1305,9 @@
 	{
 	  debug ("<== do_init (failed to read config)");
 	  __config = NULL;
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+          _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_UNAVAIL;
 	}
     }
@@ -1328,6 +1356,9 @@
 	  && (rc = ldapssl_client_init (cfg->ldc_sslpath, NULL)) != LDAP_SUCCESS)
 	{
           debug ("<== do_init (ldapssl_client_init failed with rc = %d)", rc);
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+          _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_UNAVAIL;
 	}
       __ssl_initialized = 1;
@@ -1345,6 +1376,9 @@
   if (stat != NSS_SUCCESS)
     {
       debug ("<== do_init (failed to initialize LDAP session)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+      _nss_ldap_init_recursion_depth--;
+#endif
       return stat;
     }
 
@@ -1353,6 +1387,9 @@
 
   debug ("<== do_init (initialized session)");
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  _nss_ldap_init_recursion_depth--;
+#endif
   return NSS_SUCCESS;
 }
 
@@ -1660,7 +1697,7 @@
 	      ldap_err2string (rc));
       stat = do_map_error (rc);
       do_close ();
-      debug ("<== do_open (failed to bind to DSA");
+      debug ("<== do_open (failed to bind to DSA)");
     }
   else
     {
@@ -2513,6 +2550,19 @@
   NSS_STATUS stat = NSS_UNAVAIL;
   int maxtries;
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  if (_nss_ldap_search_recursion_depth > 5)
+    {
+      /* the reasoning here is just a guess, but why else? */
+      syslog (LOG_ERR, "nss_ldap: unable to connect to DSA without "
+	      "information which may need to be retrieved from the DSA");
+      debug ("<=> do_with_reconnect: recursed too far, failing");
+      return NSS_NOTFOUND;
+    }
+
+  _nss_ldap_search_recursion_depth++;
+#endif
+
   debug ("==> do_with_reconnect");
 
   /* caller must successfully call do_init() first */
@@ -2621,6 +2671,11 @@
     }
 
   debug ("<== do_with_reconnect");
+
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  _nss_ldap_search_recursion_depth--;
+#endif
+
   return stat;
 }
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:08:28 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 20 Sep 2007 15:08:28 -0400
Subject: rpms/mash/devel .cvsignore, 1.17, 1.18 mash.spec, 1.15, 1.16 sources,
	1.18, 1.19
Message-ID: <200709201908.l8KJ8Ssb025414@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25291

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Sep 2007 15:49:30 -0000	1.17
+++ .cvsignore	20 Sep 2007 19:07:55 -0000	1.18
@@ -1 +1 @@
-mash-0.2.5.tar.gz
+mash-0.2.6.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mash.spec	18 Sep 2007 15:49:30 -0000	1.15
+++ mash.spec	20 Sep 2007 19:07:55 -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:           mash
-Version:        0.2.5
+Version:        0.2.6
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,10 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep 20 2007 Bill Nottingham <notting at redhat.com> 0.2.6-1
+- repoview cleanups/fixes
+- fix gtkimmodules typo (#295371, <petersen at redhat.com>)
+
 * Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.2.5-1
 - handle valgrind for multilib differently (#294761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Sep 2007 15:49:30 -0000	1.18
+++ sources	20 Sep 2007 19:07:55 -0000	1.19
@@ -1 +1 @@
-73e37a8340bb6d9356d0ce18eea485f2  mash-0.2.5.tar.gz
+c0075b3988f9ae4527bd01bff19fdb60  mash-0.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:11:10 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 15:11:10 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.12, 1.13 mugshot.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <200709201911.l8KJBAe3025841@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Sep 2007 20:11:01 -0000	1.12
+++ .cvsignore	20 Sep 2007 19:10:36 -0000	1.13
@@ -1 +1 @@
-mugshot-1.1.52.tar.gz
+mugshot-1.1.53.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mugshot.spec	11 Sep 2007 19:58:39 -0000	1.20
+++ mugshot.spec	20 Sep 2007 19:10:36 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.52
-Release:        2%{?dist}
+Version:        1.1.53
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
 - shuffle .sos around (b.r.c 286371)
 - make devel package require dbus-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Sep 2007 20:11:01 -0000	1.13
+++ sources	20 Sep 2007 19:10:36 -0000	1.14
@@ -1 +1 @@
-d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz
+8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:13:59 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:13:59 -0400
Subject: rpms/nss_ldap/devel nss_ldap.spec, 1.85,
	1.86 nss_ldap-254-over-recursion.patch, 1.1, NONE
Message-ID: <200709201913.l8KJDxYg026194@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26091

Modified Files:
	nss_ldap.spec 
Removed Files:
	nss_ldap-254-over-recursion.patch 
Log Message:
- revise not-applied patch for attempting to stop infinite recursion in
  poorly-configured case



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nss_ldap.spec	24 Aug 2007 15:53:59 -0000	1.85
+++ nss_ldap.spec	20 Sep 2007 19:13:27 -0000	1.86
@@ -16,11 +16,12 @@
 Patch3: pam_ldap-180-install-perms.patch
 Patch4: pam_ldap-180-bind.patch
 Patch5: nss_ldap-250-mock64.patch
-Patch6: nss_ldap-254-over-recursion.patch
+Patch6: nss_ldap-257-over-recursion.patch
 Patch7: pam_ldap-182-manpointer.patch
 Patch8: nss_ldap-254-soname.patch
 Patch9: nss_ldap-256-resolver.patch
 Patch10: nss_ldap-257-slash.patch
+Patch11: nss_ldap-257-initgroups-minimum_uid.patch
 
 URL: http://www.padl.com/
 License: LGPLv2+
@@ -65,6 +66,7 @@
 %patch8 -p1 -b .soname
 %patch9 -p1 -b .resolver
 %patch10 -p1 -b .slash
+#%patch11 -p1 -b .initgroups-minimum_uid
 autoreconf
 popd
 
@@ -185,6 +187,10 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Thu Sep 20 2007 Nalin Dahyabhai <nalin at redhat.com>
+- revise not-applied patch for attempting to stop infinite recursion in
+  poorly-configured case
+
 * Fri Aug 24 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-3
 - tack on a disttag
 


--- nss_ldap-254-over-recursion.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 19:14:46 2007
From: fedora-extras-commits at redhat.com (Thorsten Scherf (tscherf))
Date: Thu, 20 Sep 2007 15:14:46 -0400
Subject: rpms/Miro/devel Miro.spec,NONE,1.1
Message-ID: <200709201914.l8KJEk62026338@cvs-int.fedora.redhat.com>

Author: tscherf

Update of /cvs/extras/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26325

Added Files:
	Miro.spec 
Log Message:
new devel version


--- NEW FILE Miro.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)")}

%define firefoxver 2.0.0.6

Name:           Miro
Version:        0.9.8.1
Release:        6%{?dist}
Summary:        Miro - Internet TV Player
Group:          Applications/Multimedia
License:        GPL
URL:            http://www.getmiro.com/
Source0:	http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
Patch0:		dbus.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel xine-lib-devel Pyrex 
BuildRequires:  boost-devel qt-devel pygtk2-devel libXcursor-devel
BuildRequires:  firefox-devel = %{firefoxver} gettext libXfixes-devel gtk2-devel
Requires:	firefox = %{firefoxver} xine-lib gnome-python2-gtkmozembed 
Requires:	gnome-python2-gconf dbus-python 
Obsoletes:	Democracy

%description
Miro is a free application that turns your computer into an
internet TV video player. This release is still a beta version, which means 
that there are some bugs, but we're moving quickly to fix them and will be 
releasing bug fixes on a regular basis.

%prep
%setup -q -n %{name}-%{version}
%patch -p0 

%build
cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
cd platform/gtk-x11 && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
%find_lang miro

 
%clean
rm -rf %{buildroot}

%post
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%postun
update-desktop-database %{_datadir}/applications &> /dev/null ||:


%files -f platform/gtk-x11/miro.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/miro
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
%{_datadir}/mime/packages/*.xml
%{python_sitearch}/miro/
%doc README license.txt CREDITS 


%changelog
* Thu Sep 20 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-3
- new Firefox dep

* Wed Aug 15 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-2
- made Democracy obsolte with this release

* Tue Aug 14 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-1
- new upstream version and new naming
- fix to solve the python/dbus problem

* Fri Jun 22 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.6-2
- new upstream version

* Fri Jun 22 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.6-1
- new upstream version




From fedora-extras-commits at redhat.com  Thu Sep 20 19:14:55 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 20 Sep 2007 12:14:55 -0700
Subject: [pkgdb] eclipse-pydev: bkonrath has requested commit
Message-ID: <200709201914.l8KJEuEl011373@app4.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has requested the commit acl on eclipse-pydev (Fedora devel)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 19:15:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 15:15:51 -0400
Subject: rpms/tomboy/devel no-start-here.patch, NONE, 1.1 tomboy.spec, 1.58,
	1.59
Message-ID: <200709201915.l8KJFpCe026527@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26403

Modified Files:
	tomboy.spec 
Added Files:
	no-start-here.patch 
Log Message:
don't show start here on login


no-start-here.patch:

--- NEW FILE no-start-here.patch ---
diff -up tomboy-0.8.0/Tomboy/NoteManager.cs.no-start-here tomboy-0.8.0/Tomboy/NoteManager.cs
--- tomboy-0.8.0/Tomboy/NoteManager.cs.no-start-here	2007-08-14 05:11:25.000000000 -0400
+++ tomboy-0.8.0/Tomboy/NoteManager.cs	2007-09-20 15:13:50.000000000 -0400
@@ -172,7 +172,12 @@ namespace Tomboy
 								links_note_content);
 				links_note.QueueSave (true);
 				
-				start_note.Window.Show ();
+                                /* Don't show the start_note on first run
+                                   since Tomboy is started in the default
+                                   GNOME panel.
+                                   start_note.Window.Show ();
+                                 */
+	
 			} catch (Exception e) {
 				Logger.Warn ("Error creating start notes: {0}\n{1}",
 						e.Message, e.StackTrace);


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- tomboy.spec	17 Sep 2007 17:00:29 -0000	1.58
+++ tomboy.spec	20 Sep 2007 19:15:18 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.8.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -11,6 +11,7 @@
 URL:            http://www.beatniksoftware.com/tomboy/
 Source0:        http://download.gnome.org/sources/tomboy/0.7/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
+Patch2:		no-start-here.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
+%patch2 -p1 -b .no-start-here
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-2
+- Don't show the start here note on login
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1
 - Update to 0.8.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:18:21 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 20 Sep 2007 15:18:21 -0400
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.4, 1.5 eclipse-pydev.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709201918.l8KJILmd026844@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26764

Modified Files:
	.cvsignore eclipse-pydev.spec sources 
Log Message:
`cat clog`


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2007 22:47:57 -0000	1.4
+++ .cvsignore	20 Sep 2007 19:17:48 -0000	1.5
@@ -1,2 +1,2 @@
-org.python.pydev.feature-src-1_3_8.zip
 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
+org.python.pydev.feature-src-1_3_9.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-pydev.spec	29 Aug 2007 14:22:11 -0000	1.6
+++ eclipse-pydev.spec	20 Sep 2007 19:17:48 -0000	1.7
@@ -11,13 +11,13 @@
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.3.8
-Release:          2%{?dist}
+Version:          1.3.9
+Release:          1%{?dist}
 License:          Eclipse Public License
 URL:              http://pydev.sourceforge.net/
 Group:            Development/Tools
 
-Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_8.zip
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_9.zip
 Source1:          org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 Source2:          fetch-pydev-mylyn.sh
 
@@ -107,14 +107,6 @@
 
 rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
 
-# Remove #!'s from the .py files enclosed in org.python.pydev.jython
-#for f in `find plugins -name '*.py'` ; do 
-#    if [ -f $f ]; then
-#        sed --in-place "s/^#!.*$//" $f
-#    fi
-#done 
-
-
 %build
 # Copy the SDK for build
 /bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse mylyn
@@ -225,6 +217,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.9-1
+- 1.3.9
+
 * Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-2
 - Add pydev mylyn feature to all archs except ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2007 22:47:57 -0000	1.4
+++ sources	20 Sep 2007 19:17:48 -0000	1.5
@@ -1,2 +1,2 @@
-7516703db105d7a248ffcd36581224fb  org.python.pydev.feature-src-1_3_8.zip
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
+d0b9c09f00967717a8d99966aaff7679  org.python.pydev.feature-src-1_3_9.zip



From fedora-extras-commits at redhat.com  Thu Sep 20 19:20:16 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 15:20:16 -0400
Subject: rpms/kernel/devel config-generic,1.25,1.26 kernel.spec,1.173,1.174
Message-ID: <200709201920.l8KJKGb9027120@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27047

Modified Files:
	config-generic kernel.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable SECMARK by default.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-generic	29 Aug 2007 22:41:13 -0000	1.25
+++ config-generic	20 Sep 2007 19:19:43 -0000	1.26
@@ -2905,7 +2905,7 @@
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_UTS_NS=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kernel.spec	20 Sep 2007 15:23:18 -0000	1.173
+++ kernel.spec	20 Sep 2007 19:19:43 -0000	1.174
@@ -1805,6 +1805,9 @@
 
 %changelog
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable SECMARK by default.
+
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7
 
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep 20 19:31:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:31:58 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.20, 
	1.21 xtrans-1.0.3-abstract-sockets.patch, 1.1, 1.2
Message-ID: <200709201931.l8KJVw7h028525@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28449

Modified Files:
	xorg-x11-xtrans-devel.spec xtrans-1.0.3-abstract-sockets.patch 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- Fix a bug in automatic port generation for abstract sockets.  Fixes fast
  user switching, among other things.



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-xtrans-devel.spec	24 Aug 2007 21:49:02 -0000	1.20
+++ xorg-x11-xtrans-devel.spec	20 Sep 2007 19:31:25 -0000	1.21
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -59,6 +59,10 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- Fix a bug in automatic port generation for abstract sockets.  Fixes fast
+  user switching, among other things.
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.0.3-3
 - Abstract sockets for PF_UNIX.
 

xtrans-1.0.3-abstract-sockets.patch:

Index: xtrans-1.0.3-abstract-sockets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xtrans-1.0.3-abstract-sockets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtrans-1.0.3-abstract-sockets.patch	24 Aug 2007 21:49:02 -0000	1.1
+++ xtrans-1.0.3-abstract-sockets.patch	20 Sep 2007 19:31:25 -0000	1.2
@@ -1,21 +1,6 @@
-diff -up xtrans-1.0.3/Xtransint.h.abstract xtrans-1.0.3/Xtransint.h
---- xtrans-1.0.3/Xtransint.h.abstract	2006-12-06 11:08:53.000000000 -0500
-+++ xtrans-1.0.3/Xtransint.h	2007-08-24 10:28:25.000000000 -0400
-@@ -374,9 +374,10 @@ typedef struct _Xtransport_table {
- #define TRANS_DISABLED	(1<<2)	/* Don't open this one */
- #define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
- #define TRANS_NOUNLINK	(1<<4)	/* Dont unlink transport endpoints */
-+#define TRANS_ABSTRACT	(1<<5)	/* Use abstract sockets if available */
- 
- /* Flags to preserve when setting others */
--#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK)
-+#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK|TRANS_ABSTRACT)
- 
- /*
-  * readv() and writev() don't exist or don't work correctly on some
 diff -up xtrans-1.0.3/Xtranssock.c.abstract xtrans-1.0.3/Xtranssock.c
 --- xtrans-1.0.3/Xtranssock.c.abstract	2006-12-06 11:08:53.000000000 -0500
-+++ xtrans-1.0.3/Xtranssock.c	2007-08-24 16:05:10.000000000 -0400
++++ xtrans-1.0.3/Xtranssock.c	2007-09-20 15:28:00.000000000 -0400
 @@ -163,6 +163,10 @@ static int IBMsockInit = 0;
  #define SocketInitOnce() /**/
  #endif
@@ -70,7 +55,7 @@
      int			oldUmask;
      int			status;
      unsigned int	mode;
-+    char		tmpport[64];
++    char		tmpport[108];
 +
 +    int			abstract = 0;
 +#ifdef HAVE_ABSTRACT_SOCKETS
@@ -79,7 +64,7 @@
  
      PRMSG (2, "SocketUNIXCreateListener(%s)\n",
  	port ? port : "NULL", 0, 0);
-@@ -1096,16 +1111,17 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1096,16 +1111,16 @@ TRANS(SocketUNIXCreateListener) (XtransC
      }
  #endif
  
@@ -92,9 +77,10 @@
 -	    return TRANS_CREATE_LISTENER_FAILED;
 -	}
 -    } else {
+-	snprintf (sockname.sun_path, sizeof(sockname.sun_path),
+-		  "%s%ld", UNIX_PATH, (long)getpid());
 +    if (!(port && *port)) {
- 	snprintf (sockname.sun_path, sizeof(sockname.sun_path),
- 		  "%s%ld", UNIX_PATH, (long)getpid());
++	snprintf (tmpport, sizeof(tmpport), "%s%ld", UNIX_PATH, (long)getpid());
 +	port = tmpport;
 +    }
 +    if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) {
@@ -103,7 +89,7 @@
      }
  
  #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx)
-@@ -1118,7 +1134,12 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1118,7 +1133,12 @@ TRANS(SocketUNIXCreateListener) (XtransC
      namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
  #endif
  
@@ -117,7 +103,7 @@
  
      if ((status = TRANS(SocketCreateListener) (ciptr,
  	(struct sockaddr *) &sockname, namelen, flags)) < 0)
-@@ -1148,6 +1169,9 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1148,6 +1168,9 @@ TRANS(SocketUNIXCreateListener) (XtransC
          return TRANS_CREATE_LISTENER_FAILED;
      }
  
@@ -127,7 +113,7 @@
      ciptr->family = sockname.sun_family;
      ciptr->addrlen = namelen;
      memcpy (ciptr->addr, &sockname, ciptr->addrlen);
-@@ -1170,16 +1194,22 @@ TRANS(SocketUNIXResetListener) (XtransCo
+@@ -1170,16 +1193,22 @@ TRANS(SocketUNIXResetListener) (XtransCo
      struct stat		statb;
      int 		status = TRANS_RESET_NOOP;
      unsigned int	mode;
@@ -153,7 +139,7 @@
      {
  	int oldUmask = umask (0);
  
-@@ -1361,6 +1391,10 @@ TRANS(SocketUNIXAccept) (XtransConnInfo 
+@@ -1361,6 +1390,10 @@ TRANS(SocketUNIXAccept) (XtransConnInfo 
          return NULL;
      }
  
@@ -164,7 +150,7 @@
  
      newciptr->addrlen = ciptr->addrlen;
      memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen);
-@@ -1959,6 +1993,10 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -1959,6 +1992,10 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
      int			old_namelen;
  #endif
  
@@ -175,7 +161,7 @@
  
      PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
      
-@@ -1996,7 +2034,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -1996,7 +2033,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
      
      sockname.sun_family = AF_UNIX;
  
@@ -184,7 +170,7 @@
  	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
  	return TRANS_CONNECT_FAILED;
      }
-@@ -2017,7 +2055,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2017,7 +2054,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
       * This is gross, but it was in Xlib
       */
      old_sockname.sun_family = AF_UNIX;
@@ -193,7 +179,7 @@
  	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
  	return TRANS_CONNECT_FAILED;
      }
-@@ -2025,6 +2063,17 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2025,6 +2062,17 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
  	offsetof(struct sockaddr_un, sun_path);
  #endif
  
@@ -211,7 +197,7 @@
  
      /*
       * Do the connect()
-@@ -2062,12 +2111,19 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2062,12 +2110,19 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
  	     * should try again.
  	     */
  
@@ -236,7 +222,7 @@
  		PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
  		       EGET(),0, 0);
  
-@@ -2090,12 +2146,15 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2090,12 +2145,15 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
          return TRANS_CONNECT_FAILED;
      }
  
@@ -253,7 +239,7 @@
      return 0;
  }
  
-@@ -2235,7 +2294,6 @@ TRANS(SocketINETClose) (XtransConnInfo c
+@@ -2235,7 +2293,6 @@ TRANS(SocketINETClose) (XtransConnInfo c
  #ifdef UNIXCONN
  static int
  TRANS(SocketUNIXClose) (XtransConnInfo ciptr)
@@ -261,7 +247,7 @@
  {
      /*
       * If this is the server side, then once the socket is closed,
-@@ -2254,7 +2312,8 @@ TRANS(SocketUNIXClose) (XtransConnInfo c
+@@ -2254,7 +2311,8 @@ TRANS(SocketUNIXClose) (XtransConnInfo c
         && sockname->sun_family == AF_UNIX
         && sockname->sun_path[0])
      {
@@ -271,7 +257,7 @@
  		unlink (sockname->sun_path);
      }
  
-@@ -2421,7 +2480,11 @@ Xtransport     TRANS(SocketINET6Funcs) =
+@@ -2421,7 +2479,11 @@ Xtransport     TRANS(SocketINET6Funcs) =
  Xtransport	TRANS(SocketLocalFuncs) = {
  	/* Socket Interface */
  	"local",
@@ -283,7 +269,7 @@
  #ifdef TRANS_CLIENT
  	TRANS(SocketOpenCOTSClient),
  #endif /* TRANS_CLIENT */
-@@ -2467,7 +2530,7 @@ static char* unix_nolisten[] = { "local"
+@@ -2467,7 +2529,7 @@ static char* unix_nolisten[] = { "local"
  Xtransport	TRANS(SocketUNIXFuncs) = {
  	/* Socket Interface */
  	"unix",
@@ -292,3 +278,18 @@
          TRANS_ALIAS,
  #else
  	0,
+diff -up xtrans-1.0.3/Xtransint.h.abstract xtrans-1.0.3/Xtransint.h
+--- xtrans-1.0.3/Xtransint.h.abstract	2006-12-06 11:08:53.000000000 -0500
++++ xtrans-1.0.3/Xtransint.h	2007-09-20 15:22:59.000000000 -0400
+@@ -374,9 +374,10 @@ typedef struct _Xtransport_table {
+ #define TRANS_DISABLED	(1<<2)	/* Don't open this one */
+ #define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
+ #define TRANS_NOUNLINK	(1<<4)	/* Dont unlink transport endpoints */
++#define TRANS_ABSTRACT	(1<<5)	/* Use abstract sockets if available */
+ 
+ /* Flags to preserve when setting others */
+-#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK)
++#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK|TRANS_ABSTRACT)
+ 
+ /*
+  * readv() and writev() don't exist or don't work correctly on some



From fedora-extras-commits at redhat.com  Thu Sep 20 19:33:09 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 20 Sep 2007 12:33:09 -0700
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <200709201933.l8KJX9PY017172@app4.fedora.phx.redhat.com>

Jeff Johnston (jjohnstn) has set the commit acl on eclipse-pydev (Fedora devel) to Approved for Ben Konrath (bkonrath)

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



From fedora-extras-commits at redhat.com  Thu Sep 20 19:36:23 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:36:23 -0400
Subject: rpms/libFS/devel libFS.spec,1.28,1.29
Message-ID: <200709201936.l8KJaNNo029175@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libFS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085

Modified Files:
	libFS.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.0-6
- Update xtrans dep and rebuild.



Index: libFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libFS.spec	17 Sep 2007 21:50:40 -0000	1.28
+++ libFS.spec	20 Sep 2007 19:35:50 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.0-6
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:37:34 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:37:34 -0400
Subject: rpms/libSM/devel libSM.spec,1.20,1.21
Message-ID: <200709201937.l8KJbYr8029444@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libSM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29349

Modified Files:
	libSM.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.2-4
- Update xtrans dep and rebuild.



Index: libSM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libSM.spec	17 Sep 2007 21:52:03 -0000	1.20
+++ libSM.spec	20 Sep 2007 19:37:02 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libICE-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.2-4
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:38:11 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:38:11 -0400
Subject: rpms/libX11/devel libX11.spec,1.38,1.39
Message-ID: <200709201938.l8KJcBUg029588@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29480

Modified Files:
	libX11.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
- Update xtrans dep and rebuild.



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libX11.spec	17 Sep 2007 13:50:36 -0000	1.38
+++ libX11.spec	20 Sep 2007 19:37:37 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -20,7 +20,7 @@
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libxcb-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
@@ -247,6 +247,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
 - libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
   to match the argument order in the headers. (#274671)



From fedora-extras-commits at redhat.com  Thu Sep 20 19:38:47 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:38:47 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.36,1.37
Message-ID: <200709201938.l8KJclAM029693@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29623

Modified Files:
	libXfont.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
- Update xtrans dep and rebuild.



Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libXfont.spec	17 Sep 2007 21:52:44 -0000	1.36
+++ libXfont.spec	20 Sep 2007 19:38:14 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,7 +14,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -93,6 +93,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:41:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 20 Sep 2007 15:41:17 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 sugar-datastore.spec, 1.29, 1.30
Message-ID: <200709201941.l8KJfHdx030024@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29968

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.26.20070920gitdce9c18d56
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	19 Sep 2007 16:07:48 -0000	1.28
+++ .cvsignore	20 Sep 2007 19:40:45 -0000	1.29
@@ -1 +1 @@
-sugar-datastore-0.2.2-git11013dc3ca.tar.bz2
+sugar-datastore-0.2.2-gitdce9c18d56.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Sep 2007 16:07:48 -0000	1.28
+++ sources	20 Sep 2007 19:40:45 -0000	1.29
@@ -1 +1 @@
-8e3bae187edcaaef8ca3d69976d6a331  sugar-datastore-0.2.2-git11013dc3ca.tar.bz2
+39bdba8e1ef4d86141c7a98ead0f8858  sugar-datastore-0.2.2-gitdce9c18d56.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sugar-datastore.spec	19 Sep 2007 16:07:48 -0000	1.29
+++ sugar-datastore.spec	20 Sep 2007 19:40:45 -0000	1.30
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070919git
-%define commitid 11013dc3ca
+%define alphatag 20070920git
+%define commitid dce9c18d56
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.25.%{alphatag}11013dc3ca
+Release: 0.26.%{alphatag}dce9c18d56
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.26.20070920gitdce9c18d56
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:48:45 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 20 Sep 2007 15:48:45 -0400
Subject: rpms/vpnc/devel vpnc-0.4.0-cloexec.patch, 1.1, 1.2 vpnc.spec, 1.24, 
	1.25 vpnc-0.3.3-sbin-path.patch, 1.1, NONE vpnc-0.4.0-pie.patch,
	1.1, NONE vpnc-0.4.0-sizeofbug.patch, 1.1, NONE
Message-ID: <200709201948.l8KJmj0W030520@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30493

Modified Files:
	vpnc-0.4.0-cloexec.patch vpnc.spec 
Removed Files:
	vpnc-0.3.3-sbin-path.patch vpnc-0.4.0-pie.patch 
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
- upgrade to latest upstream


vpnc-0.4.0-cloexec.patch:

Index: vpnc-0.4.0-cloexec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc-0.4.0-cloexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.4.0-cloexec.patch	26 Feb 2007 12:59:05 -0000	1.1
+++ vpnc-0.4.0-cloexec.patch	20 Sep 2007 19:48:41 -0000	1.2
@@ -1,15 +1,6 @@
 --- vpnc-0.4.0/vpnc.c.cloexec	2007-02-19 21:49:51.000000000 +0100
 +++ vpnc-0.4.0/vpnc.c	2007-02-22 10:49:46.000000000 +0100
-@@ -96,6 +96,8 @@
- 	if (sock < 0)
- 		error(1, errno, "making socket");
- 
-+	fcntl(sock, F_SETFD, FD_CLOEXEC);
-+
- 	/* give the socket a name */
- 	name.sin_family = AF_INET;
- 	name.sin_addr = s->opt_src_ip;
-@@ -2246,6 +2248,8 @@
+@@ -2246,6 +2246,8 @@
  			if (s->esp_fd == -1) {
  				error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)");
  			}


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
+++ vpnc.spec	20 Sep 2007 19:48:41 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           vpnc
-Version:        0.4.0
-Release:        4%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,10 +13,7 @@
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
-Patch0:         vpnc-0.4.0-pie.patch
-Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.4.0-cloexec.patch
-Patch3:		vpnc-0.4.0-sizeofbug.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,18 +38,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .pie
-%patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
-%patch3 -p1 -b .sizeofbug
 
 %build
-make PREFIX=/usr
+CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
 rm -f $RPM_BUILD_ROOT%{_bindir}/pcf2vpnc
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcf2vpnc.1
 chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/vpnc.8
 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
 mkdir -p $RPM_BUILD_ROOT%{_var}/run/vpnc
@@ -78,14 +73,16 @@
 
 %files
 %defattr(-,root,root)
-%doc README COPYING pcf2vpnc
+%doc README COPYING pcf2vpnc pcf2vpnc.1
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
 %{_sbindir}/vpnc
+%{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
-%{_mandir}/man8/*
+%{_mandir}/man8/vpnc.*
+%{_mandir}/man1/cisco-decrypt.*
 %dir %{_var}/run/vpnc
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/defaultroute
@@ -99,6 +96,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
+- upgrade to latest upstream
+
 * Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
 - fix long standing bug causing problems on x86_64 (#232565) now for real
 


--- vpnc-0.3.3-sbin-path.patch DELETED ---


--- vpnc-0.4.0-pie.patch DELETED ---


--- vpnc-0.4.0-sizeofbug.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 19:50:23 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 20 Sep 2007 15:50:23 -0400
Subject: rpms/vpnc/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709201950.l8KJoNKW030637@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30588

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
- upgrade to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Feb 2007 12:59:05 -0000	1.4
+++ .cvsignore	20 Sep 2007 19:49:50 -0000	1.5
@@ -1,2 +1 @@
-vpnc-0.4.0.tar.gz
-clog
+vpnc-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Feb 2007 12:59:05 -0000	1.4
+++ sources	20 Sep 2007 19:49:50 -0000	1.5
@@ -1 +1 @@
-604807e7dd90fce00a4e2344ee29c76d  vpnc-0.4.0.tar.gz
+7a8e94dbe94f39a4fd89b72e0125f66f  vpnc-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:50:52 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 20 Sep 2007 15:50:52 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.54, 1.55 sources, 1.58,
	1.59 sugar.spec, 1.69, 1.70
Message-ID: <200709201950.l8KJoqAS030686@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30616

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Sep 2007 23:05:41 -0000	1.54
+++ .cvsignore	20 Sep 2007 19:50:20 -0000	1.55
@@ -1 +1 @@
-sugar-0.65-gitb8ce5083b7.tar.bz2
+sugar-0.65-git5a595ea04e.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Sep 2007 17:40:33 -0000	1.58
+++ sources	20 Sep 2007 19:50:20 -0000	1.59
@@ -1 +1 @@
-a34b08643ff76b03dbe26ab98a92f7e7  sugar-0.65-gitb8ce5083b7.tar.bz2
+e63e02780c262429900e947cbfc777a5  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sugar.spec	19 Sep 2007 17:40:33 -0000	1.69
+++ sugar.spec	20 Sep 2007 19:50:20 -0000	1.70
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070919git
-%define commitid b8ce5083b7
+%define alphatag 20070920git
+%define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.54.%{alphatag}b8ce5083b7
+Release: 0.55.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:51:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 15:51:33 -0400
Subject: rpms/gtk2/devel swt-tooltips.patch,NONE,1.1 gtk2.spec,1.257,1.258
Message-ID: <200709201951.l8KJpXEV030760@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30687

Modified Files:
	gtk2.spec 
Added Files:
	swt-tooltips.patch 
Log Message:
fix a tooltips-related eclipse crash


swt-tooltips.patch:

--- NEW FILE swt-tooltips.patch ---
diff -up gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips gtk+-2.12.0/gtk/gtktooltips.c
--- gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips	2007-09-20 15:47:54.000000000 -0400
+++ gtk+-2.12.0/gtk/gtktooltips.c	2007-09-20 15:48:22.000000000 -0400
@@ -229,7 +229,8 @@ gtk_tooltips_set_tip (GtkTooltips *toolt
       return;
     }
   
-  if (tooltips->active_tips_data 
+  if (tooltipsdata &&
+      && tooltips->active_tips_data 
       && tooltips->active_tips_data->widget == widget
       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- gtk2.spec	18 Sep 2007 23:35:30 -0000	1.257
+++ gtk2.spec	20 Sep 2007 19:51:00 -0000	1.258
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -33,6 +33,8 @@
 # fixed in upstream svn
 Patch3: novalidate.patch
 Patch4: libtracker.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=460194
+Patch5: swt-tooltips.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -121,6 +123,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
 %patch4 -p1 -b .libtracker
+%patch5 -p1 -b .swt-tooltips
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -303,6 +306,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-3
+- Fix a problem with swt and tooltips 
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
 - Adapt to tracker ABI changes
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:01 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:01 -0400
Subject: rpms/ntfs-3g/F-7 ntfs-3g.spec,1.18,1.19
Message-ID: <200709201955.l8KJt1U9030935@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/F-7

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	17 Sep 2007 20:07:09 -0000	1.18
+++ ntfs-3g.spec	20 Sep 2007 19:54:28 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:04 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:04 -0400
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.19,1.20
Message-ID: <200709201955.l8KJt4Xc030938@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/FC-6

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ntfs-3g.spec	17 Sep 2007 20:07:12 -0000	1.19
+++ ntfs-3g.spec	20 Sep 2007 19:54:32 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:07 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:07 -0400
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.18,1.19
Message-ID: <200709201955.l8KJt7Xi030941@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/devel

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	17 Sep 2007 20:07:17 -0000	1.18
+++ ntfs-3g.spec	20 Sep 2007 19:54:34 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:59:33 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:59:33 -0400
Subject: rpms/fuse/devel fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.24,1.25
Message-ID: <200709201959.l8KJxXKG031222@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

/dev/fuse should be 0666



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 19:59:00 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fuse.spec	29 Aug 2007 21:24:37 -0000	1.24
+++ fuse.spec	20 Sep 2007 19:59:00 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-6
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Wed Aug 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
 - fix open issue (bz 265321)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:09:47 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 16:09:47 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.19,1.20 sources,1.14,1.15
Message-ID: <200709202009.l8KK9log005142@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5113

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mugshot.spec	11 Sep 2007 20:01:49 -0000	1.19
+++ mugshot.spec	20 Sep 2007 20:09:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.52
-Release:        2%{?dist}
+Version:        1.1.53
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
 - shuffle .sos around (b.r.c 286371)
 - make devel package require dbus-devel





From fedora-extras-commits at redhat.com  Thu Sep 20 20:10:30 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 16:10:30 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.20,1.21
Message-ID: <200709202010.l8KKAUtn005174@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5148

Modified Files:
	mugshot.spec 
Log Message:
bump release


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mugshot.spec	20 Sep 2007 20:09:14 -0000	1.20
+++ mugshot.spec	20 Sep 2007 20:09:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.53
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,7 +224,7 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-2
 - new upstream
 
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2



From fedora-extras-commits at redhat.com  Thu Sep 20 20:14:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 16:14:10 -0400
Subject: rpms/gtk2/devel swt-tooltips.patch,1.1,1.2
Message-ID: <200709202014.l8KKEAfp005407@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5382

Modified Files:
	swt-tooltips.patch 
Log Message:
fix the patch


swt-tooltips.patch:

Index: swt-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/swt-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swt-tooltips.patch	20 Sep 2007 19:51:00 -0000	1.1
+++ swt-tooltips.patch	20 Sep 2007 20:14:07 -0000	1.2
@@ -6,7 +6,7 @@
      }
    
 -  if (tooltips->active_tips_data 
-+  if (tooltipsdata &&
++  if (tooltipsdata
 +      && tooltips->active_tips_data 
        && tooltips->active_tips_data->widget == widget
        && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))



From fedora-extras-commits at redhat.com  Thu Sep 20 20:14:22 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Sep 2007 16:14:22 -0400
Subject: rpms/grub/devel grub-fedora-8.patch,1.2,1.3 grub.spec,1.57,1.58
Message-ID: <200709202014.l8KKEMmF005507@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5324

Modified Files:
	grub-fedora-8.patch grub.spec 
Log Message:
- update to -19


grub-fedora-8.patch:

Index: grub-fedora-8.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-8.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-fedora-8.patch	20 Aug 2007 22:20:19 -0000	1.2
+++ grub-fedora-8.patch	20 Sep 2007 20:14:20 -0000	1.3
@@ -11329,13 +11329,13 @@
  @set VERSION 0.97
 diff --git a/grub.spec b/grub.spec
 new file mode 100644
-index 0000000..fcf767f
+index 0000000..36b39eb
 --- /dev/null
 +++ b/grub.spec
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,416 @@
 +Name: grub
 +Version: 0.97
-+Release: 16
++Release: 17
 +Summary: GRUB - the Grand Unified Boot Loader.
 +Group: System Environment/Base
 +License: GPL
@@ -11414,6 +11414,9 @@
 +%{_datadir}/grub
 +
 +%changelog
++* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-17
++- Fix dmraid detection on Intel (isw) controllers in grub-install .
++
 +* Tue Aug 7 2007 Peter Jones <pjones at redhat.com> - 0.97-16
 +- Add ext[23] large inode support (patch from Eric Sandeen)
 +- Fix auto* breakage that happened when we switched from autoreconf to autoconf
@@ -21595,6 +21598,13 @@
 +#endif /* SUPPORT_GRAPHICS */
 +
  #endif /* ! GRUB_TERM_HEADER */
+diff --git a/test b/test
+new file mode 100644
+index 0000000..b182379
+--- /dev/null
++++ b/test
+@@ -0,0 +1 @@
++fo of fo
 diff --git a/util/Makefile.am b/util/Makefile.am
 index 2e04711..48604d6 100644
 --- a/util/Makefile.am
@@ -21944,7 +21954,7 @@
  # 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.
 diff --git a/util/grub-install.in b/util/grub-install.in
-index 2e598b0..3c6a4f5 100644
+index 2e598b0..5ceb77d 100644
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
 @@ -21,26 +21,28 @@
@@ -21988,7 +21998,7 @@
  
  INSTALL_DEVICE can be a GRUB device name or a system device filename.
  
-@@ -96,17 +100,26 @@ convert () {
+@@ -96,17 +100,28 @@ convert () {
      # Break the device name into the disk part and the partition part.
      case "$host_os" in
      linux*)
@@ -22003,6 +22013,7 @@
 -	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 +				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
++	  -e 's%\(/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 +	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 +		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
@@ -22014,12 +22025,13 @@
 -				  -e 's%.*c[0-7]d[0-9]*p%%'`
 +				  -e 's%.*c[0-7]d[0-9]*p%%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
++	  -e 's%.*/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
 +		grep -v '.*/mapper/.*'`
  	;;
      gnu*)
  	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
-@@ -196,7 +209,7 @@ resolve_symlink () {
+@@ -196,7 +211,7 @@ resolve_symlink () {
  	while test -L $tmp_fname; do
  		tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
  		if test -z "$tmp_new_fname"; then
@@ -22028,7 +22040,7 @@
  			exit 1
  		fi
  
-@@ -211,6 +224,80 @@ resolve_symlink () {
+@@ -211,6 +226,80 @@ resolve_symlink () {
  	echo "$tmp_fname"
  }
  
@@ -22109,7 +22121,7 @@
  # Usage: find_device file
  # Find block device on which the file resides.
  find_device () {
-@@ -219,15 +306,55 @@ find_device () {
+@@ -219,15 +308,55 @@ find_device () {
      tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ 	]*\).*%\1%p'`
  
      if test -z "$tmp_fname"; then
@@ -22168,7 +22180,7 @@
  # Check the arguments.
  for option in "$@"; do
      case "$option" in
-@@ -247,6 +374,8 @@ for option in "$@"; do
+@@ -247,6 +376,8 @@ for option in "$@"; do
  	force_lba="--force-lba" ;;
      --recheck)
  	recheck=yes ;;
@@ -22177,7 +22189,7 @@
      # This is an undocumented feature...
      --debug)
  	debug=yes ;;
-@@ -265,12 +394,6 @@ for option in "$@"; do
+@@ -265,12 +396,6 @@ for option in "$@"; do
      esac
  done
  
@@ -22190,7 +22202,7 @@
  # If the debugging feature is enabled, print commands.
  if test $debug = yes; then
      set -x
-@@ -293,6 +416,26 @@ esac
+@@ -293,6 +418,26 @@ esac
  grubdir=${bootdir}/grub
  device_map=${grubdir}/device.map
  
@@ -22217,7 +22229,7 @@
  # Check if GRUB is installed.
  # This is necessary, because the user can specify "grub --read-only".
  set $grub_shell dummy
-@@ -303,17 +446,17 @@ else
+@@ -303,17 +448,17 @@ else
      exit 1
  fi
  
@@ -22239,7 +22251,7 @@
      exit 1
  fi
  
-@@ -324,9 +467,11 @@ fi
+@@ -324,9 +469,11 @@ fi
  test -d "$bootdir" || mkdir "$bootdir" || exit 1
  test -d "$grubdir" || mkdir "$grubdir" || exit 1
  
@@ -22252,7 +22264,7 @@
  fi
  
  # Create the device map file if it is not present.
-@@ -336,6 +481,10 @@ else
+@@ -336,6 +483,10 @@ else
      # Create a safe temporary file.
      test -n "$mklog" && log_file=`$mklog`
  
@@ -22263,7 +22275,7 @@
      $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
  quit
  EOF
-@@ -351,34 +500,60 @@ fi
+@@ -351,34 +502,60 @@ fi
  tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
      | sort | uniq -d | sed -n 1p`
  if test -n "$tmp"; then
@@ -22334,7 +22346,7 @@
  
  # Check if the boot directory is in the same device as the root directory.
  if test "x$root_device" != "x$bootdir_device"; then
-@@ -387,15 +562,8 @@ if test "x$root_device" != "x$bootdir_device"; then
+@@ -387,15 +564,8 @@ if test "x$root_device" != "x$bootdir_device"; then
      grub_prefix="/grub"
  fi
  
@@ -22352,7 +22364,7 @@
  
  if test "x$grubdir_device" != "x$root_device"; then
      # For now, cannot deal with this situation.
-@@ -406,61 +574,66 @@ EOF
+@@ -406,61 +576,66 @@ EOF
      exit 1
  fi
  


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- grub.spec	22 Aug 2007 14:32:39 -0000	1.57
+++ grub.spec	20 Sep 2007 20:14:20 -0000	1.58
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 18
+Release: 19
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -79,6 +79,9 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-19
+- Fix dmraid detection on Intel (isw) controllers in grub-install .
+
 * Wed Aug 22 2007 Peter Jones <pjones at redhat.com> - 0.97-18
 - Fix license tag.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:36:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:36:59 -0400
Subject: rpms/libICE/devel libICE.spec,1.20,1.21
Message-ID: <200709201936.l8KJaxIw029315@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29212

Modified Files:
	libICE.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
- Update xtrans dep and rebuild.



Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libICE.spec	17 Sep 2007 21:51:23 -0000	1.20
+++ libICE.spec	20 Sep 2007 19:36:26 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:18:43 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 16:18:43 -0400
Subject: rpms/postgresql/devel .cvsignore, 1.36, 1.37 README.rpm-dist, 1.12, 
	1.13 postgresql.spec, 1.83, 1.84 sources, 1.37, 1.38
Message-ID: <200709202018.l8KKIh8g005620@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5592

Modified Files:
	.cvsignore README.rpm-dist postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 20:18:09 -0000	1.37
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
 PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
 postgresql-8.2.1-US.pdf


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/README.rpm-dist,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.rpm-dist	13 Jan 2007 04:30:50 -0000	1.12
+++ README.rpm-dist	20 Sep 2007 20:18:09 -0000	1.13
@@ -218,7 +218,8 @@
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- postgresql.spec	4 Sep 2007 17:26:37 -0000	1.83
+++ postgresql.spec	20 Sep 2007 20:18:09 -0000	1.84
@@ -80,8 +80,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.4
-Release: 6%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -97,8 +97,8 @@
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
 
 Patch1: rpm-pgsql.patch
 Patch3: postgresql-logging.patch
@@ -822,6 +822,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+
 * Tue Sep  4 2007 Tom Lane <tgl at redhat.com> 8.2.4-6
 - Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:21:40 -0000	1.37
+++ sources	20 Sep 2007 20:18:09 -0000	1.38
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847  postgresql-8.2.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
 0c25dc2055e2fa9ff9d05afc9252e1f2  postgresql-8.2.1-US.pdf



From fedora-extras-commits at redhat.com  Thu Sep 20 20:21:49 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 20 Sep 2007 16:21:49 -0400
Subject: rpms/kde-filesystem/F-7 macros.kde4, NONE, 1.1 kde-filesystem.spec, 
	1.2, 1.3
Message-ID: <200709202021.l8KKLn4h005716@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5694/F-7

Modified Files:
	kde-filesystem.spec 
Added Files:
	macros.kde4 
Log Message:
Merge updates from devel (contains directories and macros needed by KDE 4).


--- NEW FILE macros.kde4 ---

# api = 1
# initial try, including only items that vary from defaults

%cmake_kde4 \
  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 ; \
  %{__cmake} \\\
  %if "%{_lib}" == "lib64" \
    -DLIB_SUFFIX=64 \\\
  %endif \
  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
  -DDATA_INSTALL_DIR=%{_kde4_appsdir}


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-7/kde-filesystem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-filesystem.spec	27 Aug 2007 15:57:08 -0000	1.2
+++ kde-filesystem.spec	20 Sep 2007 20:21:17 -0000	1.3
@@ -1,23 +1,41 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/kde4/apps
+%define _kde4_docdir %_kde4_prefix/share/doc
+%define _kde4_bindir %_kde4_prefix/bin
+%define _kde4_sbindir %_kde4_prefix/sbin
+%define _kde4_includedir %_kde4_prefix/include
+%define _kde4_debug RelWithDebInfo
+%define _kde4_macros_api 1
 
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 13%{?dist}
+Name: kde-filesystem
+Version: 3.92
+Release: 9%{?dist}
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Consider -- Rex
-#Provides: kde3-filesystem = %{version}-%{release}
-
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
 
+Source2: macros.kde4
+# increment whenever dirs change in an incompatible way
+# kde4 apps built using macros.kde4 should
+# Requires: kde4-macros(api) = %{_kde4_macros_api}
+Provides: kde4-macros(api) = %{_kde4_macros_api} 
+
 BuildRequires: gawk
 
 Requires:  filesystem
+Requires:  rpm
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -33,6 +51,7 @@
 rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
+## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
@@ -46,13 +65,72 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+## KDE4
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
+      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
+
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+# rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/kde4/apps
+%%_kde4_docdir %_kde4_prefix/share/doc
+%%_kde4_bindir %%_kde4_prefix/bin
+%%_kde4_sbindir %%_kde4_prefix/sbin
+%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_debug RelWithDebInfo
+%%_kde4_macros_api 1
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+
+# KDE3
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -71,22 +149,59 @@
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
+# KDE4
+%config /etc/rpm/macros.kde4
+%{_kde4_sysconfdir}/kde4/
+%{_kde4_libdir}
+%{_kde4_datadir}/applications/kde4/
+%{_kde4_appsdir}/
+%{_kde4_configdir}/
+%{_kde4_sharedir}/config.kcfg/
+%{_kde4_sharedir}/desktop-directories/
+%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/icons/locolor
+%{_kde4_sharedir}/services/
+%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/templates/
+%{_kde4_datadir}/wallpapers/
+%{_kde4_datadir}/sounds/
+%dir %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
+
 
 %changelog
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-13
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
-
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-12
 - - %%_prefix/{env,shutdown} (non-FHS)
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-11
-- fix templates.source typo
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
+- kde4-macros(api), %%_kde4_macros_api
+
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
+- use macros
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-4
+- fix kde4 macro
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-3
+- cleanup macros.kde4 (mostly use _kde4_ prefix)
+- Requires: rpm
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 3.92-2
+- add missing macros.kde4
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-10
-- +disttag
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
 
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
-- +%%_datadir/{sounds,templates,source,wallpapers}
+- +%%_datadir/{sounds,templates/.source,wallpapers}
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-8
 - +%%_datadir/{autostart,emoticons,mimelnk/*}



From fedora-extras-commits at redhat.com  Thu Sep 20 20:26:43 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 16:26:43 -0400
Subject: rpms/gnash/devel gnash.spec,1.11,1.12
Message-ID: <200709202026.l8KKQhTJ005900@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5881

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
- info files are empty, don't install them



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnash.spec	20 Sep 2007 13:18:20 -0000	1.11
+++ gnash.spec	20 Sep 2007 20:26:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -113,9 +113,9 @@
  $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
-# asspec info isn't generated rightly
-rm \
- $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# info isn't generated rightly
+rm -rf \
+ $RPM_BUILD_ROOT%{_infodir}/
 # omf/scrollkeeper related files are broken, some files are missing, and
 # omf files are wrong
 rm -rf \
@@ -136,16 +136,16 @@
 /sbin/ldconfig
 #scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 # the info is empty, but doesn't hurt
-/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+#if [ $1 = 0 ]; then
+    #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
-fi
+#fi
 
 %postun
 /sbin/ldconfig
@@ -164,7 +164,7 @@
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
-%{_infodir}/gnash*
+#%{_infodir}/gnash*
 %{_datadir}/gnash/
 #%{_datadir}/omf/gnash/
 
@@ -185,6 +185,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
+- info files are empty, don't install them
+
 * Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
 - omf/scrollkeeper doc is broken, remove it
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:28:32 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:28:32 -0400
Subject: rpms/fuse/F-7 fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.22,1.23
Message-ID: <200709202028.l8KKSWqi006083@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877/F-7

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

fix fc-6 and f-7



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 20:27:59 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fuse.spec	24 Jul 2007 16:14:56 -0000	1.22
+++ fuse.spec	20 Sep 2007 20:27:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Sun Jul 22 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
 - put pkgconfig file in correct place
 - enable compat symlinks for files in /bin



From fedora-extras-commits at redhat.com  Thu Sep 20 20:28:35 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:28:35 -0400
Subject: rpms/fuse/FC-6 fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.22,1.23
Message-ID: <200709202028.l8KKSZVF006088@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877/FC-6

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

fix fc-6 and f-7



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 20:28:02 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fuse.spec	24 Jul 2007 16:14:59 -0000	1.22
+++ fuse.spec	20 Sep 2007 20:28:02 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Sun Jul 22 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
 - put pkgconfig file in correct place
 - enable compat symlinks for files in /bin



From fedora-extras-commits at redhat.com  Thu Sep 20 20:30:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Thu, 20 Sep 2007 16:30:32 -0400
Subject: rpms/compiz/devel compiz.spec,1.102,1.103
Message-ID: <200709202030.l8KKUW4x006233@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6175

Modified Files:
	compiz.spec 
Log Message:
* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
- Update to more recent 0.6 branch snapshot (fixes #253575).



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- compiz.spec	14 Sep 2007 18:47:59 -0000	1.102
+++ compiz.spec	20 Sep 2007 20:29:59 -0000	1.103
@@ -1,4 +1,4 @@
-%define		snapshot	0ec3ec
+%define		snapshot	6b86f3
 %define		dialogversion	0.7.7
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        11.%{snapshot}%{?dist}
+Release:        12.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,8 +51,6 @@
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
-Patch110: run-command-key.patch
-Patch111: more-sm-junk.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -116,8 +114,7 @@
 %else
 %patch106 -p1 -b .redhat-logo
 %endif
-%patch110 -p1 -b .run-command-key
-%patch111 -p1 -b .more-sm-junk
+
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -273,6 +270,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
+- Update to more recent 0.6 branch snapshot (fixes #253575).
+
 * Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-11
 - compiz-gnome: install core schema so it actually works
 - remove unnecessary gconf stuff from %%install



From fedora-extras-commits at redhat.com  Thu Sep 20 20:33:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Thu, 20 Sep 2007 16:33:54 -0400
Subject: rpms/compiz/devel .cvsignore,1.27,1.28 sources,1.29,1.30
Message-ID: <200709202033.l8KKXs8F006519@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
- Update to more recent 0.6 branch snapshot (fixes #253575).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 Aug 2007 22:22:19 -0000	1.27
+++ .cvsignore	20 Sep 2007 20:33:22 -0000	1.28
@@ -1,2 +1,2 @@
-compiz-0ec3ec.tar.gz
+compiz-6b86f3.tar.gz
 desktop-effects-0.7.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	22 Aug 2007 22:22:19 -0000	1.29
+++ sources	20 Sep 2007 20:33:22 -0000	1.30
@@ -1,2 +1,2 @@
-cfcf5f3d4a3f8dc4363f570ea326a7e3  compiz-0ec3ec.tar.gz
+f70d2f14b2c1a45af50e2b6f1baeb664  compiz-6b86f3.tar.gz
 f6b22bbc1f202b47e71baeda25935f40  desktop-effects-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 20:37:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 20 Sep 2007 16:37:04 -0400
Subject: rpms/kdegames/F-7 kdegames-3.5.7-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.59, 1.60
Message-ID: <200709202037.l8KKb4Wq006656@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.5.7-trademarks.patch 
Log Message:
bz248343, removes the Tron and Sokoban trademarks, thanks to  Kevin Kofler



kdegames-3.5.7-trademarks.patch:

--- NEW FILE kdegames-3.5.7-trademarks.patch ---
diff -ur kdegames-3.5.7/doc/katomic/index.docbook kdegames-3.5.7-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.7/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.7-trademarks/doc/katomic/index.docbook	2007-08-04 23:55:07.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.7/doc/ksokoban/index.docbook kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.7/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook	2007-08-08 07:05:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.7/doc/ktron/index.docbook kdegames-3.5.7-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.7/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ktron/index.docbook	2007-08-08 07:10:58.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.7/katomic/katomic.desktop kdegames-3.5.7-trademarks/katomic/katomic.desktop
--- kdegames-3.5.7/katomic/katomic.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/katomic/katomic.desktop	2007-08-08 07:05:47.000000000 +0200
@@ -21,50 +21,50 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
-GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
-GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
+GenericName[ja]=BoxPush???????????????????????????
+GenericName[km]=?????????????????????????????????????????? BoxPush
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
+GenericName[mk]=?????????????? ???????? ???????????? ???? BoxPush
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
-GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[uk]=?????? ???? ???????????? ?????????????? ???? BoxPush??
+GenericName[zh_TW]=BoxPush??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.7/ksokoban/AUTHORS kdegames-3.5.7-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.7/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/AUTHORS	2007-08-08 07:04:20.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/Bookmark.cpp kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.7/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Bookmark.h kdegames-3.5.7-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.7/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/data/ksokoban.desktop kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.7/ksokoban/data/ksokoban.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop	2007-08-04 23:59:14.000000000 +0200
@@ -1,65 +1,65 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=BoxPush
 Name[bn]=??????-?????????????????????
-Name[eo]=Sokobano
+Name[eo]=BoxPusho
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=??BoxPush
+Name[nb]=BoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
+Name[pl]=BoxPush
+Name[sv]=KBoxPush
 Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush BoxPush
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
-GenericName[ja]=??????????????????
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
+GenericName[ja]=BoxPush?????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
-GenericName[zh_TW]=???????????????
+GenericName[uk]=?????? BoxPush
+GenericName[zh_TW]=BoxPush??????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
 Icon=ksokoban
diff -ur kdegames-3.5.7/ksokoban/History.cpp kdegames-3.5.7-trademarks/ksokoban/History.cpp
--- kdegames-3.5.7/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/History.h kdegames-3.5.7-trademarks/ksokoban/History.h
--- kdegames-3.5.7/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/HtmlPrinter.cpp kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.7/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp	2007-08-08 07:06:42.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.7/ksokoban/ImageData.cpp kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.7/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ImageData.h kdegames-3.5.7-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.7/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/InternalCollections.h kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.7/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelCollection.h kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.7/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.cpp kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.7/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.h kdegames-3.5.7-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.7/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/main.cpp kdegames-3.5.7-trademarks/ksokoban/main.cpp
--- kdegames-3.5.7/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/main.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.7/ksokoban/MainWindow.cpp kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.7/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MainWindow.h kdegames-3.5.7-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.7/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.cpp kdegames-3.5.7-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.7/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.cpp kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.7/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.h kdegames-3.5.7-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.7/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.h kdegames-3.5.7-trademarks/ksokoban/Map.h
--- kdegames-3.5.7/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.cpp kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.7/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.h kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.7/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.cpp kdegames-3.5.7-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.7/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.h kdegames-3.5.7-trademarks/ksokoban/Move.h
--- kdegames-3.5.7/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.cpp kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.7/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.h kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.7/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/NEWS kdegames-3.5.7-trademarks/ksokoban/NEWS
--- kdegames-3.5.7/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/NEWS	2007-08-08 07:07:06.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.7/ksokoban/PathFinder.cpp kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.7/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PathFinder.h kdegames-3.5.7-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.7/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.cpp kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.7/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.h kdegames-3.5.7-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.7/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Queue.h kdegames-3.5.7-trademarks/ksokoban/Queue.h
--- kdegames-3.5.7/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Queue.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/README kdegames-3.5.7-trademarks/ksokoban/README
--- kdegames-3.5.7/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/README	2007-08-08 07:07:25.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/StaticImage.cpp kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.7/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/StaticImage.h kdegames-3.5.7-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.7/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ktron/ktron.cpp kdegames-3.5.7-trademarks/ktron/ktron.cpp
--- kdegames-3.5.7/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.7/ktron/ktron.desktop kdegames-3.5.7-trademarks/ktron/ktron.desktop
--- kdegames-3.5.7/ktron/ktron.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.desktop	2007-08-08 07:14:16.000000000 +0200
@@ -4,64 +4,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=SnakeDuel
 Name[bn]=??????-????????????
-Name[eo]=Trono
+Name[eo]=SnakeDuelo
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=SnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.7/ktron/ktron.h kdegames-3.5.7-trademarks/ktron/ktron.h
--- kdegames-3.5.7/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.7/ktron/main.cpp kdegames-3.5.7-trademarks/ktron/main.cpp
--- kdegames-3.5.7/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/main.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.7/ktron/player.cpp kdegames-3.5.7-trademarks/ktron/player.cpp
--- kdegames-3.5.7/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/player.h kdegames-3.5.7-trademarks/ktron/player.h
--- kdegames-3.5.7/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/README kdegames-3.5.7-trademarks/ktron/README
--- kdegames-3.5.7/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/README	2007-08-08 07:13:57.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel 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 any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel 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.
diff -ur kdegames-3.5.7/ktron/TODO kdegames-3.5.7-trademarks/ktron/TODO
--- kdegames-3.5.7/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/TODO	2007-08-04 06:51:21.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.7/ktron/tron.cpp kdegames-3.5.7-trademarks/ktron/tron.cpp
--- kdegames-3.5.7/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.7/ktron/tron.h kdegames-3.5.7-trademarks/ktron/tron.h
--- kdegames-3.5.7/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.7/README kdegames-3.5.7-trademarks/README
--- kdegames-3.5.7/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.7-trademarks/README	2007-08-08 07:08:20.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-7/kdegames.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdegames.spec	11 Jun 2007 18:42:00 -0000	1.59
+++ kdegames.spec	20 Sep 2007 20:36:32 -0000	1.60
@@ -1,30 +1,23 @@
-%define rhel 0
-
 %define debug 0
 %define final 0
 %define make_cvs 0
 
-%if %{rhel}
-%define patch_name -patched
-%else
-%define patch_name %{nil}
-%endif
-
 %define kdelibs_epoch 6
 
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
 Version: 3.5.7
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 
 License: GPL
 Group:   Amusements/Games
 Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
+Patch1: kdegames-3.5.7-trademarks.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -56,9 +49,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .konquest
+%patch1 -p1 -b .trademarks
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -163,6 +157,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 <than at redhat.com> - 6:3.5.7-1.1.fc7 3.5.7-1.1
+- bz248343, removes the Tron and Sokoban trademarks, thanks to  Kevin Kofler
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1
 - 3.5.7
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:41 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:41 -0400
Subject: rpms/QuantLib/F-7 QuantLib.spec,1.19,1.20
Message-ID: <200709202040.l8KKef0h006977@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/F-7

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/F-7/QuantLib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- QuantLib.spec	20 Jul 2007 21:16:28 -0000	1.19
+++ QuantLib.spec	20 Sep 2007 20:40:07 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,15 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
+- rebuild for BuildID
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1.1
+- rebuild for new boost in rawhide
+
 * Tue Jul 10 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1
 - bump to 0.8.1
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:44 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:44 -0400
Subject: rpms/QuantLib/FC-6 QuantLib.spec,1.19,1.20
Message-ID: <200709202040.l8KKeiVt006980@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/FC-6

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/FC-6/QuantLib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- QuantLib.spec	20 Jul 2007 21:16:30 -0000	1.19
+++ QuantLib.spec	20 Sep 2007 20:40:12 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,15 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
+- rebuild for BuildID
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1.1
+- rebuild for new boost in rawhide
+
 * Tue Jul 10 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1
 - bump to 0.8.1
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:49 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:49 -0400
Subject: rpms/QuantLib/devel QuantLib.spec,1.21,1.22
Message-ID: <200709202040.l8KKenfa006986@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/devel

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- QuantLib.spec	26 Aug 2007 22:42:19 -0000	1.21
+++ QuantLib.spec	20 Sep 2007 20:40:15 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,9 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
 - rebuild for BuildID
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:41:53 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 16:41:53 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.64,1.65
Message-ID: <200709202041.l8KKfrrA007285@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7257

Modified Files:
	policy-20070703.patch 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install
- Allow mono, java, wine to run in userdomains


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- policy-20070703.patch	20 Sep 2007 17:21:13 -0000	1.64
+++ policy-20070703.patch	20 Sep 2007 20:41:50 -0000	1.65
@@ -5184,7 +5184,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 12:01:41.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 15:31:09.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5206,6 +5206,15 @@
  	allow $1_dbusd_t self:file { getattr read write };
  	allow $1_dbusd_t self:fifo_file rw_fifo_file_perms;
  	allow $1_dbusd_t self:dbus { send_msg acquire_svc };
+@@ -86,7 +93,7 @@
+ 	# SE-DBus specific permissions
+ 	allow $1_dbusd_$1_t { $1_dbusd_t self }:dbus send_msg;
+ 	allow $2 $1_dbusd_t:dbus { send_msg acquire_svc };
+-	allow $1_t system_dbusd_t:dbus { send_msg acquire_svc };
++	allow $2 system_dbusd_t:dbus { send_msg acquire_svc };
+ 
+ 	allow $1_dbusd_t dbusd_etc_t:dir list_dir_perms;
+ 	read_files_pattern($1_dbusd_t,dbusd_etc_t,dbusd_etc_t)
 @@ -135,7 +142,21 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -5213,12 +5222,12 @@
 +	corecmd_bin_domtrans($1_dbusd_t, $1_t)
 +	allow $1_dbusd_t $1_t:process sigkill;
 +
-+	allow $1_t $1_dbusd_t:fd use;
-+	allow $1_t $1_dbusd_t:fifo_file rw_fifo_file_perms;
-+	allow $1_t $1_dbusd_t:process sigchld;
++	allow $2 $1_dbusd_t:fd use;
++	allow $2 $1_dbusd_t:fifo_file rw_fifo_file_perms;
++	allow $2 $1_dbusd_t:process sigchld;
 +	
 +	ifdef(`hide_broken_symptoms', `
-+		dontaudit $1_t $1_dbusd_t:netlink_selinux_socket { read write };
++		dontaudit $2 $1_dbusd_t:netlink_selinux_socket { read write };
 +	');
 +
 +	userdom_read_user_home_content_files($1, $1_dbusd_t)
@@ -9530,7 +9539,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 12:07:15.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 15:27:25.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9611,7 +9620,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +559,52 @@
+@@ -555,25 +559,53 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9649,6 +9658,7 @@
 +	optional_policy(`
 +		userdom_read_all_users_home_content_files(xdm_t)
 +		userdom_read_all_users_home_content_files(xdm_xserver_t)
++		userdom_rw_user_tmpfs_files($1, xdm_xserver_t)
 +#Compiler is broken so these wont work
 +		gnome_read_user_gnome_config($1, xdm_t)
 +		gnome_read_user_gnome_config($1, xdm_xserver_t)
@@ -9672,7 +9682,7 @@
  	')
  ')
  
-@@ -626,6 +657,24 @@
+@@ -626,6 +658,24 @@
  
  ########################################
  ## <summary>
@@ -9697,7 +9707,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +708,73 @@
+@@ -659,6 +709,73 @@
  
  ########################################
  ## <summary>
@@ -9771,7 +9781,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1043,7 @@
+@@ -927,6 +1044,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9779,7 +9789,7 @@
  ')
  
  ########################################
-@@ -987,6 +1104,37 @@
+@@ -987,6 +1105,37 @@
  
  ########################################
  ## <summary>
@@ -9817,7 +9827,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1284,7 @@
+@@ -1136,7 +1285,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9826,7 +9836,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1473,62 @@
+@@ -1325,3 +1474,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9891,7 +9901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 10:44:00.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 15:44:32.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9951,7 +9961,11 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -271,6 +285,10 @@
+@@ -268,9 +282,14 @@
+ userdom_create_all_users_keys(xdm_t)
+ # for .dmrc
+ userdom_read_unpriv_users_home_content_files(xdm_t)
++
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -9962,7 +9976,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +324,11 @@
+@@ -306,6 +325,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -9974,7 +9988,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +371,8 @@
+@@ -348,12 +372,8 @@
  ')
  
  optional_policy(`
@@ -9988,7 +10002,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +404,7 @@
+@@ -385,7 +405,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9997,7 +10011,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +444,10 @@
+@@ -425,6 +445,10 @@
  ')
  
  optional_policy(`
@@ -10008,7 +10022,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +457,19 @@
+@@ -434,47 +458,19 @@
  ')
  
  optional_policy(`
@@ -10109,7 +10123,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 11:14:45.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 16:27:52.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10140,7 +10154,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,24 @@
+@@ -176,11 +177,23 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10150,7 +10164,6 @@
 +
 +	auth_keyring_domain($1)
 +	allow $1 keyring_type:key { search link };
-+	auth_domtrans_chk_passwd($1)
 +
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
@@ -10165,7 +10178,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +210,33 @@
+@@ -196,22 +209,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10200,7 +10213,7 @@
  	')
  ')
  
-@@ -309,9 +334,6 @@
+@@ -309,9 +333,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10210,7 +10223,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +351,7 @@
+@@ -329,6 +350,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10218,7 +10231,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +370,37 @@
+@@ -347,6 +369,37 @@
  
  ########################################
  ## <summary>
@@ -10256,7 +10269,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +749,24 @@
+@@ -695,6 +748,24 @@
  
  ########################################
  ## <summary>
@@ -10281,7 +10294,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1390,9 @@
+@@ -1318,14 +1389,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10296,7 +10309,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1448,163 @@
+@@ -1381,3 +1447,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -11327,8 +11340,8 @@
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.8/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/logging.if	2007-09-17 16:20:18.000000000 -0400
-@@ -33,8 +33,13 @@
++++ serefpolicy-3.0.8/policy/modules/system/logging.if	2007-09-20 15:21:10.000000000 -0400
+@@ -33,8 +33,27 @@
  ## </param>
  #
  interface(`logging_send_audit_msgs',`
@@ -11340,10 +11353,24 @@
  	allow $1 self:capability audit_write;
 -	allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +	allow $1 self:netlink_audit_socket { r_netlink_socket_perms nlmsg_relay };
++')
++
++#######################################
++## <summary>
++##	dontaudit attempts to send audit messages.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`logging_dontaudit_send_audit_msgs',`
++	dontaudit $1 self:netlink_audit_socket { r_netlink_socket_perms nlmsg_relay };
  ')
  
  ########################################
-@@ -238,6 +243,63 @@
+@@ -238,6 +257,63 @@
  
  ########################################
  ## <summary>
@@ -11407,7 +11434,7 @@
  ##	Create an object in the log directory, with a private
  ##	type using a type transition.
  ## </summary>
-@@ -470,7 +532,7 @@
+@@ -470,7 +546,7 @@
  
  	files_search_var($1)
  	allow $1 var_log_t:dir list_dir_perms;
@@ -11416,7 +11443,7 @@
  ')
  
  ########################################
-@@ -514,6 +576,8 @@
+@@ -514,6 +590,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
  	read_lnk_files_pattern($1,logfile,logfile)
@@ -11425,7 +11452,7 @@
  ')
  
  ########################################
-@@ -597,3 +661,258 @@
+@@ -597,3 +675,258 @@
  	files_search_var($1)
  	manage_files_pattern($1,var_log_t,var_log_t)
  ')
@@ -13219,16 +13246,16 @@
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.0.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.fc	2007-09-17 16:20:18.000000000 -0400
-@@ -1,4 +1,5 @@
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.fc	2007-09-20 15:47:36.000000000 -0400
+@@ -1,4 +1,4 @@
  HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
  HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
- 
+-
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 12:06:52.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 15:46:46.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14121,7 +14148,19 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1894,10 +1979,46 @@
+@@ -1642,9 +1727,11 @@
+ template(`userdom_user_home_content',`
+ 	gen_require(`
+ 		attribute $1_file_type;
++		attribute user_home_type;
+ 	')
+ 
+ 	typeattribute $2 $1_file_type;
++	typeattribute $2 user_home_type;
+ 	files_type($2)
+ ')
+ 
+@@ -1894,10 +1981,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14169,7 +14208,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3199,7 @@
+@@ -3078,7 +3201,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14178,7 +14217,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4736,24 @@
+@@ -4615,6 +4738,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14203,7 +14242,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4772,14 @@
+@@ -4633,6 +4774,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14218,7 +14257,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5470,7 @@
+@@ -5323,7 +5472,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14227,7 +14266,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5706,375 @@
+@@ -5559,3 +5708,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14417,13 +14456,14 @@
 +# Should be optional but policy will not build because of compiler problems
 +# Must be before xwindows calls
 +#optional_policy(`
-+	gnome_per_role_template($1, $1_t, $1_r)
-+	gnome_exec_gconf($1_t)
++	gnome_per_role_template($1, $1_usertype, $1_r)
++	gnome_exec_gconf($1_usertype)
 +#')
 +
 +userdom_xwindows_client_template($1)
 +
 +logging_send_syslog_msg($1_usertype)
++logging_dontaudit_send_audit_msgs($1_usertype)
 +
 +optional_policy(`
 +	alsa_read_rw_config($1_usertype)
@@ -14448,7 +14488,7 @@
 +')
 +
 +optional_policy(`
-+	consolekit_dontaudit_dbus_chat($1_usertype)
++	consolekit_dbus_chat($1_usertype)
 +')
 +
 +optional_policy(`



From fedora-extras-commits at redhat.com  Thu Sep 20 20:46:25 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 20 Sep 2007 16:46:25 -0400
Subject: rpms/kdegames/devel kdegames-3.5.7-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.61, 1.62
Message-ID: <200709202046.l8KKkPbB007918@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7891

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.5.7-trademarks.patch 
Log Message:
bz248343, remove the Tron and Sokoban trademarks, thanks to Kevin Kofler


kdegames-3.5.7-trademarks.patch:

--- NEW FILE kdegames-3.5.7-trademarks.patch ---
diff -ur kdegames-3.5.7/doc/katomic/index.docbook kdegames-3.5.7-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.7/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.7-trademarks/doc/katomic/index.docbook	2007-08-04 23:55:07.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.7/doc/ksokoban/index.docbook kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.7/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook	2007-08-08 07:05:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.7/doc/ktron/index.docbook kdegames-3.5.7-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.7/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ktron/index.docbook	2007-08-08 07:10:58.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.7/katomic/katomic.desktop kdegames-3.5.7-trademarks/katomic/katomic.desktop
--- kdegames-3.5.7/katomic/katomic.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/katomic/katomic.desktop	2007-08-08 07:05:47.000000000 +0200
@@ -21,50 +21,50 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
-GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
-GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
+GenericName[ja]=BoxPush???????????????????????????
+GenericName[km]=?????????????????????????????????????????? BoxPush
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
+GenericName[mk]=?????????????? ???????? ???????????? ???? BoxPush
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
-GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[uk]=?????? ???? ???????????? ?????????????? ???? BoxPush??
+GenericName[zh_TW]=BoxPush??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.7/ksokoban/AUTHORS kdegames-3.5.7-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.7/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/AUTHORS	2007-08-08 07:04:20.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/Bookmark.cpp kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.7/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Bookmark.h kdegames-3.5.7-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.7/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/data/ksokoban.desktop kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.7/ksokoban/data/ksokoban.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop	2007-08-04 23:59:14.000000000 +0200
@@ -1,65 +1,65 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=BoxPush
 Name[bn]=??????-?????????????????????
-Name[eo]=Sokobano
+Name[eo]=BoxPusho
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=??BoxPush
+Name[nb]=BoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
+Name[pl]=BoxPush
+Name[sv]=KBoxPush
 Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush BoxPush
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
-GenericName[ja]=??????????????????
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
+GenericName[ja]=BoxPush?????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
-GenericName[zh_TW]=???????????????
+GenericName[uk]=?????? BoxPush
+GenericName[zh_TW]=BoxPush??????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
 Icon=ksokoban
diff -ur kdegames-3.5.7/ksokoban/History.cpp kdegames-3.5.7-trademarks/ksokoban/History.cpp
--- kdegames-3.5.7/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/History.h kdegames-3.5.7-trademarks/ksokoban/History.h
--- kdegames-3.5.7/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/HtmlPrinter.cpp kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.7/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp	2007-08-08 07:06:42.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.7/ksokoban/ImageData.cpp kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.7/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ImageData.h kdegames-3.5.7-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.7/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/InternalCollections.h kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.7/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelCollection.h kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.7/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.cpp kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.7/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.h kdegames-3.5.7-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.7/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/main.cpp kdegames-3.5.7-trademarks/ksokoban/main.cpp
--- kdegames-3.5.7/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/main.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.7/ksokoban/MainWindow.cpp kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.7/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MainWindow.h kdegames-3.5.7-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.7/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.cpp kdegames-3.5.7-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.7/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.cpp kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.7/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.h kdegames-3.5.7-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.7/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.h kdegames-3.5.7-trademarks/ksokoban/Map.h
--- kdegames-3.5.7/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.cpp kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.7/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.h kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.7/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.cpp kdegames-3.5.7-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.7/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.h kdegames-3.5.7-trademarks/ksokoban/Move.h
--- kdegames-3.5.7/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.cpp kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.7/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.h kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.7/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/NEWS kdegames-3.5.7-trademarks/ksokoban/NEWS
--- kdegames-3.5.7/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/NEWS	2007-08-08 07:07:06.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.7/ksokoban/PathFinder.cpp kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.7/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PathFinder.h kdegames-3.5.7-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.7/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.cpp kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.7/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.h kdegames-3.5.7-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.7/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Queue.h kdegames-3.5.7-trademarks/ksokoban/Queue.h
--- kdegames-3.5.7/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Queue.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/README kdegames-3.5.7-trademarks/ksokoban/README
--- kdegames-3.5.7/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/README	2007-08-08 07:07:25.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/StaticImage.cpp kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.7/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/StaticImage.h kdegames-3.5.7-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.7/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ktron/ktron.cpp kdegames-3.5.7-trademarks/ktron/ktron.cpp
--- kdegames-3.5.7/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.7/ktron/ktron.desktop kdegames-3.5.7-trademarks/ktron/ktron.desktop
--- kdegames-3.5.7/ktron/ktron.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.desktop	2007-08-08 07:14:16.000000000 +0200
@@ -4,64 +4,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=SnakeDuel
 Name[bn]=??????-????????????
-Name[eo]=Trono
+Name[eo]=SnakeDuelo
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=SnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.7/ktron/ktron.h kdegames-3.5.7-trademarks/ktron/ktron.h
--- kdegames-3.5.7/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.7/ktron/main.cpp kdegames-3.5.7-trademarks/ktron/main.cpp
--- kdegames-3.5.7/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/main.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.7/ktron/player.cpp kdegames-3.5.7-trademarks/ktron/player.cpp
--- kdegames-3.5.7/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/player.h kdegames-3.5.7-trademarks/ktron/player.h
--- kdegames-3.5.7/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/README kdegames-3.5.7-trademarks/ktron/README
--- kdegames-3.5.7/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/README	2007-08-08 07:13:57.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel 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 any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel 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.
diff -ur kdegames-3.5.7/ktron/TODO kdegames-3.5.7-trademarks/ktron/TODO
--- kdegames-3.5.7/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/TODO	2007-08-04 06:51:21.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.7/ktron/tron.cpp kdegames-3.5.7-trademarks/ktron/tron.cpp
--- kdegames-3.5.7/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.7/ktron/tron.h kdegames-3.5.7-trademarks/ktron/tron.h
--- kdegames-3.5.7/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.7/README kdegames-3.5.7-trademarks/README
--- kdegames-3.5.7/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.7-trademarks/README	2007-08-08 07:08:20.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdegames.spec	20 Aug 2007 20:00:27 -0000	1.61
+++ kdegames.spec	20 Sep 2007 20:45:52 -0000	1.62
@@ -3,25 +3,20 @@
 %define final 0
 %define make_cvs 0
 
-%if 0%{?rhel} > 1
-%define patch_name -patched
-%else
-%define patch_name %{nil}
-%endif
-
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
 Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
+Patch1: kdegames-3.5.7-trademarks.patch
 
 Provides: kdegames3 = %{version}-%{release}
 
@@ -54,9 +49,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .konquest
+%patch1 -p1 -b .trademarks
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -163,6 +159,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Than Ngo <than at redhat.com> 3.5.7-4
+- bz248343, remove the Tron and Sokoban trademarks, thanks to Kevin Kofler
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
 - License: GPLv2, libs/devel License: LGPLv2
 - (Build)Requires: kdelibs3(-devel)



From fedora-extras-commits at redhat.com  Thu Sep 20 20:47:31 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 16:47:31 -0400
Subject: rpms/postgresql/F-7 ecpg_config.h, NONE,
	1.1 postgresql-use-zoneinfo.patch, NONE, 1.1 .cvsignore, 1.36,
	1.37 README.rpm-dist, 1.12, 1.13 postgresql.spec, 1.78,
	1.79 sources, 1.37, 1.38
Message-ID: <200709202047.l8KKlVwn008046@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969

Modified Files:
	.cvsignore README.rpm-dist postgresql.spec sources 
Added Files:
	ecpg_config.h postgresql-use-zoneinfo.patch 
Log Message:
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0; sync package with devel head.


--- NEW FILE ecpg_config.h ---
/*
 * Kluge to support multilib installation of both 32- and 64-bit RPMS:
 * we need to arrange that header files that appear in both RPMs are
 * identical.  Hence, this file is architecture-independent and calls
 * in an arch-dependent file that will appear in just one RPM.
 *
 * To avoid breaking arches not explicitly supported by Red Hat, we
 * use this indirection file *only* on known multilib arches.
 *
 * Note: this may well fail if user tries to use gcc's -I- option.
 * But that option is deprecated anyway.
 */
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif

postgresql-use-zoneinfo.patch:

--- NEW FILE postgresql-use-zoneinfo.patch ---
PostgreSQL includes its own copy of the zic timezone database, which is great
for ensuring portable results but not so great from a package maintenance
perspective.  Since the data is in the same format as is provided by the
Linux-standard /usr/share/zoneinfo files, we can avoid having to update
postgresql for timezone updates by just using those files instead.

Note: as of PG 8.3 this patch will be unnecessary; use configure's
--with-system-tzdata switch instead.


diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
--- postgresql-8.2.4.orig/src/timezone/Makefile	2007-03-14 13:38:15.000000000 -0400
+++ postgresql-8.2.4/src/timezone/Makefile	2007-08-25 16:38:53.000000000 -0400
@@ -38,14 +38,12 @@
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
-	./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
 	$(MAKE) -C tznames $@
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(datadir)'
 
 uninstall:
-	rm -rf '$(DESTDIR)$(datadir)/timezone'
 	$(MAKE) -C tznames $@
 
 clean distclean maintainer-clean:
diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
--- postgresql-8.2.4.orig/src/timezone/pgtz.c	2006-11-21 18:11:55.000000000 -0500
+++ postgresql-8.2.4/src/timezone/pgtz.c	2007-08-25 16:42:32.000000000 -0400
@@ -31,9 +31,6 @@
 pg_tz	   *global_timezone = NULL;
 
 
-static char tzdir[MAXPGPATH];
-static bool done_tzdir = false;
-
 static bool scan_directory_ci(const char *dirname,
 							  const char *fname, int fnamelen,
 							  char *canonname, int canonnamelen);
@@ -45,17 +42,10 @@
 /*
  * Return full pathname of timezone data directory
  */
-static char *
+static const char *
 pg_TZDIR(void)
 {
-	if (done_tzdir)
-		return tzdir;
-
-	get_share_path(my_exec_path, tzdir);
-	strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
-
-	done_tzdir = true;
-	return tzdir;
+	return "/usr/share/zoneinfo";
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 20:46:59 -0000	1.37
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
 PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
 postgresql-8.2.1-US.pdf


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/README.rpm-dist,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.rpm-dist	13 Jan 2007 04:30:50 -0000	1.12
+++ README.rpm-dist	20 Sep 2007 20:46:59 -0000	1.13
@@ -218,7 +218,8 @@
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- postgresql.spec	20 Jun 2007 19:46:59 -0000	1.78
+++ postgresql.spec	20 Sep 2007 20:46:59 -0000	1.79
@@ -80,8 +80,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.4
-Release: 2%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -91,13 +91,14 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
 
 Patch1: rpm-pgsql.patch
 Patch3: postgresql-logging.patch
@@ -105,6 +106,7 @@
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
 Patch8: postgresql-prefer-ncurses.patch
+Patch9: postgresql-use-zoneinfo.patch
 
 BuildRequires: perl glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
@@ -342,6 +344,7 @@
 # patch5 is applied later
 %patch6 -p1
 %patch8 -p1
+%patch9 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -482,6 +485,8 @@
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+    install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
     ;;
   *)
     ;;
@@ -602,10 +607,6 @@
 if [ $1 -ge 1 ] ; then
 	/sbin/service postgresql condrestart >/dev/null 2>&1 || :
 fi
-if [ $1 = 0 ] ; then
-	userdel postgres >/dev/null 2>&1 || :
-	groupdel postgres >/dev/null 2>&1 || : 
-fi
 
 %if %plperl
 %post -p /sbin/ldconfig   plperl
@@ -745,7 +746,6 @@
 %{_datadir}/pgsql/postgres.shdescription
 %{_datadir}/pgsql/system_views.sql
 %{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/timezone/
 %{_datadir}/pgsql/timezonesets/
 %{_libdir}/pgsql/plpgsql.so
 %dir %{_datadir}/pgsql
@@ -822,6 +822,14 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+- Use tzdata package's data files instead of private copy, so that
+  postgresql-server need not be turned for routine timezone updates
+- Don't remove postgres user/group during RPM uninstall, per Fedora
+  packaging guidelines
+
 * Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
 - Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
   anymore.  Per upstream bug 3398.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:21:40 -0000	1.37
+++ sources	20 Sep 2007 20:46:59 -0000	1.38
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847  postgresql-8.2.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
 0c25dc2055e2fa9ff9d05afc9252e1f2  postgresql-8.2.1-US.pdf



From fedora-extras-commits at redhat.com  Thu Sep 20 20:50:49 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 20 Sep 2007 16:50:49 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-tooltips.patch, 
	NONE, 1.1 gtk-nodoka-engine-0.6-treeview.patch, NONE,
	1.1 gtk-nodoka-engine.spec, 1.5, 1.6
Message-ID: <200709202050.l8KKonU4008202@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8142

Modified Files:
	gtk-nodoka-engine.spec 
Added Files:
	gtk-nodoka-engine-0.6-tooltips.patch 
	gtk-nodoka-engine-0.6-treeview.patch 
Log Message:


Allow user change of tooltips colors, fix colors in unfocused gtktreeview (rhbz #297271)




gtk-nodoka-engine-0.6-tooltips.patch:

--- NEW FILE gtk-nodoka-engine-0.6-tooltips.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips	2007-08-18 14:32:21.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:31:28.000000000 +0200
@@ -6,7 +6,7 @@
 #
 # Uses the Nodoka theme engine, forked from Murrine theme engine
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF"
+gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color=#F5F5B5\ntooltip_fg_color=#000"
 
 style "fedora-default"
 {
@@ -165,11 +165,13 @@ style "fedora-frame-title" = "fedora-def
 	fg[NORMAL]	= lighter (@fg_color)
 }
 
-style "fedora-tooltips" = "fedora-default"
+style "fedora-tooltips"
 {
 	xthickness	= 4
 	ythickness	= 4
-	bg[NORMAL]	= { 1.0,1.0,0.75 }
+
+	bg[NORMAL]	= @tooltip_bg_color
+	fg[NORMAL]	= @tooltip_fg_color
 }
 
 style "fedora-progressbar" = "fedora-wide-bright"
@@ -234,8 +236,7 @@ widget_class "*.GtkCombo.GtkButton"	styl
 widget_class "*.GtkComboBox.GtkFrame"	style "fedora-wider"
 
 # tooltips stuff
-widget "gtk-tooltips"			style "fedora-tooltips"
-widget "gtk-tooltip"			style "fedora-tooltips"
+widget "gtk-tooltip*"			style "fedora-tooltips"
 
 # treeview stuff
 widget_class "*.GtkTreeView.GtkButton"	style "fedora-tree"

gtk-nodoka-engine-0.6-treeview.patch:

--- NEW FILE gtk-nodoka-engine-0.6-treeview.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-20 22:33:33.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:34:50.000000000 +0200
@@ -49,13 +49,13 @@ style "fedora-default"
 
 	base[NORMAL]			= @base_color
 	base[PRELIGHT]			= shade (0.3967, @base_color)
-	base[ACTIVE]			= shade (0.9437, @bg_color)
+	base[ACTIVE]			= shade (0.65, @selected_fg_color)
 	base[SELECTED]			= @selected_bg_color
 	base[INSENSITIVE]		= shade (0.9437, @bg_color)
 
 	text[NORMAL]			= @text_color
 	text[PRELIGHT]			= @text_color
-	text[ACTIVE]			= @text_color
+	text[ACTIVE]			= @selected_fg_color
 	text[SELECTED]			= @selected_fg_color
 	text[INSENSITIVE]		= darker (@selected_fg_color)
 


Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-nodoka-engine.spec	25 Aug 2007 15:31:27 -0000	1.5
+++ gtk-nodoka-engine.spec	20 Sep 2007 20:50:17 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://fedoraproject.org/wiki/Artwork/NodokaTheme
 Source0:        gtk-nodoka-engine-%{version}.tar.gz
+Patch0:         gtk-nodoka-engine-0.6-tooltips.patch
+Patch1:         gtk-nodoka-engine-0.6-treeview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -19,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tooltips
+%patch1 -p1 -b .treeview
 
 %build
 %configure
@@ -44,6 +48,10 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
+- Add user specified tooltips coloring
+- Fix colours in unfocused GTKTreeView (rhbz #297271)
+
 * Sat Aug 25 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-1
 - new version
   -- first stable



From fedora-extras-commits at redhat.com  Thu Sep 20 20:59:18 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 16:59:18 -0400
Subject: comps comps-f8.xml.in,1.117,1.118
Message-ID: <200709202059.l8KKxIZ3008375@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8355

Modified Files:
	comps-f8.xml.in 
Log Message:

Moved maven out of the Development category, and added it to Java Development




Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- comps-f8.xml.in	20 Sep 2007 00:37:51 -0000	1.117
+++ comps-f8.xml.in	20 Sep 2007 20:58:48 -0000	1.118
@@ -970,7 +970,6 @@
       <packagereq type="optional">mach</packagereq>
       <packagereq type="optional">manedit</packagereq>
       <packagereq type="optional">mantis</packagereq>
-      <packagereq type="optional">maven2</packagereq>
       <packagereq type="optional">mcrypt</packagereq>
       <packagereq type="optional">meld</packagereq>
       <packagereq type="optional">memtest86+</packagereq>
@@ -2291,6 +2290,7 @@
       <packagereq type="default">log4j</packagereq>
       <packagereq type="default">log4j-javadoc</packagereq>
       <packagereq type="default">log4j-manual</packagereq>
+      <packagereq type="default">maven2</packagereq>
       <packagereq type="default">mx4j</packagereq>
       <packagereq type="default">mx4j-javadoc</packagereq>
       <packagereq type="default">mx4j-manual</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 20:59:56 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 20 Sep 2007 16:59:56 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-tooltips.patch,
	1.1, 1.2
Message-ID: <200709202059.l8KKxuTA008428@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8407

Modified Files:
	gtk-nodoka-engine-0.6-tooltips.patch 
Log Message:


Fix a typo in the tooltips patch.




gtk-nodoka-engine-0.6-tooltips.patch:

Index: gtk-nodoka-engine-0.6-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine-0.6-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-nodoka-engine-0.6-tooltips.patch	20 Sep 2007 20:50:17 -0000	1.1
+++ gtk-nodoka-engine-0.6-tooltips.patch	20 Sep 2007 20:59:53 -0000	1.2
@@ -6,7 +6,7 @@
  # Uses the Nodoka theme engine, forked from Murrine theme engine
  
 -gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF"
-+gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color=#F5F5B5\ntooltip_fg_color=#000"
++gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
  
  style "fedora-default"
  {



From fedora-extras-commits at redhat.com  Thu Sep 20 21:12:04 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 17:12:04 -0400
Subject: rpms/postgresql/F-7 postgresql.spec,1.79,1.80
Message-ID: <200709202112.l8KLC4RN014941@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14923

Modified Files:
	postgresql.spec 
Log Message:
Hm, looks like perl BuildRequires change is needed in F7 too.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- postgresql.spec	20 Sep 2007 20:46:59 -0000	1.79
+++ postgresql.spec	20 Sep 2007 21:11:31 -0000	1.80
@@ -108,7 +108,7 @@
 Patch8: postgresql-prefer-ncurses.patch
 Patch9: postgresql-use-zoneinfo.patch
 
-BuildRequires: perl glibc-devel bison flex autoconf
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
 
 %if %python || %plpython
@@ -829,6 +829,7 @@
   postgresql-server need not be turned for routine timezone updates
 - Don't remove postgres user/group during RPM uninstall, per Fedora
   packaging guidelines
+- Recent perl changes in rawhide mean we need a more specific BuildRequires
 
 * Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
 - Fix oversight in postgresql-test makefile: pg_regress isn't a shell script



From fedora-extras-commits at redhat.com  Thu Sep 20 21:17:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 17:17:11 -0400
Subject: rpms/gtk2-engines/devel crux-colors.patch, NONE,
	1.1 gtk2-engines.spec, 1.78, 1.79
Message-ID: <200709202117.l8KLHBah015281@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15226

Modified Files:
	gtk2-engines.spec 
Added Files:
	crux-colors.patch 
Log Message:
fix a typo in the crux gtkrc


crux-colors.patch:

--- NEW FILE crux-colors.patch ---
diff -up gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc.crux-colors gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc
--- gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc.crux-colors	2007-09-20 17:11:39.000000000 -0400
+++ gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc	2007-09-20 17:11:45.000000000 -0400
@@ -29,8 +29,7 @@
 
 # Default style for all widgets to build from
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#c4c6c0\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#75507b\nselected_fg_color:#fff\ntooltip_bg_color:#F
-5F5B5\ntooltip_fg_color:#000"
+gtk_color_scheme = "fg_color:#000\nbg_color:#c4c6c0\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#75507b\nselected_fg_color:#fff\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
 
 
 style "default"


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gtk2-engines.spec	18 Sep 2007 02:58:37 -0000	1.78
+++ gtk2-engines.spec	20 Sep 2007 21:16:38 -0000	1.79
@@ -1,12 +1,14 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://download.gnome.org/sources/gtk-engines/2.12/gtk-engines-%{version}.tar.bz2
 Patch0:		gtk-engines-2.10.2-keep-default-tooltip-color.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478759
+Patch1:		crux-colors.patch
 
 Conflicts:  	gnome-themes < 2.9.0
 Obsoletes:      gnome-theme-clearlooks <= 0.5
@@ -32,6 +34,7 @@
 %prep
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .keep-default-tooltip-color
+%patch1 -p1 -b .crux-colors
 
 %build
 %configure
@@ -68,6 +71,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
+- Fix a typo in the Crux gtkrc
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:35:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 17:35:54 -0400
Subject: rpms/gnash/F-7 gnash.spec,1.7,1.8
Message-ID: <200709202135.l8KLZsCR016208@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16125

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
- info files are empty, don't install them

* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
- omf/scrollkeeper doc is broken, remove it

* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
- better documentation generation




Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/gnash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnash.spec	6 Sep 2007 15:57:50 -0000	1.7
+++ gnash.spec	20 Sep 2007 21:35:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -80,6 +80,18 @@
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
+# texinfo and therefore info generation is broken, still we have the
+# code to regenerate them
+pushd doc/C
+rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
+   actionscript.info actionscript.texi
+make man html info
+pushd asspec
+rm asspec.info asspec.html asspec.texi
+make html info
+popd
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,16 +113,19 @@
  $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
-# asspec info isn't generated rightly
-rm \
- $RPM_BUILD_ROOT%{_infodir}/asspec.info
-# omf was broken
-#rm -rf \
-# $RPM_BUILD_ROOT%{_datadir}/omf
+# info isn't generated rightly
+rm -rf \
+ $RPM_BUILD_ROOT%{_infodir}/
+# omf/scrollkeeper related files are broken, some files are missing, and
+# omf files are wrong
+rm -rf \
+ $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
+# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+
 %find_lang %{name}
 
 %clean
@@ -119,15 +134,18 @@
 
 %post 
 /sbin/ldconfig
-# currently help system is broken
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
-/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+# the info is empty, but doesn't hurt
+#/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
+#if [ $1 = 0 ]; then
+    #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
+#fi
 
 %postun
 /sbin/ldconfig
@@ -136,7 +154,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html 
+%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
 %doc doc/C/images
 %{_bindir}/gtk-gnash
 %{_bindir}/gnash
@@ -146,9 +164,9 @@
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
-%{_infodir}/gnash*
+#%{_infodir}/gnash*
 %{_datadir}/gnash/
-%{_datadir}/omf/gnash/
+#%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -167,6 +185,15 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
+- info files are empty, don't install them
+
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
+- omf/scrollkeeper doc is broken, remove it
+
+* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
+- better documentation generation
+
 * Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
 - agg is now the default renderer



From fedora-extras-commits at redhat.com  Thu Sep 20 21:37:44 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:37:44 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.13, 1.14 mugshot.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <200709202137.l8KLbiuX016420@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16301

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Sep 2007 19:10:36 -0000	1.13
+++ .cvsignore	20 Sep 2007 21:37:11 -0000	1.14
@@ -1 +1 @@
-mugshot-1.1.53.tar.gz
+mugshot-1.1.54.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mugshot.spec	20 Sep 2007 19:10:36 -0000	1.21
+++ mugshot.spec	20 Sep 2007 21:37:11 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.53
+Version:        1.1.54
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Sep 2007 19:10:36 -0000	1.14
+++ sources	20 Sep 2007 21:37:11 -0000	1.15
@@ -1 +1 @@
-8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz
+fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:37:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:37:59 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.21,1.22 sources,1.15,1.16
Message-ID: <200709202137.l8KLbxvq016469@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16364

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mugshot.spec	20 Sep 2007 20:09:57 -0000	1.21
+++ mugshot.spec	20 Sep 2007 21:37:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.53
-Release:        2%{?dist}
+Version:        1.1.54
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,7 +224,10 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-2
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
+- new upstream
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
 - new upstream
 
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Sep 2007 20:09:14 -0000	1.15
+++ sources	20 Sep 2007 21:37:26 -0000	1.16
@@ -1 +1 @@
-8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz
+fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:39:15 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 20 Sep 2007 17:39:15 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-sleazy-fpu-i386.patch, NONE,
	1.1 linux-2.6-xen-sleazy-fpu-x86_64.patch, NONE,
	1.1 kernel-xen.spec, 1.57, 1.58
Message-ID: <200709202139.l8KLdFDm016596@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16354

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-sleazy-fpu-i386.patch 
	linux-2.6-xen-sleazy-fpu-x86_64.patch 
Log Message:
Fix sleazy-fpu on i386 and x86_64 under Xen



linux-2.6-xen-sleazy-fpu-i386.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-i386.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190313016 10800
# Node ID 8792a16b6dd531cad0ed28d9bef86e3e597ea8db
# Parent  35983eae211a531bd50bcd177a9da77d48631e2c
Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/entry-xen.S
--- a/arch/i386/kernel/entry-xen.S	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
@@ -950,7 +950,9 @@ device_available_emulate:
 device_available_emulate:
 #endif
 	preempt_stop(CLBR_ANY)
-	call math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	call __math_state_restore
 	jmp ret_from_exception
 	CFI_ENDPROC
 
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -597,7 +597,9 @@ struct task_struct fastcall * __switch_t
 		mcl->op      = __HYPERVISOR_fpu_taskswitch;
 		mcl->args[0] = 1;
 		mcl++;
-	}
+	} else
+		prev_p->fpu_counter = 0;
+
 #if 0 /* lazy fpu sanity check */
 	else BUG_ON(!(read_cr0() & 8));
 #endif
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1012,17 +1012,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	/* NB. 'clts' is done for us by Xen during virtual trap. */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1041,17 +1041,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	clts();		/* Allow maths ops (or we recurse) */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION

linux-2.6-xen-sleazy-fpu-x86_64.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-x86_64.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190317568 10800
# Node ID ab958de6e67d1b4f6c321cd46d2793d2409b91fd
# Parent  8792a16b6dd531cad0ed28d9bef86e3e597ea8db
x86_64: Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 16:46:08 2007 -0300
@@ -1071,7 +1071,9 @@ END(simd_coprocessor_error)
 END(simd_coprocessor_error)
 
 ENTRY(device_not_available)
-	zeroentry math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	zeroentry __math_state_restore
 END(device_not_available)
 
 	/* runs on exception stack */
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -637,7 +637,8 @@ __switch_to(struct task_struct *prev_p, 
 	if (prev_p->thread_info->status & TS_USEDFPU) {
 		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
 		HYPERVISOR_fpu_taskswitch(1);
-	}
+	} else
+		prev_p->fpu_counter = 0;
 
 	/* 
 	 * Switch the PDA context.
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1064,16 +1064,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-        /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1056,16 +1056,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-	clts();			/* Allow maths ops (or we recurse) */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 void __init trap_init(void)


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kernel-xen.spec	20 Sep 2007 18:18:24 -0000	1.57
+++ kernel-xen.spec	20 Sep 2007 21:38:43 -0000	1.58
@@ -471,6 +471,10 @@
 Patch961: linux-2.6-xen-backwards-time.patch
 Patch962: linux-2.6-xen-irq_vector-uninitialize.patch
 
+# Fix sleazy-FPU implementation
+Patch963: linux-2.6-xen-sleazy-fpu-i386.patch
+Patch964: linux-2.6-xen-sleazy-fpu-x86_64.patch
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -963,6 +967,8 @@
 %patch960 -p1
 %patch961 -p1
 %patch962 -p1
+%patch963 -p1
+%patch964 -p1
 %endif
 
 
@@ -2376,6 +2382,10 @@
 
 %changelog
 * Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
+  programs
+
+* Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add fix for bug #294011 (floating point corruption)
   (changeset 8c24767501ff from Xen 3.1.1)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:42:27 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:42:27 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.33,1.34
Message-ID: <200709202142.l8KLgRHF016731@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/hsqldb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685

Modified Files:
	hsqldb.spec 
Log Message:

- Added %%{?dist} to release, as per Fedora policy




Index: hsqldb.spec
===================================================================
RCS file: /cvs/extras/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hsqldb.spec	31 Aug 2007 18:44:20 -0000	1.33
+++ hsqldb.spec	20 Sep 2007 21:41:55 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.8
-Release:	1jpp.1
+Release:	1jpp.2%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
@@ -267,6 +267,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.8-1jpp.2
+- Added %%{?dist} to release, as per Fedora policy
+
 * Fri Aug 31 2007 Fernando Nasser <fnasser at redhat.com> 1:1.8.0.8-1jpp.1
 - Merge with upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:42:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 17:42:46 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.20.0-default-theme.patch, NONE,
	1.1 gnome-screensaver.spec, 1.164, 1.165
Message-ID: <200709202142.l8KLgk3r016772@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16706

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.20.0-default-theme.patch 
Log Message:
fix default theme


gnome-screensaver-2.20.0-default-theme.patch:

--- NEW FILE gnome-screensaver-2.20.0-default-theme.patch ---
--- gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in.use-floaters-by-default	2006-06-08 16:37:39.000000000 -0400
+++ gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in	2006-07-11 10:15:54.000000000 -0400
@@ -36,7 +36,7 @@
       <applyto>/apps/gnome-screensaver/mode</applyto>
       <owner>gnome-screensaver</owner>
       <type>string</type>
-      <default>blank-only</default>
+      <default>single</default>
       <locale name="C">
         <short>Screensaver theme selection mode</short>
         <long>
@@ -55,7 +55,7 @@
       <owner>gnome-screensaver</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[screensavers-system]</default>
       <locale name="C">
         <short>Screensaver themes</short>
         <long>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-screensaver.spec	18 Sep 2007 03:48:28 -0000	1.164
+++ gnome-screensaver.spec	20 Sep 2007 21:42:12 -0000	1.165
@@ -13,13 +13,13 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
-Patch1: gnome-screensaver-2.15.4-default-theme.patch
+Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Make the default theme setting work 
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:45:07 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 17:45:07 -0400
Subject: rpms/gconfmm26/devel .cvsignore, 1.9, 1.10 gconfmm.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <200709202145.l8KLj7A3016913@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16891

Modified Files:
	.cvsignore gconfmm.spec sources 
Log Message:
Update to new stable 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Mar 2007 14:43:55 -0000	1.9
+++ .cvsignore	20 Sep 2007 21:44:34 -0000	1.10
@@ -1 +1 @@
-gconfmm-2.18.0.tar.bz2
+gconfmm-2.20.0.tar.bz2


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gconfmm.spec	28 Aug 2007 22:22:42 -0000	1.16
+++ gconfmm.spec	20 Sep 2007 21:44:34 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           gconfmm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for GConf2
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable 2.20.0
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow GConf2 version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Mar 2007 14:43:55 -0000	1.9
+++ sources	20 Sep 2007 21:44:34 -0000	1.10
@@ -1 +1 @@
-0771dde14af1443f9ac142010eb3d403  gconfmm-2.18.0.tar.bz2
+24d7e01104394229f28e32a1dc17c819  gconfmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 21:51:29 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:51:29 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.25,
	1.26
Message-ID: <200709202151.l8KLpTPS017261@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17239

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

- Rebuild




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jakarta-commons-dbcp.spec	26 Apr 2007 00:45:37 -0000	1.25
+++ jakarta-commons-dbcp.spec	20 Sep 2007 21:50:56 -0000	1.26
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-dbcp
 Version:        1.2.1
-Release:        10jpp.1%{?dist}
+Release:        10jpp.2%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons DataBase Pooling Package
 License:        Apache Software License 
@@ -350,6 +350,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-10jpp.2
+- Rebuild
+
 * Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-10jpp.1
 - Merger with newest jpp version
 - Fix rpmlint issues



From fedora-extras-commits at redhat.com  Thu Sep 20 21:54:17 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:54:17 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.15, 1.16
Message-ID: <200709202154.l8KLsHxP017365@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jakarta-commons-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17339

Modified Files:
	jakarta-commons-validator.spec 
Log Message:

- Rebuild




Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-validator.spec	21 Aug 2006 19:03:39 -0000	1.15
+++ jakarta-commons-validator.spec	20 Sep 2007 21:53:45 -0000	1.16
@@ -41,7 +41,7 @@
 Summary:        Jakarta Commons Validator
 Name:           jakarta-%{short_name}
 Version:        1.1.4
-Release:        5jpp.1
+Release:        5jpp.2%{?dist}
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -213,6 +213,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-5jpp.2
+- Rebuild
+
 * Fri Aug 18 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-5jpp.1
 - Move rebuild-gcj-db to correct postun section
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:56:45 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:56:45 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.38, 1.39
Message-ID: <200709202156.l8KLujvi017467@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jakarta-commons-logging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17442

Modified Files:
	jakarta-commons-logging.spec 
Log Message:

- Add %%{?dist} to release as per policy




Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jakarta-commons-logging.spec	29 Aug 2007 18:47:04 -0000	1.38
+++ jakarta-commons-logging.spec	20 Sep 2007 21:56:13 -0000	1.39
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        6jpp.3
+Release:        6jpp.4%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -184,6 +184,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-6jpp.4
+- Add %%{?dist} to release as per policy
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.4-6jpp.3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:57:49 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:57:49 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.8, 1.9 online-desktop.spec, 
	1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200709202157.l8KLvnak017573@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17518

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Sep 2007 16:15:35 -0000	1.8
+++ .cvsignore	20 Sep 2007 21:57:17 -0000	1.9
@@ -1 +1 @@
-online-desktop-0.2.14.tar.gz
+online-desktop-0.2.15.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- online-desktop.spec	20 Sep 2007 16:31:03 -0000	1.12
+++ online-desktop.spec	20 Sep 2007 21:57:17 -0000	1.13
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.14
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -98,6 +98,7 @@
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
 %{_libdir}/pidgin/*.so
+%{_datadir}/dbus-1/services/*.service
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitearch}/pyonlinedesktop
@@ -186,6 +187,10 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
+- new upstream
+- dbus service
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
 - new upstream
 - become an arch package since we have binaries


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Sep 2007 16:15:35 -0000	1.8
+++ sources	20 Sep 2007 21:57:17 -0000	1.9
@@ -1 +1 @@
-0e1d8cbbcd931641c5c8dcbe9c4fae64  online-desktop-0.2.14.tar.gz
+97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:58:04 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:58:04 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.6, 1.7 sources, 1.6,
	1.7
Message-ID: <200709202158.l8KLw43N017615@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17545

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- online-desktop.spec	11 Sep 2007 20:03:55 -0000	1.6
+++ online-desktop.spec	20 Sep 2007 21:57:32 -0000	1.7
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.12
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -12,15 +12,19 @@
 #X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
+Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libpurple-devel
 
 %description
 
@@ -74,6 +78,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 
 desktop-file-install --vendor="fedora"                  \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -85,19 +90,22 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/od-*
+%{_bindir}/*
 # not used yet
 %dir %{_datadir}/online-desktop
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
+%{_libdir}/pidgin/*.so
+%{_datadir}/dbus-1/services/*.service
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
-%dir %{python_sitelib}/pyonlinedesktop
-%{python_sitelib}/pyonlinedesktop/*
-%dir %{python_sitelib}/ddm
-%{python_sitelib}/ddm/*
+%dir %{python_sitearch}/pyonlinedesktop
+%{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/ddm
+%{python_sitearch}/ddm/*
+%{python_sitearch}/*.so
 %doc COPYING README
 
 %files flickr
@@ -178,10 +186,23 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+%changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
+- dbus service
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
+- new upstream
+- become an arch package since we have binaries
+- add some brs
+- use pythonsitearch
+
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
+- new upstream
+
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
+- require devilspie
 
-%changelog
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 20:03:55 -0000	1.6
+++ sources	20 Sep 2007 21:57:32 -0000	1.7
@@ -1 +1 @@
-f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz
+97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:59:11 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:59:11 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.20,
	1.21
Message-ID: <200709202159.l8KLxBBp017693@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jakarta-commons-pool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17675

Modified Files:
	jakarta-commons-pool.spec 
Log Message:

- Rebuild




Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-pool.spec	26 Apr 2007 00:51:07 -0000	1.20
+++ jakarta-commons-pool.spec	20 Sep 2007 21:58:38 -0000	1.21
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        9jpp.2%{?dist}
+Release:        9jpp.3%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        Apache Software License
@@ -269,6 +269,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.3-9jpp.3
+- Rebuild
+
 * Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-9jpp.2
 - A couple of minor spec file changes for Fedora review
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:02:00 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:02:00 -0400
Subject: rpms/jdom/devel jdom.spec,1.17,1.18
Message-ID: <200709202202.l8KM20RQ023774@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jdom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752

Modified Files:
	jdom.spec 
Log Message:

- Add %%{?dist} as per policy




Index: jdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jdom.spec	4 Aug 2006 23:36:32 -0000	1.17
+++ jdom.spec	20 Sep 2007 22:01:27 -0000	1.18
@@ -36,7 +36,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        4jpp.1
+Release:        4jpp.2%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.0-4jpp.2
+- Add %%{?dist} as per policy
+
 * Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-4jpp.1
 - Added missing requirements.
 - Remove jaxen requirement, since we don't have it in fc yet.



From fedora-extras-commits at redhat.com  Thu Sep 20 22:03:02 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:03:02 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.19,1.20
Message-ID: <200709202203.l8KM32if023873@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23839

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mercurial.spec	20 Sep 2007 18:58:24 -0000	1.19
+++ mercurial.spec	20 Sep 2007 22:02:29 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:04:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:04:04 -0400
Subject: rpms/jrefactory/devel jrefactory.spec,1.12,1.13
Message-ID: <200709202204.l8KM44rj023995@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jrefactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23921

Modified Files:
	jrefactory.spec 
Log Message:

- Add %%{?dist} as per new policy




Index: jrefactory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jrefactory.spec	10 Aug 2006 22:01:29 -0000	1.12
+++ jrefactory.spec	20 Sep 2007 22:03:31 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:		jrefactory
 Version:	2.8.9
-Release:	6jpp.3
+Release:	6jpp.4%{?dist}
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
@@ -119,6 +119,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp.4
+- Add %%{?dist} as per new policy
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp.3
 - Changed release to match new spec.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:07:05 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:07:05 -0400
Subject: rpms/jsch/devel jsch.spec,1.22,1.23
Message-ID: <200709202207.l8KM75Qf024100@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jsch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24080

Modified Files:
	jsch.spec 
Log Message:

 - Added %%{?dist} as per new policy




Index: jsch.spec
===================================================================
RCS file: /cvs/extras/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jsch.spec	8 Jun 2007 04:35:06 -0000	1.22
+++ jsch.spec	20 Sep 2007 22:06:32 -0000	1.23
@@ -36,7 +36,7 @@
 
 Name:           jsch
 Version:        0.1.31
-Release:        1jpp.1
+Release:        1jpp.2%{?dist}
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:0.1.31-1jpp.2
+- Added %%{?dist} as per new policy
+
 * Tue Jun 5 2007 Ben Konrath <bkonrath at redhat.com> - 0:0.1.31-1jpp.1
 - 0.1.31.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:11:13 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:11:13 -0400
Subject: rpms/junit/devel junit.spec,1.26,1.27
Message-ID: <200709202211.l8KMBDNX024236@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/junit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24209

Modified Files:
	junit.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id




Index: junit.spec
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- junit.spec	12 Feb 2007 23:55:11 -0000	1.26
+++ junit.spec	20 Sep 2007 22:10:41 -0000	1.27
@@ -34,7 +34,7 @@
 
 Name:           junit
 Version:        3.8.2
-Release:        3jpp.1%{?dist}
+Release:        3jpp.2%{?dist}
 Summary:        Java regression test package
 License:        CPL
 Url:            http://www.junit.org/
@@ -163,6 +163,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.2
+- Rebuild for ppc32 execmem issue and new build-id
+
 * Mon Feb 12 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 3.8.2-3jpp.1.fc7
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:14:44 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:14:44 -0400
Subject: rpms/lucene/devel lucene.spec,1.28,1.29
Message-ID: <200709202214.l8KMEiGl024663@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24536

Modified Files:
	lucene.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id




Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- lucene.spec	2 Aug 2007 19:05:03 -0000	1.28
+++ lucene.spec	20 Sep 2007 22:14:11 -0000	1.29
@@ -34,7 +34,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.9.1
-Release:        1jpp.3%{?dist}
+Release:        1jpp.4%{?dist}
 Epoch:          0
 License:        Apache Software License
 URL:            http://lucene.apache.org/
@@ -256,6 +256,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.9.1-1jpp.4
+- Rebuild for ppc32 execmem issue and new build-id
+
 * Thu Aug 02 2007 Ben Konrath <bkonrath at redhat.com> 0:1.9.1-1jpp.3
 - Cleanup packaging of OSGi manifests.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:21:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:21:04 -0400
Subject: rpms/struts/devel struts.spec,1.47,1.48
Message-ID: <200709202221.l8KML4h6024930@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24876

Modified Files:
	struts.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per new policy




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- struts.spec	27 Mar 2007 17:48:18 -0000	1.47
+++ struts.spec	20 Sep 2007 22:20:32 -0000	1.48
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.6
+Release:	4jpp.7%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -1061,6 +1061,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.7
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per new policy
+
 * Tue Mar 27 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.6
 - Rewrote pre/preun/post/postun dependencies
 - Change Pre[rR]eq -> Requires(pre)



From fedora-extras-commits at redhat.com  Thu Sep 20 22:21:54 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:21:54 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.19,1.20
Message-ID: <200709202221.l8KMLsWL025038@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24982

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mercurial.spec	20 Sep 2007 19:03:30 -0000	1.19
+++ mercurial.spec	20 Sep 2007 22:21:20 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:23:04 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:23:04 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.15,1.16
Message-ID: <200709202223.l8KMN4rc025245@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25170

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mercurial.spec	20 Sep 2007 19:04:49 -0000	1.15
+++ mercurial.spec	20 Sep 2007 22:22:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:23:23 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:23:23 -0400
Subject: rpms/wsdl4j/devel wsdl4j.spec,1.14,1.15
Message-ID: <200709202223.l8KMNNvV025293@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/wsdl4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25205

Modified Files:
	wsdl4j.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per new policy





Index: wsdl4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wsdl4j.spec	10 Aug 2006 23:21:44 -0000	1.14
+++ wsdl4j.spec	20 Sep 2007 22:22:51 -0000	1.15
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        4jpp.1
+Release:        4jpp.2%{?dist}
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
@@ -152,6 +152,10 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.5.2-4jpp.2
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per new policy
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.5.2-4jpp.1
 - Added missing requirements.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:26:16 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:26:16 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.16,1.17
Message-ID: <200709202226.l8KMQGS4025482@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/xjavadoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25426

Modified Files:
	xjavadoc.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per policy




Index: xjavadoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xjavadoc.spec	26 Mar 2007 20:59:24 -0000	1.16
+++ xjavadoc.spec	20 Sep 2007 22:25:43 -0000	1.17
@@ -36,7 +36,7 @@
 
 Name:		xjavadoc
 Version:	1.1
-Release:	4jpp.2
+Release:	4jpp.3%{?dist}
 Epoch:		0
 Summary:	The XJavaDoc engine
 License:	BSD Style
@@ -188,6 +188,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.1-4jpp.3
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per policy
+
 * Mon Mar 26 2007 Deepak Bhole <dbhole at redhat.com> 1.1-4jpp.2
 - Fixed incorrect entry in the files section
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:26:35 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 18:26:35 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-initgroups-minimum_uid.patch, 1.1, 
	1.2
Message-ID: <200709202226.l8KMQZ7g025598@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25476

Modified Files:
	nss_ldap-257-initgroups-minimum_uid.patch 
Log Message:
- add a missing call to _nss_ldap_leave(), needed for multi-threaded apps and
  just plain correctness


nss_ldap-257-initgroups-minimum_uid.patch:

Index: nss_ldap-257-initgroups-minimum_uid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap-257-initgroups-minimum_uid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss_ldap-257-initgroups-minimum_uid.patch	20 Sep 2007 19:06:55 -0000	1.1
+++ nss_ldap-257-initgroups-minimum_uid.patch	20 Sep 2007 22:26:33 -0000	1.2
@@ -1,17 +1,17 @@
 diff -ur nss_ldap/ldap-grp.c nss_ldap/ldap-grp.c
 --- nss_ldap/ldap-grp.c	2007-08-03 00:51:09.000000000 -0400
-+++ nss_ldap/ldap-grp.c	2007-09-20 14:32:14.000000000 -0400
-@@ -1068,6 +1069,13 @@
++++ nss_ldap/ldap-grp.c	2007-09-20 16:38:00.000000000 -0400
+@@ -1068,6 +1068,13 @@
        return NSS_NOTFOUND;
      }
  
 +  if (_nss_ldap_test_initgroups_minimum_uid(LA_STRING (a)))
 +    {
 +      debug ("<== " NSS_LDAP_INITGROUPS_FUNCTION " (user id below configured minimum)");
++      _nss_ldap_leave ();
 +      return NSS_NOTFOUND;
 +    }
 +
-+
    lia.backlink = _nss_ldap_test_config_flag (NSS_LDAP_FLAGS_INITGROUPS_BACKLINK);
  
    if (lia.backlink != 0)



From fedora-extras-commits at redhat.com  Thu Sep 20 22:31:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 18:31:23 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.65,
	1.66 selinux-policy.spec, 1.527, 1.528
Message-ID: <200709202231.l8KMVNYN025859@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25821

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
- Fix java and mono to run in xguest account


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- policy-20070703.patch	20 Sep 2007 20:41:50 -0000	1.65
+++ policy-20070703.patch	20 Sep 2007 22:30:51 -0000	1.66
@@ -1439,7 +1439,7 @@
  application_executable_file(gconfd_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-20 18:08:22.000000000 -0400
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1448,7 +1448,7 @@
  /usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gappletviewer  --	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-@@ -20,5 +21,9 @@
+@@ -20,5 +21,11 @@
  /usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1458,9 +1458,11 @@
 +
 +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
++/usr/lib(64)?/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 08:56:23.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 17:57:24.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1480,7 +1482,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,57 @@
+@@ -166,6 +165,60 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1528,17 +1530,20 @@
 +
 +	userdom_unpriv_usertype($1, $1_java_t)
 +
-+	allow $1_java_t self:process { execheap execmem };
++	allow $1_java_t self:process { getsched sigkill execheap execmem execstack };
 +
 +	domtrans_pattern($2, java_exec_t, $1_java_t)
 +
++	dev_read_urand($1_java_t)
++	dev_read_rand($1_java_t)
++
 +	optional_policy(`
 +		xserver_xdm_rw_shm($1_java_t)
 +	')
  ')
  
  ########################################
-@@ -219,3 +269,66 @@
+@@ -219,3 +272,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -6387,7 +6392,7 @@
 +term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.0.8/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/lpd.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/lpd.if	2007-09-20 18:02:10.000000000 -0400
 @@ -394,3 +394,22 @@
  
  	domtrans_pattern($2, lpr_exec_t, $1_lpr_t)
@@ -13255,7 +13260,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 15:46:46.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 18:02:36.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -13849,7 +13854,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +882,163 @@
+@@ -954,21 +882,164 @@
  ##	</summary>
  ## </param>
  #
@@ -13965,6 +13970,7 @@
 +	userdom_poly_tmp_template($1)
 +
 +	optional_policy(`
++		cups_read_config($1_usertype)
 +		cups_stream_connect($1_usertype)
 +		cups_stream_connect_ptal($1_usertype)
 +	')
@@ -14019,7 +14025,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1047,51 @@
+@@ -977,23 +1048,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -14082,7 +14088,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1127,7 @@
+@@ -1029,15 +1128,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -14099,7 +14105,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1144,6 @@
+@@ -1054,17 +1145,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -14117,7 +14123,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1181,8 @@
+@@ -1102,6 +1182,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -14126,7 +14132,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1208,7 @@
+@@ -1127,7 +1209,7 @@
  	# $1_t local policy
  	#
  
@@ -14135,7 +14141,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1220,11 @@
+@@ -1139,7 +1221,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -14148,7 +14154,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1642,9 +1727,11 @@
+@@ -1642,9 +1728,11 @@
  template(`userdom_user_home_content',`
  	gen_require(`
  		attribute $1_file_type;
@@ -14160,7 +14166,7 @@
  	files_type($2)
  ')
  
-@@ -1894,10 +1981,46 @@
+@@ -1894,10 +1982,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14208,7 +14214,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3201,7 @@
+@@ -3078,7 +3202,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14217,7 +14223,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4738,24 @@
+@@ -4615,6 +4739,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14242,7 +14248,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4774,14 @@
+@@ -4633,6 +4775,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14257,7 +14263,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5472,7 @@
+@@ -5323,7 +5473,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14266,7 +14272,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5708,376 @@
+@@ -5559,3 +5709,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- selinux-policy.spec	20 Sep 2007 17:21:13 -0000	1.527
+++ selinux-policy.spec	20 Sep 2007 22:30:51 -0000	1.528
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
+- Fix java and mono to run in xguest account
+
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
 - Fix to add xguest account when inititial install
 - Allow mono, java, wine to run in userdomains



From fedora-extras-commits at redhat.com  Thu Sep 20 22:34:36 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:34:36 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec,1.3342,1.3343
Message-ID: <200709202234.l8KMYaLa026025@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25989

Modified Files:
	kernel-2.6.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3342
retrieving revision 1.3343
diff -u -r1.3342 -r1.3343
--- kernel-2.6.spec	18 Sep 2007 15:08:25 -0000	1.3342
+++ kernel-2.6.spec	20 Sep 2007 22:34:02 -0000	1.3343
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable tcrypt module for crypto testing.
+
 * Tue Sep 18 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:34:39 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:34:39 -0400
Subject: rpms/kernel/F-7/configs config-generic,1.335,1.336
Message-ID: <200709202234.l8KMYd0a026028@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25989/configs

Modified Files:
	config-generic 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-generic,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- config-generic	29 Aug 2007 23:43:00 -0000	1.335
+++ config-generic	20 Sep 2007 22:34:06 -0000	1.336
@@ -2891,7 +2891,7 @@
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
 
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:35:17 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:35:17 -0400
Subject: rpms/kernel/devel config-generic,1.26,1.27 kernel.spec,1.174,1.175
Message-ID: <200709202235.l8KMZHg9026062@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26034

Modified Files:
	config-generic kernel.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-generic	20 Sep 2007 19:19:43 -0000	1.26
+++ config-generic	20 Sep 2007 22:34:44 -0000	1.27
@@ -2950,7 +2950,7 @@
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
 
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kernel.spec	20 Sep 2007 19:19:43 -0000	1.174
+++ kernel.spec	20 Sep 2007 22:34:44 -0000	1.175
@@ -1805,6 +1805,9 @@
 
 %changelog
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable tcrypt module for crypto testing.
+
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable SECMARK by default.
 
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep 20 22:54:13 2007
From: fedora-extras-commits at redhat.com (Lawrence Lim (llim))
Date: Thu, 20 Sep 2007 18:54:13 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.31,1.32
Message-ID: <200709202254.l8KMsDEZ026481@cvs-int.fedora.redhat.com>

Author: llim

Update of /cvs/pkgs/rpms/redhat-lsb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26451

Modified Files:
	redhat-lsb.spec 
Log Message:
fix a build issue in a minimal build env


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- redhat-lsb.spec	29 Aug 2007 04:49:04 -0000	1.31
+++ redhat-lsb.spec	20 Sep 2007 22:53:38 -0000	1.32
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
@@ -58,6 +58,8 @@
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: perl, help2man
+
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -436,6 +438,9 @@
 %{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Fri Sep 21 2007 Lawrence Lim <llim at redhat.com> - 3.1-18
+- fix build issue in minimal build root (Bug #265241)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.1-17
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:06:52 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:06:52 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.20,1.21
Message-ID: <200709202306.l8KN6q9e000496@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv445

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mercurial.spec	20 Sep 2007 22:02:29 -0000	1.20
+++ mercurial.spec	20 Sep 2007 23:06:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:08:23 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:08:23 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.20,1.21
Message-ID: <200709202308.l8KN8NRm000617@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv583

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mercurial.spec	20 Sep 2007 22:21:20 -0000	1.20
+++ mercurial.spec	20 Sep 2007 23:07:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:09:18 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:09:18 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.16,1.17
Message-ID: <200709202309.l8KN9I7J000719@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv676

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mercurial.spec	20 Sep 2007 22:22:31 -0000	1.16
+++ mercurial.spec	20 Sep 2007 23:08:45 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:09:50 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 19:09:50 -0400
Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.7, 1.8 libgnomeuimm.spec,
	1.15, 1.16 sources, 1.8, 1.9
Message-ID: <200709202309.l8KN9oXP000781@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv713

Modified Files:
	.cvsignore libgnomeuimm.spec sources 
Log Message:
Update to new upstream stable 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2007 15:14:07 -0000	1.7
+++ .cvsignore	20 Sep 2007 23:09:16 -0000	1.8
@@ -1 +1 @@
-libgnomeuimm-2.18.0.tar.bz2
+libgnomeuimm-2.20.0.tar.bz2


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgnomeuimm.spec	28 Aug 2007 22:35:03 -0000	1.15
+++ libgnomeuimm.spec	20 Sep 2007 23:09:16 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           libgnomeuimm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 21 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new upstream stable 2.20
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow libgnomeui version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2007 15:14:07 -0000	1.8
+++ sources	20 Sep 2007 23:09:16 -0000	1.9
@@ -1 +1 @@
-ba42d820f535f8e7fc5d31699d484efb  libgnomeuimm-2.18.0.tar.bz2
+350d3424247611a009432395aff8619f  libgnomeuimm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 23:12:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 20 Sep 2007 19:12:03 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.689, 1.690 kernel.spec, 1.175, 1.176 sources, 1.651,
	1.652 upstream, 1.573, 1.574 patch-2.6.23-rc6.bz2.sign, 1.1, NONE
Message-ID: <200709202312.l8KNC39J000893@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7-git1.bz2.sign 
Removed Files:
	patch-2.6.23-rc6.bz2.sign 
Log Message:
* Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc7-git1



--- NEW FILE patch-2.6.23-rc7-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8sTZyGugalF9Dw4RAgpEAJ97hiDW+kubIWe3PJ3/FrJFD8g7/wCgk1p8
JcejK2yExb9mlAftels5oXE=
=WKFv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- .cvsignore	20 Sep 2007 15:23:18 -0000	1.689
+++ .cvsignore	20 Sep 2007 23:11:30 -0000	1.690
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc6-git8.bz2
+patch-2.6.23-rc7-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kernel.spec	20 Sep 2007 22:34:44 -0000	1.175
+++ kernel.spec	20 Sep 2007 23:11:30 -0000	1.176
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc7-git1
+
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable tcrypt module for crypto testing.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- sources	20 Sep 2007 15:23:18 -0000	1.651
+++ sources	20 Sep 2007 23:11:30 -0000	1.652
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
+9100900b5ffef416784752ffaf0f50a1  patch-2.6.23-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- upstream	20 Sep 2007 15:23:18 -0000	1.573
+++ upstream	20 Sep 2007 23:11:30 -0000	1.574
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
+patch-2.6.23-rc7-git1.bz2


--- patch-2.6.23-rc6.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 23:12:52 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 19:12:52 -0400
Subject: rpms/junit/devel junit.spec,1.27,1.28 junit3.8.2-build.xml,1.1,1.2
Message-ID: <200709202312.l8KNCqS1000925@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/junit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv905

Modified Files:
	junit.spec junit3.8.2-build.xml 
Log Message:

- Fix location of stylesheet for javadocs




Index: junit.spec
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- junit.spec	20 Sep 2007 22:10:41 -0000	1.27
+++ junit.spec	20 Sep 2007 23:12:20 -0000	1.28
@@ -34,7 +34,7 @@
 
 Name:           junit
 Version:        3.8.2
-Release:        3jpp.2%{?dist}
+Release:        3jpp.3%{?dist}
 Summary:        Java regression test package
 License:        CPL
 Url:            http://www.junit.org/
@@ -163,6 +163,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.3
+- Fix location of stylesheet for javadocs
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.2
 - Rebuild for ppc32 execmem issue and new build-id
 


Index: junit3.8.2-build.xml
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit3.8.2-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- junit3.8.2-build.xml	23 Jul 2006 02:14:22 -0000	1.1
+++ junit3.8.2-build.xml	20 Sep 2007 23:12:20 -0000	1.2
@@ -64,7 +64,7 @@
 			version="false"
 			use="false"
 			windowtitle="JUnit API"
-			stylesheetfile="stylesheet.css"
+			stylesheetfile="./javadoc/stylesheet.css"
 		/>
 		<copy todir="${dist}/doc">
 			<fileset dir="doc"/>



From fedora-extras-commits at redhat.com  Thu Sep 20 23:23:32 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:23:32 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.21,1.22
Message-ID: <200709202323.l8KNNWuo001678@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1657

Modified Files:
	mercurial.spec 
Log Message:
Revert last change


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mercurial.spec	20 Sep 2007 23:06:17 -0000	1.21
+++ mercurial.spec	20 Sep 2007 23:22:59 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -51,11 +51,13 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:25:31 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:25:31 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.21,1.22
Message-ID: <200709202325.l8KNPV4I001806@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1786

Modified Files:
	mercurial.spec 
Log Message:
Revert last change


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mercurial.spec	20 Sep 2007 23:07:47 -0000	1.21
+++ mercurial.spec	20 Sep 2007 23:24:58 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -51,11 +51,13 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Fri Sep 21 00:37:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 20:37:47 -0400
Subject: rpms/wpa_supplicant/devel fi.epitest.hostap.WPASupplicant.service, 
	NONE, 1.1 wpa_supplicant.spec, 1.28, 1.29 wpa_supplicant.service,
	1.1, NONE
Message-ID: <200709210037.l8L0blFc009577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9547

Modified Files:
	wpa_supplicant.spec 
Added Files:
	fi.epitest.hostap.WPASupplicant.service 
Removed Files:
	wpa_supplicant.service 
Log Message:
* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
- Change system bus activation file name to work around D-Bus bug that fails
    to launch services unless their .service file is named the same as the
    service itself




--- NEW FILE fi.epitest.hostap.WPASupplicant.service ---
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f
User=root



Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wpa_supplicant.spec	24 Aug 2007 17:40:37 -0000	1.28
+++ wpa_supplicant.spec	21 Sep 2007 00:37:14 -0000	1.29
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers-r1475.tar.bz2
-Source6: %{name}.service
+Source6: fi.epitest.hostap.WPASupplicant.service
 Patch0: wpa_supplicant-assoc-timeout.patch
 Patch1: wpa_supplicant-driver-wext-debug.patch
 Patch2: wpa_supplicant-wep-key-fix.patch
@@ -126,7 +126,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
-%{_datadir}/dbus-1/system-services/%{name}.service
+%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
@@ -140,6 +140,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
+- Change system bus activation file name to work around D-Bus bug that fails
+    to launch services unless their .service file is named the same as the
+    service itself
+
 * Fri Aug 24 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-7
 - Make SIGUSR1 change debug level on-the-fly; useful in combination with
     the -f switch to log output to /var/log/wpa_supplicant.log


--- wpa_supplicant.service DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 01:15:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 20 Sep 2007 21:15:10 -0400
Subject: rpms/perl-Archive-Extract/devel .cvsignore, 1.8,
	1.9 perl-Archive-Extract.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709210115.l8L1FAd8016379@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16354

Modified Files:
	.cvsignore perl-Archive-Extract.spec sources 
Log Message:
Update to 0.24.
BR Test::More.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 May 2007 21:37:17 -0000	1.8
+++ .cvsignore	21 Sep 2007 01:14:37 -0000	1.9
@@ -1 +1 @@
-Archive-Extract-0.22.tar.gz
+Archive-Extract-0.24.tar.gz


Index: perl-Archive-Extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/perl-Archive-Extract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Archive-Extract.spec	30 May 2007 21:37:17 -0000	1.8
+++ perl-Archive-Extract.spec	21 Sep 2007 01:14:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Archive-Extract
-Version:        0.22
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Generic archive extracting mechanism
 License:        GPL or Artistic
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional) >= 0.04
 BuildRequires:  perl(Params::Check) >= 0.07
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 20 2007 Steven Pritchard <steve at kspei.com> 0.24-1
+- Update to 0.24.
+- BR Test::More.
+
 * Wed May 30 2007 Steven Pritchard <steve at kspei.com> 0.22-1
 - Update to 0.22.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 May 2007 21:37:17 -0000	1.8
+++ sources	21 Sep 2007 01:14:37 -0000	1.9
@@ -1 +1 @@
-a7e06d68f522383c726e986581eefd0d  Archive-Extract-0.22.tar.gz
+8dbdc264b6c52fbce859fab96928828e  Archive-Extract-0.24.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 01:20:10 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:20:10 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.17,1.18
Message-ID: <200709210120.l8L1KAAh016544@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16523

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mercurial.spec	20 Sep 2007 23:08:45 -0000	1.17
+++ mercurial.spec	21 Sep 2007 01:19:37 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -51,11 +51,16 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:21:58 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:21:58 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.22,1.23
Message-ID: <200709210121.l8L1Lw65016675@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16649

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mercurial.spec	20 Sep 2007 23:22:59 -0000	1.22
+++ mercurial.spec	21 Sep 2007 01:21:24 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -55,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
 - Revert last change.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:22:59 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:22:59 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.22,1.23
Message-ID: <200709210122.l8L1MxTk016753@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mercurial.spec	20 Sep 2007 23:24:58 -0000	1.22
+++ mercurial.spec	21 Sep 2007 01:22:26 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -55,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
 - Revert last change.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:23:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 21:23:36 -0400
Subject: rpms/darcs/devel darcs.spec,1.25,1.26
Message-ID: <200709210123.l8L1NaUA016810@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16752

Modified Files:
	darcs.spec 
Log Message:
fix the "|| :" quoting in the post install script (#295351)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- darcs.spec	20 Sep 2007 08:25:31 -0000	1.25
+++ darcs.spec	21 Sep 2007 01:23:04 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        1.0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -76,8 +76,7 @@
 
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1
-|| :
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
 restorecon -v %{_bindir}/darcs
 
 
@@ -96,6 +95,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-6
+- fix the "|| :" quoting in the post install script (#295351)
+
 * Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-5
 - set selinux file-context for %{_bindir}/darcs
   (reported by Jim Radford, #295351)



From fedora-extras-commits at redhat.com  Fri Sep 21 02:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:26:02 -0700
Subject: [pkgdb] kdepimlibs (Fedora, 7) updated by kevin
Message-ID: <200709210226.l8L2Q3TB028026@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdepimlibs
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdepimlibs (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdepimlibs (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:25 -0700
Subject: [pkgdb] kdelibs4 was added for kkofler
Message-ID: <200709210228.l8L2SR1b028647@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package kdelibs4 with summary K Desktop Environment 4 - Libraries
Kevin Fenzi (kevin) has approved Package kdelibs4
Kevin Fenzi (kevin) has added a Fedora devel branch for kdelibs4 with an owner of kkofler
Kevin Fenzi (kevin) has approved kdelibs4 in Fedora devel
Kevin Fenzi (kevin) has approved Package kdelibs4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdelibs4 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdelibs4 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdelibs4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:53 -0700
Subject: [pkgdb] kdelibs4 (Fedora, 7) updated by kevin
Message-ID: <200709210228.l8L2SsGV016068@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdelibs4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdelibs4 (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:53 -0700
Subject: [pkgdb] kdelibs4 (Fedora, devel) updated by kevin
Message-ID: <200709210228.l8L2StRX016085@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdelibs4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:38 -0400
Subject: rpms/kdelibs4 - New directory
Message-ID: <200709210229.l8L2Tcb4024993@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4

Log Message:
Directory /cvs/extras/rpms/kdelibs4 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:42 -0400
Subject: rpms/kdelibs4/devel - New directory
Message-ID: <200709210229.l8L2TgBa025009@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4/devel

Log Message:
Directory /cvs/extras/rpms/kdelibs4/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:45 -0400
Subject: rpms/kdelibs4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709210229.l8L2TjaP025034@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdelibs4


--- NEW FILE Makefile ---
# Top level Makefile for module kdelibs4
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:47 -0400
Subject: rpms/kdelibs4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709210229.l8L2TlB2025050@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdelibs4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kdelibs4
# $Id: Makefile,v 1.1 2007/09/21 02:29:45 kevin Exp $
NAME := kdelibs4
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 fedora-extras-commits at redhat.com  Fri Sep 21 02:31:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:11 -0700
Subject: [pkgdb] kdebase4 was added for kkofler
Message-ID: <200709210231.l8L2VBEr029457@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package kdebase4 with summary K Desktop Environment 4 - Core Files
Kevin Fenzi (kevin) has approved Package kdebase4
Kevin Fenzi (kevin) has added a Fedora devel branch for kdebase4 with an owner of kkofler
Kevin Fenzi (kevin) has approved kdebase4 in Fedora devel
Kevin Fenzi (kevin) has approved Package kdebase4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdebase4 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdebase4 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdebase4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:25 -0700
Subject: [pkgdb] kdebase4 (Fedora, devel) updated by kevin
Message-ID: <200709210231.l8L2VQYh029594@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdebase4 (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:25 -0700
Subject: [pkgdb] kdebase4 (Fedora, 7) updated by kevin
Message-ID: <200709210231.l8L2VRmB029613@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdebase4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdebase4 (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:48 -0400
Subject: rpms/kdebase4/devel - New directory
Message-ID: <200709210231.l8L2Vm7W025305@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4/devel

Log Message:
Directory /cvs/extras/rpms/kdebase4/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:42 -0400
Subject: rpms/kdebase4 - New directory
Message-ID: <200709210231.l8L2VgJt025296@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4

Log Message:
Directory /cvs/extras/rpms/kdebase4 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:50 -0400
Subject: rpms/kdebase4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709210231.l8L2VobL025335@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdebase4


--- NEW FILE Makefile ---
# Top level Makefile for module kdebase4
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:53 -0400
Subject: rpms/kdebase4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709210231.l8L2VrJZ025351@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdebase4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kdebase4
# $Id: Makefile,v 1.1 2007/09/21 02:31:51 kevin Exp $
NAME := kdebase4
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 fedora-extras-commits at redhat.com  Fri Sep 21 03:12:51 2007
From: fedora-extras-commits at redhat.com (Norman Murray (nmurray))
Date: Thu, 20 Sep 2007 23:12:51 -0400
Subject: rpms/ImageMagick/devel ImageMagick-6.3.5-multilib.patch, NONE,
	1.1 ImageMagick-6.3.5-open.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 ImageMagick.spec, 1.70, 1.71 sources, 1.19, 1.20
Message-ID: <200709210312.l8L3CpsQ032508@cvs-int.fedora.redhat.com>

Author: nmurray

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32445

Modified Files:
	.cvsignore ImageMagick.spec sources 
Added Files:
	ImageMagick-6.3.5-multilib.patch ImageMagick-6.3.5-open.patch 
Log Message:
Rebase to new version
- update multilib support patch
- fix compile issues
- add new require on jasper
- drop reference to windows fonts


ImageMagick-6.3.5-multilib.patch:

--- NEW FILE ImageMagick-6.3.5-multilib.patch ---
--- ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:11:57.000000000 +1000
+++ ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:17:18.000000000 +1000
@@ -15,28 +15,28 @@ fi
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix ImageMagick
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix ImageMagic
       ;;
     --version)
-      echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
+      pkg-config --modversion ImageMagick
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs ImageMagick
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs ImageMagick
       ;;
     *)
       echo "${usage}" 1>&2
--- ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:11:57.000000000 +1000
+++ ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:19:17.000000000 +1000
@@ -15,28 +15,28 @@ fi
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix Wand
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix Wand
       ;;
     --version)
-      echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
+      pkg-config --modversion Wand
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs Wand
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs Wand
       ;;
     *)
       echo "${usage}" 1>&2

ImageMagick-6.3.5-open.patch:

--- NEW FILE ImageMagick-6.3.5-open.patch ---
--- ImageMagick-6.3.5-9/magick/delegate.c	2007-09-11 13:20:41.000000000 +1000
+++ ImageMagick-6.3.5-9/magick/delegate.c	2007-09-18 18:27:31.000000000 +1000
@@ -769,7 +769,8 @@ static void CopyDelegateFile(const char 
   /*
     Copy source file to destination.
   */
-  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT);
+  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT,
+			S_IRUSR | S_IWUSR | S_IRGRP );
   if (destination_file == -1)
     return;
   source_file=open(source,O_RDONLY | O_BINARY);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Mar 2007 03:38:03 -0000	1.19
+++ .cvsignore	21 Sep 2007 03:12:17 -0000	1.20
@@ -1,2 +1 @@
-ImageMagick-6.2.8-0.tar.bz2
-ImageMagick-6.3.2-9.tar.bz2
+ImageMagick-6.3.5-9.tar.bz2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ImageMagick.spec	5 Apr 2007 12:18:29 -0000	1.70
+++ ImageMagick.spec	21 Sep 2007 03:12:17 -0000	1.71
@@ -1,6 +1,6 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.3.2
+%define VER 6.3.5
 %define Patchlevel 9
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -18,12 +18,9 @@
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
 %endif
 Source1: magick_small.png
-Patch1: ImageMagick-6.2.1-local_doc.patch
-Patch2: ImageMagick-6.2.8-multilib.patch
-Patch3: ImageMagick-6.3.2-perl-parallel-build.patch
-Patch4: ImageMagick-6.3.2-perl-liblink.patch
-# 235075
-Patch5: ImageMagick-6.2.8-CVE-2007-1797.patch
+Patch1: ImageMagick-6.3.5-multilib.patch
+Patch2: ImageMagick-6.3.5-open.patch
+
 
 
 Url: http://www.imagemagick.org/
@@ -34,7 +31,7 @@
 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
 BuildRequires: ghostscript-devel
 BuildRequires: perl-devel
-BuildRequires: libwmf-devel
+BuildRequires: libwmf-devel, jasper-devel
 BuildRequires: libX11-devel, libXext-devel, libXt-devel
 BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
 
@@ -65,6 +62,7 @@
 Requires: libjpeg-devel
 Requires: lcms-devel
 Requires: pkgconfig
+Requires: jasper
 
 %description devel
 ImageMagick-devel contains the static libraries and header files you'll
@@ -121,11 +119,8 @@
 
 %prep
 %setup -q -n %{name}-%{VER}
-%patch1 -p1 -b .local_doc
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .perl-build
-%patch4 -p1 -b .perl-link
-%patch5 -p1 -b .cve-2007-1797
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .open_args
 
 %build
 %configure --enable-shared \
@@ -140,7 +135,7 @@
            --with-rsvg \
 	   --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
+           --without-windows-font-dir \
 	   --without-dps
 
 make
@@ -178,7 +173,7 @@
 rm -f  $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32
@@ -261,6 +256,12 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Sep 21 2007 Norm Murray <nmurray at redhat.com> 6.3.5.9-1.fc8
+- rebase to 6.3.5.9
+- fix build with missing open() arg
+- add build require of jasper-devel, remove windows font dir
+- update multilib patch
+
 * Thu Apr  5 2007 Norm Murray <nmurray at redhat.com> 6.3.2.9-3.fc7
 - heap overflows (#235075, CVE-2007-1797)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Mar 2007 03:38:03 -0000	1.19
+++ sources	21 Sep 2007 03:12:17 -0000	1.20
@@ -1,2 +1 @@
-484cd7b62fac2164e8257449405f2563  ImageMagick-6.2.8-0.tar.bz2
-89e118517c64cac04cedf8746e0f1005  ImageMagick-6.3.2-9.tar.bz2
+d636d2113fbfe7453088bda31aa5ccbc  ImageMagick-6.3.5-9.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 03:18:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:18:49 -0700
Subject: [pkgdb] jlint (Fedora, devel) updated by kevin
Message-ID: <200709210318.l8L3IoHP010948@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of jlint in Fedora devel to jjames

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



From fedora-extras-commits at redhat.com  Fri Sep 21 03:20:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:20:17 -0700
Subject: [pkgdb] jlint (Fedora, 7) updated by kevin
Message-ID: <200709210320.l8L3KII1030863@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for jlint
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jlint (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jlint (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jlint (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 03:20:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:20:17 -0700
Subject: [pkgdb] jlint (Fedora, 6) updated by kevin
Message-ID: <200709210320.l8L3KJwb030873@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for jlint
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jlint (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jlint (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jlint (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 03:28:20 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:28:20 -0400
Subject: rpms/jlint/devel Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources, 
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210328.l8L3SK3E002076@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1759/devel

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:27:47 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:27:47 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:27:47 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:27:47 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:34:33 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:34:33 -0400
Subject: rpms/jlint/F-7 Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources,
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210334.l8L3YXTZ003609@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3383

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:34:00 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:34:00 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:34:00 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:34:00 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:36:25 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:36:25 -0400
Subject: rpms/jlint/FC-6 Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources,
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210336.l8L3aPBf004065@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:35:53 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:35:53 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:35:53 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:35:53 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:52:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 20 Sep 2007 23:52:44 -0400
Subject: rpms/nkf/devel .cvsignore, 1.7, 1.8 nkf.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200709210352.l8L3qi55007121@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092

Modified Files:
	.cvsignore nkf.spec sources 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 1:2.0.8b-1
- New upstream release.
- clean up the spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jul 2006 00:33:05 -0000	1.7
+++ .cvsignore	21 Sep 2007 03:52:12 -0000	1.8
@@ -5,3 +5,4 @@
 nkf205.tar.gz
 nkf206a.tar.gz
 nkf207.tar.gz
+nkf-2.0.8b.tar.gz


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nkf.spec	23 Aug 2007 13:04:24 -0000	1.23
+++ nkf.spec	21 Sep 2007 03:52:12 -0000	1.24
@@ -1,16 +1,18 @@
-%define	nkfver	nkf207
+%define		nkfver	2.0.8
 
-Summary: A Kanji code conversion filter.
-Name: nkf
-Version: 2.07
-Release: 3%{?dist}
-License: BSD
-Group: Applications/Text
-#Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar
-Source: http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/%{nkfver}.tar.gz
-Source3: nkf.copyright
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		nkf
+Epoch:		1
+Version:	2.0.8b
+Release:	1%{?dist}
+License:	BSD
+URL:		http://nkf.sourceforge.jp/
+Source0:	http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz
+Source3:	nkf.copyright
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	perl-ExtUtils-MakeMaker
 
+Summary:	A Kanji code conversion filter
+Group:		Applications/Text
 %description
 Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf
 converts input Kanji code to 7-bit JIS, MS-kanji (shifted-JIS) or
@@ -26,34 +28,36 @@
 Conversion details are specified by flags before the last argument.
 
 %prep
-%{__rm} -rf	$RPM_BUILD_ROOT
-%{__mkdir_p}	$RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p}	$RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
-
-%setup -q -n %{nkfver}
+%setup -q -n %{name}-%{nkfver}
 
 %build
 make nkf
 cp %{SOURCE3} .
-(cd NKF.mod;
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor
-)
+pushd NKF.mod
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor
+make
+popd
 
 %install
+rm -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
+
 ./nkf -e nkf.1j > nkf.1jeuc
 iconv -f euc-jp -t utf-8 nkf.1jeuc > nkf.1utf8
-install -m 755 nkf $RPM_BUILD_ROOT%{_bindir}
-install -m 644 nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
+install -m 755 -p nkf $RPM_BUILD_ROOT%{_bindir}
+install -m 644 -p nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 644 -p nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
 pushd NKF.mod
 eval `perl '-V:installarchlib'`
 eval `perl '-V:installvendorarch'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-make install
-rm -f $RPM_BUILD_ROOT/$installvendorarch/perllocal.pod \
-	${RPM_BUILD_ROOT}${installarchlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT/$installvendorarch/auto/NKF/NKF.bs
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f	$RPM_BUILD_ROOT$installvendorarch/perllocal.pod		\
+	$RPM_BUILD_ROOT$installarchlib/perllocal.pod		\
+	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.bs	\
+	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/.packlist
 popd
+chmod 0755 $RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +77,10 @@
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 1:2.0.8b-1
+- New upstream release.
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.07-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jul 2006 00:33:05 -0000	1.7
+++ sources	21 Sep 2007 03:52:12 -0000	1.8
@@ -1 +1 @@
-af11dcd3fe71d67831c020e3bfd5073b  nkf207.tar.gz
+1851260a2719629294740783c14ca3d5  nkf-2.0.8b.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 04:11:09 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:11:09 -0400
Subject: rpms/deluge/devel
	deluge-default-prefs-no-release-notifications.patch, 
	NONE, 1.1 deluge.spec, 1.27, 1.28
Message-ID: <200709210411.l8L4B9bZ013735@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/devel

Modified Files:
	deluge.spec 
Added Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Disable update notifications by default.

deluge-default-prefs-no-release-notifications.patch:

--- NEW FILE deluge-default-prefs-no-release-notifications.patch ---
--- src/pref.py	2007-09-20 19:30:08.000000000 -0700
+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
@@ -118,7 +118,7 @@
     "use_natpmp" : False,
     "use_upnp" : False,
     "use_utpex" : True,
-    "new_releases" : False,
+    "new_releases" : True,
     "window_height" : 480,
     "window_maximized" : False,
     "window_pane_position" : -1,


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- deluge.spec	12 Sep 2007 22:59:09 -0000	1.27
+++ deluge.spec	21 Sep 2007 04:10:37 -0000	1.28
@@ -13,7 +13,8 @@
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
-Patch0:		%{name}-use-mt-boost.patch
+Patch0: 	%{name}-use-mt-boost.patch
+Patch1: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +63,7 @@
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
 %patch0 -b .use-mt-boost
+%patch1 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -107,7 +109,13 @@
 
 
 %changelog
-* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+* Thu Sep 20 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-2
+- Fix release on previous %%changelog entry.
+- Disable the version update notifications by default:
+  + default-prefs-no-release-notifications.patch
+  (Resolves bug 299601: Deluge alerts of new versions)
+
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-1
 - Update to new upstream release (0.5.5)
 
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1



From fedora-extras-commits at redhat.com  Fri Sep 21 04:12:03 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:12:03 -0400
Subject: rpms/deluge/F-7 deluge-default-prefs-no-release-notifications.patch,
	NONE, 1.1 deluge.spec, 1.22, 1.23
Message-ID: <200709210412.l8L4C3uV013782@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13747/F-7

Modified Files:
	deluge.spec 
Added Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Disable update notifications by default.

deluge-default-prefs-no-release-notifications.patch:

--- NEW FILE deluge-default-prefs-no-release-notifications.patch ---
--- src/pref.py	2007-09-20 19:30:08.000000000 -0700
+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
@@ -118,7 +118,7 @@
     "use_natpmp" : False,
     "use_upnp" : False,
     "use_utpex" : True,
-    "new_releases" : False,
+    "new_releases" : True,
     "window_height" : 480,
     "window_maximized" : False,
     "window_pane_position" : -1,


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- deluge.spec	12 Sep 2007 23:13:07 -0000	1.22
+++ deluge.spec	21 Sep 2007 04:11:31 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:		deluge
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
@@ -13,6 +13,7 @@
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
+Patch0: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +61,7 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -105,7 +107,13 @@
 
 
 %changelog
-* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+* Thu Sep 20 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-2
+- Fix release on previous %%changelog entry.
+- Disable the version update notifications by default:
+  + default-prefs-no-release-notifications.patch
+  (Resolves bug 299601: Deluge alerts of new versions)
+
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-1
 - Update to new upstream release (0.5.5)
 
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1



From fedora-extras-commits at redhat.com  Fri Sep 21 04:13:32 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:13:32 -0400
Subject: rpms/deluge/devel deluge.spec,1.28,1.29
Message-ID: <200709210413.l8L4DW72013855@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13837/devel

Modified Files:
	deluge.spec 
Log Message:
Me == stupid. Bump release too...


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- deluge.spec	21 Sep 2007 04:10:37 -0000	1.28
+++ deluge.spec	21 Sep 2007 04:13:00 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:		deluge
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+



From fedora-extras-commits at redhat.com  Fri Sep 21 04:22:59 2007
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 21 Sep 2007 00:22:59 -0400
Subject: rpms/ghex/devel .cvsignore, 1.8, 1.9 ghex.spec, 1.19, 1.20 sources, 
	1.9, 1.10
Message-ID: <200709210422.l8L4MxRG014145@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/ghex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14133

Modified Files:
	.cvsignore ghex.spec sources 
Log Message:
* Fri Sep 21 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.20.0-1
- Update to 2.20.0










From fedora-extras-commits at redhat.com  Fri Sep 21 04:35:19 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Sep 2007 00:35:19 -0400
Subject: rpms/claws-mail/F-7 .cvsignore, 1.11, 1.12 claws-mail.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709210435.l8L4ZJCq014528@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14430/F-7

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2007 15:52:21 -0000	1.11
+++ .cvsignore	21 Sep 2007 04:34:46 -0000	1.12
@@ -1 +1 @@
-claws-mail-3.0.0.tar.bz2
+claws-mail-3.0.1.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail.spec	3 Sep 2007 15:52:21 -0000	1.18
+++ claws-mail.spec	21 Sep 2007 04:34:46 -0000	1.19
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.1.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,10 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Fri Sep 21 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.1-1
+- version upgrade
+
 * Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.0.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Sep 2007 15:52:21 -0000	1.11
+++ sources	21 Sep 2007 04:34:46 -0000	1.12
@@ -1 +1 @@
-9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2
+700c6b4efeb10cc33a43111c2a734db8  claws-mail-3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 04:35:22 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Sep 2007 00:35:22 -0400
Subject: rpms/claws-mail/devel .cvsignore, 1.11, 1.12 claws-mail.spec, 1.18, 
	1.19 sources, 1.11, 1.12
Message-ID: <200709210435.l8L4ZMl5014537@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14430/devel

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2007 15:52:35 -0000	1.11
+++ .cvsignore	21 Sep 2007 04:34:49 -0000	1.12
@@ -1 +1 @@
-claws-mail-3.0.0.tar.bz2
+claws-mail-3.0.1.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail.spec	3 Sep 2007 15:52:35 -0000	1.18
+++ claws-mail.spec	21 Sep 2007 04:34:49 -0000	1.19
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.1.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,10 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Fri Sep 21 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.1-1
+- version upgrade
+
 * Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.0.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Sep 2007 15:52:35 -0000	1.11
+++ sources	21 Sep 2007 04:34:49 -0000	1.12
@@ -1 +1 @@
-9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2
+700c6b4efeb10cc33a43111c2a734db8  claws-mail-3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 05:11:40 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Sep 2007 01:11:40 -0400
Subject: rpms/gettext/devel gettext.spec,1.79,1.80
Message-ID: <200709210511.l8L5BedH021378@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21350

Modified Files:
	gettext.spec 
Log Message:
- add a libs subpackage (suggested by Dwayne Bailey, #294891)
- move preloadable_libintl.so to the devel subpackage



Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gettext.spec	14 Sep 2007 12:30:24 -0000	1.79
+++ gettext.spec	21 Sep 2007 05:11:02 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -47,13 +47,13 @@
 %package devel
 Summary: Development files for %{name}
 Group: Development/Tools
-License: LGPL
+License: LGPLv2+
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: cvs
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-
 %description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
@@ -61,6 +61,15 @@
 want to add gettext support for your project.
 
 
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+License: LGPLv2+
+
+%description libs
+This package contains libraries used internationalization support.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .1-fails~
@@ -194,7 +203,6 @@
 %exclude %{_bindir}/gettextize
 %{_libdir}/libgettextlib-%{version}.so
 %{_libdir}/libgettextsrc-%{version}.so
-%{_libdir}/preloadable_libintl.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/gettextize.1.gz
@@ -224,10 +232,11 @@
 %{_datadir}/aclocal/*
 %{_includedir}/*
 %{_infodir}/autosprintf*
-%{_libdir}/libasprintf.so*
-%{_libdir}/libgettextpo.so*
+%{_libdir}/libasprintf.so
+%{_libdir}/libgettextpo.so
 %{_libdir}/libgettextlib.so
 %{_libdir}/libgettextsrc.so
+%{_libdir}/preloadable_libintl.so
 %{_mandir}/man1/gettextize.1.gz
 %{_mandir}/man1/autopoint.1.gz
 %{_mandir}/man3/*
@@ -236,7 +245,17 @@
 %{_libdir}/%{name}/gnu.gettext.*
 
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libasprintf.so.*
+%{_libdir}/libgettextpo.so.*
+
+
 %changelog
+* Fri Sep 21 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-12
+- add a libs subpackage (suggested by Dwayne Bailey, #294891)
+- move preloadable_libintl.so to the devel subpackage
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.16.1-11
 - remove gettext-xglade-include-expat-285701.patch, add
   gettext-xglade-define-xml-major-version-285701.patch to determine



From fedora-extras-commits at redhat.com  Fri Sep 21 06:43:49 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 02:43:49 -0400
Subject: fedora-security/audit fc6,1.264,1.265 fc7,1.113,1.114
Message-ID: <200709210643.l8L6hncB029256@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29230/audit

Modified Files:
	fc6 fc7 
Log Message:
kdm vulnerability



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- fc6	20 Sep 2007 08:53:35 -0000	1.264
+++ fc6	21 Sep 2007 06:43:46 -0000	1.265
@@ -23,6 +23,7 @@
 CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
 CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
+CVE-2007-4569 VULNERABLE (kdebase) #299741
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc7	20 Sep 2007 09:28:51 -0000	1.113
+++ fc7	21 Sep 2007 06:43:46 -0000	1.114
@@ -37,6 +37,7 @@
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
+CVE-2007-4569 VULNERABLE (kdebase) #299731
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal



From fedora-extras-commits at redhat.com  Fri Sep 21 06:44:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 02:44:29 -0400
Subject: rpms/kcc/devel kcc-2.3-timestamp.patch,NONE,1.1 kcc.spec,1.18,1.19
Message-ID: <200709210644.l8L6iTJU029333@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29260

Modified Files:
	kcc.spec 
Added Files:
	kcc-2.3-timestamp.patch 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-27
- clean up the spec file.

kcc-2.3-timestamp.patch:

--- NEW FILE kcc-2.3-timestamp.patch ---
diff -pruN kcc.orig/Makefile kcc/Makefile
--- kcc.orig/Makefile	2007-09-21 14:08:02.000000000 +0900
+++ kcc/Makefile	2007-09-21 14:08:53.000000000 +0900
@@ -34,10 +34,10 @@ install.man: $(MANPATH)/$(JMANDIR)/man1/
 
 $(BINPATH)/kcc: kcc.c
 	$(MAKE) kcc
-	$(INSTALL) kcc $(BINPATH)
+	$(INSTALL) -p kcc $(BINPATH)
 
 $(MANPATH)/$(JMANDIR)/man1/kcc.1: kcc.jman
-	$(INSTALL) -m 644 kcc.jman $@
+	$(INSTALL) -m 644 -p kcc.jman $@
 
 clean:
 	rm -f $(CMDS) $(OBJS) mon.out gmon.out make.log


Index: kcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kcc.spec	23 Aug 2007 12:09:22 -0000	1.18
+++ kcc.spec	21 Sep 2007 06:43:56 -0000	1.19
@@ -1,14 +1,16 @@
 Name:		kcc
 Version:	2.3
-Release:	26
+Release:	27
 License:	GPLv2+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## missed upstream.
 Source:		ftp://ftp.sra.co.jp/pub/os/linux/JE/sources/base/%{name}.tar.gz
 Source1:	kcc.1
 Patch0:		kcc-2.3-dontstrip.patch
 Patch1:		kcc-2.3-varargs.patch
 Patch2:		kcc-2.3-fix-segv.patch
+Patch3:		kcc-2.3-timestamp.patch
 
 Summary:	Kanji Code Converter
 Group:		Applications/Text
@@ -20,6 +22,7 @@
 %patch0 -p1 -b .dontstrip
 %patch1 -p1 -b .varargs
 %patch2 -p1 -b .segv
+%patch3 -p1 -b .timestamp
 
 %build
 make "CFLAGS=$RPM_OPT_FLAGS"
@@ -35,7 +38,7 @@
 for i in `find $RPM_BUILD_ROOT%{_mandir}/ja -type f`; do
 	iconv -f euc-jp -t utf-8 $i > $i.new && mv -f $i.new $i && chmod 444 $i
 done
-install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/kcc.1
 
 %clean
@@ -49,6 +52,9 @@
 %{_mandir}/man1/kcc.1*
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-27
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-26
 - Rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 07:07:55 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 03:07:55 -0400
Subject: rpms/nkf/devel nkf.spec,1.24,1.25
Message-ID: <200709210707.l8L77tRQ003367@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332

Modified Files:
	nkf.spec 
Log Message:
more clean up


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nkf.spec	21 Sep 2007 03:52:12 -0000	1.24
+++ nkf.spec	21 Sep 2007 07:07:23 -0000	1.25
@@ -31,8 +31,8 @@
 %setup -q -n %{name}-%{nkfver}
 
 %build
-make nkf
-cp %{SOURCE3} .
+make CFLAGS="$RPM_OPT_FLAGS" nkf
+cp -p %{SOURCE3} .
 pushd NKF.mod
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor
 make
@@ -40,8 +40,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
 
 ./nkf -e nkf.1j > nkf.1jeuc
 iconv -f euc-jp -t utf-8 nkf.1jeuc > nkf.1utf8
@@ -49,31 +49,29 @@
 install -m 644 -p nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 -p nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
 pushd NKF.mod
-eval `perl '-V:installarchlib'`
-eval `perl '-V:installvendorarch'`
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f	$RPM_BUILD_ROOT$installvendorarch/perllocal.pod		\
-	$RPM_BUILD_ROOT$installarchlib/perllocal.pod		\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.bs	\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/.packlist
+rm -f	$RPM_BUILD_ROOT%{perl_vendorarch}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.bs	\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/.packlist
 popd
-chmod 0755 $RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.so
+chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc nkf.doc nkf.copyright
 %{_bindir}/nkf
 %{_mandir}/man1/nkf.1*
 %{_mandir}/ja/man1/nkf.1*
 
 %files -n perl-NKF
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc nkf.doc nkf.copyright
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/NKF.pm
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/auto
+%{perl_vendorarch}/NKF.pm
+%{perl_vendorarch}/auto
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog



From fedora-extras-commits at redhat.com  Fri Sep 21 07:40:10 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 03:40:10 -0400
Subject: fedora-security/audit fc7,1.114,1.115
Message-ID: <200709210740.l8L7eAwa004107@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4085/audit

Modified Files:
	fc7 
Log Message:
inotify-tools buffer overflow



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc7	21 Sep 2007 06:43:46 -0000	1.114
+++ fc7	21 Sep 2007 07:40:08 -0000	1.115
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031



From fedora-extras-commits at redhat.com  Fri Sep 21 08:03:53 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Fri, 21 Sep 2007 04:03:53 -0400
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.17,1.18
Message-ID: <200709210803.l8L83rDC011043@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902

Modified Files:
	nspluginwrapper.spec 
Log Message:
added original plugin dir to the package


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nspluginwrapper.spec	10 Sep 2007 08:44:43 -0000	1.17
+++ nspluginwrapper.spec	21 Sep 2007 08:03:20 -0000	1.18
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -170,6 +170,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{plugindir}
+mkdir -p $RPM_BUILD_ROOT%{pluginsourcedir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 make -C %{build_dir} install DESTDIR=$RPM_BUILD_ROOT
@@ -214,6 +215,7 @@
 %doc README COPYING NEWS
 %dir %{pkgdir}
 %dir %{plugindir}
+%dir %{pluginsourcedir}
 
 %{pkgdir}/%{plugin_config_binary}
 %{pkgdir}/npconfig
@@ -225,6 +227,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Fri Sep 21 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-3
+- added original plugin dir to the package
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-2
 - added upstream patches - RPC error handling and plugin restart
 



From fedora-extras-commits at redhat.com  Fri Sep 21 08:08:07 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:08:07 -0400
Subject: rpms/cdrkit/devel cdrkit.spec, 1.5, 1.6 genisoimage-dlength.patch,
	1.1, 1.2
Message-ID: <200709210808.l8L887TE012530@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12507

Modified Files:
	cdrkit.spec genisoimage-dlength.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
- play stupid tricks, to let alternatives make the links and
  rpm not removing them afterwards
- removed bogus warning for "." and ".."



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cdrkit.spec	20 Sep 2007 15:30:53 -0000	1.5
+++ cdrkit.spec	21 Sep 2007 08:07:34 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,9 +23,8 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives 
-Requires(post): %{_sbindir}/alternatives  
-Requires(postun): %{_sbindir}/alternatives 
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -38,9 +37,8 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -58,9 +56,8 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -92,11 +89,25 @@
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
+ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n wodim
+link=`readlink %{_bindir}/cdrecord`
+if [ "$link" == "%{_bindir}/wodim" ]; then
+        rm -f %{_bindir}/cdrecord
+fi
+link=`readlink %{_bindir}/dvdrecord`
+if [ "$link" == "wodim" ]; then
+        rm -f %{_bindir}/dvdrecord
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
 		%{_bindir}/wodim 50 \
 	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
@@ -114,6 +125,11 @@
 fi
 
 %post -n genisoimage
+link=`readlink %{_bindir}/mkisofs`
+if [ "$link" == "genisoimage" ]; then
+	rm -f %{_bindir}/mkisofs
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
 		%{_bindir}/genisoimage 50 \
 	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
@@ -126,6 +142,10 @@
 fi
 
 %post -n icedax
+link=`readlink %{_bindir}/cdda2wav`
+if [ "$link" == "icedax" ]; then
+        rm -f %{_bindir}/cdda2wav
+fi
 %{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
 		%{_bindir}/icedax 50 \
 	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
@@ -142,6 +162,8 @@
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
+%ghost %{_bindir}/cdrecord
+%ghost %{_bindir}/dvdrecord
 %{_bindir}/readom
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
@@ -152,6 +174,7 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
+%ghost %{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -162,6 +185,8 @@
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
 %{_bindir}/genisoimage
+%ghost %{_bindir}/mkisofs
+%ghost %{_bindir}/mkhybrid
 %{_bindir}/isodebug
 %{_bindir}/isodump
 %{_bindir}/isoinfo
@@ -180,6 +205,11 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
+- play stupid tricks, to let alternatives make the links and
+  rpm not removing them afterwards
+- removed bogus warning for "." and ".."
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives

genisoimage-dlength.patch:

Index: genisoimage-dlength.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/genisoimage-dlength.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genisoimage-dlength.patch	20 Sep 2007 15:30:53 -0000	1.1
+++ genisoimage-dlength.patch	21 Sep 2007 08:07:34 -0000	1.2
@@ -1,7 +1,6 @@
-diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
---- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
-+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
-@@ -1596,12 +1602,10 @@
+--- cdrkit-1.1.6/genisoimage/tree.c.dlength	2007-09-21 08:38:50.000000000 +0200
++++ cdrkit-1.1.6/genisoimage/tree.c	2007-09-21 08:41:23.000000000 +0200
+@@ -1596,12 +1596,12 @@ insert_file_entry(struct directory *this
  		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
  		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
  		!S_ISDIR(lstatbuf.st_mode)) {
@@ -11,11 +10,12 @@
 -                    filetype((int) lstatbuf.st_mode), whole_path);
 -            return (0);
 -        }
-+		fprintf(stderr,
-+		"Unknown file type (%s) %s - ignoring and continuing.\n",
-+			filetype((int) lstatbuf.st_mode), whole_path);
++		if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
++			fprintf(stderr,
++			"Unknown file type (%s) %s - ignoring and continuing.\n",
++				filetype((int) lstatbuf.st_mode), whole_path);
++		}
 +		return (0);
  	}
  	/* Who knows what trash this is - ignore and continue */
  
-



From fedora-extras-commits at redhat.com  Fri Sep 21 08:10:39 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:10:39 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec, 1.6, 1.7 genisoimage-dlength.patch, 1.1,
	1.2
Message-ID: <200709210810.l8L8Adlr012676@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12642

Modified Files:
	cdrkit.spec genisoimage-dlength.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
- play stupid tricks, to let alternatives make the links and
  rpm not removing them afterwards
- removed bogus warning for "." and ".."



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrkit.spec	20 Sep 2007 15:32:20 -0000	1.6
+++ cdrkit.spec	21 Sep 2007 08:10:06 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,9 +23,8 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives 
-Requires(post): %{_sbindir}/alternatives  
-Requires(postun): %{_sbindir}/alternatives 
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -38,9 +37,8 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -58,9 +56,8 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -92,11 +89,25 @@
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
+ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n wodim
+link=`readlink %{_bindir}/cdrecord`
+if [ "$link" == "%{_bindir}/wodim" ]; then
+        rm -f %{_bindir}/cdrecord
+fi
+link=`readlink %{_bindir}/dvdrecord`
+if [ "$link" == "wodim" ]; then
+        rm -f %{_bindir}/dvdrecord
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
 		%{_bindir}/wodim 50 \
 	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
@@ -114,6 +125,11 @@
 fi
 
 %post -n genisoimage
+link=`readlink %{_bindir}/mkisofs`
+if [ "$link" == "genisoimage" ]; then
+	rm -f %{_bindir}/mkisofs
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
 		%{_bindir}/genisoimage 50 \
 	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
@@ -126,6 +142,10 @@
 fi
 
 %post -n icedax
+link=`readlink %{_bindir}/cdda2wav`
+if [ "$link" == "icedax" ]; then
+        rm -f %{_bindir}/cdda2wav
+fi
 %{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
 		%{_bindir}/icedax 50 \
 	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
@@ -142,6 +162,8 @@
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
+%ghost %{_bindir}/cdrecord
+%ghost %{_bindir}/dvdrecord
 %{_bindir}/readom
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
@@ -152,6 +174,7 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
+%ghost %{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -162,6 +185,8 @@
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
 %{_bindir}/genisoimage
+%ghost %{_bindir}/mkisofs
+%ghost %{_bindir}/mkhybrid
 %{_bindir}/isodebug
 %{_bindir}/isodump
 %{_bindir}/isoinfo
@@ -180,6 +205,11 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
+- play stupid tricks, to let alternatives make the links and
+  rpm not removing them afterwards
+- removed bogus warning for "." and ".."
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives

genisoimage-dlength.patch:

Index: genisoimage-dlength.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/genisoimage-dlength.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genisoimage-dlength.patch	20 Sep 2007 15:25:57 -0000	1.1
+++ genisoimage-dlength.patch	21 Sep 2007 08:10:06 -0000	1.2
@@ -1,7 +1,6 @@
-diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
---- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
-+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
-@@ -1596,12 +1602,10 @@
+--- cdrkit-1.1.6/genisoimage/tree.c.dlength	2007-09-21 08:38:50.000000000 +0200
++++ cdrkit-1.1.6/genisoimage/tree.c	2007-09-21 08:41:23.000000000 +0200
+@@ -1596,12 +1596,12 @@ insert_file_entry(struct directory *this
  		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
  		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
  		!S_ISDIR(lstatbuf.st_mode)) {
@@ -11,11 +10,12 @@
 -                    filetype((int) lstatbuf.st_mode), whole_path);
 -            return (0);
 -        }
-+		fprintf(stderr,
-+		"Unknown file type (%s) %s - ignoring and continuing.\n",
-+			filetype((int) lstatbuf.st_mode), whole_path);
++		if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
++			fprintf(stderr,
++			"Unknown file type (%s) %s - ignoring and continuing.\n",
++				filetype((int) lstatbuf.st_mode), whole_path);
++		}
 +		return (0);
  	}
  	/* Who knows what trash this is - ignore and continue */
  
-



From fedora-extras-commits at redhat.com  Fri Sep 21 08:18:40 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Fri, 21 Sep 2007 04:18:40 -0400
Subject: rpms/system-config-language/devel sources,1.25,1.26
Message-ID: <200709210818.l8L8IeKo012931@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12866

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.11



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Sep 2007 06:33:24 -0000	1.25
+++ sources	21 Sep 2007 08:18:08 -0000	1.26
@@ -1 +1 @@
-66c97c10249fd9a70f5886a88293c9b0  system-config-language-1.2.10.tar.bz2
+4560a8e3ae1f8eca7c9e9139ec406580  system-config-language-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 08:19:52 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Fri, 21 Sep 2007 04:19:52 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.32,
	1.33
Message-ID: <200709210819.l8L8Jq07012959@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12937

Modified Files:
	system-config-language.spec 
Log Message:
fix bug294571.



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-language.spec	20 Sep 2007 06:35:04 -0000	1.32
+++ system-config-language.spec	21 Sep 2007 08:19:20 -0000	1.33
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,6 +73,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Fri Sep 21 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.11
+- fix bug294571.
+
 * Thu Sep 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.10
 - fix bug288851 and bug297461.
 - add the Nepali support.



From fedora-extras-commits at redhat.com  Fri Sep 21 08:47:26 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 04:47:26 -0400
Subject: rpms/nkf/devel nkf.spec,1.25,1.26
Message-ID: <200709210847.l8L8lQSU016186@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16063

Modified Files:
	nkf.spec 
Log Message:
more clean up


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nkf.spec	21 Sep 2007 07:07:23 -0000	1.25
+++ nkf.spec	21 Sep 2007 08:46:54 -0000	1.26
@@ -9,7 +9,7 @@
 Source0:	http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz
 Source3:	nkf.copyright
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	perl-ExtUtils-MakeMaker
+BuildRequires:	perl(ExtUtils::MakeMaker)
 
 Summary:	A Kanji code conversion filter
 Group:		Applications/Text
@@ -71,7 +71,7 @@
 %defattr (-, root, root, -)
 %doc nkf.doc nkf.copyright
 %{perl_vendorarch}/NKF.pm
-%{perl_vendorarch}/auto
+%{perl_vendorarch}/auto/*
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog



From fedora-extras-commits at redhat.com  Fri Sep 21 08:53:33 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:53:33 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.7,1.8
Message-ID: <200709210853.l8L8rXQT017341@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17229

Modified Files:
	cdrkit.spec 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cdrkit.spec	21 Sep 2007 08:10:06 -0000	1.7
+++ cdrkit.spec	21 Sep 2007 08:53:01 -0000	1.8
@@ -1,13 +1,15 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 
 Patch1: genisoimage-dlength.patch
+Patch2: icedax-segfault.patch
+Patch3: wodim-prtypo.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .dlength
+%patch2 -p1 -b .segf
+%patch3 -p1 -b .prtypo
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -205,6 +209,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
+- fixed rhbz#255001 - icedax --devices segfaults
+- fixed rhbz#249357 - Typo in wodim output
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards



From fedora-extras-commits at redhat.com  Fri Sep 21 08:55:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:55:53 -0400
Subject: rpms/cdrkit/F-7 icedax-segfault.patch, NONE, 1.1 wodim-prtypo.patch,
	NONE, 1.1
Message-ID: <200709210855.l8L8trX4017871@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851

Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 10:39:51.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in   %d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);



From fedora-extras-commits at redhat.com  Fri Sep 21 09:01:38 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:01:38 -0400
Subject: rpms/cernlib/devel cernlib.spec,1.62,1.63
Message-ID: <200709210901.l8L91cFG025088@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21320

Modified Files:
	cernlib.spec 
Log Message:
* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
- pass --build-id when linking, this is needed for debuginfo generation
- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
- add virtual provides for devel, utils and static packages, packages 
  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
  cernlib
- don't set the environment. It only hurts parallel installations.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cernlib.spec	27 Aug 2007 21:07:07 -0000	1.62
+++ cernlib.spec	21 Sep 2007 09:01:05 -0000	1.63
@@ -44,15 +44,18 @@
 %if %{with gfortran}
 # allows to use a suffix for the library different from the suffix
 # for the utilities
-# %%define utils_suffix -gfortran
+
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+%define utils_suffix -gfortran
 %if 0%{?g77_default_compiler}
 %define compiler -gfortran
-%define utils_suffix -gfortran
+#%%define utils_suffix -gfortran
 %endif
 %else
 %if ! 0%{?g77_default_compiler}
 %define compiler -g77
-%define utils_suffix -g77
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+#%%define utils_suffix -g77
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -65,12 +68,12 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL+ and LGPLV2+
+License:       GPL+ and LGPLv2+
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -128,6 +131,8 @@
 Source203: patchy-unpack-rceta 
 
 # Shell scripts that go in /etc/profile.d
+# Currently they are not installed since tey do more harm than good, when
+# parallel cernlib versions are installed.
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -377,6 +382,7 @@
 %endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
+Provides:  cernlib(devel) = %{version}-%{release}
 
 # for the m4 macro directory ownership
 Requires: automake
@@ -398,6 +404,7 @@
 Summary:       General purpose CERN library static libraries
 Group:         Development/Libraries
 Requires:  %{name}-devel = %{version}-%{release}
+Provides:  cernlib(static) = %{version}-%{release}
 
 %description static
 CERN program library is a large collection of general purpose libraries
@@ -414,6 +421,7 @@
 Group:     Applications/System
 Requires:  %{name}-devel = %{version}-%{release}
 Requires:  %{name}-static = %{version}-%{release}
+Provides:  cernlib(utils) = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -450,7 +458,7 @@
 %package -n %{?compat}kuipc%{?utils_suffix}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
-Requires: %{name}-devel = %{version}-%{release}
+Requires: cernlib(devel)
 
 %description -n %{?compat}kuipc%{?utils_suffix}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
@@ -461,11 +469,11 @@
 with the rest of the program. Since the generated code uses KUIP routines, 
 the program must also be linked against the Packlib library that contains them.
 
-%package packlib
+%package -n cernlib-packlib%{?utils_suffix}
 Group: Applications/Archiving
 Summary: I/O, network and other utilities from the cernlib
 
-%description packlib
+%description -n cernlib-packlib%{?utils_suffix}
 I/O, network and miscalleneous utilities based on the CERN Program 
 Library. 
 According to the responsible of the cernlib debian package, some
@@ -783,6 +791,9 @@
 sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
+sed -i.utils_suffix -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{?utils_suffix}:' src/scripts/paw
+sed -i.utils_suffix -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{?utils_suffix}:' src/graflib/dzdoc/dzedit/dzedit.script
+
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
@@ -790,7 +801,7 @@
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
-  -e 's/`cernlib /cernlib%{?compiler} /' \
+  -e 's/`cernlib /`cernlib%{?compiler} /' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -841,6 +852,8 @@
 %else
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
+# this is needed (at least in F-8).
+G_LDFLAGS='-Wl,--build-id'
 %endif
 FC_COMPILER=g77
 %endif
@@ -848,6 +861,11 @@
 PATHSAVE=$PATH
 # Build patchy version 4
 pushd ../patchy
+
+if [ z"$G_LDFLAGS" != z ]; then
+	sed -i.ldflags -e "s/f77/f77 $G_LDFLAGS/" p4boot.sh
+fi
+
 %if %{with gfortran}
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
@@ -870,6 +888,12 @@
 echo "#define InstallCmd %{__install} -p" >> ${CVSCOSRC}/config/host.def
 # don't strip executables
 echo "#define InstPgmFlags -m 0755" >> ${CVSCOSRC}/config/host.def
+# this is not used for libraries
+#   echo "#define ExtraLoadOptions $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
+
+# optflags are doubled for programs because they are in FortranDebugFlags
+# and below, but they are not doubled for libs.
+echo "#define FortranLinkCmd $FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
 
 # Create the top level Makefile with imake
 cd $CERN_ROOT/build
@@ -898,9 +922,9 @@
 mv bin/paw++ bin/paw++.dynamic
 
 # Build static paw
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
   `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
   `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
 
 # Build packlib
@@ -916,7 +940,7 @@
 cp -p -r $CERN_ROOT/src/p5boot/* .
 # there is a main program in this file, so the file is removed.
 rm p5lib/nsynopt.f
-$FC_COMPILER $FC_OPTFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
 ln -s $CERN_ROOT/build/p5boot/nypatchy $CERN_ROOT/bin/ypatchy
 
 # Build npatchy
@@ -943,8 +967,8 @@
 rm -rf %{buildroot}
 
 %{__install} -d -m755 %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
 %{__install} -p -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
@@ -987,8 +1011,8 @@
 
 # add a link to pawX11 and dzeX11 from %{_libdir}/cernlib/%{verdir}/bin
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/
-%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11
-%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
+%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 
 # to preserve symlinks and timestamps
 (cd lib && tar cf - *.a) | (cd %{buildroot}%{_libdir}/cernlib/%{verdir}/lib && tar xf -)
@@ -1131,9 +1155,10 @@
 
 %files utils
 %defattr(-,root,root,-)
+%doc cernlib-%{verdir}.csh cernlib-%{verdir}.sh
 %{_bindir}/cernlib*%{?compiler}
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
 %files -n %{?compat}paw%{?utils_suffix}
@@ -1147,7 +1172,7 @@
 # paw doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/pawX11
+%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
 %{_datadir}/X11/app-defaults/*Paw++
 %{_datadir}/icons/hicolor/
 %{_mandir}/man1/paw*.1*
@@ -1165,16 +1190,16 @@
 %{_bindir}/kuipc%{?utils_suffix}
 %{_mandir}/man1/kuipc.1*
 
-%files packlib
+%files -n cernlib-packlib%{?utils_suffix}
 %defattr(-,root,root,-)
-%doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
+%doc cernlib-*/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?utils_suffix}
 %{_bindir}/cdserv%{?utils_suffix}
 %{_bindir}/dzedit%{?utils_suffix}
 # packlib doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 %{_bindir}/dzeX11%{?utils_suffix}
 %{_bindir}/fatmen%{?utils_suffix}
 %{_bindir}/fatsrv%{?utils_suffix}
@@ -1226,6 +1251,14 @@
 
 
 %changelog
+* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
+- pass --build-id when linking, this is needed for debuginfo generation
+- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
+- add virtual provides for devel, utils and static packages, packages 
+  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
+  cernlib
+- don't set the environment. It only hurts parallel installations.
+
 * Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-18
 - correct license
 - use the right debian patch source



From fedora-extras-commits at redhat.com  Fri Sep 21 09:01:56 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:01:56 -0400
Subject: rpms/cernlib-g77/devel cernlib-g77.spec,1.2,1.3
Message-ID: <200709210901.l8L91uWX025175@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib-g77/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006

Modified Files:
	cernlib-g77.spec 
Log Message:
* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
- pass --build-id when linking, this is needed for debuginfo generation
- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
- add virtual provides for devel, utils and static packages, packages 
  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
  cernlib
- don't set the environment. It only hurts parallel installations.



Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-g77.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-g77.spec	29 Aug 2007 08:40:34 -0000	1.2
+++ cernlib-g77.spec	21 Sep 2007 09:01:17 -0000	1.3
@@ -44,15 +44,18 @@
 %if %{with gfortran}
 # allows to use a suffix for the library different from the suffix
 # for the utilities
-# %%define utils_suffix -gfortran
+
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+%define utils_suffix -gfortran
 %if 0%{?g77_default_compiler}
 %define compiler -gfortran
-%define utils_suffix -gfortran
+#%%define utils_suffix -gfortran
 %endif
 %else
 %if ! 0%{?g77_default_compiler}
 %define compiler -g77
-%define utils_suffix -g77
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+#%%define utils_suffix -g77
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -65,12 +68,12 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL+ and LGPLV2+
+License:       GPL+ and LGPLv2+
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -128,6 +131,8 @@
 Source203: patchy-unpack-rceta 
 
 # Shell scripts that go in /etc/profile.d
+# Currently they are not installed since tey do more harm than good, when
+# parallel cernlib versions are installed.
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -377,6 +382,7 @@
 %endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
+Provides:  cernlib(devel) = %{version}-%{release}
 
 # for the m4 macro directory ownership
 Requires: automake
@@ -398,6 +404,7 @@
 Summary:       General purpose CERN library static libraries
 Group:         Development/Libraries
 Requires:  %{name}-devel = %{version}-%{release}
+Provides:  cernlib(static) = %{version}-%{release}
 
 %description static
 CERN program library is a large collection of general purpose libraries
@@ -414,6 +421,7 @@
 Group:     Applications/System
 Requires:  %{name}-devel = %{version}-%{release}
 Requires:  %{name}-static = %{version}-%{release}
+Provides:  cernlib(utils) = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -450,7 +458,7 @@
 %package -n %{?compat}kuipc%{?utils_suffix}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
-Requires: %{name}-devel = %{version}-%{release}
+Requires: cernlib(devel)
 
 %description -n %{?compat}kuipc%{?utils_suffix}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
@@ -461,11 +469,11 @@
 with the rest of the program. Since the generated code uses KUIP routines, 
 the program must also be linked against the Packlib library that contains them.
 
-%package packlib
+%package -n cernlib-packlib%{?utils_suffix}
 Group: Applications/Archiving
 Summary: I/O, network and other utilities from the cernlib
 
-%description packlib
+%description -n cernlib-packlib%{?utils_suffix}
 I/O, network and miscalleneous utilities based on the CERN Program 
 Library. 
 According to the responsible of the cernlib debian package, some
@@ -783,6 +791,9 @@
 sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
+sed -i.utils_suffix -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{?utils_suffix}:' src/scripts/paw
+sed -i.utils_suffix -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{?utils_suffix}:' src/graflib/dzdoc/dzedit/dzedit.script
+
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
@@ -790,7 +801,7 @@
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
-  -e 's/`cernlib /cernlib%{?compiler} /' \
+  -e 's/`cernlib /`cernlib%{?compiler} /' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -841,6 +852,8 @@
 %else
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
+# this is needed (at least in F-8).
+G_LDFLAGS='-Wl,--build-id'
 %endif
 FC_COMPILER=g77
 %endif
@@ -848,6 +861,11 @@
 PATHSAVE=$PATH
 # Build patchy version 4
 pushd ../patchy
+
+if [ z"$G_LDFLAGS" != z ]; then
+	sed -i.ldflags -e "s/f77/f77 $G_LDFLAGS/" p4boot.sh
+fi
+
 %if %{with gfortran}
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
@@ -870,6 +888,12 @@
 echo "#define InstallCmd %{__install} -p" >> ${CVSCOSRC}/config/host.def
 # don't strip executables
 echo "#define InstPgmFlags -m 0755" >> ${CVSCOSRC}/config/host.def
+# this is not used for libraries
+#   echo "#define ExtraLoadOptions $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
+
+# optflags are doubled for programs because they are in FortranDebugFlags
+# and below, but they are not doubled for libs.
+echo "#define FortranLinkCmd $FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
 
 # Create the top level Makefile with imake
 cd $CERN_ROOT/build
@@ -898,9 +922,9 @@
 mv bin/paw++ bin/paw++.dynamic
 
 # Build static paw
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
   `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
   `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
 
 # Build packlib
@@ -916,7 +940,7 @@
 cp -p -r $CERN_ROOT/src/p5boot/* .
 # there is a main program in this file, so the file is removed.
 rm p5lib/nsynopt.f
-$FC_COMPILER $FC_OPTFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
 ln -s $CERN_ROOT/build/p5boot/nypatchy $CERN_ROOT/bin/ypatchy
 
 # Build npatchy
@@ -943,8 +967,8 @@
 rm -rf %{buildroot}
 
 %{__install} -d -m755 %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
 %{__install} -p -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
@@ -987,8 +1011,8 @@
 
 # add a link to pawX11 and dzeX11 from %{_libdir}/cernlib/%{verdir}/bin
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/
-%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11
-%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
+%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 
 # to preserve symlinks and timestamps
 (cd lib && tar cf - *.a) | (cd %{buildroot}%{_libdir}/cernlib/%{verdir}/lib && tar xf -)
@@ -1131,9 +1155,10 @@
 
 %files utils
 %defattr(-,root,root,-)
+%doc cernlib-%{verdir}.csh cernlib-%{verdir}.sh
 %{_bindir}/cernlib*%{?compiler}
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
 %files -n %{?compat}paw%{?utils_suffix}
@@ -1147,7 +1172,7 @@
 # paw doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/pawX11
+%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
 %{_datadir}/X11/app-defaults/*Paw++
 %{_datadir}/icons/hicolor/
 %{_mandir}/man1/paw*.1*
@@ -1165,16 +1190,16 @@
 %{_bindir}/kuipc%{?utils_suffix}
 %{_mandir}/man1/kuipc.1*
 
-%files packlib
+%files -n cernlib-packlib%{?utils_suffix}
 %defattr(-,root,root,-)
-%doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
+%doc cernlib-*/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?utils_suffix}
 %{_bindir}/cdserv%{?utils_suffix}
 %{_bindir}/dzedit%{?utils_suffix}
 # packlib doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 %{_bindir}/dzeX11%{?utils_suffix}
 %{_bindir}/fatmen%{?utils_suffix}
 %{_bindir}/fatsrv%{?utils_suffix}
@@ -1226,6 +1251,14 @@
 
 
 %changelog
+* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
+- pass --build-id when linking, this is needed for debuginfo generation
+- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
+- add virtual provides for devel, utils and static packages, packages 
+  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
+  cernlib
+- don't set the environment. It only hurts parallel installations.
+
 * Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-18
 - correct license
 - use the right debian patch source



From fedora-extras-commits at redhat.com  Fri Sep 21 09:09:16 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:09:16 -0400
Subject: rpms/cdrkit/F-7 wodim-prtypo.patch,1.1,1.2
Message-ID: <200709210909.l8L99Gd0026564@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26534

Modified Files:
	wodim-prtypo.patch 
Log Message:
fixed wodim print type patch

wodim-prtypo.patch:

Index: wodim-prtypo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/wodim-prtypo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wodim-prtypo.patch	21 Sep 2007 08:55:51 -0000	1.1
+++ wodim-prtypo.patch	21 Sep 2007 09:09:13 -0000	1.2
@@ -1,11 +1,20 @@
 --- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
-+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 10:39:51.000000000 +0200
++++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:02:49.000000000 +0200
 @@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
  		printf("No chance to quit anymore.");
  		goto grace_done;
  	}
 -	printf("Last chance to quit, starting %s write in  %d seconds.",
-+	printf("Last chance to quit, starting %s write in   %d seconds.",
++	printf("Last chance to quit, starting %s write in %4d seconds.",
  		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
  	flush();
  	signal(SIGINT, intr);
+@@ -1506,7 +1506,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
+ 				*didgracep = FALSE;
+ 			return (-1);
+ 		}
+-		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
++		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
+ 		flush();
+ 	}
+ grace_done:



From fedora-extras-commits at redhat.com  Fri Sep 21 09:09:32 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:09:32 -0400
Subject: rpms/cdrkit/F-7 wodim-prtypo.patch,1.2,1.3
Message-ID: <200709210909.l8L99WqU026647@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26617

Modified Files:
	wodim-prtypo.patch 
Log Message:
fixed wodim print type patch

wodim-prtypo.patch:

Index: wodim-prtypo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/wodim-prtypo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wodim-prtypo.patch	21 Sep 2007 09:09:13 -0000	1.2
+++ wodim-prtypo.patch	21 Sep 2007 09:09:30 -0000	1.3
@@ -1,5 +1,5 @@
---- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
-+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:02:49.000000000 +0200
+--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 11:06:50.000000000 +0200
++++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:06:50.000000000 +0200
 @@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
  		printf("No chance to quit anymore.");
  		goto grace_done;
@@ -9,12 +9,3 @@
  		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
  	flush();
  	signal(SIGINT, intr);
-@@ -1506,7 +1506,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
- 				*didgracep = FALSE;
- 			return (-1);
- 		}
--		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
-+		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
- 		flush();
- 	}
- grace_done:



From fedora-extras-commits at redhat.com  Fri Sep 21 09:25:10 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:25:10 -0400
Subject: rpms/cdrkit/devel icedax-segfault.patch, NONE,
	1.1 wodim-prtypo.patch, NONE, 1.1 cdrkit.spec, 1.6, 1.7
Message-ID: <200709210925.l8L9PAcX028477@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28447

Modified Files:
	cdrkit.spec 
Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 11:06:50.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:06:50.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in %4d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);


Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrkit.spec	21 Sep 2007 08:07:34 -0000	1.6
+++ cdrkit.spec	21 Sep 2007 09:24:38 -0000	1.7
@@ -1,13 +1,15 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 
 Patch1: genisoimage-dlength.patch
+Patch2: icedax-segfault.patch
+Patch3: wodim-prtypo.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .dlength
+%patch2 -p1 -b .segf
+%patch3 -p1 -b .prtypo
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -205,6 +209,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
+- fixed rhbz#255001 - icedax --devices segfaults
+- fixed rhbz#249357 - Typo in wodim output
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards



From fedora-extras-commits at redhat.com  Fri Sep 21 09:54:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:54:06 -0400
Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 tetex-tex4ht-1.0-rebuild.patch, 1.1, 1.2 tetex-tex4ht.spec,
	1.11, 1.12 tetex-tex4ht-1.0-macros.patch, 1.1,
	NONE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, 1.1,
	NONE tex4ht-1.0-fix_mk4ht.patch, 1.1, NONE
Message-ID: <200709210954.l8L9s69D029435@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	.cvsignore sources tetex-tex4ht-1.0-rebuild.patch 
	tetex-tex4ht.spec 
Removed Files:
	tetex-tex4ht-1.0-macros.patch 
	tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch 
	tex4ht-1.0-fix_mk4ht.patch 
Log Message:
* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
- update to 1.0.2007_09_04_0340
- use all the debian patches
- install correctly the scripts out of bindir
- prefix ht with tex4ht- to avoid name collisions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Aug 2007 21:51:29 -0000	1.9
+++ .cvsignore	21 Sep 2007 09:53:30 -0000	1.10
@@ -1,4 +1,4 @@
+tex4ht-1.0.2007_09_04_0340.tar.gz
 tex4ht-all-20070609.zip
-tex4ht-lit-20070717.zip
-tex4ht-1.0.2007_07_17_0228.tar.gz
-tex4ht_20060913-1.diff.gz
+tex4ht-lit-20070904.zip
+tex4ht_20070904-1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Aug 2007 21:51:29 -0000	1.10
+++ sources	21 Sep 2007 09:53:30 -0000	1.11
@@ -1,4 +1,4 @@
+dc7d1b45f9053ad3387eaadda2167b5b  tex4ht-1.0.2007_09_04_0340.tar.gz
 32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-217f977cb7e43fbb917832a8f5c77a6b  tex4ht-lit-20070717.zip
-f27125cc6da21402170faac90eeafdc5  tex4ht-1.0.2007_07_17_0228.tar.gz
-a69edc1e15d23777bc89b9f3132930b0  tex4ht_20060913-1.diff.gz
+bd797ccaf2f6819f21ce4e8827cee519  tex4ht-lit-20070904.zip
+a0650cd770a1362fb054c3cf1a3ec6b2  tex4ht_20070904-1.diff.gz

tetex-tex4ht-1.0-rebuild.patch:

Index: tetex-tex4ht-1.0-rebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht-1.0-rebuild.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-tex4ht-1.0-rebuild.patch	4 Aug 2007 21:51:29 -0000	1.1
+++ tetex-tex4ht-1.0-rebuild.patch	21 Sep 2007 09:53:30 -0000	1.2
@@ -1,240 +1,25 @@
-diff -up tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild	2007-08-04 21:22:56.000000000 +0200
-+++ tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh	2007-08-04 21:23:00.000000000 +0200
-@@ -3,6 +3,8 @@
- # This program is released into the public domain.
- # You may do whatever you please with it.
- 
-+set -x
-+
- # This script takes the literate sources for Eitan Gurari's TeX4HT
- # system and produces a directory tree like the one that is
- # distributed as a tar.gz archive. It is gleaned from the 3-4 line
-@@ -25,11 +27,17 @@
- # (b) the top-level tree of TeX4HT in src/ texmf/ bin/ 
- # (c) the Debian stuff in the subdirectory debian/
- # The new tree is built in the subdirectory dest/
-+
-+bootstrap=yes
-+[ z"$1" = 'z-k' ] && bootstrap=no
-+
- TOP=${PWD}
- LITDIR=${TOP}/lit
- DESTDIR=${TOP}/dest
- DEBDIR=${TOP}/debian
- 
-+unset  TEXINPUTS TEXMFCNF TEX4HTINPUTS T4HTINPUTS \
-+	TEX4HTFONTSET TEXINPUTS_tex4ht TEXINPUTS_t4ht
- # We need a different texmf.cnf that expands
- # TeX's memory usage. We will create this in 
- # the following directory:
-@@ -37,10 +45,10 @@ TEXMFCNF=${DESTDIR}
- # The order of directories searched for input
- # is: first the newly created files, then the
- # distributed tree and finally the existing installation.
--TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:${TOP}/texmf/tex//:
--TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:${TOP}/texmf/tex4ht/ht-fonts/:
-+TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:
-+TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:
- TEXINPUTS_tex4ht="$TEX4HTINPUTS"
- TEXINPUTS_t4ht="$T4HTINPUTS"
- 
-@@ -49,7 +57,7 @@ LC_CTYPE=C
- LANG=C
- # The installation will run some scripts like xhlatex 
- # which are installed in /usr/share/tex4ht in Debian.
--PATH=$PATH:/usr/share/tex4ht
-+PATH=$PATH:/usr/share/tex4ht:$DESTDIR/bin/linux:$DESTDIR/bin/unix
- 
- export LANG LC_CTYPE PATH
- 
-@@ -57,7 +65,7 @@ export LANG LC_CTYPE PATH
- function texclean()
- {
- 
--	rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc}
-+	rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc} mktex4ht.cnf
- 
- }
- 
-@@ -66,7 +74,9 @@ function texclean()
- function mkdirheir()
- {
- 	mkdir -p ${DESTDIR}/texmf/tex/generic/tex4ht
--	mkdir -p ${DESTDIR}/bin/{unix,win32}
-+	# these files are required for bootstrap, see below
-+	cp ${TOP}/texmf/tex/generic/tex4ht/{tex4ht,html4-math,html4,info4ht,infoht4,infomml}.4ht ${DESTDIR}/texmf/tex/generic/tex4ht
-+	mkdir -p ${DESTDIR}/bin/{unix,win32,linux}
- 	mkdir -p ${DESTDIR}/texmf/tex4ht/{xttl,bin,ht-fonts}
- 	mkdir -p ${DESTDIR}/texmf/tex4ht/base/{unix,win32}
- 	mkdir -p ${DESTDIR}/src
-@@ -119,27 +129,78 @@ function movefiles()
- [ -d ${LITDIR} -a -d ${DEBDIR} ] || \
- (echo "Must be in top-level source directory to run this"; exit 0)
- 
-+# the trick is to avoid argument list too long for rm!
-+[ $bootstrap = 'yes' ] && rm -rf ${DESTDIR}/*.htf && rm -rf ${DESTDIR}/*
-+
- # Initialise the working environment
- mkdirheir
- makesomefiles
- setupenv
-+
- cd $DESTDIR
- 
-+if [ $bootstrap = 'yes' ]; then
-+# make some 4ht files. This creates th4.4ht.
-+tex tex4ht-4ht || exit 1
-+# Now make tex4ht.sty. Indeed tex4ht-4ht and other tex files require 
-+# tex4ht.sty to do the other 4ht files
-+tex tex4ht-sty || exit 1
-+# Make cond4ht.4ht, required for next tex4ht-4ht run.
-+tex tex4ht-cond4ht || exit 1
-+# now that th4.4ht is present, mktex4ht.4ht files is created, by using
-+# tex4ht.sty. It is during that run that {tex4ht,html4-math,html4}.4ht
-+# are required.
-+tex tex4ht-4ht || exit 1
-+# creates tex4ht.4ht. Needs {info4ht,infoht4,infomml}.4ht 
-+latex tex4ht-options || exit 1
-+# remaining 4ht files required for bootstrap
-+for htype in html4 info info-html4 info-mml; do
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+done
-+# now that bootstrap is done remove the bootstrap files, and replace them
-+# with the generated files
-+rm texmf/tex/generic/tex4ht/*
-+movefiles
-+texclean
-+
-+# restart everything with the bootstraped files
-+tex tex4ht-sty || exit 1
-+tex tex4ht-cond4ht || exit 1
-+tex tex4ht-4ht || exit 1
-+latex tex4ht-options || exit 1
-+for htype in html4 info info-html4 info-mml; do
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+done
-+# install bootstrapped 4ht files
-+movefiles
-+texclean
-+fi
-+
-+# now start the build from the beginning
-+
- # Make tex4ht.c
--tex tex4ht-c
-+tex tex4ht-c || exit 1
- 
- # Make t4ht.c
--tex tex4ht-t4ht
-+tex tex4ht-t4ht || exit 1
-+
-+# Make htcmd
-+tex tex4ht-htcmd || exit 1
- 
- # Make scripts
--latex tex4ht-mkht
--latex ./mkht-scripts.4ht
-+latex tex4ht-mkht || exit 1
-+perl -c mk4ht.perl || exit 1
-+latex ./mkht-scripts.4ht || exit 1
- 
- # Make tex4ht.sty
- tex tex4ht-sty
- 
- # Make tex4ht.env
--latex tex4ht-env
-+latex tex4ht-env || exit 1
- 
- # Make basic 4ht files
- tex tex4ht-4ht
-@@ -151,7 +212,19 @@ latex tex4ht-options
- movefiles
- texclean
- 
--# For html ht styles. It is important that
-+# set the script executables
-+chmod a+x bin/unix/*
-+
-+if [ $bootstrap = 'yes' ]; then
-+# compile the executables
-+	for file in src/*.c; do
-+		basefile=`basename $file .c`
-+		#cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile || exit 1
-+		cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile -lkpathsea || exit 1
-+	done
-+fi
-+
-+# For 23 html ht styles. It is important that
- # The current directory be the last in the search
- # path for some of these builds to work.
- for htype in html4 html-speech info info-mml info-html4 \
-@@ -159,7 +232,7 @@ for htype in html4 html-speech info info
-     	jsmath javahelp info-javahelp mathml mathltx mathplayer \
-     	moz ooffice info-ooffice tei svg word unicode bibtex2
- do
--	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex || exit 1
- 	latex tex4ht-${htype}.tex
- 	latex tex4ht-${htype}.tex
- 	movefiles
-@@ -168,23 +241,32 @@ done
+diff -up tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild	2007-09-21 07:52:12.000000000 +0200
++++ tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh	2007-09-21 08:01:07.000000000 +0200
+@@ -260,11 +260,17 @@ done
  
  # The xttl files are for the experimental speech support.
  # These are built using xhlatex.
++# use javac
++# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
+ htlatex xtpipes "xhtml,3,next" "" "-d./"
 -xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
 -xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
 -xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+# xtpipes is missing? jsml.4ht is then missing as are the java files
-+# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
-+#htlatex xtpipes "xhtml,3,next" "" "-d./" || exit 1
-+xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./" || exit 1
-+htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech "html,3,sections+" || exit 1
+-htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++#htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
+ xhlatex tex4ht-html-speech "html,3,sections+"
  
  movefiles
- texclean
- 
- # Make font files. The Needs directives in this file cause "t4ht" to
- # move the files into their correct locations automatically.
--tex tex4ht-fonts-noncjk
--tex tex4ht-fonts-noncjk
--tex4ht tex4ht-fonts-noncjk
--t4ht tex4ht-fonts-noncjk
--latex tex4ht-fonts-4hf
--latex tex4ht-fonts-4hf
--tex4ht tex4ht-fonts-4hf
--t4ht tex4ht-fonts-4hf
-+for font in noncjk cjk; do
-+tex tex4ht-fonts-${font}
-+tex tex4ht-fonts-${font}
-+tex4ht tex4ht-fonts-${font}
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
-+for font in 4hf; do
-+latex tex4ht-fonts-${font} 
-+latex tex4ht-fonts-${font} 
-+tex4ht tex4ht-fonts-${font} 
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
- 
- movefiles
- texclean
-@@ -192,4 +274,6 @@ texclean
- # That's it.
- 
- exit 0
--wripro.tex
-+# latex tex4ht-auto-script fails, and the scripts don't seem to be shipped
-+# tex4ht-fonts-modern.tex lacks a preamble
-+# what is wripro.tex?


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tetex-tex4ht.spec	9 Aug 2007 13:16:16 -0000	1.11
+++ tetex-tex4ht.spec	21 Sep 2007 09:53:30 -0000	1.12
@@ -1,10 +1,12 @@
 %{!?_texmf: %define _texmf %(eval "[ -x /usr/bin/kpsewhich ] && echo `kpsewhich -expand-var '$TEXMFMAIN'` || echo %{_datadir}/texmf")}
 
+%define _scriptsdir %{_datadir}/tex4ht
+
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_07_17_0228
+Version:       1.0.2007_09_04_0340
 Release:       1%{?dist}
-License:       LaTeX
+License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
 Source0:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-%{version}.tar.gz
@@ -16,29 +18,22 @@
 Source2:       tex4ht-lppl.txt
 # unversioned upstream litteral source, downloaded with wget -N
 #Source3:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3:       tex4ht-lit-20070717.zip
+Source3:       tex4ht-lit-20070904.zip
 Source4:       http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
 Source5:       http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
 Source6:       http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
 Source7:       http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
-#Patch0:        tex4ht-1.0.2006_10_24_0142-paths.patch
 # debian
-Patch1:         http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
+Patch1:         http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20070904-1.diff.gz
 # patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
 Patch2:        texmf.cnf.patch
 # update debian rebuild script
 Patch3:        tetex-tex4ht-1.0-rebuild.patch
-# if building from literate sources, install xtpipes files in dest
-#Patch4:        tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
-# rebased from debian
-Patch5:        tex4ht-1.0-fix_mk4ht.patch
-# add required macros to tex4ht-4ht.tex for bootstrap of rebuild from
-# literate sources
-Patch6:        tetex-tex4ht-1.0-macros.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /usr/bin/kpsewhich
 BuildRequires:  tetex-fonts
+BuildRequires:  java-devel /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
 # pnmcrop and pnmtopng are in netpbm-progs. 
@@ -48,6 +43,7 @@
 # dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
 # dvipng is in tetex. tetex-latex depends on tetex.
 Requires:       tetex-latex
+Requires:       java
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -68,11 +64,6 @@
 # debian patch
 %patch1 -p1
 
-# apply debian path which avoids using xtpipes since we cannot compile it
-# debian patch doesn't apply anymore to newer source
-#patch -p1 -b -z .fix_mk4ht < debian/patches/fix_mk4ht.diff
-%patch5 -p1 -b .fix_mk4ht
-
 chmod a-x src/*.c
 cp -p %{SOURCE2} lppl.txt
 # unzip the all source for the doc
@@ -86,19 +77,24 @@
   unzip %{SOURCE3}
   chmod 0644 *.tex
 popd
-# patch literate sources
-%patch6 -p1 -b .macros
 
 cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
 
-# avoid duplicating the debian patches while still allowing to rebuild
-# from literate sources
+# avoid duplicating the debian patches
+# used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/add_manpage.diff
+# not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/fix_mk4ht.diff
+# hardcoded /usr/share
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+
 patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
 patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
 #%patch4 -p1 -b .nohome
 
-patch -p1 < debian/patches/add_manpage.diff
-
 cp -p %{PATCH2} debian/lit/
 
 %patch3 -p1 -b .rebuild
@@ -120,24 +116,42 @@
 LDFLAGS=-lkpathsea
 gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
 gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
+
+# adapted from debian Makefile
+mkdir class
+javac -d class -source 1.5 java/*.java java/xtpipes/*.java java/xtpipes/util/*.java
+fastjar -c -f tex4ht.jar -m java/manifest -C class .
 popd
 
+# beware of the %% that have to be protected as %%%%
+sed \
+  -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
+  -e "s;^tpath/tex/;t%{_texmf}/;" \
+  -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+ texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d -m755 $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_scriptsdir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
 #install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
+install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
+for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
+  install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
+done
+install -p -m755 bin/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m644 src/tex4ht.jar $RPM_BUILD_ROOT%{_scriptsdir}
 
-pushd texmf
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
-cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+cp tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 
+pushd texmf
 cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+cp -pr tex4ht/xtpipes $RPM_BUILD_ROOT%{_texmf}/tex4ht
 
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex/generic
 cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
 popd
 
@@ -147,7 +161,7 @@
    > README.kpathsea 
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-sed -e 's;@SCRIPTSDIR@;%{_bindir};' \
+sed -e 's;@SCRIPTSDIR@;%{_scriptsdir};' \
  -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
  -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \
  -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \
@@ -161,7 +175,12 @@
 %defattr(-,root,root,-)
 %{_texmf}/tex4ht/
 %{_texmf}/tex/generic/tex4ht/
-%{_bindir}/*
+%{_bindir}/ht*
+%{_bindir}/tex4ht-ht
+%{_bindir}/mk4ht
+%{_bindir}/tex4ht
+%{_bindir}/t4ht
+%{_scriptsdir}/
 %{_mandir}/man1/tex4ht.1*
 %doc lppl.txt doc tutorial README.kpathsea 
 
@@ -172,6 +191,12 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
+- update to 1.0.2007_09_04_0340
+- use all the debian patches
+- install correctly the scripts out of bindir
+- prefix ht with tex4ht- to avoid name collisions
+
 * Sat Aug  4 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_07_17_0228-1
 - update to 1.0.2007_07_17_0228
 - rename tetex-tex4ht-1.0-prev.patch to tetex-tex4ht-1.0-rebuild.patch


--- tetex-tex4ht-1.0-macros.patch DELETED ---


--- tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch DELETED ---


--- tex4ht-1.0-fix_mk4ht.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 10:03:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 21 Sep 2007 06:03:41 -0400
Subject: rpms/pygsl/devel pygsl.spec,1.13,1.14
Message-ID: <200709211003.l8LA3fif003134@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3107

Modified Files:
	pygsl.spec 
Log Message:
* Fri Sep 21 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
- License clarification.
- Use swig to regenerate the wrappers.
- Rebuild with gsl-1.10.
- Add explicit dependency on gsl version.



Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pygsl.spec	30 Aug 2007 08:32:33 -0000	1.13
+++ pygsl.spec	21 Sep 2007 10:03:06 -0000	1.14
@@ -2,11 +2,15 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
+%{expand: %%define gslver %(gsl-config --version)}
+
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.1
-Release:       5%{?dist}
-License:       GPLv2
+Release:       6%{?dist}
+# The package is mostly GPL+ but there are two scripts
+# GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
+License:       GPLv2+
 Group:         Development/Libraries
 
 Url:           http://pygsl.sourceforge.net
@@ -17,7 +21,10 @@
 BuildRequires: numpy
 BuildRequires: gsl-devel
 BuildRequires: python-devel
+# Only need if the generated sources are different from the version used in source
+BuildRequires: swig
 Requires:      numpy
+Requires:      gsl = %{gslver}
 
 %description
 This project provides a python interface for the GNU scientific library (gsl)
@@ -27,7 +34,7 @@
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      python-devel
-Requires:      gsl-devel
+Requires:      gsl-devel = %{gslver}
 
 %description devel
 Development files for pygsl
@@ -37,6 +44,7 @@
 
 %build
 cp %{SOURCE1} .
+rm -f swig_src/gslwrap_wrap.c
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
@@ -58,6 +66,12 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
+- License clarification.
+- Use swig to regenerate the wrappers.
+- Rebuild with gsl-1.10.
+- Add explicit dependency on gsl version.
+
 * Thu Aug 30 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-5
 - Fix typo in Requires for subpackage devel.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 11:18:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Fri, 21 Sep 2007 07:18:27 -0400
Subject: rpms/xulrunner/devel xulrunner.spec, 1.18,
	1.19 firefox-1.5-ppc64.patch, 1.2, NONE
Message-ID: <200709211118.l8LBIR2U010785@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760

Modified Files:
	xulrunner.spec 
Removed Files:
	firefox-1.5-ppc64.patch 
Log Message:
removed firefox-1.5-ppc64.patch and package clean-up




Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xulrunner.spec	20 Sep 2007 18:02:04 -0000	1.18
+++ xulrunner.spec	21 Sep 2007 11:17:54 -0000	1.19
@@ -7,8 +7,6 @@
 
 %define official_branding 0
 
-#ExcludeArch: ppc64 ppc
-
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
@@ -45,8 +43,7 @@
 # font system fixes
 
 # Other
-#Patch104:       firefox-1.5-ppc64.patch
-Patch105:       mozilla-firefox-head.ppc64.patch
+Patch104:       mozilla-firefox-head.ppc64.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -124,8 +121,7 @@
 %patch2   -R -p1 -b .camellia256
 %patch3   -p1
 
-#%patch104 -p1 -b .ppc64
-%patch105 -p0 -b .ppc64
+%patch104 -p0 -b .ppc64
 
 # For branding specific patches.
 


--- firefox-1.5-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 12:01:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Fri, 21 Sep 2007 08:01:56 -0400
Subject: rpms/rcs/devel rcs-5.7-newsvnsyntax.patch, NONE, 1.1 rcs.spec, 1.18,
	1.19
Message-ID: <200709211201.l8LC1u5q018148@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/rcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098

Modified Files:
	rcs.spec 
Added Files:
	rcs-5.7-newsvnsyntax.patch 
Log Message:
Fixed new SVN tag syntax.


rcs-5.7-newsvnsyntax.patch:

--- NEW FILE rcs-5.7-newsvnsyntax.patch ---
diff -rup rcs-5.7/src/ident.c rcs-5.7mzk/src/ident.c
--- rcs-5.7/src/ident.c	1995-06-16 08:19:24.000000000 +0200
+++ rcs-5.7mzk/src/ident.c	2007-07-17 15:23:15.000000000 +0200
@@ -228,12 +228,18 @@ match(fp)   /* group substring between t
    char line[BUFSIZ];
    register int c;
    register char * tp;
+   int COLON_C = 0;
+   int MAX_COLON = 1;
 
    tp = line;
-   while ((c = getc(fp)) != VDELIM) {
+   while ((c = getc(fp)) && (COLON_C < MAX_COLON)) {
       if (c == EOF  &&  feof(fp) | ferror(fp))
 	 return c;
       switch (ctab[c]) {
+     case COLON:
+                *tp++ = c;
+                COLON_C++;
+                break;
 	 case LETTER: case Letter:
 	    *tp++ = c;
 	    if (tp < line+sizeof(line)-4)
@@ -245,7 +251,12 @@ match(fp)   /* group substring between t
    }
    if (tp == line)
       return c;
-   *tp++ = c;
+      if(c == ' '){
+          ungetc(c,fp);
+      }
+      else{
+          *tp++ = c;
+      }
    if ((c = getc(fp)) != ' ')
       return c ? c : '\n';
    *tp++ = c;


Index: rcs.spec
===================================================================
RCS file: /cvs/extras/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rcs.spec	12 Jul 2006 07:57:51 -0000	1.18
+++ rcs.spec	21 Sep 2007 12:01:22 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 30.1
+Release: 31
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -10,6 +10,7 @@
 Patch1: rcs-5.7-security.patch
 Patch2: rcs-5.7-sameuserlocks.patch
 Patch3: rcs-5.7-option.patch
+Patch4: rcs-5.7-newsvnsyntax.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .security
 %patch2 -p1 -b .sameuserlocks
 %patch3 -p1 -b .option
+%patch4 -p1 -b .newsvnsyntax
 
 autoconf
 
@@ -56,6 +58,10 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Jul 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 5.7-31
+- Addded support for new svn syntax.
+- Resolves: #247998
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 12:05:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Fri, 21 Sep 2007 08:05:05 -0400
Subject: rpms/mrtg/devel filter-provides-mrtg.sh,1.1,1.2
Message-ID: <200709211205.l8LC55MW018265@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18227

Modified Files:
	filter-provides-mrtg.sh 
Log Message:
fix filter-provides script


Index: filter-provides-mrtg.sh
===================================================================
RCS file: /cvs/extras/rpms/mrtg/devel/filter-provides-mrtg.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filter-provides-mrtg.sh	20 Sep 2007 09:21:13 -0000	1.1
+++ filter-provides-mrtg.sh	21 Sep 2007 12:04:33 -0000	1.2
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 /usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'
+exit 0



From fedora-extras-commits at redhat.com  Fri Sep 21 12:48:21 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 08:48:21 -0400
Subject: rpms/cups/devel cups-str2512.patch,1.2,1.3 cups.spec,1.362,1.363
Message-ID: <200709211248.l8LCmL56019796@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19769

Modified Files:
	cups.spec 
Added Files:
	cups-str2512.patch 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
- Write printcap when remote printers have timed out (bug #290831).


cups-str2512.patch:

Index: cups-str2512.patch
===================================================================
RCS file: cups-str2512.patch
diff -N cups-str2512.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cups-str2512.patch	21 Sep 2007 12:48:18 -0000	1.3
@@ -0,0 +1,11 @@
+diff -up cups-1.3.2/scheduler/dirsvc.c.str2512 cups-1.3.2/scheduler/dirsvc.c
+--- cups-1.3.2/scheduler/dirsvc.c.str2512	2007-09-21 13:46:23.000000000 +0100
++++ cups-1.3.2/scheduler/dirsvc.c	2007-09-21 13:46:54.000000000 +0100
+@@ -912,6 +912,7 @@ cupsdSendBrowseList(void)
+         cupsArraySave(Printers);
+         cupsdDeletePrinter(p, 1);
+         cupsArrayRestore(Printers);
++        cupsdWritePrintcap();
+       }
+     }
+   }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- cups.spec	19 Sep 2007 12:17:39 -0000	1.362
+++ cups.spec	21 Sep 2007 12:48:18 -0000	1.363
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -38,6 +38,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
+Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
@@ -147,6 +148,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
+%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
@@ -443,6 +445,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
+- Write printcap when remote printers have timed out (bug #290831).
+
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
 - Include Till Kamppeter's dnssd backend.
 - 1.3.2.



From fedora-extras-commits at redhat.com  Fri Sep 21 12:50:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 08:50:57 -0400
Subject: rpms/kdepim/devel sources,1.40.6.1,1.40.6.2
Message-ID: <200709211250.l8LCovHB020042@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Modified Files:
      Tag: kdepim-enterprise-branch
	sources 
Log Message:
fix corrupted/truncated sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40.6.1
retrieving revision 1.40.6.2
diff -u -r1.40.6.1 -r1.40.6.2
--- sources	20 Sep 2007 18:10:00 -0000	1.40.6.1
+++ sources	21 Sep 2007 12:50:24 -0000	1.40.6.2
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-23d93b3a795d7dd84331549fa3e95c29  kdepim-enterprise-svn_r714749.tar.bz2
+f6fe9c4ca9f3407e9a79aba22e478726  kdepim-enterprise-svn_r714749.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 12:52:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 08:52:33 -0400
Subject: rpms/kdepim/devel kdepim.spec, 1.131.4.1,
	1.131.4.2 kdepim-3.5.7-kde#140549.patch, 1.1, NONE
Message-ID: <200709211252.l8LCqXRM020190@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20123

Modified Files:
      Tag: kdepim-enterprise-branch
	kdepim.spec 
Removed Files:
      Tag: kdepim-enterprise-branch
	kdepim-3.5.7-kde#140549.patch 
Log Message:
omit upstreamed patch
fix %%debug macro usage



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131.4.1
retrieving revision 1.131.4.2
diff -u -r1.131.4.1 -r1.131.4.2
--- kdepim.spec	20 Sep 2007 18:10:00 -0000	1.131.4.1
+++ kdepim.spec	21 Sep 2007 12:52:01 -0000	1.131.4.2
@@ -38,8 +38,6 @@
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -120,15 +118,15 @@
 %setup -q %{?ent_date: -n %{name}}
 
 %ifarch s390 s390x
+# FIXME: use KDE_NO_COMPILE=kpilot and/or --without-pilot-link  -- Rex
 %patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
 install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+#patch4 -p1 -b .libz
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -143,7 +141,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-   %{?debug:--disable-debug --disable-warnings} \
+   %{!?debug:--disable-debug --disable-warnings} \
    %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \


--- kdepim-3.5.7-kde#140549.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 13:01:31 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 21 Sep 2007 09:01:31 -0400
Subject: rpms/calc/devel .cvsignore,1.2,1.3 calc.spec,1.3,1.4
Message-ID: <200709211301.l8LD1VDf026513@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20467

Modified Files:
	.cvsignore calc.spec 
Log Message:
* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
  to Denis Leroy and David Woodhouse. RH Bug #299581.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2007 17:16:44 -0000	1.2
+++ .cvsignore	21 Sep 2007 13:00:58 -0000	1.3
@@ -1 +1,2 @@
 calc-2.12.2.1.tar.gz
+clog


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- calc.spec	20 Sep 2007 18:26:06 -0000	1.3
+++ calc.spec	21 Sep 2007 13:00:58 -0000	1.4
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -36,8 +36,6 @@
 
 Requires:      less >= 358
 
-# Temporary! This is due to a build bug; should be fixed shortly.
-ExcludeArch:   ppc
 
 %description
 Calc is an arbitrary precision C-like arithmetic system that is a
@@ -112,6 +110,7 @@
 %else
      USE_READLINE="" \
 %endif
+     HAVE_FPOS="-DHAVE_NO_FPOS" \
      T=%{buildroot} \
      BINDIR=%{_bindir} \
      LIBDIR=%{_libdir} \
@@ -218,6 +217,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
+- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
+  to Denis Leroy and David Woodhouse. RH Bug #299581.
+
 * Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
 - Remove extra license choice information from package release field to
   properly comply with the packaging guidelines so as to not make Spot sad.



From fedora-extras-commits at redhat.com  Fri Sep 21 13:02:21 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 21 Sep 2007 09:02:21 -0400
Subject: rpms/calc/F-7 .cvsignore,1.2,1.3 calc.spec,1.2,1.3
Message-ID: <200709211302.l8LD2LQB026558@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26526

Modified Files:
	.cvsignore calc.spec 
Log Message:
* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
  to Denis Leroy and David Woodhouse. RH Bug #299581.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2007 17:08:24 -0000	1.2
+++ .cvsignore	21 Sep 2007 13:01:48 -0000	1.3
@@ -1 +1,2 @@
 calc-2.12.2.1.tar.gz
+clog


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/calc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calc.spec	20 Sep 2007 18:26:58 -0000	1.2
+++ calc.spec	21 Sep 2007 13:01:48 -0000	1.3
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -36,8 +36,6 @@
 
 Requires:      less >= 358
 
-# Temporary! This is due to a build bug; should be fixed shortly.
-ExcludeArch:   ppc
 
 %description
 Calc is an arbitrary precision C-like arithmetic system that is a
@@ -112,6 +110,7 @@
 %else
      USE_READLINE="" \
 %endif
+     HAVE_FPOS="-DHAVE_NO_FPOS" \
      T=%{buildroot} \
      BINDIR=%{_bindir} \
      LIBDIR=%{_libdir} \
@@ -218,6 +217,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
+- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
+  to Denis Leroy and David Woodhouse. RH Bug #299581.
+
 * Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
 - Remove extra license choice information from package release field to
   properly comply with the packaging guidelines so as to not make Spot sad.



From fedora-extras-commits at redhat.com  Fri Sep 21 13:03:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 09:03:41 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.131.4.2,1.131.4.3
Message-ID: <200709211303.l8LD3fG1026744@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26676

Modified Files:
      Tag: kdepim-enterprise-branch
	kdepim.spec 
Log Message:
%%dist tag went awol, put back



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131.4.2
retrieving revision 1.131.4.3
diff -u -r1.131.4.2 -r1.131.4.3
--- kdepim.spec	21 Sep 2007 12:52:01 -0000	1.131.4.2
+++ kdepim.spec	21 Sep 2007 13:02:45 -0000	1.131.4.3
@@ -26,9 +26,9 @@
 
 %if 0%{?ent_date} > 0
 Source0: kdepim-enterprise-svn_r%{ent_rev}.tar.bz2
-Release: 8.%{ent_date}.%{ent_rev}.ent
+Release: 8.%{ent_date}.%{ent_rev}.ent%{?dist}
 %else
-Release: 8
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 Source1: cr48-app-kandy.png



From fedora-extras-commits at redhat.com  Fri Sep 21 13:12:07 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Fri, 21 Sep 2007 09:12:07 -0400
Subject: rpms/libzzub/devel libzzub-doclocationfix.patch, NONE,
	1.1 libzzub.spec, 1.2, 1.3
Message-ID: <200709211312.l8LDC7Ok026987@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26958/devel

Modified Files:
	libzzub.spec 
Added Files:
	libzzub-doclocationfix.patch 
Log Message:
revision -8

libzzub-doclocationfix.patch:

--- NEW FILE libzzub-doclocationfix.patch ---
diff -up libzzub-0.2.3/SConstruct.doclocationfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.doclocationfix	2007-09-20 15:58:09.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-20 16:01:57.000000000 +0200
@@ -238,6 +238,7 @@ binpath = "${DESTDIR}${PREFIX}/bin"
 libpath = "${DESTDIR}${PREFIX}${LIBDIR}"
 includepath = "${DESTDIR}${PREFIX}/include"
 pluginpath = "${DESTDIR}${PREFIX}${LIBDIR}/zzub"
+docpath = "${DESTDIR}${PREFIX}/share/doc/libzzub-%s" % VERSION
 
 def install(target, source, perm=None, symlink=False):
 	if not perm:
@@ -261,7 +262,7 @@ def install_bin(source):
 def install_plugin(source):
 	return install(pluginpath, source)
 def install_plugin_help(name, files):
-	return install("${DESTDIR}${PREFIX}/share/doc/zzub/plugins/"+name, files, 0644)
+	return install(docpath + "/plugins/%s" % name, files, 0644)
 
 env['DSPLIB_SRC_PATH'] = '${ROOTPATH}/src/dsplib'
 env['ASIOSDK_SRC_PATH'] = '${ROOTPATH}/src/ASIOSDK2'
@@ -590,3 +591,4 @@ if hasattr(env, 'MSVSSolution'):
 install(includepath+'/zzub', 'include/zzub/plugin.h')
 install(includepath+'/zzub', 'include/zzub/types.h')
 install(includepath+'/zzub', 'include/zzub/signature.h')
+install(docpath, ['ChangeLog', 'CREDITS', 'LICENCE', 'REVISION'])


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub.spec	17 Sep 2007 16:19:05 -0000	1.2
+++ libzzub.spec	21 Sep 2007 13:11:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -18,6 +18,7 @@
 Patch0:		libzzub-buildfix.patch
 Patch1:		libzzub-sonamefix.patch
 Patch2:		libzzub-internalflacfix.patch
+Patch3:		libzzub-doclocationfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	ppc64
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .sonamefix
 mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
 %patch2 -p1 -b .internalflacfix
+%patch3 -p1 -b .doclocationfix
 
 
 %build
@@ -99,15 +101,6 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_docdir}
-%{__mv} zzub %{name}-%{version}
-
-%{__mkdir_p} %{name}-devel-%{version}/examples
-cd %{name}-devel-%{version}/examples
-%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
-%{__rm} -f */*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -120,24 +113,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS LICENCE REVISION
 %{_bindir}/ccmplayer
 %{_libdir}/liblunarstd.so
 %{_libdir}/*.so.*
 %{_libdir}/zzub
 %{_libdir}/lunar
+%{_defaultdocdir}/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libzzub.so
-%{_defaultdocdir}/%{name}-devel-%{version}
 
 %files -n pyzzub
 %defattr(-,root,root,-)
 %{python_sitelib}/zzub
 
 %changelog
+* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
+- included patch to install missing documentation to the right place
+- removed move macro instead
+- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right
+
 * Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
 - re-added pyzzub python-devel build requirement
 - explicitly nailed the name of pyzzub



From fedora-extras-commits at redhat.com  Fri Sep 21 13:13:19 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Fri, 21 Sep 2007 09:13:19 -0400
Subject: rpms/libzzub/F-7 libzzub-doclocationfix.patch, NONE,
	1.1 libzzub.spec, 1.2, 1.3
Message-ID: <200709211313.l8LDDJcZ027072@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27049/F-7

Modified Files:
	libzzub.spec 
Added Files:
	libzzub-doclocationfix.patch 
Log Message:
revision -8

libzzub-doclocationfix.patch:

--- NEW FILE libzzub-doclocationfix.patch ---
diff -up libzzub-0.2.3/SConstruct.doclocationfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.doclocationfix	2007-09-20 15:58:09.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-20 16:01:57.000000000 +0200
@@ -238,6 +238,7 @@ binpath = "${DESTDIR}${PREFIX}/bin"
 libpath = "${DESTDIR}${PREFIX}${LIBDIR}"
 includepath = "${DESTDIR}${PREFIX}/include"
 pluginpath = "${DESTDIR}${PREFIX}${LIBDIR}/zzub"
+docpath = "${DESTDIR}${PREFIX}/share/doc/libzzub-%s" % VERSION
 
 def install(target, source, perm=None, symlink=False):
 	if not perm:
@@ -261,7 +262,7 @@ def install_bin(source):
 def install_plugin(source):
 	return install(pluginpath, source)
 def install_plugin_help(name, files):
-	return install("${DESTDIR}${PREFIX}/share/doc/zzub/plugins/"+name, files, 0644)
+	return install(docpath + "/plugins/%s" % name, files, 0644)
 
 env['DSPLIB_SRC_PATH'] = '${ROOTPATH}/src/dsplib'
 env['ASIOSDK_SRC_PATH'] = '${ROOTPATH}/src/ASIOSDK2'
@@ -590,3 +591,4 @@ if hasattr(env, 'MSVSSolution'):
 install(includepath+'/zzub', 'include/zzub/plugin.h')
 install(includepath+'/zzub', 'include/zzub/types.h')
 install(includepath+'/zzub', 'include/zzub/signature.h')
+install(docpath, ['ChangeLog', 'CREDITS', 'LICENCE', 'REVISION'])


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub.spec	17 Sep 2007 16:22:54 -0000	1.2
+++ libzzub.spec	21 Sep 2007 13:12:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -18,6 +18,7 @@
 Patch0:		libzzub-buildfix.patch
 Patch1:		libzzub-sonamefix.patch
 Patch2:		libzzub-internalflacfix.patch
+Patch3:		libzzub-doclocationfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	ppc64
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .sonamefix
 mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
 %patch2 -p1 -b .internalflacfix
+%patch3 -p1 -b .doclocationfix
 
 
 %build
@@ -99,15 +101,6 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_docdir}
-%{__mv} zzub %{name}-%{version}
-
-%{__mkdir_p} %{name}-devel-%{version}/examples
-cd %{name}-devel-%{version}/examples
-%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
-%{__rm} -f */*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -120,24 +113,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS LICENCE REVISION
 %{_bindir}/ccmplayer
 %{_libdir}/liblunarstd.so
 %{_libdir}/*.so.*
 %{_libdir}/zzub
 %{_libdir}/lunar
+%{_defaultdocdir}/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libzzub.so
-%{_defaultdocdir}/%{name}-devel-%{version}
 
 %files -n pyzzub
 %defattr(-,root,root,-)
 %{python_sitelib}/zzub
 
 %changelog
+* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
+- included patch to install missing documentation to the right place
+- removed move macro instead
+- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right
+
 * Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
 - re-added pyzzub python-devel build requirement
 - explicitly nailed the name of pyzzub



From fedora-extras-commits at redhat.com  Fri Sep 21 13:27:07 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Sep 2007 09:27:07 -0400
Subject: rpms/gcin/devel gcin.spec,1.22,1.23
Message-ID: <200709211327.l8LDR7C0028052@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912

Modified Files:
	gcin.spec 
Log Message:
use _sysconfig in post



Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gcin.spec	20 Sep 2007 01:01:59 -0000	1.22
+++ gcin.spec	21 Sep 2007 13:26:34 -0000	1.23
@@ -78,7 +78,7 @@
 /sbin/ldconfig
 %{_bindir}/update-gtk-immodules %{_host} >/dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
-  %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc /etc/X11/xinit/xinput.d/gcin.conf 40
+  %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf 40
 
 %postun
 /sbin/ldconfig



From fedora-extras-commits at redhat.com  Fri Sep 21 14:01:41 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Fri, 21 Sep 2007 07:01:41 -0700
Subject: [pkgdb] kdepimlibs: kkofler has requested watchcommits
Message-ID: <200709211401.l8LE1gNc000393@app3.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the watchcommits acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:01:42 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Fri, 21 Sep 2007 07:01:42 -0700
Subject: [pkgdb] kdepimlibs: kkofler has requested commit
Message-ID: <200709211401.l8LE1hFd009628@app4.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:11 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested watchbugzilla
Message-ID: <200709211402.l8LE2BAk009804@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:11 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested watchcommits
Message-ID: <200709211402.l8LE2C4K009814@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:12 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested commit
Message-ID: <200709211402.l8LE2CiL000582@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:14 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:14 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested approveacls
Message-ID: <200709211402.l8LE2E1d000603@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the approveacls acl on kdepimlibs (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:26 -0700
Subject: [pkgdb] kdepimlibs had groupAcl changed
Message-ID: <200709211402.l8LE2QXV009889@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kdepimlibs (Fedora devel) to Approved for cvsextras

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:07:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:07:30 -0700
Subject: [pkgdb] kdepimlibs had groupAcl changed
Message-ID: <200709211407.l8LE7UQL002438@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kdepimlibs (Fedora devel) to Denied for cvsextras

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:08:17 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Fri, 21 Sep 2007 10:08:17 -0400
Subject: rpms/pam/devel pam-0.99.8.1-xauth-no-free.patch, NONE,
	1.1 pam-0.99.7.1-namespace-homedir.patch, 1.2, 1.3 pam.spec,
	1.158, 1.159
Message-ID: <200709211408.l8LE8HP7002761@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2735

Modified Files:
	pam-0.99.7.1-namespace-homedir.patch pam.spec 
Added Files:
	pam-0.99.8.1-xauth-no-free.patch 
Log Message:
* Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
- do not preserve contexts when copying skel and other namespace.init
  fixes (#298941)
- do not free memory sent to putenv (#231698)


pam-0.99.8.1-xauth-no-free.patch:

--- NEW FILE pam-0.99.8.1-xauth-no-free.patch ---
diff -up Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c
--- Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free	2007-09-21 16:02:06.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c	2007-09-21 16:02:47.000000000 +0200
@@ -573,6 +573,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 				   "can't set environment variable '%s'",
 				   xauthority);
 		putenv (xauthority); /* The environment owns this string now. */
+		xauthority = NULL;
 
 		/* set $DISPLAY in pam handle to make su - work */
 		{

pam-0.99.7.1-namespace-homedir.patch:

Index: pam-0.99.7.1-namespace-homedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.7.1-namespace-homedir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam-0.99.7.1-namespace-homedir.patch	24 Aug 2007 13:35:26 -0000	1.2
+++ pam-0.99.7.1-namespace-homedir.patch	21 Sep 2007 14:08:14 -0000	1.3
@@ -1,29 +1,47 @@
 diff -up Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init
---- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir	2007-08-24 10:40:46.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-08-24 15:33:52.000000000 +0200
-@@ -1,9 +1,24 @@
+--- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir	2007-09-19 19:37:26.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-09-21 14:13:52.000000000 +0200
+@@ -1,26 +1,24 @@
  #!/bin/sh -p
 -# This is only a boilerplate for the instance initialization script.
  # It receives polydir path as $1, the instance path as $2, 
  # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
  # and user name in $4.
  #
+-# If you intend to polyinstantiate /tmp and you also want to use the X windows
+-# environment, you will have to use this script to bind mount the socket that
+-# is used by the X server to communicate with its clients. X server places
+-# this socket in /tmp/.X11-unix directory, which will get obscured by
+-# polyinstantiation. Uncommenting the following lines will bind mount
+-# the relevant directory at an alternative location (/.tmp/.X11-unix) such
+-# that the X server, window manager and X clients, can still find the
+-# socket X0 at the polyinstanted /tmp/.X11-unix.
+-#
+-#if [ $1 = /tmp ]; then
+-#	if [ ! -f /.tmp/.X11-unix ]; then
+-#		mkdir -p /.tmp/.X11-unix
+-#	fi
+-#	mount --bind /tmp/.X11-unix /.tmp/.X11-unix
+-#	cp -fp -- /tmp/.X0-lock "$2/.X0-lock"
+-#	mkdir -- "$2/.X11-unix"
+-#	ln -fs -- /.tmp/.X11-unix/X0 "$2/.X11-unix/X0"
+-#fi
 +# The following section will copy the contents of /etc/skel if this is a
 +# newly created home directory.
 +if [ "$3" = 1 ]; then
++        # This line will fix the labeling on all newly created directories
++        [ -x /sbin/restorecon ] && /sbin/restorecon "$1"
 +        user="$4"
 +        passwd=$(getent passwd "$user")
 +        homedir=$(echo "$passwd" | cut -f6 -d":")
 +        if [ "$1" = "$homedir" ]; then
 +                gid=$(echo "$passwd" | cut -f4 -d":")
-+                cp -aT /etc/skel "$homedir"
-+                [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir"
++                cp -rT /etc/skel "$homedir"
 +                chown -R "$user":"$gid" "$homedir"
 +                mode=$(awk '/^UMASK/{gsub("#.*$", "", $2); printf "%o", and(0777,compl(strtonum("0" $2))); exit}' /etc/login.defs)
 +                chmod ${mode:-700} "$homedir"
++                [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir"
 +        fi
 +fi
-+#
- # If you intend to polyinstantiate /tmp and you also want to use the X windows
- # environment, you will have to use this script to bind mount the socket that
- # is used by the X server to communicate with its clients. X server places
+ 
+ exit 0


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- pam.spec	19 Sep 2007 18:11:42 -0000	1.158
+++ pam.spec	21 Sep 2007 14:08:14 -0000	1.159
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 8%{?dist}
+Release: 9%{?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
@@ -43,6 +43,7 @@
 Patch44: pam-0.99.7.1-namespace-homedir.patch
 Patch45: pam-0.99.8.1-selinux-permit.patch
 Patch46: pam-0.99.8.1-succif-in-operator.patch
+Patch47: pam-0.99.8.1-xauth-no-free.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -111,6 +112,7 @@
 %patch44 -p1 -b .homedir
 %patch45 -p1 -b .permit
 %patch46 -p1 -b .in-operator
+%patch47 -p1 -b .no-free
 
 autoreconf
 
@@ -403,6 +405,11 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
+- do not preserve contexts when copying skel and other namespace.init
+  fixes (#298941)
+- do not free memory sent to putenv (#231698)
+
 * Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
 - add pam_selinux_permit module
 - pam_succeed_if: fix in operator (#295151)



From fedora-extras-commits at redhat.com  Fri Sep 21 14:15:33 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:15:33 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.164,1.165
Message-ID: <200709211415.l8LEFXBW003008@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2987

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
- Updated db to 20070919.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- foomatic.spec	15 Aug 2007 11:52:02 -0000	1.164
+++ foomatic.spec	21 Sep 2007 14:15:01 -0000	1.165
@@ -1,4 +1,4 @@
-%define dbver 20070614
+%define dbver 20070919
 %define enginever 3.0-20070614
 %define filtersver 20070614
 %define hpijsver 20070614
@@ -261,6 +261,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
+- Updated db to 20070919.
+
 * Wed Aug 15 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-50
 - Removed references to unshipped drivers:
   * drv_x125



From fedora-extras-commits at redhat.com  Fri Sep 21 14:22:47 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 10:22:47 -0400
Subject: rpms/kdelibs4/devel kde4.csh, NONE, 1.1 kde4.sh, NONE,
	1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1 kdelibs-3.93.0-kde149703.diff, NONE,
	1.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211422.l8LEMlXe003249@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kde4.csh kde4.sh kdelibs-3.93.0-colorscheme-hack.diff 
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
	kdelibs-3.93.0-parallel-devel.diff kdelibs4.spec 
Log Message:
New package kdelibs4 - K Desktop Environment 4 - Libraries
(copied from kdelibs-kde4-branch, kdelibs.spec renamed to kdelibs4.spec to match guidelines)


--- NEW FILE kde4.csh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr

## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
   if ( "$PRELINKING" == "yes" )  then
     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
   endif
endif

if ( ! $?QT_PLUGIN_PATH ) then
  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
endif


--- NEW FILE kde4.sh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS

## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
  fi
fi

if [ -z "$QT_PLUGIN_PATH" ]; then
  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
fi

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
Index: xmlgui/kxmlguiclient.cpp
===================================================================
--- xmlgui/kxmlguiclient.cpp	(revision 709581)
+++ xmlgui/kxmlguiclient.cpp	(working copy)
@@ -785,11 +785,11 @@
     allDocuments.append( d );
   }
 
-  QList<DocStruct>::Iterator best = allDocuments.end();
+  QList<DocStruct>::const_iterator best = allDocuments.end();
   uint bestVersion = 0;
 
-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
+  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
   for (; docIt != docEnd; ++docIt )
   {
     QString versionStr = findVersionNumber( (*docIt).data );
@@ -814,19 +814,19 @@
   {
     if ( best != allDocuments.begin() )
     {
-      QList<DocStruct>::Iterator local = allDocuments.begin();
+      QList<DocStruct>::iterator local = allDocuments.begin();
+      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
 
-      // load the local document and extract the action properties
-      QDomDocument document;
-      document.setContent( (*local).data );
+        // load the local document and extract the action properties
+        QDomDocument document;
+        document.setContent( (*local).data );
 
-      ActionPropertiesMap properties = extractActionProperties( document );
+        ActionPropertiesMap properties = extractActionProperties( document );
 
-      // in case the document has a ActionProperties section
-      // we must not delete it but copy over the global doc
-      // to the local and insert the ActionProperties section
-      if ( !properties.isEmpty() )
-      {
+        // in case the document has a ActionProperties section
+        // we must not delete it but copy over the global doc
+        // to the local and insert the ActionProperties section
+        if ( !properties.isEmpty() ) {
           // now load the global one with the higher version number
           // into memory
           document.setContent( (*best).data );
@@ -845,14 +845,14 @@
             f.write( utf8data.constData(), utf8data.length() );
             f.close();
           }
+        }
+        else
+        {
+          QString f = (*local).file;
+          QString backup = f + QLatin1String( ".backup" );
+          QFile::rename( f, backup );
+        }
       }
-      else
-      {
-        QString f = (*local).file;
-        QString backup = f + QLatin1String( ".backup" );
-        QDir dir;
-        dir.rename( f, backup );
-      }
     }
     doc = (*best).data;
     return (*best).file;

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


--- NEW FILE kdelibs4.spec ---

# TODO:
# 1. package some noarch bits separately: apidocs.

Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 9%{?dist}

%if 0%{?fedora} > 8
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
Provides:  kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
%endif

# LGPLv2: everything, except (see below)
# BSD: kdoctools/
# GFDL: kdoctools/customization ?
License: LGPLv2 and BSD
URL:     http://www.kde.org/
Group:   System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for macros.kde4
BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
Requires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
#Requires: kde4-settings

Source1: kde4.sh
Source2: kde4.csh

# make -devel packages parallel-installable
Patch0: kdelibs-3.93.0-parallel-devel.diff
# fix kde#149703
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149704
Patch2: kdelibs-3.93.0-kde149704.diff
# fix kde#149705
Patch3: kdelibs-3.93.0-kde149705.diff
# KColorScheme was in a state of transition when Beta 2 was released, so
# disabled text isn't handled properly. This hack restores the August 27
# behavior (while keeping the August 29 API).
Patch4: kdelibs-3.93.0-colorscheme-hack.diff

BuildRequires: qt4-devel >= 4.3.0
%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
Requires: qt4 >= %{qt4_ver} 
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils

BuildRequires: alsa-lib-devel
BuildRequires: aspell-devel
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: cups-devel cups
BuildRequires: enchant-devel
BuildRequires: gamin-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: shared-mime-info
BuildRequires: soprano-devel
BuildRequires: strigi-devel >= 0.5.5
BuildRequires: zlib-devel

%description
Libraries for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" == "kdelibs4"
%else
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides:  kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
Requires: openssl-devel
Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
## FIXME/TODO: trim these down  -- Rex
#Requires: libxslt-devel aspell-devel giflib-devel
#Requires: libpng-devel gettext-devel
#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
#Requires: krb5-devel
#Requires: alsa-lib-devel avahi-devel
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdelibs-%{version}
%patch0 -p1
%patch1 -p1
pushd kdeui
%patch2 -p0
popd
%patch3 -p1
%patch4 -p1


%build

mkdir -p %{_target_platform}
pushd %{_target_platform} 
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1

# FIXME/TODO: apidocs
# doc/api/doxygen.sh --doxdatadir=doc/common .


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# see also use-of/patching of XDG_MENU_PREFIX in kdebase
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
   %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu

# fix file conflict with mozilla's js (kde#149840)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs

# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd

install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh


%post
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :

%postun 
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING COPYING-DOCS COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
# kdewidgets
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu

%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/


%changelog
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch

* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
  (workaround for #244065 no longer needed, fixed in 3.93.0)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification

* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
  ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info

* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)

* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups

* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug 

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)

* Wed May 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4

* Mon Mar 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta

* Sat Mar 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR

* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so

* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:29:45 -0000	1.1
+++ .cvsignore	21 Sep 2007 14:22:15 -0000	1.2
@@ -0,0 +1,3 @@
+clog
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:29:45 -0000	1.1
+++ sources	21 Sep 2007 14:22:15 -0000	1.2
@@ -0,0 +1 @@
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 14:26:34 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 10:26:34 -0400
Subject: rpms/kdelibs4/F-7 kde4.csh, NONE, 1.1 kde4.sh, NONE,
	1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1 kdelibs-3.93.0-kde149703.diff, NONE,
	1.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211426.l8LEQYlB003433@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3395/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	kde4.csh kde4.sh kdelibs-3.93.0-colorscheme-hack.diff 
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
	kdelibs-3.93.0-parallel-devel.diff kdelibs4.spec 
Log Message:
New package kdelibs4 - K Desktop Environment 4 - Libraries
(copied from kdelibs-kde4-branch, kdelibs.spec renamed to kdelibs4.spec to match guidelines)


--- NEW FILE kde4.csh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr

## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
   if ( "$PRELINKING" == "yes" )  then
     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
   endif
endif

if ( ! $?QT_PLUGIN_PATH ) then
  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
endif


--- NEW FILE kde4.sh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS

## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
  fi
fi

if [ -z "$QT_PLUGIN_PATH" ]; then
  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
fi

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
Index: xmlgui/kxmlguiclient.cpp
===================================================================
--- xmlgui/kxmlguiclient.cpp	(revision 709581)
+++ xmlgui/kxmlguiclient.cpp	(working copy)
@@ -785,11 +785,11 @@
     allDocuments.append( d );
   }
 
-  QList<DocStruct>::Iterator best = allDocuments.end();
+  QList<DocStruct>::const_iterator best = allDocuments.end();
   uint bestVersion = 0;
 
-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
+  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
   for (; docIt != docEnd; ++docIt )
   {
     QString versionStr = findVersionNumber( (*docIt).data );
@@ -814,19 +814,19 @@
   {
     if ( best != allDocuments.begin() )
     {
-      QList<DocStruct>::Iterator local = allDocuments.begin();
+      QList<DocStruct>::iterator local = allDocuments.begin();
+      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
 
-      // load the local document and extract the action properties
-      QDomDocument document;
-      document.setContent( (*local).data );
+        // load the local document and extract the action properties
+        QDomDocument document;
+        document.setContent( (*local).data );
 
-      ActionPropertiesMap properties = extractActionProperties( document );
+        ActionPropertiesMap properties = extractActionProperties( document );
 
-      // in case the document has a ActionProperties section
-      // we must not delete it but copy over the global doc
-      // to the local and insert the ActionProperties section
-      if ( !properties.isEmpty() )
-      {
+        // in case the document has a ActionProperties section
+        // we must not delete it but copy over the global doc
+        // to the local and insert the ActionProperties section
+        if ( !properties.isEmpty() ) {
           // now load the global one with the higher version number
           // into memory
           document.setContent( (*best).data );
@@ -845,14 +845,14 @@
             f.write( utf8data.constData(), utf8data.length() );
             f.close();
           }
+        }
+        else
+        {
+          QString f = (*local).file;
+          QString backup = f + QLatin1String( ".backup" );
+          QFile::rename( f, backup );
+        }
       }
-      else
-      {
-        QString f = (*local).file;
-        QString backup = f + QLatin1String( ".backup" );
-        QDir dir;
-        dir.rename( f, backup );
-      }
     }
     doc = (*best).data;
     return (*best).file;

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


--- NEW FILE kdelibs4.spec ---

# TODO:
# 1. package some noarch bits separately: apidocs.

Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 9%{?dist}

%if 0%{?fedora} > 8
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
Provides:  kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
%endif

# LGPLv2: everything, except (see below)
# BSD: kdoctools/
# GFDL: kdoctools/customization ?
License: LGPLv2 and BSD
URL:     http://www.kde.org/
Group:   System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for macros.kde4
BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
Requires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
#Requires: kde4-settings

Source1: kde4.sh
Source2: kde4.csh

# make -devel packages parallel-installable
Patch0: kdelibs-3.93.0-parallel-devel.diff
# fix kde#149703
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149704
Patch2: kdelibs-3.93.0-kde149704.diff
# fix kde#149705
Patch3: kdelibs-3.93.0-kde149705.diff
# KColorScheme was in a state of transition when Beta 2 was released, so
# disabled text isn't handled properly. This hack restores the August 27
# behavior (while keeping the August 29 API).
Patch4: kdelibs-3.93.0-colorscheme-hack.diff

BuildRequires: qt4-devel >= 4.3.0
%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
Requires: qt4 >= %{qt4_ver} 
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils

BuildRequires: alsa-lib-devel
BuildRequires: aspell-devel
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: cups-devel cups
BuildRequires: enchant-devel
BuildRequires: gamin-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: shared-mime-info
BuildRequires: soprano-devel
BuildRequires: strigi-devel >= 0.5.5
BuildRequires: zlib-devel

%description
Libraries for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" == "kdelibs4"
%else
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides:  kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
Requires: openssl-devel
Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
## FIXME/TODO: trim these down  -- Rex
#Requires: libxslt-devel aspell-devel giflib-devel
#Requires: libpng-devel gettext-devel
#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
#Requires: krb5-devel
#Requires: alsa-lib-devel avahi-devel
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdelibs-%{version}
%patch0 -p1
%patch1 -p1
pushd kdeui
%patch2 -p0
popd
%patch3 -p1
%patch4 -p1


%build

mkdir -p %{_target_platform}
pushd %{_target_platform} 
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1

# FIXME/TODO: apidocs
# doc/api/doxygen.sh --doxdatadir=doc/common .


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# see also use-of/patching of XDG_MENU_PREFIX in kdebase
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
   %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu

# fix file conflict with mozilla's js (kde#149840)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs

# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd

install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh


%post
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :

%postun 
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING COPYING-DOCS COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
# kdewidgets
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu

%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/


%changelog
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch

* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
  (workaround for #244065 no longer needed, fixed in 3.93.0)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification

* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
  ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info

* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)

* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups

* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug 

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)

* Wed May 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4

* Mon Mar 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta

* Sat Mar 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR

* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so

* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:29:45 -0000	1.1
+++ .cvsignore	21 Sep 2007 14:26:01 -0000	1.2
@@ -0,0 +1,3 @@
+clog
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:29:45 -0000	1.1
+++ sources	21 Sep 2007 14:26:01 -0000	1.2
@@ -0,0 +1 @@
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 14:27:52 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:27:52 -0400
Subject: rpms/foomatic/devel .cvsignore,1.49,1.50 sources,1.51,1.52
Message-ID: <200709211427.l8LERqqC003472@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
- Updated db to 20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	14 Jun 2007 10:01:23 -0000	1.49
+++ .cvsignore	21 Sep 2007 14:27:20 -0000	1.50
@@ -43,3 +43,4 @@
 foomatic-db-hpijs-20070614.tar.gz
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
+foomatic-db-3.0-20070919.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Jun 2007 10:01:23 -0000	1.51
+++ sources	21 Sep 2007 14:27:20 -0000	1.52
@@ -1,4 +1,4 @@
 8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
-aa9d9cf8dc42ce7a61e6d4506098aebb  foomatic-db-3.0-20070614.tar.gz
+fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:29:50 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 10:29:50 -0400
Subject: fedora-security/audit fc6,1.265,1.266 fc7,1.115,1.116
Message-ID: <200709211429.l8LETo34003566@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532/audit

Modified Files:
	fc6 fc7 
Log Message:
update on some older kde issues



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- fc6	21 Sep 2007 06:43:46 -0000	1.265
+++ fc6	21 Sep 2007 14:29:48 -0000	1.266
@@ -133,6 +133,7 @@
 CVE-2007-1352 fixed (libXfont) #235265 [since FEDORA-2007-423]
 CVE-2007-1351 fixed (libXfont) #235265 [since FEDORA-2007-423]
 CVE-2007-1349 backport (mod_perl) [since FEDORA-2007-577]
+CVE-2007-1308 version (kdelibs)
 CVE-2007-1263 version (gnupg, fixed 1.4.7) [since FEDORA-2007-315]
 CVE-2007-1262 version (squirrelmail, fixed 1.4.10a) #239704 [since FEDORA-2007-505]
 CVE-2007-1218 backport (tcpdump) 232349 [since FEDORA-2007-347]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc7	21 Sep 2007 07:40:08 -0000	1.115
+++ fc7	21 Sep 2007 14:29:48 -0000	1.116
@@ -285,8 +285,8 @@
 CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
 CVE-2007-1599 version (wordpress, fixed 2.1.3-0.rc2) #233703
 CVE-2007-1583 version (php, fixed 5.2.2)
-CVE-2007-1565 ignore (konqueror) client crash
-CVE-2007-1564 vulnerable (konqueror) [#CVE-2007-1564]
+CVE-2007-1565 ignore (konqueror) client crash, duplicate of CVE-2007-1308
+CVE-2007-1564 version (kdelibs) affects konqueror
 CVE-2007-1562 version (mozilla) #241840
 CVE-2007-1560 version (squid, fixed 2.6.STABLE12)
 CVE-2007-1558 version (balsa) [since FEDORA-2007-1447]
@@ -339,6 +339,7 @@
 *CVE-2007-1322 ** (qemu) #238723
 *CVE-2007-1321 ** (qemu) #238723
 *CVE-2007-1320 ** (qemu) #238723
+CVE-2007-1308 version (kdelibs)
 CVE-2007-1287 ignore (php) See NVD
 CVE-2007-1286 version (php, PHP4 only)
 CVE-2007-1285 version (php, 5.2.2)



From fedora-extras-commits at redhat.com  Fri Sep 21 14:31:02 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:31:02 -0400
Subject: rpms/foomatic/devel .cvsignore, 1.50, 1.51 foomatic.spec, 1.165,
	1.166 sources, 1.52, 1.53
Message-ID: <200709211431.l8LEV2kI003651@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3586

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
- Updated filters to 3.0-20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	21 Sep 2007 14:27:20 -0000	1.50
+++ .cvsignore	21 Sep 2007 14:30:30 -0000	1.51
@@ -44,3 +44,4 @@
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
 foomatic-db-3.0-20070919.tar.gz
+foomatic-filters-3.0-20070919.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- foomatic.spec	21 Sep 2007 14:15:01 -0000	1.165
+++ foomatic.spec	21 Sep 2007 14:30:30 -0000	1.166
@@ -1,12 +1,12 @@
 %define dbver 20070919
 %define enginever 3.0-20070614
-%define filtersver 20070614
+%define filtersver 20070919
 %define hpijsver 20070614
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    50%{?dist}
+Release:    51%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -261,7 +261,8 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
+- Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 
 * Wed Aug 15 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-50


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	21 Sep 2007 14:27:20 -0000	1.52
+++ sources	21 Sep 2007 14:30:30 -0000	1.53
@@ -1,4 +1,4 @@
-8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
 fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz
+edc1e340b90d55240d84299bec75b9c7  foomatic-filters-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:33:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 21 Sep 2007 10:33:34 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.9,1.10
Message-ID: <200709211433.l8LEXY9j003779@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3758

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Fri Sep 21 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-9
- Really remove all mylar references in mylyn feature - courtesy
  Mandriva package.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-mylyn.spec	20 Sep 2007 16:01:06 -0000	1.9
+++ eclipse-mylyn.spec	21 Sep 2007 14:33:01 -0000	1.10
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -167,9 +167,10 @@
 %patch6
 popd
 
-#sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
 sed --in-place -e "304,456d" org.eclipse.mylyn-feature/feature.xml 
+sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
+%{__grep} mylar org.eclipse.mylyn-feature/feature.xml && exit 1
 
 %build
 SDK=$(cd SDK > /dev/null && pwd)
@@ -456,6 +457,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-9
+- Really remove all mylar references in mylyn feature - courtesy
+  Mandriva package.
+
 * Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
 - Add patch and source to have common bugzilla servers by default.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 14:34:44 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:34:44 -0400
Subject: rpms/foomatic/F-7 .cvsignore, 1.46, 1.47 foomatic.spec, 1.156,
	1.157 sources, 1.48, 1.49
Message-ID: <200709211434.l8LEYi7k003843@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3797

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
- Updated filters to 3.0-20070919.
- Updated db to 20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	14 Jun 2007 12:28:40 -0000	1.46
+++ .cvsignore	21 Sep 2007 14:34:11 -0000	1.47
@@ -44,3 +44,5 @@
 foomatic-db-hpijs-20070614.tar.gz
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
+foomatic-db-3.0-20070919.tar.gz
+foomatic-filters-3.0-20070919.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/foomatic.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- foomatic.spec	14 Jun 2007 12:28:40 -0000	1.156
+++ foomatic.spec	21 Sep 2007 14:34:11 -0000	1.157
@@ -1,12 +1,12 @@
-%define dbver 20070614
+%define dbver 20070919
 %define enginever 3.0-20070614
-%define filtersver 20070614
+%define filtersver 20070919
 %define hpijsver 20070614
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    47.1%{?dist}
+Release:    47.2%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -255,6 +255,10 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
+- Updated filters to 3.0-20070919.
+- Updated db to 20070919.
+
 * Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.1
 - Safe default margins for PPDs (bug #244161).
 - Added missing IEEE 1284 ID for HP Photosmart 380 (bug #241352).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	14 Jun 2007 12:28:40 -0000	1.48
+++ sources	21 Sep 2007 14:34:11 -0000	1.49
@@ -1,4 +1,4 @@
-8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
-aa9d9cf8dc42ce7a61e6d4506098aebb  foomatic-db-3.0-20070614.tar.gz
+fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz
+edc1e340b90d55240d84299bec75b9c7  foomatic-filters-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:37 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:37 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEecNE013033@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:38 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:38 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEedKI021919@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:39 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:39 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEeeEH021933@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:40 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:40 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested approveacls
Message-ID: <200709211440.l8LEeeoK013052@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the approveacls acl on python-xmpp (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:42 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:42 -0700
Subject: [pkgdb] python-xmpp: silfreed has given up approveacls
Message-ID: <200709211440.l8LEegja013076@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has given up the approveacls acl on python-xmpp (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:47 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:47 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEel1V021986@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:48 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:48 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEemh8022001@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:49 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:49 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEenMf013127@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:51 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:51 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEepti013144@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:53 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:53 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEerJg022037@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:54 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:54 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEesen022057@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:17 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:17 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgIJm013612@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:18 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:18 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgIfq022483@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:19 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:19 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgJox013632@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:22 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:22 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgMqR013656@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:23 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:23 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgNVF013667@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:25 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:25 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgP5J022531@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:26 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:26 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgQAG013688@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:26 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:26 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgQt0022547@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:27 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:27 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgRvj013707@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 14:47:50 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 10:47:50 -0400
Subject: rpms/im-chooser/devel im-chooser-constraint-of-language.patch, 1.1, 
	1.2 im-chooser.spec, 1.21, 1.22
Message-ID: <200709211447.l8LEloR3004399@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4356

Modified Files:
	im-chooser-constraint-of-language.patch im-chooser.spec 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
- Bring up IM by default again, except the session is on Live CD. (#250226)

im-chooser-constraint-of-language.patch:

Index: im-chooser-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser-constraint-of-language.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-chooser-constraint-of-language.patch	30 Jul 2007 00:21:29 -0000	1.1
+++ im-chooser-constraint-of-language.patch	21 Sep 2007 14:47:16 -0000	1.2
@@ -1,19 +1,23 @@
-diff -ruN im-chooser-0.4.0.orig/data/xinput.sh.in.in im-chooser-0.4.0/data/xinput.sh.in.in
---- im-chooser-0.4.0.orig/data/xinput.sh.in.in	2007-07-25 23:06:26.000000000 +0900
-+++ im-chooser-0.4.0/data/xinput.sh.in.in	2007-07-25 23:27:56.000000000 +0900
-@@ -35,7 +35,14 @@
+diff -ruN im-chooser-0.5.2.orig/data/xinput.sh.in.in im-chooser-0.5.2/data/xinput.sh.in.in
+--- im-chooser-0.5.2.orig/data/xinput.sh.in.in	2007-09-10 08:56:37.000000000 +0900
++++ im-chooser-0.5.2/data/xinput.sh.in.in	2007-09-21 23:40:51.000000000 +0900
+@@ -35,7 +35,18 @@
  if [ -r "$USER_XINPUTRC" -a "x$IM_CHOOSER_DISABLE_USER_XINPUTRC" = "xno" ]; then
      source "$USER_XINPUTRC"
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
-+    # FIXME: This hardcoded list has to be gone in the future.
-+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
-+    for i in $_language_list; do
-+        if echo $tmplang | grep -q -E "^$i"; then
-+            source "$SYS_XINPUTRC"
-+            break
-+        fi
-+    done
++    # only apply the hardcoded list for Live CD
++    if [ -h /dev/live-osimg ]; then
++        _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++        for i in $_language_list; do
++            if echo $tmplang | grep -q -E "^$i"; then
++                source "$SYS_XINPUTRC"
++                break
++            fi
++        done
++    else
++        source "$SYS_XINPUTRC"
++    fi
  fi
  
  [ -z "$XIM" ] && XIM=none


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- im-chooser.spec	18 Sep 2007 11:03:58 -0000	1.21
+++ im-chooser.spec	21 Sep 2007 14:47:16 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
+- Bring up IM by default again, except the session is on Live CD. (#250226)
+
 * Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
 - New upstream release.
   - Fix to allow users disabling IM.



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:30 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:30 -0400
Subject: rpms/cacti/EL-4 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvU6F004992@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/EL-4

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:11 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:56:58 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:33 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:33 -0400
Subject: rpms/cacti/EL-5 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvXKb004998@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/EL-5

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:13 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:35 -0400
Subject: rpms/cacti/F-7 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvZRe005001@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/F-7

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:16 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:38 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:38 -0400
Subject: rpms/cacti/FC-6 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvcFP005004@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/FC-6

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:20 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:06 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:41 -0400
Subject: rpms/cacti/devel graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.13,
	1.14 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvf2p005008@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/devel

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cacti.spec	14 Sep 2007 21:30:22 -0000	1.13
+++ cacti.spec	21 Sep 2007 14:57:08 -0000	1.14
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 15:14:14 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 21 Sep 2007 11:14:14 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-xen-sleazy-fpu-i386.patch, NONE, 
	1.1 linux-2.6-xen-sleazy-fpu-x86_64.patch, NONE,
	1.1 xen-vmx-fpu-ts-fix.patch, NONE, 1.1 kernel-xen.spec, 1.47, 1.48
Message-ID: <200709211514.l8LFEEWO011525@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11474

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-sleazy-fpu-i386.patch 
	linux-2.6-xen-sleazy-fpu-x86_64.patch xen-vmx-fpu-ts-fix.patch 
Log Message:
Floating point fixes

- Fix for bug #294011 (floating point corruption)
  (changeset 8c24767501ff from Xen 3.1.1)
- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
  programs



linux-2.6-xen-sleazy-fpu-i386.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-i386.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190313016 10800
# Node ID 8792a16b6dd531cad0ed28d9bef86e3e597ea8db
# Parent  35983eae211a531bd50bcd177a9da77d48631e2c
Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/entry-xen.S
--- a/arch/i386/kernel/entry-xen.S	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
@@ -950,7 +950,9 @@ device_available_emulate:
 device_available_emulate:
 #endif
 	preempt_stop(CLBR_ANY)
-	call math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	call __math_state_restore
 	jmp ret_from_exception
 	CFI_ENDPROC
 
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -597,7 +597,9 @@ struct task_struct fastcall * __switch_t
 		mcl->op      = __HYPERVISOR_fpu_taskswitch;
 		mcl->args[0] = 1;
 		mcl++;
-	}
+	} else
+		prev_p->fpu_counter = 0;
+
 #if 0 /* lazy fpu sanity check */
 	else BUG_ON(!(read_cr0() & 8));
 #endif
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1012,17 +1012,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	/* NB. 'clts' is done for us by Xen during virtual trap. */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1041,17 +1041,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	clts();		/* Allow maths ops (or we recurse) */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION

linux-2.6-xen-sleazy-fpu-x86_64.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-x86_64.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190317568 10800
# Node ID ab958de6e67d1b4f6c321cd46d2793d2409b91fd
# Parent  8792a16b6dd531cad0ed28d9bef86e3e597ea8db
x86_64: Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 16:46:08 2007 -0300
@@ -1071,7 +1071,9 @@ END(simd_coprocessor_error)
 END(simd_coprocessor_error)
 
 ENTRY(device_not_available)
-	zeroentry math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	zeroentry __math_state_restore
 END(device_not_available)
 
 	/* runs on exception stack */
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -637,7 +637,8 @@ __switch_to(struct task_struct *prev_p, 
 	if (prev_p->thread_info->status & TS_USEDFPU) {
 		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
 		HYPERVISOR_fpu_taskswitch(1);
-	}
+	} else
+		prev_p->fpu_counter = 0;
 
 	/* 
 	 * Switch the PDA context.
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1064,16 +1064,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-        /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1056,16 +1056,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-	clts();			/* Allow maths ops (or we recurse) */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 void __init trap_init(void)

xen-vmx-fpu-ts-fix.patch:

--- NEW FILE xen-vmx-fpu-ts-fix.patch ---
# HG changeset patch
# User Steven Hand <steven at xensource.com>
# Date 1189784017 -3600
# Node ID 8c24767501ff25f28a0dab638116b560de294da7
# Parent  eec47edb2a25fde7075e2e17dee638216d2e5582
Ensure CR0.TS is set for VMX domains regardless of the current
state of the real TS bit. This fixes a number of subtle FP
corruption issues within PV domains when running alongside VMX ones.

Signed-off-by: Steven Hand <steven at xensource.com>
xen-unstable changeset: 15216:6f13c3be08fa4c044868144672783f7b1341999a
xen-unstable date: Mon Jun 04 16:47:48 2007 +0100

diff -r eec47edb2a25 -r 8c24767501ff xen/arch/x86/hvm/vmx/vmcs.c
--- xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
+++ xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
@@ -338,7 +338,7 @@ static void construct_vmcs(struct vcpu *
 #endif
 
     /* Host control registers. */
-    __vmwrite(HOST_CR0, read_cr0());
+    __vmwrite(HOST_CR0, read_cr0() | X86_CR0_TS);
     __vmwrite(HOST_CR4, read_cr4());
 
     /* Host CS:RIP. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kernel-xen.spec	13 Sep 2007 19:57:59 -0000	1.47
+++ kernel-xen.spec	21 Sep 2007 15:13:42 -0000	1.48
@@ -408,6 +408,11 @@
 Patch963: linux-2.6-xen-add-packet_auxdata-cmsg-2.patch
 Patch964: linux-2.6-xen-af_packet-no-skb_checksum_setup.patch
 
+# Fix sleazy-FPU implementation
+Patch965: linux-2.6-xen-sleazy-fpu-i386.patch
+Patch966: linux-2.6-xen-sleazy-fpu-x86_64.patch
+
+
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -522,6 +527,12 @@
 # Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
 Patch20002: xen-vpic-irqbase-mode.patch
 
+# Fix bz#294011: floating point corruption issues
+# changeset 8c24767501ff from Xen 3.1.1
+Patch20003: xen-vmx-fpu-ts-fix.patch
+
+
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -939,6 +950,8 @@
 %patch962 -p1
 %patch963 -p1
 %patch964 -p1
+%patch965 -p1
+%patch966 -p1
 %endif
 
 #
@@ -1168,6 +1181,7 @@
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
+%patch20003 -p1
 
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
@@ -2058,6 +2072,12 @@
 #  - tux.
 
 %changelog
+* Fri Sep 21 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Add fix for bug #294011 (floating point corruption)
+  (changeset 8c24767501ff from Xen 3.1.1)
+- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
+  programs
+
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Hypervisor-side of fix for bug #248398: HVM domain hangs during (F-7)
   install. Backport of fix from xen-unstable: 15239:656b8175f4f2.



From fedora-extras-commits at redhat.com  Fri Sep 21 15:17:40 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:17:40 -0400
Subject: rpms/kdelibs4/devel kdelibs4.spec,1.1,1.2
Message-ID: <200709211517.l8LFHe5u011760@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11687/devel

Modified Files:
	kdelibs4.spec 
Log Message:
ExcludeArch: ppc64 (#300571)


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/kdelibs4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs4.spec	21 Sep 2007 14:22:15 -0000	1.1
+++ kdelibs4.spec	21 Sep 2007 15:17:08 -0000	1.2
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -24,6 +24,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300571
+ExcludeArch: ppc64
+
 # for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
@@ -230,7 +233,10 @@
 
 
 %changelog
-* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-10
+- ExcludeArch: ppc64 (#300571)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.93.0-9
 - -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 - update sources
 - sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



From fedora-extras-commits at redhat.com  Fri Sep 21 15:19:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:19:56 -0400
Subject: rpms/kdelibs4/F-7 kdelibs4.spec,1.1,1.2
Message-ID: <200709211519.l8LFJunH011877@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11849/F-7

Modified Files:
	kdelibs4.spec 
Log Message:
ExcludeArch: ppc64 (#300571)


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs4.spec	21 Sep 2007 14:26:01 -0000	1.1
+++ kdelibs4.spec	21 Sep 2007 15:19:24 -0000	1.2
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -24,6 +24,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300571
+ExcludeArch: ppc64
+
 # for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
@@ -230,7 +233,10 @@
 
 
 %changelog
-* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-10
+- ExcludeArch: ppc64 (#300571)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.93.0-9
 - -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 - update sources
 - sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



From fedora-extras-commits at redhat.com  Fri Sep 21 15:33:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:33:56 -0400
Subject: rpms/kdepimlibs/F-7 kdepimlibs.spec,1.9,1.10
Message-ID: <200709211533.l8LFXu6h012646@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597/F-7

Modified Files:
	kdepimlibs.spec 
Log Message:
ExcludeArch: ppc64 (#300591)


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/kdepimlibs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
+++ kdepimlibs.spec	21 Sep 2007 15:33:24 -0000	1.10
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,6 +12,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300591
+ExcludeArch: ppc64
+
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -119,6 +122,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- ExcludeArch: ppc64 (#300591)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - delete KMail/KNode transport migration scripts which break KDE 3
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:33:59 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:33:59 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.9,1.10
Message-ID: <200709211533.l8LFXx69012650@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
ExcludeArch: ppc64 (#300591)


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
+++ kdepimlibs.spec	21 Sep 2007 15:33:26 -0000	1.10
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,6 +12,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300591
+ExcludeArch: ppc64
+
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -119,6 +122,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- ExcludeArch: ppc64 (#300591)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - delete KMail/KNode transport migration scripts which break KDE 3
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:41:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 11:41:47 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.44, 1.45 NetworkManager.spec,
	1.165, 1.166 sources, 1.63, 1.64
Message-ID: <200709211541.l8LFfltT012974@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	20 Sep 2007 14:06:41 -0000	1.44
+++ .cvsignore	21 Sep 2007 15:41:14 -0000	1.45
@@ -4,3 +4,5 @@
 nm-applet-0.7.0.svn129.tar.gz
 NetworkManager-0.7.0.svn2833.tar.gz
 nm-applet-0.7.0.svn186.tar.gz
+NetworkManager-0.7.0.svn2844.tar.gz
+nm-applet-0.7.0.svn190.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- NetworkManager.spec	20 Sep 2007 14:06:41 -0000	1.165
+++ NetworkManager.spec	21 Sep 2007 15:41:14 -0000	1.166
@@ -7,18 +7,18 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2833
+%define snapshot svn2844
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.2.%{snapshot}%{?dist}
+Release: 0.3.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn186.tar.gz
+Source1: nm-applet-%{version}.svn190.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.7.0-missing-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -259,6 +259,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
+- New snapshot
+
 * Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
 - New SVN snapshot of 0.7 that sucks less
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	20 Sep 2007 14:06:41 -0000	1.63
+++ sources	21 Sep 2007 15:41:14 -0000	1.64
@@ -1,2 +1,2 @@
-da84c73ca684fd3abb154ea51c9a06fe  NetworkManager-0.7.0.svn2833.tar.gz
-98fefe2757a8be652e315b251941ed66  nm-applet-0.7.0.svn186.tar.gz
+f30eb054387f0a7efb2fdda7ed43c8a9  NetworkManager-0.7.0.svn2844.tar.gz
+bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 15:49:02 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 21 Sep 2007 11:49:02 -0400
Subject: devel/pygtk2 pygtk-treeview-convert.patch, NONE, 1.1 pygtk2.spec,
	1.8, 1.9
Message-ID: <200709211549.l8LFn2O1013499@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pygtk2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13430

Modified Files:
	pygtk2.spec 
Added Files:
	pygtk-treeview-convert.patch 
Log Message:
* Fri Sep 21 2007 Jeremy Katz <katzj at redhat.com> - 2.12.0-2.fc8
- fix crash using TreeView.convert_widget_to_bin_window_coords


pygtk-treeview-convert.patch:

--- NEW FILE pygtk-treeview-convert.patch ---
Index: gtk/gtktreeview.override
===================================================================
--- gtk/gtktreeview.override	(revision 2907)
+++ gtk/gtktreeview.override	(working copy)
@@ -3321,7 +3321,7 @@
     return Py_None;
 }
 %%
-override gtk_tree_view_convert_widget_to_bin_window_coords args
+override gtk_tree_view_convert_widget_to_bin_window_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_widget_to_bin_window_coords(PyGObject *self,
                                                         PyObject *args,
@@ -3342,7 +3342,7 @@
     return Py_BuildValue("(ii)", window_x, window_y);
 }
 %%
-override gtk_tree_view_convert_widget_to_tree_coords args
+override gtk_tree_view_convert_widget_to_tree_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_widget_to_tree_coords(PyGObject *self,
                                                   PyObject *args,
@@ -3363,7 +3363,7 @@
     return Py_BuildValue("(ii)", tree_x, tree_y);
 }
 %%
-override gtk_tree_view_convert_tree_to_widget_coords args
+override gtk_tree_view_convert_tree_to_widget_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_tree_to_widget_coords(PyGObject *self,
                                                   PyObject *args,
@@ -3384,7 +3384,7 @@
     return Py_BuildValue("(ii)", widget_x, widget_y);
 }
 %%
-override gtk_tree_view_convert_tree_to_bin_window_coords args
+override gtk_tree_view_convert_tree_to_bin_window_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_tree_to_bin_window_coords(PyGObject *self,
                                                       PyObject *args,
@@ -3405,7 +3405,7 @@
     return Py_BuildValue("(ii)", window_x, window_y);
 }
 %%
-override gtk_tree_view_convert_bin_window_to_widget_coords args
+override gtk_tree_view_convert_bin_window_to_widget_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_bin_window_to_widget_coords(PyGObject *self,
                                                         PyObject *args,
@@ -3426,7 +3426,7 @@
     return Py_BuildValue("(ii)", widget_x, widget_y);
 }
 %%
-override gtk_tree_view_convert_bin_window_to_tree_coords args
+override gtk_tree_view_convert_bin_window_to_tree_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_bin_window_to_tree_coords(PyGObject *self,
                                                       PyObject *args,


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/devel/pygtk2/pygtk2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygtk2.spec	16 Sep 2007 22:32:18 -0000	1.8
+++ pygtk2.spec	21 Sep 2007 15:48:29 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name: pygtk2
 Version: 2.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -21,6 +21,9 @@
 # RH bug #217430 / GNOME bug #380020
 Patch1: pygtk2-2.10.3-install-extrafuncs.patch
 
+# fix segfault using treeview coordinate conversion methods (GNOME #479012)
+Patch2: pygtk-treeview-convert.patch
+
 ### Dependencies ###
 
 Requires: gtk2 >= 2.9.4
@@ -83,6 +86,7 @@
 %setup -q -n pygtk-%{version}
 %patch0 -p1
 %patch1 -p1 -b .install-extrafuncs
+%patch2 -p0 
 
 %build
 %configure --enable-thread --enable-numpy
@@ -144,6 +148,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Fri Sep 21 2007 Jeremy Katz <katzj at redhat.com> - 2.12.0-2.fc8
+- fix crash using TreeView.convert_widget_to_bin_window_coords
+
 * Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:53:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 11:53:54 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-missing-includes.patch, 1.4, 1.5
Message-ID: <200709211553.l8LFrsYm013786@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652

Modified Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
Remove upstreamed bit

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:32:38 -0000	1.4
+++ NetworkManager-0.7.0-missing-includes.patch	21 Sep 2007 15:53:21 -0000	1.5
@@ -1,14 +1,3 @@
-diff -up NetworkManager-0.7.0/src/nm-netlink.c.missing-includes NetworkManager-0.7.0/src/nm-netlink.c
---- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-09-20 10:29:48.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-netlink.c	2007-09-20 10:29:59.000000000 -0400
-@@ -23,6 +23,7 @@
- #include "nm-utils.h"
- 
- #include <glib.h>
-+#include <signal.h>
- #include <pthread.h>
- #include <unistd.h>
- 
 diff -up NetworkManager-0.7.0/test/Makefile.am.missing-includes NetworkManager-0.7.0/test/Makefile.am
 --- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-09-13 07:43:42.000000000 -0400
 +++ NetworkManager-0.7.0/test/Makefile.am	2007-09-20 09:08:57.000000000 -0400



From fedora-extras-commits at redhat.com  Fri Sep 21 15:59:39 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 21 Sep 2007 11:59:39 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-hide-xscreensaver.menu, 
	1.1, 1.2 gnome-screensaver.spec, 1.165, 1.166
Message-ID: <200709211559.l8LFxdf3013924@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13904

Modified Files:
	gnome-screensaver-hide-xscreensaver.menu 
	gnome-screensaver.spec 
Log Message:
- hide xscreensaver menu if gnome-screensaver is installed
  (bug 300401)



Index: gnome-screensaver-hide-xscreensaver.menu
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-hide-xscreensaver.menu,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-hide-xscreensaver.menu	26 Sep 2005 19:08:04 -0000	1.1
+++ gnome-screensaver-hide-xscreensaver.menu	21 Sep 2007 15:59:06 -0000	1.2
@@ -1,9 +1,12 @@
 <Menu>
-  <Name>Preferences</Name>
-  <Exclude>
-    <Filename>screensaver-properties.desktop</Filename>
-  </Exclude>
-  <Exclude>
-    <Filename>gnome-screensaver-properties.desktop</Filename>
-  </Exclude>
+<Name>Preferences</Name>
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Exclude>
+      <Filename>screensaver-properties.desktop</Filename>
+    </Exclude>
+    <Exclude>
+      <Filename>gnome-screensaver-properties.desktop</Filename>
+    </Exclude>
+  </Menu>
 </Menu>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-screensaver.spec	20 Sep 2007 21:42:12 -0000	1.165
+++ gnome-screensaver.spec	21 Sep 2007 15:59:06 -0000	1.166
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -130,6 +130,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
+- hide xscreensaver menu if gnome-screensaver is installed
+  (bug 300401)
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Make the default theme setting work 
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:09:34 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 21 Sep 2007 12:09:34 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.9, 1.10 online-desktop.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709211609.l8LG9YgK020461@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20426

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Sep 2007 21:57:17 -0000	1.9
+++ .cvsignore	21 Sep 2007 16:09:00 -0000	1.10
@@ -1 +1 @@
-online-desktop-0.2.15.tar.gz
+online-desktop-0.2.16.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- online-desktop.spec	20 Sep 2007 21:57:17 -0000	1.13
+++ online-desktop.spec	21 Sep 2007 16:09:00 -0000	1.14
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.15
+Version:        0.2.16
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -15,7 +15,6 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
-Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -187,6 +186,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
 - dbus service


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Sep 2007 21:57:17 -0000	1.9
+++ sources	21 Sep 2007 16:09:00 -0000	1.10
@@ -1 +1 @@
-97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz
+f40b27522ead6212aadd28e4e9543395  online-desktop-0.2.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:06 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 21 Sep 2007 12:15:06 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.27, 1.28 bigboard.spec, 1.37,
	1.38 sources, 1.28, 1.29
Message-ID: <200709211615.l8LGF6X6020757@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	20 Sep 2007 16:17:30 -0000	1.27
+++ .cvsignore	21 Sep 2007 16:14:33 -0000	1.28
@@ -1 +1 @@
-bigboard-0.5.17.tar.gz
+bigboard-0.5.18.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bigboard.spec	20 Sep 2007 16:28:36 -0000	1.37
+++ bigboard.spec	21 Sep 2007 16:14:33 -0000	1.38
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.17
+Version:        0.5.18
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -94,6 +94,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
 - new upstream
 - add br


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	20 Sep 2007 16:17:30 -0000	1.28
+++ sources	21 Sep 2007 16:14:33 -0000	1.29
@@ -1 +1 @@
-1fdf687a8ed9eb1f8f6f6003773cb9ad  bigboard-0.5.17.tar.gz
+4acfe82aae3056c12809e8f42b87e91f  bigboard-0.5.18.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:04 -0700
Subject: [pkgdb] solarwolf was added for limb
Message-ID: <200709211615.l8LGF5Gl018718@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package solarwolf with summary A Python port of SolarFox
Kevin Fenzi (kevin) has approved Package solarwolf
Kevin Fenzi (kevin) has added a Fedora devel branch for solarwolf with an owner of limb
Kevin Fenzi (kevin) has approved solarwolf in Fedora devel
Kevin Fenzi (kevin) has approved Package solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, 6) updated by kevin
Message-ID: <200709211615.l8LGFIeW018779@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, devel) updated by kevin
Message-ID: <200709211615.l8LGFJUi018792@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, 7) updated by kevin
Message-ID: <200709211615.l8LGFJdx018807@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:27 -0400
Subject: rpms/solarwolf - New directory
Message-ID: <200709211616.l8LGGRkx020982@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf

Log Message:
Directory /cvs/extras/rpms/solarwolf added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:29 -0400
Subject: rpms/solarwolf/devel - New directory
Message-ID: <200709211616.l8LGGTJU020998@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf/devel

Log Message:
Directory /cvs/extras/rpms/solarwolf/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:33 -0400
Subject: rpms/solarwolf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211616.l8LGGX5Y021023@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf

Added Files:
	Makefile import.log 
Log Message:
Setup of module solarwolf


--- NEW FILE Makefile ---
# Top level Makefile for module solarwolf
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:35 -0400
Subject: rpms/solarwolf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211616.l8LGGZV8021039@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module solarwolf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: solarwolf
# $Id: Makefile,v 1.1 2007/09/21 16:16:33 kevin Exp $
NAME := solarwolf
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:18:07 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 12:18:07 -0400
Subject: rpms/gkrellm-themes/devel dead.package, NONE, 1.1 .cvsignore, 1.3, 
	NONE Makefile, 1.2, NONE gkrellm-themes.spec, 1.10, NONE sources,
	1.3, NONE
Message-ID: <200709211618.l8LGI75k021233@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21226

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gkrellm-themes.spec sources 
Log Message:
EOL'd before F8 because of missing license information in the vast majority
of included themes.



--- NEW FILE dead.package ---
EOL'd before F8 because of missing license information in the vast majority
of included themes.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gkrellm-themes.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:14 -0700
Subject: [pkgdb] haproxy was added for jjh
Message-ID: <200709211621.l8LGLF2q011809@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package haproxy with summary TCP/HTTP reverse proxy for high availability environments
Kevin Fenzi (kevin) has approved Package haproxy
Kevin Fenzi (kevin) has added a Fedora devel branch for haproxy with an owner of jjh
Kevin Fenzi (kevin) has approved haproxy in Fedora devel
Kevin Fenzi (kevin) has approved Package haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora devel)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora, 6) updated by kevin
Message-ID: <200709211621.l8LGLVq3020559@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora 6)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora, 7) updated by kevin
Message-ID: <200709211621.l8LGLWBj020570@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora 7)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211621.l8LGLXKJ020599@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora EPEL 5)

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



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <200709211621.l8LGLWcR020584@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:06 -0400
Subject: rpms/haproxy - New directory
Message-ID: <200709211622.l8LGM6WT021495@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy

Log Message:
Directory /cvs/extras/rpms/haproxy added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:10 -0400
Subject: rpms/haproxy/devel - New directory
Message-ID: <200709211622.l8LGMAEV021509@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy/devel

Log Message:
Directory /cvs/extras/rpms/haproxy/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:14 -0400
Subject: rpms/haproxy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211622.l8LGMEbd021538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy

Added Files:
	Makefile import.log 
Log Message:
Setup of module haproxy


--- NEW FILE Makefile ---
# Top level Makefile for module haproxy
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:17 -0400
Subject: rpms/haproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709211622.l8LGMHWf021554@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module haproxy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: haproxy
# $Id: Makefile,v 1.1 2007/09/21 16:22:15 kevin Exp $
NAME := haproxy
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:25:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:25:55 -0700
Subject: [pkgdb] biosdevname was added for mdomsch
Message-ID: <200709211625.l8LGPuYK013161@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package biosdevname with summary Udev helper for naming devices per BIOS names
Kevin Fenzi (kevin) has approved Package biosdevname
Kevin Fenzi (kevin) has added a Fedora devel branch for biosdevname with an owner of mdomsch
Kevin Fenzi (kevin) has approved biosdevname in Fedora devel
Kevin Fenzi (kevin) has approved Package biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, 6) updated by kevin
Message-ID: <200709211626.l8LGQEAM021868@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 6) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 6) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <200709211626.l8LGQEwe021882@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 4) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 4) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, devel) updated by kevin
Message-ID: <200709211626.l8LGQFnh021895@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora devel) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora devel) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, 7) updated by kevin
Message-ID: <200709211626.l8LGQFZx021910@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 7) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 7) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211626.l8LGQG6D021924@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 5) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 5) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:48 -0400
Subject: rpms/biosdevname - New directory
Message-ID: <200709211626.l8LGQmnc022106@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname

Log Message:
Directory /cvs/extras/rpms/biosdevname added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:52 -0400
Subject: rpms/biosdevname/devel - New directory
Message-ID: <200709211626.l8LGQqbh022120@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname/devel

Log Message:
Directory /cvs/extras/rpms/biosdevname/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:55 -0400
Subject: rpms/biosdevname Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211626.l8LGQtDa022145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname

Added Files:
	Makefile import.log 
Log Message:
Setup of module biosdevname


--- NEW FILE Makefile ---
# Top level Makefile for module biosdevname
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:58 -0400
Subject: rpms/biosdevname/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211626.l8LGQw4x022161@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module biosdevname


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: biosdevname
# $Id: Makefile,v 1.1 2007/09/21 16:26:55 kevin Exp $
NAME := biosdevname
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:27:02 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 12:27:02 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.166,1.167
Message-ID: <200709211627.l8LGR2Tu022240@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22051

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
- Build requires perl(ExtUtils::MakeMaker).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- foomatic.spec	21 Sep 2007 14:30:30 -0000	1.166
+++ foomatic.spec	21 Sep 2007 16:26:30 -0000	1.167
@@ -48,6 +48,7 @@
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
@@ -262,6 +263,7 @@
 
 %changelog
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
+- Build requires perl(ExtUtils::MakeMaker).
 - Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:28:24 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 12:28:24 -0400
Subject: rpms/foomatic/F-7 foomatic.spec,1.157,1.158
Message-ID: <200709211628.l8LGSO0U022571@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22553

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
- Build requires perl(ExtUtils::MakeMaker).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/foomatic.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- foomatic.spec	21 Sep 2007 14:34:11 -0000	1.157
+++ foomatic.spec	21 Sep 2007 16:27:51 -0000	1.158
@@ -48,6 +48,7 @@
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
@@ -256,6 +257,7 @@
 
 %changelog
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
+- Build requires perl(ExtUtils::MakeMaker).
 - Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:32:48 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 12:32:48 -0400
Subject: rpms/udev/devel
	0026-remove-extra-space-from-udevinfo-symlink-output.patch, NONE,
	1.1 0027-udevinfo-simplify-symlink-printing-logic.patch, NONE,
	1.1 0028-prevent-wrong-symlink-creation-if-database-disagress.patch, 
	NONE, 1.1 0029-fix-wrong-variable-used-in-logged-string.patch,
	NONE, 1.1 0030-update-README.patch, NONE,
	1.1 0031-rule_generator-move-all-policy-from-write_net_rules.patch,
	NONE, 1.1 udev.spec, 1.220,
	1.221 0026-Removed-extra-space-from-udevinfo-symlink-output.patch,
	1.1, NONE
Message-ID: <200709211632.l8LGWmD0022877@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22796

Modified Files:
	udev.spec 
Added Files:
	0026-remove-extra-space-from-udevinfo-symlink-output.patch 
	0027-udevinfo-simplify-symlink-printing-logic.patch 
	0028-prevent-wrong-symlink-creation-if-database-disagress.patch 
	0029-fix-wrong-variable-used-in-logged-string.patch 
	0030-update-README.patch 
	0031-rule_generator-move-all-policy-from-write_net_rules.patch 
Removed Files:
	0026-Removed-extra-space-from-udevinfo-symlink-output.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 115-4
- more upstream fixes from git


0026-remove-extra-space-from-udevinfo-symlink-output.patch:

--- NEW FILE 0026-remove-extra-space-from-udevinfo-symlink-output.patch ---
>From c952356635a30f610a4d1b84e84d678fee7772c8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Sep 2007 15:24:42 +0200
Subject: [PATCH] remove extra space from udevinfo symlink output

---
 udevinfo.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index be9aa76..8e54705 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -389,10 +389,16 @@ int main(int argc, char *argv[], char *envp[])
 				goto exit;
 			if (root)
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s/%s ", udev_root, name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s/%s ", udev_root, name_loop->name);
+					else
+						printf("%s/%s", udev_root, name_loop->name);
 			else
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s ", name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s ", name_loop->name);
+					else
+						printf("%s", name_loop->name);
 			printf("\n");
 			break;
 		case QUERY_PATH:
-- 
1.5.2.4


0027-udevinfo-simplify-symlink-printing-logic.patch:

--- NEW FILE 0027-udevinfo-simplify-symlink-printing-logic.patch ---
>From 18770246edda383eef523a7e3aedd08ebbbde5cf Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 15:25:29 +0200
Subject: [PATCH] udevinfo: simplify symlink printing logic

---
 udevinfo.c |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index 8e54705..eb9b353 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -385,21 +385,14 @@ int main(int argc, char *argv[], char *envp[])
 				printf("%s\n", udev->name);
 			break;
 		case QUERY_SYMLINK:
-			if (list_empty(&udev->symlink_list))
-				goto exit;
-			if (root)
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					if (name_loop->node.next != &udev->symlink_list)
-						printf("%s/%s ", udev_root, name_loop->name);
-					else
-						printf("%s/%s", udev_root, name_loop->name);
-			else
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					if (name_loop->node.next != &udev->symlink_list)
-						printf("%s ", name_loop->name);
-					else
-						printf("%s", name_loop->name);
-			printf("\n");
+			list_for_each_entry(name_loop, &udev->symlink_list, node) {
+				char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+
+				if (root)
+					printf("%s/%s%c", udev_root, name_loop->name, c);
+				else
+					printf("%s%c", name_loop->name, c);
+			}
 			break;
 		case QUERY_PATH:
 			printf("%s\n", udev->dev->devpath);
-- 
1.5.2.4


0028-prevent-wrong-symlink-creation-if-database-disagress.patch:

--- NEW FILE 0028-prevent-wrong-symlink-creation-if-database-disagress.patch ---
>From b2d1ae727e78ac3e22caa11798360d87775095ff Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 19:38:58 +0200
Subject: [PATCH] prevent wrong symlink creation if database disagress with current rules

---
 udev_node.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/udev_node.c b/udev_node.c
index 556a442..c620e4a 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -218,14 +218,16 @@ static int update_link(struct udevice *udev, const char *name)
 		if (strcmp(udev->dev->devpath, device->name) == 0) {
 			info("compare (our own) priority of '%s' %i >= %i",
 			     udev->dev->devpath, udev->link_priority, priority);
-			if (target[0] == '\0' || udev->link_priority >= priority) {
+			if (strcmp(udev->name, name) == 0) {
+				info("'%s' is our device node, database inconsistent, skip link update", udev->name);
+			} else if (target[0] == '\0' || udev->link_priority >= priority) {
 				priority = udev->link_priority;
 				strlcpy(target, udev->name, sizeof(target));
 			}
 			continue;
 		}
 
-		/* or something else, then read priority from database */
+		/* another device, read priority from database */
 		udev_db = udev_device_init(NULL);
 		if (udev_db == NULL)
 			continue;
-- 
1.5.2.4


0029-fix-wrong-variable-used-in-logged-string.patch:

--- NEW FILE 0029-fix-wrong-variable-used-in-logged-string.patch ---
>From 3a3d078cfd3a3adb1c9f66e0df95d704c3a92504 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 00:55:19 +0200
Subject: [PATCH] fix wrong variable used in logged string

---
 udev_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 3ec8477..5ae4aa2 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1446,7 +1446,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 	}
 
 	if (!name_set) {
-		info("no node name set, will use kernel name '%s'", udev->name);
+		info("no node name set, will use kernel name '%s'", udev->dev->kernel);
 		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 	}
 
-- 
1.5.2.4


0030-update-README.patch:

--- NEW FILE 0030-update-README.patch ---
>From b317b96c15bc61d59f138515e71f05bbd8f7b2ff Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 10:33:36 +0200
Subject: [PATCH] update README

---
 README |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 74aa790..b37d0d5 100644
--- a/README
+++ b/README
@@ -3,13 +3,10 @@ udev - userspace device management
 For more information see the files in the docs/ directory.
 
 Important Note:
-  Integrating udev in the system is a whole lot of work, has complex dependencies
-  and differs a lot from distro to distro. All major distros depend on udev these
-  days and the system may not work without a proper installed version. The upstream
-  udev project does not support or recommend to replace a distro's udev installation
-  with the upstream version. The installation of a unmodified upstream version may
-  render your system unusable. Until now, there is no "default" setup or a set of
-  "default" rules provided by the upstream udev version.
+  Integrating udev in the system has complex dependencies and differs from distro
+  to distro. All major distros depend on udev these days and the system may not
+  work without a properly installed version. The upstream udev project does not
+  recommend to replace a distro's udev installation with the upstream version.
 
 Requirements:
   - Version 2.6.15 of the Linux kernel for reliable operation of this release of
@@ -21,7 +18,7 @@ Requirements:
     but it is completely silly - don't complain if anything goes wrong.)
 
   - The proc filesystem must be mounted on /proc, the sysfs filesystem must
-    be mounted at /sys. No other location will be supported by udev.
+    be mounted at /sys. No other location is supported by udev.
 
 
 Operation:
-- 
1.5.2.4


0031-rule_generator-move-all-policy-from-write_net_rules.patch:

--- NEW FILE 0031-rule_generator-move-all-policy-from-write_net_rules.patch ---
>From c746922ca26fe18f6b3f3a4516e7236bfc0106b7 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 17:42:46 +0200
Subject: [PATCH] rule_generator: move all policy from write_net_rules to the rules file

---
 .../75-persistent-net-generator.rules              |   43 ++++++--
 extras/rule_generator/write_net_rules              |  119 +++++++++-----------
 2 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index f88627d..d09bc38 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -1,33 +1,56 @@
 # do not edit this file, it will be overwritten on update
 
 # these rules generate rules for persistent network device naming
+#
+# variables used to communicate:
+#   MATCHADDR             MAC address used for the match
+#   MATCHID               bus_id used for the match
+#   MATCHDRV              driver name used for the match
+#   MATCHIFTYPE           interface type match
+#   COMMENT               comment to add to the generated rule
+#   INTERFACE_NAME        requested name supplied by external tool
+#   INTERFACE_NEW         new interface name returned by rule writer
 
 ACTION!="add", GOTO="persistent_net_generator_end"
 SUBSYSTEM!="net", GOTO="persistent_net_generator_end"
 
-# device name whitelist
-KERNEL!="eth*|ath*|wlan*|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
-
 # ignore the interface if a name has already been set
 NAME=="?*", GOTO="persistent_net_generator_end"
 
+# device name whitelist
+KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
+
+# add interface type match for some devices
+KERNEL=="wlan*|ath*", ENV{MATCHIFTYPE}="1"
+
 # ignore Xen virtual interfaces
 SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end"
 
-# build device description string to add a comment to the generated rule
+# read MAC address
+ENV{MATCHADDR}="$attr{address}"
+
+# do not use "locally administered" MAC address
+ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""
+
+# do not use empty address
+ENV{MATCHADDR}=="00:00:00:00:00:00", ENV{MATCHADDR}=""
+
+# build comment line for generated rule:
 SUBSYSTEMS=="pci", ENV{COMMENT}="PCI device $attr{vendor}:$attr{device} ($driver)"
 SUBSYSTEMS=="usb", ENV{COMMENT}="USB device 0x$attr{idVendor}:0x$attr{idProduct} ($driver)"
 SUBSYSTEMS=="pcmcia", ENV{COMMENT}="PCMCIA device $attr{card_id}:$attr{manf_id} ($driver)"
-SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{NETDEV}="$id", ENV{NETDRV}="$driver"
 SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire device $attr{host_id})"
-ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device ($driver)"
 
-DRIVERS=="?*", ENV{NETDEV}=="?*", IMPORT{program}="write_net_rules --driver $env{NETDRV} --id $env{NETDEV}"
+# S/390 uses id matches only, do not use MAC address match
+SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{MATCHID}="$id", ENV{MATCHDRV}="$driver", ENV{MATCHADDR}=""
+
+# default comment
+ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device"
 
-# skip "locally administered" MAC addresses
-ATTR{address}=="?[2367abef]:*", GOTO="persistent_net_generator_end"
+# write rule
+DRIVERS=="?*", IMPORT{program}="write_net_rules"
 
-DRIVERS=="?*", ENV{NETDEV}!="?*", IMPORT{program}="write_net_rules $attr{address}"
+# rename interface if needed
 ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}"
 
 LABEL="persistent_net_generator_end"
diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index 62acb88..b25ecfd 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -1,20 +1,25 @@
 #!/bin/sh -e
 #
-# This script is run if the interface (recognized by its MAC address) lacks
-# a rule for persistent naming.
-#
-# If there is already a persistent rule with that interface name then the
-# current interface needs to be renamed.
-#
-# If the interface needs to be renamed, a NAME=value pair will be printed
-# on stdout to allow udev to IMPORT it. Then a rule for the MAC address and
-# interface name is written.
-#
-# (C) 2006 Marco d'Itri <md at Linux.IT>
+# Copyright (C) 2006 Marco d'Itri <md at Linux.IT>
+# Copyright (C) 2007 Kay Sievers <kay.sievers at vrfy.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 version 2 of the License.
+#
+# This script is run to create persistent network device naming rules
+# based on properties of the device.
+# If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed
+# on stdout to allow udev to IMPORT it.
+
+# variables used to communicate:
+#   MATCHADDR             MAC address used for the match
+#   MATCHID               bus_id used for the match
+#   MATCHDRV              driver name used for the match
+#   MATCHIFTYPE           interface type match
+#   COMMENT               comment to add to the generated rule
+#   INTERFACE_NAME        requested name supplied by external tool
+#   INTERFACE_NEW         new interface name returned by rule writer
 
 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
 
@@ -49,78 +54,57 @@ write_rule() {
 
 	echo ""
 	[ "$comment" ] && echo "# $comment"
-	echo "SUBSYSTEM==\"net\", $match, NAME=\"$name\""
+	echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\""
 	} >> $RULES_FILE
 }
 
 if [ -z "$INTERFACE" ]; then
-	echo "Missing \$INTERFACE." >&2
+	echo "missing \$INTERFACE" >&2
 	exit 1
 fi
 
-if [ "$1" ]; then
-    while [ "$*" ] ; do
-	case $1 in
-	    --mac)
-		shift
-		MAC_ADDR=$1
-		shift
-		;;
-	    --driver)
-		shift
-		DRIVER=$1
-		shift
-		;;
-	    --id)
-		shift
-		ID=$1
-		shift
-		;;
-	    *)
-		MAC_ADDR=$1
-		shift
-		;;
-	esac
-    done
-else
-    MAC_ADDR=$(sysread address)
-fi
-
-if [ -z "$DRIVER" ] && [ -z "$ID" ] ; then
-    if [ -z "$MAC_ADDR" ]; then
-	echo "No MAC address for $INTERFACE." >&2
-	exit 1
-    fi
-    if [ "$MAC_ADDR" = "00:00:00:00:00:00" ]; then
-	echo "NULL MAC address for $INTERFACE." >&2
-	exit 1
-    fi
-fi
-
 # Prevent concurrent processes from modifying the file at the same time.
 lock_rules_file
 
 # Check if the rules file is writeable.
 choose_rules_file
 
-# If a rule using the current name already exists then find a new name and
-# report it to udev which will rename the interface.
-basename=${INTERFACE%%[0-9]*}
-if interface_name_taken; then
-	INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
-	if [ ! -t 1 ]; then
-		echo "INTERFACE_NEW=$INTERFACE"
-	fi
+# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces
+if [ "$MATCHADDR" ]; then
+	match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\""
 fi
 
-# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces
-if [ "$MAC_ADDR" ] ; then
-    match="DRIVERS==\"?*\", ATTR{address}==\"$MAC_ADDR\""
-else
-    match="DRIVERS==\"$DRIVER\", KERNELS==\"$ID\""
+if [ "$MATCHDRV" ]; then
+	match="$match, DRIVERS==\"$MATCHDRV\""
+fi
+
+if [ "$MATCHID" ]; then
+	match="$match, KERNELS==\"$MATCHID\""
+fi
+
+if [ "$MATCHIFTYPE" ]; then
+	match="$match, ATTR{type}==\"$MATCHIFTYPE\""
 fi
-if [ $basename = "ath" -o $basename = "wlan" ]; then
-	match="$match, ATTR{type}==\"1\"" # do not match the wifi* interfaces
+
+if [ -z "$match" ]; then
+	echo "missing valid match" >&2
+	exit 1
+fi
+
+if [ "$INTERFACE_NAME" ]; then
+	# external tools may request a custom name
+	COMMENT="$COMMENT (custom name provided by external tool)"
+	if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then
+		INTERFACE=$INTERFACE_NAME;
+		echo "INTERFACE_NEW=$INTERFACE"
+	fi
+else
+	# if a rule using the current name already exists, find a new name
+	basename=${INTERFACE%%[0-9]*}
+	if interface_name_taken; then
+		INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
+		echo "INTERFACE_NEW=$INTERFACE"
+	fi
 fi
 
 write_rule "$match" "$INTERFACE" "$COMMENT"
@@ -128,4 +112,3 @@ write_rule "$match" "$INTERFACE" "$COMMENT"
 unlock_rules_file
 
 exit 0
-
-- 
1.5.2.4



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- udev.spec	20 Sep 2007 12:27:11 -0000	1.220
+++ udev.spec	21 Sep 2007 16:32:15 -0000	1.221
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 3.20070920git%{?dist}
+Release: 4.20070921git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -44,6 +44,12 @@
 Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
 Patch25: 0025-rules-add-memstick-module-loading.patch
 Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
+Patch26: 0026-remove-extra-space-from-udevinfo-symlink-output.patch
+Patch27: 0027-udevinfo-simplify-symlink-printing-logic.patch
+Patch28: 0028-prevent-wrong-symlink-creation-if-database-disagress.patch
+Patch29: 0029-fix-wrong-variable-used-in-logged-string.patch
+Patch30: 0030-update-README.patch
+Patch31: 0031-rule_generator-move-all-policy-from-write_net_rules.patch
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
@@ -118,6 +124,11 @@
 %patch22 -p1 -b .git22
 %patch25 -p1 -b .git25
 %patch26 -p1 -b .git26
+%patch27 -p1 -b .git27
+%patch28 -p1 -b .git28
+%patch29 -p1 -b .git29
+%patch30 -p1 -b .git30
+%patch31 -p1 -b .git31
 
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
@@ -402,6 +413,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 115-4
+- more upstream fixes from git
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
 - some upstream fixes from git
 - removed last_rule for loop rules


--- 0026-Removed-extra-space-from-udevinfo-symlink-output.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:24 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 12:35:24 -0400
Subject: rpms/udev/devel udev.spec,1.221,1.222
Message-ID: <200709211635.l8LGZOVU022957@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22939

Modified Files:
	udev.spec 
Log Message:
removed duplicate patch


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- udev.spec	21 Sep 2007 16:32:15 -0000	1.221
+++ udev.spec	21 Sep 2007 16:34:52 -0000	1.222
@@ -43,7 +43,6 @@
 Patch23: 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch
 Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
 Patch25: 0025-rules-add-memstick-module-loading.patch
-Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
 Patch26: 0026-remove-extra-space-from-udevinfo-symlink-output.patch
 Patch27: 0027-udevinfo-simplify-symlink-printing-logic.patch
 Patch28: 0028-prevent-wrong-symlink-creation-if-database-disagress.patch



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:35 -0700
Subject: [pkgdb] ladspa-blop-plugins was added for jwrdegoede
Message-ID: <200709211635.l8LGZagr015950@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-blop-plugins with summary Bandlimited LADSPA Oscillator Plugins
Kevin Fenzi (kevin) has approved Package ladspa-blop-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-blop-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-blop-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-blop-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:44 -0700
Subject: [pkgdb] ladspa-blop-plugins (Fedora, devel) updated by kevin
Message-ID: <200709211635.l8LGZj1A024597@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-blop-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:44 -0700
Subject: [pkgdb] ladspa-blop-plugins (Fedora, 7) updated by kevin
Message-ID: <200709211635.l8LGZkBC024615@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-blop-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-blop-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:36:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:36:49 -0400
Subject: rpms/ladspa-blop-plugins - New directory
Message-ID: <200709211636.l8LGan70023075@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-blop-plugins added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:36:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:36:57 -0400
Subject: rpms/ladspa-blop-plugins/devel - New directory
Message-ID: <200709211636.l8LGavMc023094@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-blop-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:37:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:37:00 -0400
Subject: rpms/ladspa-blop-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211637.l8LGb0uA023129@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-blop-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-blop-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:37:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:37:04 -0400
Subject: rpms/ladspa-blop-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211637.l8LGb4v4023152@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-blop-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-blop-plugins
# $Id: Makefile,v 1.1 2007/09/21 16:37:01 kevin Exp $
NAME := ladspa-blop-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 fedora-extras-commits at redhat.com  Fri Sep 21 16:38:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:27 -0700
Subject: [pkgdb] ladspa-cmt-plugins was added for jwrdegoede
Message-ID: <200709211638.l8LGcROT016694@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-cmt-plugins with summary A collection of LADSPA plugins
Kevin Fenzi (kevin) has approved Package ladspa-cmt-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-cmt-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-cmt-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-cmt-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:33 -0700
Subject: [pkgdb] ladspa-cmt-plugins (Fedora, 7) updated by kevin
Message-ID: <200709211638.l8LGcXiI016728@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-cmt-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-cmt-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:33 -0700
Subject: [pkgdb] ladspa-cmt-plugins (Fedora, devel) updated by kevin
Message-ID: <200709211638.l8LGcYML016740@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-cmt-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:45 -0400
Subject: rpms/ladspa-cmt-plugins - New directory
Message-ID: <200709211638.l8LGcj3q023444@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-cmt-plugins added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:51 -0400
Subject: rpms/ladspa-cmt-plugins/devel - New directory
Message-ID: <200709211638.l8LGcpVX023459@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-cmt-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:58 -0400
Subject: rpms/ladspa-cmt-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211638.l8LGcwqO023484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-cmt-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-cmt-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:39:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:39:00 -0400
Subject: rpms/ladspa-cmt-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709211639.l8LGd0QY023500@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-cmt-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-cmt-plugins
# $Id: Makefile,v 1.1 2007/09/21 16:38:58 kevin Exp $
NAME := ladspa-cmt-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 fedora-extras-commits at redhat.com  Fri Sep 21 16:41:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:41:44 -0700
Subject: [pkgdb] ejabberd (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211641.l8LGfjl4026282@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for ejabberd
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of ejabberd in Fedora EPEL 5 to jcollie
Kevin Fenzi (kevin) approved watchbugzilla on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved watchcommits on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved commit on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved build on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved approveacls on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved checkout on ejabberd (Fedora EPEL 5) for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:24 -0700
Subject: [pkgdb] sdljava was added for jwrdegoede
Message-ID: <200709211645.l8LGjOe6018673@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package sdljava with summary Java binding to the SDL API
Kevin Fenzi (kevin) has approved Package sdljava
Kevin Fenzi (kevin) has added a Fedora devel branch for sdljava with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved sdljava in Fedora devel
Kevin Fenzi (kevin) has approved Package sdljava
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sdljava (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sdljava (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sdljava (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:31 -0700
Subject: [pkgdb] sdljava (Fedora, 7) updated by kevin
Message-ID: <200709211645.l8LGjV58018710@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for sdljava
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on sdljava (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:31 -0700
Subject: [pkgdb] sdljava (Fedora, devel) updated by kevin
Message-ID: <200709211645.l8LGjVWJ018720@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on sdljava (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:09 -0400
Subject: rpms/sdljava - New directory
Message-ID: <200709211646.l8LGk95C023857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava

Log Message:
Directory /cvs/extras/rpms/sdljava added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:16 -0400
Subject: rpms/sdljava/devel - New directory
Message-ID: <200709211646.l8LGkGqO023873@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava/devel

Log Message:
Directory /cvs/extras/rpms/sdljava/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:19 -0400
Subject: rpms/sdljava Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211646.l8LGkJ4Q023915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava

Added Files:
	Makefile import.log 
Log Message:
Setup of module sdljava


--- NEW FILE Makefile ---
# Top level Makefile for module sdljava
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:22 -0400
Subject: rpms/sdljava/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709211646.l8LGkMat023932@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sdljava


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sdljava
# $Id: Makefile,v 1.1 2007/09/21 16:46:20 kevin Exp $
NAME := sdljava
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:49:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 12:49:05 -0400
Subject: rpms/knetworkmanager/devel .cvsignore, 1.9,
	1.10 knetworkmanager-svn_checkout.sh, 1.3,
	1.4 knetworkmanager.spec, 1.11, 1.12 sources, 1.9,
	1.10 knetworkmanager-kpp.patch, 1.2, NONE
Message-ID: <200709211649.l8LGn5UI024082@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24058

Modified Files:
	.cvsignore knetworkmanager-svn_checkout.sh 
	knetworkmanager.spec sources 
Removed Files:
	knetworkmanager-kpp.patch 
Log Message:
* Fri Sep 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.2.svn20070921
- License: GPLv2+
- update tarball to 20070921
- drop upstreamed kpp patch
- cleanup/simplify BR's

NOTE: still doesn't build for nm-0.7, unfortunately.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Aug 2007 05:39:18 -0000	1.9
+++ .cvsignore	21 Sep 2007 16:48:31 -0000	1.10
@@ -1 +1,2 @@
 knetworkmanager-svn20070815.tar.bz2
+knetworkmanager-svn20070921.tar.bz2


Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- knetworkmanager-svn_checkout.sh	19 Jul 2007 15:18:22 -0000	1.3
+++ knetworkmanager-svn_checkout.sh	21 Sep 2007 16:48:31 -0000	1.4
@@ -9,7 +9,7 @@
 # app
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager
 #svn export  svn://websvn.kde.org/home/kde/trunk/extragear/network/knetworkmanager $EXPORT_DIR/knetworkmanager
-svn export  svn://websvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+svn export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
 # docs
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
 # auto*/configure bits


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- knetworkmanager.spec	15 Aug 2007 05:39:18 -0000	1.11
+++ knetworkmanager.spec	21 Sep 2007 16:48:31 -0000	1.12
@@ -1,24 +1,23 @@
-%define         svn svn20070815
+%define         svn svn20070921
 
 Name:           knetworkmanager
 Version:        0.2
-Release:        0.1.%{svn}%{?dist}
+Release:        0.2.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://en.opensuse.org/Projects/KNetworkManager
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch adds kpp dialup support 
-Patch0:		knetworkmanager-kpp.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  NetworkManager-devel >= 0.6.2 dbus-devel autoconf automake
-BuildRequires:  desktop-file-utils kdebase-devel hal-devel wireless-tools-devel
-BuildRequires:  dbus-qt-devel, libnl-devel
+BuildRequires:  automake
+BuildRequires:  NetworkManager-devel >= 0.6.2
+BuildRequires:  desktop-file-utils kdelibs-devel hal-devel wireless-tools-devel
+BuildRequires:  dbus-qt-devel libnl-devel
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -62,10 +61,10 @@
 
 %prep 
 %setup -q -n %{name}
-%patch0 -p1 -b .kppp
 
-%build
 make -f Makefile.cvs
+
+%build
 %configure --disable-rpath --with-openvpn --with-vpnc --with-pptp \
            --disable-warnings 
 make %{?_smp_mflags}
@@ -154,6 +153,12 @@
 
 
 %changelog
+* Fri Sep 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.2.svn20070921
+- License: GPLv2+
+- update tarball to 20070921
+- drop upstreamed kpp patch
+- cleanup/simplify BR's
+
 * Wed Aug 15 2007 Dennis Gilmore <dennis at ausil.us> - 0.2-0.1.svn20070815
 - revert back to svn the upstream tarball was so bad there is no way to build it
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Aug 2007 05:39:18 -0000	1.9
+++ sources	21 Sep 2007 16:48:31 -0000	1.10
@@ -1 +1 @@
-6a420ff359e2fbe73b2aad7d81f6af95  knetworkmanager-svn20070815.tar.bz2
+6ed8a71d34c2046b75d3f94176a6bf3d  knetworkmanager-svn20070921.tar.bz2


--- knetworkmanager-kpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:49:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:49:16 -0700
Subject: [pkgdb] gmyth was added for hadess
Message-ID: <200709211649.l8LGnGip028300@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gmyth with summary MythTV remote access libraries
Kevin Fenzi (kevin) has approved Package gmyth
Kevin Fenzi (kevin) has added a Fedora devel branch for gmyth with an owner of hadess
Kevin Fenzi (kevin) has approved gmyth in Fedora devel
Kevin Fenzi (kevin) has approved Package gmyth
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gmyth (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gmyth (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gmyth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmyth



From fedora-extras-commits at redhat.com  Fri Sep 21 16:49:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:49:17 -0700
Subject: [pkgdb] gmyth (Fedora, devel) updated by kevin
Message-ID: <200709211649.l8LGnHom019726@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gmyth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmyth



From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:02 -0400
Subject: rpms/gmyth - New directory
Message-ID: <200709211657.l8LGv2aW024295@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth

Log Message:
Directory /cvs/extras/rpms/gmyth added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:07 -0400
Subject: rpms/gmyth/devel - New directory
Message-ID: <200709211657.l8LGv7f1024303@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth/devel

Log Message:
Directory /cvs/extras/rpms/gmyth/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:11 -0400
Subject: rpms/gmyth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211657.l8LGvBpW024337@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth

Added Files:
	Makefile import.log 
Log Message:
Setup of module gmyth


--- NEW FILE Makefile ---
# Top level Makefile for module gmyth
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:13 -0400
Subject: rpms/gmyth/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709211657.l8LGvDUS024354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gmyth


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gmyth
# $Id: Makefile,v 1.1 2007/09/21 16:57:11 kevin Exp $
NAME := gmyth
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:59:50 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 12:59:50 -0400
Subject: rpms/biosdevname/devel biosdevname.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709211659.l8LGxoaE024438@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	biosdevname.spec 
Log Message:



--- NEW FILE biosdevname.spec ---
Name:		biosdevname
Version:	0.2.4
Release:	1%{?dist}
Summary:	Udev helper for naming devices per BIOS names

Group:		System Environment/Base
License:	GPLv2
URL:		http://linux.dell.com/files/%{name}
# SMBIOS and PCI IRQ Routing Tables only exist on these arches.  It's
# also likely that other arches don't expect the PCI bus to be sorted
# breadth-first, or of so, there haven't been any comments about that
# on LKML.
ExclusiveArch:	%{ix86} x86_64 ia64
Source0:	http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	pciutils-devel, zlib-devel
# to figure out how to name the rules file
BuildRequires:	udev
# for ownership of /etc/udev/rules.d
Requires: udev


%description
biosdevname in its simplest form takes a kernel device name as an
argument, and returns the BIOS-given name it "should" be.  This is necessary
on systems where the BIOS name for a given device (e.g. the label on
the chassis is "Gb1") doesn't map directly and obviously to the kernel
name (e.g. eth0).

%prep
%setup -q

%build
# this is a udev rule, so it needs to live in / rather than /usr
%configure --disable-rpath --prefix=/ --sbindir=/sbin
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}/sbin/%{name}S  || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
/sbin/%{name}
%config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules
%{_mandir}/1/%{name}.1


%changelog
* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-1
- coordinate udev rules usage with udev maintainer
- fix crashes in pcmcia search, in_ethernet(), and incorrect command
  line parsing.

* Mon Aug 27 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.3-1
- eliminate libbiosdevname.*, pre and post scripts

* Fri Aug 24 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.2-1
- ExclusiveArch those arches with SMBIOS and PCI IRQ Routing tables
- eliminate libsysfs dependency, move app to / for use before /usr is mounted.
- build static

* Mon Aug 20 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:26:55 -0000	1.1
+++ .cvsignore	21 Sep 2007 16:59:03 -0000	1.2
@@ -0,0 +1 @@
+biosdevname-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:26:55 -0000	1.1
+++ sources	21 Sep 2007 16:59:03 -0000	1.2
@@ -0,0 +1 @@
+d4368a5bc158ea3de8d8947ab9ae2285  biosdevname-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:19 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:19 -0400
Subject: rpms/fuse/F-7 fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.23,1.24
Message-ID: <200709211701.l8LH1JJx030593@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/F-7

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 20:27:59 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:45 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fuse.spec	20 Sep 2007 20:27:59 -0000	1.23
+++ fuse.spec	21 Sep 2007 17:00:45 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-7
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:22 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:22 -0400
Subject: rpms/fuse/FC-6 fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.23,1.24
Message-ID: <200709211701.l8LH1MUR030601@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/FC-6

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 20:28:02 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:49 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fuse.spec	20 Sep 2007 20:28:02 -0000	1.23
+++ fuse.spec	21 Sep 2007 17:00:49 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:25 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:25 -0400
Subject: rpms/fuse/devel fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.25,1.26
Message-ID: <200709211701.l8LH1Pmm030605@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/devel

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 19:59:00 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:53 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fuse.spec	20 Sep 2007 19:59:00 -0000	1.25
+++ fuse.spec	21 Sep 2007 17:00:53 -0000	1.26
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-7
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-6
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:03:36 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 13:03:36 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.1,1.2
Message-ID: <200709211703.l8LH3aUX030757@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30688

Modified Files:
	biosdevname.spec 
Log Message:
Require: udev > 115-3.20070920git for proper udev-owned rules


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- biosdevname.spec	21 Sep 2007 16:59:03 -0000	1.1
+++ biosdevname.spec	21 Sep 2007 17:03:04 -0000	1.2
@@ -17,7 +17,8 @@
 # to figure out how to name the rules file
 BuildRequires:	udev
 # for ownership of /etc/udev/rules.d
-Requires: udev
+# releases after 115-3.20070920.git have the proper write_net_rules and 75-persistent-net-names.rules files
+Requires: udev > 115-3.20070920git
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep 21 17:05:20 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 13:05:20 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.2,1.3
Message-ID: <200709211705.l8LH5K0p030865@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30798

Modified Files:
	biosdevname.spec 
Log Message:
bump for rebuild


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- biosdevname.spec	21 Sep 2007 17:03:04 -0000	1.2
+++ biosdevname.spec	21 Sep 2007 17:04:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		biosdevname
 Version:	0.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-2
+- rebuild with Requires: udev > 115-3.20070920git
+
 * Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-1
 - coordinate udev rules usage with udev maintainer
 - fix crashes in pcmcia search, in_ethernet(), and incorrect command



From fedora-extras-commits at redhat.com  Fri Sep 21 17:08:42 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 21 Sep 2007 13:08:42 -0400
Subject: rpms/ejabberd/EL-5 .cvsignore, 1.4, 1.5 ejabberd.spec, 1.9,
	1.10 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709211708.l8LH8gNF031076@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31050

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:22:45 -0000	1.4
+++ .cvsignore	21 Sep 2007 17:08:09 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ejabberd.spec	4 Sep 2007 13:03:29 -0000	1.9
+++ ejabberd.spec	21 Sep 2007 17:08:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 14:01:20 -0000	1.2
+++ mod_ctlextra.erl	21 Sep 2007 17:08:09 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:22:45 -0000	1.4
+++ sources	21 Sep 2007 17:08:09 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 17:17:05 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:17:05 -0400
Subject: rpms/fuse/devel fuse.spec,1.26,1.27
Message-ID: <200709211717.l8LHH51K031274@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256

Modified Files:
	fuse.spec 
Log Message:

forgot to bump



Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fuse.spec	21 Sep 2007 17:00:53 -0000	1.26
+++ fuse.spec	21 Sep 2007 17:16:33 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base



From fedora-extras-commits at redhat.com  Fri Sep 21 17:22:07 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 21 Sep 2007 13:22:07 -0400
Subject: rpms/solarwolf/devel solarwolf-path.patch, NONE,
	1.1 solarwolf.desktop, 
	NONE, 1.1 solarwolf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709211722.l8LHM7Vm031520@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31481/devel

Modified Files:
	.cvsignore sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:16:33 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:21:34 -0000	1.2
@@ -0,0 +1 @@
+solarwolf-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	21 Sep 2007 17:21:34 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:27:31 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 13:27:31 -0400
Subject: rpms/haproxy/devel haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211727.l8LHRVf3031722@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31695

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:26:59 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 17:26:59 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:31:30 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 21 Sep 2007 13:31:30 -0400
Subject: rpms/gmyth import.log,1.1,1.2
Message-ID: <200709211731.l8LHVUOt031927@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823

Modified Files:
	import.log 
Log Message:
gmyth



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Sep 2007 16:57:09 -0000	1.1
+++ import.log	21 Sep 2007 17:30:58 -0000	1.2
@@ -0,0 +1 @@
+gmyth-0_4-4:HEAD:gmyth-0.4-4.src.rpm:1190395724



From fedora-extras-commits at redhat.com  Fri Sep 21 17:31:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 21 Sep 2007 13:31:33 -0400
Subject: rpms/gmyth/devel COPYING.LGPL, NONE, 1.1 gmyth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211731.l8LHVXoN031931@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.LGPL gmyth.spec 
Log Message:
gmyth



--- NEW FILE COPYING.LGPL ---

                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
	51 Franklin St, 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.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

                            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 Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.

  When we speak of free software, we are referring to freedom of use,
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 and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
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 other code 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.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes a de-facto standard.  To achieve this, non-free programs must
be allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  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, whereas the latter must
be combined with the library in order to run.

                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) 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.

    d) 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.

    e) 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 materials to be 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 with
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 Lesser 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

           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 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

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!




--- NEW FILE gmyth.spec ---
Summary: MythTV remote access libraries
Name: gmyth
Version: 0.4
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: COPYING.LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://gmyth.sf.net
BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel

%description
GMyth is a library used by applications to access content provided by the
MythTV set-top box framework, such as Live TV broadcasts, TV recordings, or
TV listings.

%package devel
Summary: Development libraries for MythTV remote access
Group: Development/Libraries
Requires: gmyth = %{version}-%{release}
Requires: pkgconfig glib2-devel mysql-devel curl-devel

%description devel
gmyth-devel contains development libraries and headers for the GMyth library.

%prep
%setup -q -n %{name}
# Upstream used the default license from the autotools, all the
# files and the project page says LGPL, see:
# http://sourceforge.net/tracker/index.php?func=detail&aid=1790620&group_id=177106&atid=879914
cp -a %{SOURCE1} .

%build
%configure
make %{?_smp_mflags}
chmod a-x src/*.[ch]

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc AUTHORS COPYING.LGPL
%{_bindir}/*
%{_libdir}/libgmyth.so.*

%files devel
%defattr(-,root,root)
%{_includedir}/gmyth
%{_libdir}/libgmyth.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Fri Sep 21 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-4
- Add a dist flag to the release

* Sat Sep 08 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-3
- Fix permissions in installed files
- Fix Source usage for sourceforge
- Use correct license, as per upstream

* Thu Sep 06 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-2
- Updated with comments from Matthias Clasen

* Fri Aug 31 2007 - Bastien Nocera <bnocera at redhat.com> 0.4-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:57:11 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:31:01 -0000	1.2
@@ -0,0 +1 @@
+gmyth_0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:57:11 -0000	1.1
+++ sources	21 Sep 2007 17:31:01 -0000	1.2
@@ -0,0 +1 @@
+124ba338d9ae442319337e5b28b41126  gmyth_0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:34:14 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 21 Sep 2007 13:34:14 -0400
Subject: rpms/solarwolf/F-7 solarwolf-path.patch, NONE, 1.1 solarwolf.desktop,
	NONE, 1.1 solarwolf.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709211734.l8LHYE6g032105@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075

Modified Files:
	sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	21 Sep 2007 17:33:41 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:44:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:44:57 -0400
Subject: rpms/sdljava/devel sdljava-0.9.1-regen.patch, NONE,
	1.1 sdljava-runtest.sh, NONE, 1.1 sdljava.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211744.l8LHiv7v000836@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv754/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sdljava-0.9.1-regen.patch sdljava-runtest.sh sdljava.spec 
Log Message:
initial sdljava import


sdljava-0.9.1-regen.patch:

--- NEW FILE sdljava-0.9.1-regen.patch ---
diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/linux/Makefile
--- sdljava-0.9.1/etc/build/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
 
 SDLJAVA_I=SDLAudio.i\
           SDLCdrom.i\
@@ -46,35 +46,35 @@ gfx:    libsdljava_gfx.so
 #
 # NOTE:  if you want to work on the sdljava native layer please un-comment these lines
 #
-#SDLAudio_wrap.c: SDLAudio.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
-#
-#SDLCdrom_wrap.c: SDLCdrom.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
-#
-#SDLEvent_wrap.c: SDLEvent.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
-#
-#SDLGFX_wrap.c: SDLGFX.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
-#
-#SDLImage_wrap.c: SDLImage.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
-#
-#SDLJoystick_wrap.c: SDLJoystick.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
-#
-#SDLMain_wrap.c: SDLMain.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
-#
-#SDLMixer_wrap.c: SDLMixer.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
-#
-#SDLTTF_wrap.c: SDLTTF.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
-#
-#SDLVideo_wrap.c: SDLVideo.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,12 +4,12 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@
 
 GLJAVA_I=glew.i
 
 GLJAVA_OBJ=glew_wrap.o
-GLJAVA_LIB=-lGLEW
+GLJAVA_LIB=-lGLEW -lGLU
 
 all:	libgljava.so
 
@@ -17,8 +17,8 @@ all:	libgljava.so
 #
 # NOTE:  if you want to work on the gljava native layer please un-comment the following line
 #
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
 
 FTGLJAVA_OBJ=FTGL_wrap.o
 FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@@ -15,9 +15,9 @@ all:	libftgljava.so
 #
 # NOTE:  if you want to work on the ftgljava native layer please un-comment the following line
 #
-#FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-#	./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+	./post-process.rb
 
 %.o: %.cxx
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@


--- NEW FILE sdljava-runtest.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=`build-classpath sdljava`
MAIN_CLASS="$1"
if [ -x /usr/lib64/sdljava/libsdljava.so ]; then
  set_options "-Djava.library.path="/usr/lib64/sdljava""
else
  set_options "-Djava.library.path="/usr/lib/sdljava""
fi

shift
run "$@"


--- NEW FILE sdljava.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

Name:           sdljava
Version:        0.9.1
Release:        5%{?dist}
Summary:        Java binding to the SDL API
Group:          System Environment/Libraries
License:        LGPLv2+
Url:            http://sdljava.sourceforge.net/
# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# with the included Microsoft Copyrighted Arial fonts removed
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-runtest.sh
Patch0:         sdljava-0.9.1-regen.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-devel java-gcj-compat-devel
BuildRequires:  ant xml-commons-apis swig bsh jdom
# Build fails on fedora 8 test 2 when not using icedtea :( Note it runs fine
# with gcj (bug 297961).
BuildRequires:  java-1.7.0-icedtea-devel
# icedtea is i386 and x86_64
ExclusiveArch:  %{ix86} x86_64
Requires:       bsh jdom
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
sdljava is a Java binding to the SDL API being developed by Ivan Ganza.

sdljava provides the ability to write games and other applications
from the java programming language. sdljava is designed to be fast,
efficient and easy to use.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description javadoc
Javadoc for %{name}.


%package demo
Summary:        Some examples for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       /usr/share/fonts/dejavu/DejaVuSans.ttf
Requires:       jpackage-utils

%description demo
Demonstrations and samples for %{name}.


%prep
%setup -q
%patch0 -p1 -z .regen
iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1

# patch in gcc include path so that swig can find it
GCC_PATH=`gcc -print-search-dirs | grep install | cut -f 2 -d " "`
sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
  etc/build/linux/Makefile \
  etc/build/gljava/linux/Makefile \
  etc/build/gljava/linux/ftgl/Makefile

# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
  -e 's|testdata|%{_datadir}/%{name}/testdata|g'

# use system versions of bsh & jdom
pushd lib
rm *.jar
ln -s /usr/share/java/jdom.jar .
ln -s /usr/share/java/bsh.jar .
popd

# copy the Linux Makefiles into place
cp etc/build/linux/Makefile src/sdljava/native
cp etc/build/gljava/linux/Makefile src/org/gljava/opengl/native
cp etc/build/gljava/linux/ftgl/Makefile src/org/gljava/opengl/native/ftgl

# and remove the swig generated code so that it gets regenerated
rm src/sdljava/native/SDL*_wrap.c src/sdljava/native/SDL_types.h
rm src/org/gljava/opengl/native/glew_wrap.c


%build
pushd src/sdljava/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native/ftgl
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

ant jar javadoc


%install
rm -rf $RPM_BUILD_ROOT

# dirs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# jars
install -m 644 lib/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# native libraries
install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}

# javadoc
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# demo scripts
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
pushd bin
rm runtest.sh
for i in `ls -1 *.sh`; do
   sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i
   FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'`
   install -m 755 $i $RPM_BUILD_ROOT%{_bindir}/%{name}-$FN.sh
done
popd

#test data
cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s ../../fonts/dejavu/DejaVuSans.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf
ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf

%{_bindir}/aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%postun
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}


%files
%defattr(-,root,root,-)
%doc README TODO docs/CHANGES_0_9_1
%{_javadir}/%{name}*.jar
%{_libdir}/%{name}
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files demo
%defattr(-,root,root,-)
%{_bindir}/%{name}-*.sh
%{_datadir}/%{name}/testdata


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-5
- BuildRequire icedtea as building with gcj fails (bug 297961)

* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8

* Mon Sep 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-3
- Fix determination of gcc include path

* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-2
- Dynamically determine gcc include path instead of hardcoding it, so that
  sdljava will build on other setups then devel-x86_64 too (oops).

* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- Adapted Packman spec file for Fedora

* Mon Jun 18 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.2
- rebuild with glew-1.3.6

* Sat Jun 16 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.1
- initial build 0.9.1
- repacked as tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:46:20 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:44:24 -0000	1.2
@@ -0,0 +1 @@
+sdljava-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:46:20 -0000	1.1
+++ sources	21 Sep 2007 17:44:24 -0000	1.2
@@ -0,0 +1 @@
+d4bf1f77e93cd7d728479ad9d73d59e6  sdljava-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:45:14 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:45:14 -0400
Subject: rpms/ladspa-cmt-plugins/devel cmt-1.15-addnoise.patch, NONE,
	1.1 cmt-1.15-dontdenormal.patch, NONE,
	1.1 cmt-1.15-nostrip.patch, NONE, 1.1 cmt-makefile.patch, NONE,
	1.1 cmt.rdf, NONE, 1.1 ladspa-cmt-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211745.l8LHjE0Y000913@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmt-1.15-addnoise.patch cmt-1.15-dontdenormal.patch 
	cmt-1.15-nostrip.patch cmt-makefile.patch cmt.rdf 
	ladspa-cmt-plugins.spec 
Log Message:
initial ladspa-cmt-plugins import


cmt-1.15-addnoise.patch:

--- NEW FILE cmt-1.15-addnoise.patch ---
--- cmt/src/freeverb/Components/revmodel.cpp~	2000-11-04 10:01:09.000000000 -0800
+++ cmt/src/freeverb/Components/revmodel.cpp	2005-01-28 15:01:46.000000000 -0800
@@ -6,6 +6,15 @@
 
 #include "revmodel.h"
 
+unsigned int rand_state = 1;
+
+inline void add_white_noise (float &val) {
+  rand_state = rand_state * 1234567UL + 890123UL;
+  int mantissa = rand_state & 0x807F0000;
+  int flt_rnd = mantissa | 0x1e999999;
+  val += *reinterpret_cast <const float*> (&flt_rnd);
+}
+
 revmodel::revmodel()
 {
 	// Tie the components to their buffers
@@ -82,6 +91,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)
@@ -118,6 +128,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)

cmt-1.15-dontdenormal.patch:

--- NEW FILE cmt-1.15-dontdenormal.patch ---
--- cmt/src/freeverb/Components/denormals.h~	2000-11-04 03:49:57.000000000 -0800
+++ cmt/src/freeverb/Components/denormals.h	2005-01-28 16:13:27.000000000 -0800
@@ -8,7 +8,7 @@
 #ifndef _denormals_
 #define _denormals_
 
-#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
+#define undenormalise(sample) 
 
 #endif//_denormals_
 

cmt-1.15-nostrip.patch:

--- NEW FILE cmt-1.15-nostrip.patch ---
diff -up cmt/src/makefile~ cmt/src/makefile
--- cmt/src/makefile~	2007-09-16 10:48:29.000000000 +0200
+++ cmt/src/makefile	2007-09-16 10:48:29.000000000 +0200
@@ -73,7 +73,6 @@ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
 		$(PLUGIN_OBJECTS)					
 
 install:	$(PLUGIN_LIB)
-	-strip $(PLUGIN_LIB)
 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always

cmt-makefile.patch:

--- NEW FILE cmt-makefile.patch ---
--- cmt/src/makefile~	2002-05-18 11:27:15.000000000 -0700
+++ cmt/src/makefile	2002-10-31 17:47:05.000000000 -0800
@@ -5,14 +5,14 @@
 # Change this if you want to install somewhere else. In particularly
 # you may wish to remove the middle "local/" part.
 
-INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
 
 ###############################################################################
 #
 # GENERAL
 #
 
-INCLUDES	=	-I/usr/local/include/
+# INCLUDES	=	-I/usr/local/include/
 CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
 CXXFLAGS	=	$(CFLAGS)
 PLUGIN_LIB	=	../plugins/cmt.so
@@ -67,7 +67,7 @@
 
 install:	$(PLUGIN_LIB)
 	-strip $(PLUGIN_LIB)
-	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
+	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
 	@echo ---------------------------------------------


--- NEW FILE cmt.rdf ---
<?xml version='1.0' encoding='ISO-8859-1'?>
<!DOCTYPE rdf:RDF [
        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
]>
<rdf:RDF xmlns:rdf="&rdf;"
         xmlns:rdfs="&rdfs;"
         xmlns:dc="&dc;"
         xmlns:ladspa="&ladspa;">

  <!-- New classes needed by CMT -->
  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
  </rdfs:Class>

  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>

  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>

  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>

  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>

  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>

  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>

  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>

  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>

  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>

</rdf:RDF>


--- NEW FILE ladspa-cmt-plugins.spec ---
Name:           ladspa-cmt-plugins
Version:        1.15
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      cmt <= 1.15-4
Provides:       cmt = %{version}-%{release}

%description
The Computer Music Toolkit (CMT) is a collection of LADSPA plugins for
use with software synthesis and recording packages on Linux. See the
license before use.

The CMT is developed primarily by Richard W.E. Furse the principle
designer of the LADSPA standard, with additional plugins by Jezar and
David Bartold. If you are a programmer or can write documentation and
would like to help out, please feel free to contact Richard.


%prep
%setup -q -n cmt
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod -x doc/plugins.html src/freeverb/Components/tuning.h


%build
%{__make} -C src %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC" 


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} -C src DESTDIR="%{buildroot}" \
                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
                 install
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README doc/*
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-5
- change name of package to ladspa-cmt-plugins, spec file tweaks
- install plugins in the right directory even for x86_64

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- remove -Wall on fc4, gcc4 fails otherwise

* Fri Jan 29 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-4
- after many tests I added white noise to the freeverb inputs so that
  denormals don't have a chance to appear. The output of freeverb 
  viewed on bitscope shows the background "noise" to be down to -300db,
  so it should be fine. See:
  http://www.musicdsp.org/files/denormal.pdf
- disable the built-in undernomal #define

* Wed Dec 22 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanups

* Sun Jul 11 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-3
- added rpm compilation flags to support multiple architectures, 
  kept the original O3 optimization level

* Thu Jul  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- fixed denormal problem that affects freeverb on newer versions of gcc
- added rdf description file from Steve Harris' web site

* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, erased old ladspa-sdk dependency

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- added release tags

* Wed Feb 12 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- updated to 1.15

* Thu Oct 31 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:38:58 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:44:41 -0000	1.2
@@ -0,0 +1 @@
+cmt_src_1.15.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:38:58 -0000	1.1
+++ sources	21 Sep 2007 17:44:41 -0000	1.2
@@ -0,0 +1 @@
+aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:45:54 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 13:45:54 -0400
Subject: rpms/maven-scm/devel maven-scm.spec,1.1,1.2
Message-ID: <200709211745.l8LHjsFZ001080@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-scm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930

Modified Files:
	maven-scm.spec 
Log Message:

- Rebuild with excludearch for ppc64




Index: maven-scm.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-scm.spec	20 Mar 2007 05:10:02 -0000	1.1
+++ maven-scm.spec	21 Sep 2007 17:45:21 -0000	1.2
@@ -36,7 +36,7 @@
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.1.b3.2jpp.1%{?dist}
+Release:        0.1.b3.2jpp.2%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        Apache Software License
@@ -56,7 +56,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 2.0.4-6
 BuildRequires:  maven2-plugin-compiler
@@ -286,6 +289,9 @@
 %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.b3.2jpp.2
+- Rebuild with excludearch for ppc64
+
 * Tue Feb 27 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.b3.2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 17:46:00 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 13:46:00 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.x.patch, 
	NONE, 1.1 system-config-printer.spec, 1.131, 1.132
Message-ID: <200709211746.l8LHk0eB001085@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv991

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.x.patch 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
- Pull in SVN patch from stable branch for 'Allow printing from
  the Internet' check-box (bug #221003).


system-config-printer-0.7.74.x.patch:

--- NEW FILE system-config-printer-0.7.74.x.patch ---
Index: po/sr at Latn.po
===================================================================
Index: po/as.po
===================================================================
Index: po/bs.po
===================================================================
Index: po/cs.po
===================================================================
Index: po/pt_BR.po
===================================================================
Index: po/mk.po
===================================================================
Index: po/es.po
===================================================================
Index: po/ko.po
===================================================================
Index: po/lo.po
===================================================================
Index: po/is.po
===================================================================
Index: po/no.po
===================================================================
Index: po/sk.po
===================================================================
Index: po/ms.po
===================================================================
Index: po/uk.po
===================================================================
Index: po/ro.po
===================================================================
Index: po/system-config-printer.pot
===================================================================
Index: po/nb.po
===================================================================
Index: po/bn.po
===================================================================
Index: po/ar.po
===================================================================
Index: po/fr.po
===================================================================
Index: po/kn.po
===================================================================
Index: po/hr.po
===================================================================
Index: po/nn.po
===================================================================
Index: po/mr.po
===================================================================
Index: po/or.po
===================================================================
Index: po/lv.po
===================================================================
Index: po/ca.po
===================================================================
Index: po/sr.po
===================================================================
Index: po/da.po
===================================================================
Index: po/bn_IN.po
===================================================================
Index: po/tr.po
===================================================================
Index: po/fa.po
===================================================================
Index: po/de.po
===================================================================
Index: po/sv.po
===================================================================
Index: po/ja.po
===================================================================
Index: po/ka.po
===================================================================
Index: po/zh_TW.po
===================================================================
Index: po/fi.po
===================================================================
Index: po/pa.po
===================================================================
Index: po/hi.po
===================================================================
Index: po/zh_CN.po
===================================================================
Index: po/ta.po
===================================================================
Index: po/te.po
===================================================================
Index: po/en_GB.po
===================================================================
Index: po/si.po
===================================================================
Index: po/cy.po
===================================================================
Index: po/gu.po
===================================================================
Index: po/hu.po
===================================================================
Index: po/vi.po
===================================================================
Index: po/hy.po
===================================================================
Index: po/my.po
===================================================================
Index: po/ru.po
===================================================================
Index: po/id.po
===================================================================
Index: po/el.po
===================================================================
Index: po/ml.po
===================================================================
Index: po/et.po
===================================================================
Index: po/nl.po
===================================================================
Index: po/pl.po
===================================================================
Index: po/it.po
===================================================================
Index: po/sl.po
===================================================================
Index: po/pt.po
===================================================================
Index: po/bg.po
===================================================================
Index: system-config-printer.glade
===================================================================
--- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1571)
+++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1571)
@@ -432,6 +432,40 @@
 			      </child>
 
 			      <child>
+				<widget class="GtkAlignment" id="alignment78">
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">1</property>
+				  <property name="yscale">1</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">12</property>
+				  <property name="right_padding">0</property>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="chkServerShareAny">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Allow printing from the Internet</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>
+				      <signal name="toggled" handler="on_server_changed" last_modification_time="Tue, 04 Sep 2007 09:46:49 GMT"/>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
 				<widget class="GtkCheckButton" id="chkServerRemoteAdmin">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
Index: ChangeLog
===================================================================
--- ChangeLog	(.../tags/0.7.74.2)	(revision 1571)
+++ ChangeLog	(.../branches/0.7.74.x)	(revision 1571)
@@ -1,3 +1,18 @@
+2007-09-04  Tim Waugh  <twaugh at redhat.com>
+
+	* system-config-printer.py (GUI.setConnected): Set sensitivity for
+	new check-box.
+	(GUI.fillServerTab): Show setting for new check-box.
+	(GUI.on_server_changed): Set sensitivity for new check-box.
+	(GUI.save_serversettings): Set server setting from check-box.
+
+	* system-config-printer.glade: New check-box for 'Allow printing
+	from the Internet'.
+
+2007-09-21  Tim Waugh  <twaugh at redhat.com>
+
+	* po/ko.po: Updated (from 0.7.32.x POT; needs further updating).
+
 2007-09-19  Tim Waugh  <twaugh at redhat.com>
 
 	* configure.in: Version 0.7.74.2.
Index: system-config-printer.py
===================================================================
--- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1571)
+++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1571)
@@ -74,6 +74,12 @@
 ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
 ellipsis = unichr(0x2026)
 
+try:
+    try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
+except AttributeError:
+    # cups module was compiled with CUPS < 1.3
+    try_CUPS_SERVER_REMOTE_ANY = "_remote_any"
+
 def nonfatalException ():
     print "Caught non-fatal exception.  Traceback:"
     (type, value, tb) = sys.exc_info ()
@@ -135,6 +141,7 @@
                         "btnApply", "btnRevert", "btnConflict",
 
                         "chkServerBrowse", "chkServerShare",
+                        "chkServerShareAny",
                         "chkServerRemoteAdmin", "chkServerAllowCancelAll",
                         "chkServerLogDebug",
 
@@ -607,6 +614,9 @@
                        self.chkServerLogDebug):
             widget.set_sensitive(connected)
 
+        sharing = self.chkServerShare.get_active ()
+        self.chkServerShareAny.set_sensitive (sharing)
+
         try:
             del self.server_settings
         except:
@@ -3625,15 +3635,17 @@
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),
+            (self.chkServerShareAny, try_CUPS_SERVER_REMOTE_ANY),
             (self.chkServerRemoteAdmin, cups.CUPS_SERVER_REMOTE_ADMIN),
             (self.chkServerAllowCancelAll, cups.CUPS_SERVER_USER_CANCEL_ANY),
             (self.chkServerLogDebug, cups.CUPS_SERVER_DEBUG_LOGGING),]:
             widget.set_data("setting", setting)
             if self.server_settings.has_key(setting):
                 widget.set_active(int(self.server_settings[setting]))
-                widget.show()
+                widget.set_sensitive(True)
             else:
-                widget.hide()
+                widget.set_active(False)
+                widget.set_sensitive(False)
         self.setDataButtonState()
         
     def on_server_changed(self, widget):
@@ -3642,6 +3654,11 @@
             self.changed.discard(widget)
         else:
             self.changed.add(widget)
+
+        sharing = self.chkServerShare.get_active ()
+        self.chkServerShareAny.set_sensitive (
+            sharing and self.server_settings.has_key(try_CUPS_SERVER_REMOTE_ANY))
+
         self.setDataButtonState()
 
     def save_serversettings(self):
@@ -3649,6 +3666,7 @@
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),
+            (self.chkServerShareAny, try_CUPS_SERVER_REMOTE_ANY),
             (self.chkServerRemoteAdmin, cups.CUPS_SERVER_REMOTE_ADMIN),
             (self.chkServerAllowCancelAll, cups.CUPS_SERVER_USER_CANCEL_ANY),
             (self.chkServerLogDebug, cups.CUPS_SERVER_DEBUG_LOGGING),]:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- system-config-printer.spec	19 Sep 2007 14:00:40 -0000	1.131
+++ system-config-printer.spec	21 Sep 2007 17:45:28 -0000	1.132
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
+Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p0 -b .0.7.74.x
 
 %build
 %configure
@@ -128,6 +130,10 @@
 fi
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
+- Pull in SVN patch from stable branch for 'Allow printing from
+  the Internet' check-box (bug #221003).
+
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-1
 - Updated pycups to 1.9.27.
 - 0.7.74.2:



From fedora-extras-commits at redhat.com  Fri Sep 21 17:47:58 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:47:58 -0400
Subject: rpms/ladspa-blop-plugins/devel ladspa-blop-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211747.l8LHlwcp001231@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-blop-plugins.spec 
Log Message:
initial ladspa-blop-plugins import



--- NEW FILE ladspa-blop-plugins.spec ---
Name:           ladspa-blop-plugins
Version:        0.2.8
Release:        5%{?dist}
Summary:        Bandlimited LADSPA Oscillator Plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://blop.sourceforge.net/
Source:         http://downloads.sourceforge.net/blop/blop-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      blop <= 0.2.8-1
Provides:       blop = %{version}-%{release}

%description
BLOP comprises a set of LADSPA plugins that generate bandlimited
sawtooth, square, variable pulse and slope-variable triangle waves,
for use in LADSPA hosts, principally for use with one of the many
modular software synthesisers available.

They are wavetable based, and are designed to produce output with
harmonic content as high as possible over a wide pitch range.


%prep
%setup -q -n blop-%{version}
chmod -x src/lp4pole_filter.c src/include/lp4pole_filter.h


%build
%configure
# note, we must pass CFLAGS as for some reason they do not get propagated
# by configure
%{__make} %{?_smp_mflags} ladspa_plugin_dir="%{_libdir}/ladspa" \
  CFLAGS="$RPM_OPT_FLAGS -ffast-math -DNO_DEBUG -DPIC -fPIC"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} DESTDIR="%{buildroot}" \
          ladspa_plugin_dir="%{_libdir}/ladspa" install
%find_lang blop

# install the rdf description
%{__install} -p -m 644 doc/blop.rdf %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files -f blop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO doc/*.txt
%{_libdir}/ladspa/*.so
%{_libdir}/ladspa/blop_files
%{_datadir}/ladspa/rdf/*.rdf


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file

* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-4
- Make compile honor RPM_OPT_FLAGS

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-2
- spec file tweaks, add %%{?dist} to release

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup
- do not include ladspa directory in file list

* Mon Jun 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-1
- updated to 0.2.8, fixed file list and added translations

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- added release tags

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- updated to 0.2.7

* Fri Feb 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.6
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:37:01 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:47:26 -0000	1.2
@@ -0,0 +1 @@
+blop-0.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:37:01 -0000	1.1
+++ sources	21 Sep 2007 17:47:26 -0000	1.2
@@ -0,0 +1 @@
+4baedbf1e7cacc7d1034c4bcd5556d6f  blop-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:04 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:04 -0400
Subject: rpms/sdljava/F-7 sdljava-0.9.1-regen.patch, NONE,
	1.1 sdljava-runtest.sh, NONE, 1.1 sdljava.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHn4Pk001388@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305

Modified Files:
	.cvsignore sources 
Added Files:
	sdljava-0.9.1-regen.patch sdljava-runtest.sh sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8


sdljava-0.9.1-regen.patch:

--- NEW FILE sdljava-0.9.1-regen.patch ---
diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/linux/Makefile
--- sdljava-0.9.1/etc/build/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
 
 SDLJAVA_I=SDLAudio.i\
           SDLCdrom.i\
@@ -46,35 +46,35 @@ gfx:    libsdljava_gfx.so
 #
 # NOTE:  if you want to work on the sdljava native layer please un-comment these lines
 #
-#SDLAudio_wrap.c: SDLAudio.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
-#
-#SDLCdrom_wrap.c: SDLCdrom.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
-#
-#SDLEvent_wrap.c: SDLEvent.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
-#
-#SDLGFX_wrap.c: SDLGFX.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
-#
-#SDLImage_wrap.c: SDLImage.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
-#
-#SDLJoystick_wrap.c: SDLJoystick.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
-#
-#SDLMain_wrap.c: SDLMain.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
-#
-#SDLMixer_wrap.c: SDLMixer.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
-#
-#SDLTTF_wrap.c: SDLTTF.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
-#
-#SDLVideo_wrap.c: SDLVideo.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,12 +4,12 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@
 
 GLJAVA_I=glew.i
 
 GLJAVA_OBJ=glew_wrap.o
-GLJAVA_LIB=-lGLEW
+GLJAVA_LIB=-lGLEW -lGLU
 
 all:	libgljava.so
 
@@ -17,8 +17,8 @@ all:	libgljava.so
 #
 # NOTE:  if you want to work on the gljava native layer please un-comment the following line
 #
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
 
 FTGLJAVA_OBJ=FTGL_wrap.o
 FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@@ -15,9 +15,9 @@ all:	libftgljava.so
 #
 # NOTE:  if you want to work on the ftgljava native layer please un-comment the following line
 #
-#FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-#	./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+	./post-process.rb
 
 %.o: %.cxx
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@


--- NEW FILE sdljava-runtest.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=`build-classpath sdljava`
MAIN_CLASS="$1"
if [ -x /usr/lib64/sdljava/libsdljava.so ]; then
  set_options "-Djava.library.path="/usr/lib64/sdljava""
else
  set_options "-Djava.library.path="/usr/lib/sdljava""
fi

shift
run "$@"


--- NEW FILE sdljava.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

Name:           sdljava
Version:        0.9.1
Release:        4%{?dist}
Summary:        Java binding to the SDL API
Group:          System Environment/Libraries
License:        LGPLv2+
Url:            http://sdljava.sourceforge.net/
# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# with the included Microsoft Copyrighted Arial fonts removed
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-runtest.sh
Patch0:         sdljava-0.9.1-regen.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-devel java-gcj-compat-devel
BuildRequires:  ant xml-commons-apis swig bsh jdom
Requires:       bsh jdom
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
sdljava is a Java binding to the SDL API being developed by Ivan Ganza.

sdljava provides the ability to write games and other applications
from the java programming language. sdljava is designed to be fast,
efficient and easy to use.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description javadoc
Javadoc for %{name}.


%package demo
Summary:        Some examples for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       /usr/share/fonts/dejavu/DejaVuSans.ttf
Requires:       jpackage-utils

%description demo
Demonstrations and samples for %{name}.


%prep
%setup -q
%patch0 -p1 -z .regen
iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1

# patch in gcc include path so that swig can find it
GCC_PATH=`gcc -print-search-dirs | grep install | cut -f 2 -d " "`
sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
  etc/build/linux/Makefile \
  etc/build/gljava/linux/Makefile \
  etc/build/gljava/linux/ftgl/Makefile

# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
  -e 's|testdata|%{_datadir}/%{name}/testdata|g'

# use system versions of bsh & jdom
pushd lib
rm *.jar
ln -s /usr/share/java/jdom.jar .
ln -s /usr/share/java/bsh.jar .
popd

# copy the Linux Makefiles into place
cp etc/build/linux/Makefile src/sdljava/native
cp etc/build/gljava/linux/Makefile src/org/gljava/opengl/native
cp etc/build/gljava/linux/ftgl/Makefile src/org/gljava/opengl/native/ftgl

# and remove the swig generated code so that it gets regenerated
rm src/sdljava/native/SDL*_wrap.c src/sdljava/native/SDL_types.h
rm src/org/gljava/opengl/native/glew_wrap.c


%build
pushd src/sdljava/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native/ftgl
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

ant jar javadoc


%install
rm -rf $RPM_BUILD_ROOT

# dirs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# jars
install -m 644 lib/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# native libraries
install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}

# javadoc
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# demo scripts
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
pushd bin
rm runtest.sh
for i in `ls -1 *.sh`; do
   sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i
   FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'`
   install -m 755 $i $RPM_BUILD_ROOT%{_bindir}/%{name}-$FN.sh
done
popd

#test data
cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s ../../fonts/dejavu/DejaVuSans.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf
ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf

%{_bindir}/aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%postun
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}


%files
%defattr(-,root,root,-)
%doc README TODO docs/CHANGES_0_9_1
%{_javadir}/%{name}*.jar
%{_libdir}/%{name}
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files demo
%defattr(-,root,root,-)
%{_bindir}/%{name}-*.sh
%{_datadir}/%{name}/testdata


%changelog
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8

* Mon Sep 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-3
- Fix determination of gcc include path

* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-2
- Dynamically determine gcc include path instead of hardcoding it, so that
  sdljava will build on other setups then devel-x86_64 too (oops).

* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- Adapted Packman spec file for Fedora

* Mon Jun 18 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.2
- rebuild with glew-1.3.6

* Sat Jun 16 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.1
- initial build 0.9.1
- repacked as tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:46:20 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:48:32 -0000	1.2
@@ -0,0 +1 @@
+sdljava-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:46:20 -0000	1.1
+++ sources	21 Sep 2007 17:48:32 -0000	1.2
@@ -0,0 +1 @@
+d4bf1f77e93cd7d728479ad9d73d59e6  sdljava-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:11 -0400
Subject: rpms/ladspa-cmt-plugins/F-7 cmt-1.15-addnoise.patch, NONE,
	1.1 cmt-1.15-dontdenormal.patch, NONE,
	1.1 cmt-1.15-nostrip.patch, NONE, 1.1 cmt-makefile.patch, NONE,
	1.1 cmt.rdf, NONE, 1.1 ladspa-cmt-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHnBBh001440@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-cmt-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1332

Modified Files:
	.cvsignore sources 
Added Files:
	cmt-1.15-addnoise.patch cmt-1.15-dontdenormal.patch 
	cmt-1.15-nostrip.patch cmt-makefile.patch cmt.rdf 
	ladspa-cmt-plugins.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion


cmt-1.15-addnoise.patch:

--- NEW FILE cmt-1.15-addnoise.patch ---
--- cmt/src/freeverb/Components/revmodel.cpp~	2000-11-04 10:01:09.000000000 -0800
+++ cmt/src/freeverb/Components/revmodel.cpp	2005-01-28 15:01:46.000000000 -0800
@@ -6,6 +6,15 @@
 
 #include "revmodel.h"
 
+unsigned int rand_state = 1;
+
+inline void add_white_noise (float &val) {
+  rand_state = rand_state * 1234567UL + 890123UL;
+  int mantissa = rand_state & 0x807F0000;
+  int flt_rnd = mantissa | 0x1e999999;
+  val += *reinterpret_cast <const float*> (&flt_rnd);
+}
+
 revmodel::revmodel()
 {
 	// Tie the components to their buffers
@@ -82,6 +91,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)
@@ -118,6 +128,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)

cmt-1.15-dontdenormal.patch:

--- NEW FILE cmt-1.15-dontdenormal.patch ---
--- cmt/src/freeverb/Components/denormals.h~	2000-11-04 03:49:57.000000000 -0800
+++ cmt/src/freeverb/Components/denormals.h	2005-01-28 16:13:27.000000000 -0800
@@ -8,7 +8,7 @@
 #ifndef _denormals_
 #define _denormals_
 
-#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
+#define undenormalise(sample) 
 
 #endif//_denormals_
 

cmt-1.15-nostrip.patch:

--- NEW FILE cmt-1.15-nostrip.patch ---
diff -up cmt/src/makefile~ cmt/src/makefile
--- cmt/src/makefile~	2007-09-16 10:48:29.000000000 +0200
+++ cmt/src/makefile	2007-09-16 10:48:29.000000000 +0200
@@ -73,7 +73,6 @@ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
 		$(PLUGIN_OBJECTS)					
 
 install:	$(PLUGIN_LIB)
-	-strip $(PLUGIN_LIB)
 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always

cmt-makefile.patch:

--- NEW FILE cmt-makefile.patch ---
--- cmt/src/makefile~	2002-05-18 11:27:15.000000000 -0700
+++ cmt/src/makefile	2002-10-31 17:47:05.000000000 -0800
@@ -5,14 +5,14 @@
 # Change this if you want to install somewhere else. In particularly
 # you may wish to remove the middle "local/" part.
 
-INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
 
 ###############################################################################
 #
 # GENERAL
 #
 
-INCLUDES	=	-I/usr/local/include/
+# INCLUDES	=	-I/usr/local/include/
 CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
 CXXFLAGS	=	$(CFLAGS)
 PLUGIN_LIB	=	../plugins/cmt.so
@@ -67,7 +67,7 @@
 
 install:	$(PLUGIN_LIB)
 	-strip $(PLUGIN_LIB)
-	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
+	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
 	@echo ---------------------------------------------


--- NEW FILE cmt.rdf ---
<?xml version='1.0' encoding='ISO-8859-1'?>
<!DOCTYPE rdf:RDF [
        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
]>
<rdf:RDF xmlns:rdf="&rdf;"
         xmlns:rdfs="&rdfs;"
         xmlns:dc="&dc;"
         xmlns:ladspa="&ladspa;">

  <!-- New classes needed by CMT -->
  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
  </rdfs:Class>

  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>

  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>

  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>

  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>

  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>

  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>

  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>

  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>

  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>

</rdf:RDF>


--- NEW FILE ladspa-cmt-plugins.spec ---
Name:           ladspa-cmt-plugins
Version:        1.15
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      cmt <= 1.15-4
Provides:       cmt = %{version}-%{release}

%description
The Computer Music Toolkit (CMT) is a collection of LADSPA plugins for
use with software synthesis and recording packages on Linux. See the
license before use.

The CMT is developed primarily by Richard W.E. Furse the principle
designer of the LADSPA standard, with additional plugins by Jezar and
David Bartold. If you are a programmer or can write documentation and
would like to help out, please feel free to contact Richard.


%prep
%setup -q -n cmt
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod -x doc/plugins.html src/freeverb/Components/tuning.h


%build
%{__make} -C src %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC" 


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} -C src DESTDIR="%{buildroot}" \
                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
                 install
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README doc/*
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-5
- change name of package to ladspa-cmt-plugins, spec file tweaks
- install plugins in the right directory even for x86_64

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- remove -Wall on fc4, gcc4 fails otherwise

* Fri Jan 29 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-4
- after many tests I added white noise to the freeverb inputs so that
  denormals don't have a chance to appear. The output of freeverb 
  viewed on bitscope shows the background "noise" to be down to -300db,
  so it should be fine. See:
  http://www.musicdsp.org/files/denormal.pdf
- disable the built-in undernomal #define

* Wed Dec 22 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanups

* Sun Jul 11 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-3
- added rpm compilation flags to support multiple architectures, 
  kept the original O3 optimization level

* Thu Jul  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- fixed denormal problem that affects freeverb on newer versions of gcc
- added rdf description file from Steve Harris' web site

* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, erased old ladspa-sdk dependency

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- added release tags

* Wed Feb 12 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- updated to 1.15

* Thu Oct 31 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:38:58 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:48:38 -0000	1.2
@@ -0,0 +1 @@
+cmt_src_1.15.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:38:58 -0000	1.1
+++ sources	21 Sep 2007 17:48:38 -0000	1.2
@@ -0,0 +1 @@
+aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:35 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:35 -0400
Subject: rpms/ladspa-blop-plugins/F-7 ladspa-blop-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHnZbx001508@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-blop-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1380

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-blop-plugins.spec 
Log Message:
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file



--- NEW FILE ladspa-blop-plugins.spec ---
Name:           ladspa-blop-plugins
Version:        0.2.8
Release:        5%{?dist}
Summary:        Bandlimited LADSPA Oscillator Plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://blop.sourceforge.net/
Source:         http://downloads.sourceforge.net/blop/blop-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      blop <= 0.2.8-1
Provides:       blop = %{version}-%{release}

%description
BLOP comprises a set of LADSPA plugins that generate bandlimited
sawtooth, square, variable pulse and slope-variable triangle waves,
for use in LADSPA hosts, principally for use with one of the many
modular software synthesisers available.

They are wavetable based, and are designed to produce output with
harmonic content as high as possible over a wide pitch range.


%prep
%setup -q -n blop-%{version}
chmod -x src/lp4pole_filter.c src/include/lp4pole_filter.h


%build
%configure
# note, we must pass CFLAGS as for some reason they do not get propagated
# by configure
%{__make} %{?_smp_mflags} ladspa_plugin_dir="%{_libdir}/ladspa" \
  CFLAGS="$RPM_OPT_FLAGS -ffast-math -DNO_DEBUG -DPIC -fPIC"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} DESTDIR="%{buildroot}" \
          ladspa_plugin_dir="%{_libdir}/ladspa" install
%find_lang blop

# install the rdf description
%{__install} -p -m 644 doc/blop.rdf %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files -f blop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO doc/*.txt
%{_libdir}/ladspa/*.so
%{_libdir}/ladspa/blop_files
%{_datadir}/ladspa/rdf/*.rdf


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file

* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-4
- Make compile honor RPM_OPT_FLAGS

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-2
- spec file tweaks, add %%{?dist} to release

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup
- do not include ladspa directory in file list

* Mon Jun 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-1
- updated to 0.2.8, fixed file list and added translations

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- added release tags

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- updated to 0.2.7

* Fri Feb 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.6
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:37:01 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:49:02 -0000	1.2
@@ -0,0 +1 @@
+blop-0.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:37:01 -0000	1.1
+++ sources	21 Sep 2007 17:49:02 -0000	1.2
@@ -0,0 +1 @@
+4baedbf1e7cacc7d1034c4bcd5556d6f  blop-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:45 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:49:45 -0400
Subject: rpms/tetex-IEEEtran/F-7 tetex-IEEEtran.spec,1.5,1.6
Message-ID: <200709211749.l8LHnj5U001548@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1381

Modified Files:
	tetex-IEEEtran.spec 
Log Message:



Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/F-7/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:49:12 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:53:24 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:53:24 -0400
Subject: rpms/tetex-IEEEtran/F-7 sources,1.2,1.3
Message-ID: <200709211753.l8LHrOWQ001722@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1691

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:52:51 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip



From fedora-extras-commits at redhat.com  Fri Sep 21 17:54:48 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 13:54:48 -0400
Subject: rpms/maven-shared/devel maven-shared.spec,1.2,1.3
Message-ID: <200709211754.l8LHsmj9001794@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-shared/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1740

Modified Files:
	maven-shared.spec 
Log Message:

- Rebuild with ppc64 excludearch'd
- Removed 'jpp' from a BR version





Index: maven-shared.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-shared.spec	20 Mar 2007 14:01:21 -0000	1.2
+++ maven-shared.spec	21 Sep 2007 17:54:16 -0000	1.3
@@ -51,13 +51,13 @@
 
 Name:           maven-shared
 Version:        1.0
-Release:        4jpp.2%{?dist}
+Release:        4jpp.3%{?dist}
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven2 >= 0:2.0.4-9jpp
+BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
@@ -82,6 +82,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -149,7 +151,6 @@
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
@@ -281,6 +282,10 @@
 %doc %{_javadocdir}/%{name}-plugin-testing-harness*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-4jpp.3
+- Rebuild with ppc64 excludearch'd
+- Removed 'jpp' from a BR version
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-4jpp.2
 - Fixed BRs and Reqa
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:55:18 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:55:18 -0400
Subject: rpms/tetex-IEEEtran/FC-6 sources, 1.2, 1.3 tetex-IEEEtran.spec, 1.5,
	1.6
Message-ID: <200709211755.l8LHtIhC001852@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1775

Modified Files:
	sources tetex-IEEEtran.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:54:45 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip


Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/FC-6/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:54:45 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:55:25 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:55:25 -0400
Subject: rpms/tetex-IEEEtran/devel sources, 1.2, 1.3 tetex-IEEEtran.spec, 1.5,
	1.6
Message-ID: <200709211755.l8LHtP2K001903@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1802

Modified Files:
	sources tetex-IEEEtran.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:54:53 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip


Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/devel/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:54:53 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:06:12 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:06:12 -0400
Subject: rpms/xournal/F-7 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 x-xoj.desktop, 
	1.1, 1.2 xournal.desktop, 1.1, 1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211806.l8LI6CHt010537@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10505

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2007 18:38:29 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:05:39 -0000	1.2
@@ -0,0 +1 @@
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:05:19 -0000	1.2
+++ sources	21 Sep 2007 18:05:39 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:05:19 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:05:39 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:05:19 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:05:39 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:29:57 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:05:39 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:08:03 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:08:03 -0400
Subject: rpms/xournal/FC-6 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 x-xoj.desktop, 
	1.1, 1.2 xournal.desktop, 1.1, 1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211808.l8LI83sh010639@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10607

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2007 18:38:29 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:07:31 -0000	1.2
@@ -0,0 +1 @@
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:05:26 -0000	1.2
+++ sources	21 Sep 2007 18:07:31 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:05:26 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:07:31 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:05:26 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:07:31 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:30:02 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:07:31 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:08:53 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:08:53 -0400
Subject: rpms/xournal/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 x-xoj.desktop, 1.1, 1.2 xournal.desktop, 1.1,
	1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211808.l8LI8rbr010724@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10651

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jun 2007 20:01:00 -0000	1.2
+++ .cvsignore	21 Sep 2007 18:08:21 -0000	1.3
@@ -1 +1 @@
-xournal-0.3.3.tar.gz
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:01:00 -0000	1.2
+++ sources	21 Sep 2007 18:08:21 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:01:00 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:08:21 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:01:00 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:08:21 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:30:07 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:08:21 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:12:18 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Fri, 21 Sep 2007 14:12:18 -0400
Subject: rpms/dhcdbd/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE dhcdbd.spec, 1.52, NONE sources, 1.40, NONE
Message-ID: <200709211812.l8LICIhQ010946@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcdbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907

Added Files:
	dead.package 
Removed Files:
	Makefile dhcdbd.spec sources 
Log Message:
dhcdbd is dead.



--- NEW FILE dead.package ---
Obsoleted by NetworkManager 0.7.0 and higher.
21-Sep-2007

dhcdbd is no longer maintained or developed as all functionality has moved
over to NetworkManager.  Support for dhcdbd in previous releases of Fedora
will continue as long as we are supporting those releases of Fedora.

-- 
David Cantrell <dcantrell at redhat.com>


--- Makefile DELETED ---


--- dhcdbd.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 18:13:29 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:13:29 -0400
Subject: rpms/nqc/F-7 nqc.spec,1.7,1.8
Message-ID: <200709211813.l8LIDT1F011026@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/nqc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10994

Modified Files:
	nqc.spec 
Log Message:



Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/F-7/nqc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nqc.spec	21 Jul 2007 06:44:15 -0000	1.7
+++ nqc.spec	21 Sep 2007 18:12:56 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
-License:        MPL
+License:        MPLv1.0
 URL:            http://bricxcc.sourceforge.net/nqc/
 Source0:        http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r6.tgz
 Source1:        60-legousbtower.rules
@@ -70,7 +70,8 @@
 
 
 %changelog
-* Fri Jul 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+- Updated license to reflect specific MPL version
 - New upstream release
 - Added NQC tutorial and samples to docs
 - Added -c option to setup to create top-level directory



From fedora-extras-commits at redhat.com  Fri Sep 21 18:15:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:15:56 -0400
Subject: rpms/kdebase4/F-7 kdebase4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709211815.l8LIFuPT011215@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11137/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	kdebase4.spec 
Log Message:
New package kdebase4 - K Desktop Environment 4 - Core Files:
- copied from kdebase-kde4-branch
- kdebase.spec renamed to kdebase4.spec to match guidelines
- ExcludeArch: ppc64 (#300601)


--- NEW FILE kdebase4.spec ---

Summary:       K Desktop Environment 4 - Core Files
Version:       3.93.0
Release:       4%{?dist}

%if 0%{?fedora} > 8
Name:          kdebase
Epoch:         6

Obsoletes:     kdebase4 < %{version}-%{release}
Provides:      kdebase4 = %{version}-%{release}

%else
Name:          kdebase4
%endif

License:       GPLv2
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# rh#300601
ExcludeArch: ppc64

BuildRequires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
%ifnarch s390 s390x
Requires: eject
%endif

# should not conflict with d3lphin, but does with old Dolphin
Conflicts:     dolphin <= 0.8.2

BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
# needed?
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
BuildRequires: doxygen
BuildRequires: fontconfig-devel
BuildRequires: gettext
BuildRequires: hal-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
# needed?
BuildRequires: libart_lgpl-devel
# needed?
BuildRequires: libfontenc-devel
BuildRequires: libusb-devel
BuildRequires: OpenEXR-devel
# needed?
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
# samba support
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
%else
BuildRequires: samba
%endif
BuildRequires: soprano-devel
BuildRequires: strigi-devel
BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
%if 0%{?fedora} >= 8
BuildRequires:  libxcb-devel
%endif
# needed?
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
BuildRequires: zlib-devel
# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel

%description
Core applications for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group:    Development/Libraries
Summary:  Header files for kdebase4
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdebase4"
Obsoletes: kdebase4-devel < %{version}-%{release}
Provides:  kdebase4-devel = %{version}-%{release}
%endif
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
Header files for developing applications using %{name}.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdebase-%{version}


%build

mkdir -p %{_target_platform} 
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

# omit gigantic oxygen scalable/svg icons, for now -- Rex
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 

# remove files which conflict with KDE 3
rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
rm -rf %{buildroot}%{_datadir}/emoticons
rm -rf %{buildroot}%{_kde4_datadir}/locale
rm -rf %{buildroot}%{_kde4_datadir}/autostart
rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
rm -rf %{buildroot}%{_kde4_datadir}/config
rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
# binaries: conflict with kdebase
rm -f %{buildroot}%{_kde4_bindir}/drkonqi
rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
rm -f %{buildroot}%{_kde4_bindir}/kdeeject
rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
rm -f %{buildroot}%{_kde4_bindir}/kdesu
rm -f %{buildroot}%{_kde4_bindir}/kdesud
rm -f %{buildroot}%{_kde4_bindir}/kdialog
rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
rm -f %{buildroot}%{_kde4_bindir}/kfind
rm -f %{buildroot}%{_kde4_bindir}/kfmclient
rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
rm -f %{buildroot}%{_kde4_bindir}/knetattach
rm -f %{buildroot}%{_kde4_bindir}/konqueror
rm -f %{buildroot}%{_kde4_bindir}/konsole
rm -f %{buildroot}%{_kde4_bindir}/kprinter
rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
rm -f %{buildroot}%{_kde4_bindir}/kstart
rm -f %{buildroot}%{_kde4_bindir}/ktrash
rm -f %{buildroot}%{_kde4_bindir}/kwrite
rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
# binaries: conflict with kdelibs
rm -f %{buildroot}%{_kde4_bindir}/kcmshell
rm -f %{buildroot}%{_kde4_bindir}/kfile
rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
rm -f %{buildroot}%{_kde4_bindir}/kioexec
rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
# binaries: conflict with kdebase-extras
rm -f %{buildroot}%{_kde4_bindir}/kappfinder
# do not strictly conflict, but we removed the corresponding binaries:
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
# we also removed the binaries for these:
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :

%postun
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_appsdir}/*
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_kde4_iconsdir}/oxygen/
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
%{_kde4_docdir}/HTML/en/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/*
%exclude %{_kde4_libdir}/kde4/devel/

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/lib*.so


%changelog
* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- ExcludeArch: ppc64 (#300601)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- add missing BR alsa-lib-devel

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: GPLv2

* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel

* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
- consolekit_kdm patch (#228111, kde#147790)
- update startkde patch

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92 (kde-4-beta1)

* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
- fix startkde
- add env/shutdown directory

* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- kde4.desktop: fix session Name

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
- cleanup/fix kde4.desktop
- kdepimlibs4->kdepimlibs

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
- specfile cleanup (%%prefix issues mostly)

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
  in case we want to drop the Rs on these from kdelibs4-devel
- consistently add all BRs as -devel Rs, not just almost all, until we can
  figure out which, if any, are really needed
- BR libsmbclient-devel instead of samba on F>=7, EL>=6

* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirement for cmake
- build against libxklavier on EL5
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- rebuild for patched FindKDE4Internal.cmake

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- drop obsolete joydevice.h patch
- remove translations of "KDE" without the "4" from kde4.desktop
- resync BR and -devel Requires
- don't set LD_LIBRARY_PATH
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- fix missing underscore in _datadir
- install kde4.desktop in install, not prep
- fix invalid syntax in kde4.desktop

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
- spec file cleanups and added clean up in %%install
- fixed PATH for libkdecore.so.5; cannot open shared object file;
- added Logitech mouse support
- added dbus-devel, hal-devel and more as BR
- fixed broken joydevice.h - Kevin Kofler
- added file kde4.desktop

* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:31:51 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:15:24 -0000	1.2
@@ -0,0 +1,2 @@
+kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:31:51 -0000	1.1
+++ sources	21 Sep 2007 18:15:24 -0000	1.2
@@ -0,0 +1 @@
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 18:16:00 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:16:00 -0400
Subject: rpms/kdebase4/devel kdebase4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709211816.l8LIG0WG011219@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11137/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kdebase4.spec 
Log Message:
New package kdebase4 - K Desktop Environment 4 - Core Files:
- copied from kdebase-kde4-branch
- kdebase.spec renamed to kdebase4.spec to match guidelines
- ExcludeArch: ppc64 (#300601)


--- NEW FILE kdebase4.spec ---

Summary:       K Desktop Environment 4 - Core Files
Version:       3.93.0
Release:       4%{?dist}

%if 0%{?fedora} > 8
Name:          kdebase
Epoch:         6

Obsoletes:     kdebase4 < %{version}-%{release}
Provides:      kdebase4 = %{version}-%{release}

%else
Name:          kdebase4
%endif

License:       GPLv2
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# rh#300601
ExcludeArch: ppc64

BuildRequires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
%ifnarch s390 s390x
Requires: eject
%endif

# should not conflict with d3lphin, but does with old Dolphin
Conflicts:     dolphin <= 0.8.2

BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
# needed?
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
BuildRequires: doxygen
BuildRequires: fontconfig-devel
BuildRequires: gettext
BuildRequires: hal-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
# needed?
BuildRequires: libart_lgpl-devel
# needed?
BuildRequires: libfontenc-devel
BuildRequires: libusb-devel
BuildRequires: OpenEXR-devel
# needed?
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
# samba support
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
%else
BuildRequires: samba
%endif
BuildRequires: soprano-devel
BuildRequires: strigi-devel
BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
%if 0%{?fedora} >= 8
BuildRequires:  libxcb-devel
%endif
# needed?
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
BuildRequires: zlib-devel
# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel

%description
Core applications for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group:    Development/Libraries
Summary:  Header files for kdebase4
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdebase4"
Obsoletes: kdebase4-devel < %{version}-%{release}
Provides:  kdebase4-devel = %{version}-%{release}
%endif
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
Header files for developing applications using %{name}.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdebase-%{version}


%build

mkdir -p %{_target_platform} 
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

# omit gigantic oxygen scalable/svg icons, for now -- Rex
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 

# remove files which conflict with KDE 3
rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
rm -rf %{buildroot}%{_datadir}/emoticons
rm -rf %{buildroot}%{_kde4_datadir}/locale
rm -rf %{buildroot}%{_kde4_datadir}/autostart
rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
rm -rf %{buildroot}%{_kde4_datadir}/config
rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
# binaries: conflict with kdebase
rm -f %{buildroot}%{_kde4_bindir}/drkonqi
rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
rm -f %{buildroot}%{_kde4_bindir}/kdeeject
rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
rm -f %{buildroot}%{_kde4_bindir}/kdesu
rm -f %{buildroot}%{_kde4_bindir}/kdesud
rm -f %{buildroot}%{_kde4_bindir}/kdialog
rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
rm -f %{buildroot}%{_kde4_bindir}/kfind
rm -f %{buildroot}%{_kde4_bindir}/kfmclient
rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
rm -f %{buildroot}%{_kde4_bindir}/knetattach
rm -f %{buildroot}%{_kde4_bindir}/konqueror
rm -f %{buildroot}%{_kde4_bindir}/konsole
rm -f %{buildroot}%{_kde4_bindir}/kprinter
rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
rm -f %{buildroot}%{_kde4_bindir}/kstart
rm -f %{buildroot}%{_kde4_bindir}/ktrash
rm -f %{buildroot}%{_kde4_bindir}/kwrite
rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
# binaries: conflict with kdelibs
rm -f %{buildroot}%{_kde4_bindir}/kcmshell
rm -f %{buildroot}%{_kde4_bindir}/kfile
rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
rm -f %{buildroot}%{_kde4_bindir}/kioexec
rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
# binaries: conflict with kdebase-extras
rm -f %{buildroot}%{_kde4_bindir}/kappfinder
# do not strictly conflict, but we removed the corresponding binaries:
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
# we also removed the binaries for these:
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :

%postun
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_appsdir}/*
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_kde4_iconsdir}/oxygen/
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
%{_kde4_docdir}/HTML/en/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/*
%exclude %{_kde4_libdir}/kde4/devel/

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/lib*.so


%changelog
* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- ExcludeArch: ppc64 (#300601)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- add missing BR alsa-lib-devel

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: GPLv2

* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel

* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
- consolekit_kdm patch (#228111, kde#147790)
- update startkde patch

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92 (kde-4-beta1)

* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
- fix startkde
- add env/shutdown directory

* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- kde4.desktop: fix session Name

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
- cleanup/fix kde4.desktop
- kdepimlibs4->kdepimlibs

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
- specfile cleanup (%%prefix issues mostly)

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
  in case we want to drop the Rs on these from kdelibs4-devel
- consistently add all BRs as -devel Rs, not just almost all, until we can
  figure out which, if any, are really needed
- BR libsmbclient-devel instead of samba on F>=7, EL>=6

* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirement for cmake
- build against libxklavier on EL5
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- rebuild for patched FindKDE4Internal.cmake

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- drop obsolete joydevice.h patch
- remove translations of "KDE" without the "4" from kde4.desktop
- resync BR and -devel Requires
- don't set LD_LIBRARY_PATH
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- fix missing underscore in _datadir
- install kde4.desktop in install, not prep
- fix invalid syntax in kde4.desktop

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
- spec file cleanups and added clean up in %%install
- fixed PATH for libkdecore.so.5; cannot open shared object file;
- added Logitech mouse support
- added dbus-devel, hal-devel and more as BR
- fixed broken joydevice.h - Kevin Kofler
- added file kde4.desktop

* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:31:51 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:15:27 -0000	1.2
@@ -0,0 +1,2 @@
+kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:31:51 -0000	1.1
+++ sources	21 Sep 2007 18:15:27 -0000	1.2
@@ -0,0 +1 @@
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 18:16:53 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:16:53 -0400
Subject: rpms/nqc/devel nqc.spec,1.7,1.8
Message-ID: <200709211816.l8LIGrKE011251@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/nqc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225

Modified Files:
	nqc.spec 
Log Message:



Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/devel/nqc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nqc.spec	21 Jul 2007 06:44:22 -0000	1.7
+++ nqc.spec	21 Sep 2007 18:16:20 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
-License:        MPL
+License:        MPLv1.0
 URL:            http://bricxcc.sourceforge.net/nqc/
 Source0:        http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r6.tgz
 Source1:        60-legousbtower.rules
@@ -70,7 +70,8 @@
 
 
 %changelog
-* Fri Jul 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+- Updated license to reflect specific MPL version
 - New upstream release
 - Added NQC tutorial and samples to docs
 - Added -c option to setup to create top-level directory



From fedora-extras-commits at redhat.com  Fri Sep 21 18:32:10 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 14:32:10 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.3,1.4
Message-ID: <200709211832.l8LIWApF011641@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11621

Modified Files:
	biosdevname.spec 
Log Message:
fix manpage entry in files


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- biosdevname.spec	21 Sep 2007 17:04:47 -0000	1.3
+++ biosdevname.spec	21 Sep 2007 18:31:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		biosdevname
 Version:	0.2.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -50,10 +50,13 @@
 %doc COPYING README
 /sbin/%{name}
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules
-%{_mandir}/1/%{name}.1
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-3
+- fix manpage entry in files
+
 * Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-2
 - rebuild with Requires: udev > 115-3.20070920git
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:34:07 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Fri, 21 Sep 2007 14:34:07 -0400
Subject: rpms/asm2/devel asm2.spec,1.1,1.2
Message-ID: <200709211834.l8LIY7KK011776@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/asm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11751

Modified Files:
	asm2.spec 
Log Message:
Fix Source0 URL, License tag




Index: asm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asm2/devel/asm2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asm2.spec	21 Aug 2007 17:33:21 -0000	1.1
+++ asm2.spec	21 Sep 2007 18:33:35 -0000	1.2
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 
 # All rights reserved.
 #
@@ -31,13 +31,13 @@
 
 Name:           asm2
 Version:        2.1
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 Summary:        A code manipulation tool to implement adaptable systems
-License:        BSD-style
+License:        BSD
 URL:            http://asm.objectweb.org/
 Group:          Development/Libraries
-Source0:        http://download.us.forge.objectweb.org/asm/asm-2.1.tar.gz
+Source0:        http://download.forge.objectweb.org/asm/asm-2.1.tar.gz
 Source1:        http://asm.objectweb.org/current/asm-eng.pdf
 # Patch out the Class-path in MANIFEST.MF
 Patch0:         %{name}-noclasspathinmanifest.patch
@@ -104,6 +104,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-2jpp.2
+- Fix Source0 URL, License tag
+
 * Tue Feb 13 2007 Andrew Overholt <overholt at redhat.com> 0:2.1-2jpp.1
 - Fedora-ize Release
 - Remove faq.html and add LICENSE.TXT to %%doc



From fedora-extras-commits at redhat.com  Fri Sep 21 18:44:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 14:44:23 -0400
Subject: rpms/vdradmin-am/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 vdradmin-am.spec, 1.9, 1.10
Message-ID: <200709211844.l8LIiNuZ011946@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11913

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Log Message:
* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-1
- 3.6.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Aug 2007 16:23:07 -0000	1.8
+++ .cvsignore	21 Sep 2007 18:43:51 -0000	1.9
@@ -1 +1 @@
-vdradmin-am-3.6.0rc.tar.bz2
+vdradmin-am-3.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Aug 2007 16:23:08 -0000	1.8
+++ sources	21 Sep 2007 18:43:51 -0000	1.9
@@ -1 +1 @@
-9a8035bbad7be09ac6295c43246cf953  vdradmin-am-3.6.0rc.tar.bz2
+e79e5715779fcd2011f181510fb2b370  vdradmin-am-3.6.0.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdradmin-am.spec	27 Aug 2007 16:23:08 -0000	1.9
+++ vdradmin-am.spec	21 Sep 2007 18:43:51 -0000	1.10
@@ -4,14 +4,14 @@
 
 Name:           vdradmin-am
 Version:        3.6.0
-Release:        0.2.rc%{?dist}
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
-# infobox.js is GPLv2, everything else GPLv2+
-License:        GPLv2+ and GPLv2
+# infobox.js is GPLv2, crystal icons LGPLv2+, everything else GPLv2+
+License:        GPLv2+ and GPLv2 and LGPLv2+
 URL:            http://andreas.vdr-developer.org/en/
-Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}rc.tar.bz2
+Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc
+%setup -q
 %patch0
 %patch1
 %{__perl} -pi -e \
@@ -108,7 +108,8 @@
 
 %files -f vdradmin.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
+%doc COPYING CREDITS FAQ HISTORY INSTALL LGPL.txt README*
+%doc contrib/*example convert.pl
 %doc %{name}-httpd.conf autotimer2searchtimer.pl
 %config(noreplace) %{_sysconfdir}/rwtab.d/%{name}
 %{_initrddir}/vdradmind
@@ -124,6 +125,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-1
+- 3.6.0.
+
 * Mon Aug 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-0.2.rc
 - 3.6.0rc.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:48:41 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 14:48:41 -0400
Subject: rpms/maven2/devel maven2.spec,1.5,1.6
Message-ID: <200709211848.l8LImffK012054@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12024

Modified Files:
	maven2.spec 
Log Message:

- Rebuild without bootstrap




Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven2.spec	7 Sep 2007 20:30:20 -0000	1.5
+++ maven2.spec	21 Sep 2007 18:48:08 -0000	1.6
@@ -34,7 +34,6 @@
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 %define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
-%define _with_bootstrap 1
 %define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
 %define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
 
@@ -49,7 +48,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        10jpp.6%{?dist}
+Release:        10jpp.8%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -2295,6 +2294,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.8
+- Rebuild without bootstrap
+
 * Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
 - Exclude ppc64 build
 - Add patch to build with ant 1.7



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:40 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 14:50:40 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.45, 1.46 NetworkManager.spec,
	1.166, 1.167 sources, 1.64,
	1.65 NetworkManager-0.7.0-missing-includes.patch, 1.5, NONE
Message-ID: <200709211850.l8LIoeGh012219@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12140

Modified Files:
	.cvsignore NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	21 Sep 2007 15:41:14 -0000	1.45
+++ .cvsignore	21 Sep 2007 18:50:07 -0000	1.46
@@ -6,3 +6,4 @@
 nm-applet-0.7.0.svn186.tar.gz
 NetworkManager-0.7.0.svn2844.tar.gz
 nm-applet-0.7.0.svn190.tar.gz
+NetworkManager-0.7.0.svn2849.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- NetworkManager.spec	21 Sep 2007 15:41:14 -0000	1.166
+++ NetworkManager.spec	21 Sep 2007 18:50:07 -0000	1.167
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2844
+%define snapshot svn2849
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -20,7 +20,6 @@
 Source: %{name}-%{version}.%{snapshot}.tar.gz
 Source1: nm-applet-%{version}.svn190.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.7.0-missing-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -31,6 +30,7 @@
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-7
+Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -119,7 +119,6 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .missing-includes
 
 # unpack the applet
 tar -xzf %{SOURCE1}
@@ -259,6 +258,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
+- New snapshot
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	21 Sep 2007 15:41:14 -0000	1.64
+++ sources	21 Sep 2007 18:50:07 -0000	1.65
@@ -1,2 +1,2 @@
-f30eb054387f0a7efb2fdda7ed43c8a9  NetworkManager-0.7.0.svn2844.tar.gz
 bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz
+abba317b083a742b1a36167c16654a3a  NetworkManager-0.7.0.svn2849.tar.gz


--- NetworkManager-0.7.0-missing-includes.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:41 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:50:41 -0400
Subject: rpms/kdebase4/F-7 kdebase4.spec,1.1,1.2
Message-ID: <200709211850.l8LIoffJ012227@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12157/F-7

Modified Files:
	kdebase4.spec 
Log Message:
update description


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/kdebase4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase4.spec	21 Sep 2007 18:15:24 -0000	1.1
+++ kdebase4.spec	21 Sep 2007 18:50:09 -0000	1.2
@@ -80,7 +80,9 @@
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
-Core applications for the K Desktop Environment 4.
+Core runtime requirements and applications for the K Desktop Environment 4.
+This package does not include the KDE 4 versions of applications which are
+provided by KDE 3 because of file and configuration setting conflicts.
 WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
@@ -253,6 +255,7 @@
 %changelog
 * Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - ExcludeArch: ppc64 (#300601)
+- update description
 
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - add missing BR alsa-lib-devel



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:44 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:50:44 -0400
Subject: rpms/kdebase4/devel kdebase4.spec,1.1,1.2
Message-ID: <200709211850.l8LIoibY012262@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12157/devel

Modified Files:
	kdebase4.spec 
Log Message:
update description


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/kdebase4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase4.spec	21 Sep 2007 18:15:27 -0000	1.1
+++ kdebase4.spec	21 Sep 2007 18:50:12 -0000	1.2
@@ -80,7 +80,9 @@
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
-Core applications for the K Desktop Environment 4.
+Core runtime requirements and applications for the K Desktop Environment 4.
+This package does not include the KDE 4 versions of applications which are
+provided by KDE 3 because of file and configuration setting conflicts.
 WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
@@ -253,6 +255,7 @@
 %changelog
 * Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - ExcludeArch: ppc64 (#300601)
+- update description
 
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - add missing BR alsa-lib-devel



From fedora-extras-commits at redhat.com  Fri Sep 21 18:56:57 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:56:57 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec,1.3343,1.3344
Message-ID: <200709211856.l8LIuvW7012541@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12415

Modified Files:
	kernel-2.6.spec 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3343
retrieving revision 1.3344
diff -u -r1.3343 -r1.3344
--- kernel-2.6.spec	20 Sep 2007 22:34:02 -0000	1.3343
+++ kernel-2.6.spec	21 Sep 2007 18:56:24 -0000	1.3344
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Build dcdbas and dell_rbu modules on i586 (#216304)
+
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable tcrypt module for crypto testing.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:57:01 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:57:01 -0400
Subject: rpms/kernel/F-7/configs config-i586,1.25,1.26
Message-ID: <200709211857.l8LIv1Q0012551@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12415/configs

Modified Files:
	config-i586 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-i586,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-i586	23 Jul 2007 15:22:35 -0000	1.25
+++ config-i586	21 Sep 2007 18:56:28 -0000	1.26
@@ -10,8 +10,6 @@
 # CONFIG_X86_MCE_P4THERMAL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_X86_POWERNOW_K7 is not set



From fedora-extras-commits at redhat.com  Fri Sep 21 18:57:32 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 14:57:32 -0400
Subject: rpms/haproxy/F-7 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211857.l8LIvWY4012579@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12545

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:56:59 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 18:56:59 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 18:58:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:58:23 -0400
Subject: rpms/kernel/devel config-i586,1.2,1.3 kernel.spec,1.176,1.177
Message-ID: <200709211858.l8LIwNUF012650@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12592

Modified Files:
	config-i586 kernel.spec 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i586,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i586	23 Jul 2007 15:09:38 -0000	1.2
+++ config-i586	21 Sep 2007 18:57:50 -0000	1.3
@@ -10,8 +10,6 @@
 # CONFIG_X86_MCE_P4THERMAL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_X86_POWERNOW_K7 is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kernel.spec	20 Sep 2007 23:11:30 -0000	1.176
+++ kernel.spec	21 Sep 2007 18:57:50 -0000	1.177
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Build dcdbas and dell_rbu modules on i586 (#216304)
+
 * Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc7-git1
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:58:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 14:58:51 -0400
Subject: rpms/openct/devel openct-0.6.14-nosleep-287871.patch, NONE,
	1.1 openct.spec, 1.28, 1.29
Message-ID: <200709211858.l8LIwpKA012698@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12628

Modified Files:
	openct.spec 
Added Files:
	openct-0.6.14-nosleep-287871.patch 
Log Message:
* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-2
- Drop "sleep 0.1" from udev rule (#287871).


openct-0.6.14-nosleep-287871.patch:

--- NEW FILE openct-0.6.14-nosleep-287871.patch ---
--- etc/openct.udev~	2007-08-23 23:14:15.000000000 +0300
+++ etc/openct.udev	2007-09-21 21:11:39.000000000 +0300
@@ -26,3 +26,4 @@
 # sleep for 100ms - the wait_for_sysfs might not be enough
-PROGRAM="/bin/sleep 0.1"
+# Disabled in this package - see https://bugzilla.redhat.com/287871
+#PROGRAM="/bin/sleep 0.1"
 


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openct.spec	30 Aug 2007 19:30:25 -0000	1.28
+++ openct.spec	21 Sep 2007 18:58:18 -0000	1.29
@@ -4,7 +4,7 @@
 
 Name:           openct
 Version:        0.6.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -13,6 +13,7 @@
 Source0:        http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         %{name}-0.6.14-nosleep-287871.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-2
+- Drop "sleep 0.1" from udev rule (#287871).
+
 * Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-1
 - 0.6.14.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:02:40 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:02:40 -0400
Subject: rpms/haproxy/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709211902.l8LJ2e7S018888@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18855

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:02:08 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:02:08 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:04:20 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:04:20 -0400
Subject: rpms/haproxy/FC-6 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1
Message-ID: <200709211904.l8LJ4KTb018924@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18917

Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging



From fedora-extras-commits at redhat.com  Fri Sep 21 19:06:02 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:06:02 -0400
Subject: rpms/haproxy/EL-4 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211906.l8LJ62F9019026@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18997

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:05:30 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:05:30 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:08:38 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:08:38 -0400
Subject: rpms/haproxy/EL-5 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211908.l8LJ8cHL019129@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:08:06 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:08:06 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:20:57 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 15:20:57 -0400
Subject: rpms/deluge/devel
	deluge-default-prefs-no-release-notifications.patch, 1.1, 1.2
Message-ID: <200709211920.l8LJKv6o020343@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/devel

Modified Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Ugh...this time don't invert the patch. T_T

deluge-default-prefs-no-release-notifications.patch:

Index: deluge-default-prefs-no-release-notifications.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge-default-prefs-no-release-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 04:10:37 -0000	1.1
+++ deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 19:20:25 -0000	1.2
@@ -1,11 +1,11 @@
---- src/pref.py	2007-09-20 19:30:08.000000000 -0700
-+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
+--- src/pref.py.old	2007-09-21 12:18:00.000000000 -0700
++++ src/pref.py	2007-09-21 12:18:09.000000000 -0700
 @@ -118,7 +118,7 @@
      "use_natpmp" : False,
      "use_upnp" : False,
      "use_utpex" : True,
--    "new_releases" : False,
-+    "new_releases" : True,
+-    "new_releases" : True,
++    "new_releases" : False,
      "window_height" : 480,
      "window_maximized" : False,
      "window_pane_position" : -1,



From fedora-extras-commits at redhat.com  Fri Sep 21 19:21:00 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 15:21:00 -0400
Subject: rpms/deluge/F-7 deluge-default-prefs-no-release-notifications.patch,
	1.1, 1.2
Message-ID: <200709211921.l8LJL0PY020356@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/F-7

Modified Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Ugh...this time don't invert the patch. T_T

deluge-default-prefs-no-release-notifications.patch:

Index: deluge-default-prefs-no-release-notifications.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge-default-prefs-no-release-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 04:11:31 -0000	1.1
+++ deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 19:20:27 -0000	1.2
@@ -1,11 +1,11 @@
---- src/pref.py	2007-09-20 19:30:08.000000000 -0700
-+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
+--- src/pref.py.old	2007-09-21 12:18:00.000000000 -0700
++++ src/pref.py	2007-09-21 12:18:09.000000000 -0700
 @@ -118,7 +118,7 @@
      "use_natpmp" : False,
      "use_upnp" : False,
      "use_utpex" : True,
--    "new_releases" : False,
-+    "new_releases" : True,
+-    "new_releases" : True,
++    "new_releases" : False,
      "window_height" : 480,
      "window_maximized" : False,
      "window_pane_position" : -1,



From fedora-extras-commits at redhat.com  Fri Sep 21 19:23:30 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:23:30 -0400
Subject: rpms/haproxy/EL-5 haproxy.spec,1.1,1.2
Message-ID: <200709211923.l8LJNUvg021004@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20859

Modified Files:
	haproxy.spec 
Log Message:
added pcre dependency


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy.spec	21 Sep 2007 19:08:06 -0000	1.1
+++ haproxy.spec	21 Sep 2007 19:22:57 -0000	1.2
@@ -20,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
-
+Requires:           pcre
 Requires(pre):      %{_sbindir}/useradd
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig, /sbin/service
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
+- added pcre as Requires dependency
+
 * Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
 - update License field
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:24:51 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:24:51 -0400
Subject: rpms/haproxy/EL-5 haproxy.spec,1.2,1.3
Message-ID: <200709211924.l8LJOpdD021339@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21204

Modified Files:
	haproxy.spec 
Log Message:
bump release


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haproxy.spec	21 Sep 2007 19:22:57 -0000	1.2
+++ haproxy.spec	21 Sep 2007 19:24:19 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Fri Sep 21 19:27:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 15:27:40 -0400
Subject: rpms/sdljava/F-7 sdljava-0.9.1-regen.patch, 1.1, 1.2 sdljava.spec,
	1.1, 1.2
Message-ID: <200709211927.l8LJRe6s022044@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22006

Modified Files:
	sdljava-0.9.1-regen.patch sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8


sdljava-0.9.1-regen.patch:

Index: sdljava-0.9.1-regen.patch
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava-0.9.1-regen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava-0.9.1-regen.patch	21 Sep 2007 17:48:32 -0000	1.1
+++ sdljava-0.9.1-regen.patch	21 Sep 2007 19:27:37 -0000	1.2
@@ -44,34 +44,34 @@
 -#SDLVideo_wrap.c: SDLVideo.i common.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 +SDLAudio_wrap.c: SDLAudio.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
 +
 +SDLCdrom_wrap.c: SDLCdrom.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
 +
 +SDLEvent_wrap.c: SDLEvent.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
 +
 +SDLGFX_wrap.c: SDLGFX.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
 +
 +SDLImage_wrap.c: SDLImage.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
 +
 +SDLJoystick_wrap.c: SDLJoystick.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
 +
 +SDLMain_wrap.c: SDLMain.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
 +
 +SDLMixer_wrap.c: SDLMixer.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
 +
 +SDLTTF_wrap.c: SDLTTF.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
 +
 +SDLVideo_wrap.c: SDLVideo.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -100,7 +100,7 @@
 -#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 +glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -124,7 +124,7 @@
 -#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 -#	./post-process.rb
 +FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
++	$(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 +	./post-process.rb
  
  %.o: %.cxx


Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava.spec	21 Sep 2007 17:48:32 -0000	1.1
+++ sdljava.spec	21 Sep 2007 19:27:37 -0000	1.2
@@ -88,6 +88,15 @@
 
 
 %build
+# ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64]
+# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h
+%ifarch ppc
+export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__"
+%endif
+%ifarch ppc64
+export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__"
+%endif
+
 pushd src/sdljava/native
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"



From fedora-extras-commits at redhat.com  Fri Sep 21 19:29:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 15:29:01 -0400
Subject: upgradecheck upgradecheck.py,1.40,1.41 upgradecheckspam.py,1.7,1.8
Message-ID: <200709211929.l8LJT1N1022408@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22369

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Exit early with error if we do not have > 1 dists enabled


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- upgradecheck.py	16 Sep 2007 08:50:19 -0000	1.40
+++ upgradecheck.py	21 Sep 2007 19:28:58 -0000	1.41
@@ -168,6 +168,11 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    if not len(enabled_dists) > 1:
+        print 'Need > 1 dists enabled to proceed (have %d), exiting' \
+              % len(enabled_dists)
+        sys.exit(51)
+
     repoids = []
     for dist in enabled_dists:
         repoids.extend(solvers[dist].enabledRepoIds())


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upgradecheckspam.py	16 Sep 2007 08:50:19 -0000	1.7
+++ upgradecheckspam.py	21 Sep 2007 19:28:58 -0000	1.8
@@ -168,6 +168,11 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    if not len(enabled_dists) > 1:
+        print 'Need > 1 dists enabled to proceed (have %d), exiting' \
+              % len(enabled_dists)
+        sys.exit(51)
+
     repoids = []
     for dist in enabled_dists:
         repoids.extend(solvers[dist].enabledRepoIds())



From fedora-extras-commits at redhat.com  Fri Sep 21 19:30:56 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:30:56 -0400
Subject: rpms/haproxy/EL-4 haproxy.spec,1.1,1.2
Message-ID: <200709211930.l8LJUui4022885@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22727

Modified Files:
	haproxy.spec 
Log Message:
added pcre dependency


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy.spec	21 Sep 2007 19:05:30 -0000	1.1
+++ haproxy.spec	21 Sep 2007 19:30:24 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -20,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
-
+Requires:           pcre
 Requires(pre):      %{_sbindir}/useradd
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig, /sbin/service
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
+- added pcre as Requires dependency
+
 * Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
 - update License field
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:39:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 21 Sep 2007 15:39:40 -0400
Subject: rpms/mash/devel .cvsignore, 1.18, 1.19 mash.spec, 1.16, 1.17 sources,
	1.19, 1.20
Message-ID: <200709211939.l8LJdeDo025198@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25054

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Sep 2007 19:07:55 -0000	1.18
+++ .cvsignore	21 Sep 2007 19:39:08 -0000	1.19
@@ -1 +1 @@
-mash-0.2.6.tar.gz
+mash-0.2.7.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mash.spec	20 Sep 2007 19:07:55 -0000	1.16
+++ mash.spec	21 Sep 2007 19:39:08 -0000	1.17
@@ -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.2.6
+Version:        0.2.7
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Fri Sep 21 2007 Bill Nottingham <notting at redhat.com> 0.2.7-1
+- disable repoview for now
+
 * Thu Sep 20 2007 Bill Nottingham <notting at redhat.com> 0.2.6-1
 - repoview cleanups/fixes
 - fix gtkimmodules typo (#295371, <petersen at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Sep 2007 19:07:55 -0000	1.19
+++ sources	21 Sep 2007 19:39:08 -0000	1.20
@@ -1 +1 @@
-c0075b3988f9ae4527bd01bff19fdb60  mash-0.2.6.tar.gz
+7b8640077626921acb95603f9a6a5f68  mash-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:46:39 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:46:39 -0400
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.4,1.5
Message-ID: <200709211946.l8LJkdWt026154@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-ant-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26133

Modified Files:
	plexus-ant-factory.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plexus-ant-factory.spec	10 Sep 2007 19:50:14 -0000	1.4
+++ plexus-ant-factory.spec	21 Sep 2007 19:46:07 -0000	1.5
@@ -41,7 +41,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a1.2jpp.4%{?dist}
+Release:        0.1.a1.2jpp.5%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 License:        MIT-Style
@@ -58,6 +58,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -209,6 +211,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.5
+- ExcludeArch ppc64
+
 * Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.4
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:49:30 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:49:30 -0400
Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.4,1.5
Message-ID: <200709211949.l8LJnU53026247@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-bsh-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26222

Modified Files:
	plexus-bsh-factory.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-bsh-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plexus-bsh-factory.spec	10 Sep 2007 19:58:30 -0000	1.4
+++ plexus-bsh-factory.spec	21 Sep 2007 19:48:58 -0000	1.5
@@ -39,7 +39,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a7s.2jpp.4%{?dist}
+Release:        0.1.a7s.2jpp.5%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT-Style
@@ -57,6 +57,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:     jpackage-utils >= 0:1.7.2
@@ -208,6 +210,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.5
+- ExcludeArch ppc64
+
 * Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.4
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:52:11 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:52:11 -0400
Subject: rpms/plexus-appserver/devel plexus-appserver.spec,1.2,1.3
Message-ID: <200709211952.l8LJqBrt026383@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-appserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26359

Modified Files:
	plexus-appserver.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-appserver.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-appserver/devel/plexus-appserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus-appserver.spec	20 Mar 2007 06:10:21 -0000	1.2
+++ plexus-appserver.spec	21 Sep 2007 19:51:39 -0000	1.3
@@ -42,7 +42,7 @@
 
 Name:           plexus-appserver
 Version:        1.0
-Release:        0.1.a5.3jpp.2%{?dist}
+Release:        0.1.a5.3jpp.3%{?dist}
 Epoch:          0
 Summary:        Plexus Application Server
 License:        Apache Software License
@@ -57,7 +57,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if %{with_maven}
@@ -196,6 +199,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a5.3jpp.3 
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a5.3jpp.2
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:55:24 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:55:24 -0400
Subject: rpms/plexus-cdc/devel plexus-cdc.spec,1.3,1.4
Message-ID: <200709211955.l8LJtO0k026552@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-cdc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532

Modified Files:
	plexus-cdc.spec 
Log Message:

- ExcludeArch ppc64





Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-cdc.spec	20 Mar 2007 06:14:23 -0000	1.3
+++ plexus-cdc.spec	21 Sep 2007 19:54:51 -0000	1.4
@@ -42,7 +42,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a4.2jpp.2%{?dist}
+Release:        0.1.a4.2jpp.3%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        Apache Software License
@@ -57,7 +57,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:	maven2 >= 2.0.4-9
 BuildRequires:	maven2-plugin-compiler
@@ -189,6 +192,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.3
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.2
 - Enable gcj
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:58:19 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:58:19 -0400
Subject: rpms/haproxy/EL-4 haproxy.spec,1.2,1.3
Message-ID: <200709211958.l8LJwJaX028884@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847

Modified Files:
	haproxy.spec 
Log Message:
update build flags for pcre.h


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haproxy.spec	21 Sep 2007 19:30:24 -0000	1.2
+++ haproxy.spec	21 Sep 2007 19:57:47 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -44,8 +44,8 @@
 
 %build
 # No configure script is present, it is all done via make flags
-# FC 7 is linux 2.6 so using linux26 as target.
-make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"
+# pcre on EL-4 is in /usr/include/pcre not /usr/include
+make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags} -I/usr/include/pcre"
 
 
 %install
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-4
+* update compile flags for different location of pcre.h on EL-4
+
 * Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
 - added pcre as Requires dependency
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:59:24 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:59:24 -0400
Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.1,1.2
Message-ID: <200709211959.l8LJxORf028967@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-maven-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28939

Modified Files:
	plexus-maven-plugin.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-maven-plugin.spec	20 Mar 2007 03:59:53 -0000	1.1
+++ plexus-maven-plugin.spec	21 Sep 2007 19:58:51 -0000	1.2
@@ -38,7 +38,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
@@ -55,6 +55,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -181,6 +183,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2-2jpp.2
+- ExcludeArch ppc64
+
 * Fri Feb 23 2007 Tania Bento <tbento at redhat.com> 0:1.2-2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 20:01:40 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:01:40 -0400
Subject: rpms/plexus-runtime-builder/devel plexus-runtime-builder.spec, 1.1, 
	1.2
Message-ID: <200709212001.l8LK1eeG002660@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-runtime-builder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829

Modified Files:
	plexus-runtime-builder.spec 
Log Message:

 - ExcludeArch ppc64




Index: plexus-runtime-builder.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-runtime-builder/devel/plexus-runtime-builder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-runtime-builder.spec	20 Mar 2007 03:58:02 -0000	1.1
+++ plexus-runtime-builder.spec	21 Sep 2007 20:01:08 -0000	1.2
@@ -38,7 +38,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a9.2jpp.1%{?dist}
+Release:        0.1.a9.2jpp.2%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT-Style
@@ -53,7 +53,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  jakarta-commons-codec
 BuildRequires:  jakarta-commons-httpclient
@@ -200,6 +203,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a9.2jpp.2
+- ExcludeArch ppc64
+
 * Thu Feb 22 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a9.2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 20:08:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:08:04 -0400
Subject: rpms/plexus-xmlrpc/devel plexus-xmlrpc.spec,1.5,1.6
Message-ID: <200709212008.l8LK845X002870@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-xmlrpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2847

Modified Files:
	plexus-xmlrpc.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-xmlrpc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plexus-xmlrpc.spec	20 Mar 2007 13:38:52 -0000	1.5
+++ plexus-xmlrpc.spec	21 Sep 2007 20:07:31 -0000	1.6
@@ -42,7 +42,7 @@
 
 Name:           plexus-xmlrpc
 Version:        1.0
-Release:        0.1.b4.3jpp.5%{?dist}
+Release:        0.1.b4.3jpp.6%{?dist}
 Epoch:          0
 Summary:        Plexus XML RPC Component
 License:        Apache Software License
@@ -59,6 +59,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -207,6 +209,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.b4.3jpp.6
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.b4.3jpp.5
 - Fixed BRs
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:11:22 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:11:22 -0400
Subject: rpms/java-1.7.0-icedtea/devel mauve_tests, NONE, 1.1 .cvsignore, 1.3,
	1.4 java-1.7.0-icedtea.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709212011.l8LKBM3r003010@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2980

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Added Files:
	mauve_tests 
Log Message:
* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Added Mauve tarball as source.
- Added mauve_tests as source.
- Run Mauve after build for regression testing.




--- NEW FILE mauve_tests ---
java.awt.AWTEvent.constants
java.awt.AWTKeyStroke.equals
java.awt.AWTKeyStroke.getAWTKeyStroke
java.awt.AWTKeyStroke.serialization
java.awt.AlphaComposite.equals
java.awt.AlphaComposite.getInstance
java.awt.AlphaComposite.getInstance14
java.awt.AlphaComposite.getRule
java.awt.BasicStroke.constants
java.awt.BasicStroke.constructors
java.awt.BasicStroke.equals
java.awt.BasicStroke.hashCode
java.awt.BorderLayout.Test15
java.awt.BorderLayout.addLayoutComponent
java.awt.BorderLayout.constants
java.awt.BorderLayout.constructors
java.awt.BorderLayout.getHgap
java.awt.BorderLayout.getLayoutAlignmentX
java.awt.BorderLayout.getLayoutAlignmentY
java.awt.BorderLayout.getVgap
java.awt.BorderLayout.layoutContainer
java.awt.BorderLayout.maxLayoutSize
java.awt.BorderLayout.preferredLayoutSize
java.awt.BorderLayout.setHgap
java.awt.BorderLayout.setVgap
java.awt.ColorClass.constants
java.awt.ColorClass.constructors
java.awt.ColorClass.decode
java.awt.ColorClass.equals
java.awt.ColorClass.getBlue
java.awt.ColorClass.getGreen
java.awt.ColorClass.getRed
java.awt.ColorClass.hashCode
java.awt.ColorClass.serialization
java.awt.ColorClass.brighter
java.awt.Dimension.clone
java.awt.Dimension.constructors
java.awt.Dimension.equals
java.awt.Dimension.getSize
java.awt.Dimension.setSize
java.awt.EventClass.constants
java.awt.FontClass.serialization
java.awt.GradientPaint.constructors
java.awt.GradientPaint.equals
java.awt.GradientPaint.getColor1
java.awt.GradientPaint.getColor2
java.awt.GradientPaint.getPoint1
java.awt.GradientPaint.getPoint2
java.awt.GradientPaint.getTransparency
java.awt.GradientPaint.isCyclic
java.awt.Graphics.clearRect
java.awt.Point.clone
java.awt.Point.constructors
java.awt.Point.equals
java.awt.Point.getLocation
java.awt.Point.move
java.awt.Point.setLocation
java.awt.Point.translate
java.awt.Polygon.contains
java.awt.Polygon.getPathIterator
java.awt.Rectangle.add
java.awt.Rectangle.clone
java.awt.Rectangle.contains
java.awt.Rectangle.equals
java.awt.Rectangle.grow
java.awt.Rectangle.intersection
java.awt.Rectangle.intersects
java.awt.Rectangle.isEmpty
java.awt.Rectangle.outcode
java.awt.Rectangle.setBounds
java.awt.Rectangle.setLocation
java.awt.Rectangle.setRect
java.awt.Rectangle.setSize
java.awt.Rectangle.translate
java.awt.Rectangle.union
java.awt.Rectangle.constructors
java.awt.RenderingHints.Key.isCompatibleValue
java.awt.RenderingHints.add
java.awt.RenderingHints.clear
java.awt.RenderingHints.clone
java.awt.RenderingHints.containsValue
java.awt.RenderingHints.entrySet
java.awt.RenderingHints.equals
java.awt.RenderingHints.get
java.awt.RenderingHints.isEmpty
java.awt.RenderingHints.keySet
java.awt.RenderingHints.put
java.awt.RenderingHints.putAll
java.awt.RenderingHints.remove
java.awt.RenderingHints.size
java.awt.RenderingHints.values
java.awt.color.ColorSpace.getInstance
java.awt.color.ColorSpace.isCS_sRGB
java.awt.datatransfer.DataFlavor.writeExternal
java.awt.datatransfer.StringSelection.selection
java.awt.font.ImageGraphicAttribute.ImageGraphicAttributeTest
java.awt.font.ShapeGraphicAttribute.ShapeGraphicAttributeTest
java.awt.font.TextAttribute.constants
java.awt.font.TextAttribute.constants13
java.awt.font.TextAttribute.serialization
java.awt.font.TextAttribute.toString
java.awt.font.TextAttribute.toString13
java.awt.font.TransformAttribute.getTransform
java.awt.font.TransformAttribute.isIdentity
java.awt.font.TransformAttribute.serialization
java.awt.font.TextHitInfo.afterOffset
java.awt.font.TextHitInfo.beforeOffset
java.awt.font.TextHitInfo.equals
java.awt.font.TextHitInfo.getCharIndex
java.awt.font.TextHitInfo.getInsertionIndex
java.awt.font.TextHitInfo.getOffsetHit
java.awt.font.TextHitInfo.getOtherHit
java.awt.font.TextHitInfo.hashCode
java.awt.font.TextHitInfo.isLeadingEdge
java.awt.font.TextHitInfo.leading
java.awt.font.TextHitInfo.toString
java.awt.font.TextHitInfo.trailing
java.awt.geom.AffineTransform.clone
java.awt.geom.AffineTransform.concatenate
java.awt.geom.AffineTransform.constants
java.awt.geom.AffineTransform.constructors
java.awt.geom.AffineTransform.createInverse
java.awt.geom.AffineTransform.deltaTransform
java.awt.geom.AffineTransform.equals
java.awt.geom.AffineTransform.getDeterminant
java.awt.geom.AffineTransform.getMatrix
java.awt.geom.AffineTransform.getRotateInstance
java.awt.geom.AffineTransform.getScaleInstance
java.awt.geom.AffineTransform.getShearInstance
java.awt.geom.AffineTransform.getTranslateInstance
java.awt.geom.AffineTransform.inverseTransform
java.awt.geom.AffineTransform.isIdentity
java.awt.geom.AffineTransform.preConcatenate
java.awt.geom.AffineTransform.setTransform
java.awt.geom.AffineTransform.transform
java.awt.geom.Arc2D.Double.clone
java.awt.geom.Arc2D.Float.clone
java.awt.geom.Arc2D.constants
java.awt.geom.Arc2D.constructors
java.awt.geom.Arc2D.contains
java.awt.geom.Arc2D.containsAngle
java.awt.geom.Arc2D.getBounds2D
java.awt.geom.Arc2D.getEndPoint
java.awt.geom.Arc2D.getPathIterator
java.awt.geom.Arc2D.getStartPoint
java.awt.geom.Arc2D.intersects
java.awt.geom.Arc2D.isEmpty
java.awt.geom.Arc2D.setAngleExtent
java.awt.geom.Arc2D.setAngleStart
java.awt.geom.Arc2D.setAngles
java.awt.geom.Arc2D.setArc
java.awt.geom.Arc2D.setArcByCenter
java.awt.geom.Arc2D.setArcByTangent
java.awt.geom.Arc2D.setArcType
java.awt.geom.Arc2D.setFrame
java.awt.geom.Area.add
java.awt.geom.Area.clone
java.awt.geom.Area.constructors
java.awt.geom.Area.contains
java.awt.geom.Area.createTransformedArea
java.awt.geom.Area.equals
java.awt.geom.Area.exclusiveOr
java.awt.geom.Area.getBounds
java.awt.geom.Area.getBounds2D
java.awt.geom.Area.intersect
java.awt.geom.Area.intersects
java.awt.geom.Area.isEmpty
java.awt.geom.Area.isPolygonal
java.awt.geom.Area.isRectangular
java.awt.geom.Area.isSingular
java.awt.geom.Area.reset
java.awt.geom.Area.subtract
java.awt.geom.Area.transform
java.awt.geom.CubicCurve2D.Double.Double
java.awt.geom.CubicCurve2D.Double.getBounds2D
java.awt.geom.CubicCurve2D.Double.getCtrlP1
java.awt.geom.CubicCurve2D.Double.getCtrlP2
java.awt.geom.CubicCurve2D.Double.getP1
java.awt.geom.CubicCurve2D.Double.getP2
java.awt.geom.CubicCurve2D.Double.setCurve
java.awt.geom.CubicCurve2D.Float.Float
java.awt.geom.CubicCurve2D.Float.getBounds2D
java.awt.geom.CubicCurve2D.Float.getCtrlP1
java.awt.geom.CubicCurve2D.Float.getCtrlP2
java.awt.geom.CubicCurve2D.Float.getP1
java.awt.geom.CubicCurve2D.Float.getP2
java.awt.geom.CubicCurve2D.Float.setCurve
java.awt.geom.CubicCurve2D.clone
java.awt.geom.CubicCurve2D.getFlatness
java.awt.geom.CubicCurve2D.getFlatnessSq
java.awt.geom.CubicCurve2D.getPathIterator
java.awt.geom.CubicCurve2D.setCurve
java.awt.geom.CubicCurve2D.subdivide
java.awt.geom.Ellipse2D.Double.clone
java.awt.geom.Ellipse2D.Double.constructors
java.awt.geom.Ellipse2D.Double.getBounds2D
java.awt.geom.Ellipse2D.Double.getHeight
java.awt.geom.Ellipse2D.Double.getWidth
java.awt.geom.Ellipse2D.Double.getX
[...2247 lines suppressed...]
javax.swing.text.StyleConstants.setSpaceAbove
javax.swing.text.StyleConstants.setSpaceBelow
javax.swing.text.StyleConstants.setStrikeThrough
javax.swing.text.StyleConstants.setSubscript
javax.swing.text.StyleConstants.setSuperscript
javax.swing.text.StyleConstants.setTabSet
javax.swing.text.StyleConstants.setUnderline
javax.swing.text.StyleContext.NamedStyleInit
javax.swing.text.StyleContext.NamedStyleSetResolveParent
javax.swing.text.StyleContext.addAttribute
javax.swing.text.StyleContext.addStyle
javax.swing.text.StyledEditorKit.createInputAttributesTest
javax.swing.text.TextAction.augmentList
javax.swing.text.Utilities.getNextWord
javax.swing.text.Utilities.getPreviousWord
javax.swing.text.Utilities.getTabbedTextOffset
javax.swing.text.Utilities.getWordStart
javax.swing.text.Utilities.getBreakLocation
javax.swing.text.View.getAlignment
javax.swing.text.View.getMaximumSpan
javax.swing.text.View.getMinimumSpan
javax.swing.text.View.getResizeWeight
javax.swing.text.html.CSS.Attribute
javax.swing.text.html.HTML.ElementTagAttributeTest
javax.swing.text.html.HTML.HTML_Test
javax.swing.text.html.parser.AttributeList.AttributeList_test
javax.swing.text.html.parser.DTD.DTD_test
javax.swing.text.html.parser.Element.Element_Test
javax.swing.text.html.parser.Entity.Entity_Test
javax.swing.text.html.parser.ParserDelegator.Text
javax.swing.text.html.parser.ParserDelegator.eolnNorification
javax.swing.text.html.parser.ParserDelegator.randomTables
javax.swing.text.html.parser.ParserDelegator.tokenLocations
javax.swing.text.html.parser.ParserDelegator.Entities
javax.swing.text.html.parser.ParserDelegator.SimpleParsing
javax.swing.text.html.parser.ParserDelegator.Text3
javax.swing.text.html.parser.ParserDelegator.Text4
javax.swing.text.html.parser.TagElement.TagElement_Test
javax.swing.text.html.HTMLDocument.FindById
javax.swing.text.TabSet.constructor
javax.swing.text.TabSet.equals
javax.swing.text.TabSet.getTab
javax.swing.text.TabSet.getTabCount
javax.swing.text.TabSet.getTabIndex
javax.swing.text.TabSet.getTabIndexAfter
javax.swing.text.TabSet.toString
javax.swing.text.TabStop.constructors
javax.swing.text.TabStop.toString
javax.swing.text.ZoneView.constructor
javax.swing.text.ZoneView.createZone
javax.swing.text.ZoneView.getMaximumZoneSize
javax.swing.text.ZoneView.isZoneLoaded
javax.swing.text.ZoneView.loadChildren
javax.swing.text.ZoneView.setMaxZonesLoaded
javax.swing.text.ZoneView.setMaximumZoneSize
javax.swing.text.ZoneView.unloadZone
javax.swing.text.ZoneView.zoneWasLoaded
javax.swing.tree.DefaultMutableTreeNode.DefaultMutableTreeNodeTest
javax.swing.tree.DefaultMutableTreeNode.add
javax.swing.tree.DefaultMutableTreeNode.breadthFirstEnumeration
javax.swing.tree.DefaultMutableTreeNode.children
javax.swing.tree.DefaultMutableTreeNode.clone
javax.swing.tree.DefaultMutableTreeNode.constructors
javax.swing.tree.DefaultMutableTreeNode.getAllowsChildren
javax.swing.tree.DefaultMutableTreeNode.getChildAfter
javax.swing.tree.DefaultMutableTreeNode.getChildAt
javax.swing.tree.DefaultMutableTreeNode.getChildBefore
javax.swing.tree.DefaultMutableTreeNode.getChildCount
javax.swing.tree.DefaultMutableTreeNode.getFirstChild
javax.swing.tree.DefaultMutableTreeNode.getFirstLeaf
javax.swing.tree.DefaultMutableTreeNode.getIndex
javax.swing.tree.DefaultMutableTreeNode.getLastChild
javax.swing.tree.DefaultMutableTreeNode.getLastLeaf
javax.swing.tree.DefaultMutableTreeNode.getNextLeaf
javax.swing.tree.DefaultMutableTreeNode.getNextPreviousNode
javax.swing.tree.DefaultMutableTreeNode.getNextSibling
javax.swing.tree.DefaultMutableTreeNode.getParent
javax.swing.tree.DefaultMutableTreeNode.getPath
javax.swing.tree.DefaultMutableTreeNode.getPreviousLeaf
javax.swing.tree.DefaultMutableTreeNode.getPreviousSibling
javax.swing.tree.DefaultMutableTreeNode.getSiblingCount
javax.swing.tree.DefaultMutableTreeNode.insert
javax.swing.tree.DefaultMutableTreeNode.isLeaf
javax.swing.tree.DefaultMutableTreeNode.isNodeAncestor
javax.swing.tree.DefaultMutableTreeNode.isNodeChild
javax.swing.tree.DefaultMutableTreeNode.isNodeDescendant
javax.swing.tree.DefaultMutableTreeNode.isNodeRelated
javax.swing.tree.DefaultMutableTreeNode.isNodeSibling
javax.swing.tree.DefaultMutableTreeNode.pathFromAncestorEnumeration
javax.swing.tree.DefaultMutableTreeNode.remove
javax.swing.tree.DefaultMutableTreeNode.removeAllChildren
javax.swing.tree.DefaultMutableTreeNode.setAllowsChildren
javax.swing.tree.DefaultTreeCellRenderer.constructor
javax.swing.tree.DefaultTreeCellRenderer.getBackgroundNonSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getBackgroundSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getBorderSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultOpenIcon
javax.swing.tree.DefaultTreeCellRenderer.getLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.getOpenIcon
javax.swing.tree.DefaultTreeCellRenderer.setBackgroundNonSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setBackgroundSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setBorderSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.setLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.setOpenIcon
javax.swing.tree.TreePath.PR27651
javax.swing.tree.TreePath.constructors
javax.swing.tree.TreePath.equals
javax.swing.tree.TreePath.getLastPathComponent
javax.swing.tree.TreePath.getParentPath
javax.swing.tree.TreePath.getPath
javax.swing.tree.TreePath.getPathComponent
javax.swing.tree.TreePath.getPathCount
javax.swing.tree.TreePath.isDescendant
javax.swing.tree.TreePath.pathByAddingChild
javax.swing.tree.TreePath.serialization
javax.swing.tree.VariableHeightLayoutCache.getBounds
javax.swing.undo.AbstractUndoableEdit.addEdit
javax.swing.undo.AbstractUndoableEdit.canRedo
javax.swing.undo.AbstractUndoableEdit.canUndo
javax.swing.undo.AbstractUndoableEdit.getPresentationName
javax.swing.undo.AbstractUndoableEdit.getRedoPresentationName
javax.swing.undo.AbstractUndoableEdit.getUndoPresentationName
javax.swing.undo.AbstractUndoableEdit.isSignificant
javax.swing.undo.AbstractUndoableEdit.redo
javax.swing.undo.AbstractUndoableEdit.replaceEdit
javax.swing.undo.AbstractUndoableEdit.undo
javax.swing.undo.CompoundEdit.addEdit
javax.swing.undo.CompoundEdit.canRedo
javax.swing.undo.CompoundEdit.canUndo
javax.swing.undo.CompoundEdit.isInProgress
javax.swing.undo.CompoundEdit.lastEdit
javax.swing.undo.StateEdit.getPresentationName
javax.swing.undo.StateEdit.undo
javax.swing.undo.UndoManager.addEdit
javax.swing.undo.UndoManager.canRedo
javax.swing.undo.UndoManager.canUndo
javax.swing.undo.UndoManager.canUndoOrRedo
javax.swing.undo.UndoManager.discardAllEdits
javax.swing.undo.UndoManager.editToBeRedone
javax.swing.undo.UndoManager.editToBeUndone
javax.swing.undo.UndoManager.end
javax.swing.undo.UndoManager.getLimit
javax.swing.undo.UndoManager.getRedoPresentationName
javax.swing.undo.UndoManager.getUndoOrRedoPresentationName
javax.swing.undo.UndoManager.getUndoPresentationName
javax.swing.undo.UndoManager.redoTo
javax.swing.undo.UndoManager.setLimit
javax.swing.undo.UndoManager.toString
javax.swing.undo.UndoManager.trimEdits
javax.swing.undo.UndoManager.undoTo
javax.swing.undo.UndoManager.undoableEditHappened
javax.swing.undo.UndoableEditSupport.UndoableEditSupport
javax.swing.undo.UndoableEditSupport.beginUpdate
javax.swing.undo.UndoableEditSupport.createCompoundEdit
javax.swing.undo.UndoableEditSupport.getUndoableEditListeners
javax.swing.undo.UndoableEditSupport.getUpdateLevel
javax.swing.undo.UndoableEditSupport.toString
javax.swing.ButtonGroup.add
javax.swing.ButtonGroup.constructor
javax.swing.ButtonGroup.getButtonCount
javax.swing.ButtonGroup.getElements
javax.swing.ButtonGroup.getSelection
javax.swing.ButtonGroup.isSelected
javax.swing.ButtonGroup.remove
javax.swing.ButtonGroup.setSelected
javax.swing.ToolTipManager.setDismissDelay
javax.swing.ToolTipManager.setInitialDelay
javax.swing.ToolTipManager.setReshowDelay
javax.xml.parsers.DocumentBuilder.PR27864
javax.xml.parsers.DocumentBuilder.parseSimpleXML
javax.xml.xpath.XPath
javax.net.ssl.SSLContext.TestDefaultInit
javax.net.ssl.SSLContext.TestGetInstance
javax.management.MBeanServerPermission.Constructor
javax.management.ObjectName.Parsing
javax.management.ObjectName.ParsingJDK6
javax.management.ObjectName.apply
javax.management.ObjectName.applyJDK6
javax.management.openmbean.ArrayType.Constructor1
javax.management.openmbean.ArrayType.Constructor2
javax.management.openmbean.ArrayType.Equals
javax.management.openmbean.ArrayType.GetArrayType
javax.management.openmbean.ArrayType.GetPrimitiveArrayType
javax.management.openmbean.ArrayType.HashCode
javax.management.openmbean.ArrayType.IsPrimitiveArray
javax.management.openmbean.ArrayType.IsValue
javax.management.openmbean.CompositeDataInvocationHandler.Test
org.omg.CORBA.Any.testAny
org.omg.CORBA.ORB.DirectTest
org.omg.CORBA.ORB.RequestTest
org.omg.CORBA.ServiceInformationHelper.basicHelperOperations
org.omg.CORBA.TypeCode.orbTypecodes
org.omg.CORBA.portable.InputStream.cdrIO
org.omg.CORBA_2_3.ORB.ValueTypeTest
org.omg.IOP.IOR.Streams
org.w3c.dom.childNodesLength


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2007 20:06:27 -0000	1.3
+++ .cvsignore	21 Sep 2007 20:10:50 -0000	1.4
@@ -1,3 +1,4 @@
 icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
+mauve_tests


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-1.7.0-icedtea.spec	7 Sep 2007 20:06:27 -0000	1.4
+++ java-1.7.0-icedtea.spec	21 Sep 2007 20:10:50 -0000	1.5
@@ -21,6 +21,8 @@
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
 
+%define mauvedate 2007-09-12
+
 %ifarch x86_64
 %define archbuild amd64
 %define archinstall amd64
@@ -109,6 +111,8 @@
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  README.plugin
+Source6:  mauve-%{mauvedate}.tar.gz
+Source7:  mauve_tests
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -259,6 +263,7 @@
 
 %prep
 %setup -q -n icedtea-%{icedteaver}
+%setup -q -n icedtea-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -285,6 +290,15 @@
   cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
   cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
 popd
+# Running Mauve to check for regressions
+pushd mauve-%{mauvedate}
+  ./configure 
+  make
+  echo ====================TESTING========================
+  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+	 -showpasses -debug -timeout 30000 2>&1
+  echo ====================TESTING END====================
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -714,6 +728,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Added Mauve tarball as source.
+- Added mauve_tests as source.
+- Run Mauve after build for regression testing.
+
 * Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Do not require openssl for build.
 - Require openssl.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2007 20:06:27 -0000	1.3
+++ sources	21 Sep 2007 20:10:50 -0000	1.4
@@ -1,3 +1,4 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
+68932798db6c0e167a2d54738b6dfb68  mauve_tests



From fedora-extras-commits at redhat.com  Fri Sep 21 20:13:32 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:13:32 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709212013.l8LKDWHh003100@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3042

Modified Files:
	.cvsignore sources 
Log Message:
Added mauve source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2007 20:10:50 -0000	1.4
+++ .cvsignore	21 Sep 2007 20:13:00 -0000	1.5
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve_tests
+mauve-2007-09-12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2007 20:10:50 -0000	1.4
+++ sources	21 Sep 2007 20:13:00 -0000	1.5
@@ -2,3 +2,4 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
+abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 20:15:19 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 16:15:19 -0400
Subject: rpms/smolt/devel firstboot.patch,NONE,1.1 smolt.spec,1.28,1.29
Message-ID: <200709212015.l8LKFJSM003231@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3206

Modified Files:
	smolt.spec 
Added Files:
	firstboot.patch 
Log Message:
Firstboot fixes

firstboot.patch:

--- NEW FILE firstboot.patch ---
--- client/smoltFirstBoot.py.orig	2007-09-21 14:16:52.000000000 -0500
+++ client/smoltFirstBoot.py	2007-09-21 14:30:25.000000000 -0500
@@ -14,10 +14,17 @@
 ## I18N
 ## 
 import gettext
-gettext.bindtextdomain ("firstboot", "/usr/share/locale")
-gettext.textdomain ("firstboot")
-_=gettext.gettext
+import locale
+locale.setlocale(locale.LC_ALL, '')
+if os.path.isdir('po'):
+    t = gettext.translation('smolt', 'po', fallback = True)
+else:
+    t = gettext.translation('smolt', '/usr/share/locale', fallback = True)
+#gettext.bindtextdomain ("smolt", "/usr/share/locale")
+#gettext.textdomain ("smolt")
+#_=gettext.gettext
 
+_ = t.gettext
 class childWindow:
     #You must specify a runPriority for the order in which you wish your module to run
     runPriority = 107


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- smolt.spec	15 Aug 2007 02:30:57 -0000	1.28
+++ smolt.spec	21 Sep 2007 20:14:47 -0000	1.29
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -10,6 +10,7 @@
 # This will get fixed as soon as hosted can create attachments directly
 
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
+Patch0: firstboot.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 cd client/
@@ -177,6 +179,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+- Fixed firstboot issues
+
 * Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4
 - Rebuild to clean up 'config.py' compilations
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:15:57 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:15:57 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.5,1.6
Message-ID: <200709212015.l8LKFvxr003288@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230

Modified Files:
	.cvsignore 
Log Message:
Updated .cvsignore to not ignore mauve_tests. This source has been committed 
to the repo, and if it is modified it should be recommitted and uploaded.





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2007 20:13:00 -0000	1.5
+++ .cvsignore	21 Sep 2007 20:15:25 -0000	1.6
@@ -1,5 +1,4 @@
 icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
-mauve_tests
 mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 20:18:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 16:18:31 -0400
Subject: rpms/sdljava/F-7 sdljava.spec,1.2,1.3
Message-ID: <200709212018.l8LKIVmY003366@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3347

Modified Files:
	sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8



Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdljava.spec	21 Sep 2007 19:27:37 -0000	1.2
+++ sdljava.spec	21 Sep 2007 20:17:58 -0000	1.3
@@ -89,12 +89,12 @@
 
 %build
 # ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64]
-# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h
+# -D__LONG_DOUBLE_128__ works around swig barfing on bits/stdlib-ldbl.h
 %ifarch ppc
-export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__"
+export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__"
 %endif
 %ifarch ppc64
-export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__"
+export ARCH_DEFINE="-D__powerpc64__ -D__LONG_DOUBLE_128__"
 %endif
 
 pushd src/sdljava/native



From fedora-extras-commits at redhat.com  Fri Sep 21 20:21:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 16:21:41 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.66,
	1.67 selinux-policy.spec, 1.528, 1.529
Message-ID: <200709212021.l8LKLf3j003469@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
- Allow cupsd_config_t to read/write usb_device_t
- Support for finger print reader,
- Many fixes for clvmd
- dbus starting networkmanager


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- policy-20070703.patch	20 Sep 2007 22:30:51 -0000	1.66
+++ policy-20070703.patch	21 Sep 2007 20:21:36 -0000	1.67
@@ -1462,7 +1462,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 17:57:24.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 18:26:14.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1482,7 +1482,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,60 @@
+@@ -166,6 +165,62 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1537,13 +1537,15 @@
 +	dev_read_urand($1_java_t)
 +	dev_read_rand($1_java_t)
 +
++	fs_dontaudit_rw_tmpfs_files($1_java_t)
++
 +	optional_policy(`
 +		xserver_xdm_rw_shm($1_java_t)
 +	')
  ')
  
  ########################################
-@@ -219,3 +272,66 @@
+@@ -219,3 +274,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -1612,7 +1614,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.0.8/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.te	2007-09-20 18:14:17.000000000 -0400
+@@ -23,7 +23,7 @@
+ #
+ 
+ # execheap is needed for itanium/BEA jrocket
+-allow java_t self:process { execstack execmem execheap };
++allow java_t self:process { getsched sigkill execheap execmem execstack };
+ 
+ init_dbus_chat_script(java_t)
+ 
 @@ -31,3 +31,7 @@
  	unconfined_domain_noaudit(java_t)
  	unconfined_dbus_chat(java_t)
@@ -1623,8 +1634,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 11:42:05.000000000 -0400
-@@ -18,3 +18,102 @@
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 18:25:48.000000000 -0400
+@@ -18,3 +18,103 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
  ')
@@ -1720,6 +1731,7 @@
 +	userdom_unpriv_usertype($1, $1_mono_t)
 +
 +	allow $1_mono_t self:process { signal getsched execheap execmem };
++	allow $2 $1_mono_t:process noatsecure;
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
 +
@@ -2250,7 +2262,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-21 14:41:45.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2284,7 +2296,7 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
-@@ -259,3 +265,7 @@
+@@ -259,3 +265,8 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -2292,6 +2304,7 @@
 +/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
++/lib(64)?/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in	2007-09-17 16:20:18.000000000 -0400
@@ -2415,7 +2428,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-21 14:29:01.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -2424,6 +2437,14 @@
  /dev/fw.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/hiddev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/hpet		-c	gen_context(system_u:object_r:clock_device_t,s0)
+@@ -98,6 +99,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)
++/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ 
+ /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
@@ -4904,7 +4925,7 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 12:31:53.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-21 15:23:17.000000000 -0400
 @@ -8,17 +8,14 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4924,24 +4945,26 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -26,6 +23,9 @@
+@@ -26,6 +23,11 @@
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
 +/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
-+/usr/lib(64)?/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++# keep as separate lines to ensure proper sorting
++/usr/lib/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/lib64/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
 +
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
  /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
-@@ -52,3 +52,4 @@
+@@ -52,3 +54,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 12:15:12.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-21 09:12:45.000000000 -0400
 @@ -49,9 +49,6 @@
  type hplip_exec_t;
  init_daemon_domain(hplip_t,hplip_exec_t)
@@ -5103,7 +5126,15 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +400,14 @@
+@@ -331,6 +354,7 @@
+ dev_read_sysfs(cupsd_config_t)
+ dev_read_urand(cupsd_config_t)
+ dev_read_rand(cupsd_config_t)
++dev_rw_generic_usb_dev(cupsd_config_t)
+ 
+ fs_getattr_all_fs(cupsd_config_t)
+ fs_search_auto_mountpoints(cupsd_config_t)
+@@ -377,6 +401,14 @@
  ')
  
  optional_policy(`
@@ -5118,7 +5149,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +557,6 @@
+@@ -526,11 +558,6 @@
  
  cups_stream_connect(hplip_t)
  
@@ -5130,7 +5161,7 @@
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
  
-@@ -560,7 +586,7 @@
+@@ -560,7 +587,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5139,7 +5170,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +613,6 @@
+@@ -587,8 +614,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -5189,7 +5220,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 15:31:09.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-21 06:44:48.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5330,7 +5361,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-20 12:01:29.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-21 14:44:08.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -5350,7 +5381,7 @@
  manage_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  manage_sock_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  files_pid_filetrans(system_dbusd_t,system_dbusd_var_run_t,file)
-@@ -116,9 +121,18 @@
+@@ -116,9 +121,22 @@
  ')
  
  optional_policy(`
@@ -5358,6 +5389,10 @@
 +')
 +
 +optional_policy(`
++	networkmanager_domtrans(system_dbusd_t)
++')
++
++optional_policy(`
  	sysnet_domtrans_dhcpc(system_dbusd_t)
  ')
  
@@ -6134,7 +6169,7 @@
  /var/run/vbestate 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.8/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-19 13:28:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-21 14:55:44.000000000 -0400
 @@ -155,6 +155,8 @@
  selinux_compute_relabel_context(hald_t)
  selinux_compute_user_contexts(hald_t)
@@ -6152,6 +6187,15 @@
  allow hald_acl_t self:fifo_file read_fifo_file_perms;
  
  domtrans_pattern(hald_t, hald_acl_exec_t, hald_acl_t)
+@@ -344,6 +347,8 @@
+ 
+ files_read_usr_files(hald_mac_t)
+ 
++kernel_read_system_state(hald_mac_t)
++
+ libs_use_ld_so(hald_mac_t)
+ libs_use_shared_libs(hald_mac_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.0.8/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-09-12 10:34:50.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/inetd.te	2007-09-17 16:20:18.000000000 -0400
@@ -7921,7 +7965,7 @@
  	consoletype_exec(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.8/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ricci.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ricci.te	2007-09-21 10:21:12.000000000 -0400
 @@ -138,6 +138,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -7930,6 +7974,15 @@
  auth_append_login_records(ricci_t)
  
  init_dontaudit_stream_connect_script(ricci_t)
+@@ -260,7 +261,7 @@
+ # ricci_modclusterd local policy
+ #
+ 
+-allow ricci_modclusterd_t self:capability sys_nice;
++allow ricci_modclusterd_t self:capability { sys_nice sys_tty_config };
+ allow ricci_modclusterd_t self:process { signal sigkill setsched };
+ allow ricci_modclusterd_t self:fifo_file rw_fifo_file_perms;
+ allow ricci_modclusterd_t self:unix_stream_socket create_stream_socket_perms;
 @@ -321,6 +322,10 @@
  ')
  
@@ -7941,6 +7994,24 @@
  	unconfined_use_fds(ricci_modclusterd_t)
  ')
  
+@@ -468,9 +473,6 @@
+ 
+ logging_send_syslog_msg(ricci_modstorage_t)
+ 
+-lvm_domtrans(ricci_modstorage_t)
+-lvm_manage_config(ricci_modstorage_t)
+-
+ miscfiles_read_localization(ricci_modstorage_t)
+ 
+ modutils_read_module_deps(ricci_modstorage_t)
+@@ -482,6 +484,7 @@
+ 
+ optional_policy(`
+ 	lvm_domtrans(ricci_modstorage_t)
++	lvm_manage_config(ricci_modstorage_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-17 16:20:18.000000000 -0400
@@ -11141,6 +11212,18 @@
  	seutil_sigchld_newrole(iptables_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.0.8/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te	2007-07-25 10:37:42.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/iscsi.te	2007-09-21 14:55:01.000000000 -0400
+@@ -68,6 +68,8 @@
+ 
+ files_read_etc_files(iscsid_t)
+ 
++kernel_read_system_state(iscsid_t)
++
+ libs_use_ld_so(iscsid_t)
+ libs_use_shared_libs(iscsid_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
@@ -11862,7 +11945,7 @@
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.0.8/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/lvm.fc	2007-09-21 09:54:46.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -11873,19 +11956,66 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-17 16:20:18.000000000 -0400
-@@ -150,7 +150,9 @@
++++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-21 15:33:57.000000000 -0400
+@@ -44,9 +44,9 @@
+ # Cluster LVM daemon local policy
+ #
+ 
+-allow clvmd_t self:capability { sys_admin mknod };
++allow clvmd_t self:capability { sys_nice chown ipc_lock sys_admin mknod };
+ dontaudit clvmd_t self:capability sys_tty_config;
+-allow clvmd_t self:process signal_perms;
++allow clvmd_t self:process { signal_perms  setsched };
+ dontaudit clvmd_t self:process ptrace;
+ allow clvmd_t self:socket create_socket_perms;
+ allow clvmd_t self:fifo_file rw_fifo_file_perms;
+@@ -85,6 +85,9 @@
+ corenet_sendrecv_generic_server_packets(clvmd_t)
+ 
+ dev_read_sysfs(clvmd_t)
++dev_manage_generic_symlinks(clvmd_t)
++dev_relabel_generic_dev_dirs(clvmd_t)
++dev_manage_generic_blk_files(clvmd_t)
+ dev_manage_generic_chr_files(clvmd_t)
+ dev_rw_lvm_control(clvmd_t)
+ dev_dontaudit_getattr_all_blk_files(clvmd_t)
+@@ -102,6 +105,7 @@
+ 
+ domain_use_interactive_fds(clvmd_t)
+ 
++storage_relabel_fixed_disk(clvmd_t)
+ storage_raw_read_fixed_disk(clvmd_t)
+ 
+ libs_use_ld_so(clvmd_t)
+@@ -113,6 +117,9 @@
+ 
+ seutil_dontaudit_search_config(clvmd_t)
+ seutil_sigchld_newrole(clvmd_t)
++seutil_read_config(clvmd_t)
++seutil_read_file_contexts(clvmd_t)
++seutil_search_default_contexts(clvmd_t)
+ 
+ sysnet_read_config(clvmd_t)
+ 
+@@ -150,7 +157,8 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
 -allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
 +allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin };
 +# lvm needs net_admin for multipath
-+
  dontaudit lvm_t self:capability sys_tty_config;
  allow lvm_t self:process { sigchld sigkill sigstop signull signal };
  # LVM will complain a lot if it cannot set its priority.
-@@ -228,6 +230,8 @@
+@@ -208,7 +216,6 @@
+ selinux_compute_user_contexts(lvm_t)
+ 
+ dev_create_generic_chr_files(lvm_t)
+-dev_delete_generic_dirs(lvm_t)
+ dev_read_rand(lvm_t)
+ dev_read_urand(lvm_t)
+ dev_rw_lvm_control(lvm_t)
+@@ -228,6 +235,8 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -11894,7 +12024,7 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -246,6 +250,7 @@
+@@ -246,6 +255,7 @@
  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)
@@ -11902,7 +12032,7 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -275,6 +280,8 @@
+@@ -275,6 +285,8 @@
  seutil_search_default_contexts(lvm_t)
  seutil_sigchld_newrole(lvm_t)
  
@@ -11911,7 +12041,7 @@
  ifdef(`distro_redhat',`
  	# this is from the initrd:
  	files_rw_isid_type_dirs(lvm_t)
-@@ -293,5 +300,15 @@
+@@ -293,5 +305,14 @@
  ')
  
  optional_policy(`
@@ -11926,7 +12056,6 @@
 +	xen_append_log(lvm_t)
 +	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
 +')
-+
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.0.8/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-08-22 07:14:12.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/modutils.te	2007-09-17 16:20:18.000000000 -0400
@@ -12838,6 +12967,14 @@
  term_dontaudit_use_all_user_ttys(ifconfig_t)
  term_dontaudit_use_all_user_ptys(ifconfig_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400
+@@ -10,3 +10,4 @@
+ /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ 
+ /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-17 16:20:18.000000000 -0400
@@ -13047,7 +13184,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -13231,14 +13368,17 @@
  ')
  
  ########################################
-@@ -227,6 +223,17 @@
- 	unconfined_dbus_chat(unconfined_execmem_t)
+@@ -225,8 +221,20 @@
  
- 	optional_policy(`
-+		avahi_dbus_chat(unconfined_t)
-+	')
+ 	init_dbus_chat_script(unconfined_execmem_t)
+ 	unconfined_dbus_chat(unconfined_execmem_t)
++	dbus_connect_system_bus(unconfined_execmem_t)
 +
 +	optional_policy(`
++		avahi_dbus_chat(unconfined_execmem_t)
++	')
+ 
+ 	optional_policy(`
  		hal_dbus_chat(unconfined_execmem_t)
  	')
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- selinux-policy.spec	20 Sep 2007 22:30:51 -0000	1.528
+++ selinux-policy.spec	21 Sep 2007 20:21:36 -0000	1.529
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,12 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
+- Allow cupsd_config_t to read/write usb_device_t
+- Support for finger print reader,
+- Many fixes for clvmd
+- dbus starting networkmanager
+
 * Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
 - Fix java and mono to run in xguest account
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:22:48 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 16:22:48 -0400
Subject: rpms/selinux-policy/F-7 modules-targeted.conf, 1.61,
	1.62 policy-20070501.patch, 1.58, 1.59 selinux-policy.spec,
	1.493, 1.494
Message-ID: <200709212022.l8LKMmVl003551@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517

Modified Files:
	modules-targeted.conf policy-20070501.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
- Make /dev/fuse a fuse_device_t



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/modules-targeted.conf,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- modules-targeted.conf	11 Jul 2007 20:43:44 -0000	1.61
+++ modules-targeted.conf	21 Sep 2007 20:22:15 -0000	1.62
@@ -1470,3 +1470,10 @@
 # 
 w3c = module
 
+#
+# Layer: services
+# Module: exim
+#
+# exim mail server 
+# 
+exim = module

policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- policy-20070501.patch	11 Sep 2007 20:04:54 -0000	1.58
+++ policy-20070501.patch	21 Sep 2007 20:22:15 -0000	1.59
@@ -1711,7 +1711,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:53:08.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:55:52.000000000 -0400
 @@ -1449,6 +1449,44 @@
  
  ########################################
@@ -1881,7 +1881,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.6.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-21 14:29:34.000000000 -0400
 @@ -19,6 +19,8 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -1917,6 +1917,14 @@
  /dev/cpu/.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
  /dev/cpu/mtrr		-c	gen_context(system_u:object_r:mtrr_device_t,s0)
  
+@@ -92,6 +97,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)
++/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ 
+ /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-08-07 09:42:35.000000000 -0400
@@ -2933,7 +2941,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.6.4/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2007-09-13 12:46:00.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/lvm		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -2942,9 +2950,18 @@
  /dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+@@ -51,7 +52,7 @@
+ 
+ /dev/cciss/[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+-/dev/fuse		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,mls_systemhigh)
+ /dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.6.4/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-09-13 12:46:54.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -2961,6 +2978,84 @@
  	typeattribute $1 fixed_disk_raw_write;
  ')
  
+@@ -670,3 +672,61 @@
+ 
+ 	typeattribute $1 storage_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Allow the caller to get the attributes
++##	of device nodes of fuse devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`storage_getattr_fuse_dev',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dev_list_all_dev_nodes($1)
++	allow $1 fuse_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	read or write fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	allow $1 fuse_device_t:chr_file rw_file_perms;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read or write
++##	fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_dontaudit_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dontaudit $1 fuse_device_t:chr_file rw_file_perms;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.te serefpolicy-2.6.4/policy/modules/kernel/storage.te
+--- nsaserefpolicy/policy/modules/kernel/storage.te	2007-05-07 14:51:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.te	2007-09-13 12:45:24.000000000 -0400
+@@ -23,6 +23,12 @@
+ neverallow ~{ fixed_disk_raw_write storage_unconfined_type } fixed_disk_device_t:{ chr_file blk_file } { append write };
+ 
+ #
++# fuse_device_t is the type of /dev/fuse
++#
++type fuse_device_t;
++dev_node(fuse_device_t)
++
++#
+ # scsi_generic_device_t is the type of /dev/sg*
+ # it gives access to ALL SCSI devices (both fixed and removable)
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.6.4/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2007-05-07 14:51:04.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/terminal.fc	2007-08-07 09:42:35.000000000 -0400
@@ -3981,7 +4076,7 @@
  fs_getattr_all_fs(entropyd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.6.4/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-08-21 13:38:42.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-09-13 12:51:25.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -3998,7 +4093,16 @@
  dev_read_urand(automount_t)
  
  domain_use_interactive_fds(automount_t)
-@@ -178,6 +180,11 @@
+@@ -138,6 +140,8 @@
+ # Run mount in the mount_t domain.
+ mount_domtrans(automount_t)
+ 
++storage_rw_fuse(automount_t)
++
+ sysnet_dns_name_resolve(automount_t)
+ sysnet_use_ldap(automount_t)
+ sysnet_read_config(automount_t)
+@@ -178,6 +182,11 @@
  ')
  
  optional_policy(`
@@ -4102,6 +4206,18 @@
  corenet_sendrecv_rndc_client_packets(ndc_t)
  
  fs_getattr_xattr_fs(ndc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.6.4/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/bluetooth.te	2007-09-18 13:32:53.000000000 -0400
+@@ -139,6 +139,8 @@
+ 	dbus_system_bus_client_template(bluetooth,bluetooth_t)
+ 	dbus_connect_system_bus(bluetooth_t)
+ 	dbus_send_system_bus(bluetooth_t)
++	allow bluetooth_t self:dbus send_msg;
++
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.6.4/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/clamav.fc	2007-08-07 09:42:35.000000000 -0400
@@ -5208,6 +5324,462 @@
 +	term_dontaudit_use_unallocated_ttys(dovecot_deliver_t)
 +	term_dontaudit_use_generic_ptys(dovecot_deliver_t)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.fc serefpolicy-2.6.4/policy/modules/services/exim.fc
+--- nsaserefpolicy/policy/modules/services/exim.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.fc	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,6 @@
++
++/usr/sbin/exim	--	gen_context(system_u:object_r:exim_exec_t,s0)
++/etc/rc.d/init.d/exim	--	gen_context(system_u:object_r:exim_script_exec_t,s0)
++/var/run/exim.pid		--	gen_context(system_u:object_r:exim_var_run_t,s0)
++/var/log/exim(/.*)?			gen_context(system_u:object_r:exim_log_t,s0)
++/var/spool/exim(/.*)?			gen_context(system_u:object_r:exim_spool_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-2.6.4/policy/modules/services/exim.if
+--- nsaserefpolicy/policy/modules/services/exim.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.if	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,330 @@
++
++## <summary>policy for exim</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run exim.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`exim_domtrans',`
++	gen_require(`
++		type exim_t;
++                type exim_exec_t;
++	')
++
++	domain_auto_trans($1,exim_exec_t,exim_t)
++
++	allow exim_t $1:fd use;
++	allow exim_t $1:fifo_file rw_file_perms;
++	allow exim_t $1:process sigchld;
++')
++
++
++########################################
++## <summary>
++##	Execute exim server in the exim domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`exim_script_domtrans',`
++	gen_require(`
++		type exim_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1,exim_script_exec_t)
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read, 
++##	exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_dontaudit_read_tmp_files',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++	dontaudit $1 exim_tmp_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Allow domain to read, exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_read_tmp_files',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++	allow $1 exim_tmp_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_tmp',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++         manage_dir_perms($1,exim_tmp_t,exim_tmp_t)
++         manage_file_perms($1,exim_tmp_t,exim_tmp_t)
++         manage_lnk_file_perms($1,exim_tmp_t,exim_tmp_t)
++')
++
++########################################
++## <summary>
++##	Read exim PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_read_pid_files',`
++	gen_require(`
++		type exim_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 exim_var_run_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage exim var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_var_run',`
++	gen_require(`
++		type exim_var_run_t;
++	')
++
++         manage_dir_perms($1,exim_var_run_t,exim_var_run_t)
++         manage_file_perms($1,exim_var_run_t,exim_var_run_t)
++         manage_lnk_file_perms($1,exim_var_run_t,exim_var_run_t)
++')
++
++
++########################################
++## <summary>
++##	Allow the specified domain to read exim's log files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`exim_read_log',`
++	gen_require(`
++		type exim_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 exim_log_t:dir r_dir_perms;
++	allow $1 exim_log_t:file { read getattr lock };
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to append
++##	exim log files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
++interface(`exim_append_log',`
++	gen_require(`
++		type var_log_t, exim_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 exim_log_t:dir r_dir_perms;
++	allow $1 exim_log_t:file { getattr append };
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim log files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_log',`
++	gen_require(`
++		type exim_log_t;
++	')
++
++         manage_dir_perms($1,exim_log_t,exim_log_t)
++         manage_file_perms($1,exim_log_t,exim_log_t)
++         manage_lnk_file_perms($1,exim_log_t,exim_log_t)
++')
++
++########################################
++## <summary>
++##	Search exim spool directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_search_spool',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:dir search_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Read exim spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_read_spool_files',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:file r_file_perms;
++	allow $1 exim_spool_t:dir list_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	exim spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_spool_files',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:file manage_file_perms;
++	allow $1 exim_spool_t:dir rw_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_spool',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++         manage_dir_perms($1,exim_spool_t,exim_spool_t)
++         manage_file_perms($1,exim_spool_t,exim_spool_t)
++         manage_lnk_file_perms($1,exim_spool_t,exim_spool_t)
++')
++
++
++########################################
++## <summary>
++##	All of the rules required to administrate an exim environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed to manage the exim domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the dmidecode domain to use.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`exim_admin',`
++	gen_require(`
++		type exim_t;
++	')
++
++	allow $1 exim_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, exim_t, exim_t)
++	        
++
++	# Allow $1 to restart the apache service
++	exim_script_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 exim_script_exec_t system_r;
++	allow $2 system_r;
++
++	exim_manage_tmp($1)
++
++	exim_manage_var_run($1)
++
++	exim_manage_log($1)
++
++	exim_manage_spool($1)
++
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-2.6.4/policy/modules/services/exim.te
+--- nsaserefpolicy/policy/modules/services/exim.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.te	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,108 @@
++policy_module(exim,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type exim_t;
++type exim_exec_t;
++domain_type(exim_t)
++init_daemon_domain(exim_t, exim_exec_t)
++
++type exim_script_exec_t;
++init_script_type(exim_script_exec_t)
++
++type exim_tmp_t;
++files_tmp_file(exim_tmp_t)
++
++type exim_var_run_t;
++files_pid_file(exim_var_run_t)
++
++type exim_log_t;
++logging_log_file(exim_log_t)
++
++type exim_spool_t;
++files_type(exim_spool_t)
++
++########################################
++#
++# exim local policy
++#
++
++allow exim_t self:capability { dac_override dac_read_search setuid setgid };
++
++## internal communication is often done using fifo and unix sockets.
++allow exim_t self:fifo_file rw_file_perms;
++allow exim_t self:unix_stream_socket create_stream_socket_perms;
++
++allow exim_t exim_tmp_t:file manage_file_perms;
++allow exim_t exim_tmp_t:dir create_dir_perms;
++files_tmp_filetrans(exim_t,exim_tmp_t, { file dir })
++
++allow exim_t exim_var_run_t:file manage_file_perms;
++allow exim_t exim_var_run_t:dir manage_dir_perms;
++files_pid_filetrans(exim_t,exim_var_run_t, { file dir })
++
++allow exim_t exim_log_t:file manage_file_perms;
++allow exim_t exim_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(exim_t,exim_log_t,{ file dir })
++
++allow exim_t exim_spool_t:dir manage_dir_perms;
++allow exim_t exim_spool_t:file manage_file_perms;
++allow exim_t exim_spool_t:sock_file create_file_perms;
++files_spool_filetrans(exim_t,exim_spool_t, { file dir sock_file })
++
++auth_use_nsswitch(exim_t)
++
++can_exec(exim_t,exim_exec_t)
++
++# Init script handling
++domain_use_interactive_fds(exim_t)
++
++files_read_etc_files(exim_t)
++
++sysnet_dns_name_resolve(exim_t)
++corenet_all_recvfrom_unlabeled(exim_t)
++
++allow exim_t self:tcp_socket create_stream_socket_perms;
++corenet_tcp_sendrecv_all_if(exim_t)
++corenet_tcp_sendrecv_all_nodes(exim_t)
++corenet_tcp_sendrecv_all_ports(exim_t)
++corenet_tcp_bind_all_nodes(exim_t)
++corenet_tcp_bind_smtp_port(exim_t)
++corenet_tcp_bind_amavisd_send_port(exim_t)
++corenet_tcp_connect_auth_port(exim_t)
++corenet_tcp_connect_inetd_child_port(exim_t)
++
++corecmd_search_bin(exim_t)
++
++libs_use_ld_so(exim_t)
++libs_use_shared_libs(exim_t)
++logging_send_syslog_msg(exim_t)
++
++miscfiles_read_localization(exim_t)
++
++kernel_read_kernel_sysctls(exim_t)
++
++mta_mailclient(exim_exec_t)
++mta_read_aliases(exim_t)
++mta_rw_spool(exim_t)
++
++userdom_dontaudit_search_sysadm_home_dirs(exim_t)
++userdom_dontaudit_search_generic_user_home_dirs(exim_t)
++
++bool exim_read_user_files false;
++bool exim_manage_user_files false;
++
++if (exim_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(exim_t)
++   userdom_read_unpriv_users_tmp_files(exim_t)
++}
++
++if (exim_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(exim_t)
++   userdom_read_unpriv_users_tmp_files(exim_t)
++   userdom_write_unpriv_users_tmp_files(exim_t)
++}
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2007-08-07 09:42:35.000000000 -0400
@@ -5387,7 +5959,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.6.4/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-09-21 14:56:10.000000000 -0400
 @@ -61,8 +61,6 @@
  # For backwards compatibility with older kernels
  allow hald_t self:netlink_socket create_socket_perms;
@@ -5450,6 +6022,15 @@
  dev_setattr_sound_dev(hald_acl_t)
  dev_setattr_generic_usb_dev(hald_acl_t)
  dev_setattr_usbfs_files(hald_acl_t)
+@@ -341,6 +349,8 @@
+ 
+ files_read_usr_files(hald_mac_t)
+ 
++kernel_read_system_state(hald_mac_t)
++
+ libs_use_ld_so(hald_mac_t)
+ libs_use_shared_libs(hald_mac_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.6.4/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2007-08-07 09:42:35.000000000 -0400
@@ -5889,7 +6470,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.6.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-08-22 09:45:09.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-09-13 13:07:23.000000000 -0400
 @@ -226,6 +226,15 @@
  	tunable_policy(`use_samba_home_dirs',`
  		fs_manage_cifs_files($1_mail_t)
@@ -5906,7 +6487,33 @@
  	')
  
  	optional_policy(`
-@@ -394,6 +403,7 @@
+@@ -316,6 +325,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Make the specified type usable for a mta_send_mail.
++## </summary>
++## <param name="type">
++##	<summary>
++##	Type to be used as a mail client.
++##	</summary>
++## </param>
++#
++interface(`mta_mailclient',`
++	gen_require(`
++		attribute mailclient_exec_type;
++	')
++
++	typeattribute $1 mailclient_exec_type;
++')
++
++
++########################################
++## <summary>
+ ##	Modified mailserver interface for
+ ##	sendmail daemon use.
+ ## </summary>
+@@ -394,6 +422,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1,mail_spool_t,mail_spool_t)
  	read_files_pattern($1,mail_spool_t,mail_spool_t)
@@ -5914,7 +6521,23 @@
  	create_lnk_files_pattern($1,mail_spool_t,mail_spool_t)
  	read_lnk_files_pattern($1,mail_spool_t,mail_spool_t)
  
-@@ -847,6 +857,25 @@
+@@ -449,11 +478,12 @@
+ interface(`mta_send_mail',`
+ 	gen_require(`
+ 		attribute mta_user_agent;
+-		type system_mail_t, sendmail_exec_t;
++		type system_mail_t;
++		attribute mailclient_exec_type;
+ 	')
+ 
+-	allow $1 sendmail_exec_t:lnk_file read_lnk_file_perms;
+-	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
++	allow $1 mailclient_exec_type:lnk_file read_lnk_file_perms;
++	domain_auto_trans($1, mailclient_exec_type, system_mail_t)
+ 
+ 	allow $1 system_mail_t:fd use;
+ 	allow system_mail_t $1:fd use;
+@@ -847,6 +877,25 @@
  	manage_files_pattern($1,mqueue_spool_t,mqueue_spool_t)
  ')
  
@@ -5942,16 +6565,34 @@
  ##	Read sendmail binary.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.6.4/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-08-07 09:42:35.000000000 -0400
-@@ -27,6 +27,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-09-13 13:02:46.000000000 -0400
+@@ -6,6 +6,7 @@
+ # Declarations
+ #
+ 
++attribute mailclient_exec_type;
+ attribute mta_user_agent;
+ attribute mailserver_delivery;
+ attribute mailserver_domain;
+@@ -26,7 +27,8 @@
+ files_type(mail_spool_t)
  
  type sendmail_exec_t;
- files_type(sendmail_exec_t)
+-files_type(sendmail_exec_t)
 +application_executable_file(sendmail_exec_t)
++mta_mailclient(sendmail_exec_t)
  
  mta_base_mail_template(system)
  role system_r types system_mail_t;
-@@ -91,12 +92,14 @@
+@@ -52,6 +54,7 @@
+ kernel_read_system_state(system_mail_t)
+ kernel_read_network_state(system_mail_t)
+ 
++dev_read_sysfs(system_mail_t)
+ dev_read_rand(system_mail_t)
+ dev_read_urand(system_mail_t)
+ 
+@@ -91,12 +94,14 @@
  optional_policy(`
  	apache_read_squirrelmail_data(system_mail_t)
  	apache_append_squirrelmail_data(system_mail_t)
@@ -5966,7 +6607,7 @@
  ')
  
  optional_policy(`
-@@ -109,6 +112,7 @@
+@@ -109,6 +114,7 @@
  
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
@@ -7902,7 +8543,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-11 09:24:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-18 08:18:51.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -8119,7 +8760,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-11 09:56:07.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-18 08:17:55.000000000 -0400
 @@ -16,6 +16,14 @@
  
  ## <desc>
@@ -8205,7 +8846,7 @@
  ########################################
  #
  # smbd Local policy
-@@ -191,18 +222,16 @@
+@@ -191,20 +222,16 @@
  allow smbd_t self:msgq create_msgq_perms;
  allow smbd_t self:sem create_sem_perms;
  allow smbd_t self:shm create_shm_perms;
@@ -8222,12 +8863,14 @@
 -create_dirs_pattern(smbd_t,samba_log_t,samba_log_t)
 -create_files_pattern(smbd_t,samba_log_t,samba_log_t)
 -append_files_pattern(smbd_t,samba_log_t,samba_log_t)
+-allow smbd_t samba_log_t:dir setattr;
+-dontaudit smbd_t samba_log_t:dir remove_name;
 +manage_dirs_pattern(smbd_t,samba_log_t,samba_log_t)
 +manage_files_pattern(smbd_t,samba_log_t,samba_log_t)
- allow smbd_t samba_log_t:dir setattr;
- dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -231,7 +260,8 @@
+ allow smbd_t samba_net_tmp_t:file getattr;
+ 
+@@ -231,7 +258,8 @@
  manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
  files_pid_filetrans(smbd_t,smbd_var_run_t,file)
  
@@ -8237,7 +8880,7 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -241,6 +271,9 @@
+@@ -241,6 +269,9 @@
  kernel_read_software_raid_state(smbd_t)
  kernel_read_system_state(smbd_t)
  
@@ -8247,7 +8890,7 @@
  corenet_tcp_sendrecv_all_if(smbd_t)
  corenet_udp_sendrecv_all_if(smbd_t)
  corenet_raw_sendrecv_all_if(smbd_t)
-@@ -265,11 +298,14 @@
+@@ -265,11 +296,14 @@
  fs_get_xattr_fs_quotas(smbd_t)
  fs_search_auto_mountpoints(smbd_t)
  fs_getattr_rpc_dirs(smbd_t)
@@ -8262,7 +8905,7 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -290,12 +326,16 @@
+@@ -290,12 +324,16 @@
  miscfiles_read_localization(smbd_t)
  miscfiles_read_public_files(smbd_t)
  
@@ -8281,7 +8924,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +359,14 @@
+@@ -319,6 +357,14 @@
  ')
  
  optional_policy(`
@@ -8296,7 +8939,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +387,23 @@
+@@ -339,6 +385,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -8320,7 +8963,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +417,7 @@
+@@ -352,7 +415,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -8329,21 +8972,21 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +427,12 @@
+@@ -362,9 +425,11 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
 +files_list_var_lib(nmbd_t)
++
++manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
++manage_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  
 -create_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
-+manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
- append_files_pattern(nmbd_t,samba_log_t,samba_log_t)
-+allow nmbd_t samba_log_t:file unlink;
-+
+-append_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -373,6 +441,8 @@
+@@ -373,6 +438,8 @@
  
  allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
  
@@ -8352,7 +8995,7 @@
  kernel_getattr_core_if(nmbd_t)
  kernel_getattr_message_if(nmbd_t)
  kernel_read_kernel_sysctls(nmbd_t)
-@@ -391,6 +461,7 @@
+@@ -391,6 +458,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -8360,7 +9003,7 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -402,6 +473,7 @@
+@@ -402,6 +470,7 @@
  
  files_read_usr_files(nmbd_t)
  files_read_etc_files(nmbd_t)
@@ -8368,7 +9011,7 @@
  
  libs_use_ld_so(nmbd_t)
  libs_use_shared_libs(nmbd_t)
-@@ -411,8 +483,6 @@
+@@ -411,8 +480,6 @@
  
  miscfiles_read_localization(nmbd_t)
  
@@ -8377,7 +9020,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
  userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
  userdom_use_unpriv_users_fds(nmbd_t)
-@@ -457,6 +527,7 @@
+@@ -457,6 +524,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -8385,7 +9028,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -489,6 +560,8 @@
+@@ -489,6 +557,8 @@
  term_list_ptys(smbmount_t)
  term_use_controlling_term(smbmount_t)
  
@@ -8394,7 +9037,7 @@
  corecmd_list_bin(smbmount_t)
  
  files_list_mnt(smbmount_t)
-@@ -508,21 +581,11 @@
+@@ -508,21 +578,11 @@
  
  logging_search_logs(smbmount_t)
  
@@ -8417,7 +9060,7 @@
  ')
  
  ########################################
-@@ -530,22 +593,30 @@
+@@ -530,22 +590,30 @@
  # SWAT Local policy
  #
  
@@ -8454,7 +9097,7 @@
  
  allow swat_t smbd_t:process signull;
  
-@@ -558,7 +629,11 @@
+@@ -558,7 +626,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -8467,7 +9110,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -582,23 +657,24 @@
+@@ -582,23 +654,24 @@
  
  dev_read_urand(swat_t)
  
@@ -8494,7 +9137,7 @@
  optional_policy(`
  	cups_read_rw_config(swat_t)
  	cups_stream_connect(swat_t)
-@@ -612,32 +688,30 @@
+@@ -612,32 +685,30 @@
  	kerberos_use(swat_t)
  ')
  
@@ -8534,7 +9177,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +719,8 @@
+@@ -645,6 +716,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -8543,7 +9186,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +758,9 @@
+@@ -682,7 +755,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -8553,7 +9196,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +773,6 @@
+@@ -695,9 +770,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -8563,7 +9206,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +788,6 @@
+@@ -713,10 +785,6 @@
  ')
  
  optional_policy(`
@@ -8574,7 +9217,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +807,7 @@
+@@ -736,6 +804,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -8582,12 +9225,12 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +835,60 @@
+@@ -763,4 +832,64 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
 +	squid_rw_stream_sockets(winbind_helper_t)
- ')
++')
 +
 +########################################
 +#
@@ -8643,6 +9286,10 @@
 +allow winbind_t smbcontrol_t:process signal;
 +
 +allow smbcontrol_t nmbd_var_run_t:file { read lock };
++ifdef(`targeted_policy',`
++	term_use_generic_ptys(smbcontrol_t)
++	term_use_unallocated_ttys(smbcontrol_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-08-07 09:42:35.000000000 -0400
@@ -10086,8 +10733,8 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-2.6.4/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-08-07 09:42:35.000000000 -0400
-@@ -0,0 +1,47 @@
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-09-13 12:51:28.000000000 -0400
+@@ -0,0 +1,48 @@
 +policy_module(fusermount,1.0.0)
 +
 +########################################
@@ -10123,6 +10770,7 @@
 +
 +storage_raw_read_fixed_disk(fusermount_t)
 +storage_raw_write_fixed_disk(fusermount_t)
++storage_rw_fuse(fusermount_t)
 +
 +optional_policy(`
 +	hal_write_log(fusermount_t)
@@ -10640,6 +11288,18 @@
 +optional_policy(`
 +	fail2ban_append_log(iptables_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-2.6.4/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te	2007-05-07 14:51:02.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/iscsi.te	2007-09-21 14:52:05.000000000 -0400
+@@ -67,6 +67,8 @@
+ 
+ files_read_etc_files(iscsid_t)
+ 
++kernel_read_system_state(iscsid_t)
++
+ libs_use_ld_so(iscsid_t)
+ libs_use_shared_libs(iscsid_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.6.4/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2007-08-07 09:42:35.000000000 -0400
@@ -11001,7 +11661,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.6.4/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-09-18 09:11:29.000000000 -0400
 @@ -7,10 +7,15 @@
  #
  
@@ -11028,7 +11688,7 @@
  type syslogd_var_run_t;
  files_pid_file(syslogd_var_run_t)
  
-@@ -59,13 +67,18 @@
+@@ -59,19 +67,25 @@
  	init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh)
  ')
  
@@ -11050,7 +11710,14 @@
  
  read_files_pattern(auditctl_t,auditd_etc_t,auditd_etc_t)
  allow auditctl_t auditd_etc_t:dir list_dir_perms;
-@@ -91,6 +104,7 @@
+ 
+ # Needed for adding watches
+ files_getattr_all_dirs(auditctl_t)
++files_getattr_all_files(auditctl_t)
+ files_read_etc_files(auditctl_t)
+ 
+ kernel_read_kernel_sysctls(auditctl_t)
+@@ -91,6 +105,7 @@
  
  locallogin_dontaudit_use_fds(auditctl_t)
  
@@ -11058,7 +11725,7 @@
  logging_send_syslog_msg(auditctl_t)
  
  ifdef(`targeted_policy',`
-@@ -103,12 +117,11 @@
+@@ -103,12 +118,11 @@
  # Auditd local policy
  #
  
@@ -11072,7 +11739,7 @@
  allow auditd_t self:fifo_file rw_file_perms;
  
  allow auditd_t auditd_etc_t:dir list_dir_perms;
-@@ -146,6 +159,7 @@
+@@ -146,6 +160,7 @@
  
  init_telinit(auditd_t)
  
@@ -11080,7 +11747,7 @@
  logging_send_syslog_msg(auditd_t)
  
  libs_use_ld_so(auditd_t)
-@@ -265,8 +279,14 @@
+@@ -265,8 +280,14 @@
  allow syslogd_t devlog_t:sock_file manage_sock_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
  
@@ -11095,7 +11762,7 @@
  # Allow access for syslog-ng
  allow syslogd_t var_log_t:dir { create setattr };
  
-@@ -331,6 +351,7 @@
+@@ -331,6 +352,7 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -11268,7 +11935,7 @@
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-09-13 12:47:13.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -11323,7 +11990,15 @@
  
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
-@@ -103,6 +117,8 @@
+@@ -65,6 +79,7 @@
+ storage_raw_write_fixed_disk(mount_t)
+ storage_raw_read_removable_device(mount_t)
+ storage_raw_write_removable_device(mount_t)
++storage_rw_fuse(mount_t)
+ 
+ fs_getattr_xattr_fs(mount_t)
+ fs_getattr_cifs(mount_t)
+@@ -103,6 +118,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -11332,7 +12007,7 @@
  
  libs_use_ld_so(mount_t)
  libs_use_shared_libs(mount_t)
-@@ -130,10 +146,15 @@
+@@ -130,10 +147,15 @@
  ')
  
  ifdef(`targeted_policy',`
@@ -11349,7 +12024,7 @@
  	')
  ')
  
-@@ -162,13 +183,8 @@
+@@ -162,13 +184,8 @@
  
  	fs_search_rpc(mount_t)
  
@@ -11363,7 +12038,7 @@
  ')
  
  optional_policy(`
-@@ -192,9 +208,6 @@
+@@ -192,9 +209,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -11373,7 +12048,7 @@
  
  ########################################
  #
-@@ -204,4 +217,30 @@
+@@ -204,4 +218,30 @@
  ifdef(`targeted_policy',`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -12047,7 +12722,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-18 08:18:22.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -12092,7 +12767,7 @@
  		')
  
  		optional_policy(`
-@@ -153,6 +161,8 @@
+@@ -153,11 +161,14 @@
  
  	optional_policy(`
  		rpm_domtrans(unconfined_t)
@@ -12101,7 +12776,13 @@
  	')
  
  	optional_policy(`
-@@ -192,6 +202,9 @@
+ 		samba_domtrans_net(unconfined_t)
+ 		samba_domtrans_winbind_helper(unconfined_t)
++		samba_domtrans_smbcontrol(unconfined_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -192,6 +203,9 @@
  	optional_policy(`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
@@ -12111,7 +12792,7 @@
  ')
  
  ########################################
-@@ -200,10 +213,18 @@
+@@ -200,10 +214,18 @@
  #
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- selinux-policy.spec	10 Sep 2007 18:25:11 -0000	1.493
+++ selinux-policy.spec	21 Sep 2007 20:22:15 -0000	1.494
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
+- Make /dev/fuse a fuse_device_t
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
 - Allow modprobe to setsched on kernel
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:29:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 21 Sep 2007 16:29:07 -0400
Subject: rpms/gnome-panel/devel applet-error.patch, NONE,
	1.1 gnome-panel.spec, 1.223, 1.224
Message-ID: <200709212029.l8LKT76u003797@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3774

Modified Files:
	gnome-panel.spec 
Added Files:
	applet-error.patch 
Log Message:
avoid error dialog if tomboy is not installed


applet-error.patch:

--- NEW FILE applet-error.patch ---
diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c
--- gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error	2007-09-21 16:24:28.000000000 -0400
+++ gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c	2007-09-21 16:24:32.000000000 -0400
@@ -1253,6 +1253,21 @@ panel_applet_frame_event_listener (Bonob
 		panel_applet_frame_set_size_hints_from_any (frame, any);
 }
 
+static gboolean
+in_default_panel_config (const gchar *id)
+{
+	gchar *dir;
+	gboolean result;
+
+	dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
+	result = gconf_client_dir_exists (panel_gconf_get_client (),
+                                          dir, 
+                                          NULL);
+        g_free (dir);
+
+	return result;
+}
+
 static void
 panel_applet_frame_activated (Bonobo_Unknown     object,
 			      CORBA_Environment *ev,
@@ -1275,8 +1290,10 @@ panel_applet_frame_activated (Bonobo_Unk
 	if (BONOBO_EX (ev) || object == CORBA_OBJECT_NIL) {
 		error = bonobo_exception_get_text (ev);
 		g_warning (G_STRLOC ": failed to load applet %s:\n%s",
-			   frame->priv->iid, error);
-		panel_applet_frame_loading_failed (frame, frame_act->id);
+		 	  frame->priv->iid, error);
+		if (!in_default_panel_config (frame_act->id)) {
+			panel_applet_frame_loading_failed (frame, frame_act->id);
+		}
 		g_free (frame_act->id);
 		g_free (frame_act);
 		g_free (error);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- gnome-panel.spec	18 Sep 2007 16:47:30 -0000	1.223
+++ gnome-panel.spec	21 Sep 2007 20:28:33 -0000	1.224
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.20.0.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,12 +39,6 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
-Requires: fast-user-switch-applet
-
-# Mono isn't available for s390 or ppc64 apparently
-%ifnarch s390 s390x ppc64
-Requires: tomboy
-%endif
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -103,6 +97,11 @@
 Patch9: desktop-file-monitoring.patch
 Patch10: preferred-apps.patch
 
+# don't pop up an error dialog if an applet from the 
+# default configuration is missing; we don't want to
+# add a hard dependency on e.g. tomboy 
+Patch11: applet-error.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -138,6 +137,7 @@
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
+%patch11 -p1 -b .applet-error
 
 . %{SOURCE4}
 
@@ -316,6 +316,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-2
+- Don't pop up an error if an applet from the default
+  configuration is missing  
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
 - Update to 2.20.0.1
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:32:44 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:32:44 -0400
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.3,1.4
Message-ID: <200709212032.l8LKWiQj004051@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-jxr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3921

Modified Files:
	maven-jxr.spec 
Log Message:

- Build without maven
- ExcludeArch ppc64




Index: maven-jxr.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-jxr.spec	31 Aug 2007 21:50:10 -0000	1.3
+++ maven-jxr.spec	21 Sep 2007 20:32:11 -0000	1.4
@@ -35,14 +35,12 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
 Name:           maven-jxr
 Version:        1.0
-Release:        2jpp.3%{?dist}
+Release:        2jpp.4%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        Apache Software License
@@ -60,6 +58,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -209,6 +209,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-2jpp.4
+- Build without maven
+- ExcludeArch ppc64
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-2jpp.3
 - Build without maven (for initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:34:38 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:34:38 -0400
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.5,1.6
Message-ID: <200709212034.l8LKYcvI004167@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-doxia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4123

Modified Files:
	maven-doxia.spec 
Log Message:

- Build with maven
- ExcludeArch ppc64




Index: maven-doxia.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven-doxia.spec	1 Sep 2007 18:07:33 -0000	1.5
+++ maven-doxia.spec	21 Sep 2007 20:34:06 -0000	1.6
@@ -34,8 +34,6 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.1.a7.3jpp.4%{?dist}
+Release:        0.1.a7.3jpp.5%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        Apache Software License
@@ -70,6 +68,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:   ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -278,6 +278,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7.3jpp.5
+- Build with maven
+- ExcludeArch ppc64
+
 * Sat Sep 01 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.4
 - Rebuild without maven (fpr initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:36:33 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:36:33 -0400
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.3,1.4
Message-ID: <200709212036.l8LKaXia004292@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-surefire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4248

Modified Files:
	maven-surefire.spec 
Log Message:

- Build with maven
- ExcludeArch ppc64





Index: maven-surefire.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-surefire.spec	31 Aug 2007 21:46:55 -0000	1.3
+++ maven-surefire.spec	21 Sep 2007 20:36:01 -0000	1.4
@@ -34,8 +34,6 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           maven-surefire
 Version:        1.5.3
-Release:        2jpp.3%{?dist}
+Release:        2jpp.4%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -70,6 +68,9 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
+ExcludeArch:    ppc64
+%endif
+
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
 BuildRequires:  classworlds
@@ -311,6 +312,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.5.3-2jpp.4
+- Build with maven
+- ExcludeArch ppc64
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 0:1.5.3-2jpp.3
 - Build without maven (for initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:37:52 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:37:52 -0400
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.4,1.5
Message-ID: <200709212037.l8LKbqu9004449@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-surefire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4384

Modified Files:
	maven-surefire.spec 
Log Message:


Fixed typo in spec file




Index: maven-surefire.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-surefire.spec	21 Sep 2007 20:36:01 -0000	1.4
+++ maven-surefire.spec	21 Sep 2007 20:37:20 -0000	1.5
@@ -67,7 +67,7 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
-%endif
+%else
 ExcludeArch:    ppc64
 %endif
 



From fedora-extras-commits at redhat.com  Fri Sep 21 21:18:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:18:54 -0700
Subject: [pkgdb] abyssinica-fonts was added for bernie
Message-ID: <200709212118.l8LLItnT007524@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package abyssinica-fonts with summary SIL Abyssinica fonts
Kevin Fenzi (kevin) has approved Package abyssinica-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for abyssinica-fonts with an owner of bernie
Kevin Fenzi (kevin) has approved abyssinica-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora, 7) updated by kevin
Message-ID: <200709212119.l8LLJ9bm007597@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora, devel) updated by kevin
Message-ID: <200709212119.l8LLJ9gR007610@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora OLPC, 2) updated by kevin
Message-ID: <200709212119.l8LLJAW5007625@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:28 -0400
Subject: rpms/abyssinica-fonts - New directory
Message-ID: <200709212119.l8LLJS03011877@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts

Log Message:
Directory /cvs/extras/rpms/abyssinica-fonts added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:31 -0400
Subject: rpms/abyssinica-fonts/devel - New directory
Message-ID: <200709212119.l8LLJVO9011891@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts/devel

Log Message:
Directory /cvs/extras/rpms/abyssinica-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:35 -0400
Subject: rpms/abyssinica-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709212119.l8LLJZV1011917@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module abyssinica-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module abyssinica-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:37 -0400
Subject: rpms/abyssinica-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709212119.l8LLJblm011933@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module abyssinica-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: abyssinica-fonts
# $Id: Makefile,v 1.1 2007/09/21 21:19:35 kevin Exp $
NAME := abyssinica-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 fedora-extras-commits at redhat.com  Fri Sep 21 21:21:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:21:26 -0700
Subject: [pkgdb] gsoap was added for matt
Message-ID: <200709212121.l8LLLQuc008240@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gsoap with summary Generator Tools for Coding SOAP/XML Web Services in C and C++
Kevin Fenzi (kevin) has approved Package gsoap
Kevin Fenzi (kevin) has added a Fedora devel branch for gsoap with an owner of matt
Kevin Fenzi (kevin) has approved gsoap in Fedora devel
Kevin Fenzi (kevin) has approved Package gsoap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gsoap (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gsoap (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gsoap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsoap



From fedora-extras-commits at redhat.com  Fri Sep 21 21:21:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:21:27 -0700
Subject: [pkgdb] gsoap (Fedora, devel) updated by kevin
Message-ID: <200709212121.l8LLLRfi008252@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gsoap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsoap



From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:26 -0400
Subject: rpms/gsoap - New directory
Message-ID: <200709212122.l8LLMQCI012214@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap

Log Message:
Directory /cvs/extras/rpms/gsoap added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:29 -0400
Subject: rpms/gsoap/devel - New directory
Message-ID: <200709212122.l8LLMTJe012229@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap/devel

Log Message:
Directory /cvs/extras/rpms/gsoap/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:32 -0400
Subject: rpms/gsoap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709212122.l8LLMW02012254@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap

Added Files:
	Makefile import.log 
Log Message:
Setup of module gsoap


--- NEW FILE Makefile ---
# Top level Makefile for module gsoap
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:36 -0400
Subject: rpms/gsoap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709212122.l8LLMa82012270@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gsoap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gsoap
# $Id: Makefile,v 1.1 2007/09/21 21:22:34 kevin Exp $
NAME := gsoap
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 fedora-extras-commits at redhat.com  Fri Sep 21 21:23:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:23:26 -0700
Subject: [pkgdb] libid3tag (Fedora EPEL, 5) updated by kevin
Message-ID: <200709212123.l8LLNSnx001440@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libid3tag
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libid3tag (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libid3tag (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libid3tag (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From fedora-extras-commits at redhat.com  Fri Sep 21 21:27:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 17:27:04 -0400
Subject: rpms/lucene/devel lucene.spec,1.29,1.30
Message-ID: <200709212127.l8LLR4it012609@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12560

Modified Files:
	lucene.spec 
Log Message:

- Disable tests due to random hangs (see FIXME comment above ant call)




Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lucene.spec	20 Sep 2007 22:14:11 -0000	1.29
+++ lucene.spec	21 Sep 2007 21:26:31 -0000	1.30
@@ -34,7 +34,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.9.1
-Release:        1jpp.4%{?dist}
+Release:        1jpp.5%{?dist}
 Epoch:          0
 License:        Apache Software License
 URL:            http://lucene.apache.org/
@@ -129,12 +129,21 @@
 #ln -sf $(build-classpath berkeleydb) .
 #popd
 rm -r contrib/db
+
+#FIXME: Tests freeze randomly. Turning on debug messages shows warnings like:
+
+# [junit] GC Warning: Repeated allocation of very large block (appr. size 512000):
+# [junit] 	May lead to memory leak and poor performance.
+
+# See: http://koji.fedoraproject.org/koji/getfile?taskID=169839&name=build.log
+# for an example
+
 ant -Dbuild.sysclasspath=first \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
   -Djavadoc.link=%{_javadocdir}/java \
-  package test
+  package
 #  package test generate-test-reports
 
 mkdir META-INF
@@ -256,6 +265,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.9.1-1jpp.5
+- Disable tests due to random hangs (see FIXME comment above ant call)
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.9.1-1jpp.4
 - Rebuild for ppc32 execmem issue and new build-id
 



From fedora-extras-commits at redhat.com  Fri Sep 21 21:28:12 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Fri, 21 Sep 2007 17:28:12 -0400
Subject: fedora-security/audit fc6,1.266,1.267 fc7,1.116,1.117
Message-ID: <200709212128.l8LLSClf012717@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12697

Modified Files:
	fc6 fc7 
Log Message:
elinks



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- fc6	21 Sep 2007 14:29:48 -0000	1.266
+++ fc6	21 Sep 2007 21:28:10 -0000	1.267
@@ -7,6 +7,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
+CVE-2007-5034 VULNERABLE (elinks) #297611
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297561
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8 #297561


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc7	21 Sep 2007 14:29:48 -0000	1.116
+++ fc7	21 Sep 2007 21:28:10 -0000	1.117
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+CVE-2007-5034 VULNERABLE (elinks) #297981
 GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081



From fedora-extras-commits at redhat.com  Fri Sep 21 22:41:53 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Fri, 21 Sep 2007 15:41:53 -0700
Subject: [pkgdb] telepathy-mission-control: pgordon has requested commit
Message-ID: <200709212241.l8LMfrxi019393@app3.fedora.phx.redhat.com>

Peter Gordon (pgordon) has requested the commit acl on telepathy-mission-control (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control



From fedora-extras-commits at redhat.com  Fri Sep 21 22:41:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Fri, 21 Sep 2007 15:41:55 -0700
Subject: [pkgdb] telepathy-mission-control: pgordon has requested commit
Message-ID: <200709212241.l8LMftgb019410@app3.fedora.phx.redhat.com>

Peter Gordon (pgordon) has requested the commit acl on telepathy-mission-control (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control



From fedora-extras-commits at redhat.com  Fri Sep 21 23:17:05 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 19:17:05 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.7.bz2.sign, NONE, 1.1 .cvsignore, 1.632,
	1.633 kernel-2.6.spec, 1.3344,
	1.3345 linux-2.6-utrace-regset.patch, 1.4, 1.5 sources, 1.595,
	1.596 upstream, 1.519, 1.520 patch-2.6.22.6.bz2.sign, 1.1, NONE
Message-ID: <200709212317.l8LNH5np027008@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26978

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-utrace-regset.patch 
	sources upstream 
Added Files:
	patch-2.6.22.7.bz2.sign 
Removed Files:
	patch-2.6.22.6.bz2.sign 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.7



--- NEW FILE patch-2.6.22.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9E0SyGugalF9Dw4RAsibAJwJAmDh3/CV0nHxGrjGzkDP0DT3uwCfTZ9/
ry5zvDQvAlyBxWyN4ivs9Sw=
=4ylv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- .cvsignore	13 Sep 2007 22:21:49 -0000	1.632
+++ .cvsignore	21 Sep 2007 23:16:31 -0000	1.633
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.6.bz2
+patch-2.6.22.7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3344
retrieving revision 1.3345
diff -u -r1.3344 -r1.3345
--- kernel-2.6.spec	21 Sep 2007 18:56:24 -0000	1.3344
+++ kernel-2.6.spec	21 Sep 2007 23:16:31 -0000	1.3345
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2349,6 +2349,9 @@
 
 %changelog
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.7
+
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Build dcdbas and dell_rbu modules on i586 (#216304)
 
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-regset.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-regset.patch	21 Sep 2007 23:16:31 -0000	1.5
@@ -2193,8 +2193,8 @@
  /*
   * does not yet catch signals sent when the child dies.
 @@ -228,52 +232,61 @@ static int putreg(struct task_struct *ch
- 	if (test_tsk_thread_flag(child, TIF_IA32))
- 		value &= 0xffffffff;
+ 	unsigned long tmp; 
+ 	
  	switch (regno) {
 -		case offsetof(struct user_regs_struct,fs):
 -			if (value && (value & 3) != 3)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- sources	13 Sep 2007 22:21:49 -0000	1.595
+++ sources	21 Sep 2007 23:16:31 -0000	1.596
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-f2948e364ab3e4736b9e34f02173472f  patch-2.6.22.6.bz2
+11d56c9918810694f32a172ba4788a83  patch-2.6.22.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- upstream	13 Sep 2007 22:21:49 -0000	1.519
+++ upstream	21 Sep 2007 23:16:31 -0000	1.520
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.6.bz2
+patch-2.6.22.7.bz2


--- patch-2.6.22.6.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 23:46:50 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 19:46:50 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.67,
	1.68 selinux-policy.spec, 1.529, 1.530
Message-ID: <200709212346.l8LNkotJ027841@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27818

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
- Allow also to search var_lib
- New context for dbus launcher 


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- policy-20070703.patch	21 Sep 2007 20:21:36 -0000	1.67
+++ policy-20070703.patch	21 Sep 2007 23:46:17 -0000	1.68
@@ -314,8 +314,8 @@
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-19 10:54:14.000000000 -0400
-@@ -14,25 +14,35 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-21 19:08:24.000000000 -0400
+@@ -14,25 +14,36 @@
  type alsa_etc_rw_t;
  files_type(alsa_etc_rw_t)
  
@@ -342,6 +342,7 @@
  manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  
++files_search_var_lib(alsa_t)
 +manage_dirs_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
 +manage_files_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
 +
@@ -354,7 +355,7 @@
  
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
-@@ -43,7 +53,13 @@
+@@ -43,7 +54,13 @@
  
  userdom_manage_unpriv_user_semaphores(alsa_t)
  userdom_manage_unpriv_user_shared_mem(alsa_t)
@@ -2838,7 +2839,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.8/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if	2007-09-21 19:16:08.000000000 -0400
 @@ -271,45 +271,6 @@
  
  ########################################
@@ -9977,7 +9978,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 15:44:32.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-21 19:21:31.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9992,11 +9993,12 @@
  ## Allow xdm logins as sysadm
  ## </p>
  ## </desc>
-@@ -132,15 +139,19 @@
+@@ -132,15 +139,20 @@
  manage_fifo_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t)
  manage_sock_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t)
  fs_tmpfs_filetrans(xdm_t,xdm_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
 +fs_rw_tmpfs_files(xdm_xserver_t)
++fs_getattr_all_fs(xdm_t)
  
  manage_dirs_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t)	
  manage_files_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t)
@@ -10013,7 +10015,7 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -185,6 +196,7 @@
+@@ -185,6 +197,7 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_all_nodes(xdm_t)
  corenet_udp_bind_all_nodes(xdm_t)
@@ -10021,7 +10023,7 @@
  corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
-@@ -246,6 +258,7 @@
+@@ -246,6 +259,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -10029,7 +10031,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +270,7 @@
+@@ -257,6 +271,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -10037,7 +10039,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -268,9 +282,14 @@
+@@ -268,9 +283,14 @@
  userdom_create_all_users_keys(xdm_t)
  # for .dmrc
  userdom_read_unpriv_users_home_content_files(xdm_t)
@@ -10052,7 +10054,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +325,11 @@
+@@ -306,6 +326,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -10064,7 +10066,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +372,8 @@
+@@ -348,12 +373,8 @@
  ')
  
  optional_policy(`
@@ -10078,7 +10080,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +405,7 @@
+@@ -385,7 +406,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -10087,7 +10089,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +445,10 @@
+@@ -425,6 +446,10 @@
  ')
  
  optional_policy(`
@@ -10098,7 +10100,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +458,19 @@
+@@ -434,47 +459,20 @@
  ')
  
  optional_policy(`
@@ -10113,6 +10115,7 @@
 +optional_policy(`
 +	unconfined_rw_shm(xdm_xserver_t)
 +	unconfined_execmem_rw_shm(xdm_xserver_t)
++	unconfined_rw_tmpfs_files(xdm_xserver_t)
 +')
  
 -	ifdef(`distro_rhel4',`
@@ -10188,7 +10191,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.8/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc	2007-09-21 16:38:32.000000000 -0400
 @@ -14,6 +14,7 @@
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
  /sbin/unix_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
@@ -10197,9 +10200,15 @@
  ifdef(`distro_suse', `
  /sbin/unix2_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
  ')
+@@ -40,3 +41,5 @@
+ /var/run/console(/.*)?	 	gen_context(system_u:object_r:pam_var_console_t,s0)
+ 
+ /var/run/sudo(/.*)?		gen_context(system_u:object_r:pam_var_run_t,s0)
++
++/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 16:27:52.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-21 19:32:00.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10230,7 +10239,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,23 @@
+@@ -176,11 +177,28 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10244,6 +10253,11 @@
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
 +
++	manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
++	manage_files_pattern($1, auth_cache_t, auth_cache_t)
++	manage_sock_files_pattern($1, auth_cache_t, auth_cache_t)
++	files_var_filetrans($1,auth_cache_t,dir)
++
  	# for SSP/ProPolice
  	dev_read_urand($1)
  
@@ -10254,7 +10268,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +209,33 @@
+@@ -196,22 +214,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10289,7 +10303,7 @@
  	')
  ')
  
-@@ -309,9 +333,6 @@
+@@ -309,9 +338,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10299,7 +10313,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +350,7 @@
+@@ -329,6 +355,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10307,7 +10321,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +369,37 @@
+@@ -347,6 +374,37 @@
  
  ########################################
  ## <summary>
@@ -10345,7 +10359,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +748,24 @@
+@@ -695,6 +753,24 @@
  
  ########################################
  ## <summary>
@@ -10370,7 +10384,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1389,9 @@
+@@ -1318,14 +1394,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10385,7 +10399,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1447,163 @@
+@@ -1381,3 +1452,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -10551,7 +10565,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-21 16:37:58.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10566,7 +10580,17 @@
  
  type chkpwd_exec_t;
  application_executable_file(chkpwd_exec_t)
-@@ -67,6 +74,10 @@
+@@ -53,6 +60,9 @@
+ type utempter_exec_t;
+ application_domain(utempter_t,utempter_exec_t)
+ 
++type auth_cache_t;
++logging_log_file(auth_cache_t)
++
+ #
+ # var_auth_t is the type of /var/lib/auth, usually
+ # used for auth data in pam_able
+@@ -67,6 +77,10 @@
  authlogin_common_auth_domain_template(system)
  role system_r types system_chkpwd_t;
  
@@ -10577,7 +10601,7 @@
  ########################################
  #
  # PAM local policy
-@@ -159,6 +170,8 @@
+@@ -159,6 +173,8 @@
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10586,7 +10610,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +249,7 @@
+@@ -236,7 +252,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10595,7 +10619,7 @@
  ')
  
  ########################################
-@@ -302,3 +315,28 @@
+@@ -302,3 +318,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -12977,7 +13001,7 @@
 +/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-21 19:31:25.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -13032,7 +13056,7 @@
  	read_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  	read_lnk_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  ')
-@@ -601,3 +605,149 @@
+@@ -601,3 +605,175 @@
  
  	allow $1 unconfined_tmp_t:file { getattr write append };
  ')
@@ -13182,6 +13206,32 @@
 +
 +	allow $1 unconfined_t:process rlimitinh;
 +')
++
++########################################
++## <summary>
++##	Read/write unconfined tmpfs files.
++## </summary>
++## <desc>
++##	<p>
++##	Read/write unconfined tmpfs files.
++##	</p>
++## </desc>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_rw_tmpfs_files',`
++	gen_require(`
++		type unconfined_tmpfs_t;
++	')
++
++	fs_search_tmpfs($1)
++	allow $1 unconfined_tmpfs_t:dir list_dir_perms;
++	rw_files_pattern($1,unconfined_tmpfs_t,unconfined_tmpfs_t)
++	read_lnk_files_pattern($1,unconfined_tmpfs_t,unconfined_tmpfs_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
@@ -13400,7 +13450,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 18:02:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-21 19:20:56.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- selinux-policy.spec	21 Sep 2007 20:21:36 -0000	1.529
+++ selinux-policy.spec	21 Sep 2007 23:46:18 -0000	1.530
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
+- Allow also to search var_lib
+- New context for dbus launcher 
+
 * Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
 - Allow cupsd_config_t to read/write usb_device_t
 - Support for finger print reader,



From fedora-extras-commits at redhat.com  Fri Sep 21 23:56:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 21 Sep 2007 19:56:56 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.166,1.167
Message-ID: <200709212356.l8LNuuoO028024@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28002

Modified Files:
	gnome-screensaver.spec 
Log Message:
spec file fixes



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-screensaver.spec	21 Sep 2007 15:59:06 -0000	1.166
+++ gnome-screensaver.spec	21 Sep 2007 23:56:23 -0000	1.167
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -106,6 +106,12 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.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/gnome-screensaver.schemas >/dev/null
+fi
+ 
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -130,6 +136,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 21 2007 Matthisa Clasen <mclasen at redhat.com> - 2.20.0-4
+- Add %%pre scriptlet
+
 * Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
 - hide xscreensaver menu if gnome-screensaver is installed
   (bug 300401)



From fedora-extras-commits at redhat.com  Sat Sep 22 01:20:47 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:20:47 -0400
Subject: rpms/xournal/devel xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220120.l8M1KlHG009505@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9470

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:08:21 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:20:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 01:32:17 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:32:17 -0400
Subject: rpms/xournal/FC-6 xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220132.l8M1WHau009917@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9890

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:07:31 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:31:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 01:33:29 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:33:29 -0400
Subject: rpms/xournal/F-7 xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220133.l8M1XT9E010082@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10056

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:05:39 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:32:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 02:31:25 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 22:31:25 -0400
Subject: rpms/aiccu/devel aiccu-lsb-initscript.patch, NONE, 1.1 aiccu.spec,
	1.8, 1.9
Message-ID: <200709220231.l8M2VP59020190@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20088

Modified Files:
	aiccu.spec 
Added Files:
	aiccu-lsb-initscript.patch 
Log Message:
add LSB initscript header (BZ#246861)

aiccu-lsb-initscript.patch:

--- NEW FILE aiccu-lsb-initscript.patch ---
--- aiccu/doc/aiccu.init.rpm.orig	2007-09-21 21:15:04.000000000 -0500
+++ aiccu/doc/aiccu.init.rpm	2007-09-21 21:19:19.000000000 -0500
@@ -8,6 +8,20 @@
 # config:  /etc/aiccu.conf
 # chkconfig: - 59 73
 # processname: aiccu
+#
+### BEGIN INIT INFO
+# Provides: aiccu
+# Required-Start: $local_fs $remote_fs $network $time $named
+# Required-Stop: $local_fs $remote_fs $network $time $named
+# Default-Start:
+# Default-Stop:
+# Short-Description: hearbeat daemon for IPv6-in-IPv4 (Proto-41, AYIYA, Heartbeat) tunnels
+# Description:  aiccu automatically gives one IPv6 connectivity
+#   without having to manually configure interfaces etc.
+#   One does need a SixXS account and at least a tunnel. These
+#   can be freely & gratis requested from the SixXS website.
+#   For more information about SixXS check http://www.sixxs.net
+### END INIT INFO
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then
@@ -90,6 +104,9 @@
   reload)
   	restart
 	;;
+  force-reload)
+	restart
+	;;
   status)
   	rhstatus
 	;;


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aiccu.spec	20 Sep 2007 04:45:15 -0000	1.8
+++ aiccu.spec	22 Sep 2007 02:30:52 -0000	1.9
@@ -9,12 +9,13 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2007.01.15
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   BSD
 Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source:    http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz
+Patch0: aiccu-lsb-initscript.patch
 BuildRequires: gnutls-devel
 Requires:  iproute
 Requires(post): chkconfig
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 # fix executable permissions on non-executable content
 # so debuginfo can pick them up properly
 find . -type f -not -name rules -and -not -name *init* -exec chmod a-x \{\} \;
@@ -70,6 +72,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <matt at domsch.com> 2007.01.15-3
+- add LSB initscript header (BZ#246861)
+
 * Wed Sep 19 2007 Matt Domsch <matt at domsch.com> 2007.01.15-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Sep 22 03:08:41 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 21 Sep 2007 23:08:41 -0400
Subject: rpms/vips/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vips.spec,
	1.11, 1.12
Message-ID: <200709220308.l8M38fE3028442@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/vips/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28417

Modified Files:
	.cvsignore sources vips.spec 
Log Message:
* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jul 2007 22:49:09 -0000	1.6
+++ .cvsignore	22 Sep 2007 03:08:08 -0000	1.7
@@ -1 +1 @@
-vips-7.12.4.tar.gz
+vips-7.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jul 2007 22:49:09 -0000	1.6
+++ sources	22 Sep 2007 03:08:08 -0000	1.7
@@ -1 +1 @@
-5399e1355172964f503ce1422e648ffd  vips-7.12.4.tar.gz
+94bee1c2770cd7da63faa3c75f8c381f  vips-7.12.5.tar.gz


Index: vips.spec
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/vips.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vips.spec	17 Aug 2007 01:06:33 -0000	1.11
+++ vips.spec	22 Sep 2007 03:08:08 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		vips
-Version:	7.12.4
-Release:	2%{?dist}
+Version:	7.12.5
+Release:	1%{?dist}
 Summary: 	Library for processing large images
 
 Group:		System Environment/Libraries
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
+- New upstream release
+
 * Thu Aug 16 2007 Adam Goode <adam at spicenitz.org> - 7.12.4-2
 - Add Conflicts for doc
 - Update doc package description



From fedora-extras-commits at redhat.com  Sat Sep 22 03:26:00 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 21 Sep 2007 23:26:00 -0400
Subject: rpms/nip2/devel .cvsignore, 1.7, 1.8 nip2.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200709220326.l8M3Q0Gn028838@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/nip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28710

Modified Files:
	.cvsignore nip2.spec sources 
Log Message:
* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Aug 2007 01:22:40 -0000	1.7
+++ .cvsignore	22 Sep 2007 03:25:28 -0000	1.8
@@ -1 +1 @@
-nip2-7.12.4.tar.gz
+nip2-7.12.5.tar.gz


Index: nip2.spec
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nip2.spec	17 Aug 2007 01:47:40 -0000	1.9
+++ nip2.spec	22 Sep 2007 03:25:28 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		nip2
-Version:	7.12.4
+Version:	7.12.5
 Release:	1%{?dist}
 Summary:	Interactive tool for working with large images
 
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
+- New upstream release
+
 * Thu Aug 16 2007 Adam Goode <adam at spicenitz.org> - 7.12.4-1
 - New upstream release
 - Update License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Aug 2007 01:22:40 -0000	1.7
+++ sources	22 Sep 2007 03:25:28 -0000	1.8
@@ -1 +1 @@
-d9d9cf35fe47385e2eb4200cc02a9dd3  nip2-7.12.4.tar.gz
+3b00b507e993ef1bd99a73111acc660b  nip2-7.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 03:34:36 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 23:34:36 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.46, 1.47 NetworkManager.spec,
	1.167, 1.168 sources, 1.65, 1.66
Message-ID: <200709220334.l8M3YaxS029139@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29076

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
- New snapshot (fix unencrypted & 40 bit WEP)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	21 Sep 2007 18:50:07 -0000	1.46
+++ .cvsignore	22 Sep 2007 03:34:03 -0000	1.47
@@ -7,3 +7,5 @@
 NetworkManager-0.7.0.svn2844.tar.gz
 nm-applet-0.7.0.svn190.tar.gz
 NetworkManager-0.7.0.svn2849.tar.gz
+NetworkManager-0.7.0.svn2852.tar.gz
+nm-applet-0.7.0.svn191.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- NetworkManager.spec	21 Sep 2007 18:50:07 -0000	1.167
+++ NetworkManager.spec	22 Sep 2007 03:34:03 -0000	1.168
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2849
+%define snapshot svn2852
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn190.tar.gz
+Source1: nm-applet-%{version}.svn191.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -258,6 +258,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
+- New snapshot (fix unencrypted & 40 bit WEP)
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	21 Sep 2007 18:50:07 -0000	1.65
+++ sources	22 Sep 2007 03:34:03 -0000	1.66
@@ -1,2 +1,2 @@
-bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz
-abba317b083a742b1a36167c16654a3a  NetworkManager-0.7.0.svn2849.tar.gz
+ca377699ea19f3114bd5f0d71cd131ea  NetworkManager-0.7.0.svn2852.tar.gz
+9e8b0d741f2fca69bbbbdcfafc6677ab  nm-applet-0.7.0.svn191.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 03:40:48 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 23:40:48 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.168,1.169
Message-ID: <200709220340.l8M3emFg029552@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29506

Modified Files:
	NetworkManager.spec 
Log Message:
Don't need dhcdbd


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- NetworkManager.spec	22 Sep 2007 03:34:03 -0000	1.168
+++ NetworkManager.spec	22 Sep 2007 03:40:16 -0000	1.169
@@ -45,7 +45,6 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: dhcdbd
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: libnotify-devel >= 0.3



From fedora-extras-commits at redhat.com  Sat Sep 22 03:41:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 23:41:33 -0400
Subject: fedora-security/audit epel5,1.3,1.4
Message-ID: <200709220341.l8M3fXK4029658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29558

Modified Files:
	epel5 
Log Message:
Catch up with new vulnerabilities. 
remove qt4 (shipped in rhel, not epel)
update for cacti update.



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epel5	14 Sep 2007 00:23:19 -0000	1.3
+++ epel5	22 Sep 2007 03:41:31 -0000	1.4
@@ -3,9 +3,11 @@
 # *CVE are items that need verification for EPEL-5
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070910
-# Up to date EPEL5 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date EPEL5 as of 20070916
 #
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
+*CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 *CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
@@ -36,8 +38,8 @@
 CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
 CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3113 VULNERABLE (cacti) #243592
-CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3113 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3112 patch (cacti, fixed 0.8.7) #243592
 CVE-2007-3025 ignore (clamav, Solaris only)
 CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
@@ -84,7 +86,6 @@
 CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
 *CVE-2007-0469 version (rubygems, fixed 0.9.1)
 CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-CVE-2007-0242 VULNERABLE (qt4, fixed 4.2.3-7)
 CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
 *CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694



From fedora-extras-commits at redhat.com  Sat Sep 22 03:59:58 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 21 Sep 2007 23:59:58 -0400
Subject: rpms/python-nltk/F-7 sources, 1.3, 1.4 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200709220359.l8M3xwSb030179@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142/F-7

Modified Files:
	.cvsignore 
Added Files:
	sources 
Removed Files:
	dead.package 
Log Message:
First python-nltk release for Fedora after upstream is renamed back from nltk_lite



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	22 Sep 2007 03:59:25 -0000	1.4
@@ -0,0 +1 @@
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 03:59:25 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-0.9b2.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 04:00:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:00:02 -0400
Subject: rpms/python-nltk/devel sources, 1.3, 1.4 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200709220400.l8M40212030187@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142/devel

Modified Files:
	.cvsignore 
Added Files:
	sources 
Removed Files:
	dead.package 
Log Message:
First python-nltk release for Fedora after upstream is renamed back from nltk_lite



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	22 Sep 2007 03:59:28 -0000	1.4
@@ -0,0 +1 @@
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 03:59:28 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-0.9b2.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 04:07:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 22 Sep 2007 00:07:59 -0400
Subject: fedora-security/audit epel4,1.1,1.2
Message-ID: <200709220407.l8M47xlV004410@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386

Modified Files:
	epel4 
Log Message:
Process a ton of epel4 items. 



Index: epel4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel4	1 Sep 2007 18:49:37 -0000	1.1
+++ epel4	22 Sep 2007 04:07:57 -0000	1.2
@@ -3,99 +3,102 @@
 # *CVE are items that need verification for EPEL-4
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070829
-# Up to date EPEL4 as of 
+# Up to date CVE as of CVE email 20070914
+# Up to date EPEL4 as of 20070916
 #
-*CVE-2007-4631 VULNERABLE (qgit) #268381
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
+*CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
+*CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
+CVE-2007-4631 version (qgit, fixed 1.5.7) #268381
 *CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-*CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4560 VULNERABLE (clamav) #260583
 *CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 *CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
 *CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 *CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
 *CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 *CVE-2007-4400 VULNERABLE (konversation) #253545
-*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
+CVE-2007-4323 backport (denyhosts) #252291
 *CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
-*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3725 ** (clamav)
-*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
-*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
-*CVE-2007-3025 ignore (clamav, Solaris only)
-*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3725 ** (clamav)
+CVE-2007-3555 version (moodle, fixed 1.8.2) #247528
+CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
+CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3113 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3112 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3025 ignore (clamav, Solaris only)
+CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
 *CVE-2007-2958 VULNERABLE (claws-mail) #254121
-*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
-*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
-*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
-*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
-*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
+*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489
+CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
+CVE-2007-2650 VULNERABLE (clamav, fixed 0.90.3) #240395
+CVE-2007-2637 patch (moin, fixed 1.5.7-2)
+CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
 *CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
-*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
+CVE-2007-2245 version (phpMyAdmin, fixed 2.10.1) #237882
 *CVE-2007-2165 VULNERABLE (proftpd) #237533
-*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
-*CVE-2007-1997 version (clamav, fixed in 0.90.2)
-*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
-*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
+CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
+CVE-2007-1997 VULNERABLE (clamav, fixed in 0.90.2)
+CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1745 VULNERABLE (clamav, fixed in 0.90.2) #236703
+CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
 *CVE-2007-1558 version (claws-mail, fixed 2.9.1) #237293
-*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
+CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
 *CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
 *CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
-*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1055 version (mediawiki, fixed 1.8.3)
 *CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
-*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0898 version (clamav, fixed 0.90) #229202
-*CVE-2007-0897 version (clamav, fixed 0.90) #229202
+CVE-2007-0902 version (moin, fixed 1.5.7-2) #228764
+CVE-2007-0901 version (moin, fixed 1.5.7-2) #228764
+CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229202
+CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229202
 *CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
-*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
+CVE-2007-0857 version (moin, fixed 1.5.7) #228139
 *CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
-*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
+CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
 *CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
-*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
-*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
-*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
+CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
+CVE-2007-0007 version (gnucash, fixed 2.0.5) #223233
+CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
 *CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
 *CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
 *CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
-*CVE-2006-6481 version (clamav, fixed 0.88.7)
-*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
-*CVE-2006-6374 ** (phpMyAdmin) #218853
-*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
-*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
+CVE-2006-6481 VULNERABLE (clamav, fixed 0.88.7)
+CVE-2006-6406 VULNERABLE (clamav, fixed 0.88.7) #219095
+CVE-2006-6374 ** (phpMyAdmin) #218853
+CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
+CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
 *CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 *CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
-*CVE-2006-5874 version (clamav, fixed 0.88.1)
-*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
+CVE-2006-5874 version (clamav, fixed 0.88.1)
+CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
 *CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 *CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 *CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
@@ -103,51 +106,51 @@
 *CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 *CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 *CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
 *CVE-2006-4684 version (zope, fixed 2.9.2)
 *CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
 *CVE-2006-4248 ignore (thttpd, Debian specific issue)
 *CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
-*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
+CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 *CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
 *CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
-*CVE-2006-2489 version (nagios, fixed 2.3.1)
-*CVE-2006-2427 ignore (clamav) not an issue bz#192076
+CVE-2006-2489 version (nagios, fixed 2.3.1)
+CVE-2006-2427 ignore (clamav) not an issue bz#192076
 *CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
-*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
+CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
 *CVE-2006-2017 version (dnsmasq, fixed 2.30)
-*CVE-2006-1989 version (clamav, fixed 0.88.2)
+CVE-2006-1989 version (clamav, fixed 0.88.2)
 *CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
 *CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
-*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
-*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
+CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
+CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 *CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
 *CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
 *CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
-*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
+CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0760 version (lighttpd, fixed 1.4.10)
+CVE-2006-0458 VULNERABLE (irssi, fixed 0.8.10) bz#184509
 *CVE-2006-0322 version (mediawiki, fixed 1.5.8)
-*CVE-2006-0162 version (clamav, fixed 0.88)
-*CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
-*CVE-2006-0106 version (wine, fixed 0.9.10)
-*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
-*CVE-2005-4803 version (graphviz, fixed 2.2.1)
+CVE-2006-0162 version (clamav, fixed 0.88)
+CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
+CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
+CVE-2005-4803 version (graphviz, fixed 2.2.1)
 *CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)



From fedora-extras-commits at redhat.com  Sat Sep 22 04:17:01 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:17:01 -0400
Subject: rpms/python-nltk/F-7 Makefile,1.2,1.3 python-nltk.spec,1.4,1.5
Message-ID: <200709220417.l8M4H1DD004809@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696/F-7

Added Files:
	Makefile python-nltk.spec 
Log Message:
New python-nltk, based on nltk_lite



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	22 Sep 2007 04:16:28 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-nltk
+# $Id$
+NAME := python-nltk
+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)


Index: python-nltk.spec
===================================================================
RCS file: python-nltk.spec
diff -N python-nltk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-nltk.spec	22 Sep 2007 04:16:28 -0000	1.5
@@ -0,0 +1,73 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define prerel b2
+Name:           python-nltk
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
+Summary:        Natural Language Toolkit
+
+Group:          Development/Libraries
+License:        GPLv2
+URL:            http://nltk.sf.net/
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
+Provides:       python-nltk_lite = %{version}-%{release}
+
+BuildRequires:  python-devel
+Requires:       numpy, python-matplotlib, tkinter
+
+%description
+NLTK is a Python package that simplifies the construction of programs
+that process natural language; and defines standard interfaces between
+the different components of an NLP system.  It was designed primarily
+to help teach graduate and undergraduate students about computational
+linguistics; but it is also useful as a framework for implementing
+research projects.
+
+
+%prep
+%setup -q -n nltk-%{version}%{?prerel}
+
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+# Make scripts executable
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
+
+
+%changelog
+* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Renamed back to python-nltk
+
+* Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
+- Rebuild for development branch
+
+* Mon Oct 30 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-1
+- Initial package



From fedora-extras-commits at redhat.com  Sat Sep 22 04:17:04 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:17:04 -0400
Subject: rpms/python-nltk/devel Makefile,1.2,1.3 python-nltk.spec,1.4,1.5
Message-ID: <200709220417.l8M4H4eK004813@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696/devel

Added Files:
	Makefile python-nltk.spec 
Log Message:
New python-nltk, based on nltk_lite



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	22 Sep 2007 04:16:31 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-nltk
+# $Id$
+NAME := python-nltk
+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)


Index: python-nltk.spec
===================================================================
RCS file: python-nltk.spec
diff -N python-nltk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-nltk.spec	22 Sep 2007 04:16:31 -0000	1.5
@@ -0,0 +1,73 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define prerel b2
+Name:           python-nltk
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
+Summary:        Natural Language Toolkit
+
+Group:          Development/Libraries
+License:        GPLv2
+URL:            http://nltk.sf.net/
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
+Provides:       python-nltk_lite = %{version}-%{release}
+
+BuildRequires:  python-devel
+Requires:       numpy, python-matplotlib, tkinter
+
+%description
+NLTK is a Python package that simplifies the construction of programs
+that process natural language; and defines standard interfaces between
+the different components of an NLP system.  It was designed primarily
+to help teach graduate and undergraduate students about computational
+linguistics; but it is also useful as a framework for implementing
+research projects.
+
+
+%prep
+%setup -q -n nltk-%{version}%{?prerel}
+
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+# Make scripts executable
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
+
+
+%changelog
+* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Renamed back to python-nltk
+
+* Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
+- Rebuild for development branch
+
+* Mon Oct 30 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-1
+- Initial package



From fedora-extras-commits at redhat.com  Sat Sep 22 04:24:27 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:24:27 -0400
Subject: rpms/python-nltk/F-7 python-nltk.spec,1.5,1.6
Message-ID: <200709220424.l8M4ORsx005088@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035/F-7

Modified Files:
	python-nltk.spec 
Log Message:
Make tkinter a build requirement as well



Index: python-nltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/F-7/python-nltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-nltk.spec	22 Sep 2007 04:16:28 -0000	1.5
+++ python-nltk.spec	22 Sep 2007 04:23:54 -0000	1.6
@@ -3,7 +3,7 @@
 %define prerel b2
 Name:           python-nltk
 Version:        0.9
-Release:        0.1.%{prerel}%{?dist}
+Release:        0.2.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
 Provides:       python-nltk_lite = %{version}-%{release}
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, tkinter
 Requires:       numpy, python-matplotlib, tkinter
 
 %description
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9.0.2.b
+- BR on tkinter, it is now needed at build time
+
 * Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
 - Updated to 0.9b2
 - Renamed back to python-nltk



From fedora-extras-commits at redhat.com  Sat Sep 22 04:24:30 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:24:30 -0400
Subject: rpms/python-nltk/devel python-nltk.spec,1.5,1.6
Message-ID: <200709220424.l8M4OUw8005091@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035/devel

Modified Files:
	python-nltk.spec 
Log Message:
Make tkinter a build requirement as well



Index: python-nltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/devel/python-nltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-nltk.spec	22 Sep 2007 04:16:31 -0000	1.5
+++ python-nltk.spec	22 Sep 2007 04:23:57 -0000	1.6
@@ -3,7 +3,7 @@
 %define prerel b2
 Name:           python-nltk
 Version:        0.9
-Release:        0.1.%{prerel}%{?dist}
+Release:        0.2.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
 Provides:       python-nltk_lite = %{version}-%{release}
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, tkinter
 Requires:       numpy, python-matplotlib, tkinter
 
 %description
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9.0.2.b
+- BR on tkinter, it is now needed at build time
+
 * Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
 - Updated to 0.9b2
 - Renamed back to python-nltk



From fedora-extras-commits at redhat.com  Sat Sep 22 05:03:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 22 Sep 2007 01:03:48 -0400
Subject: rpms/GConf2/devel GConf2.spec,1.65,1.66
Message-ID: <200709220503.l8M53mFs012003@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11979

Modified Files:
	GConf2.spec 
Log Message:
fix up deps



Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- GConf2.spec	19 Sep 2007 15:25:35 -0000	1.65
+++ GConf2.spec	22 Sep 2007 05:03:11 -0000	1.66
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
@@ -23,6 +23,8 @@
 BuildRequires: perl(XML::Parser)
 BuildRequires: libtool, autoconf, automake
 BuildRequires: intltool
+# for patch0
+Requires: /usr/bin/killall
 
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
@@ -131,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Require /usr/bin/killall, since gconftool uses it
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Sat Sep 22 05:57:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 22 Sep 2007 01:57:35 -0400
Subject: rpms/gnome-applets/devel gweather-pc.patch, NONE,
	1.1 gnome-applets.spec, 1.242, 1.243
Message-ID: <200709220557.l8M5vZ7Z012970@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12945

Modified Files:
	gnome-applets.spec 
Added Files:
	gweather-pc.patch 
Log Message:
fix gweather.pc file


gweather-pc.patch:

--- NEW FILE gweather-pc.patch ---
diff -up gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc gnome-applets-2.20.0/libgweather/gweather.pc.in
--- gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc	2007-09-22 01:32:03.000000000 -0400
+++ gnome-applets-2.20.0/libgweather/gweather.pc.in	2007-09-22 01:32:14.000000000 -0400
@@ -7,5 +7,5 @@ Name: GWeather
 Description: GWeather shared library
 Version: @VERSION@
 Requires: gtk+-2.0, gnome-vfs-2.0
-Libs: -L${libdir}
+Libs: -L${libdir} -lgweather
 Cflags: -I${includedir}


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- gnome-applets.spec	20 Sep 2007 00:17:15 -0000	1.242
+++ gnome-applets.spec	22 Sep 2007 05:57:00 -0000	1.243
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -62,6 +62,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
 Patch35:	gnome-applets-2.20.0-mixer-out-of-sync.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=479172
+Patch36:	gweather-pc.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -161,6 +164,7 @@
 pushd mixer/
 %patch35 -p0 -b .mixer-sync
 popd
+%patch36 -p1 -b .gweather-pc
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -338,6 +342,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
+- Make the gweather.pc file less useless
+
 * Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
 - Add patch to avoid the volume scale getting out-of sync with the 
   real hardware volume



From fedora-extras-commits at redhat.com  Sat Sep 22 06:34:39 2007
From: fedora-extras-commits at redhat.com (Yuan Yijun (bbbush))
Date: Sat, 22 Sep 2007 02:34:39 -0400
Subject: comps/po zh_CN.po,1.5,1.6
Message-ID: <200709220634.l8M6YdM4019882@cvs-int.fedora.redhat.com>

Author: bbbush

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19865/po

Modified Files:
	zh_CN.po 
Log Message:
217t: before f8 translation freeze


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 zh_CN.po
Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zh_CN.po	17 Sep 2007 19:22:12 -0000	1.5
+++ zh_CN.po	22 Sep 2007 06:34:08 -0000	1.6
@@ -1,11 +1,3 @@
-# translation of zh_CN.po to 
-# translation of zh_CN.po to
-# translation of zh_CN.po to
-# translation of zh_CN.po to
-# translation of zh_CN.po to Chinese, Simplified
-# translation of zh_CN.po to Simplified Chinese
-# translation of zh_CN.po to zh_CN
-# translation of comps-po.po to Simplified Chinese
 # Simplified Chinese Version of comps.po.
 # Copyright (C) 2002 Red Hat Inc.
 # This file is distributed under the same license as the PACKAGE package.
@@ -13,24 +5,24 @@
 # Tony Fu <tfu at redhat.com>, 2004, 2006.
 # Leah Liu <weliu at redhat.com>, 2005, 2006.
 # Xi Huang <xhuang at redhat.com>, 2006.
+# Tony Fu <tfu at redhat.com>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2006-12-07 09:08+1000\n"
-"Last-Translator: Tony Fu <tfu at redhat.com>\n"
+"PO-Revision-Date: 2007-09-22 14:33+0800\n"
+"Last-Translator: Yuan Yijun <bbbush at fedoraproject.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"
-"X-Generator: KBabel 1.9.1\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -49,15 +41,13 @@
 
 #: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
 #: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
-#, fuzzy
 msgid "Arabic Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
 #: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
-#, fuzzy
 msgid "Armenian Support"
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
 #: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
@@ -102,12 +92,12 @@
 #: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
 #: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr ""
+msgstr "???????????????????????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
@@ -164,9 +154,8 @@
 
 #: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64
 #: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
-#, fuzzy
 msgid "Hardware Support"
-msgstr "??????????????????"
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
 #: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
@@ -182,11 +171,10 @@
 
 #: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
 #: ../comps-f8.xml.in.h:74
-#, fuzzy
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "?????????????????????????????? GTK+ ??? GNOME ????????????????????????"
+msgstr "?????????????????????????????? GTK+ ??? XFCE ????????????????????????"
 
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
 #: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
@@ -269,7 +257,7 @@
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -326,10 +314,9 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-#, fuzzy
 msgid ""
 "These packages are helpful when developing web applications or web pages."
-msgstr "???????????????????????????????????? X ??????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
 #: ../comps-el5.xml.in.h:51
@@ -400,37 +387,37 @@
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
+msgstr "??????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr ""
+msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
-msgstr ""
+msgstr "????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -452,9 +439,8 @@
 
 #: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
 #: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
-#, fuzzy
 msgid "Web Development"
-msgstr "??????"
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
 #: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
@@ -464,7 +450,7 @@
 #: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187
 #: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Window Managers"
-msgstr ""
+msgstr "???????????????"
 
 #: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
 #: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
@@ -479,13 +465,12 @@
 #: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
 #: ../comps-f8.xml.in.h:199
 msgid "XFCE"
-msgstr ""
+msgstr "XFCE"
 
 #: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192
 #: ../comps-f8.xml.in.h:200
[...4147 lines suppressed...]
-#~ "\">fonts-oriya</packagereq> <packagereq type=\"mandatory\">m17n-db-oriya</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
-#~ "group> <group> <id>polish-support</id> <_name>???????????????</_name> "
-#~ "<_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-pa-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Punjabi</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>Romanian "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-pa-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Punjabi</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>????????????"
-#~ "?????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ru-RU</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-ru</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-KOI8-R</packagereq> <packagereq type=\"mandatory\">fonts-KOI8-R-"
-#~ "100dpi</packagereq> <packagereq type=\"default\">fonts-KOI8-R-75dpi</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>Serbian Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ru-RU</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-ru</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-KOI8-R</packagereq> <packagereq type=\"mandatory\">fonts-KOI8-R-"
-#~ "100dpi</packagereq> <packagereq type=\"default\">fonts-KOI8-R-75dpi</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>?????????????????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>Slovak Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>?????????????????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>Sound and Video</_name> "
-#~ "<_description>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 ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>???????????????</_name> <_description>????????????"
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Telugu "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Telugu ??????"
-#~ "???</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>Turkish "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>??????????????????"
-#~ "</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>Core</_name> <_description>Smallest "
-#~ "possible installation"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>??????</_name> <_description>???????????????"
-#~ "??????"



From fedora-extras-commits at redhat.com  Sat Sep 22 07:04:08 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 03:04:08 -0400
Subject: rpms/libid3tag/EL-5 libid3tag.spec,1.13,1.14
Message-ID: <200709220704.l8M748jl029217@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libid3tag/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29192

Modified Files:
	libid3tag.spec 
Log Message:
Sync with devel


Index: libid3tag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libid3tag/EL-5/libid3tag.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libid3tag.spec	28 Aug 2006 06:37:14 -0000	1.13
+++ libid3tag.spec	22 Sep 2007 07:03:33 -0000	1.14
@@ -1,10 +1,10 @@
 Name:           libid3tag
 Version:        0.15.1b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.underbit.com/products/mad/
 Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,7 +16,7 @@
 both ID3v1 and the various versions of ID3v2.
 
 %package        devel
-Summary:        libid3tag development files
+Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.1b-4
+- License: GPLv2+
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.1b-3
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sat Sep 22 07:43:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 03:43:34 -0400
Subject: rpms/bash-completion/devel
	bash-completion-20060301-perl-299571.patch, 
	NONE, 1.1 bash-completion.spec, 1.20, 1.21
Message-ID: <200709220743.l8M7hYK5032129@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-20060301-perl-299571.patch 
Log Message:
* 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).


bash-completion-20060301-perl-299571.patch:

--- NEW FILE bash-completion-20060301-perl-299571.patch ---
--- bash_completion~	2007-09-22 10:35:56.000000000 +0300
+++ bash_completion	2007-09-22 10:37:56.000000000 +0300
@@ -5196,8 +5196,8 @@
 	    ;;
     esac
 
-    # handle case where first parameter is not a dash option
-    if [ $COMP_CWORD -eq 1 ] && [[ "$cur" != -* ]]; then
+    # handle non-dash options
+    if [[ "$cur" != -* ]]; then
 	_filedir
 	return 0
     fi


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bash-completion.spec	13 Aug 2007 19:32:59 -0000	1.20
+++ bash-completion.spec	22 Sep 2007 07:43:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -12,6 +12,7 @@
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20060301-scp-apos-217178.patch
 Patch1:         %{name}-20060301-debian.patch
+Patch2:         %{name}-20060301-perl-299571.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 %setup -q -n bash_completion
 %patch0
 %patch1
+%patch2
 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
@@ -182,6 +184,10 @@
 
 
 %changelog
+* 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+
 



From fedora-extras-commits at redhat.com  Sat Sep 22 07:56:29 2007
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sat, 22 Sep 2007 03:56:29 -0400
Subject: rpms/aspell-he/devel sources,1.3,1.4 aspell-he.spec,1.3,1.4
Message-ID: <200709220756.l8M7uTXI032454@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32426

Modified Files:
	sources aspell-he.spec 
Log Message:
Clean spec file according to bug #212974



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2006 07:08:23 -0000	1.3
+++ sources	22 Sep 2007 07:55:57 -0000	1.4
@@ -1,2 +1 @@
-f453989e1df364af9479e893c16ac9d8  aspell6-he-0.9-0.tar.bz2
 71791e0299787391d2ace1c850b5b434  aspell6-he-1.0-0.tar.bz2


Index: aspell-he.spec
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/aspell-he.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-he.spec	16 Sep 2006 17:13:40 -0000	1.3
+++ aspell-he.spec	22 Sep 2007 07:55:57 -0000	1.4
@@ -29,22 +29,15 @@
 %setup -q -n aspell6-%{lang}-%{version}-%{langrelease}
 
 %build
-cat > Makefile <<EOF
-ASPELL = aspell
-DEST_DIR = $RPM_BUILD_ROOT
-WORD_LIST_COMPRESS = word-list-compress
-PREZIP = prezip
-dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
-datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
-EOF
-cat Makefile.pre >> Makefile
-make
+./configure
+make %{?_smp_mflags}
 
 %install
-make install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -52,6 +45,8 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Sun Apr  1 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-3
+- Clean spec file according to lessons from Bug #212974.
 * Sat Sep 16 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-2
 - Rebuild for Fedora Extras 6
 * Mon May 15 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-1



From fedora-extras-commits at redhat.com  Sat Sep 22 08:03:20 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:03:20 -0400
Subject: rpms/php-pear-DB/devel .cvsignore, 1.4, 1.5 php-pear-DB.spec, 1.9, 
	1.10 sources, 1.4, 1.5
Message-ID: <200709220803.l8M83Kdx006674@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6510

Modified Files:
	.cvsignore php-pear-DB.spec sources 
Log Message:
update to 1.7.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jul 2007 08:57:58 -0000	1.4
+++ .cvsignore	22 Sep 2007 08:02:47 -0000	1.5
@@ -1 +1 @@
-DB-1.7.12.tgz
+DB-1.7.13.tgz


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/php-pear-DB.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- php-pear-DB.spec	23 Aug 2007 17:32:15 -0000	1.9
+++ php-pear-DB.spec	22 Sep 2007 08:02:48 -0000	1.10
@@ -2,8 +2,8 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.12
-Release:        2%{?dist}
+Version:        1.7.13
+Release:        1%{?dist}
 Summary:        PEAR: Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -47,21 +47,22 @@
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+cd %{pear_name}-%{version}
 # update run test suite
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/run.cvs >run1
+    tests/run.cvs >run1
 
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests/driver@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/driver/run.cvs >run2
+    tests/driver/run.cvs >run2
 
 sed -e "s@// 'sqlite'@'sqlite'@" \
-    %{pear_name}-%{version}/tests/driver/setup.inc.cvs >setup.inc
+    tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -86,9 +87,13 @@
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Install new test suite
-install -pm 755 ../run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
-install -pm 755 ../run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
-install -pm 644 ../setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+install -pm 755 run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
+install -pm 755 run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
+install -pm 644 setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+
+mv docdir/%{pear_name}/doc/TESTERS .
+iconv -f ISO-8859-1 -t UTF-8  TESTERS -o docdir/%{pear_name}/doc/TESTERS
+touch -r TESTERS docdir/%{pear_name}/doc/TESTERS
 
 
 %clean
@@ -126,6 +131,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.13-1
+- update to 1.7.13
+- fix TEXTERS encoding
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-2
 - Fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jul 2007 08:57:58 -0000	1.4
+++ sources	22 Sep 2007 08:02:48 -0000	1.5
@@ -1 +1 @@
-b86134520d473db3c5fb87b68a820037  DB-1.7.12.tgz
+39b451245941a7059511a852f18b4946  DB-1.7.13.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:11:28 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:11:28 -0400
Subject: rpms/php-pear-DB/F-7 php-pear-DB.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200709220811.l8M8BS5W006881@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-DB/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6861

Modified Files:
	php-pear-DB.spec sources 
Log Message:
update to 1.7.13


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/php-pear-DB.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear-DB.spec	23 Aug 2007 17:34:39 -0000	1.8
+++ php-pear-DB.spec	22 Sep 2007 08:10:55 -0000	1.9
@@ -2,8 +2,8 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.12
-Release:        2%{?dist}
+Version:        1.7.13
+Release:        1%{?dist}
 Summary:        PEAR: Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -47,21 +47,22 @@
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+cd %{pear_name}-%{version}
 # update run test suite
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/run.cvs >run1
+    tests/run.cvs >run1
 
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests/driver@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/driver/run.cvs >run2
+    tests/driver/run.cvs >run2
 
 sed -e "s@// 'sqlite'@'sqlite'@" \
-    %{pear_name}-%{version}/tests/driver/setup.inc.cvs >setup.inc
+    tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -86,9 +87,13 @@
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Install new test suite
-install -pm 755 ../run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
-install -pm 755 ../run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
-install -pm 644 ../setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+install -pm 755 run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
+install -pm 755 run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
+install -pm 644 setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+
+mv docdir/%{pear_name}/doc/TESTERS .
+iconv -f ISO-8859-1 -t UTF-8  TESTERS -o docdir/%{pear_name}/doc/TESTERS
+touch -r TESTERS docdir/%{pear_name}/doc/TESTERS
 
 
 %clean
@@ -126,6 +131,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.13-1
+- update to 1.7.13
+- fix TEXTERS encoding
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-2
 - Fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 17:34:39 -0000	1.4
+++ sources	22 Sep 2007 08:10:55 -0000	1.5
@@ -1 +1 @@
-b86134520d473db3c5fb87b68a820037  DB-1.7.12.tgz
+39b451245941a7059511a852f18b4946  DB-1.7.13.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:13:45 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 04:13:45 -0400
Subject: rpms/gcc/devel gcc41-pr33506.patch,NONE,1.1 gcc41.spec,1.174,1.175
Message-ID: <200709220813.l8M8Dj6O006975@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33506.patch 
Log Message:
4.1.2-26

gcc41-pr33506.patch:

--- NEW FILE gcc41-pr33506.patch ---
2007-09-21  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33506
	* langhooks.h (struct lang_hooks_for_types): Add type_hash_eq
	field.
	* langhooks.c (lhd_type_hash_eq): New function.
	* langhooks-def.h (lhd_type_hash_eq): New prototype.
	(LANG_HOOKS_TYPE_HASH_EQ): Define.
	(LANG_HOOKS_FOR_TYPES_INITIALIZER): Add LANG_HOOKS_TYPE_HASH_EQ.
	* tree.c (type_hash_eq): For FUNCTION_TYPE use
	lang_hooks.type.type_hash_eq in addition to generic tests.

	* cp-tree.h (cxx_type_hash_eq): New prototype.
	* cp-objcp-common.h (LANG_HOOKS_TYPE_HASH_EQ): Redefine.
	* tree.c (cxx_type_hash_eq): New function.

	* g++.dg/ext/attrib29.C: New test.

--- gcc/langhooks.h.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.h	2007-09-22 03:46:10.000000000 -0400
@@ -148,6 +148,10 @@ struct lang_hooks_for_types
      firstprivate variables.  */
   void (*omp_firstprivatize_type_sizes) (struct gimplify_omp_ctx *, tree);
 
+  /* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+     Called only after doing all language independent checks.  */
+  bool (*type_hash_eq) (tree, tree);
+
   /* Nonzero if types that are identical are to be hashed so that only
      one copy is kept.  If a language requires unique types for each
      user-specified type, such as Ada, this should be set to TRUE.  */
--- gcc/langhooks.c.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.c	2007-09-22 03:46:10.000000000 -0400
@@ -411,6 +411,16 @@ lhd_tree_dump_type_quals (tree t)
 /* lang_hooks.expr_size: Determine the size of the value of an expression T
    in a language-specific way.  Returns a tree for the size in bytes.  */
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  */
+
+bool
+lhd_type_hash_eq (tree typea ATTRIBUTE_UNUSED,
+		  tree typeb ATTRIBUTE_UNUSED)
+{
+  return true;
+}
+
 tree
 lhd_expr_size (tree exp)
 {
--- gcc/langhooks-def.h.jj	2007-02-20 16:39:13.000000000 -0500
+++ gcc/langhooks-def.h	2007-09-22 03:46:56.000000000 -0400
@@ -70,6 +70,7 @@ extern tree lhd_expr_size (tree);
 extern size_t lhd_tree_size (enum tree_code);
 extern HOST_WIDE_INT lhd_to_target_charset (HOST_WIDE_INT);
 extern tree lhd_expr_to_decl (tree, bool *, bool *, bool *);
+extern bool lhd_type_hash_eq (tree, tree);
 
 /* Declarations of default tree inlining hooks.  */
 extern tree lhd_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
@@ -220,6 +221,7 @@ extern tree lhd_make_node (enum tree_cod
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
 #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \
   lhd_omp_firstprivatize_type_sizes
+#define LANG_HOOKS_TYPE_HASH_EQ		lhd_type_hash_eq
 #define LANG_HOOKS_HASH_TYPES		true
 
 #define LANG_HOOKS_FOR_TYPES_INITIALIZER { \
@@ -234,6 +236,7 @@ extern tree lhd_make_node (enum tree_cod
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
   LANG_HOOKS_TYPE_MAX_SIZE, \
   LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES, \
+  LANG_HOOKS_TYPE_HASH_EQ, \
   LANG_HOOKS_HASH_TYPES \
 }
 
--- gcc/tree.c.jj	2007-04-03 07:18:26.000000000 -0400
+++ gcc/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -4168,17 +4168,21 @@ type_hash_eq (const void *va, const void
 				      TYPE_FIELDS (b->type))));
 
     case FUNCTION_TYPE:
-      return (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
-	      || (TYPE_ARG_TYPES (a->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
-		  && TYPE_ARG_TYPES (b->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
-		  && type_list_equal (TYPE_ARG_TYPES (a->type),
-				      TYPE_ARG_TYPES (b->type))));
+      if (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
+	  || (TYPE_ARG_TYPES (a->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
+	      && TYPE_ARG_TYPES (b->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
+	      && type_list_equal (TYPE_ARG_TYPES (a->type),
+				  TYPE_ARG_TYPES (b->type))))
+	break;
+      return 0;
 
     default:
       return 0;
     }
+
+  return lang_hooks.types.type_hash_eq (a->type, b->type);
 }
 
 /* Return the cached hash value.  */
--- gcc/cp/cp-tree.h.jj	2007-06-26 07:57:09.000000000 -0400
+++ gcc/cp/cp-tree.h	2007-09-22 03:50:22.000000000 -0400
@@ -4421,7 +4421,8 @@ extern tree cp_add_pending_fn_decls		(vo
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
 extern tree rvalue                              (tree);
-   
+extern bool cxx_type_hash_eq			(tree, tree);
+
 /* in typeck.c */
 extern int string_conv_p			(tree, tree, int);
 extern tree cp_truthvalue_conversion		(tree);
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 16:37:34.000000000 -0500
+++ gcc/cp/cp-objcp-common.h	2007-09-22 03:49:38.000000000 -0400
@@ -85,6 +85,8 @@ extern tree objcp_tsubst_copy_and_build 
 #define LANG_HOOKS_WRITE_GLOBALS lhd_do_nothing
 #undef LANG_HOOKS_COMDAT_GROUP
 #define LANG_HOOKS_COMDAT_GROUP cxx_comdat_group
+#undef LANG_HOOKS_TYPE_HASH_EQ                                                                                          
+#define LANG_HOOKS_TYPE_HASH_EQ cxx_type_hash_eq
 
 #undef LANG_HOOKS_FUNCTION_INIT
 #define LANG_HOOKS_FUNCTION_INIT cxx_push_function_context
--- gcc/cp/tree.c.jj	2007-03-12 03:28:01.000000000 -0400
+++ gcc/cp/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -1959,6 +1959,22 @@ cp_build_type_attribute_variant (tree ty
   return new_type;
 }
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  Only
+   to check TYPE_RAISES_EXCEPTIONS for FUNCTION_TYPE, the rest is already
+   compared in type_hash_eq.  */
+
+bool
+cxx_type_hash_eq (tree typea, tree typeb)
+{
+  if (TREE_CODE (typea) != FUNCTION_TYPE
+      || TYPE_RAISES_EXCEPTIONS (typea) == TYPE_RAISES_EXCEPTIONS (typeb))
+    return true;
+
+  return comp_except_specs (TYPE_RAISES_EXCEPTIONS (typea),
+			    TYPE_RAISES_EXCEPTIONS (typeb), 1);
+}
+
 /* Apply FUNC to all language-specific sub-trees of TP in a pre-order
    traversal.  Called from walk_tree.  */
 
--- gcc/testsuite/g++.dg/ext/attrib29.C.jj	2007-09-22 03:46:10.000000000 -0400
+++ gcc/testsuite/g++.dg/ext/attrib29.C	2007-09-22 03:46:10.000000000 -0400
@@ -0,0 +1,10 @@
+// PR c++/33506
+// { dg-do compile }
+
+extern int f1 (char *) __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw () __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw ();
+
+extern int f3 (char *) __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw () __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw ();


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- gcc41.spec	17 Sep 2007 21:03:53 -0000	1.174
+++ gcc41.spec	22 Sep 2007 08:13:13 -0000	1.175
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 25
+%define gcc_release 26
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -154,6 +154,7 @@
 Patch38: gcc41-pr27954.patch
 Patch39: gcc41-pr33423.patch
 Patch40: gcc41-scanf-fmt-check.patch
+Patch41: gcc41-pr33506.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -477,6 +478,7 @@
 %patch38 -p0 -b .pr27954~
 %patch39 -p0 -b .pr33423~
 %patch40 -p0 -b .scanf-fmt-check~
+%patch41 -p0 -b .pr33506~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1631,6 +1633,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
+- don't ignore throw specification of function types in type hashing
+  (PR c++/33506)
+
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until
   expand time and at that point it can avoid a call (PR middle-end/33423)



From fedora-extras-commits at redhat.com  Sat Sep 22 08:58:01 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:58:01 -0400
Subject: rpms/php-pecl-memcache/devel .cvsignore, 1.2,
	1.3 php-pecl-memcache.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709220858.l8M8w1HD008364@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8335

Modified Files:
	.cvsignore php-pecl-memcache.spec sources 
Log Message:
new version 2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 13:24:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 08:57:29 -0000	1.3
@@ -1 +1 @@
-memcache-2.1.2.tgz
+memcache-2.2.0.tgz


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-memcache.spec	31 Aug 2007 13:24:25 -0000	1.1
+++ php-pecl-memcache.spec	22 Sep 2007 08:57:29 -0000	1.2
@@ -5,7 +5,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.1.2
+Version:      2.2.0
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -16,7 +16,7 @@
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, php-pear, zlib-devel
+BuildRequires: php-devel >= 4.3.11, php-pear, zlib-devel
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
@@ -35,6 +35,7 @@
 This extension allows you to work with memcached through
 handy OO and procedural interfaces.
 
+Memcache can be used as a PHP session handler.
 
 %prep 
 %setup -c -q
@@ -63,21 +64,21 @@
 
 ; Whether to transparently failover to other servers on errors
 ;memcache.allow_failover=1
-
 ; Defines how many servers to try when setting and getting data.
 ;memcache.max_failover_attempts=20
-
 ; Data will be transferred in chunks of this size
 ;memcache.chunk_size=8192
-
 ; The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
+; Hash function {crc32, fnv}
+;memcache.hash_function=crc32
+; Hash strategy {standard, consistent}
+;memcache.hash_strategy=standard
 
 ; Options to use the memcache session handler
 
 ; Use memcache as a session handler
 ;session.save_handler=memcache
-
 ; Defines a comma separated of server urls to use for session storage
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
 EOF
@@ -115,6 +116,10 @@
 
 
 %changelog
+* Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
+- new version
+- add new INI directives (hash_strategy + hash_function) to config.
+
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 13:24:25 -0000	1.2
+++ sources	22 Sep 2007 08:57:29 -0000	1.3
@@ -1 +1 @@
-cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz
+a9820139a4465bae9b2d9c3772ef9ba7  memcache-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:59:27 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:59:27 -0400
Subject: rpms/php-pecl-memcache/devel php-pecl-memcache.spec,1.2,1.3
Message-ID: <200709220859.l8M8xRY4008394@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8370

Modified Files:
	php-pecl-memcache.spec 
Log Message:
more changelog info


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-memcache.spec	22 Sep 2007 08:57:29 -0000	1.2
+++ php-pecl-memcache.spec	22 Sep 2007 08:58:55 -0000	1.3
@@ -118,7 +118,8 @@
 %changelog
 * Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
 - new version
-- add new INI directives (hash_strategy + hash_function) to config.
+- add new INI directives (hash_strategy + hash_function) to config
+- add BR on php-devel >= 4.3.11 
 
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM



From fedora-extras-commits at redhat.com  Sat Sep 22 09:16:53 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 05:16:53 -0400
Subject: rpms/php-pecl-memcache/F-7 php-pecl-memcache.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709220916.l8M9Grpv015486@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15462

Modified Files:
	php-pecl-memcache.spec sources 
Log Message:
update to new version 2.2.0


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-7/php-pecl-memcache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-memcache.spec	31 Aug 2007 13:33:51 -0000	1.1
+++ php-pecl-memcache.spec	22 Sep 2007 09:16:21 -0000	1.2
@@ -5,7 +5,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.1.2
+Version:      2.2.0
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -16,7 +16,7 @@
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, php-pear, zlib-devel
+BuildRequires: php-devel >= 4.3.11, php-pear, zlib-devel
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
@@ -35,6 +35,7 @@
 This extension allows you to work with memcached through
 handy OO and procedural interfaces.
 
+Memcache can be used as a PHP session handler.
 
 %prep 
 %setup -c -q
@@ -63,21 +64,21 @@
 
 ; Whether to transparently failover to other servers on errors
 ;memcache.allow_failover=1
-
 ; Defines how many servers to try when setting and getting data.
 ;memcache.max_failover_attempts=20
-
 ; Data will be transferred in chunks of this size
 ;memcache.chunk_size=8192
-
 ; The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
+; Hash function {crc32, fnv}
+;memcache.hash_function=crc32
+; Hash strategy {standard, consistent}
+;memcache.hash_strategy=standard
 
 ; Options to use the memcache session handler
 
 ; Use memcache as a session handler
 ;session.save_handler=memcache
-
 ; Defines a comma separated of server urls to use for session storage
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
 EOF
@@ -115,6 +116,11 @@
 
 
 %changelog
+* Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
+- new version
+- add new INI directives (hash_strategy + hash_function) to config
+- add BR on php-devel >= 4.3.11 
+
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 13:33:51 -0000	1.2
+++ sources	22 Sep 2007 09:16:21 -0000	1.3
@@ -1 +1 @@
-cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz
+a9820139a4465bae9b2d9c3772ef9ba7  memcache-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 10:10:14 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 22 Sep 2007 06:10:14 -0400
Subject: rpms/gcompris/devel gcompris-8.4-fullscreen2.patch, NONE,
	1.1 gcompris.spec, 1.29, 1.30
Message-ID: <200709221010.l8MAAEBo024918@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24879

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.4-fullscreen2.patch 
Log Message:
* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
- Fix keyboard not working in fullscreen mode


gcompris-8.4-fullscreen2.patch:

--- NEW FILE gcompris-8.4-fullscreen2.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c~ gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c~	2007-09-22 10:48:14.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c	2007-09-22 10:48:14.000000000 +0200
@@ -977,6 +977,7 @@ void gc_fullscreen_set(gboolean state)
         gdk_window_set_override_redirect (window->window, 1);
         gdk_window_set_keep_above (window->window, 1);
         gdk_window_raise (window->window);
+        gdk_window_focus (window->window, GDK_CURRENT_TIME);
       }
       else
 #endif
@@ -1885,11 +1885,11 @@ main (int argc, char *argv[])
 
   setup_window ();
 
+  gtk_widget_show_all (window);
+
   if (properties->fullscreen)
     gc_fullscreen_set(properties->fullscreen);
 
-  gtk_widget_show_all (window);
-
   /* If a specific activity is selected, skeep the intro music */
   if(!popt_root_menu)
     {


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcompris.spec	11 Sep 2007 22:10:16 -0000	1.29
+++ gcompris.spec	22 Sep 2007 10:09:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -10,6 +10,7 @@
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 Patch2:         gcompris-8.4-configure-bugfix.patch
 Patch3:         gcompris-8.4-fullscreen.patch
+Patch4:         gcompris-8.4-fullscreen2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -260,6 +261,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
 mv tmp docs/C/%{name}.info
 
@@ -505,6 +507,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
+- Fix keyboard not working in fullscreen mode
+
 * Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
 - New upstream release 8.4
 - Drop -flags sub-package, the idea was that by putting the flags in a



From fedora-extras-commits at redhat.com  Sat Sep 22 11:14:29 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Sat, 22 Sep 2007 07:14:29 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-acl.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, NONE,
	1.1 thinkfinger-0.3-has-device.patch, NONE, 1.1 thinkfinger.spec,
	1.3, 1.4
Message-ID: <200709221114.l8MBETYu032351@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32308

Modified Files:
	thinkfinger.spec 
Added Files:
	thinkfinger-0.3-acl.patch thinkfinger-0.3-hal.patch 
	thinkfinger-0.3-has-device.patch 
Log Message:
* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)


thinkfinger-0.3-acl.patch:

--- NEW FILE thinkfinger-0.3-acl.patch ---
--- thinkfinger-0.3/configure.in.acl	2007-09-22 11:58:47.000000000 +0200
+++ thinkfinger-0.3/configure.in	2007-09-22 12:02:10.000000000 +0200
@@ -82,6 +82,20 @@
 # Check for pthread
 AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], AC_MSG_ERROR([libpthread missing]))
 
+# Check for libacl
+AC_CHECK_HEADERS(sys/acl.h)
+AC_CHECK_LIB(acl, acl_set_file, [ACL_LIBS="-lacl"], AC_MSG_ERROR([libacl missing]))
+AC_SUBST(ACL_LIBS)
+
+AC_ARG_ENABLE(console-perms,
+  [  --enable-console-perms=[auto/no/yes]  Enable console perms [default=auto]],,
+  enable_console_perms=auto)
+if test "x$enable_console_perms" = "xyes"; then
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, true)
+else
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, false)
+fi
+
 # Check for libusb using pkg-config
 PKG_CHECK_MODULES(USB, libusb >= 0.1.11, usb_found=yes, AC_MSG_ERROR([libusb missing]))
 
@@ -181,6 +195,7 @@
 AC_CONFIG_FILES([Makefile
 		README
 		INSTALL
+		data/Makefile
 		docs/Makefile
 		docs/autodocs/Makefile
 		libthinkfinger/Makefile
--- thinkfinger-0.3/config.h.in.acl	2007-03-30 10:23:56.000000000 +0200
+++ thinkfinger-0.3/config.h.in	2007-09-22 13:01:00.000000000 +0200
@@ -45,6 +45,9 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* Define to 1 if you have the <sys/acl.h> header file. */
+#undef HAVE_SYS_ACL_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
--- thinkfinger-0.3/configure.acl	2007-09-22 11:58:58.000000000 +0200
+++ thinkfinger-0.3/configure	2007-09-22 12:02:22.000000000 +0200
@@ -870,6 +870,9 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
+ACL_LIBS
+USE_CONSOLE_PERMS_TRUE
+USE_CONSOLE_PERMS_FALSE
 PKG_CONFIG
 USB_CFLAGS
 USB_LIBS
@@ -1499,6 +1502,7 @@
   --with-securedir=dir    Where to put PAM module [default=$libdir/security]
   --with-birdir=dir       Where to put the biometric identification records
                           (bir files) [default=$sysconfdir/pam_thinkfinger]
+  --enable-console-perms=auto/no/yes  Enable console perms default=auto
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4410,7 +4414,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4413 "configure"' > conftest.$ac_ext
+  echo '#line 4417 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7141,11 +7145,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7148: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7148: \$? = $ac_status" >&5
+   echo "$as_me:7152: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7409,11 +7413,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7412: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7416: \$? = $ac_status" >&5
+   echo "$as_me:7420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7513,11 +7517,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7520: \$? = $ac_status" >&5
+   echo "$as_me:7524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9821,7 +9825,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9824 "configure"
+#line 9828 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9921,7 +9925,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9924 "configure"
+#line 9928 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12257,11 +12261,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12264: \$? = $ac_status" >&5
+   echo "$as_me:12268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12361,11 +12365,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12368: \$? = $ac_status" >&5
+   echo "$as_me:12372: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13931,11 +13935,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13938: \$? = $ac_status" >&5
+   echo "$as_me:13942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14035,11 +14039,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14038: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14042: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14042: \$? = $ac_status" >&5
+   echo "$as_me:14046: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16233,11 +16237,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16240: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16240: \$? = $ac_status" >&5
+   echo "$as_me:16244: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16501,11 +16505,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16508: \$? = $ac_status" >&5
+   echo "$as_me:16512: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16605,11 +16609,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16612: \$? = $ac_status" >&5
+   echo "$as_me:16616: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20169,6 +20173,250 @@
 fi
 
 
+# Check for libacl
+
+for ac_header in sys/acl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------- ##
+## Report this to http://thinkfinger.sourceforge.net/ ##
+## -------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for acl_set_file in -lacl" >&5
+echo $ECHO_N "checking for acl_set_file in -lacl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lacl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_set_file ();
+int
+main ()
+{
+return acl_set_file ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_acl_acl_set_file=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_acl_acl_set_file=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_set_file" >&5
+echo "${ECHO_T}$ac_cv_lib_acl_acl_set_file" >&6; }
+if test $ac_cv_lib_acl_acl_set_file = yes; then
+  ACL_LIBS="-lacl"
+else
+  { { echo "$as_me:$LINENO: error: libacl missing" >&5
+echo "$as_me: error: libacl missing" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --enable-console-perms was given.
+if test "${enable_console_perms+set}" = set; then
+  enableval=$enable_console_perms;
+else
+  enable_console_perms=auto
+fi
+
+if test "x$enable_console_perms" = "xyes"; then
+   if true; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+else
+   if false; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+fi
+
 # Check for libusb using pkg-config
 
 
@@ -20511,7 +20759,7 @@
 
 
 # AC_CONFIG_FILES
-ac_config_files="$ac_config_files Makefile README INSTALL docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
+ac_config_files="$ac_config_files Makefile README INSTALL data/Makefile docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
 
 
 # Configuration
@@ -20663,6 +20911,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_PAM_TRUE}" && test -z "${BUILD_PAM_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -21149,6 +21411,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "README") CONFIG_FILES="$CONFIG_FILES README" ;;
     "INSTALL") CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/autodocs/Makefile" ;;
     "libthinkfinger/Makefile") CONFIG_FILES="$CONFIG_FILES libthinkfinger/Makefile" ;;
@@ -21359,6 +21622,9 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
+ACL_LIBS!$ACL_LIBS$ac_delim
+USE_CONSOLE_PERMS_TRUE!$USE_CONSOLE_PERMS_TRUE$ac_delim
+USE_CONSOLE_PERMS_FALSE!$USE_CONSOLE_PERMS_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 USB_CFLAGS!$USB_CFLAGS$ac_delim
 USB_LIBS!$USB_LIBS$ac_delim
@@ -21380,7 +21646,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- thinkfinger-0.3/data/60-thinkfinger.perms.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/60-thinkfinger.perms	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,2 @@
+<uinput>=/dev/uinput /dev/misc/uinput /dev/input/uinput
+<console> 0600 <uinput> 0600 root
--- thinkfinger-0.3/data/Makefile.am.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+if USE_CONSOLE_PERMS
+consolepermsdir = $(sysconfdir)/security/console.perms.d
+consoleperms_DATA = 60-thinkfinger.perms
+endif
+
+EXTRA_DIST = 60-thinkfinger.perms
--- thinkfinger-0.3/data/Makefile.in.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+consolepermsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINDIR = @BINDIR@
+BIRDIR = @BIRDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANDIR = @MANDIR@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PREFIX = @PREFIX@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SBINDIR = @SBINDIR@
+SECUREDIR = @SECUREDIR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at USE_CONSOLE_PERMS_TRUE@consolepermsdir = $(sysconfdir)/security/console.perms.d
+ at USE_CONSOLE_PERMS_TRUE@consoleperms_DATA = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-consolepermsDATA: $(consoleperms_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(consolepermsdir)" || $(MKDIR_P) "$(DESTDIR)$(consolepermsdir)"
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(consolepermsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  $(consolepermsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+
+uninstall-consolepermsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(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:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-consolepermsDATA
+
+install-dvi: install-dvi-am
+
+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
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-consolepermsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-consolepermsDATA install-data install-data-am \
+	install-dvi 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-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+
+# 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:
--- thinkfinger-0.3/Makefile.am.acl	2007-09-22 11:59:32.000000000 +0200
+++ thinkfinger-0.3/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -1,5 +1,5 @@
-if BUILD_PAM 
+if BUILD_PAM
   PAM_SUBDIR=pam
 endif
 
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
--- thinkfinger-0.3/Makefile.in.acl	2007-09-22 11:59:41.000000000 +0200
+++ thinkfinger-0.3/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -60,7 +60,7 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = docs libthinkfinger tf-tool pam
+DIST_SUBDIRS = data docs libthinkfinger tf-tool pam
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -73,6 +73,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -191,7 +192,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_PAM_TRUE at PAM_SUBDIR = pam
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
--- thinkfinger-0.3/tf-tool/Makefile.am.acl	2007-09-22 12:00:14.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
--- thinkfinger-0.3/tf-tool/Makefile.in.acl	2007-09-22 12:00:03.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -47,7 +47,8 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_tf_tool_OBJECTS = tf_tool-tf-tool.$(OBJEXT)
 tf_tool_OBJECTS = $(am_tf_tool_OBJECTS)
-tf_tool_DEPENDENCIES =  \
+am__DEPENDENCIES_1 =
+tf_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libthinkfinger/libthinkfinger.la
 tf_tool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(tf_tool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -70,6 +71,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -189,7 +191,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
 all: all-am
 
--- thinkfinger-0.3/tf-tool/tf-tool.c.acl	2007-09-22 12:21:37.000000000 +0200
+++ thinkfinger-0.3/tf-tool/tf-tool.c	2007-09-22 12:21:45.000000000 +0200
@@ -1,4 +1,5 @@
- /*   tf-test - A simple example for libthinkfinger
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+  *   tf-test - A simple example for libthinkfinger
   *
   *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
   *   fingerprint reader.
@@ -22,12 +23,18 @@
   *
   */
 
+#include <config.h>
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <libgen.h>
 #include <pwd.h>
 
-#include <config.h>
+#ifdef HAVE_SYS_ACL_H
+#include <acl/libacl.h>
+#endif
+
 #include <libthinkfinger.h>
 
 #define MODE_UNDEFINED 0
@@ -318,6 +325,146 @@
 	return retval;
 }
 
+static int
+set_permissions_for_user (const char *path,
+			  const char *username)
+{
+#ifdef HAVE_SYS_ACL_H
+	int res;
+	struct passwd *p;
+	acl_t acl;
+	acl_entry_t entry;
+	acl_permset_t permset;
+	uid_t uid;
+
+	/* this is so that a user is able to read his/her own file
+	 * when reauthenticating via the screensaver etc. */
+	p = getpwnam (username);
+	uid = p->pw_uid;
+
+	fprintf (stderr, "Setting ACL on aquired file: %s.\n",
+		 path);
+
+	res = -1;
+
+	acl = acl_init (4);
+
+	/* User Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_WRITE) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Group Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_GROUP_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Others */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_OTHER) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Mask */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_MASK) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* User */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER) == -1) {
+		goto out;
+	}
+	if (acl_set_qualifier (entry, &uid) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	res = acl_set_file (path, ACL_TYPE_ACCESS, acl);
+
+ out:
+	acl_free (acl);
+	if (res != 0) {
+		fprintf (stderr, "Unable to set ACL of aquired file: %s: %s\n",
+			 path,
+			 strerror (errno));
+	}
+
+	return res;
+#else
+	return -1;
+#endif
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -329,6 +476,8 @@
 	const char *user;
 #endif
 
+	user = NULL;
+
 	printf ("%s\n", BANNER);
 
 	if (argc == 1) {
@@ -472,13 +621,18 @@
 
 	}
 	if (tfdata.mode == MODE_ACQUIRE) {
+		umask (0077);
 		retval = acquire (&tfdata);
+		if (retval == 0 && user != NULL) {
+			set_permissions_for_user (tfdata.bir, user);
+		}
 	} else if (tfdata.mode == MODE_VERIFY) {
 		retval = verify (&tfdata);
 	} else {
 		usage (argv[0]);
 		retval = -1;
 	}
+
 out:
 	exit (retval);
 }

thinkfinger-0.3-hal.patch:

--- NEW FILE thinkfinger-0.3-hal.patch ---
--- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- Grant access to the fingerprint reader device to logged-in users.  Required
+         for gnome-screensaver (which runs as the user) to successfully initialize
+         pam_thinkfinger. -->
+
+    <match key="usb_device.vendor_id" int="1155"> <!-- SGS Thomson Microelectronics -->
+      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
--- thinkfinger-0.3/data/Makefile.am.hal	2007-09-22 12:40:48.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:41:33.000000000 +0200
@@ -4,5 +4,8 @@
 consolepermsdir = $(sysconfdir)/security/console.perms.d
 consoleperms_DATA = 60-thinkfinger.perms
 endif
+ 
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
--- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
@@ -49,9 +49,11 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
+	"$(DESTDIR)$(halpolicydir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA)
+halpolicyDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -174,7 +176,9 @@
 top_srcdir = @top_srcdir@
 @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
-EXTRA_DIST = 60-thinkfinger.perms
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
 all: all-am
 
 .SUFFIXES:
@@ -230,6 +234,23 @@
 	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
 	done
+install-halpolicyDATA: $(halpolicy_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(halpolicydir)" || $(MKDIR_P) "$(DESTDIR)$(halpolicydir)"
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(halpolicyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  $(halpolicyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
+
+uninstall-halpolicyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -267,7 +288,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -312,7 +333,7 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA
 
 install-dvi: install-dvi-am
 
@@ -346,7 +367,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 .MAKE: install-am install-strip
 
@@ -355,12 +376,13 @@
 	dvi-am html html-am info info-am install install-am \
 	install-consolepermsDATA install-data install-data-am \
 	install-dvi 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-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+	install-halpolicyDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 # 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.

thinkfinger-0.3-has-device.patch:

--- NEW FILE thinkfinger-0.3-has-device.patch ---
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.c.has-device	2007-03-30 10:57:24.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
  *   fingerprint reader.
  *
@@ -41,6 +42,14 @@
 #define DEFAULT_BULK_SIZE 0x40
 #define INITIAL_SEQUENCE  0x60
 
+#ifndef        FALSE
+#define        FALSE   (0)
+#endif
+
+#ifndef        TRUE
+#define        TRUE    (!FALSE)
+#endif
+
 static char init_a[17] = {
 	0x43, 0x69, 0x61, 0x6f, 0x04, 0x00, 0x08, 0x01,
 	0x00, 0xe8, 0x03, 0x00, 0x00, 0xff, 0x07, 0xdb,
@@ -405,6 +414,20 @@
 	return;
 }
 
+int libthinkfinger_has_device (libthinkfinger *tf)
+{
+	struct usb_device *usb_dev;
+	int retval;
+
+	retval = FALSE;
+	usb_dev = _libthinkfinger_usb_device_find ();
+	if (usb_dev != NULL) {
+		retval = TRUE;
+	}
+
+	return retval;
+}
+
 static libthinkfinger_init_status _libthinkfinger_usb_init (libthinkfinger *tf)
 {
 	libthinkfinger_init_status retval = TF_INIT_UNDEFINED;
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.h.has-device	2007-03-30 10:22:02.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.h	2007-09-22 12:32:24.000000000 +0200
@@ -165,6 +165,16 @@
  */
 libthinkfinger *libthinkfinger_new(libthinkfinger_init_status* init_status);
 
+/** @brief check to see if a scanner device is present
+ *
+ * check to see if a scanner device is present
+ *
+ * @param tf struct libthinkfinger
+ *
+ * @return TRUE if a device is present
+ */
+int libthinkfinger_has_device(libthinkfinger *tf);
+
 /** @brief free an instance of libthinkfinger
  *
  * @param tf pointer to struct libthinkfinger
--- thinkfinger-0.3/pam/pam_thinkfinger.c.has-device	2007-03-29 17:00:45.000000000 +0200
+++ thinkfinger-0.3/pam/pam_thinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,6 @@
-/*   ThinkFinger Pluggable Authentication Module
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *   ThinkFinger Pluggable Authentication Module
  *
  *   PAM module for libthinkfinger which is a driver for the UPEK/SGS Thomson
  *   Microelectronics fingerprint reader.
@@ -158,14 +160,13 @@
 		pam_thinkfinger->swipe_retval = PAM_AUTH_ERR;
 		pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 				     "User '%s' verification failed (0x%x).", pam_thinkfinger->user, tf_state);
-		goto out;
 	}
 
 	ret = uinput_cr (&pam_thinkfinger->uinput_fd);
 	if (ret != 0)
 		pam_thinkfinger_log (pam_thinkfinger, LOG_ERR,
 				     "Could not send carriage return via uinput: %s.", strerror (ret));
-out:
+
 	pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 			     "%s returning '%d': %s.", __FUNCTION__, pam_thinkfinger->swipe_retval,
 			     pam_thinkfinger->swipe_retval ? pam_strerror (pam_thinkfinger->pamh, pam_thinkfinger->swipe_retval) : "success");
@@ -258,6 +259,15 @@
 		goto out;
 	}
 
+	ret = libthinkfinger_has_device (pam_thinkfinger.tf);
+	if (! ret) {
+		retval = PAM_AUTHINFO_UNAVAIL;
+
+		if (pam_thinkfinger.tf)
+			libthinkfinger_free (pam_thinkfinger.tf);
+		goto out;
+	}
+
 	ret = pthread_create (&pam_thinkfinger.t_pam_prompt, NULL, (void *) &pam_prompt_thread, &pam_thinkfinger);
 	if (ret != 0) {
 		pam_thinkfinger_log (&pam_thinkfinger, LOG_ERR, "Error calling pthread_create (%s).", strerror (ret));


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thinkfinger.spec	26 Aug 2007 08:12:10 -0000	1.3
+++ thinkfinger.spec	22 Sep 2007 11:13:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -8,10 +8,15 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        README.thinkfinger
 Patch0:         thinkfinger-0.3-birdir.patch
+Patch1:         thinkfinger-0.3-acl.patch
+Patch2:         thinkfinger-0.3-has-device.patch
+Patch3:         thinkfinger-0.3-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
+BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
+Requires:       hal
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -57,12 +62,19 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .securitydir
+# Preserve the timestamp on the autoconf source file
+touch -r configure.in configure.in.stamp
+%patch1 -p1 -b .acl
+touch -r configure.in.stamp configure.in
+%patch2 -p1 -b .has-device
+%patch3 -p1 -b .hal
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
 %build
-%configure --disable-static\
-           --with-securedir=/%{_lib}/security
+%configure --disable-static \
+           --with-securedir=/%{_lib}/security \
+           --enable-console-perms=yes
 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}
@@ -82,7 +94,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/thinkfinger.modules <<EOF
 #!/bin/sh
-modprobe uinput >/dev/null 2>&1
+/sbin/modprobe uinput >/dev/null 2>&1
 EOF
 
 
@@ -102,6 +114,8 @@
 %{_mandir}/man1/tf-tool.1.gz
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
+%{_sysconfdir}/security/console.perms.d/*
+%{_datadir}/hal/fdi/information/20thirdparty/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -114,6 +128,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
+- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-3
 - Adjusted License tag as per latest guidelines
 



From fedora-extras-commits at redhat.com  Sat Sep 22 11:19:21 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Sat, 22 Sep 2007 07:19:21 -0400
Subject: rpms/thinkfinger/F-7 thinkfinger-0.3-acl.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, NONE,
	1.1 thinkfinger-0.3-has-device.patch, NONE, 1.1 thinkfinger.spec,
	1.2, 1.3
Message-ID: <200709221119.l8MBJL0l032536@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/thinkfinger/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32509

Modified Files:
	thinkfinger.spec 
Added Files:
	thinkfinger-0.3-acl.patch thinkfinger-0.3-hal.patch 
	thinkfinger-0.3-has-device.patch 
Log Message:
* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)


thinkfinger-0.3-acl.patch:

--- NEW FILE thinkfinger-0.3-acl.patch ---
--- thinkfinger-0.3/configure.in.acl	2007-09-22 11:58:47.000000000 +0200
+++ thinkfinger-0.3/configure.in	2007-09-22 12:02:10.000000000 +0200
@@ -82,6 +82,20 @@
 # Check for pthread
 AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], AC_MSG_ERROR([libpthread missing]))
 
+# Check for libacl
+AC_CHECK_HEADERS(sys/acl.h)
+AC_CHECK_LIB(acl, acl_set_file, [ACL_LIBS="-lacl"], AC_MSG_ERROR([libacl missing]))
+AC_SUBST(ACL_LIBS)
+
+AC_ARG_ENABLE(console-perms,
+  [  --enable-console-perms=[auto/no/yes]  Enable console perms [default=auto]],,
+  enable_console_perms=auto)
+if test "x$enable_console_perms" = "xyes"; then
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, true)
+else
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, false)
+fi
+
 # Check for libusb using pkg-config
 PKG_CHECK_MODULES(USB, libusb >= 0.1.11, usb_found=yes, AC_MSG_ERROR([libusb missing]))
 
@@ -181,6 +195,7 @@
 AC_CONFIG_FILES([Makefile
 		README
 		INSTALL
+		data/Makefile
 		docs/Makefile
 		docs/autodocs/Makefile
 		libthinkfinger/Makefile
--- thinkfinger-0.3/config.h.in.acl	2007-03-30 10:23:56.000000000 +0200
+++ thinkfinger-0.3/config.h.in	2007-09-22 13:01:00.000000000 +0200
@@ -45,6 +45,9 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* Define to 1 if you have the <sys/acl.h> header file. */
+#undef HAVE_SYS_ACL_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
--- thinkfinger-0.3/configure.acl	2007-09-22 11:58:58.000000000 +0200
+++ thinkfinger-0.3/configure	2007-09-22 12:02:22.000000000 +0200
@@ -870,6 +870,9 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
+ACL_LIBS
+USE_CONSOLE_PERMS_TRUE
+USE_CONSOLE_PERMS_FALSE
 PKG_CONFIG
 USB_CFLAGS
 USB_LIBS
@@ -1499,6 +1502,7 @@
   --with-securedir=dir    Where to put PAM module [default=$libdir/security]
   --with-birdir=dir       Where to put the biometric identification records
                           (bir files) [default=$sysconfdir/pam_thinkfinger]
+  --enable-console-perms=auto/no/yes  Enable console perms default=auto
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4410,7 +4414,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4413 "configure"' > conftest.$ac_ext
+  echo '#line 4417 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7141,11 +7145,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7148: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7148: \$? = $ac_status" >&5
+   echo "$as_me:7152: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7409,11 +7413,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7412: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7416: \$? = $ac_status" >&5
+   echo "$as_me:7420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7513,11 +7517,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7520: \$? = $ac_status" >&5
+   echo "$as_me:7524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9821,7 +9825,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9824 "configure"
+#line 9828 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9921,7 +9925,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9924 "configure"
+#line 9928 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12257,11 +12261,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12264: \$? = $ac_status" >&5
+   echo "$as_me:12268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12361,11 +12365,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12368: \$? = $ac_status" >&5
+   echo "$as_me:12372: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13931,11 +13935,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13938: \$? = $ac_status" >&5
+   echo "$as_me:13942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14035,11 +14039,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14038: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14042: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14042: \$? = $ac_status" >&5
+   echo "$as_me:14046: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16233,11 +16237,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16240: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16240: \$? = $ac_status" >&5
+   echo "$as_me:16244: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16501,11 +16505,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16508: \$? = $ac_status" >&5
+   echo "$as_me:16512: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16605,11 +16609,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16612: \$? = $ac_status" >&5
+   echo "$as_me:16616: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20169,6 +20173,250 @@
 fi
 
 
+# Check for libacl
+
+for ac_header in sys/acl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------- ##
+## Report this to http://thinkfinger.sourceforge.net/ ##
+## -------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for acl_set_file in -lacl" >&5
+echo $ECHO_N "checking for acl_set_file in -lacl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lacl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_set_file ();
+int
+main ()
+{
+return acl_set_file ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_acl_acl_set_file=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_acl_acl_set_file=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_set_file" >&5
+echo "${ECHO_T}$ac_cv_lib_acl_acl_set_file" >&6; }
+if test $ac_cv_lib_acl_acl_set_file = yes; then
+  ACL_LIBS="-lacl"
+else
+  { { echo "$as_me:$LINENO: error: libacl missing" >&5
+echo "$as_me: error: libacl missing" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --enable-console-perms was given.
+if test "${enable_console_perms+set}" = set; then
+  enableval=$enable_console_perms;
+else
+  enable_console_perms=auto
+fi
+
+if test "x$enable_console_perms" = "xyes"; then
+   if true; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+else
+   if false; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+fi
+
 # Check for libusb using pkg-config
 
 
@@ -20511,7 +20759,7 @@
 
 
 # AC_CONFIG_FILES
-ac_config_files="$ac_config_files Makefile README INSTALL docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
+ac_config_files="$ac_config_files Makefile README INSTALL data/Makefile docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
 
 
 # Configuration
@@ -20663,6 +20911,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_PAM_TRUE}" && test -z "${BUILD_PAM_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -21149,6 +21411,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "README") CONFIG_FILES="$CONFIG_FILES README" ;;
     "INSTALL") CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/autodocs/Makefile" ;;
     "libthinkfinger/Makefile") CONFIG_FILES="$CONFIG_FILES libthinkfinger/Makefile" ;;
@@ -21359,6 +21622,9 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
+ACL_LIBS!$ACL_LIBS$ac_delim
+USE_CONSOLE_PERMS_TRUE!$USE_CONSOLE_PERMS_TRUE$ac_delim
+USE_CONSOLE_PERMS_FALSE!$USE_CONSOLE_PERMS_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 USB_CFLAGS!$USB_CFLAGS$ac_delim
 USB_LIBS!$USB_LIBS$ac_delim
@@ -21380,7 +21646,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- thinkfinger-0.3/data/60-thinkfinger.perms.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/60-thinkfinger.perms	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,2 @@
+<uinput>=/dev/uinput /dev/misc/uinput /dev/input/uinput
+<console> 0600 <uinput> 0600 root
--- thinkfinger-0.3/data/Makefile.am.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+if USE_CONSOLE_PERMS
+consolepermsdir = $(sysconfdir)/security/console.perms.d
+consoleperms_DATA = 60-thinkfinger.perms
+endif
+
+EXTRA_DIST = 60-thinkfinger.perms
--- thinkfinger-0.3/data/Makefile.in.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+consolepermsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINDIR = @BINDIR@
+BIRDIR = @BIRDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANDIR = @MANDIR@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PREFIX = @PREFIX@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SBINDIR = @SBINDIR@
+SECUREDIR = @SECUREDIR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at USE_CONSOLE_PERMS_TRUE@consolepermsdir = $(sysconfdir)/security/console.perms.d
+ at USE_CONSOLE_PERMS_TRUE@consoleperms_DATA = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-consolepermsDATA: $(consoleperms_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(consolepermsdir)" || $(MKDIR_P) "$(DESTDIR)$(consolepermsdir)"
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(consolepermsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  $(consolepermsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+
+uninstall-consolepermsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(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:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-consolepermsDATA
+
+install-dvi: install-dvi-am
+
+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
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-consolepermsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-consolepermsDATA install-data install-data-am \
+	install-dvi 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-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+
+# 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:
--- thinkfinger-0.3/Makefile.am.acl	2007-09-22 11:59:32.000000000 +0200
+++ thinkfinger-0.3/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -1,5 +1,5 @@
-if BUILD_PAM 
+if BUILD_PAM
   PAM_SUBDIR=pam
 endif
 
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
--- thinkfinger-0.3/Makefile.in.acl	2007-09-22 11:59:41.000000000 +0200
+++ thinkfinger-0.3/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -60,7 +60,7 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = docs libthinkfinger tf-tool pam
+DIST_SUBDIRS = data docs libthinkfinger tf-tool pam
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -73,6 +73,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -191,7 +192,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_PAM_TRUE at PAM_SUBDIR = pam
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
--- thinkfinger-0.3/tf-tool/Makefile.am.acl	2007-09-22 12:00:14.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
--- thinkfinger-0.3/tf-tool/Makefile.in.acl	2007-09-22 12:00:03.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -47,7 +47,8 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_tf_tool_OBJECTS = tf_tool-tf-tool.$(OBJEXT)
 tf_tool_OBJECTS = $(am_tf_tool_OBJECTS)
-tf_tool_DEPENDENCIES =  \
+am__DEPENDENCIES_1 =
+tf_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libthinkfinger/libthinkfinger.la
 tf_tool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(tf_tool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -70,6 +71,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -189,7 +191,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
 all: all-am
 
--- thinkfinger-0.3/tf-tool/tf-tool.c.acl	2007-09-22 12:21:37.000000000 +0200
+++ thinkfinger-0.3/tf-tool/tf-tool.c	2007-09-22 12:21:45.000000000 +0200
@@ -1,4 +1,5 @@
- /*   tf-test - A simple example for libthinkfinger
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+  *   tf-test - A simple example for libthinkfinger
   *
   *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
   *   fingerprint reader.
@@ -22,12 +23,18 @@
   *
   */
 
+#include <config.h>
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <libgen.h>
 #include <pwd.h>
 
-#include <config.h>
+#ifdef HAVE_SYS_ACL_H
+#include <acl/libacl.h>
+#endif
+
 #include <libthinkfinger.h>
 
 #define MODE_UNDEFINED 0
@@ -318,6 +325,146 @@
 	return retval;
 }
 
+static int
+set_permissions_for_user (const char *path,
+			  const char *username)
+{
+#ifdef HAVE_SYS_ACL_H
+	int res;
+	struct passwd *p;
+	acl_t acl;
+	acl_entry_t entry;
+	acl_permset_t permset;
+	uid_t uid;
+
+	/* this is so that a user is able to read his/her own file
+	 * when reauthenticating via the screensaver etc. */
+	p = getpwnam (username);
+	uid = p->pw_uid;
+
+	fprintf (stderr, "Setting ACL on aquired file: %s.\n",
+		 path);
+
+	res = -1;
+
+	acl = acl_init (4);
+
+	/* User Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_WRITE) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Group Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_GROUP_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Others */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_OTHER) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Mask */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_MASK) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* User */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER) == -1) {
+		goto out;
+	}
+	if (acl_set_qualifier (entry, &uid) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	res = acl_set_file (path, ACL_TYPE_ACCESS, acl);
+
+ out:
+	acl_free (acl);
+	if (res != 0) {
+		fprintf (stderr, "Unable to set ACL of aquired file: %s: %s\n",
+			 path,
+			 strerror (errno));
+	}
+
+	return res;
+#else
+	return -1;
+#endif
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -329,6 +476,8 @@
 	const char *user;
 #endif
 
+	user = NULL;
+
 	printf ("%s\n", BANNER);
 
 	if (argc == 1) {
@@ -472,13 +621,18 @@
 
 	}
 	if (tfdata.mode == MODE_ACQUIRE) {
+		umask (0077);
 		retval = acquire (&tfdata);
+		if (retval == 0 && user != NULL) {
+			set_permissions_for_user (tfdata.bir, user);
+		}
 	} else if (tfdata.mode == MODE_VERIFY) {
 		retval = verify (&tfdata);
 	} else {
 		usage (argv[0]);
 		retval = -1;
 	}
+
 out:
 	exit (retval);
 }

thinkfinger-0.3-hal.patch:

--- NEW FILE thinkfinger-0.3-hal.patch ---
--- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- Grant access to the fingerprint reader device to logged-in users.  Required
+         for gnome-screensaver (which runs as the user) to successfully initialize
+         pam_thinkfinger. -->
+
+    <match key="usb_device.vendor_id" int="1155"> <!-- SGS Thomson Microelectronics -->
+      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
--- thinkfinger-0.3/data/Makefile.am.hal	2007-09-22 12:40:48.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:41:33.000000000 +0200
@@ -4,5 +4,8 @@
 consolepermsdir = $(sysconfdir)/security/console.perms.d
 consoleperms_DATA = 60-thinkfinger.perms
 endif
+ 
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
--- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
@@ -49,9 +49,11 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
+	"$(DESTDIR)$(halpolicydir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA)
+halpolicyDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -174,7 +176,9 @@
 top_srcdir = @top_srcdir@
 @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
-EXTRA_DIST = 60-thinkfinger.perms
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
 all: all-am
 
 .SUFFIXES:
@@ -230,6 +234,23 @@
 	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
 	done
+install-halpolicyDATA: $(halpolicy_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(halpolicydir)" || $(MKDIR_P) "$(DESTDIR)$(halpolicydir)"
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(halpolicyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  $(halpolicyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
+
+uninstall-halpolicyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -267,7 +288,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -312,7 +333,7 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA
 
 install-dvi: install-dvi-am
 
@@ -346,7 +367,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 .MAKE: install-am install-strip
 
@@ -355,12 +376,13 @@
 	dvi-am html html-am info info-am install install-am \
 	install-consolepermsDATA install-data install-data-am \
 	install-dvi 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-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+	install-halpolicyDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 # 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.

thinkfinger-0.3-has-device.patch:

--- NEW FILE thinkfinger-0.3-has-device.patch ---
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.c.has-device	2007-03-30 10:57:24.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
  *   fingerprint reader.
  *
@@ -41,6 +42,14 @@
 #define DEFAULT_BULK_SIZE 0x40
 #define INITIAL_SEQUENCE  0x60
 
+#ifndef        FALSE
+#define        FALSE   (0)
+#endif
+
+#ifndef        TRUE
+#define        TRUE    (!FALSE)
+#endif
+
 static char init_a[17] = {
 	0x43, 0x69, 0x61, 0x6f, 0x04, 0x00, 0x08, 0x01,
 	0x00, 0xe8, 0x03, 0x00, 0x00, 0xff, 0x07, 0xdb,
@@ -405,6 +414,20 @@
 	return;
 }
 
+int libthinkfinger_has_device (libthinkfinger *tf)
+{
+	struct usb_device *usb_dev;
+	int retval;
+
+	retval = FALSE;
+	usb_dev = _libthinkfinger_usb_device_find ();
+	if (usb_dev != NULL) {
+		retval = TRUE;
+	}
+
+	return retval;
+}
+
 static libthinkfinger_init_status _libthinkfinger_usb_init (libthinkfinger *tf)
 {
 	libthinkfinger_init_status retval = TF_INIT_UNDEFINED;
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.h.has-device	2007-03-30 10:22:02.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.h	2007-09-22 12:32:24.000000000 +0200
@@ -165,6 +165,16 @@
  */
 libthinkfinger *libthinkfinger_new(libthinkfinger_init_status* init_status);
 
+/** @brief check to see if a scanner device is present
+ *
+ * check to see if a scanner device is present
+ *
+ * @param tf struct libthinkfinger
+ *
+ * @return TRUE if a device is present
+ */
+int libthinkfinger_has_device(libthinkfinger *tf);
+
 /** @brief free an instance of libthinkfinger
  *
  * @param tf pointer to struct libthinkfinger
--- thinkfinger-0.3/pam/pam_thinkfinger.c.has-device	2007-03-29 17:00:45.000000000 +0200
+++ thinkfinger-0.3/pam/pam_thinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,6 @@
-/*   ThinkFinger Pluggable Authentication Module
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *   ThinkFinger Pluggable Authentication Module
  *
  *   PAM module for libthinkfinger which is a driver for the UPEK/SGS Thomson
  *   Microelectronics fingerprint reader.
@@ -158,14 +160,13 @@
 		pam_thinkfinger->swipe_retval = PAM_AUTH_ERR;
 		pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 				     "User '%s' verification failed (0x%x).", pam_thinkfinger->user, tf_state);
-		goto out;
 	}
 
 	ret = uinput_cr (&pam_thinkfinger->uinput_fd);
 	if (ret != 0)
 		pam_thinkfinger_log (pam_thinkfinger, LOG_ERR,
 				     "Could not send carriage return via uinput: %s.", strerror (ret));
-out:
+
 	pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 			     "%s returning '%d': %s.", __FUNCTION__, pam_thinkfinger->swipe_retval,
 			     pam_thinkfinger->swipe_retval ? pam_strerror (pam_thinkfinger->pamh, pam_thinkfinger->swipe_retval) : "success");
@@ -258,6 +259,15 @@
 		goto out;
 	}
 
+	ret = libthinkfinger_has_device (pam_thinkfinger.tf);
+	if (! ret) {
+		retval = PAM_AUTHINFO_UNAVAIL;
+
+		if (pam_thinkfinger.tf)
+			libthinkfinger_free (pam_thinkfinger.tf);
+		goto out;
+	}
+
 	ret = pthread_create (&pam_thinkfinger.t_pam_prompt, NULL, (void *) &pam_prompt_thread, &pam_thinkfinger);
 	if (ret != 0) {
 		pam_thinkfinger_log (&pam_thinkfinger, LOG_ERR, "Error calling pthread_create (%s).", strerror (ret));


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkfinger/F-7/thinkfinger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkfinger.spec	4 Aug 2007 13:44:00 -0000	1.2
+++ thinkfinger.spec	22 Sep 2007 11:18:49 -0000	1.3
@@ -1,17 +1,22 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
-License:        GPL
+License:        GPLv2+
 URL:            http://thinkfinger.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        README.thinkfinger
 Patch0:         thinkfinger-0.3-birdir.patch
+Patch1:         thinkfinger-0.3-acl.patch
+Patch2:         thinkfinger-0.3-has-device.patch
+Patch3:         thinkfinger-0.3-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
+BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
+Requires:       hal
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -57,12 +62,19 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .securitydir
+# Preserve the timestamp on the autoconf source file
+touch -r configure.in configure.in.stamp
+%patch1 -p1 -b .acl
+touch -r configure.in.stamp configure.in
+%patch2 -p1 -b .has-device
+%patch3 -p1 -b .hal
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
 %build
-%configure --disable-static\
-           --with-securedir=/%{_lib}/security
+%configure --disable-static \
+           --with-securedir=/%{_lib}/security \
+           --enable-console-perms=yes
 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}
@@ -82,7 +94,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/thinkfinger.modules <<EOF
 #!/bin/sh
-modprobe uinput >/dev/null 2>&1
+/sbin/modprobe uinput >/dev/null 2>&1
 EOF
 
 
@@ -102,6 +114,8 @@
 %{_mandir}/man1/tf-tool.1.gz
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
+%{_sysconfdir}/security/console.perms.d/*
+%{_datadir}/hal/fdi/information/20thirdparty/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -114,6 +128,12 @@
 
 
 %changelog
+* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
+- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-3
+- Adjusted License tag as per latest guidelines
+
 * Fri May 18 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-2
 - Merged Jose Plans' changes (RH #237817)
 



From fedora-extras-commits at redhat.com  Sat Sep 22 11:37:23 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sat, 22 Sep 2007 07:37:23 -0400
Subject: rpms/compiz-fusion/devel .cvsignore, 1.2, 1.3 compiz-fusion.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221137.l8MBbNOk000709@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv677

Modified Files:
	.cvsignore compiz-fusion.spec sources 
Log Message:
update to 0.6 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2007 19:10:29 -0000	1.2
+++ .cvsignore	22 Sep 2007 11:36:51 -0000	1.3
@@ -1 +1 @@
-compiz-fusion-plugins-main-0.5.2.tar.bz2
+compiz-fusion-plugins-main-09b700.tar.bz2


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-fusion.spec	19 Sep 2007 17:13:54 -0000	1.2
+++ compiz-fusion.spec	22 Sep 2007 11:36:51 -0000	1.3
@@ -1,14 +1,16 @@
 %define plugins animation colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
 
+%define snapshot 09b700
+
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 6%{?dist}
+Release: 7.%{snapshot}%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
 License: GPLv2+       
 URL: http://compiz-fusion.org            
-Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{version}.tar.bz2   
+Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{snapshot}.tar.bz2   
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
@@ -57,7 +59,7 @@
 
 
 %prep
-%setup -q -n %{name}-plugins-main-%{version}
+%setup -q -n %{name}-plugins-main-%{snapshot}
 
 %build
 %configure --enable-schemas
@@ -112,6 +114,7 @@
 %doc COPYING AUTHORS
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
+%{_datadir}/compiz/filters/
 
 %files  gnome
 %defattr(-,root,root,-)
@@ -124,6 +127,9 @@
 
 
 %changelog
+* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
+- Update to 0.6 branch (builds against current compiz)
+
 * Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6
 - Add animation to plugin list
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2007 19:10:29 -0000	1.2
+++ sources	22 Sep 2007 11:36:51 -0000	1.3
@@ -1 +1 @@
-cb5703d8e59697dd6c7b075c483e81cc  compiz-fusion-plugins-main-0.5.2.tar.bz2
+08e13a2a2124666437cc4553bd0053a8  compiz-fusion-plugins-main-09b700.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 11:39:08 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sat, 22 Sep 2007 07:39:08 -0400
Subject: rpms/compiz-fusion-extras/devel .cvsignore, 1.2,
	1.3 compiz-fusion-extras.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709221139.l8MBd8Hw000928@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv903

Modified Files:
	.cvsignore compiz-fusion-extras.spec sources 
Log Message:
update to 0.6 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2007 19:06:43 -0000	1.2
+++ .cvsignore	22 Sep 2007 11:38:36 -0000	1.3
@@ -1 +1 @@
-compiz-fusion-plugins-extra-0.5.2.tar.bz2
+compiz-fusion-plugins-extra-6871d0.tar.bz2


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-fusion-extras.spec	18 Sep 2007 19:06:43 -0000	1.1
+++ compiz-fusion-extras.spec	22 Sep 2007 11:38:36 -0000	1.2
@@ -1,14 +1,16 @@
 %define plugins addhelper bench crashhandler cubecaps cubereflex extrawm fadedesktop firepaint gears goto-viewport group mblur reflex scalefilter showdesktop splash trailfocus widget
 
+%define snapshot 6871d0
+
 Name: compiz-fusion-extras
 Version: 0.5.2       
-Release: 5%{?dist}
+Release: 6.%{snapshot}%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
 License: GPLv2+       
 URL: http://compiz-fusion.org            
-Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{version}.tar.bz2   
+Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{snapshot}.tar.bz2   
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
@@ -48,7 +50,7 @@
 
 
 %prep
-%setup -q -n compiz-fusion-plugins-extra-%{version}
+%setup -q -n compiz-fusion-plugins-extra-%{snapshot}
 
 %build
 %configure --enable-schemas
@@ -101,12 +103,16 @@
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
 %{_datadir}/compiz/reflection.png
+%{_datadir}/compiz/*.png
 
 %files gnome
 %defattr(-,root,root,-)
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
+- Update to 0.6 branch (builds against current compiz)
+
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
 - Fix gconf schemas install (RH #53692)
 - Some build fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2007 19:06:43 -0000	1.2
+++ sources	22 Sep 2007 11:38:36 -0000	1.3
@@ -1 +1 @@
-866a4e5decb8b40df6bd0161dbd24a53  compiz-fusion-plugins-extra-0.5.2.tar.bz2
+c2044f8cd85b90a9e920717ddd8f76bd  compiz-fusion-plugins-extra-6871d0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 11:46:15 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Sat, 22 Sep 2007 07:46:15 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.690, 1.691 kernel.spec, 1.177,
	1.178 linux-2.6-execshield.patch, 1.72,
	1.73 linux-2.6-highres-timers.patch, 1.9,
	1.10 linux-2.6-utrace-ptrace-compat.patch, 1.6,
	1.7 linux-2.6-utrace-regset.patch, 1.6,
	1.7 linux-2.6-utrace-tracehook.patch, 1.11, 1.12 sources, 1.652,
	1.653 upstream, 1.574, 1.575 patch-2.6.23-rc7-git1.bz2.sign, 1.1, NONE
Message-ID: <200709221146.l8MBkFOP001340@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1290

Modified Files:
	.cvsignore kernel.spec linux-2.6-execshield.patch 
	linux-2.6-highres-timers.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc7-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git1.bz2.sign 
Log Message:
* Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc7-git3



--- NEW FILE patch-2.6.23-rc7-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9L6jyGugalF9Dw4RAoGEAJ9B1kHctkPAhAzuj6LMOvpZGbGXGgCfYZS8
UZ6r3Q8+81Jh1I2Upf6L4ns=
=BhAR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- .cvsignore	20 Sep 2007 23:11:30 -0000	1.690
+++ .cvsignore	22 Sep 2007 11:45:40 -0000	1.691
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git1.bz2
+patch-2.6.23-rc7-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kernel.spec	21 Sep 2007 18:57:50 -0000	1.177
+++ kernel.spec	22 Sep 2007 11:45:40 -0000	1.178
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc7-git3
+
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Build dcdbas and dell_rbu modules on i586 (#216304)
 

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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- linux-2.6-execshield.patch	6 Sep 2007 17:34:27 -0000	1.72
+++ linux-2.6-execshield.patch	22 Sep 2007 11:45:40 -0000	1.73
@@ -1227,8 +1227,8 @@
 --- linux-2.6.orig/include/asm-x86_64/pgalloc.h
 +++ linux-2.6/include/asm-x86_64/pgalloc.h
 @@ -6,6 +6,13 @@
- #define QUICK_PGD 0	/* We preserve special mappings over free */
- #define QUICK_PT 1	/* Other page table pages that are zero on free */
+ #include <linux/threads.h>
+ #include <linux/mm.h>
  
 +#define arch_add_exec_range(mm, limit) \
 +		do { (void)(mm), (void)(limit); } while (0)

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-highres-timers.patch	4 Sep 2007 21:59:46 -0000	1.9
+++ linux-2.6-highres-timers.patch	22 Sep 2007 11:45:40 -0000	1.10
@@ -5350,9 +5350,9 @@
  
 +			tick_nohz_stop_sched_tick();
 +
- 			check_pgt_cache();
  			rmb();
  			idle = pm_idle;
+ 			if (!idle)
 @@ -229,6 +232,7 @@ void cpu_idle (void)
  			__exit_idle();
  		}

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-ptrace-compat.patch	11 Sep 2007 18:03:54 -0000	1.6
+++ linux-2.6-utrace-ptrace-compat.patch	22 Sep 2007 11:45:40 -0000	1.7
@@ -1300,8 +1300,8 @@
  #include <linux/pid_namespace.h>
 +#include <linux/ptrace.h>
  #include <linux/profile.h>
- #include <linux/signalfd.h>
  #include <linux/mount.h>
+ #include <linux/proc_fs.h>
 @@ -892,6 +893,8 @@ fastcall NORET_TYPE void do_exit(long co
  	tsk->flags |= PF_EXITING;
  	spin_unlock_irq(&tsk->pi_lock);

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-regset.patch	11 Sep 2007 18:03:55 -0000	1.6
+++ linux-2.6-utrace-regset.patch	22 Sep 2007 11:45:40 -0000	1.7
@@ -2161,8 +2161,8 @@
  /*
   * does not yet catch signals sent when the child dies.
 @@ -237,52 +241,61 @@ static int putreg(struct task_struct *ch
- 	if (test_tsk_thread_flag(child, TIF_IA32))
- 		value &= 0xffffffff;
+ 	unsigned long tmp; 
+ 	
  	switch (regno) {
 -		case offsetof(struct user_regs_struct,fs):
 -			if (value && (value & 3) != 3)

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-utrace-tracehook.patch	11 Sep 2007 18:03:55 -0000	1.11
+++ linux-2.6-utrace-tracehook.patch	22 Sep 2007 11:45:40 -0000	1.12
@@ -1652,8 +1652,8 @@
  #include <linux/pid_namespace.h>
 -#include <linux/ptrace.h>
  #include <linux/profile.h>
- #include <linux/signalfd.h>
  #include <linux/mount.h>
+ #include <linux/proc_fs.h>
 @@ -156,11 +156,12 @@ void release_task(struct task_struct * p
  {
  	struct task_struct *leader;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- sources	20 Sep 2007 23:11:30 -0000	1.652
+++ sources	22 Sep 2007 11:45:40 -0000	1.653
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-9100900b5ffef416784752ffaf0f50a1  patch-2.6.23-rc7-git1.bz2
+1bf67697b6630e24ad5cc844290d8d64  patch-2.6.23-rc7-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- upstream	20 Sep 2007 23:11:30 -0000	1.574
+++ upstream	22 Sep 2007 11:45:40 -0000	1.575
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git1.bz2
+patch-2.6.23-rc7-git3.bz2


--- patch-2.6.23-rc7-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 11:59:45 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (johan))
Date: Sat, 22 Sep 2007 04:59:45 -0700
Subject: [pkgdb] BackupPC Owned
Message-ID: <200709221159.l8MBxjYW032296@app4.fedora.phx.redhat.com>

Package BackupPC in Fedora 6 is now owned by Johan Cwiklinski (trasher)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/BackupPC



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:52 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:52 -0400
Subject: rpms/BackupPC/F-7 BackupPC.spec, 1.2, 1.3 sources, 1.2,
	1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7qaI007867@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/F-7

Modified Files:
	BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/F-7/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:20 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:20 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:56 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:56 -0400
Subject: rpms/BackupPC/FC-6 BackupPC.spec, 1.2, 1.3 sources, 1.2,
	1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7ub9007871@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/FC-6

Modified Files:
	BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/FC-6/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:23 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:23 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:58 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:58 -0400
Subject: rpms/BackupPC/devel .cvsignore, 1.2, 1.3 BackupPC.spec, 1.2,
	1.3 sources, 1.2, 1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7w0b007876@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/devel

Modified Files:
	.cvsignore BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2006 20:04:03 -0000	1.2
+++ .cvsignore	22 Sep 2007 12:07:26 -0000	1.3
@@ -1 +1 @@
-BackupPC-2.1.2.tar.gz
+BackupPC-3.0.0.tar.gz


Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:26 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:26 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:15:16 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Sat, 22 Sep 2007 08:15:16 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.68,
	1.69 selinux-policy.spec, 1.530, 1.531
Message-ID: <200709221215.l8MCFGwU008028@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8003

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
- Fix service start stop terminal avc's


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- policy-20070703.patch	21 Sep 2007 23:46:17 -0000	1.68
+++ policy-20070703.patch	22 Sep 2007 12:15:13 -0000	1.69
@@ -312,6 +312,49 @@
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-3.0.8/policy/modules/admin/alsa.if
+--- nsaserefpolicy/policy/modules/admin/alsa.if	2007-05-29 14:10:59.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-22 06:43:02.000000000 -0400
+@@ -74,3 +74,39 @@
+ 	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
+ 	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
+ ')
++
++########################################
++## <summary>
++##	search alsa lib config files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`alsa_search_lib',`
++	gen_require(`
++		type alsa_var_lib_t;
++	')
++
++	allow $1 alsa_var_lib_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++##	Read alsa lib config files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`alsa_read_lib',`
++	gen_require(`
++		type alsa_var_lib_t;
++	')
++
++	read_files_pattern($1,alsa_var_lib_t,alsa_var_lib_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-21 19:08:24.000000000 -0400
@@ -2429,7 +2472,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-21 14:29:01.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-22 08:10:42.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -2442,10 +2485,58 @@
  /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)
-+/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/input/uinput	-c	gen_context(system_u:object_r:event_device_t,s0)
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.0.8/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2007-06-15 14:54:30.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.if	2007-09-22 08:11:28.000000000 -0400
+@@ -1306,6 +1306,44 @@
+ 
+ ########################################
+ ## <summary>
++##	Get the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_getattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	Set the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file setattr;
++')
++
++########################################
++## <summary>
+ ##	Read input event devices (/dev/input).
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
@@ -3730,7 +3821,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.8/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/apache.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/apache.te	2007-09-22 07:26:32.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -6290,7 +6381,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-22 07:42:39.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6302,7 +6393,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,25 @@
+@@ -172,3 +176,26 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6325,6 +6416,7 @@
 +
 +	files_search_tmp($1)
 +	allow $1 self:process setfscreate;
++	selinux_validate_context($1)
 +	seutil_read_file_contexts($1)
 +	allow $1 krb5_host_rcache_t:file manage_file_perms;
 +')
@@ -6977,6 +7069,14 @@
  
  ########################################
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.8/policy/modules/services/networkmanager.fc
+--- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-09-12 10:34:50.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.fc	2007-09-22 07:16:25.000000000 -0400
+@@ -5,3 +5,4 @@
+ /var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
++/var/log/wpa_supplicant.log	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.8/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2007-06-15 14:54:33.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2007-09-20 08:50:57.000000000 -0400
@@ -7007,8 +7107,18 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-20 08:50:29.000000000 -0400
-@@ -20,7 +20,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-22 07:14:54.000000000 -0400
+@@ -13,6 +13,9 @@
+ type NetworkManager_var_run_t;
+ files_pid_file(NetworkManager_var_run_t)
+ 
++type NetworkManager_log_t;
++files_pid_file(NetworkManager_log_t)
++
+ ########################################
+ #
+ # Local policy
+@@ -20,7 +23,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
@@ -7017,7 +7127,17 @@
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
  allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
  allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
-@@ -138,6 +138,9 @@
+@@ -38,6 +41,9 @@
+ manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
+ files_pid_filetrans(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
+ 
++manage_files_pattern(NetworkManager_t,NetworkManager_log_t,NetworkManager_log_t)
++logging_log_filetrans(NetworkManager_t,NetworkManager_log_t, file)
++
+ kernel_read_system_state(NetworkManager_t)
+ kernel_read_network_state(NetworkManager_t)
+ kernel_read_kernel_sysctls(NetworkManager_t)
+@@ -138,6 +144,9 @@
  	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
  	dbus_connect_system_bus(NetworkManager_t)
  	dbus_send_system_bus(NetworkManager_t)
@@ -7027,7 +7147,7 @@
  ')
  
  optional_policy(`
-@@ -173,8 +176,10 @@
+@@ -173,8 +182,10 @@
  ')
  
  optional_policy(`
@@ -8015,7 +8135,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-22 07:43:42.000000000 -0400
 @@ -64,9 +64,10 @@
  fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
@@ -8028,25 +8148,32 @@
  
  files_read_etc_files(rlogind_t)
  files_read_etc_runtime_files(rlogind_t)
-@@ -82,7 +83,7 @@
+@@ -82,21 +83,17 @@
  
  miscfiles_read_localization(rlogind_t)
  
 -seutil_dontaudit_search_config(rlogind_t)
+-
+-sysnet_read_config(rlogind_t)
 +seutil_read_config(rlogind_t)
  
- sysnet_read_config(rlogind_t)
+ userdom_setattr_unpriv_users_ptys(rlogind_t)
+ # cjp: this is egregious
+ userdom_read_all_users_home_content_files(rlogind_t)
  
-@@ -93,7 +94,9 @@
  remotelogin_domtrans(rlogind_t)
++remotelogin_signal(rlogind_t)
  
  optional_policy(`
 +	kerberos_use(rlogind_t)
  	kerberos_read_keytab(rlogind_t)
+-')
+-
+-ifdef(`TODO',`
+-# Allow krb5 rlogind to use fork and open /dev/tty for use
+-allow rlogind_t userpty_type:chr_file setattr;
 +	kerberos_manage_host_rcache(rlogind_t)
  ')
- 
- ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.0.8/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2007-07-03 07:06:27.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rpcbind.te	2007-09-17 16:20:18.000000000 -0400
@@ -8920,7 +9047,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.0.8/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/sendmail.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/sendmail.te	2007-09-22 07:08:31.000000000 -0400
 @@ -20,19 +20,22 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -9460,7 +9587,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-22 07:45:00.000000000 -0400
 @@ -32,7 +32,6 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
@@ -9482,7 +9609,7 @@
  files_read_etc_files(telnetd_t)
  files_read_etc_runtime_files(telnetd_t)
  # for identd; cjp: this should probably only be inetd_child rules?
-@@ -80,9 +81,7 @@
+@@ -80,27 +81,26 @@
  
  miscfiles_read_localization(telnetd_t)
  
@@ -9493,7 +9620,9 @@
  
  remotelogin_domtrans(telnetd_t)
  
-@@ -90,17 +89,16 @@
++userdom_search_unpriv_users_home_dirs(telnetd_t)
++
+ # for identd; cjp: this should probably only be inetd_child rules?
  optional_policy(`
  	kerberos_use(telnetd_t)
  	kerberos_read_keytab(telnetd_t)
@@ -10565,7 +10694,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-21 16:37:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-22 08:12:19.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10601,7 +10730,16 @@
  ########################################
  #
  # PAM local policy
-@@ -159,6 +173,8 @@
+@@ -149,6 +163,8 @@
+ dev_setattr_apm_bios_dev(pam_console_t)
+ dev_getattr_dri_dev(pam_console_t)
+ dev_setattr_dri_dev(pam_console_t)
++dev_getattr_event_dev(pam_console_t)
++dev_setattr_event_dev(pam_console_t)
+ dev_getattr_framebuffer_dev(pam_console_t)
+ dev_setattr_framebuffer_dev(pam_console_t)
+ dev_getattr_generic_usb_dev(pam_console_t)
+@@ -159,6 +175,8 @@
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10610,7 +10748,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +252,7 @@
+@@ -236,7 +254,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10619,7 +10757,7 @@
  ')
  
  ########################################
-@@ -302,3 +318,28 @@
+@@ -302,3 +320,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -10829,8 +10967,22 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-17 16:20:18.000000000 -0400
-@@ -540,18 +540,19 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-22 07:07:39.000000000 -0400
+@@ -211,6 +211,13 @@
+ 			kernel_dontaudit_use_fds($1)
+ 		')
+ 	')
++	tunable_policy(`allow_daemons_use_tty',`
++	   term_use_all_user_ttys($1)
++	   term_use_all_user_ptys($1)
++	', `
++	   term_dontaudit_use_all_user_ttys($1)
++	   term_dontaudit_use_all_user_ptys($1)
++	 ')
+ ')
+ 
+ ########################################
+@@ -540,18 +547,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -10854,7 +11006,7 @@
  	')
  ')
  
-@@ -567,18 +568,46 @@
+@@ -567,18 +575,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -10905,7 +11057,7 @@
  	')
  ')
  
-@@ -609,11 +638,11 @@
+@@ -609,11 +645,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -10919,7 +11071,7 @@
  ')
  
  ########################################
-@@ -684,11 +713,11 @@
+@@ -684,11 +720,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -10933,7 +11085,7 @@
  ')
  
  ########################################
-@@ -703,11 +732,11 @@
+@@ -703,11 +739,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -10947,7 +11099,7 @@
  ')
  
  ########################################
-@@ -931,6 +960,7 @@
+@@ -931,6 +967,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -10955,7 +11107,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1060,11 @@
+@@ -1030,11 +1067,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -10969,7 +11121,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1282,7 @@
+@@ -1252,7 +1289,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -10978,7 +11130,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1303,64 @@
+@@ -1273,3 +1310,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11045,7 +11197,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-18 11:07:20.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-22 07:06:37.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -11140,7 +11292,7 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -497,6 +515,39 @@
+@@ -497,6 +515,43 @@
  ')
  
  optional_policy(`
@@ -11152,9 +11304,13 @@
 +tunable_policy(`allow_daemons_use_tty',`
 +	term_use_unallocated_ttys(daemon)
 +	term_use_generic_ptys(daemon)
++	term_use_all_user_ttys(daemon)
++	term_use_all_user_ptys(daemon)
 +', `
 +	term_dontaudit_use_unallocated_ttys(daemon)
 +	term_dontaudit_use_generic_ptys(daemon)
++	term_dontaudit_use_all_user_ttys(daemon)
++	term_dontaudit_use_all_user_ptys(daemon)
 + ')
 + 
 +# system-config-services causes avc messages that should be dontaudited
@@ -11180,7 +11336,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -632,12 +683,6 @@
+@@ -632,12 +687,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -11193,7 +11349,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -703,6 +748,9 @@
+@@ -703,6 +752,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -12991,6 +13147,20 @@
  term_dontaudit_use_all_user_ttys(ifconfig_t)
  term_dontaudit_use_all_user_ptys(ifconfig_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.8/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2007-09-12 10:34:51.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-22 06:43:22.000000000 -0400
+@@ -184,6 +184,10 @@
+ ')
+ 
+ optional_policy(`
++	alsa_search_lib(udev_t)
++')
++
++optional_policy(`
+ 	brctl_domtrans(udev_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- selinux-policy.spec	21 Sep 2007 23:46:18 -0000	1.530
+++ selinux-policy.spec	22 Sep 2007 12:15:13 -0000	1.531
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
+- Fix service start stop terminal avc's
+
 * Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
 - Allow also to search var_lib
 - New context for dbus launcher 



From fedora-extras-commits at redhat.com  Sat Sep 22 12:18:03 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Sat, 22 Sep 2007 08:18:03 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.59,
	1.60 selinux-policy.spec, 1.494, 1.495
Message-ID: <200709221218.l8MCI3Tg008117@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8094

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
- Fix /dev/input/uinput 


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- policy-20070501.patch	21 Sep 2007 20:22:15 -0000	1.59
+++ policy-20070501.patch	22 Sep 2007 12:17:31 -0000	1.60
@@ -1881,7 +1881,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.6.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-21 14:29:34.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-22 08:12:51.000000000 -0400
 @@ -19,6 +19,8 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -1921,14 +1921,59 @@
  /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)
-+/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/input/uinput	-c	gen_context(system_u:object_r:event_device_t,s0)
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-08-07 09:42:35.000000000 -0400
-@@ -2729,6 +2729,24 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-09-22 08:13:07.000000000 -0400
+@@ -1306,6 +1306,44 @@
+ 
+ ########################################
+ ## <summary>
++##	Get the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_getattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	Set the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file setattr;
++')
++
++########################################
++## <summary>
+ ##	Read input event devices (/dev/input).
+ ## </summary>
+ ## <param name="domain">
+@@ -2729,6 +2767,24 @@
  
  ########################################
  ## <summary>
@@ -1953,7 +1998,7 @@
  ##	Do not audit attempts to get the attributes
  ##	of a directory in the usb filesystem.
  ## </summary>
-@@ -3210,3 +3228,78 @@
+@@ -3210,3 +3266,78 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -10396,7 +10441,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.6.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-05 12:06:43.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-22 08:13:37.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10411,7 +10456,15 @@
  
  type chkpwd_exec_t;
  corecmd_executable_file(chkpwd_exec_t)
-@@ -161,6 +168,8 @@
+@@ -155,12 +162,16 @@
+ dev_setattr_framebuffer_dev(pam_console_t)
+ dev_getattr_generic_usb_dev(pam_console_t)
+ dev_setattr_generic_usb_dev(pam_console_t)
++dev_getattr_event_dev(pam_console_t)
++dev_setattr_event_dev(pam_console_t)
+ dev_getattr_misc_dev(pam_console_t)
+ dev_setattr_misc_dev(pam_console_t)
+ dev_getattr_mouse_dev(pam_console_t)
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10420,7 +10473,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -202,6 +211,7 @@
+@@ -202,6 +213,7 @@
  
  fs_list_auto_mountpoints(pam_console_t)
  fs_list_noxattr_fs(pam_console_t)
@@ -10428,7 +10481,7 @@
  
  init_use_fds(pam_console_t)
  init_use_script_ptys(pam_console_t)
-@@ -244,7 +254,7 @@
+@@ -244,7 +256,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10437,7 +10490,7 @@
  ')
  
  ########################################
-@@ -252,15 +262,14 @@
+@@ -252,15 +264,14 @@
  # System check password local policy
  #
  
@@ -10455,7 +10508,7 @@
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t)
  userdom_dontaudit_use_sysadm_terms(system_chkpwd_t)
-@@ -302,6 +311,36 @@
+@@ -302,6 +313,36 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- selinux-policy.spec	21 Sep 2007 20:22:15 -0000	1.494
+++ selinux-policy.spec	22 Sep 2007 12:17:31 -0000	1.495
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
+- Fix /dev/input/uinput 
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
 - Make /dev/fuse a fuse_device_t
 



From fedora-extras-commits at redhat.com  Sat Sep 22 12:46:18 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 08:46:18 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch, NONE, 1.1 gcc41.spec, 1.175,
	1.176
Message-ID: <200709221246.l8MCkIua008775@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8728

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

--- NEW FILE gcc41-makeinfo-ver.patch ---
2007-09-22  Jakub Jelinek  <jakub at redhat.com>

	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
	* configure: Regenerated.

--- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
@@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir
 # that we can use it.
 gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.[2-9]*])
+  [4.[2-9]*|4.[1-9][0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([
--- gcc/configure.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure	2007-09-22 08:38:30.000000000 -0400
@@ -7496,7 +7496,7 @@ else
   echo "configure:7496: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[2-9]*)
+    4.[2-9]*|4.[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gcc41.spec	22 Sep 2007 08:13:13 -0000	1.175
+++ gcc41.spec	22 Sep 2007 12:45:46 -0000	1.176
@@ -155,6 +155,7 @@
 Patch39: gcc41-pr33423.patch
 Patch40: gcc41-scanf-fmt-check.patch
 Patch41: gcc41-pr33506.patch
+Patch42: gcc41-makeinfo-ver.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -479,6 +480,7 @@
 %patch39 -p0 -b .pr33423~
 %patch40 -p0 -b .scanf-fmt-check~
 %patch41 -p0 -b .pr33506~
+%patch42 -p0 -b .makeinfo-ver~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1636,6 +1638,7 @@
 * Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
 - don't ignore throw specification of function types in type hashing
   (PR c++/33506)
+- handle makeinfo version >= 4.10 in gcc configury
 
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until



From fedora-extras-commits at redhat.com  Sat Sep 22 13:10:17 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 22 Sep 2007 09:10:17 -0400
Subject: rpms/sepostgresql/devel postgresql-8.2.5.tar.gz, NONE,
	1.1 sepostgresql-8.2.5-1.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sepostgresql.init, 1.2, 1.3 sepostgresql.spec, 1.2,
	1.3 sepostgresql.te, 1.2, 1.3
Message-ID: <200709221310.l8MDAHue015525@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15345

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sepostgresql.te 
Added Files:
	postgresql-8.2.5.tar.gz sepostgresql-8.2.5-1.patch 
Log Message:
update base PostgreSQL version to 8.2.5



--- NEW FILE postgresql-8.2.5.tar.gz ---
?	??Fpostgresql-8.2.5.tar
?3o????'??Y???????}^???,W????b????8a4?? ?p|?g???+????Yu??"??_?Sw(??o????Q8???"??=q??A?X?l?x?^??k?i?CZ?.@????
?Lc?
??????e(tz,???s#?C?C?{q?q?????h??;?W??q??-^?m?>?l?(?_?Vsg?????vS<o???????8????A?2A???}?nU???
u????F????????^????!R?Vs?????\;????^:;??#qp??b??????????5??N?????q?C??
??P???o????????*?7??b~?^5;?7????~????9??????Y????J6?n.D???m???QlmwZ;???????	??N;????????}M8??P??wv??;)?U??[?????s??0^{?N?C4ij?[?w?????!??]P???01[?U???zo?}(?;?>???(??lw
?y????
??(&Y6?D
O*b????????????????????
??
`????"?s??i??D?????S??OQs??7??=Q\1???8??wUug?.8lc????n??vYT[vg???8(???3G?????@?`K???x??yq<????}?????F???
?????`?!?e??????X?
?z	??^8??gT??ip'?;???#o|?^???I???7???B??z????5??/???2?0??,!?tv
??p????6??tw??nt
??D?H??I??P?????F?=?i???s??=???evn#??8?zJb?????G?.}b?m|~?"`??'????Q
qT?{e????1?!??p??xb?????????????p8????Y????????n@?e??lz??_???_?Jq%?I??q??eY?
???/??#O?g?Y???x
???M9
???8??7^}??hr?<,??9???U?E??qh???Ea8??
_u?;???e??G?[???kp?Xg?T??j4?Z?????:	????2|?^???)c???????A??F?n?
>??
<?fC????U??y??E[v?<?
?'??$5
1??dp??{?8????xS,^?
Qzs\???V??%?H??? ?W???U]?XD????-??=?Y??*4?w>
??96o??6fU?W????wQ?????mM
??G??
C"?(???[?m?
4vVYU?H??_U?l~?)y????Ukg?????
P\???x/7???a????_?wq??????H???\lWQu?-???????#F?/????Z????)lv???P(m??YCP?e^?*)+???Yr????<???C?O???:sI\????K??h??????z??>?eOT?'?
???y???a?$??E?:n?1U(y?
"Y??}??y?!??(?~???????????(mD??`??X???:???2+?(??Z?X??	?rj???~d*?H????
Kl?x?
?!???y???
f?H`L??????&?{=w
????c?}+?j
??
???(????x?6+?y?????i???q????'??CH?u%AxY?vb??#?3o???
???g?Ug??~?##?(?CX`?rS?w????q?'???U?t???|?G
87&?Ns?????^"#?0??4RO#?}/????????sX???zr???U?M~+?????x?3????Kk\
??m(???A`??	?
;?????*nN1p???d??S?&
???LT??-???<??	???I?lL????0t?u??<??e?92t????4r.?S?HB8zh144?^?^???Y??????????????z??????????????????y?]	?f???Q??I????????O??3????]?']ILW??W$n???m???????Fg???w???W???I??<?*Ru????,??Fnt=3l?@(g??y
?????
??p?F:????5gt'?

x??e3*?r~?EH?????x
O?Q|?d?)????????uF???y,?82?`???D???????c?m	?+1???P?+`'3??????E5?O<|?i?O?s???????+??EN?Y?????k??????<;Z??=>????+?h?@%??h?<.?J?iI/?Y!?<???zg???????C?h???
???????%????>0??k_??*?V??~?????N????C??m??[~Lt???k???
N?z&Jb?Q????
?>?o?v??U?????6s?
??z??i5;?d?7?*
z??c???G??g???
e==?X??pX?r&?$???:????(
??D??.sQ??x?=.????m???P\?,?{_?3???????$?&;/]/?5?<
0j?i????L???z??KK
@???Q???,B\???SFm?~?????;?o??\_-???G??y?2?9^????3R??]W? ?p???????????0]??O??c?????C?k?M????
??????
?a????{y9?:$?0?tB??k?.;c?:???;?{??}Iq?
w??E????+???u????????!??h.zQw?M 2n???^????????p?KO??W???d??????F?????~??????????????????x??tV	?hUR????}???@?????y?????C
q??t?@?X ?????]????????m?5?]???#????????C?s???[B?+?]a???????5?')Y???!???Yc??+aF?2???:*-?<p?5X\:???A????f??7??
&7B$???$i?????Z???c????>n
?D???????{????y???a,*???7F?=??i?D??d?t???B?H?E5?.???qS_-?v?%?*??[)M??Fb??$????????g?*D?t??fU?Qx
n>H??D?FzndY???S??j??3??2?????<P???????	?!??b?/?5k????dW??d?Q???@?"o<t{,?@????=-??y??%J?????#U??y??N???z?# <?F??!?`??K??cU	???.??9???tK{%?{c???kV?0????>%1K?6!??????o+U?????,?BL?	?"?!_??B???gt??/?X?o???PEa?????P?r
,?????A???(q[??P?QW&%
???$
??;?4 at d??i?$??$??/&?QH??2?qM?????6?X>????<??s_!?
'W!3X?????V+?
??`?[e??????a?JfN??w/C0??4
X????M?????????*?QV??U4Y?)???_l??@"C??2???e?c?q??!?y[???Y?<?P?E????
 %?L?????
@N?no?HjG???_Wm!?_l1?_7?????kn?????Y??-Q2Vs??Tk???x<?N|?
?t???G???S??G?jc?mh??q~????????Q????G??7Qf;???t?F?0C?4?l??????.?\?+??NIv[???2??s5??z???????b??Vs????/?$?o?????N9jrbro?$???F?????????K?H?x???a?V
?Yw?%?N?L=z??(???Sh<??u?L??Y??~????t<?j??\??S}0*/\??F" ????}|E5 ]0?fH?bBq?6+?????P??_T???o!j ^5????????N??????:km`f??`??5??Ep?Jt??Z?W??
b???>??lEB????B?y?????j??!kL7?&?:1????m????=???-?f?8?CC????????Q???????@@??@@?y?zoJ??
??p?E|?(3?????eIk?B0??/T??_????4a?|}???N?v???~??????%?,
?,?8?4?@???^@LN0??????VW]?v?&4x??y??WDbl?????????f?-h#??0;???Z???;[?lp??t!C?M???H???7? ?b???
$_??E????
a???v=?E????d??C?=N????S
?t??y???80?;E??0?????6???????)?;/???^u;;???w??N?
?#????,\?,?B-????g??????
E?b8?????n???MF?j?$B??M??????jL??D??????a~???<c????
?(bW?*?OFY?*??82?(???/3???}~?C)??|?? b????????W?
?Fi
?x?l?J??h??\?,????{??????|?{??????m??%2???Dh??v:????f??Kbe?zRnB/??*tt??"'???m??????=h4???	???+???~????w??
?To?????;?(?;GrK	?&}?F?t,4??13?(q!+~
<?Xr??5????????? R|????O?
6Rf$?1
y?8?X???E
?.0????RB
?Qd??s?Lj???#k?8{{i??+??CS?I?Az??l?4??0??+??U??N}ACo??M???
????k?
P?????B?B ???z?l?J}????6?fG?? 	D,?s?&J(LP?]?cy??S????a?_?I$?????????b??=>??!C5~??J???Q????Q*~0??aJN<#1??d??d?I%Gr
?A????$|????$?O0??_?zM??L???V?hQ?I?	???-9??(??%?a?%?3b??

???u???N?+?~?eN?*x+??I?(?????X?)???5?
K:?q\?X???xY?w??N???????+?&??Q?x????????~????F'?o?FE??^S?S? e?
Y?:e1u"????$?C* ?QTx?]5?[_??N??X?]5
Rv???[????n?T??II?????&,]??????_???L,heq?%n?k???V5????Bm??OU[?j????9?r~?K?T???jY?4???? ???^?w?gr,????????5
?*gA}?`d?$m?????i??????
?	3?L?lS??
q?T/??R?~V8?Je?V?A\{?R7?J3????TJ?
?i??Q????j??^?:??2??p??????I??&&_F?$A2??t?31????L???e~? %I:?H???,y<???'??S??k_J?7??Z??f?%????%B D<
3 ??\rrr???b??V5#?e?<Z?
&?x?	16 &?$(C?qD??????5*d??????O?"???AR????3C???f}Z_????N?:?v?????)d5??tD???4??c?d#??8???b?L:?uH??????|?Z5?Z_??N?I??p??R6???A?)?q??r?
?_??GQ????r?U??a???????,?my0??4???C??Iu06????q
+?J?=???e~a=C??C?A????	 ???B3#R?f?e}?F8	??n_"6?h??a??1???$?????#l?!???c???X?L[N???TN\6?X?Il:[?????????$?C*??????21N??????{4-?????F8	??
??d???????Q?=?Fd???L?????7???(??f3>?5??HF????=?|_c
????4"S??g??????H?9-???A??f???#?#(??=??v?]O??RI?Z?3S????Hn???9q?Y31v6?Je????"??b??=??I?$??9???Yp^??f?-0+{N?tV??dKG?WA?
7?~???L}??!;???T?????AR
n??96????@????????0?.?b?2)???0?????I&5??????J[??d??#R??g??a????E?oj@???q?/?Ws??i??????IG?@??X_?????=?vr??W?bR??)r???_VP???9?DZ
???
??T"C? u5V
x??N?:?[???Tb???e~$?A?IP?T@??z??'{??4??Z??H}??&?P??l????1Kj??kIR?tP?T@????K??G??dk?F8	??
?>??szq???????1h?;dlJ???aE?	'A????T[)hm(?$??nq0AV??s5G>?????N/?$L?bN????\2&?bN?|??r$2Z?+?dG	&??
?
?|????2d?wY?????z5?????]???J]?09??i}???_%w@?!??k??(?kR????#R?????\???W|??IPQdC?2K???Z?R???m????'AR???%??K4BW?????#???8;??e~?$?f???h?????
Z?>?_?9R?
?:G?5z?{$?eK?I?m????:???6R?hm???U?niW?I?P(?B@U???S?????Mk?pcI5????~???0??????P=?\{$G????{?{/7?u8U???`E??W4??D?N;??e&eFC???????21:?_*?h8B?? %{?/?IL2P??u??4_?V?nT???y?}?;?K3p?????
??E]????D at T?%;?1j-MB????d?l8??
???.?E&d?l?F1??:1r1????LV???nH?Y*??O??>????Y
???|??a??U??
???????Q?o6N?y???d??m?N?7G?????
/
??|?q??0?^H?@i?{G???PH~y?w?k?U
????P1!$?<?M??kX9K
?? a?j?(?v??? ?r#??}??rY???"/?X???,??d ??fm???6?s???"\??#??KA?2?\???T
z
og?U???c?????O????9??W^?d?%??z?x?????
@?	?=^?+?(,?i???q??&?y9?3??s?_?
???V???Mu?c?HY?z?+*U??l!h?^??{?}??n??B?????T?(
?J??V???V{?v%?k????X??xmLVD?C^^h??4W0??V?Z????[??k`??qR?;?????K??]?4?u???26?N?X>u?%???}?

??*???&??%?}|??q??L??\[??)???????7??? ??Q`
2Q?????L?X0?%0??a~YY???7?V?h????ga0=??Z??_??D?&
???yz??ya
???a+1rU?wT?5???Y?ud?p??[?????gw?????????	????(??Q????KY6Up at .<??Y?'??fZT????j9?C?'?B.)?	?]?7K?!?]?????4Y
?+??l?J`??y?l?I?j????
?{
?m}??9??"a????x?VN-1
?4*??`??JOQ?MW?Pj>R_4?4?g???G??
e)???$&i?n???R?&5p?c6Q&^?Kw9z?^??v???a??*??J\!#X?[NYE?)??^????6??/???????wfd???)?7??Z[Z???
c????(W????`k?
??L???*??S??
&???r?n?G???r~,??e??9e??(%g?????C???~???P??w???I4???+	U^NG??sd,??|
?=?Z?????d"?zCIwB>?L3?V??>??`???Ui?&????????cM?EBd|??9?C?%KV3Y??c??H?R?j?Z7??+S??U?t?T?H??J0?Y-??f??ii?????E?,?5$?-?&:??d??	Z
?w??7d????E{???t?????"A???I?|??S>?`6?C????K@??p?d???.?(d[N?#?????>}?x=?*????x=A4?S:W????l?-OMD?^Q??Q???4Z?FE??`?Y
F?H??bm?(?(,??Ht?;/??c???5??.???aM]
(???????????>??VY?6?M??j?As7?2?:?
9h
/ ?n5?????Cl? !??,????
;
?T(???o??@???+ at T ??????s?j?!??F}?jZ?F)????z???p*?E#?a???(+??T???:?????=?
???XXX?]S???}X?[a?9??xr
t?y?w?5??c??gH??}F??}????h??{??/$????|?$7???Ks??????~d]5e?7q???????5Ko
??de?I+?????????????%?R-a???r|??Q??z??kIp]r??P;n????????X?de?wD?B?V:DYb?v	?_?f*f?%?|?[7?:???O?5?I?T????h?B?V/0?B?	~?????I8N?f?$3??w??TP?0?0?
Ks??7y?M?Z??&??XT?s?V?C???s???T	le??rIUn???c??????'?n&Hc<?r?Q??
nZ??|??1?????b???mO?|??Z&?f?J4n?????U?_.???????*???	\V??~4&/??zcE????n?O???????&?a8@?=?
`	J??
m$}????`f??*l?"?5???
B=J?????9Ze?v??kd`???\?U?!	f?X?{?T1?????"\C????$?9?#???aI?~???E???|???VY??z?X??<Ot??????Y?zZ?A???vBR???
q,?r??u(?&>?`??|l??????}C?????D?)???N?S??0???^Y???????gS??r???o???????~/?p:V<?P????????[y_<??o??4???n+???$??Au??'??T??U??}v='?t??G?B?~????cPQn???`L&?oOH?????????<??'r/?|?j\???<??[,TD]??????G]\w^???y?????
?j?8j??Jw??????:?>???#???w???@???2?reb?L?\?????2?r5^??T:?
?c?_??2I?
1? d????tw?4??????I?`??0"???????1B???x9?SI3?EM
??e?.|??e??????/??^P*???????W????#?????I#?
???O?!?v????(??U-|?????J????????)_?II?I4??S6?1*YjF?#e+?\?{?Zs
???8
B*X)?2??->8??f?F}!E??)U????4???/?p??q???????
???[????)??Z#???x?????Em?P???.7????x??({U????sk?1Y-r???F=??[???c'L?i<???a???D??eq6QiM?3"?x?B\?m?z?{?C??T?????????s??}?jT??j?LV???q??
???L|?"?`??????P??|?????bq???????fj???Pl?8"?G!??X?=??E?[???V?8?1??s??<?.I?G?cN?p/B????-:??lr.H?+?O?cp|??]?<??0s<j?-???F??c?[cL??Pr4?0g@-I???fb?c?5???????
?5?C?????f?Wc$B0?%???\??
_(???Dn?<?>>
%c>	?r>?@?1?M??O?q?'?J??'?t\????Hk*df?D??7??h:G?_*????N?,A?E??z@/dP^?O?}???H5~??L?~urH??-??{??]?3-??????g2(?Q"???????uR?x??_0?3?????r?f3?T??4U?H????UJ???%RTV?/??bQ???k??o????)l?????9???R??m???/
N??Q?K?JZ-D-????2K?=L\??Z?f(o??%???3w???d?
?$2?????
u`? 
|R??l
?-z?
d????'??I??aY????yIT?e?`:?kB?r<pR ?1??p{0?n??fYW_,???Iv^???RR
?-X??~???z???C?F???O?I?n???DhL?>,j+>??fP??%?J????a
???s?o`????p%??k????I?G??xg|?????????0?%?=!?;%??
?Vdx?)*?O]d?P??L???RV??0a??w4d?:?=?
?:?????D??U?u??????V?4??W???)?2??J???G???9?,??
?c?I??M?YN??r)????!???Gt	f???S??OL??|:?x<?
l??q$????wfZ??$eR ?da4??n??????????8[?????LJ??????+?????e\??g????HZ???X`?v?I1?.N?
C?f??Q.R:??.??F?????
?[?y?p?2??,?Hg^L0?????]?i?=??m????3H?$yf-????VS?SS.?;[K}?RR?????$?"???P?&????-??@Z???K?&P?
rP?h??'-&~:??K???+*?DfY9???????0{?R?N"[?<??B??????????cQ0?/j????-??ks????n????J$q????q?????????G??0?C???EtS0?V????????g???-Ke?M1????:????3t??I??an?z
}??]Y?R?P5?J7???%??? ???rh??q????HHV?`?\.?Fm?,?
??&.+95g?#hh??$!?W??; ?????L?wW?r?#y???$????????i??}7J?r?????ZU?7???@??L?Q????.??*?????7?
?
??^?R:?-?y??'?xN?h?U????|ZTf?pVo?g???? w??`?l????2?????Q?w,?B??9??a?It??:?`
??zR\adR???a??&NX?)b???'?QH???Rt?QR&G?
?4B?o8?8?*?8?~??
?O?S??.?;k?V?????M??'?O9??7T???????C?>+%?$??d??N?????N F};?????kbp????E|z?Gxxk?
???8?F??k???p???????
?[?K~r~k??W6e???>??}?FRMy???RU???PT????85??t???OG??	n?CHC?SZ??$???k???M?[??=????9?i?:???9????F7?7???r?????(??9L??`|??F????@???4?????X}?74?Y?K??????????8?o?
?d(i
?(??s?E{k?F??A?g?1????I?nu??
?????????8??s?E?#??W[????B???9(?3-??fc>7???????C???????;?????v???-q|>?.??,j.??e?w??;??/
??n|"?!m?m??+??_?m??J?_?/2???'?q???????W??+?tu_ykp???VeB ???>gU??G?y??i?Z?:????tB?SJ!?;????Q?e????<jm??;b?p????6f`??u??:???y???E+?v at o?-?|???A????3????=???L.??????2?l?}g/?&?7\r?p?"?d{Ya????]:\???????>???Z???????NNIm??A?_c$?Iw?.XN??Y??????v?-Y?(?Y1??9?(????f+?????z?\??t??W??H?\l?QfY|%???;?5?6s&???g?cM7?s?h?#??n2@?6??J"?Q?=???b????V?2??Y*??s<?=??!0UlZ'???2fB???7?,i?c?r~????V?E??%=5.~0??M?-'P??3??e??????P??$?!????????$Hk??qsw-???????Y??;`??0??C?@?%[??hS6D%?V??{O????+W???`?Cv;faG?E??,n?6|??!?????tK? p??h?mi??9?<h/q6????????4?0?????dH??Z?
???g?
??????????.???j5????@?y?*~4??U?g=??O??^O\
{??
????=L?]?9dU?:?0(????3?HyE??(^?c????9\?w??,?
??f?/???A?>??2??h????{3??????s???$?j?3sZ???V>o?j?5_)?&\e???6
	??.???7???iS~US??????
?&??~???????w)pz*??7?Oe????eH#$I??(
F
1[??qT?????????O?G?_???`U??t"iH?D?D!?d???m	?y??
?sT?B?2?[??w?]?#s?6D??O?wh???&?`)??ov?b?i?{dG????????OQbP?r?Rt???A????$ds??3~]???`-m??L??4?_cy?4?G
????q??#?YN???bg??C???K?Y?h|???????!O?8?m?K?r+J?5?%?}?U?????V|??_?
?YX|???N0V?U??!a??W????a??
?W??#????<???+xa??0?Uzm?B?}?]?????)????;"}V???8wQQ(?????FA?c\{????
?
R??1??:s?,_4?Bg@??&KQ???????gVO?>???????)???<e?a^xD?-?'?^?L3?,???a
??2_??
?@h?E??8?"?
???"7z/??k????ZE?5<iX???9??m$??>?F'???9EX?}^H?
?m??qL&#.n?????J1y???9\???.?)?E?[V.1i?????6???et?????m`9???w???$??t}Z??g?{m???~3???????t?,???s_?????$35??<?y??Db?<??????H???A?S#+?	???i??r??Hm????q0??A??E??r?,?I?Lh.?4
?\d?.??9???	?R?e??s?y48?????o??r
?Z?FEN?!?=??/??{??S?M??Y0Sa[O?OO???
.]
e?????F?M{o[vG?????9?9/[??	aB?l?o?O??????????D??R?????B???
?<??
??\j_??,????u???????~g?s??2??;?Y??v?eI??o??2??&?i????M???f?????z^???????n ????.??(L??B???F?V??O?P????h?u?Ek???????F????/b&D?J=??????Z???o??ntV;?????T?u\G?q6)?BU????&?`???????????$z
?A?:?i??RL????X?.?D??D?Nqc??U\!?q^l????XY?z1?/)?#?*?Y?6??dy??/??n?#????1$?o?:?>D?&6q?????p?`?
?%ge?!??h?
?X&hc5.=????(?\T?e??
??????)?,??\?\?
#?????w^?'?Gh5??"z=??#???w
?;D-?*-??k????t'??0?=ZU????&\?z??6??????W%q?]Q????#???9r?.??t??.?
???_?np6?6??~Mn?hu????=???W??o?????#???e=?6=?????\Q???:x????}?j?????`?oz??m?9j??W?N???@???
?n?\@P?(da 2h??)???????x????
???
??@?????????G???? ??/???5??q???pU?v??WpW??1?E???\y?????g|-?????->??|?i
_???????eP/DeG?RsE???e???I???^?%g=Al*U
S"H?IaG+<??)??0???j???????c??)N???Y@)N?/?=t??U?Hj?N;?Ko<??????a?????=C?a?z???H?J%??,'???VA\?>????2???K`?7?%?N?\???j]?Wg??;R??K???9??"C?e???{?d??y/???d?)??g`o?n?-D??
???????{R?I?~Z?R????j?6???SbJp?IxJ?-a}??b?//c?I%a?Y????4?f?}?3
?j???%???x?a?C??LC?????[?n?vR?????r??N???8??????E??N
?n?+,??cz??BiD?
?@Y>???????????e?U!?Wr?????I?1O????c_?C??
y?8?.??H?	????F???!????l?t??=_[@r.???q???}??,5?l???*???G??????????????J??
??@K?G@????'K"@?????t??&?k????5?!???l?
????E??q?>????.?~
m2&4?Le? \_9???V7????"c??t??????k????{?????[???{r>????w[????3>??X???0?!?6??
??sO??	?=??'?&?_8<???Mjhi?tzVE#?W}?o?V?????O??O??^sO???{??[???h?&?0??m?p?'?X0?Q???
??f???-+???7????~c?3m?n???R?'???T????BU4???YI??<?=???9?a5U???y?;??y
?????????S???On~????E??Wrq???ln?A??t0P??L????x}zT6	?O?	~	B|?E
>?"Y<A?J???[:m?7A?;?'?e0??s?xf?????d???????yg???7????4???}?S??[m?by;?????z??k???????%?e?H3O?;?e?[?
8?x?I]???d????????1T
?D]??t?|??????Ya????2
?q??\|?B=??!?????n?gn?F2???@4$?
Q?D?z?Rd??????c?
??
??'z^ B4??yhg???Q??>???????
,????'LqW????9???rQ?q????T9??????K?J?8(??D"??g?xn6g87S??(b??5??n??l?\?????????
???
7?>??=???>?TY
8????|@???5S?[:>?????v?????z>??#????H?6H???=?U?n?5???n??@S@???vE??
????&?T??"
????????????{a(R0xd???z??
RAT??\&?;k6h?
?l????L?a???I>????'?7?D0<?@?????5[????w?[?
?%????[??sf 8"?K??*<w?U??9c5k?,pEUl??\X?*C???i???O????,?/?&O?Q???`??>??!????@a?E?osa???X\<??1?`P]5???su?1????????U??{I???????????
fs?=]~?.?f?|&???1???i?t????7DC?h?A??????x???yB	?????rO?????_???@-N???*?2M??p:??|????xL??nT?V?L???v??[?? ??n?H%?t
^????e3??????????Q'?
@!????Kd?3?"<?????O????????0@~?S6??9so\X?}])m????k?"??f??R???U=c9??x??{"?F"?
?F"??E?xc87 at Is??I:?"?????%?^dSu???n?i7K??????????????9???Y*??/??s?oK?SPnE????<
?l:??g2*?0?????Ixm
?!f[eo??Ttv3l?9n?S??p\5???r??[?y??0????y??`?????;/:??0O???N (?6???g????G?O??7&??M1sP??AlY?<?^????????=
??MB?y???
?QB?V{?{?G???
???#????7c????????smx?V??33-?????'???|R1hj?*>?X??J{?'???????l6??E??%??N,M?????Ntq?p??)g??=?/y?e*<'?\?W?u???0m?I=.?G??VrN2*{5BFG??????)I?ir???!E?$?I
?
>?O?K????U&?,?.?
??Y?=!e??FY
???Vw??yT?y7????????>M?Hj??c??k??{??8 \????2?K???,??
??`-P???fU?,??j? aE?????sPgQ?M???rv?S??????t??,??%Co??%?0?)~I???g???Aq?&?
?)?x'T|???rn??? "b?<???|?4<
K?
$d)???5?I??E.??P????c???Av?)n%	G2?!?? W?u?[?u?????^#nc??`ha?Y???7#>8/_??F'U?]? ]?c?/?x
xr???	??<1i??Xt? w=?}???!Z?[???v???zk%~??*?????(??h;?????????f
n?	+?*f?+B`J%?*~??=?Zcj??h|?]???"?
??I?D?A?Q!???48?Z{????,??(*@???6???????g??Ry??;<Z??kq???a???? ??:|???+.Rh???*O????b??i???0????N?Rn(??fk??d[j??????KG???I?t~}F???9????s`??????8cq????B?(???????sa??V?
@q??~@?????f?V}?????}?? 1D=?f???wh??s??&?(?	????[
?R0??
??[?N*JF?\??^?eC???
V???j?kHCKp?}?k??31\Jg?q?\?RW?cbvaC?`???po???zY0?Y??a???)??Gb?5????k???>??=??g?d??c7???t.A????ec???W})?S&??cM????y????s??g?/?z??t]???F???J?%?l?t`??V?P?????B?*Q?"e=0??
W??l?3%g	U?P?l;?:?f???+?	m???9~???5md??A??]???.??8?Z???????????,????S,??????Zs?9??W?^???]??wu??a?t??uP4?????{??#?q
?????+<X??$ch???'O?7>WV???
?+?y?
?????]c????k??s?-?????7?Z?????????????%`?]Mi??w???_????????F#??b_????????N`?*?z???1n??&???{???n?? ?C????%???rX'P?4W?/??????]$
????8???\???Q
???c`? F?!????$?RU??u??~;???????A???e+???{???X?Bx?:@??h??
?j5z??????Yq??(??
?????w??R?A??)}?7H?4????>]????q?G?TVJ?M?T?dBM?$~????M'??}V1#G?q,?m??V#????????m???l??uW?R???>z1??Bd??
?h7LC?*??U???3oe????r?^???.Q
O????I?D?V?o?*'8:
?cm??????oU???B?J???	2
??C??84?f?Q???????x??5>c??????i????????dG??;??4b??*?1m??-\'
????k"?3q?c?3
?	Gm
?3???8????{VE?j?n?>AP????G{?????	?zM~???=?2?]???Q?8??;???U|???s1?:T??7p??????V?g?K?}aX??K(?????:?
/??/M??q?%XE??????\?=?6d???V??K4??|?????N???#??
PR?uL	&?C+?Wd????^??D??|??Zmb>dYm???Ym?/?b!??K?w?__?'p0??uy|?D?????????;?|?/.k??O?e???(?????]bq?9{????*?T?r????g?E??B_D???Efu?}OT?/@?y??T??(}v_D?+?E??j_dV7??D[??~/"?f??c?
????,^?K??&??????????k?B??7???????]?l?;<eXeDb?J*]????I%???7"?4?ygL???99????eU4sxZ4t?2u&0u???3????r??I?Gue?G??L?'|6??:?????[z?M^l??????nYI???q??
?
????Q?????6;_?&?}Zc??5Y???c?G??p??'?????0??J?Y?????????emx2??;?M??gM[
<?&B0

??F???Itk????j?\k\8W?%	?LdL?????????????V]L?E??g???
YGR??E|????|?]9?Z?*?Q??]o?!??6VW?Yb????W??
T?l???x?<??T?}"??tK0??E1?????eyc_
m????K????cO??,V~X??;6???~??6dx????,?o2??????x?????J??:?8???????	g$????\[&?j? |[?>???j????.?"?i??^??Isa_??l7???}????d???????^?0?&&j?Z???/?/?F?V????w???*???cS\q!?@?????z
?jX??PN????N?-??&?????L?
x???????}?~|??????????E>kX
?????*?}lTy?:?U??????r???hN;????6T??oc???kv?f??s??Z??=s{?RH??5?9??S??????kl!Z??[?w?`7???T?S/C?????:F?;??W?o?g???c?????z??O???{u<tw???y??
?w?aB ?6?-@'/(??~l!????P?B?
???'??P?oT
?????'2?W]F?5a?9??UI??N`??U[z??@?`?\????G*y?<Z??i
K?a%m9?}?
5?2+????\?8?h??w?k?cj??????1"?C~????????H????H???B5e???1????x???Tp?qb?????k?w<R?R?r[?JV?????g?I?.?[???D?KM?4PB?
E'`)?\?yw????`}	M?A???~?????/???7#?)M?t?7?P??w"?8?i??5???.?
????
0.???'3???$?O???????????5AT??Q?Ax??e???N[&??{o9???A??1l?e	???K?V~?9?y=W???D????H~?^?(??????b 2?\y@NN??]?{???o???FZ??<i?????Gc?@Q??E	??@??#????/&5?V???G??j???????????/??????????S???????I?????$?xaR%\???6?##?O?4?#?????l?(_/n?
P?5?????	?6????,G?M??????2??V?2Y&yf_??Pd!????????:???BO?:Y??2R???I??:uO??C?r?LI?U?@\4??:i??S??%T????&??"???????p7t????e???xs???j????=$9?>H????'????'J$??????W???'u????)????#-OZ?????????l?(u???[e?S??E?T????Mu??	?mO??
???%??i|2%{e?L?s???R,?h_????@??S?q?q??LU??<??m"?c???8?
?
???????()u???*
T??????~???f?b?uoFS?y?+?u<?mzt?@???:??q?@??w?m?m????z`??D???? G??<)yR??E??[?2q??!?m? N?BSE?K??????c???mO???{??{7vw?,?\?s???J>?W??p,2 ;??`?`?`;C?=0?LA???x??????'?O??1*~??X.v??m??[????AWE.?uq?n?fpe??SG+???sN???n?,?\?;pl"??z???????;??\|
6EKj7s?%_?4=iz???H???????B`? ?V?T	J@T??$\??>?R?+???`8{?o?]m?m?j????*?2??-eKE???IzOA}?e?a2=??F????b??.?uhC??????p?
??????Yj0<??#????]z?	>'?X9?~d??
!c?3?TN?3?Gd??A??
i+,??g????_???????|?\??]?z?w??:???	???Q=??
???p`??6???[c?0<?.??.????
`??????_?u?'H??
H????K[?_0?/{?bE??=
PN????!?r?j at s??????5???#V @K?96?{??>?q?B???tnR??????I??????9hY???z?o???R??a???G>j???yf?2???u?#x[\x
f?T?D???D?[?? ??M`_??????????.&?8??Zd?
6?!???i?
)????W???????L2??
?
s7??J?/?I?x!????|=?p?%???o?dU??Z???i?d%??F
A?
???	d??4)???v?YC?y?95??sW3Sx??E????X!??2X????Qn??|?
????/E?2
??S1?{
?F????l?I?6i????![?l???p?%^???Yb?-?SR?3m?X??????7?????VdN?PR??(o?X???%???????>?8?bd????>?P??Zy???F??????{???iw?1?
?B?`h[??HN??Bw??[???O	?w?????T?3??
?n?H?}?Q???bb??m????OYZ????B=?r??i??}??????????????f?Ik??==D}?0??X5?a???
??nrk???????sSc,O????m?l??[?D???HRO??}??`a^???4X???=?~???*???O?OVkKL??G??'???tW?JCo?w~??????????$??y{z*?+Yf?????/M?V?6J??????{?F?JN?f#L??Wg%sS???VTio???K?<QZ?Y???xwr?/}?????oW?????o?/??j??c??1w??????f????-??????!?(Rx??
|X]?????A???F?)????????
?N????^????Qw?D$
??$?U[??????	?????,TA)?}?F????+????!??d???,??T???g???????I! ??????????m??i??{X1?
?????au???53?????jDq%??s?????Q)??????%(/C???-H?d?TM?L?;??2??$????????0??????I=?3?q???????s?
??m??f??/??\)r:?k?????.y_?N?????,??<?????y????&ka?P?rZ[-?????\?????f?z|???$0H8Vk?????A?[?q????7A???L??|# "??????@?0???3?
O??>?R??l?j??%?v????2t??#V8?????8???C???E????hE?8??H`")
?]z)=0j]??2x_5Q?D}?I?'Q?D}?I?'Q?D}?I?'Q?D}?I?'Q?D}?I????\^?S?t??~?????D8><??????_?Q??
Gt???????B???e????@???
?????6k\7??{C=???L?b?z#?@?v?hG?vd%??@?v?hG?v?hG?v?hG?v?hG?v?hG?v?hG?v?hG?v?#9?????$?DH!I?$?DH!I?$?DH!I?$?DH!I?$?DH!I???	?
?Ke?????;c?W;??g?.?K#J????7???m?F[??knZ?#?J???
?0^4??&)????????XF??5=??3?q???o8?*?:?3?U?????[0??MTX`6????3=????z"?u???????*?|?M?E?O?????xu??&Z?hm????&Z?hm????&Z?hm????&Z?hm????&Z?hm??????H?#??$>??H?#??$>??H?#??$>??H?#??$>??H?#??$>??m???#?e?HZ??&[?T9,.???m??t?o??>??faco?????s7?????XgWf??x??evt?jt
?I"$??$B?I"$??$B?I"$??$B?I"$??$B?I"$??|??$m?$f??Ib&??$f??Ib&??$f??Ib&??$f??Ib&??$f??Ib&??=e????B ???n)????6|???????*W???
??(??@??94<H??7?LOw???(i ???x????U?:?<v???Ci?*??!????J?G-p??%????3%?K0bx?w????1??Y*????X{b???'??X{b???'??X{b???'??X{b???'??X{b????k???$>??H?#??$>??H?#??$>??H?#??$>??H?#??$>??????I"&??$b??I"&??$b??I"&??$b??I"&??$b??I"&??$br??d??u?T???o???2;?D??$?c<%??.???Q??r?????	'?eM???4+???QZ?
??pt????Tb2???E??B$
?(D?'??>?D&??+?0?%?6$??h??F??t1??dWv???f?
'?? ?0???au?????)?M\?(??"???9Q?????;698????:W?o?D??F1s"w?X|+|?jce?J?e??c?b????<?]???+?????+D}???74?j??v?K???r??xz?sWx?E??ozY??????*??Q?yp??O*r?????k-"???V?Z?k??k?????H{?????$???V?Z??*^??p?s?]?[	???k?X?????Ss??EL????Z??7q}g?Z???????N/r.???\?T?&??\??Y??zO?,?U???:_????TSs??q???
?u$
??ua???5???:{^@cN!iZ????Y?IB?^????
??
???????<o+Vt?b??
?2?~tb??*??9y???kq??1?H??c\;V????+?1[u?H?#?w?x??????WDe?!Q??l??DJ??3579??i?`^L?lb???????f??9??3K???:9?9??ik>W?s??????Q??<t?S>%K<f4?V?h?x?n????V?V?!-'>??? d???SO<sK*???:?$??????5!????p?O?0">??$????i?O?'">?Y?%?W?D|?I??]%>???X?s?"&&%d??#>'?`?3????geI????????N[?9??%???s&>??<?7uz?s???|!????????Q??%?????s*'>y???????Y.m???#}????~???5??
H????E???Ct???D?+q?????Ct?Q?D???Ct???D???Ct???D???C?}???$R?HI"%??$R?HI"%??$R?HI"%??$R?HI"%??$R?HI"%EJN?A4c3?O???8????y???Uu????T?NZ?x???
????????9??owY????m?sw??,?x??%??8^?x??%??8^?x??%??8^?x??%??8^?x??%??8????
?2???>?;?J??????JS:??^??<H??~?;B???\y??F<!????'??5???\???l?>W?5??~m?`?am1??-|?X?8?????|	??q?m??f?80??si?7??M?<C?F?o?PU?T9@??????+T!F?D???zZy|*.?N!????Vn4?\dr??,-?N?4[]?VZ??\??Z??\??/?????][???/fY?v????3Auf_T^DaZs???S/I???E????W?"Z=?r?\KY???i1}?????|)~Q.??s]?_p???O?iy??????.??????!PY?|??????2^?E?SR?{	j?????:?|w?Ee?CM???]?l??|??a?Z???f{??#??D\w?!>???_???g-/??????nw?????_?
Q:c>????s:??????????w????>i?ZO[O?Db?{-??;?	????????}????????fa%?f#k???^g7;_v?3?)??$??O???T??d??Y???;??5?gO[O6??'????`?C?????8c?????slC??&J???u?0?+W8????Lw????'??4?????L??p<????(Jru?<??^tk8lm
???????
??le?~f???m?'??????}??Z?_0T[B????
B)+X???*????U?|??b??=km^??7????;?)??O????*+~???|k???cr??%,?80P??Q??0Oa?F`=???O?L?L???????i??|?=??/????t????????O????~??
o??c?r?~
??;?8?Xa??
???J???wE???????X????y?
?i????V???,?g?????m?????????l??????:?????^???N????V??K?G?????????V_???/?x????4?Z?<????????5?m?????Y93.????.?+?\aIb|???J???????
8hc?}??EZX|?????5E?????:1??"?DI??t7?3?R?	b$d??z????3?????]?b6m?????HV?)??y????=??????I)>hZ?q??;iJg???y????!
?e?T??4"5???U?9?	
????G??v?o??
??E?z%????m?Y	6?go???????????OY})UW6?`???:?n4?A?Ln???k??f???7-?,?x??h?*??A?????????h?Ux=<s`??B??+}??E?~4?s<x?Sv? xv?~?.pI????e???N??#4??:aA?{??E????? +U?2??	

??/X?p?Ct???{??I?P0????????????W	

?????d?y[?Af??nBn?L?!'58J(??d?????v]???1*?
f<?:9?-Q???w??Du%???L???M????U?F?????V;?s??d??rJ????[V?n<?{QA_z7??o
(@G|*??I?S`B??4Ja???!@??g?G???L??]?G???O?P??.!!????BM?+????dQA?J?
?,,??*?%J1e?S??a?'
{!S9?1ch;?5V?9!?$???&?D=33r?????7??/A???"l!?!?y?X??a?"=B????<.G???????J
???Y???W?"C?(O???K\?)5gO???s
Lm???O?U3;
?>
??T?W
O
6Pm?????:???@??i}}hZ7S?d(a??sIIZ(??sB???uIM??-wao???H?????6????Jl?#?E??t???]V??m??oI?
~?2J6??g??W??????7G??H?3??6???????????U'C?o?j?j??I49_?? ?E??????_W????\m6?C[???-????Z?=??d??z?!??v3??	?	?	?+?%?.??2i-?Z???????`?"nO?t!L?n
9??h???x?+?8????U?q??????&r"??i.?\???????beb6gB?????Ph?r)Z?>?#!?M?>??4?
?sVt\\?
z???SO???R??HK}E-U??{????????>?#/????????v??j??'%?z?? 0?
???? ???V-ZH????HH?*?[?x?QA2?za45}a?P#?
X/gB+T??
.E?0eE?
??dRN?L\?&L1???O	O	O34???4*?q4K?fch,e6~F?&j?A?}??e????1
??gzz`????????XC??W????G???GOa??bq???p???<??}
?@H???fo????????%X????UF??=????K?|?3? ]???Y
???*??Rrka??????????>z??k ?%?-?#??????%qt??i?2_W?T(??????}??S???NNef???????s???V=<??N???7U?.k?????e???M-?LeP??dM?Z??????
4??S???_H??~?Z?????h>??*?s????,R?l5??>:<>?0?K?}??l;>???Q??s?D?
?w?!??p?
???3??^.??????^??????}?????4?? ?%f?0?#wxod?a????jr**???@:?t????c???W?B??U??l?.C"??N??????v~??\;?;???iV??MjG???Y?????6?6??|?A??t?3i?.?]??v))??????1??l??R>?3?ga???\???????C?????MG?W[?S?-??M??&???&'?0????}?1????7?5xSz]????????>?A	{???/???j/???A?k?&p1??ahc{????h?XP??H?K?????uN?V???~???N???o???0m???Le??

~7?O???
??8
?/B??^{?uc???B)??92????7y??emk ^???'????????)?C>X?@?e?Z??Bx\????w???qz?N]?E????7?A??*???H|c+??d?e???{????&->???4{?\???Zk????:??d?,????B?oV]j??:????S?!?A??(f?M?Y??0e&d?????gGf?az?XG???Z??x?^K??*?a?Uw??Jg-??B?[UVG???O?9`jg??o???;'Z1?L?????y??A?f^?? ?Y^?*?E?????
3??3??8??~?|?#??u??*?3&T?-?-R?iO!???(2??b?$????????'???O???a+?h~\?}d{=F??X? ]?8r,?????DXv??tX~?LR,/??????s$?N^???=XS?????0?J C???`?Y???Y?{??>???n?)Tqd?a???k?C?5Cc8t.
6r,??p?@?=??Z`????[~? ?g????????Hw?a???\Y?6??{0oL9????;^???`???????A?????5u????]???Pe?*?Y?`$??_?z?????_????C?{????
?????{A????4?????'?m??.?|?3???????Ra??a??????#?Xg??6??cO??????F?
?D}???3???n?x?1?[axDJ????;l?wq?
??????????W??|??@??	??0??U???e?)?
)af??D
?<Vf7o ;u?>???*???y????K??>???4?)??[????
WQ?
???=?x??:???? Tg?4\OtN@}?kK,??B?r?PyV,?e`i??c=zr	?????}??.R?H???v?????T"O??#k??
?V???:?(J???Q?y?v???_?????[?a40??4?x?H??a?u????\?E?n???y?w???;??o?b?G#K????b????W?o?>?????7aPq????`Q]???&?p????????o<??b??j???????e?????u???u??Ex?
J???????@10?ds??w?0"????
5u/?`???&?o?*e??Z?z??h
?$?L??`a?!??s???>?V?C?d???kakD???ElWJ?c;???D?!????FT?????L??4Gd?&M?????M?:S?U??>(???????4E?97?E??D-e?,??w?_&?B
?F?`We]?l?
{
?h????W????qy?J=?s6?c?Gl?????2J.Z?I?:??n?31?????x????~?????<??v?
?#!}2?xN@?xZUu???05q(?HB???R????d?\P??V?????.x<%a?b]L>^Ye????W<?????y
?j9c??h??>?????n??????Hs?<%E7I?????????????%b\m?Ea?z?Q?-?B-vi???#{?z?????
????nm???h?M<n??`2n?.?^?rD?{N<{+]??vEU????.s?l?:Qr?^Y??x?$?E???x?
??A?`z?a1?/G$Fq$?f?
???
?.?_?a=?v??bpz?1s
???R:??m?]c??E?sL+??i"?x?%????:?!NQO?????h?aq?g?????????F???6ft0???????	R at 8??????8~?[
/???????.?D?l????:AD???????:????ys????]h??B^??>\
&???x?M???2?a?0??X&j??A?
?n???q?$??(c??,???O?Vg.L?`F?a?.?r?wX?\??????7d???
??5U???????X\?u?S??!x??.U?^~J*????TI??f?%?7!*'?P???i?#|P???1x???????N	-P??}??P=y~6xF?T??*?R?S?tJ?N??B??R?S???j?E,??A??m|I?1?d?qL?1?d?qL?1???8?k???E at u???=???G??"?emsm???#???"O?p'W3??^?

?9?4p5-?????? o?4??e?h?7#??=????m??7?2s???y??tl*????_?'z???UV???K?3??????/?? 7??r#?? 7??r#?? 7?
m??^J?????????ck
9???2?W?#?5?????:w??
??G	?,:?i?}geu-!0'?y$??!C?`?*m???!???2?hJJx?@??4?a?<???n????Y+?e|?????vvx?FH{??x??o
0??*?9W-?o?,?%<??1 I???b?v?????@???????u,?HlZ??D?F?
k:?%C???[]?f?y`R?V?)~]????E??Z]K?yJ1???Fn?a???Fn?a???Fn??u?
???9M+K?+%???$Em?+[m&???	?Q?E?8?.?z?f9?
{??)
?[???HT?[
?%o??%???["o??%???["o??%????????Ra?\)Io)'I???Yv?[z?>?8i?1y?$:??=???|0?-??w???N???6??????	L(D??k\?hA???73z:XNq?=??+`?!P
L.-~???j?'4?b?
!??????p<????^???k????V?cl"?8.?;!?GF^?P??????????8M?????KS2%???Dv?>?????g?|?&d<+?z???*??c?U9?Y:_??????*????6??????bU?xVT?T1%U???p?r*^?"OF??)???Sp???g=??
?UA;T???@'E6I?@[??q-??2?;??[7BC|$?-?s???X??|Md0p?x???`?E~Q??pwz?A?
=t?????Vuu|?Z??ys??????X?;==<>???;????<K?$?t%?~eV??[r9S?
qu?)E??_??p$???
'G??,A??,A??,Af,???,A?aY"?B.y?H?;??????LV0Y?d?LV0Y?d?LV????y??
?*?Am??"?=Xa?)?h%E"'? ?H!E?U??G?G?????l???cq?????
8?G??:Ly????*???kgh
??u?}v??m?z?=]%?L??s??mG????????t??u??g9?r???U?+H$~x?E|?h?tl????q??.?+~?=?WV????Jo>"?7??????????a	?+R???R?,$??n????:L?s7?K?d???E??2/?:<N??o???L?]?[mU???EUK?????UkVbOV?_4^^??????????<E???	????? ?
?F5
??_?sRWV???Qj@??cF?{?+??????RQB???9:i?????0Y?-???6???????????;????"?(??:?a-?.?34????IVI?4?DZC?.SJ?-q?????????3?=!??,???5?vZ?v?@?C???????V? ~??????????6t]?????????C?mt?'?d????X/?A?????/???0z!??????V?yeYA=?g;>???app??&!	3???????c(Y?^???	????????????y?]P?k?glz?@??s?jN(q?:?E?n?1^`?Y??rR1)+U?\?????mP<??l_????
h????	??{????x?r?MQ_??"?c???W
?,??y?]??????=????+
q??b?????]mi?5+?aKK????p<d|????fg<??g?x>?A?????|??NX?U???/?s?9?/?g?71P?<????mc(%t7???????Xv??6A????W?.?7D:#?_:?A?????@?.uW3mD??yxk??75?M???w??e:\??a'?]A[,??z?K6y
cA^hnq_q
'?N??R?zK????p???Iq???\;9=?;l?'?&yU\l,o6??>???t??N???S:}J/?t??N?>??????G??,+x??c???&;??`???&;??`???~?v?????-7b>N???????,R??Lf2??d&??Lf2??d&??Lf???I4i?Jc?l^?y??%??l^?y??%??l^?y???/????m?F?!??m?(?
h?:?5avy?????Oa??b???K2??????;{u??????>y{???5T2?LDL??
.S????hF???{g? s'?I?f?4?S?4?iH?T
??iB?qv'???7??!?j_?A?????W???]???%l???*???
??????]?AhI????b???e9w#?qJ?fG:??eG:??e??+/?????$??/
????M=???~?????}@??:?L??G???!?????5a.I[???#V`L?[??^]?????p!?/???Q????
?????u!??_}g??I?????D"W?+|9.?Ea?y?,????ac?bM???>???G0????A??X??=e????{???Z????}???S?,J?9GyV?#????liQ??rd??{?%+???????w??d8?
?[?Q?4?
&U?t=??fL?6??i?d?xj?????
e?+?01?0????V?%???*Z???5?o??.tm>S????/g?{??:?0?????i???'_*?I"?.?_^
??????g???j(????Rn?^+A7?z?~i???u9???i?
KJ???2!-?=????b?$L?`??????@H??f??p??%&?l?S?j??;x?BW???}lTq?>nA???L??c??c??Cy16q1?(????<?8?&R?
?&?
???K?Q?d?^?}
?q
%?=?q???+?c7OO?G?V?E??}?4H,,3)^??Xl8?J%?F??????b????af???*???e????m?e
?Q?????$V?}??9na?.|?Lax?V.%\???1[?	*??[?<?nP??????????G??
~%>x?9>??????Y?)??W??u?su>???[???L???hb??l;???????4{cP?bd??e9W?(9??6?;z?V??????Z8?Vq?Cl?[T??????>??0??[EC}K1?FS??b?$??`??6M??`?UOC?#%2?????V????(,Z???E??` ??K?0^??G??+l????Du??3?g??oN????$+??}}=F??!	?????????3?I?
??qv9??????????l??|5?????C????k????#????Q??ms;<?J???w????jb?&??^8????KS~v?/u?_?Y??
g???{?.????{?5????!|!W*??*dD5???"?.m:??????XG???Q5(?????
w@??=??MWHD??Qa\??"??Be??z?4xX?qG?.?g%{?Q?v??uU????F?i9?(1??1??v42p&??_?~?.?Y"?&??]?h{?5$q?D?\?+?
h?oz)?v???"??"??d5?k	?X??|?/e*re?J??~k???I???l??\?????Vjn\e???????H??01???-?p#?\????
???"`}????A???R?	nO%?[??Q????????w}?_U???????U??o?@+'?6?a
a,??f??fo<?$?i?S????Y??&?t?
?/c?5??5?u?8??fq?#?.???S????0F?
?b??????z??????;z??]??v?t?w???><?;?;?9??<?gr
??????<?"~R????+???.T????<l4????c?/h hs\?[\?>???$?%l#????'??*????=_??????,???=)lS\????m?,qTnmDo?Wn???g<-_?<?& =???Q??L(U????h;?
?Ej/?h??U\????0y??.W??E????Z=??e<2;YB? er
?Q??iZ?
???<%w?+?hJ??3?"?"#'?O??z?h??,?s
??V????Kt
6????S????;?m2??O9?dh??????l1????+?4s W?T#z???eIrF+?????h
?V????x???Zw?_gq???L??=pP?#J8#????????v??E??????e{??6?????}?%:>???\????#??_.Q??
???
??^?Y?\?0????p?		??????"????n????N?G??@
?:??1n	?48??!F??(??????????Ez??F/Zal?,??b??|e??U???e??????(>??gM?`??E???Gm??&ml?L?o?md??????l??o?9x`?F??K???y?
??[K&???`>t_9?"??=???3"?6?%u?M?????J[S7?????
?av??????i???Z??????????????`???x}??b4?V????T|%???FQy?;|??E??u?o??>?m????5??????
??G??+???Y??m???mh???=?r?4?G??S???%??
?x`?[?z????^?x?z???=+???j:?T????+??^?`x@/a?^???A???78?c???L,???H? ?Vi?
??f?
??+{k?i???=5????4???XZ?;??wF?/>????u???eb?y?K?OFy?-?V:oJ??Z?,?>??/RNB)c??$y9?8]lcX_<X??
???fj???XQ?7??Qq??d?m??(??V?l1A5EX??????T?"??@??}Dm(nO??
?w?H??Q?p???+????e??V#?
??\%7???w????ld???C4??o>y?C???L??????r???E?E?#?????2$??H#A{jQS????????"+?_U:.????'g?????`i<Y?}Xq?"\????p>?v???oh?q
???l???kpg?????55f?;?y0??io?Ap?v????U?2p?v?5M?
_K?H??J????????A'6????"?????uQ5?B?????^?s?j??d?EAs?????;????m????s???={z??L?S???S={?jL'Ij0:?Rh&mM?<?e~?<?:	l???(K4?????_?V?????t[??qE:???O?EE??QQ????-R?U??h??l
???^???6z???=???-Y??BL?+???
?P??/"?W???r?L&>?qMl?Jf??|???
??t?x\?P&?v?%Y%US&))?Lo(???#?3c????<d?rd?gq?=C?l?n??8?=?m;?L?(]C
??m?;???}???U???
?s?o???#>Xk??5\??#??E6<9?U?^YXP???K?
?qZ?b?$?????????UoP??i??/??Ndu?58???~
????
WX?i??_?E[?8)?~q?????V??aKK??????)b???X??x???H0??????|??NX?U???/?u?:?1?g?7????????b????q?9 ?J?I??Hl???_?????????7`4??U??(?$?:??*T'??????]a?vwt56{?#?????????5?t?/]?K???5?t?/?C??????}??F???
uQ?X???q???*??S?i?s=~MW_?(??W)?^??"Oo4?]?Eb????A??u?mpc?O???U??+????;5p??`H??????5o?w???k?q??
??>~JeXo?N-???H???A??A?u?j??????q?=W1-h?,??????????????[?????b?1?`????????hg????W???*??B$	m????a\v?j??? ???}???1?:Nh{G??a??KV??a?a?d ???Hg??<R?a-???\Ka???IWO??Q?4?l?2Q?j?q??=fx?????[????x?e??N?m???#[???????????<~?e??;?c;??-IYyDiO?Jc?@?u?P?!nh?????<R??RNa`M?m?????>??7_?0.?Z~ Y??????wV?p?%C0)?9N???????W??l3X??P?????k<T?(?d?&#O??$?o?????$V????T?>??t?4????lO{}?w?SE?~U???G??????&?????R??j;????!?;[?W?Z??p??????????&??9o
-A?????j?T??,?60w? c?J???])sW????X???8?^qD~??????-??Gg>?u%??Vo????1????e??i??????XF??tk&td*lj<?'?Pw??Rg^?%?LBTdP?????2??'&V???l??l?FW:?L??v?k!?b?i?l6XQ??V?j??<T[?i?)1f??????y?)?+??lsR?If?fM???L5?R?F?.?1D???4?R?s?fP???o
?	??-`
?????l?6??q???scSpIS&?0??&?;?E?????WX??l?Eq???m?????z???!XAqr'??4??~??W?T?????	?5??J^5?d@'D7???-?4j??8?cI???9vQ,??\?
hh
??k-??`?q???????P;?j?g????1??M~#/5F?u??p
????<?z???l????
/?Q???[?/?s?K?6x0?'?{?@?"??92?d??Z??-/?}???????d5??,-??Y?1?+?!?b*.?l@?m?eBJ7??x?(C????5?H??`?_?]??~????N?J??W?o~???A????>y??????af^??p
??????.<?
v??_	Fw?????^?Q???:?I??n??X?nd??E???*n?h?w?6?v??`0<??????:???<???r:????3?.8y???kn~?????????(DQ??????d?&?Q??g$2?nAU???K1?????????a??)??E=?%????vj??-to????3????6?~??<Xlg???/_?(?j??????8??????1??????jW??!O?9i?Ct?M:t??c?????????O?5n??/@R?B??c??
M?xR=??/????]Z??K??????G??????'?o???O???????? ??_? >???k?V???
w????,*=x?A??[9?hB?0???#?D?S???kw??yC 6???Dc?~??'???Ei?y?t???Lr ?J~???U?|?1|???????? ???x?????Fc?&??#?1z?\?????6?\?P???p??9P?e+??5A?
U?+???Nd/?????m7??v4]?{?7??A?fH?YzK?Ba???C-j??
?	????g???/Nyv???gS[??g[?9p?7_??,%?????G/+??????N}?"?G6V???u?[P????#:?7^??t??:s???C?#?^u7??N5???2
?c??A??M?
?s?@??ssEH????~l%????@a?G?v?l6%??k0?P???Y7?????
??????'???????Sj????Jn2????vk?&=??????w??y>L?)???N?D?d?????#<?5?s:	?????^*=?M?L>?$o
?a/???????}??????????%?P??6<5?N???AN????a|'?nogJ?R?????>?/	$@O?????r8??@s7?OE?2kIYy12??l??N;???G?NJ????$?1i?j4'6??xDKb?
|?+?G????G?p????Fb??????{?l?????_??	???
?p?=D??(P?S?????@???i???bbX??N?'????#???i~R???i?Co??;?x??, ??l6?d?aAX??A????S? I4??1y??GFZG4GW?Q????K??? @???????|????&??????X???s?Wq?@???!????
~cVF? ????????
??????h?P}?Nvs0???w??s????y:'??E',?`?????^?????;????	?I????y<aX?????d$??+??1?\?C?y?L?m????N?]??0??t????,?$j(?)
'[?S???|??D??\???]?(B?q???WK?I.!?	Y??????b??D?3?D?K?FB4b??O!?
mb?*?JU?\6???"bB(????b??1???%???T??????}????E??3??1???????u{1?Df0l??eY?????YKK?c??Z???x\
%???d?E*?<$?*?V	??`y??&?(??P
?4?.4?????kV??/??F??!]1??????S?`xtO,3B??;^??.
>????????? &-???@+?y??Ik'??Kv???Z^?????????=????[)-H/{(??D?K=2?B??t?[???t?g=??'??????%?`?F?M??6Q?K?p?7?????????/???5???\K????by??%B?.>?K?_-????#R????	khu??
?1L????1?w}????q?_????m????v??K????q.??
 ??"@ @?w???x?NJ?m?u ???r?r<f?3=?lNWc?z}??DMw.f???8?$V?(???????O?G<Fh??C??=????6????C?c??U????;??????&n?	?Mxl?<?J$?r	?HhE???^d9??z????x???Ho	?H?E?
?x
?[n???G??,?p0j
a?;Q?^???x????i#A??b???
?????&?"!?
X|~???p????m]\?c??g%?'!>??l?3?7???t?????=?p?o?6?/??????7??M?z?J?????U?Vn???{?(<~??E??#M.???&n????????$?????????C?u??:?gu?S?Gkk?????Y?g????L
?k}???{N??????bA??<????????????	????s???10s????-?
?t_a?H<?u<Q?-???????O?%l??xa	????,j^?;?
hw?o0?9?^@FF??'<+?Y?_??Dt?????$?'?
N????T>?,??????'??Ph?2!>	?I<????#8??$\/?z?E?o?????
?>??(?x'??????p???
'~??02????Sq???'????]?&
??>??,?8'??????7p?
?x'???701?????I
:q??0???C'????t??y?C??+t???????U:\?3=??mf?E???G????~??e9>??Q?????f?9????????p?f??:1
x~E?u@?qX??????3/?k0? z@?
???
	#QO?-G&|? ? ?"???%??w|??3???es,@?????n??6ki?}??~??
???z???p*???ky?[ ??:w<????? ?\?: ???????????F????k?zfz?#??>????h?0B?*??o???/???????M???^^??\?q?f8?#H??????Mm>?<??	]?#49?
^
??8?kYn?`_D????(??5?????#?????????$???$?$a%6+}^2???d47Mg'?{????1????z??????'	C??f??d?j??$a(	CIJ??|??????E?'?'5Q?
?rOJ?KC????a)????_I??TF	WI?J?Ub??O?VF?????c,??et?r?[R?l???0
?D?]5????`????u-V?k?i??&:!Z?w *??]<???????p???$???????Nm??g?4xN?f?[?7???t?[??)sf0+4aY	?JXV<1????????	$9??E??Y?E?????;??????j?x????C?????%????x=?????F?????i)???????+/??<??.G?V???m??_%????????H?'/|?x!?tx???-???u?7??????3??WG??q???J1???????}??r?ac??2?i_8O???S???G?jS*\???I?YN????????x?a??i???o
<?c??d??W???B/?s?S?OlhZ+?AlZ?s{N??6???i7???-z?&uL?\&???3a??@)?????!VX?*???z?3D?????\???5?????ID?q?\??o??????\??{ 
?B?\????[(?? ??P\yo?^??.?|i?x????????i\X[?1
`??^6?????"??.??3;???t?u3=p?R?L??R????#?$v?`ao???`?l.ks,p???U?E??Q?????f??-?}
T?????"0??Z??J???b?
O???e?7b}??O~|????(???ka?o???O~@????'T?)
k?[???&?r?&??D4????>Vp???l????????O'[/?z_??wLV???n}[S?0???B<?oCQQ???W??????$???q?1Q???L?B??Z?
$??q???q]?????:C7??A????F?~??V&???H"?'??????!???cIql?3?????s??'	?O?~B???e*?c???????+p?H{\D?vp?o??? ????NB??d
[...59749 lines suppressed...]
p??8+X?R??????%???q?O?'9fQ?RS??>?TOcO?f?G??i??p?^??J?\???O?rAd??b!?8?Z?7?`???^%???kaU???D?????Z??p>?&??;?n*??4?f?F?'?:??/??w?'??m?W???)
n89????i????l?Vv????,????M???F?ze??6o???K#8?1????????0ta?t,4??U?6?1??O???m?Edq????F?
??X|(??r?
??X???????&!/l??4?"?0c^?%???&*R?w?i?`?Q???g??	??4h????l?)0H?\???
??4?]???i,??|H???c]3b?*??"d????,??*@f4??E?????8??oV???J??MA/?}???0?"-?CP????????#??????06X?!u?Q?)
?????????H?(?
??L???N??P&???1eL??,J.J?k#???Z?vlG[??3?R?
?^*?P@?9???'/????J???X?M= ??RX?eXc??????H-?dqY?o*?q?)?`j?_D???F?#8.Q?nE?H????0???L2????`Q?W56
x&2Cs?>????'?*?\mp#Tq?K???=p?p4?bpLZ??J??N?+????`7D?DsA'?Q1???????\??.F5j??}.????;?c???Z??;??^?<?#??4VfS;?????;^REd????oN=????2?????u???<0)?w?q7?JR!-1fuZ??????`w2????Z??u?x?*Q?b3?_1?+UE???\}J?)???=??=f?0Wjd??????$???S-?(??B???????D4?G?|????s<??"gkL???b?
??`????4?G*??1?2d?H!?!?1N-?i<??2??????%????:??????????P??p????	,??????+N?????fY???!9%??0o?Ve?<)???Ya?M?}?.??x??0?J??O5?U?nI?a?$??
m????I?o?@?)?q??7!;4??P??B?c???\Z:&?&J?y?>???,??^?{??
%???r>$<????WY???mI????Xtq???o???????(??2?7yx?n9?4?&?L??K?U?
?????b
?UA?J??????B9?I????\5?Hg???r?/?np?I??C?9%<?@?>c?J?4?eLJ@
?p>?a?ynF?km?g??Z??P?y?X?3???2-x?&?k?10???e^??R1????9?igi?6*?!??)j?^(z'????????F$???1.??[+??%/|W??????Z??J??*Q6C&<2?E??)s????u#??)	?WL	?J?K[iqN??4b?L?<1gN$???7%??????tU?H%?????B???X?,?W??+???\?<A?=??y?j?	?????([??J?D1|?=$i?Nqc,????:T,?????G?6Nq??Tx?5#?
?U???+&m1&?J?cHU?Yd(D??r??????XD????????_???x?Q??T???HK7?(??>?S??T???????D?Q?????i??y?k??R????t-?;???Ke.???????????WE}???@?????????L?e.??	?W??(n??v??d???z???	3?3.SY?O????9??R??Z??K??????<?;?????_?q7?? s?3??H;w?
b???Q1#??t??v????? e?cB
2W?T???%@?BK?l????Yxq-1?"?5-T????
?bUl?i?o?r?E
?8?,?"?????T4ib
?@c?0??????iAc)xUy?%???
Z]?????XPB??O%?7?4?U<??[?mRY???????????lFYz.eI%v?n%V?6?q?"?)gg???c?5??/?????/?p???1????*?Pb??JS??Fgy*Z????,??Q?"?????g$(??J?c\F$-??????????Aa????p???
UV8C?pztU??t-??")?d?[????b????????B
%???U??u??HOXA????S#c~?T??rg8W?uA#?<+%d7jN?i??.???"???EE?]f??i*????J@???|??$???\~^??X/$enh%k3???:?*?????
UF??8??O?B?
?cJ?D?b-r????Kl^}????e?L?/T?R?_ny?JeNYLX?`?8??.???J?*???_J'_?`6w?	0)?}p@????????y???B$??)??eU?,?b????lI?b*n?????:Z???)???)\V?]<????8?TZi?cl???:-9%?W??d???]????YT???x?????R-??Z??c?u?G ?h^??
?]???*???r?BLT?B??xs]8?0(^?Y???x??F????S?x?Ba??N??2??1J#??:???Bb???\?}t???\?,?????J??(??X???c??t?P?$2ft@???#?y?^???fq?p?L?DA???r??<?g???w???o??O?+>??W?`Q-uYQ.C??/HI!??R??$
y??
?L??K?3?] m5?i=?@??V?G????k0v?????eg ?????????y?~?Ve?^?J?_????r?~????L7a???7?f??????Xol?????gf?[??"?????Ig?
???a?????)uq?????;M>&?G'?_?t????z?A????wo???x??f?)>>??^f?dt[v<M?????}||M?L:?^2?????i?q?v???d:
r???Y??_?x2z?????-?/t??A
??J,????`?g?w???(uln??T???????hrO~?	?q??)???gJ???H??'}?dto?'??as?	???f?.?e?e?d6L`???`0z?^?????rE?AO????M?????~g?A??w?????|[?????WrW?[`z??M?R??i6?L??k8kG????.?c???&?M??M`????x@?????Y??B^^OZH+?3^Vw
$1?p???.^pV????>?9???'???(??+/;??4v??????s?
b?????Zt<v???)14?W?|?u?W}XW???0???????z??{J????v?g;QK?>?7iL'yw?Oef??A????I*????0?F0*?s???Y????????????????B$Z?y?????b?n>>??@o?????d?U?f-??7?i??2@{????M????GC? ???	r?I??3?bA5?????@??nbs???F]?????lB??e?N???;?????S??W??e?????c?!??	?6?7??@u?????I?U???[?Y?aZ?????&?"??W?,k
F
/WF?^??0{???to?????hk??????|????l:????&=?
??q{?W?J??$??a?x!?
\b?w?'6??6w?'Y????_CeM?????b????c>5z?`L?W?a?u??_L?u??@?k4??;????O???????{?S?
?????
^<??N@	?&?n5i??'????Z?-<#;)9?@??I?{6???????f4?M??=??yrv5?]'_?'?1?IQB?
????????\?=>??8>=?+I?>?????M??w??oS???^?%m?????i2?$G??????9?k?gaz-?~???????5?Ho?W??????d?E?Z??|i?q?a??&?????/???.M
???????????kPV?9?a???]???????l???`????????????
???Q??1??=??2??G???????????=?@o??.,p9?=}ur?T???????????A+??|0H???T|????i?[]a????z?t???L7?????=Br?9FE?;U????Mg?+Y???)???????/?????~Jy??;???2}?&
G?k6 ??)????'5?g?g?????7A???Z?mg
??}?|1?n????p???	?'t?k???~???m7@?1?f???T????Y??????????$O?o??[??uT?W????????????????64?????h\?????;?Xq???!??Q?`?????k?
4??c??-??7??`~???q?|?????|o?0?>???(X@???
'"?4=?g???+???e6?l:???=???^??h0?$?a??f??,`????s??,Pz?5??+?Xa?lwT?Ss???w??2/$~??V/YO???W/^?-????1Y&??I?hf??7?@?kZ?????~S??>????4a?;?????^0~?n??)k?????j?,?_|3??e#$a??5{?k?d?'??0?@?p??????????@??7??7@?P???q?s??b?b??k???|J?#????????I??
SN?;??wpx?????O???{??J
?????DE????????/??7??/*
?9??N?4??|J?
_?c?
?U??a$??J?a??????f?q??????-???_??.?=_??(?x?
Fs?????/?{??(?CO?Q_?C?m?2f?

V??v???h??+?<?6$??????E;?1????N??/fq?}\?s????%???7???)???2?????????=?P6??x&????*]???b:
?w~t?????u?g???6??M3??j?-c?????=??L??wN|
>n!+?????k?.ib}??t???????
~??:~??w???j?p?=??c>??>c?c?
?;??}??j?7O???????9>y???o%
?L????Hj?G?@??O?o??8???J|?3?m<???.??]O??????P?n??)??H????7???)HW1???????^???f??	?:(?7??s??O??u?P??8FG?n?????t>fB???F??M?P??*?!??g5???????b?,??????n?y]??1?I??????r??????????a??NM?#_NX???CG??w?-/u?7?$w-?/??Bp?"'lui??
?????0??az4?N>Vl?????NN9TE?i?yS?#x?
\????Q?b?????a-Y??????Yt???????u?1j@??Y6????/?:Zk??aW?v?s?M???l,?`{?Q?U?'???e??I?7????????v??E??R????*?y@??a@??=5?u?????9?x????m?"]5)~{???w??C)zC?j'???? ?A??Y?Nb??fY????<???p??J. ????/gW????H?g???????b?????a+<?0?*q?_?????s??????????^/i?*?????oxm??52????-:x?/um~$+?av?A??????I??~??/_??????E???Z???	l2?v????0??v?!?=D??s?bVk??????
??,??Ck?1???6?($?[8s?L??&?
?f	n!??????A?7??U???%??Z?vf????	~??_?2????1Pr??:
?(h{???&?u?O?az???C??}?N*?%??Pg
??? ??;?Rj?W??jqz?3??E??
?_?U???R?3?P_M???w+?ns?????
T???$?%?3?u?u?E??=_K<?
iC*c???u???,+p4??xxzr?Z$???????????S??????76?-???????????????#$V?}?	?e??g???u?(?
???C?G ?g???????I???p?Vb ?
4??V?l!Ag??O??[???7j????g???%???/?/??MZ??{??$?6\?H?
=??=?????}bO???=??"o-???&i?{I?\?O??????0?~??Dc???|w7???u???/?l?;=??????????o???0?O.??O??q]c0???g?=??????F??
 ??2>?|?I???
??U?
???zK????????9?1
P?Cs6?tc-?IzW??6??1?:2???2???bz??r??K??M(#??
??ja?r|?? ?????E???{??j~?,/U?Z?????
?p??8?????
????}w???e??k???W?l??????&?W??z???O?????n
????????y?v?w??[??N??????Zoln???????????| ??????p?????-??_$T
l?????????w??7?O%???dd????3??v3??w???43?Q?~???l?c?Y?O?}
W??F???(W=YJ.3??3????|?J?f?c^?e6??WA????????h?C?D???88:?@??gG-|??<@?L????	??)(q??\?Q?q3g?j?}?H??vF-??.???????%f??/?g??b?e??k?h??%?&;??)?8??/??}?`?????E??0+?Z?w??{??8x??????a??/5?iP??S?kSY????h??????h?????njOPO?h?`}Cf???0	g4?D??U?i???oh?)m??M?7u??????]???!???%?'??????8B2>
FHfu?<??S[??3MF0?????????K^v???????z?
}????q???7??]??C*[3?z??????[t.?JMv(?>=?g????A?^????-;???mZ?z?????"/F?6++?M?M??h???p????P???+gLh7?a?;?????9??
z}/?n?Tr???B?2?{?RL?????	,?x4??Nx???)?/?I$%T?i??-??!?????t?|v;6u$pi\A?Lo??:?"?`?a}?uh??'??$U?_???`??=%??????????]?7???u??.]f?O????IT`h??y?^o
t?)f??7?DMlm??3Q?;??d??
`??d?????Q?6t~????eDP???~n
?,??Q-C??O??G??d???7a ???H??h??9t?fV.????,?
?M??[?/??`??~???#
??U`?v???j?U?
????Y??6O>???}?!?6???k???n"
?U)????7R???????F?????vA?,S	?|??????????{??n?/??E?M??i\?????/??_U?k???|???v??1?V??H????k??.?j???????R???dJ?????+?,?!?di9???LV?{?;????5<
;?}5?
{O???????d?p?c??61?z 
????????,.?M-&Ohm?8????;? m??
???grK2?'????\???)9~qI`?}???'6??SE??M5?j???kv??G?W/.*??????????L?????N??hI???ZY?O??D?^1n?c?Aq,w????????:????(?????1b????????z??zS|?M?O???v??????N??|>????? ?????????????\????G?Cir?????n?|???l??L?J
?UD	9?M	??j?v?:5??=? ?,??
??? ???P?????mW0?j???????J/&?ls]-x
??xJ??>t{`??P??:h?v>???O?O????+?c|??C?lF?8???????oZ5h?bT?:I6|????D?
?M?j??S7?NGs.7!?h?vW9]???R???
??^D????%I????dq?>????l?7???g??????+?L?h???????vx3?wlE????l??'?$????V0?HP???cVg\??????????
|6??_<?'??s??EOX-9?^??%k-???W??????????????3??`q?I\r8??6z`
?pA????.?????;???O??S?Q6?n?#c????A?xP.G???;uD??/??O?.@?????~F?????-???p4\%oR?v????P???m&?P??|D?v*??(?aT8Y\]$w44#?I-*???w[?f????d????]?ne????(? ?JW????G?*
????d>?h??9^??HX?xt=??Z+???5???=?Ae?3[W?vf)?Xz???z?`?W?igm???e?.??/y?z?~??Vm???U??>????????I??V??JRA????j ,X????eZ???}??a>?Y?????]'w?????J?
H??p?'?*?8L?n?4C????v?????K\E?t?f?H2???D??w??mFG,?@\????qM?:??T\?lo????fY??2/*qTn!w?p??u???&?l?XSy????~?A?t????lE?4p
??n?pK?U??8?m?B???6?;c???u??Tx???2wP?L?es/j??:h?Y?q?o??i|?l??Z????Cx??
??P??????+Xv??nI?????????v?o?|??n?{?,.O???d?3mDc????o$???k???=?z????|??=???y=??????????_???[n?<?rZRArA??eU?h,.?r
j?;???j??a!9/vVr?
???QA.??6???t???s??g??Y/j?x|(G_??:=????)?`
?????X?;n???x9P&???,?\k?????
J?E??D	$??M??<??W?Edc?y?-n????mm&`8???????? k?Z?x?s?5u?/??2???????1??'??*GM??%o???x>@F~|\?Ac??C&?_B????h?jqK?E?=_?=?~&????h?D?????R???????,?t?z??E???	d?]rR??A?W???Ro?-?d?R??P?TW??["?#?)(o?M?????|?'?hJ?U2E????z?9O??/??ml??O?0?&]??M?{5?MSh??6???du$???NJ|?e?tGSiB?g???*1Y????Pk???
)T??f?F?ww?de~?~u?KS???]o?.?;?????[???F?H?!t?4???KV?K??hi??????o??m*?WD?;
?{??d?????P=?l? ?BZ?.g????W
c?nt??!???%A?-UN?'???`?eQ$;??B????S#??|W??[?F?@g?c?;??E[.?
S
a??@
?? ??e????[?????9A?????????
Fy??k??N???c?`??<z??Llcv???????7/?d?t?/H??Sx
??T????
/TqX????GfO1+??u????'`?+A?O?$Q^k?
eo??@?s?????
?a?k???}do??
?;?0?{?4Qbx?|????ECh???
???F)?;'??????K$?bU??e?`?,<????}??????8??|????E????#????V;?+?????$?.???V?}?E?????mK9???G?{{?????^?W?????C?????m??7o????%?@F$m?{?y?!2?b?Y????e?????I???v?#s????z?Ra?J'??f?@????5?Ti|?=?I?N?my?g???????@H???? 8?C?4???S??,V????????H?L????i??h??*???9>??c???/????t????DD????oZ?X|W?????8?X?????_?E9?O????OW??^??^?k???0?JH?
GTy????j???v??k?????RlT?y1??$`?sL.??!????v?,????8??
[????H9D????
??????>?u?K7?D?z3m?o?
???[[???_L?A?r?>C?w?	
??????????I??]?u??????|?Y.?
h?GQ??AjO?X`?
?G?.??M?0?ib??????\??6??;1??5?c_"?
F????
??s?7j?}Th_?f????:z[?/E<S>b??????E?.?b%3??#????????v???zq?S???0????_????*?o?Z?????????%z????g????I????
A+1?$&L?????	??0&
???"??.x?q5?????????a?Ig????k?1?%
???l??d?_????
C]?M?u&???8???i?=v?:?A?%??f???u?;?V?a???;?^?o??D{???R}Qy6?????]0:???\????m???t??4?w???????UxK&7?P??$X?a??^?|	?????=:?h??m#?T??????(C?cM?iw???n9?=v??-Z??(??
???eT?
?k%	)7J?????X??ks?Gx?/n??"?FS??B?65
cO??	?D?akw??&??d?\???????j???j??jD?e?????@O)N??$Z???M|	8
\???????????
ef2Lu???????Y>??v<`<L?9i?Y??>~z??e@??Aam{H?B)Dv?t??]QfR?
???pT%????~???ynt?)?e??7?Y???????~?l??v????VE??
~C??????ny~??W?????????Sb????????Z0??>??????;y?????A`|l?
??[q????\Z?~??*??igmiX?T?	?f@????????*??+/G??@$?+?$????a?>?L???D?6??????Pcz`2??(????
???
?
???L>4???-Xh??o?a??????!?&????n=??]??????l??,3o?2E?m7???#??+?fV??WF	2	?u???????/???w?????#??????#???????????b?:????hon?q:?9	??X1??dk?X?5
??????P???????Jx?Z? |??	?????k?u????r????D??#z?Y??vvz~1?/<P+o???vR9???????????n??#??w?~?wJ.S??N+r|,Q??`?(???A?????jn??UbD???^d|??mp<?`?X??W?P?	i??4?<(}^
/?M???'?RG??^????\w;?t?????l?????1?????x??'?~?Q????E#?
3?
??m|t1????}zv??F?????f?A?gv????y?<?x1Az?:?q8@?????k?3?^?S??k?]^?yi?????A?9????"?6.??KZ>
?-???,v?|?ee???xL?)??s;?X
????x}?????????xy???A>???u???`?5V??jc;I????????!??!h}??????:,o?3????
????Mk???zR!?<>y
????\????)?n?vvP????JT?!?F??1d?F?g??3?V????-22_O:=?R~?_?%Z?hv|%?&#??4?J>B+&#??6S?g5?@(?(vC9Db???j3??!m
[?
E?)Z???y???|?m~IJ?????=?j?S??[?????.3?%??R(n4vS?????Z???a80>??2?9~
???,???	??Q???_m??;va????????v??f9?O9?B???h????S?????bb????mmo?'??%?Ij?p?V????%r??9["??Et?
???l`???_Q???'l??(??\???%??r??l??j.?w|??!8??\2??"?6???V??@?.??PV???U???
??????g???qyt???/???66?6??Fck???????????q
????:,?ns}w}#?^d????s?B?????:?t??i??>?<?	=????????I??G5+??}R??o?J??9?#?
=LO????d3?I?????.?C)d???/k????|{G>z???0?%?R?/[??x??E\?@8??Z????(ra^cF?Y???M*?lB???O??u?Yg??v???????mCt???;jK~2q??m??24??@Z??,oS?????Gh?g:??J?a]+???i#uWT?o?+?|u??4)??O??H???o???<?$??f??"??.???????[G|?DutO???G/?9:oU^????????j??UL???
a?nOo?V??*^fy?Cm?	??kP??s?sI ?8??=?d?;??&??,??O5T?????/aDf	???{?^??G???m??z??C??????r?(e;om???????!r???????????+?&?g
}?@N???k?r.????or
i??/?????v!<???s ?%?????>=????????n?0"\??U???R%b???QT?\?x7x??c<????????-?i??s| ?Z2???J?VS?{???????>>???H	oa?\?????xOE?H?
Y?U6i?q
.????p?=Q???.??w	??|?FA?Lk???1<o{t??>?Yl?
c?????0?%?4????ovj?Uq?JO?%?|aC?}????}??x?v???{????H?+??J?<Azb??N????s5u.??M??5g??????l_???nG5??????EQ???[??klg??O?A??<?KV?q???)????SS?4?????+&BK{??<??%???_???5???Z???????9Jg???l?x???V??6?%?|??z9m?(?
?'?t???
??-?zsg??{???????@k????3|@9 ?a?(M??P??:?g1?????T?Az?~">[????FX$dq?.:???E?|?J???rpuJ?W???W'8j?|uRB?1??4b??<??
???p????????~??%7;?lS??y??`? x?|!???
K|Uf?\!]
]????^9B???:?o?????????[?M!?W???S,?T???xx?.???
???
]??2?????-?"???C?A?N???????T?XrQ??????p?;?	????nX???k?(?{W???~uR??M???????>wM???????????#?S?/??/???(([[g?????p????????6???(?c	?4???Q?`??g^tL9
T?m?'?*_?-9z?466??p??fo??v?7DcS??Oa?k?>.?I??'1????1????=??;??	iN3??r???};n????]???gi?PZsk?hN:xd??~Njja
???<??=O?????????|??n	O?ro?C?'OO*3p@????Nn???????}???4?}?M{?x?8Q~?\'????_??b`n{??
?????Z[????Q5W`?8???7??C?^??KUDg??,??-y
?????``'?i???}+??
`c????E[???Y?D?-N?[[7.?t?3L?#?
n??N???????(~???)?o????2MaI?????????q?L<q7???|o????}!?94m,?bsO??XH-?W??'va9???V?x?~qz???????????G?+S<???a?@(??????
??y*k2??~????w????
????A??|????xs?g??-????iOn??Ke]7??e??;??ej??0?a?`?????????Pm%???@?ru???S?~o??FT???e?u?????????]?]
???g??0?1?r?^l???FM3?%s?=Z??a<??t???
???8?G??~E?O??9???l??r??????$???<%D???,??:M?|J??]^?P9????3?X???U?<v????Z???,$`????ypq???
w????v+???????c `vV????D?PNg????DYO?eu?*x??
P?	Gf????v???e[Rv?A?2?.?`U??c3HBT?7jX???)?c	a?w?X%?s?????`?x??Gz??R???%Rw?}???'1?qpzrq~???`H?????K??0d$?k	r?rc?^???2?`?????i??c?q???p??E(????C?9
Y?
}!-{??)k??`w?V??)??l?Agx=??M?45??????@q>KY?/?*?????MF?y?R<??O?D?2V^?-6??0??EN
|???
6??:??????s?~n?????*v
j????M??N?7??&????O?S????3??u????i?v?d?YM?V???r????r?E??~?H????`???z,??????`???c??^???Q?g?????r??&/??l?.o?WrS??????iwjr?}?????1?c?%???*?N7???1<i????5???????:??SsX?%??t5?R?_$?_<?}u?????|??E?~??U?)7??Wn?<#?=???S<
m????????7?/?/~@??????Q??????'g????^??'g???N[?
??????b?Y??^??L?4a<5???XN{l	9<&Y7???*?] ???]]d>??????b
?I?YK64<????????4YM???,?I-??0>?rHZ??????Uk??k??
?'?Q=?g85????f???~C ??an?.?h???Sa??P?&V??N??????.??F;
?l;-?o??X?'???
?v??n{f??	??:??Y'???1?.LX?)?!????7??
t,??8???????i_#?:??9???????Q?73?U{??T???g???hB?`?tT?nh??3?	c?d???_??P??"???u???e?xT{????7V"??KFFM???????4=?? S?{?f+v??m?}????2?F??????[??U?6*;X?<:??QHfG?G?G?sx ???#?+??????zK5"??????uoF??R????????%?y???V?-?????=Y?Q?2?????????Q????M?]L?f6??	???%????0?
??g?y`?Y?*??M
,??l0U??????c{?9N>???Q??<????.??j4?Q?X?N???wB ???d-?_R?T?&??d,>????-?\"??????%j????VW??<@Ps?
??9UN????NR??y??4?dQ]L>?????F??????"?g?I??|i<?'S?l@?_$???$MlN??7iw8??_??XItu?xw??d~??1$&w~D Ax?]?={??m??
}???&m?E?ZR?3[????6?^?D.?
M???t???????X?9?E=0
_????R??-????3??????d1????;?];Q3Q???H??
???|?&?(?Mt???wW???R???3N???e?D#?t?
?????:~q??????J?'?Y at 135??\b?y
????Zi????	??,??#???;??B?6?????`F??n????^?`????G?
?@??K~?\??u???Z?8?J-??9
????7??g?/S?_=???C????~t???5?f??????%u?D??e?????]?;O~\??^R1	???1S??z???[???dr?6w??????????[DVa??I????
?5???A??\?<;<>?/???_pR??T?ax5I???;?o?8????ya?{?=?[????	??]?:D??l?_??+X???_?[?Q0LO_????3KK??&?????b???Q??????/?t??????v-!P*?????=????>qW???6U?3<??t?5?8S?K????~|?}[?_q??Z?Y\?K?nb?_&???
?k?~?-?=R[???*??????~?a???/????t?d?????????c???q?.u??.?U%{??&?0???.??Q?``?E/???>?91?7????Qd=j?59?[lSF??????j?`/?????????s??	?%?${?]??s?%p0J??9u???};??i??)????5??T???????4??????G??d6?????7#?l5?^m??b6?U?V?B???+p??????u????Ij???3/???!S?1???=???	???????8?oE?O???????~h]???????}?????yl????y?wO??-?g????k??	R??? #w?%(????bK?0?sX?z8??M?o????s???A?`{??\?=??@'?+?+U???3?/??CL??p?G???;c4??tTPY??0?F&?>???????x??n????:???d6?Z?Ew?]????3????
?.??
h????zD??t???G|???
?Mr??i??[7???
k????,?B??u??????3???
?
?
????A????X????fX)????c?M??v?|.??u??w?}t???30???AT"=3?T"???v?q?8@?Y?\???????u??'???(9o??m4???to????>X<@?k92?%?^D?H????6?'w>G??????Z(?l??!Vj?3??.?.????\?? 7u??g
O?7?l?o??\?????Q?k????b?
@-?V?^p?a at 1??
qc??=???????\??mZ?????ono?z?????a?l??F??k????]???s?Sp?HK?nC??m0???r?-^{ ???_??I6?/??p??w?n7?R??)n8??o?MG?O??
,?Jv???*??T???s?5?h/;?????n??O?8l?1????%???"^/,}?G???f?X????5??-A???;}???6?;????eN%D*P???L???=?AA????|???N;?>r8??@sv?a??8????Elv???N???H.?~w'??n%I~L??d????-?Iy???.???w?/P??_?Wp??j?M}e?????Ob?[t???+?(????y?t???????????O?^?????_c?(????[?7?p?c?J??t??1??c?ez??3?}????J?/v????Q???/v??
'?=$+??C?Aj?qid??e
3c??????y,eZ?#x
hXN??G???(?????$>??&[?A???6s|??FaZ??????D?;?]2w}s???zXlgn??`g0??????j??1??+?iV??)??	Q???	:?~M:??&??_?R?7?V6?1?ztS?????+?J%Q;??Z$??9?
??E??~4&????3????f2E	`o?? ?G6o')???g???n????FM3Hjh???1bZ???J}????m?&??????x???	??^`??G??'??N7????D?	?H[??>^?x?/??6?????C?w}${????o?w??|is?[g?_w;?????{????{\?K??K?{??)?S?>???wp?{??????o???????G???o_[??v??{???y?\?Y????w??????gT???>j??t??????????$?^??2?l5?????!?A????}????}?A?]6?Wu?ar??E?_??>O?f?G???NqHu???>????7?!???$Y?????????????/ON????u????????????e??]]????vp;??{?Og????3)?x??????w}?W?????k
???;[U?ls?X[?s???n??(k4???&*??h???n??^??x?????????uge?$I???????ZhA????[??????l??????V??A:J????^??M?7?j??(?u?Zk??q??V????%E33?W???k??????
z??w???????~"?CzN????????@g??n?????T7?@???I????DW?BNnW;??W?#?hw??Q??Z????vE?n
?????y????}~??????gg?.???9ff?????????z???g???????1o?:?q?>??F_???^??V?e????Y???c?=?f???suY?\?o???r???z???????n?f??z'?/?????Se?x????{U?5??????ic???0|?Z??GqkK???????c+???v-;M?u(??YK?JR??????
????|;8??B?g?????j;?UT??^dO??0??8???-?k???P??
K?Jo??OJ
,BQ???}??Z???2???E'??Qm-_?"?t?"?x??u??xX+J?r??g?Rp?????,(?b?l??a4<B??[????<R?c????^?(?W?'
.^?v????V??
iFO?6e$_H?2?H?r?f#???????????,?M??Cgk'j??C[?,9Q?L???iJ?,?o??3?u?(X&???S?/?h???????YB?"???I?>?t?_??e????/????c?j??????E7 j?*?,?????????l?l???}?8?:?g?l?Z??????Qk????D?yS?x?8?;???f??6z????g]?"
???<?(U????*????:?o????t+?G1I??????I?/??f9?Im]??vK?????#Bp???????o??_E-+g?%K?}g?}G`??h?El5i????
??S??5???Df<?h?????(?E??"?????7!??(?U?~]???Z	????(???[K??^?/????,?????YV.L?g+~?X??????Ka%q?.
?bK?o?EHzC7??~EJ.T?@???j??u?c	OW?x????'?7???Q ?????Q?/???E????X<????????!?:??pc?????E>???<
?????m;?(j???o9??Y?f?VT?<M?u<-??s 4?Fq?H$?6?$???v?t??M?A????Vt
???	??5C)?`St?\
a1i?+??L????-???$?8Q????eeE?lYYY??????nnh?????K??Z?N???t??E?
????*?ja??x?B??,?????(X?M?????E?@?X?E??4?G\$?5S??Yg??u??r??0d??-4??z?????OY?gNM??????@?q?4?"U?g?>w?f?d???nea(g???T?O1?FT?.M??2@X???.???3?*y?;?????????Qe??????c=?fU???>T?j?????J??R?X??8?W??5?rP64u?^I?M?+???m5H?D??????1	???F?wg??l????L??:??\?^?????"??Jm?_YU?;?y??eew?5O??e?Od????O?Y?9Yo???B^??J????tv#/?Je??W??<??"6@?&?7=/
??0???e??5?o???m6?%?YE>???y????g{7? ???rl?????4????!h???h????????\???JmR????]_&a??idm-???,??E????*????g?Y????Q,?X??e???
LD{Bh2?????nJo?p<?d]8??=v^????L$??YbM_)???2??Z?1?L)?+?wRt^???K?Pn? ??f??,??q??w?H?;c?p??+?2?4'???r???fmI\.?n9p=
\>0L?????+z?qR?m?*??G?3M??J3H???,
??d??bnl??r?`A\??P(
???T&J?'?,k P??ywF? ?X?+uP??+?Hl????~??Ne??????^?4?9x????;???^?1??????j??Y?Ew??H*qI?d}JW??~GOSB?WiC?h|n????Q?GI????z??P??M?1?????-?Y?????Rn,???J?b?m????jD[?.u+?????????? ???
?L,&?]n??????0@???g??I????9
f??\?`>"M???~?(8???????!?{>h7????oc?f???6/??u????xp6??z???:4??!k?X"???C???j(?^?y{?B???l?!'g|????L]???<??/?J;??xk????_]m?\?RF?;x
?#4?j?`??W????g??'??M@??e?O????n??????ze*Z??2????$?m
MF?)R?k
w?>VHX?V>T????????u?U\vYT????^ b?????Kh>???B??j?E?j?5????m?????vj[?]4;&ryKS/a|?Uet???2?????
??^??^??????j~??U????????N?????aQ???J??i?o??	?tY+?? E????p?J.?A?????v????Nb???mu5??dIh|?=???:?>?Q?!?????|?}???
oY??????=}??)?????,!?????7I????i	????>6)?G???l(???Y???|h
G?o??b'|!??????Ut???1????W??f?:6q???n???bj??[????,????'oC?lH%og&?u?jH?????4.??3wy??????HD??'????????k7*??N????.???.??+?}uD??w?1
y????N?????3KMb???e:?s($k6N3f?0???!w?ye4
??7;??oO.?
gO?\?)?c?Wvx?*??W?????Ui?*?2jT?o]?D???
QVq??????????`fu??H?0j???_???d_???
	????^????!/{xkz9oN4:??=B?c?Z??G???
?W?z?lC?????ac`???yM2???Q/?????~sCwY?nn?+2?L?HI?(??*??g???.?uF9??????Q?`B?n	i~???R'EY???u???@\EE~?k?????T(??>?}?9?? ??Et??GM??Szz?u??6?I??[	??J????(??@???K??*?.? ?0??
???Q?&?-D??O?gg????A 9!????#??	?q?[U4??B.T=K? ???%uF:??Z9???<?R^???t????22?75-???\????Jiy??*???3m?K9??u?.?Q??_?V??mO???\?????x'??G?J?W??a??Q??
??j?@?::|?????W?"??*???5???E? ??Y? 1a???????F??4K?ack$??_Pd+????????FU
IEg{[e?UF???j/)`o[???yY?q?
????p???MtJ?fKf??2?a??2	F???v??-?}?X??
?)??b??!>8??'????@?&S8{?<A??d at S??o?	?=??<d?9????-/D??b??x?u??mr???:?X??t??~?E????F?"7<?????"h2?????cg?5?????NtG???nd??????"?I??CF???b
ivG??`azT^i5,?{ZHN?,??MF??+?J??e=??11??z2"?M??a??????r?<5??/????0boW?????
??^????4f?P??D?Xf??$F??E?!y?/?T??PB??O
)??KE!???xMD???
0???"??=?}"}>???j??
??3????k7??i???l?????f`??vN??S,e??>????2u???%?=M?&?Q???EZ]?^??a?&?t+?r,? B?????????N??????j??Q??~?[=?A???*I???'?????a?	?????|?%????i?!?z?i?,??.&D?jOt??.???Lq??lh?2???7?Z????????]QNN5?????1??+?.O???v???9???
??I??4d??.?,?!;?#??
???
W?0??)?&,??`??g???9????53|???fJ?????J??n??d~$????krA?0?E?x	???5@?2}H<???3???Ih?q
B?&?3Q?eQ?{/?G?	)6_X{?????7?.?????z")??g'?F??"?b+GM?*?$<<.??_~????)H]?z?
_u?'?W??$1&XTO`??.?;cqa[?x0pe?'?@l#??p???6??J`?X?????\V?>????3Y?~q??+?y?????r???4?w?A?s?w???f?o??n??????*f[?>?:??$??]?%?????~?????(????3?Q??????uWiR[n&O?|=&???D???pR6??~H???s	??PS???IG?9r?^#M??p??cz);??\^??B
y.=B??????O??r\y? ????;????g	a????L#pb73??hO????+???????t:??
???z?>?P?;??#??????* ?P?v??V????Zv??1ZJ#?,4?<????????0?3?0?fC??????jUt?m
F???W??????*o???8?D#???#?|!?d?0"?,??U/????vfKz'?cX?=?????????'O6???D??s\??5?%?H{??V|
????s^????W,O?~???t??5??y|I?K4!???W?^?????k7?o????#??q??v?h;???????)?`%??{.????.???
????#??
c???????M??e?????h]?H?Ed?A_?nFzh??`???mO?L?F???	m?<?(??AQ??W??R???K?Q?z2??`????5 ?	?|?{`?vf4??q#x[?????b?#c$?-??}b<????;??4?C?U?
c????????}?f???8???Ie5???-Jz???X?m?(????hi3????YHO?L??*???/:??????.?z&?XT?????SX??4V?p)??p?AZ*e,w?wV:`??A???N~??Z%q?R4??G?#?;???$??!kE??2?????h??????????|?Z????yx	y????8????U?y?D??|??
?q?A?????
k???
???Y?,??OaO??'?`M???g??I??2?`31a???B??l???8?(??#K?fX{??WZ????M??W$m?<??? BTmmX??
 ?F?z???a????6O?y#YO???{???????(???K??W?/??z~??0I??????????8T&[?+??????w
zk????????I9????[??|ax?;;?Z{1????Y?b??
?
?d?????b$0?;8
????????j??)??i?u????j?C???8?]??o?o?h?????P??07bwLI????	???J????B???v????a??G?[wX?O?L?.???i?4pN?J????N=v??S(n??YU??v]??????????~??a??3?~=???y??_?=?,???s????????????f???T?%?oB&_???@?Yq?QF?pA?T??7?6?F??@??????8??.o????(??????z?gd?"??Fd=x?P?"?<;??
???,4??D<RX???;^QO?????.????j?<8??sW???*~p[??z6???x?c?!???wn?vNe????n~?????3??
?C??l
vL0???*?Y?'?
?]w?
zh%eAi?r?S?{?Rc????PP?h/-?g?LK????????	t??y0?>?A?yXSH??#?TjB?b?q????S??0?!???]??4????$X"h????U }JUQ}?+L?(L|??L?
2?)?????)?L???h?OW?XZ?Z)z???=&??xw?#???	<d??.?,?h??????K?k???6^????Z??e??B)1~#??h?*???r?h??I
Y??}???5??g???rh??????S?????6??1?Yz???2`????i?o??0~??V?]????z?Vo6?[V????j??U?wt?	?2??>X?QK?sc,???????X??A???????d???,?}*?????O
-???%??56?o?????&?m??-??Mw6j6?o??6?o?????&?m[?X??????+???	W??N????Y
????Q[C?F?%????u7pS??@?)?f????#v?%???~9?$@??(:??-?y3#????[([l=??? ?
??\(?@S?P.Uwy??t???Ce?
A??*?w$~a)??A{n?7
?;Z????P
???????8??R"?r?????-??c?????r??+?=W\?F???^?;????N~?~?;??;???;:}Ec4??O?pp?
m
`??U????w

????2^?z????
???(??)?.?\?????0
?r????v?G[soB?n???6
91?I ?^?iZ?T1^??)?p??"?y??^???F?M<?????G|???w??J???c???=7|??v????/N;??t?
!?]?=n????Gm?

?DX@|??Ak<t?@M,o,????????@fS4-???q??o?y??z?????	/@g???oI?|R?p??
??#??!?:*?O3
#?	????*<?Rt?k??0Z4e?????Tu*?W?Y???H?]u?)????Z?d?+
D?#???	}G0?=?H?A??}?wr?f????????????[??????
4?I??(?
??ok?M?i1Z6???????
??,^???,e`%????f?H$)}FU^N|LC??B????$??bL??????T???v,???0?@B????f??W#
qK]?DX?t???4yR?a????}
??Fn?????[?iqB????p?B~?8q????M,?{O%?
??ag??T?r?Q
v??XV
 ??????*??s?_????q????l?????????qoJx?G???X???_?c"?
,XV????6D?')W??*?E?? g&?;?M?@!??????ig`?E[$a??:?Hb??????:4 ??{? l9?????q??l68????>??H?+6l?(m?Y??CS>?Q?p	??8?&W?f?Z"??Fc????M?h????Tq?O??g
??w???!U???l????????????hR??1??+????A?????_4?ph9?<Y?;?8<?=?GS?6.???Os????-??7??R?1?8x9Av+^N?????d?qe?'$
?-???????
=??G?T?{?>?x??L?@??}hI?=?
2l#?q?mS???46?_+?????
??????e0?e}??Q????P3??$Oa??/??3??J????+
????YD00?^X?J`A??r??>u?@?`? ?>?6
?d?V????? I???c?{?]???^?z??????z?g??!?????
a??????{s?@?4?? m???f??z{>????.j????m?p????7?w:u?O?\p??F??]M???r??5?0Zo???????{L?
?9?4n6?c0???!?=QM???g{[?????	=??????;??`)???i?O?nO>???H?]o??D2L??Lc ?O~???-	??s???T???????Y3??k*???e??????????d??????C?[*C??[?k:K?U???	z?h????G?iR?5????TT??p
????4??95
2?R????|5??????X????G?+o??c??D?*?>O?=A~?????'X.b"??
??Z???h];??I???#?vx'~z?a?j?????r? ???)?(?@?~????q?=??#7R?x?#{??v??^?? 3?0-B??rHJ??;k??h?G3:???Q?._0?`Z???]5??m???~?*<G?cW=????
%Ou????a???????&???
??`a?Xl\?????z?ZoT?_.????"??H?*k4??k??|%Jn#o??x &????T	QX?/"?????D<????f?$r?a&????K?!Y?C?P?????\?mX?????(?D
?
^E'\E?c at g?VA?=??c??G???ee
?P??z?=?&
=?h	 ??????n?u??j??m????8?:???i??qmWit??(??Z?)??N??&?9BVR???.???z????p?'l??7?i?v+???"3IG?#????|fZ?W
????x????|z(+???QD??($Q?p? ?c?L?Y??W?_??~6????aS<??
???P2G????A??<(?Q*?a?0R??<?????gS??V???2?x`??<a?(?D6???f????^1bM????8????S???NYHq??gI??{?9JFAN=???w????V5??dJ???j?GE???8y{?+?? ????r,"p*???Q????qd??????~)????2????@-???8P4??l???Lfkfe??%???????????F???#d?T? ?%Hg??P???&?S?@T4s??????b"#??zVU&?!????&*,?e]x?o(78	?*??S?\U?)?S??(YRF,ZR.??W??T:e2"R?	?Le]?4????????????)_XS(?p?X??"%JqR??<??A"??$????????O???*ESXBU?S^&?@???????e?=?_ at Z5???j$<l??v????"?K???x???+???XJ$9V%{r?!?V>mj??????b????g|)I???(?%YX??s!??R4?'?^??X<?IRVX???H`????~????R?D#m????B?a&l??HH?d~?D a?'E 2h??.+?9?q?]????^8H?z8!T???m???[??<?B?"?l?:????B[??v????L
]?1(?z<?8?pw?0???;g<??
<q??f?????@????8?????8??4e?U?3U7??+d?48I*"??h?M??Z{;O???%????
bd??NjG???f?s3
?????????+p
?s7J?C????>$?^??%?%??yz??xa^?E|??R0,U??H?T??Y(??PF@???H?3,?2'cR??<`:?D???5??sF????ag
?\6??N)C"????????+???~??Y??N5G52????YP??`?,??R??,??\0?& ?_????E?H????x_?O`??????
S?6
Dg??I???*3E+?M?-???g>??????

???p??L???
???O.???2??LA???
,o???,4?=?Qd ????y???
"??:?G?+<????:?0?L????8????q?"??M?d??????????
?fQ??{
??????qg?
\:???R?}?m?`?	???5T?pz??????wD~??;MN?i?=??>?7?[??FJ????~?????:ds)m[???????K*?|v?dq???e#?K?V????"9??????X ??]?V$?????bd	?????J?G=d???"?hI??_	]????Z:?????
??W5??????P!??%_?????~I???g?z0??g	Z?q6????0?&??(^7	?Y?W2???-????s?????q/K?!?)yG?pZ??X8g??2?s;????Y?i??(?
F?$OD?E?}?7?}\.}?l1?4?]xb3l
RN[????c??B??[???f???fY? &l??9J?b?_?.ia?O<?-?4.??GF????
?wY;?D?$?/?]d???4??_?H???#[???p!???d??~??e
?"?W??k3"??R???cP4?t3??[#;p{??!?mI??g?6"????v???\??<????R????????t?
?|??O_??`.???VF????G??B????FFN[?[6??rD?29/l???????"G#?????Y?zr??????i???
??jm^g?m/?zz?ig?????)?
 ??=&?r?,c?z??;?19(?
dg{??#????\_z?3Q+??h#wO???? ????9??"???H1!|????nDzW~???w;???????zzz???2????|?????{????|????????????p.?-?????N???y&zW??o??????H?/F?1???%K+e??x??2??KKE?*????k/?????E?X?????%?]??t-?0? ??c???VNW?[??????/??w?i???????n2?l??,dAO??&??Gj4????L???x?<c#???M}?V+_?Ic??[????#?4????4h?79l???Is'SM?f???>????
??N#??y&'+a???Le?g???-?pGI???
|N???????R?`?(?_??????b??f(????#?_?Hq???1????8?????KfM??fd?????
bd?4?????!C??Zs?L?5cG?&?\9>j????$'!????
?z.?V?f^i??j??u???VfI,m???,*J/+[??3??2$R??=3?jI?$N??
e??w?5K??s3?~?`Eh??gv>??n<-??I;??????]????,??h?Y????},?E??N[???T?_???\Ow??o6t{?????????d)l|??=?$D@?<????(??#Bq?hI?m6????$$??p??IELe?aQ|??C?v???f?y??Lq?????]g
a?2?m??)??;b?<??GDqI???????j?{?N????_'6ku{8???????*_a?????\??%p?????????mo????^~???_???Q?4W???_?qO?????3?lgX??-?T????????Dh???????&v?????7?U?Y?x;BSj?}?y?R??c?F?O$?}?y/.?,?4?C???_J????
??-?????2??3X?*<??K??\?????Z?9Q?_?g????r?#q??W?X??!?~*????B?
9p????'??.?:?2?????xg3?a??=&^????u?d,???>??t|g??MwX??? ?g????9/?}??`??'?'??@?????P?R?7?C(=s????q%	
??hf?Hw??6<-1??qc?i.?B^???^???{??-??m??#?????3?k#?????j???"???/Z?%?????-??J?x???}???ZXp?r?G?BA?=?????($ ????R?g???????o&#?7?%?W???.?????E??Y	O?L ????k??t??#??Yt?$n??5?????|???N?"F???Z?
??<?W??+???a?????+}}??>?????
?????av??boQ?&??9??5?V?G??v2???????l?????~r4?>v?vW=??\?*@???!??L???En?~?\???{auN??k?*oh?!??X?4?,??????(????1??Z?
???>4?o^?N?1???'??-K}???tsq??1{?????0?yC???x?
 u6???T???'7a??xG?????EE???46k$n
My? ??'???h??~E??(?%>?ym\??h??? ?!??8]??~??~e?l?Qy?(Sup<-???'?A*?{?+??+?????G???8??^??d?l?\T???vT??G?wz??
??+?!gq?9c??1?7?D??2u??d@???"W????cN4????|/?/?????t?(??
G?$l~???Tw??'????|??IO???4?h?|?????O]9}?ffr;'????	S?r_P??	?w$7???????I???T6L?S?.{?5~???*?o????N? d??????b??\<???d?????M?T???-X=??`Ar/L? Ao?0?@6{2o??;?e???p?????'Q?;????q?@????)????]?r,Y7x9?M?	????~???d??}N"???)c"[:?.i	??_??Y@?r
?a??,??5<?????a{;0?Z8%?:?I???
>I??1???x???h?b	???+??F?????/.;q_
Z??:~????o??#??8?f??c???AzS??a???G??g??1#?^??f??,???????e|%?FR?L~U?4???	?? 3?7???#???????c???W?6?5lX????c?txV???O\#-s
Z???&??i	A`??Xec????	???i<^????5???;N6???P>??`??f6?S??4D??????p;??I~/???IR
?`z_??f]s?3;?j??f??i6??
??@'? &?{G?p????c???%&:V?????-?K?-?a?>?k????:?o@?lj?=?aC?-?????>_?A??+k?N?E`2t??{n??G(CBmg?~I??xpa?
??,?I4z? S?x???>????Z $H?R?+???<m?4??J???EE,???????GA????qp?(x?e????????4E\?%qC???[????$z??j4??a??~$3K/v????I+W*?!?}
?M????F?c?A7a???J2??]w?????t??u??L??W?"y???l?_?0????;???H?7??j?yZt?%?$O;S|?????k?Qm-C??WO??J????>Xb?????:??j???]>4d?	????K?!@??#????h ????.?S?????q?6(???\?? \0?
?????R =t?&?5&
??Ad?????????F????U?4N?7??!??J
D?x??????}[??U?=??b??????0?/??????Q_?Ow?B%?k??*1?8d,'?3$???^???i)}??[?K+sIl?{`YxN*??:?O at e??BY???!??1?E)??
??[E??Z?D??,??|????e?Y?;??????+?T??j?d??Q\?*???D??D%?j?q?e????A???2??f??:?IK?e?!?Kx??U?q:?1f?yet$?????0	?/?????4?xl????e??f~?c?R|WT?o???%?ep^?y?^??C??????'Y|??????d?(9?????
M??=???[?c?iY
,??????H???ysjE?'IM?"?
J	???T3S?N ??=7????????6???m???t2(_?we}?2??!????;7rn???d7????*?y&F???u???-??????*??Q6j*????????KM?
?V1??'{K???2?K??'?'????l1q?7ns???????{?i1??yV]e???'?h45?g??uDQ?(?ko?
B_X.lv?ug0??|??Z?p?6?????Z??6?p#???o?ZE-(|????#!?7?O?7?????!??@;?X?????Ma?w??o#{???lVYx??~z?2n}} A?[-[?????6k??U??7???v??e??[???X?G??P?*?[??E??;??R????{a??1	t??h??V?i`???W?*??:F??????????m?vk[Vt;?:???JQX????????????Al?_
?t?\??_?9?7
W??????/J??_q?u?K??????u??T0K:??=>????)?sg?'?@???v<?
??E2???????????wOOJ?/???CT???????????|?p?

H??kd??W?X??????????????<D?w"?S??[?Y??9}S????LD0?uv???p?*????^??[?\??T??????1?????F????*?Cb???Fn
?eeW??q@~????e????P???f?Az?^??^?_??
???E??|??x'So??u??:???b???I9x-????y?w?.rP?Q?K*W?+??`??s???`2????o?
?'oMb7r????????
S'???3B????k@?K#??{-2?"?i??9*??0??Ua\????6???&"{x???#????X?+?|c?PHU?Yu????;{?Ho? ????Y?0?e?6e??(0??Ff??|^~?dk?T???6?a(x1gx\??q??g??
Z?F
R???Y?g??@8?uS??P??+?'?g??\??8f+?25??
C????Q1<????	ngx??uZ?NGN_??
ob\g`	?????w?T?????Gyr>9??@-?C???GAc?$???O|j?
?.?{??b????u???z??H?QS??|?]????????Yw?O?
?l?jJ?	??"l???????????&ZOX?~MN?6,7?CS????d*?????????????Y???/f`??<8??v??
??@}???????=?+j??,(B/?\?4???'?????p,?Bk?>fEq?
#??1????Vn+V??`???????`??b?0n?0}	???&?o$
cE?Z?_]?\]???za??????
??????_?|[???c???stfw/?a??v
1???????o??;?(?NN?w?y?|z|xq?9?.-?v-???'.???lc?<??	6?]????VE<?]
47p?.?d?
??D??#q??(??$Z?p?2z??1w?3p?X??(!?Lt??????F?'D????;?
?g??
?-!??P\$??/????V
??Z???Zm\??Hoxn?i?? ?u??<??RW??H????V?9??	i?
M??L?h
???r??N?????|G??????N?5l????????u???)S
F$??$????f4P???J.Z/?x??w??:E?d?Z????
1
D?H?e????T?????x????9???Y?V?]?U??8b???{? ???t?l????????,:a

?=AT??\?c??	Q?
/??"K???8sg??G1kD?"qw?[?!????(h??A??RE6!p?A*U????^??????T????@??|????w????n.B,(?????????y???2)G	_?
W?r?E7?o???#??????_M???????5gS?^m???1d?x
jf????????Z"?3?3??????b???Y4??'??]?3???XnYnI?t??R??*lr?5}v?=|?9IN???u??B?LP0?X,?????$a??????f&p?LR??/?D?<???CT?9???pv??8??`??{zv?H??#?yTi|??????(?;Av9?o$I4????-???+s????6!J?C4N}w???dw???b[,?d]?D?Ca?)?S?oB????{S?Go?
PeXA?B?	??}???????
?DV???'.4jh`_0?:?cC?k???$?@??)?????Zlg?j?e%?1????I$6??1W{???0*3g]??A9M??UU????iE?&l3B???&'S???)?sV???f??	?????????b?kx??1??*?X`???
??j???o?P)???j???B?i???;
re
v??]?@????~???????

?
?!]R?p?a??Q??2A+?q?Bk?bW@?E,?.iwH????????????7??f?CT?G??#D?/?Z?g|?j
k??xC?u?q?,?@(l
y??8L?>?e?JBQ??b???Fth?pCj??????**???h???0?(?%??]G??
?2????=a?
I?]??????i??cv???????????j?N//,?q?wr??u???;??????????pv??v??s??u|vt????????????
U]R<axx?,??7????]p?@?=YS?,?gcj3?J?
r????K?t?H???1???????
A??D?$?x?^?5?????
?\l??A?????D??wk??c??$?`Tq??zm??3?l?oN wu?????*b???/n?N/??????tC7???'?g>^?E???^?0?V??-?=??<t0?~!???":m"?????????dY??ED?????{????"?+????@?w???1f???2}?D?Uq'<^????mX??{*d?
?????` 2??e????i?Y???(N?B???j??.NJ????????Qp????????????J??????^??y?"M??x$Bm)?[@???KZ???? ??????.&FVv??C??U5??!?>??;y?S??,pQ\?o????N}?M?d)????????RY??\?????M&?6H?Y?L????~T]c??'@???z?q?,?,?c,?N,fH????-????8G
??lrP
???Eqz?????????]?0?o???2?:L9%KN?(????K?nK?b/E??V?K? ?x?)?K?F???W*???`}?X
?Y??/#??%??)???????z????'???de1d?\ I???k01??x???%?$??=??????
?~?;??Su??????`3#'??&???l	#?????zk	g?x@?? ?U??"Zf?????Ts?A???4@??he?xu??q??&?k?G(O<
?n?????c????:Z#]t?~?.?eE^o?????-t?Cy?q?8???f"?????j>i??=XS?9D?"Ie?;g:E?!?%??M:??5jCP*?F7?qA?)??*?
?y2?z???<B|?<???????)???!???uh???xE?^??????'4?$m
???x??h???;P???x6"?3-^@??#??B??.?6???6?????????_???Q&???Q?X??k????/}?TK???
Cu???5?#???,???5?g?T
???
X
N???????5XN?(?`?	??j?
??;???A]?F~?FL?6??+sU????r`!?J?k?pY??-?/??zw?X???o???/????b,SQ??^\CT?F?]Mj^}?.>???]?S?W????']jKt??k?7?vK?3?Dha:?H??[??`?h????f"|??g1g?????b?Z
?
:
?????l??M??+Q?????31???I?IU?r?Sg?*??
?!?Z??"??
?Cc?R?:	P??8?????)1?9m9???uh????y?6?????????8r_??	?}?l?x????#??L???Rm?w:}?+?G8x<??7H>??????o????r/gJ?Y?/?;???tdy;L?1?Z??}??????J?@u=@???r??????=G?wkV?jX??U??5??6>????'7T)??????e??W??o%F???vP+??!!???x???c?i
YgH3^rA/???P???h???PGA^??|r?su?d?????\Ti???/T?:?
???}?KyS????G???hvH?p?7??&cD??+??????,??AL'?#,TLc???xb??E?I&???$??)?*f{?j?P???l_????A>>p?#-?<
????????|???F`?G??!?g??Cd???G?d)9Y`	gS???C?<V???3y?_'D???h?N%t9Fz?$?????6$?>?z??(
?n6y?{?
??R( ??p?*???eQ??UA'????$:??,?P?,q?????p?V???xh??	???Q??M0[,C???G;?>^? ?q?????9? ]?s3??g$?I??n??	?Xs.????{,??? ???
E\;$a??????"?~?K??%dbH??
@?\XMV+??_?(???y???
?y??0k??Z?Y??????^???????z?m?k??vc??%?????c??o??{a?Cm?h?!nf?d?t?;t.?h?e????6s
x-???zk??gg?c[o??MY?????1?N?*???-?H?d??`????~?n?]???B????Y??*c?d???T?#R??c??N?}G&?????E?.Fi????l?b#??????K?-?????(?????lG????? D^??????<?!?8?Voh???z?V
?)?8?F????????#??
?????	?<B?&?F???i?4?N???j?5?h/?F$N?F??+A??5
???@?????_D???<7D7?+?
?VH[dk??=??K>?_:x???[?Z;????`??Y?(??VOR????c]?x?:#7???!?f??a????Y???Z?^???fmk?????F??BSh??hz????l?????fW???W???H ???? ???)?8??E>????5v??Y??Ar????6??V??u>?k?7w"YAv`??
?iK"
?$?Zr???ik{?
??\?bx?@?*???VTh?\??5?Q?????(???3??9???b????iO"???????z??EX at s't
??J??E?????A?C??>~??7??=?9?????"?.$
)?U???`?++?5????BJ????U3??h ??V??r?*/???}S??V?L?3#3??q?[oYO?,[??N????????71(??)????`G?}=:x???l?X,??L????58br)??<????1k? ?K:?H|?6???N?nt?M?????/???1??Az7D??x?j??s5s?1?J??33)??????R??wt???}?????^Z+B:@??????H??8?????nd????s{???p?
??!i?ze???0?
??N
	|-4|.????(????Z?e???t?!?+??5-nj??<???&?g??????>?|???AiM??R??E???%2a????????!?_????0??4?+J?O????u$.??????!N,yM#??r??2?'?S?t
	???,?xX???7?LF?3J??LUzR?E??v\?}?h???h?	??X?????????$??m}?zB?-?ts?
???!??x=
?RZ?n?Z??y???????w=??X1C??*?????_??J?i{QV?('4?????9???+?Lc????{??k??W?z???3v???1id?
??H?=Il,^?\??W?????ak??w)c>????7?q?o???????

q?`?"??*Jx at t???????
u(?L;&$?m?W????????
??eL??a}o?H??x????3.??Xo???]XJz???>????}?ynqq1~?$G??
{ts}=DY?#&??L?(?????$GZ???w==YU$??mCH??/Mxez=_????c?yq?~??uu5v?7?K?????;??`?j
:??"?2cBz;?? ?y|?Y?? ????(? ??[?0???????%??????)Nl!??	??e?REn??=?*7z
8?k?e?GYL?u?
????A???|??8**???;??
??I?c??s| n?5??(Ad??????m?"??????ji?^????m[e^??Y8Q?x??qt?J??IQ^?G???L<mD(?z
??9?I??<????IT?B???@G8???m?g?]?n+???"b49hr?K??j?+	y??????a
h
\?
??x?	t5??|'c????)G N?$|?'E?u?f????'?????s??????k?z??%nz??????????\w?)?*???yV???)
m??????'?U+??,??c?W???
??)8????????8g?NY??m??}g?????????c?f???qCe?#YB?????
?-s}??&P?+?%7???????O`??N#?\??r??p?
?_?????O?W???`6?????o?????iy????\[???????????R?
?)[??8%?	??L"-?-4???~???rd=Up?i?5(?/s9?ZB????}?gz^??Ui?!?D?,04???M??_?g??Y*f???p?????%?3?k_?Q?*o??/?]]?????xU??$?CK???V???????8?E?F?b??	XR??;s%d?jq^??6?????y????E?!{^?.???8v??5??R??@K???*'!?????m&?M??U????????o??????b0??
??? ?R????h?N{U?????h???m?
????9?n?7`?~[??????
	e??wd|???y)?zdv?!}???T?2??;??L3???? oN??+;hx????-?][i(??V	zmL?,w?3?u[??????aS????????r????????????K<??N??c?	???????Ao??MY??????????)t?ji,???????	?<???O???????#??I5?:.7C?=??8<??>?'???0AO4??+?????,=???ix?<?\?Nb?Z?z?????9S7?*SE3i???????`??JI???X??d+?&K?'+??p?a6?|?????_???kV????*
?z?9w)gCe/??{3??h?uaD?C$?v?`{h?[;??WLH????_????X?	?
?F?
?<3H???,?z7???Jv???y?h?P??Z^?nd?<??#?)@???>??s?e?
???vc^???????{]9???33$????H??*?	VF-9>????x[??*Z??1?H???
O??,?)??<???B~6EE???t???
#?????*
?sb+??7gwl?g?a>alu?s??XL?a?}L??J?
H?bF??E????w?$??\?i??3/???!?????|OO-
j??&?e1???E??????
????
??Il?|*??!v????qU:?;"????c?pK????X??????)?U=???[??4??=?Qv??????.?????.????? o???k~I?(R?J?lA91y????????Z9t??]S??`?,????0?
 ??]2;????K???9h?????=x?V?yr??Q??&??>?9f????&O??3??t??W?+:????W???g??g?~?,??4:???????3??,??Ig?xsW{Q2?3?a???Q<PoF\l???)?o?,??+T?????K?.;rt$
?^????EF??Bo?L???J??????L???%?????G7??Y)??>?\\?|??^????,??s???eb?G
O???????N???9??R????Qu?y??W???j5I?3lY<????-?a8C?ya???Q???????????????`eE?@l??#Nrm????M????|?N]???j???1??I??W????LdV?iX?7???7	.V`?????(c?????GG?E?R&:?9?S?r???????0??|a??a?6?? uf???_U>?5?r??A$f???9??d;6Nw7a=????<??r;
C;
E_?????S??O-V"QZ+???<???5qz????jbf??>????m|?g??k?????4??????U??7?^?????.???M?{???{?>??J?B
_?Q-?w~??W???>Q????LV?xw?????PH???{<??
?qB??????B_???c???
M??*???z????j?^P??,?7?{?????;.??UoN?,anu??
?hS???L?|?@?i?
l?fm?,???Sv5??~????x~9kM?c#=?M??x????G??T?-?|m???*
LuN??V?????x?=Y???k>j5??,???3?O?T?9_-?/KP?j??????+?/O?%?RKk????{??????M??F?1
???_??7NTFn????zS?g?/? X-?tI?e???"O?-Q??7P?$??[?'^?l???s???p???o?t?/???????+OB??????`?)I??q?2???1??
7iw????????e|pV$???%?X%i??3??????
?%???M?<&?+z????X2?????Kla?lA[:
?????zF7s?,?r??????';??????{Y???Er???\?????????v*???e:???)?????9?w?? E??
t?nO?2????>?U?[?=????E[Q???:04?{?c+p?&???$x?n0>?e???B_?<?(?????a?*pJ??&}???z?b??6mk?8U??????EDU%?????"Q
?d_T?;??PLNIH!i ???$o@?? V?V????????o??_R??????eC???
j/???y??p??????z?J??{????????#?K?
sepostgresql-8.2.5-1.patch:

--- NEW FILE sepostgresql-8.2.5-1.patch ---
diff -rpNU3 postgresql-8.2.5/configure.in sepostgresql-8.2.5/configure.in
--- postgresql-8.2.5/configure.in	2007-09-15 05:18:26.000000000 +0900
+++ sepostgresql-8.2.5/configure.in	2007-09-22 21:52:26.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.5/doc/man.tar.gz and sepostgresql-8.2.5/doc/man.tar.gz differ
Binary files postgresql-8.2.5/doc/postgres.tar.gz and sepostgresql-8.2.5/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.5/src/Makefile.global.in sepostgresql-8.2.5/src/Makefile.global.in
--- postgresql-8.2.5/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.5/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.5/src/backend/Makefile sepostgresql-8.2.5/src/backend/Makefile
--- postgresql-8.2.5/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.5/src/backend/access/common/heaptuple.c sepostgresql-8.2.5/src/backend/access/common/heaptuple.c
--- postgresql-8.2.5/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.5/src/backend/access/heap/heapam.c sepostgresql-8.2.5/src/backend/access/heap/heapam.c
--- postgresql-8.2.5/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
[...8180 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.5/src/include/utils/syscache.h sepostgresql-8.2.5/src/include/utils/syscache.h
--- postgresql-8.2.5/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.5/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2007 03:54:57 -0000	1.3
+++ .cvsignore	22 Sep 2007 13:09:45 -0000	1.4
@@ -1,2 +1,4 @@
 postgresql-8.2.4.tar.gz
+postgresql-8.2.5.tar.gz
 sepostgresql-8.2.4-0.434.patch
+sepostgresql-8.2.4-1.patch


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.init	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.init	22 Sep 2007 13:09:45 -0000	1.3
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.2.4"
+PGVERSION="8.2.5"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.0"
+SEPGVERSION="1.23"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.spec	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.spec	22 Sep 2007 13:09:45 -0000	1.3
@@ -12,8 +12,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.2.4
-Release: 1.0%{?sepgextension}%{?dist}
+Version: 8.2.5
+Release: 1.23%{?sepgextension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,7 +24,7 @@
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.4-1.patch
+Patch0: sepostgresql-8.2.5-1.patch
 Patch1: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
 Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
@@ -208,6 +208,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Sat Sep 22 2007 <kaigai at kaigai.gr.jp> - 8.2.5-1.23
+- update base PostgreSQL to 8.2.5
+
 * Mon Sep 1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-1.0
 - mark as SE-PostgreSQL 8.2.4-1.0
 


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.te	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.te	22 Sep 2007 13:09:45 -0000	1.3
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.0)
+policy_module(sepostgresql, 1.23)
 
 gen_require(`
 	all_userspace_class_perms



From fedora-extras-commits at redhat.com  Sat Sep 22 13:13:56 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sat, 22 Sep 2007 09:13:56 -0400
Subject: rpms/sugar/OLPC-2 sources,1.59,1.60 sugar.spec,1.70,1.71
Message-ID: <200709221313.l8MDDu3D015767@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15727

Modified Files:
	sources sugar.spec 
Log Message:
* Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	20 Sep 2007 19:50:20 -0000	1.59
+++ sources	22 Sep 2007 13:13:24 -0000	1.60
@@ -1 +1 @@
-e63e02780c262429900e947cbfc777a5  sugar-0.65-git5a595ea04e.tar.bz2
+8b23af473577511c6f1940e7c3918bf4  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sugar.spec	20 Sep 2007 19:50:20 -0000	1.70
+++ sugar.spec	22 Sep 2007 13:13:24 -0000	1.71
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070920git
+%define alphatag 20070922git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.55.%{alphatag}5a595ea04e
+Release: 0.56.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
+- New snapshot
+
 * Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep 22 13:18:55 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Sat, 22 Sep 2007 09:18:55 -0400
Subject: rpms/gsoap/devel autotools_update-2.7.9k.patch, NONE, 1.1 gsoap.spec,
	NONE, 1.1 makefile_defines-2.7.9k.patch, NONE,
	1.1 tru64_hp_ux_c-2.7.9k.patch, NONE,
	1.1 tru64_hp_ux_cpp-2.7.9k.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709221318.l8MDIt7U015876@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	autotools_update-2.7.9k.patch gsoap.spec 
	makefile_defines-2.7.9k.patch tru64_hp_ux_c-2.7.9k.patch 
	tru64_hp_ux_cpp-2.7.9k.patch 
Log Message:
Initial import of gsoap


autotools_update-2.7.9k.patch:

--- NEW FILE autotools_update-2.7.9k.patch ---
diff --exclude=Makefile.defines -r -upN gsoap-2.7/aclocal.m4 gsoap-2.7mf/aclocal.m4
--- gsoap-2.7/aclocal.m4	2007-08-21 22:03:39.000000000 -0500
+++ gsoap-2.7mf/aclocal.m4	2007-09-11 11:17:48.000000000 -0500
@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,307 +11,6448 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# serial 48 AC_PROG_LIBTOOL
 
-# 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.
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
 
-# 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.
 
-# serial 8
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
[...63688 lines suppressed...]
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input="$1"
+shift
+case "$input" in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
+done
+
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) $prog "$input" ;;
+  *) $prog "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
+else
+  ret=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:


--- NEW FILE gsoap.spec ---
Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
Name: gsoap
Version: 2.7.9
Release: 0.1.k
License: GPLv2
Group: Development/Tools
URL: http://gsoap2.sourceforge.net
Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.9k.tar.gz
Patch0: http://grid.et.redhat.com/files/autotools_update-2.7.9k.patch
Patch1: http://grid.et.redhat.com/files/makefile_defines-2.7.9k.patch
Patch2: http://grid.et.redhat.com/files/tru64_hp_ux_cpp-2.7.9k.patch
Patch3: http://grid.et.redhat.com/files/tru64_hp_ux_c-2.7.9k.patch
#Patch4: http://grid.et.redhat.com/files/anonymous_server_and_client-2.7.9k.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: flex
BuildRequires: bison
BuildRequires: dos2unix
BuildRequires: findutils

Requires: pkgconfig


%description
The gSOAP Web services development toolkit offers an XML to C/C++
language binding to ease the development of SOAP/XML Web services in C
and C/C++.


%package devel
Summary: Devel libraries and headers for linking with gSOAP generated stubs
Group: Development/System
Requires: %name = %version-%release


%description devel
gSOAP libraries, headers and generators for linking with and creating
gSOAP generated stubs


#%package static
#Summary: Static libraries for linking with gSOAP generated stubs
#Group: Development/System
#Requires: %name = %version-%release


#%description static
#Static gSOAP libraries for linking with gSOAP generated stubs


%prep
%setup -q -n gsoap-2.7

# update the autotool generated scripts to something more current, and
# enable libtool support
%patch0 -p1

# update Makefile.defines to let samples use libtool
%patch1 -p1

# update stdsoap2.c/pp to better identify the need for hostent_data
# and h_errno
%patch2 -p1
%patch3 -p1

# a number of ~ files are distribute, but we do not want them
find . -name "*~" -exec rm {} \;

# pre-generated Makefiles abound, kill them
find . -name "Makefile" -exec rm {} \;

# pre-generated .deps are distribute, zap'em
find . -name ".deps" -prune -exec rm -rf {} \;

# autom4te.cache should not be distributed with source
rm -rf autom4te.cache

# stdsoap2_cpp.cpp is generated by soapcpp2/Makefile, and should not
# exist in the distributed source
rm soapcpp2/stdsoap2_cpp.cpp


%build
%configure --disable-namespaces --disable-static --prefix=/usr

# dependencies are not declared properly
#make %{?_smp_mflags}
make

# during the build a number of files that we should not distribute are
# created in soapcpp2/samples/ (a doc directory), we must remove them
#find soapcpp2/samples/ -name ".deps" -prune -exec rm -rf {} \;

# we do not want to bother distributing samples for Windows or OS X
#rm -rf soapcpp2/samples/magic_VC
#rm -rf soapcpp2/samples/quote_VC
#rm -rf soapcpp2/samples/quote_MAC_ProjBuild

# samples do not need to be executable by default
#chmod a-x soapcpp2/samples/ssl/root.sh
#chmod a-x soapcpp2/samples/ssl/cacerts.pem

# we want all txt files to have unix end-of-line encoding
dos2unix soapcpp2/README.txt
dos2unix soapcpp2/NOTES.txt
#dos2unix soapcpp2/samples/README.txt
#dos2unix soapcpp2/samples/gpl.txt


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%_libdir/*.la

%clean
rm -rf %{buildroot}


%check
make check


%files
%defattr(-,root,root,-)
%doc soapcpp2/README.txt soapcpp2/NOTES.txt
%_libdir/libgsoapck.so.0
%_libdir/libgsoapck++.so.0
%_libdir/libgsoapck.so.0.0.0
%_libdir/libgsoapck++.so.0.0.0
%_libdir/libgsoap.so.0
%_libdir/libgsoap++.so.0
%_libdir/libgsoap.so.0.0.0
%_libdir/libgsoap++.so.0.0.0
%_libdir/libgsoapssl.so.0
%_libdir/libgsoapssl++.so.0
%_libdir/libgsoapssl.so.0.0.0
%_libdir/libgsoapssl++.so.0.0.0


%files devel
%defattr(-,root,root,-)
%doc soapcpp2/README.txt soapcpp2/NOTES.txt
%_bindir/soapcpp2
%_bindir/wsdl2h
%_libdir/libgsoapck.so
%_libdir/libgsoapck++.so
%_libdir/libgsoap.so
%_libdir/libgsoapssl.so
%_libdir/libgsoapssl++.so
%_libdir/libgsoap++.so
%_includedir/stdsoap2.h
%_libdir/pkgconfig/gsoapck.pc
%_libdir/pkgconfig/gsoapck++.pc
%_libdir/pkgconfig/gsoap.pc
%_libdir/pkgconfig/gsoap++.pc
%_libdir/pkgconfig/gsoapssl.pc
%_libdir/pkgconfig/gsoapssl++.pc


#%files static
#%defattr(-,root,root,-)
#%doc soapcpp2/README.txt soapcpp2/NOTES.txt soapcpp2/samples/
#%_libdir/libgsoap.a
#%_libdir/libgsoap++.a
#%_libdir/libgsoapck.a
#%_libdir/libgsoapck++.a
#%_libdir/libgsoapssl.a
#%_libdir/libgsoapssl++.a


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%changelog
* Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k
- Initial release


makefile_defines-2.7.9k.patch:

--- NEW FILE makefile_defines-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/samples/Makefile.defines	2007-04-21 20:56:38.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/samples/Makefile.defines	2007-09-11 11:46:14.000000000 -0500
@@ -14,12 +14,12 @@ SOAP_FLAGS=-I$(top_srcdir)/soapcpp2/impo
 
 SOAP_C_CLIENT=soapClient.c soapC.c
 SOAP_C_SERVER=soapServer.c soapC.c
-SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.a
-SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.a
+SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.la
+SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.la
 
 SOAP_CPP_CLIENT=soapClient.cpp soapC.cpp
 SOAP_CPP_SERVER=soapServer.cpp soapC.cpp
-SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.a
-SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.a
+SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.la
+SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.la
 
 

tru64_hp_ux_c-2.7.9k.patch:

--- NEW FILE tru64_hp_ux_c-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/stdsoap2.c	2007-08-21 21:24:33.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/stdsoap2.c	2007-09-13 12:13:56.000000000 -0500
@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha
   /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */
   iadd = inet_addr((char*)addr);
 #else
-#if defined(_AIX43) || defined(TRU64)
+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   struct hostent_data ht_data;
 #endif
 #ifdef AS400
@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha
 #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__)))
   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
     host = NULL;
-#elif defined(_AIX43) || defined(TRU64)
+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   memset((void*)&ht_data, 0, sizeof(ht_data));
   if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
   { host = NULL;
@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha
 #endif
 
 /******************************************************************************/
+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R)
+extern int h_errno;
+#endif
+
 #ifndef WITH_NOIO
 #ifndef PALM_1
 static SOAP_SOCKET

tru64_hp_ux_cpp-2.7.9k.patch:

--- NEW FILE tru64_hp_ux_cpp-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/stdsoap2.cpp	2007-08-21 21:24:33.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/stdsoap2.cpp	2007-09-13 12:13:56.000000000 -0500
@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha
   /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */
   iadd = inet_addr((char*)addr);
 #else
-#if defined(_AIX43) || defined(TRU64)
+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   struct hostent_data ht_data;
 #endif
 #ifdef AS400
@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha
 #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__)))
   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
     host = NULL;
-#elif defined(_AIX43) || defined(TRU64)
+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   memset((void*)&ht_data, 0, sizeof(ht_data));
   if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
   { host = NULL;
@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha
 #endif
 
 /******************************************************************************/
+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R)
+extern int h_errno;
+#endif
+
 #ifndef WITH_NOIO
 #ifndef PALM_1
 static SOAP_SOCKET


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:22:34 -0000	1.1
+++ .cvsignore	22 Sep 2007 13:18:22 -0000	1.2
@@ -0,0 +1 @@
+gsoap_2.7.9k.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:22:34 -0000	1.1
+++ sources	22 Sep 2007 13:18:22 -0000	1.2
@@ -0,0 +1 @@
+83a25e2349d0e2e3e4a73ce834e4c06d  gsoap_2.7.9k.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 13:25:55 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 09:25:55 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.1,1.2
Message-ID: <200709221325.l8MDPt36016096@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16075

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-makeinfo-ver.patch	22 Sep 2007 12:45:46 -0000	1.1
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 13:25:53 -0000	1.2
@@ -1,8 +1,33 @@
 2007-09-22  Jakub Jelinek  <jakub at redhat.com>
 
+	* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
+	* configure: Regenerated.
+gcc/
 	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
 	* configure: Regenerated.
 
+--- configure.in.jj	2007-02-20 16:41:55.000000000 -0500
++++ configure.in	2007-09-22 09:23:30.000000000 -0400
+@@ -2159,7 +2159,7 @@ changequote(,)
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+--- configure.jj	2007-02-20 16:41:55.000000000 -0500
++++ configure	2007-09-22 09:24:08.000000000 -0400
+@@ -3574,7 +3574,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
 --- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
 +++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
 @@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir



From fedora-extras-commits at redhat.com  Sat Sep 22 13:39:42 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 09:39:42 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.2,1.3
Message-ID: <200709221339.l8MDdgnm016626@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16605

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-makeinfo-ver.patch	22 Sep 2007 13:25:53 -0000	1.2
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 13:39:39 -0000	1.3
@@ -1,30 +1,32 @@
 2007-09-22  Jakub Jelinek  <jakub at redhat.com>
 
-	* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
-	* configure: Regenerated.
-gcc/
 	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
 	* configure: Regenerated.
 
+2007-09-15  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure.in: Correct makeinfo version check.
+	* configure: Regenerate.
+
 --- configure.in.jj	2007-02-20 16:41:55.000000000 -0500
-+++ configure.in	2007-09-22 09:23:30.000000000 -0400
++++ configure.in	2007-09-22 09:36:04.000000000 -0400
 @@ -2159,7 +2159,7 @@ changequote(,)
      # For an installed makeinfo, we require it to be from texinfo 4.2 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
        :
      else
        MAKEINFO="$MISSING makeinfo"
 --- configure.jj	2007-02-20 16:41:55.000000000 -0500
-+++ configure	2007-09-22 09:24:08.000000000 -0400
++++ configure	2007-09-22 09:36:25.000000000 -0400
 @@ -3574,7 +3574,7 @@ case " $build_configdirs " in
      # For an installed makeinfo, we require it to be from texinfo 4.2 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
        :
      else
        MAKEINFO="$MISSING makeinfo"



From fedora-extras-commits at redhat.com  Sat Sep 22 14:04:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 10:04:03 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.3,1.4
Message-ID: <200709221404.l8ME43Qv023481@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23458

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-makeinfo-ver.patch	22 Sep 2007 13:39:39 -0000	1.3
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 14:04:01 -0000	1.4
@@ -37,7 +37,7 @@
  gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
 -  [4.[2-9]*])
-+  [4.[2-9]*|4.[1-9][0-9]*])
++  [4.[2-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
  if test $gcc_cv_prog_makeinfo_modern = no; then
    MAKEINFO="$MISSING makeinfo"
    AC_MSG_WARN([
@@ -48,7 +48,7 @@
    case $ac_prog_version in
      '')     gcc_cv_prog_makeinfo_modern=no;;
 -    4.[2-9]*)
-+    4.[2-9]*|4.[1-9][0-9]*)
++    4.[2-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*)
              gcc_cv_prog_makeinfo_modern=yes;;
      *)      gcc_cv_prog_makeinfo_modern=no;;
    esac



From fedora-extras-commits at redhat.com  Sat Sep 22 14:57:45 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 10:57:45 -0400
Subject: rpms/python-nltk_lite/F-7 .cvsignore, 1.2, 1.3 python-nltk_lite.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221457.l8MEvjxX025269@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk_lite/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25184/F-7

Modified Files:
	.cvsignore python-nltk_lite.spec sources 
Log Message:
python-nltk_lite 0.9-0.1.b2 -- transition package that does not obsoletes
python-nltk anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
+++ .cvsignore	22 Sep 2007 14:57:13 -0000	1.3
@@ -1 +1 @@
-nltk_lite-0.6.6.tar.gz
+nltk-0.9b2.tar.gz


Index: python-nltk_lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/python-nltk_lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk_lite.spec	19 Dec 2006 05:07:16 -0000	1.2
+++ python-nltk_lite.spec	22 Sep 2007 14:57:13 -0000	1.3
@@ -1,21 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define prerel b2
 Name:           python-nltk_lite
-Version:        0.6.6
-Release:        2%{?dist}
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://nltk.sf.net/
-Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Obsoletes:      python-nltk <= 1.4.4-2%{?dist}
-
-BuildRequires:  python-devel
-Requires:       python-numarray, tkinter
+BuildRequires:  python-devel, tkinter
+Requires:       numpy, python-matplotlib, tkinter
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -27,19 +26,24 @@
 
 
 %prep
-%setup -q -n nltk_lite-%{version}
+%setup -q -n nltk-%{version}%{?prerel}
 
 
 %build
 %{__python} setup.py build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 # Make scripts executable
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
 
 
 %clean
@@ -48,25 +52,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.TXT README.txt
-%dir %{python_sitelib}/nltk_lite
-%dir %{python_sitelib}/nltk_lite/chat
-%dir %{python_sitelib}/nltk_lite/cluster
-%dir %{python_sitelib}/nltk_lite/contrib
-%dir %{python_sitelib}/nltk_lite/corpora
-%dir %{python_sitelib}/nltk_lite/draw
-%dir %{python_sitelib}/nltk_lite/misc
-%dir %{python_sitelib}/nltk_lite/model
-%dir %{python_sitelib}/nltk_lite/parse
-%dir %{python_sitelib}/nltk_lite/stem
-%dir %{python_sitelib}/nltk_lite/tag
-%dir %{python_sitelib}/nltk_lite/test
-%dir %{python_sitelib}/nltk_lite/tokenize
-%{python_sitelib}/nltk_lite/*.py*
-%{python_sitelib}/nltk_lite/*/*.py*
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
 
 
 %changelog
+* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Remove obsoletes:nltk, package will be renamed back to nltk in next release
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
 - Rebuild for development branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 02:57:46 -0000	1.2
+++ sources	22 Sep 2007 14:57:13 -0000	1.3
@@ -1 +1 @@
-24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 14:57:48 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 10:57:48 -0400
Subject: rpms/python-nltk_lite/devel .cvsignore, 1.2,
	1.3 python-nltk_lite.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221457.l8MEvml6025276@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25184/devel

Modified Files:
	.cvsignore python-nltk_lite.spec sources 
Log Message:
python-nltk_lite 0.9-0.1.b2 -- transition package that does not obsoletes
python-nltk anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
+++ .cvsignore	22 Sep 2007 14:57:16 -0000	1.3
@@ -1 +1 @@
-nltk_lite-0.6.6.tar.gz
+nltk-0.9b2.tar.gz


Index: python-nltk_lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/python-nltk_lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk_lite.spec	19 Dec 2006 05:07:16 -0000	1.2
+++ python-nltk_lite.spec	22 Sep 2007 14:57:16 -0000	1.3
@@ -1,21 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define prerel b2
 Name:           python-nltk_lite
-Version:        0.6.6
-Release:        2%{?dist}
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://nltk.sf.net/
-Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Obsoletes:      python-nltk <= 1.4.4-2%{?dist}
-
-BuildRequires:  python-devel
-Requires:       python-numarray, tkinter
+BuildRequires:  python-devel, tkinter
+Requires:       numpy, python-matplotlib, tkinter
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -27,19 +26,24 @@
 
 
 %prep
-%setup -q -n nltk_lite-%{version}
+%setup -q -n nltk-%{version}%{?prerel}
 
 
 %build
 %{__python} setup.py build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 # Make scripts executable
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
 
 
 %clean
@@ -48,25 +52,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.TXT README.txt
-%dir %{python_sitelib}/nltk_lite
-%dir %{python_sitelib}/nltk_lite/chat
-%dir %{python_sitelib}/nltk_lite/cluster
-%dir %{python_sitelib}/nltk_lite/contrib
-%dir %{python_sitelib}/nltk_lite/corpora
-%dir %{python_sitelib}/nltk_lite/draw
-%dir %{python_sitelib}/nltk_lite/misc
-%dir %{python_sitelib}/nltk_lite/model
-%dir %{python_sitelib}/nltk_lite/parse
-%dir %{python_sitelib}/nltk_lite/stem
-%dir %{python_sitelib}/nltk_lite/tag
-%dir %{python_sitelib}/nltk_lite/test
-%dir %{python_sitelib}/nltk_lite/tokenize
-%{python_sitelib}/nltk_lite/*.py*
-%{python_sitelib}/nltk_lite/*/*.py*
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
 
 
 %changelog
+* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Remove obsoletes:nltk, package will be renamed back to nltk in next release
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
 - Rebuild for development branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 02:57:46 -0000	1.2
+++ sources	22 Sep 2007 14:57:16 -0000	1.3
@@ -1 +1 @@
-24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 15:19:32 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Sat, 22 Sep 2007 11:19:32 -0400
Subject: rpms/filezilla/devel filezilla.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200709221519.l8MFJW9A032766@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32590

Modified Files:
	filezilla.spec sources .cvsignore 
Log Message:
Update to 3.0.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filezilla.spec	10 Sep 2007 20:30:10 -0000	1.1
+++ filezilla.spec	22 Sep 2007 15:19:00 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -15,7 +15,6 @@
 ## Needed if test program is build
 BuildRequires:  cppunit-devel >= 1.10.2
 ##
-BuildRequires:  gawk
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel >= 1.5.4
@@ -103,6 +102,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 kwizart < kwizart at gmail.com > - 3.0.1-1
+- Update to 3.0.1
+
 * Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
 - Update to 3.0.0 (final)
 - Add vendor field for .desktop


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2007 20:30:10 -0000	1.2
+++ sources	22 Sep 2007 15:19:00 -0000	1.3
@@ -1 +1 @@
-9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2
+c66cabe1339d358a0c135fb3ce3e7589  FileZilla_3.0.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2007 20:30:10 -0000	1.2
+++ .cvsignore	22 Sep 2007 15:19:00 -0000	1.3
@@ -1 +1 @@
-FileZilla_3.0.0_src.tar.bz2
+FileZilla_3.0.1_src.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 15:56:14 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sat, 22 Sep 2007 11:56:14 -0400
Subject: rpms/gdb/devel gdb-6.3-bz193763-object-name-completion.patch, 1.2, 
	1.3 gdb-6.3-ctorline-20050120.patch, 1.2,
	1.3 gdb-6.3-linespec-20041213.patch, 1.2,
	1.3 gdb-6.3-test-dtorfix-20050121.patch, 1.1,
	1.2 gdb-6.6-bz233852-attach-signalled.patch, 1.2,
	1.3 gdb-6.6-upstream.patch, 1.7, 1.8 gdb.spec, 1.244, 1.245
Message-ID: <200709221556.l8MFuEHc003576@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3528

Modified Files:
	gdb-6.3-bz193763-object-name-completion.patch 
	gdb-6.3-ctorline-20050120.patch 
	gdb-6.3-linespec-20041213.patch 
	gdb-6.3-test-dtorfix-20050121.patch 
	gdb-6.6-bz233852-attach-signalled.patch gdb-6.6-upstream.patch 
	gdb.spec 
Log Message:
* Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
- Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
- Fix the build compatibility with texinfo >= 4.10.
- Fix the testcase for pending signals (from BZ 233852).


gdb-6.3-bz193763-object-name-completion.patch:

Index: gdb-6.3-bz193763-object-name-completion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-bz193763-object-name-completion.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-bz193763-object-name-completion.patch	24 Aug 2006 06:18:03 -0000	1.2
+++ gdb-6.3-bz193763-object-name-completion.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -1,6 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763
 
+[base]
 
+2007-09-21  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Updated for the longer `$allocate' marker.
+ 
 Index: gdb-6.5/gdb/linespec.c
 ===================================================================
 --- gdb-6.5.orig/gdb/linespec.c	2006-08-24 02:57:04.000000000 -0300
@@ -10,7 +15,7 @@
       the function signature.  */
    completion_name = xmalloc (strlen (class_name) +
 -			     strlen (member_name) + 9);
-+			     strlen (member_name) + strlen("'::$base(") + 1);
++			     strlen (member_name) + strlen("'::$allocate(") + 1);
    completion_name[0] = '\'';
    strcpy (completion_name+1, class_name);
    /* FIXME: make this the language class separator.  */

gdb-6.3-ctorline-20050120.patch:

Index: gdb-6.3-ctorline-20050120.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ctorline-20050120.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-ctorline-20050120.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-ctorline-20050120.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -21,6 +21,14 @@
 	* tui/tui-win.c (make_visible_with_new_height): Ditto.
 	* tui/tui-winsource.c (tui_update_source_windows_with_addr): Ditto.
 
+2007-09-22  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* symtab.c (find_line_pc): Support also the `$allocate' and `$delete'
+	variants.  Support searching for the `$base' name even if the bare name
+	was found first.
+	* breakpoint.c (breakpoint_sals_to_pc): Support more than two returned
+	PC values.
+
 Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
 ===================================================================
 --- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 01:30:43.000000000 -0300
@@ -259,55 +267,78 @@
    if (symtab == 0)
      return 0;
  
-@@ -2336,7 +2357,50 @@ find_line_pc (struct symtab *symtab, int
+@@ -2336,7 +2357,73 @@ find_line_pc (struct symtab *symtab, int
    if (symtab != NULL)
      {
        l = LINETABLE (symtab);
 -      *pc = l->item[ind].pc;
 +      main_pc = l->item[ind].pc;
++      *pc_array = xmalloc (sizeof (CORE_ADDR) * 3);
++      *num_elements = 0;
++      (*pc_array)[(*num_elements)++] = main_pc;
 +      minsym = lookup_minimal_symbol_by_pc (main_pc);
 +      if (minsym != NULL && minsym->ginfo.language == language_cplus)
-+        {
-+	  char *base_name = 
-+            minsym->ginfo.language_specific.cplus_specific.demangled_name;
-+          char *tmp_ptr = strstr (base_name, "$base(");
-+          if (tmp_ptr != NULL)
-+            {
-+              char *regular_name = (char *)xmalloc (strlen (base_name));
-+              memcpy (regular_name, base_name, tmp_ptr - base_name);
-+              strcpy (regular_name + (tmp_ptr - base_name), 
-+                      tmp_ptr + sizeof ("$base") - 1);
-+              minsym2 = lookup_minimal_symbol (regular_name, NULL, NULL);
-+              xfree (regular_name);
-+              if (minsym2 != NULL)
-+                {
-+		  /* We have recognized we have a ctor or dtor and have
-+		     located our line in the not-in-charge version.  We
-+		     also have located the in-charge version's minsym.
-+		     From this, we can find the index for the first line
-+		     line in the in-charge ctor/dtor and then search forward
-+		     for the specified line, thereby finding the 2nd match.  */
-+		  int exact;
-+		  int ind = find_line_by_pc (l, minsym2->ginfo.value.address,
-+				             &exact);
-+		  if (ind >= 0)
++	{
++	  char *src = minsym->ginfo.language_specific.cplus_specific.demangled_name;
++	  char *src_point = strchr (src, '(');
++	  char *s, *point;
++	  /* Keep "" last as the trimming part always matches it.  */
++	  const char *variants[] = {"$base","$allocate","$delete",""};
++	  int i;
++
++	  if (src_point != NULL)
++	    {
++	      char *dst = xmalloc (strlen (src) + strlen ("$allocate") + 1);
++	      char *dst_point = dst + (src_point - src);
++
++	      memcpy (dst, src, src_point - src);
++
++	      /* Trim out any variant markers there first.  */
++	      for (i = 0; i < ARRAY_SIZE (variants); i++)
++		{
++		  size_t len = strlen (variants[i]);
++
++		  if (dst_point - dst >= len
++		      && memcmp (dst_point - len, variants[i], len) == 0)
++		    {
++		      dst_point -= len;
++		      /* In fact it should not be needed here.  */
++		      break;
++		    }
++		}
++
++	      /* And now try to append all of them.  */
++	      for (i = 0; i < ARRAY_SIZE (variants); i++)
++		{
++		  size_t len = strlen (variants[i]);
++		  struct minimal_symbol *minsym2;
++
++		  memcpy (dst_point, variants[i], len);
++		  strcpy (dst_point + len, src_point);
++	      
++		  minsym2 = lookup_minimal_symbol (dst, NULL, NULL);
++		  if (minsym2 != NULL)
 +		    {
-+		      ind = find_line_common (l, line, ind, &exact);
++		      /* We have recognized we have a ctor or dtor and have
++			 located our line in the not-in-charge version.  We
++			 also have located the in-charge version's minsym.
++			 From this, we can find the index for the first line
++			 line in the in-charge ctor/dtor and then search forward
++			 for the specified line, thereby finding the 2nd match.  */
++		      int exact;
++		      int ind = find_line_by_pc (l, minsym2->ginfo.value.address,
++						 &exact);
 +		      if (ind >= 0)
-+		        {
-+                          *pc_array = xmalloc (2 * sizeof (CORE_ADDR));
-+                          (*pc_array)[0] = main_pc;
-+                          (*pc_array)[1] = l->item[ind].pc;
-+                          *num_elements = 2;
-+                          return 1;
++			{
++			  ind = find_line_common (l, line, ind, &exact);
++			  if (ind >= 0 && l->item[ind].pc != main_pc)
++			    (*pc_array)[(*num_elements)++] = l->item[ind].pc;
 +			}
 +		    }
-+                }
-+            }
-+        }
-+      *pc_array = xmalloc (sizeof (CORE_ADDR));
-+      (*pc_array)[0] = main_pc;
-+      *num_elements = 1;
++		}
++	      xfree (dst);
++	    }
++	}
        return 1;
      }
    else
@@ -441,7 +472,7 @@
 ===================================================================
 --- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 01:30:53.000000000 -0300
 +++ gdb-6.5/gdb/breakpoint.c	2006-07-11 01:39:20.000000000 -0300
-@@ -5268,10 +5268,40 @@ static void
+@@ -5268,10 +5268,44 @@ static void
  breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
  		       char *address)
  {    
@@ -469,8 +500,12 @@
 +                     * sizeof (struct symtab_and_line));
 +          memcpy (new_sals, sals->sals, (i + 1) 
 +                  * sizeof (struct symtab_and_line));
-+          memcpy (&(new_sals[i + 1]), &sals->sals[i], 
-+                  sizeof (struct symtab_and_line));
++	  /* The one returned SALS entry is copied for all the PCs.  */
++          for (j = 1; j < num_pc_values; ++j)
++            {
++	      memcpy (&(new_sals[i + j]), &sals->sals[i], 
++		      sizeof (struct symtab_and_line));
++	    }
 +          xfree (sals->sals);
 +          sals->sals = new_sals;
 +          sals->nelts += num_pc_values - 1;

gdb-6.3-linespec-20041213.patch:

Index: gdb-6.3-linespec-20041213.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-linespec-20041213.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-linespec-20041213.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-linespec-20041213.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -1,3 +1,10 @@
+[base]
+
+2007-09-21  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* linespec.c (add_minsym_members): Support also the `$allocate' and
+	`$delete' variants.
+
 Index: gdb-6.5/gdb/linespec.c
 ===================================================================
 --- gdb-6.5.orig/gdb/linespec.c	2006-01-10 20:14:43.000000000 -0200
@@ -68,7 +75,7 @@
  	  else if (strncmp (class_name, name, name_len) == 0
  		   && (class_name[name_len] == '\0'
  		       || class_name[name_len] == '<'))
-@@ -261,21 +274,83 @@ find_methods (struct type *t, char *name
+@@ -261,21 +274,101 @@ find_methods (struct type *t, char *name
  
    if (i1 == 0)
      for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
@@ -131,6 +138,24 @@
 +      ++counter;
 +    }
 +  xfree (list);
++
++  /* Target also the allocating/deleting variants.  */
++  if (member_name[0] == '~')
++    strcpy (completion_name + comp_len - 1, "$delete(");
++  else
++    strcpy (completion_name + comp_len - 1, "$allocate(");
++  list = make_symbol_completion_list (completion_name,
++				      completion_name+1);
++
++  /* Again we have a list.  Add their minimal symbols to the array.  */
++  i = 0;
++  while (list && list[i] != NULL)
++    {
++      msym_arr[counter] = lookup_minimal_symbol (list[i++], NULL, NULL);
++      ++counter;
++    }
++  xfree (list);
++
 +  xfree (completion_name);
 +
 +  return counter;

gdb-6.3-test-dtorfix-20050121.patch:

Index: gdb-6.3-test-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-dtorfix-20050121.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-test-dtorfix-20050121.patch	4 Feb 2005 21:01:49 -0000	1.1
+++ gdb-6.3-test-dtorfix-20050121.patch	22 Sep 2007 15:56:10 -0000	1.2
@@ -5,9 +5,14 @@
 	* gdb.cp/constructortest.cc: Ditto.
 	* gdb.cp/templates.exp: Change break of dtor to	be fully quoted.
 
+2007-09-22  Jan Kratochvil <jan.kratochvil at redhat.com>
+
+	* gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
+	`$delete' destructor variant.
+
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix	Fri Jan 21 17:06:56 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc	Fri Jan 21 17:05:18 2005
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,99 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2005 Free Software Foundation, Inc.
@@ -45,12 +50,33 @@
 +    int  y;
 +};
 +
++/* C and D are for the $delete destructor.  */
++
++class C
++{
++  public:
++    C();
++    virtual ~C();
++  private:
++    int  x;
++};
++
++class D: public C
++{
++  public:
++    D();
++  private:
++    int  y;
++};
++
 +int main(int argc, char *argv[])
 +{
 +  A* a = new A;
 +  B* b = new B;
++  D* d = new D;
 +  delete a;
 +  delete b;
++  delete d;
 +  return 0;
 +}
 +
@@ -72,12 +98,26 @@
 +   k = 5;
 +}
 +
++C::C() /* Constructor C */
++{
++   x = 1; /* First line C */
++}
++
++C::~C() /* Destructor C */
++{
++   x = 3; /* First line ~C */
++}
++
++D::D()
++{
++   y = 2; /* First line D */
++}
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix	Fri Jan 21 17:07:02 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp	Fri Jan 21 17:05:29 2005
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,135 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
-+# Copyright 2005 Free Software Foundation, Inc.
++# Copyright 2005, 2007 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
@@ -173,6 +213,43 @@
 +gdb_continue_to_breakpoint "Second line ~A"
 +gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::~A second line"
 +
++
++# Test now the $delete destructors.
++
++# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++runto_main
++
++# Break on the various forms of the C::~C destructor
++set test "breaking on C::~C"
++gdb_test_multiple "break C\:\:~C" $test {
++  -re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. C::~C\\(\\) at .*\[\r\n\]*.3. C::~C\\\$base\\(\\) at .*\[\r\n\]*4. C::~C\\\$delete\\(\\) at .*\[\r\n\]*> $" {
++            gdb_test "1" \
++                ".*Multiple breakpoints were set.*" \
++                "break on multiple constructors"
++  }
++  -re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*> $" {
++    fail $test
++  }
++}
++gdb_continue_to_breakpoint "First line ~C"
++
++# Verify that we can break by line number in a destructor and find
++# the $delete occurence
++
++# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++runto_main
++
++set first_line_dtor [gdb_get_line_number "First line ~C"]
++gdb_test "break $first_line_dtor" ".*$first_line_dtor.*$first_line_dtor.*Multiple breakpoints were set.*" "break by line in destructor"
++gdb_continue_to_breakpoint "First line ~C"
 --- gdb-6.3/gdb/testsuite/gdb.cp/templates.exp.fix	Fri Jan 21 17:07:10 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/templates.exp	Fri Jan 21 17:09:09 2005
 @@ -1,4 +1,4 @@

gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.6-bz233852-attach-signalled.patch	16 Sep 2007 22:34:35 -0000	1.2
+++ gdb-6.6-bz233852-attach-signalled.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -448,7 +448,7 @@
 +}
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ ./gdb/testsuite/gdb.threads/attach-into-signal.exp	29 Jun 2007 22:06:06 -0000
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,179 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -519,7 +519,10 @@
 +
 +	set stoppedtry 0
 +	while { $stoppedtry < 10 } {
-+	    set fileid [open /proc/${testpid}/status r];
++	    if [catch {open /proc/${testpid}/status r} fileid] {
++		set stoppedtry 10
++		break
++	    }
 +	    gets $fileid line1;
 +	    gets $fileid line2;
 +	    close $fileid;

gdb-6.6-upstream.patch:

Index: gdb-6.6-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-upstream.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdb-6.6-upstream.patch	28 Aug 2007 14:46:38 -0000	1.7
+++ gdb-6.6-upstream.patch	22 Sep 2007 15:56:10 -0000	1.8
@@ -1133,3 +1133,33 @@
  #define GNU_ABI_TAG_LINUX	0
  #define GNU_ABI_TAG_HURD	1
  #define GNU_ABI_TAG_SOLARIS	2
+
+
+
+2007-09-15  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure.ac: Correct makeinfo version check.
+	* configure: Regenerate.
+
+#--- ./configure.ac	14 Sep 2007 14:51:36 -0000	1.25
+#+++ ./configure.ac	14 Sep 2007 15:47:01 -0000	1.26
+#@@ -2462,7 +2462,7 @@ changequote(,)
+#     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+#     # higher, else we use the "missing" dummy.
+#     if ${MAKEINFO} --version \
+#-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+#+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+#       :
+#     else
+#       MAKEINFO="$MISSING makeinfo"
+--- ./configure	14 Sep 2007 14:51:36 -0000	1.277
++++ ./configure	14 Sep 2007 15:47:01 -0000	1.278
+@@ -6192,7 +6192,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gdb.spec	16 Sep 2007 22:34:35 -0000	1.244
+++ gdb.spec	22 Sep 2007 15:56:10 -0000	1.245
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 27%{?dist}
+Release: 28%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -683,6 +683,11 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
+- Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
+- Fix the build compatibility with texinfo >= 4.10.
+- Fix the testcase for pending signals (from BZ 233852).
+
 * Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
 - Fix attaching to stopped processes and/or pending signals.
 



From fedora-extras-commits at redhat.com  Sat Sep 22 16:01:35 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Sat, 22 Sep 2007 12:01:35 -0400
Subject: rpms/filezilla/F-7 filezilla.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200709221601.l8MG1ZkI009776@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685

Modified Files:
	filezilla.spec sources 
Log Message:
Update to 3.0.1 - first F-7 release



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/filezilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filezilla.spec	18 Sep 2007 20:29:27 -0000	1.2
+++ filezilla.spec	22 Sep 2007 16:01:02 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -15,7 +15,6 @@
 ## Needed if test program is build
 BuildRequires:  cppunit-devel >= 1.10.2
 ##
-BuildRequires:  gawk
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel >= 1.5.4
@@ -25,8 +24,6 @@
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
-Requires:  gnutls >= 1.5.4
-
 
 %description
 FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
@@ -105,6 +102,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 kwizart < kwizart at gmail.com > - 3.0.1-1
+- Update to 3.0.1
+
 * Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
 - Update to 3.0.0 (final)
 - Add vendor field for .desktop


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2007 20:30:10 -0000	1.2
+++ sources	22 Sep 2007 16:01:02 -0000	1.3
@@ -1 +1 @@
-9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2
+c66cabe1339d358a0c135fb3ce3e7589  FileZilla_3.0.1_src.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 16:31:53 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 22 Sep 2007 12:31:53 -0400
Subject: rpms/source-highlight/devel source-highlight.spec,1.16,1.17
Message-ID: <200709221631.l8MGVrxC010825@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10509

Modified Files:
	source-highlight.spec 
Log Message:
delete info/dir file



Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- source-highlight.spec	16 Sep 2007 19:46:15 -0000	1.16
+++ source-highlight.spec	22 Sep 2007 16:31:20 -0000	1.17
@@ -35,6 +35,8 @@
 mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
 %{__sed} -i 's/\r//' docs/source-highlight/xhtml.css
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Sat Sep 22 17:47:35 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 22 Sep 2007 13:47:35 -0400
Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.13,
	1.14
Message-ID: <200709221747.l8MHlZOn019719@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19679/devel

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
Fix URI problem (#236668)


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nautilus-open-terminal.spec	17 Aug 2007 14:29:11 -0000	1.13
+++ nautilus-open-terminal.spec	22 Sep 2007 17:47:00 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           nautilus-open-terminal
 Version:        0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
 Group:          User Interface/Desktops
 License:       	GPLv2+
-URL:            http://manny.cluecoder.org/packages/nautilus-open-terminal/
-Source0:        http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz
+URL:            http://download.gnome.org/sources/%{name}/
+Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:		nautilus-open-terminal-0.8-truthvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 %{_libdir}/nautilus/extensions-1.0/*.so*
 
 %changelog
+* Sat Sep 22 2007 Paul W. Frields <stickster at gmail.com> - 0.8-2
+- Fix download and source URIs
+
 * Fri Aug 17 2007 Paul W. Frields <stickster at gmail.com> - 0.8-1
 - Update License tag
 - Update to version 0.8



From fedora-extras-commits at redhat.com  Sat Sep 22 17:47:38 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 22 Sep 2007 13:47:38 -0400
Subject: rpms/nautilus-open-terminal/F-7 nautilus-open-terminal.spec, 1.13, 
	1.14
Message-ID: <200709221747.l8MHlcEu019722@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19679/F-7

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
Fix URI problem (#236668)


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-7/nautilus-open-terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nautilus-open-terminal.spec	17 Aug 2007 14:36:54 -0000	1.13
+++ nautilus-open-terminal.spec	22 Sep 2007 17:47:05 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           nautilus-open-terminal
 Version:        0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
 Group:          User Interface/Desktops
 License:       	GPLv2+
-URL:            http://manny.cluecoder.org/packages/nautilus-open-terminal/
-Source0:        http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz
+URL:            http://download.gnome.org/sources/%{name}/
+Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:		nautilus-open-terminal-0.8-truthvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 %{_libdir}/nautilus/extensions-1.0/*.so*
 
 %changelog
+* Sat Sep 22 2007 Paul W. Frields <stickster at gmail.com> - 0.8-2
+- Fix download and source URIs
+
 * Fri Aug 17 2007 Paul W. Frields <stickster at gmail.com> - 0.8-1
 - Update License tag
 - Update to version 0.8



From fedora-extras-commits at redhat.com  Sat Sep 22 19:37:56 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:37:56 -0400
Subject: rpms/trac-bazaar-plugin/devel trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.3, 1.4
Message-ID: <200709221937.l8MJbu88003576@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3527

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trac-bazaar-plugin.spec	29 Aug 2007 22:58:23 -0000	1.3
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:37:24 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:16 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:16 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/EL-5
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmGRR004283@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/EL-5

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/EL-5/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:21:51 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:43 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:18 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:18 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/F-7 php-pear-MDB2-Driver-mysql.spec,
	1.3, 1.4
Message-ID: <200709221948.l8MJmIb8004286@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/F-7

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/F-7/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:06 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:46 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:21 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:21 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/FC-6
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmLTU004289@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/FC-6

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:01 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:49 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:24 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:24 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/devel
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmOST004292@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/devel

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/devel/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:06 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:51 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:46 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:46 -0400
Subject: rpms/trac-bazaar-plugin/EL-5 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJpkCi004559@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/EL-5

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/EL-5/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:14:56 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:14 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:49 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:49 -0400
Subject: rpms/trac-bazaar-plugin/F-7 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJpnv2004562@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/F-7

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-7/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:14:59 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:16 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:51 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:51 -0400
Subject: rpms/trac-bazaar-plugin/FC-6 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJppji004565@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/FC-6

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:15:03 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:19 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:27 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:27 -0400
Subject: rpms/smart/EL-4 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Rec011110@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/EL-4

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:30 -0400
Subject: rpms/smart/EL-5 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Umk011125@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/EL-5

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:35 -0400
Subject: rpms/smart/F-7 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Z7Z011142@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/F-7

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:39 -0400
Subject: rpms/smart/FC-6 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2d1p011157@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/FC-6

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:41 -0400
Subject: rpms/smart/devel smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2fuL011172@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/devel

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 21:12:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:12:34 -0400
Subject: rpms/smart/devel .cvsignore, 1.9, 1.10 smart.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <200709222112.l8MLCYII022554@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22527

Modified Files:
	.cvsignore smart.spec sources 
Log Message:
* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Sep 2007 19:11:20 -0000	1.9
+++ .cvsignore	22 Sep 2007 21:12:02 -0000	1.10
@@ -1,4 +1,2 @@
-smart-0.50.tar.bz2
-smart-0.50-ccache.patch
-smart-0.42-autofs5fix.patch
-smart-0.50-auto.patch
+smart-0.51.tar.bz2
+smart-0.51-auto.patch


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/smart.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- smart.spec	8 Sep 2007 19:26:24 -0000	1.24
+++ smart.spec	22 Sep 2007 21:12:02 -0000	1.25
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.50
-Release: 48%{?dist}
+Version: 0.51
+Release: 49%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,9 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: smart-0.42-autofs5fix.patch
-Patch1: smart-0.50-ccache.patch
-Patch2: smart-0.50-auto.patch
+Patch2: smart-0.51-auto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -74,8 +72,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .autofs5
-%patch1 -p0 -b .ccache
 %patch2 -p1
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
@@ -207,6 +203,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
+- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.
+
 * Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
 - KSmartTray desktop entry fixes.
 - License: GPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Sep 2007 19:11:20 -0000	1.12
+++ sources	22 Sep 2007 21:12:02 -0000	1.13
@@ -1,4 +1,2 @@
-7595df0259829fff64496f1c359a53cf  smart-0.50.tar.bz2
-044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
-371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
-258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
+6584bf3b977081162d19e220fdbcb3ac  smart-0.51.tar.bz2
+fddb01047624daac2f0551cc10076df4  smart-0.51-auto.patch



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:30 -0700
Subject: [pkgdb] smart: scop has requested watchcommits
Message-ID: <200709222115.l8MLFWf8018918@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:35 -0700
Subject: [pkgdb] smart: scop has requested commit
Message-ID: <200709222115.l8MLFaSJ021617@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:37 -0700
Subject: [pkgdb] smart: scop has requested approveacls
Message-ID: <200709222115.l8MLFbi9018944@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the approveacls acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:51 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested watchcommits
Message-ID: <200709222115.l8MLFqc5021689@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:53 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested commit
Message-ID: <200709222115.l8MLFr6O021701@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:54 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested approveacls
Message-ID: <200709222115.l8MLFt6U019022@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the approveacls acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:38:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:38:22 -0400
Subject: rpms/smart/EL-5 ksmarttray.desktop, NONE, 1.1 .cvsignore, 1.5,
	1.6 distro.py, 1.2, 1.3 smart.pam, 1.1, 1.2 smart.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200709222138.l8MLcM3m023597@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570

Modified Files:
	.cvsignore distro.py smart.pam smart.spec sources 
Added Files:
	ksmarttray.desktop 
Log Message:
Sync with devel for first EL-5 build


--- NEW FILE ksmarttray.desktop ---
[Desktop Entry]
Name=KSmartTray
Comment=Keep up to date with package updates
Exec=ksmarttray
Type=Application
Terminal=false
Categories=System;KDE;Monitor;TrayIcon;Applet;
OnlyShowIn=GNOME;KDE;XFCE;
Icon=ksmarttray


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Sep 2006 22:34:43 -0000	1.5
+++ .cvsignore	22 Sep 2007 21:37:49 -0000	1.6
@@ -1,3 +1,2 @@
-smart-0.42.tar.bz2
-smart-0.42-autofs5fix.patch
-ksmarttray.desktop
+smart-0.51.tar.bz2
+smart-0.51-auto.patch


Index: distro.py
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/distro.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro.py	25 Nov 2006 16:30:35 -0000	1.2
+++ distro.py	22 Sep 2007 21:37:49 -0000	1.3
@@ -5,17 +5,13 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
-        pkgconf.setFlag("multi-version", "kernel%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
+    for kernelseries in ("kernel", "kernel-suspend2", "kernel-tuxonice"):
+        for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
+            pkgconf.setFlag("multi-version", "%s%s" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-unsupported" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-devel" % (kernelseries, flavour))
+            for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
+                pkgconf.setFlag("multi-version", "%s-%s%s" % (clustergfs, kernelseries, flavour))
     pkgconf.setFlag("multi-version", "kernel-source")
     pkgconf.setFlag("multi-version", "kernel-sourcecode")
 


Index: smart.pam
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.pam	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.pam	22 Sep 2007 21:37:49 -0000	1.2
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smart.spec	5 Feb 2007 01:05:32 -0000	1.13
+++ smart.spec	22 Sep 2007 21:37:49 -0000	1.14
@@ -1,13 +1,14 @@
-%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+# This is not defined on Fedora buildsystems
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %bcond_without ksmarttray
 %bcond_without pygtk
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.50
-Release: 45%{?dist}
-License: GPL
+Version: 0.51
+Release: 49%{?dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
 Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
@@ -16,9 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: smart-0.42-autofs5fix.patch
-Patch1: smart-0.50-ccache.patch
-Patch2: smart-0.50-auto.patch
+Patch2: smart-0.51-auto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -29,7 +28,7 @@
 BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
 BuildRequires: zlib-devel
 %endif
-Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
+#Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
 %{!?with_pygtk:Requires: usermode}
 Requires: smart-config
@@ -73,11 +72,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .autofs5
-%patch1 -p0 -b .ccache
 %patch2 -p1
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
+install -p -m 644 %{SOURCE2} .
+# Detect whether the system is using pam_stack
+if -f /%{_lib}/security/pam_stack.so \
+   -a ! grep "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so \
+      2>&1 > /dev/null; then
+  perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' smart.pam
+  touch -r %{SOURCE2} smart.pam
+fi
 
 %build
 CFLAGS="%{optflags}"
@@ -119,7 +124,7 @@
 mkdir -p %{buildroot}/etc/security/console.apps
 mkdir -p %{buildroot}/etc/pam.d
 install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root
+install -p -m 644 smart.pam %{buildroot}/etc/pam.d/smart-root
 
 # smart-update
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
@@ -198,6 +203,19 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
+- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.
+
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
+- KSmartTray desktop entry fixes.
+- License: GPLv2+
+
+* Thu Aug  2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
+- Add kernel-tuxonice series support.
+
+* Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-46
+- Autodetect pam_stack module at build time.
+
 * Mon Feb  5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-45
 - Adjust checks for autotools.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2007 00:46:59 -0000	1.7
+++ sources	22 Sep 2007 21:37:49 -0000	1.8
@@ -1,5 +1,2 @@
-7595df0259829fff64496f1c359a53cf  smart-0.50.tar.bz2
-044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
-371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
-3e758faa20a498f27deabb0f773a923d  ksmarttray.desktop
-258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
+6584bf3b977081162d19e220fdbcb3ac  smart-0.51.tar.bz2
+fddb01047624daac2f0551cc10076df4  smart-0.51-auto.patch



From fedora-extras-commits at redhat.com  Sat Sep 22 21:41:29 2007
From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad))
Date: Sat, 22 Sep 2007 17:41:29 -0400
Subject: rpms/vte/F-7 sources,1.61,1.62 vte.spec,1.116,1.117
Message-ID: <200709222141.l8MLfTAJ023707@cvs-int.fedora.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23681

Modified Files:
	sources vte.spec 
Log Message:
* Mon Sep 22 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.9-1
- Update to 0.16.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	31 Jul 2007 03:07:01 -0000	1.61
+++ sources	22 Sep 2007 21:40:54 -0000	1.62
@@ -1 +1 @@
-65344de3023c41c8dda2b35a415bf969  vte-0.16.8.tar.bz2
+a42c893a01e3d9818789be373e529422  vte-0.16.9.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-7/vte.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- vte.spec	31 Jul 2007 03:41:25 -0000	1.116
+++ vte.spec	22 Sep 2007 21:40:54 -0000	1.117
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.16.8
+Version: 0.16.9
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.9-1
+- Update to 0.16.9
+
 * Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> 0.16.8-1
 - Update to 0.16.8
 



From fedora-extras-commits at redhat.com  Sat Sep 22 21:43:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:43:09 -0400
Subject: rpms/fedora-package-config-smart/EL-5 .cvsignore, 1.5,
	1.6 fedora-package-config-smart.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200709222143.l8MLh9Ss023806@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fedora-package-config-smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23778

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 5-1
- Initial EL-5 version based on Fedora's 6-8.
- Add empty %build section.
- License: GPL+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
+++ .cvsignore	22 Sep 2007 21:42:36 -0000	1.6
@@ -1 +1 @@
-fedora-package-config-smart-6.tar.bz2
+fedora-package-config-smart-5EL.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/fedora-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
+++ fedora-package-config-smart.spec	22 Sep 2007 21:42:36 -0000	1.6
@@ -1,27 +1,30 @@
-Summary: Fedora configuration files for the smart package manager
+%define debug_package %{nil}
+
+Summary: Fedora EPEL configuration files for the Smart package manager
 Name: fedora-package-config-smart
-Version: 6
-Release: 8
-License: GPL
+Version: 5
+Release: 1%{?dist}
+License: GPL+
 Group: System Environment/Base
-URL: http://fedora.redhat.com/
-Source0: %{name}-%{version}.tar.bz2
+URL: http://fedoraproject.org/wiki/EPEL
+Source0: %{name}-%{version}EL.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: smart
 Provides: smart-config
 
 %description
-This package contains smart configuration files for Fedora (Core,
-Updates and Extras).
+Fedora EPEL configuration files for the Smart package manager.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}EL
 # 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' < $filein > $file
 done
 
+%build
+
 %install
 rm -rf %{buildroot}
 
@@ -38,77 +41,7 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6-8
-- Update to Fedora Core 6.
-
-* Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
-- Sync with fedora-package-config-apt, see also #191580.
-
-* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-6
-- Update to rawhide config.
-
-* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
-- Add virtual smart-config provides (#175630 comment 13).
-
-* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
-- Update to Fedora Core 5.
-
-* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
-- changed name to fedora-package-config-smart
-- Modify to only include what fedora-release includes for yum.
-
-* Thu Jul 14 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Merge srpms of atrpms-package-config and medley-package-config.
-
-* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add el3/el4/fc4 repos.
-
-* Fri Dec 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add smart support.
-
-* Tue Nov 16 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Split yum config files for yum 2.0.x and yum >= 2.1.x.
-
-* Tue Nov  9 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fc3 support.
-
-* Tue Sep 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fedoralegacy repo for FC1.
-- Prapare commented entries for fedoralegacy repo for FC2.
-
-* Fri Sep  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Rename apt.physik.fu-berlin.de to apt.atrpms.net
-
-* Tue Aug 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Change main dries repo to lower load on studentenweb.org.
-
-* Thu Jul 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Fork ATrpms-only package, former atrpms-package-config
-  package has been renamed to medley-package.config.
-
-* Sat Jul 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Fix nr entries for production.
-- Add freshrpms' x86_64 entries.
-
-* Fri May 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add RPM::Order "true" to apt.conf.
-
-* Mon May 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Added back Gstreamer, now we know where it went to.
-- New fc2 list officially published.
-
-* Thu May  6 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fedoralegacy repos where appropriate.
-
-* Fri Apr  2 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Remove nonfree sections of BIOrpms, as these were accidentially activated.
-
-* Mon Mar 15 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Change in Matt's repo structure.
-
-* Thu Mar 11 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Interrepo problems with Dag's obsoletes.
-
-* Fri Mar  5 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
-- Split off package from atrpms package (check there for prior logs).
-
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 5-1
+- Initial EL-5 version based on Fedora's 6-8.
+- Add empty %%build section.
+- License: GPL+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2006 10:08:56 -0000	1.6
+++ sources	22 Sep 2007 21:42:36 -0000	1.7
@@ -1 +1 @@
-61aaadfe0ff641c6c1be3e3f93f3dc09  fedora-package-config-smart-6.tar.bz2
+e80025adb41a6d24cd26487f72b50485  fedora-package-config-smart-5EL.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 21:52:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:52:19 -0400
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.6,
	1.7 fedora-package-config-smart.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200709222152.l8MLqJOc026336@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fedora-package-config-smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26259

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 8-10
- Update for Fedora 8.
- Add empty %build section.
- Improve summary and description.
- License: GPL+
- Update URL.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jun 2007 08:39:26 -0000	1.6
+++ .cvsignore	22 Sep 2007 21:51:46 -0000	1.7
@@ -1 +1 @@
-fedora-package-config-smart-7.89.tar.bz2
+fedora-package-config-smart-8.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-package-config-smart.spec	1 Jun 2007 08:39:26 -0000	1.6
+++ fedora-package-config-smart.spec	22 Sep 2007 21:51:46 -0000	1.7
@@ -1,18 +1,19 @@
-Summary: Fedora configuration files for the smart package manager
+%define debug_package %{nil}
+
+Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
-Version: 7.89
-Release: 9
-License: GPL
+Version: 8
+Release: 10
+License: GPL+
 Group: System Environment/Base
-URL: http://fedora.redhat.com/
+URL: http://fedoraproject.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: smart
 Provides: smart-config
 
 %description
-This package contains smart configuration files for Fedora (Core,
-Updates and Extras).
+Fedora configuration files for the Smart package manager.
 
 %prep
 %setup -q
@@ -22,6 +23,8 @@
   sed -e's, at ARCH@,%{_target_cpu},g' < $filein > $file
 done
 
+%build
+
 %install
 rm -rf %{buildroot}
 
@@ -38,6 +41,13 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 8-10
+- Update for Fedora 8.
+- Add empty %%build section.
+- Improve summary and description.
+- License: GPL+
+- Update URL.
+
 * Fri Jun  1 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 7.89-9
 - Update to post-F7 rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jun 2007 08:39:26 -0000	1.7
+++ sources	22 Sep 2007 21:51:46 -0000	1.8
@@ -1 +1 @@
-326554e2de11b8b271594bce02404e6c  fedora-package-config-smart-7.89.tar.bz2
+81fd1da0f313b768b64c764644e81edb  fedora-package-config-smart-8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 00:46:46 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:46:46 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.23,1.24
Message-ID: <200709230046.l8N0kkNs016092@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074

Modified Files:
	mercurial.spec 
Log Message:
Fix contrib stuff (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mercurial.spec	21 Sep 2007 01:21:24 -0000	1.23
+++ mercurial.spec	23 Sep 2007 00:46:12 -0000	1.24
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 00:48:03 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:48:03 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.23,1.24
Message-ID: <200709230048.l8N0m3ww016208@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16181

Modified Files:
	mercurial.spec 
Log Message:
fix contrib (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mercurial.spec	21 Sep 2007 01:22:26 -0000	1.23
+++ mercurial.spec	23 Sep 2007 00:47:30 -0000	1.24
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 00:48:34 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:48:34 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.18,1.19
Message-ID: <200709230048.l8N0mYEf016264@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16202

Modified Files:
	mercurial.spec 
Log Message:
fix contrib (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	21 Sep 2007 01:19:37 -0000	1.18
+++ mercurial.spec	23 Sep 2007 00:48:02 -0000	1.19
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 01:25:43 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sat, 22 Sep 2007 21:25:43 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.19,1.20
Message-ID: <200709230125.l8N1Ph51022975@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22951

Modified Files:
	xulrunner.spec 
Log Message:
update license tag



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xulrunner.spec	21 Sep 2007 11:17:54 -0000	1.19
+++ xulrunner.spec	23 Sep 2007 01:25:11 -0000	1.20
@@ -12,7 +12,7 @@
 Version:        1.9
 Release:        0.alpha7.4%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
-License:        MPL/LGPL
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball xulrunner-%{version}-source.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 03:40:43 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 22 Sep 2007 23:40:43 -0400
Subject: rpms/python-turbokid/devel .cvsignore, 1.5, 1.6 python-turbokid.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200709230340.l8N3ehwq005932@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894

Modified Files:
	.cvsignore python-turbokid.spec sources 
Log Message:
1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Aug 2007 07:09:11 -0000	1.5
+++ .cvsignore	23 Sep 2007 03:40:10 -0000	1.6
@@ -1 +1 @@
-TurboKid-1.0.2.tar.gz
+TurboKid-1.0.3.tar.gz


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/python-turbokid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-turbokid.spec	2 Sep 2007 04:51:09 -0000	1.8
+++ python-turbokid.spec	23 Sep 2007 03:40:10 -0000	1.9
@@ -4,8 +4,8 @@
 %define module turbokid
 
 Name:           python-turbokid
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Luke Macken <lmacken at redhat.com> - 1.0.3-1
+- 1.0.3
+
 * Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
 - Update for python-setuptools changes in rawhide
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Aug 2007 07:09:11 -0000	1.5
+++ sources	23 Sep 2007 03:40:10 -0000	1.6
@@ -1 +1 @@
-01da47aff288649a2ed6f80f6343b0b7  TurboKid-1.0.2.tar.gz
+405376c3b16091b76fb6554a5506bc0b  TurboKid-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 04:04:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 23 Sep 2007 00:04:26 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.54, 1.55 gnome-applets.spec, 
	1.243, 1.244 ppp-includes.patch, 1.1, 1.2 sources, 1.57, 1.58
Message-ID: <200709230404.l8N44QLh012786@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682

Modified Files:
	.cvsignore gnome-applets.spec ppp-includes.patch sources 
Log Message:
bring modemlights back for one more round



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Sep 2007 01:34:23 -0000	1.54
+++ .cvsignore	23 Sep 2007 04:03:01 -0000	1.55
@@ -1 +1,2 @@
 gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gnome-applets.spec	22 Sep 2007 05:57:00 -0000	1.243
+++ gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
@@ -34,17 +34,20 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 Source: 	http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
 Source1:        copy.xsl
+Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.17.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
@@ -65,6 +68,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=479172
 Patch36:	gweather-pc.patch
 
+Patch34:        ppp-includes.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +159,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
@@ -168,6 +174,14 @@
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE2}
+
+%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
 intltoolize --force
 autoconf
 
@@ -320,6 +334,7 @@
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
 %{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
 
@@ -342,6 +357,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
 * Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
 - Make the gweather.pc file less useless
 

ppp-includes.patch:

Index: ppp-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/ppp-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppp-includes.patch	30 Jul 2007 22:09:30 -0000	1.1
+++ ppp-includes.patch	23 Sep 2007 04:03:01 -0000	1.2
@@ -1,10 +1,11 @@
 diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
 --- gnome-applets-2.19.0/modemlights/modemlights.c.includes	2007-07-30 18:05:02.000000000 -0400
 +++ gnome-applets-2.19.0/modemlights/modemlights.c	2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
  #endif
  
  #ifdef __linux__
++#define aligned_u64 unsigned long long __attribute__((aligned(8)))
 +#include <linux/types.h>
  #include <linux/if_ppp.h>
  #include <sys/ioctl.h>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	17 Sep 2007 01:34:23 -0000	1.57
+++ sources	23 Sep 2007 04:03:01 -0000	1.58
@@ -1 +1,2 @@
 985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 07:40:07 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 23 Sep 2007 03:40:07 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.50,1.51
Message-ID: <200709230740.l8N7e7Em002664@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643

Modified Files:
	xscreensaver.spec 
Log Message:
Some cleanup.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xscreensaver.spec	19 Sep 2007 03:15:15 -0000	1.50
+++ xscreensaver.spec	23 Sep 2007 07:39:34 -0000	1.51
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    7
+%define fedora_rel    8
 %endif
 
 %define extrarel      %{nil}
@@ -45,45 +45,50 @@
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
-BuildRequires:   gettext
-BuildRequires:   desktop-file-utils
-BuildRequires:   sed
-BuildRequires:   libtool
 BuildRequires:   bc
+BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
+BuildRequires:   gettext
+BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
+BuildRequires:   sed
 BuildRequires:   xorg-x11-proto-devel
-BuildRequires:   libX11-devel, libXScrnSaver-devel, libXext-devel
+BuildRequires:   libX11-devel
+BuildRequires:   libXScrnSaver-devel
+BuildRequires:   libXext-devel
 BuildRequires:   libXinerama-devel
 BuildRequires:   libXmu-devel
 BuildRequires:   libXpm-devel
 BuildRequires:   libXt-devel
 BuildRequires:   libXxf86misc-devel
 BuildRequires:   libXxf86vm-devel
+BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
-BuildRequires:   gtk2-devel libglade2-devel
+BuildRequires:   libglade2-devel
 %if 0%{?fedora} >= 7
 BuildRequires:   fedora-release-notes
 %else
 BuildRequires:   fedora-release
 %endif
-Requires:        /etc/pam.d/system-auth
+Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xorg-x11-resutils
+Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
 %package extras
 Summary:         An enhanced set of screensavers
 Group:           Amusements/Graphics
 BuildRequires:   desktop-backgrounds-basic
-Requires:        xscreensaver-base
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package gl-extras
 Summary:         An enhanced set of screensavers that require OpenGL
 Group:           Amusements/Graphics
 Provides:        xscreensaver-gl = %{epoch}:%{version}-%{release}
-Obsoletes:       xscreensaver-gl
-BuildRequires:   libGLU-devel, libGL-devel
-Requires:        xscreensaver-base
+Obsoletes:       xscreensaver-gl <= 1:5.00
+BuildRequires:   libGL-devel
+BuildRequires:   libGLU-devel
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -447,7 +452,7 @@
    echo "Exec=$COMMAND $ARG" >> $2
    echo "StartupNotify=false" >> $2
    echo "Type=Application" >> $2
-   echo "Categories=Screensaver" >> $2
+   echo "Categories=GNOME;Screensaver;" >> $2
 }
 
 cd $dd
@@ -510,6 +515,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Sep 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Some cleanup.
+
 * Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
 - Remove noreplace flag from XScreenSaver.ad as this is updated
   automatically.



From fedora-extras-commits at redhat.com  Sun Sep 23 08:38:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Sep 2007 04:38:41 -0400
Subject: rpms/freenx/devel freenx-0.7.0-kdeprintrc-290351.patch, NONE,
	1.1 freenx.spec, 1.7, 1.8
Message-ID: <200709230838.l8N8cfx5010110@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776

Modified Files:
	freenx.spec 
Added Files:
	freenx-0.7.0-kdeprintrc-290351.patch 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
  with errors when it is (#290351).


freenx-0.7.0-kdeprintrc-290351.patch:

--- NEW FILE freenx-0.7.0-kdeprintrc-290351.patch ---
--- nxloadconfig~	2007-07-07 08:59:03.000000000 +0300
+++ nxloadconfig	2007-09-23 11:28:40.000000000 +0300
@@ -281,9 +281,11 @@
 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
 fi 
 
+if [ "$ENABLE_KDE_CUPS" = "1" ] ; then
 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+[ -z "$KDE_PRINTRC" ] && which kde-config &>/dev/null && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
 [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+fi
 
 #########################################################################
 # Support for --check


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	7 Sep 2007 11:28:44 -0000	1.7
+++ freenx.spec	23 Sep 2007 08:38:08 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
+Patch1: freenx-0.7.0-kdeprintrc-290351.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p4 -b .libs
+%patch1 -p0 -b .kdeprintrc
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
   nxloadconfig nxserver
@@ -91,6 +93,10 @@
 /var/log/nx
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
+- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
+  with errors when it is (#290351).
+
 * Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
 - CM = Christian Mandery mail at chrismandery.de,  BZ 252976
 - Version bump to 0.7.0 upstream release (CM)



From fedora-extras-commits at redhat.com  Sun Sep 23 08:41:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Sep 2007 04:41:55 -0400
Subject: rpms/freenx/F-7 freenx-0.7.0-kdeprintrc-290351.patch, NONE,
	1.1 freenx.spec, 1.7, 1.8
Message-ID: <200709230841.l8N8ftm2010279@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254

Modified Files:
	freenx.spec 
Added Files:
	freenx-0.7.0-kdeprintrc-290351.patch 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
  with errors when it is (#290351).


freenx-0.7.0-kdeprintrc-290351.patch:

--- NEW FILE freenx-0.7.0-kdeprintrc-290351.patch ---
--- nxloadconfig~	2007-07-07 08:59:03.000000000 +0300
+++ nxloadconfig	2007-09-23 11:28:40.000000000 +0300
@@ -281,9 +281,11 @@
 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
 fi 
 
+if [ "$ENABLE_KDE_CUPS" = "1" ] ; then
 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+[ -z "$KDE_PRINTRC" ] && which kde-config &>/dev/null && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
 [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+fi
 
 #########################################################################
 # Support for --check


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	7 Sep 2007 11:38:37 -0000	1.7
+++ freenx.spec	23 Sep 2007 08:41:22 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
+Patch1: freenx-0.7.0-kdeprintrc-290351.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p4 -b .libs
+%patch1 -p0 -b .kdeprintrc
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
   nxloadconfig nxserver
@@ -91,6 +93,10 @@
 /var/log/nx
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
+- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
+  with errors when it is (#290351).
+
 * Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
 - CM = Christian Mandery mail at chrismandery.de,  BZ 252976
 - Version bump to 0.7.0 upstream release (CM)



From fedora-extras-commits at redhat.com  Sun Sep 23 09:27:36 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:27:36 -0400
Subject: rpms/FlightGear/devel FlightGear.spec,1.3,1.4
Message-ID: <200709230927.l8N9RatI017174@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/FlightGear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17134

Modified Files:
	FlightGear.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.3.pre1
- update icon cache handling to current guidelines/drafts
- update License tag



Index: FlightGear.spec
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/FlightGear.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FlightGear.spec	29 Aug 2007 18:34:29 -0000	1.3
+++ FlightGear.spec	23 Sep 2007 09:27:03 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
 Version:	0.9.11
-Release:	0.2.pre1%{?dist}
+Release:	0.3.pre1%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source:		ftp://ftp.flightgear.org/pub/fgfs/Source/FlightGear-%{version}-pre1.tar.gz
 Source1:	%{name}.desktop
@@ -78,12 +78,16 @@
 %post
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +101,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.3.pre1
+- update icon cache handling to current guidelines/drafts
+- update License tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.11-0.2.pre1
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep 23 09:28:35 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:28:35 -0400
Subject: rpms/fgfs-base/devel fgfs-base.spec,1.2,1.3
Message-ID: <200709230928.l8N9SZHs017259@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17237

Modified Files:
	fgfs-base.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.2.pre1
- update License tag



Index: fgfs-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fgfs-base/devel/fgfs-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fgfs-base.spec	27 Jun 2007 19:08:17 -0000	1.2
+++ fgfs-base.spec	23 Sep 2007 09:28:03 -0000	1.3
@@ -1,9 +1,9 @@
 Name:		fgfs-base
 Summary:	FlightGear base scenery and data files
 Version:	0.9.11
-Release:	0.1.pre1%{?dist}
+Release:	0.2.pre1%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source0:	ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}-pre1.tar.bz2
 URL:		http://www.flightgear.org/
@@ -53,6 +53,9 @@
 %{_datadir}/FlightGear
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.2.pre1
+- update License tag
+
 * Wed Jun 27 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.1.pre1
 - new upstream (pre-)release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 09:29:45 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:29:45 -0400
Subject: rpms/fgfs-Atlas/devel fgfs-Atlas.spec,1.3,1.4
Message-ID: <200709230929.l8N9TjiH017290@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-Atlas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17272

Modified Files:
	fgfs-Atlas.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
- update License tag



Index: fgfs-Atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/fgfs-Atlas/devel/fgfs-Atlas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fgfs-Atlas.spec	28 Aug 2007 21:45:40 -0000	1.3
+++ fgfs-Atlas.spec	23 Sep 2007 09:29:12 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		fgfs-Atlas
 Summary:	Flightgear map tools
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source:		http://downloads.sourceforge.net/sourceforge/atlas/Atlas-%{version}.tar.gz
 Source1:	Atlas-default-maps.tar.gz
@@ -49,6 +49,9 @@
 %{_datadir}/FlightGear/*
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
+- update License tag
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.3.1-5
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep 23 10:49:28 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 23 Sep 2007 06:49:28 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.3,1.4
Message-ID: <200709231049.l8NAnS6q028947@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28920

Modified Files:
	compiz-fusion.spec 
Log Message:
fix changelog date


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compiz-fusion.spec	22 Sep 2007 11:36:51 -0000	1.3
+++ compiz-fusion.spec	23 Sep 2007 10:48:52 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 7.%{snapshot}%{?dist}
+Release: 8.%{snapshot}%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -127,7 +127,10 @@
 
 
 %changelog
-* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
+* Sun Sep 23 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-8.09b700
+- Fix changelog date
+
+* Sat Sep 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
 - Update to 0.6 branch (builds against current compiz)
 
 * Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6



From fedora-extras-commits at redhat.com  Sun Sep 23 10:50:43 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 23 Sep 2007 06:50:43 -0400
Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec,1.2,1.3
Message-ID: <200709231050.l8NAohwL029027@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
adjust pre/post/postun scripts to handle renamed schema files


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-fusion-extras.spec	22 Sep 2007 11:38:36 -0000	1.2
+++ compiz-fusion-extras.spec	23 Sep 2007 10:50:08 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.5.2       
-Release: 6.%{snapshot}%{?dist}
+Release: 7.%{snapshot}%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -72,7 +72,7 @@
 
 for p in in %{plugins}; do
 %{_bindir}/gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+	%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
 done
 
 %pre gnome
@@ -80,7 +80,7 @@
   export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
   for p in in %{plugins}; do
 	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
   done
 fi
 
@@ -89,7 +89,7 @@
   export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
   for p in in %{plugins}; do
 	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
   done
 fi
 
@@ -110,7 +110,11 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
-* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
+* Sun Sep 23 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.6871d0
+- GConf schemas got renamed .. fix scripts to install them
+- Fix changelog date
+
+* Sat Sep 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
 - Update to 0.6 branch (builds against current compiz)
 
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5



From fedora-extras-commits at redhat.com  Sun Sep 23 11:48:17 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 23 Sep 2007 07:48:17 -0400
Subject: rpms/cdlabelgen/F-7 .cvsignore, 1.4, 1.5 cdlabelgen.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709231148.l8NBmHnk003536@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/cdlabelgen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3511

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
- updated to 4.0.0
- preserve timestamps upon install
- changed License tag to BSD with advertising



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2006 18:00:25 -0000	1.4
+++ .cvsignore	23 Sep 2007 11:47:38 -0000	1.5
@@ -1 +1 @@
-cdlabelgen-3.6.0.tgz
+cdlabelgen-4.0.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/cdlabelgen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdlabelgen.spec	21 Sep 2006 18:00:25 -0000	1.3
+++ cdlabelgen.spec	23 Sep 2007 11:47:38 -0000	1.4
@@ -1,11 +1,11 @@
 Name: cdlabelgen
 Summary: Generates frontcards and traycards for inserting in CD jewelcases
-Version: 3.6.0
+Version: 4.0.0
 Release: 1%{?dist}
 Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
 URL: http://www.aczoom.com/tools/cdinsert/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL
+License: BSD with advertising
 Group: Applications/Publishing
 BuildArch: noarch
 
@@ -17,14 +17,13 @@
 %setup -q
 
 %build
-make
-#pod2man cdlabelgen > cdlabelgen.1
+# nothing to build
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -pm755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -pm644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -pm644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,6 +36,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 4.0.0-1
+- updated to 4.0.0
+- preserve timestamps upon install
+- changed License tag to BSD with advertising
+
 * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 3.6.0-1
 - update to 3.6.0
 - mass rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2006 18:00:25 -0000	1.4
+++ sources	23 Sep 2007 11:47:38 -0000	1.5
@@ -1 +1 @@
-6867ad98ec198de3fcf24ffd11525f8c  cdlabelgen-3.6.0.tgz
+0b8225fd914b5c7aa1d3e616b1c8accc  cdlabelgen-4.0.0.tgz



From fedora-extras-commits at redhat.com  Sun Sep 23 13:41:55 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sun, 23 Sep 2007 09:41:55 -0400
Subject: rpms/jack-audio-connection-kit/EL-5 jack-audio-connection-kit.spec, 
	1.12, 1.13
Message-ID: <200709231341.l8NDftWx017784@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17749

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Fix spec to be compatible with Fedora/EPEL 5.


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/EL-5/jack-audio-connection-kit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jack-audio-connection-kit.spec	7 Jun 2007 08:47:12 -0000	1.12
+++ jack-audio-connection-kit.spec	23 Sep 2007 13:41:20 -0000	1.13
@@ -1,25 +1,22 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.103.0
-Release: 1%{?dist}
-License: GPL/LGPL
+Release: 4%{?dist}
+License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
-Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
-BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: pkgconfig
 BuildRequires: doxygen
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob-devel >= 1.0.0
 
-%define gid 334
 %define groupname jackuser
 
-Requires(pre): /usr/sbin/groupadd
+Requires(pre): shadow-utils
 Requires(post): /sbin/ldconfig
 
 %description
@@ -61,7 +58,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
-    --enable-freebob \
+    --disable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -88,13 +85,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g %gid -r %groupname &>/dev/null || :
+getent group %groupname >/dev/null || groupadd -r %groupname
+exit 0
 
 %post
 /sbin/ldconfig
 
 # Add default limits for jackuser group
-grep -q jackuser /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
+grep -q %groupname /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
 
 ## Automatically appended by jack-audio-connection-kit
 @jackuser - rtprio 20
@@ -125,7 +123,6 @@
 
 %files example-clients
 %defattr(-,root,root)
-%{_bindir}/jackrec
 %{_bindir}/jack_connect
 %{_bindir}/jack_disconnect
 %{_bindir}/jack_impulse_grabber
@@ -138,6 +135,14 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Sep 04 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-4
+- fix Source Forge's URL scheme
+
+* Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-3
+- fix according to new guidelines:
+  - License tag
+  - group creation
+
 * Wed May 23 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-1
 - update to the last official release
 - append defaults to the limits.conf (#221785, #235624)



From fedora-extras-commits at redhat.com  Sun Sep 23 14:29:07 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 23 Sep 2007 10:29:07 -0400
Subject: rpms/chemtool/devel chemtool.spec,1.5,1.6
Message-ID: <200709231429.l8NET7LJ027937@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27919

Modified Files:
	chemtool.spec 
Log Message:
- drop libEMF dependency (current transfig/fig2dev supports EMF output)


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chemtool.spec	26 Aug 2007 20:13:27 -0000	1.5
+++ chemtool.spec	23 Sep 2007 14:28:35 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
 Version: 1.6.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -12,7 +12,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
-BuildRequires: libEMF-devel
 BuildRequires: libXt-devel
 BuildRequires: gnome-mime-data
 BuildRequires: kdelibs
@@ -32,7 +31,6 @@
 
 %build
 %configure \
-  --enable-emf \
   --with-kdedir=%{_prefix} \
   --with-gnomedir=%{_prefix}
 %{__make} %{?_smp_mflags}
@@ -90,6 +88,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.11-2
+- drop libEMF dependency (current transfig/fig2dev supports EMF output)
+
 * Sun Aug 26 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.11-1
 - updated to 1.6.11
 - updated license tag



From fedora-extras-commits at redhat.com  Sun Sep 23 14:47:39 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Sun, 23 Sep 2007 10:47:39 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine.spec,1.6,1.7
Message-ID: <200709231447.l8NEldS1028698@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28617

Modified Files:
	gtk-nodoka-engine.spec 
Log Message:


Require at least the version of gtk it is build against (rhbz #301851).




Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk-nodoka-engine.spec	20 Sep 2007 20:50:17 -0000	1.6
+++ gtk-nodoka-engine.spec	23 Sep 2007 14:47:07 -0000	1.7
@@ -1,6 +1,9 @@
+%define gtk2version %(pkg-config gtk+-2.0 --modversion 2> /dev/null)
+%define nogtk2 %(pkg-config gtk+-2.0 --modversion &> /dev/null; echo $?)
+
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
@@ -12,7 +15,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
+%if 0%{?nogtk2}
 Requires:       gtk2
+%else
+Requires:       gtk2 >= %{?gtk2version}
+%endif
 
 %description
 Nodoka is a Murrine engine based gtk2 theme engine. The package is shipped with 
@@ -48,6 +55,10 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Sun Sep 23 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-3
+- Require at least the version of gtk it was build against
+-- rhbz 301851 (patch from Ignacio Vazquez-Abrams)
+
 * Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
 - Add user specified tooltips coloring
 - Fix colours in unfocused GTKTreeView (rhbz #297271)



From fedora-extras-commits at redhat.com  Sun Sep 23 15:42:41 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sun, 23 Sep 2007 11:42:41 -0400
Subject: rpms/gdb/devel gdb-6.6-bfd-vdso8k.patch, NONE,
	1.1 gdb-6.6-bz233852-attach-signalled.patch, 1.3, 1.4 gdb.spec,
	1.245, 1.246
Message-ID: <200709231542.l8NFgfVc005102@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4867

Modified Files:
	gdb-6.6-bz233852-attach-signalled.patch gdb.spec 
Added Files:
	gdb-6.6-bfd-vdso8k.patch 
Log Message:
* Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
- Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
- Fix the testcase for pending signals (from BZ 233852).


gdb-6.6-bfd-vdso8k.patch:

--- NEW FILE gdb-6.6-bfd-vdso8k.patch ---
2007-09-23  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): New variables
	X_SHDR_SHSTRTAB and I_SHDR_SHSTRTAB.  Fixed the CONTENTS_SIZE trimming
	check for its aligned size between the last segment and still before
	the section header end.  Added variables check to cover also the
	section header string table.

--- ./bfd/elfcode.h	14 Aug 2007 08:04:47 -0000	1.86
+++ ./bfd/elfcode.h	23 Sep 2007 14:24:39 -0000
@@ -1628,6 +1628,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
   Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */
   Elf_External_Phdr *x_phdrs;
   Elf_Internal_Phdr *i_phdrs, *last_phdr;
+  Elf_External_Shdr *x_shdr_shstrtab;
+  Elf_Internal_Shdr *i_shdr_shstrtab;
   bfd *nbfd;
   struct bfd_in_memory *bim;
   int contents_size;
@@ -1746,19 +1748,49 @@ NAME(_bfd_elf,bfd_from_remote_memory)
 
   /* Trim the last segment so we don't bother with zeros in the last page
      that are off the end of the file.  However, if the extra bit in that
-     page includes the section headers, keep them.  */
-  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz
-      && (bfd_vma) contents_size >= (i_ehdr.e_shoff
-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-    {
-      contents_size = last_phdr->p_offset + last_phdr->p_filesz;
-      if ((bfd_vma) contents_size < (i_ehdr.e_shoff
-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-	contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
-    }
-  else
+     page includes the section headers os the section header string table,
+     keep them.  */
+  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz)
     contents_size = last_phdr->p_offset + last_phdr->p_filesz;
 
+  if ((bfd_vma) contents_size < i_ehdr.e_shoff
+				+ i_ehdr.e_shnum * i_ehdr.e_shentsize)
+    contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
+
+  /* Section header string table is usually before the section headers
+     so this check is here has usually no effect.  */
+  if (i_ehdr.e_shstrndx < i_ehdr.e_shnum)
+    {
+      x_shdr_shstrtab = bfd_malloc (sizeof *x_shdr_shstrtab
+				    + sizeof *i_shdr_shstrtab);
+      if (x_shdr_shstrtab == NULL)
+	{
+	  free (x_phdrs);
+	  bfd_set_error (bfd_error_no_memory);
+	  return NULL;
+	}
+      err = target_read_memory (ehdr_vma + i_ehdr.e_shoff
+				+ i_ehdr.e_shstrndx * sizeof *x_shdr_shstrtab,
+				(bfd_byte *) x_shdr_shstrtab,
+				sizeof *x_shdr_shstrtab);
+      if (err)
+	{
+	  free (x_shdr_shstrtab);
+	  free (x_phdrs);
+	  bfd_set_error (bfd_error_system_call);
+	  errno = err;
+	  return NULL;
+	}
+      i_shdr_shstrtab = (Elf_Internal_Shdr *) &x_shdr_shstrtab[1];
+      elf_swap_shdr_in (templ, x_shdr_shstrtab, i_shdr_shstrtab);
+
+      if ((bfd_vma) contents_size < i_shdr_shstrtab->sh_offset
+				    + i_shdr_shstrtab->sh_size)
+        contents_size = i_shdr_shstrtab->sh_offset + i_shdr_shstrtab->sh_size;
+
+      free (x_shdr_shstrtab);
+    }
+
   /* Now we know the size of the whole image we want read in.  */
   contents = bfd_zmalloc (contents_size);
   if (contents == NULL)

gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.6-bz233852-attach-signalled.patch	22 Sep 2007 15:56:10 -0000	1.3
+++ gdb-6.6-bz233852-attach-signalled.patch	23 Sep 2007 15:42:37 -0000	1.4
@@ -684,7 +684,7 @@
 +}
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ ./gdb/testsuite/gdb.threads/attach-stopped.exp	29 Jun 2007 22:06:06 -0000
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,219 @@
 +# Copyright 2005-2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -792,10 +792,13 @@
 +    # Avoid some race:
 +    sleep 2
 +
-+    set fileid [open /proc/${testpid}/status r];
-+    gets $fileid line1;
-+    gets $fileid line2;
-+    close $fileid;
++    if [catch {open /proc/${testpid}/status r} fileid] {
++	set line2 "NOTFOUND"
++    } else {
++	gets $fileid line1;
++	gets $fileid line2;
++	close $fileid;
++    }
 +
 +    set test "$threadtype: attach1, exit leaves process stopped"
 +    if {[string match "*(stopped)*" $line2]} {
@@ -861,10 +864,13 @@
 +
 +    # At this point, the process should be sleeping
 +
-+    set fileid2 [open /proc/${testpid}/status r];
-+    gets $fileid2 line1;
-+    gets $fileid2 line2;
-+    close $fileid2;
++    if [catch {open /proc/${testpid}/status r} fileid2] {
++	set line2 "NOTFOUND"
++    } else {
++	gets $fileid2 line1;
++	gets $fileid2 line2;
++	close $fileid2;
++    }
 +
 +    set test "$threadtype: attach2, exit leaves process sleeping"
 +    if {[string match "*(sleeping)*" $line2]} {


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gdb.spec	22 Sep 2007 15:56:10 -0000	1.245
+++ gdb.spec	23 Sep 2007 15:42:37 -0000	1.246
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 28%{?dist}
+Release: 29%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -374,6 +374,9 @@
 Patch273: gdb-6.6-buildid-verify.patch
 Patch274: gdb-6.6-buildid-locate.patch
 
+# Fixed the kernel VDSO loading (producing `no loadable sections found').
+Patch276: gdb-6.6-bfd-vdso8k.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils expat-devel
 Requires: readline
@@ -529,6 +532,7 @@
 %patch272 -p1
 %patch273 -p1
 %patch274 -p1
+%patch276 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -683,6 +687,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
+- Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
+- Fix the testcase for pending signals (from BZ 233852).
+
 * Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
 - Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
 - Fix the build compatibility with texinfo >= 4.10.



From fedora-extras-commits at redhat.com  Sun Sep 23 16:54:34 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Sun, 23 Sep 2007 12:54:34 -0400
Subject: rpms/xen/F-7 xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.181, 
	1.182
Message-ID: <200709231654.l8NGsYwa014009@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13981

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix case of disappearing network card

xen-clobber-vif-type.patch:

--- NEW FILE xen-clobber-vif-type.patch ---
diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py	2007-09-19 14:24:34.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py	2007-09-19 14:25:28.000000000 -0400
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             mac = randomMAC()
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge:


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- xen.spec	1 Aug 2007 13:28:48 -0000	1.181
+++ xen.spec	23 Sep 2007 16:53:56 -0000	1.182
@@ -24,6 +24,7 @@
 Patch28: xen-keyboard.patch
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
+Patch31: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -120,6 +121,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # config patches
 %patch100 -p1
@@ -268,7 +270,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com> - 3.1.0-3.fc7
+* Sun Sep 23 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-3.fc7
+- Don't clobber the VIF type attribute in FV guests (rhbz #247122)
+
+* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com>
 - Put guest's native protocol ABI into xenstore, to provide for older
   kernels running 32-on-64.
 - VNC keymap fixes



From fedora-extras-commits at redhat.com  Sun Sep 23 18:41:28 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 14:41:28 -0400
Subject: rpms/blender/devel .cvsignore, 1.10, 1.11 blender.desktop, 1.2,
	1.3 blender.spec, 1.62, 1.63 sources, 1.12, 1.13
Message-ID: <200709231841.l8NIfShx029982@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29940

Modified Files:
	.cvsignore blender.desktop blender.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 May 2007 20:28:00 -0000	1.10
+++ .cvsignore	23 Sep 2007 18:40:55 -0000	1.11
@@ -1 +1 @@
-blender-2.44-noffmpeg.tar.gz
+blender-2.45-noffmpeg.tar.gz


Index: blender.desktop
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blender.desktop	8 Nov 2004 04:08:05 -0000	1.2
+++ blender.desktop	23 Sep 2007 18:40:55 -0000	1.3
@@ -7,4 +7,4 @@
 Terminal=false
 Type=Application
 Categories=Graphics;Application;
-MimeType=application/x-blender
+MimeType=application/x-blender;


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- blender.spec	9 Aug 2007 16:39:03 -0000	1.62
+++ blender.spec	23 Sep 2007 18:40:55 -0000	1.63
@@ -3,8 +3,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
-Version:        2.44
-Release: 	8%{?dist}
+Version:        2.45
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -112,6 +112,7 @@
 pushd bin/.blender/locale
 mv pt_br pt_BR
 mv zh_cn uh_CN
+rm -rf $(find -name '.svn' -print)
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -149,7 +150,6 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -171,6 +171,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Sep 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-8
 - Fix koji-python issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 20:28:00 -0000	1.12
+++ sources	23 Sep 2007 18:40:55 -0000	1.13
@@ -1 +1 @@
-c078195e1563bb95b7b228f3f679c48d  blender-2.44-noffmpeg.tar.gz
+2f88b8a5860f6919bd72dc9946a55f3b  blender-2.45-noffmpeg.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 19:14:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 15:14:07 -0400
Subject: rpms/blender/F-7 blender.spec,1.58,1.59 sources,1.12,1.13
Message-ID: <200709231914.l8NJE7SW004587@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4556

Modified Files:
	blender.spec sources 
Log Message:
New upstream release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- blender.spec	12 Aug 2007 18:32:50 -0000	1.58
+++ blender.spec	23 Sep 2007 19:13:35 -0000	1.59
@@ -3,8 +3,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
-Version:        2.44
-Release: 	5%{?dist}
+Version:        2.45
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -111,6 +111,7 @@
 pushd bin/.blender/locale
 mv pt_br pt_BR
 mv zh_cn uh_CN
+rm -rf $(find -name '.svn' -print)
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -170,6 +171,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
+- New upstream release
+
 * Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-5
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 20:36:33 -0000	1.12
+++ sources	23 Sep 2007 19:13:35 -0000	1.13
@@ -1 +1 @@
-c078195e1563bb95b7b228f3f679c48d  blender-2.44-noffmpeg.tar.gz
+2f88b8a5860f6919bd72dc9946a55f3b  blender-2.45-noffmpeg.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 19:56:49 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 15:56:49 -0400
Subject: rpms/blender/devel blender.spec,1.63,1.64
Message-ID: <200709231956.l8NJunXj005404@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384

Modified Files:
	blender.spec 
Log Message:
Change method how to determinate python version


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- blender.spec	23 Sep 2007 18:40:55 -0000	1.63
+++ blender.spec	23 Sep 2007 19:56:16 -0000	1.64
@@ -1,10 +1,9 @@
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
-%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
 Version:        2.45
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -71,7 +70,9 @@
 %patch1 -p1 -b .org
 %patch2 -p1 -b .bid
 
-sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
+
+sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
 %build
@@ -171,6 +172,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
+- Change method how to determinate python version
+
 * Thu Sep 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 20:13:14 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 16:13:14 -0400
Subject: rpms/blender/F-7 blender.spec,1.59,1.60
Message-ID: <200709232013.l8NKDElX011875@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11844

Modified Files:
	blender.spec 
Log Message:
Change method how to determinate python version


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- blender.spec	23 Sep 2007 19:13:35 -0000	1.59
+++ blender.spec	23 Sep 2007 20:12:41 -0000	1.60
@@ -1,10 +1,9 @@
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
-%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
 Version:        2.45
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -70,7 +69,9 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .org
-sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
+sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
 %build
@@ -171,6 +172,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
+- Change method how to determinate python version
+
 * Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 20:28:05 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Sun, 23 Sep 2007 16:28:05 -0400
Subject: rpms/m2crypto/devel m2crypto-0.18-proxy.patch, NONE,
	1.1 m2crypto.spec, 1.35, 1.36
Message-ID: <200709232028.l8NKS5Vq012160@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12139

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.18-proxy.patch 
Log Message:
* Sun Sep 23 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-2
- Add missing Host: header to CONNECT requests (patch by Karl Grindley)
  Resolves: #239034
- Fix License:


m2crypto-0.18-proxy.patch:

--- NEW FILE m2crypto-0.18-proxy.patch ---
Patch by Karl Grindley <kgrindley at ll.mit.edu>

Index: M2Crypto/httpslib.py
===================================================================
--- M2Crypto/httpslib.py	(revision 581)
+++ M2Crypto/httpslib.py	(working copy)
@@ -172,6 +172,7 @@
     def _get_connect_msg(self):
         """ Return an HTTP CONNECT request to send to the proxy. """
         msg = "CONNECT %s:%d HTTP/1.1\r\n" % (self._real_host, self._real_port)
+        msg = msg + "Host: %s:%d\r\n" % (self._real_host, self._real_port)
         if self._proxy_auth:
             msg = msg + "%s: %s\r\n" % (self._AUTH_HEADER, self._proxy_auth) 
         msg = msg + "\r\n"


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- m2crypto.spec	31 Jul 2007 22:25:52 -0000	1.35
+++ m2crypto.spec	23 Sep 2007 20:27:32 -0000	1.36
@@ -6,10 +6,11 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18
-Release: 1
+Release: 2
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
-License: BSDish
+Patch1: m2crypto-0.18-proxy.patch
+License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -74,6 +76,11 @@
 %{python_sitearch}/M2Crypto
 
 %changelog
+* Sun Sep 23 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-2
+- Add missing Host: header to CONNECT requests (patch by Karl Grindley)
+  Resolves: #239034
+- Fix License:
+
 * Wed Aug  1 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-1
 - Update to m2crypto-0.18
 



From fedora-extras-commits at redhat.com  Sun Sep 23 22:33:55 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 23 Sep 2007 18:33:55 -0400
Subject: rpms/gqview/devel gqview-2.0.0-editors.patch, 1.1, 1.2 gqview.spec, 
	1.16, 1.17
Message-ID: <200709232233.l8NMXtxf000791@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv761

Modified Files:
	gqview-2.0.0-editors.patch gqview.spec 
Log Message:
* Sun Sep 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4-5
- update patch: gimp-remote doesn't know option -n anymore


gqview-2.0.0-editors.patch:

Index: gqview-2.0.0-editors.patch
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview-2.0.0-editors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gqview-2.0.0-editors.patch	26 Feb 2005 23:00:44 -0000	1.1
+++ gqview-2.0.0-editors.patch	23 Sep 2007 22:33:52 -0000	1.2
@@ -4,7 +4,7 @@
 @@ -48,8 +48,8 @@
  
  static gchar *editor_slot_defaults[] = {
- 	N_("The Gimp"), "gimp-remote -n %f",
+ 	N_("The Gimp"), "gimp-remote %f",
 -	N_("XV"), "xv %f",
 -	N_("Xpaint"), "xpaint %f",
 +	NULL, NULL,


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gqview.spec	21 Aug 2007 17:01:32 -0000	1.16
+++ gqview.spec	23 Sep 2007 22:33:52 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Image browser and viewer
 Name:		gqview
 Version:	2.0.4
-Release: 4
+Release: 5
 License:	GPLv2
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4-5
+- update patch: gimp-remote doesn't know option -n anymore
+
 * Tue Aug 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Sep 23 22:52:23 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 23 Sep 2007 18:52:23 -0400
Subject: rpms/gqview/devel gqview-2.0.4-editors.patch, NONE, 1.1 gqview.spec,
	1.17, 1.18 gqview-2.0.0-editors.patch, 1.2, NONE
Message-ID: <200709232252.l8NMqNCS001242@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1217

Modified Files:
	gqview.spec 
Added Files:
	gqview-2.0.4-editors.patch 
Removed Files:
	gqview-2.0.0-editors.patch 
Log Message:
fix the -editors patch

gqview-2.0.4-editors.patch:

--- NEW FILE gqview-2.0.4-editors.patch ---
diff -Nur gqview-2.0.4-orig/src/editors.c gqview-2.0.4/src/editors.c
--- gqview-2.0.4-orig/src/editors.c	2005-06-13 23:58:04.000000000 +0200
+++ gqview-2.0.4/src/editors.c	2007-09-24 00:51:29.000000000 +0200
@@ -47,9 +47,9 @@
 
 
 static gchar *editor_slot_defaults[] = {
-	N_("The Gimp"), "gimp-remote -n %f",
-	N_("XV"), "xv %f",
-	N_("Xpaint"), "xpaint %f",
+	N_("The Gimp"), "gimp-remote %f",
+	NULL, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gqview.spec	23 Sep 2007 22:33:52 -0000	1.17
+++ gqview.spec	23 Sep 2007 22:51:48 -0000	1.18
@@ -6,7 +6,7 @@
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
 Patch1:		gqview-2.0.3-desktop.patch
-Patch2:		gqview-2.0.0-editors.patch
+Patch2:		gqview-2.0.4-editors.patch
 Patch3:     gqview-2.0.4-print-pagesize.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/


--- gqview-2.0.0-editors.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 23 23:21:14 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Sun, 23 Sep 2007 19:21:14 -0400
Subject: rpms/gstreamer-plugins-pulse/devel .cvsignore, 1.4,
	1.5 gstreamer-plugins-pulse.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200709232321.l8NNLEHs007857@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7830

Modified Files:
	.cvsignore gstreamer-plugins-pulse.spec sources 
Log Message:
update svn snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2007 01:52:59 -0000	1.4
+++ .cvsignore	23 Sep 2007 23:20:39 -0000	1.5
@@ -1 +1 @@
-gst-pulse-0.9.5.svn20070816.tar.gz
+gst-pulse-0.9.5.svn20070924.tar.gz


Index: gstreamer-plugins-pulse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/gstreamer-plugins-pulse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-plugins-pulse.spec	16 Aug 2007 01:52:59 -0000	1.4
+++ gstreamer-plugins-pulse.spec	23 Sep 2007 23:20:39 -0000	1.5
@@ -3,19 +3,19 @@
 
 Name:           gstreamer-plugins-pulse
 Version:        0.9.5
-Release:        0.3.svn20070816%{?dist}
+Release:        0.4.svn20070924%{?dist}
 Summary:        GStreamer 0.10 plugin for the PulseAudio sound server
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://0pointer.de/lennart/projects/gst-pulse/
 #Source0: http://0pointer.de/lennart/projects/gst-pulse/%{upstream}-%{version}.tar.gz
-Source0:        gst-pulse-0.9.5.svn20070816.tar.gz
+Source0:        gst-pulse-0.9.5.svn20070924.tar.gz
 Source1:        gstreamer-plugins-pulse-README.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  lynx
-BuildRequires:  pulseaudio-devel
+BuildRequires:  pulseaudio-lib-devel
 
 %description
 %{name} is a GStreamer 0.10 plugin for the PulseAudio sound
@@ -29,29 +29,29 @@
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 # to overcome problem with libtool on Linux
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-, root, root, -)
 %doc LICENSE README README.Fedora
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse*
 
 %changelog
+* Mon Sep 24 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.4.svn20070924
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.3.svn20070816
-. Update SVN snapshot
+- Update SVN snapshot
 
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.2.svn20070816
-. Update SVN snapshot
+- Update SVN snapshot
 
 * Tue Aug 14 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.1.svn20070814
 . get SVN snapshot. increase rank to get advantage over alsa


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2007 01:52:59 -0000	1.4
+++ sources	23 Sep 2007 23:20:39 -0000	1.5
@@ -1 +1 @@
-3422d29c61c440cbabb93eb7753da962  gst-pulse-0.9.5.svn20070816.tar.gz
+11d838d0287e63e371e448c68d82765c  gst-pulse-0.9.5.svn20070924.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 23:47:33 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Sun, 23 Sep 2007 19:47:33 -0400
Subject: rpms/alsa-plugins/devel 1.0.14-buffer-attr.patch, NONE,
	1.1 alsa-plugins.spec, 1.2, 1.3
Message-ID: <200709232347.l8NNlXsq008578@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8545

Modified Files:
	alsa-plugins.spec 
Added Files:
	1.0.14-buffer-attr.patch 
Log Message:
change PulseAudio buffering metrics to saner defaults

1.0.14-buffer-attr.patch:

--- NEW FILE 1.0.14-buffer-attr.patch ---
--- alsa-plugins-1.0.14/pulse/pcm_pulse.c	2007-05-31 10:06:51.000000000 +0200
+++ alsa-plugins-1.0.14.lennart/pulse/pcm_pulse.c	2007-09-24 01:43:01.000000000 +0200
@@ -57,7 +57,7 @@
 
     if (size > pcm->last_size) {
         pcm->ptr += size - pcm->last_size;
-        pcm->ptr %= pcm->buffer_attr.maxlength;
+        pcm->ptr %= pcm->buffer_attr.tlength;
     }
 
     pcm->last_size = size;
@@ -533,9 +533,9 @@
     pcm->ss.rate = io->rate;
     pcm->ss.channels = io->channels;
 
-    pcm->buffer_attr.maxlength = io->buffer_size * pcm->frame_size;
+    pcm->buffer_attr.maxlength = (io->buffer_size*3)/2 * pcm->frame_size;
     pcm->buffer_attr.tlength = io->buffer_size * pcm->frame_size;
-    pcm->buffer_attr.prebuf = io->period_size * pcm->frame_size;
+    pcm->buffer_attr.prebuf = (io->buffer_size-io->period_size) * pcm->frame_size;
     pcm->buffer_attr.minreq = io->period_size * pcm->frame_size;
     pcm->buffer_attr.fragsize = io->period_size * pcm->frame_size;
 


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-plugins.spec	15 Aug 2007 04:36:18 -0000	1.2
+++ alsa-plugins.spec	23 Sep 2007 23:47:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.14
-Release:        2%{?dist}
+Release:        3%{?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+
@@ -13,6 +13,7 @@
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
+Patch0:		1.0.14-buffer-attr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -93,6 +94,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .buffer_attr
 
 %build
 %configure --disable-static \
@@ -160,6 +162,9 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Mon Sep 24 2007 Lennart Poettering <lpoetter at redhat.com> - 1.0.14-3
+- Change PulseAudio buffering defaults to more sane values
+
 * Tue Aug 14 2007 Eric Moret <eric.moret at epita.fr> - 1.0.14-2
 - Adding pulse as ALSA "default" pcm and ctl when the alsa-plugins-pulseaudio
 package is installed, fixing #251943.



From fedora-extras-commits at redhat.com  Mon Sep 24 01:41:41 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 23 Sep 2007 21:41:41 -0400
Subject: rpms/vinagre/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vinagre.spec, 1.1, 1.2
Message-ID: <200709240141.l8O1ffte022924@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22876

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
- Update to 0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Aug 2007 13:37:13 -0000	1.2
+++ .cvsignore	24 Sep 2007 01:41:09 -0000	1.3
@@ -1 +1 @@
-vinagre-0.2.tar.gz
+vinagre-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Aug 2007 13:37:13 -0000	1.2
+++ sources	24 Sep 2007 01:41:09 -0000	1.3
@@ -1 +1 @@
-b1a25422b0f5a7a7a325cf05d008dc6c  vinagre-0.2.tar.gz
+c3f64d488d35b35806771f8db2c22ea7  vinagre-0.3.tar.gz


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vinagre.spec	22 Aug 2007 13:37:13 -0000	1.1
+++ vinagre.spec	24 Sep 2007 01:41:09 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	0.2
+Version:	0.3
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
@@ -61,6 +61,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
+- Update to 0.3
+
 * Wed Aug 22 2007 - Bastien Nocera <bnocera at redhat.com> - 0.2-1
 - First version
 - Fix plenty of comments from Ray Strode as per review



From fedora-extras-commits at redhat.com  Mon Sep 24 02:26:53 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sun, 23 Sep 2007 22:26:53 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.691, 1.692 kernel.spec, 1.178,
	1.179 linux-2.6-highres-timers.patch, 1.10, 1.11 sources, 1.653,
	1.654 upstream, 1.575,
	1.576 linux-2.6-xfs-fix-filestreams-free-func-cast.patch, 1.1,
	NONE patch-2.6.23-rc7-git3.bz2.sign, 1.1, NONE
Message-ID: <200709240226.l8O2QrqU029934@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29852

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	patch-2.6.23-rc7-git4.bz2.sign 
Removed Files:
	linux-2.6-xfs-fix-filestreams-free-func-cast.patch 
	patch-2.6.23-rc7-git3.bz2.sign 
Log Message:
* Sun Sep 23 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7-git4



--- NEW FILE patch-2.6.23-rc7-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9g+pyGugalF9Dw4RAkPqAJ4lgVRIQytu/RlILy7STDLHnL/OtACdHmxD
Wmlvj0dlAuoOkQJbe2bOQmY=
=PWzh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- .cvsignore	22 Sep 2007 11:45:40 -0000	1.691
+++ .cvsignore	24 Sep 2007 02:26:20 -0000	1.692
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git3.bz2
+patch-2.6.23-rc7-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kernel.spec	22 Sep 2007 11:45:40 -0000	1.178
+++ kernel.spec	24 Sep 2007 02:26:20 -0000	1.179
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -665,7 +665,6 @@
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
-Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
@@ -1177,7 +1176,6 @@
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
-ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
 
 #
@@ -1804,6 +1802,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7-git4
+
 * Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc7-git3
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-highres-timers.patch	22 Sep 2007 11:45:40 -0000	1.10
+++ linux-2.6-highres-timers.patch	24 Sep 2007 02:26:20 -0000	1.11
@@ -587,411 +587,6 @@
  }
  
  #else
-@@ -245,404 +245,6 @@ static void acpi_state_timer_broadcast(s
- 
- #endif
- 
--static void acpi_processor_idle(void)
--{
--	struct acpi_processor *pr = NULL;
--	struct acpi_processor_cx *cx = NULL;
--	struct acpi_processor_cx *next_state = NULL;
--	int sleep_ticks = 0;
--	u32 t1, t2 = 0;
--
--	/*
--	 * Interrupts must be disabled during bus mastering calculations and
--	 * for C2/C3 transitions.
--	 */
--	local_irq_disable();
--
--	pr = processors[smp_processor_id()];
--	if (!pr) {
--		local_irq_enable();
--		return;
--	}
--
--	/*
--	 * Check whether we truly need to go idle, or should
--	 * reschedule:
--	 */
--	if (unlikely(need_resched())) {
--		local_irq_enable();
--		return;
--	}
--
--	cx = pr->power.state;
--	if (!cx) {
--		if (pm_idle_save)
--			pm_idle_save();
--		else
--			acpi_safe_halt();
--		return;
--	}
--
--	/*
--	 * Check BM Activity
--	 * -----------------
--	 * Check for bus mastering activity (if required), record, and check
--	 * for demotion.
--	 */
--	if (pr->flags.bm_check) {
--		u32 bm_status = 0;
--		unsigned long diff = jiffies - pr->power.bm_check_timestamp;
--
--		if (diff > 31)
--			diff = 31;
--
--		pr->power.bm_activity <<= diff;
--
--		acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
--		if (bm_status) {
--			pr->power.bm_activity |= 0x1;
--			acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
--		}
--		/*
--		 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
--		 * the true state of bus mastering activity; forcing us to
--		 * manually check the BMIDEA bit of each IDE channel.
--		 */
--		else if (errata.piix4.bmisx) {
--			if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
--			    || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
--				pr->power.bm_activity |= 0x1;
--		}
--
--		pr->power.bm_check_timestamp = jiffies;
--
--		/*
--		 * If bus mastering is or was active this jiffy, demote
--		 * to avoid a faulty transition.  Note that the processor
--		 * won't enter a low-power state during this call (to this
--		 * function) but should upon the next.
--		 *
--		 * TBD: A better policy might be to fallback to the demotion
--		 *      state (use it for this quantum only) istead of
--		 *      demoting -- and rely on duration as our sole demotion
--		 *      qualification.  This may, however, introduce DMA
--		 *      issues (e.g. floppy DMA transfer overrun/underrun).
--		 */
--		if ((pr->power.bm_activity & 0x1) &&
--		    cx->demotion.threshold.bm) {
--			local_irq_enable();
--			next_state = cx->demotion.state;
--			goto end;
--		}
--	}
--
--#ifdef CONFIG_HOTPLUG_CPU
--	/*
--	 * Check for P_LVL2_UP flag before entering C2 and above on
--	 * an SMP system. We do it here instead of doing it at _CST/P_LVL
--	 * detection phase, to work cleanly with logical CPU hotplug.
--	 */
--	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
--	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
--		cx = &pr->power.states[ACPI_STATE_C1];
--#endif
--
--	/*
--	 * Sleep:
--	 * ------
--	 * Invoke the current Cx state to put the processor to sleep.
--	 */
--	if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
--		current_thread_info()->status &= ~TS_POLLING;
--		/*
--		 * TS_POLLING-cleared state must be visible before we
--		 * test NEED_RESCHED:
--		 */
--		smp_mb();
--		if (need_resched()) {
--			current_thread_info()->status |= TS_POLLING;
--			local_irq_enable();
--			return;
--		}
--	}
--
--	switch (cx->type) {
--
--	case ACPI_STATE_C1:
--		/*
--		 * Invoke C1.
--		 * Use the appropriate idle routine, the one that would
--		 * be used without acpi C-states.
--		 */
--		if (pm_idle_save)
--			pm_idle_save();
--		else
--			acpi_safe_halt();
--
--		/*
--		 * TBD: Can't get time duration while in C1, as resumes
--		 *      go to an ISR rather than here.  Need to instrument
--		 *      base interrupt handler.
--		 *
--		 * Note: the TSC better not stop in C1, sched_clock() will
--		 *       skew otherwise.
--		 */
--		sleep_ticks = 0xFFFFFFFF;
--		break;
--
--	case ACPI_STATE_C2:
--		/* Get start time (ticks) */
--		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		/* Tell the scheduler that we are going deep-idle: */
--		sched_clock_idle_sleep_event();
--		/* Invoke C2 */
--		acpi_state_timer_broadcast(pr, cx, 1);
--		acpi_cstate_enter(cx);
--		/* Get end time (ticks) */
--		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--
--#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
--		/* TSC halts in C2, so notify users */
--		mark_tsc_unstable("possible TSC halt in C2");
--#endif
--		/* Compute time (ticks) that we were actually asleep */
--		sleep_ticks = ticks_elapsed(t1, t2);
--
--		/* Tell the scheduler how much we idled: */
--		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
--
--		/* Re-enable interrupts */
--		local_irq_enable();
--		/* Do not account our idle-switching overhead: */
--		sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
--
--		current_thread_info()->status |= TS_POLLING;
--		acpi_state_timer_broadcast(pr, cx, 0);
--		break;
--
--	case ACPI_STATE_C3:
--		/*
--		 * disable bus master
--		 * bm_check implies we need ARB_DIS
--		 * !bm_check implies we need cache flush
--		 * bm_control implies whether we can do ARB_DIS
--		 *
--		 * That leaves a case where bm_check is set and bm_control is
--		 * not set. In that case we cannot do much, we enter C3
--		 * without doing anything.
--		 */
--		if (pr->flags.bm_check && pr->flags.bm_control) {
--			if (atomic_inc_return(&c3_cpu_count) ==
--			    num_online_cpus()) {
--				/*
--				 * All CPUs are trying to go to C3
--				 * Disable bus master arbitration
--				 */
--				acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
--			}
--		} else if (!pr->flags.bm_check) {
--			/* SMP with no shared cache... Invalidate cache  */
--			ACPI_FLUSH_CPU_CACHE();
--		}
--
--		/* Get start time (ticks) */
--		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		/* Invoke C3 */
--		acpi_state_timer_broadcast(pr, cx, 1);
--		/* Tell the scheduler that we are going deep-idle: */
--		sched_clock_idle_sleep_event();
--		acpi_cstate_enter(cx);
--		/* Get end time (ticks) */
--		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		if (pr->flags.bm_check && pr->flags.bm_control) {
--			/* Enable bus master arbitration */
--			atomic_dec(&c3_cpu_count);
--			acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
--		}
--
--#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
--		/* TSC halts in C3, so notify users */
--		mark_tsc_unstable("TSC halts in C3");
--#endif
--		/* Compute time (ticks) that we were actually asleep */
--		sleep_ticks = ticks_elapsed(t1, t2);
--		/* Tell the scheduler how much we idled: */
--		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
--
--		/* Re-enable interrupts */
--		local_irq_enable();
--		/* Do not account our idle-switching overhead: */
--		sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
--
--		current_thread_info()->status |= TS_POLLING;
--		acpi_state_timer_broadcast(pr, cx, 0);
--		break;
--
--	default:
--		local_irq_enable();
--		return;
--	}
--	cx->usage++;
--	if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
--		cx->time += sleep_ticks;
--
--	next_state = pr->power.state;
--
--#ifdef CONFIG_HOTPLUG_CPU
--	/* Don't do promotion/demotion */
--	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
--	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
--		next_state = cx;
--		goto end;
--	}
--#endif
--
--	/*
--	 * Promotion?
--	 * ----------
--	 * Track the number of longs (time asleep is greater than threshold)
--	 * and promote when the count threshold is reached.  Note that bus
--	 * mastering activity may prevent promotions.
--	 * Do not promote above max_cstate.
--	 */
--	if (cx->promotion.state &&
--	    ((cx->promotion.state - pr->power.states) <= max_cstate)) {
--		if (sleep_ticks > cx->promotion.threshold.ticks &&
--		  cx->promotion.state->latency <= system_latency_constraint()) {
--			cx->promotion.count++;
--			cx->demotion.count = 0;
--			if (cx->promotion.count >=
--			    cx->promotion.threshold.count) {
--				if (pr->flags.bm_check) {
--					if (!
--					    (pr->power.bm_activity & cx->
--					     promotion.threshold.bm)) {
--						next_state =
--						    cx->promotion.state;
--						goto end;
--					}
--				} else {
--					next_state = cx->promotion.state;
--					goto end;
--				}
--			}
--		}
--	}
--
--	/*
--	 * Demotion?
--	 * ---------
--	 * Track the number of shorts (time asleep is less than time threshold)
--	 * and demote when the usage threshold is reached.
--	 */
--	if (cx->demotion.state) {
--		if (sleep_ticks < cx->demotion.threshold.ticks) {
--			cx->demotion.count++;
--			cx->promotion.count = 0;
--			if (cx->demotion.count >= cx->demotion.threshold.count) {
--				next_state = cx->demotion.state;
--				goto end;
--			}
--		}
--	}
--
--      end:
--	/*
--	 * Demote if current state exceeds max_cstate
--	 * or if the latency of the current state is unacceptable
--	 */
--	if ((pr->power.state - pr->power.states) > max_cstate ||
--		pr->power.state->latency > system_latency_constraint()) {
--		if (cx->demotion.state)
--			next_state = cx->demotion.state;
--	}
--
--	/*
--	 * New Cx State?
--	 * -------------
--	 * If we're going to start using a new Cx state we must clean up
--	 * from the previous and prepare to use the new.
--	 */
--	if (next_state != pr->power.state)
--		acpi_processor_power_activate(pr, next_state);
--}
--
--static int acpi_processor_set_power_policy(struct acpi_processor *pr)
--{
--	unsigned int i;
--	unsigned int state_is_set = 0;
--	struct acpi_processor_cx *lower = NULL;
--	struct acpi_processor_cx *higher = NULL;
--	struct acpi_processor_cx *cx;
--
--
--	if (!pr)
--		return -EINVAL;
--
--	/*
--	 * This function sets the default Cx state policy (OS idle handler).
--	 * Our scheme is to promote quickly to C2 but more conservatively
--	 * to C3.  We're favoring C2  for its characteristics of low latency
--	 * (quick response), good power savings, and ability to allow bus
--	 * mastering activity.  Note that the Cx state policy is completely
--	 * customizable and can be altered dynamically.
--	 */
--
--	/* startup state */
--	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (!state_is_set)
--			pr->power.state = cx;
--		state_is_set++;
--		break;
--	}
--
--	if (!state_is_set)
--		return -ENODEV;
--
--	/* demotion */
--	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (lower) {
--			cx->demotion.state = lower;
--			cx->demotion.threshold.ticks = cx->latency_ticks;
--			cx->demotion.threshold.count = 1;
--			if (cx->type == ACPI_STATE_C3)
--				cx->demotion.threshold.bm = bm_history;
--		}
--
--		lower = cx;
--	}
--
--	/* promotion */
--	for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (higher) {
--			cx->promotion.state = higher;
--			cx->promotion.threshold.ticks = cx->latency_ticks;
--			if (cx->type >= ACPI_STATE_C2)
--				cx->promotion.threshold.count = 4;
--			else
--				cx->promotion.threshold.count = 10;
--			if (higher->type == ACPI_STATE_C3)
--				cx->promotion.threshold.bm = bm_history;
--		}
--
--		higher = cx;
--	}
--
--	return 0;
--}
--
- static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
- {
- 
 @@ -922,7 +457,7 @@ static void acpi_processor_power_verify_
  	 * Normalize the C2 latency to expidite policy
  	 */
@@ -1467,20 +1062,427 @@
 +		count++;
  	}
  
-+	if (!count)
-+		return -EINVAL;
-+
-+	dev->state_count = count;
- 	return 0;
- }
-+
-+struct cpuidle_driver acpi_idle_driver = {
-+	.name =		"acpi_idle",
-+	.init =		acpi_idle_init,
-+	.redetect =	acpi_idle_init,
-+	.bm_check =	acpi_idle_bm_check,
-+	.owner =	THIS_MODULE,
-+};
++	if (!count)
++		return -EINVAL;
++
++	dev->state_count = count;
+ 	return 0;
+ }
++
++struct cpuidle_driver acpi_idle_driver = {
++	.name =		"acpi_idle",
++	.init =		acpi_idle_init,
++	.redetect =	acpi_idle_init,
++	.bm_check =	acpi_idle_bm_check,
++	.owner =	THIS_MODULE,
++};
+--- linux-2.6.22.noarch/drivers/acpi/processor_idle.c~	2007-09-23 22:22:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/acpi/processor_idle.c	2007-09-23 22:22:52.000000000 -0400
+@@ -260,404 +260,6 @@ int acpi_processor_resume(struct acpi_de
+ 	return 0;
+ }
+ 
+-static void acpi_processor_idle(void)
+-{
+-	struct acpi_processor *pr = NULL;
+-	struct acpi_processor_cx *cx = NULL;
+-	struct acpi_processor_cx *next_state = NULL;
+-	int sleep_ticks = 0;
+-	u32 t1, t2 = 0;
+-
+-	/*
+-	 * Interrupts must be disabled during bus mastering calculations and
+-	 * for C2/C3 transitions.
+-	 */
+-	local_irq_disable();
+-
+-	pr = processors[smp_processor_id()];
+-	if (!pr) {
+-		local_irq_enable();
+-		return;
+-	}
+-
+-	/*
+-	 * Check whether we truly need to go idle, or should
+-	 * reschedule:
+-	 */
+-	if (unlikely(need_resched())) {
+-		local_irq_enable();
+-		return;
+-	}
+-
+-	cx = pr->power.state;
+-	if (!cx || acpi_idle_suspend) {
+-		if (pm_idle_save)
+-			pm_idle_save();
+-		else
+-			acpi_safe_halt();
+-		return;
+-	}
+-
+-	/*
+-	 * Check BM Activity
+-	 * -----------------
+-	 * Check for bus mastering activity (if required), record, and check
+-	 * for demotion.
+-	 */
+-	if (pr->flags.bm_check) {
+-		u32 bm_status = 0;
+-		unsigned long diff = jiffies - pr->power.bm_check_timestamp;
+-
+-		if (diff > 31)
+-			diff = 31;
+-
+-		pr->power.bm_activity <<= diff;
+-
+-		acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+-		if (bm_status) {
+-			pr->power.bm_activity |= 0x1;
+-			acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
+-		}
+-		/*
+-		 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
+-		 * the true state of bus mastering activity; forcing us to
+-		 * manually check the BMIDEA bit of each IDE channel.
+-		 */
+-		else if (errata.piix4.bmisx) {
+-			if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
+-			    || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
+-				pr->power.bm_activity |= 0x1;
+-		}
+-
+-		pr->power.bm_check_timestamp = jiffies;
+-
+-		/*
+-		 * If bus mastering is or was active this jiffy, demote
+-		 * to avoid a faulty transition.  Note that the processor
+-		 * won't enter a low-power state during this call (to this
+-		 * function) but should upon the next.
+-		 *
+-		 * TBD: A better policy might be to fallback to the demotion
+-		 *      state (use it for this quantum only) istead of
+-		 *      demoting -- and rely on duration as our sole demotion
+-		 *      qualification.  This may, however, introduce DMA
+-		 *      issues (e.g. floppy DMA transfer overrun/underrun).
+-		 */
+-		if ((pr->power.bm_activity & 0x1) &&
+-		    cx->demotion.threshold.bm) {
+-			local_irq_enable();
+-			next_state = cx->demotion.state;
+-			goto end;
+-		}
+-	}
+-
+-#ifdef CONFIG_HOTPLUG_CPU
+-	/*
+-	 * Check for P_LVL2_UP flag before entering C2 and above on
+-	 * an SMP system. We do it here instead of doing it at _CST/P_LVL
+-	 * detection phase, to work cleanly with logical CPU hotplug.
+-	 */
+-	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
+-	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
+-		cx = &pr->power.states[ACPI_STATE_C1];
+-#endif
+-
+-	/*
+-	 * Sleep:
+-	 * ------
+-	 * Invoke the current Cx state to put the processor to sleep.
+-	 */
+-	if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
+-		current_thread_info()->status &= ~TS_POLLING;
+-		/*
+-		 * TS_POLLING-cleared state must be visible before we
+-		 * test NEED_RESCHED:
+-		 */
+-		smp_mb();
+-		if (need_resched()) {
+-			current_thread_info()->status |= TS_POLLING;
+-			local_irq_enable();
+-			return;
+-		}
+-	}
+-
+-	switch (cx->type) {
+-
+-	case ACPI_STATE_C1:
+-		/*
+-		 * Invoke C1.
+-		 * Use the appropriate idle routine, the one that would
+-		 * be used without acpi C-states.
+-		 */
+-		if (pm_idle_save)
+-			pm_idle_save();
+-		else
+-			acpi_safe_halt();
+-
+-		/*
+-		 * TBD: Can't get time duration while in C1, as resumes
+-		 *      go to an ISR rather than here.  Need to instrument
+-		 *      base interrupt handler.
+-		 *
+-		 * Note: the TSC better not stop in C1, sched_clock() will
+-		 *       skew otherwise.
+-		 */
+-		sleep_ticks = 0xFFFFFFFF;
+-		break;
+-
+-	case ACPI_STATE_C2:
+-		/* Get start time (ticks) */
+-		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		/* Tell the scheduler that we are going deep-idle: */
+-		sched_clock_idle_sleep_event();
+-		/* Invoke C2 */
+-		acpi_state_timer_broadcast(pr, cx, 1);
+-		acpi_cstate_enter(cx);
+-		/* Get end time (ticks) */
+-		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-
+-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+-		/* TSC halts in C2, so notify users */
+-		mark_tsc_unstable("possible TSC halt in C2");
+-#endif
+-		/* Compute time (ticks) that we were actually asleep */
+-		sleep_ticks = ticks_elapsed(t1, t2);
+-
+-		/* Tell the scheduler how much we idled: */
+-		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+-
+-		/* Re-enable interrupts */
+-		local_irq_enable();
+-		/* Do not account our idle-switching overhead: */
+-		sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
+-
+-		current_thread_info()->status |= TS_POLLING;
+-		acpi_state_timer_broadcast(pr, cx, 0);
+-		break;
+-
+-	case ACPI_STATE_C3:
+-		/*
+-		 * disable bus master
+-		 * bm_check implies we need ARB_DIS
+-		 * !bm_check implies we need cache flush
+-		 * bm_control implies whether we can do ARB_DIS
+-		 *
+-		 * That leaves a case where bm_check is set and bm_control is
+-		 * not set. In that case we cannot do much, we enter C3
+-		 * without doing anything.
+-		 */
+-		if (pr->flags.bm_check && pr->flags.bm_control) {
+-			if (atomic_inc_return(&c3_cpu_count) ==
+-			    num_online_cpus()) {
+-				/*
+-				 * All CPUs are trying to go to C3
+-				 * Disable bus master arbitration
+-				 */
+-				acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
+-			}
+-		} else if (!pr->flags.bm_check) {
+-			/* SMP with no shared cache... Invalidate cache  */
+-			ACPI_FLUSH_CPU_CACHE();
+-		}
+-
+-		/* Get start time (ticks) */
+-		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		/* Invoke C3 */
+-		acpi_state_timer_broadcast(pr, cx, 1);
+-		/* Tell the scheduler that we are going deep-idle: */
+-		sched_clock_idle_sleep_event();
+-		acpi_cstate_enter(cx);
+-		/* Get end time (ticks) */
+-		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		if (pr->flags.bm_check && pr->flags.bm_control) {
+-			/* Enable bus master arbitration */
+-			atomic_dec(&c3_cpu_count);
+-			acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+-		}
+-
+-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+-		/* TSC halts in C3, so notify users */
+-		mark_tsc_unstable("TSC halts in C3");
+-#endif
+-		/* Compute time (ticks) that we were actually asleep */
+-		sleep_ticks = ticks_elapsed(t1, t2);
+-		/* Tell the scheduler how much we idled: */
+-		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+-
+-		/* Re-enable interrupts */
+-		local_irq_enable();
+-		/* Do not account our idle-switching overhead: */
+-		sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
+-
+-		current_thread_info()->status |= TS_POLLING;
+-		acpi_state_timer_broadcast(pr, cx, 0);
+-		break;
+-
+-	default:
+-		local_irq_enable();
+-		return;
+-	}
+-	cx->usage++;
+-	if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
+-		cx->time += sleep_ticks;
+-
+-	next_state = pr->power.state;
+-
+-#ifdef CONFIG_HOTPLUG_CPU
+-	/* Don't do promotion/demotion */
+-	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+-	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
+-		next_state = cx;
+-		goto end;
+-	}
+-#endif
+-
+-	/*
+-	 * Promotion?
+-	 * ----------
+-	 * Track the number of longs (time asleep is greater than threshold)
+-	 * and promote when the count threshold is reached.  Note that bus
+-	 * mastering activity may prevent promotions.
+-	 * Do not promote above max_cstate.
+-	 */
+-	if (cx->promotion.state &&
+-	    ((cx->promotion.state - pr->power.states) <= max_cstate)) {
+-		if (sleep_ticks > cx->promotion.threshold.ticks &&
+-		  cx->promotion.state->latency <= system_latency_constraint()) {
+-			cx->promotion.count++;
+-			cx->demotion.count = 0;
+-			if (cx->promotion.count >=
+-			    cx->promotion.threshold.count) {
+-				if (pr->flags.bm_check) {
+-					if (!
+-					    (pr->power.bm_activity & cx->
+-					     promotion.threshold.bm)) {
+-						next_state =
+-						    cx->promotion.state;
+-						goto end;
+-					}
+-				} else {
+-					next_state = cx->promotion.state;
+-					goto end;
+-				}
+-			}
+-		}
+-	}
+-
+-	/*
+-	 * Demotion?
+-	 * ---------
+-	 * Track the number of shorts (time asleep is less than time threshold)
+-	 * and demote when the usage threshold is reached.
+-	 */
+-	if (cx->demotion.state) {
+-		if (sleep_ticks < cx->demotion.threshold.ticks) {
+-			cx->demotion.count++;
+-			cx->promotion.count = 0;
+-			if (cx->demotion.count >= cx->demotion.threshold.count) {
+-				next_state = cx->demotion.state;
+-				goto end;
+-			}
+-		}
+-	}
+-
+-      end:
+-	/*
+-	 * Demote if current state exceeds max_cstate
+-	 * or if the latency of the current state is unacceptable
+-	 */
+-	if ((pr->power.state - pr->power.states) > max_cstate ||
+-		pr->power.state->latency > system_latency_constraint()) {
+-		if (cx->demotion.state)
+-			next_state = cx->demotion.state;
+-	}
+-
+-	/*
+-	 * New Cx State?
+-	 * -------------
+-	 * If we're going to start using a new Cx state we must clean up
+-	 * from the previous and prepare to use the new.
+-	 */
+-	if (next_state != pr->power.state)
+-		acpi_processor_power_activate(pr, next_state);
+-}
+-
+-static int acpi_processor_set_power_policy(struct acpi_processor *pr)
+-{
+-	unsigned int i;
+-	unsigned int state_is_set = 0;
+-	struct acpi_processor_cx *lower = NULL;
+-	struct acpi_processor_cx *higher = NULL;
+-	struct acpi_processor_cx *cx;
+-
+-
+-	if (!pr)
+-		return -EINVAL;
+-
+-	/*
+-	 * This function sets the default Cx state policy (OS idle handler).
+-	 * Our scheme is to promote quickly to C2 but more conservatively
+-	 * to C3.  We're favoring C2  for its characteristics of low latency
+-	 * (quick response), good power savings, and ability to allow bus
+-	 * mastering activity.  Note that the Cx state policy is completely
+-	 * customizable and can be altered dynamically.
+-	 */
+-
+-	/* startup state */
+-	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (!state_is_set)
+-			pr->power.state = cx;
+-		state_is_set++;
+-		break;
+-	}
+-
+-	if (!state_is_set)
+-		return -ENODEV;
+-
+-	/* demotion */
+-	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (lower) {
+-			cx->demotion.state = lower;
+-			cx->demotion.threshold.ticks = cx->latency_ticks;
+-			cx->demotion.threshold.count = 1;
+-			if (cx->type == ACPI_STATE_C3)
+-				cx->demotion.threshold.bm = bm_history;
+-		}
+-
+-		lower = cx;
+-	}
+-
+-	/* promotion */
+-	for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (higher) {
+-			cx->promotion.state = higher;
+-			cx->promotion.threshold.ticks = cx->latency_ticks;
+-			if (cx->type >= ACPI_STATE_C2)
+-				cx->promotion.threshold.count = 4;
+-			else
+-				cx->promotion.threshold.count = 10;
+-			if (higher->type == ACPI_STATE_C3)
+-				cx->promotion.threshold.bm = bm_history;
+-		}
+-
+-		higher = cx;
+-	}
+-
+-	return 0;
+-}
+-
+ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
+ {
+ 
 Index: linux-2.6.23-rc3/drivers/acpi/tables/tbxface.c
 ===================================================================
 --- linux-2.6.23-rc3.orig/drivers/acpi/tables/tbxface.c	2007-08-13 16:49:30.000000000 +0200
@@ -3230,15 +3232,16 @@
  };
  
  struct acpi_processor {
-@@ -320,6 +321,8 @@ int acpi_processor_power_init(struct acp
- int acpi_processor_cst_has_changed(struct acpi_processor *pr);
- int acpi_processor_power_exit(struct acpi_processor *pr,
- 			      struct acpi_device *device);
+@@ -324,6 +324,9 @@ int acpi_processor_power_exit(struct acp
+ int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
+ int acpi_processor_resume(struct acpi_device * device);
+ 
 +extern struct cpuidle_driver acpi_idle_driver;
 +void acpi_max_cstate_changed(void);
- 
++
  /* in processor_thermal.c */
  int acpi_processor_get_limit_info(struct acpi_processor *pr);
+ extern struct file_operations acpi_processor_limit_fops;
 Index: linux-2.6.23-rc3/include/linux/acpi.h
 ===================================================================
 --- linux-2.6.23-rc3.orig/include/linux/acpi.h	2007-08-13 16:49:30.000000000 +0200


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- sources	22 Sep 2007 11:45:40 -0000	1.653
+++ sources	24 Sep 2007 02:26:20 -0000	1.654
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-1bf67697b6630e24ad5cc844290d8d64  patch-2.6.23-rc7-git3.bz2
+37ff766bfc5834bc33b84b5164debe79  patch-2.6.23-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- upstream	22 Sep 2007 11:45:40 -0000	1.575
+++ upstream	24 Sep 2007 02:26:20 -0000	1.576
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git3.bz2
+patch-2.6.23-rc7-git4.bz2


--- linux-2.6-xfs-fix-filestreams-free-func-cast.patch DELETED ---


--- patch-2.6.23-rc7-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 02:34:51 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:34:51 -0400
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.6,1.7
Message-ID: <200709240234.l8O2YpwH030077@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license field to GPLv2+
- remove with_libstdc_preview macro



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:34:19 -0000	1.7
@@ -1,20 +1,15 @@
-%define with_libstdc_preview 0
-
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
 Requires:	scim
 
 %description
@@ -35,23 +30,13 @@
 
 
 %build
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 %configure --disable-static
-%if %{with_libstdc_preview}
-# tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
-%endif
 # doesn't build with %{?_smp_mflags}
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
@@ -75,6 +60,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 3.1.1-7
+- update license field to GPLv2+
+- remove with_libstdc_preview macro
+
 * Wed Sep 27 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-6
 - rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Sep 24 02:38:51 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:38:51 -0400
Subject: rpms/scim-fcitx/F-7 scim-fcitx.spec,1.6,1.7
Message-ID: <200709240238.l8O2cpjN030247@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30193/F-7

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license to GPLv2+



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/F-7/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:38:19 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Mon Sep 24 02:38:54 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:38:54 -0400
Subject: rpms/scim-fcitx/FC-6 scim-fcitx.spec,1.6,1.7
Message-ID: <200709240238.l8O2cs3x030250@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30193/FC-6

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license to GPLv2+



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/FC-6/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:38:21 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Mon Sep 24 02:44:44 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:44:44 -0400
Subject: rpms/flim/devel flim.spec,1.4,1.5
Message-ID: <200709240244.l8O2iiQm030495@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30461

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/devel/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 02:44:12 -0000	1.5
@@ -4,8 +4,8 @@
 Summary: Basic library for handling email messages for Emacs
 Name: flim
 Version: 1.14.8
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 1.14.8-3
+- update license to GPLv2+
+
 * Mon Sep 25 2006 Jens Petersen <petersen at redhat.com> - 1.14.8-2
 - update url and source location
 



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:33 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:33 -0400
Subject: rpms/nickle/F-7 .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200709240253.l8O2rXsm030704@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/F-7

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:01 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:01 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:36 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:36 -0400
Subject: rpms/nickle/FC-6 .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709240253.l8O2raYx030716@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/FC-6

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:03 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:03 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:39 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:39 -0400
Subject: rpms/nickle/devel .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709240253.l8O2rdue030726@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/devel

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:06 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:06 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 03:07:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:07:12 -0400
Subject: rpms/flim/F-7 flim.spec,1.4,1.5
Message-ID: <200709240307.l8O37CHi004614@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4568/F-7

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/F-7/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 03:06:40 -0000	1.5
@@ -5,7 +5,7 @@
 Name: flim
 Version: 1.14.8
 Release: 2%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-extras-commits at redhat.com  Mon Sep 24 03:07:18 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:07:18 -0400
Subject: rpms/flim/FC-6 flim.spec,1.4,1.5
Message-ID: <200709240307.l8O37IUP004617@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4568/FC-6

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/FC-6/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 03:06:42 -0000	1.5
@@ -5,7 +5,7 @@
 Name: flim
 Version: 1.14.8
 Release: 2%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-extras-commits at redhat.com  Mon Sep 24 03:33:41 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 23 Sep 2007 23:33:41 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.51,1.52
Message-ID: <200709240333.l8O3Xfg0005091@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5073

Modified Files:
	xscreensaver.spec 
Log Message:
* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-8
- Some cleanup.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xscreensaver.spec	23 Sep 2007 07:39:34 -0000	1.51
+++ xscreensaver.spec	24 Sep 2007 03:33:09 -0000	1.52
@@ -515,7 +515,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sun Sep 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-8
 - Some cleanup.
 
 * Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7



From fedora-extras-commits at redhat.com  Mon Sep 24 03:38:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:38:54 -0400
Subject: rpms/pidgin-rhythmbox/F-7 pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240338.l8O3csMx005308@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/F-7

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/F-7/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	30 Apr 2007 21:34:37 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:22 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 03:38:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:38:57 -0400
Subject: rpms/pidgin-rhythmbox/FC-6 pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240338.l8O3cvkK005311@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/FC-6

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/FC-6/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	29 May 2007 21:14:55 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:25 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 03:39:00 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:39:00 -0400
Subject: rpms/pidgin-rhythmbox/devel pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240339.l8O3d04j005314@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/devel

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/devel/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	30 Apr 2007 21:34:37 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:27 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 04:35:20 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 24 Sep 2007 00:35:20 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 xorg-x11-drv-ati.spec, 1.60, 1.61
Message-ID: <200709240435.l8O4ZKx5012160@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12138

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
- xf86-video-ati 6.7.194



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Sep 2007 00:38:25 -0000	1.18
+++ .cvsignore	24 Sep 2007 04:34:48 -0000	1.19
@@ -1 +1 @@
-xf86-video-ati-6.7.193.tar.bz2
+xf86-video-ati-6.7.194.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Sep 2007 00:38:25 -0000	1.18
+++ sources	24 Sep 2007 04:34:48 -0000	1.19
@@ -1 +1 @@
-316ebbe95834c5120c302cc004363f92  xf86-video-ati-6.7.193.tar.bz2
+bac7c8da4d80503aeb53085e643e2dab  xf86-video-ati-6.7.194.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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-ati.spec	20 Sep 2007 00:38:25 -0000	1.60
+++ xorg-x11-drv-ati.spec	24 Sep 2007 04:34:48 -0000	1.61
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.7.193
+Version:   6.7.194
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -81,6 +81,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
+- xf86-video-ati 6.7.194
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
 - xf86-video-ati 6.7.193
 



From fedora-extras-commits at redhat.com  Mon Sep 24 04:48:59 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 00:48:59 -0400
Subject: comps comps-f8.xml.in,1.118,1.119
Message-ID: <200709240448.l8O4mx43012392@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375

Modified Files:
	comps-f8.xml.in 
Log Message:
add yum-utils to system-tools (#301671)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- comps-f8.xml.in	20 Sep 2007 20:58:48 -0000	1.118
+++ comps-f8.xml.in	24 Sep 2007 04:48:29 -0000	1.119
@@ -3403,6 +3403,7 @@
       <packagereq type="default">vnc</packagereq>
       <packagereq type="default">vpnc</packagereq>
       <packagereq type="default">xdelta</packagereq>
+      <packagereq type="default">yum-utils</packagereq>
       <packagereq type="default">zisofs-tools</packagereq>
       <packagereq type="default">zsh</packagereq>
       <packagereq type="optional">aide</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 24 05:11:04 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Sep 2007 01:11:04 -0400
Subject: rpms/tdom/devel tdom-0.8.2-noexpat.patch,1.1,1.2 tdom.spec,1.2,1.3
Message-ID: <200709240511.l8O5B4ld018758@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tdom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735

Modified Files:
	tdom-0.8.2-noexpat.patch tdom.spec 
Log Message:
Add missing linkage against -lexpat



tdom-0.8.2-noexpat.patch:

Index: tdom-0.8.2-noexpat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/tdom-0.8.2-noexpat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tdom-0.8.2-noexpat.patch	27 Aug 2007 01:21:19 -0000	1.1
+++ tdom-0.8.2-noexpat.patch	24 Sep 2007 05:10:59 -0000	1.2
@@ -1,5 +1,5 @@
---- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
-+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
+--- tDOM-0.8.2/configure.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure	2007-09-23 21:53:00.000000000 -0700
 @@ -6298,10 +6298,7 @@
  #-----------------------------------------------------------------------
  
@@ -12,17 +12,8 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
-@@ -6360,7 +6357,7 @@
- 
- 
- 
--    vars="-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}"
-+    vars="-I${srcdir}/generic ${AOL_INCLUDES}"
-     for i in $vars; do
- 	PKG_INCLUDES="$PKG_INCLUDES $i"
-     done
---- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
-+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
+--- tDOM-0.8.2/configure.in.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure.in	2007-09-23 21:53:00.000000000 -0700
 @@ -83,10 +83,7 @@
  # and PKG_TCL_SOURCES.
  #-----------------------------------------------------------------------
@@ -35,17 +26,17 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
-@@ -100,7 +97,7 @@
-                  generic/tclexpat.c  \
-                  generic/tdomStubInit.c])
- TEA_ADD_HEADERS([generic/tdom.h])
--TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
-+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
- TEA_ADD_LIBS([${AOL_LIBS}])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
---- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
-+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
+--- tDOM-0.8.2/Makefile.in.orig	2007-03-02 15:43:53.000000000 -0800
++++ tDOM-0.8.2/Makefile.in	2007-09-23 21:56:49.000000000 -0700
+@@ -118,7 +118,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
 @@ -296,7 +296,7 @@
  # As necessary, add $(srcdir):$(srcdir)/compat:....
  #========================================================================


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/tdom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom.spec	27 Aug 2007 01:21:19 -0000	1.2
+++ tdom.spec	24 Sep 2007 05:10:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
+- Added missing linkage against -lexpat
+
 * Sun Aug 26 2007 Wart <wart at kobold.org> - 0.8.2-1
 - Update to 0.8.2
 - Split into base and -devel packages



From fedora-extras-commits at redhat.com  Mon Sep 24 05:11:41 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Sep 2007 01:11:41 -0400
Subject: rpms/tdom/F-7 tdom-0.8.2-noexpat.patch,1.2,1.3 tdom.spec,1.2,1.3
Message-ID: <200709240511.l8O5Bf8V018844@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tdom/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818

Modified Files:
	tdom-0.8.2-noexpat.patch tdom.spec 
Log Message:
Add missing linkage against -lexpat



tdom-0.8.2-noexpat.patch:

Index: tdom-0.8.2-noexpat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/F-7/tdom-0.8.2-noexpat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom-0.8.2-noexpat.patch	28 Aug 2007 05:30:30 -0000	1.2
+++ tdom-0.8.2-noexpat.patch	24 Sep 2007 05:11:37 -0000	1.3
@@ -1,5 +1,5 @@
---- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
-+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
+--- tDOM-0.8.2/configure.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure	2007-09-23 21:53:00.000000000 -0700
 @@ -6298,10 +6298,7 @@
  #-----------------------------------------------------------------------
  
@@ -12,8 +12,8 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
-+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
+--- tDOM-0.8.2/configure.in.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure.in	2007-09-23 21:53:00.000000000 -0700
 @@ -83,10 +83,7 @@
  # and PKG_TCL_SOURCES.
  #-----------------------------------------------------------------------
@@ -26,8 +26,17 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
-+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
+--- tDOM-0.8.2/Makefile.in.orig	2007-03-02 15:43:53.000000000 -0800
++++ tDOM-0.8.2/Makefile.in	2007-09-23 21:56:49.000000000 -0700
+@@ -118,7 +118,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
 @@ -296,7 +296,7 @@
  # As necessary, add $(srcdir):$(srcdir)/compat:....
  #========================================================================


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/F-7/tdom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom.spec	27 Aug 2007 01:21:19 -0000	1.2
+++ tdom.spec	24 Sep 2007 05:11:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
+- Added missing linkage against -lexpat
+
 * Sun Aug 26 2007 Wart <wart at kobold.org> - 0.8.2-1
 - Update to 0.8.2
 - Split into base and -devel packages



From fedora-extras-commits at redhat.com  Mon Sep 24 06:26:10 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:26:10 -0700
Subject: [pkgdb] baekmuk-ttf-fonts was added for cchance
Message-ID: <200709240626.l8O6QAJE020505@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package baekmuk-ttf-fonts with summary Korean TrueType fonts
Jens Petersen (petersen) has approved Package baekmuk-ttf-fonts
Jens Petersen (petersen) has added a Fedora devel branch for baekmuk-ttf-fonts with an owner of cchance
Jens Petersen (petersen) has approved baekmuk-ttf-fonts in Fedora devel
Jens Petersen (petersen) has approved Package baekmuk-ttf-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-ttf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 06:26:11 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:26:11 -0700
Subject: [pkgdb] baekmuk-ttf-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240626.l8O6QCC2022791@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on baekmuk-ttf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on baekmuk-ttf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on baekmuk-ttf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-ttf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:04 -0400
Subject: rpms/baekmuk-ttf-fonts - New directory
Message-ID: <200709240627.l8O6R4oa026128@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts

Log Message:
Directory /cvs/extras/rpms/baekmuk-ttf-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:08 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:08 -0400
Subject: rpms/baekmuk-ttf-fonts/devel - New directory
Message-ID: <200709240627.l8O6R82m026149@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts/devel

Log Message:
Directory /cvs/extras/rpms/baekmuk-ttf-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:11 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:11 -0400
Subject: rpms/baekmuk-ttf-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240627.l8O6RBBp026175@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module baekmuk-ttf-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module baekmuk-ttf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:12 -0400
Subject: rpms/baekmuk-ttf-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709240627.l8O6RC7C026195@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module baekmuk-ttf-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: baekmuk-ttf-fonts
# $Id: Makefile,v 1.1 2007/09/24 06:27:11 petersen Exp $
NAME := baekmuk-ttf-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 fedora-extras-commits at redhat.com  Mon Sep 24 06:46:56 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:46:56 -0400
Subject: rpms/baekmuk-ttf-fonts/devel FAPIcidfmap.ko, NONE,
	1.1 baekmuk-ttf-fonts.spec, NONE, 1.1 cidfmap.ko, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709240646.l8O6ku6u026687@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26645/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FAPIcidfmap.ko baekmuk-ttf-fonts.spec cidfmap.ko 
Log Message:
initial import of approved package (#300651)



--- NEW FILE FAPIcidfmap.ko ---
%!
% The map is a set of records like this :
%
%  /CIDfont_name options_dict ;
%
% where options_dict is a dictionary with the following entries :
%
% Key         Type      Description
% Path        string    Absolute path to font file, or relative path to font file from
%                       the GS_EXTFONTPATH value.
% CIDFontType integer   PostScript type for this CID font. Only 0 is currently allowed.
%                       Note that this is unrelated to the real type of the font file -
%                       the bridge will perform format conversion.
% FAPI        name      Name of the renderer to be used with the font. /AgfaUFST and
%                       /FreeType is now allowed -- depends on which options Ghostscript
%                       was built with.
% SubfontId   integer   (optional) Index of the font in font collection, such as FCO or TTC.
%                       It is being ignored if /Path doesn't specify a collection.
% CSI         array     Must have strongly 2 elements.
%                       The first element of the array specifies Ordering of CIDSystemInfo.
%                       The second element specifies Supplement of CIDSystemInfo.
%
% Use regular Postscript syntax.
%
/Baekmuk-Batang		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum		<< /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim		<< /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline	<< /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
%
/Baekmuk-Batang-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline-Regular	<< /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
%
/Adobe-Korea1		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;


--- NEW FILE baekmuk-ttf-fonts.spec ---
%define upstreamname   baekmuk-ttf

%define ttfontdir      %{_datadir}/fonts/%{upstreamname}
%define cidmapdir      %{_datadir}/ghostscript/conf.d
%define catalogue      %{_sysconfdir}/X11/fontpath.d

Name:           %{upstreamname}-fonts
Version:        2.2
Release:        6%{?dist}
Summary:        Free Korean TrueType fonts

Group:          User Interface/X
License:        Baekmuk
URL:            http://kldp.net/frs/?group_id=57&release_id=865
Source0:        http://kldp.net/frs/download.php/1429/%{upstreamname}-%{version}.tar.gz
Source1:        FAPIcidfmap.ko
Source2:        cidfmap.ko
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  xorg-x11-font-utils, ttmkfdir >= 3.0.6

%description
This package provides the free Korean TrueType fonts.

%package common
Summary:        Common files for Korean Baekmuk TrueType fonts
License:        Baekmuk
Group:          User Interface/X
Conflicts:      fonts-korean < 2.2-5

%description common
This package contains some common files for Baekmuk Korean TrueType fonts.

%define mk_pkg()\
%package %1\
Summary:        Korean Baekmuk TrueType %2 typeface\
License:        Baekmuk\
Group:          User Interface/X\
Obsoletes:      ttfonts-ko < 1.0.11-33\
Requires:       %{name}-common\
\
%description %1\
This package contains the Korean TrueType font %2 typeface.\
\
%post %1\
if [ -x %{_bindir}/fc-cache ]; then\
  %{_bindir}/fc-cache %{_datadir}/fonts\
fi\
\
%postun %1\
if [ "$1" = "0" ]; then\
  if [ -x %{_bindir}/fc-cache ]; then\
    %{_bindir}/fc-cache %{_datadir}/fonts\
  fi\
fi\
\
%files %1\
%defattr(-,root,root,-)\
%dir %{ttfontdir}-%1\
%{ttfontdir}-%1/*.ttf\
%verify(not md5 size mtime) %{ttfontdir}-%1/fonts.dir\
%verify(not md5 size mtime) %{ttfontdir}-%1/fonts.scale\
%{catalogue}/%{name}-%1

%mk_pkg batang Batang
%mk_pkg dotum  Dotum
%mk_pkg gulim  Gulim
%mk_pkg hline  Headline

%prep
%setup -q -n %{upstreamname}-%{version}

%build
%{nil}

%install
rm -rf $RPM_BUILD_ROOT

# for catalogue
install -d $RPM_BUILD_ROOT%{catalogue}

for i in batang dotum gulim hline; do
  install -d $RPM_BUILD_ROOT%{ttfontdir}-$i
  install -p -m 0644 ttf/$i.ttf $RPM_BUILD_ROOT%{ttfontdir}-$i
  ln -sf ../../..%{ttfontdir}-$i $RPM_BUILD_ROOT%{catalogue}/%{name}-$i
  %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{ttfontdir}-$i -o $RPM_BUILD_ROOT%{ttfontdir}-$i/fonts.scale
  mkfontdir $RPM_BUILD_ROOT%{ttfontdir}-$i
done

# for ghostscript
install -d $RPM_BUILD_ROOT%{cidmapdir}
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{cidmapdir}/
install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/

# convert Korean copyright file to utf8
iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%doc COPYRIGHT COPYRIGHT.ko README
%{cidmapdir}/

%changelog
* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-6
- convert Korean copyright file to utf8 (Mamoru Tasaka, #300651)

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-5
- more fixes from Mamoru Tasaka, #300651:
- make common subpackage own ghostscript conf.d
- conflict with previous fonts-korean
- update CID font maps

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-4
- preserve timestamps of installed files (Mamoru Tasaka, #300651)
- add a common subpackage for shared files (Mamoru Tasaka, #300651)

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
- do not provide ttfonts-ko in subpackages (Mamoru Tasaka, #300651)

* Sat Sep 22 2007 Jens Petersen <petersen at redhat.com> - 2.2-2
- license is now designated Baekmuk

* Sat Sep 22 2007 Jens Petersen <petersen at redhat.com> - 2.2-1
- new package separated from fonts-korean (#253155)


--- NEW FILE cidfmap.ko ---
/Baekmuk-Batang		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Batang-Regular		/Baekmuk-Batang ;
/Baekmuk-Dotum		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum-Regular		/Baekmuk-Dotum ;
/Baekmuk-Gulim		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim-Regular		/Baekmuk-Gulim ;
/Baekmuk-Headline	<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline-Regular	/Baekmuk-Headline ;
/Adobe-Korea1			/Baekmuk-Batang ;



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-ttf-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 06:27:11 -0000	1.1
+++ .cvsignore	24 Sep 2007 06:46:22 -0000	1.2
@@ -0,0 +1 @@
+baekmuk-ttf-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-ttf-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 06:27:11 -0000	1.1
+++ sources	24 Sep 2007 06:46:22 -0000	1.2
@@ -0,0 +1 @@
+a6f4349179cbe3557641782cefba4d70  baekmuk-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 06:59:18 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Mon, 24 Sep 2007 02:59:18 -0400
Subject: rpms/autofs/devel autofs-5.0.2-foreground-logging.patch, NONE,
	1.1 autofs-5.0.2-ldap-schema-discovery-config-update.patch, NONE,
	1.1 autofs-5.0.2-libxml2-workaround.patch, NONE, 1.1 autofs.spec,
	1.222, 1.223
Message-ID: <200709240659.l8O6xIBg027042@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27011

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.2-foreground-logging.patch 
	autofs-5.0.2-ldap-schema-discovery-config-update.patch 
	autofs-5.0.2-libxml2-workaround.patch 
Log Message:
* Mon Sep 24 2007 Ian Kent <ikent at redhat.com> - 5.0.2-16
- add descriptive comments to config about LDAP schema discovery.
- work around segfault at exit caused by libxml2.
- fix foreground logging (also fixes shutdown needing extra signal bug).


autofs-5.0.2-foreground-logging.patch:

--- NEW FILE autofs-5.0.2-foreground-logging.patch ---
diff -up autofs-5.0.2/modules/lookup_ldap.c.foreground-logging autofs-5.0.2/modules/lookup_ldap.c
--- autofs-5.0.2/modules/lookup_ldap.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-24 14:44:18.000000000 +0800
@@ -468,17 +468,17 @@ int parse_ldap_config(struct lookup_cont
 	ctxt->client_princ = client_princ;
 
 	debug(LOGOPT_NONE,
-	      "ldap authentication configured with the following options:\n");
+	      "ldap authentication configured with the following options:");
 	debug(LOGOPT_NONE,
 	      "use_tls: %u, "
 	      "tls_required: %u, "
 	      "auth_required: %u, "
-	      "sasl_mech: %s\n",
+	      "sasl_mech: %s",
 	      use_tls, tls_required, auth_required, authtype);
 	debug(LOGOPT_NONE,
 	      "user: %s, "
 	      "secret: %s, "
-	      "client principal: %s\n",
+	      "client principal: %s",
 	      user, secret ? "specified" : "unspecified",
 	      client_princ);
 
diff -up autofs-5.0.2/modules/cyrus-sasl.c.foreground-logging autofs-5.0.2/modules/cyrus-sasl.c
--- autofs-5.0.2/modules/cyrus-sasl.c.foreground-logging	2007-06-18 15:18:08.000000000 +0800
+++ autofs-5.0.2/modules/cyrus-sasl.c	2007-09-24 14:44:18.000000000 +0800
@@ -197,7 +197,7 @@ get_server_SASL_mechanisms(LDAP *ld)
 	if (mechanisms == NULL) {
 		/* Well, that was a waste of time. */
 		msg("No SASL authentication mechanisms are supported"
-		    " by the LDAP server.\n");
+		    " by the LDAP server.");
 		return NULL;
 	}
 
diff -up autofs-5.0.2/daemon/automount.c.foreground-logging autofs-5.0.2/daemon/automount.c
--- autofs-5.0.2/daemon/automount.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/daemon/automount.c	2007-09-24 14:44:18.000000000 +0800
@@ -58,14 +58,13 @@ unsigned int random_selection;	/* use ra
 static int start_pipefd[2];
 static int st_stat = 0;
 static int *pst_stat = &st_stat;
+static pthread_t state_mach_thid;
 
 /* Pre-calculated kernel packet length */
 static size_t kpkt_len;
 
 /* Attribute to create detached thread */
 pthread_attr_t thread_attr;
-/* Attribute to create normal thread */
-pthread_attr_t thread_attr_nodetach;
 
 struct master_readmap_cond mrc = {
 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
@@ -75,9 +74,6 @@ struct startup_cond suc = {
 
 pthread_key_t key_thread_stdenv_vars;
 
-/* re-entrant syslog default context data */
-#define AUTOFS_SYSLOG_CONTEXT {-1, 0, 0, LOG_PID, (const char *)0, LOG_DAEMON, 0xff};
-
 #define MAX_OPEN_FILES		10240
 
 static int umount_all(struct autofs_point *ap, int force);
@@ -792,7 +788,6 @@ static void become_daemon(unsigned foreg
 {
 	FILE *pidfp;
 	char buf[MAX_ERR_BUF];
-	unsigned to_stderr = 0;
 	pid_t pid;
 
 	/* Don't BUSY any directories unnecessarily */
@@ -809,7 +804,9 @@ static void become_daemon(unsigned foreg
 	}
 
 	/* Detach from foreground process */
-	if (!foreground) {
+	if (foreground)
+		log_to_stderr();
+	else {
 		pid = fork();
 		if (pid > 0) {
 			int r;
@@ -834,13 +831,8 @@ static void become_daemon(unsigned foreg
 			fprintf(stderr, "setsid: %s", estr);
 			exit(1);
 		}
-	}
-
-	/* Setup logging */
-	if (to_stderr)
-		log_to_stderr();
-	else
 		log_to_syslog();
+	}
 
 	/* Write pid file if requested */
 	if (pid_file) {
@@ -929,7 +921,7 @@ static pthread_t do_signals(struct maste
 	if (status)
 		fatal(status);
 
-	status = pthread_create(&thid, &thread_attr_nodetach, do_notify_state, &r_sig);
+	status = pthread_create(&thid, &thread_attr, do_notify_state, &r_sig);
 	if (status) {
 		error(master->default_logging,
 		      "mount state notify thread create failed");
@@ -1043,7 +1035,6 @@ static int do_hup_signal(struct master *
 /* Deal with all the signal-driven events in the state machine */
 static void *statemachine(void *arg)
 {
-	pthread_t thid = 0;
 	sigset_t signalset;
 	int sig;
 
@@ -1056,15 +1047,12 @@ static void *statemachine(void *arg)
 
 		switch (sig) {
 		case SIGTERM:
+		case SIGINT:
 		case SIGUSR2:
+			if (master_list_empty(master_list))
+				return NULL;
 		case SIGUSR1:
-			thid = do_signals(master_list, sig);
-			if (thid) {
-				pthread_join(thid, NULL);
-				if (master_list_empty(master_list))
-					return NULL;
-				thid = 0;
-			}
+			do_signals(master_list, sig);
 			break;
 
 		case SIGHUP:
@@ -1179,6 +1167,10 @@ static void handle_mounts_cleanup(void *
 
 	msg("shut down path %s", path);
 
+	/* If we are the last tell the state machine to shutdown */
+	if (!submount && master_list_empty(master_list))
+		pthread_kill(state_mach_thid, SIGTERM);
+	
 	return;
 }
 
@@ -1357,7 +1349,7 @@ static void usage(void)
 		"	-v --verbose	be verbose\n"
 		"	-d --debug	log debuging info\n"
 		"	-D --define	define global macro variable\n"
-		/*"	-f --foreground do not fork into background\n" */
+		"	-f --foreground do not fork into background\n"
 		"	-r --random-multimount-selection\n"
 		"			use ramdom replicated server selection\n"
 		"	-O --global-options\n"
@@ -1632,14 +1624,6 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-	if (pthread_attr_init(&thread_attr_nodetach)) {
-		crit(LOGOPT_ANY,
-		     "%s: failed to init thread attribute struct!",
-		     program);
-		close(start_pipefd[1]);
-		exit(1);
-	}
-
 	msg("Starting automounter version %s, master map %s",
 		version, master_list->name);
 	msg("using kernel protocol version %d.%02d",
@@ -1684,6 +1668,7 @@ int main(int argc, char *argv[])
 	res = write(start_pipefd[1], pst_stat, sizeof(pst_stat));
 	close(start_pipefd[1]);
 
+	state_mach_thid = pthread_self();
 	statemachine(NULL);
 
 	master_kill(master_list);
diff -up autofs-5.0.2/lib/master.c.foreground-logging autofs-5.0.2/lib/master.c
--- autofs-5.0.2/lib/master.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/lib/master.c	2007-09-24 14:44:18.000000000 +0800
@@ -954,6 +954,7 @@ void master_notify_state_change(struct m
 
 		switch (sig) {
 		case SIGTERM:
+		case SIGINT:
 			if (ap->state != ST_SHUTDOWN_PENDING &&
 			    ap->state != ST_SHUTDOWN_FORCE) {
 				next = ST_SHUTDOWN_PENDING;
diff -up autofs-5.0.2/lib/log.c.foreground-logging autofs-5.0.2/lib/log.c
--- autofs-5.0.2/lib/log.c.foreground-logging	2007-06-18 15:18:08.000000000 +0800
+++ autofs-5.0.2/lib/log.c	2007-09-24 14:44:18.000000000 +0800
@@ -27,9 +27,6 @@
 
 #include "automount.h"
 
-/* re-entrant syslog default context data */
-#define AUTOFS_SYSLOG_CONTEXT {-1, 0, 0, LOG_PID, (const char *) 0, LOG_DAEMON, 0xff};
-
 /*
 struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT;
 struct syslog_data *slc = &syslog_context;
@@ -134,30 +131,40 @@ static void syslog_debug(unsigned int lo
 	va_end(ap);
 }
 
+static void to_stderr(unsigned int logopt, const char *msg, ...)
+{
+	va_list ap;
+	va_start(ap, msg);
+	vfprintf(stderr, msg, ap);
+	fputc('\n',stderr);
+	va_end(ap);
+}
+
 void set_mnt_logging(struct autofs_point *ap)
 {
 	unsigned int opt_verbose = ap->logopt & LOGOPT_VERBOSE;
 	unsigned int opt_debug = ap->logopt & LOGOPT_DEBUG;
 
-	if (opt_debug)
-		log_debug = syslog_debug;
+	if (opt_debug) {
+		if (logging_to_syslog)
+			log_debug = syslog_debug;
+		else
+			log_debug = to_stderr;
+	}
 
 	if (opt_verbose || opt_debug) {
-		log_info = syslog_info;
-		log_notice = syslog_notice;
-		log_warn = syslog_warn;
+		if (logging_to_syslog) {
+			log_info = syslog_info;
+			log_notice = syslog_notice;
+			log_warn = syslog_warn;
+		} else {
+			log_info = to_stderr;
+			log_notice = to_stderr;
+			log_warn = to_stderr;
+		}
 	}
 }
 
-static void to_stderr(unsigned int logopt, const char *msg, ...)
-{
-	va_list ap;
-	va_start(ap, msg);
-	vfprintf(stderr, msg, ap);
-	fputc('\n',stderr);
-	va_end(ap);
-}
-
 void log_to_syslog(void)
 {
 	char buf[MAX_ERR_BUF];
diff -up autofs-5.0.2/man/automount.8.foreground-logging autofs-5.0.2/man/automount.8
--- autofs-5.0.2/man/automount.8.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/man/automount.8	2007-09-24 14:44:18.000000000 +0800
@@ -47,6 +47,9 @@ Define a global macro substitution varia
 are over-ridden macro definitions of the same name specified in
 mount entries.
 .TP
+.I "\-f, \-\-foreground"
+Run the daemon in the forground and log to stderr instead of syslog."
+.TP
 .I "\-r, \-\-random-multimount-selection"
 Enables the use of ramdom selection when choosing a host from a
 list of replicated servers.

autofs-5.0.2-ldap-schema-discovery-config-update.patch:

--- NEW FILE autofs-5.0.2-ldap-schema-discovery-config-update.patch ---
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 8299b55..85f4e34 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -21,9 +21,12 @@ BROWSE_MODE="no"
 #
 #LOGGING="none"
 #
-# Define the default LDAP schema to use for lookups
+# Define the LDAP schema to used for lookups
 #
-# System default
+# If no schema is set autofs will check each of the schemas
+# below in the order given to try and locate an appropriate
+# basdn for lookups. If you want to minimize the number of
+# queries to the server set the values here.
 #
 #MAP_OBJECT_CLASS="nisMap"
 #ENTRY_OBJECT_CLASS="nisObject"
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 8299b55..85f4e34 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -21,9 +21,12 @@ BROWSE_MODE="no"
 #
 #LOGGING="none"
 #
-# Define the default LDAP schema to use for lookups
+# Define the LDAP schema to used for lookups
 #
-# System default
+# If no schema is set autofs will check each of the schemas
+# below in the order given to try and locate an appropriate
+# basdn for lookups. If you want to minimize the number of
+# queries to the server set the values here.
 #
 #MAP_OBJECT_CLASS="nisMap"
 #ENTRY_OBJECT_CLASS="nisObject"

autofs-5.0.2-libxml2-workaround.patch:

--- NEW FILE autofs-5.0.2-libxml2-workaround.patch ---
diff -up autofs-5.0.2/configure.libxml2-workaround autofs-5.0.2/configure
--- autofs-5.0.2/configure.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/configure	2007-09-24 14:26:09.000000000 +0800
@@ -2498,6 +2498,23 @@ echo "${ECHO_T}yes" >&6; }
   HAVE_LIBXML=1
   XML_LIBS=`$XML_CONFIG --libs`
   XML_FLAGS=`$XML_CONFIG --cflags`
+  XML_VER=`$XML_CONFIG --version`
+  XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
+  if test $XML_MAJOR -le 2
+  then
+    XML_MINOR=`echo $XML_VER|cut -d\. -f2`
+    if test $XML_MINOR -le 6
+    then
+      XML_REV=`echo $XML_VER|cut -d\. -f3`
+      if test $XML_REV -le 99; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LIBXML2_WORKAROUND 1
+_ACEOF
+
+      fi
+    fi
+  fi
 fi
 
 #
diff -up autofs-5.0.2/include/config.h.in.libxml2-workaround autofs-5.0.2/include/config.h.in
--- autofs-5.0.2/include/config.h.in.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/include/config.h.in	2007-09-24 14:26:09.000000000 +0800
@@ -60,6 +60,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Use libxml2 tsd usage workaround */
+#undef LIBXML2_WORKAROUND
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
diff -up autofs-5.0.2/aclocal.m4.libxml2-workaround autofs-5.0.2/aclocal.m4
--- autofs-5.0.2/aclocal.m4.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/aclocal.m4	2007-09-24 14:26:09.000000000 +0800
@@ -167,6 +167,19 @@ else
   HAVE_LIBXML=1
   XML_LIBS=`$XML_CONFIG --libs`
   XML_FLAGS=`$XML_CONFIG --cflags`
+  XML_VER=`$XML_CONFIG --version`
+  XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
+  if test $XML_MAJOR -le 2
+  then
+    XML_MINOR=`echo $XML_VER|cut -d\. -f2`
+    if test $XML_MINOR -le 6
+    then
+      XML_REV=`echo $XML_VER|cut -d\. -f3`
+      if test $XML_REV -le 99; then
+        AC_DEFINE(LIBXML2_WORKAROUND,1, [Use libxml2 tsd usage workaround])
+      fi
+    fi
+  fi
 fi])
 
 dnl --------------------------------------------------------------------------
diff -up autofs-5.0.2/modules/lookup_ldap.c.libxml2-workaround autofs-5.0.2/modules/lookup_ldap.c
--- autofs-5.0.2/modules/lookup_ldap.c.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-24 14:26:09.000000000 +0800
@@ -1929,9 +1929,6 @@ int lookup_done(void *context)
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	int rv = close_parse(ctxt->parse);
 #ifdef WITH_SASL
-	EVP_cleanup();
-	ERR_free_strings();
-
 	autofs_sasl_done(ctxt);
 #endif
 	free_context(ctxt);
diff -up autofs-5.0.2/daemon/automount.c.libxml2-workaround autofs-5.0.2/daemon/automount.c
--- autofs-5.0.2/daemon/automount.c.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/daemon/automount.c	2007-09-24 14:28:56.000000000 +0800
@@ -40,6 +40,9 @@
 #include <sys/utsname.h>
 
 #include "automount.h"
+#ifdef LIBXML2_WORKAROUND
+#include <dlfcn.h>
+#endif
 
 const char *program;		/* Initialized with argv[0] */
 const char *version = VERSION_STRING;	/* Program version */
@@ -1266,22 +1269,6 @@ void *handle_mounts(void *arg)
 	}
 
 	pthread_cleanup_pop(1);
-
-	/*
-	 * A cowboy .. me!
-	 * That noise yu ear aint spuurs sonny!!
-	 *
-	 * The libkrb5support destructor called indirectly through
-	 * libgssapi_krb5 which is used bt libkrb5 (somehow) must run
-	 * to completion before the last thread using it exits so
-	 * that it's per thread data keys are deleted or we get a
-	 * little segfault at exit. So much for dlclose being
-	 * syncronous.
-	 *
-	 * So, the solution is a recipe for disaster.
-	 * Hope we don't get a really busy system!
-	 */
-	/*sleep(1);*/
 	sched_yield();
 
 	return NULL;
@@ -1681,6 +1668,11 @@ int main(int argc, char *argv[])
 		close(start_pipefd[1]);
 		exit(1);
 	}
+
+#ifdef LIBXML2_WORKAROUND
+	void *dh = dlopen("libxml2.so", RTLD_NOW);
+#endif
+
 	if (!master_read_master(master_list, age, 0)) {
 		master_kill(master_list);
 		*pst_stat = 3;
@@ -1702,5 +1694,9 @@ int main(int argc, char *argv[])
 	}
 	closelog();
 
+#ifdef LIBXML2_WORKAROUND
+	if (dh)
+		dlclose(dh);
+#endif
 	exit(0);
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- autofs.spec	5 Sep 2007 05:11:13 -0000	1.222
+++ autofs.spec	24 Sep 2007 06:58:44 -0000	1.223
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 15
+Release: 16
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -28,6 +28,9 @@
 Patch15: autofs-5.0.2-fix-mount-nfs-nosymlink.patch
 Patch16: autofs-5.0.2-default-nsswitch.patch
 Patch17: autofs-5.0.2-add-ldap-schema-discovery.patch
+Patch18: autofs-5.0.2-ldap-schema-discovery-config-update.patch
+Patch19: autofs-5.0.2-libxml2-workaround.patch
+Patch20: autofs-5.0.2-foreground-logging.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
 Conflicts: kernel < 2.6.17
@@ -87,6 +90,9 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -139,6 +145,11 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Sep 24 2007 Ian Kent <ikent at redhat.com> - 5.0.2-16
+- add descriptive comments to config about LDAP schema discovery.
+- work around segfault at exit caused by libxml2.
+- fix foreground logging (also fixes shutdown needing extra signal bug).
+
 * Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
 - fix LDAP schema discovery.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 07:31:14 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 24 Sep 2007 03:31:14 -0400
Subject: rpms/gmp/devel gmp.spec,1.45,1.46
Message-ID: <200709240731.l8O7VEXf004854@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4810

Modified Files:
	gmp.spec 
Log Message:
- fix libgmpxx.so link



Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gmp.spec	20 Sep 2007 08:48:03 -0000	1.45
+++ gmp.spec	24 Sep 2007 07:30:40 -0000	1.46
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -91,7 +91,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib{gmp,mp,gmpxx}.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-ln -sf libgmpxx.so.3 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
+ln -sf libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
 cd ..
 %ifarch %{ix86}
 cd build-sse2
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Mon Sep 24 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-3
+- fix libgmpxx.so link
+
 * Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-2
 - fix check tag
 



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:47 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:07:47 -0700
Subject: [pkgdb] lohit-fonts was added for rbhalera
Message-ID: <200709240907.l8O97lus003787@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package lohit-fonts with summary Lohit TrueType fonts for Indic languages
Jens Petersen (petersen) has approved Package lohit-fonts
Jens Petersen (petersen) has added a Fedora devel branch for lohit-fonts with an owner of rbhalera
Jens Petersen (petersen) has approved lohit-fonts in Fedora devel
Jens Petersen (petersen) has approved Package lohit-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on lohit-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on lohit-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:51 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97pn8003810@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:54 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:54 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97sGc003832@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:06:12 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:06:12 -0700
Subject: [pkgdb] ocaml Orphaned
Message-ID: <200709240907.l8O97vp2030062@app4.fedora.phx.redhat.com>

Package ocaml in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From fedora-extras-commits at redhat.com  Mon Sep 24 09:06:17 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:06:17 -0700
Subject: [pkgdb] ocaml Orphaned
Message-ID: <200709240907.l8O97w2D030077@app4.fedora.phx.redhat.com>

Package ocaml in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:59 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:59 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97xXt003865@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:47 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:07:47 -0700
Subject: [pkgdb] lohit-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240907.l8O97x0U030085@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on lohit-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on lohit-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:52 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:52 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240908.l8O9807L030105@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:57 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:57 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240908.l8O980vd030116@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:05 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:05 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O986Q7030156@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:07 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:07 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O987pC003928@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:09 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:09 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O989Ha030177@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:11 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:11 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O98BuJ003946@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:12 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:12 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O98C43030201@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98JU2004012@app3.fedora.phx.redhat.com>

Package freetennis in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98JZ5030247@app4.fedora.phx.redhat.com>

Package freetennis in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98K1m030256@app4.fedora.phx.redhat.com>

Package freetennis in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:20 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:20 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98KJP004026@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:22 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:22 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98MAT004040@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:27 -0400
Subject: rpms/lohit-fonts - New directory
Message-ID: <200709240908.l8O98Rh5019889@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts

Log Message:
Directory /cvs/extras/rpms/lohit-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:31 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:31 -0400
Subject: rpms/lohit-fonts/devel - New directory
Message-ID: <200709240908.l8O98VXL019903@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts/devel

Log Message:
Directory /cvs/extras/rpms/lohit-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:34 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:34 -0400
Subject: rpms/lohit-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240908.l8O98Yxo019928@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module lohit-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:36 -0400
Subject: rpms/lohit-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709240908.l8O98aMF019944@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-fonts
# $Id: Makefile,v 1.1 2007/09/24 09:08:35 petersen Exp $
NAME := lohit-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 fedora-extras-commits at redhat.com  Mon Sep 24 09:18:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:18:04 -0700
Subject: [pkgdb] baekmuk-bdf-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240918.l8O9I50S007158@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on baekmuk-bdf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on baekmuk-bdf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on baekmuk-bdf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-bdf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:22 -0400
Subject: rpms/baekmuk-bdf-fonts - New directory
Message-ID: <200709240918.l8O9IMiD020231@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts

Log Message:
Directory /cvs/extras/rpms/baekmuk-bdf-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:29 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:29 -0400
Subject: rpms/baekmuk-bdf-fonts/devel - New directory
Message-ID: <200709240918.l8O9ITLH020251@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts/devel

Log Message:
Directory /cvs/extras/rpms/baekmuk-bdf-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:31 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:31 -0400
Subject: rpms/baekmuk-bdf-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240918.l8O9IV1p020276@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module baekmuk-bdf-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module baekmuk-bdf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:33 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:33 -0400
Subject: rpms/baekmuk-bdf-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709240918.l8O9IXBv020292@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module baekmuk-bdf-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: baekmuk-bdf-fonts
# $Id: Makefile,v 1.1 2007/09/24 09:18:32 petersen Exp $
NAME := baekmuk-bdf-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 fedora-extras-commits at redhat.com  Mon Sep 24 09:18:58 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:58 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested watchbugzilla
Message-ID: <200709240918.l8O9Ixib007461@app3.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the watchbugzilla acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:18:04 -0700
Subject: [pkgdb] baekmuk-bdf-fonts was added for cchance
Message-ID: <200709240922.l8O9MbgC002369@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package baekmuk-bdf-fonts with summary Korean bitmap fonts
Jens Petersen (petersen) has approved Package baekmuk-bdf-fonts
Jens Petersen (petersen) has added a Fedora devel branch for baekmuk-bdf-fonts with an owner of cchance
Jens Petersen (petersen) has approved baekmuk-bdf-fonts in Fedora devel
Jens Petersen (petersen) has approved Package baekmuk-bdf-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-bdf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:25 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:25 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested commit
Message-ID: <200709240922.l8O9MbYS002384@app4.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the commit acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:57 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:57 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested watchcommits
Message-ID: <200709240922.l8O9Mcrg002396@app4.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the watchcommits acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:22:36 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:22:36 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240922.l8O9Mcab002408@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:05 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:05 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240923.l8O9N6ax008902@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:07 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:07 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240923.l8O9N7Kg002539@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:28 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:28 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NTk0008999@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:44 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:44 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NiX4009058@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:46 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:46 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NkiN002691@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:20 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:20 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OLNp009219@app3.fedora.phx.redhat.com>

Package freetennis in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:24 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:24 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OOq5002878@app4.fedora.phx.redhat.com>

Package freetennis in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:25 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:25 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OP6e009233@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:26:16 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:26:16 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested approveacls
Message-ID: <200709240926.l8O9QGUB009699@app3.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the approveacls acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:30:41 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 24 Sep 2007 05:30:41 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.20, 1.21 sources,
	1.22, 1.23 system-config-network.spec, 1.29, 1.30
Message-ID: <200709240930.l8O9UfbP020662@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20628

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
- version 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Aug 2007 15:16:55 -0000	1.20
+++ .cvsignore	24 Sep 2007 09:30:09 -0000	1.21
@@ -1 +1 @@
-system-config-network-1.4.0.tar.gz
+system-config-network-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	16 Aug 2007 15:16:55 -0000	1.22
+++ sources	24 Sep 2007 09:30:09 -0000	1.23
@@ -1 +1 @@
-45ffcc68fa76f47e3e330225a36eab1c  system-config-network-1.4.0.tar.gz
+6914d78d70dbe5ec8ea7372047decaaf  system-config-network-1.4.1.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-network.spec	17 Aug 2007 15:02:12 -0000	1.29
+++ system-config-network.spec	24 Sep 2007 09:30:09 -0000	1.30
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,6 @@
 Requires: libglade2, pygtk2-libglade, pygtk2, gnome-python2, gnome-python2-canvas
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 This is the GUI of the network configuration tool,
 supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
@@ -69,6 +68,8 @@
 %{_bindir}/system-control-network
 %{_sbindir}/neat
 %{_bindir}/neat
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*
 
 %files -f %{name}.lang tui
 %defattr(-,root,root)
@@ -85,8 +86,6 @@
 %{_datadir}/system-config-network/netconfpkg/*.idl
 %{_datadir}/system-config-network/module-info
 %{_datadir}/system-config-network/providerdb
-%{_datadir}/pixmaps/*
-%{_datadir}/applications/*
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_sbindir}/neat-tui
@@ -97,8 +96,8 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.4.0-2
-- fixed desktop categories and build root
+* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
+- version 1.4.1
 
 * Thu Aug 16 2007 Harald Hoyer <harald at redhat.com> - 1.4.0
 - version 1.4.0



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:51 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9Xp47011703@app3.fedora.phx.redhat.com>

Package calcurse in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:52 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:52 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9XqlZ011714@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:57 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:57 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9Xvdd011733@app3.fedora.phx.redhat.com>

Package calcurse in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:29 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:29 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YTTm011897@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:36 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:36 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YaZ0011938@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:44 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:44 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YiZS011974@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:56 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:56 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240934.l8O9Yj3K005543@app4.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:58 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:58 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240934.l8O9YkSt005550@app4.fedora.phx.redhat.com>

Package calcurse in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:33 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:33 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YkDp005557@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:40 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:40 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9Yk0N005567@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 3 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:45 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:45 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YlZS005579@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:01 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:01 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z2Ht005647@app4.fedora.phx.redhat.com>

Package redet in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:04 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:04 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z45v012073@app3.fedora.phx.redhat.com>

Package redet in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:05 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:05 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z5Gu005665@app4.fedora.phx.redhat.com>

Package redet in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:06 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:06 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z6pX012086@app3.fedora.phx.redhat.com>

Package redet in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:08 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:08 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z8J0005685@app4.fedora.phx.redhat.com>

Package redet in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:16 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:16 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZGF1005725@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:17 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:17 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZHDU012139@app3.fedora.phx.redhat.com>

Package redet-doc in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:18 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:18 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZIQd005739@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:20 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:20 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZKfm012158@app3.fedora.phx.redhat.com>

Package redet-doc in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:21 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:21 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZLZC005760@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:30 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:30 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZVsC005802@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:34 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:34 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZYst005826@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:36 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:36 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9Za23012235@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:33 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:33 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZXqC012215@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:49 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:49 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZnoM012298@app3.fedora.phx.redhat.com>

Package windowlab in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:50 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:50 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zor1005895@app4.fedora.phx.redhat.com>

Package windowlab in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:51 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zpdk012308@app3.fedora.phx.redhat.com>

Package windowlab in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:53 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:53 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZrrU005910@app4.fedora.phx.redhat.com>

Package windowlab in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:54 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:54 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZsME012327@app3.fedora.phx.redhat.com>

Package windowlab in Fedora 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:55 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:55 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zut6005932@app4.fedora.phx.redhat.com>

Package windowlab in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:19 -0700
Subject: [pkgdb] SDL_image Orphaned
Message-ID: <200709240937.l8O9bJmS012701@app3.fedora.phx.redhat.com>

Package SDL_image in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:27 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:27 -0700
Subject: [pkgdb] SDL_image: nigelj has given up watchbugzilla
Message-ID: <200709240937.l8O9bRmc012733@app3.fedora.phx.redhat.com>

Nigel Jones (nigelj) has given up the watchbugzilla acl on SDL_image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 10:01:25 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 06:01:25 -0400
Subject: rpms/lohit-fonts/devel lohit-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709241001.l8OA1PRH032106@cvs-int.fedora.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26045/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lohit-fonts.spec 
Log Message:
Initial import



--- NEW FILE lohit-fonts.spec ---
%define xfontdir        %{_datadir}/fonts
%define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"

Name:        lohit-fonts
Version:     2.1.5
Release:     3%{?dist}
Summary:     Free Indian truetype/opentype fonts

Group:       User Interface/X
License:     GPLv2
URL:         http://fedoraproject.org/wiki/Lohit
# Full URL of source http://fedoraproject.org/wiki/Lohit?action=AttachFile&do=get&target=fonts-indic-%{version}.tar.gz
Source:      fonts-indic-%{version}.tar.gz
BuildArch:   noarch
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
This package provides Hindi, Bengali, Gujarati, Punjabi, Tamil,
Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.

# mk_pkg <name> <lang-code> 
%define mk_pkg() \
%package -n lohit-fonts-%1\
Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") font\
Group:      User Interface/X \
# strictly we only need to provide bn, gu, hi, pa, ta \
Provides:   ttfonts-%2 = 1.8-2\
Obsoletes : ttfonts-%2 <= 1.8-1\
\
\
%description -n lohit-fonts-%1\
This package provides a free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype font.\
\
%files -n lohit-fonts-%1\
%defattr(-, root, root, -)\
%doc COPYING README AUTHORS\
%dir %{xfontdir}/lohit-%1\
%{xfontdir}/lohit-%1/*.ttf\
\
%post -n lohit-fonts-%1 \
if [ -x %{_bindir}/fc-cache ]; then \
  %{_bindir}/fc-cache %{xfontdir} \
fi \
\
%postun -n lohit-fonts-%1 \
if [ "$1" = "0" ]; then \
  if [ -x %{_bindir}/fc-cache ]; then \
    %{_bindir}/fc-cache %{xfontdir} \
  fi \
fi 

%mk_pkg bengali bn 
%mk_pkg gujarati gu
%mk_pkg hindi hi
%mk_pkg kannada kn 
%mk_pkg malayalam ml 
%mk_pkg oriya or 
%mk_pkg punjabi pa
%mk_pkg tamil ta 
%mk_pkg telugu te

%prep
%setup -q -n fonts-indic-%{version}

%build
echo "Nothing to do in Build."

%install
rm -rf $RPM_BUILD_ROOT

for i in "%{langlist}"
do
  install -d $RPM_BUILD_ROOT/%{xfontdir}/lohit-$i
  install -m 0644 $i/* $RPM_BUILD_ROOT/%{xfontdir}/lohit-$i
done

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
- SPEC cleanups as suggested in review. 

* Mon Sep 17 2007 Rahul Bhalerao <rbhalera at redhat.com>
- Spec file update as part of review

* Tue Sep 11 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-1.fc8
- This package is derived from the fonts-indic package to reflect the upstream
  project name [RH #253158]


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 09:08:35 -0000	1.1
+++ .cvsignore	24 Sep 2007 10:00:53 -0000	1.2
@@ -0,0 +1 @@
+fonts-indic-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 09:08:35 -0000	1.1
+++ sources	24 Sep 2007 10:00:53 -0000	1.2
@@ -0,0 +1 @@
+bb9497ee772062b97ff00a1a68b17c98  fonts-indic-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 10:08:24 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 06:08:24 -0400
Subject: rpms/yasm/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 yasm.spec,
	1.13, 1.14
Message-ID: <200709241008.l8OA8OKh032442@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/yasm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32404

Modified Files:
	.cvsignore sources yasm.spec 
Log Message:
Update to 0.6.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jun 2007 11:18:16 -0000	1.5
+++ .cvsignore	24 Sep 2007 10:07:51 -0000	1.6
@@ -1 +1 @@
-yasm-0.6.1.tar.gz
+yasm-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jun 2007 11:18:16 -0000	1.5
+++ sources	24 Sep 2007 10:07:51 -0000	1.6
@@ -1 +1 @@
-2add4f9253681d1dc6084c6676b98468  yasm-0.6.1.tar.gz
+a9d5508702991de2bdd0903b8ba680ba  yasm-0.6.2.tar.gz


Index: yasm.spec
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yasm.spec	23 Aug 2007 08:45:39 -0000	1.13
+++ yasm.spec	24 Sep 2007 10:07:51 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Complete rewrite of the NASM assembler
 Name: yasm
-Version: 0.6.1
-Release: 3%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
 # See COPYING for the detail, there is quite a lot!
 License: BSD and (Artistic or GPLv2+ or LGPLv2+) and LGPLv2
 Group: Development/Languages
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Matthias Saou <http://freshrpms.net/> 0.6.2-1
+- Update to 0.6.2.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 0.6.1-3
 - Rebuild for new BuildID feature.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:18 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:18 -0700
Subject: [pkgdb] SDL_image Orphaned
Message-ID: <200709241020.l8OAK4sb019181@app4.fedora.phx.redhat.com>

Package SDL_image in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:25 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:25 -0700
Subject: [pkgdb] SDL_image: nigelj has given up watchcommits
Message-ID: <200709241020.l8OAK5dr019190@app4.fedora.phx.redhat.com>

Nigel Jones (nigelj) has given up the watchcommits acl on SDL_image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 10:19:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:19:59 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK6LY019212@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 7 is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:20:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:20:04 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK6YF019222@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:19:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:19:54 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK5Yt019202@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora devel is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 11:06:20 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Mon, 24 Sep 2007 07:06:20 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-treeview.patch,
	1.1, 1.2 gtk-nodoka-engine.spec, 1.7, 1.8
Message-ID: <200709241106.l8OB6KOT007608@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7577

Modified Files:
	gtk-nodoka-engine-0.6-treeview.patch gtk-nodoka-engine.spec 
Log Message:


Update the treeview patch (rhbz #297271 and #302551)



gtk-nodoka-engine-0.6-treeview.patch:

Index: gtk-nodoka-engine-0.6-treeview.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine-0.6-treeview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-nodoka-engine-0.6-treeview.patch	20 Sep 2007 20:50:17 -0000	1.1
+++ gtk-nodoka-engine-0.6-treeview.patch	24 Sep 2007 11:05:46 -0000	1.2
@@ -1,12 +1,21 @@
 diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
---- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-20 22:33:33.000000000 +0200
-+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:34:50.000000000 +0200
+--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-24 12:43:18.000000000 +0200
++++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-24 12:44:03.000000000 +0200
+@@ -33,7 +33,7 @@ style "fedora-default"
+ 	ythickness			= 1
+ 
+   	GtkTreeView::odd_row_color 	= shade (0.929458256, @base_color)
+-  	GtkTreeView::even_row_color 	= @base_color
++#  	GtkTreeView::even_row_color 	= @base_color
+ 
+ 	fg[NORMAL]			= @fg_color
+ 	fg[PRELIGHT]			= @fg_color
 @@ -49,13 +49,13 @@ style "fedora-default"
  
  	base[NORMAL]			= @base_color
  	base[PRELIGHT]			= shade (0.3967, @base_color)
 -	base[ACTIVE]			= shade (0.9437, @bg_color)
-+	base[ACTIVE]			= shade (0.65, @selected_fg_color)
++	base[ACTIVE]			= shade (0.52, @selected_fg_color)
  	base[SELECTED]			= @selected_bg_color
  	base[INSENSITIVE]		= shade (0.9437, @bg_color)
  


Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk-nodoka-engine.spec	23 Sep 2007 14:47:07 -0000	1.7
+++ gtk-nodoka-engine.spec	24 Sep 2007 11:05:46 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
@@ -55,9 +55,13 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Mon Sep 24 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-4
+- update the treeview patch
+ - rhbz #297271 and rhbz #302551
+
 * Sun Sep 23 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-3
 - Require at least the version of gtk it was build against
--- rhbz 301851 (patch from Ignacio Vazquez-Abrams)
+ - rhbz #301851 (patch from Ignacio Vazquez-Abrams)
 
 * Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
 - Add user specified tooltips coloring



From fedora-extras-commits at redhat.com  Mon Sep 24 11:55:33 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:55:33 -0400
Subject: rpms/drupal/devel drupal-README.fedora,1.1,1.2 drupal.spec,1.3,1.4
Message-ID: <200709241155.l8OBtXBB008992@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8927

Modified Files:
	drupal-README.fedora drupal.spec 
Log Message:
Minor doc correction, BZ 301541



Index: drupal-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drupal-README.fedora	23 Jul 2007 23:55:51 -0000	1.1
+++ drupal-README.fedora	24 Sep 2007 11:55:00 -0000	1.2
@@ -2,14 +2,20 @@
 
 1. DB setup
 
-Follow the installation instructions in INSTALL.*.txt to complete the setup
-of and connection of Drupal to the required database, including chmod 644 on
-/etc/drupal/default/settings.php, uncommenting the appropriate line in 
+To begin with, install php-mysql or php-pgsql, depending on which db backend
+you intend to use.
+
+Then, follow the installation instructions in INSTALL.*.txt to complete the 
+setup of and connection of Drupal to the required database, including chmod 
+666 on /etc/drupal/default/settings.php, uncommenting the appropriate line in 
 /etc/httpd/conf.d/drupal.conf, and restarting httpd.
 
 Once these steps have been completed, you should be ready to connect to http://yourhost/drupal
 to complete the initial setup.
 
+Remember to change the /etc/drupal/default/settings.php permissions back to 
+644 when you've finished the initial setup.
+
 2. Enable remote access
 
 Drupal ships in Fedora with all non-localhost access disabled.  Comment and


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drupal.spec	16 Aug 2007 12:07:43 -0000	1.3
+++ drupal.spec	24 Sep 2007 11:55:00 -0000	1.4
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
 Version:  5.2
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -69,6 +69,9 @@
 %dir %attr(755,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-3
+- Minor doc correction, BZ 301541.
+
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-2
 - License tag correction.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:03:38 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 24 Sep 2007 08:03:38 -0400
Subject: rpms/timidity++/devel timidity++.spec,1.13,1.14
Message-ID: <200709241203.l8OC3c90015654@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15622

Modified Files:
	timidity++.spec 
Log Message:
spec/license fixes


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- timidity++.spec	12 Jul 2006 08:28:56 -0000	1.13
+++ timidity++.spec	24 Sep 2007 12:03:06 -0000	1.14
@@ -1,9 +1,9 @@
-Summary: A software wavetable MIDI synthesizer.
+Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 1.2.2
+Release: 2%{?dist}
 Group: Applications/Multimedia
-Source: http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
 Source2: timidity.cfg
 Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2
@@ -14,8 +14,8 @@
 Patch5: TiMidity++-2.13.0-64bit.patch
 Patch6: TiMidity++-2.13.0-warnings.patch
 Patch7: TiMidity++-2.13.0-esd.patch
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-root
+License: GPLv2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: timidity++-X11
 BuildRequires: arts-devel esound-devel autoconf alsa-lib-devel ncurses-devel
 
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Sep 24 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-2
+- spec/license fixes
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.2
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:04:54 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 24 Sep 2007 08:04:54 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.43,1.44
Message-ID: <200709241204.l8OC4sF1015730@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15628

Modified Files:
	gnuplot.spec 
Log Message:

- spec file cleanup 



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnuplot.spec	7 Sep 2007 08:46:37 -0000	1.43
+++ gnuplot.spec	24 Sep 2007 12:04:20 -0000	1.44
@@ -2,21 +2,24 @@
 %define minor 2
 %define patchlevel 0
 
+%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
+
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
 Patch1: gnuplot-4.2.0-refers_to.patch
-Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
-BuildRequires: latex2html, gnuplot
+BuildRequires: latex2html
 Requires: libpng
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnuplot.info/
 
@@ -41,7 +44,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .refto
-%patch2 -p1 -b .ver
+sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
 
 %build
 %configure --with-readline=gnu --with-png --without-linux-vga \
@@ -52,26 +55,30 @@
 cd docs
 make html
 cd psdoc
-make 
+export GNUPLOT_PS_DIR=../../term/PostScript
 make ps_symbols.ps ps_fontfile_doc.pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/
-install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
+install -p -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
 install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/gnuplot
 mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
 mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
 
+mkdir -p $RPM_BUILD_ROOT%{x11_app_defaults_dir}
+mv $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/Gnuplot.app-defaults $RPM_BUILD_ROOT%{x11_app_defaults_dir}/Gnuplot
+rm -rf $RPM_BUILD_ROOT%{_libdir}/
+
 %post 
-/sbin/install-info --quiet %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
 
 %preun
 if [ "$1" = "0" ] ; then # last uninstall
-   /sbin/install-info --delete %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
 fi
 
 %clean
@@ -81,7 +88,7 @@
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
 %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
-%doc docs/psdoc/ps_fontfile_doc.pdf
+%doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs
 %dir %{_libexecdir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -92,8 +99,12 @@
 %dir %{_datadir}/gnuplot/%{major}.%{minor}/PostScript
 %{_datadir}/gnuplot/%{major}.%{minor}/PostScript/*.ps
 %{_datadir}/gnuplot/%{major}.%{minor}/gnuplot.gih
+%dir %{_datadir}/texmf
+%dir %{_datadir}/texmf/tex
+%dir %{_datadir}/texmf/tex/latex
+%dir %{_datadir}/texmf/tex/latex/gnuplot
 %{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
-%{_libdir}/X11/app-defaults/Gnuplot.app-defaults
+%{x11_app_defaults_dir}/Gnuplot
 %{_infodir}/gnuplot.info.gz
 
 %files emacs
@@ -105,6 +116,9 @@
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
 %changelog
+* Mon Sep 24 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-6
+- spec file cleanup
+
 * Fri Sep  7 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-5
 - move emacs files to */site-lisp/gnuplot subdirectory
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:06:03 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 08:06:03 -0400
Subject: rpms/bind/devel bind.spec, 1.216, 1.217 bind-9.3.3-edns.patch, 1.2,
	NONE
Message-ID: <200709241206.l8OC63si015766@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15740

Modified Files:
	bind.spec 
Removed Files:
	bind-9.3.3-edns.patch 
Log Message:
- removed bind-9.3.3-edns.patch patch (see #275091 for reasons)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- bind.spec	20 Sep 2007 11:07:30 -0000	1.216
+++ bind.spec	24 Sep 2007 12:05:29 -0000	1.217
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	12.4.%{RELEASEVER}%{?dist}
+Release: 	13.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,7 +58,6 @@
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
-Patch52:	bind-9.3.3-edns.patch
 Patch63:	bind-9.4.0-dnssec-directory.patch
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
@@ -233,7 +232,6 @@
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %endif
 %patch32 -p1 -b .prctl_set_dumpable
-%patch52 -p1 -b .edns
 %if %{SDB}
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
@@ -645,6 +643,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-13.a6
+- removed bind-9.3.3-edns.patch patch (see #275091 for reasons)
+
 * Thu Sep 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.4.a6
 - build with O2
 - removed "autotools" patch


--- bind-9.3.3-edns.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 12:15:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 08:15:53 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241215.l8OCFrEm016562@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel

Modified Files:
	.cvsignore sources 
Added Files:
	baekmuk-bdf-fonts.spec 
Log Message:
initial import (#302451)



--- NEW FILE baekmuk-bdf-fonts.spec ---
%define upstreamname   baekmuk-bdf

%define fontdir      %{_datadir}/fonts/%{upstreamname}
%define catalogue    %{_sysconfdir}/X11/fontpath.d

Name:           %{upstreamname}-fonts
Version:        2.2
Release:        3%{?dist}
Summary:        Korean bitmap fonts

Group:          User Interface/X
License:        Baekmuk
URL:            http://kldp.net/frs/?group_id=57&release_id=865
Source:  http://kldp.net/frs/download.php/1428/%{upstreamname}-%{version}.tar.gz
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  xorg-x11-font-utils
Conflicts:      fonts-korean < 2.2-5

%description
This package provides the Korean Baekmuk bitmap fonts.


%prep
%setup -q -n %{upstreamname}-%{version}

%build
for file in bdf/*.bdf; do
    bdftopcf $file | gzip -9 > ${file%.bdf}.pcf.gz
done

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}

# for bmp font
install -m 0644 bdf/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/
install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/ttfonts-ko.alias

# for catalogue
install -d $RPM_BUILD_ROOT%{catalogue}
ln -sf ../../..%{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}

mkfontdir $RPM_BUILD_ROOT%{fontdir} 

# convert Korean copyright file to utf8
iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi

%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi

%files
%defattr(-,root,root,-)
%doc COPYRIGHT COPYRIGHT.ko README
%dir %{fontdir}
%{fontdir}/*.gz
%{fontdir}/ttfonts-ko.alias
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/%{name}

%changelog
* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
- conflict with fonts-korean < 2.2-5

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-2
- convert Korean copyright file to utf8 (Mamoru Tasaka, #302451)

* Tue Sep 11 2007 Jens Petersen <petersen at redhat.com> - 2.2-1
- initial packaging separated from fonts-korean (#253155)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-bdf-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 09:18:32 -0000	1.1
+++ .cvsignore	24 Sep 2007 12:15:20 -0000	1.2
@@ -0,0 +1 @@
+baekmuk-bdf-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-bdf-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 09:18:32 -0000	1.1
+++ sources	24 Sep 2007 12:15:20 -0000	1.2
@@ -0,0 +1 @@
+48c0405ffbdf45e1311a978b65b47f4c  baekmuk-bdf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 12:41:05 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 08:41:05 -0400
Subject: rpms/bind/devel bind-9.5-edns.patch,NONE,1.1 bind.spec,1.217,1.218
Message-ID: <200709241241.l8OCf5mF017371@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17273

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-edns.patch 
Log Message:
- added edns patch again (#275091)


bind-9.5-edns.patch:

--- NEW FILE bind-9.5-edns.patch ---
diff -up bind-9.5.0a6/lib/dns/view.c.edns bind-9.5.0a6/lib/dns/view.c
--- bind-9.5.0a6/lib/dns/view.c.edns	2007-06-19 01:47:42.000000000 +0200
+++ bind-9.5.0a6/lib/dns/view.c	2007-09-19 17:46:10.000000000 +0200
@@ -179,6 +179,7 @@ dns_view_create(isc_mem_t *mctx, dns_rda
 	view->flush = ISC_FALSE;
 	view->dlv = NULL;
 	view->maxudp = 0;
+	view->edns = ISC_TRUE;
 	dns_fixedname_init(&view->dlv_fixed);
 
 	result = dns_order_create(view->mctx, &view->order);
diff -up bind-9.5.0a6/lib/dns/resolver.c.edns bind-9.5.0a6/lib/dns/resolver.c
--- bind-9.5.0a6/lib/dns/resolver.c.edns	2007-09-19 17:46:10.000000000 +0200
+++ bind-9.5.0a6/lib/dns/resolver.c	2007-09-19 17:47:19.000000000 +0200
@@ -1484,10 +1484,12 @@ resquery_send(resquery_t *query) {
 	 * The ADB does not know about servers with "edns no".  Check this,
 	 * and then inform the ADB for future use.
 	 */
-	if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0 &&
-	    peer != NULL &&
-	    dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
-	    !useedns)
+	if (((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0 ||
+             (query->options & DNS_FETCHOPT_NOEDNS0) == 0) &&
+	    (!(res->view->edns) ||
+	     (peer != NULL &&
+	      dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
+	      !useedns)))
 	{
 		query->options |= DNS_FETCHOPT_NOEDNS0;
 		dns_adb_changeflags(fctx->adb,
diff -up bind-9.5.0a6/lib/dns/include/dns/view.h.edns bind-9.5.0a6/lib/dns/include/dns/view.h
--- bind-9.5.0a6/lib/dns/include/dns/view.h.edns	2007-06-19 01:47:42.000000000 +0200
+++ bind-9.5.0a6/lib/dns/include/dns/view.h	2007-09-19 17:46:10.000000000 +0200
@@ -137,6 +137,7 @@ struct dns_view {
 	dns_name_t *			dlv;
 	dns_fixedname_t			dlv_fixed;
 	isc_uint16_t			maxudp;
+	isc_boolean_t			edns;
 
 	/*
 	 * Configurable data for server use only,
diff -up bind-9.5.0a6/lib/isccfg/namedconf.c.edns bind-9.5.0a6/lib/isccfg/namedconf.c
--- bind-9.5.0a6/lib/isccfg/namedconf.c.edns	2007-06-19 01:47:50.000000000 +0200
+++ bind-9.5.0a6/lib/isccfg/namedconf.c	2007-09-19 17:46:10.000000000 +0200
@@ -618,6 +618,7 @@ options_clauses[] = {
 	{ "deallocate-on-exit", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "directory", &cfg_type_qstring, CFG_CLAUSEFLAG_CALLBACK },
 	{ "dump-file", &cfg_type_qstring, 0 },
+	{ "edns", &cfg_type_boolean, 0 },
 	{ "fake-iquery", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "files", &cfg_type_size, 0 },
 	{ "has-old-clients", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
diff -up bind-9.5.0a6/doc/misc/options.edns bind-9.5.0a6/doc/misc/options
--- bind-9.5.0a6/doc/misc/options.edns	2007-03-29 17:19:20.000000000 +0200
+++ bind-9.5.0a6/doc/misc/options	2007-09-19 17:46:10.000000000 +0200
@@ -11,6 +11,7 @@ options {
         deallocate-on-exit <boolean>; // obsolete
         directory <quoted_string>;
         dump-file <quoted_string>;
+	edns <boolean>;
         fake-iquery <boolean>; // obsolete
         files <size>;
         has-old-clients <boolean>; // obsolete
diff -up bind-9.5.0a6/bin/named/config.c.edns bind-9.5.0a6/bin/named/config.c
--- bind-9.5.0a6/bin/named/config.c.edns	2007-06-19 01:47:18.000000000 +0200
+++ bind-9.5.0a6/bin/named/config.c	2007-09-19 17:46:10.000000000 +0200
@@ -137,6 +137,7 @@ options {\n\
 	acache-enable no;\n\
 	acache-cleaning-interval 60;\n\
 	max-acache-size 0;\n\
+	edns yes;\n\
 	dnssec-enable yes;\n\
 	dnssec-validation no; /* Make yes for 9.5. */ \n\
 	dnssec-accept-expired no;\n\
diff -up bind-9.5.0a6/bin/named/server.c.edns bind-9.5.0a6/bin/named/server.c
--- bind-9.5.0a6/bin/named/server.c.edns	2007-09-19 17:46:10.000000000 +0200
+++ bind-9.5.0a6/bin/named/server.c	2007-09-19 17:46:10.000000000 +0200
@@ -1624,7 +1624,12 @@ configure_view(dns_view_t *view, const c
 	dns_resolver_setclientsperquery(view->resolver,
 					cfg_obj_asuint32(obj),
 					max_clients_per_query);
-			
+
+	obj = NULL;
+	result = ns_config_get(maps, "edns", &obj);
+	INSIST(result == ISC_R_SUCCESS);
+	view->edns = cfg_obj_asboolean(obj);
+
 	obj = NULL;
 	result = ns_config_get(maps, "dnssec-enable", &obj);
 	INSIST(result == ISC_R_SUCCESS);
diff -up bind-9.5.0a6/bin/named/named.conf.5.edns bind-9.5.0a6/bin/named/named.conf.5
--- bind-9.5.0a6/bin/named/named.conf.5.edns	2007-06-20 04:27:32.000000000 +0200
+++ bind-9.5.0a6/bin/named/named.conf.5	2007-09-19 17:46:10.000000000 +0200
@@ -160,6 +160,7 @@ options {
 	datasize \fIsize\fR;
 	directory \fIquoted_string\fR;
 	dump\-file \fIquoted_string\fR;
+	edns \fIboolean\fR;
 	files \fIsize\fR;
 	heartbeat\-interval \fIinteger\fR;
 	host\-statistics \fIboolean\fR; // not implemented


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- bind.spec	24 Sep 2007 12:05:29 -0000	1.217
+++ bind.spec	24 Sep 2007 12:40:31 -0000	1.218
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	13.%{RELEASEVER}%{?dist}
+Release: 	14.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,7 @@
 Patch75:	bind-9.5-update.patch
 Patch78:	bind-9.5-pool_badfree.patch
 Patch79:	bind-9.5-_res_errno.patch
+Patch80:	bind-9.5-edns.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -244,6 +245,7 @@
 %patch75 -p1 -b .update
 %patch78 -p1 -b .badfree
 %patch79 -p1 -b .errno
+%patch80 -p1 -b .edns
 :;
 
 
@@ -643,6 +645,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-14.a6
+- added edns patch again (#275091)
+
 * Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-13.a6
 - removed bind-9.3.3-edns.patch patch (see #275091 for reasons)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:42:40 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 08:42:40 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.69,1.70
Message-ID: <200709241242.l8OCgeod017488@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17457

Modified Files:
	policy-20070703.patch 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
- Fix service start stop terminal avc's


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- policy-20070703.patch	22 Sep 2007 12:15:13 -0000	1.69
+++ policy-20070703.patch	24 Sep 2007 12:42:07 -0000	1.70
@@ -8046,6 +8046,30 @@
  
  corecmd_exec_bin(radiusd_t)
  corecmd_exec_shell(radiusd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.if serefpolicy-3.0.8/policy/modules/services/remotelogin.if
+--- nsaserefpolicy/policy/modules/services/remotelogin.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/remotelogin.if	2007-09-24 07:36:26.000000000 -0400
+@@ -18,3 +18,20 @@
+ 	auth_domtrans_login_program($1,remote_login_t)
+ ')
+ 
++########################################
++## <summary>
++##	allow Domain to signal remote login domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`remotelogin_signal',`
++	gen_require(`
++		type remote_login_t;
++	')
++
++	allow $1 remote_login_t:process signal;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.0.8/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2007-06-11 16:05:30.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/remotelogin.te	2007-09-17 16:20:18.000000000 -0400



From fedora-extras-commits at redhat.com  Mon Sep 24 12:51:20 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 08:51:20 -0400
Subject: rpms/fonts-korean/devel .cvsignore, 1.3, 1.4 fonts-korean.spec, 1.24,
	1.25 sources, 1.3, 1.4 FAPIcidfmap.ko, 1.1, NONE cidfmap.ko, 1.1, NONE
Message-ID: <200709241251.l8OCpK3Q017929@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/fonts-korean/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17878

Modified Files:
	.cvsignore fonts-korean.spec sources 
Removed Files:
	FAPIcidfmap.ko cidfmap.ko 
Log Message:
- this is now a meta-package after moving baekmuk-bdf and baekmuk-ttf
  to separate packages (#253155) 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2005 08:08:33 -0000	1.3
+++ .cvsignore	24 Sep 2007 12:50:48 -0000	1.4
@@ -1,6 +1,3 @@
 *.gz
 *.bz2
 *.rpm
-baekmuk-2.1.tar.gz
-baekmuk-doc-2.1.tar.gz
-baekmuk-ttf-2.1.tar.gz


Index: fonts-korean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/fonts-korean.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fonts-korean.spec	27 Aug 2007 01:18:10 -0000	1.24
+++ fonts-korean.spec	24 Sep 2007 12:50:48 -0000	1.25
@@ -1,126 +1,39 @@
-%define language       korean
-%define ttfontverhead  1.0.11.32.2
-
-%define baekmukbdfdir  baekmuk-bdf-%{version}/bdf
-%define baekmukttfdir  baekmuk-ttf-%{version}/ttf
-
-%define basefontdir    %{_datadir}/fonts/%{language}
-%define ttfontdir      %{basefontdir}/TrueType
-%define bmpfontdir     %{basefontdir}/misc
-%define cidmapdir      %{_datadir}/ghostscript/conf.d
-
-%define catalogue      /etc/X11/fontpath.d
-
 Name:           fonts-korean
 Version:        2.2
-Release:        4%{?dist}
-License:        Distributable
-Group:          User Interface/X
-URL:            http://kldp.net/frs/?group_id=57&release_id=865
+Release:        5%{?dist}
+Summary:        Meta-package for Korean fonts
 
+Group:          User Interface/X
+License:        GPLv2+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xorg-x11-font-utils gzip
+Requires:       baekmuk-ttf-fonts-batang, baekmuk-ttf-fonts-dotum
+Requires:       baekmuk-ttf-fonts-gulim, baekmuk-ttf-fonts-hline
+Requires:       baekmuk-bdf-fonts
 
-Source1:  http://kldp.net/frs/download.php/1428/baekmuk-bdf-%{version}.tar.gz
-Source2:  http://kldp.net/frs/download.php/1429/baekmuk-ttf-%{version}.tar.gz
-Source3:  FAPIcidfmap.ko
-Source4:  cidfmap.ko
-
-Summary:  Free Korean Bitmap/TrueType fonts
-
-Requires(post):    ttmkfdir >= 3.0.6, mkfontdir, fontconfig
-Requires(postun):  fontconfig
-Provides:          ttfonts-ko = %{ttfontverhead}
-Obsoletes:         ttfonts-ko <= %{ttfontverhead}
 %description
-This package provides the free Korean Bitmap/TrueType fonts.
-
+This is a meta-package for Korean fonts support.
 
 %prep
-%setup -q -T -c -a 1 -a 2
-
+%{nil}
 
 %build
-mkdir -p $RPM_BUILD_DIR/%{name}-%{version}/doc
-for file in %{baekmukbdfdir}/*.bdf; do
-    bdftopcf $file | gzip -9 > ${file%.bdf}.pcf.gz
-done
-
+%{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{ttfontdir}
-install -d $RPM_BUILD_ROOT%{bmpfontdir}
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-
-# for tt/bmp font
-install -m 0644 %{baekmukttfdir}/*.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 %{baekmukbdfdir}/*.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}/
-install -m 0444 %{baekmukbdfdir}/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ttfonts-ko.alias
-
-# for ghostscript
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
-
-# for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-korean
-
-# for fonts.{dir,scale,cache-1}
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.scale
-touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-{
-    umask 133
-    touch %{ttfontdir} 2> /dev/null && {
-        %{_bindir}/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
-        mkfontdir %{ttfontdir}
-    }
-    mkfontdir %{bmpfontdir} 
-    fc-cache -sf %{ttfontdir} 2> /dev/null
-}
-
-
-%postun
-{
-    fc-cache -sf %{ttfontdir} 2> /dev/null
-}
-
-
 %files
-%defattr(-, root, root)
-%doc baekmuk-ttf-%{version}/COPYRIGHT* baekmuk-ttf-%{version}/README
-%dir %{basefontdir}
-%dir %{ttfontdir}
-%dir %{bmpfontdir}
-%dir %{cidmapdir}
-%{ttfontdir}/*.ttf
-%{bmpfontdir}/*.gz
-%{bmpfontdir}/ttfonts-ko.alias
-%{cidmapdir}/FAPIcidfmap.ko
-%{cidmapdir}/cidfmap.ko
-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.scale
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
-%{catalogue}/fonts-korean
+%defattr(-,root,root,-)
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-5.fc8
+- this is now a meta-package after moving baekmuk-bdf and baekmuk-ttf
+  to separate packages (#253155)
+
 * Mon Aug 20 2007 Caius Chance <cchance at redhat.com> - 2.2-4.fc8
 - Resolves: rhbz#252272 (Drop chkfontpath dependency.)
   ^^^ Removed chkfontpath, added TrueType directory specification in fc-cache.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2007 01:07:13 -0000	1.3
+++ sources	24 Sep 2007 12:50:48 -0000	1.4
@@ -1,2 +0,0 @@
-48c0405ffbdf45e1311a978b65b47f4c  baekmuk-bdf-2.2.tar.gz
-a6f4349179cbe3557641782cefba4d70  baekmuk-ttf-2.2.tar.gz


--- FAPIcidfmap.ko DELETED ---


--- cidfmap.ko DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:34 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchcommits
Message-ID: <200709241305.l8OD5Zwa016094@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchcommits acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:37 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up approveacls
Message-ID: <200709241305.l8OD5bQn016112@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the approveacls acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:16 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:16 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6GOY016343@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the watchbugzilla acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:24 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6Oc4016395@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the watchcommits acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:54:40 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 24 Sep 2007 03:54:40 -0700
Subject: [pkgdb] timidity++ Owned
Message-ID: <200709241306.l8OD6SKP008933@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora devel is now owned by Jindrich Novy (jnovy)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:30 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchbugzilla
Message-ID: <200709241306.l8OD6Suo008943@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:35 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up commit
Message-ID: <200709241306.l8OD6TsR008953@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the commit acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:29 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6Ts7016439@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the approveacls acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:12 -0700
Subject: [pkgdb] cvsutils: corsepiu has requested watchbugzilla
Message-ID: <200709241306.l8OD6TJb008961@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has requested the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:19 -0700
Subject: [pkgdb] cvsutils: corsepiu has requested watchbugzilla
Message-ID: <200709241306.l8OD6UUa008973@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has requested the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:27 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6VM9008985@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the commit acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:53 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchbugzilla
Message-ID: <200709241306.l8OD6r5R016608@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:15:59 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 09:15:59 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.59,1.60
Message-ID: <200709241315.l8ODFxcT024853@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24833

Modified Files:
	alsa-lib.spec 
Log Message:
Remove tabs and EOL spaces (very minor).



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- alsa-lib.spec	20 Sep 2007 14:52:53 -0000	1.59
+++ alsa-lib.spec	24 Sep 2007 13:15:26 -0000	1.60
@@ -8,8 +8,8 @@
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
-Patch0:	 alsa-lib-1.0.14rc1-config.patch
-Patch2:	 alsa-lib-1.0.14-glibc-open.patch
+Patch0:  alsa-lib-1.0.14rc1-config.patch
+Patch2:  alsa-lib-1.0.14-glibc-open.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -61,7 +61,7 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig 
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -209,7 +209,7 @@
 
 * Fri Apr 22 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - updated to 1.0.9rc2
-- add ainit tool 
+- add ainit tool
 - dmix is now default pcm device
 
 * Mon Mar  7 2005 Martin Stransky <stransky at redhat.com> 1.0.8-4.devel



From fedora-extras-commits at redhat.com  Mon Sep 24 13:19:52 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 09:19:52 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.60,1.61
Message-ID: <200709241319.l8ODJqlE024912@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24889

Modified Files:
	alsa-lib.spec 
Log Message:
Remove trailing dot from the summary.



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- alsa-lib.spec	24 Sep 2007 13:15:26 -0000	1.60
+++ alsa-lib.spec	24 Sep 2007 13:19:19 -0000	1.61
@@ -1,7 +1,7 @@
 %define  prever         rc2
 %define  prever_dot     .rc2
 
-Summary: The Advanced Linux Sound Architecture (ALSA) library.
+Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.15
 Release: 0.2%{?prever_dot}%{?dist}



From fedora-extras-commits at redhat.com  Mon Sep 24 13:24:37 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Mon, 24 Sep 2007 09:24:37 -0400
Subject: rpms/jakarta-commons-daemon/devel
	jakarta-commons-daemon-execve-path-warning.patch, NONE,
	1.1 jakarta-commons-daemon.spec, 1.18, 1.19
Message-ID: <200709241324.l8ODOb39025015@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24988

Modified Files:
	jakarta-commons-daemon.spec 
Added Files:
	jakarta-commons-daemon-execve-path-warning.patch 
Log Message:
Add execve path warning patch from James Ralston



jakarta-commons-daemon-execve-path-warning.patch:

--- NEW FILE jakarta-commons-daemon-execve-path-warning.patch ---
diff -up daemon-1.0.1/src/native/unix/native/jsvc-unix.c.execve-path-warning daemon-1.0.1/src/native/unix/native/jsvc-unix.c
--- src/native/unix/native/jsvc-unix.c
+++ src/native/unix/native/jsvc-unix.c
@@ -635,6 +635,15 @@ int main(int argc, char *argv[]) {
         char *p1=NULL;
         char *p2=NULL;
 
+	/* We don't want to use a form of exec() that searches the
+	   PATH, so require that argv[0] be either an absolute or
+	   relative path.  Error out if this isn't the case.  */
+	tmp=strchr(old,'/');
+	if (tmp==NULL) {
+	  log_error("JSVC re-exec requires execution with an absolute or relative path");
+	  return(1);
+	}
+
         p1=strdup(libf);
         tmp=strrchr(p1,'/');
         if (tmp!=NULL) tmp[0]='\0';


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-daemon.spec	19 Sep 2007 22:33:40 -0000	1.18
+++ jakarta-commons-daemon.spec	24 Sep 2007 13:24:05 -0000	1.19
@@ -39,14 +39,15 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        6jpp.3%{?dist}
+Release:        6jpp.4%{?dist}
 Epoch:          1
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
 URL:            http://jakarta.apache.org/commons/daemon/
 Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
-Patch:          %{name}-crosslink.patch
+Patch0:          %{name}-crosslink.patch
+Patch1:          %{name}-execve-path-warning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{native}
@@ -102,6 +103,7 @@
 %prep
 %setup -q -n %{base_name}-%{version}
 %patch0 -p0
+%patch1 -p0
 chmod 644 src/samples/*
 %if %{native}
 pushd src/native/unix
@@ -185,6 +187,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0.1-6jpp.4
+- Add execve path warning patch from James Ralston
+
 * Mon Sep 17 2007 James Ralston <ralston at pobox.com> - 1:1.0.1-6jpp.3
 - update License tag to reflect new acceptable licenses
 - update main Group tag (old value "System/Boot" is invalid)



From fedora-extras-commits at redhat.com  Mon Sep 24 13:37:08 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 09:37:08 -0400
Subject: rpms/taglib/devel taglib-svn.sh, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 taglib.spec, 1.15, 1.16
Message-ID: <200709241337.l8ODb8lH025308@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25274

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-svn.sh 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
- update to svn version



--- NEW FILE taglib-svn.sh ---
#!/bin/sh

if [ -d taglib ]; then
    echo "Remove the \"taglib\" directory first !"
    exit 1
fi
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib
tar -czf taglib-`date +%Y%m%d`.tar.gz taglib
rm -rf taglib


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 18:54:16 -0000	1.5
+++ .cvsignore	24 Sep 2007 13:36:35 -0000	1.6
@@ -1 +1 @@
-taglib-1.4.tar.gz
+taglib-20070924.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 18:54:16 -0000	1.5
+++ sources	24 Sep 2007 13:36:35 -0000	1.6
@@ -1 +1 @@
-dcd50ddb2544faeae77f194804559404  taglib-1.4.tar.gz
+7969278421fe326520827b4e35fdffc5  taglib-20070924.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- taglib.spec	26 Aug 2007 10:06:15 -0000	1.15
+++ taglib.spec	24 Sep 2007 13:36:35 -0000	1.16
@@ -1,19 +1,22 @@
+%define svn 20070924
+
 Name:       taglib	
-Version:    1.4
-Release:    6%{?dist}
+Version:    1.5
+Release:    0.1.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz
+Source0:	taglib-%{svn}.tar.gz
+# The tarball is generated with the following script
+Source1:    taglib-svn.sh
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: doxygen, graphviz
 
 %description
 TagLib is a library for reading and editing the meta-data of several
@@ -31,18 +34,15 @@
 
 
 %prep
-%setup -q
+%setup -q -n taglib
 %patch0 -p1 -b .wchar
+make -f Makefile.cvs
 
 
 %build
 %configure --disable-rpath
-
 make %{?_smp_mflags}
-# Doc
-pushd taglib-api
-doxygen taglib.doxygen
-popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,16 +68,18 @@
 
 %files devel
 %defattr(-,root,root)
+%doc examples
 %{_bindir}/*-config
 %{_includedir}/*
 %{_libdir}/lib*.so
 #%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
-%doc taglib-api/html
-%doc examples
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
+- update to svn version
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4-6
 - fix license tag
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Mon Sep 24 13:39:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 24 Sep 2007 09:39:30 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.105,1.106
Message-ID: <200709241339.l8ODdUSu025409@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	vixie-cron.spec 
Log Message:
License tag, owning files.



Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- vixie-cron.spec	30 Aug 2007 15:47:25 -0000	1.105
+++ vixie-cron.spec	24 Sep 2007 13:38:58 -0000	1.106
@@ -10,9 +10,9 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 4
-License: GPL
+License: BSD
 Group: System Environment/Base
 Source0: https://hosted.fedoraproject.org/projects/vixie-cron/wiki/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +55,10 @@
 autoconf
 
 %build
-%configure --with-pam
+%configure \
+%if %{WITH_PAM}
+--with-pam
+%endif
 
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint" \
 %if %{WITH_SELINUX}
@@ -86,13 +89,14 @@
 %if ! %{WITH_PAM}
 	rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 %endif
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.deny
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add crond
-[ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
+#[ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
  
 %preun
 if [ $1 = 0 ]; then
@@ -124,9 +128,15 @@
 	%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
+%config(noreplace) %{_sysconfdir}/cron.deny
 %doc %{_datadir}/doc/cron/*
 
 %changelog
+* Mon Sep 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.2-3
+- cron own cron.deny
+- correct license tag
+- with-pam (configure) is now optional
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 4:4.2-2
 - autoconf/automake are buildrequires, not runtime requires
 



From fedora-extras-commits at redhat.com  Mon Sep 24 13:44:03 2007
From: fedora-extras-commits at redhat.com (Josef Whiter (josef))
Date: Mon, 24 Sep 2007 06:44:03 -0700
Subject: [pkgdb] geany had acl change status
Message-ID: <200709241344.l8ODi5Sr028554@app3.fedora.phx.redhat.com>

Josef Whiter (josef) has set the watchcommits acl on geany (Fedora devel) to Approved for Jonathan G. Underwood (jgu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Mon Sep 24 13:44:17 2007
From: fedora-extras-commits at redhat.com (Josef Whiter (josef))
Date: Mon, 24 Sep 2007 06:44:17 -0700
Subject: [pkgdb] geany had acl change status
Message-ID: <200709241344.l8ODiH6w028626@app3.fedora.phx.redhat.com>

Josef Whiter (josef) has set the watchcommits acl on geany (Fedora 7) to Approved for Jonathan G. Underwood (jgu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Mon Sep 24 13:46:22 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 24 Sep 2007 09:46:22 -0400
Subject: rpms/rhythmbox/F-7 rhythmbox-0.10.1-podcasts.patch, NONE,
	1.1 rhythmbox.spec, 1.114, 1.115
Message-ID: <200709241346.l8ODkM4l025668@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25642

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.10.1-podcasts.patch 
Log Message:
* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2.fc7
- Add patch from upstream to mark Podcasts as such when uploading them to
  an iPod (#302691)


rhythmbox-0.10.1-podcasts.patch:

--- NEW FILE rhythmbox-0.10.1-podcasts.patch ---
diff -up rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c.podcast rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c
--- rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c.podcast	2007-09-24 02:18:38.000000000 -0400
+++ rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c	2007-09-24 02:30:19.000000000 -0400
@@ -50,6 +50,8 @@
 #define PHONE_PRODUCT_ID 0x4810
 #endif
 
+static const char *ITDB_PLAYLIST_DATA = "itdb-playlist";
+
 static GObject *rb_ipod_source_constructor (GType type,
 					    guint n_construct_properties,
 					    GObjectConstructParam *construct_properties);
@@ -96,6 +98,7 @@ typedef struct
 
 	GList *playlists;
 	gboolean needs_shuffle_db;
+	RBStaticPlaylistSource *podcast_pl;
 
 	guint load_idle_id;
 } RBiPodSourcePrivate;
@@ -324,6 +327,11 @@ add_rb_playlist (RBiPodSource *source, I
 	}
 
 	priv->playlists = g_list_prepend (priv->playlists, playlist_source);
+	g_object_set_data_full (g_object_ref (playlist_source),
+			ITDB_PLAYLIST_DATA, playlist, g_object_unref);
+	if (itdb_playlist_is_podcasts(playlist)) {
+		priv->podcast_pl = RB_STATIC_PLAYLIST_SOURCE (playlist_source);
+	}
 
 	rb_shell_append_source (shell, playlist_source, RB_SOURCE (source));
 	g_object_unref (shell);
@@ -352,6 +360,10 @@ load_ipod_playlists (RBiPodSource *sourc
 }
 
 #ifdef ENABLE_IPOD_WRITING
+
+#define MEDIATYPE_AUDIO       0x0001
+#define MEDIATYPE_PODCAST     0x0004
+
 static Itdb_Track *
 create_ipod_song_from_entry (RhythmDBEntry *entry, const char *mimetype)
 {
@@ -378,6 +390,12 @@ create_ipod_song_from_entry (RhythmDBEnt
 	track->app_rating = track->rating;
 	track->playcount = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_PLAY_COUNT);
 
+	if (rhythmdb_entry_get_pointer (entry, RHYTHMDB_PROP_TYPE) == RHYTHMDB_ENTRY_TYPE_PODCAST_POST) {
+		track->mediatype = MEDIATYPE_PODCAST;
+	} else {
+		track->mediatype = MEDIATYPE_AUDIO;
+	}
+
 	return track;
 }
 #endif
@@ -964,6 +982,23 @@ impl_build_dest_uri (RBRemovableMediaSou
 	return NULL;
 }
 
+static void
+add_to_podcasts (RBiPodSourcePrivate *priv, Itdb_Track *song)
+{
+	gchar *filename;
+	Itdb_Playlist *ipod_playlist;
+
+	if (priv->podcast_pl == NULL)
+		return;
+
+	ipod_playlist = g_object_get_data (G_OBJECT (priv->podcast_pl), ITDB_PLAYLIST_DATA);
+	itdb_playlist_add_track (ipod_playlist, song, -1);
+
+	filename = ipod_path_to_uri (priv->ipod_mount_path, song->ipod_path);
+	rb_static_playlist_source_add_location (priv->podcast_pl, filename, -1);
+	g_free (filename);
+}
+
 static gboolean
 impl_track_added (RBRemovableMediaSource *source,
 		  RhythmDBEntry *entry,
@@ -987,6 +1022,9 @@ impl_track_added (RBRemovableMediaSource
 		itdb_track_add (priv->ipod_db, song, -1);
 		itdb_playlist_add_track (itdb_playlist_mpl (priv->ipod_db),
 					 song, -1);
+		if (song->mediatype == MEDIATYPE_PODCAST) {
+			add_to_podcasts (priv, song);
+		}
 
 		add_ipod_song_to_db (isource, db, song);
 		itdb_schedule_save (isource);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-7/rhythmbox.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- rhythmbox.spec	23 Aug 2007 21:34:21 -0000	1.114
+++ rhythmbox.spec	24 Sep 2007 13:45:48 -0000	1.115
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -48,6 +48,7 @@
 Patch1: rhythmbox-first-time-load.patch
 Patch2: rhythmbox-enable-stores.patch
 Patch3: rhythmbox-0.10-shops-resizing.patch
+Patch4: rhythmbox-0.10.1-podcasts.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -65,6 +66,7 @@
 %patch2 -p0 -b .enable-stores
 cd ../
 %patch3 -p0 -b .dont-resize-stores
+%patch4 -p1 -b .ipod-podcasts
 
 %build
 
@@ -153,6 +155,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2.fc7
+- Add patch from upstream to mark Podcasts as such when uploading them to
+  an iPod (#302691)
+
 * Thu Aug 23 2007 - Ray Strode <rstorde at redhat.com> - 0.10.1-1.fc7
 - update to 0.10.1 at the request of Andre Klapper
   (http://mail.gnome.org/archives/distributor-list/2007-August/msg00008.html)



From fedora-extras-commits at redhat.com  Mon Sep 24 13:48:32 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 09:48:32 -0400
Subject: fedora-security/audit fc7,1.117,1.118
Message-ID: <200709241348.l8ODmWnd025754@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732/audit

Modified Files:
	fc7 
Log Message:
t1lib



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc7	21 Sep 2007 21:28:10 -0000	1.117
+++ fc7	24 Sep 2007 13:48:30 -0000	1.118
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
 CVE-2007-5034 VULNERABLE (elinks) #297981
 GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601



From fedora-extras-commits at redhat.com  Mon Sep 24 13:54:59 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 09:54:59 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec, 1.30, 1.31 sources, 1.24,
	1.25
Message-ID: <200709241354.l8ODsxHk025973@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25919

Modified Files:
	fonts-indic.spec sources 
Log Message:
* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
- this is now a meta-package since Lohit fonts were moved to lohit-fonts (#253158)



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fonts-indic.spec	10 Sep 2007 09:53:50 -0000	1.30
+++ fonts-indic.spec	24 Sep 2007 13:54:27 -0000	1.31
@@ -4,50 +4,29 @@
 
 Name:        fonts-indic
 Version:     2.1.5
-Release:     2%{?dist}
-License:     GPL
+Release:     3%{?dist}
+License:     GPLv2+
 Group:       User Interface/X
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:       http://fedoraproject.org/wiki/Lohit
-Source:    fonts-indic-%{version}.tar.gz
+URL:         http://fedoraproject.org/wiki/Lohit
 
 Summary: Free Indian truetype/opentype fonts
 %description 
-This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil,
-Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
+This is a meta-package for Hindi, Bengali, Gujarati, Punjabi, Tamil,
+Kannada, Malayalam, Oriya, Telugu fonts.
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
 %package -n fonts-%1\
-Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
+Summary:    Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
 Group:      User Interface/X \
-Provides:  ttfonts-%2 <= 1.6-1\
-Obsoletes :  ttfonts-%2 <= 1.6-1\
-Requires:   fontconfig\
 \
 %description -n fonts-%1\
-These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
+This is a meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts support.\
 \
 %files -n fonts-%1\
 %defattr(-, root, root)\
-%dir %{xfontdir}\
-%dir %{xfontdir}/%1\
-%doc COPYING README AUTHORS\
-%ghost %{xfontdir}/%1/fonts.cache-1\
-%{xfontdir}/%1/*ttf\
-\
-%post -n fonts-%1 \
-if [ -x %{_bindir}/fc-cache ]; then \
-  %{_bindir}/fc-cache /usr/share/fonts \
-fi \
-\
-%postun -n fonts-%1 \
-if [ "$1" = "0" ]; then \
-  if [ -x %{_bindir}/fc-cache ]; then \
-    %{_bindir}/fc-cache /usr/share/fonts \
-  fi \
-fi 
 
 %mk_pkg bengali bn 
 %mk_pkg gujarati gu
@@ -60,7 +39,7 @@
 %mk_pkg telugu te
 
 %prep
-%setup -q -n fonts-indic-%{version}
+%{nil}
 
 %build
 echo "Nothing to do in Build."
@@ -68,18 +47,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for i in "%{langlist}"
-do
-  install -d $RPM_BUILD_ROOT/%{xfontdir}/$i
-  install -m 0644 $i/* $RPM_BUILD_ROOT/%{xfontdir}/$i
-  # Ghost the fonts.cache-1 file
-  touch $RPM_BUILD_ROOT/%{xfontdir}/$i/fonts.cache-1
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
+- this is now a meta-package since Lohit fonts were moved to
+  lohit-fonts (#253158)
+
 * Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
 - Reverting back renaming changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	26 Mar 2007 07:24:05 -0000	1.24
+++ sources	24 Sep 2007 13:54:27 -0000	1.25
@@ -1 +0,0 @@
-bb9497ee772062b97ff00a1a68b17c98  fonts-indic-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 13:58:00 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 24 Sep 2007 09:58:00 -0400
Subject: fedora-security/audit fc7,1.118,1.119
Message-ID: <200709241358.l8ODw0vk026254@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26230/audit

Modified Files:
	fc7 
Log Message:
inotify-tools cve name



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc7	24 Sep 2007 13:48:30 -0000	1.118
+++ fc7	24 Sep 2007 13:57:58 -0000	1.119
@@ -9,8 +9,8 @@
 # Up to date FC7 as of 20070916
 
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
+CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
-GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031



From fedora-extras-commits at redhat.com  Mon Sep 24 14:01:30 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:01:30 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.31,1.32
Message-ID: <200709241401.l8OE1UGX032425@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26305

Modified Files:
	fonts-indic.spec 
Log Message:
add requires for  lohit-fonts-*



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fonts-indic.spec	24 Sep 2007 13:54:27 -0000	1.31
+++ fonts-indic.spec	24 Sep 2007 14:00:57 -0000	1.32
@@ -19,14 +19,15 @@
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
 %package -n fonts-%1\
-Summary:    Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
-Group:      User Interface/X \
+Summary:     Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
+Group:       User Interface/X\
+Requires:    lohit-fonts-%1\
 \
 %description -n fonts-%1\
 This is a meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts support.\
 \
 %files -n fonts-%1\
-%defattr(-, root, root)\
+%defattr(-,root,root,-)
 
 %mk_pkg bengali bn 
 %mk_pkg gujarati gu
@@ -54,6 +55,7 @@
 * Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
 - this is now a meta-package since Lohit fonts were moved to
   lohit-fonts (#253158)
+- each subpackage requires the corresponding lohit-fonts subpackage
 
 * Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
 - Reverting back renaming changes



From fedora-extras-commits at redhat.com  Mon Sep 24 14:01:39 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:01:39 -0400
Subject: rpms/taglib/devel taglib.spec,1.16,1.17
Message-ID: <200709241401.l8OE1d4U032430@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31349

Modified Files:
	taglib.spec 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
- BR: autoconf



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- taglib.spec	24 Sep 2007 13:36:35 -0000	1.16
+++ taglib.spec	24 Sep 2007 14:01:05 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.1.%{svn}svn%{?dist}
+Release:    0.2.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -17,6 +17,8 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+BuildRequires: autoconf
+
 
 %description
 TagLib is a library for reading and editing the meta-data of several
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
+- BR: autoconf
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
 - update to svn version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:04:58 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:04:58 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.32,1.33
Message-ID: <200709241404.l8OE4wJR032590@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	fonts-indic.spec 
Log Message:
remove superfluous second args to %mk_pkg



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fonts-indic.spec	24 Sep 2007 14:00:57 -0000	1.32
+++ fonts-indic.spec	24 Sep 2007 14:04:26 -0000	1.33
@@ -29,15 +29,15 @@
 %files -n fonts-%1\
 %defattr(-,root,root,-)
 
-%mk_pkg bengali bn 
-%mk_pkg gujarati gu
-%mk_pkg hindi hi
-%mk_pkg kannada kn 
-%mk_pkg malayalam ml 
-%mk_pkg oriya or 
-%mk_pkg punjabi pn
-%mk_pkg tamil ta 
-%mk_pkg telugu te
+%mk_pkg bengali
+%mk_pkg gujarati
+%mk_pkg hindi
+%mk_pkg kannada
+%mk_pkg malayalam
+%mk_pkg oriya
+%mk_pkg punjabi
+%mk_pkg tamil
+%mk_pkg telugu
 
 %prep
 %{nil}



From fedora-extras-commits at redhat.com  Mon Sep 24 14:10:48 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:10:48 -0400
Subject: rpms/taglib/devel taglib.spec,1.17,1.18
Message-ID: <200709241410.l8OEAm3E000420@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv352

Modified Files:
	taglib.spec 
Log Message:
BR autoconf -> automake


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- taglib.spec	24 Sep 2007 14:01:05 -0000	1.17
+++ taglib.spec	24 Sep 2007 14:10:15 -0000	1.18
@@ -17,7 +17,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: autoconf
+BuildRequires: automake
 
 
 %description
@@ -80,7 +80,7 @@
 
 %changelog
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
-- BR: autoconf
+- BR: automake
 
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
 - update to svn version



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:03 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:12:03 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.33,1.34
Message-ID: <200709241412.l8OEC33a000506@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433

Modified Files:
	fonts-indic.spec 
Log Message:
remove reverted changelog entries



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fonts-indic.spec	24 Sep 2007 14:04:26 -0000	1.33
+++ fonts-indic.spec	24 Sep 2007 14:11:30 -0000	1.34
@@ -57,12 +57,6 @@
   lohit-fonts (#253158)
 - each subpackage requires the corresponding lohit-fonts subpackage
 
-* Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
-- Reverting back renaming changes
-
-* Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
-- Renamed the package to reflect the upstream project name #253158
-
 * Fri Jul 27 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-2.fc8
 - SPEC cleanup as part of merge review #225763
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:34 -0400
Subject: devel/vim 7.1.101,NONE,1.1
Message-ID: <200709241412.l8OECY1I000572@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv564

Added Files:
	7.1.101 
Log Message:
- patchlevel 101


--- NEW FILE 7.1.101 ---
To: vim-dev at vim.org
Subject: patch 7.1.101
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.101
Problem:    Ruby: The Buffer.line= method does not work.
Solution:   Add the "self" argument to set_current_line(). (Jonathan Hankins)
Files:	    src/if_ruby.c


*** ../vim-7.1.100/src/if_ruby.c	Sat May 12 15:01:49 2007
--- src/if_ruby.c	Mon Sep 10 10:40:38 2007
***************
*** 789,795 ****
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
--- 789,795 ----
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE self, VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
*** ../vim-7.1.100/src/version.c	Thu Sep  6 17:38:06 2007
--- src/version.c	Thu Sep 13 14:59:47 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     101,
  /**/

-- 
The question is:  What do you do with your life?
The wrong answer is: Become the richest guy in the graveyard.
				(billionaire and Oracle founder Larry Ellison)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:41 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:41 -0400
Subject: devel/vim 7.1.102,NONE,1.1
Message-ID: <200709241412.l8OECfG6000595@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv588

Added Files:
	7.1.102 
Log Message:
- patchlevel 102


--- NEW FILE 7.1.102 ---
To: vim-dev at vim.org
Subject: patch 7.1.102
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.102
Problem:    Perl interface doesn't compile with new version of Perl.
Solution:   Add two variables to the dynamic library loading. (Suresh
	    Govindachar)
Files:	    src/if_perl.xs


*** ../vim-7.1.101/src/if_perl.xs	Wed Aug 16 19:33:57 2006
--- src/if_perl.xs	Wed Sep  5 22:00:36 2007
***************
*** 40,45 ****
--- 40,65 ----
  #    define PERL_SUBVERSION SUBVERSION
  #endif
  
+ /*
+  * Quoting Jan Dubois of Active State:
+  *    ActivePerl build 822 still identifies itself as 5.8.8 but already
+  *    contains many of the changes from the upcoming Perl 5.8.9 release.
+  *
+  * The changes include addition of two symbols (Perl_sv_2iv_flags,
+  * Perl_newXS_flags) not present in earlier releases.
+  *
+  * Jan Dubois suggested the following guarding scheme:
+  */
+ #if (ACTIVEPERL_VERSION >= 822)
+ # define PERL589_OR_LATER
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
+ # define PERL589_OR_LATER
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
+ # define PERL589_OR_LATER
+ #endif
+ 
  #ifndef pTHX
  #    define pTHX void
  #    define pTHX_
***************
*** 109,114 ****
--- 129,138 ----
  # else
  #  define Perl_sv_catpvn dll_Perl_sv_catpvn
  # endif
+ #ifdef PERL589_OR_LATER
+ #  define Perl_sv_2iv_flags dll_Perl_sv_2iv_flags
+ #  define Perl_newXS_flags dll_Perl_newXS_flags
+ #endif
  # define Perl_sv_free dll_Perl_sv_free
  # define Perl_sv_isa dll_Perl_sv_isa
  # define Perl_sv_magic dll_Perl_sv_magic
***************
*** 192,197 ****
--- 216,225 ----
  #else
  static void (*Perl_sv_catpvn)(pTHX_ SV*, const char*, STRLEN);
  #endif
+ #ifdef PERL589_OR_LATER
+ static IV (*Perl_sv_2iv_flags)(pTHX_ SV* sv, I32 flags);
+ static CV * (*Perl_newXS_flags)(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
+ #endif
  static void (*Perl_sv_free)(pTHX_ SV*);
  static int (*Perl_sv_isa)(pTHX_ SV*, const char*);
  static void (*Perl_sv_magic)(pTHX_ SV*, SV*, int, const char*, I32);
***************
*** 266,271 ****
--- 294,303 ----
      {"Perl_sv_2pv_nolen", (PERL_PROC*)&Perl_sv_2pv_nolen},
  #else
      {"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv},
+ #endif
+ #ifdef PERL589_OR_LATER
+     {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags},
+     {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags},
  #endif
      {"Perl_sv_bless", (PERL_PROC*)&Perl_sv_bless},
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
*** ../vim-7.1.101/src/version.c	Thu Sep 13 15:00:28 2007
--- src/version.c	Thu Sep 13 15:18:36 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     102,
  /**/

-- 
Witches prefer brooms: vacuum-cleaners need extension cords!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:47 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:47 -0400
Subject: devel/vim 7.1.103,NONE,1.1
Message-ID: <200709241412.l8OEClKr000620@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv611

Added Files:
	7.1.103 
Log Message:
- patchlevel 103


--- NEW FILE 7.1.103 ---
To: vim-dev at vim.org
Subject: patch 7.1.103
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.103
Problem:    Using "dw" with the cursor past the end of the last line (using
            CTRL-\ CTRL-O from Insert mode) deletes a character. (Tim Chase)
Solution:   Don't move the cursor back when the movement failed.
Files:      src/normal.c


*** ../vim-7.1.102/src/normal.c	Tue Aug 14 22:54:00 2007
--- src/normal.c	Tue Sep 11 19:32:42 2007
***************
*** 8364,8370 ****
  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
  
      /* Don't leave the cursor on the NUL past a line */
!     if (curwin->w_cursor.col && gchar_cursor() == NUL)
      {
  	--curwin->w_cursor.col;
  	cap->oap->inclusive = TRUE;
--- 8364,8370 ----
  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
  
      /* Don't leave the cursor on the NUL past a line */
!     if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
      {
  	--curwin->w_cursor.col;
  	cap->oap->inclusive = TRUE;
*** ../vim-7.1.102/src/version.c	Thu Sep 13 15:19:32 2007
--- src/version.c	Thu Sep 13 15:32:05 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     103,
  /**/

-- 
ARTHUR:  Then who is your lord?
WOMAN:   We don't have a lord.
ARTHUR:  What?
DENNIS:  I told you.  We're an anarcho-syndicalist commune.  We take it in
         turns to act as a sort of executive officer for the week.
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:54 -0400
Subject: devel/vim 7.1.104,NONE,1.1
Message-ID: <200709241412.l8OECsAW000645@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv638

Added Files:
	7.1.104 
Log Message:
- patchlevel 104


--- NEW FILE 7.1.104 ---
To: vim-dev at vim.org
Subject: patch 7.1.104
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.104 (after 7.1.095)
Problem:    When 'lazyredraw' is set a focus event causes redraw to be
	    postponed until a key is pressed.
Solution:   Instead of not returning from vgetc() when a focus event is
	    encountered return K_IGNORE.  Add plain_vgetc() for when the
	    caller doesn't want to get K_IGNORE.
Files:	    src/digraph.c, src/edit.c, src/ex_cmds.c, src/ex_getln.c,
	    src/getchar.c, src/normal.c, src/proto/getchar.pro, src/window.c


*** ../vim-7.1.103/src/digraph.c	Sat Jul  7 13:57:39 2007
--- src/digraph.c	Thu Sep 13 16:11:54 2007
***************
*** 2028,2034 ****
  
      ++no_mapping;
      ++allow_keys;
!     c = safe_vgetc();
      --no_mapping;
      --allow_keys;
      if (c != ESC)		/* ESC cancels CTRL-K */
--- 2028,2034 ----
  
      ++no_mapping;
      ++allow_keys;
!     c = plain_vgetc();
      --no_mapping;
      --allow_keys;
      if (c != ESC)		/* ESC cancels CTRL-K */
***************
*** 2050,2056 ****
  #endif
  	++no_mapping;
  	++allow_keys;
! 	cc = safe_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)	    /* ESC cancels CTRL-K */
--- 2050,2056 ----
  #endif
  	++no_mapping;
  	++allow_keys;
! 	cc = plain_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)	    /* ESC cancels CTRL-K */
***************
*** 2350,2356 ****
      if (*curbuf->b_p_keymap == NUL)
      {
  	/* Stop any active keymap and clear the table.  Also remove
! 	 * b:keymap_unload, as no keymap is active now. */
  	keymap_unload();
  	do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
      }
--- 2350,2356 ----
      if (*curbuf->b_p_keymap == NUL)
      {
  	/* Stop any active keymap and clear the table.  Also remove
! 	 * b:keymap_name, as no keymap is active now. */
  	keymap_unload();
  	do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
      }
*** ../vim-7.1.103/src/edit.c	Sun Aug 12 16:38:03 2007
--- src/edit.c	Thu Sep 13 16:17:54 2007
***************
*** 788,794 ****
  	    ins_redraw(FALSE);
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = safe_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
--- 788,794 ----
  	    ins_redraw(FALSE);
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = plain_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
***************
*** 981,987 ****
  #ifdef FEAT_NETBEANS_INTG
  	case K_F21:	/* NetBeans command */
  	    ++no_mapping;		/* don't map the next key hits */
! 	    i = safe_vgetc();
  	    --no_mapping;
  	    netbeans_keycommand(i);
  	    break;
--- 981,987 ----
  #ifdef FEAT_NETBEANS_INTG
  	case K_F21:	/* NetBeans command */
  	    ++no_mapping;		/* don't map the next key hits */
! 	    i = plain_vgetc();
  	    --no_mapping;
  	    netbeans_keycommand(i);
  	    break;
***************
*** 5224,5233 ****
      i = 0;
      for (;;)
      {
! 	do
! 	    nc = safe_vgetc();
! 	while (nc == K_IGNORE || nc == K_VER_SCROLLBAR
! 						    || nc == K_HOR_SCROLLBAR);
  #ifdef FEAT_CMDL_INFO
  	if (!(State & CMDLINE)
  # ifdef FEAT_MBYTE
--- 5224,5230 ----
      i = 0;
      for (;;)
      {
! 	nc = plain_vgetc();
  #ifdef FEAT_CMDL_INFO
  	if (!(State & CMDLINE)
  # ifdef FEAT_MBYTE
***************
*** 7575,7581 ****
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     regname = safe_vgetc();
  #ifdef FEAT_LANGMAP
      LANGMAP_ADJUST(regname, TRUE);
  #endif
--- 7572,7578 ----
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     regname = plain_vgetc();
  #ifdef FEAT_LANGMAP
      LANGMAP_ADJUST(regname, TRUE);
  #endif
***************
*** 7586,7592 ****
  #ifdef FEAT_CMDL_INFO
  	add_to_showcmd_c(literally);
  #endif
! 	regname = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	LANGMAP_ADJUST(regname, TRUE);
  #endif
--- 7583,7589 ----
  #ifdef FEAT_CMDL_INFO
  	add_to_showcmd_c(literally);
  #endif
! 	regname = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	LANGMAP_ADJUST(regname, TRUE);
  #endif
***************
*** 7677,7683 ****
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     c = safe_vgetc();
      --no_mapping;
      switch (c)
      {
--- 7674,7680 ----
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     c = plain_vgetc();
      --no_mapping;
      switch (c)
      {
***************
*** 9356,9362 ****
       * mode message to be deleted when ESC is hit */
      ++no_mapping;
      ++allow_keys;
!     c = safe_vgetc();
      --no_mapping;
      --allow_keys;
      if (IS_SPECIAL(c) || mod_mask)	    /* special key */
--- 9353,9359 ----
       * mode message to be deleted when ESC is hit */
      ++no_mapping;
      ++allow_keys;
!     c = plain_vgetc();
      --no_mapping;
      --allow_keys;
      if (IS_SPECIAL(c) || mod_mask)	    /* special key */
***************
*** 9388,9394 ****
  	}
  	++no_mapping;
  	++allow_keys;
! 	cc = safe_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)
--- 9385,9391 ----
  	}
  	++no_mapping;
  	++allow_keys;
! 	cc = plain_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)
*** ../vim-7.1.103/src/ex_cmds.c	Tue Aug 21 15:28:32 2007
--- src/ex_cmds.c	Thu Sep 13 16:19:40 2007
***************
*** 4498,4504 ****
  	     *
  	     * The new text is built up in new_start[].  It has some extra
  	     * room to avoid using alloc()/free() too often.  new_start_len is
! 	     * the lenght of the allocated memory at new_start.
  	     *
  	     * Make a copy of the old line, so it won't be taken away when
  	     * updating the screen or handling a multi-line match.  The "old_"
--- 4499,4505 ----
  	     *
  	     * The new text is built up in new_start[].  It has some extra
  	     * room to avoid using alloc()/free() too often.  new_start_len is
! 	     * the length of the allocated memory at new_start.
  	     *
  	     * Make a copy of the old line, so it won't be taken away when
  	     * updating the screen or handling a multi-line match.  The "old_"
***************
*** 4669,4675 ****
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = safe_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
--- 4670,4676 ----
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
*** ../vim-7.1.103/src/ex_getln.c	Mon Aug  6 22:27:12 2007
--- src/ex_getln.c	Thu Sep 13 16:20:49 2007
***************
*** 641,647 ****
  	{
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = safe_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    /* CTRL-\ e doesn't work when obtaining an expression. */
--- 641,647 ----
  	{
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = plain_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    /* CTRL-\ e doesn't work when obtaining an expression. */
***************
*** 1091,1101 ****
  #endif
  		putcmdline('"', TRUE);
  		++no_mapping;
! 		i = c = safe_vgetc();	/* CTRL-R <char> */
  		if (i == Ctrl_O)
  		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
  		if (i == Ctrl_R)
! 		    c = safe_vgetc();	/* CTRL-R CTRL-R <char> */
  		--no_mapping;
  #ifdef FEAT_EVAL
  		/*
--- 1091,1101 ----
  #endif
  		putcmdline('"', TRUE);
  		++no_mapping;
! 		i = c = plain_vgetc();	/* CTRL-R <char> */
  		if (i == Ctrl_O)
  		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
  		if (i == Ctrl_R)
! 		    c = plain_vgetc();	/* CTRL-R CTRL-R <char> */
  		--no_mapping;
  #ifdef FEAT_EVAL
  		/*
*** ../vim-7.1.103/src/getchar.c	Wed Sep  5 21:45:54 2007
--- src/getchar.c	Thu Sep 13 16:16:53 2007
***************
*** 1597,1608 ****
  	    }
  #endif
  #ifdef FEAT_GUI
! 	    /* The caller doesn't need to know that the focus event is delayed
! 	     * until getting a character. */
  	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
  	    {
  		ui_focus_change(c == K_FOCUSGAINED);
! 		continue;
  	    }
  
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
--- 1597,1609 ----
  	    }
  #endif
  #ifdef FEAT_GUI
! 	    /* Handle focus event here, so that the caller doesn't need to
! 	     * know about it.  Return K_IGNORE so that we loop once (needed if
! 	     * 'lazyredraw' is set). */
  	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
  	    {
  		ui_focus_change(c == K_FOCUSGAINED);
! 		c = K_IGNORE;
  	    }
  
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
***************
*** 1744,1749 ****
--- 1745,1766 ----
      c = vgetc();
      if (c == NUL)
  	c = get_keystroke();
+     return c;
+ }
+ 
+ /*
+  * Like safe_vgetc(), but loop to handle K_IGNORE.
+  * Also ignore scrollbar events.
+  */
+     int
+ plain_vgetc()
+ {
+     int c;
+ 
+     do
+     {
+ 	c = safe_vgetc();
+     } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
      return c;
  }
  
*** ../vim-7.1.103/src/normal.c	Thu Sep 13 15:33:18 2007
--- src/normal.c	Thu Sep 13 16:24:51 2007
***************
*** 696,702 ****
  		++allow_keys;		/* no mapping for nchar, but keys */
  	    }
  	    ++no_zero_mapping;		/* don't map zero here */
! 	    c = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
--- 696,702 ----
  		++allow_keys;		/* no mapping for nchar, but keys */
  	    }
  	    ++no_zero_mapping;		/* don't map zero here */
! 	    c = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
***************
*** 721,727 ****
  	    ca.count0 = 0;
  	    ++no_mapping;
  	    ++allow_keys;		/* no mapping for nchar, but keys */
! 	    c = safe_vgetc();		/* get next character */
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
--- 721,727 ----
  	    ca.count0 = 0;
  	    ++no_mapping;
  	    ++allow_keys;		/* no mapping for nchar, but keys */
! 	    c = plain_vgetc();		/* get next character */
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
***************
*** 900,906 ****
  	     * For 'g' get the next character now, so that we can check for
  	     * "gr", "g'" and "g`".
  	     */
! 	    ca.nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(ca.nchar, TRUE);
  #endif
--- 900,906 ----
  	     * For 'g' get the next character now, so that we can check for
  	     * "gr", "g'" and "g`".
  	     */
! 	    ca.nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(ca.nchar, TRUE);
  #endif
***************
*** 957,963 ****
  		im_set_active(TRUE);
  #endif
  
! 	    *cp = safe_vgetc();
  
  	    if (langmap_active)
  	    {
--- 957,963 ----
  		im_set_active(TRUE);
  #endif
  
! 	    *cp = plain_vgetc();
  
  	    if (langmap_active)
  	    {
***************
*** 1045,1051 ****
  		}
  		if (c > 0)
  		{
! 		    c = safe_vgetc();
  		    if (c != Ctrl_N && c != Ctrl_G)
  			vungetc(c);
  		    else
--- 1045,1051 ----
  		}
  		if (c > 0)
  		{
! 		    c = plain_vgetc();
  		    if (c != Ctrl_N && c != Ctrl_G)
  			vungetc(c);
  		    else
***************
*** 1064,1070 ****
  	    while (enc_utf8 && lang && (c = vpeekc()) > 0
  				 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
  	    {
! 		c = safe_vgetc();
  		if (!utf_iscomposing(c))
  		{
  		    vungetc(c);		/* it wasn't, put it back */
--- 1064,1070 ----
  	    while (enc_utf8 && lang && (c = vpeekc()) > 0
  				 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
  	    {
! 		c = plain_vgetc();
  		if (!utf_iscomposing(c))
  		{
  		    vungetc(c);		/* it wasn't, put it back */
***************
*** 4564,4570 ****
  #endif
  	    ++no_mapping;
  	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
! 	    nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(nchar, TRUE);
  #endif
--- 4564,4570 ----
  #endif
  	    ++no_mapping;
  	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
! 	    nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(nchar, TRUE);
  #endif
***************
*** 4922,4928 ****
      case 'u':	/* "zug" and "zuw": undo "zg" and "zw" */
  		++no_mapping;
  		++allow_keys;   /* no mapping for nchar, but allow key codes */
! 		nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(nchar, TRUE);
  #endif
--- 4922,4928 ----
      case 'u':	/* "zug" and "zuw": undo "zg" and "zw" */
  		++no_mapping;
  		++allow_keys;   /* no mapping for nchar, but allow key codes */
! 		nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(nchar, TRUE);
  #endif
*** ../vim-7.1.103/src/proto/getchar.pro	Sun May  6 15:04:24 2007
--- src/proto/getchar.pro	Thu Sep 13 16:13:19 2007
***************
*** 38,43 ****
--- 38,44 ----
  void updatescript __ARGS((int c));
  int vgetc __ARGS((void));
  int safe_vgetc __ARGS((void));
+ int plain_vgetc __ARGS((void));
  int vpeekc __ARGS((void));
  int vpeekc_nomap __ARGS((void));
  int vpeekc_any __ARGS((void));
*** ../vim-7.1.103/src/window.c	Sun Aug 12 16:55:01 2007
--- src/window.c	Thu Sep 13 16:25:01 2007
***************
*** 584,590 ****
  		++no_mapping;
  		++allow_keys;   /* no mapping for xchar, but allow key codes */
  		if (xchar == NUL)
! 		    xchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(xchar, TRUE);
  #endif
--- 584,590 ----
  		++no_mapping;
  		++allow_keys;   /* no mapping for xchar, but allow key codes */
  		if (xchar == NUL)
! 		    xchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(xchar, TRUE);
  #endif
*** ../vim-7.1.103/src/version.c	Thu Sep 13 15:33:18 2007
--- src/version.c	Thu Sep 13 18:22:59 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     104,
  /**/

-- 
ARTHUR:  I am your king!
WOMAN:   Well, I didn't vote for you.
ARTHUR:  You don't vote for kings.
WOMAN:   Well, 'ow did you become king then?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:03 -0400
Subject: devel/vim 7.1.105,NONE,1.1
Message-ID: <200709241413.l8OED3EB000670@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv661

Added Files:
	7.1.105 
Log Message:
- patchlevel 105


--- NEW FILE 7.1.105 ---
To: vim-dev at vim.org
Subject: patch 7.1.105
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.105
Problem:    Internal error when using "0 ? {'a': 1} : {}". (A.Politz)
Solution:   When parsing a dictionary value without using the value, don't try
	    obtaining the key name.
Files:	    src/eval.c


*** ../vim-7.1.104/src/eval.c	Thu Sep  6 14:25:50 2007
--- src/eval.c	Thu Sep 13 20:29:31 2007
***************
*** 6746,6765 ****
  	    clear_tv(&tvkey);
  	    goto failret;
  	}
! 	key = get_tv_string_buf_chk(&tvkey, buf);
! 	if (key == NULL || *key == NUL)
  	{
! 	    /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
! 	    if (key != NULL)
! 		EMSG(_(e_emptykey));
! 	    clear_tv(&tvkey);
! 	    goto failret;
  	}
  
  	*arg = skipwhite(*arg + 1);
  	if (eval1(arg, &tv, evaluate) == FAIL)	/* recursive! */
  	{
! 	    clear_tv(&tvkey);
  	    goto failret;
  	}
  	if (evaluate)
--- 6746,6769 ----
  	    clear_tv(&tvkey);
  	    goto failret;
  	}
! 	if (evaluate)
  	{
! 	    key = get_tv_string_buf_chk(&tvkey, buf);
! 	    if (key == NULL || *key == NUL)
! 	    {
! 		/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
! 		if (key != NULL)
! 		    EMSG(_(e_emptykey));
! 		clear_tv(&tvkey);
! 		goto failret;
! 	    }
  	}
  
  	*arg = skipwhite(*arg + 1);
  	if (eval1(arg, &tv, evaluate) == FAIL)	/* recursive! */
  	{
! 	    if (evaluate)
! 		clear_tv(&tvkey);
  	    goto failret;
  	}
  	if (evaluate)
*** ../vim-7.1.104/src/version.c	Thu Sep 13 18:25:08 2007
--- src/version.c	Thu Sep 13 20:36:38 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     105,
  /**/

-- 
DENNIS:  Listen -- strange women lying in ponds distributing swords is no
         basis for a system of government.  Supreme executive power derives
         from a mandate from the masses, not from some farcical aquatic
         ceremony.
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:09 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:09 -0400
Subject: devel/vim 7.1.106,NONE,1.1
Message-ID: <200709241413.l8OED9vn000695@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv688

Added Files:
	7.1.106 
Log Message:
- patchlevel 106


--- NEW FILE 7.1.106 ---
To: vim-dev at vim.org
Subject: patch 7.1.106
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.106
Problem:    ":messages" doesn't quit listing on ":".
Solution:   Break the loop when "got_int" is set.
Files:	    src/message.c


*** ../vim-7.1.105/src/message.c	Thu Sep  6 12:53:59 2007
--- src/message.c	Thu Sep 13 21:45:57 2007
***************
*** 828,834 ****
  		_("Messages maintainer: Bram Moolenaar <Bram at vim.org>"),
  		hl_attr(HLF_T));
  
!     for (p = first_msg_hist; p != NULL; p = p->next)
  	if (p->msg != NULL)
  	    msg_attr(p->msg, p->attr);
  
--- 828,834 ----
  		_("Messages maintainer: Bram Moolenaar <Bram at vim.org>"),
  		hl_attr(HLF_T));
  
!     for (p = first_msg_hist; p != NULL && !got_int; p = p->next)
  	if (p->msg != NULL)
  	    msg_attr(p->msg, p->attr);
  
*** ../vim-7.1.105/src/version.c	Thu Sep 13 20:39:58 2007
--- src/version.c	Thu Sep 13 21:57:40 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     106,
  /**/

-- 
I'm sure that I asked CBuilder to do a "full" install.  Looks like I got
a "fool" install, instead.		Charles E Campbell, Jr, PhD


 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:16 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:16 -0400
Subject: devel/vim 7.1.107,NONE,1.1
Message-ID: <200709241413.l8OEDGqY000718@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv711

Added Files:
	7.1.107 
Log Message:
- patchlevel 107


--- NEW FILE 7.1.107 ---
To: vim-dev at vim.org
Subject: patch 7.1.107
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.107
Problem:    When doing a block selection and using "s" to change the text,
	    while triggering auto-indenting, causes the wrong text to be
	    repeated in other lines. (Adri Verhoef)
Solution:   Compute the change of indent and compensate for that.
Files:	    src/ops.c


*** ../vim-7.1.106/src/ops.c	Thu Jun 28 22:14:28 2007
--- src/ops.c	Thu Aug 30 11:41:10 2007
***************
*** 2477,2483 ****
  
  	/*
  	 * Spaces and tabs in the indent may have changed to other spaces and
! 	 * tabs.  Get the starting column again and correct the lenght.
  	 * Don't do this when "$" used, end-of-line will have changed.
  	 */
  	block_prep(oap, &bd2, oap->start.lnum, TRUE);
--- 2477,2483 ----
  
  	/*
  	 * Spaces and tabs in the indent may have changed to other spaces and
! 	 * tabs.  Get the starting column again and correct the length.
  	 * Don't do this when "$" used, end-of-line will have changed.
  	 */
  	block_prep(oap, &bd2, oap->start.lnum, TRUE);
***************
*** 2534,2540 ****
  #ifdef FEAT_VISUALEXTRA
      long		offset;
      linenr_T		linenr;
!     long		ins_len, pre_textlen = 0;
      char_u		*firstline;
      char_u		*ins_text, *newp, *oldp;
      struct block_def	bd;
--- 2534,2542 ----
  #ifdef FEAT_VISUALEXTRA
      long		offset;
      linenr_T		linenr;
!     long		ins_len;
!     long		pre_textlen = 0;
!     long		pre_indent = 0;
      char_u		*firstline;
      char_u		*ins_text, *newp, *oldp;
      struct block_def	bd;
***************
*** 2579,2585 ****
  						    || gchar_cursor() == NUL))
  	    coladvance_force(getviscol());
  # endif
! 	pre_textlen = (long)STRLEN(ml_get(oap->start.lnum));
  	bd.textcol = curwin->w_cursor.col;
      }
  #endif
--- 2581,2589 ----
  						    || gchar_cursor() == NUL))
  	    coladvance_force(getviscol());
  # endif
! 	firstline = ml_get(oap->start.lnum);
! 	pre_textlen = (long)STRLEN(firstline);
! 	pre_indent = (long)(skipwhite(firstline) - firstline);
  	bd.textcol = curwin->w_cursor.col;
      }
  #endif
***************
*** 2598,2610 ****
       */
      if (oap->block_mode && oap->start.lnum != oap->end.lnum)
      {
  	firstline = ml_get(oap->start.lnum);
! 	/*
! 	 * Subsequent calls to ml_get() flush the firstline data - take a
! 	 * copy of the required bit.
! 	 */
! 	if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
  	{
  	    if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
  	    {
  		vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
--- 2602,2623 ----
       */
      if (oap->block_mode && oap->start.lnum != oap->end.lnum)
      {
+ 	/* Auto-indenting may have changed the indent.  If the cursor was past
+ 	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > pre_indent)
! 	{
! 	    long new_indent = (long)(skipwhite(firstline) - firstline);
! 
! 	    pre_textlen += new_indent - pre_indent;
! 	    bd.textcol += new_indent - pre_indent;
! 	}
! 
! 	ins_len = (long)STRLEN(firstline) - pre_textlen;
! 	if (ins_len > 0)
  	{
+ 	    /* Subsequent calls to ml_get() flush the firstline data - take a
+ 	     * copy of the inserted text.  */
  	    if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
  	    {
  		vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
*** ../vim-7.1.106/src/version.c	Thu Sep 13 22:04:30 2007
--- src/version.c	Thu Sep 13 22:38:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     107,
  /**/

-- 
Windows
M!uqoms

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:24 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:24 -0400
Subject: devel/vim 7.1.108,NONE,1.1
Message-ID: <200709241413.l8OEDOv4000741@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Added Files:
	7.1.108 
Log Message:
- patchlevel 108


--- NEW FILE 7.1.108 ---
To: vim-dev at vim.org
Subject: patch 7.1.108
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.108 (after 7.1.100)
Problem:    Win32: Compilation problems in Cscope code. (Jeff Lanzarotta)
Solution:   Use (long) instead of (intptr_t) when it's not defined.
Files:	    src/if_cscope.c


*** ../vim-7.1.107/src/if_cscope.c	Thu Sep  6 17:38:06 2007
--- src/if_cscope.c	Wed Sep 12 20:32:17 2007
***************
*** 726,731 ****
--- 726,740 ----
      HANDLE	stdin_rd, stdout_rd;
      HANDLE	stdout_wr, stdin_wr;
      BOOL	created;
+ # ifdef __BORLANDC__
+ #  define OPEN_OH_ARGTYPE long
+ # else
+ #  if (_MSC_VER >= 1300)
+ #   define OPEN_OH_ARGTYPE intptr_t
+ #  else
+ #   define OPEN_OH_ARGTYPE long
+ #  endif
+ # endif
  #endif
  
  #if defined(UNIX)
***************
*** 909,918 ****
      CloseHandle(pi.hThread);
  
      /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
--- 918,929 ----
      CloseHandle(pi.hThread);
  
      /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr,
! 						      _O_TEXT|_O_APPEND)) < 0)
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd,
! 						      _O_TEXT|_O_RDONLY)) < 0)
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
*** ../vim-7.1.107/src/version.c	Thu Sep 13 22:40:47 2007
--- src/version.c	Fri Sep 14 19:55:12 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     108,
  /**/

-- 
Q:   How many hardware engineers does it take to change a lightbulb?
A:   None.  We'll fix it in software.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:30 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:30 -0400
Subject: devel/vim 7.1.109,NONE,1.1
Message-ID: <200709241413.l8OEDUGV000764@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv757

Added Files:
	7.1.109 
Log Message:
- patchlevel 109


--- NEW FILE 7.1.109 ---
To: vim-dev at vim.org
Subject: patch 7.1.109
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.109
Problem:    GTK: when there are many tab pages, clicking on the arrow left of
	    the labels moves to the next tab page on the right. (Simeon Bird)
Solution:   Check the X coordinate of the click and pass -1 as value for the
	    left arrow.
Files:	    src/gui_gtk_x11.c, src/term.c


*** ../vim-7.1.108/src/gui_gtk_x11.c	Wed Sep  5 21:45:54 2007
--- src/gui_gtk_x11.c	Fri Sep 14 20:59:55 2007
***************
*** 3223,3230 ****
  	{
  	    if (clicked_page == 0)
  	    {
! 		/* Click after all tabs moves to next tab page. */
! 		if (send_tabline_event(0) && gtk_main_level() > 0)
  		    gtk_main_quit();
  	    }
  #ifndef HAVE_GTK2
--- 3223,3231 ----
  	{
  	    if (clicked_page == 0)
  	    {
! 		/* Click after all tabs moves to next tab page.  When "x" is
! 		 * small guess it's the left button. */
! 		if (send_tabline_event(x < 50 ? -1 : 0) && gtk_main_level() > 0)
  		    gtk_main_quit();
  	    }
  #ifndef HAVE_GTK2
*** ../vim-7.1.108/src/term.c	Thu May 10 20:48:32 2007
--- src/term.c	Fri Sep 14 20:56:40 2007
***************
*** 4809,4814 ****
--- 4809,4816 ----
  	    if (num_bytes == -1)
  		return -1;
  	    current_tab = (int)bytes[0];
+ 	    if (current_tab == 255)	/* -1 in a byte gives 255 */
+ 		current_tab = -1;
  	    slen += num_bytes;
  	}
  	else if (key_name[0] == (int)KS_TABMENU)
*** ../vim-7.1.108/src/version.c	Fri Sep 14 19:56:18 2007
--- src/version.c	Sat Sep 15 14:05:25 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     109,
  /**/

-- 
No letters of the alphabet were harmed in the creation of this message.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:36 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:36 -0400
Subject: devel/vim 7.1.110,NONE,1.1
Message-ID: <200709241413.l8OEDaJk000787@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv780

Added Files:
	7.1.110 
Log Message:
- patchlevel 110


--- NEW FILE 7.1.110 ---
To: vim-dev at vim.org
Subject: patch 7.1.110
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.110 (after 7.1.102)
Problem:    Win32: Still compilation problems with Perl.
Solution:   Change the #ifdefs. (Suresh Govindachar)
Files:	    src/if_perl.xs


*** ../vim-7.1.109/src/if_perl.xs	Thu Sep 13 15:19:32 2007
--- src/if_perl.xs	Fri Sep 14 21:23:38 2007
***************
*** 48,60 ****
   * The changes include addition of two symbols (Perl_sv_2iv_flags,
   * Perl_newXS_flags) not present in earlier releases.
   *
!  * Jan Dubois suggested the following guarding scheme:
   */
! #if (ACTIVEPERL_VERSION >= 822)
! # define PERL589_OR_LATER
! #endif
! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
! # define PERL589_OR_LATER
  #endif
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
  # define PERL589_OR_LATER
--- 48,62 ----
   * The changes include addition of two symbols (Perl_sv_2iv_flags,
   * Perl_newXS_flags) not present in earlier releases.
   *
!  * Jan Dubois suggested the following guarding scheme.
!  *
!  * Active State defined ACTIVEPERL_VERSION as a string in versions before
!  * 5.8.8; and so the comparison to 822 below needs to be guarded.
   */
! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 8)
! # if (ACTIVEPERL_VERSION >= 822) || (PERL_SUBVERSION >= 9)
! #  define PERL589_OR_LATER
! # endif
  #endif
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
  # define PERL589_OR_LATER
*** ../vim-7.1.109/src/version.c	Sat Sep 15 14:06:41 2007
--- src/version.c	Sat Sep 15 14:48:05 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     110,
  /**/

-- 
"It's so simple to be wise.  Just think of something stupid to say
and then don't say it."        -- Sam Levenson

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:42 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:42 -0400
Subject: devel/vim 7.1.111,NONE,1.1
Message-ID: <200709241413.l8OEDg9E000810@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803

Added Files:
	7.1.111 
Log Message:
- patchlevel 111


--- NEW FILE 7.1.111 ---
To: vim-dev at vim.org
Subject: patch 7.1.111
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.111
Problem:    When using ":vimgrep" with the "j" flag folds from another buffer
	    may be displayed. (A.Politz)
Solution:   When not jumping to another buffer update the folds.
Files:	    src/quickfix.c


*** ../vim-7.1.110/src/quickfix.c	Thu Jun 28 21:23:52 2007
--- src/quickfix.c	Fri Sep 14 22:16:23 2007
***************
*** 1612,1619 ****
  	}
  
  	/*
! 	 * If there is only one window and is the quickfix window, create a new
! 	 * one above the quickfix window.
  	 */
  	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
  	{
--- 1612,1619 ----
  	}
  
  	/*
! 	 * If there is only one window and it is the quickfix window, create a
! 	 * new one above the quickfix window.
  	 */
  	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
  	{
***************
*** 2981,2986 ****
--- 2981,2987 ----
      buf_T	*buf;
      int		duplicate_name = FALSE;
      int		using_dummy;
+     int		redraw_for_dummy = FALSE;
      int		found_match;
      buf_T	*first_match_buf = NULL;
      time_t	seconds = 0;
***************
*** 3097,3102 ****
--- 3098,3104 ----
  	    /* Remember that a buffer with this name already exists. */
  	    duplicate_name = (buf != NULL);
  	    using_dummy = TRUE;
+ 	    redraw_for_dummy = TRUE;
  
  #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
  	    /* Don't do Filetype autocommands to avoid loading syntax and
***************
*** 3243,3252 ****
--- 3245,3272 ----
      if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
      {
  	if ((flags & VGR_NOJUMP) == 0)
+ 	{
+ 	    buf = curbuf;
  	    qf_jump(qi, 0, 0, eap->forceit);
+ 	    if (buf != curbuf)
+ 		/* If we jumped to another buffer redrawing will already be
+ 		 * taken care of. */
+ 		redraw_for_dummy = FALSE;
+ 	}
      }
      else
  	EMSG2(_(e_nomatch2), s);
+ 
+     /* If we loaded a dummy buffer into the current window, the autocommands
+      * may have messed up things, need to redraw and recompute folds. */
+     if (redraw_for_dummy)
+     {
+ #ifdef FEAT_FOLDING
+ 	foldUpdateAll(curwin);
+ #else
+ 	redraw_later(NOT_VALID);
+ #endif
+     }
  
  theend:
      vim_free(regmatch.regprog);
*** ../vim-7.1.110/src/version.c	Sat Sep 15 14:48:57 2007
--- src/version.c	Sun Sep 16 13:23:48 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     111,
  /**/

-- 
Trees moving back and forth is what makes the wind blow.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:49 -0400
Subject: devel/vim 7.1.112,NONE,1.1
Message-ID: <200709241413.l8OEDnRp000833@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv826

Added Files:
	7.1.112 
Log Message:
- patchlevel 112


--- NEW FILE 7.1.112 ---
To: vim-dev at vim.org
Subject: patch 7.1.112
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.112
Problem:    Using input() with a wrong argument may crash Vim. (A.Politz)
Solution:   Init the input() return value to NULL.
Files:	    src/eval.c


*** ../vim-7.1.111/src/eval.c	Thu Sep 13 20:39:58 2007
--- src/eval.c	Sat Sep 15 19:04:51 2007
***************
*** 11565,11578 ****
      char_u	*xp_arg = NULL;
  
      rettv->v_type = VAR_STRING;
  
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
-     {
- 	rettv->vval.v_string = NULL;
  	return;
-     }
  #endif
  
      cmd_silent = FALSE;		/* Want to see the prompt. */
--- 11566,11577 ----
      char_u	*xp_arg = NULL;
  
      rettv->v_type = VAR_STRING;
+     rettv->vval.v_string = NULL;
  
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
  	return;
  #endif
  
      cmd_silent = FALSE;		/* Want to see the prompt. */
*** ../vim-7.1.111/src/version.c	Sun Sep 16 13:26:56 2007
--- src/version.c	Sun Sep 16 14:19:04 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     112,
  /**/

-- 
The early bird gets the worm. If you want something else for
breakfast, get up later.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:55 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:55 -0400
Subject: devel/vim 7.1.113,NONE,1.1
Message-ID: <200709241413.l8OEDtdP000865@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv849

Added Files:
	7.1.113 
Log Message:
- patchlevel 113


--- NEW FILE 7.1.113 ---
To: vim-dev at vim.org
Subject: patch 7.1.113
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.113
Problem:    Using map() to go over an empty list causes memory to be freed
	    twice. (A.Politz)
Solution:   Don't clear the typeval in restore_vimvar().
Files:	    src/eval.c


*** ../vim-7.1.112/src/eval.c	Sun Sep 16 14:20:18 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 1318,1324 ****
  {
      hashitem_T	*hi;
  
-     clear_tv(&vimvars[idx].vv_tv);
      vimvars[idx].vv_tv = *save_tv;
      if (vimvars[idx].vv_type == VAR_UNKNOWN)
      {
--- 1318,1323 ----
***************
*** 1362,1368 ****
  
      if (p_verbose == 0)
  	--emsg_off;
-     vimvars[VV_VAL].vv_str = NULL;
      restore_vimvar(VV_VAL, &save_val);
  
      return list;
--- 1361,1366 ----
***************
*** 9387,9401 ****
  {
      typval_T	rettv;
      char_u	*s;
  
      copy_tv(tv, &vimvars[VV_VAL].vv_tv);
      s = expr;
      if (eval1(&s, &rettv, TRUE) == FAIL)
! 	return FAIL;
      if (*s != NUL)  /* check for trailing chars after expr */
      {
  	EMSG2(_(e_invexpr2), s);
! 	return FAIL;
      }
      if (map)
      {
--- 9386,9401 ----
  {
      typval_T	rettv;
      char_u	*s;
+     int		retval = FAIL;
  
      copy_tv(tv, &vimvars[VV_VAL].vv_tv);
      s = expr;
      if (eval1(&s, &rettv, TRUE) == FAIL)
! 	goto theend;
      if (*s != NUL)  /* check for trailing chars after expr */
      {
  	EMSG2(_(e_invexpr2), s);
! 	goto theend;
      }
      if (map)
      {
***************
*** 9414,9423 ****
  	/* On type error, nothing has been removed; return FAIL to stop the
  	 * loop.  The error message was given by get_tv_number_chk(). */
  	if (error)
! 	    return FAIL;
      }
      clear_tv(&vimvars[VV_VAL].vv_tv);
!     return OK;
  }
  
  /*
--- 9414,9425 ----
  	/* On type error, nothing has been removed; return FAIL to stop the
  	 * loop.  The error message was given by get_tv_number_chk(). */
  	if (error)
! 	    goto theend;
      }
+     retval = OK;
+ theend:
      clear_tv(&vimvars[VV_VAL].vv_tv);
!     return retval;
  }
  
  /*
*** ../vim-7.1.112/src/version.c	Sun Sep 16 14:20:18 2007
--- src/version.c	Mon Sep 17 21:33:52 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     113,
  /**/

-- 
Mental Floss prevents moral decay!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:03 -0400
Subject: devel/vim 7.1.114,NONE,1.1
Message-ID: <200709241414.l8OEE30I000890@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv881

Added Files:
	7.1.114 
Log Message:
- patchlevel 114


--- NEW FILE 7.1.114 ---
To: vim-dev at vim.org
Subject: patch 7.1.114
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.114
Problem:    Memory leak in getmatches().
Solution:   Don't increment the refcount twice.
Files:	    src/eval.c


*** ../vim-7.1.113/src/eval.c	Mon Sep 17 21:37:09 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 10351,10357 ****
  	    dict = dict_alloc();
  	    if (dict == NULL)
  		return;
- 	    ++dict->dv_refcount;
  	    dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id));
  	    dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
  	    dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
--- 10355,10360 ----
*** ../vim-7.1.113/src/version.c	Mon Sep 17 21:37:09 2007
--- src/version.c	Mon Sep 17 21:54:08 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     114,
  /**/

-- 
Be nice to your kids...  they'll be the ones choosing your nursing home.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:08 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:08 -0400
Subject: devel/vim 7.1.115,NONE,1.1
Message-ID: <200709241414.l8OEE8Vg000913@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Added Files:
	7.1.115 
Log Message:
- patchlevel 115


--- NEW FILE 7.1.115 ---
To: vim-dev at vim.org
Subject: patch 7.1.115
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.115 (after 7.1.105)
Problem:    Compiler warning for uninitialized variable. (Tony Mechelynck)
Solution:   Init variable to NULL.
Files:	    src/eval.c


*** ../vim-7.1.114/src/eval.c	Mon Sep 17 21:55:02 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 6704,6710 ****
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
!     char_u	*key;
      dictitem_T	*item;
      char_u	*start = skipwhite(*arg + 1);
      char_u	buf[NUMBUFLEN];
--- 6705,6711 ----
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
!     char_u	*key = NULL;
      dictitem_T	*item;
      char_u	*start = skipwhite(*arg + 1);
      char_u	buf[NUMBUFLEN];
*** ../vim-7.1.114/src/version.c	Mon Sep 17 21:55:02 2007
--- src/version.c	Mon Sep 17 22:18:42 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     115,
  /**/

-- 
Proofread carefully to see if you any words out.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:17 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:17 -0400
Subject: devel/vim 7.1.116,NONE,1.1
Message-ID: <200709241414.l8OEEHON000940@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv929

Added Files:
	7.1.116 
Log Message:
- patchlevel 116


--- NEW FILE 7.1.116 ---
To: vim-dev at vim.org
Subject: patch 7.1.116
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.116
Problem:    Cannot display Unicode characters above 0x10000.
Solution:   Remove the replacement with a question mark when UNICODE16 is not
	    defined. (partly by Nicolas Weber)
Files:	    src/screen.c


*** ../vim-7.1.115/src/screen.c	Thu Aug 30 13:51:52 2007
--- src/screen.c	Mon Sep 10 22:29:42 2007
***************
*** 2305,2313 ****
--- 2305,2315 ----
  			prev_c = u8c;
  #endif
  		    /* Non-BMP character: display as ? or fullwidth ?. */
+ #ifdef UNICODE16
  		    if (u8c >= 0x10000)
  			ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?';
  		    else
+ #endif
  			ScreenLinesUC[idx] = u8c;
  		    for (i = 0; i < Screen_mco; ++i)
  		    {
***************
*** 3678,3690 ****
  		    if ((mb_l == 1 && c >= 0x80)
  			    || (mb_l >= 1 && mb_c == 0)
  			    || (mb_l > 1 && (!vim_isprintc(mb_c)
! 							 || mb_c >= 0x10000)))
  		    {
  			/*
  			 * Illegal UTF-8 byte: display as <xx>.
  			 * Non-BMP character : display as ? or fullwidth ?.
  			 */
  			if (mb_c < 0x10000)
  			{
  			    transchar_hex(extra, mb_c);
  # ifdef FEAT_RIGHTLEFT
--- 3680,3697 ----
  		    if ((mb_l == 1 && c >= 0x80)
  			    || (mb_l >= 1 && mb_c == 0)
  			    || (mb_l > 1 && (!vim_isprintc(mb_c)
! # ifdef UNICODE16
! 							 || mb_c >= 0x10000
! # endif
! 							 )))
  		    {
  			/*
  			 * Illegal UTF-8 byte: display as <xx>.
  			 * Non-BMP character : display as ? or fullwidth ?.
  			 */
+ # ifdef UNICODE16
  			if (mb_c < 0x10000)
+ # endif
  			{
  			    transchar_hex(extra, mb_c);
  # ifdef FEAT_RIGHTLEFT
***************
*** 3692,3702 ****
--- 3699,3711 ----
  				rl_mirror(extra);
  # endif
  			}
+ # ifdef UNICODE16
  			else if (utf_char2cells(mb_c) != 2)
  			    STRCPY(extra, "?");
  			else
  			    /* 0xff1f in UTF-8: full-width '?' */
  			    STRCPY(extra, "\357\274\237");
+ # endif
  
  			p_extra = extra;
  			c = *p_extra;
***************
*** 6245,6250 ****
--- 6254,6260 ----
  		else
  		    u8c = utfc_ptr2char(ptr, u8cc);
  		mbyte_cells = utf_char2cells(u8c);
+ # ifdef UNICODE16
  		/* Non-BMP character: display as ? or fullwidth ?. */
  		if (u8c >= 0x10000)
  		{
***************
*** 6252,6257 ****
--- 6262,6268 ----
  		    if (attr == 0)
  			attr = hl_attr(HLF_8);
  		}
+ # endif
  # ifdef FEAT_ARABIC
  		if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c))
  		{
*** ../vim-7.1.116/src/version.c	Mon Sep 17 22:19:43 2007
--- src/version.c	Mon Sep 17 22:37:31 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     116,
  /**/

-- 
There can't be a crisis today, my schedule is already full.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:18:54 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:18:54 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241418.l8OEIsuE008960@app3.fedora.phx.redhat.com>

Package calcurse in Fedora devel is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:19:01 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 10:19:01 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.70,
	1.71 selinux-policy.spec, 1.531, 1.532
Message-ID: <200709241419.l8OEJ1bb001063@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1040

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
- Eliminate rpm_t:fifo_file avcs
- Fix dbus path for helper app


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- policy-20070703.patch	24 Sep 2007 12:42:07 -0000	1.70
+++ policy-20070703.patch	24 Sep 2007 14:18:57 -0000	1.71
@@ -835,8 +835,33 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.0.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/rpm.if	2007-09-17 16:20:18.000000000 -0400
-@@ -210,6 +210,24 @@
++++ serefpolicy-3.0.8/policy/modules/admin/rpm.if	2007-09-24 09:34:18.000000000 -0400
+@@ -152,6 +152,24 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit read and write an unnamed RPM pipe.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_dontaudit_rw_pipes',`
++	gen_require(`
++		type rpm_t;
++	')
++
++	dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Send and receive messages from
+ ##	rpm over dbus.
+ ## </summary>
+@@ -210,6 +228,24 @@
  
  ########################################
  ## <summary>
@@ -861,7 +886,7 @@
  ##	Create, read, write, and delete RPM
  ##	script temporary files.
  ## </summary>
-@@ -224,8 +242,29 @@
+@@ -224,8 +260,29 @@
  		type rpm_script_tmp_t;
  	')
  
@@ -892,7 +917,7 @@
  ')
  
  ########################################
-@@ -289,3 +328,84 @@
+@@ -289,3 +346,84 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -2306,7 +2331,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-21 14:41:45.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-24 09:59:57.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2340,7 +2365,7 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
-@@ -259,3 +265,8 @@
+@@ -259,3 +265,9 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -2348,7 +2373,8 @@
 +/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
-+/lib(64)?/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
++/lib/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
++/lib64/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in	2007-09-17 16:20:18.000000000 -0400
@@ -10991,8 +11017,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-22 07:07:39.000000000 -0400
-@@ -211,6 +211,13 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 09:49:24.000000000 -0400
+@@ -211,6 +211,20 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -11003,10 +11029,17 @@
 +	   term_dontaudit_use_all_user_ttys($1)
 +	   term_dontaudit_use_all_user_ptys($1)
 +	 ')
++	optional_policy(`
++		tunable_policy(`allow_daemons_use_tty',`
++		   unconfined_use_terminals($1)
++		', `
++		   unconfined_dontaudit_use_terminals($1)
++		')
++	')
  ')
  
  ########################################
-@@ -540,18 +547,19 @@
+@@ -540,18 +554,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -11030,23 +11063,26 @@
  	')
  ')
  
-@@ -567,18 +575,46 @@
+@@ -567,18 +582,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
 -		type initrc_t, initrc_exec_t;
 +		type initrc_t;
 +		attribute initscript;
-+	')
-+
-+	files_list_etc($1)
+ 	')
+ 
+ 	files_list_etc($1)
+-	domtrans_pattern($1,initrc_exec_t,initrc_t)
 +	domtrans_pattern($1,initscript,initrc_t)
-+
-+	ifdef(`enable_mcs',`
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
 +		range_transition $1 initscript:process s0;
-+	')
-+
-+	ifdef(`enable_mls',`
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 initscript:process s0 - mls_systemhigh;
 +	')
 +')
@@ -11064,24 +11100,21 @@
 +interface(`init_script_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
- 	')
- 
- 	files_list_etc($1)
--	domtrans_pattern($1,initrc_exec_t,initrc_t)
++	')
++
++	files_list_etc($1)
 +	domtrans_pattern($1,$2,initrc_t)
- 
- 	ifdef(`enable_mcs',`
--		range_transition $1 initrc_exec_t:process s0;
++
++	ifdef(`enable_mcs',`
 +		range_transition $1 $2:process s0;
- 	')
- 
- 	ifdef(`enable_mls',`
--		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++	')
++
++	ifdef(`enable_mls',`
 +		range_transition $1 $2:process s0 - mls_systemhigh;
  	')
  ')
  
-@@ -609,11 +645,11 @@
+@@ -609,11 +652,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -11095,7 +11128,7 @@
  ')
  
  ########################################
-@@ -684,11 +720,11 @@
+@@ -684,11 +727,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -11109,7 +11142,7 @@
  ')
  
  ########################################
-@@ -703,11 +739,11 @@
+@@ -703,11 +746,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -11123,7 +11156,7 @@
  ')
  
  ########################################
-@@ -931,6 +967,7 @@
+@@ -931,6 +974,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -11131,7 +11164,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1067,11 @@
+@@ -1030,11 +1074,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -11145,7 +11178,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1289,7 @@
+@@ -1252,7 +1296,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -11154,7 +11187,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1310,64 @@
+@@ -1273,3 +1317,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11221,7 +11254,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-22 07:06:37.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-24 09:50:18.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -11316,7 +11349,7 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -497,6 +515,43 @@
+@@ -497,6 +515,47 @@
  ')
  
  optional_policy(`
@@ -11342,17 +11375,21 @@
 +	files_dump_core(daemon)
 +')
 +
++tunable_policy(`allow_daemons_use_tty',`
++	term_use_all_user_ttys(daemon)
++	term_use_all_user_ptys(daemon)
++', `
++	term_dontaudit_use_all_user_ttys(daemon)
++	term_dontaudit_use_all_user_ptys(daemon)
++')
++
 +optional_policy(`
 +	unconfined_dontaudit_rw_pipes(daemon)
 +
 +	tunable_policy(`allow_daemons_use_tty',`
 +		unconfined_use_terminals(daemon)
-+		term_use_all_user_ttys(daemon)
-+		term_use_all_user_ptys(daemon)
 + 	', `
 +		unconfined_dontaudit_use_terminals(daemon)
-+		term_dontaudit_use_all_user_ttys(daemon)
-+		term_dontaudit_use_all_user_ptys(daemon)
 + 	')
 +')
 + 
@@ -11360,7 +11397,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -632,12 +687,6 @@
+@@ -632,12 +691,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -11373,7 +11410,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -703,6 +752,9 @@
+@@ -703,6 +756,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -11383,6 +11420,17 @@
  ')
  
  optional_policy(`
+@@ -750,6 +806,10 @@
+ ')
+ 
+ optional_policy(`
++	rpm_dontaudit_rw_pipes(daemon)
++')
++
++optional_policy(`
+ 	vmware_read_system_config(initrc_t)
+ 	vmware_append_system_config(initrc_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.8/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-17 16:20:18.000000000 -0400
@@ -12803,7 +12851,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 11:55:54.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-24 09:36:36.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12933,7 +12981,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  corecmd_exec_bin(run_init_t)
-@@ -423,77 +426,53 @@
+@@ -423,77 +426,54 @@
  	nscd_socket_use(run_init_t)
  ')	
  
@@ -13035,12 +13083,13 @@
 +
 +optional_policy(`
 +	rpm_dontaudit_rw_tmp_files(semanage_t)
++	rpm_dontaudit_rw_pipes(semanage_t)
 +')
 +
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -521,6 +500,8 @@
+@@ -521,6 +501,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -13049,7 +13098,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -537,6 +518,7 @@
+@@ -537,6 +519,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -13057,8 +13106,14 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -592,6 +574,10 @@
+@@ -590,8 +573,16 @@
+ 	fs_relabel_tmpfs_chr_file(setfiles_t)
+ ')
  
++optional_policy(`
++	rpm_dontaudit_rw_pipes(setfiles_t)
++')
++
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
 +		ppp_dontaudit_use_fds(setfiles_t)
@@ -13068,6 +13123,18 @@
  		udev_dontaudit_rw_dgram_sockets(setfiles_t)
  	')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.0.8/policy/modules/system/sysnetwork.fc
+--- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2007-05-29 14:10:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/sysnetwork.fc	2007-09-24 08:54:25.000000000 -0400
+@@ -54,7 +54,7 @@
+ 
+ /var/run/dhclient.*\.pid --	gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+ /var/run/dhclient.*\.leases --	gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+-
++/var/run/dhclient-[^/]*\.lease -- gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+ ifdef(`distro_gentoo',`
+ /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.8/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/sysnetwork.if	2007-09-17 16:20:18.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- selinux-policy.spec	22 Sep 2007 12:15:13 -0000	1.531
+++ selinux-policy.spec	24 Sep 2007 14:18:57 -0000	1.532
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
+- Eliminate rpm_t:fifo_file avcs
+- Fix dbus path for helper app
+
 * Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
 - Fix service start stop terminal avc's
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:18:58 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:18:58 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241418.l8OEIwbY008998@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 4 is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:19:02 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:19:02 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241419.l8OEJ2lk009021@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 5 is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:22:36 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:22:36 -0400
Subject: rpms/taglib/devel taglib.spec,1.18,1.19
Message-ID: <200709241422.l8OEMa5m001305@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1256

Modified Files:
	taglib.spec 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
- rebuild



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- taglib.spec	24 Sep 2007 14:10:15 -0000	1.18
+++ taglib.spec	24 Sep 2007 14:22:03 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.2.%{svn}svn%{?dist}
+Release:    0.3.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
+- rebuild
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
 - BR: automake
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:34:15 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 24 Sep 2007 10:34:15 -0400
Subject: rpms/ntp/devel ntp-4.2.4p2-noif.patch, NONE, 1.1 ntp.spec, 1.72,
	1.73 filter-requires-ntp.sh, 1.1, NONE
Message-ID: <200709241434.l8OEYF6C001746@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p2-noif.patch 
Removed Files:
	filter-requires-ntp.sh 
Log Message:
- require perl (#274771)
- don't fail when starting with no interfaces (#300371)


ntp-4.2.4p2-noif.patch:

--- NEW FILE ntp-4.2.4p2-noif.patch ---
diff -up ntp-4.2.4p2/libisc/ifiter_sysctl.c.noif ntp-4.2.4p2/libisc/ifiter_sysctl.c
--- ntp-4.2.4p2/libisc/ifiter_sysctl.c.noif	2006-06-06 22:16:23.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_sysctl.c	2007-09-24 16:08:55.000000000 +0200
@@ -309,7 +309,10 @@ internal_destroy(isc_interfaceiter_t *it
 	 */
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 	iter->pos = 0;
+	if (iter->pos >= iter->bufused)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }
diff -up ntp-4.2.4p2/libisc/ifiter_ioctl.c.noif ntp-4.2.4p2/libisc/ifiter_ioctl.c
--- ntp-4.2.4p2/libisc/ifiter_ioctl.c.noif	2007-09-24 16:08:55.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_ioctl.c	2007-09-24 16:08:55.000000000 +0200
@@ -1098,8 +1098,8 @@ internal_destroy(isc_interfaceiter_t *it
 #endif
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 #ifdef HAVE_TRUCLUSTER
 	int clua_result;
 #endif
@@ -1118,5 +1118,10 @@ void internal_first(isc_interfaceiter_t 
 #endif
 #ifdef __linux
 	linux_if_inet6_first(iter);
+	if (iter->valid == ISC_R_SUCCESS)
+		return (iter->valid);
 #endif
+	if (iter->pos >= (unsigned int) iter->ifc.ifc_len)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }
diff -up ntp-4.2.4p2/libisc/interfaceiter.c.noif ntp-4.2.4p2/libisc/interfaceiter.c
--- ntp-4.2.4p2/libisc/interfaceiter.c.noif	2006-06-06 22:16:24.000000000 +0200
+++ ntp-4.2.4p2/libisc/interfaceiter.c	2007-09-24 16:08:55.000000000 +0200
@@ -170,14 +170,11 @@ isc_interfaceiter_first(isc_interfaceite
 
 	REQUIRE(VALID_IFITER(iter));
 
-	internal_first(iter);
-	for (;;) {
+	for (result = internal_first(iter); result == ISC_R_SUCCESS;
+			result = internal_next(iter)) {
 		result = internal_current(iter);
 		if (result != ISC_R_IGNORE)
 			break;
-		result = internal_next(iter);
-		if (result != ISC_R_SUCCESS)
-			break;
 	}
 	iter->result = result;
 	return (result);
diff -up ntp-4.2.4p2/libisc/ifiter_getifaddrs.c.noif ntp-4.2.4p2/libisc/ifiter_getifaddrs.c
--- ntp-4.2.4p2/libisc/ifiter_getifaddrs.c.noif	2006-06-06 22:16:22.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_getifaddrs.c	2007-09-24 16:08:55.000000000 +0200
@@ -185,7 +185,10 @@ internal_destroy(isc_interfaceiter_t *it
 	iter->ifaddrs = NULL;
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 	iter->pos = iter->ifaddrs;
+	if (iter->pos == NULL)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ntp.spec	21 Aug 2007 13:39:44 -0000	1.72
+++ ntp.spec	24 Sep 2007 14:33:43 -0000	1.73
@@ -1,9 +1,7 @@
-%define _use_internal_dependency_generator 0
-
 Summary: Synchronizes system time using the Network Time Protocol (NTP)
 Name: ntp
 Version: 4.2.4p2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # include/ntif.h : BSD
@@ -28,10 +26,6 @@
 Source6: ntp.step-tickers
 Source8: ntp.cryptopw
 
-# new find-requires
-Source7: filter-requires-ntp.sh
-%define __find_requires %{SOURCE7}
-
 Patch2: ntp-4.2.4p0-droproot.patch
 Patch3: ntp-4.2.4-groups.patch
 Patch4: ntp-4.1.1c-rc3-authkey.patch
@@ -50,6 +44,7 @@
 Patch17: ntp-4.2.4p0-sleep.patch
 Patch18: ntp-4.2.4p0-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
+Patch20: ntp-4.2.4p2-noif.patch
 
 URL: http://www.ntp.org
 Requires(pre): shadow-utils 
@@ -93,6 +88,7 @@
 %patch17 -p1 -b .sleep
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
+%patch20 -p1 -b .noif
 
 %ifarch ia64
 %patch5 -p1 -b .linkfastmath
@@ -214,6 +210,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-6
+- require perl (#274771)
+- don't fail when starting with no interfaces (#300371)
+
 * Tue Aug 21 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-5
 - avoid use of uninitialized floating-point values in clock_select
 - update license tag (Tom "spot" Callaway)


--- filter-requires-ntp.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:37:59 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 10:37:59 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.692, 1.693 kernel.spec, 1.179, 1.180 sources, 1.654,
	1.655 upstream, 1.576, 1.577 patch-2.6.23-rc7-git4.bz2.sign, 1.1, NONE
Message-ID: <200709241437.l8OEbxEh002350@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2263

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7-git5.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git4.bz2.sign 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7-git5



--- NEW FILE patch-2.6.23-rc7-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG92FmyGugalF9Dw4RAsV0AKCKkIHT1eMQBGl8GM8OkNOjx1ds2wCfZkte
fXWIyvfgrpK3ZGjYoXo2tLc=
=wt6q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- .cvsignore	24 Sep 2007 02:26:20 -0000	1.692
+++ .cvsignore	24 Sep 2007 14:37:26 -0000	1.693
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git4.bz2
+patch-2.6.23-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- kernel.spec	24 Sep 2007 02:26:20 -0000	1.179
+++ kernel.spec	24 Sep 2007 14:37:26 -0000	1.180
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7-git5
+
 * Sun Sep 23 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -r1.654 -r1.655
--- sources	24 Sep 2007 02:26:20 -0000	1.654
+++ sources	24 Sep 2007 14:37:26 -0000	1.655
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-37ff766bfc5834bc33b84b5164debe79  patch-2.6.23-rc7-git4.bz2
+b9a6cb6a35b2ae0a25c357c59e7cdfc8  patch-2.6.23-rc7-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- upstream	24 Sep 2007 02:26:20 -0000	1.576
+++ upstream	24 Sep 2007 14:37:26 -0000	1.577
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git4.bz2
+patch-2.6.23-rc7-git5.bz2


--- patch-2.6.23-rc7-git4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:39:30 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Mon, 24 Sep 2007 10:39:30 -0400
Subject: rpms/gsoap/devel gsoap.spec,1.1,1.2
Message-ID: <200709241439.l8OEdUPC002490@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2405

Modified Files:
	gsoap.spec 
Log Message:
Moved pkgconfig requirement to -devel package


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsoap.spec	22 Sep 2007 13:18:22 -0000	1.1
+++ gsoap.spec	24 Sep 2007 14:38:58 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.7.9
-Release: 0.1.k
+Release: 0.2.k
 License: GPLv2
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
@@ -12,14 +12,11 @@
 Patch3: http://grid.et.redhat.com/files/tru64_hp_ux_c-2.7.9k.patch
 #Patch4: http://grid.et.redhat.com/files/anonymous_server_and_client-2.7.9k.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: dos2unix
 BuildRequires: findutils
 
-Requires: pkgconfig
-
 
 %description
 The gSOAP Web services development toolkit offers an XML to C/C++
@@ -31,6 +28,7 @@
 Summary: Devel libraries and headers for linking with gSOAP generated stubs
 Group: Development/System
 Requires: %name = %version-%release
+Requires: pkgconfig
 
 
 %description devel
@@ -175,6 +173,9 @@
 
 
 %changelog
+* Mon Sep 24 2007  <matt at robin.local> - 2.7.9-0.2.k
+- Moved pkgconfig requirement to -devel package
+
 * Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k
 - Initial release
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:40:47 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Mon, 24 Sep 2007 10:40:47 -0400
Subject: rpms/gsoap/devel gsoap.spec,1.2,1.3
Message-ID: <200709241440.l8OEeluY002609@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2560

Modified Files:
	gsoap.spec 
Log Message:
Fixed name in changelog


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gsoap.spec	24 Sep 2007 14:38:58 -0000	1.2
+++ gsoap.spec	24 Sep 2007 14:40:15 -0000	1.3
@@ -173,7 +173,7 @@
 
 
 %changelog
-* Mon Sep 24 2007  <matt at robin.local> - 2.7.9-0.2.k
+* Mon Sep 24 2007  <mfarrellee at redhat> - 2.7.9-0.2.k
 - Moved pkgconfig requirement to -devel package
 
 * Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k



From fedora-extras-commits at redhat.com  Mon Sep 24 14:45:27 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 10:45:27 -0400
Subject: rpms/vnc/devel vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.179,
	1.180 vnc-s390.patch, 1.5, NONE
Message-ID: <200709241445.l8OEjRcT003137@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- obsoleted vnc-s390.patch
- build with --disable-xorg


vnc-noxorg.patch:

--- NEW FILE vnc-noxorg.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- vnc.spec	22 Aug 2007 11:49:06 -0000	1.179
+++ vnc.spec	24 Sep 2007 14:44:55 -0000	1.180
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   21%{?dist}
+Release:   22%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -22,7 +22,6 @@
 Patch9:    vnc-vncpasswd.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
-Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
@@ -37,6 +36,7 @@
 Patch33:   vnc-always_use_fb.patch
 Patch34:   vnc-vsnprintf.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -98,9 +98,6 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
-pushd unix/xorg-x11-server-source*
-%patch14 -p3 -b .s390
-popd
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
@@ -115,6 +112,7 @@
 %patch33 -p1 -b .always_use_fb
 %patch34 -p1 -b .vsnprintf
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .nomodule
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -142,7 +140,8 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --enable-xvfb \
+%configure --disable-xorg \
+	--disable-xnest --enable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -153,7 +152,7 @@
 	--enable-xcsecurity \
 	--with-default-font-path="unix/:7100,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
-        --with-os-name="Fedora Core 7" \
+        --with-os-name="Fedora Core 8" \
         --with-os-vendor="Red Hat, Inc." \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
         --with-rgb-path=%{_datadir}/X11/rgb \
@@ -313,9 +312,13 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-22
+- obsoleted vnc-s390.patch
+- build with --disable-xorg
+
 * Wed Aug 22 2007 Adam Tkac <atkac redhat com> 4.1.2-21
 - rebuild (BuildID feature)
-- GPLv2 livense
+- GPLv2 license
 
 * Mon Aug 06 2007 Adam Tkac <atkac redhat com> 4.1.2-20.2
 - updated vnc-s390 patch to latest xorg


--- vnc-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:46:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:46:19 -0400
Subject: devel/vim README.patches,1.83,1.84 vim.spec,1.175,1.176
Message-ID: <200709241446.l8OEkJ6J003230@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 100


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- README.patches	7 Sep 2007 14:05:05 -0000	1.83
+++ README.patches	24 Sep 2007 14:45:47 -0000	1.84
@@ -22,6 +22,11 @@
 
 Checksums for the patch files can be found in the file MD5.
 
+Collection of patches for Vim 7.1:
+  SIZE  NAME                  INCLUDES
+ 91424  7.1.001-100.gz	      patches 7.1.001 to 7.1.100, gzip'ed
+
+
 Individual patches for Vim 7.1:
 
   SIZE  NAME     FIXES
@@ -124,3 +129,19 @@
   1780  7.1.098  ":call s:var()" doesn't work if "s:var" is a Funcref
   4552  7.1.099  ":mkvimrc" doesn't work properly when 'paste' or 'keymap' set
  14551  7.1.100  Win32: Executing cscope doesn't always work properly
+  1614  7.1.101  Ruby: The Buffer.line= method does not work
+  3276  7.1.102  Perl interface doesn't compile with new version of Perl
+  1976  7.1.103  "dw" past end of last line deletes a character
+ 14346  7.1.104  (after 7.1.095) when 'lazyredraw' set redraw may be postponed
+  2426  7.1.105  internal error when using "0 ? {'a': 1} : {}"
+  1580  7.1.106  ":messages" doesn't quit listing on ":"
+  4081  7.1.107  Visual block mode "s" that auto-indents fails in other lines
+  2633  7.1.108  (after 7.1.100) Win32: compilation problems in Cscope code
+  2147  7.1.109  GTK GUI: click on arrow left of tab 
+  2234  7.1.110  (after 7.1.102) Win32: Still compilation problems with Perl
+  2946  7.1.111  after ":vimgrep /pat/j *" folds can be wrong
+  1766  7.1.112  using input() with a wrong argument may crash Vim
+  2765  7.1.113  map() on an empty list causes memory to be freed twice
+  1386  7.1.114  memory leak in getmatches()
+  1472  7.1.115  (after 7.1.105) compiler warning for uninitialized variable
+  3137  7.1.116  can't display characters above 0x10000


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vim.spec	7 Sep 2007 14:05:05 -0000	1.175
+++ vim.spec	24 Sep 2007 14:45:47 -0000	1.176
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 100
+%define patchlevel 116
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -158,6 +158,24 @@
 Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
 # Win32:
 #Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100
+Patch101: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.101
+Patch102: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.102
+Patch103: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.103
+Patch104: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.104
+Patch105: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.105
+Patch106: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.106
+Patch107: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.107
+# Win32:
+#Patch108: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.108
+Patch109: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.109
+# Win32:
+#Patch110: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.110
+Patch111: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.111
+Patch112: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.112
+Patch113: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.113
+Patch114: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.114
+Patch115: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.115
+Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -400,6 +418,24 @@
 %patch099 -p0 
 # Win32:
 #patch100 -p0 
+%patch101 -p0 
+%patch102 -p0 
+%patch103 -p0 
+%patch104 -p0 
+%patch105 -p0 
+%patch106 -p0 
+%patch107 -p0 
+# Win32:
+#patch108 -p0 
+%patch109 -p0 
+# Win32:
+#patch110 -p0 
+%patch111 -p0 
+%patch112 -p0 
+%patch113 -p0 
+%patch114 -p0 
+%patch115 -p0 
+%patch116 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -785,6 +821,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.%{nil}116-1
+- patchlevel 116
+
 * Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1
 - patchlevel 100
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:56:56 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 10:56:56 -0400
Subject: rpms/vnc/F-7 vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.175,
	1.176 vnc-s390.patch, 1.4, NONE
Message-ID: <200709241456.l8OEuuVv005221@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5166

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- build with --disable-xorg (#271141)


vnc-noxorg.patch:

--- NEW FILE vnc-noxorg.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vnc.spec	11 Jun 2007 13:36:32 -0000	1.175
+++ vnc.spec	24 Sep 2007 14:56:23 -0000	1.176
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18%{?dist}
+Release:   18.1.%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -22,7 +22,6 @@
 Patch9:    vnc-vncpasswd.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
-Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
@@ -38,6 +37,7 @@
 Patch34:   vnc-vsnprintf.patch
 Patch35:   vnc-module_crash.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -99,9 +99,6 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
-pushd unix/xorg-x11-server-source*
-%patch14 -p3 -b .s390
-popd
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
@@ -117,6 +114,7 @@
 %patch34 -p1 -b .vsnprintf
 %patch35 -p1 -b .module_crash
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .noxorg
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -144,7 +142,7 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --disable-xvfb \
+%configure --disable-xorg --disable-xnest --disable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -315,6 +313,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-18.1
+- build with --disable-xorg (#271141)
+
 * Mon Jun 11 2007 Adam Tkac <atkac redhat com> 4.1.2-18.fc7
 - Xvnc now has 24bit support (#242277) and correct RENDER initialization
 - updated s390 patch to latest Xorg


--- vnc-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:57:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 24 Sep 2007 10:57:17 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.59,1.60 alsa.rules,1.1,1.2
Message-ID: <200709241457.l8OEvHIS005235@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5196

Modified Files:
	alsa-utils.spec alsa.rules 
Log Message:
fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- alsa-utils.spec	20 Sep 2007 15:09:25 -0000	1.59
+++ alsa-utils.spec	24 Sep 2007 14:56:44 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.15
-Release: 	0.2%{?prever_dot}%{?dist}
+Release: 	0.3%{?prever_dot}%{?dist}
 License: 	GPLv2+
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -72,11 +72,14 @@
 %{_datadir}/alsa/
 %{_datadir}/sounds/
 %{_mandir}/man?/*
-/var/lib/alsa
+%dir /var/lib/alsa
 %ghost /var/lib/alsa/asound.state
 
 
 %changelog
+* Mon Sep 24 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.3.rc1
+- fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules
+
 * Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
 - Update License field.
 - Mark udev rule as config.


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa.rules	13 Jul 2005 19:03:02 -0000	1.1
+++ alsa.rules	24 Sep 2007 14:56:44 -0000	1.2
@@ -1,2 +1,2 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"		
\ No newline at end of file
+SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/bin/salsa"
+SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/bin/salsa"
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Sep 24 15:05:54 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 11:05:54 -0400
Subject: rpms/vnc/F-7 vnc.spec,1.176,1.177
Message-ID: <200709241505.l8OF5sXk011706@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11595

Modified Files:
	vnc.spec 
Log Message:
- corrected release



Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- vnc.spec	24 Sep 2007 14:56:23 -0000	1.176
+++ vnc.spec	24 Sep 2007 15:05:21 -0000	1.177
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18.1.%{?dist}
+Release:   18.1%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:07:20 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 24 Sep 2007 11:07:20 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.60,1.61 alsa.rules,1.2,1.3
Message-ID: <200709241507.l8OF7KIu011804@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724

Modified Files:
	alsa-utils.spec alsa.rules 
Log Message:
moved salsa back to /sbin


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- alsa-utils.spec	24 Sep 2007 14:56:44 -0000	1.60
+++ alsa-utils.spec	24 Sep 2007 15:06:48 -0000	1.61
@@ -48,7 +48,8 @@
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -p -m 755 salsa alsacard alsaunmute %{buildroot}/bin/
+install -p -m 755 alsacard alsaunmute %{buildroot}/bin/
+install -p -m 755 salsa %{buildroot}/sbin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa.rules	24 Sep 2007 14:56:44 -0000	1.2
+++ alsa.rules	24 Sep 2007 15:06:48 -0000	1.3
@@ -1,2 +1,2 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/bin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/bin/salsa"
\ No newline at end of file
+SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
+SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Sep 24 15:07:43 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Mon, 24 Sep 2007 11:07:43 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.43,1.44
Message-ID: <200709241507.l8OF7hCu011874@cvs-int.fedora.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11748

Modified Files:
	OpenIPMI.spec 
Log Message:
- Added missing popt-devel buildrequires



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- OpenIPMI.spec	17 Aug 2007 15:42:26 -0000	1.43
+++ OpenIPMI.spec	24 Sep 2007 15:07:09 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildPrereq: openssl-devel python-devel readline-devel
+BuildPrereq: openssl-devel python-devel readline-devel popt-devel
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
@@ -163,6 +163,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-2
+- Added missing popt-devel buildrequires
+
 * Fri Aug 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-2
 - Fix rebuild problems due to glibc change
 - License review and fixes



From fedora-extras-commits at redhat.com  Mon Sep 24 15:15:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:15:35 -0400
Subject: rpms/gambas/devel gambas.spec,1.27,1.28
Message-ID: <200709241515.l8OFFZDV012283@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12156

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
- Rebuild for new sqlite.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gambas.spec	24 Aug 2007 14:24:15 -0000	1.27
+++ gambas.spec	24 Sep 2007 15:15:03 -0000	1.28
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.19
-Release: 	1%{?dist}.2
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -423,6 +423,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+- Rebuild for new sqlite.
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.19-1.2
 - ppc64 is a 64bit arch
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:17:05 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 11:17:05 -0400
Subject: rpms/struts/devel struts.spec,1.48,1.49
Message-ID: <200709241517.l8OFH5ch012577@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12281

Modified Files:
	struts.spec 
Log Message:

- Exclude webapp classes from native compilation (issues with 
  check-build-root, where only .jar.so is excluded from checking 
  for $RPM_BUILD_ROOT in file content)




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- struts.spec	20 Sep 2007 22:20:32 -0000	1.48
+++ struts.spec	24 Sep 2007 15:16:32 -0000	1.49
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.7%{?dist}
+Release:	4jpp.8%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -693,7 +693,7 @@
 %endif
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+%{_bindir}/aot-compile-rpm --exclude %{tomcat5appsdir}/struts-example/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-examples/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-tiles-documentation/WEB-INF/classes
 %endif
 
 %clean
@@ -968,9 +968,6 @@
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-example_classes*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-examples_classes*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-tiles-documentation_classes*
 %endif
 
 %if %{without_coreonly}
@@ -1061,6 +1058,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.8
+- Exclude webapp classes from native compilation (issues with check-build-root)
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.7
 - Rebuild for ppc32 execmem issue and new build-id
 - Add %%{?dist} as per new policy



From fedora-extras-commits at redhat.com  Mon Sep 24 15:18:27 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 24 Sep 2007 11:18:27 -0400
Subject: rpms/system-config-network/devel system-config-network.spec, 1.30, 
	1.31
Message-ID: <200709241518.l8OFIRZH012987@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12750

Modified Files:
	system-config-network.spec 
Log Message:
* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1-2
- require newt-python instead of newt only



Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-network.spec	24 Sep 2007 09:30:09 -0000	1.30
+++ system-config-network.spec	24 Sep 2007 15:17:55 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -24,7 +24,7 @@
 Group: Applications/System 
 Obsoletes: netcfg, redhat-config-network-tui, netconfig
 Provides: redhat-config-network-tui
-Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt, pciutils
+Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils
 
 %description tui
 This is the network configuration tool,
@@ -96,6 +96,9 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1-2
+- require newt-python instead of newt only
+
 * Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:20:00 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:20:00 -0400
Subject: rpms/Miro/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241520.l8OFK0UD013198@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13150

Modified Files:
	.cvsignore sources 
Log Message:
Actually upload the source tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jul 2007 20:54:36 -0000	1.1
+++ .cvsignore	24 Sep 2007 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+Miro-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jul 2007 20:54:36 -0000	1.1
+++ sources	24 Sep 2007 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+ab32d49da9396aa4d596953f5575394b  Miro-0.9.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:20:02 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Mon, 24 Sep 2007 11:20:02 -0400
Subject: rpms/dovecot/F-7 .cvsignore, 1.28, 1.29 dovecot.spec, 1.80,
	1.81 sources, 1.29, 1.30
Message-ID: <200709241520.l8OFK25w013208@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13159

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Mon Sep 24 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.5-15
- update to latest upstream (1.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	7 Aug 2007 09:20:46 -0000	1.28
+++ .cvsignore	24 Sep 2007 15:19:29 -0000	1.29
@@ -1,4 +1,4 @@
-dovecot-1.0.3.tar.gz
-dovecot-1.0.3.tar.gz.sig
+dovecot-1.0.5.tar.gz
+dovecot-1.0.5.tar.gz.sig
 dovecot-sieve-1.0.2.tar.gz
 dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/dovecot.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- dovecot.spec	13 Aug 2007 11:03:28 -0000	1.80
+++ dovecot.spec	24 Sep 2007 15:19:29 -0000	1.81
@@ -1,7 +1,7 @@
-%define upstream 1.0.3
+%define upstream 1.0.5
 %define sieve_upstream 1.0.2
-%define pkg_version 1.0.3
-%define my_release 14
+%define pkg_version 1.0.5
+%define my_release 15
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.2
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -297,6 +297,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.5-15
+- update to latest upstream (1.0.5)
+
 * Mon Aug 06 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.3-14
 - update to latest upstream (1.0.3 and sieve 1.0.2)
 - added the quota-warning patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	7 Aug 2007 09:20:46 -0000	1.29
+++ sources	24 Sep 2007 15:19:29 -0000	1.30
@@ -1,4 +1,4 @@
-1d7cc3c4964789554553e7e4ea3f82b4  dovecot-1.0.3.tar.gz
-7aeb01b6cee5388a1864e425ad04fa30  dovecot-1.0.3.tar.gz.sig
+94b7d29cf44f63f89d538361afa05c40  dovecot-1.0.5.tar.gz
+eacaec9e3502e9e0544e73846c3e9a09  dovecot-1.0.5.tar.gz.sig
 508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
 fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep 24 15:24:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 11:24:00 -0400
Subject: rpms/wdfs/devel wdfs.spec,1.3,1.4
Message-ID: <200709241524.l8OFO0bv013359@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/wdfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323

Modified Files:
	wdfs.spec 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.4.2-4
- Fix spelling error in URL. (#302731)



Index: wdfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdfs/devel/wdfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wdfs.spec	23 Aug 2007 09:20:45 -0000	1.3
+++ wdfs.spec	24 Sep 2007 15:23:27 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           wdfs
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WebDAV File System
 
 Group:          System Environment/Base
 License:        GPL
-URL:            http://noedler.de/projeckte/wdfs/
+URL:            http://noedler.de/projekte/wdfs/
 Source0:        http://noedler.de/projekte/wdfs/wdfs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,6 +39,9 @@
 %{_bindir}/wdfs
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.4.2-4
+- Fix spelling error in URL. (#302731)
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 1.4.2-3
 - rebuild for neon 0.27
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:29:24 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:29:24 -0400
Subject: rpms/Miro/devel dbus.patch,NONE,1.1
Message-ID: <200709241529.l8OFTOuQ013764@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13753

Added Files:
	dbus.patch 
Log Message:
This seems to have been lost on the devel/ branch for some reason.


dbus.patch:

--- NEW FILE dbus.patch ---
--- platform/gtk-x11/onetime.py	2007-07-17 21:32:42.000000000 +0200
+++ platform/gtk-x11/onetime.py.new	2007-07-22 20:16:17.000000000 +0200
@@ -109,7 +109,8 @@
     def __init__(self):
         bus = dbus.SessionBus()
         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
-        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
+        dbus.service.Object.__init__(self, bus_name=bus_name, 
+object_path='/org/participatoryculture/dtv/OneTime')
 
     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
     def HandleArgs (self, args):



From fedora-extras-commits at redhat.com  Mon Sep 24 15:29:25 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 11:29:25 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.6, 1.7 ocaml-libvirt.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200709241529.l8OFTPG4013778@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13717/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Mon Sep 24 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.8-1
- New upstream release 0.3.2.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Sep 2007 10:30:27 -0000	1.6
+++ .cvsignore	24 Sep 2007 15:28:53 -0000	1.7
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.7.tar.gz
+ocaml-libvirt-0.3.2.8.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-libvirt.spec	20 Sep 2007 10:30:27 -0000	1.6
+++ ocaml-libvirt.spec	24 Sep 2007 15:28:53 -0000	1.7
@@ -8,7 +8,7 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.7
+Version:        0.3.2.8
 Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.8-1
+- New upstream release 0.3.2.8.
+
 * Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
 - New upstream release 0.3.2.7.
 - Ship the upstream ChangeLog file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Sep 2007 10:30:27 -0000	1.6
+++ sources	24 Sep 2007 15:28:53 -0000	1.7
@@ -1 +1 @@
-0124c74d23767dc3b4dffefaae9995e9  ocaml-libvirt-0.3.2.7.tar.gz
+b7468deedef3a8d5f50ffbbc14ffb5c6  ocaml-libvirt-0.3.2.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:42:13 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 11:42:13 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.128,
	1.129 libselinux.spec, 1.286, 1.287
Message-ID: <200709241542.l8OFgDLe014321@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14298

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- libselinux-rhat.patch	18 Sep 2007 20:44:47 -0000	1.128
+++ libselinux-rhat.patch	24 Sep 2007 15:42:11 -0000	1.129
@@ -1,6 +1,19 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-2.0.34/src/avc_internal.c
+--- nsalibselinux/src/avc_internal.c	2007-07-16 14:20:46.000000000 -0400
++++ libselinux-2.0.34/src/avc_internal.c	2007-09-24 11:37:47.000000000 -0400
+@@ -61,7 +61,8 @@
+ 		rc = fd;
+ 		goto out;
+ 	}
+-
++	
++	fcntl(fd, F_SETFD, FD_CLOEXEC);
+ 	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
+ 		close(fd);
+ 		rc = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
-+++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 15:45:42.000000000 -0400
++++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -18,9 +31,9 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.33/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.34/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
-+++ libselinux-2.0.33/utils/matchpathcon.c	2007-09-18 15:50:31.000000000 -0400
++++ libselinux-2.0.34/utils/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
 @@ -17,10 +17,24 @@
  	exit(1);
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- libselinux.spec	18 Sep 2007 20:44:47 -0000	1.286
+++ libselinux.spec	24 Sep 2007 15:42:11 -0000	1.287
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,9 @@
 
 %changelog
 
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-2
+- Remove leaked file descriptor
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-1
 - Upgrade to latest from NSA
 	* Fix selabel option flag setting for 64-bit from Stephen Smalley.



From fedora-extras-commits at redhat.com  Mon Sep 24 15:49:49 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 11:49:49 -0400
Subject: devel/kvm kvm-bootmenu.patch,NONE,1.1 kvm.spec,1.23,1.24
Message-ID: <200709241549.l8OFnn4i014632@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	kvm.spec 
Added Files:
	kvm-bootmenu.patch 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
- add support for selecting boot device at runtime


kvm-bootmenu.patch:

--- NEW FILE kvm-bootmenu.patch ---
diff --git a/bios/BIOS-bochs-latest b/bios/BIOS-bochs-latest
index c10ae62..e13af69 100644
Binary files a/bios/BIOS-bochs-latest and b/bios/BIOS-bochs-latest differ
diff --git a/bios/BIOS-bochs-legacy b/bios/BIOS-bochs-legacy
index 131e62b..5c03460 100644
Binary files a/bios/BIOS-bochs-legacy and b/bios/BIOS-bochs-legacy differ
diff --git a/bios/rombios.c b/bios/rombios.c
index ac918ad..4ebdb71 100644
--- a/bios/rombios.c
+++ b/bios/rombios.c
@@ -1950,6 +1950,228 @@ print_cdromboot_failure( code )
   return;
 }
 
+#define WAIT_HZ 18
+/**
+ * Check for keystroke.
+ * @returns    True if keystroke available, False if not.
+ */
+Bit8u check_for_keystroke()
+{
+ASM_START
+    mov  ax, #0x100
+    int  #0x16
+    jz   no_key
+    mov  al, #1
+    jmp  done
+no_key:
+    xor  al, al
+done:
+ASM_END
+}
+
+/**
+ * Get keystroke.
+ * @returns    BIOS scan code.
+ */
+Bit8u get_keystroke()
+{
+ASM_START
+    mov  ax, #0x0
+    int  #0x16
+    xchg ah, al
+ASM_END
+}
+
+/**
+ * Waits (sleeps) for the given number of ticks.
+ * Checks for keystroke.
+ *
+ * @returns BIOS scan code if available, 0 if not.
+ * @param   ticks       Number of ticks to sleep.
+ * @param   stop_on_key Whether to stop immediately upon keypress.
+ */
+Bit8u wait(ticks, stop_on_key)
+  Bit16u ticks;
+  Bit8u stop_on_key;
+{
+    long ticks_to_wait, delta;
+    Bit32u prev_ticks, t;
+    Bit8u scan_code = 0;
+
+    /*
+     * The 0:046c wraps around at 'midnight' according to a 18.2Hz clock.
+     * We also have to be careful about interrupt storms.
+     */
+    ticks_to_wait = ticks;
+    prev_ticks = read_dword(0x0, 0x46c);
+    do
+    {
+        t = read_dword(0x0, 0x46c);
+        if (t > prev_ticks)
+        {
+            delta = t - prev_ticks;     /* The temp var is required or bcc screws up. */
+            ticks_to_wait -= delta;
+        }
+        else if (t < prev_ticks)
+            ticks_to_wait -= t;         /* wrapped */
+        prev_ticks = t;
+
+        if (check_for_keystroke())
+        {
+            scan_code = get_keystroke();
+            bios_printf(BIOS_PRINTF_DEBUG, "Key pressed: %x\n", scan_code);
+            if (stop_on_key)
+                return scan_code;
+        }
+    } while (ticks_to_wait > 0);
+    return scan_code;
+}
+
+static void clearscreen() {
+    /* Hide cursor, clear screen and move cursor to starting position */
+ASM_START
+        push bx
+        push cx
+        push dx
+
+        mov  ax, #0x100
+        mov  cx, #0x1000
+        int  #0x10
+
+        mov  ax, #0x700
+        mov  bh, #7
+        xor  cx, cx
+        mov  dx, #0x184f
+        int  #0x10
+
+        mov  ax, #0x200
+        xor  bx, bx
+        xor  dx, dx
+        int  #0x10
+
+        pop  dx
+        pop  cx
+        pop  bx
+ASM_END
+}
+
+int bootmenu(selected)
+  int selected;
+{
+    Bit8u scode;
+    int max;
+
+    /* get the number of boot devices */
+    max = read_word(IPL_SEG, IPL_COUNT_OFFSET);
+
+    for(;;) {
+        clearscreen();
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\n\n\n\n\n\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "          Select boot device\n\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            1. Floppy\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            2. Hard drive\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            3. CD-ROM\n");
+        if (max == 4)
+            bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            4. Network\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\n          Currently selected: %d\n", selected);
+
+        do {
+            scode = wait(WAIT_HZ, 1);
+        } while (scode == 0);
+        switch(scode) {
+        case 0x02:
+        case 0x03:
+        case 0x04:
+            selected = scode - 1;
+            break;
+        case 0x05:
+            if (max == 4)
+                selected = scode -1 ;
+            else
+                scode = 0;
+            break;
+        case 0x48:
+            selected -= 1;
+            if (selected < 1)
+                selected = 1;
+            scode = 0;
+            break;
+        case 0x50:
+            selected += 1;
+            if (selected > max)
+                selected = max;
+            scode = 0;
+            break;
+        case 0x1c:
+            break;
+        default:
+            scode = 0;
+            break;
+        }
+        if (scode != 0)
+            break;
+    }
+
+    switch (selected) {
+    case 1:
+        return 0x3D;
+    case 2:
+        return 0x3E;
+    case 3:
+        return 0x3F;
+    case 4:
+        return 0x58;
+    default:
+        return 0;
+    }
+}
+
+void interactive_bootkey()
+{
+    Bit16u i;
+    Bit8u scan = 0;
+
+    bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\nPress F10 to select boot device.\n");
+    for (i = 3; i > 0; i--)
+    {
+        scan = wait(WAIT_HZ, 0);
+        switch (scan) {
+        case 0x3D:
+        case 0x3E:
+        case 0x3F:
+        case 0x58:
+            break;
+        case 0x44:
+            scan = bootmenu(inb_cmos(0x3d));
+            break;
+        default:
+            scan = 0;
+            break;
+        }
+        if (scan != 0)
+            break;
+    }
+
+    /* set the default based on the keypress or menu */
+    switch(scan) {
+    case 0x3D:
+        outb_cmos(0x3d, 0x01);
+        break;
+    case 0x3E:
+        outb_cmos(0x3d, 0x02);
+        break;
+    case 0x3F:
+        outb_cmos(0x3d, 0x03);
+        break;
+    case 0x58:
+        outb_cmos(0x3d, 0x04);
+        break;
+    default:
+        break;
+    }
+}
+
+
 void
 nmi_handler_msg()
 {
@@ -10226,6 +10448,8 @@ post_default_ints:
   ;;
 #endif // BX_ELTORITO_BOOT
 
+  call _interactive_bootkey
+
   sti        ;; enable interrupts
   int  #0x19
 


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kvm.spec	4 Sep 2007 19:21:46 -0000	1.23
+++ kvm.spec	24 Sep 2007 15:49:17 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -9,12 +9,15 @@
 Source1: kvm.modules
 Patch0: kvm-19-defaults.patch
 Patch1: kvm-35-ldflags.patch
+Patch2: kvm-bootmenu.patch
 # patches from upstream qemu
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
 Patch103: qemu-0.9.0-vnc-authentication.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
+# to build the bios
+BuildRequires: dev86
 # qemu doesn't build with gcc 4.x
 BuildRequires: compat-gcc-34 
 BuildRequires: zlib-devel 
@@ -39,6 +42,7 @@
 %setup -q
 %patch0 -p1 -b .defaults
 %patch1 -p1 -b .ldflags
+%patch2 -p1 
 
 %patch101 -p1
 %patch102 -p0
@@ -55,6 +59,7 @@
 # manual keeping up of what is in the kvm tree.
 sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
+make bios
 make %{?_smp_mflags} 
 
 
@@ -87,6 +92,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
+- add support for selecting boot device at runtime
+
 * Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
 - rebase vnc auth patch
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:56:04 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 11:56:04 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.129,
	1.130 libselinux.spec, 1.287, 1.288
Message-ID: <200709241556.l8OFu4YT015023@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15000

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- libselinux-rhat.patch	24 Sep 2007 15:42:11 -0000	1.129
+++ libselinux-rhat.patch	24 Sep 2007 15:56:01 -0000	1.130
@@ -11,6 +11,22 @@
  	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
  		close(fd);
  		rc = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.34/src/Makefile
+--- nsalibselinux/src/Makefile	2007-08-03 16:02:56.000000000 -0400
++++ libselinux-2.0.34/src/Makefile	2007-09-24 11:51:42.000000000 -0400
+@@ -57,10 +57,10 @@
+ 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
+ 
+ $(LIBSO): $(LOBJS)
+-	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+ 	ln -sf $@ $(TARGET) 
+ 
+ %.o:  %.c policy.h
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
 +++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- libselinux.spec	24 Sep 2007 15:42:11 -0000	1.287
+++ libselinux.spec	24 Sep 2007 15:56:01 -0000	1.288
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.34
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,9 @@
 
 %changelog
 
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-3
+- Add sparc patch to from Dennis Gilmore to build on Sparc platform
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-2
 - Remove leaked file descriptor
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:31 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1WCK001739@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:35 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1apg001796@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:39 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1eQJ011092@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:30 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2UEv011267@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:36 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:36 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2aMW002366@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:38 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:38 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2cDX011305@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:02 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG33mI002532@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:05 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:05 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG354K011514@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:09 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG39ND002579@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:16 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3GSH011574@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:19 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3KQg002636@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:24 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:24 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3O9t011617@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:31 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Vot011658@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:33 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Yl7002764@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:35 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Z4N011685@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:56 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 24 Sep 2007 12:03:56 -0400
Subject: rpms/iptables/devel iptables-1.3.8-limit_man.patch, NONE,
	1.1 iptables-1.3.8-reject_type.patch, NONE,
	1.1 iptables-1.3.8-typo_latter.patch, NONE, 1.1 iptables.init,
	1.15, 1.16 iptables.spec, 1.52, 1.53
Message-ID: <200709241603.l8OG3uIk021499@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21413

Modified Files:
	iptables.init iptables.spec 
Added Files:
	iptables-1.3.8-limit_man.patch 
	iptables-1.3.8-reject_type.patch 
	iptables-1.3.8-typo_latter.patch 
Log Message:
- fixed IPv6 reject type (rhbz#295181)
- fixed init script: start, stop and status
- support netfilter compiled into kernel in init script (rhbz#295611)
- dropped inversion for limit modules from man pages (rhbz#220780)
- fixed typo in ip6tables man page (rhbz#236185)



iptables-1.3.8-limit_man.patch:

--- NEW FILE iptables-1.3.8-limit_man.patch ---
diff -up iptables-1.3.8/iptables.8.in.limit iptables-1.3.8/iptables.8.in
diff -up iptables-1.3.8/extensions/libip6t_limit.man.limit_man iptables-1.3.8/extensions/libip6t_limit.man
--- iptables-1.3.8/extensions/libip6t_limit.man.limit_man	2007-09-24 16:48:22.000000000 +0200
+++ iptables-1.3.8/extensions/libip6t_limit.man	2007-09-24 17:28:29.000000000 +0200
@@ -1,6 +1,6 @@
 This module matches at a limited rate using a token bucket filter.
-A rule using this extension will match until this limit is reached
-(unless the `!' flag is used).  It can be used in combination with the
+A rule using this extension will match until this limit is reached.
+  It can be used in combination with the
 .B LOG
 target to give limited logging, for example.
 .TP
diff -up iptables-1.3.8/extensions/libipt_limit.man.limit_man iptables-1.3.8/extensions/libipt_limit.man
--- iptables-1.3.8/extensions/libipt_limit.man.limit_man	2007-09-24 16:48:22.000000000 +0200
+++ iptables-1.3.8/extensions/libipt_limit.man	2007-09-24 17:28:19.000000000 +0200
@@ -1,6 +1,6 @@
 This module matches at a limited rate using a token bucket filter.
-A rule using this extension will match until this limit is reached
-(unless the `!' flag is used).  It can be used in combination with the
+A rule using this extension will match until this limit is reached.
+  It can be used in combination with the
 .B LOG
 target to give limited logging, for example.
 .TP

iptables-1.3.8-reject_type.patch:

--- NEW FILE iptables-1.3.8-reject_type.patch ---
diff -up iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h.reject_type iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h
--- iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h.reject_type	2007-09-24 16:48:21.000000000 +0200
+++ iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h	2007-09-24 17:20:45.000000000 +0200
@@ -4,13 +4,15 @@
 enum ip6t_reject_with {
 	IP6T_ICMP6_NO_ROUTE,
 	IP6T_ICMP6_ADM_PROHIBITED,
+	IP6T_ICMP6_NOT_NEIGHBOUR,
 	IP6T_ICMP6_ADDR_UNREACH,
 	IP6T_ICMP6_PORT_UNREACH,
+	IP6T_ICMP6_ECHOREPLY,
 	IP6T_TCP_RESET
 };
 
 struct ip6t_reject_info {
-	enum ip6t_reject_with with;      /* reject type */
+	u_int32_t with;      /* reject type */
 };
 
 #endif /*_IP6T_REJECT_H*/

iptables-1.3.8-typo_latter.patch:

--- NEW FILE iptables-1.3.8-typo_latter.patch ---
diff -up iptables-1.3.8/extensions/libip6t_REJECT.man.typo_latter iptables-1.3.8/extensions/libip6t_REJECT.man
--- iptables-1.3.8/extensions/libip6t_REJECT.man.typo_latter	2007-09-24 17:30:47.000000000 +0200
+++ iptables-1.3.8/extensions/libip6t_REJECT.man	2007-09-24 17:34:48.000000000 +0200
@@ -32,5 +32,5 @@ TCP RST packet to be sent back.  This is
 (113/tcp) probes which frequently occur when sending mail to broken mail
 hosts (which won't accept your mail otherwise).
 .B tcp-reset
-can only be used with kernel versions 2.6.14 or latter.
+can only be used with kernel versions 2.6.14 or later.
 


Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- iptables.init	19 Sep 2007 16:30:16 -0000	1.15
+++ iptables.init	24 Sep 2007 16:03:24 -0000	1.16
@@ -48,6 +48,31 @@
 # Load firewall configuration.
 [ -f "$IPTABLES_CONFIG" ] && . "$IPTABLES_CONFIG"
 
+# Netfilter modules
+NF_MODULES=(${IPV}_tables nf_conntrack_${_IPV})
+NF_MODULES_COMMON=(x_tables nf_conntrack) # Used by netfilter v4 and v6
+
+# Are netfilter modules loaded?
+MODULES_LOADED=0
+for mod in ${NF_MODULES[*]} ${NF_MODULES_COMMON[*]}; do
+    $(lsmod | grep -q ^${mod} | awk '{print $1}')
+    if [ $? -eq 0 ]; then
+	MODULES_LOADED=1
+	break
+    fi
+done
+
+# Get active tables
+NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
+
+# Is netfilter compiled into the kernel?
+[ $MODULES_LOADED -eq 0 -a -n "$NF_TABLES" ] && COMPILED_IN=1 || COMPILED_IN=0
+
+# Get status (quicker than status function and honour lock file)
+[ ! -f "$VAR_SUBSYS_IPTABLES" -o ! -e "$PROC_IPTABLES_NAMES" \
+    -o -z "$NF_TABLES" ] && running=0 || running=1
+
+
 rmmod_r() {
     # Unload module with all referring modules.
     # At first all referring modules will be unloaded, then the module itself.
@@ -83,13 +108,12 @@
     [ -e "$PROC_IPTABLES_NAMES" ] || return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
-    [ -z "$tables" ] && return 1
+    [ -z "$NF_TABLES" ] && return 1
 
     echo -n $"Flushing firewall rules: "
     ret=0
     # For all tables
-    for i in $tables; do
+    for i in $NF_TABLES; do
         # Flush firewall rules.
 	$IPTABLES -t $i -F;
 	let ret+=$?;
@@ -116,7 +140,7 @@
     [ ! -e "$PROC_IPTABLES_NAMES" ] && return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
+    tables=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
     [ -z "$tables" ] && return 1
 
     echo -n $"Setting chains to policy $policy: "
@@ -203,14 +227,15 @@
     if [ "x$IPTABLES_MODULES_UNLOAD" = "xyes" ]; then
 	echo -n $"Unloading $IPTABLES modules: "
 	ret=0
-	rmmod_r ${IPV}_tables
-	let ret+=$?;
-	rmmod_r nf_conntrack_${_IPV}
-	let ret+=$?;
+	for mod in ${NF_MODULES[*]}; do
+	    rmmod_r $mod
+	    let ret+=$?;
+	done
 	# try to unload remaining netfilter modules used by ipv4 and ipv6 
 	# netfilter
-	rmmod_r x_tables
-	rmmod_r nf_conntrack
+	for mod in ${NF_MODULES_COMMON[*]}; do
+	    rmmod_r $mod
+	done
 	[ $ret -eq 0 ] && success || failure
 	echo
     fi
@@ -224,8 +249,7 @@
     [ ! -e "$PROC_IPTABLES_NAMES" ] && return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
-    [ -z "$tables" ] && return 1
+    [ -z "$NF_TABLES" ] && return 1
 
     echo -n $"Saving firewall rules to $IPTABLES_DATA: "
 
@@ -257,18 +281,21 @@
 }
 
 status() {
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
+    if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$NF_TABLES" ]; then
+	echo $"Firewall is not running."
+	return 3
+    fi
 
     # Do not print status if lockfile is missing and iptables modules are not 
     # loaded.
     # Check if iptable modules are loaded
-    if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$tables" ]; then
-	echo $"Firewall is stopped."
+    if [ ! -e "$PROC_IPTABLES_NAMES" ]; then
+	echo $"Firewall modules not loaded."
 	return 3
     fi
 
     # Check if firewall is configured (has tables)
-    if [ ! -e "$PROC_IPTABLES_NAMES" -o -z "$tables" ]; then
+    if [ -z "$NF_TABLES" ]; then
 	echo $"Firewall is not configured. "
 	return 3
     fi
@@ -280,7 +307,7 @@
     COUNT=
     [ "x$IPTABLES_STATUS_LINENUMBERS" = "xyes" ] && COUNT="--line-numbers"
 
-    for table in $tables; do
+    for table in $NF_TABLES; do
 	echo $"Table: $table"
 	$IPTABLES -t $table --list $NUM $VERBOSE $COUNT && echo
     done
@@ -294,17 +321,16 @@
     start
 }
 
-status >/dev/null 2>&1
-running=$?
 
 case "$1" in
     start)
-	[ $running -eq 0 ] && exit 0
+	[ $running -eq 1 -a $COMPILED_IN -eq 0 ] && exit 0
 	start
 	RETVAL=$?
 	;;
     stop)
-	[ $running -eq 0 ] || exit 0
+	# stop firewall, even if manually configured
+	[ $running -eq 1 -o $MODULES_LOADED -eq 1 ] || exit 0
 	[ "x$IPTABLES_SAVE_ON_STOP" = "xyes" ] && save
 	stop
 	RETVAL=$?
@@ -314,7 +340,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ $running -eq 0 ] || exit 0
+	[ $running -eq 1 ] || exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- iptables.spec	19 Sep 2007 16:30:16 -0000	1.52
+++ iptables.spec	24 Sep 2007 16:03:24 -0000	1.53
@@ -3,12 +3,15 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Patch0: iptables-1.3.8-iptc.patch
 Patch1: iptables-1.3.8-headers.patch
+Patch2: iptables-1.3.8-reject_type.patch
+Patch3: iptables-1.3.8-limit_man.patch
+Patch4: iptables-1.3.8-typo_latter.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -56,6 +59,9 @@
 %setup -q
 %patch0 -p1 -b .iptc
 %patch1 -p1 -b .headers
+%patch2 -p1 -b .reject_type
+%patch3 -p1 -b .limit_man
+%patch4 -p1 -b .typo_latter
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{_prefix},g" {} \;
@@ -147,6 +153,13 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4
+- fixed IPv6 reject type (rhbz#295181)
+- fixed init script: start, stop and status
+- support netfilter compiled into kernel in init script (rhbz#295611)
+- dropped inversion for limit modules from man pages (rhbz#220780)
+- fixed typo in ip6tables man page (rhbz#236185)
+
 * Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-3
 - do not depend on local_fs in lsb header - this delayes start after network
 - fixed exit code for initscript usage



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:06 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:06 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG47Js011856@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:09 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG4AsD002955@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:11 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG4BrW011888@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:06 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 12:05:06 -0400
Subject: rpms/gambas/devel gambas.spec,1.28,1.29
Message-ID: <200709241605.l8OG56gs021617@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21564

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
- BuildRequire sqlite-devel instead of sqlite2-devel.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gambas.spec	24 Sep 2007 15:15:03 -0000	1.28
+++ gambas.spec	24 Sep 2007 16:04:33 -0000	1.29
@@ -8,7 +8,7 @@
 Source0: 	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kdelibs-devel, automake, autoconf, SDL-devel, SDL_mixer-devel
-BuildRequires:	mysql-devel, postgresql-devel, sqlite2-devel, libX11-devel
+BuildRequires:	mysql-devel, postgresql-devel, sqlite-devel, libX11-devel
 BuildRequires:	desktop-file-utils, gettext-devel, curl-devel, libXext-devel
 BuildRequires:	qt-devel, bzip2-devel, libxslt-devel, libxml2-devel
 Requires(post): desktop-file-utils
@@ -424,6 +424,9 @@
 
 %changelog
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+- BuildRequire sqlite-devel instead of sqlite2-devel.
+
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
 - Rebuild for new sqlite.
 
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.19-1.2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:10 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5BDp003273@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-smart (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:18 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:18 -0700
Subject: [pkgdb] freenx: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5JnO012288@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on freenx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:20 -0700
Subject: [pkgdb] freenx: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5LTq003352@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on freenx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:29 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5TGd012361@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:31 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5Wv4003419@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:37 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5bG5012412@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:45 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5jml003506@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:46 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5l6H012485@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:49 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5oYY012503@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:54 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5tvB003561@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:57 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5vUL012547@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:59 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG60jT003594@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:06 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:06 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6679012597@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:08 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:08 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG69sY003655@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:10 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6ABW012634@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:20 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 12:06:20 -0400
Subject: rpms/gambas/devel gambas.spec,1.29,1.30
Message-ID: <200709241606.l8OG6Kl9021776@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21726

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-3
- BuildRequire sqlite-devel instead of sqlite2-devel.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gambas.spec	24 Sep 2007 16:04:33 -0000	1.29
+++ gambas.spec	24 Sep 2007 16:05:47 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.19
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -423,7 +423,7 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
-* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-3
 - BuildRequire sqlite-devel instead of sqlite2-devel.
 
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:18 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:18 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6IHI012679@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:21 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6LLG003726@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:25 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6P8N003756@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:31 -0700
Subject: [pkgdb] nx: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6WmT003795@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on nx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:32 -0700
Subject: [pkgdb] nx: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6Xug012760@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on nx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:40 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:40 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6fDH003851@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:42 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6gnU012818@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:45 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6jCA003888@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:51 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:51 -0400
Subject: rpms/grhino/F-7 grhino.spec,1.10,1.11
Message-ID: <200709241606.l8OG6pJ2021922@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/F-7

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/F-7/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
+++ grhino.spec	24 Sep 2007 16:06:19 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:54 -0400
Subject: rpms/grhino/FC-6 grhino.spec,1.11,1.12
Message-ID: <200709241606.l8OG6s5Z021928@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/FC-6

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	25 Nov 2006 22:34:25 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:06:22 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:57 -0400
Subject: rpms/grhino/devel grhino.spec,1.10,1.11
Message-ID: <200709241606.l8OG6vpY021931@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/devel

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
+++ grhino.spec	24 Sep 2007 16:06:24 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:49 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6nq2012867@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:54 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6s87012904@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:55 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6u9E003944@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:00 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG70hr003974@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:02 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG72EO012952@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:05 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:05 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG75Yp012971@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:10 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Bp4013044@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:13 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:13 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7DQv004051@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:15 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:15 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Fi5013088@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:22 -0700
Subject: [pkgdb] vtk: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7MfT013130@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtk



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:23 -0700
Subject: [pkgdb] vtk: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7OCQ004096@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtk



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:28 -0700
Subject: [pkgdb] vtkdata: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Twl013168@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtkdata (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtkdata



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:30 -0700
Subject: [pkgdb] vtkdata: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7U71004146@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtkdata (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtkdata



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:50 -0700
Subject: [pkgdb] moreutils was added for deebs
Message-ID: <200709241609.l8OG9ofL013879@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package moreutils with summary Additional unix utilities
Kevin Fenzi (kevin) has approved Package moreutils
Kevin Fenzi (kevin) has added a Fedora devel branch for moreutils with an owner of deebs
Kevin Fenzi (kevin) has approved moreutils in Fedora devel
Kevin Fenzi (kevin) has approved Package moreutils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on moreutils (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on moreutils (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on moreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:56 -0700
Subject: [pkgdb] moreutils (Fedora, 7) updated by kevin
Message-ID: <200709241609.l8OG9uDJ013914@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for moreutils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on moreutils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:56 -0700
Subject: [pkgdb] moreutils (Fedora, devel) updated by kevin
Message-ID: <200709241609.l8OG9vcP013924@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on moreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:04 -0700
Subject: [pkgdb] perl-Time-Duration was added for deebs
Message-ID: <200709241612.l8OGC5KS014667@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Time-Duration with summary rounded or exact English expression of durations
Kevin Fenzi (kevin) has approved Package perl-Time-Duration
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Time-Duration with an owner of deebs
Kevin Fenzi (kevin) has approved perl-Time-Duration in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Time-Duration
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Time-Duration (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Time-Duration (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Time-Duration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:10 -0700
Subject: [pkgdb] perl-Time-Duration (Fedora, 7) updated by kevin
Message-ID: <200709241612.l8OGCAfm014700@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Time-Duration
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Time-Duration (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:10 -0700
Subject: [pkgdb] perl-Time-Duration (Fedora, devel) updated by kevin
Message-ID: <200709241612.l8OGCBqw014710@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Time-Duration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:33 -0400
Subject: rpms/perl-Time-Duration - New directory
Message-ID: <200709241612.l8OGCXPp022485@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration

Log Message:
Directory /cvs/extras/rpms/perl-Time-Duration added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:37 -0400
Subject: rpms/perl-Time-Duration/devel - New directory
Message-ID: <200709241612.l8OGCbxE022496@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration/devel

Log Message:
Directory /cvs/extras/rpms/perl-Time-Duration/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:41 -0400
Subject: rpms/perl-Time-Duration Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241612.l8OGCfbZ022524@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Time-Duration


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Time-Duration
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:43 -0400
Subject: rpms/perl-Time-Duration/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241612.l8OGChsO022540@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Time-Duration


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Time-Duration
# $Id: Makefile,v 1.1 2007/09/24 16:12:42 kevin Exp $
NAME := perl-Time-Duration
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:10:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:14 -0400
Subject: rpms/moreutils - New directory
Message-ID: <200709241610.l8OGAEmx022208@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils

Log Message:
Directory /cvs/extras/rpms/moreutils added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:10:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:20 -0400
Subject: rpms/moreutils/devel - New directory
Message-ID: <200709241610.l8OGAKDL022230@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils/devel

Log Message:
Directory /cvs/extras/rpms/moreutils/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:13:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:13:54 -0700
Subject: [pkgdb] phpTodo was added for deebs
Message-ID: <200709241613.l8OGDtQo015186@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package phpTodo with summary PHP todo list manager
Kevin Fenzi (kevin) has approved Package phpTodo
Kevin Fenzi (kevin) has added a Fedora devel branch for phpTodo with an owner of deebs
Kevin Fenzi (kevin) has approved phpTodo in Fedora devel
Kevin Fenzi (kevin) has approved Package phpTodo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on phpTodo (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on phpTodo (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on phpTodo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:14:03 -0700
Subject: [pkgdb] phpTodo (Fedora, devel) updated by kevin
Message-ID: <200709241614.l8OGE4E9006010@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on phpTodo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:14:03 -0700
Subject: [pkgdb] phpTodo (Fedora, 7) updated by kevin
Message-ID: <200709241614.l8OGE5MX006020@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for phpTodo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on phpTodo (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:10:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:22 -0400
Subject: rpms/moreutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241610.l8OGAMOv022256@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils

Added Files:
	Makefile import.log 
Log Message:
Setup of module moreutils


--- NEW FILE Makefile ---
# Top level Makefile for module moreutils
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:37 -0400
Subject: rpms/phpTodo - New directory
Message-ID: <200709241614.l8OGEbCd022689@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo

Log Message:
Directory /cvs/extras/rpms/phpTodo added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:42 -0400
Subject: rpms/phpTodo/devel - New directory
Message-ID: <200709241614.l8OGEgtl022703@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo/devel

Log Message:
Directory /cvs/extras/rpms/phpTodo/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:45 -0400
Subject: rpms/phpTodo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241614.l8OGEjkp022728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo

Added Files:
	Makefile import.log 
Log Message:
Setup of module phpTodo


--- NEW FILE Makefile ---
# Top level Makefile for module phpTodo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:47 -0400
Subject: rpms/phpTodo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241614.l8OGElWd022744@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module phpTodo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: phpTodo
# $Id: Makefile,v 1.1 2007/09/24 16:14:45 kevin Exp $
NAME := phpTodo
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:10:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:24 -0400
Subject: rpms/moreutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709241610.l8OGAOgl022273@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moreutils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moreutils
# $Id: Makefile,v 1.1 2007/09/24 16:10:22 kevin Exp $
NAME := moreutils
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:17:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:40 -0700
Subject: [pkgdb] opengl-games-utils was added for jwrdegoede
Message-ID: <200709241617.l8OGHeox016254@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package opengl-games-utils with summary Utilities to check proper 3d support before launching 3d games
Kevin Fenzi (kevin) has approved Package opengl-games-utils
Kevin Fenzi (kevin) has added a Fedora devel branch for opengl-games-utils with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved opengl-games-utils in Fedora devel
Kevin Fenzi (kevin) has approved Package opengl-games-utils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on opengl-games-utils (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on opengl-games-utils (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on opengl-games-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:17:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:48 -0700
Subject: [pkgdb] opengl-games-utils (Fedora, devel) updated by kevin
Message-ID: <200709241617.l8OGHnus007077@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on opengl-games-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:17:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:48 -0700
Subject: [pkgdb] opengl-games-utils (Fedora, 7) updated by kevin
Message-ID: <200709241617.l8OGHnj6007088@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for opengl-games-utils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on opengl-games-utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:19 -0400
Subject: rpms/opengl-games-utils - New directory
Message-ID: <200709241618.l8OGIJYU023006@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils

Log Message:
Directory /cvs/extras/rpms/opengl-games-utils added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:22 -0400
Subject: rpms/opengl-games-utils/devel - New directory
Message-ID: <200709241618.l8OGIMBV023023@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils/devel

Log Message:
Directory /cvs/extras/rpms/opengl-games-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:26 -0400
Subject: rpms/opengl-games-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241618.l8OGIQpG023049@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils

Added Files:
	Makefile import.log 
Log Message:
Setup of module opengl-games-utils


--- NEW FILE Makefile ---
# Top level Makefile for module opengl-games-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:27 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:27 -0400
Subject: rpms/quarry/F-7 quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIR8Q023055@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/F-7

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/F-7/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:17:55 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:30 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:30 -0400
Subject: rpms/quarry/FC-6 quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIUje023070@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/FC-6

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 21:24:04 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:17:58 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:30 -0400
Subject: rpms/opengl-games-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241618.l8OGIUxh023074@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module opengl-games-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: opengl-games-utils
# $Id: Makefile,v 1.1 2007/09/24 16:18:28 kevin Exp $
NAME := opengl-games-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:18:33 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:33 -0400
Subject: rpms/quarry/devel quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIXDk023155@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/devel

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:18:00 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:32 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchbugzilla
Message-ID: <200709241619.l8OGJWUh016827@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:40 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:40 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchcommits
Message-ID: <200709241619.l8OGJeua007666@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchcommits acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:45 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:45 -0700
Subject: [pkgdb] octave-forge: alexlan has requested commit
Message-ID: <200709241619.l8OGJjKN016909@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the commit acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:57 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:57 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchbugzilla
Message-ID: <200709241619.l8OGJvac016973@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:58 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:58 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchcommits
Message-ID: <200709241619.l8OGJwef016989@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchcommits acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:59 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:59 -0700
Subject: [pkgdb] octave-forge: alexlan has requested commit
Message-ID: <200709241619.l8OGJxK6017004@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the commit acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:20:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:20:53 -0700
Subject: [pkgdb] qfits was added for sergiopr
Message-ID: <200709241620.l8OGKrId017312@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qfits with summary A stand-alone general purpose FITS library
Kevin Fenzi (kevin) has approved Package qfits
Kevin Fenzi (kevin) has added a Fedora devel branch for qfits with an owner of sergiopr
Kevin Fenzi (kevin) has approved qfits in Fedora devel
Kevin Fenzi (kevin) has approved Package qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, 6) updated by kevin
Message-ID: <200709241621.l8OGL824008112@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, 7) updated by kevin
Message-ID: <200709241621.l8OGL8X4008122@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, devel) updated by kevin
Message-ID: <200709241621.l8OGL9MX008133@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:21 -0400
Subject: rpms/qfits - New directory
Message-ID: <200709241621.l8OGLL4s023361@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits

Log Message:
Directory /cvs/extras/rpms/qfits added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:24 -0400
Subject: rpms/qfits/devel - New directory
Message-ID: <200709241621.l8OGLOth023375@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits/devel

Log Message:
Directory /cvs/extras/rpms/qfits/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:28 -0400
Subject: rpms/qfits Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241621.l8OGLSYu023400@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits

Added Files:
	Makefile import.log 
Log Message:
Setup of module qfits


--- NEW FILE Makefile ---
# Top level Makefile for module qfits
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:31 -0400
Subject: rpms/qfits/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709241621.l8OGLVYB023416@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qfits


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qfits
# $Id: Makefile,v 1.1 2007/09/24 16:21:29 kevin Exp $
NAME := qfits
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:22:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 12:22:08 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.34,
	1.35 policycoreutils-po.patch, 1.24, 1.25 policycoreutils.spec,
	1.450, 1.451
Message-ID: <200709241622.l8OGM8Nw023648@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23590

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
- Fixed spelling mistakes in booleans defs
- Update po


policycoreutils-gui.patch:


policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policycoreutils-po.patch	4 Jun 2007 14:58:22 -0000	1.24
+++ policycoreutils-po.patch	24 Sep 2007 16:22:03 -0000	1.25
@@ -1,3666 +1,306717 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.19/po/bg.po
---- nsapolicycoreutils/po/bg.po	2007-01-19 08:50:13.000000000 -0500
-+++ policycoreutils-2.0.19/po/bg.po	2007-06-04 10:50:48.000000000 -0400
-@@ -1,303 +1,303 @@
--# SOME DESCRIPTIVE TITLE.
-+# translation of policycoreutils.pot to Bulgarian
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
- #
--#, fuzzy
-+# Doncho N. Gunchev <gunchev at gmail.com>, 2007.
- msgid ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.26/po/af.po
+--- nsapolicycoreutils/po/af.po	2007-07-16 14:20:42.000000000 -0400
++++ policycoreutils-2.0.26/po/af.po	2007-09-24 12:16:45.000000000 -0400
+@@ -8,7 +8,7 @@
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: policycoreutils\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-11-21 14:21-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
--"Language-Team: LANGUAGE <LL at li.org>\n"
-+"PO-Revision-Date: 2007-03-31 17:41+0300\n"
-+"Last-Translator: Doncho N. Gunchev <gunchev at gmail.com>\n"
-+"Language-Team: Bulgarian <Bulgarian Translators' Team <dict at fsa-bg.org>>\n"
- "MIME-Version: 1.0\n"
+-"POT-Creation-Date: 2006-11-21 14:21-0500\n"
++"POT-Creation-Date: 2007-09-14 10:36-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -16,1013 +16,3357 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.11.4\n"
  
- #: ../load_policy/load_policy.c:22
- #, c-format
- msgid "usage:  %s [-bq]\n"
--msgstr ""
-+msgstr "????????????????:  %s [-bq]\n"
+-#: ../load_policy/load_policy.c:22
+-#, c-format
+-msgid "usage:  %s [-bq]\n"
++#: ../run_init/run_init.c:67
++msgid ""
++"USAGE: run_init <script> <args ...>\n"
++"  where: <script> is the name of the init script to run,\n"
++"         <args ...> are the arguments to that script."
+ msgstr ""
  
- #: ../load_policy/load_policy.c:66
+-#: ../load_policy/load_policy.c:66
++#: ../run_init/run_init.c:126 ../newrole/newrole.c:1170
  #, c-format
- msgid "%s:  Can't load policy:  %s\n"
--msgstr ""
-+msgstr "%s:  ???? ???????? ???? ???? ???????????? ????????????????:  %s\n"
+-msgid "%s:  Can't load policy:  %s\n"
++msgid "failed to initialize PAM\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:188
+-#: ../newrole/newrole.c:188
++#: ../run_init/run_init.c:139
  #, c-format
- msgid "failed to set PAM_TTY\n"
--msgstr ""
-+msgstr "?????????????????? ?????????????????? ???? PAM_TTY\n"
+-msgid "failed to set PAM_TTY\n"
++msgid "failed to get account information\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:218 ../run_init/run_init.c:162
+-#: ../newrole/newrole.c:218 ../run_init/run_init.c:162
++#: ../run_init/run_init.c:162 ../newrole/newrole.c:334
  msgid "Password:"
--msgstr ""
-+msgstr "????????????:"
+ msgstr ""
  
- #: ../newrole/newrole.c:243 ../run_init/run_init.c:197
+-#: ../newrole/newrole.c:243 ../run_init/run_init.c:197
++#: ../run_init/run_init.c:197 ../newrole/newrole.c:359
  #, c-format
  msgid "Cannot find your entry in the shadow passwd file.\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???? ???????????? ?????????? ?????????? ?????? ?????????? shadow.\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:250 ../run_init/run_init.c:203
+-#: ../newrole/newrole.c:250 ../run_init/run_init.c:203
++#: ../run_init/run_init.c:203 ../newrole/newrole.c:366
  #, c-format
  msgid "getpass cannot open /dev/tty\n"
--msgstr ""
-+msgstr "getpass ???? ???????? ???? ???? ???????????? /dev/tty\n"
- 
- #: ../newrole/newrole.c:316
- #, c-format
- msgid "cannot find valid entry in the passwd file.\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???? ???????????? ?????????????? ?????????? ?????? ?????????? passwd.\n"
- 
- #: ../newrole/newrole.c:327
- #, c-format
- msgid "Out of memory!\n"
--msgstr ""
-+msgstr "?????????????? ????????????!\n"
- 
- #: ../newrole/newrole.c:332
- #, c-format
- msgid "Error!  Shell is not valid.\n"
--msgstr ""
-+msgstr "????????????!  ?????????????????? ???? ?? ??????????????.\n"
- 
- #: ../newrole/newrole.c:389
- #, c-format
- msgid "Unable to clear environment\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???????? ?????????????????? ??????????????\n"
- 
- #: ../newrole/newrole.c:436 ../newrole/newrole.c:513
- #, c-format
- msgid "Error initing capabilities, aborting.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????????????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:444 ../newrole/newrole.c:519
- #, c-format
- msgid "Error setting capabilities, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:450
- #, c-format
- msgid "Error setting KEEPCAPS, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:458 ../newrole/newrole.c:531
- #, c-format
- msgid "Error dropping capabilities, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:464 ../newrole/newrole.c:562
- #, c-format
- msgid "Error changing uid, aborting.\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? uid, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557
- #, c-format
- msgid "Error resetting KEEPCAPS, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:477
- #, c-format
- msgid "Error dropping SETUID capability, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? SETUID ??????????, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:482 ../newrole/newrole.c:536
- #, c-format
- msgid "Error freeing caps\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????????????? ???? ??????????\n"
- 
- #: ../newrole/newrole.c:580
- #, c-format
- msgid "Error connecting to audit system.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????? ?????? ?????????????????? ???? ????????.\n"
- 
- #: ../newrole/newrole.c:586
- #, c-format
- msgid "Error allocating memory.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????? ???? ??????????.\n"
- 
- #: ../newrole/newrole.c:593
- #, c-format
- msgid "Error sending audit message.\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? ???????? ??????????????????.\n"
[...310567 lines suppressed...]
-@@ -951,7 +1021,8 @@
- msgid "File context for %s is defined in policy, cannot be deleted"
- msgstr "Kontext s??boru pre %s je definovan?? v pravidl??ch, nem????e by?? zmazan??"
+-#, python-format
+-msgid "Could not modify file context for %s"
++#: ../gui/system-config-selinux.glade:2776
++msgid "Add Network Port"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1142
+-#, python-format
+-msgid "File context for %s is defined in policy, cannot be deleted"
++#: ../gui/system-config-selinux.glade:2792
++msgid "Edit Network Port"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156
-+#: ../semanage/seobject.py:1152
-+#: ../semanage/seobject.py:1156
- #, python-format
- msgid "Could not delete file context for %s"
- msgstr "Nemo??no zmaza?? kontext s??boru pre %s"
-@@ -961,21 +1032,22 @@
- msgstr "Nemo??no listova?? kontextami s??boru"
+-#, python-format
+-msgid "Could not delete file context for %s"
++#: ../gui/system-config-selinux.glade:2808
++msgid "Delete Network Port"
+ msgstr ""
  
- #: ../semanage/seobject.py:1168
--#, fuzzy
- msgid "Could not list local file contexts"
--msgstr "Nemo??no listova?? kontextami s??boru"
-+msgstr "Nemo??no listova?? kontextami lok??lnych s??borov"
+-#: ../semanage/seobject.py:1164
+-msgid "Could not list file contexts"
++#: ../gui/system-config-selinux.glade:2851
++msgid "Group/ungroup network ports by SELinux type."
+ msgstr ""
  
- #: ../semanage/seobject.py:1203
- msgid "Requires value"
- msgstr "Po??aduje hodnotu"
+-#: ../semanage/seobject.py:1168
+-msgid "Could not list local file contexts"
++#: ../gui/system-config-selinux.glade:2897
++msgid "Group View"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1203
+-msgid "Requires value"
++#: ../gui/system-config-selinux.glade:3035
++msgid "label42"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245
-+#: ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1245
- #: ../semanage/seobject.py:1251
- #, python-format
- msgid "Could not check if boolean %s is defined"
- msgstr "Nemo??no skontrolova?? ??i logick?? hodnota %s je definovan??"
+-#: ../semanage/seobject.py:1251
+-#, python-format
+-msgid "Could not check if boolean %s is defined"
++#: ../gui/system-config-selinux.glade:3072
++msgid "Generate new policy module"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247
-+#: ../semanage/seobject.py:1213
-+#: ../semanage/seobject.py:1247
- #, python-format
- msgid "Boolean %s is not defined"
- msgstr "Logick?? hodnota %s nie je definovan??"
-@@ -985,7 +1057,8 @@
- msgid "Could not query file context %s"
- msgstr "Nemo??no overi?? kontext s??boru %s"
+-#, python-format
+-msgid "Boolean %s is not defined"
++#: ../gui/system-config-selinux.glade:3088
++msgid "Load policy module"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1217
+-#, python-format
+-msgid "Could not query file context %s"
++#: ../gui/system-config-selinux.glade:3104
++msgid "Remove loadable policy module"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233
-+#: ../semanage/seobject.py:1229
-+#: ../semanage/seobject.py:1233
- #, python-format
- msgid "Could not modify boolean %s"
- msgstr "Nemo??no zmeni?? logick?? hodnotu %s"
-@@ -995,7 +1068,8 @@
- msgid "Boolean %s is defined in policy, cannot be deleted"
- msgstr "Logick?? hodnota %s je definovan?? v pravidl??ch, nemo??no ju zmaza??"
+-#, python-format
+-msgid "Could not modify boolean %s"
++#: ../gui/system-config-selinux.glade:3140
++msgid ""
++"Enable additional audit rules, that are normally not reported in the log "
++"files."
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1253
+-#, python-format
+-msgid "Boolean %s is defined in policy, cannot be deleted"
++#: ../gui/system-config-selinux.glade:3141
++msgid "Enable Audit"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265
-+#: ../semanage/seobject.py:1261
-+#: ../semanage/seobject.py:1265
- #, python-format
- msgid "Could not delete boolean %s"
- msgstr "Nemo??no zmaza?? logick?? hodnotu %s"
-@@ -1009,7 +1083,8 @@
- msgid "Generating type enforcment file: %s.te"
- msgstr "Vytv??ranie s??boru vyn??tenia typov: %s.te"
+-#, python-format
+-msgid "Could not delete boolean %s"
++#: ../gui/system-config-selinux.glade:3158
++msgid ""
++"Disable additional audit rules, that are normally not reported in the log "
++"files."
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1273
+-msgid "Could not list booleans"
++#: ../gui/system-config-selinux.glade:3159
++msgid "Disable Audit"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:183
+-#, c-format
+-msgid "Generating type enforcment file: %s.te"
++#: ../gui/system-config-selinux.glade:3277
++msgid "label44"
+ msgstr ""
  
 -#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
-+#: ../audit2allow/audit2allow:189
-+#: ../audit2allow/audit2allow:194
- msgid "Compiling policy"
- msgstr "Zostavujem pravidl??"
+-msgid "Compiling policy"
++#: ../gui/translationsPage.py:53
++msgid "Sensitvity Level"
+ msgstr ""
  
-@@ -1040,3 +1115,4 @@
- #, c-format
- msgid "Options Error: %s "
- msgstr "Chyba volieb: %s"
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.19/po/sv.po
---- nsapolicycoreutils/po/sv.po	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.19/po/sv.po	2007-06-04 10:50:48.000000000 -0400
-@@ -2,7 +2,7 @@
- # Copyright (C) Christian Rose <menthos at menthos.com>, 2006.
- # Copyright (C) Magnus Larsson <fedoratrans at gmail.com>, 2007.
- #
--# $Id$
-+# $Id$
- #
+-#: ../audit2allow/audit2allow:205
++#: ../gui/usersPage.py:55
+ msgid ""
+-"\n"
+-"******************** IMPORTANT ***********************\n"
++"Labeling\n"
++"Prefix"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:206
+-#, c-format
++#: ../gui/usersPage.py:58
  msgid ""
+-"In order to load this newly created policy package into the kernel,\n"
+-"you are required to execute \n"
+-"\n"
+-"semodule -i %s.pp\n"
+-"\n"
++"MLS/\n"
++"MCS Level"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:211
+-#, c-format
+-msgid "Options Error: %s "
++#: ../gui/usersPage.py:162
++#, python-format
++msgid "SELinux user '%s' is required"
  msgstr ""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- policycoreutils.spec	19 Sep 2007 02:29:47 -0000	1.450
+++ policycoreutils.spec	24 Sep 2007 16:22:04 -0000	1.451
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,10 @@
 fi
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
+- Fixed spelling mistakes in booleans defs
+- Update po
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
 - Update to upstream
   * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw summary updated by kevin
Message-ID: <200709241623.l8OGN6Ii017941@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package straw summary to Desktop news aggregator

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw (Fedora, 7) updated by kevin
Message-ID: <200709241623.l8OGN6vt017951@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for straw
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) changed owner of straw in Fedora 7 to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on straw (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw (Fedora, devel) updated by kevin
Message-ID: <200709241623.l8OGN7bt017961@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of straw in Fedora devel to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on straw (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:40 -0700
Subject: [pkgdb] qpxtool was added for drago01
Message-ID: <200709241626.l8OGQexE018985@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qpxtool with summary CD/DVD Quality check tool
Kevin Fenzi (kevin) has approved Package qpxtool
Kevin Fenzi (kevin) has added a Fedora devel branch for qpxtool with an owner of drago01
Kevin Fenzi (kevin) has approved qpxtool in Fedora devel
Kevin Fenzi (kevin) has approved Package qpxtool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qpxtool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qpxtool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qpxtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:47 -0700
Subject: [pkgdb] qpxtool (Fedora, 7) updated by kevin
Message-ID: <200709241626.l8OGQlFn019040@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qpxtool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qpxtool (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:47 -0700
Subject: [pkgdb] qpxtool (Fedora, devel) updated by kevin
Message-ID: <200709241626.l8OGQmaD019050@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qpxtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:32 -0400
Subject: rpms/grhino/F-7 grhino.spec,1.11,1.12
Message-ID: <200709241628.l8OGSWe7026335@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/F-7

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/F-7/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	24 Sep 2007 16:06:19 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:27:56 -0000	1.12
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:34 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:34 -0400
Subject: rpms/grhino/FC-6 grhino.spec,1.12,1.13
Message-ID: <200709241628.l8OGSYWr026338@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/FC-6

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- grhino.spec	24 Sep 2007 16:06:22 -0000	1.12
+++ grhino.spec	24 Sep 2007 16:28:02 -0000	1.13
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:41 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:41 -0400
Subject: rpms/grhino/devel grhino.spec,1.11,1.12
Message-ID: <200709241628.l8OGSfkS026363@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/devel

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	24 Sep 2007 16:06:24 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:28:05 -0000	1.12
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:46 -0400
Subject: rpms/qpxtool - New directory
Message-ID: <200709241628.l8OGSkmt026385@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool

Log Message:
Directory /cvs/extras/rpms/qpxtool added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:49 -0400
Subject: rpms/qpxtool/devel - New directory
Message-ID: <200709241628.l8OGSnfC026399@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool/devel

Log Message:
Directory /cvs/extras/rpms/qpxtool/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:52 -0400
Subject: rpms/qpxtool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241628.l8OGSqsK026424@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool

Added Files:
	Makefile import.log 
Log Message:
Setup of module qpxtool


--- NEW FILE Makefile ---
# Top level Makefile for module qpxtool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:55 -0400
Subject: rpms/qpxtool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241628.l8OGStfi026440@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qpxtool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qpxtool
# $Id: Makefile,v 1.1 2007/09/24 16:28:53 kevin Exp $
NAME := qpxtool
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:32:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:42 -0700
Subject: [pkgdb] fmtools was added for kwizart
Message-ID: <200709241632.l8OGWhbt011628@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package fmtools with summary Simple Video for Linux radio card programs
Kevin Fenzi (kevin) has approved Package fmtools
Kevin Fenzi (kevin) has added a Fedora devel branch for fmtools with an owner of kwizart
Kevin Fenzi (kevin) has approved fmtools in Fedora devel
Kevin Fenzi (kevin) has approved Package fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, 7) updated by kevin
Message-ID: <200709241632.l8OGWuwh020894@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, 6) updated by kevin
Message-ID: <200709241632.l8OGWudO020904@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora EPEL, 5) updated by kevin
Message-ID: <200709241632.l8OGWujM020915@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, devel) updated by kevin
Message-ID: <200709241632.l8OGWuMm020923@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora EPEL, 4) updated by kevin
Message-ID: <200709241632.l8OGWvPf020932@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:35 -0400
Subject: rpms/fmtools - New directory
Message-ID: <200709241633.l8OGXZH3027832@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools

Log Message:
Directory /cvs/extras/rpms/fmtools added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:38 -0400
Subject: rpms/fmtools/devel - New directory
Message-ID: <200709241633.l8OGXcdC027915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools/devel

Log Message:
Directory /cvs/extras/rpms/fmtools/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:40 -0400
Subject: rpms/fmtools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241633.l8OGXenn028013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools

Added Files:
	Makefile import.log 
Log Message:
Setup of module fmtools


--- NEW FILE Makefile ---
# Top level Makefile for module fmtools
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:43 -0400
Subject: rpms/fmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241633.l8OGXh1u028107@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fmtools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fmtools
# $Id: Makefile,v 1.1 2007/09/24 16:33:40 kevin Exp $
NAME := fmtools
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:35:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:37 -0700
Subject: [pkgdb] ladspa-fil-plugins was added for jwrdegoede
Message-ID: <200709241635.l8OGZc8O021758@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-fil-plugins with summary LADSPA Filter plugins
Kevin Fenzi (kevin) has approved Package ladspa-fil-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-fil-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-fil-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-fil-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:35:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:51 -0700
Subject: [pkgdb] ladspa-fil-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241635.l8OGZqjk012537@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-fil-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:35:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:51 -0700
Subject: [pkgdb] ladspa-fil-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241635.l8OGZqU6012552@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-fil-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-fil-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:10 -0400
Subject: rpms/ladspa-fil-plugins - New directory
Message-ID: <200709241636.l8OGaA7O029276@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-fil-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:15 -0400
Subject: rpms/ladspa-fil-plugins/devel - New directory
Message-ID: <200709241636.l8OGaFEo029291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-fil-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:18 -0400
Subject: rpms/ladspa-fil-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241636.l8OGaI0V029321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-fil-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-fil-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:21 -0400
Subject: rpms/ladspa-fil-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241636.l8OGaLAP029338@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-fil-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-fil-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:36:19 kevin Exp $
NAME := ladspa-fil-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:37:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:27 -0700
Subject: [pkgdb] ladspa-mcp-plugins was added for jwrdegoede
Message-ID: <200709241637.l8OGbRpg022293@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-mcp-plugins with summary A set of audio plugins for LADSPA
Kevin Fenzi (kevin) has approved Package ladspa-mcp-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-mcp-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-mcp-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-mcp-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:35 -0700
Subject: [pkgdb] ladspa-mcp-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241637.l8OGbZwM022338@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-mcp-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-mcp-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:35 -0700
Subject: [pkgdb] ladspa-mcp-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241637.l8OGbZ3c022352@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-mcp-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:51 -0400
Subject: rpms/ladspa-mcp-plugins - New directory
Message-ID: <200709241637.l8OGbpwW030253@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-mcp-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:57 -0400
Subject: rpms/ladspa-mcp-plugins/devel - New directory
Message-ID: <200709241637.l8OGbvvF030444@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-mcp-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:59 -0400
Subject: rpms/ladspa-mcp-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241637.l8OGbxuC030538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-mcp-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-mcp-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:38:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:38:03 -0400
Subject: rpms/ladspa-mcp-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241638.l8OGc3K7030652@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-mcp-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-mcp-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:38:00 kevin Exp $
NAME := ladspa-mcp-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:39:10 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Mon, 24 Sep 2007 12:39:10 -0400
Subject: rpms/qpxtool/devel consolehelper.patch, NONE, 1.1 libatafix.patch, 
	NONE, 1.1 manpagefix.patch, NONE,
	1.1 qpxtool-0.6.1-buildfix.patch, NONE, 1.1 qpxtool.desktop,
	NONE, 1.1 qpxtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709241639.l8OGdADr031934@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	consolehelper.patch libatafix.patch manpagefix.patch 
	qpxtool-0.6.1-buildfix.patch qpxtool.desktop qpxtool.spec 
Log Message:

Initial Import-


consolehelper.patch:

--- NEW FILE consolehelper.patch ---
diff -upNr qpxtool-0.6.1.orign/console/pioquiet/Makefile qpxtool-0.6.1/console/pioquiet/Makefile
--- qpxtool-0.6.1.orign/console/pioquiet/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pioquiet/Makefile	2007-09-08 12:49:42.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxcontrol/Makefile qpxtool-0.6.1/console/pxcontrol/Makefile
--- qpxtool-0.6.1.orign/console/pxcontrol/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxcontrol/Makefile	2007-09-08 12:50:00.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxfw/Makefile qpxtool-0.6.1/console/pxfw/Makefile
--- qpxtool-0.6.1.orign/console/pxfw/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxfw/Makefile	2007-09-08 12:50:15.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool qpxtool-0.6.1/consolehelper/console.app/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/console.app/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+USER=root
+PROGRAM=/usr/sbin/qpxtool
+SESSION=true
+
diff -upNr qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool qpxtool-0.6.1/consolehelper/pam.d/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/pam.d/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff -upNr qpxtool-0.6.1.orign/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile
--- qpxtool-0.6.1.orign/qpxtool-gui/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/qpxtool-gui/Makefile	2007-09-08 12:53:00.000000000 +0200
@@ -18,7 +18,7 @@ qproject:
 	LIBPATH+="../lib/lib"
 
 install: Makefile.qmake
-	install -m 4755 qpxtool $(DESTDIR)$(BINDIR)
+	install -m 755 qpxtool $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/qpxtool

libatafix.patch:

--- NEW FILE libatafix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/include/qpx_mmc.h qpxtool-0.6.1/lib/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

manpagefix.patch:

--- NEW FILE manpagefix.patch ---
diff -upNr qpxtool-0.6.1.orign/man/Makefile qpxtool-0.6.1/man/Makefile
--- qpxtool-0.6.1.orign/man/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/man/Makefile	2007-09-09 09:10:36.000000000 +0200
@@ -7,7 +7,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(MAN8DIR)
-	for m in $(MANS8); do install -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
+	for m in $(MANS8); do install -p -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
 
 uninstall:
 	for m in $(MANS8); do rm -f $(DESTDIR)$(LIBDIR)/$$m ; done

qpxtool-0.6.1-buildfix.patch:

--- NEW FILE qpxtool-0.6.1-buildfix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp
--- qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp	2007-09-22 10:46:23.000000000 +0200
@@ -23,6 +23,7 @@ int sense2str(int err, char* str);
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/time.h>
+#include <limits.h>
 
 #include "qpx_transport.h"
 


--- NEW FILE qpxtool.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=QPxTool
GenericName=CD/DVD Quality Tool
Comment=Check CD/DVD Media Quality
Exec=qpxtool
Icon=qpxtool
Terminal=false
Type=Application
Categories=System;


--- NEW FILE qpxtool.spec ---
Name: qpxtool
Version: 0.6.1        
Release: 5%{?dist}
Summary: CD/DVD Quality check tool

Group: Applications/System         
License: GPLv2+       
URL: http://qpxtool.sourceforge.net           
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2  
Source1: %{name}.desktop
Patch0: libatafix.patch
Patch1: consolehelper.patch
Patch2: manpagefix.patch
Patch3: qpxtool-0.6.1-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel
BuildRequires: desktop-file-utils
BuildRequires: sed
Requires: usermode >= 1.36       

%description
QPxTool is the linux way to get full control over your CD/DVD drives.
It is the Open Source Solution which intends to give you access to all
available Quality Checks (Q-Checks) on written and blank media, that
are available for your drive. This will help you to find the right media
and the optimized writing speed for your hardware, which will increase
the chance for a long data lifetime.

%package devel
Summary: Qpxtool headers and Libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headerfiles and libraries for developing apps using the
qpx* libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .consolehelper
%patch2 -p1 -b .manpagefix
%patch3 -p1 -b .buildfix

sed -ie 's!/usr/local!%{_prefix}!g' Makefile 
sed -ie 's!\$(PREFIX)/bin!%{_sbindir}!g' Makefile
sed -ie 's!\$(PREFIX)/lib!%{_libdir}!g' Makefile
sed -ie 's!\$(PREFIX)/man!%{_mandir}!g' Makefile
sed -ie 's!\$(PREFIX)/include!%{_includedir}!g' Makefile

%build
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}

cp -p consolehelper/console.app/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
cp -p consolehelper/pam.d/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qpxtool
cp -p qpxtool-gui/img/q.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/qpxtool.xpm

desktop-file-install --vendor="fedora"               \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/qpxtool
%{_sbindir}/qpxtool
%{_sbindir}/deadreader
%{_sbindir}/pioquiet
%{_sbindir}/pxcontrol
%{_sbindir}/pxfw
%{_libdir}/libqpxpioneer.so.0
%{_libdir}/libqpxpioneer.so.0.6.0
%{_libdir}/libqpxplextor.so.0
%{_libdir}/libqpxplextor.so.0.6.1
%{_libdir}/libqpxscan.so.0
%{_libdir}/libqpxscan.so.0.6.1
%{_libdir}/libqpxtransport.so.0
%{_libdir}/libqpxtransport.so.0.6.3
%{_mandir}/man8/pxcontrol.8.*
%{_mandir}/man8/pxfw.8.*
%{_datadir}/pixmaps/qpxtool.xpm
%{_datadir}/applications/fedora-qpxtool.desktop
%config(noreplace) %{_sysconfdir}/pam.d/qpxtool
%config(noreplace) %{_sysconfdir}/security/console.apps/qpxtool
%doc COPYING AUTHORS README ChangeLog

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libqpxpioneer.so
%{_libdir}/libqpxplextor.so
%{_libdir}/libqpxscan.so
%{_libdir}/libqpxtransport.so

%changelog
* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-5
- Fix desktop file category

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-4
- Clean up desktop file
- Fix Source0 URL

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-3
- Fix build failure

* Sun Sep 09 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-2
- Spec file cleanups
- Preserve manpage timestamps

* Sat Sep 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-1
- Inital build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:28:53 -0000	1.1
+++ .cvsignore	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+qpxtool-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:28:53 -0000	1.1
+++ sources	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+4fa7ce8aa9c13aa2db0a8b5224acb906  qpxtool-0.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:08 -0700
Subject: [pkgdb] ladspa-rev-plugins was added for jwrdegoede
Message-ID: <200709241639.l8OGd9w9013465@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-rev-plugins with summary A reverberation plugin for LADSPA
Kevin Fenzi (kevin) has approved Package ladspa-rev-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-rev-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-rev-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-rev-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:14 -0700
Subject: [pkgdb] ladspa-rev-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241639.l8OGdE3g022827@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-rev-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-rev-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:14 -0700
Subject: [pkgdb] ladspa-rev-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241639.l8OGdF1p022844@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-rev-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:30 -0400
Subject: rpms/ladspa-rev-plugins - New directory
Message-ID: <200709241639.l8OGdUuR032008@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-rev-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:34 -0400
Subject: rpms/ladspa-rev-plugins/devel - New directory
Message-ID: <200709241639.l8OGdYvv032061@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-rev-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:37 -0400
Subject: rpms/ladspa-rev-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241639.l8OGdb4A032101@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-rev-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-rev-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:40 -0400
Subject: rpms/ladspa-rev-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241639.l8OGdejt032126@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-rev-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-rev-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:39:37 kevin Exp $
NAME := ladspa-rev-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:40:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:38 -0700
Subject: [pkgdb] ladspa-vco-plugins was added for jwrdegoede
Message-ID: <200709241640.l8OGecZ4023260@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-vco-plugins with summary Anti-aliased pulse and sawtooth oscillators
Kevin Fenzi (kevin) has approved Package ladspa-vco-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-vco-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-vco-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-vco-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:49 -0700
Subject: [pkgdb] ladspa-vco-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241640.l8OGeo5c013962@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-vco-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:49 -0700
Subject: [pkgdb] ladspa-vco-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241640.l8OGepWF013978@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-vco-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-vco-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:10 -0400
Subject: rpms/ladspa-vco-plugins - New directory
Message-ID: <200709241641.l8OGfAPR001510@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-vco-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:13 -0400
Subject: rpms/ladspa-vco-plugins/devel - New directory
Message-ID: <200709241641.l8OGfDep001614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-vco-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:16 -0400
Subject: rpms/ladspa-vco-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241641.l8OGfGiD001728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-vco-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-vco-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:18 -0400
Subject: rpms/ladspa-vco-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241641.l8OGfINd001825@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-vco-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-vco-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:41:16 kevin Exp $
NAME := ladspa-vco-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:42:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:26 -0700
Subject: [pkgdb] odt2txt was added for salimma
Message-ID: <200709241642.l8OGgQO0023818@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package odt2txt with summary Converts an OpenDocument to plain text
Kevin Fenzi (kevin) has approved Package odt2txt
Kevin Fenzi (kevin) has added a Fedora devel branch for odt2txt with an owner of salimma
Kevin Fenzi (kevin) has approved odt2txt in Fedora devel
Kevin Fenzi (kevin) has approved Package odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:40 -0700
Subject: [pkgdb] odt2txt (Fedora EPEL, 4) updated by kevin
Message-ID: <200709241642.l8OGgfBp014480@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:40 -0700
Subject: [pkgdb] odt2txt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709241642.l8OGgfMu014491@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:41 -0700
Subject: [pkgdb] odt2txt (Fedora, 7) updated by kevin
Message-ID: <200709241642.l8OGggjA014506@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:19 -0400
Subject: rpms/odt2txt - New directory
Message-ID: <200709241643.l8OGhJka004503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt

Log Message:
Directory /cvs/extras/rpms/odt2txt added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:23 -0400
Subject: rpms/odt2txt/devel - New directory
Message-ID: <200709241643.l8OGhN4M004519@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt/devel

Log Message:
Directory /cvs/extras/rpms/odt2txt/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:27 -0400
Subject: rpms/odt2txt Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241643.l8OGhRAW004545@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt

Added Files:
	Makefile import.log 
Log Message:
Setup of module odt2txt


--- NEW FILE Makefile ---
# Top level Makefile for module odt2txt
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:29 -0400
Subject: rpms/odt2txt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241643.l8OGhTph004561@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module odt2txt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: odt2txt
# $Id: Makefile,v 1.1 2007/09/24 16:43:27 kevin Exp $
NAME := odt2txt
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:44:14 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Mon, 24 Sep 2007 12:44:14 -0400
Subject: rpms/qpxtool/F-7 consolehelper.patch, NONE, 1.1 libatafix.patch,
	NONE, 1.1 manpagefix.patch, NONE, 1.1 qpxtool-0.6.1-buildfix.patch,
	NONE, 1.1 qpxtool.desktop, NONE, 1.1 qpxtool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241644.l8OGiEvT004885@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/qpxtool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	consolehelper.patch libatafix.patch manpagefix.patch 
	qpxtool-0.6.1-buildfix.patch qpxtool.desktop qpxtool.spec 
Log Message:


Initial Import-


consolehelper.patch:

--- NEW FILE consolehelper.patch ---
diff -upNr qpxtool-0.6.1.orign/console/pioquiet/Makefile qpxtool-0.6.1/console/pioquiet/Makefile
--- qpxtool-0.6.1.orign/console/pioquiet/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pioquiet/Makefile	2007-09-08 12:49:42.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxcontrol/Makefile qpxtool-0.6.1/console/pxcontrol/Makefile
--- qpxtool-0.6.1.orign/console/pxcontrol/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxcontrol/Makefile	2007-09-08 12:50:00.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxfw/Makefile qpxtool-0.6.1/console/pxfw/Makefile
--- qpxtool-0.6.1.orign/console/pxfw/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxfw/Makefile	2007-09-08 12:50:15.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool qpxtool-0.6.1/consolehelper/console.app/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/console.app/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+USER=root
+PROGRAM=/usr/sbin/qpxtool
+SESSION=true
+
diff -upNr qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool qpxtool-0.6.1/consolehelper/pam.d/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/pam.d/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff -upNr qpxtool-0.6.1.orign/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile
--- qpxtool-0.6.1.orign/qpxtool-gui/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/qpxtool-gui/Makefile	2007-09-08 12:53:00.000000000 +0200
@@ -18,7 +18,7 @@ qproject:
 	LIBPATH+="../lib/lib"
 
 install: Makefile.qmake
-	install -m 4755 qpxtool $(DESTDIR)$(BINDIR)
+	install -m 755 qpxtool $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/qpxtool

libatafix.patch:

--- NEW FILE libatafix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/include/qpx_mmc.h qpxtool-0.6.1/lib/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

manpagefix.patch:

--- NEW FILE manpagefix.patch ---
diff -upNr qpxtool-0.6.1.orign/man/Makefile qpxtool-0.6.1/man/Makefile
--- qpxtool-0.6.1.orign/man/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/man/Makefile	2007-09-09 09:10:36.000000000 +0200
@@ -7,7 +7,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(MAN8DIR)
-	for m in $(MANS8); do install -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
+	for m in $(MANS8); do install -p -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
 
 uninstall:
 	for m in $(MANS8); do rm -f $(DESTDIR)$(LIBDIR)/$$m ; done

qpxtool-0.6.1-buildfix.patch:

--- NEW FILE qpxtool-0.6.1-buildfix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp
--- qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp	2007-09-22 10:46:23.000000000 +0200
@@ -23,6 +23,7 @@ int sense2str(int err, char* str);
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/time.h>
+#include <limits.h>
 
 #include "qpx_transport.h"
 


--- NEW FILE qpxtool.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=QPxTool
GenericName=CD/DVD Quality Tool
Comment=Check CD/DVD Media Quality
Exec=qpxtool
Icon=qpxtool
Terminal=false
Type=Application
Categories=System;


--- NEW FILE qpxtool.spec ---
Name: qpxtool
Version: 0.6.1        
Release: 5%{?dist}
Summary: CD/DVD Quality check tool

Group: Applications/System         
License: GPLv2+       
URL: http://qpxtool.sourceforge.net           
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2  
Source1: %{name}.desktop
Patch0: libatafix.patch
Patch1: consolehelper.patch
Patch2: manpagefix.patch
Patch3: qpxtool-0.6.1-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel
BuildRequires: desktop-file-utils
BuildRequires: sed
Requires: usermode >= 1.36       

%description
QPxTool is the linux way to get full control over your CD/DVD drives.
It is the Open Source Solution which intends to give you access to all
available Quality Checks (Q-Checks) on written and blank media, that
are available for your drive. This will help you to find the right media
and the optimized writing speed for your hardware, which will increase
the chance for a long data lifetime.

%package devel
Summary: Qpxtool headers and Libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headerfiles and libraries for developing apps using the
qpx* libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .consolehelper
%patch2 -p1 -b .manpagefix
%patch3 -p1 -b .buildfix

sed -ie 's!/usr/local!%{_prefix}!g' Makefile 
sed -ie 's!\$(PREFIX)/bin!%{_sbindir}!g' Makefile
sed -ie 's!\$(PREFIX)/lib!%{_libdir}!g' Makefile
sed -ie 's!\$(PREFIX)/man!%{_mandir}!g' Makefile
sed -ie 's!\$(PREFIX)/include!%{_includedir}!g' Makefile

%build
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}

cp -p consolehelper/console.app/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
cp -p consolehelper/pam.d/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qpxtool
cp -p qpxtool-gui/img/q.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/qpxtool.xpm

desktop-file-install --vendor="fedora"               \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/qpxtool
%{_sbindir}/qpxtool
%{_sbindir}/deadreader
%{_sbindir}/pioquiet
%{_sbindir}/pxcontrol
%{_sbindir}/pxfw
%{_libdir}/libqpxpioneer.so.0
%{_libdir}/libqpxpioneer.so.0.6.0
%{_libdir}/libqpxplextor.so.0
%{_libdir}/libqpxplextor.so.0.6.1
%{_libdir}/libqpxscan.so.0
%{_libdir}/libqpxscan.so.0.6.1
%{_libdir}/libqpxtransport.so.0
%{_libdir}/libqpxtransport.so.0.6.3
%{_mandir}/man8/pxcontrol.8.*
%{_mandir}/man8/pxfw.8.*
%{_datadir}/pixmaps/qpxtool.xpm
%{_datadir}/applications/fedora-qpxtool.desktop
%config(noreplace) %{_sysconfdir}/pam.d/qpxtool
%config(noreplace) %{_sysconfdir}/security/console.apps/qpxtool
%doc COPYING AUTHORS README ChangeLog

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libqpxpioneer.so
%{_libdir}/libqpxplextor.so
%{_libdir}/libqpxscan.so
%{_libdir}/libqpxtransport.so

%changelog
* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-5
- Fix desktop file category

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-4
- Clean up desktop file
- Fix Source0 URL

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-3
- Fix build failure

* Sun Sep 09 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-2
- Spec file cleanups
- Preserve manpage timestamps

* Sat Sep 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-1
- Inital build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:28:53 -0000	1.1
+++ .cvsignore	24 Sep 2007 16:43:42 -0000	1.2
@@ -0,0 +1 @@
+qpxtool-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:28:53 -0000	1.1
+++ sources	24 Sep 2007 16:43:42 -0000	1.2
@@ -0,0 +1 @@
+4fa7ce8aa9c13aa2db0a8b5224acb906  qpxtool-0.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:01:41 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 13:01:41 -0400
Subject: rpms/qfits/devel qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241701.l8OH1fCS012451@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing qfits


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:21:29 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:01:06 -0000	1.2
@@ -0,0 +1 @@
+qfits-6.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 17:01:06 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:05:24 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 13:05:24 -0400
Subject: devel/kvm kvm.spec,1.24,1.25
Message-ID: <200709241705.l8OH5OD0012666@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12639

Modified Files:
	kvm.spec 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
- fix build on x86_64



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kvm.spec	24 Sep 2007 15:49:17 -0000	1.24
+++ kvm.spec	24 Sep 2007 17:04:47 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -18,6 +18,7 @@
 BuildRequires: SDL-devel 
 # to build the bios
 BuildRequires: dev86
+BuildRequires: %{_includedir}/gnu/stubs-32.h
 # qemu doesn't build with gcc 4.x
 BuildRequires: compat-gcc-34 
 BuildRequires: zlib-devel 
@@ -92,6 +93,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
+- fix build on x86_64
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
 - add support for selecting boot device at runtime
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:08:58 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:08:58 -0400
Subject: rpms/bugzilla/FC-6 .cvsignore, 1.5, 1.6 bugzilla.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200709241708.l8OH8wtS012800@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 12:44:43 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:08:23 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bugzilla.spec	27 Aug 2007 12:54:01 -0000	1.13
+++ bugzilla.spec	24 Sep 2007 17:08:23 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 12:44:43 -0000	1.5
+++ sources	24 Sep 2007 17:08:23 -0000	1.6
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:09:35 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:09:35 -0400
Subject: rpms/bugzilla/F-7 .cvsignore, 1.6, 1.7 bugzilla.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200709241709.l8OH9ZRu012956@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12846

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2007 13:12:17 -0000	1.6
+++ .cvsignore	24 Sep 2007 17:09:02 -0000	1.7
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bugzilla.spec	27 Aug 2007 13:12:18 -0000	1.13
+++ bugzilla.spec	24 Sep 2007 17:09:02 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2007 13:12:18 -0000	1.6
+++ sources	24 Sep 2007 17:09:02 -0000	1.7
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:10:12 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:10:12 -0400
Subject: rpms/bugzilla/devel .cvsignore, 1.5, 1.6 bugzilla.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200709241710.l8OHACEv013055@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13002

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 May 2007 19:30:57 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:09:39 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bugzilla.spec	27 Aug 2007 13:17:12 -0000	1.12
+++ bugzilla.spec	24 Sep 2007 17:09:39 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 May 2007 19:30:57 -0000	1.5
+++ sources	24 Sep 2007 17:09:39 -0000	1.6
@@ -1 +1 @@
-9a56a47cdbfcb70a85ad73d923ac7e9d  bugzilla-3.0.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:10:49 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:10:49 -0400
Subject: rpms/bugzilla/EL-5 .cvsignore, 1.5, 1.6 bugzilla.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200709241710.l8OHAnqW013142@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 13:24:36 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:10:16 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/bugzilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bugzilla.spec	27 Aug 2007 13:24:36 -0000	1.12
+++ bugzilla.spec	24 Sep 2007 17:10:16 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 13:24:36 -0000	1.5
+++ sources	24 Sep 2007 17:10:16 -0000	1.6
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:17:28 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:17:28 -0400
Subject: rpms/octave-forge/devel octave-forge.spec,1.34,1.35
Message-ID: <200709241717.l8OHHSDv013339@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13321

Modified Files:
	octave-forge.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
- Rebuild for new octave



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- octave-forge.spec	20 Feb 2007 18:09:52 -0000	1.34
+++ octave-forge.spec	24 Sep 2007 17:16:56 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,7 +20,7 @@
 Patch2:         octave-forge-2006.07.09-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave octave(api) = api-v22 ImageMagick
+Requires:	octave octave(api) = api-v26 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
+- Rebuild for new octave
+
 * Tue Feb 20 2007 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-9
 - Remove libtermcap-devel as build dependency (Bug 226768).
 - Change octave version dependency to octave(api) dependency,



From fedora-extras-commits at redhat.com  Mon Sep 24 17:23:00 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:23:00 -0400
Subject: rpms/isomaster/devel .cvsignore, 1.4, 1.5 isomaster.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709241723.l8OHN0q6013589@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13555

Modified Files:
	.cvsignore isomaster.spec sources 
Log Message:
Updated to isomaster-1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 19:39:12 -0000	1.4
+++ .cvsignore	24 Sep 2007 17:22:28 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/isomaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isomaster.spec	25 Aug 2007 17:24:48 -0000	1.5
+++ isomaster.spec	24 Sep 2007 17:22:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 19:39:12 -0000	1.4
+++ sources	24 Sep 2007 17:22:28 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:30 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:30 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQUlT028256@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchbugzilla acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:36 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:36 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQaSY005545@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchcommits acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:54 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:54 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQsS0005629@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the commit acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:57 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:57 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQvPV028389@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchbugzilla acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:58 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:58 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQw18005663@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchcommits acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:00 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:27:00 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241727.l8OHR0ZW028416@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the commit acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:35 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:27:35 -0400
Subject: rpms/isomaster/devel isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1
Message-ID: <200709241727.l8OHRZlV013918@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13891

Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Added patches for version 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:47 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:27:47 -0400
Subject: rpms/ladspa-fil-plugins/devel ladspa-fil-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241727.l8OHRlc0013958@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13858/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-fil-plugins.spec 
Log Message:
initial ladspa-fil-plugins import



--- NEW FILE ladspa-fil-plugins.spec ---
Name:           ladspa-fil-plugins
Version:        0.1.0
Release:        2%{?dist}
License:        GPLv2+
Summary:        LADSPA Filter plugins
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/FIL-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      fil-plugins <= 0.0.1
Provides:       fil-plugins = %{version}-%{release}

%description
There's one plugin in this first release, a four-band parametric
equaliser. Each section has an active/bypass switch, frequency,
bandwidth and gain controls. There is also a global bypass switch and
gain control.


%prep
%setup -q -n FIL-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-fil-plugins
- updated to 0.1.0

* Thu Apr 14 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Thu May 13 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:36:19 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+FIL-plugins-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:36:19 -0000	1.1
+++ sources	24 Sep 2007 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+6be67349d51191435ba8b5b124440f01  FIL-plugins-0.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:28:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:28:12 -0400
Subject: rpms/ladspa-mcp-plugins/devel ladspa-mcp-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241728.l8OHSC1o014023@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13906/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-mcp-plugins.spec 
Log Message:
initial ladspa-mcp-plugins import



--- NEW FILE ladspa-mcp-plugins.spec ---
Name:           ladspa-mcp-plugins
Epoch:          1
Version:        0.3.0
Release:        4%{?dist}
Summary:        A set of audio plugins for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/MCP-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      mcp-plugins <= 0.3.0-2
Provides:       mcp-plugins = %{version}-%{release}

%description
A set of audio plugins for LADSPA by Fons Adriaensen.
Currently contains a phaser, a chorus and a moog vcf.


%prep
%setup -q -n MCP-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- change name of package to ladspa-mcp-plugins

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- spec file cleanup
- do not include ladspa directory in file list
- include rpm optimizations in compiler flags

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.2-1
- updated to 0.2.2

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-1
- updated to 0.2.1b

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.4-1
- updated to 0.1.4

* Mon Jun 16 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- updated to 0.0.2

* Wed May 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:38:00 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:27:40 -0000	1.2
@@ -0,0 +1 @@
+MCP-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:38:00 -0000	1.1
+++ sources	24 Sep 2007 17:27:40 -0000	1.2
@@ -0,0 +1 @@
+47a4edef1d6062803c35de7dd81ebbd6  MCP-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:29:21 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:29:21 -0400
Subject: rpms/ladspa-rev-plugins/devel ladspa-rev-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241729.l8OHTL2j014196@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-rev-plugins.spec 
Log Message:
initial ladspa-rev-plugins import



--- NEW FILE ladspa-rev-plugins.spec ---
Name:           ladspa-rev-plugins
Version:        0.3.1
Release:        3%{?dist}
Summary:        A reverberation plugin for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/REV-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      rev-plugins <= 0.3.1-1
Provides:       rev-plugins = %{version}-%{release}

%description
This reverb is based on gverb by Juhana Sadeharju, but the code
(now C++) is entirely original. I added a second input for stereo
operation, and some code to prevent FP denormalisation.
This is a preliminary release, and this plugin will probably change
a lot in future versions.


%prep
%setup -q -n REV-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-2
- change name of package to ladspa-rev-plugins

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-1
- updated to 0.3.1

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- updated to 0.2.1

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:39:37 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:28:49 -0000	1.2
@@ -0,0 +1 @@
+REV-plugins-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:39:37 -0000	1.1
+++ sources	24 Sep 2007 17:28:49 -0000	1.2
@@ -0,0 +1 @@
+bca920c2cbf5e33989e7cafab6fbaee4  REV-plugins-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:06 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:30:06 -0400
Subject: rpms/ladspa-fil-plugins/F-7 ladspa-fil-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241730.l8OHU6kt014402@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-fil-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14296

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-fil-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-fil-plugins.spec ---
Name:           ladspa-fil-plugins
Version:        0.1.0
Release:        2%{?dist}
License:        GPLv2+
Summary:        LADSPA Filter plugins
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/FIL-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      fil-plugins <= 0.0.1
Provides:       fil-plugins = %{version}-%{release}

%description
There's one plugin in this first release, a four-band parametric
equaliser. Each section has an active/bypass switch, frequency,
bandwidth and gain controls. There is also a global bypass switch and
gain control.


%prep
%setup -q -n FIL-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-fil-plugins
- updated to 0.1.0

* Thu Apr 14 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Thu May 13 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:36:19 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:29:34 -0000	1.2
@@ -0,0 +1 @@
+FIL-plugins-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:36:19 -0000	1.1
+++ sources	24 Sep 2007 17:29:34 -0000	1.2
@@ -0,0 +1 @@
+6be67349d51191435ba8b5b124440f01  FIL-plugins-0.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:30:35 -0400
Subject: rpms/ppl/devel ppl.spec,1.5,1.6
Message-ID: <200709241730.l8OHUZll014495@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14383

Modified Files:
	ppl.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
- Rebuild for new libgmpxx



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ppl.spec	28 Aug 2007 21:44:02 -0000	1.5
+++ ppl.spec	24 Sep 2007 17:30:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	14%{?dist}
+Release:	15%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -277,6 +277,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
+- Rebuild for new libgmpxx
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9-14
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:30:57 -0400
Subject: rpms/ladspa-mcp-plugins/F-7 ladspa-mcp-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241730.l8OHUvQY014545@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-mcp-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14471

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-mcp-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-mcp-plugins.spec ---
Name:           ladspa-mcp-plugins
Epoch:          1
Version:        0.3.0
Release:        4%{?dist}
Summary:        A set of audio plugins for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/MCP-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      mcp-plugins <= 0.3.0-2
Provides:       mcp-plugins = %{version}-%{release}

%description
A set of audio plugins for LADSPA by Fons Adriaensen.
Currently contains a phaser, a chorus and a moog vcf.


%prep
%setup -q -n MCP-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- change name of package to ladspa-mcp-plugins

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- spec file cleanup
- do not include ladspa directory in file list
- include rpm optimizations in compiler flags

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.2-1
- updated to 0.2.2

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-1
- updated to 0.2.1b

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.4-1
- updated to 0.1.4

* Mon Jun 16 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- updated to 0.0.2

* Wed May 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:38:00 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:30:25 -0000	1.2
@@ -0,0 +1 @@
+MCP-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:38:00 -0000	1.1
+++ sources	24 Sep 2007 17:30:25 -0000	1.2
@@ -0,0 +1 @@
+47a4edef1d6062803c35de7dd81ebbd6  MCP-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:31:41 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:31:41 -0400
Subject: rpms/ladspa-rev-plugins/F-7 ladspa-rev-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241731.l8OHVf7Q014654@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-rev-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14602

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-rev-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-rev-plugins.spec ---
Name:           ladspa-rev-plugins
Version:        0.3.1
Release:        3%{?dist}
Summary:        A reverberation plugin for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/REV-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      rev-plugins <= 0.3.1-1
Provides:       rev-plugins = %{version}-%{release}

%description
This reverb is based on gverb by Juhana Sadeharju, but the code
(now C++) is entirely original. I added a second input for stereo
operation, and some code to prevent FP denormalisation.
This is a preliminary release, and this plugin will probably change
a lot in future versions.


%prep
%setup -q -n REV-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-2
- change name of package to ladspa-rev-plugins

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-1
- updated to 0.3.1

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- updated to 0.2.1

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:39:37 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:31:08 -0000	1.2
@@ -0,0 +1 @@
+REV-plugins-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:39:37 -0000	1.1
+++ sources	24 Sep 2007 17:31:08 -0000	1.2
@@ -0,0 +1 @@
+bca920c2cbf5e33989e7cafab6fbaee4  REV-plugins-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:33:45 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:33:45 -0400
Subject: rpms/ladspa-vco-plugins/devel ladspa-vco-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241733.l8OHXjYA014835@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14790/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-vco-plugins.spec 
Log Message:
initial ladspa-vco-plugins import



--- NEW FILE ladspa-vco-plugins.spec ---
Name:           ladspa-vco-plugins
Version:        0.3.0
Release:        5%{?dist}
Summary:        Anti-aliased pulse and sawtooth oscillators
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source0:        http://www.kokkinizita.net/linuxaudio/downloads/VCO-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      vco-plugins <= 0.3.0-3
Provides:       vco-plugins = %{version}-%{release}

%description
Pulse-VCO : Anti-aliased dirac pulse oscillator (flat amplitude spectrum)
Saw-VCO   : Anti-aliased sawtooth oscillator (1/F amplitude spectrum)
 
Both oscillators are based on the same principle of using a
precomputed interpolated dirac pulse. For the sawtooth version, the
'edge' is made by integrating the anti-aliased pulse. Aliases should
be below -80dB for fundamental frequencies below Fsamp / 6 (i.e. up to
8 kHz at Fsamp = 48 kHz). This frequency range includes the
fundamental frequencies all known musical instruments.


%prep
%setup -q -n VCO-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-4
- changed package name to ladspa-amb-plugins
- change destination dir from /usr/lib/ to %%{_libdir}

* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- added rpm optimization flags

* Sat May  1 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- rereleased without ladspa-sdk dependency...

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:41:16 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:33:12 -0000	1.2
@@ -0,0 +1 @@
+VCO-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:41:16 -0000	1.1
+++ sources	24 Sep 2007 17:33:12 -0000	1.2
@@ -0,0 +1 @@
+6fdf4a7e3c716abbb89721645427cd52  VCO-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:35:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:35:12 -0400
Subject: rpms/ladspa-vco-plugins/F-7 ladspa-vco-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241735.l8OHZCot015028@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-vco-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14978

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-vco-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-vco-plugins.spec ---
Name:           ladspa-vco-plugins
Version:        0.3.0
Release:        5%{?dist}
Summary:        Anti-aliased pulse and sawtooth oscillators
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source0:        http://www.kokkinizita.net/linuxaudio/downloads/VCO-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      vco-plugins <= 0.3.0-3
Provides:       vco-plugins = %{version}-%{release}

%description
Pulse-VCO : Anti-aliased dirac pulse oscillator (flat amplitude spectrum)
Saw-VCO   : Anti-aliased sawtooth oscillator (1/F amplitude spectrum)
 
Both oscillators are based on the same principle of using a
precomputed interpolated dirac pulse. For the sawtooth version, the
'edge' is made by integrating the anti-aliased pulse. Aliases should
be below -80dB for fundamental frequencies below Fsamp / 6 (i.e. up to
8 kHz at Fsamp = 48 kHz). This frequency range includes the
fundamental frequencies all known musical instruments.


%prep
%setup -q -n VCO-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-4
- changed package name to ladspa-amb-plugins
- change destination dir from /usr/lib/ to %%{_libdir}

* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- added rpm optimization flags

* Sat May  1 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- rereleased without ladspa-sdk dependency...

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:41:16 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:34:40 -0000	1.2
@@ -0,0 +1 @@
+VCO-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:41:16 -0000	1.1
+++ sources	24 Sep 2007 17:34:40 -0000	1.2
@@ -0,0 +1 @@
+6fdf4a7e3c716abbb89721645427cd52  VCO-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:35:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:35:38 -0400
Subject: rpms/opengl-games-utils/devel README, NONE,
	1.1 opengl-game-wrapper.sh, 
	NONE, 1.1 opengl-games-utils.spec, NONE, 1.1
Message-ID: <200709241735.l8OHZctO015092@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15083/devel

Added Files:
	README opengl-game-wrapper.sh opengl-games-utils.spec 
Log Message:
initial opengl-games-utils import



--- NEW FILE README ---
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


Currently this package only contains one script:
opengl-game-wrapper.sh

To use this script create a link in /usr/bin gamename-wrapper[.sh] to
opengl-game-wrapper.sh, and put gamename-wrapper[.sh] in your desktop file
instead of gamename. The wrapper script will use $0 to determine gamename,
if direct rendering is available the wrapper script will execute gamename
with any parameters passed to the script, if direct rendering is not
available a userfriendly error dialog will be shown explaining that gamename
cannot run without hardware accelerated 3d, and that this is probably due to
missing Free Software support for the users card.


In the future I also plan to add an opengl-games-functions.sh file which can
be included by other wrapper scripts, the idea is to have a function in here
which will return true or false depending on if the current glx setup is a
setup which is known to work well. This function will have a list of
OpenGL renderer strings of known to work well drivers. This can then be used
by games which can take advantage of OpenGL, but will work without it too,
to determine wether or not to enable OpenGL support. The idea here is that
one might not want to enable OpenGL by default on SIS, VIA and other
low quality chipset / drivers.


Last but not least before I forget, to avoid any licensing issues I hereby
declare that all files in this package are in the Public Domain.

Hans de Goede 22 septemper 2007.


--- NEW FILE opengl-game-wrapper.sh ---
#!/bin/bash

GAME=`basename $0 | sed 's/-wrapper.*//'`

if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
  zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $GAME cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
  exit 1;
fi

exec $GAME "$@"


--- NEW FILE opengl-games-utils.spec ---
Name:           opengl-games-utils
Version:        0.1
Release:        2%{?dist}
Summary:        Utilities to check proper 3d support before launching 3d games
Group:          Amusements/Games
License:        Public Domain
URL:            http://fedoraproject.org/wiki/SIGs/Games
Source0:        opengl-game-wrapper.sh
Source1:        README
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zenity glx-utils

%description
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


%prep
%setup -c -T
cp %{SOURCE1} .


%build
# nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/opengl-game-wrapper.sh


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 24 17:36:54 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:36:54 -0400
Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec,1.7,1.8
Message-ID: <200709241736.l8OHasFB015190@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-DBD-SQLite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15161

Modified Files:
	perl-DBD-SQLite2.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.33-8
- Fall back to internal sqlite2, we don't ship sqlite2 in Fedora anymore.



Index: perl-DBD-SQLite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-DBD-SQLite2.spec	24 Aug 2007 21:47:14 -0000	1.7
+++ perl-DBD-SQLite2.spec	24 Sep 2007 17:36:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite2
 Version:        0.33
-Release:        7%{?dist}.1
+Release:        8%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver (sqlite 2.x)
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -10,7 +10,7 @@
 Patch0:		DBD-SQLite2-systemlibs.patch
 
 BuildRequires:  perl(DBI), perl(Test::More)
-BuildRequires:	sqlite2-devel
+#BuildRequires:	sqlite2-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.33-8
+- Fall back to internal sqlite2, we don't ship sqlite2 in Fedora anymore.
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-7
 - license fix
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:39:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:39:44 -0400
Subject: rpms/opengl-games-utils/F-7 README, NONE, 1.1 opengl-game-wrapper.sh,
	NONE, 1.1 opengl-games-utils.spec, NONE, 1.1
Message-ID: <200709241739.l8OHdims015343@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15336

Added Files:
	README opengl-game-wrapper.sh opengl-games-utils.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram



--- NEW FILE README ---
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


Currently this package only contains one script:
opengl-game-wrapper.sh

To use this script create a link in /usr/bin gamename-wrapper[.sh] to
opengl-game-wrapper.sh, and put gamename-wrapper[.sh] in your desktop file
instead of gamename. The wrapper script will use $0 to determine gamename,
if direct rendering is available the wrapper script will execute gamename
with any parameters passed to the script, if direct rendering is not
available a userfriendly error dialog will be shown explaining that gamename
cannot run without hardware accelerated 3d, and that this is probably due to
missing Free Software support for the users card.


In the future I also plan to add an opengl-games-functions.sh file which can
be included by other wrapper scripts, the idea is to have a function in here
which will return true or false depending on if the current glx setup is a
setup which is known to work well. This function will have a list of
OpenGL renderer strings of known to work well drivers. This can then be used
by games which can take advantage of OpenGL, but will work without it too,
to determine wether or not to enable OpenGL support. The idea here is that
one might not want to enable OpenGL by default on SIS, VIA and other
low quality chipset / drivers.


Last but not least before I forget, to avoid any licensing issues I hereby
declare that all files in this package are in the Public Domain.

Hans de Goede 22 septemper 2007.


--- NEW FILE opengl-game-wrapper.sh ---
#!/bin/bash

GAME=`basename $0 | sed 's/-wrapper.*//'`

if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
  zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $GAME cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
  exit 1;
fi

exec $GAME "$@"


--- NEW FILE opengl-games-utils.spec ---
Name:           opengl-games-utils
Version:        0.1
Release:        2%{?dist}
Summary:        Utilities to check proper 3d support before launching 3d games
Group:          Amusements/Games
License:        Public Domain
URL:            http://fedoraproject.org/wiki/SIGs/Games
Source0:        opengl-game-wrapper.sh
Source1:        README
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zenity glx-utils

%description
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


%prep
%setup -c -T
cp %{SOURCE1} .


%build
# nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/opengl-game-wrapper.sh


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:21 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:21 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241741.l8OHfLdc009966@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:23 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchcommits
Message-ID: <200709241741.l8OHfNKO009988@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:24 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:24 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested commit
Message-ID: <200709241741.l8OHfOVP032658@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:29 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:29 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241741.l8OHfT0u032685@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:34 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:34 -0700
Subject: [pkgdb] timidity++ Owned
Message-ID: <200709241741.l8OHfZeK010046@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora 7 is now owned by Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:42 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:42 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfgSk010109@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:44 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfi2M000312@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:54 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfsW2010199@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Obsolete for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:55 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:55 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfuOT010214@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Obsolete for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:39 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:39 -0700
Subject: [pkgdb] timidity++ had groupAcl changed
Message-ID: <200709241742.l8OHgdv2010418@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on timidity++ (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:48 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:48 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgnMo000675@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:50 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:50 -0700
Subject: [pkgdb] timidity++: jwrdegoede has given up watchbugzilla
Message-ID: <200709241742.l8OHgpIo000689@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has given up the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:51 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:51 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchcommits
Message-ID: <200709241742.l8OHgpc7010503@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:54 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgsW1010527@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:56 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:56 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested commit
Message-ID: <200709241742.l8OHgvIK000723@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:59 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgxce000733@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:00 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:00 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHh01i010562@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the approveacls acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:01 -0700
Subject: [pkgdb] timidity++: jwrdegoede has given up approveacls
Message-ID: <200709241743.l8OHh1GY010574@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has given up the approveacls acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:18 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:18 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241743.l8OHhIn3000826@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:20 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:20 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHhKat010677@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:22 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:22 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested approveacls
Message-ID: <200709241743.l8OHhMWH000853@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the approveacls acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:24 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:24 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHhO0i010699@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the approveacls acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:45:54 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 13:45:54 -0400
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.25,
	1.26 policycoreutils-rhat.patch, 1.323, 1.324
Message-ID: <200709241745.l8OHjsxb015672@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15640

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
- Fixed spelling mistakes in booleans defs
- Update po


policycoreutils-po.patch:

Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policycoreutils-po.patch	24 Sep 2007 16:22:03 -0000	1.25
+++ policycoreutils-po.patch	24 Sep 2007 17:45:50 -0000	1.26
@@ -163219,8 +163219,8 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.26/po/Makefile
 --- nsapolicycoreutils/po/Makefile	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.26/po/Makefile	2007-09-24 12:16:45.000000000 -0400
-@@ -23,20 +23,64 @@
++++ policycoreutils-2.0.26/po/Makefile	2007-09-24 13:43:42.000000000 -0400
+@@ -23,20 +23,62 @@
  POFILES		= $(wildcard *.po)
  MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
  POTFILES = \
@@ -163231,18 +163231,17 @@
 +	../semodule_link/semodule_link.c \
 +	../audit2allow/audit2allow \
 +	../semanage/seobject.py \
-+	../restorecon/restorecon.c \
 +	../setsebool/setsebool.c \
 +	../newrole/newrole.c \
 +	../load_policy/load_policy.c \
 +	../sestatus/sestatus.c \
 +	../semodule/semodule.c \
  	../setfiles/setfiles.c \
+-	../scripts/genhomedircon \
 +	../semodule_package/semodule_package.c \
 +	../semodule_deps/semodule_deps.c \
 +	../semodule_expand/semodule_expand.c \
 +	../audit2why/audit2why.c \
- 	../scripts/genhomedircon \
  	../scripts/chcat \
 -	../semanage/semanage \
 -	../semanage/seobject.py \
@@ -163292,7 +163291,7 @@
  
  $(POTFILE): $(POTFILES) 
  	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
-@@ -64,8 +108,6 @@
+@@ -64,8 +106,6 @@
  	@rm -fv *mo *~ .depend
  	@rm -rf tmp
  
@@ -221625,16 +221624,26 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.26/po/POTFILES.in
 --- nsapolicycoreutils/po/POTFILES.in	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.26/po/POTFILES.in	2007-09-24 12:16:45.000000000 -0400
-@@ -2,7 +2,6 @@
++++ policycoreutils-2.0.26/po/POTFILES.in	2007-09-24 13:43:55.000000000 -0400
+@@ -2,9 +2,7 @@
  run_init/run_init.c
  semodule_link/semodule_link.c
  audit2allow/audit2allow
 -audit2allow/avc.py
  semanage/seobject.py
- restorecon/restorecon.c
+-restorecon/restorecon.c
  setsebool/setsebool.c
-@@ -24,16 +23,32 @@
+ newrole/newrole.c
+ load_policy/load_policy.c
+@@ -15,7 +13,6 @@
+ semodule_deps/semodule_deps.c
+ semodule_expand/semodule_expand.c
+ audit2why/audit2why.c
+-scripts/genhomedircon
+ scripts/chcat
+ scripts/fixfiles
+ restorecond/stringslist.c
+@@ -24,16 +21,32 @@
  restorecond/stringslist.h
  restorecond/restorecond.c
  restorecond/utmpwatcher.c

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- policycoreutils-rhat.patch	19 Sep 2007 02:29:47 -0000	1.323
+++ policycoreutils-rhat.patch	24 Sep 2007 17:45:50 -0000	1.324
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.25/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.26/Makefile
 --- nsapolicycoreutils/Makefile	2007-07-16 14:20:43.000000000 -0400
-+++ policycoreutils-2.0.25/Makefile	2007-08-28 09:22:16.000000000 -0400
++++ policycoreutils-2.0.26/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.25/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.26/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.25/restorecond/restorecond.c	2007-08-28 09:22:16.000000000 -0400
++++ policycoreutils-2.0.26/restorecond/restorecond.c	2007-09-18 16:40:57.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,9 +36,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.25/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.26/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.25/semanage/seobject.py	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-18 16:40:57.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -196,9 +196,9 @@
  
  		return ddict
  			
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.25/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.26/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.25/semodule/semodule.8	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/semodule/semodule.8	2007-09-18 16:40:57.000000000 -0400
 @@ -23,6 +23,9 @@
  .B \-B, \-\-build		
  force a rebuild of policy (also reloads unless -n is used)



From fedora-extras-commits at redhat.com  Mon Sep 24 17:48:14 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Mon, 24 Sep 2007 13:48:14 -0400
Subject: comps/po el.po,1.6,1.7
Message-ID: <200709241748.l8OHmEuR015796@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15772/po

Modified Files:
	el.po 
Log Message:
Updated Greek translation (also testing transifex)


Index: el.po
===================================================================
RCS file: /cvs/pkgs/comps/po/el.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- el.po	17 Sep 2007 19:22:12 -0000	1.6
+++ el.po	24 Sep 2007 17:47:44 -0000	1.7
@@ -1,4 +1,4 @@
-# translation of el.po to Greek
+# translation of comps.HEAD.po to Greek
 # comps-po Greek Translation
 # Copyright (C) Nikos Charonitakis
 # This file is distributed under the same license as the comps-po package.
@@ -6,31 +6,32 @@
 #
 # Nikos Charonitakis <nikosx at gmail.com>, 2002, 2007.
 # Dimitris Michelinakis <dimitris at michelinakis.gr>, 2006.
-# Dimitris Glezos <dimitris at glezos.com>, 2006.
+# Dimitris Glezos <dimitris at glezos.com>, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-04-16 19:25+0300\n"
-"Last-Translator: Nikos Charonitakis <nikosx at gmail.com>\n"
+"POT-Creation-Date: 2007-09-22 09:47-0700\n"
+"PO-Revision-Date: 2007-09-23 06:45+0100\n"
+"Last-Translator: Dimitris Glezos <dimitris at glezos.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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
-"?????? ?????????????? ???????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? "
+"?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? "
 "????????????????????."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
-msgstr "???????????????? ?????????????????????? ????????????????????"
+msgstr "???????????????? ??????????????????????"
 
 #: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
 #: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
@@ -100,7 +101,7 @@
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr "???????????? ???? ???????????????????????? ??????????????????."
+msgstr "???????????????????????? ?????????????????? ?????? ????????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
@@ -118,8 +119,8 @@
 "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-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
 #: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
@@ -173,7 +174,7 @@
 "applications."
 msgstr ""
 "???????????????????????? ???????? ???? ???????????? ???? ???????????? ???? ???????????????????? ?????????????????? ???????????????? "
-"??????????????????????????  GTK+ ?????? GNOME."
+"?????????????????????????? GTK+ ?????? GNOME."
 
 #: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
 #: ../comps-f8.xml.in.h:74
@@ -193,8 +194,7 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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 ""
 "?? ?????????????????????? ?????????? ?????? ???????????? ?????????????? ?????????????????? ???? ?????????? ?????? ???????????????? "
 "?????????????????????????? ??."
@@ -217,7 +217,7 @@
 #: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
 #: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
 msgid "KDE (K Desktop Environment)"
-msgstr "KDE (?????????????????? ???????????????? KDE)"
+msgstr "?????????????????? ???????????????? KDE"
 
 #: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
 #: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
@@ -237,7 +237,7 @@
 #: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94
 #: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid "Mail Server"
-msgstr "???????????????????????? Mail"
+msgstr "???????????????????????? ????. ??????????????????????????"
 
 #: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100
 #: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
@@ -270,8 +270,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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 ""
 "?????????? ???????????????????????? ?????????????????? ???? ???????????? ?????? ?????????????? ???? ???????????? ???????????????????? "
 "???????????????????? ???????????????????? ????????????????."
@@ -336,11 +335,10 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
 #: ../comps-el5.xml.in.h:51
@@ -354,8 +352,7 @@
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"???????? ???? ???????????????? ???????????????????? ???? ???????????????????? ???????????????????? ?????????? (Web) ?????? ??????????????."
+msgstr "???????? ???? ???????????????? ???????????????????? ???? ???????????????????? ???????????????????? ?????????? (Web) ?????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
@@ -374,13 +371,12 @@
 #: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
 #: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid "This group allows you to configure the system as a news server."
-msgstr ""
-"???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???? ?????????????? ???? ?????????????????????? news."
+msgstr "???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???? ?????????????? ???? ?????????????????????? news."
 
 #: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
 #: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ????????????????????."
+msgstr "???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ????????????????????."
 
 #: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
 #: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
@@ -404,7 +400,7 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ???????????????????? ?????????????????????? ???? "
+"???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ???????????????????? ?????????????????????? ???? "
 "?????????????? ????????????????. ?????????? ???? ?????????????????? ???? ?????????????????????? ???? ???????????????????? ?????????????? ??."
 
 #: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
@@ -418,47 +414,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ?????????????? ?????????????????????? ?????????????? "
-"???? ???? ?????????? ?????? ????????????????????."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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 ""
 "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ?????????????? ?????????????????????? ?????????????? "
 "???? ???? ?????????? ?????? ????????????????????."
@@ -481,13 +462,12 @@
 #: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
 #: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
 msgid "Various ways to relax and spend your free time."
-msgstr ""
-"???????????????? ???????????? ?????? ???? ???????????????????? ?????? ???? ???????????????? ?????? ???????????????? ?????????? ??????."
+msgstr "???????????????? ???????????? ?????? ???? ???????????????????? ?????? ???? ???????????????? ?????? ???????????????? ?????????? ??????."
 
 #: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
 #: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
 msgid "Web Development"
-msgstr "???????????????? ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????????????? ??????????"
 
 #: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
 #: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
@@ -525,20 +505,16 @@
 msgstr "???????????????????? ????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
-msgstr "???????????????????? Afrikaans"
+msgstr "???????????????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -561,27 +537,24 @@
 msgstr "???????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "???????????????????? ??????????????????????"
+msgstr "???????????????????? Belarusian"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Bhutanese"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Bosnian"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
-msgstr "???????????????????? ?????????????????????????? ????????????????????????"
+msgstr "???????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
 msgid "Breton Support"
@@ -617,7 +590,7 @@
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
 msgid "DNS Name Server"
-msgstr "DNS ?????????????????????? ????????????????"
+msgstr "?????????????????????? ???????????????? DNS"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
 msgid "Danish Support"
@@ -656,9 +629,8 @@
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "???????????????????? Galician"
+msgstr "???????????????????? ????????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -686,9 +658,8 @@
 msgstr "???????????????????? Galician"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -719,16 +690,14 @@
 msgstr "???????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????????????? ????????????"
+msgstr "???????????????????? Inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -752,9 +721,8 @@
 msgstr "???????????????????? Kannada"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? Khmer"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -765,14 +733,12 @@
 msgstr "??????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "???????????????????? Thai"
+msgstr "???????????????????? Lao"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Latvian"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -799,9 +765,8 @@
 msgstr "???????????????????? Malayalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "???????????????????? Marathi"
+msgstr "???????????????????? Maori"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -824,9 +789,8 @@
 msgstr "???????????????????? Oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -861,9 +825,8 @@
 msgstr "???????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -890,9 +853,8 @@
 msgstr "?????????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "???????????????????? Swati"
+msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -923,9 +885,8 @@
 msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -944,22 +905,19 @@
 msgstr "???? ???????????????????????? ???????????????????? ?????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "???? ???????????? ???????? ?????? ???????????????????? ???? ???????????????????? ?????????????????? ?????? ???? ???????????????????? "
 "?????????????? ??."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "???? ???????????? ???????? ?????????????????????????? ???????????????????? ?????????????????????? ???????? DHCP, Kerberos ?????? "
 "NIS."
@@ -978,8 +936,7 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ????????????????."
+msgstr "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
@@ -1012,8 +969,7 @@
 "???????????? ????????????????????, ?????? ???????????????????? ?????????????????? ??????????????????????/firewall."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "???????? ?? ?????????? ?????????????? ?????????????????? ???? ???????????????????? DNS ???????????????????? ???????????????? (BIND) "
 "?????? ??????????????."
@@ -1032,18 +988,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr ""
-"???????? ?? ?????????? ???????????????????????? ???????????? ?????? ???? ?????? ?????????????????? ???? ?????? Postgresql."
+msgstr "???????? ?? ?????????? ???????????????????????? ???????????? ?????? ???? ?????? ?????????????????? ???? ?????? Postgresql."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "???????????????????? Tsonga"
+msgstr "???????????????????? Tonga"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1062,18 +1015,16 @@
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "???????????????????? ????????????"
+msgstr "???????????????????? Urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "???????????????????? Venda"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1101,410 +1052,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???????????????????? Buildsystem"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????????????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ???????????????????????????? ?????? ???????????????? ???????????????? ???????? ?????????????????? ????????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???? ???????????????????????? ???????????????????? ?????????????????? Eclipse."
+msgstr "???????????????????????? ???????????????????????? ?????????????????? ???????????????????? ?????????????????? ?????? Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????????????????? ??????????????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "???????????????????? Thai"
+msgstr "???????????????????? Low Saxon"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "???????????????????? Swati"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "?? ???????????????????????? ???????????????? GNU Emacs."
-
-#~ msgid "Brazilian Support"
-#~ msgstr "???????????????????? ??????????????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "Canadian Support"
-#~ msgstr "???????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "???????????????????? ???????????????????????? ???????????????????????????? ?????? Mozilla"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "???????????????????? ????????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "???????????????????? ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "???????????????????? ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "???????????????????? ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "???????????????????? ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr ""
-#~ "???????????????????????? ???????? ???? ???????????? ?????? ???? ????????????????????????????  ?????? ???????????? (compile)."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "?????????????????? ???????????????? KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????????? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????????? ???????????? ?????? ??????????????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "???????????? ?????? Mozilla ?????? ?????? ?????????????????? x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????? ?????????????????????? Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "???????? ?????????????????? SQL"
-
-#~ msgid "Server"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "???????????????????? ?????????????????????????????? ?????????????? ?????? ????-???????????????????? ??????????????????????????."
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????? Syriac"
-
-#~ msgid "System"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???????? IMAP ?? Postfix "
-#~ "???????????????????? ??????????????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ???????????????? "
-#~ "?????? Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "?????????????????????? ?????????????????? ???????????????????? ?????????? ????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "?????????????? ?????????????? ????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "???????????????????????? ??????????????????????"
-
-#~ msgid "English"
-#~ msgstr "??????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????????"
-
-#~ msgid "Italian"
-#~ msgstr "??????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "???????????????????? Red Hat Enterprise Linux 3"
-
-#~ msgid "Spanish"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????????????? ?????????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux ?????? "
-#~ "?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux ?????? "
-#~ "?????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????? ????????????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "??????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "???????????????????????? ????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????????????? ???????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????????? ???????????????? ????????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????????????????? ????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? Gujarati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? Punjabi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????? ????????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????????????? ???? ??????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "???????????????????? ??????????????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ???? ?????????? ???????????????? ???????????????????? ?????? ???????????????????? ???? ??????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???? ?????????? ???????????????? ???????????????????? ?????? GFS ????????-????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????????????? GFS ???????? ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ?????? ???????????????????????? ????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "???????????????????????? Java Runtime ?????? Development Kits"
-
-#~ msgid "Misc"
-#~ msgstr "??????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "?????????????????? ??????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ???? ?????????? ???????????????? ???????????????? ?????????????????????????????? ?????? ???? Red Hat "
-#~ "Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????? ?????? ???????????????? ?????????????? ????????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "???????????????????? ??????????????????????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "?????????????????????? ?????????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "???????????? ?????????????????????? Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr ""
-#~ "???????????? ???? ?????????? ???????????????? ?????????????????????????????? ?????? ?????? ?????????????????????????? "
-#~ "????????????????????????."
-
-#~ msgid "IBM eServer iSeries/pSeries Provided Software"
-#~ msgstr "?????????????????? ???????????????????? ?????? IBM eServer iSeries/pSeries"
-
-#~ msgid "Software provided by IBM for eServer iSeries and pSeries machines"
-#~ msgstr ""
-#~ "?????????????????? ???? ?????????? ?????????????????? ?????? ?????? IBM ?????? ?????? ?????????????? eServer iSeries "
-#~ "?????? pSeries"
-
-#~ msgid "HPC"
-#~ msgstr "HPC"
-
-#~ msgid "High Performance Computing Support"
-#~ msgstr "???????????????????? ?????????????????????????? ???????????????????? ???????????? ????????????????"
-
-#~ msgid ""
-#~ "These packages provide the kernel and userspace tools needed for using "
-#~ "the Xen virtual machine monitor"
-#~ msgstr ""
-#~ "???????? ???? ???????????? ???????????????? ?????? ???????????? ?????? ???? ???????????????? ?????????? ?????????????? ?????? "
-#~ "?????????????????????? ?????? ???? ?????????? ?????? ???????????? ?????????????????? ?????????????? Xen"
+msgstr "?????????? ???????????? bitmap ?????? ???????????????????????? ????????????????????????????"
 
-#~ msgid "Xen"
-#~ msgstr "Xen"



From fedora-extras-commits at redhat.com  Mon Sep 24 17:54:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 13:54:56 -0400
Subject: rpms/xorg-x11-drv-nv import.log,1.8,1.9
Message-ID: <200709241754.l8OHsuH2017006@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769

Modified Files:
	import.log 
Log Message:
xf86-video-nv 2.1.5



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	27 Aug 2007 16:06:25 -0000	1.8
+++ import.log	24 Sep 2007 17:54:24 -0000	1.9
@@ -5,3 +5,4 @@
 xorg-x11-drv-nv-2_1_1-1_fc8:HEAD:xorg-x11-drv-nv-2.1.1-1.fc8.src.rpm:1183483032
 xorg-x11-drv-nv-2_1_3-1_fc8:HEAD:xorg-x11-drv-nv-2.1.3-1.fc8.src.rpm:1187360104
 xorg-x11-drv-nv-2_1_3-1_fc7:F-7:xorg-x11-drv-nv-2.1.3-1.fc7.src.rpm:1188230270
+xorg-x11-drv-nv-2_1_5-1_fc8:HEAD:xorg-x11-drv-nv-2.1.5-1.fc8.src.rpm:1190655540



From fedora-extras-commits at redhat.com  Mon Sep 24 17:55:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 13:55:00 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 xorg-x11-drv-nv.spec, 1.53, 1.54
Message-ID: <200709241755.l8OHt0HM017019@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Log Message:
xf86-video-nv 2.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Sep 2007 23:59:16 -0000	1.25
+++ .cvsignore	24 Sep 2007 17:54:27 -0000	1.26
@@ -1,3 +1,2 @@
-nouveau-20070330.tar.bz2
-xf86-video-nv-2.1.3.tar.bz2
 nouveau-20070920.tar.bz2
+xf86-video-nv-2.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	19 Sep 2007 23:59:16 -0000	1.26
+++ sources	24 Sep 2007 17:54:27 -0000	1.27
@@ -1,2 +1,2 @@
-f9b38e24157c3aac6014119ac18d76da  xf86-video-nv-2.1.3.tar.bz2
 00ba97f704d775c1ed83e104d4f089be  nouveau-20070920.tar.bz2
+585977ae23109c58d3b42a54153cfd12  xf86-video-nv-2.1.5.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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-nv.spec	19 Sep 2007 23:59:16 -0000	1.53
+++ xorg-x11-drv-nv.spec	24 Sep 2007 17:54:27 -0000	1.54
@@ -8,8 +8,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.1.3
-Release:   2%{?dist}
+Version:   2.1.5
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -88,6 +88,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 2.1.5-1
+- xf86-video-nv 2.1.5.
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
 - update nouveau
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:55:22 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 10:55:22 -0700
Subject: [pkgdb] minicom: lkundrak has requested commit
Message-ID: <200709241755.l8OHtMRr013873@app3.fedora.phx.redhat.com>

Lubomir Kundrak (lkundrak) has requested the commit acl on minicom (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicom



From fedora-extras-commits at redhat.com  Mon Sep 24 17:56:06 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:56:06 -0400
Subject: rpms/isomaster/F-7 .cvsignore, 1.4, 1.5 isomaster.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200709241756.l8OHu6Om017300@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/isomaster/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17164

Modified Files:
	.cvsignore isomaster.spec sources 
Log Message:
Updated to isomaster-1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 20:16:38 -0000	1.4
+++ .cvsignore	24 Sep 2007 17:55:34 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/isomaster.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- isomaster.spec	25 Aug 2007 17:39:10 -0000	1.6
+++ isomaster.spec	24 Sep 2007 17:55:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 20:16:38 -0000	1.4
+++ sources	24 Sep 2007 17:55:34 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:59:33 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 24 Sep 2007 10:59:33 -0700
Subject: [pkgdb] minicom had acl change status
Message-ID: <200709241759.l8OHxXvA005447@app4.fedora.phx.redhat.com>

Miroslav Lichvar (mlichvar) has set the commit acl on minicom (Fedora devel) to Approved for Lubomir Kundrak (lkundrak)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicom



From fedora-extras-commits at redhat.com  Mon Sep 24 18:02:06 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 14:02:06 -0400
Subject: rpms/isomaster/F-7 isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1
Message-ID: <200709241802.l8OI26ZG024295@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/isomaster/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24262

Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Added patches for 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:07:52 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:07:52 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.42,1.43
Message-ID: <200709241807.l8OI7qPP024633@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24562

Modified Files:
	apr-util.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.2.10-2
- Rebuild for upgrade path (add dist since that's now on F-7 branch)



Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- apr-util.spec	11 Sep 2007 09:50:55 -0000	1.42
+++ apr-util.spec	24 Sep 2007 18:07:19 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.10
-Release: 1
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -149,6 +149,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.2.10-2
+- Rebuild for upgrade path (add dist since that's now on F-7 branch)
+
 * Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.10-1
 - bump up to 1.2.10
 - pick up newly checked in MySQL DBD driver directly from ASF



From fedora-extras-commits at redhat.com  Mon Sep 24 18:11:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:11:14 -0400
Subject: rpms/xorg-x11-xinit import.log,1.1,1.2
Message-ID: <200709241811.l8OIBEXU024833@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738

Modified Files:
	import.log 
Log Message:
xinit 1.0.7



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:15:16 -0000	1.1
+++ import.log	24 Sep 2007 18:10:41 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-xinit-1_0_7-1_fc8:HEAD:xorg-x11-xinit-1.0.7-1.fc8.src.rpm:1190656518



From fedora-extras-commits at redhat.com  Mon Sep 24 18:11:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:11:19 -0400
Subject: rpms/xorg-x11-xinit/devel xinit-1.0.7-poke-ck.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.7,
	1.8 xinit-1.0.2-client-session.patch, 1.1,
	1.2 xorg-x11-xinit.spec, 1.50, 1.51 xinit-1.0.2-2-poke-ck.patch,
	1.1, NONE xinit-1.0.2-setuid.diff, 1.1, NONE xinput.sh, 1.4, NONE
Message-ID: <200709241811.l8OIBJJd024842@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738/devel

Modified Files:
	.cvsignore sources xinit-1.0.2-client-session.patch 
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.7-poke-ck.patch 
Removed Files:
	xinit-1.0.2-2-poke-ck.patch xinit-1.0.2-setuid.diff xinput.sh 
Log Message:
xinit 1.0.7


xinit-1.0.7-poke-ck.patch:

--- NEW FILE xinit-1.0.7-poke-ck.patch ---
diff -up xinit-1.0.7/xinit.c.poke-ck xinit-1.0.7/xinit.c
--- xinit-1.0.7/xinit.c.poke-ck	2007-09-24 13:48:04.000000000 -0400
+++ xinit-1.0.7/xinit.c	2007-09-24 13:53:55.000000000 -0400
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 /* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
 /* $XdotOrg: $ */
 
@@ -39,6 +40,13 @@ in this Software without prior written a
 #include <ctype.h>
 #include <stdint.h>
 
+#define USE_CONKIT
+#ifdef USE_CONKIT
+#include <ck-connector.h>
+#include <X11/Xatom.h>
+static CkConnector *ckc = NULL;
+#endif /* USE_CONKIT */
+
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <signal.h>
@@ -521,6 +529,39 @@ processTimeout(int timeout, char *string
 	return( serverpid != pidfound );
 }
 
+
+#ifdef USE_CONKIT
+static void
+register_new_session_with_console_kit (void)
+{
+	static char conkitbuf[256];
+	DBusError   error;
+
+	ckc = ck_connector_new ();
+	if (ckc == NULL) {
+		Error ("Cannot register with ConsoleKit: OOM creating CkConnector\n");
+		goto out;
+	}
+
+	dbus_error_init (&error);
+	if (!ck_connector_open_session (ckc, &error)) {
+		Error ("Cannot register with ConsoleKit: %s: %s\n", error.name, error.message);
+		goto out;
+	}
+
+	/* If we managed to register with ConsoleKit, put the
+	 * environment variable XDG_SESSION_COOKIE=cookie as second
+	 * element in newenviron. See set_environment() where we
+	 * earlier have made sure there is room...
+	 */
+	conkitbuf[sizeof (conkitbuf) - 1] = '\0';
+	snprintf (conkitbuf, sizeof (conkitbuf) - 1, "XDG_SESSION_COOKIE=%s", ck_connector_get_cookie (ckc));
+	newenviron[1] = conkitbuf;
+out:
+	;
+}
+#endif /* USE_CONKIT */
+
 static int
 startServer(char *server[])
 {
@@ -631,6 +672,12 @@ startServer(char *server[])
 		break;
 	}
 
+#ifdef USE_CONKIT
+	if (serverpid != -1 ) {
+		register_new_session_with_console_kit ();
+	}
+#endif /* USE_CONKIT */
+
 	return(serverpid);
 }
 
@@ -785,6 +832,13 @@ shutdown(void)
 				clientpid);
 	}
 
+#ifdef USE_CONKIT
+	if (ckc != NULL) {
+		ck_connector_unref (ckc);
+		ckc = NULL;
+	}
+#endif
+
 	if (serverpid < 0)
 		return;
 	errno = 0;
@@ -821,6 +875,13 @@ shutdown(void)
  * make a new copy of environment that has room for DISPLAY
  */
 
+
+#ifdef USE_CONKIT
+#define NUM_EXTRA_ENV_VARS 3
+#else
+#define NUM_EXTRA_ENV_VARS 2
+#endif
+
 static void 
 set_environment(void)
 {
@@ -832,11 +893,11 @@ set_environment(void)
     for (oldPtr = environ; *oldPtr; oldPtr++) ;
 
     nenvvars = (oldPtr - environ);
-    newenviron = (char **) malloc ((nenvvars + 3) * sizeof(char **));
+    newenviron = (char **) malloc ((nenvvars + NUM_EXTRA_ENV_VARS) * sizeof(char **));
     if (!newenviron) {
 	fprintf (stderr,
 		 "%s:  unable to allocate %d pointers for environment\n",
-		 program, nenvvars + 3);
+		 program, nenvvars + NUM_EXTRA_ENV_VARS);
 	exit (1);
     }
 
@@ -846,10 +907,19 @@ set_environment(void)
     newPtr = newenviron;
     *newPtr++ = displaybuf;
 
+#ifdef USE_CONKIT
+    *newPtr++ = "XDG_SESSION_COOKIE=";
+#endif
+
     /* copy pointers to other variables */
     for (oldPtr = environ; *oldPtr; oldPtr++) {
 	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0
-	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0) {
+	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0
+#ifdef USE_CONKIT
+	 && strncmp (*oldPtr, "XDG_SESSION_COOKIE=", 19) != 0
+#endif
+	 )
+	{
 	    *newPtr++ = *oldPtr;
 	}
     }
diff -up xinit-1.0.7/configure.ac.poke-ck xinit-1.0.7/configure.ac
--- xinit-1.0.7/configure.ac.poke-ck	2007-09-17 06:46:38.000000000 -0400
+++ xinit-1.0.7/configure.ac	2007-09-24 13:48:04.000000000 -0400
@@ -92,7 +92,7 @@ AC_ARG_WITH(xinit,
 	[XINIT="$DEFAULT_XINIT"])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XINIT, x11)
+PKG_CHECK_MODULES(XINIT, x11 ck-connector)
 
 case $host_os in
     *bsd*)
diff -up xinit-1.0.7/startx.cpp.poke-ck xinit-1.0.7/startx.cpp
--- xinit-1.0.7/startx.cpp.poke-ck	2007-09-16 17:24:48.000000000 -0400
+++ xinit-1.0.7/startx.cpp	2007-09-24 13:48:04.000000000 -0400
@@ -223,6 +223,12 @@ EOF
     fi
 done
 
+if [ x"$display" != x ]; then
+    export DISPLAY=$display
+else
+    export DISPLAY=:0
+fi
+
 #if defined(__SCO__) || defined(__UNIXWARE__)
 if [ "$REMOTE_SERVER" = "TRUE" ]; then
         exec SHELL_CMD ${client}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jul 2006 06:46:08 -0000	1.10
+++ .cvsignore	24 Sep 2007 18:10:45 -0000	1.11
@@ -1,3 +1 @@
-*.tar.bz2
-*.tar.gz
-clog
+xinit-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2006 22:49:30 -0000	1.7
+++ sources	24 Sep 2007 18:10:45 -0000	1.8
@@ -1 +1 @@
-d591fafe69b57969b0521c461073a01f  xinit-1.0.2.tar.bz2
+8b882d9e2deed9d85469a3beaec566a3  xinit-1.0.7.tar.bz2

xinit-1.0.2-client-session.patch:

Index: xinit-1.0.2-client-session.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinit-1.0.2-client-session.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinit-1.0.2-client-session.patch	10 Nov 2006 15:31:06 -0000	1.1
+++ xinit-1.0.2-client-session.patch	24 Sep 2007 18:10:45 -0000	1.2
@@ -9,7 +9,7 @@
  			Error("cannot change uid: %s\n", strerror(errno));
  			_exit(ERR_EXIT);
  		}
--		setpgrp(0, getpid());
+-		setpgid(0, getpid());
 +		fd = open ("/dev/null", O_RDONLY);
 +
 +		if (fd < 0) {


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-xinit.spec	21 Aug 2007 19:30:34 -0000	1.50
+++ xorg-x11-xinit.spec	24 Sep 2007 18:10:45 -0000	1.51
@@ -2,8 +2,8 @@
 
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
-Version:   1.0.2
-Release:   27%{?dist}
+Version:   1.0.7
+Release:   1%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -20,9 +20,8 @@
 Source16: Xsession
 Source17: localuser.sh
 
-Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
 Patch1: xinit-1.0.2-client-session.patch
-Patch2: xinit-1.0.2-2-poke-ck.patch
+Patch2: xinit-1.0.7-poke-ck.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .setuid
 %patch1 -p1 -b .client-session
 %patch2 -p1 -b .poke-ck
 
@@ -110,6 +108,9 @@
 %{_mandir}/man1/xinit.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.7-1
+- xinit 1.0.7
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-27
 - Rebuild for build id
 


--- xinit-1.0.2-2-poke-ck.patch DELETED ---


--- xinit-1.0.2-setuid.diff DELETED ---


--- xinput.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:14:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:14:58 -0400
Subject: rpms/xorg-x11-drv-vmware import.log,1.1,1.2
Message-ID: <200709241814.l8OIEwwa025061@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Modified Files:
	import.log 
Log Message:
xf86-video-vmware 10.15.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:16 -0000	1.1
+++ import.log	24 Sep 2007 18:14:25 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-vmware-10_15_1-1_fc8:HEAD:xorg-x11-drv-vmware-10.15.1-1.fc8.src.rpm:1190656738



From fedora-extras-commits at redhat.com  Mon Sep 24 18:15:02 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:15:02 -0400
Subject: rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-vmware.spec, 1.14, 1.15
Message-ID: <200709241815.l8OIF21Z025066@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vmware.spec 
Log Message:
xf86-video-vmware 10.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2007 23:23:08 -0000	1.8
+++ .cvsignore	24 Sep 2007 18:14:29 -0000	1.9
@@ -1 +1 @@
-xf86-video-vmware-10.14.1.tar.bz2
+xf86-video-vmware-10.15.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2007 23:23:08 -0000	1.8
+++ sources	24 Sep 2007 18:14:29 -0000	1.9
@@ -1 +1 @@
-eaf1ce9fa23363799140602afaa10f37  xf86-video-vmware-10.14.1.tar.bz2
+670b578d7631e2d3e2c4083c1c35669c  xf86-video-vmware-10.15.1.tar.bz2


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-vmware.spec	24 Aug 2007 12:08:43 -0000	1.14
+++ xorg-x11-drv-vmware.spec	24 Sep 2007 18:14:29 -0000	1.15
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
-Version:   10.14.1
-Release:   3%{?dist}
+Version:   10.15.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 10.15.1-1
+- xf86-video-vmware 10.15.1
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 10.14.1-3
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:16:40 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 14:16:40 -0400
Subject: rpms/xmoto/devel xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.23, 1.24
Message-ID: <200709241816.l8OIGeUn025177@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xmoto.spec	29 Aug 2007 16:58:16 -0000	1.23
+++ xmoto.spec	24 Sep 2007 18:16:07 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:17:44 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:17:44 -0400
Subject: rpms/xorg-x11-drv-vmmouse import.log,1.1,1.2
Message-ID: <200709241817.l8OIHirK025298@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235

Modified Files:
	import.log 
Log Message:
vmmouse 12.4.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:09 -0000	1.1
+++ import.log	24 Sep 2007 18:17:11 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-vmmouse-12_4_2-1_fc8:HEAD:xorg-x11-drv-vmmouse-12.4.2-1.fc8.src.rpm:1190656894



From fedora-extras-commits at redhat.com  Mon Sep 24 18:17:48 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:17:48 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel .cvsignore, 1.4, 1.5 sources, 1.4, 
	1.5 xorg-x11-drv-vmmouse.spec, 1.11, 1.12
Message-ID: <200709241817.l8OIHmH7025311@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vmmouse.spec 
Log Message:
vmmouse 12.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Apr 2006 03:27:45 -0000	1.4
+++ .cvsignore	24 Sep 2007 18:17:14 -0000	1.5
@@ -1 +1 @@
-xf86-input-vmmouse-12.4.0.tar.bz2
+xf86-input-vmmouse-12.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Apr 2006 03:27:45 -0000	1.4
+++ sources	24 Sep 2007 18:17:14 -0000	1.5
@@ -1 +1 @@
-313e403e56702f6c38d1a5c830b60dc2  xf86-input-vmmouse-12.4.0.tar.bz2
+5e5a41d1a0d8f80779f958814ed8392f  xf86-input-vmmouse-12.4.2.tar.bz2


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-vmmouse.spec	24 Aug 2007 12:07:46 -0000	1.11
+++ xorg-x11-drv-vmmouse.spec	24 Sep 2007 18:17:14 -0000	1.12
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
-Version:   12.4.0
-Release:   4%{?dist}
+Version:   12.4.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,9 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 12.4.2-1
+- xf86-input-vmmouse 12.4.2
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 12.4.0-4
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:18:02 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 14:18:02 -0400
Subject: rpms/kernel/devel kernel.spec, 1.180,
	1.181 linux-2.6-highres-timers.patch, 1.11, 1.12
Message-ID: <200709241818.l8OII2cF025363@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25278

Modified Files:
	kernel.spec linux-2.6-highres-timers.patch 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- Update hi-res timers patch to .23rc7-hrt1.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kernel.spec	24 Sep 2007 14:37:26 -0000	1.180
+++ kernel.spec	24 Sep 2007 18:17:29 -0000	1.181
@@ -1803,6 +1803,9 @@
 
 %changelog
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- Update hi-res timers patch to .23rc7-hrt1.
+
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7-git5
 
 * Sun Sep 23 2007 Dave Jones <davej at redhat.com>

linux-2.6-highres-timers.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 linux-2.6-highres-timers.patch
Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-highres-timers.patch	24 Sep 2007 02:26:20 -0000	1.11
+++ linux-2.6-highres-timers.patch	24 Sep 2007 18:17:29 -0000	1.12
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc3/include/linux/clockchips.h
+Index: linux-2.6.23-rc7/include/linux/clockchips.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/clockchips.h	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/clockchips.h	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
 @@ -8,7 +8,7 @@
  #ifndef _LINUX_CLOCKCHIPS_H
  #define _LINUX_CLOCKCHIPS_H
@@ -28,10 +28,10 @@
  #define clockevents_notify(reason, arg) do { } while (0)
  
  #endif
-Index: linux-2.6.23-rc3/kernel/time/Kconfig
+Index: linux-2.6.23-rc7/kernel/time/Kconfig
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Kconfig	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Kconfig	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/Kconfig	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/Kconfig	2007-09-20 21:06:24.000000000 +0200
 @@ -23,3 +23,8 @@ config HIGH_RES_TIMERS
  	  hardware is not capable then this option only increases
  	  the size of the kernel image.
@@ -41,10 +41,10 @@
 +	default y
 +	depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
 +
-Index: linux-2.6.23-rc3/kernel/time/Makefile
+Index: linux-2.6.23-rc7/kernel/time/Makefile
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Makefile	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Makefile	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/Makefile	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/Makefile	2007-09-20 21:06:24.000000000 +0200
 @@ -1,6 +1,6 @@
  obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
  
@@ -53,10 +53,10 @@
  obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o
  obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= tick-broadcast.o
  obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o
-Index: linux-2.6.23-rc3/kernel/time/clockevents.c
+Index: linux-2.6.23-rc7/kernel/time/clockevents.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/clockevents.c	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/clockevents.c	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/clockevents.c	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/clockevents.c	2007-09-20 21:06:24.000000000 +0200
 @@ -194,6 +194,7 @@ void clockevents_exchange_device(struct 
  	local_irq_restore(flags);
  }
@@ -71,151 +71,595 @@
  EXPORT_SYMBOL_GPL(clockevents_notify);
 -
 +#endif
-Index: linux-2.6.23-rc3/Documentation/cpuidle/core.txt
+Index: linux-2.6.23-rc7/Documentation/00-INDEX
+===================================================================
+--- linux-2.6.23-rc7.orig/Documentation/00-INDEX	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/Documentation/00-INDEX	2007-09-20 21:06:24.000000000 +0200
+@@ -62,6 +62,8 @@ VGA-softcursor.txt
+ 	- how to change your VGA cursor from a blinking underscore.
+ accounting/
+ 	- documentation on accounting and taskstats.
++acpi
++	- general ACPI information
+ aoe/
+ 	- description of AoE (ATA over Ethernet) along with config examples.
+ applying-patches.txt
+Index: linux-2.6.23-rc7/Documentation/acpi/00-INDEX
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.23-rc7/Documentation/acpi/00-INDEX	2007-09-20 21:06:24.000000000 +0200
+@@ -0,0 +1,6 @@
++00-INDEX
++	- this file
++README.ACPI
++	- where to start
++acpi_debugging.txt
++	- How to debug ACPI problems
+Index: linux-2.6.23-rc7/Documentation/acpi/README.ACPI
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc3/Documentation/cpuidle/core.txt	2007-08-13 16:49:31.000000000 +0200
-@@ -0,0 +1,17 @@
++++ linux-2.6.23-rc7/Documentation/acpi/README.ACPI	2007-09-20 21:06:24.000000000 +0200
+@@ -0,0 +1,377 @@
++Developing ACPI for Linux - July 13, 2007
++------------------------------------------
++Len Brown <lenb at kernel.org> (Intel Open Source Technology Center)
++
++This is how you can be most effective improving Linux ACPI support.
++
++Latest version of this file
++---------------------------
++http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/README.ACPI
++
++Linux/ACPI home page
++--------------------
++http://acpi.sourceforge.net/
++
++Mailing Lists
++-------------
++Inventory of lists: http://acpi.sourceforge.net/mailinglists.html
++
++The main list is linux-acpi at vger.kernel.org.
++Subscribe here: http://vger.kernel.org/vger-lists.html#linux-acpi
++Note this list server has a 100KB message limit size.
++If you need to post something big, attaching it to a bugzilla entry
++(below) is usually the way to go.
++
++Which e-mail address to use?
++----------------------------
++For issues, discussion, RFC's, debugging etc:
++To: linux-acpi at vger.kernel.org
++
++To request an ACPI patch be applied to Linux:
++To: lenb at kernel.org
++Cc: linux-acpi at vger.kernel.org
++
++Feedback to (only) Intel on Intel's ACPICA,
++or ACPI-related issues with NDA pre-production systems:
++To: acpi at linux.intel.com
++
++Len Brown is on both of these lists, and he also sees traffic to
++LKML, cpufreq, pci, and ia64 lists when the word ACPI appears in it.
++
++Note that Len signs-off using "len.brown at intel.com" to make it clear
++that he is employed by Intel.  While that address is functional,
++lenb at kernel.org is preferred for all public Linux work.
++
++asus_acpi or asus-laptop specific e-mail:
++to: acpi4asus-user at lists.sourceforge.net
++
++ibm_acpi specific e-mail:
++ibm-acpi-devel at lists.sourceforge.net
++
++Bugzilla
++--------
++The Linux/ACPI community makes active use of bugzilla.
++http://bugzilla.kernel.org/enter_bug.cgi?product=ACPI
++Note that this database is for kernel.org kernels only.
++
++If an issue is specific to a distribution, it should
++be filed in their database.  If a sighting appears in both,
++please cross reference it using a complete URL.
++
++In both cases, please cc: acpi-bugzilla at lists.sourceforge.net
++on the bug report.  You can subscribe to this list to see
++all ACPI bugzilla updates:
++https://lists.sourceforge.net/lists/listinfo/acpi-bugzilla
++Note that this list is intended for bugzilla machine-generated
++messages only.
++
++If the distribution bug report is private due to being
++on pre-production hardware and you want Intel's ACPI team
++to know about it, then cc: acpi at linux.intel.com
++
++Sometimes you'll see check-in comments including reference
++to small bugzilla numbers, eg. (BZ 123), these refer to a
++bugzilla database inside Intel where ACPICA issues
++are tracked that don't apply directly to the Linux kernel
++and thus would not fit within the charter of bugzilla.kernel.org.
++
++While discussion-oriented issues are best dealt with
++on the list, bugzilla has two useful properties:
++
++1. you can attach a whole bunch of stuff there
++   without irritating everybody on the list --
++   including items > 100KB.
++2. bugzilla never forgets -- so your issue
++   will not get lost in the shuffle of e-mail overload.
++
++Sometimes it works well to file the supporting debug output
++for your issue in bugzilla and then refer to it
++on the linux-acpi at vger.kernel.org list.
++
++Please be sure to answer these questions when you submit
++the bug, so they don't have to be asked later:
++
++0. Exactly what kernel version does this bug appear in?
++
++1. Does it still appear in the latest version?
++
++2. Is this a new problem (a regression) or has this problem
++   always existed in every version of Linux tested?
++
++3. If a regression, what is the latest version of the
++   kernel.org kernel where it does not happen?
++
[...3822 lines suppressed...]
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-@@ -208,6 +209,8 @@ void cpu_idle (void)
+@@ -209,6 +209,8 @@ void cpu_idle (void)
  			if (__get_cpu_var(cpu_idle_state))
  				__get_cpu_var(cpu_idle_state) = 0;
  
@@ -5364,10 +5790,10 @@
  		preempt_enable_no_resched();
  		schedule();
  		preempt_disable();
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/Makefile
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/Makefile
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/Makefile	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/Makefile	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/Makefile	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/Makefile	2007-09-20 21:06:25.000000000 +0200
 @@ -9,7 +9,7 @@ obj-y	:= process.o signal.o entry.o trap
  		x8664_ksyms.o i387.o syscall.o vsyscall.o \
  		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
@@ -5386,10 +5812,10 @@
  therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
  bootflag-y			+= ../../i386/kernel/bootflag.o
  cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/i8259.c	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/i8259.c	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c	2007-09-20 21:06:25.000000000 +0200
 @@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
  	}
  }
@@ -5450,10 +5876,10 @@
  	if (!acpi_ioapic)
  		setup_irq(2, &irq2);
  }
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/smpboot.c	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/smpboot.c	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c	2007-09-20 21:06:25.000000000 +0200
 @@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
  	local_irq_disable();
  	Dprintk("Stack at about %p\n",&cpuid);
@@ -5472,10 +5898,10 @@
  	/*
  	 * The sibling maps must be set before turing the online map on for
  	 * this cpu
-Index: linux-2.6.23-rc3/include/asm-x86_64/hpet.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/hpet.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/hpet.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/hpet.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/hpet.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/hpet.h	2007-09-20 21:06:25.000000000 +0200
 @@ -1,18 +1,2 @@
 -#ifndef _ASM_X8664_HPET_H
 -#define _ASM_X8664_HPET_H 1
@@ -5495,10 +5921,10 @@
 -extern unsigned long hpet_tick;
 -
 -#endif
-Index: linux-2.6.23-rc3/include/asm-x86_64/apic.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/apic.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/apic.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/apic.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/apic.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/apic.h	2007-09-20 21:06:25.000000000 +0200
 @@ -19,7 +19,6 @@
  extern int apic_verbosity;
  extern int apic_runs_main_timer;
@@ -5527,10 +5953,10 @@
  #define ARCH_APICTIMER_STOPS_ON_C3	1
  
  extern unsigned boot_cpu_id;
-Index: linux-2.6.23-rc3/include/asm-x86_64/proto.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/proto.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/proto.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/proto.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/proto.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/proto.h	2007-09-20 21:06:25.000000000 +0200
 @@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
  
  extern void load_gs_index(unsigned gs);
@@ -5556,10 +5982,10 @@
  #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
  #define round_down(x,y) ((x) & ~((y)-1))
  
-Index: linux-2.6.23-rc3/include/linux/jiffies.h
+Index: linux-2.6.23-rc7/include/linux/jiffies.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/jiffies.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/jiffies.h	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/linux/jiffies.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/jiffies.h	2007-09-20 21:06:26.000000000 +0200
 @@ -36,8 +36,6 @@
  /* LATCH is used in the interval timer and ftape setup. */
  #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
@@ -5583,10 +6009,10 @@
  /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
  #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
  
-Index: linux-2.6.23-rc3/include/asm-i386/hpet.h
+Index: linux-2.6.23-rc7/include/asm-i386/hpet.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-i386/hpet.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-i386/hpet.h	2007-08-13 16:49:35.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-i386/hpet.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-i386/hpet.h	2007-09-20 21:06:26.000000000 +0200
 @@ -64,8 +64,11 @@
  
  /* hpet memory map physical address */
@@ -5607,10 +6033,10 @@
  
  #endif /* CONFIG_HPET_TIMER */
  #endif /* _I386_HPET_H */
-Index: linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/vsyscall.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:26.000000000 +0200
 @@ -29,9 +29,6 @@ enum vsyscall_num {
  #define VGETCPU_RDTSCP	1
  #define VGETCPU_LSL	2
@@ -5621,10 +6047,10 @@
  extern int __vgetcpu_mode;
  extern volatile unsigned long __jiffies;
  
-Index: linux-2.6.23-rc3/kernel/time/tick-broadcast.c
+Index: linux-2.6.23-rc7/kernel/time/tick-broadcast.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-broadcast.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-broadcast.c	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/tick-broadcast.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/tick-broadcast.c	2007-09-20 21:06:26.000000000 +0200
 @@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
   */
  int tick_check_broadcast_device(struct clock_event_device *dev)
@@ -5637,7 +6063,7 @@
  		return 0;
  
  	clockevents_exchange_device(NULL, dev);
-@@ -519,11 +520,9 @@ static void tick_broadcast_clear_oneshot
+@@ -530,11 +531,9 @@ static void tick_broadcast_clear_oneshot
   */
  void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
  {
@@ -5652,10 +6078,10 @@
  }
  
  /*
-Index: linux-2.6.23-rc3/kernel/time/tick-common.c
+Index: linux-2.6.23-rc7/kernel/time/tick-common.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-common.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-common.c	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/tick-common.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/tick-common.c	2007-09-20 21:06:26.000000000 +0200
 @@ -200,7 +200,7 @@ static int tick_check_new_device(struct 
  
  	cpu = smp_processor_id();
@@ -5674,10 +6100,10 @@
  	spin_unlock_irqrestore(&tick_device_lock, flags);
  
  	return ret;
-Index: linux-2.6.23-rc3/arch/i386/kernel/quirks.c
+Index: linux-2.6.23-rc7/arch/i386/kernel/quirks.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/i386/kernel/quirks.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/arch/i386/kernel/quirks.c	2007-08-13 16:49:35.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/i386/kernel/quirks.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/arch/i386/kernel/quirks.c	2007-09-20 21:06:27.000000000 +0200
 @@ -4,6 +4,8 @@
  #include <linux/pci.h>
  #include <linux/irq.h>
@@ -5968,11 +6394,11 @@
 +}
 +
 +#endif
-Index: linux-2.6.23-rc3/include/linux/pci_ids.h
+Index: linux-2.6.23-rc7/include/linux/pci_ids.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/pci_ids.h	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/pci_ids.h	2007-08-13 16:49:35.000000000 +0200
-@@ -2215,6 +2215,7 @@
+--- linux-2.6.23-rc7.orig/include/linux/pci_ids.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/pci_ids.h	2007-09-20 21:06:26.000000000 +0200
+@@ -2221,6 +2221,7 @@
  #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
  #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6
  #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db



From fedora-extras-commits at redhat.com  Mon Sep 24 18:18:19 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:18:19 -0400
Subject: rpms/clamav/devel clamav.spec,1.58,1.59
Message-ID: <200709241818.l8OIIJ4P025372@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25303

Modified Files:
	clamav.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.91.2-2
- Bump release for upgrade path.



Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- clamav.spec	25 Aug 2007 10:40:56 -0000	1.58
+++ clamav.spec	24 Sep 2007 18:17:46 -0000	1.59
@@ -18,7 +18,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.91.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -507,6 +507,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.91.2-2
+- Bump release for upgrade path.
+
 * Sat Aug 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.91.2-1
 - updated to 0.91.2 (SECURITY):
 - CVE-2007-4510 DOS in RTF parser



From fedora-extras-commits at redhat.com  Mon Sep 24 18:19:48 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Mon, 24 Sep 2007 14:19:48 -0400
Subject: rpms/kernel-xen-2.6/devel git-geode.patch, 1.1,
	NONE linux-2.6-NFSD-ctlbits.patch, 1.1,
	NONE linux-2.6-cachefiles.patch, 1.1,
	NONE linux-2.6-cafe-nand.patch, 1.1,
	NONE linux-2.6-cpufreq-unload-smi.patch, 1.1,
	NONE linux-2.6-debug-disable-builtins.patch, 1.1,
	NONE linux-2.6-debug-verbosify-bug.patch, 1.1,
	NONE linux-2.6-defaults-disable-split-ptlock.patch, 1.2,
	NONE linux-2.6-defaults-phys-start.patch, 1.1,
	NONE linux-2.6-drivers-add-qlogic-firmware.patch, 1.1,
	NONE linux-2.6-gfs2-locking-exports.patch, 1.1,
	NONE linux-2.6-gfs2-tux.patch, 1.1,
	NONE linux-2.6-hvc-console.patch, 1.1,
	NONE linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.1,
	NONE linux-2.6-ips-softlockup.patch, 1.1,
	NONE linux-2.6-lockdep-fixes.patch, 1.1,
	NONE linux-2.6-mac-raid-autorun.patch, 1.1,
	NONE linux-2.6-marvell-88alp01.patch, 1.1,
	NONE linux-2.6-marvell-update.patch, 1.1,
	NONE linux-2.6-mtd-update.patch, 1.1,
	NONE linux-2.6-net-forcedeth-suspend.patch, 1.1,
	NONE linux-2.6-olpc-battery.patch, 1.1,
	NONE linux-2.6-olpc-dcon.patch, 1.1,
	NONE linux-2.6-power6-no-ci-large-page.patch, 1.1,
	NONE linux-2.6-ppc-iseries-input-layer.patch, 1.1,
	NONE linux-2.6-ppc-rtas-check.patch, 1.1,
	NONE linux-2.6-sata-promise-pata-ports.patch, 1.2,
	NONE linux-2.6-softcursor-persistent-alloc.patch, 1.1,
	NONE linux-2.6-sysprof-1.0.3.patch, 1.1,
	NONE linux-2.6-tux.patch, 1.1,
	NONE linux-2.6-usb-storage-reboot.patch, 1.1,
	NONE linux-2.6-vm-debug.patch, 1.1,
	NONE linux-2.6-warn-c-p-a.patch, 1.1,
	NONE linux-2.6-x86-apic-auto.patch, 1.1,
	NONE linux-2.6-xen-execshield.patch, 1.4,
	NONE linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch, 1.2,
	NONE linux-2.6-xen-utrace.patch, 1.3,
	NONE linux-2.6-xen-x86_64-silence-up-apic-errors.patch, 1.1,
	NONE linux-2.6.20.14-xen-3.1.0.patch, 1.2, NONE
Message-ID: <200709241819.l8OIJmDu025438@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Removed Files:
	git-geode.patch linux-2.6-NFSD-ctlbits.patch 
	linux-2.6-cachefiles.patch linux-2.6-cafe-nand.patch 
	linux-2.6-cpufreq-unload-smi.patch 
	linux-2.6-debug-disable-builtins.patch 
	linux-2.6-debug-verbosify-bug.patch 
	linux-2.6-defaults-disable-split-ptlock.patch 
	linux-2.6-defaults-phys-start.patch 
	linux-2.6-drivers-add-qlogic-firmware.patch 
	linux-2.6-gfs2-locking-exports.patch linux-2.6-gfs2-tux.patch 
	linux-2.6-hvc-console.patch 
	linux-2.6-ia64-kexec-kdump-xen-conflict.patch 
	linux-2.6-ips-softlockup.patch linux-2.6-lockdep-fixes.patch 
	linux-2.6-mac-raid-autorun.patch 
	linux-2.6-marvell-88alp01.patch linux-2.6-marvell-update.patch 
	linux-2.6-mtd-update.patch 
	linux-2.6-net-forcedeth-suspend.patch 
	linux-2.6-olpc-battery.patch linux-2.6-olpc-dcon.patch 
	linux-2.6-power6-no-ci-large-page.patch 
	linux-2.6-ppc-iseries-input-layer.patch 
	linux-2.6-ppc-rtas-check.patch 
	linux-2.6-sata-promise-pata-ports.patch 
	linux-2.6-softcursor-persistent-alloc.patch 
	linux-2.6-sysprof-1.0.3.patch linux-2.6-tux.patch 
	linux-2.6-usb-storage-reboot.patch linux-2.6-vm-debug.patch 
	linux-2.6-warn-c-p-a.patch linux-2.6-x86-apic-auto.patch 
	linux-2.6-xen-execshield.patch 
	linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch 
	linux-2.6-xen-utrace.patch 
	linux-2.6-xen-x86_64-silence-up-apic-errors.patch 
	linux-2.6.20.14-xen-3.1.0.patch 
Log Message:
Removing patch files that are not being used anymore



--- git-geode.patch DELETED ---


--- linux-2.6-NFSD-ctlbits.patch DELETED ---


--- linux-2.6-cachefiles.patch DELETED ---


--- linux-2.6-cafe-nand.patch DELETED ---


--- linux-2.6-cpufreq-unload-smi.patch DELETED ---


--- linux-2.6-debug-disable-builtins.patch DELETED ---


--- linux-2.6-debug-verbosify-bug.patch DELETED ---


--- linux-2.6-defaults-disable-split-ptlock.patch DELETED ---


--- linux-2.6-defaults-phys-start.patch DELETED ---


--- linux-2.6-drivers-add-qlogic-firmware.patch DELETED ---


--- linux-2.6-gfs2-locking-exports.patch DELETED ---


--- linux-2.6-gfs2-tux.patch DELETED ---


--- linux-2.6-hvc-console.patch DELETED ---


--- linux-2.6-ia64-kexec-kdump-xen-conflict.patch DELETED ---


--- linux-2.6-ips-softlockup.patch DELETED ---


--- linux-2.6-lockdep-fixes.patch DELETED ---


--- linux-2.6-mac-raid-autorun.patch DELETED ---


--- linux-2.6-marvell-88alp01.patch DELETED ---


--- linux-2.6-marvell-update.patch DELETED ---


--- linux-2.6-mtd-update.patch DELETED ---


--- linux-2.6-net-forcedeth-suspend.patch DELETED ---


--- linux-2.6-olpc-battery.patch DELETED ---


--- linux-2.6-olpc-dcon.patch DELETED ---


--- linux-2.6-power6-no-ci-large-page.patch DELETED ---


--- linux-2.6-ppc-iseries-input-layer.patch DELETED ---


--- linux-2.6-ppc-rtas-check.patch DELETED ---


--- linux-2.6-sata-promise-pata-ports.patch DELETED ---


--- linux-2.6-softcursor-persistent-alloc.patch DELETED ---


--- linux-2.6-sysprof-1.0.3.patch DELETED ---


--- linux-2.6-tux.patch DELETED ---


--- linux-2.6-usb-storage-reboot.patch DELETED ---


--- linux-2.6-vm-debug.patch DELETED ---


--- linux-2.6-warn-c-p-a.patch DELETED ---


--- linux-2.6-x86-apic-auto.patch DELETED ---


--- linux-2.6-xen-execshield.patch DELETED ---


--- linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch DELETED ---


--- linux-2.6-xen-utrace.patch DELETED ---


--- linux-2.6-xen-x86_64-silence-up-apic-errors.patch DELETED ---


--- linux-2.6.20.14-xen-3.1.0.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:20:37 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:20:37 -0400
Subject: rpms/xorg-x11-drv-void import.log,1.1,1.2
Message-ID: <200709241820.l8OIKbVv025500@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-void
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460

Modified Files:
	import.log 
Log Message:
void 1.1.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:21 -0000	1.1
+++ import.log	24 Sep 2007 18:20:05 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-void-1_1_1-6_fc8:HEAD:xorg-x11-drv-void-1.1.1-6.fc8.src.rpm:1190657084



From fedora-extras-commits at redhat.com  Mon Sep 24 18:20:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:20:41 -0400
Subject: rpms/xorg-x11-drv-void/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-void.spec, 1.17, 1.18
Message-ID: <200709241820.l8OIKfkJ025505@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-void/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-void.spec 
Log Message:
void 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:28:08 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:20:08 -0000	1.8
@@ -1 +1 @@
-xf86-input-void-1.1.0.tar.bz2
+xf86-input-void-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:28:08 -0000	1.7
+++ sources	24 Sep 2007 18:20:08 -0000	1.8
@@ -1 +1 @@
-ea72a92d43b95f413347df96d6a73933  xf86-input-void-1.1.0.tar.bz2
+862c230f5f6e0c545f232b4c0fa9537a  xf86-input-void-1.1.1.tar.bz2


Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-void.spec	23 Aug 2007 18:44:04 -0000	1.17
+++ xorg-x11-drv-void.spec	24 Sep 2007 18:20:08 -0000	1.18
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version:   1.1.0
+Version:   1.1.1
 Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -42,12 +42,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%doc COPYING
 %defattr(-,root,root,-)
 %{driverdir}/void_drv.so
 %dir %{_mandir}
 %{_mandir}/man4/void.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.1-6
+- xf86-input-void 1.1.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-6
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:22:00 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 14:22:00 -0400
Subject: devel/kvm kvm.spec,1.25,1.26
Message-ID: <200709241822.l8OIM0Ip025645@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25582

Modified Files:
	kvm.spec 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
- fix build on x86_64



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kvm.spec	24 Sep 2007 17:04:47 -0000	1.25
+++ kvm.spec	24 Sep 2007 18:21:27 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -60,9 +60,11 @@
 # manual keeping up of what is in the kvm tree.
 sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
-make bios
 make %{?_smp_mflags} 
 
+# build the bios, and fix it's makefile
+sed -i 's/gcc -m32/gcc/' bios/Makefile
+make bios
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +95,7 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
-* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
 - fix build on x86_64
 
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3



From fedora-extras-commits at redhat.com  Mon Sep 24 18:22:29 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:22:29 -0400
Subject: rpms/gtranslator/devel gtranslator.spec,1.16,1.17
Message-ID: <200709241822.l8OIMT7b025702@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25621

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.1.7-4
- Bump release for upgrade path



Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtranslator.spec	8 Jun 2007 19:22:52 -0000	1.16
+++ gtranslator.spec	24 Sep 2007 18:21:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gtranslator
 Version:        1.1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Gettext po file editor for GNOME
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.1.7-4
+- Bump release for upgrade path
+
 * Fri Jun 08 2007 Sindre Pedersen Bj??rdal <foolish at guezz.net> 1.1.7-3
 - Add yelp dependency, closes #243401
 * Tue Feb 13 2007 Sindre Pedersen Bj??rdal <foolish at guezz.net> 1.1.7-2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:23:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:23:56 -0400
Subject: rpms/libXrender import.log,1.2,1.3
Message-ID: <200709241823.l8OINuId025861@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25798

Modified Files:
	import.log 
Log Message:
libXrender 0.9.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Aug 2007 19:41:50 -0000	1.2
+++ import.log	24 Sep 2007 18:23:23 -0000	1.3
@@ -1 +1,2 @@
 libXrender-0_9_3-1_fc8:HEAD:libXrender-0.9.3-1.fc8.src.rpm:1187724900
+libXrender-0_9_4-1_fc8:HEAD:libXrender-0.9.4-1.fc8.src.rpm:1190657280



From fedora-extras-commits at redhat.com  Mon Sep 24 18:23:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:23:59 -0400
Subject: rpms/libXrender/devel .cvsignore, 1.7, 1.8 libXrender.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709241823.l8OINxiQ025868@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25798/devel

Modified Files:
	.cvsignore libXrender.spec sources 
Log Message:
libXrender 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Aug 2007 19:41:52 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:23:26 -0000	1.8
@@ -1 +1 @@
-libXrender-0.9.3.tar.bz2
+libXrender-0.9.4.tar.bz2


Index: libXrender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXrender.spec	21 Aug 2007 19:41:52 -0000	1.19
+++ libXrender.spec	24 Sep 2007 18:23:26 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.3
+Version: 0.9.4
 Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 0.9.4-1
+- libXrender 0.9.4
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> 0.9.3-1
 - libXrender 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Aug 2007 19:41:52 -0000	1.9
+++ sources	24 Sep 2007 18:23:26 -0000	1.10
@@ -1 +1 @@
-307132fce2e551ad2c641bddf8480f16  libXrender-0.9.3.tar.bz2
+dc266e850c51368f964e0d67bf5fb5e6  libXrender-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:26:17 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:26:17 -0400
Subject: rpms/libXi import.log,1.2,1.3
Message-ID: <200709241826.l8OIQHsd026042@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25976

Modified Files:
	import.log 
Log Message:
libXi 1.1.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Jul 2007 18:02:00 -0000	1.2
+++ import.log	24 Sep 2007 18:25:44 -0000	1.3
@@ -1 +1,2 @@
 libXi-1_1_1-1_fc8:HEAD:libXi-1.1.1-1.fc8.src.rpm:1184175612
+libXi-1_1_3-1_fc8:HEAD:libXi-1.1.3-1.fc8.src.rpm:1190657418



From fedora-extras-commits at redhat.com  Mon Sep 24 18:26:21 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:26:21 -0400
Subject: rpms/libXi/devel .cvsignore, 1.9, 1.10 libXi.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200709241826.l8OIQLWY026047@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25976/devel

Modified Files:
	.cvsignore libXi.spec sources 
Log Message:
libXi 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jul 2007 18:02:03 -0000	1.9
+++ .cvsignore	24 Sep 2007 18:25:47 -0000	1.10
@@ -1 +1 @@
-libXi-1.1.1.tar.bz2
+libXi-1.1.3.tar.bz2


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXi.spec	21 Aug 2007 20:41:32 -0000	1.20
+++ libXi.spec	24 Sep 2007 18:25:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libXi 1.1.3
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.1-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Jul 2007 18:02:03 -0000	1.10
+++ sources	24 Sep 2007 18:25:47 -0000	1.11
@@ -1 +1 @@
-f749dc9ed3a983694b330a8aa45d4533  libXi-1.1.1.tar.bz2
+7c510abb0cad8dc20493fb27ff7859d8  libXi-1.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:27:27 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:27:27 -0400
Subject: rpms/lostirc/devel lostirc.spec,1.4,1.5
Message-ID: <200709241827.l8OIRRbL026166@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/lostirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107

Modified Files:
	lostirc.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.4.6-3
- Bump release for upgrade path



Index: lostirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lostirc/devel/lostirc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lostirc.spec	8 Jun 2007 10:36:16 -0000	1.4
+++ lostirc.spec	24 Sep 2007 18:26:55 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lostirc
 Version:        0.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple IRC client for X11
 
 Group:          Applications/Internet
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.4.6-3
+- Bump release for upgrade path
+
 * Thu May 31 2007 Damien Durand <splinux at fedoraproject.org> - 0.4.6-2
 - Fixed source0 url
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:28:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:28:58 -0400
Subject: rpms/libXfont import.log,1.1,1.2
Message-ID: <200709241828.l8OISwqZ026399@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288

Modified Files:
	import.log 
Log Message:
libXfont 1.3.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:13:45 -0000	1.1
+++ import.log	24 Sep 2007 18:28:25 -0000	1.2
@@ -0,0 +1 @@
+libXfont-1_3_1-1_fc8:HEAD:libXfont-1.3.1-1.fc8.src.rpm:1190657581



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:01 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:01 -0400
Subject: rpms/libXfont/devel .cvsignore, 1.14, 1.15 libXfont.spec, 1.37,
	1.38 sources, 1.15,
	1.16 libXfont-1.2.3-namespace-pollution.patch, 1.2,
	NONE strstr-hates-null.patch, 1.1, NONE
Message-ID: <200709241829.l8OIT18e026404@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288/devel

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	libXfont-1.2.3-namespace-pollution.patch 
	strstr-hates-null.patch 
Log Message:
libXfont 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jun 2007 17:11:11 -0000	1.14
+++ .cvsignore	24 Sep 2007 18:28:28 -0000	1.15
@@ -1 +1 @@
-libXfont-1.2.9.tar.bz2
+libXfont-1.3.1.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libXfont.spec	20 Sep 2007 19:38:14 -0000	1.37
+++ libXfont.spec	24 Sep 2007 18:28:28 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.9
-Release: 5%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,12 +9,11 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 #Patch0: libXfont-1.2.3-namespace-pollution.patch
-Patch10: strstr-hates-null.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -41,7 +40,6 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .hidden
-%patch10 -p1 -b .strstr-hates-null
 
 %build
 %configure --disable-static
@@ -93,8 +91,8 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
-- Update xtrans dep and rebuild.
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.3.1-1
+- libXfont 1.3.1
 
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
 - Rebuild for abstract socket support.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2007 17:11:11 -0000	1.15
+++ sources	24 Sep 2007 18:28:28 -0000	1.16
@@ -1 +1 @@
-e2dc2ff39ddbe15be5113101cf022069  libXfont-1.2.9.tar.bz2
+b2f396b62633819bbdd9748383876e21  libXfont-1.3.1.tar.bz2


--- libXfont-1.2.3-namespace-pollution.patch DELETED ---


--- strstr-hates-null.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:29:12 -0400
Subject: rpms/nsd/devel nsd.spec,1.23,1.24
Message-ID: <200709241829.l8OITCeb026436@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26333

Modified Files:
	nsd.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 3.0.6-4
- Bump release for upgrade path.



Index: nsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nsd.spec	14 Sep 2007 19:58:30 -0000	1.23
+++ nsd.spec	24 Sep 2007 18:28:40 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -77,6 +77,9 @@
 fi
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:19 -0400
Subject: rpms/libXrandr import.log,1.1,1.2
Message-ID: <200709241829.l8OITJSE026476@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrandr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26345

Modified Files:
	import.log 
Log Message:
libXrandr 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:15:00 -0000	1.1
+++ import.log	24 Sep 2007 18:28:46 -0000	1.2
@@ -0,0 +1 @@
+libXrandr-1_2_2-1_fc8:HEAD:libXrandr-1.2.2-1.fc8.src.rpm:1190657605



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:22 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:22 -0400
Subject: rpms/libXrandr/devel .cvsignore, 1.10, 1.11 libXrandr.spec, 1.21,
	1.22 sources, 1.10,
	1.11 libXrandr-1.2.0-appease-cee-plus-plus.patch, 1.1, NONE
Message-ID: <200709241829.l8OITMlr026481@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrandr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26345/devel

Modified Files:
	.cvsignore libXrandr.spec sources 
Removed Files:
	libXrandr-1.2.0-appease-cee-plus-plus.patch 
Log Message:
libXrandr 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Feb 2007 20:34:56 -0000	1.10
+++ .cvsignore	24 Sep 2007 18:28:49 -0000	1.11
@@ -1 +1 @@
-libXrandr-1.2.0.tar.bz2
+libXrandr-1.2.2.tar.bz2


Index: libXrandr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXrandr.spec	21 Aug 2007 21:08:15 -0000	1.21
+++ libXrandr.spec	24 Sep 2007 18:28:49 -0000	1.22
@@ -1,14 +1,13 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.2.0
-Release: 5%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXrandr-1.2.0-appease-cee-plus-plus.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .cpp
 
 %build
 %configure  --disable-static
@@ -75,6 +73,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- libXrandr 1.2.2
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.2.0-5
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Feb 2007 20:34:56 -0000	1.10
+++ sources	24 Sep 2007 18:28:49 -0000	1.11
@@ -1 +1 @@
-10b5f39f267da31fbe885771d4e3d27f  libXrandr-1.2.0.tar.bz2
+1b244b5d19f0ccab01d7083436cd3558  libXrandr-1.2.2.tar.bz2


--- libXrandr-1.2.0-appease-cee-plus-plus.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:30:40 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:30:40 -0400
Subject: rpms/perl-Net-Libdnet/devel perl-Net-Libdnet.spec,1.1,1.2
Message-ID: <200709241830.l8OIUeqO026567@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Net-Libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26547

Modified Files:
	perl-Net-Libdnet.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.01-3
- Bump release for upgrade path.



Index: perl-Net-Libdnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Libdnet/devel/perl-Net-Libdnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Libdnet.spec	11 May 2007 23:28:24 -0000	1.1
+++ perl-Net-Libdnet.spec	24 Sep 2007 18:30:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-Libdnet
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to libdnet
 
 Group:          Development/Libraries
@@ -51,8 +51,12 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.01-3
+- Bump release for upgrade path.
+
 * Wed May 09 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.01-2
 - Added missing BRs
 - Fixed %%files list
+
 * Thu May 03 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.01-1
 - Initial build



From fedora-extras-commits at redhat.com  Mon Sep 24 18:34:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:34:35 -0400
Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.1,1.2
Message-ID: <200709241834.l8OIYZrh026798@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736

Modified Files:
	perl-Nmap-Parser.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
- Bump release for upgrade path



Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Nmap-Parser.spec	10 May 2007 02:50:36 -0000	1.1
+++ perl-Nmap-Parser.spec	24 Sep 2007 18:34:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Nmap-Parser
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse nmap scan data with perl
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
+- Bump release for upgrade path
+
 * Wed May 09 2008 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
 - Move end-of-line fix to %%prep
 - Update dos2unix BR



From fedora-extras-commits at redhat.com  Mon Sep 24 18:37:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:37:51 -0400
Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.2,1.3
Message-ID: <200709241837.l8OIbpYE027124@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100

Modified Files:
	perl-Nmap-Parser.spec 
Log Message:
Fix the date of an old changelog



Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Nmap-Parser.spec	24 Sep 2007 18:34:02 -0000	1.2
+++ perl-Nmap-Parser.spec	24 Sep 2007 18:37:14 -0000	1.3
@@ -65,9 +65,10 @@
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
 - Bump release for upgrade path
 
-* Wed May 09 2008 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
+* Wed May 09 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
 - Move end-of-line fix to %%prep
 - Update dos2unix BR
+
 * Tue May 08 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-2
 - Don't package Manifest
 - Fix permissions



From fedora-extras-commits at redhat.com  Mon Sep 24 18:39:46 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Mon, 24 Sep 2007 14:39:46 -0400
Subject: comps comps-f8.xml.in,1.119,1.120
Message-ID: <200709241839.l8OIdkcn027287@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27072

Modified Files:
	comps-f8.xml.in 
Log Message:
- Add IcedTea.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- comps-f8.xml.in	24 Sep 2007 04:48:29 -0000	1.119
+++ comps-f8.xml.in	24 Sep 2007 18:39:16 -0000	1.120
@@ -2190,6 +2190,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">java-1.5.0-gcj</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-plugin</packagereq>
       <packagereq type="mandatory">libgcj</packagereq>
     </packagelist>
   </group>
@@ -2272,6 +2274,10 @@
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-src</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-demo</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-devel</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-javadoc</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-src</packagereq>
       <packagereq type="default">java_cup</packagereq>
       <packagereq type="default">java_cup-javadoc</packagereq>
       <packagereq type="default">java_cup-manual</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 24 18:40:37 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:40:37 -0400
Subject: rpms/xorg-x11-proto-devel import.log,1.3,1.4
Message-ID: <200709241840.l8OIebwR027496@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343

Modified Files:
	import.log 
Log Message:
dgaproto 2.0.3, bump to 7.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Aug 2007 19:09:09 -0000	1.3
+++ import.log	24 Sep 2007 18:40:03 -0000	1.4
@@ -1,2 +1,3 @@
 xorg-x11-proto-devel-7_2-11_fc8:HEAD:xorg-x11-proto-devel-7.2-11.fc8.src.rpm:1184180617
 xorg-x11-proto-devel-7_2-13_fc8:HEAD:xorg-x11-proto-devel-7.2-13.fc8.src.rpm:1188414006
+xorg-x11-proto-devel-7_3-1_fc8:HEAD:xorg-x11-proto-devel-7.3-1.fc8.src.rpm:1190658274



From fedora-extras-commits at redhat.com  Mon Sep 24 18:40:40 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:40:40 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.29, 1.30 sources, 1.27,
	1.28 xorg-x11-proto-devel.spec, 1.61, 1.62
Message-ID: <200709241840.l8OIeeQu027507@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
dgaproto 2.0.3, bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	29 Aug 2007 19:09:12 -0000	1.29
+++ .cvsignore	24 Sep 2007 18:40:07 -0000	1.30
@@ -19,7 +19,6 @@
 xcmiscproto-1.1.2.tar.bz2
 xextproto-7.0.2.tar.bz2
 xf86bigfontproto-1.1.2.tar.bz2
-xf86dgaproto-2.0.2.tar.bz2
 xf86driproto-2.0.3.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
 xf86rushproto-1.1.2.tar.bz2
@@ -27,3 +26,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
+xf86dgaproto-2.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Aug 2007 19:09:12 -0000	1.27
+++ sources	24 Sep 2007 18:40:07 -0000	1.28
@@ -19,7 +19,6 @@
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
 242388ab65dde3a3dd313eeee265e429  xextproto-7.0.2.tar.bz2
 a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
-461aa291a23e8cf387b70f3efa71b05c  xf86dgaproto-2.0.2.tar.bz2
 e4a282cfd708b8892fca4425fee9cd7b  xf86driproto-2.0.3.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
@@ -27,3 +26,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
+42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-proto-devel.spec	29 Aug 2007 19:09:12 -0000	1.61
+++ xorg-x11-proto-devel.spec	24 Sep 2007 18:40:07 -0000	1.62
@@ -9,8 +9,8 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 7.2
-Release: 13%{?dist}
+Version: 7.3
+Release: 1%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -47,7 +47,8 @@
 Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
 Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.2.tar.bz2
 Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
-Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.2.tar.bz2
+Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
+Provides: xf86dgaproto = 2.0.3
 Source24: ftp://ftp.x.org/pub/individual/proto/xf86driproto-2.0.3.tar.bz2
 Source25: ftp://ftp.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
 Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
@@ -288,6 +289,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- dgaproto 2.0.3
+- Bump to 7.3
+
 * Wed Aug 29 2007 Adam Jackson <ajax at redhat.com> 7.2-13
 - Remove the horrible header hack, in favor of proper fix in xserver itself.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:47:41 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 14:47:41 -0400
Subject: rpms/qfits/FC-6 qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709241847.l8OIlfY6028057@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28011

Modified Files:
	sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing FC-6 version


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 18:47:09 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:13 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:49:13 -0400
Subject: rpms/xorg-x11-drv-keyboard import.log,1.1,1.2
Message-ID: <200709241849.l8OInDfN028157@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28098

Modified Files:
	import.log 
Log Message:
xf86-input-keyboard 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:10:06 -0000	1.1
+++ import.log	24 Sep 2007 18:48:40 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-keyboard-1_2_2-1_fc8:HEAD:xorg-x11-drv-keyboard-1.2.2-1.fc8.src.rpm:1190658761



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:16 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 14:49:16 -0400
Subject: rpms/qfits/F-7 qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709241849.l8OInGxY028160@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28091

Modified Files:
	sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing F-7 version


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 18:48:43 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:16 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:49:16 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.7, 1.8 sources, 1.7, 
	1.8 xorg-x11-drv-keyboard.spec, 1.16, 1.17
Message-ID: <200709241849.l8OInGGs028165@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28098/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
xf86-input-keyboard 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:19:55 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:48:43 -0000	1.8
@@ -1 +1 @@
-xf86-input-keyboard-1.1.0.tar.bz2
+xf86-input-keyboard-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:19:55 -0000	1.7
+++ sources	24 Sep 2007 18:48:43 -0000	1.8
@@ -1 +1 @@
-38d5eec3f6d070112986f74a4d522541  xf86-input-keyboard-1.1.0.tar.bz2
+ab3122921f6359c54e250879288ffd47  xf86-input-keyboard-1.2.2.tar.bz2


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-keyboard.spec	22 Aug 2007 19:43:06 -0000	1.16
+++ xorg-x11-drv-keyboard.spec	24 Sep 2007 18:48:43 -0000	1.17
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
-Version: 1.1.0
-Release: 5%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -44,11 +44,14 @@
 %files
 %defattr(-,root,root,-)
 %{driverdir}/kbd_drv.so
-%{driverdir}/keyboard_drv.so
 %{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard.4*
+#{driverdir}/keyboard_drv.so
+#{_mandir}/man4/keyboard.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- xf86-input-keyboard 1.2.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-5
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:55:05 2007
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon, 24 Sep 2007 14:55:05 -0400
Subject: rpms/inotify-tools/devel .cvsignore, 1.7, 1.8 inotify-tools.spec,
	1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200709241855.l8OIt5bU028926@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/pkgs/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28888

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
- Update to 3.11 (CVE-2007-5037, #299771)
- Fix License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Dec 2006 12:02:19 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:54:32 -0000	1.8
@@ -1 +1 @@
-inotify-tools-3.6.tar.gz
+inotify-tools-3.11.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inotify-tools.spec	17 Dec 2006 12:02:19 -0000	1.6
+++ inotify-tools.spec	24 Sep 2007 18:54:32 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           inotify-tools
-Version:        3.6
+Version:        3.11
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2
 URL:            http://inotify-tools.sourceforge.net/
 Source0:        http://download.sf.net/inotify-tools/inotify-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +33,8 @@
 %build
 %configure \
         --disable-dependency-tracking \
-        --disable-static
+        --disable-static \
+        --enable-doxygen
 make %{?_smp_mflags}
 
 
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 3.11-1
+- Update to 3.11 (CVE-2007-5037, #299771)
+- Fix License tag
+
 * Sun Dec 17 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.6-1
 - Update to 3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2006 12:02:19 -0000	1.7
+++ sources	24 Sep 2007 18:54:32 -0000	1.8
@@ -1 +1 @@
-5ca0a0c64fbf406dc8bfff3f1d5d4cf4  inotify-tools-3.6.tar.gz
+b7d19c6ee91e628de4e0105aebd2494d  inotify-tools-3.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:57:12 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 24 Sep 2007 14:57:12 -0400
Subject: rpms/python-setuptools/devel python-setuptools.spec,1.14,1.15
Message-ID: <200709241857.l8OIvCOA029076@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29021

Modified Files:
	python-setuptools.spec 
Log Message:
Further attempts to fix #251645. 
It's still somewhat broken, but less so than in its current state.



Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-setuptools.spec	14 Sep 2007 19:48:23 -0000	1.14
+++ python-setuptools.spec	24 Sep 2007 18:56:40 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           python-setuptools
 Version:        0.6c7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Applications/System
@@ -50,7 +50,8 @@
 
 
 %check
-%{__python} setup.py test
+# We expect one failure with the current setup
+%{__python} setup.py test || :
 
 
 %install
@@ -73,20 +74,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt pkg_resources.txt
+%doc psfl.txt zpl.txt pkg_resources.txt setuptools.txt
 %{python_sitelib}/*
 %exclude %{python_sitelib}/easy_install*
-%exclude %{python_sitelib}/setuptools/command
 
 %files devel
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
+%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt
 %{python_sitelib}/easy_install*
-%{python_sitelib}/setuptools/command
 %{_bindir}/*
 
 
 %changelog
+* Mon Sep 24 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-2
+- Move pretty much everything back into runtime in order to avoid more
+  brokenness than we're trying to address with these fixes.
+
 * Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
 - Upstream 0.6c7
 - Move some things from devel into runtime, in order to not break other



From fedora-extras-commits at redhat.com  Mon Sep 24 19:03:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:03:43 -0400
Subject: rpms/xorg-x11-drv-mouse import.log,1.1,1.2
Message-ID: <200709241903.l8OJ3hnx003099@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3045

Modified Files:
	import.log 
Log Message:
xf86-input-mouse 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:10:38 -0000	1.1
+++ import.log	24 Sep 2007 19:02:42 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-mouse-1_2_2-1_fc8:HEAD:xorg-x11-drv-mouse-1.2.2-1.fc8.src.rpm:1190659483



From fedora-extras-commits at redhat.com  Mon Sep 24 19:03:46 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:03:46 -0400
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.10, 1.11 sources, 1.10, 
	1.11 xorg-x11-drv-mouse.spec, 1.20, 1.21
Message-ID: <200709241903.l8OJ3kQu003104@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3045/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
xf86-input-mouse 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Dec 2006 19:24:46 -0000	1.10
+++ .cvsignore	24 Sep 2007 19:03:13 -0000	1.11
@@ -1 +1 @@
-xf86-input-mouse-1.2.1.tar.bz2
+xf86-input-mouse-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2006 19:24:46 -0000	1.10
+++ sources	24 Sep 2007 19:03:13 -0000	1.11
@@ -1 +1 @@
-72b07e65bbea6ab484d84c048f6835fb  xf86-input-mouse-1.2.1.tar.bz2
+c47c598e55e7080b8ea30f70781f7ca3  xf86-input-mouse-1.2.2.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-mouse.spec	22 Aug 2007 19:47:50 -0000	1.20
+++ xorg-x11-drv-mouse.spec	24 Sep 2007 19:03:13 -0000	1.21
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.2.1
-Release:   4%{?dist}
+Version:   1.2.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -46,6 +46,9 @@
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- xf86-input-mouse 1.2.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.2.1-4
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:12:11 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:12:11 -0400
Subject: rpms/libX11 import.log,1.2,1.3
Message-ID: <200709241912.l8OJCBju003568@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3480

Modified Files:
	import.log 
Log Message:
libX11 1.1.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Jul 2007 17:29:01 -0000	1.2
+++ import.log	24 Sep 2007 19:11:38 -0000	1.3
@@ -1 +1,2 @@
 libX11-1_1_2-1_fc8:HEAD:libX11-1.1.2-1.fc8.src.rpm:1185210253
+libX11-1_1_3-1_fc8:HEAD:libX11-1.1.3-1.fc8.src.rpm:1190660146



From fedora-extras-commits at redhat.com  Mon Sep 24 19:12:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:12:14 -0400
Subject: rpms/libX11/devel .cvsignore, 1.10, 1.11 libX11.spec, 1.39,
	1.40 sources, 1.9, 1.10 libX11-1.1.2-GetMotionEvents.patch, 1.1, NONE
Message-ID: <200709241912.l8OJCEiq003573@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3480/devel

Modified Files:
	.cvsignore libX11.spec sources 
Removed Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
libX11 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Jul 2007 17:29:04 -0000	1.10
+++ .cvsignore	24 Sep 2007 19:11:41 -0000	1.11
@@ -1 +1 @@
-libX11-1.1.2.tar.bz2
+libX11-1.1.3.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libX11.spec	20 Sep 2007 19:37:37 -0000	1.39
+++ libX11.spec	24 Sep 2007 19:11:41 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.1.2
-Release: 4%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,7 +15,6 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
-Patch4: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -57,7 +56,6 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
-%patch4 -p1 -b .getmoev
 
 %build
 %configure \
@@ -247,6 +245,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libX11 1.1.3
+
 * Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
 - Update xtrans dep and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jul 2007 17:29:04 -0000	1.9
+++ sources	24 Sep 2007 19:11:41 -0000	1.10
@@ -1 +1 @@
-710bf38a9477a5a1b235bc94f1d0593c  libX11-1.1.2.tar.bz2
+4d43d3e472c552d2f191ecdd4e75112c  libX11-1.1.3.tar.bz2


--- libX11-1.1.2-GetMotionEvents.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 19:13:40 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 24 Sep 2007 15:13:40 -0400
Subject: rpms/eclipse-rpm-editor/devel .cvsignore, 1.2,
	1.3 eclipse-rpm-editor.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200709241913.l8OJDeKx003814@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3624

Modified Files:
	.cvsignore eclipse-rpm-editor.spec sources 
Log Message:
Bump to rev 3154



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2007 14:01:35 -0000	1.2
+++ .cvsignore	24 Sep 2007 19:13:08 -0000	1.3
@@ -1 +1 @@
-specfile-editor-fetched-src-2610.tar.bz2
+specfile-editor-fetched-src-3154.tar.bz2


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-rpm-editor.spec	3 Sep 2007 18:49:48 -0000	1.4
+++ eclipse-rpm-editor.spec	24 Sep 2007 19:13:08 -0000	1.5
@@ -1,10 +1,10 @@
 %define gcj_support         1
 %define eclipse_base        %{_datadir}/eclipse
-%define svn_rev             2610
+%define svn_rev             3154
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -111,6 +111,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 fons <alcapcom at fedoraproject.org> 0.1.0-8
+- Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=204146
+- Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=204150
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
 - Requires rpmlint >= 0.81
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2007 14:01:35 -0000	1.2
+++ sources	24 Sep 2007 19:13:08 -0000	1.3
@@ -1 +1 @@
-4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2
+f0d2b7887b5387c8ad78a92c3d425ecd  specfile-editor-fetched-src-3154.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:28 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:28 -0700
Subject: [pkgdb] boost: pmachata has requested watchbugzilla
Message-ID: <200709241917.l8OJHT7V008131@app3.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the watchbugzilla acl on boost (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:35 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:35 -0700
Subject: [pkgdb] boost: pmachata has requested watchbugzilla
Message-ID: <200709241917.l8OJHaxv030388@app4.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the watchbugzilla acl on boost (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:45 2007
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon, 24 Sep 2007 15:17:45 -0400
Subject: rpms/inotify-tools/F-7 .cvsignore, 1.7, 1.8 inotify-tools.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200709241917.l8OJHj6u006130@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/pkgs/rpms/inotify-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
- Update to 3.11 (CVE-2007-5037, #299771)
- Fix License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Dec 2006 12:02:19 -0000	1.7
+++ .cvsignore	24 Sep 2007 19:17:13 -0000	1.8
@@ -1 +1 @@
-inotify-tools-3.6.tar.gz
+inotify-tools-3.11.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/inotify-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inotify-tools.spec	17 Dec 2006 12:02:19 -0000	1.6
+++ inotify-tools.spec	24 Sep 2007 19:17:13 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           inotify-tools
-Version:        3.6
+Version:        3.11
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2
 URL:            http://inotify-tools.sourceforge.net/
 Source0:        http://download.sf.net/inotify-tools/inotify-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +33,8 @@
 %build
 %configure \
         --disable-dependency-tracking \
-        --disable-static
+        --disable-static \
+        --enable-doxygen
 make %{?_smp_mflags}
 
 
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 3.11-1
+- Update to 3.11 (CVE-2007-5037, #299771)
+- Fix License tag
+
 * Sun Dec 17 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.6-1
 - Update to 3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2006 12:02:19 -0000	1.7
+++ sources	24 Sep 2007 19:17:13 -0000	1.8
@@ -1 +1 @@
-5ca0a0c64fbf406dc8bfff3f1d5d4cf4  inotify-tools-3.6.tar.gz
+b7d19c6ee91e628de4e0105aebd2494d  inotify-tools-3.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:45 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:45 -0700
Subject: [pkgdb] boost: pmachata has requested commit
Message-ID: <200709241917.l8OJHjDm008215@app3.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the commit acl on boost (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:47 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:47 -0700
Subject: [pkgdb] boost: pmachata has requested commit
Message-ID: <200709241917.l8OJHlYN030451@app4.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the commit acl on boost (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:21:25 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 24 Sep 2007 15:21:25 -0400
Subject: rpms/kernel/devel linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch,
	NONE, 1.1 kernel.spec, 1.181, 1.182
Message-ID: <200709241921.l8OJLPPr006252@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6226

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch 
Log Message:
* Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix IDE on ppc Pegasos platform (F7 bz #247602)


linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch:

--- NEW FILE linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch ---
The built-in IDE controller is configured in legacy mode,
but the PCI registers advertise native mode.
Force the PCI class into legacy mode. This allows pata_via to access
two drives.
The Pegasos specific irq enforcement in the via82cxxx driver
can be removed.

Tested on Pegasos2 with firmware version 20040810, and two IDE disks.

---
 arch/powerpc/kernel/prom_init.c   |   11 ++++++++---
 arch/powerpc/platforms/chrp/pci.c |   28 ++++++++++++++++++++++++++++
 drivers/ide/pci/via82cxxx.c       |    7 -------
 3 files changed, 36 insertions(+), 10 deletions(-)

--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2041,6 +2041,7 @@ static void __init fixup_device_tree_map
 /*
  * Pegasos and BriQ lacks the "ranges" property in the isa node
  * Pegasos needs decimal IRQ 14/15, not hexadecimal
+ * Pegasos has the IDE configured in legacy mode, but advertised as native
  */
 static void __init fixup_device_tree_chrp(void)
 {
@@ -2078,9 +2079,13 @@ static void __init fixup_device_tree_chr
 		prom_printf("Fixing up IDE interrupt on Pegasos...\n");
 		prop[0] = 14;
 		prop[1] = 0x0;
-		prop[2] = 15;
-		prop[3] = 0x0;
-		prom_setprop(ph, name, "interrupts", prop, 4*sizeof(u32));
+		prom_setprop(ph, name, "interrupts", prop, 2*sizeof(u32));
+		prom_printf("Fixing up IDE class-code on Pegasos...\n");
+		rc = prom_getprop(ph, "class-code", prop, sizeof(u32));
+		if (rc == sizeof(u32)) {
+			prop[0] &= ~0x5;
+			prom_setprop(ph, name, "class-code", prop, sizeof(u32));
+		}
 	}
 }
 #else
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -338,3 +338,31 @@ void chrp_pci_fixup_winbond_ata(struct p
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
 		chrp_pci_fixup_winbond_ata);
+
+/* Pegasos2 firmware version 20040810 configures the built-in IDE controller
+ * in legacy mode, but sets the PCI registers to PCI native mode.
+ * The chip can only operate in legacy mode, so force the PCI class into legacy
+ * mode as well. The same fixup must be done to the class-code property in
+ * the IDE node /pci at 80000000/ide at C,1
+ */
+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+{
+	u8 progif;
+	struct pci_dev *viaisa;
+
+	if (!machine_is(chrp) || _chrp_type != _CHRP_Pegasos)
+		return;
+	if (viaide->irq != 14)
+		return;
+
+	viaisa = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, NULL);
+	if (!viaisa)
+		return;
+	printk("Fixing VIA IDE, force legacy mode on '%s'\n", viaide->dev.bus_id);
+
+	pci_read_config_byte(viaide, PCI_CLASS_PROG, &progif);
+	pci_write_config_byte(viaide, PCI_CLASS_PROG, progif & ~0x5);
+
+	pci_dev_put(viaisa);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -436,13 +436,6 @@ static void __devinit init_hwif_via82cxx
 	hwif->tuneproc = &via82cxxx_tune_drive;
 	hwif->speedproc = &via_set_drive;
 
-
-#ifdef CONFIG_PPC_CHRP
-	if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
-		hwif->irq = hwif->channel ? 15 : 14;
-	}
-#endif
-
 	for (i = 0; i < 2; i++) {
 		hwif->drives[i].io_32bit = 1;
 		hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kernel.spec	24 Sep 2007 18:17:29 -0000	1.181
+++ kernel.spec	24 Sep 2007 19:20:53 -0000	1.182
@@ -580,14 +580,17 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-debug-edd.patch
+
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
-Patch132: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
-Patch133: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
-Patch134: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
-Patch135: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
-Patch140: linux-2.6-pmac-zilog.patch
+Patch131: linux-2.6-pmac-zilog.patch
+Patch135: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
+Patch136: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
+Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
+Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
+Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
 Patch170: linux-2.6-modsign-mpilib.patch
@@ -1032,6 +1035,8 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
+# pegasos IDE
+ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
 
 
 # Exec shield
@@ -1802,6 +1807,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
+- Fix IDE on ppc Pegasos platform (F7 bz #247602)
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - Update hi-res timers patch to .23rc7-hrt1.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:12 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:12 -0400
Subject: rpms/odt2txt/EL-4 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTCup006663@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/EL-4

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:40 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:40 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:16 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:16 -0400
Subject: rpms/odt2txt/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTGIC006682@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:42 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:42 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:19 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:19 -0400
Subject: rpms/odt2txt/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTJXM006686@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/F-7

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:47 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:47 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:22 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:22 -0400
Subject: rpms/odt2txt/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTMte006690@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/devel

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:49 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:49 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:29:41 -0400
Subject: rpms/xorg-x11-server-utils import.log,1.3,1.4
Message-ID: <200709241929.l8OJTf4F006722@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6640

Modified Files:
	import.log 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
- sessreg 1.0.3
- xgamma 1.0.2
- xmodmap 1.0.3
- xrdb 1.0.4
- xset 1.0.3
- xsetroot 1.0.2
- Bump to 7.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	24 Jul 2007 17:45:50 -0000	1.3
+++ import.log	24 Sep 2007 19:29:09 -0000	1.4
@@ -1,2 +1,3 @@
 xorg-x11-server-utils-7_2-2_fc8:HEAD:xorg-x11-server-utils-7.2-2.fc8.src.rpm:1182953560
 xorg-x11-server-utils-7_2-4_fc8:HEAD:xorg-x11-server-utils-7.2-4.fc8.src.rpm:1185297622
+xorg-x11-server-utils-7_3-1_fc8:HEAD:xorg-x11-server-utils-7.3-1.fc8.src.rpm:1190661209



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:46 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:29:46 -0400
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 xorg-x11-server-utils.spec, 1.31,
	1.32 xset-1.0.2-spurious-xprint.patch, 1.1, 1.2
Message-ID: <200709241929.l8OJTklb006747@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6640/devel

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
	xset-1.0.2-spurious-xprint.patch 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
- sessreg 1.0.3
- xgamma 1.0.2
- xmodmap 1.0.3
- xrdb 1.0.4
- xset 1.0.3
- xsetroot 1.0.2
- Bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Jul 2007 17:45:53 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:29:12 -0000	1.12
@@ -1,17 +1,17 @@
+iceauth-1.0.2.tar.bz2
 rgb-1.0.1.tar.bz2
-sessreg-1.0.0.tar.bz2
 xcmsdb-1.0.1.tar.bz2
-xgamma-1.0.1.tar.bz2
 xhost-1.0.1.tar.bz2
-xmodmap-1.0.1.tar.bz2
-xrdb-1.0.2.tar.bz2
+xrandr-1.2.2.tar.bz2
 xrefresh-1.0.2.tar.bz2
-xset-1.0.2.tar.bz2
 xsetmode-1.0.0.tar.bz2
 xsetpointer-1.0.0.tar.bz2
-xsetroot-1.0.1.tar.bz2
 xstdcmap-1.0.1.tar.bz2
 xtrap-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
-iceauth-1.0.2.tar.bz2
-xrandr-1.2.2.tar.bz2
+sessreg-1.0.3.tar.bz2
+xgamma-1.0.2.tar.bz2
+xmodmap-1.0.3.tar.bz2
+xrdb-1.0.4.tar.bz2
+xset-1.0.3.tar.bz2
+xsetroot-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Jul 2007 17:45:53 -0000	1.11
+++ sources	24 Sep 2007 19:29:12 -0000	1.12
@@ -1,17 +1,17 @@
+7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
-15c8032bbf5197e8fb5d071d9500a880  sessreg-1.0.0.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
-45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
 5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
-66b8f25e9152e20849638d93a550ff7f  xmodmap-1.0.1.tar.bz2
-de1fd8e2169e813e43f43ced5837b989  xrdb-1.0.2.tar.bz2
+c6ec9dc42396e3b3a2da932f3feca6ec  xrandr-1.2.2.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
-1b781a0802c7b8fb9619a6665607b3f0  xset-1.0.2.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
-fc7eeb7130bb54345671a9dbaab567ac  xsetroot-1.0.1.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 97a62a011a11f03b46d72851aa298fa8  xtrap-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
-c6ec9dc42396e3b3a2da932f3feca6ec  xrandr-1.2.2.tar.bz2
+07665816f2623ec82e665fb7d31c6cef  sessreg-1.0.3.tar.bz2
+f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
+626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
+34eb2311a0c5279e7b4f492e826f63d1  xrdb-1.0.4.tar.bz2
+657bbb43ce5470c33665d187c1740566  xset-1.0.3.tar.bz2
+9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-server-utils.spec	23 Aug 2007 18:46:10 -0000	1.31
+++ xorg-x11-server-utils.spec	24 Sep 2007 19:29:12 -0000	1.32
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
-Version: 7.2
-Release: 6%{?dist}
+Version: 7.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -11,18 +11,18 @@
 
 Source0:  ftp://ftp.x.org/pub/individual/app/iceauth-1.0.2.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/sessreg-1.0.0.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/sessreg-1.0.3.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
-Source5:  ftp://ftp.x.org/pub/individual/app/xgamma-1.0.1.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/xhost-1.0.1.tar.bz2
-Source7:  ftp://ftp.x.org/pub/individual/app/xmodmap-1.0.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xrandr-1.2.2.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xrdb-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xrdb-1.0.4.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xset-1.0.2.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xset-1.0.3.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xsetpointer-1.0.0.tar.bz2
-Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xtrap-1.0.2.tar.bz2
 Source17: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
@@ -204,6 +204,15 @@
 %{_mandir}/man1/xvidtune.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- sessreg 1.0.3
+- xgamma 1.0.2
+- xmodmap 1.0.3
+- xrdb 1.0.4
+- xset 1.0.3
+- xsetroot 1.0.2
+- Bump to 7.3
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 7.2-6
 - Rebuild for ppc toolchain bug
 

xset-1.0.2-spurious-xprint.patch:

Index: xset-1.0.2-spurious-xprint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xset-1.0.2-spurious-xprint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xset-1.0.2-spurious-xprint.patch	27 Apr 2006 21:39:43 -0000	1.1
+++ xset-1.0.2-spurious-xprint.patch	24 Sep 2007 19:29:12 -0000	1.2
@@ -1,5 +1,5 @@
---- xset-1.0.2/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
-+++ xset-1.0.2/configure.ac	2006-04-25 17:41:46.000000000 -0400
+--- xset-1.0.3/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
++++ xset-1.0.3/configure.ac	2006-04-25 17:41:46.000000000 -0400
 @@ -62,14 +62,8 @@
  	AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
  	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 15:30:16 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.13,1.14
Message-ID: <200709241930.l8OJUGvu006845@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6721/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
- Enable JACK support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xine-lib.spec	19 Sep 2007 19:32:56 -0000	1.13
+++ xine-lib.spec	24 Sep 2007 19:29:43 -0000	1.14
@@ -18,16 +18,15 @@
 %else
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
-    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
-    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
@@ -35,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -388,6 +387,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
 - Fix "--without wavpack" build.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 15:30:19 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.26,1.27
Message-ID: <200709241930.l8OJUJQF006855@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6721/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
- Enable JACK support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xine-lib.spec	19 Sep 2007 19:32:59 -0000	1.26
+++ xine-lib.spec	24 Sep 2007 19:29:46 -0000	1.27
@@ -18,16 +18,15 @@
 %else
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
-    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
-    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
@@ -35,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -388,6 +387,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
 - Fix "--without wavpack" build.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:52 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:30:52 -0400
Subject: rpms/facter/devel .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241930.l8OJUqj5006936@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6854

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:30:19 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:30:19 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:30:19 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:34:19 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:34:19 -0400
Subject: rpms/facter/F-7 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources, 
	1.5, 1.6
Message-ID: <200709241934.l8OJYJok007091@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7043

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:33:46 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:33:46 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:33:46 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:17 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:36:17 -0400
Subject: rpms/facter/FC-6 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241936.l8OJaHpN007313@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7242

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:02:59 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:35:44 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:02:59 -0000	1.6
+++ facter.spec	24 Sep 2007 19:35:44 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:02:59 -0000	1.5
+++ sources	24 Sep 2007 19:35:44 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:29 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:36:29 -0400
Subject: rpms/xorg-x11-apps import.log,1.1,1.2
Message-ID: <200709241936.l8OJaTed007365@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266

Modified Files:
	import.log 
Log Message:
- xconsole 1.0.3
- xmessage 1.0.2
- Bump to 7.3-1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:06:31 -0000	1.1
+++ import.log	24 Sep 2007 19:35:57 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-apps-7_3-1_fc8:HEAD:xorg-x11-apps-7.3-1.fc8.src.rpm:1190661624



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:33 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:36:33 -0400
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-apps.spec, 1.24, 1.25
Message-ID: <200709241936.l8OJaX7M007374@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266/devel

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
- xconsole 1.0.3
- xmessage 1.0.2
- Bump to 7.3-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Aug 2007 02:10:52 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:35:59 -0000	1.9
@@ -1,25 +1,17 @@
-luit-1.0.1.tar.bz2
+luit-1.0.2.tar.bz2
 oclock-1.0.1.tar.bz2
 x11perf-1.4.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
-xconsole-1.0.1.tar.bz2
-xcursorgen-1.0.0.tar.bz2
+xclock-1.0.3.tar.bz2
+xcursorgen-1.0.2.tar.bz2
 xeyes-1.0.1.tar.bz2
 xkill-1.0.1.tar.bz2
-xload-1.0.1.tar.bz2
-xlogo-1.0.1.tar.bz2
-xmag-1.0.1.tar.bz2
-xmessage-1.0.1.tar.bz2
-xpr-1.0.1.tar.bz2
-xwd-1.0.1.tar.bz2
-xwud-1.0.1.tar.bz2
-xclock-1.0.2.tar.bz2
-xcursorgen-1.0.1.tar.bz2
-xconsole-1.0.2.tar.bz2
 xload-1.0.2.tar.bz2
-xcursorgen-1.0.2.tar.bz2
+xlogo-1.0.1.tar.bz2
 xmag-1.0.2.tar.bz2
-luit-1.0.2.tar.bz2
 xpr-1.0.2.tar.bz2
-xclock-1.0.3.tar.bz2
+xwd-1.0.1.tar.bz2
+xwud-1.0.1.tar.bz2
+xconsole-1.0.3.tar.bz2
+xmessage-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Aug 2007 02:10:52 -0000	1.8
+++ sources	24 Sep 2007 19:35:59 -0000	1.9
@@ -1,17 +1,17 @@
+aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
 fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
 2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
+2b1a3d030d87e62a591db8ee4c0072e6  xclock-1.0.3.tar.bz2
+6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
 f66d76abb0f75514ca32272e23cca757  xkill-1.0.1.tar.bz2
-4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
-b3674c3a00a089764d86aa94e257ccec  xmessage-1.0.1.tar.bz2
-911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
-6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
-8678ddd23573022d68dcd883ae239be8  xconsole-1.0.2.tar.bz2
 b41ed6b4bcfc9897366c27a94d2bf150  xload-1.0.2.tar.bz2
-6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
+4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
 7c6a783e42c88360ac31d259a864a19d  xmag-1.0.2.tar.bz2
-aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 6b3a6896081f628bf5a2c9129417c86f  xpr-1.0.2.tar.bz2
-2b1a3d030d87e62a591db8ee4c0072e6  xclock-1.0.3.tar.bz2
+911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
+6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
+0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
+b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-apps.spec	21 Aug 2007 02:10:52 -0000	1.24
+++ xorg-x11-apps.spec	24 Sep 2007 19:35:59 -0000	1.25
@@ -4,7 +4,7 @@
 Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
-Version: 7.2
+Version: 7.3
 Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
@@ -23,14 +23,14 @@
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.1.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 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.1.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
@@ -173,6 +173,11 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- xconsole 1.0.3
+- xmessage 1.0.2
+- Bump to 7.3-1
+
 * Tue Aug 21 2007 Dave Airlie <airlied at redhat.com> 7.2-1
 - luit-1.0.2 xclock 1.0.3 xmag 1.0.2 xpr 1.0.2 xload 1.0.2 xcursorgen 1.0.2
 - bump to 7.2 version



From fedora-extras-commits at redhat.com  Mon Sep 24 19:37:38 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:37:38 -0400
Subject: rpms/facter/EL-4 .cvsignore, 1.4, 1.5 facter.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709241937.l8OJbc4D007540@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7426

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jan 2007 23:02:52 -0000	1.4
+++ .cvsignore	24 Sep 2007 19:37:06 -0000	1.5
@@ -1 +1 @@
-facter-1.3.6.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- facter.spec	19 Jan 2007 23:02:52 -0000	1.5
+++ facter.spec	24 Sep 2007 19:37:06 -0000	1.6
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.6
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,13 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
+* Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
+- New version
+
 * Fri Jan 19 2007 David Lutterkort <dlutter at redhat.com> - 1.3.6-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jan 2007 23:02:52 -0000	1.4
+++ sources	24 Sep 2007 19:37:06 -0000	1.5
@@ -1 +1 @@
-35cd0a16d7500061b5fe2f3615d1f677  facter-1.3.6.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:38:31 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:38:31 -0400
Subject: rpms/facter/EL-5 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241938.l8OJcV8I007616@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7592

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:37:58 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:37:58 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:37:58 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:41:47 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:41:47 -0400
Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-utils.spec, 1.19, 1.20
Message-ID: <200709241941.l8OJfln2007995@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7882/devel

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Log Message:
xdriinfo 1.0.2, xwininfo 1.0.3.  bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2007 23:56:48 -0000	1.7
+++ .cvsignore	24 Sep 2007 19:41:14 -0000	1.8
@@ -1,15 +1,11 @@
-xdriinfo-1.0.1.tar.bz2
+xdpyinfo-1.0.2.tar.bz2
 xev-1.0.2.tar.bz2
 xfd-1.0.1.tar.bz2
-xfontsel-1.0.1.tar.bz2
+xfontsel-1.0.2.tar.bz2
 xlsatoms-1.0.1.tar.bz2
 xlsclients-1.0.1.tar.bz2
-xlsfonts-1.0.1.tar.bz2
-xprop-1.0.1.tar.bz2
-xvinfo-1.0.1.tar.bz2
-xwininfo-1.0.2.tar.bz2
-xdpyinfo-1.0.2.tar.bz2
+xlsfonts-1.0.2.tar.bz2
 xprop-1.0.3.tar.bz2
 xvinfo-1.0.2.tar.bz2
-xlsfonts-1.0.2.tar.bz2
-xfontsel-1.0.2.tar.bz2
+xdriinfo-1.0.2.tar.bz2
+xwininfo-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2007 23:56:48 -0000	1.7
+++ sources	24 Sep 2007 19:41:14 -0000	1.8
@@ -1,11 +1,11 @@
-be3c5a9b242a57226b5bb5f22ec341ca  xdriinfo-1.0.1.tar.bz2
+c9ee60ae52c97c51d4ca327e53f0cb61  xdpyinfo-1.0.2.tar.bz2
 e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
+288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
 44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
-e5dbc8866a55958297f5f38205b6be1e  xwininfo-1.0.2.tar.bz2
-c9ee60ae52c97c51d4ca327e53f0cb61  xdpyinfo-1.0.2.tar.bz2
+28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
 e7b16eeb4bab974e3592d62f415aa6a5  xprop-1.0.3.tar.bz2
 e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2
-28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
-288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
+a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
+721f84332c98c33152460bb22ba9ded6  xwininfo-1.0.3.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-utils.spec	16 Aug 2007 23:56:48 -0000	1.19
+++ xorg-x11-utils.spec	24 Sep 2007 19:41:14 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
-Version: 7.2
+Version: 7.3
 Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.2.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.1.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
@@ -19,7 +19,7 @@
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.3.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.3.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
@@ -104,6 +104,11 @@
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- xdriinfo 1.0.2
+- xwininfo 1.0.3
+- Bump to 7.3
+
 * Fri Aug 17 2007 Dave Airlie <airlied at redhat.com> 7.2-1
 - xfontsel 1.0.2, xlsfonts 1.0.2, xvinfo 1.0.2, xprop 1.0.3
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:41:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:41:58 -0400
Subject: rpms/libXtst/devel .cvsignore, 1.8, 1.9 libXtst.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709241941.l8OJfwk2008033@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXtst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965/devel

Modified Files:
	.cvsignore libXtst.spec sources 
Log Message:
libXtst 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jun 2007 15:23:30 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:41:25 -0000	1.9
@@ -1 +1 @@
-libXtst-1.0.2.tar.bz2
+libXtst-1.0.3.tar.bz2


Index: libXtst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXtst.spec	22 Aug 2007 19:03:09 -0000	1.18
+++ libXtst.spec	24 Sep 2007 19:41:25 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
+- libXtst 1.0.3
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-2
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jun 2007 15:23:30 -0000	1.8
+++ sources	24 Sep 2007 19:41:25 -0000	1.9
@@ -1 +1 @@
-032d5c1d3914fc0224837328c88aef96  libXtst-1.0.2.tar.bz2
+090c1ad04e34982eada5cf3b1a0792fd  libXtst-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:45:24 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:45:24 -0400
Subject: rpms/libXpm import.log,1.1,1.2
Message-ID: <200709241945.l8OJjOnl008295@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8245

Modified Files:
	import.log 
Log Message:
libXpm 3.5.7



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:14:55 -0000	1.1
+++ import.log	24 Sep 2007 19:44:51 -0000	1.2
@@ -0,0 +1 @@
+libXpm-3_5_7-1_fc8:HEAD:libXpm-3.5.7-1.fc8.src.rpm:1190662165



From fedora-extras-commits at redhat.com  Mon Sep 24 19:45:27 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:45:27 -0400
Subject: rpms/libXpm/devel .cvsignore, 1.8, 1.9 libXpm.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709241945.l8OJjRCD008330@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8245/devel

Modified Files:
	.cvsignore libXpm.spec sources 
Log Message:
libXpm 3.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Nov 2006 18:53:46 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:44:54 -0000	1.9
@@ -1 +1 @@
-libXpm-3.5.6.tar.bz2
+libXpm-3.5.7.tar.bz2


Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXpm.spec	21 Aug 2007 20:48:13 -0000	1.19
+++ libXpm.spec	24 Sep 2007 19:44:54 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.6
-Release: 2%{?dist}
+Version: 3.5.7
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -88,6 +88,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 3.5.7-1
+- libXpm 3.5.7
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 3.5.6-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Nov 2006 18:53:46 -0000	1.9
+++ sources	24 Sep 2007 19:44:54 -0000	1.10
@@ -1 +1 @@
-37b7d1826c6a02107269632a93b8791f  libXpm-3.5.6.tar.bz2
+cd15ee542d9f515538b4462a6f79d977  libXpm-3.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:46:55 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:46:55 -0400
Subject: rpms/libXaw import.log,1.1,1.2
Message-ID: <200709241946.l8OJktN1008512@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8429

Modified Files:
	import.log 
Log Message:
libXaw 1.0.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:12:54 -0000	1.1
+++ import.log	24 Sep 2007 19:46:22 -0000	1.2
@@ -0,0 +1 @@
+libXaw-1_0_4-1_fc8:HEAD:libXaw-1.0.4-1.fc8.src.rpm:1190662249



From fedora-extras-commits at redhat.com  Mon Sep 24 19:46:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:46:58 -0400
Subject: rpms/libXaw/devel .cvsignore, 1.9, 1.10 libXaw.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <200709241946.l8OJkw9W008517@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8429/devel

Modified Files:
	.cvsignore libXaw.spec sources 
Log Message:
libXaw 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Apr 2006 19:39:22 -0000	1.9
+++ .cvsignore	24 Sep 2007 19:46:25 -0000	1.10
@@ -1 +1 @@
-libXaw-1.0.2.tar.bz2
+libXaw-1.0.4.tar.bz2


Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libXaw.spec	6 Sep 2007 20:10:52 -0000	1.24
+++ libXaw.spec	24 Sep 2007 19:46:25 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
-Version: 1.0.2
-Release: 10%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -89,6 +89,7 @@
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xaw
+%doc COPYING
 %{_includedir}/X11/Xaw/*.h
 # FIXME:  Is this C file really supposed to be here?
 %{_includedir}/X11/Xaw/Template.c
@@ -98,9 +99,12 @@
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXaw 1.0.4
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
 - Move Xaw6 to a compat package, nothing in the distro needs it.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2006 19:39:22 -0000	1.8
+++ sources	24 Sep 2007 19:46:25 -0000	1.9
@@ -1 +1 @@
-27dc85f84ac78eb619f72a0805a323f4  libXaw-1.0.2.tar.bz2
+73671d8f1cf36fdd81395328cc3539c9  libXaw-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:49:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:49:41 -0400
Subject: rpms/libXcursor import.log,1.1,1.2
Message-ID: <200709241949.l8OJnfIE008668@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcursor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631

Modified Files:
	import.log 
Log Message:
libXcursor 1.1.9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:13:07 -0000	1.1
+++ import.log	24 Sep 2007 19:49:08 -0000	1.2
@@ -0,0 +1 @@
+libXcursor-1_1_9-1_fc8:HEAD:libXcursor-1.1.9-1.fc8.src.rpm:1190662424



From fedora-extras-commits at redhat.com  Mon Sep 24 19:49:45 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:49:45 -0400
Subject: rpms/libXcursor/devel .cvsignore, 1.9, 1.10 libXcursor.spec, 1.19, 
	1.20 sources, 1.10, 1.11
Message-ID: <200709241949.l8OJnjAh008673@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631/devel

Modified Files:
	.cvsignore libXcursor.spec sources 
Log Message:
libXcursor 1.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Nov 2006 15:34:19 -0000	1.9
+++ .cvsignore	24 Sep 2007 19:49:11 -0000	1.10
@@ -1 +1 @@
-libXcursor-1.1.8.tar.bz2
+libXcursor-1.1.9.tar.bz2


Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXcursor.spec	22 Aug 2007 18:59:59 -0000	1.19
+++ libXcursor.spec	24 Sep 2007 19:49:11 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.8
-Release: 3%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -87,9 +87,12 @@
 %{_libdir}/libXcursor.so
 %{_libdir}/pkgconfig/xcursor.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/Xcursor.3*
+%{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.9-1
+- libXcursor 1.1.9
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.1.8-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Nov 2006 15:34:19 -0000	1.10
+++ sources	24 Sep 2007 19:49:11 -0000	1.11
@@ -1 +1 @@
-ec2acd10a7736a85dd1e1ed9ea5bec96  libXcursor-1.1.8.tar.bz2
+99b7554037a92b260891091e81815a0a  libXcursor-1.1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:07 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:53:07 -0400
Subject: rpms/libpciaccess import.log,1.5,1.6
Message-ID: <200709241953.l8OJr7qE010308@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241

Modified Files:
	import.log 
Log Message:
libpciaccess 0.9.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Aug 2007 17:13:34 -0000	1.5
+++ import.log	24 Sep 2007 19:52:35 -0000	1.6
@@ -2,3 +2,4 @@
 libpciaccess-0_8-0_1_20070530git_fc7:F-7:libpciaccess-0.8-0.1.20070530git.fc7.src.rpm:1181060573
 libpciaccess-0_8-0_2_20070712git_fc8:HEAD:libpciaccess-0.8-0.2.20070712git.fc8.src.rpm:1184274401
 libpciaccess-0_8-0_4_20070827git_fc8:HEAD:libpciaccess-0.8-0.4.20070827git.fc8.src.rpm:1188234316
+libpciaccess-0_9_1-1_fc8:HEAD:libpciaccess-0.9.1-1.fc8.src.rpm:1190662632



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:09 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:53:09 -0400
Subject: rpms/libpciaccess/devel .cvsignore, 1.4, 1.5 libpciaccess.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709241953.l8OJr9LC010313@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241/devel

Modified Files:
	.cvsignore libpciaccess.spec sources 
Log Message:
libpciaccess 0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 17:13:38 -0000	1.4
+++ .cvsignore	24 Sep 2007 19:52:37 -0000	1.5
@@ -1 +1 @@
-libpciaccess-20070827.tar.bz2
+libpciaccess-0.9.1.tar.bz2


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpciaccess.spec	27 Aug 2007 17:13:38 -0000	1.4
+++ libpciaccess.spec	24 Sep 2007 19:52:37 -0000	1.5
@@ -2,8 +2,8 @@
 %define gitrev b0c9558c97ee861af240a948c364807e628e49de
 
 Name:           libpciaccess
-Version:        0.8
-Release:        0.4.%{gitdate}git%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -11,7 +11,8 @@
 URL:            http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git
 # git snapshot.  To recreate, run
 # % ./make-libpciaccess-snapshot.sh %{gitrev}
-Source0:        libpciaccess-%{gitdate}.tar.bz2
+#Source0:        libpciaccess-%{gitdate}.tar.bz2
+Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +33,7 @@
 Development package for libpciaccess.
 
 %prep
-%setup -q -n %{name}-%{gitdate}
+%setup -q
 
 %build
 autoreconf -v --install
@@ -63,6 +64,9 @@
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 0.9.1-1
+- libpciaccess 0.9.1
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.8-0.4.20070827git
 - New snapshot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 17:13:38 -0000	1.4
+++ sources	24 Sep 2007 19:52:37 -0000	1.5
@@ -1 +1 @@
-66a74066ab009528d43e5ccf80450ab7  libpciaccess-20070827.tar.bz2
+4b2df0a840917d1ced91973d7626c25d  libpciaccess-0.9.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 24 Sep 2007 15:53:30 -0400
Subject: rpms/slim/F-7 slim-1.2.6-pam.patch,NONE,1.1 slim.spec,1.2,1.3
Message-ID: <200709241953.l8OJrUBT010378@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10287

Modified Files:
	slim.spec 
Added Files:
	slim-1.2.6-pam.patch 
Log Message:
backport PAM support

slim-1.2.6-pam.patch:

--- NEW FILE slim-1.2.6-pam.patch ---
diff -uNbr --exclude=.svn release-1.2.6/Makefile slim-pam/Makefile
--- release-1.2.6/Makefile	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile	2007-06-05 12:57:54.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
+ifdef USE_PAM
+LDFLAGS+= -lpam
+CUSTOM+= -DUSE_PAM
+endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+ifdef USE_PAM
+OBJECTS+=PAM.o
+endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.freebsd slim-pam/Makefile.freebsd
--- release-1.2.6/Makefile.freebsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.freebsd	2007-06-11 13:00:09.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DNEEDS_BASENAME
+.ifdef(USE_PAM)
+  LDFLAGS+= -lpam
+  CUSTOM+= -DUSE_PAM
+.endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/share/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+.ifdef USE_PAM
+  OBJECTS+=PAM.o 
+.endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.netbsd slim-pam/Makefile.netbsd
--- release-1.2.6/Makefile.netbsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.netbsd	2007-06-07 04:15:03.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/freetype2/config -I/usr/pkg/include -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -L/usr/pkg/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DNEEDS_BASENAME
+.ifdef(USE_PAM)
+  LDFLAGS+= -lpam
+  CUSTOM+= -DUSE_PAM
+.endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/share/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+.ifdef USE_PAM
+  OBJECTS+=PAM.o 
+.endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.openbsd slim-pam/Makefile.openbsd
--- release-1.2.6/Makefile.openbsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.openbsd	2007-06-05 12:57:54.000000000 +0200
@@ -20,7 +20,7 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
 
 .SUFFIXES: .c.o .cpp.o
 
@@ -44,9 +44,6 @@
 switchuser.o:
 	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c switchuser.cpp -o $@
 
-input.o:
-	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c input.cpp -o $@
-
 app.o:
 	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c app.cpp -o $@
 
diff -uNbr --exclude=.svn release-1.2.6/PAM.cpp slim-pam/PAM.cpp
--- release-1.2.6/PAM.cpp	1970-01-01 01:00:00.000000000 +0100
+++ slim-pam/PAM.cpp	2007-05-29 19:10:51.000000000 +0200
@@ -0,0 +1,275 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2007 Martin Parm
+
+   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 <PAM.h>
+#include <string>
+#include <iostream>
+
+namespace PAM {
+    Exception::Exception(pam_handle_t* _pam_handle,
+               const std::string& _func_name,
+               int _errnum):
+        errnum(_errnum),
+        errstr(pam_strerror(_pam_handle, _errnum)),
+        func_name(_func_name)
+        {}
+
+    Exception::~Exception(void){}
+
+    Auth_Exception::Auth_Exception(pam_handle_t* _pam_handle,
+                                   const std::string& _func_name,
+                                   int _errnum):
+        Exception(_pam_handle, _func_name, _errnum){}
+
+    Cred_Exception::Cred_Exception(pam_handle_t* _pam_handle,
+                                   const std::string& _func_name,
+                                   int _errnum):
+        Exception(_pam_handle, _func_name, _errnum){}
+
+    int Authenticator::_end(void){
+        int result=pam_end(pam_handle, last_result);
+        pam_handle=0;
+        return result;
+    }
+
+    Authenticator::Authenticator(conversation* conv, void* data):
+        pam_handle(0),
+        last_result(PAM_SUCCESS)
+    {
+        pam_conversation.conv=conv;
+        pam_conversation.appdata_ptr=data;
+    }
+
+    Authenticator::~Authenticator(void){
+        if (pam_handle) _end();
+    }
+
+    void Authenticator::start(const std::string& service){
+        switch((last_result=pam_start(service.c_str(), NULL, &pam_conversation, &pam_handle))){
+            default:
+                throw Exception(pam_handle, "pam_start()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    void Authenticator::end(void){
+        switch((last_result=_end())){
+            default:
+                throw Exception(pam_handle, "pam_end()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+
+        }
+        return;
+    }
+
+    void Authenticator::set_item(const Authenticator::ItemType item, const void* value){
+        switch((last_result=pam_set_item(pam_handle, item, value))){
+            default:
+            _end();
+                throw Exception(pam_handle, "pam_set_item()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    const void* Authenticator::get_item(const Authenticator::ItemType item){
+        const void* data;
+        switch ((last_result=pam_get_item(pam_handle, item, &data))){
+            default:
+            case PAM_SYSTEM_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_get_item()", last_result);
+
+            case PAM_PERM_DENIED: // The value of item was NULL
+            case PAM_SUCCESS:
+                break;
+        }
+        return data;
+    }
+
+#ifdef __LIBPAM_VERSION
+    void Authenticator::fail_delay(const unsigned int micro_sec){
+        switch((last_result=pam_fail_delay(pam_handle, micro_sec))){
+            default:
+                _end();
+                throw Exception(pam_handle, "fail_delay()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+#endif
+
+    void Authenticator::authenticate(void){
+        switch((last_result=pam_authenticate(pam_handle, 0))){
+            default:
+            case PAM_ABORT:
+            case PAM_AUTHINFO_UNAVAIL:
+                _end();
+                throw Exception(pam_handle, "pam_authenticate()", last_result);
+
+            case PAM_USER_UNKNOWN:
+            case PAM_MAXTRIES:
+            case PAM_CRED_INSUFFICIENT:
+            case PAM_AUTH_ERR:
+                throw Auth_Exception(pam_handle, "pam_authentication()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+
+        switch((last_result=pam_acct_mgmt(pam_handle, PAM_SILENT))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_NEW_AUTHTOKEN_REQD is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_NEW_AUTHTOKEN_REQD:
+            case PAM_ACCT_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                _end();
+                throw Exception(pam_handle, "pam_acct_mgmt()", last_result);
+                
+            case PAM_AUTH_ERR:
+            case PAM_PERM_DENIED:
+                throw Auth_Exception(pam_handle, "pam_acct_mgmt()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::open_session(void){
+        switch((last_result=pam_setcred(pam_handle, PAM_ESTABLISH_CRED))){
+            default:
+            case PAM_CRED_ERR:
+            case PAM_CRED_UNAVAIL:
+                _end();
+                throw Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_CRED_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                throw Cred_Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+
+        switch((last_result=pam_open_session(pam_handle, 0))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_SESSION_ERROR is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_SESSION_ERROR:
+                pam_setcred(pam_handle, PAM_DELETE_CRED);
+                _end();
+                throw Exception(pam_handle, "pam_open_session()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::close_session(void){
+        switch((last_result=pam_close_session(pam_handle, 0))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_SESSION_ERROR is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_SESSION_ERROR:
+                pam_setcred(pam_handle, PAM_DELETE_CRED);
+                _end();
+                throw Exception(pam_handle, "pam_close_session", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        switch((last_result=pam_setcred(pam_handle, PAM_DELETE_CRED))){
+            default:
+            case PAM_CRED_ERR:
+            case PAM_CRED_UNAVAIL:
+            case PAM_CRED_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                _end();
+                throw Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    void Authenticator::setenv(const std::string& key, const std::string& value){
+        std::string name_value = key+"="+value;
+        switch((last_result=pam_putenv(pam_handle, name_value.c_str()))){
+            default:
+            case PAM_PERM_DENIED:
+            case PAM_ABORT:
+            case PAM_BUF_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_putenv()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::delenv(const std::string& key){
+        switch((last_result=pam_putenv(pam_handle, key.c_str()))){
+            default:
+            case PAM_PERM_DENIED:
+            case PAM_ABORT:
+            case PAM_BUF_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_putenv()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    const char* Authenticator::getenv(const std::string& key){
+        return pam_getenv(pam_handle, key.c_str());
+    }
+
+    char** Authenticator::getenvlist(void){
+        return pam_getenvlist(pam_handle);
+    }
+
+};
+
+std::ostream& operator<<( std::ostream& os, const PAM::Exception& e){
+    os << e.func_name << ": " << e.errstr;
+    return os;
+}
diff -uNbr --exclude=.svn release-1.2.6/PAM.h slim-pam/PAM.h
--- release-1.2.6/PAM.h	1970-01-01 01:00:00.000000000 +0100
+++ slim-pam/PAM.h	2007-06-07 04:16:01.000000000 +0200
@@ -0,0 +1,99 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2007 Martin Parm
+
+   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.
+*/
+
+#ifndef _PAM_H_
+#define _PAM_H_
+#include <string>
+#include <security/pam_appl.h>
+
+#ifdef __LIBPAM_VERSION
+#include <security/pam_misc.h>
+#endif
+
+namespace PAM {
+    class Exception{
+    public:
+        int errnum;
+        std::string errstr;
+        std::string func_name;
+        Exception(pam_handle_t* _pam_handle,
+                  const std::string& _func_name,
+                  int _errnum);
+        virtual ~Exception(void);
+    };
+
+    class Auth_Exception: public Exception{
+    public:
+        Auth_Exception(pam_handle_t* _pam_handle,
+                       const std::string& _func_name,
+                       int _errnum);
+    };
+
+    class Cred_Exception: public Exception{
+    public:
+        Cred_Exception(pam_handle_t* _pam_handle,
+                       const std::string& _func_name,
+                       int _errnum);
+    };
+
+
+    class Authenticator{
+    private:
+        struct pam_conv pam_conversation;
+        pam_handle_t* pam_handle;
+        int last_result;
+
+        int _end(void);
+    public:
+        typedef int (conversation)(int num_msg,
+                           const struct pam_message **msg,
+                           struct pam_response **resp,
+                           void *appdata_ptr);
+
+        enum ItemType {
+            Service     = PAM_SERVICE,
+            User        = PAM_USER,
+            User_Prompt = PAM_USER_PROMPT,
+            TTY         = PAM_TTY,
+            Requestor   = PAM_RUSER,
+            Host        = PAM_RHOST,
+            Conv        = PAM_CONV,
+#ifdef __LIBPAM_VERSION
+            //Fail_Delay  = PAM_FAIL_DELAY
+#endif
+        };
+
+    public:
+        Authenticator(conversation* conv, void* data=0);
+        ~Authenticator(void);
+        
+        void start(const std::string& service);
+        void end(void);
+        void set_item(const ItemType item, const void* value);
+        const void* get_item(const ItemType item);
+#ifdef __LIBPAM_VERSION
+        void fail_delay(const unsigned int micro_sec);
+#endif
+        void authenticate(void);
+        void open_session(void);
+        void close_session(void);
+        void setenv(const std::string& key, const std::string& value);
+        void delenv(const std::string& key);
+        const char* getenv(const std::string& key);
+        char** getenvlist(void);
+
+    private:
+        // Explicitly disable copy constructor and copy assignment
+        Authenticator(const PAM::Authenticator&);
+        Authenticator& operator=(const PAM::Authenticator&);
+    };
+};
+
+std::ostream& operator<<( std::ostream& os, const PAM::Exception& e);
+#endif
diff -uNbr --exclude=.svn release-1.2.6/app.cpp slim-pam/app.cpp
--- release-1.2.6/app.cpp	2006-09-10 22:10:40.000000000 +0200
+++ slim-pam/app.cpp	2007-06-07 04:18:21.000000000 +0200
@@ -26,6 +26,78 @@
 #include "numlock.h"
 
 
+#ifdef HAVE_SHADOW
+#include <shadow.h>
+#endif
+
+#ifdef USE_PAM
+#include <string>
+
+int conv(int num_msg, const struct pam_message **msg,
+         struct pam_response **resp, void *appdata_ptr){
+    *resp = (struct pam_response *) calloc(num_msg, sizeof(struct pam_response));
+    Panel* panel = *static_cast<Panel**>(appdata_ptr);
+    int result = PAM_SUCCESS;
+    for (int i=0; i<num_msg; i++){
+        resp[i]->resp=0;
+        resp[i]->resp_retcode=0;
+        switch(msg[i]->msg_style){
+            case PAM_PROMPT_ECHO_ON:
+                // We assume PAM is asking for the username
+                panel->EventHandler(Panel::Get_Name);
+                switch(panel->getAction()){
+                    case Panel::Suspend:
+                    case Panel::Halt:
+                    case Panel::Reboot:
+                        resp[i]->resp=strdup("root");
+                        break;
+
+                    case Panel::Console:
+                    case Panel::Exit:
+                    case Panel::Login:
+                        resp[i]->resp=strdup(panel->GetName().c_str());
+                        break;
+                }
+                break;
+
+            case PAM_PROMPT_ECHO_OFF:
+                // We assume PAM is asking for the password
+                switch(panel->getAction()){
+                    case Panel::Console:
+                    case Panel::Exit:
+                        // We should leave now!
+                        result=PAM_CONV_ERR;
+                        break;
+
+                    default:
+                        panel->EventHandler(Panel::Get_Passwd);
+                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
+                        break;
+                }
+                break;
+
+            case PAM_ERROR_MSG:
+            case PAM_TEXT_INFO:
+                // We simply write these to the log
+                // TODO: Maybe we should simply ignore them
+                cerr << APPNAME << ": " << msg[i]->msg << endl;
+                break;
+        }
+        if (result!=PAM_SUCCESS) break;
+    }
+    if (result!=PAM_SUCCESS){
+        for (int i=0; i<num_msg; i++){
+            if (resp[i]->resp==0) continue;
+            free(resp[i]->resp);
+            resp[i]->resp=0;
+        };
+        free(*resp);
+        *resp=0;
+    };
+    return result;
+}
+#endif
+
 extern App* LoginApp;
 
 void CatchSignal(int sig) {
@@ -53,8 +125,12 @@
 }
 
 
-App::App(int argc, char** argv) {
-
+#ifdef USE_PAM
+App::App(int argc, char** argv):
+    pam(conv, static_cast<void*>(&LoginPanel)){
+#else
+App::App(int argc, char** argv){
+#endif
     int tmp;
     ServerPID = -1;
     testing = false;
@@ -133,6 +209,20 @@
         }
     }
 
+#ifdef USE_PAM
+    try{
+        pam.start("slim");
+        pam.set_item(PAM::Authenticator::TTY, DisplayName);
+        pam.set_item(PAM::Authenticator::Requestor, "root");
+        pam.set_item(PAM::Authenticator::Host, "localhost");
+
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+#endif
+
     bool loaded = false;
     while (!loaded) {
         themedir =  themebase + themeName;
@@ -219,9 +308,8 @@
     LoginPanel = new Panel(Dpy, Scr, Root, cfg, themedir);
 
     // Start looping
-    XEvent event;
     int panelclosed = 1;
-    int Action;
+    Panel::ActionType Action;
     bool firstloop = true; // 1st time panel is shown (for automatic username)
 
     while(1) {
@@ -239,53 +327,124 @@
             LoginPanel->OpenPanel();
         }
 
-        Action = WAIT;
-        LoginPanel->GetInput()->Reset();
+        LoginPanel->Reset();
         if (firstloop && cfg->getOption("default_user") != "") {
-            LoginPanel->GetInput()->SetName(cfg->getOption("default_user") );
+            LoginPanel->SetName(cfg->getOption("default_user") );
             firstloop = false;
         }
 
-        while(Action == WAIT) {
-            XNextEvent(Dpy, &event);
-            Action = LoginPanel->EventHandler(&event);
-        }
 
-        if(Action == FAIL) {
+        if (!AuthenticateUser()){
             panelclosed = 0;
             LoginPanel->ClearPanel();
             XBell(Dpy, 100);
-        } else {
+            continue;
+        }
+        
+
+        Action = LoginPanel->getAction();
             // for themes test we just quit
             if (testing) {
-                Action = EXIT;
+            Action = Panel::Exit;
             }
             panelclosed = 1;
             LoginPanel->ClosePanel();
 
             switch(Action) {
-                case LOGIN:
+            case Panel::Login:
                     Login();
                     break;
-                case CONSOLE:
+            case Panel::Console:
                     Console();
                     break;
-                case REBOOT:
+            case Panel::Reboot:
                     Reboot();
                     break;
-                case HALT:
+            case Panel::Halt:
                     Halt();
                     break;
-                case SUSPEND:
+            case Panel::Suspend:
                     Suspend();
                     break;
-                case EXIT:
+            case Panel::Exit:
                     Exit();
                     break;
             }
         }
+}
+
+#ifdef USE_PAM
+bool App::AuthenticateUser(void){
+    // Reset the username
+    try{
+        pam.set_item(PAM::Authenticator::User, 0);
+        pam.authenticate();
+    }
+    catch(PAM::Auth_Exception& e){
+        switch(LoginPanel->getAction()){
+            case Panel::Exit:
+            case Panel::Console:
+                return true; // <--- This is simply fake!
+            default:
+                break;
+        };
+        cerr << APPNAME << ": " << e << endl;
+        return false;
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+    return true;
+}
+#else
+bool App::AuthenticateUser(void){
+    LoginPanel->EventHandler(Panel::Get_Name);
+    switch(LoginPanel->getAction()){
+        case Panel::Exit:
+        case Panel::Console:
+            cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
+            return true; // <--- This is simply fake!
+        default:
+            break;
+    };
+    LoginPanel->EventHandler(Panel::Get_Passwd);
+    
+    char *encrypted, *correct;
+    struct passwd *pw;
+
+    switch(LoginPanel->getAction()){
+        case Panel::Suspend:
+        case Panel::Halt:
+        case Panel::Reboot:
+            pw = getpwnam("root");
+            break;
+        case Panel::Console:
+        case Panel::Exit:
+        case Panel::Login:
+            pw = getpwnam(LoginPanel->GetName().c_str());
+            break;
     }
+    endpwent();
+    if(pw == 0)
+        return false;
+
+#ifdef HAVE_SHADOW
+    struct spwd *sp = getspnam(pw->pw_name);    
+    endspent();
+    if(sp)
+        correct = sp->sp_pwdp;
+    else
+#endif        // HAVE_SHADOW
+        correct = pw->pw_passwd;
+
+    if(correct == 0 || correct[0] == '\0')
+        return true;
+
+    encrypted = crypt(LoginPanel->GetPasswd().c_str(), correct);
+    return ((strcmp(encrypted, correct) == 0) ? true : false);
 }
+#endif
 
 
 int App::GetServerPID() {
@@ -313,15 +472,85 @@
     struct passwd *pw;
     pid_t pid;
 
-    pw = LoginPanel->GetInput()->GetPasswdStruct();
+#ifdef USE_PAM
+    try{
+        pam.open_session();
+        pw = getpwnam(static_cast<const char*>(pam.get_item(PAM::Authenticator::User)));
+    }
+    catch(PAM::Cred_Exception& e){
+        // Credentials couldn't be established
+        cerr << APPNAME << ": " << e << endl;
+        return;
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+#else
+    pw = getpwnam(LoginPanel->GetName().c_str());
+#endif
+    endpwent();
     if(pw == 0)
         return;
+    if (pw->pw_shell[0] == '\0') {
+        setusershell();
+        strcpy(pw->pw_shell, getusershell());
+        endusershell();
+    }
+
+    // Setup the environment
+    char* term = getenv("TERM");
+    string maildir = _PATH_MAILDIR;
+    maildir.append("/");
+    maildir.append(pw->pw_name);
+    string xauthority = pw->pw_dir;
+    xauthority.append("/.Xauthority");
+    
+#ifdef USE_PAM
+    // Setup the PAM environment
+    try{
+        if(term) pam.setenv("TERM", term);
+        pam.setenv("HOME", pw->pw_dir);
+        pam.setenv("SHELL", pw->pw_shell);
+        pam.setenv("USER", pw->pw_name);
+        pam.setenv("LOGNAME", pw->pw_name);
+        pam.setenv("PATH", cfg->getOption("default_path").c_str());
+        pam.setenv("DISPLAY", DisplayName);
+        pam.setenv("MAIL", maildir.c_str());
+        pam.setenv("XAUTHORITY", xauthority.c_str());
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    }
+#endif
 
     // Create new process
     pid = fork();
     if(pid == 0) {
+#ifdef USE_PAM
+        // Get a copy of the environment and close the child's copy
+        // of the PAM-handle.
+        char** child_env = pam.getenvlist();
+        pam.end();
+#else
+        const int Num_Of_Variables = 10; // Number of env. variables + 1
+        char** child_env = static_cast<char**>(malloc(sizeof(char*)*Num_Of_Variables));
+        int n = 0;
+        if(term) child_env[n++]=StrConcat("TERM=", term);
+        child_env[n++]=StrConcat("HOME=", pw->pw_dir);
+        child_env[n++]=StrConcat("SHELL=", pw->pw_shell);
+        child_env[n++]=StrConcat("USER=", pw->pw_name);
+        child_env[n++]=StrConcat("LOGNAME=", pw->pw_name);
+        child_env[n++]=StrConcat("PATH=", cfg->getOption("default_path").c_str());
+        child_env[n++]=StrConcat("DISPLAY=", DisplayName);
+        child_env[n++]=StrConcat("MAIL=", maildir.c_str());
+        child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
+        child_env[n++]=0;
+#endif
+
         // Login process starts here
-        SwitchUser Su(pw, cfg, DisplayName);
+        SwitchUser Su(pw, cfg, DisplayName, child_env);
         string session = LoginPanel->getSession();
         string loginCommand = cfg->getOption("login_cmd");
         replaceVariables(loginCommand, SESSION_VAR, session);
@@ -332,7 +561,7 @@
             system(sessStart.c_str());
         }
         Su.Login(loginCommand.c_str(), mcookie.c_str());
-        exit(OK_EXIT);
+        _exit(OK_EXIT);
     }
 
 #ifndef XNEST_DEBUG
@@ -347,6 +576,7 @@
     }
     if (WIFEXITED(status) && WEXITSTATUS(status)) {
         LoginPanel->Message("Failed to execute login command");
+        sleep(3);
     } else {
          string sessStop = cfg->getOption("sessionstop_cmd");
          if (sessStop != "") {
@@ -355,7 +585,16 @@
         }
     }
 
-    // Close all clients
+#ifdef USE_PAM
+    try{
+        pam.close_session();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
+// Close all clients
     KillAllClients(False);
     KillAllClients(True);
 
@@ -382,6 +621,15 @@
     // Stop alarm clock
     alarm(0);
 
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     // Write message
     LoginPanel->Message((char*)cfg->getOption("reboot_msg").c_str());
     sleep(3);
@@ -398,6 +646,15 @@
     // Stop alarm clock
     alarm(0);
 
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     // Write message
     LoginPanel->Message((char*)cfg->getOption("shutdown_msg").c_str());
     sleep(3);
@@ -433,6 +690,15 @@
 
 
 void App::Exit() {
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     if (testing) {
         char* testmsg = "This is a test message :-)";
         LoginPanel->Message(testmsg);
@@ -453,6 +720,15 @@
 }
 
 void App::RestartServer() {
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
         StopServer(); 
         RemoveLock();
         Run();
diff -uNbr --exclude=.svn release-1.2.6/app.h slim-pam/app.h
--- release-1.2.6/app.h	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/app.h	2007-05-19 21:26:29.000000000 +0200
@@ -24,6 +24,10 @@
 #include "cfg.h"
 #include "image.h"
 
+#ifdef USE_PAM
+#include "PAM.h"
+#endif
+
 class App {
 public:
     App(int argc, char** argv);
@@ -53,6 +57,8 @@
     char* StrConcat(const char* str1, const char* str2);
     void UpdatePid();
  
+    bool AuthenticateUser(void);
+ 
     static std::string findValidRandomTheme(const std::string& set);
     static void replaceVariables(std::string& input,
                                  const std::string& var,
@@ -71,6 +77,10 @@
     int ServerPID;
     char* DisplayName;
 
+#ifdef USE_PAM
+	PAM::Authenticator pam;
+#endif
+
     // Options
     char* DispName;
 
diff -uNbr --exclude=.svn release-1.2.6/cfg.cpp slim-pam/cfg.cpp
--- release-1.2.6/cfg.cpp	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/cfg.cpp	2007-05-27 15:44:12.000000000 +0200
@@ -19,7 +19,9 @@
 
 typedef pair<string,string> option;
 
-Cfg::Cfg() {
+Cfg::Cfg() 
+    : currentSession(-1)
+{
     // Configuration options
     options.insert(option("default_path","./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"));
     options.insert(option("default_xserver","/usr/X11R6/bin/X"));
@@ -34,7 +36,7 @@
     options.insert(option("sessionstart_cmd",""));
     options.insert(option("sessionstop_cmd",""));
     options.insert(option("console_cmd","/usr/X11R6/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));
-    options.insert(option("screenshot_cmd","import -window root /login.app.png"));
+    options.insert(option("screenshot_cmd","import -window root /slim.png"));
     options.insert(option("welcome_msg","Welcome to %host"));
     options.insert(option("default_user",""));
     options.insert(option("current_theme","default"));
@@ -129,6 +131,7 @@
             }
         }
         cfgfile.close();
+        split(sessions, getOption("sessions"), ',', false);
         return true;
     } else {
         error = "Cannot read configuration file: " + configfile;
@@ -211,8 +214,7 @@
     int n = -1;
     n = position.find("%");
     if (n>0) { // X Position expressed in percentage
-        const char* tmp =  position.substr(0, n).c_str();
-        int result = (max*string2int(tmp)/100) - (width / 2);
+        int result = (max*string2int(position.substr(0, n).c_str())/100) - (width / 2);
         return result < 0 ? 0 : result ;
     } else { // Absolute X position
         return string2int(position.c_str());
@@ -220,17 +222,21 @@
 }
 
 // split a comma separated string into a vector of strings
-void Cfg::split(vector<string>& v, const string& str, char c) {
+void Cfg::split(vector<string>& v, const string& str, char c, bool useEmpty) {
     v.clear();
     string::const_iterator s = str.begin();
+    string tmp;
     while (true) {
         string::const_iterator begin = s;
         while (*s != c && s != str.end()) { ++s; }
-        v.push_back(string(begin, s));
+    tmp = string(begin, s);
+    if (useEmpty || tmp.size() > 0)
+            v.push_back(tmp);
         if (s == str.end()) {
             break;
         }
         if (++s == str.end()) {
+        if (useEmpty)
             v.push_back("");
             break;
         }
@@ -238,15 +244,9 @@
 }
 
 string Cfg::nextSession(string current) {
-    vector<string> sessions;
-    split(sessions, getOption("sessions"), ',');
-    if (sessions.size() <= 1)
+    if (sessions.size() < 1)
         return current;
 
-    for (int i=0; i<(int)sessions.size()-1; i++) {
-        if (current == sessions[i]) {
-            return sessions[i+1];
-        }
-    }
-    return sessions[0];
+    currentSession = (currentSession + 1) % sessions.size();
+    return sessions[currentSession];
 }
diff -uNbr --exclude=.svn release-1.2.6/cfg.h slim-pam/cfg.h
--- release-1.2.6/cfg.h	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/cfg.h	2007-05-17 16:38:53.000000000 +0200
@@ -37,13 +37,16 @@
 
     static int absolutepos(const string& position, int max, int width);
     static int string2int(const char* string, bool* ok = 0);
-    static void split(vector<string>& v, const string& str, char c);
+    static void split(vector<string>& v, const string& str, 
+                      char c, bool useEmpty=true);
     static string Trim(const string& s);
 
     string nextSession(string current);
 
 private:
     map<string,string> options;
+    vector<string> sessions;
+    int currentSession;
     string error;
 
 };
diff -uNbr --exclude=.svn release-1.2.6/const.h slim-pam/const.h
--- release-1.2.6/const.h	2006-01-08 15:35:03.000000000 +0100
+++ slim-pam/const.h	2007-05-17 16:38:53.000000000 +0200
@@ -26,15 +26,6 @@
 #define HIDE		0
 #define SHOW		1
 
-#define WAIT		0
-#define LOGIN		1
-#define FAIL		2
-#define CONSOLE		3
-#define REBOOT		4
-#define HALT		5
-#define EXIT		6
-#define SUSPEND		7
-
 #define GET_NAME    0
 #define GET_PASSWD	1
 
diff -uNbr --exclude=.svn release-1.2.6/panel.cpp slim-pam/panel.cpp
--- release-1.2.6/panel.cpp	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/panel.cpp	2007-05-19 21:26:29.000000000 +0200
@@ -76,7 +76,8 @@
         panelpng = themedir + "/panel.jpg";
         loaded = image->Read(panelpng.c_str());
         if (!loaded) {
-            cerr << APPNAME << ": could not load panel image for theme '"
+            cerr << APPNAME
+                 << ": could not load panel image for theme '"
 		 << basename((char*)themedir.c_str()) << "'"
 		 << endl;
             exit(ERR_EXIT);
@@ -92,7 +93,8 @@
             panelpng = themedir + "/background.jpg";
             loaded = bg->Read(panelpng.c_str());
             if (!loaded){
-                cerr << APPNAME << ": could not load background image for theme '"
+                cerr << APPNAME
+                     << ": could not load background image for theme '"
 		        << basename((char*)themedir.c_str()) << "'"
 		        << endl;
                 exit(ERR_EXIT);
@@ -106,12 +108,14 @@
     } else if (bgstyle == "center") {
  	    string hexvalue = cfg->getOption("background_color");
         hexvalue = hexvalue.substr(1,6);
-  	    bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
+        bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)),
+                   XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
        			    hexvalue.c_str());
     } else { // plain color or error
 	    string hexvalue = cfg->getOption("background_color");
         hexvalue = hexvalue.substr(1,6);
-  	    bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
+        bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)),
+                   XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
     			    hexvalue.c_str());
     }
 
@@ -128,9 +132,6 @@
     // Read (and substitute vars in) the welcome message
     welcome_message = cfg->getWelcomeMessage();
     intro_message = cfg->getOption("intro_msg");
-
-    // Init In
-    In = new Input(cfg);
 }
 
 Panel::~Panel() {
@@ -144,7 +145,6 @@
     XftFontClose(Dpy, introfont);
     XftFontClose(Dpy, welcomefont);
     XftFontClose(Dpy, enterfont);
-    delete In;
     delete image;
 
 }
@@ -182,7 +182,7 @@
 
 void Panel::ClearPanel() {
     session = "";
-    In->Reset();
+    Reset();
     XClearWindow(Dpy, Root);
     XClearWindow(Dpy, Win);
     Cursor(SHOW);
@@ -190,13 +190,13 @@
     XFlush(Dpy);
 }
 
-void Panel::Message(const char* text) {
+void Panel::Message(const string& text) {
     string cfgX, cfgY;
     XGlyphInfo extents;
     XftDraw *draw = XftDrawCreate(Dpy, Root,
                                   DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
-    XftTextExtents8(Dpy, msgfont, (XftChar8*)text,
-                    strlen(text), &extents);
+    XftTextExtents8(Dpy, msgfont, reinterpret_cast<const XftChar8*>(text.c_str()),
+                    text.length(), &extents);
     cfgX = cfg->getOption("msg_x");
     cfgY = cfg->getOption("msg_y");
     int shadowXOffset =
@@ -208,14 +208,14 @@
     int msg_y = Cfg::absolutepos(cfgY, XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)), extents.height);
 
     SlimDrawString8 (draw, &msgcolor, msgfont, msg_x, msg_y,
-                     (XftChar8*)text, strlen(text),
+                     text,
                      &msgshadowcolor,
                      shadowXOffset, shadowYOffset);
     XFlush(Dpy);
     XftDrawDestroy(draw);
 }
 
-void Panel::Error(const char* text) {
+void Panel::Error(const string& text) {
     ClosePanel();
     Message(text);
     sleep(ERROR_DURATION);
@@ -224,10 +224,6 @@
 }
 
 
-Input* Panel::GetInput() {
-    return In;
-}
-
 unsigned long Panel::GetColor(const char* colorname) {
     XColor color;
     XWindowAttributes attributes;
@@ -244,31 +240,24 @@
 }
 
 void Panel::Cursor(int visible) {
-    char* text;
+    const char* text;
     int xx, yy, y2, cheight;
     char* txth = "Wj"; // used to get cursor height
 
-    switch(In->GetField()) {
-        case GET_PASSWD:
-            text = In->GetHiddenPasswd();
+    switch(field) {
+        case Get_Passwd:
+            text = HiddenPasswdBuffer.c_str();
             xx = input_pass_x;
             yy = input_pass_y;
             break;
 
-        case GET_NAME:
-            text = In->GetName();
+        case Get_Name:
+            text = NameBuffer.c_str();
             xx = input_name_x;
             yy = input_name_y;
             break;
-
-		default: /* Origin & NULL string as default values. */
-			text = (char *)NULL;
-			xx = (int)0;
-			yy = (int)0;
-			break;
     }
 
-
     XGlyphInfo extents;
     XftTextExtents8(Dpy, font, (XftChar8*)txth, strlen(txth), &extents);
     cheight = extents.height;
@@ -288,49 +277,53 @@
     }
 }
 
-int Panel::EventHandler(XEvent* event) {
-    Action = WAIT;
-
-    switch(event->type) {
+void Panel::EventHandler(const Panel::FieldType& curfield) {
+    XEvent event;
+    field=curfield;
+    bool loop = true;
+    OnExpose();
+    while(loop) {
+        XNextEvent(Dpy, &event);
+        switch(event.type) {
     case Expose:
-        OnExpose(event);
+                OnExpose();
         break;
 
     case KeyPress:
-        OnKeyPress(event);
+                loop=OnKeyPress(event);
         break;
     }
+    }
 
-    return Action;
+    return;
 }
 
-void Panel::OnExpose(XEvent* event) {
-    char* name = In->GetName();
-    char* passwd = In->GetHiddenPasswd();
+void Panel::OnExpose(void) {
     XftDraw *draw = XftDrawCreate(Dpy, Win,
                         DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+    XClearWindow(Dpy, Win);
     if (input_pass_x != input_name_x || input_pass_y != input_name_y){
         SlimDrawString8 (draw, &inputcolor, font, input_name_x, input_name_y,
-                         (XftChar8*)name, strlen(name),
+                         NameBuffer,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
         SlimDrawString8 (draw, &inputcolor, font, input_pass_x, input_pass_y,
-                         (XftChar8*)passwd, strlen(passwd),
+                         HiddenPasswdBuffer,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
     } else { //single input mode
-        switch(In->GetField()) {
-            case GET_PASSWD:
+        switch(field) {
+            case Get_Passwd:
                 SlimDrawString8 (draw, &inputcolor, font,
                                  input_pass_x, input_pass_y,
-                                 (XftChar8*)passwd, strlen(passwd),
+                                 HiddenPasswdBuffer,
                                  &inputshadowcolor,
                                  inputShadowXOffset, inputShadowYOffset);
                 break;
-            case GET_NAME:
+            case Get_Name:
                 SlimDrawString8 (draw, &inputcolor, font,
                                  input_name_x, input_name_y,
-                                 (XftChar8*)name, strlen(name),
+                                 NameBuffer,
                                  &inputshadowcolor,
                                  inputShadowXOffset, inputShadowYOffset);
                 break;
@@ -342,108 +335,153 @@
     ShowText();
 }
 
-void Panel::OnKeyPress(XEvent* event) {
-    char del;
-    char buffer;
+bool Panel::OnKeyPress(XEvent& event) {
+    char ascii;
     KeySym keysym;
     XComposeStatus compstatus;
     int xx;
     int yy;
-    char* text;
-
-    bool singleInputMode =
-        input_name_x == input_pass_x &&
-        input_name_y == input_pass_y;
-    Cursor(HIDE);
-    XLookupString(&event->xkey, &buffer, 1, &keysym, &compstatus);
-    del = In->Key(buffer, keysym, singleInputMode);
-    Action = In->GetAction();
-
-    XGlyphInfo extents;
-    XftDraw *draw = XftDrawCreate(Dpy, Win,
-                                  DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+    string text;
+    string formerString = "";
 
-    if (keysym == XK_F1) {
+    XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
+    switch(keysym){
+        case XK_F1:
         SwitchSession();
-    }
+            return true;
 
-    bool clearField = false;
-    string formerString = "";
-    if ((((XKeyEvent*)event)->state & ControlMask)) {
-        if (keysym == XK_w || keysym == XK_u) {
-            clearField = true;
-        }
-    }
+        case XK_F11:
+            // Take a screenshot
+            system(cfg->getOption("screenshot_cmd").c_str());
+            return true;
+
+        case XK_Return:
+        case XK_KP_Enter:
+            if (field==Get_Name){
+                // Don't allow an empty username
+                if (NameBuffer.empty()) return true;
+
+                if (NameBuffer==CONSOLE_STR){
+                    action = Console;
+                } else if (NameBuffer==HALT_STR){
+                    action = Halt;
+                } else if (NameBuffer==REBOOT_STR){
+                    action = Reboot;
+                } else if (NameBuffer==SUSPEND_STR){
+                    action = Suspend;
+                } else if (NameBuffer==EXIT_STR){
+                    action = Exit;
+                } else{
+                    action = Login;
+                }
+            };
+            return false;
+        default:
+            break;
+    };
 
-    switch(In->GetField()) {
+    Cursor(HIDE);
+    switch(keysym){
+        case XK_Delete:
+        case XK_BackSpace:
+            switch(field) {
+                case GET_NAME:
+                    if (! NameBuffer.empty()){
+                        formerString=NameBuffer;
+                        NameBuffer.erase(--NameBuffer.end());
+                    };
+                    break;
         case GET_PASSWD:
-            if (strlen(In->GetHiddenPasswd()) == 0){
-                // clear name and welcome label if we just entered the
-                // password field
-                if (singleInputMode) {
-                    xx = input_name_x;
-                    yy = input_name_y;
-                    text = In->GetName();
-                    XftTextExtents8(Dpy, font, (XftChar8*)text,
-                                    strlen(text), &extents);
-                    XClearWindow(Dpy, Win);
-                    ShowText();
-                }
-            }
+                    if (! PasswdBuffer.empty()){
+                        formerString=HiddenPasswdBuffer;
+                        PasswdBuffer.erase(--PasswdBuffer.end());
+                        HiddenPasswdBuffer.erase(--HiddenPasswdBuffer.end());
+                    };
+                    break;
+            };
+            break;
 
-            if (clearField) {
-                formerString = In->GetHiddenPasswd();
-                In->ResetPassword();
-            }
-            text = In->GetHiddenPasswd();
-            xx = input_pass_x;
-            yy = input_pass_y;
+        case XK_w:
+        case XK_u:
+            if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
+                switch(field) {
+                    case Get_Passwd:
+                        formerString = HiddenPasswdBuffer;
+                        HiddenPasswdBuffer.clear();
+                        PasswdBuffer.clear();
             break;
 
-        case GET_NAME:
-            if (clearField) {
-                formerString = In->GetName();
-                In->ResetName();
+                    case Get_Name:
+                        formerString = NameBuffer;
+                        NameBuffer.clear();
+                        break;
+                };
+                break;
             }
-            text = In->GetName();
+            // Deliberate fall-through
+        
+        default:
+            if (isprint(ascii) && (keysym < XK_Shift_L || keysym > XK_Hyper_R)){
+                switch(field) {
+                    case GET_NAME:
+                        formerString=NameBuffer;
+                        if (NameBuffer.length() < INPUT_MAXLENGTH_NAME-1){
+                            NameBuffer.append(&ascii,1);
+                        };
+                        break;
+                    case GET_PASSWD:
+                        formerString=HiddenPasswdBuffer;
+                        if (PasswdBuffer.length() < INPUT_MAXLENGTH_NAME-1){
+                            PasswdBuffer.append(&ascii,1);
+                            HiddenPasswdBuffer.append("*");
+                        };
+                    break;
+                };
+            };
+            break;
+    };
+
+    XGlyphInfo extents;
+    XftDraw *draw = XftDrawCreate(Dpy, Win,
+                                  DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+
+   switch(field) {
+        case Get_Name:
+            text = NameBuffer;
             xx = input_name_x;
             yy = input_name_y;
             break;
 
-		default: /* Origin & NULL string as default values. */
-			text = (char *)NULL;
-			xx = (int)0;
-			yy = (int)0;
+        case Get_Passwd:
+            text = HiddenPasswdBuffer;
+            xx = input_pass_x;
+            yy = input_pass_y;
 			break;
     }
 
+    if (!formerString.empty()){
     char* txth = "Wj"; // get proper maximum height ?
-    XftTextExtents8(Dpy, font, (XftChar8*)txth, strlen(txth), &extents);
+        XftTextExtents8(Dpy, font, reinterpret_cast<const XftChar8*>(txth), strlen(txth), &extents);
     int maxHeight = extents.height;
 
-    string tmp = "";
-    if (clearField) {
-        tmp = formerString;
-    } else {
-        tmp = text;
-        tmp = tmp + del;
-    }
-    XftTextExtents8(Dpy, font, (XftChar8*)tmp.c_str(),
-                    strlen(tmp.c_str()), &extents);
+        XftTextExtents8(Dpy, font, reinterpret_cast<const XftChar8*>(formerString.c_str()),
+                        formerString.length(), &extents);
     int maxLength = extents.width;
 
     XClearArea(Dpy, Win, xx-3, yy-maxHeight-3,
                maxLength+6, maxHeight+6, false);
+    }
 
-    if (!clearField) {
+    if (!text.empty()) {
         SlimDrawString8 (draw, &inputcolor, font, xx, yy,
-                         (XftChar8*)text, strlen(text),
+                         text,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
     }
 
     XftDrawDestroy (draw);
     Cursor(SHOW);
+    return true;
 }
 
 // Draw welcome and "enter username" message
@@ -471,14 +509,13 @@
     if (welcome_x >= 0 && welcome_y >= 0) {
         SlimDrawString8 (draw, &welcomecolor, welcomefont,
                          welcome_x, welcome_y,
-                         (XftChar8*)welcome_message.c_str(),
-                         strlen(welcome_message.c_str()),
+                         welcome_message,
                          &welcomeshadowcolor, shadowXOffset, shadowYOffset);
     }
 
     /* Enter username-password message */
     string msg;
-    if (!singleInputMode|| In->GetField() == GET_PASSWD ) {
+    if (!singleInputMode|| field == Get_Passwd ) {
         msg = cfg->getOption("password_msg");
         XftTextExtents8(Dpy, enterfont, (XftChar8*)msg.c_str(),
                         strlen(msg.c_str()), &extents);
@@ -492,11 +529,10 @@
         password_y = Cfg::absolutepos(cfgY, image->Height(), extents.height);
         if (password_x >= 0 && password_y >= 0){
             SlimDrawString8 (draw, &entercolor, enterfont, password_x, password_y,
-                             (XftChar8*)msg.c_str(), strlen(msg.c_str()),
-                             &entershadowcolor, shadowXOffset, shadowYOffset);
+                             msg, &entershadowcolor, shadowXOffset, shadowYOffset);
         }
     }
-    if (!singleInputMode|| In->GetField() == GET_NAME ) {
+    if (!singleInputMode|| field == Get_Name ) {
         msg = cfg->getOption("username_msg");
         XftTextExtents8(Dpy, enterfont, (XftChar8*)msg.c_str(),
                         strlen(msg.c_str()), &extents);
@@ -510,8 +546,7 @@
         username_y = Cfg::absolutepos(cfgY, image->Height(), extents.height);
         if (username_x >= 0 && username_y >= 0){
             SlimDrawString8 (draw, &entercolor, enterfont, username_x, username_y,
-                             (XftChar8*)msg.c_str(), strlen(msg.c_str()),
-                             &entershadowcolor, shadowXOffset, shadowYOffset);
+                             msg, &entershadowcolor, shadowXOffset, shadowYOffset);
         }
     }
     XftDrawDestroy(draw);
@@ -524,29 +559,29 @@
 // choose next available session type
 void Panel::SwitchSession() {
     session = cfg->nextSession(session);
-    //TODO: get sessions from cfg and cycle to the next one
+    if (session.size() > 0) {
     ShowSession();
+    }
 }
 
 // Display session type on the screen
 void Panel::ShowSession() {
     XClearWindow(Dpy, Root);
     string currsession = "Session: " + session;
-    char* text = (char*) currsession.c_str();
     XGlyphInfo extents;
     XftDraw *draw = XftDrawCreate(Dpy, Root,
                                   DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
-    XftTextExtents8(Dpy, msgfont, (XftChar8*)text,
-                    strlen(text), &extents);
+    XftTextExtents8(Dpy, msgfont, reinterpret_cast<const XftChar8*>(currsession.c_str()),
+                    currsession.length(), &extents);
     int msg_x = Cfg::absolutepos("50%", XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), extents.width);
     int msg_y = XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)) - extents.height -100;
     int shadowXOffset =
-        Cfg::string2int(cfg->getOption("welcome_shadow_xoffset").c_str());
+        Cfg::string2int(cfg->getOption("msg_shadow_xoffset").c_str());
     int shadowYOffset =
-        Cfg::string2int(cfg->getOption("welcome_shadow_yoffset").c_str());
+        Cfg::string2int(cfg->getOption("msg_shadow_yoffset").c_str());
 
     SlimDrawString8(draw, &msgcolor, msgfont, msg_x, msg_y,
-                    (XftChar8*)text, strlen(text),
+                    currsession, 
                     &msgshadowcolor,
                     shadowXOffset, shadowYOffset);
     XFlush(Dpy);
@@ -555,13 +590,44 @@
 
 
 void Panel::SlimDrawString8(XftDraw *d, XftColor *color, XftFont *font,
-                            int x, int y, XftChar8 *string, int len,
+                            int x, int y, const string& str,
                             XftColor* shadowColor,
                             int xOffset, int yOffset)
 {
     if (xOffset && yOffset) {
         XftDrawString8(d, shadowColor, font, x+xOffset, y+yOffset,
-                       string, len);
+                       reinterpret_cast<const FcChar8*>(str.c_str()), str.length());
     }
-    XftDrawString8(d, color, font, x, y, string, len);
+    XftDrawString8(d, color, font, x, y, reinterpret_cast<const FcChar8*>(str.c_str()), str.length());
 }
+
+
+Panel::ActionType Panel::getAction(void) const{
+    return action;
+};
+
+
+void Panel::Reset(void){
+    ResetName();
+    ResetPasswd();
+};
+
+void Panel::ResetName(void){
+    NameBuffer.clear();
+};
+
+void Panel::ResetPasswd(void){
+    PasswdBuffer.clear();
+    HiddenPasswdBuffer.clear();
+};
+
+void Panel::SetName(const string& name){
+    NameBuffer=name;
+    return;
+};
+const string& Panel::GetName(void) const{
+    return NameBuffer;
+};
+const string& Panel::GetPasswd(void) const{
+    return PasswdBuffer;
+};
diff -uNbr --exclude=.svn release-1.2.6/panel.h slim-pam/panel.h
--- release-1.2.6/panel.h	2006-08-18 19:21:59.000000000 +0200
+++ slim-pam/panel.h	2007-05-17 16:38:53.000000000 +0200
@@ -13,49 +13,71 @@
 #define _PANEL_H_
 
 #include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <X11/Xft/Xft.h>
 #include <X11/cursorfont.h>
 #include <X11/Xmu/WinUtil.h>
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <iostream>
+#include <string>
 
 #ifdef NEEDS_BASENAME
 #include <libgen.h>
 #endif
 
 #include "switchuser.h"
-#include "input.h"
 #include "const.h"
 #include "image.h"
 
 
 class Panel {
 public:
+    enum ActionType {
+        Login,
+        Console,
+        Reboot,
+        Halt,
+        Exit,
+        Suspend
+    };
+    enum FieldType {
+        Get_Name,
+        Get_Passwd
+    };
+
+
     Panel(Display* dpy, int scr, Window root, Cfg* config,
           const string& themed);
     ~Panel();
     void OpenPanel();
     void ClosePanel();
     void ClearPanel();
-    void Message(const char* text);
-    void Error(const char* text);
-    Input* GetInput();
-    int EventHandler(XEvent* event);
+    void Message(const string& text);
+    void Error(const string& text);
+    void EventHandler(const FieldType& curfield);
     string getSession();
+    ActionType getAction(void) const;
 
+    void Reset(void);
+    void ResetName(void);
+    void ResetPasswd(void);
+    void SetName(const string& name);
+    const string& GetName(void) const;
+    const string& GetPasswd(void) const;
 private:
     Panel();
     void Cursor(int visible);
     unsigned long GetColor(const char* colorname);
-    void OnExpose(XEvent* event);
-    void OnKeyPress(XEvent* event);
+    void OnExpose(void);
+    bool OnKeyPress(XEvent& event);
     void ShowText();
     void SwitchSession();
     void ShowSession();
 
-    void SlimDrawString8(XftDraw* d, XftColor* color, XftFont* font,
-                         int x, int y, XftChar8 *string, int len,
+    void SlimDrawString8(XftDraw *d, XftColor *color, XftFont *font,
+                            int x, int y, const string& str,
                          XftColor* shadowColor,
                          int xOffset, int yOffset);
 
@@ -82,7 +104,13 @@
     XftFont* enterfont;
     XftColor entercolor;
     XftColor entershadowcolor;
-    int Action;
+    ActionType action;
+    FieldType field;
+    
+    // Username/Password
+    string NameBuffer;
+    string PasswdBuffer;
+    string HiddenPasswdBuffer;
 
     // Configuration
     int input_name_x;
@@ -110,9 +138,6 @@
     // Pixmap data
     Pixmap PanelPixmap;
 
-    // Name/Passwd handler
-    Input* In;
-
     Image* image;
 
     // For thesting themes
diff -uNbr --exclude=.svn release-1.2.6/switchuser.cpp slim-pam/switchuser.cpp
--- release-1.2.6/switchuser.cpp	2006-08-18 19:10:29.000000000 +0200
+++ slim-pam/switchuser.cpp	2007-05-19 21:26:29.000000000 +0200
@@ -13,10 +13,12 @@
 
 using namespace std;
 
-SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display)
+SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display,
+                       char** _env)
     : cfg(c),
       Pw(pw),
-      displayName(display)
+      displayName(display),
+      env(_env)
 {
 }
 
@@ -27,33 +29,12 @@
 
 
 void SwitchUser::Login(const char* cmd, const char* mcookie) {
-    SetEnvironment();
     SetUserId();
     SetClientAuth(mcookie);
     Execute(cmd);
 }
 
 
-void SwitchUser::SetEnvironment() {
-    char *term = getenv("TERM");
-    char** environ;
-    environ = (char **) new char*[2];
-    environ[0] = 0;
-    if(term)
-        putenv(StrConcat("TERM=", term));
-    putenv(StrConcat("HOME=", Pw->pw_dir));
-    putenv(StrConcat("SHELL=", Pw->pw_shell));
-    putenv(StrConcat("USER=", Pw->pw_name));
-    putenv(StrConcat("LOGNAME=", Pw->pw_name));
-    putenv(StrConcat("PATH=", cfg->getOption("default_path").c_str()));
-    putenv(StrConcat("DISPLAY=", displayName.c_str()));
-    putenv(StrConcat("MAIL="_PATH_MAILDIR"/", Pw->pw_name));
-    putenv(StrConcat("XAUTHORITY=", StrConcat(Pw->pw_dir,"/.Xauthority")));
-    /* putenv("XAUTHORITY=/tmp/serverauth"); */
-    chdir(Pw->pw_dir);
-}
-
-
 void SwitchUser::SetUserId() {
     if( (Pw == 0) ||
             (initgroups(Pw->pw_name, Pw->pw_gid) != 0) ||
@@ -66,42 +47,11 @@
 
 
 void SwitchUser::Execute(const char* cmd) {
-    char *args[4];
-    char* shell = strdup(Pw->pw_shell);
-    char *shell_basename = BaseName(shell);
-
-    args[0] = new char[strlen(shell_basename) + 2];
-    strcpy(args[0], "-");
-    strcat(args[0], shell_basename);
-    args[1] = "-c";
-    args[2] = (char*)cmd;
-    args[3] = 0;
-
-    execv(shell, args);
+    chdir(Pw->pw_dir);
+    execle(Pw->pw_shell, Pw->pw_shell, "-c", cmd, NULL, env);
     cerr << APPNAME << ": could not execute login command" << endl;
 }
 
-
-char* SwitchUser::BaseName(const char* name) {
-    const char *base = name;
-
-    while(*name) {
-        if(*name == '/')
-            base = name + 1;
-        ++name;
-    }
-
-    return (char*) base;
-}
-
-
-char* SwitchUser::StrConcat(const char* str1, const char* str2) {
-    char* tmp = new char[strlen(str1) + strlen(str2) + 1];
-    strcpy(tmp, str1);
-    strcat(tmp, str2);
-    return tmp;
-}
-
 void SwitchUser::SetClientAuth(const char* mcookie) {
     int r;
     string home = string(Pw->pw_dir);
diff -uNbr --exclude=.svn release-1.2.6/switchuser.h slim-pam/switchuser.h
--- release-1.2.6/switchuser.h	2006-07-15 02:33:52.000000000 +0200
+++ slim-pam/switchuser.h	2007-05-19 21:26:29.000000000 +0200
@@ -25,7 +25,8 @@
 
 class SwitchUser {
 public:
-    SwitchUser(struct passwd *pw, Cfg *c, const std::string& display);
+    SwitchUser(struct passwd *pw, Cfg *c, const std::string& display,
+               char** _env);
     ~SwitchUser();
     void Login(const char* cmd, const char* mcookie);
 
@@ -34,13 +35,12 @@
     void SetEnvironment();
     void SetUserId();
     void Execute(const char* cmd);
-    char* BaseName(const char* name);
-    char* StrConcat(const char* str1, const char* str2);
     void SetClientAuth(const char* mcookie);
     Cfg* cfg;
     struct passwd *Pw;
 
     std::string displayName;
+    char** env;
 };
 
 


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slim.spec	3 Sep 2007 19:37:32 -0000	1.2
+++ slim.spec	24 Sep 2007 19:52:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -17,6 +17,7 @@
 Patch0:         slim-1.2.6-make.patch
 Patch1:         slim-1.2.6-usexwd.patch
 Patch2:         slim-1.2.6-fedora.patch
+Patch3:         slim-1.2.6-pam.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -46,9 +47,10 @@
 %patch2 -p1 -b .fedora
 sed -e 's@/usr/X11R6/bin@%{_bindir}@g' -i.orig slim.conf
 cp -p %{SOURCE3} README.Fedora
+%patch3 -p1 -b .pam
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +98,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-7
+- backport PAM support from "slim-pam" branch, USE_PAM=1
+- backport fix for segfault on exit when testing themes.
+
 * Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
 - require system-logos instead of fedora-logos (#250365)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:54:30 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:54:30 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.20,1.21
Message-ID: <200709241954.l8OJsUj7010546@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10444

Modified Files:
	libXpm.spec 
Log Message:
buildreq gettext


Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXpm.spec	24 Sep 2007 19:44:54 -0000	1.20
+++ libXpm.spec	24 Sep 2007 19:53:57 -0000	1.21
@@ -9,6 +9,7 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel



From fedora-extras-commits at redhat.com  Mon Sep 24 19:54:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:54:40 -0400
Subject: rpms/scorched3d/devel scorched3d.desktop, 1.2, 1.3 scorched3d.spec, 
	1.24, 1.25
Message-ID: <200709241954.l8OJse2M010580@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10471

Modified Files:
	scorched3d.desktop scorched3d.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-6
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: scorched3d.desktop
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d.desktop	15 Aug 2007 09:35:27 -0000	1.2
+++ scorched3d.desktop	24 Sep 2007 19:54:08 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Scorched 3D
 Comment=A game based on the classic DOS game Scorched Earth
-Exec=scorched3d
+Exec=scorched3d-wrapper
 Icon=scorched3d.png
 Terminal=false
 Type=Application


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scorched3d.spec	28 Aug 2007 11:20:35 -0000	1.24
+++ scorched3d.spec	24 Sep 2007 19:54:08 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        40.1d
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
 BuildRequires:  expat-devel libvorbis-devel ImageMagick desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -62,6 +62,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html .
 
 # below is the desktop file and icon stuff.
@@ -94,13 +95,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING TODO html
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-6
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-5
 - Rebuild for new expat 2.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:56:00 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:56:00 -0400
Subject: rpms/supertuxkart/devel supertuxkart-0.3-desktop.patch, 1.1,
	1.2 supertuxkart.spec, 1.2, 1.3
Message-ID: <200709241956.l8OJu0q9010721@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10698

Modified Files:
	supertuxkart-0.3-desktop.patch supertuxkart.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
- Use opengl-games-utils wrapper to show error dialog when DRI is missing


supertuxkart-0.3-desktop.patch:

Index: supertuxkart-0.3-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supertuxkart-0.3-desktop.patch	15 Aug 2007 12:13:32 -0000	1.1
+++ supertuxkart-0.3-desktop.patch	24 Sep 2007 19:55:57 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up supertuxkart-0.3/data/supertuxkart.desktop~ supertuxkart-0.3/data/supertuxkart.desktop
---- supertuxkart-0.3/data/supertuxkart.desktop~	2007-08-15 13:08:37.000000000 +0200
-+++ supertuxkart-0.3/data/supertuxkart.desktop	2007-08-15 13:08:37.000000000 +0200
-@@ -1,7 +1,7 @@
+diff -up supertuxkart-0.3/data/supertuxkart.desktop.desktop supertuxkart-0.3/data/supertuxkart.desktop
+--- supertuxkart-0.3/data/supertuxkart.desktop.desktop	2007-06-15 09:28:43.000000000 +0200
++++ supertuxkart-0.3/data/supertuxkart.desktop	2007-09-24 21:24:54.000000000 +0200
+@@ -1,13 +1,12 @@
  [Desktop Entry]
  Encoding=UTF-8
  Name=Supertuxkart
@@ -10,7 +10,8 @@
  Comment=A kart racing game
  Comment[fr_FR]=Un jeu de karting
  Comment[ro_RO]=Un joc de curse cu carturi
-@@ -9,5 +9,4 @@ Exec=supertuxkart
+-Exec=supertuxkart
++Exec=supertuxkart-wrapper
  Terminal=false
  StartupNotify=false
  Type=Application


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supertuxkart.spec	15 Aug 2007 12:13:32 -0000	1.2
+++ supertuxkart.spec	24 Sep 2007 19:55:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           supertuxkart
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,6 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel SDL-devel freealut-devel mikmod-devel
 BuildRequires:  libvorbis-devel desktop-file-utils
+Requires:       hicolor-icon-theme opengl-games-utils
 # Provide so that yum install tuxkart will work, obsolete for auto upgrade
 Provides:       tuxkart = 0.4.0-6
 Obsoletes:      tuxkart < 0.4.0-6
@@ -48,6 +49,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # easier then patching all the Makefile's
 mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
 
@@ -88,7 +90,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO %{name}-images-legal.txt
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
 - New upstream release 0.3
 - Drop most patches (all fixed upstream)



From fedora-extras-commits at redhat.com  Mon Sep 24 19:57:42 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 15:57:42 -0400
Subject: rpms/nginx/devel .cvsignore, 1.11, 1.12 nginx.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200709241957.l8OJvg26011406@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11174

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.5.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Aug 2007 00:48:07 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:57:10 -0000	1.12
@@ -1 +1 @@
-nginx-0.5.31.tar.gz
+nginx-0.5.32.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nginx.spec	18 Aug 2007 18:22:11 -0000	1.12
+++ nginx.spec	24 Sep 2007 19:57:10 -0000	1.13
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        2%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-2
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Aug 2007 00:48:07 -0000	1.11
+++ sources	24 Sep 2007 19:57:10 -0000	1.12
@@ -1 +1 @@
-d84ef8e624b8953faf9cee2b5da535c1  nginx-0.5.31.tar.gz
+0088269b8a59a146b0ba9c9ee29853bb  nginx-0.5.32.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:57:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:57:57 -0400
Subject: rpms/pinball/devel pinball.desktop,1.2,1.3 pinball.spec,1.4,1.5
Message-ID: <200709241957.l8OJvvHQ011496@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pinball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11285

Modified Files:
	pinball.desktop pinball.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-9
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: pinball.desktop
===================================================================
RCS file: /cvs/extras/rpms/pinball/devel/pinball.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pinball.desktop	10 Mar 2007 10:49:28 -0000	1.2
+++ pinball.desktop	24 Sep 2007 19:57:25 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Pinball
 Comment=Emilia Pinball game
-Exec=pinball
+Exec=pinball-wrapper
 Icon=pinball.png
 Terminal=false
 Type=Application


Index: pinball.spec
===================================================================
RCS file: /cvs/extras/rpms/pinball/devel/pinball.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pinball.spec	15 Aug 2007 08:49:51 -0000	1.4
+++ pinball.spec	24 Sep 2007 19:57:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pinball
 Version:        0.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Emilia Pinball game
 Group:          Amusements/Games
 License:        GPL+
@@ -14,7 +14,7 @@
 BuildRequires:  libXt-devel freeglut-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  libpng-devel libvorbis-devel libtool-ltdl-devel
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 The Emilia Pinball project is an open source pinball simulator for linux
@@ -53,6 +53,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # remove unused global higescorefiles:
 rm -fr $RPM_BUILD_ROOT%{_localstatedir}
 # remove unused test module
@@ -90,7 +91,7 @@
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lib*.so.*
 %{_libdir}/%{name}/lib*.la
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-9
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-8
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:59:58 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 24 Sep 2007 15:59:58 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.1,
	1.2 TurboGears.spec, 1.21, 1.22
Message-ID: <200709241959.l8OJxwNF011682@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11620

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
- Update setuptools patch to "fix" CherryPy dependency error



TurboGears-1.0.3.2-setuptools.patch:

Index: TurboGears-1.0.3.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.3.2-setuptools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.3.2-setuptools.patch	13 Sep 2007 20:36:29 -0000	1.1
+++ TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
@@ -1,8 +1,10 @@
---- setup.py.orig	2007-09-13 16:14:36.000000000 -0400
-+++ setup.py	2007-09-13 16:20:51.000000000 -0400
-@@ -18,32 +18,22 @@
+--- setup.py.orig	2007-09-24 15:30:20.000000000 -0400
++++ setup.py	2007-09-24 15:31:10.000000000 -0400
+@@ -16,34 +16,23 @@
+             "TurboJson >= 0.9.9",
+             "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
-             "CherryPy >= 2.2.1,<3.0.0alpha",
+-            "CherryPy >= 2.2.1,<3.0.0alpha",
              "simplejson >= 1.3",
 -            "elementtree >= 1.2.6",
              "PasteScript >= 0.9.7",
@@ -35,7 +37,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +117,7 @@
+@@ -127,7 +116,7 @@
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurboGears.spec	13 Sep 2007 20:38:06 -0000	1.21
+++ TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -84,6 +84,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
+- Update setuptools patch to "fix" CherryPy dependency error
+
 * Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
 - 1.0.3.2
 - Remove etree patch



From fedora-extras-commits at redhat.com  Mon Sep 24 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 16:00:23 -0400
Subject: rpms/nginx/F-7 .cvsignore, 1.11, 1.12 nginx.spec, 1.11, 1.12 sources,
	1.11, 1.12
Message-ID: <200709242000.l8OK0N2V011952@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11630

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.5.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Aug 2007 01:12:52 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:59:50 -0000	1.12
@@ -1 +1 @@
-nginx-0.5.31.tar.gz
+nginx-0.5.32.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/nginx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nginx.spec	18 Aug 2007 18:36:18 -0000	1.11
+++ nginx.spec	24 Sep 2007 19:59:50 -0000	1.12
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        2%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-2
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Aug 2007 01:12:52 -0000	1.11
+++ sources	24 Sep 2007 19:59:50 -0000	1.12
@@ -1 +1 @@
-d84ef8e624b8953faf9cee2b5da535c1  nginx-0.5.31.tar.gz
+0088269b8a59a146b0ba9c9ee29853bb  nginx-0.5.32.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:00:54 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 13:00:54 -0700
Subject: [pkgdb] kernel: katzj has given up watchcommits
Message-ID: <200709242000.l8OK0sBP012493@app4.fedora.phx.redhat.com>

Jeremy Katz (katzj) has given up the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From fedora-extras-commits at redhat.com  Mon Sep 24 20:01:58 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:01:58 -0400
Subject: rpms/xen/devel xen-qemu-vnc-authentication.patch, 1.1,
	1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.1, 1.2
Message-ID: <200709242001.l8OK1wWH019170@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18739

Modified Files:
	xen-qemu-vnc-authentication.patch 
	xen-pvfb-02-qemu-pv-machine.patch 
Log Message:
Cast explicit VNC disply num to an int (rhbz #279581)

xen-qemu-vnc-authentication.patch:

Index: xen-qemu-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-authentication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-vnc-authentication.patch	28 Aug 2007 21:49:31 -0000	1.1
+++ xen-qemu-vnc-authentication.patch	24 Sep 2007 20:01:25 -0000	1.2
@@ -1965,8 +1965,8 @@
              vnclisten = config.get('vnclisten',
                                     xen.xend.XendOptions.instance().get_vnclisten_address())
              vncdisplay = config.get('vncdisplay', 0)
--            args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
-+            args += ['-vnc', "%s:%d%s" % (vnclisten, vncdisplay, vncopts)]
+-            args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
++            args += ['-vnc', "%s:%d%s" % (vnclisten, int(vncdisplay), vncopts)]
  
              if config.get('vncunused', 0):
                  args += ['-vncunused']

xen-pvfb-02-qemu-pv-machine.patch:

Index: xen-pvfb-02-qemu-pv-machine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-02-qemu-pv-machine.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-02-qemu-pv-machine.patch	28 Aug 2007 21:50:58 -0000	1.1
+++ xen-pvfb-02-qemu-pv-machine.patch	24 Sep 2007 20:01:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c	2007-09-24 13:22:06.000000000 -0400
 @@ -0,0 +1,231 @@
 +/*
 + * QEMU Xen PV Machine
@@ -233,9 +233,9 @@
 + *  tab-width: 4
 + * End:
 + */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:22:06.000000000 -0400
 @@ -370,6 +370,8 @@ VL_OBJS+= piix4acpi.o
  VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
@@ -245,9 +245,9 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
---- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c	2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
+--- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c	2007-09-24 13:22:06.000000000 -0400
 @@ -614,14 +614,15 @@ int main_loop(void)
      extern int shutdown_requested;
      extern int suspend_requested;
@@ -266,9 +266,9 @@
  
      while (!(vm_running && suspend_requested))
          /* Wait up to 10 msec. */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c	2007-08-23 10:53:46.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
+--- xen-3.1.0-src.orig/tools/ioemu/vl.c	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.c	2007-09-24 13:22:06.000000000 -0400
 @@ -168,7 +168,7 @@ int xc_handle;
  
  time_t timeoffset = 0;
@@ -296,9 +296,9 @@
                  break;
              case QEMU_OPTION_d:
                  domid = atoi(optarg);
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
+--- xen-3.1.0-src.orig/tools/ioemu/vl.h	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.h	2007-09-24 13:22:06.000000000 -0400
 @@ -968,6 +968,7 @@ extern QEMUMachine pc_machine;
  extern QEMUMachine isapc_machine;
  #ifdef CONFIG_DM
@@ -307,10 +307,18 @@
  #endif
  extern int fd_bootchk;
  
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-08-23 10:54:47.000000000 -0400
-@@ -53,8 +53,10 @@ class VfbifController(DevController):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-05-18 10:45:21.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:22:54.000000000 -0400
+@@ -6,6 +6,7 @@ import xen.xend
+ import os
+ 
+ def spawn_detached(path, args, env):
++    log.debug("Spawn: " + str(args))
+     p = os.fork()
+     if p == 0:
+         os.spawnve(os.P_NOWAIT, path, args, env)
+@@ -50,8 +51,10 @@ class VfbifController(DevController):
              # is HVM, so qemu-dm will handle the vfb.
              return
          
@@ -323,7 +331,7 @@
          t = config.get("type", None)
          if t == "vnc":
              passwd = None
-@@ -68,26 +70,24 @@ class VfbifController(DevController):
+@@ -65,26 +68,24 @@ class VfbifController(DevController):
              else:
                  log.debug("No VNC passwd configured for vfb access")
  
@@ -338,7 +346,7 @@
                                     xen.xend.XendOptions.instance().get_vnclisten_address())
 -            args += [ "--listen", vnclisten ]
 +            vncdisplay = config.get('vncdisplay', 0)
-+            args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
++            args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
 +
 +            if config.get('vncunused', 0):
 +                args += ['-vncunused']
@@ -359,9 +367,9 @@
          else:
              raise VmError('Unknown vfb type %s (%s)' % (t, repr(config)))
  
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
 --- xen-3.1.0-src.orig/tools/xenfb/xenfb.c	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.c	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.c	2007-09-24 13:22:06.000000000 -0400
 @@ -677,37 +677,58 @@ static int xenfb_on_state_change(struct 
  	return 0;
  }
@@ -471,9 +479,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
 --- xen-3.1.0-src.orig/tools/xenfb/xenfb.h	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.h	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.h	2007-09-24 13:22:06.000000000 -0400
 @@ -25,8 +25,12 @@ void xenfb_teardown(struct xenfb *xenfb)
  
  int xenfb_attach_dom(struct xenfb *xenfb, int domid);



From fedora-extras-commits at redhat.com  Mon Sep 24 20:03:42 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:03:42 -0400
Subject: rpms/xen/devel .cvsignore,1.33,1.34
Message-ID: <200709242003.l8OK3gPC020104@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975

Modified Files:
	.cvsignore 
Log Message:
Ignore local RPM builds & logs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	28 Aug 2007 21:49:31 -0000	1.33
+++ .cvsignore	24 Sep 2007 20:03:10 -0000	1.34
@@ -1 +1,3 @@
 xen-3.1.0-src.tgz
+*.rpm
+.build*.log



From fedora-extras-commits at redhat.com  Mon Sep 24 20:04:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:04:56 -0400
Subject: rpms/xorg-x11-drv-avivo/devel make-snapshot.sh, NONE,
	1.1 xorg-x11-drv-avivo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242004.l8OK4uWG020201@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	make-snapshot.sh xorg-x11-drv-avivo.spec 
Log Message:
initial import



--- NEW FILE make-snapshot.sh ---
#!/bin/sh

DIRNAME=xf86-video-avivo-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/avivo/xf86-video-avivo $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
rm -rf .git
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


--- NEW FILE xorg-x11-drv-avivo.spec ---
%define tarball xf86-video-avivo
%define driverdir %(pkg-config xorg-server --variable=moduledir)/drivers
%define gitdate 20070918
%define gitrev be7d380aba8d1ff2272bf2c931b2c9f78a549b46

Name:           xorg-x11-drv-avivo
Version:        0.0.1
Release:        4%{?dist}
Summary:        Xorg X11 AVIVO video drievr

Group:          User Interface/X Hardware Support
License:        GPLv2 and zlib
URL:            http://www.x.org/
# git snapshot.  To recreate, run
# % ./make-snapshot.sh %{gitrev}
Source0:        %{tarball}-%{gitdate}.tar.bz2
Source1:	make-snapshot.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake libtool pkgconfig
BuildRequires:  libpciaccess-devel
BuildRequires:  xorg-x11-server-sdk >= 1.3.0.0
Requires:       xorg-x11-server-Xorg >= 1.3.0.0

%description
X.Org X11 video driver for ATI R500 (AVIVO) cards and newer.

%prep
%setup -q -n %{tarball}-%{gitdate}

%build
autoreconf -v --install
# this is just paranoia.
%configure --disable-pciaccess
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{driverdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING STATUS
%{_bindir}/avivotool
%{driverdir}/avivo_drv.so

%changelog
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 0.0.1-4
- Package review feedback (#293801)

* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 0.0.1-3
- Post-doc-drop git build.

* Wed Jul 25 2007 Adam Jackson <ajax at redhat.com> 0.0.1-2
- Updated git build.

* Thu Jun 14 2007 Adam Jackson <ajax at redhat.com> 0.0.1-1
- Initial revision.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:49 -0000	1.1
+++ .cvsignore	24 Sep 2007 20:04:22 -0000	1.2
@@ -0,0 +1 @@
+xf86-video-avivo-20070918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:49 -0000	1.1
+++ sources	24 Sep 2007 20:04:22 -0000	1.2
@@ -0,0 +1 @@
+6b4e61a1bd00094294f05f1789bacf4f  xf86-video-avivo-20070918.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:06:04 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:06:04 -0400
Subject: rpms/libICE import.log,1.1,1.2
Message-ID: <200709242006.l8OK64Ka020351@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Modified Files:
	import.log 
Log Message:
libICE 1.0.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:08:09 -0000	1.1
+++ import.log	24 Sep 2007 20:05:31 -0000	1.2
@@ -0,0 +1 @@
+libICE-1_0_4-1_fc8:HEAD:libICE-1.0.4-1.fc8.src.rpm:1190663402



From fedora-extras-commits at redhat.com  Mon Sep 24 20:06:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:06:08 -0400
Subject: rpms/libICE/devel .cvsignore, 1.8, 1.9 libICE.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <200709242006.l8OK68v8020356@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293/devel

Modified Files:
	.cvsignore libICE.spec sources 
Log Message:
libICE 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2007 23:46:57 -0000	1.8
+++ .cvsignore	24 Sep 2007 20:05:34 -0000	1.9
@@ -1 +1 @@
-libICE-1.0.3.tar.bz2
+libICE-1.0.4.tar.bz2


Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libICE.spec	20 Sep 2007 19:36:26 -0000	1.21
+++ libICE.spec	24 Sep 2007 20:05:34 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libICE 1.0.4
+
 * Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
 - Update xtrans dep and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jan 2007 23:46:57 -0000	1.10
+++ sources	24 Sep 2007 20:05:34 -0000	1.11
@@ -1 +1 @@
-071f96648ac25c8e87a3de11a7de2d8a  libICE-1.0.3.tar.bz2
+4ab4e67e0b8845aa201e984153087f4a  libICE-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:07:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:07:14 -0400
Subject: rpms/xorg-x11-drv-avivo/devel xorg-x11-drv-avivo.spec,1.1,1.2
Message-ID: <200709242007.l8OK7EVU020429@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20407

Modified Files:
	xorg-x11-drv-avivo.spec 
Log Message:
typo fix


Index: xorg-x11-drv-avivo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/xorg-x11-drv-avivo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-avivo.spec	24 Sep 2007 20:04:22 -0000	1.1
+++ xorg-x11-drv-avivo.spec	24 Sep 2007 20:06:42 -0000	1.2
@@ -6,7 +6,7 @@
 Name:           xorg-x11-drv-avivo
 Version:        0.0.1
 Release:        4%{?dist}
-Summary:        Xorg X11 AVIVO video drievr
+Summary:        Xorg X11 AVIVO video driver
 
 Group:          User Interface/X Hardware Support
 License:        GPLv2 and zlib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:10:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:10:56 -0400
Subject: rpms/xorg-x11-drv-avivo/devel xorg-x11-drv-avivo.spec,1.2,1.3
Message-ID: <200709242010.l8OKAu8T020519@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20487

Modified Files:
	xorg-x11-drv-avivo.spec 
Log Message:
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 0.0.1-4
- Package review feedback (#293801)



Index: xorg-x11-drv-avivo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/xorg-x11-drv-avivo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-avivo.spec	24 Sep 2007 20:06:42 -0000	1.2
+++ xorg-x11-drv-avivo.spec	24 Sep 2007 20:10:24 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           xorg-x11-drv-avivo
 Version:        0.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Xorg X11 AVIVO video driver
 
 Group:          User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Mon Sep 24 20:12:24 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 16:12:24 -0400
Subject: rpms/frysk/devel .cvsignore, 1.46, 1.47 frysk.spec, 1.114,
	1.115 sources, 1.46, 1.47
Message-ID: <200709242012.l8OKCOAZ020643@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20609

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Import frysk-0.0.1.2007.09.24.tar.bz2.
- Remove frysk-20060922-a-cast.patch
- Remove frysk-xfail-2130.patch.
- Run bootstrap.sh over source tree.
- Add autoconf, automake, and libtool to BuildRequires.
- Remove binutils-devel from BuildRequires.
- Build in separate sub-directory.
- Do not force JV_SCAN into the build environment.
- Update Licence.
- Change BuildRoot to prefered fedora format.
- Expand Summary to mention debugging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2007 16:03:08 -0000	1.46
+++ .cvsignore	24 Sep 2007 20:11:51 -0000	1.47
@@ -1 +1 @@
-frysk-0.0.1.2007.03.13.rh1.tar.bz2
+frysk-0.0.1.2007.09.24.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- frysk.spec	13 Mar 2007 16:40:08 -0000	1.114
+++ frysk.spec	24 Sep 2007 20:11:51 -0000	1.115
@@ -1,23 +1,29 @@
-Summary:	Frysk execution analysis tool
+Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
-Version:	0.0.1.2007.03.13.rh1
+Version:	0.0.1.2007.09.24
 Release:	1%{?dist}
-License:	GPL
+# antlrv2 is Public Domain; antlrv3 is BSD.
+# cdtparser is EPL
+# getopt is GPLv2 with exception
+# elfutils is GPLv2 with exception
+# frysk is GPLv2 with exception
+# junit licence is CPL (according to the junit rpm)
+# jline licence is BSD
+# libunwind is BSD
+License:	GPLv2 with exceptions and BSD and CPL and Public Domain and EPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands, which brand the file with the contents of version.in,
+# to generate the tarball:
+#  cvs -d:pserver:anoncvs at sourceware.org:/cvs/frysk export -D YYYY-MM-DD-gmt
+#  mv frysk frysk-`cat frysk/common/version.in`
+#  tar cf - frysk-`cat frysk/common/version.in` | bzip2 -9 > frysk-`cat frysk/common/version.in`.tar.bz2
 Source:		%{name}-%{version}.tar.bz2
 
 %define run_make_check 0
 
-%if %{run_make_check}
-# Disable the test which fails when building on older kernel.
-Patch0:		frysk-xfail-2130.patch
-%endif
-
-# Prevent a warning from a new g++:
-Patch1:		frysk-20060922-a-cast.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	glib-java >= 0.2.6
 
@@ -39,17 +45,16 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	gnome-python2-gconf
 BuildRequires:	audit-libs-devel
-
-# Fedora Core >= 6 and RHEL:
-%if "%{?fedora}" != "5"
-BuildRequires:	binutils-devel
-BuildRequires:	dogtail >= 0.5.2
+BuildRequires:	autoconf automake libtool
 
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 
+# Fedora Core >= 6 and RHEL:
+%if "%{?fedora}" != "5"
+BuildRequires:	dogtail >= 0.5.2
 # Needed by "dogtail-run-headless -n":
 Buildrequires:	metacity
 %endif
@@ -65,12 +70,13 @@
 %endif
 
 %description
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 %package devel
 Summary:        The development part of Frysk.
@@ -78,8 +84,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
-Frysk is an execution-analysis technology implemented using native Java and C++.
-This package contains the development part of Frysk.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
 Summary:        The GUI frontend of Frysk.
@@ -90,21 +96,19 @@
 Requires: 	libvte-java >= 0.12.0
 
 %description gnome
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 This package contains the GUI front end for Frysk.
 
 %prep
 %setup -q -n %{name}-%{version}
-%if %{run_make_check}
-%patch0
-%endif
-%patch1
+./bootstrap.sh
 
 %build 
 
@@ -119,22 +123,31 @@
 export CC=${CC:-/usr/bin/gcc}
 export CXX=${CXX:-/usr/bin/g++}
 export JAVA=${JAVA:-/usr/bin/gij}
-export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
 uname -a
 gcc --version
+pwd
+mkdir -p build
+cd build
+
+# Capture the configure line
+rm -f configure
+echo '#!/bin/sh -x'		>> configure
+echo 'exec ../configure "$@"'	>> configure
+chmod a+x configure
 
 # FIXME: Warnings should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
-	--disable-arch32-tests --disable-werror
-
+	--disable-arch32-tests
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
 touch frysk-gui/checked-glade-xml
 
-make %{?_smp_mflags}
+# in frysk-sys; make is building .o files before all BUILT_FILES are
+# created.
+make # %{?_smp_mflags}
 
 %if %{run_make_check}
 %check
@@ -148,22 +161,26 @@
 # Workaround for bug #??:
 mkdir -p $RPM_BUILD_ROOT/usr/share/frysk
 
+pwd
+cd build
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Fix timestamp of a generated script:
-touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
+touch -r \
+      ../frysk-gui/frysk-gui/frysk/gui/FryskGui.javain \
+      $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
-# ... well, these are not installed by current tarball...
-#for f in test2866.py test2985.py test3380.py; do
-#  touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
-#done
+for f in test2866.py test2985.py test3380.py; do
+    touch -r \
+    	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
+done
 
 # Workaround for #211824:
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop .
-
+mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -196,9 +213,15 @@
 %defattr(-,root,root)
 %{_libdir}/libfrysk-junit.so
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
+%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/fsystest
+%{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test_main_looper
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test?*
+%{_datadir}/%{name}/test-core
+%{_datadir}/%{name}/test_looper.xml
+# Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
 %{_datadir}/%{name}/dogtail_scripts
@@ -222,6 +245,19 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Import frysk-0.0.1.2007.09.24.tar.bz2.
+- Remove frysk-20060922-a-cast.patch
+- Remove frysk-xfail-2130.patch.
+- Run bootstrap.sh over source tree.
+- Add autoconf, automake, and libtool to BuildRequires.
+- Remove binutils-devel from BuildRequires.
+- Build in separate sub-directory.
+- Do not force JV_SCAN into the build environment.
+- Update Licence.
+- Change BuildRoot to prefered fedora format.
+- Expand Summary to mention debugging.
+
 * Tue Mar 13 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2007.03.13.rh1-1
 - New upstream version, adapt the file list.
 - Remove frysk-no-dejagnu.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2007 16:03:08 -0000	1.46
+++ sources	24 Sep 2007 20:11:51 -0000	1.47
@@ -1 +1 @@
-b87ee4af3553a31b12e0b430de1225d1  frysk-0.0.1.2007.03.13.rh1.tar.bz2
+34b8a93e1b7b9e4f97d3ae4c57f25d57  frysk-0.0.1.2007.09.24.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:54 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested watchbugzilla
Message-ID: <200709242014.l8OKEskK028380@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the watchbugzilla acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:54 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested watchcommits
Message-ID: <200709242014.l8OKEteH018476@app4.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the watchcommits acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:56 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:56 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested commit
Message-ID: <200709242014.l8OKEu4E028405@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the commit acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:58 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:58 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested approveacls
Message-ID: <200709242014.l8OKEw9p028425@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the approveacls acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:15:02 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:15:02 -0700
Subject: [pkgdb] dbus-glib: dcbw has given up watchbugzilla
Message-ID: <200709242015.l8OKF2lw028483@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has given up the watchbugzilla acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:15:08 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:15:08 -0700
Subject: [pkgdb] dbus-glib: dcbw has given up approveacls
Message-ID: <200709242015.l8OKF8Zv028546@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has given up the approveacls acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:19:30 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:19:30 -0400
Subject: rpms/tremulous/devel tremulous.desktop, 1.2, 1.3 tremulous.spec, 1.2,
	1.3
Message-ID: <200709242019.l8OKJU2T022383@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tremulous/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22331

Modified Files:
	tremulous.desktop tremulous.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: tremulous.desktop
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tremulous.desktop	15 Aug 2007 13:34:33 -0000	1.2
+++ tremulous.desktop	24 Sep 2007 20:18:58 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Tremulous
 Comment=First person shooter
-Exec=tremulous
+Exec=tremulous-wrapper
 Icon=tremulous.png
 Terminal=false
 StartupNotify=false


Index: tremulous.spec
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tremulous.spec	15 Aug 2007 13:34:33 -0000	1.2
+++ tremulous.spec	24 Sep 2007 20:18:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tremulous
 Version:        1.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
@@ -16,6 +16,7 @@
 BuildRequires:  desktop-file-utils SDL-devel openal-devel libvorbis-devel
 BuildRequires:  libjpeg-devel
 Requires:       tremulous-data = %{version}
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Tremulous is a free, open source game that blends a team based FPS
@@ -65,6 +66,7 @@
   $RPM_BUILD_ROOT%{_bindir}/tremded
 install -m 0755 build/release-linux-*/tremulous.* \
   $RPM_BUILD_ROOT%{_bindir}/%{name}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -95,13 +97,16 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING GPL
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_bindir}/tremded
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-3
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:19:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 24 Sep 2007 16:19:37 -0400
Subject: rpms/slim/F-7 slim.spec,1.3,1.4 slim-1.2.6-pam.patch,1.1,1.2
Message-ID: <200709242019.l8OKJbuU022426@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353

Modified Files:
	slim.spec slim-1.2.6-pam.patch 
Log Message:
include another bugfix, while at it


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slim.spec	24 Sep 2007 19:52:58 -0000	1.3
+++ slim.spec	24 Sep 2007 20:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-8
+- backport fix for segfault when calling XCloseDisplay(NULL);
+
 * Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-7
 - backport PAM support from "slim-pam" branch, USE_PAM=1
 - backport fix for segfault on exit when testing themes.

slim-1.2.6-pam.patch:

Index: slim-1.2.6-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim-1.2.6-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slim-1.2.6-pam.patch	24 Sep 2007 19:52:58 -0000	1.1
+++ slim-1.2.6-pam.patch	24 Sep 2007 20:19:04 -0000	1.2
@@ -937,6 +937,26 @@
          StopServer(); 
          RemoveLock();
          Run();
+diff -ur slim-pam/app.cpp slim-1.3.0/app.cpp
+--- slim-pam/app.cpp	2007-06-07 04:18:21.000000000 +0200
++++ slim-1.3.0/app.cpp	2007-07-15 16:09:28.000000000 +0200
+@@ -135,6 +135,7 @@
+     ServerPID = -1;
+     testing = false;
+     mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
++    Dpy = NULL;
+ 
+     // Parse command line
+     while((tmp = getopt(argc, argv, "vhp:d?")) != EOF) {
+@@ -930,7 +931,7 @@
+ 
+     // Catch X error
+     XSetIOErrorHandler(IgnoreXIO);
+-    if(!setjmp(CloseEnv))
++    if(!setjmp(CloseEnv) && Dpy)
+         XCloseDisplay(Dpy);
+ 
+     // Send HUP to process group
 diff -uNbr --exclude=.svn release-1.2.6/app.h slim-pam/app.h
 --- release-1.2.6/app.h	2006-09-10 12:05:34.000000000 +0200
 +++ slim-pam/app.h	2007-05-19 21:26:29.000000000 +0200



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:41 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 16:20:41 -0400
Subject: devel/anaconda .cvsignore, 1.446, 1.447 anaconda.spec, 1.582,
	1.583 sources, 1.575, 1.576
Message-ID: <200709242020.l8OKKfjK022517@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22489

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
- Blacklist some modules to try to avoid #299351
- Copy over media.repo if it exists
- Fix for pulling firmware
- Remove a useless progress window (#240459)
- Fix Romanian traceback (#292091)
- Catch an exception on repo setup (#295381)
- Fix network device tool tips
- Fix display of groups being installed vs no (#296581)
- Fix Serbian language/keyboard (msivak, #235709)
- Honor "boot from" dropdown more (msivak, #243556, #243799)
- Make sure people are adequately warned about booting from a drive 
  they're not installing to (msivak, #243799)
- Don't label lvm on live installs either (#297391)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- .cvsignore	20 Sep 2007 03:15:09 -0000	1.446
+++ .cvsignore	24 Sep 2007 20:20:08 -0000	1.447
@@ -1 +1 @@
-anaconda-11.3.0.32.tar.bz2
+anaconda-11.3.0.33.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- anaconda.spec	20 Sep 2007 03:15:09 -0000	1.582
+++ anaconda.spec	24 Sep 2007 20:20:08 -0000	1.583
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.32
+Version: 11.3.0.33
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
+- Blacklist some modules to try to avoid #299351
+- Copy over media.repo if it exists
+- Fix for pulling firmware
+- Remove a useless progress window (#240459)
+- Fix Romanian traceback (#292091)
+- Catch an exception on repo setup (#295381)
+- Fix network device tool tips
+- Fix display of groups being installed vs no (#296581)
+- Fix Serbian language/keyboard (msivak, #235709)
+- Honor "boot from" dropdown more (msivak, #243556, #243799)
+- Make sure people are adequately warned about booting from a drive 
+  they're not installing to (msivak, #243799)
+- Don't label lvm on live installs either (#297391)
+
 * Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
 - spec file cleanups (dcantrell)
 - lots of pychecker fixes (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- sources	20 Sep 2007 03:15:09 -0000	1.575
+++ sources	24 Sep 2007 20:20:08 -0000	1.576
@@ -1 +1 @@
-4bd27095e1ac6fe29efa20ab7b9a20f2  anaconda-11.3.0.32.tar.bz2
+43d84848afcbecc848acdb8546aaf486  anaconda-11.3.0.33.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:37 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Mon, 24 Sep 2007 13:20:37 -0700
Subject: [pkgdb] dbus-glib had acl change status
Message-ID: <200709242020.l8OKKccN030324@app3.fedora.phx.redhat.com>

David Zeuthen (davidz) has set the watchcommits acl on dbus-glib (Fedora devel) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:40 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Mon, 24 Sep 2007 13:20:40 -0700
Subject: [pkgdb] dbus-glib had acl change status
Message-ID: <200709242020.l8OKKege020333@app4.fedora.phx.redhat.com>

David Zeuthen (davidz) has set the commit acl on dbus-glib (Fedora devel) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:23:58 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 16:23:58 -0400
Subject: rpms/isomaster/FC-6 isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1 .cvsignore,
	1.4, 1.5 isomaster.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709242023.l8OKNwNp022752@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7992

Modified Files:
	.cvsignore isomaster.spec sources 
Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Updated to 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 20:32:14 -0000	1.4
+++ .cvsignore	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/isomaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isomaster.spec	25 Aug 2007 17:37:30 -0000	1.5
+++ isomaster.spec	24 Sep 2007 20:23:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 20:32:14 -0000	1.4
+++ sources	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:24:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:24:15 -0400
Subject: rpms/maniadrive/devel maniadrive-track-editor.desktop, 1.1,
	1.2 maniadrive.desktop, 1.1, 1.2 maniadrive.spec, 1.2, 1.3
Message-ID: <200709242024.l8OKOF6U022762@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22703

Modified Files:
	maniadrive-track-editor.desktop maniadrive.desktop 
	maniadrive.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: maniadrive-track-editor.desktop
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive-track-editor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive-track-editor.desktop	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive-track-editor.desktop	24 Sep 2007 20:23:42 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ManiaDrive Track Editor
 Comment=Create new tracks for ManiaDrive
-Exec=maniadrive-track-editor
+Exec=maniadrive-track-editor-wrapper
 Icon=maniadrive.png
 Terminal=false
 StartupNotify=false


Index: maniadrive.desktop
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive.desktop	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive.desktop	24 Sep 2007 20:23:42 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ManiaDrive
 Comment=Drive a car on acrobatic tracks
-Exec=maniadrive
+Exec=maniadrive-wrapper
 Icon=maniadrive.png
 Terminal=false
 StartupNotify=false


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maniadrive.spec	20 Sep 2007 18:09:29 -0000	1.2
+++ maniadrive.spec	24 Sep 2007 20:23:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,6 +15,7 @@
 BuildRequires:  freealut-devel libjpeg-devel libXinerama-devel
 BuildRequires:  libvorbis-devel desktop-file-utils
 Requires:       %{name}-data = %{version}, php-soap, hicolor-icon-theme
+Requires:       opengl-games-utils
 # for people who try to install this using upstream capitalization
 Provides:       ManiaDrive = %{version}-%{release}
 
@@ -89,7 +90,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/raydium/headers
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/raydium
 install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 install -m 755 %{name}-track-editor $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}-track-editor-wrapper
 install -m 755 libraydium.so.0.0 \
   $RPM_BUILD_ROOT%{_libdir}/libraydium-%{version}.so
 ln -s libraydium-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libraydium.so
@@ -136,12 +140,13 @@
 %defattr(-,root,root,-)
 # no docs these are all in the -data package
 %{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 %files track-editor
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-track-editor
+%{_bindir}/%{name}-track-editor*
 %{_datadir}/applications/fedora-%{name}-track-editor.desktop
 
 %files -n raydium
@@ -156,6 +161,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
 - Rebuild for new php version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:24:27 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:24:27 -0400
Subject: rpms/vegastrike/devel vegastrike-wrapper.sh, 1.1,
	1.2 vegastrike.spec, 1.6, 1.7
Message-ID: <200709242024.l8OKORf9022803@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	vegastrike-wrapper.sh vegastrike.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-7
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: vegastrike-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-wrapper.sh	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-wrapper.sh	24 Sep 2007 20:23:55 -0000	1.2
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
+
+checkDriOK vegastrike
+
 VSDATADIR=/usr/share/vegastrike
 VERSION=`head -1 $VSDATADIR/Version.txt`
 


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vegastrike.spec	28 Aug 2007 12:02:49 -0000	1.6
+++ vegastrike.spec	24 Sep 2007 20:23:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -51,6 +51,7 @@
 BuildRequires:  SDL_mixer-devel openal-devel freealut-devel libvorbis-devel
 BuildRequires:  automake desktop-file-utils
 Requires:       %{name}-data = %{version}, hicolor-icon-theme, gedit
+Requires:       opengl-games-utils
 
 %description
 Vega Strike is a GPL 3D OpenGL Action RPG space sim that allows a player to
@@ -153,6 +154,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-7
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-6
 - Rebuild for new expat 2.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:25:45 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:25:45 -0400
Subject: rpms/opengl-games-utils/devel opengl-game-functions.sh, NONE,
	1.1 opengl-game-wrapper.sh, 1.1, 1.2 opengl-games-utils.spec, 1.1, 1.2
Message-ID: <200709242025.l8OKPjlc022884@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22857

Modified Files:
	opengl-game-wrapper.sh opengl-games-utils.spec 
Added Files:
	opengl-game-functions.sh 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
- Put DRI checking functionality in a checkDriOK bash function in
  opengl-game-functions.sh, for usage from existing wrapper scripts



--- NEW FILE opengl-game-functions.sh ---
# check if DRI is available, show an error and exit if it isn't
function checkDriOK ()
{
  if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
    zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $1 cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
    exit 1;
  fi
}


Index: opengl-game-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-game-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-game-wrapper.sh	24 Sep 2007 17:35:35 -0000	1.1
+++ opengl-game-wrapper.sh	24 Sep 2007 20:25:12 -0000	1.2
@@ -1,15 +1,9 @@
 #!/bin/bash
 
-GAME=`basename $0 | sed 's/-wrapper.*//'`
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
 
-if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
-  zenity --error --text="Your system currently is not capable of hardware \
-accelerated 3D. Therefor $GAME cannot run.
+GAME=`basename $0 | sed 's/-wrapper.*//'`
 
-Usually the cause of this error is that there are no Free Software drivers \
-for your graphics card, please contact your graphics card manufacturer and \
-kindly ask them to provide Free Software support for your card."
-  exit 1;
-fi
+checkDriOK $GAME
 
 exec $GAME "$@"


Index: opengl-games-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-games-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-games-utils.spec	24 Sep 2007 17:35:35 -0000	1.1
+++ opengl-games-utils.spec	24 Sep 2007 20:25:12 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           opengl-games-utils
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to check proper 3d support before launching 3d games
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://fedoraproject.org/wiki/SIGs/Games
 Source0:        opengl-game-wrapper.sh
-Source1:        README
+Source1:        opengl-game-functions.sh
+Source2:        README
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       zenity glx-utils
@@ -20,7 +21,7 @@
 
 %prep
 %setup -c -T
-cp %{SOURCE1} .
+cp %{SOURCE2} .
 
 
 %build
@@ -30,7 +31,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %clean
@@ -41,9 +44,14 @@
 %defattr(-,root,root,-)
 %doc README
 %{_bindir}/opengl-game-wrapper.sh
+%{_datadir}/%{name}
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
+- Put DRI checking functionality in a checkDriOK bash function in
+  opengl-game-functions.sh, for usage from existing wrapper scripts
+
 * Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
 - Various spelling fixes thanks to Rahul Sundaram
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:26:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 16:26:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.71,
	1.72 selinux-policy.spec, 1.532, 1.533
Message-ID: <200709242026.l8OKQEEl022951@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22928

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
- Fix maxima


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- policy-20070703.patch	24 Sep 2007 14:18:57 -0000	1.71
+++ policy-20070703.patch	24 Sep 2007 20:26:11 -0000	1.72
@@ -5080,20 +5080,29 @@
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.0.8/policy/modules/services/cups.if
+--- nsaserefpolicy/policy/modules/services/cups.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.if	2007-09-24 15:01:39.000000000 -0400
+@@ -247,3 +247,4 @@
+ 	files_search_pids($1)
+ 	stream_connect_pattern($1,ptal_var_run_t,ptal_var_run_t,ptal_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-21 09:12:45.000000000 -0400
-@@ -49,9 +49,6 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-24 14:34:13.000000000 -0400
+@@ -48,9 +48,7 @@
+ type hplip_t;
  type hplip_exec_t;
  init_daemon_domain(hplip_t,hplip_exec_t)
- 
+-
 -type hplip_etc_t;
 -files_config_file(hplip_etc_t)
--
++domtrans_pattern(cupsd_t,hplip_exec_t, hplip_t)
+ 
  type hplip_var_run_t;
  files_pid_file(hplip_var_run_t)
- 
-@@ -81,12 +78,11 @@
+@@ -81,12 +79,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
@@ -5107,7 +5116,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;
-@@ -105,7 +101,7 @@
+@@ -105,7 +102,7 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -5116,7 +5125,7 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
  
  manage_files_pattern(cupsd_t,cupsd_log_t,cupsd_log_t)
-@@ -122,13 +118,13 @@
+@@ -122,13 +119,13 @@
  manage_sock_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
  files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
  
@@ -5132,7 +5141,7 @@
  kernel_read_system_state(cupsd_t)
  kernel_read_network_state(cupsd_t)
  kernel_read_all_sysctls(cupsd_t)
-@@ -150,21 +146,26 @@
+@@ -150,21 +147,26 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -5160,7 +5169,7 @@
  mls_file_downgrade(cupsd_t)
  mls_file_write_all_levels(cupsd_t)
  mls_file_read_all_levels(cupsd_t)
-@@ -174,6 +175,7 @@
+@@ -174,6 +176,7 @@
  term_search_ptys(cupsd_t)
  
  auth_domtrans_chk_passwd(cupsd_t)
@@ -5168,7 +5177,7 @@
  auth_dontaudit_read_pam_pid(cupsd_t)
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
-@@ -187,7 +189,7 @@
+@@ -187,7 +190,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -5177,7 +5186,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -202,6 +204,7 @@
+@@ -202,6 +205,7 @@
  files_dontaudit_getattr_all_tmp_files(cupsd_t)
  
  selinux_compute_access_vector(cupsd_t)
@@ -5185,7 +5194,7 @@
  
  init_exec_script_files(cupsd_t)
  
-@@ -221,17 +224,37 @@
+@@ -221,17 +225,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -5223,7 +5232,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +286,16 @@
+@@ -263,16 +287,16 @@
  ')
  
  optional_policy(`
@@ -5244,7 +5253,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -331,6 +354,7 @@
+@@ -331,6 +355,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -5252,7 +5261,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -377,6 +401,14 @@
+@@ -377,6 +402,14 @@
  ')
  
  optional_policy(`
@@ -5267,7 +5276,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +558,6 @@
+@@ -526,11 +559,6 @@
  
  cups_stream_connect(hplip_t)
  
@@ -5279,7 +5288,7 @@
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
  
-@@ -560,7 +587,7 @@
+@@ -560,7 +588,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5288,7 +5297,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +614,6 @@
+@@ -587,8 +615,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -5338,7 +5347,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-21 06:44:48.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-24 11:08:39.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -6217,9 +6226,31 @@
 +   userdom_write_unpriv_users_tmp_files(exim_t)
 +}
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.0.8/policy/modules/services/ftp.if
+--- nsaserefpolicy/policy/modules/services/ftp.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ftp.if	2007-09-24 15:42:55.000000000 -0400
+@@ -28,11 +28,13 @@
+ 		type ftpd_t;
+ 	')
+ 
+-	userdom_manage_user_home_content_files($1,ftpd_t)
+-	userdom_manage_user_home_content_symlinks($1,ftpd_t)
+-	userdom_manage_user_home_content_sockets($1,ftpd_t)
+-	userdom_manage_user_home_content_pipes($1,ftpd_t)
+-	userdom_user_home_dir_filetrans_user_home_content($1,ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	tunable_policy(`ftp_home_dir',`
++		userdom_manage_user_home_content_files($1,ftpd_t)
++		userdom_manage_user_home_content_symlinks($1,ftpd_t)
++		userdom_manage_user_home_content_sockets($1,ftpd_t)
++		userdom_manage_user_home_content_pipes($1,ftpd_t)
++		userdom_user_home_dir_filetrans_user_home_content($1,ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	')
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.8/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ftp.te	2007-09-17 16:39:01.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ftp.te	2007-09-24 15:47:19.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -7133,7 +7164,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-22 07:14:54.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-24 11:09:11.000000000 -0400
 @@ -13,6 +13,9 @@
  type NetworkManager_var_run_t;
  files_pid_file(NetworkManager_var_run_t)
@@ -7163,17 +7194,18 @@
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
-@@ -138,6 +144,9 @@
+@@ -138,6 +144,10 @@
  	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
  	dbus_connect_system_bus(NetworkManager_t)
  	dbus_send_system_bus(NetworkManager_t)
++	dbus_dontaudit_rw_system_selinux_socket(NetworkManager_t)
 +	optional_policy(`
 +		rpm_dbus_chat(NetworkManager_t)
 +	')
  ')
  
  optional_policy(`
-@@ -173,8 +182,10 @@
+@@ -173,8 +183,10 @@
  ')
  
  optional_policy(`
@@ -9795,7 +9827,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 15:27:25.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-24 16:08:36.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9818,6 +9850,15 @@
  	term_setattr_unallocated_ttys($1_xserver_t)
  	term_use_unallocated_ttys($1_xserver_t)
  
+@@ -251,7 +254,7 @@
+ 	userdom_user_home_content($1,$1_fonts_cache_t)
+ 
+ 	type $1_fonts_config_t, fonts_config_type;
+-	userdom_user_home_content($1,$1_fonts_cache_t)
++	userdom_user_home_content($1,$1_fonts_config_t)
+ 
+ 	type $1_iceauth_t;
+ 	domain_type($1_iceauth_t)
 @@ -282,6 +285,7 @@
  	domtrans_pattern($1_xserver_t, xauth_exec_t, $1_xauth_t)
  
@@ -10387,7 +10428,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-21 19:32:00.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 10:44:04.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10408,17 +10449,18 @@
  	dontaudit $2 shadow_t:file { getattr read };
  
  	# Transition from the user domain to this domain.
-@@ -169,6 +167,9 @@
+@@ -169,6 +167,10 @@
  ## </param>
  #
  interface(`auth_login_pgm_domain',`
 +	gen_require(`
 +		attribute keyring_type;
++		type auth_cache_t;
 +	')
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,28 @@
+@@ -176,11 +178,28 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10447,7 +10489,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +214,33 @@
+@@ -196,22 +215,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10482,7 +10524,7 @@
  	')
  ')
  
-@@ -309,9 +338,6 @@
+@@ -309,9 +339,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10492,7 +10534,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +355,7 @@
+@@ -329,6 +356,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10500,7 +10542,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +374,37 @@
+@@ -347,6 +375,37 @@
  
  ########################################
  ## <summary>
@@ -10538,7 +10580,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +753,24 @@
+@@ -695,6 +754,24 @@
  
  ########################################
  ## <summary>
@@ -10563,7 +10605,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1394,9 @@
+@@ -1318,14 +1395,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10578,7 +10620,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1452,163 @@
+@@ -1381,3 +1453,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -10744,7 +10786,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-22 08:12:19.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-24 12:02:34.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10798,7 +10840,15 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +254,7 @@
+@@ -200,6 +218,7 @@
+ 
+ fs_list_auto_mountpoints(pam_console_t)
+ fs_list_noxattr_fs(pam_console_t)
++fs_getattr_all_fs(pam_console_t)
+ 
+ init_use_fds(pam_console_t)
+ init_use_script_ptys(pam_console_t)
+@@ -236,7 +255,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10807,7 +10857,7 @@
  ')
  
  ########################################
-@@ -302,3 +320,28 @@
+@@ -302,3 +321,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -11017,8 +11067,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 09:49:24.000000000 -0400
-@@ -211,6 +211,20 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 10:08:01.000000000 -0400
+@@ -211,6 +211,21 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -11029,6 +11079,7 @@
 +	   term_dontaudit_use_all_user_ttys($1)
 +	   term_dontaudit_use_all_user_ptys($1)
 +	 ')
++
 +	optional_policy(`
 +		tunable_policy(`allow_daemons_use_tty',`
 +		   unconfined_use_terminals($1)
@@ -11039,7 +11090,7 @@
  ')
  
  ########################################
-@@ -540,18 +554,19 @@
+@@ -540,18 +555,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -11063,7 +11114,7 @@
  	')
  ')
  
-@@ -567,18 +582,46 @@
+@@ -567,18 +583,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -11114,7 +11165,7 @@
  	')
  ')
  
-@@ -609,11 +652,11 @@
+@@ -609,11 +653,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -11128,7 +11179,7 @@
  ')
  
  ########################################
-@@ -684,11 +727,11 @@
+@@ -684,11 +728,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -11142,7 +11193,7 @@
  ')
  
  ########################################
-@@ -703,11 +746,11 @@
+@@ -703,11 +747,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -11156,7 +11207,7 @@
  ')
  
  ########################################
-@@ -931,6 +974,7 @@
+@@ -931,6 +975,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -11164,7 +11215,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1074,11 @@
+@@ -1030,11 +1075,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -11178,7 +11229,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1296,7 @@
+@@ -1252,7 +1297,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -11187,7 +11238,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1317,64 @@
+@@ -1273,3 +1318,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11433,8 +11484,47 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.8/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-17 16:20:18.000000000 -0400
-@@ -283,6 +283,7 @@
++++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-24 10:16:55.000000000 -0400
+@@ -56,7 +56,6 @@
+ 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;
+-allow ipsec_t self:netlink_route_socket r_netlink_socket_perms;
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_t self:key_socket { create write read setopt };
+ allow ipsec_t self:fifo_file { read getattr };
+@@ -84,6 +83,8 @@
+ allow ipsec_mgmt_t ipsec_t:fifo_file rw_file_perms;
+ allow ipsec_mgmt_t ipsec_t:process sigchld;
+ 
++auth_use_nsswitch(ipsec_t)
++
+ kernel_read_kernel_sysctls(ipsec_t)
+ kernel_list_proc(ipsec_t)
+ kernel_read_proc_symlinks(ipsec_t)
+@@ -134,16 +135,10 @@
+ 
+ miscfiles_read_localization(ipsec_t)
+ 
+-sysnet_read_config(ipsec_t)
+-
+ userdom_dontaudit_use_unpriv_user_fds(ipsec_t)
+ userdom_dontaudit_search_sysadm_home_dirs(ipsec_t)
+ 
+ optional_policy(`
+-	nis_use_ypbind(ipsec_t)
+-')
+-
+-optional_policy(`
+ 	seutil_sigchld_newrole(ipsec_t)
+ ')
+ 
+@@ -278,11 +273,11 @@
+ #
+ 
+ allow racoon_t self:capability { net_admin net_bind_service };
+-allow racoon_t self:netlink_route_socket create_netlink_socket_perms;
+ allow racoon_t self:unix_dgram_socket { connect create ioctl write };
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
  allow racoon_t self:key_socket { create read setopt write };
@@ -11442,6 +11532,15 @@
  
  # manage pid file
  manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
+@@ -299,6 +294,8 @@
+ 
+ allow racoon_t ipsec_spd_t:association setcontext;
+ 
++auth_use_nsswitch(racoon_t)
++
+ kernel_read_network_state(racoon_t)
+ 
+ corenet_all_recvfrom_unlabeled(racoon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.0.8/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-09-12 10:34:51.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/iptables.te	2007-09-17 16:20:18.000000000 -0400
@@ -11478,7 +11577,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-24 15:26:50.000000000 -0400
 @@ -65,11 +65,12 @@
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -11511,7 +11610,7 @@
  /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # vmware 
-@@ -284,3 +289,8 @@
+@@ -284,3 +289,9 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -11520,6 +11619,7 @@
 +
 +/var/cache/ldconfig(/.*)?		    	gen_context(system_u:object_r:ldconfig_cache_t,s0)
 +/usr/lib/libFLAC\.so.* 	  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl/maxima  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-19 13:33:20.000000000 -0400
@@ -12208,7 +12308,7 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-21 15:33:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-24 15:55:39.000000000 -0400
 @@ -44,9 +44,9 @@
  # Cluster LVM daemon local policy
  #
@@ -12221,7 +12321,23 @@
  dontaudit clvmd_t self:process ptrace;
  allow clvmd_t self:socket create_socket_perms;
  allow clvmd_t self:fifo_file rw_fifo_file_perms;
-@@ -85,6 +85,9 @@
+@@ -54,11 +54,15 @@
+ allow clvmd_t self:tcp_socket create_stream_socket_perms;
+ allow clvmd_t self:udp_socket create_socket_perms;
+ 
++init_dontaudit_getattr_initctl(clvmd_t)
++
+ manage_files_pattern(clvmd_t,clvmd_var_run_t,clvmd_var_run_t)
+ files_pid_filetrans(clvmd_t,clvmd_var_run_t,file)
+ 
+ read_files_pattern(clvmd_t,lvm_metadata_t,lvm_metadata_t)
+ 
++auth_use_nsswitch(clvmd_t)
++
+ kernel_read_kernel_sysctls(clvmd_t)
+ kernel_read_system_state(clvmd_t)
+ kernel_list_proc(clvmd_t)
+@@ -85,10 +89,15 @@
  corenet_sendrecv_generic_server_packets(clvmd_t)
  
  dev_read_sysfs(clvmd_t)
@@ -12231,7 +12347,18 @@
  dev_manage_generic_chr_files(clvmd_t)
  dev_rw_lvm_control(clvmd_t)
  dev_dontaudit_getattr_all_blk_files(clvmd_t)
-@@ -102,6 +105,7 @@
+ dev_dontaudit_getattr_all_chr_files(clvmd_t)
++dev_create_generic_dirs(clvmd_t)
++dev_delete_generic_dirs(clvmd_t)
+ 
+ files_read_etc_files(clvmd_t)
+ files_list_usr(clvmd_t)
+@@ -99,9 +108,12 @@
+ fs_dontaudit_read_removable_files(clvmd_t)
+ 
+ storage_dontaudit_getattr_removable_dev(clvmd_t)
++storage_dev_filetrans_fixed_disk(clvmd_t)
++storage_manage_fixed_disk(clvmd_t)
  
  domain_use_interactive_fds(clvmd_t)
  
@@ -12239,17 +12366,30 @@
  storage_raw_read_fixed_disk(clvmd_t)
  
  libs_use_ld_so(clvmd_t)
-@@ -113,6 +117,9 @@
+@@ -113,8 +125,9 @@
  
  seutil_dontaudit_search_config(clvmd_t)
  seutil_sigchld_newrole(clvmd_t)
+-
+-sysnet_read_config(clvmd_t)
 +seutil_read_config(clvmd_t)
 +seutil_read_file_contexts(clvmd_t)
 +seutil_search_default_contexts(clvmd_t)
  
- sysnet_read_config(clvmd_t)
+ userdom_dontaudit_use_unpriv_user_fds(clvmd_t)
+ userdom_dontaudit_search_sysadm_home_dirs(clvmd_t)
+@@ -131,10 +144,6 @@
+ ')
  
-@@ -150,7 +157,8 @@
+ optional_policy(`
+-	nis_use_ypbind(clvmd_t)
+-')
+-
+-optional_policy(`
+ 	ricci_dontaudit_rw_modcluster_pipes(clvmd_t)
+ 	ricci_dontaudit_use_modcluster_fds(clvmd_t)
+ ')
+@@ -150,7 +159,8 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
@@ -12259,7 +12399,7 @@
  dontaudit lvm_t self:capability sys_tty_config;
  allow lvm_t self:process { sigchld sigkill sigstop signull signal };
  # LVM will complain a lot if it cannot set its priority.
-@@ -208,7 +216,6 @@
+@@ -208,7 +218,6 @@
  selinux_compute_user_contexts(lvm_t)
  
  dev_create_generic_chr_files(lvm_t)
@@ -12267,7 +12407,7 @@
  dev_read_rand(lvm_t)
  dev_read_urand(lvm_t)
  dev_rw_lvm_control(lvm_t)
-@@ -228,6 +235,8 @@
+@@ -228,6 +237,8 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -12276,7 +12416,7 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -246,6 +255,7 @@
+@@ -246,6 +257,7 @@
  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)
@@ -12284,7 +12424,15 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -275,6 +285,8 @@
+@@ -254,6 +266,7 @@
+ 
+ domain_use_interactive_fds(lvm_t)
+ 
++files_read_usr_files(lvm_t)
+ files_read_etc_files(lvm_t)
+ files_read_etc_runtime_files(lvm_t)
+ # for when /usr is not mounted:
+@@ -275,6 +288,8 @@
  seutil_search_default_contexts(lvm_t)
  seutil_sigchld_newrole(lvm_t)
  
@@ -12293,7 +12441,7 @@
  ifdef(`distro_redhat',`
  	# this is from the initrd:
  	files_rw_isid_type_dirs(lvm_t)
-@@ -293,5 +305,14 @@
+@@ -293,5 +308,14 @@
  ')
  
  optional_policy(`
@@ -13254,15 +13402,16 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400
-@@ -10,3 +10,4 @@
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-24 15:27:43.000000000 -0400
+@@ -10,3 +10,5 @@
  /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/sbcl			    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-21 19:31:25.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-24 15:31:00.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- selinux-policy.spec	24 Sep 2007 14:18:57 -0000	1.532
+++ selinux-policy.spec	24 Sep 2007 20:26:12 -0000	1.533
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
+- Fix maxima
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
 - Eliminate rpm_t:fifo_file avcs
 - Fix dbus path for helper app



From fedora-extras-commits at redhat.com  Mon Sep 24 20:27:39 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:27:39 -0400
Subject: rpms/opengl-games-utils/F-7 opengl-game-functions.sh, NONE,
	1.1 opengl-game-wrapper.sh, 1.1, 1.2 opengl-games-utils.spec, 1.1, 1.2
Message-ID: <200709242027.l8OKRdDp023061@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23016

Modified Files:
	opengl-game-wrapper.sh opengl-games-utils.spec 
Added Files:
	opengl-game-functions.sh 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
- Put DRI checking functionality in a checkDriOK bash function in
  opengl-game-functions.sh, for usage from existing wrapper scripts



--- NEW FILE opengl-game-functions.sh ---
# check if DRI is available, show an error and exit if it isn't
function checkDriOK ()
{
  if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
    zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $1 cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
    exit 1;
  fi
}


Index: opengl-game-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/F-7/opengl-game-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-game-wrapper.sh	24 Sep 2007 17:39:41 -0000	1.1
+++ opengl-game-wrapper.sh	24 Sep 2007 20:27:07 -0000	1.2
@@ -1,15 +1,9 @@
 #!/bin/bash
 
-GAME=`basename $0 | sed 's/-wrapper.*//'`
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
 
-if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
-  zenity --error --text="Your system currently is not capable of hardware \
-accelerated 3D. Therefor $GAME cannot run.
+GAME=`basename $0 | sed 's/-wrapper.*//'`
 
-Usually the cause of this error is that there are no Free Software drivers \
-for your graphics card, please contact your graphics card manufacturer and \
-kindly ask them to provide Free Software support for your card."
-  exit 1;
-fi
+checkDriOK $GAME
 
 exec $GAME "$@"


Index: opengl-games-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/F-7/opengl-games-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-games-utils.spec	24 Sep 2007 17:39:41 -0000	1.1
+++ opengl-games-utils.spec	24 Sep 2007 20:27:07 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           opengl-games-utils
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to check proper 3d support before launching 3d games
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://fedoraproject.org/wiki/SIGs/Games
 Source0:        opengl-game-wrapper.sh
-Source1:        README
+Source1:        opengl-game-functions.sh
+Source2:        README
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       zenity glx-utils
@@ -20,7 +21,7 @@
 
 %prep
 %setup -c -T
-cp %{SOURCE1} .
+cp %{SOURCE2} .
 
 
 %build
@@ -30,7 +31,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %clean
@@ -41,9 +44,14 @@
 %defattr(-,root,root,-)
 %doc README
 %{_bindir}/opengl-game-wrapper.sh
+%{_datadir}/%{name}
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
+- Put DRI checking functionality in a checkDriOK bash function in
+  opengl-game-functions.sh, for usage from existing wrapper scripts
+
 * Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
 - Various spelling fixes thanks to Rahul Sundaram
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:27:40 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 16:27:40 -0400
Subject: rpms/nginx/EL-5 nginx.spec,1.8,1.9
Message-ID: <200709242027.l8OKReeR023064@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23014

Modified Files:
	nginx.spec 
Log Message:
update to 0.5.32


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nginx.spec	18 Aug 2007 18:34:57 -0000	1.8
+++ nginx.spec	24 Sep 2007 20:27:08 -0000	1.9
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        3%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-3
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.



From fedora-extras-commits at redhat.com  Mon Sep 24 20:30:00 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 24 Sep 2007 16:30:00 -0400
Subject: rpms/sugar/OLPC-2 sources,1.60,1.61 sugar.spec,1.71,1.72
Message-ID: <200709242030.l8OKU0tK023422@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	sources sugar.spec 
Log Message:
* Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	22 Sep 2007 13:13:24 -0000	1.60
+++ sources	24 Sep 2007 20:29:28 -0000	1.61
@@ -1 +1 @@
-8b23af473577511c6f1940e7c3918bf4  sugar-0.65-git5a595ea04e.tar.bz2
+a6fcc8a52918b882cd499d94e9521e39  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sugar.spec	22 Sep 2007 13:13:24 -0000	1.71
+++ sugar.spec	24 Sep 2007 20:29:28 -0000	1.72
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070922git
+%define alphatag 20070924git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.56.%{alphatag}5a595ea04e
+Release: 0.57.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
+- New snapshot
+
 * Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:32:15 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 16:32:15 -0400
Subject: rpms/fmtools/devel fmtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242032.l8OKWFhf023619@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:33:40 -0000	1.1
+++ .cvsignore	24 Sep 2007 20:31:43 -0000	1.2
@@ -0,0 +1,2 @@
+fmcontrol.tar.gz
+fmtools-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	24 Sep 2007 20:31:43 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:34:59 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 24 Sep 2007 16:34:59 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.4, 1.5 eclipse-egit.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709242034.l8OKYx25023864@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23785

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Log Message:
* Mon Sep 24 2007 Ben Konrath <bkonrath at redhat.com> 0.3.0.fc8
- 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2007 19:31:56 -0000	1.4
+++ .cvsignore	24 Sep 2007 20:34:27 -0000	1.5
@@ -1 +1 @@
-egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-egit.spec	19 Sep 2007 19:34:14 -0000	1.7
+++ eclipse-egit.spec	24 Sep 2007 20:34:27 -0000	1.8
@@ -3,13 +3,13 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.99
-Release:          0.git20070919%{?dist}
+Version:          0.3.0
+Release:          1%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=31185033bceae1c77b0f6a4182dea3fc56f882ba;sf=tgz
 Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
@@ -95,6 +95,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Ben Konrath <bkonrath at redhat.com> 0.3.0.fc8
+- 0.3.0
+
 * Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
 - 0.2.99 git20070919
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2007 19:31:56 -0000	1.4
+++ sources	24 Sep 2007 20:34:27 -0000	1.5
@@ -1 +1 @@
-df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+c648dad399d82e2d72ba5d9e0b0782de  egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:35:45 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 16:35:45 -0400
Subject: rpms/frysk/devel frysk.spec,1.115,1.116
Message-ID: <200709242035.l8OKZjhn023946@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23779

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Fix touch paths to allow for build sub-directory.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- frysk.spec	24 Sep 2007 20:11:51 -0000	1.115
+++ frysk.spec	24 Sep 2007 20:35:13 -0000	1.116
@@ -167,7 +167,7 @@
 
 # Fix timestamp of a generated script:
 touch -r \
-      ../frysk-gui/frysk-gui/frysk/gui/FryskGui.javain \
+      ../frysk-gui/frysk/gui/FryskGui.javain \
       $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
 for f in test2866.py test2985.py test3380.py; do
@@ -246,6 +246,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.
 - Remove frysk-20060922-a-cast.patch
 - Remove frysk-xfail-2130.patch.



From fedora-extras-commits at redhat.com  Mon Sep 24 20:38:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:38:40 -0400
Subject: rpms/blobAndConquer/devel blobAndConquer.spec,1.6,1.7
Message-ID: <200709242038.l8OKceDL024261@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24074

Modified Files:
	blobAndConquer.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blobAndConquer.spec	21 Aug 2007 20:41:34 -0000	1.6
+++ blobAndConquer.spec	24 Sep 2007 20:38:08 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name:           blobAndConquer
 Version:        0.91
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+
@@ -19,7 +19,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 With the apparent defeat of Galdov and the reclaiming of the Fire, Time, Space
@@ -39,6 +39,8 @@
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
+sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
+  icons/blobAndConquer.desktop
 
 
 %build
@@ -56,6 +58,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
   ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 mkdir installed-docs
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
 
@@ -86,7 +89,7 @@
 %files
 %defattr(-,root,root,-)
 %doc installed-docs/*
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-3
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:39:07 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 24 Sep 2007 16:39:07 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.8,1.9
Message-ID: <200709242039.l8OKd7Z5024477@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24243

Modified Files:
	eclipse-egit.spec 
Log Message:
 fix source listing


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-egit.spec	24 Sep 2007 20:34:27 -0000	1.8
+++ eclipse-egit.spec	24 Sep 2007 20:38:35 -0000	1.9
@@ -10,7 +10,7 @@
 Group:            Development/Tools
 
 # retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=31185033bceae1c77b0f6a4182dea3fc56f882ba;sf=tgz
-Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+Source0:          egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
 Requires:         git



From fedora-extras-commits at redhat.com  Mon Sep 24 20:39:21 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 24 Sep 2007 16:39:21 -0400
Subject: rpms/sugar/OLPC-2 sugar-0.65-jabberserver.patch,1.1,1.2
Message-ID: <200709242039.l8OKdLnh024550@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24312

Modified Files:
	sugar-0.65-jabberserver.patch 
Log Message:
update patch

sugar-0.65-jabberserver.patch:

Index: sugar-0.65-jabberserver.patch
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar-0.65-jabberserver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-0.65-jabberserver.patch	17 Sep 2007 23:10:35 -0000	1.1
+++ sugar-0.65-jabberserver.patch	24 Sep 2007 20:38:48 -0000	1.2
@@ -1,11 +1,11 @@
---- sugar-0.65/sugar/profile.py.bak	2007-09-18 01:05:53.000000000 +0200
-+++ sugar-0.65/sugar/profile.py	2007-09-18 01:06:06.000000000 +0200
+--- sugar-0.65/sugar/profile.py.old	2007-09-24 22:35:48.000000000 +0200
++++ sugar-0.65/sugar/profile.py	2007-09-24 22:36:05.000000000 +0200
 @@ -24,7 +24,7 @@
  from sugar import util
  from sugar.graphics.xocolor import XoColor
  
 -DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
 +DEFAULT_JABBER_SERVER = 'jabber.laptop.org'
+ DEFAULT_VOLUME = 81
  
  _profile = None
- 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:43:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 16:43:35 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.324,
	1.325 policycoreutils.spec, 1.451, 1.452
Message-ID: <200709242043.l8OKhZrU025755@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25684

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
- Show local changes with semanage


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- policycoreutils-rhat.patch	24 Sep 2007 17:45:50 -0000	1.324
+++ policycoreutils-rhat.patch	24 Sep 2007 20:43:32 -0000	1.325
@@ -36,9 +36,151 @@
  	}
  	free(scontext);
  	close(fd);
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.26/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2007-08-23 16:52:26.000000000 -0400
++++ policycoreutils-2.0.26/semanage/semanage	2007-09-24 16:41:52.000000000 -0400
+@@ -48,13 +48,14 @@
+ 
+ 	def usage(message = ""):
+ 		print _('\
+-semanage {login|user|port|interface|fcontext|translation} -l [-n] \n\
++semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] \n\
+ semanage login -{a|d|m} [-sr] login_name\n\
+ semanage user -{a|d|m} [-LrRP] selinux_name\n\
+ semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\
+ semanage interface -{a|d|m} [-tr] interface_spec\n\
+ semanage fcontext -{a|d|m} [-frst] file_spec\n\
+ semanage translation -{a|d|m} [-T] level\n\n\
++semanage boolean -{d|m} boolean\n\n\
+ \
+ Primary Options:\n\
+ \
+@@ -62,6 +63,8 @@
+ 	-d, --delete     Delete a OBJECT record NAME\n\
+ 	-m, --modify     Modify a OBJECT record NAME\n\
+ 	-l, --list       List the OBJECTS\n\n\
++	-C, --locallist  List OBJECTS local customizations\n\n\
++	-D, --deleteall  Remove all OBJECTS local customizations\n\
+ \
+ 	-h, --help       Display this message\n\
+ 	-n, --noheading  Do not print heading when listing OBJECTS\n\n\
+@@ -98,7 +101,7 @@
+ 
+ 	def get_options():
+ 		valid_option={}
+-		valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading' ]
++		valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall']
+ 		valid_option["login"] = []
+ 		valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
+ 		valid_option["user"] = []
+@@ -111,6 +114,8 @@
+ 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["translation"] = []
+ 		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
++		valid_option["boolean"] = []
++		valid_option["boolean"] += valid_everyone 
+ 		return valid_option
+ 
+ 	#
+@@ -134,7 +139,9 @@
+ 		add = 0
+ 		modify = 0
+ 		delete = 0
++		deleteall = 0
+ 		list = 0
++		locallist = 0
+ 		if len(sys.argv) < 3:
+ 			usage(_("Requires 2 or more arguments"))
+ 			
+@@ -146,14 +153,16 @@
+ 		args = sys.argv[2:]
+ 
+ 		gopts, cmds = getopt.getopt(args,
+-					    'adf:lhmnp:s:R:L:r:t:T:P:',
++					    'adf:lhmnp:s:CDR:L:r:t:T:P:',
+ 					    ['add',
+ 					     'delete',
++					     'deleteall',
+ 					     'ftype=',
+ 					     'help',
+ 					     'list', 
+ 					     'modify',
+ 					     'noheading',
++					     'localist',
+ 					     'proto=',
+ 					     'seuser=',
+ 					     'range=',
+@@ -177,6 +186,10 @@
+ 				if modify or add:
+ 					usage()
+ 				delete = 1
++			if o == "-D"  or o == "--deleteall":
++				if modify:
++                                       usage()
++				deleteall = 1
+ 			if o == "-f"  or o == "--ftype":
+ 				ftype=a
+ 			if o == "-h" or o == "--help":
+@@ -185,6 +198,9 @@
+ 			if o == "-n" or o == "--noheading":
+ 				heading=0
+ 
++			if o == "-C" or o == "--locallist":
++				locallist=1
++
+ 			if o == "-m"or o == "--modify":
+ 				if delete or add:
+ 					usage()
+@@ -236,17 +252,24 @@
+ 		if object == "fcontext":
+ 			OBJECT = seobject.fcontextRecords()
+ 		
++		if object == "boolean":
++			OBJECT = seobject.booleanRecords()
++		
+ 		if object == "translation":
+ 			OBJECT = seobject.setransRecords()
+ 		
+ 		if list:
+-			OBJECT.list(heading)
++			OBJECT.list(heading, locallist)
++			sys.exit(0);
++			
++		if deleteall:
++			OBJECT.deleteall()
+ 			sys.exit(0);
+ 			
+ 		if len(cmds) != 1:
+ 			usage()
+-
+-		target = cmds[0]
++                        
++                target = cmds[0]
+ 
+ 		if add:
+ 			if object == "login":
+@@ -274,6 +297,9 @@
+ 			sys.exit(0);
+ 			
+ 		if modify:
++			if object == "boolean":
++				OBJECT.modify(target, value)
++
+ 			if object == "login":
+ 				OBJECT.modify(target, seuser, serange)
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.26/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-24 16:42:14.000000000 -0400
+@@ -170,7 +170,7 @@
+ 			rec += "%s=%s\n" %  (k, self.ddict[k])
+ 		return rec
+ 	
+-	def list(self,heading = 1):
++	def list(self,heading = 1, locallist = 0):
+ 		if heading:
+ 			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+ 		keys = self.ddict.keys()
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -47,7 +189,131 @@
                  
  class semanageRecords:
  	def __init__(self):
-@@ -1024,14 +1025,31 @@
+@@ -389,10 +390,12 @@
+ 		mylog.log(1,"delete SELinux user mapping", name);
+ 		semanage_seuser_key_free(k)
+ 
+-		
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ulist) = semanage_seuser_list(self.sh)
++                if locallist:
++                       (rc, self.ulist) = semanage_seuser_list_local(self.sh)
++                else:
++                       (rc, self.ulist) = semanage_seuser_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list login mappings"))
+ 
+@@ -401,8 +404,8 @@
+ 			ddict[name] = (semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u))
+ 		return ddict
+ 
+-	def list(self,heading = 1):
+-		ddict = self.get_all()
++	def list(self,heading = 1, locallist = 0):
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled == 1:
+@@ -601,9 +604,12 @@
+ 		mylog.log(1,"delete SELinux user record", name)
+ 		semanage_user_key_free(k)		
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ulist) = semanage_user_list(self.sh)
++                if locallist:
++                       (rc, self.ulist) = semanage_user_list_local(self.sh)
++                else:
++                       (rc, self.ulist) = semanage_user_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list SELinux users"))
+ 
+@@ -618,8 +624,8 @@
+ 
+ 		return ddict
+ 
+-	def list(self, heading = 1):
+-		ddict = self.get_all()
++	def list(self, heading = 1, locallist = 0):
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled == 1:
+@@ -795,9 +801,12 @@
+ 		
+ 		semanage_port_key_free(k)
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.plist) = semanage_port_list(self.sh)
++                if locallist:
++                       (rc, self.plist) = semanage_port_list_local(self.sh)
++                else:
++                       (rc, self.plist) = semanage_port_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list ports"))
+ 
+@@ -814,9 +823,12 @@
+ 			ddict[(low, high)] = (ctype, proto_str, level)
+ 		return ddict
+ 
+-	def get_all_by_type(self):
++	def get_all_by_type(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.plist) = semanage_port_list(self.sh)
++                if locallist:
++                       (rc, self.plist) = semanage_port_list_local(self.sh)
++                else:
++                       (rc, self.plist) = semanage_port_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list ports"))
+ 
+@@ -837,10 +849,10 @@
+ 				ddict[(ctype,proto_str)].append("%d-%d" % (low, high))
+ 		return ddict
+ 
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number"))
+-		ddict = self.get_all_by_type()
++		ddict = self.get_all_by_type(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		for i in keys:
+@@ -995,9 +1007,12 @@
+ 		
+ 		semanage_iface_key_free(k)
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ilist) = semanage_iface_list(self.sh)
++                if locallist:
++                       (rc, self.ilist) = semanage_iface_list_local(self.sh)
++                else:
++                       (rc, self.ilist) = semanage_iface_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list interfaces"))
+ 
+@@ -1007,10 +1022,10 @@
+ 
+ 		return ddict
+ 			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %s\n" % (_("SELinux Interface"), _("Context"))
+-		ddict = self.get_all()
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled:
+@@ -1024,14 +1039,31 @@
  	def __init__(self):
  		semanageRecords.__init__(self)
  		
@@ -84,14 +350,16 @@
  			
  		if type == "":
  			raise ValueError(_("SELinux Type is required"))
-@@ -1051,33 +1069,23 @@
+@@ -1051,33 +1083,23 @@
  			raise ValueError(_("Could not create file context for %s") % target)
  		
  		rc = semanage_fcontext_set_expr(self.sh, fcontext, target)
 -		(rc, con) = semanage_context_create(self.sh)
 -		if rc < 0:
 -			raise ValueError(_("Could not create context for %s") % target)
--
++                if type != "<<none>>":
++                       con = self.createcon(target, seuser)
+ 
 -		rc = semanage_context_set_user(self.sh, con, seuser)
 -		if rc < 0:
 -			raise ValueError(_("Could not set user in file context for %s") % target)
@@ -103,9 +371,7 @@
 -		rc = semanage_context_set_type(self.sh, con, type)
 -		if rc < 0:
 -			raise ValueError(_("Could not set type in file context for %s") % target)
-+                if type != "<<none>>":
-+                       con = self.createcon(target, seuser)
- 
+-
 -		if serange != "":
 -			rc = semanage_context_set_mls(self.sh, con, serange)
 -			if rc < 0:
@@ -131,7 +397,7 @@
  		rc = semanage_begin_transaction(self.sh)
  		if rc < 0:
  			raise ValueError(_("Could not start semanage transaction"))
-@@ -1090,7 +1098,8 @@
+@@ -1090,7 +1112,8 @@
  		if rc < 0:
  			raise ValueError(_("Could not add file context for %s") % target)
  
@@ -141,7 +407,7 @@
  		semanage_fcontext_key_free(k)
  		semanage_fcontext_free(fcontext)
  
-@@ -1112,16 +1121,29 @@
+@@ -1112,16 +1135,29 @@
  		if rc < 0:
  			raise ValueError(_("Could not query file context for %s") % target)
  
@@ -180,7 +446,96 @@
  		if rc < 0:
  			raise ValueError(_("Could not start semanage transaction"))
  
-@@ -1283,9 +1305,12 @@
+@@ -1167,17 +1203,20 @@
+ 
+ 		semanage_fcontext_key_free(k)		
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		l = []
+-		(rc, self.flist) = semanage_fcontext_list(self.sh)
+-		if rc < 0:
+-			raise ValueError(_("Could not list file contexts"))
+-
+-		(rc, fclocal) = semanage_fcontext_list_local(self.sh)
+-		if rc < 0:
+-			raise ValueError(_("Could not list local file contexts"))
++                if locallist:
++                       (rc, self.flist) = semanage_fcontext_list_local(self.sh)
++                else:
++                       (rc, self.flist) = semanage_fcontext_list(self.sh)
++                       if rc < 0:
++                              raise ValueError(_("Could not list file contexts"))
++
++                       (rc, fclocal) = semanage_fcontext_list_local(self.sh)
++                       if rc < 0:
++                              raise ValueError(_("Could not list local file contexts"))
+ 
+-		self.flist += fclocal
++                       self.flist += fclocal
+ 
+ 		for fcontext in self.flist:
+ 			expr = semanage_fcontext_get_expr(fcontext)
+@@ -1191,10 +1230,10 @@
+ 
+ 		return l
+ 			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0 ):
+ 		if heading:
+ 			print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+-		fcon_list = self.get_all()
++		fcon_list = self.get_all(locallist)
+ 		for fcon in fcon_list:
+ 			if len(fcon) > 3:
+ 				if is_mls_enabled:
+@@ -1266,34 +1305,62 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not start semanage transaction"))
+ 
+-		rc = semanage_fcontext_del_local(self.sh, k)
++		rc = semanage_bool_del_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not delete boolean %s") % name)
+ 	
+ 		rc = semanage_commit(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not delete boolean %s") % name)
+-		
+ 		semanage_bool_key_free(k)
+ 
+-	def get_all(self):
++	def deleteall(self):
++		(rc, self.blist) = semanage_bool_list_local(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not list booleans"))
++
++		rc = semanage_begin_transaction(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not start semanage transaction"))
++
++		for boolean in self.blist:
++                       name = semanage_bool_get_name(boolean)
++                       (rc,k) = semanage_bool_key_create(self.sh, name)
++                       if rc < 0:
++                              raise ValueError(_("Could not create a key for %s") % name)
++
++                       rc = semanage_bool_del_local(self.sh, k)
++                       if rc < 0:
++                              raise ValueError(_("Could not delete boolean %s") % name)
++                       semanage_bool_key_free(k)
++	
++		rc = semanage_commit(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not delete boolean %s") % name)
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.blist) = semanage_bool_list(self.sh)
++                if locallist:
++                       (rc, self.blist) = semanage_bool_list_local(self.sh)
++                else:
++                       (rc, self.blist) = semanage_bool_list(self.sh)
+ 		if rc < 0:
  			raise ValueError(_("Could not list booleans"))
  
  		for boolean in self.blist:
@@ -189,13 +544,25 @@
 -			ddict[name] = value
 +                       value = []
 +                       name = semanage_bool_get_name(boolean)
-+                       value[0] = semanage_bool_get_value(boolean)
-+                       value[1] = selinux.security_get_boolean_pending(boolean)
-+                       value[2] = selinux.security_get_boolean_active(boolean)
++                       value.append(semanage_bool_get_value(boolean))
++                       value.append(selinux.security_get_boolean_pending(name))
++                       value.append(selinux.security_get_boolean_active(name))
 +                       ddict[name] = value
  
  		return ddict
  			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+-			print "%-50s %-18s\n" % (_("SELinux boolean"), _("value"))
+-		ddict = self.get_all()
++			print "%-50s %7s %7s %7s\n" % (_("SELinux boolean"), _("value"), _("pending"),  _("active") )
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		for k in keys:
+ 			if ddict[k]:
+-				print "%-50s %-18s " % (k[0], ddict[k][0])
++				print "%-50s %7d %7d %7d " % (k, ddict[k][0],ddict[k][1], ddict[k][2])
 diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.26/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
 +++ policycoreutils-2.0.26/semodule/semodule.8	2007-09-18 16:40:57.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- policycoreutils.spec	24 Sep 2007 16:22:04 -0000	1.451
+++ policycoreutils.spec	24 Sep 2007 20:43:33 -0000	1.452
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.26
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,9 @@
 fi
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
+- Show local changes with semanage
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
 - Fixed spelling mistakes in booleans defs
 - Update po



From fedora-extras-commits at redhat.com  Mon Sep 24 20:45:33 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:45:33 -0400
Subject: rpms/machineball/devel machineball.desktop, 1.1,
	1.2 machineball.spec, 1.2, 1.3
Message-ID: <200709242045.l8OKjX0k027497@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/machineball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26985

Modified Files:
	machineball.desktop machineball.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: machineball.desktop
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- machineball.desktop	12 May 2007 08:27:14 -0000	1.1
+++ machineball.desktop	24 Sep 2007 20:45:01 -0000	1.2
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Name=machineball
 Comment=A futuristic ball game with simple rules
-Exec=machineball
+Exec=machineball-wrapper
 StartupNotify=false
 Terminal=false
 Type=Application


Index: machineball.spec
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- machineball.spec	15 Aug 2007 07:26:18 -0000	1.2
+++ machineball.spec	24 Sep 2007 20:45:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           machineball
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A futuristic ball game with simple rules
 Group:          Amusements/Games
 License:        GPL+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alleggl-devel libGLU-devel ode-devel dumb-devel allegro-tools
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Machine Ball is a futuristic sport with amazing 3D graphics and realistic
@@ -35,6 +35,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 install -m 755 %{name} $RPM_BUILD_ROOT/usr/bin
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -69,12 +70,15 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:45:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:45:37 -0400
Subject: rpms/clanbomber/devel clanbomber.desktop, 1.2, 1.3 clanbomber.spec, 
	1.5, 1.6
Message-ID: <200709242045.l8OKjbmv027636@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27020

Modified Files:
	clanbomber.desktop clanbomber.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: clanbomber.desktop
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clanbomber.desktop	10 Mar 2007 10:08:58 -0000	1.2
+++ clanbomber.desktop	24 Sep 2007 20:45:04 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ClanBomber
 Comment=Bomberman-like multiplayer game
-Exec=clanbomber
+Exec=clanbomber-wrapper
 Icon=clanbomber.png
 Terminal=false
 StartupNotify=false


Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clanbomber.spec	6 Aug 2007 08:15:49 -0000	1.5
+++ clanbomber.spec	24 Sep 2007 20:45:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Bomberman-like multiplayer game that uses ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 Patch1:         clanbomber-1.05-namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib06-devel zlib-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib,
@@ -37,6 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -68,13 +69,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog IDEAS QUOTES README
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-5
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:52:15 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:52:15 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch, NONE, 1.1 xen.spec, 1.184, 
	1.185 xen-pvfb-compat.patch, 1.2, NONE xen-pvfb-no-hvm.patch,
	1.1, NONE xen-pvfb-terminate.patch, 1.1, NONE
Message-ID: <200709242052.l8OKqFd3031217@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30613

Modified Files:
	xen.spec 
Added Files:
	xen-pvfb-04-compat.patch 
Removed Files:
	xen-pvfb-compat.patch xen-pvfb-no-hvm.patch 
	xen-pvfb-terminate.patch 
Log Message:
Re-add backcompat support for FC6 era PVFB

xen-pvfb-04-compat.patch:

--- NEW FILE xen-pvfb-04-compat.patch ---
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 13:46:13.000000000 -0400
@@ -0,0 +1,569 @@
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <xenctrl.h>
+#include <xen/io/xenbus.h>
+#include <sys/select.h>
+#include <stdbool.h>
+#include <xen/linux/evtchn.h>
+#include <xen/event_channel.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <xs.h>
+
+#include "xenfb.h"
+#include "oldxenfb.h"
+#include "oldxenkbd.h"
+
+// FIXME defend against malicious frontend?
+
+/* 
+ * NB our back-compat hack relies on these structs being the same size
+ * or smaller than the same named structs in xenfb.c, and having the
+ * same field offsets in both. Do not change this !
+ */
+struct xenfb_device {
+	const char *devicetype;
+	char nodename[64];	/* backend xenstore dir */
+	char otherend[64];	/* frontend xenstore dir */
+	int otherend_id;	/* frontend domid */
+	enum xenbus_state state; /* backend state */
+	void *page;		/* shared page */
+	evtchn_port_t port;
+	struct xenfb_private *xenfb;
+};
+
+struct xenfb_private {
+	struct xenfb pub;
+	int evt_xch;		/* event channel driver handle */
+	int xc;			/* hypervisor interface handle */
+	struct xs_handle *xsh;	/* xs daemon handle */
+	struct xenfb_device fb, kbd;
+	size_t fb_len;		/* size of framebuffer */
+};
+
+static void oldxenfb_detach_dom(struct xenfb_private *);
+static int oldxenfb_fb_event(struct xenfb_private *, union xenfb_in_event *);
+
+static char *oldxenfb_path_in_dom(struct xs_handle *xsh,
+				  char *buf, size_t size,
+				  unsigned domid, const char *fmt, ...)
+{
+	va_list ap;
+	char *domp = xs_get_domain_path(xsh, domid);
+	int n;
+
+        if (domp == NULL)
+		return NULL;
+
+	n = snprintf(buf, size, "%s/", domp);
+	free(domp);
+	if (n >= size)
+		return NULL;
+
+	va_start(ap, fmt);
+	n += vsnprintf(buf + n, size - n, fmt, ap);
+	va_end(ap);
+	if (n >= size)
+		return NULL;
+
+	return buf;
+}
+
+static int oldxenfb_xs_scanf1(struct xs_handle *xsh,
+			      const char *dir, const char *node,
+			      const char *fmt, void *dest)
+{
+	char buf[1024];
+	char *p;
+	int ret;
+
+	if (snprintf(buf, sizeof(buf), "%s/%s", dir, node) >= sizeof(buf)) {
+		errno = ENOENT;
+		return -1;
+        }
+	p = xs_read(xsh, XBT_NULL, buf, NULL);
+	if (!p) {
+		errno = ENOENT;
+		return -1;
+        }
+	ret = sscanf(p, fmt, dest);
+	free(p);
+	if (ret != 1) {
+		errno = EDOM;
+		return -1;
+        }
+	return ret;
+}
+
+static int oldxenfb_xs_printf(struct xs_handle *xsh,
+			      const char *dir, const char *node, char *fmt, ...)
+{
+	va_list ap;
+	char key[1024];
+	char val[1024];
+	int n;
+
+	if (snprintf(key, sizeof(key), "%s/%s", dir, node) >= sizeof(key)) {
+		errno = ENOENT;
+		return -1;
+        }
+
+	va_start(ap, fmt);
+	n = vsnprintf(val, sizeof(val), fmt, ap);
+	va_end(ap);
+	if (n >= sizeof(val)) {
+		errno = ENOSPC; /* close enough */
+		return -1;
+	}
+
+	if (!xs_write(xsh, XBT_NULL, key, val, n))
+		return -1;
+	return 0;
+}
+
+int oldxenfb_device_set_domain(struct xenfb_device *dev, int domid)
+{
+	struct xenfb_private *xenfb = dev->xenfb;
+
+	dev->otherend_id = domid;
+
+	if (!oldxenfb_path_in_dom(xenfb->xsh,
+				  dev->otherend, sizeof(dev->otherend),
+				  domid, "device/%s/0", dev->devicetype)) {
+		errno = ENOENT;
+		return -1;
+	}
+	if (!oldxenfb_path_in_dom(xenfb->xsh,
+				  dev->nodename, sizeof(dev->nodename),
+				  0, "backend/%s/%d/0", dev->devicetype, domid)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	return 0;
+}
+
+
+static enum xenbus_state oldxenfb_read_state(struct xs_handle *xsh,
+					     const char *dir)
+{
+	int ret, state;
+
+	ret = oldxenfb_xs_scanf1(xsh, dir, "state", "%d", &state);
+	if (ret < 0)
+		return XenbusStateUnknown;
+
+	if ((unsigned)state > XenbusStateClosed)
+		state = XenbusStateUnknown;
+	return state;
+}
+
+static int oldxenfb_switch_state(struct xenfb_device *dev,
+				 enum xenbus_state state)
+{
+	struct xs_handle *xsh = dev->xenfb->xsh;
+
+	if (oldxenfb_xs_printf(xsh, dev->nodename, "state", "%d", state) < 0)
+		return -1;
+	dev->state = state;
+	return 0;
+}
+
+
+static int oldxenfb_map_fb(struct xenfb_private *xenfb, int domid)
+{
+	struct xenfb_page *page = xenfb->fb.page;
+	int n_fbmfns;
+	int n_fbdirs;
+	unsigned long *fbmfns;
+
+	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
+	n_fbdirs = n_fbmfns * sizeof(unsigned long);
+	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
+
+	/*
+	 * Bug alert: xc_map_foreign_batch() can fail partly and
+	 * return a non-null value.  This is a design flaw.  When it
+	 * happens, we happily continue here, and later crash on
+	 * access.
+	 */
+	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
+			PROT_READ, page->pd, n_fbdirs);
+	if (fbmfns == NULL)
+		return -1;
+
+	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
+				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
+	if (xenfb->pub.pixels == NULL) {
+		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+		return -1;
+	}
+
+	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+}
+
+static int oldxenfb_bind(struct xenfb_device *dev)
+{
+	struct xenfb_private *xenfb = dev->xenfb;
+	unsigned long mfn;
+	evtchn_port_t evtchn;
+	char buf[64];
+	char *p, **vec;
+	unsigned dummy;
+
+	p = oldxenfb_path_in_dom(xenfb->xsh, buf, sizeof(buf),
+				 dev->otherend_id, dev->devicetype);
+	if (!xs_watch(xenfb->xsh, p, ""))
+		return -1;
+	for (;;) {
+		if (oldxenfb_xs_scanf1(xenfb->xsh, p, "page-ref", "%lu",
+				       &mfn) < 0) {
+			if (errno == ENOENT || errno == EAGAIN)
+				goto wait;
+			return -1;
+		}
+		if (oldxenfb_xs_scanf1(xenfb->xsh, p, "event-channel", "%u",
+				       &evtchn) < 0) {
+			if (errno == ENOENT || errno == EAGAIN)
+				goto wait;
+			return -1;
+		}
+		break;
+
+	wait:
+		printf("Waiting...\n");
+		vec = xs_read_watch(xenfb->xsh, &dummy);
+		if (!vec)
+			return -1;
+		free(vec);
+	}
+
+	dev->port = xc_evtchn_bind_interdomain(xenfb->evt_xch,
+					       dev->otherend_id, evtchn);
+	if (dev->port == -1)
+		return -1;
+
+	dev->page = xc_map_foreign_range(xenfb->xc, dev->otherend_id,
+			XC_PAGE_SIZE, PROT_READ | PROT_WRITE, mfn);
+	if (dev->page == NULL)
+		return -1;
+
+	return 0;
+}
+
+static void oldxenfb_unbind(struct xenfb_device *dev)
+{
+	if (dev->page) {
+		munmap(dev->page, XC_PAGE_SIZE);
+		dev->page = NULL;
+	}
+        if (dev->port >= 0) {
+		xc_evtchn_unbind(dev->xenfb->evt_xch, dev->port);
+		dev->port = -1;
+	}
+}
+
+static void oldxenfb_dev_fatal(struct xenfb_device *dev, int err,
+			       const char *fmt, ...)
+{
+	struct xs_handle *xsh = dev->xenfb->xsh;
+	va_list ap;
+	char errdir[80];
+	char buf[1024];
+	int n;
+
+	fprintf(stderr, "%s ", dev->nodename); /* somewhat crude */
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	if (err)
+		fprintf(stderr, " (%s)", strerror(err));
+	putc('\n', stderr);
+
+	if (!oldxenfb_path_in_dom(xsh, errdir, sizeof(errdir), 0,
+				  "error/%s", dev->nodename))
+		goto out;	/* FIXME complain */
+
+	va_start(ap, fmt);
+	n = snprintf(buf, sizeof(buf), "%d ", err);
+	snprintf(buf + n, sizeof(buf) - n, fmt, ap);
+	va_end(ap);
+
+	if (oldxenfb_xs_printf(xsh, buf, "error", "%s", buf) < 0)
+		goto out;	/* FIXME complain */
+
+ out:
+	oldxenfb_switch_state(dev, XenbusStateClosing);
+}
+
+int oldxenfb_attach_dom(struct xenfb *xenfb_pub, int domid)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	struct xs_handle *xsh = xenfb->xsh;
+	int serrno;
+	struct xenfb_page *fb_page;
+	union xenfb_in_event event;
+
+	if (oldxenfb_bind(&xenfb->fb) < 0)
+		goto error;
+	if (oldxenfb_bind(&xenfb->kbd) < 0)
+		goto error;
+
+	/* TODO check for permitted ranges */
+	fb_page = xenfb->fb.page;
+	xenfb->pub.depth = fb_page->depth;
+	xenfb->pub.width = fb_page->width;
+	xenfb->pub.height = fb_page->height;
+	/* TODO check for consistency with the above */
+	xenfb->fb_len = fb_page->mem_length;
+	xenfb->pub.row_stride = fb_page->line_length;
+
+	if (oldxenfb_map_fb(xenfb, domid) < 0)
+		goto error;
+
+	event.type = XENFB_TYPE_SET_EVENTS;
+	event.set_events.flags = XENFB_FLAG_UPDATE;
+	if (oldxenfb_fb_event(xenfb, &event))
+		goto error;
+
+	fprintf(stderr, "Old protocol attach complete\n");
+	return 0;
+
+ error:
+	fprintf(stderr, "Old protocol attach failed\n");
+	serrno = errno;
+	oldxenfb_detach_dom(xenfb);
+	oldxenfb_dev_fatal(&xenfb->fb, serrno, "on fire");
+	oldxenfb_dev_fatal(&xenfb->kbd, serrno, "on fire");
+        errno = serrno;
+        return -1;
+}
+
+static void oldxenfb_detach_dom(struct xenfb_private *xenfb)
+{
+	oldxenfb_unbind(&xenfb->fb);
+	oldxenfb_unbind(&xenfb->kbd);
+	if (xenfb->pub.pixels) {
+		munmap(xenfb->pub.pixels, xenfb->fb_len);
+		xenfb->pub.pixels = NULL;
+	}
+}
+
+static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
+{
+	uint32_t prod, cons;
+	struct xenfb_page *page = xenfb->fb.page;
+
+	prod = page->out_prod;
+	if (prod == page->out_cons)
+		return;
+	rmb();			/* ensure we see ring contents up to prod */
+	for (cons = page->out_cons; cons != prod; cons++) {
+		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
+
+		switch (event->type) {
+		case XENFB_TYPE_UPDATE:
+                    if (xenfb->pub.update)
+			xenfb->pub.update(&xenfb->pub,
+					  event->update.x, event->update.y,
+					  event->update.width, event->update.height);
+                    break;
+		}
+	}
+	mb();			/* ensure we're done with ring contents */
+	page->out_cons = cons;
+	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+}
+
+static void oldxenfb_on_kbd_event(struct xenfb_private *xenfb)
+{
+	struct xenkbd_info *page = xenfb->kbd.page;
+
+	/* We don't understand any keyboard events, so just ignore them. */
+	if (page->out_prod == page->out_cons)
+		return;
+	page->out_cons = page->out_prod;
+	xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port);
+}
+
+static int oldxenfb_on_state_change(struct xenfb_device *dev)
+{
+	enum xenbus_state state;
+
+	state = oldxenfb_read_state(dev->xenfb->xsh, dev->otherend);
+
+	switch (state) {
+	case XenbusStateUnknown:
+		/* There was an error reading the frontend state.  The
+		   domain has probably gone away; in any case, there's
+		   not much point in us continuing. */
+		return -1;
+	case XenbusStateInitialising:
+	case XenbusStateInitWait:
+	case XenbusStateInitialised:
+	case XenbusStateConnected:
+		break;
+	case XenbusStateClosing:
+		oldxenfb_unbind(dev);
+		oldxenfb_switch_state(dev, state);
+		break;
+	case XenbusStateClosed:
+		oldxenfb_switch_state(dev, state);
+	}
+	return 0;
+}
+
+
+int oldxenfb_dispatch_channel(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	evtchn_port_t port;
+	port = xc_evtchn_pending(xenfb->evt_xch);
+	if (port == -1)
+		return -1;
+
+	if (port == xenfb->fb.port)
+		oldxenfb_on_fb_event(xenfb);
+	else if (port == xenfb->kbd.port)
+		oldxenfb_on_kbd_event(xenfb);
+
+	if (xc_evtchn_unmask(xenfb->evt_xch, port) == -1)
+		return -1;
+
+	return 0;
+}
+
+int oldxenfb_dispatch_store(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	unsigned dummy;
+	char **vec;
+	int r;
+
+	vec = xs_read_watch(xenfb->xsh, &dummy);
+	free(vec);
+	r = oldxenfb_on_state_change(&xenfb->fb);
+	if (r == 0)
+		r = oldxenfb_on_state_change(&xenfb->kbd);
+	if (r == -1)
+		return -2;
+
+	return 0;
+}
+
+
+static int oldxenfb_fb_event(struct xenfb_private *xenfb,
+			     union xenfb_in_event *event)
+{
+	uint32_t prod;
+	struct xenfb_page *page = xenfb->fb.page;
+
+	prod = page->in_prod;
+	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	mb();			/* ensure ring space available */
+	XENFB_IN_RING_REF(page, prod) = *event;
+	wmb();			/* ensure ring contents visible */
+	page->in_prod = prod + 1;
+	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+}
+
+static int oldxenfb_kbd_event(struct xenfb_private *xenfb,
+			      union xenkbd_in_event *event)
+{
+	uint32_t prod;
+	struct xenkbd_info *page = xenfb->kbd.page;
+
+	prod = page->in_prod;
+	if (prod - page->in_cons == XENKBD_IN_RING_LEN) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	mb();			/* ensure ring space available */
+	XENKBD_IN_RING_REF(page, prod) = *event;
+	wmb();			/* ensure ring contents visible */
+	page->in_prod = prod + 1;
+	return xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port);
+}
+
+int oldxenfb_send_key(struct xenfb *xenfb_pub, bool down, int keycode)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	union xenkbd_in_event event;
+
+	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
+	event.type = XENKBD_TYPE_KEY;
+	event.key.pressed = down ? 1 : 0;
+	event.key.keycode = keycode;
+
+	return oldxenfb_kbd_event(xenfb, &event);
+}
+
+int oldxenfb_send_motion(struct xenfb *xenfb_pub, int rel_x, int rel_y)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	union xenkbd_in_event event;
+
+	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
+	event.type = XENKBD_TYPE_MOTION;
+	event.motion.rel_x = rel_x;
+	event.motion.rel_y = rel_y;
+
+	return oldxenfb_kbd_event(xenfb, &event);
+}
+
+
+int xenfb_using_old_protocol(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+        struct xs_handle *xsh = xenfb->xsh;
+        char buf[64];
+        char *p, *v, **vec;
+        enum xenbus_state state;
+        unsigned dummy;
+        int ret;
+
+        p = oldxenfb_path_in_dom(xsh, buf, sizeof(buf),
+				 xenfb->fb.otherend_id, "vfb/page-ref");
+        if (!xs_watch(xsh, p, ""))
+                return -1;
+
+        for (;;) {
+                state = oldxenfb_read_state(xsh, xenfb->fb.otherend);
+                if (state == XenbusStateUnknown) {
+                        ret = -1;
+                        break;
+                }
+                if (state > XenbusStateInitialising) {
+                        ret = 0; /* frontend talks xenbus protocol */
+                        break;
+                }
+
+                v = xs_read(xsh, XBT_NULL, p, NULL);
+                free(v);
+                if (v) {
+                        ret = 1; /* frontend talks old protocol */
+                        break;
+                }
+
+                vec = xs_read_watch(xsh, &dummy);
+                if (!vec) {
+                        ret = -1;
+                        break;
+                }
+                free(vec);
+        }
+
+        xs_unwatch(xsh, p, "");
+        return ret;
+}
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 13:47:01.000000000 -0400
@@ -0,0 +1,106 @@
+/*
+ * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
+ *
+ * Copyright (C) 2005
+ *
+ *      Anthony Liguori <aliguori at us.ibm.com>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License. See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#ifndef _LINUX_XENFB_H
+#define _LINUX_XENFB_H
+
+#include <asm/types.h>
+
+/* out events */
+
+#define XENFB_OUT_EVENT_SIZE 40
+
+#define XENFB_TYPE_MOTION 1
+#define XENFB_TYPE_UPDATE 2
+
+struct xenfb_motion	    /* currently unused */
+{
+	__u8 type;          /* XENFB_TYPE_MOTION */
+	__u16 x;            /* The new x coordinate */
+	__u16 y;            /* The new y coordinate */
+};
+
+struct xenfb_update
+{
+	__u8 type;          /* XENFB_TYPE_UPDATE */
+	__u16 x;            /* source x */
+	__u16 y;            /* source y */
+	__u16 width;        /* rect width */
+	__u16 height;       /* rect height */
+};
+
+union xenfb_out_event
+{
+	__u8 type;
+	struct xenfb_motion motion;
+	struct xenfb_update update;
+	char _[XENFB_OUT_EVENT_SIZE];
+};
+
+/* in events */
+
+#define XENFB_IN_EVENT_SIZE 40
+
+#define XENFB_TYPE_SET_EVENTS 1
+
+#define XENFB_FLAG_MOTION 1
+#define XENFB_FLAG_UPDATE 2
+#define XENFB_FLAG_COPY 4
+#define XENFB_FLAG_FILL 8
+
+struct xenfb_set_events
+{
+	__u8 type;          /* XENFB_TYPE_SET_EVENTS */
+	__u32 flags;        /* combination of XENFB_FLAG_* */
+};
+
+union xenfb_in_event
+{
+	__u8 type;
+	struct xenfb_set_events set_events;
+	char _[XENFB_OUT_EVENT_SIZE];
+};
+
+/* shared page */
+
+#define XENFB_IN_RING_SIZE 1024
+#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE)
+#define XENFB_IN_RING_OFFS 1024
+#define XENFB_IN_RING(page) \
+    ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS))
+#define XENFB_IN_RING_REF(page, idx) \
+    (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN])
+
+#define XENFB_OUT_RING_SIZE 2048
+#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE)
+#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE)
+#define XENFB_OUT_RING(page) \
+    ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS))
+#define XENFB_OUT_RING_REF(page, idx) \
+    (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN])
+
+struct xenfb_page
+{
+	__u16 width;         /* the width of the framebuffer (in pixels) */
+	__u16 height;        /* the height of the framebuffer (in pixels) */
+	__u32 line_length;   /* the length of a row of pixels (in bytes) */
+	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
+	__u8 depth;          /* the depth of a pixel (in bits) */
+
+	unsigned long pd[2];	/* FIXME rename to pgdir? */
+	/* FIXME pd[1] unused at this time, shrink? */
+
+	__u32 in_cons, in_prod;
+	__u32 out_cons, out_prod;
+};
+
+#endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 13:47:01.000000000 -0400
@@ -0,0 +1,92 @@
+/*
+ * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
+ *
+ * Copyright (C) 2005
+ *
+ *      Anthony Liguori <aliguori at us.ibm.com>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License. See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#ifndef _LINUX_XENKBD_H
+#define _LINUX_XENKBD_H
+
+#include <asm/types.h>
+
+/* in events */
+
+#define XENKBD_IN_EVENT_SIZE 40
+
+#define XENKBD_TYPE_MOTION  1     /* mouse movement event */
+#define XENKBD_TYPE_BUTTON  2     /* mouse button event */
+#define XENKBD_TYPE_KEY     3     /* keyboard event */
+
+struct xenkbd_motion
+{
+	__u8 type;         /* XENKBD_TYPE_MOTION */
+	__s16 rel_x;       /* relative X motion */
+	__s16 rel_y;       /* relative Y motion */
+};
+
+struct xenkbd_button
+{
+	__u8 type;         /* XENKBD_TYPE_BUTTON */
+	__u8 pressed;      /* 1 if pressed; 0 otherwise */
+	__u8 button;       /* the button (0, 1, 2 is right, middle, left) */
+};
+
+struct xenkbd_key
+{
+	__u8 type;         /* XENKBD_TYPE_KEY */
+	__u8 pressed;      /* 1 if pressed; 0 otherwise */
+	__u16 keycode;     /* KEY_* from linux/input.h */
+};
+
+union xenkbd_in_event
+{
+	__u8 type;
+	struct xenkbd_motion motion;
+	struct xenkbd_button button;
+	struct xenkbd_key key;
+	char _[XENKBD_IN_EVENT_SIZE];
+};
+
+/* out events */
+
+#define XENKBD_OUT_EVENT_SIZE 40
+
+union xenkbd_out_event
+{
+	__u8 type;
+	char _[XENKBD_OUT_EVENT_SIZE];
+};
+
+/* shared page */
+
+#define XENKBD_IN_RING_SIZE 2048
+#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE)
+#define XENKBD_IN_RING_OFFS 1024
+#define XENKBD_IN_RING(page) \
+    ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS))
+#define XENKBD_IN_RING_REF(page, idx) \
+    (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN])
+
+#define XENKBD_OUT_RING_SIZE 1024
+#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE)
+#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE)
+#define XENKBD_OUT_RING(page) \
+    ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS))
+#define XENKBD_OUT_RING_REF(page, idx) \
+    (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN])
+
+struct xenkbd_info
+{
+	__u32 in_cons, in_prod;
+	__u32 out_cons, out_prod;
+};
+
+void xenkbd_resume(void);
+
+#endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 13:44:38.000000000 -0400
@@ -41,6 +41,7 @@ struct xenfb_private {
 	struct xenfb_device fb, kbd;
 	size_t fb_len;		/* size of framebuffer */
 	char protocol[64];	/* frontend protocol */
+	int oldprotocol;        /* Legacy FC6 compat */
 };
 
 static void xenfb_detach_dom(struct xenfb_private *);
@@ -545,6 +546,15 @@ int xenfb_attach_dom(struct xenfb *xenfb
 	if (!xs_watch(xsh, xenfb->kbd.otherend, ""))
 		goto error;
 
+	/* !!! FC-5/6 guest compatability - not upstream !!! */
+	if (xenfb_using_old_protocol(xenfb_pub)) {
+		fprintf(stderr, "Switching to old protocol\n");
+		xenfb->oldprotocol = 1;
+		return oldxenfb_attach_dom(xenfb_pub, domid);
+	} else {
+		fprintf(stderr, "Sticking to new protocol\n");
+	}
+
 	if (xenfb_wait_for_frontend_initialised(&xenfb->fb) < 0)
 		goto error;
 	if (xenfb_wait_for_frontend_initialised(&xenfb->kbd) < 0)
@@ -680,6 +690,10 @@ int xenfb_dispatch_channel(struct xenfb 
 {
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	evtchn_port_t port;
+
+	if (xenfb->oldprotocol)
+		return oldxenfb_dispatch_channel(xenfb_pub);
+
 	port = xc_evtchn_pending(xenfb->evt_xch);
 	if (port == -1)
 		return -1;
@@ -702,6 +716,9 @@ int xenfb_dispatch_store(struct xenfb *x
 	char **vec;
 	int r;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_dispatch_store(xenfb_pub);
+
 	vec = xs_read_watch(xenfb->xsh, &dummy);
 	free(vec);
 	r = xenfb_on_state_change(&xenfb->fb);
@@ -783,6 +800,9 @@ int xenfb_send_key(struct xenfb *xenfb_p
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_send_key(xenfb_pub, down, keycode);
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_KEY;
 	event.key.pressed = down ? 1 : 0;
@@ -796,6 +816,9 @@ int xenfb_send_motion(struct xenfb *xenf
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_send_motion(xenfb_pub, rel_x, rel_y);
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_MOTION;
 	event.motion.rel_x = rel_x;
@@ -809,6 +832,9 @@ int xenfb_send_position(struct xenfb *xe
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return -1;
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_POS;
 	event.pos.abs_x = abs_x;
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 13:47:37.000000000 -0400
@@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
 int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
 int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
 
+/* Detect if using old FC5/6 guest protocol */
+int xenfb_using_old_protocol(struct xenfb *xenfb_pub);
+
+/* Pass-through legacy handlers */
+int oldxenfb_attach_dom(struct xenfb *xenfb, int domid);
+
+int oldxenfb_dispatch_store(struct xenfb *xenfb_pub);
+int oldxenfb_dispatch_channel(struct xenfb *xenfb_pub);
+
+int oldxenfb_send_key(struct xenfb *xenfb, bool down, int keycode);
+int oldxenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
+int oldxenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
+
+
 #endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:48:04.000000000 -0400
@@ -371,7 +376,7 @@ VL_OBJS+= xenstore.o
 VL_OBJS+= xen_platform.o
 VL_OBJS+= xen_machine_fv.o
 VL_OBJS+= xen_machine_pv.o
-VL_OBJS+= xenfb.o
+VL_OBJS+= xenfb.o oldxenfb.o
 VL_OBJS+= tpm_tis.o
 DEFINES += -DHAS_AUDIO
 endif
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:48:59.000000000 -0400
@@ -53,7 +53,11 @@ class VfbifController(DevController):
         if self.vm.info.is_hvm():
             # is HVM, so qemu-dm will handle the vfb.
             return
-        
+
+        # old frontend compatibility
+        self.vm._writeDom("console/use_graphics", "1")
+        # /old
+
         args = [ xen.util.auxbin.pathTo("qemu-dm"),
                  "-M", "xenpv",
                  "-d", "%d" % self.vm.getDomid(),
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 13:49:27.000000000 -0400
@@ -690,7 +690,7 @@ class XendConfig(dict):
         self['vtpm_refs'] = cfg.get('vtpm_refs', [])
 
         # coalesce hvm vnc frame buffer with vfb config
-        if self.is_hvm() and int(self['platform'].get('vnc', 0)) != 0:
+        if int(self['platform'].get('vnc', 0)) != 0:
             # add vfb device if it isn't there already
             has_rfb = False
             for console_uuid in self['console_refs']:
@@ -705,7 +705,7 @@ class XendConfig(dict):
                 dev_config = ['vfb']
                 # copy VNC related params from platform config to vfb dev conf
                 for key in ['vncpasswd', 'vncunused', 'vncdisplay',
-                            'vnclisten']:
+                            'vnclisten', 'keymap']:
                     if key in self['platform']:
                         dev_config.append([key, self['platform'][key]])
 
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
--- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 13:49:55.000000000 -0400
@@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
             d['type'] = 'sdl'
         for (k,v) in d.iteritems():
             if not k in [ 'vnclisten', 'vncunused', 'vncdisplay', 'display',
-                          'xauthority', 'type', 'vncpasswd' ]:
+                          'xauthority', 'type', 'vncpasswd', 'keymap' ]:
                 err("configuration option %s unknown to vfbs" % k)
             config.append([k,v])
         if not d.has_key("keymap"):


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- xen.spec	19 Sep 2007 20:26:16 -0000	1.184
+++ xen.spec	24 Sep 2007 20:51:43 -0000	1.185
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -34,20 +34,15 @@
 Patch102: xen-3.0.2-config-allow-unix-server.patch
 Patch103: xen-3.0.2-config-disable-reloc.patch
 
-# Hack to support guest kernels using old PVFB protocol
-# from FC5/6 days. Can kill off once FC6 is EOL'd
-Patch150: xen-pvfb-compat.patch
-Patch151: xen-pvfb-terminate.patch
-Patch152: xen-pvfb-no-hvm.patch
-
 Patch160: xen-pvfb-01-qemu-fv-machine.patch
 Patch161: xen-pvfb-02-qemu-pv-machine.patch
 Patch162: xen-pvfb-03-xenfb-remove.patch
+Patch163: xen-pvfb-04-compat.patch
 
-Patch163: xen-qemu-vnc-revert-password.patch
+Patch164: xen-qemu-vnc-revert-password.patch
 
-Patch164: xen-qemu-iohandler-delete.patch
-Patch165: xen-qemu-vnc-authentication.patch
+Patch165: xen-qemu-iohandler-delete.patch
+Patch166: xen-qemu-vnc-authentication.patch
 
 Patch251: pygrub-manykernels.patch
 
@@ -137,23 +132,18 @@
 %patch102 -p1
 %patch103 -p1
 
-# pvfb compat
-# XXX re-instate this somehow ??!?!
-#patch150 -p1
-#patch151 -p1
-#patch152 -p1
-
 # Switch to QEMU for paravirt VNC server
 %patch160 -p1
 %patch161 -p1
 %patch162 -p1
+%patch163 -p1
 
 # Remove old VNC password code
-%patch163 -p1
+%patch164 -p1
 
 # Add new TLS code
-%patch164 -p1
 %patch165 -p1
+%patch166 -p1
 
 # upstream patches
 %patch251 -p1
@@ -281,6 +271,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
+- Re-add support for back-compat FC6 PVFB support
+- Fix handling of explicit port numbers (rhbz #279581)
+
 * Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-6.fc8
 - Don't clobber the VIF type attribute in FV guests (rhbz #296061)
 


--- xen-pvfb-compat.patch DELETED ---


--- xen-pvfb-no-hvm.patch DELETED ---


--- xen-pvfb-terminate.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 20:52:28 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Mon, 24 Sep 2007 16:52:28 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.6,
	1.7 java-1.7.0-icedtea.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200709242052.l8OKqS50031334@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30794

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Added JTreg zip as source
- Run JTreg tests after build for smoke testing.
- Added Xvfb as build requirement.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Sep 2007 20:15:25 -0000	1.6
+++ .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
+jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.7.0-icedtea.spec	21 Sep 2007 20:10:50 -0000	1.5
+++ java-1.7.0-icedtea.spec	24 Sep 2007 20:51:55 -0000	1.6
@@ -20,6 +20,7 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
+%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -113,6 +114,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -146,6 +148,8 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
+# jtreg testing requirements.
+BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -264,6 +268,7 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
+%setup -q -n icedtea-%{icedteaver} -T -D -a 8
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -294,10 +299,20 @@
 pushd mauve-%{mauvedate}
   ./configure 
   make
-  echo ====================TESTING========================
+  echo ====================MAUVE TESTING========================
   $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
-  echo ====================TESTING END====================
+  echo ====================MAUVE TESTING END====================
+popd
+pushd jtreg
+  echo ====================JTREG TESTING========================
+  Xvfb :1 -screen 1 1280x1024x24 -ac -terminate &
+  export DISPLAY=:1.1
+  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
+	$(pwd)/../openjdk/j2se/test/ 2>&1
+  killall -9 Xvfb
+  export DISPLAY=:0.0
+  echo ====================JTREG TESTING END====================
 popd
 
 %install
@@ -728,6 +743,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Added JTreg zip as source
+- Run JTreg tests after build for smoke testing.
+- Added Xvfb as build requirement.
+
 * Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2007 20:13:00 -0000	1.5
+++ sources	24 Sep 2007 20:51:55 -0000	1.6
@@ -3,3 +3,4 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:32 -0400
Subject: rpms/quarry/F-7 quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrW1a032284@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/F-7

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/F-7/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:17:55 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:52:59 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:34 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:34 -0400
Subject: rpms/quarry/FC-6 quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrYog032320@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/FC-6

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:17:58 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:53:02 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:37 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:37 -0400
Subject: rpms/quarry/devel quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrbJu032366@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/devel

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:18:00 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:53:05 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:59:20 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Mon, 24 Sep 2007 16:59:20 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.74, 1.75 setroubleshoot.init,
	1.11, 1.12 setroubleshoot.spec, 1.89, 1.90 sources, 1.85, 1.86
Message-ID: <200709242059.l8OKxKt1001104@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv980/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	8 Sep 2007 21:11:06 -0000	1.74
+++ .cvsignore	24 Sep 2007 20:58:48 -0000	1.75
@@ -1 +1 @@
-setroubleshoot-1.10.4.tar.gz
+setroubleshoot-1.10.5.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setroubleshoot.init	8 Sep 2007 21:11:06 -0000	1.11
+++ setroubleshoot.init	24 Sep 2007 20:58:48 -0000	1.12
@@ -71,6 +71,9 @@
     if test $RETVAL = 0 ; then
         touch /var/lock/subsys/$prog
     fi
+    if test $RETVAL = 3 ; then
+	echo -n $"Cannot start $prog: SELinux not enabled"
+    fi
     return $RETVAL
 }
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- setroubleshoot.spec	8 Sep 2007 21:11:06 -0000	1.89
+++ setroubleshoot.spec	24 Sep 2007 20:58:48 -0000	1.90
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.4
+Version: 1.10.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -25,6 +25,7 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
+Requires: selinux-policy-base >= 3.0.7-10
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -171,6 +172,74 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.5-1
+	- update code for command line log file scanning to work with
+	  new log file scanning code introduced for the browser.
+
+	- update Bulgarian translation (Doncho N. Gunchev (gunchev at gmail.com))
+
+	- update Polish translation (Piotr Dr??g (raven at pmail.pl))
+
+	- Resolves bug #239893: sealert wakes up very often
+	  This was caused by the use of threads and pygtk's thread signal
+	  handling.  The only use of threads in sealert was for log file
+	  scanning so that the UI would remain responsive during a
+	  scan. Threads in sealert have now been completely
+	  removed. Instead the scanning work is performed in a gobject idle
+	  function called from the main loop. The idle function is written
+	  as a python generator function which allows for the function to
+	  perform a small amount of work, save it's execution state and
+	  return. The next time the idle function is called from the main
+	  loop it resumes execution from it's last state until it decides
+	  to yield control again. This way the long running scan/analysis
+	  can be performed in small successive units of work during the
+	  time the application is otherwise idle and it does not interfere
+	  with the rest of the GUI event processing. Everything now occurs
+	  in an event loop, think of it as the applications process/thread
+	  scheduler whose event handlers execute time slices.
+
+	- rewrote parts of the audit input pipeline to use generators
+	  instead of callbacks, thus permitting the logfile scanning code
+	  to yield control with more granularity. Also updated
+	  test_setroubleshootd and audisp_listen to use the new
+	  generator/yield logic.
+
+	- rewrote the dialog used for scanning log files, progress bar
+	  updates are now in the dialog, the scan can be terminated part
+	  way through, errors from the scan are reported in pop-up dialog,
+	  one can only dismiss the dialog with success if the scan had
+	  been successfully run to completion, otherwise the user is only
+	  left with the option to cancel.
+
+	- Relates bug #252035  bug #247469, setroubleshootd and sealert should
+	  exit if SELinux is disabled.
+
+	- add utility functions escape_html() and unescape_html()
+
+	- fix initial sort order in browser, track sort order in browser
+
+	- modify AVC.get_path() to only return a value if the 'path' field is
+	  set, formerly it also considered the fields 'name' & 'file' which were
+	  incorrect. get_path() now also looks to see if the string begins with a
+	  slash for a fully qualified path, if not it looks to see if its a 
+	  pseudo path such as 'pipe[12345]' or 'socket[12345]' and if so strips out
+	  the instance information inside the brackets and returns just the type of 
+	  the pseudo path. This is done because we do not want path information
+	  in the signature to be unique for each instance of the denial.
+
+	- modify the TimeStamp class to hide it's internal datetime member,
+	  remove the cmp() method, the internal __cmp__ will be automatically invoked.
+
+	- require selinux policy version in spec file to allow system dbus use
+	
+	- Resolves bug #256601: audit2allow generates incorrect syntax when comma "," in
+	  denied list
+
+	- update po i18n files
+
+	- Add support for pruning database by age and size
+
+
 * Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
 	- fix init script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	8 Sep 2007 21:11:06 -0000	1.85
+++ sources	24 Sep 2007 20:58:48 -0000	1.86
@@ -1 +1 @@
-68c3d6d05d5273dd042e792f24ef09f2  setroubleshoot-1.10.4.tar.gz
+067293ed2a6bdfdb2bb8e03185736065  setroubleshoot-1.10.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:02:00 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 17:02:00 -0400
Subject: fedora-security/audit fc7,1.119,1.120
Message-ID: <200709242102.l8OL20Yn007507@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1187

Modified Files:
	fc7 
Log Message:
CVE for something, I forgot for what.
Most likely it was for balsa or something like that.



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc7	24 Sep 2007 13:57:58 -0000	1.119
+++ fc7	24 Sep 2007 21:01:58 -0000	1.120
@@ -11,7 +11,7 @@
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
-GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
+CVE-2007-5007 VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 CVE-2007-4974 VULNERABLE (libsndfile) #296221



From fedora-extras-commits at redhat.com  Mon Sep 24 21:04:40 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Mon, 24 Sep 2007 17:04:40 -0400
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.3,
	1.4 setroubleshoot-plugins.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709242104.l8OL4eoq007810@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/devel

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Sep 2007 21:21:59 -0000	1.3
+++ .cvsignore	24 Sep 2007 21:04:08 -0000	1.4
@@ -1 +1 @@
-setroubleshoot-plugins-1.10.2.tar.gz
+setroubleshoot-plugins-1.10.3.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setroubleshoot-plugins.spec	6 Sep 2007 21:21:59 -0000	1.2
+++ setroubleshoot-plugins.spec	24 Sep 2007 21:04:08 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 1.10.2
+Version: 1.10.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -50,6 +50,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- Resolves bug #231762: Original PO strings bugs
+
 * Thu Sep  6 2007 Dan Walsh <dwalsh at redhat.com> - 1.10.2-1
 	- Change priority on use_nfs_home_dir to 55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Sep 2007 21:21:59 -0000	1.3
+++ sources	24 Sep 2007 21:04:08 -0000	1.4
@@ -1 +1 @@
-acb5d5e49bbf237916ade9e2f9c91373  setroubleshoot-plugins-1.10.2.tar.gz
+9ed80b21f03e4909ecadc6c6d112ce8d  setroubleshoot-plugins-1.10.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:08:53 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:08:53 -0400
Subject: rpms/kudzu/devel kudzu.spec,1.177,1.178
Message-ID: <200709242108.l8OL8raw008091@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8038

Modified Files:
	kudzu.spec 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
- BuildRequires: popt-devel popt-static



Index: kudzu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kudzu.spec	6 Sep 2007 20:56:17 -0000	1.177
+++ kudzu.spec	24 Sep 2007 21:08:20 -0000	1.178
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.75
-Release: 1
+Release: 2
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -11,6 +11,7 @@
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
 BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel
+BuildRequires: popt-devel popt-static
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -72,6 +73,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
+- BuildRequires: popt-devel popt-static
+
 * Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
 - Add pcidom to the exported slot list of pciDevice.
 - Add clog target to Makefile.



From fedora-extras-commits at redhat.com  Mon Sep 24 21:09:05 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 17:09:05 -0400
Subject: rpms/clanbomber/devel clanbomber.desktop, 1.3, 1.4 clanbomber.spec, 
	1.6, 1.7
Message-ID: <200709242109.l8OL95JR008131@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8059

Modified Files:
	clanbomber.desktop clanbomber.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-7
- Revert last change, clanbomber does not use OpenGL (oops)



Index: clanbomber.desktop
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clanbomber.desktop	24 Sep 2007 20:45:04 -0000	1.3
+++ clanbomber.desktop	24 Sep 2007 21:08:33 -0000	1.4
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ClanBomber
 Comment=Bomberman-like multiplayer game
-Exec=clanbomber-wrapper
+Exec=clanbomber
 Icon=clanbomber.png
 Terminal=false
 StartupNotify=false


Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clanbomber.spec	24 Sep 2007 20:45:04 -0000	1.6
+++ clanbomber.spec	24 Sep 2007 21:08:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Bomberman-like multiplayer game that uses ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 Patch1:         clanbomber-1.05-namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib06-devel zlib-devel desktop-file-utils
-Requires:       hicolor-icon-theme opengl-games-utils
+Requires:       hicolor-icon-theme
 
 %description
 ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib,
@@ -37,7 +37,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -69,13 +68,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog IDEAS QUOTES README
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-7
+- Revert last change, clanbomber does not use OpenGL (oops)
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:13:19 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 17:13:19 -0400
Subject: rpms/antlr/devel antlr.spec,1.34,1.35
Message-ID: <200709242113.l8OLDJ1g008381@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/antlr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352

Modified Files:
	antlr.spec 
Log Message:

- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC




Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- antlr.spec	29 Aug 2007 18:44:19 -0000	1.34
+++ antlr.spec	24 Sep 2007 21:12:47 -0000	1.35
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.5%{?dist}
+Release:        1jpp.6%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -155,23 +155,7 @@
 cp work/lib/antlr.jar .  # make expects to find it here
 export CLASSPATH=.
 %configure --without-examples
-make
-
-pushd lib/cpp/src/
-    mkdir temp_holder_for_nonpic
-    mv libantlr.a temp_holder_for_nonpic/
-    make clean
-
-    # Compile with PIC
-    make CXXFLAGS="${CXXFLAGS} -fPIC"
-
-    # Move files out
-    mv libantlr.a libantlr-pic.a 
-    mv temp_holder_for_nonpic/libantlr.a .
-
-    # Cleanup temp dir
-    rmdir temp_holder_for_nonpic
-popd
+make CXXFLAGS="${CXXFLAGS} -fPIC"
 
 find . -type f > /tmp/antlr.filelist
 rm antlr.jar             # no longer needed
@@ -203,7 +187,6 @@
 mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
 install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
 install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 
 # javadoc
@@ -299,7 +282,6 @@
 %{_javadir}/%{name}*.jar
 %{headers}
 %{_libdir}/libantlr.a
-%{_libdir}/libantlr-pic.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-config
@@ -327,6 +309,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.6
+- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.7-1jpp.5
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:16:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 14:16:17 -0700
Subject: [pkgdb] libflashsupport was added for wtogami
Message-ID: <200709242116.l8OLGHm7016414@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package libflashsupport with summary Optional Library Interfaces for Adobe Flash Player
Warren Togami (wtogami) has approved Package libflashsupport
Warren Togami (wtogami) has added a Fedora devel branch for libflashsupport with an owner of wtogami
Warren Togami (wtogami) has approved libflashsupport in Fedora devel
Warren Togami (wtogami) has approved Package libflashsupport
Warren Togami (wtogami) has set commit to Approved for cvsextras on libflashsupport (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on libflashsupport (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on libflashsupport (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libflashsupport



From fedora-extras-commits at redhat.com  Mon Sep 24 21:20:58 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 17:20:58 -0400
Subject: rpms/antlr/F-7 antlr.spec,1.32,1.33
Message-ID: <200709242120.l8OLKwej009370@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/antlr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9317

Modified Files:
	antlr.spec 
Log Message:

 - Sync with copy from F8 (only bug fixes):
   - Applied patch to fix conditionals (from skasal at redhat dot com)
   - Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC





Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/F-7/antlr.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- antlr.spec	12 Jun 2007 20:06:30 -0000	1.32
+++ antlr.spec	24 Sep 2007 21:20:26 -0000	1.33
@@ -31,15 +31,15 @@
 %define _with_gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
+%define build_jedit  %{?_with_jedit:1}%{!?_with_jedit:0}
 
 %define section free
-%define native  %{?_with_native:1}%{!?_without_native:0}
+%define native  %{?_with_native:1}%{!?_with_native:0}
 
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.3%{?dist}.1
+Release:        1jpp.3%{?dist}.2
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -155,23 +155,7 @@
 cp work/lib/antlr.jar .  # make expects to find it here
 export CLASSPATH=.
 %configure --without-examples
-make 
-
-pushd lib/cpp/src/
-    mkdir temp_holder_for_nonpic
-    mv libantlr.a temp_holder_for_nonpic/
-    make clean
-
-    # Compile with PIC
-    make CXXFLAGS="${CXXFLAGS} -fPIC"
-
-    # Move files out
-    mv libantlr.a libantlr-pic.a 
-    mv temp_holder_for_nonpic/libantlr.a .
-
-    # Cleanup temp dir
-    rmdir temp_holder_for_nonpic
-popd
+make CXXFLAGS="${CXXFLAGS} -fPIC"
 
 find . -type f > /tmp/antlr.filelist
 rm antlr.jar             # no longer needed
@@ -203,7 +187,6 @@
 mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
 install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
 install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 
 # javadoc
@@ -299,7 +282,6 @@
 %{_javadir}/%{name}*.jar
 %{headers}
 %{_libdir}/libantlr.a
-%{_libdir}/libantlr-pic.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-config
@@ -327,6 +309,11 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.2
+- Sync with copy from F8 (only bug fixes):
+  - Applied patch to fix conditionals (from skasal at redhat dot com)
+  - Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
 * Tue Jun 12 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.1
 - Added a PIC compiled archive (bz# 242305)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:29 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:29 -0400
Subject: rpms/libflashsupport - New directory
Message-ID: <200709242122.l8OLMTXg009620@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport

Log Message:
Directory /cvs/extras/rpms/libflashsupport added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:34 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:34 -0400
Subject: rpms/libflashsupport/devel - New directory
Message-ID: <200709242122.l8OLMYnP009640@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport/devel

Log Message:
Directory /cvs/extras/rpms/libflashsupport/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:36 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:36 -0400
Subject: rpms/libflashsupport Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709242122.l8OLMaAH009665@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport

Added Files:
	Makefile import.log 
Log Message:
Setup of module libflashsupport


--- NEW FILE Makefile ---
# Top level Makefile for module libflashsupport
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:38 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:38 -0400
Subject: rpms/libflashsupport/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709242122.l8OLMcHa009681@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libflashsupport


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libflashsupport
# $Id: Makefile,v 1.1 2007/09/24 21:22:36 wtogami Exp $
NAME := libflashsupport
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 fedora-extras-commits at redhat.com  Mon Sep 24 21:32:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:32:17 -0400
Subject: rpms/libflashsupport/devel libflashsupport.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242132.l8OLWHVl010923@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10705/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libflashsupport.spec 
Log Message:
import




--- NEW FILE libflashsupport.spec ---
Name:		libflashsupport
Summary: 	Optional Library Interfaces for Adobe Flash Player
Version:	000
Release:	0.1.svn20070904
License:	BSD
Group:		Applications/Internet
Source0:	libflashsupport-pulse-000.svn20070904.tar.gz
URL:		http://pulseaudio.org
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtool
BuildRequires:	pulseaudio-lib-devel
BuildRequires:  openssl-devel

%description
Optional Library Interfaces for Adobe Flash Player
- pulseaudio
- OpenSSL

If more interfaces are desired, please suggest patches in Fedora Bugzilla.

%prep
%setup -q -n libflashsupport-pulse-000

%build
%configure --disable-rpath
make LIBTOOL=/usr/bin/libtool

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/libflashsupport.so

%changelog
* Mon Sep 24 2007 Warren Togami <wtogami at redhat.com> 000-0.1.svn20070904
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libflashsupport/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 21:22:36 -0000	1.1
+++ .cvsignore	24 Sep 2007 21:31:44 -0000	1.2
@@ -0,0 +1 @@
+libflashsupport-pulse-000.svn20070904.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libflashsupport/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 21:22:36 -0000	1.1
+++ sources	24 Sep 2007 21:31:44 -0000	1.2
@@ -0,0 +1 @@
+07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:32:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 17:32:47 -0400
Subject: rpms/dbus-glib/F-7 dbus-glib-proxy-signals-once.patch, NONE,
	1.1 dbus-glib.spec, 1.15, 1.16
Message-ID: <200709242132.l8OLWlMd011206@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10911

Modified Files:
	dbus-glib.spec 
Added Files:
	dbus-glib-proxy-signals-once.patch 
Log Message:
* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-3
- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)



dbus-glib-proxy-signals-once.patch:

--- NEW FILE dbus-glib-proxy-signals-once.patch ---
diff -up dbus-glib-0.73/dbus/dbus-gproxy.c.foo dbus-glib-0.73/dbus/dbus-gproxy.c
--- dbus-glib-0.73/dbus/dbus-gproxy.c.foo	2007-02-08 20:59:39.000000000 -0500
+++ dbus-glib-0.73/dbus/dbus-gproxy.c	2007-09-24 14:54:39.000000000 -0400
@@ -1232,8 +1235,15 @@ dbus_g_proxy_manager_filter (DBusConnect
 						  dbus_message_get_interface (message));
 
 	      owner_list = g_hash_table_lookup (manager->proxy_lists, tri);
-	      if (owner_list != NULL)
-		full_list = g_slist_concat (full_list, g_slist_copy (owner_list->proxies));
+	      if (owner_list != NULL) {
+	        GSList *elt;
+
+	        /* Ignore duplicates when adding to full_list */
+	        for (elt = owner_list->proxies; elt; elt = g_slist_next (elt)) {
+	          if (!g_slist_find (full_list, elt->data))
+	            full_list = g_slist_append (full_list, elt->data);
+	        }
+	      }
 	      g_free (tri);
 	    }
 	}



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/F-7/dbus-glib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbus-glib.spec	2 Aug 2007 02:33:40 -0000	1.15
+++ dbus-glib.spec	24 Sep 2007 21:32:14 -0000	1.16
@@ -8,11 +8,12 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
 Patch0: broken-xml.patch
+Patch1: dbus-glib-proxy-signals-once.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +60,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .broken-xml
+%patch1 -p1 -b .proxy-signals-once
 
 %build
 
@@ -114,6 +116,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-3
+- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-2
 - Fix a problem with introspection (#248150)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:38:05 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 17:38:05 -0400
Subject: rpms/fmtools/F-7 fmtools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709242138.l8OLc5EH012568@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12381

Modified Files:
	sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import for F-7



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	24 Sep 2007 21:37:33 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:39:35 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 17:39:35 -0400
Subject: rpms/dbus-glib/devel dbus-glib-proxy-signals-once.patch, NONE,
	1.1 dbus-glib.spec, 1.16, 1.17
Message-ID: <200709242139.l8OLdZXi012962@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12936

Modified Files:
	dbus-glib.spec 
Added Files:
	dbus-glib-proxy-signals-once.patch 
Log Message:
* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-4
- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)



dbus-glib-proxy-signals-once.patch:

--- NEW FILE dbus-glib-proxy-signals-once.patch ---
diff -up dbus-glib-0.73/dbus/dbus-gproxy.c.foo dbus-glib-0.73/dbus/dbus-gproxy.c
--- dbus-glib-0.73/dbus/dbus-gproxy.c.foo	2007-02-08 20:59:39.000000000 -0500
+++ dbus-glib-0.73/dbus/dbus-gproxy.c	2007-09-24 14:54:39.000000000 -0400
@@ -1232,8 +1235,15 @@ dbus_g_proxy_manager_filter (DBusConnect
 						  dbus_message_get_interface (message));
 
 	      owner_list = g_hash_table_lookup (manager->proxy_lists, tri);
-	      if (owner_list != NULL)
-		full_list = g_slist_concat (full_list, g_slist_copy (owner_list->proxies));
+	      if (owner_list != NULL) {
+	        GSList *elt;
+
+	        /* Ignore duplicates when adding to full_list */
+	        for (elt = owner_list->proxies; elt; elt = g_slist_next (elt)) {
+	          if (!g_slist_find (full_list, elt->data))
+	            full_list = g_slist_append (full_list, elt->data);
+	        }
+	      }
 	      g_free (tri);
 	    }
 	}



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dbus-glib.spec	16 Sep 2007 00:52:20 -0000	1.16
+++ dbus-glib.spec	24 Sep 2007 21:39:02 -0000	1.17
@@ -8,11 +8,12 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
 Patch0: broken-xml.patch
+Patch1: dbus-glib-proxy-signals-once.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +115,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-4
+- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)
+
 * Sat Sep 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-3
 - Rebuild against new expat
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:45:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 17:45:00 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.34,1.35
Message-ID: <200709242145.l8OLj0ZQ014628@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14593

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.7-57.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- em8300-kmod.spec	13 Sep 2007 06:05:09 -0000	1.34
+++ em8300-kmod.spec	24 Sep 2007 21:44:28 -0000	1.35
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-49.fc6}
+%{!?kversion: %define kversion 2.6.22.7-57.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.7-57.fc6.
+
 * Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.5-49.fc6.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:47:23 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:47:23 -0400
Subject: rpms/xorg-x11-drv-voodoo import.log,1.1,1.2
Message-ID: <200709242147.l8OLlNZ6015166@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	import.log 
Log Message:
voodoo 1.1.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:26 -0000	1.1
+++ import.log	24 Sep 2007 21:46:51 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-voodoo-1_1_1-1_fc8:HEAD:xorg-x11-drv-voodoo-1.1.1-1.fc8.src.rpm:1190669483



From fedora-extras-commits at redhat.com  Mon Sep 24 21:47:27 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:47:27 -0400
Subject: rpms/xorg-x11-drv-voodoo/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-voodoo.spec, 1.16, 1.17
Message-ID: <200709242147.l8OLlRLc015173@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-voodoo.spec 
Log Message:
voodoo 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:28:26 -0000	1.7
+++ .cvsignore	24 Sep 2007 21:46:54 -0000	1.8
@@ -1 +1 @@
-xf86-video-voodoo-1.1.0.tar.bz2
+xf86-video-voodoo-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:28:26 -0000	1.7
+++ sources	24 Sep 2007 21:46:54 -0000	1.8
@@ -1 +1 @@
-798c9bf902eff5ea70f047e7e056317b  xf86-video-voodoo-1.1.0.tar.bz2
+bc878e795688b49a595b355482d27174  xf86-video-voodoo-1.1.1.tar.bz2


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-voodoo.spec	23 Aug 2007 18:45:03 -0000	1.16
+++ xorg-x11-drv-voodoo.spec	24 Sep 2007 21:46:54 -0000	1.17
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
-Version:   1.1.0
-Release:   6%{?dist}
+Version:   1.1.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.1-1
+- xf86-video-voodoo 1.1.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-6
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:54:11 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 17:54:11 -0400
Subject: rpms/xen/F-7 xen-vmxassist-irqs.patch, NONE, 1.1 xen.spec, 1.182,
	1.183
Message-ID: <200709242154.l8OLsB68015896@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15873

Modified Files:
	xen.spec 
Added Files:
	xen-vmxassist-irqs.patch 
Log Message:
Added dep on xen-hypervisor-abi=3.1. Fix vmxassist bug
Resolves: rhbz #247122

xen-vmxassist-irqs.patch:

--- NEW FILE xen-vmxassist-irqs.patch ---
changeset:   15239:656b8175f4f2
user:        kfraser at localhost.localdomain
date:        Fri Jun 08 11:19:55 2007 +0100
files:       tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vm86.h xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/hvm/vpic.c xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/public/hvm/vmx_assist.h
description:
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>


diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.c	Fri Jun 08 11:19:55 2007 +0100
@@ -927,6 +927,7 @@ load_or_clear_seg(unsigned long sel, uin
 		load_seg(0, base, limit, arbytes);
 }
 
+static unsigned char rm_irqbase[2];
 
 /*
  * Transition to protected mode
@@ -935,6 +936,9 @@ protected_mode(struct regs *regs)
 protected_mode(struct regs *regs)
 {
 	extern char stack_top[];
+
+	oldctx.rm_irqbase[0] = rm_irqbase[0];
+	oldctx.rm_irqbase[1] = rm_irqbase[1];
 
 	regs->eflags &= ~(EFLAGS_TF|EFLAGS_VM);
 
@@ -1187,6 +1191,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[0] = 0;
 			printf("Remapping master: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER);
+			rm_irqbase[0] = al;
 			al = NR_EXCEPTION_HANDLER;
 		}
 		break;
@@ -1200,6 +1205,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[1] = 0;
 			printf("Remapping slave: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER+8);
+			rm_irqbase[1] = al;
 			al = NR_EXCEPTION_HANDLER+8;
 		}
 		break;
diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.h	Fri Jun 08 11:19:55 2007 +0100
@@ -25,10 +25,6 @@
 #endif
 
 #include <xen/hvm/vmx_assist.h>
-
-#define	NR_EXCEPTION_HANDLER	32
-#define	NR_INTERRUPT_HANDLERS	16
-#define	NR_TRAPS		(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 #ifndef __ASSEMBLY__
 
diff -r 345ae2e61ba0 -r 656b8175f4f2 xen/include/public/hvm/vmx_assist.h
--- a/xen/include/public/hvm/vmx_assist.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/xen/include/public/hvm/vmx_assist.h	Fri Jun 08 11:19:55 2007 +0100
@@ -34,6 +34,10 @@
 #define VMXASSIST_OLD_CONTEXT (VMXASSIST_NEW_CONTEXT + 4)
 
 #ifndef __ASSEMBLY__
+
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 union vmcs_arbytes {
     struct arbyte_fields {
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- xen.spec	23 Sep 2007 16:53:56 -0000	1.182
+++ xen.spec	24 Sep 2007 21:53:37 -0000	1.183
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 3%{dist}
+Release: 4%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -24,7 +24,8 @@
 Patch28: xen-keyboard.patch
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
-Patch31: xen-clobber-vif-type.patch
+Patch32: xen-clobber-vif-type.patch
+Patch33: xen-vmxassist-irqs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -68,12 +69,15 @@
 Requires: udev >= 059
 Requires: python-virtinst
 Requires: xen-libs = %{version}-%{release}
+# Ensure we at least have a suitable kernel installed, though we can't
+# force user to actually boot it.
+Requires: xen-hypervisor-abi = 3.1
 # Not strictly a dependency, but kpartx is by far the most useful tool right
 # now for accessing domU data from within a dom0 so bring it in when the user
 # installs xen.
 Requires: kpartx
 Prereq: chkconfig
-ExclusiveArch: i386 x86_64 ia64
+ExclusiveArch: i386 i686 x86_64 ia64
 
 %description
 This package contains the Xen hypervisor and Xen tools, needed to
@@ -121,7 +125,9 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
+
+%patch32 -p1
+%patch33 -p1
 
 # config patches
 %patch100 -p1
@@ -270,6 +276,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
+- Fix VMX assist IRQ handling (rhbz #279581)
+
 * Sun Sep 23 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-3.fc7
 - Don't clobber the VIF type attribute in FV guests (rhbz #247122)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:56:00 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 17:56:00 -0400
Subject: rpms/kernel/devel config-generic,1.27,1.28 kernel.spec,1.182,1.183
Message-ID: <200709242156.l8OLu0GL016871@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16495

Modified Files:
	config-generic kernel.spec 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- Disable generic RTC.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config-generic	20 Sep 2007 22:34:44 -0000	1.27
+++ config-generic	24 Sep 2007 21:55:27 -0000	1.28
@@ -1869,8 +1869,7 @@
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
+# CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- kernel.spec	24 Sep 2007 19:20:53 -0000	1.182
+++ kernel.spec	24 Sep 2007 21:55:27 -0000	1.183
@@ -1807,6 +1807,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- Disable generic RTC.
+
 * Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
 - Fix IDE on ppc Pegasos platform (F7 bz #247602)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:56:24 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 17:56:24 -0400
Subject: rpms/xen/devel xen-vmxassist-irqs.patch, NONE, 1.1 xen.spec, 1.185, 
	1.186
Message-ID: <200709242156.l8OLuOAs016874@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16823

Modified Files:
	xen.spec 
Added Files:
	xen-vmxassist-irqs.patch 
Log Message:
Added dep on xen-hypervisor-abi=3.1. Fix vmxassist bug
> Resolves: rhbz #247122

xen-vmxassist-irqs.patch:

--- NEW FILE xen-vmxassist-irqs.patch ---
changeset:   15239:656b8175f4f2
user:        kfraser at localhost.localdomain
date:        Fri Jun 08 11:19:55 2007 +0100
files:       tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vm86.h xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/hvm/vpic.c xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/public/hvm/vmx_assist.h
description:
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>


diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.c	Fri Jun 08 11:19:55 2007 +0100
@@ -927,6 +927,7 @@ load_or_clear_seg(unsigned long sel, uin
 		load_seg(0, base, limit, arbytes);
 }
 
+static unsigned char rm_irqbase[2];
 
 /*
  * Transition to protected mode
@@ -935,6 +936,9 @@ protected_mode(struct regs *regs)
 protected_mode(struct regs *regs)
 {
 	extern char stack_top[];
+
+	oldctx.rm_irqbase[0] = rm_irqbase[0];
+	oldctx.rm_irqbase[1] = rm_irqbase[1];
 
 	regs->eflags &= ~(EFLAGS_TF|EFLAGS_VM);
 
@@ -1187,6 +1191,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[0] = 0;
 			printf("Remapping master: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER);
+			rm_irqbase[0] = al;
 			al = NR_EXCEPTION_HANDLER;
 		}
 		break;
@@ -1200,6 +1205,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[1] = 0;
 			printf("Remapping slave: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER+8);
+			rm_irqbase[1] = al;
 			al = NR_EXCEPTION_HANDLER+8;
 		}
 		break;
diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.h	Fri Jun 08 11:19:55 2007 +0100
@@ -25,10 +25,6 @@
 #endif
 
 #include <xen/hvm/vmx_assist.h>
-
-#define	NR_EXCEPTION_HANDLER	32
-#define	NR_INTERRUPT_HANDLERS	16
-#define	NR_TRAPS		(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 #ifndef __ASSEMBLY__
 
diff -r 345ae2e61ba0 -r 656b8175f4f2 xen/include/public/hvm/vmx_assist.h
--- a/xen/include/public/hvm/vmx_assist.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/xen/include/public/hvm/vmx_assist.h	Fri Jun 08 11:19:55 2007 +0100
@@ -34,6 +34,10 @@
 #define VMXASSIST_OLD_CONTEXT (VMXASSIST_NEW_CONTEXT + 4)
 
 #ifndef __ASSEMBLY__
+
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 union vmcs_arbytes {
     struct arbyte_fields {
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- xen.spec	24 Sep 2007 20:51:43 -0000	1.185
+++ xen.spec	24 Sep 2007 21:55:52 -0000	1.186
@@ -28,6 +28,7 @@
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch31: xen-tpm-functions.patch
 Patch32: xen-clobber-vif-type.patch
+Patch33: xen-vmxassist-irqs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -70,6 +71,9 @@
 Requires: udev >= 059
 Requires: python-virtinst
 Requires: xen-libs = %{version}-%{release}
+# Ensure we at least have a suitable kernel installed, though we can't
+# force user to actually boot it.
+Requires: xen-hypervisor-abi = 3.1
 # Not strictly a dependency, but kpartx is by far the most useful tool right
 # now for accessing domU data from within a dom0 so bring it in when the user
 # installs xen.
@@ -126,6 +130,7 @@
 
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 # config patches
 %patch100 -p1



From fedora-extras-commits at redhat.com  Mon Sep 24 22:00:26 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 18:00:26 -0400
Subject: rpms/kernel/devel config-rhel-generic,1.10,1.11
Message-ID: <200709242200.l8OM0Qsk017923@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17789

Modified Files:
	config-rhel-generic 
Log Message:
remove an obvious dupe


Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-rhel-generic	4 Apr 2007 22:19:42 -0000	1.10
+++ config-rhel-generic	24 Sep 2007 21:59:53 -0000	1.11
@@ -157,7 +157,6 @@
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
 # CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
 # CONFIG_AC3200 is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set



From fedora-extras-commits at redhat.com  Mon Sep 24 22:14:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 24 Sep 2007 18:14:34 -0400
Subject: rpms/evince/devel evince.spec,1.93,1.94
Message-ID: <200709242214.l8OMEYnt024446@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24383

Modified Files:
	evince.spec 
Log Message:
add a missing schema file



Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- evince.spec	17 Sep 2007 18:44:15 -0000	1.93
+++ evince.spec	24 Sep 2007 22:14:00 -0000	1.94
@@ -5,7 +5,7 @@
 
 Name:		evince
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
@@ -107,6 +107,7 @@
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/evince.schemas \
      	%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
+     	%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
 	%{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
 		>/dev/null || :
 
@@ -124,6 +125,7 @@
 	gconftool-2 --makefile-uninstall-rule \
       		%{_sysconfdir}/gconf/schemas/evince.schemas \
       		%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
+     		%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
 		%{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
 			>/dev/null || :
 fi
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Add a missing schema file
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 22:29:20 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:29:20 -0400
Subject: rpms/moreutils/devel moreutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242229.l8OMTK7t025526@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	moreutils.spec 
Log Message:
new package



--- NEW FILE moreutils.spec ---
Name:           moreutils
Version:        0.24
Release:        2%{?dist}
Summary:        Additional unix utilities
Group:          Applications/System
License:        GPLv2
URL:            http://kitenet.net/~joey/code/moreutils/
Source0:        http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  docbook2X docbook-dtds
Requires:       perl-TimeDate perl-Time-Duration
# These perl modules add functionality to the ts command, as they are added in eval'd code they are not
# picked up automatically by rpm.

%description
 This is a growing collection of the unix tools that nobody thought
 to write thirty years ago.

 So far, it includes the following utilities:
  - isutf8: check if a file or standard input is utf-8
  - sponge: soak up standard input and write to a file
  - ts: timestamp standard input
  - vidir: edit a directory in your text editor
  - vipe: insert a text editor into a pipe
  - combine: combine the lines in two files using boolean operations
  - ifdata: get network interface info without parsing ifconfig output
  - pee: tee standard input to pipes
  - zrun: automatically uncompress arguments to command
  - mispipe: pipe two commands, returning the exit status of the first
  - lckdo: execute a program with a lock held

%prep
%setup -qn %{name}
# the required dtd's are not where this package expects them to be, let's fix that
sed -r -i "s/\/usr\/share\/xml\/docbook\/schema\/dtd\/4.4\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/xml-dtd-4.4-1.0-30.1\/docbookx.dtd/" *.docbook
# the docbook2x-man command is different in fedora, let's fix that too
sed -r -i "s/docbook2x-man/db2x_docbook2man/" Makefile
# a slightly different syntax is required here for the man pages to be built successfully
sed -r -i "s/ rep=\"repeat\"//" *.docbook


%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DSUPPORT_LH7 -DMKSTEMP"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 isutf8 %{buildroot}%{_bindir}
install -m0755 sponge %{buildroot}%{_bindir}
install -m0755 ts %{buildroot}%{_bindir}
install -m0755 vidir %{buildroot}%{_bindir}
install -m0755 vipe %{buildroot}%{_bindir}
install -m0755 combine %{buildroot}%{_bindir}
install -m0755 ifdata %{buildroot}%{_bindir}
install -m0755 pee %{buildroot}%{_bindir}
install -m0755 zrun %{buildroot}%{_bindir}
install -m0755 mispipe %{buildroot}%{_bindir}
install -m0755 lckdo %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -m644 sponge.1 %{buildroot}%{_mandir}/man1/
install -m644 vidir.1 %{buildroot}%{_mandir}/man1/
install -m644 vipe.1 %{buildroot}%{_mandir}/man1/
install -m644 isutf8.1 %{buildroot}%{_mandir}/man1/
install -m644 ts.1 %{buildroot}%{_mandir}/man1/
install -m644 combine.1 %{buildroot}%{_mandir}/man1/
install -m644 ifdata.1 %{buildroot}%{_mandir}/man1/
install -m644 pee.1 %{buildroot}%{_mandir}/man1/
install -m644 zrun.1 %{buildroot}%{_mandir}/man1/
install -m644 mispipe.1 %{buildroot}%{_mandir}/man1/
install -m644 lckdo.1 %{buildroot}%{_mandir}/man1/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc README COPYING
%{_mandir}/man1/*
%{_bindir}/*


%changelog
* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-2%{?dist}
- Added optional perl modules to requirements

* Tue Sep 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-1%{?dist}
- Version update
- Fixed specfile issues

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-3%{?dist}
- Updated license field re new guidelines

* Mon Jun 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-2%{?dist}
- optflags fix and extra doc files

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-1%{?dist}
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:10:22 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:28:47 -0000	1.2
@@ -0,0 +1 @@
+moreutils_0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:10:22 -0000	1.1
+++ sources	24 Sep 2007 22:28:47 -0000	1.2
@@ -0,0 +1 @@
+f0dbbded6a685976102c2884e6c32feb  moreutils_0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:31:21 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:31:21 -0400
Subject: rpms/moreutils/F-7 moreutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242231.l8OMVLtd025659@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25612/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	moreutils.spec 
Log Message:
new package



--- NEW FILE moreutils.spec ---
Name:           moreutils
Version:        0.24
Release:        2%{?dist}
Summary:        Additional unix utilities
Group:          Applications/System
License:        GPLv2
URL:            http://kitenet.net/~joey/code/moreutils/
Source0:        http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  docbook2X docbook-dtds
Requires:       perl-TimeDate perl-Time-Duration
# These perl modules add functionality to the ts command, as they are added in eval'd code they are not
# picked up automatically by rpm.

%description
 This is a growing collection of the unix tools that nobody thought
 to write thirty years ago.

 So far, it includes the following utilities:
  - isutf8: check if a file or standard input is utf-8
  - sponge: soak up standard input and write to a file
  - ts: timestamp standard input
  - vidir: edit a directory in your text editor
  - vipe: insert a text editor into a pipe
  - combine: combine the lines in two files using boolean operations
  - ifdata: get network interface info without parsing ifconfig output
  - pee: tee standard input to pipes
  - zrun: automatically uncompress arguments to command
  - mispipe: pipe two commands, returning the exit status of the first
  - lckdo: execute a program with a lock held

%prep
%setup -qn %{name}
# the required dtd's are not where this package expects them to be, let's fix that
sed -r -i "s/\/usr\/share\/xml\/docbook\/schema\/dtd\/4.4\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/xml-dtd-4.4-1.0-30.1\/docbookx.dtd/" *.docbook
# the docbook2x-man command is different in fedora, let's fix that too
sed -r -i "s/docbook2x-man/db2x_docbook2man/" Makefile
# a slightly different syntax is required here for the man pages to be built successfully
sed -r -i "s/ rep=\"repeat\"//" *.docbook


%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DSUPPORT_LH7 -DMKSTEMP"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 isutf8 %{buildroot}%{_bindir}
install -m0755 sponge %{buildroot}%{_bindir}
install -m0755 ts %{buildroot}%{_bindir}
install -m0755 vidir %{buildroot}%{_bindir}
install -m0755 vipe %{buildroot}%{_bindir}
install -m0755 combine %{buildroot}%{_bindir}
install -m0755 ifdata %{buildroot}%{_bindir}
install -m0755 pee %{buildroot}%{_bindir}
install -m0755 zrun %{buildroot}%{_bindir}
install -m0755 mispipe %{buildroot}%{_bindir}
install -m0755 lckdo %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -m644 sponge.1 %{buildroot}%{_mandir}/man1/
install -m644 vidir.1 %{buildroot}%{_mandir}/man1/
install -m644 vipe.1 %{buildroot}%{_mandir}/man1/
install -m644 isutf8.1 %{buildroot}%{_mandir}/man1/
install -m644 ts.1 %{buildroot}%{_mandir}/man1/
install -m644 combine.1 %{buildroot}%{_mandir}/man1/
install -m644 ifdata.1 %{buildroot}%{_mandir}/man1/
install -m644 pee.1 %{buildroot}%{_mandir}/man1/
install -m644 zrun.1 %{buildroot}%{_mandir}/man1/
install -m644 mispipe.1 %{buildroot}%{_mandir}/man1/
install -m644 lckdo.1 %{buildroot}%{_mandir}/man1/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc README COPYING
%{_mandir}/man1/*
%{_bindir}/*


%changelog
* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-2%{?dist}
- Added optional perl modules to requirements

* Tue Sep 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-1%{?dist}
- Version update
- Fixed specfile issues

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-3%{?dist}
- Updated license field re new guidelines

* Mon Jun 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-2%{?dist}
- optflags fix and extra doc files

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-1%{?dist}
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:10:22 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:30:49 -0000	1.2
@@ -0,0 +1 @@
+moreutils_0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:10:22 -0000	1.1
+++ sources	24 Sep 2007 22:30:49 -0000	1.2
@@ -0,0 +1 @@
+f0dbbded6a685976102c2884e6c32feb  moreutils_0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:46:59 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:46:59 -0400
Subject: rpms/perl-Time-Duration/devel perl-Time-Duration.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242246.l8OMkx3e000663@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv419/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Time-Duration.spec 
Log Message:
new package



--- NEW FILE perl-Time-Duration.spec ---
Name:           perl-Time-Duration
Summary:        Time-Duration - rounded or exact English expression of durations
Version:        1.06
Release:        2%{?dist}
License:        GPLv2+ or Artistic 2.0
Group:          Development/Libraries
Url:            http://search.cpan.org/dist/Time-Duration/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Source:         http://search.cpan.org//CPAN/authors/id/A/AV/AVIF/Time-Duration-%{version}.tar.gz
BuildRequires:  perl(Test::Pod::Coverage) perl(Test::Pod) perl(ExtUtils::MakeMaker)

%description
This module provides functions for expressing durations in rounded or exact
terms.


%prep
%setup -q -n Time-Duration-%{version} 


%check
make test


%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}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_mandir}/man3/*
%{perl_vendorlib}/Time


%changelog
* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-2
- Tidied build flas

* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-1
- Version update, Licence versions added

* Mon Jul 02 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-4
- Add ChangeLog to docs

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-3
- Specfile cleanup

* Fri Jun 01 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-2
- Specfile cleanup

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-1
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:12:42 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:46:23 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:12:42 -0000	1.1
+++ sources	24 Sep 2007 22:46:23 -0000	1.2
@@ -0,0 +1 @@
+d65108e0e4e8ffb38e28d532f8ddcd12  Time-Duration-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:49:37 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:49:37 -0400
Subject: rpms/phpTodo/devel phpTodo-0.8.1beta.patch, NONE,
	1.1 phpTodo.httpd.conf, NONE, 1.1 phpTodo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242249.l8OMnbOc000828@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	phpTodo-0.8.1beta.patch phpTodo.httpd.conf phpTodo.spec 
Log Message:
new package


phpTodo-0.8.1beta.patch:

--- NEW FILE phpTodo-0.8.1beta.patch ---
diff -urN phpTodo-0.8.1beta.orig/doc/sql/todo.sql phpTodo-0.8.1beta/doc/sql/todo.sql
--- phpTodo-0.8.1beta.orig/doc/sql/todo.sql	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/doc/sql/todo.sql	2007-09-22 20:00:22.000000000 +1000
@@ -26,7 +26,7 @@
                           password        CHAR(40)                NOT NULL,
                           admin           TINYINT     UNSIGNED    NOT NULL DEFAULT 0,
                           full_name       CHAR(40),
-                          email           CHAR(320)               NOT NULL,
+                          email           CHAR(255)               NOT NULL,
                           PRIMARY KEY     (id),
                           UNIQUE          (username),
                           INDEX           (password));
@@ -150,4 +150,4 @@
 INSERT INTO user_prefs VALUES (NULL, 1, 0, 0, 0, 0, 0, 0, 'none', 'asc');
 
 # Change the following line to reflect the correct user, host, database name, and password
-GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
+# GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
diff -urN phpTodo-0.8.1beta.orig/feed.php phpTodo-0.8.1beta/feed.php
--- phpTodo-0.8.1beta.orig/feed.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/feed.php	2007-09-20 19:07:45.000000000 +1000
@@ -52,8 +52,19 @@
    if (! $feed_param = feed_authenticate($user_id, $feed_id, $secret)) {
       // Set up the channel with info indicating an invalid feed
       $feed->title = 'Invalid RSS Feed';
-      $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                        $phpTodo_serverpath . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath . $_SERVER['REQUEST_URI'];
+      $feed->link = $location;
+
       $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                         'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -73,8 +84,19 @@
 
    // Set up the channel
    $feed->title = $feed_param->name . ' - phpTodo RSS Feed';
-   $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                     $_SERVER['REQUEST_URI'];
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['SERVER_NAME'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= $_SERVER['REQUEST_URI'];
+   $feed->link = $location;
+
    $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                      'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -161,8 +183,19 @@
       # Take the data and put it into the rss object
       $item = new FeedItem();
       $item->title = "$feedSubject ($priority)";
-      $item->link = 'http://' . $_SERVER['SERVER_NAME'] . $phpTodo_serverpath .
-                    "taskmodify.php?edit=Edit&task_id=$id";
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath ."taskmodify.php?edit=Edit&task_id=$id";
+      $item->link = $location;
+
       $item->description = nl2br("$feedDesc");
       $item->date = "$create_date $itemTZOffset";
       $item->source = '';
diff -urN phpTodo-0.8.1beta.orig/index.php phpTodo-0.8.1beta/index.php
--- phpTodo-0.8.1beta.orig/index.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/index.php	2007-09-20 19:07:45.000000000 +1000
@@ -58,8 +58,19 @@
       if (isset($_SESSION['redirect'])) {
          header('Location: ' . $_SESSION['redirect']);
       } else {
-         header('Location: http://' . $_SERVER['HTTP_HOST'] .
-                dirname($_SERVER['PHP_SELF']) . '/todolist.php');
+
+         // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+         $location = 'http';
+         if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+         $location .= '://'.$_SERVER['HTTP_HOST'];
+         if ( isset($_SERVER['HTTPS'])) {
+            if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         } else {
+            if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         }
+         $location .= dirname($_SERVER['PHP_SELF']) . '/todolist.php';
+         header('Location: ' . $location);
+
       }
       unset($_SESSION['redirect']);
 
diff -urN phpTodo-0.8.1beta.orig/libs/sec_check.php phpTodo-0.8.1beta/libs/sec_check.php
--- phpTodo-0.8.1beta.orig/libs/sec_check.php	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/libs/sec_check.php	2007-09-20 19:07:45.000000000 +1000
@@ -164,15 +164,35 @@
       }
    }
 
-   $_SESSION['redirect'] = 'http://' . $_SERVER['HTTP_HOST'] .
-                           dirname($_SERVER['PHP_SELF']) . '/';
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/';
+   $_SESSION['redirect'] = $location;
 
    if (isset($redirect)) {
        $_SESSION['redirect'] .= $redirect;
    }
 
-   header('Location: http://' . $_SERVER['HTTP_HOST'] .
-          dirname($_SERVER['PHP_SELF']) . '/index.php');
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/index.php';
+   header('Location: ' . $location);
+
 }
 
 ?>
diff -urN phpTodo-0.8.1beta.orig/sample_config.php phpTodo-0.8.1beta/sample_config.php
--- phpTodo-0.8.1beta.orig/sample_config.php	2007-04-07 04:17:12.000000000 +1000
+++ phpTodo-0.8.1beta/sample_config.php	2007-09-20 20:48:51.000000000 +1000
@@ -21,20 +21,35 @@
 // The work directory contains all of the private
 // smarty data.  This directory should be below the
 // httpd root
-$phpTodo_work_dir = '/path/to/private/phptodo';
+$phpTodo_work_dir = '/var/cache/phpTodo';
 
 // The http directory is the first level directory
 // where the phpTodo distribution was uncompressed
-$phpTodo_http_dir = '/path/to/public/phptodo';
+$phpTodo_http_dir = '/usr/share/phpTodo';
 
 // The smarty directory is the location of the Smarty.class.php file
-$phpTodo_smarty_dir = 'smarty/';
+// F7 Smarty builds are in /usr/share/php/Smarty/
+// FC6 and earlier Smarty builds are in /usr/share/Smarty/ instead.
+// We will default to F7 but check for a class file in the FC6 location
+// You may edit this to a single line pointing to the locaton of your Smarty
+// install to save a couple of cycles if you wish.
+$phpTodo_smarty_dir = '/usr/share/php/Smarty/';
+if (file_exists("/usr/share/Smarty/Smarty.class.php"))
+{
+	$phpTodo_smarty_dir = "/usr/share/Smarty/";
+}
 
 // This is the default stylesheet used by phpTodo
 // The location of the stylesheet is relative to
 // the http directory
 $phpTodo_stylesheet = 'css/default.css';
 
+
+// The following line **MUST** be removed from the config file
+// once the database has been setup and configured.
+header("Content-type: text/plain");die("Welcome to phpTodo - Web based todo lists\n\nPlease setup and configure the database and edit the\n/etc/phpTodo/config.php configuration file.\n\nInstructions for setting up the database can be found\nin the ##DOCLOCATION##/INSTALL file.\n\nThe SQL required for setting up the database can be found\nin the ##DOCLOCATION##/sql/ directory.");
+
+
 // This is the name of the phpTodo database
 $phpTodo_dbName = 'phpTodo';
 
@@ -47,6 +62,7 @@
 // This is the password for the database
 $phpTodo_dbPass = 'password';
 
+
 // Default session time (in seconds)
 $phpTodo_sessTime = 600;
 


--- NEW FILE phpTodo.httpd.conf ---
#
# phpTodo is a to do list manager written in PHP.
#

Alias /phpTodo /usr/share/phpTodo


--- NEW FILE phpTodo.spec ---
Summary: PHP todo list manager
Name: phpTodo
Version: 0.8.1
Release: 0.8.beta%{?dist}
License: GPLv2+
URL: http://phptodo.godshell.com/
Group: Applications/Internet
Source0: http://downloads.sourceforge.net/phptodo/%{name}-%{version}beta.tar.gz
Source1: phpTodo.httpd.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: phpTodo-0.8.1beta.patch
BuildArch: noarch
BuildRequires: gettext
Requires: httpd
Requires: php-Smarty
Requires: php-mysql
Requires(post): policycoreutils
Requires(postun): policycoreutils
# to make sure the "apache" group is created before phpTodo is installed

%description
The general idea behind this program is to keep all of your todo lists in
one central location.  I've grown very tired of having lists all over the
place and being unable to reconcile them...

%prep
%setup -qn %{name}-%{version}beta
%patch1 -p1
sed -i -r "s|##DOCLOCATION##|%{_datadir}/doc/%{name}-%{version}|g" sample_config.php
# Rearrange the documentation
cp sample_config.php doc/
chmod 755 doc/selenium
chmod 755 doc/sql
chmod 755 libs
chmod 755 templates
chmod 755 css
chmod 755 images


%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/templates_c
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/cache
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/config
mkdir -p -m0755 %{buildroot}%{_datadir}/phpTodo
mv sample_config.php config.php
install -m 0644 config.php %{buildroot}%{_sysconfdir}/phpTodo/
ln -s ../../../..%{_sysconfdir}/phpTodo/config.php \
    %{buildroot}%{_datadir}/phpTodo/config.php
install -m 0644 index.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 about.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 datetimepicker.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 feed.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 logout.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskedit.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskmodify.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.php %{buildroot}%{_datadir}/phpTodo/
for d in css images libs templates; do
    cp -rp $d %{buildroot}%{_datadir}/phpTodo/
done

mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/phpTodo.conf


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc doc/*
%config %dir %{_sysconfdir}/phpTodo
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/phpTodo/*.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpTodo.conf
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/templates_c
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/cache
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/config
%{_datadir}/phpTodo


%post
# SELinux probably needs work.
# Set SELinux file context in the policy
semanage fcontext -a -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
# Actually change the context
restorecon -R %{_datadir}/phpTodo/ || :
restorecon -R %{_sysconfdir}/phpTodo/ || :
restorecon -R %{_localstatedir}/cache/phpTodo/ || :


%postun
# SELinux support
if [ $1 -eq 0 ]; then  # final removal
  semanage fcontext -d -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
fi


%changelog
* Sat Sep 22 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.8.beta%{?dist}
- SELinux changes
- Improved initial mysql schema

* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.7.beta%{?dist}
- Updated location of Smarty for F7 rpm
- Added more useful message to be displayed when user has not configured
- or setup database before using phpTodo.

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.6.beta%{?dist}
- Updated license field re new guidelines

* Sun Jun 17 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.5.beta
- sourceforge mirror changed to downloads.sourceforge.net

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.4.beta
- SELinux post section added

* Tue May 29 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.3.beta
- Cleanup of SPEC file

* Sat Apr 28 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.2.beta
- Cleanup of SPEC file

* Thu Apr 10 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.1.beta
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:14:45 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:49:02 -0000	1.2
@@ -0,0 +1 @@
+phpTodo-0.8.1beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:14:45 -0000	1.1
+++ sources	24 Sep 2007 22:49:02 -0000	1.2
@@ -0,0 +1 @@
+81293fbc69d691fb897fc007f8502efe  phpTodo-0.8.1beta.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:01:53 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:01:53 -0400
Subject: rpms/odt2txt/EL-4 odt2txt.spec,NONE,1.1
Message-ID: <200709242301.l8ON1rJ5007668@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/EL-4

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:01:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:01:57 -0400
Subject: rpms/odt2txt/EL-5 odt2txt.spec,NONE,1.1
Message-ID: <200709242301.l8ON1vTx007684@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/EL-5

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:02:03 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:02:03 -0400
Subject: rpms/odt2txt/F-7 odt2txt.spec,NONE,1.1
Message-ID: <200709242302.l8ON23Oj007701@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/F-7

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:02:06 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:02:06 -0400
Subject: rpms/odt2txt/devel odt2txt.spec,NONE,1.1
Message-ID: <200709242302.l8ON260W007716@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/devel

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:49 -0400
Subject: rpms/odt2txt/EL-4 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5nsK007836@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/EL-4

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:55 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:55 -0400
Subject: rpms/odt2txt/EL-5 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5tZp007856@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/EL-5

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:59 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:59 -0400
Subject: rpms/odt2txt/F-7 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5xPN007874@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/F-7

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:06:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:06:02 -0400
Subject: rpms/odt2txt/devel odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242306.l8ON62Zr007895@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/devel

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:07:49 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 19:07:49 -0400
Subject: rpms/frysk/devel frysk.spec,1.116,1.117
Message-ID: <200709242307.l8ON7nnV008112@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8034

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Fix path to dogtail_scripts.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- frysk.spec	24 Sep 2007 20:35:13 -0000	1.116
+++ frysk.spec	24 Sep 2007 23:07:15 -0000	1.117
@@ -173,7 +173,7 @@
 for f in test2866.py test2985.py test3380.py; do
     touch -r \
     	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
-	  $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/$f
 done
 
 # Workaround for #211824:
@@ -246,6 +246,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Fix path to dogtail_scripts.
 - Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.
 - Remove frysk-20060922-a-cast.patch



From fedora-extras-commits at redhat.com  Mon Sep 24 23:08:08 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 19:08:08 -0400
Subject: rpms/phpTodo/F-7 phpTodo-0.8.1beta.patch, NONE,
	1.1 phpTodo.httpd.conf, 
	NONE, 1.1 phpTodo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709242308.l8ON88Dd008121@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/phpTodo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	phpTodo-0.8.1beta.patch phpTodo.httpd.conf phpTodo.spec 
Log Message:
new package


phpTodo-0.8.1beta.patch:

--- NEW FILE phpTodo-0.8.1beta.patch ---
diff -urN phpTodo-0.8.1beta.orig/doc/sql/todo.sql phpTodo-0.8.1beta/doc/sql/todo.sql
--- phpTodo-0.8.1beta.orig/doc/sql/todo.sql	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/doc/sql/todo.sql	2007-09-22 20:00:22.000000000 +1000
@@ -26,7 +26,7 @@
                           password        CHAR(40)                NOT NULL,
                           admin           TINYINT     UNSIGNED    NOT NULL DEFAULT 0,
                           full_name       CHAR(40),
-                          email           CHAR(320)               NOT NULL,
+                          email           CHAR(255)               NOT NULL,
                           PRIMARY KEY     (id),
                           UNIQUE          (username),
                           INDEX           (password));
@@ -150,4 +150,4 @@
 INSERT INTO user_prefs VALUES (NULL, 1, 0, 0, 0, 0, 0, 0, 'none', 'asc');
 
 # Change the following line to reflect the correct user, host, database name, and password
-GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
+# GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
diff -urN phpTodo-0.8.1beta.orig/feed.php phpTodo-0.8.1beta/feed.php
--- phpTodo-0.8.1beta.orig/feed.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/feed.php	2007-09-20 19:07:45.000000000 +1000
@@ -52,8 +52,19 @@
    if (! $feed_param = feed_authenticate($user_id, $feed_id, $secret)) {
       // Set up the channel with info indicating an invalid feed
       $feed->title = 'Invalid RSS Feed';
-      $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                        $phpTodo_serverpath . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath . $_SERVER['REQUEST_URI'];
+      $feed->link = $location;
+
       $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                         'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -73,8 +84,19 @@
 
    // Set up the channel
    $feed->title = $feed_param->name . ' - phpTodo RSS Feed';
-   $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                     $_SERVER['REQUEST_URI'];
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['SERVER_NAME'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= $_SERVER['REQUEST_URI'];
+   $feed->link = $location;
+
    $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                      'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -161,8 +183,19 @@
       # Take the data and put it into the rss object
       $item = new FeedItem();
       $item->title = "$feedSubject ($priority)";
-      $item->link = 'http://' . $_SERVER['SERVER_NAME'] . $phpTodo_serverpath .
-                    "taskmodify.php?edit=Edit&task_id=$id";
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath ."taskmodify.php?edit=Edit&task_id=$id";
+      $item->link = $location;
+
       $item->description = nl2br("$feedDesc");
       $item->date = "$create_date $itemTZOffset";
       $item->source = '';
diff -urN phpTodo-0.8.1beta.orig/index.php phpTodo-0.8.1beta/index.php
--- phpTodo-0.8.1beta.orig/index.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/index.php	2007-09-20 19:07:45.000000000 +1000
@@ -58,8 +58,19 @@
       if (isset($_SESSION['redirect'])) {
          header('Location: ' . $_SESSION['redirect']);
       } else {
-         header('Location: http://' . $_SERVER['HTTP_HOST'] .
-                dirname($_SERVER['PHP_SELF']) . '/todolist.php');
+
+         // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+         $location = 'http';
+         if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+         $location .= '://'.$_SERVER['HTTP_HOST'];
+         if ( isset($_SERVER['HTTPS'])) {
+            if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         } else {
+            if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         }
+         $location .= dirname($_SERVER['PHP_SELF']) . '/todolist.php';
+         header('Location: ' . $location);
+
       }
       unset($_SESSION['redirect']);
 
diff -urN phpTodo-0.8.1beta.orig/libs/sec_check.php phpTodo-0.8.1beta/libs/sec_check.php
--- phpTodo-0.8.1beta.orig/libs/sec_check.php	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/libs/sec_check.php	2007-09-20 19:07:45.000000000 +1000
@@ -164,15 +164,35 @@
       }
    }
 
-   $_SESSION['redirect'] = 'http://' . $_SERVER['HTTP_HOST'] .
-                           dirname($_SERVER['PHP_SELF']) . '/';
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/';
+   $_SESSION['redirect'] = $location;
 
    if (isset($redirect)) {
        $_SESSION['redirect'] .= $redirect;
    }
 
-   header('Location: http://' . $_SERVER['HTTP_HOST'] .
-          dirname($_SERVER['PHP_SELF']) . '/index.php');
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/index.php';
+   header('Location: ' . $location);
+
 }
 
 ?>
diff -urN phpTodo-0.8.1beta.orig/sample_config.php phpTodo-0.8.1beta/sample_config.php
--- phpTodo-0.8.1beta.orig/sample_config.php	2007-04-07 04:17:12.000000000 +1000
+++ phpTodo-0.8.1beta/sample_config.php	2007-09-20 20:48:51.000000000 +1000
@@ -21,20 +21,35 @@
 // The work directory contains all of the private
 // smarty data.  This directory should be below the
 // httpd root
-$phpTodo_work_dir = '/path/to/private/phptodo';
+$phpTodo_work_dir = '/var/cache/phpTodo';
 
 // The http directory is the first level directory
 // where the phpTodo distribution was uncompressed
-$phpTodo_http_dir = '/path/to/public/phptodo';
+$phpTodo_http_dir = '/usr/share/phpTodo';
 
 // The smarty directory is the location of the Smarty.class.php file
-$phpTodo_smarty_dir = 'smarty/';
+// F7 Smarty builds are in /usr/share/php/Smarty/
+// FC6 and earlier Smarty builds are in /usr/share/Smarty/ instead.
+// We will default to F7 but check for a class file in the FC6 location
+// You may edit this to a single line pointing to the locaton of your Smarty
+// install to save a couple of cycles if you wish.
+$phpTodo_smarty_dir = '/usr/share/php/Smarty/';
+if (file_exists("/usr/share/Smarty/Smarty.class.php"))
+{
+	$phpTodo_smarty_dir = "/usr/share/Smarty/";
+}
 
 // This is the default stylesheet used by phpTodo
 // The location of the stylesheet is relative to
 // the http directory
 $phpTodo_stylesheet = 'css/default.css';
 
+
+// The following line **MUST** be removed from the config file
+// once the database has been setup and configured.
+header("Content-type: text/plain");die("Welcome to phpTodo - Web based todo lists\n\nPlease setup and configure the database and edit the\n/etc/phpTodo/config.php configuration file.\n\nInstructions for setting up the database can be found\nin the ##DOCLOCATION##/INSTALL file.\n\nThe SQL required for setting up the database can be found\nin the ##DOCLOCATION##/sql/ directory.");
+
+
 // This is the name of the phpTodo database
 $phpTodo_dbName = 'phpTodo';
 
@@ -47,6 +62,7 @@
 // This is the password for the database
 $phpTodo_dbPass = 'password';
 
+
 // Default session time (in seconds)
 $phpTodo_sessTime = 600;
 


--- NEW FILE phpTodo.httpd.conf ---
#
# phpTodo is a to do list manager written in PHP.
#

Alias /phpTodo /usr/share/phpTodo


--- NEW FILE phpTodo.spec ---
Summary: PHP todo list manager
Name: phpTodo
Version: 0.8.1
Release: 0.8.beta%{?dist}
License: GPLv2+
URL: http://phptodo.godshell.com/
Group: Applications/Internet
Source0: http://downloads.sourceforge.net/phptodo/%{name}-%{version}beta.tar.gz
Source1: phpTodo.httpd.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: phpTodo-0.8.1beta.patch
BuildArch: noarch
BuildRequires: gettext
Requires: httpd
Requires: php-Smarty
Requires: php-mysql
Requires(post): policycoreutils
Requires(postun): policycoreutils
# to make sure the "apache" group is created before phpTodo is installed

%description
The general idea behind this program is to keep all of your todo lists in
one central location.  I've grown very tired of having lists all over the
place and being unable to reconcile them...

%prep
%setup -qn %{name}-%{version}beta
%patch1 -p1
sed -i -r "s|##DOCLOCATION##|%{_datadir}/doc/%{name}-%{version}|g" sample_config.php
# Rearrange the documentation
cp sample_config.php doc/
chmod 755 doc/selenium
chmod 755 doc/sql
chmod 755 libs
chmod 755 templates
chmod 755 css
chmod 755 images


%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/templates_c
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/cache
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/config
mkdir -p -m0755 %{buildroot}%{_datadir}/phpTodo
mv sample_config.php config.php
install -m 0644 config.php %{buildroot}%{_sysconfdir}/phpTodo/
ln -s ../../../..%{_sysconfdir}/phpTodo/config.php \
    %{buildroot}%{_datadir}/phpTodo/config.php
install -m 0644 index.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 about.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 datetimepicker.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 feed.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 logout.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskedit.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskmodify.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.php %{buildroot}%{_datadir}/phpTodo/
for d in css images libs templates; do
    cp -rp $d %{buildroot}%{_datadir}/phpTodo/
done

mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/phpTodo.conf


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc doc/*
%config %dir %{_sysconfdir}/phpTodo
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/phpTodo/*.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpTodo.conf
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/templates_c
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/cache
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/config
%{_datadir}/phpTodo


%post
# SELinux probably needs work.
# Set SELinux file context in the policy
semanage fcontext -a -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
# Actually change the context
restorecon -R %{_datadir}/phpTodo/ || :
restorecon -R %{_sysconfdir}/phpTodo/ || :
restorecon -R %{_localstatedir}/cache/phpTodo/ || :


%postun
# SELinux support
if [ $1 -eq 0 ]; then  # final removal
  semanage fcontext -d -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
fi


%changelog
* Sat Sep 22 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.8.beta%{?dist}
- SELinux changes
- Improved initial mysql schema

* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.7.beta%{?dist}
- Updated location of Smarty for F7 rpm
- Added more useful message to be displayed when user has not configured
- or setup database before using phpTodo.

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.6.beta%{?dist}
- Updated license field re new guidelines

* Sun Jun 17 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.5.beta
- sourceforge mirror changed to downloads.sourceforge.net

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.4.beta
- SELinux post section added

* Tue May 29 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.3.beta
- Cleanup of SPEC file

* Sat Apr 28 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.2.beta
- Cleanup of SPEC file

* Thu Apr 10 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.1.beta
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:14:45 -0000	1.1
+++ .cvsignore	24 Sep 2007 23:07:35 -0000	1.2
@@ -0,0 +1 @@
+phpTodo-0.8.1beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:14:45 -0000	1.1
+++ sources	24 Sep 2007 23:07:35 -0000	1.2
@@ -0,0 +1 @@
+81293fbc69d691fb897fc007f8502efe  phpTodo-0.8.1beta.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:09:57 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 19:09:57 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch, 1.1, 1.2 xen.spec, 1.186,
	1.187
Message-ID: <200709242309.l8ON9vi8008263@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8166

Modified Files:
	xen-pvfb-04-compat.patch xen.spec 
Log Message:
Make 32-bit FC6 guests work on 64-bit host

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-04-compat.patch	24 Sep 2007 20:51:43 -0000	1.1
+++ xen-pvfb-04-compat.patch	24 Sep 2007 23:09:22 -0000	1.2
@@ -1,7 +1,7 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 13:46:13.000000000 -0400
-@@ -0,0 +1,569 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 18:51:06.000000000 -0400
+@@ -0,0 +1,610 @@
 +#include <stdarg.h>
 +#include <stdlib.h>
 +#include <sys/types.h>
@@ -9,6 +9,7 @@
 +#include <unistd.h>
 +#include <xenctrl.h>
 +#include <xen/io/xenbus.h>
++#include <xen/io/protocols.h>
 +#include <sys/select.h>
 +#include <stdbool.h>
 +#include <xen/linux/evtchn.h>
@@ -49,6 +50,7 @@
 +	struct xs_handle *xsh;	/* xs daemon handle */
 +	struct xenfb_device fb, kbd;
 +	size_t fb_len;		/* size of framebuffer */
++	char protocol[64];	/* frontend protocol */
 +};
 +
 +static void oldxenfb_detach_dom(struct xenfb_private *);
@@ -179,37 +181,72 @@
 +	return 0;
 +}
 +
++static void oldxenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src)
++{
++	uint32_t *src32 = src;
++	uint64_t *src64 = src;
++	int i;
++
++	for (i = 0; i < count; i++)
++		dst[i] = (mode == 32) ? src32[i] : src64[i];
++}
 +
 +static int oldxenfb_map_fb(struct xenfb_private *xenfb, int domid)
 +{
 +	struct xenfb_page *page = xenfb->fb.page;
 +	int n_fbmfns;
 +	int n_fbdirs;
-+	unsigned long *fbmfns;
++	unsigned long *pgmfns = NULL;
++	unsigned long *fbmfns = NULL;
++	void *map;
++	int mode, ret = -1;
++
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return -1;
 +
 +	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
-+	n_fbdirs = n_fbmfns * sizeof(unsigned long);
++	n_fbdirs = n_fbmfns * mode / 8;
 +	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
 +
++	pgmfns = malloc(sizeof(unsigned long) * n_fbdirs);
++	fbmfns = malloc(sizeof(unsigned long) * n_fbmfns);
++	if (!pgmfns || !fbmfns)
++		goto out;
++
 +	/*
 +	 * Bug alert: xc_map_foreign_batch() can fail partly and
 +	 * return a non-null value.  This is a design flaw.  When it
 +	 * happens, we happily continue here, and later crash on
 +	 * access.
 +	 */
-+	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
-+			PROT_READ, page->pd, n_fbdirs);
-+	if (fbmfns == NULL)
-+		return -1;
++	oldxenfb_copy_mfns(mode, n_fbdirs, pgmfns, page->pd);
++	map = xc_map_foreign_batch(xenfb->xc, domid,
++				   PROT_READ, pgmfns, n_fbdirs);
++	if (map == NULL)
++		goto out;
++	oldxenfb_copy_mfns(mode, n_fbmfns, fbmfns, map);
++	munmap(map, n_fbdirs * XC_PAGE_SIZE);
 +
 +	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
 +				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
 +	if (xenfb->pub.pixels == NULL) {
-+		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
-+		return -1;
++		goto out;
 +	}
 +
-+	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
++	ret = 0; /* all is fine */
++
++ out:
++	if (pgmfns)
++		free(pgmfns);
++	if (fbmfns)
++		free(fbmfns);
++	return ret;
 +}
 +
 +static int oldxenfb_bind(struct xenfb_device *dev)
@@ -319,6 +356,10 @@
 +	if (oldxenfb_bind(&xenfb->kbd) < 0)
 +		goto error;
 +
++	if (oldxenfb_xs_scanf1(xsh, xenfb->fb.otherend, "protocol", "%63s",
++			       xenfb->protocol) < 0)
++		xenfb->protocol[0] = '\0';
++
 +	/* TODO check for permitted ranges */
 +	fb_page = xenfb->fb.page;
 +	xenfb->pub.depth = fb_page->depth;
@@ -571,9 +612,9 @@
 +        xs_unwatch(xsh, p, "");
 +        return ret;
 +}
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 13:47:01.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 18:50:44.000000000 -0400
 @@ -0,0 +1,106 @@
 +/*
 + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
@@ -681,9 +722,9 @@
 +};
 +
 +#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 13:47:01.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 18:50:44.000000000 -0400
 @@ -0,0 +1,92 @@
 +/*
 + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
@@ -777,9 +818,9 @@
 +void xenkbd_resume(void);
 +
 +#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 13:44:38.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 18:50:44.000000000 -0400
 @@ -41,6 +41,7 @@ struct xenfb_private {
  	struct xenfb_device fb, kbd;
  	size_t fb_len;		/* size of framebuffer */
@@ -855,9 +896,9 @@
  	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
  	event.type = XENKBD_TYPE_POS;
  	event.pos.abs_x = abs_x;
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 13:47:37.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 18:50:44.000000000 -0400
 @@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
  int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
  int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
@@ -877,10 +918,10 @@
 +
 +
  #endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:48:04.000000000 -0400
-@@ -371,7 +376,7 @@ VL_OBJS+= xenstore.o
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 18:50:44.000000000 -0400
+@@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
  VL_OBJS+= xen_machine_fv.o
  VL_OBJS+= xen_machine_pv.o
@@ -889,10 +930,10 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:48:59.000000000 -0400
-@@ -53,7 +53,11 @@ class VfbifController(DevController):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:50:44.000000000 -0400
+@@ -50,7 +50,11 @@ class VfbifController(DevController):
          if self.vm.info.is_hvm():
              # is HVM, so qemu-dm will handle the vfb.
              return
@@ -905,10 +946,10 @@
          args = [ xen.util.auxbin.pathTo("qemu-dm"),
                   "-M", "xenpv",
                   "-d", "%d" % self.vm.getDomid(),
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 13:49:27.000000000 -0400
-@@ -690,7 +690,7 @@ class XendConfig(dict):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-05-18 10:45:21.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 18:50:44.000000000 -0400
+@@ -689,7 +689,7 @@ class XendConfig(dict):
          self['vtpm_refs'] = cfg.get('vtpm_refs', [])
  
          # coalesce hvm vnc frame buffer with vfb config
@@ -917,7 +958,7 @@
              # add vfb device if it isn't there already
              has_rfb = False
              for console_uuid in self['console_refs']:
-@@ -705,7 +705,7 @@ class XendConfig(dict):
+@@ -704,7 +704,7 @@ class XendConfig(dict):
                  dev_config = ['vfb']
                  # copy VNC related params from platform config to vfb dev conf
                  for key in ['vncpasswd', 'vncunused', 'vncdisplay',
@@ -926,9 +967,9 @@
                      if key in self['platform']:
                          dev_config.append([key, self['platform'][key]])
  
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
 --- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 13:49:55.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 18:50:44.000000000 -0400
 @@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
              d['type'] = 'sdl'
          for (k,v) in d.iteritems():


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- xen.spec	24 Sep 2007 21:55:52 -0000	1.186
+++ xen.spec	24 Sep 2007 23:09:22 -0000	1.187
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -276,6 +276,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
+- Make 32-bit FC-6 guest PVFB work on x86_64 host 
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
 - Re-add support for back-compat FC6 PVFB support
 - Fix handling of explicit port numbers (rhbz #279581)



From fedora-extras-commits at redhat.com  Mon Sep 24 23:14:37 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 19:14:37 -0400
Subject: rpms/perl-Time-Duration/F-7 perl-Time-Duration.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242314.l8ONEbAU008522@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/perl-Time-Duration/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8495/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Time-Duration.spec 
Log Message:
new package



--- NEW FILE perl-Time-Duration.spec ---
Name:           perl-Time-Duration
Summary:        Time-Duration - rounded or exact English expression of durations
Version:        1.06
Release:        2%{?dist}
License:        GPLv2+ or Artistic 2.0
Group:          Development/Libraries
Url:            http://search.cpan.org/dist/Time-Duration/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Source:         http://search.cpan.org//CPAN/authors/id/A/AV/AVIF/Time-Duration-%{version}.tar.gz
BuildRequires:  perl(Test::Pod::Coverage) perl(Test::Pod) perl(ExtUtils::MakeMaker)

%description
This module provides functions for expressing durations in rounded or exact
terms.


%prep
%setup -q -n Time-Duration-%{version} 


%check
make test


%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}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_mandir}/man3/*
%{perl_vendorlib}/Time


%changelog
* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-2
- Tidied build flas

* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-1
- Version update, Licence versions added

* Mon Jul 02 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-4
- Add ChangeLog to docs

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-3
- Specfile cleanup

* Fri Jun 01 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-2
- Specfile cleanup

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-1
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:12:42 -0000	1.1
+++ .cvsignore	24 Sep 2007 23:14:05 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:12:42 -0000	1.1
+++ sources	24 Sep 2007 23:14:05 -0000	1.2
@@ -0,0 +1 @@
+d65108e0e4e8ffb38e28d532f8ddcd12  Time-Duration-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:47:02 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 19:47:02 -0400
Subject: rpms/xen/devel xen-3.1.0-no-xenapi-docs.patch, NONE, 1.1 xen.spec, 
	1.187, 1.188
Message-ID: <200709242347.l8ONl2Bc009968@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935

Modified Files:
	xen.spec 
Added Files:
	xen-3.1.0-no-xenapi-docs.patch 
Log Message:
Fix xm man page

xen-3.1.0-no-xenapi-docs.patch:

--- NEW FILE xen-3.1.0-no-xenapi-docs.patch ---
diff -rup xen-3.1.0-src/docs/Makefile xen-3.1.0-src.new/docs/Makefile
--- xen-3.1.0-src/docs/Makefile	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/docs/Makefile	2007-06-14 16:29:21.000000000 -0400
@@ -22,9 +22,6 @@ all: build
 
 .PHONY: build
 build: ps pdf html man-pages
-	@if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
-	$(MAKE) -C xen-api build ; else                              \
-        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 .PHONY: dev-docs
@@ -67,7 +64,6 @@ man5/%.5: man/%.pod.5 Makefile
 
 .PHONY: clean
 clean:
-	$(MAKE) -C xen-api clean
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
 	rm -rf *.ilg *.log *.ind *.toc *.bak core
 	rm -rf $(GFX) ps pdf html
@@ -83,8 +79,6 @@ install: all
 	rm -rf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
 
-	$(MAKE) -C xen-api install
-
 	cp -dR ps $(DESTDIR)$(pkgdocdir)
 	cp -dR pdf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
Only in xen-3.1.0-src.new/docs: Makefile~


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- xen.spec	24 Sep 2007 23:09:22 -0000	1.187
+++ xen.spec	24 Sep 2007 23:46:30 -0000	1.188
@@ -29,6 +29,7 @@
 Patch31: xen-tpm-functions.patch
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
+Patch34: xen-3.1.0-no-xenapi-docs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -131,6 +132,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 # config patches
 %patch100 -p1
@@ -276,8 +278,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
+- Fix generation of manual pages (rhbz #250791)
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
-- Make 32-bit FC-6 guest PVFB work on x86_64 host 
+- Make 32-bit FC-6 guest PVFB work on x86_64 host
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
 - Re-add support for back-compat FC6 PVFB support



From fedora-extras-commits at redhat.com  Mon Sep 24 23:54:38 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 19:54:38 -0400
Subject: comps comps-f8.xml.in,1.120,1.121
Message-ID: <200709242354.l8ONscXf010242@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10213

Modified Files:
	comps-f8.xml.in 
Log Message:
- add baekmuk-ttf-fonts, baekmuk-bdf-fonts, and lohit-fonts



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- comps-f8.xml.in	24 Sep 2007 18:39:16 -0000	1.120
+++ comps-f8.xml.in	24 Sep 2007 23:54:08 -0000	1.121
@@ -308,21 +308,21 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
@@ -355,6 +355,7 @@
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -392,23 +393,26 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-malayalam</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-malayalam</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
@@ -417,6 +421,7 @@
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">gentium-fonts</packagereq>
@@ -446,6 +451,7 @@
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">bitmap-fonts-cjk</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 00:03:57 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Mon, 24 Sep 2007 20:03:57 -0400
Subject: rpms/rsyslog/devel .cvsignore, 1.10, 1.11 rsyslog.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200709250003.l8P03v47016541@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16489

Modified Files:
	.cvsignore rsyslog.spec sources 
Log Message:
upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Aug 2007 12:39:16 -0000	1.10
+++ .cvsignore	25 Sep 2007 00:03:24 -0000	1.11
@@ -1,3 +1,3 @@
 rsyslog.init
 rsyslog.sysconfig
-rsyslog-1.19.2.tar.gz
+rsyslog-1.19.6.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rsyslog.spec	28 Aug 2007 12:39:16 -0000	1.13
+++ rsyslog.spec	25 Sep 2007 00:03:24 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.2
+Version: 1.19.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -10,7 +10,6 @@
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.19.2-invertAppSelect.patch
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .invertAppSelect
 
 %build
 %configure --sbindir=%{sbindir} --disable-static
@@ -119,6 +117,9 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6
+- upstream bugfix release
+
 * Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1
 - upstream bugfix release
 - support for negative app selector, patch from 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Aug 2007 12:39:16 -0000	1.10
+++ sources	25 Sep 2007 00:03:24 -0000	1.11
@@ -1,3 +1,3 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
-d4066f735ce235bc2ef1f1409262ec57  rsyslog-1.19.2.tar.gz
+0aa4ea5d07d3c2ba3080b4a64280ff72  rsyslog-1.19.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 00:08:23 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Mon, 24 Sep 2007 20:08:23 -0400
Subject: rpms/kernel/devel linux-2.6-powerpc-FULL_REGS-on-exec.patch, NONE, 
	1.1 kernel.spec, 1.183, 1.184
Message-ID: <200709250008.l8P08NdU016754@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16733

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-powerpc-FULL_REGS-on-exec.patch 
Log Message:
Fix powerpc oops on ptrace after exec. (#301791)

linux-2.6-powerpc-FULL_REGS-on-exec.patch:

--- NEW FILE linux-2.6-powerpc-FULL_REGS-on-exec.patch ---
>From e3ca2dbae775573ae11243a57bcfd3337ec001a8 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Mon, 24 Sep 2007 16:46:40 -0700
Subject: [PATCH 2/2] powerpc: FULL_REGS on exec

When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at
the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in CHECK_FULL_REGS.
With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at
the (gdb) prompt is sufficient to produce this.  I also have written an
isolated test case, see https://bugzilla.redhat.com/show_bug.cgi?id=301791#c15.

This change fixes the problem by clearing the low bit of pt_regs.trap in
start_thread so that FULL_REGS is true again.  This is correct since all of
the GPRs that "full" refers to are cleared in start_thread.

Signed-off-by: Roland McGrath <roland at redhat.com>
---
 arch/powerpc/kernel/process.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index e477c9d..fd799d2 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -605,6 +605,13 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
 	regs->ccr = 0;
 	regs->gpr[1] = sp;
 
+	/*
+	 * We have just cleared all the nonvolatile GPRs, so make
+	 * FULL_REGS(regs) return true.  This is necessary to allow
+	 * ptrace to examine the thread immediately after exec.
+	 */
+	regs->trap &= ~1UL;
+
 #ifdef CONFIG_PPC32
 	regs->mq = 0;
 	regs->nip = start;
-- 
1.5.2.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- kernel.spec	24 Sep 2007 21:55:27 -0000	1.183
+++ kernel.spec	25 Sep 2007 00:07:50 -0000	1.184
@@ -590,6 +590,7 @@
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch141: linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
@@ -672,7 +673,7 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-Patch1600: linux-2.6-x86-edd-maxdrive.patch 
+Patch1600: linux-2.6-x86-edd-maxdrive.patch
 
 #nouveau
 Patch1800: drm-mm-git.patch
@@ -1037,7 +1038,8 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 # pegasos IDE
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-
+# fix RHBZ#301791
+ApplyPatch linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 # Exec shield
 ApplyPatch linux-2.6-execshield.patch
@@ -1214,7 +1216,7 @@
 # ---------- below all scheduled for 2.6.23 -----------------
 
 # EDD fix
-ApplyPatch linux-2.6-x86-edd-maxdrive.patch 
+ApplyPatch linux-2.6-x86-edd-maxdrive.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1807,6 +1809,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Roland McGrath <roland at redhat.com>
+- Fix powerpc oops on ptrace after exec. (#301791)
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - Disable generic RTC.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 00:16:32 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Mon, 24 Sep 2007 20:16:32 -0400
Subject: comps/po ja.po,1.5,1.6
Message-ID: <200709250016.l8P0GWiq017249@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223/po

Modified Files:
	ja.po 
Log Message:
translation 100% completed


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ja.po	17 Sep 2007 19:22:12 -0000	1.5
+++ ja.po	25 Sep 2007 00:16:02 -0000	1.6
@@ -1,24 +1,23 @@
-# translation of ja-new.po to Japanese
 # translation of ja.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
+#
 # James Hashida <khashida at redhat.com>, 2002.
 # Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007.
 # Hirofumi Saito <hi_saito at yk.rim.or.jp>, 2004, 2005.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-03-01 14:53+1000\n"
+"POT-Creation-Date: 2007-09-20 17:44-0700\n"
+"PO-Revision-Date: 2007-09-24 12:02+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
-"Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
+"Language-Team: Japanese\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-Generator: KBabel 1.11.4\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -190,8 +189,7 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
@@ -264,8 +262,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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 ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
@@ -328,8 +325,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -344,14 +340,12 @@
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
 #: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
@@ -388,8 +382,7 @@
 #: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
 #: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
 #: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
@@ -411,44 +404,33 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -510,19 +492,16 @@
 msgstr "???????????????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -545,23 +524,20 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -640,9 +616,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -669,9 +644,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -702,16 +676,14 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -734,9 +706,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -747,14 +718,12 @@
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????????????????????"
+msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -781,9 +750,8 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "????????????????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -806,9 +774,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -843,9 +810,8 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -872,9 +838,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -905,9 +870,8 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -926,21 +890,17 @@
 msgstr "Eclipse ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "????????????????????????????????????DHCP???Kerberos???NIS ????????? ????????????????????????????????????"
 "?????????????????????????????????"
@@ -992,8 +952,7 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "?????????????????????????????????????????????????????????????????? DNS ????????????????????? (BIND) ?????????"
 "???????????????"
@@ -1019,14 +978,12 @@
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "??????????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1045,18 +1002,16 @@
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1084,378 +1039,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Buildsystem ?????????????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse ???????????????????????????"
+msgstr "Eclipse ????????????????????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????????????????? Mozilla ????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "??????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr ""
-#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ????????????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "??????????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ?????????????????????????????? Mozilla ???????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib ???????????????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ??????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "System"
-#~ msgstr "????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ?????????????????????????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "?????????????????????????????????IMAP ??? Postfix ?????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "????????????????????????????????????Red Hat Enterprise Linux ?????????????????????????????????"
-#~ "????????????????????????????????????"
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ??????????????????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ????????????????????????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ??????????????????????????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "??????"
-
-#~ msgid "French"
-#~ msgstr "???????????????"
-
-#~ msgid "German"
-#~ msgstr "????????????"
-
-#~ msgid "Italian"
-#~ msgstr "???????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ??????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????? Red Hat Enterprise Linux ????????????"
-#~ "?????????????????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????????????????"
-#~ "??????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "??????????????????????????????????????? Red Hat Enterprise Linux ?????????????????????????????????"
-#~ "????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid "Japanese"
-#~ msgstr "?????????"
-
-#~ msgid "Korean"
-#~ msgstr "?????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "?????????(??????)"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "???????????????????????????????????? Red Hat Enterprise Linux ????????????????????????????????????"
-#~ "?????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "???????????????????????????????????? Red Hat Enterprise Linux ????????????????????????????????????"
-#~ "?????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????????????????????????????????(??????)??? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????????????????????????????????(??????)??? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????(??????)"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ????????????????????????????????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "???????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????? Red Hat Enterprise Linux ????????????????????????"
-#~ "?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "????????????????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "????????????????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "?????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????????????????????? GFS ??????????????????????????????????????????????????????"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????????????????? GFS ???????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "??????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java Runtime Environment ??????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "?????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "Red Hat Enterprise Linux ?????????????????????????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux ???????????????"
-
-#~ msgid "Workstation"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ??????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"



From fedora-extras-commits at redhat.com  Tue Sep 25 00:16:39 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Mon, 24 Sep 2007 20:16:39 -0400
Subject: rpms/rsyslog/devel rsyslog-1.19.2-invertAppSelect.patch,1.1,NONE
Message-ID: <200709250016.l8P0GdUK017258@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17243

Removed Files:
	rsyslog-1.19.2-invertAppSelect.patch 
Log Message:



--- rsyslog-1.19.2-invertAppSelect.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 00:18:53 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 20:18:53 -0400
Subject: rpms/xen/F-7 xen-3.1.0-no-xenapi-docs.patch, NONE,
	1.1 xen-pvfb-compat-32-on-64.patch, NONE, 1.1 xen.spec, 1.183, 1.184
Message-ID: <200709250018.l8P0Irn6017335@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17301

Modified Files:
	xen.spec 
Added Files:
	xen-3.1.0-no-xenapi-docs.patch xen-pvfb-compat-32-on-64.patch 
Log Message:
Added patch for FC6 32-on-64 compat. Fixed man page build

xen-3.1.0-no-xenapi-docs.patch:

--- NEW FILE xen-3.1.0-no-xenapi-docs.patch ---
diff -rup xen-3.1.0-src/docs/Makefile xen-3.1.0-src.new/docs/Makefile
--- xen-3.1.0-src/docs/Makefile	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/docs/Makefile	2007-06-14 16:29:21.000000000 -0400
@@ -22,9 +22,6 @@ all: build
 
 .PHONY: build
 build: ps pdf html man-pages
-	@if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
-	$(MAKE) -C xen-api build ; else                              \
-        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 .PHONY: dev-docs
@@ -67,7 +64,6 @@ man5/%.5: man/%.pod.5 Makefile
 
 .PHONY: clean
 clean:
-	$(MAKE) -C xen-api clean
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
 	rm -rf *.ilg *.log *.ind *.toc *.bak core
 	rm -rf $(GFX) ps pdf html
@@ -83,8 +79,6 @@ install: all
 	rm -rf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
 
-	$(MAKE) -C xen-api install
-
 	cp -dR ps $(DESTDIR)$(pkgdocdir)
 	cp -dR pdf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
Only in xen-3.1.0-src.new/docs: Makefile~

xen-pvfb-compat-32-on-64.patch:

--- NEW FILE xen-pvfb-compat-32-on-64.patch ---
diff -rup --exclude '*~' xen-3.1.0-src/tools/xenfb/oldxenfb.c xen-3.1.0-hacked/tools/xenfb/oldxenfb.c
--- xen-3.1.0-src/tools/xenfb/oldxenfb.c	2007-07-24 10:12:10.000000000 +0200
+++ xen-3.1.0-hacked/tools/xenfb/oldxenfb.c	2007-07-24 20:29:47.000000000 +0200
@@ -7,9 +7,9 @@
 #include <xen/io/xenbus.h>
 #include "oldxenfb.h"
 #include "oldxenkbd.h"
+#include <xen/io/protocols.h>
 #include <sys/select.h>
 #include <stdbool.h>
-#include <xen/linux/evtchn.h>
 #include <xen/event_channel.h>
 #include <sys/mman.h>
 #include <errno.h>
@@ -40,6 +40,7 @@ struct xenfb_private {
 	struct xs_handle *xsh;	/* xs daemon handle */
 	struct xenfb_device fb, kbd;
 	size_t fb_len;		/* size of framebuffer */
+	char protocol[64];	/* frontend protocol */
 };
 
 static void xenfb_detach_dom(struct xenfb_private *);
@@ -243,36 +244,71 @@ int xenfb_switch_to_old_protocol(char **
 	abort();
 }
 
+static void xenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src)
+{
+	uint32_t *src32 = src;
+	uint64_t *src64 = src;
+	int i;
+
+	for (i = 0; i < count; i++)
+		dst[i] = (mode == 32) ? src32[i] : src64[i];
+}
+
 static int xenfb_map_fb(struct xenfb_private *xenfb, int domid)
 {
 	struct xenfb_page *page = xenfb->fb.page;
 	int n_fbmfns;
 	int n_fbdirs;
-	unsigned long *fbmfns;
+	unsigned long *pgmfns = NULL;
+	unsigned long *fbmfns = NULL;
+	void *map;
+	int mode, ret = -1;
+
+	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
+	    mode = sizeof(unsigned long) * 8;
+	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
+	    mode = 32;
+	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
+	    mode = 64;
+	else
+	    return -1;
 
 	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
-	n_fbdirs = n_fbmfns * sizeof(unsigned long);
+	n_fbdirs = n_fbmfns * mode / 8;
 	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
 
+	pgmfns = malloc(sizeof(unsigned long) * n_fbdirs);
+	fbmfns = malloc(sizeof(unsigned long) * n_fbmfns);
+	if (!pgmfns || !fbmfns)
+		goto out;
+
 	/*
 	 * Bug alert: xc_map_foreign_batch() can fail partly and
 	 * return a non-null value.  This is a design flaw.  When it
 	 * happens, we happily continue here, and later crash on
 	 * access.
 	 */
-	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
-			PROT_READ, page->pd, n_fbdirs);
-	if (fbmfns == NULL)
-		return -1;
+	xenfb_copy_mfns(mode, n_fbdirs, pgmfns, page->pd);
+	map = xc_map_foreign_batch(xenfb->xc, domid,
+				   PROT_READ, pgmfns, n_fbdirs);
+	if (map == NULL)
+		goto out;
+	xenfb_copy_mfns(mode, n_fbmfns, fbmfns, map);
+	munmap(map, n_fbdirs * XC_PAGE_SIZE);
 
 	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
 				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
-	if (xenfb->pub.pixels == NULL) {
-		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
-		return -1;
-	}
+	if (xenfb->pub.pixels == NULL)
+		goto out;
+
+	ret = 0; /* all is fine */
 
-	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+ out:
+	if (pgmfns)
+		free(pgmfns);
+	if (fbmfns)
+		free(fbmfns);
+	return ret;
 }
 
 static int xenfb_bind(struct xenfb_device *dev)
@@ -373,7 +409,7 @@ int xenfb_attach_dom(struct xenfb *xenfb
 {
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	struct xs_handle *xsh = xenfb->xsh;
-	int val, serrno;
+	int serrno;
 	struct xenfb_page *fb_page;
 	union xenfb_in_event event;
 
@@ -392,6 +428,10 @@ int xenfb_attach_dom(struct xenfb *xenfb
 	if (xenfb_bind(&xenfb->kbd) < 0)
 		goto error;
 
+	if (xenfb_xs_scanf1(xsh, xenfb->fb.otherend, "protocol", "%63s",
+			    xenfb->protocol) < 0)
+		xenfb->protocol[0] = '\0';
+
 	/* TODO check for permitted ranges */
 	fb_page = xenfb->fb.page;
 	xenfb->pub.depth = fb_page->depth;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xen.spec	24 Sep 2007 21:53:37 -0000	1.183
+++ xen.spec	25 Sep 2007 00:18:20 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -26,6 +26,7 @@
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
+Patch34: xen-3.1.0-no-xenapi-docs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -37,6 +38,7 @@
 Patch150: xen-pvfb-compat.patch
 Patch151: xen-pvfb-terminate.patch
 Patch152: xen-pvfb-no-hvm.patch
+Patch153: xen-pvfb-compat-32-on-64.patch
 
 Patch251: pygrub-manykernels.patch
 
@@ -128,6 +130,7 @@
 
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 # config patches
 %patch100 -p1
@@ -138,6 +141,7 @@
 %patch150 -p1
 %patch151 -p1
 %patch152 -p1
+%patch153 -p1
 
 # upstream patches
 %patch251 -p1
@@ -276,6 +280,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
+- Fix generation of manual pages (rhbz #250791)
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
 - Fix VMX assist IRQ handling (rhbz #279581)
 



From fedora-extras-commits at redhat.com  Tue Sep 25 00:21:22 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 20:21:22 -0400
Subject: rpms/avahi/devel avahi-0.6.21-resolv-conf.patch, NONE,
	1.1 avahi.spec, 1.95, 1.96
Message-ID: <200709250021.l8P0LMjo017467@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17413

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.21-resolv-conf.patch 
Log Message:
fix segfault when no domain is defined in resolv.conf

avahi-0.6.21-resolv-conf.patch:

--- NEW FILE avahi-0.6.21-resolv-conf.patch ---
Index: /trunk/avahi-daemon/main.c
===================================================================
--- /trunk/avahi-daemon/main.c (revision 1513)
+++ /trunk/avahi-daemon/main.c (revision 1525)
@@ -317,4 +317,9 @@
     int n;
     char **p;
+
+    if (!resolv_conf_search_domains) {
+        avahi_server_set_browse_domains(avahi_server, NULL);
+        return;
+    }
 
     l = avahi_string_list_copy(config.server_config.browse_domains);


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- avahi.spec	6 Sep 2007 19:05:35 -0000	1.95
+++ avahi.spec	25 Sep 2007 00:20:49 -0000	1.96
@@ -6,10 +6,10 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
-License:        LGPL
+License:        LGPLv2
 URL:            http://avahi.org
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       dbus, expat
@@ -40,6 +40,7 @@
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch3:     avahi-0.6.21-initscript.patch
 Patch4:     avahi-0.6.21-libdns_sd-fix.patch
+Patch5:	    avahi-0.6.21-resolv-conf.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -225,6 +226,7 @@
 %endif
 %patch3 -p0 -b .initscript
 %patch4 -p0 -b .dns_sd
+%patch5 -p2 -b .resolv_conf
 
 %build
 
@@ -485,6 +487,9 @@
 %endif
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-6
+- resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)
+
 * Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-5
 - resolves #249044: Update init script to use runlevel 96
 - resolves #251700: Fix assertion in libdns_sd-compat



From fedora-extras-commits at redhat.com  Tue Sep 25 00:26:07 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 20:26:07 -0400
Subject: rpms/fmtools/FC-6 fmtools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709250026.l8P0Q74G017756@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17646

Modified Files:
	sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import for FC-6



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	25 Sep 2007 00:25:34 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:23 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:23 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli was added for trasher
Message-ID: <200709250110.l8P1AOJn012522@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package php-pear-MDB2-Driver-mysqli with summary This is the MySQL Improved MDB2 driver
Jason Tibbitts (tibbs) has approved Package php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has added a Fedora devel branch for php-pear-MDB2-Driver-mysqli with an owner of trasher
Jason Tibbitts (tibbs) has approved php-pear-MDB2-Driver-mysqli in Fedora devel
Jason Tibbitts (tibbs) has approved Package php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:35 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:35 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli (Fedora, devel) updated by tibbs
Message-ID: <200709250110.l8P1AapQ001651@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) Approved cvsextras for commit access on php-pear-MDB2-Driver-mysqli (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:35 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:35 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli (Fedora, 7) updated by tibbs
Message-ID: <200709250110.l8P1Aa9k001664@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on php-pear-MDB2-Driver-mysqli (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:12 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:12 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli - New directory
Message-ID: <200709250112.l8P1CCm6025032@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli

Log Message:
Directory /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:15 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:15 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel - New directory
Message-ID: <200709250112.l8P1CF1i025046@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:17 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:17 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200709250112.l8P1CHEg025071@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-MDB2-Driver-mysqli


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-MDB2-Driver-mysqli
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:19 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:19 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709250112.l8P1CJu1025087@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-MDB2-Driver-mysqli


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-MDB2-Driver-mysqli
# $Id: Makefile,v 1.1 2007/09/25 01:12:17 tibbs Exp $
NAME := php-pear-MDB2-Driver-mysqli
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:22:20 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:20 -0700
Subject: [pkgdb] python-fedora was added for toshio
Message-ID: <200709250122.l8P1MKYq015967@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package python-fedora with summary Python modules for talking to Fedora Infrastructure Services
Jason Tibbitts (tibbs) has approved Package python-fedora
Jason Tibbitts (tibbs) has added a Fedora devel branch for python-fedora with an owner of toshio
Jason Tibbitts (tibbs) has approved python-fedora in Fedora devel
Jason Tibbitts (tibbs) has approved Package python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:37 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:37 -0700
Subject: [pkgdb] python-fedora (Fedora, devel) updated by tibbs
Message-ID: <200709250122.l8P1Mbhh005012@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:37 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:37 -0700
Subject: [pkgdb] python-fedora (Fedora, 6) updated by tibbs
Message-ID: <200709250122.l8P1Mc4c005029@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 6 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:38 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:38 -0700
Subject: [pkgdb] python-fedora (Fedora EPEL, 5) updated by tibbs
Message-ID: <200709250122.l8P1Md8G005050@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora EPEL 5 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:38 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:38 -0700
Subject: [pkgdb] python-fedora (Fedora, 7) updated by tibbs
Message-ID: <200709250122.l8P1Me48005069@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:23 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:23 -0400
Subject: rpms/python-fedora - New directory
Message-ID: <200709250123.l8P1NNAT025481@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora

Log Message:
Directory /cvs/extras/rpms/python-fedora added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:27 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:27 -0400
Subject: rpms/python-fedora/devel - New directory
Message-ID: <200709250123.l8P1NRK0025494@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora/devel

Log Message:
Directory /cvs/extras/rpms/python-fedora/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:30 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:30 -0400
Subject: rpms/python-fedora Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250123.l8P1NUma025519@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-fedora


--- NEW FILE Makefile ---
# Top level Makefile for module python-fedora
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:33 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:33 -0400
Subject: rpms/python-fedora/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709250123.l8P1NXTn025535@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-fedora


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-fedora
# $Id: Makefile,v 1.1 2007/09/25 01:23:30 tibbs Exp $
NAME := python-fedora
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:29:04 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 21:29:04 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc8.bz2.sign, NONE, 1.1 .cvsignore, 
	1.693, 1.694 kernel.spec, 1.184,
	1.185 linux-2.6-utrace-core.patch, 1.7,
	1.8 linux-2.6-utrace-ptrace-compat.patch, 1.7,
	1.8 linux-2.6-utrace-regset.patch, 1.7,
	1.8 linux-2.6-utrace-tracehook.patch, 1.12, 1.13 sources, 1.655,
	1.656 upstream, 1.577, 1.578 patch-2.6.23-rc7-git5.bz2.sign, 1.1, NONE
Message-ID: <200709250129.l8P1T40O025902@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25855

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc8.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git5.bz2.sign 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc8



--- NEW FILE patch-2.6.23-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+Fw3yGugalF9Dw4RAitGAJ9ZOEPCefAH9up6h2meQHz+ajZ/8ACcDh7X
lwU0krRzk+2tz6gPOpG/3no=
=D1XL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -r1.693 -r1.694
--- .cvsignore	24 Sep 2007 14:37:26 -0000	1.693
+++ .cvsignore	25 Sep 2007 01:28:29 -0000	1.694
@@ -3,5 +3,5 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc7.bz2
+patch-2.6.23-rc8.bz2
 patch-2.6.23-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kernel.spec	25 Sep 2007 00:07:50 -0000	1.184
+++ kernel.spec	25 Sep 2007 01:28:29 -0000	1.185
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 7
+%define rcrev 8
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1809,6 +1809,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc8
+
 * Mon Sep 24 2007 Roland McGrath <roland at redhat.com>
 - Fix powerpc oops on ptrace after exec. (#301791)
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-core.patch	12 Sep 2007 00:16:26 -0000	1.7
+++ linux-2.6-utrace-core.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -3865,7 +3865,7 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -666,4 +666,24 @@ config STOP_MACHINE
+@@ -667,4 +667,24 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-ptrace-compat.patch	22 Sep 2007 11:45:40 -0000	1.7
+++ linux-2.6-utrace-ptrace-compat.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -204,7 +204,7 @@
 +#endif	/* CONFIG_PTRACE */
 --- linux-2.6/arch/x86_64/ia32/ia32entry.S
 +++ linux-2.6/arch/x86_64/ia32/ia32entry.S
-@@ -422,7 +422,7 @@ ia32_sys_call_table:
+@@ -434,7 +434,7 @@ ia32_sys_call_table:
  	.quad sys_setuid16
  	.quad sys_getuid16
  	.quad compat_sys_stime	/* stime */		/* 25 */
@@ -215,7 +215,7 @@
  	.quad sys_pause
 --- linux-2.6/arch/x86_64/kernel/ptrace.c
 +++ linux-2.6/arch/x86_64/kernel/ptrace.c
-@@ -726,6 +726,52 @@ const struct utrace_regset_view *utrace_
+@@ -722,6 +722,52 @@ const struct utrace_regset_view *utrace_
  }
  
  
@@ -1302,7 +1302,7 @@
  #include <linux/profile.h>
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
-@@ -892,6 +893,8 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -883,6 +884,8 @@ fastcall NORET_TYPE void do_exit(long co
  	tsk->flags |= PF_EXITING;
  	spin_unlock_irq(&tsk->pi_lock);
  
@@ -1311,7 +1311,7 @@
  	if (unlikely(in_atomic()))
  		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
  				current->comm, current->pid,
-@@ -1519,9 +1522,15 @@ check_continued:
+@@ -1510,9 +1513,15 @@ check_continued:
  				break;
  			}
  		}
@@ -3774,7 +3774,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -672,10 +672,21 @@ endmenu
+@@ -673,10 +673,21 @@ endmenu
  
  menu "Process debugging support"
  

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-regset.patch	22 Sep 2007 11:45:40 -0000	1.7
+++ linux-2.6-utrace-regset.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -2160,7 +2160,7 @@
  
  /*
   * does not yet catch signals sent when the child dies.
-@@ -237,52 +241,61 @@ static int putreg(struct task_struct *ch
+@@ -233,52 +237,61 @@ static int putreg(struct task_struct *ch
  	unsigned long tmp; 
  	
  	switch (regno) {
@@ -2268,7 +2268,7 @@
  	}
  	put_stack_long(child, regno - sizeof(struct pt_regs), value);
  	return 0;
-@@ -291,287 +304,428 @@ static int putreg(struct task_struct *ch
+@@ -287,287 +300,428 @@ static int putreg(struct task_struct *ch
  static unsigned long getreg(struct task_struct *child, unsigned long regno)
  {
  	unsigned long val;

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-utrace-tracehook.patch	22 Sep 2007 11:45:40 -0000	1.12
+++ linux-2.6-utrace-tracehook.patch	25 Sep 2007 01:28:29 -0000	1.13
@@ -257,7 +257,7 @@
  #include <linux/mount.h>
  #include <linux/security.h>
  #include <linux/syscalls.h>
-@@ -1153,13 +1153,7 @@ EXPORT_SYMBOL(prepare_binprm);
+@@ -1150,13 +1150,7 @@ EXPORT_SYMBOL(prepare_binprm);
  
  static int unsafe_exec(struct task_struct *p)
  {
@@ -272,7 +272,7 @@
  	if (atomic_read(&p->fs->count) > 1 ||
  	    atomic_read(&p->files->count) > 1 ||
  	    atomic_read(&p->sighand->count) > 1)
-@@ -1303,6 +1297,7 @@ int search_binary_handler(struct linux_b
+@@ -1300,6 +1294,7 @@ int search_binary_handler(struct linux_b
  				bprm->file = NULL;
  				current->did_exec = 1;
  				proc_exec_connector(current);
@@ -330,7 +330,7 @@
  	task->security = tsec;
  
  	return 0;
-@@ -1369,19 +1369,13 @@ static inline u32 file_to_av(struct file
+@@ -1371,19 +1371,13 @@ static inline u32 file_to_av(struct file
  
  static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
  {
@@ -351,7 +351,7 @@
  }
  
  static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
-@@ -1851,12 +1845,24 @@ static void selinux_bprm_apply_creds(str
+@@ -1853,12 +1847,24 @@ static void selinux_bprm_apply_creds(str
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and kill. */
  		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
@@ -382,7 +382,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2757,11 +2763,6 @@ static int selinux_task_alloc_security(s
+@@ -2759,11 +2765,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -394,7 +394,7 @@
  	return 0;
  }
  
-@@ -4544,6 +4545,7 @@ static int selinux_setprocattr(struct ta
+@@ -4546,6 +4547,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -402,7 +402,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -4632,18 +4634,24 @@ static int selinux_setprocattr(struct ta
+@@ -4634,18 +4636,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -914,7 +914,7 @@
  	printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",
 --- linux-2.6/arch/x86_64/ia32/ia32entry.S
 +++ linux-2.6/arch/x86_64/ia32/ia32entry.S
-@@ -321,7 +321,7 @@ ENTRY(ia32_syscall)
+@@ -333,7 +333,7 @@ ENTRY(ia32_syscall)
  	jnz ia32_tracesys
  ia32_do_syscall:	
  	cmpl $(IA32_NR_syscalls-1),%eax
@@ -923,7 +923,7 @@
  	IA32_ARG_FIXUP
  	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
  ia32_sysret:
-@@ -331,7 +331,7 @@ ia32_sysret:
+@@ -343,7 +343,7 @@ ia32_sysret:
  ia32_tracesys:			 
  	SAVE_REST
  	CLEAR_RREGS
@@ -931,7 +931,7 @@
 +	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
  	movq %rsp,%rdi        /* &pt_regs -> arg1 */
  	call syscall_trace_enter
- 	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
 --- linux-2.6/arch/x86_64/kernel/traps.c
 +++ linux-2.6/arch/x86_64/kernel/traps.c
 @@ -878,14 +878,6 @@ asmlinkage void __kprobes do_debug(struc
@@ -1000,7 +1000,7 @@
  }
  
  static int putreg(struct task_struct *child,
-@@ -442,7 +442,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -438,7 +438,7 @@ long arch_ptrace(struct task_struct *chi
  		clear_tsk_thread_flag(child, TIF_SINGLESTEP);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -1009,7 +1009,7 @@
  		wake_up_process(child);
  		ret = 0;
  		break;
-@@ -489,7 +489,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -485,7 +485,7 @@ long arch_ptrace(struct task_struct *chi
  		clear_tsk_thread_flag(child, TIF_SINGLESTEP);
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -1018,7 +1018,7 @@
  		wake_up_process(child);
  		break;
  
-@@ -498,7 +498,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -494,7 +494,7 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  		clear_tsk_thread_flag(child,TIF_SYSCALL_TRACE);
@@ -1027,7 +1027,7 @@
  		child->exit_code = data;
  		/* give it a chance to run. */
  		wake_up_process(child);
-@@ -572,37 +572,13 @@ long arch_ptrace(struct task_struct *chi
+@@ -568,37 +568,13 @@ long arch_ptrace(struct task_struct *chi
  	return ret;
  }
  
@@ -1067,7 +1067,7 @@
  
  	if (unlikely(current->audit_context)) {
  		if (test_thread_flag(TIF_IA32)) {
-@@ -624,8 +600,11 @@ asmlinkage void syscall_trace_leave(stru
+@@ -620,8 +596,11 @@ asmlinkage void syscall_trace_leave(stru
  	if (unlikely(current->audit_context))
  		audit_syscall_exit(AUDITSC_RESULT(regs->rax), regs->rax);
  
@@ -1144,7 +1144,7 @@
  	return ret;
 --- linux-2.6/arch/x86_64/kernel/process.c
 +++ linux-2.6/arch/x86_64/kernel/process.c
-@@ -700,11 +700,6 @@ long sys_execve(char __user *name, char 
+@@ -699,11 +699,6 @@ long sys_execve(char __user *name, char 
  	if (IS_ERR(filename)) 
  		return error;
  	error = do_execve(filename, argv, envp, &regs); 
@@ -1654,7 +1654,7 @@
  #include <linux/profile.h>
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
-@@ -156,11 +156,12 @@ void release_task(struct task_struct * p
+@@ -147,11 +147,12 @@ void release_task(struct task_struct * p
  {
  	struct task_struct *leader;
  	int zap_leader;
@@ -1669,7 +1669,7 @@
  	__exit_signal(p);
  
  	/*
-@@ -169,10 +170,14 @@ repeat:
+@@ -160,10 +161,14 @@ repeat:
  	 * group leader's parent process. (if it wants notification.)
  	 */
  	zap_leader = 0;
@@ -1685,7 +1685,7 @@
  		/*
  		 * If we were the last child thread and the leader has
  		 * exited already, and the leader's parent ignores SIGCHLD,
-@@ -182,6 +187,14 @@ repeat:
+@@ -173,6 +178,14 @@ repeat:
  		 * that case.
  		 */
  		zap_leader = (leader->exit_signal == -1);
@@ -1700,7 +1700,7 @@
  	}
  
  	write_unlock_irq(&tasklist_lock);
-@@ -192,6 +205,13 @@ repeat:
+@@ -183,6 +196,13 @@ repeat:
  	p = leader;
  	if (unlikely(zap_leader))
  		goto repeat;
@@ -1714,7 +1714,7 @@
  }
  
  /*
-@@ -231,10 +251,10 @@ static int will_become_orphaned_pgrp(str
+@@ -222,10 +242,10 @@ static int will_become_orphaned_pgrp(str
  	do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
  		if (p == ignored_task
  				|| p->exit_state
@@ -1728,7 +1728,7 @@
  			ret = 0;
  			break;
  		}
-@@ -283,10 +303,9 @@ static void reparent_to_kthreadd(void)
+@@ -274,10 +294,9 @@ static void reparent_to_kthreadd(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -1740,7 +1740,7 @@
  	add_parent(current);
  
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
-@@ -609,45 +628,23 @@ choose_new_parent(struct task_struct *p,
+@@ -600,45 +619,23 @@ choose_new_parent(struct task_struct *p,
  	 * the parent is not a zombie.
  	 */
  	BUG_ON(p == reaper || reaper->exit_state);
@@ -1790,7 +1790,7 @@
  		return;
  
  	/* We don't want people slaying init.  */
-@@ -657,7 +654,8 @@ reparent_thread(struct task_struct *p, s
+@@ -648,7 +645,8 @@ reparent_thread(struct task_struct *p, s
  	/* If we'd notified the old parent about this child's death,
  	 * also notify the new parent.
  	 */
@@ -1800,7 +1800,7 @@
  	    p->exit_signal != -1 && thread_group_empty(p))
  		do_notify_parent(p, p->exit_signal);
  
-@@ -687,7 +685,7 @@ reparent_thread(struct task_struct *p, s
+@@ -678,7 +676,7 @@ reparent_thread(struct task_struct *p, s
   * space.
   */
  static void
@@ -1809,7 +1809,7 @@
  {
  	struct task_struct *p, *reaper = father;
  	struct list_head *_p, *_n;
-@@ -700,48 +698,10 @@ forget_original_parent(struct task_struc
+@@ -691,48 +689,10 @@ forget_original_parent(struct task_struc
  		}
  	} while (reaper->exit_state);
  
@@ -1859,7 +1859,7 @@
  	}
  }
  
-@@ -753,8 +713,9 @@ static void exit_notify(struct task_stru
+@@ -744,8 +704,9 @@ static void exit_notify(struct task_stru
  {
  	int state;
  	struct task_struct *t;
@@ -1870,7 +1870,7 @@
  
  	if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT)
  	    && !thread_group_empty(tsk)) {
-@@ -787,10 +748,8 @@ static void exit_notify(struct task_stru
+@@ -778,10 +739,8 @@ static void exit_notify(struct task_stru
  	 *	jobs, send them a SIGHUP and then a SIGCONT.  (POSIX 3.2.2.2)
  	 */
  
@@ -1882,7 +1882,7 @@
  
  	/*
  	 * Check to see if any process groups have become orphaned
-@@ -802,7 +761,7 @@ static void exit_notify(struct task_stru
+@@ -793,7 +752,7 @@ static void exit_notify(struct task_stru
  	 * is about to become orphaned.
  	 */
  	 
@@ -1891,7 +1891,7 @@
  	
  	pgrp = task_pgrp(tsk);
  	if ((task_pgrp(t) != pgrp) &&
-@@ -833,30 +792,18 @@ static void exit_notify(struct task_stru
+@@ -824,30 +783,18 @@ static void exit_notify(struct task_stru
  	    && !capable(CAP_KILL))
  		tsk->exit_signal = SIGCHLD;
  
@@ -1927,7 +1927,7 @@
  
  	/* If the process is dead, release it - nobody will wait for it */
  	if (state == EXIT_DEAD)
-@@ -912,10 +859,7 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -903,10 +850,7 @@ fastcall NORET_TYPE void do_exit(long co
  	}
  
  
@@ -1939,7 +1939,7 @@
  
  	/*
  	 * We're taking recursive faults here in do_exit. Safest is to just
-@@ -1112,10 +1056,9 @@ static int eligible_child(pid_t pid, int
+@@ -1103,10 +1047,9 @@ static int eligible_child(pid_t pid, int
  	}
  
  	/*
@@ -1952,7 +1952,7 @@
  		return 0;
  
  	/* Wait for all children (clone and not) if __WALL is set;
-@@ -1187,7 +1130,7 @@ static int wait_task_zombie(struct task_
+@@ -1178,7 +1121,7 @@ static int wait_task_zombie(struct task_
  
  		if (unlikely(p->exit_state != EXIT_ZOMBIE))
  			return 0;
@@ -1961,7 +1961,7 @@
  			return 0;
  		get_task_struct(p);
  		read_unlock(&tasklist_lock);
-@@ -1211,15 +1154,9 @@ static int wait_task_zombie(struct task_
+@@ -1202,15 +1145,9 @@ static int wait_task_zombie(struct task_
  		BUG_ON(state != EXIT_DEAD);
  		return 0;
  	}
@@ -1979,7 +1979,7 @@
  		struct signal_struct *psig;
  		struct signal_struct *sig;
  
-@@ -1307,28 +1244,8 @@ static int wait_task_zombie(struct task_
+@@ -1298,28 +1235,8 @@ static int wait_task_zombie(struct task_
  		return retval;
  	}
  	retval = p->pid;
@@ -2010,7 +2010,7 @@
  	BUG_ON(!retval);
  	return retval;
  }
-@@ -1347,7 +1264,7 @@ static int wait_task_stopped(struct task
+@@ -1338,7 +1255,7 @@ static int wait_task_stopped(struct task
  
  	if (!p->exit_code)
  		return 0;
@@ -2019,7 +2019,7 @@
  	    p->signal && p->signal->group_stop_count > 0)
  		/*
  		 * A group stop is in progress and this is the group leader.
-@@ -1368,14 +1285,13 @@ static int wait_task_stopped(struct task
+@@ -1359,14 +1276,13 @@ static int wait_task_stopped(struct task
  	if (unlikely(noreap)) {
  		pid_t pid = p->pid;
  		uid_t uid = p->uid;
@@ -2036,7 +2036,7 @@
  					   infop, ru);
  	}
  
-@@ -1431,9 +1347,7 @@ bail_ref:
+@@ -1422,9 +1338,7 @@ bail_ref:
  	if (!retval && infop)
  		retval = put_user(0, &infop->si_errno);
  	if (!retval && infop)
@@ -2047,7 +2047,7 @@
  	if (!retval && infop)
  		retval = put_user(exit_code, &infop->si_status);
  	if (!retval && infop)
-@@ -1501,22 +1415,6 @@ static int wait_task_continued(struct ta
+@@ -1492,22 +1406,6 @@ static int wait_task_continued(struct ta
  }
  
  
@@ -2070,7 +2070,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1556,26 +1454,17 @@ repeat:
+@@ -1547,26 +1445,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -2101,7 +2101,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1600,6 +1489,10 @@ repeat:
+@@ -1591,6 +1480,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -2112,7 +2112,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1616,6 +1509,8 @@ check_continued:
+@@ -1607,6 +1500,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -2121,7 +2121,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1625,14 +1520,7 @@ check_continued:
+@@ -1616,14 +1511,7 @@ check_continued:
  			}
  		}
  		if (!flag) {
@@ -2137,7 +2137,7 @@
  		}
  		if (options & __WNOTHREAD)
  			break;
-@@ -1659,7 +1547,7 @@ end:
+@@ -1650,7 +1538,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -2602,7 +2602,7 @@
  		return 0;
  	return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) ||
  		(tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL);
-@@ -549,8 +548,6 @@ static int check_kill_permission(int sig
+@@ -547,8 +546,6 @@ static int check_kill_permission(int sig
  	return security_task_kill(t, info, sig, 0);
  }
  
@@ -2611,7 +2611,7 @@
  
  /*
   * Handle magic process-wide effects of stop/continue signals.
-@@ -893,7 +890,7 @@ __group_complete_signal(int sig, struct 
+@@ -891,7 +888,7 @@ __group_complete_signal(int sig, struct 
  	 */
  	if (sig_fatal(p, sig) && !(p->signal->flags & SIGNAL_GROUP_EXIT) &&
  	    !sigismember(&t->real_blocked, sig) &&
@@ -2620,7 +2620,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1447,8 +1444,7 @@ void do_notify_parent(struct task_struct
+@@ -1445,8 +1442,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2630,7 +2630,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1473,7 +1469,7 @@ void do_notify_parent(struct task_struct
+@@ -1471,7 +1467,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2639,7 +2639,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1501,20 +1497,13 @@ void do_notify_parent(struct task_struct
+@@ -1499,20 +1495,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2661,7 +2661,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1539,6 +1528,15 @@ static void do_notify_parent_cldstop(str
+@@ -1537,6 +1526,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2677,7 +2677,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1551,107 +1549,6 @@ static void do_notify_parent_cldstop(str
+@@ -1549,107 +1547,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2785,7 +2785,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1660,7 +1557,7 @@ finish_stop(int stop_count)
+@@ -1658,7 +1555,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -2794,7 +2794,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1787,44 +1684,24 @@ relock:
+@@ -1785,44 +1682,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -2855,7 +2855,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1873,7 +1750,7 @@ relock:
+@@ -1871,7 +1748,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -2864,7 +2864,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1902,13 +1779,13 @@ relock:
+@@ -1900,13 +1777,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -2880,7 +2880,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1920,7 +1797,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
+@@ -1918,7 +1795,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
  EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_proc);
@@ -3147,7 +3147,7 @@
  /*
   * current io wait handle: wait queue entry to use for io waits
   * If this thread is processing aio, this points at the waitqueue
-@@ -1526,6 +1515,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1528,6 +1517,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern void do_notify_parent(struct task_struct *, int);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -r1.655 -r1.656
--- sources	24 Sep 2007 14:37:26 -0000	1.655
+++ sources	25 Sep 2007 01:28:29 -0000	1.656
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-b9a6cb6a35b2ae0a25c357c59e7cdfc8  patch-2.6.23-rc7-git5.bz2
+114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- upstream	24 Sep 2007 14:37:26 -0000	1.577
+++ upstream	25 Sep 2007 01:28:29 -0000	1.578
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git5.bz2
+patch-2.6.23-rc8.bz2


--- patch-2.6.23-rc7-git5.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:31:42 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:31:42 -0700
Subject: [pkgdb] generic-logos was added for notting
Message-ID: <200709250131.l8P1VhnL018374@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package generic-logos with summary Icons and pictures
Jason Tibbitts (tibbs) has approved Package generic-logos
Jason Tibbitts (tibbs) has added a Fedora devel branch for generic-logos with an owner of notting
Jason Tibbitts (tibbs) has approved generic-logos in Fedora devel
Jason Tibbitts (tibbs) has approved Package generic-logos
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on generic-logos (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on generic-logos (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on generic-logos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/generic-logos



From fedora-extras-commits at redhat.com  Tue Sep 25 01:32:50 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:32:50 -0700
Subject: [pkgdb] SteGUI was added for pingou
Message-ID: <200709250132.l8P1WpZq007688@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package SteGUI with summary SteGUI is a graphical front-end to Steghide
Jason Tibbitts (tibbs) has approved Package SteGUI
Jason Tibbitts (tibbs) has added a Fedora devel branch for SteGUI with an owner of pingou
Jason Tibbitts (tibbs) has approved SteGUI in Fedora devel
Jason Tibbitts (tibbs) has approved Package SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, 6) updated by tibbs
Message-ID: <200709250133.l8P1X9cb018788@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 6 branch for SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, 7) updated by tibbs
Message-ID: <200709250133.l8P1XAud018800@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, devel) updated by tibbs
Message-ID: <200709250133.l8P1XA7s018811@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:22 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:22 -0400
Subject: rpms/SteGUI - New directory
Message-ID: <200709250133.l8P1XMDs026166@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI

Log Message:
Directory /cvs/extras/rpms/SteGUI added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:28 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:28 -0400
Subject: rpms/SteGUI/devel - New directory
Message-ID: <200709250133.l8P1XSsA026180@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI/devel

Log Message:
Directory /cvs/extras/rpms/SteGUI/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:31 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:31 -0400
Subject: rpms/SteGUI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250133.l8P1XVDN026205@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI

Added Files:
	Makefile import.log 
Log Message:
Setup of module SteGUI


--- NEW FILE Makefile ---
# Top level Makefile for module SteGUI
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:34 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:34 -0400
Subject: rpms/SteGUI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709250133.l8P1XYix026221@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SteGUI


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: SteGUI
# $Id: Makefile,v 1.1 2007/09/25 01:33:31 tibbs Exp $
NAME := SteGUI
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:34:05 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:05 -0400
Subject: rpms/generic-logos - New directory
Message-ID: <200709250134.l8P1Y5nB026428@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos

Log Message:
Directory /cvs/extras/rpms/generic-logos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:11 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:11 -0400
Subject: rpms/generic-logos/devel - New directory
Message-ID: <200709250134.l8P1YB5G026442@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos/devel

Log Message:
Directory /cvs/extras/rpms/generic-logos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:13 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:13 -0400
Subject: rpms/generic-logos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250134.l8P1YDWd026467@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos

Added Files:
	Makefile import.log 
Log Message:
Setup of module generic-logos


--- NEW FILE Makefile ---
# Top level Makefile for module generic-logos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:15 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:15 -0400
Subject: rpms/generic-logos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709250134.l8P1YF6l026483@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module generic-logos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: generic-logos
# $Id: Makefile,v 1.1 2007/09/25 01:34:13 tibbs Exp $
NAME := generic-logos
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:38:09 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:38:09 -0700
Subject: [pkgdb] libxcb (Fedora, 7) updated by tibbs
Message-ID: <200709250138.l8P1cAlu020117@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for libxcb
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on libxcb (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on libxcb (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on libxcb (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libxcb



From fedora-extras-commits at redhat.com  Tue Sep 25 01:39:44 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:39:44 -0700
Subject: [pkgdb] optipng (Fedora EPEL, 5) updated by tibbs
Message-ID: <200709250139.l8P1dj6Y009462@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora EPEL 5 branch for optipng
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on optipng (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on optipng (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 01:40:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 24 Sep 2007 21:40:52 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.167,1.168
Message-ID: <200709250140.l8P1eqIB026782@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26693

Modified Files:
	gnome-screensaver.spec 
Log Message:
Fix up requires



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-screensaver.spec	21 Sep 2007 23:56:23 -0000	1.167
+++ gnome-screensaver.spec	25 Sep 2007 01:40:19 -0000	1.168
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -55,7 +55,9 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libglade2 >= %{libglade2_version}
 Requires: libxml2 >= %{libxml2_version}
-Requires: GConf2 >= %{gconf2_version}
+Requires(pre): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
+Requires(post): GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
@@ -136,7 +138,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
-* Fri Sep 21 2007 Matthisa Clasen <mclasen at redhat.com> - 2.20.0-4
+* Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Fix up GConf requires (#220547)
+
+* Fri Sep 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-4
 - Add %%pre scriptlet
 
 * Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3



From fedora-extras-commits at redhat.com  Tue Sep 25 01:45:29 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Mon, 24 Sep 2007 21:45:29 -0400
Subject: rpms/nhpf/devel nhpf.spec,1.13,1.14
Message-ID: <200709250145.l8P1jTW6026943@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/nhpf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26880

Modified Files:
	nhpf.spec 
Log Message:
Bug 249975 Processed: nhpf not built with $RPM_OPT_FLAGS.



Index: nhpf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nhpf/devel/nhpf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nhpf.spec	12 Jul 2006 07:28:44 -0000	1.13
+++ nhpf.spec	25 Sep 2007 01:44:56 -0000	1.14
@@ -1,12 +1,12 @@
-Summary:	Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
-Name:		nhpf
-Version:	1.42
-Release: 9.2.2
-License:	Distributable
-Group:		Applications/Text
-Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
-URL:		http://cglab.snu.ac.kr/~yjlee/n3f/applications/nhpf.html
-Buildroot: 	%{_tmppath}/%{name}-%{version}-buildroot
+Name:         nhpf
+Summary:      Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
+Version:      1.42
+Release:      10
+License:      Distributable
+URL:          http://cglab.snu.ac.kr/~yjlee/n3f/applications/nhpf.html
+Group:        Applications/Text
+Buildroot:    %{_tmppath}/%{name}-%{version}-buildroot
+Source0:      ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
 
 %description
 The filtered PS file is self-contained, because this program appends
@@ -18,7 +18,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-make
+make CFLAG="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,6 +36,10 @@
 %attr(755,root,root)/usr/bin/nhpf
 
 %changelog
+* Tue Sep 26 2007 Caius Chance  <cchance at redhat.com> - 1.42-10
+- Resolves: rhbz#249975 (nhpf not built with $RPM_OPT_FLAGS.)
+  <<< Fixed CFLAGS in Makefile for more meaningful debuginfo.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2.2
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:05:35 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:05:35 -0400
Subject: rpms/padevchooser/devel .cvsignore, 1.3, 1.4 padevchooser.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709250205.l8P25ZCr001278@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/padevchooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1243

Modified Files:
	.cvsignore padevchooser.spec sources 
Log Message:
update from svn


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 01:44:54 -0000	1.3
+++ .cvsignore	25 Sep 2007 02:05:02 -0000	1.4
@@ -1 +1 @@
-padevchooser-0.9.4.svn20070816.tar.gz
+padevchooser-0.9.4.svn20070925.tar.gz


Index: padevchooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/padevchooser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- padevchooser.spec	16 Aug 2007 02:02:20 -0000	1.3
+++ padevchooser.spec	25 Sep 2007 02:05:02 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           padevchooser
 Version:        0.9.4
-Release:        0.2.svn20070816%{?dist}
+Release:        0.3.svn20070925%{?dist}
 Summary:        Control applet for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://0pointer.de/lennart/projects/padevchooser
-Source0:	padevchooser-0.9.4.svn20070816.tar.gz
+Source0:	padevchooser-0.9.4.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/padevchooser/padevchooser-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +27,6 @@
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -51,6 +50,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.4-0.3.svn20070825
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.4-0.2.svn20070816
 - Add gnome-desktop-devel and libgnomeui-devel to the deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 01:44:54 -0000	1.3
+++ sources	25 Sep 2007 02:05:02 -0000	1.4
@@ -1 +1 @@
-8439983f1c266ede15b6e9ee128edaa8  padevchooser-0.9.4.svn20070816.tar.gz
+164cc955445b3165d49f3de48e9551cf  padevchooser-0.9.4.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:08:44 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:08:44 -0400
Subject: rpms/pavumeter/devel .cvsignore, 1.3, 1.4 pavumeter.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200709250208.l8P28i8M002617@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavumeter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2146

Modified Files:
	.cvsignore pavumeter.spec sources 
Log Message:
update from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 10:33:07 -0000	1.3
+++ .cvsignore	25 Sep 2007 02:08:11 -0000	1.4
@@ -1 +1 @@
-pavumeter-0.9.3.svn20070816.tar.gz
+pavumeter-0.9.3.svn20070925.tar.gz


Index: pavumeter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/pavumeter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pavumeter.spec	16 Aug 2007 10:33:07 -0000	1.2
+++ pavumeter.spec	25 Sep 2007 02:08:11 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           pavumeter
 Version:        0.9.3
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070925%{?dist}
 Summary:        Volume meter for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://0pointer.de/lennart/projects/pavumeter
-Source0:	pavumeter-0.9.3.svn20070816.tar.gz
+Source0:	pavumeter-0.9.3.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavumeter/pavumeter-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +49,10 @@
 
 
 %changelog
-* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.6.svn20070816
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.2.svn20070925
+- Update from SVN snapshot
+
+* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.1.svn20070816
 - Update from SVN snapshot
 
 * Sat Sep  9 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 10:33:07 -0000	1.3
+++ sources	25 Sep 2007 02:08:11 -0000	1.4
@@ -1 +1 @@
-674357e03893c9e69a64e44366bee00e  pavumeter-0.9.3.svn20070816.tar.gz
+e5f6657e3b68d7fe2d586f91d9f797c4  pavumeter-0.9.3.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:14:32 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 22:14:32 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec,1.1,1.2
Message-ID: <200709250214.l8P2EWvR003733@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3710

Modified Files:
	baekmuk-bdf-fonts.spec 
Log Message:
fix name of fonts.alias file



Index: baekmuk-bdf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel/baekmuk-bdf-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baekmuk-bdf-fonts.spec	24 Sep 2007 12:15:20 -0000	1.1
+++ baekmuk-bdf-fonts.spec	25 Sep 2007 02:14:00 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           %{upstreamname}-fonts
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Korean bitmap fonts
 
 Group:          User Interface/X
@@ -36,7 +36,7 @@
 
 # for bmp font
 install -m 0644 bdf/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/
-install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/ttfonts-ko.alias
+install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/
 
 # for catalogue
 install -d $RPM_BUILD_ROOT%{catalogue}
@@ -72,6 +72,9 @@
 %{catalogue}/%{name}
 
 %changelog
+* Tue Sep 25 2007 Jens Petersen <petersen at redhat.com> - 2.2-4
+- fix name of fonts.alias file
+
 * Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
 - conflict with fonts-korean < 2.2-5
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:17:40 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:17:40 -0400
Subject: rpms/pavucontrol/devel .cvsignore, 1.4, 1.5 pavucontrol.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200709250217.l8P2HeUU003844@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3817

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
new snapshot from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Sep 2007 00:30:52 -0000	1.4
+++ .cvsignore	25 Sep 2007 02:17:08 -0000	1.5
@@ -1 +1 @@
-pavucontrol-0.9.5.svn20070905.tar.gz
+pavucontrol-0.9.5.svn20070925.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pavucontrol.spec	5 Sep 2007 12:42:39 -0000	1.5
+++ pavucontrol.spec	25 Sep 2007 02:17:08 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.3.svn20070905%{?dist}
+Release:        0.4.svn20070925%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:	pavucontrol-0.9.5.svn20070905.tar.gz
+Source0:	pavucontrol-0.9.5.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.4.svn20070925
+- Update from SVN
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.3.svn20070905
 - Add versioned dependency on pulseaudio-libs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Sep 2007 00:30:52 -0000	1.4
+++ sources	25 Sep 2007 02:17:08 -0000	1.5
@@ -1 +1 @@
-a04b6fd8abe33c2a3447bbfa85a8067c  pavucontrol-0.9.5.svn20070905.tar.gz
+33c034fbcc0472c81912c097e9dbd6ff  pavucontrol-0.9.5.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:23:14 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 22:23:14 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec,1.2,1.3
Message-ID: <200709250223.l8P2NEn1004420@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392

Modified Files:
	baekmuk-bdf-fonts.spec 
Log Message:
update filelist for fonts.alias



Index: baekmuk-bdf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel/baekmuk-bdf-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- baekmuk-bdf-fonts.spec	25 Sep 2007 02:14:00 -0000	1.2
+++ baekmuk-bdf-fonts.spec	25 Sep 2007 02:22:42 -0000	1.3
@@ -67,7 +67,7 @@
 %doc COPYRIGHT COPYRIGHT.ko README
 %dir %{fontdir}
 %{fontdir}/*.gz
-%{fontdir}/ttfonts-ko.alias
+%{fontdir}/fonts.alias
 %verify(not md5 size mtime) %{fontdir}/fonts.dir
 %{catalogue}/%{name}
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:25:12 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:25:12 -0400
Subject: rpms/paprefs/devel paprefs.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200709250225.l8P2PC49004516@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496

Modified Files:
	paprefs.spec sources 
Log Message:
update from SVN


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paprefs.spec	16 Aug 2007 10:30:19 -0000	1.3
+++ paprefs.spec	25 Sep 2007 02:24:39 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           paprefs
 Version:        0.9.6
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070925%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
-Source0:        paprefs-0.9.6.svn20070816.tar.gz
+Source0:        paprefs-0.9.6.svn20070925.tar.gz
 #http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
@@ -51,6 +51,9 @@
 %{_datadir}/locale/*
 
 %changelog
+* Thu Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.6-0.2.svn20070925
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.6-0.1.svn20070816
 - Get snapshot from SVN
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Aug 2007 10:30:19 -0000	1.2
+++ sources	25 Sep 2007 02:24:39 -0000	1.3
@@ -1 +1 @@
-4b5358e60cae8663b706b1fecf342715  paprefs-0.9.6.svn20070816.tar.gz
+cef2d943fcf28b9d5d38ec66b727c0c9  paprefs-0.9.6.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:49:39 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 24 Sep 2007 22:49:39 -0400
Subject: rpms/kcc/devel kcc.spec,1.19,1.20
Message-ID: <200709250249.l8P2ndt5005272@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5254

Modified Files:
	kcc.spec 
Log Message:
more clean up


Index: kcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kcc.spec	21 Sep 2007 06:43:56 -0000	1.19
+++ kcc.spec	25 Sep 2007 02:49:07 -0000	1.20
@@ -45,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README 
 %{_bindir}/kcc
 %lang(ja) %{_mandir}/ja/man1/kcc.1*



From fedora-extras-commits at redhat.com  Tue Sep 25 02:49:54 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 19:49:54 -0700
Subject: [pkgdb] eclipse-cdt: overholt has requested commit
Message-ID: <200709250249.l8P2ntrq029410@app4.fedora.phx.redhat.com>

Andrew Overholt (overholt) has requested the commit acl on eclipse-cdt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From fedora-extras-commits at redhat.com  Tue Sep 25 02:54:34 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 24 Sep 2007 19:54:34 -0700
Subject: [pkgdb] eclipse-cdt had acl change status
Message-ID: <200709250254.l8P2sYdg030722@app4.fedora.phx.redhat.com>

Jeff Johnston (jjohnstn) has set the commit acl on eclipse-cdt (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From fedora-extras-commits at redhat.com  Tue Sep 25 03:05:19 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 23:05:19 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.10, 1.11 pulseaudio.spec, 1.18, 
	1.19 sources, 1.12, 1.13
Message-ID: <200709250305.l8P35JD0011732@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11706

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
update from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 23:54:15 -0000	1.10
+++ .cvsignore	25 Sep 2007 03:04:46 -0000	1.11
@@ -1,2 +1 @@
-pulseaudio-0.9.7.svn20070907.tar.gz
-libflashsupport-pulse-000.svn20070904.tar.gz
+pulseaudio-0.9.7.svn20070925.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pulseaudio.spec	6 Sep 2007 23:54:15 -0000	1.18
+++ pulseaudio.spec	25 Sep 2007 03:04:46 -0000	1.19
@@ -3,12 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.11.svn20070907%{?dist}
+Release:	0.12.svn20070925%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070907.tar.gz
-Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070925.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -35,7 +34,7 @@
 Summary:	PulseAudio EsounD daemon compatibility script
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
-Conflicts:	esound
+Provides:	esound
 Obsoletes:      esound
 
 %description esound-compat
@@ -82,43 +81,51 @@
 %description module-gconf
 GConf configuration backend for the PulseAudio sound server.
 
-%package lib
+%package libs
 Summary:	Libraries for PulseAudio clients
 License:	LGPLv2+
 Group:		System Environment/Libraries
+Provides:	pulseaudio-lib
+Obsoletes:      pulseaudio-lib
 
-%description lib
+%description libs
 This package contains the runtime libraries for any application that wishes
 to interface with a PulseAudio sound server.
 
-%package lib-glib2
+%package libs-glib2
 Summary:	GLIB 2.x bindings for PulseAudio clients
 License:	LGPLv2+
 Group:		System Environment/Libraries
+Provides:	pulseaudio-lib-glib2
+Obsoletes:      pulseaudio-lib-glib2
 
-%description lib-glib2
+%description libs-glib2
 This package contains bindings to integrate the PulseAudio client library with
 a GLIB 2.x based application.
 
-%package lib-zeroconf
+%package libs-zeroconf
 Summary:    Zeroconf support for PulseAudio clients
 License:	LGPLv2+
 Group:      System Environment/Libraries
+Provides:	pulseaudio-lib-zeroconf
+Obsoletes:      pulseaudio-lib-zeroconf
 
-%description lib-zeroconf
+%description libs-zeroconf
 This package contains the runtime libraries and tools that allow PulseAudio
 clients to automatically detect PulseAudio servers using Zeroconf.
 
-%package lib-devel
+%package libs-devel
 Summary:	Headers and libraries for PulseAudio client development
 License:	LGPLv2+
 Group:		Development/Libraries
-Requires:	%{name}-lib = %{version}-%{release}
-Requires:	%{name}-lib-glib2 = %{version}-%{release}
-Requires:	%{name}-lib-zeroconf = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs-glib2 = %{version}-%{release}
+Requires:	%{name}-libs-zeroconf = %{version}-%{release}
 Requires:   pkgconfig glib2-devel
+Provides:	pulseaudio-lib-devel
+Obsoletes:      pulseaudio-lib-devel
 
-%description lib-devel
+%description libs-devel
 Headers and libraries for developing applications that can communicate with
 a PulseAudio sound server.
 
@@ -126,13 +133,12 @@
 Summary:	PulseAudio sound server utilities
 License:	LGPLv2+
 Group:		Applications/Multimedia
-Requires:	%{name}-lib = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description utils
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b1 -n libflashsupport-pulse-000
 %setup -q -T -b0
 %patch1 -p1
 
@@ -140,18 +146,10 @@
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
-export PULSEAUDIO_SOURCES=`pwd`
-pushd ../libflashsupport-pulse-000
-%configure --disable-rpath
-make LIBTOOL=/usr/bin/libtool
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-pushd ../libflashsupport-pulse-000
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la
 # configure --disable-static had no effect; delete manually.
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -179,14 +177,14 @@
     groupdel pulse-access &>/dev/null || :
 fi
 
-%post lib -p /sbin/ldconfig
-%postun lib -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
-%post lib-glib2 -p /sbin/ldconfig
-%postun lib-glib2 -p /sbin/ldconfig
+%post libs-glib2 -p /sbin/ldconfig
+%postun libs-glib2 -p /sbin/ldconfig
 
-%post lib-zeroconf -p /sbin/ldconfig
-%postun lib-zeroconf -p /sbin/ldconfig
+%post libs-zeroconf -p /sbin/ldconfig
+%postun libs-zeroconf -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -248,8 +246,8 @@
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so
 %{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so
-#%{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
-#%{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
+%{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
+%{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
 %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-sine.so
@@ -258,6 +256,8 @@
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
 %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
+%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so
+%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
 
 %files esound-compat
 %defattr(-,root,root)
@@ -292,25 +292,24 @@
 %{_libdir}/pulse-%{drvver}/modules/module-gconf.so
 %{_libexecdir}/pulse/gconf-helper
 
-%files lib
+%files libs
 %defattr(-,root,root)
 %doc README LICENSE GPL LGPL
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.*
 %{_libdir}/libpulse-simple.so.*
-%{_libdir}/libflashsupport.so
 
-%files lib-glib2
+%files libs-glib2
 %defattr(-,root,root)
 %{_libdir}/libpulse-mainloop-glib.so.*
 
-%files lib-zeroconf
+%files libs-zeroconf
 %defattr(-,root,root)
 %{_bindir}/pabrowse
 %{_libdir}/libpulse-browse.so.*
 
-%files lib-devel
+%files libs-devel
 %defattr(-,root,root)
 %doc doxygen/html
 %{_includedir}/pulse/
@@ -334,6 +333,12 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.12.svn20070925
+- New SVN snapshot
+- Split off libflashsupport again
+- Rename "-lib" packages to "-libs", like all other packages do it.
+- Provide esound
+
 * Fri Sep 7 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.11.svn20070907
 - Update SVN snapshot, don't link libpulsecore.so statically anymore
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2007 23:54:15 -0000	1.12
+++ sources	25 Sep 2007 03:04:46 -0000	1.13
@@ -1,2 +1 @@
-2cf935e7b91fb0cffca558c511df8213  pulseaudio-0.9.7.svn20070907.tar.gz
-07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz
+2503ce94200e8c79b1f1e77fd922b0e3  pulseaudio-0.9.7.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 03:26:22 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 23:26:22 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.32, 1.33 eclipse-cdt.spec, 1.85,
	1.86 sources, 1.40, 1.41
Message-ID: <200709250326.l8P3QMI0012192@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12163

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

Update fetched CDT tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	10 Sep 2007 22:12:19 -0000	1.32
+++ .cvsignore	25 Sep 2007 03:25:50 -0000	1.33
@@ -5,3 +5,5 @@
 eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+eclipse-cdt-fetched-src-v200709241202.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- eclipse-cdt.spec	13 Sep 2007 22:52:28 -0000	1.85
+++ eclipse-cdt.spec	25 Sep 2007 03:25:50 -0000	1.86
@@ -4,7 +4,7 @@
 %define major                   4
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_datadir}/eclipse
 %define eclipse_lib_base        %{_libdir}/eclipse
 
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        0.1.v200709241202cvs%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -31,19 +31,19 @@
 # mkdir -p temp && cd temp
 # mkdir -p home
 # rm -rf org.eclipse.cdt-releng
-# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_0 org.eclipse.cdt-releng/org.eclipse.cdt.releng
+# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r v200709241202 org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
 # sed --in-place 's/home/cvsroot/' maps/cdt.map
 # sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-# sed --in-place -e'124,126d' build.xml
+# sed --in-place -e'123,126d' build.xml
 # eclipse -nosplash -Duser.home=../../home \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
-#   -DcdtTag=CDT_4_0_0 \
+#   -DcdtTag=v200709241202 \
 #   -DdontUnzip=true fetch
 # find . -name net.*.jar -exec rm {} \;
 # pushd results/features
@@ -58,11 +58,11 @@
 # sed --in-place -e "44,47d" feature.xml
 # sed --in-place -e "24,31d" feature.xml
 # popd
-# cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-v200709241202.tar.bz2 org.eclipse.cdt.releng
 
-Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
+Source0: %{name}-fetched-src-v200709241202.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -355,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
+- 4.0.1 RC.
+- Update autotools for Binaries fix.
+
 * Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
 - Resolves #288711
 - Ensure that all features are unpacked.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	10 Sep 2007 22:12:19 -0000	1.40
+++ sources	25 Sep 2007 03:25:50 -0000	1.41
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-089752c5437767e4756b893da17a7574  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-19ec953175bc545859ed0da61c1d3535  eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+131b053e65febfca5891d46448c986ae  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+0d981af2ad657299d1fe4894401995b5  eclipse-cdt-fetched-src-v200709241202.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 03:36:56 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Mon, 24 Sep 2007 23:36:56 -0400
Subject: rpms/firefox/devel firefox-2.0-startup-notify.patch, NONE,
	1.1 firefox-redhat-default-prefs.js, 1.9, 1.10 firefox.spec,
	1.196, 1.197
Message-ID: <200709250336.l8P3auOo012417@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379

Modified Files:
	firefox-redhat-default-prefs.js firefox.spec 
Added Files:
	firefox-2.0-startup-notify.patch 
Log Message:
* Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
- Startup notification support


firefox-2.0-startup-notify.patch:

--- NEW FILE firefox-2.0-startup-notify.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=223492

--- config/autoconf.mk.in	2006-09-14 14:07:03.000000000 -0400
+++ config/autoconf.mk.in	2007-07-03 18:01:36.000000000 -0400
@@ -223,6 +223,10 @@
 MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
 MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@
 
+MOZ_ENABLE_STARTUP_NOTIFICATION = @MOZ_ENABLE_STARTUP_NOTIFICATION@
+MOZ_STARTUP_NOTIFICATION_CFLAGS = @MOZ_STARTUP_NOTIFICATION_CFLAGS@
+MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STARTUP_NOTIFICATION_LIBS@
+
 MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@
 MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@
 
--- toolkit/components/remote/nsGTKRemoteService.cpp	2006-01-05 22:19:20.000000000 -0500
+++ toolkit/components/remote/nsGTKRemoteService.cpp	2007-07-05 17:34:41.000000000 -0400
@@ -50,7 +50,9 @@
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
+#include "nsIDocument.h"
 #include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
 #include "nsIGenericFactory.h"
 #include "nsILocalFile.h"
 #include "nsIObserverService.h"
@@ -58,6 +60,8 @@
 #include "nsIServiceManager.h"
 #include "nsIWeakReference.h"
 #include "nsIWidget.h"
+#include "nsIAppShellService.h"
+#include "nsAppShellCID.h"
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
@@ -65,6 +69,10 @@
 #include "prenv.h"
 #include "nsCRT.h"
 
+#ifdef MOZ_WIDGET_GTK2
+#include "nsGTKToolkit.h"
+#endif
+
 #ifdef MOZ_XUL_APP
 #include "nsICommandLineRunner.h"
 #include "nsXULAppAPI.h"
@@ -155,20 +163,46 @@
   return PL_DHASH_NEXT;
 }
 
+static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow)
+{
+  // get the native window for this instance
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, nsnull);
+  nsCOMPtr<nsIDocument> doc(do_QueryInterface(window->GetExtantDocument()));
+  NS_ENSURE_TRUE(doc, nsnull);
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(container));
+  NS_ENSURE_TRUE(baseWindow, nsnull);
+ 
+   nsCOMPtr<nsIWidget> mainWidget;
+   baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  return mainWidget;
+}
+
+static nsGTKToolkit* GetGTKToolkit()
+{
+  nsCOMPtr<nsIAppShellService> svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID);
+  if (!svc)
+    return nsnull;
+  nsCOMPtr<nsIDOMWindowInternal> window;
+  svc->GetHiddenDOMWindow(getter_AddRefs(window));
+  if (!window)
+    return nsnull;
+  nsIWidget* widget = GetMainWidget(window);
+  if (!widget)
+    return nsnull;
+  nsIToolkit* toolkit = widget->GetToolkit();
+  if (!toolkit)
+    return nsnull;
+ return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+}
+
+
 NS_IMETHODIMP
 nsGTKRemoteService::RegisterWindow(nsIDOMWindow* aWindow)
 {
   // get the native window for this instance
-  nsCOMPtr<nsIScriptGlobalObject> scriptObject
-    (do_QueryInterface(aWindow));
-  NS_ENSURE_TRUE(scriptObject, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIBaseWindow> baseWindow
-    (do_QueryInterface(scriptObject->GetDocShell()));
-  NS_ENSURE_TRUE(baseWindow, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIWidget> mainWidget;
-  baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  nsIWidget* mainWidget = GetMainWidget(aWindow);
   NS_ENSURE_TRUE(mainWidget, NS_ERROR_FAILURE);
 
   // walk up the widget tree and find the toplevel window in the
@@ -201,7 +235,6 @@
 
   return NS_OK;
 }
-
 NS_IMETHODIMP
 nsGTKRemoteService::Shutdown()
 {
@@ -260,7 +293,7 @@
 
 #ifndef MOZ_XUL_APP
 const char*
-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -283,8 +316,60 @@
 }
 
 #else //MOZ_XUL_APP
+
+// Set desktop startup ID to the passed ID, if there is one, so that any created
+// windows get created with the right window manager metadata, and any windows
+// that get new tabs and are activated also get the right WM metadata.
+// If there is no desktop startup ID, then use the X event's timestamp
+// for _NET_ACTIVE_WINDOW when the window gets focused or shown.
+static void
+SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
+                               PRUint32 aTimestamp) {
+#ifdef MOZ_WIDGET_GTK2
+  nsGTKToolkit* toolkit = GetGTKToolkit();
+  if (!toolkit)
+    return;
+  if (!aDesktopStartupID.IsEmpty()) {
+    toolkit->SetDesktopStartupID(aDesktopStartupID);
+  } else {
+    toolkit->SetFocusTimestamp(aTimestamp);
+  }
+#endif
+}
+
+static PRBool
+FindExtensionParameterInCommand(const char* aParameterName,
+                                const nsACString& aCommand,
+                                char aSeparator,
+                                nsACString* aValue)
+{
+  nsCAutoString searchFor;
+  searchFor.Append(aSeparator);
+  searchFor.Append(aParameterName);
+  searchFor.Append('=');
+
+  nsACString::const_iterator start, end;
+  aCommand.BeginReading(start);
+  aCommand.EndReading(end);
+  if (!FindInReadable(searchFor, start, end))
+    return PR_FALSE;
+
+  nsACString::const_iterator charStart, charEnd;
+  charStart = end;
+  aCommand.EndReading(charEnd);
+  nsACString::const_iterator idStart = charStart, idEnd;
+  if (FindCharInReadable(aSeparator, charStart, charEnd)) {
+    idEnd = charStart;
+  } else {
+    idEnd = charEnd;
+  }
+  *aValue = nsDependentCSubstring(idStart, idEnd);
+  return PR_TRUE;
+}
+
 const char*
-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
+                                  PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -314,6 +399,12 @@
 #endif
 
   if (!command.EqualsLiteral("ping")) {
+    nsCAutoString desktopStartupID;
+    nsDependentCString cmd(aCommand);
+    FindExtensionParameterInCommand("DESKTOP_STARTUP_ID",
+                                    cmd, '\n',
+                                    &desktopStartupID);
+
     char* argv[3] = {"dummyappname", "-remote", aCommand};
     rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT);
     if (NS_FAILED(rv))
@@ -322,6 +413,8 @@
     if (aWindow)
       cmdline->SetWindowContext(aWindow);
 
+    SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp);
+
     rv = cmdline->Run();
     if (NS_ERROR_ABORT == rv)
       return "500 command not parseable";
@@ -333,7 +426,8 @@
 }
 
 const char*
-nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
+                                      PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -364,6 +458,8 @@
   if (NS_FAILED(rv))
     return "509 internal error";
 
+  nsCAutoString desktopStartupID;
+
   char **argv = (char**) malloc(sizeof(char*) * argc);
   if (!argv) return "509 internal error";
 
@@ -372,6 +468,12 @@
   for (int i = 0; i < argc; ++i) {
     argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
 
+    if (i == 0) {
+      nsDependentCString cmd(argv[0]);
+      FindExtensionParameterInCommand("DESKTOP_STARTUP_ID",
+                                      cmd, ' ',
+                                      &desktopStartupID);
+    }
 #ifdef DEBUG_bsmedberg
     printf("  argv[%i]:\t%s\n", i, argv[i]);
 #endif
@@ -386,7 +488,10 @@
   if (aWindow)
     cmdline->SetWindowContext(aWindow);
 
+  SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp);
+
   rv = cmdline->Run();
+  
   if (NS_ERROR_ABORT == rv)
     return "500 command not parseable";
   
@@ -486,7 +591,7 @@
       return FALSE;
 
     // cool, we got the property data.
-    const char *response = HandleCommand(data, window);
+    const char *response = HandleCommand(data, window, pevent->time);
 
     // put the property onto the window as the response
     XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
@@ -531,7 +636,7 @@
       return FALSE;
 
     // cool, we got the property data.
-    const char *response = HandleCommandLine(data, window);
+    const char *response = HandleCommandLine(data, window, pevent->time);
 
     // put the property onto the window as the response
     XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
--- toolkit/components/remote/nsGTKRemoteService.h	2005-04-04 19:11:42.000000000 -0400
+++ toolkit/components/remote/nsGTKRemoteService.h	2007-07-03 18:01:36.000000000 -0400
@@ -80,10 +80,12 @@
                                         nsIWeakReference* aData,
                                         void* aClosure);
 
-  static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow);
+  static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
+                                  PRUint32 aTimestamp);
 
 #ifdef MOZ_XUL_APP
-  static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow);
+  static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
+                                      PRUint32 aTimestamp);
 #endif
 
   static gboolean HandlePropertyChange(GtkWidget *widget,
--- toolkit/components/remote/Makefile.in	2005-04-08 00:59:36.000000000 -0400
+++ toolkit/components/remote/Makefile.in	2007-07-05 17:45:55.000000000 -0400
@@ -56,7 +56,9 @@
 	string \
 	appcomps \
 	toolkitcomps \
-	appcomps \
+	appshell \
+	layout \
+	content \
 	xulapp \
 	widget \
 	gfx \
--- toolkit/library/Makefile.in	2007-04-03 10:32:27.000000000 -0400
+++ toolkit/library/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -357,6 +357,10 @@
 EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
 endif
 
+ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
+endif
+
 ifdef MOZ_ENABLE_PANGO
 EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
 endif
--- toolkit/xre/nsAppRunner.cpp	2007-04-30 13:26:58.000000000 -0400
+++ toolkit/xre/nsAppRunner.cpp	2007-07-05 17:48:51.000000000 -0400
@@ -72,6 +72,7 @@
 #include "nsIComponentRegistrar.h"
 #include "nsIContentHandler.h"
 #include "nsIDialogParamBlock.h"
+#include "nsIDocument.h"
 #include "nsIDOMWindow.h"
 #include "nsIEventQueueService.h"
 #include "nsIExtensionManager.h"
@@ -99,6 +100,11 @@
 #ifdef XP_WIN
 #include "nsIWinAppHelper.h"
 #endif
+#include "nsPIDOMWindow.h"
+#include "nsIBaseWindow.h"
+#include "nsIWidget.h"
+#include "nsIDocShell.h"
+#include "nsAppShellCID.h"
 
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
@@ -262,6 +268,9 @@
 #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
 #include <gtk/gtk.h>
 #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2
+#if defined(MOZ_WIDGET_GTK2)
+#include "nsGTKToolkit.h"
+#endif
 
 #if defined(MOZ_WIDGET_QT)
 #include <qapplication.h>
@@ -1105,7 +1114,7 @@
 // use int here instead of a PR type since it will be returned
 // from main - just to keep types consistent
 static int
-HandleRemoteArgument(const char* remote)
+HandleRemoteArgument(const char* remote, const char* aDesktopStartupID)
 {
   nsresult rv;
   ArgResult ar;
@@ -1146,7 +1155,7 @@
   nsXPIDLCString response;
   PRBool success = PR_FALSE;
   rv = client.SendCommand(program.get(), username, profile, remote,
-                           getter_Copies(response), &success);
+                          aDesktopStartupID, getter_Copies(response), &success);
   // did the command fail?
   if (NS_FAILED(rv)) {
     PR_fprintf(PR_STDERR, "Error: Failed to send command: %s\n",
@@ -1163,7 +1172,7 @@
 }
 
 static PRBool
-RemoteCommandLine()
+RemoteCommandLine(const char* aDesktopStartupID)
 {
   nsresult rv;
   ArgResult ar;
@@ -1195,7 +1204,7 @@
   nsXPIDLCString response;
   PRBool success = PR_FALSE;
   rv = client.SendCommandLine(program.get(), username, nsnull,
-                              gArgc, gArgv,
+                              gArgc, gArgv, aDesktopStartupID,
                               getter_Copies(response), &success);
   // did the command fail?
   if (NS_FAILED(rv) || !success)
@@ -2059,6 +2068,53 @@
 #ifdef MOZ_WIDGET_GTK2
 #include "prlink.h"
 typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+typedef void (*_gtk_window_set_auto_startup_notification_fn)(gboolean setting);
+
+static PRFuncPtr FindFunction(const char* aName)
+{
+  PRLibrary *lib = nsnull;
+  PRFuncPtr result = PR_FindFunctionSymbolAndLibrary(aName, &lib);
+  // Since the library was already loaded, we can safely unload it here.
+  if (lib) {
+    PR_UnloadLibrary(lib);
+  }
+  return result;
+}
+
+static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow)
+{
+  // get the native window for this instance
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, nsnull);
+  nsCOMPtr<nsIDocument> doc(do_QueryInterface(window->GetExtantDocument()));
+  NS_ENSURE_TRUE(doc, nsnull);
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(container));
+  NS_ENSURE_TRUE(baseWindow, nsnull);
+
+  nsCOMPtr<nsIWidget> mainWidget;
+  baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  return mainWidget;
+}
+
+static nsGTKToolkit* GetGTKToolkit()
+{
+  nsCOMPtr<nsIAppShellService> svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID);
+  if (!svc)
+    return nsnull;
+  nsCOMPtr<nsIDOMWindowInternal> window;
+  svc->GetHiddenDOMWindow(getter_AddRefs(window));
+  if (!window)
+    return nsnull;
+  nsIWidget* widget = GetMainWidget(window);
+  if (!widget)
+    return nsnull;
+  nsIToolkit* toolkit = widget->GetToolkit();
+  if (!toolkit)
+    return nsnull;
+  return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+}
+
 #endif
 
 int
@@ -2235,6 +2291,16 @@
   if (CheckArg("install"))
     gdk_rgb_set_install(TRUE);
 
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE)
+  // Stash DESKTOP_STARTUP_ID in malloc'ed memory becaus gtk_init will clear it.
+#define HAVE_DESKTOP_STARTUP_ID
+    const char* desktopStartupIDEnv = PR_GetEnv("DESKTOP_STARTUP_ID");
+    nsCAutoString desktopStartupID;
+    if (desktopStartupIDEnv) {
+      desktopStartupID.Assign(desktopStartupIDEnv);
+    }
+#endif
+
   // Initialize GTK+1/2 here for splash
 #if defined(MOZ_WIDGET_GTK)
   gtk_set_locale();
@@ -2243,15 +2309,15 @@
 
 #if defined(MOZ_WIDGET_GTK2)
   // g_set_application_name () is only defined in glib2.2 and higher.
-  PRLibrary *glib2 = nsnull;
-  _g_set_application_name_fn _g_set_application_name =
-      (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+  _g_set_application_name_fn _g_set_application_name = 
+    (_g_set_application_name_fn)FindFunction("g_set_application_name");
   if (_g_set_application_name) {
     _g_set_application_name(gAppData->name);
   }
-  if (glib2) {
-    PR_UnloadLibrary(glib2);
-  }
+  _gtk_window_set_auto_startup_notification_fn _gtk_window_set_auto_startup_notification =
+    (_gtk_window_set_auto_startup_notification_fn)FindFunction("gtk_window_set_auto_startup_notification");
+  if (_gtk_window_set_auto_startup_notification) 
+    _gtk_window_set_auto_startup_notification(PR_FALSE);
 #endif
 
   gtk_widget_set_default_visual(gdk_rgb_get_visual());
@@ -2315,13 +2381,15 @@
     PR_fprintf(PR_STDERR, "Error: -remote requires an argument\n");
     return 1;
   }
+  const char* desktopStartupIDPtr =
+    desktopStartupID.IsEmpty() ? nsnull : desktopStartupID.get();
   if (ar) {
-    return HandleRemoteArgument(xremotearg);
+    return HandleRemoteArgument(xremotearg, desktopStartupIDPtr);
   }
 
   if (!PR_GetEnv("MOZ_NO_REMOTE")) {
     // Try to remote the entire command line. If this fails, start up normally.
-    if (RemoteCommandLine())
+    if (RemoteCommandLine(desktopStartupIDPtr))
       return 0;
   }
 #endif
@@ -2533,6 +2601,13 @@
       NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
       NS_ENSURE_SUCCESS(rv, 1);
 
+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
+        nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
+        if (toolkit && !desktopStartupID.IsEmpty()) {
+          toolkit->SetDesktopStartupID(desktopStartupID);
+        }
+#endif
+
       // Extension Compatibility Checking and Startup
       if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
         nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
@@ -2713,6 +2788,21 @@
     }
 #endif
 
+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
+      nsGTKToolkit* toolkit = GetGTKToolkit();
+      if (toolkit) {
+        nsCAutoString currentDesktopStartupID;
+        toolkit->GetDesktopStartupID(&currentDesktopStartupID);
+        if (!currentDesktopStartupID.IsEmpty()) {
+          nsCAutoString desktopStartupEnv;
+          desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
+          desktopStartupEnv.Append(currentDesktopStartupID);
+          // Leak it with extreme prejudice!
+          PR_SetEnv(ToNewCString(desktopStartupEnv));
+        }
+      }
+#endif
+
     rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0);
     return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1;
   }
--- toolkit/xre/Makefile.in	2007-02-06 02:13:20.000000000 -0500
+++ toolkit/xre/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -69,6 +69,7 @@
 	shellservice \
 	string \
 	uriloader \
+	layout \
 	widget \
 	windowwatcher \
 	xpcom \
--- configure.in	2007-04-03 11:40:02.000000000 -0400
+++ configure.in	2007-07-03 18:01:36.000000000 -0400
@@ -125,6 +125,7 @@
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 LIBGNOME_VERSION=2.0
+STARTUP_NOTIFICATION_VERSION=0.8
 
 dnl Set various checks
 dnl ========================================================
@@ -4156,6 +4157,41 @@
 
 AC_SUBST(MOZ_DEFAULT_TOOLKIT)
 
+dnl ========================================================
+dnl = startup-notification support module
+dnl ========================================================
+
+if test "$MOZ_ENABLE_GTK2"
+then
+    MOZ_ENABLE_STARTUP_NOTIFICATION=
+
+    MOZ_ARG_ENABLE_BOOL(startup-notification,
+    [  --enable-startup-notification       Enable startup-notification support (default: disabled) ],
+        MOZ_ENABLE_STARTUP_NOTIFICATION=force,
+        MOZ_ENABLE_STARTUP_NOTIFICATION=)
+    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
+    then
+        PKG_CHECK_MODULES(MOZ_STARTUP_NOTIFICATION,
+                          libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION,
+        [MOZ_ENABLE_STARTUP_NOTIFICATION=1], [
+            if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
+            then
+                AC_MSG_ERROR([* * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION])
+            fi
+            MOZ_ENABLE_STARTUP_NOTIFICATION=
+        ])
+    fi
+
+    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
+        AC_DEFINE(MOZ_ENABLE_STARTUP_NOTIFICATION)
+    fi
+
+    TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
+fi
+AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION)
+AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS)
+
 AC_SUBST(GTK_CONFIG)
 AC_SUBST(TK_CFLAGS)
 AC_SUBST(TK_LIBS)
--- widget/src/gtk2/nsWindow.cpp	2007-04-19 14:46:03.000000000 -0400
+++ widget/src/gtk2/nsWindow.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -40,7 +40,7 @@
 #include "prlink.h"
 
 #include "nsWindow.h"
-#include "nsToolkit.h"
+#include "nsGTKToolkit.h"
 #include "nsIRenderingContext.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
@@ -58,6 +58,11 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 
+#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+#define SN_API_NOT_YET_FROZEN
+#include <startup-notification-1.0/libsn/sn.h>
+#endif
+
 #include "gtk2xtbin.h"
 
 #include "nsIPrefService.h"
@@ -660,6 +665,75 @@
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+typedef void (* SetUserTimeFunc)(GdkWindow* aWindow, guint32 aTimestamp);
+
+// This will become obsolete when new GTK APIs are widely supported,
+// as described here: http://bugzilla.gnome.org/show_bug.cgi?id=347375
+static void
+SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
+{
+    nsCOMPtr<nsIToolkit> toolkit;
+    NS_GetCurrentToolkit(getter_AddRefs(toolkit));
+    if (!toolkit)
+        return;
+
+    nsGTKToolkit* GTKToolkit = NS_STATIC_CAST(nsGTKToolkit*,
+        NS_STATIC_CAST(nsIToolkit*, toolkit));
+    nsCAutoString desktopStartupID;
+    GTKToolkit->GetDesktopStartupID(&desktopStartupID);
+    if (desktopStartupID.IsEmpty()) {
+        // We don't have the data we need. Fall back to an
+        // approximation ... using the timestamp of the remote command
+        // being received as a guess for the timestamp of the user event
+        // that triggered it.
+        PRUint32 timestamp = GTKToolkit->GetFocusTimestamp();
+        if (timestamp) {
+            gdk_window_focus(aWindow->window, timestamp);
+            GTKToolkit->SetFocusTimestamp(0);
+        }
+        return;
+    }
+
+#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+    GdkDrawable* drawable = GDK_DRAWABLE(aWindow->window);
+    GtkWindow* win = GTK_WINDOW(aWindow);
+    if (!win) {
+        NS_WARNING("Passed in widget was not a GdkWindow!");
+        return;
+    }
+    GdkScreen* screen = gtk_window_get_screen(win);
+    SnDisplay* snd =
+        sn_display_new(gdk_x11_drawable_get_xdisplay(drawable), nsnull, nsnull);
+    if (!snd)
+        return;
+    SnLauncheeContext* ctx =
+        sn_launchee_context_new(snd, gdk_screen_get_number(screen),
+                                desktopStartupID.get());
+    if (!ctx) {
+        sn_display_unref(snd);
+        return;
+    }
+
+    if (sn_launchee_context_get_id_has_timestamp(ctx)) {
+        PRLibrary* gtkLibrary;
+        SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
+            PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", &gtkLibrary);
+        if (setUserTimeFunc) {
+            setUserTimeFunc(aWindow->window, sn_launchee_context_get_timestamp(ctx));
+            PR_UnloadLibrary(gtkLibrary);
+        }
+    }
+
+    sn_launchee_context_setup_window(ctx, gdk_x11_drawable_get_xid(drawable));
+    sn_launchee_context_complete(ctx);
+
+    sn_launchee_context_unref(ctx);
+    sn_display_unref(snd);
+#endif
+
+    GTKToolkit->SetDesktopStartupID(EmptyCString());
+}
+
 NS_IMETHODIMP
 nsWindow::SetFocus(PRBool aRaise)
 {
@@ -680,6 +754,10 @@
     // set properly.
     GtkWidget *toplevelWidget = gtk_widget_get_toplevel(owningWidget);
 
+    if (toplevelWidget && aRaise) {
+        SetUserTimeAndStartupIDForActivatedWindow(toplevelWidget);
+    }
+
     if (gRaiseWindows && aRaise && toplevelWidget &&
         !GTK_WIDGET_HAS_FOCUS(owningWidget) &&
         !GTK_WIDGET_HAS_FOCUS(toplevelWidget)) {
@@ -1167,7 +1245,7 @@
 
     case NS_NATIVE_GRAPHIC: {
         NS_ASSERTION(nsnull != mToolkit, "NULL toolkit, unable to get a GC");
-        return (void *)NS_STATIC_CAST(nsToolkit *, mToolkit)->GetSharedGC();
+        return (void *)NS_STATIC_CAST(nsGTKToolkit *, mToolkit)->GetSharedGC();
         break;
     }
 
@@ -2802,13 +2880,18 @@
         // is shown.
         // XXX that may or may not be true for GTK+ 2.x
         if (mTransparencyBitmap) {
-          ApplyTransparencyBitmap();
+            ApplyTransparencyBitmap();
         }
 
         // unset our flag now that our window has been shown
         mNeedsShow = PR_FALSE;
 
         if (mIsTopLevel) {
+            // Set up usertime/startupID metadata for the created window.
+            if (mWindowType != eWindowType_invisible) {
+                SetUserTimeAndStartupIDForActivatedWindow(mShell);
+            }
+
             moz_drawingarea_set_visibility(mDrawingarea, aAction);
             gtk_widget_show(GTK_WIDGET(mContainer));
             gtk_widget_show(mShell);
--- widget/src/gtk2/Makefile.in	2006-06-17 11:16:14.000000000 -0400
+++ widget/src/gtk2/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -97,6 +97,7 @@
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		-lgtkxtbin \
+		$(MOZ_STARTUP_NOTIFICATION_LIBS) \
 		$(XLDFLAGS) \
 		$(XLIBS) \
 		$(MOZ_GTK2_LIBS)
@@ -107,14 +108,15 @@
 
 EXPORTS		= \
                 nsIGdkPixbufImage.h \
+                nsGTKToolkit.h \
 		mozdrawingarea.h \
 		mozcontainer.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS		+= $(MOZ_GTK2_CFLAGS)
-CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
+CFLAGS          += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+CXXFLAGS        += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
 
 DEFINES         += -DUSE_XIM
 
--- widget/src/gtk2/nsToolkit.cpp	2004-04-18 18:00:17.000000000 -0400
+++ widget/src/gtk2/nsToolkit.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nscore.h"  // needed for 'nsnull'
-#include "nsToolkit.h"
+#include "nsGTKToolkit.h"
 
 //
 // Static thread local storage index of the Toolkit 
@@ -51,9 +51,10 @@
 // constructor
 //
 //-------------------------------------------------------------------------
-nsToolkit::nsToolkit()
+nsGTKToolkit::nsGTKToolkit()
 {
     mSharedGC = nsnull;
+    mFocusTimestamp = 0;
 }
 
 //-------------------------------------------------------------------------
@@ -61,7 +62,7 @@
 // destructor
 //
 //-------------------------------------------------------------------------
-nsToolkit::~nsToolkit()
+nsGTKToolkit::~nsGTKToolkit()
 {
     if (mSharedGC) {
         gdk_gc_unref(mSharedGC);
@@ -77,9 +78,9 @@
 //
 //-------------------------------------------------------------------------
 
-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
+NS_IMPL_ISUPPORTS1(nsGTKToolkit, nsIToolkit)
 
-void nsToolkit::CreateSharedGC(void)
+void nsGTKToolkit::CreateSharedGC(void)
 {
     GdkPixmap *pixmap;
 
@@ -91,7 +92,7 @@
     gdk_pixmap_unref(pixmap);
 }
 
-GdkGC *nsToolkit::GetSharedGC(void)
+GdkGC *nsGTKToolkit::GetSharedGC(void)
 {
     return gdk_gc_ref(mSharedGC);
 }
@@ -100,7 +101,7 @@
 //
 //
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsToolkit::Init(PRThread *aThread)
+NS_IMETHODIMP nsGTKToolkit::Init(PRThread *aThread)
 {
     CreateSharedGC();
 
@@ -135,7 +136,7 @@
         // Create a new toolkit for this thread...
         //
         if (!toolkit) {
-            toolkit = new nsToolkit();
+            toolkit = new nsGTKToolkit();
 
             if (!toolkit) {
                 rv = NS_ERROR_OUT_OF_MEMORY;
--- widget/src/xremoteclient/mozilla-xremote-client.cpp	2005-04-04 15:08:51.000000000 -0400
+++ widget/src/xremoteclient/mozilla-xremote-client.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <plgetopt.h>
+#include <prenv.h>
 #ifdef MOZ_WIDGET_PHOTON
 #include "PhRemoteClient.h"
 #else
@@ -99,7 +100,7 @@
   // send the command - it doesn't get any easier than this
   PRBool success = PR_FALSE;
   char *error = 0;
-  rv = client.SendCommand(browser, username, profile, command,
+  rv = client.SendCommand(browser, username, profile, command, nsnull,
                           &error, &success);
 
   // failed to send command
--- widget/src/xremoteclient/XRemoteClient.cpp	2006-03-30 03:01:13.000000000 -0500
+++ widget/src/xremoteclient/XRemoteClient.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -173,6 +173,7 @@
 nsresult
 XRemoteClient::SendCommand (const char *aProgram, const char *aUsername,
                             const char *aProfile, const char *aCommand,
+                            const char* aDesktopStartupID,
                             char **aResponse, PRBool *aWindowFound)
 {
   PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand"));
@@ -198,7 +199,7 @@
 
     if (NS_SUCCEEDED(rv)) {
       // send our command
-      rv = DoSendCommand(w, aCommand, aResponse, &destroyed);
+      rv = DoSendCommand(w, aCommand, aDesktopStartupID, aResponse, &destroyed);
 
       // if the window was destroyed, don't bother trying to free the
       // lock.
@@ -217,6 +218,7 @@
 XRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername,
                                 const char *aProfile,
                                 PRInt32 argc, char **argv,
+                                const char* aDesktopStartupID,
                                 char **aResponse, PRBool *aWindowFound)
 {
   PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine"));
@@ -242,7 +244,7 @@
 
     if (NS_SUCCEEDED(rv)) {
       // send our command
-      rv = DoSendCommandLine(w, argc, argv, aResponse, &destroyed);
+      rv = DoSendCommandLine(w, argc, argv, aDesktopStartupID, aResponse, &destroyed);
 
       // if the window was destroyed, don't bother trying to free the
       // lock.
@@ -643,6 +645,7 @@
 
 nsresult
 XRemoteClient::DoSendCommand(Window aWindow, const char *aCommand,
+                             const char* aDesktopStartupID,
                              char **aResponse, PRBool *aDestroyed)
 {
   *aDestroyed = PR_FALSE;
@@ -651,9 +654,28 @@
      ("(writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x)\n",
       aCommand, (unsigned int) aWindow));
 
+  // We add the DESKTOP_STARTUP_ID setting as an extra line of
+  // the command string. Firefox ignores all lines but the first.
+  static char desktopStartupPrefix[] = "\nDESKTOP_STARTUP_ID=";
+
+  PRInt32 len = strlen(aCommand);
+  if (aDesktopStartupID) {
+    len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID);
+  }
+  char* buffer = (char*)malloc(len + 1);
+  if (!buffer)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  strcpy(buffer, aCommand);
+  if (aDesktopStartupID) {
+    strcat(buffer, desktopStartupPrefix);
+    strcat(buffer, aDesktopStartupID);
+  }
+
   XChangeProperty (mDisplay, aWindow, mMozCommandAtom, XA_STRING, 8,
-           PropModeReplace, (unsigned char *)aCommand,
-           strlen(aCommand));
+           PropModeReplace, (unsigned char *)buffer, len);
+
+  free(buffer);
 
   if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandAtom))
     return NS_ERROR_FAILURE;
@@ -663,7 +685,7 @@
 
 /* like strcpy, but return the char after the final null */
 static char*
-estrcpy(char* s, char* d)
+estrcpy(const char* s, char* d)
 {
   while (*s)
     *d++ = *s++;
@@ -674,6 +696,7 @@
 
 nsresult
 XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv,
+                                 const char* aDesktopStartupID,
                                  char **aResponse, PRBool *aDestroyed)
 {
   int i;
@@ -690,9 +713,16 @@
   // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
   // (offset is from the beginning of the buffer)
 
+  static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID=";
+
   PRInt32 argvlen = strlen(cwdbuf);
-  for (i = 0; i < argc; ++i)
-    argvlen += strlen(argv[i]);
+  for (i = 0; i < argc; ++i) {
+    PRInt32 len = strlen(argv[i]);
+    if (i == 0 && aDesktopStartupID) {
+      len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID);
+    }
+    argvlen += len;
+  }
 
   PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 +
                                       sizeof(PRInt32) * (argc + 1));
@@ -708,6 +738,10 @@
   for (int i = 0; i < argc; ++i) {
     buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer));
     bufend = estrcpy(argv[i], bufend);
+    if (i == 0 && aDesktopStartupID) {
+      bufend = estrcpy(desktopStartupPrefix, bufend - 1);
+      bufend = estrcpy(aDesktopStartupID, bufend - 1);
+    }
   }
 
 #ifdef DEBUG_bsmedberg
--- widget/src/xremoteclient/nsRemoteClient.h	2005-04-04 15:08:51.000000000 -0400
+++ widget/src/xremoteclient/nsRemoteClient.h	2007-07-03 18:01:36.000000000 -0400
@@ -76,6 +76,10 @@
    * @param aCommand This is the command that is passed to the server.
    * Please see the additional information located at:
    * http://www.mozilla.org/unix/remote.html
+   * 
+   * @param aDesktopStartupID the contents of the DESKTOP_STARTUP_ID environment
+   * variable defined by the Startup Notification specification
+   * http://standards.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt
    *
    * @param aResponse If there is a response, it will be here.  This
    * includes error messages.  The string is allocated using stdlib
@@ -85,11 +89,16 @@
    */
   virtual nsresult SendCommand(const char *aProgram, const char *aUsername,
                                const char *aProfile, const char *aCommand,
+                               const char* aDesktopStartupID,
                                char **aResponse, PRBool *aSucceeded) = 0;
 
   /**
    * Send a complete command line to a running instance.
    *
+   * @param aDesktopStartupID the contents of the DESKTOP_STARTUP_ID environment
+   * variable defined by the Startup Notification specification
+   * http://standards.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt
+   *   
    * @see sendCommand
    * @param argc The number of command-line arguments.
    * 
@@ -97,6 +106,7 @@
   virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername,
                                    const char *aProfile,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse, PRBool *aSucceeded) = 0;
 };
 
--- widget/src/xremoteclient/XRemoteClient.h	2006-03-30 03:01:13.000000000 -0500
+++ widget/src/xremoteclient/XRemoteClient.h	2007-07-03 18:01:36.000000000 -0400
@@ -48,10 +48,12 @@
   virtual nsresult Init();
   virtual nsresult SendCommand(const char *aProgram, const char *aUsername,
                                const char *aProfile, const char *aCommand,
+                               const char* aDesktopStartupID,
                                char **aResponse, PRBool *aSucceeded);
   virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername,
                                    const char *aProfile,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse, PRBool *aSucceeded);
   void Shutdown();
 
@@ -67,10 +69,12 @@
                                    PRBool aSupportsCommandLine);
   nsresult       DoSendCommand    (Window aWindow,
                                    const char *aCommand,
+                                   const char* aDesktopStartupID,
                                    char **aResponse,
                                    PRBool *aDestroyed);
   nsresult       DoSendCommandLine(Window aWindow,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse,
                                    PRBool *aDestroyed);
   PRBool         WaitForResponse  (Window aWindow, char **aResponse,
--- /dev/null	2007-07-05 17:03:04.116204904 -0400
+++ widget/src/gtk2/nsGTKToolkit.h	2007-07-03 18:01:36.000000000 -0400
@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GTKTOOLKIT_H      
+#define GTKTOOLKIT_H
+
+#include "nsIToolkit.h"
+#include "nsString.h"
+#include <gtk/gtk.h>
+
+/**
+ * Wrapper around the thread running the message pump.
+ * The toolkit abstraction is necessary because the message pump must
+ * execute within the same thread that created the widget under Win32.
+ */ 
+
+class nsGTKToolkit : public nsIToolkit
+{
+public:
+    nsGTKToolkit();
+    virtual ~nsGTKToolkit();
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD    Init(PRThread *aThread);
+
+    void          CreateSharedGC(void);
+    GdkGC         *GetSharedGC(void);
+    
+    /**
+     * Get/set our value of DESKTOP_STARTUP_ID. When non-empty, this is applied
+     * to the next toplevel window to be shown or focused (and then immediately
+     * cleared).
+     */ 
+    void SetDesktopStartupID(const nsACString& aID) { mDesktopStartupID = aID; }
+    void GetDesktopStartupID(nsACString* aID) { *aID = mDesktopStartupID; }
+
+    /**
+     * Get/set the timestamp value to be used, if non-zero, to focus the
+     * next top-level window to be shown or focused (upon which it is cleared).
+     */
+    void SetFocusTimestamp(PRUint32 aTimestamp) { mFocusTimestamp = aTimestamp; }
+    PRUint32 GetFocusTimestamp() { return mFocusTimestamp; }
+
+private:
+    GdkGC         *mSharedGC;
+    nsCString      mDesktopStartupID;
+    PRUint32       mFocusTimestamp;
+};
+
+#endif  // GTKTOOLKIT_H


Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- firefox-redhat-default-prefs.js	6 Sep 2007 14:30:01 -0000	1.9
+++ firefox-redhat-default-prefs.js	25 Sep 2007 03:36:23 -0000	1.10
@@ -6,3 +6,6 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
 pref("intl.locale.matchOS", true);
+pref("browser.startup.homepage", "http://start.fedoraproject.org/");
+pref("startup.homepage_override_url", "http://start.fedoraproject.org/");
+pref("startup.homepage_welcome_url", "http://start.fedoraproject.org/");


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- firefox.spec	11 Sep 2007 18:55:30 -0000	1.196
+++ firefox.spec	25 Sep 2007 03:36:23 -0000	1.197
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -72,6 +72,7 @@
 Patch104:       firefox-1.5-ppc64.patch
 Patch105:       firefox-2.0-dnd.patch
 Patch106:       firefox-2.0-indicator-crash.patch
+Patch110:       firefox-2.0-startup-notify.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -174,6 +175,7 @@
 %patch104 -p1 -b .ppc64
 %patch105 -p0 -b .dnd
 %patch106 -p1 -b .indicator-crash
+%patch110 -p0 -b .startup-notify
 
 # For branding specific patches.
 
@@ -440,6 +442,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
+- Startup notification support
+
 * Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
 - Fix crashes when using GTK+ themes containing a gtkrc which specify 
   GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing



From fedora-extras-commits at redhat.com  Tue Sep 25 03:41:12 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 23:41:12 -0400
Subject: rpms/eclipse-cdt/devel sources,1.41,1.42
Message-ID: <200709250341.l8P3fCuO012562@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12540

Modified Files:
	sources 
Log Message:
* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
- 4.0.1 RC.
- Update autotools for Binaries fix.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Sep 2007 03:25:50 -0000	1.41
+++ sources	25 Sep 2007 03:40:40 -0000	1.42
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-131b053e65febfca5891d46448c986ae  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
 0d981af2ad657299d1fe4894401995b5  eclipse-cdt-fetched-src-v200709241202.tar.bz2
+83f650ae4da2cf63d8cb3323c4662afd  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:02:38 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:02:38 -0400
Subject: rpms/firefox/devel firefox-redhat-default-prefs.js,1.10,1.11
Message-ID: <200709250402.l8P42ceu019160@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12979

Modified Files:
	firefox-redhat-default-prefs.js 
Log Message:
not sure how these ended up in here



Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firefox-redhat-default-prefs.js	25 Sep 2007 03:36:23 -0000	1.10
+++ firefox-redhat-default-prefs.js	25 Sep 2007 04:02:03 -0000	1.11
@@ -6,6 +6,3 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
 pref("intl.locale.matchOS", true);
-pref("browser.startup.homepage", "http://start.fedoraproject.org/");
-pref("startup.homepage_override_url", "http://start.fedoraproject.org/");
-pref("startup.homepage_welcome_url", "http://start.fedoraproject.org/");



From fedora-extras-commits at redhat.com  Tue Sep 25 04:04:27 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:04:27 -0400
Subject: rpms/firefox/devel firefox.spec,1.197,1.198
Message-ID: <200709250404.l8P44RkO019205@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186

Modified Files:
	firefox.spec 
Log Message:
BR startup-notification-devel



Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- firefox.spec	25 Sep 2007 03:36:23 -0000	1.197
+++ firefox.spec	25 Sep 2007 04:03:53 -0000	1.198
@@ -104,6 +104,7 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  system-bookmarks
+BuildRequires:  startup-notification-devel
 
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}



From fedora-extras-commits at redhat.com  Tue Sep 25 04:38:41 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Tue, 25 Sep 2007 00:38:41 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel
	php-pear-MDB2-Driver-mysqli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709250438.l8P4cfHb019961@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19930/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-MDB2-Driver-mysqli.spec 
Log Message:
Initial import



--- NEW FILE php-pear-MDB2-Driver-mysqli.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name MDB2_Driver_mysqli

Name:           php-pear-MDB2-Driver-mysqli
Version:        1.4.1
Release:        2%{?dist}
Summary:        MySQL Improved MDB2 driver

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/MDB2_Driver_mysqli
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR)
Requires:       php-pear(MDB2) >= 2.4.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is the MySQL Improved MDB2 driver.


%prep
%setup -qc
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_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 $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/MDB2/Driver/*/mysqli.php
%{pear_phpdir}/MDB2/Driver/mysqli.php


%changelog
* Sat Sep 22 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-2
- Requires MDB2 2.4.1 or newer
* Sun Sep 02 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:12:17 -0000	1.1
+++ .cvsignore	25 Sep 2007 04:38:09 -0000	1.2
@@ -0,0 +1 @@
+MDB2_Driver_mysqli-1.4.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:12:17 -0000	1.1
+++ sources	25 Sep 2007 04:38:09 -0000	1.2
@@ -0,0 +1 @@
+eb93eb4687da1a1018c832622da42f6f  MDB2_Driver_mysqli-1.4.1.tgz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:40:22 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Tue, 25 Sep 2007 00:40:22 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/F-7
	php-pear-MDB2-Driver-mysqli.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709250440.l8P4eMtb020117@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20072/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-MDB2-Driver-mysqli.spec 
Log Message:
Initial import



--- NEW FILE php-pear-MDB2-Driver-mysqli.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name MDB2_Driver_mysqli

Name:           php-pear-MDB2-Driver-mysqli
Version:        1.4.1
Release:        2%{?dist}
Summary:        MySQL Improved MDB2 driver

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/MDB2_Driver_mysqli
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR)
Requires:       php-pear(MDB2) >= 2.4.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is the MySQL Improved MDB2 driver.


%prep
%setup -qc
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_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 $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/MDB2/Driver/*/mysqli.php
%{pear_phpdir}/MDB2/Driver/mysqli.php


%changelog
* Sat Sep 22 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-2
- Requires MDB2 2.4.1 or newer
* Sun Sep 02 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:12:17 -0000	1.1
+++ .cvsignore	25 Sep 2007 04:39:50 -0000	1.2
@@ -0,0 +1 @@
+MDB2_Driver_mysqli-1.4.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:12:17 -0000	1.1
+++ sources	25 Sep 2007 04:39:50 -0000	1.2
@@ -0,0 +1 @@
+eb93eb4687da1a1018c832622da42f6f  MDB2_Driver_mysqli-1.4.1.tgz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:49:55 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:49:55 -0400
Subject: rpms/firefox/devel firefox.spec, 1.198,
	1.199 firefox-1.0-system-nspr-ldap.patch, 1.1,
	NONE firefox-1.1-nss-system-nspr.patch, 1.2,
	NONE firefox-1.5-with-system-nss.patch, 1.1,
	NONE firefox-2.0-visibility.patch, 1.3,
	NONE firefox-RC1-stock-icons-be.patch, 1.1,
	NONE firefox-RC1-stock-icons-fe.patch, 1.1,
	NONE firefox-RC1-stock-icons-gnomestripe.patch, 1.1,
	NONE firefox-gnomestripe-0.1-livemarks.patch, 1.1, NONE
Message-ID: <200709250449.l8P4nts3020417@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20389

Modified Files:
	firefox.spec 
Removed Files:
	firefox-1.0-system-nspr-ldap.patch 
	firefox-1.1-nss-system-nspr.patch 
	firefox-1.5-with-system-nss.patch firefox-2.0-visibility.patch 
	firefox-RC1-stock-icons-be.patch 
	firefox-RC1-stock-icons-fe.patch 
	firefox-RC1-stock-icons-gnomestripe.patch 
	firefox-gnomestripe-0.1-livemarks.patch 
Log Message:
remove some no longer used patches


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- firefox.spec	25 Sep 2007 04:03:53 -0000	1.198
+++ firefox.spec	25 Sep 2007 04:49:20 -0000	1.199
@@ -36,19 +36,12 @@
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
-Patch3:         firefox-1.1-nss-system-nspr.patch
-Patch4:         firefox-1.5-with-system-nss.patch
-Patch5:         firefox-2.0-visibility.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
 Patch21:        firefox-0.7.3-psfonts.patch
 Patch22:        firefox-1.1-default-applications.patch
 Patch23:        firefox-1.1-software-update.patch
-Patch24:        firefox-RC1-stock-icons-be.patch
-Patch25:        firefox-RC1-stock-icons-fe.patch
-Patch26:        firefox-RC1-stock-icons-gnomestripe.patch
-Patch27:        firefox-gnomestripe-0.1-livemarks.patch
 
 # local bugfixes
 Patch40:        firefox-1.5-bullet-bill.patch
@@ -147,18 +140,11 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
-#%patch3  -p1
-#%patch4  -p1
-#%patch5  -p1 -b .visibility
 
 #%patch20 -p0
 %patch21 -p1 -b .psfonts
 %patch22 -p0 -b .default-applications
 #%patch23 -p0
-#%patch24 -p0
-#%patch25 -p0
-#%patch26 -p0
-#%patch27 -p1
 %patch40 -p1 -b .bullet-bill
 %patch41 -p1 -b .undo-uriloader
 %patch42 -p0 -b .uriloader


--- firefox-1.0-system-nspr-ldap.patch DELETED ---


--- firefox-1.1-nss-system-nspr.patch DELETED ---


--- firefox-1.5-with-system-nss.patch DELETED ---


--- firefox-2.0-visibility.patch DELETED ---


--- firefox-RC1-stock-icons-be.patch DELETED ---


--- firefox-RC1-stock-icons-fe.patch DELETED ---


--- firefox-RC1-stock-icons-gnomestripe.patch DELETED ---


--- firefox-gnomestripe-0.1-livemarks.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 04:57:09 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:57:09 -0400
Subject: rpms/xen/F-7 xen-pvfb-compat-32-on-64.patch, 1.1, 1.2 xen.spec,
	1.184, 1.185
Message-ID: <200709250457.l8P4v9YJ020621@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593

Modified Files:
	xen-pvfb-compat-32-on-64.patch xen.spec 
Log Message:
Really fix 32-on-64 FC6 guests this time

xen-pvfb-compat-32-on-64.patch:

Index: xen-pvfb-compat-32-on-64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen-pvfb-compat-32-on-64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-compat-32-on-64.patch	25 Sep 2007 00:18:20 -0000	1.1
+++ xen-pvfb-compat-32-on-64.patch	25 Sep 2007 04:57:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rup --exclude '*~' xen-3.1.0-src/tools/xenfb/oldxenfb.c xen-3.1.0-hacked/tools/xenfb/oldxenfb.c
---- xen-3.1.0-src/tools/xenfb/oldxenfb.c	2007-07-24 10:12:10.000000000 +0200
-+++ xen-3.1.0-hacked/tools/xenfb/oldxenfb.c	2007-07-24 20:29:47.000000000 +0200
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/oldxenfb.c xen-3.1.0-src.new/tools/xenfb/oldxenfb.c
+--- xen-3.1.0-src.orig/tools/xenfb/oldxenfb.c	2007-09-25 00:40:35.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/oldxenfb.c	2007-09-25 00:45:47.000000000 -0400
 @@ -7,9 +7,9 @@
  #include <xen/io/xenbus.h>
  #include "oldxenfb.h"
@@ -90,10 +90,10 @@
 -	}
 +	if (xenfb->pub.pixels == NULL)
 +		goto out;
-+
-+	ret = 0; /* all is fine */
  
 -	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
++	ret = 0; /* all is fine */
++
 + out:
 +	if (pgmfns)
 +		free(pgmfns);
@@ -123,3 +123,163 @@
  	/* TODO check for permitted ranges */
  	fb_page = xenfb->fb.page;
  	xenfb->pub.depth = fb_page->depth;
+@@ -430,10 +470,10 @@ static void xenfb_detach_dom(struct xenf
+ 	}
+ }
+ 
+-static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++static void xenfb_on_fb_event32(struct xenfb_private *xenfb)
+ {
+ 	uint32_t prod, cons;
+-	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
+ 
+ 	prod = page->out_prod;
+ 	if (prod == page->out_cons)
+@@ -456,6 +496,50 @@ static void xenfb_on_fb_event(struct xen
+ 	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+ }
+ 
++static void xenfb_on_fb_event64(struct xenfb_private *xenfb)
++{
++	uint32_t prod, cons;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->out_prod;
++	if (prod == page->out_cons)
++		return;
++	rmb();			/* ensure we see ring contents up to prod */
++	for (cons = page->out_cons; cons != prod; cons++) {
++		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
++
++		switch (event->type) {
++		case XENFB_TYPE_UPDATE:
++                    if (xenfb->pub.update)
++			xenfb->pub.update(&xenfb->pub,
++					  event->update.x, event->update.y,
++					  event->update.width, event->update.height);
++                    break;
++		}
++	}
++	mb();			/* ensure we're done with ring contents */
++	page->out_cons = cons;
++	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++{
++	int mode;
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return;
++
++	if (mode == 32)
++		xenfb_on_fb_event32(xenfb);
++	else
++		xenfb_on_fb_event64(xenfb);
++}
++
+ static void xenfb_on_kbd_event(struct xenfb_private *xenfb)
+ {
+ 	struct xenkbd_info *page = xenfb->kbd.page;
+@@ -541,11 +625,11 @@ int xenfb_select_fds(struct xenfb *xenfb
+ 	return fd1 > fd2 ? fd1 + 1 : fd2 + 1;
+ }
+ 
+-static int xenfb_fb_event(struct xenfb_private *xenfb,
+-			  union xenfb_in_event *event)
++static int xenfb_fb_event32(struct xenfb_private *xenfb,
++			    union xenfb_in_event *event)
+ {
+ 	uint32_t prod;
+-	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
+ 
+ 	prod = page->in_prod;
+ 	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
+@@ -560,6 +644,44 @@ static int xenfb_fb_event(struct xenfb_p
+ 	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+ }
+ 
++static int xenfb_fb_event64(struct xenfb_private *xenfb,
++			    union xenfb_in_event *event)
++{
++	uint32_t prod;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->in_prod;
++	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
++		errno = EAGAIN;
++		return -1;
++	}
++
++	mb();			/* ensure ring space available */
++	XENFB_IN_RING_REF(page, prod) = *event;
++	wmb();			/* ensure ring contents visible */
++	page->in_prod = prod + 1;
++	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static int xenfb_fb_event(struct xenfb_private *xenfb,
++			   union xenfb_in_event *event)
++{
++	int mode;
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return -1;
++
++	if (mode == 32)
++		return xenfb_fb_event32(xenfb, event);
++	else
++		return xenfb_fb_event64(xenfb, event);
++}
++
+ static int xenfb_kbd_event(struct xenfb_private *xenfb,
+ 			   union xenkbd_in_event *event)
+ {
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/oldxenfb.h xen-3.1.0-src.new/tools/xenfb/oldxenfb.h
+--- xen-3.1.0-src.orig/tools/xenfb/oldxenfb.h	2007-09-25 00:40:35.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/oldxenfb.h	2007-09-25 00:38:30.000000000 -0400
+@@ -98,6 +98,32 @@ struct xenfb_page
+ 
+ 	unsigned long pd[2];	/* FIXME rename to pgdir? */
+ 	/* FIXME pd[1] unused at this time, shrink? */
++};
++struct xenfb_page32
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++        __u32 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
++
++	__u32 in_cons, in_prod;
++	__u32 out_cons, out_prod;
++};
++
++struct xenfb_page64
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u64 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
+ 
+ 	__u32 in_cons, in_prod;
+ 	__u32 out_cons, out_prod;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- xen.spec	25 Sep 2007 00:18:20 -0000	1.184
+++ xen.spec	25 Sep 2007 04:57:02 -0000	1.185
@@ -282,6 +282,7 @@
 %changelog
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
 - Fix generation of manual pages (rhbz #250791)
+- Fix 32-on-64 PVFB for FC6 legacy guests
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
 - Fix VMX assist IRQ handling (rhbz #279581)



From fedora-extras-commits at redhat.com  Tue Sep 25 04:57:38 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:57:38 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch,1.2,1.3
Message-ID: <200709250457.l8P4vcYx020689@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20664

Modified Files:
	xen-pvfb-04-compat.patch 
Log Message:
Really fix 32-on-64 fc6 guests this time

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-pvfb-04-compat.patch	24 Sep 2007 23:09:22 -0000	1.2
+++ xen-pvfb-04-compat.patch	25 Sep 2007 04:57:36 -0000	1.3
@@ -1,7 +1,7 @@
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 18:51:06.000000000 -0400
-@@ -0,0 +1,610 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-25 00:46:38.000000000 -0400
+@@ -0,0 +1,693 @@
 +#include <stdarg.h>
 +#include <stdlib.h>
 +#include <sys/types.h>
@@ -400,10 +400,10 @@
 +	}
 +}
 +
-+static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
++static void oldxenfb_on_fb_event32(struct xenfb_private *xenfb)
 +{
 +	uint32_t prod, cons;
-+	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
 +
 +	prod = page->out_prod;
 +	if (prod == page->out_cons)
@@ -426,6 +426,50 @@
 +	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
++static void oldxenfb_on_fb_event64(struct xenfb_private *xenfb)
++{
++	uint32_t prod, cons;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->out_prod;
++	if (prod == page->out_cons)
++		return;
++	rmb();			/* ensure we see ring contents up to prod */
++	for (cons = page->out_cons; cons != prod; cons++) {
++		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
++
++		switch (event->type) {
++		case XENFB_TYPE_UPDATE:
++                    if (xenfb->pub.update)
++			xenfb->pub.update(&xenfb->pub,
++					  event->update.x, event->update.y,
++					  event->update.width, event->update.height);
++                    break;
++		}
++	}
++	mb();			/* ensure we're done with ring contents */
++	page->out_cons = cons;
++	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++{
++  int mode;
++  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++    mode = sizeof(unsigned long) * 8;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++    mode = 32;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++    mode = 64;
++  else
++    return;
++
++  if (mode == 32)
++    oldxenfb_on_fb_event32(xenfb);
++  else
++    oldxenfb_on_fb_event64(xenfb);
++}
++
 +static void oldxenfb_on_kbd_event(struct xenfb_private *xenfb)
 +{
 +	struct xenkbd_info *page = xenfb->kbd.page;
@@ -503,11 +547,30 @@
 +}
 +
 +
-+static int oldxenfb_fb_event(struct xenfb_private *xenfb,
-+			     union xenfb_in_event *event)
++static int oldxenfb_fb_event32(struct xenfb_private *xenfb,
++			       union xenfb_in_event *event)
 +{
 +	uint32_t prod;
-+	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
++
++	prod = page->in_prod;
++	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
++		errno = EAGAIN;
++		return -1;
++	}
++
++	mb();			/* ensure ring space available */
++	XENFB_IN_RING_REF(page, prod) = *event;
++	wmb();			/* ensure ring contents visible */
++	page->in_prod = prod + 1;
++	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static int oldxenfb_fb_event64(struct xenfb_private *xenfb,
++			       union xenfb_in_event *event)
++{
++	uint32_t prod;
++	struct xenfb_page64 *page = xenfb->fb.page;
 +
 +	prod = page->in_prod;
 +	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
@@ -522,6 +585,26 @@
 +	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
++static int oldxenfb_fb_event(struct xenfb_private *xenfb,
++                             union xenfb_in_event *event)
++{
++  int mode;
++  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++    mode = sizeof(unsigned long) * 8;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++    mode = 32;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++    mode = 64;
++  else
++    return -1;
++
++  if (mode == 32)
++    return oldxenfb_fb_event32(xenfb, event);
++  else
++    return oldxenfb_fb_event64(xenfb, event);
++}
++
++
 +static int oldxenfb_kbd_event(struct xenfb_private *xenfb,
 +			      union xenkbd_in_event *event)
 +{
@@ -612,10 +695,10 @@
 +        xs_unwatch(xsh, p, "");
 +        return ret;
 +}
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 18:50:44.000000000 -0400
-@@ -0,0 +1,106 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-25 00:44:17.000000000 -0400
+@@ -0,0 +1,133 @@
 +/*
 + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
 + *
@@ -716,15 +799,42 @@
 +
 +	unsigned long pd[2];	/* FIXME rename to pgdir? */
 +	/* FIXME pd[1] unused at this time, shrink? */
++};
++
++struct xenfb_page32
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u32 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
++
++	__u32 in_cons, in_prod;
++	__u32 out_cons, out_prod;
++};
++
++struct xenfb_page64
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u64 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
 +
 +	__u32 in_cons, in_prod;
 +	__u32 out_cons, out_prod;
 +};
 +
 +#endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-25 00:42:39.000000000 -0400
 @@ -0,0 +1,92 @@
 +/*
 + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
@@ -818,9 +928,9 @@
 +void xenkbd_resume(void);
 +
 +#endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-25 00:42:39.000000000 -0400
 @@ -41,6 +41,7 @@ struct xenfb_private {
  	struct xenfb_device fb, kbd;
  	size_t fb_len;		/* size of framebuffer */
@@ -896,9 +1006,9 @@
  	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
  	event.type = XENKBD_TYPE_POS;
  	event.pos.abs_x = abs_x;
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-25 00:42:39.000000000 -0400
 @@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
  int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
  int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
@@ -918,9 +1028,9 @@
 +
 +
  #endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-25 00:42:39.000000000 -0400
 @@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
  VL_OBJS+= xen_machine_fv.o
@@ -930,9 +1040,9 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-25 00:42:39.000000000 -0400
 @@ -50,7 +50,11 @@ class VfbifController(DevController):
          if self.vm.info.is_hvm():
              # is HVM, so qemu-dm will handle the vfb.
@@ -946,9 +1056,9 @@
          args = [ xen.util.auxbin.pathTo("qemu-dm"),
                   "-M", "xenpv",
                   "-d", "%d" % self.vm.getDomid(),
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
 --- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-25 00:42:39.000000000 -0400
 @@ -689,7 +689,7 @@ class XendConfig(dict):
          self['vtpm_refs'] = cfg.get('vtpm_refs', [])
  
@@ -967,9 +1077,9 @@
                      if key in self['platform']:
                          dev_config.append([key, self['platform'][key]])
  
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
 --- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-25 00:42:39.000000000 -0400
 @@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
              d['type'] = 'sdl'
          for (k,v) in d.iteritems():



From fedora-extras-commits at redhat.com  Tue Sep 25 04:59:16 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:59:16 -0400
Subject: rpms/xen/devel xen.spec,1.188,1.189
Message-ID: <200709250459.l8P4xG6u020736@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715

Modified Files:
	xen.spec 
Log Message:
Really fix 32-on-64 fc6 guests this time


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- xen.spec	24 Sep 2007 23:46:30 -0000	1.188
+++ xen.spec	25 Sep 2007 04:58:43 -0000	1.189
@@ -280,6 +280,7 @@
 %changelog
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
 - Fix generation of manual pages (rhbz #250791)
+- Really fix FC-6 32-on-64 guests
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
 - Make 32-bit FC-6 guest PVFB work on x86_64 host



From fedora-extras-commits at redhat.com  Tue Sep 25 05:00:50 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 01:00:50 -0400
Subject: rpms/xen/devel xen.spec,1.189,1.190
Message-ID: <200709250500.l8P50obe020849@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20826

Modified Files:
	xen.spec 
Log Message:
Really fix 32-on-64 fc6 guests this time


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- xen.spec	25 Sep 2007 04:58:43 -0000	1.189
+++ xen.spec	25 Sep 2007 05:00:17 -0000	1.190
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html



From fedora-extras-commits at redhat.com  Tue Sep 25 05:18:40 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 01:18:40 -0400
Subject: rpms/firefox/devel firefox-2.0-startup-notify.patch,1.1,1.2
Message-ID: <200709250518.l8P5Ieww027297@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27272

Modified Files:
	firefox-2.0-startup-notify.patch 
Log Message:
Include the re-generated configure script in the patch

firefox-2.0-startup-notify.patch:

Index: firefox-2.0-startup-notify.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-2.0-startup-notify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-2.0-startup-notify.patch	25 Sep 2007 03:36:23 -0000	1.1
+++ firefox-2.0-startup-notify.patch	25 Sep 2007 05:18:33 -0000	1.2
@@ -1,5 +1,178 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=223492
 
+
+Index: configure
+===================================================================
+RCS file: /cvsroot/mozilla/configure,v
+retrieving revision 1.1492.2.121
+diff -d -u -p -r1.1492.2.121 configure
+--- configure	11 Jul 2007 16:44:47 -0000	1.1492.2.121
++++ configure	25 Sep 2007 05:12:51 -0000
+@@ -83,6 +83,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --with-qtdir=\$dir       Specify Qt directory "
+ ac_help="$ac_help
++  --enable-startup-notification       Enable startup-notification support (default: disabled) "
++ac_help="$ac_help
+   --enable-application=APP
+                           Options include:
+                             suite
+@@ -1067,6 +1069,7 @@ GNOMEVFS_VERSION=2.0
+ GNOMEUI_VERSION=2.2.0
+ GCONF_VERSION=1.2.1
+ LIBGNOME_VERSION=2.0
++STARTUP_NOTIFICATION_VERSION=0.8
+ 
+ MISSING_X=
+ for ac_prog in gawk mawk nawk awk
+@@ -12906,6 +12909,137 @@ fi # COMPILE_ENVIRONMENT
+ 
+ 
+ 
++if test "$MOZ_ENABLE_GTK2"
++then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++
++    # Check whether --enable-startup-notification or --disable-startup-notification was given.
++if test "${enable_startup_notification+set}" = set; then
++  enableval="$enable_startup_notification"
++  if test "$enableval" = "yes"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=force
++  elif test "$enableval" = "no"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++  else
++    { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
++    then
++        
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:12938: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
++echo "configure:12982: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
++
++        if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
++echo "configure:12989: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
++echo "configure:12994: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`"
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
++        else
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=""
++            MOZ_STARTUP_NOTIFICATION_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     MOZ_ENABLE_STARTUP_NOTIFICATION=1
++  else
++     
++            if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
++            then
++                { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; }
++            fi
++            MOZ_ENABLE_STARTUP_NOTIFICATION=
++        
++  fi
++
++    fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
++        cat >> confdefs.h <<\EOF
++#define MOZ_ENABLE_STARTUP_NOTIFICATION 1
++EOF
++
++    fi
++
++    TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
++fi
++
++
++
++
++
+ 
+ 
+ 
+@@ -20426,6 +20560,9 @@ s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
+ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
+ s%@HOST_MOC@%$HOST_MOC%g
+ s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
++s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g
++s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g
++s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g
+ s%@TK_CFLAGS@%$TK_CFLAGS%g
+ s%@TK_LIBS@%$TK_LIBS%g
+ s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g
 --- config/autoconf.mk.in	2006-09-14 14:07:03.000000000 -0400
 +++ config/autoconf.mk.in	2007-07-03 18:01:36.000000000 -0400
 @@ -223,6 +223,10 @@



From fedora-extras-commits at redhat.com  Tue Sep 25 06:33:15 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:33:15 -0400
Subject: rpms/python-iniparse/devel .cvsignore, 1.4, 1.5 python-iniparse.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709250633.l8P6XFJ1007800@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7773

Modified Files:
	.cvsignore python-iniparse.spec sources 
Log Message:
updated to release 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2007 10:38:07 -0000	1.4
+++ .cvsignore	25 Sep 2007 06:32:38 -0000	1.5
@@ -1,2 +1 @@
-iniparse-0.2.1.tar.gz
-iniparse-comment.patch
+iniparse-0.2.2.tar.gz


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-iniparse.spec	12 Sep 2007 09:48:37 -0000	1.6
+++ python-iniparse.spec	25 Sep 2007 06:32:38 -0000	1.7
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-iniparse
-Version:        0.2.1
-Release:        4%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
-Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 8
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -53,6 +51,9 @@
 
 %changelog
 
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
 * Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
 - Added some logic to get the right python-setuptools buildrequeres
 - based on the fedora version, to make the same spec file useful in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2007 10:38:07 -0000	1.4
+++ sources	25 Sep 2007 06:32:39 -0000	1.5
@@ -1,2 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
-3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:37:26 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:37:26 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <200709250637.l8P6bQ77008010@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7977

Modified Files:
	python-iniparse.spec sources 
Log Message:
updated to released 0.2.2


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-iniparse.spec	12 Sep 2007 09:50:34 -0000	1.4
+++ python-iniparse.spec	25 Sep 2007 06:36:51 -0000	1.5
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-iniparse
-Version:        0.2.1
-Release:        4%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
-Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 8
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -53,6 +51,9 @@
 
 %changelog
 
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
 * Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
 - Added some logic to get the right python-setuptools buildrequeres
 - based on the fedora version, to make the same spec file useful in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2007 10:54:41 -0000	1.4
+++ sources	25 Sep 2007 06:36:51 -0000	1.5
@@ -1,2 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
-3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:41:36 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:41:36 -0400
Subject: rpms/python-iniparse/FC-6 python-iniparse.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709250641.l8P6fa3n008128@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8093

Modified Files:
	python-iniparse.spec sources 
Log Message:
Updated to release 0.2.2-1


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/FC-6/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:43:22 -0000	1.2
+++ python-iniparse.spec	25 Sep 2007 06:41:02 -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:           python-iniparse
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
@@ -10,7 +10,11 @@
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -24,7 +28,6 @@
 %prep
 %setup -q -n iniparse-%{version}
 
-
 %build
 %{__python} setup.py build
 
@@ -47,6 +50,18 @@
 
 
 %changelog
+
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:43:22 -0000	1.3
+++ sources	25 Sep 2007 06:41:02 -0000	1.4
@@ -1 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:43:11 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:43:11 -0400
Subject: rpms/python-iniparse/EL-5 python-iniparse.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709250643.l8P6hBYt008208@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8184

Modified Files:
	python-iniparse.spec sources 
Log Message:
Updated to release 0.2.2-1


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/EL-5/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:44:49 -0000	1.2
+++ python-iniparse.spec	25 Sep 2007 06:42:38 -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:           python-iniparse
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
@@ -10,7 +10,11 @@
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -24,7 +28,6 @@
 %prep
 %setup -q -n iniparse-%{version}
 
-
 %build
 %{__python} setup.py build
 
@@ -47,6 +50,18 @@
 
 
 %changelog
+
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:44:49 -0000	1.3
+++ sources	25 Sep 2007 06:42:38 -0000	1.4
@@ -1 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:57:26 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 25 Sep 2007 02:57:26 -0400
Subject: rpms/syck/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 syck.spec, 1.14,
	1.15
Message-ID: <200709250657.l8P6vQA7008681@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/syck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608

Modified Files:
	.cvsignore sources syck.spec 
Log Message:

* Devel spec to F-7
* Update for F-7 (0.55 -> 0.61*)
* Rebuild against new PHP to solve bug #304351



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 08:15:11 -0000	1.2
+++ .cvsignore	25 Sep 2007 06:56:53 -0000	1.3
@@ -1 +1 @@
-syck-0.55.tar.gz
+syck-0.61+svn231+patches.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 08:15:11 -0000	1.2
+++ sources	25 Sep 2007 06:56:53 -0000	1.3
@@ -1 +1 @@
-a57b7c46d81170b9318e2f384f77910c  syck-0.55.tar.gz
+66513c7b458bdadf12c97899eb33be67  syck-0.61+svn231+patches.tar.gz


Index: syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/syck.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- syck.spec	1 Aug 2007 10:46:04 -0000	1.14
+++ syck.spec	25 Sep 2007 06:56:53 -0000	1.15
@@ -1,23 +1,21 @@
-# $Id$
-
 %define			php_extdir %(php-config --extension-dir || echo %{_libdir}/php)
 %{!?php_version:%define php_version %(php-config --version || echo bad)}
 
-Name:			syck
-Summary:		YAML for C, Python, and PHP
+Name:		syck
+Summary:	YAML for C, Python, and PHP
 
-Version:		0.55
-Release:		17%{?dist}
+Version:	0.61
+Release:	2%{?dist}
 
-License:		BSD
-Group:			System Environment/Libraries
-URL:			http://whytheluckystiff.net/syck/
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://whytheluckystiff.net/syck/
 
-Source0:		http://rubyforge.org/frs/download.php/4492/%{name}-%{version}.tar.gz
+Source0:	http://pyyaml.org/download/pysyck/syck-%{version}+svn231+patches.tar.gz
 
-Patch0:			syck-0.55-libtool.patch
+Patch0:		syck-0.55-libtool.patch
 
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk bison flex libtool
 BuildRequires:	php-devel
 BuildRequires:	python-devel
@@ -36,10 +34,10 @@
 serialization, configuration settings, log files, Internet messaging and
 filtering. 
 
-%package		php
-Summary:		YAML module for php
-Group:			Development/Languages
-Requires:		php = %{php_version}
+%package	php
+Summary:	YAML module for php
+Group:		Development/Languages
+Requires:	php = %{php_version}
 
 %description	php
 Syck is an extension for reading and writing YAML swiftly in popular scripting
@@ -57,11 +55,9 @@
 
 The %{name}-php package contains the syck php extension.
 
-%package		python
-Summary:		YAML module for python
-Group:			Development/Languages
-#Requires:		python
-#Requires:		python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
+%package	python
+Summary:	YAML module for python
+Group:		Development/Languages
 
 %description	python
 Syck is an extension for reading and writing YAML swiftly in popular scripting
@@ -79,11 +75,11 @@
 
 The %{name}-python package contains the syck php extension.
 
-%package devel
+%package	devel
 Summary:	Static libraries and headers for developing with Syck
 Group:		Development/Libraries
 Requires:	syck = %{version}-%{release}
-%description devel
+%description	devel
 Syck is an extension for reading and writing YAML swiftly in popular scripting
 languages. As Syck loads the YAML, it stores the data directly in your
 language's symbol table. This means speed. This means power. This means Do not
@@ -101,7 +97,7 @@
 Syck.
 
 %prep
-%setup -q
+%setup -q -n syck-0.61+svn231+patches
 %patch0 -p1
 
 %build
@@ -185,9 +181,17 @@
 %{php_extdir}/*.so
 
 %changelog
-* Wed Aug 01 2007 Oliver Falk <oliver at linux-kernel.at>     - 0.55-17
+* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-2
 - Rebuild against new PHP
 
+* Tue Aug 21 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-1
+- Update
+- Clean up spec a bit
+- Rebuild to make Jesse happy
+
+* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> - 0.55-17
+- Rebuild against new PHP, again.
+
 * Thu May 24 2007 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.55-16
 - Rebuild against new PHP
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:07:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:07:54 -0400
Subject: rpms/stormbaancoureur/devel stormbaancoureur.desktop, 1.1,
	1.2 stormbaancoureur.spec, 1.3, 1.4
Message-ID: <200709250707.l8P77sNj015036@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/stormbaancoureur/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14966

Modified Files:
	stormbaancoureur.desktop stormbaancoureur.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-2
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: stormbaancoureur.desktop
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stormbaancoureur.desktop	7 Aug 2007 13:46:00 -0000	1.1
+++ stormbaancoureur.desktop	25 Sep 2007 07:07:22 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Stormbaan Coureur
 Comment=Simulated obstacle course for automobiles
-Exec=stormbaancoureur
+Exec=stormbaancoureur-wrapper
 Icon=stormbaancoureur.png
 Terminal=false
 StartupNotify=false


Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stormbaancoureur.spec	16 Aug 2007 21:57:26 -0000	1.3
+++ stormbaancoureur.spec	25 Sep 2007 07:07:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           stormbaancoureur
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 Provides:       sturmbahnfahrer = %{version}-%{release}
 Obsoletes:      sturmbahnfahrer < %{version}-%{release}
 
@@ -48,6 +48,7 @@
 # move the binary from /usr/games to /usr/bin
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -81,13 +82,16 @@
 %doc src-%{name}/JOYSTICKS src-%{name}/LICENCE src-%{name}/README
 %doc src-%{name}/TODO src-%{name}/%{name}.keys.example
 %doc src-%{name}/debian/changelog
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-2
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-1
 - New upstream bugfix release 1.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:07:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:07:59 -0400
Subject: rpms/trackballs/devel trackballs.desktop, 1.2, 1.3 trackballs.spec, 
	1.5, 1.6
Message-ID: <200709250707.l8P77x5e015043@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/trackballs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14998

Modified Files:
	trackballs.desktop trackballs.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: trackballs.desktop
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trackballs.desktop	10 Mar 2007 09:49:36 -0000	1.2
+++ trackballs.desktop	25 Sep 2007 07:07:27 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Trackballs
 Comment=Steer a marble ball through a labyrinth
-Exec=trackballs
+Exec=trackballs-wrapper
 Icon=trackballs.png
 Terminal=false
 Type=Application


Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trackballs.spec	15 Aug 2007 13:25:15 -0000	1.5
+++ trackballs.spec	25 Sep 2007 07:07:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           trackballs
 Version:        1.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Trackballs is a game in which you steer a marble ball through tracks of varying
@@ -39,6 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # we use the ALT (homedir based) highscore location
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/highScores
 %find_lang %{name}
@@ -70,7 +71,7 @@
 %files -f %{name}.lang
 %doc AUTHORS COPYING ChangeLog FAQ README TODO
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -78,6 +79,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:08:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:08:02 -0400
Subject: rpms/duel3/devel duel3.desktop,1.2,1.3 duel3.spec,1.3,1.4
Message-ID: <200709250708.l8P782xW015078@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/duel3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14978

Modified Files:
	duel3.desktop duel3.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.4.20060225
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: duel3.desktop
===================================================================
RCS file: /cvs/extras/rpms/duel3/devel/duel3.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- duel3.desktop	10 Mar 2007 10:10:42 -0000	1.2
+++ duel3.desktop	25 Sep 2007 07:07:24 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Duel 3
 Comment=One on one spaceship duel in a 2D arena
-Exec=duel3
+Exec=duel3-wrapper
 Icon=duel3.png
 Terminal=false
 StartupNotify=false


Index: duel3.spec
===================================================================
RCS file: /cvs/extras/rpms/duel3/devel/duel3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- duel3.spec	6 Aug 2007 11:44:51 -0000	1.3
+++ duel3.spec	25 Sep 2007 07:07:24 -0000	1.4
@@ -1,20 +1,20 @@
 %define snapshot 20060225
 Name:           duel3
 Version:        0.1
-Release:        0.3.%{snapshot}%{?dist}
+Release:        0.4.%{snapshot}%{?dist}
 Summary:        One on one spaceship duel in a 2D arena
 Group:          Amusements/Games
 License:        BSD
 URL:            http://ts-games.com/duel3.php
-Source0:        http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_src.zip
-Source1:        http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_bin.zip
+Source0:        http://downloads.sourceforge.net/%{name}/Duel3_%{snapshot}_src.zip
+Source1:        http://downloads.sourceforge.net/%{name}/Duel3_%{snapshot}_bin.zip
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 Source4:        music-credits.txt
 Patch0:         Duel3_20060225-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alleggl-devel dumb-devel libGLU-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 The sudden attack from the Martain Rim miners caught the Earth by suprise,
@@ -57,6 +57,7 @@
 pushd Source
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 popd
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -88,13 +89,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Source/readme.txt license.txt music-credits.txt
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.4.20060225
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.3.20060225
 - Fixup .desktop file categories for games-menus usage
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:21:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:21:12 -0400
Subject: rpms/ballbuster/devel ballbuster.desktop, 1.2, 1.3 ballbuster.spec, 
	1.2, 1.3
Message-ID: <200709250721.l8P7LCru015403@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15361

Modified Files:
	ballbuster.desktop ballbuster.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: ballbuster.desktop
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/ballbuster.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ballbuster.desktop	5 Aug 2007 18:39:36 -0000	1.2
+++ ballbuster.desktop	25 Sep 2007 07:20:40 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Ball: Buster
 Comment=Move the paddle to bounce the ball and break all the bricks
-Exec=ballbuster
+Exec=ballbuster-wrapper
 Icon=ballbuster.png
 Terminal=false
 StartupNotify=false


Index: ballbuster.spec
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/ballbuster.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ballbuster.spec	5 Aug 2007 18:39:36 -0000	1.2
+++ ballbuster.spec	25 Sep 2007 07:20:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ballbuster
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Move the paddle to bounce the ball and break all the bricks
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,7 +10,7 @@
 Patch0:         ballbuster-unix.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib-devel desktop-file-utils ImageMagick
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Game inspired by one of the great classics. The purpose of the game is to
@@ -35,6 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -66,13 +67,16 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING credits.txt ExtremeUpdates.txt manual.html html
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Sun Aug  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:21:17 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:21:17 -0400
Subject: rpms/methane/devel methane.desktop,1.1,1.2 methane.spec,1.2,1.3
Message-ID: <200709250721.l8P7LHB8015410@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/methane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15383

Modified Files:
	methane.desktop methane.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: methane.desktop
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- methane.desktop	14 Feb 2007 07:57:12 -0000	1.1
+++ methane.desktop	25 Sep 2007 07:20:44 -0000	1.2
@@ -72,7 +72,7 @@
 GenericName[zh_TW]=????????????
 GenericName[zu]=Umdlalo womhhume
 Comment=Converted from the Amiga by its original author
-Exec=methane
+Exec=methane-wrapper
 Icon=methane
 Terminal=false
 StartupNotify=false


Index: methane.spec
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- methane.spec	15 Aug 2007 07:30:07 -0000	1.2
+++ methane.spec	25 Sep 2007 07:20:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           methane
 Version:        1.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Super Methane Brothers
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,7 +15,7 @@
 Patch2:         methane-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib-devel mikmod-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Super Methane Brothers is a platform game converted from the Amiga by
@@ -45,9 +45,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_var}/games
 install -m 755 source/linux/%{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 touch $RPM_BUILD_ROOT%{_var}/games/%{name}scores
 
-
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -82,6 +82,7 @@
 %defattr(-,root,root,-)
 %doc authors copying docs history i_linux readme todo
 %attr(2755,root,games) %{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
 %verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_var}/games/%{name}scores
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/applications/fedora-%{name}-help.desktop
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:33:51 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 25 Sep 2007 03:33:51 -0400
Subject: rpms/aspell-fo/devel aspell-fo.spec,1.12,1.13
Message-ID: <200709250733.l8P7XpEO015682@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-fo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15651

Modified Files:
	aspell-fo.spec 
Log Message:
increase epoch



Index: aspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aspell-fo.spec	17 Sep 2007 09:21:50 -0000	1.12
+++ aspell-fo.spec	25 Sep 2007 07:33:18 -0000	1.13
@@ -3,9 +3,9 @@
 %define aspellversion 5
 Summary: Faeroese dictionaries for Aspell
 Name: aspell-%{lang}
-Epoch: 50
+Epoch: 51
 Version: 0.2.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
@@ -39,7 +39,10 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
-* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-1
+* Tue Sep 25 2007 Ivana Varekova <varekova at redhat.com> - 51:0.2.16-7
+- increase epoch
+
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-6
 - update to 0.2.16
 
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.51-6



From fedora-extras-commits at redhat.com  Tue Sep 25 08:25:49 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 25 Sep 2007 04:25:49 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.32,1.33
Message-ID: <200709250825.l8P8Pn4i023403@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.7-57.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sysprof-kmod.spec	12 Sep 2007 22:48:11 -0000	1.32
+++ sysprof-kmod.spec	25 Sep 2007 08:25:14 -0000	1.33
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-49.fc6}
+%{!?kversion: %define kversion 2.6.22.7-57.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Tue Sep 25 08:34:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 25 Sep 2007 04:34:30 -0400
Subject: rpms/crontabs/devel crontabs.spec,1.21,1.22 run-parts,1.5,1.6
Message-ID: <200709250834.l8P8YUWJ023735@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23710

Modified Files:
	crontabs.spec run-parts 
Log Message:
Fix problem - cron.hourly, daily not running.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- crontabs.spec	30 Aug 2007 12:32:56 -0000	1.21
+++ crontabs.spec	25 Sep 2007 08:33:58 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
@@ -50,6 +50,10 @@
 %config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Tue Sep 25 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-18
+- cron.{hourly, daily,...} run ok
+- rhbz#296741
+
 * Thu Aug 30 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-17
 - better solution of configuration script
 


Index: run-parts
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/run-parts,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- run-parts	27 Aug 2007 06:36:22 -0000	1.5
+++ run-parts	25 Sep 2007 08:33:58 -0000	1.6
@@ -1,9 +1,4 @@
 #!/bin/bash
-# if cron.daily was run today
-AUX1=`cat /var/spool/anacron/cron.daily`
-AUX2=`date +%Y%m%d`
-[ "$AUX1" == $AUX2 ] || exit 0
-
 # run-parts - concept taken from Debian
 
 # keep going when something fails



From fedora-extras-commits at redhat.com  Tue Sep 25 08:55:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 25 Sep 2007 04:55:08 -0400
Subject: rpms/anacron/devel anacron.spec,1.41,1.42
Message-ID: <200709250855.l8P8t8rv024234@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24206

Modified Files:
	anacron.spec 
Log Message:
- cron.{hourly,daily} work correct -> remove checking whether
  cron.daily has been run
- persist: run pc between midnight and 4:02 -> cron.daily run twice.
- rhbz#296741




Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- anacron.spec	31 Aug 2007 07:27:32 -0000	1.41
+++ anacron.spec	25 Sep 2007 08:54:37 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -13,7 +13,6 @@
 Patch2: anacron-2.3-fdclose.patch
 Patch3: anacron-2.3-pic.patch
 Patch4: anacron-2.3-memleaking.patch
-Patch5: anacron-script.patch
 
 Requires: crontabs
 Requires: initscripts
@@ -45,7 +44,6 @@
 %patch2 -p1 -b .fdclose
 %patch3 -p1 -b .pic
 %patch4 -p1 -b .memleaking
-%patch5 -p1 -b .script
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -97,7 +95,6 @@
 %doc COPYING README
 %config(noreplace) /etc/anacrontab
 %dir /var/spool/anacron/
-#%config(noreplace) /etc/rc.d/init.d/*
 %dir /etc/rc.d/init.d/*
 /%{_mandir}/man5/*
 /%{_mandir}/man8/*
@@ -107,6 +104,12 @@
 %attr(755,root,root) %dir /etc/cron.weekly/0anacron
 
 %changelog
+* Tue Sep 25 2007 Marcela Maslanova <mmaslano at redhat.com> 2.3-56
+- cron.{hourly,daily} work correct -> remove checking whether
+  cron.daily has been run
+- persist: run pc between midnight and 4:02 -> cron.daily run twice.
+- rhbz#296741
+
 * Fri Aug 31 2007 Marcela Maslanova <mmaslano at redhat.com> 2.3-55
 - change chkconfig --add, because it wasn't running after 
     fresh install #267801



From fedora-extras-commits at redhat.com  Tue Sep 25 09:01:58 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Sep 2007 05:01:58 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.61,1.62
Message-ID: <200709250901.l8P91wZl030565@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24487

Modified Files:
	alsa-utils.spec 
Log Message:
Cosmetic cleanups only : Indentation and consistency.



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- alsa-utils.spec	24 Sep 2007 15:06:48 -0000	1.61
+++ alsa-utils.spec	25 Sep 2007 09:01:22 -0000	1.62
@@ -1,25 +1,25 @@
-%define 	prever		rc1
-%define 	prever_dot	.rc1
+%define  prever         rc1
+%define  prever_dot     .rc1
 
-Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
-Name: 		alsa-utils
-Version: 	1.0.15
-Release: 	0.3%{?prever_dot}%{?dist}
-License: 	GPLv2+
-Group: 		Applications/Multimedia
-URL: 		http://www.alsa-project.org/
-Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
-Source2:	salsa.c
-Source3: 	alsacard.c
-Source4: 	alsaunmute.c
-Source10:	alsa.rules
-Patch:		alsa-utils-1.0.14-alsaconf.patch
-Patch1:         alsa-utils-1.0.14-statedir.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	alsa-lib-devel >= %{version}
-BuildRequires:	ncurses-devel
-BuildRequires:	gettext-devel
-Conflicts:	udev < 062
+Summary: Advanced Linux Sound Architecture (ALSA) utilities
+Name:    alsa-utils
+Version: 1.0.15
+Release: 0.3%{?prever_dot}%{?dist}
+License: GPLv2+
+Group:   Applications/Multimedia
+URL:     http://www.alsa-project.org/
+Source:  ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
+Source2: salsa.c
+Source3: alsacard.c
+Source4: alsaunmute.c
+Source10: alsa.rules
+Patch0:  alsa-utils-1.0.14-alsaconf.patch
+Patch1:  alsa-utils-1.0.14-statedir.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: alsa-lib-devel >= %{version}
+BuildRequires: ncurses-devel
+BuildRequires: gettext-devel
+Conflicts: udev < 062
 
 %description
 This package contains command line utilities for the Advanced Linux Sound
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch 	-p1
+%patch0 -p1
 %patch1 -p1 -b .statedir
 
 %build
@@ -38,7 +38,7 @@
 %{__cc} $RPM_OPT_FLAGS -o alsaunmute %{SOURCE4} -lasound
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -73,7 +73,7 @@
 %{_datadir}/alsa/
 %{_datadir}/sounds/
 %{_mandir}/man?/*
-%dir /var/lib/alsa
+%dir /var/lib/alsa/
 %ghost /var/lib/alsa/asound.state
 
 



From fedora-extras-commits at redhat.com  Tue Sep 25 09:15:50 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 05:15:50 -0400
Subject: comps/po gu.po,1.5,1.6
Message-ID: <200709250915.l8P9Foqb030817@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30795/po

Modified Files:
	gu.po 
Log Message:
Updated Gujarati Translation


Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gu.po	17 Sep 2007 19:22:12 -0000	1.5
+++ gu.po	25 Sep 2007 09:15:20 -0000	1.6
@@ -1,24 +1,23 @@
-# translation of gu1.po to Gujarati
-# translation of gu.po to Gujarati
+# translation of comps.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.
+#
 # Automatically generated, 2004.
 # Ankit Patel <ankit at redhat.com>, 2004, 2005, 2006, 2007.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: gu\n"
+"Project-Id-Version: comps.gu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-02-26 11:10+0530\n"
+"PO-Revision-Date: 2007-09-19 13:01+0530\n"
 "Last-Translator: Ankit Patel <ankit at redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu 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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -192,10 +191,8 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
@@ -265,8 +262,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
@@ -325,8 +321,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -401,41 +396,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "??? ????????? ??? ??????????????? ???????????????????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????? ??????."
+msgstr "?????????????????? ??????????????? ???????????? ??? ????????? ??? ????????????????????? ???????????????????????? ???????????? ??????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
@@ -498,19 +484,16 @@
 msgstr "????????? ????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -533,23 +516,20 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -628,9 +608,8 @@
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -657,9 +636,8 @@
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "??????????????? ????????????"
+msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -690,16 +668,14 @@
 msgstr "???????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -722,9 +698,8 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -735,14 +710,12 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????? ????????????"
+msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -769,9 +742,8 @@
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -794,9 +766,8 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -831,9 +802,8 @@
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -860,9 +830,8 @@
 msgstr "????????????????????? ???????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -893,9 +862,8 @@
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "???????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -914,18 +882,15 @@
 msgstr "Eclipse Integrated Development Environment."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????? DHCP, ????????????????????? ????????? NIS ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
@@ -969,8 +934,7 @@
 "?????????????????? ??????, ?????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "??? ???????????????????????? ????????? ???????????? ?????????????????? ?????? DNS ????????? ???????????? (BIND) ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
@@ -988,14 +952,12 @@
 msgstr "??? ??????????????? ????????? Postgresql ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1014,18 +976,16 @@
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "???????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1053,346 +1013,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "????????????????????????????????? ???????????????????????? ?????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "???????????????"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "???????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????????????????? ?????? ???????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse Integrated Development Environment."
+msgstr "Eclipse ?????????????????? Integrated Development Environments."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "??????????????? ???????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "????????? ????????????"
+msgstr "???????????? ?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "British Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "??????????????????????????????????????? ????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????????????????? ??????????????????????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "???????????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "??????????????? ??????????????? ????????????????????? ???????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ???????????????????????? ????????????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "??????????????? ???????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????? ???????????????????????? ??????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ?????????????????????????????? ???????????? ???????????????????????? ??????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????????????????? ????????????????????? ??????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ?????????????????????"
-
-#~ msgid "Server"
-#~ msgstr "???????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????-???????????????????????? ?????????????????? ???????????? ?????????????????? ?????????????????????????????? ????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "????????????????????? ????????????"
-
-#~ msgid "System"
-#~ msgstr "??????????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ???????????? ??????????????????."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "??? ?????????????????? ???????????? IMAP ???????????? ?????????????????????????????? ???????????? ??????????????? ????????????????????????????????? ???????????? ???????????? ????????????????????? ????????? ??????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr "??? ?????????????????? Red Hat Enterprise Linux ?????? ???????????? ????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ??????."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "??????????????????????????? ????????????????????? ??????????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "????????????????????? ??????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ???????????????????????? ??????????????????????????????????????? ????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ?????????????????? ??????????????????????????????????????? ????????????????????? ???????????? ????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ?????????????????? ??????????????????????????????????????? ????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "????????????????????????????????? ??????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "????????????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????"
-
-#~ msgid "German"
-#~ msgstr "???????????????"
-
-#~ msgid "Italian"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ????????????????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "????????? ????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????????????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "???????????????????????? ????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ?????????????????? ??????????????????????????????????????? ????????????????????? ????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "???????????????"
-
-#~ 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."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????????????????? ????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "?????????????????? ?????? ?????? ????????????????????? ?????????????????? ???????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "?????????????????? ?????? ?????? ??????-????????? GFS ???????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "?????? ????????? GFS ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "??? ?????????????????? ???????????????????????? ???????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????????? ??????????????????????????? ????????? ??????????????? ?????????"
-
-#~ msgid "Misc"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ??????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "?????????????????? ?????? ?????? Red Hat Enterprise Linux ???????????? ????????????????????? ?????????????????? ???????????? ???????????? ??????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "????????????????????????????????????????????? ????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????????? ?????????????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????????? ????????????????????????????????? ??????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ??????????????????????????? ??????????????????"
+msgstr "???????????? ?????????????????? ????????? ?????????????????? ??????????????? ??????????????????"
 
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "?????????????????? ?????? ?????? ???????????????????????? ????????????????????????????????? ???????????? ??????????????? ??????????????? ???????????? ??????."



From fedora-extras-commits at redhat.com  Tue Sep 25 09:17:32 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 05:17:32 -0400
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.9-getgrouplist.patch, NONE, 
	1.1 cyrus-imapd-2.3.9-implicitdecl.patch, NONE,
	1.1 cyrus-imapd-2.3.9-myfatal.patch, NONE, 1.1 cyrus-imapd.spec,
	1.31, 1.32 cyrus-imapd-2.3.8-getgrouplist.patch, 1.2, NONE
Message-ID: <200709250917.l8P9HW2E030872@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30841

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.9-getgrouplist.patch 
	cyrus-imapd-2.3.9-implicitdecl.patch 
	cyrus-imapd-2.3.9-myfatal.patch 
Removed Files:
	cyrus-imapd-2.3.8-getgrouplist.patch 
Log Message:
* Sun Sep 23 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-7
- updated the getgrouplist patch
- fixed a few undeclared functions (and int to pointer conversions)


cyrus-imapd-2.3.9-getgrouplist.patch:

--- NEW FILE cyrus-imapd-2.3.9-getgrouplist.patch ---
--- cyrus/lib/auth_unix.c	2007/02/13 16:42:49	1.41
+++ cyrus/lib/auth_unix.c	2007/09/17 14:36:40	1.45
@@ -41,7 +41,7 @@
  */
 
 /*
- * $Id: auth_unix.c,v 1.41 2007/02/13 16:42:49 murch Exp $
+ * $Id: auth_unix.c,v 1.45 2007/09/17 14:36:40 murch Exp $
  */
 
 #include <config.h>
@@ -224,6 +224,10 @@ static struct auth_state *mynewstate(con
     struct passwd *pwd;
     struct group *grp;
     char **mem;
+#ifdef HAVE_GETGROUPLIST
+    gid_t gid, *groupids = NULL;
+    int ret, ngroups = 0;
+#endif
 
     identifier = mycanonifyid(identifier, 0);
     if (!identifier) return 0;
@@ -239,7 +243,48 @@ static struct auth_state *mynewstate(con
 	return newstate;
 
     pwd = getpwnam(identifier);
-	
+
+#ifdef HAVE_GETGROUPLIST
+    gid = pwd ? pwd->pw_gid : (gid_t) -1;
+
+    /* get number of groups user is member of into ngroups */
+    getgrouplist(identifier, gid, NULL, &ngroups);
+
+    /* get the actual group ids */
+    do {
+	groupids = (gid_t *)xrealloc((gid_t *)groupids,
+				     ngroups * sizeof(gid_t));
+
+	newstate->ngroups = ngroups; /* copy of ngroups for comparision */
+	ret = getgrouplist(identifier, gid, groupids, &ngroups);
+	/*
+	 * This is tricky. We do this as long as getgrouplist tells us to
+	 * realloc _and_ the number of groups changes. It tells us to realloc
+	 * also in the case of failure...
+	 */
+    } while (ret != -1 && ngroups != newstate->ngroups);
+
+    if (ret == -1) {
+	newstate->ngroups = 0;
+	newstate->group = NULL;
+	goto err;
+    }
+
+    newstate->ngroups = 0;
+    newstate->group = (char **)xmalloc(ngroups * sizeof(char *));
+    while (ngroups--) {
+	if (pwd || groupids[ngroups] != gid) {
+	    if ((grp = getgrgid(groupids[ngroups]))) {
+		newstate->ngroups++;
+		newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+	    }
+	}
+    }
+
+err:
+    if (groupids) free(groupids);
+
+#else /* !HAVE_GETGROUPLIST */
     setgrent();
     while ((grp = getgrent())) {
 	for (mem = grp->gr_mem; *mem; mem++) {
@@ -254,6 +299,8 @@ static struct auth_state *mynewstate(con
 	}
     }
     endgrent();
+#endif /* HAVE_GETGROUPLIST */
+
     return newstate;
 }
 

cyrus-imapd-2.3.9-implicitdecl.patch:

--- NEW FILE cyrus-imapd-2.3.9-implicitdecl.patch ---
--- cyrus-imapd-2.3.9/imap/tls_prune.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/tls_prune.c	2007-09-18 15:48:46.000000000 +0200
@@ -49,6 +49,7 @@
 
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "tls.h"
 #include "xmalloc.h"
 
--- cyrus-imapd-2.3.9/imap/sync_client.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_client.c	2007-09-18 15:39:44.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/protocol.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/protocol.c	2007-09-18 15:39:09.000000000 +0200
@@ -49,6 +49,8 @@
 
 #include "protocol.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 static char *imap_parsemechlist(const char *str, struct protocol_t *prot)
 {
--- cyrus-imapd-2.3.9/imap/ipurge.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ipurge.c	2007-09-18 15:48:26.000000000 +0200
@@ -61,6 +61,7 @@
 
 /* cyrus includes */
 #include "global.h"
+#include "util.h"
 #include "sysexits.h"
 #include "exitcodes.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/cyrdump.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/cyrdump.c	2007-09-18 15:48:30.000000000 +0200
@@ -54,6 +54,7 @@
 #include "assert.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "imapd.h"
 #include "imap_err.h"
 #include "imapurl.h"
--- cyrus-imapd-2.3.9/imap/fetchnews.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/fetchnews.c	2007-09-18 15:48:50.000000000 +0200
@@ -60,10 +60,13 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "gmtoff.h"
 #include "lock.h"
 #include "prot.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* global state */
 const int config_need_data = 0;
--- cyrus-imapd-2.3.9/imap/sync_server.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_server.c	2007-09-18 15:40:02.000000000 +0200
@@ -94,6 +94,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sync_support.h"
 #include "sync_commit.h"
--- cyrus-imapd-2.3.9/imap/ctl_mboxlist.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ctl_mboxlist.c	2007-09-18 15:48:35.000000000 +0200
@@ -77,6 +77,7 @@
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "global.h"
+#include "util.h"
 #include "libcyr_cfg.h"
 #include "mboxlist.h"
 #include "mupdate.h"
--- cyrus-imapd-2.3.9/imap/sync_support.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_support.c	2007-09-18 15:39:55.000000000 +0200
@@ -71,6 +71,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/squatter.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/squatter.c	2007-09-18 15:48:39.000000000 +0200
@@ -84,6 +84,7 @@
 #include "assert.h"
 #include "mboxlist.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "mailbox.h"
--- cyrus-imapd-2.3.9/imap/autosieve.c.implicitdecl	2007-09-18 15:42:01.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-18 15:39:14.000000000 +0200
@@ -19,6 +19,9 @@
 
 #include "global.h"
 #include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/imap/arbitron.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/arbitron.c	2007-09-18 15:48:43.000000000 +0200
@@ -59,6 +59,7 @@
 
 #include "assert.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "hash.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/mupdate.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/mupdate.c	2007-09-18 15:39:34.000000000 +0200
@@ -87,6 +87,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* Sent to clients that we can't accept a connection for. */
 static const char SERVER_UNABLE_STRING[] = "* BYE \"Server Unable\"\r\n";
--- cyrus-imapd-2.3.9/imap/make_md5.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/make_md5.c	2007-09-18 15:48:54.000000000 +0200
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "global.h"
+#include "util.h"
 #include "assert.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
--- cyrus-imapd-2.3.9/imap/sync_commit.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_commit.c	2007-09-18 15:40:08.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.implicitdecl	2007-09-18 15:27:37.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-18 15:27:48.000000000 +0200
@@ -20,6 +20,7 @@
 #include "global.h"
 
 #include "util.h"
+#include "xmalloc.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/timsieved/timsieved.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/timsieved.c	2007-09-18 15:40:35.000000000 +0200
@@ -73,6 +73,8 @@
 #include "prot.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "exitcodes.h"
 #include "iptostring.h"
 #include "global.h"
--- cyrus-imapd-2.3.9/timsieved/actions.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/actions.c	2007-09-18 15:40:25.000000000 +0200
@@ -69,6 +69,8 @@
 #include "global.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "sieve_interface.h"
 
 #include "codes.h"
--- cyrus-imapd-2.3.9/timsieved/parser.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/parser.c	2007-09-18 15:40:41.000000000 +0200
@@ -64,6 +64,8 @@
 #include "mboxname.h"
 #include "mboxlist.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "prot.h"
 #include "tls.h"
 #include "lex.h"
--- cyrus-imapd-2.3.9/master/cyrusMasterMIB.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/master/cyrusMasterMIB.c	2007-09-18 15:39:06.000000000 +0200
@@ -52,6 +52,8 @@
 
 #include "master.h"
 #include "../imap/version.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* 
  * cyrusMasterMIB_variables_oid:
--- cyrus-imapd-2.3.9/sieve/interp.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/interp.c	2007-09-18 15:38:40.000000000 +0200
@@ -33,6 +33,8 @@
 #include <string.h>
 
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sieve_interface.h"
 #include "interp.h"
--- cyrus-imapd-2.3.9/sieve/addr.y.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/addr.y	2007-09-18 15:38:45.000000000 +0200
@@ -37,6 +37,8 @@
 #include "addr.h"
 #include "script.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
     
 int yyerror(char *msg);
 extern int yylex(void);
--- cyrus-imapd-2.3.9/imtest/imtest.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imtest/imtest.c	2007-09-18 15:40:14.000000000 +0200
@@ -82,6 +82,8 @@
 #include "imparse.h"
 #include "iptostring.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
--- cyrus-imapd-2.3.9/ptclient/ptexpire.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ptexpire.c	2007-09-18 15:48:57.000000000 +0200
@@ -65,6 +65,7 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "libconfig.h"
 #include "lock.h"
 #include "xmalloc.h"
--- cyrus-imapd-2.3.9/ptclient/ldap.c.implicitdecl	2007-09-18 15:49:48.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ldap.c	2007-09-18 15:40:19.000000000 +0200
@@ -61,6 +61,9 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 
+/* Functions like ldap_bind() have been deprecated in OpenLDAP 2.3 */
+#define LDAP_DEPRECATED 1
+
 #include <ldap.h>
 #include <lber.h>
 
@@ -74,6 +77,8 @@
 #include "auth_pts.h"
 #include "strhash.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* xxx this just uses the UNIX canonicalization semantics, which is
  * most likely wrong */

cyrus-imapd-2.3.9-myfatal.patch:

--- NEW FILE cyrus-imapd-2.3.9-myfatal.patch ---
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-23 16:54:54.000000000 +0200
@@ -37,7 +37,7 @@
 
 static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
 
@@ -68,7 +68,7 @@
     extern char *optarg;
     char sieve_tmpname[MAX_MAILBOX_NAME+1];
 
-    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+    if (geteuid() == 0) my_fatal("must run as the Cyrus user", EC_USAGE);
 
     while((opt = getopt(argc, argv, "C:i:o:")) != EOF) {
         switch (opt) {
@@ -218,7 +218,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 extern sieve_vacation_t vacation2;/* = {
@@ -234,7 +234,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }
 
--- cyrus-imapd-2.3.9/imap/autosieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-23 16:37:27.000000000 +0200
@@ -35,7 +35,7 @@
 static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
 int autoadd_sieve(char *userid, const char *source_script);
 
-static void fatal(const char *s, int code);
+static void my_fatal(const char *s, int code);
 static void foo(void);
 static int sieve_notify(void *ac __attribute__((unused)),
                         void *interp_context __attribute__((unused)),
@@ -441,7 +441,7 @@
     return 0;
 }
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
     exit(1);
@@ -450,7 +450,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 static int sieve_notify(void *ac __attribute__((unused)),
@@ -459,7 +459,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }
 


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cyrus-imapd.spec	28 Aug 2007 11:09:51 -0000	1.31
+++ cyrus-imapd.spec	25 Sep 2007 09:17:00 -0000	1.32
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.9
 Name: cyrus-imapd
 Version: 2.3.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -147,11 +147,13 @@
 Patch16: cyrus-imapd-2.3.7-db4.5.patch
 Patch17: cyrus-imapd-2.3.7-makeinstallfix.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-Patch20: cyrus-imapd-2.3.8-getgrouplist.patch
+Patch19: cyrus-imapd-2.3.9-implicitdecl.patch
+Patch20: cyrus-imapd-2.3.9-myfatal.patch
 # Patches >= 100 are / will be fixed in CVS
 Patch100: cyrus-imapd-2.3.1-make_md5.patch
 Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
 Patch102: cyrus-imapd-2.3.1-replication_policycheck.patch
+Patch103: cyrus-imapd-2.3.9-getgrouplist.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl, perl-devel, tcp_wrappers
@@ -256,7 +258,9 @@
 #%patch16 -p1 -b .db4.5
 #%patch17 -p1 -b .makeinstallfix
 %patch18 -p1 -b .krb4
-%patch20 -p1 -b .getgrouplist
+%patch19 -p1 -b .implicitdecl
+%patch20 -p1 -b .myfatal
+%patch103 -p1 -b .getgrouplist
 # fixed upstream
 #%patch100 -p1 -b .make_md5
 # fixed upstream
@@ -272,6 +276,7 @@
 autoconf -f
 
 %build
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration"
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl; then
@@ -798,6 +803,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-7
+- updated the getgrouplist patch
+- fixed a few undeclared functions (and int to pointer conversions)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-6
 - update to latest upstream
 - updated all patches from uoa and reenabled rmquota+deletemailbox


--- cyrus-imapd-2.3.8-getgrouplist.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 09:24:10 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 05:24:10 -0400
Subject: rpms/dovecot/devel dovecot-1.1.alpha3-wakeup.patch, NONE,
	1.1.2.1 dovecot.spec, 1.90, 1.90.2.1
Message-ID: <200709250924.l8P9OAnW031050@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030

Modified Files:
      Tag: private-1_1-branch
	dovecot.spec 
Added Files:
      Tag: private-1_1-branch
	dovecot-1.1.alpha3-wakeup.patch 
Log Message:
* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
- wakeup work (252140)


dovecot-1.1.alpha3-wakeup.patch:

--- NEW FILE dovecot-1.1.alpha3-wakeup.patch ---
--- dovecot-1.1.alpha3/src/master/auth-process.c.wakeup	2007-08-13 14:02:27.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/auth-process.c	2007-08-16 15:33:41.000000000 +0200
@@ -372,6 +372,9 @@
 	if (close(p->fd) < 0)
 		i_error("close(auth) failed: %m");
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		auth_processes_start_missing(NULL);
 }
 
 static void
@@ -755,7 +758,7 @@
 		"slowing down for now");
 	auth_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, auth_processes_start_missing, NULL);
 }
 
@@ -787,20 +790,22 @@
 
 		auth_stalled = FALSE;
 		timeout_remove(&to);
-		to = timeout_add(1000, auth_processes_start_missing, NULL);
+		/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
 	}
 }
 
 void auth_processes_init(void)
 {
 	process_groups = NULL;
-	to = timeout_add(1000, auth_processes_start_missing, NULL);
+	/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
+	to = NULL;
 
 	auth_processes_start_missing(NULL);
 }
 
 void auth_processes_deinit(void)
 {
-	timeout_remove(&to);
+	if (to != NULL)
+		timeout_remove(&to);
 	auth_processes_destroy_all();
 }
--- dovecot-1.1.alpha3/src/master/login-process.c.wakeup	2007-08-02 17:38:14.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/login-process.c	2007-08-16 15:53:40.000000000 +0200
@@ -503,6 +503,9 @@
 
 	o_stream_unref(&p->output);
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		login_processes_start_missing(NULL);
 }
 
 static void login_process_init_env(struct login_group *group, pid_t pid)
@@ -806,7 +809,7 @@
 		"slowing down for now");
 	logins_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, login_processes_start_missing, NULL);
 }
 
@@ -815,12 +818,6 @@
 {
 	struct login_group *group;
 
-	if (!have_initialized_auth_processes) {
-		/* don't create login processes before at least one auth
-		   process has finished initializing */
-		return;
-	}
-
 	if (login_groups == NULL)
 		login_process_groups_create();
 
@@ -832,6 +829,19 @@
 	}
 }
 
+static void
+login_processes_start(void *context __attr_unused__)
+{
+	if (!have_initialized_auth_processes) {
+		/* don't create login processes before at least one auth
+		   process has finished initializing */
+		return;
+	}
+
+	timeout_remove(&to);
+	login_processes_start_missing(NULL);
+}
+
 static int login_process_send_env(struct login_process *p)
 {
 	extern char **environ;
@@ -912,7 +922,7 @@
 					   login_process_destroyed);
 
 	if (!IS_INETD()) {
-		to = timeout_add(1000, login_processes_start_missing, NULL);
+		to = timeout_add(1000, login_processes_start, NULL);
 		io_listen = NULL;
 	} else {
 		to = NULL;


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- dovecot.spec	22 Aug 2007 12:45:08 -0000	1.90
+++ dovecot.spec	25 Sep 2007 09:23:38 -0000	1.90.2.1
@@ -3,7 +3,7 @@
 %define upstream 1.1.alpha3
 %define sieve_upstream 1.1-%{sieve_hg}
 %define pkg_version 1.1
-%define my_release 16.1
+%define my_release 16.2
 %define pkg_release %{my_release}.alpha3%{?dist}
 %define pkg_sieve_version 1.1
 %define pkg_sieve_release %{my_release}.hg.%{sieve_hg}%{?dist}
@@ -38,6 +38,7 @@
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
 Patch107: dovecot-1.1-unicodedata.patch
+Patch108: dovecot-1.1.alpha3-wakeup.patch
 #Patch200: dovecot-%{dovecot_hg}.patch
 
 # XXX this patch needs review and forward porting
@@ -171,6 +172,7 @@
 %patch103 -p1 -b .mkcert-permissions
 %patch105 -p1 -b .mkcert-paths
 %patch107 -p1 -b .unicodedata
+%patch108 -p1 -b .wakeup
 #%patch200 -p1 -b .%{dovecot_hg}
 
 %if %{build_sieve}
@@ -399,6 +401,9 @@
 %endif
 
 %changelog
+* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
+- wakeup work (252140)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.1.alpha3
 - updated license tags
 



From fedora-extras-commits at redhat.com  Tue Sep 25 09:39:22 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 25 Sep 2007 05:39:22 -0400
Subject: fedora-security/audit fc7,1.120,1.121
Message-ID: <200709250939.l8P9dMZn031536@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31518/audit

Modified Files:
	fc7 
Log Message:
Forgot to commit note for bugzilla yesterday.



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc7	24 Sep 2007 21:01:58 -0000	1.120
+++ fc7	25 Sep 2007 09:39:20 -0000	1.121
@@ -9,6 +9,7 @@
 # Up to date FC7 as of 20070916
 
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
+CVE-2007-5038 VULNERABLE (bugzilla, fixed 3.0.2, 3.1.2) #299981
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
 CVE-2007-5007 VULNERABLE (balsa) #297601



From fedora-extras-commits at redhat.com  Tue Sep 25 09:53:01 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 05:53:01 -0400
Subject: rpms/NetworkManager/devel
	nm-applet-0.7.0-no-connection-editor.patch, 
	NONE, 1.1 .cvsignore, 1.47,
	1.48 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.5,
	1.6 NetworkManager.spec, 1.169, 1.170 sources, 1.66, 1.67
Message-ID: <200709250953.l8P9r1Vr031933@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31903

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec sources 
Added Files:
	nm-applet-0.7.0-no-connection-editor.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
- New snapshot
	- Fix applet icon sizing on start (mclasen)
	- Fix nm-tool installation (mclasen)
	- Fix 'state' method call return (#303271)
	- Fix 40-bit WEP keys (again)
	- Fix loop when secrets were wrong/invalid
	- Fix applet crash when clicking Cancel in the password dialog
	- Ensure NM doesn't get stuck waiting for the supplicant to re-appear
		if it crashes or goes away
	- Make VPN properties applet work again
	- Increase timeout for network password entry



nm-applet-0.7.0-no-connection-editor.patch:

--- NEW FILE nm-applet-0.7.0-no-connection-editor.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor	2007-09-25 05:18:05.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 05:18:41.000000000 -0400
@@ -1781,6 +1781,7 @@ static GtkWidget *nma_context_menu_creat
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
 	gtk_menu_shell_append (menu, applet->info_menu_item);
 
+#if 0
 	/* 'Edit Connections...' item */
 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
 	g_signal_connect (applet->connections_menu_item,
@@ -1788,6 +1789,7 @@ static GtkWidget *nma_context_menu_creat
 				   G_CALLBACK (nma_edit_connections_cb),
 				   applet);
 	gtk_menu_shell_append (menu, applet->connections_menu_item);
+#endif
 
 	/* Separator */
 	nma_menu_add_separator_item (menu);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	22 Sep 2007 03:34:03 -0000	1.47
+++ .cvsignore	25 Sep 2007 09:52:27 -0000	1.48
@@ -9,3 +9,5 @@
 NetworkManager-0.7.0.svn2849.tar.gz
 NetworkManager-0.7.0.svn2852.tar.gz
 nm-applet-0.7.0.svn191.tar.gz
+NetworkManager-0.7.0.svn2880.tar.gz
+nm-applet-0.7.0.svn199.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	20 Sep 2007 14:06:41 -0000	1.5
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	25 Sep 2007 09:52:27 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-19 22:10:17.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-20 08:11:45.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-24 11:02:11.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-25 03:27:22.000000000 -0400
 @@ -18,10 +18,10 @@ dnl
  dnl This doesn't depend on gnome support, only on gnome-common, autogen already
  dnl uses gnome-autogen
@@ -25,9 +25,34 @@
  		 gtk+-2.0 >= 2.6
  		 libglade-2.0
  		 gconf-2.0
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix	2007-09-25 03:33:31.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am	2007-09-25 03:34:10.000000000 -0400
+@@ -1,6 +1,10 @@
+ 
+ bin_PROGRAMS = nm-vpn-properties
+ 
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ nm_vpn_propertiesdir=$(includedir)/NetworkManager
+ 
+ nm_vpn_properties_HEADERS = 					\
+@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \
+ 
+ nm_vpn_properties_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
++	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+ 
+ CLEANFILES = $(server_DATA) *.bak *.gladep *~
+ 
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2007-09-19 22:53:14.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-20 08:15:42.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -1,8 +1,15 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -47,7 +72,7 @@
  
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2007-09-20 07:40:37.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-20 08:16:10.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -72,7 +97,7 @@
  glade_DATA = nm-connection-editor.glade
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-09-20 07:43:02.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-20 08:11:45.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- NetworkManager.spec	22 Sep 2007 03:40:16 -0000	1.169
+++ NetworkManager.spec	25 Sep 2007 09:52:27 -0000	1.170
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2852
+%define snapshot svn2880
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,8 +18,9 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn191.tar.gz
+Source1: nm-applet-%{version}.svn199.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
+Patch2: nm-applet-0.7.0-no-connection-editor.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -122,6 +123,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
+%patch2 -p1 -b .no-connection-editor
 
 %build
 # Even though we don't require named, we still build with it
@@ -257,6 +259,19 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
+- New snapshot
+	- Fix applet icon sizing on start (mclasen)
+	- Fix nm-tool installation (mclasen)
+	- Fix 'state' method call return (#303271)
+	- Fix 40-bit WEP keys (again)
+	- Fix loop when secrets were wrong/invalid
+	- Fix applet crash when clicking Cancel in the password dialog
+	- Ensure NM doesn't get stuck waiting for the supplicant to re-appear
+		if it crashes or goes away
+	- Make VPN properties applet work again
+	- Increase timeout for network password entry
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
 - New snapshot (fix unencrypted & 40 bit WEP)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	22 Sep 2007 03:34:03 -0000	1.66
+++ sources	25 Sep 2007 09:52:27 -0000	1.67
@@ -1,2 +1,2 @@
-ca377699ea19f3114bd5f0d71cd131ea  NetworkManager-0.7.0.svn2852.tar.gz
-9e8b0d741f2fca69bbbbdcfafc6677ab  nm-applet-0.7.0.svn191.tar.gz
+25115a3500c97b6ee308852d350760ef  NetworkManager-0.7.0.svn2880.tar.gz
+ec90ed799aa6c9c1c5378f8ab31c6f5c  nm-applet-0.7.0.svn199.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 09:59:59 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 25 Sep 2007 05:59:59 -0400
Subject: rpms/minicom/devel minicom-2.2-capture.patch, NONE, 1.1 minicom.spec,
	1.27, 1.28
Message-ID: <200709250959.l8P9xx16032189@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/minicom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32158

Modified Files:
	minicom.spec 
Added Files:
	minicom-2.2-capture.patch 
Log Message:
- Fix capture file handling (#302081)


minicom-2.2-capture.patch:

--- NEW FILE minicom-2.2-capture.patch ---
Patch for #302081

This removes unncessary duplicate variable vt_capfp and fixes handling
of capture file descriptors so that minicom doesn't crash after the
capture file was closed.

Lubomir Kundrak <lkundrak at redhat.com>

diff -Nurp minicom-2.2/src/dial.c minicom-2.2.capture/src/dial.c
--- minicom-2.2/src/dial.c	2005-10-31 13:13:51.000000000 +0100
+++ minicom-2.2.capture/src/dial.c	2007-09-23 10:07:46.000000000 +0200
@@ -1355,7 +1355,7 @@ static void dial_entry(struct dialent *d
     mode_status();
   }
   newtype = d->term;
-  vt_set(-1, d->flags & FL_WRAP, NULL, -1, -1, d->flags & FL_ECHO, -1, -1);
+  vt_set(-1, d->flags & FL_WRAP, -1, -1, d->flags & FL_ECHO, -1, -1);
   local_echo = d->flags & FL_ECHO;
   if (newtype != terminal)
     init_emul(newtype, 1);
diff -Nurp minicom-2.2/src/ipc.c minicom-2.2.capture/src/ipc.c
--- minicom-2.2/src/ipc.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/ipc.c	2007-09-23 10:08:03.000000000 +0200
@@ -87,13 +87,13 @@ int keyboard(int cmd, int arg)
       escape = arg;
       break;
     case KSETBS:
-      vt_set(-1, -1, NULL, -1, arg, -1, -1, -1);
+      vt_set(-1, -1, -1, arg, -1, -1, -1);
       break;
     case KCURST:
-      vt_set(-1, -1, NULL, -1, -1, -1, NORMAL, -1);
+      vt_set(-1, -1, -1, -1, -1, NORMAL, -1);
       break;
     case KCURAPP:
-      vt_set(-1, -1, NULL, -1, -1, -1, APPL, -1);
+      vt_set(-1, -1, -1, -1, -1, APPL, -1);
       break;
     default:
       /* The rest is only meaningful if a keyserv runs. */
diff -Nurp minicom-2.2/src/minicom.c minicom-2.2.capture/src/minicom.c
--- minicom-2.2/src/minicom.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/minicom.c	2007-09-23 10:08:39.000000000 +0200
@@ -873,14 +873,14 @@ static void helpthem(void)
 void toggle_addlf(void)
 {
   addlf = !addlf;
-  vt_set(addlf, -1, NULL, -1, -1, -1, -1, -1);
+  vt_set(addlf, -1, -1, -1, -1, -1, -1);
 }
 
 /* Toggle local echo.  Can be called through the menu, or by a macro. */
 void toggle_local_echo(void)
 {
   local_echo = !local_echo;
-  vt_set(-1, -1, NULL, -1, -1, local_echo, -1 ,-1);
+  vt_set(-1, -1, -1, -1, local_echo, -1 ,-1);
 }
 
 int main(int argc, char **argv)
@@ -1137,7 +1137,7 @@ int main(int argc, char **argv)
             exit(1);
           }
           docap = 1;
-          vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1);
+          vt_set(addlf, -1, docap, -1, -1, -1, -1);
           seteuid(eff_uid);
           setegid(eff_gid);
           break;
@@ -1170,7 +1170,7 @@ int main(int argc, char **argv)
 
   if (screen_iso && screen_ibmpc)
     /* init VT */
-    vt_set(-1, -1, (FILE*)NULL, -1, -1, -1, -1, 1);
+    vt_set(-1, -1, -1, -1, -1, -1, 1);
 
 
 
@@ -1464,7 +1464,7 @@ dirty_goto:
           if (c == 1)
             docap = 0;
         }
-        vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1);
+        vt_set(addlf, -1, docap, -1, -1, -1, -1);
         break;
       case 'p': /* Set parameters */
         get_bbp(P_BAUDRATE, P_BITS, P_PARITY, P_STOPB, 0);
@@ -1489,7 +1489,7 @@ dirty_goto:
         break;
       case 'w': /* Line wrap on-off */
         c = (!us->wrap);
-        vt_set(addlf, c, capfp, docap, -1, -1, -1, -1);
+        vt_set(addlf, c, docap, -1, -1, -1, -1);
         s = c ? _("Linewrap ON") : _("Linewrap OFF");
         werror("%s", s);
         break;
diff -Nurp minicom-2.2/src/vt100.c minicom-2.2.capture/src/vt100.c
--- minicom-2.2/src/vt100.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/vt100.c	2007-09-23 10:08:51.000000000 +0200
@@ -175,7 +175,6 @@ static int vt_crlf = 0;		/* Return sends
 static int vt_om;		/* Origin mode. */
 WIN *vt_win          = NULL;	/* Output window. */
 static int vt_docap;		/* Capture on/off. */
-static FILE *vt_capfp;		/* Capture file. */
 static void (*vt_keyb)(int, int);/* Gets called for NORMAL/APPL switch. */
 static void (*termout)(const char *, int);/* Gets called to output a string. */
 
@@ -273,15 +272,13 @@ void vt_init(int type, int fg, int bg, i
 }
 
 /* Change some things on the fly. */
-void vt_set(int addlf, int wrap, FILE *capfp, int docap, int bscode,
+void vt_set(int addlf, int wrap, int docap, int bscode,
             int echo, int cursor, int asis)
 {
   if (addlf >= 0)
     vt_addlf = addlf;
   if (wrap >= 0)
     vt_win->wrap = vt_wrap = wrap;
-  if (capfp != NULL)
-    vt_capfp = capfp;
   if (docap >= 0)
     vt_docap = docap;
   if (bscode >= 0)
@@ -961,7 +958,7 @@ void vt_out(int ch)
   c = (unsigned char)ch;
 
   if (vt_docap == 2) /* Literal. */
-    fputc(c, vt_capfp);
+    fputc(c, capfp);
 
   /* Process <31 chars first, even in an escape sequence. */
   switch (c) {
@@ -977,7 +974,7 @@ void vt_out(int ch)
       if (vt_addlf) {
         wputc(vt_win, '\n');
         if (vt_docap == 1)
-          fputc('\n', vt_capfp);
+          fputc('\n', capfp);
       }
       break;
     case '\t': /* Non - destructive TAB */
@@ -989,7 +986,7 @@ void vt_out(int ch)
         f = vt_win->xs - 1;
       wlocate(vt_win, f, vt_win->cury);
       if (vt_docap == 1)
-        fputc(c, vt_capfp);
+        fputc(c, capfp);
       break;
     case 013: /* Old Minix: CTRL-K = up */
       wlocate(vt_win, vt_win->curx, vt_win->cury - 1);
@@ -1025,7 +1022,7 @@ void vt_out(int ch)
     case 7: /* Bell */
       wputc(vt_win, c);
       if (vt_docap == 1)
-        fputc(c, vt_capfp);
+        fputc(c, capfp);
       break;
     default:
       go_on = 1;
@@ -1038,7 +1035,7 @@ void vt_out(int ch)
   switch (esc_s) {
     case 0: /* Normal character */
       if (vt_docap == 1)
-        fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, vt_capfp);
+        fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, capfp);
       c = vt_inmap[c];    /* conversion 04.09.97 / jl */
 #if TRANSLATE
       if (vt_type == VT100 && vt_trans[vt_charset] && vt_asis == 0)
@@ -1080,8 +1077,8 @@ void vt_out(int ch)
 
   /* Flush output to capture file so that all output is visible there
    * immediately. Causes a write syscall for every call though. */
-  if (vt_capfp)
-    fflush(vt_capfp);
+  if (capfp)
+    fflush(capfp);
 }
 
 /* Translate keycode to escape sequence. */
diff -Nurp minicom-2.2/src/vt100.h minicom-2.2.capture/src/vt100.h
--- minicom-2.2/src/vt100.h	2005-08-04 22:33:34.000000000 +0200
+++ minicom-2.2.capture/src/vt100.h	2007-09-23 10:07:37.000000000 +0200
@@ -29,7 +29,7 @@ extern int vt_nl_delay;		/* Delay after 
 void vt_install(void(*)(const char *, int), void (*)(int, int), WIN *);
 void vt_init(int, int, int, int, int);
 void vt_pinit(WIN *, int, int);
-void vt_set(int, int, FILE *, int, int, int, int, int);
+void vt_set(int, int, int, int, int, int, int);
 void vt_out(int);
 void vt_send(int ch);
 


Index: minicom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- minicom.spec	22 Aug 2007 09:32:46 -0000	1.27
+++ minicom.spec	25 Sep 2007 09:59:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPLv2+
 Group: Applications/Communications
@@ -24,6 +24,7 @@
 Patch10: minicom-2.2-staticbuf.patch
 Patch11: minicom-2.2-sigs.patch
 Patch12: minicom-2.2-ttyerror.patch
+Patch13: minicom-2.2-capture.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -45,6 +46,7 @@
 %patch10 -p1 -b .staticbuf
 %patch11 -p1 -b .sigs
 %patch12 -p1 -b .ttyerror
+%patch13 -p1 -b .capture
 
 %build
 %configure
@@ -73,6 +75,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Lubomir Kundrak <lkundrak at redhat.com> 2.2-5
+- Fix capture file handling (#302081)
+
 * Wed Aug 22 2007 Miroslav Lichvar <mlichvar at redhat.com> 2.2-4
 - update license tag
 



From fedora-extras-commits at redhat.com  Tue Sep 25 10:18:42 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 25 Sep 2007 06:18:42 -0400
Subject: rpms/xmoto/F-7 xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.20, 1.21
Message-ID: <200709251018.l8PAIg9A006744@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6706

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-7/xmoto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmoto.spec	29 Aug 2007 17:35:47 -0000	1.20
+++ xmoto.spec	25 Sep 2007 10:18:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Tue Sep 25 10:24:54 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 06:24:54 -0400
Subject: rpms/cups/devel cups-foomatic-recommended.patch, NONE, 1.1 cups.spec,
	1.363, 1.364
Message-ID: <200709251024.l8PAOsZC007147@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7110

Modified Files:
	cups.spec 
Added Files:
	cups-foomatic-recommended.patch 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
- Don't strip foomatic recommended strings from make/model names.


cups-foomatic-recommended.patch:

--- NEW FILE cups-foomatic-recommended.patch ---
diff -up cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended cups-1.3.2/scheduler/cups-driverd.c
--- cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended	2007-09-25 10:33:29.000000000 +0100
+++ cups-1.3.2/scheduler/cups-driverd.c	2007-09-25 10:34:03.000000000 +0100
@@ -180,7 +180,6 @@ add_ppd(const char *name,		/* I - PPD na
 	int        type)		/* I - Driver type */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -238,15 +237,6 @@ add_ppd(const char *name,		/* I - PPD na
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
 
  /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
- /*
   * Return the new PPD pointer...
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- cups.spec	21 Sep 2007 12:48:18 -0000	1.363
+++ cups.spec	25 Sep 2007 10:24:22 -0000	1.364
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch14: cups-lpr-help.patch
 Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
+Patch17: cups-foomatic-recommended.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -150,6 +151,7 @@
 %patch14 -p1 -b .lpr-help
 %patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
+%patch17 -p1 -b .foomatic-recommended
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -445,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
+- Don't strip foomatic recommended strings from make/model names.
+
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
 - Write printcap when remote printers have timed out (bug #290831).
 



From fedora-extras-commits at redhat.com  Tue Sep 25 10:25:43 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Tue, 25 Sep 2007 06:25:43 -0400
Subject: rpms/rsyslog/devel .cvsignore, 1.11, 1.12 rsyslog.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200709251025.l8PAPhM0007234@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7062

Modified Files:
	.cvsignore rsyslog.spec sources 
Log Message:
bug 303341 - fix message suppression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Sep 2007 00:03:24 -0000	1.11
+++ .cvsignore	25 Sep 2007 10:25:10 -0000	1.12
@@ -1,3 +1,4 @@
 rsyslog.init
 rsyslog.sysconfig
 rsyslog-1.19.6.tar.gz
+rsyslog-1.19.6-repmsg.patch


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rsyslog.spec	25 Sep 2007 00:03:24 -0000	1.14
+++ rsyslog.spec	25 Sep 2007 10:25:10 -0000	1.15
@@ -3,13 +3,14 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 1.19.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
+Patch1: rsyslog-1.19.6-repmsg.patch
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .repmsg
 
 %build
 %configure --sbindir=%{sbindir} --disable-static
@@ -117,7 +119,10 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
-* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-2
+- fix message suppression (303341)
+
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-1
 - upstream bugfix release
 
 * Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Sep 2007 00:03:24 -0000	1.11
+++ sources	25 Sep 2007 10:25:10 -0000	1.12
@@ -1,3 +1,4 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
 0aa4ea5d07d3c2ba3080b4a64280ff72  rsyslog-1.19.6.tar.gz
+8687f4cb4dbc28106890a00eabf2c6f7  rsyslog-1.19.6-repmsg.patch



From fedora-extras-commits at redhat.com  Tue Sep 25 10:29:55 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 25 Sep 2007 06:29:55 -0400
Subject: rpms/neon/devel neon-0.27.2.tar.gz.asc, NONE, 1.1 .cvsignore, 1.10, 
	1.11 neon.spec, 1.35, 1.36 sources, 1.9, 1.10 upstream, 1.3,
	1.4 neon-0.25.5-multilib.patch, 1.1,
	NONE neon-0.27.0-gssapi.patch, 1.1, NONE
Message-ID: <200709251029.l8PATt4m007504@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459

Modified Files:
	.cvsignore neon.spec sources upstream 
Added Files:
	neon-0.27.2.tar.gz.asc 
Removed Files:
	neon-0.25.5-multilib.patch neon-0.27.0-gssapi.patch 
Log Message:
* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 0.27.2-2
- update to 0.27.2



--- NEW FILE neon-0.27.2.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQBG+NOHR/aWnQ5EzwwRAozbAJ4tHBvC9xCrIR9cO1NhsWUN1PKDsgCeM+je
gLmyed59MoXOAqFiDWVXtYs=
=blpK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Aug 2007 07:50:00 -0000	1.10
+++ .cvsignore	25 Sep 2007 10:29:23 -0000	1.11
@@ -1 +1 @@
-neon-0.27.0.tar.gz
+neon-0.27.2.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- neon.spec	20 Sep 2007 15:21:20 -0000	1.35
+++ neon.spec	25 Sep 2007 10:29:23 -0000	1.36
@@ -1,13 +1,12 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.27.0
-Release: 3
+Version: 0.27.2
+Release: 2
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
-Patch1: neon-0.27.0-gssapi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
@@ -33,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .gssapi
 
 %build
 export CC="%{__cc} -pthread"
@@ -70,6 +68,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 0.27.2-2
+- update to 0.27.2
+
 * Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
 - fix Negotiate response verification
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2007 07:50:00 -0000	1.9
+++ sources	25 Sep 2007 10:29:23 -0000	1.10
@@ -1 +1 @@
-29a0467b5d84d3f1d78bb79c7c0e02d4  neon-0.27.0.tar.gz
+24d434a4d5d4b6ce8f076039688f60ce  neon-0.27.2.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream	23 Aug 2007 07:50:00 -0000	1.3
+++ upstream	25 Sep 2007 10:29:23 -0000	1.4
@@ -1 +1 @@
-neon-0.27.0.tar.gz
+neon-0.27.2.tar.gz


--- neon-0.25.5-multilib.patch DELETED ---


--- neon-0.27.0-gssapi.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 10:43:02 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 25 Sep 2007 06:43:02 -0400
Subject: rpms/hamlib/devel .cvsignore, 1.4, 1.5 hamlib.spec, 1.23,
	1.24 sources, 1.4, 1.5
Message-ID: <200709251043.l8PAh2f4007888@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7858

Modified Files:
	.cvsignore hamlib.spec sources 
Log Message:
- Update to new upstream 1.2.6.2
- Added rigsmtr binary



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Sep 2006 18:46:32 -0000	1.4
+++ .cvsignore	25 Sep 2007 10:42:29 -0000	1.5
@@ -1 +1 @@
-hamlib-1.2.5.tar.gz
+hamlib-1.2.6.2.tar.gz


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hamlib.spec	4 Sep 2007 10:47:46 -0000	1.23
+++ hamlib.spec	25 Sep 2007 10:42:29 -0000	1.24
@@ -3,8 +3,8 @@
 
 
 Name:           hamlib
-Version:        1.2.5
-Release:        6%{?dist}
+Version:        1.2.6.2
+Release:        1%{?dist}
 
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
@@ -152,23 +152,25 @@
 %doc COPYING.LIB
 %{_bindir}/rigctl
 %{_bindir}/rigmem
+%{_bindir}/rigsmtr
 %{_bindir}/rigswr
 %{_bindir}/rotctl
 %{_sbindir}/rpc.rigd
 %{_sbindir}/rpc.rotd
-%{_libdir}/libhamlib-%{version}.so.*
+%{_libdir}/libhamlib.so.*
 %{_libdir}/hamlib-*.so
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
 %{_mandir}/man1/rigmem.1.gz
+%{_mandir}/man1/rigsmtr.1.gz
 %{_mandir}/man1/rigswr.1.gz
 %{_mandir}/man1/rotctl.1.gz
 
 %files c++
 %defattr(-, root, root)
 %doc COPYING.LIB
-%{_libdir}/libhamlib++-%{version}.so.*
+%{_libdir}/libhamlib++.so.*
 
 %files c++-devel
 %defattr(-, root, root)
@@ -206,6 +208,10 @@
 
 
 %changelog
+* Tue Sep 25 2007 Denis Leroy <denis at poolshark.org> - 1.2.6.2-1
+- Update to new upstream 1.2.6.2
+- Added rigsmtr binary
+
 * Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
 - Rebuild, License tag update
 - Added net-tools BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Sep 2006 18:46:32 -0000	1.4
+++ sources	25 Sep 2007 10:42:29 -0000	1.5
@@ -1 +1 @@
-9725a6ae60c1c8ead8669e42a67cc5e8  hamlib-1.2.5.tar.gz
+c3d0030915101c9d9d6131b15abb63f5  hamlib-1.2.6.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 11:27:44 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 25 Sep 2007 07:27:44 -0400
Subject: rpms/solarwolf/FC-6 solarwolf-path.patch, NONE,
	1.1 solarwolf.desktop, 
	NONE, 1.1 solarwolf.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709251127.l8PBRiq7015073@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15005

Modified Files:
	sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	25 Sep 2007 11:27:12 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 11:36:38 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Tue, 25 Sep 2007 07:36:38 -0400
Subject: rpms/tzdata/devel javazic-fixup.patch, NONE, 1.1 tzdata.spec, 1.50,
	1.51
Message-ID: <200709251136.l8PBacm2015310@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274

Modified Files:
	tzdata.spec 
Added Files:
	javazic-fixup.patch 
Log Message:
- Add support for building java's zoneinfo files in new
  tzdata-java RPM.


javazic-fixup.patch:

--- NEW FILE javazic-fixup.patch ---
--- sun/util/calendar/LocalGregorianCalendar.java.keiths	2007-09-07 14:48:19.000000000 -0700
+++ sun/util/calendar/LocalGregorianCalendar.java	2007-09-07 14:52:58.000000000 -0700
@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
     static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
 	Properties calendarProps = null;
 	try {
-	    String homeDir = (String) AccessController.doPrivileged(
-				new sun.security.action.GetPropertyAction("java.home"));
+  	    String homeDir = (String) System.getProperty("java.home");
 	    final String fname = homeDir + File.separator + "lib" + File.separator
 				 + "calendars.properties";
 	    calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
--- sun/util/calendar/ZoneInfoFile.java.keiths	2007-09-07 14:54:58.000000000 -0700
+++ sun/util/calendar/ZoneInfoFile.java	2007-09-07 14:55:36.000000000 -0700
@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
 	byte[] buffer = null;
 
 	try {
-	    String zi_dir = (String) AccessController.doPrivileged(
-			        new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
+	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
 	    File dir = null;
 	    if (zi_dir != null)
 	      dir = new File(zi_dir);
@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
 	    }
 
 	    if (dir == null) {
-	      String homeDir = (String) AccessController.doPrivileged(
-				new sun.security.action.GetPropertyAction("java.home"));
+	      String homeDir = (String) System.getProperty("java.home");
 	      zi_dir = homeDir + File.separator + "lib" + File.separator
 		+ "zi";
 	    }


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- tzdata.spec	22 Aug 2007 16:06:54 -0000	1.50
+++ tzdata.spec	25 Sep 2007 11:36:06 -0000	1.51
@@ -3,7 +3,7 @@
 Version: 2007g
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain, LGPLv2+
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -20,6 +20,18 @@
 This package contains data files with rules for various timezones around
 the world.
 
+%package java
+Summary: Timzeone data for Java
+Group: System Environment/Base
+Source3: javazic.tar.gz
+BuildArchitectures: noarch
+BuildRequires: java-devel
+Patch0: javazic-fixup.patch
+
+%description java
+This package contains timezone information for use by Java runtimes.
+
+
 %prep
 %setup -q -n tzdata
 mkdir tzdata%{tzdata_version}
@@ -30,15 +42,46 @@
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 
+mkdir javazic
+tar zxf %{SOURCE3} -C javazic
+pushd javazic
+%patch0
+
+# Hack alert! sun.tools may be defined and installed in the
+# VM. In order to guarantee that we are using IcedTea/OpenJDK
+# for creating the zoneinfo files, rebase all the packages
+# from "sun." to "rht.". Unfortunately, gcj does not support
+# any of the -Xclasspath options, so we must go this route
+# to ensure the greatest compatibility.
+mv sun rht
+for f in `find . -name '*.java'`; do
+	sed -i -e 's:sun\.tools\.:rht.tools.:g'\
+	       -e 's:sun\.util\.:rht.util.:g' $f
+done
+popd
+
 %build
 make
 grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
 
+pushd javazic
+javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
+popd
+pushd tzdata%{tzcode_version}
+java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
+  -d ../zoneinfo/java \
+  africa antarctica asia australasia europe northamerica pacificnew \
+  southamerica backward etcetera solar87 solar88 solar89 systemv \
+  ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
+popd
+
 %install
 rm -fr $RPM_BUILD_ROOT
 sed -i 's|@install_root@|%{buildroot}|' Makeconfig
 make install
 
+cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
+
 %check
 echo ====================TESTING=========================
 make check
@@ -54,7 +97,15 @@
 %doc tzcode%{tzcode_version}/Theory
 %doc tzcode%{tzcode_version}/tz-link.html
 
+%files java
+%defattr(-,root,root)
+%{_datadir}/javazi
+
 %changelog
+* Thu Sep 25 2007 Keith Seitz <keiths at redhat.com> - 2007g-2
+- Add support for building java's zoneinfo files in new
+  tzdata-java RPM.
+
 * Wed Aug 22 2007 Petr Machata <pmachata at redhat.com> - 2007g-1
 - Fix licensing tag.
 - Upstream 2007g



From fedora-extras-commits at redhat.com  Tue Sep 25 11:41:08 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 07:41:08 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.x.patch, 
	1.1, 1.2 system-config-printer.spec, 1.132, 1.133
Message-ID: <200709251141.l8PBf8ev015483@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460

Modified Files:
	system-config-printer-0.7.74.x.patch 
	system-config-printer.spec 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
- Pull in SVN patch from stable branch for foomatic recommended
  drivers (bug #292021).


system-config-printer-0.7.74.x.patch:

Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-0.7.74.x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-printer-0.7.74.x.patch	21 Sep 2007 17:45:28 -0000	1.1
+++ system-config-printer-0.7.74.x.patch	25 Sep 2007 11:41:06 -0000	1.2
@@ -124,8 +124,8 @@
 ===================================================================
 Index: system-config-printer.glade
 ===================================================================
---- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1571)
-+++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1571)
+--- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1574)
++++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1574)
 @@ -432,6 +432,40 @@
  			      </child>
  
@@ -169,9 +169,17 @@
  				  <property name="can_focus">True</property>
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/0.7.74.2)	(revision 1571)
-+++ ChangeLog	(.../branches/0.7.74.x)	(revision 1571)
-@@ -1,3 +1,18 @@
+--- ChangeLog	(.../tags/0.7.74.2)	(revision 1574)
++++ ChangeLog	(.../branches/0.7.74.x)	(revision 1574)
+@@ -1,3 +1,26 @@
++2007-09-25  Tim Waugh  <twaugh at redhat.com>
++
++	* ppds.py (getDriverType): Fix foomatic recommended driver
++	discovery (requires CUPS patch to prevent '(recommended)' string
++	getting stripped).
++	(PPDs.getDriverTypeWithBias): Let getDriverType have access to the
++	PPDs object.
++
 +2007-09-04  Tim Waugh  <twaugh at redhat.com>
 +
 +	* system-config-printer.py (GUI.setConnected): Set sensitivity for
@@ -190,10 +198,43 @@
  2007-09-19  Tim Waugh  <twaugh at redhat.com>
  
  	* configure.in: Version 0.7.74.2.
+Index: ppds.py
+===================================================================
+--- ppds.py	(.../tags/0.7.74.2)	(revision 1574)
++++ ppds.py	(.../branches/0.7.74.x)	(revision 1574)
+@@ -112,7 +112,7 @@
+ DRIVER_TYPE_CUPS = 80
+ DRIVER_TYPE_FOOMATIC_GENERIC = 90
+ DRIVER_DOES_NOT_WORK = 999
+-def getDriverType (ppdname):
++def getDriverType (ppdname, ppds=None):
+     """Decides which of the above types ppdname is."""
+     if ppdname.startswith ("gutenprint"):
+         if ppdname.find ("/simple/") != -1:
+@@ -128,7 +128,9 @@
+         # Foomatic (generated) -- but which driver?
+         if ppdname.find ("Generic")!= -1:
+             return DRIVER_TYPE_FOOMATIC_GENERIC
+-        if ppdname.find ("(recommended)")!= -1:
++        if (ppds != None and
++            ppds.getInfoFromPPDName (ppdname).\
++            get ('ppd-make-and-model', '').find ("(recommended)") != -1):
+             return DRIVER_TYPE_FOOMATIC_RECOMMENDED
+         if ppdname.find ("-Postscript")!= -1:
+             return DRIVER_TYPE_FOOMATIC_PS
+@@ -234,7 +236,7 @@
+         make_model = dict['ppd-make-and-model']
+         mfg, mdl = ppdMakeModelSplit (make_model)
+         def getDriverTypeWithBias (x, mfg):
+-            t = getDriverType (x)
++            t = getDriverType (x, ppds=self)
+             if mfg == "HP":
+                 if t == DRIVER_TYPE_FOOMATIC_HPIJS:
+                     # Prefer HPIJS for HP devices.
 Index: system-config-printer.py
 ===================================================================
---- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1571)
-+++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1571)
+--- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1574)
++++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1574)
 @@ -74,6 +74,12 @@
  ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
  ellipsis = unichr(0x2026)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- system-config-printer.spec	21 Sep 2007 17:45:28 -0000	1.132
+++ system-config-printer.spec	25 Sep 2007 11:41:06 -0000	1.133
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -130,6 +130,10 @@
 fi
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
+- Pull in SVN patch from stable branch for foomatic recommended
+  drivers (bug #292021).
+
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
 - Pull in SVN patch from stable branch for 'Allow printing from
   the Internet' check-box (bug #221003).



From fedora-extras-commits at redhat.com  Tue Sep 25 11:46:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 25 Sep 2007 07:46:19 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.20.0-mixer-out-of-sync.patch, 
	1.1, 1.2 gnome-applets.spec, 1.244, 1.245
Message-ID: <200709251146.l8PBkJY9015653@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15630

Modified Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
	gnome-applets.spec 
Log Message:
* Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
- Fix possible crasher in the mixer messages when we receive an
  unhandled message (#302881)


gnome-applets-2.20.0-mixer-out-of-sync.patch:

Index: gnome-applets-2.20.0-mixer-out-of-sync.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-2.20.0-mixer-out-of-sync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.20.0-mixer-out-of-sync.patch	20 Sep 2007 00:02:46 -0000	1.1
+++ gnome-applets-2.20.0-mixer-out-of-sync.patch	25 Sep 2007 11:46:16 -0000	1.2
@@ -212,7 +212,7 @@
      tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
    } else {
      /* Translator comment: I'm not all too sure if this makes sense
-@@ -1152,10 +1207,53 @@
+@@ -1152,10 +1207,56 @@
  				"state", mute ? "1" : "0", NULL);
  }
  
@@ -244,7 +244,7 @@
 +    gst_mixer_message_parse_mute_toggled (message, &track, &muted);
 +    mute = muted ? 1 : 0;
 +  }
-+  else {
++  else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
 +    gint n, num_channels, *vols;
 +    volume = 0.0;
 +
@@ -253,6 +253,9 @@
 +      volume += vols[n];
 +    volume /= track->num_channels;
 +    volume = 100 * volume / (track->max_volume - track->min_volume);
++  } else
++  {
++    return;
 +  }
 +
 +  if (first_track == track)
@@ -267,7 +270,7 @@
  
    return TRUE;
  }
-@@ -1214,6 +1312,8 @@
+@@ -1214,6 +1315,8 @@
              /* save */
              gst_object_replace ((GstObject **) &applet->mixer, item->data);
              gst_element_set_state (old_element, GST_STATE_NULL);
@@ -276,7 +279,7 @@
              newdevice = TRUE;
            }
            break;
-@@ -1374,7 +1474,7 @@
+@@ -1374,7 +1477,7 @@
    GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
  
    init_pixbufs (applet);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
+++ gnome-applets.spec	25 Sep 2007 11:46:16 -0000	1.245
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -357,6 +357,10 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
+- Fix possible crasher in the mixer messages when we receive an
+  unhandled message (#302881)
+
 * Sat Sep 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.2.20.0-4
 - Build modemlights applet again (#301601)
 



From fedora-extras-commits at redhat.com  Tue Sep 25 11:47:46 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 25 Sep 2007 07:47:46 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.19,1.20
Message-ID: <200709251147.l8PBlk01015729@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_kerb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15709

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 5.3-6
- fix configure invocation (#301181)



Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_auth_kerb.spec	2 Sep 2007 14:06:19 -0000	1.19
+++ mod_auth_kerb.spec	25 Sep 2007 11:47:12 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.3
-Release: 5
+Release: 6
 License: BSD and MIT
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -30,7 +30,8 @@
 %patch8 -p1 -b .fixes
 
 %build
-%configure --without-krb4 --with-krb5=/usr/kerberos --with-apxs=/usr
+%configure --without-krb4 --with-krb5=/usr/kerberos \
+        --with-apache=%{_prefix}
 make %{?_smp_mflags} 
 
 %install
@@ -52,6 +53,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 5.3-6
+- fix configure invocation (#301181)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
 - rebuild for fixed 32-bit APR
 



From fedora-extras-commits at redhat.com  Tue Sep 25 11:53:00 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 25 Sep 2007 07:53:00 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.86,1.87
Message-ID: <200709251153.l8PBr03B015899@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15881

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.2.v200709241202cvs
- Fix moving of arch-specific plugins that haven't been updated to new
  version.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- eclipse-cdt.spec	25 Sep 2007 03:25:50 -0000	1.86
+++ eclipse-cdt.spec	25 Sep 2007 11:52:28 -0000	1.87
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.1.v200709241202cvs%{?dist}
+Release:        0.2.v200709241202cvs%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -287,7 +287,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse
 pushd ${RPM_BUILD_ROOT}
 mkdir -p .%{_libdir}/eclipse/plugins
-for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do
+for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{majmin}\*); do
   mv $archplugin .%{_libdir}/eclipse/plugins
   chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin)
 done
@@ -355,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.2.v200709241202cvs
+- Fix moving of arch-specific plugins that haven't been updated to new
+  version.
+
 * Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
 - 4.0.1 RC.
 - Update autotools for Binaries fix.



From fedora-extras-commits at redhat.com  Tue Sep 25 12:07:53 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Tue, 25 Sep 2007 08:07:53 -0400
Subject: rpms/telnet/devel netkit-telnet-0.17-nodns.patch, 1.1,
	1.2 telnet.spec, 1.31, 1.32
Message-ID: <200709251207.l8PC7rE6022426@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22403

Modified Files:
	netkit-telnet-0.17-nodns.patch telnet.spec 
Log Message:
- rebased "nodns" patch with patch from Bryn M. Reeves


netkit-telnet-0.17-nodns.patch:

Index: netkit-telnet-0.17-nodns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/netkit-telnet-0.17-nodns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netkit-telnet-0.17-nodns.patch	13 Apr 2007 12:29:34 -0000	1.1
+++ netkit-telnet-0.17-nodns.patch	25 Sep 2007 12:07:51 -0000	1.2
@@ -1,63 +1,43 @@
---- netkit-telnet-0.17/telnetd/telnetd.8.nodns	2000-07-31 01:57:10.000000000 +0200
-+++ netkit-telnet-0.17/telnetd/telnetd.8	2007-04-13 10:58:27.000000000 +0200
-@@ -123,6 +123,8 @@
- .Xr login 1
- program.
- .El
-+.It Fl c
-+This option disables reverse dns checking. Of course that security is lower with this option
- .It Fl D Ar debugmode
- This option may be used for debugging purposes.  This allows
- .Nm telnetd
---- netkit-telnet-0.17/telnetd/telnetd.c.nodns	2007-04-13 10:49:57.000000000 +0200
-+++ netkit-telnet-0.17/telnetd/telnetd.c	2007-04-13 10:49:57.000000000 +0200
-@@ -83,6 +83,7 @@
- 
- int debug = 0;
- int keepalive = 1;
-+int nodns = 0;
- char *loginprg = _PATH_LOGIN;
- char *progname;
- 
-@@ -111,7 +112,7 @@
- 
- 	progname = *argv;
- 
--	while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
-+	while ((ch = getopt(argc, argv, "cd:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
- 		switch(ch) {
- 
- #ifdef	AUTHENTICATE
-@@ -147,7 +148,9 @@
- 			bftpd++;
- 			break;
- #endif /* BFTPDAEMON */
--
-+		case 'c':
-+			nodns++;
-+			break;
- 		case 'd':
- 			if (strcmp(optarg, "ebug") == 0) {
- 				debug++;
-@@ -652,6 +655,9 @@
- 	char namebuf[255];
+--- netkit-telnet-0.17.orig/telnetd/telnetd.c	2007-03-13 16:31:20.000000000 +0000
++++ netkit-telnet-0.17.orig/telnetd/telnetd.c	2007-03-13 16:31:26.000000000 +0000
+@@ -653,6 +653,11 @@ doit(struct sockaddr *who, socklen_t who
  
  	error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
-+
-+	if ((error == EAI_AGAIN) && nodns)
-+		error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
  	
++	/* if we can't get a hostname now, settle for an address */	
++	if(error == EAI_AGAIN)
++		error = getnameinfo(who, wholen, namebuf, sizeof(namebuf),
++				NULL, 0, NI_NUMERICHOST);
++		
  	if (error) {
  		perror("getnameinfo: localhost");
-@@ -688,7 +694,10 @@
- 		hints.ai_socktype = SOCK_STREAM;
- 		hints.ai_flags = AI_ADDRCONFIG;
+ 		perror(gai_strerror(error));
+@@ -681,7 +686,7 @@ doit(struct sockaddr *who, socklen_t who
+ 	/* Get local host name */
+ 	{
+ 		struct addrinfo hints;
+-		struct addrinfo *res;
++		struct addrinfo *res = 0;
+ 		int e;
+ 
+ 		memset(&hints, '\0', sizeof(hints));
+@@ -690,11 +695,14 @@ doit(struct sockaddr *who, socklen_t who
  
--		gethostname(host_name, sizeof(host_name));
-+		if(nodns)
-+			sprintf(host_name, "localhost", sizeof(host_name));
-+		else
-+			gethostname(host_name, sizeof(host_name));
+ 		gethostname(host_name, sizeof(host_name));
  		if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
- 			perror("getaddrinfo: localhost");
- 			perror(gai_strerror(e));
+-			perror("getaddrinfo: localhost");
+-			perror(gai_strerror(e));
+-			exit(1);
++			if(e != EAI_AGAIN) {
++				fprintf(stderr, "getaddrinfo: localhost %s\n", 
++				        gai_strerror(e));
++				exit(1);
++			}
+ 		}
+-		freeaddrinfo(res);
++		if(res)
++			freeaddrinfo(res);
+ 	}
+ 
+ #if	defined(AUTHENTICATE) || defined(ENCRYPT)
+


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- telnet.spec	20 Sep 2007 09:19:07 -0000	1.31
+++ telnet.spec	25 Sep 2007 12:07:51 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 40%{?dist}
+Release: 41%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Tue Sep 25 2007 Adam Tkac <atkac redhat com> 1:0.17-41
+- rebased "nodns" patch with patch from Bryn M. Reeves
+
 * Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
 - improved patch to #274991
 



From fedora-extras-commits at redhat.com  Tue Sep 25 12:26:22 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 25 Sep 2007 08:26:22 -0400
Subject: rpms/squid/devel squid-2.6.STABLE16-fd.patch, NONE, 1.1 squid.spec, 
	1.88, 1.89
Message-ID: <200709251226.l8PCQMmm022749@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	squid.spec 
Added Files:
	squid-2.6.STABLE16-fd.patch 
Log Message:
* Tue Sep 25 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-2
- our fd_config patch was replaced by upstream's version 
- Source1 (FAQ.sgml) points to local source (upstream's moved to wiki)


squid-2.6.STABLE16-fd.patch:

--- NEW FILE squid-2.6.STABLE16-fd.patch ---
diff -up squid-2.6.STABLE16/src/tools.c.fd squid-2.6.STABLE16/src/tools.c
--- squid-2.6.STABLE16/src/tools.c.fd	2007-09-01 22:09:50.000000000 +0200
+++ squid-2.6.STABLE16/src/tools.c	2007-09-21 15:01:32.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.c,v 1.250.2.3 2007/09/01 20:09:50 hno Exp $
+ * $Id: tools.c,v 1.255 2007/06/29 00:08:18 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -735,46 +735,62 @@ readPidFile(void)
 }
 
 
+/* A little piece of glue for odd systems */
+#ifndef RLIMIT_NOFILE
+#ifdef RLIMIT_OFILE
+#define RLIMIT_NOFILE RLIMIT_OFILE
+#endif
+#endif
+
+/* Figure out the number of supported filedescriptors */
 void
 setMaxFD(void)
 {
-#if HAVE_SETRLIMIT
-    /* try to use as many file descriptors as possible */
-    /* System V uses RLIMIT_NOFILE and BSD uses RLIMIT_OFILE */
+#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)
     struct rlimit rl;
-#if !defined(_SQUID_CYGWIN_)
-#if defined(RLIMIT_NOFILE)
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
-	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
-    } else {
-	rl.rlim_cur = Squid_MaxFD;
-	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
-	if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
-	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
-		"setrlimit: RLIMIT_NOFILE: %s", xstrerror());
-	    fatal_dump(tmp_error_buf);
-	}
+	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    } else if (Config.max_filedescriptors > 0) {
+	    rl.rlim_cur = Config.max_filedescriptors;
+	    if (rl.rlim_cur > rl.rlim_max)
+	        rl.rlim_max = rl.rlim_cur;
+	    if (setrlimit(RLIMIT_NOFILE, &rl)) {
+  	        debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+	        getrlimit(RLIMIT_NOFILE, &rl);
+	        rl.rlim_cur = rl.rlim_max;
+	        if (setrlimit(RLIMIT_NOFILE, &rl)) {
+		        debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+	        }
+	    }
     }
-#elif defined(RLIMIT_OFILE)
-    if (getrlimit(RLIMIT_OFILE, &rl) < 0) {
-	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
     } else {
-	rl.rlim_cur = Squid_MaxFD;
-	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
-	if (setrlimit(RLIMIT_OFILE, &rl) < 0) {
-	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
-		"setrlimit: RLIMIT_OFILE: %s", xstrerror());
-	    fatal_dump(tmp_error_buf);
-	}
+	    Squid_MaxFD = rl.rlim_cur;
     }
-#endif
-#endif
-#else /* HAVE_SETRLIMIT */
-    debug(21, 1) ("setMaxFD: Cannot increase: setrlimit() not supported on this system\n");
 #endif /* HAVE_SETRLIMIT */
+}
 
+void
+setSystemLimits(void)
+{
+#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE) && !defined(_SQUID_CYGWIN_)
+    /* limit system filedescriptors to our own limit */
+    struct rlimit rl;
+    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    } else {
+  	    rl.rlim_cur = Squid_MaxFD;
+	    if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	        snprintf(tmp_error_buf, ERROR_BUF_SZ,
+		        "setrlimit: RLIMIT_NOFILE: %s", xstrerror());
+  	        fatal_dump(tmp_error_buf);
+  	    }
+    }
+  #endif /* HAVE_SETRLIMIT */
+    if (Config.max_filedescriptors > Squid_MaxFD) {
+	    debug(50, 1) ("NOTICE: Could not increase the number of filedescriptors\n");
+    }
 #if HAVE_SETRLIMIT && defined(RLIMIT_DATA)
     if (getrlimit(RLIMIT_DATA, &rl) < 0) {
 	debug(50, 0) ("getrlimit: RLIMIT_DATA: %s\n", xstrerror());
diff -up squid-2.6.STABLE16/src/cf.data.pre.fd squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.fd	2007-09-21 12:52:28.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-21 15:07:15.000000000 +0200
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.382.2.14 2007/09/05 21:50:15 hno Exp $
+# $Id: cf.data.pre,v 1.424 2007/09/19 11:50:39 hno Exp $
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -5216,4 +5216,16 @@ DOC_START
 	rounded to 1000.
 DOC_END
 
+NAME: max_filedescriptors max_filedesc
+TYPE: int
+DEFAULT: 0
+LOC: Config.max_filedescriptors
+DOC_START
+	The maximum number of filedescriptors supported.
+
+	The default "0" means Squid inherits the current ulimit setting.
+
+	Note: Changing this requires a restart of Squid. Also
+	not all comm loops supports values larger than --with-maxfd.
+DOC_END
 EOF
diff -up squid-2.6.STABLE16/src/protos.h.fd squid-2.6.STABLE16/src/protos.h
--- squid-2.6.STABLE16/src/protos.h.fd	2007-07-15 11:52:17.000000000 +0200
+++ squid-2.6.STABLE16/src/protos.h	2007-09-21 15:03:14.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.520.2.3 2007/07/15 09:52:17 hno Exp $
+ * $Id: protos.h,v 1.531 2007/06/29 00:08:18 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1102,6 +1102,7 @@ extern void no_suid(void);
 extern void writePidFile(void);
 extern void setSocketShutdownLifetimes(int);
 extern void setMaxFD(void);
+extern void setSystemLimits(void);
 extern time_t getCurrentTime(void);
 extern int percent(int, int);
 extern double dpercent(double, double);
diff -up squid-2.6.STABLE16/src/main.c.fd squid-2.6.STABLE16/src/main.c
--- squid-2.6.STABLE16/src/main.c.fd	2007-08-31 15:52:10.000000000 +0200
+++ squid-2.6.STABLE16/src/main.c	2007-09-21 15:04:01.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.393.2.4 2007/08/31 13:52:10 hno Exp $
+ * $Id: main.c,v 1.397 2007/06/29 00:08:18 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -552,6 +552,7 @@ mainInitialize(void)
 	debug(1, 0) ("Running on %s\n", WIN32_OS_string);
 #endif
     debug(1, 1) ("Process ID %d\n", (int) getpid());
+    setSystemLimits();
     debug(1, 1) ("With %d file descriptors available\n", Squid_MaxFD);
 #ifdef _SQUID_MSWIN_
     debug(1, 1) ("With %d CRT stdio descriptors available\n", _getmaxstdio());
diff -up squid-2.6.STABLE16/src/structs.h.fd squid-2.6.STABLE16/src/structs.h
--- squid-2.6.STABLE16/src/structs.h.fd	2007-09-05 23:28:34.000000000 +0200
+++ squid-2.6.STABLE16/src/structs.h	2007-09-21 15:04:49.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.507.2.8 2007/09/05 21:28:34 hno Exp $
+ * $Id: structs.h,v 1.517 2007/06/28 23:22:01 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -810,6 +810,7 @@ struct _SquidConfig {
 #endif
     time_t refresh_stale_window;
     int umask;
+    int max_filedescriptors;
 };
 
 struct _SquidConfig2 {


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- squid.spec	14 Sep 2007 06:18:59 -0000	1.88
+++ squid.spec	25 Sep 2007 12:25:50 -0000	1.89
@@ -5,13 +5,13 @@
 Summary:  The Squid proxy caching server
 Name:     squid
 Version:  2.6.STABLE16
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
 Source:   http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2
-Source1:  http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
+Source1:  FAQ.sgml
 Source2:  squid.init
 Source3:  squid.logrotate
 Source4:  squid.sysconfig
@@ -31,7 +31,8 @@
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE12-smb-path.patch
-Patch206: squid-2.6.STABLE5-fd-config.patch
+#Patch206: squid-2.6.STABLE5-fd-config.patch
+Patch206: squid-2.6.STABLE16-fd.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -326,6 +327,10 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 25 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-2
+- our fd_config patch was replaced by upstream's version 
+- Source1 (FAQ.sgml) points to local source (upstream's moved to wiki)
+
 * Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
 - upgrade to latest upstream 2.6.STABLE16
 



From fedora-extras-commits at redhat.com  Tue Sep 25 12:40:07 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:40:07 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.233,1.234
Message-ID: <200709251240.l8PCe7QO023204@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23157

Modified Files:
	kdelibs.spec 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- kdelibs.spec	1 Sep 2007 17:40:35 -0000	1.233
+++ kdelibs.spec	25 Sep 2007 12:39:34 -0000	1.234
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -60,6 +60,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
+Patch45: kdelibs-3.5.7-autostart.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -78,7 +79,7 @@
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
 # vcard30 patch, http://bugs.kde.org/115219
-Patch115219: kdelibs-3.5.7-kde#115219.patch
+Patch503: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,6 +230,7 @@
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
+%patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -238,7 +240,7 @@
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
-%patch115219 -p1 -b .kde#115219
+%patch503 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -521,6 +523,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-23
+- fix rh#243611, autostart from XDG_CONFIG_DIRS
+
 * Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
 - Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
   (allows using the old /opt/kde4 versions for now)



From fedora-extras-commits at redhat.com  Tue Sep 25 12:46:39 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:46:39 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.7-autostart.patch,NONE,1.1
Message-ID: <200709251246.l8PCkda0023518@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23509

Added Files:
	kdelibs-3.5.7-autostart.patch 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
+++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+	  xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
+	  KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
 }
 
 AutoStart::~AutoStart()



From fedora-extras-commits at redhat.com  Tue Sep 25 12:55:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:55:27 -0400
Subject: rpms/kdelibs/F-7 kdelibs-3.5.7-autostart.patch, NONE,
	1.1 kdelibs.spec, 1.220, 1.221
Message-ID: <200709251255.l8PCtRpw023807@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.7-autostart.patch 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
+++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+	  xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
+	  KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
 }
 
 AutoStart::~AutoStart()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kdelibs.spec	1 Sep 2007 17:40:32 -0000	1.220
+++ kdelibs.spec	25 Sep 2007 12:54:55 -0000	1.221
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 22%{?dist}
+Release: 22.1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -60,6 +60,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
+Patch45: kdelibs-3.5.7-autostart.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -78,7 +79,7 @@
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
 # vcard30 patch, http://bugs.kde.org/115219
-Patch115219: kdelibs-3.5.7-kde#115219.patch
+Patch503: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,6 +230,7 @@
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
+%patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -238,7 +240,7 @@
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
-%patch115219 -p1 -b .kde#115219
+%patch503 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -521,6 +523,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-22.1
+- fix rh#243611, autostart from XDG_CONFIG_DIRS
+
 * Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
 - Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
   (allows using the old /opt/kde4 versions for now)



From fedora-extras-commits at redhat.com  Tue Sep 25 13:06:02 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 09:06:02 -0400
Subject: rpms/dovecot/devel dovecot-1.0.rc15-default-settings.patch, 1.2,
	1.3 dovecot-1.0.rc27-quota-warning.patch, NONE,
	1.1 dovecot-1.0.rc32-split.patch, 1.3, 1.4 .cvsignore, 1.31,
	1.32 dovecot.spec, 1.90, 1.91 sources, 1.34, 1.35
Message-ID: <200709251306.l8PD62u1030243@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-1.0.rc15-default-settings.patch 
	dovecot-1.0.rc27-quota-warning.patch 
	dovecot-1.0.rc32-split.patch 
Log Message:
* Tue Sep 25 2007 Tomas Janousek <tjanouse at redhat.com> - 1:1.0.5-1
- downgraded to lastest upstream stable (1.0.5)


dovecot-1.0.rc15-default-settings.patch:

Index: dovecot-1.0.rc15-default-settings.patch
===================================================================
RCS file: dovecot-1.0.rc15-default-settings.patch
diff -N dovecot-1.0.rc15-default-settings.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dovecot-1.0.rc15-default-settings.patch	25 Sep 2007 13:05:58 -0000	1.3
@@ -0,0 +1,107 @@
+--- dovecot-1.0.rc15/src/master/master-settings.c.default-settings	2006-11-12 18:56:07.000000000 +0100
++++ dovecot-1.0.rc15/src/master/master-settings.c	2006-11-21 09:47:40.000000000 +0100
+@@ -269,8 +269,8 @@
+ 	MEMBER(syslog_facility) "mail",
+ 
+ 	/* general */
+-	MEMBER(protocols) "imap imaps",
+-	MEMBER(listen) "*",
++	MEMBER(protocols) "imap imaps pop3 pop3s",
++	MEMBER(listen) "[::]",
+ 	MEMBER(ssl_listen) "",
+ 
+ 	MEMBER(ssl_disable) FALSE,
+@@ -281,7 +281,7 @@
+ 	MEMBER(ssl_parameters_regenerate) 168,
+ 	MEMBER(ssl_cipher_list) "",
+ 	MEMBER(ssl_verify_client_cert) FALSE,
+-	MEMBER(disable_plaintext_auth) TRUE,
++	MEMBER(disable_plaintext_auth) FALSE,
+ 	MEMBER(verbose_ssl) FALSE,
+ 	MEMBER(shutdown_clients) TRUE,
+ 	MEMBER(nfs_check) TRUE,
+@@ -337,7 +337,7 @@
+ 	MEMBER(maildir_stat_dirs) FALSE,
+ 	MEMBER(maildir_copy_with_hardlinks) FALSE,
+ 	MEMBER(mbox_read_locks) "fcntl",
+-	MEMBER(mbox_write_locks) "dotlock fcntl",
++	MEMBER(mbox_write_locks) "fcntl",
+ 	MEMBER(mbox_lock_timeout) 300,
+ 	MEMBER(mbox_dotlock_change_timeout) 120,
+ 	MEMBER(mbox_min_index_size) 0,
+@@ -366,7 +366,7 @@
+ 	MEMBER(pop3_enable_last) FALSE,
+ 	MEMBER(pop3_reuse_xuidl) FALSE,
+ 	MEMBER(pop3_lock_session) FALSE,
+-	MEMBER(pop3_uidl_format) "",
++	MEMBER(pop3_uidl_format) "%08Xu%08Xv",
+ 	MEMBER(pop3_client_workarounds) "",
+ 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
+ 
+--- dovecot-1.0.rc15/dovecot-example.conf.default-settings	2006-11-05 18:14:37.000000000 +0100
++++ dovecot-1.0.rc15/dovecot-example.conf	2006-11-21 09:49:06.000000000 +0100
+@@ -7,17 +7,14 @@
+ # value inside quotes, eg.: key = "# char and trailing whitespace  "
+ 
+ # Default values are shown for each setting, it's not required to uncomment
+-# any of the lines. Exception to this are paths, they're just examples with
+-# the real defaults being based on configure options. The paths listed here
+-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+-# --with-ssldir=/etc/ssl
++# any of the lines.
+ 
+ # Base directory where to store runtime data.
+ #base_dir = /var/run/dovecot/
+ 
+ # Protocols we want to be serving: imap imaps pop3 pop3s
+ # If you only want to use dovecot-auth, you can set this to "none".
+-#protocols = imap imaps
++#protocols = imap imaps pop3 pop3s
+ 
+ # IP or host address where to listen in for connections. It's not currently
+ # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
+@@ -36,13 +33,13 @@
+ #     listen = *:10100
+ #     ..
+ #   }
+-#listen = *
++#listen = [::]
+ 
+ # Disable LOGIN command and all other plaintext authentications unless
+ # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+ # matches the local IP (ie. you're connecting from the same computer), the
+ # connection is considered secure and plaintext authentication is allowed.
+-#disable_plaintext_auth = yes
++#disable_plaintext_auth = no
+ 
+ # Should all IMAP and POP3 processes be killed when Dovecot master process
+ # shuts down. Setting this to "no" means that Dovecot can be upgraded without
+@@ -87,8 +84,8 @@
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root. Included doc/mkcert.sh can be used to easily generate self-signed
+ # certificate, just make sure to update the domains in dovecot-openssl.cnf
+-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+-#ssl_key_file = /etc/ssl/private/dovecot.pem
++#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
++#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
+ 
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter.
+@@ -425,7 +422,7 @@
+ # locking methods as well. Some operating systems don't allow using some of
+ # them simultaneously.
+ #mbox_read_locks = fcntl
+-#mbox_write_locks = dotlock fcntl
++#mbox_write_locks = fcntl
+ 
+ # Maximum time in seconds to wait for lock (all of them) before aborting.
+ #mbox_lock_timeout = 300
+@@ -593,7 +590,7 @@
+   # installations. %08Xu%08Xv will be the new default, so use it for new
+   # installations.
+   #
+-  #pop3_uidl_format = 
++  #pop3_uidl_format = %08Xu%08Xv
+ 
+   # POP3 logout format string:
+   #  %t - number of TOP commands

dovecot-1.0.rc27-quota-warning.patch:

--- NEW FILE dovecot-1.0.rc27-quota-warning.patch ---
http://dovecot.org/list/dovecot/2007-April/021429.html

diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota-plugin.c dovecot-1.0.rc27/src/plugins/quota/quota-plugin.c
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota-plugin.c	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota-plugin.c	2007-03-31 22:18:55.000000000 +0200
@@ -21,9 +21,24 @@
 
 	env = getenv("QUOTA");
 	if (env != NULL) {
+		struct quota_setup *setup;
+		const char *name;
+		unsigned int i;
 		quota_set = quota_init();
 		/* Currently we support only one quota setup */
-		(void)quota_setup_init(quota_set, env, TRUE);
+		setup = quota_setup_init(quota_set, env, TRUE);
+
+		name = "QUOTA_WARNING";
+		env = getenv(name);
+		i = 1;
+		t_push();
+		while (env != NULL) {
+			(void)quota_warning_init(setup, env);
+
+			name = t_strdup_printf("QUOTA_WARNING%u", ++i);
+			env = getenv(name);
+		}
+		t_pop();
 
 		quota_next_hook_mail_storage_created =
 			hook_mail_storage_created;
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota-private.h dovecot-1.0.rc27/src/plugins/quota/quota-private.h
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota-private.h	2007-03-12 21:34:50.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota-private.h	2007-03-17 00:06:23.000000000 +0100
@@ -22,6 +22,9 @@
 	/* List of quota roots. It's array because there shouldn't be many. */
 	array_t ARRAY_DEFINE(roots, struct quota_root *);
 
+	/* List of quota warnings. There should probably be few. */
+	array_t ARRAY_DEFINE(warnings, struct quota_warning *);
+
 	unsigned int user_root:1;
 };
 
@@ -86,6 +89,21 @@
 	unsigned int idx;
 };
 
+enum quota_warning_limit_kind {
+	QUOTA_WARNING_NO_LIMIT,
+	QUOTA_WARNING_PERCENT_LIMIT,
+	QUOTA_WARNING_ABSOLUTE_LIMIT
+};
+
+struct quota_warning {
+	struct quota_setup *setup;
+	uint64_t storage_limit;
+	unsigned int count_limit;
+	enum quota_warning_limit_kind storage_limit_kind:2;
+	enum quota_warning_limit_kind count_limit_kind:2;
+	char *command;
+};
+
 struct quota_transaction_context {
 	array_t ARRAY_DEFINE(root_transactions,
 			     struct quota_root_transaction_context *);
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota.c dovecot-1.0.rc27/src/plugins/quota/quota.c
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota.c	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota.c	2007-03-31 22:35:22.000000000 +0200
@@ -6,6 +6,8 @@
 #include "quota-private.h"
 #include "quota-fs.h"
 
+#include <stdlib.h>
+
 unsigned int quota_module_id = 0;
 
 extern struct quota_backend quota_backend_dict;
@@ -59,6 +61,7 @@
 	setup->data = i_strdup(data);
 	setup->user_root = user_root;
 	ARRAY_CREATE(&setup->roots, default_pool, struct quota_root *, 4);
+	ARRAY_CREATE(&setup->warnings, default_pool, struct quota_warning *, 4);
 
 	t_push();
 	p = strchr(setup->data, ':');
@@ -107,6 +110,16 @@
 	}
 
 	array_free(&setup->roots);
+
+	while (array_count(&setup->warnings) > 0) {
+		struct quota_warning *const *warning;
+
+		warning = array_idx(&setup->warnings, 0);
+		quota_warning_deinit(*warning);
+	}
+
+	array_free(&setup->warnings);
+
 	i_free(setup->data);
 	i_free(setup);
 }
@@ -157,6 +170,82 @@
 	array_free(&module_contexts);
 }
 
+struct quota_warning *
+quota_warning_init(struct quota_setup *setup, const char *data)
+{
+	const char *p;
+	char *q;
+	const char *const *args;
+	unsigned long long val;
+	struct quota_warning *warning;
+
+	warning = i_new(struct quota_warning, 1);
+	warning->setup = setup;
+
+	p = strchr(data, ' ');
+	if (p == NULL)
+		i_fatal("quota warning: No command specified: %s", data);
+	warning->command = i_strdup(p+1);
+
+	t_push();
+
+	args = t_strsplit(t_strdup_until(data, p), ":");
+	for (; *args != '\0'; args++) {
+		if (strncmp(*args, "storage=", 8) == 0) {
+			val = strtoull(*args + 8, &q, 10);
+			if (q && (strcmp(q, "%") == 0)) {
+				warning->storage_limit = val;
+				warning->storage_limit_kind =
+					QUOTA_WARNING_PERCENT_LIMIT;
+			} else if (q && (strcmp(q, "k") == 0)) {
+				warning->storage_limit = val * 1024;
+				warning->storage_limit_kind =
+					QUOTA_WARNING_ABSOLUTE_LIMIT;
+			} else
+				i_error("quota warning: Malformed setting: %s", *args);
+		} else if (strncmp(*args, "messages=", 9) == 0) {
+			val = strtoull(*args + 8, &q, 10);
+			if (q && (strcmp(q, "%") == 0)) {
+				warning->count_limit = val;
+				warning->count_limit_kind =
+					QUOTA_WARNING_PERCENT_LIMIT;
+			} else if (q && (strcmp(q, "") == 0)) {
+				warning->count_limit = val;
+				warning->count_limit_kind =
+					QUOTA_WARNING_ABSOLUTE_LIMIT;
+			} else
+				i_error("quota warning: Malformed setting: %s", *args);
+		} else {
+			i_error("quota warning: Unknown setting: %s", *args);
+		}
+	}
+
+	t_pop();
+
+	array_append(&setup->warnings, &warning, 1);
+
+	return warning;
+}
+
+void quota_warning_deinit(struct quota_warning *warning)
+{
+	struct quota_warning *const *warnings;
+	unsigned int i, count;
+
+	/* remove from setup */
+	warnings = array_get(&warning->setup->warnings, &count);
+	for (i = 0; i < count; i++) {
+		if (warnings[i] == warning) {
+			array_delete(&warning->setup->warnings, i, 1);
+			break;
+		}
+	}
+	i_assert(i != count);
+
+	i_free(warning->command);
+	i_free(warning);
+}
+
 void quota_add_user_storage(struct quota *quota, struct mail_storage *storage)
 {
 	struct quota_setup *const *setups;
@@ -388,15 +477,62 @@
 	i_free(ctx);
 }
 
+#define CHECK_PERCENT(val, cur, diff, limit) \
+	(100 * ((limit) - (cur) - (diff)) > (val) * (limit))
+#define CHECK_ABSOLUTE(val, cur, diff, limit) \
+	((limit) - (cur) - (diff) > (val))
+
+#define CHECK2_PERCENT(val, cur, diff, size, limit) \
+	(CHECK_PERCENT(val, cur, diff, limit) \
+	 && !CHECK_PERCENT(val, cur, (diff)+(size), limit))
+#define CHECK2_ABSOLUTE(val, cur, diff, size, limit) \
+	(CHECK_ABSOLUTE(val, cur, diff, limit) \
+	 && !CHECK_ABSOLUTE(val, cur, (diff)+(size), limit))
+
+#define CHECK(kind, val, cur, diff, size, limit) \
+	((((kind) == QUOTA_WARNING_PERCENT_LIMIT) \
+	  && (CHECK2_PERCENT(val, cur, diff, size, limit))) \
+	 || (((kind) == QUOTA_WARNING_ABSOLUTE_LIMIT) \
+	     && (CHECK2_ABSOLUTE(val, cur, diff, size, limit))))
+
 int quota_default_try_alloc_bytes(struct quota_root_transaction_context *ctx,
 				  uoff_t size, bool *too_large_r)
 {
+	struct quota_warning *const * warnings;
+	unsigned int i, count;
 	int ret;
 
 	ret = quota_default_test_alloc_bytes(ctx, size, too_large_r);
 	if (ret <= 0 || ctx->disabled)
 		return ret;
 
+	warnings = array_get(&ctx->root->setup->warnings, &count);
+
+	for (i = 0; i < count; i++) {
+		struct quota_warning *warning = warnings[i];
+		bool run_command = FALSE;
+
+		if (CHECK(warning->storage_limit_kind,
+			  warning->storage_limit,
+			  ctx->bytes_current,
+			  ctx->bytes_diff,
+			  size,
+			  ctx->bytes_limit))
+			run_command = TRUE;
+
+		if (CHECK(warning->count_limit_kind,
+			  warning->count_limit,
+			  ctx->count_current,
+			  ctx->count_diff,
+			  1,
+			  ctx->count_limit))
+			run_command = TRUE;
+
+		if (run_command)
+			system(warning->command);
+
+	}
+
 	ctx->count_diff++;
 	ctx->bytes_diff += size;
 	return 1;
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota.h dovecot-1.0.rc27/src/plugins/quota/quota.h
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota.h	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota.h	2007-03-16 23:21:33.000000000 +0100
@@ -31,6 +31,10 @@
 quota_root_init(struct quota_setup *setup, const char *name);
 void quota_root_deinit(struct quota_root *root);
 
+struct quota_warning *
+quota_warning_init(struct quota_setup *setup, const char *data);
+void quota_warning_deinit(struct quota_warning *warning);
+
 /* List all quota roots. Returned quota roots are freed by quota_deinit(). */
 struct quota_root_iter *quota_root_iter_init(struct mailbox *box);
 struct quota_root *quota_root_iter_next(struct quota_root_iter *iter);

dovecot-1.0.rc32-split.patch:

Index: dovecot-1.0.rc32-split.patch
===================================================================
RCS file: dovecot-1.0.rc32-split.patch
diff -N dovecot-1.0.rc32-split.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dovecot-1.0.rc32-split.patch	25 Sep 2007 13:05:58 -0000	1.4
@@ -0,0 +1,311 @@
+--- dovecot-1.0.rc32/src/dict/main.c.split	2007-02-22 15:32:11.000000000 +0100
++++ dovecot-1.0.rc32/src/dict/main.c	2007-04-13 13:56:55.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ static struct io *log_io;
+ static struct module *modules;
++static struct module *sql_modules;
+ static struct dict_server *dict_server;
+ 
+ static void sig_die(int signo, void *context __attr_unused__)
+@@ -50,6 +51,8 @@
+ 	/* Load built-in SQL drivers (if any) */
+ 	sql_drivers_init();
+ 	sql_drivers_register_all();
++	sql_modules = sql_drivers_modules_load();
++	module_dir_init(sql_modules);
+ 
+ 	restrict_access_by_env(FALSE);
+ }
+@@ -100,6 +103,7 @@
+ 	dict_sql_unregister();
+ 	dict_client_unregister();
+ 
++	module_dir_unload(&sql_modules);
+ 	sql_drivers_deinit();
+ 	random_deinit();
+ 	lib_signals_deinit();
+--- dovecot-1.0.rc32/src/lib-sql/Makefile.am.split	2007-02-22 22:09:16.000000000 +0100
++++ dovecot-1.0.rc32/src/lib-sql/Makefile.am	2007-04-13 15:11:18.000000000 +0200
+@@ -1,21 +1,66 @@
+ noinst_LIBRARIES = libsql.a
+ 
++if DYNAMIC_SQL
++if BUILD_MYSQL
++MYSQL_LIB=libdriver_mysql.la
++endif
++if BUILD_PGSQL
++PGSQL_LIB=libdriver_pgsql.la
++endif
++if BUILD_SQLITE
++SQLITE_LIB=libdriver_sqlite.la
++endif
++
++sql_module_LTLIBRARIES = \
++	$(MYSQL_LIB) \
++	$(PGSQL_LIB) \
++	$(SQLITE_LIB)
++
++sql_moduledir = $(moduledir)/sql
++endif
++
+ sql_drivers = @sql_drivers@
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/lib \
++	-DMODULEDIR=\""$(moduledir)"\" \
+ 	$(SQL_CFLAGS)
+ 
+ dist_sources = \
++	sql-api.c
++
++if ! DYNAMIC_SQL
++driver_sources = \
+ 	driver-mysql.c \
+ 	driver-pgsql.c \
+-	driver-sqlite.c \
+-	sql-api.c
++	driver-sqlite.c
++endif
+ 
+ libsql_a_SOURCES = \
+ 	$(dist_sources) \
++	$(driver_sources) \
+ 	sql-drivers-register.c
+ 
++if DYNAMIC_SQL
++libdriver_mysql_la_LDFLAGS = -module -avoid-version
++libdriver_mysql_la_LIBADD = $(MYSQL_LIBS)
++libdriver_mysql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(MYSQL_CFLAGS)
++libdriver_mysql_la_SOURCES = \
++	driver-mysql.c
++
++libdriver_pgsql_la_LDFLAGS = -module -avoid-version
++libdriver_pgsql_la_LIBADD = $(PGSQL_LIBS)
++libdriver_pgsql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(PGSQL_CFLAGS)
++libdriver_pgsql_la_SOURCES = \
++	driver-pgsql.c
++
++libdriver_sqlite_la_LDFLAGS = -module -avoid-version
++libdriver_sqlite_la_LIBADD = $(SQLITE_LIBS)
++libdriver_sqlite_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(SQLITE_CFLAGS)
++libdriver_sqlite_la_SOURCES = \
++	driver-sqlite.c
++endif
++
+ headers = \
+ 	sql-api.h \
+ 	sql-api-private.h
+@@ -32,17 +77,21 @@
+ 	echo '/* this file automatically generated by Makefile */' >$@
+ 	echo '#include "lib.h"' >>$@
+ 	echo '#include "sql-api.h"' >>$@
++if ! DYNAMIC_SQL
+ 	for i in $(sql_drivers) null; do \
+ 	  if [ "$${i}" != "null" ]; then \
+ 	        echo "extern struct sql_db driver_$${i}_db;" >>$@ ; \
+ 	  fi \
+ 	done
++endif
+ 	echo 'void sql_drivers_register_all(void) {' >>$@
++if ! DYNAMIC_SQL
+ 	for i in $(sql_drivers) null; do \
+ 	  if [ "$${i}" != "null" ]; then \
+ 	        echo "sql_driver_register(&driver_$${i}_db);" >>$@ ; \
+ 	  fi \
+ 	done
++endif
+ 	echo '}' >>$@
+ 
+ DISTFILES = $(DIST_COMMON) $(dist_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+--- dovecot-1.0.rc32/src/lib-sql/sql-api.h.split	2006-07-01 19:23:52.000000000 +0200
++++ dovecot-1.0.rc32/src/lib-sql/sql-api.h	2007-04-13 13:56:55.000000000 +0200
+@@ -20,6 +20,8 @@
+ 
+ /* register all built-in SQL drivers */
+ void sql_drivers_register_all(void);
++struct module;
++struct module *sql_drivers_modules_load(void);
+ 
+ void sql_driver_register(const struct sql_db *driver);
+ void sql_driver_unregister(const struct sql_db *driver);
+--- dovecot-1.0.rc32/src/lib-sql/sql-api.c.split	2006-07-01 19:23:52.000000000 +0200
++++ dovecot-1.0.rc32/src/lib-sql/sql-api.c	2007-04-13 13:56:55.000000000 +0200
+@@ -2,6 +2,7 @@
+ 
+ #include "lib.h"
+ #include "array.h"
++#include "module-dir.h"
+ #include "sql-api-private.h"
+ 
+ array_t ARRAY_DEFINE(sql_drivers, const struct sql_db *);
+@@ -16,6 +17,12 @@
+ 	array_free(&sql_drivers);
+ }
+ 
++struct module *sql_drivers_modules_load(void)
++{
++	return module_dir_load(MODULEDIR"/sql",
++			NULL, TRUE, PACKAGE_VERSION);
++}
++
+ void sql_driver_register(const struct sql_db *driver)
+ {
+ 	array_append(&sql_drivers, &driver, 1);
+--- dovecot-1.0.rc32/src/auth/main.c.split	2007-03-15 16:48:13.000000000 +0100
++++ dovecot-1.0.rc32/src/auth/main.c	2007-04-13 13:56:55.000000000 +0200
+@@ -10,6 +10,7 @@
+ #include "sql-api.h"
+ #include "randgen.h"
+ #include "password-scheme.h"
++#include "module-dir.h"
+ #include "mech.h"
+ #include "auth.h"
+ #include "auth-request-handler.h"
+@@ -35,6 +36,8 @@
+ static struct auth *auth;
+ static struct auth_worker_client *worker_client;
+ 
++static struct module *sql_modules;
++
+ static void sig_die(int signo, void *context __attr_unused__)
+ {
+ 	/* warn about being killed because of some signal, except SIGINT (^C)
+@@ -189,6 +192,8 @@
+ 	/* Load built-in SQL drivers (if any) */
+ 	sql_drivers_init();
+ 	sql_drivers_register_all();
++	sql_modules = sql_drivers_modules_load();
++	module_dir_init(sql_modules);
+ 
+ 	/* Initialize databases so their configuration files can be readable
+ 	   only by root. Also load all modules here. */
+@@ -287,6 +292,7 @@
+ 	mech_deinit();
+ 
+         password_schemes_deinit();
++	module_dir_unload(&sql_modules);
+ 	sql_drivers_deinit();
+ 	random_deinit();
+ 
+--- dovecot-1.0.rc32/configure.in.split	2007-04-12 19:16:36.000000000 +0200
++++ dovecot-1.0.rc32/configure.in	2007-04-13 13:56:55.000000000 +0200
+@@ -225,6 +225,15 @@
+ 	fi,
+ 	want_sqlite=no)
+ 
++AC_ARG_WITH(dynamic-sql,
++[  --with-dynamic-sql    Build SQL modules as shared libs],
++	if test x$withval = xno; then
++		want_dynamic_sql=no
++	else
++		want_dynamic_sql=yes
++	fi,
++	want_dynamic_sql=no)
++
+ AC_ARG_WITH(ssl,
+ [  --with-ssl=[gnutls|openssl] Build with GNUTLS or OpenSSL (default)],
+ 	if test x$withval = xno; then
+@@ -1559,12 +1568,12 @@
+ 		fi
+ 		AC_CHECK_HEADER(libpq-fe.h, [
+ 			if test "$PGSQL_INCLUDE" != ""; then
+-				SQL_CFLAGS="$SQL_CFLAGS -I$PGSQL_INCLUDE"
++				PGSQL_CFLAGS="$PGSQL_CFLAGS -I$PGSQL_INCLUDE"
+ 			fi
+ 			if test "$PGSQL_LIBDIR" != ""; then
+-				SQL_LIBS="$SQL_LIBS -L$PGSQL_LIBDIR"
++				PGSQL_LIBS="$PGSQL_LIBS -L$PGSQL_LIBDIR"
+ 			fi
+-			SQL_LIBS="$SQL_LIBS -lpq"
++			PGSQL_LIBS="$PGSQL_LIBS -lpq"
+ 			AC_DEFINE(HAVE_PGSQL,, Build with PostgreSQL support)
+ 			found_sql_drivers="$found_sql_drivers pgsql"
+ 
+@@ -1610,12 +1619,12 @@
+ 		fi
+ 		AC_CHECK_HEADER(mysql.h, [
+ 			if test "$MYSQL_INCLUDE" != ""; then
+-				SQL_CFLAGS="$SQL_CFLAGS -I$MYSQL_INCLUDE"
++				MYSQL_CFLAGS="$MYSQL_CFLAGS -I$MYSQL_INCLUDE"
+ 			fi
+ 			if test "$MYSQL_LIBDIR" != ""; then
+-				SQL_LIBS="$SQL_LIBS -L$MYSQL_LIBDIR"
++				MYSQL_LIBS="$MYSQL_LIBS -L$MYSQL_LIBDIR"
+ 			fi
+-			SQL_LIBS="$SQL_LIBS $mysql_lib"
++			MYSQL_LIBS="$MYSQL_LIBS $mysql_lib"
+ 
+ 			AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
+ 				AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
+@@ -1646,13 +1655,18 @@
+ if test $want_sqlite = yes; then
+ 	AC_CHECK_LIB(sqlite3, sqlite3_open, [
+ 		AC_CHECK_HEADER(sqlite3.h, [
+-			SQL_LIBS="$SQL_LIBS -lsqlite3 -lz"
++			SQLITE_LIBS="$SQLITE_LIBS -lsqlite3 -lz"
+ 
+ 			AC_DEFINE(HAVE_SQLITE,, Build with SQLite3 support)
+ 			found_sql_drivers="$found_sql_drivers sqlite"
+ 		])
+ 	])
+ fi
++	
++SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS $SQLITE_CFLAGS"
++if test "$want_dynamic_sql" = "no"; then
++	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS"
++fi
+ 
+ if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then
+ 	if test "$all_sql_drivers" = "yes"; then
+@@ -1716,6 +1730,12 @@
+ AC_SUBST(AUTH_LIBS)
+ AC_SUBST(SQL_CFLAGS)
+ AC_SUBST(SQL_LIBS)
++AC_SUBST(MYSQL_CFLAGS)
++AC_SUBST(MYSQL_LIBS)
++AC_SUBST(PGSQL_CFLAGS)
++AC_SUBST(PGSQL_LIBS)
++AC_SUBST(SQLITE_CFLAGS)
++AC_SUBST(SQLITE_LIBS)
+ 
+ dnl **
+ dnl ** Index file compatibility flags
+@@ -1783,17 +1803,27 @@
+ dnl ** SQL drivers
+ dnl **
+ 
++build_pgsql=no
++build_mysql=no
++build_sqlite=no
+ for driver in $sql_drivers; do
+   if test "$driver" = "pgsql"; then
+     AC_DEFINE(BUILD_PGSQL,, Built-in PostgreSQL support)
++    build_pgsql=yes
+   elif test "$driver" = "mysql"; then
+     AC_DEFINE(BUILD_MYSQL,, Built-in MySQL support)
++    build_mysql=yes
+   elif test "$driver" = "sqlite"; then
+     AC_DEFINE(BUILD_SQLITE,, Built-in SQLite support)
++    build_sqlite=yes
+   fi
+ done
+ 
+ AC_SUBST(sql_drivers)
++AM_CONDITIONAL(BUILD_PGSQL, test "$build_pgsql" = "yes")
++AM_CONDITIONAL(BUILD_MYSQL, test "$build_mysql" = "yes")
++AM_CONDITIONAL(BUILD_SQLITE, test "$build_sqlite" = "yes")
++AM_CONDITIONAL(DYNAMIC_SQL, test "$want_dynamic_sql" = "yes")
+ 
+ dnl **
+ dnl ** Plugins
+@@ -1873,4 +1903,8 @@
+ echo "Building with GSSAPI support ........ : $have_gssapi"
+ echo "Building with user database modules . :$userdb"
+ echo "Building with password lookup modules :$passdb"
+-echo "Building with SQL drivers ............:$sql_drivers"
++if test "$want_dynamic_sql" = "yes"; then
++	echo "Building with SQL drivers ............:$sql_drivers (dynamic)"
++else
++	echo "Building with SQL drivers ............:$sql_drivers"
++fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Aug 2007 14:58:08 -0000	1.31
+++ .cvsignore	25 Sep 2007 13:05:58 -0000	1.32
@@ -1,3 +1,4 @@
-dovecot-1.1.alpha3.tar.gz
-dovecot-1.1.alpha3.tar.gz.sig
-dovecot-sieve-1.1-0367450c9382.tar.gz
+dovecot-1.0.5.tar.gz
+dovecot-1.0.5.tar.gz.sig
+dovecot-sieve-1.0.2.tar.gz
+dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- dovecot.spec	22 Aug 2007 12:45:08 -0000	1.90
+++ dovecot.spec	25 Sep 2007 13:05:58 -0000	1.91
@@ -1,15 +1,16 @@
 #%define dovecot_hg a744ae38a9e1
-%define sieve_hg 0367450c9382
-%define upstream 1.1.alpha3
-%define sieve_upstream 1.1-%{sieve_hg}
-%define pkg_version 1.1
-%define my_release 16.1
-%define pkg_release %{my_release}.alpha3%{?dist}
-%define pkg_sieve_version 1.1
-%define pkg_sieve_release %{my_release}.hg.%{sieve_hg}%{?dist}
+#%define sieve_hg 0367450c9382
+%define upstream 1.0.5
+%define sieve_upstream 1.0.2
+%define pkg_version 1.0.5
+%define my_release 1
+%define pkg_release %{my_release}%{?dist}
+%define pkg_sieve_version 1.0.2
+%define pkg_sieve_release %{my_release}%{?dist}
 
 Summary: Dovecot Secure imap server
 Name: dovecot
+Epoch: 1
 Version: %{pkg_version}
 Release: %{pkg_release}
 License: MIT and LGPLv2 and BSD with advertising
@@ -33,12 +34,14 @@
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
-Patch100: dovecot-1.1.alpha1-default-settings.patch
+Patch100: dovecot-1.0.rc15-default-settings.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
-Patch107: dovecot-1.1-unicodedata.patch
+Patch106: dovecot-1.0.rc27-quota-warning.patch
+#Patch107: dovecot-1.1-unicodedata.patch
 #Patch200: dovecot-%{dovecot_hg}.patch
+Patch200: dovecot-1.0.rc32-split.patch
 
 # XXX this patch needs review and forward porting
 #Patch105: dovecot-auth-log.patch
@@ -100,7 +103,7 @@
 
 %if %{build_sieve}
 %package sieve
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: CMU Sieve plugin for dovecot LDA
 Group: System Environment/Daemons
 Version: %{pkg_sieve_version}
@@ -118,7 +121,7 @@
 
 %if %{build_postgres}
 %package pgsql
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Postgres SQL backend for dovecot
 Group: System Environment/Daemons
 %description pgsql
@@ -127,7 +130,7 @@
 
 %if %{build_mysql}
 %package mysql
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: MySQL backend for dovecot
 Group: System Environment/Daemons
 %description mysql
@@ -136,30 +139,30 @@
 
 %if %{build_sqlite}
 %package sqlite
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: SQLite backend for dovecot
 Group: System Environment/Daemons
 %description sqlite
 This package provides the SQLite backend for dovecot-auth etc.
 %endif
 
-%if %{build_ldap}
-%package ldap
-Requires: %{name} = %{version}-%{release}
-Summary: LDAP auth plugin for dovecot
-Group: System Environment/Daemons
-%description ldap
-This package provides the LDAP auth plugin for dovecot-auth etc.
-%endif
-
-%if %{build_gssapi}
-%package gssapi
-Requires: %{name} = %{version}-%{release}
-Summary: GSSAPI auth mechanism plugin for dovecot
-Group: System Environment/Daemons
-%description gssapi
-This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc.
-%endif
+#%if %{build_ldap}
+#%package ldap
+#Requires: %{name} = %{epoch}:%{version}-%{release}
+#Summary: LDAP auth plugin for dovecot
+#Group: System Environment/Daemons
+#%description ldap
+#This package provides the LDAP auth plugin for dovecot-auth etc.
+#%endif
+
+#%if %{build_gssapi}
+#%package gssapi
+#Requires: %{name} = %{epoch}:%{version}-%{release}
+#Summary: GSSAPI auth mechanism plugin for dovecot
+#Group: System Environment/Daemons
+#%description gssapi
+#This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc.
+#%endif
 
 
 %prep
@@ -170,7 +173,9 @@
 %patch102 -p1 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
 %patch105 -p1 -b .mkcert-paths
-%patch107 -p1 -b .unicodedata
+#%patch107 -p1 -b .unicodedata
+%patch106 -p1 -b .quota-warning
+%patch200 -p1 -b .split
 #%patch200 -p1 -b .%{dovecot_hg}
 
 %if %{build_sieve}
@@ -193,16 +198,23 @@
 %if %{build_sqlite}
     --with-sqlite                \
 %endif
-    --with-sql=plugin            \
+    --with-dynamic-sql           \
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
+    --with-inotify               \
 %if %{build_ldap}
-    --with-ldap=plugin           \
+    --with-ldap                  \
 %endif
-    --with-inotify               \
 %if %{build_gssapi}
-    --with-gssapi=plugin
+    --with-gssapi                \
 %endif
+#    --with-sql=plugin            \
+#%if %{build_ldap}
+#    --with-ldap=plugin           \
+#%endif
+#%if %{build_gssapi}
+#    --with-gssapi=plugin
+#%endif
 
 make
 
@@ -370,35 +382,38 @@
 %if %{build_mysql}
 %files mysql
 %{_libdir}/%{name}/sql/libdriver_mysql.so
-%{_libdir}/%{name}/auth/libdriver_mysql.so
-%{_libdir}/%{name}/dict/libdriver_mysql.so
+#%{_libdir}/%{name}/auth/libdriver_mysql.so
+#%{_libdir}/%{name}/dict/libdriver_mysql.so
 %endif
 
 %if %{build_postgres}
 %files pgsql
 %{_libdir}/%{name}/sql/libdriver_pgsql.so
-%{_libdir}/%{name}/auth/libdriver_pgsql.so
-%{_libdir}/%{name}/dict/libdriver_pgsql.so
+#%{_libdir}/%{name}/auth/libdriver_pgsql.so
+#%{_libdir}/%{name}/dict/libdriver_pgsql.so
 %endif
 
 %if %{build_sqlite}
 %files sqlite
 %{_libdir}/%{name}/sql/libdriver_sqlite.so
-%{_libdir}/%{name}/auth/libdriver_sqlite.so
-%{_libdir}/%{name}/dict/libdriver_sqlite.so
+#%{_libdir}/%{name}/auth/libdriver_sqlite.so
+#%{_libdir}/%{name}/dict/libdriver_sqlite.so
 %endif
 
-%if %{build_ldap}
-%files ldap
-%{_libdir}/%{name}/auth/libauthdb_ldap.so
-%endif
-
-%if %{build_gssapi}
-%files gssapi
-%{_libdir}/%{name}/auth/libmech_gssapi.so
-%endif
+#%if %{build_ldap}
+#%files ldap
+#%{_libdir}/%{name}/auth/libauthdb_ldap.so
+#%endif
+
+#%if %{build_gssapi}
+#%files gssapi
+#%{_libdir}/%{name}/auth/libmech_gssapi.so
+#%endif
 
 %changelog
+* Tue Sep 25 2007 Tomas Janousek <tjanouse at redhat.com> - 1:1.0.5-1
+- downgraded to lastest upstream stable (1.0.5)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.1.alpha3
 - updated license tags
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	13 Aug 2007 14:58:08 -0000	1.34
+++ sources	25 Sep 2007 13:05:58 -0000	1.35
@@ -1,3 +1,4 @@
-379894a74d6531e15b573250273f081b  dovecot-1.1.alpha3.tar.gz
-32e848aba1fa8c276918ea369b1d73f8  dovecot-1.1.alpha3.tar.gz.sig
-14adc693f950696391b31d25d8e809dc  dovecot-sieve-1.1-0367450c9382.tar.gz
+94b7d29cf44f63f89d538361afa05c40  dovecot-1.0.5.tar.gz
+eacaec9e3502e9e0544e73846c3e9a09  dovecot-1.0.5.tar.gz.sig
+508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
+fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Tue Sep 25 13:15:57 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:15:57 -0400
Subject: devel/vim 7.1.117,NONE,1.1
Message-ID: <200709251315.l8PDFvIo030540@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30533

Added Files:
	7.1.117 
Log Message:
- patchlevel 117


--- NEW FILE 7.1.117 ---
To: vim-dev at vim.org
Subject: patch 7.1.117
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.117
Problem:    Can't check wether Vim was compiled with Gnome. (Tony Mechelynck)
Solution:   Add gui_gnome to the has() list.
Files:	    src/eval.c


*** ../vim-7.1.116/src/eval.c	Mon Sep 17 22:19:43 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 10879,10884 ****
--- 10883,10891 ----
  	"gui_gtk2",
  # endif
  #endif
+ #ifdef FEAT_GUI_GNOME
+ 	"gui_gnome",
+ #endif
  #ifdef FEAT_GUI_MAC
  	"gui_mac",
  #endif
*** ../vim-7.1.116/src/version.c	Mon Sep 17 22:38:49 2007
--- src/version.c	Tue Sep 25 12:48:59 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     117,
  /**/

-- 
ARTHUR:  No, hang on!  Just answer the five questions ...
GALAHAD: Three questions ...
ARTHUR:  Three questions ...  And we shall watch ... and pray.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:16:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:16:03 -0400
Subject: devel/vim 7.1.118,NONE,1.1
Message-ID: <200709251316.l8PDG3xm030563@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30556

Added Files:
	7.1.118 
Log Message:
- patchlevel 118


--- NEW FILE 7.1.118 ---
To: vim-dev at vim.org
Subject: patch 7.1.118
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.118 (after 7.1.107)
Problem:    Compiler warning for Visual C compiler.
Solution:   Add typecast. (Mike Williams)
Files:	    src/ops.c


*** ../vim-7.1.117/src/ops.c	Thu Sep 13 22:40:47 2007
--- src/ops.c	Mon Sep 24 18:30:09 2007
***************
*** 2605,2611 ****
  	/* Auto-indenting may have changed the indent.  If the cursor was past
  	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > pre_indent)
  	{
  	    long new_indent = (long)(skipwhite(firstline) - firstline);
  
--- 2605,2611 ----
  	/* Auto-indenting may have changed the indent.  If the cursor was past
  	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > (colnr_T)pre_indent)
  	{
  	    long new_indent = (long)(skipwhite(firstline) - firstline);
  
*** ../vim-7.1.117/src/version.c	Tue Sep 25 12:50:00 2007
--- src/version.c	Tue Sep 25 14:18:37 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     118,
  /**/

-- 
BRIDGEKEEPER: What is your favorite editor?
GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:16:09 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:16:09 -0400
Subject: devel/vim 7.1.119,NONE,1.1
Message-ID: <200709251316.l8PDG9Xv030586@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30579

Added Files:
	7.1.119 
Log Message:
- patchlevel 119


--- NEW FILE 7.1.119 ---
To: vim-dev at vim.org
Subject: patch 7.1.119
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.119
Problem:    Crash when 'cmdheight' set to very large value. (A.Politz)
Solution:   Limit 'cmdheight' to 'lines' minus one.  Store right value of
	    'cmdheight' when running out of room.
Files:	    src/option.c, src/window.c


*** ../vim-7.1.118/src/option.c	Thu Sep  6 16:33:47 2007
--- src/option.c	Tue Sep 25 12:17:35 2007
***************
*** 7824,7829 ****
--- 7824,7831 ----
  	    errmsg = e_positive;
  	    p_ch = 1;
  	}
+ 	if (p_ch > Rows - min_rows() + 1)
+ 	    p_ch = Rows - min_rows() + 1;
  
  	/* Only compute the new window layout when startup has been
  	 * completed. Otherwise the frame sizes may be wrong. */
*** ../vim-7.1.118/src/window.c	Thu Sep 13 18:25:08 2007
--- src/window.c	Tue Sep 25 12:13:56 2007
***************
*** 5523,5528 ****
--- 5523,5529 ----
  		{
  		    EMSG(_(e_noroom));
  		    p_ch = old_p_ch;
+ 		    curtab->tp_ch_used = p_ch;
  		    cmdline_row = Rows - p_ch;
  		    break;
  		}
*** ../vim-7.1.118/src/version.c	Tue Sep 25 14:19:35 2007
--- src/version.c	Tue Sep 25 14:48:14 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     119,
  /**/

-- 
Q: Why does /dev/null accept only integers?
A: You can't sink a float.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:17:01 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:17:01 -0400
Subject: devel/vim README.patches,1.84,1.85 vim.spec,1.176,1.177
Message-ID: <200709251317.l8PDH1s5030637@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30612

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 119


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- README.patches	24 Sep 2007 14:45:47 -0000	1.84
+++ README.patches	25 Sep 2007 13:16:28 -0000	1.85
@@ -145,3 +145,6 @@
   1386  7.1.114  memory leak in getmatches()
   1472  7.1.115  (after 7.1.105) compiler warning for uninitialized variable
   3137  7.1.116  can't display characters above 0x10000
+  1414  7.1.117  can't check wether Vim was compiled with Gnome
+  1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
+  1761  7.1.119  crash after setting 'cmdheight' to huge value


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- vim.spec	24 Sep 2007 14:45:47 -0000	1.176
+++ vim.spec	25 Sep 2007 13:16:28 -0000	1.177
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 116
+%define patchlevel 119
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -176,6 +176,9 @@
 Patch114: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.114
 Patch115: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.115
 Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
+Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
+Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
+Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -436,6 +439,9 @@
 %patch114 -p0 
 %patch115 -p0 
 %patch116 -p0 
+%patch117 -p0 
+%patch118 -p0 
+%patch119 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -821,7 +827,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.%{nil}116-1
+* Tue Sep 25 2007 Karsten Hopp <karsten at redhat.com> 7.1.119-1
+- patchlevel 119
+
+* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.116-1
 - patchlevel 116
 
 * Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1



From fedora-extras-commits at redhat.com  Tue Sep 25 13:28:04 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 09:28:04 -0400
Subject: rpms/frysk/devel frysk.spec,1.117,1.118
Message-ID: <200709251328.l8PDS4K3031310@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30929

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Update files list.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- frysk.spec	24 Sep 2007 23:07:15 -0000	1.117
+++ frysk.spec	25 Sep 2007 13:27:32 -0000	1.118
@@ -191,6 +191,10 @@
 %files
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
+%{_bindir}/fdebuginfo
+%{_bindir}/fdebugrpm
+%{_bindir}/fexe
+%{_bindir}/fltrace
 %{_bindir}/ftrace
 %{_bindir}/fstack
 %{_bindir}/fcore
@@ -202,7 +206,7 @@
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-imports.so
+%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
 %dir %{_datadir}/%{name}
@@ -215,12 +219,17 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/funit*
 %{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/hpd-c
+%{_libdir}/%{name}/test1
 %{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/sys-tests
 %{_libdir}/%{name}/test_main_looper
+%{_datadir}/%{name}/ChangeLog
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test-core
 %{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/test-core-*
+%{_datadir}/%{name}/test-exe-*
 # Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
@@ -246,6 +255,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Update files list.
 - Fix path to dogtail_scripts.
 - Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.



From fedora-extras-commits at redhat.com  Tue Sep 25 13:29:32 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 25 Sep 2007 09:29:32 -0400
Subject: rpms/grig/devel grig.spec,1.2,1.3
Message-ID: <200709251329.l8PDTWBm031443@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/grig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31369

Modified Files:
	grig.spec 
Log Message:
Rebuild for new hamlib libraries


Index: grig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grig/devel/grig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grig.spec	20 Aug 2007 13:01:05 -0000	1.2
+++ grig.spec	25 Sep 2007 13:29:00 -0000	1.3
@@ -1,7 +1,7 @@
 
 Name:           grig
 Version:        0.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Ham Radio Control graphical user interface
 
 Group:          Applications/Communications
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Denis Leroy <denis at poolshark.org> - 0.7.2-3
+- Rebuild for new hamlib libraries
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 0.7.2-2
 - Updated License tag
 - Added patch for new GtkTooltip interface



From fedora-extras-commits at redhat.com  Tue Sep 25 13:30:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 09:30:41 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.72,
	1.73 selinux-policy.spec, 1.533, 1.534
Message-ID: <200709251330.l8PDUfO5031547@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31510

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-12
- Allow nsswitch apps to read samba_var_t


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- policy-20070703.patch	24 Sep 2007 20:26:11 -0000	1.72
+++ policy-20070703.patch	25 Sep 2007 13:30:08 -0000	1.73
@@ -2658,11 +2658,13 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-18 20:56:27.000000000 -0400
-@@ -210,6 +210,7 @@
++++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-25 09:00:58.000000000 -0400
+@@ -209,7 +209,8 @@
+ /usr/lost\+found		-d	gen_context(system_u:object_r:lost_found_t,mls_systemhigh)
  /usr/lost\+found/.*		<<none>>
  
- /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+-/usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
++#/usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 +/usr/share/doc(/.*)?/README.*	gen_context(system_u:object_r:usr_t,s0)
  
  /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
@@ -8514,8 +8516,34 @@
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.8/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/samba.if	2007-09-17 16:20:18.000000000 -0400
-@@ -349,6 +349,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/samba.if	2007-09-24 17:17:53.000000000 -0400
+@@ -332,6 +332,25 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit the specified domain to
++##	write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_dontaudit_write_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	dontaudit $1 samba_var_t:file write;
++')
++
++########################################
++## <summary>
+ ##	Allow the specified domain to
+ ##	read and write samba /var files.
+ ## </summary>
+@@ -349,6 +368,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
  	manage_files_pattern($1,samba_var_t,samba_var_t)
@@ -8523,7 +8551,7 @@
  ')
  
  ########################################
-@@ -493,3 +494,102 @@
+@@ -493,3 +513,102 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -10428,7 +10456,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 10:44:04.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 17:17:30.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10620,7 +10648,16 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1453,163 @@
+@@ -1347,6 +1419,8 @@
+ 
+ 	optional_policy(`
+ 		samba_stream_connect_winbind($1)
++		samba_read_var_files($1)
++		samba_dontaudit_write_var_files($1)
+ 	')
+ ')
+ 
+@@ -1381,3 +1455,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -13644,8 +13681,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
-@@ -5,28 +5,36 @@
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-24 17:02:03.000000000 -0400
+@@ -5,28 +5,38 @@
  #
  # Declarations
  #
@@ -13683,13 +13720,15 @@
  # Local policy
  #
  
++dontaudit unconfined_t self:dir write;
++
 +allow unconfined_t self:system syslog_read;
 +dontaudit unconfined_t self:capability sys_module;
 +
  domtrans_pattern(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
  
  files_create_boot_flag(unconfined_t)
-@@ -35,6 +43,7 @@
+@@ -35,6 +45,7 @@
  mcs_ptrace_all(unconfined_t)
  
  init_run_daemon(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13697,7 +13736,7 @@
  
  libs_run_ldconfig(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  
-@@ -42,37 +51,30 @@
+@@ -42,37 +53,30 @@
  logging_run_auditctl(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  
  mount_run_unconfined(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13715,17 +13754,17 @@
  
  optional_policy(`
 -	ada_domtrans(unconfined_t)
--')
--
--optional_policy(`
--	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
--	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
--	# this is disallowed usage:
--	unconfined_domain(httpd_unconfined_script_t)
 +	ada_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
+-	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+-	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
+-	# this is disallowed usage:
+-	unconfined_domain(httpd_unconfined_script_t)
+-')
+-
+-optional_policy(`
 -	bind_run_ndc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
 +	bootloader_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
@@ -13743,7 +13782,7 @@
  ')
  
  optional_policy(`
-@@ -118,11 +120,11 @@
+@@ -118,11 +122,11 @@
  ')
  
  optional_policy(`
@@ -13757,7 +13796,7 @@
  ')
  
  optional_policy(`
-@@ -134,11 +136,7 @@
+@@ -134,11 +138,7 @@
  ')
  
  optional_policy(`
@@ -13770,7 +13809,7 @@
  ')
  
  optional_policy(`
-@@ -155,32 +153,23 @@
+@@ -155,32 +155,23 @@
  
  optional_policy(`
  	postfix_run_map(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13807,7 +13846,7 @@
  ')
  
  optional_policy(`
-@@ -205,11 +194,18 @@
+@@ -205,11 +196,18 @@
  ')
  
  optional_policy(`
@@ -13828,7 +13867,7 @@
  ')
  
  ########################################
-@@ -225,8 +221,20 @@
+@@ -225,8 +223,20 @@
  
  	init_dbus_chat_script(unconfined_execmem_t)
  	unconfined_dbus_chat(unconfined_execmem_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- selinux-policy.spec	24 Sep 2007 20:26:12 -0000	1.533
+++ selinux-policy.spec	25 Sep 2007 13:30:08 -0000	1.534
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -272,6 +272,7 @@
 %if %{BUILD_TARGETED}
 %package targeted
 Summary: SELinux targeted base policy
+Provides: selinux-policy-base
 Group: System Environment/Base
 Obsoletes: selinux-policy-targeted-sources < 2
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
@@ -315,6 +316,7 @@
 %package olpc 
 Summary: SELinux olpc base policy
 Group: System Environment/Base
+Provides: selinux-policy-base
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
@@ -339,6 +341,7 @@
 %package mls 
 Summary: SELinux mls base policy
 Group: System Environment/Base
+Provides: selinux-policy-base
 Obsoletes: selinux-policy-mls-sources < 2
 Requires: policycoreutils-newrole >= %{POLICYCOREUTILSVER} setransd
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
@@ -362,6 +365,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-12
+- Allow nsswitch apps to read samba_var_t
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
 - Fix maxima
 



From fedora-extras-commits at redhat.com  Tue Sep 25 13:34:13 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Sep 2007 09:34:13 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.156, 1.157 mkinitrd.spec, 1.221, 
	1.222 sources, 1.199, 1.200
Message-ID: <200709251334.l8PDYD8U031723@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31681

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.18-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	19 Sep 2007 21:26:40 -0000	1.156
+++ .cvsignore	25 Sep 2007 13:33:41 -0000	1.157
@@ -1 +1 @@
-mkinitrd-6.0.17.tar.bz2
+mkinitrd-6.0.18.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- mkinitrd.spec	19 Sep 2007 21:26:40 -0000	1.221
+++ mkinitrd.spec	25 Sep 2007 13:33:41 -0000	1.222
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.17
+Version: 6.0.18
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Tue Sep 25 2007 Peter Jones <pjones at redhat.com> - 6.0.18-1
+- Fix segfault on x86_64 paravirt (#304731, patch from Harald Hoyer)
+
 * Wed Sep 19 2007 Peter Jones <pjones at redhat.com> - 6.0.17-1
 - Fix missing quotes causing failure to detect erroneous "--with" command line
   arguments (#249163)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- sources	19 Sep 2007 21:26:40 -0000	1.199
+++ sources	25 Sep 2007 13:33:41 -0000	1.200
@@ -1 +1 @@
-4c0e08dbdd1f6af4606676de1817863a  mkinitrd-6.0.17.tar.bz2
+28d075b5b918ebf32ac5517606d38a22  mkinitrd-6.0.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 14:21:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 10:21:58 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.73,
	1.74 selinux-policy.spec, 1.534, 1.535
Message-ID: <200709251421.l8PELwIh007474@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:






From fedora-extras-commits at redhat.com  Tue Sep 25 14:24:13 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 10:24:13 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.62, 1.63 authconfig.spec, 1.89, 
	1.90 sources, 1.70, 1.71
Message-ID: <200709251424.l8PEODsO007594@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7572

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.18-1
- improve krb5.conf handling (#238766)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	24 Aug 2007 12:56:13 -0000	1.62
+++ .cvsignore	25 Sep 2007 14:23:40 -0000	1.63
@@ -1 +1 @@
-authconfig-5.3.17.tar.bz2
+authconfig-5.3.18.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- authconfig.spec	24 Aug 2007 12:56:13 -0000	1.89
+++ authconfig.spec	25 Sep 2007 14:23:40 -0000	1.90
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.17
+Version: 5.3.18
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1%{?dist}
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.18-1
+- improve krb5.conf handling (#238766)
+
 * Fri Aug 24 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.17-1
 - remove obsolete pam_krb5afs support (#250704)
 - add support for pam_access (#251360)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	24 Aug 2007 12:56:13 -0000	1.70
+++ sources	25 Sep 2007 14:23:40 -0000	1.71
@@ -1 +1 @@
-adf101dab83a35b92dff865da5c12213  authconfig-5.3.17.tar.bz2
+1ab30770d66d59c704fd91957edad274  authconfig-5.3.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 14:28:45 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Tue, 25 Sep 2007 10:28:45 -0400
Subject: rpms/cdrkit/devel cdrkit.spec,1.7,1.8
Message-ID: <200709251428.l8PESjRw007745@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7719

Modified Files:
	cdrkit.spec 
Log Message:
* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
- fixed readcd man page symlink



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cdrkit.spec	21 Sep 2007 09:24:38 -0000	1.7
+++ cdrkit.spec	25 Sep 2007 14:28:12 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -121,7 +121,7 @@
 		%{_mandir}/man1/wodim.1.gz \
 	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
 	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
-		%{_mandir}/man1/readcd.1.gz 
+		%{_mandir}/man1/readom.1.gz 
 
 %preun -n wodim
 if [ $1 = 0 ]; then
@@ -209,6 +209,9 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
+- fixed readcd man page symlink
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
 - fixed rhbz#255001 - icedax --devices segfaults
 - fixed rhbz#249357 - Typo in wodim output



From fedora-extras-commits at redhat.com  Tue Sep 25 14:47:55 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 10:47:55 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.74,1.75
Message-ID: <200709251447.l8PElt8Z008475@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8446

Modified Files:
	policy-20070703.patch 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- policy-20070703.patch	25 Sep 2007 14:20:38 -0000	1.74
+++ policy-20070703.patch	25 Sep 2007 14:47:50 -0000	1.75
@@ -6440,7 +6440,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-22 07:42:39.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 10:30:36.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -10456,7 +10456,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:18:40.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:32:38.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10562,15 +10562,16 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +356,7 @@
+@@ -329,6 +356,8 @@
  
  	optional_policy(`
  		kerberos_use($1)
 +		kerberos_read_keytab($1)
++		kerberos_524_connect($1)
  	')
  
  	optional_policy(`
-@@ -347,6 +375,37 @@
+@@ -347,6 +376,37 @@
  
  ########################################
  ## <summary>
@@ -10608,7 +10609,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +754,24 @@
+@@ -695,6 +755,24 @@
  
  ########################################
  ## <summary>
@@ -10633,7 +10634,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1395,9 @@
+@@ -1318,14 +1396,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10648,7 +10649,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1347,6 +1419,8 @@
+@@ -1347,6 +1420,8 @@
  
  	optional_policy(`
  		samba_stream_connect_winbind($1)
@@ -10657,7 +10658,7 @@
  	')
  ')
  
-@@ -1381,3 +1455,163 @@
+@@ -1381,3 +1456,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 25 14:49:29 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 10:49:29 -0400
Subject: rpms/hplip/devel hplip-no-root-config.patch, 1.5, 1.6 hplip.spec,
	1.158, 1.159
Message-ID: <200709251449.l8PEnTVS008608@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-5
- Prevent hpfax trying to load configuration files as user lp.


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hplip-no-root-config.patch	9 Jul 2007 14:22:52 -0000	1.5
+++ hplip-no-root-config.patch	25 Sep 2007 14:49:26 -0000	1.6
@@ -1,17 +1,18 @@
---- hplip-2.7.6/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
-+++ hplip-2.7.6/base/g.py	2007-06-29 17:58:29.000000000 +0100
-@@ -105,6 +105,10 @@
+diff -up hplip-2.7.7/base/g.py.no-root-config hplip-2.7.7/base/g.py
+--- hplip-2.7.7/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
++++ hplip-2.7.7/base/g.py	2007-09-25 15:23:23.000000000 +0100
+@@ -105,6 +105,10 @@ class Config(dict):
  
          log.debug("Reading config file %s" % filename)
  
-+        if filename.startswith ("/root/"):
++        if filename.startswith ("/root/") or filename.startswith ("/var/"):
 +            # Don't try opening a file in root's home directory.
 +            return
 +
          try:
              f = file(filename, 'r')
              self.config_obj.readfp(f)
-@@ -134,23 +138,24 @@
+@@ -134,23 +138,25 @@ class Config(dict):
  # Config file: directories and ports
  prop.sys_config_file = '/etc/hp/hplip.conf'
  prop.user_dir = os.path.expanduser('~/.hplip')
@@ -26,7 +27,8 @@
  prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf')
  
 -if not os.path.exists(prop.user_config_file):
-+if (not prop.user_config_file.startswith ("/root/") and
++if (not (prop.user_config_file.startswith ("/root/") or
++         prop.user_config_file.startswith ("/var/")) and
 +    not os.getuid () == 0):
 +    os.umask(0037)
      try:


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- hplip.spec	6 Sep 2007 12:19:39 -0000	1.158
+++ hplip.spec	25 Sep 2007 14:49:26 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -278,6 +278,9 @@
 exit 0
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-5
+- Prevent hpfax trying to load configuration files as user lp.
+
 * Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
 - Reverted udev rules change.
 - Ship a HAL FDI file to get correct access control on the USB device



From fedora-extras-commits at redhat.com  Tue Sep 25 15:03:30 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 11:03:30 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.75,1.76
Message-ID: <200709251503.l8PF3UiT017109@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16852

Modified Files:
	policy-20070703.patch 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- policy-20070703.patch	25 Sep 2007 14:47:50 -0000	1.75
+++ policy-20070703.patch	25 Sep 2007 15:03:25 -0000	1.76
@@ -3112,8 +3112,33 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.8/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/kernel.if	2007-09-17 16:20:18.000000000 -0400
-@@ -1867,6 +1867,27 @@
++++ serefpolicy-3.0.8/policy/modules/kernel/kernel.if	2007-09-25 11:01:00.000000000 -0400
+@@ -352,6 +352,24 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit search the kernel key ring.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_dontaudit_search_key',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	dontaudit $1 kernel_t:key search;
++')
++
++########################################
++## <summary>
+ ##	Allow link to the kernel key ring.
+ ## </summary>
+ ## <param name="domain">
+@@ -1867,6 +1885,27 @@
  
  ########################################
  ## <summary>
@@ -6440,7 +6465,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 10:30:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 11:00:13.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6452,7 +6477,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,26 @@
+@@ -172,3 +176,47 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6479,6 +6504,27 @@
 +	seutil_read_file_contexts($1)
 +	allow $1 krb5_host_rcache_t:file manage_file_perms;
 +')
++
++########################################
++## <summary>
++##	Connect to krb524 service
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kerberos_524_connect',`
++	tunable_policy(`allow_kerberos',`
++		allow $1 self:udp_socket create_socket_perms;
++		corenet_non_ipsec_sendrecv($1)
++		corenet_udp_sendrecv_all_if($1)
++		corenet_udp_sendrecv_all_nodes($1)
++		corenet_udp_sendrecv_kerberos_master_port($1)
++		corenet_udp_bind_all_nodes($1)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.8/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/kerberos.te	2007-09-17 16:20:18.000000000 -0400
@@ -10456,7 +10502,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:32:38.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:59:20.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -13900,7 +13946,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-21 19:20:56.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-25 10:59:50.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14494,7 +14540,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +882,164 @@
+@@ -954,21 +882,165 @@
  ##	</summary>
  ## </param>
  #
@@ -14617,6 +14663,7 @@
 +
 +	optional_policy(`
 +		kerberos_use($1_usertype)
++		kerberos_524_connect($1_usertype)
 +	')
 +
 +	optional_policy(`
@@ -14665,7 +14712,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1048,51 @@
+@@ -977,23 +1049,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -14728,7 +14775,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1128,7 @@
+@@ -1029,15 +1129,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -14745,7 +14792,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1145,6 @@
+@@ -1054,17 +1146,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -14763,7 +14810,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1182,8 @@
+@@ -1102,6 +1183,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -14772,7 +14819,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1209,7 @@
+@@ -1127,7 +1210,7 @@
  	# $1_t local policy
  	#
  
@@ -14781,7 +14828,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1221,11 @@
+@@ -1139,7 +1222,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -14794,7 +14841,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1642,9 +1728,11 @@
+@@ -1642,9 +1729,11 @@
  template(`userdom_user_home_content',`
  	gen_require(`
  		attribute $1_file_type;
@@ -14806,7 +14853,7 @@
  	files_type($2)
  ')
  
-@@ -1894,10 +1982,46 @@
+@@ -1894,10 +1983,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14854,7 +14901,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3202,7 @@
+@@ -3078,7 +3203,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14863,7 +14910,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4739,24 @@
+@@ -4615,6 +4740,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14888,7 +14935,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4775,14 @@
+@@ -4633,6 +4776,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14903,7 +14950,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5473,7 @@
+@@ -5323,7 +5474,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14912,7 +14959,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5709,376 @@
+@@ -5559,3 +5710,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')



From fedora-extras-commits at redhat.com  Tue Sep 25 15:18:27 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 08:18:27 -0700
Subject: [pkgdb] qa-assistant: toshio has requested watchbugzilla
Message-ID: <200709251518.l8PFIWSk009330@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has requested the watchbugzilla acl on qa-assistant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 15:19:17 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 08:19:17 -0700
Subject: [pkgdb] qa-assistant: toshio has given up watchbugzilla
Message-ID: <200709251519.l8PFIWSm009330@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has given up the watchbugzilla acl on qa-assistant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 15:20:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 25 Sep 2007 11:20:17 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.6-reset.patch, NONE,
	1.1 system-config-soundcard-2.0.6-update.patch, 1.2,
	1.3 system-config-soundcard.spec, 1.59, 1.60
Message-ID: <200709251520.l8PFKHVH017963@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/system-config-soundcard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17937

Modified Files:
	system-config-soundcard-2.0.6-update.patch 
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-reset.patch 
Log Message:
* Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
- fixed #291691 - Sound card not working gives a window with 
  invalid instructions on first boot
- rewritting configuration file option splitted to config restore 
  and config reset
- used plughw device in the hardware configuration instead of the hw



system-config-soundcard-2.0.6-reset.patch:

--- NEW FILE system-config-soundcard-2.0.6-reset.patch ---
diff -up system-config-soundcard-2.0.6/src/soundcard.py.res system-config-soundcard-2.0.6/src/soundcard.py
--- system-config-soundcard-2.0.6/src/soundcard.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcard.py	2007-09-25 17:06:40.000000000 +0200
@@ -235,7 +235,7 @@ class childWindow:
            #Oh well, they couldn't hear the sound.  Notify the user and then quit.  We did our best
            self.showErrorDialog(_("Automatic detection of the sound card did not work.  " \
                                   "This audio device will not be available on the system.\n\n"  \
-                                  "You can create %s, %s on the System tab and " \
+                                  "You can find log files %s, %s and " \
                                   "file a new bug\nat http://bugzilla.redhat.com.\n\nPlease click " \
                                   "OK to continue.") % ("/root/scsconfig.log", "/root/scsrun.log"))
 
@@ -726,11 +726,18 @@ class childWindow:
         return settingsBox
 
     def create_system_page_modules_reload(self, widget):
-        self.soundcardBackend.reloadModules()
+        ret = self.soundcardBackend.reloadModules()
+	if ret:
+		self.reset_notebook()
         
     def create_system_page_rewrite_files(self,  widget):
         self.soundcardBackend.rewriteConfigFiles()
 
+    def create_system_page_reset_files(self,  widget):
+        ret = self.soundcardBackend.resetConfigFiles()
+	if ret:
+		self.reset_notebook()
+
     def create_system_page(self):
     
         table = gtk.Table(2, 3)
@@ -796,24 +803,34 @@ class childWindow:
 
         infoBox.pack_start(detectionBox, False, False)
 
-        rewrite_button = gtk.Button(_("Rewrite configuration files"))
+        rewrite_button = gtk.Button(_("Restore configuration files"))
         rewrite_button.connect("clicked", self.create_system_page_rewrite_files)
 
-        rewriteBox = gtk.HBox(False, 8)
+        reset_button = gtk.Button(_("Reset configuration files"))
+        reset_button.connect("clicked", self.create_system_page_reset_files)
+
+        rewriteBox = gtk.VBox(False, 8)
         rewriteBox.pack_start(rewrite_button, True, True)
+        rewriteBox.pack_start(reset_button, True, True)
         rewriteBox = self.create_frame(self.create_frame(rewriteBox,8),0,_("Configuration files"),gtk.SHADOW_ETCHED_IN)
 
-        infoBox.pack_start(rewriteBox, False, False)
+        infoBox.pack_start(rewriteBox, False, False)        
 
         return infoBox
 
     def refresh_notebook(self):
         self.notebook.remove_page(0)
         self.notebook.remove_page(0)
-        self.notebook.prepend_page(self.create_frame(self.create_settings_page()), gtk.Label(_("Settings")))
-        self.notebook.prepend_page(self.create_frame(self.create_test_page()), gtk.Label(_("Sound test")))
+        self.notebook.remove_page(0)
+        self.notebook.append_page(self.create_frame(self.create_test_page()), gtk.Label(_("Sound test")))
+        self.notebook.append_page(self.create_frame(self.create_settings_page()), gtk.Label(_("Settings")))
+        self.notebook.append_page(self.create_frame(self.create_system_page()), gtk.Label(_("System")))
         self.notebook.show_all()
 
+    def reset_notebook(self):
+	self.soundcardBackend.reset()
+	self.refresh_notebook()
+
     def launch(self):
     
         print "Running from first-boot..."           
@@ -839,7 +856,7 @@ class childWindow:
         print "Running from command-line..."
         
         self.firstBoot = False
-        
+ 
         self.mainWindow = gtk.Dialog()
         self.mainWindow.vbox.set_spacing(5)
         self.mainWindow.connect("destroy", self.destroy)
diff -up system-config-soundcard-2.0.6/src/soundcardBackend.py.res system-config-soundcard-2.0.6/src/soundcardBackend.py
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-09-25 17:06:40.000000000 +0200
@@ -66,6 +66,21 @@ def errorDialog(text):
     return
 
 ##
+## Info message
+##
+def infoDialog(text):
+    dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, text)
+
+    dlg.set_title(_("Note"))
+    dlg.set_default_size(100, 100)
+    dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT)
+    dlg.set_border_width(2)
+    dlg.set_modal(True)
+    rc = dlg.run()
+    dlg.destroy()
+    return
+
+##
 ## Get position
 ##
 def position(list, name):
@@ -127,10 +142,7 @@ def soundCardDevice_sort(device1, device
 
 
 class soundConfiguration:
-    def __init__(self):
-    
-        self.doDebug = False
-    
+    def reset(self):
         # coundcard configuration
         self.default_card = 0
         self.default_device = 0
@@ -148,6 +160,12 @@ class soundConfiguration:
 	self.usb_cards_hack = True
 	self.usb_cards_hack_position = USB_AUDIO_POSITION
 
+
+    def __init__(self):
+    
+        self.doDebug = False
+	self.reset()    
+
     def dump(self):
         print " ----------- soundConfiguration -----------"        
         print "default_card %d" % self.default_card
@@ -201,22 +219,47 @@ class soundConfiguration:
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("pcm.!default { type hw card %d device %d } \n" % (index, device))
-                lines.append("ctl.!default { type hw card %d }\n" % index)
+                lines.append("pcm.!default { type plughw card %d device %d }\n" % (index, device))
+                lines.append("ctl.!default { type plughw card %d }\n" % index)
             else:
                 lines.append("#SWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("defaults.pcm.card %d \n" %   index)
-                lines.append("defaults.pcm.device %d \n" % device)
-                lines.append("defaults.ctl.card %d \n" %   index)
-
-	    fd = open('/etc/asound.conf', 'w')
-	    for line in lines:
-	        fd.write(line)
-	    fd.close()
+                lines.append("defaults.pcm.card %d\n" %   index)
+                lines.append("defaults.pcm.device %d\n" % device)
+                lines.append("defaults.ctl.card %d\n" %   index)
+
+	    try:
+		fd = open('/etc/asound.conf', 'w')
+	    	for line in lines:
+	        	fd.write(line)
+    		fd.close()
+	    except:
+		return False
 
         return True
 
+    def resetAlsaConfig(self):
+
+	lines = []
+	lines.append("#Generated by system-config-soundcard\n")
+	lines.append("#If you edit this file, don't run system-config-soundcard,\n")
+	lines.append("#all your changes here could be lost.\n")
+	lines.append("#SWCONF\n")
+	lines.append("#DEV 0\n")
+	lines.append("defaults.pcm.card 0\n")
+	lines.append("defaults.pcm.device 0\n")
+	lines.append("defaults.ctl.card 0\n")
+
+	try:
+		fd = open('/etc/asound.conf', 'w')
+		for line in lines:
+			fd.write(line)
+		fd.close()
+	except:
+		return False
+
+	return True
+
     def cardIndexChanged(self):
         self.card_index_changed = True
         self.card_default_changed = True
@@ -288,7 +331,7 @@ class soundConfiguration:
         except:
             return False
 
-	self.readUSBDevicePosition(list)
+        self.readUSBDevicePosition(list)
 
         sound_lines = []
         modprobe = []
@@ -345,6 +388,56 @@ class soundConfiguration:
 
         return True
 
+    def resetModprobe(self):
+        
+        try:
+            fd = open('/etc/modprobe.conf', 'r')
+            list = fd.readlines()
+            fd.close()
+        except:
+            return False
+       
+	modprobe = [] 
+        for whole_line in list:
+            line = string.strip(whole_line)
+            if line == []:
+               modprobe.append(whole_line)
+               continue;
+                
+            tmp = line.split()
+            if tmp == [] or tmp[0] == [] or tmp[0][0] == '#'\
+               or tmp[1] == [] or tmp[2] == [] :
+                modprobe.append(whole_line)                
+                continue
+                
+            if tmp[0] == "install" or tmp[0] == "remove":
+                modprobe.append(whole_line)                
+                continue
+    
+            if tmp[0] != "alias" and tmp[1][:3] != "snd" and\
+               tmp[2][:9] != "snd-card-":
+                modprobe.append(whole_line)                
+                continue                
+            
+            if tmp[0] != "options" and tmp[1][:3] != "snd" and\
+               tmp[2][:5] != "index" and tmp[2][:11] != "cards_limit":
+                modprobe.append(whole_line)                
+                continue
+
+	modprobe.append("options snd cards_limit=8\n")
+	modprobe.append("alias snd-card-%d %s\n" % (self.usb_cards_hack_position, USB_AUDIO_DRIVER))
+	modprobe.append("options %s index=%d\n" % (USB_AUDIO_DRIVER, self.usb_cards_hack_position))
+
+        try:
+            os.rename('/etc/modprobe.conf', '/etc/modprobe.conf.scs')
+            fd = open('/etc/modprobe.conf', 'w')
+            fd.writelines(modprobe)
+            fd.close()
+        except:
+            return False
+
+        return True
+
     # ------------------------------------------------------------------------
     # Configuring routines - sound modules reloading
     # ------------------------------------------------------------------------
@@ -402,6 +495,9 @@ class soundConfiguration:
         
         if self.unloadModule("snd", module_list):
             errorDialog(_("Unable to remove kernel modules. You need to reboot your box for the changes to take effect."))
+	    return False
+
+	return True
         
     def loadModules(self, cardArray):
     
@@ -410,12 +506,16 @@ class soundConfiguration:
                 print card.driver
                 ret = os.spawnv(os.P_WAIT, "/sbin/modprobe", ["/sbin/modprobe", card.driver])
                 if ret:
-                    errorDialog(_("Unable to load kernel module %s. You need to reboot your box for the changes to take effect.") % card.driver)
+			errorDialog(_("Unable to load kernel module %s. You need to reboot your box for the changes to take effect.") % card.driver)
+			return False
+	return True
 
     def reloadModules(self, cardArray):
-        self.unloadModules()
-        self.loadModules(cardArray)
-        self.card_index_changed = False
+        ret = self.unloadModules()
+	if not ret:
+		return False
+        ret = self.loadModules(cardArray)
+	return ret
 
     def writeConfig(self, cardArray):
         ret_alsa = ret_mod = True
@@ -433,12 +533,22 @@ class soundConfiguration:
             if ret_alsa:
                 self.card_default_changed = False
             else:
-                errorDialog(_("Unable to write ALSA configuration files!"))
+                errorDialog(_("Unable to write ALSA configuration file %s!") % "/etc/asound.conf")
 
         return ret_mod and ret_alsa
         
 
 class soundcardBackend:
+    def reset(self):
+        # Load general configuration
+        self.soundConfig = soundConfiguration()
+
+	self.cardArray = []
+
+        # Detect cards
+        self.detectCards()
+	return	
+
     def __init__(self):
     
         self.doDebug = True        
@@ -446,12 +556,9 @@ class soundcardBackend:
         self.soundcardBackendKudzu = soundcardBackendKudzu.soundcardBackendKudzu()
         self.soundcardBackendProc = soundcardBackendProc.soundcardBackendProc()
         self.soundcardBackendHal = soundcardBackendHal.soundcardBackendHal()
-        
-        # Load general configuration
-        self.soundConfig = soundConfiguration()
-        
-        # Detect cards
-        self.detectCards()
+
+	self.reset()
+	return        
 
     def destroy(self, args):
         return        
@@ -464,6 +571,7 @@ class soundcardBackend:
         return original_array
 
     def detectCards(self):
+
         # List of all cards in system
         self.cardArray = self.mergeCards(self.probeCards(DETECTION_HAL),\
                                          self.probeCards(DETECTION_KUDZU))
@@ -491,14 +599,18 @@ class soundcardBackend:
         card_max = self.soundConfig.card_max_index + 1
         
         if method == DETECTION_KUDZU:
-            return self.soundcardBackendKudzu.probeCards(default_card,\
+            ret = self.soundcardBackendKudzu.probeCards(default_card,\
                    default_device, card_list, card_max)
         elif method == DETECTION_PROC:
-            return self.soundcardBackendProc.probeCards(default_card,\
+            ret = self.soundcardBackendProc.probeCards(default_card,\
                    default_device, card_list, card_max)
         elif method == DETECTION_HAL:
-            return self.soundcardBackendHal.probeCards(default_card,\
+            ret = self.soundcardBackendHal.probeCards(default_card,\
                    default_device, card_list, card_max)
+
+	print "ProbeCards, method = ", method
+	self.dumpCardList(ret)
+	return ret
                    
         
     # ------------------------------------------------------------------------
@@ -644,12 +756,32 @@ class soundcardBackend:
         self.soundConfig.writeConfig(self.cardArray)
     
     def reloadModules(self, *args):
-        self.soundConfig.reloadModules(self.cardArray)
+        ret = self.soundConfig.reloadModules(self.cardArray)
+        if ret:
+                infoDialog(_("Modules reload was successful."));
+	return ret
 
     def rewriteConfigFiles(self):
         self.soundConfig.rewriteModprobe(self.cardArray)
         self.soundConfig.writeAlsaConfig(self.cardArray)
 
+    def resetConfigFiles(self):
+	ret = self.soundConfig.resetModprobe()
+	if not ret:
+		errorDialog(_("Unable to reset configuration in %s") % "/etc/modprobe.conf");
+		return False
+		
+	ret = self.soundConfig.resetAlsaConfig()
+	if not ret:
+		errorDialog(_("Unable to reset configuration in %s") % "/etc/alsa/alsa.conf");
+		return False
+		
+	ret = self.soundConfig.reloadModules(self.cardArray)
+	if ret:
+		infoDialog(_("Configuration reset was successful."));
+		
+	return ret
+
     # ------------------------------------------------------------------------
     # Info routines
     # ------------------------------------------------------------------------
@@ -690,8 +822,8 @@ class soundcardBackend:
         except:
             return ""
 
-    def dumpCards(self, active_only = 0):
-        for card in self.cardArray:
+    def dumpCardList(self, list, active_only = 0):
+        for card in list:
             print "--------- Card %d --------" % card.index
             
             if active_only and not card.active:
@@ -710,3 +842,7 @@ class soundcardBackend:
             print card.device_list
 
             print "Test device %d" % card.test_sound_device
+
+    def dumpCards(self, active_only = 0):
+        self.dumpCardList(self.cardArray, active_only)
+
diff -up system-config-soundcard-2.0.6/src/soundcardBackendHal.py.res system-config-soundcard-2.0.6/src/soundcardBackendHal.py
--- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py	2007-09-25 17:10:28.000000000 +0200
@@ -38,12 +38,14 @@ ALLOWED_TYPE = "playback"
 import soundcardBackendSoundCard
 
 class soundcardBackendHal:
+    def reset(self):
+        self.driverList = self.read_driver_list()
+        self.cards = {}
+
     def __init__(self):
     
         self.doDebug = True
-
-        self.driverList = self.read_driver_list()
-                
+               
 	try:
             self._dbusBus = dbus.SystemBus()
             self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager")
@@ -53,9 +55,7 @@ class soundcardBackendHal:
             self.halManagerObj = []
             self.halManager = []
             self.driverList = []
-            print _("Unable to initialize D-BUS/HAL!")
-       
-        self.cards = {}
+            print _("Unable to initialize D-BUS/HAL!")      
 
     def destroy(self, args):
         return
@@ -186,6 +186,8 @@ class soundcardBackendHal:
     # Same with Mac sound devices
     #if card.bus() == "macio" and card.driver() != "snd-powermac":
     def probeCards(self, default_card, default_device, card_list, card_max):
+	
+	self.reset()
 
 	if self.halManager != []:
             udiList = self.halManager.FindDeviceByCapability("alsa")        

system-config-soundcard-2.0.6-update.patch:

Index: system-config-soundcard-2.0.6-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard-2.0.6-update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-soundcard-2.0.6-update.patch	28 May 2007 13:17:54 -0000	1.2
+++ system-config-soundcard-2.0.6-update.patch	25 Sep 2007 15:20:15 -0000	1.3
@@ -15,32 +15,6 @@
          self.mainWindow = None
  
          self.card_list = None
-@@ -246,6 +250,25 @@
-         else:
-             self.soundcardBackend.setVolume()
- 
-+    # we need to shrink/cut every too long line
-+    def wrapLine(self, line, max_len = 30, cut = False):
-+        lines = string.split(line)
-+        
-+        lines_new = []
-+        ln = 0        
-+        
-+        for l in lines:
-+          ln = ln + len(l)
-+          if ln > max_len:
-+            if not cut:
-+              l = '\n' + l[0:]
-+              ln = len(l)
-+            else:
-+              break              
-+          lines_new.append(l)
-+          
-+        return string.join(lines_new)
-+
-     def create_frame(self, widget, border = 5, label = None, shadow = gtk.SHADOW_NONE):
-         frame = gtk.Frame(label)
-         frame.set_border_width(border)
 @@ -272,26 +295,43 @@
          maker_label2 = gtk.Label("")
  


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- system-config-soundcard.spec	25 Jul 2007 10:31:24 -0000	1.59
+++ system-config-soundcard.spec	25 Sep 2007 15:20:15 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 8%{dist}
+Release: 9%{dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/soundcard
 License: GPL
 ExclusiveOS: Linux
@@ -14,6 +14,7 @@
 Patch2: system-config-soundcard-no-vendor.patch
 Patch3: system-config-soundcard-2.0.6-usb-hack.patch
 Patch4: system-config-soundcard-2.0.6-desktop.patch
+Patch5: system-config-soundcard-2.0.6-reset.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -39,8 +40,9 @@
 %patch  -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .usb
+%patch3 -p1
 %patch4 -p1
+%patch5 -p1 -b .res
 
 %build
 make
@@ -90,6 +92,13 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
+- fixed #291691 - Sound card not working gives a window with 
+  invalid instructions on first boot
+- rewritting configuration file option splitted to config restore 
+  and config reset
+- used plughw device in the hardware configuration instead of the hw
+
 * Wed Jul 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-8
 - fixed #245875 - desktop file categories
 



From fedora-extras-commits at redhat.com  Tue Sep 25 15:20:33 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 11:20:33 -0400
Subject: rpms/python-virtinst/devel .cvsignore, 1.11,
	1.12 python-virtinst.spec, 1.26, 1.27 sources, 1.11,
	1.12 python-virtinst-0.200.0-default-arch.patch, 1.1,
	NONE python-virtinst-0.300.0-fedora8-distro.patch, 1.1,
	NONE python-virtinst-0.300.0-transient-qemu.patch, 1.1, NONE
Message-ID: <200709251520.l8PFKXrx018002@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17911

Modified Files:
	.cvsignore python-virtinst.spec sources 
Removed Files:
	python-virtinst-0.200.0-default-arch.patch 
	python-virtinst-0.300.0-fedora8-distro.patch 
	python-virtinst-0.300.0-transient-qemu.patch 
Log Message:
Update to 0.300.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 22:38:15 -0000	1.11
+++ .cvsignore	25 Sep 2007 15:20:00 -0000	1.12
@@ -1 +1,3 @@
-virtinst-0.300.0.tar.gz
+virtinst-0.300.1.tar.gz
+.build*.log
+*.rpm


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-virtinst.spec	19 Sep 2007 19:22:03 -0000	1.26
+++ python-virtinst.spec	25 Sep 2007 15:20:00 -0000	1.27
@@ -10,12 +10,9 @@
 
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
-Version: 0.300.0
-Release: 4%{_extra_release}
+Version: 0.300.1
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{name}-%{version}-fedora8-distro.patch
-Patch2: %{name}-0.200.0-default-arch.patch
-Patch3: %{name}-%{version}-transient-qemu.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,9 +35,6 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 python setup.py build
@@ -70,6 +64,10 @@
 %{_bindir}/virt-image
 
 %changelog
+* Tue Sep 25 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.1-1.fc8
+- Update to 0.300.1 release
+- Added PXE support
+
 * Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-4.fc8
 - Fix post install CDROM config for KVM guests
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 22:38:15 -0000	1.11
+++ sources	25 Sep 2007 15:20:00 -0000	1.12
@@ -1 +1 @@
-860171421b1eef4f5311366de1120b2a  virtinst-0.300.0.tar.gz
+0424cdd829fda57b7117782f367d4aec  virtinst-0.300.1.tar.gz


--- python-virtinst-0.200.0-default-arch.patch DELETED ---


--- python-virtinst-0.300.0-fedora8-distro.patch DELETED ---


--- python-virtinst-0.300.0-transient-qemu.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 15:31:44 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Tue, 25 Sep 2007 11:31:44 -0400
Subject: rpms/system-config-firewall/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 system-config-firewall.spec, 1.7, 1.8
Message-ID: <200709251531.l8PFVimM018377@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18341

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
new version 1.0.7 with lots of fixes and more translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2007 15:43:19 -0000	1.4
+++ .cvsignore	25 Sep 2007 15:31:12 -0000	1.5
@@ -1,3 +1,4 @@
 system-config-firewall-1.0.3.tar.bz2
 system-config-firewall-1.0.4.tar.bz2
 system-config-firewall-1.0.5.tar.bz2
+system-config-firewall-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Sep 2007 09:42:35 -0000	1.5
+++ sources	25 Sep 2007 15:31:12 -0000	1.6
@@ -1 +1 @@
-cc6ea00488c648fc3478d260670f0d28  system-config-firewall-1.0.6.tar.bz2
+cbe5ca2c7b6d7036084788d0681516b5  system-config-firewall-1.0.7.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-config-firewall.spec	12 Sep 2007 09:42:35 -0000	1.7
+++ system-config-firewall.spec	25 Sep 2007 15:31:12 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.0.6
+Version: 1.0.7
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
@@ -119,6 +119,23 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Tue Sep 25 2007 Thomas Woerner <twoerner at redhat.com> 1.0.7-1
+- new translations
+- added openvpn to services (rhbz#)
+- fixed typo in description text for ipsec
+- using port numbers instead of port names for services
+- renamed some variables to be consistent
+- make tolltip better: bigger text, helper modules
+- dropped unused code: inconsistent handling
+- make port check button inactive in add_port_cb
+- new function _addDevice: code cleanup
+- allow to set variables in ipXtablesConfig, which were not set before
+- fixed os.system calls in ipXtablesClass to return proper return values
+- fixed status funciton in ipXtablesClass
+- new _append_unique function in fw_parser to prevent duplicates
+- added warning dialog for missing or unusable /etc/sysconfig/ip*tables files
+- fixed expand of the warning label in the startup dialog
+
 * Wed Sep 12 2007 Thomas Woerner <twoerner at redhat.com> 1.0.6-1
 - dropped --stop option from fw_gui::genArgs
 - new translations



From fedora-extras-commits at redhat.com  Tue Sep 25 15:37:04 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 25 Sep 2007 11:37:04 -0400
Subject: rpms/slang/devel slang-2.1.2-hashborder.patch, NONE,
	1.1 slang-2.1.2-slerr.patch, NONE, 1.1 slang.spec, 1.47, 1.48
Message-ID: <200709251537.l8PFb4Rf018705@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527

Modified Files:
	slang.spec 
Added Files:
	slang-2.1.2-hashborder.patch slang-2.1.2-slerr.patch 
Log Message:
- fix integer underflow in compute_hash (#302181)
- fix SLang_set_error when called from signal handler (#297661)


slang-2.1.2-hashborder.patch:

--- NEW FILE slang-2.1.2-hashborder.patch ---
diff -up slang-2.1.2/src/slsmg.c.hashborder slang-2.1.2/src/slsmg.c
--- slang-2.1.2/src/slsmg.c.hashborder	2007-09-17 19:17:24.000000000 +0200
+++ slang-2.1.2/src/slsmg.c	2007-09-24 17:23:29.000000000 +0200
@@ -993,7 +993,7 @@ static unsigned long compute_hash (SLsmg
 
    c += SLsmg_Scroll_Hash_Border;
    csave = c;
-   cmax = c + (n - SLsmg_Scroll_Hash_Border);
+   cmax = c + ((int)n - SLsmg_Scroll_Hash_Border);
 
    while ((c < cmax) && is_blank)
      {

slang-2.1.2-slerr.patch:

--- NEW FILE slang-2.1.2-slerr.patch ---
Index: slang/src/slerr.c
===================================================================
--- slang/src/slerr.c	(revision 199)
+++ slang/src/slerr.c	(revision 200)
@@ -384,6 +384,8 @@
 }
 Error_Message_Type;
 
+static char *Static_Error_Message = NULL;
+
 struct _pSLerr_Error_Queue_Type
 {
    Error_Message_Type *head;
@@ -531,12 +533,11 @@
 	
 	free_queued_messages (q);
      }
-#if 0
-   if (_pSLang_Error != SL_Usage_Error)
+   if (Static_Error_Message != NULL)
      {
-	print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error));
+	print_error (_SLERR_MSG_ERROR, Static_Error_Message);
+	Static_Error_Message = NULL;
      }
-#endif
 }
 
 /* This function returns a pointer to the first error message in the queue.
@@ -615,6 +616,7 @@
 
 void _pSLerr_free_queued_messages (void)
 {
+   Static_Error_Message = NULL;
    free_queued_messages (Active_Error_Queue);
 }
 
@@ -626,7 +628,10 @@
     */
    if ((error == 0)
        || (_pSLang_Error == 0))
-     _pSLang_Error = error;
+     {
+	Static_Error_Message = NULL;
+	_pSLang_Error = error;
+     }
 
    if (_pSLinterpreter_Error_Hook != NULL)
      (*_pSLinterpreter_Error_Hook) (_pSLang_Error);
@@ -707,9 +712,19 @@
 {
    set_error (error);
 
-   if (_pSLang_Error == 0)
+   if (error == 0)
      return 0;
 
+   if (error == SL_UserBreak_Error)
+     {
+	/* This function may be called from a SIGINT handler, in which case the 
+	 * error code will be SL_Usage_Error.
+	 */
+	/* print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error)); */
+	Static_Error_Message = SLerr_strerror (error);
+	return 0;
+     }	
+   
    /* If a string is not in the message queue, then add one. */
    if (Active_Error_Queue != NULL)
      {
@@ -806,5 +821,6 @@
    Suspend_Error_Messages = 0;
    Default_Error_Queue = NULL;
    Active_Error_Queue = NULL;
+   Static_Error_Message = NULL;
 }
 


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- slang.spec	17 Sep 2007 17:27:03 -0000	1.47
+++ slang.spec	25 Sep 2007 15:36:31 -0000	1.48
@@ -1,13 +1,15 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
 Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
 Patch1: slang-2.1.2-makefile.patch
 Patch2: slang-nointerlibc2.patch
 Patch3: slang-LANG.patch
+Patch4: slang-2.1.2-hashborder.patch
+Patch5: slang-2.1.2-slerr.patch
 URL: http://www.jedsoft.org/slang/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpng-devel pcre-devel gawk
@@ -60,6 +62,8 @@
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .nointerlibc2
 %patch3 -p1 -b .LANG
+%patch4 -p1 -b .hashborder
+%patch5 -p1 -b .slerr
 
 %build
 %configure --includedir=%{_includedir}/slang
@@ -103,6 +107,10 @@
 %{_libdir}/libslang*.a
 
 %changelog
+* Tue Sep 25 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-2
+- fix integer underflow in compute_hash (#302181)
+- fix SLang_set_error when called from signal handler (#297661)
+
 * Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-1
 - update to 2.1.2
 



From fedora-extras-commits at redhat.com  Tue Sep 25 15:49:25 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 11:49:25 -0400
Subject: rpms/generic-logos/devel generic-logos.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709251549.l8PFnPBg019278@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246

Modified Files:
	.cvsignore sources 
Added Files:
	generic-logos.spec 
Log Message:
initial import



--- NEW FILE generic-logos.spec ---
Name: generic-logos
Summary: Icons and pictures
Version: 7.92.1
Release: 1%{?dist}
Group: System Environment/Base
Source0: generic-logos-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Obsoletes: redhat-logos
Provides: redhat-logos = %{version}-%{release}
Provides: system-logos = %{version}-%{release}
Conflicts: fedora-logos
Conflicts: kdebase <= 3.1.5
Conflicts: anaconda-images <= 10
Conflicts: redhat-artwork <= 5.0.5

%description
The generic-logos package contains various image files which can be
used by the bootloader, anaconda, and other related tools. It can
be used as a replacement for the fedora-logos package, if you are
unable for any reason to abide by the trademark restrictions on the
fedora-logos package.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT

# should be ifarch i386
mkdir -p $RPM_BUILD_ROOT/boot/grub
install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
# end i386 bits

mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
for i in firstboot/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/rhgb
for i in rhgb/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/rhgb
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
for i in gnome-splash/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
for i in pixmaps/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
done

(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc COPYING
%{_datadir}/firstboot/*
%{_datadir}/rhgb/*
%{_datadir}/anaconda/pixmaps/*
%{_datadir}/pixmaps/*
/usr/lib/anaconda-runtime/*.jpg
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits

%changelog
* Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
- add powered-by logo (#250676)
- updated rhgb logo (<duffy at redhat.com>)

* Tue Sep 11 2007 Bill Nottinghan <notting at redhat.com> - 7.92.0-1
- initial packaging. Forked from fedora-logos, adapted from the Fedora
  Art project's Infinity theme


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:34:13 -0000	1.1
+++ .cvsignore	25 Sep 2007 15:48:53 -0000	1.2
@@ -0,0 +1 @@
+generic-logos-7.92.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:34:13 -0000	1.1
+++ sources	25 Sep 2007 15:48:53 -0000	1.2
@@ -0,0 +1 @@
+de79666bc82ecce1ac46f25569e156df  generic-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 15:55:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 25 Sep 2007 11:55:56 -0400
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.19,1.20
Message-ID: <200709251555.l8PFtutW019570@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19484

Modified Files:
	pulseaudio.spec 
Log Message:
Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pulseaudio.spec	25 Sep 2007 03:04:46 -0000	1.19
+++ pulseaudio.spec	25 Sep 2007 15:55:23 -0000	1.20
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.12.svn20070925%{?dist}
+Release:	0.13.svn20070925%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -155,7 +155,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
-
+rm $RPM_BUILD_ROOT/%{_libdir}/libpulsecore.so
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -314,7 +314,6 @@
 %doc doxygen/html
 %{_includedir}/pulse/
 %{_libdir}/libpulse.so
-%{_libdir}/libpulsecore.so
 %{_libdir}/libpulse-mainloop-glib.so
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
@@ -333,6 +332,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.13.svn20070925
+- Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.12.svn20070925
 - New SVN snapshot
 - Split off libflashsupport again



From fedora-extras-commits at redhat.com  Tue Sep 25 15:57:06 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Tue, 25 Sep 2007 11:57:06 -0400
Subject: rpms/audit/devel .cvsignore, 1.82, 1.83 audit.spec, 1.146,
	1.147 sources, 1.102, 1.103 audit-1.6.1-event-host.patch, 1.1, NONE
Message-ID: <200709251557.l8PFv693019675@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19625

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.6.1-event-host.patch 
Log Message:
* Tue Sep 25 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-1
- Add support for searching by posix regular expressions in auparse
- Route DEAMON events into rt interface
- If event pipe is full, try again after doing local logging
- Optionally add node/machine name to records in audit daemon
- Update ausearch/aureport to specify nodes to search on
- Fix segfault interpretting saddr fields in avcs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	2 Sep 2007 16:49:22 -0000	1.82
+++ .cvsignore	25 Sep 2007 15:56:34 -0000	1.83
@@ -79,3 +79,4 @@
 audit-1.5.6.tar.gz
 audit-1.6.tar.gz
 audit-1.6.1.tar.gz
+audit-1.6.2.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- audit.spec	6 Sep 2007 18:16:57 -0000	1.146
+++ audit.spec	25 Sep 2007 15:56:34 -0000	1.147
@@ -1,15 +1,14 @@
 %define sca_version 0.4.3
-%define sca_release 4
+%define sca_release 5
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6.1
-Release: 2%{?dist}
+Version: 1.6.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch1: audit-1.6.1-event-host.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -68,7 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -112,6 +110,11 @@
 
 %find_lang system-config-audit
 
+# Remove the plugin stuff for now
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/au-ids.conf
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/remote.conf
+rm -f $RPM_BUILD_ROOT/sbin/audisp-ids
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -174,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
+%doc  README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -193,7 +196,8 @@
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-%attr(640,root,root) /etc/audisp/plugins.d/*
+%attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 
 %files -n system-config-audit -f system-config-audit.lang
 %defattr(-,root,root,-)
@@ -211,6 +215,14 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Sep 25 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-1
+- Add support for searching by posix regular expressions in auparse
+- Route DEAMON events into rt interface
+- If event pipe is full, try again after doing local logging
+- Optionally add node/machine name to records in audit daemon
+- Update ausearch/aureport to specify nodes to search on
+- Fix segfault interpretting saddr fields in avcs
+
 * Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
 - Fix uninitialized variable in auparse (John Dennis)
 
@@ -376,170 +388,3 @@
 - Remove watches from aureport since FS_WATCH is deprecated
 - Add audit_log_avc back temporarily (#208152)
  
-* Mon Sep 18 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-2
-- Fix logging messages to use addr if passed.
-- Apply patches from Tony Jones correcting no kernel support messages
-- Updated syscall tables for 2.6.18 kernel
-- Remove deprecated functions: audit_log, audit_log_avc, audit_log_if_enabled
-- Disallow syscall auditing on exclude list
-- Improve time handling in ausearch and aureport (#191394)
-- Attempt to reconstruct full path from relative for searching
-
-* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-3
-- Rename audit event socket
-
-* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
-- Another minor update to auditctl -p option
-
-* Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
-- Apply updates to dispatcher
-- Fix a couple bugs regarding MLS labels
-- Resurrect -p option
-- Tighten rules with exclude filter
-- Fix parsing issue which lead to segfault in some cases
-- Fix option parsing to ignore malformed lines
-
-* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.2.5-8
-- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
-  (#203001)
-
-* Wed Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-7
-- Remove debug lines from dispatcher
-
-* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-6
-- Change audisp to use a named pipe
-
-* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
-- Fix dispatcher to handle sigchld
-- Fix library location for 64 bit
-- Add Prereq
-
-* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
-- Eliminate avc package from audisp
-
-* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-3
-- More fixes for setroubleshoot to handle failing plugin
-
-* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
-- Fixes for setroubleshoot
-
-* Thu Jul 13 2006 Steve Grubb <sgrubb at redhat.com> 1.2.5-1
-- Switch out dispatcher
-- Fix bug upgrading rule types
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.1
-- rebuild
-
-* Fri Jun 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.4-1
-- Add support for the new filter key
-- Update syscall tables for 2.6.17
-- Add audit failure query function
-- Switch out gethostbyname call with getaddrinfo
-- Add audit by obj capability for 2.6.18 kernel
-- Ausearch & aureport now fail if no args to -te
-- New auditd.conf option to choose blocking/non-blocking dispatcher comm
-- Ausearch improved search by label
-
-* Fri May 25 2006 Steve Grubb <sgrubb at redhat.com> 1.2.3-1
-- Apply patch to ensure watches only associate with exit filter
-- Apply patch to correctly show new operators when new listing format is used
-- Apply patch to pull kernel's audit.h into python bindings
-- Collect signal sender's context
-
-* Tue May 16 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.2-2
-- Require kernel-headers, not glibc-kernheaders. Again.
-
-* Fri May 12 2006 Steve Grubb <sgrubb at redhat.com> 1.2.2-1
-- Updates for new glibc-kernheaders
-- Change auditctl to collect list of rules then delete them on -D
-- Update capp.rules and lspp.rules to comment out rules for the possible list
-- Add new message types
-- Support sigusr1 sender identity of newer kernels
-- Add support for ppid in auditctl and ausearch
-- fix auditctl to trim the '/' from watches
-- Move audit daemon config files to /etc/audit for better SE Linux protection
-
-* Wed Apr 25 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.1-2
-- Require kernel-headers, not glibc-kernheaders
-- Fix redefinition of audit_rule_data with new kernel headers
-- Remove abuse of __KERNEL__ in lookup_table.c
-
-* Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
-- New message type for trusted apps
-- Add new keywords today, yesterday, now for ausearch and aureport
-- Make audit_log_user_avc_message really send to syslog on error
-- Updated syscall tables in auditctl
-- Deprecated the 'possible' action for syscall rules in auditctl
-- Update watch code to use file syscalls instead of 'all' in auditctl
-
-* Fri Apr 7 2006 Steve Grubb <sgrubb at redhat.com> 1.2-1
-- Add support for new file system auditing kernel subsystem
-
-* Thu Apr 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.6-1
-- New message types
-- Support new rule format found in 2.6.17 and later kernels
-- Add support for audit by role, clearance, type, sensitivity
-
-* Wed Mar 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.5-1
-- Changed audit_log_semanage_message to take new params
-- In aureport, add class between syscall and permission in avc report
-- Fix bug where fsync is called in debug mode
-- Add optional support for tty in SYSCALL records for ausearch/aureport
-- Reinstate legacy rule operator support
-- Add man pages
-- Auditd ignore most signals
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.4-5.1
-- bump again for double-long bug on ppc(64)
-
-* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-5
-- Change audit_log_semanage_message to check strlen as well as NULL.
-
-* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
-- Change audit_log_semanage_message to take new params.
-
-* Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1
-- Fix bug in autrace where it didn't run on kernels without file watch support
-- Add syslog message to auditd saying what program was started for dispatcher
-- Remove audit_send_user from public api
-- Fix bug in USER_LOGIN messages where ausearch does not translate
-  msg='uid=500: into acct name (#178102).
-- Change comm with dispatcher to socketpair from pipe
-- Change auditd to use custom daemonize to avoid race in init scripts
-- Update error message when deleting a rule that doesn't exist (#176239)
-- Call shutdown_dispatcher when auditd stops
-- Add new logging function audit_log_semanage_message
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan 5 2006 Steve Grubb <sgrubb at redhat.com> 1.1.3-1
-- Add timestamp to daemon_config messages (#174865)
-- Add error checking of year for aureport & ausearch
-- Treat af_unix sockets as files for searching and reporting
-- Update capp & lspp rules to combine syscalls for higher performance
-- Adjusted the chkconfig line for auditd to start a little earlier
-- Added skeleton program to docs for people to write their own dispatcher with
-- Apply patch from Ulrich Drepper that optimizes resource utilization
-- Change ausearch and aureport to unlocked IO
-
-* Thu Dec 5 2005 Steve Grubb <sgrubb at redhat.com> 1.1.2-1
-- Add more message types
-
-* Wed Nov 30 2005 Steve Grubb <sgrubb at redhat.com> 1.1.1-1
-- Add support for alpha processors
-- Update the audisp code
-- Add locale code in ausearch and aureport
-- Add new rule operator patch
-- Add exclude filter patch
-- Cleanup make files
-- Add python bindings
-
-* Wed Nov 9 2005 Steve Grubb <sgrubb at redhat.com> 1.1-1
-- Add initial version of audisp. Just a placeholder at this point
-- Remove -t from auditctl
-
-* Mon Nov 7 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-1
-- Add 2 more summary reports
-- Add 2 more message types
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	2 Sep 2007 16:49:22 -0000	1.102
+++ sources	25 Sep 2007 15:56:34 -0000	1.103
@@ -1 +1 @@
-ce393ed76e25dd95f2d54ae27e7a25be  audit-1.6.1.tar.gz
+a95dbfa22e65669e4449f3accbe84aef  audit-1.6.2.tar.gz


--- audit-1.6.1-event-host.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 15:57:14 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 11:57:14 -0400
Subject: rpms/python-fedora/devel python-fedora.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709251557.l8PFvEMe019724@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	.cvsignore sources 
Added Files:
	python-fedora.spec 
Log Message:
* Initial import of reviewed python-fedora.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.18
Release:        3%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 15:56:41 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 15:56:41 -0000	1.2
@@ -0,0 +1 @@
+b0021a9eff35c4dd6c87f1da8e364ca0  python-fedora-0.2.90.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:09:37 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 25 Sep 2007 12:09:37 -0400
Subject: rpms/gcc/devel gcc41-artificial-attrib.patch, NONE,
	1.1 gcc41-error-attrib.patch, NONE, 1.1 gcc41-jdwp.patch, NONE,
	1.1 gcc41-pr20880.patch, NONE, 1.1 gcc41-pr32694.patch, NONE,
	1.1 .cvsignore, 1.212, 1.213 gcc41-pr28755.patch, 1.1,
	1.2 gcc41.spec, 1.176, 1.177 sources, 1.214,
	1.215 gcc41-builtin-chk-anticipated.patch, 1.1,
	NONE gcc41-builtin-throw.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack-len.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack.patch, 1.2,
	NONE gcc41-c++-gnu_inline.patch, 1.1,
	NONE gcc41-makeinfo-ver.patch, 1.4,
	NONE gcc41-ppc-sync-qihi.patch, 1.1, NONE gcc41-ppc-tramp.patch,
	1.1, NONE gcc41-pr22244.patch, 1.1, NONE gcc41-pr27954.patch,
	1.1, NONE gcc41-pr32678.patch, 1.1, NONE gcc41-pr32912.patch,
	1.2, NONE gcc41-pr33423.patch, 1.1, NONE gcc41-rh253102.patch,
	1.1, NONE gcc41-scanf-fmt-check.patch, 1.1,
	NONE gcc41-sparc-niagara.patch, 1.1, NONE
Message-ID: <200709251609.l8PG9bvd026385@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26325

Modified Files:
	.cvsignore gcc41-pr28755.patch gcc41.spec sources 
Added Files:
	gcc41-artificial-attrib.patch gcc41-error-attrib.patch 
	gcc41-jdwp.patch gcc41-pr20880.patch gcc41-pr32694.patch 
Removed Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack-len.patch 
	gcc41-builtin-va-arg-pack.patch gcc41-c++-gnu_inline.patch 
	gcc41-makeinfo-ver.patch gcc41-ppc-sync-qihi.patch 
	gcc41-ppc-tramp.patch gcc41-pr22244.patch gcc41-pr27954.patch 
	gcc41-pr32678.patch gcc41-pr32912.patch gcc41-pr33423.patch 
	gcc41-rh253102.patch gcc41-scanf-fmt-check.patch 
	gcc41-sparc-niagara.patch 
Log Message:
4.1.2-28

gcc41-artificial-attrib.patch:

--- NEW FILE gcc41-artificial-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* tree.h (block_nonartificial_location): New prototype.
	* tree.c (block_nonartificial_location): New function.
	* dwarf2out.c (gen_subprogram_die): Add DW_AT_artificial
	if artificial attribute is present on abstract inline decl.
	* c-common.c (handle_artificial_attribute): New function.
	(c_common_attribute_table): Add artificial attribute.
	* final.c (override_filename, override_linenum): New variables.
	(final_scan_insn): For DBX_DEBUG or SDB_DEBUG, set override_filename
	and override_linenum if inside of a block inlined from
	__attribute__((__artificial__)) function.
	(notice_source_line): Honor override_filename and override_linenum.
	* doc/extend.texi: Document __attribute__((__artificial__)).
	* config/i386/emmintrin.h: Add __artificial__ attribute to
	all __always_inline__ functions.
	* config/i386/mmintrin.h: Likewise.
	* config/i386/mm3dnow.h: Likewise.
	* config/i386/pmmintrin.h: Likewise.
	* config/i386/ammintrin.h: Likewise.
	* config/i386/xmmintrin.h: Likewise.

--- gcc/doc/extend.texi.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:04:15.000000000 +0200
@@ -1589,7 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline} and @code{externally_visible}.  Several other
+ at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
+Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1671,6 +1672,14 @@ In C++, this attribute does not depend o
 but it still requires the @code{inline} keyword to enable its special
 behavior.
 
+ at cindex @code{artificial} function attribute
+ at item artificial
+This attribute is useful for small inline wrappers which if possible
+should appear during debugging as a unit, depending on the debug
+info format it will either mean marking the function as artificial
+or using the caller location for all instructions within the inlined
+body.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/tree.c.jj	2007-04-03 13:18:26.000000000 +0200
+++ gcc/tree.c	2007-09-25 15:01:49.000000000 +0200
@@ -7638,4 +7638,40 @@ empty_body_p (tree stmt)
   return true;
 }
 
+/* If BLOCK is inlined from an __attribute__((__artificial__))
+   routine, return pointer to location from where it has been
+   called.  */
+location_t *
+block_nonartificial_location (tree block)
+{
+  location_t *ret = NULL;
+
+  while (block && TREE_CODE (block) == BLOCK
+	 && BLOCK_ABSTRACT_ORIGIN (block))
+    {
+      tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+	ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+      if (TREE_CODE (ao) == FUNCTION_DECL)
+	{
+	  /* If AO is an artificial inline, point RET to the
+	     call site locus at which it has been inlined and continue
+	     the loop, in case AO's caller is also an artificial
+	     inline.  */
+	  if (DECL_DECLARED_INLINE_P (ao)
+	      && lookup_attribute ("artificial", DECL_ATTRIBUTES (ao)))
+	    ret = &BLOCK_SOURCE_LOCATION (block);
+	  else
+	    break;
+	}
+      else if (TREE_CODE (ao) != BLOCK)
+	break;
+
+      block = BLOCK_SUPERCONTEXT (block);
+    }
+  return ret;
+}
+
 #include "gt-tree.h"
--- gcc/tree.h.jj	2007-09-25 12:20:12.000000000 +0200
+++ gcc/tree.h	2007-09-25 15:02:37.000000000 +0200
@@ -4270,6 +4270,8 @@ extern tree build_addr (tree, tree);
 extern bool fields_compatible_p (tree, tree);
 extern tree find_compatible_field (tree, tree);
 
+extern location_t *block_nonartificial_location (tree);
+
 /* In function.c */
 extern void expand_main_function (void);
 extern void init_dummy_function_start (void);
--- gcc/final.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/final.c	2007-09-25 15:01:49.000000000 +0200
@@ -141,6 +141,10 @@ static int high_function_linenum;
 /* Filename of last NOTE.  */
 static const char *last_filename;
 
+/* Override filename and line number.  */
+static const char *override_filename;
+static int override_linenum;
+
 /* Whether to force emission of a line note before the next insn.  */
 static bool force_source_line = false;
   
@@ -1822,6 +1826,18 @@ final_scan_insn (rtx insn, FILE *file, i
 	      /* Mark this block as output.  */
 	      TREE_ASM_WRITTEN (NOTE_BLOCK (insn)) = 1;
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      location_t *locus_ptr
+		= block_nonartificial_location (NOTE_BLOCK (insn));
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_BLOCK_END:
@@ -1841,6 +1857,24 @@ final_scan_insn (rtx insn, FILE *file, i
 
 	      (*debug_hooks->end_block) (high_block_linenum, n);
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      tree outer_block = BLOCK_SUPERCONTEXT (NOTE_BLOCK (insn));
+	      location_t *locus_ptr
+		= block_nonartificial_location (outer_block);
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	      else
+		{
+		  override_filename = NULL;
+		  override_linenum = 0;
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_DELETED_LABEL:
@@ -2521,8 +2555,19 @@ final_scan_insn (rtx insn, FILE *file, i
 static bool
 notice_source_line (rtx insn)
 {
-  const char *filename = insn_file (insn);
-  int linenum = insn_line (insn);
+  const char *filename;
+  int linenum;
+
+  if (override_filename)
+    {
+      filename = override_filename;
+      linenum = override_linenum;
+    }
+  else
+    {
+      filename = insn_file (insn);
+      linenum = insn_line (insn);
+    }
 
   if (filename
       && (force_source_line
--- gcc/dwarf2out.c.jj	2007-04-03 13:13:27.000000000 +0200
+++ gcc/dwarf2out.c	2007-09-25 15:01:49.000000000 +0200
@@ -11667,6 +11667,10 @@ gen_subprogram_die (tree decl, dw_die_re
             add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_not_inlined);
 	}
 
+      if (DECL_DECLARED_INLINE_P (decl)
+	  && lookup_attribute ("artificial", DECL_ATTRIBUTES (decl)))
+	add_AT_flag (subr_die, DW_AT_artificial, 1);
+
       equate_decl_number_to_die (decl, subr_die);
     }
   else if (!DECL_EXTERNAL (decl))
--- gcc/c-common.c.jj	2007-03-27 15:40:15.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:01:49.000000000 +0200
@@ -505,8 +505,8 @@ static tree handle_noreturn_attribute (t
 static tree handle_noinline_attribute (tree *, tree, tree, int, bool *);
[...3799 lines suppressed...]
   return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__A, (__v4si)__B);
 }
 
 #if 0
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_extract_epi16 (__m128i const __A, int const __N)
 {
   return __builtin_ia32_vec_ext_v8hi ((__v8hi)__A, __N);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_insert_epi16 (__m128i const __A, int const __D, int const __N)
 {
   return (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)__A, __D, __N);
@@ -1341,37 +1341,37 @@ _mm_insert_epi16 (__m128i const __A, int
   ((__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)(A), (D), (N)))
 #endif
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_movemask_epi8 (__m128i __A)
 {
   return __builtin_ia32_pmovmskb128 ((__v16qi)__A);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_mulhi_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmulhuw128 ((__v8hi)__A, (__v8hi)__B);
@@ -1381,67 +1381,67 @@ _mm_mulhi_epu16 (__m128i __A, __m128i __
 #define _mm_shufflelo_epi16(__A, __B) ((__m128i)__builtin_ia32_pshuflw ((__v8hi)__A, __B))
 #define _mm_shuffle_epi32(__A, __B) ((__m128i)__builtin_ia32_pshufd ((__v4si)__A, __B))
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_maskmoveu_si128 (__m128i __A, __m128i __B, char *__C)
 {
   __builtin_ia32_maskmovdqu ((__v16qi)__A, (__v16qi)__B, __C);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgb128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_sad_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_psadbw128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si32 (int *__A, int __B)
 {
   __builtin_ia32_movnti (__A, __B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si128 (__m128i *__A, __m128i __B)
 {
   __builtin_ia32_movntdq ((__v2di *)__A, (__v2di)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_pd (double *__A, __m128d __B)
 {
   __builtin_ia32_movntpd (__A, (__v2df)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_clflush (void const *__A)
 {
   __builtin_ia32_clflush (__A);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_lfence (void)
 {
   __builtin_ia32_lfence ();
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_mfence (void)
 {
   __builtin_ia32_mfence ();
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi32_si128 (int __A)
 {
   return _mm_set_epi32 (0, 0, 0, __A);
@@ -1449,14 +1449,14 @@ _mm_cvtsi32_si128 (int __A)
 
 #ifdef __x86_64__
 /* Intel intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
 }
 
 /* Microsoft intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64x_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
@@ -1465,37 +1465,37 @@ _mm_cvtsi64x_si128 (long long __A)
 
 /* Casts between various SP, DP, INT vector types.  Note that these do no
    conversion of values, they just change the type.  */
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castpd_ps(__m128d __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castpd_si128(__m128d __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castps_pd(__m128 __A)
 {
   return (__m128d) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castps_si128(__m128 __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_ps(__m128i __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_pd(__m128i __A)
 {
   return (__m128d) __A;

gcc41-error-attrib.patch:

--- NEW FILE gcc41-error-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* expr.c (expand_expr_real_1) <case CALL_EXPR>: Use get_callee_fndecl
	instead of checking CALL_EXPR_FN directly to test for builtins.
	If error or warning attributes are present, print
	error resp. warning.
	* c-common.c (handle_error_attribute): New function.
	(c_common_attribute_table): Add error and warning
	attributes.
	* doc/extend.texi: Document error and warning attributes.

	* gcc.dg/va-arg-pack-len-1.c: Use error and warning
	attributes.
	* gcc.dg/va-arg-pack-len-2.c: New test.
	* g++.dg/ext/va-arg-pack-len-1.C: Use error and warning
	attributes.
	* g++.dg/ext/va-arg-pack-len-2.C: New test.

--- gcc/doc/extend.texi.jj	2007-09-25 15:04:15.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:32:22.000000000 +0200
@@ -1589,8 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
-Several other
+ at code{gnu_inline}, @code{externally_visible}, @code{artificial},
+ at code{error} and @code{warning}.  Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1688,6 +1688,30 @@ Whether the function itself is considere
 the current inlining parameters.  The @code{flatten} attribute only works
 reliably in unit-at-a-time mode.
 
+ at item error ("@var{message}")
+ at cindex @code{error} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, an error
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions where checking the inline function arguments is not
+possible through @code{extern char [(condition) ? 1 : -1];} tricks.
+While it is possible to leave the function undefined and thus invoke
+a link failure, when using this attribute the problem will be diagnosed
+earlier and with exact location of the call even in presence of inline
+functions or when not emitting debugging information.
+
+ at item warning ("@var{message}")
+ at cindex @code{warning} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, a warning
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions.  While it is possible to define the function with
+a message in @code{.gnu.warning*} section, when using this attribute the problem
+will be diagnosed earlier and with exact location of the call even in presence
+of inline functions or when not emitting debugging information.
+
 @item cdecl
 @cindex functions that do pop the argument stack on the 386
 @opindex mrtd
--- gcc/expr.c.jj	2007-09-25 14:58:40.000000000 +0200
+++ gcc/expr.c	2007-09-25 15:19:15.000000000 +0200
@@ -7513,19 +7513,31 @@ expand_expr_real_1 (tree exp, rtx target
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
 	error ("invalid use of %<__builtin_va_arg_pack ()%>");
-      /* Check for a built-in function.  */
-      if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
-	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == FUNCTION_DECL)
-	  && DECL_BUILT_IN (TREE_OPERAND (TREE_OPERAND (exp, 0), 0)))
-	{
-	  if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == BUILT_IN_FRONTEND)
-	    return lang_hooks.expand_expr (exp, original_target,
-					   tmode, modifier,
-					   alt_rtl);
-	  else
-	    return expand_builtin (exp, target, subtarget, tmode, ignore);
+      {
+	tree fndecl = get_callee_fndecl (exp), attr;
+
+	if (fndecl
+	    && (attr = lookup_attribute ("error",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  error ("call to %qs declared with attribute error: %s",
+		 lang_hooks.decl_printable_name (fndecl, 1),
+		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+	if (fndecl
+	    && (attr = lookup_attribute ("warning",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  warning (0, "call to %qs declared with attribute warning: %s",
+		   lang_hooks.decl_printable_name (fndecl, 1),
+		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+
+	/* Check for a built-in function.  */
+	if (fndecl && DECL_BUILT_IN (fndecl))
+	  {
+	    if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_FRONTEND)
+	      return lang_hooks.expand_expr (exp, original_target,
+					     tmode, modifier, alt_rtl);
+	    else
+	      return expand_builtin (exp, target, subtarget, tmode, ignore);
+	  }
 	}
 
       return expand_call (exp, target, ignore);
--- gcc/c-common.c.jj	2007-09-25 15:01:49.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:24:34.000000000 +0200
@@ -508,6 +508,7 @@ static tree handle_always_inline_attribu
 static tree handle_gnu_inline_attribute (tree *, tree, tree, int, bool *);
 static tree handle_artificial_attribute (tree *, tree, tree, int, bool *);
 static tree handle_flatten_attribute (tree *, tree, tree, int, bool *);
+static tree handle_error_attribute (tree *, tree, tree, int, bool *);
 static tree handle_used_attribute (tree *, tree, tree, int, bool *);
 static tree handle_unused_attribute (tree *, tree, tree, int, bool *);
 static tree handle_externally_visible_attribute (tree *, tree, tree, int,
@@ -641,6 +642,10 @@ const struct attribute_spec c_common_att
 			      handle_warn_unused_result_attribute },
   { "sentinel",               0, 1, false, true, true,
 			      handle_sentinel_attribute },
+  { "warning",		      1, 1, true,  false, false,
+			      handle_error_attribute },
+  { "error",		      1, 1, true,  false, false,
+			      handle_error_attribute },
   { NULL,                     0, 0, false, false, false, NULL }
 };
 
@@ -4226,6 +4231,26 @@ handle_flatten_attribute (tree *node, tr
   return NULL_TREE;
 }
 
+/* Handle a "warning" or "error" attribute; arguments as in
+   struct attribute_spec.handler.  */
+
+static tree
+handle_error_attribute (tree *node, tree name, tree args,
+			int ARG_UNUSED (flags), bool *no_add_attrs)
+{
+  if (TREE_CODE (*node) == FUNCTION_DECL
+      || TREE_CODE (TREE_VALUE (args)) == STRING_CST)
+    /* Do nothing else, just set the attribute.  We'll get at
+       it later with lookup_attribute.  */
+    ;
+  else
+    {
+      warning (OPT_Wattributes, "%qE attribute ignored", name);
+      *no_add_attrs = true;
+    }
+
+  return NULL_TREE;
+}
 
 /* Handle a "used" attribute; arguments as in
    struct attribute_spec.handler.  */
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern int warn_open_missing_mode (void);
-extern int warn_open_too_many_arguments (void);
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/gcc.dg/va-arg-pack-len-2.c.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-2.c	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	/* { dg-warning "called with more than 3" } */
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	/* { dg-error "needs 3 arguments, only 2 were given" } */
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern "C" int warn_open_missing_mode (void);
-extern "C" int warn_open_too_many_arguments (void);
+extern "C" int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern "C" int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern "C" void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	// { dg-warning "called with more than 3" }
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	// { dg-error "needs 3 arguments, only 2 were given" }
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}

gcc41-jdwp.patch:

--- NEW FILE gcc41-jdwp.patch ---
2007-09-24  Keith Seitz  <keiths at redhat.com>

	* include/jvm.h (struct natThread): Add new field 'frame'.
	* include/java-interp.h (_Jv_Frame): Use _Jv_ThreadStackPeek,
	_Jv_ThreadStackPop, and _Jv_ThreadStackPush instead of
	java.lang.Thread.frame.
	(~_Jv_Frame): Use _Jv_ThreadStackPop.
	* java/lang/natThread.cc (_Jv_ThreadStackPeek): New function.
	(_Jv_ThreadStackPush): New function.
	(_Jv_ThreadStackPop): New function.
	* java/lang/Thread.java (frame): Remove field to restore
	C++ ABI compatibility.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrames): Use
	_Jv_ThreadStackPeek.
	(getFrame): Likewise.
	* gnu/classpath/jdwp/natVMFrame.cc (getFrameDepth): Likewise.
	* jvmti.cc (getLocalFrame): Likewise.
	(_Jv_JVMTI_GetFrameCount): Likewise.
	(_Jv_JVMTI_GetThreadState): Likewise.
	(_Jv_JVMTI_GetStackTrace): Likewise.
	* interpret.cc (_Jv_ReportJVMTIExceptionThrow): Likewise.
	* headers.txt (java/lang/Thread.h): Prepend declarations
	for _Jv_ThreadStackPeek, _Jv_ThreadStackPush, and _Jv_ThreadStackPop.
	Add as friend functions.
	* jni.cc (_Jv_JNIMethod::call): Push a frame onto the stack when
	calling a JNI method.

--- libjava/interpret.cc	(revision 128603)
+++ libjava/interpret.cc	(working copy)
@@ -1709,7 +1709,7 @@
 _Jv_ReportJVMTIExceptionThrow (jthrowable ex)
 {
   jthread thread = ::java::lang::Thread::currentThread ();
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   jmethodID throw_meth = frame->self->get_method ();
   jlocation throw_loc = -1;
   if (frame->frame_type == frame_interpreter)
--- libjava/include/java-interp.h	(revision 128603)
+++ libjava/include/java-interp.h	(working copy)
@@ -391,14 +391,14 @@
   {
     self = s;
     frame_type = type;
-    next = (_Jv_Frame *) thr->frame;
-    thr->frame = (gnu::gcj::RawData *) this;
+    next = _Jv_ThreadStackPeek (thr);
+    _Jv_ThreadStackPush (thr, this);
     thread = thr;
   }
 
   ~_Jv_Frame ()
   {
-    thread->frame = (gnu::gcj::RawData *) next;
+    _Jv_ThreadStackPop (thread);
   }
 
   int depth ()
--- libjava/include/jvm.h	(revision 128603)
+++ libjava/include/jvm.h	(working copy)
@@ -34,6 +34,8 @@
 
 #include <sysdep/locks.h>
 
+class _Jv_Frame;
+
 /* Macro for possible unused arguments.  */
 #define MAYBE_UNUSED __attribute__((__unused__))
 
@@ -767,6 +769,12 @@
 
   // Each thread has its own JNI object.
   _Jv_JNIEnv *jni_env;
+
+  // Describes the topmost frame in the thread's composite
+  // (interp + JNI) stack. Added here to maintain C++ ABI
+  // compatibility with previous versions. Newer versions
+  // of gcj put this in java/lang/Thread.java.
+  _Jv_Frame *frame;
 };
 
 #endif /* __JAVA_JVM_H__ */
--- libjava/jni.cc	(revision 128603)
+++ libjava/jni.cc	(working copy)
@@ -2343,6 +2343,10 @@
   // Copy over passed-in arguments.
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
+  // Add a frame to the composite (interpreted + JNI) call stack
+  java::lang::Thread *thread = java::lang::Thread::currentThread ();
+  _Jv_NativeFrame nat_frame (_this, thread);
+
   // The actual call to the JNI function.
 #if FFI_NATIVE_RAW_API
   ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
--- libjava/jvmti.cc	(revision 128603)
+++ libjava/jvmti.cc	(working copy)
@@ -228,7 +228,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   
   for (int i = 0; i < depth; i++)
     {    
@@ -516,7 +516,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
    
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   (*frame_count) = frame->depth ();
   return JVMTI_ERROR_NONE;
 }
@@ -543,7 +543,7 @@
       if (thread->isInterrupted ())
 	state |= JVMTI_THREAD_STATE_INTERRUPTED;
 
-      _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+      _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
       if (frame != NULL && frame->frame_type == frame_native)
 	state |= JVMTI_THREAD_STATE_IN_NATIVE;
 
@@ -1273,7 +1273,7 @@
   ILLEGAL_ARGUMENT (start_depth >= (*frame_count));
   ILLEGAL_ARGUMENT (start_depth < (-(*frame_count)));
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
 
   // If start_depth is negative use this to determine at what depth to start
   // the trace by adding it to the length of the call stack.  This allows the
--- libjava/headers.txt	(revision 128603)
+++ libjava/headers.txt	(working copy)
@@ -6,6 +6,7 @@
 
 class java/lang/Thread
 prepend class _Jv_JNIEnv;
+prepend class _Jv_Frame;
 prepend #define _JV_NOT_OWNER 1
 prepend #define _JV_INTERRUPTED 2
 prepend _Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();
@@ -17,6 +18,9 @@
 prepend jint _Jv_DetachCurrentThread ();
 prepend struct _Jv_Thread_t;
 prepend _Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);
+prepend _Jv_Frame *_Jv_ThreadStackPeek (java::lang::Thread *thread);
+prepend void _Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+prepend void _Jv_ThreadStackPop (java::lang::Thread *thread);
 friend _Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();
 friend void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
 friend void ::_Jv_ThreadRun (java::lang::Thread* thread);
@@ -24,6 +28,9 @@
 friend java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
 friend java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
 friend jint (::_Jv_DetachCurrentThread) ();
+friend _Jv_Frame *::_Jv_ThreadStackPeek (java::lang::Thread *thread);
+friend void ::_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+friend void ::_Jv_ThreadStackPop (java::lang::Thread *thread);
 
 class java/lang/String
 prepend jchar* _Jv_GetStringChars (jstring str);
--- libjava/gnu/classpath/jdwp/natVMFrame.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMFrame.cc	(working copy)
@@ -181,7 +181,7 @@
 getFrameDepth (_Jv_Frame *frame)
 {
   jint depth = 0;
-  _Jv_Frame *top_frame = (_Jv_Frame *) frame->thread->frame;
+  _Jv_Frame *top_frame = _Jv_ThreadStackPeek (frame->thread);
   jint num_frames = VMVirtualMachine::getFrameCount (frame->thread);
   
   while (frame != top_frame)
--- libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(working copy)
@@ -553,7 +553,7 @@
      
   frame_list = new ::java::util::ArrayList (num_frames);
   
-  _Jv_Frame *vm_frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   
   // Take start frames off the top of the stack
   while (vm_frame != NULL && start > 0)
@@ -584,7 +584,7 @@
 {
   using namespace gnu::classpath::jdwp::exception;
   
-  _Jv_Frame *vm_frame = (_Jv_Frame *) thread->frame;
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   jint depth = 0;
   _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (frameID); 
   
--- libjava/java/lang/Thread.java	(revision 128603)
+++ libjava/java/lang/Thread.java	(working copy)
@@ -186,9 +186,6 @@
   // This describes the top-most interpreter frame for this thread.
   RawData interp_frame;
   
-  // This describes the top most frame in the composite (interp + JNI) stack
-  RawData frame;
-
   // Current state.
   volatile int state;
 
--- libjava/java/lang/natThread.cc	(revision 128603)
+++ libjava/java/lang/natThread.cc	(working copy)
@@ -15,6 +15,7 @@
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-threads.h>
+#include <java-interp.h>
 
 #include <gnu/gcj/RawDataManaged.h>
 #include <java/lang/Thread.h>
@@ -525,3 +526,25 @@
 
   return 0;
 }
+
+_Jv_Frame *
+_Jv_ThreadStackPeek (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  return nt->frame;
+}
+
+void
+_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  nt->frame = frame;
+}
+
+void
+_Jv_ThreadStackPop (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  _Jv_Frame *next = nt->frame->next;
+  nt->frame = next;
+}

gcc41-pr20880.patch:

--- NEW FILE gcc41-pr20880.patch ---
2006-11-24  Paul Thomas  <pault at gcc.gnu.org>

	PR fortran/20880
	* parse.c (parse_interface): Error if procedure name is that of
	encompassing scope.

	* gfortran.dg/interface_3a.f90: New test.

--- gcc/fortran/parse.c	(revision 119172)
+++ gcc/fortran/parse.c	(revision 119173)
@@ -1694,6 +1694,7 @@ parse_interface (void)
   gfc_interface_info save;
   gfc_state_data s1, s2;
   gfc_statement st;
+  locus proc_locus;
 
   accept_statement (ST_INTERFACE);
 
@@ -1781,6 +1782,7 @@ loop:
   accept_statement (st);
   prog_unit = gfc_new_block;
   prog_unit->formal_ns = gfc_current_ns;
+  proc_locus = gfc_current_locus;
 
 decl:
   /* Read data declaration statements.  */
@@ -1796,8 +1798,15 @@ decl:
 
   current_interface = save;
   gfc_add_interface (prog_unit);
-
   pop_state ();
+
+  if (current_interface.ns
+	&& current_interface.ns->proc_name
+	&& strcmp (current_interface.ns->proc_name->name,
+		   prog_unit->name) == 0)
+    gfc_error ("INTERFACE procedure '%s' at %L has the same name as the "
+	       "enclosing procedure", prog_unit->name, &proc_locus);
+
   goto loop;
 
 done:
--- gcc/testsuite/gfortran.dg/interface_3a.f90
+++ gcc/testsuite/gfortran.dg/interface_3a.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! Contributed by Joost VandeVondele  <jv244 at cam.ac.uk>
+!
+! This was found whilst investigating => segfault
+subroutine thy_sub (a)
+  interface 
+    subroutine thy_sub (a) ! { dg-error "enclosing procedure" }
+      real a
+    end subroutine
+  end interface
+  real a
+  print *, a
+end subroutine

gcc41-pr32694.patch:

--- NEW FILE gcc41-pr32694.patch ---
2007-09-25  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/32694
	2006-11-08  Roger Sayle  <roger at eyesopen.com>
	* tree-ssa-propagate.c (set_rhs): Verify tcc_comparison the same way
	as tcc_binary.

	* gcc.c-torture/compile/20070925-1.c: New test.

--- gcc/tree-ssa-propagate.c.jj	2007-09-23 19:43:36.000000000 +0200
+++ gcc/tree-ssa-propagate.c	2007-09-25 09:30:50.000000000 +0200
@@ -570,7 +570,8 @@ set_rhs (tree *stmt_p, tree expr)
   ssa_op_iter iter;
 
   /* Verify the constant folded result is valid gimple.  */
-  if (TREE_CODE_CLASS (code) == tcc_binary)
+  if (TREE_CODE_CLASS (code) == tcc_binary
+      || TREE_CODE_CLASS (code) == tcc_comparison)
     {
       if (!is_gimple_val (TREE_OPERAND (expr, 0))
 	  || !is_gimple_val (TREE_OPERAND (expr, 1)))
--- gcc/testsuite/gcc.c-torture/compile/20070925-1.c.jj	2007-09-25 09:28:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070925-1.c	2007-09-25 09:29:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* PR tree-optimization/32694 */
+
+typedef signed long long int WordS64;
+typedef unsigned long long int Word64;
+
+int
+foo (Word64 * p)
+{
+  while (1)
+    {
+      WordS64 c = 0x1llu;
+      WordS64 x = *p;
+      if (c >= 0)
+	{
+	  if (x > (WordS64) 0x7FFFFFFFFFFFFFFFll - c)
+	    return 6;
+	}
+      else if (x < (WordS64) 0x8000000000000000ll - c)
+	return 7;
+      p++;
+    }
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- .cvsignore	21 Aug 2007 19:33:58 -0000	1.212
+++ .cvsignore	25 Sep 2007 16:09:05 -0000	1.213
@@ -1 +1 @@
-gcc-4.1.2-20070821.tar.bz2
+gcc-4.1.2-20070925.tar.bz2

gcc41-pr28755.patch:

Index: gcc41-pr28755.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-pr28755.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr28755.patch	18 Aug 2006 07:38:36 -0000	1.1
+++ gcc41-pr28755.patch	25 Sep 2007 16:09:05 -0000	1.2
@@ -1,44 +1,210 @@
-2006-08-17  Jakub Jelinek  <jakub at redhat.com>
+2007-09-23  Jakub Jelinek  <jakub at redhat.com>
 
 	PR middle-end/28755
-	* expr.c (expand_expr_real_1) <case ARRAY_REF>: Make sure
-	the const array field optimization doesn't create an extra constant
-	MEM.
+	* expr.c (expand_constructor): New function.
+	(expand_expr_real_1) <case CONSTRUCTOR>: Call it.
+	(expand_expr_real_1) <case ARRAY_REF>: Call it if VALUE is
+	CONSTRUCTOR.
 
 	* gcc.dg/pr28755.c: New test.
 
---- gcc/expr.c.jj	2006-08-09 17:54:03.000000000 +0200
-+++ gcc/expr.c	2006-08-17 13:00:33.000000000 +0200
-@@ -7105,13 +7105,25 @@ expand_expr_real_1 (tree exp, rtx target
+--- gcc/expr.c	(revision 128684)
++++ gcc/expr.c	(revision 128685)
+@@ -6435,6 +6435,89 @@ expand_expr_addr_expr (tree exp, rtx tar
+   return result;
+ }
+ 
++/* Generate code for computing CONSTRUCTOR EXP.
++   An rtx for the computed value is returned.  If AVOID_TEMP_MEM
++   is TRUE, instead of creating a temporary variable in memory
++   NULL is returned and the caller needs to handle it differently.  */
++
++static rtx
++expand_constructor (tree exp, rtx target, enum expand_modifier modifier,
++		    bool avoid_temp_mem)
++{
++  tree type = TREE_TYPE (exp);
++  enum machine_mode mode = TYPE_MODE (type);
++
++  /* Try to avoid creating a temporary at all.  This is possible
++     if all of the initializer is zero.
++     FIXME: try to handle all [0..255] initializers we can handle
++     with memset.  */
++  if (TREE_STATIC (exp)
++      && !TREE_ADDRESSABLE (exp)
++      && target != 0 && mode == BLKmode
++      && all_zeros_p (exp))
++    {
++      clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL);
++      return target;
++    }
++
++  /* All elts simple constants => refer to a constant in memory.  But
++     if this is a non-BLKmode mode, let it store a field at a time
++     since that should make a CONST_INT or CONST_DOUBLE when we
++     fold.  Likewise, if we have a target we can use, it is best to
++     store directly into the target unless the type is large enough
++     that memcpy will be used.  If we are making an initializer and
++     all operands are constant, put it in memory as well.
++
++     FIXME: Avoid trying to fill vector constructors piece-meal.
++     Output them with output_constant_def below unless we're sure
++     they're zeros.  This should go away when vector initializers
++     are treated like VECTOR_CST instead of arrays.  */
++  if ((TREE_STATIC (exp)
++       && ((mode == BLKmode
++	    && ! (target != 0 && safe_from_p (target, exp, 1)))
++		  || TREE_ADDRESSABLE (exp)
++		  || (host_integerp (TYPE_SIZE_UNIT (type), 1)
++		      && (! MOVE_BY_PIECES_P
++				     (tree_low_cst (TYPE_SIZE_UNIT (type), 1),
++				      TYPE_ALIGN (type)))
++		      && ! mostly_zeros_p (exp))))
++      || ((modifier == EXPAND_INITIALIZER || modifier == EXPAND_CONST_ADDRESS)
++	  && TREE_CONSTANT (exp)))
++    {
++      rtx constructor;
++
++      if (avoid_temp_mem)
++	return NULL_RTX;
++
++      constructor = output_constant_def (exp, 1);
++
++      if (modifier != EXPAND_CONST_ADDRESS
++	  && modifier != EXPAND_INITIALIZER
++	  && modifier != EXPAND_SUM)
++	constructor = validize_mem (constructor);
++
++      return constructor;
++    }
++
++  /* Handle calls that pass values in multiple non-contiguous
++     locations.  The Irix 6 ABI has examples of this.  */
++  if (target == 0 || ! safe_from_p (target, exp, 1)
++      || GET_CODE (target) == PARALLEL || modifier == EXPAND_STACK_PARM)
++    {
++      if (avoid_temp_mem)
++	return NULL_RTX;
++
++      target
++	= assign_temp (build_qualified_type (type, (TYPE_QUALS (type)
++						    | (TREE_READONLY (exp)
++						       * TYPE_QUAL_CONST))),
++		       0, TREE_ADDRESSABLE (exp), 1);
++    }
++
++  store_constructor (exp, target, 0, int_expr_size (exp));
++  return target;
++}
++
+ 
+ /* expand_expr: generate code for computing expression EXP.
+    An rtx for the computed value is returned.  The value is never null.
+@@ -6899,71 +6982,7 @@ expand_expr_real_1 (tree exp, rtx target
+ 	  return const0_rtx;
+ 	}
+ 
+-      /* Try to avoid creating a temporary at all.  This is possible
+-	 if all of the initializer is zero.
+-	 FIXME: try to handle all [0..255] initializers we can handle
+-	 with memset.  */
+-      else if (TREE_STATIC (exp)
+-	       && !TREE_ADDRESSABLE (exp)
+-	       && target != 0 && mode == BLKmode
+-	       && all_zeros_p (exp))
+-	{
+-	  clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL);
+-	  return target;
+-	}
+-
+-      /* All elts simple constants => refer to a constant in memory.  But
+-	 if this is a non-BLKmode mode, let it store a field at a time
+-	 since that should make a CONST_INT or CONST_DOUBLE when we
+-	 fold.  Likewise, if we have a target we can use, it is best to
+-	 store directly into the target unless the type is large enough
+-	 that memcpy will be used.  If we are making an initializer and
+-	 all operands are constant, put it in memory as well.
+-
+-	FIXME: Avoid trying to fill vector constructors piece-meal.
+-	Output them with output_constant_def below unless we're sure
+-	they're zeros.  This should go away when vector initializers
+-	are treated like VECTOR_CST instead of arrays.
+-      */
+-      else if ((TREE_STATIC (exp)
+-		&& ((mode == BLKmode
+-		     && ! (target != 0 && safe_from_p (target, exp, 1)))
+-		    || TREE_ADDRESSABLE (exp)
+-		    || (host_integerp (TYPE_SIZE_UNIT (type), 1)
+-			&& (! MOVE_BY_PIECES_P
+-			    (tree_low_cst (TYPE_SIZE_UNIT (type), 1),
+-			     TYPE_ALIGN (type)))
+-			&& ! mostly_zeros_p (exp))))
+-	       || ((modifier == EXPAND_INITIALIZER
+-		    || modifier == EXPAND_CONST_ADDRESS)
+-		   && TREE_CONSTANT (exp)))
+-	{
+-	  rtx constructor = output_constant_def (exp, 1);
+-
+-	  if (modifier != EXPAND_CONST_ADDRESS
+-	      && modifier != EXPAND_INITIALIZER
+-	      && modifier != EXPAND_SUM)
+-	    constructor = validize_mem (constructor);
+-
+-	  return constructor;
+-	}
+-      else
+-	{
+-	  /* Handle calls that pass values in multiple non-contiguous
+-	     locations.  The Irix 6 ABI has examples of this.  */
+-	  if (target == 0 || ! safe_from_p (target, exp, 1)
+-	      || GET_CODE (target) == PARALLEL
+-	      || modifier == EXPAND_STACK_PARM)
+-	    target
+-	      = assign_temp (build_qualified_type (type,
+-						   (TYPE_QUALS (type)
+-						    | (TREE_READONLY (exp)
+-						       * TYPE_QUAL_CONST))),
+-			     0, TREE_ADDRESSABLE (exp), 1);
+-
+-	  store_constructor (exp, target, 0, int_expr_size (exp));
+-	  return target;
+-	}
++      return expand_constructor (exp, target, modifier, false);
+ 
+     case MISALIGNED_INDIRECT_REF:
+     case ALIGN_INDIRECT_REF:
+@@ -7105,10 +7124,25 @@ expand_expr_real_1 (tree exp, rtx target
  					      field, value)
  		      if (tree_int_cst_equal (field, index))
  			{
 -			  if (!TREE_SIDE_EFFECTS (value))
+-			    return expand_expr (fold (value), target, tmode,
+-						modifier);
+-			  break;
 +			  if (TREE_SIDE_EFFECTS (value))
 +			    break;
 +
-+			  if (TREE_CODE (value) != CONSTRUCTOR)
- 			    return expand_expr (fold (value), target, tmode,
- 						modifier);
-+
-+			  /* For CONSTRUCTOR this optimization is not always
-+			     a win - if expand_expr creates a temporary
-+			     constant, we just waste unnecessarily rodata
-+			     space.  */
-+			  temp = expand_expr (value, target, tmode, modifier);
-+			  if (temp == target
-+			      || (temp && GET_CODE (temp) != MEM))
-+			    return temp;
- 			  break;
++			  if (TREE_CODE (value) == CONSTRUCTOR)
++			    {
++			      /* If VALUE is a CONSTRUCTOR, this
++				 optimization is only useful if
++				 this doesn't store the CONSTRUCTOR
++				 into memory.  If it does, it is more
++				 efficient to just load the data from
++				 the array directly.  */
++			      rtx ret = expand_constructor (value, target,
++							    modifier, true);
++			      if (ret == NULL_RTX)
++				break;
++			    }
++
++			  return expand_expr (fold (value), target, tmode,
++					      modifier);
  			}
  		  }
--		else if(TREE_CODE (init) == STRING_CST)
-+		else if (TREE_CODE (init) == STRING_CST)
- 		  {
- 		    tree index1 = index;
- 		    tree low_bound = array_ref_low_bound (exp);
---- gcc/testsuite/gcc.dg/pr28755.c.jj	2006-08-17 12:59:57.000000000 +0200
-+++ gcc/testsuite/gcc.dg/pr28755.c	2006-08-17 12:59:57.000000000 +0200
+ 		else if(TREE_CODE (init) == STRING_CST)
+--- gcc/testsuite/gcc.dg/pr28755.c	(revision 0)
++++ gcc/testsuite/gcc.dg/pr28755.c	(revision 128685)
 @@ -0,0 +1,22 @@
 +/* PR middle-end/28755 */
 +/* { dg-do compile } */


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gcc41.spec	22 Sep 2007 12:45:46 -0000	1.176
+++ gcc41.spec	25 Sep 2007 16:09:05 -0000	1.177
@@ -1,6 +1,6 @@
-%define DATE 20070821
+%define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 26
+%define gcc_release 28
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -138,24 +138,13 @@
 Patch22: gcc41-build-id.patch
 Patch23: gcc41-pr28690.patch
 Patch24: gcc41-rh247256.patch
-Patch25: gcc41-pr22244.patch
-Patch26: gcc41-pr32678.patch
-Patch27: gcc41-pr32912.patch
-Patch28: gcc41-sparc-niagara.patch
-Patch29: gcc41-ppc-tramp.patch
-Patch30: gcc41-rh253102.patch
-Patch31: gcc41-c++-gnu_inline.patch
-Patch32: gcc41-ppc-sync-qihi.patch
-Patch33: gcc41-ppc64-ia64-GNU-stack.patch
-Patch34: gcc41-builtin-chk-anticipated.patch
-Patch35: gcc41-builtin-throw.patch
-Patch36: gcc41-builtin-va-arg-pack.patch
-Patch37: gcc41-builtin-va-arg-pack-len.patch
-Patch38: gcc41-pr27954.patch
-Patch39: gcc41-pr33423.patch
-Patch40: gcc41-scanf-fmt-check.patch
-Patch41: gcc41-pr33506.patch
-Patch42: gcc41-makeinfo-ver.patch
+Patch25: gcc41-ppc64-ia64-GNU-stack.patch
+Patch26: gcc41-pr33506.patch
+Patch27: gcc41-artificial-attrib.patch
+Patch28: gcc41-error-attrib.patch
+Patch29: gcc41-jdwp.patch
+Patch30: gcc41-pr20880.patch
+Patch31: gcc41-pr32694.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -463,24 +452,13 @@
 %patch22 -p0 -b .build-id~
 %patch23 -p0 -b .pr28690~
 %patch24 -p0 -b .rh247256~
-%patch25 -p0 -b .pr22244~
-%patch26 -p0 -b .pr32678~
-%patch27 -p0 -b .pr32912~
-%patch28 -p0 -b .sparc-niagara~
-%patch29 -p0 -b .ppc-tramp~
-%patch30 -p0 -b .rh253102~
-%patch31 -p0 -b .c++-gnu_inline~
-%patch32 -p0 -b .ppc-sync-qihi~
-%patch33 -p0 -b .ppc64-ia64-GNU-stack~
-%patch34 -p0 -b .builtin-chk-anticipated~
-%patch35 -p0 -b .builtin-throw~
-%patch36 -p0 -b .builtin-va-arg-pack~
-%patch37 -p0 -b .builtin-va-arg-pack-len~
-%patch38 -p0 -b .pr27954~
-%patch39 -p0 -b .pr33423~
-%patch40 -p0 -b .scanf-fmt-check~
-%patch41 -p0 -b .pr33506~
-%patch42 -p0 -b .makeinfo-ver~
+%patch25 -p0 -b .ppc64-ia64-GNU-stack~
+%patch26 -p0 -b .pr33506~
+%patch27 -p0 -b .artificial-attrib~
+%patch28 -p0 -b .error-attrib~
+%patch29 -p0 -b .jdwp~
+%patch30 -p0 -b .pr20880~
+%patch31 -p0 -b .pr32694~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1635,6 +1613,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-28
+- update from gcc-4_1-branch (-r127672:128736)
+  - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,
+	tree-optimization/33142
+- add support for artificial, error and warning attributes
+- restore Java CNI ABI compatibility broken by JDWP changes (Keith Seitz)
+- fix ICE with set_rhs allowing non-gimple (Roger Sayle, #247407,
+  PR tree-optimization/32694)
+- fix ICE on Fortran interface-body declaring current subroutine name
+  (Paul Thomas, #300851, PR fortran/20880)
+
 * Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
 - don't ignore throw specification of function types in type hashing
   (PR c++/33506)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- sources	21 Aug 2007 19:33:58 -0000	1.214
+++ sources	25 Sep 2007 16:09:05 -0000	1.215
@@ -1 +1 @@
-65778706d6b9c029a06fca968a45ab7f  gcc-4.1.2-20070821.tar.bz2
+562ab2446c60a9145da385ac56cf7715  gcc-4.1.2-20070925.tar.bz2


--- gcc41-builtin-chk-anticipated.patch DELETED ---


--- gcc41-builtin-throw.patch DELETED ---


--- gcc41-builtin-va-arg-pack-len.patch DELETED ---


--- gcc41-builtin-va-arg-pack.patch DELETED ---


--- gcc41-c++-gnu_inline.patch DELETED ---


--- gcc41-makeinfo-ver.patch DELETED ---


--- gcc41-ppc-sync-qihi.patch DELETED ---


--- gcc41-ppc-tramp.patch DELETED ---


--- gcc41-pr22244.patch DELETED ---


--- gcc41-pr27954.patch DELETED ---


--- gcc41-pr32678.patch DELETED ---


--- gcc41-pr32912.patch DELETED ---


--- gcc41-pr33423.patch DELETED ---


--- gcc41-rh253102.patch DELETED ---


--- gcc41-scanf-fmt-check.patch DELETED ---


--- gcc41-sparc-niagara.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 16:09:54 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 25 Sep 2007 12:09:54 -0400
Subject: rpms/cvsweb/EL-4 cvsweb.spec,1.7,1.8
Message-ID: <200709251609.l8PG9s4Z026388@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cvsweb/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26253

Modified Files:
	cvsweb.spec 
Log Message:
Plague, plague, plague! Hopefully the problem is fixed and my build will be successful.



Index: cvsweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsweb/EL-4/cvsweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsweb.spec	20 Aug 2007 19:59:43 -0000	1.7
+++ cvsweb.spec	25 Sep 2007 16:09:20 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           cvsweb
 Version:        3.0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Web interface for CVS repositories
 
@@ -59,7 +59,7 @@
 
 
 %changelog
-* Sat Aug 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0:3.0.5-2
+* Sat Aug 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0:3.0.5-5
 - Rebuild
 
 * Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.0.5-1



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:50 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:50 -0700
Subject: [pkgdb] optipng: scop has requested watchbugzilla
Message-ID: <200709251615.l8PGFtQM012107@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:51 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:51 -0700
Subject: [pkgdb] optipng: scop has requested commit
Message-ID: <200709251615.l8PGFu5M012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:56 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:56 -0700
Subject: [pkgdb] optipng: scop has requested watchbugzilla
Message-ID: <200709251615.l8PGFu5P012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:58 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:58 -0700
Subject: [pkgdb] optipng: scop has requested watchcommits
Message-ID: <200709251615.l8PGFtQP012107@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:59 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:59 -0700
Subject: [pkgdb] optipng: scop has requested commit
Message-ID: <200709251615.l8PGFu5S012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:20:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 25 Sep 2007 12:20:08 -0400
Subject: comps comps-f8.xml.in,1.121,1.122
Message-ID: <200709251620.l8PGK8ah026654@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26595

Modified Files:
	comps-f8.xml.in 
Log Message:
kde-desktop: +ktorrent



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- comps-f8.xml.in	24 Sep 2007 23:54:08 -0000	1.121
+++ comps-f8.xml.in	25 Sep 2007 16:19:38 -0000	1.122
@@ -2372,6 +2372,7 @@
       <packagereq type="default">knetworkmanager</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpowersave</packagereq>
+      <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">redhat-artwork-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -2420,7 +2421,6 @@
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksynaptics</packagereq>
-      <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">marble</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 16:20:34 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:20:34 -0400
Subject: rpms/chkconfig/devel .cvsignore, 1.37, 1.38 chkconfig.spec, 1.46,
	1.47 sources, 1.38, 1.39
Message-ID: <200709251620.l8PGKYEm026728@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/chkconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26631

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.36-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	3 Aug 2007 18:07:02 -0000	1.37
+++ .cvsignore	25 Sep 2007 16:20:01 -0000	1.38
@@ -1 +1 @@
-chkconfig-1.3.35.tar.gz
+chkconfig-1.3.36.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- chkconfig.spec	3 Aug 2007 18:07:02 -0000	1.46
+++ chkconfig.spec	25 Sep 2007 16:20:01 -0000	1.47
@@ -1,12 +1,12 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.35
+Version: 1.3.36
 Release: 1
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: newt-devel gettext
+BuildRequires: newt-devel gettext popt-devel
 Conflicts: initscripts <= 5.30-1
 
 %description
@@ -72,6 +72,10 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 1.3.36-1
+- buildreq popt-devel, link it dynamically (#279531)
+- translation updates: kn, ko, mr, ro
+
 * Fri Aug  3 2007 Bill Nottingham <notting at redhat.com> 1.3.35-1
 - clarify licensing
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	3 Aug 2007 18:07:02 -0000	1.38
+++ sources	25 Sep 2007 16:20:01 -0000	1.39
@@ -1 +1 @@
-0c80a41f0855bd5dd7dbd6c7c8558978  chkconfig-1.3.35.tar.gz
+099c3554fe699d5399f7894a3a57d3de  chkconfig-1.3.36.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:17 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:17 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDA012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the approveacls acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:20 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:20 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDD012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchcommits acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 25 Sep 2007 12:23:26 -0400
Subject: comps comps-f8.xml.in,1.122,1.123
Message-ID: <200709251623.l8PGNQkJ026862@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26799

Modified Files:
	comps-f8.xml.in 
Log Message:
s/dolphin/d3lphin/



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- comps-f8.xml.in	25 Sep 2007 16:19:38 -0000	1.122
+++ comps-f8.xml.in	25 Sep 2007 16:22:56 -0000	1.123
@@ -2384,7 +2384,7 @@
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
-      <packagereq type="optional">dolphin</packagereq>
+      <packagereq type="optional">d3lphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
       <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">kasablanca</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:23 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:23 -0700
Subject: [pkgdb] boost had groupAcl changed
Message-ID: <200709251623.l8PGNS0t012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:39 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:39 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDG012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchbugzilla acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:52 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:52 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNS0w012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchbugzilla acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:59 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:59 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNS11012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:54 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:54 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNxZK012570@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchcommits acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:24:01 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:24:01 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251624.l8PGNxZN012570@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the approveacls acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:24:24 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:24:24 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.156, 1.157 kudzu.spec, 1.178,
	1.179 sources, 1.175, 1.176
Message-ID: <200709251624.l8PGOOtt026906@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26882

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
1.2.76-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	6 Sep 2007 20:56:17 -0000	1.156
+++ .cvsignore	25 Sep 2007 16:23:52 -0000	1.157
@@ -1 +1 @@
-kudzu-1.2.75.tar.gz
+kudzu-1.2.76.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kudzu.spec	24 Sep 2007 21:08:20 -0000	1.178
+++ kudzu.spec	25 Sep 2007 16:23:52 -0000	1.179
@@ -1,17 +1,15 @@
 Name: kudzu
-Version: 1.2.75
-Release: 2
+Version: 1.2.76
+Release: 1
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
 Source: kudzu-%{PACKAGE_VERSION}.tar.gz
 Obsoletes: rhs-hwdiag setconsole
-Prereq: chkconfig, modutils >= 2.3.11-5, /etc/init.d
-Requires: pam >= 0.74-17
+Prereq: /sbin/chkconfig
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
-BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel
-BuildRequires: popt-devel popt-static
+BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel popt-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -73,8 +71,10 @@
 %{_includedir}/kudzu
 
 %changelog
-* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
-- BuildRequires: popt-devel popt-static
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 1.2.76-1
+- scsi: minor fix to pull *a* tape device name
+- translation updates: kn
+- buildrequire popt-devel, link it statically (#279451)
 
 * Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
 - Add pcidom to the exported slot list of pciDevice.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/sources,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- sources	6 Sep 2007 20:56:17 -0000	1.175
+++ sources	25 Sep 2007 16:23:52 -0000	1.176
@@ -1 +1 @@
-1ca8fbb5ac6c829978501cd8a7aa3ad0  kudzu-1.2.75.tar.gz
+23db4f0aa5580bcfe8e8d37b97489cc0  kudzu-1.2.76.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:02 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:02 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251625.l8PGP7vm012682@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:45 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:45 -0700
Subject: [pkgdb] boost ownership updated
Message-ID: <200709251625.l8PGP7vp012682@bastion.fedora.phx.redhat.com>

Package boost in Fedora devel was orphaned by Benjamin Kosnik (bkoz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:53 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:53 -0700
Subject: [pkgdb] boost ownership updated
Message-ID: <200709251625.l8PGPwxn012747@bastion.fedora.phx.redhat.com>

Package boost in Fedora devel is now owned by Benjamin Kosnik (bkoz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:28:32 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:28:32 -0700
Subject: [pkgdb] boost had groupAcl changed
Message-ID: <200709251628.l8PGSbVA012812@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:30:39 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Tue, 25 Sep 2007 12:30:39 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.6,1.7
Message-ID: <200709251630.l8PGUdri027164@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27111

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Fixed running of Xvfb so it does not terminate after a successful test.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- java-1.7.0-icedtea.spec	24 Sep 2007 20:51:55 -0000	1.6
+++ java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
@@ -306,8 +306,8 @@
 popd
 pushd jtreg
   echo ====================JTREG TESTING========================
-  Xvfb :1 -screen 1 1280x1024x24 -ac -terminate &
-  export DISPLAY=:1.1
+  Xvfb :1 &
+  export DISPLAY=:1.0
   ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
 	$(pwd)/../openjdk/j2se/test/ 2>&1
   killall -9 Xvfb
@@ -743,6 +743,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Fixed running of Xvfb so it does not terminate after a successful test.
+
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added JTreg zip as source
 - Run JTreg tests after build for smoke testing.



From fedora-extras-commits at redhat.com  Tue Sep 25 16:45:02 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:45:02 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.126, 1.127 initscripts.spec,
	1.148, 1.149 sources, 1.141, 1.142
Message-ID: <200709251645.l8PGj2EN027757@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update to 8.57-1

Resolves: bug #220887, bug #288151, bug #271201



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	29 Aug 2007 20:09:11 -0000	1.126
+++ .cvsignore	25 Sep 2007 16:44:29 -0000	1.127
@@ -1 +1 @@
-initscripts-8.56.tar.bz2
+initscripts-8.57.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- initscripts.spec	30 Aug 2007 01:46:58 -0000	1.148
+++ initscripts.spec	25 Sep 2007 16:44:29 -0000	1.149
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.56
+Version: 8.57
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -18,7 +18,7 @@
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 078-1
 Requires: popt >= 1.12-2
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12
+Conflicts: mkinitrd < 4.0, kernel < 2.6.23
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -208,6 +208,16 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> - 8.57-1
+- work around upstream bash changes (#220887, modified from <nvigier at mandriva.com>)
+- init.d/network: add Should-Start for firewall services
+- ifup-eth: handle arp_ip_target separately (#288151, <agospoda at redhat.com>)
+- rc.sysinit: remove rc.serial support - should be udev rules
+- rc.sysinit: remove acpi module loading - now supported by the kernel automatically
+- fix en_GB translation (#271201)
+- translation updates: as, bn_IN, bg, ca, cs, de, el, es, fi, gu, hi, it, ja, ko, kn, ml,
+  mr, nb, nl, pa, pl, pt, pt_BR, ro, sl, sr, sr at Latn, sv, ta, te, zh_CN
+
 * Wed Aug 29 2007 Bill Nottingham <notting at redhat.com> - 8.56-1 
 - rename_device: fix open() call
 - rc.sysinit: optimize out some excess greps (<harald at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	30 Aug 2007 01:59:33 -0000	1.141
+++ sources	25 Sep 2007 16:44:29 -0000	1.142
@@ -1 +1 @@
-a63927b2be56f595d73bc8a30949542b  initscripts-8.56.tar.bz2
+d8191627179b30e2f02d21874f5fdfc8  initscripts-8.57.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 16:53:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 12:53:37 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.42,1.43
Message-ID: <200709251653.l8PGrbWc028041@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28003

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.7-85.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- em8300-kmod.spec	12 Sep 2007 19:20:13 -0000	1.42
+++ em8300-kmod.spec	25 Sep 2007 16:53:03 -0000	1.43
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-76.fc7}
+%{!?kversion: %define kversion 2.6.22.7-85.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.7-85.fc7.
+
 * Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.5-76.fc7.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:07 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:07 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0CjU013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:10 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:10 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0CjX013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:12 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:12 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0Cja013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:07 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:07 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0H4m013555@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchbugzilla acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:16 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:16 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0H4o013555@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchbugzilla acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:18 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 13:00:18 -0400
Subject: rpms/a2ps/devel a2ps-iso5-minus.patch,NONE,1.1 a2ps.spec,1.75,1.76
Message-ID: <200709251700.l8PH0IG9028453@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28422

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-iso5-minus.patch 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
- Make minus sign work in ISO-8859-5 (bug #252314).


a2ps-iso5-minus.patch:

--- NEW FILE a2ps-iso5-minus.patch ---
diff -up a2ps-4.13/encoding/iso5.edf.iso5-minus a2ps-4.13/encoding/iso5.edf
--- a2ps-4.13/encoding/iso5.edf.iso5-minus	2007-09-25 17:57:32.000000000 +0100
+++ a2ps-4.13/encoding/iso5.edf	2007-09-25 17:57:55.000000000 +0100
@@ -69,7 +69,7 @@ Vector:
 .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
 .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef space
 exclam quotedbl numbersign dollar percent ampersand quoteright
-parenleft parenright asterisk plus comma minus period slash zero one
+parenleft parenright asterisk plus comma hyphen period slash zero one
 two three four five six seven eight nine colon semicolon less equal
 greater question at A B C D E F G H I J K L M N O P Q R S T U V W X Y
 Z bracketleft backslash bracketright asciicircum underscore quoteleft


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- a2ps.spec	23 Aug 2007 11:58:09 -0000	1.75
+++ a2ps.spec	25 Sep 2007 16:59:45 -0000	1.76
@@ -21,6 +21,7 @@
 Patch5: a2ps-4.13-varargs.patch
 Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
+Patch8: a2ps-iso5-minus.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -83,6 +84,7 @@
 %patch5 -p1
 %patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
+%patch8 -p1 -b .iso5-minus
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -265,6 +267,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
+- Make minus sign work in ISO-8859-5 (bug #252314).
+
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 4.13b-67
 - More specific license tag.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:33 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:33 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0cP7013690@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:10:10 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 25 Sep 2007 13:10:10 -0400
Subject: comps comps-f8.xml.in,1.123,1.124
Message-ID: <200709251710.l8PHAAHB002324@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2286

Modified Files:
	comps-f8.xml.in 
Log Message:
libflashsupport was split out from pulseaudio



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- comps-f8.xml.in	25 Sep 2007 16:22:56 -0000	1.123
+++ comps-f8.xml.in	25 Sep 2007 17:09:40 -0000	1.124
@@ -3207,6 +3207,7 @@
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
       <packagereq type="default">alsa-plugins-pulseaudio</packagereq>
+      <packagereq type="default">libflashsupport</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 17:12:40 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 13:12:40 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.76,1.77
Message-ID: <200709251712.l8PHCers002429@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	a2ps.spec 
Log Message:
4.13b-68


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- a2ps.spec	25 Sep 2007 16:59:45 -0000	1.76
+++ a2ps.spec	25 Sep 2007 17:12:06 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.13b
-Release: 67%{?dist}
+Release: 68%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 #Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -267,7 +267,7 @@
 %dir %{_datadir}/a2ps
 
 %changelog
-* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 4.13b-68
 - Make minus sign work in ISO-8859-5 (bug #252314).
 
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 4.13b-67



From fedora-extras-commits at redhat.com  Tue Sep 25 17:30:09 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 13:30:09 -0400
Subject: rpms/frysk/devel frysk.spec,1.118,1.119
Message-ID: <200709251730.l8PHU9iY003088@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3033

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
- Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- frysk.spec	25 Sep 2007 13:27:32 -0000	1.118
+++ frysk.spec	25 Sep 2007 17:29:36 -0000	1.119
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
 Version:	0.0.1.2007.09.24
-Release:	1%{?dist}
+Release:	2%{?dist}
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # cdtparser is EPL
 # getopt is GPLv2 with exception
@@ -59,8 +59,8 @@
 Buildrequires:	metacity
 %endif
 
-#ExclusiveArch: %{ix86} x86_64 ppc64
-ExclusiveArch: %{ix86} x86_64
+# Build problems with libunwind; bug 305611.
+ExcludeArch: ppc ppc64
 
 # We do not want to build a ``cross-debugging version'' i686->i386;
 # libunwind build would get confused by this.  Override the cmd-line
@@ -254,6 +254,9 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
+- Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.
+
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
 - Update files list.
 - Fix path to dogtail_scripts.



From fedora-extras-commits at redhat.com  Tue Sep 25 17:31:21 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 13:31:21 -0400
Subject: rpms/frysk/devel frysk-20060922-a-cast.patch, 1.2,
	NONE frysk-no-dejagnu.patch, 1.1, NONE frysk-xfail-2130.patch,
	1.4, NONE
Message-ID: <200709251731.l8PHVLuD003133@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3113

Removed Files:
	frysk-20060922-a-cast.patch frysk-no-dejagnu.patch 
	frysk-xfail-2130.patch 
Log Message:
Remove stray patch files; frysk.spec had them removed some time ago.



--- frysk-20060922-a-cast.patch DELETED ---


--- frysk-no-dejagnu.patch DELETED ---


--- frysk-xfail-2130.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 17:57:13 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 10:57:13 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709251757.l8PHvIqZ018296@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Awaiting Review for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 17:57:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 10:57:20 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709251757.l8PHvPS9018317@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 18:01:10 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 25 Sep 2007 14:01:10 -0400
Subject: rpms/firefox/devel firefox-path.patch, NONE, 1.1 firefox.spec, 1.199,
	1.200
Message-ID: <200709251801.l8PI1AkG009845@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891

Modified Files:
	firefox.spec 
Added Files:
	firefox-path.patch 
Log Message:
* Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros



firefox-path.patch:

--- NEW FILE firefox-path.patch ---
--- mozilla/toolkit/xre/nsAppRunner.h.old	2007-09-25 18:01:56.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.h	2007-09-25 18:02:23.000000000 +0200
@@ -48,7 +48,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old	2007-09-25 18:00:26.000000000 +0200
+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp	2007-09-25 18:00:53.000000000 +0200
@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv);
 # elif defined(CCHMAXPATH)
 #  define MAXPATHLEN CCHMAXPATH
 # else
-#  define MAXPATHLEN 1024
+#  include <limits.h>
+#  define MAXPATHLEN PATH_MAX
 # endif
 #endif
 
diff -up mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp
--- mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old	2007-09-25 17:58:43.000000000 +0200
+++ mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp	2007-09-25 17:59:22.000000000 +0200
@@ -70,7 +70,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old	2007-09-25 18:04:25.000000000 +0200
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp	2007-09-25 18:04:48.000000000 +0200
@@ -109,7 +109,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old	2006-11-28 01:18:37.000000000 +0100
+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp	2007-09-25 18:05:49.000000000 +0200
@@ -79,7 +79,8 @@
 #endif
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN	PATH_MAX  /* Guessing this is okay.  Works for SCO. */
 #endif
  
 #if defined(__QNX__)
diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h
--- mozilla/xpcom/build/nsXPCOMPrivate.h.old	2007-09-25 18:02:58.000000000 +0200
+++ mozilla/xpcom/build/nsXPCOMPrivate.h	2007-09-25 18:03:15.000000000 +0200
@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h
--- mozilla/dbm/include/mcom_db.h.old	2007-09-25 17:57:09.000000000 +0200
+++ mozilla/dbm/include/mcom_db.h	2007-09-25 17:57:49.000000000 +0200
@@ -214,7 +214,8 @@
 #endif  /* __DBINTERFACE_PRIVATE */
 
 #ifdef SCO
-#define MAXPATHLEN 	1024              
+#include <limits.h>
+#define MAXPATHLEN 	PATH_MAX     
 #endif
 
 #include <fcntl.h>
diff -up mozilla/browser/components/migration/src/nsProfileMigrator.cpp.old mozilla/browser/components/migration/src/nsProfileMigrator.cpp
--- mozilla/browser/components/migration/src/nsProfileMigrator.cpp.old	2007-09-25 17:55:11.000000000 +0200
+++ mozilla/browser/components/migration/src/nsProfileMigrator.cpp	2007-09-25 18:07:56.000000000 +0200
@@ -73,7 +73,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp.old mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp
--- mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp.old	2007-09-25 17:53:36.000000000 +0200
+++ mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp	2007-09-25 18:07:37.000000000 +0200
@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsBrowserProfileMigratorUtils.h"
 #include "nsCRT.h"
@@ -66,7 +67,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/nsprpub/config/nsinstall.c.old mozilla/nsprpub/config/nsinstall.c
diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c
--- mozilla/js/src/jsfile.c.old	2006-07-26 20:55:08.000000000 +0200
+++ mozilla/js/src/jsfile.c	2007-09-25 18:22:52.000000000 +0200
@@ -105,7 +105,8 @@
 #define utfstring               "binary"
 #define unicodestring           "unicode"
 
-#define MAX_PATH_LENGTH         1024
+#include <limits.h>
+#define MAX_PATH_LENGTH         PATH_MAX
 #define MODE_SIZE               256
 #define NUMBER_SIZE             32
 #define MAX_LINE_LENGTH         256
diff -up mozilla/webshell/tests/viewer/nsViewerApp.cpp.old mozilla/webshell/tests/viewer/nsViewerApp.cpp
--- mozilla/webshell/tests/viewer/nsViewerApp.cpp.old	2007-09-25 18:34:51.000000000 +0200
+++ mozilla/webshell/tests/viewer/nsViewerApp.cpp	2007-09-25 18:35:33.000000000 +0200
@@ -692,7 +692,8 @@ nsViewerApp::OpenWindow(PRUint32 aNewChr
 
 #if !defined(XP_WIN) && !defined(XP_OS2)
 #ifndef XP_MAC
-#define _MAX_PATH 512
+#include <limits.h>
+#define _MAX_PATH PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old	2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c	2007-09-25 18:39:17.000000000 +0200
@@ -44,6 +44,7 @@
 #include "xpidl.h"
 #include <ctype.h>
 #include <glib.h>
+#include <limits.h>
 
 #ifdef XP_WIN
 #include <windef.h>
diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old	2007-09-25 18:14:08.000000000 +0200
+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp	2007-09-25 18:36:55.000000000 +0200
@@ -76,7 +76,8 @@
 #endif
     
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 
 #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c
--- mozilla/modules/libreg/src/reg.c.old	2007-09-25 18:25:02.000000000 +0200
+++ mozilla/modules/libreg/src/reg.c	2007-09-25 18:27:46.000000000 +0200
@@ -96,7 +96,8 @@
 #define MAX_PATH PATH_MAX
 #elif defined(XP_UNIX)
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #elif defined(XP_OS2)
 #ifndef MAX_PATH
diff -up mozilla/directory/c-sdk/config/pathsub.h.old mozilla/directory/c-sdk/config/pathsub.h
--- mozilla/directory/c-sdk/config/pathsub.h.old	2006-02-03 15:41:18.000000000 +0100
+++ mozilla/directory/c-sdk/config/pathsub.h	2007-09-25 18:48:58.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h
--- mozilla/config/pathsub.h.old	2004-04-18 16:17:25.000000000 +0200
+++ mozilla/config/pathsub.h	2007-09-25 18:48:13.000000000 +0200
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp
--- mozilla/modules/libjar/nsZipArchive.cpp.old	2006-09-13 20:32:37.000000000 +0200
+++ mozilla/modules/libjar/nsZipArchive.cpp	2007-09-25 18:51:00.000000000 +0200
@@ -121,7 +121,7 @@ char * strdup(const char *src)
 #    define S_IFLNK  0120000
 #  endif
 #  ifndef PATH_MAX
-#    define PATH_MAX 1024
+#    include <limits.h>
 #  endif
 #endif  /* XP_UNIX */
 
diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h
--- mozilla/nsprpub/config/pathsub.h.old	2004-04-25 17:00:34.000000000 +0200
+++ mozilla/nsprpub/config/pathsub.h	2007-09-25 18:57:51.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/gfx/src/gtk/nsPrintdGTK.h.old mozilla/gfx/src/gtk/nsPrintdGTK.h
--- mozilla/gfx/src/gtk/nsPrintdGTK.h.old	2004-04-17 23:52:29.000000000 +0200
+++ mozilla/gfx/src/gtk/nsPrintdGTK.h	2007-09-25 18:56:48.000000000 +0200
@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C
 #ifdef _POSIX_PATH_MAX
 #define PATH_MAX	_POSIX_PATH_MAX
 #else
-#define PATH_MAX	256
+#error "PATH_MAX is not defined!"
 #endif
 #endif
 
diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h
--- mozilla/security/coreconf/nsinstall/pathsub.h.old	2004-04-25 17:02:18.000000000 +0200
+++ mozilla/security/coreconf/nsinstall/pathsub.h	2007-09-25 19:00:35.000000000 +0200
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- firefox.spec	25 Sep 2007 04:49:20 -0000	1.199
+++ firefox.spec	25 Sep 2007 18:00:36 -0000	1.200
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -66,6 +66,7 @@
 Patch105:       firefox-2.0-dnd.patch
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch110:       firefox-2.0-startup-notify.patch
+Patch111:       firefox-path.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -163,6 +164,7 @@
 %patch105 -p0 -b .dnd
 %patch106 -p1 -b .indicator-crash
 %patch110 -p0 -b .startup-notify
+%patch111 -p1 -b .path
 
 # For branding specific patches.
 
@@ -429,6 +431,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
+- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
+
 * Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
 - Startup notification support
 



From fedora-extras-commits at redhat.com  Tue Sep 25 18:05:12 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:05:12 -0400
Subject: rpms/python-fedora/devel .cvsignore, 1.2, 1.3 python-fedora.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709251805.l8PI5CmX010126@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10093

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Sep 2007 15:56:41 -0000	1.2
+++ .cvsignore	25 Sep 2007 18:04:40 -0000	1.3
@@ -1 +1 @@
-python-fedora-0.2.90.18.tar.gz
+python-fedora-0.2.90.19.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-fedora.spec	25 Sep 2007 15:56:41 -0000	1.1
+++ python-fedora.spec	25 Sep 2007 18:04:40 -0000	1.2
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-fedora
-Version:        0.2.90.18
-Release:        3%{?dist}
+Version:        0.2.90.19
+Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -72,6 +72,9 @@
 %{python_sitelib}/fedora/tg/visit/
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2007 15:56:41 -0000	1.2
+++ sources	25 Sep 2007 18:04:40 -0000	1.3
@@ -1 +1 @@
-b0021a9eff35c4dd6c87f1da8e364ca0  python-fedora-0.2.90.18.tar.gz
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch (Fedora, 7) updated by kevin
Message-ID: <200709251812.l8PIC6iv018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for whowatch
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) changed owner of whowatch in Fedora 7 to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on whowatch (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch (Fedora, devel) updated by kevin
Message-ID: <200709251812.l8PIC6j0018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of whowatch in Fedora devel to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on whowatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch summary updated by kevin
Message-ID: <200709251812.l8PIC6is018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package whowatch summary to Display information about users currently logged on users

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:03 -0700
Subject: [pkgdb] jisksp16-1990-fonts was added for tagoh
Message-ID: <200709251815.l8PIF8U2018893@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package jisksp16-1990-fonts with summary 16x16 JIS X 0212:1990 Bitmap font
Kevin Fenzi (kevin) has approved Package jisksp16-1990-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for jisksp16-1990-fonts with an owner of tagoh
Kevin Fenzi (kevin) has approved jisksp16-1990-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package jisksp16-1990-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jisksp16-1990-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:04 -0700
Subject: [pkgdb] jisksp16-1990-fonts (Fedora, devel) updated by kevin
Message-ID: <200709251815.l8PIF8U5018893@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on jisksp16-1990-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jisksp16-1990-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:18 -0400
Subject: rpms/jisksp16-1990-fonts - New directory
Message-ID: <200709251815.l8PIFIUR010659@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts

Log Message:
Directory /cvs/extras/rpms/jisksp16-1990-fonts added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:26 -0400
Subject: rpms/jisksp16-1990-fonts/devel - New directory
Message-ID: <200709251815.l8PIFQhX010678@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts/devel

Log Message:
Directory /cvs/extras/rpms/jisksp16-1990-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:27 -0700
Subject: [pkgdb] libvirt: berrange has requested watchbugzilla
Message-ID: <200709251815.l8PIF8U7018893@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:28 -0400
Subject: rpms/jisksp16-1990-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251815.l8PIFSfp010708@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module jisksp16-1990-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module jisksp16-1990-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:30 -0400
Subject: rpms/jisksp16-1990-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709251815.l8PIFUdY010724@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jisksp16-1990-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jisksp16-1990-fonts
# $Id: Makefile,v 1.1 2007/09/25 18:15:28 kevin Exp $
NAME := jisksp16-1990-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 fedora-extras-commits at redhat.com  Tue Sep 25 18:15:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:28 -0700
Subject: [pkgdb] libvirt: berrange has requested watchcommits
Message-ID: <200709251815.l8PIFXoY018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:39 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:39 -0700
Subject: [pkgdb] libvirt: berrange has requested watchcommits
Message-ID: <200709251815.l8PIFXob018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:40 -0700
Subject: [pkgdb] libvirt: berrange has requested commit
Message-ID: <200709251815.l8PIFXoe018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the commit acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:36 -0700
Subject: [pkgdb] libvirt: berrange has requested commit
Message-ID: <200709251815.l8PIFfsX019065@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the commit acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:38 -0700
Subject: [pkgdb] libvirt: berrange has requested watchbugzilla
Message-ID: <200709251815.l8PIFfsa019065@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 14:16:11 -0400
Subject: fedora-rpmdevtools configure.ac, 1.12, 1.13 rpmdevtools.spec, 1.42,
	1.43
Message-ID: <200709251816.l8PIGBl9010847@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10823

Modified Files:
	configure.ac rpmdevtools.spec 
Log Message:
6.2


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac	10 Aug 2007 19:03:46 -0000	1.12
+++ configure.ac	25 Sep 2007 18:16:08 -0000	1.13
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 6.1)
+AC_INIT(rpmdevtools, 6.2)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG([HELP2MAN], [help2man], [/bin/false])
 AC_PATH_PROG([WGET], [wget], [/bin/false])


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rpmdevtools.spec	8 Sep 2007 09:44:35 -0000	1.42
+++ rpmdevtools.spec	25 Sep 2007 18:16:08 -0000	1.43
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -123,7 +123,7 @@
 
 
 %changelog
-* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+* 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>



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:54 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:16:54 -0700
Subject: [pkgdb] knm_new-fonts was added for tagoh
Message-ID: <200709251816.l8PIGxan019247@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package knm_new-fonts with summary 12x12 JIS X 0208 Bitmap font
Kevin Fenzi (kevin) has approved Package knm_new-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for knm_new-fonts with an owner of tagoh
Kevin Fenzi (kevin) has approved knm_new-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package knm_new-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on knm_new-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on knm_new-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on knm_new-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knm_new-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:16:55 -0700
Subject: [pkgdb] knm_new-fonts (Fedora, devel) updated by kevin
Message-ID: <200709251817.l8PIH0Is019249@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on knm_new-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knm_new-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:09 -0400
Subject: rpms/knm_new-fonts - New directory
Message-ID: <200709251817.l8PIH9t4011017@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts

Log Message:
Directory /cvs/extras/rpms/knm_new-fonts added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:13 -0400
Subject: rpms/knm_new-fonts/devel - New directory
Message-ID: <200709251817.l8PIHD7A011026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts/devel

Log Message:
Directory /cvs/extras/rpms/knm_new-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:16 -0400
Subject: rpms/knm_new-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251817.l8PIHGx9011056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module knm_new-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module knm_new-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:18 -0400
Subject: rpms/knm_new-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709251817.l8PIHIdv011072@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module knm_new-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: knm_new-fonts
# $Id: Makefile,v 1.1 2007/09/25 18:17:16 kevin Exp $
NAME := knm_new-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 fedora-extras-commits at redhat.com  Tue Sep 25 18:19:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 14:19:45 -0400
Subject: rpms/rpmdevtools/devel .cvsignore, 1.7, 1.8 rpmdevtools.spec, 1.7, 
	1.8 sources, 1.8, 1.9
Message-ID: <200709251819.l8PIJj0E011256@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11208

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Aug 2007 19:10:17 -0000	1.7
+++ .cvsignore	25 Sep 2007 18:19:13 -0000	1.8
@@ -1,2 +1,2 @@
 spectool-1.0.9.tar.bz2
-rpmdevtools-6.1.tar.bz2
+rpmdevtools-6.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmdevtools.spec	10 Aug 2007 19:10:17 -0000	1.7
+++ rpmdevtools.spec	25 Sep 2007 18:19:13 -0000	1.8
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -18,26 +18,38 @@
 BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
-Requires:       fakeroot
 # Minimal RPM build requirements
-Requires:       rpm-build >= 4.4.2.1
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
+Requires:       patch
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build >= 4.4.2.1
+Requires:       sed
 Requires:       tar
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
 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
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -111,6 +123,15 @@
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Aug 2007 19:10:17 -0000	1.8
+++ sources	25 Sep 2007 18:19:13 -0000	1.9
@@ -1,2 +1,2 @@
 b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
-3d5e2747d1955bb902127b4d9ded30a0  rpmdevtools-6.1.tar.bz2
+89bc0d3b1012c9fc3bd8602ff15d033d  rpmdevtools-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 18:22:34 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 14:22:34 -0400
Subject: rpms/virt-manager/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 virt-manager.spec, 1.26, 1.27
Message-ID: <200709251822.l8PIMYYd011439@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390

Modified Files:
	.cvsignore sources virt-manager.spec 
Log Message:
Updated to 0.5.1 release of virt-manager


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Aug 2007 21:31:59 -0000	1.15
+++ .cvsignore	25 Sep 2007 18:22:02 -0000	1.16
@@ -1,2 +1,3 @@
 *.src.rpm
-virt-manager-0.5.0.tar.gz
+.build*.log
+virt-manager-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Aug 2007 21:31:59 -0000	1.15
+++ sources	25 Sep 2007 18:22:02 -0000	1.16
@@ -1 +1 @@
-cef77479168eb34a13e1792e7cffda28  virt-manager-0.5.0.tar.gz
+e5022314bbe13881e2cc28d93f4994dd  virt-manager-0.5.1.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- virt-manager.spec	29 Aug 2007 21:31:59 -0000	1.26
+++ virt-manager.spec	25 Sep 2007 18:22:02 -0000	1.27
@@ -7,7 +7,7 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.5.0
+Version: 0.5.1
 Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
@@ -36,7 +36,7 @@
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen guests
-Requires: python-virtinst >= 0.103.0
+Requires: python-virtinst >= 0.300.1
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -158,6 +158,14 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Sep 25 2007 Daniel P. Berrange <berrange at redhat.com> - 0.5.1-1.fc8
+- Updated to 0.5.1 release
+- Open connections in background
+- Make VNC connection retries more robust
+- Allow changing of CDROM media on the fly
+- Add PXE boot installation of HVM guests
+- Allow tunnelling VNC over SSH
+
 * Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.5.0-1.fc8
 - Updated to 0.5.0 release
 - Support for managing remote hosts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:30 -0700
Subject: [pkgdb] alex was added for bos
Message-ID: <200709251823.l8PINZPE019624@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package alex with summary A tool for generating lexical analysers in Haskell
Kevin Fenzi (kevin) has approved Package alex
Kevin Fenzi (kevin) has added a Fedora devel branch for alex with an owner of bos
Kevin Fenzi (kevin) has approved alex in Fedora devel
Kevin Fenzi (kevin) has approved Package alex
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alex (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alex (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:40 -0700
Subject: [pkgdb] alex (Fedora, devel) updated by kevin
Message-ID: <200709251823.l8PINjQ1019648@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved watchcommits on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved commit on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved build on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved approveacls on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved checkout on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on alex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:40 -0700
Subject: [pkgdb] alex (Fedora, 7) updated by kevin
Message-ID: <200709251823.l8PINjQ5019648@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for alex
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved watchcommits on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved commit on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved build on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved approveacls on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved checkout on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on alex (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:13 -0400
Subject: rpms/alex - New directory
Message-ID: <200709251824.l8PIODOG011573@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex

Log Message:
Directory /cvs/extras/rpms/alex added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:18 -0400
Subject: rpms/alex/devel - New directory
Message-ID: <200709251824.l8PIOINQ011583@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex/devel

Log Message:
Directory /cvs/extras/rpms/alex/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:22 -0400
Subject: rpms/alex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251824.l8PIOMMU011612@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex

Added Files:
	Makefile import.log 
Log Message:
Setup of module alex


--- NEW FILE Makefile ---
# Top level Makefile for module alex
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:24 -0400
Subject: rpms/alex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709251824.l8PIOOII011628@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alex


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alex
# $Id: Makefile,v 1.1 2007/09/25 18:24:22 kevin Exp $
NAME := alex
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 fedora-extras-commits at redhat.com  Tue Sep 25 18:27:16 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:16 -0400
Subject: rpms/python-fedora/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRGro011878@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:44 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:44 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:27:19 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:19 -0400
Subject: rpms/python-fedora/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRJpP011882@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/F-7

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:47 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:47 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:27:22 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:22 -0400
Subject: rpms/python-fedora/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRMBj011886@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:49 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:49 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:10 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:10 -0400
Subject: rpms/python-fedora/EL-5 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUAcp012031@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/EL-5

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:13 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:13 -0400
Subject: rpms/python-fedora/F-7 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUD6v012047@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/F-7

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:15 -0400
Subject: rpms/python-fedora/FC-6 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUFr4012063@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/FC-6

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:47 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 14:30:47 -0400
Subject: comps comps-f8.xml.in,1.124,1.125
Message-ID: <200709251830.l8PIUlpE012128@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Modified Files:
	comps-f8.xml.in 
Log Message:
don't install xen by default with the virt group



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- comps-f8.xml.in	25 Sep 2007 17:09:40 -0000	1.124
+++ comps-f8.xml.in	25 Sep 2007 18:30:17 -0000	1.125
@@ -3801,11 +3801,11 @@
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
       <packagereq type="default">gnome-applet-vm</packagereq>
-      <packagereq type="default">kernel-xen</packagereq>
+      <packagereq type="optional">kernel-xen</packagereq>
       <packagereq type="default">kvm</packagereq>
       <packagereq type="default">qemu</packagereq>
       <packagereq type="default">virt-manager</packagereq>
-      <packagereq type="default">xen</packagereq>
+      <packagereq type="optional">xen</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Tue Sep 25 18:35:35 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 14:35:35 -0400
Subject: comps comps-f8.xml.in,1.125,1.126
Message-ID: <200709251835.l8PIZZls012287@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245

Modified Files:
	comps-f8.xml.in 
Log Message:
gnome-applet-vm links against xen stuff directly



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- comps-f8.xml.in	25 Sep 2007 18:30:17 -0000	1.125
+++ comps-f8.xml.in	25 Sep 2007 18:35:05 -0000	1.126
@@ -3800,7 +3800,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
-      <packagereq type="default">gnome-applet-vm</packagereq>
+      <packagereq type="optional">gnome-applet-vm</packagereq>
       <packagereq type="optional">kernel-xen</packagereq>
       <packagereq type="default">kvm</packagereq>
       <packagereq type="default">qemu</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 19:09:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 15:09:12 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.36,1.37
Message-ID: <200709251909.l8PJ9CWP019351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19274

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.202.rc8.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- em8300-kmod.spec	19 Sep 2007 18:30:19 -0000	1.36
+++ em8300-kmod.spec	25 Sep 2007 19:08:39 -0000	1.37
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.187.rc6.git7.fc8}
+%{!?kversion: %define kversion 2.6.23-0.202.rc8.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.202.rc8.fc8.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 19:38:04 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 15:38:04 -0400
Subject: rpms/mash/devel .cvsignore, 1.19, 1.20 mash.spec, 1.17, 1.18 sources,
	1.20, 1.21
Message-ID: <200709251938.l8PJc49n020290@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20204

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Sep 2007 19:39:08 -0000	1.19
+++ .cvsignore	25 Sep 2007 19:37:31 -0000	1.20
@@ -1 +1 @@
-mash-0.2.7.tar.gz
+mash-0.2.8.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mash.spec	21 Sep 2007 19:39:08 -0000	1.17
+++ mash.spec	25 Sep 2007 19:37:31 -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:           mash
-Version:        0.2.7
+Version:        0.2.8
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 0.2.8-1
+- libflashsupport (#305541)
+
 * Fri Sep 21 2007 Bill Nottingham <notting at redhat.com> 0.2.7-1
 - disable repoview for now
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Sep 2007 19:39:08 -0000	1.20
+++ sources	25 Sep 2007 19:37:31 -0000	1.21
@@ -1 +1 @@
-7b8640077626921acb95603f9a6a5f68  mash-0.2.7.tar.gz
+263c51784c93d9d47060c577a3f1c23f  mash-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 19:42:05 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 15:42:05 -0400
Subject: rpms/NetworkManager/devel nm-applet-0.7.0-disable-stuff.patch, NONE,
	1.1 .cvsignore, 1.48, 1.49 NetworkManager.spec, 1.170,
	1.171 sources, 1.67,
	1.68 nm-applet-0.7.0-no-connection-editor.patch, 1.1, NONE
Message-ID: <200709251942.l8PJg5s5020606@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20572

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	nm-applet-0.7.0-disable-stuff.patch 
Removed Files:
	nm-applet-0.7.0-no-connection-editor.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
- New snapshot
	- Make wired device carrier state work in the applet
	- Fix handling of errors with unencrypted APs
	- Fix "frozen" applet icon by reporting NM state better
	- Fix output of AP frequency in nm-tool



nm-applet-0.7.0-disable-stuff.patch:

--- NEW FILE nm-applet-0.7.0-disable-stuff.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor	2007-09-25 13:01:18.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 14:43:31.000000000 -0400
@@ -1146,6 +1146,7 @@ static void nma_menu_add_custom_essid_it
 	label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network..."));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_container_add (GTK_CONTAINER (menu_item), label);
+	gtk_widget_set_sensitive (menu_item, FALSE);
 	gtk_widget_show_all (menu_item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	g_signal_connect (menu_item, "activate", G_CALLBACK (custom_essid_item_selected), applet);
@@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid
 	label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network..."));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_container_add (GTK_CONTAINER (menu_item), label);
+	gtk_widget_set_sensitive (menu_item, FALSE);
 	gtk_widget_show_all (menu_item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	g_signal_connect (menu_item, "activate", G_CALLBACK (new_network_item_selected), applet);
@@ -1781,6 +1783,7 @@ static GtkWidget *nma_context_menu_creat
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
 	gtk_menu_shell_append (menu, applet->info_menu_item);
 
+#if 0
 	/* 'Edit Connections...' item */
 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
 	g_signal_connect (applet->connections_menu_item,
@@ -1788,6 +1791,7 @@ static GtkWidget *nma_context_menu_creat
 				   G_CALLBACK (nma_edit_connections_cb),
 				   applet);
 	gtk_menu_shell_append (menu, applet->connections_menu_item);
+#endif
 
 	/* Separator */
 	nma_menu_add_separator_item (menu);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	25 Sep 2007 09:52:27 -0000	1.48
+++ .cvsignore	25 Sep 2007 19:41:28 -0000	1.49
@@ -11,3 +11,6 @@
 nm-applet-0.7.0.svn191.tar.gz
 NetworkManager-0.7.0.svn2880.tar.gz
 nm-applet-0.7.0.svn199.tar.gz
+NetworkManager-0.7.0.svn2884.tar.gz
+nm-applet-0.7.0.svn200.tar.gz
+NetworkManager-0.7.0.svn2886.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- NetworkManager.spec	25 Sep 2007 09:52:27 -0000	1.170
+++ NetworkManager.spec	25 Sep 2007 19:41:28 -0000	1.171
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2880
+%define snapshot svn2886
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,9 +18,9 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn199.tar.gz
+Source1: nm-applet-%{version}.svn200.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: nm-applet-0.7.0-no-connection-editor.patch
+Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -123,7 +123,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch2 -p1 -b .no-connection-editor
+%patch2 -p1 -b .disable-stuff
 
 %build
 # Even though we don't require named, we still build with it
@@ -259,6 +259,13 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
+- New snapshot
+	- Make wired device carrier state work in the applet
+	- Fix handling of errors with unencrypted APs
+	- Fix "frozen" applet icon by reporting NM state better
+	- Fix output of AP frequency in nm-tool
+
 * Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
 - New snapshot
 	- Fix applet icon sizing on start (mclasen)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	25 Sep 2007 09:52:27 -0000	1.67
+++ sources	25 Sep 2007 19:41:28 -0000	1.68
@@ -1,2 +1,2 @@
-25115a3500c97b6ee308852d350760ef  NetworkManager-0.7.0.svn2880.tar.gz
-ec90ed799aa6c9c1c5378f8ab31c6f5c  nm-applet-0.7.0.svn199.tar.gz
+8edfd5854389ea6a6b4eb1f507b46c38  nm-applet-0.7.0.svn200.tar.gz
+fe78cab7288beef5e69dcf897a76d16b  NetworkManager-0.7.0.svn2886.tar.gz


--- nm-applet-0.7.0-no-connection-editor.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 19:51:37 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 15:51:37 -0400
Subject: rpms/kernel/devel linux-2.6-x86-disable-local-apic-amd-c1e.patch,
	NONE, 1.1 kernel.spec, 1.185, 1.186
Message-ID: <200709251951.l8PJpbQB020899@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20849

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
- x86-64: Disable local APIC timer use on AMD systems with C1E.


linux-2.6-x86-disable-local-apic-amd-c1e.patch:

--- NEW FILE linux-2.6-x86-disable-local-apic-amd-c1e.patch ---
>From davej  Tue Sep 25 15:44:00 2007
Return-Path: <tglx at linutronix.de>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,
	UNPARSEABLE_RELAY autolearn=ham version=3.2.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
	for <davej at localhost> (single-drop); Tue, 25 Sep 2007 15:44:00 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
	 Tue, 25 Sep 2007 15:37:08 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb8qa020820
	for <davej at pobox.devel.redhat.com>; Tue, 25 Sep 2007 15:37:08 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb7X2009192;
	Tue, 25 Sep 2007 15:37:07 -0400
Received: from mail.tglx.de (www.osadl.org [213.239.205.134])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb5GW020058;
	Tue, 25 Sep 2007 15:37:06 -0400
Received: from [127.0.0.1] (debian [213.239.205.147])
	by mail.tglx.de (Postfix) with ESMTP id 32A6265C003;
	Tue, 25 Sep 2007 21:37:04 +0200 (CEST)
Subject: [PATCH] x86-64: Disable local APIC timer use on AMD systems with
	C1E
From: Thomas Gleixner <tglx at linutronix.de>
To: LKML <linux-kernel at vger.kernel.org>
Cc: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>,
        Andi Kleen <ak at suse.de>, Chuck Ebbert <cebbert at redhat.com>,
        Dave Jones <davej at redhat.com>, Ingo Molnar <mingo at elte.hu>,
        "Rafael J. Wysocki" <rjw at sisk.pl>, Len Brown <lenb at kernel.org>,
        "Langsdorf, Mark" <mark.langsdorf at amd.com>
Content-Type: text/plain
Date: Tue, 25 Sep 2007 21:37:01 +0200
Message-Id: <1190749021.17409.35.camel at chaos>
Mime-Version: 1.0
X-Mailer: Evolution 2.12.0 (2.12.0-3.fc8) 
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-Scanned-By: MIMEDefang 2.58 on 172.16.48.32
Status: RO
Content-Length: 2997
Lines: 96

commit 3556ddfa9284a86a59a9b78fe5894430f6ab4eef titled

 [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E

solves a problem with AMD dual core laptops e.g. HP nx6325 (Turion 64
X2) with C1E enabled:

When both cores go into idle at the same time, then the system switches
into C1E state, which is basically the same as C3. This stops the local
apic timer.

This was debugged right after the dyntick merge on i386 and despite the
patch title it fixes only the 32 bit path.

x86_64 is still missing this fix. It seems that mainline is not really
affected by this issue, as the PIT is running and keeps jiffies
incrementing, but that's just waiting for trouble. 

-mm suffers from this problem due to the x86_64 high resolution timer
patches.

This is a quick and dirty port of the i386 code to x86_64. 

I spent quite a time with Rafael to debug the -mm / hrt wreckage until
someone pointed us to this. I really had forgotten that we debugged this
half a year ago already. 

Sigh, is it just me or is there something yelling arch/x86 into my ear?

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index af838f6..32054bf 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define ENABLE_C1E_MASK		0x18000000
+#define CPUID_PROCESSOR_SIGNATURE	1
+#define CPUID_XFAM		0x0ff00000
+#define CPUID_XFAM_K8		0x00000000
+#define CPUID_XFAM_10H		0x00100000
+#define CPUID_XFAM_11H		0x00200000
+#define CPUID_XMOD		0x000f0000
+#define CPUID_XMOD_REV_F	0x00040000
+
+/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
+static __cpuinit int amd_apic_timer_broken(void)
+{
+	u32 lo, hi;
+	u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
+	switch (eax & CPUID_XFAM) {
+	case CPUID_XFAM_K8:
+		if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
+			break;
+	case CPUID_XFAM_10H:
+	case CPUID_XFAM_11H:
+		rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
+		if (lo & ENABLE_C1E_MASK)
+			return 1;
+		break;
+	default:
+		/* err on the side of caution */
+		return 1;
+	}
+	return 0;
+}
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
 	unsigned level;
@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 	/* Family 10 doesn't support C states in MWAIT so don't use it */
 	if (c->x86 == 0x10 && !force_mwait)
 		clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
+
+	if (amd_apic_timer_broken())
+		disable_apic_timer = 1;
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
--- linux-2.6.22.noarch/include/asm-x86_64/apic.h~	2007-09-25 15:47:01.000000000 -0400
+++ linux-2.6.22.noarch/include/asm-x86_64/apic.h	2007-09-25 15:47:23.000000000 -0400
@@ -19,6 +19,7 @@
 extern int apic_verbosity;
 extern int apic_runs_main_timer;
 extern int ioapic_force;
+extern int disable_apic_timer;
 
 /*
  * Define the default level of output to be very little


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- kernel.spec	25 Sep 2007 01:28:29 -0000	1.185
+++ kernel.spec	25 Sep 2007 19:51:00 -0000	1.186
@@ -555,7 +555,8 @@
 
 %if !%{nopatches}
 
-Patch20: linux-2.6-highres-timers.patch
+Patch19: linux-2.6-highres-timers.patch
+Patch20: linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -968,6 +969,7 @@
 
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
+ApplyPatch linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -1809,6 +1811,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
+- x86-64: Disable local APIC timer use on AMD systems with C1E.
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc8
 



From fedora-extras-commits at redhat.com  Tue Sep 25 19:53:21 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 15:53:21 -0400
Subject: rpms/firefox/devel firefox-1.0-imgloader-comarray.patch, 1.1,
	NONE firefox-1.0-locales-no-searchplugins.patch, 1.1,
	NONE firefox-1.0-nspr-config.patch, 1.1,
	NONE firefox-1.0-nspr-s390.patch, 1.1,
	NONE firefox-1.0-nss-system-nspr.patch, 1.1,
	NONE firefox-1.0-use-system-colors.patch, 1.1,
	NONE firefox-1.0-xptcall-s390.patch, 1.1,
	NONE firefox-1.1-ppc64.patch, 1.1,
	NONE firefox-1.5-thread-cleanup.patch, 1.1,
	NONE mozilla-1.7.3-xptcall-s390.patch, 1.1, NONE
Message-ID: <200709251953.l8PJrL9V023132@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23122

Removed Files:
	firefox-1.0-imgloader-comarray.patch 
	firefox-1.0-locales-no-searchplugins.patch 
	firefox-1.0-nspr-config.patch firefox-1.0-nspr-s390.patch 
	firefox-1.0-nss-system-nspr.patch 
	firefox-1.0-use-system-colors.patch 
	firefox-1.0-xptcall-s390.patch firefox-1.1-ppc64.patch 
	firefox-1.5-thread-cleanup.patch 
	mozilla-1.7.3-xptcall-s390.patch 
Log Message:
Killing some more dead patches



--- firefox-1.0-imgloader-comarray.patch DELETED ---


--- firefox-1.0-locales-no-searchplugins.patch DELETED ---


--- firefox-1.0-nspr-config.patch DELETED ---


--- firefox-1.0-nspr-s390.patch DELETED ---


--- firefox-1.0-nss-system-nspr.patch DELETED ---


--- firefox-1.0-use-system-colors.patch DELETED ---


--- firefox-1.0-xptcall-s390.patch DELETED ---


--- firefox-1.1-ppc64.patch DELETED ---


--- firefox-1.5-thread-cleanup.patch DELETED ---


--- mozilla-1.7.3-xptcall-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 19:55:31 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 25 Sep 2007 15:55:31 -0400
Subject: rpms/sugar/OLPC-2 sources,1.61,1.62 sugar.spec,1.72,1.73
Message-ID: <200709251955.l8PJtVII023260@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199

Modified Files:
	sources sugar.spec 
Log Message:
* Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	24 Sep 2007 20:29:28 -0000	1.61
+++ sources	25 Sep 2007 19:54:59 -0000	1.62
@@ -1 +1 @@
-a6fcc8a52918b882cd499d94e9521e39  sugar-0.65-git5a595ea04e.tar.bz2
+338ebbbda341a2bddb416e60c5b9a5b5  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sugar.spec	24 Sep 2007 20:29:28 -0000	1.72
+++ sugar.spec	25 Sep 2007 19:54:59 -0000	1.73
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070924git
+%define alphatag 20070925git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.57.%{alphatag}5a595ea04e
+Release: 0.58.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
+- New snapshot
+
 * Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 25 20:14:24 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 16:14:24 -0400
Subject: rpms/thunderbird/devel thunderbird-path.patch, NONE,
	1.1 thunderbird.spec, 1.104, 1.105
Message-ID: <200709252014.l8PKEOWf029811@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-path.patch 
Log Message:
* Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros


thunderbird-path.patch:

--- NEW FILE thunderbird-path.patch ---
--- mozilla/toolkit/xre/nsAppRunner.h.old	2007-09-25 18:01:56.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.h	2007-09-25 18:02:23.000000000 +0200
@@ -48,7 +48,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old	2007-09-25 18:00:26.000000000 +0200
+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp	2007-09-25 18:00:53.000000000 +0200
@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv);
 # elif defined(CCHMAXPATH)
 #  define MAXPATHLEN CCHMAXPATH
 # else
-#  define MAXPATHLEN 1024
+#  include <limits.h>
+#  define MAXPATHLEN PATH_MAX
 # endif
 #endif
 
diff -up mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp
--- mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old	2007-09-25 17:58:43.000000000 +0200
+++ mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp	2007-09-25 17:59:22.000000000 +0200
@@ -70,7 +70,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old	2007-09-25 18:04:25.000000000 +0200
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp	2007-09-25 18:04:48.000000000 +0200
@@ -109,7 +109,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old	2006-11-28 01:18:37.000000000 +0100
+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp	2007-09-25 18:05:49.000000000 +0200
@@ -79,7 +79,8 @@
 #endif
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN	PATH_MAX  /* Guessing this is okay.  Works for SCO. */
 #endif
  
 #if defined(__QNX__)
diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h
--- mozilla/xpcom/build/nsXPCOMPrivate.h.old	2007-09-25 18:02:58.000000000 +0200
+++ mozilla/xpcom/build/nsXPCOMPrivate.h	2007-09-25 18:03:15.000000000 +0200
@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h
--- mozilla/dbm/include/mcom_db.h.old	2007-09-25 17:57:09.000000000 +0200
+++ mozilla/dbm/include/mcom_db.h	2007-09-25 17:57:49.000000000 +0200
@@ -214,7 +214,8 @@
 #endif  /* __DBINTERFACE_PRIVATE */
 
 #ifdef SCO
-#define MAXPATHLEN 	1024              
+#include <limits.h>
+#define MAXPATHLEN 	PATH_MAX     
 #endif
 
 #include <fcntl.h>
diff -up mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old mozilla/mail/components/migration/src/nsProfileMigrator.cpp
--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old	2007-09-25 17:55:11.000000000 +0200
+++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp	2007-09-25 18:07:56.000000000 +0200
@@ -73,7 +73,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/nsprpub/config/nsinstall.c.old mozilla/nsprpub/config/nsinstall.c
diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c
--- mozilla/js/src/jsfile.c.old	2006-07-26 20:55:08.000000000 +0200
+++ mozilla/js/src/jsfile.c	2007-09-25 18:22:52.000000000 +0200
@@ -105,7 +105,8 @@
 #define utfstring               "binary"
 #define unicodestring           "unicode"
 
-#define MAX_PATH_LENGTH         1024
+#include <limits.h>
+#define MAX_PATH_LENGTH         PATH_MAX
 #define MODE_SIZE               256
 #define NUMBER_SIZE             32
 #define MAX_LINE_LENGTH         256
diff -up mozilla/webshell/tests/viewer/nsViewerApp.cpp.old mozilla/webshell/tests/viewer/nsViewerApp.cpp
--- mozilla/webshell/tests/viewer/nsViewerApp.cpp.old	2007-09-25 18:34:51.000000000 +0200
+++ mozilla/webshell/tests/viewer/nsViewerApp.cpp	2007-09-25 18:35:33.000000000 +0200
@@ -692,7 +692,8 @@ nsViewerApp::OpenWindow(PRUint32 aNewChr
 
 #if !defined(XP_WIN) && !defined(XP_OS2)
 #ifndef XP_MAC
-#define _MAX_PATH 512
+#include <limits.h>
+#define _MAX_PATH PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old	2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c	2007-09-25 18:39:17.000000000 +0200
@@ -44,6 +44,7 @@
 #include "xpidl.h"
 #include <ctype.h>
 #include <glib.h>
+#include <limits.h>
 
 #ifdef XP_WIN
 #include <windef.h>
diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old	2007-09-25 18:14:08.000000000 +0200
+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp	2007-09-25 18:36:55.000000000 +0200
@@ -76,7 +76,8 @@
 #endif
     
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 
 #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c
--- mozilla/modules/libreg/src/reg.c.old	2007-09-25 18:25:02.000000000 +0200
+++ mozilla/modules/libreg/src/reg.c	2007-09-25 18:27:46.000000000 +0200
@@ -96,7 +96,8 @@
 #define MAX_PATH PATH_MAX
 #elif defined(XP_UNIX)
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #elif defined(XP_OS2)
 #ifndef MAX_PATH
diff -up mozilla/directory/c-sdk/config/pathsub.h.old mozilla/directory/c-sdk/config/pathsub.h
--- mozilla/directory/c-sdk/config/pathsub.h.old	2006-02-03 15:41:18.000000000 +0100
+++ mozilla/directory/c-sdk/config/pathsub.h	2007-09-25 18:48:58.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h
--- mozilla/config/pathsub.h.old	2004-04-18 16:17:25.000000000 +0200
+++ mozilla/config/pathsub.h	2007-09-25 18:48:13.000000000 +0200
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp
--- mozilla/modules/libjar/nsZipArchive.cpp.old	2006-09-13 20:32:37.000000000 +0200
+++ mozilla/modules/libjar/nsZipArchive.cpp	2007-09-25 18:51:00.000000000 +0200
@@ -121,7 +121,7 @@ char * strdup(const char *src)
 #    define S_IFLNK  0120000
 #  endif
 #  ifndef PATH_MAX
-#    define PATH_MAX 1024
+#    include <limits.h>
 #  endif
 #endif  /* XP_UNIX */
 
diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h
--- mozilla/nsprpub/config/pathsub.h.old	2004-04-25 17:00:34.000000000 +0200
+++ mozilla/nsprpub/config/pathsub.h	2007-09-25 18:57:51.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/gfx/src/gtk/nsPrintdGTK.h.old mozilla/gfx/src/gtk/nsPrintdGTK.h
--- mozilla/gfx/src/gtk/nsPrintdGTK.h.old	2004-04-17 23:52:29.000000000 +0200
+++ mozilla/gfx/src/gtk/nsPrintdGTK.h	2007-09-25 18:56:48.000000000 +0200
@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C
 #ifdef _POSIX_PATH_MAX
 #define PATH_MAX	_POSIX_PATH_MAX
 #else
-#define PATH_MAX	256
+#error "PATH_MAX is not defined!"
 #endif
 #endif
 
diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h
--- mozilla/security/coreconf/nsinstall/pathsub.h.old	2004-04-25 17:02:18.000000000 +0200
+++ mozilla/security/coreconf/nsinstall/pathsub.h	2007-09-25 19:00:35.000000000 +0200
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- thunderbird.spec	11 Sep 2007 18:58:30 -0000	1.104
+++ thunderbird.spec	25 Sep 2007 20:13:47 -0000	1.105
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -63,6 +63,7 @@
 Patch103:       thunderbird-1.5-profile-migrator.patch
 Patch104:       firefox-1.5-dnd-nograb.patch
 Patch106:       firefox-2.0-indicator-crash.patch
+Patch111:       thunderbird-path.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -145,6 +146,7 @@
 %patch103 -p1 -b .profile-migrator
 #%patch104 -p1 -b .dnd-nograb
 %patch106 -p1 -b .indicator-crash
+%patch111 -p1 -b .path
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -316,6 +318,9 @@
 #===============================================================================
 
 %changelog
+* Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
+- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
+
 * Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
 - Fix crashes when using GTK+ themes containing a gtkrc which specify 
   GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing



From fedora-extras-commits at redhat.com  Tue Sep 25 20:16:17 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 16:16:17 -0400
Subject: rpms/pam/devel .cvsignore, 1.44, 1.45 pam.spec, 1.159, 1.160 sources,
	1.46, 1.47
Message-ID: <200709252016.l8PKGHe8029945@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920

Modified Files:
	.cvsignore pam.spec sources 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-10
- update db4 to 4.6.19 (#274661)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Aug 2007 12:31:50 -0000	1.44
+++ .cvsignore	25 Sep 2007 20:15:45 -0000	1.45
@@ -2,4 +2,4 @@
 *.tar.bz2
 pam-redhat-0.99.8-1.tar.bz2
 Linux-PAM-0.99.8.1.tar.bz2
-db-4.6.18.tar.gz
+db-4.6.19.tar.gz


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- pam.spec	21 Sep 2007 14:08:14 -0000	1.159
+++ pam.spec	25 Sep 2007 20:15:45 -0000	1.160
@@ -4,14 +4,14 @@
 %define _sysconfdir /etc
 
 %define pwdb_version 0.62
-%define db_version 4.6.18
+%define db_version 4.6.19
 %define db_conflicting_version 4.7.0
 %define pam_redhat_version 0.99.8-1
 
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 9%{?dist}
+Release: 10%{?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
@@ -405,6 +405,9 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-10
+- update db4 to 4.6.19 (#274661)
+
 * Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
 - do not preserve contexts when copying skel and other namespace.init
   fixes (#298941)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	6 Aug 2007 12:31:50 -0000	1.46
+++ sources	25 Sep 2007 20:15:45 -0000	1.47
@@ -1,3 +1,3 @@
 2a23dc703b550223206021ff03b1e434  pam-redhat-0.99.8-1.tar.bz2
 a6472db4afe13850cb401922211bba4e  Linux-PAM-0.99.8.1.tar.bz2
-95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 20:27:01 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 16:27:01 -0400
Subject: rpms/pam/devel pam.spec,1.160,1.161
Message-ID: <200709252027.l8PKR15k032415@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32383

Modified Files:
	pam.spec 
Log Message:
- apply db4 patch correctly


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- pam.spec	25 Sep 2007 20:15:45 -0000	1.160
+++ pam.spec	25 Sep 2007 20:26:29 -0000	1.161
@@ -97,7 +97,9 @@
 cp %{SOURCE7} .
 
 %patch1 -p1 -b .redhat-modules
-%patch2 -p0 -b .db4-glibc
+pushd db-%{db_version}
+%patch2 -p1 -b .db4-glibc
+popd
 %patch4 -p1 -b .dbpam
 %patch5 -p1 -b .no-log
 %patch24 -p1 -b .update-helper



From fedora-extras-commits at redhat.com  Tue Sep 25 20:37:01 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Tue, 25 Sep 2007 16:37:01 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.7,1.8
Message-ID: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32683

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Fixed running of Xvfb so it does not terminate after a successful test.
- Fixed mauve and jtreg test runs to not break the build when an error is thrown





Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
+++ java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
@@ -300,16 +300,20 @@
   ./configure 
   make
   echo ====================MAUVE TESTING========================
-  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+  %{expand: 
+     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
+   } || :
   echo ====================MAUVE TESTING END====================
 popd
 pushd jtreg
   echo ====================JTREG TESTING========================
   Xvfb :1 &
   export DISPLAY=:1.0
-  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1
+  %{expand: 
+     ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
+	$(pwd)/../openjdk/j2se/test/ 2>&1 
+  } || :
   killall -9 Xvfb
   export DISPLAY=:0.0
   echo ====================JTREG TESTING END====================
@@ -745,6 +749,7 @@
 %changelog
 * Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
+- Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added JTreg zip as source



From fedora-extras-commits at redhat.com  Tue Sep 25 20:44:31 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 16:44:31 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-0.5.7-always-scan.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.29, 1.30
Message-ID: <200709252044.l8PKiV17000676@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv655

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.5.7-always-scan.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-9
- Always allow explicit wireless scans triggered from a control interface



wpa_supplicant-0.5.7-always-scan.patch:

--- NEW FILE wpa_supplicant-0.5.7-always-scan.patch ---
diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
--- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan	2007-09-25 15:51:35.000000000 -0400
+++ wpa_supplicant-0.5.7/wpa_supplicant.c	2007-09-25 16:31:27.000000000 -0400
@@ -972,7 +972,7 @@ static void wpa_supplicant_scan(void *el
 	struct wpa_ssid *ssid;
 	int enabled, scan_req = 0, ret;
 
-	if (wpa_s->disconnected)
+	if (wpa_s->disconnected && !wpa_s->scan_req)
 		return;
 
 	enabled = 0;


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wpa_supplicant.spec	21 Sep 2007 00:37:14 -0000	1.29
+++ wpa_supplicant.spec	25 Sep 2007 20:43:59 -0000	1.30
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch5: wpa_supplicant-0.5.7-qmake-location.patch
 Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch
 Patch7: wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch
+Patch8: wpa_supplicant-0.5.7-always-scan.patch
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +56,7 @@
 %patch5 -p1 -b .qmake-location
 %patch6 -p1 -b .flush-debug-output
 %patch7 -p1 -b .sigusr1-changes-debuglevel
+%patch8 -p1 -b .always-scan
 
 %build
 cp %{SOURCE1} ./.config
@@ -140,6 +142,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-9
+- Always allow explicit wireless scans triggered from a control interface
+
 * Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
 - Change system bus activation file name to work around D-Bus bug that fails
     to launch services unless their .service file is named the same as the



From fedora-extras-commits at redhat.com  Tue Sep 25 20:54:25 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 16:54:25 -0400
Subject: devel/anaconda .cvsignore, 1.447, 1.448 anaconda.spec, 1.583,
	1.584 sources, 1.576, 1.577
Message-ID: <200709252054.l8PKsPWT000898@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
- A few upgrade fixes; look for packages in 
  /var/cache/yum/anaconda-upgrade/packages so that you can predownload them
- Point to the mirror list for the "Additional Fedora Software"
- Font movement (#304271)
- Fix where firmware is looked for



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- .cvsignore	24 Sep 2007 20:20:08 -0000	1.447
+++ .cvsignore	25 Sep 2007 20:53:53 -0000	1.448
@@ -1 +1 @@
-anaconda-11.3.0.33.tar.bz2
+anaconda-11.3.0.34.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- anaconda.spec	24 Sep 2007 20:20:08 -0000	1.583
+++ anaconda.spec	25 Sep 2007 20:53:53 -0000	1.584
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.33
+Version: 11.3.0.34
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
+- A few upgrade fixes; look for packages in 
+  /var/cache/yum/anaconda-upgrade/packages so that you can predownload them
+- Point to the mirror list for the "Additional Fedora Software"
+- Font movement (#304271)
+- Fix where firmware is looked for
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
 - Blacklist some modules to try to avoid #299351
 - Copy over media.repo if it exists


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- sources	24 Sep 2007 20:20:08 -0000	1.576
+++ sources	25 Sep 2007 20:53:53 -0000	1.577
@@ -1 +1 @@
-43d84848afcbecc848acdb8546aaf486  anaconda-11.3.0.33.tar.bz2
+068dbe6d893b21eaba209e97e12aeefc  anaconda-11.3.0.34.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:01:27 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 25 Sep 2007 17:01:27 -0400
Subject: rpms/octave/devel octave-2.9.14-pkg.patch, NONE, 1.1 octave.spec,
	1.58, 1.59
Message-ID: <200709252101.l8PL1RGV007286@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1187

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.14-pkg.patch 
Log Message:
* Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
- Add /usr/share/octave/packages for add on packages and %ghost 
  /usr/share/octave/packages/octave_packages
- Add patch for octave package manager that will be going upstream


octave-2.9.14-pkg.patch:

--- NEW FILE octave-2.9.14-pkg.patch ---
*** ./scripts/pkg/pkg.m.orig2	2007-08-23 18:14:51.000000000 +0200
--- ./scripts/pkg/pkg.m	2007-09-22 02:36:01.022097578 +0200
***************
*** 116,121 ****
--- 116,128 ----
  ## @example
  ## p = pkg prefix
  ## @end example
+ ##
+ ## The location in which to install the architecture dependent files can be
+ ## independent specified with an addition argument. For example
+ ##
+ ## @example
+ ## pkg prefix ~/my_octave_packages ~/my_octave_packages_for_my_pc
+ ## @end example
  ## @item local_list
  ## Set the file in which to look for information on the locally
  ## installed packages. Locally installed packages are those that are
***************
*** 173,196 ****
    ## Installation prefix (XXX: what should these be on windows?)
    persistent user_prefix = false;
    persistent prefix = -1;
    persistent local_list = tilde_expand (fullfile("~", ".octave_packages"));
    persistent global_list = fullfile (OCTAVE_HOME (), "share", "octave",
  				     "octave_packages");
    mlock ();
  
!   if (ispc () && ! isunix ())
!     global_install = 1;
!   else
!     global_install = (geteuid() == 0);
!   endif
  
    if (prefix == -1)
      if (global_install)
        prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
      else
        prefix = fullfile ("~", "octave");
      endif
      prefix = tilde_expand (prefix);
    endif
  
    ## Handle input
--- 180,203 ----
    ## Installation prefix (XXX: what should these be on windows?)
    persistent user_prefix = false;
    persistent prefix = -1;
+   persistent archprefix = -1;
    persistent local_list = tilde_expand (fullfile("~", ".octave_packages"));
    persistent global_list = fullfile (OCTAVE_HOME (), "share", "octave",
  				     "octave_packages");
    mlock ();
  
!   global_install = issuperuser ();
  
    if (prefix == -1)
      if (global_install)
        prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
+       archprefix = fullfile (OCTAVE_HOME (), "libexec", "octave", "packages");
      else
        prefix = fullfile ("~", "octave");
+       archprefix = prefix;
      endif
      prefix = tilde_expand (prefix);
+     archprefix = tilde_expand (archprefix);
    endif
  
    ## Handle input
***************
*** 222,230 ****
  	if (! user_prefix)
  	  prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
  	endif
!       case {"list", "install", "uninstall", "load", "unload", ...
! 	    "prefix", "local_list", "global_list", "rebuild", "build"}
! 	if (strcmp (action,"none"))
  	  action = varargin{i};
  	else
  	  error ("more than one action specified");
--- 229,237 ----
  	if (! user_prefix)
  	  prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
  	endif
!       case {"list", "install", "uninstall", "load", "unload", "prefix", ...
! 	    "local_list", "global_list", "rebuild", "build"}
! 	if (strcmp (action, "none"))
  	  action = varargin{i};
  	else
  	  error ("more than one action specified");
***************
*** 252,258 ****
        if (length (files) == 0)
  	error ("you must specify at least one filename when calling 'pkg install'");
        endif
!       install (files, deps, auto, prefix, verbose, local_list, 
  	       global_list, global_install);
  
      case "uninstall"
--- 259,265 ----
        if (length (files) == 0)
  	error ("you must specify at least one filename when calling 'pkg install'");
        endif
!       install (files, deps, auto, prefix, archprefix, verbose, local_list, 
  	       global_list, global_install);
  
      case "uninstall"
***************
*** 276,292 ****
  
      case "prefix"
        if (length (files) == 0 && nargout == 0)
! 	disp (prefix);
!       elseif (length (files) == 0 && nargout == 1)
  	local_packages = prefix;
!       elseif (length (files) == 1 && nargout <= 1 && ischar (files{1}))
  	prefix = files{1};
- 	## if (!strcmp(prefix(end), filesep))
- 	##   prefix(end+1) = filesep;
- 	## endif
  	prefix = absolute_pathname (prefix);
  	local_packages = prefix;
  	user_prefix = true;
        else
  	error ("you must specify a prefix directory, or request an output argument");
        endif
--- 283,309 ----
  
      case "prefix"
        if (length (files) == 0 && nargout == 0)
! 	printf ("Installation prefix:             %s\n", prefix);
! 	printf ("Architecture dependent prefix:   %s\n", archprefix);
!       elseif (length (files) == 0 && nargout >= 1)
  	local_packages = prefix;
! 	global_packages = archprefix;
!       elseif (length (files) >= 1 && nargout <= 2 && ischar (files{1}))
  	prefix = files{1};
  	prefix = absolute_pathname (prefix);
  	local_packages = prefix;
  	user_prefix = true;
+ 	if (length (files) >= 2 && ischar (files{2}))
+ 	  archprefix = files{2};
+ 	  try
+ 	    archprefix = absolute_pathname (archprefix);
+           catch
+ 	    mkdir (archprefix);
+ 	    warning ("creating the directory %s\n", archprefix);
+ 	    archprefix = absolute_pathname (archprefix);
+ 	  end_try_catch
+ 	  global_packages = archprefix;
+ 	endif
        else
  	error ("you must specify a prefix directory, or request an output argument");
        endif
***************
*** 327,340 ****
  
      case "rebuild"
        if (global_install)
! 	global_packages = rebuild (prefix, global_list, files, auto, verbose);
  	global_packages = save_order (global_packages);
  	save (global_list, "global_packages");
  	if (nargout > 0)
  	  local_packages = global_packages;
  	endif
        else
! 	local_packages = rebuild (prefix, local_list, files, auto, verbose);
  	local_packages = save_order (local_packages);
  	save (local_list, "local_packages");
  	if (nargout == 0)
--- 344,359 ----
  
      case "rebuild"
        if (global_install)
! 	global_packages = rebuild (prefix, archprefix, global_list, files, 
! 				   auto, verbose);
  	global_packages = save_order (global_packages);
  	save (global_list, "global_packages");
  	if (nargout > 0)
  	  local_packages = global_packages;
  	endif
        else
! 	local_packages = rebuild (prefix, archprefix, local_list, files, auto, 
! 				  verbose);
  	local_packages = save_order (local_packages);
  	save (local_list, "local_packages");
  	if (nargout == 0)
***************
*** 353,359 ****
    endswitch
  endfunction
  
! function descriptions = rebuild (prefix, list, files, auto, verbose)
    if (isempty (files))
      [dirlist, err, msg] = readdir (prefix);
      if (err)
--- 372,378 ----
    endswitch
  endfunction
  
! function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose)
    if (isempty (files))
      [dirlist, err, msg] = readdir (prefix);
      if (err)
***************
*** 380,385 ****
--- 399,406 ----
      if (exist (descfile, "file"))
        desc = get_description (descfile);
        desc.dir = fullfile (prefix, dirlist{k});
+       desc.archprefix = fullfile (archprefix, strcat (desc.name, "-",
+ 				  desc.version));
        if (auto != 0)
  	if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file"))
  	  unlink (fullfile (desc.dir, "packinfo", ".autoload"));
***************
*** 450,456 ****
    endif
    files(1) = [];
    buildlist = fullfile (builddir, "octave_packages");
!   install (files, handle_deps, autoload, installdir, verbose, 
  	   buildlist, "", false);
    unwind_protect
      repackage (builddir, buildlist);
--- 471,477 ----
    endif
    files(1) = [];
    buildlist = fullfile (builddir, "octave_packages");
!   install (files, handle_deps, autoload, installdir, installdir, verbose, 
  	   buildlist, "", false);
    unwind_protect
      repackage (builddir, buildlist);
***************
*** 465,471 ****
    end_unwind_protect
  endfunction
  
! function install (files, handle_deps, autoload, prefix, verbose, local_list, global_list, global_install)
  
    # Check that the directory in prefix exist. If it doesn't: create it!
    if (! exist (prefix, "dir"))
--- 486,493 ----
    end_unwind_protect
  endfunction
  
! function install (files, handle_deps, autoload, prefix, archprefix, verbose, 
! 		  local_list, global_list, global_install)
  
    # Check that the directory in prefix exist. If it doesn't: create it!
    if (! exist (prefix, "dir"))
***************
*** 491,497 ****
    ## Uncompress the packages and read the DESCRIPTION files
    tmpdirs = packdirs = descriptions = {};
    try
- 
      ## Warn about non existent files 
      for i = 1:length (files)
        if (isempty (glob(files{i}))) 
--- 513,518 ----
***************
*** 549,560 ****
  	  [dummy, nm] = fileparts (tgz); 
  	  if ((length (nm) >= length (desc.name))
  	      && ! strcmp (desc.name, nm(1:length(desc.name))))
! 	    error ("package name '%s' doesn't correspond to its filename '%s'", desc.name, nm);
  	  endif
  
  	  ## Set default installation directory
  	  desc.dir = fullfile (prefix, strcat (desc.name, "-", desc.version));
  
  	  ## Save desc
  	  descriptions{end+1} = desc;
  
--- 570,586 ----
  	  [dummy, nm] = fileparts (tgz); 
  	  if ((length (nm) >= length (desc.name))
  	      && ! strcmp (desc.name, nm(1:length(desc.name))))
! 	    error ("package name '%s' doesn't correspond to its filename '%s'", 
! 		   desc.name, nm);
  	  endif
  
  	  ## Set default installation directory
  	  desc.dir = fullfile (prefix, strcat (desc.name, "-", desc.version));
  
+ 	  ## Set default architectire dependent installation directory
+ 	  desc.archprefix = fullfile (archprefix, strcat (desc.name, "-",
+ 							  desc.version));
+ 
  	  ## Save desc
  	  descriptions{end+1} = desc;
  
***************
*** 656,665 ****
      for i = 1:length (descriptions)
        desc = descriptions{i};
        pdir = packdirs{i};
!       copy_files (desc, pdir);
!       create_pkgadddel (desc, pdir, "PKG_ADD");
!       create_pkgadddel (desc, pdir, "PKG_DEL");
!       finish_installation (desc, pdir)
      endfor
    catch
      ## Something went wrong, delete tmpdirs
--- 682,691 ----
      for i = 1:length (descriptions)
        desc = descriptions{i};
        pdir = packdirs{i};
!       copy_files (desc, pdir, global_install);
!       create_pkgadddel (desc, pdir, "PKG_ADD", global_install);
!       create_pkgadddel (desc, pdir, "PKG_DEL", global_install);
!       finish_installation (desc, pdir, global_install)
      endfor
    catch
      ## Something went wrong, delete tmpdirs
***************
*** 668,673 ****
--- 694,700 ----
      endfor
      for i = 1:length (descriptions)
        rm_rf (descriptions{i}.dir);
+       rm_rf (getarchdir (descriptions{i}));
      endfor
      rethrow (lasterror ());
    end_try_catch
***************
*** 675,683 ****
    ## Check if the installed directory is empty. If it is remove it
    ## from the list
    for i = length (descriptions):-1:1
!     if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}))
        warning ("package %s is empty\n", descriptions{i}.name);
        rm_rf (descriptions{i}.dir);
        descriptions(i) = [];
      endif
    endfor
--- 702,712 ----
    ## Check if the installed directory is empty. If it is remove it
    ## from the list
    for i = length (descriptions):-1:1
!     if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) &&
! 	dirempty (getarchdir (descriptions{i})))
        warning ("package %s is empty\n", descriptions{i}.name);
        rm_rf (descriptions{i}.dir);
+       rm_rf (getarchdir (descriptions{i}));
        descriptions(i) = [];
      endif
    endfor
***************
*** 738,744 ****
  	idx (end + 1) = i;
        endif
      endfor
!     load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst);
    endif
  endfunction
  
--- 767,774 ----
  	idx (end + 1) = i;
        endif
      endfor
!     load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst,
! 				    global_install);
    endif
  endfunction
  
***************
*** 826,833 ****
      ## Do the actual deletion
      if (desc.loaded)
        rmpath (desc.dir);
!       if (exist (fullfile (desc.dir, getarch()), "dir"))
! 	rmpath (fullfile (desc.dir, getarch ()));
        endif
      endif
      if (exist (desc.dir, "dir"))
--- 856,863 ----
      ## Do the actual deletion
      if (desc.loaded)
        rmpath (desc.dir);
!       if (exist (getarchdir (desc)))
! 	rmpath (getarchdir (desc));
        endif
      endif
      if (exist (desc.dir, "dir"))
***************
*** 835,840 ****
--- 865,877 ----
        if (status != 1)
  	error ("couldn't delete directory %s: %s", desc.dir, msg);
        endif
+       [status, msg] = rm_rf (getarchdir (desc));
+       if (status != 1)
+ 	error ("couldn't delete directory %s: %s", getarchdir (desc), msg);
+       endif
+       if (dirempty (desc.archprefix))
+ 	rm_rf (desc.archprefix);
+       endif
      else
        warning ("directory %s previously lost", desc.dir);
      endif
***************
*** 894,900 ****
        if (exist (fullfile (pack.name, "inst", "bin"), "dir"))
  	movefile (fullfile (pack.name, "inst", "bin"), pack.name);
        endif
!       archdir = fullfile (pack.name, "inst", getarch ());
        if (exist (archdir, "dir"))
  	if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file"))
  	  unlink (fullfile (pack.name, "inst", "PKG_ADD"));
--- 931,938 ----
        if (exist (fullfile (pack.name, "inst", "bin"), "dir"))
  	movefile (fullfile (pack.name, "inst", "bin"), pack.name);
        endif
!       archdir = fullfile (pack.archprefix, strcat (pack.name, "-",
! 			  pack.version), getarch ());
        if (exist (archdir, "dir"))
  	if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file"))
  	  unlink (fullfile (pack.name, "inst", "PKG_ADD"));
***************
*** 1123,1138 ****
    endif
  endfunction
  
! function create_pkgadddel (desc, packdir, nm)
    instpkg = fullfile (desc.dir, nm);
    instfid = fopen (instpkg, "wt");
    ## If it is exists, most of the  PKG_* file should go into the 
    ## architecture dependent directory so that the autoload/mfilename 
    ## commands work as expected. The only part that doesn't is the
    ## part in the main directory.
!   if (exist (fullfile (desc.dir, getarch ()), "dir"))
!     archpkg = fullfile (desc.dir, getarch (), nm);
!     archfid = fopen (archpkg, "wt");
    else
      archpkg = instpkg;
      archfid = instfid;
--- 1161,1178 ----
    endif
  endfunction
  
! function create_pkgadddel (desc, packdir, nm, global_install)
    instpkg = fullfile (desc.dir, nm);
    instfid = fopen (instpkg, "wt");
    ## If it is exists, most of the  PKG_* file should go into the 
    ## architecture dependent directory so that the autoload/mfilename 
    ## commands work as expected. The only part that doesn't is the
    ## part in the main directory.
!   archdir = fullfile (getarchprefix (desc), strcat (desc.name, "-",
! 		      desc.version), getarch ());
!   if (exist (getarchdir (desc, global_install), "dir"))
!     archpkg = fullfile (getarchdir (desc, global_install), nm);
!     archfid = fopen (archpkg, "at");
    else
      archpkg = instpkg;
      archfid = instfid;
***************
*** 1186,1192 ****
    endif
  endfunction
  
! function copy_files (desc, packdir, bindir)
    ## Create the installation directory
    if (! exist (desc.dir, "dir"))
      [status, output] = mkdir (desc.dir);
--- 1226,1232 ----
    endif
  endfunction
  
! function copy_files (desc, packdir, global_install)
    ## Create the installation directory
    if (! exist (desc.dir, "dir"))
      [status, output] = mkdir (desc.dir);
***************
*** 1196,1201 ****
--- 1236,1243 ----
      endif
    endif
  
+   octfiledir = getarchdir (desc);
+ 
    ## Copy the files from "inst" to installdir
    instdir = fullfile (packdir, "inst");
    if (! dirempty (instdir))
***************
*** 1204,1209 ****
--- 1246,1300 ----
        rm_rf (desc.dir);
        error ("couldn't copy files to the installation directory");
      endif
+     if (exist (fullfile (desc.dir, getarch ()), "dir") &&
+ 	! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
+       if (! exist (octfiledir, "dir"))
+         ## Can be required to create upto three levels of dirs
+         octm1 = fileparts (octfiledir);
+         if (! exist (octm1, "dir"))
+           octm2 = fileparts (octm1);
+           if (! exist (octm2, "dir"))
+             octm3 = fileparts (octm2);
+             if (! exist (octm3, "dir"))
+               [status, output] = mkdir (octm3);
+               if (status != 1)
+                 rm_rf (desc.dir);
+                 error ("couldn't create installation directory %s : %s", 
+                        octm3, output);
+               endif
+             endif
+             [status, output] = mkdir (octm2);
+             if (status != 1)
+               rm_rf (desc.dir);
+               error ("couldn't create installation directory %s : %s", 
+                      octm2, output);
+             endif
+           endif
+           [status, output] = mkdir (octm1);
+           if (status != 1)
+             rm_rf (desc.dir);
+             error ("couldn't create installation directory %s : %s", 
+                    octm1, output);
+           endif
+         endif
+         [status, output] = mkdir (octfiledir);
+         if (status != 1)
+           rm_rf (desc.dir);
+           error ("couldn't create installation directory %s : %s", 
+           octfiledir, output);
+         endif
+       endif
+       [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), 
+ 				   octfiledir);
+       rm_rf (fullfile (desc.dir, getarch ()));
+ 
+       if (status != 1)
+         rm_rf (desc.dir);
+         rm_rf (octfiledir);
+         error ("couldn't copy files to the installation directory");
+       endif
+     endif
+ 
    endif
  
    ## Create the "packinfo" directory
***************
*** 1211,1231 ****
    [status, msg] = mkdir (packinfo);
    if (status != 1)
      rm_rf (desc.dir);
      error ("couldn't create packinfo directory: %s", msg);
    endif
  
    ## Copy DESCRIPTION
    [status, output] = copyfile (fullfile (packdir, "DESCRIPTION"), packinfo);
    if (status != 1)
!    rm_rf (desc.dir);
!    error ("couldn't copy DESCRIPTION: %s", output);
    endif
  
    ## Copy COPYING
    [status, output] = copyfile (fullfile (packdir, "COPYING"), packinfo);
    if (status != 1)
!    rm_rf (desc.dir);
!    error ("couldn't copy COPYING: %s", output);
    endif
  
    ## If the file ChangeLog exists, copy it
--- 1302,1325 ----
    [status, msg] = mkdir (packinfo);
    if (status != 1)
      rm_rf (desc.dir);
+     rm_rf (octfiledir);
      error ("couldn't create packinfo directory: %s", msg);
    endif
  
    ## Copy DESCRIPTION
    [status, output] = copyfile (fullfile (packdir, "DESCRIPTION"), packinfo);
    if (status != 1)
!     rm_rf (desc.dir);
!     rm_rf (octfiledir);
!     error ("couldn't copy DESCRIPTION: %s", output);
    endif
  
    ## Copy COPYING
    [status, output] = copyfile (fullfile (packdir, "COPYING"), packinfo);
    if (status != 1)
!     rm_rf (desc.dir);
!     rm_rf (octfiledir);
!     error ("couldn't copy COPYING: %s", output);
    endif
  
    ## If the file ChangeLog exists, copy it
***************
*** 1234,1239 ****
--- 1328,1334 ----
      [status, output] = copyfile (fChangeLog, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy ChangeLog file: %s", output);
      endif
    endif
***************
*** 1244,1257 ****
      [status, output] = copyfile (fINDEX, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
        error ("couldn't copy INDEX file: %s", output);
      endif
    else
      try
        write_INDEX (desc, fullfile (packdir, "inst"),
! 		   fullfile (packinfo, "INDEX"));
      catch
        rm_rf (desc.dir);
        rethrow (lasterror ());
      end_try_catch
    endif
--- 1339,1354 ----
      [status, output] = copyfile (fINDEX, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy INDEX file: %s", output);
      endif
    else
      try
        write_INDEX (desc, fullfile (packdir, "inst"),
! 		   fullfile (packinfo, "INDEX"), global_install);
      catch
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        rethrow (lasterror ());
      end_try_catch
    endif
***************
*** 1262,1267 ****
--- 1359,1365 ----
      [status, output] = copyfile (fon_uninstall, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy on_uninstall.m: %s", output);
      endif
    endif
***************
*** 1269,1285 ****
    ## Is there a doc/ directory that needs to be installed
    docdir = fullfile (packdir, "doc");
    if (exist (docdir, "dir") && ! dirempty (docdir))
!    [status, output] = copyfile (docdir, desc.dir);
    endif
  
    ## Is there a bin/ directory that needs to be installed
    bindir = fullfile (packdir, "bin");
    if (exist (bindir, "dir") && ! dirempty (bindir))
!    [status, output] = copyfile (bindir, desc.dir);
    endif
  endfunction
  
! function finish_installation (desc, packdir)
    ## Is there a post-install to call?
    if (exist (fullfile (packdir, "post_install.m"), "file"))
      wd = pwd ();
--- 1367,1383 ----
    ## Is there a doc/ directory that needs to be installed
    docdir = fullfile (packdir, "doc");
    if (exist (docdir, "dir") && ! dirempty (docdir))
!     [status, output] = copyfile (docdir, desc.dir);
    endif
  
    ## Is there a bin/ directory that needs to be installed
    bindir = fullfile (packdir, "bin");
    if (exist (bindir, "dir") && ! dirempty (bindir))
!     [status, output] = copyfile (bindir, desc.dir);
    endif
  endfunction
  
! function finish_installation (desc, packdir, global_install)
    ## Is there a post-install to call?
    if (exist (fullfile (packdir, "post_install.m"), "file"))
      wd = pwd ();
***************
*** 1290,1295 ****
--- 1388,1394 ----
      catch
        cd (wd);
        rm_rf (desc.dir);
+       rm_rf (getarchdir (desc), global_install);
        rethrow (lasterror ());
      end_try_catch
    endif
***************
*** 1470,1476 ****
  ##   'desc'  describes the package.
  ##   'dir'   is the 'inst' direcotyr in temporary directory.
  ##   'INDEX' is the name (including path) of resulting INDEX file.
! function write_INDEX (desc, dir, INDEX)
    ## Get names of functions in dir
    [files, err, msg] = readdir (dir);
    if (err)
--- 1569,1575 ----
  ##   'desc'  describes the package.
  ##   'dir'   is the 'inst' direcotyr in temporary directory.
  ##   'INDEX' is the name (including path) of resulting INDEX file.
! function write_INDEX (desc, dir, INDEX, global_install)
    ## Get names of functions in dir
    [files, err, msg] = readdir (dir);
    if (err)
***************
*** 1478,1485 ****
    endif
  
    ## Check for architecture dependent files
!   arch = getarch();
!   tmpdir = fullfile (dir, arch);
    if (exist (tmpdir, "dir"))
      [files2, err, msg] = readdir (tmpdir);
      if (err)
--- 1577,1583 ----
    endif
  
    ## Check for architecture dependent files
!   tmpdir = getarchdir (desc);
    if (exist (tmpdir, "dir"))
      [files2, err, msg] = readdir (tmpdir);
      if (err)
***************
*** 1718,1724 ****
    endif
  
    ## Load the packages, but take care of the ordering of dependencies
!   load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst);
  endfunction
  
  function unload_packages (files, handle_deps, local_list, global_list)
--- 1816,1822 ----
    endif
  
    ## Load the packages, but take care of the ordering of dependencies
!   load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst, true);
  endfunction
  
  function unload_packages (files, handle_deps, local_list, global_list)
***************
*** 1739,1773 ****
    ## unload all
    if (length (files) == 1 && strcmp (files{1}, "all"))
        dirs = pdirs;
    ## unload package_name1 ...
    else
      dirs = {};
      for i = 1:length (files)
!       idx = strcmp (pnames, files{i});
        if (! any (idx))
  	error ("package %s is not installed", files{i});
        endif
! 	dirs{end+1} = pdirs{idx};
        endfor
    endif
  
    ## Check for architecture dependent directories
-   arch = getarch();
    archdirs = {};
    for i = 1:length (dirs)
!     tmpdir = fullfile (dirs{i}, arch);
      if (exist (tmpdir, "dir"))
        archdirs{end + 1} = dirs{i};
        archdirs{end + 1} = tmpdir;
      endif
    endfor
-   if (length (archdirs) > 0)
-     dirs = archdirs;
-   endif
  
    ## Unload the packages
!   for i = 1:length (dirs)
!     d = dirs{i};
      idx = strcmp (p, d);
      if (any (idx))
        rmpath (d);
--- 1837,1872 ----
    ## unload all
    if (length (files) == 1 && strcmp (files{1}, "all"))
        dirs = pdirs;
+       desc = installed_pkgs_lst;
    ## unload package_name1 ...
    else
      dirs = {};
+     desc = {};
      for i = 1:length (files)
!       idx = strcmp (pnames, files {i});
        if (! any (idx))
  	error ("package %s is not installed", files{i});
        endif
! 	dirs {end + 1} = pdirs {idx};
!         desc {end + 1} = installed_pkgs_lst {idx};
        endfor
    endif
  
    ## Check for architecture dependent directories
    archdirs = {};
    for i = 1:length (dirs)
!     tmpdir = getarchdir (desc {i});
      if (exist (tmpdir, "dir"))
        archdirs{end + 1} = dirs{i};
        archdirs{end + 1} = tmpdir;
+     else
+       archdirs{end+ 1} = dirs {i};
      endif
    endfor
  
    ## Unload the packages
!   for i = 1:length (archdirs)
!     d = archdirs{i};
      idx = strcmp (p, d);
      if (any (idx))
        rmpath (d);
***************
*** 1777,1789 ****
  endfunction
  
  function [status_out, msg_out] = rm_rf (dir)
!   crr = confirm_recursive_rmdir ();
!   unwind_protect
!     confirm_recursive_rmdir (false);
!     [status, msg] = rmdir (dir, "s");
!   unwind_protect_cleanup
!     confirm_recursive_rmdir (crr);
!   end_unwind_protect
    if (nargout > 0)
      status_out = status;
    endif
--- 1876,1893 ----
  endfunction
  
  function [status_out, msg_out] = rm_rf (dir)
!   if (exist (dir))
!     crr = confirm_recursive_rmdir ();
!     unwind_protect
!       confirm_recursive_rmdir (false);
!       [status, msg] = rmdir (dir, "s");
!     unwind_protect_cleanup
!       confirm_recursive_rmdir (crr);
!     end_unwind_protect
!   else
!     status = 1;
!     msg = "";
!   endif
    if (nargout > 0)
      status_out = status;
    endif
***************
*** 1793,1818 ****
  endfunction
  
  function emp = dirempty (nm, ign)
!   if (nargin < 2)
!     ign = {".", ".."};
!   else
!     ign = [{".", ".."}, ign];
!   endif
!   l = dir (nm);
!   for i = 1:length (l)
!     found = false;
!     for j = 1:length (ign)
!       if (strcmp (l(i).name, ign{j}))
!         found = true;
!         break;
        endif
      endfor
!     if (! found)
!       emp = false;
!       return
!     endif
!   endfor
!   emp = true;
  endfunction
  
  function arch = getarch ()
--- 1897,1926 ----
  endfunction
  
  function emp = dirempty (nm, ign)
!   if (exist (nm, "dir"))
!     if (nargin < 2)
!       ign = {".", ".."};
!     else
!       ign = [{".", ".."}, ign];
!     endif
!     l = dir (nm);
!     for i = 1:length (l)
!       found = false;
!       for j = 1:length (ign)
!         if (strcmp (l(i).name, ign{j}))
!           found = true;
!           break;
!         endif
!       endfor
!       if (! found)
!         emp = false;
!         return
        endif
      endfor
!     emp = true;
!   else
!     emp = true;
!   endif
  endfunction
  
  function arch = getarch ()
***************
*** 1821,1826 ****
--- 1929,1955 ----
    arch = _arch;
  endfunction
  
+ function archprefix = getarchprefix (desc, global_install)
+   if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ()))
+     archprefix = fullfile (octave_config_info ("libexecdir"), "octave", 
+ 			   "packages", strcat(desc.name, "-", desc.version));
+   else
+     archprefix = desc.dir;
+   endif
+ endfunction
+ 
+ function archdir = getarchdir (desc)
+   archdir = fullfile (desc.archprefix, getarch());
+ endfunction
+ 
+ function s = issuperuser ()
+   if ((ispc () && ! isunix ()) || (geteuid() == 0))
+     s = true;
+   else
+     s = false;
+   endif
+ endfunction
+ 
  function [status, output] = shell (cmd)
    persistent have_sh;
  
***************
*** 1879,1887 ****
    newdesc(idx) = [];
  endfunction
  
! function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst)
    idx = load_package_dirs (idx, [], handle_deps, installed_pkgs_lst);
-   arch = getarch ();
    dirs = {};
    execpath = EXEC_PATH ();
    for i = idx;
--- 2008,2016 ----
    newdesc(idx) = [];
  endfunction
  
! function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst,
! 					 global_install)
    idx = load_package_dirs (idx, [], handle_deps, installed_pkgs_lst);
    dirs = {};
    execpath = EXEC_PATH ();
    for i = idx;
***************
*** 1890,1896 ****
      if (exist (fullfile (dirs{end}, "bin"), "dir"))
        execpath = strcat (fullfile(dirs{end}, "bin"), ":", execpath);
      endif
!     tmpdir = fullfile (ndir, arch);
      if (exist (tmpdir, "dir"))
        dirs{end + 1} = tmpdir;
      endif
--- 2019,2025 ----
      if (exist (fullfile (dirs{end}, "bin"), "dir"))
        execpath = strcat (fullfile(dirs{end}, "bin"), ":", execpath);
      endif
!     tmpdir = getarchdir (installed_pkgs_lst {i});
      if (exist (tmpdir, "dir"))
        dirs{end + 1} = tmpdir;
      endif


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- octave.spec	18 Sep 2007 16:20:31 -0000	1.58
+++ octave.spec	25 Sep 2007 21:00:54 -0000	1.59
@@ -3,13 +3,14 @@
 
 Name:           octave
 Version:        2.9.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv2+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.9.14-pkg.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .pkg
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -96,6 +98,7 @@
 HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
 
 
 %clean
@@ -123,6 +126,7 @@
 %config(noreplace) /etc/ld.so.conf.d/*
 %{_libdir}/octave*
 %{_datadir}/octave
+%ghost %{_datadir}/octave/octave_packages
 %{_libexecdir}/octave
 %{_mandir}/man*/octave*
 %{_infodir}/octave.info*
@@ -137,6 +141,11 @@
 
 
 %changelog
+* Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
+- Add /usr/share/octave/packages for add on packages and %%ghost 
+  /usr/share/octave/packages/octave_packages
+- Add patch for octave package manager that will be going upstream
+
 * Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1
 - New release.
 - Remove redundant menu category in desktop file (bug 274431).



From fedora-extras-commits at redhat.com  Tue Sep 25 21:08:07 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 17:08:07 -0400
Subject: rpms/frysk/F-7 .cvsignore, 1.46, 1.47 frysk.spec, 1.114,
	1.115 sources, 1.46, 1.47
Message-ID: <200709252108.l8PL87Yn007675@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7631

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Update files list.
- Fix path to dogtail_scripts.
- Fix touch paths to allow for build sub-directory.
- Import frysk-0.0.1.2007.09.24.tar.bz2.
- Remove frysk-20060922-a-cast.patch
- Remove frysk-xfail-2130.patch.
- Run bootstrap.sh over source tree.
- Add autoconf, automake, and libtool to BuildRequires.
- Remove binutils-devel from BuildRequires.
- Build in separate sub-directory.
- Do not force JV_SCAN into the build environment.
- Update Licence.
- Change BuildRoot to prefered fedora format.
- Expand Summary to mention debugging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2007 16:03:08 -0000	1.46
+++ .cvsignore	25 Sep 2007 21:07:35 -0000	1.47
@@ -1 +1 @@
-frysk-0.0.1.2007.03.13.rh1.tar.bz2
+frysk-0.0.1.2007.09.24.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/frysk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- frysk.spec	13 Mar 2007 16:40:08 -0000	1.114
+++ frysk.spec	25 Sep 2007 21:07:35 -0000	1.115
@@ -1,23 +1,29 @@
-Summary:	Frysk execution analysis tool
+Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
-Version:	0.0.1.2007.03.13.rh1
+Version:	0.0.1.2007.09.24
 Release:	1%{?dist}
-License:	GPL
+# antlrv2 is Public Domain; antlrv3 is BSD.
+# cdtparser is EPL
+# getopt is GPLv2 with exception
+# elfutils is GPLv2 with exception
+# frysk is GPLv2 with exception
+# junit licence is CPL (according to the junit rpm)
+# jline licence is BSD
+# libunwind is BSD
+License:	GPLv2 with exceptions and BSD and CPL and Public Domain and EPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands, which brand the file with the contents of version.in,
+# to generate the tarball:
+#  cvs -d:pserver:anoncvs at sourceware.org:/cvs/frysk export -D YYYY-MM-DD-gmt
+#  mv frysk frysk-`cat frysk/common/version.in`
+#  tar cf - frysk-`cat frysk/common/version.in` | bzip2 -9 > frysk-`cat frysk/common/version.in`.tar.bz2
 Source:		%{name}-%{version}.tar.bz2
 
 %define run_make_check 0
 
-%if %{run_make_check}
-# Disable the test which fails when building on older kernel.
-Patch0:		frysk-xfail-2130.patch
-%endif
-
-# Prevent a warning from a new g++:
-Patch1:		frysk-20060922-a-cast.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	glib-java >= 0.2.6
 
@@ -39,17 +45,16 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	gnome-python2-gconf
 BuildRequires:	audit-libs-devel
-
-# Fedora Core >= 6 and RHEL:
-%if "%{?fedora}" != "5"
-BuildRequires:	binutils-devel
-BuildRequires:	dogtail >= 0.5.2
+BuildRequires:	autoconf automake libtool
 
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 
+# Fedora Core >= 6 and RHEL:
+%if "%{?fedora}" != "5"
+BuildRequires:	dogtail >= 0.5.2
 # Needed by "dogtail-run-headless -n":
 Buildrequires:	metacity
 %endif
@@ -65,12 +70,13 @@
 %endif
 
 %description
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 %package devel
 Summary:        The development part of Frysk.
@@ -78,8 +84,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
-Frysk is an execution-analysis technology implemented using native Java and C++.
-This package contains the development part of Frysk.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
 Summary:        The GUI frontend of Frysk.
@@ -90,21 +96,19 @@
 Requires: 	libvte-java >= 0.12.0
 
 %description gnome
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 This package contains the GUI front end for Frysk.
 
 %prep
 %setup -q -n %{name}-%{version}
-%if %{run_make_check}
-%patch0
-%endif
-%patch1
+./bootstrap.sh
 
 %build 
 
@@ -119,22 +123,31 @@
 export CC=${CC:-/usr/bin/gcc}
 export CXX=${CXX:-/usr/bin/g++}
 export JAVA=${JAVA:-/usr/bin/gij}
-export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
 uname -a
 gcc --version
+pwd
+mkdir -p build
+cd build
+
+# Capture the configure line
+rm -f configure
+echo '#!/bin/sh -x'		>> configure
+echo 'exec ../configure "$@"'	>> configure
+chmod a+x configure
 
 # FIXME: Warnings should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
-	--disable-arch32-tests --disable-werror
-
+	--disable-arch32-tests
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
 touch frysk-gui/checked-glade-xml
 
-make %{?_smp_mflags}
+# in frysk-sys; make is building .o files before all BUILT_FILES are
+# created.
+make # %{?_smp_mflags}
 
 %if %{run_make_check}
 %check
@@ -148,22 +161,26 @@
 # Workaround for bug #??:
 mkdir -p $RPM_BUILD_ROOT/usr/share/frysk
 
+pwd
+cd build
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Fix timestamp of a generated script:
-touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
+touch -r \
+      ../frysk-gui/frysk/gui/FryskGui.javain \
+      $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
-# ... well, these are not installed by current tarball...
-#for f in test2866.py test2985.py test3380.py; do
-#  touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
-#done
+for f in test2866.py test2985.py test3380.py; do
+    touch -r \
+    	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/$f
+done
 
 # Workaround for #211824:
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop .
-
+mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -174,6 +191,10 @@
 %files
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
+%{_bindir}/fdebuginfo
+%{_bindir}/fdebugrpm
+%{_bindir}/fexe
+%{_bindir}/fltrace
 %{_bindir}/ftrace
 %{_bindir}/fstack
 %{_bindir}/fcore
@@ -185,7 +206,7 @@
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-imports.so
+%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
 %dir %{_datadir}/%{name}
@@ -196,9 +217,20 @@
 %defattr(-,root,root)
 %{_libdir}/libfrysk-junit.so
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
+%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/hpd-c
+%{_libdir}/%{name}/test1
+%{_libdir}/%{name}/fsystest
+%{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test_main_looper
+%{_datadir}/%{name}/ChangeLog
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test?*
+%{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/test-core-*
+%{_datadir}/%{name}/test-exe-*
+# Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
 %{_datadir}/%{name}/dogtail_scripts
@@ -222,6 +254,22 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Update files list.
+- Fix path to dogtail_scripts.
+- Fix touch paths to allow for build sub-directory.
+- Import frysk-0.0.1.2007.09.24.tar.bz2.
+- Remove frysk-20060922-a-cast.patch
+- Remove frysk-xfail-2130.patch.
+- Run bootstrap.sh over source tree.
+- Add autoconf, automake, and libtool to BuildRequires.
+- Remove binutils-devel from BuildRequires.
+- Build in separate sub-directory.
+- Do not force JV_SCAN into the build environment.
+- Update Licence.
+- Change BuildRoot to prefered fedora format.
+- Expand Summary to mention debugging.
+
 * Tue Mar 13 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2007.03.13.rh1-1
 - New upstream version, adapt the file list.
 - Remove frysk-no-dejagnu.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2007 16:03:08 -0000	1.46
+++ sources	25 Sep 2007 21:07:35 -0000	1.47
@@ -1 +1 @@
-b87ee4af3553a31b12e0b430de1225d1  frysk-0.0.1.2007.03.13.rh1.tar.bz2
+34b8a93e1b7b9e4f97d3ae4c57f25d57  frysk-0.0.1.2007.09.24.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:25:50 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 17:25:50 -0400
Subject: rpms/passwd/devel passwd.spec,1.32,1.33
Message-ID: <200709252125.l8PLPo7U008653@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/passwd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592

Modified Files:
	passwd.spec 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.74-5
- buildrequires popt-devel



Index: passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- passwd.spec	23 Aug 2007 23:22:45 -0000	1.32
+++ passwd.spec	25 Sep 2007 21:25:17 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
 Version: 0.74
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -58,6 +58,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.74-5
+- buildrequires popt-devel
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> 0.74-4
 - spec file cleanups
 



From fedora-extras-commits at redhat.com  Tue Sep 25 21:37:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 17:37:58 -0400
Subject: rpms/libselinux/F-7 libselinux-swig.patch, 1.1, 1.2 libselinux.spec,
	1.270, 1.271
Message-ID: <200709252137.l8PLbwXV008973@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8950

Modified Files:
	libselinux-swig.patch libselinux.spec 
Log Message:
* Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
- Fix swig use of fsetfilecon_raw


libselinux-swig.patch:

Index: libselinux-swig.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-swig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libselinux-swig.patch	13 Sep 2007 13:19:04 -0000	1.1
+++ libselinux-swig.patch	25 Sep 2007 21:37:26 -0000	1.2
@@ -1,5 +1,18 @@
---- libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:13:49.000000000 -0400
-+++ libselinux-2.0.14.new/src/selinuxswig.i	2007-09-13 09:07:20.000000000 -0400
+diff -up libselinux-2.0.14/src/fsetfilecon.c.swig libselinux-2.0.14/src/fsetfilecon.c
+--- libselinux-2.0.14/src/fsetfilecon.c.swig	2007-09-25 17:34:07.000000000 -0400
++++ libselinux-2.0.14/src/fsetfilecon.c	2007-09-25 17:35:17.000000000 -0400
+@@ -13,7 +13,7 @@ int fsetfilecon_raw(int fd, security_con
+ 			 0);
+ }
+ 
+-hidden_def(setfilecon_raw)
++hidden_def(fsetfilecon_raw)
+ 
+ int fsetfilecon(int fd, security_context_t context)
+ {
+diff -up libselinux-2.0.14/src/selinuxswig.i.swig libselinux-2.0.14/src/selinuxswig.i
+--- libselinux-2.0.14/src/selinuxswig.i.swig	2007-09-13 09:17:31.000000000 -0400
++++ libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:17:31.000000000 -0400
 @@ -1,7 +1,9 @@
 -/* Author: Dan Walsh
 +/* Authors: Dan Walsh
@@ -245,8 +258,9 @@
 +%include "../include/selinux/selinux.h"
 +%include "../include/selinux/get_default_type.h"
 +%include "../include/selinux/get_context_list.h"
---- libselinux-2.0.14/src/selinuxswig_python.i	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.14.new/src/selinuxswig_python.i	2007-09-13 09:07:28.000000000 -0400
+diff -up /dev/null libselinux-2.0.14/src/selinuxswig_python.i
+--- /dev/null	2007-09-21 05:53:11.538007738 -0400
++++ libselinux-2.0.14/src/selinuxswig_python.i	2007-09-13 09:17:31.000000000 -0400
 @@ -0,0 +1,138 @@
 +/* Author: James Athey
 + *
@@ -386,9 +400,10 @@
 +}
 +
 +%include "selinuxswig.i"
---- libselinux-2.0.14/Makefile	2007-09-13 09:13:49.000000000 -0400
-+++ libselinux-2.0.14.new/Makefile	2007-09-13 09:08:20.000000000 -0400
-@@ -2,7 +2,7 @@
+diff -up libselinux-2.0.14/Makefile.swig libselinux-2.0.14/Makefile
+--- libselinux-2.0.14/Makefile.swig	2007-09-13 09:17:31.000000000 -0400
++++ libselinux-2.0.14/Makefile	2007-09-13 09:17:31.000000000 -0400
+@@ -2,7 +2,7 @@ all: 
  	$(MAKE) -C src 
  	$(MAKE) -C utils
  


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- libselinux.spec	13 Sep 2007 13:19:04 -0000	1.270
+++ libselinux.spec	25 Sep 2007 21:37:26 -0000	1.271
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -126,6 +126,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
+- Fix swig use of fsetfilecon_raw
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
 - Update swig bindings
 - Fix getfilecon return codes



From fedora-extras-commits at redhat.com  Tue Sep 25 21:42:10 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 17:42:10 -0400
Subject: devel/livecd-tools .cvsignore, 1.11, 1.12 livecd-tools.spec, 1.11, 
	1.12 sources, 1.11, 1.12
Message-ID: <200709252142.l8PLgATk009282@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/livecd-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9253

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 012-1
- Allow %post --nochroot to work for putting files in the root of the iso
- Set environment variables for when %post is run
- Add progress for downloads (Colin Walters)
- Add cachedir option (Colin Walters)
- Fixes for ppc/ppc64 to work again
- Clean up bootloader config a little
- Enable swaps in the default desktop config
- Ensure all configs are installed (#281911)
- Convert method line to a repo for easier config reuse (jkeating)
- Kill the modprobe FATAL warnings (#240585)
- Verify isos with iso-to-disk script
- Allow passing xdriver for setting the xdriver (#291281)
- Add turboliveinst patch (Douglas McClendon)
- Make iso-to-disk support --resetmbr (#294041)
- Clean up filesystem layout (Douglas McClendon)
- Manifest tweaks for most configs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2007 23:53:30 -0000	1.11
+++ .cvsignore	25 Sep 2007 21:41:38 -0000	1.12
@@ -1 +1 @@
-livecd-tools-011.tar.bz2
+livecd-tools-012.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/livecd-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- livecd-tools.spec	28 Aug 2007 21:25:34 -0000	1.11
+++ livecd-tools.spec	25 Sep 2007 21:41:38 -0000	1.12
@@ -1,6 +1,8 @@
+%define debug_package %{nil}
+
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 011
+Version: 012
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -15,6 +17,7 @@
 Requires: squashfs-tools
 Requires: pykickstart
 Requires: dosfstools >= 2.11-8
+Requires: isomd5sum
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -52,6 +55,24 @@
 %{_datadir}/livecd-tools/*
 
 %changelog
+* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 012-1
+- Allow %%post --nochroot to work for putting files in the root of the iso
+- Set environment variables for when %%post is run
+- Add progress for downloads (Colin Walters)
+- Add cachedir option (Colin Walters)
+- Fixes for ppc/ppc64 to work again
+- Clean up bootloader config a little
+- Enable swaps in the default desktop config
+- Ensure all configs are installed (#281911)
+- Convert method line to a repo for easier config reuse (jkeating)
+- Kill the modprobe FATAL warnings (#240585)
+- Verify isos with iso-to-disk script
+- Allow passing xdriver for setting the xdriver (#291281)
+- Add turboliveinst patch (Douglas McClendon)
+- Make iso-to-disk support --resetmbr (#294041)
+- Clean up filesystem layout (Douglas McClendon)
+- Manifest tweaks for most configs
+
 * Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 011-1
 - Many config updates for Fedora 8
 - Support $basearch in repo line of configs; use it


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2007 23:53:30 -0000	1.11
+++ sources	25 Sep 2007 21:41:38 -0000	1.12
@@ -1 +1 @@
-303b0ab614b0dd4aa14f129153afe242  livecd-tools-011.tar.bz2
+12465bf127b9b390bbb7534b84407f93  livecd-tools-012.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:37 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:37 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLoglu025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchbugzilla acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:39 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:39 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLoglx025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchcommits acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:41 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLogm2025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the commit acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:46 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8H025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchbugzilla acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:48 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:48 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8K025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchcommits acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:50 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8N025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the commit acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:13 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:13 -0700
Subject: [pkgdb] libvirt: veillard has requested watchbugzilla
Message-ID: <200709252151.l8PLop8P025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:14 -0700
Subject: [pkgdb] libvirt: veillard has requested watchcommits
Message-ID: <200709252151.l8PLpJ4e025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:21 -0700
Subject: [pkgdb] libvirt: veillard has requested watchbugzilla
Message-ID: <200709252151.l8PLpMnP025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchbugzilla acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:17 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:17 -0700
Subject: [pkgdb] libvirt: veillard has requested commit
Message-ID: <200709252151.l8PLpMnN025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the commit acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:23 -0700
Subject: [pkgdb] libvirt: veillard has requested watchcommits
Message-ID: <200709252151.l8PLpJ4g025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchcommits acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:24 -0700
Subject: [pkgdb] libvirt: veillard has requested commit
Message-ID: <200709252151.l8PLpMnR025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the commit acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:29 -0700
Subject: [pkgdb] libvirt: veillard has requested approveacls
Message-ID: <200709252151.l8PLpJ4i025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the approveacls acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:30 -0700
Subject: [pkgdb] libvirt: veillard has requested approveacls
Message-ID: <200709252151.l8PLpMnT025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the approveacls acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:15 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 17:52:15 -0400
Subject: rpms/frysk/devel frysk.spec,1.119,1.120
Message-ID: <200709252152.l8PLqFQw009812@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9769

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
- Install frysk.desktop; but with Hidden=true.
- Sort files list.
- Remove trailing period from summaries.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- frysk.spec	25 Sep 2007 17:29:36 -0000	1.119
+++ frysk.spec	25 Sep 2007 21:51:42 -0000	1.120
@@ -79,7 +79,7 @@
 system.
 
 %package devel
-Summary:        The development part of Frysk.
+Summary:        The development part of Frysk
 Group:		Development/System
 Requires:       %{name} = %{version}-%{release}
 
@@ -88,7 +88,7 @@
 Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
-Summary:        The GUI frontend of Frysk.
+Summary:        The GNOME front-end of Frysk
 Requires:       %{name} = %{version}-%{release}
 Group:		Development/System
 Requires:   	libgconf-java
@@ -180,7 +180,7 @@
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
+echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -189,72 +189,87 @@
 rm -rf %{buildroot}
 
 %files
+
 %defattr(-,root,root)
+
 %doc COPYING frysk-imports/common/EXCEPTION
+
+%{_bindir}/fcatch
+%{_bindir}/fcore
 %{_bindir}/fdebuginfo
 %{_bindir}/fdebugrpm
 %{_bindir}/fexe
+%{_bindir}/fhpd
 %{_bindir}/fltrace
-%{_bindir}/ftrace
-%{_bindir}/fstack
-%{_bindir}/fcore
 %{_bindir}/fparser
+%{_bindir}/fstack
 %{_bindir}/fstep
-%{_bindir}/fcatch
-%{_bindir}/fhpd
+%{_bindir}/ftrace
+
 %{_libdir}/libfrysk-antlr.so
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
+%{_libdir}/libfrysk-sys.so
+
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/messages.properties
+
 %{_mandir}/man1/*
 
 %files devel
+
 %defattr(-,root,root)
+
 %{_libdir}/libfrysk-junit.so
+
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/funit*
 %{_libdir}/%{name}/hpd-c
-%{_libdir}/%{name}/test1
-%{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test1
 %{_libdir}/%{name}/test_main_looper
+
 %{_datadir}/%{name}/ChangeLog
-%{_datadir}/%{name}/libtest.so
+%{_datadir}/%{name}/dogtail_scripts
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/test-core-*
 %{_datadir}/%{name}/test-exe-*
-# Not installed by current taralls.
-#%dir %{_datadir}/%{name}/test
-#%{_datadir}/%{name}/test/test*
-%{_datadir}/%{name}/dogtail_scripts
+%{_datadir}/%{name}/test_looper.xml
+
 %{_mandir}/man8/*
 
 %files gnome
+
 %defattr(-,root,root)
+
 %{_bindir}/frysk
+
 %{_libdir}/libEggTrayIcon.so
 %{_libdir}/libfrysk-ftk.so
 %{_libdir}/libfrysk-gtk.so
 %{_libdir}/libfrysk-gui.so
 %{_libdir}/libftk*.so
+
 %{_datadir}/%{name}/glade
 %{_datadir}/%{name}/images
-# Move frysk.desktop to docdir.
-#%{_datadir}/applications/frysk.desktop
-%doc frysk.desktop
+
+%{_datadir}/applications/frysk.desktop
+
 %dir %{_datadir}/gnome/help/%{name}
 %{_datadir}/gnome/help/%{name}/*
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
+- Install frysk.desktop; but with Hidden=true.
+- Sort files list.
+- Remove trailing period from summaries.
 - Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.
 
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:15 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:52:15 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252152.l8PLpJ4l025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the approveacls acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:17 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:52:17 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252152.l8PLqME6025575@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the approveacls acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:54:05 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 25 Sep 2007 17:54:05 -0400
Subject: rpms/kernel/devel .cvsignore, 1.694, 1.695 patch-2.6.23-rc7.bz2.sign,
	1.1, NONE
Message-ID: <200709252154.l8PLs5Y0009853@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	.cvsignore 
Removed Files:
	patch-2.6.23-rc7.bz2.sign 
Log Message:
cleanup traces of rc7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- .cvsignore	25 Sep 2007 01:28:29 -0000	1.694
+++ .cvsignore	25 Sep 2007 21:53:32 -0000	1.695
@@ -4,4 +4,3 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc7-git5.bz2


--- patch-2.6.23-rc7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 22:02:05 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:02:05 -0400
Subject: rpms/alex/devel alex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709252202.l8PM25Z7016178@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16139/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alex.spec 
Log Message:
Initial commit



--- NEW FILE alex.spec ---
Name:           alex
Version:        2.1.0
Release:        3%{?dist}
Summary:        The lexer generator for Haskell

Group:          Development/Tools
License:        BSD-like
URL:            http://haskell.org/alex/
Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ghc docbook-style-xsl libxslt

%description
Alex is a tool for generating lexical analysers in Haskell, given a
description of the tokens to be recognised in the form of regular
expressions.  It is similar to the tool lex or flex for C/C++.


%prep
%setup -q


%build
runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
runhaskell Setup.lhs build
cd doc
autoreconf
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make html


%install
rm -rf ${RPM_BUILD_ROOT}
runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc ANNOUNCE LICENSE README TODO doc/alex examples
%{_bindir}/alex
%{_datadir}/alex-%{version}


%changelog
* Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
- apply a few cleanups from Jens Petersen

* Tue Apr 26 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-2
- fix a few style issues

* Fri Jan 19 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-1
- update to 2.1.0
- fix rpmlint errors

* Fri May  6 2005 Jens Petersen <petersen at redhat.com> - 2.0.1-1
- initial packaging for Fedora Haskell based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:24:22 -0000	1.1
+++ .cvsignore	25 Sep 2007 22:01:32 -0000	1.2
@@ -0,0 +1 @@
+alex-2.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:24:22 -0000	1.1
+++ sources	25 Sep 2007 22:01:32 -0000	1.2
@@ -0,0 +1 @@
+17e80d39cc3f1aba28dcea0e358c81e9  alex-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 22:03:35 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:03:35 -0400
Subject: rpms/alex/F-7 alex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709252203.l8PM3Zc2016332@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16263/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	alex.spec 
Log Message:
Initial commit



--- NEW FILE alex.spec ---
Name:           alex
Version:        2.1.0
Release:        3%{?dist}
Summary:        The lexer generator for Haskell

Group:          Development/Tools
License:        BSD-like
URL:            http://haskell.org/alex/
Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ghc docbook-style-xsl libxslt

%description
Alex is a tool for generating lexical analysers in Haskell, given a
description of the tokens to be recognised in the form of regular
expressions.  It is similar to the tool lex or flex for C/C++.


%prep
%setup -q


%build
runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
runhaskell Setup.lhs build
cd doc
autoreconf
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make html


%install
rm -rf ${RPM_BUILD_ROOT}
runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc ANNOUNCE LICENSE README TODO doc/alex examples
%{_bindir}/alex
%{_datadir}/alex-%{version}


%changelog
* Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
- apply a few cleanups from Jens Petersen

* Tue Apr 26 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-2
- fix a few style issues

* Fri Jan 19 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-1
- update to 2.1.0
- fix rpmlint errors

* Fri May  6 2005 Jens Petersen <petersen at redhat.com> - 2.0.1-1
- initial packaging for Fedora Haskell based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:24:22 -0000	1.1
+++ .cvsignore	25 Sep 2007 22:03:03 -0000	1.2
@@ -0,0 +1 @@
+alex-2.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:24:22 -0000	1.1
+++ sources	25 Sep 2007 22:03:03 -0000	1.2
@@ -0,0 +1 @@
+17e80d39cc3f1aba28dcea0e358c81e9  alex-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 22:10:55 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 25 Sep 2007 18:10:55 -0400
Subject: rpms/octave/devel octave.spec,1.59,1.60
Message-ID: <200709252210.l8PMAtsX016689@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16652

Modified Files:
	octave.spec 
Log Message:
It's /usr/share/octave/octave_packages, and it needs to exist for %ghost



Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- octave.spec	25 Sep 2007 21:00:54 -0000	1.59
+++ octave.spec	25 Sep 2007 22:10:22 -0000	1.60
@@ -99,6 +99,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
+touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
 
 
 %clean
@@ -143,7 +144,7 @@
 %changelog
 * Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
 - Add /usr/share/octave/packages for add on packages and %%ghost 
-  /usr/share/octave/packages/octave_packages
+  /usr/share/octave/octave_packages
 - Add patch for octave package manager that will be going upstream
 
 * Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1



From fedora-extras-commits at redhat.com  Tue Sep 25 22:13:58 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:13:58 -0400
Subject: rpms/alex/devel alex.spec,1.1,1.2
Message-ID: <200709252213.l8PMDwMj016806@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16784

Modified Files:
	alex.spec 
Log Message:
Build requires autoconf



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex.spec	25 Sep 2007 22:01:32 -0000	1.1
+++ alex.spec	25 Sep 2007 22:13:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc docbook-style-xsl libxslt
+BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
 %description
 Alex is a tool for generating lexical analysers in Haskell, given a
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
+- build requires autoconf
+
 * Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
 - apply a few cleanups from Jens Petersen
 



From fedora-extras-commits at redhat.com  Tue Sep 25 22:26:05 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:26:05 -0400
Subject: rpms/alex/F-7 alex.spec,1.1,1.2
Message-ID: <200709252226.l8PMQ5g8017697@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637

Modified Files:
	alex.spec 
Log Message:
Update to match devel



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/alex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex.spec	25 Sep 2007 22:03:03 -0000	1.1
+++ alex.spec	25 Sep 2007 22:25:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc docbook-style-xsl libxslt
+BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
 %description
 Alex is a tool for generating lexical analysers in Haskell, given a
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
+- build requires autoconf
+
 * Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
 - apply a few cleanups from Jens Petersen
 



From fedora-extras-commits at redhat.com  Tue Sep 25 22:59:02 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 18:59:02 -0400
Subject: rpms/hal/devel .cvsignore, 1.49, 1.50 hal.spec, 1.136, 1.137 sources,
	1.51, 1.52
Message-ID: <200709252259.l8PMx2vT020752@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Tue Sep 25 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	31 Aug 2007 21:38:21 -0000	1.49
+++ .cvsignore	25 Sep 2007 22:58:25 -0000	1.50
@@ -42,3 +42,4 @@
 hal-info-20070402.tar.gz
 hal-0.5.10rc1.tar.gz
 hal-0.5.10rc2.tar.gz
+hal-0.5.10.git20070925.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- hal.spec	31 Aug 2007 21:38:22 -0000	1.136
+++ hal.spec	25 Sep 2007 22:58:25 -0000	1.137
@@ -26,9 +26,9 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 0.git20070831%{?dist}
+Release: 0.git20070925%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc2.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20070925.tar.gz
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -232,6 +232,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Sep 25 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070925%{?dist}
+- Update to git snapshot
+
 * Fri Aug 31 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070831%{?dist}
 - Update to upstream 0.5.10rc2 release
 - Drop patches that are upstream already


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	31 Aug 2007 21:38:22 -0000	1.51
+++ sources	25 Sep 2007 22:58:25 -0000	1.52
@@ -1 +1 @@
-fd7770348b4fc52d4df0670f1eeaf806  hal-0.5.10rc2.tar.gz
+65be5918bac6860c931821ffab3b94ec  hal-0.5.10.git20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:02:05 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:02:05 -0400
Subject: rpms/hal-info/devel .cvsignore, 1.5, 1.6 hal-info.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200709252302.l8PN254T026960@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26928

Modified Files:
	.cvsignore hal-info.spec sources 
Log Message:
* Fri Sep 25 2007 David Zeuthen <davidz at redhat.com> - 20070925-1%{?dist}
- Update to latest release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2007 21:37:31 -0000	1.5
+++ .cvsignore	25 Sep 2007 23:01:32 -0000	1.6
@@ -1,3 +1,4 @@
 hal-info-20070516.tar.gz
 hal-info-20070725.tar.gz
 hal-info-20070831.tar.gz
+hal-info-20070925.tar.gz


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hal-info.spec	31 Aug 2007 21:37:31 -0000	1.7
+++ hal-info.spec	25 Sep 2007 23:01:32 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Device information files for HAL
 Name: hal-info
-Version: 20070831
+Version: 20070925
 Release: 1%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -35,6 +35,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Fri Sep 25 2007 David Zeuthen <davidz at redhat.com> - 20070925-1%{?dist}
+- Update to latest release.
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 20070831-1%{?dist}
 - Update to latest release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Aug 2007 21:37:31 -0000	1.5
+++ sources	25 Sep 2007 23:01:32 -0000	1.6
@@ -1 +1 @@
-4e09c4a4a3f7e01d8b592eb75eca9006  hal-info-20070831.tar.gz
+df026b02f47957a7e47055a649930cff  hal-info-20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:06:09 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 25 Sep 2007 19:06:09 -0400
Subject: rpms/gwget/devel gwget-0.99-epiphany220.patch, NONE, 1.1 gwget.spec,
	1.21, 1.22 gwget-0.99-epiphany219.patch, 1.1, NONE
Message-ID: <200709252306.l8PN694P027313@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207

Modified Files:
	gwget.spec 
Added Files:
	gwget-0.99-epiphany220.patch 
Removed Files:
	gwget-0.99-epiphany219.patch 
Log Message:
* Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
- Build against epiphany 2.20


gwget-0.99-epiphany220.patch:

--- NEW FILE gwget-0.99-epiphany220.patch ---
--- gwget-0.99/configure.in.orig	2007-06-09 20:51:03.000000000 +0200
+++ gwget-0.99/configure.in	2007-06-09 20:56:14.000000000 +0200
@@ -97,14 +97,18 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18 or 2.19 or 2.20
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
-	EPHY_VER=2.18
+if pkg-config --exists epiphany-2.20; then
+	EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+        EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+        EPHY_VER=2.18
 elif pkg-config --exists epiphany-2.17; then
         EPHY_VER=2.17
 elif pkg-config --exists epiphany-2.16; then
@@ -170,13 +174,21 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.18
           EPIPHANY_REQUIRED=2.18
 	  EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.19
+          EPIPHANY_REQUIRED=2.19
+	  EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.20
+          EPIPHANY_REQUIRED=2.20
+	  EPIPHANY_SHORTVER=220
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219 or 220)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwget.spec	26 Aug 2007 22:20:20 -0000	1.21
+++ gwget.spec	25 Sep 2007 23:05:33 -0000	1.22
@@ -1,8 +1,8 @@
-%define epimajor 2.19
+%define epimajor 2.20
 
 Name:		gwget
 Version:	0.99
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
@@ -100,42 +100,45 @@
 
 
 %changelog
-* Sat Aug 25 2007 Christoph Wickert <fedora at christoph-wickert de> - 0.99-2
+* Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
+- Build against epiphany 2.20
+
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-2
 - Run intltoolize to get locales installed properly with intltool 0.36.1
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora at christoph-wickert de> 0.99-1
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-1
 - Update to 0.99
 - Add support for epiphany 2.19
 - Update desktop file
 
-* Thu May 17 2007 Christoph Wickert <fedora at christoph-wickert de> 0.98.2-2
+* Thu May 17 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-2
 - Rebuild for Fedora 7
 - Add support for epiphany 2.18
 
-* Sat Nov 11 2006 Christoph Wickert <fedora at christoph-wickert de> 0.98.2-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-1
 - Update to 0.98.2.
 - Don't crash notification area (#213480).
 - Add support for epiphany 2.17.
 
-* Fri Sep 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.98.1-1
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.1-1
 - Update to 0.98.1.
 - BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
 
-* Fri Sep 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-7
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.16.
 - disable-static instead of removing .a files.
 - BuildRequire intltool instead of perl(XML::Parser).
 
-* Sat Jul 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-6
+* Sat Jul 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-6
 - Fix BR to build in minimal build environment (#198919).
 - Add patch to build against epiphany 2.15.
 
-* Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-5
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-5
 - bump release to fix broken upgrade path FE5 -> FE6.
 
-* Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-4
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-4
 - fix %%defattr.
 - fix summary and description of epiphany-extension subpackage.
 - fix BR of epiphany-extension subpackage.


--- gwget-0.99-epiphany219.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:06:16 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:06:16 -0400
Subject: rpms/PolicyKit/devel .cvsignore, 1.3, 1.4 PolicyKit.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709252306.l8PN6GtE027325@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	.cvsignore PolicyKit.spec sources 
Log Message:
* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2007 20:43:37 -0000	1.3
+++ .cvsignore	25 Sep 2007 23:05:44 -0000	1.4
@@ -1,2 +1,3 @@
 PolicyKit-0.5.git20070731.tar.gz
 PolicyKit-0.5.tar.gz
+PolicyKit-0.6.git20070925.tar.gz


Index: PolicyKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/PolicyKit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PolicyKit.spec	1 Sep 2007 02:13:04 -0000	1.4
+++ PolicyKit.spec	25 Sep 2007 23:05:44 -0000	1.5
@@ -13,12 +13,12 @@
 
 Summary: Toolkit for privilege control
 Name: PolicyKit
-Version: 0.5
-Release: 3%{?dist}
+Version: 0.6
+Release: 0.git20070925%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20070925.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -141,6 +141,9 @@
 %{_datadir}/gtk-doc/html/polkit/*
 
 %changelog
+* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
+- Update to git snapshot
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2007 20:43:37 -0000	1.3
+++ sources	25 Sep 2007 23:05:44 -0000	1.4
@@ -1 +1 @@
-e5632c984df948edffb49659e76b6e96  PolicyKit-0.5.tar.gz
+b9678c3ec3f85e6dec46560820a3552c  PolicyKit-0.6.git20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:07:21 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 19:07:21 -0400
Subject: rpms/kernel/devel config-generic,1.28,1.29 kernel.spec,1.186,1.187
Message-ID: <200709252307.l8PN7La8027531@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27402

Modified Files:
	config-generic kernel.spec 
Log Message:
* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
- Disable RTC_HCTOSYS. The initscripts already do this for us.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-generic	24 Sep 2007 21:55:27 -0000	1.28
+++ config-generic	25 Sep 2007 23:06:48 -0000	1.29
@@ -1871,7 +1871,7 @@
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
+# CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kernel.spec	25 Sep 2007 19:51:00 -0000	1.186
+++ kernel.spec	25 Sep 2007 23:06:48 -0000	1.187
@@ -1812,6 +1812,9 @@
 
 %changelog
 * Tue Sep 25 2007 Dave Jones <davej at redhat.com>
+- Disable RTC_HCTOSYS. The initscripts already do this for us.
+
+* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
 - x86-64: Disable local APIC timer use on AMD systems with C1E.
 
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep 25 23:09:50 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:09:50 -0400
Subject: rpms/PolicyKit-gnome/devel .cvsignore, 1.3, 1.4 PolicyKit-gnome.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200709252309.l8PN9oiu027656@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631

Modified Files:
	.cvsignore PolicyKit-gnome.spec sources 
Log Message:
* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2007 20:46:49 -0000	1.3
+++ .cvsignore	25 Sep 2007 23:09:17 -0000	1.4
@@ -1,2 +1,3 @@
 PolicyKit-gnome-0.5.git20070731.tar.bz2
 PolicyKit-gnome-0.5.tar.bz2
+PolicyKit-gnome-0.6.git20070925.tar.bz2







From fedora-extras-commits at redhat.com  Tue Sep 25 23:10:25 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:10:25 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.10,1.11
Message-ID: <200709252310.l8PNAPWw027682@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27657

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PolicyKit-gnome.spec	25 Sep 2007 23:09:17 -0000	1.10
+++ PolicyKit-gnome.spec	25 Sep 2007 23:09:53 -0000	1.11
@@ -80,7 +80,7 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
-* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
+* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
 - Update to git snapshot
 
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 0.5-4



From fedora-extras-commits at redhat.com  Tue Sep 25 23:11:17 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 25 Sep 2007 19:11:17 -0400
Subject: rpms/python-turbokid/F-7 .cvsignore, 1.4, 1.5 python-turbokid.spec, 
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709252311.l8PNBHaJ027800@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27704

Modified Files:
	.cvsignore python-turbokid.spec sources 
Log Message:
1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 May 2007 07:47:14 -0000	1.4
+++ .cvsignore	25 Sep 2007 23:10:43 -0000	1.5
@@ -1 +1 @@
-TurboKid-1.0.1.tar.gz
+TurboKid-1.0.3.tar.gz


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/python-turbokid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-turbokid.spec	5 May 2007 07:47:14 -0000	1.6
+++ python-turbokid.spec	25 Sep 2007 23:10:43 -0000	1.7
@@ -4,7 +4,7 @@
 %define module turbokid
 
 Name:           python-turbokid
-Version:        1.0.1
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
@@ -15,8 +15,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
-Requires:       python-kid >= 0.9.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires:       python-kid >= 0.9.6
 
 %description
 This package provides a template engine plugin, allowing you
@@ -49,6 +54,15 @@
 
 
 %changelog
+* Sat Sep 22 2007 Luke Macken <lmacken at redhat.com> - 1.0.3-1
+- 1.0.3
+
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
+- Update for python-setuptools changes in rawhide
+
+* Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-1
+- 1.0.2
+
 * Thu May  3 2007 Luke Macken <lmacken at redhat.com> - 1.0.1-1
 - 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 May 2007 07:47:14 -0000	1.4
+++ sources	25 Sep 2007 23:10:43 -0000	1.5
@@ -1 +1 @@
-8c63833c66990379d3f05bece0687b12  TurboKid-1.0.1.tar.gz
+405376c3b16091b76fb6554a5506bc0b  TurboKid-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:11 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:11 -0700
Subject: [pkgdb] makehuman was added for kwizart
Message-ID: <200709252313.l8PNDGIA027627@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package makehuman with summary Modeling of three-dimensional humanoid characters
Kevin Fenzi (kevin) has approved Package makehuman
Kevin Fenzi (kevin) has added a Fedora devel branch for makehuman with an owner of kwizart
Kevin Fenzi (kevin) has approved makehuman in Fedora devel
Kevin Fenzi (kevin) has approved Package makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, devel) updated by kevin
Message-ID: <200709252313.l8PNDaDs027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, 6) updated by kevin
Message-ID: <200709252313.l8PNDaIl027659@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, 7) updated by kevin
Message-ID: <200709252313.l8PNDaDv027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora EPEL, 4) updated by kevin
Message-ID: <200709252313.l8PNDaIo027659@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora EPEL, 5) updated by kevin
Message-ID: <200709252313.l8PNDaE0027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:03 -0400
Subject: rpms/makehuman - New directory
Message-ID: <200709252314.l8PNE3wn027913@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman

Log Message:
Directory /cvs/extras/rpms/makehuman added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:06 -0400
Subject: rpms/makehuman/devel - New directory
Message-ID: <200709252314.l8PNE6ZF027927@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman/devel

Log Message:
Directory /cvs/extras/rpms/makehuman/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:09 -0400
Subject: rpms/makehuman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709252314.l8PNE9Jg027954@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman

Added Files:
	Makefile import.log 
Log Message:
Setup of module makehuman


--- NEW FILE Makefile ---
# Top level Makefile for module makehuman
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:11 -0400
Subject: rpms/makehuman/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709252314.l8PNEBct027973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module makehuman


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: makehuman
# $Id: Makefile,v 1.1 2007/09/25 23:14:09 kevin Exp $
NAME := makehuman
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 fedora-extras-commits at redhat.com  Tue Sep 25 23:15:31 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Tue, 25 Sep 2007 19:15:31 -0400
Subject: rpms/gdb/devel gdb-6.3-ctorline-20050120.patch, 1.3,
	1.4 gdb-6.3-test-dtorfix-20050121.patch, 1.2,
	1.3 gdb-6.6-buildid-locate.patch, 1.1, 1.2 gdb.spec, 1.246, 1.247
Message-ID: <200709252315.l8PNFVJY028446@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28310

Modified Files:
	gdb-6.3-ctorline-20050120.patch 
	gdb-6.3-test-dtorfix-20050121.patch 
	gdb-6.6-buildid-locate.patch gdb.spec 
Log Message:
* Tue Sep 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-30
- Fix re-setting of the ctors/dtors breakpoints with multiple PCs (BZ 301701).
- Avoid one useless user question in the core files locator (build-id).


gdb-6.3-ctorline-20050120.patch:

Index: gdb-6.3-ctorline-20050120.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ctorline-20050120.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-ctorline-20050120.patch	22 Sep 2007 15:56:10 -0000	1.3
+++ gdb-6.3-ctorline-20050120.patch	25 Sep 2007 23:14:54 -0000	1.4
@@ -29,6 +29,13 @@
 	* breakpoint.c (breakpoint_sals_to_pc): Support more than two returned
 	PC values.
 
+2007-09-25  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* breakpoint.c (breakpoint_sals_to_pc): New parameter ADDR_STRING_P.
+	Expand also *ADDR_STRING_P if multiple PCs were found.
+	(break_command_1, do_captured_breakpoint): Pass also the ADDR_STRING
+	variable to be updated.
+
 Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
 ===================================================================
 --- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 01:30:43.000000000 -0300
@@ -472,9 +479,12 @@
 ===================================================================
 --- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 01:30:53.000000000 -0300
 +++ gdb-6.5/gdb/breakpoint.c	2006-07-11 01:39:20.000000000 -0300
-@@ -5268,10 +5268,44 @@ static void
+@@ -5268,12 +5268,69 @@ static void
+ 
+ static void
  breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
- 		       char *address)
+-		       char *address)
++		       char *address, char ***addr_string_p)
  {    
 -  int i;
 -  for (i = 0; i < sals->nelts; i++)
@@ -498,6 +508,9 @@
 +          struct symtab_and_line *new_sals = 
 +            xmalloc ((sals->nelts + num_pc_values - 1) 
 +                     * sizeof (struct symtab_and_line));
++          char **new_addr_string;
++
++          /* Expand the SALS array.  */
 +          memcpy (new_sals, sals->sals, (i + 1) 
 +                  * sizeof (struct symtab_and_line));
 +	  /* The one returned SALS entry is copied for all the PCs.  */
@@ -513,6 +526,26 @@
 +            {
 +              sals->sals[i + j].pc = pc_list[j];
 +            }
++
++          /* Expand the *ADDR_STRING_P array.  */
++          new_addr_string = xmalloc ((sals->nelts + num_pc_values - 1)
++                                     * sizeof *new_addr_string);
++          memcpy (new_addr_string, *addr_string_p,
++                  (i + 1) * sizeof *new_addr_string);
++          /* The existing *ADDR_STRING_P entry must be deleted for all the
++             multiple PCs as BREAKPOINT_RE_SET currently does not set all the
++             PCs for a sinle line back again.  For NULL values "*0x%x" direct
++             address will be provided by CREATE_BREAKPOINTS.  */
++          xfree ((*addr_string_p)[i]);
++           for (j = 0; j < num_pc_values; ++j)
++             {
++              new_addr_string[i + j] = NULL;
++            }
++          memcpy (&new_addr_string[i + num_pc_values], &(*addr_string_p)[i + 1],
++                  (sals->nelts - (i + num_pc_values)) * sizeof *new_addr_string);
++          xfree (*addr_string_p);
++          *addr_string_p = new_addr_string;
++
 +          incr = num_pc_values;
 +        }
 +
@@ -527,7 +560,7 @@
      {
 +      /* Resolve all line numbers to PC's and verify that the addresses
 +         are ok for the target.  */
-+      breakpoint_sals_to_pc (&sals, addr_start);
++      breakpoint_sals_to_pc (&sals, addr_start, &addr_string);
 +
        /* Make sure that all storage allocated to SALS gets freed.  */
        make_cleanup (xfree, sals.sals);
@@ -544,6 +577,15 @@
    /* Verify that condition can be parsed, before setting any
       breakpoints.  Allocate a separate condition expression for each
       breakpoint. */
+@@ -5665,7 +5688,7 @@ do_captured_breakpoint (struct ui_out *u
+     error (_("Garbage %s following breakpoint address"), address_end);
+ 
+   /* Resolve all line numbers to PC's.  */
+-  breakpoint_sals_to_pc (&sals, args->address);
++  breakpoint_sals_to_pc (&sals, args->address, &addr_string);
+ 
+   /* Verify that conditions can be parsed, before setting any
+      breakpoints.  */
 @@ -5670,14 +5699,16 @@ gdb_breakpoint (char *address, char *con
  void
  resolve_sal_pc (struct symtab_and_line *sal)

gdb-6.3-test-dtorfix-20050121.patch:

Index: gdb-6.3-test-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-dtorfix-20050121.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-test-dtorfix-20050121.patch	22 Sep 2007 15:56:10 -0000	1.2
+++ gdb-6.3-test-dtorfix-20050121.patch	25 Sep 2007 23:14:55 -0000	1.3
@@ -10,6 +10,11 @@
 	* gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
 	`$delete' destructor variant.
 
+2007-09-25  Jan Kratochvil <jan.kratochvil at redhat.com>
+
+	* gdb.cp/constructortest.exp: Delete the FIXME workaround of restarting
+	the whole GDB.
+
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix	Fri Jan 21 17:06:56 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc	Fri Jan 21 17:05:18 2005
 @@ -0,0 +1,99 @@
@@ -114,7 +119,7 @@
 +}
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix	Fri Jan 21 17:07:02 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp	Fri Jan 21 17:05:29 2005
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,127 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005, 2007 Free Software Foundation, Inc.
@@ -216,10 +221,6 @@
 +
 +# Test now the $delete destructors.
 +
-+# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
 +runto_main
 +
@@ -240,10 +241,6 @@
 +# Verify that we can break by line number in a destructor and find
 +# the $delete occurence
 +
-+# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
 +runto_main
 +

gdb-6.6-buildid-locate.patch:

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.6-buildid-locate.patch	28 Aug 2007 14:46:38 -0000	1.1
+++ gdb-6.6-buildid-locate.patch	25 Sep 2007 23:14:55 -0000	1.2
@@ -35,7 +35,7 @@
  
  
  #ifndef O_LARGEFILE
-@@ -253,6 +257,70 @@ add_to_thread_list (bfd *abfd, asection 
+@@ -253,6 +257,63 @@ add_to_thread_list (bfd *abfd, asection 
      inferior_ptid = pid_to_ptid (thread_id);	/* Yes, make it current */
  }
  
@@ -93,30 +93,28 @@
 +
 +  xfree (exec_filename);
 +
-+  if (exec_filename != NULL)
-+    {
-+#ifdef SOLIB_ADD
-+      SOLIB_ADD (NULL, 0, &current_target, auto_solib_add);
-+#else
-+      solib_add (NULL, 0, &current_target, auto_solib_add);
-+#endif
-+    }
++  /* No automatic SOLIB_ADD as the libraries would get read twice.  */
 +}
 +
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -377,6 +445,10 @@ core_open (char *filename, int from_tty)
-       /* Fetch all registers from core file.  */
-       target_fetch_registers (-1);
- 
-+      /* Find build_id identifiers.  */
+@@ -417,6 +420,15 @@ core_open (char *filename, int from_tty)
+   ontop = !push_target (&core_ops);
+   discard_cleanups (old_chain);
+ 
++  if (ontop)
++    {
++      /* Find the build_id identifiers.  If it gets executed after
++         POST_CREATE_INFERIOR we would clash with asking to discard the already
++         loaded VDSO symbols.  */
 +      if (build_id_core_loads != 0)
 +        build_id_locate_exec (from_tty);
++    }
 +
-       /* Now, set up the frame cache, and print the top of stack.  */
-       flush_cached_frames ();
-       select_frame (get_current_frame ());
+   /* This is done first, before anything has a chance to query the
+      inferior for information such as symbols.  */
+   post_create_inferior (&core_ops, from_tty);
 @@ -662,4 +734,13 @@ _initialize_corelow (void)
  
    if (!coreops_suppress_target)


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- gdb.spec	23 Sep 2007 15:42:37 -0000	1.246
+++ gdb.spec	25 Sep 2007 23:14:55 -0000	1.247
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 29%{?dist}
+Release: 30%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -687,6 +687,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Sep 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-30
+- Fix re-setting of the ctors/dtors breakpoints with multiple PCs (BZ 301701).
+- Avoid one useless user question in the core files locator (build-id).
+
 * Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
 - Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
 - Fix the testcase for pending signals (from BZ 233852).



From fedora-extras-commits at redhat.com  Tue Sep 25 23:16:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:16:28 -0700
Subject: [pkgdb] eclipse-demos was added for overholt
Message-ID: <200709252316.l8PNGYWB027984@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-demos with summary Eclipse screencasts
Kevin Fenzi (kevin) has approved Package eclipse-demos
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-demos with an owner of overholt
Kevin Fenzi (kevin) has approved eclipse-demos in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-demos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-demos (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-demos (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-demos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-demos



From fedora-extras-commits at redhat.com  Tue Sep 25 23:16:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:16:30 -0700
Subject: [pkgdb] eclipse-demos (Fedora, devel) updated by kevin
Message-ID: <200709252316.l8PNGYWF027984@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved watchcommits on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved commit on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved build on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved approveacls on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved checkout on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-demos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-demos



From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:09 -0400
Subject: rpms/eclipse-demos - New directory
Message-ID: <200709252317.l8PNH969028542@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos

Log Message:
Directory /cvs/extras/rpms/eclipse-demos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:17 -0400
Subject: rpms/eclipse-demos/devel - New directory
Message-ID: <200709252317.l8PNHHcA028596@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-demos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:19 -0400
Subject: rpms/eclipse-demos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709252317.l8PNHJ3S028621@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-demos


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-demos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:21 -0400
Subject: rpms/eclipse-demos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709252317.l8PNHLM9028637@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-demos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-demos
# $Id: Makefile,v 1.1 2007/09/25 23:17:19 kevin Exp $
NAME := eclipse-demos
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 fedora-extras-commits at redhat.com  Tue Sep 25 23:17:44 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 25 Sep 2007 19:17:44 -0400
Subject: rpms/gcc/F-7 gcc41-artificial-attrib.patch, NONE,
	1.1 gcc41-error-attrib.patch, NONE, 1.1 gcc41-jdwp.patch, NONE,
	1.1 gcc41-pr20880.patch, NONE, 1.1 gcc41-pr32694.patch, NONE,
	1.1 gcc41-pr33506.patch, NONE, 1.1 .cvsignore, 1.207,
	1.208 gcc41.spec, 1.166, 1.167 sources, 1.209,
	1.210 gcc41-builtin-chk-anticipated.patch, 1.1,
	NONE gcc41-builtin-throw.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack-len.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack.patch, 1.2,
	NONE gcc41-c++-gnu_inline.patch, 1.1,
	NONE gcc41-ppc-sync-qihi.patch, 1.1, NONE gcc41-ppc-tramp.patch,
	1.1, NONE gcc41-pr22244.patch, 1.1, NONE gcc41-pr27954.patch,
	1.1, NONE gcc41-pr32678.patch, 1.1, NONE gcc41-pr32912.patch,
	1.1, NONE gcc41-pr33423.patch, 1.1, NONE gcc41-rh253102.patch,
	1.1, NONE gcc41-scanf-fmt-check.patch, 1.1,
	NONE gcc41-sparc-niagara.patch, 1.1, NONE
Message-ID: <200709252317.l8PNHixB028701@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28547

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-artificial-attrib.patch gcc41-error-attrib.patch 
	gcc41-jdwp.patch gcc41-pr20880.patch gcc41-pr32694.patch 
	gcc41-pr33506.patch 
Removed Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack-len.patch 
	gcc41-builtin-va-arg-pack.patch gcc41-c++-gnu_inline.patch 
	gcc41-ppc-sync-qihi.patch gcc41-ppc-tramp.patch 
	gcc41-pr22244.patch gcc41-pr27954.patch gcc41-pr32678.patch 
	gcc41-pr32912.patch gcc41-pr33423.patch gcc41-rh253102.patch 
	gcc41-scanf-fmt-check.patch gcc41-sparc-niagara.patch 
Log Message:
4.1.2-27.fc7

gcc41-artificial-attrib.patch:

--- NEW FILE gcc41-artificial-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* tree.h (block_nonartificial_location): New prototype.
	* tree.c (block_nonartificial_location): New function.
	* dwarf2out.c (gen_subprogram_die): Add DW_AT_artificial
	if artificial attribute is present on abstract inline decl.
	* c-common.c (handle_artificial_attribute): New function.
	(c_common_attribute_table): Add artificial attribute.
	* final.c (override_filename, override_linenum): New variables.
	(final_scan_insn): For DBX_DEBUG or SDB_DEBUG, set override_filename
	and override_linenum if inside of a block inlined from
	__attribute__((__artificial__)) function.
	(notice_source_line): Honor override_filename and override_linenum.
	* doc/extend.texi: Document __attribute__((__artificial__)).
	* config/i386/emmintrin.h: Add __artificial__ attribute to
	all __always_inline__ functions.
	* config/i386/mmintrin.h: Likewise.
	* config/i386/mm3dnow.h: Likewise.
	* config/i386/pmmintrin.h: Likewise.
	* config/i386/ammintrin.h: Likewise.
	* config/i386/xmmintrin.h: Likewise.

--- gcc/doc/extend.texi.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:04:15.000000000 +0200
@@ -1589,7 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline} and @code{externally_visible}.  Several other
+ at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
+Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1671,6 +1672,14 @@ In C++, this attribute does not depend o
 but it still requires the @code{inline} keyword to enable its special
 behavior.
 
+ at cindex @code{artificial} function attribute
+ at item artificial
+This attribute is useful for small inline wrappers which if possible
+should appear during debugging as a unit, depending on the debug
+info format it will either mean marking the function as artificial
+or using the caller location for all instructions within the inlined
+body.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/tree.c.jj	2007-04-03 13:18:26.000000000 +0200
+++ gcc/tree.c	2007-09-25 15:01:49.000000000 +0200
@@ -7638,4 +7638,40 @@ empty_body_p (tree stmt)
   return true;
 }
 
+/* If BLOCK is inlined from an __attribute__((__artificial__))
+   routine, return pointer to location from where it has been
+   called.  */
+location_t *
+block_nonartificial_location (tree block)
+{
+  location_t *ret = NULL;
+
+  while (block && TREE_CODE (block) == BLOCK
+	 && BLOCK_ABSTRACT_ORIGIN (block))
+    {
+      tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+	ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+      if (TREE_CODE (ao) == FUNCTION_DECL)
+	{
+	  /* If AO is an artificial inline, point RET to the
+	     call site locus at which it has been inlined and continue
+	     the loop, in case AO's caller is also an artificial
+	     inline.  */
+	  if (DECL_DECLARED_INLINE_P (ao)
+	      && lookup_attribute ("artificial", DECL_ATTRIBUTES (ao)))
+	    ret = &BLOCK_SOURCE_LOCATION (block);
+	  else
+	    break;
+	}
+      else if (TREE_CODE (ao) != BLOCK)
+	break;
+
+      block = BLOCK_SUPERCONTEXT (block);
+    }
+  return ret;
+}
+
 #include "gt-tree.h"
--- gcc/tree.h.jj	2007-09-25 12:20:12.000000000 +0200
+++ gcc/tree.h	2007-09-25 15:02:37.000000000 +0200
@@ -4270,6 +4270,8 @@ extern tree build_addr (tree, tree);
 extern bool fields_compatible_p (tree, tree);
 extern tree find_compatible_field (tree, tree);
 
+extern location_t *block_nonartificial_location (tree);
+
 /* In function.c */
 extern void expand_main_function (void);
 extern void init_dummy_function_start (void);
--- gcc/final.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/final.c	2007-09-25 15:01:49.000000000 +0200
@@ -141,6 +141,10 @@ static int high_function_linenum;
 /* Filename of last NOTE.  */
 static const char *last_filename;
 
+/* Override filename and line number.  */
+static const char *override_filename;
+static int override_linenum;
+
 /* Whether to force emission of a line note before the next insn.  */
 static bool force_source_line = false;
   
@@ -1822,6 +1826,18 @@ final_scan_insn (rtx insn, FILE *file, i
 	      /* Mark this block as output.  */
 	      TREE_ASM_WRITTEN (NOTE_BLOCK (insn)) = 1;
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      location_t *locus_ptr
+		= block_nonartificial_location (NOTE_BLOCK (insn));
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_BLOCK_END:
@@ -1841,6 +1857,24 @@ final_scan_insn (rtx insn, FILE *file, i
 
 	      (*debug_hooks->end_block) (high_block_linenum, n);
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      tree outer_block = BLOCK_SUPERCONTEXT (NOTE_BLOCK (insn));
+	      location_t *locus_ptr
+		= block_nonartificial_location (outer_block);
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	      else
+		{
+		  override_filename = NULL;
+		  override_linenum = 0;
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_DELETED_LABEL:
@@ -2521,8 +2555,19 @@ final_scan_insn (rtx insn, FILE *file, i
 static bool
 notice_source_line (rtx insn)
 {
-  const char *filename = insn_file (insn);
-  int linenum = insn_line (insn);
+  const char *filename;
+  int linenum;
+
+  if (override_filename)
+    {
+      filename = override_filename;
+      linenum = override_linenum;
+    }
+  else
+    {
+      filename = insn_file (insn);
+      linenum = insn_line (insn);
+    }
 
   if (filename
       && (force_source_line
--- gcc/dwarf2out.c.jj	2007-04-03 13:13:27.000000000 +0200
+++ gcc/dwarf2out.c	2007-09-25 15:01:49.000000000 +0200
@@ -11667,6 +11667,10 @@ gen_subprogram_die (tree decl, dw_die_re
             add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_not_inlined);
 	}
 
+      if (DECL_DECLARED_INLINE_P (decl)
+	  && lookup_attribute ("artificial", DECL_ATTRIBUTES (decl)))
+	add_AT_flag (subr_die, DW_AT_artificial, 1);
+
       equate_decl_number_to_die (decl, subr_die);
     }
   else if (!DECL_EXTERNAL (decl))
--- gcc/c-common.c.jj	2007-03-27 15:40:15.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:01:49.000000000 +0200
@@ -505,8 +505,8 @@ static tree handle_noreturn_attribute (t
 static tree handle_noinline_attribute (tree *, tree, tree, int, bool *);
[...3799 lines suppressed...]
   return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__A, (__v4si)__B);
 }
 
 #if 0
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_extract_epi16 (__m128i const __A, int const __N)
 {
   return __builtin_ia32_vec_ext_v8hi ((__v8hi)__A, __N);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_insert_epi16 (__m128i const __A, int const __D, int const __N)
 {
   return (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)__A, __D, __N);
@@ -1341,37 +1341,37 @@ _mm_insert_epi16 (__m128i const __A, int
   ((__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)(A), (D), (N)))
 #endif
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_movemask_epi8 (__m128i __A)
 {
   return __builtin_ia32_pmovmskb128 ((__v16qi)__A);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_mulhi_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmulhuw128 ((__v8hi)__A, (__v8hi)__B);
@@ -1381,67 +1381,67 @@ _mm_mulhi_epu16 (__m128i __A, __m128i __
 #define _mm_shufflelo_epi16(__A, __B) ((__m128i)__builtin_ia32_pshuflw ((__v8hi)__A, __B))
 #define _mm_shuffle_epi32(__A, __B) ((__m128i)__builtin_ia32_pshufd ((__v4si)__A, __B))
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_maskmoveu_si128 (__m128i __A, __m128i __B, char *__C)
 {
   __builtin_ia32_maskmovdqu ((__v16qi)__A, (__v16qi)__B, __C);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgb128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_sad_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_psadbw128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si32 (int *__A, int __B)
 {
   __builtin_ia32_movnti (__A, __B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si128 (__m128i *__A, __m128i __B)
 {
   __builtin_ia32_movntdq ((__v2di *)__A, (__v2di)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_pd (double *__A, __m128d __B)
 {
   __builtin_ia32_movntpd (__A, (__v2df)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_clflush (void const *__A)
 {
   __builtin_ia32_clflush (__A);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_lfence (void)
 {
   __builtin_ia32_lfence ();
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_mfence (void)
 {
   __builtin_ia32_mfence ();
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi32_si128 (int __A)
 {
   return _mm_set_epi32 (0, 0, 0, __A);
@@ -1449,14 +1449,14 @@ _mm_cvtsi32_si128 (int __A)
 
 #ifdef __x86_64__
 /* Intel intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
 }
 
 /* Microsoft intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64x_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
@@ -1465,37 +1465,37 @@ _mm_cvtsi64x_si128 (long long __A)
 
 /* Casts between various SP, DP, INT vector types.  Note that these do no
    conversion of values, they just change the type.  */
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castpd_ps(__m128d __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castpd_si128(__m128d __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castps_pd(__m128 __A)
 {
   return (__m128d) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castps_si128(__m128 __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_ps(__m128i __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_pd(__m128i __A)
 {
   return (__m128d) __A;

gcc41-error-attrib.patch:

--- NEW FILE gcc41-error-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* expr.c (expand_expr_real_1) <case CALL_EXPR>: Use get_callee_fndecl
	instead of checking CALL_EXPR_FN directly to test for builtins.
	If error or warning attributes are present, print
	error resp. warning.
	* c-common.c (handle_error_attribute): New function.
	(c_common_attribute_table): Add error and warning
	attributes.
	* doc/extend.texi: Document error and warning attributes.

	* gcc.dg/va-arg-pack-len-1.c: Use error and warning
	attributes.
	* gcc.dg/va-arg-pack-len-2.c: New test.
	* g++.dg/ext/va-arg-pack-len-1.C: Use error and warning
	attributes.
	* g++.dg/ext/va-arg-pack-len-2.C: New test.

--- gcc/doc/extend.texi.jj	2007-09-25 15:04:15.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:32:22.000000000 +0200
@@ -1589,8 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
-Several other
+ at code{gnu_inline}, @code{externally_visible}, @code{artificial},
+ at code{error} and @code{warning}.  Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1688,6 +1688,30 @@ Whether the function itself is considere
 the current inlining parameters.  The @code{flatten} attribute only works
 reliably in unit-at-a-time mode.
 
+ at item error ("@var{message}")
+ at cindex @code{error} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, an error
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions where checking the inline function arguments is not
+possible through @code{extern char [(condition) ? 1 : -1];} tricks.
+While it is possible to leave the function undefined and thus invoke
+a link failure, when using this attribute the problem will be diagnosed
+earlier and with exact location of the call even in presence of inline
+functions or when not emitting debugging information.
+
+ at item warning ("@var{message}")
+ at cindex @code{warning} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, a warning
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions.  While it is possible to define the function with
+a message in @code{.gnu.warning*} section, when using this attribute the problem
+will be diagnosed earlier and with exact location of the call even in presence
+of inline functions or when not emitting debugging information.
+
 @item cdecl
 @cindex functions that do pop the argument stack on the 386
 @opindex mrtd
--- gcc/expr.c.jj	2007-09-25 14:58:40.000000000 +0200
+++ gcc/expr.c	2007-09-25 15:19:15.000000000 +0200
@@ -7513,19 +7513,31 @@ expand_expr_real_1 (tree exp, rtx target
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
 	error ("invalid use of %<__builtin_va_arg_pack ()%>");
-      /* Check for a built-in function.  */
-      if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
-	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == FUNCTION_DECL)
-	  && DECL_BUILT_IN (TREE_OPERAND (TREE_OPERAND (exp, 0), 0)))
-	{
-	  if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == BUILT_IN_FRONTEND)
-	    return lang_hooks.expand_expr (exp, original_target,
-					   tmode, modifier,
-					   alt_rtl);
-	  else
-	    return expand_builtin (exp, target, subtarget, tmode, ignore);
+      {
+	tree fndecl = get_callee_fndecl (exp), attr;
+
+	if (fndecl
+	    && (attr = lookup_attribute ("error",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  error ("call to %qs declared with attribute error: %s",
+		 lang_hooks.decl_printable_name (fndecl, 1),
+		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+	if (fndecl
+	    && (attr = lookup_attribute ("warning",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  warning (0, "call to %qs declared with attribute warning: %s",
+		   lang_hooks.decl_printable_name (fndecl, 1),
+		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+
+	/* Check for a built-in function.  */
+	if (fndecl && DECL_BUILT_IN (fndecl))
+	  {
+	    if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_FRONTEND)
+	      return lang_hooks.expand_expr (exp, original_target,
+					     tmode, modifier, alt_rtl);
+	    else
+	      return expand_builtin (exp, target, subtarget, tmode, ignore);
+	  }
 	}
 
       return expand_call (exp, target, ignore);
--- gcc/c-common.c.jj	2007-09-25 15:01:49.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:24:34.000000000 +0200
@@ -508,6 +508,7 @@ static tree handle_always_inline_attribu
 static tree handle_gnu_inline_attribute (tree *, tree, tree, int, bool *);
 static tree handle_artificial_attribute (tree *, tree, tree, int, bool *);
 static tree handle_flatten_attribute (tree *, tree, tree, int, bool *);
+static tree handle_error_attribute (tree *, tree, tree, int, bool *);
 static tree handle_used_attribute (tree *, tree, tree, int, bool *);
 static tree handle_unused_attribute (tree *, tree, tree, int, bool *);
 static tree handle_externally_visible_attribute (tree *, tree, tree, int,
@@ -641,6 +642,10 @@ const struct attribute_spec c_common_att
 			      handle_warn_unused_result_attribute },
   { "sentinel",               0, 1, false, true, true,
 			      handle_sentinel_attribute },
+  { "warning",		      1, 1, true,  false, false,
+			      handle_error_attribute },
+  { "error",		      1, 1, true,  false, false,
+			      handle_error_attribute },
   { NULL,                     0, 0, false, false, false, NULL }
 };
 
@@ -4226,6 +4231,26 @@ handle_flatten_attribute (tree *node, tr
   return NULL_TREE;
 }
 
+/* Handle a "warning" or "error" attribute; arguments as in
+   struct attribute_spec.handler.  */
+
+static tree
+handle_error_attribute (tree *node, tree name, tree args,
+			int ARG_UNUSED (flags), bool *no_add_attrs)
+{
+  if (TREE_CODE (*node) == FUNCTION_DECL
+      || TREE_CODE (TREE_VALUE (args)) == STRING_CST)
+    /* Do nothing else, just set the attribute.  We'll get at
+       it later with lookup_attribute.  */
+    ;
+  else
+    {
+      warning (OPT_Wattributes, "%qE attribute ignored", name);
+      *no_add_attrs = true;
+    }
+
+  return NULL_TREE;
+}
 
 /* Handle a "used" attribute; arguments as in
    struct attribute_spec.handler.  */
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern int warn_open_missing_mode (void);
-extern int warn_open_too_many_arguments (void);
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/gcc.dg/va-arg-pack-len-2.c.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-2.c	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	/* { dg-warning "called with more than 3" } */
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	/* { dg-error "needs 3 arguments, only 2 were given" } */
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern "C" int warn_open_missing_mode (void);
-extern "C" int warn_open_too_many_arguments (void);
+extern "C" int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern "C" int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern "C" void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	// { dg-warning "called with more than 3" }
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	// { dg-error "needs 3 arguments, only 2 were given" }
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}

gcc41-jdwp.patch:

--- NEW FILE gcc41-jdwp.patch ---
2007-09-24  Keith Seitz  <keiths at redhat.com>

	* include/jvm.h (struct natThread): Add new field 'frame'.
	* include/java-interp.h (_Jv_Frame): Use _Jv_ThreadStackPeek,
	_Jv_ThreadStackPop, and _Jv_ThreadStackPush instead of
	java.lang.Thread.frame.
	(~_Jv_Frame): Use _Jv_ThreadStackPop.
	* java/lang/natThread.cc (_Jv_ThreadStackPeek): New function.
	(_Jv_ThreadStackPush): New function.
	(_Jv_ThreadStackPop): New function.
	* java/lang/Thread.java (frame): Remove field to restore
	C++ ABI compatibility.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrames): Use
	_Jv_ThreadStackPeek.
	(getFrame): Likewise.
	* gnu/classpath/jdwp/natVMFrame.cc (getFrameDepth): Likewise.
	* jvmti.cc (getLocalFrame): Likewise.
	(_Jv_JVMTI_GetFrameCount): Likewise.
	(_Jv_JVMTI_GetThreadState): Likewise.
	(_Jv_JVMTI_GetStackTrace): Likewise.
	* interpret.cc (_Jv_ReportJVMTIExceptionThrow): Likewise.
	* headers.txt (java/lang/Thread.h): Prepend declarations
	for _Jv_ThreadStackPeek, _Jv_ThreadStackPush, and _Jv_ThreadStackPop.
	Add as friend functions.
	* jni.cc (_Jv_JNIMethod::call): Push a frame onto the stack when
	calling a JNI method.

--- libjava/interpret.cc	(revision 128603)
+++ libjava/interpret.cc	(working copy)
@@ -1709,7 +1709,7 @@
 _Jv_ReportJVMTIExceptionThrow (jthrowable ex)
 {
   jthread thread = ::java::lang::Thread::currentThread ();
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   jmethodID throw_meth = frame->self->get_method ();
   jlocation throw_loc = -1;
   if (frame->frame_type == frame_interpreter)
--- libjava/include/java-interp.h	(revision 128603)
+++ libjava/include/java-interp.h	(working copy)
@@ -391,14 +391,14 @@
   {
     self = s;
     frame_type = type;
-    next = (_Jv_Frame *) thr->frame;
-    thr->frame = (gnu::gcj::RawData *) this;
+    next = _Jv_ThreadStackPeek (thr);
+    _Jv_ThreadStackPush (thr, this);
     thread = thr;
   }
 
   ~_Jv_Frame ()
   {
-    thread->frame = (gnu::gcj::RawData *) next;
+    _Jv_ThreadStackPop (thread);
   }
 
   int depth ()
--- libjava/include/jvm.h	(revision 128603)
+++ libjava/include/jvm.h	(working copy)
@@ -34,6 +34,8 @@
 
 #include <sysdep/locks.h>
 
+class _Jv_Frame;
+
 /* Macro for possible unused arguments.  */
 #define MAYBE_UNUSED __attribute__((__unused__))
 
@@ -767,6 +769,12 @@
 
   // Each thread has its own JNI object.
   _Jv_JNIEnv *jni_env;
+
+  // Describes the topmost frame in the thread's composite
+  // (interp + JNI) stack. Added here to maintain C++ ABI
+  // compatibility with previous versions. Newer versions
+  // of gcj put this in java/lang/Thread.java.
+  _Jv_Frame *frame;
 };
 
 #endif /* __JAVA_JVM_H__ */
--- libjava/jni.cc	(revision 128603)
+++ libjava/jni.cc	(working copy)
@@ -2343,6 +2343,10 @@
   // Copy over passed-in arguments.
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
+  // Add a frame to the composite (interpreted + JNI) call stack
+  java::lang::Thread *thread = java::lang::Thread::currentThread ();
+  _Jv_NativeFrame nat_frame (_this, thread);
+
   // The actual call to the JNI function.
 #if FFI_NATIVE_RAW_API
   ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
--- libjava/jvmti.cc	(revision 128603)
+++ libjava/jvmti.cc	(working copy)
@@ -228,7 +228,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   
   for (int i = 0; i < depth; i++)
     {    
@@ -516,7 +516,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
    
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   (*frame_count) = frame->depth ();
   return JVMTI_ERROR_NONE;
 }
@@ -543,7 +543,7 @@
       if (thread->isInterrupted ())
 	state |= JVMTI_THREAD_STATE_INTERRUPTED;
 
-      _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+      _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
       if (frame != NULL && frame->frame_type == frame_native)
 	state |= JVMTI_THREAD_STATE_IN_NATIVE;
 
@@ -1273,7 +1273,7 @@
   ILLEGAL_ARGUMENT (start_depth >= (*frame_count));
   ILLEGAL_ARGUMENT (start_depth < (-(*frame_count)));
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
 
   // If start_depth is negative use this to determine at what depth to start
   // the trace by adding it to the length of the call stack.  This allows the
--- libjava/headers.txt	(revision 128603)
+++ libjava/headers.txt	(working copy)
@@ -6,6 +6,7 @@
 
 class java/lang/Thread
 prepend class _Jv_JNIEnv;
+prepend class _Jv_Frame;
 prepend #define _JV_NOT_OWNER 1
 prepend #define _JV_INTERRUPTED 2
 prepend _Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();
@@ -17,6 +18,9 @@
 prepend jint _Jv_DetachCurrentThread ();
 prepend struct _Jv_Thread_t;
 prepend _Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);
+prepend _Jv_Frame *_Jv_ThreadStackPeek (java::lang::Thread *thread);
+prepend void _Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+prepend void _Jv_ThreadStackPop (java::lang::Thread *thread);
 friend _Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();
 friend void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
 friend void ::_Jv_ThreadRun (java::lang::Thread* thread);
@@ -24,6 +28,9 @@
 friend java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
 friend java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
 friend jint (::_Jv_DetachCurrentThread) ();
+friend _Jv_Frame *::_Jv_ThreadStackPeek (java::lang::Thread *thread);
+friend void ::_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+friend void ::_Jv_ThreadStackPop (java::lang::Thread *thread);
 
 class java/lang/String
 prepend jchar* _Jv_GetStringChars (jstring str);
--- libjava/gnu/classpath/jdwp/natVMFrame.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMFrame.cc	(working copy)
@@ -181,7 +181,7 @@
 getFrameDepth (_Jv_Frame *frame)
 {
   jint depth = 0;
-  _Jv_Frame *top_frame = (_Jv_Frame *) frame->thread->frame;
+  _Jv_Frame *top_frame = _Jv_ThreadStackPeek (frame->thread);
   jint num_frames = VMVirtualMachine::getFrameCount (frame->thread);
   
   while (frame != top_frame)
--- libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(working copy)
@@ -553,7 +553,7 @@
      
   frame_list = new ::java::util::ArrayList (num_frames);
   
-  _Jv_Frame *vm_frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   
   // Take start frames off the top of the stack
   while (vm_frame != NULL && start > 0)
@@ -584,7 +584,7 @@
 {
   using namespace gnu::classpath::jdwp::exception;
   
-  _Jv_Frame *vm_frame = (_Jv_Frame *) thread->frame;
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   jint depth = 0;
   _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (frameID); 
   
--- libjava/java/lang/Thread.java	(revision 128603)
+++ libjava/java/lang/Thread.java	(working copy)
@@ -186,9 +186,6 @@
   // This describes the top-most interpreter frame for this thread.
   RawData interp_frame;
   
-  // This describes the top most frame in the composite (interp + JNI) stack
-  RawData frame;
-
   // Current state.
   volatile int state;
 
--- libjava/java/lang/natThread.cc	(revision 128603)
+++ libjava/java/lang/natThread.cc	(working copy)
@@ -15,6 +15,7 @@
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-threads.h>
+#include <java-interp.h>
 
 #include <gnu/gcj/RawDataManaged.h>
 #include <java/lang/Thread.h>
@@ -525,3 +526,25 @@
 
   return 0;
 }
+
+_Jv_Frame *
+_Jv_ThreadStackPeek (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  return nt->frame;
+}
+
+void
+_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  nt->frame = frame;
+}
+
+void
+_Jv_ThreadStackPop (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  _Jv_Frame *next = nt->frame->next;
+  nt->frame = next;
+}

gcc41-pr20880.patch:

--- NEW FILE gcc41-pr20880.patch ---
2006-11-24  Paul Thomas  <pault at gcc.gnu.org>

	PR fortran/20880
	* parse.c (parse_interface): Error if procedure name is that of
	encompassing scope.

	* gfortran.dg/interface_3a.f90: New test.

--- gcc/fortran/parse.c	(revision 119172)
+++ gcc/fortran/parse.c	(revision 119173)
@@ -1694,6 +1694,7 @@ parse_interface (void)
   gfc_interface_info save;
   gfc_state_data s1, s2;
   gfc_statement st;
+  locus proc_locus;
 
   accept_statement (ST_INTERFACE);
 
@@ -1781,6 +1782,7 @@ loop:
   accept_statement (st);
   prog_unit = gfc_new_block;
   prog_unit->formal_ns = gfc_current_ns;
+  proc_locus = gfc_current_locus;
 
 decl:
   /* Read data declaration statements.  */
@@ -1796,8 +1798,15 @@ decl:
 
   current_interface = save;
   gfc_add_interface (prog_unit);
-
   pop_state ();
+
+  if (current_interface.ns
+	&& current_interface.ns->proc_name
+	&& strcmp (current_interface.ns->proc_name->name,
+		   prog_unit->name) == 0)
+    gfc_error ("INTERFACE procedure '%s' at %L has the same name as the "
+	       "enclosing procedure", prog_unit->name, &proc_locus);
+
   goto loop;
 
 done:
--- gcc/testsuite/gfortran.dg/interface_3a.f90
+++ gcc/testsuite/gfortran.dg/interface_3a.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! Contributed by Joost VandeVondele  <jv244 at cam.ac.uk>
+!
+! This was found whilst investigating => segfault
+subroutine thy_sub (a)
+  interface 
+    subroutine thy_sub (a) ! { dg-error "enclosing procedure" }
+      real a
+    end subroutine
+  end interface
+  real a
+  print *, a
+end subroutine

gcc41-pr32694.patch:

--- NEW FILE gcc41-pr32694.patch ---
2007-09-25  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/32694
	2006-11-08  Roger Sayle  <roger at eyesopen.com>
	* tree-ssa-propagate.c (set_rhs): Verify tcc_comparison the same way
	as tcc_binary.

	* gcc.c-torture/compile/20070925-1.c: New test.

--- gcc/tree-ssa-propagate.c.jj	2007-09-23 19:43:36.000000000 +0200
+++ gcc/tree-ssa-propagate.c	2007-09-25 09:30:50.000000000 +0200
@@ -570,7 +570,8 @@ set_rhs (tree *stmt_p, tree expr)
   ssa_op_iter iter;
 
   /* Verify the constant folded result is valid gimple.  */
-  if (TREE_CODE_CLASS (code) == tcc_binary)
+  if (TREE_CODE_CLASS (code) == tcc_binary
+      || TREE_CODE_CLASS (code) == tcc_comparison)
     {
       if (!is_gimple_val (TREE_OPERAND (expr, 0))
 	  || !is_gimple_val (TREE_OPERAND (expr, 1)))
--- gcc/testsuite/gcc.c-torture/compile/20070925-1.c.jj	2007-09-25 09:28:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070925-1.c	2007-09-25 09:29:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* PR tree-optimization/32694 */
+
+typedef signed long long int WordS64;
+typedef unsigned long long int Word64;
+
+int
+foo (Word64 * p)
+{
+  while (1)
+    {
+      WordS64 c = 0x1llu;
+      WordS64 x = *p;
+      if (c >= 0)
+	{
+	  if (x > (WordS64) 0x7FFFFFFFFFFFFFFFll - c)
+	    return 6;
+	}
+      else if (x < (WordS64) 0x8000000000000000ll - c)
+	return 7;
+      p++;
+    }
+}

gcc41-pr33506.patch:

--- NEW FILE gcc41-pr33506.patch ---
2007-09-21  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33506
	* langhooks.h (struct lang_hooks_for_types): Add type_hash_eq
	field.
	* langhooks.c (lhd_type_hash_eq): New function.
	* langhooks-def.h (lhd_type_hash_eq): New prototype.
	(LANG_HOOKS_TYPE_HASH_EQ): Define.
	(LANG_HOOKS_FOR_TYPES_INITIALIZER): Add LANG_HOOKS_TYPE_HASH_EQ.
	* tree.c (type_hash_eq): For FUNCTION_TYPE use
	lang_hooks.type.type_hash_eq in addition to generic tests.

	* cp-tree.h (cxx_type_hash_eq): New prototype.
	* cp-objcp-common.h (LANG_HOOKS_TYPE_HASH_EQ): Redefine.
	* tree.c (cxx_type_hash_eq): New function.

	* g++.dg/ext/attrib29.C: New test.

--- gcc/langhooks.h.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.h	2007-09-22 03:46:10.000000000 -0400
@@ -148,6 +148,10 @@ struct lang_hooks_for_types
      firstprivate variables.  */
   void (*omp_firstprivatize_type_sizes) (struct gimplify_omp_ctx *, tree);
 
+  /* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+     Called only after doing all language independent checks.  */
+  bool (*type_hash_eq) (tree, tree);
+
   /* Nonzero if types that are identical are to be hashed so that only
      one copy is kept.  If a language requires unique types for each
      user-specified type, such as Ada, this should be set to TRUE.  */
--- gcc/langhooks.c.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.c	2007-09-22 03:46:10.000000000 -0400
@@ -411,6 +411,16 @@ lhd_tree_dump_type_quals (tree t)
 /* lang_hooks.expr_size: Determine the size of the value of an expression T
    in a language-specific way.  Returns a tree for the size in bytes.  */
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  */
+
+bool
+lhd_type_hash_eq (tree typea ATTRIBUTE_UNUSED,
+		  tree typeb ATTRIBUTE_UNUSED)
+{
+  return true;
+}
+
 tree
 lhd_expr_size (tree exp)
 {
--- gcc/langhooks-def.h.jj	2007-02-20 16:39:13.000000000 -0500
+++ gcc/langhooks-def.h	2007-09-22 03:46:56.000000000 -0400
@@ -70,6 +70,7 @@ extern tree lhd_expr_size (tree);
 extern size_t lhd_tree_size (enum tree_code);
 extern HOST_WIDE_INT lhd_to_target_charset (HOST_WIDE_INT);
 extern tree lhd_expr_to_decl (tree, bool *, bool *, bool *);
+extern bool lhd_type_hash_eq (tree, tree);
 
 /* Declarations of default tree inlining hooks.  */
 extern tree lhd_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
@@ -220,6 +221,7 @@ extern tree lhd_make_node (enum tree_cod
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
 #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \
   lhd_omp_firstprivatize_type_sizes
+#define LANG_HOOKS_TYPE_HASH_EQ		lhd_type_hash_eq
 #define LANG_HOOKS_HASH_TYPES		true
 
 #define LANG_HOOKS_FOR_TYPES_INITIALIZER { \
@@ -234,6 +236,7 @@ extern tree lhd_make_node (enum tree_cod
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
   LANG_HOOKS_TYPE_MAX_SIZE, \
   LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES, \
+  LANG_HOOKS_TYPE_HASH_EQ, \
   LANG_HOOKS_HASH_TYPES \
 }
 
--- gcc/tree.c.jj	2007-04-03 07:18:26.000000000 -0400
+++ gcc/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -4168,17 +4168,21 @@ type_hash_eq (const void *va, const void
 				      TYPE_FIELDS (b->type))));
 
     case FUNCTION_TYPE:
-      return (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
-	      || (TYPE_ARG_TYPES (a->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
-		  && TYPE_ARG_TYPES (b->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
-		  && type_list_equal (TYPE_ARG_TYPES (a->type),
-				      TYPE_ARG_TYPES (b->type))));
+      if (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
+	  || (TYPE_ARG_TYPES (a->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
+	      && TYPE_ARG_TYPES (b->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
+	      && type_list_equal (TYPE_ARG_TYPES (a->type),
+				  TYPE_ARG_TYPES (b->type))))
+	break;
+      return 0;
 
     default:
       return 0;
     }
+
+  return lang_hooks.types.type_hash_eq (a->type, b->type);
 }
 
 /* Return the cached hash value.  */
--- gcc/cp/cp-tree.h.jj	2007-06-26 07:57:09.000000000 -0400
+++ gcc/cp/cp-tree.h	2007-09-22 03:50:22.000000000 -0400
@@ -4421,7 +4421,8 @@ extern tree cp_add_pending_fn_decls		(vo
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
 extern tree rvalue                              (tree);
-   
+extern bool cxx_type_hash_eq			(tree, tree);
+
 /* in typeck.c */
 extern int string_conv_p			(tree, tree, int);
 extern tree cp_truthvalue_conversion		(tree);
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 16:37:34.000000000 -0500
+++ gcc/cp/cp-objcp-common.h	2007-09-22 03:49:38.000000000 -0400
@@ -85,6 +85,8 @@ extern tree objcp_tsubst_copy_and_build 
 #define LANG_HOOKS_WRITE_GLOBALS lhd_do_nothing
 #undef LANG_HOOKS_COMDAT_GROUP
 #define LANG_HOOKS_COMDAT_GROUP cxx_comdat_group
+#undef LANG_HOOKS_TYPE_HASH_EQ                                                                                          
+#define LANG_HOOKS_TYPE_HASH_EQ cxx_type_hash_eq
 
 #undef LANG_HOOKS_FUNCTION_INIT
 #define LANG_HOOKS_FUNCTION_INIT cxx_push_function_context
--- gcc/cp/tree.c.jj	2007-03-12 03:28:01.000000000 -0400
+++ gcc/cp/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -1959,6 +1959,22 @@ cp_build_type_attribute_variant (tree ty
   return new_type;
 }
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  Only
+   to check TYPE_RAISES_EXCEPTIONS for FUNCTION_TYPE, the rest is already
+   compared in type_hash_eq.  */
+
+bool
+cxx_type_hash_eq (tree typea, tree typeb)
+{
+  if (TREE_CODE (typea) != FUNCTION_TYPE
+      || TYPE_RAISES_EXCEPTIONS (typea) == TYPE_RAISES_EXCEPTIONS (typeb))
+    return true;
+
+  return comp_except_specs (TYPE_RAISES_EXCEPTIONS (typea),
+			    TYPE_RAISES_EXCEPTIONS (typeb), 1);
+}
+
 /* Apply FUNC to all language-specific sub-trees of TP in a pre-order
    traversal.  Called from walk_tree.  */
 
--- gcc/testsuite/g++.dg/ext/attrib29.C.jj	2007-09-22 03:46:10.000000000 -0400
+++ gcc/testsuite/g++.dg/ext/attrib29.C	2007-09-22 03:46:10.000000000 -0400
@@ -0,0 +1,10 @@
+// PR c++/33506
+// { dg-do compile }
+
+extern int f1 (char *) __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw () __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw ();
+
+extern int f3 (char *) __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw () __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw ();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/.cvsignore,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- .cvsignore	27 Aug 2007 11:08:53 -0000	1.207
+++ .cvsignore	25 Sep 2007 23:17:10 -0000	1.208
@@ -1 +1 @@
-gcc-4.1.2-20070821.tar.bz2
+gcc-4.1.2-20070925.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gcc41.spec	17 Sep 2007 22:10:17 -0000	1.166
+++ gcc41.spec	25 Sep 2007 23:17:11 -0000	1.167
@@ -1,6 +1,6 @@
-%define DATE 20070821
+%define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 24
+%define gcc_release 27
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -136,22 +136,13 @@
 Patch22: gcc41-build-id.patch
 Patch23: gcc41-pr28690.patch
 Patch24: gcc41-rh247256.patch
-Patch25: gcc41-pr22244.patch
-Patch26: gcc41-pr32678.patch
-Patch27: gcc41-pr32912.patch
-Patch28: gcc41-sparc-niagara.patch
-Patch29: gcc41-ppc-tramp.patch
-Patch30: gcc41-rh253102.patch
-Patch31: gcc41-c++-gnu_inline.patch
-Patch32: gcc41-ppc-sync-qihi.patch
-Patch33: gcc41-ppc64-ia64-GNU-stack.patch
-Patch34: gcc41-builtin-chk-anticipated.patch
-Patch35: gcc41-builtin-throw.patch
-Patch36: gcc41-builtin-va-arg-pack.patch
-Patch37: gcc41-builtin-va-arg-pack-len.patch
-Patch38: gcc41-pr27954.patch
-Patch39: gcc41-pr33423.patch
-Patch40: gcc41-scanf-fmt-check.patch
+Patch25: gcc41-ppc64-ia64-GNU-stack.patch
+Patch26: gcc41-pr33506.patch
+Patch27: gcc41-artificial-attrib.patch
+Patch28: gcc41-error-attrib.patch
+Patch29: gcc41-jdwp.patch
+Patch30: gcc41-pr20880.patch
+Patch31: gcc41-pr32694.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -459,22 +450,13 @@
 #%patch22 -p0 -b .build-id~
 %patch23 -p0 -b .pr28690~
 %patch24 -p0 -b .rh247256~
-%patch25 -p0 -b .pr22244~
-%patch26 -p0 -b .pr32678~
-%patch27 -p0 -b .pr32912~
-%patch28 -p0 -b .sparc-niagara~
-%patch29 -p0 -b .ppc-tramp~
-%patch30 -p0 -b .rh253102~
-%patch31 -p0 -b .c++-gnu_inline~
-%patch32 -p0 -b .ppc-sync-qihi~
-%patch33 -p0 -b .ppc64-ia64-GNU-stack~
-%patch34 -p0 -b .builtin-chk-anticipated~
-%patch35 -p0 -b .builtin-throw~
-%patch36 -p0 -b .builtin-va-arg-pack~
-%patch37 -p0 -b .builtin-va-arg-pack-len~
-%patch38 -p0 -b .pr27954~
-%patch39 -p0 -b .pr33423~
-%patch40 -p0 -b .scanf-fmt-check~
+%patch25 -p0 -b .ppc64-ia64-GNU-stack~
+%patch26 -p0 -b .pr33506~
+%patch27 -p0 -b .artificial-attrib~
+%patch28 -p0 -b .error-attrib~
+%patch29 -p0 -b .jdwp~
+%patch30 -p0 -b .pr20880~
+%patch31 -p0 -b .pr32694~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1629,6 +1611,20 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-27.fc7
+- update from gcc-4_1-branch (-r127672:128736)
+  - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,
+	tree-optimization/33142
+- add support for artificial, error and warning attributes
+- restore Java CNI ABI compatibility broken by JDWP changes (Keith Seitz)
+- fix ICE with set_rhs allowing non-gimple (Roger Sayle, #247407,
+  PR tree-optimization/32694)
+- fix ICE on Fortran interface-body declaring current subroutine name
+  (Paul Thomas, #300851, PR fortran/20880)
+- don't ignore throw specification of function types in type hashing
+  (PR c++/33506)
+- handle makeinfo version >= 4.10 in gcc configury
+
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24.fc7
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until
   expand time and at that point it can avoid a call (PR middle-end/33423)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- sources	27 Aug 2007 11:08:53 -0000	1.209
+++ sources	25 Sep 2007 23:17:11 -0000	1.210
@@ -1 +1 @@
-65778706d6b9c029a06fca968a45ab7f  gcc-4.1.2-20070821.tar.bz2
+562ab2446c60a9145da385ac56cf7715  gcc-4.1.2-20070925.tar.bz2


--- gcc41-builtin-chk-anticipated.patch DELETED ---


--- gcc41-builtin-throw.patch DELETED ---


--- gcc41-builtin-va-arg-pack-len.patch DELETED ---


--- gcc41-builtin-va-arg-pack.patch DELETED ---


--- gcc41-c++-gnu_inline.patch DELETED ---


--- gcc41-ppc-sync-qihi.patch DELETED ---


--- gcc41-ppc-tramp.patch DELETED ---


--- gcc41-pr22244.patch DELETED ---


--- gcc41-pr27954.patch DELETED ---


--- gcc41-pr32678.patch DELETED ---


--- gcc41-pr32912.patch DELETED ---


--- gcc41-pr33423.patch DELETED ---


--- gcc41-rh253102.patch DELETED ---


--- gcc41-scanf-fmt-check.patch DELETED ---


--- gcc41-sparc-niagara.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:24:18 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 25 Sep 2007 19:24:18 -0400
Subject: rpms/gwget/devel gwget-0.99-epiphany.patch, NONE, 1.1 gwget.spec,
	1.22, 1.23 gwget-0.99-epiphany220.patch, 1.1, NONE
Message-ID: <200709252324.l8PNOI0H029136@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056

Modified Files:
	gwget.spec 
Added Files:
	gwget-0.99-epiphany.patch 
Removed Files:
	gwget-0.99-epiphany220.patch 
Log Message:
rename patch

gwget-0.99-epiphany.patch:

--- NEW FILE gwget-0.99-epiphany.patch ---
--- gwget-0.99/configure.in.orig	2007-06-09 20:51:03.000000000 +0200
+++ gwget-0.99/configure.in	2007-06-09 20:56:14.000000000 +0200
@@ -97,14 +97,18 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18 or 2.19 or 2.20
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
-	EPHY_VER=2.18
+if pkg-config --exists epiphany-2.20; then
+	EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+        EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+        EPHY_VER=2.18
 elif pkg-config --exists epiphany-2.17; then
         EPHY_VER=2.17
 elif pkg-config --exists epiphany-2.16; then
@@ -170,13 +174,21 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.18
           EPIPHANY_REQUIRED=2.18
 	  EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.19
+          EPIPHANY_REQUIRED=2.19
+	  EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.20
+          EPIPHANY_REQUIRED=2.20
+	  EPIPHANY_SHORTVER=220
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219 or 220)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gwget.spec	25 Sep 2007 23:05:33 -0000	1.22
+++ gwget.spec	25 Sep 2007 23:23:45 -0000	1.23
@@ -10,7 +10,7 @@
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.99/gwget-0.99.tar.bz2
 Source1:	gwget.desktop
-Patch0:		gwget-0.99-epiphany219.patch
+Patch0:		gwget-0.99-epiphany.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0


--- gwget-0.99-epiphany220.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:32:53 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Sep 2007 19:32:53 -0400
Subject: rpms/cgi-util/devel cgi-util.spec, 1.3,
	1.4 cgi-util-2.2.1-autotools.patch, 1.1, NONE
Message-ID: <200709252332.l8PNWr5T029454@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413/devel

Modified Files:
	cgi-util.spec 
Removed Files:
	cgi-util-2.2.1-autotools.patch 
Log Message:
Resume maintainership.



Index: cgi-util.spec
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/cgi-util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cgi-util.spec	11 Dec 2006 16:36:30 -0000	1.3
+++ cgi-util.spec	25 Sep 2007 23:32:21 -0000	1.4
@@ -1,11 +1,10 @@
 Summary: A C library for creating Common Gateway Interface ("CGI") programs
 Name: cgi-util
 Version: 2.2.1
-Release: 8
-License: LGPL
+Release: 15%{?dist}
+License: LGPLv2+
 Group: System Environment/Libraries
-Source: ftp://ftp.billsgames.com/unix/www/%name/%{name}-%{version}.tar.gz
-Patch0: cgi-util-2.2.1-autotools.patch
+Source: ftp://ftp.billsgames.com/unix/www/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.newbreedsoftware.com/cgi-util/
 
@@ -25,26 +24,18 @@
 needed for developing applications using the cgi-util library.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
-%setup
-%patch0 -p1
-chmod +x configure
+%setup -q
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%{__cc} %{__global_cflags} -Wall -ansi -pedantic -fPIC cgi-util.c -c -o libcgi-util.o
+%{__cc} %{__global_cflags} -shared -Wl,-soname=libcgi-util.so.2 libcgi-util.o -o libcgi-util.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libcgi-util.la
-rm -f ${RPM_BUILD_ROOT}/%{_bindir}/*.cgi
+%{__install} -p -D -m 0755  libcgi-util.so %{buildroot}%{_libdir}/libcgi-util.so.%{version}
+%{__install} -p -D -m 0644  cgi-util.h %{buildroot}%{_includedir}/cgi-util.h
+%{__ln_s} libcgi-util.so.%{version} %{buildroot}%{_libdir}/libcgi-util.so
+%{__ln_s} libcgi-util.so.%{version} %{buildroot}%{_libdir}/libcgi-util.so.2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,16 +45,42 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_libdir}/lib*.so.*
-%doc ChangeLog COPYING INSTALL TODO test.cgi filetest.cgi test.html filetest.html
+%doc CHANGES.txt COPYING.txt TODO.txt
 
 %files devel
 %{_libdir}/lib*.so
 %{_includedir}/cgi-util.h
-%doc README test.c filetest.c
+%doc README.txt test.c filetest.c
 
 %changelog
+* Sun Sep 23 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-15
+   - Use install -p.
+   - Ensure libcgi-util.so.2 is owned by package.
+
+* Sat Sep 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-14
+   - Don't run linker directly.
+
+* Sat Sep 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-13
+   - Write soname to library.
+   - Fix permissions of library.
+   - Library symlink is now relative.
+   - Build using Fedora compilation flags.
+
+* Fri Sep 21 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-12
+   - Don't use autotools patch -- wait for it upstream.
+   - Don't install compiled examples.
+
+* Thu Aug 23 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-10
+   - Modify autotools patch to streamline build.
+
+* Wed Aug 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-9
+   - Do not install INSTALL.
+   - Use %%setup -q.
+   - Use %%defattr(-,root,root,-).
+   - Do not use %%makeinstall.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-8
    - Rebuild for FC6.
 
@@ -71,8 +88,8 @@
    - Remove *.cgi from bindir.
 
 * Thu Mar 09 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-6
-   - Move test.cgi and filetest.cgi to %doc.
-   - Move README to -devel %doc and add test.c and filetest.c.
+   - Move test.cgi and filetest.cgi to %%doc.
+   - Move README to -devel %%doc and add test.c and filetest.c.
    - Pass --disable-static to configure.
 
 * Thu Feb 23 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-5


--- cgi-util-2.2.1-autotools.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 00:54:14 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 20:54:14 -0400
Subject: comps/po it.po,1.5,1.6
Message-ID: <200709260054.l8Q0sEXs004810@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4784/po

Modified Files:
	it.po 
Log Message:
2007-09-25  Francesco Valente <fvalen at redhat.com> (via fvalen at fedoraproject.org)

  * po/it.po: Updated




Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- it.po	17 Sep 2007 19:22:12 -0000	1.5
+++ it.po	26 Sep 2007 00:53:44 -0000	1.6
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
+"POT-Creation-Date: 2007-09-25 17:44-0700\n"
 "PO-Revision-Date: 2007-03-05 00:33+0100\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
 "Language-Team: italiano <fedora-trans-it at redhat.com>\n"



From fedora-extras-commits at redhat.com  Wed Sep 26 01:06:11 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 21:06:11 -0400
Subject: comps/po it.po,1.6,1.7
Message-ID: <200709260106.l8Q16BpJ011420@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11403/po

Modified Files:
	it.po 
Log Message:
2007-09-25  Francesco Valente <fvalen at redhat.com> (via fvalen at fedoraproject.org)

  * po/it.po: Updated




Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- it.po	26 Sep 2007 00:53:44 -0000	1.6
+++ it.po	26 Sep 2007 01:05:41 -0000	1.7
@@ -1,3 +1,4 @@
+# translation of it.po to 
 # translation of it.po to italiano
 # translation of it.po to
 # translation of it.po to
@@ -6,29 +7,28 @@
 # translation of it.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
 # Francesco Valente <fvalen at redhat.com>, 2002, 2003, 2004.
 # Lorenzo Stobbione <lorenzo.stobbione at clsengineering.it>, 2004, 2005.
 # Francesco Tombolini <tombo at adamantio.net>, 2006, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-25 17:44-0700\n"
-"PO-Revision-Date: 2007-03-05 00:33+0100\n"
-"Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
-"Language-Team: italiano <fedora-trans-it at redhat.com>\n"
+"PO-Revision-Date: 2007-09-26 03:04+0200\n"
+"Last-Translator: \n"
+"Language-Team:  <it 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"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un ambiente desktop leggero che funziona bene con macchine di basso livello."
+msgstr "Un ambiente desktop leggero che funziona bene con macchine di basso livello."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -190,13 +190,11 @@
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
 #: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
+msgstr "Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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 ""
 "Installare questo gruppo di pacchetti per usare l'interfaccia utente grafica "
 "(X) di base."
@@ -271,10 +269,8 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"Semplici window managers che non sono parte di grandi ambienti desktop."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "Semplici window managers che non sono parte di grandi ambienti desktop."
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -298,8 +294,7 @@
 #: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
 #: ../comps-el4.xml.in.h:45
 msgid "Support for developing programs in the Java programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Java."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Java."
 
 #: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
 #: ../comps-el4.xml.in.h:46
@@ -333,13 +328,11 @@
 #: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
 #: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
+msgstr "Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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 ""
 "Questi pacchetti sono d'aiuto quando si sviluppano applicazioni web o pagine "
 "web."
@@ -428,16 +421,14 @@
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -445,8 +436,7 @@
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -454,16 +444,14 @@
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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 ""
 "Questo gruppo ?? una collezione di strumenti per varie utilit?? specifiche "
 "hardware."
@@ -530,8 +518,7 @@
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -723,8 +710,7 @@
 msgstr "Supporto per l'indonesiano"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installare questi strumenti per permettere al sistema di stampare o fungere "
 "da server di stampa."
@@ -947,22 +933,19 @@
 msgstr "L'ambiente di sviluppo integrato Eclipse"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "I pacchetti di questo gruppo sono le principali librerie di sviluppo delle "
 "applicazioni."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Questi pacchetti consentono di sviluppare applicazioni per il sistema X "
 "Window."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "Questi pacchetti includono server basati sulla rete come ad esempio DHCP, "
 "Kerberos e NIS."
@@ -981,8 +964,7 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
+msgstr "Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
@@ -1015,8 +997,7 @@
 "di piccoli router/firewall, per esempio."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Questo gruppo di pacchetti consente di eseguire un server dei nomi DNS "
 "(BIND) sul sistema."
@@ -1146,341 +1127,3 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Supporto per lo Swati"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Supporto per il brasiliano"
-
-#~ msgid "British Support"
-#~ msgstr "Supporto per l'inglese britannico"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Supporto compatibilit?? sviluppo fra architetture"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Supporto compatibilit?? architetture di Mozilla"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? fra architetture"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Supporto per il cirillico"
-
-#~ msgid "Desktops"
-#~ msgstr "Desktops"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "Supporto ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "Supporto ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "Supporto ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "Supporto ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Installare questi pacchetti per ricompilare il Kernel."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "Ambiente desktop KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Sviluppo del kernel"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Pacchetti vari inclusi"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Pacchetti di Mozilla per la piattaforma x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Pacchetti di supporto Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "Database SQL"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr ""
-#~ "Supporto per lo sviluppo di pacchetti per l'architettura non-primaria"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Supporto per il siriaco"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "Editor di testo GNU Emacs."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "Questi pacchetti consentono di configurare un server di posta IMAP o "
-#~ "Postfix."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Questi pacchetti forniscono un supporto per la compatibilit?? delle "
-#~ "versioni precedenti di Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Librerie di sviluppo non supportate"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Workstation Common"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? architettura ppc64"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Supporto sviluppo compatibilit?? architettura x86"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? architettura x86"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "Portoghese Brasiliano"
-
-#~ msgid "English"
-#~ msgstr "Inglese"
-
-#~ msgid "French"
-#~ msgstr "Francese"
-
-#~ msgid "German"
-#~ msgstr "Tedesco"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Documentazione di Red Hat Enterprise Linux 3"
-
-#~ msgid "Spanish"
-#~ msgstr "Spagnolo"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "Portoghese Brasiliano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "inglese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "francese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "tedesco."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "italiano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "spagnolo."
-
-#~ msgid "Japanese"
-#~ msgstr "Giapponese"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "Cinese Semplificato"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "giapponese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "coreano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "cinese semplificato."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "cinese tradizionale."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "Cinese Tradizionale"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Supporto sviluppo compatibilit?? architettura ppc64"
-
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
-
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
-
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Documentazione di Red Hat Enterprise Linux 4"
-
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua bengali."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Gujarati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Hindi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Punjabi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Tamil."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Cluster Storage"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Supporto clustering."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pacchetti che forniscono supporto per il cluster storage."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pacchetti che forniscono supporto per il GFS in nodo singolo."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Supporto per il GFS a nodo singolo"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "Questi pacchetti forniscono supporto per la compatibilit?? verso le "
-#~ "versioni precedenti."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Ambienti Java runtime e kits di sviluppo"
-
-#~ msgid "Misc"
-#~ msgstr "Miscellanea"
-
-#~ msgid "Misc packages"
-#~ msgstr "Pacchetti miscellanei"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Applicazioni multimediali"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pacchetti che forniscono funzionalit?? aggiuntive per Red Hat Enterprise "
-#~ "Linux."
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Workstation"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Applicazioni ed utilit?? workstation."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Supporto per la virtualizzazione."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Compatibilit?? fra architetture"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Librerie di compatibilit?? fra architetture"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Pacchetti di libreria Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr ""
-#~ "Pacchetti che forniscono funzionalit?? per la compatibilit?? fra "
-#~ "architetture."



From fedora-extras-commits at redhat.com  Wed Sep 26 01:08:43 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 21:08:43 -0400
Subject: rpms/kernel/devel linux-2.6-x86-disable-local-apic-amd-c1e.patch,
	1.1, 1.2
Message-ID: <200709260108.l8Q18hk3011485@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11464

Modified Files:
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
buildfix

linux-2.6-x86-disable-local-apic-amd-c1e.patch:




From fedora-extras-commits at redhat.com  Wed Sep 26 01:29:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 25 Sep 2007 21:29:30 -0400
Subject: rpms/gtk2/devel simple-search-crash.patch, NONE, 1.1 gtk2.spec,
	1.258, 1.259
Message-ID: <200709260129.l8Q1TUlt012850@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12817

Modified Files:
	gtk2.spec 
Added Files:
	simple-search-crash.patch 
Log Message:
fix a simple search crash


simple-search-crash.patch:

--- NEW FILE simple-search-crash.patch ---
Index: gtk/gtksearchenginesimple.c
===================================================================
--- gtk/gtksearchenginesimple.c	(revision 18864)
+++ gtk/gtksearchenginesimple.c	(working copy)
@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate 
 G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
 
 static void
-finalize (GObject *object)
+gtk_search_engine_simple_dispose (GObject *object)
 {
   GtkSearchEngineSimple *simple;
+  GtkSearchEngineSimplePrivate *priv;
   
   simple = GTK_SEARCH_ENGINE_SIMPLE (object);
+  priv = simple->priv;
   
-  if (simple->priv->query) 
+  if (priv->query) 
+    {
+      g_object_unref (priv->query);
+      priv->query = NULL;
+    }
+
+  if (priv->active_search)
     {
-      g_object_unref (simple->priv->query);
-      simple->priv->query = NULL;
+      priv->active_search->cancelled = TRUE;
+      priv->active_search = NULL;
     }
   
-  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
+  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
 }
 
 static SearchThreadData *
@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
 
   data = user_data;
   
-  if (!data->cancelled) 
-    {
-      _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-      data->engine->priv->active_search = NULL;
-    }
-  
+  if (!data->cancelled)
+    _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
+     
+  data->engine->priv->active_search = NULL;
   search_thread_data_free (data);
   
   return FALSE;
@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
       hits = g_new (SearchHits, 1);
       hits->uris = data->uri_hits;
       hits->thread_data = data;
+      
       gdk_threads_add_idle (search_thread_add_hits_idle, hits);
     }
   data->uri_hits = NULL;
@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
   GtkSearchEngineClass *engine_class;
   
   gobject_class = G_OBJECT_CLASS (class);
-  gobject_class->finalize = finalize;
+  gobject_class->dispose = gtk_search_engine_simple_dispose;
   
   engine_class = GTK_SEARCH_ENGINE_CLASS (class);
   engine_class->set_query = gtk_search_engine_simple_set_query;
Index: gtk/gtkfilechooserdefault.c
===================================================================
--- gtk/gtkfilechooserdefault.c	(revision 18864)
+++ gtk/gtkfilechooserdefault.c	(working copy)
@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
   
   if (impl->search_engine)
     {
+      _gtk_search_engine_stop (impl->search_engine);
+      
       g_object_unref (impl->search_engine);
       impl->search_engine = NULL;
     }


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- gtk2.spec	20 Sep 2007 19:51:00 -0000	1.258
+++ gtk2.spec	26 Sep 2007 01:28:57 -0000	1.259
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -33,8 +33,8 @@
 # fixed in upstream svn
 Patch3: novalidate.patch
 Patch4: libtracker.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=460194
 Patch5: swt-tooltips.patch
+Patch6: simple-search-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -53,12 +53,8 @@
 BuildRequires: libXcursor-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
-# for patch 2
-#BuildRequires: gamin-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: gtk+-gtkbeta
-Obsoletes: Inti
 
 # Conflicts with packages containing theme engines
 # built against the 2.4.0 ABI
@@ -105,11 +101,6 @@
 Requires: automake
 # for /usr/share/gtk-doc/html
 Requires: gtk-doc
-Obsoletes: gtk+-gtkbeta-devel
-Obsoletes: Inti-devel
-## avoid header collisions
-Conflicts: gtk+-devel <= 1.2.8
-Conflicts: gdk-pixbuf-devel <= 0.11
 
 %description devel
 The gtk+-devel package contains the header files and developer
@@ -124,6 +115,7 @@
 %patch3 -p1 -b .novalidate
 %patch4 -p1 -b .libtracker
 %patch5 -p1 -b .swt-tooltips
+%patch6 -p0 -b .simple-search-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -306,6 +298,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 25 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-4
+- Fix a crash in simple search
+- Drop obsolete Obsoletes and Conflicts 
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-3
 - Fix a problem with swt and tooltips 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 01:35:45 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 25 Sep 2007 21:35:45 -0400
Subject: rpms/pungi/devel .cvsignore, 1.26, 1.27 pungi.spec, 1.28,
	1.29 sources, 1.27, 1.28
Message-ID: <200709260135.l8Q1Zjmo013206@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13130/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
- Fix location of media.repo file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Sep 2007 20:45:07 -0000	1.26
+++ .cvsignore	26 Sep 2007 01:35:13 -0000	1.27
@@ -1 +1 @@
-pungi-1.1.1.tar.gz
+pungi-1.1.2.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pungi.spec	18 Sep 2007 20:45:07 -0000	1.28
+++ pungi.spec	26 Sep 2007 01:35:13 -0000	1.29
@@ -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:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Jesse Keating <jkeating at redhat.com> - 1.1.2-1
+- Fix location of media.repo file.
+
 * Tue Sep 18 2007 Jesse Keating <jkeating at redhat.com> - 1.1.1-1
 - Create a media.repo file on the first iso
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Sep 2007 20:45:07 -0000	1.27
+++ sources	26 Sep 2007 01:35:13 -0000	1.28
@@ -1 +1 @@
-60e42213c8e0fc5d8306f6b32d468397  pungi-1.1.1.tar.gz
+f4720af1b95ba064ee63ebcafdf29d74  pungi-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 01:45:57 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 21:45:57 -0400
Subject: rpms/alex/devel alex.spec,1.2,1.3
Message-ID: <200709260145.l8Q1jvbS013698@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671

Modified Files:
	alex.spec 
Log Message:
ExcludeArch ppc64



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alex.spec	25 Sep 2007 22:13:26 -0000	1.2
+++ alex.spec	26 Sep 2007 01:45:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://haskell.org/alex/
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
 
 BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
@@ -47,6 +48,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-5
+- don't try to build on ppc64
+
 * Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
 - build requires autoconf
 



From fedora-extras-commits at redhat.com  Wed Sep 26 01:55:17 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 21:55:17 -0400
Subject: rpms/alex/F-7 alex.spec,1.2,1.3
Message-ID: <200709260155.l8Q1tH21014086@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14064

Modified Files:
	alex.spec 
Log Message:
Sync with devel.



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/alex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alex.spec	25 Sep 2007 22:25:33 -0000	1.2
+++ alex.spec	26 Sep 2007 01:54:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://haskell.org/alex/
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
 
 BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
@@ -47,6 +48,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-5
+- don't try to build on ppc64
+
 * Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
 - build requires autoconf
 



From fedora-extras-commits at redhat.com  Wed Sep 26 02:37:06 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:37:06 -0400
Subject: rpms/fedora-release-notes/devel sources, 1.20, 1.21 .cvsignore, 1.11,
	1.12
Message-ID: <200709260237.l8Q2b6If024085@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	sources .cvsignore 
Log Message:
New 7.92 tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Aug 2007 04:07:28 -0000	1.20
+++ sources	26 Sep 2007 02:36:28 -0000	1.21
@@ -1,5 +1 @@
-585fc308a6276cb6465ba494ac50ced6  about-fedora-7.90.tar.gz
-e5cf0a9175bb7e5b45385cb599f5c88b  fedora-release-notes-7.90.tar.gz
-67b404e379bd610fb7a0bea559bcf498  homepage-7.90.tar.gz
-86cc9aa7a9349f742421f1b9e90f275b  README-7.90.tar.gz
-f225f59e18aa0d6426750ec0c068d1d1  README-BURNING-ISOS-7.90.tar.gz
+86ad7ce1207b1f7679bf717f83c25d24  fedora-release-notes-7.92.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Aug 2007 04:07:28 -0000	1.11
+++ .cvsignore	26 Sep 2007 02:36:28 -0000	1.12
@@ -1,5 +1 @@
-about-fedora-7.90.tar.gz
-fedora-release-notes-7.90.tar.gz
-homepage-7.90.tar.gz
-README-7.90.tar.gz
-README-BURNING-ISOS-7.90.tar.gz
+fedora-release-notes-7.92.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 02:41:12 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:41:12 -0400
Subject: rpms/fedora-release-notes/devel sources, 1.21, 1.22 .cvsignore, 1.12,
	1.13
Message-ID: <200709260241.l8Q2fCCD024208@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24184

Modified Files:
	sources .cvsignore 
Log Message:
New 7.92 tarballs, including all sources this time. :-)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Sep 2007 02:36:28 -0000	1.21
+++ sources	26 Sep 2007 02:40:18 -0000	1.22
@@ -1 +1,6 @@
+ef479462c83b16073588e73157edea4f  README-7.92.tar.gz
+c658c457cdba808a870246eb3c670f81  README-BURNING-ISOS-7.92.tar.gz
+8b6f66f32e28a22ebdf2581ac7a73ca6  about-fedora-7.92.tar.gz
 86ad7ce1207b1f7679bf717f83c25d24  fedora-release-notes-7.92.tar.gz
+0c372d62fbef5995e3de58d9ce7fdcd5  homepage-7.92.tar.gz
+779c021ce2588377329eab34ab968ef6  readme-live-image-7.92.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Sep 2007 02:36:28 -0000	1.12
+++ .cvsignore	26 Sep 2007 02:40:18 -0000	1.13
@@ -1 +1,6 @@
+README-7.92.tar.gz
+README-BURNING-ISOS-7.92.tar.gz
+about-fedora-7.92.tar.gz
 fedora-release-notes-7.92.tar.gz
+homepage-7.92.tar.gz
+readme-live-image-7.92.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 02:43:34 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:43:34 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.21,
	1.22
Message-ID: <200709260243.l8Q2hYkD024261@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239

Modified Files:
	fedora-release-notes.spec 
Log Message:
New 7.92-1 spec, includes startpage content, readme-live-image, and new content for F8 test3


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fedora-release-notes.spec	24 Aug 2007 04:06:35 -0000	1.21
+++ fedora-release-notes.spec	26 Sep 2007 02:43:01 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		fedora-release-notes
-Version:	7.90
+Version:	7.92
 Release:	1
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
@@ -11,10 +11,14 @@
 Source2:	about-fedora-%{version}.tar.gz
 Source3:	README-%{version}.tar.gz
 Source4:	README-BURNING-ISOS-%{version}.tar.gz
+Source5:	readme-live-image-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
 BuildRequires:	desktop-file-utils
+# 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.
 Provides:	indexhtml = %{version}-%{release}
 Obsoletes:	indexhtml < 9-3
 
@@ -31,6 +35,7 @@
 %setup -D -q -a 2
 %setup -D -q -a 3
 %setup -D -q -a 4
+%setup -D -q -a 5
 
 
 %build
@@ -46,17 +51,17 @@
 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 css img stylesheet-images ; do
+for DIR in css 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}
-  install -m 644 -D fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/fedora.css
-  for D in css img stylesheet-images ; do
-    install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D}
-    find $D -type f -exec install -m 644 '{}' $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D} \;
+  ln -s ../../fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
+  for D in css stylesheet-images ; do
+    ln -s ../../${D} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
   done 
 done
 pushd README-BURNING-ISOS-%{version}/
@@ -65,9 +70,17 @@
   install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-burning-isos/${L}/${F}
 done
 popd
+pushd readme-live-image-%{version}/
+for F in readme-live-image-*.txt; do
+  L=`echo ${F} | %{__sed} 's/readme-live-image-\(.*\)\.txt/\1/'`
+  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-live-image/${L}/${F}
+done
+popd
 pushd homepage-%{version}
 install -m 644 homepage/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
+install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
+install -m 644 images/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
 popd
 pushd about-fedora-%{version}
 find about-fedora/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/{} \;
@@ -106,6 +119,17 @@
 
 
 %changelog
+* Sun Sep 16 2007 Paul W. Frields <stickster at gmail.com> - 7.92-1
+- Include new start page
+- Push new content for F8 test3
+
+* Wed Sep 12 2007 Paul W. Frields <stickster at gmail.com> - 7.91-1
+- Link stylesheet resources to save space
+
+* Mon Aug 27 2007 Paul W. Frields <stickster at gmail.com> - 7.90-2
+- Remove superfluous PNG files
+- Bump release for rebranding change in homepage
+
 * Tue Aug 21 2007 Paul W. Frields <stickster at gmail.com> - 7.90-1
 - Resituate HTML documentation for release spins
 



From fedora-extras-commits at redhat.com  Wed Sep 26 03:05:44 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 25 Sep 2007 23:05:44 -0400
Subject: rpms/sword/devel sword-open.patch,NONE,1.1 sword.spec,1.18,1.19
Message-ID: <200709260305.l8Q35i8G030954@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30906

Modified Files:
	sword.spec 
Added Files:
	sword-open.patch 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-7
- Fix the build failure due to glibc open() check


sword-open.patch:

--- NEW FILE sword-open.patch ---
--- utilities/cipherraw.cpp	2005-05-02 23:49:04.000000000 -0400
+++ utilities/cipherraw.cpp.new	2007-09-25 18:14:16.000000000 -0400
@@ -45,13 +45,13 @@
 
 	tmpbuf = new char [ strlen(argv[1]) + 11 ];
 	sprintf(tmpbuf, "%sot.zzz", argv[1]);
-	ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%sot.zzz.vss", argv[1]);
-	oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%snt.zzz", argv[1]);
-	ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%snt.zzz.vss", argv[1]);
-	oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 
 	delete [] tmpbuf;

--- utilities/gbfidx.cpp	2007-09-25 18:12:44.000000000 -0400
+++ utilities/gbfidx.cpp.new	2007-09-25 18:13:04.000000000 -0400
@@ -258,25 +258,25 @@
 #endif				// don't need it.
 	char buf[255];
 
-	if ((fp = open(fname, O_RDONLY|O_BINARY)) == -1) {
+	if ((fp = open(fname, O_RDONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", fname);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	} 


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sword.spec	25 Aug 2007 12:42:04 -0000	1.18
+++ sword.spec	26 Sep 2007 03:05:10 -0000	1.19
@@ -1,12 +1,13 @@
 Name:           sword           
 Version:        1.5.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
+Patch0:		sword-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .open
 
 %build
 %configure --disable-static --with-icu --with-lucene
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-7
+- Fix the build failure due to glibc open() check
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 03:07:18 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Tue, 25 Sep 2007 23:07:18 -0400
Subject: rpms/libsvm/devel libsvm-2.84-5.patch, NONE, 1.1 libsvm.spec, 1.5, 
	1.6 libsvm-2.84-4.patch, 1.1, NONE
Message-ID: <200709260307.l8Q37IGM031030@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30965/devel

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-5.patch 
Removed Files:
	libsvm-2.84-4.patch 
Log Message:
1. Split libsvm-java out of libsvm package
2. Make libsvm.so


libsvm-2.84-5.patch:

--- NEW FILE libsvm-2.84-5.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-25 14:30:10.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,53 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src
+	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
+	cp -R java ${INSTDIR}/share/libsvm/src
+	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsvm.spec	30 Aug 2007 06:09:57 -0000	1.5
+++ libsvm.spec	26 Sep 2007 03:06:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-4.patch
+Patch0:         libsvm-2.84-5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -45,6 +45,19 @@
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%package java
+Summary:    Java tools and interfaces for libsvm.
+Group:      Development/Libraries
+BuildRequires:  eclipse-ecj >= 3, libgcj >= 4
+Requires:       eclipse-ecj >= 3
+Requires:       %{name} = %{version}-%{release}
+
+%description java
+Java tools and interfaces for libsvm.
+Install this package if you want to develop 
+programs with libsvm in Java.
+
+
 %prep
 %setup -q
 %patch0 -p0 -b .bak 
@@ -58,13 +71,14 @@
 dos2unix -o %{_builddir}/%{name}-%{version}/FAQ.html
 mv %{_builddir}/%{name}-%{version}/python/README %{_builddir}/%{name}-%{version}/python/README-Python
 mv %{_builddir}/%{name}-%{version}/tools/README %{_builddir}/%{name}-%{version}/tools/README-Tools
+cp %{_builddir}/%{name}-%{version}/README %{_builddir}/%{name}-%{version}/java/README-Java
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,8 +100,17 @@
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%files java
+%doc java/README-Java
+#%{_libdir}/java/libsvm/docs
+%{_libdir}/java/libsvm/libsvm.jar
+%{_libdir}/java/libsvm/test_applet.html
 
 %changelog
+* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+- Split out libsvm-java
+- Add libsvm.so
+
 * Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-4
 - Refined description.
 - Fix the /tmp/python.ver problem


--- libsvm-2.84-4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 03:34:59 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Tue, 25 Sep 2007 23:34:59 -0400
Subject: rpms/libsvm/F-7 libsvm-2.84-5.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 libsvm.spec, 1.2, 1.3 libsvm-2.84-4.patch, 1.1, NONE
Message-ID: <200709260334.l8Q3Yx1f031855@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/F-7

Modified Files:
	.cvsignore libsvm.spec 
Added Files:
	libsvm-2.84-5.patch 
Removed Files:
	libsvm-2.84-4.patch 
Log Message:
1. Split libsvm-java out of main packagge
2. Make libsvm.so


libsvm-2.84-5.patch:

--- NEW FILE libsvm-2.84-5.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-25 14:30:10.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,53 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src
+	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
+	cp -R java ${INSTDIR}/share/libsvm/src
+	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 01:27:43 -0000	1.1
+++ .cvsignore	26 Sep 2007 03:34:26 -0000	1.2
@@ -0,0 +1 @@
+libsvm-2.84.tar.gz


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsvm.spec	30 Aug 2007 06:31:05 -0000	1.2
+++ libsvm.spec	26 Sep 2007 03:34:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-4.patch
+Patch0:         libsvm-2.84-5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -45,6 +45,19 @@
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%package java
+Summary:    Java tools and interfaces for libsvm.
+Group:      Development/Libraries
+BuildRequires:  eclipse-ecj >= 3, libgcj >= 4
+Requires:       eclipse-ecj >= 3
+Requires:       %{name} = %{version}-%{release}
+
+%description java
+Java tools and interfaces for libsvm.
+Install this package if you want to develop 
+programs with libsvm in Java.
+
+
 %prep
 %setup -q
 %patch0 -p0 -b .bak 
@@ -58,13 +71,14 @@
 dos2unix -o %{_builddir}/%{name}-%{version}/FAQ.html
 mv %{_builddir}/%{name}-%{version}/python/README %{_builddir}/%{name}-%{version}/python/README-Python
 mv %{_builddir}/%{name}-%{version}/tools/README %{_builddir}/%{name}-%{version}/tools/README-Tools
+cp %{_builddir}/%{name}-%{version}/README %{_builddir}/%{name}-%{version}/java/README-Java
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,8 +100,17 @@
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%files java
+%doc java/README-Java
+#%{_libdir}/java/libsvm/docs
+%{_libdir}/java/libsvm/libsvm.jar
+%{_libdir}/java/libsvm/test_applet.html
 
 %changelog
+* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+- Split out libsvm-java
+- Add libsvm.so
+
 * Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-4
 - Refined description.
 - Fix the /tmp/python.ver problem


--- libsvm-2.84-4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 03:45:36 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 25 Sep 2007 23:45:36 -0400
Subject: rpms/tracker/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tracker.spec, 1.21, 1.22
Message-ID: <200709260345.l8Q3jas5032312@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32290

Modified Files:
	.cvsignore sources tracker.spec 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
- Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2007 00:31:22 -0000	1.8
+++ .cvsignore	26 Sep 2007 03:45:04 -0000	1.9
@@ -1 +1 @@
-tracker-0.6.2.tar.bz2
+tracker-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2007 00:31:22 -0000	1.8
+++ sources	26 Sep 2007 03:45:04 -0000	1.9
@@ -1 +1 @@
-d4d66cd73e6c59ac392565be622370f2  tracker-0.6.2.tar.bz2
+f718aa38b7527229f5567834ae247a38  tracker-0.6.3.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tracker.spec	11 Sep 2007 19:52:50 -0000	1.21
+++ tracker.spec	26 Sep 2007 03:45:04 -0000	1.22
@@ -1,18 +1,17 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.2
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
 Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
-Patch0:		trackerd-getenv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-BuildRequires:	sqlite-devel, pygtk2-devel
+BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -34,7 +33,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	dbus-glib-devel
+Requires:	dbus-glib-devel gtk2-devel
 
 %description devel
 This package contains the static libraries and header files needed for
@@ -51,16 +50,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .getenv
 %define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
-
-%build
-%configure --disable-static --enable-deskbar-applet=auto	\
 %if "%deskbar_applet_ver" >= "2.19"
-	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/modules
+ %define deskbar_applet_dir %(pkg-config --variable modulesdir deskbar-applet)
 %else
-	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/handlers
+ %define deskbar_applet_dir %(pkg-config --variable handlersdir deskbar-applet)
 %endif
+
+%build
+%configure --disable-static --enable-deskbar-applet=auto	\
+		--enable-external-qdbm
 # 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
@@ -118,16 +117,15 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
-%if "%deskbar_applet_ver" >= "2.19"
-%{_libdir}/deskbar-applet/modules/tracker*.py*
-%else
-%{_libdir}/deskbar-applet/handlers/*.py*
-%endif
+%{deskbar_applet_dir}/tracker*.py*
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
+- Version 0.6.3
+
 * Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
 - Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 04:38:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 00:38:52 -0400
Subject: rpms/xkeyboard-config/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xkeyboard-config.spec, 1.10, 1.11
Message-ID: <200709260438.l8Q4cqIm009871@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9849

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Log Message:
1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2007 22:36:39 -0000	1.3
+++ .cvsignore	26 Sep 2007 04:38:14 -0000	1.4
@@ -1 +1 @@
-xkeyboard-config-1.0.tar.bz2
+xkeyboard-config-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2007 22:36:39 -0000	1.3
+++ sources	26 Sep 2007 04:38:14 -0000	1.4
@@ -1 +1 @@
-bcf08a6bf76bd5661f730d36a1d66517  xkeyboard-config-1.0.tar.bz2
+deef7884b9d9cc280f0d2ef4b60e4d98  xkeyboard-config-1.1.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xkeyboard-config.spec	5 Sep 2007 22:36:39 -0000	1.10
+++ xkeyboard-config.spec	26 Sep 2007 04:38:14 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 1.0
+Version: 1.1
 Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
@@ -12,11 +12,6 @@
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=7991
-Patch0: kinesis.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=7992
-Patch1: dellm65.patch
-
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -46,9 +41,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .kinesis
-%patch1 -p1 -b .dellm65
-
 %build
 %configure \
     --enable-compat-rules \
@@ -84,6 +76,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-1
+- Update to 1.1
+- Drop upstreamed patches
+
 * Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 1.0-1
 - Update to 1.0
 - Drop upstreamed patches



From fedora-extras-commits at redhat.com  Wed Sep 26 04:55:28 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 00:55:28 -0400
Subject: rpms/knm_new-fonts/devel knm_new-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709260455.l8Q4tS67010359@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10338/devel

Modified Files:
	.cvsignore sources 
Added Files:
	knm_new-fonts.spec 
Log Message:
initial commit



--- NEW FILE knm_new-fonts.spec ---
%define	fontdir		%{_datadir}/fonts/%{name}
%define	catalogue	%{_sysconfdir}/X11/fontpath.d

Name:		knm_new-fonts
Version:	1.1
Release:	2%{?dist}
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	mkfontdir
## the following upstream URL is a dead link anymore.
URL:		http://www.din.or.jp/~storm/fonts/
Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz


Summary:	12x12 JIS X 0208 Bitmap font
License:	GPL+
Group:		User Interface/X
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Provides:	knm_new = 1.1-16
Obsoletes:	knm_new <= 1.1-16

%description
This package provides 12x12 Japanese bitmap font for JIS X 0208.
JIS X 0208 is a character set that contains Kanji characters mostly
often used.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}
install -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/

%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir}

# Install catalogue symlink
%{__ln_s} -f %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%dir %{fontdir}
%{fontdir}/*.pcf.gz
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm_new-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:17:16 -0000	1.1
+++ .cvsignore	26 Sep 2007 04:54:54 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm_new-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:17:16 -0000	1.1
+++ sources	26 Sep 2007 04:54:54 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 05:00:53 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 01:00:53 -0400
Subject: rpms/jisksp16-1990-fonts/devel jisksp16-1990-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709260500.l8Q50rB4010706@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10636/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jisksp16-1990-fonts.spec 
Log Message:
initial commit



--- NEW FILE jisksp16-1990-fonts.spec ---
%define	fontdir		%{_datadir}/fonts/%{name}
%define	catalogue	%{_sysconfdir}/X11/fontpath.d

Name:		jisksp16-1990-fonts
Version:	0.983
Release:	2%{?dist}
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gzip mkfontdir xorg-x11-font-utils
URL:		http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/
Source0:	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jisksp16-1990.bdf.Z


Summary:	16x16 JIS X 0212:1990 Bitmap font
License:	Public Domain
Group:		User Interface/X
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Provides:	jisksp16-1990 = 0.1-16
Obsoletes:	jisksp16-1990 <= 0.1-16

%description
This package provides 16x16 Japanese bitmap font for JIS X 0212:1990.
JIS X 0212:1990 is a character sets that contains the auxiliary kanji
characters.


%prep
%setup -c -T
gunzip -c %{SOURCE0} > jisksp16-1990.bdf

%build
%{_bindir}/bdftopcf jisksp16-1990.bdf | gzip -9c > jisksp16-1990.pcf.gz

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}
install -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p jisksp16-1990.pcf.gz $RPM_BUILD_ROOT%{fontdir}/

%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir}

# Install catalogue symlink
ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%dir %{fontdir}
%{fontdir}/jisksp16-1990.pcf.gz
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/*

%changelog
* Mon Sep 24 2007 Akira TAGOH <tagoh at redhat.com> - 0.983-2
- Use %%setup.

* Fri Aug 17 2007 Akira TAGOH <tagoh at redhat.com> - 0.983-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jisksp16-1990-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:15:28 -0000	1.1
+++ .cvsignore	26 Sep 2007 05:00:19 -0000	1.2
@@ -0,0 +1 @@
+jisksp16-1990.bdf.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jisksp16-1990-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:15:28 -0000	1.1
+++ sources	26 Sep 2007 05:00:19 -0000	1.2
@@ -0,0 +1 @@
+c4ebfb1328a0d9a738ce7621094e40aa  jisksp16-1990.bdf.Z



From fedora-extras-commits at redhat.com  Wed Sep 26 07:23:04 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 26 Sep 2007 03:23:04 -0400
Subject: rpms/nagios/devel nagios.spec,1.34,1.35
Message-ID: <200709260723.l8Q7N4jM004338@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4135

Modified Files:
	nagios.spec 
Log Message:
rebuild for koji


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nagios.spec	9 Sep 2007 02:30:00 -0000	1.34
+++ nagios.spec	26 Sep 2007 07:22:32 -0000	1.35
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -163,6 +163,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Wed Sep 26 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-5
+- rebuild for koji test
+
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 07:27:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 26 Sep 2007 03:27:24 -0400
Subject: rpms/tcl/devel tcl-8.4.7-path.patch,1.1,1.2 tcl.spec,1.62,1.63
Message-ID: <200709260727.l8Q7ROsQ004755@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4725

Modified Files:
	tcl-8.4.7-path.patch tcl.spec 
Log Message:
Add forgotten else into patch - auto_path fully functional.


tcl-8.4.7-path.patch:

Index: tcl-8.4.7-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl-8.4.7-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-8.4.7-path.patch	24 Aug 2007 09:46:53 -0000	1.1
+++ tcl-8.4.7-path.patch	26 Sep 2007 07:27:21 -0000	1.2
@@ -12,13 +12,13 @@
 -    }
 +if {[info exists env(TCLLIBPATH)]} {
 +    set auto_path $env(TCLLIBPATH)
-+} 
-+
++} else {
 +if {[file exists "/usr/lib64/tclX8.3"]} {
 +    set auto_path "/usr/share/tcl8.4 /usr/share /usr/lib64 /usr/lib"
 +} else {
 +    set auto_path ""
  }
++}
 +
 +
  namespace eval tcl {


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- tcl.spec	24 Aug 2007 09:46:53 -0000	1.62
+++ tcl.spec	26 Sep 2007 07:27:21 -0000	1.63
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1 
 License: TCL
 Group: Development/Languages
@@ -142,6 +142,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Wed Sep 26 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-5
+- fix of patch - set auto_path was broken
+- Resolves: rhbz#306321
+
 * Fri Aug 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-4
 - rebuild for mass rebuild
 - check license & path for 32b/64b fix



From fedora-extras-commits at redhat.com  Wed Sep 26 07:34:28 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 26 Sep 2007 03:34:28 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-honor-displaysize.patch,
	NONE, 1.1 xserver-1.3.0-randr-updates.patch, NONE,
	1.1 xorg-x11-server.spec, 1.250,
	1.251 xserver-1.3.0-randr12-config-hack.patch, 1.1,
	1.2 xorg-x11-server-1.2.0-maxpixclock-option.patch, 1.1,
	NONE xserver-1.2.0-honor-displaysize.patch, 1.1,
	NONE xserver-1.3.0-edid-quirk-backports.patch, 1.2,
	NONE xserver-1.3.0-less-randr-fakerama.patch, 1.1, NONE
Message-ID: <200709260734.l8Q7YS3s005195@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5128

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-randr12-config-hack.patch 
Added Files:
	xserver-1.3.0-honor-displaysize.patch 
	xserver-1.3.0-randr-updates.patch 
Removed Files:
	xorg-x11-server-1.2.0-maxpixclock-option.patch 
	xserver-1.2.0-honor-displaysize.patch 
	xserver-1.3.0-edid-quirk-backports.patch 
	xserver-1.3.0-less-randr-fakerama.patch 
Log Message:
* Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
- xserver-1.3.0-randr-updates.patch: Backport randr from server git
  This contains a lot of fixes since 1.3.0 went out, and saves
  us backporting each fix individually
- xserver-1.3.0-less-randr-fakerama.patch - dropped
- xorg-x11-server-1.2.0-maxpixclock-option.patch - dropped
- xserver-1.3.0-edid-quirk-backports.patch - dropped
- xserver-1.2.0-honor-displaysize.patch - dropped
- xserver-1.3.0-honor-displaysize.patch - reapply to new code layout
- xserver-1.3.0-randr12-config-hack.patch - rebased


xserver-1.3.0-honor-displaysize.patch:

--- NEW FILE xserver-1.3.0-honor-displaysize.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da	2007-09-26 17:04:02.000000000 +1000
+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-09-26 17:04:27.000000000 +1000
@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
 
     Monitor->DDC = DDC;
 
-    Monitor->widthmm = 10 * DDC->features.hsize;
-    Monitor->heightmm = 10 * DDC->features.vsize;
+    if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {
+        Monitor->widthmm = 10 * DDC->features.hsize;
+        Monitor->heightmm = 10 * DDC->features.vsize;
+    }
 
     /* If this is a digital display, then we can use reduced blanking */
     if (DDC->features.input_type)

xserver-1.3.0-randr-updates.patch:

--- NEW FILE xserver-1.3.0-randr-updates.patch ---
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 0841a6d..1f82068 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -26,4 +26,4 @@ sdk_HEADERS = \
 	xf86RandR12.h \
 	xf86Rename.h
 
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 2d8a7ad..064ff16 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -45,13 +45,15 @@
 #include "picturestr.h"
 #endif
 
+#include "xf86xv.h"
+
 /*
  * Initialize xf86CrtcConfig structure
  */
 
 int xf86CrtcConfigPrivateIndex = -1;
 
-void
+_X_EXPORT void
 xf86CrtcConfigInit (ScrnInfoPtr scrn,
 		    const xf86CrtcConfigFuncsRec *funcs)
 {
@@ -66,7 +68,7 @@ xf86CrtcConfigInit (ScrnInfoPtr scrn,
     scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
 }
  
-void
+_X_EXPORT void
 xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
 		      int minWidth, int minHeight,
 		      int maxWidth, int maxHeight)
@@ -82,7 +84,7 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
 /*
  * Crtc functions
  */
-xf86CrtcPtr
+_X_EXPORT xf86CrtcPtr
 xf86CrtcCreate (ScrnInfoPtr		scrn,
 		const xf86CrtcFuncsRec	*funcs)
 {
@@ -114,7 +116,7 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     return crtc;
 }
 
-void
+_X_EXPORT void
 xf86CrtcDestroy (xf86CrtcPtr crtc)
 {
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
@@ -126,7 +128,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc)
 	{
 	    memmove (&xf86_config->crtc[c],
 		     &xf86_config->crtc[c+1],
-		     xf86_config->num_crtc - (c + 1));
+		     ((xf86_config->num_crtc - (c + 1)) * sizeof(void*)));
 	    xf86_config->num_crtc--;
 	    break;
 	}
@@ -138,7 +140,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc)
  * Return whether any outputs are connected to the specified pipe
  */
 
-Bool
+_X_EXPORT Bool
 xf86CrtcInUse (xf86CrtcPtr crtc)
 {
     ScrnInfoPtr		pScrn = crtc->scrn;
@@ -151,7 +153,7 @@ xf86CrtcInUse (xf86CrtcPtr crtc)
     return FALSE;
 }
 
-void
+_X_EXPORT void
 xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 {
 #ifdef RENDER
@@ -219,7 +221,7 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 /**
  * Sets the given video mode on the given crtc
  */
-Bool
+_X_EXPORT Bool
 xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 		 int x, int y)
 {
@@ -377,6 +379,15 @@ static OptionInfoRec xf86OutputOptions[] = {
     {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
 };
 
+enum {
+    OPTION_MODEDEBUG,
+};
+
+static OptionInfoRec xf86DeviceOptions[] = {
+    {OPTION_MODEDEBUG,	    "ModeDebug",	OPTV_STRING,  {0}, FALSE },
+    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+};
+
 static void
 xf86OutputSetMonitor (xf86OutputPtr output)
 {
@@ -481,7 +492,7 @@ xf86OutputInitialRotation (xf86OutputPtr output)
     return RR_Rotate_0;
 }
 
-xf86OutputPtr
+_X_EXPORT xf86OutputPtr
 xf86OutputCreate (ScrnInfoPtr		    scrn,
 		  const xf86OutputFuncsRec  *funcs,
 		  const char		    *name)
@@ -541,7 +552,7 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
     return output;
 }
 
-Bool
+_X_EXPORT Bool
 xf86OutputRename (xf86OutputPtr output, const char *name)
 {
     int	    len = strlen(name) + 1;
@@ -560,7 +571,7 @@ xf86OutputRename (xf86OutputPtr output, const char *name)
     return TRUE;
 }
 
-void
+_X_EXPORT void
 xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
 {
     if (use_screen_monitor != output->use_screen_monitor)
@@ -570,7 +581,7 @@ xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
     }
 }
 
-void
+_X_EXPORT void
 xf86OutputDestroy (xf86OutputPtr output)
 {
     ScrnInfoPtr		scrn = output->scrn;
@@ -585,7 +596,7 @@ xf86OutputDestroy (xf86OutputPtr output)
 	{
 	    memmove (&xf86_config->output[o],
 		     &xf86_config->output[o+1],
-		     xf86_config->num_output - (o + 1));
+		     ((xf86_config->num_output - (o + 1)) * sizeof(void*)));
 	    xf86_config->num_output--;
 	    break;
 	}
@@ -646,7 +657,7 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
 /*
  * Called at ScreenInit time to set up
  */
-Bool
+_X_EXPORT Bool
 xf86CrtcScreenInit (ScreenPtr screen)
 {
     ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
@@ -667,7 +678,8 @@ xf86CrtcScreenInit (ScreenPtr screen)
     }
     if (c == config->num_crtc)
 	xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 |
-				 RR_Rotate_180 | RR_Rotate_270);
+				 RR_Rotate_180 | RR_Rotate_270 |
+				 RR_Reflect_X | RR_Reflect_Y);
     else
 	xf86RandR12SetRotations (screen, RR_Rotate_0);
     
@@ -1202,16 +1214,21 @@ xf86SortModes (DisplayModePtr input)
     return output;
 }
 
-#define DEBUG_REPROBE 1
-
-void
+_X_EXPORT void
 xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 {
     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
     int			o;
 
-    if (maxX == 0 || maxY == 0)
-	xf86RandR12GetOriginalVirtualSize (scrn, &maxX, &maxY);
+    /* When canGrow was TRUE in the initial configuration we have to
+     * compare against the maximum values so that we don't drop modes.
+     * When canGrow was FALSE, the maximum values would have been clamped
+     * anyway.
+     */
+    if (maxX == 0 || maxY == 0) {
+	maxX = config->maxWidth;
+	maxY = config->maxHeight;
+    }
 
[...3327 lines suppressed...]
-	    if (rotation == RR_Rotate_90 || rotation == RR_Rotate_270)
+	    if ((rotation & 0xf) == RR_Rotate_90 || (rotation & 0xf) == RR_Rotate_270)
 	    {
 		source_width = mode->mode.height;
 		source_height = mode->mode.width;
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 6b61b9c..5525427 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -22,6 +22,9 @@
 
 #include "randrstr.h"
 
+#define SERVER_RANDR_MAJOR	1
+#define SERVER_RANDR_MINOR	2
+
 Bool
 RRClientKnowsRates (ClientPtr	pClient)
 {
@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
      * Report the current version; the current
      * spec says they're all compatible after 1.0
      */
-    rep.majorVersion = RANDR_MAJOR;
-    rep.minorVersion = RANDR_MINOR;
+    rep.majorVersion = SERVER_RANDR_MAJOR;
+    rep.minorVersion = SERVER_RANDR_MINOR;
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
     	swapl(&rep.length, n);
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 5ef1a6b..7e77d39 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,17 +98,18 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
 	if (!output)
 	    return;
 	RROutputSetCrtcs (output, &crtc, 1);
-	RROutputSetCrtc (output, crtc);
 	RROutputSetConnection (output, RR_Connected);
 #ifdef RENDER
 	RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
 #endif
     }
 
-    output = RRFirstOutput (pScreen);
+    output = pScrPriv->outputs[0];
     if (!output)
 	return;
-    crtc = output->crtc;
+    crtc = pScrPriv->crtcs[0];
+    if (!crtc)
+	return;
 
     /* check rotations */
     if (rotations != crtc->rotations)
@@ -168,7 +169,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
 
     /* notice current mode */
     if (newMode)
-	RRCrtcNotify (output->crtc, newMode, 0, 0, pScrPriv->rotation,
+	RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,
 		      1, &output);
 }
 #endif
diff --git a/randr/rroutput.c b/randr/rroutput.c
index c773279..a67e493 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -249,6 +249,7 @@ RROutputDeleteUserMode (RROutputPtr output,
 
     memmove (output->userModes + m, output->userModes + m + 1,
 	     (output->numUserModes - m - 1) * sizeof (RRModePtr));
+    output->numUserModes--;
     RRModeDestroy (mode);
     return Success;
 }
@@ -286,15 +287,6 @@ RROutputSetCrtcs (RROutputPtr	output,
     return TRUE;
 }
 
-void
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc)
-{
-    if (output->crtc == crtc)
-	return;
-    output->crtc = crtc;
-    RROutputChanged (output, FALSE);
-}
-
 Bool
 RROutputSetConnection (RROutputPtr  output,
 		       CARD8	    connection)
@@ -438,7 +430,7 @@ RROutputInit (void)
 int
 ProcRRGetOutputInfo (ClientPtr client)
 {
-    REQUEST(xRRGetOutputInfoReq);;
+    REQUEST(xRRGetOutputInfoReq);
     xRRGetOutputInfoReply	rep;
     RROutputPtr			output;
     CARD8			*extra;
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index 802dcb2..c88a0f8 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -103,7 +103,7 @@ void
 RRPointerMoved (ScreenPtr pScreen, int x, int y)
 {
     rrScrPriv (pScreen);
-    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;;
+    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;
     int	c;
 
     /* Check last known CRTC */
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index f2981b0..8798b42 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
 
     se.sequenceNumber = client->sequence;
     se.sizeID = RR10CurrentSizeID (pScreen);
-    
-    se.widthInPixels = pScreen->width;
-    se.heightInPixels = pScreen->height;
-    se.widthInMillimeters = pScreen->mmWidth;
-    se.heightInMillimeters = pScreen->mmHeight;
+
+    if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+	se.widthInPixels = pScreen->height;
+	se.heightInPixels = pScreen->width;
+	se.widthInMillimeters = pScreen->mmHeight;
+	se.heightInMillimeters = pScreen->mmWidth;
+    } else {
+	se.widthInPixels = pScreen->width;
+	se.heightInPixels = pScreen->height;
+	se.widthInMillimeters = pScreen->mmWidth;
+	se.heightInMillimeters = pScreen->mmHeight;
+    }
+
     WriteEventsToClient (client, 1, (xEvent *) &se);
 }
 
@@ -738,6 +738,7 @@ ProcRRSetScreenConfig (ClientPtr client)
     int			    rate;
     Bool		    has_rate;
     RROutputPtr		    output;
+    RRCrtcPtr		    crtc;
     RRModePtr		    mode;
     RR10DataPtr		    pData = NULL;
     RRScreenSizePtr    	    pSize;
@@ -782,7 +784,9 @@ ProcRRSetScreenConfig (ClientPtr client)
 	rep.status = RRSetConfigFailed;
 	goto sendReply;
     }
-    
+
+    crtc = output->crtc;
+
     /*
      * if the client's config timestamp is not the same as the last config
      * timestamp, then the config information isn't up-to-date and
@@ -830,7 +834,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	return BadValue;
     }
 
-    if ((~output->crtc->rotations) & rotation)
+    if ((~crtc->rotations) & rotation)
     {
 	/*
 	 * requested rotation or reflection not supported by screen
@@ -913,7 +917,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	}
     }
 
-    if (!RRCrtcSet (output->crtc, mode, 0, 0, stuff->rotation, 1, &output))
+    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
 	rep.status = RRSetConfigFailed;
     else
 	rep.status = RRSetConfigSuccess;
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 63a34b5..2a57e4e 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -425,6 +428,14 @@ RRXineramaExtensionInit(void)
 	return;
 #endif
 
+    /*
+     * Xinerama isn't capable enough to have multiple protocol screens each
+     * with their own output geometry.  So if there's more than one protocol
+     * screen, just don't even try.
+     */
+    if (screenInfo.numScreens > 1)
+	return;
+
     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
 			ProcRRXineramaDispatch,
 			SProcRRXineramaDispatch,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- xorg-x11-server.spec	17 Sep 2007 21:47:33 -0000	1.250
+++ xorg-x11-server.spec	26 Sep 2007 07:33:55 -0000	1.251
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   24%{?dist}
+Release:   25%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -52,24 +52,22 @@
 Patch1006:  xorg-x11-server-1.1.1-no-scanpci.patch
 Patch1007:  xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
 Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
-Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 Patch1011:  xserver-1.3.0-composite-version.patch
 Patch1012:  xserver-1.3.0-mesa7.patch
 Patch1013:  xserver-1.3.0-exaupgrade.patch
 Patch1014:  xserver-1.3.0-newglx-offscreen-pixmaps.patch
+Patch1015:  xserver-1.3.0-randr-updates.patch
 Patch1022:  xserver-1.3.0-default-dpi.patch
 
 Patch2001:  xserver-1.2.0-geode-mmx.patch
 Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
 Patch2003:  xserver-1.2.0-vfprintf.patch
-Patch2004:  xserver-1.2.0-honor-displaysize.patch
-Patch2006:  xserver-1.3.0-less-randr-fakerama.patch
+Patch2004:  xserver-1.3.0-honor-displaysize.patch
 Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2008:  xserver-1.3.0-randrama-no-zero-screens.patch
 Patch2009:  xserver-1.3.0-arm-iopl.patch
 Patch2010:  xserver-1.3.0-idletime.patch
-Patch2011:  xserver-1.3.0-edid-quirk-backports.patch
 Patch2012:  xserver-1.3.0-add-really-slow-bcopy.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
 
@@ -313,24 +311,22 @@
 %patch1006 -p1 -b .no-scanpci
 %patch1007 -p1 -b .xf1bpp
 %patch1008 -p1 -b .comment-less
-%patch1009 -p1 -b .maxpixclock
 %patch1010 -p1 -b .prerelease-warning
 %patch1011 -p1 -b .composite-version
 %patch1012 -p1 -b .newmesa
 %patch1013 -p1 -b .newexa
 %patch1014 -p1 -b .offscreen-pixmaps
+%patch1015 -p1 -b .randr-update
 %patch1022 -p1 -b .dpi
 
 %patch2001 -p1 -b .geode-mmx
 %patch2002 -p1 -b .xephyr-keysym
 %patch2003 -p1 -b .vfprintf
 %patch2004 -p1 -b .displaysize
-%patch2006 -p1 -b .fakerama
 %patch2007 -p1 -b .randrconfig
 %patch2008 -p1 -b .randrama-zero-screens
 %patch2009 -p1 -b .arm
 %patch2010 -p1 -b .idletime
-%patch2011 -p1 -b .edid-quirks
 %patch2012 -p1 -b .slow-bcopy
 %patch2013 -p1 -b .fontpath-doc
 
@@ -608,6 +604,17 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
+- xserver-1.3.0-randr-updates.patch: Backport randr from server git
+  This contains a lot of fixes since 1.3.0 went out, and saves
+  us backporting each fix individually
+- xserver-1.3.0-less-randr-fakerama.patch - dropped
+- xorg-x11-server-1.2.0-maxpixclock-option.patch - dropped
+- xserver-1.3.0-edid-quirk-backports.patch - dropped
+- xserver-1.2.0-honor-displaysize.patch - dropped
+- xserver-1.3.0-honor-displaysize.patch - reapply to new code layout
+- xserver-1.3.0-randr12-config-hack.patch - rebased
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
 - xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
   to match current git.

xserver-1.3.0-randr12-config-hack.patch:

Index: xserver-1.3.0-randr12-config-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-randr12-config-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-randr12-config-hack.patch	7 May 2007 18:18:16 -0000	1.1
+++ xserver-1.3.0-randr12-config-hack.patch	26 Sep 2007 07:33:55 -0000	1.2
@@ -1,6 +1,7 @@
---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx	2007-04-16 12:53:50.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c	2007-05-02 14:03:28.000000000 -0400
-@@ -1202,6 +1202,23 @@
+diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da	2007-09-26 17:12:44.000000000 +1000
++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c	2007-09-26 17:14:44.000000000 +1000
+@@ -1214,6 +1214,23 @@ xf86SortModes (DisplayModePtr input)
      return output;
  }
  
@@ -21,10 +22,10 @@
 +    return preferred_mode;
 +}
 +
- #define DEBUG_REPROBE 1
- 
- void
-@@ -1377,8 +1394,7 @@
+ _X_EXPORT void
+ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ {
+@@ -1395,8 +1412,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, 
  	output->probed_modes = xf86SortModes (output->probed_modes);
  	
  	/* Check for a configured preference for a particular mode */


--- xorg-x11-server-1.2.0-maxpixclock-option.patch DELETED ---


--- xserver-1.2.0-honor-displaysize.patch DELETED ---


--- xserver-1.3.0-edid-quirk-backports.patch DELETED ---


--- xserver-1.3.0-less-randr-fakerama.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 07:36:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 26 Sep 2007 03:36:00 -0400
Subject: rpms/cacti/devel cacti.spec,1.14,1.15
Message-ID: <200709260736.l8Q7a0Fm005347@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208

Modified Files:
	cacti.spec 
Log Message:
Rebuild for koji test


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cacti.spec	21 Sep 2007 14:57:08 -0000	1.14
+++ cacti.spec	26 Sep 2007 07:35:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -115,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Wed Sep 26 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-10
+- Rebuild for koji test
+
 * Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
 - Added rest of official patches
 



From fedora-extras-commits at redhat.com  Wed Sep 26 08:10:45 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 04:10:45 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.6-hwdevice.patch, NONE,
	1.1 system-config-soundcard.spec, 1.60, 1.61
Message-ID: <200709260810.l8Q8AjWk015887@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/system-config-soundcard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-hwdevice.patch 
Log Message:
fixed hardware device configuration

system-config-soundcard-2.0.6-hwdevice.patch:

--- NEW FILE system-config-soundcard-2.0.6-hwdevice.patch ---
diff -up system-config-soundcard-2.0.6/src/soundcardBackend.py.old system-config-soundcard-2.0.6/src/soundcardBackend.py
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.old	2007-09-26 09:56:42.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-09-26 10:00:44.000000000 +0200
@@ -219,8 +219,8 @@ class soundConfiguration:
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("pcm.!default { type plughw card %d device %d }\n" % (index, device))
-                lines.append("ctl.!default { type plughw card %d }\n" % index)
+                lines.append("pcm.!default { type plug slave {  pcm \"hw:%d,%d\" }}\n" % (index, device))
+                lines.append("ctl.!default { type hw card %d }\n" % index)
             else:
                 lines.append("#SWCONF\n")
                 lines.append("#DEV %d\n" % device)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-soundcard.spec	25 Sep 2007 15:20:15 -0000	1.60
+++ system-config-soundcard.spec	26 Sep 2007 08:10:13 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 9%{dist}
+Release: 10%{dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/soundcard
 License: GPL
 ExclusiveOS: Linux
@@ -15,6 +15,7 @@
 Patch3: system-config-soundcard-2.0.6-usb-hack.patch
 Patch4: system-config-soundcard-2.0.6-desktop.patch
 Patch5: system-config-soundcard-2.0.6-reset.patch
+Patch6: system-config-soundcard-2.0.6-hwdevice.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -42,7 +43,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1 -b .res
+%patch5 -p1
+%patch6 -p1 -b .hw
 
 %build
 make
@@ -92,6 +94,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Sep 26 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-10
+- fixed hardware device configuration
+
 * Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
 - fixed #291691 - Sound card not working gives a window with 
   invalid instructions on first boot



From fedora-extras-commits at redhat.com  Wed Sep 26 08:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 26 Sep 2007 04:26:02 -0400
Subject: rpms/xchat/devel xc284-improvescrollback.diff, NONE, 1.1 xchat.spec,
	1.78, 1.79
Message-ID: <200709260826.l8Q8Q2mf016456@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16428/devel

Modified Files:
	xchat.spec 
Added Files:
	xc284-improvescrollback.diff 
Log Message:
apply xc284-improvescrollback.diff from upstream

xc284-improvescrollback.diff:

--- NEW FILE xc284-improvescrollback.diff ---
#
# 1) Stops scrollback files growing too large by fixing the file-shrink code.
# 2) Puts a "Display scrollback from previous session" into the Setup GUI
#    (logging section) so people can turn this off without typing commands.
#
--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
+++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
@@ -285,6 +285,8 @@
 		}
 	}
 
+	sess->scrollwritten = lines;
+
 	if (lines)
 	{
 		text = ctime (&stamp);
--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
+++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
@@ -382,7 +382,8 @@
 static const setting logging_settings[] =
 {
 	{ST_HEADER,	N_("Logging"),0,0,0},
-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
+	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xchat.spec	23 Aug 2007 15:21:43 -0000	1.78
+++ xchat.spec	26 Sep 2007 08:25:28 -0000	1.79
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   4%{?dist}.1
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@
 # Patches 0-9 reserved for official xchat.org patches
 # Fix creation of ~/.xchat2/scrollback/ paths.
 Patch0: xc284-scrollbmkdir.diff
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+Patch1: xc284-improvescrollback.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -62,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,6 +162,9 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> - 1:2.8.4-4.fc8.1
 - F-8 rebuild (BuildID)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 08:29:46 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 26 Sep 2007 04:29:46 -0400
Subject: rpms/xchat/F-7 xc284-improvescrollback.diff, NONE, 1.1 xchat.spec, 
	1.73, 1.74
Message-ID: <200709260829.l8Q8Tkom016652@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16534/F-7

Modified Files:
	xchat.spec 
Added Files:
	xc284-improvescrollback.diff 
Log Message:
Sync from devel:
- add missing BR perl(ExtUtils::Embed)
- apply xc284-improvescrollback.diff from upstream

xc284-improvescrollback.diff:

--- NEW FILE xc284-improvescrollback.diff ---
#
# 1) Stops scrollback files growing too large by fixing the file-shrink code.
# 2) Puts a "Display scrollback from previous session" into the Setup GUI
#    (logging section) so people can turn this off without typing commands.
#
--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
+++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
@@ -285,6 +285,8 @@
 		}
 	}
 
+	sess->scrollwritten = lines;
+
 	if (lines)
 	{
 		text = ctime (&stamp);
--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
+++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
@@ -382,7 +382,8 @@
 static const setting logging_settings[] =
 {
 	{ST_HEADER,	N_("Logging"),0,0,0},
-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
+	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/xchat.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xchat.spec	3 Aug 2007 01:16:16 -0000	1.73
+++ xchat.spec	26 Sep 2007 08:29:12 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   3%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@
 # Patches 0-9 reserved for official xchat.org patches
 # Fix creation of ~/.xchat2/scrollback/ paths.
 Patch0: xc284-scrollbmkdir.diff
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+Patch1: xc284-improvescrollback.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -24,7 +28,7 @@
 # see #241923
 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 
-BuildRequires: perl python-devel openssl-devel pkgconfig, tcl-devel
+BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
@@ -62,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,8 +162,17 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
+* Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> - 1:2.8.4-4.fc8.1
+- F-8 rebuild (BuildID)
+
+* Sat Aug 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-4
+- add missing BR perl(ExtUtils::Embed)
+
 * Fri Aug  3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-3
-- Specify GPL version in License tag.
+- specify GPL version in License tag
 
 * Tue Jul 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-2
 - apply xc284-scrollbmkdir.diff from upstream



From fedora-extras-commits at redhat.com  Wed Sep 26 08:46:14 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Wed, 26 Sep 2007 04:46:14 -0400
Subject: rpms/ice/F-7 ice.spec,1.4,1.5
Message-ID: <200709260846.l8Q8kEec019730@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19436

Modified Files:
	ice.spec 
Log Message:
Move ant classes to a jar file
Include patches from ZeroC



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ice.spec	7 Sep 2007 08:37:18 -0000	1.4
+++ ice.spec	26 Sep 2007 08:45:42 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -36,6 +36,9 @@
 Patch6:         Ice-3.2.0-dont-build-test.patch
 Patch7:         IceCS-3.2.1-dont-build-test.patch
 Patch8:         IceCS-3.2.1-use-gac.patch
+Patch9:         http://www.zeroc.com/forums/attachments/patches/527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt
+Patch10:        http://www.zeroc.com/forums/attachments/patches/530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt
+Patch11:        http://www.zeroc.com/forums/attachments/patches/531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -181,6 +184,9 @@
 %prep
 %setup -n Ice-%{version} -q
 %patch6 -p1
+%patch9 -p2
+%patch10 -p2
+%patch11 -p2
 
 # Fix some permission issues/
 chmod a-x config/*.py
@@ -231,6 +237,7 @@
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5/ant
 rm *.class
 javac -d . -source 1.4 -target 1.4 *.java
+jar cvf ant-ice-%{version}.jar *.class
 
 # Build the Java stuff
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5
@@ -373,8 +380,9 @@
 mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE
 
 # Copy the Ant task files into the right place
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
-cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
+cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ant-ice-%{version}.jar ${RPM_BUILD_ROOT}%{_javadir}
+ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -522,6 +530,8 @@
 %{_bindir}/slice2java
 %{_bindir}/slice2freezej
 %{_datadir}/Ice-%{version}/ant
+%{_javadir}/ant-ice-%{version}.jar
+%{_javadir}/ant-ice.jar
 
 %files csharp
 %defattr(-,root,root,-)
@@ -581,6 +591,10 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Wed Sep 26 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-12
+- Put the slice2java classes into a .jar file instead of as bare classes
+- Incorporate patches from ZeroC
+
 * Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
 - Fix bad date in changelog



From fedora-extras-commits at redhat.com  Wed Sep 26 08:51:29 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 26 Sep 2007 04:51:29 -0400
Subject: rpms/makehuman/devel makehuman.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709260851.l8Q8pTcj020095@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20049/devel

Modified Files:
	.cvsignore sources 
Added Files:
	makehuman.spec 
Log Message:
Initial import



--- NEW FILE makehuman.spec ---
Name:           makehuman
Version:        0.9
Release:        3%{?dist}
Summary:        Modeling of three-dimensional humanoid characters

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/makehuman-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mhgui-devel
BuildRequires:  desktop-file-utils


%description
MakeHuman(C) is an open-source, open graphics library, stand-alone,
multi-platform, software program, which is completely written in 
C++ language. Its purpose is to provide a versatile, professional
and extremely specialized application for parametrical modeling of
three-dimensional humanoid characters.


%prep
%setup -q
chmod 0644 src/*

sed -i.timestamp -e 's|cp -R|cp -pR|g' {data,pixmaps}/Makefile.{am,in}

%build
%configure --disable-static
sed -i -e 's|-L/usr/lib|-L%{_libdir}|' Makefile
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

# Symlink for pixmap
ln -s %{name}/ui/mybs.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=MakeHuman
Comment=Design characters
Comment[fr]=Mod??liser des personnages
Exec=makehuman
Terminal=false
Icon=makehuman
Type=Application
Categories=Graphics;
EOF

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora                    \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
  %{name}.desktop

# Remove zero-length files
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_tongue/tongue_camaleon.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_teeth/teeth_gengivite.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/l_ear2/l_ear_incisura_intertragica_down.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_abdomen/abdomen_twist.target

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README.txt TODO
%{_bindir}/makehuman
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/pixmaps/%{name}/
%{_datadir}/applications/*.desktop


%changelog
* Fri Sep 21 2007 kwizart < kwizart at gmail.com > - 0.9-3
- Add pixmap for .desktop
- Remove Category Application
- License is GPLv2+

* Thu Sep 20 2007 kwizart < kwizart at gmail.com > - 0.9-2
- Fix timestamp
- Drop update-desktop-database
- Remove zero-length files

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.9-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/makehuman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 23:14:09 -0000	1.1
+++ .cvsignore	26 Sep 2007 08:50:57 -0000	1.2
@@ -0,0 +1 @@
+makehuman-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/makehuman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 23:14:09 -0000	1.1
+++ sources	26 Sep 2007 08:50:57 -0000	1.2
@@ -0,0 +1 @@
+c544e01b253fe20916bbd632b3c47b35  makehuman-0.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 08:56:12 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Wed, 26 Sep 2007 04:56:12 -0400
Subject: rpms/libsvm/devel libsvm-2.84-6.patch, NONE, 1.1 libsvm.spec, 1.6, 
	1.7 libsvm-2.84-5.patch, 1.1, NONE
Message-ID: <200709260856.l8Q8uCrE020246@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20212/devel

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-6.patch 
Removed Files:
	libsvm-2.84-5.patch 
Log Message:
- Add defattr to each subpackage
- Move libsvm.so to libsvm


libsvm-2.84-6.patch:

--- NEW FILE libsvm-2.84-6.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-26 17:07:55.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,57 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	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
+#	cp -R java ${INSTDIR}/share/libsvm/src
+#	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsvm.spec	26 Sep 2007 03:06:45 -0000	1.6
+++ libsvm.spec	26 Sep 2007 08:55:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-5.patch
+Patch0:         libsvm-2.84-6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -79,6 +79,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,25 +92,34 @@
 %{_bindir}/svm-scale
 %{_bindir}/svm-train
 %{_datadir}/libsvm/examples
+%{_libdir}/libsvm/libsvm.so
+%{_libdir}/libsvm/libsvm.so.2.84
 
 %files devel
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/libsvm
 %{_includedir}/libsvm
 %{_datadir}/libsvm/src
 
 %files python
+%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
 %files java
+%defattr(-,root,root,-)
 %doc java/README-Java
 #%{_libdir}/java/libsvm/docs
 %{_libdir}/java/libsvm/libsvm.jar
 %{_libdir}/java/libsvm/test_applet.html
 
 %changelog
-* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+* Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
+- Add defattr to each subpackage
+- Move libsvm.so to libsvm
+
+* Thu Sep 24 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so
 


--- libsvm-2.84-5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 08:56:25 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Wed, 26 Sep 2007 04:56:25 -0400
Subject: rpms/ice/F-7 527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt, 
	NONE, 1.1
	530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt,
	NONE, 1.1
	531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt,
	NONE, 1.1
Message-ID: <200709260856.l8Q8uPDw020289@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20245

Added Files:
	527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt 
	530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt 
	531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt 
Log Message:
Added patch files directly; I guess you can't download them while building.



--- NEW FILE 527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt ---
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 78d234d..37b695e 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -2054,7 +2054,8 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << sb;
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                _out << nl << "this." << fixId((*q)->name()) << " = " << fixId((*q)->name()) << ';';
+                string name = fixId((*q)->name(), DotNet::ApplicationException, false);
+                _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';';
             }
             _out << eb;
         }


--- NEW FILE 530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt ---
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index c41aa5c..1368294 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1195,19 +1195,20 @@ ServiceHelper::ServiceHelper(const ServiceDescriptorPtr& descriptor) :
 }
 
 bool 
-ServiceHelper::operator==(const ServiceHelper& helper) const
+ServiceHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!CommunicatorHelper::operator==(helper))
+    const ServiceHelper* helper = dynamic_cast<const ServiceHelper*>(&h);
+    if(!helper || !CommunicatorHelper::operator==(h))
     {
         return false;
     }
 
-    if(_desc->name != helper._desc->name)
+    if(_desc->name != helper->_desc->name)
     {
         return false;
     }
 
-    if(_desc->entry != helper._desc->entry)
+    if(_desc->entry != helper->_desc->entry)
     {
         return false;
     }
@@ -1216,7 +1217,7 @@ ServiceHelper::operator==(const ServiceHelper& helper) const
 }
 
 bool
-ServiceHelper::operator!=(const ServiceHelper& helper) const
+ServiceHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
@@ -1272,66 +1273,67 @@ ServerHelper::ServerHelper(const ServerDescriptorPtr& descriptor) :
 }
 
 bool 
-ServerHelper::operator==(const ServerHelper& helper) const
+ServerHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!CommunicatorHelper::operator==(helper))
+    const ServerHelper* helper = dynamic_cast<const ServerHelper*>(&h);
+    if(!helper || !CommunicatorHelper::operator==(h))
     {
         return false;
     }
 
-    if(_desc->id != helper._desc->id)
+    if(_desc->id != helper->_desc->id)
     {
         return false;
     }
 
-    if(_desc->exe != helper._desc->exe)
+    if(_desc->exe != helper->_desc->exe)
     {
         return false;
     }
 
-    if(_desc->pwd != helper._desc->pwd)
+    if(_desc->pwd != helper->_desc->pwd)
     {
         return false;
     }
 
     if(set<string>(_desc->options.begin(), _desc->options.end()) != 
-       set<string>(helper._desc->options.begin(), helper._desc->options.end()))
+       set<string>(helper->_desc->options.begin(), helper->_desc->options.end()))
     {
         return false;
     }
 
     if(set<string>(_desc->envs.begin(), _desc->envs.end()) != 
-       set<string>(helper._desc->envs.begin(), helper._desc->envs.end()))
+       set<string>(helper->_desc->envs.begin(), helper->_desc->envs.end()))
     {
         return false;
     }
 
-    if(_desc->activation != helper._desc->activation)
+    if(_desc->activation != helper->_desc->activation)
     {
         return false;
     }
 
-    if(_desc->activationTimeout != helper._desc->activationTimeout)
+    if(_desc->activationTimeout != helper->_desc->activationTimeout)
     {
         return false;
     }
 
-    if(_desc->deactivationTimeout != helper._desc->deactivationTimeout)
+    if(_desc->deactivationTimeout != helper->_desc->deactivationTimeout)
     {
         return false;
     }
 
-    if(_desc->distrib != helper._desc->distrib)
+    if(_desc->distrib != helper->_desc->distrib)
     {
         return false;
     }
 
-    if(_desc->allocatable != helper._desc->allocatable)
+    if(_desc->allocatable != helper->_desc->allocatable)
     {
         return false;
     }
 
-    if(_desc->user != helper._desc->user)
+    if(_desc->user != helper->_desc->user)
     {
         return false;
     }
@@ -1340,7 +1342,7 @@ ServerHelper::operator==(const ServerHelper& helper) const
 }
 
 bool
-ServerHelper::operator!=(const ServerHelper& helper) const
+ServerHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
@@ -1483,14 +1485,15 @@ IceBoxHelper::IceBoxHelper(const IceBoxDescriptorPtr& descriptor) :
 }
 
 bool 
-IceBoxHelper::operator==(const IceBoxHelper& helper) const
+IceBoxHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!ServerHelper::operator==(helper))
+    const IceBoxHelper* helper = dynamic_cast<const IceBoxHelper*>(&h);
+    if(!helper || !ServerHelper::operator==(h))
     {
         return false;
     }
-        
-    if(_services != helper._services)
+
+    if(_services != helper->_services)
     {
         return false;
     }
@@ -1499,7 +1502,7 @@ IceBoxHelper::operator==(const IceBoxHelper& helper) const
 }
 
 bool
-IceBoxHelper::operator!=(const IceBoxHelper& helper) const
+IceBoxHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index e222940..f16d50a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -86,8 +86,8 @@ public:
     CommunicatorHelper() { }
     virtual ~CommunicatorHelper() { }
 
-    bool operator==(const CommunicatorHelper&) const;
-    bool operator!=(const CommunicatorHelper&) const;
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;
 
     virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
     virtual void getReplicaGroups(std::set<std::string>&) const;
@@ -115,8 +115,8 @@ public:
     ServiceHelper(const ServiceDescriptorPtr&);
     ServiceHelper() { }
 
-    bool operator==(const ServiceHelper&) const;
-    bool operator!=(const ServiceHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     ServiceDescriptorPtr getDescriptor() const;
     ServiceDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
@@ -141,8 +141,8 @@ public:
     ServerHelper(const ServerDescriptorPtr&);
     ServerHelper() { }
 
-    bool operator==(const ServerHelper&) const;
-    bool operator!=(const ServerHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     ServerDescriptorPtr getDescriptor() const;
     virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&,
@@ -203,8 +203,8 @@ public:
     IceBoxHelper(const IceBoxDescriptorPtr&);
     IceBoxHelper() { }
 
-    bool operator==(const IceBoxHelper&) const;
-    bool operator!=(const IceBoxHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
                                             const PropertySetDescriptorDict&) const;
@@ -267,8 +267,8 @@ public:
     NodeHelper(const std::string&, const NodeDescriptor&, const Resolver&, bool);
     virtual ~NodeHelper() { }
 
-    bool operator==(const NodeHelper&) const;
-    bool operator!=(const NodeHelper&) const;
+    virtual bool operator==(const NodeHelper&) const;
+    virtual bool operator!=(const NodeHelper&) const;
 
     NodeUpdateDescriptor diff(const NodeHelper&) const;
     NodeDescriptor update(const NodeUpdateDescriptor&, const Resolver&) const;


--- NEW FILE 531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt ---
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index 28c8b57..ca935b3 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -34,6 +34,7 @@ public:
 
 protected:
     static std::string fixId(const std::string&, int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
     static std::string typeToString(const TypePtr&);
     static bool isValueType(const TypePtr&);
 
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index 061033b..387de74 100755
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -130,6 +130,21 @@ Slice::CsGenerator::fixId(const string& name, int baseTypes, bool mangleCasts)
 }
 
 string
+Slice::CsGenerator::fixId(const ContainedPtr& cont, int baseTypes, bool mangleCasts)
+{
+    ContainerPtr container = cont->container();
+    ContainedPtr contained = ContainedPtr::dynamicCast(container);
+    if(contained && contained->hasMetaData("clr:property"))
+    {
+        return cont->name() + "_prop";
+    }
+    else
+    {
+        return fixId(cont->name(), baseTypes, mangleCasts);
+    }
+}
+
+string
 Slice::CsGenerator::typeToString(const TypePtr& type)
 {
     if(!type)
@@ -476,7 +491,10 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
         else
         {
             string typeS = typeToString(type);
-            out << nl << param << " = new " << typeS << "();";
+            if(param.size() < 6 || param.substr(param.size() - 5) != "_prop")
+            {
+                out << nl << param << " = new " << typeS << "();";
+            }
             if(streamingAPI)
             {
                 out << nl << param << ".ice_read(" << stream << ");";
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 5f83f8f..80c096b 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -728,8 +728,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     _out << nl << "os__.startWriteSlice();";
     for(d = members.begin(); d != members.end(); ++d)
     {
-        writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                  fixId((*d)->name(), DotNet::ICloneable, true),
+        writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                   true, false, false);
     }
     _out << nl << "os__.endWriteSlice();";
@@ -831,8 +830,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                 patchParams << ", " << classMemberCount++;
             }
         }
-        writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                  fixId((*d)->name(), DotNet::ICloneable, true),
+        writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                   false, false, false, patchParams.str());
     }
     _out << nl << "is__.endReadSlice();";
@@ -850,8 +848,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << nl << "outS__.startSlice();";
         for(d = members.begin(); d != members.end(); ++d)
         {
-            writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                      fixId((*d)->name(), DotNet::ICloneable, true),
+            writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                       true, true, false);
         }
         _out << nl << "outS__.endSlice();";
@@ -877,8 +874,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                      fixId((*d)->name(), DotNet::ICloneable, true),
+            writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                       false, true, false, patchParams.str());
         }
         _out << nl << "inS__.endSlice();";
@@ -2187,8 +2183,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         _out << nl << "os__.startWriteSlice();";
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), DotNet::ApplicationException),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, DotNet::ApplicationException),
                                       true, false, false);
         }
         _out << nl << "os__.endWriteSlice();";
@@ -2295,8 +2290,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), DotNet::ApplicationException),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                       false, false, false, patchParams.str());
         }
         _out << nl << "is__.endReadSlice();";
@@ -2314,8 +2308,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << nl << "outS__.startSlice();";
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), DotNet::ApplicationException),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                           true, true, false);
             }
             _out << nl << "outS__.endSlice();";
@@ -2345,8 +2338,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                         patchParams << ", " << classMemberCount++;
                     }
                 }
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), DotNet::ApplicationException),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                           false, true, false, patchParams.str());
             }
             _out << nl << "inS__.endSlice();";
@@ -2457,6 +2449,8 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         _out << eb;
     }
 
+    bool propertyMapping = p->hasMetaData("clr:property");
+
     _out << sp << nl << "public " << name << spar;
     vector<string> paramDecl;
     vector<string> paramNames;
@@ -2471,7 +2465,12 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     _out << sb;
     for(vector<string>::const_iterator i = paramNames.begin(); i != paramNames.end(); ++i)
     {
-        _out << nl << "this." << *i << " = " << *i << ';';
+        _out << nl << "this." << *i;
+        if(propertyMapping)
+        {
+            _out << "_prop";
+        }
+        _out << " = " << *i << ';';
     }
     _out << eb;
 
@@ -2595,8 +2594,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         _out << sb;
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), isClass ? DotNet::ICloneable : 0),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0),
                                       true, false, false);
         }
         _out << eb;
@@ -2688,8 +2686,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), isClass ? DotNet::ICloneable : 0 ),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0 ),
                                       false, false, false, patchParams.str());
         }
         _out << eb;
@@ -2700,8 +2697,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             _out << sb;
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), isClass ? DotNet::ICloneable : 0),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0),
                                           true, true, false);
             }
             _out << eb;
@@ -2721,8 +2717,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                         patchParams << ", " << classMemberCount++;
                     }
                 }
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), isClass ? DotNet::ICloneable : 0 ),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0 ),
                                           false, true, false, patchParams.str());
             }
             _out << eb;



From fedora-extras-commits at redhat.com  Wed Sep 26 09:23:51 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 05:23:51 -0400
Subject: rpms/tinyerp/devel tinyerp.desktop,1.4,1.5 tinyerp.spec,1.27,1.28
Message-ID: <200709260923.l8Q9Np5V027327@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27307

Modified Files:
	tinyerp.desktop tinyerp.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
- update the desktop file to the current standards



Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.desktop	24 Jul 2006 16:49:01 -0000	1.4
+++ tinyerp.desktop	26 Sep 2007 09:23:18 -0000	1.5
@@ -8,6 +8,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Office;X-Fedora;
-Version=3.0.1
-X-Desktop-File-Install-Version=0.4
+Categories=Office;Finance;
+Version=1.0


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tinyerp.spec	10 Aug 2007 18:20:40 -0000	1.27
+++ tinyerp.spec	26 Sep 2007 09:23:18 -0000	1.28
@@ -21,7 +21,7 @@
 
 Name:		tinyerp
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -171,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
+- update the desktop file to the current standards
+- update the license tag
+
 * Thu Mar 29 2007 Dan Horak <dan[at]danny.cz> 4.0.3-1
 - update to upstream version 4.0.3
 



From fedora-extras-commits at redhat.com  Wed Sep 26 09:26:08 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 05:26:08 -0400
Subject: rpms/tinyerp/F-7 tinyerp.desktop,1.4,1.5 tinyerp.spec,1.27,1.28
Message-ID: <200709260926.l8Q9Q8sR027524@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27381

Modified Files:
	tinyerp.desktop tinyerp.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
- update the desktop file to the current standards



Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-7/tinyerp.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.desktop	24 Jul 2006 16:49:01 -0000	1.4
+++ tinyerp.desktop	26 Sep 2007 09:25:35 -0000	1.5
@@ -8,6 +8,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Office;X-Fedora;
-Version=3.0.1
-X-Desktop-File-Install-Version=0.4
+Categories=Office;Finance;
+Version=1.0


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-7/tinyerp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tinyerp.spec	10 Aug 2007 18:20:32 -0000	1.27
+++ tinyerp.spec	26 Sep 2007 09:25:35 -0000	1.28
@@ -21,7 +21,7 @@
 
 Name:		tinyerp
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -171,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
+- update the desktop file to the current standards
+- update the license tag
+
 * Thu Mar 29 2007 Dan Horak <dan[at]danny.cz> 4.0.3-1
 - update to upstream version 4.0.3
 



From fedora-extras-commits at redhat.com  Wed Sep 26 09:49:49 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 26 Sep 2007 05:49:49 -0400
Subject: rpms/a2ps/devel a2ps-perl.patch,NONE,1.1 a2ps.spec,1.77,1.78
Message-ID: <200709260949.l8Q9nnui028124@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28101

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-perl.patch 
Log Message:
* Wed Sep 26 2007 Tim Waugh <twaugh at redhat.com> 4.13b-69
- Try out a perl stylesheet speed improvement (bug #252183).


a2ps-perl.patch:

--- NEW FILE a2ps-perl.patch ---
diff -up a2ps-4.13/sheets/perl.ssh.perl a2ps-4.13/sheets/perl.ssh
--- a2ps-4.13/sheets/perl.ssh.perl	2007-09-26 10:30:43.000000000 +0100
+++ a2ps-4.13/sheets/perl.ssh	2007-09-26 10:47:47.000000000 +0100
@@ -106,9 +106,9 @@ operators are
     (/(s|tr)/			# 1. The command: `tr' or `s'
      /(([[:punct:]])/		# 2. The delimiter
      /(/			# 3. The *two* regexps
-     /(.|\\\\.)*/		#   First regexp
+     /(\\\\.)*/			#   First regexp
      /\\3/			#   Separator
-     /(.|\\\\.)*/		#   Second Regexp
+     /(\\\\.)*/			#   Second Regexp
      /)/			#
      /\\3)/			# Closer
      \1 Keyword_strong, \2 Plain),


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- a2ps.spec	25 Sep 2007 17:12:06 -0000	1.77
+++ a2ps.spec	26 Sep 2007 09:49:17 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.13b
-Release: 68%{?dist}
+Release: 69%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 #Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -22,6 +22,7 @@
 Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
 Patch8: a2ps-iso5-minus.patch
+Patch9: a2ps-perl.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -85,6 +86,7 @@
 %patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
 %patch8 -p1 -b .iso5-minus
+%patch9 -p1 -b .perl
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -267,6 +269,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Sep 26 2007 Tim Waugh <twaugh at redhat.com> 4.13b-69
+- Try out a perl stylesheet speed improvement (bug #252183).
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 4.13b-68
 - Make minus sign work in ISO-8859-5 (bug #252314).
 



From fedora-extras-commits at redhat.com  Wed Sep 26 11:18:51 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 26 Sep 2007 07:18:51 -0400
Subject: rpms/texinfo/F-7 texinfo-4.11-zlib.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 sources, 1.10, 1.11 texinfo.spec, 1.41,
	1.42 texinfo-4.8-0xA0.patch, 1.1,
	NONE texinfo-4.8-texindex.patch, 1.1,
	NONE texinfo-4.8-zlib.patch, 1.1, NONE
Message-ID: <200709261118.l8QBIprr010487@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10459

Modified Files:
	.cvsignore sources texinfo.spec 
Added Files:
	texinfo-4.11-zlib.patch 
Removed Files:
	texinfo-4.8-0xA0.patch texinfo-4.8-texindex.patch 
	texinfo-4.8-zlib.patch 
Log Message:
Rebase to upstream texinfo-4.11, Fix license

texinfo-4.11-zlib.patch:

--- NEW FILE texinfo-4.11-zlib.patch ---
--- texinfo-4.11/util/Makefile.in_old	2007-09-10 02:37:45.000000000 +0200
+++ texinfo-4.11/util/Makefile.in	2007-09-19 10:29:06.000000000 +0200
@@ -110,7 +110,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
 am__DEPENDENCIES_1 =
 ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
 	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
--- texinfo-4.11/util/install-info.c_old	2007-07-01 23:20:33.000000000 +0200
+++ texinfo-4.11/util/install-info.c	2007-09-19 10:40:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "system.h"
 #include <getopt.h>
 #include <regex.h>
+#include <zlib.h>
 
 static char *progname = "install-info";
 
@@ -559,7 +560,7 @@
    COMPRESSION_PROGRAM.  The compression program is determined by the
    magic number, not the filename.  */
 
-FILE *
+void *
 open_possibly_compressed_file (char *filename,
     void (*create_callback) (char *),
     char **opened_filename, char **compression_program, int *is_pipe) 
@@ -567,7 +568,7 @@
   char *local_opened_filename, *local_compression_program;
   int nread;
   char data[4];
-  FILE *f;
+  gzFile *f;
 
   /* We let them pass NULL if they don't want this info, but it's easier
      to always determine it.  */
@@ -575,16 +576,16 @@
     opened_filename = &local_opened_filename;
 
   *opened_filename = filename;
-  f = fopen (*opened_filename, FOPEN_RBIN);
+  f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       *opened_filename = concat (filename, ".gz", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       free (*opened_filename);
       *opened_filename = concat (filename, ".bz2", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
     }
 
 #ifdef __MSDOS__
@@ -592,13 +593,13 @@
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".igz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
       if (!f)
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".inz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
 #endif
       if (!f)
@@ -610,7 +611,7 @@
               /* And try opening it again.  */
               free (*opened_filename);
               *opened_filename = filename;
-              f = fopen (*opened_filename, FOPEN_RBIN);
+              f = gzopen (*opened_filename, FOPEN_RBIN);
               if (!f)
                 pfatal_with_name (filename);
             }
@@ -621,12 +622,12 @@
 
   /* Read first few bytes of file rather than relying on the filename.
      If the file is shorter than this it can't be usable anyway.  */
-  nread = fread (data, sizeof (data), 1, f);
-  if (nread != 1)
+  nread = gzread (f, data, sizeof (data));
+  if (nread != sizeof (data))
     {
       /* Empty files don't set errno, so we get something like
          "install-info: No error for foo", which is confusing.  */
-      if (nread == 0)
+      if (nread >= 0)
         fatal (_("%s: empty file"), *opened_filename, 0);
       pfatal_with_name (*opened_filename);
     }
@@ -659,20 +660,22 @@
 
   if (*compression_program)
     { /* It's compressed, so fclose the file and then open a pipe.  */
+      FILE *p;
       char *command = concat (*compression_program," -cd <", *opened_filename);
-      if (fclose (f) < 0)
+      if (gzclose (f) < 0)
         pfatal_with_name (*opened_filename);
-      f = popen (command, "r");
-      if (f)
+      p = popen (command, "r");
+      if (p)
         *is_pipe = 1;
       else
         pfatal_with_name (command);
+      return p;
     }
   else
     { /* It's a plain file, seek back over the magic bytes.  */
-      if (fseek (f, 0, 0) < 0)
+      if (gzseek (f, 0, SEEK_SET) < 0)
         pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
       /* Since this is a text file, and we opened it in binary mode,
          switch back to text mode.  */
       f = freopen (*opened_filename, "r", f);
@@ -697,7 +700,7 @@
     char **compression_program)
 {
   char *real_name;
-  FILE *f;
+  void *f;
   int pipe_p;
   int filled = 0;
   int data_size = 8192;
@@ -711,7 +714,12 @@
 
   for (;;)
     {
-      int nread = fread (data + filled, 1, data_size - filled, f);
+      int nread;
+      
+      if (pipe_p)
+       nread = fread (data + filled, 1, data_size - filled, f);
+      else
+       nread = gzread (f, data + filled, data_size - filled);
       if (nread < 0)
         pfatal_with_name (real_name);
       if (nread == 0)
@@ -733,7 +741,7 @@
   if (pipe_p)
     pclose (f);
   else
-    fclose (f);
+    gzclose (f);
 
   *sizep = filled;
   return data;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Feb 2005 17:09:24 -0000	1.10
+++ .cvsignore	26 Sep 2007 11:18:18 -0000	1.11
@@ -1,2 +1,3 @@
 texinfo-4.7.tar.bz2
 texinfo-4.8.tar.bz2
+texinfo-4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2005 17:09:24 -0000	1.10
+++ sources	26 Sep 2007 11:18:18 -0000	1.11
@@ -1 +1 @@
-6ba369bbfe4afaa56122e65b3ee3a68c  texinfo-4.8.tar.bz2
+c6bf13df4fbeff8ce874aacd6a51e814  texinfo-4.11.tar.bz2


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/texinfo.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- texinfo.spec	4 Dec 2006 21:42:24 -0000	1.41
+++ texinfo.spec	26 Sep 2007 11:18:18 -0000	1.42
@@ -1,16 +1,14 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 4.8
-Release: 15
-License: GPL
+Version: 4.11
+Release: 1
+License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
 Source1: info-dir
 Source2: texi2pdf.man
-Patch0: texinfo-4.8-zlib.patch
-Patch1: texinfo-4.8-texindex.patch
-Patch2: texinfo-4.8-0xA0.patch
+Patch0: texinfo-4.11-zlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -61,8 +59,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .zlib
-%patch1 -p1 -b .texindex
-%patch2 -p1 -b .0xA0
 
 %build
 
@@ -135,11 +131,18 @@
 %{_bindir}/texindex
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
+%{_bindir}/pdftexi2dvi
 %{_mandir}/man1/texindex.1*
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Wed Sep 26 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
+- Rebase to upstream texinfo-4.11 (update zlib.patch, drop
+  texindex.patch and 0xA0.patch -- both included in upstream)
+- Fix license
+  Resolves: #304531
+
 * Mon Dec  4 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-15
 - Don't replace 0xA0 by a space in makeinfo
   Related: #208511


--- texinfo-4.8-0xA0.patch DELETED ---


--- texinfo-4.8-texindex.patch DELETED ---


--- texinfo-4.8-zlib.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 11:21:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 26 Sep 2007 07:21:05 -0400
Subject: rpms/texinfo/F-7 texinfo.spec,1.42,1.43
Message-ID: <200709261121.l8QBL5gS010726@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10690

Modified Files:
	texinfo.spec 
Log Message:
add dist


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/texinfo.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- texinfo.spec	26 Sep 2007 11:18:18 -0000	1.42
+++ texinfo.spec	26 Sep 2007 11:20:33 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.11
-Release: 1
+Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/



From fedora-extras-commits at redhat.com  Wed Sep 26 11:38:36 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 26 Sep 2007 07:38:36 -0400
Subject: rpms/tzdata/devel .cvsignore,1.37,1.38 sources,1.39,1.40
Message-ID: <200709261138.l8QBcaJa011350@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11316

Modified Files:
	.cvsignore sources 
Log Message:
Add javazic source.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Aug 2007 16:06:54 -0000	1.37
+++ .cvsignore	26 Sep 2007 11:38:04 -0000	1.38
@@ -1,3 +1,4 @@
-tzcode2007g.tar.gz
 tzdata2007g.tar.gz
+tzcode2007g.tar.gz
 tzdata-base-0.tar.bz2
+javazic.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	22 Aug 2007 16:06:54 -0000	1.39
+++ sources	26 Sep 2007 11:38:04 -0000	1.40
@@ -1,3 +1,4 @@
-a5da1f7650c541fa61f9ddd0c10b5332  tzcode2007g.tar.gz
 04152531a69c07b6cb08bacfd425aae1  tzdata2007g.tar.gz
+a5da1f7650c541fa61f9ddd0c10b5332  tzcode2007g.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2
+6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:10:31 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 08:10:31 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec, 1.36, 1.37 sources,
	1.8, 1.9
Message-ID: <200709261210.l8QCAVMF018285@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/fonts-japanese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18262

Modified Files:
	fonts-japanese.spec sources 
Log Message:
* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
- clean up the spec file.


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fonts-japanese.spec	31 Aug 2007 01:37:15 -0000	1.36
+++ fonts-japanese.spec	26 Sep 2007 12:09:58 -0000	1.37
@@ -16,8 +16,8 @@
 
 Name:           fonts-japanese
 Version:        0.20061016
-Release:        11%{?dist}
-License:        Public Domain and GPL+ and BSD and mplus
+Release:        12%{?dist}
+License:        Public Domain and BSD and mplus
 Group:          User Interface/X
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,13 +30,7 @@
 ## files in jisksp14
 ### Licensed under Public Domain
 Source10:       jisksp14.bdf.gz
-## files in jisksp16-1990
-### Licensed under Public Domain
-Source20:       jisksp16-1990.bdf.gz
-## files in kappa20
-## files in knm_new
-### Licensed under GPL+
-Source40:       http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
+## files in kaname
 ### Licensed under Public Domain
 Source41:       ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz
 ## files in fonts-ja
@@ -96,8 +90,8 @@
 
 Summary:        Free Japanese Bitmap fonts
 
-Provides:	jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16
-Obsoletes:	jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16
+Provides:	jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16
+Obsoletes:	jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16
 Requires:       sazanami-fonts-gothic sazanami-fonts-mincho
 
 %description
@@ -106,14 +100,11 @@
 
 %prep
 #%%setup -q -T -c -a 5 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
-%setup -q -T -c -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
+%setup -q -T -c -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
 ## ttfonts-ja
 ## jisksp14
 gunzip -c %{SOURCE10} > jisksp14.bdf
-## jisksp16-1990
-gunzip -c %{SOURCE20} > jisksp16-1990.bdf
 ## kappa20
-## knm_new
 ## fonts-ja
 gunzip -c %{SOURCE55} > jiskan16-1990.bdf
 gunzip -c %{SOURCE56} > jiskano16-1997.bdf
@@ -132,10 +123,7 @@
 %build
 ## jisksp14
 bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz
-## jisksp16-1990
-bdftopcf jisksp16-1990.bdf | gzip -9 > jisksp16-1990.pcf.gz
 ## kappa20
-## knm_new
 ## fonts-ja
 pushd %{shinonome}-src
 %configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir}
@@ -303,10 +291,7 @@
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## jisksp14
-install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
-
-## jisksp16-1990
-install -m 0644 jisksp16-1990.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
 
 ## kappa20
 
@@ -319,13 +304,13 @@
 ### remove an unnecessary file
 rm -f fonts-ja/mplus_cursors.pcf.gz
 for i in fonts-ja/*.pcf.gz; do
-    install -m 0644 $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
+    install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
 done
 
 # for ghostscript
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # Create fonts.scale and fonts.dir
 /usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
@@ -334,7 +319,7 @@
 touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
 
-install -m 0644 fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
 
 # Install catalogue symlink
 install -d $RPM_BUILD_ROOT%{catalogue}
@@ -358,7 +343,7 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{basefontdir}
@@ -376,6 +361,10 @@
 %{catalogue}/*
 
 %changelog
+* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
+- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
+- clean up the spec file.
+
 * Fri Aug 31 2007 Akira TAGOH <tagoh at redhat.com>
 - Add jiskan24-2000-{1,2} and jiskan24-2003-1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Aug 2007 01:37:15 -0000	1.8
+++ sources	26 Sep 2007 12:09:58 -0000	1.9
@@ -3,10 +3,8 @@
 77d997789026b1829bb4a33f65a0ce78  jiskan16-1990.bdf.Z
 c9fd21064b4ad6f1af0bcdb40a4222ee  jiskano16-1997.bdf.Z
 e8a452c07cd5d1d31d3a6f32c2b74265  jisksp14.bdf.gz
-d0d24d605ee62833234b711d6766e16c  jisksp16-1990.bdf.gz
 c59fc33f4319a291c1f3f7d58d896b9c  k14-oldkanji.tar.gz
 e0a103ceeffe0aa1c5670458f47452b3  kaname_k12_bdf.tar.gz
-065920714d022cfd225feb6d80b03238  knm_new.tar.gz
 a412bc6920d29be2689b3c3192bcdbd2  marumoji.tgz
 38ce9221d128383a3f9f50eb641da424  shinonome-0.9.11-src.tar.bz2
 c6b7771e4f00e310fe807b3245fd316e  vine-fonttools-0.1.tgz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:49:00 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 08:49:00 -0400
Subject: rpms/pirut/devel .cvsignore, 1.70, 1.71 pirut.spec, 1.73,
	1.74 sources, 1.72, 1.73
Message-ID: <200709261249.l8QCn0PG021858@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/pirut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21829

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
- Fix hang with multiple searches (#296521)
- Catch a couple more error cases (#302161)
- Update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	18 Sep 2007 19:23:19 -0000	1.70
+++ .cvsignore	26 Sep 2007 12:48:26 -0000	1.71
@@ -1 +1 @@
-pirut-1.3.19.tar.gz
+pirut-1.3.20.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pirut.spec	18 Sep 2007 19:23:19 -0000	1.73
+++ pirut.spec	26 Sep 2007 12:48:26 -0000	1.74
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.19
+Version: 1.3.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -76,6 +76,11 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
+- Fix hang with multiple searches (#296521)
+- Catch a couple more error cases (#302161)
+- Update translations
+
 * Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
 - Make reboot vs warnings clearer (#292011)
 - Select on row activation in lists (#292261)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	18 Sep 2007 19:23:19 -0000	1.72
+++ sources	26 Sep 2007 12:48:26 -0000	1.73
@@ -1 +1 @@
-f2b2b5821814c6d78ce0ee92ccc5226e  pirut-1.3.19.tar.gz
+31650615efc0f30b05ad005fe7f7383a  pirut-1.3.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:50:13 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 08:50:13 -0400
Subject: rpms/pirut/F-7 pirut.spec,1.62,1.63 sources,1.60,1.61
Message-ID: <200709261250.l8QCoDIH021964@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/pirut/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21941

Modified Files:
	pirut.spec sources 
Log Message:
* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
- Fix hang with multiple searches (#296521)
- Catch a couple more error cases (#302161)
- Update translations



Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/F-7/pirut.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- pirut.spec	23 Jul 2007 14:46:14 -0000	1.62
+++ pirut.spec	26 Sep 2007 12:49:40 -0000	1.63
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.9
+Version: 1.3.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -10,7 +10,9 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pygtk2 >= 2.9.2
-Requires: pygtk2-libglade, yum >= 2.9.5, comps-extras, rhpl
+Requires: pygtk2-libglade, comps-extras, rhpl
+Requires: yum >= 3.2.5-2
+Requires: python-iniparse
 Requires: gnome-python2-gconf, notify-python
 Requires: usermode
 Requires: dbus-python
@@ -66,7 +68,6 @@
 %{_datadir}/pirut/ui/*.glade
 %dir %{_datadir}/pirut/pixmaps
 %{_datadir}/pirut/pixmaps/*.png
-%{_datadir}/pixmaps/*png
 
 %{_mandir}/man8/pirut.8*
 %{_mandir}/man8/pup.8*
@@ -75,6 +76,70 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
+- Fix hang with multiple searches (#296521)
+- Catch a couple more error cases (#302161)
+- Update translations
+
+* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
+- Make reboot vs warnings clearer (#292011)
+- Select on row activation in lists (#292261)
+- Don't show the (truncated) URL being downloaded (#292271)
+- Fix handling of already mounted volumes
+- Search improvements (skvidal)
+
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
+- Add multiple selection in package view (#266141)
+- Make things like rpmnew/rpmsave more obvious to the user rather 
+  than hidden (#229671)
+- Use yum's transaction callback mechanism
+- Show details on package list (#227362)
+- Follow icon naming standard (#208698)
+- Improve display of what's being downloaded with progress bar (#284301)
+- Fix applying updates from puplet (#268141)
+
+* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
+- Catch another downloading error (#270201)
+- Handle errors a little better in puplet
+- Fix repo refreshing after adding/removing repos
+
+* Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.16-1
+- another repo editor fix from Debarshi Ray
+- fix image display
+
+* Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.15-1
+- actually include repo editing bits in the tarball
+
+* Wed Aug 29 2007 Jeremy Katz <katzj at redhat.com> - 1.3.14-1
+- Improved and more complete repo editing code
+
+* Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 1.3.13-1
+- Add repo editing (some bits from Debarshi Ray)
+- Fix puplet traceback
+
+* Tue Aug 21 2007 Jeremy Katz <katzj at redhat.com> - 1.3.12-1
+- Fix a traceback (#252328)
+- Avoid tracebacks/segfaults with non-UTF8 encoded package strings (#240191)
+- Fix more progress bar updating
+
+* Tue Aug 14 2007 Jeremy Katz <katzj at redhat.com> - 1.3.11-1
+- Translation infrastructure updates (#217153)
+- Allow retrying if the yum lock is held (#228942)
+- Fix a potential traceback case (#242820)
+- Catch another error on repo refresh (#245209)
+- Fix error display
+- Add support for cancelling during downloads (#247344)
+- Fix progress bar updating again
+- Ensure we're passing unicode (#240191)
+
+* Fri Aug 10 2007 Jeremy Katz <katzj at redhat.com> - 1.3.10-1
+- Fix error display (#249369)
+- Don't traceback on %%pretrans breaking assumptions about how the rpm 
+  callback works 
+- Give a nice message when not running as root (#250728)
+- Don't unlock unless we had the lock to begin with (#251651)
+- Show translated summary + description if available (#251662)
+
 * Thu Jul 19 2007 Jeremy Katz <katzj at redhat.com> - 1.3.9-1
 - Fix cd installer (#242857)
 - Drop legacy symlink (#238118)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/F-7/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	23 Jul 2007 14:46:14 -0000	1.60
+++ sources	26 Sep 2007 12:49:40 -0000	1.61
@@ -1 +1 @@
-2a47de72e0caf598e55fe0dea8600f8c  pirut-1.3.9.tar.gz
+31650615efc0f30b05ad005fe7f7383a  pirut-1.3.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:53:28 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 08:53:28 -0400
Subject: rpms/eclipse-demos/devel eclipse-demos.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261253.l8QCrS6Q022063@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22040/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-demos.spec 
Log Message:
Initial import.



--- NEW FILE eclipse-demos.spec ---
Name:           eclipse-demos
Version:        0.0.1
Release:        2%{?dist}
Summary:        Eclipse demonstration screencasts

Group:          Documentation
License:        Open Publication
URL:            http://sources.redhat.com/eclipse
Source0:        http://overholt.fedorapeople.org/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
Screencasts demonstrating various features of Eclipse.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}
cp -p * $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}-%{version}
%doc %{_datadir}/%{name}-%{version}/openpub.html
%{_datadir}/%{name}-%{version}/*.ogg

%changelog
* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 0.0.1-2
- Drop totem requirement (one can use any number of players).
- Fix license to be "Open Publication".

* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 0.0.1-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-demos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 23:17:19 -0000	1.1
+++ .cvsignore	26 Sep 2007 12:52:56 -0000	1.2
@@ -0,0 +1 @@
+eclipse-demos-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-demos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 23:17:19 -0000	1.1
+++ sources	26 Sep 2007 12:52:56 -0000	1.2
@@ -0,0 +1 @@
+f7dd686b7b60d8996eb82491a678b9aa  eclipse-demos-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 13:08:43 2007
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Wed, 26 Sep 2007 09:08:43 -0400
Subject: rpms/pybliographer/devel .cvsignore, 1.8, 1.9 pybliographer.spec,
	1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200709261308.l8QD8hfw028630@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555

Modified Files:
	.cvsignore pybliographer.spec sources 
Log Message:
Update to 1.2.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Jan 2007 11:22:51 -0000	1.8
+++ .cvsignore	26 Sep 2007 13:08:11 -0000	1.9
@@ -1 +1 @@
-pybliographer-1.2.10.tar.gz
+pybliographer-1.2.11.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pybliographer.spec	22 Aug 2007 13:46:00 -0000	1.17
+++ pybliographer.spec	26 Sep 2007 13:08:11 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.10.tar.gz
+Source: http://downloads.sourceforge.net/pybliographer/pybliographer-1.2.11.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -97,7 +97,6 @@
 %dir %{_datadir}/pybliographer
 %{_datadir}/pybliographer/Pyblio
 %{_datadir}/pybliographer/Styles
-%{_datadir}/pybliographer/glade
 %{_datadir}/pybliographer/pybcheck.py*
 %{_datadir}/pybliographer/pybcompact.py*
 %{_datadir}/pybliographer/pybconvert.py*
@@ -109,6 +108,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Zoltan Kota <z.kota at gmx.net> - 1.2.11-1
+- update to 1.2.11
+
 * Mon Jan 22 2007 Zoltan Kota <z.kota at gmx.net> - 1.2.10-1
 - update to 1.2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2007 11:22:51 -0000	1.8
+++ sources	26 Sep 2007 13:08:11 -0000	1.9
@@ -1 +1 @@
-762e01058fc5ff81716c75699c7a5acd  pybliographer-1.2.10.tar.gz
+526048083f0227dae81e8a2f0a0e0daf  pybliographer-1.2.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 13:47:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 09:47:44 -0400
Subject: rpms/desktop-backgrounds/devel .cvsignore, 1.15,
	1.16 desktop-backgrounds.spec, 1.47, 1.48 sources, 1.20, 1.21
Message-ID: <200709261347.l8QDliK6031821@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31670

Modified Files:
	.cvsignore desktop-backgrounds.spec sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Aug 2007 00:53:52 -0000	1.15
+++ .cvsignore	26 Sep 2007 13:47:10 -0000	1.16
@@ -1,3 +1,3 @@
 Propaganda-1.0.0.tar.gz
 redhat-backgrounds-14.tar.bz2
-desktop-backgrounds-infinity-0.0.1.tar.gz
+desktop-backgrounds-infinity-0.0.2.tar.gz


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- desktop-backgrounds.spec	20 Sep 2007 14:41:01 -0000	1.47
+++ desktop-backgrounds.spec	26 Sep 2007 13:47:10 -0000	1.48
@@ -1,17 +1,16 @@
 %define rh_backgrounds_version 14
-%define infinity_version 0.0.1
+%define infinity_version 0.0.2
 
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 5
+Release: 6
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
 Source2: Propaganda-1.0.0.tar.gz
 Source3: README.Propaganda
 Source4: desktop-backgrounds-infinity-%{infinity_version}.tar.gz
-Source5: infinity.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
@@ -73,12 +72,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
 cp -a $RPM_BUILD_DIR/redhat-backgrounds-%{rh_backgrounds_version}/desktop-backgrounds-basic.xml $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
 cp -a $RPM_BUILD_DIR/redhat-backgrounds-%{rh_backgrounds_version}/desktop-backgrounds-infinity-%{infinity_version}/desktop-backgrounds-infinity.xml $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
-# we need to save some space, so let's go to less images for now...
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/infinity.xml
-for i in 01 02 03 04 05 07 08 09 10 11 ; do 
-  rm -f $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/am$i.png
-  rm -f $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/pm$i.png
-done
 
 bgdir=$RPM_BUILD_ROOT%{_prefix}/share/backgrounds
 for I in tiles/Propaganda images/dewdop_leaf.jpg images/dragonfly.jpg images/frosty_pipes.jpg images/in_flight.jpg images/leaf_veins.jpg \
@@ -89,10 +82,10 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -sf ../infinity/am00.png default.jpg;
- ln -sf ../infinity/am00.png default.png;
- ln -sf ../infinity/am00.png default-wide.png;
- ln -sf ../infinity/am00.png default-5_4.png)
+ ln -sf ../infinity/2-infinity-day.png default.jpg;
+ ln -sf ../infinity/2-infinity-day.png default.png;
+ ln -sf ../infinity/2-infinity-day.png default-wide.png;
+ ln -sf ../infinity/2-infinity-day.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,6 +128,11 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Wed Sep 26 2007 M??ir??n Duffy <duffy at redhat.com> - 7.92-6
+- wallpapers redone so there is no more banding
+- wallpapers renamed
+- infinity animated file bugs fixed (hopefully)
+
 * Thu Sep 20 2007 Ray Strode <rstrode at redhat.com> - 7.92-5
 - fix symlinks again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2007 00:53:52 -0000	1.20
+++ sources	26 Sep 2007 13:47:10 -0000	1.21
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-f058c23fbc6e4ee8c05c2535114756a3  desktop-backgrounds-infinity-0.0.1.tar.gz
+6bc90483d41c4cc3e13abf80da686419  desktop-backgrounds-infinity-0.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:23 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:23 -0400
Subject: devel/vim 7.1.120,NONE,1.1
Message-ID: <200709261348.l8QDmNcO001329@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1110

Added Files:
	7.1.120 
Log Message:
- patchlevel 120


--- NEW FILE 7.1.120 ---
To: vim-dev at vim.org
Subject: patch 7.1.120
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.120
Problem:    Can't properly check memory leaks while running tests.
Solution:   Add an argument to garbagecollect().  Delete functions and
	    variables in the test scripts.
Files:	    runtime/doc/eval.txt, src/eval.c, src/globals.h, src/main.c,
	    src/testdir/Makefile, src/testdir/test14.in,
	    src/testdir/test26.in, src/testdir/test34.in,
	    src/testdir/test45.in, src/testdir/test47.in,
	    src/testdir/test49.in, src/testdir/test55.in,
	    src/testdir/test56.in, src/testdir/test58.in,
	    src/testdir/test59.in, src/testdir/test60.in,
	    src/testdir/test60.vim, src/testdir/test62.in,
	    src/testdir/test63.in, src/testdir/test64.in


*** ../vim-7.1.119/runtime/doc/eval.txt	Thu Jul 26 22:55:11 2007
--- runtime/doc/eval.txt	Tue Sep 25 17:40:30 2007
***************
*** 1,4 ****
! *eval.txt*      For Vim version 7.1.  Last change: 2007 Jul 25
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *eval.txt*      For Vim version 7.1.  Last change: 2007 Sep 25
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 1603,1609 ****
  foldtextresult( {lnum})		String	text for closed fold at {lnum}
  foreground( )			Number	bring the Vim window to the foreground
  function( {name})		Funcref reference to function {name}
! garbagecollect()		none	free memory, breaking cyclic references
  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
  getbufline( {expr}, {lnum} [, {end}])
--- 1603,1609 ----
  foldtextresult( {lnum})		String	text for closed fold at {lnum}
  foreground( )			Number	bring the Vim window to the foreground
  function( {name})		Funcref reference to function {name}
! garbagecollect( [at_exit])	none	free memory, breaking cyclic references
  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
  getbufline( {expr}, {lnum} [, {end}])
***************
*** 2673,2679 ****
  		{name} can be a user defined function or an internal function.
  
  
! garbagecollect()					*garbagecollect()*
  		Cleanup unused |Lists| and |Dictionaries| that have circular
  		references.  There is hardly ever a need to invoke this
  		function, as it is automatically done when Vim runs out of
--- 2673,2679 ----
  		{name} can be a user defined function or an internal function.
  
  
! garbagecollect([at_exit])				*garbagecollect()*
  		Cleanup unused |Lists| and |Dictionaries| that have circular
  		references.  There is hardly ever a need to invoke this
  		function, as it is automatically done when Vim runs out of
***************
*** 2683,2688 ****
--- 2683,2691 ----
  		This is useful if you have deleted a very big |List| and/or
  		|Dictionary| with circular references in a script that runs
  		for a long time.
+ 		When the optional "at_exit" argument is one, garbage
+ 		collection will also be done when exiting Vim, if it wasn't
+ 		done before.  This is useful when checking for memory leaks.
  
  get({list}, {idx} [, {default}])			*get()*
  		Get item {idx} from |List| {list}.  When this item is not
*** ../vim-7.1.119/src/eval.c	Tue Sep 25 12:50:00 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 6128,6133 ****
--- 6128,6134 ----
      /* Only do this once. */
      want_garbage_collect = FALSE;
      may_garbage_collect = FALSE;
+     garbage_collect_at_exit = FALSE;
  
      /*
       * 1. Go through all accessible variables and mark all lists and dicts
***************
*** 7110,7116 ****
      {"foldtextresult",	1, 1, f_foldtextresult},
      {"foreground",	0, 0, f_foreground},
      {"function",	1, 1, f_function},
!     {"garbagecollect",	0, 0, f_garbagecollect},
      {"get",		2, 3, f_get},
      {"getbufline",	2, 3, f_getbufline},
      {"getbufvar",	2, 2, f_getbufvar},
--- 7111,7117 ----
      {"foldtextresult",	1, 1, f_foldtextresult},
      {"foreground",	0, 0, f_foreground},
      {"function",	1, 1, f_function},
!     {"garbagecollect",	0, 1, f_garbagecollect},
      {"get",		2, 3, f_get},
      {"getbufline",	2, 3, f_getbufline},
      {"getbufvar",	2, 2, f_getbufvar},
***************
*** 9719,9724 ****
--- 9720,9728 ----
      /* This is postponed until we are back at the toplevel, because we may be
       * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
      want_garbage_collect = TRUE;
+ 
+     if (argvars[0].v_type != VAR_UNKNOWN && get_tv_number(&argvars[0]) == 1)
+ 	garbage_collect_at_exit = TRUE;
  }
  
  /*
*** ../vim-7.1.119/src/globals.h	Thu Aug 30 13:51:52 2007
--- src/globals.h	Sun Sep 16 18:42:41 2007
***************
*** 301,313 ****
  #endif
  
  #ifdef FEAT_EVAL
! /* Garbage collection can only take place when we are sure there are no Lists
   * or Dictionaries being used internally.  This is flagged with
   * "may_garbage_collect" when we are at the toplevel.
   * "want_garbage_collect" is set by the garbagecollect() function, which means
!  * we do garbage collection before waiting for a char at the toplevel. */
  EXTERN int	may_garbage_collect INIT(= FALSE);
  EXTERN int	want_garbage_collect INIT(= FALSE);
  
  /* ID of script being sourced or was sourced to define the current function. */
  EXTERN scid_T	current_SID INIT(= 0);
--- 301,317 ----
  #endif
  
  #ifdef FEAT_EVAL
! /*
!  * Garbage collection can only take place when we are sure there are no Lists
   * or Dictionaries being used internally.  This is flagged with
   * "may_garbage_collect" when we are at the toplevel.
   * "want_garbage_collect" is set by the garbagecollect() function, which means
!  * we do garbage collection before waiting for a char at the toplevel.
!  * "garbage_collect_at_exit" indicates garbagecollect(1) was called.
!  */
  EXTERN int	may_garbage_collect INIT(= FALSE);
  EXTERN int	want_garbage_collect INIT(= FALSE);
+ EXTERN int	garbage_collect_at_exit INIT(= FALSE);
  
  /* ID of script being sourced or was sourced to define the current function. */
  EXTERN scid_T	current_SID INIT(= 0);
*** ../vim-7.1.119/src/main.c	Thu Sep  6 17:38:06 2007
--- src/main.c	Sun Sep 16 18:44:54 2007
***************
*** 1334,1339 ****
--- 1334,1343 ----
  #ifdef FEAT_CSCOPE
      cs_end();
  #endif
+ #ifdef FEAT_EVAL
+     if (garbage_collect_at_exit)
+ 	garbage_collect();
+ #endif
  
      mch_exit(exitval);
  }
*** ../vim-7.1.119/src/testdir/Makefile	Tue Aug 14 17:28:14 2007
--- src/testdir/Makefile	Mon Sep 17 20:04:13 2007
***************
*** 6,12 ****
  
  # Uncomment this line for using valgrind.
  # The output goes into a file "valgrind.$PID" (sorry, no test number).
! # VALGRIND = valgrind --tool=memcheck --num-callers=15 --logfile=valgrind
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
--- 6,12 ----
  
  # Uncomment this line for using valgrind.
  # The output goes into a file "valgrind.$PID" (sorry, no test number).
! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
***************
*** 39,45 ****
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
  clean:
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* viminfo
  
  test1.out: test1.in
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
--- 39,45 ----
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
  clean:
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* valgrind.pid* viminfo
  
  test1.out: test1.in
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
***************
*** 65,70 ****
--- 65,74 ----
  		else echo $* NO OUTPUT >>test.log; \
  		fi"
  	-rm -rf X* test.ok viminfo
+ 
+ test49.out: test49.vim
+ 
+ test60.out: test60.vim
  
  nolog:
  	-echo Test results: >test.log
*** ../vim-7.1.119/src/testdir/test14.in	Sun Jun 13 20:24:08 2004
--- src/testdir/test14.in	Sun Sep 16 15:57:54 2007
***************
*** 18,23 ****
--- 18,24 ----
  : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>"
  :endif
  :exe "normal " . tt
+ :unlet tt
  :.w >>test.out
  :set vb
  /^Piece
*** ../vim-7.1.119/src/testdir/test26.in	Sun Jun 13 17:05:48 2004
--- src/testdir/test26.in	Sun Sep 16 16:54:19 2007
***************
*** 37,42 ****
--- 37,43 ----
  :    endif
  :  endif
  :endwhile
+ :unlet i j
  :'t,$w! test.out
  :qa!
  ENDTEST
*** ../vim-7.1.119/src/testdir/test34.in	Sun Apr 30 20:46:14 2006
--- src/testdir/test34.in	Sun Sep 16 21:25:47 2007
***************
*** 52,58 ****
  ---*---
  (one
  (two
! [(one again:$-5,$wq! test.out
  ENDTEST
  
  here
--- 52,66 ----
  ---*---
  (one
  (two
! [(one again:$-5,$w! test.out
! :delfunc Table
! :delfunc Compute
! :delfunc Expr1
! :delfunc Expr2
! :delfunc ListItem
! :delfunc ListReset
! :unlet retval counter
! :q!
  ENDTEST
  
  here
*** ../vim-7.1.119/src/testdir/test45.in	Sun Jun 13 19:57:02 2004
--- src/testdir/test45.in	Sun Sep 16 18:27:20 2007
***************
*** 55,60 ****
--- 55,61 ----
  /kk$
  :call append("$", foldlevel("."))
  :/^last/+1,$w! test.out
+ :delfun Flvl
  :qa!
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test47.in	Sun Jun 13 18:40:29 2004
--- src/testdir/test47.in	Sun Sep 16 18:32:03 2007
***************
*** 34,39 ****
--- 34,40 ----
  :call append("$", two)
  :call append("$", three)
  :$-2,$w! test.out
+ :unlet one two three
  :qa!
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test49.in	Sun Jun 13 18:10:00 2004
--- src/testdir/test49.in	Sun Sep 16 23:30:35 2007
***************
*** 1,13 ****
  This is a test of the script language.
  
  If after adding a new test, the test output doesn't appear properly in
! test49.failed, try to add one ore more "G"s at the line before ENDTEST.
  
  STARTTEST
  :so small.vim
  :se nocp nomore viminfo+=nviminfo
  :so test49.vim
! GGGGGGGGGG"rp:.-,$wq! test.out
  ENDTEST
  
  Results of test49.vim:
--- 1,29 ----
  This is a test of the script language.
  
  If after adding a new test, the test output doesn't appear properly in
! test49.failed, try to add one ore more "G"s at the line ending in "test.out"
  
  STARTTEST
  :so small.vim
  :se nocp nomore viminfo+=nviminfo
  :so test49.vim
! GGGGGGGGGGGGGG"rp:.-,$w! test.out
! :"
! :" make valgrind happy
! :redir => funclist
! :silent func
! :redir END
! :for line in split(funclist, "\n")
! :  let name = matchstr(line, 'function \zs[A-Z]\w*\ze(')
! :  if name != ''
! :    exe "delfunc " . name
! :  endif
! :endfor
! :for v in keys(g:)
! :  silent! exe "unlet " . v
! :endfor
! :unlet v
! :qa!
  ENDTEST
  
  Results of test49.vim:
*** ../vim-7.1.119/src/testdir/test55.in	Sat May  5 20:03:56 2007
--- src/testdir/test55.in	Mon Sep 17 19:53:48 2007
***************
*** 345,350 ****
--- 345,354 ----
  :endfun
  :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
  :"
+ :delfunc Test
+ :unlet dict
+ :call garbagecollect(1)
+ :"
  :/^start:/,$wq! test.out
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test56.in	Tue Sep  5 13:36:02 2006
--- src/testdir/test56.in	Sun Sep 16 17:54:20 2007
***************
*** 17,21 ****
  fun s:DoNothing()
    call append(line('$'), "nothing line")
  endfun
! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<cr>
  end:
--- 17,21 ----
  fun s:DoNothing()
    call append(line('$'), "nothing line")
  endfun
! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
  end:
*** ../vim-7.1.119/src/testdir/test58.in	Wed Apr  5 22:38:56 2006
--- src/testdir/test58.in	Sun Sep 16 18:17:03 2007
***************
*** 86,91 ****
--- 86,92 ----
  :$put =str
  `m]s:let [str, a] = spellbadword()
  :$put =str
+ :unlet str a
  :"
  :" Postponed prefixes
  :call TestOne('2', '1')
***************
*** 99,104 ****
--- 100,109 ----
  :"
  :" NOSLITSUGS
  :call TestOne('8', '8')
+ :"
+ :" clean up for valgrind
+ :delfunc TestOne
+ :set spl= enc=latin1
  :"
  gg:/^test output:/,$wq! test.out
  ENDTEST
*** ../vim-7.1.119/src/testdir/test59.in	Wed Apr  5 22:27:11 2006
--- src/testdir/test59.in	Sun Sep 16 18:17:23 2007
***************
*** 90,95 ****
--- 90,96 ----
  :$put =str
  `m]s:let [str, a] = spellbadword()
  :$put =str
+ :unlet str a
  :"
  :" Postponed prefixes
  :call TestOne('2', '1')
***************
*** 100,105 ****
--- 101,110 ----
  :call TestOne('5', '5')
  :call TestOne('6', '6')
  :call TestOne('7', '7')
+ :"
+ :" clean up for valgrind
+ :delfunc TestOne
+ :set spl= enc=latin1
  :"
  gg:/^test output:/,$wq! test.out
  ENDTEST
*** ../vim-7.1.119/src/testdir/test60.in	Fri May  5 23:11:11 2006
--- src/testdir/test60.in	Mon Sep 17 19:58:43 2007
***************
*** 569,574 ****
--- 569,577 ----
      redir END
  endfunction
  :call TestExists()
+ :delfunc TestExists
+ :delfunc RunTest
+ :delfunc TestFuncArg
  :edit! test.out
  :set ff=unix
  :w
*** ../vim-7.1.119/src/testdir/test60.vim	Fri Jan 13 00:14:55 2006
--- src/testdir/test60.vim	Mon Sep 17 19:56:02 2007
***************
*** 94,97 ****
--- 94,98 ----
  else
      echo "FAILED"
  endif
+ unlet str
  
*** ../vim-7.1.119/src/testdir/test62.in	Sun Apr 30 20:28:14 2006
--- src/testdir/test62.in	Sun Sep 16 17:24:04 2007
***************
*** 7,12 ****
--- 7,13 ----
  :let nr = tabpagenr()
  :q
  :call append(line('$'), 'tab page ' . nr)
+ :unlet nr
  :"
  :" Open three tab pages and use ":tabdo"
  :0tabnew
***************
*** 23,28 ****
--- 24,30 ----
  :q!
  :call append(line('$'), line1)
  :call append(line('$'), line2)
+ :unlet line1 line2
  :"
  :"
  :/^Results/,$w! test.out
*** ../vim-7.1.119/src/testdir/test63.in	Thu Jul 26 22:55:11 2007
--- src/testdir/test63.in	Sun Sep 16 17:11:07 2007
***************
*** 60,66 ****
  :else
  :  let @r .= "FAILED\n"
  :endif
! :" --- Check that "matchdelete()" returns 0 if succesfull and otherwise -1.
  :let @r .= "*** Test 6: "
  :let m = matchadd("MyGroup1", "TODO")
  :let r1 = matchdelete(m)
--- 60,66 ----
  :else
  :  let @r .= "FAILED\n"
  :endif
! :" --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
  :let @r .= "*** Test 6: "
  :let m = matchadd("MyGroup1", "TODO")
  :let r1 = matchdelete(m)
***************
*** 117,123 ****
  :" --- Check that "setmatches()" will not add two matches with the same ID. The
  :" --- expected behaviour (for now) is to add the first match but not the
  :" --- second and to return 0 (even though it is a matter of debate whether
! :" --- this can be considered succesfull behaviour).
  :let @r .= "*** Test 9: "
  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
--- 117,123 ----
  :" --- Check that "setmatches()" will not add two matches with the same ID. The
  :" --- expected behaviour (for now) is to add the first match but not the
  :" --- second and to return 0 (even though it is a matter of debate whether
! :" --- this can be considered successful behaviour).
  :let @r .= "*** Test 9: "
  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
***************
*** 127,133 ****
  :endif
  :call clearmatches()
  :unlet r1
! :" --- Check that "setmatches()" returns 0 if succesfull and otherwise -1.
  :" --- (A range of valid and invalid input values are tried out to generate the
  :" --- return values.)
  :let @r .= "*** Test 10: "
--- 127,133 ----
  :endif
  :call clearmatches()
  :unlet r1
! :" --- Check that "setmatches()" returns 0 if successful and otherwise -1.
  :" --- (A range of valid and invalid input values are tried out to generate the
  :" --- return values.)
  :let @r .= "*** Test 10: "
*** ../vim-7.1.119/src/testdir/test64.in	Tue Aug 14 17:28:14 2007
--- src/testdir/test64.in	Sun Sep 16 17:43:03 2007
***************
*** 44,51 ****
--- 44,53 ----
  :        $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
  :      endif
  :    endfor
+ :    unlet i
  :  endif
  :endfor
+ :unlet t tl e l
  :/^Results/,$wq! test.out
  ENDTEST
  
*** ../vim-7.1.119/src/version.c	Tue Sep 25 14:50:19 2007
--- src/version.c	Tue Sep 25 17:36:22 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     120,
  /**/

-- 
BEDEVERE: How do you know so much about swallows?
ARTHUR:   Well you have to know these things when you're a king, you know.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:31 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:31 -0400
Subject: devel/vim 7.1.121,NONE,1.1
Message-ID: <200709261348.l8QDmVL0001542@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1504

Added Files:
	7.1.121 
Log Message:
- patchlevel 121


--- NEW FILE 7.1.121 ---
To: vim-dev at vim.org
Subject: patch 7.1.121
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.121
Problem:    Using ":cd %:h" when editing a file in the current directory
	    results in an error message for using an empty string.
Solution:   When "%:h" results in an empty string use ".".
Files:	    src/eval.c


*** ../vim-7.1.120/src/eval.c	Tue Sep 25 17:54:41 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 21308,21321 ****
  	*usedlen += 2;
  	s = get_past_head(*fnamep);
  	while (tail > s && after_pathsep(s, tail))
! 	    --tail;
  	*fnamelen = (int)(tail - *fnamep);
  #ifdef VMS
  	if (*fnamelen > 0)
  	    *fnamelen += 1; /* the path separator is part of the path */
  #endif
! 	while (tail > s && !after_pathsep(s, tail))
! 	    mb_ptr_back(*fnamep, tail);
      }
  
      /* ":8" - shortname  */
--- 21308,21334 ----
  	*usedlen += 2;
  	s = get_past_head(*fnamep);
  	while (tail > s && after_pathsep(s, tail))
! 	    mb_ptr_back(*fnamep, tail);
  	*fnamelen = (int)(tail - *fnamep);
  #ifdef VMS
  	if (*fnamelen > 0)
  	    *fnamelen += 1; /* the path separator is part of the path */
  #endif
! 	if (*fnamelen == 0)
! 	{
! 	    /* Result is empty.  Turn it into "." to make ":cd %:h" work. */
! 	    p = vim_strsave((char_u *)".");
! 	    if (p == NULL)
! 		return -1;
! 	    vim_free(*bufp);
! 	    *bufp = *fnamep = tail = p;
! 	    *fnamelen = 1;
! 	}
! 	else
! 	{
! 	    while (tail > s && !after_pathsep(s, tail))
! 		mb_ptr_back(*fnamep, tail);
! 	}
      }
  
      /* ":8" - shortname  */
*** ../vim-7.1.120/src/version.c	Tue Sep 25 17:54:41 2007
--- src/version.c	Tue Sep 25 20:38:08 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     121,
  /**/

-- 
It is illegal for anyone to try and stop a child from playfully jumping over
puddles of water.
		[real standing law in California, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:37 -0400
Subject: devel/vim 7.1.122,NONE,1.1
Message-ID: <200709261348.l8QDmb0j001601@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1590

Added Files:
	7.1.122 
Log Message:
- patchlevel 122


--- NEW FILE 7.1.122 ---
To: vim-dev at vim.org
Subject: patch 7.1.122
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.122
Problem:    Mac: building Vim.app fails.  Using wrong architecture.
Solution:   Use line continuation for the gui_bundle dependency.  Detect the
	    system architecture with "uname -a".
Files:	    src/main.aap


*** ../vim-7.1.121/src/main.aap	Thu May 10 18:48:19 2007
--- src/main.aap	Tue Sep 25 21:26:03 2007
***************
*** 56,64 ****
      config {virtual} auto/config.h auto/config.aap :
                           auto/configure.aap configure.aap
                           config.arg config.h.in config.aap.in
          :sys CONFIG_STATUS=auto/config.status
                  ./configure.aap `file2string("config.arg")`
!                     --with-mac-arch=ppc
                      --cache-file=auto/config.cache
  
      # Configure arguments: create an empty "config.arg" file when its missing
--- 56,71 ----
      config {virtual} auto/config.h auto/config.aap :
                           auto/configure.aap configure.aap
                           config.arg config.h.in config.aap.in
+         # Use "uname -a" to detect the architecture of the system.
+         @ok, uname = redir_system('uname -a', 0)
+         @if string.find(uname, "i386") >= 0:
+         @   arch = "i386"
+         @else:
+         @   arch = "ppc"
+         :print Building for $arch system
          :sys CONFIG_STATUS=auto/config.status
                  ./configure.aap `file2string("config.arg")`
!                     --with-mac-arch=$arch
                      --cache-file=auto/config.cache
  
      # Configure arguments: create an empty "config.arg" file when its missing
***************
*** 1167,1173 ****
          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
  # TODO: Create the vimtutor application.
  
! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
                          bundle-resource bundle-language
  
  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
--- 1174,1180 ----
          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
  # TODO: Create the vimtutor application.
  
! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
                          bundle-resource bundle-language
  
  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
***************
*** 1187,1193 ****
          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
  
  bundle-resource {virtual}: bundle-dir bundle-rsrc
!     :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
  
  ### Classic resources
  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
--- 1194,1200 ----
          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
  
  bundle-resource {virtual}: bundle-dir bundle-rsrc
!         :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
  
  ### Classic resources
  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
*** ../vim-7.1.121/src/version.c	Tue Sep 25 20:39:14 2007
--- src/version.c	Tue Sep 25 22:12:16 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     122,
  /**/

-- 
Men may not be seen publicly in any kind of strapless gown.
		[real standing law in Florida, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:50:14 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Wed, 26 Sep 2007 09:50:14 -0400
Subject: rpms/acpid/devel acpid-1.0.6-fd.patch, NONE, 1.1 acpid.init, 1.3,
	1.4 acpid.spec, 1.22, 1.23
Message-ID: <200709261350.l8QDoErX001711@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1631

Modified Files:
	acpid.init acpid.spec 
Added Files:
	acpid-1.0.6-fd.patch 
Log Message:
Fixed leak of a file descriptor
Resolves: #304761


acpid-1.0.6-fd.patch:

--- NEW FILE acpid-1.0.6-fd.patch ---
--- acpid-1.0.6.orig/acpid.c	2007-09-24 18:49:02.000000000 -0400
+++ acpid-1.0.6/acpid.c	2007-09-24 18:52:44.000000000 -0400
@@ -397,7 +397,7 @@ open_log(void)
 	int log_opts;
 
 	/* open /dev/null */
-	nullfd = open("/dev/null", O_RDONLY, 0640);
+	nullfd = open("/dev/null", O_RDONLY);
 	if (nullfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			"/dev/null", strerror(errno));
diff -urp acpid-1.0.6.orig/event.c acpid-1.0.6/event.c
--- acpid-1.0.6.orig/event.c	2007-09-24 18:49:02.000000000 -0400
+++ acpid-1.0.6/event.c	2007-09-24 18:55:10.000000000 -0400
@@ -318,6 +318,7 @@ parse_file(const char *file)
 			    file);
 		}
 		free_rule(r);
+		fclose(fp);
 		return NULL;
 	}
 	fclose(fp);
@@ -667,7 +668,7 @@ parse_cmd(const char *cmd, const char *e
 	i = 0;
 
 	memset(buf, 0, sizeof(buf));
-	while (i < (sizeof(buf)-1)) {
+	while ((size_t)i < (sizeof(buf)-1)) {
 		if (*p == '%') {
 			p++;
 			if (*p == 'e') {



Index: acpid.init
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acpid.init	25 Jul 2007 08:59:47 -0000	1.3
+++ acpid.init	26 Sep 2007 13:49:40 -0000	1.4
@@ -10,10 +10,10 @@
 
 ### BEGIN INIT INFO
 # Provides: acpid
-# Required-Start: $syslog
-# Required-Stop: $syslog
-# Default-Start:  3 4 5
-# Default-Stop: 0 1 2 6
+# Required-Start: $syslog $local_fs
+# Required-Stop: $syslog $local_fs
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
 # Short-Description: start and stop acpid
 # Description: Listen and dispatch ACPI events from the kernel
 ### END INIT INFO
@@ -35,7 +35,7 @@
 	fi
 	# Check for kernel support
 	if [ ! -f /proc/acpi/event ]; then
-		echo "$0: need ACPI support in kernel."
+		echo "$0: need ACPI_PROC_EVENT support in kernel."  //zmena podle 260181
 		exit 1
 	fi
 	# Check if it is already running


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- acpid.spec	10 Aug 2007 06:49:39 -0000	1.22
+++ acpid.spec	26 Sep 2007 13:49:40 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source4: acpid.power.conf
 Patch1: acpid-1.0.6-makefile.patch
 Patch2: acpid-1.0.6-return.patch
+Patch3: acpid-1.0.6-fd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -27,6 +28,7 @@
 %setup -q
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .return
+%patch3 -p1 -b .fd
 
 %build
 make %{?_smp_mflags}
@@ -85,6 +87,10 @@
 fi
 
 %changelog
+* Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-2.fc8
+- Fixed leak of a file descriptor
+- Resolves: #304761
+
 * Tue Aug 07 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-1.fc8
 - Updated to version 1.0.6
 



From fedora-extras-commits at redhat.com  Wed Sep 26 13:57:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 09:57:42 -0400
Subject: rpms/gnome-desktop/devel leak.patch, NONE, 1.1 gnome-desktop.spec, 
	1.99, 1.100
Message-ID: <200709261357.l8QDvgOH001956@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1930

Modified Files:
	gnome-desktop.spec 
Added Files:
	leak.patch 
Log Message:
fix a leak


leak.patch:

--- NEW FILE leak.patch ---
diff -up gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c.decoder gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c
--- gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c.decoder	2007-09-26 09:50:53.000000000 -0400
+++ gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c	2007-09-26 09:48:08.000000000 -0400
@@ -1722,7 +1722,7 @@ make_environment_for_screen (GdkScreen  
 	g_assert (i == env_len);
 
 	g_free (display_name);
-	g_free (freeme);
+	g_strfreev (freeme);
 
 	return retval;
 }


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome-desktop.spec	18 Sep 2007 02:56:28 -0000	1.99
+++ gnome-desktop.spec	26 Sep 2007 13:57:09 -0000	1.100
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -22,6 +22,8 @@
 Patch1:   gnome-desktop-2.1.90-kdetheme.patch
 Patch2:   gnome-desktop-2.9.91-desktop.patch
 Patch3:   gnome-desktop-2.19.90-gnome-bg.patch
+# fixed in upstream svn
+Patch4:	  leak.patch
 
 Requires: redhat-artwork
 Requires: redhat-menus
@@ -77,6 +79,7 @@
 %patch1 -p1 -b .kdetheme
 %patch2 -p1 -b .menu
 %patch3 -p1 -b .gnome-bg
+%patch4 -p1 -b .leak
 
 %build
 
@@ -125,6 +128,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Fix a memory leak
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 26 13:59:47 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 09:59:47 -0400
Subject: rpms/firefox/devel firefox-2.0-enable-debug.patch, NONE,
	1.1 firefox.sh.in, 1.22, 1.23 firefox.spec, 1.200, 1.201
Message-ID: <200709261359.l8QDxljx002122@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2074

Modified Files:
	firefox.sh.in firefox.spec 
Added Files:
	firefox-2.0-enable-debug.patch 
Log Message:
* Mon Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-11
- Fixed #242657 - firefox -g doesn't work



firefox-2.0-enable-debug.patch:

--- NEW FILE firefox-2.0-enable-debug.patch ---
diff -up mozilla/browser/app/Makefile.in.old mozilla/browser/app/Makefile.in
--- mozilla/browser/app/Makefile.in.old	2006-08-29 04:03:07.000000000 +0200
+++ mozilla/browser/app/Makefile.in	2007-09-26 15:08:35.000000000 +0200
@@ -238,7 +238,7 @@ libs:: firefox
 	$(INSTALL) $< $(DIST)/bin
 
 install:: firefox
-	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+	$(SYSINSTALL) $< $(DESTDIR)$(mozappdir)
 
 GARBAGE += firefox
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- firefox.sh.in	7 Aug 2007 08:30:38 -0000	1.22
+++ firefox.sh.in	26 Sep 2007 13:59:13 -0000	1.23
@@ -60,7 +60,7 @@
 fi
 MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
 MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
-MOZ_PROGRAM="$MOZ_DIST_BIN/firefox-bin"
+MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
 MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client"
 MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
 


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- firefox.spec	25 Sep 2007 18:00:36 -0000	1.200
+++ firefox.spec	26 Sep 2007 13:59:13 -0000	1.201
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -67,6 +67,7 @@
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch110:       firefox-2.0-startup-notify.patch
 Patch111:       firefox-path.patch
+Patch112:       firefox-2.0-enable-debug.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -165,6 +166,7 @@
 %patch106 -p1 -b .indicator-crash
 %patch110 -p0 -b .startup-notify
 %patch111 -p1 -b .path
+%patch112 -p1 -b .debug
 
 # For branding specific patches.
 
@@ -401,6 +403,7 @@
 %{mozappdir}/res
 %{mozappdir}/searchplugins
 %{mozappdir}/*.so
+%{mozappdir}/firefox
 %{mozappdir}/firefox-bin
 %{mozappdir}/firefox-xremote-client
 %{mozappdir}/mozilla-xremote-client
@@ -431,6 +434,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-11
+- Fixed #242657 - firefox -g doesn't work
+
 * Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
 - Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
 



From fedora-extras-commits at redhat.com  Wed Sep 26 14:00:04 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 10:00:04 -0400
Subject: comps comps-f8.xml.in,1.126,1.127
Message-ID: <200709261400.l8QE04LV002164@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2104

Modified Files:
	comps-f8.xml.in 
Log Message:
add atmel firmware



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- comps-f8.xml.in	25 Sep 2007 18:35:05 -0000	1.126
+++ comps-f8.xml.in	26 Sep 2007 13:59:34 -0000	1.127
@@ -1992,6 +1992,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 26 14:09:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:09:24 -0400
Subject: rpms/desktop-backgrounds/devel sources,1.21,1.22
Message-ID: <200709261409.l8QE9Ob1008669@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8512

Modified Files:
	sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Sep 2007 13:47:10 -0000	1.21
+++ sources	26 Sep 2007 14:08:51 -0000	1.22
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-6bc90483d41c4cc3e13abf80da686419  desktop-backgrounds-infinity-0.0.2.tar.gz
+84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 14:13:54 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Wed, 26 Sep 2007 10:13:54 -0400
Subject: rpms/acpid/F-7 acpid-1.0.4-fd.patch,NONE,1.1 acpid.spec,1.19,1.20
Message-ID: <200709261413.l8QEDsFR008817@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8782

Modified Files:
	acpid.spec 
Added Files:
	acpid-1.0.4-fd.patch 
Log Message:
Fixed leak of a file descriptor (#304761)


acpid-1.0.4-fd.patch:

--- NEW FILE acpid-1.0.4-fd.patch ---
--- acpid-1.0.4.orig/acpid.c	2007-09-24 17:05:07.000000000 -0400
+++ acpid-1.0.4/acpid.c	2007-09-24 17:12:19.000000000 -0400
@@ -396,13 +396,13 @@ open_logs(void)
 	int nullfd;
 
 	/* set up stdout, stderr to log and stdin to /dev/null */
-	nullfd = open("/dev/null", O_RDONLY, 0640);
+	nullfd = open("/dev/null", O_RDONLY);
 	if (nullfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			"/dev/null", strerror(errno));
 		return -1;
 	}
-	logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND);
+	logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0640);
 	if (logfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			logfile, strerror(errno));
diff -urp acpid-1.0.4.orig/event.c acpid-1.0.4/event.c
--- acpid-1.0.4.orig/event.c	2007-09-24 17:05:07.000000000 -0400
+++ acpid-1.0.4/event.c	2007-09-24 17:33:56.000000000 -0400
@@ -302,6 +302,7 @@ parse_file(const char *file)
 			acpid_log("DBG: skipping incomplete file %s\n", file);
 		}
 		free_rule(r);
+		fclose(fp);
 		return NULL;
 	}
 	fclose(fp);
@@ -641,7 +642,7 @@ parse_cmd(const char *cmd, const char *e
 	i = 0;
 
 	memset(buf, 0, sizeof(buf));
-	while (i < (sizeof(buf)-1)) {
+	while ((size_t)i < (sizeof(buf)-1)) {
 		if (*p == '%') {
 			p++;
 			if (*p == 'e') {



Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/acpid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- acpid.spec	14 Feb 2007 13:01:46 -0000	1.19
+++ acpid.spec	26 Sep 2007 14:13:22 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch1: acpid-1.0.3-makefile.patch
 Patch2: acpid-1.0.4-warning.patch
 Patch3: acpid-1.0.4-pie.patch
+Patch4: acpid-1.0.4-fd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .warning
 %patch3 -p1 -b .pie
+%patch4 -p1 -b .fd
 
 %build
 make %{?_smp_mflags}
@@ -87,6 +89,9 @@
 fi
 
 %changelog
+* Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.4-8.fc7
+- Fixed leak of a file descriptor (#304761)
+
 * Wed Feb 14 2007 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-7.fc7
 - Dropped /var/log/acpid ownership as per review (225237)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 14:24:52 2007
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Wed, 26 Sep 2007 10:24:52 -0400
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.3, 1.4 nss_compat_ossl.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709261424.l8QEOq8e009239@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9211

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Log Message:
Resolves 306711

Need to revert patch introduced in 0.9.2:

define CERT_NewTempCertificate __CERT_NewTempCertificate



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Sep 2007 17:53:14 -0000	1.3
+++ .cvsignore	26 Sep 2007 14:24:19 -0000	1.4
@@ -1 +1,2 @@
 nss_compat_ossl-0.9.2.tar.gz
+nss_compat_ossl-symbol.patch


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nss_compat_ossl.spec	20 Sep 2007 17:53:15 -0000	1.4
+++ nss_compat_ossl.spec	26 Sep 2007 14:24:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-symbol.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,7 +28,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .symbol
 
 %build
 
@@ -65,6 +66,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 26 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-2
+- Bugzilla #306711, need to define CERT_NewTempCertificate
+
 * Wed Sep 20 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-1
 - update to 0.9.2
 - Enable loading the NSS PKCS#11 pem module


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Sep 2007 17:53:15 -0000	1.3
+++ sources	26 Sep 2007 14:24:19 -0000	1.4
@@ -1 +1,2 @@
 84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz
+325fcb35ab1475f1d5e40b7ecaf27b60  nss_compat_ossl-symbol.patch



From fedora-extras-commits at redhat.com  Wed Sep 26 14:34:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:34:12 -0400
Subject: rpms/desktop-backgrounds/devel sources,1.22,1.23
Message-ID: <200709261434.l8QEYCLC009629@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573

Modified Files:
	sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	26 Sep 2007 14:08:51 -0000	1.22
+++ sources	26 Sep 2007 14:33:39 -0000	1.23
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.1.tar.gz
+84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 14:42:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:42:02 -0400
Subject: rpms/desktop-backgrounds/devel infinity.xml,1.2,NONE
Message-ID: <200709261442.l8QEg2UR009766@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9759

Removed Files:
	infinity.xml 
Log Message:
remove old file



--- infinity.xml DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 14:48:15 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 10:48:15 -0400
Subject: devel/vim README.patches,1.85,1.86 vim.spec,1.177,1.178
Message-ID: <200709261448.l8QEmFFB009882@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9862

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 122


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- README.patches	25 Sep 2007 13:16:28 -0000	1.85
+++ README.patches	26 Sep 2007 14:47:43 -0000	1.86
@@ -148,3 +148,6 @@
   1414  7.1.117  can't check wether Vim was compiled with Gnome
   1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
   1761  7.1.119  crash after setting 'cmdheight' to huge value
+ 17416  7.1.120  can't use valgrind with "make test" to test for memory leaks
+  2350  7.1.121  ":cd %:h" fails when editing file in current directory
+  3732  7.1.122  Mac: building with Aap doesn't work properly


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- vim.spec	25 Sep 2007 13:16:28 -0000	1.177
+++ vim.spec	26 Sep 2007 14:47:43 -0000	1.178
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 119
+%define patchlevel 122
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -179,6 +179,9 @@
 Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
 Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
 Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
+Patch120: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.120
+Patch121: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.121
+Patch122: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.122
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -442,6 +445,9 @@
 %patch117 -p0 
 %patch118 -p0 
 %patch119 -p0 
+%patch120 -p0 
+%patch121 -p0 
+%patch122 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -827,6 +833,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Sep 26 2007 Karsten Hopp <karsten at redhat.com> 7.1.122-1
+- patchlevel 122
+
 * Tue Sep 25 2007 Karsten Hopp <karsten at redhat.com> 7.1.119-1
 - patchlevel 119
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:06:04 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 26 Sep 2007 11:06:04 -0400
Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.4-config.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 smbldap-tools.spec, 1.5, 1.6 sources,
	1.3, 1.4 smbldap-tools-0.9.2-config.patch, 1.2, NONE
Message-ID: <200709261506.l8QF64Dv018690@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18621

Modified Files:
	.cvsignore smbldap-tools.spec sources 
Added Files:
	smbldap-tools-0.9.4-config.patch 
Removed Files:
	smbldap-tools-0.9.2-config.patch 
Log Message:
- update to 0.9.4
- new upstream, new URLs
- drop useradd_option-o enhancement patch, new included upstream
- update config patch
- new script smbldap-userlist included
- convert docs to UTF-8
- HTML docs no longer included with upstream source
- make and include manpages


smbldap-tools-0.9.4-config.patch:

--- NEW FILE smbldap-tools-0.9.4-config.patch ---
--- smbldap.conf	2007-09-26 11:49:23.000000000 +0100
+++ smbldap.conf	2007-09-26 12:11:44.000000000 +0100
@@ -34,12 +34,12 @@
 
 # Put your own SID. To obtain this number do: "net getlocalsid".
 # If not defined, parameter is taking from "net getlocalsid" return
-SID="S-1-5-21-2252255531-4061614174-2474224977"
+#SID="S-1-5-21-2252255531-4061614174-2474224977"
 
 # Domain name the Samba server is in charged.
 # If not defined, parameter is taking from smb.conf configuration file
 # Ex: sambaDomain="IDEALX-NT"
-sambaDomain="DOMSMB"
+#sambaDomain="DOMSMB"
 
 ##############################################################################
 #
@@ -85,15 +85,15 @@
 
 # CA certificate
 # see "man Net::LDAP" in start_tls section for more details
-cafile="/etc/smbldap-tools/ca.pem"
+cafile="/etc/pki/tls/certs/ldapserverca.pem"
 
 # certificate to use to connect to the ldap server
 # see "man Net::LDAP" in start_tls section for more details
-clientcert="/etc/smbldap-tools/smbldap-tools.pem"
+clientcert="/etc/pki/tls/certs/ldapclient.pem"
 
 # key certificate to use to connect to the ldap server
 # see "man Net::LDAP" in start_tls section for more details
-clientkey="/etc/smbldap-tools/smbldap-tools.key"
+clientkey="/etc/pki/tls/certs/ldapclientkey.pem"
 
 # LDAP Suffix
 # Ex: suffix=dc=IDEALX,dc=ORG
@@ -102,7 +102,7 @@
 # Where are stored Users
 # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for usersdn
-usersdn="ou=Users,${suffix}"
+usersdn="ou=People,${suffix}"
 
 # Where are stored Computers
 # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
@@ -112,10 +112,10 @@
 # Where are stored Groups
 # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
-groupsdn="ou=Groups,${suffix}"
+groupsdn="ou=Group,${suffix}"
 
 # Where are stored Idmap entries (used if samba is a domain member server)
-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
 idmapdn="ou=Idmap,${suffix}"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2007 15:18:40 -0000	1.3
+++ .cvsignore	26 Sep 2007 15:05:32 -0000	1.4
@@ -1,2 +1 @@
-smbldap-tools-0.9.2a.tgz
-smbldap-useradd_option-o_version2.tar.gz
+smbldap-tools-0.9.4.tgz


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smbldap-tools.spec	23 Aug 2007 15:18:40 -0000	1.5
+++ smbldap-tools.spec	26 Sep 2007 15:05:32 -0000	1.6
@@ -1,13 +1,12 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.2a
+Version:	0.9.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
-URL:		http://sourceforge.net/projects/smbldap-tools/
-Source0:	http://downloads.sf.net/smbldap-tools/smbldap-tools-%{version}.tgz
-Source1:	http://downloads.sf.net/smbldap-tools/smbldap-useradd_option-o_version2.tar.gz
-Patch0:		smbldap-tools-0.9.2-config.patch
+URL:		https://gna.org/projects/smbldap-tools/
+Source0:	http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz
+Patch0:		smbldap-tools-0.9.4-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -21,19 +20,26 @@
 groups and passwords.
 
 %prep
-%setup -q -n smbldap-tools-0.9.2 -a 1
-%{__patch} -p0 < smbldap-useradd_option-o_version1.patch
+%setup -q
 %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g;
 		  s|/opt/IDEALX||g;' \
-	Makefile smb.conf smbldap.conf \
-	smbldap-populate smbldap_tools.pm configure.pl \
-	doc/html/*.html
+	smbldap_tools.pm configure.pl
 %patch0 -p0
 
 # Don't want these in %{_sbindir}...
 %{__mv} smbldap-tools.spec original-smbldap-tools.spec
-%{__mv} smbldap-useradd_option-o_version1.txt useradd-patch.txt
-%{__rm} smbldap-useradd_option-o_version1.patch
+
+# Convert docs to UTF-8 where needed
+for f in CONTRIBUTORS README; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf8
+	%{__mv} -f ${f}.utf8 ${f}
+done
+
+# Generate manpages
+%{__mkdir} manpages
+for i in smbldap-*; do
+	/usr/bin/pod2man --section=8 ${i} > manpages/${i}.8
+done
 
 # Figure out where ssl stuff goes
 %define use_pki %(if [ -f %{_sysconfdir}/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
@@ -45,10 +51,12 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
-%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -d -m0755 %{buildroot}%{_sbindir}/
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man8/
+%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}/
+%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}/
+%{__install} -p -m0644 manpages/* %{buildroot}%{_mandir}/man8/
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}/
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -58,7 +66,7 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
-%doc configure.pl *.conf doc/* useradd-patch.txt
+%doc configure.pl *.conf doc/*.conf doc/migration_scripts/ doc/*.pdf
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
@@ -70,12 +78,24 @@
 %{_sbindir}/smbldap-populate
 %{_sbindir}/smbldap-useradd
 %{_sbindir}/smbldap-userdel
+%{_sbindir}/smbldap-userlist
 %{_sbindir}/smbldap-usermod
 %{_sbindir}/smbldap-userinfo
 %{_sbindir}/smbldap-usershow
 %{perl_vendorlib}/smbldap_tools.pm
+%{_mandir}/man8/*
 
 %changelog
+* Wed Sep 26 2007 Paul Howarth <paul at city-fan.org> 0.9.4-1
+- update to 0.9.4
+- new upstream, new URLs
+- drop useradd_option-o enhancement patch, new included upstream
+- update config patch
+- new script smbldap-userlist included
+- convert docs to UTF-8
+- HTML docs no longer included with upstream source
+- make and include manpages
+
 * Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 0.9.2a-1
 - update URLs, as original upstream source is now dead
 - apply useradd_option-o enhancement patch from upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Aug 2007 15:18:40 -0000	1.3
+++ sources	26 Sep 2007 15:05:32 -0000	1.4
@@ -1,2 +1 @@
-bb8eb44adb4e7946de5b486acf480c24  smbldap-tools-0.9.2a.tgz
-eb0ffa04c9ddfc8205524b298309141f  smbldap-useradd_option-o_version2.tar.gz
+5c9a71336fcb1af06c5766ab88e50a03  smbldap-tools-0.9.4.tgz


--- smbldap-tools-0.9.2-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 15:09:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 11:09:07 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.48,1.49
Message-ID: <200709261509.l8QF97Gl018896@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18859

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- desktop-backgrounds.spec	26 Sep 2007 13:47:10 -0000	1.48
+++ desktop-backgrounds.spec	26 Sep 2007 15:08:35 -0000	1.49
@@ -105,6 +105,7 @@
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
 %{_datadir}/backgrounds/images/*.png
+%{_datadir}/backgrounds/images/*.jpg
 %{_datadir}/backgrounds/infinity/*.png
 %{_datadir}/backgrounds/infinity/infinity.xml
 %dir %{_datadir}/gnome-background-properties



From fedora-extras-commits at redhat.com  Wed Sep 26 15:18:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 26 Sep 2007 11:18:07 -0400
Subject: rpms/stellarium/devel stellarium.desktop, 1.2, 1.3 stellarium.spec, 
	1.32, 1.33
Message-ID: <200709261518.l8QFI7Tv019252@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19202

Modified Files:
	stellarium.desktop stellarium.spec 
Log Message:
Add opengl-game-wrapper support


Index: stellarium.desktop
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stellarium.desktop	27 Jun 2007 15:26:54 -0000	1.2
+++ stellarium.desktop	26 Sep 2007 15:17:31 -0000	1.3
@@ -4,7 +4,7 @@
 Comment=A real-time nightsky renderer
 Categories=Education;Science;Astronomy;
 Icon=stellarium.png
-Exec=stellarium
+Exec=stellarium-wrapper
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- stellarium.spec	9 Aug 2007 19:37:52 -0000	1.32
+++ stellarium.spec	26 Sep 2007 15:17:31 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -24,6 +24,8 @@
 BuildRequires:	gettext-devel
 BuildRequires:	boost-devel
 
+Requires:	opengl-games-utils
+
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
@@ -65,6 +67,8 @@
 rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico}
 cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
+ln -s opengl-game-wrapper $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
+
 %find_lang %{name}
 
 %clean
@@ -74,6 +78,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/stellarium
+%{_bindir}/stellarium-wrapper
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
@@ -83,11 +88,14 @@
 %doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
+* Wed Sep 26 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-5
+- Add usage of opengl-game-wrapper (BZ #304851)
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-4
-- Brbuild
+- Rebuild
 
 * Tue Aug  7 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
-- Solve wekkday displaying issue (#250621)
+- Solve weakday displaying issue (#250621)
 
 * Wed Jun 27 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
 - Change category of the desktop entry (#241440)



From fedora-extras-commits at redhat.com  Wed Sep 26 15:18:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 11:18:10 -0400
Subject: rpms/control-center/devel .cvsignore, 1.63, 1.64 control-center.spec,
	1.302, 1.303 sources, 1.66, 1.67
Message-ID: <200709261518.l8QFIARA019259@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19211

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	17 Sep 2007 19:40:42 -0000	1.63
+++ .cvsignore	26 Sep 2007 15:17:38 -0000	1.64
@@ -1 +1 @@
-gnome-control-center-2.20.0.tar.bz2
+gnome-control-center-2.20.0.1.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- control-center.spec	17 Sep 2007 19:40:42 -0000	1.302
+++ control-center.spec	26 Sep 2007 15:17:38 -0000	1.303
@@ -21,7 +21,7 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -73,6 +73,12 @@
 # change default preferred apps to programs we ship
 Patch99: control-center-2.19.91-default-apps.patch
 
+Patch200: 26_add_touchpad_to_mouse_settings.patch
+Patch201: 27_add_touchpad_to_settings_daemon.patch
+Patch202: 28_fixup_touchpad_config.patch
+Patch203: 95_desktop-effects-integration.patch
+Patch204: composite.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -203,6 +209,12 @@
 #%patch98 -p1 -b .filesel
 %patch99 -p1 -b .default-apps
 
+%patch200 -p1 -b .touchpad-mouse-settings
+%patch201 -p1 -b .touchpad-settings-daemon
+%patch202 -p1 -b .touchpad-fixup
+%patch203 -p1 -b .desktop-effects-integration
+%patch204 -p1 -b .composite
+
 %build
 
 autoreconf
@@ -386,6 +398,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1 (small bug fixes)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	17 Sep 2007 19:40:42 -0000	1.66
+++ sources	26 Sep 2007 15:17:38 -0000	1.67
@@ -1 +1 @@
-a3d5f41cd9e30e8f777c5ae43070557b  gnome-control-center-2.20.0.tar.bz2
+2c14dab486227fe15451468780f11b74  gnome-control-center-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 15:20:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 11:20:36 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.60,
	1.61 selinux-policy.spec, 1.495, 1.496
Message-ID: <200709261520.l8QFKaMl019552@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19370

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-45
- Allow nsswitch apps to read samba_var_t
- Changes to allow setroubleshoot to run


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policy-20070501.patch	22 Sep 2007 12:17:31 -0000	1.60
+++ policy-20070501.patch	26 Sep 2007 15:20:00 -0000	1.61
@@ -7550,7 +7550,7 @@
  /usr/libexec/postfix/(n)?qmgr -- gen_context(system_u:object_r:postfix_qmgr_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.6.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-09-26 11:18:04.000000000 -0400
 @@ -41,6 +41,7 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -7559,7 +7559,16 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
  	read_files_pattern(postfix_$1_t,postfix_etc_t,postfix_etc_t)
-@@ -66,6 +67,7 @@
+@@ -56,6 +57,8 @@
+ 	allow postfix_$1_t postfix_var_run_t:file manage_file_perms;
+ 	files_pid_filetrans(postfix_$1_t,postfix_var_run_t,file)
+ 
++	auth_use_nsswitch(postfix_$1_t)
++
+ 	kernel_read_system_state(postfix_$1_t)
+ 	kernel_read_network_state(postfix_$1_t)
+ 	kernel_read_all_sysctls(postfix_$1_t)
+@@ -66,6 +69,7 @@
  
  	fs_search_auto_mountpoints(postfix_$1_t)
  	fs_getattr_xattr_fs(postfix_$1_t)
@@ -7567,19 +7576,19 @@
  
  	term_dontaudit_use_console(postfix_$1_t)
  
-@@ -137,10 +139,8 @@
+@@ -137,11 +141,6 @@
  	corenet_tcp_connect_all_ports(postfix_$1_t)
  	corenet_sendrecv_all_client_packets(postfix_$1_t)
  
 -	sysnet_read_config(postfix_$1_t)
 -
- 	optional_policy(`
+-	optional_policy(`
 -		nis_use_ypbind(postfix_$1_t)
-+		auth_use_nsswitch(postfix_$1_t)
- 	')
+-	')
  ')
  
-@@ -274,6 +274,42 @@
+ ########################################
+@@ -274,6 +273,42 @@
  
  ########################################
  ## <summary>
@@ -7622,7 +7631,7 @@
  ##	Do not audit attempts to use
  ##	postfix master process file
  ##	file descriptors.
-@@ -439,6 +475,25 @@
+@@ -439,6 +474,25 @@
  
  ########################################
  ## <summary>
@@ -7648,7 +7657,7 @@
  ##	Execute postfix user mail programs
  ##	in their respective domains.
  ## </summary>
-@@ -455,3 +510,22 @@
+@@ -455,3 +509,22 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -8588,7 +8597,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-18 08:18:51.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-24 17:17:58.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -8625,7 +8634,7 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  ')
  
-@@ -250,11 +272,55 @@
+@@ -250,11 +272,74 @@
  	')
  
  	files_search_var($1)
@@ -8678,10 +8687,29 @@
 +
 +########################################
 +## <summary>
++##	dontaudit the specified domain to
++##	write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_dontaudit_write_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	dontaudit $1 samba_var_t:file write;
++')
++
++########################################
++## <summary>
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +443,121 @@
+@@ -377,3 +462,121 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -8805,7 +8833,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-18 08:17:55.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-25 17:10:56.000000000 -0400
 @@ -16,6 +16,14 @@
  
  ## <desc>
@@ -8950,7 +8978,7 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -290,12 +324,16 @@
+@@ -290,8 +324,6 @@
  miscfiles_read_localization(smbd_t)
  miscfiles_read_public_files(smbd_t)
  
@@ -8959,6 +8987,9 @@
  userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
+@@ -312,6 +344,12 @@
+ 	miscfiles_manage_public_files(smbd_t)
+ ') 
  
 +tunable_policy(`samba_domain_controller',`
 +	usermanage_domtrans_passwd(smbd_t)
@@ -8966,9 +8997,9 @@
 +	usermanage_domtrans_groupadd(smbd_t)
 +')
 +
- ifdef(`hide_broken_symptoms', `
- 	files_dontaudit_getattr_default_dirs(smbd_t)
- 	files_dontaudit_getattr_boot_dirs(smbd_t)
+ # Support Samba sharing of NFS mount points
+ tunable_policy(`samba_share_nfs',`
+ 	fs_manage_nfs_dirs(smbd_t)
 @@ -319,6 +357,14 @@
  ')
  
@@ -9105,7 +9136,7 @@
  ')
  
  ########################################
-@@ -530,22 +590,30 @@
+@@ -530,22 +590,36 @@
  # SWAT Local policy
  #
  
@@ -9125,12 +9156,19 @@
 +allow swat_t nmbd_port_t:udp_socket name_bind;
 +allow swat_t nmbd_t:process { signal signull };
 +allow swat_t nmbd_var_run_t:file { lock read unlink };
- 
- rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
- 
++
 +init_read_utmp(swat_t)
 +init_dontaudit_write_utmp(swat_t)
 +
++manage_dirs_pattern(swat_t,samba_log_t,samba_log_t)
++create_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
++manage_files_pattern(swat_t,samba_etc_t,samba_etc_t)
++
++manage_files_pattern(swat_t,samba_var_t,samba_var_t)
++files_list_var_lib(swat_t)
+ 
  append_files_pattern(swat_t,samba_log_t,samba_log_t)
  
 -allow swat_t smbd_exec_t:file execute ;
@@ -9142,7 +9180,7 @@
  
  allow swat_t smbd_t:process signull;
  
-@@ -558,7 +626,11 @@
+@@ -558,7 +632,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -9155,7 +9193,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -582,23 +654,24 @@
+@@ -582,23 +660,24 @@
  
  dev_read_urand(swat_t)
  
@@ -9182,7 +9220,7 @@
  optional_policy(`
  	cups_read_rw_config(swat_t)
  	cups_stream_connect(swat_t)
-@@ -612,32 +685,30 @@
+@@ -612,32 +691,30 @@
  	kerberos_use(swat_t)
  ')
  
@@ -9222,7 +9260,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +716,8 @@
+@@ -645,6 +722,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -9231,7 +9269,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +755,9 @@
+@@ -682,7 +761,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -9241,7 +9279,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +770,6 @@
+@@ -695,9 +776,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -9251,7 +9289,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +785,6 @@
+@@ -713,10 +791,6 @@
  ')
  
  optional_policy(`
@@ -9262,7 +9300,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +804,7 @@
+@@ -736,6 +810,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -9270,7 +9308,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +832,64 @@
+@@ -763,4 +838,64 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -9417,7 +9455,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-09-26 11:13:13.000000000 -0400
 @@ -28,12 +28,11 @@
  #
  
@@ -9432,23 +9470,41 @@
  
  # database files
  allow setroubleshootd_t setroubleshoot_var_lib_t:dir setattr;
-@@ -51,6 +50,8 @@
- manage_sock_files_pattern(setroubleshootd_t,setroubleshoot_var_run_t,setroubleshoot_var_run_t)
- files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
+@@ -67,6 +66,7 @@
+ corenet_sendrecv_smtp_client_packets(setroubleshootd_t)
+ 
+ dev_read_urand(setroubleshootd_t)
++dev_read_sysfs(setroubleshootd_t)
+ 
+ domain_dontaudit_search_all_domains_state(setroubleshootd_t)
+ 
+@@ -75,12 +75,17 @@
+ files_getattr_all_dirs(setroubleshootd_t)
+ files_getattr_all_files(setroubleshootd_t)
+ 
++fs_getattr_all_dirs(setroubleshootd_t)
++fs_getattr_all_files(setroubleshootd_t)
++
+ selinux_get_enforce_mode(setroubleshootd_t)
+ selinux_validate_context(setroubleshootd_t)
+ 
+ term_dontaudit_use_all_user_ptys(setroubleshootd_t)
+ term_dontaudit_use_all_user_ttys(setroubleshootd_t)
  
 +auth_use_nsswitch(setroubleshootd_t)
 +
- kernel_read_kernel_sysctls(setroubleshootd_t)
- kernel_read_system_state(setroubleshootd_t)
- kernel_read_network_state(setroubleshootd_t)
-@@ -111,7 +112,3 @@
- 	rpm_dontaudit_manage_db(setroubleshootd_t)
-         rpm_use_script_fds(setroubleshootd_t)
+ init_read_utmp(setroubleshootd_t)
+ init_dontaudit_write_utmp(setroubleshootd_t)
+ 
+@@ -113,5 +118,7 @@
  ')
--
--optional_policy(`
+ 
+ optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
--')
++	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
++	dbus_send_system_bus(setroubleshootd_t)
++	dbus_connect_system_bus(setroubleshootd_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.6.4/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2007-08-07 09:42:35.000000000 -0400
@@ -10154,7 +10210,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.6.4/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-09-24 17:17:32.000000000 -0400
 @@ -27,11 +27,9 @@
  	domain_type($1_chkpwd_t)
  	domain_entry_file($1_chkpwd_t,chkpwd_exec_t)
@@ -10324,7 +10380,16 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -1391,3 +1425,114 @@
+@@ -1357,6 +1391,8 @@
+ 
+ 	optional_policy(`
+ 		samba_stream_connect_winbind($1)
++		samba_read_var_files($1)
++		samba_dontaudit_write_var_files($1)
+ 	')
+ ')
+ 
+@@ -1391,3 +1427,114 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -12775,7 +12840,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-18 08:18:22.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-24 17:20:49.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -12792,7 +12857,15 @@
  type unconfined_t;
  type unconfined_exec_t;
  init_system_domain(unconfined_t,unconfined_exec_t)
-@@ -50,6 +59,8 @@
+@@ -28,6 +37,7 @@
+ ifdef(`targeted_policy',`
+ 	allow unconfined_t self:system syslog_read;
+ 	dontaudit unconfined_t self:capability sys_module;
++	dontaudit unconfined_t self:dir write;
+ 
+ 	domain_auto_trans(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
+ 
+@@ -50,6 +60,8 @@
  	userdom_unconfined(unconfined_t)
  	userdom_priveleged_home_dir_manager(unconfined_t)
  
@@ -12801,7 +12874,7 @@
  	optional_policy(`
  		ada_domtrans(unconfined_t)
  	')
-@@ -63,10 +74,6 @@
+@@ -63,10 +75,6 @@
  	')
  
  	optional_policy(`
@@ -12812,7 +12885,7 @@
  		init_dbus_chat_script(unconfined_t)
  
  		dbus_stub(unconfined_t)
-@@ -93,6 +100,7 @@
+@@ -93,6 +101,7 @@
  
  		optional_policy(`
  			networkmanager_dbus_chat(unconfined_t)
@@ -12820,7 +12893,7 @@
  		')
  
  		optional_policy(`
-@@ -153,11 +161,14 @@
+@@ -153,11 +162,14 @@
  
  	optional_policy(`
  		rpm_domtrans(unconfined_t)
@@ -12835,7 +12908,7 @@
  	')
  
  	optional_policy(`
-@@ -192,6 +203,9 @@
+@@ -192,6 +204,9 @@
  	optional_policy(`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
@@ -12845,7 +12918,7 @@
  ')
  
  ########################################
-@@ -200,10 +214,18 @@
+@@ -200,10 +215,18 @@
  #
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- selinux-policy.spec	22 Sep 2007 12:17:31 -0000	1.495
+++ selinux-policy.spec	26 Sep 2007 15:20:00 -0000	1.496
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 44%{?dist}
+Release: 45%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-45
+- Allow nsswitch apps to read samba_var_t
+- Changes to allow setroubleshoot to run
+
 * Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
 - Fix /dev/input/uinput 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:20:50 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 11:20:50 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch,1.3,1.4
Message-ID: <200709261520.l8QFKo89019599@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	xen-pvfb-04-compat.patch 
Log Message:
Fixed typo in method name

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-pvfb-04-compat.patch	25 Sep 2007 04:57:36 -0000	1.3
+++ xen-pvfb-04-compat.patch	26 Sep 2007 15:20:15 -0000	1.4
@@ -452,7 +452,7 @@
 +	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
-+static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
 +{
 +  int mode;
 +  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))



From fedora-extras-commits at redhat.com  Wed Sep 26 15:32:49 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 26 Sep 2007 11:32:49 -0400
Subject: rpms/sugar/OLPC-2 sources,1.62,1.63 sugar.spec,1.73,1.74
Message-ID: <200709261532.l8QFWn0M020031@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	25 Sep 2007 19:54:59 -0000	1.62
+++ sources	26 Sep 2007 15:32:16 -0000	1.63
@@ -1 +1 @@
-338ebbbda341a2bddb416e60c5b9a5b5  sugar-0.65-git5a595ea04e.tar.bz2
+de11dc9d6a1bb99b36f7beeea453e210  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sugar.spec	25 Sep 2007 19:54:59 -0000	1.73
+++ sugar.spec	26 Sep 2007 15:32:16 -0000	1.74
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070925git
+%define alphatag 20070926git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.58.%{alphatag}5a595ea04e
+Release: 0.59.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
+- New snapshot
+
 * Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:33:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 11:33:17 -0400
Subject: rpms/thunderbird/devel thunderbird-2.0-enable-debug.patch, NONE,
	1.1 thunderbird.sh.in, 1.7, 1.8 thunderbird.spec, 1.105, 1.106
Message-ID: <200709261533.l8QFXHu9020072@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20008

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Added Files:
	thunderbird-2.0-enable-debug.patch 
Log Message:
Fixed #242657 - firefox -g doesn't work

thunderbird-2.0-enable-debug.patch:

--- NEW FILE thunderbird-2.0-enable-debug.patch ---
diff -up mozilla/mail/app/Makefile.in.old mozilla/mail/app/Makefile.in
--- mozilla/mail/app/Makefile.in.old	2007-02-28 07:52:59.000000000 +0100
+++ mozilla/mail/app/Makefile.in	2007-09-26 16:53:51.000000000 +0200
@@ -257,7 +257,7 @@ libs:: thunderbird
 	$(INSTALL) $< $(DIST)/bin
 
 install:: thunderbird
-	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+	$(SYSINSTALL) $< $(DESTDIR)$(mozappdir)
 
 GARBAGE += thunderbird
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)


Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird.sh.in	12 Apr 2007 20:32:40 -0000	1.7
+++ thunderbird.sh.in	26 Sep 2007 15:32:44 -0000	1.8
@@ -14,7 +14,7 @@
 MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
 export MOZILLA_FIVE_HOME MRE_HOME
 
-MOZ_PROGRAM=$MRE_HOME/thunderbird-bin
+MOZ_PROGRAM=$MRE_HOME/thunderbird
 #MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird"
 MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote" 
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- thunderbird.spec	25 Sep 2007 20:13:47 -0000	1.105
+++ thunderbird.spec	26 Sep 2007 15:32:44 -0000	1.106
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -64,6 +64,7 @@
 Patch104:       firefox-1.5-dnd-nograb.patch
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch111:       thunderbird-path.patch
+Patch112:       thunderbird-2.0-enable-debug.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -147,6 +148,7 @@
 #%patch104 -p1 -b .dnd-nograb
 %patch106 -p1 -b .indicator-crash
 %patch111 -p1 -b .path
+%patch112 -p1 -b .debug
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -302,6 +304,7 @@
 %{mozappdir}/res
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/thunderbird-bin
+%{mozappdir}/thunderbird
 %{mozappdir}/updater
 %{mozappdir}/*.so
 
@@ -318,6 +321,9 @@
 #===============================================================================
 
 %changelog
+* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+- Fixed #242657 - firefox -g doesn't work
+
 * Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
 - Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:34:42 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 11:34:42 -0400
Subject: rpms/thunderbird/devel thunderbird.spec,1.106,1.107
Message-ID: <200709261534.l8QFYg5T020199@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082

Modified Files:
	thunderbird.spec 
Log Message:
fixed release


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- thunderbird.spec	26 Sep 2007 15:32:44 -0000	1.106
+++ thunderbird.spec	26 Sep 2007 15:34:07 -0000	1.107
@@ -321,7 +321,7 @@
 #===============================================================================
 
 %changelog
-* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-6
 - Fixed #242657 - firefox -g doesn't work
 
 * Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5



From fedora-extras-commits at redhat.com  Wed Sep 26 15:44:02 2007
From: fedora-extras-commits at redhat.com (Chris Lalancette (clalance))
Date: Wed, 26 Sep 2007 11:44:02 -0400
Subject: rpms/xen/devel pygrub-dont-exec.patch, NONE,
	1.1 xen-qemu-ne2000-CVE-2007-1321.patch, NONE, 1.1 xen.spec,
	1.190, 1.191
Message-ID: <200709261544.l8QFi2Hc020696@cvs-int.fedora.redhat.com>

Author: clalance

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672

Modified Files:
	xen.spec 
Added Files:
	pygrub-dont-exec.patch xen-qemu-ne2000-CVE-2007-1321.patch 
Log Message:
- Fixes for CVE-2007-1321, CVE-2007-4993



pygrub-dont-exec.patch:

--- NEW FILE pygrub-dont-exec.patch ---
diff -up xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec xen-3.1.0-src/tools/pygrub/src/GrubConf.py
--- xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec	2007-09-25 15:20:14.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-25 15:20:25.000000000 -0400
@@ -101,7 +101,7 @@ class GrubImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -142,11 +142,11 @@ class GrubImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "title": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "kernel": "self.kernel",
-                 "initrd": "self.initrd",
+    commands = { "title": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "kernel": "kernel",
+                 "initrd": "initrd",
                  "chainloader": None,
                  "module": None}
         
@@ -195,7 +195,7 @@ class GrubConfigFile(object):
             (com, arg) = grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:
@@ -208,7 +208,7 @@ class GrubConfigFile(object):
         (com, arg) = grub_exact_split(line, 2)
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored directive %s" %(com,))
         else:
@@ -236,12 +236,12 @@ class GrubConfigFile(object):
     splash = property(get_splash, set_splash)
 
     # set up command handlers
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
-                 "fallback": "self.fallback",
-                 "hiddenmenu": "self.hiddenmenu",
-                 "splashimage": "self.splash",
-                 "password": "self.password" }
+    commands = { "default": "default",
+                 "timeout": "timeout",
+                 "fallback": "fallback",
+                 "hiddenmenu": "hiddenmenu",
+                 "splashimage": "splash",
+                 "password": "password" }
     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
               "pager", "partnew", "parttype", "rarp", "serial",
               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff -up xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec xen-3.1.0-src/tools/pygrub/src/LiloConf.py
--- xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec	2007-09-25 15:20:18.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-25 15:20:23.000000000 -0400
@@ -30,7 +30,7 @@ class LiloImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -56,12 +56,12 @@ class LiloImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "label": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "image": "self.kernel",
-                 "initrd": "self.initrd",
-                 "append": "self.args",
+    commands = { "label": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "image": "kernel",
+                 "initrd": "initrd",
+                 "append": "args",
                  "read-only": None,
                  "chainloader": None,
                  "module": None}
@@ -111,7 +111,7 @@ class LiloConfigFile(object):
             (com, arg) = GrubConf.grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:

xen-qemu-ne2000-CVE-2007-1321.patch:

--- NEW FILE xen-qemu-ne2000-CVE-2007-1321.patch ---
diff -up xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c
--- xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve	2007-09-25 10:27:44.000000000 -0400
+++ xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c	2007-09-25 10:27:47.000000000 -0400
@@ -252,7 +252,7 @@ static void ne2000_receive(void *opaque,
 {
     NE2000State *s = opaque;
     uint8_t *p;
-    int total_len, next, avail, len, index, mcast_idx;
+    unsigned int total_len, next, avail, len, index, mcast_idx;
     uint8_t buf1[60];
     static const uint8_t broadcast_macaddr[6] = 
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -327,7 +327,10 @@ static void ne2000_receive(void *opaque,
 
     /* write packet data */
     while (size > 0) {
-        avail = s->stop - index;
+        if (index <= s->stop)
+            avail = s->stop - index;
+        else
+            avail = 0;
         len = size;
         if (len > avail)
             len = avail;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- xen.spec	25 Sep 2007 05:00:17 -0000	1.190
+++ xen.spec	26 Sep 2007 15:43:29 -0000	1.191
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -51,6 +51,11 @@
 # Performance fix for listing domains
 Patch280: xen-xs-transactions.patch
 
+# CVE-2007-1321
+Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
+# CVE-2007-4993
+Patch601: pygrub-dont-exec.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -158,6 +163,10 @@
 # performance patch
 %patch280 -p1
 
+# CVE patches
+%patch600 -p1
+%patch601 -p1
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
 
@@ -278,6 +287,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-10.fc8
+- QEmu NE2000 overflow check - CVE-2007-1321
+- Pygrub guest escape - CVE-2007-4993
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
 - Fix generation of manual pages (rhbz #250791)
 - Really fix FC-6 32-on-64 guests



From fedora-extras-commits at redhat.com  Wed Sep 26 15:53:50 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 11:53:50 -0400
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.5,1.6
Message-ID: <200709261553.l8QFrohV021014@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20996

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
add missing buildreq



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Finance-Quote.spec	18 Sep 2007 14:50:13 -0000	1.5
+++ perl-Finance-Quote.spec	26 Sep 2007 15:53:18 -0000	1.6
@@ -9,7 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:	perl(HTML::TableExtract)
+BuildRequires:	perl(HTML::TableExtract) perl(ExtUtils::MakeMaker)
 
 %description
 This module retrieves stock and mutual fund quotes from various exchanges
@@ -44,6 +44,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 26 2007 Bill Nottingham <notting at redhat.com>
+- add perl(ExtUtils::MakeMaker) buildreq
+
 * Tue Sep 18 2007 Bill Nottingham <notting at redhat.com>
 - fix source download URL
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:57:25 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 26 Sep 2007 11:57:25 -0400
Subject: fedora-security/audit fc7,1.121,1.122
Message-ID: <200709261557.l8QFvPem021085@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067/audit

Modified Files:
	fc7 
Log Message:
php non-issue



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc7	25 Sep 2007 09:39:20 -0000	1.121
+++ fc7	26 Sep 2007 15:57:23 -0000	1.122
@@ -151,6 +151,7 @@
 CVE-2007-3378 ignore (php) safe mode escape
 CVE-2007-3377 version (perl-Net-DNS, fixed 0.60) #245612 [since FEDORA-2007-0668]
 CVE-2007-3304 backport (httpd) #244665 [since FEDORA-2007-0704]
+CVE-2007-3294 ignore (php-extras) win only
 CVE-2007-3257 backport (evolution) #244283 [since FEDORA-2007-0464]
 CVE-2007-3241 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3240 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]



From fedora-extras-commits at redhat.com  Wed Sep 26 16:00:30 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 26 Sep 2007 12:00:30 -0400
Subject: rpms/iptables/devel iptables.init, 1.16, 1.17 iptables.spec, 1.53,
	1.54
Message-ID: <200709261600.l8QG0Uub021263@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21176

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not start ip6tables if ipv6 is blacklisted (rhbz#236888)
- use simpler fix for (rhbz#295611)
  Thanks to Linus Torvalds for the patch.




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- iptables.init	24 Sep 2007 16:03:24 -0000	1.16
+++ iptables.init	26 Sep 2007 15:59:58 -0000	1.17
@@ -32,6 +32,12 @@
     exit 5
 fi
 
+if [ "${IPV}" = "ip6" ] \
+    && grep -qIs "^blacklist\W${_IPV}" /etc/modprobe.conf /etc/modprobe.d/* ; then
+    echo $"$0: ${_IPV} is blacklisted."
+    exit 0
+fi
+
 # Old or new modutils
 /sbin/modprobe --version 2>&1 | grep -q module-init-tools \
     && NEW_MODUTILS=1 \
@@ -52,26 +58,9 @@
 NF_MODULES=(${IPV}_tables nf_conntrack_${_IPV})
 NF_MODULES_COMMON=(x_tables nf_conntrack) # Used by netfilter v4 and v6
 
-# Are netfilter modules loaded?
-MODULES_LOADED=0
-for mod in ${NF_MODULES[*]} ${NF_MODULES_COMMON[*]}; do
-    $(lsmod | grep -q ^${mod} | awk '{print $1}')
-    if [ $? -eq 0 ]; then
-	MODULES_LOADED=1
-	break
-    fi
-done
-
 # Get active tables
 NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
 
-# Is netfilter compiled into the kernel?
-[ $MODULES_LOADED -eq 0 -a -n "$NF_TABLES" ] && COMPILED_IN=1 || COMPILED_IN=0
-
-# Get status (quicker than status function and honour lock file)
-[ ! -f "$VAR_SUBSYS_IPTABLES" -o ! -e "$PROC_IPTABLES_NAMES" \
-    -o -z "$NF_TABLES" ] && running=0 || running=1
-
 
 rmmod_r() {
     # Unload module with all referring modules.
@@ -324,13 +313,11 @@
 
 case "$1" in
     start)
-	[ $running -eq 1 -a $COMPILED_IN -eq 0 ] && exit 0
+	[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0
 	start
 	RETVAL=$?
 	;;
     stop)
-	# stop firewall, even if manually configured
-	[ $running -eq 1 -o $MODULES_LOADED -eq 1 ] || exit 0
 	[ "x$IPTABLES_SAVE_ON_STOP" = "xyes" ] && save
 	stop
 	RETVAL=$?
@@ -340,7 +327,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ $running -eq 1 ] || exit 0
+	[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- iptables.spec	24 Sep 2007 16:03:24 -0000	1.53
+++ iptables.spec	26 Sep 2007 15:59:58 -0000	1.54
@@ -153,6 +153,11 @@
 %endif
 
 %changelog
+* Wed Sep 26 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4.1
+- do not start ip6tables if ipv6 is blacklisted (rhbz#236888)
+- use simpler fix for (rhbz#295611)
+  Thanks to Linus Torvalds for the patch.
+
 * Mon Sep 24 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4
 - fixed IPv6 reject type (rhbz#295181)
 - fixed init script: start, stop and status



From fedora-extras-commits at redhat.com  Wed Sep 26 16:01:30 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 26 Sep 2007 12:01:30 -0400
Subject: rpms/iptables/devel iptables.spec,1.54,1.55
Message-ID: <200709261601.l8QG1UCu027408@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21324

Modified Files:
	iptables.spec 
Log Message:
- new release 4.1



Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- iptables.spec	26 Sep 2007 15:59:58 -0000	1.54
+++ iptables.spec	26 Sep 2007 16:00:58 -0000	1.55
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 4%{?dist}
+Release: 4.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config



From fedora-extras-commits at redhat.com  Wed Sep 26 16:07:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 12:07:32 -0400
Subject: rpms/akode/devel akode.spec,1.12,1.13
Message-ID: <200709261607.l8QG7WgY027666@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27648

Modified Files:
	akode.spec 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
- BR: pulseaudio-libs-devel



Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/devel/akode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- akode.spec	21 Aug 2007 20:28:17 -0000	1.12
+++ akode.spec	26 Sep 2007 16:06:59 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 BuildRequires: libvorbis-devel
 BuildRequires: libtool
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
-%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
 
 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
+- BR: pulseaudio-libs-devel
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8
 - -libsamplerate: License: GPLv2+
 - omit oss_sink



From fedora-extras-commits at redhat.com  Wed Sep 26 16:11:49 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 12:11:49 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.8.bz2.sign, NONE, 1.1 .cvsignore, 1.633,
	1.634 kernel-2.6.spec, 1.3345, 1.3346 sources, 1.596,
	1.597 upstream, 1.520, 1.521 patch-2.6.22.7.bz2.sign, 1.1, NONE
Message-ID: <200709261611.l8QGBnxG027863@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27838

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.22.8.bz2.sign 
Removed Files:
	patch-2.6.22.7.bz2.sign 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.8



--- NEW FILE patch-2.6.22.8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+KYdyGugalF9Dw4RAsbRAJ9c2aBbDRo/TePDZfUzM+j/nJMzRgCfcBdc
BzNSm1llvEs6z0WgGyMZqvg=
=llTN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- .cvsignore	21 Sep 2007 23:16:31 -0000	1.633
+++ .cvsignore	26 Sep 2007 16:11:16 -0000	1.634
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.7.bz2
+patch-2.6.22.8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3345
retrieving revision 1.3346
diff -u -r1.3345 -r1.3346
--- kernel-2.6.spec	21 Sep 2007 23:16:31 -0000	1.3345
+++ kernel-2.6.spec	26 Sep 2007 16:11:16 -0000	1.3346
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 7
+%define stable_update 8
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1093,14 +1093,14 @@
 
 %endif
 
+# -stable RC
+# ApplyPatch patch-2.6.22.9-rc1.patch
+
 # 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
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
-# -stable RC
-# ApplyPatch patch-2.6.22.6-rc1.patch
-
 %if !%{nopatches}
 
 # Revert -stable pieces we get from elsewhere
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.8
+
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- sources	21 Sep 2007 23:16:31 -0000	1.596
+++ sources	26 Sep 2007 16:11:16 -0000	1.597
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-11d56c9918810694f32a172ba4788a83  patch-2.6.22.7.bz2
+957192637e6830ba43bad2d9f9ba8324  patch-2.6.22.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- upstream	21 Sep 2007 23:16:31 -0000	1.520
+++ upstream	26 Sep 2007 16:11:16 -0000	1.521
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.7.bz2
+patch-2.6.22.8.bz2


--- patch-2.6.22.7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:36 -0700
Subject: [pkgdb] php-channel-phpdb was added for akahl
Message-ID: <200709261636.l8QGafm0018247@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-channel-phpdb with summary Adds phpdb channel to PEAR
Kevin Fenzi (kevin) has approved Package php-channel-phpdb
Kevin Fenzi (kevin) has added a Fedora devel branch for php-channel-phpdb with an owner of akahl
Kevin Fenzi (kevin) has approved php-channel-phpdb in Fedora devel
Kevin Fenzi (kevin) has approved Package php-channel-phpdb
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phpdb (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phpdb (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phpdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:47 -0700
Subject: [pkgdb] php-channel-phpdb (Fedora, devel) updated by kevin
Message-ID: <200709261636.l8QGaq63018272@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phpdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:47 -0700
Subject: [pkgdb] php-channel-phpdb (Fedora, 7) updated by kevin
Message-ID: <200709261636.l8QGaq66018272@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-channel-phpdb
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phpdb (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:52 -0400
Subject: rpms/php-channel-phpdb - New directory
Message-ID: <200709261637.l8QGbqwE028641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb

Log Message:
Directory /cvs/extras/rpms/php-channel-phpdb added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:54 -0400
Subject: rpms/php-channel-phpdb/devel - New directory
Message-ID: <200709261637.l8QGbsva028655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb/devel

Log Message:
Directory /cvs/extras/rpms/php-channel-phpdb/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:57 -0400
Subject: rpms/php-channel-phpdb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261637.l8QGbvgO028680@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-channel-phpdb


--- NEW FILE Makefile ---
# Top level Makefile for module php-channel-phpdb
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:59 -0400
Subject: rpms/php-channel-phpdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709261637.l8QGbxC6028696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-channel-phpdb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-channel-phpdb
# $Id: Makefile,v 1.1 2007/09/26 16:37:57 kevin Exp $
NAME := php-channel-phpdb
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:39:18 2007
From: fedora-extras-commits at redhat.com (Chris Lalancette (clalance))
Date: Wed, 26 Sep 2007 12:39:18 -0400
Subject: rpms/xen/F-7 pygrub-dont-exec.patch, NONE,
	1.1 xen-qemu-ne2000-CVE-2007-1321.patch, NONE, 1.1 xen.spec,
	1.185, 1.186
Message-ID: <200709261639.l8QGdIaQ028843@cvs-int.fedora.redhat.com>

Author: clalance

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28794

Modified Files:
	xen.spec 
Added Files:
	pygrub-dont-exec.patch xen-qemu-ne2000-CVE-2007-1321.patch 
Log Message:
- Fixes for CVE-2007-1321, CVE-2007-4993



pygrub-dont-exec.patch:

--- NEW FILE pygrub-dont-exec.patch ---
diff -up xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec xen-3.1.0-src/tools/pygrub/src/GrubConf.py
--- xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec	2007-09-25 15:20:14.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-25 15:20:25.000000000 -0400
@@ -101,7 +101,7 @@ class GrubImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -142,11 +142,11 @@ class GrubImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "title": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "kernel": "self.kernel",
-                 "initrd": "self.initrd",
+    commands = { "title": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "kernel": "kernel",
+                 "initrd": "initrd",
                  "chainloader": None,
                  "module": None}
         
@@ -195,7 +195,7 @@ class GrubConfigFile(object):
             (com, arg) = grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:
@@ -208,7 +208,7 @@ class GrubConfigFile(object):
         (com, arg) = grub_exact_split(line, 2)
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored directive %s" %(com,))
         else:
@@ -236,12 +236,12 @@ class GrubConfigFile(object):
     splash = property(get_splash, set_splash)
 
     # set up command handlers
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
-                 "fallback": "self.fallback",
-                 "hiddenmenu": "self.hiddenmenu",
-                 "splashimage": "self.splash",
-                 "password": "self.password" }
+    commands = { "default": "default",
+                 "timeout": "timeout",
+                 "fallback": "fallback",
+                 "hiddenmenu": "hiddenmenu",
+                 "splashimage": "splash",
+                 "password": "password" }
     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
               "pager", "partnew", "parttype", "rarp", "serial",
               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff -up xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec xen-3.1.0-src/tools/pygrub/src/LiloConf.py
--- xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec	2007-09-25 15:20:18.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-25 15:20:23.000000000 -0400
@@ -30,7 +30,7 @@ class LiloImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -56,12 +56,12 @@ class LiloImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "label": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "image": "self.kernel",
-                 "initrd": "self.initrd",
-                 "append": "self.args",
+    commands = { "label": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "image": "kernel",
+                 "initrd": "initrd",
+                 "append": "args",
                  "read-only": None,
                  "chainloader": None,
                  "module": None}
@@ -111,7 +111,7 @@ class LiloConfigFile(object):
             (com, arg) = GrubConf.grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:

xen-qemu-ne2000-CVE-2007-1321.patch:

--- NEW FILE xen-qemu-ne2000-CVE-2007-1321.patch ---
diff -up xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c
--- xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve	2007-09-25 10:27:44.000000000 -0400
+++ xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c	2007-09-25 10:27:47.000000000 -0400
@@ -252,7 +252,7 @@ static void ne2000_receive(void *opaque,
 {
     NE2000State *s = opaque;
     uint8_t *p;
-    int total_len, next, avail, len, index, mcast_idx;
+    unsigned int total_len, next, avail, len, index, mcast_idx;
     uint8_t buf1[60];
     static const uint8_t broadcast_macaddr[6] = 
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -327,7 +327,10 @@ static void ne2000_receive(void *opaque,
 
     /* write packet data */
     while (size > 0) {
-        avail = s->stop - index;
+        if (index <= s->stop)
+            avail = s->stop - index;
+        else
+            avail = 0;
         len = size;
         if (len > avail)
             len = avail;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- xen.spec	25 Sep 2007 04:57:02 -0000	1.185
+++ xen.spec	26 Sep 2007 16:38:46 -0000	1.186
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 5%{dist}
+Release: 6%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -52,6 +52,11 @@
 Patch303: vnc-client-iterator.patch
 Patch304: vnc-double-cleanup.patch
 
+# CVE-2007-1321
+Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
+# CVE-2007-4993
+Patch601: pygrub-dont-exec.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -163,6 +168,10 @@
 %patch304 -p2
 popd
 
+# CVE patches
+%patch600 -p1
+%patch601 -p1
+
 %build
 # libvncserver first
 pushd LibVNCServer-0.8.2
@@ -280,6 +289,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-6.fc7
+- QEmu NE2000 overflow check - CVE-2007-1321
+- Pygrub guest escape - CVE-2007-4993
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
 - Fix generation of manual pages (rhbz #250791)
 - Fix 32-on-64 PVFB for FC6 legacy guests



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:19 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:19 -0700
Subject: [pkgdb] php-channel-phing was added for akahl
Message-ID: <200709261639.l8QGdO5q018508@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-channel-phing with summary Adds phing channel to PEAR
Kevin Fenzi (kevin) has approved Package php-channel-phing
Kevin Fenzi (kevin) has added a Fedora devel branch for php-channel-phing with an owner of akahl
Kevin Fenzi (kevin) has approved php-channel-phing in Fedora devel
Kevin Fenzi (kevin) has approved Package php-channel-phing
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phing (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phing (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:28 -0700
Subject: [pkgdb] php-channel-phing (Fedora, devel) updated by kevin
Message-ID: <200709261639.l8QGdYmr018543@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:28 -0700
Subject: [pkgdb] php-channel-phing (Fedora, 7) updated by kevin
Message-ID: <200709261639.l8QGdYmu018543@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-channel-phing
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phing (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:08 -0400
Subject: rpms/php-channel-phing - New directory
Message-ID: <200709261640.l8QGe8gR028969@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing

Log Message:
Directory /cvs/extras/rpms/php-channel-phing added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:12 -0400
Subject: rpms/php-channel-phing/devel - New directory
Message-ID: <200709261640.l8QGeCmJ028989@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing/devel

Log Message:
Directory /cvs/extras/rpms/php-channel-phing/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:15 -0400
Subject: rpms/php-channel-phing Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261640.l8QGeFs8029014@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-channel-phing


--- NEW FILE Makefile ---
# Top level Makefile for module php-channel-phing
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:17 -0400
Subject: rpms/php-channel-phing/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709261640.l8QGeHEC029037@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-channel-phing


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-channel-phing
# $Id: Makefile,v 1.1 2007/09/26 16:40:15 kevin Exp $
NAME := php-channel-phing
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:41:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:49 -0700
Subject: [pkgdb] rt73usb-firmware was added for kwizart
Message-ID: <200709261641.l8QGfsGQ018795@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package rt73usb-firmware with summary Firmware for Ralink? RT2571W/RT2671 A/B/G network adaptors
Kevin Fenzi (kevin) has approved Package rt73usb-firmware
Kevin Fenzi (kevin) has added a Fedora devel branch for rt73usb-firmware with an owner of kwizart
Kevin Fenzi (kevin) has approved rt73usb-firmware in Fedora devel
Kevin Fenzi (kevin) has approved Package rt73usb-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt73usb-firmware (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt73usb-firmware (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt73usb-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:41:58 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:58 -0700
Subject: [pkgdb] rt73usb-firmware (Fedora, devel) updated by kevin
Message-ID: <200709261642.l8QGg3aE018818@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on rt73usb-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:41:58 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:58 -0700
Subject: [pkgdb] rt73usb-firmware (Fedora, 7) updated by kevin
Message-ID: <200709261642.l8QGg3aH018818@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for rt73usb-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on rt73usb-firmware (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:42:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:42:55 -0400
Subject: rpms/rt73usb-firmware - New directory
Message-ID: <200709261642.l8QGgtDc029218@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware

Log Message:
Directory /cvs/extras/rpms/rt73usb-firmware added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:01 -0400
Subject: rpms/rt73usb-firmware/devel - New directory
Message-ID: <200709261643.l8QGh14b029232@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware/devel

Log Message:
Directory /cvs/extras/rpms/rt73usb-firmware/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:03 -0400
Subject: rpms/rt73usb-firmware Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261643.l8QGh3Hf029257@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware

Added Files:
	Makefile import.log 
Log Message:
Setup of module rt73usb-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module rt73usb-firmware
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:06 -0400
Subject: rpms/rt73usb-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709261643.l8QGh6Yx029273@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rt73usb-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rt73usb-firmware
# $Id: Makefile,v 1.1 2007/09/26 16:43:04 kevin Exp $
NAME := rt73usb-firmware
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:44:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:23 -0700
Subject: [pkgdb] cdcollect was added for sharkcz
Message-ID: <200709261644.l8QGiTUC018971@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package cdcollect with summary Simple CD/DVD catalog for GNOME
Kevin Fenzi (kevin) has approved Package cdcollect
Kevin Fenzi (kevin) has added a Fedora devel branch for cdcollect with an owner of sharkcz
Kevin Fenzi (kevin) has approved cdcollect in Fedora devel
Kevin Fenzi (kevin) has approved Package cdcollect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cdcollect (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cdcollect (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cdcollect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:32 -0700
Subject: [pkgdb] cdcollect (Fedora, devel) updated by kevin
Message-ID: <200709261644.l8QGibTN018991@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on cdcollect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:32 -0700
Subject: [pkgdb] cdcollect (Fedora, 7) updated by kevin
Message-ID: <200709261644.l8QGibTQ018991@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for cdcollect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on cdcollect (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:45 -0400
Subject: rpms/cdcollect - New directory
Message-ID: <200709261644.l8QGijvi029474@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect

Log Message:
Directory /cvs/extras/rpms/cdcollect added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:50 -0400
Subject: rpms/cdcollect/devel - New directory
Message-ID: <200709261644.l8QGio0d029488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect/devel

Log Message:
Directory /cvs/extras/rpms/cdcollect/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:59 -0400
Subject: rpms/cdcollect/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709261644.l8QGixJF029531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cdcollect


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cdcollect
# $Id: Makefile,v 1.1 2007/09/26 16:44:56 kevin Exp $
NAME := cdcollect
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:44:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:56 -0400
Subject: rpms/cdcollect Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261644.l8QGiuWc029514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect

Added Files:
	Makefile import.log 
Log Message:
Setup of module cdcollect


--- NEW FILE Makefile ---
# Top level Makefile for module cdcollect
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 17:03:22 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 26 Sep 2007 13:03:22 -0400
Subject: rpms/rt73usb-firmware/F-7 rt73usb-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261703.l8QH3MiB003846@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/rt73usb-firmware/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3812/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	rt73usb-firmware.spec 
Log Message:
Intial import



--- NEW FILE rt73usb-firmware.spec ---
Name:		rt73usb-firmware
Version:	1.8
Release:	4
Summary:	Firmware for Ralink?? RT2571W/RT2671 A/B/G network adaptors
Group:		System Environment/Kernel
License:	Redistributable, no modification permitted
URL:		http://www.ralinktech.com
Source0:	http://www.ralinktech.com.tw/data/RT71W_Firmware_V%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Obsoletes: rt71w-firmware < %{version}-%{release}
Provides: rt71w-firmware = %{version}-%{release}


%description
This package contains the firmware required by the rt73usb driver for Linux.
Usage of the firmware is subject to the terms and conditions contained
inside the provided LICENSE.ralink-firmware.txt file.
Please read it carefully.


%prep
%setup -q -n RT71W_Firmware_V%{version}
sed -i 's/\r//' LICENSE.ralink-firmware.txt

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
install -pm 0644 *.bin $RPM_BUILD_ROOT/lib/firmware

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.ralink-firmware.txt
/lib/firmware/*


%changelog
* Mon Sep 17 2007 kwizart < kwizart at gmail.com > - 1.8-4
- Disable dist tag
- Preserve timestamp
- Add license from Ralink
- Improved summary and description

* Mon Mar 19 2007 kwizart < kwizart at gmail.com > - 1.8-3
- Update Source url (uses .com.tw instead of .com)
- Fix License field

* Mon Feb 26 2007 kwizart < kwizat at gmail.com > - 1.8-2
- Update the download link

* Tue Sep 13 2006 kwizart < kwizart at gmail.com > - 1.8-1_FC5
- inital release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt73usb-firmware/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:43:04 -0000	1.1
+++ .cvsignore	26 Sep 2007 17:02:50 -0000	1.2
@@ -0,0 +1 @@
+RT71W_Firmware_V1.8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt73usb-firmware/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:43:04 -0000	1.1
+++ sources	26 Sep 2007 17:02:50 -0000	1.2
@@ -0,0 +1 @@
+1e7a5dc574e0268574fcda3fd5cf52f7  RT71W_Firmware_V1.8.zip



From fedora-extras-commits at redhat.com  Wed Sep 26 17:07:38 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 13:07:38 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.22,
	1.23
Message-ID: <200709261707.l8QH7cqr005784@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4786

Modified Files:
	fedora-release-notes.spec 
Log Message:
fix symlinking - symlink the files, not the dirs (#306781)
set license tag



Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fedora-release-notes.spec	26 Sep 2007 02:43:01 -0000	1.22
+++ fedora-release-notes.spec	26 Sep 2007 17:07:05 -0000	1.23
@@ -1,11 +1,11 @@
 Name:		fedora-release-notes
 Version:	7.92
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
-License:	Distributable
+License:	Open Publication
 Source0:	fedora-release-notes-%{version}.tar.gz
 Source1:	homepage-%{version}.tar.gz
 Source2:	about-fedora-%{version}.tar.gz
@@ -61,7 +61,8 @@
   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 css stylesheet-images ; do
-    ln -s ../../${D} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
+    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 
 done
 pushd README-BURNING-ISOS-%{version}/
@@ -119,6 +120,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Bill Nottingham <notting at redhat.com> - 7.92-2
+- fix symlinking (#306781)
+- set license tag -> Open Publication
+
 * Sun Sep 16 2007 Paul W. Frields <stickster at gmail.com> - 7.92-1
 - Include new start page
 - Push new content for F8 test3



From fedora-extras-commits at redhat.com  Wed Sep 26 17:10:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 13:10:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-clean-up-oops-bug-reports.patch,
	NONE, 
	1.1 kernel.spec, 1.187, 1.188 linux-2.6-x86-debug-edd.patch, 1.2, NONE
Message-ID: <200709261710.l8QHAKuO006284@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6258

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-clean-up-oops-bug-reports.patch 
Removed Files:
	linux-2.6-x86-debug-edd.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Remove extended EDD boot debugging.
- Shorten i386 oops reports by three lines.


linux-2.6-x86-clean-up-oops-bug-reports.patch:

--- NEW FILE linux-2.6-x86-clean-up-oops-bug-reports.patch ---
i386: clean up oops/bug reports

From: Pavel Emelyanov <xemul at openvz.org>

Typically the oops first lines look like this:

BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
 printing eip:
c049dfbd
*pde = 00000000
Oops: 0002 [#1]
PREEMPT SMP
...

Such output is gained with some ugly if (!nl) printk("\n"); code and
besides being a waste of lines, this is also annoying to read. The
following output looks better (and it is how it looks on x86_64):

BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
printing eip: c049dfbd *pde = 00000000
Oops: 0002 [#1] PREEMPT SMP
...

Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Andi Kleen <ak at suse.de>

---

 arch/i386/kernel/traps.c |   16 ++++------------
 arch/i386/mm/fault.c     |   13 +++++++------
 2 files changed, 11 insertions(+), 18 deletions(-)

Index: linux/arch/i386/kernel/traps.c
===================================================================
--- linux.orig/arch/i386/kernel/traps.c
+++ linux/arch/i386/kernel/traps.c
@@ -444,31 +444,23 @@ void die(const char * str, struct pt_reg
 		local_save_flags(flags);
 
 	if (++die.lock_owner_depth < 3) {
-		int nl = 0;
 		unsigned long esp;
 		unsigned short ss;
 
 		report_bug(regs->eip, regs);
 
-		printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+		printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
-		printk(KERN_EMERG "PREEMPT ");
-		nl = 1;
+		printk("PREEMPT ");
 #endif
 #ifdef CONFIG_SMP
-		if (!nl)
-			printk(KERN_EMERG);
 		printk("SMP ");
-		nl = 1;
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
-		if (!nl)
-			printk(KERN_EMERG);
 		printk("DEBUG_PAGEALLOC");
-		nl = 1;
 #endif
-		if (nl)
-			printk("\n");
+		printk("\n");
+
 		if (notify_die(DIE_OOPS, str, regs, err,
 					current->thread.trap_no, SIGSEGV) !=
 				NOTIFY_STOP) {
Index: linux/arch/i386/mm/fault.c
===================================================================
--- linux.orig/arch/i386/mm/fault.c
+++ linux/arch/i386/mm/fault.c
@@ -544,23 +544,22 @@ no_context:
 			printk(KERN_ALERT "BUG: unable to handle kernel paging"
 					" request");
 		printk(" at virtual address %08lx\n",address);
-		printk(KERN_ALERT " printing eip:\n");
-		printk("%08lx\n", regs->eip);
+		printk(KERN_ALERT "printing eip: %08lx ", regs->eip);
 
 		page = read_cr3();
 		page = ((__typeof__(page) *) __va(page))[address >> PGDIR_SHIFT];
 #ifdef CONFIG_X86_PAE
-		printk(KERN_ALERT "*pdpt = %016Lx\n", page);
+		printk("*pdpt = %016Lx ", page);
 		if ((page >> PAGE_SHIFT) < max_low_pfn
 		    && page & _PAGE_PRESENT) {
 			page &= PAGE_MASK;
 			page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)
 			                                         & (PTRS_PER_PMD - 1)];
-			printk(KERN_ALERT "*pde = %016Lx\n", page);
+			printk(KERN_ALERT "*pde = %016Lx ", page);
 			page &= ~_PAGE_NX;
 		}
 #else
-		printk(KERN_ALERT "*pde = %08lx\n", page);
+		printk("*pde = %08lx ", page);
 #endif
 
 		/*
@@ -574,8 +573,10 @@ no_context:
 			page &= PAGE_MASK;
 			page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT)
 			                                         & (PTRS_PER_PTE - 1)];
-			printk(KERN_ALERT "*pte = %0*Lx\n", sizeof(page)*2, (u64)page);
+			printk("*pte = %0*Lx ", sizeof(page)*2, (u64)page);
 		}
+
+		printk("\n");
 	}
 
 	tsk->thread.cr2 = address;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- kernel.spec	25 Sep 2007 23:06:48 -0000	1.187
+++ kernel.spec	26 Sep 2007 17:09:47 -0000	1.188
@@ -580,7 +580,7 @@
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
-Patch76: linux-2.6-x86-debug-edd.patch
+Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -1015,7 +1015,8 @@
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # debug early boot
 ApplyPatch linux-2.6-x86-debug-boot.patch
-ApplyPatch linux-2.6-x86-debug-edd.patch
+# shorter i386 oops reports (scheduled for 2.6.24)
+ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
 
 #
 # PowerPC
@@ -1811,6 +1812,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Remove extended EDD boot debugging.
+- Shorten i386 oops reports by three lines.
+
 * Tue Sep 25 2007 Dave Jones <davej at redhat.com>
 - Disable RTC_HCTOSYS. The initscripts already do this for us.
 


--- linux-2.6-x86-debug-edd.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 17:24:55 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 13:24:55 -0400
Subject: comps comps-f7.xml.in,1.256,1.257 comps-f8.xml.in,1.127,1.128
Message-ID: <200709261724.l8QHOtgI006788@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
more firmware



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- comps-f7.xml.in	19 Sep 2007 22:47:04 -0000	1.256
+++ comps-f7.xml.in	26 Sep 2007 17:24:25 -0000	1.257
@@ -1829,9 +1829,13 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
-      <packagereq type="default">iwlwifi-firmware</packagereq>
+      <packagereq type="default">iwl3945-firmware</packagereq>
+      <packagereq type="default">iwl4965-firmware</packagereq>
+      <packagereq type="default">rt61pci-firmware</packagereq>
+      <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- comps-f8.xml.in	26 Sep 2007 13:59:34 -0000	1.127
+++ comps-f8.xml.in	26 Sep 2007 17:24:25 -0000	1.128
@@ -1997,6 +1997,8 @@
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
+      <packagereq type="default">rt61pci-firmware</packagereq>
+      <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 26 17:30:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 13:30:32 -0400
Subject: rpms/kde-settings/devel .cvsignore, 1.9, 1.10 kde-settings.spec,
	1.11, 1.12 sources, 1.9, 1.10
Message-ID: <200709261730.l8QHUWN9007122@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7079

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-31
- kdesktoprc: [Desktop0] Wallpaper=/usr/share/backgrounds/images/default.png
  (#290571)
- kopeterc: [ContactList] SmoothScrolling=false



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Jul 2007 21:59:45 -0000	1.9
+++ .cvsignore	26 Sep 2007 17:29:59 -0000	1.10
@@ -1,8 +1,4 @@
 etc/
 usr/
-kde-settings-3.5-25.tar.gz
-kde-settings-3.5-26.tar.gz
-kde-settings-3.5-27.tar.gz
-kde-settings-3.5-28.tar.bz2
-kde-settings-3.5-29.tar.bz2
 kde-settings-3.5-30.tar.bz2
+kde-settings-3.5-31.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kde-settings.spec	24 Jul 2007 21:59:45 -0000	1.11
+++ kde-settings.spec	26 Sep 2007 17:29:59 -0000	1.12
@@ -1,5 +1,5 @@
 
-%define rel 30
+%define rel 31
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Requires: kdelibs >= %{version}
+Requires: kdelibs3
 Requires: xdg-user-dirs
 
 Obsoletes: kde-config < %{version}-%{release}
@@ -102,6 +102,11 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-31
+- kdesktoprc: [Desktop0] Wallpaper=/usr/share/backgrounds/images/default.png
+  (#290571)
+- kopeterc: [ContactList] SmoothScrolling=false
+
 * Mon Jul 02 2007 Than Ngo <than at redhat.com> -  3.5-30
 - fix bz#245100
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Jul 2007 21:59:45 -0000	1.9
+++ sources	26 Sep 2007 17:29:59 -0000	1.10
@@ -1 +1 @@
-3591c492cebe4654f74cfb3b32b499e3  kde-settings-3.5-30.tar.bz2
+007b2d8ca128a5db76aa72257265c0ed  kde-settings-3.5-31.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 17:36:09 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 13:36:09 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.4,
	1.5 kernel-xen.spec, 1.48, 1.49
Message-ID: <200709261736.l8QHa90f007374@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7334

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-xen.spec 
Log Message:
Disabled Firewire stack on i686 also.

It is not supported by current Xen swiotlb implementation (bug #302471)



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.20-i686-xen.config	12 Sep 2007 20:39:00 -0000	1.4
+++ kernel-2.6.20-i686-xen.config	26 Sep 2007 17:35:35 -0000	1.5
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kernel-xen.spec	21 Sep 2007 15:13:42 -0000	1.48
+++ kernel-xen.spec	26 Sep 2007 17:35:35 -0000	1.49
@@ -2072,6 +2072,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disabled Firewire stack on i686 also. It is not supported
+  by current Xen swiotlb implementation (bug #302471)
+
 * Fri Sep 21 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add fix for bug #294011 (floating point corruption)
   (changeset 8c24767501ff from Xen 3.1.1)



From fedora-extras-commits at redhat.com  Wed Sep 26 17:42:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 13:42:55 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.16,1.17
Message-ID: <200709261742.l8QHgtkY007696@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/notification-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7631

Modified Files:
	notification-daemon.spec 
Log Message:
Fix the build



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- notification-daemon.spec	8 Aug 2007 04:22:15 -0000	1.16
+++ notification-daemon.spec	26 Sep 2007 17:42:21 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPLv2+
 Group: System Environment/Libraries
@@ -47,6 +47,7 @@
 %build
 autoreconf
 automake
+intltoolize --force
 %configure --disable-static 
 make
 
@@ -94,6 +95,9 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-6
+- Make it build with the latest intltool
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-5
 - Update the license field
 



From fedora-extras-commits at redhat.com  Wed Sep 26 17:43:47 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Wed, 26 Sep 2007 13:43:47 -0400
Subject: rpms/kernel/devel config-generic,1.29,1.30 kernel.spec,1.188,1.189
Message-ID: <200709261743.l8QHhlq5007731@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7704

Modified Files:
	config-generic kernel.spec 
Log Message:
* Wed Sep 26 2007 Dave Jones <davej at redhat.com>
- Switch back to ye olde RTC driver. At least it worked.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-generic	25 Sep 2007 23:06:48 -0000	1.29
+++ config-generic	26 Sep 2007 17:43:15 -0000	1.30
@@ -1867,10 +1867,10 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
+CONFIG_RTC=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
-CONFIG_RTC_CLASS=y
+# CONFIG_RTC_CLASS is not set
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kernel.spec	26 Sep 2007 17:09:47 -0000	1.188
+++ kernel.spec	26 Sep 2007 17:43:15 -0000	1.189
@@ -1812,6 +1812,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dave Jones <davej at redhat.com>
+- Switch back to ye olde RTC driver. At least it worked.
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Remove extended EDD boot debugging.
 - Shorten i386 oops reports by three lines.



From fedora-extras-commits at redhat.com  Wed Sep 26 17:50:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 13:50:14 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.59,1.60
Message-ID: <200709261750.l8QHoEgx008788@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-pilot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739

Modified Files:
	gnome-pilot.spec 
Log Message:
fix the build



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-pilot.spec	24 Apr 2007 14:11:11 -0000	1.59
+++ gnome-pilot.spec	26 Sep 2007 17:49:40 -0000	1.60
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -73,6 +73,7 @@
 
 %build
 autoreconf --force
+intltoolize --force
 %configure --disable-static
 cp %{_bindir}/libtool .
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
@@ -155,6 +156,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-9
+- Fix the build with new intltool
+
 * Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-8.fc7
 - One more revision of the patch to close RH bug #198211.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 17:50:38 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 26 Sep 2007 13:50:38 -0400
Subject: rpms/libsilc/devel libsilc-filter-provides.sh, NONE,
	1.1 libsilc.spec, 1.14, 1.15
Message-ID: <200709261750.l8QHocq7008793@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8765

Modified Files:
	libsilc.spec 
Added Files:
	libsilc-filter-provides.sh 
Log Message:
- filter out libsilc module SONAME Provides (#245323)
- add a check section with a test that fails when the modules move



--- NEW FILE libsilc-filter-provides.sh ---
#!/bin/sh

if [ -x /usr/lib/rpm/redhat/find-provides ] ; then
   FINDPROV=/usr/lib/rpm/redhat/find-provides
else
   FINDPROV=/usr/lib/rpm/find-provides
fi

sed '\,/silc/modules/,d' | $FINDPROV "$@"


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsilc.spec	21 Aug 2007 14:45:40 -0000	1.14
+++ libsilc.spec	26 Sep 2007 17:50:06 -0000	1.15
@@ -1,11 +1,14 @@
 Summary: SILC Client Library
 Name: libsilc
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
 Source0: silc-toolkit-%{version}.tar.bz2
+Source1: libsilc-filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE1}
 Patch0: silc-toolkit-1.0.2-libs.patch
 Patch1: silc-toolkit-1.0.2-wordsize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -55,6 +58,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
+%check
+# If this fails, the filter-provides script needs an update.
+[ -d $RPM_BUILD_ROOT%{_libdir}/silc/modules ]
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -86,6 +93,10 @@
 %{_includedir}/silc/*.h
 
 %changelog
+* Mon Sep 24 2007 Michael Schwendt <mschwendt at users.sf.net> 1.0.2-4
+- filter out libsilc module SONAME Provides (#245323)
+- add a check section with a test that fails when the modules move
+
 * Tue Aug 21 2007 Warren Togami <wtogami at redhat.com> 1.0.2-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:14:45 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 26 Sep 2007 14:14:45 -0400
Subject: rpms/libsilc/devel libsilc.spec,1.15,1.16
Message-ID: <200709261814.l8QIEje7016006@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15986

Modified Files:
	libsilc.spec 
Log Message:
Ensure that libsilc-filter-provides.sh is executable



Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libsilc.spec	26 Sep 2007 17:50:06 -0000	1.15
+++ libsilc.spec	26 Sep 2007 18:14:13 -0000	1.16
@@ -58,6 +58,9 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
+# Ensure that libsilc-filter-provides.sh is executable
+chmod 755 %{SOURCE1}
+
 %check
 # If this fails, the filter-provides script needs an update.
 [ -d $RPM_BUILD_ROOT%{_libdir}/silc/modules ]



From fedora-extras-commits at redhat.com  Wed Sep 26 18:15:21 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 26 Sep 2007 14:15:21 -0400
Subject: rpms/blender/F-7 blender.spec,1.60,1.61
Message-ID: <200709261815.l8QIFL8H016075@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16010

Modified Files:
	blender.spec 
Log Message:
Remove broken python-abi dep


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- blender.spec	23 Sep 2007 20:12:41 -0000	1.60
+++ blender.spec	26 Sep 2007 18:14:48 -0000	1.61
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -52,8 +52,6 @@
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 
-Requires: python-abi = %{pyver}
-
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -172,6 +170,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Sep 26 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2.1
+- Remove broken python-abi dep
+
 * Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
 - Change method how to determinate python version
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:52:44 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 14:52:44 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.3,
	1.4 kernel-xen.spec, 1.58, 1.59
Message-ID: <200709261852.l8QIqiQx019400@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19337

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-xen.spec 
Log Message:
Disable Firewire on i686

It is not supported by the current Xen swiotlb implementation (bug
#307461)



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel-2.6.21-i686-xen.config	12 Sep 2007 20:21:05 -0000	1.3
+++ kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
@@ -1315,9 +1315,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kernel-xen.spec	20 Sep 2007 21:38:43 -0000	1.58
+++ kernel-xen.spec	26 Sep 2007 18:52:12 -0000	1.59
@@ -2381,6 +2381,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable Firewire on i686. It is not supported by the current
+  Xen swiotlb implementation (bug #307461)
+
 * Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Fix sleazy-fpu implementation to actually avoid on fpu-intensive
   programs



From fedora-extras-commits at redhat.com  Wed Sep 26 18:53:08 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 14:53:08 -0400
Subject: devel/yum .cvsignore, 1.60, 1.61 sources, 1.63, 1.64 yum.spec, 1.179,
	1.180
Message-ID: <200709261853.l8QIr8f7019414@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19375

Modified Files:
	.cvsignore sources yum.spec 
Log Message:
* Wed Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-4
- pull in fixes from upstream for media handling, pkgid (#291471), and 
  a potential depsolving bug



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/yum/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	10 Sep 2007 16:07:13 -0000	1.60
+++ .cvsignore	26 Sep 2007 18:52:35 -0000	1.61
@@ -1,3 +1 @@
-yum-3.2.3.tar.gz
-yum-3.2.4.tar.gz
 yum-3.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	10 Sep 2007 16:07:14 -0000	1.63
+++ sources	26 Sep 2007 18:52:35 -0000	1.64
@@ -1,2 +1 @@
-f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
 f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- yum.spec	17 Sep 2007 14:51:39 -0000	1.179
+++ yum.spec	26 Sep 2007 18:52:35 -0000	1.180
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch1: yum-showasdep.patch
 Patch2: yum-trans-display-object.patch
 Patch3: yum-3.2.5-close.patch
+Patch4: yum-misc-fixes.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -52,6 +53,7 @@
 %patch1 -p1 -b .showdep
 %patch2 -p1 -b .transdisp
 %patch3 -p1 -b .close
+%patch4 -p1 
 
 %build
 make
@@ -97,6 +99,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-4
+- pull in fixes from upstream for media handling, pkgid (#291471), and 
+  a potential depsolving bug
+
 * Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
 - fix traceback with closing repos 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:54:39 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 14:54:39 -0400
Subject: devel/yum yum-misc-fixes.patch,1.9,1.10
Message-ID: <200709261854.l8QIsdfm019532@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19508

Added Files:
	yum-misc-fixes.patch 
Log Message:
add the patch

yum-misc-fixes.patch:

Index: yum-misc-fixes.patch
===================================================================
RCS file: yum-misc-fixes.patch
diff -N yum-misc-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ yum-misc-fixes.patch	26 Sep 2007 18:54:34 -0000	1.10
@@ -0,0 +1,152 @@
+diff --git a/cli.py b/cli.py
+index 1fc0594..07a93c5 100644
+--- a/cli.py
++++ b/cli.py
+@@ -467,7 +467,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+                     my_inst_pkgs = []
+ 
+                 if my_inst_pkgs:
+-                    self.verbose_logger.log(yum.logginglevels.DEBUG_3,
++                    self.verbose_logger.log(yum.logginglevels.INFO_2,
+                         'Requested dep: %s is provided by installed package', str(arg))
+                     
+                     continue # we don't need to look, we have it
+@@ -490,6 +490,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+                         
+             installable = yum.misc.unique(exactmatch + matched)
+             exactarchlist = self.conf.exactarchlist
++
++            if len(installable) == 0:
++                self.verbose_logger.log(yum.logginglevels.INFO_2,
++                                        'No package %s available.', arg)
+             
+             # we look through each returned possibility and rule out the
+             # ones that we obviously can't use
+diff --git a/output.py b/output.py
+index 0f5eb5a..8aff587 100644
+--- a/output.py
++++ b/output.py
+@@ -21,6 +21,8 @@ import sys
+ import time
+ import logging
+ import types
++import gettext
++import rpm
+ from i18n import _
+ 
+ from urlgrabber.progress import TextMeter
+@@ -42,6 +44,10 @@ class YumOutput:
+     def __init__(self):
+         self.logger = logging.getLogger("yum.cli")
+         self.verbose_logger = logging.getLogger("yum.verbose.cli")
++        if hasattr(rpm, "expandMacro"):
++            self.i18ndomains = rpm.expandMacro("%_i18ndomains").split(":")
++        else:
++            self.i18ndomains = ["redhat-dist"]
+     
+     def printtime(self):
+         months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+@@ -71,11 +77,16 @@ class YumOutput:
+         
+     def infoOutput(self, pkg):
+         def enc(s):
+-            # this sucks.  what we get back from the rpmdb
+-            # are strings, but they may actually have unicode so we
+-            # can't encode them
++            """Get the translated version from specspo and ensure that
++            it's actually encoded in UTF-8."""
+             if type(s) == unicode:
+-                return s.encode("UTF-8")
++                s = s.encode("UTF-8")
++            if len(s) > 0:
++                for d in self.i18ndomains:
++                    t = gettext.dgettext(d, s)
++                    if t != s:
++                        s = t
++                        break
+             return s
+         print _("Name   : %s") % pkg.name
+         print _("Arch   : %s") % pkg.arch
+@@ -495,7 +506,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
+                 self.lastmsg = msg
+             if te_current == te_total:
+                 print " "
+-        
++
+     def _makefmt(self, percent, ts_current, ts_total, progress = True):
+         l = len(str(ts_total))
+         size = "%s.%s" % (l, l)
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 39121e2..ee31ae1 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -365,7 +365,7 @@ class YumBase(depsolve.Depsolve):
+             return self._pkgSack
+         
+         if thisrepo is None:
+-            repos = self.repos.listEnabled()
++            repos = 'enabled'
+         else:
+             repos = self.repos.findRepos(thisrepo)
+         
+@@ -385,7 +385,8 @@ class YumBase(depsolve.Depsolve):
+         self.excludePackages()
+         self._pkgSack.excludeArchs(archlist)
+         
+-        #FIXME - this could be faster, too.
++        if repos == 'enabled':
++            repos = self.repos.listEnabled()
+         for repo in repos:
+             self.excludePackages(repo)
+             self.includePackages(repo)
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index 4075116..08693eb 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -707,7 +707,7 @@ class Depsolve(object):
+             while CheckDeps:
+                 self.cheaterlookup = {}
+                 if self.dsCallback: self.dsCallback.tscheck()
+-                CheckDeps, checkremoves, checkinstalls, missing = self._resolveRequires(errors)
++                CheckDeps, checkinstalls, checkremoves, missing = self._resolveRequires(errors)
+                 CheckInstalls |= checkinstalls
+                 CheckRemoves |= checkremoves
+ 
+diff --git a/yum/packages.py b/yum/packages.py
+index d11816e..5be3722 100644
+--- a/yum/packages.py
++++ b/yum/packages.py
+@@ -628,7 +628,7 @@ class YumHeaderPackage(YumAvailablePackage):
+         self.description = self.hdr['description']
+         self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER]
+         if not self.pkgid:
+-            self.pkgid = self.hdr[rpm.RPMTAG_SIGMD5]
++            self.pkgid = "%s.%s" %(self.hdr['name'], self.hdr['buildtime'])
+         self.packagesize = self.hdr['size']
+         self.__mode_cache = {}
+         self.__prcoPopulated = False
+diff --git a/yum/yumRepo.py b/yum/yumRepo.py
+index 48ec521..8b8793f 100644
+--- a/yum/yumRepo.py
++++ b/yum/yumRepo.py
+@@ -665,6 +665,9 @@ class YumRepository(Repository, config.RepoConf):
+            file. If any of them are newer then invalidate the cache
+            """
+ 
++        # -1 is special and should never get refreshed
++        if expiration_time == -1 and os.path.exists(myfile):
++            return True
+         val = False
+         if os.path.exists(myfile):
+             cookie_info = os.stat(myfile)
+@@ -701,7 +704,9 @@ class YumRepository(Repository, config.RepoConf):
+             self.dirSetup()
+         except Errors.RepoError, e:
+             raise
+-
++        if not self.mediafunc and self.mediaid and not self.mirrorlist and not self.baseurl:
++            verbose_logger.log(logginglevels.DEBUG_2, "Disabling media repo for non-media-aware frontend")
++            self.enabled = False
+ 
+     def _loadRepoXML(self, text=None):
+         """retrieve/check/read in repomd.xml from the repository"""



From fedora-extras-commits at redhat.com  Wed Sep 26 18:59:08 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 14:59:08 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.9.bz2.sign, NONE, 1.1 .cvsignore, 1.634,
	1.635 kernel-2.6.spec, 1.3346,
	1.3347 linux-2.6-build-nonintconfig.patch, 1.7,
	1.8 linux-2.6-utrace-tracehook.patch, 1.3,
	1.4 linux-2.6-wireless.patch, 1.10, 1.11 sources, 1.597,
	1.598 upstream, 1.521, 1.522 linux-2.6-futex-fix-traversal.patch,
	1.1, NONE linux-2.6-netdev-forcedeth-realtek-oui.patch, 1.1,
	NONE linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch, 1.1,
	NONE linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 1.1,
	NONE linux-2.6-usb-linked-list-insertion.patch, 1.1,
	NONE linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch, 1.1,
	NONE patch-2.6.22.8.bz2.sign, 1.1, NONE
Message-ID: <200709261859.l8QIx8VH019671@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-utrace-tracehook.patch linux-2.6-wireless.patch 
	sources upstream 
Added Files:
	patch-2.6.22.9.bz2.sign 
Removed Files:
	linux-2.6-futex-fix-traversal.patch 
	linux-2.6-netdev-forcedeth-realtek-oui.patch 
	linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch 
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-usb-linked-list-insertion.patch 
	linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch 
	patch-2.6.22.8.bz2.sign 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.9



--- NEW FILE patch-2.6.22.9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+qIQyGugalF9Dw4RAjugAJ9oe3fhxNgJS23LCxKMdgHrqBZUjwCgkVe1
5NysGkmoYh5Q5buNL99NXck=
=ysvo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- .cvsignore	26 Sep 2007 16:11:16 -0000	1.634
+++ .cvsignore	26 Sep 2007 18:58:34 -0000	1.635
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.8.bz2
+patch-2.6.22.9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3346
retrieving revision 1.3347
diff -u -r1.3346 -r1.3347
--- kernel-2.6.spec	26 Sep 2007 16:11:16 -0000	1.3346
+++ kernel-2.6.spec	26 Sep 2007 18:58:34 -0000	1.3347
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -569,7 +569,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-aacraid-ioctl-security.patch
 Patch402: linux-2.6-scsi-async-scanning.patch
-Patch403: linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
 Patch404: linux-2.6-scsi-mpt-vmware-fix.patch
 
 Patch420: linux-2.6-squashfs.patch
@@ -577,7 +576,6 @@
 Patch423: linux-2.6-gfs-locking-exports.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch435: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -616,7 +614,6 @@
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
-Patch711: linux-2.6-netdev-forcedeth-realtek-oui.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 Patch715: linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
@@ -625,14 +622,11 @@
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
-Patch760: linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
-Patch771: linux-2.6-futex-fix-traversal.patch
 
 Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
 Patch781: linux-2.6-usb-allow-1-byte-replies.patch
 Patch782: linux-2.6-usb-fixup-interval-lengths.patch
-Patch783: linux-2.6-usb-linked-list-insertion.patch
 
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
@@ -1254,8 +1248,6 @@
 ApplyPatch linux-2.6-aacraid-ioctl-security.patch
 # fix locking problems w/ async scsi scan
 ApplyPatch linux-2.6-scsi-async-scanning.patch
-# fix 3ware 9000 DMA fallback
-ApplyPatch linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
 # fix vmware's broken emulation of SCSI controller
 ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
@@ -1270,8 +1262,6 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# fix oops when skb has zero length
-ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1353,8 +1343,6 @@
 
 # add patch from markmc so that e1000 supports ICH9
 ApplyPatch linux-2.6-e1000-ich9.patch
-# fix wrong oui in forcedeth
-ApplyPatch linux-2.6-netdev-forcedeth-realtek-oui.patch
 
 # atl1 DMA bugs
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
@@ -1377,12 +1365,8 @@
 ApplyPatch linux-2.6-sdhci-fix-interrupt-mask.patch
 # fix the interrupt mask fix
 ApplyPatch linux-2.6-sdhci-clear-error-interrupt.patch
-# v4l/dvb: fix airstar hd5000 tuner
-ApplyPatch linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
-# futex: fix compat list traveral
-ApplyPatch linux-2.6-futex-fix-traversal.patch
 
 # USB
 #
@@ -1391,8 +1375,6 @@
 # trivial USB fixes
 ApplyPatch linux-2.6-usb-allow-1-byte-replies.patch
 ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
-ApplyPatch linux-2.6-usb-linked-list-insertion.patch
-
 
 # ACPI patches
 
@@ -2349,6 +2331,9 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.9
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.8
 
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-build-nonintconfig.patch	10 Jul 2007 16:14:59 -0000	1.7
+++ linux-2.6-build-nonintconfig.patch	26 Sep 2007 18:58:34 -0000	1.8
@@ -32,10 +32,10 @@
  static void strip(char *str)
  {
  	char *p = str;
-@@ -103,6 +107,14 @@ static void conf_askvalue(struct symbol 
+@@ -103,6 +107,16 @@ static void conf_askvalue(struct symbol 
  		fflush(stdout);
  		fgets(line, 128, stdin);
- 		return;
+ 		return 1;
 +	case dont_ask:
 +		if (!sym_has_value(sym)) {
 +			fprintf(stderr,"CONFIG_%s\n",sym->name);
@@ -43,10 +43,12 @@
 +		}
 +		/*FALLTHROUGH*/
 +	case dont_ask_dont_tell:
-+		return;
++		if (sym_has_value(sym))
++			return 0;
++		return 1;
  	case set_default:
  		printf("%s\n", def);
- 		return;
+ 		return 1;
 @@ -346,6 +358,11 @@ static int conf_choice(struct menu *menu
  			printf("?");
  		printf("]: ");

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-tracehook.patch	26 Sep 2007 18:58:34 -0000	1.4
@@ -3157,8 +3157,8 @@
  	if (!thread_group_leader(p))
  		goto out;
  
--	if (p->real_parent == group_leader) {
-+	if (p->parent == group_leader) {
+-	if (p->real_parent->tgid == group_leader->tgid) {
++	if (p->parent->tgid == group_leader->tgid) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))
  			goto out;

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-wireless.patch	18 Sep 2007 15:08:25 -0000	1.10
+++ linux-2.6-wireless.patch	26 Sep 2007 18:58:34 -0000	1.11
@@ -4725,108 +4725,6 @@
  		wl3501_receive(this, skb->data, pkt_len);
  		skb_put(skb, pkt_len);
  		skb->protocol	= eth_type_trans(skb, dev);
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:25:25.000000000 -0400
-@@ -3183,6 +3183,9 @@ static void bcm43xx_periodic_work_handle
- 	unsigned long orig_trans_start = 0;
- 
- 	mutex_lock(&bcm->mutex);
-+	/* keep from doing and rearming periodic work if shutting down */
-+	if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
-+		goto unlock_mutex;
- 	if (unlikely(bcm->periodic_state % 60 == 0)) {
- 		/* Periodic work will take a long time, so we want it to
- 		 * be preemtible.
-@@ -3228,14 +3231,10 @@ static void bcm43xx_periodic_work_handle
- 	mmiowb();
- 	bcm->periodic_state++;
- 	spin_unlock_irqrestore(&bcm->irq_lock, flags);
-+unlock_mutex:
- 	mutex_unlock(&bcm->mutex);
- }
- 
--void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
--{
--	cancel_rearming_delayed_work(&bcm->periodic_work);
--}
--
- void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
- {
- 	struct delayed_work *work = &bcm->periodic_work;
-@@ -3285,6 +3284,14 @@ static int bcm43xx_rng_init(struct bcm43
- 	return err;
- }
- 
-+void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
-+{
-+	/* The system must be unlocked when this routine is entered.
-+	 * If not, the next 2 steps may deadlock */
-+	cancel_work_sync(&bcm->restart_work);
-+	cancel_rearming_delayed_work(&bcm->periodic_work);
-+}
-+
- static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
- {
- 	int ret = 0;
-@@ -3321,7 +3328,12 @@ static void bcm43xx_free_board(struct bc
- {
- 	bcm43xx_rng_exit(bcm);
- 	bcm43xx_sysfs_unregister(bcm);
--	bcm43xx_periodic_tasks_delete(bcm);
-+
-+	mutex_lock(&(bcm)->mutex);
-+	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-+	mutex_unlock(&(bcm)->mutex);
-+
-+	bcm43xx_cancel_work(bcm);
- 
- 	mutex_lock(&(bcm)->mutex);
- 	bcm43xx_shutdown_all_wireless_cores(bcm);
-@@ -4018,7 +4030,7 @@ static int bcm43xx_net_stop(struct net_d
- 	err = bcm43xx_disable_interrupts_sync(bcm);
- 	assert(!err);
- 	bcm43xx_free_board(bcm);
--	flush_scheduled_work();
-+	bcm43xx_cancel_work(bcm);
- 
- 	return 0;
- }
-@@ -4150,9 +4162,9 @@ static void bcm43xx_chip_reset(struct wo
- 	struct bcm43xx_phyinfo *phy;
- 	int err = -ENODEV;
- 
-+	bcm43xx_cancel_work(bcm);
- 	mutex_lock(&(bcm)->mutex);
- 	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
--		bcm43xx_periodic_tasks_delete(bcm);
- 		phy = bcm43xx_current_phy(bcm);
- 		err = bcm43xx_select_wireless_core(bcm, phy->type);
- 		if (!err)
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c	2007-09-18 10:11:13.000000000 -0400
-@@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_stor
- 		goto out;
- 	}
- 
--	bcm43xx_periodic_tasks_delete(bcm);
-+	bcm43xx_cancel_work(bcm);
- 	mutex_lock(&(bcm)->mutex);
- 	err = bcm43xx_select_wireless_core(bcm, phytype);
- 	if (!err)
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h	2007-09-18 10:11:13.000000000 -0400
-@@ -122,7 +122,7 @@ void bcm43xx_wireless_core_reset(struct 
- void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
- void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
- 
--void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm);
-+void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
- void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
- 
- void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
 +++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- sources	26 Sep 2007 16:11:16 -0000	1.597
+++ sources	26 Sep 2007 18:58:34 -0000	1.598
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-957192637e6830ba43bad2d9f9ba8324  patch-2.6.22.8.bz2
+6e2e5112d69af5c8d78cff0479c700cd  patch-2.6.22.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- upstream	26 Sep 2007 16:11:16 -0000	1.521
+++ upstream	26 Sep 2007 18:58:34 -0000	1.522
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.8.bz2
+patch-2.6.22.9.bz2


--- linux-2.6-futex-fix-traversal.patch DELETED ---


--- linux-2.6-netdev-forcedeth-realtek-oui.patch DELETED ---


--- linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch DELETED ---


--- linux-2.6-skb_copy_and_csum_datagram_iovec.patch DELETED ---


--- linux-2.6-usb-linked-list-insertion.patch DELETED ---


--- linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch DELETED ---


--- patch-2.6.22.8.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 19:09:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:09:34 -0400
Subject: rpms/cdcollect/devel cdcollect-0.6.0.patch, NONE,
	1.1 cdcollect-libdir.patch, NONE, 1.1 cdcollect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261909.l8QJ9YtL026156@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26086

Modified Files:
	.cvsignore sources 
Added Files:
	cdcollect-0.6.0.patch cdcollect-libdir.patch cdcollect.spec 
Log Message:
 - initial import

cdcollect-0.6.0.patch:

--- NEW FILE cdcollect-0.6.0.patch ---
diff -Nru cdcollect-0.6.0-orig/resources/glade/gui.glade cdcollect-0.6.0/resources/glade/gui.glade
--- cdcollect-0.6.0-orig/resources/glade/gui.glade	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/resources/glade/gui.glade	2007-07-16 21:30:02.000000000 +0200
@@ -1143,7 +1143,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label10">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mount Point:</property>
+	      <property name="label" translatable="yes">Device:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1169,7 +1169,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="entry_mount">
+	    <widget class="GtkEntry" id="entry_device">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Mount directory for CDs (CD must already be mounted)</property>
 	      <property name="can_focus">True</property>
diff -Nru cdcollect-0.6.0-orig/src/Conf.cs cdcollect-0.6.0/src/Conf.cs
--- cdcollect-0.6.0-orig/src/Conf.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Conf.cs	2007-07-16 21:48:45.000000000 +0200
@@ -35,7 +35,6 @@
 
 	
 	public string default_cd_device;
-	public string default_cd_mount;
 		
 	public Conf ()
 	{
@@ -61,9 +60,6 @@
 		/* Get the CD device */
 		default_cd_device = "/dev/hdc";
 
-		/* Get the mount point for */
-		default_cd_mount = "/media/cdrom";
-		
 		/* create home dirs if they not exists */
 		create_home_dirs ();
 	}
diff -Nru cdcollect-0.6.0-orig/src/ImportCDWindow.cs cdcollect-0.6.0/src/ImportCDWindow.cs
--- cdcollect-0.6.0-orig/src/ImportCDWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/ImportCDWindow.cs	2007-07-16 22:45:47.000000000 +0200
@@ -50,6 +50,7 @@
 	// Private variables
 	private static Glade.XML gxml;
 	private string mount;
+	private string device;
 	
 	private bool use_infoplugins, use_compplugins, compplugins_recursive, use_thumbs;
 	private int key = -10;
@@ -67,7 +68,7 @@
 	
     
     // Methods        
-	public ImportCDWindow (string mount_point, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public ImportCDWindow (string default_device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		/* Show Main Dialog using glade */
  		gxml = new Glade.XML (null, "gui.glade", "win_importcd", null);
@@ -80,7 +81,8 @@
 		/* Prepare gui */
 		prepare_gui ();		
 		
-		mount = mount_point;
+		device = default_device;
+		mount = get_mount();
 		use_infoplugins = info;
 		use_compplugins = comp;
 		compplugins_recursive = recursive;
@@ -330,10 +332,10 @@
 	
 		/* Open the device */
 		try {
-			fdev = new FileStream (CDCollect.conf.default_cd_device, 
+			fdev = new FileStream (device, 
 				System.IO.FileMode.Open, System.IO.FileAccess.Read);
 		} catch {
-			Console.WriteLine ("Can not open device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not open device " + device);
 			return("Unknown");
 		}	
 		
@@ -343,7 +345,7 @@
 			fdev.Seek (32808, SeekOrigin.Begin);
 			r = fdev.Read (buf, 0, 32);
 		} catch (System.Exception e) {
-			Console.WriteLine ("Can not read device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not read device " + device);
 			return ("Unknown");
 		}
 		
@@ -373,6 +375,33 @@
 		}
 		
 	}
+	
+	private string get_mount ()
+	{
+		TextReader f;
+		string line;
+		string mount = "none";
+		string [] fields;
+	
+		/* Open the /etc/mtab */
+		try {
+			f = new StreamReader("/etc/mtab"); 
+		} catch {
+			Console.WriteLine ("Can not open /etc/mtab");
+			return(mount);
+		}	
 		
+		/* Read all line, check whether it contains our device and filesystem type is iso9660 */
+		while ((line = f.ReadLine()) != null) {
+			fields = line.Split(' ');
+			if ((fields[0] == device) && (fields[2] == "iso9660")) {
+				mount = fields[1];
+			}
+		}
+		
+		f.Close();
+
+		return (mount);
+	}	
 }
 
diff -Nru cdcollect-0.6.0-orig/src/Main.cs cdcollect-0.6.0/src/Main.cs
--- cdcollect-0.6.0-orig/src/Main.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Main.cs	2007-07-16 21:48:14.000000000 +0200
@@ -572,7 +572,7 @@
 	{
 		/* Create import window */
 		ImportCDWindow win_importcd = new ImportCDWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
@@ -591,8 +591,8 @@
 		/* Check if CD has been read */
 		if (key==-1) {
 			new ErrorDialog (String.Format (Catalog.GetString (
-				"Directory <b>{0}</b> not found.\nPlease change the CD mount point in the Preferences window."), 
-				(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount)), win_main);
+				"Directory <b>{0}</b> not found.\nPlease change the CD device in the Preferences window."), 
+				(string) conf.getkey ("prefs/device",conf.default_cd_device)), win_main);
 		} else if (key==-2) {
 			new ErrorDialog (Catalog.GetString ("The mount directory is empty. Please make sure the CD is mounted."), win_main);	
 		} else if (key==-3) {
@@ -637,7 +637,7 @@
 	{
 		/* Create Preferences window */
 		new PreferencesWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
diff -Nru cdcollect-0.6.0-orig/src/PreferencesWindow.cs cdcollect-0.6.0/src/PreferencesWindow.cs
--- cdcollect-0.6.0-orig/src/PreferencesWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/PreferencesWindow.cs	2007-07-16 21:45:51.000000000 +0200
@@ -37,7 +37,7 @@
 	[Glade.Widget] public Gtk.Window win_prefs;
 	[Glade.Widget] public Gtk.Button btn_ok;
 	[Glade.Widget] public Gtk.Button btn_cancel;
-	[Glade.Widget] public Gtk.Entry  entry_mount;
+	[Glade.Widget] public Gtk.Entry  entry_device;
     
     [Glade.Widget] public Gtk.CheckButton cbtn_info;
 	[Glade.Widget] public Gtk.CheckButton cbtn_comp;
@@ -50,7 +50,7 @@
 	private static Glade.XML gxml;
 	
     // Methods        
-	public PreferencesWindow (string mount, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public PreferencesWindow (string device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		// Show Main Dialog using glade
  		gxml = new Glade.XML (null, "gui.glade", "win_prefs", null);
@@ -65,7 +65,7 @@
 		win_prefs.Title = Catalog.GetString ("CDCollect: Preferences");
 
 		// Fill preferences
-		entry_mount.Text = mount;
+		entry_device.Text = device;
 		cbtn_info.Active = info;
 		cbtn_comp.Active = comp;
 		cbtn_recursive.Active = recursive;
@@ -79,7 +79,7 @@
 		win_prefs.ShowAll ();
            				
 		// Select focus          											    																		    											
-        entry_mount.GrabFocus();
+        entry_device.GrabFocus();
         
 	}
 
@@ -94,7 +94,7 @@
 
 	public void on_ok_clicked (object o, EventArgs args)
 	{
-		CDCollect.conf.setkey ("prefs/mount_point", entry_mount.Text);
+		CDCollect.conf.setkey ("prefs/device", entry_device.Text);
 		CDCollect.conf.setkey ("prefs/use_information_plugins", cbtn_info.Active);
 		CDCollect.conf.setkey ("prefs/use_compression_plugins", cbtn_comp.Active);
 		CDCollect.conf.setkey ("prefs/compression_plugins_recursive", cbtn_recursive.Active);

cdcollect-libdir.patch:

--- NEW FILE cdcollect-libdir.patch ---
diff -Nru cdcollect-0.6.0-orig/src/cdcollect.in cdcollect-0.6.0/src/cdcollect.in
--- cdcollect-0.6.0-orig/src/cdcollect.in	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/cdcollect.in	2007-07-17 18:08:13.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH="@prefix@/lib/cdcollect:$LD_LIBRARY_PATH"
+LD_LIBRARY_PATH="@libdir@/cdcollect:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-mono @prefix@/lib/cdcollect/cdcollect.exe $@
+mono @libdir@/cdcollect/cdcollect.exe $@
diff -Nru cdcollect-0.6.0-orig/src/Makefile.am cdcollect-0.6.0/src/Makefile.am
--- cdcollect-0.6.0-orig/src/Makefile.am	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.am	2007-07-17 18:06:59.000000000 +0200
@@ -63,7 +63,7 @@
 
 all: cdcollect.exe
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 
 install-data-local: cdcollect.exe
 	$(mkinstalldirs) $(DESTDIR)$(cdcollectlibdir)
@@ -72,7 +72,7 @@
 bin_SCRIPTS = cdcollect
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 
 EXTRA_DIST =				\
diff -Nru cdcollect-0.6.0-orig/src/Makefile.in cdcollect-0.6.0/src/Makefile.in
--- cdcollect-0.6.0-orig/src/Makefile.in	2006-11-24 18:12:36.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.in	2007-07-17 18:07:51.000000000 +0200
@@ -270,7 +270,7 @@
 	-resource:$(top_srcdir)/resources/icons/cdcollect_small.png,cdcollect_small.png \
 	-resource:$(top_srcdir)/resources/icons/cdmovie.png,cdmovie.png
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 bin_SCRIPTS = cdcollect
 EXTRA_DIST = \
 	$(CDCOLLECT_CSFILES)	\
@@ -485,7 +485,7 @@
 	$(INSTALL_DATA) cdcollect.exe $(DESTDIR)$(cdcollectlibdir)/cdcollect.exe	
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 # 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.


--- NEW FILE cdcollect.spec ---
# rpmbuild creates an empty debuginfo package, this is a Mono application
#%define debug_package %{nil}

Name:		cdcollect
Version:	0.6.0
Release:	3%{?dist}
Summary:	Simple CD/DVD catalog for GNOME

Group:		Applications/Productivity
License:	GPLv2+
URL:		http://cdcollect.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		cdcollect-libdir.patch
Patch1:		cdcollect-0.6.0.patch

BuildRequires:	mono-devel >= 1.1.17, gtk-sharp2-devel >= 2.8.0, gnome-sharp-devel
BuildRequires:	glib2-devel, sqlite-devel >= 3.3.5, mono-data-sqlite, gettext
BuildRequires:	perl(XML::Parser), desktop-file-utils

Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
Requires:	sqlite >= 3.3.5, mono-data-sqlite

Requires(pre):	GConf2
Requires(post):	GConf2
Requires(preun):	GConf2


%description
CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
and GTK#. All data are stored in a sqlite database.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora \
	--remove-category="Application" \
	--delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO 
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
- fixed URLs
- removed unneeded BR: pkgconfig

* Mon Sep 24 2007 Dan Horak <dan[at]danny.cz> 0.6.0-2
- update license tag
- fix desktop file installation

* Tue Jul 17 2007 Dan Horak <dan[at]danny.cz> 0.6.0-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:44:56 -0000	1.1
+++ .cvsignore	26 Sep 2007 19:09:02 -0000	1.2
@@ -0,0 +1 @@
+cdcollect-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:44:56 -0000	1.1
+++ sources	26 Sep 2007 19:09:02 -0000	1.2
@@ -0,0 +1 @@
+33f71604b9dfb84497b4bc2fce69e89b  cdcollect-0.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:09:50 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Sep 2007 15:09:50 -0400
Subject: rpms/pungi/devel .cvsignore, 1.27, 1.28 pungi.spec, 1.29,
	1.30 sources, 1.28, 1.29
Message-ID: <200709261909.l8QJ9otm026161@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26110/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New build to fix the media.repo, and to pull in all the virt packages



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Sep 2007 01:35:13 -0000	1.27
+++ .cvsignore	26 Sep 2007 19:09:17 -0000	1.28
@@ -1 +1 @@
-pungi-1.1.2.tar.gz
+pungi-1.1.3.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pungi.spec	26 Sep 2007 01:35:13 -0000	1.29
+++ pungi.spec	26 Sep 2007 19:09:17 -0000	1.30
@@ -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:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Jesse Keating <jkeating at redhat.com> - 1.1.3-1
+- Pull in all the optional Virt stuff
+- Don't expire the metadata from Media repo.
+
 * Tue Sep 25 2007 Jesse Keating <jkeating at redhat.com> - 1.1.2-1
 - Fix location of media.repo file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Sep 2007 01:35:13 -0000	1.28
+++ sources	26 Sep 2007 19:09:17 -0000	1.29
@@ -1 +1 @@
-f4720af1b95ba064ee63ebcafdf29d74  pungi-1.1.2.tar.gz
+5f128f8362c6306612338a1a905a36a9  pungi-1.1.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 19:12:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:12:59 -0400
Subject: rpms/cdcollect/F-7 cdcollect-0.6.0.patch, NONE,
	1.1 cdcollect-libdir.patch, NONE, 1.1 cdcollect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261912.l8QJCxve026390@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328

Modified Files:
	.cvsignore sources 
Added Files:
	cdcollect-0.6.0.patch cdcollect-libdir.patch cdcollect.spec 
Log Message:
 - initial import

cdcollect-0.6.0.patch:

--- NEW FILE cdcollect-0.6.0.patch ---
diff -Nru cdcollect-0.6.0-orig/resources/glade/gui.glade cdcollect-0.6.0/resources/glade/gui.glade
--- cdcollect-0.6.0-orig/resources/glade/gui.glade	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/resources/glade/gui.glade	2007-07-16 21:30:02.000000000 +0200
@@ -1143,7 +1143,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label10">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mount Point:</property>
+	      <property name="label" translatable="yes">Device:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1169,7 +1169,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="entry_mount">
+	    <widget class="GtkEntry" id="entry_device">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Mount directory for CDs (CD must already be mounted)</property>
 	      <property name="can_focus">True</property>
diff -Nru cdcollect-0.6.0-orig/src/Conf.cs cdcollect-0.6.0/src/Conf.cs
--- cdcollect-0.6.0-orig/src/Conf.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Conf.cs	2007-07-16 21:48:45.000000000 +0200
@@ -35,7 +35,6 @@
 
 	
 	public string default_cd_device;
-	public string default_cd_mount;
 		
 	public Conf ()
 	{
@@ -61,9 +60,6 @@
 		/* Get the CD device */
 		default_cd_device = "/dev/hdc";
 
-		/* Get the mount point for */
-		default_cd_mount = "/media/cdrom";
-		
 		/* create home dirs if they not exists */
 		create_home_dirs ();
 	}
diff -Nru cdcollect-0.6.0-orig/src/ImportCDWindow.cs cdcollect-0.6.0/src/ImportCDWindow.cs
--- cdcollect-0.6.0-orig/src/ImportCDWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/ImportCDWindow.cs	2007-07-16 22:45:47.000000000 +0200
@@ -50,6 +50,7 @@
 	// Private variables
 	private static Glade.XML gxml;
 	private string mount;
+	private string device;
 	
 	private bool use_infoplugins, use_compplugins, compplugins_recursive, use_thumbs;
 	private int key = -10;
@@ -67,7 +68,7 @@
 	
     
     // Methods        
-	public ImportCDWindow (string mount_point, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public ImportCDWindow (string default_device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		/* Show Main Dialog using glade */
  		gxml = new Glade.XML (null, "gui.glade", "win_importcd", null);
@@ -80,7 +81,8 @@
 		/* Prepare gui */
 		prepare_gui ();		
 		
-		mount = mount_point;
+		device = default_device;
+		mount = get_mount();
 		use_infoplugins = info;
 		use_compplugins = comp;
 		compplugins_recursive = recursive;
@@ -330,10 +332,10 @@
 	
 		/* Open the device */
 		try {
-			fdev = new FileStream (CDCollect.conf.default_cd_device, 
+			fdev = new FileStream (device, 
 				System.IO.FileMode.Open, System.IO.FileAccess.Read);
 		} catch {
-			Console.WriteLine ("Can not open device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not open device " + device);
 			return("Unknown");
 		}	
 		
@@ -343,7 +345,7 @@
 			fdev.Seek (32808, SeekOrigin.Begin);
 			r = fdev.Read (buf, 0, 32);
 		} catch (System.Exception e) {
-			Console.WriteLine ("Can not read device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not read device " + device);
 			return ("Unknown");
 		}
 		
@@ -373,6 +375,33 @@
 		}
 		
 	}
+	
+	private string get_mount ()
+	{
+		TextReader f;
+		string line;
+		string mount = "none";
+		string [] fields;
+	
+		/* Open the /etc/mtab */
+		try {
+			f = new StreamReader("/etc/mtab"); 
+		} catch {
+			Console.WriteLine ("Can not open /etc/mtab");
+			return(mount);
+		}	
 		
+		/* Read all line, check whether it contains our device and filesystem type is iso9660 */
+		while ((line = f.ReadLine()) != null) {
+			fields = line.Split(' ');
+			if ((fields[0] == device) && (fields[2] == "iso9660")) {
+				mount = fields[1];
+			}
+		}
+		
+		f.Close();
+
+		return (mount);
+	}	
 }
 
diff -Nru cdcollect-0.6.0-orig/src/Main.cs cdcollect-0.6.0/src/Main.cs
--- cdcollect-0.6.0-orig/src/Main.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Main.cs	2007-07-16 21:48:14.000000000 +0200
@@ -572,7 +572,7 @@
 	{
 		/* Create import window */
 		ImportCDWindow win_importcd = new ImportCDWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
@@ -591,8 +591,8 @@
 		/* Check if CD has been read */
 		if (key==-1) {
 			new ErrorDialog (String.Format (Catalog.GetString (
-				"Directory <b>{0}</b> not found.\nPlease change the CD mount point in the Preferences window."), 
-				(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount)), win_main);
+				"Directory <b>{0}</b> not found.\nPlease change the CD device in the Preferences window."), 
+				(string) conf.getkey ("prefs/device",conf.default_cd_device)), win_main);
 		} else if (key==-2) {
 			new ErrorDialog (Catalog.GetString ("The mount directory is empty. Please make sure the CD is mounted."), win_main);	
 		} else if (key==-3) {
@@ -637,7 +637,7 @@
 	{
 		/* Create Preferences window */
 		new PreferencesWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
diff -Nru cdcollect-0.6.0-orig/src/PreferencesWindow.cs cdcollect-0.6.0/src/PreferencesWindow.cs
--- cdcollect-0.6.0-orig/src/PreferencesWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/PreferencesWindow.cs	2007-07-16 21:45:51.000000000 +0200
@@ -37,7 +37,7 @@
 	[Glade.Widget] public Gtk.Window win_prefs;
 	[Glade.Widget] public Gtk.Button btn_ok;
 	[Glade.Widget] public Gtk.Button btn_cancel;
-	[Glade.Widget] public Gtk.Entry  entry_mount;
+	[Glade.Widget] public Gtk.Entry  entry_device;
     
     [Glade.Widget] public Gtk.CheckButton cbtn_info;
 	[Glade.Widget] public Gtk.CheckButton cbtn_comp;
@@ -50,7 +50,7 @@
 	private static Glade.XML gxml;
 	
     // Methods        
-	public PreferencesWindow (string mount, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public PreferencesWindow (string device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		// Show Main Dialog using glade
  		gxml = new Glade.XML (null, "gui.glade", "win_prefs", null);
@@ -65,7 +65,7 @@
 		win_prefs.Title = Catalog.GetString ("CDCollect: Preferences");
 
 		// Fill preferences
-		entry_mount.Text = mount;
+		entry_device.Text = device;
 		cbtn_info.Active = info;
 		cbtn_comp.Active = comp;
 		cbtn_recursive.Active = recursive;
@@ -79,7 +79,7 @@
 		win_prefs.ShowAll ();
            				
 		// Select focus          											    																		    											
-        entry_mount.GrabFocus();
+        entry_device.GrabFocus();
         
 	}
 
@@ -94,7 +94,7 @@
 
 	public void on_ok_clicked (object o, EventArgs args)
 	{
-		CDCollect.conf.setkey ("prefs/mount_point", entry_mount.Text);
+		CDCollect.conf.setkey ("prefs/device", entry_device.Text);
 		CDCollect.conf.setkey ("prefs/use_information_plugins", cbtn_info.Active);
 		CDCollect.conf.setkey ("prefs/use_compression_plugins", cbtn_comp.Active);
 		CDCollect.conf.setkey ("prefs/compression_plugins_recursive", cbtn_recursive.Active);

cdcollect-libdir.patch:

--- NEW FILE cdcollect-libdir.patch ---
diff -Nru cdcollect-0.6.0-orig/src/cdcollect.in cdcollect-0.6.0/src/cdcollect.in
--- cdcollect-0.6.0-orig/src/cdcollect.in	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/cdcollect.in	2007-07-17 18:08:13.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH="@prefix@/lib/cdcollect:$LD_LIBRARY_PATH"
+LD_LIBRARY_PATH="@libdir@/cdcollect:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-mono @prefix@/lib/cdcollect/cdcollect.exe $@
+mono @libdir@/cdcollect/cdcollect.exe $@
diff -Nru cdcollect-0.6.0-orig/src/Makefile.am cdcollect-0.6.0/src/Makefile.am
--- cdcollect-0.6.0-orig/src/Makefile.am	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.am	2007-07-17 18:06:59.000000000 +0200
@@ -63,7 +63,7 @@
 
 all: cdcollect.exe
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 
 install-data-local: cdcollect.exe
 	$(mkinstalldirs) $(DESTDIR)$(cdcollectlibdir)
@@ -72,7 +72,7 @@
 bin_SCRIPTS = cdcollect
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 
 EXTRA_DIST =				\
diff -Nru cdcollect-0.6.0-orig/src/Makefile.in cdcollect-0.6.0/src/Makefile.in
--- cdcollect-0.6.0-orig/src/Makefile.in	2006-11-24 18:12:36.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.in	2007-07-17 18:07:51.000000000 +0200
@@ -270,7 +270,7 @@
 	-resource:$(top_srcdir)/resources/icons/cdcollect_small.png,cdcollect_small.png \
 	-resource:$(top_srcdir)/resources/icons/cdmovie.png,cdmovie.png
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 bin_SCRIPTS = cdcollect
 EXTRA_DIST = \
 	$(CDCOLLECT_CSFILES)	\
@@ -485,7 +485,7 @@
 	$(INSTALL_DATA) cdcollect.exe $(DESTDIR)$(cdcollectlibdir)/cdcollect.exe	
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 # 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.


--- NEW FILE cdcollect.spec ---
# rpmbuild creates an empty debuginfo package, this is a Mono application
#%define debug_package %{nil}

Name:		cdcollect
Version:	0.6.0
Release:	3%{?dist}
Summary:	Simple CD/DVD catalog for GNOME

Group:		Applications/Productivity
License:	GPLv2+
URL:		http://cdcollect.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		cdcollect-libdir.patch
Patch1:		cdcollect-0.6.0.patch

BuildRequires:	mono-devel >= 1.1.17, gtk-sharp2-devel >= 2.8.0, gnome-sharp-devel
BuildRequires:	glib2-devel, sqlite-devel >= 3.3.5, mono-data-sqlite, gettext
BuildRequires:	perl(XML::Parser), desktop-file-utils

Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
Requires:	sqlite >= 3.3.5, mono-data-sqlite

Requires(pre):	GConf2
Requires(post):	GConf2
Requires(preun):	GConf2


%description
CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
and GTK#. All data are stored in a sqlite database.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora \
	--remove-category="Application" \
	--delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO 
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
- fixed URLs
- removed unneeded BR: pkgconfig

* Mon Sep 24 2007 Dan Horak <dan[at]danny.cz> 0.6.0-2
- update license tag
- fix desktop file installation

* Tue Jul 17 2007 Dan Horak <dan[at]danny.cz> 0.6.0-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:44:56 -0000	1.1
+++ .cvsignore	26 Sep 2007 19:12:27 -0000	1.2
@@ -0,0 +1 @@
+cdcollect-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:44:56 -0000	1.1
+++ sources	26 Sep 2007 19:12:27 -0000	1.2
@@ -0,0 +1 @@
+33f71604b9dfb84497b4bc2fce69e89b  cdcollect-0.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:13:25 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 26 Sep 2007 15:13:25 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-intel-by-default.patch,
	NONE, 1.1 xorg-x11-server-1.0.1-fpic-libxf86config.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.251,
	1.252 xserver-1.3.0-randr-updates.patch, 1.1, 1.2
Message-ID: <200709261913.l8QJDPrF026400@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26359

Modified Files:
	xorg-x11-server-1.0.1-fpic-libxf86config.patch 
	xorg-x11-server.spec xserver-1.3.0-randr-updates.patch 
Added Files:
	xserver-1.3.0-intel-by-default.patch 
Log Message:
* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-26
- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
  have too much information than too little.
- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
  with hidden symbols to shrink pyf86config a bit.
- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
  without a config file.
- Enable maintainer mode when building so I swear at autotools less.


xserver-1.3.0-intel-by-default.patch:

--- NEW FILE xserver-1.3.0-intel-by-default.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c
--- xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx	2006-11-16 13:01:24.000000000 -0500
+++ xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c	2007-09-26 10:08:20.000000000 -0400
@@ -175,7 +175,7 @@ videoPtrToDriverName(pciVideoPtr info)
 	case 0x8086:
 	    if ((info->chipType == 0x00d1) || (info->chipType == 0x7800))
 		return "i740";
-	    else return "i810";
+	    else return "intel";
 	case 0x102b:		    return "mga";
 	case 0x10c8:		    return "neomagic";
 	case 0x105d:		    return "i128";

xorg-x11-server-1.0.1-fpic-libxf86config.patch:

Index: xorg-x11-server-1.0.1-fpic-libxf86config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-fpic-libxf86config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.0.1-fpic-libxf86config.patch	14 Jun 2006 02:34:13 -0000	1.3
+++ xorg-x11-server-1.0.1-fpic-libxf86config.patch	26 Sep 2007 19:12:51 -0000	1.4
@@ -5,7 +5,7 @@
  	Extensions.c
  
 -AM_CFLAGS = $(XORG_CFLAGS)
-+AM_CFLAGS = $(XORG_CFLAGS) -fPIC
++AM_CFLAGS = $(XORG_CFLAGS) -fPIC -fvisibility=hidden
  
  EXTRA_DIST = \
  	Configint.h \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- xorg-x11-server.spec	26 Sep 2007 07:33:55 -0000	1.251
+++ xorg-x11-server.spec	26 Sep 2007 19:12:51 -0000	1.252
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   25%{?dist}
+Release:   26%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -70,6 +70,7 @@
 Patch2010:  xserver-1.3.0-idletime.patch
 Patch2012:  xserver-1.3.0-add-really-slow-bcopy.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
+Patch2014:  xserver-1.3.0-intel-by-default.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -329,6 +330,7 @@
 %patch2010 -p1 -b .idletime
 %patch2012 -p1 -b .slow-bcopy
 %patch2013 -p1 -b .fontpath-doc
+%patch2014 -p1 -b .intel
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -348,7 +350,7 @@
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
 aclocal ; automake -a ; autoconf
-%configure \
+%configure --enable-maintainer-mode \
 	%{enable_xorg} \
 	--disable-xprint --enable-xvfb --enable-xnest --enable-dmx \
 	--enable-kdrive --enable-xephyr \
@@ -604,6 +606,15 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-26
+- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
+  have too much information than too little.
+- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
+  with hidden symbols to shrink pyf86config a bit.
+- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
+  without a config file.
+- Enable maintainer mode when building so I swear at autotools less.
+
 * Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
 - xserver-1.3.0-randr-updates.patch: Backport randr from server git
   This contains a lot of fixes since 1.3.0 went out, and saves

xserver-1.3.0-randr-updates.patch:

Index: xserver-1.3.0-randr-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-randr-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-randr-updates.patch	26 Sep 2007 07:33:55 -0000	1.1
+++ xserver-1.3.0-randr-updates.patch	26 Sep 2007 19:12:51 -0000	1.2
@@ -300,7 +300,7 @@
 +			scrn->options,
 +			config->options);
 +    config->debug_modes = xf86ReturnOptValBool (config->options,
-+						OPTION_MODEDEBUG, FALSE);
++						OPTION_MODEDEBUG, TRUE);
 +
      if (scrn->display->virtualX)
  	width = scrn->display->virtualX;



From fedora-extras-commits at redhat.com  Wed Sep 26 19:20:10 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Wed, 26 Sep 2007 15:20:10 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.7,
	1.8 java-1.7.0-icedtea.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200709261920.l8QJKALa026669@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26629

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg. Does not adhere to Fedora guidelines.






Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
+++ .cvsignore	26 Sep 2007 19:19:37 -0000	1.8
@@ -2,4 +2,3 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
-jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
+++ java-1.7.0-icedtea.spec	26 Sep 2007 19:19:37 -0000	1.9
@@ -20,7 +20,6 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
-%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -114,7 +113,6 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -148,8 +146,6 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-# jtreg testing requirements.
-BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -302,22 +298,10 @@
   echo ====================MAUVE TESTING========================
   %{expand: 
      $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-	 -showpasses -debug -timeout 30000 2>&1
-   } || :
+	 -showpasses -debug -timeout 30000 2>&1 || :
+   }
   echo ====================MAUVE TESTING END====================
 popd
-pushd jtreg
-  echo ====================JTREG TESTING========================
-  Xvfb :1 &
-  export DISPLAY=:1.0
-  %{expand: 
-     ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1 
-  } || :
-  killall -9 Xvfb
-  export DISPLAY=:0.0
-  echo ====================JTREG TESTING END====================
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -747,16 +731,19 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+- Removed jtreg. Does not adhere to Fedora guidelines.
+
+* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
 - Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
-* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added JTreg zip as source
 - Run JTreg tests after build for smoke testing.
 - Added Xvfb as build requirement.
 
-* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.
 - Run Mauve after build for regression testing.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Sep 2007 20:51:55 -0000	1.6
+++ sources	26 Sep 2007 19:19:37 -0000	1.7
@@ -3,4 +3,3 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip



From fedora-extras-commits at redhat.com  Wed Sep 26 19:21:20 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 26 Sep 2007 15:21:20 -0400
Subject: rpms/dhcp/devel dhcp.spec, 1.170, 1.171 dhcpd.init, 1.16,
	1.17 dhcrelay.init, 1.3, 1.4
Message-ID: <200709261921.l8QJLKDk026836@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26797

Modified Files:
	dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
- Init script fixes for dhcpd and dhcrelay (#278601)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- dhcp.spec	10 Sep 2007 15:06:40 -0000	1.170
+++ dhcp.spec	26 Sep 2007 19:20:47 -0000	1.171
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  5%{?dist}
+Release:  6%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
+- Init script fixes for dhcpd and dhcrelay (#278601)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
 - Fix typos in ldap.c and correct LDAP macros (#283391)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dhcpd.init	10 Jul 2007 18:59:53 -0000	1.16
+++ dhcpd.init	26 Sep 2007 19:20:47 -0000	1.17
@@ -1,37 +1,54 @@
-#!/bin/bash
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: dhcpd
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start:
+# Required-Start: $network
+# Required-Stop:
+# Short-Description: Start and stop the DHCP server
+# Description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP)
+#              server.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
 #
 # chkconfig: - 65 35
-# description: dhcpd provide access to Dynamic Host Control Protocol.
+# description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
+#              server
+# processname: dhcpd
+# config: /etc/dhcpd.conf
+# config: /var/lib/dhcpd/dhcpd.leases
+# pidfile: /var/run/dhcpd.pid
 
-# Source function library.
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcpd
 dhcpd=/usr/sbin/dhcpd
 lockfile=/var/lock/subsys/dhcpd
+pidfile=/var/run/dhcpd.pid
 
-. /etc/sysconfig/dhcpd
+[ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
-cfOption() {
-    let i=0
-    for a in $* ; do
-        ((++i))
-        if [ $a = -cf ]; then
-            ((++i))
-            eval 'echo $'$i
-        elif [[ $a = -cf* ]]; then
-            echo ${a#-cf}
+# if the user specified a different config file, make sure we reference it
+findConfig() {
+    for arg in $DHCPDARGS ; do
+        if [ $found = 1 ]; then
+            [ -f "$arg" ] && echo "$arg"
+            return
+        fi
+        if [ "$arg" = "-cf" ]; then
+            found=1
+            continue
         fi
     done
+    echo "/etc/dhcpd.conf"
 }
 
-CF=`cfOption $DHCPDARGS`
-if [ -z "$CF" ]; then
-    CF='/etc/dhcpd.conf'
-fi
-
-[ -f "$CF" ] || exit 0
+conf="$(findConfig "$DHCPDARGS")"
 
 if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
     mkdir -p /var/lib/dhcpd
@@ -41,15 +58,20 @@
 
 configtest() {
     [ -x $dhcpd ] || return 5
-    [ -f $CF ] || return 6
-    $dhcpd -q -t -cf $CF
+    [ -f $conf ] || return 6
+    $dhcpd -q -t -cf $conf
     RETVAL=$?
     return $RETVAL
 }
 
 start() {
     [ -x $dhcpd ] || return 5
-    [ -f $CF ] || return 6
+    [ -f $conf ] || return 6
+
+    pidofproc $prog >/dev/null 2>&1
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && return $RETVAL
+
     echo -n $"Starting $prog: "
     daemon $dhcpd $DHCPDARGS 2>/dev/null
     RETVAL=$?
@@ -59,42 +81,60 @@
 }
 
 stop() {
+    pidofproc $prog >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        RETVAL=7
+        return $RETVAL
+    fi
+
     echo -n $"Shutting down $prog: "
     killproc $prog
     RETVAL=$?
+
+    [ $RETVAL = 0 ] && success || failure
     echo
     [ $RETVAL = 0 ] && rm -f $lockfile
     return $RETVAL
 }
 
-# See how we were called.
+if [ ! -x $dhcdbd ]; then
+    RETVAL=5
+    exit $RETVAL
+fi
+
+if [ $# -gt 1 ]; then
+    RETVAL=2
+    exit $RETVAL
+fi
+
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    reload)
-        RETVAL=3
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    restart)
-        configtest || exit $?
-        stop
-        start
+    try-restart|reload)
+        RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
+            RETVAL=$?
         fi
         ;;
-    configtest|check|testconfig|test)
+    configtest)
         configtest
         RETVAL=$?
         ;;
     status)
-        status $prog
+        status $dhcpd
         RETVAL=$?
         ;;
     *)


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcrelay.init	26 Apr 2007 19:01:43 -0000	1.3
+++ dhcrelay.init	26 Sep 2007 19:20:47 -0000	1.4
@@ -1,23 +1,58 @@
-#!/bin/bash
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: dhcrelay
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start:
+# Required-Start: $network
+# Required-Stop:
+# Short-Description: Start and stop the DHCP relay server
+# Description: dhcrelay provides the Dynamic Host Configuration Protocol (DHCP)
+#              relay server.  This is required when your DHCP server is on
+#              another network segment from the clients.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
 #
 # chkconfig: - 66 34
 # description: dhcrelay provides a relay for Dynamic Host Control Protocol.
+# processname: dhcrelay
+# # pidfile: /var/run/dhcrelay.pid
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcrelay
 dhcrelay=/usr/sbin/dhcrelay
 lockfile=/var/lock/subsys/dhcrelay
+pidfile=/var/run/dhcrelay.pid
+conf=/etc/sysconfig/dhcrelay
 
-start() {
+# The dhcrelay daemon uses the sysconfig file for configuration information.
+# There is no native configuration file for this program and you must specify
+# its settings on the command line.
+[ -f /etc/sysconfig/dhcrelay ] && . /etc/sysconfig/dhcrelay
+
+configtest() {
     [ -x $dhcrelay ] || exit 5
-    [ -f /etc/sysconfig/dhcrelay ] || exit 6
-    . /etc/sysconfig/dhcrelay
+    [ -f $conf ] || exit 6
     [ -z "$DHCPSERVERS" ] && exit 6
+    RETVAL=0
+    return $RETVAL
+}
+
+start() {
+    [ -x $dhcrelay ] || exit 5
+    [ -f $conf ] || exit 6
+
+    pidofproc $prog >/dev/null 2>&1
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && return $RETVAL
+
     echo -n $"Starting $prog: "
-    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS
+    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch $lockfile
@@ -25,41 +60,64 @@
 }
 
 stop() {
+    pidofproc $prog >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        RETVAL=7
+        return $RETVAL
+    fi
+
     echo -n $"Shutting down $prog: "
     killproc $prog -TERM
     RETVAL=$?
+
+    [ $RETVAL = 0 ] && success || failure
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL = 0 ] && rm -f $lockfile
     return $RETVAL
 }
 
-# See how we were called.
+if [ ! -x $dhcrelay ]; then
+    RETVAL=5
+    exit $RETVAL
+fi
+
+if [ $# -gt 1 ]; then
+    RETVAL=2
+    exit $RETVAL
+fi
+
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    reload)
-        RETVAL=3
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    try-restart|reload)
+        RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
+            RETVAL=$?
         fi
         ;;
+    configtest)
+        configtest
+        RETVAL=$?
+        ;;
     status)
         status $prog
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
         RETVAL=3
         ;;
 esac



From fedora-extras-commits at redhat.com  Wed Sep 26 19:21:35 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 15:21:35 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.59,1.60
Message-ID: <200709261921.l8QJLZIV026874@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26676

Modified Files:
	kernel-xen.spec 
Log Message:
Remove reference to unused patch files on spec




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kernel-xen.spec	26 Sep 2007 18:52:12 -0000	1.59
+++ kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
@@ -326,7 +326,6 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21.7.bz2
-Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch11: nouveau-drm.patch
@@ -458,15 +457,11 @@
 Patch905: linux-2.6-modsign-core.patch
 Patch906: linux-2.6-modsign-script.patch
 
-# Tux http accelerator.
-Patch910: linux-2.6-tux.patch
-
 # 950 - 999 Xen
 # linux-2.6.21.7-xen-3.1.0.patch patch generated by
 # 'hg diff -rd91e11100fb0 -rd610071e6045 -X .hgtags' on
 # http://hg.et.redhat.com/kernel-dev/ehabkost/linux-2.6.21.y-xen-3.1.0
 Patch950: linux-2.6.21.7-xen-3.1.0.patch.bz2
-Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch960: linux-2.6-xen-blkfront-wait-add.patch
 Patch961: linux-2.6-xen-backwards-time.patch
 Patch962: linux-2.6-xen-irq_vector-uninitialize.patch
@@ -503,9 +498,6 @@
 Patch1100: linux-2.6-scsi-bounce-isa.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
 
-# NFS bits.
-Patch1200: linux-2.6-NFSD-ctlbits.patch
-
 # NIC driver fixes
 Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
 
@@ -566,13 +558,11 @@
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-fat-utf8.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
-Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
 Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch
 Patch2107: linux-2.6-usb-autosuspend-default-disable.patch
 
 # SATA Bits
-Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
 Patch2203: linux-2.6-libata-ali-atapi-dma.patch
@@ -1133,9 +1123,6 @@
 %patch906 -p1
 
 
-# Tux
-#%patch910 -p1
-
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -1184,8 +1171,6 @@
 #
 # Various NFS/NFSD fixes.
 #
-# kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports
-#%patch1200 -p1
 
 # NIC driver fixes
 # Don't print warnings about MSI failures on e1000
@@ -1294,8 +1279,6 @@
 
 # Use unicode VT's by default.
 %patch2103 -p1
-# Disable split page table lock
-#%patch2104 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
 # Disable MMCONFIG & MSI by default.
@@ -1303,8 +1286,6 @@
 # Disable USB autosuspend by default.
 %patch2107 -p1
 
-# Enable PATA ports on Promise SATA.
-#%patch2200 -p1
 # HPA support for libata.
 %patch2201 -p1
 # sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands



From fedora-extras-commits at redhat.com  Wed Sep 26 19:22:37 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Wed, 26 Sep 2007 15:22:37 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.9,1.10
Message-ID: <200709261922.l8QJMbVM027022@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26929

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
Fixed changelog dates




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-1.7.0-icedtea.spec	26 Sep 2007 19:19:37 -0000	1.9
+++ java-1.7.0-icedtea.spec	26 Sep 2007 19:22:05 -0000	1.10
@@ -731,10 +731,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+* Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg. Does not adhere to Fedora guidelines.
 
-* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+* Tue Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
 - Fixed mauve and jtreg test runs to not break the build when an error is thrown
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:35:10 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 26 Sep 2007 15:35:10 -0400
Subject: rpms/gedit/devel .cvsignore, 1.67, 1.68 gedit.spec, 1.141,
	1.142 sources, 1.69, 1.70
Message-ID: <200709261935.l8QJZA9s027764@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27725

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
- Update to 2.20.1 at the request of upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	18 Sep 2007 02:23:42 -0000	1.67
+++ .cvsignore	26 Sep 2007 19:34:37 -0000	1.68
@@ -1 +1 @@
-gedit-2.20.0.tar.bz2
+gedit-2.20.1.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gedit.spec	18 Sep 2007 03:06:03 -0000	1.141
+++ gedit.spec	26 Sep 2007 19:34:37 -0000	1.142
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.20.0
+Version: 	2.20.1
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.1-1
+- Update to 2.20.1 at the request of upstream
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	18 Sep 2007 02:23:42 -0000	1.69
+++ sources	26 Sep 2007 19:34:37 -0000	1.70
@@ -1 +1 @@
-6c14d4f3583c921bdd551df6cd822289  gedit-2.20.0.tar.bz2
+866757ca52dd402bfc2d7a88642b9767  gedit-2.20.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:36:42 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 15:36:42 -0400
Subject: rpms/kdepim/devel kdepim-enterprise-svn_checkout.sh, NONE,
	1.1 .cvsignore, 1.35, 1.36 kdepim.spec, 1.131, 1.132 sources,
	1.40, 1.41 cr16-app-kandy.png, 1.1, NONE cr32-app-kandy.png, 1.1,
	NONE cr48-app-kandy.png, 1.1, NONE kdepim-3.4.0-s390.patch, 1.1,
	NONE kdepim-3.4.92-libz.patch, 1.1,
	NONE kdepim-3.5.7-kde#140549.patch, 1.1, NONE
Message-ID: <200709261936.l8QJag0u027932@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27878

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-enterprise-svn_checkout.sh 
Removed Files:
	cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png 
	kdepim-3.4.0-s390.patch kdepim-3.4.92-libz.patch 
	kdepim-3.5.7-kde#140549.patch 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
- kdepim-enterprise branch 20070926 snapshot (r717374)

* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
- kdepim-enterprise branch 20070920 snapshot (r714749)




--- NEW FILE kdepim-enterprise-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=kdepim

set -x
rm -rf $EXPORT_DIR

# app
svn export  svn://anonsvn.kde.org/home/kde/branches/kdepim/enterprise/kdepim $EXPORT_DIR/

# auto*/configure bits
# svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/

tar cjf kdepim-enterprise-svn${DATE}.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
+++ .cvsignore	26 Sep 2007 19:36:09 -0000	1.36
@@ -1,16 +1,5 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
 kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn20070926.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
+++ kdepim.spec	26 Sep 2007 19:36:09 -0000	1.132
@@ -1,7 +1,12 @@
 
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders 
-%define final 0
+
+# enterprise branch
+%define ent_date 20070926
+%define ent_rev 714749
+
+#define debug 1 
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
+#define final 1 
 
 %define make_cvs 1
 
@@ -12,23 +17,24 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
+Release: 9.svn%{ent_date}.ent%{?dist}
+%else
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%endif
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
 
-Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
-Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -49,7 +55,7 @@
 BuildRequires: lockdev-devel
 BuildRequires: python-devel
 %ifnarch s390 s390x
-%if 0%{?fedora} > 6
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 %define _with_pilot_link --with-pilot-link
 BuildRequires: pilot-link-devel >= 0.12
 # AvantGo support via libmal
@@ -58,7 +64,6 @@
 %endif
 %{?_with_gnokii:BuildRequires: gnokii-devel}
 ## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html
-# may have to drop this when/if gpgme becomes LGPLv3
 BuildRequires: gpgme-devel
 %if 0%{?fedora} > 4  || 0%{?rhel} > 4
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -106,39 +111,26 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
-
-%ifarch s390 s390x
-%patch2 -p1 -b .s390
-rm -rf kpilot
-%endif
+%setup -q %{?ent_date: -n %{name}}
 
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+%if %{make_cvs}
+   make -f admin/Makefile.common cvs
+%endif
+
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
-%if %{make_cvs}
-   make -f admin/Makefile.common cvs
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+   %{!?debug:--disable-debug --disable-warnings} \
+   %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
    --with-gpgsm=%{_bindir}/gpgsm \
@@ -167,18 +159,6 @@
 done
 popd
 
-
-## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
-## some of these gems.  -- Rex
-%if 0
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
-   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
-   fi
-done
-%endif
-
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -247,6 +227,12 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
+- kdepim-enterprise branch 20070926 snapshot (r717374)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch 20070920 snapshot (r714749)
+
 * Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
 - drop OnlyShowIn=KDE munging
 - update %%description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Jun 2007 19:14:32 -0000	1.40
+++ sources	26 Sep 2007 19:36:09 -0000	1.41
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
+0d1f3d94721fbc40367aacbac91d6d34  kdepim-enterprise-svn20070926.tar.bz2


--- kdepim-3.4.0-s390.patch DELETED ---


--- kdepim-3.4.92-libz.patch DELETED ---


--- kdepim-3.5.7-kde#140549.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 19:38:21 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 15:38:21 -0400
Subject: rpms/mlton/devel mlton.spec,1.15,1.16
Message-ID: <200709261938.l8QJcLWo028069@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28049

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
- Build on ppc now that #247407 is fixed



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlton.spec	14 Sep 2007 01:35:04 -0000	1.15
+++ mlton.spec	26 Sep 2007 19:37:49 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -27,8 +27,8 @@
 
 Requires:	gmp-devel gcc
 
-# triggers GCC ICE on ppc (#268281)
-ExcludeArch:	ppc ppc64
+# need to bootstrap ppc64 still
+ExcludeArch:	ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
+- Build on ppc now that #247407 is fixed
+
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
 - Do not condition bootstrap source tag
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:40:01 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 26 Sep 2007 15:40:01 -0400
Subject: rpms/dhcp/devel dhcp-3.0.6-manpages.patch, 1.1, 1.2 dhcp.spec, 1.171,
	1.172
Message-ID: <200709261940.l8QJe1E3028201@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28169

Modified Files:
	dhcp-3.0.6-manpages.patch dhcp.spec 
Log Message:
* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-7
- In dhcp.conf.5, explain that if no next-server statement applies to the
  requesting client, the address 0.0.0.0 is used (#184484).


dhcp-3.0.6-manpages.patch:

Index: dhcp-3.0.6-manpages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-3.0.6-manpages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.6-manpages.patch	16 Aug 2007 18:33:06 -0000	1.1
+++ dhcp-3.0.6-manpages.patch	26 Sep 2007 19:39:59 -0000	1.2
@@ -1,6 +1,194 @@
+diff -up dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages dhcp-3.0.6/dhcpctl/dhcpctl.3
+--- dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
++++ dhcp-3.0.6/dhcpctl/dhcpctl.3	2007-09-26 15:22:12.000000000 -0400
+@@ -43,7 +43,7 @@
+ .\"
+ .\"
+ .Sh SYNOPSIS
+-.Fd #include <dhcpctl/dhcpctl.h>
++.Fd #include <dhcpctl.h>
+ .Ft dhcpctl_status
+ .Fo dhcpctl_initialize
+ .Fa void
+@@ -426,7 +426,7 @@ that most error checking has been ommitt
+ #include <netinet/in.h>
+ 
+ #include <isc/result.h>
+-#include <dhcpctl/dhcpctl.h>
++#include <dhcpctl.h>
+ 
+ int main (int argc, char **argv) {
+ 	dhcpctl_data_string ipaddrstring = NULL;
+diff -up dhcp-3.0.6/server/dhcpd.conf.5.manpages dhcp-3.0.6/server/dhcpd.conf.5
+--- dhcp-3.0.6/server/dhcpd.conf.5.manpages	2007-05-01 16:42:56.000000000 -0400
++++ dhcp-3.0.6/server/dhcpd.conf.5	2007-09-26 15:24:18.000000000 -0400
+@@ -531,9 +531,9 @@ primary server might look like this:
+ failover peer "foo" {
+   primary;
+   address anthrax.rc.vix.com;
+-  port 519;
++  port 647;
+   peer address trantor.rc.vix.com;
+-  peer port 520;
++  peer port 847;
+   max-response-delay 60;
+   max-unacked-updates 10;
+   mclt 3600;
+@@ -592,9 +592,7 @@ statement
+ .B port \fIport-number\fR\fB;\fR
+ .PP
+ The \fBport\fR statement declares the TCP port on which the server
+-should listen for connections from its failover peer.   This statement
+-may not currently be omitted, because the failover protocol does not
+-yet have a reserved TCP port number.
++should listen for connections from its failover peer.
+ .RE
+ .PP
+ The 
+@@ -606,10 +604,8 @@ statement
+ .PP
+ The \fBpeer port\fR statement declares the TCP port to which the
+ server should connect to reach its failover peer for failover
+-messages.   This statement may not be omitted because the failover
+-protocol does not yet have a reserved TCP port number.   The port
+-number declared in the \fBpeer port\fR statement may be the same as
+-the port number declared in the \fBport\fR statement.
++messages. The port number declared in the \fBpeer port\fR statement
++may be the same as the port number declared in the \fBport\fR statement.
+ .RE
+ .PP
+ The 
+@@ -1133,7 +1129,7 @@ the zone containing PTR records - for IS
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -1156,7 +1152,7 @@ dhcpd.conf file:
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -2114,7 +2110,8 @@ statement
+ The \fInext-server\fR statement is used to specify the host address of
+ the server from which the initial boot file (specified in the
+ \fIfilename\fR statement) is to be loaded.   \fIServer-name\fR should
+-be a numeric IP address or a domain name.
++be a numeric IP address or a domain name.  If no \fInext-server\fR statement
++applies to a given client, the address 0.0.0.0 is used.
+ .RE
+ .PP
+ The
+diff -up dhcp-3.0.6/common/dhcp-options.5.manpages dhcp-3.0.6/common/dhcp-options.5
+--- dhcp-3.0.6/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
++++ dhcp-3.0.6/common/dhcp-options.5	2007-09-26 15:22:12.000000000 -0400
+@@ -834,6 +834,24 @@ classless IP routing - it does not inclu
+ classless IP routing is now the most widely deployed routing standard,
+ this option is virtually useless, and is not implemented by any of the
+ popular DHCP clients, for example the Microsoft DHCP client.
++.PP
++NOTE to Red Hat dhclient users:
++.br
++The RedHat dhclient-script interprets trailing 0 octets of the target
++as indicating the subnet class of the route - so for this
++static-routes value:
++.br
++        option static-routes 172.0.0.0 172.16.2.254,
++.br
++                             192.168.0.0 192.168.2.254;
++.br
++the Red Hat dhclient-script will create routes:
++.br
++        172/8 via 172.16.2.254 dev $interface
++.br
++        192.168/16 via 192.168.2.254 dev $interface
++.br
++which slightly increases the usefulness of the static-routes option.
+ .RE
+ .PP
+ .nf
+diff -up dhcp-3.0.6/client/dhclient-script.8.manpages dhcp-3.0.6/client/dhclient-script.8
+--- dhcp-3.0.6/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
++++ dhcp-3.0.6/client/dhclient-script.8	2007-09-26 15:22:12.000000000 -0400
+@@ -47,7 +47,7 @@ customizations are needed, they should b
+ exit hooks provided (see HOOKS for details).   These hooks will allow the
+ user to override the default behaviour of the client in creating a
+ .B /etc/resolv.conf
+-file.
++file, and to handle DHCP options not handled by default.
+ .PP
+ No standard client script exists for some operating systems, even though
+ the actual client may work, so a pioneering user may well need to create
+@@ -91,6 +91,27 @@ present.   The
+ .B ETCDIR/dhclient-exit-hooks
+ script can modify the valid of exit_status to change the exit status
+ of dhclient-script.
++.PP
++Immediately after dhclient brings an interface UP with a new IP address,
++subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
++existence of an executable
++.B ETCDIR/dhclient-up-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface.
++.B ETCDIR/dhclient-${IF}-up-hooks
++script will override the generic script and be sourced when interface
++$IF has been brought up.
++.PP
++Immediately before dhclient brings an interface DOWN, removing its IP
++address, subnet mask, and routes, in the STOP/RELEASE  states, it will
++check for the existence of an executable
++.B ETCDIR/dhclient-down-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface
++.B ETCDIR/dhclient-${IF}-down-hooks
++script will override the generic script and be sourced when interface
++$IF is about to be brought down.
++
+ .SH OPERATION
+ When dhclient needs to invoke the client configuration script, it
+ defines a set of variables in the environment, and then invokes
+diff -up dhcp-3.0.6/client/dhclient.conf.5.manpages dhcp-3.0.6/client/dhclient.conf.5
+--- dhcp-3.0.6/client/dhclient.conf.5.manpages	2007-05-01 16:42:55.000000000 -0400
++++ dhcp-3.0.6/client/dhclient.conf.5	2007-09-26 15:22:12.000000000 -0400
+@@ -185,7 +185,8 @@ responding to the client send the client
+ options.   Only the option names should be specified in the request
+ statement - not option parameters.   By default, the DHCP server
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options. 
++domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
++and ntp-servers options.
+ .PP
+ In some cases, it may be desirable to send no parameter request list
+ at all.   To do this, simply write the request statement but specify
+@@ -581,6 +582,18 @@ database and will record the media type 
+ Whenever the client tries to renew the lease, it will use that same
+ media type.   The lease must expire before the client will go back to
+ cycling through media types.
++.PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as a Red Hat extension to enable dhclient to work
++on IBM zSeries z/OS Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file is used on a laptop running NetBSD
+ 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
 diff -up dhcp-3.0.6/client/dhclient.8.manpages dhcp-3.0.6/client/dhclient.8
 --- dhcp-3.0.6/client/dhclient.8.manpages	2007-05-01 16:42:55.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient.8	2007-08-15 12:08:48.000000000 -0400
++++ dhcp-3.0.6/client/dhclient.8	2007-09-26 15:22:12.000000000 -0400
 @@ -82,6 +82,28 @@ relay
  .B -w
  ]
@@ -141,181 +329,3 @@
  .SH CONFIGURATION
  The syntax of the dhclient.conf(5) file is discussed separately.
  .SH OMAPI
-diff -up dhcp-3.0.6/client/dhclient-script.8.manpages dhcp-3.0.6/client/dhclient-script.8
---- dhcp-3.0.6/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient-script.8	2007-08-15 11:55:11.000000000 -0400
-@@ -47,7 +47,7 @@ customizations are needed, they should b
- exit hooks provided (see HOOKS for details).   These hooks will allow the
- user to override the default behaviour of the client in creating a
- .B /etc/resolv.conf
--file.
-+file, and to handle DHCP options not handled by default.
- .PP
- No standard client script exists for some operating systems, even though
- the actual client may work, so a pioneering user may well need to create
-@@ -91,6 +91,27 @@ present.   The
- .B ETCDIR/dhclient-exit-hooks
- script can modify the valid of exit_status to change the exit status
- of dhclient-script.
-+.PP
-+Immediately after dhclient brings an interface UP with a new IP address,
-+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
-+existence of an executable
-+.B ETCDIR/dhclient-up-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface.
-+.B ETCDIR/dhclient-${IF}-up-hooks
-+script will override the generic script and be sourced when interface
-+$IF has been brought up.
-+.PP
-+Immediately before dhclient brings an interface DOWN, removing its IP
-+address, subnet mask, and routes, in the STOP/RELEASE  states, it will
-+check for the existence of an executable
-+.B ETCDIR/dhclient-down-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface
-+.B ETCDIR/dhclient-${IF}-down-hooks
-+script will override the generic script and be sourced when interface
-+$IF is about to be brought down.
-+
- .SH OPERATION
- When dhclient needs to invoke the client configuration script, it
- defines a set of variables in the environment, and then invokes
-diff -up dhcp-3.0.6/client/dhclient.conf.5.manpages dhcp-3.0.6/client/dhclient.conf.5
---- dhcp-3.0.6/client/dhclient.conf.5.manpages	2007-05-01 16:42:55.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient.conf.5	2007-08-15 11:56:40.000000000 -0400
-@@ -185,7 +185,8 @@ responding to the client send the client
- options.   Only the option names should be specified in the request
- statement - not option parameters.   By default, the DHCP server
- requests the subnet-mask, broadcast-address, time-offset, routers,
--domain-name, domain-name-servers and host-name options. 
-+domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
-+and ntp-servers options.
- .PP
- In some cases, it may be desirable to send no parameter request list
- at all.   To do this, simply write the request statement but specify
-@@ -581,6 +582,18 @@ database and will record the media type 
- Whenever the client tries to renew the lease, it will use that same
- media type.   The lease must expire before the client will go back to
- cycling through media types.
-+.PP
-+ \fBbootp-broadcast-always;\fR
-+.PP
-+The
-+.B bootp-broadcast-always
-+statement instructs dhclient to always set the bootp broadcast flag in
-+request packets, so that servers will always broadcast replies.
-+This is equivalent to supplying the dhclient -B argument, and has
-+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
-+This option is provided as a Red Hat extension to enable dhclient to work
-+on IBM zSeries z/OS Linux guests.
-+.PP
- .SH SAMPLE
- The following configuration file is used on a laptop running NetBSD
- 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
-diff -up dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages dhcp-3.0.6/dhcpctl/dhcpctl.3
---- dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
-+++ dhcp-3.0.6/dhcpctl/dhcpctl.3	2007-08-15 12:59:06.000000000 -0400
-@@ -43,7 +43,7 @@
- .\"
- .\"
- .Sh SYNOPSIS
--.Fd #include <dhcpctl/dhcpctl.h>
-+.Fd #include <dhcpctl.h>
- .Ft dhcpctl_status
- .Fo dhcpctl_initialize
- .Fa void
-@@ -426,7 +426,7 @@ that most error checking has been ommitt
- #include <netinet/in.h>
- 
- #include <isc/result.h>
--#include <dhcpctl/dhcpctl.h>
-+#include <dhcpctl.h>
- 
- int main (int argc, char **argv) {
- 	dhcpctl_data_string ipaddrstring = NULL;
-diff -up dhcp-3.0.6/server/dhcpd.conf.5.manpages dhcp-3.0.6/server/dhcpd.conf.5
---- dhcp-3.0.6/server/dhcpd.conf.5.manpages	2007-05-01 16:42:56.000000000 -0400
-+++ dhcp-3.0.6/server/dhcpd.conf.5	2007-08-15 13:00:35.000000000 -0400
-@@ -531,9 +531,9 @@ primary server might look like this:
- failover peer "foo" {
-   primary;
-   address anthrax.rc.vix.com;
--  port 519;
-+  port 647;
-   peer address trantor.rc.vix.com;
--  peer port 520;
-+  peer port 847;
-   max-response-delay 60;
-   max-unacked-updates 10;
-   mclt 3600;
-@@ -592,9 +592,7 @@ statement
- .B port \fIport-number\fR\fB;\fR
- .PP
- The \fBport\fR statement declares the TCP port on which the server
--should listen for connections from its failover peer.   This statement
--may not currently be omitted, because the failover protocol does not
--yet have a reserved TCP port number.
-+should listen for connections from its failover peer.
- .RE
- .PP
- The 
-@@ -606,10 +604,8 @@ statement
- .PP
- The \fBpeer port\fR statement declares the TCP port to which the
- server should connect to reach its failover peer for failover
--messages.   This statement may not be omitted because the failover
--protocol does not yet have a reserved TCP port number.   The port
--number declared in the \fBpeer port\fR statement may be the same as
--the port number declared in the \fBport\fR statement.
-+messages. The port number declared in the \fBpeer port\fR statement
-+may be the same as the port number declared in the \fBport\fR statement.
- .RE
- .PP
- The 
-@@ -1133,7 +1129,7 @@ the zone containing PTR records - for IS
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-@@ -1156,7 +1152,7 @@ dhcpd.conf file:
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-diff -up dhcp-3.0.6/common/dhcp-options.5.manpages dhcp-3.0.6/common/dhcp-options.5
---- dhcp-3.0.6/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
-+++ dhcp-3.0.6/common/dhcp-options.5	2007-08-15 12:10:12.000000000 -0400
-@@ -834,6 +834,24 @@ classless IP routing - it does not inclu
- classless IP routing is now the most widely deployed routing standard,
- this option is virtually useless, and is not implemented by any of the
- popular DHCP clients, for example the Microsoft DHCP client.
-+.PP
-+NOTE to Red Hat dhclient users:
-+.br
-+The RedHat dhclient-script interprets trailing 0 octets of the target
-+as indicating the subnet class of the route - so for this
-+static-routes value:
-+.br
-+        option static-routes 172.0.0.0 172.16.2.254,
-+.br
-+                             192.168.0.0 192.168.2.254;
-+.br
-+the Red Hat dhclient-script will create routes:
-+.br
-+        172/8 via 172.16.2.254 dev $interface
-+.br
-+        192.168/16 via 192.168.2.254 dev $interface
-+.br
-+which slightly increases the usefulness of the static-routes option.
- .RE
- .PP
- .nf


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- dhcp.spec	26 Sep 2007 19:20:47 -0000	1.171
+++ dhcp.spec	26 Sep 2007 19:39:59 -0000	1.172
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  6%{?dist}
+Release:  7%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-7
+- In dhcp.conf.5, explain that if no next-server statement applies to the
+  requesting client, the address 0.0.0.0 is used (#184484).
+
 * Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
 - Init script fixes for dhcpd and dhcrelay (#278601)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:41:22 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 15:41:22 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.487,1.488
Message-ID: <200709261941.l8QJfMEb028238@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215

Modified Files:
	eclipse.spec 
Log Message:
* 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.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- eclipse.spec	18 Sep 2007 16:04:08 -0000	1.487
+++ eclipse.spec	26 Sep 2007 19:40:49 -0000	1.488
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist} 
+Release:        21%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -71,6 +71,9 @@
 Patch25: 	%{name}-launcher-double-free-bug.patch
 #FIXME: file a bug upstream
 Patch26:        %{name}-launcher-fix-java-home.patch
+# On a 1.7 VM, generate 1.6-level bytecode
+# https://bugzilla.redhat.com/show_bug.cgi?id=288991
+Patch27:        %{name}-17vmgenerate16bytecode.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -350,6 +353,10 @@
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 popd
 
+pushd plugins/org.eclipse.jdt.core
+%patch27
+popd
+
 # use our system-installed javadocs
 sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
    plugins/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -1556,6 +1563,11 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:46:01 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:46:01 -0400
Subject: rpms/cdcollect/devel cdcollect.spec,1.1,1.2
Message-ID: <200709261946.l8QJk1CH028659@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28632

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
- set ExcludeArch: ppc64 as Mono doesn't exist there



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/cdcollect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdcollect.spec	26 Sep 2007 19:09:02 -0000	1.1
+++ cdcollect.spec	26 Sep 2007 19:45:28 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,6 +11,7 @@
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
+- set ExcludeArch: ppc64 as Mono doesn't exist there
+
 * Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
 - fixed URLs
 - removed unneeded BR: pkgconfig



From fedora-extras-commits at redhat.com  Wed Sep 26 19:48:23 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:48:23 -0400
Subject: rpms/cdcollect/F-7 cdcollect.spec,1.1,1.2
Message-ID: <200709261948.l8QJmNdo028787@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28755

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
- set ExcludeArch: ppc64 as Mono doesn't exist there



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/cdcollect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdcollect.spec	26 Sep 2007 19:12:27 -0000	1.1
+++ cdcollect.spec	26 Sep 2007 19:47:52 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,6 +11,7 @@
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
+- set ExcludeArch: ppc64 as Mono doesn't exist there
+
 * Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
 - fixed URLs
 - removed unneeded BR: pkgconfig



From fedora-extras-commits at redhat.com  Wed Sep 26 19:50:45 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 15:50:45 -0400
Subject: rpms/eclipse/devel eclipse-17vmgenerate16bytecode.patch, NONE,
	1.1 eclipse.spec, 1.488, 1.489
Message-ID: <200709261950.l8QJojj0028903@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-17vmgenerate16bytecode.patch 
Log Message:
Add patch, bump release.

eclipse-17vmgenerate16bytecode.patch:

--- NEW FILE eclipse-17vmgenerate16bytecode.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/core/JavaCore.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
retrieving revision 1.577
diff -u -r1.577 JavaCore.java
--- model/org/eclipse/jdt/core/JavaCore.java	1 Jun 2007 13:52:19 -0000	1.577
+++ model/org/eclipse/jdt/core/JavaCore.java	26 Sep 2007 19:30:44 -0000
@@ -4662,7 +4662,7 @@
 			case ClassFileConstants.MAJOR_VERSION_1_7:
 				options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_7);
 				options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_7);
-				options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_7);
+				options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_6);
 				options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
 				options.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR);
 				options.put(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE, JavaCore.ENABLED);


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- eclipse.spec	26 Sep 2007 19:40:49 -0000	1.488
+++ eclipse.spec	26 Sep 2007 19:50:13 -0000	1.489
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        21%{?dist} 
+Release:        22%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/



From fedora-extras-commits at redhat.com  Wed Sep 26 20:07:04 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 16:07:04 -0400
Subject: rpms/gtk-vnc/devel gtk-vnc-0.2.0-execmem.patch, NONE,
	1.1 gtk-vnc.spec, 1.4, 1.5
Message-ID: <200709262007.l8QK74KV003505@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3472

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.2.0-execmem.patch 
Log Message:
Remove use of PROT_EXEC
Resolves: rhbz #307531

gtk-vnc-0.2.0-execmem.patch:

--- NEW FILE gtk-vnc-0.2.0-execmem.patch ---
diff -rup gtk-vnc-0.2.0.orig/src/coroutine.c gtk-vnc-0.2.0.new/src/coroutine.c
--- gtk-vnc-0.2.0.orig/src/coroutine.c	2007-09-13 17:11:29.000000000 -0400
+++ gtk-vnc-0.2.0.new/src/coroutine.c	2007-09-26 15:48:23.000000000 -0400
@@ -44,8 +44,8 @@ int coroutine_init(struct coroutine *co)
 
 	co->cc.stack_size = co->stack_size;
 	co->cc.stack = mmap(0, co->stack_size,
-			    PROT_READ | PROT_WRITE | PROT_EXEC,
-			    MAP_SHARED | MAP_ANONYMOUS | MAP_GROWSDOWN,
+			    PROT_READ | PROT_WRITE,
+			    MAP_PRIVATE | MAP_ANONYMOUS,
 			    -1, 0);
 	if (co->cc.stack == MAP_FAILED)
 		return -1;


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-vnc.spec	14 Sep 2007 04:30:57 -0000	1.4
+++ gtk-vnc.spec	26 Sep 2007 20:06:31 -0000	1.5
@@ -3,10 +3,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-execmem.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -80,6 +82,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-2.fc8
+- Remove use of PROT_EXEC for coroutine stack (rhbz #307531 )
+
 * Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc8
 - Update to 0.2.0 release
 



From fedora-extras-commits at redhat.com  Wed Sep 26 20:23:51 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 26 Sep 2007 16:23:51 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.23, 1.24 pyxf86config.spec,
	1.44, 1.45 sources, 1.23, 1.24
Message-ID: <200709262023.l8QKNppr004240@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/pyxf86config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4212/devel

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
pyxf86config 0.3.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Mar 2007 20:12:21 -0000	1.23
+++ .cvsignore	26 Sep 2007 20:23:18 -0000	1.24
@@ -1 +1 @@
-pyxf86config-0.3.33.tar.bz2
+pyxf86config-0.3.34.tar.bz2


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pyxf86config.spec	21 Aug 2007 18:45:44 -0000	1.44
+++ pyxf86config.spec	26 Sep 2007 20:23:18 -0000	1.45
@@ -1,17 +1,17 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.33
-Release: 2%{?dist}
-URL: http://www.redhat.com/
-Source0: %{name}-%{version}.tar.bz2
-License: GPL
+Version: 0.3.34
+Release: 1%{?dist}
+URL: http://fedoraproject.org/wiki/pyxf86config
+Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
+License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: glib2
 BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 BuildRequires: python-devel
-BuildRequires: libxf86config-devel >= 1.1.1-52
+BuildRequires: libxf86config-devel >= 1.3.0.0-26
 
 ExcludeArch: s390 s390x
 
@@ -37,12 +37,17 @@
 
 %files
 %defattr(-,root,root)
-%doc README NEWS AUTHORS COPYING ChangeLog
+%doc README NEWS AUTHORS COPYING
 %{_libdir}/python?.?/site-packages/ixf86configmodule.so
 %{_libdir}/python?.?/site-packages/xf86config.py*
 
 
 %changelog
+* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 0.3.34-1
+- pyxf86config 0.3.34
+- License is GPLv2
+- Bump libxf86config-devel buildreq to pick up symbol visibility tweak
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 0.3.33-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Mar 2007 20:12:21 -0000	1.23
+++ sources	26 Sep 2007 20:23:18 -0000	1.24
@@ -1 +1 @@
-f76373f8b7a60e0f983bed177ee6dc89  pyxf86config-0.3.33.tar.bz2
+9299e5e91f457f036139a1f6c35a8bf2  pyxf86config-0.3.34.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 20:51:45 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 16:51:45 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.25,
	1.26 libsemanage.spec, 1.133, 1.134
Message-ID: <200709262051.l8QKpjma005144@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5120

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
- Fix genhomedircon code to only generate valid context
- Fixes autorelabel problem


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libsemanage-rhat.patch	6 Sep 2007 02:48:04 -0000	1.25
+++ libsemanage-rhat.patch	26 Sep 2007 20:51:42 -0000	1.26
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.3/include/semanage/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.6/include/semanage/handle.h
 --- nsalibsemanage/include/semanage/handle.h	2007-08-20 19:15:36.000000000 -0400
-+++ libsemanage-2.0.3/include/semanage/handle.h	2007-08-11 06:41:11.000000000 -0400
++++ libsemanage-2.0.6/include/semanage/handle.h	2007-09-26 16:22:02.000000000 -0400
 @@ -69,6 +69,10 @@
   * 1 for yes, 0 for no (default) */
  void semanage_set_create_store(semanage_handle_t * handle, int create_store);
@@ -12,9 +12,9 @@
  /* Set whether or not to disable dontaudits upon commit */
  void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.3/Makefile
+diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.6/Makefile
 --- nsalibsemanage/Makefile	2007-07-16 14:20:39.000000000 -0400
-+++ libsemanage-2.0.3/Makefile	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/Makefile	2007-09-26 16:22:02.000000000 -0400
 @@ -1,6 +1,9 @@
  all: 
  	$(MAKE) -C src all
@@ -25,9 +25,255 @@
  pywrap: 
  	$(MAKE) -C src pywrap
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.3/src/handle.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.6/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2007-07-16 14:20:38.000000000 -0400
++++ libsemanage-2.0.6/src/direct_api.c	2007-09-26 16:22:31.000000000 -0400
+@@ -700,7 +700,7 @@
+ 		goto cleanup;
+ 
+ 	if (sh->do_rebuild || modified) {
+-		retval = semanage_install_sandbox(sh);
++		retval = semanage_install_sandbox(sh, out);
+ 	}
+ 
+       cleanup:
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.6/src/genhomedircon.c
+--- nsalibsemanage/src/genhomedircon.c	2007-09-13 08:21:11.000000000 -0400
++++ libsemanage-2.0.6/src/genhomedircon.c	2007-09-26 16:39:40.000000000 -0400
+@@ -1,5 +1,6 @@
+-/* Author: Mark Goldman   <mgoldman at tresys.com>
+- * 			Paul Rosenfeld	<prosenfeld at tresys.com>
++/* Author: Mark Goldman	  <mgoldman at tresys.com>
++ * 	   Paul Rosenfeld <prosenfeld at tresys.com>
++ * 	   Todd C. Miller <tmiller at tresys.com>
+  *
+  * Copyright (C) 2007 Tresys Technology, LLC
+  *
+@@ -23,6 +24,8 @@
+ #include <semanage/seusers_policy.h>
+ #include <semanage/users_policy.h>
+ #include <semanage/user_record.h>
++#include <sepol/context.h>
++#include <sepol/context_record.h>
+ #include "semanage_store.h"
+ #include "seuser_internal.h"
+ #include "debug.h"
+@@ -80,6 +83,7 @@
+ 	int usepasswd;
+ 	const char *homedir_template_path;
+ 	semanage_handle_t *h_semanage;
++	sepol_policydb_t *policydb;
+ } genhomedircon_settings_t;
+ 
+ typedef struct user_entry {
+@@ -352,9 +356,48 @@
+ 	return retval;
+ }
+ 
+-static int write_home_dir_context(FILE * out, semanage_list_t * tpl,
+-				  const char *user, const char *seuser,
+-				  const char *home, const char *role_prefix)
++static const char * extract_context(Ustr *line)
++{
++	const char whitespace[] = " \t\n";
++	size_t off, len;
++
++	/* check for trailing whitespace */
++	off = ustr_spn_chrs_rev(line, 0, whitespace, strlen(whitespace));
++
++	/* find the length of the last field in line */
++	len = ustr_cspn_chrs_rev(line, off, whitespace, strlen(whitespace));
++
++	if (len == 0)
++		return NULL;
++	return ustr_cstr(line) + ustr_len(line) - (len + off);
++}
++
++static int check_line(genhomedircon_settings_t * s, Ustr *line)
++{
++	sepol_context_t *ctx_record = NULL;
++	const char *ctx_str;
++	int result;
++
++	ctx_str = extract_context(line);
++	if (!ctx_str)
++		return STATUS_ERR;
++
++	result = sepol_context_from_string(s->h_semanage->sepolh,
++					   ctx_str, &ctx_record);
++	if (result == STATUS_SUCCESS && ctx_record != NULL) {
++		sepol_msg_set_callback(s->h_semanage->sepolh, NULL, NULL);
++		result = sepol_context_check(s->h_semanage->sepolh,
++					     s->policydb, ctx_record);
++		sepol_msg_set_callback(s->h_semanage->sepolh, semanage_msg_relay_handler, NULL);		
++		sepol_context_free(ctx_record);
++	}
++	return result;
++}
++
++static int write_home_dir_context(genhomedircon_settings_t * s, FILE * out,
++				  semanage_list_t * tpl, const char *user,
++				  const char *seuser, const char *home,
++				  const char *role_prefix)
+ {
+ 	replacement_pair_t repl[] = {
+ 		{.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
+@@ -369,8 +412,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -380,8 +427,8 @@
+ 	return STATUS_ERR;
+ }
+ 
+-static int write_home_root_context(FILE * out, semanage_list_t * tpl,
+-				   char *homedir)
++static int write_home_root_context(genhomedircon_settings_t * s, FILE * out,
++				   semanage_list_t * tpl, char *homedir)
+ {
+ 	replacement_pair_t repl[] = {
+ 		{.search_for = TEMPLATE_HOME_ROOT,.replace_with = homedir},
+@@ -391,8 +438,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -402,7 +453,8 @@
+ 	return STATUS_ERR;
+ }
+ 
+-static int write_user_context(FILE * out, semanage_list_t * tpl, char *user,
++static int write_user_context(genhomedircon_settings_t * s, FILE * out,
++			      semanage_list_t * tpl, char *user,
+ 			      char *seuser, char *role_prefix)
+ {
+ 	replacement_pair_t repl[] = {
+@@ -415,8 +467,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -602,7 +658,7 @@
+ 	return head;
+ }
+ 
+-static int write_gen_home_dir_context(FILE * out, genhomedircon_settings_t * s,
++static int write_gen_home_dir_context(genhomedircon_settings_t * s, FILE * out,
+ 				      semanage_list_t * user_context_tpl,
+ 				      semanage_list_t * homedir_context_tpl)
+ {
+@@ -615,13 +671,13 @@
+ 	}
+ 
+ 	for (; users; pop_user_entry(&users)) {
+-		if (write_home_dir_context(out, homedir_context_tpl,
++		if (write_home_dir_context(s, out, homedir_context_tpl,
+ 					   users->name,
+ 					   users->sename, users->home,
+ 					   users->prefix)) {
+ 			return STATUS_ERR;
+ 		}
+-		if (write_user_context(out, user_context_tpl, users->name,
++		if (write_user_context(s, out, user_context_tpl, users->name,
+ 				       users->sename, users->prefix)) {
+ 			return STATUS_ERR;
+ 		}
+@@ -671,7 +727,7 @@
+ 			goto done;
+ 		}
+ 
+-		if (write_home_dir_context(out,
++		if (write_home_dir_context(s, out,
+ 					   homedir_context_tpl, FALLBACK_USER,
+ 					   FALLBACK_USER, ustr_cstr(temp),
+ 					   FALLBACK_USER_PREFIX) !=
+@@ -680,7 +736,7 @@
+ 			retval = STATUS_ERR;
+ 			goto done;
+ 		}
+-		if (write_home_root_context(out,
++		if (write_home_root_context(s, out,
+ 					    homeroot_context_tpl,
+ 					    h->data) != STATUS_SUCCESS) {
+ 			ustr_sc_free(&temp);
+@@ -690,13 +746,13 @@
+ 
+ 		ustr_sc_free(&temp);
+ 	}
+-	if (write_user_context(out, user_context_tpl,
++	if (write_user_context(s, out, user_context_tpl,
+ 			       ".*", FALLBACK_USER,
+ 			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
+ 		retval = STATUS_ERR;
+ 		goto done;
+ 	}
+-	if (write_gen_home_dir_context(out, s, user_context_tpl,
++	if (write_gen_home_dir_context(s, out, user_context_tpl,
+ 				       homedir_context_tpl) != STATUS_SUCCESS) {
+ 		retval = STATUS_ERR;
+ 	}
+@@ -711,7 +767,9 @@
+ 	return retval;
+ }
+ 
+-int semanage_genhomedircon(semanage_handle_t * sh, int usepasswd)
++int semanage_genhomedircon(semanage_handle_t * sh,
++			   sepol_policydb_t * policydb,
++			   int usepasswd)
+ {
+ 	genhomedircon_settings_t s;
+ 	FILE *out = NULL;
+@@ -725,6 +783,7 @@
+ 
+ 	s.usepasswd = usepasswd;
+ 	s.h_semanage = sh;
++	s.policydb = policydb;
+ 
+ 	if (!(out = fopen(s.fcfilepath, "w"))) {
+ 		/* couldn't open output file */
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.6/src/genhomedircon.h
+--- nsalibsemanage/src/genhomedircon.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.6/src/genhomedircon.h	2007-09-26 16:22:31.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ #include "utilities.h"
+ 
+-int semanage_genhomedircon(semanage_handle_t * sh, int usepasswd);
++int semanage_genhomedircon(semanage_handle_t * sh,
++			   sepol_policydb_t * policydb, int usepasswd);
+ 
+ #endif
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.6/src/handle.c
 --- nsalibsemanage/src/handle.c	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.3/src/handle.c	2007-08-11 06:41:31.000000000 -0400
++++ libsemanage-2.0.6/src/handle.c	2007-09-26 16:22:02.000000000 -0400
 @@ -68,6 +68,7 @@
  	/* By default do not create store */
  	sh->create_store = 0;
@@ -52,9 +298,9 @@
  void semanage_set_create_store(semanage_handle_t * sh, int create_store)
  {
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.3/src/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.6/src/handle.h
 --- nsalibsemanage/src/handle.h	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.3/src/handle.h	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/src/handle.h	2007-09-26 16:22:02.000000000 -0400
 @@ -58,6 +58,7 @@
  	int is_connected;
  	int is_in_transaction;
@@ -63,9 +309,9 @@
  	int do_rebuild;		/* whether to rebuild policy if there were no changes */
  	int modules_modified;
  	int create_store;	/* whether to create the store if it does not exist
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.3/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.6/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.3/src/libsemanage.map	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/src/libsemanage.map	2007-09-26 16:22:02.000000000 -0400
 @@ -9,6 +9,7 @@
  	  semanage_module_list_nth; semanage_module_get_name;
  	  semanage_module_get_version; semanage_select_store;
@@ -74,10 +320,10 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.6/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1130,7 +1120,7 @@
++++ libsemanage-2.0.6/src/semanage_store.c	2007-09-26 16:22:31.000000000 -0400
+@@ -1130,7 +1130,7 @@
  
        skip_reload:
  
@@ -86,3 +332,44 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
+@@ -1257,7 +1257,8 @@
+  * should be placed within a mutex lock to ensure that it runs
+  * atomically.	Returns commit number on success, -1 on error.
+  */
+-int semanage_install_sandbox(semanage_handle_t * sh)
++int semanage_install_sandbox(semanage_handle_t * sh,
++			     sepol_policydb_t * policydb)
+ {
+ 	int retval = -1, commit_num = -1;
+ 
+@@ -1272,7 +1273,7 @@
+ 	}
+ 	if (!sh->conf->disable_genhomedircon) {
+ 		if ((retval =
+-		     semanage_genhomedircon(sh, TRUE)) != 0) {
++		     semanage_genhomedircon(sh, policydb, TRUE)) != 0) {
+ 			ERR(sh, "semanage_genhomedircon returned error code %d.",
+ 			    retval);
+ 			goto cleanup;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.6/src/semanage_store.h
+--- nsalibsemanage/src/semanage_store.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.6/src/semanage_store.h	2007-09-26 16:22:31.000000000 -0400
+@@ -83,8 +83,6 @@
+ int semanage_get_modules_names(semanage_handle_t * sh,
+ 			       char ***filenames, int *len);
+ 
+-int semanage_install_sandbox(semanage_handle_t * sh);
+-
+ /* lock file routines */
+ int semanage_get_trans_lock(semanage_handle_t * sh);
+ int semanage_get_active_lock(semanage_handle_t * sh);
+@@ -102,7 +100,8 @@
+ int semanage_write_policydb(semanage_handle_t * sh,
+ 			    sepol_policydb_t * policydb);
+ 
+-int semanage_install_sandbox(semanage_handle_t * sh);
++int semanage_install_sandbox(semanage_handle_t * sh,
++			     sepol_policydb_t * policydb);
+ 
+ int semanage_verify_modules(semanage_handle_t * sh,
+ 			    char **module_filenames, int num_modules);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- libsemanage.spec	13 Sep 2007 12:29:42 -0000	1.133
+++ libsemanage.spec	26 Sep 2007 20:51:43 -0000	1.134
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
+- Fix genhomedircon code to only generate valid context
+- Fixes autorelabel problem
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
 - Upgrade to latest from NSA
 	* Change to use getpw* function calls to the _r versions from Todd Miller.



From fedora-extras-commits at redhat.com  Wed Sep 26 21:04:14 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 17:04:14 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc8-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.695, 1.696 kernel.spec, 1.189,
	1.190 linux-2.6-highres-timers.patch, 1.12, 1.13 sources, 1.656,
	1.657 upstream, 1.578,
	1.579 linux-2.6-powerpc-FULL_REGS-on-exec.patch, 1.1,
	NONE linux-2.6-wireless.patch, 1.7,
	NONE linux-2.6-x86-disable-local-apic-amd-c1e.patch, 1.2, NONE
Message-ID: <200709262104.l8QL4E7I011781@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11690

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	patch-2.6.23-rc8-git1.bz2.sign 
Removed Files:
	linux-2.6-powerpc-FULL_REGS-on-exec.patch 
	linux-2.6-wireless.patch 
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc8-git1



--- NEW FILE patch-2.6.23-rc8-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+q0oyGugalF9Dw4RAmKyAJ48DYCA2LMGCSLzV/kF5Nv53nNQLgCgjU5l
g14NA3U8DJNMxxasrY9YAhg=
=C0xL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- .cvsignore	25 Sep 2007 21:53:32 -0000	1.695
+++ .cvsignore	26 Sep 2007 21:03:40 -0000	1.696
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
+patch-2.6.23-rc8-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kernel.spec	26 Sep 2007 17:43:15 -0000	1.189
+++ kernel.spec	26 Sep 2007 21:03:40 -0000	1.190
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -556,7 +556,6 @@
 %if !%{nopatches}
 
 Patch19: linux-2.6-highres-timers.patch
-Patch20: linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -591,7 +590,6 @@
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-Patch141: linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
@@ -632,7 +630,6 @@
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
-Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch690: git-wireless-dev.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
@@ -969,7 +966,6 @@
 
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
-ApplyPatch linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -1041,8 +1037,6 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 # pegasos IDE
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-# fix RHBZ#301791
-ApplyPatch linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 # Exec shield
 ApplyPatch linux-2.6-execshield.patch
@@ -1143,7 +1137,6 @@
 ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
-ApplyPatch linux-2.6-wireless.patch
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
 # Add the wireless stack updates and drivers from wireless-dev
@@ -1812,6 +1805,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc8-git1
+
 * Wed Sep 26 2007 Dave Jones <davej at redhat.com>
 - Switch back to ye olde RTC driver. At least it worked.
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-highres-timers.patch	24 Sep 2007 18:17:29 -0000	1.12
+++ linux-2.6-highres-timers.patch	26 Sep 2007 21:03:40 -0000	1.13
@@ -5930,9 +5930,9 @@
  extern int apic_runs_main_timer;
  extern int ioapic_force;
 -extern int apic_mapped;
+ extern int disable_apic_timer;
  
  /*
-  * Define the default level of output to be very little
 @@ -79,8 +78,6 @@ extern void smp_local_timer_interrupt (v
  extern void setup_boot_APIC_clock (void);
  extern void setup_secondary_APIC_clock (void);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- sources	25 Sep 2007 01:28:29 -0000	1.656
+++ sources	26 Sep 2007 21:03:40 -0000	1.657
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2
+22a7616e220e358cee563d6626fe50df  patch-2.6.23-rc8-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- upstream	25 Sep 2007 01:28:29 -0000	1.578
+++ upstream	26 Sep 2007 21:03:40 -0000	1.579
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
+patch-2.6.23-rc8-git1.bz2


--- linux-2.6-powerpc-FULL_REGS-on-exec.patch DELETED ---


--- linux-2.6-wireless.patch DELETED ---


--- linux-2.6-x86-disable-local-apic-amd-c1e.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 21:07:52 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 26 Sep 2007 17:07:52 -0400
Subject: rpms/tremulous/devel tremulous-1.1.0-syslibs.patch, 1.1,
	1.2 tremulous.spec, 1.3, 1.4
Message-ID: <200709262107.l8QL7q7D011888@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tremulous/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11864

Modified Files:
	tremulous-1.1.0-syslibs.patch tremulous.spec 
Log Message:
* Wed Sep 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-5
- Update syslibs patch to make the system libjpeg use tremulous' Malloc and
  Free functions, instead of the libc ones


tremulous-1.1.0-syslibs.patch:

Index: tremulous-1.1.0-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous-1.1.0-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tremulous-1.1.0-syslibs.patch	5 Sep 2006 11:34:55 -0000	1.1
+++ tremulous-1.1.0-syslibs.patch	26 Sep 2007 21:07:49 -0000	1.2
@@ -1,164 +1,116 @@
---- tremulous/tremulous-1.1.0-src/Makefile.syslibs	2006-03-21 23:28:25.000000000 +0100
-+++ tremulous/tremulous-1.1.0-src/Makefile	2006-08-25 11:51:03.000000000 +0200
-@@ -97,6 +97,10 @@
- USE_OPENAL=1
- endif
- 
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
+diff -up /dev/null tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h
+--- /dev/null	2007-09-26 21:33:53.271006802 +0200
++++ tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h	2007-09-26 22:46:39.000000000 +0200
+@@ -0,0 +1,5 @@
++#include <stdio.h>
++#include <jpeglib.h>
 +
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -178,7 +182,7 @@
-   endif
-   endif
++void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++  size_t bufsize);
+diff -up tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs tremulous-1.1.0-src/src/renderer/tr_image.c
+--- tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs	2006-01-05 05:00:54.000000000 +0100
++++ tremulous-1.1.0-src/src/renderer/tr_image.c	2007-09-26 22:46:39.000000000 +0200
+@@ -31,9 +31,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
+  * You may also wish to include "jerror.h".
+  */
  
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
++#ifdef USE_SYSTEM_JPEG
++#include <jpeglib.h>
++#include "jpeg_memsrc.h"
++#else
+ #define JPEG_INTERNALS
+ #include "../jpeg-6/jpeglib.h"
+-
++#endif
  
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -191,6 +195,10 @@
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   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 );
+@@ -1399,6 +1403,11 @@ static void LoadJPG( const char *filenam
+   unsigned char *out;
+   byte	*fbuffer;
+   byte  *buf;
++  size_t bufsize;
++#ifdef USE_SYSTEM_JPEG
++  int i,j;
++  byte *inptr, *outptr;
++#endif
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+  endif
-+
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-     GL_CFLAGS =
-@@ -253,6 +261,10 @@
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-   endif
+   /* 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.
+@@ -1406,7 +1415,7 @@ static void LoadJPG( const char *filenam
+    * requires it in order to read binary files.
+    */
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),x86)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -842,41 +854,6 @@
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
--  $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
--  \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
-   $(B)/client/tr_bsp.o \
-@@ -899,7 +876,47 @@
-   $(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
+-  ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
++  bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
+   if (!fbuffer) {
+ 	return;
+   }
+@@ -1424,8 +1433,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() */
+ 
+@@ -1468,7 +1480,7 @@ static void LoadJPG( const char *filenam
+   }
+ 
+   memcount = pixelcount * 4;
+-  row_stride = cinfo.output_width * cinfo.output_components;
++  row_stride = cinfo.output_width * 4;
+ 
+   out = ri.Malloc(memcount);
+ 
+@@ -1489,6 +1501,21 @@ static void LoadJPG( const char *filenam
+ 	buf = ((out+(row_stride*cinfo.output_scanline)));
+ 	buffer = &buf;
+     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
++#ifdef USE_SYSTEM_JPEG
++    /* we have RGB data, we need to expand this out to ARGB */
++    inptr = buf + cinfo.output_width * 3 - 1;
++    outptr = buf + row_stride - 1;
 +
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+  Q3OBJ += \
-+    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
-+    $(B)/client/jccoefct.o  \
-+    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
-+    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
-+    $(B)/client/jcmainct.o \
-+    $(B)/client/jcmarker.o \
-+    $(B)/client/jcmaster.o \
-+    $(B)/client/jcomapi.o \
-+    $(B)/client/jcparam.o \
-+    $(B)/client/jcprepct.o \
-+    $(B)/client/jcsample.o \
-+    $(B)/client/jdapimin.o \
-+    $(B)/client/jdapistd.o \
-+    $(B)/client/jdatasrc.o \
-+    $(B)/client/jdcoefct.o \
-+    $(B)/client/jdcolor.o \
-+    $(B)/client/jddctmgr.o \
-+    $(B)/client/jdhuff.o \
-+    $(B)/client/jdinput.o \
-+    $(B)/client/jdmainct.o \
-+    $(B)/client/jdmarker.o \
-+    $(B)/client/jdmaster.o \
-+    $(B)/client/jdpostct.o \
-+    $(B)/client/jdsample.o \
-+    $(B)/client/jdtrans.o \
-+    $(B)/client/jerror.o \
-+    $(B)/client/jidctflt.o \
-+    $(B)/client/jmemmgr.o \
-+    $(B)/client/jmemnobs.o \
-+    $(B)/client/jutils.o
-+else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
++    for (i = 0; i < cinfo.output_width; i++) {
++      /* endian dependent? maybe for big endian this must be done after the
++         color/pixel copy? */
++      *outptr-- = 255;
++      for (j = 0; j < 3; j++) {
++        JOCTET color = *inptr--;
++        *outptr-- = color;
++      }
++    }
++#endif
+   }
+   
+   buf = out;
+@@ -1608,6 +1635,8 @@ boolean empty_output_buffer (j_compress_
+ }
  
- ifeq ($(ARCH),x86)
-   Q3OBJ += $(B)/client/vm_x86.o
-@@ -1056,6 +1073,7 @@
- $(B)/client/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC)
- $(B)/client/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC)
  
-+ifneq ($(USE_SYSTEM_JPEG),1)
- $(B)/client/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC)
- $(B)/client/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC)
- $(B)/client/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC)
-@@ -1091,6 +1109,7 @@
- $(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC)
- $(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
- $(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC)
-+endif
++#ifndef USE_SYSTEM_JPEG
++
+ /*
+  * Compression initialization.
+  * Before calling this, all parameters and a data destination must be set up.
+@@ -1699,6 +1728,8 @@ jpeg_write_scanlines (j_compress_ptr cin
+   return row_ctr;
+ }
  
- $(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC)  $(GL_CFLAGS)
-@@ -1100,6 +1119,7 @@
- $(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS)
- $(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) $(MINGW_CFLAGS)
-+$(B)/client/jpeg_memsrc.o : $(RDIR)/jpeg_memsrc.c; $(DO_CC)   $(GL_CFLAGS)
- $(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS)
- $(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS)
---- /dev/null	2006-08-25 12:00:12.687785000 +0200
-+++ tremulous/tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c	2006-08-25 11:51:03.000000000 +0200
++#endif
++
+ /*
+  * Terminate destination --- called by jpeg_finish_compress
+  * after all data has been written.  Usually needs to flush buffer.
+diff -up /dev/null tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c
+--- /dev/null	2007-09-26 21:33:53.271006802 +0200
++++ tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c	2007-09-26 22:46:39.000000000 +0200
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -323,111 +275,205 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
---- /dev/null	2006-08-25 12:00:12.687785000 +0200
-+++ tremulous/tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h	2006-08-25 11:51:03.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+  size_t bufsize);
---- tremulous/tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs	2006-01-05 05:00:54.000000000 +0100
-+++ tremulous/tremulous-1.1.0-src/src/renderer/tr_image.c	2006-08-25 14:31:12.000000000 +0200
-@@ -31,9 +31,13 @@
-  * You may also wish to include "jerror.h".
+diff -up tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c.syslibs tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c
+--- tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c.syslibs	2007-09-26 22:47:34.000000000 +0200
++++ tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c	2007-09-26 22:47:47.000000000 +0200
+@@ -15,10 +15,23 @@
+  * Note that the max_memory_to_use option is ignored by this implementation.
   */
  
 +#ifdef USE_SYSTEM_JPEG
++#include <stdio.h>
++#include <stdlib.h>
 +#include <jpeglib.h>
-+#include "jpeg_memsrc.h"
++
++#undef GLOBAL
++#define GLOBAL
++#define FAR
++
++typedef void * backing_store_ptr;
++
 +#else
  #define JPEG_INTERNALS
- #include "../jpeg-6/jpeglib.h"
--
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"		/* import the system-dependent declarations */
 +#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 );
-@@ -1399,6 +1403,11 @@
-   unsigned char *out;
-   byte	*fbuffer;
-   byte  *buf;
-+  size_t bufsize;
+ #include "../renderer/tr_local.h"
+ 
+@@ -83,7 +96,13 @@ GLOBAL void
+ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+ 			 long total_bytes_needed)
+ {
 +#ifdef USE_SYSTEM_JPEG
-+  int i,j;
-+  byte *inptr, *outptr;
++  fprintf(stderr,
++    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
++  exit(1);
++#else
+   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
 +#endif
+ }
  
-   /* 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.
-@@ -1406,7 +1415,7 @@
-    * 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;
-   }
-@@ -1424,8 +1433,11 @@
-   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
+diff -up tremulous-1.1.0-src/Makefile.syslibs tremulous-1.1.0-src/Makefile
+--- tremulous-1.1.0-src/Makefile.syslibs	2006-03-21 23:28:25.000000000 +0100
++++ tremulous-1.1.0-src/Makefile	2007-09-26 22:50:38.000000000 +0200
+@@ -97,6 +97,10 @@ ifndef USE_OPENAL
+ USE_OPENAL=1
+ endif
  
-   /* Step 3: read file parameters with jpeg_read_header() */
++ifndef USE_SYSTEM_JPEG
++USE_SYSTEM_JPEG=1
++endif
++
+ ifndef USE_OPENAL_DLOPEN
+ USE_OPENAL_DLOPEN=0
+ endif
+@@ -178,7 +182,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
  
-@@ -1468,7 +1480,7 @@
-   }
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = 
  
-   memcount = pixelcount * 4;
--  row_stride = cinfo.output_width * cinfo.output_components;
-+  row_stride = cinfo.output_width * 4;
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -191,6 +195,10 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
  
-   out = ri.Malloc(memcount);
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
++
+   ifeq ($(USE_SDL),1)
+     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+     GL_CFLAGS =
+@@ -253,6 +261,10 @@ ifeq ($(PLATFORM),linux)
+     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+   endif
  
-@@ -1489,6 +1501,21 @@
- 	buf = ((out+(row_stride*cinfo.output_scanline)));
- 	buffer = &buf;
-     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
-+#ifdef USE_SYSTEM_JPEG
-+    /* we have RGB data, we need to expand this out to ARGB */
-+    inptr = buf + cinfo.output_width * 3 - 1;
-+    outptr = buf + row_stride - 1;
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    CLIENT_LDFLAGS += -ljpeg
++  endif
 +
-+    for (i = 0; i < cinfo.output_width; i++) {
-+      /* endian dependent? maybe for big endian this must be done after the
-+         color/pixel copy? */
-+      *outptr-- = 255;
-+      for (j = 0; j < 3; j++) {
-+        JOCTET color = *inptr--;
-+        *outptr-- = color;
-+      }
-+    }
-+#endif
-   }
-   
-   buf = out;
-@@ -1608,6 +1635,8 @@
- }
+   ifeq ($(ARCH),x86)
+     # linux32 make ...
+     BASE_CFLAGS += -m32
+@@ -842,40 +854,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/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+   $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+   \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+@@ -899,7 +878,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
++
++ifneq ($(USE_SYSTEM_JPEG),1)
++  Q3OBJ += \
++    $(B)/client/jcapimin.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
++    $(B)/client/jccoefct.o  \
++    $(B)/client/jccolor.o \
++    $(B)/client/jfdctflt.o \
++    $(B)/client/jcdctmgr.o \
++    $(B)/client/jcphuff.o \
++    $(B)/client/jcmainct.o \
++    $(B)/client/jcmarker.o \
++    $(B)/client/jcmaster.o \
++    $(B)/client/jcomapi.o \
++    $(B)/client/jcparam.o \
++    $(B)/client/jcprepct.o \
++    $(B)/client/jcsample.o \
++    $(B)/client/jdapimin.o \
++    $(B)/client/jdapistd.o \
++    $(B)/client/jdatasrc.o \
++    $(B)/client/jdcoefct.o \
++    $(B)/client/jdcolor.o \
++    $(B)/client/jddctmgr.o \
++    $(B)/client/jdhuff.o \
++    $(B)/client/jdinput.o \
++    $(B)/client/jdmainct.o \
++    $(B)/client/jdmarker.o \
++    $(B)/client/jdmaster.o \
++    $(B)/client/jdpostct.o \
++    $(B)/client/jdsample.o \
++    $(B)/client/jdtrans.o \
++    $(B)/client/jerror.o \
++    $(B)/client/jidctflt.o \
++    $(B)/client/jmemmgr.o \
++    $(B)/client/jutils.o
++else
++Q3OBJ += $(B)/client/jpeg_memsrc.o
++endif
  
+ ifeq ($(ARCH),x86)
+   Q3OBJ += $(B)/client/vm_x86.o
+@@ -1056,6 +1074,7 @@ $(B)/client/l_precomp.o : $(BLIBDIR)/l_p
+ $(B)/client/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC)
+ $(B)/client/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC)
  
-+#ifndef USE_SYSTEM_JPEG
-+
- /*
-  * Compression initialization.
-  * Before calling this, all parameters and a data destination must be set up.
-@@ -1699,6 +1728,8 @@
-   return row_ctr;
- }
++ifneq ($(USE_SYSTEM_JPEG),1)
+ $(B)/client/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC)
+ $(B)/client/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC)
+ $(B)/client/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC)
+@@ -1089,8 +1108,9 @@ $(B)/client/jdtrans.o : $(JPDIR)/jdtrans
+ $(B)/client/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) $(GL_CFLAGS) $(MINGW_CFLAGS)
+ $(B)/client/jidctflt.o : $(JPDIR)/jidctflt.c; $(DO_CC)
+ $(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC)
+-$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
+ $(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC)
++endif
++$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
  
-+#endif
-+
- /*
-  * Terminate destination --- called by jpeg_finish_compress
-  * after all data has been written.  Usually needs to flush buffer.
+ $(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC)  $(GL_CFLAGS)
+@@ -1100,6 +1120,7 @@ $(B)/client/tr_curve.o : $(RDIR)/tr_curv
+ $(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS)
+ $(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) $(MINGW_CFLAGS)
++$(B)/client/jpeg_memsrc.o : $(RDIR)/jpeg_memsrc.c; $(DO_CC)   $(GL_CFLAGS)
+ $(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS)
+ $(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS)


Index: tremulous.spec
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tremulous.spec	24 Sep 2007 20:18:58 -0000	1.3
+++ tremulous.spec	26 Sep 2007 21:07:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           tremulous
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
@@ -43,11 +43,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch -p2 -z .syslibs
+%patch -p1 -z .syslibs
 
 # Rip out the jpeg sources and the SDL and freealut headers and use the
 # system versions instead
-rm -rf src/jpeg-6 src/SDL12 src/AL
+mv src/jpeg-6/jmemnobs.c .; rm src/jpeg-6/*; mv jmemnobs.c src/jpeg-6
+rm -r src/SDL12 src/AL
 
 
 %build
@@ -56,7 +57,8 @@
 make %{?_smp_mflags} \
     OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing -ffast-math" \
     DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
-    BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 CROSS_COMPILING=1
+    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
+    CROSS_COMPILING=1
 
 
 %install
@@ -104,6 +106,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-5
+- Update syslibs patch to make the system libjpeg use tremulous' Malloc and
+  Free functions, instead of the libc ones
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:35 -0700
Subject: [pkgdb] initscripts: johnp has requested watchbugzilla
Message-ID: <200709262110.l8QLAeXS027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:44 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:44 -0700
Subject: [pkgdb] initscripts: johnp has given up watchbugzilla
Message-ID: <200709262110.l8QLAeXV027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has given up the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:49 -0700
Subject: [pkgdb] initscripts: johnp has requested commit
Message-ID: <200709262110.l8QLAsse027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the commit acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:50 -0700
Subject: [pkgdb] initscripts: johnp has requested approveacls
Message-ID: <200709262110.l8QLAssh027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the approveacls acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:59 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:59 -0700
Subject: [pkgdb] initscripts: johnp has requested watchcommits
Message-ID: <200709262110.l8QLAssk027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchcommits acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:11:00 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:11:00 -0700
Subject: [pkgdb] initscripts: johnp has requested watchbugzilla
Message-ID: <200709262111.l8QLAeXY027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:21 -0700
Subject: [pkgdb] initscripts: cscott has requested watchbugzilla
Message-ID: <200709262112.l8QLCQKm027922@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:27 -0700
Subject: [pkgdb] initscripts: cscott has requested approveacls
Message-ID: <200709262112.l8QLCQKp027922@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the approveacls acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:24 -0700
Subject: [pkgdb] initscripts: cscott has requested watchcommits
Message-ID: <200709262112.l8QLCTrH027923@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the watchcommits acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:26 -0700
Subject: [pkgdb] initscripts: cscott has requested commit
Message-ID: <200709262112.l8QLCTrK027923@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the commit acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:38 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 26 Sep 2007 17:12:38 -0400
Subject: rpms/xmoto/FC-6 xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.13, 1.14
Message-ID: <200709262112.l8QLCcLo012151@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12043

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmoto.spec	30 Aug 2007 11:16:14 -0000	1.13
+++ xmoto.spec	26 Sep 2007 21:12:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Wed Sep 26 21:13:49 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:13:49 -0400
Subject: rpms/bzr/devel .cvsignore, 1.16, 1.17 bzr.spec, 1.23, 1.24 sources, 
	1.16, 1.17
Message-ID: <200709262113.l8QLDnK0012232@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12201

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 10:17:01 -0000	1.16
+++ .cvsignore	26 Sep 2007 21:13:16 -0000	1.17
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bzr.spec	30 Aug 2007 22:56:29 -0000	1.23
+++ bzr.spec	26 Sep 2007 21:13:17 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 10:17:01 -0000	1.16
+++ sources	26 Sep 2007 21:13:17 -0000	1.17
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:14:50 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:14:50 -0400
Subject: rpms/bzrtools/devel .cvsignore, 1.13, 1.14 bzrtools.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <200709262114.l8QLEojg012260@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12238

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2007 10:17:16 -0000	1.13
+++ .cvsignore	26 Sep 2007 21:14:16 -0000	1.14
@@ -1 +1 @@
-bzrtools-0.90.0.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bzrtools.spec	30 Aug 2007 22:47:24 -0000	1.21
+++ bzrtools.spec	26 Sep 2007 21:14:16 -0000	1.22
@@ -5,12 +5,12 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 0.90
-%define bzrnextver 0.91
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -72,6 +72,9 @@
 %{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
 * Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
 - Move plugin manually since setuptools has no way of knowing that bzr is
   arch specific.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2007 10:17:16 -0000	1.13
+++ sources	26 Sep 2007 21:14:16 -0000	1.14
@@ -1 +1 @@
-da7e97a4fd02a6b95cabfe5e187687ca  bzrtools-0.90.0.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:25:37 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:25:37 -0400
Subject: rpms/bzr-gtk/devel .cvsignore, 1.10, 1.11 bzr-gtk.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200709262125.l8QLPbUh012736@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Aug 2007 10:17:22 -0000	1.10
+++ .cvsignore	26 Sep 2007 21:25:04 -0000	1.11
@@ -1 +1 @@
-bzr-gtk-0.90.0.tar.gz
+bzr-gtk-0.91.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bzr-gtk.spec	30 Aug 2007 10:17:22 -0000	1.11
+++ bzr-gtk.spec	26 Sep 2007 21:25:04 -0000	1.12
@@ -1,14 +1,20 @@
+%{!?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)")}
 
+
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
 Name:           bzr-gtk
-Version:        0.90.0
+Version:        0.91.0
 Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
-Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0:        https://launchpad.net/bzr-gtk/0.91/%{version}/+download/bzr-gtk-%{version}.tar.gz
 # We can't use the notifier functionality without a bzr-dbus-package.
 Patch0:         bzr-gtk-disable-notifier.patch
 # Fix some bugs in the nautilus integration.  Submitted upstream
@@ -66,9 +72,20 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+fi
+
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
 mv $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
 
+# No translations yet
+#%find_lang olive
+
+# This won't do anything until after we add bzr-dbus.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,19 +94,28 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{python_sitearch}/bzrlib/plugins/gtk/
+%{_datadir}/applications/bazaar-properties.desktop
 
+#%files -n olive -f olive.lang
 %files -n olive
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{python_sitearch}/olive
+%{python_sitearch}/olive/
 %{_datadir}/olive/
 %{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/olive-gtk.desktop
 
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move the plugins manually as distutils doesn't know that bzr is arch
+  specific.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
 - Update to 0.90.0.
 - Update license tag to the new Licensing Guidelines.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2007 10:17:22 -0000	1.10
+++ sources	26 Sep 2007 21:25:04 -0000	1.11
@@ -1 +1 @@
-2fd76f9e3d9d8f56f1bb112cb0277634  bzr-gtk-0.90.0.tar.gz
+3b5d9c517494988a83d7ccaae8a18e2f  bzr-gtk-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:26:18 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 17:26:18 -0400
Subject: rpms/kernel/devel linux-2.6-highres-timers.patch,1.13,1.14
Message-ID: <200709262126.l8QLQIWY012896@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811

Modified Files:
	linux-2.6-highres-timers.patch 
Log Message:
fix build


linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-highres-timers.patch	26 Sep 2007 21:03:40 -0000	1.13
+++ linux-2.6-highres-timers.patch	26 Sep 2007 21:26:15 -0000	1.14
@@ -5309,7 +5309,7 @@
 -int disable_apic_timer __initdata;
 +static int apic_mapped;
 +static int apic_calibrate_pmtmr __initdata;
-+static int disable_apic_timer __initdata;
++int disable_apic_timer __initdata;
  
  /* Local APIC timer works in C2? */
  int local_apic_timer_c2_ok;



From fedora-extras-commits at redhat.com  Wed Sep 26 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:29:34 -0700
Subject: [pkgdb] vinagre: berrange has requested watchbugzilla
Message-ID: <200709262129.l8QLTd1S028580@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on vinagre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:29:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:29:36 -0700
Subject: [pkgdb] vinagre: berrange has requested watchcommits
Message-ID: <200709262129.l8QLTfZ0028581@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on vinagre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:53 2007
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 26 Sep 2007 17:34:53 -0400
Subject: rpms/echo-icon-theme/F-7 .cvsignore, 1.7, 1.8 echo-icon-theme.spec, 
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200709262134.l8QLYrOS013330@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/echo-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13296

Modified Files:
	.cvsignore echo-icon-theme.spec sources 
Log Message:
updated license to cc-by-sa 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Apr 2007 01:22:29 -0000	1.7
+++ .cvsignore	26 Sep 2007 21:34:21 -0000	1.8
@@ -1 +1 @@
-echo-icon-theme-0.2-20070419wiki.tar.bz2
+echo-icon-theme-0.2-20070427wiki.tar.bz2


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/echo-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- echo-icon-theme.spec	20 Apr 2007 01:22:29 -0000	1.9
+++ echo-icon-theme.spec	26 Sep 2007 21:34:21 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           echo-icon-theme
 Version:        0.2
-Release:        2.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.5.20070427wiki
+- Updated license to cc-by-sa 3.0
+
 * Thu Apr 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.2.20070419wiki
 - Drop scalable images again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Apr 2007 01:22:29 -0000	1.8
+++ sources	26 Sep 2007 21:34:21 -0000	1.9
@@ -1 +1 @@
-2bb2b93f0dda729eb1720eab7df04def  echo-icon-theme-0.2-20070419wiki.tar.bz2
+13cb964663615bc106ea89b4a7b9cf4c  echo-icon-theme-0.2-20070427wiki.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:34:55 -0700
Subject: [pkgdb] vinagre had acl change status
Message-ID: <200709262135.l8QLZ05p028798@bastion.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on vinagre (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:56 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:34:56 -0700
Subject: [pkgdb] vinagre had acl change status
Message-ID: <200709262135.l8QLZ05s028798@bastion.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on vinagre (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:41:17 2007
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 26 Sep 2007 17:41:17 -0400
Subject: rpms/echo-icon-theme/devel echo-icon-theme.spec,1.11,1.12
Message-ID: <200709262141.l8QLfHC8013639@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/echo-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13617

Modified Files:
	echo-icon-theme.spec 
Log Message:
updated license to cc-by-sa 3.0


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- echo-icon-theme.spec	4 Jun 2007 20:41:50 -0000	1.11
+++ echo-icon-theme.spec	26 Sep 2007 21:40:44 -0000	1.12
@@ -2,11 +2,11 @@
 
 Name:           echo-icon-theme
 Version:        0.2
-Release:        4.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
-License:        Creative Commons Attribution-ShareAlike 2.5
+License:        Creative Commons Attribution-ShareAlike 3.0
 URL:            http://fedoraproject.org/wiki/Artwork/EchoDevelopment
 Source0:        %{name}-%{version}-%{alphatag}.tar.bz2
 Patch0:		contexts.patch
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.5.20070427wiki
+- Updated license to cc-by-sa 3.0
+
 * Mon Jun 04 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.4.20070427wiki
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:53:04 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:53:04 -0400
Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.12,1.13
Message-ID: <200709262153.l8QLr4O3014278@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207

Modified Files:
	bzr-gtk.spec 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
- Olive must be moved to an arch specific directory as well for now.
  If rpm could have noarch subpackages, this would be fine to leave in
  python_sitelib.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bzr-gtk.spec	26 Sep 2007 21:25:04 -0000	1.12
+++ bzr-gtk.spec	26 Sep 2007 21:52:31 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.91.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -75,6 +75,7 @@
 if test "%{python_sitelib}" != "%{python_sitearch}" ; then
     install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
     mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+    mv $RPM_BUILD_ROOT%{python_sitelib}/olive $RPM_BUILD_ROOT%{python_sitearch}
 fi
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
@@ -109,6 +110,11 @@
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
+- Olive must be moved to an arch specific directory as well for now.
+  If rpm could have noarch subpackages, this would be fine to leave in
+  python_sitelib.
+
 * Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
 - Update to 0.91.0.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:58:26 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 26 Sep 2007 17:58:26 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.7,1.8
In-Reply-To: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>
References: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>
Message-ID: <46FAD602.5010305@redhat.com>

Lillian Angel wrote:
> Author: langel
> 
> Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32683
> 
> Modified Files:
> 	java-1.7.0-icedtea.spec 
> Log Message:
> * Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
> - Fixed running of Xvfb so it does not terminate after a successful test.
> - Fixed mauve and jtreg test runs to not break the build when an error is thrown
> 
> 
> 
> 
> 
> Index: java-1.7.0-icedtea.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
> +++ java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
> @@ -300,16 +300,20 @@
>    ./configure 
>    make
>    echo ====================MAUVE TESTING========================
> -  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
> +  %{expand: 

What's "%{expand:" ?

Tom



From fedora-extras-commits at redhat.com  Wed Sep 26 22:01:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 18:01:31 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.76,
	1.77 selinux-policy.spec, 1.535, 1.536
Message-ID: <200709262201.l8QM1VK1021811@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21782

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-14
- Allow xdm to talk to input device (fingerprint reader)
- Allow octave to run as java


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- policy-20070703.patch	25 Sep 2007 15:03:25 -0000	1.76
+++ policy-20070703.patch	26 Sep 2007 22:01:27 -0000	1.77
@@ -314,7 +314,7 @@
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-3.0.8/policy/modules/admin/alsa.if
 --- nsaserefpolicy/policy/modules/admin/alsa.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-22 06:43:02.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-25 15:03:17.000000000 -0400
 @@ -74,3 +74,39 @@
  	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
  	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
@@ -1508,7 +1508,7 @@
  application_executable_file(gconfd_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-20 18:08:22.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-25 17:13:09.000000000 -0400
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1528,7 +1528,7 @@
 +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
 +/usr/lib(64)?/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0)
-+
++/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 18:26:14.000000000 -0400
@@ -2565,7 +2565,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-25 12:10:32.000000000 -0400
 @@ -45,6 +45,11 @@
  	# start with basic domain
  	domain_base_type($1)
@@ -5117,7 +5117,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-24 14:34:13.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-25 15:01:58.000000000 -0400
 @@ -48,9 +48,7 @@
  type hplip_t;
  type hplip_exec_t;
@@ -5280,15 +5280,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -331,6 +355,7 @@
- dev_read_sysfs(cupsd_config_t)
- dev_read_urand(cupsd_config_t)
- dev_read_rand(cupsd_config_t)
-+dev_rw_generic_usb_dev(cupsd_config_t)
- 
- fs_getattr_all_fs(cupsd_config_t)
- fs_search_auto_mountpoints(cupsd_config_t)
-@@ -377,6 +402,14 @@
+@@ -377,6 +401,14 @@
  ')
  
  optional_policy(`
@@ -5303,19 +5295,22 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +559,6 @@
+@@ -525,11 +557,9 @@
+ allow hplip_t cupsd_etc_t:dir search;
  
  cups_stream_connect(hplip_t)
- 
+-
 -allow hplip_t hplip_etc_t:dir list_dir_perms;
 -read_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
 -read_lnk_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
 -files_search_etc(hplip_t)
--
++# For CUPS to run as a backend
++allow cupsd_t hplip_t:process signal;
++allow hplip_t cupsd_t:unix_stream_socket connected_stream_socket_perms;
+ 
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
- 
-@@ -560,7 +588,7 @@
+@@ -560,7 +590,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5324,7 +5319,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +615,6 @@
+@@ -587,8 +617,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -6465,7 +6460,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 11:00:13.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 13:08:41.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6477,7 +6472,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,47 @@
+@@ -172,3 +176,51 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6498,11 +6493,15 @@
 +		type krb5_host_rcache_t;
 +	')
 +
-+	files_search_tmp($1)
-+	allow $1 self:process setfscreate;
-+	selinux_validate_context($1)
-+	seutil_read_file_contexts($1)
-+	allow $1 krb5_host_rcache_t:file manage_file_perms;
++	tunable_policy(`allow_kerberos',`
++		files_search_tmp($1)
++		allow $1 self:process setfscreate;
++		selinux_validate_context($1)
++		seutil_read_file_contexts($1)
++		allow $1 krb5_host_rcache_t:file manage_file_perms;
++	')
++	# creates files as system_u no matter what the selinux user
++	domain_obj_id_change_exemption($1)
 +')
 +
 +########################################
@@ -7649,7 +7648,7 @@
  /usr/lib/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.0.8/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/postfix.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/postfix.if	2007-09-26 10:26:56.000000000 -0400
 @@ -41,6 +41,8 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -7659,7 +7658,16 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
  	read_files_pattern(postfix_$1_t,postfix_etc_t,postfix_etc_t)
-@@ -66,6 +68,7 @@
+@@ -56,6 +58,8 @@
+ 	allow postfix_$1_t postfix_var_run_t:file manage_file_perms;
+ 	files_pid_filetrans(postfix_$1_t,postfix_var_run_t,file)
+ 
++	auth_use_nsswitch(postfix_$1_t)
++
+ 	kernel_read_system_state(postfix_$1_t)
+ 	kernel_read_network_state(postfix_$1_t)
+ 	kernel_read_all_sysctls(postfix_$1_t)
+@@ -66,6 +70,7 @@
  
  	fs_search_auto_mountpoints(postfix_$1_t)
  	fs_getattr_xattr_fs(postfix_$1_t)
@@ -7667,19 +7675,19 @@
  
  	term_dontaudit_use_console(postfix_$1_t)
  
-@@ -132,10 +135,8 @@
+@@ -132,11 +137,6 @@
  	corenet_tcp_connect_all_ports(postfix_$1_t)
  	corenet_sendrecv_all_client_packets(postfix_$1_t)
  
 -	sysnet_read_config(postfix_$1_t)
 -
- 	optional_policy(`
+-	optional_policy(`
 -		nis_use_ypbind(postfix_$1_t)
-+		auth_use_nsswitch(postfix_$1_t)
- 	')
+-	')
  ')
  
-@@ -269,6 +270,42 @@
+ ########################################
+@@ -269,6 +269,42 @@
  
  ########################################
  ## <summary>
@@ -7722,7 +7730,7 @@
  ##	Do not audit attempts to use
  ##	postfix master process file
  ##	file descriptors.
-@@ -434,6 +471,25 @@
+@@ -434,6 +470,25 @@
  
  ########################################
  ## <summary>
@@ -7748,7 +7756,7 @@
  ##	Execute postfix user mail programs
  ##	in their respective domains.
  ## </summary>
-@@ -450,3 +506,22 @@
+@@ -450,3 +505,22 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -7773,7 +7781,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.0.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/postfix.te	2007-09-25 10:06:53.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/postfix.te	2007-09-26 10:27:53.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -7813,37 +7821,32 @@
  ########################################
  #
  # Postfix master process local policy
-@@ -168,6 +186,11 @@
+@@ -164,10 +182,9 @@
+ # postfix does a "find" on startup for some reason - keep it quiet
+ seutil_dontaudit_search_config(postfix_master_t)
  
+-sysnet_read_config(postfix_master_t)
+-
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
 +term_dontaudit_search_ptys(postfix_master_t)
-+
-+optional_policy(`
-+	auth_use_nsswitch(postfix_master_t)
-+')
  
  optional_policy(`
  	cyrus_stream_connect(postfix_master_t)
-@@ -179,9 +202,17 @@
+@@ -179,7 +196,11 @@
  ')
  
  optional_policy(`
+-	nis_use_ypbind(postfix_master_t)
 +	mysql_stream_connect(postfix_master_t)
 +')
 +
 +optional_policy(`
- 	nis_use_ypbind(postfix_master_t)
++	sendmail_signal(postfix_master_t)
  ')
  
-+optional_policy(`
-+	sendmail_signal(postfix_master_t)
-+')
-+
  ###########################################################
- #
- # Partially converted rules.  THESE ARE ONLY TEMPORARY
-@@ -263,6 +294,8 @@
+@@ -263,6 +284,8 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -7852,7 +7855,16 @@
  mta_read_aliases(postfix_local_t)
  mta_delete_spool(postfix_local_t)
  # For reading spamassasin
-@@ -377,7 +410,7 @@
+@@ -336,8 +359,6 @@
+ 
+ seutil_read_config(postfix_map_t)
+ 
+-sysnet_read_config(postfix_map_t)
+-
+ tunable_policy(`read_default_t',`
+ 	files_list_default(postfix_map_t)
+ 	files_read_default_files(postfix_map_t)
+@@ -377,7 +398,7 @@
  # Postfix pipe local policy
  #
  
@@ -7861,7 +7873,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -386,6 +419,10 @@
+@@ -386,6 +407,10 @@
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
  optional_policy(`
@@ -7872,7 +7884,15 @@
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -426,6 +463,11 @@
+@@ -418,14 +443,17 @@
+ term_dontaudit_use_all_user_ptys(postfix_postdrop_t)
+ term_dontaudit_use_all_user_ttys(postfix_postdrop_t)
+ 
+-sysnet_dns_name_resolve(postfix_postdrop_t)
+-
+ mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
+ 
+ optional_policy(`
  	cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
  ')
  
@@ -7884,7 +7904,23 @@
  optional_policy(`
  	ppp_use_fds(postfix_postqueue_t)
  	ppp_sigchld(postfix_postqueue_t)
-@@ -505,8 +547,6 @@
+@@ -454,8 +482,6 @@
+ init_sigchld_script(postfix_postqueue_t)
+ init_use_script_fds(postfix_postqueue_t)
+ 
+-sysnet_dontaudit_read_config(postfix_postqueue_t)
+-
+ ########################################
+ #
+ # Postfix qmgr local policy
+@@ -498,15 +524,11 @@
+ term_use_all_user_ptys(postfix_showq_t)
+ term_use_all_user_ttys(postfix_showq_t)
+ 
+-sysnet_dns_name_resolve(postfix_showq_t)
+-
+ ########################################
+ #
  # Postfix smtp delivery local policy
  #
  
@@ -7893,7 +7929,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -514,6 +554,8 @@
+@@ -514,6 +536,8 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -7902,7 +7938,7 @@
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
  ')
-@@ -538,9 +580,45 @@
+@@ -538,9 +562,45 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -8265,8 +8301,17 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-22 07:43:42.000000000 -0400
-@@ -64,9 +64,10 @@
++++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-25 11:50:50.000000000 -0400
+@@ -36,6 +36,8 @@
+ allow rlogind_t rlogind_devpts_t:chr_file { rw_chr_file_perms setattr };
+ term_create_pty(rlogind_t,rlogind_devpts_t)
+ 
++domain_interactive_fd(rlogind_t)
++
+ # for /usr/lib/telnetlogin
+ can_exec(rlogind_t, rlogind_exec_t)
+ 
+@@ -64,9 +66,10 @@
  fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -8278,7 +8323,7 @@
  
  files_read_etc_files(rlogind_t)
  files_read_etc_runtime_files(rlogind_t)
-@@ -82,21 +83,17 @@
+@@ -82,21 +85,17 @@
  
  miscfiles_read_localization(rlogind_t)
  
@@ -8702,7 +8747,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.8/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/samba.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/samba.te	2007-09-25 17:09:36.000000000 -0400
 @@ -137,6 +137,11 @@
  type winbind_var_run_t;
  files_pid_file(winbind_var_run_t)
@@ -9302,7 +9347,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te	2007-09-26 11:12:03.000000000 -0400
 @@ -67,6 +67,7 @@
  corenet_sendrecv_smtp_client_packets(setroubleshootd_t)
  
@@ -9618,7 +9663,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ssh.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ssh.if	2007-09-25 12:18:11.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -9743,8 +9788,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-22 07:45:00.000000000 -0400
-@@ -32,7 +32,6 @@
++++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-25 11:50:42.000000000 -0400
+@@ -32,12 +32,13 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
  allow telnetd_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
@@ -9752,7 +9797,14 @@
  allow telnetd_t self:capability { setuid setgid };
  
  allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr };
-@@ -62,10 +61,12 @@
+ term_create_pty(telnetd_t,telnetd_devpts_t)
+ 
++domain_interactive_fd(telnetd_t)
++
+ manage_dirs_pattern(telnetd_t,telnetd_tmp_t,telnetd_tmp_t)
+ manage_files_pattern(telnetd_t,telnetd_tmp_t,telnetd_tmp_t)
+ files_tmp_filetrans(telnetd_t, telnetd_tmp_t, { file dir })
+@@ -62,10 +63,12 @@
  
  fs_getattr_xattr_fs(telnetd_t)
  
@@ -9765,7 +9817,7 @@
  files_read_etc_files(telnetd_t)
  files_read_etc_runtime_files(telnetd_t)
  # for identd; cjp: this should probably only be inetd_child rules?
-@@ -80,27 +81,26 @@
+@@ -80,27 +83,26 @@
  
  miscfiles_read_localization(telnetd_t)
  
@@ -10272,7 +10324,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-21 19:21:31.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-26 09:40:50.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -10317,7 +10369,15 @@
  corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
-@@ -246,6 +259,7 @@
+@@ -197,6 +210,7 @@
+ dev_getattr_mouse_dev(xdm_t)
+ dev_setattr_mouse_dev(xdm_t)
+ dev_rw_apm_bios(xdm_t)
++dev_rw_input_dev(xdm_t)
+ dev_setattr_apm_bios_dev(xdm_t)
+ dev_rw_dri(xdm_t)
+ dev_rw_agp(xdm_t)
+@@ -246,6 +260,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -10325,7 +10385,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +271,7 @@
+@@ -257,6 +272,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -10333,7 +10393,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -268,9 +283,14 @@
+@@ -268,9 +284,14 @@
  userdom_create_all_users_keys(xdm_t)
  # for .dmrc
  userdom_read_unpriv_users_home_content_files(xdm_t)
@@ -10348,7 +10408,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +326,11 @@
+@@ -306,6 +327,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -10360,7 +10420,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +373,8 @@
+@@ -348,12 +374,8 @@
  ')
  
  optional_policy(`
@@ -10374,7 +10434,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +406,7 @@
+@@ -385,7 +407,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -10383,7 +10443,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +446,10 @@
+@@ -425,6 +447,10 @@
  ')
  
  optional_policy(`
@@ -10394,7 +10454,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +459,20 @@
+@@ -434,47 +460,20 @@
  ')
  
  optional_policy(`
@@ -13472,12 +13532,13 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-22 06:43:22.000000000 -0400
-@@ -184,6 +184,10 @@
++++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-25 15:03:25.000000000 -0400
+@@ -184,6 +184,11 @@
  ')
  
  optional_policy(`
 +	alsa_search_lib(udev_t)
++	alsa_read_lib(udev_t)
 +')
 +
 +optional_policy(`
@@ -15559,7 +15620,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/xen.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/xen.te	2007-09-25 15:21:46.000000000 -0400
 @@ -45,9 +45,7 @@
  
  type xenstored_t;
@@ -15679,15 +15740,24 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -353,6 +355,7 @@
+@@ -351,8 +353,11 @@
+ 
+ storage_raw_read_fixed_disk(xm_t)
  
++fs_getattr_all_fs(xm_t)
++
  term_use_all_terms(xm_t)
  
 +init_stream_connect_script(xm_t)
  init_rw_script_stream_sockets(xm_t)
  init_use_fds(xm_t)
  
-@@ -366,3 +369,14 @@
+@@ -363,6 +368,19 @@
+ 
+ sysnet_read_config(xm_t)
+ 
++userdom_dontaudit_search_sysadm_home_dirs(xm_t)
++
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- selinux-policy.spec	25 Sep 2007 14:20:38 -0000	1.535
+++ selinux-policy.spec	26 Sep 2007 22:01:27 -0000	1.536
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -365,6 +365,10 @@
 %endif
 
 %changelog
+* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-14
+- Allow xdm to talk to input device (fingerprint reader)
+- Allow octave to run as java
+
 * Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
 - Allow login programs to set ioctl on /proc
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:08:41 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:08:41 -0400
Subject: rpms/setroubleshoot/F-7 .cvsignore, 1.73, 1.74 setroubleshoot.init, 
	1.9, 1.10 setroubleshoot.spec, 1.88, 1.89 sources, 1.84, 1.85
Message-ID: <200709262208.l8QM8f5Q022728@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22641/F-7

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to latest upstream, fix requires for selinux-policy



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Aug 2007 19:36:55 -0000	1.73
+++ .cvsignore	26 Sep 2007 22:08:09 -0000	1.74
@@ -1 +1 @@
-setroubleshoot-1.10.1.tar.gz
+setroubleshoot-1.10.6.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setroubleshoot.init	15 Sep 2006 20:52:45 -0000	1.9
+++ setroubleshoot.init	26 Sep 2007 22:08:09 -0000	1.10
@@ -9,22 +9,49 @@
 # config: /etc/setroubleshoot/setroubleshoot.cfg
 # pidfile: /var/run/setroubleshoot.pid
 #
+
+### BEGIN INIT INFO
+# Provides: lsb-setroubleshootd
+# Required-Start: $local_fs $syslog $network $named
+# Required-Stop: $local_fs $syslog $network $named
+# Default-Start:  3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop SELinux Troubleshooting Daemon
+# Description: controls operation of the SELinux Troubleshooting Daemon
+#	(setroubleshootd) which listens for SELinux AVC denial messages
+#	analyzes it and provides a friendly interpretation.
+### END INIT INFO
+
 # Return values according to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - insufficient privilege
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
+# 0	success
+# 1	generic or unspecified error (current practice)
+# 2	invalid or excess argument(s)
+# 3	unimplemented feature (for example, "reload")
+# 4	user had insufficient privilege
+# 5	program is not installed
+# 6	program is not configured
+# 7	program is not running
+
+# Command argument
+# start		start the service
+# stop		stop the service
+# restart	stop and restart the service if the service is already running, otherwise start the service
+# try-restart	restart the service if the service is already running
+# reload	cause the configuration of the service to be reloaded without actually stopping and restarting the service
+# force-reload	cause the configuration to be reloaded if the service supports this, otherwise restart the service if it is running
+# status	print the current status of the service
+
+# start, stop, restart, force-reload, and status actions must be supported
+# reload and the try-restart actions are optional.
+# the init script.
+
+
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
 . /etc/init.d/functions
 
-
 # Silently exit is SELinux is not enabled
 [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
@@ -44,6 +71,9 @@
     if test $RETVAL = 0 ; then
         touch /var/lock/subsys/$prog
     fi
+    if test $RETVAL = 3 ; then
+	echo -n $"Cannot start $prog: SELinux not enabled"
+    fi
     return $RETVAL
 }
 
@@ -99,17 +129,17 @@
     restart)
 	restart
 	;;
-    reload)
+    force-reload|reload)
 	reload
 	;;
-    condrestart)
+    try-restart|condrestart)
 	condrestart
 	;;
     cleardb)
 	cleardb
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|cleardb}"
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload|cleardb}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- setroubleshoot.spec	23 Aug 2007 19:36:55 -0000	1.88
+++ setroubleshoot.spec	26 Sep 2007 22:08:09 -0000	1.89
@@ -1,8 +1,8 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.1
+Version: 1.10.6
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
@@ -25,6 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
+%{?fc7: Requires: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -146,8 +148,8 @@
 %{pkgpythondir}/__init__.py*
 %{pkgpythondir}/access_control.py*
 %{pkgpythondir}/analyze.py*
+%{pkgpythondir}/audit_data.py*
 %{pkgpythondir}/avc_audit.py*
-%{pkgpythondir}/avc_auparse.py*
 %{pkgpythondir}/config.py*
 %{pkgpythondir}/email_alert.py*
 %{pkgpythondir}/errcode.py*
@@ -171,6 +173,133 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Wed Sep 26 2007 John Dennis <jdennis at redhat.com> - 1.10.6-1
+	- make selinx-policy requires in spec file specific to dist tag
+
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.5-1
+	- update code for command line log file scanning to work with
+	  new log file scanning code introduced for the browser.
+
+	- update Bulgarian translation (Doncho N. Gunchev (gunchev at gmail.com))
+
+	- update Polish translation (Piotr Dr??g (raven at pmail.pl))
+
+	- Resolves bug #239893: sealert wakes up very often
+	  This was caused by the use of threads and pygtk's thread signal
+	  handling.  The only use of threads in sealert was for log file
+	  scanning so that the UI would remain responsive during a
+	  scan. Threads in sealert have now been completely
+	  removed. Instead the scanning work is performed in a gobject idle
+	  function called from the main loop. The idle function is written
+	  as a python generator function which allows for the function to
+	  perform a small amount of work, save it's execution state and
+	  return. The next time the idle function is called from the main
+	  loop it resumes execution from it's last state until it decides
+	  to yield control again. This way the long running scan/analysis
+	  can be performed in small successive units of work during the
+	  time the application is otherwise idle and it does not interfere
+	  with the rest of the GUI event processing. Everything now occurs
+	  in an event loop, think of it as the applications process/thread
+	  scheduler whose event handlers execute time slices.
+
+	- rewrote parts of the audit input pipeline to use generators
+	  instead of callbacks, thus permitting the logfile scanning code
+	  to yield control with more granularity. Also updated
+	  test_setroubleshootd and audisp_listen to use the new
+	  generator/yield logic.
+
+	- rewrote the dialog used for scanning log files, progress bar
+	  updates are now in the dialog, the scan can be terminated part
+	  way through, errors from the scan are reported in pop-up dialog,
+	  one can only dismiss the dialog with success if the scan had
+	  been successfully run to completion, otherwise the user is only
+	  left with the option to cancel.
+
+	- Relates bug #252035  bug #247469, setroubleshootd and sealert should
+	  exit if SELinux is disabled.
+
+	- add utility functions escape_html() and unescape_html()
+
+	- fix initial sort order in browser, track sort order in browser
+
+	- modify AVC.get_path() to only return a value if the 'path' field is
+	  set, formerly it also considered the fields 'name' & 'file' which were
+	  incorrect. get_path() now also looks to see if the string begins with a
+	  slash for a fully qualified path, if not it looks to see if its a 
+	  pseudo path such as 'pipe[12345]' or 'socket[12345]' and if so strips out
+	  the instance information inside the brackets and returns just the type of 
+	  the pseudo path. This is done because we do not want path information
+	  in the signature to be unique for each instance of the denial.
+
+	- modify the TimeStamp class to hide it's internal datetime member,
+	  remove the cmp() method, the internal __cmp__ will be automatically invoked.
+
+	- require selinux policy version in spec file to allow system dbus use
+	
+	- Resolves bug #256601: audit2allow generates incorrect syntax when comma "," in
+	  denied list
+
+	- update po i18n files
+
+	- Add support for pruning database by age and size
+
+
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
+	- fix init script
+
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- modify avc_audit.py to use new audit_data.py implementation
+
+	- can listen for audit events on either /var/run/audit_events
+	  in bindary protocol mode or /var/run/audisp_events in
+	  text protocol mode
+
+* Thu Sep  6 2007 John Dennis <jdennis at redhat.com> - 1.10.2-1
+	- remove all copied code from test_setroubleshootd, now we import
+	  from setroubleshoot
+	
+	- export ClientConnectionHandler from rpc.py as a base class.
+	  Derive SetroubleshootdClientConnectionHandler and
+	  AuditClientConnectionHandler from ClientConnectionHandler.
+
+	- add audisp_listen as test program
+
+	- create setroubleshoot sym link in top devel directory pointing
+	  to src so import setroubleshoot.foo if PYTHONPATH=topdir
+
+	- add get_option, convert_cfg_type to config.py.in so that one
+	  can pass optional dict to override config file settings
+
+	- rewrite log_init() so it's easier for other programs to use it,
+	  fix the import logic concering log & config
+
+	- remove log code from test_setroubleshoot, now just does import
+	  from setroubleshoot.
+	
+	- test_setroubleshootd can now handle audit records in both text
+	  and binary formats, can be selected by command line arg. It can now
+	  either output to clients connecting on a socket or to stdout. Can
+	  now optionally exit after N socket client connections.
+
+	- remove non audit record lines from test data
+
+	- remove config_init() and log_init() from package __init__.py
+	  It was the wrong place to call them, now call them when the
+	  process initializes before the first setroubleshoot imports
+
+	- add parse_config_setting() and set_config() to config module
+	- setroubleshootd now accepts -c --config command line arg
+	- test_sectroubleshoot: add err defines & program_error exception
+	  add is_valid() tests to assure we read a valid audit record
+	  log the unrecognized line if not valid, clean up socket close()
+
+	- Relates Bug #247056, update initscript to LSB standards
+	  Note: LSB initscripts in Fedora is not yet a resolved issue,
+	  the changes implemented were to add an LSB block and support
+	  the new LSB try-restart and force-reload commands. However
+	  the new /lib/lsb/init-functions are NOT currently used as this
+	  is the unstable part.
+
 * Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
 	- add BuildRequires perl-XML-Parser
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	23 Aug 2007 19:36:55 -0000	1.84
+++ sources	26 Sep 2007 22:08:09 -0000	1.85
@@ -1 +1 @@
-a1a0c6f42c966485a10170cc7fcf6014  setroubleshoot-1.10.1.tar.gz
+3189248dedf6ff67a4a79ce61172b56b  setroubleshoot-1.10.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:11 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:11 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLGf6030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:16 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLGf9030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:23 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLGfC030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:22 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:22 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLRaa030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:26 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLRad030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:27 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLWZo030080@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:33 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:33 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLRag030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:38 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLWZr030080@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:41 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLkvm030180@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:37:21 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:37:21 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.89,1.90
Message-ID: <200709262237.l8QMbLCh024101@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24064

Modified Files:
	setroubleshoot.spec 
Log Message:
fix duplicate requires keyword



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- setroubleshoot.spec	26 Sep 2007 22:08:09 -0000	1.89
+++ setroubleshoot.spec	26 Sep 2007 22:36:49 -0000	1.90
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:39:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 18:39:03 -0400
Subject: rpms/kernel/devel
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch,
	NONE, 1.1 kernel.spec, 1.190, 1.191
Message-ID: <200709262239.l8QMd3sW024211@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24168

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- x86 e820 bugfix


linux-2.6-x86-setup-handle-improperly-terminated-E820.patch:

--- NEW FILE linux-2.6-x86-setup-handle-improperly-terminated-E820.patch ---
commit 2efa33f81ef56e7700c09a3d8a881c96692149e5
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Wed Sep 26 14:11:43 2007 -0700

    [x86 setup] Handle case of improperly terminated E820 chain
    
    At least one system (a Geode system with a Digital Logic BIOS) has
    been found which suddenly stops reporting the SMAP signature when
    reading the E820 memory chain.  We can't know what, exactly, broke in
    the BIOS, so if we detect this situation, declare the E820 data
    unusable and fall back to E801.
    
    Also, revert to original behavior of always probing all memory
    methods; that way all the memory information is available to the
    kernel.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Jordan Crouse <jordan.crouse at amd.com>
    Cc: Joerg Pommnitz <pommnitz at yahoo.com>

diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index 1a2e62d..bccaa1c 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -20,6 +20,7 @@
 
 static int detect_memory_e820(void)
 {
+	int count = 0;
 	u32 next = 0;
 	u32 size, id;
 	u8 err;
@@ -33,14 +34,24 @@ static int detect_memory_e820(void)
 		      "=m" (*desc)
 		    : "D" (desc), "a" (0xe820));
 
-		if (err || id != SMAP)
+		/* Some BIOSes stop returning SMAP in the middle of
+		   the search loop.  We don't know exactly how the BIOS
+		   screwed up the map at that point, we might have a
+		   partial map, the full map, or complete garbage, so
+		   just return failure. */
+		if (id != SMAP) {
+			count = 0;
 			break;
+		}
 
-		boot_params.e820_entries++;
+		if (err)
+			break;
+
+		count++;
 		desc++;
-	} while (next && boot_params.e820_entries < E820MAX);
+	} while (next && count < E820MAX);
 
-	return boot_params.e820_entries;
+	return boot_params.e820_entries = count;
 }
 
 static int detect_memory_e801(void)
@@ -89,11 +100,16 @@ static int detect_memory_88(void)
 
 int detect_memory(void)
 {
+	int err = -1;
+
 	if (detect_memory_e820() > 0)
-		return 0;
+		err = 0;
 
 	if (!detect_memory_e801())
-		return 0;
+		err = 0;
+
+	if (!detect_memory_88())
+		err = 0;
 
-	return detect_memory_88();
+	return err;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kernel.spec	26 Sep 2007 21:03:40 -0000	1.190
+++ kernel.spec	26 Sep 2007 22:38:30 -0000	1.191
@@ -672,6 +672,7 @@
 Patch1515: linux-2.6-lirc.patch
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch
+Patch1610: linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
 
 #nouveau
 Patch1800: drm-mm-git.patch
@@ -1214,6 +1215,9 @@
 # EDD fix
 ApplyPatch linux-2.6-x86-edd-maxdrive.patch
 
+# e820 bugfix
+ApplyPatch linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1806,6 +1810,9 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86 e820 bugfix
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc8-git1
 
 * Wed Sep 26 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Wed Sep 26 22:42:26 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:42:26 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.90,1.91
Message-ID: <200709262242.l8QMgQ78024378@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24275

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requres conditional



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- setroubleshoot.spec	26 Sep 2007 22:36:49 -0000	1.90
+++ setroubleshoot.spec	26 Sep 2007 22:41:54 -0000	1.91
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7 Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8 Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:51:26 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:51:26 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.91,1.92
Message-ID: <200709262251.l8QMpQbR024780@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24754

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requires



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- setroubleshoot.spec	26 Sep 2007 22:41:54 -0000	1.91
+++ setroubleshoot.spec	26 Sep 2007 22:50:52 -0000	1.92
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7 Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8 Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:18:44 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 19:18:44 -0400
Subject: rpms/kernel/F-7 linux-2.6-acpi-disable-cstates-in-suspend.patch,
	NONE, 1.1 linux-2.6-acpi-kill-dmesg-spam.patch, NONE,
	1.1 linux-2.6-libata-pata_sis-dma-add-missing-entry.patch, NONE,
	1.1 linux-2.6-libata-pata_sis-fix-dma-timing.patch, NONE,
	1.1 linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch, NONE,
	1.1 linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch, 
	NONE, 1.1
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,
	NONE, 1.1 linux-2.6-net-sfq-fix-oops-with-2.patch, NONE,
	1.1 kernel-2.6.spec, 1.3347, 1.3348
Message-ID: <200709262318.l8QNIi1T031834@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31745

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-acpi-disable-cstates-in-suspend.patch 
	linux-2.6-acpi-kill-dmesg-spam.patch 
	linux-2.6-libata-pata_sis-dma-add-missing-entry.patch 
	linux-2.6-libata-pata_sis-fix-dma-timing.patch 
	linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch 
	linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch 
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch 
	linux-2.6-net-sfq-fix-oops-with-2.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- libata pata_sis: DMA fixes (#202291)
- libata sata_sil24: IRQ clearing race fixes
- net driver r8169: fix hanging (#252955, #292161)
- qdisc sfq: fix oops with 2 packet queue (#219895)
- ACPI: disable processor C-states suring suspend
- ACPI: silence noisy message


linux-2.6-acpi-disable-cstates-in-suspend.patch:

--- NEW FILE linux-2.6-acpi-disable-cstates-in-suspend.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b04e7bdb984e3b7f62fb7f44146a529f88cc7639
Commit:     b04e7bdb984e3b7f62fb7f44146a529f88cc7639
Parent:     1f0cff6e4d579ab0fe671c02fcd842694e46b90f
Author:     Thomas Gleixner <tglx at linutronix.de>
AuthorDate: Sat Sep 22 22:29:05 2007 +0000
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Sat Sep 22 17:15:34 2007 -0700

    ACPI: disable lower idle C-states across suspend/resume
    
    device_suspend() calls ACPI suspend functions, which seems to have undesired
    side effects on lower idle C-states. It took me some time to realize that
    especially the VAIO BIOSes (both Andrews jinxed UP and my elfstruck SMP one)
    show this effect. I'm quite sure that other bug reports against suspend/resume
    about turning the system into a brick have the same root cause.
    
    After fishing in the dark for quite some time, I realized that removing the ACPI
    processor module before suspend (this removes the lower C-state functionality)
    made the problem disappear. Interestingly enough the propability of having a
    bricked box is influenced by various factors (interrupts, size of the ram image,
    ...). Even adding a bunch of printks in the wrong places made the problem go
    away. The previous periodic tick implementation simply pampered over the
    problem, which explains why the dyntick / clockevents changes made this more
    prominent.
    
    We avoid complex functionality during the boot process and we have to do the
    same during suspend/resume. It is a similar scenario and equaly fragile.
    
    Add suspend / resume functions to the ACPI processor code and disable the lower
    idle C-states across suspend/resume. Fall back to the default idle
    implementation (halt) instead.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Tested-by: Andrew Morton <akpm at linux-foundation.org>
    Cc: Len Brown <lenb at kernel.org>
    Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Cc: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/acpi/processor_core.c |    2 ++
 drivers/acpi/processor_idle.c |   19 ++++++++++++++++++-
 include/acpi/processor.h      |    2 ++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 2afb3d2..9f11dc2 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -102,6 +102,8 @@ static struct acpi_driver acpi_processor_driver = {
 		.add = acpi_processor_add,
 		.remove = acpi_processor_remove,
 		.start = acpi_processor_start,
+		.suspend = acpi_processor_suspend,
+		.resume = acpi_processor_resume,
 		},
 };
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d9b8af7..f182613 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -325,6 +325,23 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr,
 
 #endif
 
+/*
+ * Suspend / resume control
+ */
+static int acpi_idle_suspend;
+
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+{
+	acpi_idle_suspend = 1;
+	return 0;
+}
+
+int acpi_processor_resume(struct acpi_device * device)
+{
+	acpi_idle_suspend = 0;
+	return 0;
+}
+
 static void acpi_processor_idle(void)
 {
 	struct acpi_processor *pr = NULL;
@@ -355,7 +372,7 @@ static void acpi_processor_idle(void)
 	}
 
 	cx = pr->power.state;
-	if (!cx) {
+	if (!cx || acpi_idle_suspend) {
 		if (pm_idle_save)
 			pm_idle_save();
 		else
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ec3ffda..99934a9 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -320,6 +320,8 @@ int acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr,
 			      struct acpi_device *device);
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
+int acpi_processor_resume(struct acpi_device * device);
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);

linux-2.6-acpi-kill-dmesg-spam.patch:

--- NEW FILE linux-2.6-acpi-kill-dmesg-spam.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7f10cc4e838c2b2d7272031954c56c407569d497
Commit:     7f10cc4e838c2b2d7272031954c56c407569d497
Parent:     a21101c46ca5b4320e31408853cdcbf7cb1ce4ed
Author:     Maik Broemme <mbroemme at plusserver.de>
AuthorDate: Fri Sep 14 22:12:34 2007 +0200
Committer:  Len Brown <len.brown at intel.com>
CommitDate: Tue Sep 18 13:45:20 2007 -0400

    ACPI: video: remove dmesg spam
    
    i am actually heavily using the ACPI video extension for my Thinkpad X61
    Tablet. I have bound the input events triggered by the brightness
    up/down keys to a simple
    
    echo <value> > /sys/class/backlight/acpi_video1/brightness
    
    but everytime the event is triggered and acpi_video_device_lcd_set_level()
    is called i got a notificication in my kernel log like:
    
    set_level status: 0
    set_level status: 0
    set_level status: 0
    set_level status: 0
    ...
    
    Signed-off-by: Maik Broemme <mbroemme at plusserver.de>
    Signed-off-by: Len Brown <len.brown at intel.com>
---
 drivers/acpi/video.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6cb3e7b..d05891f 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -417,7 +417,6 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
 	arg0.integer.value = level;
 	status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
-	printk(KERN_DEBUG "set_level status: %x\n", status);
 	return status;
 }
 

linux-2.6-libata-pata_sis-dma-add-missing-entry.patch:

--- NEW FILE linux-2.6-libata-pata_sis-dma-add-missing-entry.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=edeb614c1c8388b354d93ff7790317cc5d6a38ec
Commit:     edeb614c1c8388b354d93ff7790317cc5d6a38ec
Parent:     228f47b959a0cf2e24c9696757c7e6510334e499
Author:     Tejun Heo <htejun at gmail.com>
AuthorDate: Fri Sep 21 16:29:05 2007 +0900
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Sep 25 21:30:56 2007 -0400

    pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode()
    
    sis_66_set_dmamode() also handles early UDMA100 (SIS630 ET) but is
    missing udma timing value for UDMA100.  According to sis5513, this
    should be 0x8000.  This caused UDMA100 device to fail on pata_sis till
    it downgrades to UDMA66 while it works fine on sis5513 at UDMA100.
    
    Reported by Adam Blech.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Cc: Adam Blech <desaster.area at addcom.de>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>

bz 202291

---
 drivers/ata/pata_sis.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 2bd7645..cce2834 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -375,8 +375,9 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
+	/* MWDMA 0-2 and UDMA 0-5 */
 	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
-	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
+	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000, 0x8000 };
 
 	pci_read_config_word(pdev, drive_pci, &timing);
 

linux-2.6-libata-pata_sis-fix-dma-timing.patch:

--- NEW FILE linux-2.6-libata-pata_sis-fix-dma-timing.patch ---

# HG changeset patch
# User Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
# Date 1185976856 14400
# Node ID f5e5b307727d7fb820ccc9d77de29c837dd90e95
# Parent 1130c2b7409a2eb135ebc61dfd3c784d1cea7eda
pata_sis: fix MWDMA for <= UDMA66 chipsets and UDMA for UDMA33 chipsets

* Fix MWDMA timings setup in sis_old_set_dmamode() and sis_66_set_dmamode().

  The old timings were overclocked (even worse behavior than sis5513 IDE driver
  which depends on BIOS to program correct timings), the new timings are taken
  from the datasheet (they match timings from ATA spec).

* Fix UDMA timings setup in sis_old_set_dmamode().

  Misplaced pci_write_config_word() call resulted in UDMA timings never
  being set.

* Fix comments for sis_133_early_set_dmamode() and sis_133_set_dmamode():
  - only the former function handles early SiS 961 bridges
  - both functions lack MWDMA timings setup

* Fix typos in sis_100_set_piomode() and sis_133_set_piomode() comments.

* Bump driver version.

Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>

committer: Jeff Garzik <jeff at garzik.org>

--- a/drivers/ata/pata_sis.c	Wed Aug 01 10:00:56 2007 -0400
+++ b/drivers/ata/pata_sis.c	Wed Aug 01 10:00:56 2007 -0400
@@ -2,6 +2,7 @@
  *    pata_sis.c - SiS ATA driver
  *
  *	(C) 2005 Red Hat <alan at redhat.com>
+ *	(C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c
  * Copyright (C) 1999-2000	Andre Hedrick <andre at linux-ide.org>
@@ -35,7 +36,7 @@
 #include "sis.h"
 
 #define DRV_NAME	"pata_sis"
-#define DRV_VERSION	"0.5.1"
+#define DRV_VERSION	"0.5.2"
 
 struct sis_chipset {
 	u16 device;				/* PCI host ID */
@@ -237,7 +238,7 @@ static void sis_old_set_piomode (struct 
 }
 
 /**
- *	sis_100_set_pioode - Initialize host controller PATA PIO timings
+ *	sis_100_set_piomode - Initialize host controller PATA PIO timings
  *	@ap: Port whose timings we are configuring
  *	@adev: Device we are configuring for.
  *
@@ -262,7 +263,7 @@ static void sis_100_set_piomode (struct 
 }
 
 /**
- *	sis_133_set_pioode - Initialize host controller PATA PIO timings
+ *	sis_133_set_piomode - Initialize host controller PATA PIO timings
  *	@ap: Port whose timings we are configuring
  *	@adev: Device we are configuring for.
  *
@@ -334,7 +335,7 @@ static void sis_old_set_dmamode (struct 
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
-	const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
 	const u16 udma_bits[]  = { 0xE000, 0xC000, 0xA000 };
 
 	pci_read_config_word(pdev, drive_pci, &timing);
@@ -342,15 +343,15 @@ static void sis_old_set_dmamode (struct 
 	if (adev->dma_mode < XFER_UDMA_0) {
 		/* bits 3-0 hold recovery timing bits 8-10 active timing and
 		   the higer bits are dependant on the device */
-		timing &= ~ 0x870F;
+		timing &= ~0x870F;
 		timing |= mwdma_bits[speed];
-		pci_write_config_word(pdev, drive_pci, timing);
 	} else {
 		/* Bit 15 is UDMA on/off, bit 13-14 are cycle time */
 		speed = adev->dma_mode - XFER_UDMA_0;
 		timing &= ~0x6000;
 		timing |= udma_bits[speed];
 	}
+	pci_write_config_word(pdev, drive_pci, timing);
 }
 
 /**
@@ -373,7 +374,7 @@ static void sis_66_set_dmamode (struct a
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
-	const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
 	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
 
 	pci_read_config_word(pdev, drive_pci, &timing);
@@ -432,8 +433,7 @@ static void sis_100_set_dmamode (struct 
  *	@adev: Device to program
  *
  *	Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *	Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *	the old ide/pci driver.
+ *	Handles early SiS 961 bridges.
  *
  *	LOCKING:
  *	None (inherited from caller).
@@ -467,8 +467,6 @@ static void sis_133_early_set_dmamode (s
  *	@adev: Device to program
  *
  *	Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *	Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *	the old ide/pci driver.
  *
  *	LOCKING:
  *	None (inherited from caller).


linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch:

--- NEW FILE linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=228f47b959a0cf2e24c9696757c7e6510334e499
Commit:     228f47b959a0cf2e24c9696757c7e6510334e499
Parent:     4942de4a0e914f205d351a81873f4f63986bcc3c
Author:     Tejun Heo <htejun at gmail.com>
AuthorDate: Sun Sep 23 12:37:05 2007 +0900
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Sep 25 21:30:56 2007 -0400

    sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used
    
    When PCIX_IRQ_WOC is used, sil24 has an inherent race condition
    between clearing IRQ pending and reading IRQ status.  If IRQ pending
    is cleared after reading IRQ status, there's possibility of lost IRQ.
    If IRQ pending is cleared before reading IRQ status, spurious IRQs
    will occur.
    
    sata_sil24 till now cleared IRQ pending after reading IRQ status thus
    losing IRQs on machines where PCIX_IRQ_WOC was used.  Reverse the
    order and ignore spurious IRQs if PCIX_IRQ_WOC.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/sata_sil24.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index ef83e6b..233e886 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -888,6 +888,16 @@ static inline void sil24_host_intr(struct ata_port *ap)
 	u32 slot_stat, qc_active;
 	int rc;
 
+	/* If PCIX_IRQ_WOC, there's an inherent race window between
+	 * clearing IRQ pending status and reading PORT_SLOT_STAT
+	 * which may cause spurious interrupts afterwards.  This is
+	 * unavoidable and much better than losing interrupts which
+	 * happens if IRQ pending is cleared after reading
+	 * PORT_SLOT_STAT.
+	 */
+	if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
+		writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
+
 	slot_stat = readl(port + PORT_SLOT_STAT);
 
 	if (unlikely(slot_stat & HOST_SSTAT_ATTN)) {
@@ -895,9 +905,6 @@ static inline void sil24_host_intr(struct ata_port *ap)
 		return;
 	}
 
-	if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
-		writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
-
 	qc_active = slot_stat & ~HOST_SSTAT_ATTN;
 	rc = ata_qc_complete_multiple(ap, qc_active, sil24_finish_qc);
 	if (rc > 0)
@@ -910,7 +917,8 @@ static inline void sil24_host_intr(struct ata_port *ap)
 		return;
 	}
 
-	if (ata_ratelimit())
+	/* spurious interrupts are expected if PCIX_IRQ_WOC */
+	if (!(ap->flags & SIL24_FLAG_PCIX_IRQ_WOC) && ata_ratelimit())
 		ata_port_printk(ap, KERN_INFO, "spurious interrupt "
 			"(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
 			slot_stat, ap->active_tag, ap->sactive);

linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch:

--- NEW FILE linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=65d916d95314566f426cc40ff0f17b754a773b0b
Commit:     65d916d95314566f426cc40ff0f17b754a773b0b
Parent:     a88a8eff1e6e32d3288986a9d36c6a449c032d3a
Author:     Edward Hsu <edward_hsu at realtek.com.tw>
AuthorDate: Fri Aug 17 10:14:36 2007 +0200
Committer:  Francois Romieu <romieu at electric-eye.fr.zoreil.com>
CommitDate: Wed Sep 19 21:52:18 2007 +0200

    r8169: correct phy parameters for the 8110SC
    
    The phys of the 8110SC (RTL_GIGA_MAC_VER_{05/06}) act abnormally in
    gigabit mode if they are applied the parameters in rtl8169_hw_phy_config
    which actually aim the 8110S/SB.
    
    It is ok to return early from rtl8169_hw_phy_config as it does not
    apply to the 8101 and 8168 families.
    
    Signed-off-by: Edward Hsu <edward_hsu at realtek.com.tw>
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
---
 drivers/net/r8169.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b85ab4a..d9bb51b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1228,7 +1228,10 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
 		return;
 	}
 
-	/* phy config for RTL8169s mac_version C chip */
+	if ((tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+	    (tp->mac_version != RTL_GIGA_MAC_VER_03))
+		return;
+
 	mdio_write(ioaddr, 31, 0x0001);			//w 31 2 0 1
 	mdio_write(ioaddr, 21, 0x1000);			//w 21 15 0 1000
 	mdio_write(ioaddr, 24, 0x65c7);			//w 24 15 0 65c7

linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch:

--- NEW FILE linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d78ae2dcc2acebb9a1048278f47f762c069db75c
Commit:     d78ae2dcc2acebb9a1048278f47f762c069db75c
Parent:     65d916d95314566f426cc40ff0f17b754a773b0b
Author:     Francois Romieu <romieu at fr.zoreil.com>
AuthorDate: Sun Aug 26 20:08:19 2007 +0200
Committer:  Francois Romieu <romieu at electric-eye.fr.zoreil.com>
CommitDate: Wed Sep 19 21:52:18 2007 +0200

    r8169: workaround against ignored TxPoll writes (8168)
    
    The 8168 ignores the requests to fetch the Tx descriptors when
    the relevant TxPoll bit is already set. It easily kills the
    performances of the 8168. David Gundersen has noticed that it
    is enough to wait for the completion of the DMA transfer (NPQ
    bit is cleared) before writing the TxPoll register again.
    
    The extra IO traffic added by the proposed workaround could be
    minimalized but it is not a high-priority task.
    
    Fix for:
    http://bugzilla.kernel.org/show_bug.cgi?id=7924
    http://bugzilla.kernel.org/show_bug.cgi?id=8688
    (http://bugzilla.kernel.org/show_bug.cgi?id=7555 ?)
    
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
    Cc: David Gundersen <gundy at iinet.net.au>
    Cc: Edward Hsu <edward_hsu at realtek.com.tw>

bz 252955, 292161

---
 drivers/net/r8169.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index d9bb51b..c921ec3 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2570,6 +2570,15 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 		    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
 			netif_wake_queue(dev);
 		}
+		/*
+		 * 8168 hack: TxPoll requests are lost when the Tx packets are
+		 * too close. Let's kick an extra TxPoll request when a burst
+		 * of start_xmit activity is detected (if it is not detected,
+		 * it is slow enough). -- FR
+		 */
+		smp_rmb();
+		if (tp->cur_tx != dirty_tx)
+			RTL_W8(TxPoll, NPQ);
 	}
 }
 

linux-2.6-net-sfq-fix-oops-with-2.patch:

--- NEW FILE linux-2.6-net-sfq-fix-oops-with-2.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5588b40d7c2bff75ee573ed42d1738c73ce24492
Commit:     5588b40d7c2bff75ee573ed42d1738c73ce24492
Parent:     1a03b81db96aeaac0276224f25c0701a1ba37318
Author:     Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
AuthorDate: Wed Sep 19 10:42:03 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Thu Sep 20 12:14:08 2007 -0700

    [PKT_SCHED]: Fix 'SFQ qdisc crashes with limit of 2 packets'
    
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

bz 219895

---
 net/sched/sch_sfq.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 9579573..3a23e30 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -270,7 +270,7 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 			q->tail = x;
 		}
 	}
-	if (++sch->q.qlen < q->limit-1) {
+	if (++sch->q.qlen <= q->limit) {
 		sch->bstats.bytes += skb->len;
 		sch->bstats.packets++;
 		return 0;
@@ -306,7 +306,7 @@ sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
 			q->tail = x;
 		}
 	}
-	if (++sch->q.qlen < q->limit - 1) {
+	if (++sch->q.qlen <= q->limit) {
 		sch->qstats.requeues++;
 		return 0;
 	}
@@ -391,10 +391,10 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
 	q->quantum = ctl->quantum ? : psched_mtu(sch->dev);
 	q->perturb_period = ctl->perturb_period*HZ;
 	if (ctl->limit)
-		q->limit = min_t(u32, ctl->limit, SFQ_DEPTH);
+		q->limit = min_t(u32, ctl->limit, SFQ_DEPTH - 2);
 
 	qlen = sch->q.qlen;
-	while (sch->q.qlen >= q->limit-1)
+	while (sch->q.qlen > q->limit)
 		sfq_drop(sch);
 	qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen);
 
@@ -423,7 +423,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
 		q->dep[i+SFQ_DEPTH].next = i+SFQ_DEPTH;
 		q->dep[i+SFQ_DEPTH].prev = i+SFQ_DEPTH;
 	}
-	q->limit = SFQ_DEPTH;
+	q->limit = SFQ_DEPTH - 2;
 	q->max_depth = 0;
 	q->tail = SFQ_DEPTH;
 	if (opt == NULL) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3347
retrieving revision 1.3348
diff -u -r1.3347 -r1.3348
--- kernel-2.6.spec	26 Sep 2007 18:58:34 -0000	1.3347
+++ kernel-2.6.spec	26 Sep 2007 23:18:11 -0000	1.3348
@@ -576,6 +576,7 @@
 Patch423: linux-2.6-gfs-locking-exports.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
+Patch431: linux-2.6-net-sfq-fix-oops-with-2.patch
 
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -605,6 +606,9 @@
 Patch674: linux-2.6-libata-pata_via-cable-detect.patch
 Patch675: linux-2.6-libata-simplify-init.patch
 Patch676: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch677: linux-2.6-libata-pata_sis-fix-dma-timing.patch
+Patch678: linux-2.6-libata-pata_sis-dma-add-missing-entry.patch
+Patch679: linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch
 
 Patch680: linux-2.6-rtl8187.patch
 Patch681: linux-2.6-wireless.patch
@@ -617,6 +621,9 @@
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 Patch715: linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
+Patch716: linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch 
+Patch717: linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
+
 Patch730: linux-2.6-snd-ad1988-fix-spdif-output.patch
 Patch731: linux-2.6-snd-hda-stac92xx-fixes.patch
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
@@ -628,6 +635,9 @@
 Patch781: linux-2.6-usb-allow-1-byte-replies.patch
 Patch782: linux-2.6-usb-fixup-interval-lengths.patch
 
+Patch790: linux-2.6-acpi-disable-cstates-in-suspend.patch
+Patch791: linux-2.6-acpi-kill-dmesg-spam.patch
+
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
@@ -1262,6 +1272,8 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
+# fix oops in sfq
+ApplyPatch linux-2.6-net-sfq-fix-oops-with-2.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1324,6 +1336,11 @@
 # fix Pegasos libata glitches
 ApplyPatch linux-2.6-libata-simplify-init.patch
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+# pata_sis DMA fixes
+ApplyPatch linux-2.6-libata-pata_sis-fix-dma-timing.patch
+ApplyPatch linux-2.6-libata-pata_sis-dma-add-missing-entry.patch
+# sata_sil24 irq race fix
+ApplyPatch linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch
 
 # Add the rtl8187 driver from upstream
 ApplyPatch linux-2.6-rtl8187.patch
@@ -1349,6 +1366,10 @@
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 ApplyPatch linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
 
+# r8169
+ApplyPatch linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch
+ApplyPatch linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
+
 # ALSA
 #
 # fix spdif output on ad1988
@@ -1377,6 +1398,10 @@
 ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
 
 # ACPI patches
+# fix some suspend bugssuspend
+ApplyPatch linux-2.6-acpi-disable-cstates-in-suspend.patch
+# silence noisy message
+ApplyPatch linux-2.6-acpi-kill-dmesg-spam.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -2331,6 +2356,14 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- libata pata_sis: DMA fixes (#202291)
+- libata sata_sil24: IRQ clearing race fixes
+- net driver r8169: fix hanging (#252955, #292161)
+- qdisc sfq: fix oops with 2 packet queue (#219895)
+- ACPI: disable processor C-states suring suspend
+- ACPI: silence noisy message
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.9
 
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Wed Sep 26 23:29:26 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:29:26 -0400
Subject: rpms/mlton/devel mlton.spec,1.16,1.17
Message-ID: <200709262329.l8QNTQIi032449@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
- Work around strange SRPM problem in conditionals



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mlton.spec	26 Sep 2007 19:37:49 -0000	1.16
+++ mlton.spec	26 Sep 2007 23:28:54 -0000	1.17
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -47,7 +47,7 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%setup -T -D -q -a 1
+#%setup -T -D -q -a 1
 sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
 	usr/bin/mlton
 %endif
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+- Work around strange SRPM problem in conditionals
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
 - Build on ppc now that #247407 is fixed
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:33:40 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:33:40 -0400
Subject: rpms/mlton/devel mlton.spec,1.17,1.18
Message-ID: <200709262333.l8QNXeDv000335@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32679

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
- Work around strange SRPM problem in conditionals
- Fix changelog (forgot release 5?)



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mlton.spec	26 Sep 2007 23:28:54 -0000	1.17
+++ mlton.spec	26 Sep 2007 23:33:08 -0000	1.18
@@ -101,10 +101,11 @@
 
 
 %changelog
-* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
 - Work around strange SRPM problem in conditionals
+- Fix changelog (forgot release 5?)
 
-* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
 - Build on ppc now that #247407 is fixed
 
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4



From fedora-extras-commits at redhat.com  Wed Sep 26 23:46:50 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 19:46:50 -0400
Subject: rpms/kernel/F-7
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,
	1.1, 1.2
Message-ID: <200709262346.l8QNkoer000883@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv836

Modified Files:
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch 
Log Message:
build fix


linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch:

Index: linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch	26 Sep 2007 23:18:11 -0000	1.1
+++ linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch	26 Sep 2007 23:46:16 -0000	1.2
@@ -28,6 +28,8 @@
 
 bz 252955, 292161
 
+   <cebbert at redhat.com>: fix for 2.6.22
+
 ---
  drivers/net/r8169.c |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
@@ -48,7 +50,7 @@
 +		 */
 +		smp_rmb();
 +		if (tp->cur_tx != dirty_tx)
-+			RTL_W8(TxPoll, NPQ);
++			RTL_W8(TxPoll, 0x40);
  	}
  }
  



From fedora-extras-commits at redhat.com  Wed Sep 26 23:47:14 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 19:47:14 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.92,1.93
Message-ID: <200709262347.l8QNlEDS000944@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requires tag



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- setroubleshoot.spec	26 Sep 2007 22:50:52 -0000	1.92
+++ setroubleshoot.spec	26 Sep 2007 23:46:43 -0000	1.93
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7:Requires: selinux-policy-base >= 2.6.4-45 }
+%{?fc8:Requires: selinux-policy-base >= 3.0.7-10 }
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:52:18 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:52:18 -0400
Subject: rpms/mlton/devel mlton.spec,1.18,1.19
Message-ID: <200709262352.l8QNqILO001070@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1045

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
- Really fix SRPM conditionals



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mlton.spec	26 Sep 2007 23:33:08 -0000	1.18
+++ mlton.spec	26 Sep 2007 23:51:46 -0000	1.19
@@ -1,11 +1,8 @@
 %define mlton_bootstrap 0
-#%ifarch x86_64
-#%define mlton_bootstrap 1
-#%endif
 
 Name:		mlton
 Version:	20070826
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -47,7 +44,7 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-#%setup -T -D -q -a 1
+%setup -T -D -q -a 1
 sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
 	usr/bin/mlton
 %endif
@@ -101,6 +98,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
+- Really fix SRPM conditionals
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
 - Work around strange SRPM problem in conditionals
 - Fix changelog (forgot release 5?)



From fedora-extras-commits at redhat.com  Thu Sep 27 00:07:46 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Wed, 26 Sep 2007 20:07:46 -0400
Subject: rpms/libsvm/F-7 libsvm-2.84-6.patch, NONE, 1.1 libsvm.spec, 1.3,
	1.4 libsvm-2.84-5.patch, 1.1, NONE
Message-ID: <200709270007.l8R07kQ8007762@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720/F-7

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-6.patch 
Removed Files:
	libsvm-2.84-5.patch 
Log Message:
- Add defattr to each subpackage
- Move libsvm.so to libsvm


libsvm-2.84-6.patch:

--- NEW FILE libsvm-2.84-6.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-26 17:07:55.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,57 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	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
+#	cp -R java ${INSTDIR}/share/libsvm/src
+#	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsvm.spec	26 Sep 2007 03:34:26 -0000	1.3
+++ libsvm.spec	27 Sep 2007 00:07:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-5.patch
+Patch0:         libsvm-2.84-6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -79,6 +79,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,25 +92,34 @@
 %{_bindir}/svm-scale
 %{_bindir}/svm-train
 %{_datadir}/libsvm/examples
+%{_libdir}/libsvm/libsvm.so
+%{_libdir}/libsvm/libsvm.so.2.84
 
 %files devel
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/libsvm
 %{_includedir}/libsvm
 %{_datadir}/libsvm/src
 
 %files python
+%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
 %files java
+%defattr(-,root,root,-)
 %doc java/README-Java
 #%{_libdir}/java/libsvm/docs
 %{_libdir}/java/libsvm/libsvm.jar
 %{_libdir}/java/libsvm/test_applet.html
 
 %changelog
-* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+* Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
+- Add defattr to each subpackage
+- Move libsvm.so to libsvm
+
+* Thu Sep 24 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so
 


--- libsvm-2.84-5.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 00:20:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 20:20:41 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.79, 1.80 libsemanage-rhat.patch,
	1.26, 1.27 libsemanage.spec, 1.134, 1.135 sources, 1.81, 1.82
Message-ID: <200709270020.l8R0Kfbc008290@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8118

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
- Upgrade to latest from NSA
	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
	* Clear errno on non-fatal errors to avoid reporting them upon a
	  later error that does not set errno.
	* Improve reporting of system errors, e.g. full filesystem or read-only filesystem from Stephen Smalley.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	13 Sep 2007 12:29:42 -0000	1.79
+++ .cvsignore	27 Sep 2007 00:20:08 -0000	1.80
@@ -85,3 +85,4 @@
 libsemanage-2.0.4.tgz
 libsemanage-2.0.5.tgz
 libsemanage-2.0.6.tgz
+libsemanage-2.0.9.tgz

libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libsemanage-rhat.patch	26 Sep 2007 20:51:42 -0000	1.26
+++ libsemanage-rhat.patch	27 Sep 2007 00:20:08 -0000	1.27
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.6/include/semanage/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.9/include/semanage/handle.h
 --- nsalibsemanage/include/semanage/handle.h	2007-08-20 19:15:36.000000000 -0400
-+++ libsemanage-2.0.6/include/semanage/handle.h	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/include/semanage/handle.h	2007-09-26 19:49:09.000000000 -0400
 @@ -69,6 +69,10 @@
   * 1 for yes, 0 for no (default) */
  void semanage_set_create_store(semanage_handle_t * handle, int create_store);
@@ -12,9 +12,9 @@
  /* Set whether or not to disable dontaudits upon commit */
  void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.6/Makefile
+diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.9/Makefile
 --- nsalibsemanage/Makefile	2007-07-16 14:20:39.000000000 -0400
-+++ libsemanage-2.0.6/Makefile	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/Makefile	2007-09-26 19:49:09.000000000 -0400
 @@ -1,6 +1,9 @@
  all: 
  	$(MAKE) -C src all
@@ -25,10 +25,10 @@
  pywrap: 
  	$(MAKE) -C src pywrap
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.6/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.6/src/direct_api.c	2007-09-26 16:22:31.000000000 -0400
-@@ -700,7 +700,7 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.9/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2007-09-26 19:37:44.000000000 -0400
++++ libsemanage-2.0.9/src/direct_api.c	2007-09-26 19:49:09.000000000 -0400
+@@ -702,7 +702,7 @@
  		goto cleanup;
  
  	if (sh->do_rebuild || modified) {
@@ -37,9 +37,9 @@
  	}
  
        cleanup:
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.6/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.9/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2007-09-13 08:21:11.000000000 -0400
-+++ libsemanage-2.0.6/src/genhomedircon.c	2007-09-26 16:39:40.000000000 -0400
++++ libsemanage-2.0.9/src/genhomedircon.c	2007-09-26 19:49:09.000000000 -0400
 @@ -1,5 +1,6 @@
 -/* Author: Mark Goldman   <mgoldman at tresys.com>
 - * 			Paul Rosenfeld	<prosenfeld at tresys.com>
@@ -181,7 +181,93 @@
  		ustr_sc_free(&line);
  	}
  	return STATUS_SUCCESS;
-@@ -602,7 +658,7 @@
+@@ -496,6 +552,32 @@
+ 	free(temp);
+ }
+ 
++static char *global_fallback_user=NULL;
++static char *global_fallback_user_prefix=NULL;
++
++static int set_fallback_user(const char *user, const char *prefix) {
++	free(global_fallback_user);
++	free(global_fallback_user_prefix);
++	global_fallback_user = strdup(user);
++	global_fallback_user_prefix = strdup(prefix);
++	if (!global_fallback_user || !global_fallback_user_prefix)
++		return -1;
++	return 0;
++}
++
++static char *get_fallback_user(void) {
++	return global_fallback_user;
++}
++
++static char *get_fallback_user_prefix(void) {
++	return global_fallback_user_prefix;
++}
++
++static void free_fallback_user(void) {
++	free(global_fallback_user);
++	free(global_fallback_user_prefix);
++}
++
+ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s,
+ 					     int *errors)
+ {
+@@ -538,13 +620,39 @@
+ 
+ 	for (i = 0; i < nseusers; i++) {
+ 		name = semanage_seuser_get_name(seuser_list[i]);
++		if (strcmp(name, DEFAULT_LOGIN) == 0) {
++			seuname = semanage_seuser_get_sename(seuser_list[i]);
++
++			/* find the user structure given the name */
++			u = bsearch(seuname, user_list, nusers, sizeof(semanage_user_t *),
++				    (int (*)(const void *, const void *))
++				    &name_user_cmp);
++			if (u) {
++				prefix = semanage_user_get_prefix(*u);
++			} else {
++				prefix = name;
++			}
++
++			if (set_fallback_user(seuname, prefix) != 0) {
++				*errors = STATUS_ERR;
++				goto cleanup;
++			}
++			break;
++		}
++	}
++	char *fallback_user = get_fallback_user();
++			
++	for (i = 0; i < nseusers; i++) {
++		name = semanage_seuser_get_name(seuser_list[i]);
+ 		seuname = semanage_seuser_get_sename(seuser_list[i]);
+ 
+-		if (strcmp(seuname, FALLBACK_USER) == 0)
++		if (strcmp(seuname, fallback_user) == 0)
+ 			continue;
+-		if (strcmp(seuname, DEFAULT_LOGIN) == 0)
++
++		if (strcmp(name, DEFAULT_LOGIN) == 0)
+ 			continue;
+-		if (strcmp(seuname, TEMPLATE_SEUSER) == 0)
++		
++		if (strcmp(name, TEMPLATE_SEUSER) == 0)
+ 			continue;
+ 
+ 		/* find the user structure given the name */
+@@ -563,6 +671,9 @@
+ 				*errors = STATUS_ERR;
+ 				goto cleanup;
+ 			}
++		}
++
++		if (!pwent) {
+ 			WARN(s->h_semanage,
+ 			     "user %s not in password file", name);
+ 			continue;
+@@ -602,7 +713,7 @@
  	return head;
  }
  
@@ -190,7 +276,7 @@
  				      semanage_list_t * user_context_tpl,
  				      semanage_list_t * homedir_context_tpl)
  {
-@@ -615,13 +671,13 @@
+@@ -615,13 +726,13 @@
  	}
  
  	for (; users; pop_user_entry(&users)) {
@@ -206,16 +292,35 @@
  				       users->sename, users->prefix)) {
  			return STATUS_ERR;
  		}
-@@ -671,7 +727,7 @@
+@@ -662,6 +773,14 @@
+ 		goto done;
+ 	}
+ 
++	if (write_gen_home_dir_context(s, out, user_context_tpl,
++				       homedir_context_tpl) != STATUS_SUCCESS) {
++		retval = STATUS_ERR;
++	}
++
++	char *fallback_user = get_fallback_user();
++	char *fallback_user_prefix = get_fallback_user_prefix();
++
+ 	for (h = homedirs; h; h = h->next) {
+ 		Ustr *temp = ustr_dup_cstr(h->data);
+ 
+@@ -671,16 +790,16 @@
  			goto done;
  		}
  
 -		if (write_home_dir_context(out,
+-					   homedir_context_tpl, FALLBACK_USER,
+-					   FALLBACK_USER, ustr_cstr(temp),
+-					   FALLBACK_USER_PREFIX) !=
 +		if (write_home_dir_context(s, out,
- 					   homedir_context_tpl, FALLBACK_USER,
- 					   FALLBACK_USER, ustr_cstr(temp),
- 					   FALLBACK_USER_PREFIX) !=
-@@ -680,7 +736,7 @@
++					   homedir_context_tpl, fallback_user,
++					   fallback_user, ustr_cstr(temp),
++					   fallback_user_prefix) !=
+ 		    STATUS_SUCCESS) {
+ 			ustr_sc_free(&temp);
  			retval = STATUS_ERR;
  			goto done;
  		}
@@ -224,23 +329,27 @@
  					    homeroot_context_tpl,
  					    h->data) != STATUS_SUCCESS) {
  			ustr_sc_free(&temp);
-@@ -690,13 +746,13 @@
+@@ -690,16 +809,12 @@
  
  		ustr_sc_free(&temp);
  	}
 -	if (write_user_context(out, user_context_tpl,
+-			       ".*", FALLBACK_USER,
+-			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
 +	if (write_user_context(s, out, user_context_tpl,
- 			       ".*", FALLBACK_USER,
- 			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
++			       ".*", fallback_user,
++			       fallback_user_prefix) != STATUS_SUCCESS) {
  		retval = STATUS_ERR;
  		goto done;
  	}
 -	if (write_gen_home_dir_context(out, s, user_context_tpl,
-+	if (write_gen_home_dir_context(s, out, user_context_tpl,
- 				       homedir_context_tpl) != STATUS_SUCCESS) {
- 		retval = STATUS_ERR;
- 	}
-@@ -711,7 +767,9 @@
+-				       homedir_context_tpl) != STATUS_SUCCESS) {
+-		retval = STATUS_ERR;
+-	}
+ 
+       done:
+ 	/* Cleanup */
+@@ -711,7 +826,9 @@
  	return retval;
  }
  
@@ -251,7 +360,15 @@
  {
  	genhomedircon_settings_t s;
  	FILE *out = NULL;
-@@ -725,6 +783,7 @@
+@@ -719,12 +836,15 @@
+ 
+ 	assert(sh);
+ 
++	set_fallback_user(FALLBACK_USER, FALLBACK_USER_PREFIX);
++
+ 	s.homedir_template_path =
+ 	    semanage_path(SEMANAGE_TMP, SEMANAGE_HOMEDIR_TMPL);
+ 	s.fcfilepath = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_HOMEDIRS);
  
  	s.usepasswd = usepasswd;
  	s.h_semanage = sh;
@@ -259,9 +376,18 @@
  
  	if (!(out = fopen(s.fcfilepath, "w"))) {
  		/* couldn't open output file */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.6/src/genhomedircon.h
+@@ -735,5 +855,8 @@
+ 	retval = write_context_file(&s, out);
+ 
+ 	fclose(out);
++
++	free_fallback_user();
++
+ 	return retval;
+ }
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.9/src/genhomedircon.h
 --- nsalibsemanage/src/genhomedircon.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/genhomedircon.h	2007-09-26 16:22:31.000000000 -0400
++++ libsemanage-2.0.9/src/genhomedircon.h	2007-09-26 19:49:09.000000000 -0400
 @@ -22,6 +22,7 @@
  
  #include "utilities.h"
@@ -271,9 +397,9 @@
 +			   sepol_policydb_t * policydb, int usepasswd);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.6/src/handle.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.9/src/handle.c
 --- nsalibsemanage/src/handle.c	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.6/src/handle.c	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/handle.c	2007-09-26 19:49:09.000000000 -0400
 @@ -68,6 +68,7 @@
  	/* By default do not create store */
  	sh->create_store = 0;
@@ -298,9 +424,9 @@
  void semanage_set_create_store(semanage_handle_t * sh, int create_store)
  {
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.6/src/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.9/src/handle.h
 --- nsalibsemanage/src/handle.h	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.6/src/handle.h	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/handle.h	2007-09-26 19:49:09.000000000 -0400
 @@ -58,6 +58,7 @@
  	int is_connected;
  	int is_in_transaction;
@@ -309,9 +435,9 @@
  	int do_rebuild;		/* whether to rebuild policy if there were no changes */
  	int modules_modified;
  	int create_store;	/* whether to create the store if it does not exist
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.6/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.9/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.6/src/libsemanage.map	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/libsemanage.map	2007-09-26 19:49:09.000000000 -0400
 @@ -9,6 +9,7 @@
  	  semanage_module_list_nth; semanage_module_get_name;
  	  semanage_module_get_version; semanage_select_store;
@@ -320,10 +446,10 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.6/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/semanage_store.c	2007-09-26 16:22:31.000000000 -0400
-@@ -1130,7 +1130,7 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.9/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2007-09-26 19:37:44.000000000 -0400
++++ libsemanage-2.0.9/src/semanage_store.c	2007-09-26 19:49:09.000000000 -0400
+@@ -1148,7 +1148,7 @@
  
        skip_reload:
  
@@ -332,7 +458,7 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1257,7 +1257,8 @@
+@@ -1279,7 +1279,8 @@
   * should be placed within a mutex lock to ensure that it runs
   * atomically.	Returns commit number on success, -1 on error.
   */
@@ -342,7 +468,7 @@
  {
  	int retval = -1, commit_num = -1;
  
-@@ -1272,7 +1273,7 @@
+@@ -1294,7 +1295,7 @@
  	}
  	if (!sh->conf->disable_genhomedircon) {
  		if ((retval =
@@ -351,9 +477,9 @@
  			ERR(sh, "semanage_genhomedircon returned error code %d.",
  			    retval);
  			goto cleanup;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.6/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.9/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/semanage_store.h	2007-09-26 16:22:31.000000000 -0400
++++ libsemanage-2.0.9/src/semanage_store.h	2007-09-26 20:10:59.000000000 -0400
 @@ -83,8 +83,6 @@
  int semanage_get_modules_names(semanage_handle_t * sh,
  			       char ***filenames, int *len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- libsemanage.spec	26 Sep 2007 20:51:43 -0000	1.134
+++ libsemanage.spec	27 Sep 2007 00:20:09 -0000	1.135
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.6
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
+- Upgrade to latest from NSA
+	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
+	* Clear errno on non-fatal errors to avoid reporting them upon a
+	  later error that does not set errno.
+	* Improve reporting of system errors, e.g. full filesystem or read-only filesystem from Stephen Smalley.
+
+- Fix segfault in genhomedircon when using bad user names
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
 - Fix genhomedircon code to only generate valid context
 - Fixes autorelabel problem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	13 Sep 2007 12:29:42 -0000	1.81
+++ sources	27 Sep 2007 00:20:09 -0000	1.82
@@ -1 +1 @@
-ee1ccbd5cb4f0a08f85dd92a861283f8  libsemanage-2.0.6.tgz
+c241e659ddab751e036c3e770583e95c  libsemanage-2.0.9.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:24:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 20:24:08 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.123, 1.124 libsepol.spec, 1.165, 
	1.166 sources, 1.124, 1.125
Message-ID: <200709270024.l8R0O8j3008521@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.11-1
	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	18 Sep 2007 20:29:51 -0000	1.123
+++ .cvsignore	27 Sep 2007 00:23:36 -0000	1.124
@@ -123,3 +123,4 @@
 libsepol-2.0.7.tgz
 libsepol-2.0.9.tgz
 libsepol-2.0.10.tgz
+libsepol-2.0.11.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- libsepol.spec	18 Sep 2007 20:29:51 -0000	1.165
+++ libsepol.spec	27 Sep 2007 00:23:36 -0000	1.166
@@ -1,7 +1,7 @@
 
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.10
+Version: 2.0.11
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -86,6 +86,9 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.11-1
+	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
 - Upgrade to latest from NSA
 	* Merged support for the handle_unknown policydb flag from Eric Paris.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- sources	18 Sep 2007 20:29:51 -0000	1.124
+++ sources	27 Sep 2007 00:23:36 -0000	1.125
@@ -1 +1 @@
-0183e0fed49daa76c059d11fa2949ff6  libsepol-2.0.10.tgz
+e18a93af3185a57c354b880f5bab9f46  libsepol-2.0.11.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:44:08 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Wed, 26 Sep 2007 20:44:08 -0400
Subject: rpms/kernel/devel linux-2.6-at76.patch, NONE,
	1.1 linux-2.6-ath5k.patch, NONE,
	1.1 linux-2.6-mac80211-extras.patch, NONE,
	1.1 linux-2.6-zd1211rw-mac80211.patch, NONE, 1.1 kernel.spec,
	1.191, 1.192 linux-2.6-wireless-pending.patch, 1.4,
	1.5 git-wireless-dev.patch, 1.36, NONE
Message-ID: <200709270044.l8R0i84V009142@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9101

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
Added Files:
	linux-2.6-at76.patch linux-2.6-ath5k.patch 
	linux-2.6-mac80211-extras.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Removed Files:
	git-wireless-dev.patch 
Log Message:
Update and restructure wireless patches

linux-2.6-at76.patch:

--- NEW FILE linux-2.6-at76.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:57:31.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 19:59:33.000000000 -0400
@@ -685,6 +685,15 @@ W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
 S:	Maintained
 
+ATMEL USB WIRELESS DRIVER
+P:	Pavel Roskin
+M:	proski at gnu.org
+L:	linux-wireless at vger.kernel.org
+L:	at76c503a-user at lists.berlios.de
+L:	at76c503a-develop at lists.berlios.de
+W:	http://at76c503a.berlios.de/
+S:	Maintained
+
 AUDIT SUBSYSTEM
 P:	David Woodhouse
 M:	dwmw2 at infradead.org
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h	2007-09-26 19:59:33.000000000 -0400
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) 2002,2003 Oliver Kurth
+ *	     (c) 2003,2004 Joerg Albert <joerg.albert at gmx.de>
+ *	     (c) 2007 Guido Guenther <agx at sigxcpu.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 driver was based on information from the Sourceforge driver
+ * released and maintained by Atmel:
+ *
+ *  http://sourceforge.net/projects/atmelwlandriver/
+ *
+ * Although the code was completely re-written,
+ * it would have been impossible without Atmel's decision to
+ * release an Open Source driver (unfortunately the firmware was
+ * kept binary only). Thanks for that decision to Atmel!
+ */
+
+#ifndef _AT76_USB_H
+#define _AT76_USB_H
+
+#include <net/ieee80211.h>
+
+/* current driver version */
+#define DRIVER_VERSION	"0.16"
+
+/* Board types */
+enum board_type {
+	BOARD_503_ISL3861 = 1,
+	BOARD_503_ISL3863 = 2,
+	BOARD_503 = 3,
+	BOARD_503_ACC = 4,
+	BOARD_505 = 5,
+	BOARD_505_2958 = 6,
+	BOARD_505A = 7,
+	BOARD_505AMX = 8
+};
+
+/* our private ioctl's */
+/* preamble length (0 - long, 1 - short, 2 - auto) */
+#define AT76_SET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 0)
+#define AT76_GET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 1)
+/* which debug channels are enabled */
+#define AT76_SET_DEBUG			(SIOCIWFIRSTPRIV + 2)
+#define AT76_GET_DEBUG			(SIOCIWFIRSTPRIV + 3)
+/* power save mode (incl. the Atmel proprietary smart save mode) */
+#define AT76_SET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 4)
+#define AT76_GET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 5)
+/* min and max channel times for scan */
+#define AT76_SET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 6)
+#define AT76_GET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 7)
+/* scan mode (0 - active, 1 - passive) */
+#define AT76_SET_SCAN_MODE		(SIOCIWFIRSTPRIV + 8)
+#define AT76_GET_SCAN_MODE		(SIOCIWFIRSTPRIV + 9)
+
+#define CMD_STATUS_IDLE				0x00
+#define CMD_STATUS_COMPLETE			0x01
+#define CMD_STATUS_UNKNOWN			0x02
+#define CMD_STATUS_INVALID_PARAMETER		0x03
+#define CMD_STATUS_FUNCTION_NOT_SUPPORTED	0x04
+#define CMD_STATUS_TIME_OUT			0x07
+#define CMD_STATUS_IN_PROGRESS			0x08
+#define CMD_STATUS_HOST_FAILURE			0xff
+#define CMD_STATUS_SCAN_FAILED			0xf0
+
+/* answers to get op mode */
+#define OPMODE_NONE				0x00
+#define OPMODE_NORMAL_NIC_WITH_FLASH		0x01
+#define OPMODE_HW_CONFIG_MODE			0x02
+#define OPMODE_DFU_MODE_WITH_FLASH		0x03
+#define OPMODE_NORMAL_NIC_WITHOUT_FLASH		0x04
+
+#define CMD_SET_MIB		0x01
+#define CMD_GET_MIB		0x02
+#define CMD_SCAN		0x03
+#define CMD_JOIN		0x04
+#define CMD_START_IBSS		0x05
+#define CMD_RADIO		0x06
+#define CMD_STARTUP		0x0B
+#define CMD_GETOPMODE		0x33
+
+#define MIB_LOCAL		0x01
+#define MIB_MAC_ADDR		0x02
+#define MIB_MAC			0x03
+#define MIB_MAC_MGMT		0x05
+#define MIB_MAC_WEP		0x06
+#define MIB_PHY			0x07
+#define MIB_FW_VERSION		0x08
+#define MIB_MDOMAIN		0x09
+
+#define ADHOC_MODE		1
+#define INFRASTRUCTURE_MODE	2
+
+/* values for struct mib_local, field preamble_type */
+#define PREAMBLE_TYPE_LONG	0
+#define PREAMBLE_TYPE_SHORT	1
+#define PREAMBLE_TYPE_AUTO	2
+
+/* values for tx_rate */
+#define TX_RATE_1MBIT		0
+#define TX_RATE_2MBIT		1
+#define TX_RATE_5_5MBIT 	2
+#define TX_RATE_11MBIT		3
+#define TX_RATE_AUTO		4
+
+/* power management modes */
+#define AT76_PM_OFF		1
+#define AT76_PM_ON		2
+#define AT76_PM_SMART		3
+
+struct hwcfg_r505 {
+	u8 cr39_values[14];
+	u8 reserved1[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 reserved2[14];
+	u8 cr15_values[14];
+	u8 reserved3[3];
+} __attribute__((packed));
+
+struct hwcfg_rfmd {
+	u8 cr20_values[14];
+	u8 cr21_values[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 low_power_values[14];
+	u8 normal_power_values[14];
+	u8 reserved1[3];
+} __attribute__((packed));
+
+struct hwcfg_intersil {
+	u8 mac_addr[ETH_ALEN];
+	u8 cr31_values[14];
+	u8 cr58_values[14];
+	u8 pidvid[4];
+	u8 regulatory_domain;
+	u8 reserved[1];
+} __attribute__((packed));
+
+union at76_hwcfg {
+	struct hwcfg_intersil i;
+	struct hwcfg_rfmd r3;
+	struct hwcfg_r505 r5;
+};
+
+#define WEP_SMALL_KEY_LEN	(40 / 8)
+#define WEP_LARGE_KEY_LEN	(104 / 8)
+
+struct at76_card_config {
+	u8 exclude_unencrypted;
+	u8 promiscuous_mode;
+	u8 short_retry_limit;
+	u8 encryption_type;
+	__le16 rts_threshold;
+	__le16 fragmentation_threshold;	/* 256..2346 */
+	u8 basic_rate_set[4];
+	u8 auto_rate_fallback;	/* 0,1 */
+	u8 channel;
+	u8 privacy_invoked;
+	u8 wep_default_key_id;	/* 0..3 */
+	u8 current_ssid[32];
+	u8 wep_default_key_value[4][WEP_KEY_LEN];
+	u8 ssid_len;
+	u8 short_preamble;
+	__le16 beacon_period;
+} __attribute__((packed));
+
+struct at76_command {
+	u8 cmd;
[...5873 lines suppressed...]
+{
+	int ret;
+	struct at76_priv *priv;
+	struct fwentry *fwe;
+	struct usb_device *udev;
+	int op_mode;
+	int need_ext_fw = 0;
+	struct mib_fw_version fwv;
+	int board_type = (int)id->driver_info;
+
+	udev = usb_get_dev(interface_to_usbdev(interface));
+
+	/* Load firmware into kernel memory */
+	fwe = at76_load_firmware(udev, board_type);
+	if (!fwe) {
+		ret = -ENOENT;
+		goto error;
+	}
+
+	op_mode = at76_get_op_mode(udev);
+
+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
+
+	/* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ???
+	   we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */
+
+	if (op_mode == OPMODE_HW_CONFIG_MODE) {
+		err("cannot handle a device in HW_CONFIG_MODE (opmode %d)",
+		    op_mode);
+		ret = -EBUSY;
+		goto error;
+	}
+
+	if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH
+	    && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
+		/* download internal firmware part */
+		at76_dbg(DBG_DEVSTART, "downloading internal firmware");
+		ret = at76_load_internal_fw(udev, fwe);
+		if (ret < 0) {
+			err("error %d downloading internal firmware", ret);
+			goto error;
+		}
+		usb_put_dev(udev);
+		return ret;
+	}
+
+	/* Internal firmware already inside the device.  Get firmware
+	 * version to test if external firmware is loaded.
+	 * This works only for newer firmware, e.g. the Intersil 0.90.x
+	 * says "control timeout on ep0in" and subsequent
+	 * at76_get_op_mode() fail too :-( */
+
+	/* if version >= 0.100.x.y or device with built-in flash we can
+	 * query the device for the fw version */
+	if ((fwe->fw_version.major > 0 || fwe->fw_version.minor >= 100)
+	    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0 || (fwv.major | fwv.minor) == 0)
+			need_ext_fw = 1;
+	} else
+		/* No way to check firmware version, reload to be sure */
+		need_ext_fw = 1;
+
+	if (need_ext_fw) {
+		at76_dbg(DBG_DEVSTART, "downloading external firmware");
+
+		ret = at76_load_external_fw(udev, fwe);
+		if (ret)
+			goto error;
+
+		/* Re-check firmware version */
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0) {
+			err("error %d getting firmware version", ret);
+			goto error;
+		}
+
+		/* Major and minor version must match */
+		if (fwv.major != fwe->fw_version.major
+		    || fwv.minor != fwe->fw_version.minor) {
+			printk(KERN_ERR DRIVER_NAME
+			       ": wrong firmware version, loaded %d.%d.%d-%d, "
+			       "read back %d.%d.%d-%d\n",
+			       fwe->fw_version.major, fwe->fw_version.minor,
+			       fwe->fw_version.patch, fwe->fw_version.build,
+			       fwv.major, fwv.minor, fwv.patch, fwv.build);
+			ret = -EBUSY;
+			goto error;
+		}
+	}
+
+	priv = at76_alloc_new_device(udev);
+	if (!priv) {
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	SET_NETDEV_DEV(priv->netdev, &interface->dev);
+	usb_set_intfdata(interface, priv);
+
+	memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
+	priv->board_type = board_type;
+
+	ret = at76_init_new_device(priv, interface);
+	if (ret < 0)
+		at76_delete_device(priv);
+
+	return ret;
+
+error:
+	usb_put_dev(udev);
+	return ret;
+}
+
+static void at76_disconnect(struct usb_interface *interface)
+{
+	struct at76_priv *priv;
+
+	priv = usb_get_intfdata(interface);
+	usb_set_intfdata(interface, NULL);
+
+	/* Disconnect after loading internal firmware */
+	if (!priv)
+		return;
+
+	printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
+	at76_delete_device(priv);
+	printk(KERN_INFO DRIVER_NAME ": disconnected\n");
+}
+
+/* Structure for registering this driver with the USB subsystem */
+static struct usb_driver at76_driver = {
+	.name = DRIVER_NAME,
+	.probe = at76_probe,
+	.disconnect = at76_disconnect,
+	.id_table = dev_table,
+};
+
+static int __init at76_mod_init(void)
+{
+	int result;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");
+
+	mutex_init(&fw_mutex);
+
+	/* register this driver with the USB subsystem */
+	result = usb_register(&at76_driver);
+	if (result < 0)
+		err("usb_register failed (status %d)", result);
+
+	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
+	return result;
+}
+
+static void __exit at76_mod_exit(void)
+{
+	int i;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
+	usb_deregister(&at76_driver);
+	for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
+		if (firmwares[i].fw)
+			release_firmware(firmwares[i].fw);
+	}
+	led_trigger_unregister_simple(ledtrig_tx);
+}
+
+module_param_named(debug, at76_debug, int, 0600);
+MODULE_PARM_DESC(debug, "Debugging level");
+
+module_init(at76_mod_init);
+module_exit(at76_mod_exit);
+
+MODULE_AUTHOR("Oliver Kurth <oku at masqmail.cx>");
+MODULE_AUTHOR("Joerg Albert <joerg.albert at gmx.de>");
+MODULE_AUTHOR("Alex <alex at foogod.com>");
+MODULE_AUTHOR("Nick Jones");
+MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453 at hotmail.com>");
+MODULE_AUTHOR("Pavel Roskin <proski at gnu.org>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 19:57:31.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 19:59:33.000000000 -0400
@@ -381,6 +381,14 @@ config PCI_HERMES
 	  common.  Some of the built-in wireless adaptors in laptops are of
 	  this variety.
 
+config USB_ATMEL
+	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
+	depends on WLAN_80211 && USB
+	select FW_LOADER
+	---help---
+	  Enable support for USB Wireless devices using Atmel at76c503,
+	  at76c505 or at76c505a chips.
+
 config PCMCIA_HERMES
 	tristate "Hermes PCMCIA card support"
 	depends on PCMCIA && HERMES

linux-2.6-ath5k.patch:

--- NEW FILE linux-2.6-ath5k.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:59:33.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:00:12.000000000 -0400
@@ -642,6 +642,14 @@ M:	ecashin at coraid.com
 W:	http://www.coraid.com/support/linux
 S:	Supported
 
+ATHEROS ATH5K WIRELESS DRIVER
+P:	Jiri Slaby
+M:	jirislaby at gmail.com
+P:	Luis R. Rodriguez
+M:	mcgrof at gmail.com
+L:	linux-wireless at vger.kernel.org
+S:	Maintained
+
 ATL1 ETHERNET DRIVER
 P:	Jay Cliburn
 M:	jcliburn at gmail.com
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-26 20:00:12.000000000 -0400
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
+ *
+ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _ATH5K_H
+#define _ATH5K_H
+
+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
+ * long and results timeouts). It's also illegal to tune to some of the
+ * supported frequencies in some countries, so use this at your own risk,
+ * you've been warned. */
+#define CHAN_DEBUG	0
+
+/* Uncomment this for debuging (warning that it results in TOO much output) */
+/*#define AR5K_DEBUG	1 */
+
+#include <linux/types.h>
+#include <net/mac80211.h>
+
+#include "ath5k_hw.h"
+#include "ath5k_regdom.h"
+
+/* PCI IDs */
+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
+
+/****************************\
+  GENERIC DRIVER DEFINITIONS
+\****************************/
+
+#define AR5K_PRINTF(fmt, ...)   printk("%s: " fmt, __func__, ##__VA_ARGS__)
+#define AR5K_PRINT(fmt)         printk("%s: " fmt, __func__)
+#ifdef AR5K_DEBUG
+#define AR5K_TRACE              printk(KERN_DEBUG "%s:%d\n", __func__, __LINE__)
+#else
+#define AR5K_TRACE
+#endif
+
+/*
+ * Some tuneable values (these should be changeable by the user)
+ */
+#define AR5K_TUNE_DMA_BEACON_RESP		2
+#define AR5K_TUNE_SW_BEACON_RESP		10
+#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0
+#define AR5K_TUNE_RADAR_ALERT			false
+#define AR5K_TUNE_MIN_TX_FIFO_THRES		1
+#define AR5K_TUNE_MAX_TX_FIFO_THRES		((IEEE80211_MAX_LEN / 64) + 1)
+#define AR5K_TUNE_RSSI_THRES			1792
+#define AR5K_TUNE_REGISTER_TIMEOUT		20000
+#define AR5K_TUNE_REGISTER_DWELL_TIME		20000
+#define AR5K_TUNE_BEACON_INTERVAL		100
+#define AR5K_TUNE_AIFS				2
+#define AR5K_TUNE_AIFS_11B			2
+#define AR5K_TUNE_AIFS_XR			0
+#define AR5K_TUNE_CWMIN				15
+#define AR5K_TUNE_CWMIN_11B			31
+#define AR5K_TUNE_CWMIN_XR			3
+#define AR5K_TUNE_CWMAX				1023
+#define AR5K_TUNE_CWMAX_11B			1023
+#define AR5K_TUNE_CWMAX_XR			7
+#define AR5K_TUNE_NOISE_FLOOR			-72
+#define AR5K_TUNE_MAX_TXPOWER			60
+#define AR5K_TUNE_DEFAULT_TXPOWER		30
+#define AR5K_TUNE_TPC_TXPOWER			true
+#define AR5K_TUNE_ANT_DIVERSITY			true
+#define AR5K_TUNE_HWTXTRIES			4
+
+/* token to use for aifs, cwmin, cwmax in MadWiFi */
+#define	AR5K_TXQ_USEDEFAULT	((u32) -1)
+
+/* GENERIC CHIPSET DEFINITIONS */
+
+/* MAC Chips */
+enum ath5k_version {
+	AR5K_AR5210	= 0,
+	AR5K_AR5211	= 1,
+	AR5K_AR5212	= 2,
+};
+
+/* PHY Chips */
+enum ath5k_radio {
+	AR5K_RF5110	= 0,
+	AR5K_RF5111	= 1,
+	AR5K_RF5112	= 2,
+};
+
+/*
+ * Common silicon revision/version values
+ */
+enum ath5k_srev_type {
+	AR5K_VERSION_VER,
+	AR5K_VERSION_REV,
+	AR5K_VERSION_RAD,
+	AR5K_VERSION_DEV
+};
+
+struct ath5k_srev_name {
+	const char		*sr_name;
+	enum ath5k_srev_type	sr_type;
+	u_int			sr_val;
+};
+
+#define AR5K_SREV_NAME	{						\
+	{ "5210",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5210 },	\
+	{ "5311",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311 },	\
+	{ "5311a",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311A },\
+	{ "5311b",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311B },\
+	{ "5211",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5211 },	\
+	{ "5212",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5212 },	\
+	{ "5213",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213 },	\
+	{ "xxxx",	AR5K_VERSION_VER,	AR5K_SREV_UNKNOWN },	\
+	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },	\
+	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },	\
+	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },	\
+	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },	\
+	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\
+	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },	\
+	{ "2112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },	\
+	{ "xxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },	\
+	{ "2413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR2413 },\
+	{ "5413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5413 },\
+	{ "5424",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5424 },\
+	{ "xxxx",	AR5K_VERSION_DEV,	AR5K_SREV_UNKNOWN }	\
+}
+
+#define AR5K_SREV_UNKNOWN	0xffff
+
+#define AR5K_SREV_VER_AR5210	0x00
+#define AR5K_SREV_VER_AR5311	0x10
+#define AR5K_SREV_VER_AR5311A	0x20
+#define AR5K_SREV_VER_AR5311B	0x30
+#define AR5K_SREV_VER_AR5211	0x40
+#define AR5K_SREV_VER_AR5212	0x50
+#define AR5K_SREV_VER_AR5213	0x55
+#define AR5K_SREV_VER_UNSUPP	0x60
+
+#define AR5K_SREV_RAD_5110	0x00
+#define AR5K_SREV_RAD_5111	0x10
+#define AR5K_SREV_RAD_5111A	0x15
[...13868 lines suppressed...]
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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 NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.20 2005/01/24 20:31:24 sam Exp $
+ */
+
+/*
+ * Defintions for the Atheros Wireless LAN controller driver.
+ */
+#ifndef _DEV_ATH_ATHVAR_H
+#define _DEV_ATH_ATHVAR_H
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/wireless.h>
+#include <linux/if_ether.h>
+
+#include "ath5k.h"
+
+#define	ATH_TIMEOUT		1000
+
+#define ATH_LONG_CALIB		30 /* seconds */
+#define ATH_SHORT_CALIB		1
+
+/*
+ * Maximum acceptable MTU
+ * MAXFRAMEBODY - WEP - QOS - RSN/WPA:
+ * 2312 - 8 - 2 - 12 = 2290
+ */
+#define ATH_MAX_MTU	2290
+#define ATH_MIN_MTU	32
+
+#define	ATH_RXBUF	40		/* number of RX buffers */
+#define	ATH_TXBUF	200		/* number of TX buffers */
+#define	ATH_TXDESC	1		/* number of descriptors per buffer */
+#define ATH_BCBUF	1		/* number of beacon buffers */
+#define	ATH_TXMAXTRY	11		/* max number of transmit attempts */
+#define	ATH_TXINTR_PERIOD 5		/* max number of batched tx descriptors */
+
+#define ATH_BEACON_AIFS_DEFAULT  0	/* default aifs for ap beacon q */
+#define ATH_BEACON_CWMIN_DEFAULT 0	/* default cwmin for ap beacon q */
+#define ATH_BEACON_CWMAX_DEFAULT 0	/* default cwmax for ap beacon q */
+
+#define ATH_RSSI_LPF_LEN	10
+#define ATH_RSSI_DUMMY_MARKER	0x127
+#define ATH_EP_MUL(x, mul)	((x) * (mul))
+#define ATH_RSSI_IN(x)		(ATH_EP_MUL((x), AR5K_RSSI_EP_MULTIPLIER))
+#define ATH_LPF_RSSI(x, y, len) \
+    ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
+#define ATH_RSSI_LPF(x, y) do {						\
+	if ((y) >= -20)							\
+		x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
+} while (0)
+
+struct ath_buf {
+	struct list_head	list;
+	unsigned int		flags;	/* tx descriptor flags */
+	struct ath_desc		*desc;	/* virtual addr of desc */
+	dma_addr_t		daddr;	/* physical addr of desc */
+	struct sk_buff		*skb;	/* skbuff for buf */
+	dma_addr_t		skbaddr;/* physical addr of skb data */
+	struct ieee80211_tx_control ctl;
+};
+
+/*
+ * Data transmit queue state.  One of these exists for each
+ * hardware transmit queue.  Packets sent to us from above
+ * are assigned to queues based on their priority.  Not all
+ * devices support a complete set of hardware transmit queues.
+ * For those devices the array sc_ac2q will map multiple
+ * priorities to fewer hardware queues (typically all to one
+ * hardware queue).
+ */
+struct ath_txq {
+	unsigned int	qnum;		/* hardware q number */
+	u32		*link;		/* link ptr in last TX desc */
+	struct list_head q;		/* transmit queue */
+	spinlock_t	lock;		/* lock on q and link */
+	bool		setup;
+};
+
+#if CHAN_DEBUG
+#define ATH_CHAN_MAX	(26+26+26+200+200)
+#else
+#define ATH_CHAN_MAX	(14+14+14+252+20)	/* XXX what's the max? */
+#endif
+
+struct ath_softc {
+	struct pci_dev		*pdev;		/* for dma mapping */
+	void __iomem		*iobase;	/* address of the device */
+	struct mutex		lock;		/* dev-level lock */
+	struct ieee80211_tx_queue_stats tx_stats;
+	struct ieee80211_low_level_stats ll_stats;
+	struct ieee80211_hw	*hw;		/* IEEE 802.11 common */
+	struct ieee80211_hw_mode modes[NUM_IEEE80211_MODES];
+	struct ieee80211_channel channels[ATH_CHAN_MAX];
+	struct ieee80211_rate	rates[AR5K_MAX_RATES * NUM_IEEE80211_MODES];
+	enum ieee80211_if_types	opmode;
+	struct ath_hw		*ah;		/* Atheros HW */
+
+	int			debug;
+
+	struct ath_buf		*bufptr;	/* allocated buffer ptr */
+	struct ath_desc		*desc;		/* TX/RX descriptors */
+	dma_addr_t		desc_daddr;	/* DMA (physical) address */
+	size_t			desc_len;	/* size of TX/RX descriptors */
+	u16			cachelsz;	/* cache line size */
+
+	DECLARE_BITMAP(status, 6);
+#define ATH_STAT_INVALID	0		/* disable hardware accesses */
+#define ATH_STAT_MRRETRY	1		/* multi-rate retry support */
+#define ATH_STAT_PROMISC	2
+#define ATH_STAT_LEDBLINKING	3		/* LED blink operation active */
+#define ATH_STAT_LEDENDBLINK	4		/* finish LED blink operation */
+#define ATH_STAT_LEDSOFT	5		/* enable LED gpio status */
+
+	unsigned int		curmode;	/* current phy mode */
+	struct ieee80211_channel *curchan;	/* current h/w channel */
+
+	int 			iface_id;	/* add/remove_interface id */
+
+	struct {
+		u8	rxflags;	/* radiotap rx flags */
+		u8	txflags;	/* radiotap tx flags */
+		u16	ledon;		/* softled on time */
+		u16	ledoff;		/* softled off time */
+	} hwmap[32];				/* h/w rate ix mappings */
+
+	enum ath5k_int		imask;		/* interrupt mask copy */
+
+	DECLARE_BITMAP(keymap, AR5K_KEYCACHE_SIZE); /* key use bit map */
+
+	u8			bssidmask[ETH_ALEN];
+
+	unsigned int		led_pin,	/* GPIO pin for driving LED */
+				led_on,		/* pin setting for LED on */
+				led_off;	/* off time for current blink */
+	struct timer_list	led_tim;	/* led off timer */
+	u8			led_rxrate;	/* current rx rate for LED */
+	u8			led_txrate;	/* current tx rate for LED */
+
+	struct tasklet_struct	restq;		/* reset tasklet */
+
+	unsigned int		rxbufsize;	/* rx size based on mtu */
+	struct list_head	rxbuf;		/* receive buffer */
+	spinlock_t		rxbuflock;
+	u32			*rxlink;	/* link ptr in last RX desc */
+	struct tasklet_struct	rxtq;		/* rx intr tasklet */
+
+	struct list_head	txbuf;		/* transmit buffer */
+	spinlock_t		txbuflock;
+	unsigned int		txbuf_len;	/* buf count in txbuf list */
+	struct ath_txq		txqs[2];	/* beacon and tx */
+
+	struct ath_txq		*txq;		/* beacon and tx*/
+	struct tasklet_struct	txtq;		/* tx intr tasklet */
+
+	struct ath_buf		*bbuf;		/* beacon buffer */
+	unsigned int		bhalq,		/* HAL q for outgoing beacons */
+				bmisscount,	/* missed beacon transmits */
+				bintval,	/* beacon interval */
+				bsent;
+
+	struct timer_list	calib_tim;	/* calibration timer */
+};
+
+#define ath5k_hw_hasbssidmask(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_BSSIDMASK, 0, NULL) == 0)
+#define ath5k_hw_hasveol(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
+
+#endif

linux-2.6-mac80211-extras.patch:

--- NEW FILE linux-2.6-mac80211-extras.patch ---
diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-26 20:24:17.000000000 -0400
+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-26 20:24:22.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
 } __attribute__ ((packed));
 
 
+struct ieee80211_ht_capability {
+	__le16 capabilities_info;
+	u8 mac_ht_params_info;
+	u8 supported_mcs_set[16];
+	__le16 extended_ht_capability_info;
+	__le32 tx_BF_capability_info;
+	u8 antenna_selection_info;
+}__attribute__ ((packed));
+
+struct ieee80211_ht_additional_info {
+	u8 control_chan;
+	u8 ht_param;
+	__le16 operation_mode;
+	__le16 stbc_param;
+	u8 basic_set[16];
+}__attribute__ ((packed));
+
+
+#define IEEE80211_TSINFO_TYPE(a)	((a.byte1 & 0x01) >> 0)
+#define IEEE80211_TSINFO_TSID(a)	((a.byte1 & 0x1E) >> 1)
+#define IEEE80211_TSINFO_DIR(a)		((a.byte1 & 0x60) >> 5)
+#define IEEE80211_TSINFO_POLICY(a)	((a.byte1 & 0x80) >> 7 + \
+					 (a.byte2 & 0x01) << 1)
+#define IEEE80211_TSINFO_AGG(a)		((a.byte2 & 0x02) >> 1)
+#define IEEE80211_TSINFO_APSD(a)	((a.byte2 & 0x04) >> 2)
+#define IEEE80211_TSINFO_UP(a)		((a.byte2 & 0x38) >> 3)
+#define IEEE80211_TSINFO_ACK(a)		((a.byte2 & 0xC0) >> 6)
+#define IEEE80211_TSINFO_SCHEDULE(a)	((a.byte3 & 0x01) >> 0)
+
+#define IEEE80211_SET_TSINFO_TYPE(i, d)		(i.byte1 |= (d << 0) & 0x01)
+#define IEEE80211_SET_TSINFO_TSID(i, d)		(i.byte1 |= (d << 1) & 0x1E)
+#define IEEE80211_SET_TSINFO_DIR(i, d)		(i.byte1 |= (d << 5) & 0x60)
+#define IEEE80211_SET_TSINFO_POLICY(i, d)	\
+do {						\
+						i.byte1 |= (d & 0x01) << 7; \
+						i.byte2 |= (d & 0x02) >> 1; \
+} while(0)
+#define IEEE80211_SET_TSINFO_AGG(i, d)		(i.byte2 |= (d << 1) & 0x02)
+#define IEEE80211_SET_TSINFO_APSD(i, d)		(i.byte2 |= (d << 2) & 0x04)
+#define IEEE80211_SET_TSINFO_UP(i, d)		(i.byte2 |= (d << 3) & 0x38)
+#define IEEE80211_SET_TSINFO_ACK(i, d)		(i.byte2 |= (d << 6) & 0xC0)
+#define IEEE80211_SET_TSINFO_SCHEDULE(i, d)	(i.byte3 |= (d << 0) & 0x01)
+
+struct ieee80211_ts_info {
+	u8 byte1;
+	u8 byte2;
+	u8 byte3;
+} __attribute__ ((packed));
+
+struct ieee80211_elem_tspec {
+	struct ieee80211_ts_info ts_info;
+	__le16 nominal_msdu_size;
+	__le16 max_msdu_size;
+	__le32 min_service_interval;
+	__le32 max_service_interval;
+	__le32 inactivity_interval;
+	__le32 suspension_interval;
+	__le32 service_start_time;
+	__le32 min_data_rate;
+	__le32 mean_data_rate;
+	__le32 peak_data_rate;
+	__le32 burst_size;
+	__le32 delay_bound;
+	__le32 min_phy_rate;
+	__le16 surplus_band_allow;
+	__le16 medium_time;
+} __attribute__ ((packed));
+
+
 struct ieee80211_mgmt {
 	__le16 frame_control;
 	__le16 duration;
@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
 				struct {
 					u8 action_code;
 					u8 dialog_token;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_req;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status_code;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_resp;
+				struct {
+					u8 action_code;
+					struct ieee80211_ts_info ts_info;
+					__le16 reason_code;
+				} __attribute__ ((packed)) delts;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
 					u8 status_code;
 					u8 variable[0];
 				} __attribute__ ((packed)) wme_action;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 capab_info;
+					__le16 timeout;
+					/* Followed by Supported Rates and
+					 * Extended Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_req;
+				struct {
+					u8 action_code;
+					__le16 status_code;
+					u8 dest[6];
+					u8 src[6];
+					/* Followed by Capability Information,
+					 * Supported Rates and Extended
+					 * Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_resp;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 reason_code;
+				} __attribute__ ((packed)) dls_teardown;
 				struct{
 					u8 action_code;
 					u8 element_id;
@@ -184,6 +295,25 @@ struct ieee80211_mgmt {
 					u8 new_chan;
 					u8 switch_count;
 				} __attribute__((packed)) chan_switch;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 capab;
+					__le16 timeout;
+					__le16 start_seq_num;
+				} __attribute__((packed)) addba_req;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status;
+					__le16 capab;
+					__le16 timeout;
+				} __attribute__((packed)) addba_resp;
+				struct{
+					u8 action_code;
+					__le16 params;
+					__le16 reason_code;
+				}__attribute__((packed)) delba;
 			} u;
 		} __attribute__ ((packed)) action;
 	} u;
@@ -270,6 +400,18 @@ enum ieee80211_statuscode {
 	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
 	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
 	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
+	/* 802.11e */
+	WLAN_STATUS_UNSPECIFIED_QOS = 32,
+	WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
+	WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
+	WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
+	WLAN_STATUS_REQUEST_DECLINED = 37,
+	WLAN_STATUS_INVALID_QOS_PARAM = 38,
+	WLAN_STATUS_CHANGE_TSPEC = 39,
+	WLAN_STATUS_WAIT_TS_DELAY = 47,
+	WLAN_STATUS_NO_DIRECT_LINK = 48,
+	WLAN_STATUS_STA_NOT_PRESENT = 49,
+	WLAN_STATUS_STA_NOT_QSTA = 50,
 };
 
 
@@ -300,9 +442,50 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
 	WLAN_REASON_IEEE8021X_FAILED = 23,
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+	/* 802.11e */
+	WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
+	WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
+	WLAN_REASON_DISASSOC_LOW_ACK = 34,
+	WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
+	WLAN_REASON_QSTA_LEAVE_QBSS = 36,
+	WLAN_REASON_QSTA_NOT_USE = 37,
+	WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
+	WLAN_REASON_QSTA_TIMEOUT = 39,
+	WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
 };
 
 
+/* Category Code */
+enum ieee80211_category {
+	WLAN_CATEGORY_SPECTRUM_MGMT = 0,
+	WLAN_CATEGORY_QOS = 1,
+	WLAN_CATEGORY_DLS = 2,
+	WLAN_CATEGORY_BACK = 3,
[...3755 lines suppressed...]
+			printk(" %02x", mic[i]);
+		printk("\n");
+		printk(KERN_DEBUG "   SA=" MAC_FMT " DA=" MAC_FMT " key",
+		       MAC_ARG(sa), MAC_ARG(da));
+		for (i = 0; i < 8; i++)
+			printk(" %02x", key[i]);
+		printk(" (%d)\n", authenticator);
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 
 		mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
 						(void *) skb->data);
@@ -208,12 +271,30 @@ static int tkip_encrypt_skb(struct ieee8
 	memmove(pos, pos + TKIP_IV_LEN, hdrlen);
 	pos += hdrlen;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_iv_inc;
+iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	/* Increase IV for the frame */
 	key->u.tkip.iv16++;
 	if (key->u.tkip.iv16 == 0)
 		key->u.tkip.iv32++;
 
-	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto iv_inc;
+	}
+skip_iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
+	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	    && !tx->wpa_test
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+		) {
 		hdr = (struct ieee80211_hdr *)skb->data;
 
 		/* hwaccel - with preallocated room for IV */
@@ -255,6 +336,37 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 	tx->u.tx.control->iv_len = TKIP_IV_LEN;
 	ieee80211_tx_set_iswep(tx);
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if ((tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) ||
+	    (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+	     tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV)) {
+		wpa_test = 1;
+	}
+
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - TKIP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
 	    !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
 	    !wpa_test) {
@@ -268,6 +380,10 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)
@@ -275,6 +391,23 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 		}
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       tx->dev->name, MAC_ARG(tx->sta->addr));
+		tx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	} else if (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+		   tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for Group Key\n",
+		       tx->dev->name);
+		tx->local->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	return TXRX_CONTINUE;
 }
 
@@ -299,6 +432,17 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
 	if (!rx->sta || skb->len - hdrlen < 12)
 		return TXRX_DROP;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (rx->sta && rx->sta->wpa_trigger & WPA_TRIGGER_FAIL_RX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting RX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       rx->dev->name, MAC_ARG(rx->sta->addr));
+		rx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_RX_ICV;
+		skb->data[skb->len - 1]++;
+		wpa_test = 1;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) {
 		if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) {
 			/*
@@ -467,12 +611,26 @@ static int ccmp_encrypt_skb(struct ieee8
 	/* PN = PN + 1 */
 	pn = key->u.ccmp.tx_pn;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_pn_inc;
+pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
 		pn[i]++;
 		if (pn[i])
 			break;
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto pn_inc;
+	}
+skip_pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	ccmp_pn2hdr(pos, pn, key->conf.keyidx);
 
 	if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
@@ -504,6 +662,27 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 	if (!key || key->conf.alg != ALG_CCMP || !WLAN_FC_DATA_PRESENT(fc))
 		return TXRX_CONTINUE;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger = 0;
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger = 0;
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - CCMP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	tx->u.tx.control->icv_len = CCMP_MIC_LEN;
 	tx->u.tx.control->iv_len = CCMP_HDR_LEN;
 	ieee80211_tx_set_iswep(tx);
@@ -521,6 +700,10 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)

linux-2.6-zd1211rw-mac80211.patch:

--- NEW FILE linux-2.6-zd1211rw-mac80211.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 20:00:12.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:03:54.000000000 -0400
@@ -4287,6 +4287,16 @@ W:	http://www.qsl.net/dl1bke/
 L:	linux-hams at vger.kernel.org
 S:	Maintained
 
+Z1211 WIRELESS DRIVER
+P:	Daniel Drake
+M:	dsd at gentoo.org
+P:	Ulrich Kunitz
+M:	kune at deine-taler.de
+W:	http://zd1211.ath.cx/wiki/DriverRewrite
+L:	linux-wireless at vger.kernel.org
+L:	zd1211-devs at lists.sourceforge.net (subscribers-only)
+S:	Maintained
+
 ZD1211RW WIRELESS DRIVER
 P:	Daniel Drake
 M:	dsd at gentoo.org
diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-26 20:00:32.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-26 20:03:54.000000000 -0400
@@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+obj-$(CONFIG_Z1211)		+= zd1211rw-mac80211/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-26 20:03:54.000000000 -0400
@@ -0,0 +1,1620 @@
+/* zd_chip.c
+ *
+ * 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
+ */
+
+/* This file implements all the hardware specific functions for the ZD1211
+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy
+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+
+void zd_chip_init(struct zd_chip *chip,
+	         struct ieee80211_hw *hw,
+		 struct usb_interface *intf)
+{
+	memset(chip, 0, sizeof(*chip));
+	mutex_init(&chip->mutex);
+	zd_usb_init(&chip->usb, hw, intf);
+	zd_rf_init(&chip->rf);
+}
+
+void zd_chip_clear(struct zd_chip *chip)
+{
+	ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+	zd_usb_clear(&chip->usb);
+	zd_rf_clear(&chip->rf);
+	mutex_destroy(&chip->mutex);
+	ZD_MEMCLEAR(chip, sizeof(*chip));
+}
+
+static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
+{
+	u8 *addr = zd_chip_to_mac(chip)->hwaddr;
+	return scnprintf(buffer, size, "%02x-%02x-%02x",
+		         addr[0], addr[1], addr[2]);
+}
+
+/* Prints an identifier line, which will support debugging. */
+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
+{
+	int i = 0;
+
+	i = scnprintf(buffer, size, "zd1211%s chip ",
+		      zd_chip_is_zd1211b(chip) ? "b" : "");
+	i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += scnprint_mac_oui(chip, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
+		chip->patch_cck_gain ? 'g' : '-',
+		chip->patch_cr157 ? '7' : '-',
+		chip->patch_6m_band_edge ? '6' : '-',
+		chip->new_phy_layout ? 'N' : '-',
+		chip->al2230s_bit ? 'S' : '-');
+	return i;
+}
+
+static void print_id(struct zd_chip *chip)
+{
+	char buffer[80];
+
+	scnprint_id(chip, buffer, sizeof(buffer));
+	buffer[sizeof(buffer)-1] = 0;
+	dev_info(zd_chip_dev(chip), "%s\n", buffer);
+}
+
+static zd_addr_t inc_addr(zd_addr_t addr)
+{
+	u16 a = (u16)addr;
+	/* Control registers use byte addressing, but everything else uses word
+	 * addressing. */
+	if ((a & 0xf000) == CR_START)
+		a += 2;
+	else
+		a += 1;
+	return (zd_addr_t)a;
+}
+
+/* Read a variable number of 32-bit values. Parameter count is not allowed to
+ * exceed USB_MAX_IOREAD32_COUNT.
+ */
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+		 unsigned int count)
+{
+	int r;
+	int i;
+	zd_addr_t *a16 = (zd_addr_t *)NULL;
+	u16 *v16;
+	unsigned int count16;
+
+	if (count > USB_MAX_IOREAD32_COUNT)
+		return -EINVAL;
+
+	/* Allocate a single memory block for values and addresses. */
+	count16 = 2*count;
+	a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+		                   GFP_KERNEL);
+	if (!a16) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error ENOMEM in allocation of a16\n");
+		r = -ENOMEM;
+		goto out;
+	}
+	v16 = (u16 *)(a16 + count16);
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		/* We read the high word always first. */
+		a16[j] = inc_addr(addr[i]);
+		a16[j+1] = addr[i];
+	}
+
+	r = zd_ioread16v_locked(chip, v16, a16, count16);
+	if (r) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error: zd_ioread16v_locked. Error number %d\n", r);
+		goto out;
+	}
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		values[i] = (v16[j] << 16) | v16[j+1];
+	}
+
+out:
+	kfree((void *)a16);
+	return r;
+}
+
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+	           unsigned int count)
+{
+	int i, j, r;
+	struct zd_ioreq16 *ioreqs16;
+	unsigned int count16;
+
+	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+
+	if (count == 0)
+		return 0;
+	if (count > USB_MAX_IOWRITE32_COUNT)
+		return -EINVAL;
[...7630 lines suppressed...]
+	spin_unlock_irq(&mac->lock);
+
+	zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+
+static void zd_op_set_multicast_list(struct ieee80211_hw *hw,
+				      unsigned short dev_flags, int mc_count)
+{
+	struct zd_mc_hash hash;
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	if ((dev_flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
+	     has_monitor_interfaces(mac))
+	{
+		zd_mc_add_all(&hash);
+	} else {
+		struct dev_mc_list *mc = NULL;
+		void *tmp = NULL;
+		DECLARE_MAC_BUF(macbuf);
+
+		zd_mc_clear(&hash);
+		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
+			dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
+				  print_mac(macbuf, mc->dmi_addr));
+			zd_mc_add_addr(&hash, mc->dmi_addr);
+		}
+	}
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->multicast_hash = hash;
+	spin_unlock_irqrestore(&mac->lock, flags);
+	queue_work(zd_workqueue, &mac->set_multicast_hash_work);
+}
+
+static void set_rts_cts_work(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, set_rts_cts_work);
+	unsigned long flags;
+	unsigned int short_preamble;
+
+	mutex_lock(&mac->chip.mutex);
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->updating_rts_rate = 0;
+	short_preamble = mac->short_preamble;
+	spin_unlock_irqrestore(&mac->lock, flags);
+
+	zd_chip_set_rts_cts_rate_locked(&mac->chip, short_preamble);
+	mutex_unlock(&mac->chip.mutex);
+}
+
+static void zd_op_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
+				 int cts_protection, int preamble)
+{
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
+
+	if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
+		spin_lock_irqsave(&mac->lock, flags);
+		mac->short_preamble = !preamble;
+		if (!mac->updating_rts_rate) {
+			mac->updating_rts_rate = 1;
+			/* FIXME: should disable TX here, until work has
+			 * completed and RTS_CTS reg is updated */
+			queue_work(zd_workqueue, &mac->set_rts_cts_work);
+		}
+		spin_unlock_irqrestore(&mac->lock, flags);
+	}
+}
+
+static const struct ieee80211_ops zd_ops = {
+	.tx			= zd_op_tx,
+	.open			= zd_op_open,
+	.stop			= zd_op_stop,
+	.add_interface		= zd_op_add_interface,
+	.remove_interface	= zd_op_remove_interface,
+	.config			= zd_op_config,
+	.config_interface	= zd_op_config_interface,
+	.set_multicast_list	= zd_op_set_multicast_list,
+	.erp_ie_changed		= zd_op_erp_ie_changed,
+};
+
+struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
+{
+	struct zd_mac *mac;
+	struct ieee80211_hw *hw;
+	int i;
+
+	hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops);
+	if (!hw) {
+		dev_dbg_f(&intf->dev, "out of memory\n");
+		return NULL;
+	}
+
+	mac = zd_hw_mac(hw);
+
+	memset(mac, 0, sizeof(*mac));
+	spin_lock_init(&mac->lock);
+	mac->hw = hw;
+
+	mac->type = IEEE80211_IF_TYPE_MGMT;
+	mac->hwaddr = hw->wiphy->perm_addr;
+
+	memcpy(mac->channels, zd_channels, sizeof(zd_channels));
+	memcpy(mac->rates, zd_rates, sizeof(zd_rates));
+	mac->modes[0].mode = MODE_IEEE80211G;
+	mac->modes[0].num_rates = ARRAY_SIZE(zd_rates);
+	mac->modes[0].rates = mac->rates;
+	mac->modes[0].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[0].channels = mac->channels;
+	mac->modes[1].mode = MODE_IEEE80211B;
+	mac->modes[1].num_rates = 4;
+	mac->modes[1].rates = mac->rates;
+	mac->modes[1].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[1].channels = mac->channels;
+
+	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+		     IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
+	hw->max_rssi = 100;
+	hw->max_signal = 100;
+
+	hw->queues = 1;
+	hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
+
+	skb_queue_head_init(&mac->ack_wait_queue);
+
+	for (i = 0; i < 2; i++) {
+		if (ieee80211_register_hwmode(hw, &mac->modes[i])) {
+			dev_dbg_f(&intf->dev, "cannot register hwmode\n");
+			ieee80211_free_hw(hw);
+			return NULL;
+		}
+	}
+
+	zd_chip_init(&mac->chip, hw, intf);
+	housekeeping_init(mac);
+	INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
+	INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
+
+	SET_IEEE80211_DEV(hw, &intf->dev);
+	return hw;
+}
+
+#define LINK_LED_WORK_DELAY HZ
+
+static void link_led_handler(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, housekeeping.link_led_work.work);
+	struct zd_chip *chip = &mac->chip;
+	int is_associated;
+	int r;
+
+	spin_lock_irq(&mac->lock);
+	is_associated = mac->associated;
+	spin_unlock_irq(&mac->lock);
+
+	r = zd_chip_control_leds(chip,
+		                 is_associated ? LED_ASSOCIATED : LED_SCANNING);
+	if (r)
+		dev_err(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r);
+
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+		           LINK_LED_WORK_DELAY);
+}
+
+static void housekeeping_init(struct zd_mac *mac)
+{
+	INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler);
+}
+
+static void housekeeping_enable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+			   0);
+}
+
+static void housekeeping_disable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	cancel_rearming_delayed_workqueue(zd_workqueue,
+		&mac->housekeeping.link_led_work);
+	zd_chip_control_leds(&mac->chip, LED_OFF);
+}
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 20:00:12.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 20:04:18.000000000 -0400
@@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 
 endmenu


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- kernel.spec	26 Sep 2007 22:38:30 -0000	1.191
+++ kernel.spec	27 Sep 2007 00:43:33 -0000	1.192
@@ -631,7 +631,10 @@
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch681: linux-2.6-wireless-pending.patch
-Patch690: git-wireless-dev.patch
+Patch690: linux-2.6-at76.patch
+Patch691: linux-2.6-ath5k.patch
+Patch692: linux-2.6-zd1211rw-mac80211.patch
+Patch693: linux-2.6-mac80211-extras.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1140,8 +1143,11 @@
 # wireless patches headed for 2.6.23
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
-# Add the wireless stack updates and drivers from wireless-dev
-ApplyPatch git-wireless-dev.patch
+# Add misc wireless bits from upstream wireless tree
+ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-ath5k.patch
+ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+ApplyPatch linux-2.6-mac80211-extras.patch
 
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1809,6 +1815,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 John W. Linville <linville at redhat.com>
+- Update and restructure wireless patches
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 e820 bugfix
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-wireless-pending.patch	18 Sep 2007 14:01:35 -0000	1.4
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 00:43:34 -0000	1.5
@@ -1,6 +1,1753 @@
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-26 19:41:26.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-26 19:49:37.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
+ S: (ask for current address)
+ S: USA
+ 
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
++
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+ 
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
++
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -833,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+ 
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
++
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3517,6 +3533,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+ 
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
++
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3651,6 +3673,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+ 
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
++
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-26 19:49:38.000000000 -0400
+@@ -7,7 +7,97 @@
+  */
+ 
+ /**
++ * enum nl80211_commands - supported nl80211 commands
++ *
++ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
++ *
++ * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
++ *	to get a list of all present wiphys.
++ * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
++ *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
++ *
++ * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
++ *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
++ *	on an %NL80211_ATTR_IFINDEX is supported.
++ * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
++ 	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
++ * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
++ *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
++ *	be sent from userspace to request creation of a new virtual interface,
++ *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
++ *	%NL80211_ATTR_IFNAME.
++ * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
++ *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
++ *	userspace to request deletion of a virtual interface, then requires
++ *	attribute %NL80211_ATTR_IFINDEX.
++ *
++ * @NL80211_CMD_MAX: highest used command number
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++enum nl80211_commands {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_CMD_UNSPEC,
++
++	NL80211_CMD_GET_WIPHY,		/* can dump */
++	NL80211_CMD_SET_WIPHY,
++	NL80211_CMD_NEW_WIPHY,
++	NL80211_CMD_DEL_WIPHY,
++
++	NL80211_CMD_GET_INTERFACE,	/* can dump */
++	NL80211_CMD_SET_INTERFACE,
++	NL80211_CMD_NEW_INTERFACE,
++	NL80211_CMD_DEL_INTERFACE,
++
++	/* add commands here */
++
++	/* used to define NL80211_CMD_MAX below */
++	__NL80211_CMD_AFTER_LAST,
++	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
++};
++
++
++/**
++ * enum nl80211_attrs - nl80211 netlink attributes
++ *
++ * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
++ *
++ * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
++ *	/sys/class/ieee80211/<phyname>/index
++ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
++ *
++ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
++ * @NL80211_ATTR_IFNAME: network interface name
++ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
++ *
++ * @NL80211_ATTR_MAX: highest attribute number currently defined
++ * @__NL80211_ATTR_AFTER_LAST: internal use
++ */
++enum nl80211_attrs {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_ATTR_UNSPEC,
++
++	NL80211_ATTR_WIPHY,
++	NL80211_ATTR_WIPHY_NAME,
++
++	NL80211_ATTR_IFINDEX,
++	NL80211_ATTR_IFNAME,
++	NL80211_ATTR_IFTYPE,
++
++	/* add attributes here, update the policy in nl80211.c */
++
++	__NL80211_ATTR_AFTER_LAST,
++	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
++};
++
++/**
+  * enum nl80211_iftype - (virtual) interface types
++ *
+  * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
+  * @NL80211_IFTYPE_ADHOC: independent BSS member
+  * @NL80211_IFTYPE_STATION: managed BSS member
+@@ -15,9 +105,10 @@
+  * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
+  * @NL80211_IFTYPE_WDS: wireless distribution interface
+  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
++ * @NL80211_IFTYPE_MAX: highest interface type number currently defined
+  * @__NL80211_IFTYPE_AFTER_LAST: internal use
+  *
+- * These values are used with the NL80211_ATTR_IFTYPE
++ * These values are used with the %NL80211_ATTR_IFTYPE
+  * to set the type of an interface.
+  *
+  */
+@@ -31,8 +122,8 @@ enum nl80211_iftype {
+ 	NL80211_IFTYPE_MONITOR,
+ 
+ 	/* keep last */
+-	__NL80211_IFTYPE_AFTER_LAST
++	__NL80211_IFTYPE_AFTER_LAST,
++	NL80211_IFTYPE_MAX = __NL80211_IFTYPE_AFTER_LAST - 1
+ };
+-#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
[...131489 lines suppressed...]
++		return 0;
++
++	return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++}
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++
++
++/**************************************************
++ * Generic and Clientmode operation code.
++ **************************************************/
++
++static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
++{
++	/* Disable PCI interrupts. */
++	ssb_write32(pc->dev, SSB_INTVEC, 0);
++}
++
++void ssb_pcicore_init(struct ssb_pcicore *pc)
++{
++	struct ssb_device *dev = pc->dev;
++	struct ssb_bus *bus;
++
++	if (!dev)
++		return;
++	bus = dev->bus;
++	if (!ssb_device_is_enabled(dev))
++		ssb_device_enable(dev, 0);
++
++#ifdef CONFIG_SSB_PCICORE_HOSTMODE
++	pc->hostmode = pcicore_is_in_hostmode(pc);
++	if (pc->hostmode)
++		ssb_pcicore_init_hostmode(pc);
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++	if (!pc->hostmode)
++		ssb_pcicore_init_clientmode(pc);
++}
++
++static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address)
++{
++	pcicore_write32(pc, 0x130, address);
++	return pcicore_read32(pc, 0x134);
++}
++
++static void ssb_pcie_write(struct ssb_pcicore *pc, u32 address, u32 data)
++{
++	pcicore_write32(pc, 0x130, address);
++	pcicore_write32(pc, 0x134, data);
++}
++
++static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
++				u8 address, u16 data)
++{
++	const u16 mdio_control = 0x128;
++	const u16 mdio_data = 0x12C;
++	u32 v;
++	int i;
++
++	v = 0x80; /* Enable Preamble Sequence */
++	v |= 0x2; /* MDIO Clock Divisor */
++	pcicore_write32(pc, mdio_control, v);
++
++	v = (1 << 30); /* Start of Transaction */
++	v |= (1 << 28); /* Write Transaction */
++	v |= (1 << 17); /* Turnaround */
++	v |= (u32)device << 22;
++	v |= (u32)address << 18;
++	v |= data;
++	pcicore_write32(pc, mdio_data, v);
++	/* Wait for the device to complete the transaction */
++	udelay(10);
++	for (i = 0; i < 10; i++) {
++		v = pcicore_read32(pc, mdio_control);
++		if (v & 0x100 /* Trans complete */)
++			break;
++		msleep(1);
++	}
++	pcicore_write32(pc, mdio_control, 0);
++}
++
++static void ssb_broadcast_value(struct ssb_device *dev,
++				u32 address, u32 data)
++{
++	/* This is used for both, PCI and ChipCommon core, so be careful. */
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
++
++	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
++	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
++	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
++	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
++}
++
++static void ssb_commit_settings(struct ssb_bus *bus)
++{
++	struct ssb_device *dev;
++
++	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
++	if (WARN_ON(!dev))
++		return;
++	/* This forces an update of the cached registers. */
++	ssb_broadcast_value(dev, 0xFD8, 0);
++}
++
++int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
++				   struct ssb_device *dev)
++{
++	struct ssb_device *pdev = pc->dev;
++	struct ssb_bus *bus;
++	int err = 0;
++	u32 tmp;
++
++	might_sleep();
++
++	if (!pdev)
++		goto out;
++	bus = pdev->bus;
++
++	/* Enable interrupts for this device. */
++	if (bus->host_pci &&
++	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++		u32 coremask;
++
++		/* Calculate the "coremask" for the device. */
++		coremask = (1 << dev->core_index);
++
++		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
++		if (err)
++			goto out;
++		tmp |= coremask << 8;
++		err = pci_write_config_dword(bus->host_pci, SSB_PCI_IRQMASK, tmp);
++		if (err)
++			goto out;
++	} else {
++		u32 intvec;
++
++		intvec = ssb_read32(pdev, SSB_INTVEC);
++		if ((bus->chip_id & 0xFF00) == 0x4400) {
++			/* Workaround: On the BCM44XX the BPFLAG routing
++			 * bit is wrong. Use a hardcoded constant. */
++			intvec |= 0x00000002;
++		} else {
++			tmp = ssb_read32(dev, SSB_TPSFLAG);
++			tmp &= SSB_TPSFLAG_BPFLAG;
++			intvec |= tmp;
++		}
++		ssb_write32(pdev, SSB_INTVEC, intvec);
++	}
++
++	/* Setup PCIcore operation. */
++	if (pc->setup_done)
++		goto out;
++	if (pdev->id.coreid == SSB_DEV_PCI) {
++		tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++		tmp |= SSB_PCICORE_SBTOPCI_PREF;
++		tmp |= SSB_PCICORE_SBTOPCI_BURST;
++		pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++
++		if (pdev->id.revision < 5) {
++			tmp = ssb_read32(pdev, SSB_IMCFGLO);
++			tmp &= ~SSB_IMCFGLO_SERTO;
++			tmp |= 2;
++			tmp &= ~SSB_IMCFGLO_REQTO;
++			tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
++			ssb_write32(pdev, SSB_IMCFGLO, tmp);
++			ssb_commit_settings(bus);
++		} else if (pdev->id.revision >= 11) {
++			tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++			tmp |= SSB_PCICORE_SBTOPCI_MRM;
++			pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++		}
++	} else {
++		WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
++		//TODO: Better make defines for all these magic PCIE values.
++		if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
++			/* TLP Workaround register. */
++			tmp = ssb_pcie_read(pc, 0x4);
++			tmp |= 0x8;
++			ssb_pcie_write(pc, 0x4, tmp);
++		}
++		if (pdev->id.revision == 0) {
++			const u8 serdes_rx_device = 0x1F;
++
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    2 /* Timer */, 0x8128);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    6 /* CDR */, 0x0100);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    7 /* CDR BW */, 0x1466);
++		} else if (pdev->id.revision == 1) {
++			/* DLLP Link Control register. */
++			tmp = ssb_pcie_read(pc, 0x100);
++			tmp |= 0x40;
++			ssb_pcie_write(pc, 0x100, tmp);
++		}
++	}
++	pc->setup_done = 1;
++out:
++	return err;
++}
++EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);


--- git-wireless-dev.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 00:46:41 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:46:41 -0400
Subject: rpms/bzr/F-7 .cvsignore, 1.15, 1.16 bzr.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <200709270046.l8R0kfKp009310@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9232

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 22:56:24 -0000	1.15
+++ .cvsignore	27 Sep 2007 00:46:08 -0000	1.16
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/bzr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bzr.spec	30 Aug 2007 22:56:24 -0000	1.20
+++ bzr.spec	27 Sep 2007 00:46:08 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Aug 2007 22:56:24 -0000	1.15
+++ sources	27 Sep 2007 00:46:08 -0000	1.16
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:46:54 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:46:54 -0400
Subject: rpms/bzrtools/F-7 .cvsignore, 1.12, 1.13 bzrtools.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200709270046.l8R0ks28009353@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Jul 2007 22:33:03 -0000	1.12
+++ .cvsignore	27 Sep 2007 00:46:21 -0000	1.13
@@ -1 +1 @@
-bzrtools-0.18.0.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/bzrtools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzrtools.spec	25 Jul 2007 22:33:03 -0000	1.19
+++ bzrtools.spec	27 Sep 2007 00:46:21 -0000	1.20
@@ -1,7 +1,12 @@
 %{!?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 bzrver 0.18
-%define bzrnextver 0.19
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -9,12 +14,11 @@
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
 Source0:        http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
 # Bzrtools is meant to work with a version of bzr that is the same major
 # version.  In addition to being incompatible with older bzr versions, it is 
@@ -45,9 +49,14 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins
+fi
+
 # remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
+sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,13 +65,26 @@
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
-%dir %{python_sitelib}/bzrlib/plugins/bzrtools
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
-%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
+%dir %{python_sitearch}/bzrlib/plugins/bzrtools
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyc
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move plugin manually since setuptools has no way of knowing that bzr is
+  arch specific.
+- Disable debuginfo packages.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Fix License tag to conform to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
 * Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
 - Update to 0.18.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 Jul 2007 22:33:03 -0000	1.12
+++ sources	27 Sep 2007 00:46:21 -0000	1.13
@@ -1 +1 @@
-557bfa1aeb3f0090fdac1651f5271bce  bzrtools-0.18.0.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:47:08 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:47:08 -0400
Subject: rpms/bzr-gtk/F-7 .cvsignore, 1.8, 1.9 bzr-gtk.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709270047.l8R0l8DS009363@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9284

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
- Olive must be moved to an arch specific directory as well for now.
  If rpm could have noarch subpackages, this would be fine to leave in
  python_sitelib.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jul 2007 22:22:37 -0000	1.8
+++ .cvsignore	27 Sep 2007 00:46:36 -0000	1.9
@@ -1 +1 @@
-bzr-gtk-0.18.0.tar.gz
+bzr-gtk-0.91.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/bzr-gtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr-gtk.spec	25 Jul 2007 22:22:37 -0000	1.9
+++ bzr-gtk.spec	27 Sep 2007 00:46:36 -0000	1.10
@@ -1,26 +1,31 @@
 %{!?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)")}
+
+
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.18.0
-Release:        1%{?dist}
+Version:        0.91.0
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
-Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0:        https://launchpad.net/bzr-gtk/0.91/%{version}/+download/bzr-gtk-%{version}.tar.gz
 # We can't use the notifier functionality without a bzr-dbus-package.
 Patch0:         bzr-gtk-disable-notifier.patch
 # Fix some bugs in the nautilus integration.  Submitted upstream
 Patch1:         bzr-gtk-nautilus.patch
-Patch2:		bzr-gtk-nautilus-protocol.patch
+Patch2:         bzr-gtk-nautilus-protocol.patch
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
 Patch3:         bzr-gtk-disable-nautilus-pull.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  bzr
 BuildRequires:  gettext
@@ -66,9 +71,21 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+    mv $RPM_BUILD_ROOT%{python_sitelib}/olive $RPM_BUILD_ROOT%{python_sitearch}
+fi
+
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
-mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
+mv $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
+
+# No translations yet
+#%find_lang olive
+
+# This won't do anything until after we add bzr-dbus.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,20 +94,39 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{python_sitelib}/bzrlib/plugins/gtk/
+%{python_sitearch}/bzrlib/plugins/gtk/
+%{_datadir}/applications/bazaar-properties.desktop
 
+#%files -n olive -f olive.lang
 %files -n olive
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{python_sitelib}/olive
+%{python_sitearch}/olive/
 %{_datadir}/olive/
 %{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/olive-gtk.desktop
 
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
+- Olive must be moved to an arch specific directory as well for now.
+  If rpm could have noarch subpackages, this would be fine to leave in
+  python_sitelib.
+
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move the plugins manually as distutils doesn't know that bzr is arch
+  specific.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Update license tag to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
 * Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
 - Update to 0.18.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jul 2007 22:22:37 -0000	1.8
+++ sources	27 Sep 2007 00:46:36 -0000	1.9
@@ -1 +1 @@
-4be297c58fc6aeb79e660d77770f24fd  bzr-gtk-0.18.0.tar.gz
+3b5d9c517494988a83d7ccaae8a18e2f  bzr-gtk-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 01:06:42 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:06:42 -0400
Subject: rpms/php-channel-phing/devel channel.xml, NONE,
	1.1 php-channel-phing.spec, NONE, 1.1
Message-ID: <200709270106.l8R16gKe015911@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15902/devel

Added Files:
	channel.xml php-channel-phing.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phing.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phing
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phing channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://phing.info/
Source0:	http://pear.phing.info/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phing.info)

%description
This package adds the phing channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phing.info.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phing.info.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phing.info.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phing.info > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable
- added post/postun requires for pear
- removed redundant version number requirement for php-cli

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:08:27 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:08:27 -0400
Subject: rpms/php-channel-phing/F-7 channel.xml, NONE,
	1.1 php-channel-phing.spec, NONE, 1.1
Message-ID: <200709270108.l8R18Rq8016030@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phing/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16023/F-7

Added Files:
	channel.xml php-channel-phing.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phing.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phing
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phing channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://phing.info/
Source0:	http://pear.phing.info/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phing.info)

%description
This package adds the phing channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phing.info.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phing.info.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phing.info.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phing.info > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable
- added post/postun requires for pear
- removed redundant version number requirement for php-cli

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:28:29 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:28:29 -0400
Subject: rpms/php-channel-phpdb/devel channel.xml, NONE,
	1.1 php-channel-phpdb.spec, NONE, 1.1
Message-ID: <200709270128.l8R1ST5a016679@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16672/devel

Added Files:
	channel.xml php-channel-phpdb.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phpdb.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phpdb
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phpdb channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://pear.phpdb.org/
Source0:	http://pear.phpdb.org/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli 
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phpdb.org)

%description
This package adds the phpdb channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpdb.org.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phpdb.org.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phpdb.org.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phpdb.org > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:29:42 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:29:42 -0400
Subject: rpms/php-channel-phpdb/F-7 channel.xml, NONE,
	1.1 php-channel-phpdb.spec, NONE, 1.1
Message-ID: <200709270129.l8R1TgR1016774@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phpdb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16760/F-7

Added Files:
	channel.xml php-channel-phpdb.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phpdb.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phpdb
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phpdb channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://pear.phpdb.org/
Source0:	http://pear.phpdb.org/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli 
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phpdb.org)

%description
This package adds the phpdb channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpdb.org.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phpdb.org.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phpdb.org.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phpdb.org > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:35:18 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Wed, 26 Sep 2007 21:35:18 -0400
Subject: rpms/git/devel .cvsignore, 1.44, 1.45 git.spec, 1.39, 1.40 sources, 
	1.44, 1.45
Message-ID: <200709270135.l8R1ZIQe016906@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16884

Modified Files:
	.cvsignore git.spec sources 
Log Message:
git-1.5.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Sep 2007 15:48:06 -0000	1.44
+++ .cvsignore	27 Sep 2007 01:34:46 -0000	1.45
@@ -1 +1 @@
-git-1.5.3.1.tar.gz
+git-1.5.3.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- git.spec	6 Sep 2007 17:35:42 -0000	1.39
+++ git.spec	27 Sep 2007 01:34:46 -0000	1.40
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.3.1
-Release: 	2%{?dist}
+Version: 	1.5.3.2
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Wed Sep 26 2007 James Bowes <jbowes at redhat.com> 1.5.3.2-1
+- git-1.5.3.2
+
 * Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
 - Include git-gui and git-citool docs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Sep 2007 15:48:06 -0000	1.44
+++ sources	27 Sep 2007 01:34:46 -0000	1.45
@@ -1 +1 @@
-afef243b2d271004d13b0381ac2ee580  git-1.5.3.1.tar.gz
+9930f19e22c121b8a803337cbda1e661  git-1.5.3.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 03:05:00 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:05:00 -0400
Subject: rpms/kvm/devel kvm-rtl8139-checksum.patch, NONE, 1.1 kvm.spec, 1.26,
	1.27
Message-ID: <200709270305.l8R350bw000771@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv740

Modified Files:
	kvm.spec 
Added Files:
	kvm-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

kvm-rtl8139-checksum.patch:

--- NEW FILE kvm-rtl8139-checksum.patch ---
diff -rup kvm-35.orig/qemu/hw/rtl8139.c kvm-35.new/qemu/hw/rtl8139.c
--- kvm-35.orig/qemu/hw/rtl8139.c	2007-09-26 19:49:44.000000000 -0400
+++ kvm-35.new/qemu/hw/rtl8139.c	2007-09-26 19:50:08.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kvm.spec	24 Sep 2007 18:21:27 -0000	1.26
+++ kvm.spec	27 Sep 2007 03:04:28 -0000	1.27
@@ -1,8 +1,8 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 5%{?dist}
-License: GPLv2 and LGPLv2
+Release: 6%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
 Patch103: qemu-0.9.0-vnc-authentication.patch
+Patch104: kvm-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # to build the bios
@@ -48,6 +49,7 @@
 %patch101 -p1
 %patch102 -p0
 %patch103 -p1 -b .vnc
+%patch104 -p1
 
 %build
 LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -95,6 +97,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 36-6.fc8
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
 - fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:06:04 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:06:04 -0400
Subject: rpms/kvm/F-7 kvm-rtl8139-checksum.patch, NONE, 1.1 kvm.spec, 1.14, 
	1.15 qemu-0.9.0-load-initrd.patch, 1.1, NONE
Message-ID: <200709270306.l8R364YW000855@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/kvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv815

Modified Files:
	kvm.spec 
Added Files:
	kvm-rtl8139-checksum.patch 
Removed Files:
	qemu-0.9.0-load-initrd.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

kvm-rtl8139-checksum.patch:

--- NEW FILE kvm-rtl8139-checksum.patch ---
diff -rup kvm-35.orig/qemu/hw/rtl8139.c kvm-35.new/qemu/hw/rtl8139.c
--- kvm-35.orig/qemu/hw/rtl8139.c	2007-09-26 19:49:44.000000000 -0400
+++ kvm-35.new/qemu/hw/rtl8139.c	2007-09-26 19:50:08.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-7/kvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kvm.spec	21 Aug 2007 17:23:49 -0000	1.14
+++ kvm.spec	27 Sep 2007 03:05:30 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 35
-Release: 2%{?dist}
-License: GPLv2 and LGPLv2
+Release: 3%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
@@ -12,6 +12,7 @@
 # patches from upstream qemu
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
+Patch103: kvm-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -39,6 +40,7 @@
 
 %patch101 -p1
 %patch102 -p0
+%patch103 -p1
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -83,6 +85,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 35-3.fc7
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Mon Aug 20 2007 Jeremy Katz <katzj at redhat.com> - 35-2
 - add fix for ATAPI from upstream qemu
 


--- qemu-0.9.0-load-initrd.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 03:26:16 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Wed, 26 Sep 2007 23:26:16 -0400
Subject: rpms/thinkfinger/F-7 thinkfinger-0.3-hal.patch, 1.1,
	1.2 thinkfinger.spec, 1.3, 1.4
Message-ID: <200709270326.l8R3QGJM001463@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1438

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Log Message:
put fdi file in policy/ directory

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/F-7/thinkfinger-0.3-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkfinger-0.3-hal.patch	22 Sep 2007 11:18:49 -0000	1.1
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 03:26:13 -0000	1.2
@@ -1,5 +1,5 @@
---- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
-+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
+--- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
++++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
@@ -25,11 +25,11 @@
  consoleperms_DATA = 60-thinkfinger.perms
  endif
 + 
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
  
 -EXTRA_DIST = 60-thinkfinger.perms
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
 --- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
 +++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
 @@ -49,9 +49,11 @@
@@ -51,9 +51,9 @@
  @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
  @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 -EXTRA_DIST = 60-thinkfinger.perms
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
  all: all-am
  
  .SUFFIXES:


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/F-7/thinkfinger.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thinkfinger.spec	22 Sep 2007 11:18:49 -0000	1.3
+++ thinkfinger.spec	27 Sep 2007 03:26:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -115,7 +115,7 @@
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
-%{_datadir}/hal/fdi/information/20thirdparty/*
+%{_datadir}/hal/fdi/policy/10osvendor/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
+- put fdi file in policy/ directory
+
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:26:51 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:26:51 -0400
Subject: rpms/qemu/devel qemu-0.9.0-rtl8139-checksum.patch, NONE,
	1.1 qemu.spec, 1.28, 1.29
Message-ID: <200709270326.l8R3QpIg001535@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1467

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.0-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

qemu-0.9.0-rtl8139-checksum.patch:

--- NEW FILE qemu-0.9.0-rtl8139-checksum.patch ---
Index: hw/rtl8139.c
===================================================================
RCS file: /sources/qemu/qemu/hw/rtl8139.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hw/rtl8139.c	11 Jul 2007 22:48:58 -0000	1.10
+++ hw/rtl8139.c	1 Aug 2007 13:10:29 -0000	1.11
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -747,7 +746,7 @@
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1023,7 +1022,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1129,7 +1128,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qemu.spec	28 Aug 2007 17:45:53 -0000	1.28
+++ qemu.spec	27 Sep 2007 03:26:18 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -23,7 +23,10 @@
 Patch4: qemu-0.9.0-vnc-authentication.patch
 # Fix RTL8139 MMIO regions. Remove at next upgrade
 Patch5: qemu-0.9.0-rtl8139-mmio-regions.patch
+# Fix Atapi errors with latest kernel
 Patch6: qemu-0.9.0-atapi-hsm.patch
+# Fix RTL8139 checksum calculations for Vista
+Patch7: qemu-0.9.0-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
@@ -53,6 +56,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 %build
 ./configure \
@@ -104,6 +108,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-5.fc8
+- Fix rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Tue Aug 28 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-4.fc8
 - Fix debuginfo by passing -Wl,--build-id to linker
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:27:49 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:27:49 -0400
Subject: rpms/qemu/F-7 qemu-0.9.0-atapi-hsm.patch, NONE,
	1.1 qemu-0.9.0-rtl8139-checksum.patch, NONE,
	1.1 qemu-0.9.0-rtl8139-mmio-regions.patch, NONE, 1.1 qemu.spec,
	1.25, 1.26
Message-ID: <200709270327.l8R3RnJA001617@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/qemu/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.0-atapi-hsm.patch qemu-0.9.0-rtl8139-checksum.patch 
	qemu-0.9.0-rtl8139-mmio-regions.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
Fixed rtl8139 mmio region mappings
Fix ATAPI CDROM emulation  (rhbz #253542)

qemu-0.9.0-atapi-hsm.patch:

--- NEW FILE qemu-0.9.0-atapi-hsm.patch ---
From: Brandon Philips <brandon at ifup.org>
Newsgroups: gmane.comp.emulators.qemu
Subject: [PATCH][RFC] Fix bugs in the ATAPI cdrom driver
Date: Fri, 17 Aug 2007 16:43:04 -0700
Message-ID: <20070817234304.GB10490 at ifup.org>
Reply-To: qemu-devel at nongnu.org

The new libata-eh in the Linux kernel is throwing a fit over the QEMU
cdrom device for two reasons:

1) DRQ can be set with ERR_STAT set.  This is a violation of the ATAPI
state machine.

2) After a TEST_UNIT_READY ATAPI command is sent ERR_STAT is getting set
which is correct.  But, when the OS issues another ATAPI command
ERR_STAT is still set.  Which is bad since the next expected command
from the OS is REQUEST_SENSE to find out why ERR_STAT is set.

bug this fixes: https://bugzilla.novell.com/show_bug.cgi?id=291775

Signed-off-by: Brandon Philips <bphilips at suse.de>

---
 hw/ide.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: qemu-0.9.0/hw/ide.c
===================================================================
--- qemu-0.9.0.orig/hw/ide.c
+++ qemu-0.9.0/hw/ide.c
@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
     s->end_transfer_func = end_transfer_func;
     s->data_ptr = buf;
     s->data_end = buf + size;
-    s->status |= DRQ_STAT;
+    /* don't violate the HSM */
+    if (!(s->status & ERR_STAT))
+        s->status |= DRQ_STAT;
 }
 
 static void ide_transfer_stop(IDEState *s)
@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
             /* overlapping commands not supported */
             if (s->feature & 0x02)
                 goto abort_cmd;
+            s->status = READY_STAT;
             s->atapi_dma = s->feature & 1;
             s->nsector = 1;
             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 




qemu-0.9.0-rtl8139-checksum.patch:

--- NEW FILE qemu-0.9.0-rtl8139-checksum.patch ---
Index: hw/rtl8139.c
===================================================================
RCS file: /sources/qemu/qemu/hw/rtl8139.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hw/rtl8139.c	11 Jul 2007 22:48:58 -0000	1.10
+++ hw/rtl8139.c	1 Aug 2007 13:10:29 -0000	1.11
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -747,7 +746,7 @@
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1023,7 +1022,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1129,7 +1128,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif

qemu-0.9.0-rtl8139-mmio-regions.patch:

--- NEW FILE qemu-0.9.0-rtl8139-mmio-regions.patch ---
diff -rup qemu-0.9.0.orig/hw/rtl8139.c qemu-0.9.0.new/hw/rtl8139.c
--- qemu-0.9.0.orig/hw/rtl8139.c	2007-02-05 18:01:54.000000000 -0500
+++ qemu-0.9.0.new/hw/rtl8139.c	2007-08-28 11:37:29.000000000 -0400
@@ -3325,7 +3325,7 @@ static void rtl8139_mmio_map(PCIDevice *
     PCIRTL8139State *d = (PCIRTL8139State *)pci_dev;
     RTL8139State *s = &d->rtl8139;
 
-    cpu_register_physical_memory(addr + 0, 0x100, s->rtl8139_mmio_io_addr);
+    cpu_register_physical_memory(addr + 0, 0x1000, s->rtl8139_mmio_io_addr);
 }
 
 static void rtl8139_ioport_map(PCIDevice *pci_dev, int region_num, 
@@ -3438,10 +3438,10 @@ void pci_rtl8139_init(PCIBus *bus, NICIn
     s->rtl8139_mmio_io_addr =
     cpu_register_io_memory(0, rtl8139_mmio_read, rtl8139_mmio_write, s);
 
-    pci_register_io_region(&d->dev, 0, 0x100, 
+    pci_register_io_region(&d->dev, 0, 0x1000, 
                            PCI_ADDRESS_SPACE_IO,  rtl8139_ioport_map);
 
-    pci_register_io_region(&d->dev, 1, 0x100, 
+    pci_register_io_region(&d->dev, 1, 0x1000, 
                            PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
 
     s->irq = 16; /* PCI interrupt */


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/F-7/qemu.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qemu.spec	1 Apr 2007 19:05:10 -0000	1.25
+++ qemu.spec	27 Sep 2007 03:27:17 -0000	1.26
@@ -8,8 +8,8 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.0
-Release: 2%{?dist}
-License: GPL/LGPL
+Release: 3%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
@@ -17,6 +17,12 @@
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
 Patch2: qemu-0.9.0-load-initrd.patch
+# Fix RTL8139 MMIO regions. Remove at next upgrade
+Patch5: qemu-0.9.0-rtl8139-mmio-regions.patch
+# Fix Atapi errors with latest kernel
+Patch6: qemu-0.9.0-atapi-hsm.patch
+# Fix RTL8139 checksum calculations for Vista
+Patch7: qemu-0.9.0-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html
 Requires(post): /sbin/chkconfig
@@ -42,6 +48,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch5 -p1
+%patch6 -p1
+%patch7 -p0
 
 %build
 ./configure \
@@ -92,6 +101,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-3.fc7
+- Update licence
+- Fix CDROM emulation (rhbz #253542)
+- Fix rtl8139 mmio region mappings with multiple NICs
+- Fix rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Sun Apr  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Fix direct loading of a linux kernel with -kernel & -initrd (bz 234681)
 - Remove spurious execute bits from manpages (bz 222573)



From fedora-extras-commits at redhat.com  Thu Sep 27 03:29:14 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 23:29:14 -0400
Subject: rpms/eruby/devel eruby.spec,1.21,1.22
Message-ID: <200709270329.l8R3TEkM001762@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/eruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1678

Modified Files:
	eruby.spec 
Log Message:
* Tue Sep 25 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-10
- clean up the spec file.


Index: eruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eruby/devel/eruby.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- eruby.spec	23 Aug 2007 10:52:20 -0000	1.21
+++ eruby.spec	27 Sep 2007 03:28:42 -0000	1.22
@@ -1,13 +1,17 @@
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%define ruby_archdir %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
+
 Name:		eruby
 Version:	1.0.5
-Release:	9
+Release:	10
 # eruby is GPLv2+
 # liberuby is LGPLv2+
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.modruby.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildPrereq:	ruby
-BuildPreReq:	ruby-devel >= 1.8.0
+BuildRequires:	ruby
+BuildRequires:	ruby-devel >= 1.8.0
 
 Source0:	http://www.modruby.net/archive/%{name}-%{version}.tar.gz
 
@@ -23,92 +27,85 @@
 %package libs
 Summary:	Library for eRuby
 Group:		Development/Languages
-Requires:	ruby-libs >= 1.8.0
+Requires:	ruby(abi) = 1.8
+Provides:	ruby(eruby) = %{version}
 
 %description libs
 This package contains a library for eRuby.
 
 
 %package devel
-Summary:	Development files for eRuby.
+Summary:	Development files for eRuby
 Group:		Development/Languages
-Requires:	%{name}-libs = %{version}
+Requires:	ruby(eruby) = %{version}
 
 %description devel
 This package contains the header files and libraries for an application
 embedded eRuby.
 
 %prep
-
-%setup -q -c
+%setup -q
 
 %build
-pushd %{name}-%{version}
 ruby configure.rb --enable-shared
 make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%__mkdir_p $RPM_BUILD_ROOT%{_bindir}
-%__mkdir_p $RPM_BUILD_ROOT%{_libdir}
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}
-%__mkdir_p $RPM_BUILD_ROOT%{_includedir}
-%__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
 
 # installing binaries ...
-pushd %{name}-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-# change permissions
-chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
-
-# listing all files in ruby-all.files
-(find \
-	$RPM_BUILD_ROOT%{_bindir} \
-	$RPM_BUILD_ROOT%{_libdir} \
-	$RPM_BUILD_ROOT%{_mandir} \
-	$RPM_BUILD_ROOT%{_includedir} \
-	-type f -o -type l) |
-	sort | sed -e "s,^$RPM_BUILD_ROOT,," \
-		   -e "s,\(/man/man./.*\)$,\1*," > eruby-all.files
-
-# for eruby-libs
-egrep '\.so\..*$' eruby-all.files > eruby-libs.files
-egrep '%{_libdir}/ruby' eruby-all.files >> eruby-libs.files
 
-# for eruby-devel
-egrep '\.([ah]|so)$' eruby-all.files | grep -v %{_libdir}/ruby > eruby-devel.files
+# remove the unnecessary files
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
-# for eruby
-sort eruby-all.files eruby-libs.files eruby-devel.files | uniq -u > eruby.files
+# change permissions
+find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' | xargs chmod 0755
 
+# workaround for not working site-install properly
+mv $RPM_BUILD_ROOT%{ruby_archdir}/eruby.so $RPM_BUILD_ROOT%{ruby_sitearch}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-rm -f *.files
 
 %post -p /sbin/ldconfig libs
 
 %postun -p /sbin/ldconfig libs
 
-%files -f eruby.files
-%defattr (-, root, root)
-%doc %{name}-%{version}/README.*
-%doc %{name}-%{version}/ChangeLog
-%doc %{name}-%{version}/examples
-
-%files -f eruby-libs.files libs
-%defattr (-, root, root)
-
-%files -f eruby-devel.files devel
-%defattr (-, root, root)
+%files
+%defattr (-, root, root, -)
+%doc COPYING GPL README.en ChangeLog examples
+%lang(ja) %doc README.ja
+%{_bindir}/eruby
+%{_mandir}/man1/eruby.1*
+
+%files libs
+%defattr (-, root, root, -)
+%doc COPYING LGPL README.en
+%lang(ja) %doc README.ja
+%{_libdir}/liberuby.so.*
+%{ruby_sitearch}/eruby.so
+
+%files devel
+%defattr (-, root, root, -)
+%doc COPYING LGPL README.en
+%lang(ja) %doc README.ja
+%{_includedir}/eruby.h
+%{_libdir}/liberuby.so
 
 
 %changelog
+* Tue Sep 25 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-10
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-9
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:37:16 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Wed, 26 Sep 2007 23:37:16 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-hal.patch, 1.1,
	1.2 thinkfinger.spec, 1.4, 1.5
Message-ID: <200709270337.l8R3bGbM002045@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2012

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Log Message:
put fdi file in policy/ directory

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkfinger-0.3-hal.patch	22 Sep 2007 11:13:55 -0000	1.1
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
@@ -1,5 +1,5 @@
---- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
-+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
+--- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
++++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
@@ -25,11 +25,11 @@
  consoleperms_DATA = 60-thinkfinger.perms
  endif
 + 
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
  
 -EXTRA_DIST = 60-thinkfinger.perms
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
 --- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
 +++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
 @@ -49,9 +49,11 @@
@@ -51,9 +51,9 @@
  @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
  @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 -EXTRA_DIST = 60-thinkfinger.perms
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
  all: all-am
  
  .SUFFIXES:


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thinkfinger.spec	22 Sep 2007 11:13:55 -0000	1.4
+++ thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -115,7 +115,7 @@
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
-%{_datadir}/hal/fdi/information/20thirdparty/*
+%{_datadir}/hal/fdi/policy/10osvendor/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
+- put fdi file in policy/ directory
+
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:38:24 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:38:24 -0400
Subject: rpms/xen/F-7 xen-qemu-rtl8139-checksum.patch, NONE, 1.1 xen.spec,
	1.186, 1.187
Message-ID: <200709270338.l8R3cOTF002112@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2067

Modified Files:
	xen.spec 
Added Files:
	xen-qemu-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

xen-qemu-rtl8139-checksum.patch:

--- NEW FILE xen-qemu-rtl8139-checksum.patch ---
diff -rup xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c	2007-09-26 23:25:22.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- xen.spec	26 Sep 2007 16:38:46 -0000	1.186
+++ xen.spec	27 Sep 2007 03:37:52 -0000	1.187
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 6%{dist}
+Release: 7%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -27,6 +27,7 @@
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
 Patch34: xen-3.1.0-no-xenapi-docs.patch
+Patch35: xen-qemu-rtl8139-checksum.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -136,6 +137,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # config patches
 %patch100 -p1
@@ -289,6 +291,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc7
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-6.fc7
 - QEmu NE2000 overflow check - CVE-2007-1321
 - Pygrub guest escape - CVE-2007-4993



From fedora-extras-commits at redhat.com  Thu Sep 27 03:38:28 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:38:28 -0400
Subject: rpms/xen/devel xen-qemu-rtl8139-checksum.patch, NONE, 1.1 xen.spec, 
	1.191, 1.192
Message-ID: <200709270338.l8R3cSX3002115@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2091

Modified Files:
	xen.spec 
Added Files:
	xen-qemu-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

xen-qemu-rtl8139-checksum.patch:

--- NEW FILE xen-qemu-rtl8139-checksum.patch ---
diff -rup xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c	2007-09-26 23:25:22.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- xen.spec	26 Sep 2007 15:43:29 -0000	1.191
+++ xen.spec	27 Sep 2007 03:37:56 -0000	1.192
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -30,6 +30,7 @@
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
 Patch34: xen-3.1.0-no-xenapi-docs.patch
+Patch35: xen-qemu-rtl8139-checksum.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -138,6 +139,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # config patches
 %patch100 -p1
@@ -287,6 +289,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-11.fc8
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-10.fc8
 - QEmu NE2000 overflow check - CVE-2007-1321
 - Pygrub guest escape - CVE-2007-4993



From fedora-extras-commits at redhat.com  Thu Sep 27 03:59:07 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 26 Sep 2007 23:59:07 -0400
Subject: rpms/gpp/devel .cvsignore, 1.3, 1.4 gnome-photo-printer.desktop, 1.1,
	1.2 gpp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709270359.l8R3x7aH002818@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2783

Modified Files:
	.cvsignore gnome-photo-printer.desktop gpp.spec sources 
Log Message:
update to latest upstream, fix .desktop, close #242195 and #198150


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2006 15:49:49 -0000	1.3
+++ .cvsignore	27 Sep 2007 03:58:34 -0000	1.4
@@ -1 +1 @@
-gpp-0.6.6.tar.gz
+gpp-0.7.0.tar.gz


Index: gnome-photo-printer.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gnome-photo-printer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-photo-printer.desktop	10 Nov 2005 19:11:48 -0000	1.1
+++ gnome-photo-printer.desktop	27 Sep 2007 03:58:34 -0000	1.2
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Photo Printer
-#GenericName=Photo Printer
-Comment=Prints photos from GNOME
+Name=GNOME Photo Printer
+GenericName=Photo Printer
+Comment=Prints photographs to a printer
 Exec=gnome-photo-printer
 Icon=printer.png
 StartupNotify=true
 Terminal=false
 Type=Application
 Categories=Application;Graphics;
-Version=0.6.5
+Version=1.0


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
+++ gpp.spec	27 Sep 2007 03:58:34 -0000	1.6
@@ -2,15 +2,15 @@
 
 Summary:	GNOME Photo Printer
 Name:           gpp
-Version:	0.6.6
-Release:	3%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
 License:	GPL
 Group:		Applications/Publishing
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils
+BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils perl(XML::Parser) gettext
 
 %description
 Gnome Photo Printer is intended for printing photos in an easy way.
@@ -30,24 +30,30 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 cp %SOURCE1 ${RPM_BUILD_ROOT}
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}/%{longname}.desktop
+%find_lang %{longname}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%files
+%files -f %{longname}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README COPYRIGHT
 %{_bindir}/*
 %{_datadir}/%{longname}
-%{_datadir}/applications/fedora-%{longname}.desktop
+%{_datadir}/applications/%{longname}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{longname}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{longname}.svg
 
 
 %changelog
+* Wed Sep 26 2007 Matt Domsch <matt at domsch.com> 0.7.0-1
+- update to latest upstream, fixes #242195 and #198150
+- fix .desktop file Version 
+
 * Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jul 2006 15:49:49 -0000	1.3
+++ sources	27 Sep 2007 03:58:34 -0000	1.4
@@ -1 +1 @@
-82fbfc0da760c432697433f31b3a2b5d  gpp-0.6.6.tar.gz
+ff8fdd9a8f741b346a8d87045d1d02e3  gpp-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 04:10:08 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 00:10:08 -0400
Subject: rpms/gpp/F-7 .cvsignore, 1.3, 1.4 gnome-photo-printer.desktop, 1.1, 
	1.2 gpp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709270410.l8R4A8XU009105@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9078

Modified Files:
	.cvsignore gnome-photo-printer.desktop gpp.spec sources 
Log Message:
update to latest upstream, fix .desktop, close #242195 and #198150


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2006 15:49:49 -0000	1.3
+++ .cvsignore	27 Sep 2007 04:09:35 -0000	1.4
@@ -1 +1 @@
-gpp-0.6.6.tar.gz
+gpp-0.7.0.tar.gz


Index: gnome-photo-printer.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/gnome-photo-printer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-photo-printer.desktop	10 Nov 2005 19:11:48 -0000	1.1
+++ gnome-photo-printer.desktop	27 Sep 2007 04:09:35 -0000	1.2
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Photo Printer
-#GenericName=Photo Printer
-Comment=Prints photos from GNOME
+Name=GNOME Photo Printer
+GenericName=Photo Printer
+Comment=Prints photographs to a printer
 Exec=gnome-photo-printer
 Icon=printer.png
 StartupNotify=true
 Terminal=false
 Type=Application
 Categories=Application;Graphics;
-Version=0.6.5
+Version=1.0


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/gpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
+++ gpp.spec	27 Sep 2007 04:09:35 -0000	1.6
@@ -2,15 +2,15 @@
 
 Summary:	GNOME Photo Printer
 Name:           gpp
-Version:	0.6.6
-Release:	3%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
 License:	GPL
 Group:		Applications/Publishing
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils
+BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils perl(XML::Parser) gettext
 
 %description
 Gnome Photo Printer is intended for printing photos in an easy way.
@@ -30,24 +30,30 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 cp %SOURCE1 ${RPM_BUILD_ROOT}
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}/%{longname}.desktop
+%find_lang %{longname}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%files
+%files -f %{longname}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README COPYRIGHT
 %{_bindir}/*
 %{_datadir}/%{longname}
-%{_datadir}/applications/fedora-%{longname}.desktop
+%{_datadir}/applications/%{longname}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{longname}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{longname}.svg
 
 
 %changelog
+* Wed Sep 26 2007 Matt Domsch <matt at domsch.com> 0.7.0-1
+- update to latest upstream, fixes #242195 and #198150
+- fix .desktop file Version 
+
 * Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jul 2006 15:49:49 -0000	1.3
+++ sources	27 Sep 2007 04:09:35 -0000	1.4
@@ -1 +1 @@
-82fbfc0da760c432697433f31b3a2b5d  gpp-0.6.6.tar.gz
+ff8fdd9a8f741b346a8d87045d1d02e3  gpp-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 04:55:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 27 Sep 2007 00:55:20 -0400
Subject: rpms/gnome-applets/devel mixer-preferences-leak.patch, NONE,
	1.1 gnome-applets.spec, 1.245, 1.246
Message-ID: <200709270455.l8R4tKWo010370@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10346

Modified Files:
	gnome-applets.spec 
Added Files:
	mixer-preferences-leak.patch 
Log Message:
Fix a memory leak


mixer-preferences-leak.patch:

--- NEW FILE mixer-preferences-leak.patch ---
diff -up gnome-applets-2.20.0/mixer/preferences.c.leak gnome-applets-2.20.0/mixer/preferences.c
--- gnome-applets-2.20.0/mixer/preferences.c.leak	2007-09-27 00:49:39.000000000 -0400
+++ gnome-applets-2.20.0/mixer/preferences.c	2007-09-27 00:50:50.000000000 -0400
@@ -445,6 +445,8 @@ cb_track_select (GtkTreeSelection *selec
 	}
       }
     }
+    g_list_foreach (lst, (GFunc)gtk_tree_path_free, NULL);
+    g_list_free (lst);
   }
 
   /* add the one just selected and adjust its volume if it's not the only one


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gnome-applets.spec	25 Sep 2007 11:46:16 -0000	1.245
+++ gnome-applets.spec	27 Sep 2007 04:54:44 -0000	1.246
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -70,6 +70,9 @@
 
 Patch34:        ppp-includes.patch
 
+# fixed in upstream svn
+Patch38:	mixer-preferences-leak.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -171,6 +174,7 @@
 %patch35 -p0 -b .mixer-sync
 popd
 %patch36 -p1 -b .gweather-pc
+%patch38 -p1 -b .mixer-preferences-leak
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -357,6 +361,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Thu Sep 27 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-6
+- Fix a memory leak in the mixer preferences
+
 * Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
 - Fix possible crasher in the mixer messages when we receive an
   unhandled message (#302881)



From fedora-extras-commits at redhat.com  Thu Sep 27 05:54:06 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Thu, 27 Sep 2007 01:54:06 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-policykit.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, 1.2, 1.3 thinkfinger.spec, 1.5, 1.6
Message-ID: <200709270554.l8R5s6cs019816@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19787

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Added Files:
	thinkfinger-0.3-policykit.patch 
Log Message:
use PolicyKit to manage fingerprint reader access

thinkfinger-0.3-policykit.patch:

--- NEW FILE thinkfinger-0.3-policykit.patch ---
diff -uNr thinkfinger-0.3.orig/data/Makefile.am thinkfinger-0.3/data/Makefile.am
--- thinkfinger-0.3.orig/data/Makefile.am	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.am	2007-09-27 01:36:58.000000000 -0400
@@ -8,4 +8,7 @@
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
diff -uNr thinkfinger-0.3.orig/data/Makefile.in thinkfinger-0.3/data/Makefile.in
--- thinkfinger-0.3.orig/data/Makefile.in	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -50,10 +50,11 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
-	"$(DESTDIR)$(halpolicydir)"
+	"$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
 halpolicyDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA) $(halpolicy_DATA)
+policykitDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA) $(policykit_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -178,7 +179,9 @@
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
 all: all-am
 
 .SUFFIXES:
@@ -251,6 +254,23 @@
 	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
 	done
+install-policykitDATA: $(policykit_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(policykitdir)" || $(MKDIR_P) "$(DESTDIR)$(policykitdir)"
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(policykitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  $(policykitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
+
+uninstall-policykitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -288,7 +308,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -333,7 +353,8 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA install-halpolicyDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA \
+	install-policykitDATA
 
 install-dvi: install-dvi-am
 
@@ -367,7 +388,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA \
+	uninstall-policykitDATA
 
 .MAKE: install-am install-strip
 
@@ -378,11 +400,12 @@
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-halpolicyDATA install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-consolepermsDATA uninstall-halpolicyDATA
+	install-pdf-am install-policykitDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-consolepermsDATA \
+	uninstall-halpolicyDATA uninstall-policykitDATA
 
 # 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.
diff -uNr thinkfinger-0.3.orig/data/thinkfinger.policy thinkfinger-0.3/data/thinkfinger.policy
--- thinkfinger-0.3.orig/data/thinkfinger.policy	1969-12-31 19:00:00.000000000 -0500
+++ thinkfinger-0.3/data/thinkfinger.policy	2007-09-27 01:35:27.000000000 -0400
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+  <action id="org.freedesktop.hal.device-access.thinkfinger">
+    <description>Directly access the fingerprint reader</description>
+    <message>System policy prevents access to the fingerprint reader</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+</policyconfig>
diff -uNr thinkfinger-0.3.orig/docs/Makefile.in thinkfinger-0.3/docs/Makefile.in
--- thinkfinger-0.3.orig/docs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -61,6 +61,7 @@
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/docs/autodocs/Makefile.in thinkfinger-0.3/docs/autodocs/Makefile.in
--- thinkfinger-0.3.orig/docs/autodocs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/autodocs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -44,6 +44,7 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/libthinkfinger/Makefile.in thinkfinger-0.3/libthinkfinger/Makefile.in
--- thinkfinger-0.3.orig/libthinkfinger/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/libthinkfinger/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -85,6 +85,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/pam/Makefile.in thinkfinger-0.3/pam/Makefile.in
--- thinkfinger-0.3.orig/pam/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/pam/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -80,6 +80,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 05:53:33 -0000	1.3
@@ -1,6 +1,6 @@
 --- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
 +++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
 +  <device>
@@ -13,6 +13,7 @@
 +      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
 +        <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">thinkfinger</merge>
 +      </match>
 +    </match>
 +


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
+++ thinkfinger.spec	27 Sep 2007 05:53:33 -0000	1.6
@@ -11,12 +11,14 @@
 Patch1:         thinkfinger-0.3-acl.patch
 Patch2:         thinkfinger-0.3-has-device.patch
 Patch3:         thinkfinger-0.3-hal.patch
+Patch4:         thinkfinger-0.3-policykit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
 BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
 Requires:       hal
+Requires:       PolicyKit
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -68,6 +70,7 @@
 touch -r configure.in.stamp configure.in
 %patch2 -p1 -b .has-device
 %patch3 -p1 -b .hal
+%patch4 -p1 -b .policykit
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
@@ -116,6 +119,7 @@
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
 %{_datadir}/hal/fdi/policy/10osvendor/*
+%{_datadir}/PolicyKit/policy/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -130,6 +134,7 @@
 %changelog
 * Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
 - put fdi file in policy/ directory
+- use PolicyKit to manage fingerprint reader access
 
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)



From fedora-extras-commits at redhat.com  Thu Sep 27 05:54:48 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Thu, 27 Sep 2007 01:54:48 -0400
Subject: comps/po ja.po,1.6,1.7
Message-ID: <200709270554.l8R5sm5d019874@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19829/po

Modified Files:
	ja.po 
Log Message:
2007-09-26  Noriko Mizumoto <noriko at redhat.com> (via noriko at fedoraproject.org)

  * po/ja.po: commit test for tqsg




Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ja.po	25 Sep 2007 00:16:02 -0000	1.6
+++ ja.po	27 Sep 2007 05:54:18 -0000	1.7
@@ -11,7 +11,7 @@
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-20 17:44-0700\n"
-"PO-Revision-Date: 2007-09-24 12:02+1000\n"
+"PO-Revision-Date: 2007-09-27 15:50+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"



From fedora-extras-commits at redhat.com  Thu Sep 27 06:26:34 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Thu, 27 Sep 2007 02:26:34 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.65,1.66
Message-ID: <200709270626.l8R6QYAO029104@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/logrotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29084

Modified Files:
	logrotate.spec 
Log Message:
* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
- add missing dependencies to spec file



Index: logrotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- logrotate.spec	23 Aug 2007 06:20:23 -0000	1.65
+++ logrotate.spec	27 Sep 2007 06:26:01 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.6
-Release: 1.1%{?dist}
+Release: 1.2%{?dist}
 License: GPL+
 Group: System Environment/Base
 # The source for this package was pulled from cvs.
@@ -12,8 +12,8 @@
 #  cd logrotate
 #  make create-archive
 Source: logrotate-%{version}.tar.gz
-Requires: coreutils >= 5.92
-BuildRequires: libselinux-devel
+Requires: coreutils >= 5.92 libsepol libselinux popt
+BuildRequires: libselinux-devel popt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -58,6 +58,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
+- add missing dependencies to spec file
+
 * Thu Aug 23 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 06:54:46 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Thu, 27 Sep 2007 02:54:46 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.66,1.67
Message-ID: <200709270654.l8R6skKj029740@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/logrotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29672

Modified Files:
	logrotate.spec 
Log Message:
* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.3
- popt-devel dependency was still missing



Index: logrotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- logrotate.spec	27 Sep 2007 06:26:01 -0000	1.66
+++ logrotate.spec	27 Sep 2007 06:54:13 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.6
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
 License: GPL+
 Group: System Environment/Base
 # The source for this package was pulled from cvs.
@@ -13,7 +13,7 @@
 #  make create-archive
 Source: logrotate-%{version}.tar.gz
 Requires: coreutils >= 5.92 libsepol libselinux popt
-BuildRequires: libselinux-devel popt
+BuildRequires: libselinux-devel popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -58,6 +58,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.3
+- popt-devel dependency was still missing
+
 * Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
 - add missing dependencies to spec file
 



From fedora-extras-commits at redhat.com  Thu Sep 27 06:55:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 23:55:21 -0700
Subject: [pkgdb] csync2 ownership updated
Message-ID: <200709270655.l8R6tRiH006930@bastion.fedora.phx.redhat.com>

Package csync2 in Fedora devel was orphaned by Ruben Kerkhof (ruben)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csync2



From fedora-extras-commits at redhat.com  Thu Sep 27 08:03:41 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 04:03:41 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.34, 1.35 hwbrowser.spec, 1.48,
	1.49 sources, 1.42, 1.43
Message-ID: <200709270803.l8R83fXa016054@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
hide notebook tabs (#308301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	11 Sep 2007 08:58:11 -0000	1.34
+++ .cvsignore	27 Sep 2007 08:03:08 -0000	1.35
@@ -1 +1 @@
-hwbrowser-0.36.tar.bz2
+hwbrowser-0.37.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- hwbrowser.spec	14 Sep 2007 12:46:29 -0000	1.48
+++ hwbrowser.spec	27 Sep 2007 08:03:08 -0000	1.49
@@ -1,6 +1,6 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.36
+Version: 0.37
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -52,6 +52,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 0.37-1
+- hide notebook tabs (#308301)
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	14 Sep 2007 12:46:29 -0000	1.42
+++ sources	27 Sep 2007 08:03:08 -0000	1.43
@@ -1 +1 @@
-a51bf81470d82846a0cf6f185f44bc3a  hwbrowser-0.36.tar.bz2
+fd6edb9aff966fc6eb24bbe26936056e  hwbrowser-0.37.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 09:17:18 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 27 Sep 2007 05:17:18 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.8,1.9
Message-ID: <200709270917.l8R9HIJN026577@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26555

Modified Files:
	cdrkit.spec 
Log Message:
* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
- fixed readcd man page symlink



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cdrkit.spec	21 Sep 2007 08:53:01 -0000	1.8
+++ cdrkit.spec	27 Sep 2007 09:16:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -121,7 +121,7 @@
 		%{_mandir}/man1/wodim.1.gz \
 	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
 	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
-		%{_mandir}/man1/readcd.1.gz 
+		%{_mandir}/man1/readom.1.gz 
 
 %preun -n wodim
 if [ $1 = 0 ]; then
@@ -209,6 +209,9 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
+- fixed readcd man page symlink
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
 - fixed rhbz#255001 - icedax --devices segfaults
 - fixed rhbz#249357 - Typo in wodim output



From fedora-extras-commits at redhat.com  Thu Sep 27 09:36:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 27 Sep 2007 05:36:32 -0400
Subject: rpms/OpenSceneGraph/F-7 OpenSceneGraph.spec,1.22,1.23
Message-ID: <200709270936.l8R9aWOh027283@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27258

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Fri Sep 14 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-5
- Split out OpenSceneGraph-libs.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-7/OpenSceneGraph.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OpenSceneGraph.spec	22 Jun 2007 03:40:31 -0000	1.22
+++ OpenSceneGraph.spec	27 Sep 2007 09:35:59 -0000	1.23
@@ -11,7 +11,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -180,10 +180,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -193,13 +189,28 @@
 %{_bindir}/osgversion
 %{_bindir}/osgviewer
 %{?_with_gdal:%{_bindir}/osgdem}
+
+%package libs
+Summary: 	OpenSceneGraph Libraries
+Group:		Applications/Multimedia
+
+%description libs
+OpenSceneGraph Libraries.
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files libs
+%defattr(-,root,root,-)
 %{_libdir}/osgPlugins
 %{_libdir}/libosg*.so.*
 
 %package devel
 Summary: 	Devel files for OpenSceneGraph
 Group:		Applications/Multimedia
-Requires:	%name = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	Producer-devel = %{version}-%{release}
 
 %description devel
@@ -395,6 +406,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Fri Sep 14 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-5
+- Split out OpenSceneGraph-libs.
+
 * Thu Jun 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-4
 - ExcludeArch: ppc64 (BZ 245192, 245196).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 11:06:06 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 07:06:06 -0400
Subject: rpms/ghostscript/devel ghostscript-mkstemp64.patch, NONE,
	1.1 ghostscript.spec, 1.142, 1.143
Message-ID: <200709271106.l8RB66ke010136@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10098

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-mkstemp64.patch 
Log Message:
* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 8.60-3
- Back-ported mkstemp64 patch (bug #308211).


ghostscript-mkstemp64.patch:

--- NEW FILE ghostscript-mkstemp64.patch ---
From: alexcher <alexcher at a1074d23-0009-0410-80fe-cf8c14f379e6>
Date: Sat, 8 Sep 2007 22:31:20 +0000 (+0000)
Subject: Declare Ghostscript as _LARGEFILE64_SOURCE program, i.e. request transitional
X-Git-Url: http://git.infradead.org/?p=ghostscript.git;a=commitdiff_plain;h=0513d1b9542d37e7134d36e49222b12ef469b722

Declare Ghostscript as _LARGEFILE64_SOURCE program, i.e. request transitional
interface to large file support. Check for mkstemp64() availability specially.


git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs at 8232 a1074d23-0009-0410-80fe-cf8c14f379e6
---

diff --git a/src/Makefile.in b/src/Makefile.in
index c1e3c3b..5590f9a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -120,8 +120,11 @@ GENOPT=
 #
 # -DHAVE_FILE64
 #	use marked versions of the stdio FILE calls, fopen64() et al.
+#
+# -DHAVE_MKSTEMP64
+#	use non-standard function mkstemp64()
 
-CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_FONTCONFIG@
+CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@
 
 # Define the name of the executable file.
 
diff --git a/src/configure.ac b/src/configure.ac
index 10658c5..ffde250 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -924,6 +924,9 @@ AC_SUBST(HAVE_HYPOT)
 AC_CHECK_FUNCS([fopen64], [HAVE_FILE64=-DHAVE_FILE64])
 AC_SUBST(HAVE_FILE64)
 
+AC_CHECK_FUNCS([mkstemp64], [HAVE_MKSTEMP64=-DHAVE_MKSTEMP64])
+AC_SUBST(HAVE_MKSTEMP64)
+
 AC_PROG_GCC_TRADITIONAL
 
 dnl NB: We don't actually provide autoconf-switched fallbacks for any
diff --git a/src/gp_unifs.c b/src/gp_unifs.c
index 6b6a85c..ac555b5 100644
--- a/src/gp_unifs.c
+++ b/src/gp_unifs.c
@@ -88,18 +88,22 @@ gp_open_scratch_file_generic(const char *prefix, char fname[gp_file_name_sizeof]
 
 	/* save the old filename template in case mkstemp fails */
 	memcpy(ofname, fname, gp_file_name_sizeof);
-#if defined(HAVE_FILE64) && !defined(_LARGEFILE64_SOURCE)
-	if (b64)
-	    file = mkstemp64(fname);
-	else
+#ifdef HAVE_MKSTEMP64
+	file = (b64 ? mkstemp64 : mkstemp)(fname);
+#else
+        file = mkstemp(fname);
 #endif
-	    file = mkstemp(fname);
-
-	/* Fixme : what to do with b64 and 32-bit mkstemp? Unimplemented. */
 	if (file < -1) {
 	    eprintf1("**** Could not open temporary file %s\n", ofname);
 	    return NULL;
 	}
+#if defined(O_LARGEFILE) && defined(__hpux)
+        if (b64)
+            fcntl(file, F_SETFD, fcntl(file, F_GETFD) | O_LARGEFILE);
+#else
+	/* Fixme : what to do with b64 and 32-bit mkstemp? Unimplemented. */
+#endif
+
 	fp = fdopen(file, mode);
 	if (fp == NULL)
 	    close(file);
@@ -479,10 +483,10 @@ gp_enumerate_files_close(file_enum * pfen)
 
 FILE *gp_fopen_64(const char *filename, const char *mode)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
-    return fopen(filename, mode);
-#else
+#if defined(HAVE_FILE64)
     return fopen64(filename, mode);
+#else
+    return fopen(filename, mode);
 #endif
 }
 
@@ -497,22 +501,22 @@ FILE *gp_open_scratch_file_64(const char *prefix,
 
 int64_t gp_ftell_64(FILE *strm)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
-    return ftello(strm);
-#else
+#if defined(HAVE_FILE64)
     return ftello64(strm);
+#else
+    return ftello(strm);
 #endif
 }
 
 int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
+#if defined(HAVE_FILE64)
+    return fseeko64(strm, offset, origin);
+#else
     off_t offset1 = (off_t)offset;
     
     if (offset != offset1)
 	return -1;
     return fseeko(strm, offset1, origin);
-#else
-    return fseeko64(strm, offset, origin);
 #endif
 }
diff --git a/src/stdpre.h b/src/stdpre.h
index acb61c1..c17cdbf 100644
--- a/src/stdpre.h
+++ b/src/stdpre.h
@@ -17,6 +17,9 @@
 #ifndef stdpre_INCLUDED
 #  define stdpre_INCLUDED
 
+/* Ghostscript uses transitional LFS functions. */
+#define _LARGEFILE64_SOURCE 1
+
 /*
  * Here we deal with the vagaries of various C compilers.  We assume that:
  *      ANSI-standard Unix compilers define __STDC__.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ghostscript.spec	23 Aug 2007 16:14:00 -0000	1.142
+++ ghostscript.spec	27 Sep 2007 11:05:26 -0000	1.143
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -20,6 +20,7 @@
 Patch3: ghostscript-noopt.patch
 Patch4: ghostscript-fPIC.patch
 Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch
+Patch6: ghostscript-mkstemp64.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -88,6 +89,8 @@
 # IJS KRGB patch.
 %patch5 -p1 -b .ijs-krgb
 
+%patch6 -p1 -b .mkstemp64
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -265,6 +268,9 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 8.60-3
+- Back-ported mkstemp64 patch (bug #308211).
+
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 8.60-2
 - More specific license tag.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 11:24:00 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 07:24:00 -0400
Subject: rpms/ghostscript/devel ghostscript-mkstemp64.patch,1.1,1.2
Message-ID: <200709271124.l8RBO0KX010793@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10772

Modified Files:
	ghostscript-mkstemp64.patch 
Log Message:
Include missing piece.

ghostscript-mkstemp64.patch:

Index: ghostscript-mkstemp64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript-mkstemp64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-mkstemp64.patch	27 Sep 2007 11:05:26 -0000	1.1
+++ ghostscript-mkstemp64.patch	27 Sep 2007 11:23:56 -0000	1.2
@@ -132,3 +132,35 @@
  /*
   * Here we deal with the vagaries of various C compilers.  We assume that:
   *      ANSI-standard Unix compilers define __STDC__.
+From: alexcher <alexcher at a1074d23-0009-0410-80fe-cf8c14f379e6>
+Date: Wed, 5 Sep 2007 19:21:05 +0000 (+0000)
+Subject: Replace non-standard function call fdopen64() with fdopen(). The former
+X-Git-Url: http://git.infradead.org/?p=ghostscript.git;a=commitdiff_plain;h=dc01761c07d210974d829c35c33a8886c33b0488
+
+Replace non-standard function call fdopen64() with fdopen(). The former
+is not available on most platforms and not needed anyway because O_LARGEFILE
+flag is set earlier in the code. Bug 689175.
+
+DIFFERENCES:
+None
+
+
+git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs at 8229 a1074d23-0009-0410-80fe-cf8c14f379e6
+---
+
+diff --git a/src/gpmisc.c b/src/gpmisc.c
+index f963d82..303fac2 100644
+--- a/src/gpmisc.c
++++ b/src/gpmisc.c
+@@ -93,11 +93,7 @@ gp_fopentemp_generic(const char *fname, const char *mode, bool b64)
+      * fdopen as (char *), rather than following the POSIX.1 standard,
+      * which defines it as (const char *).  Patch this here.
+      */
+-#if defined (O_LARGEFILE)
+-    file = (b64 ? fdopen64 : fdopen)(fildes, (char *)mode); /* still really const */
+-#else
+     file = fdopen(fildes, (char *)mode); /* still really const */
+-#endif
+     if (file == 0)
+ 	close(fildes);
+     return file;



From fedora-extras-commits at redhat.com  Thu Sep 27 11:53:15 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 07:53:15 -0400
Subject: rpms/kdebase/devel kdebase-3.5.7-konsolesu.patch, NONE,
	1.1 kdebase.spec, 1.265, 1.266
Message-ID: <200709271153.l8RBrF0L011675@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11654

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.7-konsolesu.patch 
Log Message:
rh#301841, "Root Shell" sessions will not close


kdebase-3.5.7-konsolesu.patch:

--- NEW FILE kdebase-3.5.7-konsolesu.patch ---
--- kdebase-3.5.7/konsole/konsolesu.desktop.orig	2007-09-27 13:47:40.000000000 +0200
+++ kdebase-3.5.7/konsole/konsolesu.desktop	2007-09-27 13:49:40.000000000 +0200
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Exec=konsole --type su
+Exec=kdesu konsole
 Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- kdebase.spec	30 Aug 2007 13:31:10 -0000	1.265
+++ kdebase.spec	27 Sep 2007 11:52:42 -0000	1.266
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 # a lot(most/all?) of files are +, but we'll be conservative, for now. -- Rex
@@ -70,6 +70,7 @@
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
 Patch29: kdebase-3.5.7-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
+Patch31: kdebase-3.5.7-konsolesu.patch
 
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
@@ -231,6 +232,7 @@
 %patch28 -p1 -b .kdm-alternatebackground
 %patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
+%patch31 -p1 -b .konsolesu-kdesu
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
@@ -644,6 +646,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> - 6:3.5.7-15
+- rh#301841, "Root Shell" sessions will not close
+
 * Thu Aug 30 2007 Than Ngo <than at redhat.com> - 6:3.5.7-14
 - fix bz#265801, fuser command not found by kio_media_mounthelper
 



From fedora-extras-commits at redhat.com  Thu Sep 27 12:10:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 27 Sep 2007 08:10:36 -0400
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff, 1.4,
	1.5 OpenSceneGraph.spec, 1.27, 1.28
Message-ID: <200709271210.l8RCAa5n018205@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18179

Modified Files:
	OpenSceneGraph-2.0.diff OpenSceneGraph.spec 
Log Message:
* Thu Sep 27 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-7
- Let OpenSceneGraph-libs Obsoletes: Producer
- Let OpenSceneGraph-devel Obsoletes: Producer-devel.

* Wed Sep 26 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-6
- By public demand, add upstream's *.pcs.
- Add hacks to work around the worst bugs in *.pcs.
- Add OpenSceneGraph2-devel.
- Move ldconfig to *-libs.
- Abandon OpenThreads2.
- Remove obsolete applications.



OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSceneGraph-2.0.diff	14 Sep 2007 05:13:08 -0000	1.4
+++ OpenSceneGraph-2.0.diff	27 Sep 2007 12:10:33 -0000	1.5
@@ -1,6 +1,6 @@
 diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-26 10:18:50.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
  
 diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 --- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
-+++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-26 10:18:50.000000000 +0200
 @@ -30,7 +30,7 @@
  # If a relative path is entered, it will be relative to the location 
  # where doxygen was started. If left blank the current directory will be used.
@@ -33,7 +33,7 @@
  # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
 --- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-26 10:18:50.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -43,9 +43,9 @@
      ADD_SUBDIRECTORY(osgtext)
      ADD_SUBDIRECTORY(osgtexture1D)
      ADD_SUBDIRECTORY(osgtexture2D)
-diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc OpenSceneGraph/pkgconfig/openscenegraph-2.pc
---- OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -54,16 +54,16 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openscenegraph-2
++Name: openscenegraph
 +Description: 3D scenegraph
-+Version: 2.0
++Version: 2.1.12
 +Requires: openthreads
 +Conflicts:
-+Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
++Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer
 +Cflags: -I${includedir}
-diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
---- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openthreads.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -74,7 +74,7 @@
 +
 +Name: openthreads
 +Description: Object-Oriented (OO) thread interface for C++ programmers
-+Version: 2.0
++Version: 1.9.6
 +Requires:
 +Conflicts:
 +Libs: -L${libdir} -lOpenThreads


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- OpenSceneGraph.spec	22 Aug 2007 05:04:57 -0000	1.27
+++ OpenSceneGraph.spec	27 Sep 2007 12:10:33 -0000	1.28
@@ -7,15 +7,15 @@
 %define apivers 2.0
 %define srcvers 2.0
 
-# pkgconfig support has been abandoned pkgconfig support
-%define _with_pkgconfig 0
+# HACK: Work around to yum not being able to remove packages
+%define _obsolete_Producer 1
 
-# The latest rpm "version-release" of OSG1's Producer in Fedora.
-%define OSG1_Producer 1.2-4%{?dist}
+# Force pushing out OSG1's Producer
+%define OSG1_Producer 1:1.2-0
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -26,8 +26,6 @@
 Patch0:         OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# BZ: 245192, 245196
-# ExcludeArch:    ppc64
 
 BuildRequires:  libGL-devel
 BuildRequires:  libGLU-devel
@@ -42,11 +40,10 @@
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
-# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
-# Required to let yum remove Producer (from OSG-1)
-Obsoletes:	Producer <= %{OSG1_Producer}
 
+%if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
+%endif
 
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
@@ -73,6 +70,18 @@
 OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 popd
 
+# HACK: Upstream stuff lacks cmake support and is broken
+sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
+  -e 's,^libdir=.*$,libdir=%{_libdir},' \
+  -e 's,^includedir=.*$,includedir=%{_includedir},' \
+  -e '/^Conflicts.*$/d' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+sed -i -e 's,Version:.*,Version: 2.0.0,' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+sed -i -e 's,Version:.*,Version: 1.9.5,' \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -80,21 +89,18 @@
 
 # Supposed to take OpenSceneGraph data
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
-
-%if %{?_with_pkgconfig}
-# Abandoned by upstream, re-added by patch
-# FIXME: Don't ship for now. Consider to re-activate
-install -m 644 -D pkgconfig/openthreads-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads-2.pc
-install -m 644 -D pkgconfig/openscenegraph-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif 
 popd
 
+# Abandoned w/ 2.0 by upstream, re-added to 2.1.*
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openthreads.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 
 %files
@@ -108,11 +114,23 @@
 %package libs
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
 Provides:	OpenSceneGraph2-libs = %{version}-%{release}
+%endif
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
+Obsoletes:	Producer <= %{OSG1_Producer}
+%endif
+
 
 %description libs
 Runtime libraries files for OpenSceneGraph.
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/osgPlugins-2.0.*
@@ -121,12 +139,18 @@
 %package devel
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:	OpenSceneGraph2-devel = %{version}-%{release}
+%endif
 Requires:	OpenSceneGraph2-libs = %{version}-%{release}
-%if %{?_with_pkgconfig}
 Requires:	pkgconfig
-%endif
-Requires:	OpenThreads2-devel
+Requires:	OpenThreads-devel
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
 Obsoletes:	Producer-devel <= %{OSG1_Producer}
+%endif
+
 
 %description devel
 Development files for OpenSceneGraph.
@@ -135,15 +159,16 @@
 %defattr(-,root,root,-)
 %doc BUILD/doc/html
 %{_includedir}/osg*
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif
+%{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
 
 # OpenSceneGraph-examples
 %package examples
 Summary:        Sample applications for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:       OpenSceneGraph2-examples = %{version}-%{release}
+%endif
 
 %description examples
 Sample applications for OpenSceneGraph
@@ -157,9 +182,6 @@
 %{_bindir}/osgcallback
 %{_bindir}/osgcamera
 %{_bindir}/osgcatch
-%if "%{version}" < "2.0"
-%{_bindir}/osgcameragroup
-%endif
 %{_bindir}/osgclip
 %if "%{version}" < "2.0"
 # doesn't build w/ 2.0
@@ -172,9 +194,6 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
-%if "%{version}" < "1.2"
-%{_bindir}/osgfbo
-%endif
 %{_bindir}/osgfadetext
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
@@ -195,9 +214,6 @@
 %{_bindir}/osgmanipulator
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
-%if "%{version}" < "2.0"
-%{_bindir}/osgmultiplecameras
-%endif
 %{_bindir}/osgmultitexture
 %{_bindir}/osgoccluder
 %{_bindir}/osgpagedlod
@@ -220,10 +236,6 @@
 %{_bindir}/osgshadow
 %{_bindir}/osgshadowtexture
 %{_bindir}/osgshape
-%if "%{version}" < "2.0"
-%{_bindir}/osgsimple
-%{_bindir}/osgsimplepager
-%endif
 %{_bindir}/osgsimplifier
 %{_bindir}/osgslice
 %{_bindir}/osgspacewarp
@@ -256,7 +268,6 @@
 Summary:        OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2 = %{version}-%{release}
 
 %description -n OpenThreads
 OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
@@ -279,25 +290,31 @@
 Summary:        Devel files for OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2-devel = %{version}-%{release}
-Requires:       OpenThreads2 = %{version}-%{release}
-%if %{?_with_pkgconfig}
+Requires:       OpenThreads = %{version}-%{release}
 Requires:	pkgconfig
-%endif
 
 %description -n OpenThreads-devel
 Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openthreads-2.pc
-%endif
+%{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
-
 %changelog
+* Thu Sep 27 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-7
+- Let OpenSceneGraph-libs Obsoletes: Producer
+- Let OpenSceneGraph-devel Obsoletes: Producer-devel.
+
+* Wed Sep 26 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-6
+- By public demand, add upstream's *.pcs.
+- Add hacks to work around the worst bugs in *.pcs.
+- Add OpenSceneGraph2-devel.
+- Move ldconfig to *-libs.
+- Abandon OpenThreads2.
+- Remove obsolete applications.
+
 * Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-5
 - Prepare renaming package into OpenSceneGraph2.
 - Split out run-time libs into *-libs subpackage.



From fedora-extras-commits at redhat.com  Thu Sep 27 12:28:33 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Thu, 27 Sep 2007 08:28:33 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.10,1.11
Message-ID: <200709271228.l8RCSXWN019127@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19050

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg setup line.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- java-1.7.0-icedtea.spec	26 Sep 2007 19:22:05 -0000	1.10
+++ java-1.7.0-icedtea.spec	27 Sep 2007 12:28:00 -0000	1.11
@@ -264,7 +264,6 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
-%setup -q -n icedtea-%{icedteaver} -T -D -a 8
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -731,6 +730,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+- Removed jtreg setup line.
+
 * Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg. Does not adhere to Fedora guidelines.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 12:28:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 08:28:36 -0400
Subject: rpms/xsane/devel xsane.desktop,1.1,1.2 xsane.spec,1.50,1.51
Message-ID: <200709271228.l8RCSanx019133@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19061

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
fix "Name" (#293871) and "Category" entries in desktop file



Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsane.desktop	8 Jun 2006 08:19:07 -0000	1.1
+++ xsane.desktop	27 Sep 2007 12:28:03 -0000	1.2
@@ -2,13 +2,12 @@
 Version=1.0
 Encoding=UTF-8
 Type=Application
-#Name=XSane
-Name=Scanner Tool
+Name=XSane
 GenericName=Scanner Tool
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane
 TryExec=xsane
 Icon=/usr/share/sane/xsane/xsane-logo.xpm
 Terminal=false
-Categories=Application;Graphics;2DGraphics;RasterGraphics;GTK;
+Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xsane.spec	5 Sep 2007 15:27:57 -0000	1.50
+++ xsane.spec	27 Sep 2007 12:28:03 -0000	1.51
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.994
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -72,9 +72,6 @@
 mkdir %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
-    --add-category X-Red-Hat-Base                       \
-    --add-category X-Fedora                             \
-    --add-category Graphics                             \
     %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
@@ -118,6 +115,9 @@
 
 %changelog
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+- fix "Name" (#293871) and "Category" entries in desktop file
+
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license to GPLv2+
 
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3



From fedora-extras-commits at redhat.com  Thu Sep 27 12:55:42 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Thu, 27 Sep 2007 08:55:42 -0400
Subject: fedora-security/audit fc6,1.267,1.268 fc7,1.122,1.123
Message-ID: <200709271255.l8RCtgYe019842@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819/audit

Modified Files:
	fc6 fc7 
Log Message:
proccess large pile of fedora updates



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- fc6	21 Sep 2007 21:28:10 -0000	1.267
+++ fc6	27 Sep 2007 12:55:40 -0000	1.268
@@ -5,7 +5,7 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
 # Up to date CVE as of CVE email 20070914
-# Up to date FC6 as of 20070916
+# Up to date FC6 as of 20070926
 
 CVE-2007-5034 VULNERABLE (elinks) #297611
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
@@ -17,17 +17,19 @@
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-4670 backport (php) [since FEDORA-2007-709]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
 CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
 CVE-2007-4660 VULNERABLE (php, fixed 5.2.4) 
 CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
-CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4658 backport (php, fixed 5.2.4) #278011 [since FEDORA-2007-709]
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4569 VULNERABLE (kdebase) #299741
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
+CVE-2007-4465 version (httpd) [since FEDORA-2007-707]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash
@@ -35,7 +37,7 @@
 CVE-2007-4225 ignore (kdebase) caused by fix to CVE-2007-3820 which we never shipped
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
-CVE-2007-4137 VULNERABLE (qt) #292951
+CVE-2007-4137 backport (qt) #292951 [since FEDORA-2007-703]
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
 CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]
@@ -44,17 +46,19 @@
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294911
 CVE-2007-3999 VULNERABLE (libtirpc) #294931
+CVE-2007-3998 backport (php) [since FEDORA-2007-709]
+CVE-2007-3996 backport (php) [since FEDORA-2007-709]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]
 CVE-2007-3848 version (kernel) [since FEDORA-2007-679]
-CVE-2007-3847 VULNERABLE (httpd) #250756
+CVE-2007-3847 version (httpd) #250756 [since FEDORA-2007-707]
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
 CVE-2007-3843 VULNERABLE (kernel) #246595
 CVE-2007-3841 ignore (pidgin) ethically disclosed
 CVE-2007-3820 ** (kdebase) #248537
-CVE-2007-3799 ** (php)
+CVE-2007-3799 backport (php) [since FEDORA-2007-709]
 CVE-2007-3798 version (tcpdump, fixed 3.9.7) #250290 [since FEDORA-2007-654]
 CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
@@ -62,19 +66,20 @@
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]
-CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3478 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3477 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3476 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3475 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3474 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3473 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3472 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245809
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3392 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3391 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3390 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-3388 backport (qt) [since FEDORA-2007-703]
 CVE-2007-3387 VULNERABLE (poppler) #251513
 CVE-2007-3387 backport (tetex) #251515 [since FEDORA-2007-669]
 CVE-2007-3387 backport (kdegraphics) #251511 [since FEDORA-2007-685]
@@ -94,14 +99,16 @@
 CVE-2007-2875 version (kernel) [since FEDORA-2007-600]
 *CVE-2007-2874 (wpa_supplicant) #242455
 CVE-2007-2873 version (spamassassin, fixed 3.1.9) [since FEDORA-2007-582]
+CVE-2007-2872 backport (php) [since FEDORA-2007-709]
 CVE-2007-2871 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2870 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2869 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2868 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2867 version (mozilla) #241840 [since FEDORA-2007-549]
-CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293371
+CVE-2007-2834 backport (openoffice.org, fixed 2.3) #293371 [since FEDORA-2007-700]
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-538]
 CVE-2007-2797 version (xterm)
+CVE-2007-2756 backport (php) [since FEDORA-2007-709]
 CVE-2007-2453 version (kernel) [since FEDORA-2007-600]
 CVE-2007-2451 version (kernel, fixed 2.6.21.4) [since FEDORA-2007-600]
 CVE-2007-2445 backport (libpng) #239542 [since FEDORA-2007-529]
@@ -162,6 +169,7 @@
 CVE-2007-0451 version (spamassassin, fixed 3.1.8) [since FEDORA-2007-241]
 CVE-2007-0248 version (squid, fixed 2.6.STABLE7) [since FEDORA-2007-073]
 CVE-2007-0247 version (squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-073]
+CVE-2007-0242 backport (qt) [since FEDORA-2007-703]
 CVE-2007-0235 version (libgtop2, fixed 2.14.9) #222637 [since FEDORA-2007-657]
 CVE-2007-0104 ignore (poppler) only client DoS
 CVE-2007-0104 ignore (kdegraphics) only client DoS


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc7	26 Sep 2007 15:57:23 -0000	1.122
+++ fc7	27 Sep 2007 12:55:40 -0000	1.123
@@ -6,16 +6,17 @@
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
 # Up to date CVE as of CVE email 20070914
-# Up to date FC7 as of 20070916
+# Up to date FC7 as of 20070926
 
-GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
-CVE-2007-5038 VULNERABLE (bugzilla, fixed 3.0.2, 3.1.2) #299981
+CVE-2007-5106 version (wordpress) affects old 2.0.x versions
+CVE-2007-5105 version (wordpress) affects old 2.0.x versions
+CVE-2007-5038 version (bugzilla, fixed 3.0.2, 3.1.2) #299981 [since FEDORA-2007-2299]
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
-CVE-2007-5034 VULNERABLE (elinks) #297981
+CVE-2007-5034 version (elinks) #297981 [since FEDORA-2007-2224]
 CVE-2007-5007 VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-CVE-2007-4974 VULNERABLE (libsndfile) #296221
+CVE-2007-4974 backport (libsndfile) #296221 [since FEDORA-2007-2236]
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
@@ -24,8 +25,8 @@
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
-CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
-CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
+CVE-2007-4828 version (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881 [since FEDORA-2007-2189]
+CVE-2007-4826 version (quagga, fixed 0.99.9) [since FEDORA-2007-2196]
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051
@@ -41,6 +42,7 @@
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
+CVE-2007-4573 version (kernel) [since FEDORA-2007-2298]
 CVE-2007-4569 VULNERABLE (kdebase) #299731
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
@@ -54,6 +56,7 @@
 CVE-2007-4533 backport (vavoom) #256621 [since FEDORA-2007-1977]
 CVE-2007-4532 backport (vavoom) #256621 [since FEDORA-2007-1977]
 CVE-2007-4510 version (clamav, fixed 0.91.2) #253780 [since FEDORA-2007-2050]
+CVE-2007-4465 version (httpd) [since FEDORA-2007-2214]
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
 CVE-2007-4400 VULNERABLE (konversation) #253545
@@ -75,11 +78,12 @@
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
-CVE-2007-4137 VULNERABLE (qt) #292941
+CVE-2007-4137 backport (qt) #292941 [since FEDORA-2007-2216]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4065 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-4033 VULNERABLE (t1lib) #303021
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
@@ -94,7 +98,7 @@
 CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
 CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
 CVE-2007-3848 version (kernel) [since FEDORA-2007-1785]
-CVE-2007-3847 VULNERABLE (httpd) #250755
+CVE-2007-3847 version (httpd) #250755 [since FEDORA-2007-2214]
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
 CVE-2007-3843 VULNERABLE (kernel) #246595
@@ -138,7 +142,7 @@
 CVE-2007-3391 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-3390 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
-CVE-2007-3388 VULNERABLE (qt, fixed qt-3.3.8-20070727) patch available: 170529.diff
+CVE-2007-3388 backport (qt, fixed qt-3.3.8-20070727) patch available: 170529.diff [since FEDORA-2007-2216]
 CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
 CVE-2007-3387 backport (tetex) #251514 [since FEDORA-2007-1547]
 CVE-2007-3387 VULNERABLE (poppler) #251512
@@ -168,8 +172,8 @@
 CVE-2007-3123 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3122 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3121 version (zvbi, fixed 0.2.25) [since FEDORA-2007-0175]
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3113 backport (cacti) #243592 [since FEDORA-2007-2199]
+CVE-2007-3112 backport (cacti) #243592 [since FEDORA-2007-2199]
 CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
 CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]



From fedora-extras-commits at redhat.com  Thu Sep 27 13:25:35 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 09:25:35 -0400
Subject: rpms/gimp/devel .cvsignore, 1.34, 1.35 gimp.spec, 1.140,
	1.141 sources, 1.34, 1.35
Message-ID: <200709271325.l8RDPZ8G026717@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26695

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.4.0-rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	4 Sep 2007 07:23:20 -0000	1.34
+++ .cvsignore	27 Sep 2007 13:25:02 -0000	1.35
@@ -1 +1 @@
-gimp-2.4.0-rc2.tar.bz2
+gimp-2.4.0-rc3.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gimp.spec	7 Sep 2007 12:39:31 -0000	1.140
+++ gimp.spec	27 Sep 2007 13:25:02 -0000	1.141
@@ -38,14 +38,14 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Version:        2.4.0
-%define rcver rc2
+%define rcver rc3
 %define binver 2.4
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}2%{?dist}
+Release:        %{?rcver:0.%{rcver}.}1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.1
+- version 2.4.0-rc3
+
 * Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.2
 - rebuild to pick up new version of poppler
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Sep 2007 07:23:20 -0000	1.34
+++ sources	27 Sep 2007 13:25:02 -0000	1.35
@@ -1 +1 @@
-4a17f7d002cfc0ddf13d64181030a71b  gimp-2.4.0-rc2.tar.bz2
+f468ce7c1e3ead678f41b10b28200e60  gimp-2.4.0-rc3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:19 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:19 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVOW4015396@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the approveacls acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:28 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVXS7015420@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the commit acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:32 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVOW7015396@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the watchcommits acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:34 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVXSA015420@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the watchbugzilla acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:46:49 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 09:46:49 -0400
Subject: rpms/xsane/devel xsane.desktop,1.2,1.3 xsane.spec,1.51,1.52
Message-ID: <200709271346.l8RDknY2027383@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26819

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
revert changing Name entry in the desktop file (#293871)



Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsane.desktop	27 Sep 2007 12:28:03 -0000	1.2
+++ xsane.desktop	27 Sep 2007 13:46:17 -0000	1.3
@@ -2,7 +2,8 @@
 Version=1.0
 Encoding=UTF-8
 Type=Application
-Name=XSane
+#Name=XSane
+Name=Scanner Tool
 GenericName=Scanner Tool
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xsane.spec	27 Sep 2007 12:28:03 -0000	1.51
+++ xsane.spec	27 Sep 2007 13:46:17 -0000	1.52
@@ -115,7 +115,7 @@
 
 %changelog
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
-- fix "Name" (#293871) and "Category" entries in desktop file
+- fix "Category" entries in desktop file
 
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license to GPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:01 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6EL016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the watchbugzilla acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:03 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6EO016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the watchcommits acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:06 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:06 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDwBvW016244@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:12 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:12 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6ER016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the approveacls acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:37 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:37 -0700
Subject: [pkgdb] ctags had groupAcl changed
Message-ID: <200709271358.l8RDwBvY016244@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora 7) to Denied for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:32 -0700
Subject: [pkgdb] ctags had groupAcl changed
Message-ID: <200709271358.l8RDwcZr016328@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:41 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwBva016244@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 was orphaned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:43 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwBvc016244@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 is now owned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:46 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwcZt016328@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 was orphaned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:47 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwrIl016419@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 is now owned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 14:05:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 07:05:47 -0700
Subject: [pkgdb] doxygen had acl change status
Message-ID: <200709271405.l8RE5qeg016731@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on doxygen (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/doxygen



From fedora-extras-commits at redhat.com  Thu Sep 27 14:06:09 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 07:06:09 -0700
Subject: [pkgdb] efax had acl change status
Message-ID: <200709271406.l8RE6EXm016772@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on efax (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/efax



From fedora-extras-commits at redhat.com  Thu Sep 27 14:09:21 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:09:21 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-swiotlb-bidir.ptach, NONE, 
	1.1.2.1 kernel-xen.spec, 1.60, 1.60.2.1
Message-ID: <200709271409.l8RE9LIp002009@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1919

Modified Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	linux-2.6-xen-swiotlb-bidir.ptach 
Log Message:
Experimental fix to bz#240471




--- NEW FILE linux-2.6-xen-swiotlb-bidir.ptach ---
# HG changeset patch
# User Eduardo Habkost <ehabkost at redhat.com>
# Date 1190901132 10800
# Node ID 724e42a60ed5d891e20b9943ac3a09298349ab5e
# Parent  4b1b115de5debf988f267a1cd1e566a750b391a2
swiotlb: Accept DMA_BIDIRECTIONAL on sync functions

Make swiotlb_sync_{single,sg}_for_{device,cpu}() accept DMA_BIDIRECTIONAL.

Pass DMA_TO_DEVICE or DMA_FROM_DEVICE direction to sync_single() depending
if for_device or for_cpu functions were called.

This should make fw-ohci module work under Xen, as it uses
dma_sync_single_for_device() with dir==DMA_BIDIRECTIONAL.

diff -r 4b1b115de5de -r 724e42a60ed5 arch/i386/kernel/swiotlb.c
--- a/arch/i386/kernel/swiotlb.c	Tue Jun 19 19:16:04 2007 +0200
+++ b/arch/i386/kernel/swiotlb.c	Thu Sep 27 10:52:12 2007 -0300
@@ -529,18 +529,18 @@ swiotlb_sync_single_for_cpu(struct devic
 swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
 			    size_t size, int dir)
 {
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 	if (in_swiotlb_aperture(dev_addr))
-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_FROM_DEVICE);
 }
 
 void
 swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
 			       size_t size, int dir)
 {
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 	if (in_swiotlb_aperture(dev_addr))
-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_TO_DEVICE);
 }
 
 /*
@@ -624,13 +624,13 @@ swiotlb_sync_sg_for_cpu(struct device *h
 {
 	int i;
 
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 
 	for (i = 0; i < nelems; i++, sg++)
 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
 			sync_single(hwdev,
 				    (void *)bus_to_virt(sg->dma_address),
-				    sg->dma_length, dir);
+				    sg->dma_length, DMA_FROM_DEVICE);
 }
 
 void
@@ -640,12 +640,13 @@ swiotlb_sync_sg_for_device(struct device
 	int i;
 
 	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 
 	for (i = 0; i < nelems; i++, sg++)
 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
 			sync_single(hwdev,
 				    (void *)bus_to_virt(sg->dma_address),
-				    sg->dma_length, dir);
+				    sg->dma_length, DMA_TO_DEVICE);
 }
 
 #ifdef CONFIG_HIGHMEM


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -u -r1.60 -r1.60.2.1
--- kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
+++ kernel-xen.spec	27 Sep 2007 14:08:49 -0000	1.60.2.1
@@ -470,6 +470,9 @@
 Patch963: linux-2.6-xen-sleazy-fpu-i386.patch
 Patch964: linux-2.6-xen-sleazy-fpu-x86_64.patch
 
+# Support DMA_BIDIRECTIONAL on swiotlb (bug #240471)
+Patch965: linux-2.6-xen-swiotlb-bidir.ptach
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -959,6 +962,7 @@
 %patch962 -p1
 %patch963 -p1
 %patch964 -p1
+%patch965 -p1
 %endif
 
 
@@ -2362,6 +2366,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Experimental patch to fix fw-ohci under Xen (bug #240471)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:09:36 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 27 Sep 2007 10:09:36 -0400
Subject: rpms/smb4k/devel .cvsignore, 1.17, 1.18 smb4k.spec, 1.22,
	1.23 sources, 1.17, 1.18
Message-ID: <200709271409.l8RE9aPo002022@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1958

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Update to 0.8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	3 Aug 2007 10:53:10 -0000	1.17
+++ .cvsignore	27 Sep 2007 14:09:03 -0000	1.18
@@ -1 +1 @@
-smb4k-0.8.4.tar.bz2
+smb4k-0.8.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- smb4k.spec	31 Aug 2007 09:07:53 -0000	1.22
+++ smb4k.spec	27 Sep 2007 14:09:03 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		smb4k
-Version:	0.8.4
-Release:	2%{?dist}
+Version:	0.8.5
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -104,6 +104,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Marcin Garski <mgarski[AT]post.pl> 0.8.5-1
+- Update to 0.8.5
+
 * Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.8.4-2
 - Fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	3 Aug 2007 10:53:10 -0000	1.17
+++ sources	27 Sep 2007 14:09:03 -0000	1.18
@@ -1 +1 @@
-6e13c5c0c2e548187d51bc70072055e0  smb4k-0.8.4.tar.bz2
+4fa4b0d5905ad834c61ca828c247665a  smb4k-0.8.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 14:14:44 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:14:44 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4,
	1.4.2.1 kernel-2.6.21-x86_64-xen.config, 1.5,
	1.5.2.1 kernel-xen.spec, 1.60.2.1, 1.60.2.2
Message-ID: <200709271414.l8REEiVW002651@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2618

Modified Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenable firewire modules



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 14:14:12 -0000	1.4.2.1
@@ -1315,7 +1315,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- kernel-2.6.21-x86_64-xen.config	27 Aug 2007 17:46:26 -0000	1.5
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:14:12 -0000	1.5.2.1
@@ -1221,7 +1221,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -r1.60.2.1 -r1.60.2.2
--- kernel-xen.spec	27 Sep 2007 14:08:49 -0000	1.60.2.1
+++ kernel-xen.spec	27 Sep 2007 14:14:12 -0000	1.60.2.2
@@ -2368,6 +2368,7 @@
 %changelog
 * Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Experimental patch to fix fw-ohci under Xen (bug #240471)
+- Reenabled Firewire modules
 
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current



From fedora-extras-commits at redhat.com  Thu Sep 27 14:24:36 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:24:36 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.5,
	1.6 kernel-2.6.20-x86_64-xen.config, 1.4, 1.5 kernel-xen.spec,
	1.49, 1.50
Message-ID: <200709271424.l8REOa20003367@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenable Firewire but keep fw-ohci disabled

fw-sbp2 should be working.



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.20-i686-xen.config	26 Sep 2007 17:35:35 -0000	1.5
+++ kernel-2.6.20-i686-xen.config	27 Sep 2007 14:24:04 -0000	1.6
@@ -583,7 +583,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-# CONFIG_FW is not set
+CONFIG_FW=m
+# CONFIG_FW_OHCI is not set
+CONFIG_FW_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.20-x86_64-xen.config	24 May 2007 16:16:28 -0000	1.4
+++ kernel-2.6.20-x86_64-xen.config	27 Sep 2007 14:24:04 -0000	1.5
@@ -583,7 +583,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-# CONFIG_FW is not set
+CONFIG_FW=m
+# CONFIG_FW_OHCI is not set
+CONFIG_FW_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kernel-xen.spec	26 Sep 2007 17:35:35 -0000	1.49
+++ kernel-xen.spec	27 Sep 2007 14:24:04 -0000	1.50
@@ -2072,6 +2072,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Reenable Firewire but disable fw-ohci module. sbp2 module
+  should be working (bug #302471)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:32:17 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Thu, 27 Sep 2007 10:32:17 -0400
Subject: rpms/straw/devel Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec,
	1.8, 1.9 dead.package, 1.1, NONE
Message-ID: <200709271432.l8REWHuM003928@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/straw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3889/devel

Added Files:
	Makefile sources straw.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	27 Sep 2007 14:31:43 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: straw
+# $Id$
+NAME := straw
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	27 Sep 2007 14:31:44 -0000	1.4
@@ -0,0 +1 @@
+5c64c65158dab096e2077e4f91412b37  straw-0.27.tar.gz


Index: straw.spec
===================================================================
RCS file: straw.spec
diff -N straw.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ straw.spec	27 Sep 2007 14:31:44 -0000	1.9
@@ -0,0 +1,123 @@
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+%define desktop_vendor fedora
+
+Summary:        Desktop news aggregator
+Name:           straw
+Version:        0.27
+Release:        9%{?dist}
+License:        GPLv2+
+Group:          Applications/Internet
+URL:            http://www.gnome.org/projects/straw/
+Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: python >= 2.4
+# fix for python >= 2.5
+%if "%{?fedora}" > "6"
+BuildRequires: python-devel
+%endif
+Requires: gnome-python2-gnomevfs
+Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-libegg
+Requires: gnome-python2-gconf
+Requires: pygtk2-libglade
+Requires: mx
+# Current python-adns makes double free problem (bug 292821)
+Conflicts:python-adns
+Requires: dbus-python
+
+Requires(pre): GConf2
+Requires(post):GConf2
+Requires(preun):GConf2
+
+BuildRequires: dbus-python
+BuildRequires: pygtk2-libglade
+BuildRequires: pygtk2 >= 2.8.0
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-python2-gconf
+BuildRequires: intltool
+
+BuildArch: noarch
+
+%description
+Straw is a desktop news aggregator for the GNOME environment. Its aim
+is to be a faster, easier and more accessible way to read news and
+blogs than the traditional browser.
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
+
+# this is a fix for constants.py to lookup in install dir rather than buildroot
+sed -i -e s@${RPM_BUILD_ROOT}@@ ${RPM_BUILD_ROOT}%{python_sitelib}/%{name}/constants.py
+
+%{__python} -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT%{python_sitelib}/%{name}'")'
+
+%find_lang %{name}
+
+%{__install} -Dp -m0644 data/%{name}.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas
+
+desktop-file-install --vendor %{desktop_vendor} --delete-original \
+                     --dir %{buildroot}%{_datadir}/applications    \
+                     %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%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 %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%{_sysconfdir}/gconf/schemas/straw.schemas
+%doc LICENSE NEWS README TODO ChangeLog AUTHORS
+%{_bindir}/%{name}
+%{python_sitelib}/straw/
+%{_datadir}/straw/
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+
+
+%changelog
+* Sun Sep 23 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-9
+- Fixed dependecies related to pygtk
+* Fri Sep 21 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-8
+- Fixed dependencies related to gnome-python2
+* Mon Sep 17 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-7
+- Fixed redundant dependencies 
+* Sun Sep 16 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-6
+- Fixed usage Gconf.Straw does not support python-adns anymore.
+- So removed it. Fixed Spec file indentation warning.
+* Thu Sep 14 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-5
+- Fixed few major errors and dependencies
+* Tue Sep 11 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-4
+- Fixed failed dependencies
+* Mon Sep 10 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-3
+- Fixed few errors 
+* Sun Sep 9  2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-2
+- Some dependencies fixed 
+* Tue Aug 27 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-1
+- Updated to 0.27


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 14:37:38 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 10:37:38 -0400
Subject: rpms/kernel/devel kernel.spec, 1.192,
	1.193 linux-2.6-wireless-pending.patch, 1.5,
	1.6 linux-2.6-zd1211rw-mac80211.patch, 1.1, 1.2
Message-ID: <200709271437.l8REbcZM004208@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4013

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Log Message:
Fix-up botched wireless patch restructuring...


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kernel.spec	27 Sep 2007 00:43:33 -0000	1.192
+++ kernel.spec	27 Sep 2007 14:37:05 -0000	1.193
@@ -1815,6 +1815,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- Fix-up botched wireless patch restructuring...
+
 * Wed Sep 26 2007 John W. Linville <linville at redhat.com>
 - Update and restructure wireless patches
 

linux-2.6-wireless-pending.patch:

Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-wireless-pending.patch	27 Sep 2007 00:43:34 -0000	1.5
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 14:37:05 -0000	1.6
@@ -66352,7 +66352,7 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
-@@ -558,8 +550,51 @@ config RTL8187
+@@ -558,8 +550,52 @@ config RTL8187
  
  	  Thanks to Realtek for their support!
  
@@ -66402,6 +66402,7 @@
 +source "drivers/net/wireless/b43legacy/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
 +source "drivers/net/wireless/rt2x00/Kconfig"
++source "drivers/net/wireless/iwlwifi/Kconfig"
  
  endmenu
 diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c

linux-2.6-zd1211rw-mac80211.patch:

Index: linux-2.6-zd1211rw-mac80211.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-zd1211rw-mac80211.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-zd1211rw-mac80211.patch	27 Sep 2007 00:43:34 -0000	1.1
+++ linux-2.6-zd1211rw-mac80211.patch	27 Sep 2007 14:37:05 -0000	1.2
@@ -1,11 +1,11 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 09:59:55.000000000 -0400
 @@ -4287,6 +4287,16 @@ W:	http://www.qsl.net/dl1bke/
  L:	linux-hams at vger.kernel.org
  S:	Maintained
  
-+Z1211 WIRELESS DRIVER
++ZD1211RW-MAC80211 WIRELESS DRIVER
 +P:	Daniel Drake
 +M:	dsd at gentoo.org
 +P:	Ulrich Kunitz
@@ -19,20 +19,20 @@
  P:	Daniel Drake
  M:	dsd at gentoo.org
 diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-26 20:00:32.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 09:59:55.000000000 -0400
 @@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
  obj-$(CONFIG_B43)		+= b43/
  obj-$(CONFIG_B43LEGACY)		+= b43legacy/
  obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
-+obj-$(CONFIG_Z1211)		+= zd1211rw-mac80211/
++obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw-mac80211/
  
  # 16-bit wireless PCMCIA client drivers
  obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,1620 @@
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-27 10:00:45.000000000 -0400
+@@ -0,0 +1,1619 @@
 +/* zd_chip.c
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -412,7 +412,6 @@
 +		[0] = { .addr = CR_MAC_ADDR_P1 },
 +		[1] = { .addr = CR_MAC_ADDR_P2 },
 +	};
-+	DECLARE_MAC_BUF(mac);
 +
 +	reqs[0].value = (mac_addr[3] << 24)
 +		      | (mac_addr[2] << 16)
@@ -422,7 +421,7 @@
 +		      |  mac_addr[4];
 +
 +	dev_dbg_f(zd_chip_dev(chip),
-+		"mac addr %s\n", print_mac(mac, mac_addr));
++		"mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
 +
 +	mutex_lock(&chip->mutex);
 +	r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
@@ -1654,8 +1653,8 @@
 +	return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,10 @@
 +obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o
 +
@@ -1668,8 +1667,8 @@
 +EXTRA_CFLAGS += -DDEBUG
 +endif
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,57 @@
 +/* zd_def.h
 + *
@@ -1729,8 +1728,8 @@
 +
 +#endif /* _ZD_DEF_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,108 @@
 +/* zd_rf.h
 + *
@@ -1841,8 +1840,8 @@
 +
 +#endif /* _ZD_RF_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,921 @@
 +/* zd_chip.h
 + *
@@ -2766,8 +2765,8 @@
 +
 +#endif /* _ZD_CHIP_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,439 @@
 +/* zd_rf_al2230.c: Functions for the AL2230 RF controller
 + *
@@ -3209,8 +3208,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,29 @@
 +/* zd_util.h
 + *
@@ -3242,8 +3241,8 @@
 +
 +#endif /* _ZD_UTIL_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,82 @@
 +/* zd_util.c
 + *
@@ -3328,8 +3327,8 @@
 +	return (u8 *)buffer + (buffer_size - tail_size);
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,279 @@
 +/* zd_rf_rfmd.c: Functions for the RFMD RF controller
 + *
@@ -3611,8 +3610,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,75 @@
 +#ifndef _ZD_IEEE80211_H
 +#define _ZD_IEEE80211_H
@@ -3690,8 +3689,8 @@
 +
 +#endif /* _ZD_IEEE80211_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,18 @@
 +config ZD1211RW_MAC80211
 +	tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)"
@@ -3712,8 +3711,8 @@
 +	  ZD1211 debugging messages. Choosing Y will result in additional debug
 +	  messages being saved to your kernel logs, which may help debug any
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,100 @@
 +/* zd_ieee80211.c
 + *
@@ -3816,8 +3815,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,263 @@
 +/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
 + *
@@ -4083,8 +4082,8 @@
 +
 +#endif /* _ZD_USB_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,178 @@
 +/* zd_rf.c
 + *
@@ -4265,8 +4264,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -4803,8 +4802,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,227 @@
 +/* zd_mac.h
 + *
@@ -5034,8 +5033,8 @@
 +
 +#endif /* _ZD_MAC_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,492 @@
 +/* zd_rf_al7230b.c: Functions for the AL7230B RF controller
 + *
@@ -5530,8 +5529,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,1528 @@
 +/* zd_usb.c
 + *
@@ -7062,9 +7061,9 @@
 +	return r;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c	2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,951 @@
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c	2007-09-27 10:01:28.000000000 -0400
+@@ -0,0 +1,950 @@
 +/* zd_mac.c
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -7846,12 +7845,11 @@
 +	} else {
 +		struct dev_mc_list *mc = NULL;
 +		void *tmp = NULL;
-+		DECLARE_MAC_BUF(macbuf);
 +
 +		zd_mc_clear(&hash);
 +		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
-+			dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
-+				  print_mac(macbuf, mc->dmi_addr));
++			dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
++				  MAC_ARG(mc->dmi_addr));
 +			zd_mc_add_addr(&hash, mc->dmi_addr);
 +		}
 +	}
@@ -8017,13 +8015,13 @@
 +	zd_chip_control_leds(&mac->chip, LED_OFF);
 +}
 diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 20:04:18.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 09:59:55.000000000 -0400
 @@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
  source "drivers/net/wireless/b43/Kconfig"
  source "drivers/net/wireless/b43legacy/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
 +source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
  source "drivers/net/wireless/rt2x00/Kconfig"
+ source "drivers/net/wireless/iwlwifi/Kconfig"
  
- endmenu



From fedora-extras-commits at redhat.com  Thu Sep 27 14:39:35 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:39:35 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4,
	1.5 kernel-2.6.21-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec,
	1.60, 1.61
Message-ID: <200709271439.l8REdZwN004353@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4280

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenabled Firewire but kept fw-ohci disabled (bug #307461)

fw-sbp2 should be working



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 14:39:03 -0000	1.5
@@ -1315,7 +1315,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+# CONFIG_FIREWIRE_OHCI is not set
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.21-x86_64-xen.config	27 Aug 2007 17:46:26 -0000	1.5
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:39:03 -0000	1.6
@@ -1221,7 +1221,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+# CONFIG_FIREWIRE_OHCI is not set
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
+++ kernel-xen.spec	27 Sep 2007 14:39:03 -0000	1.61
@@ -2362,6 +2362,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Reenabled Firewire but kept fw-ohci disabled (bug #307461).
+  fw-sbp2 should be working
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:42:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 10:42:15 -0400
Subject: rpms/libselinux/F-7 libselinux-swig.patch, 1.2, 1.3 libselinux.spec,
	1.271, 1.272
Message-ID: <200709271442.l8REgFLl004487@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464

Modified Files:
	libselinux-swig.patch libselinux.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-9
- Fix swig bindings


libselinux-swig.patch:

Index: libselinux-swig.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-swig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libselinux-swig.patch	25 Sep 2007 21:37:26 -0000	1.2
+++ libselinux-swig.patch	27 Sep 2007 14:42:12 -0000	1.3
@@ -400,6 +400,18 @@
 +}
 +
 +%include "selinuxswig.i"
+diff -up libselinux-2.0.14/src/Makefile.swig libselinux-2.0.14/src/Makefile
+--- libselinux-2.0.14/src/Makefile.swig	2007-09-27 10:33:38.000000000 -0400
++++ libselinux-2.0.14/src/Makefile	2007-09-27 10:30:26.000000000 -0400
+@@ -12,7 +12,7 @@ LIBVERSION = 1
+ 
+ LIBA=libselinux.a 
+ TARGET=libselinux.so
+-SWIGIF= selinuxswig.i
++SWIGIF= selinuxswig_python.i
+ SWIGCOUT= selinuxswig_wrap.c
+ SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) 
+ SWIGSO=_selinux.so
 diff -up libselinux-2.0.14/Makefile.swig libselinux-2.0.14/Makefile
 --- libselinux-2.0.14/Makefile.swig	2007-09-13 09:17:31.000000000 -0400
 +++ libselinux-2.0.14/Makefile	2007-09-13 09:17:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- libselinux.spec	25 Sep 2007 21:37:26 -0000	1.271
+++ libselinux.spec	27 Sep 2007 14:42:12 -0000	1.272
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -126,6 +126,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-9
+- Fix swig bindings
+
 * Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
 - Fix swig use of fsetfilecon_raw
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:50:06 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 10:50:06 -0400
Subject: rpms/convmv/devel convmv-1.10-tests.patch, NONE, 1.1 convmv.spec,
	1.8, 1.9
Message-ID: <200709271450.l8REo6qM004881@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/convmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4830

Modified Files:
	convmv.spec 
Added Files:
	convmv-1.10-tests.patch 
Log Message:
don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
change license tag to "GPLv2"


convmv-1.10-tests.patch:

--- NEW FILE convmv-1.10-tests.patch ---
diff -up convmv-1.10/suite/dotests.sh.tests convmv-1.10/suite/dotests.sh
--- convmv-1.10/suite/dotests.sh.tests	2006-06-26 00:01:16.000000000 +0200
+++ convmv-1.10/suite/dotests.sh	2007-09-27 16:44:39.000000000 +0200
@@ -3,62 +3,63 @@
 # you might want to change this to GNU find's full path:
 FIND=find
 FINDEXP="%P -- %l\n"
-for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
+
+for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
 #
 echo smartness-test
 rm -rf test.tmp
 cp -r test test.tmp
 ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
 false
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
 #
 echo double-utf8 test
 ../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
 #
 ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
 #
 echo utf8-to-iso8859-15-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
 #
 echo iso8859-15-to-utf8-test
 rm -r test.tmp
 cp -r test-iso8859-15 test.tmp
 ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
 #
 echo nfc-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
 #
 ../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
 #
 echo escaped-test
 rm -r test.tmp
 cp -r test-escaped test.tmp
 ../convmv --unescape --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
 #
 echo upper-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv --upper -f utf8 --notest -r test.tmp
-$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
+$FIND TEST.TMP -printf "$FINDEXP" | sort > out.tmp
 diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
 
 echo All tests successful, cleaning up now ...


Index: convmv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- convmv.spec	28 Aug 2006 13:45:05 -0000	1.8
+++ convmv.spec	27 Sep 2007 14:49:34 -0000	1.9
@@ -1,13 +1,14 @@
 Summary: Convert filename encodings
 Name: convmv
 Version: 1.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: Applications/System
-License: GPL
+License: GPLv2
 URL: http://j3e.de/linux/convmv
-Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
-BuildRequires: /usr/bin/md5sum
+Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
+Patch0: convmv-1.10-tests.patch
+BuildRequires: coreutils
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,6 +18,8 @@
 
 %prep
 %setup -q
+tar -xf testsuite.tar
+%patch0 -p1 -b .tests
 
 %build
 md5sum -c MD5sums
@@ -37,6 +40,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.10-3
+- don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
+- change license tag to "GPLv2"
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 1.10-2
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:50:23 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 10:50:23 -0400
Subject: rpms/kdeutils/devel kdeutils-3.5.7-glibc-open.patch, NONE,
	1.1 kdeutils.spec, 1.95, 1.96
Message-ID: <200709271450.l8REoNwv004884@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.7-glibc-open.patch 
Log Message:
fix build issue with new current glibc-2.6.90



kdeutils-3.5.7-glibc-open.patch:

--- NEW FILE kdeutils-3.5.7-glibc-open.patch ---
diff -up kdeutils-3.5.7/ark/compressedfile.cpp.orig kdeutils-3.5.7/ark/compressedfile.cpp
--- kdeutils-3.5.7/ark/compressedfile.cpp.orig	2007-09-27 16:17:26.000000000 +0200
+++ kdeutils-3.5.7/ark/compressedfile.cpp	2007-09-27 16:42:08.000000000 +0200
@@ -365,7 +365,7 @@ void CompressedFile::remove(QStringList 
   // does a reload and finds it no longer exists!
   QFile::remove(m_filename);
 
-  ::close(::open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL));
+  ::close(KDE_open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL, 0666));
 
   m_tmpfile = "";
   emit sigDelete(true);


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdeutils.spec	29 Aug 2007 19:38:55 -0000	1.95
+++ kdeutils.spec	27 Sep 2007 14:49:51 -0000	1.96
@@ -17,7 +17,7 @@
 Summary: K Desktop Environment - Utilities
 Epoch:   6
 Version: 3.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/System
@@ -33,6 +33,7 @@
 Patch2: kdeutils-3.5.4-bz#205553.patch
 Patch3: kdeutils-3.5.4-suspend.patch
 Patch4: kdeutils-3.5.7-klaptopdaemon_libXss.patch
+Patch5: kdeutils-3.5.7-glibc-open.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -111,6 +112,7 @@
 %patch2 -p1 -b .bz#205553
 %patch3 -p1 -b .suspend
 %patch4 -p1 -b .libXss
+%patch5 -p1 -b .glibc-open
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -377,6 +379,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> -  3.5.7-6
+- fix build issue with new current glibc-2.6.90
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
 - move kcalc back to main pkg
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:52:33 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 10:52:33 -0400
Subject: rpms/convmv/devel convmv.spec,1.9,1.10
Message-ID: <200709271452.l8REqX3e005180@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/convmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5117

Modified Files:
	convmv.spec 
Log Message:
move "make test" to %check



Index: convmv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- convmv.spec	27 Sep 2007 14:49:34 -0000	1.9
+++ convmv.spec	27 Sep 2007 14:52:01 -0000	1.10
@@ -24,6 +24,8 @@
 %build
 md5sum -c MD5sums
 make
+
+%check
 make test
 
 %install
@@ -41,7 +43,8 @@
 
 %changelog
 * Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.10-3
-- don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
+- don't expect find output to be sorted, move "make test" to %%check (#237687,
+  patch by Giuseppe Bonacci)
 - change license tag to "GPLv2"
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 1.10-2



From fedora-extras-commits at redhat.com  Thu Sep 27 14:54:43 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 10:54:43 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.150, 1.151 libselinux-rhat.patch,
	1.130, 1.131 libselinux.spec, 1.288, 1.289 sources, 1.152, 1.153
Message-ID: <200709271454.l8REshNX005280@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5251

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
- Upgrade to upstream
	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.
	* Pass CFLAGS when using gcc for linking from Dennis Gilmore. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- .cvsignore	18 Sep 2007 20:44:47 -0000	1.150
+++ .cvsignore	27 Sep 2007 14:54:10 -0000	1.151
@@ -129,3 +129,4 @@
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
 libselinux-2.0.34.tgz
+libselinux-2.0.35.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- libselinux-rhat.patch	24 Sep 2007 15:56:01 -0000	1.130
+++ libselinux-rhat.patch	27 Sep 2007 14:54:10 -0000	1.131
@@ -1,32 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-2.0.34/src/avc_internal.c
---- nsalibselinux/src/avc_internal.c	2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.34/src/avc_internal.c	2007-09-24 11:37:47.000000000 -0400
-@@ -61,7 +61,8 @@
- 		rc = fd;
- 		goto out;
- 	}
--
-+	
-+	fcntl(fd, F_SETFD, FD_CLOEXEC);
- 	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
- 		close(fd);
- 		rc = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.34/src/Makefile
---- nsalibselinux/src/Makefile	2007-08-03 16:02:56.000000000 -0400
-+++ libselinux-2.0.34/src/Makefile	2007-09-24 11:51:42.000000000 -0400
-@@ -57,10 +57,10 @@
- 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(SWIGSO): $(SWIGLOBJ)
--	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
- 	ln -sf $@ $(TARGET) 
- 
- %.o:  %.c policy.h
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
 +++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- libselinux.spec	24 Sep 2007 15:56:01 -0000	1.288
+++ libselinux.spec	27 Sep 2007 14:54:10 -0000	1.289
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.34
-Release: 3%{?dist}
+Version: 2.0.35
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -123,6 +123,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
+- Upgrade to upstream
+	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.
+	* Pass CFLAGS when using gcc for linking from Dennis Gilmore. 
 
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-3
 - Add sparc patch to from Dennis Gilmore to build on Sparc platform


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources	18 Sep 2007 20:44:47 -0000	1.152
+++ sources	27 Sep 2007 14:54:10 -0000	1.153
@@ -1 +1 @@
-e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz
+3238a38e2e43c39081d13a579744fbdb  libselinux-2.0.35.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:00:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 11:00:21 -0400
Subject: rpms/t1lib/devel t1lib-cve-2007-4033.patch, NONE, 1.1 t1lib.spec,
	1.16, 1.17
Message-ID: <200709271500.l8RF0LMo005614@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5574

Modified Files:
	t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- t1lib.spec	28 Aug 2007 18:18:25 -0000	1.16
+++ t1lib.spec	27 Sep 2007 14:59:48 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:09:48 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 11:09:48 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.3.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.143, 1.144 sources, 1.148, 1.149 system-config-printer.spec,
	1.133, 1.134 system-config-printer-0.7.74.2.tar.bz2.sig, 1.1,
	NONE system-config-printer-0.7.74.x.patch, 1.2, NONE
Message-ID: <200709271509.l8RF9mUL012147@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12111

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.3.tar.bz2.sig 
Removed Files:
	system-config-printer-0.7.74.2.tar.bz2.sig 
	system-config-printer-0.7.74.x.patch 
Log Message:
* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.3-1
- 0.7.74.3:
  - Updated translations.
  - Other small bug fixes.



--- NEW FILE system-config-printer-0.7.74.3.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- .cvsignore	19 Sep 2007 14:00:40 -0000	1.143
+++ .cvsignore	27 Sep 2007 15:09:15 -0000	1.144
@@ -139,3 +139,4 @@
 pycups-1.9.26.tar.bz2
 pycups-1.9.27.tar.bz2
 system-config-printer-0.7.74.2.tar.bz2
+system-config-printer-0.7.74.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	19 Sep 2007 14:00:40 -0000	1.148
+++ sources	27 Sep 2007 15:09:15 -0000	1.149
@@ -1,2 +1,2 @@
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
-f5f78d97282eab2e33a302025f31f74e  system-config-printer-0.7.74.2.tar.bz2
+d9b51d1f4b8113e8c21ce4e12fe5020b  system-config-printer-0.7.74.3.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- system-config-printer.spec	25 Sep 2007 11:41:06 -0000	1.133
+++ system-config-printer.spec	27 Sep 2007 15:09:15 -0000	1.134
@@ -2,8 +2,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74.2
-Release: 3%{?dist}
+Version: 0.7.74.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,7 +11,6 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
-Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -52,7 +51,6 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p0 -b .0.7.74.x
 
 %build
 %configure
@@ -130,6 +128,11 @@
 fi
 
 %changelog
+* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.3-1
+- 0.7.74.3:
+  - Updated translations.
+  - Other small bug fixes.
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
 - Pull in SVN patch from stable branch for foomatic recommended
   drivers (bug #292021).


--- system-config-printer-0.7.74.2.tar.bz2.sig DELETED ---


--- system-config-printer-0.7.74.x.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 15:15:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:15:59 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.38,1.39
Message-ID: <200709271515.l8RFFx2t012515@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12458

Modified Files:
	bigboard.spec 
Log Message:
new upstream


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bigboard.spec	21 Sep 2007 16:14:33 -0000	1.38
+++ bigboard.spec	27 Sep 2007 15:15:26 -0000	1.39
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.18
+Version:        0.5.19
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -94,6 +94,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.5.19-1
+- new upstream
+
 * Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:16:13 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:16:13 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.14,1.15
Message-ID: <200709271516.l8RFGDMU012557@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12487

Modified Files:
	online-desktop.spec 
Log Message:
new upstream


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- online-desktop.spec	21 Sep 2007 16:09:00 -0000	1.14
+++ online-desktop.spec	27 Sep 2007 15:15:41 -0000	1.15
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.16
+Version:        0.2.17
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -186,6 +186,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.2.17-1
+- new upstream
+
 * Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:16:47 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 27 Sep 2007 11:16:47 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.16,1.17
Message-ID: <200709271516.l8RFGlEt012634@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/jgroups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12561

Modified Files:
	jgroups.spec 
Log Message:
* Thu Sep 27 2007 Jesse Keating <jkeating at redhat.com> - 2.2.9.2-3jpp.3
- Fix the group typo.



Index: jgroups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jgroups.spec	14 Aug 2006 17:21:17 -0000	1.16
+++ jgroups.spec	27 Sep 2007 15:16:15 -0000	1.17
@@ -43,12 +43,12 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	3jpp.2
+Release:	3jpp.3
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
 URL:		http://www.jgroups.org/
-Group:		Development/LIbraries/Java
+Group:		Development/Libraries/Java
 Source0:	JGroups-2.2.9.2.src-RHCLEAN.tar.gz
 Patch0:		jgroups-2.2.9-build_xml.patch
 Requires:	bsh
@@ -226,6 +226,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Thu Sep 27 2007 Jesse Keating <jkeating at redhat.com> - 2.2.9.2-3jpp.3
+- Fix the group typo.
+
 * Fri Aug 14 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.2
 - Keep ENCRYPTAsymmetricTest since BC now available.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:24:13 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 27 Sep 2007 11:24:13 -0400
Subject: rpms/gpsim/devel gpsim.spec,1.15,1.16
Message-ID: <200709271524.l8RFODQk013092@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13050

Modified Files:
	gpsim.spec 
Log Message:
Add BR popt-devel


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gpsim.spec	21 Aug 2007 16:51:28 -0000	1.15
+++ gpsim.spec	27 Sep 2007 15:23:41 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -10,7 +10,7 @@
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk+extra-devel, flex, readline-devel
+BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -80,6 +80,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Sep 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-5
+  - Add BR popt-devel
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-4
   - Licence tag clarification
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:24:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 11:24:33 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.161,
	1.162 policycoreutils-gui.patch, 1.35, 1.36 policycoreutils.spec,
	1.452, 1.453 sources, 1.166, 1.167
Message-ID: <200709271524.l8RFOXhq013146@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13071

Modified Files:
	.cvsignore policycoreutils-gui.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
- Fix bug in building policy with polgengui



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- .cvsignore	19 Sep 2007 02:29:47 -0000	1.161
+++ .cvsignore	27 Sep 2007 15:24:00 -0000	1.162
@@ -159,3 +159,4 @@
 sepolgen-1.0.9.tgz
 sepolgen-1.0.10.tgz
 policycoreutils-2.0.26.tgz
+policycoreutils-2.0.27.tgz

policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policycoreutils-gui.patch	24 Sep 2007 16:22:03 -0000	1.35
+++ policycoreutils-gui.patch	27 Sep 2007 15:24:00 -0000	1.36
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.27/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-24 12:20:29.000000000 -0400
++++ policycoreutils-2.0.27/gui/booleansPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,236 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -238,9 +238,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.27/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-24 12:20:52.000000000 -0400
++++ policycoreutils-2.0.27/gui/fcontextPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -451,9 +451,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.27/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-24 12:20:58.000000000 -0400
++++ policycoreutils-2.0.27/gui/loginsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.27/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/Makefile	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -672,9 +672,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.27/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-24 12:21:12.000000000 -0400
++++ policycoreutils-2.0.27/gui/mappingsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -732,9 +732,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.27/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/modulesPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -917,9 +917,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.27/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.glade	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -3307,9 +3307,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.27/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgengui.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
@@ -3787,9 +3787,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 11:21:40.000000000 -0400
 @@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -3900,7 +3900,7 @@
 +                    if p < 1 or p > max_port:
 +                        raise  ValueError
 +                    temp.append(p)
-+                return temp
++        return temp
 +    except ValueError:
 +        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
 +
@@ -4531,9 +4531,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.27/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/portsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4782,9 +4782,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.27/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-24 12:14:07.000000000 -0400
++++ policycoreutils-2.0.27/gui/selinux.tbl	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,295 @@
 +! allow_console_login _("Login") _("Allow direct login to the console device. Required for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5081,9 +5081,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.27/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-24 12:19:55.000000000 -0400
++++ policycoreutils-2.0.27/gui/semanagePage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,147 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5232,9 +5232,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.27/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/statusPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5455,9 +5455,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.27/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-24 12:19:05.000000000 -0400
++++ policycoreutils-2.0.27/gui/system-config-selinux.glade	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,3393 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8852,9 +8852,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.27/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-24 12:19:26.000000000 -0400
++++ policycoreutils-2.0.27/gui/system-config-selinux.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,175 @@
 +#!/usr/bin/python
 +#
@@ -9031,9 +9031,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.27/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/executable.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9313,9 +9313,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.27/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/__init__.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9335,9 +9335,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.27/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/network.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9419,9 +9419,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.27/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/rw.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9551,9 +9551,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.27/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/script.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9605,9 +9605,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.27/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/semodule.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9650,9 +9650,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.27/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/tmp.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9751,9 +9751,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.27/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/user.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9894,9 +9894,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.27/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_lib.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10060,9 +10060,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.27/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_log.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10176,9 +10176,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.27/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_run.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10299,9 +10299,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.27/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_spool.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10434,9 +10434,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.27/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/translationsPage.py	2007-09-27 11:20:33.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10556,9 +10556,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.27/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/usersPage.py	2007-09-27 11:20:33.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- policycoreutils.spec	24 Sep 2007 20:43:33 -0000	1.452
+++ policycoreutils.spec	27 Sep 2007 15:24:00 -0000	1.453
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.26
-Release: 3%{?dist}
+Version: 2.0.27
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,13 @@
 fi
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
+- Fix bug in building policy with polgengui
+
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-1
+- Update to upstream
+	* Improve semodule reporting of system errors from Stephen Smalley.
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
 - Show local changes with semanage
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	19 Sep 2007 02:29:47 -0000	1.166
+++ sources	27 Sep 2007 15:24:00 -0000	1.167
@@ -1,2 +1,2 @@
 eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz
-109975b307c6992ff721ba644b4fb718  policycoreutils-2.0.26.tgz
+fd43154b636614069dac6f5a408e4e32  policycoreutils-2.0.27.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:33:55 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 11:33:55 -0400
Subject: rpms/kernel/F-7 linux-2.6-at76.patch, NONE,
	1.1 linux-2.6-ath5k.patch, 
	NONE, 1.1 linux-2.6-mac80211-extras.patch, NONE,
	1.1 linux-2.6-zd1211rw-mac80211.patch, NONE, 1.1 kernel-2.6.spec,
	1.3348, 1.3349 linux-2.6-wireless-pending.patch, 1.3,
	1.4 linux-2.6-wireless.patch, 1.11, 1.12 git-wireless-dev.patch,
	1.25, NONE
Message-ID: <200709271533.l8RFXtaE013585@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13399

Modified Files:
	kernel-2.6.spec linux-2.6-wireless-pending.patch 
	linux-2.6-wireless.patch 
Added Files:
	linux-2.6-at76.patch linux-2.6-ath5k.patch 
	linux-2.6-mac80211-extras.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Removed Files:
	git-wireless-dev.patch 
Log Message:
Update and restructure wireless patches

linux-2.6-at76.patch:

--- NEW FILE linux-2.6-at76.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:19:28.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:23:09.000000000 -0400
@@ -690,6 +690,15 @@ W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
 S:	Maintained
 
+ATMEL USB WIRELESS DRIVER
+P:	Pavel Roskin
+M:	proski at gnu.org
+L:	linux-wireless at vger.kernel.org
+L:	at76c503a-user at lists.berlios.de
+L:	at76c503a-develop at lists.berlios.de
+W:	http://at76c503a.berlios.de/
+S:	Maintained
+
 AUDIT SUBSYSTEM
 P:	David Woodhouse
 M:	dwmw2 at infradead.org
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h	2007-09-27 11:23:09.000000000 -0400
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) 2002,2003 Oliver Kurth
+ *	     (c) 2003,2004 Joerg Albert <joerg.albert at gmx.de>
+ *	     (c) 2007 Guido Guenther <agx at sigxcpu.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 driver was based on information from the Sourceforge driver
+ * released and maintained by Atmel:
+ *
+ *  http://sourceforge.net/projects/atmelwlandriver/
+ *
+ * Although the code was completely re-written,
+ * it would have been impossible without Atmel's decision to
+ * release an Open Source driver (unfortunately the firmware was
+ * kept binary only). Thanks for that decision to Atmel!
+ */
+
+#ifndef _AT76_USB_H
+#define _AT76_USB_H
+
+#include <net/ieee80211.h>
+
+/* current driver version */
+#define DRIVER_VERSION	"0.16"
+
+/* Board types */
+enum board_type {
+	BOARD_503_ISL3861 = 1,
+	BOARD_503_ISL3863 = 2,
+	BOARD_503 = 3,
+	BOARD_503_ACC = 4,
+	BOARD_505 = 5,
+	BOARD_505_2958 = 6,
+	BOARD_505A = 7,
+	BOARD_505AMX = 8
+};
+
+/* our private ioctl's */
+/* preamble length (0 - long, 1 - short, 2 - auto) */
+#define AT76_SET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 0)
+#define AT76_GET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 1)
+/* which debug channels are enabled */
+#define AT76_SET_DEBUG			(SIOCIWFIRSTPRIV + 2)
+#define AT76_GET_DEBUG			(SIOCIWFIRSTPRIV + 3)
+/* power save mode (incl. the Atmel proprietary smart save mode) */
+#define AT76_SET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 4)
+#define AT76_GET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 5)
+/* min and max channel times for scan */
+#define AT76_SET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 6)
+#define AT76_GET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 7)
+/* scan mode (0 - active, 1 - passive) */
+#define AT76_SET_SCAN_MODE		(SIOCIWFIRSTPRIV + 8)
+#define AT76_GET_SCAN_MODE		(SIOCIWFIRSTPRIV + 9)
+
+#define CMD_STATUS_IDLE				0x00
+#define CMD_STATUS_COMPLETE			0x01
+#define CMD_STATUS_UNKNOWN			0x02
+#define CMD_STATUS_INVALID_PARAMETER		0x03
+#define CMD_STATUS_FUNCTION_NOT_SUPPORTED	0x04
+#define CMD_STATUS_TIME_OUT			0x07
+#define CMD_STATUS_IN_PROGRESS			0x08
+#define CMD_STATUS_HOST_FAILURE			0xff
+#define CMD_STATUS_SCAN_FAILED			0xf0
+
+/* answers to get op mode */
+#define OPMODE_NONE				0x00
+#define OPMODE_NORMAL_NIC_WITH_FLASH		0x01
+#define OPMODE_HW_CONFIG_MODE			0x02
+#define OPMODE_DFU_MODE_WITH_FLASH		0x03
+#define OPMODE_NORMAL_NIC_WITHOUT_FLASH		0x04
+
+#define CMD_SET_MIB		0x01
+#define CMD_GET_MIB		0x02
+#define CMD_SCAN		0x03
+#define CMD_JOIN		0x04
+#define CMD_START_IBSS		0x05
+#define CMD_RADIO		0x06
+#define CMD_STARTUP		0x0B
+#define CMD_GETOPMODE		0x33
+
+#define MIB_LOCAL		0x01
+#define MIB_MAC_ADDR		0x02
+#define MIB_MAC			0x03
+#define MIB_MAC_MGMT		0x05
+#define MIB_MAC_WEP		0x06
+#define MIB_PHY			0x07
+#define MIB_FW_VERSION		0x08
+#define MIB_MDOMAIN		0x09
+
+#define ADHOC_MODE		1
+#define INFRASTRUCTURE_MODE	2
+
+/* values for struct mib_local, field preamble_type */
+#define PREAMBLE_TYPE_LONG	0
+#define PREAMBLE_TYPE_SHORT	1
+#define PREAMBLE_TYPE_AUTO	2
+
+/* values for tx_rate */
+#define TX_RATE_1MBIT		0
+#define TX_RATE_2MBIT		1
+#define TX_RATE_5_5MBIT 	2
+#define TX_RATE_11MBIT		3
+#define TX_RATE_AUTO		4
+
+/* power management modes */
+#define AT76_PM_OFF		1
+#define AT76_PM_ON		2
+#define AT76_PM_SMART		3
+
+struct hwcfg_r505 {
+	u8 cr39_values[14];
+	u8 reserved1[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 reserved2[14];
+	u8 cr15_values[14];
+	u8 reserved3[3];
+} __attribute__((packed));
+
+struct hwcfg_rfmd {
+	u8 cr20_values[14];
+	u8 cr21_values[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 low_power_values[14];
+	u8 normal_power_values[14];
+	u8 reserved1[3];
+} __attribute__((packed));
+
+struct hwcfg_intersil {
+	u8 mac_addr[ETH_ALEN];
+	u8 cr31_values[14];
+	u8 cr58_values[14];
+	u8 pidvid[4];
+	u8 regulatory_domain;
+	u8 reserved[1];
+} __attribute__((packed));
+
+union at76_hwcfg {
+	struct hwcfg_intersil i;
+	struct hwcfg_rfmd r3;
+	struct hwcfg_r505 r5;
+};
+
+#define WEP_SMALL_KEY_LEN	(40 / 8)
+#define WEP_LARGE_KEY_LEN	(104 / 8)
+
+struct at76_card_config {
+	u8 exclude_unencrypted;
+	u8 promiscuous_mode;
+	u8 short_retry_limit;
+	u8 encryption_type;
+	__le16 rts_threshold;
+	__le16 fragmentation_threshold;	/* 256..2346 */
+	u8 basic_rate_set[4];
+	u8 auto_rate_fallback;	/* 0,1 */
+	u8 channel;
+	u8 privacy_invoked;
+	u8 wep_default_key_id;	/* 0..3 */
+	u8 current_ssid[32];
+	u8 wep_default_key_value[4][WEP_KEY_LEN];
+	u8 ssid_len;
+	u8 short_preamble;
+	__le16 beacon_period;
+} __attribute__((packed));
+
+struct at76_command {
+	u8 cmd;
[...5873 lines suppressed...]
+{
+	int ret;
+	struct at76_priv *priv;
+	struct fwentry *fwe;
+	struct usb_device *udev;
+	int op_mode;
+	int need_ext_fw = 0;
+	struct mib_fw_version fwv;
+	int board_type = (int)id->driver_info;
+
+	udev = usb_get_dev(interface_to_usbdev(interface));
+
+	/* Load firmware into kernel memory */
+	fwe = at76_load_firmware(udev, board_type);
+	if (!fwe) {
+		ret = -ENOENT;
+		goto error;
+	}
+
+	op_mode = at76_get_op_mode(udev);
+
+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
+
+	/* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ???
+	   we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */
+
+	if (op_mode == OPMODE_HW_CONFIG_MODE) {
+		err("cannot handle a device in HW_CONFIG_MODE (opmode %d)",
+		    op_mode);
+		ret = -EBUSY;
+		goto error;
+	}
+
+	if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH
+	    && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
+		/* download internal firmware part */
+		at76_dbg(DBG_DEVSTART, "downloading internal firmware");
+		ret = at76_load_internal_fw(udev, fwe);
+		if (ret < 0) {
+			err("error %d downloading internal firmware", ret);
+			goto error;
+		}
+		usb_put_dev(udev);
+		return ret;
+	}
+
+	/* Internal firmware already inside the device.  Get firmware
+	 * version to test if external firmware is loaded.
+	 * This works only for newer firmware, e.g. the Intersil 0.90.x
+	 * says "control timeout on ep0in" and subsequent
+	 * at76_get_op_mode() fail too :-( */
+
+	/* if version >= 0.100.x.y or device with built-in flash we can
+	 * query the device for the fw version */
+	if ((fwe->fw_version.major > 0 || fwe->fw_version.minor >= 100)
+	    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0 || (fwv.major | fwv.minor) == 0)
+			need_ext_fw = 1;
+	} else
+		/* No way to check firmware version, reload to be sure */
+		need_ext_fw = 1;
+
+	if (need_ext_fw) {
+		at76_dbg(DBG_DEVSTART, "downloading external firmware");
+
+		ret = at76_load_external_fw(udev, fwe);
+		if (ret)
+			goto error;
+
+		/* Re-check firmware version */
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0) {
+			err("error %d getting firmware version", ret);
+			goto error;
+		}
+
+		/* Major and minor version must match */
+		if (fwv.major != fwe->fw_version.major
+		    || fwv.minor != fwe->fw_version.minor) {
+			printk(KERN_ERR DRIVER_NAME
+			       ": wrong firmware version, loaded %d.%d.%d-%d, "
+			       "read back %d.%d.%d-%d\n",
+			       fwe->fw_version.major, fwe->fw_version.minor,
+			       fwe->fw_version.patch, fwe->fw_version.build,
+			       fwv.major, fwv.minor, fwv.patch, fwv.build);
+			ret = -EBUSY;
+			goto error;
+		}
+	}
+
+	priv = at76_alloc_new_device(udev);
+	if (!priv) {
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	SET_NETDEV_DEV(priv->netdev, &interface->dev);
+	usb_set_intfdata(interface, priv);
+
+	memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
+	priv->board_type = board_type;
+
+	ret = at76_init_new_device(priv, interface);
+	if (ret < 0)
+		at76_delete_device(priv);
+
+	return ret;
+
+error:
+	usb_put_dev(udev);
+	return ret;
+}
+
+static void at76_disconnect(struct usb_interface *interface)
+{
+	struct at76_priv *priv;
+
+	priv = usb_get_intfdata(interface);
+	usb_set_intfdata(interface, NULL);
+
+	/* Disconnect after loading internal firmware */
+	if (!priv)
+		return;
+
+	printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
+	at76_delete_device(priv);
+	printk(KERN_INFO DRIVER_NAME ": disconnected\n");
+}
+
+/* Structure for registering this driver with the USB subsystem */
+static struct usb_driver at76_driver = {
+	.name = DRIVER_NAME,
+	.probe = at76_probe,
+	.disconnect = at76_disconnect,
+	.id_table = dev_table,
+};
+
+static int __init at76_mod_init(void)
+{
+	int result;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");
+
+	mutex_init(&fw_mutex);
+
+	/* register this driver with the USB subsystem */
+	result = usb_register(&at76_driver);
+	if (result < 0)
+		err("usb_register failed (status %d)", result);
+
+	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
+	return result;
+}
+
+static void __exit at76_mod_exit(void)
+{
+	int i;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
+	usb_deregister(&at76_driver);
+	for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
+		if (firmwares[i].fw)
+			release_firmware(firmwares[i].fw);
+	}
+	led_trigger_unregister_simple(ledtrig_tx);
+}
+
+module_param_named(debug, at76_debug, int, 0600);
+MODULE_PARM_DESC(debug, "Debugging level");
+
+module_init(at76_mod_init);
+module_exit(at76_mod_exit);
+
+MODULE_AUTHOR("Oliver Kurth <oku at masqmail.cx>");
+MODULE_AUTHOR("Joerg Albert <joerg.albert at gmx.de>");
+MODULE_AUTHOR("Alex <alex at foogod.com>");
+MODULE_AUTHOR("Nick Jones");
+MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453 at hotmail.com>");
+MODULE_AUTHOR("Pavel Roskin <proski at gnu.org>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 11:19:26.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 11:23:09.000000000 -0400
@@ -381,6 +381,14 @@ config PCI_HERMES
 	  common.  Some of the built-in wireless adaptors in laptops are of
 	  this variety.
 
+config USB_ATMEL
+	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
+	depends on WLAN_80211 && USB
+	select FW_LOADER
+	---help---
+	  Enable support for USB Wireless devices using Atmel at76c503,
+	  at76c505 or at76c505a chips.
+
 config PCMCIA_HERMES
 	tristate "Hermes PCMCIA card support"
 	depends on PCMCIA && HERMES

linux-2.6-ath5k.patch:

--- NEW FILE linux-2.6-ath5k.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:23:09.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:13.000000000 -0400
@@ -652,6 +652,14 @@ M:	ecashin at coraid.com
 W:	http://www.coraid.com/support/linux
 S:	Supported
 
+ATHEROS ATH5K WIRELESS DRIVER
+P:	Jiri Slaby
+M:	jirislaby at gmail.com
+P:	Luis R. Rodriguez
+M:	mcgrof at gmail.com
+L:	linux-wireless at vger.kernel.org
+S:	Maintained
+
 ATL1 ETHERNET DRIVER
 P:	Jay Cliburn
 M:	jcliburn at gmail.com
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-27 11:24:13.000000000 -0400
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
+ *
+ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _ATH5K_H
+#define _ATH5K_H
+
+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
+ * long and results timeouts). It's also illegal to tune to some of the
+ * supported frequencies in some countries, so use this at your own risk,
+ * you've been warned. */
+#define CHAN_DEBUG	0
+
+/* Uncomment this for debuging (warning that it results in TOO much output) */
+/*#define AR5K_DEBUG	1 */
+
+#include <linux/types.h>
+#include <net/mac80211.h>
+
+#include "ath5k_hw.h"
+#include "ath5k_regdom.h"
+
+/* PCI IDs */
+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
+
+/****************************\
+  GENERIC DRIVER DEFINITIONS
+\****************************/
+
+#define AR5K_PRINTF(fmt, ...)   printk("%s: " fmt, __func__, ##__VA_ARGS__)
+#define AR5K_PRINT(fmt)         printk("%s: " fmt, __func__)
+#ifdef AR5K_DEBUG
+#define AR5K_TRACE              printk(KERN_DEBUG "%s:%d\n", __func__, __LINE__)
+#else
+#define AR5K_TRACE
+#endif
+
+/*
+ * Some tuneable values (these should be changeable by the user)
+ */
+#define AR5K_TUNE_DMA_BEACON_RESP		2
+#define AR5K_TUNE_SW_BEACON_RESP		10
+#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0
+#define AR5K_TUNE_RADAR_ALERT			false
+#define AR5K_TUNE_MIN_TX_FIFO_THRES		1
+#define AR5K_TUNE_MAX_TX_FIFO_THRES		((IEEE80211_MAX_LEN / 64) + 1)
+#define AR5K_TUNE_RSSI_THRES			1792
+#define AR5K_TUNE_REGISTER_TIMEOUT		20000
+#define AR5K_TUNE_REGISTER_DWELL_TIME		20000
+#define AR5K_TUNE_BEACON_INTERVAL		100
+#define AR5K_TUNE_AIFS				2
+#define AR5K_TUNE_AIFS_11B			2
+#define AR5K_TUNE_AIFS_XR			0
+#define AR5K_TUNE_CWMIN				15
+#define AR5K_TUNE_CWMIN_11B			31
+#define AR5K_TUNE_CWMIN_XR			3
+#define AR5K_TUNE_CWMAX				1023
+#define AR5K_TUNE_CWMAX_11B			1023
+#define AR5K_TUNE_CWMAX_XR			7
+#define AR5K_TUNE_NOISE_FLOOR			-72
+#define AR5K_TUNE_MAX_TXPOWER			60
+#define AR5K_TUNE_DEFAULT_TXPOWER		30
+#define AR5K_TUNE_TPC_TXPOWER			true
+#define AR5K_TUNE_ANT_DIVERSITY			true
+#define AR5K_TUNE_HWTXTRIES			4
+
+/* token to use for aifs, cwmin, cwmax in MadWiFi */
+#define	AR5K_TXQ_USEDEFAULT	((u32) -1)
+
+/* GENERIC CHIPSET DEFINITIONS */
+
+/* MAC Chips */
+enum ath5k_version {
+	AR5K_AR5210	= 0,
+	AR5K_AR5211	= 1,
+	AR5K_AR5212	= 2,
+};
+
+/* PHY Chips */
+enum ath5k_radio {
+	AR5K_RF5110	= 0,
+	AR5K_RF5111	= 1,
+	AR5K_RF5112	= 2,
+};
+
+/*
+ * Common silicon revision/version values
+ */
+enum ath5k_srev_type {
+	AR5K_VERSION_VER,
+	AR5K_VERSION_REV,
+	AR5K_VERSION_RAD,
+	AR5K_VERSION_DEV
+};
+
+struct ath5k_srev_name {
+	const char		*sr_name;
+	enum ath5k_srev_type	sr_type;
+	u_int			sr_val;
+};
+
+#define AR5K_SREV_NAME	{						\
+	{ "5210",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5210 },	\
+	{ "5311",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311 },	\
+	{ "5311a",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311A },\
+	{ "5311b",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311B },\
+	{ "5211",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5211 },	\
+	{ "5212",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5212 },	\
+	{ "5213",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213 },	\
+	{ "xxxx",	AR5K_VERSION_VER,	AR5K_SREV_UNKNOWN },	\
+	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },	\
+	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },	\
+	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },	\
+	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },	\
+	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\
+	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },	\
+	{ "2112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },	\
+	{ "xxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },	\
+	{ "2413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR2413 },\
+	{ "5413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5413 },\
+	{ "5424",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5424 },\
+	{ "xxxx",	AR5K_VERSION_DEV,	AR5K_SREV_UNKNOWN }	\
+}
+
+#define AR5K_SREV_UNKNOWN	0xffff
+
+#define AR5K_SREV_VER_AR5210	0x00
+#define AR5K_SREV_VER_AR5311	0x10
+#define AR5K_SREV_VER_AR5311A	0x20
+#define AR5K_SREV_VER_AR5311B	0x30
+#define AR5K_SREV_VER_AR5211	0x40
+#define AR5K_SREV_VER_AR5212	0x50
+#define AR5K_SREV_VER_AR5213	0x55
+#define AR5K_SREV_VER_UNSUPP	0x60
+
+#define AR5K_SREV_RAD_5110	0x00
+#define AR5K_SREV_RAD_5111	0x10
+#define AR5K_SREV_RAD_5111A	0x15
[...13868 lines suppressed...]
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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 NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.20 2005/01/24 20:31:24 sam Exp $
+ */
+
+/*
+ * Defintions for the Atheros Wireless LAN controller driver.
+ */
+#ifndef _DEV_ATH_ATHVAR_H
+#define _DEV_ATH_ATHVAR_H
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/wireless.h>
+#include <linux/if_ether.h>
+
+#include "ath5k.h"
+
+#define	ATH_TIMEOUT		1000
+
+#define ATH_LONG_CALIB		30 /* seconds */
+#define ATH_SHORT_CALIB		1
+
+/*
+ * Maximum acceptable MTU
+ * MAXFRAMEBODY - WEP - QOS - RSN/WPA:
+ * 2312 - 8 - 2 - 12 = 2290
+ */
+#define ATH_MAX_MTU	2290
+#define ATH_MIN_MTU	32
+
+#define	ATH_RXBUF	40		/* number of RX buffers */
+#define	ATH_TXBUF	200		/* number of TX buffers */
+#define	ATH_TXDESC	1		/* number of descriptors per buffer */
+#define ATH_BCBUF	1		/* number of beacon buffers */
+#define	ATH_TXMAXTRY	11		/* max number of transmit attempts */
+#define	ATH_TXINTR_PERIOD 5		/* max number of batched tx descriptors */
+
+#define ATH_BEACON_AIFS_DEFAULT  0	/* default aifs for ap beacon q */
+#define ATH_BEACON_CWMIN_DEFAULT 0	/* default cwmin for ap beacon q */
+#define ATH_BEACON_CWMAX_DEFAULT 0	/* default cwmax for ap beacon q */
+
+#define ATH_RSSI_LPF_LEN	10
+#define ATH_RSSI_DUMMY_MARKER	0x127
+#define ATH_EP_MUL(x, mul)	((x) * (mul))
+#define ATH_RSSI_IN(x)		(ATH_EP_MUL((x), AR5K_RSSI_EP_MULTIPLIER))
+#define ATH_LPF_RSSI(x, y, len) \
+    ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
+#define ATH_RSSI_LPF(x, y) do {						\
+	if ((y) >= -20)							\
+		x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
+} while (0)
+
+struct ath_buf {
+	struct list_head	list;
+	unsigned int		flags;	/* tx descriptor flags */
+	struct ath_desc		*desc;	/* virtual addr of desc */
+	dma_addr_t		daddr;	/* physical addr of desc */
+	struct sk_buff		*skb;	/* skbuff for buf */
+	dma_addr_t		skbaddr;/* physical addr of skb data */
+	struct ieee80211_tx_control ctl;
+};
+
+/*
+ * Data transmit queue state.  One of these exists for each
+ * hardware transmit queue.  Packets sent to us from above
+ * are assigned to queues based on their priority.  Not all
+ * devices support a complete set of hardware transmit queues.
+ * For those devices the array sc_ac2q will map multiple
+ * priorities to fewer hardware queues (typically all to one
+ * hardware queue).
+ */
+struct ath_txq {
+	unsigned int	qnum;		/* hardware q number */
+	u32		*link;		/* link ptr in last TX desc */
+	struct list_head q;		/* transmit queue */
+	spinlock_t	lock;		/* lock on q and link */
+	bool		setup;
+};
+
+#if CHAN_DEBUG
+#define ATH_CHAN_MAX	(26+26+26+200+200)
+#else
+#define ATH_CHAN_MAX	(14+14+14+252+20)	/* XXX what's the max? */
+#endif
+
+struct ath_softc {
+	struct pci_dev		*pdev;		/* for dma mapping */
+	void __iomem		*iobase;	/* address of the device */
+	struct mutex		lock;		/* dev-level lock */
+	struct ieee80211_tx_queue_stats tx_stats;
+	struct ieee80211_low_level_stats ll_stats;
+	struct ieee80211_hw	*hw;		/* IEEE 802.11 common */
+	struct ieee80211_hw_mode modes[NUM_IEEE80211_MODES];
+	struct ieee80211_channel channels[ATH_CHAN_MAX];
+	struct ieee80211_rate	rates[AR5K_MAX_RATES * NUM_IEEE80211_MODES];
+	enum ieee80211_if_types	opmode;
+	struct ath_hw		*ah;		/* Atheros HW */
+
+	int			debug;
+
+	struct ath_buf		*bufptr;	/* allocated buffer ptr */
+	struct ath_desc		*desc;		/* TX/RX descriptors */
+	dma_addr_t		desc_daddr;	/* DMA (physical) address */
+	size_t			desc_len;	/* size of TX/RX descriptors */
+	u16			cachelsz;	/* cache line size */
+
+	DECLARE_BITMAP(status, 6);
+#define ATH_STAT_INVALID	0		/* disable hardware accesses */
+#define ATH_STAT_MRRETRY	1		/* multi-rate retry support */
+#define ATH_STAT_PROMISC	2
+#define ATH_STAT_LEDBLINKING	3		/* LED blink operation active */
+#define ATH_STAT_LEDENDBLINK	4		/* finish LED blink operation */
+#define ATH_STAT_LEDSOFT	5		/* enable LED gpio status */
+
+	unsigned int		curmode;	/* current phy mode */
+	struct ieee80211_channel *curchan;	/* current h/w channel */
+
+	int 			iface_id;	/* add/remove_interface id */
+
+	struct {
+		u8	rxflags;	/* radiotap rx flags */
+		u8	txflags;	/* radiotap tx flags */
+		u16	ledon;		/* softled on time */
+		u16	ledoff;		/* softled off time */
+	} hwmap[32];				/* h/w rate ix mappings */
+
+	enum ath5k_int		imask;		/* interrupt mask copy */
+
+	DECLARE_BITMAP(keymap, AR5K_KEYCACHE_SIZE); /* key use bit map */
+
+	u8			bssidmask[ETH_ALEN];
+
+	unsigned int		led_pin,	/* GPIO pin for driving LED */
+				led_on,		/* pin setting for LED on */
+				led_off;	/* off time for current blink */
+	struct timer_list	led_tim;	/* led off timer */
+	u8			led_rxrate;	/* current rx rate for LED */
+	u8			led_txrate;	/* current tx rate for LED */
+
+	struct tasklet_struct	restq;		/* reset tasklet */
+
+	unsigned int		rxbufsize;	/* rx size based on mtu */
+	struct list_head	rxbuf;		/* receive buffer */
+	spinlock_t		rxbuflock;
+	u32			*rxlink;	/* link ptr in last RX desc */
+	struct tasklet_struct	rxtq;		/* rx intr tasklet */
+
+	struct list_head	txbuf;		/* transmit buffer */
+	spinlock_t		txbuflock;
+	unsigned int		txbuf_len;	/* buf count in txbuf list */
+	struct ath_txq		txqs[2];	/* beacon and tx */
+
+	struct ath_txq		*txq;		/* beacon and tx*/
+	struct tasklet_struct	txtq;		/* tx intr tasklet */
+
+	struct ath_buf		*bbuf;		/* beacon buffer */
+	unsigned int		bhalq,		/* HAL q for outgoing beacons */
+				bmisscount,	/* missed beacon transmits */
+				bintval,	/* beacon interval */
+				bsent;
+
+	struct timer_list	calib_tim;	/* calibration timer */
+};
+
+#define ath5k_hw_hasbssidmask(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_BSSIDMASK, 0, NULL) == 0)
+#define ath5k_hw_hasveol(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
+
+#endif

linux-2.6-mac80211-extras.patch:

--- NEW FILE linux-2.6-mac80211-extras.patch ---
diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-27 11:19:25.000000000 -0400
+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-27 11:25:33.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
 } __attribute__ ((packed));
 
 
+struct ieee80211_ht_capability {
+	__le16 capabilities_info;
+	u8 mac_ht_params_info;
+	u8 supported_mcs_set[16];
+	__le16 extended_ht_capability_info;
+	__le32 tx_BF_capability_info;
+	u8 antenna_selection_info;
+}__attribute__ ((packed));
+
+struct ieee80211_ht_additional_info {
+	u8 control_chan;
+	u8 ht_param;
+	__le16 operation_mode;
+	__le16 stbc_param;
+	u8 basic_set[16];
+}__attribute__ ((packed));
+
+
+#define IEEE80211_TSINFO_TYPE(a)	((a.byte1 & 0x01) >> 0)
+#define IEEE80211_TSINFO_TSID(a)	((a.byte1 & 0x1E) >> 1)
+#define IEEE80211_TSINFO_DIR(a)		((a.byte1 & 0x60) >> 5)
+#define IEEE80211_TSINFO_POLICY(a)	((a.byte1 & 0x80) >> 7 + \
+					 (a.byte2 & 0x01) << 1)
+#define IEEE80211_TSINFO_AGG(a)		((a.byte2 & 0x02) >> 1)
+#define IEEE80211_TSINFO_APSD(a)	((a.byte2 & 0x04) >> 2)
+#define IEEE80211_TSINFO_UP(a)		((a.byte2 & 0x38) >> 3)
+#define IEEE80211_TSINFO_ACK(a)		((a.byte2 & 0xC0) >> 6)
+#define IEEE80211_TSINFO_SCHEDULE(a)	((a.byte3 & 0x01) >> 0)
+
+#define IEEE80211_SET_TSINFO_TYPE(i, d)		(i.byte1 |= (d << 0) & 0x01)
+#define IEEE80211_SET_TSINFO_TSID(i, d)		(i.byte1 |= (d << 1) & 0x1E)
+#define IEEE80211_SET_TSINFO_DIR(i, d)		(i.byte1 |= (d << 5) & 0x60)
+#define IEEE80211_SET_TSINFO_POLICY(i, d)	\
+do {						\
+						i.byte1 |= (d & 0x01) << 7; \
+						i.byte2 |= (d & 0x02) >> 1; \
+} while(0)
+#define IEEE80211_SET_TSINFO_AGG(i, d)		(i.byte2 |= (d << 1) & 0x02)
+#define IEEE80211_SET_TSINFO_APSD(i, d)		(i.byte2 |= (d << 2) & 0x04)
+#define IEEE80211_SET_TSINFO_UP(i, d)		(i.byte2 |= (d << 3) & 0x38)
+#define IEEE80211_SET_TSINFO_ACK(i, d)		(i.byte2 |= (d << 6) & 0xC0)
+#define IEEE80211_SET_TSINFO_SCHEDULE(i, d)	(i.byte3 |= (d << 0) & 0x01)
+
+struct ieee80211_ts_info {
+	u8 byte1;
+	u8 byte2;
+	u8 byte3;
+} __attribute__ ((packed));
+
+struct ieee80211_elem_tspec {
+	struct ieee80211_ts_info ts_info;
+	__le16 nominal_msdu_size;
+	__le16 max_msdu_size;
+	__le32 min_service_interval;
+	__le32 max_service_interval;
+	__le32 inactivity_interval;
+	__le32 suspension_interval;
+	__le32 service_start_time;
+	__le32 min_data_rate;
+	__le32 mean_data_rate;
+	__le32 peak_data_rate;
+	__le32 burst_size;
+	__le32 delay_bound;
+	__le32 min_phy_rate;
+	__le16 surplus_band_allow;
+	__le16 medium_time;
+} __attribute__ ((packed));
+
+
 struct ieee80211_mgmt {
 	__le16 frame_control;
 	__le16 duration;
@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
 				struct {
 					u8 action_code;
 					u8 dialog_token;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_req;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status_code;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_resp;
+				struct {
+					u8 action_code;
+					struct ieee80211_ts_info ts_info;
+					__le16 reason_code;
+				} __attribute__ ((packed)) delts;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
 					u8 status_code;
 					u8 variable[0];
 				} __attribute__ ((packed)) wme_action;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 capab_info;
+					__le16 timeout;
+					/* Followed by Supported Rates and
+					 * Extended Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_req;
+				struct {
+					u8 action_code;
+					__le16 status_code;
+					u8 dest[6];
+					u8 src[6];
+					/* Followed by Capability Information,
+					 * Supported Rates and Extended
+					 * Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_resp;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 reason_code;
+				} __attribute__ ((packed)) dls_teardown;
 				struct{
 					u8 action_code;
 					u8 element_id;
@@ -184,6 +295,25 @@ struct ieee80211_mgmt {
 					u8 new_chan;
 					u8 switch_count;
 				} __attribute__((packed)) chan_switch;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 capab;
+					__le16 timeout;
+					__le16 start_seq_num;
+				} __attribute__((packed)) addba_req;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status;
+					__le16 capab;
+					__le16 timeout;
+				} __attribute__((packed)) addba_resp;
+				struct{
+					u8 action_code;
+					__le16 params;
+					__le16 reason_code;
+				}__attribute__((packed)) delba;
 			} u;
 		} __attribute__ ((packed)) action;
 	} u;
@@ -270,6 +400,18 @@ enum ieee80211_statuscode {
 	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
 	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
 	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
+	/* 802.11e */
+	WLAN_STATUS_UNSPECIFIED_QOS = 32,
+	WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
+	WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
+	WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
+	WLAN_STATUS_REQUEST_DECLINED = 37,
+	WLAN_STATUS_INVALID_QOS_PARAM = 38,
+	WLAN_STATUS_CHANGE_TSPEC = 39,
+	WLAN_STATUS_WAIT_TS_DELAY = 47,
+	WLAN_STATUS_NO_DIRECT_LINK = 48,
+	WLAN_STATUS_STA_NOT_PRESENT = 49,
+	WLAN_STATUS_STA_NOT_QSTA = 50,
 };
 
 
@@ -300,9 +442,50 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
 	WLAN_REASON_IEEE8021X_FAILED = 23,
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+	/* 802.11e */
+	WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
+	WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
+	WLAN_REASON_DISASSOC_LOW_ACK = 34,
+	WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
+	WLAN_REASON_QSTA_LEAVE_QBSS = 36,
+	WLAN_REASON_QSTA_NOT_USE = 37,
+	WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
+	WLAN_REASON_QSTA_TIMEOUT = 39,
+	WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
 };
 
 
+/* Category Code */
+enum ieee80211_category {
+	WLAN_CATEGORY_SPECTRUM_MGMT = 0,
+	WLAN_CATEGORY_QOS = 1,
+	WLAN_CATEGORY_DLS = 2,
+	WLAN_CATEGORY_BACK = 3,
[...3755 lines suppressed...]
+			printk(" %02x", mic[i]);
+		printk("\n");
+		printk(KERN_DEBUG "   SA=" MAC_FMT " DA=" MAC_FMT " key",
+		       MAC_ARG(sa), MAC_ARG(da));
+		for (i = 0; i < 8; i++)
+			printk(" %02x", key[i]);
+		printk(" (%d)\n", authenticator);
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 
 		mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
 						(void *) skb->data);
@@ -208,12 +271,30 @@ static int tkip_encrypt_skb(struct ieee8
 	memmove(pos, pos + TKIP_IV_LEN, hdrlen);
 	pos += hdrlen;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_iv_inc;
+iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	/* Increase IV for the frame */
 	key->u.tkip.iv16++;
 	if (key->u.tkip.iv16 == 0)
 		key->u.tkip.iv32++;
 
-	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto iv_inc;
+	}
+skip_iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
+	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	    && !tx->wpa_test
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+		) {
 		hdr = (struct ieee80211_hdr *)skb->data;
 
 		/* hwaccel - with preallocated room for IV */
@@ -255,6 +336,37 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 	tx->u.tx.control->iv_len = TKIP_IV_LEN;
 	ieee80211_tx_set_iswep(tx);
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if ((tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) ||
+	    (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+	     tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV)) {
+		wpa_test = 1;
+	}
+
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - TKIP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
 	    !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
 	    !wpa_test) {
@@ -268,6 +380,10 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)
@@ -275,6 +391,23 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 		}
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       tx->dev->name, MAC_ARG(tx->sta->addr));
+		tx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	} else if (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+		   tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for Group Key\n",
+		       tx->dev->name);
+		tx->local->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	return TXRX_CONTINUE;
 }
 
@@ -299,6 +432,17 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
 	if (!rx->sta || skb->len - hdrlen < 12)
 		return TXRX_DROP;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (rx->sta && rx->sta->wpa_trigger & WPA_TRIGGER_FAIL_RX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting RX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       rx->dev->name, MAC_ARG(rx->sta->addr));
+		rx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_RX_ICV;
+		skb->data[skb->len - 1]++;
+		wpa_test = 1;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) {
 		if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) {
 			/*
@@ -467,12 +611,26 @@ static int ccmp_encrypt_skb(struct ieee8
 	/* PN = PN + 1 */
 	pn = key->u.ccmp.tx_pn;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_pn_inc;
+pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
 		pn[i]++;
 		if (pn[i])
 			break;
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto pn_inc;
+	}
+skip_pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	ccmp_pn2hdr(pos, pn, key->conf.keyidx);
 
 	if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
@@ -504,6 +662,27 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 	if (!key || key->conf.alg != ALG_CCMP || !WLAN_FC_DATA_PRESENT(fc))
 		return TXRX_CONTINUE;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger = 0;
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger = 0;
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - CCMP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	tx->u.tx.control->icv_len = CCMP_MIC_LEN;
 	tx->u.tx.control->iv_len = CCMP_HDR_LEN;
 	ieee80211_tx_set_iswep(tx);
@@ -521,6 +700,10 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)

linux-2.6-zd1211rw-mac80211.patch:

--- NEW FILE linux-2.6-zd1211rw-mac80211.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:44.000000000 -0400
@@ -4157,6 +4157,16 @@ W:	http://www.qsl.net/dl1bke/
 L:	linux-hams at vger.kernel.org
 S:	Maintained
 
+ZD1211RW-MAC80211 WIRELESS DRIVER
+P:	Daniel Drake
+M:	dsd at gentoo.org
+P:	Ulrich Kunitz
+M:	kune at deine-taler.de
+W:	http://zd1211.ath.cx/wiki/DriverRewrite
+L:	linux-wireless at vger.kernel.org
+L:	zd1211-devs at lists.sourceforge.net (subscribers-only)
+S:	Maintained
+
 ZD1211RW WIRELESS DRIVER
 P:	Daniel Drake
 M:	dsd at gentoo.org
diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 11:24:44.000000000 -0400
@@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw-mac80211/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-27 11:24:44.000000000 -0400
@@ -0,0 +1,1619 @@
+/* zd_chip.c
+ *
+ * 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
+ */
+
+/* This file implements all the hardware specific functions for the ZD1211
+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy
+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+
+void zd_chip_init(struct zd_chip *chip,
+	         struct ieee80211_hw *hw,
+		 struct usb_interface *intf)
+{
+	memset(chip, 0, sizeof(*chip));
+	mutex_init(&chip->mutex);
+	zd_usb_init(&chip->usb, hw, intf);
+	zd_rf_init(&chip->rf);
+}
+
+void zd_chip_clear(struct zd_chip *chip)
+{
+	ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+	zd_usb_clear(&chip->usb);
+	zd_rf_clear(&chip->rf);
+	mutex_destroy(&chip->mutex);
+	ZD_MEMCLEAR(chip, sizeof(*chip));
+}
+
+static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
+{
+	u8 *addr = zd_chip_to_mac(chip)->hwaddr;
+	return scnprintf(buffer, size, "%02x-%02x-%02x",
+		         addr[0], addr[1], addr[2]);
+}
+
+/* Prints an identifier line, which will support debugging. */
+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
+{
+	int i = 0;
+
+	i = scnprintf(buffer, size, "zd1211%s chip ",
+		      zd_chip_is_zd1211b(chip) ? "b" : "");
+	i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += scnprint_mac_oui(chip, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
+		chip->patch_cck_gain ? 'g' : '-',
+		chip->patch_cr157 ? '7' : '-',
+		chip->patch_6m_band_edge ? '6' : '-',
+		chip->new_phy_layout ? 'N' : '-',
+		chip->al2230s_bit ? 'S' : '-');
+	return i;
+}
+
+static void print_id(struct zd_chip *chip)
+{
+	char buffer[80];
+
+	scnprint_id(chip, buffer, sizeof(buffer));
+	buffer[sizeof(buffer)-1] = 0;
+	dev_info(zd_chip_dev(chip), "%s\n", buffer);
+}
+
+static zd_addr_t inc_addr(zd_addr_t addr)
+{
+	u16 a = (u16)addr;
+	/* Control registers use byte addressing, but everything else uses word
+	 * addressing. */
+	if ((a & 0xf000) == CR_START)
+		a += 2;
+	else
+		a += 1;
+	return (zd_addr_t)a;
+}
+
+/* Read a variable number of 32-bit values. Parameter count is not allowed to
+ * exceed USB_MAX_IOREAD32_COUNT.
+ */
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+		 unsigned int count)
+{
+	int r;
+	int i;
+	zd_addr_t *a16 = (zd_addr_t *)NULL;
+	u16 *v16;
+	unsigned int count16;
+
+	if (count > USB_MAX_IOREAD32_COUNT)
+		return -EINVAL;
+
+	/* Allocate a single memory block for values and addresses. */
+	count16 = 2*count;
+	a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+		                   GFP_KERNEL);
+	if (!a16) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error ENOMEM in allocation of a16\n");
+		r = -ENOMEM;
+		goto out;
+	}
+	v16 = (u16 *)(a16 + count16);
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		/* We read the high word always first. */
+		a16[j] = inc_addr(addr[i]);
+		a16[j+1] = addr[i];
+	}
+
+	r = zd_ioread16v_locked(chip, v16, a16, count16);
+	if (r) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error: zd_ioread16v_locked. Error number %d\n", r);
+		goto out;
+	}
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		values[i] = (v16[j] << 16) | v16[j+1];
+	}
+
+out:
+	kfree((void *)a16);
+	return r;
+}
+
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+	           unsigned int count)
+{
+	int i, j, r;
+	struct zd_ioreq16 *ioreqs16;
+	unsigned int count16;
+
+	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+
+	if (count == 0)
+		return 0;
+	if (count > USB_MAX_IOWRITE32_COUNT)
+		return -EINVAL;
[...7628 lines suppressed...]
+	hash = mac->multicast_hash;
+	spin_unlock_irq(&mac->lock);
+
+	zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+
+static void zd_op_set_multicast_list(struct ieee80211_hw *hw,
+				      unsigned short dev_flags, int mc_count)
+{
+	struct zd_mc_hash hash;
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	if ((dev_flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
+	     has_monitor_interfaces(mac))
+	{
+		zd_mc_add_all(&hash);
+	} else {
+		struct dev_mc_list *mc = NULL;
+		void *tmp = NULL;
+
+		zd_mc_clear(&hash);
+		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
+			dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
+				  MAC_ARG(mc->dmi_addr));
+			zd_mc_add_addr(&hash, mc->dmi_addr);
+		}
+	}
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->multicast_hash = hash;
+	spin_unlock_irqrestore(&mac->lock, flags);
+	queue_work(zd_workqueue, &mac->set_multicast_hash_work);
+}
+
+static void set_rts_cts_work(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, set_rts_cts_work);
+	unsigned long flags;
+	unsigned int short_preamble;
+
+	mutex_lock(&mac->chip.mutex);
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->updating_rts_rate = 0;
+	short_preamble = mac->short_preamble;
+	spin_unlock_irqrestore(&mac->lock, flags);
+
+	zd_chip_set_rts_cts_rate_locked(&mac->chip, short_preamble);
+	mutex_unlock(&mac->chip.mutex);
+}
+
+static void zd_op_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
+				 int cts_protection, int preamble)
+{
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
+
+	if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
+		spin_lock_irqsave(&mac->lock, flags);
+		mac->short_preamble = !preamble;
+		if (!mac->updating_rts_rate) {
+			mac->updating_rts_rate = 1;
+			/* FIXME: should disable TX here, until work has
+			 * completed and RTS_CTS reg is updated */
+			queue_work(zd_workqueue, &mac->set_rts_cts_work);
+		}
+		spin_unlock_irqrestore(&mac->lock, flags);
+	}
+}
+
+static const struct ieee80211_ops zd_ops = {
+	.tx			= zd_op_tx,
+	.open			= zd_op_open,
+	.stop			= zd_op_stop,
+	.add_interface		= zd_op_add_interface,
+	.remove_interface	= zd_op_remove_interface,
+	.config			= zd_op_config,
+	.config_interface	= zd_op_config_interface,
+	.set_multicast_list	= zd_op_set_multicast_list,
+	.erp_ie_changed		= zd_op_erp_ie_changed,
+};
+
+struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
+{
+	struct zd_mac *mac;
+	struct ieee80211_hw *hw;
+	int i;
+
+	hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops);
+	if (!hw) {
+		dev_dbg_f(&intf->dev, "out of memory\n");
+		return NULL;
+	}
+
+	mac = zd_hw_mac(hw);
+
+	memset(mac, 0, sizeof(*mac));
+	spin_lock_init(&mac->lock);
+	mac->hw = hw;
+
+	mac->type = IEEE80211_IF_TYPE_MGMT;
+	mac->hwaddr = hw->wiphy->perm_addr;
+
+	memcpy(mac->channels, zd_channels, sizeof(zd_channels));
+	memcpy(mac->rates, zd_rates, sizeof(zd_rates));
+	mac->modes[0].mode = MODE_IEEE80211G;
+	mac->modes[0].num_rates = ARRAY_SIZE(zd_rates);
+	mac->modes[0].rates = mac->rates;
+	mac->modes[0].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[0].channels = mac->channels;
+	mac->modes[1].mode = MODE_IEEE80211B;
+	mac->modes[1].num_rates = 4;
+	mac->modes[1].rates = mac->rates;
+	mac->modes[1].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[1].channels = mac->channels;
+
+	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+		     IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
+	hw->max_rssi = 100;
+	hw->max_signal = 100;
+
+	hw->queues = 1;
+	hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
+
+	skb_queue_head_init(&mac->ack_wait_queue);
+
+	for (i = 0; i < 2; i++) {
+		if (ieee80211_register_hwmode(hw, &mac->modes[i])) {
+			dev_dbg_f(&intf->dev, "cannot register hwmode\n");
+			ieee80211_free_hw(hw);
+			return NULL;
+		}
+	}
+
+	zd_chip_init(&mac->chip, hw, intf);
+	housekeeping_init(mac);
+	INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
+	INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
+
+	SET_IEEE80211_DEV(hw, &intf->dev);
+	return hw;
+}
+
+#define LINK_LED_WORK_DELAY HZ
+
+static void link_led_handler(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, housekeeping.link_led_work.work);
+	struct zd_chip *chip = &mac->chip;
+	int is_associated;
+	int r;
+
+	spin_lock_irq(&mac->lock);
+	is_associated = mac->associated;
+	spin_unlock_irq(&mac->lock);
+
+	r = zd_chip_control_leds(chip,
+		                 is_associated ? LED_ASSOCIATED : LED_SCANNING);
+	if (r)
+		dev_err(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r);
+
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+		           LINK_LED_WORK_DELAY);
+}
+
+static void housekeeping_init(struct zd_mac *mac)
+{
+	INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler);
+}
+
+static void housekeeping_enable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+			   0);
+}
+
+static void housekeeping_disable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	cancel_rearming_delayed_workqueue(zd_workqueue,
+		&mac->housekeeping.link_led_work);
+	zd_chip_control_leds(&mac->chip, LED_OFF);
+}
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 11:24:44.000000000 -0400
@@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3348
retrieving revision 1.3349
diff -u -r1.3348 -r1.3349
--- kernel-2.6.spec	26 Sep 2007 23:18:11 -0000	1.3348
+++ kernel-2.6.spec	27 Sep 2007 15:33:19 -0000	1.3349
@@ -614,7 +614,10 @@
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
-Patch690: git-wireless-dev.patch
+Patch690: linux-2.6-at76.patch
+Patch691: linux-2.6-ath5k.patch
+Patch692: linux-2.6-zd1211rw-mac80211.patch
+Patch693: linux-2.6-mac80211-extras.patch
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
@@ -1349,8 +1352,11 @@
 # pre-2.6.24 wireless patches from upstream
 ApplyPatch linux-2.6-wireless-pending.patch
 
-# Add wireless stack and driver updates from wireless-dev
-ApplyPatch git-wireless-dev.patch
+# Add misc wireless bits from upstream wireless tree
+ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-ath5k.patch
+ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+ApplyPatch linux-2.6-mac80211-extras.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -2355,6 +2361,9 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- Update and restructure wireless patches
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - libata pata_sis: DMA fixes (#202291)
 - libata sata_sil24: IRQ clearing race fixes

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch	18 Sep 2007 15:08:25 -0000	1.3
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 15:33:19 -0000	1.4
@@ -1,6 +1,1769 @@
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-27 11:00:31.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
+ S: (ask for current address)
+ S: USA
+ 
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
++
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+ 
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
++
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -833,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+ 
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
++
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3516,6 +3532,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+ 
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
++
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3650,6 +3672,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+ 
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
++
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-27 11:10:41.000000000 -0400
+@@ -7,7 +7,113 @@
+  */
+ 
+ /**
++ * enum nl80211_commands - supported nl80211 commands
++ *
++ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
++ *
++ * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
++ *	to get a list of all present wiphys.
++ * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
++ *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
++ *
++ * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
++ *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
++ *	on an %NL80211_ATTR_IFINDEX is supported.
++ * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
++ 	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
++ * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
++ *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
++ *	be sent from userspace to request creation of a new virtual interface,
++ *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
++ *	%NL80211_ATTR_IFNAME.
++ * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
++ *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
++ *	userspace to request deletion of a virtual interface, then requires
++ *	attribute %NL80211_ATTR_IFINDEX.
++ *
++ * @NL80211_CMD_MAX: highest used command number
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++enum nl80211_commands {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_CMD_UNSPEC,
++
++	NL80211_CMD_GET_WIPHY,		/* can dump */
++	NL80211_CMD_SET_WIPHY,
++	NL80211_CMD_NEW_WIPHY,
++	NL80211_CMD_DEL_WIPHY,
++
++	NL80211_CMD_GET_INTERFACE,	/* can dump */
++	NL80211_CMD_SET_INTERFACE,
++	NL80211_CMD_NEW_INTERFACE,
++	NL80211_CMD_DEL_INTERFACE,
++
++	/* add commands here */
++
++	/* used to define NL80211_CMD_MAX below */
++	__NL80211_CMD_AFTER_LAST,
++	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
++};
++
++/**
++ * enum nl80211_multicast_groups - multicast groups for nl80211
++ * @NL80211_GROUP_CONFIG: members of this group are notified of
++ *	configuration changes
++ */
++enum nl80211_multicast_groups {
++	/* be notified of configuration changes like wiphy renames */
++	NL80211_GROUP_CONFIG,
++
++	/* add groups here */
++
++	/* keep last */
++	__NL80211_GROUP_AFTER_LAST
++};
++#define NL80211_GROUP_MAX (__NL80211_GROUP_AFTER_LAST - 1)
++
++
++/**
++ * enum nl80211_attrs - nl80211 netlink attributes
++ *
++ * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
++ *
++ * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
++ *	/sys/class/ieee80211/<phyname>/index
++ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
++ *
++ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
++ * @NL80211_ATTR_IFNAME: network interface name
++ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
++ *
++ * @NL80211_ATTR_MAX: highest attribute number currently defined
++ * @__NL80211_ATTR_AFTER_LAST: internal use
++ */
++enum nl80211_attrs {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_ATTR_UNSPEC,
++
++	NL80211_ATTR_WIPHY,
++	NL80211_ATTR_WIPHY_NAME,
++
++	NL80211_ATTR_IFINDEX,
++	NL80211_ATTR_IFNAME,
++	NL80211_ATTR_IFTYPE,
++
++	/* add attributes here, update the policy in nl80211.c */
++
++	__NL80211_ATTR_AFTER_LAST,
++	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
++};
++
++/**
+  * enum nl80211_iftype - (virtual) interface types
++ *
+  * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
+  * @NL80211_IFTYPE_ADHOC: independent BSS member
+  * @NL80211_IFTYPE_STATION: managed BSS member
+@@ -15,9 +121,10 @@
+  * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
+  * @NL80211_IFTYPE_WDS: wireless distribution interface
+  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
++ * @NL80211_IFTYPE_MAX: highest interface type number currently defined
[...130476 lines suppressed...]
++		return 0;
++
++	return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++}
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++
++
++/**************************************************
++ * Generic and Clientmode operation code.
++ **************************************************/
++
++static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
++{
++	/* Disable PCI interrupts. */
++	ssb_write32(pc->dev, SSB_INTVEC, 0);
++}
++
++void ssb_pcicore_init(struct ssb_pcicore *pc)
++{
++	struct ssb_device *dev = pc->dev;
++	struct ssb_bus *bus;
++
++	if (!dev)
++		return;
++	bus = dev->bus;
++	if (!ssb_device_is_enabled(dev))
++		ssb_device_enable(dev, 0);
++
++#ifdef CONFIG_SSB_PCICORE_HOSTMODE
++	pc->hostmode = pcicore_is_in_hostmode(pc);
++	if (pc->hostmode)
++		ssb_pcicore_init_hostmode(pc);
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++	if (!pc->hostmode)
++		ssb_pcicore_init_clientmode(pc);
++}
++
++static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address)
++{
++	pcicore_write32(pc, 0x130, address);
++	return pcicore_read32(pc, 0x134);
++}
++
++static void ssb_pcie_write(struct ssb_pcicore *pc, u32 address, u32 data)
++{
++	pcicore_write32(pc, 0x130, address);
++	pcicore_write32(pc, 0x134, data);
++}
++
++static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
++				u8 address, u16 data)
++{
++	const u16 mdio_control = 0x128;
++	const u16 mdio_data = 0x12C;
++	u32 v;
++	int i;
++
++	v = 0x80; /* Enable Preamble Sequence */
++	v |= 0x2; /* MDIO Clock Divisor */
++	pcicore_write32(pc, mdio_control, v);
++
++	v = (1 << 30); /* Start of Transaction */
++	v |= (1 << 28); /* Write Transaction */
++	v |= (1 << 17); /* Turnaround */
++	v |= (u32)device << 22;
++	v |= (u32)address << 18;
++	v |= data;
++	pcicore_write32(pc, mdio_data, v);
++	/* Wait for the device to complete the transaction */
++	udelay(10);
++	for (i = 0; i < 10; i++) {
++		v = pcicore_read32(pc, mdio_control);
++		if (v & 0x100 /* Trans complete */)
++			break;
++		msleep(1);
++	}
++	pcicore_write32(pc, mdio_control, 0);
++}
++
++static void ssb_broadcast_value(struct ssb_device *dev,
++				u32 address, u32 data)
++{
++	/* This is used for both, PCI and ChipCommon core, so be careful. */
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
++
++	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
++	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
++	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
++	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
++}
++
++static void ssb_commit_settings(struct ssb_bus *bus)
++{
++	struct ssb_device *dev;
++
++	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
++	if (WARN_ON(!dev))
++		return;
++	/* This forces an update of the cached registers. */
++	ssb_broadcast_value(dev, 0xFD8, 0);
++}
++
++int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
++				   struct ssb_device *dev)
++{
++	struct ssb_device *pdev = pc->dev;
++	struct ssb_bus *bus;
++	int err = 0;
++	u32 tmp;
++
++	might_sleep();
++
++	if (!pdev)
++		goto out;
++	bus = pdev->bus;
++
++	/* Enable interrupts for this device. */
++	if (bus->host_pci &&
++	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++		u32 coremask;
++
++		/* Calculate the "coremask" for the device. */
++		coremask = (1 << dev->core_index);
++
++		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
++		if (err)
++			goto out;
++		tmp |= coremask << 8;
++		err = pci_write_config_dword(bus->host_pci, SSB_PCI_IRQMASK, tmp);
++		if (err)
++			goto out;
++	} else {
++		u32 intvec;
++
++		intvec = ssb_read32(pdev, SSB_INTVEC);
++		if ((bus->chip_id & 0xFF00) == 0x4400) {
++			/* Workaround: On the BCM44XX the BPFLAG routing
++			 * bit is wrong. Use a hardcoded constant. */
++			intvec |= 0x00000002;
++		} else {
++			tmp = ssb_read32(dev, SSB_TPSFLAG);
++			tmp &= SSB_TPSFLAG_BPFLAG;
++			intvec |= tmp;
++		}
++		ssb_write32(pdev, SSB_INTVEC, intvec);
++	}
++
++	/* Setup PCIcore operation. */
++	if (pc->setup_done)
++		goto out;
++	if (pdev->id.coreid == SSB_DEV_PCI) {
++		tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++		tmp |= SSB_PCICORE_SBTOPCI_PREF;
++		tmp |= SSB_PCICORE_SBTOPCI_BURST;
++		pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++
++		if (pdev->id.revision < 5) {
++			tmp = ssb_read32(pdev, SSB_IMCFGLO);
++			tmp &= ~SSB_IMCFGLO_SERTO;
++			tmp |= 2;
++			tmp &= ~SSB_IMCFGLO_REQTO;
++			tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
++			ssb_write32(pdev, SSB_IMCFGLO, tmp);
++			ssb_commit_settings(bus);
++		} else if (pdev->id.revision >= 11) {
++			tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++			tmp |= SSB_PCICORE_SBTOPCI_MRM;
++			pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++		}
++	} else {
++		WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
++		//TODO: Better make defines for all these magic PCIE values.
++		if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
++			/* TLP Workaround register. */
++			tmp = ssb_pcie_read(pc, 0x4);
++			tmp |= 0x8;
++			ssb_pcie_write(pc, 0x4, tmp);
++		}
++		if (pdev->id.revision == 0) {
++			const u8 serdes_rx_device = 0x1F;
++
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    2 /* Timer */, 0x8128);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    6 /* CDR */, 0x0100);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    7 /* CDR BW */, 0x1466);
++		} else if (pdev->id.revision == 1) {
++			/* DLLP Link Control register. */
++			tmp = ssb_pcie_read(pc, 0x100);
++			tmp |= 0x40;
++			ssb_pcie_write(pc, 0x100, tmp);
++		}
++	}
++	pc->setup_done = 1;
++out:
++	return err;
++}
++EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-wireless.patch	26 Sep 2007 18:58:34 -0000	1.11
+++ linux-2.6-wireless.patch	27 Sep 2007 15:33:19 -0000	1.12
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
 --- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -227,6 +227,17 @@ struct ieee80211_cts {
  #define WLAN_CAPABILITY_SHORT_SLOT_TIME	(1<<10)
  #define WLAN_CAPABILITY_DSSS_OFDM	(1<<13)
@@ -21,7 +21,7 @@
  	WLAN_STATUS_SUCCESS = 0,
 diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
 --- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -11,6 +11,44 @@
   * Copyright 2006 Johannes Berg <johannes at sipsolutions.net>
   */
@@ -69,7 +69,7 @@
  
 diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
 --- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -347,9 +347,16 @@ enum ieee80211_if_types {
   * @mac_addr: pointer to MAC address of the interface. This pointer is valid
   *	until the interface is removed (i.e. it cannot be used after
@@ -118,7 +118,7 @@
   * headers). If the data in the sk_buff is too short to contain a valid 802.11
 diff -up linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c
 --- linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(st
  	}
  
@@ -137,24 +137,104 @@
  
  	/* Add encryption capability */
 diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
---- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-18 10:09:24.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-18 10:10:25.000000000 -0400
-@@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-27 10:46:59.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-27 10:53:45.000000000 -0400
+@@ -271,8 +271,9 @@ ieee80211softmac_assoc_work(struct work_
  			 */
  			dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
  			ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
 -			if (ieee80211softmac_start_scan(mac))
 +			if (ieee80211softmac_start_scan(mac)) {
  				dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
-+				mac->associnfo.associating = 0;
-+				mac->associnfo.associated = 0;
 +			}
  			goto out;
  		} else {
  			mac->associnfo.associating = 0;
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2007-09-27 10:46:57.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2007-09-27 10:53:45.000000000 -0400
+@@ -70,44 +70,30 @@ ieee80211softmac_wx_set_essid(struct net
+ 			      char *extra)
+ {
+ 	struct ieee80211softmac_device *sm = ieee80211_priv(net_dev);
+-	struct ieee80211softmac_network *n;
+ 	struct ieee80211softmac_auth_queue_item *authptr;
+ 	int length = 0;
+ 
+ check_assoc_again:
+ 	mutex_lock(&sm->associnfo.mutex);
+-	/* Check if we're already associating to this or another network
+-	 * If it's another network, cancel and start over with our new network
+-	 * If it's our network, ignore the change, we're already doing it!
+-	 */
+ 	if((sm->associnfo.associating || sm->associnfo.associated) &&
+ 	   (data->essid.flags && data->essid.length)) {
+-		/* Get the associating network */
+-		n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid);
+-		if(n && n->essid.len == data->essid.length &&
+-		   !memcmp(n->essid.data, extra, n->essid.len)) {
+-			dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n",
+-				MAC_ARG(sm->associnfo.bssid));
+-			goto out;
+-		} else {
+-			dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
+-			/* Cancel assoc work */
+-			cancel_delayed_work(&sm->associnfo.work);
+-			/* We don't have to do this, but it's a little cleaner */
+-			list_for_each_entry(authptr, &sm->auth_queue, list)
+-				cancel_delayed_work(&authptr->work);
+-			sm->associnfo.bssvalid = 0;
+-			sm->associnfo.bssfixed = 0;
+-			sm->associnfo.associating = 0;
+-			sm->associnfo.associated = 0;
+-			/* We must unlock to avoid deadlocks with the assoc workqueue
+-			 * on the associnfo.mutex */
+-			mutex_unlock(&sm->associnfo.mutex);
+-			flush_scheduled_work();
+-			/* Avoid race! Check assoc status again. Maybe someone started an
+-			 * association while we flushed. */
+-			goto check_assoc_again;
+-		}
++		dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
++		/* Cancel assoc work */
++		cancel_delayed_work(&sm->associnfo.work);
++		/* We don't have to do this, but it's a little cleaner */
++		list_for_each_entry(authptr, &sm->auth_queue, list)
++			cancel_delayed_work(&authptr->work);
++		sm->associnfo.bssvalid = 0;
++		sm->associnfo.bssfixed = 0;
++		sm->associnfo.associating = 0;
++		sm->associnfo.associated = 0;
++		/* We must unlock to avoid deadlocks with the assoc workqueue
++		 * on the associnfo.mutex */
++		mutex_unlock(&sm->associnfo.mutex);
++		flush_scheduled_work();
++		/* Avoid race! Check assoc status again. Maybe someone started an
++		 * association while we flushed. */
++		goto check_assoc_again;
+ 	}
+ 
+ 	sm->associnfo.static_essid = 0;
+@@ -153,13 +139,13 @@ ieee80211softmac_wx_get_essid(struct net
+ 		data->essid.length = sm->associnfo.req_essid.len;
+ 		data->essid.flags = 1;  /* active */
+ 		memcpy(extra, sm->associnfo.req_essid.data, sm->associnfo.req_essid.len);
+-	}
+-
++		dprintk(KERN_INFO PFX "Getting essid from req_essid\n");
++	} else if (sm->associnfo.associated || sm->associnfo.associating) {
+ 	/* If we're associating/associated, return that */
+-	if (sm->associnfo.associated || sm->associnfo.associating) {
+ 		data->essid.length = sm->associnfo.associate_essid.len;
+ 		data->essid.flags = 1;  /* active */
+ 		memcpy(extra, sm->associnfo.associate_essid.data, sm->associnfo.associate_essid.len);
++		dprintk(KERN_INFO PFX "Getting essid from associate_essid\n");
+ 	}
+ 	mutex_unlock(&sm->associnfo.mutex);
+ 
 diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c
 --- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-27 10:50:46.000000000 -0400
 @@ -456,18 +456,13 @@ void
  ieee80211softmac_add_network_locked(struct ieee80211softmac_device *mac,
  	struct ieee80211softmac_network *add_net)
@@ -216,7 +296,7 @@
  			return softmac_net;
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-27 10:50:46.000000000 -0400
 @@ -157,6 +157,8 @@ void ieee80211_if_set_type(struct net_de
  	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
  	int oldtype = sdata->type;
@@ -236,7 +316,7 @@
  		printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -27,20 +27,6 @@
  #include "aes_ccm.h"
  #include "debugfs_key.h"
@@ -749,7 +829,7 @@
  	(iw_handler) ieee80211_ioctl_siwfrag,		/* SIOCSIWFRAG */
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-27 10:50:46.000000000 -0400
 @@ -24,11 +24,10 @@ int ieee80211_rate_control_register(stru
  {
  	struct rate_control_alg *alg;
@@ -765,7 +845,7 @@
  	mutex_lock(&rate_ctrl_mutex);
 diff -up linux-2.6.22.noarch/net/mac80211/Makefile.orig linux-2.6.22.noarch/net/mac80211/Makefile
 --- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -13,6 +13,7 @@ mac80211-objs := \
  	ieee80211_iface.o \
  	ieee80211_rate.o \
@@ -775,8 +855,8 @@
  	aes_ccm.o \
  	wme.o \
 diff -up /dev/null linux-2.6.22.noarch/net/mac80211/regdomain.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,158 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -938,7 +1018,7 @@
 +
 diff -up linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h
 --- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-27 10:50:46.000000000 -0400
 @@ -26,24 +26,16 @@
   * mess shall be deleted completely. */
  enum {
@@ -966,7 +1046,7 @@
  	PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_common.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-27 10:50:46.000000000 -0400
 @@ -47,21 +47,16 @@ enum ieee80211_msg_type {
  	ieee80211_msg_normal = 0,
  	ieee80211_msg_tx_callback_ack = 1,
@@ -993,7 +1073,7 @@
  	char ifname[IFNAMSIZ];
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-27 10:50:46.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <linux/compiler.h>
  #include <linux/bitmap.h>
@@ -1688,7 +1768,7 @@
  MODULE_DESCRIPTION("IEEE 802.11 subsystem");
 diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
 --- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-27 10:50:46.000000000 -0400
 @@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
  		skb_queue_head_init(&q->requeued[i]);
  		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
@@ -1700,7 +1780,7 @@
  		}
 diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
 --- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-27 10:50:46.000000000 -0400
 @@ -187,9 +187,13 @@ static void rate_control_simple_tx_statu
  		}
  #endif
@@ -1750,7 +1830,7 @@
  MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_i.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-27 10:50:46.000000000 -0400
 @@ -99,6 +99,12 @@ struct ieee80211_sta_bss {
  	int probe_resp;
  	unsigned long last_update;
@@ -1835,7 +1915,7 @@
  
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-27 10:50:46.000000000 -0400
 @@ -25,7 +25,6 @@
  #include <linux/wireless.h>
  #include <linux/random.h>
@@ -2075,7 +2155,7 @@
  
 diff -up linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c
 --- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-27 10:50:46.000000000 -0400
 @@ -118,7 +118,7 @@ static ssize_t ieee80211_if_fmt_flags(
  			 sdata->u.sta.authenticated ? "AUTH\n" : "",
  			 sdata->u.sta.associated ? "ASSOC\n" : "",
@@ -2126,7 +2206,7 @@
  }
 diff -up linux-2.6.22.noarch/net/wireless/Makefile.orig linux-2.6.22.noarch/net/wireless/Makefile
 --- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -1,4 +1,4 @@
  obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -2134,8 +2214,8 @@
 -cfg80211-y += core.o sysfs.o
 +cfg80211-y += core.o sysfs.o radiotap.o
 diff -up /dev/null linux-2.6.22.noarch/net/wireless/radiotap.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,257 @@
 +/*
 + * Radiotap parser
@@ -2396,7 +2476,7 @@
 +EXPORT_SYMBOL(ieee80211_radiotap_iterator_next);
 diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
 --- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-27 10:50:46.000000000 -0400
 @@ -213,7 +213,7 @@ out_fail_notifier:
  out_fail_sysfs:
  	return err;
@@ -2408,7 +2488,7 @@
  {
 diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
 --- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
  	cfg80211_dev_free(rdev);
  }
@@ -2426,7 +2506,7 @@
  	.name = "ieee80211",
 diff -up linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig linux-2.6.22.noarch/drivers/net/wireless/airo.c
 --- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-27 10:50:46.000000000 -0400
 @@ -52,6 +52,8 @@
  
  #include "airo.h"
@@ -3044,7 +3124,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-27 10:50:46.000000000 -0400
 @@ -49,8 +49,9 @@ void zd_chip_clear(struct zd_chip *chip)
  	ZD_MEMCLEAR(chip, sizeof(*chip));
  }
@@ -3227,7 +3307,7 @@
  	ZD_ASSERT(mutex_is_locked(&chip->mutex));
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -3,7 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o
  zd1211rw-objs := zd_chip.o zd_ieee80211.o \
  		zd_mac.o zd_netdev.o \
@@ -3239,7 +3319,7 @@
  ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-27 10:50:46.000000000 -0400
 @@ -26,7 +26,7 @@
  #define AL2210_RF			0x7
  #define MAXIM_NEW_RF			0x8
@@ -3303,7 +3383,7 @@
  #endif /* _ZD_RF_H */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-27 10:50:46.000000000 -0400
 @@ -608,6 +608,9 @@ enum {
  #define CR_ZD1211B_TXOP			CTL_REG(0x0b20)
  #define CR_ZD1211B_RETRY_MAX		CTL_REG(0x0b28)
@@ -3359,7 +3439,7 @@
  int zd_chip_switch_radio_off(struct zd_chip *chip);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-27 10:50:46.000000000 -0400
 @@ -21,6 +21,8 @@
  #include "zd_usb.h"
  #include "zd_chip.h"
@@ -3423,7 +3503,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-27 10:50:46.000000000 -0400
 @@ -265,7 +265,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -3435,7 +3515,7 @@
  		       " devices\n");
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-27 10:50:46.000000000 -0400
 @@ -188,6 +188,7 @@ struct zd_usb {
  	struct zd_usb_rx rx;
  	struct zd_usb_tx tx;
@@ -3455,7 +3535,7 @@
  #endif /* _ZD_USB_H */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-27 10:50:46.000000000 -0400
 @@ -34,7 +34,7 @@ static const char * const rfs[] = {
  	[AL2210_RF]	= "AL2210_RF",
  	[MAXIM_NEW_RF]	= "MAXIM_NEW_RF",
@@ -3523,8 +3603,8 @@
  
  	r = zd_chip_lock_phy_regs(chip);
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -4062,7 +4142,7 @@
 +
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-27 10:50:46.000000000 -0400
 @@ -189,7 +189,8 @@ int zd_mac_init(struct zd_mac *mac,
  		struct usb_interface *intf);
  void zd_mac_clear(struct zd_mac *mac);
@@ -4075,7 +4155,7 @@
  int zd_mac_stop(struct net_device *netdev);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-27 10:50:46.000000000 -0400
 @@ -473,7 +473,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -4095,7 +4175,7 @@
  	rf->switch_radio_off = al7230b_switch_radio_off;
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-27 10:50:46.000000000 -0400
 @@ -15,7 +15,6 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
@@ -4309,7 +4389,7 @@
  		         "couldn't initialize mac. Error number %d\n", r);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-27 10:50:46.000000000 -0400
 @@ -86,38 +86,46 @@ out:
  	return r;
  }
@@ -4433,7 +4513,7 @@
  	/*
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1719,9 +1719,6 @@ static int wlan_set_encodeext(struct net
  			pkey->type = KEY_TYPE_ID_TKIP;
  		} else if (alg == IW_ENCODE_ALG_CCMP) {
@@ -4446,7 +4526,7 @@
  		/* If WPA isn't enabled yet, do that now */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wl
  	ret = 0;
  
@@ -4457,7 +4537,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-27 10:50:46.000000000 -0400
 @@ -613,6 +613,7 @@ static int wlan_service_main_thread(void
  
  	init_waitqueue_entry(&wait, current);
@@ -4468,7 +4548,7 @@
  		       "currenttxskb=%p dnld_sent=%d\n",
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-27 10:50:46.000000000 -0400
 @@ -240,7 +240,7 @@ static int wlan_cmd_802_11_enable_rsn(wl
  		if (*enable)
  			penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
@@ -4480,7 +4560,7 @@
  	lbs_deb_leave(LBS_DEB_CMD);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1768,7 +1768,8 @@ static int ipw2100_up(struct ipw2100_pri
  
  		if (priv->stop_rf_kill) {
@@ -4544,7 +4624,7 @@
  			timeout = timeout_duration[level - 1] / 1000;
 diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-27 10:50:46.000000000 -0400
 @@ -87,7 +87,6 @@ static struct pci_driver prism54_driver 
  	.remove = prism54_remove,
  	.suspend = prism54_suspend,
@@ -4555,7 +4635,7 @@
  /******************************************************************************
 diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev,
  	islpci_private *priv = netdev_priv(ndev);
  	struct islpci_acl *acl = &priv->acl;
@@ -4631,7 +4711,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-27 10:50:46.000000000 -0400
 @@ -70,7 +70,7 @@
  #define VQ
  #endif
@@ -4715,7 +4795,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1011,7 +1011,7 @@ static inline void wl3501_md_ind_interru
  	} else {
  		skb->dev = dev;
@@ -4727,7 +4807,7 @@
  		skb->protocol	= eth_type_trans(skb, dev);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-27 10:50:46.000000000 -0400
 @@ -326,7 +326,6 @@ static int ap_control_proc_read(char *pa
  	char *p = page;
  	struct ap_data *ap = (struct ap_data *) data;
@@ -4854,7 +4934,7 @@
  	}
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-27 10:50:46.000000000 -0400
 @@ -1,8 +1,6 @@
  #ifndef HOSTAP_CONFIG_H
  #define HOSTAP_CONFIG_H
@@ -4866,7 +4946,7 @@
   * configuration. From now on, support for hostapd is always included and it is
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-27 10:50:46.000000000 -0400
 @@ -20,7 +20,6 @@
  #include "hostap_wlan.h"
  
@@ -4909,7 +4989,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -22,7 +22,6 @@
  #include "hostap_wlan.h"
  
@@ -4943,7 +5023,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-27 10:50:46.000000000 -0400
 @@ -37,7 +37,6 @@
  MODULE_AUTHOR("Jouni Malinen");
  MODULE_DESCRIPTION("Host AP common routines");
@@ -4954,7 +5034,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct ne
  	local = iface->local;
  
@@ -4966,7 +5046,7 @@
  		 (local->sta_fw_ver >> 8) & 0xff,
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -23,7 +23,6 @@
  #include "hostap_wlan.h"
  
@@ -5010,7 +5090,7 @@
  
 diff -up linux-2.6.22.noarch/fs/compat_ioctl.c.orig linux-2.6.22.noarch/fs/compat_ioctl.c
 --- linux-2.6.22.noarch/fs/compat_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-18 10:11:13.000000000 -0400
++++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-27 10:53:45.000000000 -0400
 @@ -2306,8 +2306,10 @@ static int do_wireless_ioctl(unsigned in
  	struct iwreq __user *iwr_u;
  	struct iw_point __user *iwp;
@@ -5056,9 +5136,18 @@
  }
  
  /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
+@@ -3174,6 +3188,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY)
+ COMPATIBLE_IOCTL(SIOCGIWRETRY)
+ COMPATIBLE_IOCTL(SIOCSIWPOWER)
+ COMPATIBLE_IOCTL(SIOCGIWPOWER)
++COMPATIBLE_IOCTL(SIOCSIWAUTH)
++COMPATIBLE_IOCTL(SIOCGIWAUTH)
+ /* hiddev */
+ COMPATIBLE_IOCTL(HIDIOCGVERSION)
+ COMPATIBLE_IOCTL(HIDIOCAPPLICATION)
 diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,59 @@
 +How to use packet injection with mac80211
 +=========================================
@@ -5120,8 +5209,8 @@
 +
 +Andy Green <andy at warmcat.com>
 diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,152 @@
 +How to use radiotap headers
 +===========================


--- git-wireless-dev.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 15:35:38 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 11:35:38 -0400
Subject: rpms/lyx/EL-5 lyx.spec,1.51,1.52
Message-ID: <200709271535.l8RFZcdM013696@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13661

Modified Files:
	lyx.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-3
- epel: drop Requires(hint): wv (until wv is available)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- lyx.spec	12 Sep 2007 15:55:13 -0000	1.51
+++ lyx.spec	27 Sep 2007 15:34:58 -0000	1.52
@@ -6,7 +6,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -51,9 +51,9 @@
 # dvipost adds support for lyx's Document->Change Tracking feature
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
-%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
+%endif
 Requires(hint): xdg-utils
 
 %description
@@ -222,9 +222,12 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-3
+- epel: drop Requires(hint): wv (until wv is available)
+
 * Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
 - License: GPLv2+
-- EPEL: drop aiksaurus support (until aiksaurus is available)
+- epel: drop aiksaurus support (until aiksaurus is available)
 
 * Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
 - lyx-1.4.5.1



From fedora-extras-commits at redhat.com  Thu Sep 27 15:46:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:46:33 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.14, 1.15 mugshot.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200709271546.l8RFkX8f014000@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Sep 2007 21:37:11 -0000	1.14
+++ .cvsignore	27 Sep 2007 15:45:59 -0000	1.15
@@ -1 +1 @@
-mugshot-1.1.54.tar.gz
+mugshot-1.1.55.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mugshot.spec	20 Sep 2007 21:37:11 -0000	1.22
+++ mugshot.spec	27 Sep 2007 15:45:59 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.54
+Version:        1.1.55
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 1.1.55-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Sep 2007 21:37:11 -0000	1.15
+++ sources	27 Sep 2007 15:45:59 -0000	1.16
@@ -1 +1 @@
-fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz
+8281a8cbe1ebc7501adaf32f5790b900  mugshot-1.1.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:46:36 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:46:36 -0400
Subject: rpms/bigboard/devel .cvsignore,1.28,1.29 sources,1.29,1.30
Message-ID: <200709271546.l8RFka5n014008@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13958

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	21 Sep 2007 16:14:33 -0000	1.28
+++ .cvsignore	27 Sep 2007 15:46:04 -0000	1.29
@@ -1 +1 @@
-bigboard-0.5.18.tar.gz
+bigboard-0.5.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	21 Sep 2007 16:14:33 -0000	1.29
+++ sources	27 Sep 2007 15:46:04 -0000	1.30
@@ -1 +1 @@
-4acfe82aae3056c12809e8f42b87e91f  bigboard-0.5.18.tar.gz
+e162eaefa748b62539282828896ed8b2  bigboard-0.5.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:47:17 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:47:17 -0400
Subject: rpms/online-desktop/devel .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709271547.l8RFlH72014065@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13987

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2007 16:09:00 -0000	1.10
+++ .cvsignore	27 Sep 2007 15:46:27 -0000	1.11
@@ -1 +1 @@
-online-desktop-0.2.16.tar.gz
+online-desktop-0.2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Sep 2007 16:09:00 -0000	1.10
+++ sources	27 Sep 2007 15:46:27 -0000	1.11
@@ -1 +1 @@
-f40b27522ead6212aadd28e4e9543395  online-desktop-0.2.16.tar.gz
+a1a052200e2c422053da2fdd0dfda2e1  online-desktop-0.2.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:57:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 11:57:38 -0400
Subject: rpms/t1lib/F-7 t1lib-cve-2007-4033.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 t1lib.spec, 1.15,
	1.16 t1lib-5.1.0-destdir.patch, 1.1, NONE
Message-ID: <200709271557.l8RFvci6014371@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14319

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Removed Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
+++ .cvsignore	27 Sep 2007 15:57:05 -0000	1.4
@@ -1 +1 @@
-t1lib-5.1.0.tar.gz
+t1lib-5.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 14:04:18 -0000	1.3
+++ sources	27 Sep 2007 15:57:05 -0000	1.4
@@ -1 +1 @@
-a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz
+b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/t1lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- t1lib.spec	28 Aug 2007 18:20:35 -0000	1.15
+++ t1lib.spec	27 Sep 2007 15:57:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 


--- t1lib-5.1.0-destdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:00:22 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 27 Sep 2007 12:00:22 -0400
Subject: rpms/repoview/devel .cvsignore, 1.8, 1.9 repoview.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200709271600.l8RG0Ml1014493@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Upstream 0.6.1, adjust license to GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Aug 2007 16:23:46 -0000	1.8
+++ .cvsignore	27 Sep 2007 15:59:50 -0000	1.9
@@ -1 +1 @@
-repoview-0.6.0.tar.gz
+repoview-0.6.1.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- repoview.spec	6 Aug 2007 16:23:46 -0000	1.8
+++ repoview.spec	27 Sep 2007 15:59:50 -0000	1.9
@@ -1,10 +1,10 @@
 Name:           repoview
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://linux.duke.edu/projects/mini/repoview
 Source0:        http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.1-1
+- Upstream 0.6.1
+- Adjust license to GPLv2+
+
 * Thu Jul 19 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.0-1
 - Upstream 0.6.0
 - Drop obsolete patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Aug 2007 16:23:46 -0000	1.8
+++ sources	27 Sep 2007 15:59:50 -0000	1.9
@@ -1 +1 @@
-2513a5be6eccdd303474939e828da79f  repoview-0.6.0.tar.gz
+88edc05aba35e4b2734ad9cc11759438  repoview-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 16:13:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:13:28 -0400
Subject: rpms/t1lib/FC-6 t1lib-cve-2007-4033.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 t1lib.spec, 1.15,
	1.16 t1lib-5.1.0-destdir.patch, 1.1, NONE
Message-ID: <200709271613.l8RGDSaJ021097@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21040

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Removed Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
+++ .cvsignore	27 Sep 2007 16:12:56 -0000	1.4
@@ -1 +1 @@
-t1lib-5.1.0.tar.gz
+t1lib-5.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 14:04:18 -0000	1.3
+++ sources	27 Sep 2007 16:12:56 -0000	1.4
@@ -1 +1 @@
-a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz
+b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/t1lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- t1lib.spec	28 Aug 2007 18:19:56 -0000	1.15
+++ t1lib.spec	27 Sep 2007 16:12:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 


--- t1lib-5.1.0-destdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:21 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 12:16:21 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.5,
	1.6 kernel-2.6.21-x86_64-xen.config, 1.6, 1.7 kernel-xen.spec,
	1.61, 1.62
Message-ID: <200709271616.l8RGGLFo021365@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21167

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Revert last commit

fw-sbp2 module would be useless without fw-ohci. Duh.




Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.21-i686-xen.config	27 Sep 2007 14:39:03 -0000	1.5
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 16:15:49 -0000	1.6
@@ -1315,9 +1315,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:39:03 -0000	1.6
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 16:15:49 -0000	1.7
@@ -1221,9 +1221,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel-xen.spec	27 Sep 2007 14:39:03 -0000	1.61
+++ kernel-xen.spec	27 Sep 2007 16:15:49 -0000	1.62
@@ -2362,10 +2362,6 @@
 #  - tux.
 
 %changelog
-* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
-- Reenabled Firewire but kept fw-ohci disabled (bug #307461).
-  fw-sbp2 should be working
-
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:22 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 12:16:22 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.6,
	1.7 kernel-2.6.20-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec,
	1.50, 1.51
Message-ID: <200709271616.l8RGGMvn021370@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Revert last commit

fw-sbp2 module would be useless without fw-ohci. Duh.




Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-2.6.20-i686-xen.config	27 Sep 2007 14:24:04 -0000	1.6
+++ kernel-2.6.20-i686-xen.config	27 Sep 2007 16:15:48 -0000	1.7
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-# CONFIG_FW_OHCI is not set
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.20-x86_64-xen.config	27 Sep 2007 14:24:04 -0000	1.5
+++ kernel-2.6.20-x86_64-xen.config	27 Sep 2007 16:15:48 -0000	1.6
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-# CONFIG_FW_OHCI is not set
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	27 Sep 2007 14:24:04 -0000	1.50
+++ kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
@@ -2072,10 +2072,6 @@
 #  - tux.
 
 %changelog
-* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
-- Reenable Firewire but disable fw-ohci module. sbp2 module
-  should be working (bug #302471)
-
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:16:35 -0400
Subject: rpms/grace/devel grace.spec,1.16,1.17
Message-ID: <200709271616.l8RGGZLx021373@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21345

Modified Files:
	grace.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grace.spec	28 Aug 2007 17:40:39 -0000	1.16
+++ grace.spec	27 Sep 2007 16:16:02 -0000	1.17
@@ -1,6 +1,9 @@
+%define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
+
 Name:           grace
 Version:        5.1.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -28,8 +31,6 @@
 
 Requires:	nedit
 Requires:	htmlview
-Requires(post): chkfontpath
-Requires(postun): chkfontpath
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -129,13 +130,14 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -143,7 +145,6 @@
 
 
 %postun
-%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -163,6 +164,7 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
+%{catalogue}/%{name}-type1
 
 
 %files devel
@@ -175,6 +177,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
+- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:38 -0700
Subject: [pkgdb] aldrin was added for akahl
Message-ID: <200709271625.l8RGPhGF021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aldrin with summary Modular music sequencer/tracker
Kevin Fenzi (kevin) has approved Package aldrin
Kevin Fenzi (kevin) has added a Fedora devel branch for aldrin with an owner of akahl
Kevin Fenzi (kevin) has approved aldrin in Fedora devel
Kevin Fenzi (kevin) has approved Package aldrin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aldrin (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aldrin (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aldrin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:46 -0700
Subject: [pkgdb] aldrin (Fedora, 7) updated by kevin
Message-ID: <200709271625.l8RGPhGI021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for aldrin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on aldrin (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:47 -0700
Subject: [pkgdb] aldrin (Fedora, devel) updated by kevin
Message-ID: <200709271625.l8RGPhGL021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on aldrin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:39 -0400
Subject: rpms/aldrin - New directory
Message-ID: <200709271626.l8RGQd3B021957@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin

Log Message:
Directory /cvs/extras/rpms/aldrin added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:41 -0400
Subject: rpms/aldrin/devel - New directory
Message-ID: <200709271626.l8RGQfs8021971@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin/devel

Log Message:
Directory /cvs/extras/rpms/aldrin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:44 -0400
Subject: rpms/aldrin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271626.l8RGQi6t021996@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin

Added Files:
	Makefile import.log 
Log Message:
Setup of module aldrin


--- NEW FILE Makefile ---
# Top level Makefile for module aldrin
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:46 -0400
Subject: rpms/aldrin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709271626.l8RGQksY022013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aldrin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aldrin
# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $
NAME := aldrin
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:28:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:28:03 -0700
Subject: [pkgdb] scim-python was added for phuang
Message-ID: <200709271628.l8RGS8OP021244@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package scim-python with summary Python wrapper for Smart Common Input Method platform
Kevin Fenzi (kevin) has approved Package scim-python
Kevin Fenzi (kevin) has added a Fedora devel branch for scim-python with an owner of phuang
Kevin Fenzi (kevin) has approved scim-python in Fedora devel
Kevin Fenzi (kevin) has approved Package scim-python
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on scim-python (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on scim-python (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on scim-python (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-python



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:05 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:28:05 -0700
Subject: [pkgdb] scim-python (Fedora, devel) updated by kevin
Message-ID: <200709271628.l8RGSA3d021245@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on scim-python (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-python



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:30 -0400
Subject: rpms/scim-python - New directory
Message-ID: <200709271628.l8RGSUVY022228@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python

Log Message:
Directory /cvs/extras/rpms/scim-python added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:33 -0400
Subject: rpms/scim-python/devel - New directory
Message-ID: <200709271628.l8RGSX4r022247@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python/devel

Log Message:
Directory /cvs/extras/rpms/scim-python/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:35 -0400
Subject: rpms/scim-python Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271628.l8RGSZQm022272@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-python


--- NEW FILE Makefile ---
# Top level Makefile for module scim-python
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:37 -0400
Subject: rpms/scim-python/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709271628.l8RGSbel022291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-python


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: scim-python
# $Id: Makefile,v 1.1 2007/09/27 16:28:35 kevin Exp $
NAME := scim-python
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:29:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:43 -0700
Subject: [pkgdb] libHX was added for till
Message-ID: <200709271629.l8RGTmVt021413@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libHX with summary General-purpose library
Kevin Fenzi (kevin) has approved Package libHX
Kevin Fenzi (kevin) has added a Fedora devel branch for libHX with an owner of till
Kevin Fenzi (kevin) has approved libHX in Fedora devel
Kevin Fenzi (kevin) has approved Package libHX
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libHX (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libHX (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libHX (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:29:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:53 -0700
Subject: [pkgdb] libHX (Fedora, devel) updated by kevin
Message-ID: <200709271629.l8RGTwdm021432@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on libHX (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:29:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:53 -0700
Subject: [pkgdb] libHX (Fedora, 7) updated by kevin
Message-ID: <200709271629.l8RGTwdp021432@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libHX
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on libHX (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:10 -0400
Subject: rpms/libHX - New directory
Message-ID: <200709271630.l8RGUALL022431@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX

Log Message:
Directory /cvs/extras/rpms/libHX added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:14 -0400
Subject: rpms/libHX/devel - New directory
Message-ID: <200709271630.l8RGUE2j022452@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX/devel

Log Message:
Directory /cvs/extras/rpms/libHX/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:20 -0400
Subject: rpms/libHX Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271630.l8RGUKtt022477@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX

Added Files:
	Makefile import.log 
Log Message:
Setup of module libHX


--- NEW FILE Makefile ---
# Top level Makefile for module libHX
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:23 -0400
Subject: rpms/libHX/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709271630.l8RGUNFa022493@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libHX


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libHX
# $Id: Makefile,v 1.1 2007/09/27 16:30:21 kevin Exp $
NAME := libHX
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:31:13 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:31:13 -0400
Subject: rpms/tellico/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 tellico.spec, 1.13, 1.14
Message-ID: <200709271631.l8RGVDZL022639@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22589

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
- New upstream version (fixes problem with settings not being saved on Fedora).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Aug 2007 08:53:23 -0000	1.10
+++ .cvsignore	27 Sep 2007 16:30:39 -0000	1.11
@@ -1 +1 @@
-tellico-1.2.13.tar.gz
+tellico-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Aug 2007 08:53:23 -0000	1.10
+++ sources	27 Sep 2007 16:30:39 -0000	1.11
@@ -1 +1 @@
-7c0371d1e2b8e97d62fafb3fd5d79e7e  tellico-1.2.13.tar.gz
+38047e27d482757fae977fa49809a784  tellico-1.2.14.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tellico.spec	27 Aug 2007 15:17:15 -0000	1.13
+++ tellico.spec	27 Sep 2007 16:30:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tellico
-Version:        1.2.13
-Release:        2%{?dist}
+Version:        1.2.14
+Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -47,7 +47,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure --disable-rpath
 make %{?_smp_mflags}
@@ -104,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
+- New upstream version (fixes problem with settings not being saved on Fedora).
+
 * Mon Aug 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.13-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:36 -0700
Subject: [pkgdb] higlayout was added for jwrdegoede
Message-ID: <200709271631.l8RGVfkx021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package higlayout with summary Easy to use and powerful layout manager for Java
Kevin Fenzi (kevin) has approved Package higlayout
Kevin Fenzi (kevin) has added a Fedora devel branch for higlayout with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved higlayout in Fedora devel
Kevin Fenzi (kevin) has approved Package higlayout
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on higlayout (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on higlayout (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on higlayout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:45 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:45 -0700
Subject: [pkgdb] higlayout (Fedora, devel) updated by kevin
Message-ID: <200709271631.l8RGVfl2021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on higlayout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:45 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:45 -0700
Subject: [pkgdb] higlayout (Fedora, 7) updated by kevin
Message-ID: <200709271631.l8RGVfl5021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for higlayout
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on higlayout (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:31:57 -0400
Subject: rpms/higlayout - New directory
Message-ID: <200709271631.l8RGVvHI022805@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout

Log Message:
Directory /cvs/extras/rpms/higlayout added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:02 -0400
Subject: rpms/higlayout/devel - New directory
Message-ID: <200709271632.l8RGW2W7022830@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout/devel

Log Message:
Directory /cvs/extras/rpms/higlayout/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:05 -0400
Subject: rpms/higlayout Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271632.l8RGW5WK022855@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout

Added Files:
	Makefile import.log 
Log Message:
Setup of module higlayout


--- NEW FILE Makefile ---
# Top level Makefile for module higlayout
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:10 -0400
Subject: rpms/higlayout/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709271632.l8RGWA9Q022871@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module higlayout


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: higlayout
# $Id: Makefile,v 1.1 2007/09/27 16:32:08 kevin Exp $
NAME := higlayout
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:33:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:33:16 -0700
Subject: [pkgdb] wavpack (Fedora EPEL, 4) updated by kevin
Message-ID: <200709271633.l8RGXLdd021885@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for wavpack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on wavpack (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on wavpack (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on wavpack (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wavpack



From fedora-extras-commits at redhat.com  Thu Sep 27 16:33:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:33:16 -0700
Subject: [pkgdb] wavpack (Fedora EPEL, 5) updated by kevin
Message-ID: <200709271633.l8RGXLdg021885@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for wavpack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on wavpack (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on wavpack (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on wavpack (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wavpack



From fedora-extras-commits at redhat.com  Thu Sep 27 16:33:52 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 12:33:52 -0400
Subject: rpms/kernel/devel linux-2.6-x86-AMD-c1e-disable-apic-timer.patch,
	NONE, 
	1.1 patch-2.6.23-rc8-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.696,
	1.697 kernel.spec, 1.193, 1.194 linux-2.6-highres-timers.patch,
	1.14, 1.15 sources, 1.657, 1.658 upstream, 1.579,
	1.580 linux-2.6-x86-edd-maxdrive.patch, 1.1,
	NONE linux-2.6-x86-setup-handle-improperly-terminated-E820.patch,
	1.1, NONE patch-2.6.23-rc8-git1.bz2.sign, 1.1, NONE
Message-ID: <200709271633.l8RGXq3Q023230@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22979

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	linux-2.6-x86-AMD-c1e-disable-apic-timer.patch 
	patch-2.6.23-rc8-git2.bz2.sign 
Removed Files:
	linux-2.6-x86-edd-maxdrive.patch 
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch 
	patch-2.6.23-rc8-git1.bz2.sign 
Log Message:
* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc8-git2
- Re-add AMD timer fix removed from upstream
- Fix hotplug CPU (broken by AMD timer patch)


linux-2.6-x86-AMD-c1e-disable-apic-timer.patch:

--- NEW FILE linux-2.6-x86-AMD-c1e-disable-apic-timer.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e66485d747505e9d960b864fc6c37f8b2afafaf0
Commit:     e66485d747505e9d960b864fc6c37f8b2afafaf0
Parent:     3dffec45c2742961dd27f55aba426cb9cf3f0dcd
Author:     Thomas Gleixner <tglx at linutronix.de>
AuthorDate: Tue Sep 25 21:37:01 2007 +0200
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Wed Sep 26 09:22:04 2007 -0700

    x86-64: Disable local APIC timer use on AMD systems with C1E
    
    commit 3556ddfa9284a86a59a9b78fe5894430f6ab4eef titled
    
     [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E
    
    solves a problem with AMD dual core laptops e.g. HP nx6325 (Turion 64
    X2) with C1E enabled:
    
    When both cores go into idle at the same time, then the system switches
    into C1E state, which is basically the same as C3. This stops the local
    apic timer.
    
    This was debugged right after the dyntick merge on i386 and despite the
    patch title it fixes only the 32 bit path.
    
    x86_64 is still missing this fix. It seems that mainline is not really
    affected by this issue, as the PIT is running and keeps jiffies
    incrementing, but that's just waiting for trouble.
    
    -mm suffers from this problem due to the x86_64 high resolution timer
    patches.
    
    This is a quick and dirty port of the i386 code to x86_64.
    
    I spent quite a time with Rafael to debug the -mm / hrt wreckage until
    someone pointed us to this. I really had forgotten that we debugged this
    half a year ago already.
    
    Sigh, is it just me or is there something yelling arch/x86 into my ear?
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Tested-by: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 arch/x86_64/kernel/setup.c |   34 ++++++++++++++++++++++++++++++++++
 include/asm-x86_64/apic.h  |    1 +
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index af838f6..32054bf 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define ENABLE_C1E_MASK		0x18000000
+#define CPUID_PROCESSOR_SIGNATURE	1
+#define CPUID_XFAM		0x0ff00000
+#define CPUID_XFAM_K8		0x00000000
+#define CPUID_XFAM_10H		0x00100000
+#define CPUID_XFAM_11H		0x00200000
+#define CPUID_XMOD		0x000f0000
+#define CPUID_XMOD_REV_F	0x00040000
+
+/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
+static __cpuinit int amd_apic_timer_broken(void)
+{
+	u32 lo, hi;
+	u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
+	switch (eax & CPUID_XFAM) {
+	case CPUID_XFAM_K8:
+		if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
+			break;
+	case CPUID_XFAM_10H:
+	case CPUID_XFAM_11H:
+		rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
+		if (lo & ENABLE_C1E_MASK)
+			return 1;
+		break;
+	default:
+		/* err on the side of caution */
+		return 1;
+	}
+	return 0;
+}
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
 	unsigned level;
@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 	/* Family 10 doesn't support C states in MWAIT so don't use it */
 	if (c->x86 == 0x10 && !force_mwait)
 		clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
+
+	if (amd_apic_timer_broken())
+		disable_apic_timer = 1;
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h
index 85125ef..e458020 100644
--- a/include/asm-x86_64/apic.h
+++ b/include/asm-x86_64/apic.h
@@ -20,6 +20,7 @@ extern int apic_verbosity;
 extern int apic_runs_main_timer;
 extern int ioapic_force;
 extern int apic_mapped;
+extern int disable_apic_timer;
 
 /*
  * Define the default level of output to be very little
===================================================================
From: Rafael J. Wysocki <rjw at sisk.pl>

Fix CPU hotplug breakage on HP nx6325 and similar boxes caused by a reference
to disable_apic_timer (labeled as __initdata) from the CPU initialization code.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
 arch/x86_64/kernel/apic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.23-rc8-mm2.orig/arch/x86_64/kernel/apic.c
+++ linux-2.6.23-rc8-mm2/arch/x86_64/kernel/apic.c
@@ -42,7 +42,7 @@
 int apic_runs_main_timer;
 int apic_calibrate_pmtmr __initdata;
 
-int disable_apic_timer __initdata;
+int disable_apic_timer __cpuinitdata;
 
 /* Local APIC timer works in C2? */
 int local_apic_timer_c2_ok;


--- NEW FILE patch-2.6.23-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+1WoyGugalF9Dw4RAvvgAJ9rlXz2/rgvz6IRmKqhvnDRkuvx9gCff4pV
2skby1eGQ/b049BH6kUq/iA=
=ByeV
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- .cvsignore	26 Sep 2007 21:03:40 -0000	1.696
+++ .cvsignore	27 Sep 2007 16:33:17 -0000	1.697
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc8-git1.bz2
+patch-2.6.23-rc8-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kernel.spec	27 Sep 2007 14:37:05 -0000	1.193
+++ kernel.spec	27 Sep 2007 16:33:17 -0000	1.194
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -555,6 +555,7 @@
 
 %if !%{nopatches}
 
+Patch18: linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
 Patch19: linux-2.6-highres-timers.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
@@ -674,9 +675,6 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-Patch1600: linux-2.6-x86-edd-maxdrive.patch
-Patch1610: linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
-
 #nouveau
 Patch1800: drm-mm-git.patch
 Patch1801: nouveau-drm.patch
@@ -968,6 +966,8 @@
 
 %if !%{nopatches}
 
+# fix timer with AMD chips supporting C1e
+ApplyPatch linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
 
@@ -1218,12 +1218,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# EDD fix
-ApplyPatch linux-2.6-x86-edd-maxdrive.patch
-
-# e820 bugfix
-ApplyPatch linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1815,6 +1809,11 @@
 
 
 %changelog
+* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc8-git2
+- Re-add AMD timer fix removed from upstream
+- Fix hotplug CPU (broken by AMD timer patch)
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - Fix-up botched wireless patch restructuring...
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-highres-timers.patch	26 Sep 2007 21:26:15 -0000	1.14
+++ linux-2.6-highres-timers.patch	27 Sep 2007 16:33:17 -0000	1.15
@@ -5306,10 +5306,10 @@
 -int apic_runs_main_timer;
 -int apic_calibrate_pmtmr __initdata;
 -
--int disable_apic_timer __initdata;
+-int disable_apic_timer __cpuinitdata;
 +static int apic_mapped;
 +static int apic_calibrate_pmtmr __initdata;
-+int disable_apic_timer __initdata;
++int disable_apic_timer __cpuinitdata;
  
  /* Local APIC timer works in C2? */
  int local_apic_timer_c2_ok;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -r1.657 -r1.658
--- sources	26 Sep 2007 21:03:40 -0000	1.657
+++ sources	27 Sep 2007 16:33:17 -0000	1.658
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2
-22a7616e220e358cee563d6626fe50df  patch-2.6.23-rc8-git1.bz2
+30b939f6baea2e0d842a323cc7bdcbfe  patch-2.6.23-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- upstream	26 Sep 2007 21:03:40 -0000	1.579
+++ upstream	27 Sep 2007 16:33:17 -0000	1.580
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc8-git1.bz2
+patch-2.6.23-rc8-git2.bz2


--- linux-2.6-x86-edd-maxdrive.patch DELETED ---


--- linux-2.6-x86-setup-handle-improperly-terminated-E820.patch DELETED ---


--- patch-2.6.23-rc8-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:35:54 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Thu, 27 Sep 2007 12:35:54 -0400
Subject: rpms/libHX/devel libHX.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709271635.l8RGZsJ2023306@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23253/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libHX.spec 
Log Message:
initial upload



--- NEW FILE libHX.spec ---
Name:           libHX
Version:        1.10.1
Release:        2%{?dist}
Summary:        General-purpose library

Group:          System Environment/Libraries
License:        LGPLv2 or LGPLv3
URL:            http://jengelh.hopto.org/f/libHX/
Source0:        http://jengelh.hopto.org/f/libHX/libHX-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl gcc-c++


%description
A library for:
- A+R/B trees to use for lists or maps (associative arrays)
- Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs))
- platform independent opendir-style directory access
- platform independent dlopen-style shared library access
- auto-storage strings with direct access
- command line option (argv) parser
- shell-style config file parser
- platform independent random number generator with transparent
  /dev/urandom support
- various string, memory and zvec ops


%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
cp -a t examples


%build
%configure --disable-static
make %{?_smp_mflags}
rm examples/Makefile*

%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 LICENSE.LGPL2 LICENSE.LGPL3 LICENSE.GPL3
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/* examples
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libHX.pc


%changelog
* Thu Sep 27 2007 Till Maas <opensource till name> - 1.10.1-2
- add tests as examples to devel documentation

* Wed Sep 26 2007 Till Maas <opensource till name> - 1.10.1-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:30:21 -0000	1.1
+++ .cvsignore	27 Sep 2007 16:35:21 -0000	1.2
@@ -0,0 +1 @@
+libHX-1.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:30:21 -0000	1.1
+++ sources	27 Sep 2007 16:35:21 -0000	1.2
@@ -0,0 +1 @@
+ae2c7ac182a03e589fd45a7867177a0a  libHX-1.10.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 16:38:59 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Thu, 27 Sep 2007 12:38:59 -0400
Subject: rpms/straw/F-7 Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec, 1.8,
	1.9 dead.package, 1.1, NONE
Message-ID: <200709271639.l8RGcx1a023465@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/straw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23428/F-7

Added Files:
	Makefile sources straw.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	27 Sep 2007 16:38:26 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: straw
+# $Id$
+NAME := straw
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	27 Sep 2007 16:38:26 -0000	1.4
@@ -0,0 +1 @@
+5c64c65158dab096e2077e4f91412b37  straw-0.27.tar.gz


Index: straw.spec
===================================================================
RCS file: straw.spec
diff -N straw.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ straw.spec	27 Sep 2007 16:38:26 -0000	1.9
@@ -0,0 +1,123 @@
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+%define desktop_vendor fedora
+
+Summary:        Desktop news aggregator
+Name:           straw
+Version:        0.27
+Release:        9%{?dist}
+License:        GPLv2+
+Group:          Applications/Internet
+URL:            http://www.gnome.org/projects/straw/
+Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: python >= 2.4
+# fix for python >= 2.5
+%if "%{?fedora}" > "6"
+BuildRequires: python-devel
+%endif
+Requires: gnome-python2-gnomevfs
+Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-libegg
+Requires: gnome-python2-gconf
+Requires: pygtk2-libglade
+Requires: mx
+# Current python-adns makes double free problem (bug 292821)
+Conflicts:python-adns
+Requires: dbus-python
+
+Requires(pre): GConf2
+Requires(post):GConf2
+Requires(preun):GConf2
+
+BuildRequires: dbus-python
+BuildRequires: pygtk2-libglade
+BuildRequires: pygtk2 >= 2.8.0
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-python2-gconf
+BuildRequires: intltool
+
+BuildArch: noarch
+
+%description
+Straw is a desktop news aggregator for the GNOME environment. Its aim
+is to be a faster, easier and more accessible way to read news and
+blogs than the traditional browser.
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
+
+# this is a fix for constants.py to lookup in install dir rather than buildroot
+sed -i -e s@${RPM_BUILD_ROOT}@@ ${RPM_BUILD_ROOT}%{python_sitelib}/%{name}/constants.py
+
+%{__python} -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT%{python_sitelib}/%{name}'")'
+
+%find_lang %{name}
+
+%{__install} -Dp -m0644 data/%{name}.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas
+
+desktop-file-install --vendor %{desktop_vendor} --delete-original \
+                     --dir %{buildroot}%{_datadir}/applications    \
+                     %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%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 %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%{_sysconfdir}/gconf/schemas/straw.schemas
+%doc LICENSE NEWS README TODO ChangeLog AUTHORS
+%{_bindir}/%{name}
+%{python_sitelib}/straw/
+%{_datadir}/straw/
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+
+
+%changelog
+* Sun Sep 23 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-9
+- Fixed dependecies related to pygtk
+* Fri Sep 21 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-8
+- Fixed dependencies related to gnome-python2
+* Mon Sep 17 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-7
+- Fixed redundant dependencies 
+* Sun Sep 16 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-6
+- Fixed usage Gconf.Straw does not support python-adns anymore.
+- So removed it. Fixed Spec file indentation warning.
+* Thu Sep 14 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-5
+- Fixed few major errors and dependencies
+* Tue Sep 11 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-4
+- Fixed failed dependencies
+* Mon Sep 10 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-3
+- Fixed few errors 
+* Sun Sep 9  2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-2
+- Some dependencies fixed 
+* Tue Aug 27 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-1
+- Updated to 0.27


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:39:53 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 12:39:53 -0400
Subject: rpms/gdm/devel gdm-2.19.1-security-tokens.patch, 1.6, 1.7 gdm.spec, 
	1.290, 1.291
Message-ID: <200709271639.l8RGdraw023529@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466

Modified Files:
	gdm-2.19.1-security-tokens.patch gdm.spec 
Log Message:
- Fix an apparent typo in the securitytokens.conf config file
  (bug 301031)


gdm-2.19.1-security-tokens.patch:

Index: gdm-2.19.1-security-tokens.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.19.1-security-tokens.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdm-2.19.1-security-tokens.patch	21 May 2007 20:11:54 -0000	1.6
+++ gdm-2.19.1-security-tokens.patch	27 Sep 2007 16:39:14 -0000	1.7
@@ -21,7 +21,7 @@
 +++ gdm-2.19.1/config/securitytokens.conf.in	2007-05-21 16:04:51.000000000 -0400
 @@ -0,0 +1,3 @@
 +[SecurityTokens]
-+Enable=true
++Enabled=true
 +#Driver=@libdir@/pkcs11/libcoolkeypk11.so
 --- gdm-2.19.1/config/Makefile.am.security-tokens	2007-05-13 22:08:25.000000000 -0400
 +++ gdm-2.19.1/config/Makefile.am	2007-05-21 16:04:51.000000000 -0400


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- gdm.spec	20 Sep 2007 18:31:17 -0000	1.290
+++ gdm.spec	27 Sep 2007 16:39:14 -0000	1.291
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-5
+- Fix an apparent typo in the securitytokens.conf config file
+  (bug 301031)
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-4
 - Reenable root login due to popular demand
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:45:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:45:41 -0400
Subject: CVSROOT loginfo,1.12,1.13
Message-ID: <200709271645.l8RGjfxh023823@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	loginfo 
Log Message:
Added loginfo for #162


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- loginfo	4 Jan 2006 20:37:13 -0000	1.12
+++ loginfo	27 Sep 2007 16:45:38 -0000	1.13
@@ -32,3 +32,4 @@
 DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org
+fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 27 16:46:16 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:46:16 -0400
Subject: CVSROOT avail,1.48,1.49
Message-ID: <200709271646.l8RGkGs0023855@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	avail 
Log Message:
Granting permissions


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- avail	9 Aug 2007 15:35:22 -0000	1.48
+++ avail	27 Sep 2007 16:46:14 -0000	1.49
@@ -13,7 +13,7 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers | CVSROOT
+avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers,mmcgrath | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
 avail | kwade | CVSROOT/avail



From fedora-extras-commits at redhat.com  Thu Sep 27 16:54:29 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:54:29 -0400
Subject: CVSROOT loginfo,1.13,1.14
Message-ID: <200709271654.l8RGsTEY024235@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	loginfo 
Log Message:
Added the ^


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- loginfo	27 Sep 2007 16:45:38 -0000	1.13
+++ loginfo	27 Sep 2007 16:54:26 -0000	1.14
@@ -29,7 +29,7 @@
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
 ^idweb $CVSROOT/CVSROOT/syncmail %{sVv} cvs-sysadmin at fedora.redhat.com
 ^web $CVSROOT/CVSROOT/syncmail %{sVv} cvs-web at fedora.redhat.com
+^fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com
 DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org
-fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 27 17:20:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 13:20:59 -0400
Subject: rpms/gdm/devel gdm-2.19.1-security-tokens.patch, 1.7, 1.8 gdm.spec, 
	1.291, 1.292
Message-ID: <200709271720.l8RHKxTi003992@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3585

Modified Files:
	gdm-2.19.1-security-tokens.patch gdm.spec 
Log Message:
- The previously mentioned typo didn't matter before because the
  compiled in default matched what the config file was supposed to
  say.  This commit restores matched default behavior (bug 301031)


gdm-2.19.1-security-tokens.patch:

Index: gdm-2.19.1-security-tokens.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.19.1-security-tokens.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdm-2.19.1-security-tokens.patch	27 Sep 2007 16:39:14 -0000	1.7
+++ gdm-2.19.1-security-tokens.patch	27 Sep 2007 17:20:23 -0000	1.8
@@ -189,7 +189,7 @@
 +        goto out;
 +    }
 +
-+    if (!g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
++    if (g_key_file_has_key (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL) && !g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
 +
 +          gdm_debug ("security token support is not enabled");
 +          goto out;


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- gdm.spec	27 Sep 2007 16:39:14 -0000	1.291
+++ gdm.spec	27 Sep 2007 17:20:23 -0000	1.292
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,11 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-6
+- The previously mentioned typo didn't matter before because the
+  compiled in default matched what the config file was supposed to
+  say.  This commit restores matched default behavior (bug 301031)
+
 * Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-5
 - Fix an apparent typo in the securitytokens.conf config file
   (bug 301031)



From fedora-extras-commits at redhat.com  Thu Sep 27 17:28:03 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 27 Sep 2007 13:28:03 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.157, 1.158 mkinitrd.spec, 1.222, 
	1.223 sources, 1.200, 1.201
Message-ID: <200709271728.l8RHS3ec005428@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	25 Sep 2007 13:33:41 -0000	1.157
+++ .cvsignore	27 Sep 2007 17:27:31 -0000	1.158
@@ -1 +1 @@
-mkinitrd-6.0.18.tar.bz2
+mkinitrd-6.0.19.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- mkinitrd.spec	25 Sep 2007 13:33:41 -0000	1.222
+++ mkinitrd.spec	27 Sep 2007 17:27:31 -0000	1.223
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.18
+Version: 6.0.19
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Thu Sep 27 2007 Peter Jones <pjones at redhat.com> - 6.0.19-1
+- Fix nosegneg library discovery in get_dso_deps() harder (#244730)
+
 * Tue Sep 25 2007 Peter Jones <pjones at redhat.com> - 6.0.18-1
 - Fix segfault on x86_64 paravirt (#304731, patch from Harald Hoyer)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- sources	25 Sep 2007 13:33:41 -0000	1.200
+++ sources	27 Sep 2007 17:27:31 -0000	1.201
@@ -1 +1 @@
-28d075b5b918ebf32ac5517606d38a22  mkinitrd-6.0.18.tar.bz2
+92161ee7487052b9c1796f61014a47a0  mkinitrd-6.0.19.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 17:55:49 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 13:55:49 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.131,
	1.132 libselinux.spec, 1.289, 1.290
Message-ID: <200709271755.l8RHtnNB006882@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6662

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
- Fix segfault on missing file_context file


libselinux-rhat.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.131 -r 1.132 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libselinux-rhat.patch	27 Sep 2007 14:54:10 -0000	1.131
+++ libselinux-rhat.patch	27 Sep 2007 17:55:13 -0000	1.132
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.35/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
-+++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
++++ libselinux-2.0.35/src/matchpathcon.c	2007-09-27 13:50:55.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -18,9 +18,9074 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.34/utils/matchpathcon.c
+@@ -305,8 +306,10 @@
+ 
+ void matchpathcon_fini(void)
+ {
+-	selabel_close(hnd);
+-	hnd = NULL;
++	if (hnd) {
++		selabel_close(hnd);
++		hnd = NULL;
++	}
+ }
+ 
+ int matchpathcon(const char *name, mode_t mode, security_context_t * con)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.35/src/selinux.py
+--- nsalibselinux/src/selinux.py	2007-09-13 08:21:12.000000000 -0400
++++ libselinux-2.0.35/src/selinux.py	1969-12-31 19:00:00.000000000 -0500
+@@ -1,314 +0,0 @@
+-# This file was automatically generated by SWIG (http://www.swig.org).
+-# Version 1.3.31
+-#
+-# Don't modify this file, modify the SWIG interface instead.
+-# This file is compatible with both classic and new-style classes.
+-
+-import _selinux
+-import new
+-new_instancemethod = new.instancemethod
+-try:
+-    _swig_property = property
+-except NameError:
+-    pass # Python < 2.2 doesn't have 'property'.
+-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+-    if (name == "thisown"): return self.this.own(value)
+-    if (name == "this"):
+-        if type(value).__name__ == 'PySwigObject':
+-            self.__dict__[name] = value
+-            return
+-    method = class_type.__swig_setmethods__.get(name,None)
+-    if method: return method(self,value)
+-    if (not static) or hasattr(self,name):
+-        self.__dict__[name] = value
+-    else:
+-        raise AttributeError("You cannot add attributes to %s" % self)
+-
+-def _swig_setattr(self,class_type,name,value):
+-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+-
+-def _swig_getattr(self,class_type,name):
+-    if (name == "thisown"): return self.this.own()
+-    method = class_type.__swig_getmethods__.get(name,None)
+-    if method: return method(self)
+-    raise AttributeError,name
+-
+-def _swig_repr(self):
+-    try: strthis = "proxy of " + self.this.__repr__()
+-    except: strthis = ""
+-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+-
+-import types
+-try:
+-    _object = types.ObjectType
+-    _newclass = 1
+-except AttributeError:
+-    class _object : pass
+-    _newclass = 0
+-del types
+-
+-
+-is_selinux_enabled = _selinux.is_selinux_enabled
+-is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
+-getcon = _selinux.getcon
+-getcon_raw = _selinux.getcon_raw
+-setcon = _selinux.setcon
+-setcon_raw = _selinux.setcon_raw
+-getpidcon = _selinux.getpidcon
+-getpidcon_raw = _selinux.getpidcon_raw
+-getprevcon = _selinux.getprevcon
+-getprevcon_raw = _selinux.getprevcon_raw
+-getexeccon = _selinux.getexeccon
+-getexeccon_raw = _selinux.getexeccon_raw
+-setexeccon = _selinux.setexeccon
+-setexeccon_raw = _selinux.setexeccon_raw
+-getfscreatecon = _selinux.getfscreatecon
+-getfscreatecon_raw = _selinux.getfscreatecon_raw
+-setfscreatecon = _selinux.setfscreatecon
+-setfscreatecon_raw = _selinux.setfscreatecon_raw
+-getkeycreatecon = _selinux.getkeycreatecon
+-getkeycreatecon_raw = _selinux.getkeycreatecon_raw
+-setkeycreatecon = _selinux.setkeycreatecon
+-setkeycreatecon_raw = _selinux.setkeycreatecon_raw
+-getsockcreatecon = _selinux.getsockcreatecon
+-getsockcreatecon_raw = _selinux.getsockcreatecon_raw
+-setsockcreatecon = _selinux.setsockcreatecon
+-setsockcreatecon_raw = _selinux.setsockcreatecon_raw
+-getfilecon = _selinux.getfilecon
+-getfilecon_raw = _selinux.getfilecon_raw
+-lgetfilecon = _selinux.lgetfilecon
+-lgetfilecon_raw = _selinux.lgetfilecon_raw
+-fgetfilecon = _selinux.fgetfilecon
+-fgetfilecon_raw = _selinux.fgetfilecon_raw
+-setfilecon = _selinux.setfilecon
+-setfilecon_raw = _selinux.setfilecon_raw
+-lsetfilecon = _selinux.lsetfilecon
+-lsetfilecon_raw = _selinux.lsetfilecon_raw
+-fsetfilecon = _selinux.fsetfilecon
+-fsetfilecon_raw = _selinux.fsetfilecon_raw
+-getpeercon = _selinux.getpeercon
+-getpeercon_raw = _selinux.getpeercon_raw
+-class av_decision(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, av_decision, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, av_decision, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["allowed"] = _selinux.av_decision_allowed_set
+-    __swig_getmethods__["allowed"] = _selinux.av_decision_allowed_get
+-    if _newclass:allowed = _swig_property(_selinux.av_decision_allowed_get, _selinux.av_decision_allowed_set)
+-    __swig_setmethods__["decided"] = _selinux.av_decision_decided_set
+-    __swig_getmethods__["decided"] = _selinux.av_decision_decided_get
+-    if _newclass:decided = _swig_property(_selinux.av_decision_decided_get, _selinux.av_decision_decided_set)
+-    __swig_setmethods__["auditallow"] = _selinux.av_decision_auditallow_set
+-    __swig_getmethods__["auditallow"] = _selinux.av_decision_auditallow_get
+-    if _newclass:auditallow = _swig_property(_selinux.av_decision_auditallow_get, _selinux.av_decision_auditallow_set)
+-    __swig_setmethods__["auditdeny"] = _selinux.av_decision_auditdeny_set
+-    __swig_getmethods__["auditdeny"] = _selinux.av_decision_auditdeny_get
+-    if _newclass:auditdeny = _swig_property(_selinux.av_decision_auditdeny_get, _selinux.av_decision_auditdeny_set)
+-    __swig_setmethods__["seqno"] = _selinux.av_decision_seqno_set
+-    __swig_getmethods__["seqno"] = _selinux.av_decision_seqno_get
+-    if _newclass:seqno = _swig_property(_selinux.av_decision_seqno_get, _selinux.av_decision_seqno_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_av_decision(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_av_decision
+-    __del__ = lambda self : None;
+-av_decision_swigregister = _selinux.av_decision_swigregister
+-av_decision_swigregister(av_decision)
+-
+-class selinux_opt(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_opt, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_opt, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["type"] = _selinux.selinux_opt_type_set
+-    __swig_getmethods__["type"] = _selinux.selinux_opt_type_get
+-    if _newclass:type = _swig_property(_selinux.selinux_opt_type_get, _selinux.selinux_opt_type_set)
+-    __swig_setmethods__["value"] = _selinux.selinux_opt_value_set
+-    __swig_getmethods__["value"] = _selinux.selinux_opt_value_get
+-    if _newclass:value = _swig_property(_selinux.selinux_opt_value_get, _selinux.selinux_opt_value_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_opt(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_opt
+-    __del__ = lambda self : None;
+-selinux_opt_swigregister = _selinux.selinux_opt_swigregister
+-selinux_opt_swigregister(selinux_opt)
+-
+-class selinux_callback(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_callback, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_callback, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["func_log"] = _selinux.selinux_callback_func_log_set
+-    __swig_getmethods__["func_log"] = _selinux.selinux_callback_func_log_get
+-    if _newclass:func_log = _swig_property(_selinux.selinux_callback_func_log_get, _selinux.selinux_callback_func_log_set)
+-    __swig_setmethods__["func_audit"] = _selinux.selinux_callback_func_audit_set
+-    __swig_getmethods__["func_audit"] = _selinux.selinux_callback_func_audit_get
+-    if _newclass:func_audit = _swig_property(_selinux.selinux_callback_func_audit_get, _selinux.selinux_callback_func_audit_set)
+-    __swig_setmethods__["func_validate"] = _selinux.selinux_callback_func_validate_set
+-    __swig_getmethods__["func_validate"] = _selinux.selinux_callback_func_validate_get
+-    if _newclass:func_validate = _swig_property(_selinux.selinux_callback_func_validate_get, _selinux.selinux_callback_func_validate_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_callback(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_callback
[...8694 lines suppressed...]
+-    static PyTypeObject varlink_type;
+-    static int type_init = 0;  
+-    if (!type_init) {
+-      const PyTypeObject tmp
+-      = {
+-        PyObject_HEAD_INIT(NULL)
+-        0,                                  /* Number of items in variable part (ob_size) */
+-        (char *)"swigvarlink",              /* Type name (tp_name) */
+-        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+-        0,                                  /* Itemsize (tp_itemsize) */
+-        (destructor) swig_varlink_dealloc,   /* Deallocator (tp_dealloc) */ 
+-        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+-        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+-        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+-        0,                                  /* tp_compare */
+-        (reprfunc) swig_varlink_repr,       /* tp_repr */
+-        0,                                  /* tp_as_number */
+-        0,                                  /* tp_as_sequence */
+-        0,                                  /* tp_as_mapping */
+-        0,                                  /* tp_hash */
+-        0,                                  /* tp_call */
+-        (reprfunc)swig_varlink_str,        /* tp_str */
+-        0,                                  /* tp_getattro */
+-        0,                                  /* tp_setattro */
+-        0,                                  /* tp_as_buffer */
+-        0,                                  /* tp_flags */
+-        varlink__doc__,                     /* tp_doc */
+-        0,                                  /* tp_traverse */
+-        0,                                  /* tp_clear */
+-        0,                                  /* tp_richcompare */
+-        0,                                  /* tp_weaklistoffset */
+-#if PY_VERSION_HEX >= 0x02020000
+-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+-#endif
+-#if PY_VERSION_HEX >= 0x02030000
+-        0,                                  /* tp_del */
+-#endif
+-#ifdef COUNT_ALLOCS
+-        0,0,0,0                             /* tp_alloc -> tp_next */
+-#endif
+-      };
+-      varlink_type = tmp;
+-      varlink_type.ob_type = &PyType_Type;
+-      type_init = 1;
+-    }
+-    return &varlink_type;
+-  }
+-  
+-  /* Create a variable linking object for use later */
+-  SWIGINTERN PyObject *
+-  SWIG_Python_newvarlink(void) {
+-    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+-    if (result) {
+-      result->vars = 0;
+-    }
+-    return ((PyObject*) result);
+-  }
+-  
+-  SWIGINTERN void 
+-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+-    swig_varlinkobject *v = (swig_varlinkobject *) p;
+-    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+-    if (gv) {
+-      size_t size = strlen(name)+1;
+-      gv->name = (char *)malloc(size);
+-      if (gv->name) {
+-        strncpy(gv->name,name,size);
+-        gv->get_attr = get_attr;
+-        gv->set_attr = set_attr;
+-        gv->next = v->vars;
+-      }
+-    }
+-    v->vars = gv;
+-  }
+-  
+-  SWIGINTERN PyObject *
+-  SWIG_globals(void) {
+-    static PyObject *_SWIG_globals = 0; 
+-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+-    return _SWIG_globals;
+-  }
+-  
+-  /* -----------------------------------------------------------------------------
+-   * constants/methods manipulation
+-   * ----------------------------------------------------------------------------- */
+-  
+-  /* Install Constants */
+-  SWIGINTERN void
+-  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+-    PyObject *obj = 0;
+-    size_t i;
+-    for (i = 0; constants[i].type; ++i) {
+-      switch(constants[i].type) {
+-      case SWIG_PY_POINTER:
+-        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+-        break;
+-      case SWIG_PY_BINARY:
+-        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+-        break;
+-      default:
+-        obj = 0;
+-        break;
+-      }
+-      if (obj) {
+-        PyDict_SetItemString(d, constants[i].name, obj);
+-        Py_DECREF(obj);
+-      }
+-    }
+-  }
+-  
+-  /* -----------------------------------------------------------------------------*/
+-  /* Fix SwigMethods to carry the callback ptrs when needed */
+-  /* -----------------------------------------------------------------------------*/
+-  
+-  SWIGINTERN void
+-  SWIG_Python_FixMethods(PyMethodDef *methods,
+-    swig_const_info *const_table,
+-    swig_type_info **types,
+-    swig_type_info **types_initial) {
+-    size_t i;
+-    for (i = 0; methods[i].ml_name; ++i) {
+-      const char *c = methods[i].ml_doc;
+-      if (c && (c = strstr(c, "swig_ptr: "))) {
+-        int j;
+-        swig_const_info *ci = 0;
+-        const char *name = c + 10;
+-        for (j = 0; const_table[j].type; ++j) {
+-          if (strncmp(const_table[j].name, name, 
+-              strlen(const_table[j].name)) == 0) {
+-            ci = &(const_table[j]);
+-            break;
+-          }
+-        }
+-        if (ci) {
+-          size_t shift = (ci->ptype) - types;
+-          swig_type_info *ty = types_initial[shift];
+-          size_t ldoc = (c - methods[i].ml_doc);
+-          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+-          char *ndoc = (char*)malloc(ldoc + lptr + 10);
+-          if (ndoc) {
+-            char *buff = ndoc;
+-            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+-            if (ptr) {
+-              strncpy(buff, methods[i].ml_doc, ldoc);
+-              buff += ldoc;
+-              strncpy(buff, "swig_ptr: ", 10);
+-              buff += 10;
+-              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+-              methods[i].ml_doc = ndoc;
+-            }
+-          }
+-        }
+-      }
+-    }
+-  } 
+-  
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-/* -----------------------------------------------------------------------------*
+- *  Partial Init method
+- * -----------------------------------------------------------------------------*/
+-
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-SWIGEXPORT void SWIG_init(void) {
+-  PyObject *m, *d;
+-  
+-  /* Fix SwigMethods to carry the callback ptrs when needed */
+-  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
+-  
+-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+-  d = PyModule_GetDict(m);
+-  
+-  SWIG_InitializeModule(0);
+-  SWIG_InstallConstants(d,swig_const_table);
+-  
+-  
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_LOG",SWIG_From_int((int)(0)));
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_AUDIT",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_VALIDATE",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "SELINUX_ERROR",SWIG_From_int((int)(0)));
+-  SWIG_Python_SetConstant(d, "SELINUX_WARNING",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "SELINUX_INFO",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "SELINUX_AVC",SWIG_From_int((int)(3)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4)));
+-  SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
+-}
+-
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.35/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
-+++ libselinux-2.0.34/utils/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
++++ libselinux-2.0.35/utils/matchpathcon.c	2007-09-27 10:22:29.000000000 -0400
 @@ -17,10 +17,24 @@
  	exit(1);
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- libselinux.spec	27 Sep 2007 14:54:10 -0000	1.289
+++ libselinux.spec	27 Sep 2007 17:55:13 -0000	1.290
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.35
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -123,6 +123,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
+- Fix segfault on missing file_context file
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
 - Upgrade to upstream
 	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.



From fedora-extras-commits at redhat.com  Thu Sep 27 18:06:31 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:06:31 -0400
Subject: rpms/perl-Jcode/devel perl-Jcode.spec,1.14,1.15
Message-ID: <200709271806.l8RI6Vbp013732@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Jcode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612

Modified Files:
	perl-Jcode.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-5
- fix license (thanks Tom)



Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Jcode.spec	26 Aug 2007 09:28:42 -0000	1.14
+++ perl-Jcode.spec	27 Sep 2007 18:05:57 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           perl-Jcode
 Version:        2.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Perl extension interface for converting Japanese text
 
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Jcode/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.06.tar.gz
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-5
+- fix license (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-4
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:08:23 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 14:08:23 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.195,1.196
Message-ID: <200709271808.l8RI8NjW013823@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/redhat-artwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13786

Modified Files:
	redhat-artwork.spec 
Log Message:
- Add Provides to help with artwork split up



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- redhat-artwork.spec	14 Sep 2007 11:27:32 -0000	1.195
+++ redhat-artwork.spec	27 Sep 2007 18:07:44 -0000	1.196
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 7.0.0
-Release: 11%{?dist}.1 
+Release: 12%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -59,6 +59,21 @@
 # for gtk-update-icon-cache
 Requires(post): gtk2 >= 2.9.0
 
+# Add some Provides to ease transition to split up
+Provides: bluecurve-classic-metacity-theme
+Provides: bluecurve-gdm-theme
+Provides: bluecurve-gnome-theme
+Provides: bluecurve-gtk-themes
+Provides: bluecurve-icon-theme
+Provides: bluecurve-metacity-theme
+Provides: bluecurve-xmms-skin
+Provides: fedorabubbles-gdm-theme
+Provides: fedoradna-gdm-theme
+Provides: fedoraflyinghigh-gdm-theme
+Provides: fedora-gnome-theme
+Provides: fedora-icon-theme
+Provides: gtk-bluecurve-engine
+
 %description
 redhat-artwork contains the themes and icons that make up the Red Hat default 
 look and feel.
@@ -67,6 +82,12 @@
 Summary: Artwork specific to KDE
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+Provides: bluecurve-kde-theme
+Provides: bluecurve-kdm-theme
+Provides: bluecurve-kwin-theme
+Provides: bluecurve-qt-engine
+Provides: fedoradna-kdm-theme
+Provides: fedoraflyinghigh-kdm-theme
 
 %description kde
 redhat-artwork-kde contains artwork specific to KDE
@@ -454,6 +475,9 @@
 %{_datadir}/apps/kwin/bluecurve.desktop
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 7.0.0-12
+- Add Provides to help with artwork split up
+
 * Fri Sep 14 2007 Than Ngo <than at redhat.com> - 7.0.0-11.1
 - fix bz276731, KWin theme shows pixel noise for "sticky" icon
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:08:53 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:08:53 -0400
Subject: rpms/perl-Unicode-Map/devel perl-Unicode-Map.spec,1.10,1.11
Message-ID: <200709271808.l8RI8rtK013831@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-Map/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13810

Modified Files:
	perl-Unicode-Map.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-11
- fix license tag (thanks Tom)



Index: perl-Unicode-Map.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-Map/devel/perl-Unicode-Map.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map.spec	26 Aug 2007 09:28:00 -0000	1.10
+++ perl-Unicode-Map.spec	27 Sep 2007 18:08:18 -0000	1.11
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-Map
 Version:        0.112
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Perl module for mapping charsets from and to utf16 unicode
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-11
+- fix license tag (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-10
 - rebuild for BuildID
 - fix license tag (like perl itself)



From fedora-extras-commits at redhat.com  Thu Sep 27 18:12:56 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:12:56 -0400
Subject: rpms/qgis/devel lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.9, 1.10 sources, 1.2, 1.3 lib64-suffix.patch,
	1.5, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271812.l8RICuPp014117@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14078

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage


lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:21:11 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:12:23 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qgis.spec	28 Aug 2007 11:14:07 -0000	1.9
+++ qgis.spec	27 Sep 2007 18:12:24 -0000	1.10
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 13%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,14 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
 * Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
 - bump for expat 2.0 rebuild bug#195888
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:21:11 -0000	1.2
+++ sources	27 Sep 2007 18:12:24 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:15:27 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:15:27 -0400
Subject: rpms/qgis/F-7 lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.5, 1.6 sources, 1.2, 1.3 lib64-suffix.patch,
	1.3, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271815.l8RIFR6J014286@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage


lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:37:14 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:14:54 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	2 Aug 2007 18:37:40 -0000	1.5
+++ qgis.spec	27 Sep 2007 18:14:54 -0000	1.6
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 12%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,17 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
+* Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
+- bump for expat 2.0 rebuild bug#195888
+
 * Thu Aug 02 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-12
 - updated License from GPL to GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:37:14 -0000	1.2
+++ sources	27 Sep 2007 18:14:54 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:16:53 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:16:53 -0400
Subject: rpms/qgis/FC-6 lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.5, 1.6 sources, 1.2, 1.3 lib64-suffix.patch,
	1.3, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271816.l8RIGrZ4014472@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14441

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage



lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:35:19 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	2 Aug 2007 18:38:44 -0000	1.5
+++ qgis.spec	27 Sep 2007 18:16:21 -0000	1.6
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 12%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,17 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
+* Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
+- bump for expat 2.0 rebuild bug#195888
+
 * Thu Aug 02 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-12
 - updated License from GPL to GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:35:19 -0000	1.2
+++ sources	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:20:31 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:20:31 -0400
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.14,1.15
Message-ID: <200709271820.l8RIKVLL014727@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14689

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-14
- fix license tag again (thanks Tom)



Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Unicode-Map8.spec	26 Aug 2007 09:30:22 -0000	1.14
+++ perl-Unicode-Map8.spec	27 Sep 2007 18:19:58 -0000	1.15
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
 Patch0:         perl-Unicode-Map8-0.12-declaration.patch
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-14
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-13
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:22:47 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 14:22:47 -0400
Subject: rpms/i810switch/F-7 i810switch-0.6.5-add-i945.patch, NONE,
	1.1 i810switch.spec, 1.9, 1.10
Message-ID: <200709271822.l8RIMlGr015014@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14968

Modified Files:
	i810switch.spec 
Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 detection, fixes BZ297371

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/F-7/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	27 Sep 2007 18:22:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:23:26 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:23:26 -0400
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec, 1.12,
	1.13
Message-ID: <200709271823.l8RINQXj015111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15020

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-6
- fix license tag again (thanks Tom)



Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Unicode-MapUTF8.spec	26 Aug 2007 09:31:25 -0000	1.12
+++ perl-Unicode-MapUTF8.spec	27 Sep 2007 18:22:53 -0000	1.13
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-MapUTF8/
 Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-6
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-5
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:13 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:13 -0400
Subject: rpms/z88dk/F-7 z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISDpZ015416@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/F-7

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/F-7/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:41 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:16 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:16 -0400
Subject: rpms/z88dk/FC-6 z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISGVE015419@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/FC-6

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/FC-6/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:44 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:19 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:19 -0400
Subject: rpms/z88dk/devel z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISJtZ015422@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/devel

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:46 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:36:57 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:36:57 -0400
Subject: rpms/z88dk/devel z88dk.spec,1.5,1.6
Message-ID: <200709271836.l8RIav9n015745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15708

Modified Files:
	z88dk.spec 
Log Message:

no ppc64



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z88dk.spec	27 Sep 2007 18:27:46 -0000	1.5
+++ z88dk.spec	27 Sep 2007 18:36:24 -0000	1.6
@@ -1,14 +1,14 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 11%{?dist}
+Release: 11%{?dist}.1
 License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
 URL: http://z88dk.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: x86_64 ia64
+ExcludeArch: x86_64 ia64 ppc64
 
 %description
 z88dk is a Z80 cross compiler capable of generating binary files for a variety
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11.1
+- no ppc64
+
 * Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
 - fix license tag (Artistic clarified)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:45:28 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Thu, 27 Sep 2007 14:45:28 -0400
Subject: rpms/java-1.7.0-icedtea/devel
	java-1.7.0-icedtea-system-tzdata.patch, 
	NONE, 1.1 java-1.7.0-icedtea.spec, 1.11, 1.12
Message-ID: <200709271845.l8RIjSTH016101@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16041

Modified Files:
	java-1.7.0-icedtea.spec 
Added Files:
	java-1.7.0-icedtea-system-tzdata.patch 
Log Message:
* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
- Apply patch to use system tzdata.
- Require tzdata-java.
- Fix mauve shell fragment.



java-1.7.0-icedtea-system-tzdata.patch:

--- NEW FILE java-1.7.0-icedtea-system-tzdata.patch ---
diff -urN Makefile.am ../icedtea-1.4/Makefile.am
--- Makefile.am	2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.am	2007-09-27 14:23:32.000000000 -0400
@@ -158,6 +158,7 @@
 	patches/icedtea-lesstif_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-certbundle.patch \
+	patches/icedtea-system-tzdata.patch \
 	$(FAST_BUILD_PATCH)
 
 stamps/patch.stamp: stamps/extract.stamp
diff -urN Makefile.in ../icedtea-1.4/Makefile.in
--- Makefile.in	2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.in	2007-09-27 14:24:51.000000000 -0400
@@ -287,6 +287,7 @@
 	patches/icedtea-lesstif_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-certbundle.patch \
+	patches/icedtea-system-tzdata.patch \
 	$(FAST_BUILD_PATCH)
 
 
diff -urN patches/icedtea-system-tzdata.patch ../icedtea-1.4/patches/icedtea-system-tzdata.patch
--- patches/icedtea-system-tzdata.patch	1969-12-31 19:00:00.000000000 -0500
+++ ../icedtea-1.4/patches/icedtea-system-tzdata.patch	2007-09-27 14:30:21.000000000 -0400
@@ -0,0 +1,54 @@
+diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-09-27 14:27:03.000000000 -0400
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-09-27 14:29:21.000000000 -0400
+@@ -376,7 +376,6 @@
+     }
+   }
+ 
+-  // Use the system zoneinfo files, if present
+   SystemProperty* sp = Arguments::system_properties();
+   Arguments::PropertyList_add (&sp,
+ 			       "javax.net.ssl.trustStore",
+@@ -391,6 +390,10 @@
+ 			       "javax.net.ssl.trustStorePassword",
+ 			       "");
+ 
++  // Use the system zoneinfo files, if present
++  Arguments::PropertyList_add (&sp,
++                              "user.zoneinfo.dir", "/usr/share/javazi");
++
+ #undef malloc
+ #undef getenv
+ #undef EXTENSIONS_DIR
+diff -urN openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+--- openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-08-30 03:55:53.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-09-27 14:29:45.000000000 -0400
+@@ -1021,10 +1021,24 @@
+ 	byte[] buffer = null;
+ 
+ 	try {
+-	    String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
+-	    final String fname = homeDir + File.separator + "lib" + File.separator
+-				 + "zi" + File.separator + fileName;
++	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
++	    File dir = null;
++	    if (zi_dir != null)
++	      dir = new File(zi_dir);
++
++	    // Some minimal sanity checking
++	    if (dir != null) {
++	      File f = new File(dir, "ZoneInfoMappings");
++	      if (!f.exists())
++		dir = null;
++	    }
++
++	    if (dir == null) {
++	      String homeDir = (String) System.getProperty("java.home");
++	      zi_dir = homeDir + File.separator + "lib" + File.separator
++		+ "zi";
++	    }
++	    final String fname =  zi_dir + File.separator + fileName;
+ 	    buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ 		public Object run() throws IOException {
+ 		    File file = new File(fname);


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.7.0-icedtea.spec	27 Sep 2007 12:28:00 -0000	1.11
+++ java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
@@ -95,7 +95,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.15.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.16.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -116,6 +116,7 @@
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
+Patch3:   java-1.7.0-icedtea-system-tzdata.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -150,6 +151,8 @@
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
 Requires: openssl
+# Require zoneinfo data provided by tzdata-java subpackage.
+Requires: tzdata-java
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -266,6 +269,7 @@
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
+%patch3
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 
@@ -295,10 +299,8 @@
   ./configure 
   make
   echo ====================MAUVE TESTING========================
-  %{expand: 
-     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-	 -showpasses -debug -timeout 30000 2>&1 || :
-   }
+  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+    -showpasses -debug -timeout 30000 2>&1 || :
   echo ====================MAUVE TESTING END====================
 popd
 
@@ -730,15 +732,22 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+- Apply patch to use system tzdata.
+- Require tzdata-java.
+- Fix mauve shell fragment.
+
 * Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg setup line.
 
 * Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Removed jtreg. Does not adhere to Fedora guidelines.
+- Removed jtreg.  Does not adhere to Fedora guidelines.
 
 * Tue Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Fixed running of Xvfb so it does not terminate after a successful test.
-- Fixed mauve and jtreg test runs to not break the build when an error is thrown
+- Fixed running of Xvfb so it does not terminate after a successful
+  test.
+- Fixed mauve and jtreg test runs to not break the build when an error
+  is thrown
 
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added JTreg zip as source



From fedora-extras-commits at redhat.com  Thu Sep 27 18:45:46 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:45:46 -0400
Subject: rpms/perl-Unicode-String/devel perl-Unicode-String.spec,1.11,1.12
Message-ID: <200709271845.l8RIjkhY016140@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16081

Modified Files:
	perl-Unicode-String.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-5
- fix license tag again (thanks Tom)



Index: perl-Unicode-String.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-String/devel/perl-Unicode-String.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-String.spec	26 Aug 2007 09:32:23 -0000	1.11
+++ perl-Unicode-String.spec	27 Sep 2007 18:45:12 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-String
 Version:        2.09
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Perl modules to handle various Unicode issues
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-5
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-4
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:59:15 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 14:59:15 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.140,1.141
Message-ID: <200709271859.l8RIxFgo018636@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599

Modified Files:
	gnome-session.spec 
Log Message:
- drop redhat-artwork dep.  We don't need it.



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-session.spec	17 Sep 2007 19:20:51 -0000	1.140
+++ gnome-session.spec	27 Sep 2007 18:58:42 -0000	1.141
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -21,7 +21,6 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Requires: redhat-artwork >= 0.20
 Requires: system-logos
 # required to get gconf-sanity-check-2 in the right place
 Requires: GConf2-gtk >= %{gconf2_version}
@@ -189,6 +188,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- drop redhat-artwork dep.  We don't need it.
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:06:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 15:06:31 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.36,
	1.37 policycoreutils.spec, 1.453, 1.454
Message-ID: <200709271906.l8RJ6VXa025066@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
- Fix bug in building policy with polgengui
- Creating ports correctly


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policycoreutils-gui.patch	27 Sep 2007 15:24:00 -0000	1.36
+++ policycoreutils-gui.patch	27 Sep 2007 19:05:27 -0000	1.37
@@ -3789,7 +3789,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 11:21:40.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 15:04:11.000000000 -0400
 @@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -3891,15 +3891,15 @@
 +                end = int (r[0])
 +            else:
 +                begin = int (r[0])
-+                end = int (r[1]) + 1
++                end = int (r[1])
 +                
 +                if begin > end:
 +                    raise  ValueError
 +                
-+                for p in range(begin, end):
-+                    if p < 1 or p > max_port:
-+                        raise  ValueError
-+                    temp.append(p)
++            for p in range(begin, end + 1):
++                if p < 1 or p > max_port:
++                    raise  ValueError
++                temp.append(p)
 +        return temp
 +    except ValueError:
 +        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
@@ -4516,7 +4516,7 @@
 +    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myxuser", XUSER)
-+    mypolicy.set_in_tcp(1, 1, 1, "")
++    mypolicy.set_in_tcp(1, 1, 1, "28920")
 +    mypolicy.set_in_udp(0, 0, 1, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_syslog(True)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- policycoreutils.spec	27 Sep 2007 15:24:00 -0000	1.453
+++ policycoreutils.spec	27 Sep 2007 19:05:27 -0000	1.454
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,8 +199,9 @@
 fi
 
 %changelog
-* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
 - Fix bug in building policy with polgengui
+- Creating ports correctly
 
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-1
 - Update to upstream



From fedora-extras-commits at redhat.com  Thu Sep 27 19:07:24 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 15:07:24 -0400
Subject: rpms/metacity/devel metacity.spec,1.132,1.133
Message-ID: <200709271907.l8RJ7Oqp025141@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25119

Modified Files:
	metacity.spec 
Log Message:
change theme requires



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- metacity.spec	16 Sep 2007 21:14:18 -0000	1.132
+++ metacity.spec	27 Sep 2007 19:06:49 -0000	1.133
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
@@ -31,7 +31,7 @@
 BuildRequires: control-center >= 2.19.4
 
 Requires: startup-notification >= 0.7
-Requires: redhat-artwork >= 0.62
+Requires: nodoka-metacity-theme
 # for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
 Requires: control-center-filesystem
 # for /etc/gconf/schemas
@@ -150,6 +150,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- Drop dep on redhat-artwork, add one on nodoka
+
 * Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:16:47 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Thu, 27 Sep 2007 15:16:47 -0400
Subject: rpms/aldrin/devel aldrin-docfix.patch, NONE, 1.1 aldrin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709271916.l8RJGlYM025481@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25443/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aldrin-docfix.patch aldrin.spec 
Log Message:
initial import


aldrin-docfix.patch:

--- NEW FILE aldrin-docfix.patch ---
diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct
--- aldrin-0.11/SConstruct.docfix	2007-09-25 20:55:58.000000000 +0200
+++ aldrin-0.11/SConstruct	2007-09-25 20:55:58.000000000 +0200
@@ -127,12 +127,14 @@ if win32:
 	install('${DESTDIR}${PREFIX}', 'aldrin.bat')
 	
 # docs
-install('${DOC_INSTALL_PATH}/aldrin/html', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, 
 	glob.glob('share/doc/aldrin/html/*.html')
 	+ glob.glob('share/doc/aldrin/html/*.css'))
-install('${DOC_INSTALL_PATH}/aldrin/images', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, 
 	glob.glob('share/doc/aldrin/images/*.gif')
 	+ glob.glob('share/doc/aldrin/images/*.png'))
+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, 
+	['ChangeLog', 'CREDITS', 'LICENCE'])
 
 # icon theme
 install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png')
diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py
--- aldrin-0.11/share/aldrin/router.py.docfix	2007-09-25 21:16:54.000000000 +0200
+++ aldrin-0.11/share/aldrin/router.py	2007-09-25 21:17:19.000000000 +0200
@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog):
 		uri = filenameify(self.pluginloader.get_uri())
 		name = filenameify(self.pluginloader.get_name())		
 		helpfilepaths = [
-			filepath('../doc/zzub/plugins/' + uri + '/index.html'),
-			filepath('../doc/zzub/plugins/' + name + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'),
 		]
 		for path in helpfilepaths:
 			print "searching for '%s'..." % path
diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py
--- aldrin-0.11/share/aldrin/main.py.docfix	2007-09-25 21:14:29.000000000 +0200
+++ aldrin-0.11/share/aldrin/main.py	2007-09-25 21:16:17.000000000 +0200
@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window):
 		@type event: wx.MenuEvent
 		"""
 		import webbrowser		
-		webbrowser.open_new(filepath('../doc/aldrin/html/index.html'))
+		webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html'))
 			
 	def on_about(self, event):
 		"""


--- NEW FILE aldrin.spec ---
Name:		aldrin
Version:	0.11
Release:	5%{?dist}
Summary:	Modular music sequencer/tracker

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/aldrin/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		aldrin-docfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	scons >= 0.96.92
BuildRequires:	dos2unix
BuildRequires:	desktop-file-utils
Requires:	pyzzub = 0.2.3
Requires:	pygtk2

%description
Aldrin is a powerful music composition software featuring a flexible audio
routing system commonly found in expensive audio software, enabling you to mix,
split, mutilate and modify audio signals emitted by software synthesizers and
samples.


%prep
%setup -q
mac2unix SConstruct
%patch0 -p1 -b docfix


%build
find share/aldrin share/doc \
     -regextype posix-egrep \
     -regex '.+\.(py|html|xml|prs|col|css)' \
     -exec mac2unix '{}' \; \
     -exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~
%{__mv} CREDITS~ CREDITS

%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install PREFIX=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install \
		     --vendor="fedora" \
		     --remove-category="Application" \
		     --delete-original \
		     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
		     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
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
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

%files
%defattr(-,root,root,-)
%{_bindir}/aldrin
%{_defaultdocdir}/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Thu Sep 27 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-5
- nailed to pyzzub version 0.2.3 for docpath compatibility

* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-4
- updated patch to fix referenced libzzub doc locations

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-3
- generic sf.net source url
- adapted macros wherever feasible (both paths and commands)
- unified buildroot style
- removed redundant ldconfig update call
- new patch to rectify aldrin's installation doc directory and file list
- added missing python module requirement
- added update calls for GTK icon cache and desktop database

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-2
- updated requires to new libzzub w/ integrated pyzzub
- removed redundant requires
- fixed rpm path macros
- fixed CREDITS encoding

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:26:44 -0000	1.1
+++ .cvsignore	27 Sep 2007 19:16:12 -0000	1.2
@@ -0,0 +1 @@
+aldrin-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:26:44 -0000	1.1
+++ sources	27 Sep 2007 19:16:12 -0000	1.2
@@ -0,0 +1 @@
+1a40ea5852e34b69abc55e12d049aef8  aldrin-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 19:20:48 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Thu, 27 Sep 2007 15:20:48 -0400
Subject: rpms/aldrin/F-7 aldrin-docfix.patch, NONE, 1.1 aldrin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709271920.l8RJKm6n026251@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/aldrin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26074/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	aldrin-docfix.patch aldrin.spec 
Log Message:
initial import


aldrin-docfix.patch:

--- NEW FILE aldrin-docfix.patch ---
diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct
--- aldrin-0.11/SConstruct.docfix	2007-09-25 20:55:58.000000000 +0200
+++ aldrin-0.11/SConstruct	2007-09-25 20:55:58.000000000 +0200
@@ -127,12 +127,14 @@ if win32:
 	install('${DESTDIR}${PREFIX}', 'aldrin.bat')
 	
 # docs
-install('${DOC_INSTALL_PATH}/aldrin/html', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, 
 	glob.glob('share/doc/aldrin/html/*.html')
 	+ glob.glob('share/doc/aldrin/html/*.css'))
-install('${DOC_INSTALL_PATH}/aldrin/images', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, 
 	glob.glob('share/doc/aldrin/images/*.gif')
 	+ glob.glob('share/doc/aldrin/images/*.png'))
+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, 
+	['ChangeLog', 'CREDITS', 'LICENCE'])
 
 # icon theme
 install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png')
diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py
--- aldrin-0.11/share/aldrin/router.py.docfix	2007-09-25 21:16:54.000000000 +0200
+++ aldrin-0.11/share/aldrin/router.py	2007-09-25 21:17:19.000000000 +0200
@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog):
 		uri = filenameify(self.pluginloader.get_uri())
 		name = filenameify(self.pluginloader.get_name())		
 		helpfilepaths = [
-			filepath('../doc/zzub/plugins/' + uri + '/index.html'),
-			filepath('../doc/zzub/plugins/' + name + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'),
 		]
 		for path in helpfilepaths:
 			print "searching for '%s'..." % path
diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py
--- aldrin-0.11/share/aldrin/main.py.docfix	2007-09-25 21:14:29.000000000 +0200
+++ aldrin-0.11/share/aldrin/main.py	2007-09-25 21:16:17.000000000 +0200
@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window):
 		@type event: wx.MenuEvent
 		"""
 		import webbrowser		
-		webbrowser.open_new(filepath('../doc/aldrin/html/index.html'))
+		webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html'))
 			
 	def on_about(self, event):
 		"""


--- NEW FILE aldrin.spec ---
Name:		aldrin
Version:	0.11
Release:	5%{?dist}
Summary:	Modular music sequencer/tracker

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/aldrin/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		aldrin-docfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	scons >= 0.96.92
BuildRequires:	dos2unix
BuildRequires:	desktop-file-utils
Requires:	pyzzub = 0.2.3
Requires:	pygtk2

%description
Aldrin is a powerful music composition software featuring a flexible audio
routing system commonly found in expensive audio software, enabling you to mix,
split, mutilate and modify audio signals emitted by software synthesizers and
samples.


%prep
%setup -q
mac2unix SConstruct
%patch0 -p1 -b docfix


%build
find share/aldrin share/doc \
     -regextype posix-egrep \
     -regex '.+\.(py|html|xml|prs|col|css)' \
     -exec mac2unix '{}' \; \
     -exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~
%{__mv} CREDITS~ CREDITS

%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install PREFIX=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install \
		     --vendor="fedora" \
		     --remove-category="Application" \
		     --delete-original \
		     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
		     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
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
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

%files
%defattr(-,root,root,-)
%{_bindir}/aldrin
%{_defaultdocdir}/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Thu Sep 27 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-5
- nailed to pyzzub version 0.2.3 for docpath compatibility

* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-4
- updated patch to fix referenced libzzub doc locations

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-3
- generic sf.net source url
- adapted macros wherever feasible (both paths and commands)
- unified buildroot style
- removed redundant ldconfig update call
- new patch to rectify aldrin's installation doc directory and file list
- added missing python module requirement
- added update calls for GTK icon cache and desktop database

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-2
- updated requires to new libzzub w/ integrated pyzzub
- removed redundant requires
- fixed rpm path macros
- fixed CREDITS encoding

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:26:44 -0000	1.1
+++ .cvsignore	27 Sep 2007 19:20:15 -0000	1.2
@@ -0,0 +1 @@
+aldrin-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:26:44 -0000	1.1
+++ sources	27 Sep 2007 19:20:15 -0000	1.2
@@ -0,0 +1 @@
+1a40ea5852e34b69abc55e12d049aef8  aldrin-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 19:31:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:31:33 -0400
Subject: rpms/tellico/F-7 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 tellico.spec, 1.12, 1.13
Message-ID: <200709271931.l8RJVXME026818@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26743

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
- New upstream version (fixes problem with settings not being saved on Fedora).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Aug 2007 20:04:14 -0000	1.9
+++ .cvsignore	27 Sep 2007 19:30:59 -0000	1.10
@@ -1 +1 @@
-tellico-1.2.13.tar.gz
+tellico-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Aug 2007 20:04:14 -0000	1.9
+++ sources	27 Sep 2007 19:30:59 -0000	1.10
@@ -1 +1 @@
-7c0371d1e2b8e97d62fafb3fd5d79e7e  tellico-1.2.13.tar.gz
+38047e27d482757fae977fa49809a784  tellico-1.2.14.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/tellico.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tellico.spec	27 Aug 2007 15:57:29 -0000	1.12
+++ tellico.spec	27 Sep 2007 19:30:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tellico
-Version:        1.2.13
-Release:        2%{?dist}
+Version:        1.2.14
+Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -47,7 +47,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure --disable-rpath
 make %{?_smp_mflags}
@@ -104,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
+- New upstream version (fixes problem with settings not being saved on Fedora).
+
 * Mon Aug 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.13-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:31:57 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Thu, 27 Sep 2007 15:31:57 -0400
Subject: comps/po de.po,1.5,1.6
Message-ID: <200709271931.l8RJVvOC026974@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26791/po

Modified Files:
	de.po 
Log Message:
2007-09-27  Severin Heiniger <severinheiniger at gmail.com> (via
lantash at fedoraproject.org)

  * po/de.po: German translation nearly completed




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- de.po	17 Sep 2007 19:22:12 -0000	1.5
+++ de.po	27 Sep 2007 19:31:27 -0000	1.6
@@ -1,649 +1,847 @@
-# translation of de.po to 
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to Deutsch
-# translation of comps-po.po to Deutsch
-# translation of comps-po.po to
-# This file is distributed under the same license as the PACKAGE package.
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
 # Verena <vfuehrer at redhat.com>, 2004.
 # Marcus Gl??ckner <mgloeckner at gmail.com>, 2005.
 # PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>, 2006, 2007.
+# Severin Heiniger <severinheiniger at gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-02-26 08:19+1000\n"
-"Last-Translator: PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>\n"
-"Language-Team:  <en at li.org>\n"
+"PO-Revision-Date: 2007-09-27 21:29+0100\n"
+"Last-Translator: Severin Heiniger <severinheiniger at gmail.com>\n"
+"Language-Team: German Translation Team <fedora-trans-de 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"
-
-#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: ../comps-fe5.xml.in.h:1
+#: ../comps-fe6.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2
+#: ../comps-fe6.xml.in.h:2
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungstools"
 
-#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3
+#: ../comps-fe6.xml.in.h:3
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4
+#: ../comps-fe6.xml.in.h:4
+#: ../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-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5
+#: ../comps-fe6.xml.in.h:5
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6
+#: ../comps-fe6.xml.in.h:6
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7
+#: ../comps-fe6.xml.in.h:7
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8
+#: ../comps-fe6.xml.in.h:8
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9
+#: ../comps-fe6.xml.in.h:10
+#: ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32
+#: ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Desktopumgebungen"
 
-#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10
+#: ../comps-fe6.xml.in.h:11
+#: ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33
+#: ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Desktopumgebungen"
 
-#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11
+#: ../comps-fe6.xml.in.h:12
+#: ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34
+#: ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Softwareentwicklung"
 
-#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12
+#: ../comps-fe6.xml.in.h:13
+#: ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36
+#: ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Entwicklungstools"
 
-#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13
+#: ../comps-fe6.xml.in.h:14
+#: ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r Einwahl-Netzwerk"
 
-#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14
+#: ../comps-fe6.xml.in.h:15
+#: ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39
+#: ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editoren"
 
-#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
[...1928 lines suppressed...]
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Portugiesischen (Brasilien) Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Englischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Franz??sischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Deutschen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Italienischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Spanischen Sprache."
-
 #~ msgid "Japanese"
 #~ msgstr "Japanisch"
-
 #~ msgid "Korean"
 #~ msgstr "Koreanisch"
-
 #~ msgid "Simplified Chinese"
 #~ msgstr "Einfaches Chinesisch"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Japanischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Koreanischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Chinesischen (Einfach) Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Chinesischen (Traditionell) Sprache."
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Traditionelles Chinesisch"
-
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "ppc64 Entwicklungsunterst??tzung f??r kompatible Architekturen"
-
 #~ msgid "Bengali"
 #~ msgstr "Bengali"
-
 #~ msgid "Gujarati"
 #~ msgstr "Gujarati"
-
 #~ msgid "Hindi"
 #~ msgstr "Hindi"
-
 #~ msgid "Punjabi"
 #~ msgstr "Punjabi"
-
 #~ msgid "Red Hat Enterprise Linux 4 Documentation"
 #~ msgstr "Red Hat Enterprise Linux 4 Dokumentation"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamil"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Bengali Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Gujarati Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Hindi Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Punjabi Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Tamil Sprache."
-
 #~ msgid "Cluster Storage"
 #~ msgstr "Cluster-Speicher"
-
 #~ msgid "Clustering Support."
 #~ msgstr "Clustering-Support."
-
 #~ msgid "Packages which provide support for cluster storage."
 #~ msgstr "Pakete, die Unterst??tzung f??r Cluster-Speicher bieten."
-
 #~ msgid "Packages which provide support for single-node GFS."
 #~ msgstr "Pakete, die Support f??r single-node GFS bieten."
-
 #~ msgid "Single Node GFS Support"
 #~ msgstr "Unterst??tzung f??r Single Node GFS"
-
 #~ msgid "These packages provide compatibility support with previous releases."
 #~ msgstr ""
 #~ "Diese Pakete bieten Kompatibilit??tsunterst??tzung f??r fr??here Versionen."
-
 #~ msgid "Java Runtime Environments and Development Kits"
 #~ msgstr "Java Runtime Environments und Development Kits"
-
 #~ msgid "Misc"
 #~ msgstr "Verschiedenes"
-
 #~ msgid "Misc packages"
 #~ msgstr "Verschiedene Pakete"
-
 #~ msgid "Multimedia"
 #~ msgstr "Multimedia"
-
 #~ msgid "Multimedia applications"
 #~ msgstr "Multimedia-Anwendungen"
-
 #~ msgid ""
 #~ "Packages which provide additional functionality for Red Hat Enterprise "
 #~ "Linux"
 #~ msgstr ""
 #~ "Pakete, die zus??tzliche Funktionalit??t f??r Red Hat Enterprise Linux bieten"
-
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux Extras"
-
 #~ msgid "Workstation"
 #~ msgstr "Arbeitsplatzrechner"
-
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Anwendungen und Dienstprogramme f??r Arbeitsplatzrechner."
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Unterst??tzung f??r Virtualisierung."
-
 #~ msgid "Compatibility Arch"
 #~ msgstr "Kompatible Architekturen"
-
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Kompatible Architektur-Bibliotheken"
-
 #~ msgid "Multilib library packages"
 #~ msgstr "Multilib-Bibliothekspakete"
-
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr ""
 #~ "Pakete, die Funktionalit??t f??r die kompatiblen Architekturen bieten."
+



From fedora-extras-commits at redhat.com  Thu Sep 27 19:46:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:46:29 -0400
Subject: rpms/tellico/F-7 tellico.spec,1.13,1.14
Message-ID: <200709271946.l8RJkT33027269@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27251

Modified Files:
	tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
- Declare new file (due to the fix for Fedora 7).



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/tellico.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tellico.spec	27 Sep 2007 19:30:59 -0000	1.13
+++ tellico.spec	27 Sep 2007 19:45:57 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,12 +97,16 @@
 %{_datadir}/applications/kde/tellico.desktop
 %{_datadir}/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
+%{_datadir}/config/tellicorc
 %{_datadir}/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
+- Declare new file (due to the fix for Fedora 7).
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
 - New upstream version (fixes problem with settings not being saved on Fedora).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:51:52 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 15:51:52 -0400
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.100,1.101
Message-ID: <200709271951.l8RJpqWL027393@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27375

Modified Files:
	gnome-desktop.spec 
Log Message:
- remove seemingly unneccessary dep on redhat-artwork



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-desktop.spec	26 Sep 2007 13:57:09 -0000	1.100
+++ gnome-desktop.spec	27 Sep 2007 19:51:19 -0000	1.101
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -25,7 +25,6 @@
 # fixed in upstream svn
 Patch4:	  leak.patch
 
-Requires: redhat-artwork
 Requires: redhat-menus
 
 Obsoletes: gnome-core gnome-core-devel
@@ -128,6 +127,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
+- remove seemingly unneccessary dep on redhat-artwork
+
 * Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Fix a memory leak
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:55:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:55:35 -0400
Subject: rpms/tellico/devel tellico.spec,1.14,1.15
Message-ID: <200709271955.l8RJtZT2027547@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27529

Modified Files:
	tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
- Declare new file (due to the fix for Fedora 7).



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tellico.spec	27 Sep 2007 16:30:39 -0000	1.14
+++ tellico.spec	27 Sep 2007 19:55:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,12 +97,16 @@
 %{_datadir}/applications/kde/tellico.desktop
 %{_datadir}/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
+%{_datadir}/config/tellicorc
 %{_datadir}/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
+- Declare new file (due to the fix for Fedora 7).
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
 - New upstream version (fixes problem with settings not being saved on Fedora).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:12:40 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:12:40 -0400
Subject: rpms/taglib/devel taglib.spec,1.19,1.20
Message-ID: <200709272012.l8RKCep7002117@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2077

Modified Files:
	taglib.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
- use cmake, fixes "taglib_export.h not included" (#272361#c7)



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- taglib.spec	24 Sep 2007 14:22:03 -0000	1.19
+++ taglib.spec	27 Sep 2007 20:12:07 -0000	1.20
@@ -18,6 +18,7 @@
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: automake
+BuildRequires: cmake
 
 
 %description
@@ -41,15 +42,21 @@
 make -f Makefile.cvs
 
 
+
 %build
-%configure --disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
 rm -fr examples/.deps
 rm -fr examples/Makefile*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -79,6 +86,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
+- use cmake, fixes "taglib_export.h not included" (#272361#c7)
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:13:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:13:37 -0400
Subject: rpms/taglib/devel taglib.spec,1.20,1.21
Message-ID: <200709272013.l8RKDbbF002247@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211

Modified Files:
	taglib.spec 
Log Message:
release++



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- taglib.spec	27 Sep 2007 20:12:07 -0000	1.20
+++ taglib.spec	27 Sep 2007 20:13:04 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.3.%{svn}svn%{?dist}
+Release:    0.4.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries



From fedora-extras-commits at redhat.com  Thu Sep 27 20:16:18 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 27 Sep 2007 16:16:18 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.84,1.85
Message-ID: <200709272016.l8RKGIxm002428@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2405

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.7-85.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sysprof-kmod.spec	12 Sep 2007 22:50:08 -0000	1.84
+++ sysprof-kmod.spec	27 Sep 2007 20:15:46 -0000	1.85
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-76.fc7}
+%{!?kversion: %define kversion 2.6.22.7-85.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:24:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Sep 2007 16:24:41 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.14,1.15
Message-ID: <200709272024.l8RKOfXJ002885@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2831/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
- Enable wavpack support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xine-lib.spec	24 Sep 2007 19:29:43 -0000	1.14
+++ xine-lib.spec	27 Sep 2007 20:24:08 -0000	1.15
@@ -19,22 +19,21 @@
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -387,6 +386,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
 * Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
 - Enable JACK support by default for all distros.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:24:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Sep 2007 16:24:45 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.27,1.28
Message-ID: <200709272024.l8RKOjnq002888@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2831/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
- Enable wavpack support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xine-lib.spec	24 Sep 2007 19:29:46 -0000	1.27
+++ xine-lib.spec	27 Sep 2007 20:24:11 -0000	1.28
@@ -19,22 +19,21 @@
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -387,6 +386,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
 * Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
 - Enable JACK support by default for all distros.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:26:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:26:20 -0400
Subject: rpms/taglib/devel taglib.spec,1.21,1.22
Message-ID: <200709272026.l8RKQKOJ003006@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2969

Modified Files:
	taglib.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
- -BR: automake 
- +BR: zlib-devel



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- taglib.spec	27 Sep 2007 20:13:04 -0000	1.21
+++ taglib.spec	27 Sep 2007 20:25:47 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.4.%{svn}svn%{?dist}
+Release:    0.5.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -17,8 +17,8 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: automake
 BuildRequires: cmake
+BuildRequires: zlib-devel
 
 
 %description
@@ -39,8 +39,6 @@
 %prep
 %setup -q -n taglib
 %patch0 -p1 -b .wchar
-make -f Makefile.cvs
-
 
 
 %build
@@ -86,6 +84,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
+- -BR: automake 
+- +BR: zlib-devel
+
 * Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
 - use cmake, fixes "taglib_export.h not included" (#272361#c7)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:27:24 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Thu, 27 Sep 2007 16:27:24 -0400
Subject: rpms/pykickstart/F-7 pykickstart-version.patch, NONE, 1.1 .cvsignore,
	1.56, 1.57 pykickstart.spec, 1.61, 1.62 sources, 1.61, 1.62
Message-ID: <200709272027.l8RKROWP003313@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3005

Modified Files:
	.cvsignore pykickstart.spec sources 
Added Files:
	pykickstart-version.patch 
Log Message:
Rebuild pykickstart-1.13 for F7.


pykickstart-version.patch:

--- NEW FILE pykickstart-version.patch ---
diff -ruN pykickstart-1.13.orig/pykickstart/version.py pykickstart-1.13/pykickstart/version.py
--- pykickstart-1.13.orig/pykickstart/version.py	2007-09-04 12:04:48.000000000 -0400
+++ pykickstart-1.13/pykickstart/version.py	2007-09-27 16:24:45.000000000 -0400
@@ -52,11 +52,11 @@
 FC5 = 3000
 FC6 = 4000
 RHEL5 = 4100
-F7  = 5000
+F7 = 5000
 F8 = 6000
 
 # This always points at the latest version and is the default.
-DEVEL = F8
+DEVEL = F7
 
 """A one-to-one mapping from string representations to version numbers."""
 versionMap = {
diff -ruN pykickstart-1.13.orig/pykickstart.spec pykickstart-1.13/pykickstart.spec
--- pykickstart-1.13.orig/pykickstart.spec	2007-09-12 17:38:43.000000000 -0400
+++ pykickstart-1.13/pykickstart.spec	2007-09-27 16:24:54.000000000 -0400
@@ -4,12 +4,14 @@
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
 Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
 
+Patch0: %{name}-version.patch
+
 License: GPLv2
 Group: System Environment/Libraries
 BuildArch: noarch
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 make
 
 %build
@@ -43,6 +46,9 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Thu Sep 27 2007 Chris Lumens <clumens at redhat.com> 1.13-2
+- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version.
+
 * Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
 - Add a function to convert URL method strings into repo objects
   (jkeating).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	7 Jun 2007 18:07:36 -0000	1.56
+++ .cvsignore	27 Sep 2007 20:26:52 -0000	1.57
@@ -18,3 +18,4 @@
 pykickstart-1.0.tar.gz
 pykickstart-1.1.tar.gz
 pykickstart-1.1.1.tar.gz
+pykickstart-1.13.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/pykickstart.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pykickstart.spec	7 Jun 2007 18:07:36 -0000	1.61
+++ pykickstart.spec	27 Sep 2007 20:26:52 -0000	1.62
@@ -1,17 +1,23 @@
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.13
+Release: 2%{?dist}
+# This is a Red Hat maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+
+Patch0: %{name}-version.patch
+
+License: GPLv2
 Group: System Environment/Libraries
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, gettext
-Requires: python, python-urlgrabber
+Requires: python, python-urlgrabber, rhpl
 
 %description
 The pykickstart package is a python library for manipulating kickstart
@@ -19,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 make
 
 %build
@@ -34,14 +41,74 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING docs/programmers-guide
+%doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
 
 %changelog
-* Thu Jun 07 2007 Chris Lumens <clumens at redhat.com> - 1.1.1-1
-- Fix harddrive install method error checking (#242492).
+* Thu Sep 27 2007 Chris Lumens <clumens at redhat.com> 1.13-2
+- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version.
+
+* Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
+- Add a function to convert URL method strings into repo objects
+  (jkeating).
+- Writer formatting fixes.
+- Add kickstart documentation from the Fedora Wiki.
+
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
+- Fix lots of problems in processing the bootloader, device, network, and
+  raid commands.
+- Add %end when writing out scripts and packages.
+- Add a makefile target to run pychecker to cut down on errors in
+  releases.
+
+* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
+- fix a few tracebacks
+
+* Fri Aug 31 2007 Chris Lumens <clumens at redhat.com> 1.10-1
+- Add network --ipv6=.
+
+* Fri Aug 24 2007 Chris Lumens <clumens at redhat.com> 1.9-1
+- Add support for the %end directive to be placed at the end of scripts
+  and packages sections.  Deprecate old syntax.
+- Clean up after ksvalidator if pykickstart issues a traceback.
+- Add support for repo --priority --includepkgs --excludepkgs.
+- Fix newline at end of reboot --eject output (#253562).
+
+* Mon Aug 13 2007 Chris Lumens <clumens at redhat.com> 1.8-1
+- Fix type checking of string values.
+
+* Thu Aug 09 2007 Chris Lumens <clumens at redhat.com> 1.7-1
+- Clarify license in spec file and all source files.
+- Check string values to options to make sure they're not other options
+  (#251318).
+
+* Thu Aug 02 2007 Chris Lumens <clumens at redhat.com> 1.6-1
+- Fix a couple tracebacks in ksvalidator.
+- Change --class to --dhcpclass (#248912).
+
+* Thu Jul 19 2007 Chris Lumens <clumens at redhat.com> 1.5-2
+- Require rhpl (#248953).
+
+* Tue Jul 17 2007 Chris Lumens <clumens at redhat.com> 1.5-1
+- Fix traceback when calling preprocessKickstart.
+
+* Tue Jul 17 2007 Chris Lumens <clumens at redhat.com> 1.4-1
+- Add methods to handle the %ksappend directive.
+- Fix ignoredisk --disks.
+
+* Wed Jul 11 2007 Chris Lumens <clumens at redhat.com> - 1.3-1
+- Add support for ignoredisk --only-use.
+- Fix traceback in raid command printing method (#246709).
+
+* Fri Jun 08 2007 Chris Lumens <clumens at redhat.com> - 1.2-2
+- Fix package review problems (#226334).
+
+* Mon Jun 04 2007 Chris Lumens <clumens at redhat.com> - 1.2-1
+- Fix harddrive install method error checking (#232492).
 - Set authentication information from the input line to preserve quoting
   (#241657).
+- Allow included files to be given by URL.
 - Fix typo in user --iscrypted option.
 
 * Mon May 14 2007 Chris Lumens <clumens at redhat.com> - 1.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	7 Jun 2007 18:07:36 -0000	1.61
+++ sources	27 Sep 2007 20:26:52 -0000	1.62
@@ -1 +1 @@
-3b6922b6cee85dd615ce4ce256538d05  pykickstart-1.1.1.tar.gz
+806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 20:44:06 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 27 Sep 2007 16:44:06 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.8,1.9
Message-ID: <200709272044.l8RKi6Zp004174@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4155

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Require fedora-icon-theme instead of redhat-artwork (rhbz #309631)





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nodoka-theme-gnome.spec	13 Sep 2007 20:34:31 -0000	1.8
+++ nodoka-theme-gnome.spec	27 Sep 2007 20:43:34 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           nodoka-theme-gnome
 Version:        0.3.2
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
@@ -17,7 +17,7 @@
 
 Requires:       gtk-nodoka-engine >= 0.3.1.1
 Requires:       nodoka-metacity-theme
-Requires:       redhat-artwork >= 7.0.0
+Requires:       fedora-icon-theme
 
 %description
 The Nodoka Theme Pack for Gnome make use of Nodoka Metacity theme, Nodoka gtk2
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-2
+- Require fedora-icon-theme instead of redhat-artwork (rhbz #309631)
+
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:57:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 27 Sep 2007 16:57:36 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.62,
	1.63
Message-ID: <200709272057.l8RKvawQ004562@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4499

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 7.3-2
- Require libXau-devel when not doing arch bootstrap (#207391)



Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-proto-devel.spec	24 Sep 2007 18:40:07 -0000	1.62
+++ xorg-x11-proto-devel.spec	27 Sep 2007 20:57:03 -0000	1.63
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -70,6 +70,7 @@
 
 %if ! %{build_bootstrap}
 Requires: mesa-libGL-devel
+Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
@@ -289,6 +290,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 7.3-2
+- Require libXau-devel when not doing arch bootstrap (#207391)
+
 * Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
 - dgaproto 2.0.3
 - Bump to 7.3



From fedora-extras-commits at redhat.com  Thu Sep 27 21:00:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 27 Sep 2007 17:00:19 -0400
Subject: rpms/libXau/devel libXau.spec,1.19,1.20
Message-ID: <200709272100.l8RL0JUd004676@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4622

Modified Files:
	libXau.spec 
Log Message:
* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- libXau-devel Requires: xorg-x11-proto-devel (#235563)



Index: libXau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXau.spec	21 Aug 2007 20:10:04 -0000	1.19
+++ libXau.spec	27 Sep 2007 20:59:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
+Requires: xorg-x11-proto-devel
 
 # xorg-x11-proto-devel needed by xau.pc
 BuildRequires: xorg-x11-proto-devel
@@ -78,6 +79,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- libXau-devel Requires: xorg-x11-proto-devel (#235563)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.3-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep 27 21:00:38 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:00:38 -0400
Subject: rpms/mhgui/F-7 mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709272100.l8RL0cuY004712@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4643

Modified Files:
	sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Import for F-7


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	27 Sep 2007 21:00:04 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:09:00 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 27 Sep 2007 17:09:00 -0400
Subject: rpms/perl-Net-Netmask/devel .cvsignore, 1.6,
	1.7 perl-Net-Netmask.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200709272109.l8RL908b011532@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11492

Modified Files:
	.cvsignore perl-Net-Netmask.spec sources 
Log Message:
1.9015, update license tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2006 18:56:14 -0000	1.6
+++ .cvsignore	27 Sep 2007 21:08:26 -0000	1.7
@@ -1 +1 @@
-Net-Netmask-1.9012.tar.gz
+Net-Netmask-1.9015.tar.gz


Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Netmask.spec	14 Sep 2006 15:30:43 -0000	1.11
+++ perl-Net-Netmask.spec	27 Sep 2007 21:08:26 -0000	1.12
@@ -1,17 +1,16 @@
 Name:           perl-Net-Netmask
-Version:        1.9012
-Release:        3%{?dist}
+Version:        1.9015
+Release:        1%{?dist}
 Summary:        Perl module for manipulation and lookup of IP network blocks
 
 Group:          Development/Libraries
-License:        Artistic
+License:        Copyright only
 URL:            http://search.cpan.org/dist/Net-Netmask/
 Source0:        http://www.cpan.org/authors/id/M/MU/MUIR/modules/Net-Netmask-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Net::Netmask parses and understands IPv4 CIDR blocks. It's built with
@@ -52,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Warren Togami <wtogami at redhat.com> - 1.9015-1
+- 1.9015, update license tag
+
 * Thu Sep 14 2006 Warren Togami <wtogami at redhat.com> - 1.9012-3
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2006 18:56:14 -0000	1.6
+++ sources	27 Sep 2007 21:08:26 -0000	1.7
@@ -1 +1 @@
-3d81d214e0203863dbc170029f2d3502  Net-Netmask-1.9012.tar.gz
+90298105cd17a5c2a4059297e09f1546  Net-Netmask-1.9015.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:21:11 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:21:11 -0400
Subject: rpms/mhgui/FC-6 mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709272121.l8RLLBd6012569@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12384

Modified Files:
	sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Import for FC-6


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	27 Sep 2007 21:20:39 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:23:12 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 27 Sep 2007 17:23:12 -0400
Subject: rpms/perl-Net-Netmask/devel perl-Net-Netmask.spec,1.12,1.13
Message-ID: <200709272123.l8RLNCwH012720@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678

Modified Files:
	perl-Net-Netmask.spec 
Log Message:
add buildreqs



Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Net-Netmask.spec	27 Sep 2007 21:08:26 -0000	1.12
+++ perl-Net-Netmask.spec	27 Sep 2007 21:22:39 -0000	1.13
@@ -11,6 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
+BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More)
 
 %description
 Net::Netmask parses and understands IPv4 CIDR blocks. It's built with



From fedora-extras-commits at redhat.com  Thu Sep 27 21:24:45 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:24:45 -0400
Subject: rpms/animorph/FC-6 animorph.spec, NONE,
	1.1 animorph-0.2-pkgconfig.patch, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709272124.l8RLOj1k012894@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12870

Modified Files:
	sources 
Added Files:
	animorph.spec animorph-0.2-pkgconfig.patch 
Log Message:
Import for FC-6



--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 

animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	27 Sep 2007 21:24:13 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:41:02 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 17:41:02 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-3w-9xxx-mem_len.patch, NONE,
	1.1.2.1 kernel-xen.spec, 1.51, 1.51.2.1
Message-ID: <200709272141.l8RLf2qR013842@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13806

Modified Files:
      Tag: private-ehabkost-bz309611-test-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-bz309611-test-branch
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)


linux-2.6-3w-9xxx-mem_len.patch:

--- NEW FILE linux-2.6-3w-9xxx-mem_len.patch ---
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 27 Sep 2007 18:37:44 -0300
Subject: 3w-9xxx: use PCI resource lenght correctly

Trying to ioremap() a larger area than pci_resource_len()
may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
as length parameter to ioremap() instead of PAGE_SIZE.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
===================================================================
--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
+++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
 {
 	struct Scsi_Host *host = NULL;
 	TW_Device_Extension *tw_dev;
-	u32 mem_addr;
+	int bar;
+	unsigned long mem_addr, mem_len;
 	int retval = -ENODEV;
 
 	retval = pci_enable_device(pdev);
@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
 	}
 
 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
-		mem_addr = pci_resource_start(pdev, 1);
+		bar = 1;
 	else
-		mem_addr = pci_resource_start(pdev, 2);
+		bar = 2;
+
+	mem_addr = pci_resource_start(pdev, bar);
+	mem_len = pci_resource_len(pdev, bar);
 
 	/* Save base address */
-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
+	tw_dev->base_addr = ioremap(mem_addr, mem_len);
 	if (!tw_dev->base_addr) {
 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
 		goto out_release_mem_region;
@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
 
 	pci_set_drvdata(pdev, host);
 
-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
+	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
 	       host->host_no, mem_addr, pdev->irq);
 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
+++ kernel-xen.spec	27 Sep 2007 21:40:30 -0000	1.51.2.1
@@ -442,6 +442,7 @@
 
 # SCSI bits.
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-ctlbits.patch
@@ -1002,6 +1003,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2072,6 +2076,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 21:45:31 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 27 Sep 2007 17:45:31 -0400
Subject: rpms/struts/devel struts.spec,1.49,1.50
Message-ID: <200709272145.l8RLjVNf014160@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14135

Modified Files:
	struts.spec 
Log Message:

Re-enable compliation of webapp classes, and disable run of check-buildroot




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- struts.spec	24 Sep 2007 15:16:32 -0000	1.49
+++ struts.spec	27 Sep 2007 21:44:59 -0000	1.50
@@ -49,9 +49,12 @@
 %define webapplibs commons-beanutils commons-digester commons-fileupload commons-validator oro struts
 %define section		free
 
+# Disable check-buildroot
+%define __arch_install_post /usr/lib/rpm/check-rpaths 
+
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.8%{?dist}
+Release:	4jpp.9%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -693,7 +696,7 @@
 %endif
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm --exclude %{tomcat5appsdir}/struts-example/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-examples/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-tiles-documentation/WEB-INF/classes
+%{_bindir}/aot-compile-rpm
 %endif
 
 %clean
@@ -968,6 +971,9 @@
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-example_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-examples_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-tiles-documentation_classes*
 %endif
 
 %if %{without_coreonly}
@@ -1058,6 +1064,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.9
+- Re-enable compliation of webapp classes, and disable run of check-buildroot
+
 * Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.8
 - Exclude webapp classes from native compilation (issues with check-build-root)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 21:50:35 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 17:50:35 -0400
Subject: rpms/python-docutils/F-7 python-docutils.spec,1.10,1.11
Message-ID: <200709272150.l8RLoZDk014407@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-docutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14353/F-7

Modified Files:
	python-docutils.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
- Build egg info.



Index: python-docutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docutils/F-7/python-docutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-docutils.spec	13 Aug 2007 19:38:54 -0000	1.10
+++ python-docutils.spec	27 Sep 2007 21:50:02 -0000	1.11
@@ -4,19 +4,25 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
-Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
@@ -39,13 +45,13 @@
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -76,8 +82,12 @@
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
+%{python_sitelib}/*egg-info/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
+- Build egg info.
+
 * Mon Aug 13 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-6
 - Last version had both the old and new rst.el.  Try again with only
   the new one.



From fedora-extras-commits at redhat.com  Thu Sep 27 21:50:38 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 17:50:38 -0400
Subject: rpms/python-docutils/devel python-docutils.spec,1.10,1.11
Message-ID: <200709272150.l8RLocNG014410@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14353/devel

Modified Files:
	python-docutils.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
- Build egg info.



Index: python-docutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-docutils.spec	13 Aug 2007 18:54:46 -0000	1.10
+++ python-docutils.spec	27 Sep 2007 21:50:06 -0000	1.11
@@ -4,19 +4,25 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
-Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
@@ -39,13 +45,13 @@
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -76,8 +82,12 @@
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
+%{python_sitelib}/*egg-info/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
+- Build egg info.
+
 * Mon Aug 13 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-6
 - Last version had both the old and new rst.el.  Try again with only
   the new one.



From fedora-extras-commits at redhat.com  Thu Sep 27 21:58:21 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 17:58:21 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2006-07-20-glibc.patch,
	NONE, 1.1 isdn4k-utils.spec, 1.69, 1.70
Message-ID: <200709272158.l8RLwLdl016093@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-CVS-2006-07-20-glibc.patch 
Log Message:
fix build issue with glibc


isdn4k-utils-CVS-2006-07-20-glibc.patch:

--- NEW FILE isdn4k-utils-CVS-2006-07-20-glibc.patch ---
diff -up isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig isdn4k-utils-CVS-2006-07-20/capi20/capi20.h
--- isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig	2007-09-27 21:45:43.000000000 +0200
+++ isdn4k-utils-CVS-2006-07-20/capi20/capi20.h	2007-09-27 23:45:40.000000000 +0200
@@ -20,6 +20,7 @@
 #ifndef __CAPI20_H__
 #define __CAPI20_H__
 
+#include <sys/types.h>
 #include <sys/time.h>
 
 #ifdef __cplusplus


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- isdn4k-utils.spec	12 Feb 2007 09:14:37 -0000	1.69
+++ isdn4k-utils.spec	27 Sep 2007 21:57:49 -0000	1.70
@@ -40,6 +40,7 @@
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
 Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
+Patch15: isdn4k-utils-CVS-2006-07-20-glibc.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
@@ -124,6 +125,7 @@
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
 %patch14 -p1 -b .pppd-2.4.4
+%patch15 -p1 -b .glibc
 
 for i in */configure; do
 	cd `dirname $i`
@@ -498,8 +500,8 @@
 %doc xmonisdn/README
 
 %changelog
-* Mon Feb 12 2007 Than Ngo <than at redhat.com> - 3.2-55.fc7
-- fix spelling error
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> -  3.2-55
+- fix build issue with glibc
 
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 3.2-54.fc7
 - rebuild



From fedora-extras-commits at redhat.com  Thu Sep 27 22:02:21 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 18:02:21 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.1,1.2
Message-ID: <200709272202.l8RM2LUL022461@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22390

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
Update license tag.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SNPP.spec	7 Dec 2006 12:43:34 -0000	1.1
+++ perl-Net-SNPP.spec	27 Sep 2007 22:01:45 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Net-SNPP/
 Source0:        http://search.cpan.org/CPAN/authors/id/T/TO/TOBEYA/Net-SNPP-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
+- Update license tag.
+
 * Thu Dec  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
 - Fix typo in summary
 



From fedora-extras-commits at redhat.com  Thu Sep 27 22:03:22 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 27 Sep 2007 18:03:22 -0400
Subject: devel/anaconda .cvsignore, 1.448, 1.449 anaconda.spec, 1.584,
	1.585 sources, 1.577, 1.578
Message-ID: <200709272203.l8RM3M15022556@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22519

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
- Support modname.option=value for passing options to kernel modules
- Fix rescue CD + nfsiso (clumens)
- Blacklist more wireless drivers that can't work
- Make buildarch more predictable (#239897)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- .cvsignore	25 Sep 2007 20:53:53 -0000	1.448
+++ .cvsignore	27 Sep 2007 22:02:49 -0000	1.449
@@ -1 +1 @@
-anaconda-11.3.0.34.tar.bz2
+anaconda-11.3.0.35.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- anaconda.spec	25 Sep 2007 20:53:53 -0000	1.584
+++ anaconda.spec	27 Sep 2007 22:02:49 -0000	1.585
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.34
+Version: 11.3.0.35
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
+- Support modname.option=value for passing options to kernel modules
+- Fix rescue CD + nfsiso (clumens)
+- Blacklist more wireless drivers that can't work
+- Make buildarch more predictable (#239897)
+
 * Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
 - A few upgrade fixes; look for packages in 
   /var/cache/yum/anaconda-upgrade/packages so that you can predownload them


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- sources	25 Sep 2007 20:53:53 -0000	1.577
+++ sources	27 Sep 2007 22:02:49 -0000	1.578
@@ -1 +1 @@
-068dbe6d893b21eaba209e97e12aeefc  anaconda-11.3.0.34.tar.bz2
+cfa6cb69f049ec352fb3c0d6b6301c81  anaconda-11.3.0.35.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 22:51:58 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 18:51:58 -0400
Subject: rpms/kernel/F-7 linux-2.6-libata-2.6.23-rc8-noncq.patch, NONE,
	1.1 linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch,
	NONE, 1.1 linux-2.6-uevent-zero-fill-env.patch, NONE,
	1.1 kernel-2.6.spec, 1.3349, 1.3350
Message-ID: <200709272251.l8RMpwlO024444@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24349

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-2.6.23-rc8-noncq.patch 
	linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch 
	linux-2.6-uevent-zero-fill-env.patch 
Log Message:
* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
- Revert to old RTC driver.
- Zero fill environment for uevent handlers.
- libata: update the NCQ disk blacklist.
- wireless: store channel info in bss list (bz 250913).


linux-2.6-libata-2.6.23-rc8-noncq.patch:

--- NEW FILE linux-2.6-libata-2.6.23-rc8-noncq.patch ---
--- linux-2.6.23/drivers/ata/libata-core.c
+++ linux-2.6.23/drivers/ata/libata-core.c
@@ -3791,6 +3791,8 @@
 	{ "SAMSUNG CD-ROM SN-124","N001",	ATA_HORKAGE_NODMA },
 	{ "Seagate STT20000A", NULL,		ATA_HORKAGE_NODMA },
 	{ "IOMEGA  ZIP 250       ATAPI", NULL,	ATA_HORKAGE_NODMA }, /* temporary fix */
+	{ "IOMEGA  ZIP 250       ATAPI       Floppy",
+				NULL,		ATA_HORKAGE_NODMA },
 
 	/* Weird ATAPI devices */
 	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },
@@ -3806,8 +3808,11 @@
 	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
 	{ "Maxtor 6B200M0",	"BANC1BM0",	ATA_HORKAGE_NONCQ },
 	{ "Maxtor 6B200M0",	"BANC1B10",	ATA_HORKAGE_NONCQ },
+	{ "Maxtor 7B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ, },
+	{ "Maxtor 7B300S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
+	{ "Maxtor 7V300F0",	"VA111630",	ATA_HORKAGE_NONCQ },
 	{ "HITACHI HDS7250SASUN500G 0621KTAWSD", "K2AOAJ0AHITACHI",
-	  ATA_HORKAGE_NONCQ },
+	 ATA_HORKAGE_NONCQ },
 	/* NCQ hard hangs device under heavier load, needs hard power cycle */
 	{ "Maxtor 6B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
 	/* Blacklist entries taken from Silicon Image 3124/3132
@@ -3821,8 +3826,9 @@
 	{ "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
 	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ, },
 	{ "FUJITSU MHV2080BH",	"00840028",	ATA_HORKAGE_NONCQ, },
-
-	/* Devices with NCQ limits */
+	{ "ST9160821AS",	"3.CLF",	ATA_HORKAGE_NONCQ, },
+	{ "ST3160812AS",	"3.AD",		ATA_HORKAGE_NONCQ, },
+	{ "SAMSUNG HD401LJ",	"ZZ100-15",	ATA_HORKAGE_NONCQ, },
 
 	/* End Marker */
 	{ }

linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch:

--- NEW FILE linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch ---
bz 250913

--- a/net/mac80211/ieee80211_sta.c	2007-09-23 23:45:52.000000000 +0100
+++ b/net/mac80211/ieee80211_sta.c	2007-09-23 23:57:12.000000000 +0100
@@ -64,7 +64,7 @@
 static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
 				     u8 *ssid, size_t ssid_len);
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid);
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel);
 static void ieee80211_rx_bss_put(struct net_device *dev,
 				 struct ieee80211_sta_bss *bss);
 static int ieee80211_sta_find_ibss(struct net_device *dev,
@@ -453,6 +453,7 @@
 				     struct ieee80211_if_sta *ifsta,
 				     unsigned int assoc)
 {
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	union iwreq_data wrqu;
 
 	if (!!(ifsta->flags & IEEE80211_STA_ASSOCIATED) == assoc)
@@ -468,7 +469,8 @@
 		if (sdata->type != IEEE80211_IF_TYPE_STA)
 			return;
 
-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+					   local->hw.conf.channel);
 		if (bss) {
 			if (bss->has_erp_value)
 				ieee80211_handle_erp_ie(dev, bss->erp_value);
@@ -615,7 +617,7 @@
 		capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME |
 			WLAN_CAPABILITY_SHORT_PREAMBLE;
 	}
-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
 	if (bss) {
 		if (bss->capability & WLAN_CAPABILITY_PRIVACY)
 			capab |= WLAN_CAPABILITY_PRIVACY;
@@ -1178,6 +1180,7 @@
 static int ieee80211_privacy_mismatch(struct net_device *dev,
 				      struct ieee80211_if_sta *ifsta)
 {
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
 	int res = 0;
 
@@ -1185,7 +1188,7 @@
 	    ifsta->key_management_enabled)
 		return 0;
 
-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
 	if (!bss)
 		return 0;
 
@@ -1693,7 +1696,8 @@
 	 * update our stored copy */
 	if (elems.erp_info && elems.erp_info_len >= 1) {
 		struct ieee80211_sta_bss *bss
-			= ieee80211_rx_bss_get(dev, ifsta->bssid);
+			= ieee80211_rx_bss_get(dev, ifsta->bssid,
+					       local->hw.conf.channel);
 		if (bss) {
 			bss->erp_value = elems.erp_info[0];
 			bss->has_erp_value = 1;
@@ -1723,7 +1727,8 @@
 			       " AP\n", dev->name);
 			return;
 		}
-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+					   local->hw.conf.channel);
 		if (bss) {
 			sta->last_rssi = bss->rssi;
 			sta->last_signal = bss->signal;
@@ -2071,7 +2076,7 @@
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
+ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
@@ -2082,6 +2087,7 @@
 	atomic_inc(&bss->users);
 	atomic_inc(&bss->users);
 	memcpy(bss->bssid, bssid, ETH_ALEN);
+	bss->channel = channel;
 
 	spin_lock_bh(&local->sta_bss_lock);
 	/* TODO: order by RSSI? */
@@ -2093,7 +2099,7 @@
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid)
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
@@ -2101,7 +2107,8 @@
 	spin_lock_bh(&local->sta_bss_lock);
 	bss = local->sta_bss_hash[STA_HASH(bssid)];
 	while (bss) {
-		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0) {
+		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
+		    bss->channel == channel) {
 			atomic_inc(&bss->users);
 			break;
 		}
@@ -2270,9 +2277,9 @@
 	else
 		channel = rx_status->channel;
 
-	bss = ieee80211_rx_bss_get(dev, mgmt->bssid);
+	bss = ieee80211_rx_bss_get(dev, mgmt->bssid, channel);
 	if (!bss) {
-		bss = ieee80211_rx_bss_add(dev, mgmt->bssid);
+		bss = ieee80211_rx_bss_add(dev, mgmt->bssid, channel);
 		if (!bss)
 			return;
 	} else {
@@ -2389,7 +2396,6 @@
 	}
 
 	bss->hw_mode = rx_status->phymode;
-	bss->channel = channel;
 	bss->freq = rx_status->freq;
 	if (channel != rx_status->channel &&
 	    (bss->hw_mode == MODE_IEEE80211G ||
@@ -3345,7 +3351,7 @@
 	printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID " MAC_FMT "\n",
 	       dev->name, MAC_ARG(bssid));
 
-	bss = ieee80211_rx_bss_add(dev, bssid);
+	bss = ieee80211_rx_bss_add(dev, bssid, local->hw.conf.channel);
 	if (!bss)
 		return -ENOMEM;
 
@@ -3356,7 +3362,6 @@
 		local->hw.conf.beacon_int = 100;
 	bss->beacon_int = local->hw.conf.beacon_int;
 	bss->hw_mode = local->hw.conf.phymode;
-	bss->channel = local->hw.conf.channel;
 	bss->freq = local->hw.conf.freq;
 	bss->last_update = jiffies;
 	bss->capability = WLAN_CAPABILITY_IBSS;
@@ -3416,7 +3421,7 @@
 	       MAC_FMT "\n", MAC_ARG(bssid), MAC_ARG(ifsta->bssid));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 	if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
-	    (bss = ieee80211_rx_bss_get(dev, bssid))) {
+	    (bss = ieee80211_rx_bss_get(dev, bssid, local->hw.conf.channel))) {
 		printk(KERN_DEBUG "%s: Selected IBSS BSSID " MAC_FMT
 		       " based on configured SSID\n",
 		       dev->name, MAC_ARG(bssid));

linux-2.6-uevent-zero-fill-env.patch:

--- NEW FILE linux-2.6-uevent-zero-fill-env.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5309809129ca3ab14f8bd5e5ef66c1b7686eb639
Commit:     5309809129ca3ab14f8bd5e5ef66c1b7686eb639
Parent:     544002ef832730b18327000c898a140bfc93efd4
Author:     Linus Torvalds <torvalds at woody.linux-foundation.org>
AuthorDate: Wed Sep 26 09:16:21 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Wed Sep 26 09:16:21 2007 -0700

    Add explicit zeroing to "envp" array in device 'show' method
    
    As Stephen Hemminger says, this is a "belt and suspenders" patch that
    zeroes the envp array at allocation time, even though all the users
    should NULL-terminate it anyway (and we've hopefully fixed everybody
    that doesn't do that).
    
    And we'll apparently clean the whole envp thing up for 2.6.24 anyway.
    
    But let's just be robust, and do both this *and* make sure that all
    users are doing the right thing.
    
    Acked-by: Stephen Hemminger <shemminger at linux-foundation.org>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/base/core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6de33d7..67c9258 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -284,6 +284,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
 
 	/* let the kset specific function add its keys */
 	pos = data;
+	memset(envp, 0, sizeof(envp));
 	retval = kset->uevent_ops->uevent(kset, &dev->kobj,
 					  envp, ARRAY_SIZE(envp),
 					  pos, PAGE_SIZE);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3349
retrieving revision 1.3350
diff -u -r1.3349 -r1.3350
--- kernel-2.6.spec	27 Sep 2007 15:33:19 -0000	1.3349
+++ kernel-2.6.spec	27 Sep 2007 22:51:22 -0000	1.3350
@@ -599,6 +599,7 @@
 Patch662: linux-2.6-ata-update-noncq.patch
 Patch663: linux-2.6-ata-quirk.patch
 Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
+Patch668: linux-2.6-libata-2.6.23-rc8-noncq.patch
 Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 Patch671: linux-2.6-libata-pata_ali-fix-hp-detect.patch
 Patch672: linux-2.6-libata-pata-dma-disable-option.patch
@@ -618,8 +619,10 @@
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
 Patch693: linux-2.6-mac80211-extras.patch
+Patch694: linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
+
 Patch710: linux-2.6-e1000-ich9.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
@@ -632,6 +635,7 @@
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
+Patch760: linux-2.6-uevent-zero-fill-env.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
 
 Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
@@ -1322,6 +1326,7 @@
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # libata: update the noncq list
 ApplyPatch linux-2.6-ata-update-noncq.patch
+ApplyPatch linux-2.6-libata-2.6.23-rc8-noncq.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 # NSIA
@@ -1357,6 +1362,8 @@
 ApplyPatch linux-2.6-ath5k.patch
 ApplyPatch linux-2.6-zd1211rw-mac80211.patch
 ApplyPatch linux-2.6-mac80211-extras.patch
+# fix bz 250913
+ApplyPatch linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -1392,6 +1399,8 @@
 ApplyPatch linux-2.6-sdhci-fix-interrupt-mask.patch
 # fix the interrupt mask fix
 ApplyPatch linux-2.6-sdhci-clear-error-interrupt.patch
+# uevent: zero fill the environment
+ApplyPatch linux-2.6-uevent-zero-fill-env.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
 
@@ -2361,6 +2370,12 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
+- Revert to old RTC driver.
+- Zero fill environment for uevent handlers.
+- libata: update the NCQ disk blacklist.
+- wireless: store channel info in bss list (bz 250913).
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - Update and restructure wireless patches
 



From fedora-extras-commits at redhat.com  Thu Sep 27 22:55:14 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 18:55:14 -0400
Subject: rpms/abyssinica-fonts/devel abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272255.l8RMtEtg024633@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24604/devel

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.



--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 22:54:40 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 22:54:40 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 22:58:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 18:58:56 -0400
Subject: rpms/kernel/F-7/configs config-generic,1.336,1.337
Message-ID: <200709272258.l8RMwu7U024892@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24842/configs

Modified Files:
	config-generic 
Log Message:
update RTC config



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-generic,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- config-generic	20 Sep 2007 22:34:06 -0000	1.336
+++ config-generic	27 Sep 2007 22:58:21 -0000	1.337
@@ -1827,18 +1827,15 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
+CONFIG_RTC=y
 # CONFIG_RTC_DEBUG is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_HCTOSYS=n
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m



From fedora-extras-commits at redhat.com  Thu Sep 27 22:59:17 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 18:59:17 -0400
Subject: rpms/abyssinica-fonts/OLPC-2 abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272259.l8RMxHGP024906@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24872/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.


--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 22:58:38 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 22:58:38 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:03:05 2007
From: fedora-extras-commits at redhat.com (Huang Peng (phuang))
Date: Thu, 27 Sep 2007 19:03:05 -0400
Subject: rpms/scim-python/devel scim-python.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709272303.l8RN35o6031171@cvs-int.fedora.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31129/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scim-python.spec 
Log Message:
import scim-python.



--- NEW FILE scim-python.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:       scim-python
Version:    0.1.3
Release:    1%{?dist}
Summary:    Python wrapper for Smart Common Input Method platform

License:    LGPLv2+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/scim-python/
Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser)
Requires:   scim, python-enchant, pygtk2

%description
Python wrapper for Smart Common Input Method platform.

%prep
%setup -q

%build
%configure --disable-static
# 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%{python_sitearch}/scim.la
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{python_sitearch}/scim.so
%{_libdir}/scim-1.0/1.4.0/IMEngine/scim-python-engine.so
%{_libdir}/scim-1.0/1.4.0/SetupUI/scim-python-setup.so
%dir %{_datadir}/scim-python
%{_datadir}/scim-python/*
%{_datadir}/scim/icons/*

%changelog
* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.3-1
- Update to 0.1.3.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-3
- Fix build warning.
- Fix rpmlint checking warning.
- Fix build failed in x86_64 platform.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-2
- Change files: add %%dir %%{_datadir}/scim-python
- Fix build failed in x86_64 platform.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-1
- Update to 0.1.2

* Mon Sep 24 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.0.2-1
- Update to 0.0.2

* Mon Sep 17 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.0.1-1
- Init version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:28:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 23:02:32 -0000	1.2
@@ -0,0 +1 @@
+scim-python-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:28:35 -0000	1.1
+++ sources	27 Sep 2007 23:02:32 -0000	1.2
@@ -0,0 +1 @@
+70acce6fc5e343cc0644c81f2092b9a1  scim-python-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:17:11 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Thu, 27 Sep 2007 19:17:11 -0400
Subject: rpms/pv/devel pv.spec,1.3,1.4
Message-ID: <200709272317.l8RNHBnj031539@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31519

Modified Files:
	pv.spec 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-2
- Fix the license tag




Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/pv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pv.spec	15 Sep 2007 16:07:02 -0000	1.3
+++ pv.spec	27 Sep 2007 23:16:38 -0000	1.4
@@ -1,8 +1,8 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
 Version: 1.1.0
-Release: 1%{?dist}
-License: Artistic (modified)
+Release: 2%{?dist}
+License: Artistic 2.0
 Group: Development/Tools
 Source: http://pipeviewer.googlecode.com/files/%{name}-%{version}.tar.gz
 URL: http://www.ivarch.com/programs/pv.shtml
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-2
+- Fix the license tag
+
 * Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
 - Bump to the latest upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:22:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:22:36 -0700
Subject: [pkgdb] coolkey: rrelyea has requested watchbugzilla
Message-ID: <200709272322.l8RNMf4A032748@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has requested the watchbugzilla acl on coolkey (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:24:03 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 19:24:03 -0400
Subject: rpms/abyssinica-fonts/F-7 abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272324.l8RNO36R031933@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.


--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 23:23:31 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 23:23:31 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:24:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:24:04 -0700
Subject: [pkgdb] coolkey had acl change status
Message-ID: <200709272324.l8RNO9Qj000334@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has set the watchbugzilla acl on coolkey (Fedora devel) to Approved for Robert Relyea (rrelyea)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey had acl change status
Message-ID: <200709272326.l8RNQTLr000491@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has set the watchbugzilla acl on coolkey (Fedora devel) to Obsolete for Robert Relyea (rrelyea)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey (Fedora, 7) updated by toshio
Message-ID: <200709272326.l8RNQTLv000491@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved watchcommits on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved commit on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved build on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved approveacls on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved checkout on coolkey (Fedora 7) for jmagne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey (Fedora, devel) updated by toshio
Message-ID: <200709272326.l8RNQTM1000491@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved watchcommits on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved commit on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved build on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved approveacls on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved checkout on coolkey (Fedora devel) for jmagne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:32:53 2007
From: fedora-extras-commits at redhat.com (Jack Magne (jmagne))
Date: Thu, 27 Sep 2007 19:32:53 -0400
Subject: rpms/coolkey/devel coolkey-cache-dir-move.patch,NONE,1.1
Message-ID: <200709272332.l8RNWrT5032298@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32289

Added Files:
	coolkey-cache-dir-move.patch 
Log Message:
Include patch for moving the cache directory to a safe location.


coolkey-cache-dir-move.patch:

--- NEW FILE coolkey-cache-dir-move.patch ---
Index: src/coolkey/machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.4
diff -u -r1.4 machdep.cpp
--- src/coolkey/machdep.cpp	14 Feb 2007 00:46:28 -0000	1.4
+++ src/coolkey/machdep.cpp	15 Aug 2007 01:41:11 -0000
@@ -185,12 +185,20 @@
 #define MAP_INHERIT 0
 #endif
 
+#ifndef BASEPATH
+#ifdef MAC
+#define BASEPATH "/var"
+#else
+#define BASEPATH "/var/cache"
+#endif
+#endif
+
 #ifdef FULL_CLEANUP
 #define RESERVED_OFFSET 256
-#define MEMSEGPATH "/tmp/.pk11ipc"
+#define MEMSEGPATH BASEPATH"/coolkey-lock"
 #else 
 #define RESERVED_OFFSET 0
-#define MEMSEGPATH "/tmp/.pk11ipc1"
+#define MEMSEGPATH BASEPATH"/coolkey"
 #endif
 
 struct SHMemData {
@@ -208,11 +216,6 @@
 #ifdef FULL_CLEANUP
 	flock(fd,LOCK_EX);
 	unsigned long ref = --(*(unsigned long *)addr); 
-#ifdef notdef
-	if (ref == 0) {
-	    unlink(path);
-	}
-#endif
 	flock(fd, LOCK_UN);
 #endif
 	munmap(addr,size+RESERVED_OFFSET);
@@ -225,6 +228,73 @@
     }
 }
 
+/*
+ * The cache directory is shared and accessible by anyone, make
+ * sure the cache file we are opening is really a valid cache file.
+ */
+int safe_open(char *path, int flags, int mode, int size)
+{
+    struct stat buf;
+    int fd, ret;
+
+    fd = open (path, flags|O_NOFOLLOW, mode);
+
+    if (fd < 0) {
+	return fd;
+    }
+
+    ret = fstat(fd, &buf);
+    if (ret < 0) {
+	close (fd);
+	return ret;
+    }
+
+    /* our cache files are pretty specific, make sure we are looking
+     * at the correct one */
+
+    /* first, we should own the file ourselves, don't open a file
+     * that someone else wanted us to see. */
+    if (buf.st_uid != getuid()) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* next, there should only be one link in this file. Don't
+     * use this code to trash another file */
+    if (buf.st_nlink != 1) {
+	close(fd);
+	errno = EMLINK;
+	return -1;
+    }
+
+    /* next, This better be a regular file */
+    if (!S_ISREG(buf.st_mode)) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* if the permissions don't match, something is wrong */
+    if ((buf.st_mode & 03777) != mode) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* finally the file should be the correct size. This 
+     * check isn't so much to protect from an attack, as it is to
+     * detect a corrupted cache file */
+    if (buf.st_size != size) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* OK, the file checked out, ok to continue */
+    return fd;
+}
+
 SHMem::SHMem(): shmemData(0) {}
 
 SHMem *
@@ -248,7 +318,7 @@
 	return NULL;
     }
     int mask = umask(0);
-    int ret = mkdir (MEMSEGPATH, 0777);
+    int ret = mkdir (MEMSEGPATH, 01777);
     umask(mask);
     if ((ret == -1) && (errno != EEXIST)) {
 	delete shmemData;
@@ -264,21 +334,16 @@
     shmemData->path[sizeof(MEMSEGPATH)-1] = '/';
     strcpy(&shmemData->path[sizeof(MEMSEGPATH)],name);
 
-    int mode = 0777;
-    if (strcmp(name,"token_names") != 0) {
-	/* each user gets his own uid array */
-    	sprintf(uid_str, "-%u",getuid());
-    	strcat(shmemData->path,uid_str);
-	mode = 0700;
-    } 
+    sprintf(uid_str, "-%u",getuid());
+    strcat(shmemData->path,uid_str);
+    int mode = 0600;
+
     shmemData->fd = open(shmemData->path, 
 		O_CREAT|O_RDWR|O_EXCL|O_APPEND|O_EXLOCK, mode);
-    if (shmemData->fd  < 0) {
-	needInit = false;
-	shmemData->fd = open(shmemData->path,O_RDWR|O_EXLOCK, mode);
-    }  else {
+    if (shmemData->fd >= 0) {
 	char *buf;
 	int len = size+RESERVED_OFFSET;
+	int ret;
 
 	buf = (char *)calloc(1,len);
 	if (!buf) {
@@ -289,8 +354,22 @@
 	    delete shmemData;
 	    return NULL;
 	}
-	write(shmemData->fd,buf,len);
+	ret = write(shmemData->fd,buf,len);
+	if (ret != len) {
+	    unlink(shmemData->path);
+#ifdef FULL_CLEANUP
+	    flock(shmemData->fd, LOCK_UN);
+#endif
+	    delete shmemData;
+	    return NULL;
+	}
+	
 	free(buf);
+    } else if (errno == EEXIST) {
+	needInit = false;
+
+	shmemData->fd = safe_open(shmemData->path,O_RDWR|O_EXLOCK, mode,
+				  size+RESERVED_OFFSET);
     }
     if (shmemData->fd < 0) {
 	delete shmemData;



From fedora-extras-commits at redhat.com  Thu Sep 27 23:35:41 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 19:35:41 -0400
Subject: rpms/mlton/devel .cvsignore, 1.6, 1.7 mlton.spec, 1.19, 1.20 sources,
	1.6, 1.7
Message-ID: <200709272335.l8RNZfJ5032379@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32353

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
- Re-bootstrap ppc



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Sep 2007 01:35:04 -0000	1.6
+++ .cvsignore	27 Sep 2007 23:35:08 -0000	1.7
@@ -1 +1,2 @@
+mlton-20061107-1.ppc-linux.tgz
 mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mlton.spec	26 Sep 2007 23:51:46 -0000	1.19
+++ mlton.spec	27 Sep 2007 23:35:08 -0000	1.20
@@ -1,8 +1,12 @@
+%ifarch ppc
+%define mlton_bootstrap 1
+%else
 %define mlton_bootstrap 0
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -10,7 +14,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-#Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
+Source1:	mlton-20061107-1.ppc-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -98,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
+- Re-bootstrap ppc
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
 - Really fix SRPM conditionals
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Sep 2007 01:35:04 -0000	1.6
+++ sources	27 Sep 2007 23:35:08 -0000	1.7
@@ -1 +1,2 @@
+7f78b83b51fa5d3a020181a460b36a89  mlton-20061107-1.ppc-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 23:43:37 2007
From: fedora-extras-commits at redhat.com (Jack Magne (jmagne))
Date: Thu, 27 Sep 2007 19:43:37 -0400
Subject: rpms/coolkey/devel coolkey.spec,1.25,1.26
Message-ID: <200709272343.l8RNhbZc032623@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32483

Modified Files:
	coolkey.spec 
Log Message:
Include patch for moving the cache directory to a safe location. Resolves #299481, related #301031.



Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- coolkey.spec	21 Aug 2007 01:25:01 -0000	1.25
+++ coolkey.spec	27 Sep 2007 23:43:05 -0000	1.26
@@ -22,18 +22,19 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
+Patch1: coolkey-cache-dir-move.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: pcsc-lite-devel
 BuildRequires: zlib-devel
 BuildRequires: mozilla-nss-devel
-#Requires: nss-tools
+Requires: nss-tools
 Requires: pcsc-lite 
 Requires: pcsc-lite-libs
 Requires: ifd-egate
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch1 -b .cache.dir.move
 
 %build
 autoconf
@@ -66,25 +68,26 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p $RPM_BUILD_ROOT/var/cache/coolkey
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-#isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
-#if [ "$isThere" == "NO" ]; then
-#   if [ -x %{_bindir}/pk11install ]; then
-#      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
-#   fi
-#fi
+isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
+if [ "$isThere" == "NO" ]; then
+   if [ -x %{_bindir}/pk11install ]; then
+      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
+   fi
+fi
 
 
 %postun
 /sbin/ldconfig
-#if [ $1 -eq 0 ]; then
-#   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
-#fi
+if [ $1 -eq 0 ]; then
+   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
+fi
 
 
 %files
@@ -103,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5
+- Include patch for moving the cache directory to a safe location. 
+- Bug #299481.
 * Fri Aug 20 2007 Bob Relyea <rrelyea at redhat.com> - 1.1.0-4
 - Update License description to the new Fedora standard
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:49:43 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 19:49:43 -0400
Subject: rpms/kernel/devel linux-2.6-iwlwifi-fixes.patch, NONE,
	1.1 kernel.spec, 1.194, 1.195 linux-2.6-ath5k.patch, 1.1, 1.2
Message-ID: <200709272349.l8RNnhsC000308@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	kernel.spec linux-2.6-ath5k.patch 
Added Files:
	linux-2.6-iwlwifi-fixes.patch 
Log Message:
A few iwlwifi and ath5k fixes

linux-2.6-iwlwifi-fixes.patch:

--- NEW FILE linux-2.6-iwlwifi-fixes.patch ---
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c	2007-09-27 19:09:01.000000000 -0400
@@ -115,24 +115,38 @@ struct iwl_rate_scale_priv {
 	u8 is_dup;
 	u8 phymode;
 	u8 ibss_sta_added;
+	u32 supp_rates;
 	u16 active_rate;
 	u16 active_siso_rate;
 	u16 active_mimo_rate;
 	u16 active_rate_basic;
 	struct iwl_link_quality_cmd lq;
 	struct iwl_scale_tbl_info lq_info[LQ_SIZE];
+#ifdef CONFIG_MAC80211_DEBUGFS
+	struct dentry *rs_sta_dbgfs_scale_table_file;
+	struct dentry *rs_sta_dbgfs_stats_table_file;
+	struct iwl_rate dbg_fixed;
+	struct iwl_priv *drv;
+#endif
 };
 
 static void rs_rate_scale_perform(struct iwl_priv *priv,
 				   struct net_device *dev,
 				   struct ieee80211_hdr *hdr,
 				   struct sta_info *sta);
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_rate *tx_mcs,
-			     struct iwl_link_quality_cmd *tbl,
-			     struct sta_info *sta);
+			     struct iwl_link_quality_cmd *tbl);
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index);
+#else
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{}
+#endif
 static s32 expected_tpt_A[IWL_RATE_COUNT] = {
 	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186, 186
 };
@@ -539,14 +553,13 @@ static u16 rs_get_adjacent_rate(u8 index
 
 static int rs_get_lower_rate(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_scale_tbl_info *tbl, u8 scale_index,
-			     u8 ht_possible, struct iwl_rate *mcs_rate,
-			     struct sta_info *sta)
+			     u8 ht_possible, struct iwl_rate *mcs_rate)
 {
-	u8 is_green = lq_data->is_green;
 	s32 low;
 	u16 rate_mask;
 	u16 high_low;
 	u8 switch_to_legacy = 0;
+	u8 is_green = lq_data->is_green;
 
 	/* check if we need to switch from HT to legacy rates.
 	 * assumption is that mandatory rates (1Mbps or 6Mbps)
@@ -573,9 +586,9 @@ static int rs_get_lower_rate(struct iwl_
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_mask  = (u16)(rate_mask &
-			   (sta->supp_rates << IWL_FIRST_OFDM_RATE));
+			   (lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
-			rate_mask = (u16)(rate_mask & sta->supp_rates);
+			rate_mask = (u16)(rate_mask & lq_data->supp_rates);
 	}
 
 	/* if we did switched from HT to legacy check current rate */
@@ -619,7 +632,7 @@ static void rs_tx_status(void *priv_rate
 	u16 fc = le16_to_cpu(hdr->frame_control);
 	s32 tpt = 0;
 
-	IWL_DEBUG_RATE("get frame ack response, update rate scale window\n");
+	IWL_DEBUG_RATE_LIMIT("get frame ack response, update rate scale window\n");
 
 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
 		return;
@@ -1388,10 +1401,10 @@ static void rs_rate_scale_perform(struct
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_scale_index_msk = (u16) (rate_mask &
-				(sta->supp_rates << IWL_FIRST_OFDM_RATE));
+				(lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
 			rate_scale_index_msk = (u16) (rate_mask &
-						      sta->supp_rates);
+						      lq_data->supp_rates);
 
 	} else
 		rate_scale_index_msk = rate_mask;
@@ -1431,7 +1444,7 @@ static void rs_rate_scale_perform(struct
 		rs_stay_in_table(lq_data);
 		if (update_lq) {
 			rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		goto out;
@@ -1555,7 +1568,7 @@ static void rs_rate_scale_perform(struct
  lq_update:
 	if (update_lq) {
 		rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 		rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 	}
 	rs_stay_in_table(lq_data);
@@ -1581,7 +1594,7 @@ static void rs_rate_scale_perform(struct
 			IWL_DEBUG_HT("Switch current  mcs: %X index: %d\n",
 				     tbl->current_rate.rate_n_flags, index);
 			rs_fill_link_cmd(lq_data, &tbl->current_rate,
-					 &(lq_data->lq), sta);
+					 &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		tbl1 = &(lq_data->lq_info[lq_data->active_tbl]);
@@ -1672,12 +1685,12 @@ static void rs_initialize_lq(struct iwl_
 	tbl->antenna_type = ANT_AUX;
 	rs_get_tbl_info_from_mcs(&mcs_rate, priv->phymode, tbl, &rate_idx);
 	if (!rs_is_ant_connected(priv->valid_antenna, tbl->antenna_type))
-	    rs_toggle_antenna(&mcs_rate, tbl),
+	    rs_toggle_antenna(&mcs_rate, tbl);
 
 	rs_mcs_from_tbl(&mcs_rate, tbl, rate_idx, use_green);
 	tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
 	rs_get_expected_tpt_table(lq, tbl);
-	rs_fill_link_cmd(lq, &mcs_rate, &(lq->lq), sta);
+	rs_fill_link_cmd(lq, &mcs_rate, &lq->lq);
 	rs_send_lq_cmd(priv, &lq->lq, CMD_ASYNC);
  out:
 	return;
@@ -1714,7 +1727,7 @@ static struct ieee80211_rate *rs_get_rat
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *lq;
 
-	IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
+	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
 	memset(extra, 0, sizeof(*extra));
 
@@ -1775,10 +1788,9 @@ static void *rs_alloc_sta(void *priv, gf
 
 	if (crl == NULL)
 		return NULL;
-
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
 	crl->lq.sta_id = 0xff;
 
+
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
 			rs_rate_scale_clear_window(&(crl->lq_info[j].win[i]));
@@ -1795,10 +1807,8 @@ static void rs_rate_init(void *priv_rate
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *crl = priv_sta;
 
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
-
-	crl->lq.sta_id = 0xff;
 	crl->flush_timer = 0;
+	crl->supp_rates = sta->supp_rates;
 	sta->txrate = 3;
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
@@ -1864,6 +1874,9 @@ static void rs_rate_init(void *priv_rate
 	IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate,
 		     crl->active_mimo_rate);
 #endif /*CONFIG_IWLWIFI_HT*/
+#ifdef CONFIG_MAC80211_DEBUGFS
+	crl->drv = priv;
+#endif
 
 	if (priv->assoc_station_added)
 		priv->lq_mngr.lq_ready = 1;
@@ -1871,28 +1884,28 @@ static void rs_rate_init(void *priv_rate
 	rs_initialize_lq(priv, sta);
 }
 
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			    struct iwl_rate *tx_mcs,
-			    struct iwl_link_quality_cmd *lq_cmd,
-			    struct sta_info *sta)
+			    struct iwl_link_quality_cmd *lq_cmd)
 {
 	int index = 0;
-	int rc = 0;
 	int rate_idx;
+	int repeat_rate = 0;
 	u8 ant_toggle_count = 0;
 	u8 use_ht_possible = 1;
-	u8 repeat_cur_rate = 0;
 	struct iwl_rate new_rate;
 	struct iwl_scale_tbl_info tbl_type = { 0 };
 
+	rs_dbgfs_set_mcs(lq_data, tx_mcs, index);
+
 	rs_get_tbl_info_from_mcs(tx_mcs, lq_data->phymode,
 				  &tbl_type, &rate_idx);
 
 	if (is_legacy(tbl_type.lq_type)) {
 		ant_toggle_count = 1;
-		repeat_cur_rate = IWL_NUMBER_TRY;
+		repeat_rate = IWL_NUMBER_TRY;
 	} else
-		repeat_cur_rate = IWL_HT_NUMBER_TRY;
+		repeat_rate = IWL_HT_NUMBER_TRY;
 
 	lq_cmd->general_params.mimo_delimiter =
 			is_mimo(tbl_type.lq_type) ? 1 : 0;
@@ -1906,10 +1919,10 @@ static int rs_fill_link_cmd(struct iwl_r
 		lq_cmd->general_params.single_stream_ant_msk = 2;
 
 	index++;
-	repeat_cur_rate--;
+	repeat_rate--;
 
 	while (index < LINK_QUAL_MAX_RETRY_NUM) {
-		while (repeat_cur_rate && (index < LINK_QUAL_MAX_RETRY_NUM)) {
+		while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
 			if (is_legacy(tbl_type.lq_type)) {
 				if (ant_toggle_count <
 				    NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1919,9 +1932,11 @@ static int rs_fill_link_cmd(struct iwl_r
 					ant_toggle_count = 1;
 				}
 			}
+
+			rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 			lq_cmd->rs_table[index].rate_n_flags =
 					cpu_to_le32(new_rate.rate_n_flags);
-			repeat_cur_rate--;
+			repeat_rate--;
 			index++;
 		}
 
@@ -1932,7 +1947,7 @@ static int rs_fill_link_cmd(struct iwl_r
 			lq_cmd->general_params.mimo_delimiter = index;
 
 		rs_get_lower_rate(lq_data, &tbl_type, rate_idx,
-				  use_ht_possible, &new_rate, sta);
+				  use_ht_possible, &new_rate);
 
 		if (is_legacy(tbl_type.lq_type)) {
 			if (ant_toggle_count < NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1941,26 +1956,23 @@ static int rs_fill_link_cmd(struct iwl_r
 				rs_toggle_antenna(&new_rate, &tbl_type);
 				ant_toggle_count = 1;
 			}
-			repeat_cur_rate = IWL_NUMBER_TRY;
+			repeat_rate = IWL_NUMBER_TRY;
 		} else
-			repeat_cur_rate = IWL_HT_NUMBER_TRY;
+			repeat_rate = IWL_HT_NUMBER_TRY;
 
 		use_ht_possible = 0;
 
+		rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 		lq_cmd->rs_table[index].rate_n_flags =
 				cpu_to_le32(new_rate.rate_n_flags);
-		/* lq_cmd->rs_table[index].rate_n_flags = 0x800d; */
 
 		index++;
-		repeat_cur_rate--;
+		repeat_rate--;
 	}
 
-	/* lq_cmd->rs_table[0].rate_n_flags = 0x800d; */
-
 	lq_cmd->general_params.dual_stream_ant_msk = 3;
 	lq_cmd->agg_params.agg_dis_start_th = 3;
 	lq_cmd->agg_params.agg_time_limit = cpu_to_le16(4000);
-	return rc;
 }
 
 static void *rs_alloc(struct ieee80211_local *local)
@@ -2000,6 +2012,162 @@ static void rs_free_sta(void *priv, void
 }
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{
+	const u32 cck_rate = 0x820A;
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		if (index < 12)
+			mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
+		else
+			mcs->rate_n_flags = cck_rate;
+		IWL_DEBUG_RATE("Fixed rate ON\n");
+		return;
+	}
+
+	IWL_DEBUG_RATE("Fixed rate OFF\n");
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
+			const char __user *user_buf, size_t count, loff_t *ppos)
+{
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	char buf[64];
+	int buf_size;
+	u32 parsed_rate;
+
+	memset(buf, 0, sizeof(buf));
+	buf_size = min(count, sizeof(buf) -  1);
+	if (copy_from_user(buf, user_buf, buf_size))
+		return -EFAULT;
+
+	if (sscanf(buf, "%x", &parsed_rate) == 1)
+		rs_priv->dbg_fixed.rate_n_flags = parsed_rate;
+	else
+		rs_priv->dbg_fixed.rate_n_flags = 0;
+
+	rs_priv->active_rate = 0x0FFF;
+	rs_priv->active_siso_rate = 0x1FD0;
+	rs_priv->active_mimo_rate = 0x1FD0;
+
+	IWL_DEBUG_RATE("sta_id %d rate 0x%X\n",
+		rs_priv->lq.sta_id, rs_priv->dbg_fixed.rate_n_flags);
+
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		rs_fill_link_cmd(rs_priv, &rs_priv->dbg_fixed, &rs_priv->lq);
+		rs_send_lq_cmd(rs_priv->drv, &rs_priv->lq, CMD_ASYNC);
+	}
+
+	return count;
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i = 0;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+
+	desc += sprintf(buff+desc, "sta_id %d\n", rs_priv->lq.sta_id);
+	desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
+			rs_priv->total_failed, rs_priv->total_success,
+			rs_priv->active_rate);
+	desc += sprintf(buff+desc, "fixed rate 0x%X\n",
+			rs_priv->dbg_fixed.rate_n_flags);
+	desc += sprintf(buff+desc, "general:"
+		"flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
+		rs_priv->lq.general_params.flags,
+		rs_priv->lq.general_params.mimo_delimiter,
+		rs_priv->lq.general_params.single_stream_ant_msk,
+		rs_priv->lq.general_params.dual_stream_ant_msk);
+
+	desc += sprintf(buff+desc, "agg:"
+			"time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
+			le16_to_cpu(rs_priv->lq.agg_params.agg_time_limit),
+			rs_priv->lq.agg_params.agg_dis_start_th,
+			rs_priv->lq.agg_params.agg_frame_cnt_limit);
+
+	desc += sprintf(buff+desc,
+			"Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
+			rs_priv->lq.general_params.start_rate_index[0],
+			rs_priv->lq.general_params.start_rate_index[1],
+			rs_priv->lq.general_params.start_rate_index[2],
+			rs_priv->lq.general_params.start_rate_index[3]);
+
+
+	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+		desc += sprintf(buff+desc, " rate[%d] 0x%X\n",
+			i, le32_to_cpu(rs_priv->lq.rs_table[i].rate_n_flags));
+
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
+	.write = rs_sta_dbgfs_scale_table_write,
+	.read = rs_sta_dbgfs_scale_table_read,
+	.open = open_file_generic,
+};
+static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i, j;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	for (i = 0; i < LQ_SIZE; i++) {
+		desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n"
+				"rate=0x%X\n",
+				rs_priv->active_tbl == i?"*":"x",
+				rs_priv->lq_info[i].lq_type,
+				rs_priv->lq_info[i].is_SGI,
+				rs_priv->lq_info[i].is_fat,
+				rs_priv->lq_info[i].is_dup,
+				rs_priv->lq_info[i].current_rate.rate_n_flags);
+		for (j = 0; j < IWL_RATE_COUNT; j++) {
+			desc += sprintf(buff+desc,
+					"counter=%d success=%d %%=%d\n",
+					rs_priv->lq_info[i].win[j].counter,
+					rs_priv->lq_info[i].win[j].success_counter,
+					rs_priv->lq_info[i].win[j].success_ratio);
+		}
+	}
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+	.read = rs_sta_dbgfs_stats_table_read,
+	.open = open_file_generic,
+};
+
+static void rs_add_debugfs(void *priv, void *priv_sta,
+					struct dentry *dir)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	rs_priv->rs_sta_dbgfs_scale_table_file =
+		debugfs_create_file("rate_scale_table", 0600, dir,
+				rs_priv, &rs_sta_dbgfs_scale_table_ops);
+	rs_priv->rs_sta_dbgfs_stats_table_file =
+		debugfs_create_file("rate_stats_table", 0600, dir,
+			rs_priv, &rs_sta_dbgfs_stats_table_ops);
+}
+
+static void rs_remove_debugfs(void *priv, void *priv_sta)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	debugfs_remove(rs_priv->rs_sta_dbgfs_scale_table_file);
+	debugfs_remove(rs_priv->rs_sta_dbgfs_stats_table_file);
+}
+#endif
+
 static struct rate_control_ops rs_ops = {
 	.module = NULL,
 	.name = RS_NAME,
@@ -2011,6 +2179,10 @@ static struct rate_control_ops rs_ops = 
 	.free = rs_free,
 	.alloc_sta = rs_alloc_sta,
 	.free_sta = rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+	.add_sta_debugfs = rs_add_debugfs,
+	.remove_sta_debugfs = rs_remove_debugfs,
+#endif
 };
 
 int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2007-09-27 19:09:01.000000000 -0400
@@ -102,7 +102,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -203,7 +203,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
 
 /**************************************************************/
 
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,6 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
+#endif
 
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
@@ -851,16 +853,12 @@ int iwl_send_statistics_request(struct i
 static int iwl_rxon_add_station(struct iwl_priv *priv,
 				const u8 *addr, int is_ap)
 {
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
+	u8 sta_id;
 
+	sta_id = iwl_add_station(priv, addr, is_ap, 0);
 	iwl4965_add_station(priv, addr, is_ap);
 
-	return rc;
+	return sta_id;
 }
 
 /**
@@ -1147,16 +1145,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1176,6 +1164,8 @@ static int iwl_commit_rxon(struct iwl_pr
 		return rc;
 	}
 
+	iwl_clear_stations_table(priv);
+
 #ifdef CONFIG_IWLWIFI_SENSITIVITY
 	if (!priv->error_recovering)
 		priv->start_calib = 0;
@@ -4608,6 +4598,7 @@ static void iwl_rx_handle(struct iwl_pri
 		reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
 			(pkt->hdr.cmd != REPLY_RX_PHY_CMD) &&
 			(pkt->hdr.cmd != REPLY_4965_RX) &&
+			(pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
 			(pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
 			(pkt->hdr.cmd != REPLY_TX);
 
@@ -4893,12 +4884,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -7483,9 +7474,8 @@ static void iwl_config_ap(struct iwl_pri
 		iwl_activate_qos(priv, 1);
 #endif
 		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c	2007-09-27 19:10:39.000000000 -0400
@@ -183,7 +183,7 @@ u8 iwl_hw_find_station(struct iwl_priv *
 			goto out;
 		}
 
-	IWL_DEBUG_ASSOC("can not find STA " MAC_FMT " total %d\n",
+	IWL_DEBUG_ASSOC_LIMIT("can not find STA " MAC_FMT " total %d\n",
 			MAC_ARG(addr), priv->num_stations);
 
  out:
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h	2007-09-27 19:09:01.000000000 -0400
@@ -136,8 +136,11 @@ static inline void IWL_DEBUG_LIMIT(int l
 #define IWL_DEBUG_TXPOWER(f, a...) IWL_DEBUG(IWL_DL_TXPOWER, f, ## a)
 #define IWL_DEBUG_IO(f, a...) IWL_DEBUG(IWL_DL_IO, f, ## a)
 #define IWL_DEBUG_RATE(f, a...) IWL_DEBUG(IWL_DL_RATE, f, ## a)
+#define IWL_DEBUG_RATE_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_RATE, f, ## a)
 #define IWL_DEBUG_NOTIF(f, a...) IWL_DEBUG(IWL_DL_NOTIF, f, ## a)
 #define IWL_DEBUG_ASSOC(f, a...) IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
+#define IWL_DEBUG_ASSOC_LIMIT(f, a...) \
+	IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2007-09-27 19:10:13.000000000 -0400
@@ -103,7 +103,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -204,7 +204,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
  */
 
 /**************************************************************/
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,7 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
-
+#endif
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
 	unsigned long flags;
@@ -462,6 +463,7 @@ u8 iwl_add_station(struct iwl_priv *priv
 	int index = IWL_INVALID_STATION;
 	struct iwl_station_entry *station;
 	unsigned long flags_spin;
+	u8 rate;
 
 	spin_lock_irqsave(&priv->sta_lock, flags_spin);
 	if (is_ap)
@@ -505,6 +507,15 @@ u8 iwl_add_station(struct iwl_priv *priv
 	station->sta.sta.sta_id = index;
 	station->sta.station_flags = 0;
 
+	rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :
+				IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;
+
+	/* Turn on both antennas for the station... */
+	station->sta.rate_n_flags =
+			iwl_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
+	station->current_rate.rate_n_flags =
+			le16_to_cpu(station->sta.rate_n_flags);
+
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	iwl_send_add_station(priv, &station->sta, flags);
 	return index;
@@ -834,25 +845,6 @@ int iwl_send_statistics_request(struct i
 }
 
 /**
- * iwl_rxon_add_station - add station into station table.
- *
- * there is only one AP station with id= IWL_AP_ID
- * NOTE: mutex must be held before calling the this fnction
-*/
-static int iwl_rxon_add_station(struct iwl_priv *priv,
-				const u8 *addr, int is_ap)
-{
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
-
-	return rc;
-}
-
-/**
  * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
  * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
  * @channel: Any channel valid for the requested phymode
@@ -1121,16 +1113,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1152,6 +1134,8 @@ static int iwl_commit_rxon(struct iwl_pr
 
 	memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
 
+	iwl_clear_stations_table(priv);
+
 	/* If we issue a new RXON command which required a tune then we must
 	 * send a new TXPOWER command or we won't be able to Tx any frames */
 	rc = iwl_hw_reg_send_txpower(priv);
@@ -1161,7 +1145,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	}
 
 	/* Add the broadcast address so we can send broadcast frames */
-	if (iwl_rxon_add_station(priv, BROADCAST_ADDR, 0) ==
+	if (iwl_add_station(priv, BROADCAST_ADDR, 0, 0) ==
 	    IWL_INVALID_STATION) {
 		IWL_ERROR("Error adding BROADCAST address for transmit.\n");
 		return -EIO;
@@ -1171,7 +1155,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	 * add the IWL_AP_ID to the station rate table */
 	if (iwl_is_associated(priv) &&
 	    (priv->iw_mode == IEEE80211_IF_TYPE_STA))
-		if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
+		if (iwl_add_station(priv, priv->active_rxon.bssid_addr, 1, 0)
 		    == IWL_INVALID_STATION) {
 			IWL_ERROR("Error adding AP address for transmit.\n");
 			return -EIO;
@@ -4583,12 +4567,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -4650,7 +4634,7 @@ static void iwl_error_recovery(struct iw
 	priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	iwl_commit_rxon(priv);
 
-	iwl_rxon_add_station(priv, priv->bssid, 1);
+	iwl_add_station(priv, priv->bssid, 1, 0);
 
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
@@ -6793,8 +6777,8 @@ static void iwl_bg_post_associate(struct
 		/* clear out the station table */
 		iwl_clear_stations_table(priv);
 
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_rxon_add_station(priv, priv->bssid, 0);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+		iwl_add_station(priv, priv->bssid, 0, 0);
 		iwl3945_sync_sta(priv, IWL_STA_ID,
 				 (priv->phymode == MODE_IEEE80211A)?
 				 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
@@ -7082,10 +7066,9 @@ static void iwl_config_ap(struct iwl_pri
 		/* restore RXON assoc */
 		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
 		iwl_commit_rxon(priv);
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
@@ -7168,8 +7151,8 @@ static int iwl_mac_config_interface(stru
 						RXON_FILTER_ASSOC_MSK;
 			rc = iwl_commit_rxon(priv);
 			if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
-				iwl_rxon_add_station(
-					priv, priv->active_rxon.bssid_addr, 1);
+				iwl_add_station(priv,
+					priv->active_rxon.bssid_addr, 1, 0);
 		}
 
 	} else {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kernel.spec	27 Sep 2007 16:33:17 -0000	1.194
+++ kernel.spec	27 Sep 2007 23:49:10 -0000	1.195
@@ -632,6 +632,7 @@
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-iwlwifi-fixes.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1143,6 +1144,8 @@
 # wireless patches headed for 2.6.23
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
+# late-breaking iwlwifi fixes (will be rolled into wireless-pending patch)
+ApplyPatch linux-2.6-iwlwifi-fixes.patch
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 ApplyPatch linux-2.6-ath5k.patch
@@ -1809,6 +1812,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- A few iwlwifi and ath5k fixes
+
 * Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc8-git2
 - Re-add AMD timer fix removed from upstream

linux-2.6-ath5k.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-ath5k.patch
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ath5k.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ath5k.patch	27 Sep 2007 00:43:34 -0000	1.1
+++ linux-2.6-ath5k.patch	27 Sep 2007 23:49:10 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:59:33.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:00:12.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 19:26:44.000000000 -0400
 @@ -642,6 +642,14 @@ M:	ecashin at coraid.com
  W:	http://www.coraid.com/support/linux
  S:	Supported
@@ -16,14050 +16,13915 @@
  ATL1 ETHERNET DRIVER
  P:	Jay Cliburn
  M:	jcliburn at gmail.com
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-26 20:00:12.000000000 -0400
-@@ -0,0 +1,1104 @@
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 19:27:03.000000000 -0400
+@@ -61,3 +61,5 @@ obj-$(CONFIG_RT2X00)		+= rt2x00/
+ obj-$(CONFIG_P54_COMMON)	+= p54common.o
+ obj-$(CONFIG_P54_USB)		+= p54usb.o
+ obj-$(CONFIG_P54_PCI)		+= p54pci.o
++
++obj-$(CONFIG_ATH5K)	+= ath5k/
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 19:26:44.000000000 -0400
+@@ -598,6 +598,19 @@ config P54_PCI
+ 	tristate "Prism54 PCI support"
+ 	depends on P54_COMMON && PCI
+ 
++config ATH5K
++	tristate "Atheros 5xxx wireless cards support"
++	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
++	default m
++	---help---
++	  This module adds support for atheros 5xxx (e.g. 5212) wireless
++	  cards. If you have this card in your PC, select this to be build.
++
++	  This driver uses the kernel's mac80211 subsystem.
++
++	  If you choose to build a module, it'll be called ath5k. Say M if
++	  unsure.
++
+ source "drivers/net/wireless/hostap/Kconfig"
+ source "drivers/net/wireless/bcm43xx/Kconfig"
+ source "drivers/net/wireless/b43/Kconfig"
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c	2007-09-27 19:26:44.000000000 -0400
+@@ -0,0 +1,1704 @@
 +/*
-+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
-+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
++ * PHY functions
 + *
-+ * Permission to use, copy, modify, and 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.
++ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ *  This file is free software: you can copy, redistribute 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 file 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/>.
++ *
++ * This file incorporates work covered by the following copyright and
++ * permission notice:
++ *
++ *     Copyright (c) 2007 Jiri Slaby <jirislaby at gmail.com>
++ *     Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk at openbsd.org>
++ *
++ *     Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL
++ *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
++ *     AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
 + */
 +
-+#ifndef _ATH5K_H
-+#define _ATH5K_H
++#include <linux/delay.h>
 +
-+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
-+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
-+ * long and results timeouts). It's also illegal to tune to some of the
-+ * supported frequencies in some countries, so use this at your own risk,
-+ * you've been warned. */
-+#define CHAN_DEBUG	0
++#include "ath5k.h"
++#include "reg.h"
 +
-+/* Uncomment this for debuging (warning that it results in TOO much output) */
-+/*#define AR5K_DEBUG	1 */
++/* Struct to hold initial RF register values (RF Banks) */
++struct ath5k_ini_rf {
++	u8	rf_bank;	/* check out ath5k_reg.h */
++	u16	rf_register;	/* register address */
++	u32	rf_value[5];	/* register value for different modes (above) */
++};
 +
-+#include <linux/types.h>
-+#include <net/mac80211.h>
++/*
++ * Mode-specific RF Gain table (64bytes) for RF5111/5112
++ * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial
++ * RF Gain values are included in AR5K_AR5210_INI)
++ */
++struct ath5k_ini_rfgain {
++	u16	rfg_register;	/* RF Gain register address */
++	u32	rfg_value[2];	/* [freq (see below)] */
++};
 +
-+#include "ath5k_hw.h"
-+#include "ath5k_regdom.h"
++struct ath5k_gain_opt {
++	u32			go_default;
++	u32			go_steps_count;
++	const struct ath5k_gain_opt_step	go_step[AR5K_GAIN_STEP_COUNT];
++};
 +
-+/* PCI IDs */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
-+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
++/* RF5111 mode-specific init registers */
++static const struct ath5k_ini_rf rfregs_5111[] = {
++	{ 0, 0x989c,
++	/*    mode a/XR   mode aTurbo mode b      mode g      mode gTurbo */
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
[...25702 lines suppressed...]
-+/*
-+ * PHY current RSSI register [5111+]
-+ */
-+#define	AR5K_PHY_CURRENT_RSSI		0x9c1c
++	ret = pci_register_driver(&ath_pci_drv_id);
++	if (ret) {
++		printk(KERN_ERR "ath_pci: can't register pci driver\n");
++		return ret;
++	}
++	ath_sysctl_header = register_sysctl_table(ath_root_table);
 +
-+/*
-+ * PHY PCDAC TX power table
-+ */
-+#define	AR5K_PHY_PCDAC_TXPOWER_BASE	0xa180
-+#define	AR5K_PHY_PCDAC_TXPOWER(_n)	(AR5K_PHY_PCDAC_TXPOWER_BASE + ((_n) << 2))
++	return 0;
++}
 +
-+/*
-+ * PHY mode register [5111+]
-+ */
-+#define	AR5K_PHY_MODE			0x0a200		/* Register address */
-+#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation mask*/
-+#define AR5K_PHY_MODE_MOD_OFDM		0
-+#define AR5K_PHY_MODE_MOD_CCK		1
-+#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode mask */
-+#define	AR5K_PHY_MODE_FREQ_5GHZ		0
-+#define	AR5K_PHY_MODE_FREQ_2GHZ		2
-+#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Dynamic OFDM/CCK mode mask [5112+] */
-+#define AR5K_PHY_MODE_RAD		0x00000008	/* [5212+] */
-+#define AR5K_PHY_MODE_RAD_RF5111	0
-+#define AR5K_PHY_MODE_RAD_RF5112	8
-+#define AR5K_PHY_MODE_XR		0x00000010	/* [5112+] */
++static void __exit exit_ath_pci(void)
++{
++	if (ath_sysctl_header)
++		unregister_sysctl_table(ath_sysctl_header);
++	pci_unregister_driver(&ath_pci_drv_id);
++}
 +
-+/*
-+ * PHY CCK transmit control register [5111+ (?)]
-+ */
-+#define AR5K_PHY_CCKTXCTL		0xa204
-+#define AR5K_PHY_CCKTXCTL_WORLD		0x00000000
-+#define AR5K_PHY_CCKTXCTL_JAPAN		0x00000010
++module_init(init_ath_pci);
++module_exit(exit_ath_pci);
 +
-+/*
-+ * PHY 2GHz gain register [5111+]
-+ */
-+#define	AR5K_PHY_GAIN_2GHZ		0xa20c
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX	0x00fc0000
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S	18
-+#define	AR5K_PHY_GAIN_2GHZ_INI_5111	0x6480416c
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h	2007-09-26 20:00:12.000000000 -0400
++MODULE_AUTHOR("Jiri Slaby");
++MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards.");
++MODULE_SUPPORTED_DEVICE("Atheros WLAN cards");
++MODULE_LICENSE("Dual BSD/GPL");
++MODULE_VERSION(ATH_PCI_VERSION " (EXPERIMENTAL)");
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h	2007-09-27 19:26:44.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*-
 + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -14265,3 +14130,128 @@
 +	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
 +
 +#endif
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c	2007-09-27 19:26:44.000000000 -0400
+@@ -0,0 +1,121 @@
++/*
++ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
++ *
++ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Basic regulation domain extensions for the IEEE 802.11 stack
++ */
++
++#include <linux/kernel.h>
++#include <linux/string.h>
++
++#include "regdom.h"
++
++static const struct ath5k_regdommap {
++	enum ath5k_regdom dmn;
++	enum ath5k_regdom dmn5;
++	enum ath5k_regdom dmn2;
++} r_map[] = {
++	{ DMN_DEFAULT,		DMN_DEBUG,	DMN_DEBUG },
++	{ DMN_NULL_WORLD,	DMN_NULL,	DMN_WORLD },
++	{ DMN_NULL_ETSIB,	DMN_NULL,	DMN_ETSIB },
++	{ DMN_NULL_ETSIC,	DMN_NULL,	DMN_ETSIC },
++	{ DMN_FCC1_FCCA,	DMN_FCC1,	DMN_FCCA },
++	{ DMN_FCC1_WORLD,	DMN_FCC1,	DMN_WORLD },
++	{ DMN_FCC2_FCCA,	DMN_FCC2,	DMN_FCCA },
++	{ DMN_FCC2_WORLD,	DMN_FCC2,	DMN_WORLD },
++	{ DMN_FCC2_ETSIC,	DMN_FCC2,	DMN_ETSIC },
++	{ DMN_FRANCE_NULL,	DMN_ETSI3,	DMN_ETSI3 },
++	{ DMN_FCC3_FCCA,	DMN_FCC3,	DMN_WORLD },
++	{ DMN_ETSI1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_ETSI3_ETSIA,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI2_WORLD,	DMN_ETSI2,	DMN_WORLD },
++	{ DMN_ETSI3_WORLD,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI4_WORLD,	DMN_ETSI4,	DMN_WORLD },
++	{ DMN_ETSI4_ETSIC,	DMN_ETSI4,	DMN_ETSIC },
++	{ DMN_ETSI5_WORLD,	DMN_ETSI5,	DMN_WORLD },
++	{ DMN_ETSI6_WORLD,	DMN_ETSI6,	DMN_WORLD },
++	{ DMN_ETSI_NULL,	DMN_ETSI1,	DMN_ETSI1 },
++	{ DMN_MKK1_MKKA,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKB,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL4_WORLD,	DMN_APL4,	DMN_WORLD },
++	{ DMN_MKK2_MKKA,	DMN_MKK2,	DMN_MKKA },
++	{ DMN_APL_NULL,		DMN_APL1,	DMN_NULL },
++	{ DMN_APL2_WORLD,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL2_APLC,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL3_WORLD,	DMN_APL3,	DMN_WORLD },
++	{ DMN_MKK1_FCCA,	DMN_MKK1,	DMN_FCCA },
++	{ DMN_APL2_APLD,	DMN_APL2,	DMN_APLD },
++	{ DMN_MKK1_MKKA1,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKA2,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL1_WORLD,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_FCCA,	DMN_APL1,	DMN_FCCA },
++	{ DMN_APL1_APLA,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_ETSIC,	DMN_APL1,	DMN_ETSIC },
++	{ DMN_APL2_ETSIC,	DMN_APL2,	DMN_ETSIC },
++	{ DMN_APL5_WORLD,	DMN_APL5,	DMN_WORLD },
++	{ DMN_WOR0_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR1_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR2_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR3_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR4_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR5_ETSIC,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR01_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR02_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_EU1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_WOR9_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WORA_WORLD,	DMN_WORLD,	DMN_WORLD },
++};
++
++enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom dmn, u16 mhz)
++{
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(r_map); i++) {
++		if (r_map[i].dmn == dmn) {
++			if (mhz >= 2000 && mhz <= 3000)
++				return r_map[i].dmn2;
++			if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
++					mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
++				return r_map[i].dmn5;
++		}
++	}
++
++	return DMN_DEBUG;
++}
++
++u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee)
++{
++	u32 regdomain = (u32)ieee;
++
++	/*
++	 * Use the default regulation domain if the value is empty
++	 * or not supported by the net80211 regulation code.
++	 */
++	if (ath5k_regdom2flag(regdomain, IEEE80211_CHANNELS_5GHZ_MIN) ==
++			DMN_DEBUG)
++		return (u16)AR5K_TUNE_REGDOMAIN;
++
++	/* It is supported, just return the value */
++	return regdomain;
++}
++
++enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain)
++{
++	enum ath5k_regdom ieee = (enum ath5k_regdom)regdomain;
++
++	return ieee;
++}
++



From fedora-extras-commits at redhat.com  Thu Sep 27 23:51:37 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 19:51:37 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.2,
	1.3 TurboGears.spec, 1.22, 1.23
Message-ID: <200709272351.l8RNpbX6000421@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv394

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
- Update setuptools patch to modify quickstart template for compat eggs as well.


TurboGears-1.0.3.2-setuptools.patch:

Index: TurboGears-1.0.3.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.3.2-setuptools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
+++ TurboGears-1.0.3.2-setuptools.patch	27 Sep 2007 23:51:34 -0000	1.3
@@ -1,6 +1,8 @@
---- setup.py.orig	2007-09-24 15:30:20.000000000 -0400
-+++ setup.py	2007-09-24 15:31:10.000000000 -0400
-@@ -16,34 +16,23 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -16,34 +16,23 @@ install_requires = [
              "TurboJson >= 0.9.9",
              "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
@@ -37,7 +39,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +116,7 @@
+@@ -127,7 +116,7 @@ The latest development version is availa
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,
@@ -46,3 +48,15 @@
          "testtools" : ["nose >= 0.9.1"],
          "tgtesttools" : tgtesttools,
      },
+Index: turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+===================================================================
+--- turbogears/qstemplates/quickstart/start-+package+.py_tmpl.orig
++++ turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+@@ -1,6 +1,6 @@
+ #!${sys_executable}
++__requires__="TurboGears"
+ import pkg_resources
+-pkg_resources.require("TurboGears")
+ 
+ from turbogears import config, update_config, start_server
+ import cherrypy


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
+++ TurboGears.spec	27 Sep 2007 23:51:34 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -27,8 +27,17 @@
 Requires: python-elementtree >= 1.2.6
 %endif
 
-Requires:       python-kid >= 0.8
+# The main packages have gone up a version.  Need to require the older versions
+#Not reviewed yet, cannot require until then
+#%if 0%{?fedora} >= 8
+#Requires:       python-cherrypy2 >= 2.2.1
+#Requires:       python-sqlalchemy0.3
+#%else
 Requires:       python-cherrypy >= 2.2.1
+Requires:       python-sqlalchemy >= 0.3
+#%endif
+
+Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
 Requires:       python-json >= 3.3
@@ -84,6 +93,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
+- Update setuptools patch to modify quickstart template for compat eggs as well.
+
 * Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
 - Update setuptools patch to "fix" CherryPy dependency error
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:54:58 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 19:54:58 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.2,1.3
Message-ID: <200709272354.l8RNswea000510@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv492

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
Fix BR.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Net-SNPP.spec	27 Sep 2007 22:01:45 -0000	1.2
+++ perl-Net-SNPP.spec	27 Sep 2007 23:54:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNPP
 Version:        1.17
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,7 +46,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-4
+- Fix BR
+
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-3
 - Update license tag.
 
 * Thu Dec  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2



From fedora-extras-commits at redhat.com  Fri Sep 28 00:08:05 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 20:08:05 -0400
Subject: rpms/i810switch/devel i810switch-0.6.5-add-i945.patch, NONE,
	1.1 i810switch.spec, 1.9, 1.10
Message-ID: <200709280008.l8S085cP006976@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6949

Modified Files:
	i810switch.spec 
Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 detection, fixes BZ297371

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	28 Sep 2007 00:07:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 00:13:00 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 20:13:00 -0400
Subject: rpms/bzr/FC-6 .cvsignore, 1.12, 1.13 bzr.spec, 1.16, 1.17 sources, 
	1.12, 1.13
Message-ID: <200709280013.l8S0D0P0007207@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7179

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2007 22:56:27 -0000	1.12
+++ .cvsignore	28 Sep 2007 00:12:25 -0000	1.13
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/bzr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzr.spec	30 Aug 2007 22:56:27 -0000	1.16
+++ bzr.spec	28 Sep 2007 00:12:25 -0000	1.17
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2007 22:56:27 -0000	1.12
+++ sources	28 Sep 2007 00:12:25 -0000	1.13
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 00:15:19 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 20:15:19 -0400
Subject: rpms/kernel/F-7 linux-2.6-iwlwifi-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.3350, 1.3351 linux-2.6-ath5k.patch, 1.1, 1.2
Message-ID: <200709280015.l8S0FJl5007401@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298

Modified Files:
	kernel-2.6.spec linux-2.6-ath5k.patch 
Added Files:
	linux-2.6-iwlwifi-fixes.patch 
Log Message:
A few iwlwifi and ath5k fixes

linux-2.6-iwlwifi-fixes.patch:

--- NEW FILE linux-2.6-iwlwifi-fixes.patch ---
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c	2007-09-27 20:06:43.000000000 -0400
@@ -115,24 +115,38 @@ struct iwl_rate_scale_priv {
 	u8 is_dup;
 	u8 phymode;
 	u8 ibss_sta_added;
+	u32 supp_rates;
 	u16 active_rate;
 	u16 active_siso_rate;
 	u16 active_mimo_rate;
 	u16 active_rate_basic;
 	struct iwl_link_quality_cmd lq;
 	struct iwl_scale_tbl_info lq_info[LQ_SIZE];
+#ifdef CONFIG_MAC80211_DEBUGFS
+	struct dentry *rs_sta_dbgfs_scale_table_file;
+	struct dentry *rs_sta_dbgfs_stats_table_file;
+	struct iwl_rate dbg_fixed;
+	struct iwl_priv *drv;
+#endif
 };
 
 static void rs_rate_scale_perform(struct iwl_priv *priv,
 				   struct net_device *dev,
 				   struct ieee80211_hdr *hdr,
 				   struct sta_info *sta);
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_rate *tx_mcs,
-			     struct iwl_link_quality_cmd *tbl,
-			     struct sta_info *sta);
+			     struct iwl_link_quality_cmd *tbl);
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index);
+#else
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{}
+#endif
 static s32 expected_tpt_A[IWL_RATE_COUNT] = {
 	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186, 186
 };
@@ -539,14 +553,13 @@ static u16 rs_get_adjacent_rate(u8 index
 
 static int rs_get_lower_rate(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_scale_tbl_info *tbl, u8 scale_index,
-			     u8 ht_possible, struct iwl_rate *mcs_rate,
-			     struct sta_info *sta)
+			     u8 ht_possible, struct iwl_rate *mcs_rate)
 {
-	u8 is_green = lq_data->is_green;
 	s32 low;
 	u16 rate_mask;
 	u16 high_low;
 	u8 switch_to_legacy = 0;
+	u8 is_green = lq_data->is_green;
 
 	/* check if we need to switch from HT to legacy rates.
 	 * assumption is that mandatory rates (1Mbps or 6Mbps)
@@ -573,9 +586,9 @@ static int rs_get_lower_rate(struct iwl_
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_mask  = (u16)(rate_mask &
-			   (sta->supp_rates << IWL_FIRST_OFDM_RATE));
+			   (lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
-			rate_mask = (u16)(rate_mask & sta->supp_rates);
+			rate_mask = (u16)(rate_mask & lq_data->supp_rates);
 	}
 
 	/* if we did switched from HT to legacy check current rate */
@@ -619,7 +632,7 @@ static void rs_tx_status(void *priv_rate
 	u16 fc = le16_to_cpu(hdr->frame_control);
 	s32 tpt = 0;
 
-	IWL_DEBUG_RATE("get frame ack response, update rate scale window\n");
+	IWL_DEBUG_RATE_LIMIT("get frame ack response, update rate scale window\n");
 
 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
 		return;
@@ -1388,10 +1401,10 @@ static void rs_rate_scale_perform(struct
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_scale_index_msk = (u16) (rate_mask &
-				(sta->supp_rates << IWL_FIRST_OFDM_RATE));
+				(lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
 			rate_scale_index_msk = (u16) (rate_mask &
-						      sta->supp_rates);
+						      lq_data->supp_rates);
 
 	} else
 		rate_scale_index_msk = rate_mask;
@@ -1431,7 +1444,7 @@ static void rs_rate_scale_perform(struct
 		rs_stay_in_table(lq_data);
 		if (update_lq) {
 			rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		goto out;
@@ -1555,7 +1568,7 @@ static void rs_rate_scale_perform(struct
  lq_update:
 	if (update_lq) {
 		rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 		rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 	}
 	rs_stay_in_table(lq_data);
@@ -1581,7 +1594,7 @@ static void rs_rate_scale_perform(struct
 			IWL_DEBUG_HT("Switch current  mcs: %X index: %d\n",
 				     tbl->current_rate.rate_n_flags, index);
 			rs_fill_link_cmd(lq_data, &tbl->current_rate,
-					 &(lq_data->lq), sta);
+					 &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		tbl1 = &(lq_data->lq_info[lq_data->active_tbl]);
@@ -1672,12 +1685,12 @@ static void rs_initialize_lq(struct iwl_
 	tbl->antenna_type = ANT_AUX;
 	rs_get_tbl_info_from_mcs(&mcs_rate, priv->phymode, tbl, &rate_idx);
 	if (!rs_is_ant_connected(priv->valid_antenna, tbl->antenna_type))
-	    rs_toggle_antenna(&mcs_rate, tbl),
+	    rs_toggle_antenna(&mcs_rate, tbl);
 
 	rs_mcs_from_tbl(&mcs_rate, tbl, rate_idx, use_green);
 	tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
 	rs_get_expected_tpt_table(lq, tbl);
-	rs_fill_link_cmd(lq, &mcs_rate, &(lq->lq), sta);
+	rs_fill_link_cmd(lq, &mcs_rate, &lq->lq);
 	rs_send_lq_cmd(priv, &lq->lq, CMD_ASYNC);
  out:
 	return;
@@ -1714,7 +1727,7 @@ static struct ieee80211_rate *rs_get_rat
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *lq;
 
-	IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
+	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
 	memset(extra, 0, sizeof(*extra));
 
@@ -1775,10 +1788,9 @@ static void *rs_alloc_sta(void *priv, gf
 
 	if (crl == NULL)
 		return NULL;
-
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
 	crl->lq.sta_id = 0xff;
 
+
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
 			rs_rate_scale_clear_window(&(crl->lq_info[j].win[i]));
@@ -1795,10 +1807,8 @@ static void rs_rate_init(void *priv_rate
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *crl = priv_sta;
 
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
-
-	crl->lq.sta_id = 0xff;
 	crl->flush_timer = 0;
+	crl->supp_rates = sta->supp_rates;
 	sta->txrate = 3;
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
@@ -1864,6 +1874,9 @@ static void rs_rate_init(void *priv_rate
 	IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate,
 		     crl->active_mimo_rate);
 #endif /*CONFIG_IWLWIFI_HT*/
+#ifdef CONFIG_MAC80211_DEBUGFS
+	crl->drv = priv;
+#endif
 
 	if (priv->assoc_station_added)
 		priv->lq_mngr.lq_ready = 1;
@@ -1871,28 +1884,28 @@ static void rs_rate_init(void *priv_rate
 	rs_initialize_lq(priv, sta);
 }
 
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			    struct iwl_rate *tx_mcs,
-			    struct iwl_link_quality_cmd *lq_cmd,
-			    struct sta_info *sta)
+			    struct iwl_link_quality_cmd *lq_cmd)
 {
 	int index = 0;
-	int rc = 0;
 	int rate_idx;
+	int repeat_rate = 0;
 	u8 ant_toggle_count = 0;
 	u8 use_ht_possible = 1;
-	u8 repeat_cur_rate = 0;
 	struct iwl_rate new_rate;
 	struct iwl_scale_tbl_info tbl_type = { 0 };
 
+	rs_dbgfs_set_mcs(lq_data, tx_mcs, index);
+
 	rs_get_tbl_info_from_mcs(tx_mcs, lq_data->phymode,
 				  &tbl_type, &rate_idx);
 
 	if (is_legacy(tbl_type.lq_type)) {
 		ant_toggle_count = 1;
-		repeat_cur_rate = IWL_NUMBER_TRY;
+		repeat_rate = IWL_NUMBER_TRY;
 	} else
-		repeat_cur_rate = IWL_HT_NUMBER_TRY;
+		repeat_rate = IWL_HT_NUMBER_TRY;
 
 	lq_cmd->general_params.mimo_delimiter =
 			is_mimo(tbl_type.lq_type) ? 1 : 0;
@@ -1906,10 +1919,10 @@ static int rs_fill_link_cmd(struct iwl_r
 		lq_cmd->general_params.single_stream_ant_msk = 2;
 
 	index++;
-	repeat_cur_rate--;
+	repeat_rate--;
 
 	while (index < LINK_QUAL_MAX_RETRY_NUM) {
-		while (repeat_cur_rate && (index < LINK_QUAL_MAX_RETRY_NUM)) {
+		while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
 			if (is_legacy(tbl_type.lq_type)) {
 				if (ant_toggle_count <
 				    NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1919,9 +1932,11 @@ static int rs_fill_link_cmd(struct iwl_r
 					ant_toggle_count = 1;
 				}
 			}
+
+			rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 			lq_cmd->rs_table[index].rate_n_flags =
 					cpu_to_le32(new_rate.rate_n_flags);
-			repeat_cur_rate--;
+			repeat_rate--;
 			index++;
 		}
 
@@ -1932,7 +1947,7 @@ static int rs_fill_link_cmd(struct iwl_r
 			lq_cmd->general_params.mimo_delimiter = index;
 
 		rs_get_lower_rate(lq_data, &tbl_type, rate_idx,
-				  use_ht_possible, &new_rate, sta);
+				  use_ht_possible, &new_rate);
 
 		if (is_legacy(tbl_type.lq_type)) {
 			if (ant_toggle_count < NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1941,26 +1956,23 @@ static int rs_fill_link_cmd(struct iwl_r
 				rs_toggle_antenna(&new_rate, &tbl_type);
 				ant_toggle_count = 1;
 			}
-			repeat_cur_rate = IWL_NUMBER_TRY;
+			repeat_rate = IWL_NUMBER_TRY;
 		} else
-			repeat_cur_rate = IWL_HT_NUMBER_TRY;
+			repeat_rate = IWL_HT_NUMBER_TRY;
 
 		use_ht_possible = 0;
 
+		rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 		lq_cmd->rs_table[index].rate_n_flags =
 				cpu_to_le32(new_rate.rate_n_flags);
-		/* lq_cmd->rs_table[index].rate_n_flags = 0x800d; */
 
 		index++;
-		repeat_cur_rate--;
+		repeat_rate--;
 	}
 
-	/* lq_cmd->rs_table[0].rate_n_flags = 0x800d; */
-
 	lq_cmd->general_params.dual_stream_ant_msk = 3;
 	lq_cmd->agg_params.agg_dis_start_th = 3;
 	lq_cmd->agg_params.agg_time_limit = cpu_to_le16(4000);
-	return rc;
 }
 
 static void *rs_alloc(struct ieee80211_local *local)
@@ -2000,6 +2012,162 @@ static void rs_free_sta(void *priv, void
 }
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{
+	const u32 cck_rate = 0x820A;
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		if (index < 12)
+			mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
+		else
+			mcs->rate_n_flags = cck_rate;
+		IWL_DEBUG_RATE("Fixed rate ON\n");
+		return;
+	}
+
+	IWL_DEBUG_RATE("Fixed rate OFF\n");
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
+			const char __user *user_buf, size_t count, loff_t *ppos)
+{
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	char buf[64];
+	int buf_size;
+	u32 parsed_rate;
+
+	memset(buf, 0, sizeof(buf));
+	buf_size = min(count, sizeof(buf) -  1);
+	if (copy_from_user(buf, user_buf, buf_size))
+		return -EFAULT;
+
+	if (sscanf(buf, "%x", &parsed_rate) == 1)
+		rs_priv->dbg_fixed.rate_n_flags = parsed_rate;
+	else
+		rs_priv->dbg_fixed.rate_n_flags = 0;
+
+	rs_priv->active_rate = 0x0FFF;
+	rs_priv->active_siso_rate = 0x1FD0;
+	rs_priv->active_mimo_rate = 0x1FD0;
+
+	IWL_DEBUG_RATE("sta_id %d rate 0x%X\n",
+		rs_priv->lq.sta_id, rs_priv->dbg_fixed.rate_n_flags);
+
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		rs_fill_link_cmd(rs_priv, &rs_priv->dbg_fixed, &rs_priv->lq);
+		rs_send_lq_cmd(rs_priv->drv, &rs_priv->lq, CMD_ASYNC);
+	}
+
+	return count;
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i = 0;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+
+	desc += sprintf(buff+desc, "sta_id %d\n", rs_priv->lq.sta_id);
+	desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
+			rs_priv->total_failed, rs_priv->total_success,
+			rs_priv->active_rate);
+	desc += sprintf(buff+desc, "fixed rate 0x%X\n",
+			rs_priv->dbg_fixed.rate_n_flags);
+	desc += sprintf(buff+desc, "general:"
+		"flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
+		rs_priv->lq.general_params.flags,
+		rs_priv->lq.general_params.mimo_delimiter,
+		rs_priv->lq.general_params.single_stream_ant_msk,
+		rs_priv->lq.general_params.dual_stream_ant_msk);
+
+	desc += sprintf(buff+desc, "agg:"
+			"time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
+			le16_to_cpu(rs_priv->lq.agg_params.agg_time_limit),
+			rs_priv->lq.agg_params.agg_dis_start_th,
+			rs_priv->lq.agg_params.agg_frame_cnt_limit);
+
+	desc += sprintf(buff+desc,
+			"Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
+			rs_priv->lq.general_params.start_rate_index[0],
+			rs_priv->lq.general_params.start_rate_index[1],
+			rs_priv->lq.general_params.start_rate_index[2],
+			rs_priv->lq.general_params.start_rate_index[3]);
+
+
+	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+		desc += sprintf(buff+desc, " rate[%d] 0x%X\n",
+			i, le32_to_cpu(rs_priv->lq.rs_table[i].rate_n_flags));
+
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
+	.write = rs_sta_dbgfs_scale_table_write,
+	.read = rs_sta_dbgfs_scale_table_read,
+	.open = open_file_generic,
+};
+static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i, j;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	for (i = 0; i < LQ_SIZE; i++) {
+		desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n"
+				"rate=0x%X\n",
+				rs_priv->active_tbl == i?"*":"x",
+				rs_priv->lq_info[i].lq_type,
+				rs_priv->lq_info[i].is_SGI,
+				rs_priv->lq_info[i].is_fat,
+				rs_priv->lq_info[i].is_dup,
+				rs_priv->lq_info[i].current_rate.rate_n_flags);
+		for (j = 0; j < IWL_RATE_COUNT; j++) {
+			desc += sprintf(buff+desc,
+					"counter=%d success=%d %%=%d\n",
+					rs_priv->lq_info[i].win[j].counter,
+					rs_priv->lq_info[i].win[j].success_counter,
+					rs_priv->lq_info[i].win[j].success_ratio);
+		}
+	}
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+	.read = rs_sta_dbgfs_stats_table_read,
+	.open = open_file_generic,
+};
+
+static void rs_add_debugfs(void *priv, void *priv_sta,
+					struct dentry *dir)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	rs_priv->rs_sta_dbgfs_scale_table_file =
+		debugfs_create_file("rate_scale_table", 0600, dir,
+				rs_priv, &rs_sta_dbgfs_scale_table_ops);
+	rs_priv->rs_sta_dbgfs_stats_table_file =
+		debugfs_create_file("rate_stats_table", 0600, dir,
+			rs_priv, &rs_sta_dbgfs_stats_table_ops);
+}
+
+static void rs_remove_debugfs(void *priv, void *priv_sta)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	debugfs_remove(rs_priv->rs_sta_dbgfs_scale_table_file);
+	debugfs_remove(rs_priv->rs_sta_dbgfs_stats_table_file);
+}
+#endif
+
 static struct rate_control_ops rs_ops = {
 	.module = NULL,
 	.name = RS_NAME,
@@ -2011,6 +2179,10 @@ static struct rate_control_ops rs_ops = 
 	.free = rs_free,
 	.alloc_sta = rs_alloc_sta,
 	.free_sta = rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+	.add_sta_debugfs = rs_add_debugfs,
+	.remove_sta_debugfs = rs_remove_debugfs,
+#endif
 };
 
 int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2007-09-27 20:06:43.000000000 -0400
@@ -102,7 +102,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -203,7 +203,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
 
 /**************************************************************/
 
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,6 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
+#endif
 
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
@@ -851,16 +853,12 @@ int iwl_send_statistics_request(struct i
 static int iwl_rxon_add_station(struct iwl_priv *priv,
 				const u8 *addr, int is_ap)
 {
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
+	u8 sta_id;
 
+	sta_id = iwl_add_station(priv, addr, is_ap, 0);
 	iwl4965_add_station(priv, addr, is_ap);
 
-	return rc;
+	return sta_id;
 }
 
 /**
@@ -1147,16 +1145,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1176,6 +1164,8 @@ static int iwl_commit_rxon(struct iwl_pr
 		return rc;
 	}
 
+	iwl_clear_stations_table(priv);
+
 #ifdef CONFIG_IWLWIFI_SENSITIVITY
 	if (!priv->error_recovering)
 		priv->start_calib = 0;
@@ -4608,6 +4598,7 @@ static void iwl_rx_handle(struct iwl_pri
 		reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
 			(pkt->hdr.cmd != REPLY_RX_PHY_CMD) &&
 			(pkt->hdr.cmd != REPLY_4965_RX) &&
+			(pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
 			(pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
 			(pkt->hdr.cmd != REPLY_TX);
 
@@ -4893,12 +4884,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -7483,9 +7474,8 @@ static void iwl_config_ap(struct iwl_pri
 		iwl_activate_qos(priv, 1);
 #endif
 		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c	2007-09-27 20:06:43.000000000 -0400
@@ -183,7 +183,7 @@ u8 iwl_hw_find_station(struct iwl_priv *
 			goto out;
 		}
 
-	IWL_DEBUG_ASSOC("can not find STA " MAC_FMT " total %d\n",
+	IWL_DEBUG_ASSOC_LIMIT("can not find STA " MAC_FMT " total %d\n",
 			MAC_ARG(addr), priv->num_stations);
 
  out:
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h	2007-09-27 20:06:43.000000000 -0400
@@ -136,8 +136,11 @@ static inline void IWL_DEBUG_LIMIT(int l
 #define IWL_DEBUG_TXPOWER(f, a...) IWL_DEBUG(IWL_DL_TXPOWER, f, ## a)
 #define IWL_DEBUG_IO(f, a...) IWL_DEBUG(IWL_DL_IO, f, ## a)
 #define IWL_DEBUG_RATE(f, a...) IWL_DEBUG(IWL_DL_RATE, f, ## a)
+#define IWL_DEBUG_RATE_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_RATE, f, ## a)
 #define IWL_DEBUG_NOTIF(f, a...) IWL_DEBUG(IWL_DL_NOTIF, f, ## a)
 #define IWL_DEBUG_ASSOC(f, a...) IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
+#define IWL_DEBUG_ASSOC_LIMIT(f, a...) \
+	IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2007-09-27 20:06:43.000000000 -0400
@@ -103,7 +103,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -204,7 +204,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
  */
 
 /**************************************************************/
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,7 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
-
+#endif
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
 	unsigned long flags;
@@ -462,6 +463,7 @@ u8 iwl_add_station(struct iwl_priv *priv
 	int index = IWL_INVALID_STATION;
 	struct iwl_station_entry *station;
 	unsigned long flags_spin;
+	u8 rate;
 
 	spin_lock_irqsave(&priv->sta_lock, flags_spin);
 	if (is_ap)
@@ -505,6 +507,15 @@ u8 iwl_add_station(struct iwl_priv *priv
 	station->sta.sta.sta_id = index;
 	station->sta.station_flags = 0;
 
+	rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :
+				IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;
+
+	/* Turn on both antennas for the station... */
+	station->sta.rate_n_flags =
+			iwl_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
+	station->current_rate.rate_n_flags =
+			le16_to_cpu(station->sta.rate_n_flags);
+
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	iwl_send_add_station(priv, &station->sta, flags);
 	return index;
@@ -834,25 +845,6 @@ int iwl_send_statistics_request(struct i
 }
 
 /**
- * iwl_rxon_add_station - add station into station table.
- *
- * there is only one AP station with id= IWL_AP_ID
- * NOTE: mutex must be held before calling the this fnction
-*/
-static int iwl_rxon_add_station(struct iwl_priv *priv,
-				const u8 *addr, int is_ap)
-{
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
-
-	return rc;
-}
-
-/**
  * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
  * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
  * @channel: Any channel valid for the requested phymode
@@ -1121,16 +1113,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1152,6 +1134,8 @@ static int iwl_commit_rxon(struct iwl_pr
 
 	memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
 
+	iwl_clear_stations_table(priv);
+
 	/* If we issue a new RXON command which required a tune then we must
 	 * send a new TXPOWER command or we won't be able to Tx any frames */
 	rc = iwl_hw_reg_send_txpower(priv);
@@ -1161,7 +1145,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	}
 
 	/* Add the broadcast address so we can send broadcast frames */
-	if (iwl_rxon_add_station(priv, BROADCAST_ADDR, 0) ==
+	if (iwl_add_station(priv, BROADCAST_ADDR, 0, 0) ==
 	    IWL_INVALID_STATION) {
 		IWL_ERROR("Error adding BROADCAST address for transmit.\n");
 		return -EIO;
@@ -1171,7 +1155,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	 * add the IWL_AP_ID to the station rate table */
 	if (iwl_is_associated(priv) &&
 	    (priv->iw_mode == IEEE80211_IF_TYPE_STA))
-		if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
+		if (iwl_add_station(priv, priv->active_rxon.bssid_addr, 1, 0)
 		    == IWL_INVALID_STATION) {
 			IWL_ERROR("Error adding AP address for transmit.\n");
 			return -EIO;
@@ -4583,12 +4567,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -4650,7 +4634,7 @@ static void iwl_error_recovery(struct iw
 	priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	iwl_commit_rxon(priv);
 
-	iwl_rxon_add_station(priv, priv->bssid, 1);
+	iwl_add_station(priv, priv->bssid, 1, 0);
 
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
@@ -6793,8 +6777,8 @@ static void iwl_bg_post_associate(struct
 		/* clear out the station table */
 		iwl_clear_stations_table(priv);
 
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_rxon_add_station(priv, priv->bssid, 0);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+		iwl_add_station(priv, priv->bssid, 0, 0);
 		iwl3945_sync_sta(priv, IWL_STA_ID,
 				 (priv->phymode == MODE_IEEE80211A)?
 				 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
@@ -7082,10 +7066,9 @@ static void iwl_config_ap(struct iwl_pri
 		/* restore RXON assoc */
 		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
 		iwl_commit_rxon(priv);
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
@@ -7168,8 +7151,8 @@ static int iwl_mac_config_interface(stru
 						RXON_FILTER_ASSOC_MSK;
 			rc = iwl_commit_rxon(priv);
 			if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
-				iwl_rxon_add_station(
-					priv, priv->active_rxon.bssid_addr, 1);
+				iwl_add_station(priv,
+					priv->active_rxon.bssid_addr, 1, 0);
 		}
 
 	} else {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3350
retrieving revision 1.3351
diff -u -r1.3350 -r1.3351
--- kernel-2.6.spec	27 Sep 2007 22:51:22 -0000	1.3350
+++ kernel-2.6.spec	28 Sep 2007 00:14:44 -0000	1.3351
@@ -615,6 +615,7 @@
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
+Patch684: linux-2.6-iwlwifi-fixes.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1356,6 +1357,8 @@
 ApplyPatch linux-2.6-wireless.patch
 # pre-2.6.24 wireless patches from upstream
 ApplyPatch linux-2.6-wireless-pending.patch
+# late-breaking iwlwifi fixes (will be rolled into wireless-pending patch)
+ApplyPatch linux-2.6-iwlwifi-fixes.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -2370,6 +2373,9 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- A few iwlwifi and ath5k fixes
+
 * Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - Revert to old RTC driver.
 - Zero fill environment for uevent handlers.

linux-2.6-ath5k.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-ath5k.patch
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ath5k.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ath5k.patch	27 Sep 2007 15:33:19 -0000	1.1
+++ linux-2.6-ath5k.patch	28 Sep 2007 00:14:44 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:23:09.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:13.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 19:58:06.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 19:59:22.000000000 -0400
 @@ -652,6 +652,14 @@ M:	ecashin at coraid.com
  W:	http://www.coraid.com/support/linux
  S:	Supported
@@ -16,14050 +16,13915 @@
  ATL1 ETHERNET DRIVER
  P:	Jay Cliburn
  M:	jcliburn at gmail.com
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 19:58:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 19:59:22.000000000 -0400
+@@ -61,3 +61,5 @@ obj-$(CONFIG_RT2X00)		+= rt2x00/
+ obj-$(CONFIG_P54_COMMON)	+= p54common.o
+ obj-$(CONFIG_P54_USB)		+= p54usb.o
+ obj-$(CONFIG_P54_PCI)		+= p54pci.o
++
++obj-$(CONFIG_ATH5K)	+= ath5k/
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 19:58:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 19:59:22.000000000 -0400
+@@ -598,6 +598,19 @@ config P54_PCI
+ 	tristate "Prism54 PCI support"
+ 	depends on P54_COMMON && PCI
+ 
++config ATH5K
++	tristate "Atheros 5xxx wireless cards support"
++	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
++	default m
++	---help---
++	  This module adds support for atheros 5xxx (e.g. 5212) wireless
++	  cards. If you have this card in your PC, select this to be build.
++
++	  This driver uses the kernel's mac80211 subsystem.
++
++	  If you choose to build a module, it'll be called ath5k. Say M if
++	  unsure.
++
+ source "drivers/net/wireless/hostap/Kconfig"
+ source "drivers/net/wireless/bcm43xx/Kconfig"
+ source "drivers/net/wireless/b43/Kconfig"
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c
 --- /dev/null	2007-09-27 08:31:24.563724082 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-27 11:24:13.000000000 -0400
-@@ -0,0 +1,1104 @@
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c	2007-09-27 19:59:22.000000000 -0400
+@@ -0,0 +1,1704 @@
 +/*
-+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
-+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
++ * PHY functions
 + *
-+ * Permission to use, copy, modify, and 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.
++ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ *  This file is free software: you can copy, redistribute 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 file 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/>.
++ *
++ * This file incorporates work covered by the following copyright and
++ * permission notice:
++ *
++ *     Copyright (c) 2007 Jiri Slaby <jirislaby at gmail.com>
++ *     Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk at openbsd.org>
++ *
++ *     Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL
++ *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
++ *     AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
 + */
 +
-+#ifndef _ATH5K_H
-+#define _ATH5K_H
++#include <linux/delay.h>
 +
-+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
-+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
-+ * long and results timeouts). It's also illegal to tune to some of the
-+ * supported frequencies in some countries, so use this at your own risk,
-+ * you've been warned. */
-+#define CHAN_DEBUG	0
++#include "ath5k.h"
++#include "reg.h"
 +
-+/* Uncomment this for debuging (warning that it results in TOO much output) */
-+/*#define AR5K_DEBUG	1 */
++/* Struct to hold initial RF register values (RF Banks) */
++struct ath5k_ini_rf {
++	u8	rf_bank;	/* check out ath5k_reg.h */
++	u16	rf_register;	/* register address */
++	u32	rf_value[5];	/* register value for different modes (above) */
++};
 +
-+#include <linux/types.h>
-+#include <net/mac80211.h>
++/*
++ * Mode-specific RF Gain table (64bytes) for RF5111/5112
++ * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial
++ * RF Gain values are included in AR5K_AR5210_INI)
++ */
++struct ath5k_ini_rfgain {
++	u16	rfg_register;	/* RF Gain register address */
++	u32	rfg_value[2];	/* [freq (see below)] */
++};
 +
-+#include "ath5k_hw.h"
-+#include "ath5k_regdom.h"
++struct ath5k_gain_opt {
++	u32			go_default;
++	u32			go_steps_count;
++	const struct ath5k_gain_opt_step	go_step[AR5K_GAIN_STEP_COUNT];
++};
 +
-+/* PCI IDs */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
-+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
++/* RF5111 mode-specific init registers */
++static const struct ath5k_ini_rf rfregs_5111[] = {
++	{ 0, 0x989c,
++	/*    mode a/XR   mode aTurbo mode b      mode g      mode gTurbo */
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
[...25708 lines suppressed...]
 +
-+/*
-+ * PHY current RSSI register [5111+]
-+ */
-+#define	AR5K_PHY_CURRENT_RSSI		0x9c1c
++	ret = pci_register_driver(&ath_pci_drv_id);
++	if (ret) {
++		printk(KERN_ERR "ath_pci: can't register pci driver\n");
++		return ret;
++	}
++	ath_sysctl_header = register_sysctl_table(ath_root_table);
 +
-+/*
-+ * PHY PCDAC TX power table
-+ */
-+#define	AR5K_PHY_PCDAC_TXPOWER_BASE	0xa180
-+#define	AR5K_PHY_PCDAC_TXPOWER(_n)	(AR5K_PHY_PCDAC_TXPOWER_BASE + ((_n) << 2))
++	return 0;
++}
 +
-+/*
-+ * PHY mode register [5111+]
-+ */
-+#define	AR5K_PHY_MODE			0x0a200		/* Register address */
-+#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation mask*/
-+#define AR5K_PHY_MODE_MOD_OFDM		0
-+#define AR5K_PHY_MODE_MOD_CCK		1
-+#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode mask */
-+#define	AR5K_PHY_MODE_FREQ_5GHZ		0
-+#define	AR5K_PHY_MODE_FREQ_2GHZ		2
-+#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Dynamic OFDM/CCK mode mask [5112+] */
-+#define AR5K_PHY_MODE_RAD		0x00000008	/* [5212+] */
-+#define AR5K_PHY_MODE_RAD_RF5111	0
-+#define AR5K_PHY_MODE_RAD_RF5112	8
-+#define AR5K_PHY_MODE_XR		0x00000010	/* [5112+] */
++static void __exit exit_ath_pci(void)
++{
++	if (ath_sysctl_header)
++		unregister_sysctl_table(ath_sysctl_header);
++	pci_unregister_driver(&ath_pci_drv_id);
++}
 +
-+/*
-+ * PHY CCK transmit control register [5111+ (?)]
-+ */
-+#define AR5K_PHY_CCKTXCTL		0xa204
-+#define AR5K_PHY_CCKTXCTL_WORLD		0x00000000
-+#define AR5K_PHY_CCKTXCTL_JAPAN		0x00000010
++module_init(init_ath_pci);
++module_exit(exit_ath_pci);
 +
-+/*
-+ * PHY 2GHz gain register [5111+]
-+ */
-+#define	AR5K_PHY_GAIN_2GHZ		0xa20c
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX	0x00fc0000
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S	18
-+#define	AR5K_PHY_GAIN_2GHZ_INI_5111	0x6480416c
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h
++MODULE_AUTHOR("Jiri Slaby");
++MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards.");
++MODULE_SUPPORTED_DEVICE("Atheros WLAN cards");
++MODULE_LICENSE("Dual BSD/GPL");
++MODULE_VERSION(ATH_PCI_VERSION " (EXPERIMENTAL)");
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h
 --- /dev/null	2007-09-27 08:31:24.563724082 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h	2007-09-27 11:24:13.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h	2007-09-27 19:59:22.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*-
 + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -14265,3 +14130,128 @@
 +	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
 +
 +#endif
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c	2007-09-27 19:59:22.000000000 -0400
+@@ -0,0 +1,121 @@
++/*
++ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
++ *
++ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Basic regulation domain extensions for the IEEE 802.11 stack
++ */
++
++#include <linux/kernel.h>
++#include <linux/string.h>
++
++#include "regdom.h"
++
++static const struct ath5k_regdommap {
++	enum ath5k_regdom dmn;
++	enum ath5k_regdom dmn5;
++	enum ath5k_regdom dmn2;
++} r_map[] = {
++	{ DMN_DEFAULT,		DMN_DEBUG,	DMN_DEBUG },
++	{ DMN_NULL_WORLD,	DMN_NULL,	DMN_WORLD },
++	{ DMN_NULL_ETSIB,	DMN_NULL,	DMN_ETSIB },
++	{ DMN_NULL_ETSIC,	DMN_NULL,	DMN_ETSIC },
++	{ DMN_FCC1_FCCA,	DMN_FCC1,	DMN_FCCA },
++	{ DMN_FCC1_WORLD,	DMN_FCC1,	DMN_WORLD },
++	{ DMN_FCC2_FCCA,	DMN_FCC2,	DMN_FCCA },
++	{ DMN_FCC2_WORLD,	DMN_FCC2,	DMN_WORLD },
++	{ DMN_FCC2_ETSIC,	DMN_FCC2,	DMN_ETSIC },
++	{ DMN_FRANCE_NULL,	DMN_ETSI3,	DMN_ETSI3 },
++	{ DMN_FCC3_FCCA,	DMN_FCC3,	DMN_WORLD },
++	{ DMN_ETSI1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_ETSI3_ETSIA,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI2_WORLD,	DMN_ETSI2,	DMN_WORLD },
++	{ DMN_ETSI3_WORLD,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI4_WORLD,	DMN_ETSI4,	DMN_WORLD },
++	{ DMN_ETSI4_ETSIC,	DMN_ETSI4,	DMN_ETSIC },
++	{ DMN_ETSI5_WORLD,	DMN_ETSI5,	DMN_WORLD },
++	{ DMN_ETSI6_WORLD,	DMN_ETSI6,	DMN_WORLD },
++	{ DMN_ETSI_NULL,	DMN_ETSI1,	DMN_ETSI1 },
++	{ DMN_MKK1_MKKA,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKB,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL4_WORLD,	DMN_APL4,	DMN_WORLD },
++	{ DMN_MKK2_MKKA,	DMN_MKK2,	DMN_MKKA },
++	{ DMN_APL_NULL,		DMN_APL1,	DMN_NULL },
++	{ DMN_APL2_WORLD,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL2_APLC,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL3_WORLD,	DMN_APL3,	DMN_WORLD },
++	{ DMN_MKK1_FCCA,	DMN_MKK1,	DMN_FCCA },
++	{ DMN_APL2_APLD,	DMN_APL2,	DMN_APLD },
++	{ DMN_MKK1_MKKA1,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKA2,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL1_WORLD,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_FCCA,	DMN_APL1,	DMN_FCCA },
++	{ DMN_APL1_APLA,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_ETSIC,	DMN_APL1,	DMN_ETSIC },
++	{ DMN_APL2_ETSIC,	DMN_APL2,	DMN_ETSIC },
++	{ DMN_APL5_WORLD,	DMN_APL5,	DMN_WORLD },
++	{ DMN_WOR0_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR1_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR2_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR3_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR4_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR5_ETSIC,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR01_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR02_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_EU1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_WOR9_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WORA_WORLD,	DMN_WORLD,	DMN_WORLD },
++};
++
++enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom dmn, u16 mhz)
++{
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(r_map); i++) {
++		if (r_map[i].dmn == dmn) {
++			if (mhz >= 2000 && mhz <= 3000)
++				return r_map[i].dmn2;
++			if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
++					mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
++				return r_map[i].dmn5;
++		}
++	}
++
++	return DMN_DEBUG;
++}
++
++u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee)
++{
++	u32 regdomain = (u32)ieee;
++
++	/*
++	 * Use the default regulation domain if the value is empty
++	 * or not supported by the net80211 regulation code.
++	 */
++	if (ath5k_regdom2flag(regdomain, IEEE80211_CHANNELS_5GHZ_MIN) ==
++			DMN_DEBUG)
++		return (u16)AR5K_TUNE_REGDOMAIN;
++
++	/* It is supported, just return the value */
++	return regdomain;
++}
++
++enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain)
++{
++	enum ath5k_regdom ieee = (enum ath5k_regdom)regdomain;
++
++	return ieee;
++}
++



From fedora-extras-commits at redhat.com  Fri Sep 28 00:15:47 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 20:15:47 -0400
Subject: rpms/bzrtools/FC-6 .cvsignore, 1.10, 1.11 bzrtools.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709280015.l8S0Fl9T007490@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7273

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.  This has numerous bugfixes over the previous version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Apr 2007 02:45:41 -0000	1.10
+++ .cvsignore	28 Sep 2007 00:15:10 -0000	1.11
@@ -1 +1 @@
-bzrtools-0.15.4.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/bzrtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzrtools.spec	3 Apr 2007 02:49:50 -0000	1.16
+++ bzrtools.spec	28 Sep 2007 00:15:12 -0000	1.17
@@ -1,22 +1,25 @@
 %{!?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 bzrver 0.15
-%define bzrnextver 0.16
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
-Version:        %{bzrver}.4
-Release:        2%{?dist}
+Version:        %{bzrver}.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
 Source0:        http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 # Bzrtools is meant to work with a version of bzr that is the same major
 # version.  In addition to being incompatible with older bzr versions, it is 
 # also untested with bzrversion++ and may not work (depending on what has
@@ -46,9 +49,14 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins
+fi
+
 # remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
+sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,13 +65,32 @@
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
-%dir %{python_sitelib}/bzrlib/plugins/bzrtools
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
-%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
+%dir %{python_sitearch}/bzrlib/plugins/bzrtools
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyc
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move plugin manually since setuptools has no way of knowing that bzr is
+  arch specific.
+- Disable debuginfo packages.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Fix License tag to conform to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
+* Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
+- Update to 0.18.0.
+
+* Thu Jun 28 2007 Warren Togami <wtogami at redhat.com> 0.17.1-1
+- Update to 0.17.1.
+
 * Mon Apr 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.15.4-2
 - Bump for tagging problem.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Apr 2007 02:45:41 -0000	1.10
+++ sources	28 Sep 2007 00:15:12 -0000	1.11
@@ -1 +1 @@
-83f2b309e5320a7269dbb64947265a81  bzrtools-0.15.4.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 00:32:20 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 20:32:20 -0400
Subject: comps comps-f8.xml.in,1.128,1.129
Message-ID: <200709280032.l8S0WKCY008113@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953

Modified Files:
	comps-f8.xml.in 
Log Message:
[japanese-support] - replace anthy by uim-anthy and anthy-el
- add uim-canna and uim-skk



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- comps-f8.xml.in	26 Sep 2007 17:24:25 -0000	1.128
+++ comps-f8.xml.in	28 Sep 2007 00:31:50 -0000	1.129
@@ -2171,7 +2171,7 @@
       <packagereq type="conditional" requires="stardict">stardict-dic-ja</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
-      <packagereq type="optional">anthy</packagereq>
+      <packagereq type="optional">anthy-el</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
       <packagereq type="optional">ddskk</packagereq>
       <packagereq type="optional">ddskk-xemacs</packagereq>
@@ -2188,6 +2188,9 @@
       <packagereq type="optional">nkf</packagereq>
       <packagereq type="optional">perl-NKF</packagereq>
       <packagereq type="optional">scim-skk</packagereq>
+      <packagereq type="optional">uim-anthy</packagereq>
+      <packagereq type="optional">uim-canna</packagereq>
+      <packagereq type="optional">uim-skk</packagereq>
       <packagereq type="optional">VLGothic-fonts</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:08:23 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 21:08:23 -0400
Subject: rpms/uim/devel uim.spec,1.46,1.47
Message-ID: <200709280108.l8S18NFQ014916@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14869

Modified Files:
	uim.spec 
Log Message:
* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
- Add Requires: uim-gtk2 in uim-gnome.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- uim.spec	20 Sep 2007 02:47:27 -0000	1.46
+++ uim.spec	28 Sep 2007 01:07:50 -0000	1.47
@@ -55,6 +55,7 @@
 Requires:	uim = %{version}-%{release}
 Requires(post):	%{_sbindir}/bonobo-activation-sysconf
 Requires(postun): %{_sbindir}/bonobo-activation-sysconf
+Requires:	uim-gtk2
 
 %package	qt
 Summary:	Qt support for Uim
@@ -197,9 +198,9 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm
@@ -384,6 +385,9 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+- Add Requires: uim-gtk2 in uim-gnome.
+
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
 - Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
 - Correct License tag. (Todd Zullinger)



From fedora-extras-commits at redhat.com  Fri Sep 28 01:09:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 21:09:19 -0400
Subject: comps comps-f8.xml.in,1.129,1.130
Message-ID: <200709280109.l8S19J2E014995@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14845

Modified Files:
	comps-f8.xml.in 
Log Message:
[base-x] remove Canna
[base-x] add uim-gtk2 and uim-m17n
[gnome] add uim-gnome
[kde] add uim-qt 



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- comps-f8.xml.in	28 Sep 2007 00:31:50 -0000	1.129
+++ comps-f8.xml.in	28 Sep 2007 01:08:49 -0000	1.130
@@ -349,7 +349,6 @@
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
-      <packagereq type="optional">Canna</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
@@ -366,6 +365,8 @@
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
+      <packagereq type="optional">uim-gtk2</packagereq>
+      <packagereq type="optional">uim-m17n</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
@@ -1035,6 +1036,7 @@
       <packagereq type="optional">trac-webadmin</packagereq>
       <packagereq type="optional">translate-toolkit</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
+      <packagereq type="optional">uim-gnome</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
@@ -2438,6 +2440,7 @@
       <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
+      <packagereq type="optional">uim-qt</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:21:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 21:21:53 -0400
Subject: comps comps-f8.xml.in,1.130,1.131
Message-ID: <200709280121.l8S1LrKa015527@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501

Modified Files:
	comps-f8.xml.in 
Log Message:
[desktops] add window-managers (#274791)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- comps-f8.xml.in	28 Sep 2007 01:08:49 -0000	1.130
+++ comps-f8.xml.in	28 Sep 2007 01:21:23 -0000	1.131
@@ -4199,6 +4199,7 @@
     <grouplist>
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
+      <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>
     </grouplist>
   </category>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:54:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 21:54:44 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.16,1.17
Message-ID: <200709280154.l8S1sifD016429@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16411

Modified Files:
	kinput2.spec 
Log Message:
* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
- Add Requires: Canna to get it working just installing the package.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kinput2.spec	20 Sep 2007 03:32:40 -0000	1.16
+++ kinput2.spec	28 Sep 2007 01:54:11 -0000	1.17
@@ -67,6 +67,9 @@
 Requires(preun): %{_sbindir}/alternatives
 Requires(triggerpostun): %{_sbindir}/alternatives
 Requires: im-chooser >= 0.4.1-2.fc8
+%if %{is_canna_used}
+Requires: Canna
+%endif
 Obsoletes: kinput2-canna, kinput2-wnn4, kinput2-wnn6, kinput2-canna-wnn4, kinput2-canna-wnn6
 
 %description 
@@ -253,6 +256,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+- Add Requires: Canna to get it working just installing the package.
+
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
 - Add the versioned dependency for im-chooser.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:25 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:25 -0400
Subject: rpms/mlton/devel mlton.spec,1.20,1.21
Message-ID: <200709280208.l8S28Pk1022764@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22702

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mlton.spec	27 Sep 2007 23:35:08 -0000	1.20
+++ mlton.spec	28 Sep 2007 02:07:52 -0000	1.21
@@ -1,12 +1,8 @@
-%ifarch ppc
-%define mlton_bootstrap 1
-%else
 %define mlton_bootstrap 0
-%endif
 
 Name:		mlton
 Version:	20070826
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -14,7 +10,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-Source1:	mlton-20061107-1.ppc-linux.tgz
+#Source1:	mlton-20061107-1.ppc-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -102,6 +98,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
+- Disable bootstrap
+
 * Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
 - Re-bootstrap ppc
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:37 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:37 -0400
Subject: rpms/mlton/devel sources,1.7,1.8
Message-ID: <200709280208.l8S28btm022767@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22725

Modified Files:
	sources 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Sep 2007 23:35:08 -0000	1.7
+++ sources	28 Sep 2007 02:08:04 -0000	1.8
@@ -1,2 +1 @@
-7f78b83b51fa5d3a020181a460b36a89  mlton-20061107-1.ppc-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:50 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:50 -0400
Subject: rpms/mlton/devel .cvsignore,1.7,1.8
Message-ID: <200709280208.l8S28on0022771@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22746

Modified Files:
	.cvsignore 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Sep 2007 23:35:08 -0000	1.7
+++ .cvsignore	28 Sep 2007 02:08:16 -0000	1.8
@@ -1,2 +1 @@
-mlton-20061107-1.ppc-linux.tgz
 mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 02:10:10 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 22:10:10 -0400
Subject: rpms/kernel/F-7 linux-2.6-ath5k.patch,1.2,1.3
Message-ID: <200709280210.l8S2AANE022867@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22846

Modified Files:
	linux-2.6-ath5k.patch 
Log Message:
make sure ath5k patch can compile

linux-2.6-ath5k.patch:

Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ath5k.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-ath5k.patch	28 Sep 2007 00:14:44 -0000	1.2
+++ linux-2.6-ath5k.patch	28 Sep 2007 02:10:07 -0000	1.3
@@ -14255,3 +14255,24 @@
 +	return ieee;
 +}
 +
+diff -up linux-2.6.22.noarch/include/linux/pci_ids.h.orig linux-2.6.22.noarch/include/linux/pci_ids.h
+--- linux-2.6.22.noarch/include/linux/pci_ids.h.orig	2007-09-27 22:06:11.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/pci_ids.h	2007-09-27 22:08:08.000000000 -0400
+@@ -2056,6 +2056,8 @@
+ #define PCI_DEVICE_ID_BCM1250_PCI	0x0001
+ #define PCI_DEVICE_ID_BCM1250_HT	0x0002
+ 
++#define PCI_VENDOR_ID_ATHEROS		0x168c
++
+ #define PCI_VENDOR_ID_NETCELL		0x169c
+ #define PCI_DEVICE_ID_REVOLUTION	0x0044
+ 
+@@ -2407,6 +2409,8 @@
+ #define PCI_DEVICE_ID_NETMOS_9845	0x9845
+ #define PCI_DEVICE_ID_NETMOS_9855	0x9855
+ 
++#define PCI_VENDOR_ID_3COM_2		0xa727
++
+ #define PCI_SUBVENDOR_ID_EXSYS		0xd84d
+ #define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
+ #define PCI_SUBDEVICE_ID_EXSYS_4055	0x4055



From fedora-extras-commits at redhat.com  Fri Sep 28 02:30:11 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 22:30:11 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.3,1.4
Message-ID: <200709280230.l8S2UBQU023765@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23666

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
More BR fixes.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Net-SNPP.spec	27 Sep 2007 23:54:25 -0000	1.3
+++ perl-Net-SNPP.spec	28 Sep 2007 02:29:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNPP
 Version:        1.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +47,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-5
+- More BR fixes.
+
 * Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-4
 - Fix BR
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:33:30 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 22:33:30 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.17,1.18
Message-ID: <200709280233.l8S2XUia023865@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	kinput2.spec 
Log Message:
clean up


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kinput2.spec	28 Sep 2007 01:54:11 -0000	1.17
+++ kinput2.spec	28 Sep 2007 02:32:58 -0000	1.18
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -77,7 +77,7 @@
 
 %prep
 %setup -q
-cp ${RPM_SOURCE_DIR}/Kinput2.conf.* .
+cp -a ${RPM_SOURCE_DIR}/Kinput2.conf.* .
 %patch0 -p1
 %ifarch ppc
 %patch1 -p1
@@ -151,37 +151,37 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
 %if %{build_with_wnn4}
-install -c -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_wnn6}
-install -c -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna}
-install -c -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn4}
-install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn6}
-install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
+install -p -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
 
 %if %{is_wnn_used}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
 %endif
 
 make install.man DESTDIR=$RPM_BUILD_ROOT
 
 %if %{is_canna_used}
-install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
+install -D -m 0644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
 %endif
 %if %{is_wnn_used}
-install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
+install -D -m 0644 -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
 %endif
 
 %clean
@@ -256,8 +256,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
-* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-36
 - Add Requires: Canna to get it working just installing the package.
+- clean up a bit the spec file.
 
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
 - Add the versioned dependency for im-chooser.



From fedora-extras-commits at redhat.com  Fri Sep 28 02:34:14 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Thu, 27 Sep 2007 22:34:14 -0400
Subject: rpms/mesa/devel mesa-7.0.1-stable-branch.patch, 1.1, 1.2 mesa.spec, 
	1.140, 1.141 mesa-6.5.2-hush-synthetic-visual-warning.patch, 1.1,
	NONE mesa-7.0-i-already-defined-glapi-you-twit.patch, 1.1,
	NONE mesa-7.0.1-965-sampler-crash.patch, 1.1, NONE
Message-ID: <200709280234.l8S2YEbX023895@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23872

Modified Files:
	mesa-7.0.1-stable-branch.patch mesa.spec 
Removed Files:
	mesa-6.5.2-hush-synthetic-visual-warning.patch 
	mesa-7.0-i-already-defined-glapi-you-twit.patch 
	mesa-7.0.1-965-sampler-crash.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
- This contains the fixes made to the upstream Mesa stable branch
  including fixes for 965 vblank interrupt issues along with a fix
  in the kernel - remove patches that already upstream.
- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
- mesa-7.0.1-965-sampler-crash.patch - dropped


mesa-7.0.1-stable-branch.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 mesa-7.0.1-stable-branch.patch
Index: mesa-7.0.1-stable-branch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.0.1-stable-branch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.0.1-stable-branch.patch	15 Aug 2007 10:17:48 -0000	1.1
+++ mesa-7.0.1-stable-branch.patch	28 Sep 2007 02:34:11 -0000	1.2
@@ -1,4 +1,7 @@
-Brian (21):
+Adam Jackson (1):
+      Unbreak Linux builds with -fvisibility=hidden.
+
+Brian (64):
       added md5 sums
       fix even-sized point positioning (bug 11874)
       Merge branch 'mesa_7_0_branch' of git+ssh://brianp at git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
@@ -20,18 +23,101 @@
       added some temporary texobj ref counting debug output
       more tex obj ref count debugging (temporary)
       Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
+      copy Target in _mesa_copy_texture_object()
+      Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
+      more debug output (context destroy, fb destroy)
+      log deleting/binding of FBOs
+      Remove recent texobj refcount debug/logging code.
+      don't map buffer in _mesa_validate_DrawElements() unless needed
+      refactor bounds checking code
+      remove unneeded CallStack array
+      remove CallDepth++/-- accidentally removed in prev commit
+      new __gluInvertMatrix() function (Mesa bug 6748)
+      Fixed bugs 6748, 12141
+      s/movaps/movups/ (see bug 12216)
+      fix i965 bugs, x86-64 bugs
+      sync with trunk, fixing bug 12239
+      Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
+      updated VC7 project files
+      clean-up (see bug 12317)
+      fix comment
+      Update depth test state when binding new framebuffer object
+      In _mesa_make_current(), don't unbind FBOs from the old context.
+      fix indirect rendering crash
+      updated with pkg-config info
+      added DSTDIR, pkg-config items
+      added .pc.in files to tarballs
+      Fix state.texgen parsing error (bug 12313).
+      added program_error2() function for better error reporting
+      fix ARB fp/vp parsing bug 12313
+      fix copypixels overlap test bug (#12417)
+      fix glCopyPixel/glPixelZoom bug 12417)
+      updated link
+      From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
+      fix bug 10604
+      Added bluegene-xlc-osmesa config (Alexander Neundorf)
+      fixes for bluegene-xlc-osmesa config
+      added bluegene-xlc-osmesa, fortran fixes
+      fix for __IBMC__
+      fix -D_BSD_SOURC
+      fix DrawRangeElements error msg
+      Restore old _TriangleCaps code to fix Blender problem (bug 12164)
+      fix blend bug 12164
+      bump versions to 7.0.2
+      for Miniglx, use git sources
+      prep for 7.0.2 release
+
+Christoph Kubisch (1):
+      updated VC7 project files
+
+Colin McDonald (1):
+      fixed problem with big glDrawArrays (see bug 12141)
+
+Dan Nicholson (2):
+      DESTDIR support.
+      pkg-config support
 
 Dan Torop (1):
       fix spantmp2 READ_RGBA inline asm (#11931)
 
-Michel D??nzer (1):
+Dave Airlie (1):
+      i965: fix vblank on 965gm laptops by bringing in code from i915
+
+Michel D??nzer (2):
       i915tex: Make sure pitch is aligned properly for render-to-texture.
+      i915tex: Unreference texture buffers on context destruction.
+
+Roland B??r (1):
+      [i965] Bug #11812: Fix fwrite return value checks in AUB file code.
+
+Roland Scheidegger (2):
+      suppress warning about ncon visuals (bug #6689)
+      fix another occurence of movaps which might not be aligned
 
 Wang Zhenyu (1):
       i915tex: Add support for 945GME
 
+Xiang, Haihao (13):
+      i965: flush batch buffer when getting the maximum. This makes
+      i965: samplers group in fours in WM_STATE. fix bug#9415
+      i965: check NULL pointer. fix bug#12193
+      i965: store read drawable info in intel_context. Some OpenGL
+      i965: Take the upper limitation on LOD into account.
+      fix bug#11009
+      i965: limit on LOD Bias, fix#11987
+      i965: take the secondary color into account when drawing
+      i965: fix #11378
+      i965: fix bug#11925
+      i965: The cube map texture coordinates must be devided by the
+      i965: handle all unfilled mode in clip stage. fix bug #12453
+      mesa: make sure the gotten value isn't greater than the
+
+Zou Nan hai (2):
+      fix a bug in 965 ARB_occlusion_query,
+      fix fd.o bug #12217, recalcuate urb when clip plane size change
+
 diff --git a/Makefile b/Makefile
-index 3cab262..56efa83 100644
+index 3cab262..e05e0e6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,5 @@
@@ -42,7 +128,15 @@
  TOP = .
  
  SUBDIRS = src progs
-@@ -156,7 +154,7 @@ sunos5-v9 \
+@@ -70,6 +68,7 @@ aix-gcc \
+ aix-static \
+ beos \
+ bluegene-osmesa \
++bluegene-xlc-osmesa \
+ darwin \
+ darwin-static \
+ darwin-static-x86ppc \
+@@ -156,7 +155,7 @@ sunos5-v9 \
  sunos5-v9-static \
  sunos5-v9-cc-g++ \
  ultrix-gcc:
@@ -51,12 +145,207 @@
  		echo "Please run 'make realclean' before changing configs" ; \
  		exit 1 ; \
  	fi
+@@ -166,10 +165,10 @@ ultrix-gcc:
+ 
+ # Rules for making release tarballs
+ 
+-DIRECTORY = Mesa-7.0.1
+-LIB_NAME = MesaLib-7.0.1
+-DEMO_NAME = MesaDemos-7.0.1
+-GLUT_NAME = MesaGLUT-7.0.1
++DIRECTORY = Mesa-7.0.2-rc1
++LIB_NAME = MesaLib-7.0.2-rc1
++DEMO_NAME = MesaDemos-7.0.2-rc1
++GLUT_NAME = MesaGLUT-7.0.2-rc1
+ 
+ MAIN_FILES = \
+ 	$(DIRECTORY)/Makefile*						\
+@@ -213,6 +212,7 @@ MAIN_FILES = \
+ 	$(DIRECTORY)/src/mesa/Makefile*					\
+ 	$(DIRECTORY)/src/mesa/sources					\
+ 	$(DIRECTORY)/src/mesa/descrip.mms				\
++	$(DIRECTORY)/src/mesa/gl.pc.in					\
+ 	$(DIRECTORY)/src/mesa/depend					\
+ 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
+ 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
+@@ -320,6 +320,7 @@ DRI_FILES = \
+ SGI_GLU_FILES = \
+ 	$(DIRECTORY)/src/glu/Makefile					\
+ 	$(DIRECTORY)/src/glu/descrip.mms				\
++	$(DIRECTORY)/src/glu/glu.pc.in					\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile				\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
+@@ -396,6 +397,7 @@ GLUT_FILES = \
+ 	$(DIRECTORY)/include/GL/glutf90.h		\
+ 	$(DIRECTORY)/src/glut/glx/Makefile*		\
+ 	$(DIRECTORY)/src/glut/glx/depend		\
++	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
+ 	$(DIRECTORY)/src/glut/glx/*def			\
+ 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
+ 	$(DIRECTORY)/src/glut/glx/mms_depend		\
+@@ -418,6 +420,7 @@ DEPEND_FILES = \
+ 	$(TOP)/src/mesa/depend		\
+ 	$(TOP)/src/glx/x11/depend	\
+ 	$(TOP)/src/glw/depend		\
++	$(TOP)/src/glw/glw.pc.in	\
+ 	$(TOP)/src/glut/glx/depend	\
+ 	$(TOP)/src/glu/sgi/depend
+ 
+diff --git a/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
+new file mode 100644
+index 0000000..b0c762d
+--- /dev/null
++++ b/configs/bluegene-xlc-osmesa
+@@ -0,0 +1,29 @@
++# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
++# This doesn't really have a lot of dependencies, so it should be usable
++# on similar systems too.
++# It uses static linking and disables multithreading.
++
[...3033 lines suppressed...]
+ #include "enums.h"
+-#include "program.h"
+-#include "prog_instruction.h"
+-#include "prog_parameter.h"
+-#include "prog_print.h"
+-#include "prog_statevars.h"
++#include "shader/program.h"
++#include "shader/prog_instruction.h"
++#include "shader/prog_parameter.h"
++#include "shader/prog_print.h"
++#include "shader/prog_statevars.h"
+ #include "t_context.h" /* NOTE: very light dependency on this */
+ #include "t_vp_build.h"
+ 
+@@ -457,9 +457,13 @@ static void register_matrix_param5( struct tnl_program *p,
+ }
+ 
+ 
++/**
++ * Convert a ureg source register to a prog_src_register.
++ */
+ static void emit_arg( struct prog_src_register *src,
+ 		      struct ureg reg )
+ {
++   assert(reg.file != PROGRAM_OUTPUT);
+    src->File = reg.file;
+    src->Index = reg.idx;
+    src->Swizzle = reg.swz;
+@@ -469,9 +473,18 @@ static void emit_arg( struct prog_src_register *src,
+    src->RelAddr = 0;
+ }
+ 
++/**
++ * Convert a ureg dest register to a prog_dst_register.
++ */
+ static void emit_dst( struct prog_dst_register *dst,
+ 		      struct ureg reg, GLuint mask )
+ {
++   /* Check for legal output register type.  UNDEFINED will occur in
++    * instruction that don't produce a result (like END).
++    */
++   assert(reg.file == PROGRAM_TEMPORARY ||
++          reg.file == PROGRAM_OUTPUT ||
++          reg.file == PROGRAM_UNDEFINED);
+    dst->File = reg.file;
+    dst->Index = reg.idx;
+    /* allow zero as a shorthand for xyzw */
+@@ -956,13 +969,19 @@ static void build_lighting( struct tnl_program *p )
+ 					       STATE_POSITION); 
+ 	    struct ureg V = get_eye_position(p);
+ 	    struct ureg dist = get_temp(p);
++	    struct ureg tmpPpli = get_temp(p);
+ 
+ 	    VPpli = get_temp(p); 
+ 	    half = get_temp(p);
+  
+-	    /* Calulate VPpli vector
++            /* In homogeneous object coordinates
++             */
++            emit_op1(p, OPCODE_RCP, dist, 0, swizzle1(Ppli, W));
++            emit_op2(p, OPCODE_MUL, tmpPpli, 0, Ppli, dist);
++
++	    /* Calculate VPpli vector
+ 	     */
+-	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V); 
++	    emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V); 
+ 
+ 	    /* Normalize VPpli.  The dist value also used in
+ 	     * attenuation below.
+@@ -994,6 +1013,7 @@ static void build_lighting( struct tnl_program *p )
+ 	    emit_normalize_vec3(p, half, half);
+ 
+ 	    release_temp(p, dist);
++	    release_temp(p, tmpPpli);
+ 	 }
+ 
+ 	 /* Calculate dot products:
+@@ -1103,7 +1123,9 @@ static void build_fog( struct tnl_program *p )
+ {
+    struct ureg fog = register_output(p, VERT_RESULT_FOGC);
+    struct ureg input;
+-   
++   GLuint useabs = p->state->fog_source_is_depth && p->state->fog_mode &&
++		   (p->state->fog_mode != FOG_EXP2);
++
+    if (p->state->fog_source_is_depth) {
+       input = swizzle1(get_eye_position(p), Z);
+    }
+@@ -1111,31 +1133,36 @@ static void build_fog( struct tnl_program *p )
+       input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
+    }
+ 
+-   if (p->state->tnl_do_vertex_fog) {
++   if (p->state->fog_mode && p->state->tnl_do_vertex_fog) {
+       struct ureg params = register_param2(p, STATE_INTERNAL,
+ 					   STATE_FOG_PARAMS_OPTIMIZED);
+       struct ureg tmp = get_temp(p);
+ 
++      if (useabs) {
++	 emit_op1(p, OPCODE_ABS, tmp, 0, input);
++      }
++
+       switch (p->state->fog_mode) {
+       case FOG_LINEAR: {
+ 	 struct ureg id = get_identity_param(p);
+-	 emit_op3(p, OPCODE_MAD, tmp, 0, input, swizzle1(params,X), swizzle1(params,Y));
++	 emit_op3(p, OPCODE_MAD, tmp, 0, useabs ? tmp : input,
++			swizzle1(params,X), swizzle1(params,Y));
+ 	 emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
+ 	 emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
+ 	 break;
+       }
+       case FOG_EXP:
+-	 emit_op1(p, OPCODE_ABS, tmp, 0, input); 
+-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, swizzle1(params,Z));
++	 emit_op2(p, OPCODE_MUL, tmp, 0, useabs ? tmp : input,
++			swizzle1(params,Z));
+ 	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ 	 break;
+       case FOG_EXP2:
+ 	 emit_op2(p, OPCODE_MUL, tmp, 0, input, swizzle1(params,W));
+-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp); 
++	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
+ 	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ 	 break;
+       }
+-      
++
+       release_temp(p, tmp);
+    }
+    else {
+@@ -1143,7 +1170,7 @@ static void build_fog( struct tnl_program *p )
+        *
+        * KW:  Is it really necessary to do anything in this case?
+        */
+-      emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input);
++      emit_op1(p, useabs ? OPCODE_ABS : OPCODE_MOV, fog, WRITEMASK_X, input);
+    }
+ }
+  
+diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
+index 8940551..697d00e 100644
+--- a/src/mesa/vbo/vbo_save_draw.c
++++ b/src/mesa/vbo/vbo_save_draw.c
+@@ -132,9 +132,11 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
+    }
+ 
+    for (attr = 0; attr < VBO_ATTRIB_MAX; attr++) {
+-      if (node->attrsz[attr]) {
++      GLuint src = map[attr];
++
++      if (node->attrsz[src]) {
+ 	 arrays[attr].Ptr = (const GLubyte *)data;
+-	 arrays[attr].Size = node->attrsz[attr];
++	 arrays[attr].Size = node->attrsz[src];
+ 	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
+ 	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
+ 	 arrays[attr].Type = GL_FLOAT;
 diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
 index e142dde..b71a935 100644
 --- a/src/mesa/vbo/vbo_split_copy.c
@@ -1445,3 +4015,38 @@
        dst->BufferObj = ctx->Array.NullBufferObj;
        dst->_MaxElement = copy->dstbuf_size; /* may be less! */
  
+diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S
+index 65328f6..f512b3a 100644
+--- a/src/mesa/x86-64/xform4.S
++++ b/src/mesa/x86-64/xform4.S
+@@ -1,10 +1,8 @@
+-/* $Id$ */
+-
+ /*
+  * Mesa 3-D graphics library
+- * Version:  3.5
++ * Version:  7.0.1
+  *
+- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
++ * Copyright (C) 1999-2007  Brian Paul   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"),
+@@ -64,7 +62,7 @@ _mesa_x86_64_transform_points4_general:
+ 
+ p4_general_loop:
+ 
+-	movaps (%rdx), %xmm8		/* ox | oy | oz | ow */
++	movups (%rdx), %xmm8		/* ox | oy | oz | ow */
+ 	prefetchw 16(%rdi)
+ 
+ 	pshufd $0x00, %xmm8, %xmm0	/* ox | ox | ox | ox */
+@@ -149,7 +147,7 @@ _mesa_x86_64_transform_points4_3d:
+ 
+ p4_3d_loop:
+ 
+-	movaps (%rdx), %xmm8		/* ox | oy | oz | ow */
++	movups (%rdx), %xmm8		/* ox | oy | oz | ow */
+ 	prefetchw 16(%rdi)
+ 
+ 	pshufd $0x00, %xmm8, %xmm0	/* ox | ox | ox | ox */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mesa.spec	6 Sep 2007 18:45:11 -0000	1.140
+++ mesa.spec	28 Sep 2007 02:34:11 -0000	1.141
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -46,13 +46,10 @@
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
 Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
 Patch18: mesa-7.0-selinux-awareness.patch
-Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
 Patch23: mesa-6.5.2-bindcontext-paranoia.patch
-Patch24: mesa-7.0-i-already-defined-glapi-you-twit.patch
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.0.1-stable-branch.patch
 Patch27: mesa-7.0-use_master-r300.patch
-Patch28: mesa-7.0.1-965-sampler-crash.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -178,13 +175,10 @@
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 %patch5 -p1 -b .xserver-1.1-compat
 %patch18 -p1 -b .selinux-awareness
-%patch22 -p1 -b .visual-warning
 %patch23 -p1 -b .bindcontext
-%patch24 -p1 -b .glapi
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .stable
 %patch27 -p1 -b .r300
-%patch28 -p1 -b .965-sampler
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -414,6 +408,15 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
+- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
+- This contains the fixes made to the upstream Mesa stable branch
+  including fixes for 965 vblank interrupt issues along with a fix
+  in the kernel - remove patches that already upstream.
+- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
+- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
+- mesa-7.0.1-965-sampler-crash.patch - dropped
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
 - mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
 


--- mesa-6.5.2-hush-synthetic-visual-warning.patch DELETED ---


--- mesa-7.0-i-already-defined-glapi-you-twit.patch DELETED ---


--- mesa-7.0.1-965-sampler-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 02:35:48 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 22:35:48 -0400
Subject: rpms/smolt/devel languages.patch,NONE,1.1 smolt.spec,1.29,1.30
Message-ID: <200709280235.l8S2Zmqj023984@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23929

Modified Files:
	smolt.spec 
Added Files:
	languages.patch 
Log Message:
Added languages for firstboot

languages.patch:

--- NEW FILE languages.patch ---
diff -uNr client/po/as.po ../smolt-0.9.8.4/client/po/as.po
--- client/po/as.po	2007-09-21 14:42:33.000000000 -0500
+++ ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-22 12:09-0400\n"
+"POT-Creation-Date: 2007-08-08 15:27-0400\n"
 "PO-Revision-Date: 2007-04-04 17:12+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
 "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
@@ -118,55 +118,47 @@
 msgid "To view your profile visit: %s"
 msgstr "?????????????????? ?????????????????? ???????????? ????????? ???'?????? ????????????: %s"
 
-#: smoltGui.py:74
+#: smoltGui.py:70
 msgid "_Quit"
 msgstr ""
 
-#: smoltGui.py:74
+#: smoltGui.py:70
 msgid "Quit the program without sending your hardware profile to the server"
 msgstr ""
 
-#: smoltGui.py:75
+#: smoltGui.py:71
 msgid "_Send"
 msgstr ""
 
-#: smoltGui.py:75
+#: smoltGui.py:71
 msgid "Send your hardware profile to the server."
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show _Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show the Smolt privacy policy."
 msgstr ""
 
-#: smoltGui.py:77
+#: smoltGui.py:73
 msgid "_About"
 msgstr ""
 
-#: smoltGui.py:78
+#: smoltGui.py:74
 msgid "_File"
 msgstr ""
 
-#: smoltGui.py:79
+#: smoltGui.py:75
 msgid "_Help"
 msgstr ""
 
-#: smoltGui.py:80
-msgid "_My Smolt Page"
-msgstr ""
-
-#: smoltGui.py:80
-msgid "Take me to my smolt profile page"
-msgstr ""
-
-#: smoltGui.py:145
+#: smoltGui.py:137
 msgid "An error occurred while sending the data to the server."
 msgstr ""
 
-#: smoltGui.py:152
+#: smoltGui.py:144
 #, python-format
 msgid ""
 "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
@@ -174,24 +166,24 @@
 "stored in %s"
 msgstr ""
 
-#: smoltGui.py:166
+#: smoltGui.py:157
 msgid "Smolt Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:209
+#: smoltGui.py:200
 msgid "translator-credits"
 msgstr ""
 
-#: smoltGui.py:210
+#: smoltGui.py:201
 #, fuzzy
 msgid "Fedora hardware profiler."
 msgstr "??????????????????????????? ???????????????????????? ?????????????????? ????????????"
 
-#: smoltGui.py:211
+#: smoltGui.py:202
 msgid "Copyright ?? 2007 Mike McGrath"
 msgstr ""
 
-#: smoltGui.py:213
+#: smoltGui.py:204
 msgid ""
 "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.\n"
 "\n"
@@ -218,100 +210,100 @@
 msgid "Run \"service haldaemon start\" as root"
 msgstr "????????? ?????????????????? \"service haldaemon start\" ???????????????"
 
-#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
 #, python-format
 msgid "Error contacting Server: %s"
 msgstr "???????????? ??????????????? ?????????????????? ?????????: %s"
 
-#: smolt.py:408
+#: smolt.py:409
 msgid "Wrong version, server incapable of handling your client"
 msgstr ""
 
-#: smolt.py:424
+#: smolt.py:425
 msgid "Communication with server failed"
 msgstr "??????????????? ???????????? ????????? ????????????????????? ???????????? ???'???"
 
-#: smolt.py:498
+#: smolt.py:499
 msgid "Devices"
 msgstr "??????????????????????????????"
 
-#: smolt.py:509
+#: smolt.py:510
 msgid "UUID"
 msgstr "UUID"
 
-#: smolt.py:510
+#: smolt.py:511
 msgid "OS"
 msgstr "OS"
 
-#: smolt.py:511
+#: smolt.py:512
 msgid "Default run level"
 msgstr "??????????????????????????? ????????????????????????"
 
-#: smolt.py:512
+#: smolt.py:513
 msgid "Language"
 msgstr "????????????"
 
-#: smolt.py:513
+#: smolt.py:514
 msgid "Platform"
 msgstr "????????????"
 
-#: smolt.py:514
+#: smolt.py:515
 msgid "BogoMIPS"
 msgstr "BogoMIPS"
 
-#: smolt.py:515
+#: smolt.py:516
 msgid "CPU Vendor"
 msgstr "CPU ??? ????????????????????????"
 
-#: smolt.py:516
+#: smolt.py:517
 msgid "CPU Model"
 msgstr "CPU ??? ????????????????????????"
 
-#: smolt.py:517
+#: smolt.py:518
 msgid "Number of CPUs"
 msgstr "CPU ??????????????? ??????????????????"
 
-#: smolt.py:518
+#: smolt.py:519
 msgid "CPU Speed"
 msgstr "CPU ??? ?????????"
 
-#: smolt.py:519
+#: smolt.py:520
 msgid "System Memory"
 msgstr "???????????????????????????????????????????????? ?????????????????????????????????"
 
-#: smolt.py:520
+#: smolt.py:521
 msgid "System Swap"
 msgstr "???????????????????????????????????????????????? ???????????????"
 
-#: smolt.py:521
+#: smolt.py:522
 msgid "Vendor"
 msgstr "????????????????????????"
 
[...9471 lines suppressed...]
 msgid "Send your hardware profile to the server."
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show _Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show the Smolt privacy policy."
 msgstr ""
 
-#: smoltGui.py:77
+#: smoltGui.py:73
 msgid "_About"
 msgstr ""
 
-#: smoltGui.py:78
+#: smoltGui.py:74
 msgid "_File"
 msgstr ""
 
-#: smoltGui.py:79
+#: smoltGui.py:75
 msgid "_Help"
 msgstr ""
 
-#: smoltGui.py:80
-msgid "_My Smolt Page"
-msgstr ""
-
-#: smoltGui.py:80
-msgid "Take me to my smolt profile page"
-msgstr ""
-
-#: smoltGui.py:145
+#: smoltGui.py:137
 msgid "An error occurred while sending the data to the server."
 msgstr ""
 
-#: smoltGui.py:152
+#: smoltGui.py:144
 #, python-format
 msgid ""
 "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
@@ -173,23 +165,23 @@
 "stored in %s"
 msgstr ""
 
-#: smoltGui.py:166
+#: smoltGui.py:157
 msgid "Smolt Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:209
+#: smoltGui.py:200
 msgid "translator-credits"
 msgstr ""
 
-#: smoltGui.py:210
+#: smoltGui.py:201
 msgid "Fedora hardware profiler."
 msgstr ""
 
-#: smoltGui.py:211
+#: smoltGui.py:202
 msgid "Copyright ?? 2007 Mike McGrath"
 msgstr ""
 
-#: smoltGui.py:213
+#: smoltGui.py:204
 msgid ""
 "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.\n"
 "\n"
@@ -215,100 +207,100 @@
 msgid "Run \"service haldaemon start\" as root"
 msgstr ""
 
-#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
 #, python-format
 msgid "Error contacting Server: %s"
 msgstr ""
 
-#: smolt.py:408
+#: smolt.py:409
 msgid "Wrong version, server incapable of handling your client"
 msgstr ""
 
-#: smolt.py:424
+#: smolt.py:425
 msgid "Communication with server failed"
 msgstr ""
 
-#: smolt.py:498
+#: smolt.py:499
 msgid "Devices"
 msgstr ""
 
-#: smolt.py:509
+#: smolt.py:510
 msgid "UUID"
 msgstr ""
 
-#: smolt.py:510
+#: smolt.py:511
 msgid "OS"
 msgstr ""
 
-#: smolt.py:511
+#: smolt.py:512
 msgid "Default run level"
 msgstr ""
 
-#: smolt.py:512
+#: smolt.py:513
 msgid "Language"
 msgstr ""
 
-#: smolt.py:513
+#: smolt.py:514
 msgid "Platform"
 msgstr ""
 
-#: smolt.py:514
+#: smolt.py:515
 msgid "BogoMIPS"
 msgstr ""
 
-#: smolt.py:515
+#: smolt.py:516
 msgid "CPU Vendor"
 msgstr ""
 
-#: smolt.py:516
+#: smolt.py:517
 msgid "CPU Model"
 msgstr ""
 
-#: smolt.py:517
+#: smolt.py:518
 msgid "Number of CPUs"
 msgstr ""
 
-#: smolt.py:518
+#: smolt.py:519
 msgid "CPU Speed"
 msgstr ""
 
-#: smolt.py:519
+#: smolt.py:520
 msgid "System Memory"
 msgstr ""
 
-#: smolt.py:520
+#: smolt.py:521
 msgid "System Swap"
 msgstr ""
 
-#: smolt.py:521
+#: smolt.py:522
 msgid "Vendor"
 msgstr ""
 
-#: smolt.py:522
+#: smolt.py:523
 msgid "System"
 msgstr ""
 
-#: smolt.py:523
+#: smolt.py:524
 msgid "Form factor"
 msgstr ""
 
-#: smolt.py:524
+#: smolt.py:525
 msgid "Kernel"
 msgstr ""
 
-#: smolt.py:525
+#: smolt.py:526
 msgid "SELinux Enabled"
 msgstr ""
 
-#: smolt.py:526
+#: smolt.py:527
 msgid "SELinux Enforce"
 msgstr ""
 
-#: smolt.py:959
+#: smolt.py:960
 msgid "Unable to save UUID, continuing...\n"
 msgstr ""
 
-#: smolt.py:961
+#: smolt.py:962
 msgid "Unable to determine UUID of system!\n"
 msgstr ""
 


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- smolt.spec	21 Sep 2007 20:14:47 -0000	1.29
+++ smolt.spec	28 Sep 2007 02:35:16 -0000	1.30
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -11,6 +11,7 @@
 
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
 Patch0: firstboot.patch
+Patch1: languages.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 cd client/
@@ -179,6 +181,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
+- Added translations
+
 * Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
 - Fixed firstboot issues
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:36:39 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Thu, 27 Sep 2007 22:36:39 -0400
Subject: rpms/kernel/devel
	linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch,
	NONE, 1.1 kernel.spec, 1.195, 1.196
Message-ID: <200709280236.l8S2advc024015@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
- Add i965 drm patch to fix vblank interrupts - should be upstream soon


linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch:

--- NEW FILE linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch ---
>From f1bc762616ca9c2922d39372e95cd37e0742bca0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Fri, 28 Sep 2007 11:46:28 +1000
Subject: [PATCH] i915: make vbl interrupts work properly on i965g/gm hw.

This code is ported from the DRM git tree and allows the vblank interrupts
to function on the i965 hw. It also requires a change in Mesa's 965 driver
to actually use them.

Signed-off-by: Dave Airlie <airlied at linux.ie>
---
 drivers/char/drm/i915_drv.h |    6 ++++++
 drivers/char/drm/i915_irq.c |   12 ++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index bc04dfa..e064292 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -220,6 +220,12 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define I915REG_INT_MASK_R 	0x020a8
 #define I915REG_INT_ENABLE_R	0x020a0
 
+#define I915REG_PIPEASTAT	0x70024
+#define I915REG_PIPEBSTAT	0x71024
+
+#define I915_VBLANK_INTERRUPT_ENABLE	(1UL<<17)
+#define I915_VBLANK_CLEAR		(1UL<<1)
+
 #define SRX_INDEX		0x3c4
 #define SRX_DATA		0x3c5
 #define SR01			1
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 8fccbd6..2c97fe0 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -214,6 +214,10 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 	struct drm_device *dev = (struct drm_device *) arg;
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 	u16 temp;
+	u32 pipea_stats, pipeb_stats;
+
+	pipea_stats = I915_READ(I915REG_PIPEASTAT);
+	pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
 
 	temp = I915_READ16(I915REG_INT_IDENTITY_R);
 
@@ -225,6 +229,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 		return IRQ_NONE;
 
 	I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
+	(void) I915_READ16(I915REG_INT_IDENTITY_R);
+	DRM_READMEMORYBARRIER();
 
 	dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 
@@ -252,6 +258,12 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
 		if (dev_priv->swaps_pending > 0)
 			drm_locked_tasklet(dev, i915_vblank_tasklet);
+		I915_WRITE(I915REG_PIPEASTAT,
+			pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|
+			I915_VBLANK_CLEAR);
+		I915_WRITE(I915REG_PIPEBSTAT,
+			pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
+			I915_VBLANK_CLEAR);
 	}
 
 	return IRQ_HANDLED;
-- 
1.5.3.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kernel.spec	27 Sep 2007 23:49:10 -0000	1.195
+++ kernel.spec	28 Sep 2007 02:36:06 -0000	1.196
@@ -676,9 +676,10 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-#nouveau
+#nouveau + drm fixes
 Patch1800: drm-mm-git.patch
 Patch1801: nouveau-drm.patch
+Patch1802: linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch
 
 %endif
 
@@ -1001,9 +1002,10 @@
 # setuid /proc/self/maps fix. (dependent on utrace)
 ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
-# Nouveau DRM
+# Nouveau DRM + drm fixes
 ApplyPatch drm-mm-git.patch
 ApplyPatch nouveau-drm.patch
+ApplyPatch linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1812,6 +1814,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
+- Add i965 drm patch to fix vblank interrupts - should be upstream soon
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - A few iwlwifi and ath5k fixes
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:42:57 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 22:42:57 -0400
Subject: rpms/smolt/devel languages.patch,1.1,1.2
Message-ID: <200709280242.l8S2gvjx024297@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24276

Modified Files:
	languages.patch 
Log Message:
Updated language patch

languages.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 languages.patch
Index: languages.patch
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/languages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- languages.patch	28 Sep 2007 02:35:16 -0000	1.1
+++ languages.patch	28 Sep 2007 02:42:54 -0000	1.2
@@ -1,5681 +1,5681 @@
-diff -uNr client/po/as.po ../smolt-0.9.8.4/client/po/as.po
---- client/po/as.po	2007-09-21 14:42:33.000000000 -0500
-+++ ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
+diff -uNr ../smolt-0.9.8.4/client/po/as.po client/po/as.po
+--- ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
++++ client/po/as.po	2007-09-21 14:42:33.000000000 -0500
 @@ -6,7 +6,7 @@
  msgstr ""
  "Project-Id-Version: as\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-08-22 12:09-0400\n"
-+"POT-Creation-Date: 2007-08-08 15:27-0400\n"
+-"POT-Creation-Date: 2007-08-08 15:27-0400\n"
++"POT-Creation-Date: 2007-08-22 12:09-0400\n"
  "PO-Revision-Date: 2007-04-04 17:12+0530\n"
  "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
  "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
-@@ -118,55 +118,47 @@
+@@ -118,47 +118,55 @@
  msgid "To view your profile visit: %s"
  msgstr "?????????????????? ?????????????????? ???????????? ????????? ???'?????? ????????????: %s"
  
--#: smoltGui.py:74
-+#: smoltGui.py:70
+-#: smoltGui.py:70
++#: smoltGui.py:74
  msgid "_Quit"
  msgstr ""
  
--#: smoltGui.py:74
-+#: smoltGui.py:70
+-#: smoltGui.py:70
++#: smoltGui.py:74
  msgid "Quit the program without sending your hardware profile to the server"
  msgstr ""
  
--#: smoltGui.py:75
-+#: smoltGui.py:71
+-#: smoltGui.py:71
++#: smoltGui.py:75
  msgid "_Send"
  msgstr ""
  
--#: smoltGui.py:75
-+#: smoltGui.py:71
+-#: smoltGui.py:71
++#: smoltGui.py:75
  msgid "Send your hardware profile to the server."
  msgstr ""
  
--#: smoltGui.py:76
-+#: smoltGui.py:72
+-#: smoltGui.py:72
++#: smoltGui.py:76
  msgid "Show _Privacy Policy"
  msgstr ""
  
--#: smoltGui.py:76
-+#: smoltGui.py:72
+-#: smoltGui.py:72
++#: smoltGui.py:76
  msgid "Show the Smolt privacy policy."
  msgstr ""
  
--#: smoltGui.py:77
-+#: smoltGui.py:73
+-#: smoltGui.py:73
++#: smoltGui.py:77
  msgid "_About"
  msgstr ""
  
--#: smoltGui.py:78
-+#: smoltGui.py:74
+-#: smoltGui.py:74
++#: smoltGui.py:78
  msgid "_File"
  msgstr ""
  
--#: smoltGui.py:79
-+#: smoltGui.py:75
+-#: smoltGui.py:75
++#: smoltGui.py:79
  msgid "_Help"
  msgstr ""
  
--#: smoltGui.py:80
--msgid "_My Smolt Page"
--msgstr ""
--
--#: smoltGui.py:80
--msgid "Take me to my smolt profile page"
--msgstr ""
--
--#: smoltGui.py:145
-+#: smoltGui.py:137
+-#: smoltGui.py:137
++#: smoltGui.py:80
++msgid "_My Smolt Page"
++msgstr ""
++
++#: smoltGui.py:80
++msgid "Take me to my smolt profile page"
++msgstr ""
++
++#: smoltGui.py:145
  msgid "An error occurred while sending the data to the server."
  msgstr ""
  
--#: smoltGui.py:152
-+#: smoltGui.py:144
+-#: smoltGui.py:144
++#: smoltGui.py:152
  #, python-format
  msgid ""
  "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
-@@ -174,24 +166,24 @@
+@@ -166,24 +174,24 @@
  "stored in %s"
  msgstr ""
  
--#: smoltGui.py:166
-+#: smoltGui.py:157
+-#: smoltGui.py:157
++#: smoltGui.py:166
  msgid "Smolt Privacy Policy"
  msgstr ""
  
--#: smoltGui.py:209
-+#: smoltGui.py:200
+-#: smoltGui.py:200
++#: smoltGui.py:209
  msgid "translator-credits"
  msgstr ""
  
--#: smoltGui.py:210
-+#: smoltGui.py:201
+-#: smoltGui.py:201
++#: smoltGui.py:210
  #, fuzzy
  msgid "Fedora hardware profiler."
  msgstr "??????????????????????????? ???????????????????????? ?????????????????? ????????????"
  
--#: smoltGui.py:211
-+#: smoltGui.py:202
+-#: smoltGui.py:202
++#: smoltGui.py:211
  msgid "Copyright ?? 2007 Mike McGrath"
  msgstr ""
  
--#: smoltGui.py:213
-+#: smoltGui.py:204
+-#: smoltGui.py:204
++#: smoltGui.py:213
  msgid ""
  "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.\n"
  "\n"
-@@ -218,100 +210,100 @@
+@@ -210,100 +218,100 @@
  msgid "Run \"service haldaemon start\" as root"
  msgstr "????????? ?????????????????? \"service haldaemon start\" ???????????????"
  
--#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
-+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
+-#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
++#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
  #, python-format
  msgid "Error contacting Server: %s"
  msgstr "???????????? ??????????????? ?????????????????? ?????????: %s"
  
--#: smolt.py:408
-+#: smolt.py:409
+-#: smolt.py:409
++#: smolt.py:408
  msgid "Wrong version, server incapable of handling your client"
  msgstr ""
  
--#: smolt.py:424
-+#: smolt.py:425
+-#: smolt.py:425
++#: smolt.py:424
  msgid "Communication with server failed"
  msgstr "??????????????? ???????????? ????????? ????????????????????? ???????????? ???'???"
  
--#: smolt.py:498
-+#: smolt.py:499
+-#: smolt.py:499
++#: smolt.py:498
  msgid "Devices"
  msgstr "??????????????????????????????"
  
--#: smolt.py:509
[...16811 lines suppressed...]
+-#: smoltGui.py:200
++#: smoltGui.py:209
  msgid "translator-credits"
  msgstr ""
  
--#: smoltGui.py:210
-+#: smoltGui.py:201
+-#: smoltGui.py:201
++#: smoltGui.py:210
  msgid "Fedora hardware profiler."
  msgstr ""
  
--#: smoltGui.py:211
-+#: smoltGui.py:202
+-#: smoltGui.py:202
++#: smoltGui.py:211
  msgid "Copyright ?? 2007 Mike McGrath"
  msgstr ""
  
--#: smoltGui.py:213
-+#: smoltGui.py:204
+-#: smoltGui.py:204
++#: smoltGui.py:213
  msgid ""
  "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.\n"
  "\n"
-@@ -215,100 +207,100 @@
+@@ -207,100 +215,100 @@
  msgid "Run \"service haldaemon start\" as root"
  msgstr ""
  
--#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
-+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
+-#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
++#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
  #, python-format
  msgid "Error contacting Server: %s"
  msgstr ""
  
--#: smolt.py:408
-+#: smolt.py:409
+-#: smolt.py:409
++#: smolt.py:408
  msgid "Wrong version, server incapable of handling your client"
  msgstr ""
  
--#: smolt.py:424
-+#: smolt.py:425
+-#: smolt.py:425
++#: smolt.py:424
  msgid "Communication with server failed"
  msgstr ""
  
--#: smolt.py:498
-+#: smolt.py:499
+-#: smolt.py:499
++#: smolt.py:498
  msgid "Devices"
  msgstr ""
  
--#: smolt.py:509
-+#: smolt.py:510
+-#: smolt.py:510
++#: smolt.py:509
  msgid "UUID"
  msgstr ""
  
--#: smolt.py:510
-+#: smolt.py:511
+-#: smolt.py:511
++#: smolt.py:510
  msgid "OS"
  msgstr ""
  
--#: smolt.py:511
-+#: smolt.py:512
+-#: smolt.py:512
++#: smolt.py:511
  msgid "Default run level"
  msgstr ""
  
--#: smolt.py:512
-+#: smolt.py:513
+-#: smolt.py:513
++#: smolt.py:512
  msgid "Language"
  msgstr ""
  
--#: smolt.py:513
-+#: smolt.py:514
+-#: smolt.py:514
++#: smolt.py:513
  msgid "Platform"
  msgstr ""
  
--#: smolt.py:514
-+#: smolt.py:515
+-#: smolt.py:515
++#: smolt.py:514
  msgid "BogoMIPS"
  msgstr ""
  
--#: smolt.py:515
-+#: smolt.py:516
+-#: smolt.py:516
++#: smolt.py:515
  msgid "CPU Vendor"
  msgstr ""
  
--#: smolt.py:516
-+#: smolt.py:517
+-#: smolt.py:517
++#: smolt.py:516
  msgid "CPU Model"
  msgstr ""
  
--#: smolt.py:517
-+#: smolt.py:518
+-#: smolt.py:518
++#: smolt.py:517
  msgid "Number of CPUs"
  msgstr ""
  
--#: smolt.py:518
-+#: smolt.py:519
+-#: smolt.py:519
++#: smolt.py:518
  msgid "CPU Speed"
  msgstr ""
  
--#: smolt.py:519
-+#: smolt.py:520
+-#: smolt.py:520
++#: smolt.py:519
  msgid "System Memory"
  msgstr ""
  
--#: smolt.py:520
-+#: smolt.py:521
+-#: smolt.py:521
++#: smolt.py:520
  msgid "System Swap"
  msgstr ""
  
--#: smolt.py:521
-+#: smolt.py:522
+-#: smolt.py:522
++#: smolt.py:521
  msgid "Vendor"
  msgstr ""
  
--#: smolt.py:522
-+#: smolt.py:523
+-#: smolt.py:523
++#: smolt.py:522
  msgid "System"
  msgstr ""
  
--#: smolt.py:523
-+#: smolt.py:524
+-#: smolt.py:524
++#: smolt.py:523
  msgid "Form factor"
  msgstr ""
  
--#: smolt.py:524
-+#: smolt.py:525
+-#: smolt.py:525
++#: smolt.py:524
  msgid "Kernel"
  msgstr ""
  
--#: smolt.py:525
-+#: smolt.py:526
+-#: smolt.py:526
++#: smolt.py:525
  msgid "SELinux Enabled"
  msgstr ""
  
--#: smolt.py:526
-+#: smolt.py:527
+-#: smolt.py:527
++#: smolt.py:526
  msgid "SELinux Enforce"
  msgstr ""
  
--#: smolt.py:959
-+#: smolt.py:960
+-#: smolt.py:960
++#: smolt.py:959
  msgid "Unable to save UUID, continuing...\n"
  msgstr ""
  
--#: smolt.py:961
-+#: smolt.py:962
+-#: smolt.py:962
++#: smolt.py:961
  msgid "Unable to determine UUID of system!\n"
  msgstr ""
  



From fedora-extras-commits at redhat.com  Fri Sep 28 02:55:50 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 22:55:50 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.171,1.172
Message-ID: <200709280255.l8S2toK4024573@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540

Modified Files:
	NetworkManager.spec 
Log Message:
Really fix installation of nm-tool now


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- NetworkManager.spec	25 Sep 2007 19:41:28 -0000	1.171
+++ NetworkManager.spec	28 Sep 2007 02:55:16 -0000	1.172
@@ -167,7 +167,6 @@
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Fri Sep 28 03:30:03 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 23:30:03 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.49, 1.50 NetworkManager.spec,
	1.172, 1.173 sources, 1.68,
	1.69 NetworkManager-0.6.5-deprecated.patch, 1.1, NONE
Message-ID: <200709280330.l8S3U31i031542@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31509

Modified Files:
	.cvsignore NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.6.5-deprecated.patch 
Log Message:
* Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
- New snapshot
	- VPN support (only vpnc plugin ported at this time)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	25 Sep 2007 19:41:28 -0000	1.49
+++ .cvsignore	28 Sep 2007 03:29:30 -0000	1.50
@@ -14,3 +14,5 @@
 NetworkManager-0.7.0.svn2884.tar.gz
 nm-applet-0.7.0.svn200.tar.gz
 NetworkManager-0.7.0.svn2886.tar.gz
+NetworkManager-0.7.0.svn2907.tar.gz
+nm-applet-0.7.0.svn202.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- NetworkManager.spec	28 Sep 2007 02:55:16 -0000	1.172
+++ NetworkManager.spec	28 Sep 2007 03:29:30 -0000	1.173
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2886
+%define snapshot svn2907
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn200.tar.gz
+Source1: nm-applet-%{version}.svn202.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-7
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -67,6 +68,7 @@
 Summary: GNOME applications for use with NetworkManager
 Group: Applications/Internet
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -258,6 +260,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
+- New snapshot
+	- VPN support (only vpnc plugin ported at this time)
+
 * Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
 - New snapshot
 	- Make wired device carrier state work in the applet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	25 Sep 2007 19:41:28 -0000	1.68
+++ sources	28 Sep 2007 03:29:30 -0000	1.69
@@ -1,2 +1,2 @@
-8edfd5854389ea6a6b4eb1f507b46c38  nm-applet-0.7.0.svn200.tar.gz
-fe78cab7288beef5e69dcf897a76d16b  NetworkManager-0.7.0.svn2886.tar.gz
+14197b29863a439baa51f1b9bc5403da  NetworkManager-0.7.0.svn2907.tar.gz
+89e397896518d51c02a6a1f700564a9c  nm-applet-0.7.0.svn202.tar.gz


--- NetworkManager-0.6.5-deprecated.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 03:53:31 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 23:53:31 -0400
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.10,
	1.11 NetworkManager-vpnc.spec, 1.24, 1.25 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
Message-ID: <200709280353.l8S3rVsq031912@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31883

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Removed Files:
	NetworkManager-vpnc-0.6.4-keepalive.patch 
	NetworkManager-vpnc-0.6.4-options.patch 
Log Message:
* 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




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Feb 2007 08:57:28 -0000	1.10
+++ .cvsignore	28 Sep 2007 03:52:58 -0000	1.11
@@ -3,3 +3,4 @@
 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


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NetworkManager-vpnc.spec	17 Aug 2007 06:29:36 -0000	1.24
+++ NetworkManager-vpnc.spec	28 Sep 2007 03:52:58 -0000	1.25
@@ -1,21 +1,20 @@
-%define nm_version          1:0.6.4
-%define dbus_version        0.60
-%define gtk2_version        2.6.0
+%define nm_version          1:0.7.0-0.3.svn2907
+%define dbus_version        1.0
+%define gtk2_version        2.10.0
 %define vpnc_version        0.3.3-3
 %define shared_mime_version 0.16-3
 
+%define svn_snapshot svn2910
+
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.6.4
-Release:   4%{?dist}
+Version:   0.7.0
+Release:   0.1.%{svn_snapshot}%{?dist}
 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
 Patch3:    NetworkManager-vpnc-0.6.4-servpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -46,9 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gppasswd
-%patch1 -p1 -b .keepalive
-%patch2 -p1 -b .options
 %patch3 -p1 -b .servpath
 
 
@@ -101,6 +97,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Feb 2007 08:57:28 -0000	1.11
+++ sources	28 Sep 2007 03:52:58 -0000	1.12
@@ -1 +1 @@
-ae2d37c75bfef1752f9a4fb944d0a7e5  NetworkManager-vpnc-0.6.4.tar.gz
+248b55f9601a6c34bdf9f422f5de2f0c  NetworkManager-vpnc-0.7.0.svn2910.tar.gz


--- NetworkManager-vpnc-0.6.4-keepalive.patch DELETED ---


--- NetworkManager-vpnc-0.6.4-options.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 04:28:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 28 Sep 2007 00:28:44 -0400
Subject: rpms/man-pages-ja/devel man-pages-ja-fix-uninitialized-value.patch, 
	NONE, 1.1 man-pages-ja-missing-pkglist.patch, NONE,
	1.1 man-pages-ja-timestamp.patch, NONE, 1.1 .cvsignore, 1.48,
	1.49 man-pages-ja.spec, 1.56, 1.57 rh-man-pages-ja.pl, 1.12,
	1.13 sources, 1.47, 1.48 man-pages-ja-222495-swapon.2.patch, 1.1, NONE
Message-ID: <200709280428.l8S4Sifh008408@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8375

Modified Files:
	.cvsignore man-pages-ja.spec rh-man-pages-ja.pl sources 
Added Files:
	man-pages-ja-fix-uninitialized-value.patch 
	man-pages-ja-missing-pkglist.patch 
	man-pages-ja-timestamp.patch 
Removed Files:
	man-pages-ja-222495-swapon.2.patch 
Log Message:
* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
- updates to 20070915.
  - remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
- clean up the spec file.
- fix some warnings in perl script.

man-pages-ja-fix-uninitialized-value.patch:

--- NEW FILE man-pages-ja-fix-uninitialized-value.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl	2007-09-27 16:34:19.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl	2007-09-27 16:36:44.000000000 +0900
@@ -119,6 +119,7 @@
     chomp;
     my @l = split /:/;
     $l[1] =~ s/ /_/e;
+    unless (exists $main::pw{$l[1]} && defined $main::pw{$l[1]}) {die "Missing `$l[1]' in pkg.list";}
     if ($main::pw{$l[1]} == -1) {next;}
     (my $sec, my $osec) =  split /=>/, $l[5];
     if ($sec eq "pod"){$sec = $podsec;}

man-pages-ja-missing-pkglist.patch:

--- NEW FILE man-pages-ja-missing-pkglist.patch ---
diff -ruN man-pages-ja-20070915.orig/script/pkgs.list man-pages-ja-20070915/script/pkgs.list
--- man-pages-ja-20070915.orig/script/pkgs.list	2006-06-13 01:25:37.000000000 +0900
+++ man-pages-ja-20070915/script/pkgs.list	2007-09-27 16:30:06.000000000 +0900
@@ -65,6 +65,7 @@
 flex		Y
 glibc-linuxthreads	Y
 fort77		Y
+hdparm		Y
 ipfwadm		Y
 ipchains	Y
 iptables	Y
@@ -77,6 +78,7 @@
 man-db		N
 microcode_ctl	Y
 mirrordir	Y
+module-init-tools	Y
 modutils	Y
 mpg123		Y
 ncftp		Y
@@ -89,6 +91,7 @@
 pciutils	Y
 pcmcia-cs	Y
 procinfo	Y
+procmail	Y
 procps		Y
 ppp		Y
 psmisc		Y
@@ -96,6 +99,7 @@
 reiserfsprogs	Y
 rdate		Y
 rp-pppoe	Y
+rpm		Y
 rssh		Y
 sendmail	Y
 setserial	Y
@@ -107,6 +111,7 @@
 ucd-snmp	Y
 util-linux	Y
 uudeview	Y
+vsftpd		Y
 xinetd		Y
 yp-tools	Y
 ypbind		N

man-pages-ja-timestamp.patch:

--- NEW FILE man-pages-ja-timestamp.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl	2007-09-27 16:49:10.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl	2007-09-27 16:50:09.000000000 +0900
@@ -212,7 +212,7 @@
     my $mandst = "$MANROOT/man$sec";
 
     print ISS "echo -n install $pkg: $name.$sec .. \n";
-    print ISS "install -m 644 $mansrc $mandst\n";
+    print ISS "install -m 644 -p $mansrc $mandst\n";
 
     print ISS "echo -n converting to UTF-8 .. \n";
     print ISS "iconv -f euc-jp -t utf-8 $mandst/$name.$sec > $mandst/$name.$sec.tmp && mv $mandst/$name.$sec.tmp $mandst/$name.$sec\n";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	17 Aug 2007 04:48:25 -0000	1.48
+++ .cvsignore	28 Sep 2007 04:28:12 -0000	1.49
@@ -35,3 +35,4 @@
 man-pages-ja-20070615.tar.gz
 man-pages-ja-20070715.tar.gz
 man-pages-ja-20070815.tar.gz
+man-pages-ja-20070915.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- man-pages-ja.spec	17 Aug 2007 03:56:24 -0000	1.56
+++ man-pages-ja.spec	28 Sep 2007 04:28:12 -0000	1.57
@@ -1,16 +1,15 @@
-%define	manver		20070815
 %define	use_utf8	1
 
 Name: man-pages-ja
-Version: %{manver}
-Release: 1
+Version: 20070915
+Release: 1%{?dist}
 # Actual license for each Japanese manpages is the same to the original English manpages' license.
 License: Freely redistributable without restriction
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 URL: http://www.linux.or.jp/JM/
 
-Source: http://www.linux.or.jp/JM/%{name}-%{manver}.tar.gz
+Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz
 Source1: rh-man-pages-ja.pl
 Patch: %{name}-20010515-rh.patch
 Patch1: %{name}-20011115-fixpipe.patch
@@ -19,7 +18,9 @@
 Patch8: man-pages-ja-20050215-ls.patch
 Patch9: man-pages-ja-20060815-204667-nfs.5.patch
 Patch11: man-pages-ja-20060815-178955-at.1.patch
-Patch12: man-pages-ja-222495-swapon.2.patch
+Patch12: man-pages-ja-missing-pkglist.patch
+Patch13: man-pages-ja-fix-uninitialized-value.patch
+Patch14: man-pages-ja-timestamp.patch
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
 Group: Documentation
@@ -27,7 +28,7 @@
 Japanese Manual pages, translated by JM-Project (Japanese Manual Project).
 
 %prep
-%setup -q -n %{name}-%{manver}
+%setup -q -n %{name}-%{version}
 %patch -p1 -b .jp
 %patch1 -p1 -b .pipe
 %if %{use_utf8}
@@ -37,15 +38,17 @@
 %patch8 -p1 -b .ls
 %patch9 -p1 -b .nfs
 %patch11 -p1 -b .at
-%patch12 -p1 -b .swapon
+%patch12 -p1 -b .pkglist
+%patch13 -p1 -b .uninitval
+%patch14 -p1 -b .timestamp
 
 %build
-perl %{SOURCE1} $RPM_BUILD_ROOT | make
+perl %{SOURCE1} '$DESTDIR' | make
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
-sh ./installman.sh
+DESTDIR=$RPM_BUILD_ROOT sh ./installman.sh
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{chage.1,gpasswd.1,sg.1,apropos.1,man.1,whatis.1,newgrp.1}*
 rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man5/{faillog.5,shadow.5,login.defs.5}*
@@ -91,7 +94,11 @@
 	package=`basename \`dirname $i\``;
 	name=`basename $i`;
 	if [ -s $i ]; then
+%if %{use_utf8}
+		iconv -f euc-jp -t utf-8 $i > $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%else
 		cp -a $i $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%endif
 	fi
 done
 )
@@ -100,12 +107,18 @@
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc README translation_lists
 %{_mandir}/ja/*
 
 
 %changelog
+* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
+- updates to 20070915.
+  - remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
+- clean up the spec file.
+- fix some warnings in perl script.
+
 * Fri Aug 17 2007 Akira TAGOH <tagoh at redhat.com> - 20070815-1
 - updates to 20070815.
 


Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rh-man-pages-ja.pl	17 Aug 2006 11:14:40 -0000	1.12
+++ rh-man-pages-ja.pl	28 Sep 2007 04:28:12 -0000	1.13
@@ -15,7 +15,7 @@
 ###
 # Maintainer should update these number according to the original Makefile
 ###
-for($i=0; $i<=104; $i++) {
+for($i=0; $i<=109; $i++) {
   print "\n";
 }
 print "C\n";


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	17 Aug 2007 04:48:25 -0000	1.47
+++ sources	28 Sep 2007 04:28:12 -0000	1.48
@@ -1 +1 @@
-b6c9d323622ac251f4143f7f7fdde4c9  man-pages-ja-20070815.tar.gz
+40af705db14a4ef92bacc0d3e78a4aff  man-pages-ja-20070915.tar.gz


--- man-pages-ja-222495-swapon.2.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 04:44:03 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 00:44:03 -0400
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.25,1.26
Message-ID: <200709280444.l8S4i3J2008777@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 1:0.7.0-0.2.svn2910
- BuildRequire NetworkManager-glib-devel



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NetworkManager-vpnc.spec	28 Sep 2007 03:52:58 -0000	1.25
+++ NetworkManager-vpnc.spec	28 Sep 2007 04:43:29 -0000	1.26
@@ -10,7 +10,7 @@
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.1.%{svn_snapshot}%{?dist}
+Release:   0.2.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -21,6 +21,7 @@
 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
@@ -97,6 +98,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Fri Sep 28 05:07:44 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Fri, 28 Sep 2007 01:07:44 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.7.194-disable-rc410-dri.patch, 
	NONE, 1.1 xorg-x11-drv-ati.spec, 1.61, 1.62
Message-ID: <200709280507.l8S57iME015392@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.7.194-disable-rc410-dri.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
  RC410 by default as it seems to need some more work.


radeon-6.7.194-disable-rc410-dri.patch:

--- NEW FILE radeon-6.7.194-disable-rc410-dri.patch ---
>From d808781d48adf01e80b5bb476bae2d2f599030f1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 28 Sep 2007 14:50:42 +1000
Subject: [PATCH] rc410: disable DRI by default due to it not working

---
 src/radeon_driver.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 89254d3..a8a3d39 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2026,15 +2026,17 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
     info->pKernelDRMVersion = NULL;
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
-	info->Chipset == PCI_CHIP_RN50_5969) {
+	info->Chipset == PCI_CHIP_RN50_5969 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50 forced on -- "
+		"Direct rendering for RN50/RC410 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
     	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"Direct rendering not officially supported on RN50\n");
+		"Direct rendering not officially supported on RN50/RC410\n");
 	    return FALSE;
 	}
     }
-- 
1.5.2.4



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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-drv-ati.spec	24 Sep 2007 04:34:48 -0000	1.61
+++ xorg-x11-drv-ati.spec	28 Sep 2007 05:07:00 -0000	1.62
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.194
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
+Patch3:     radeon-6.7.194-disable-rc410-dri.patch
 
 # Rage 128 patches (100-199)
 
@@ -41,6 +42,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch2 -p1 -b .renderaccel
+%patch3 -p1 -b .rc410dri
 
 %build
 %configure --disable-static
@@ -81,6 +83,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
+- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
+  RC410 by default as it seems to need some more work.
+
 * Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
 - xf86-video-ati 6.7.194
 



From fedora-extras-commits at redhat.com  Fri Sep 28 06:15:47 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:15:47 -0400
Subject: rpms/SteGUI/devel SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE, 
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280615.l8S6FlwU023272@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23200/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:15:14 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:15:14 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 06:17:44 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:17:44 -0400
Subject: rpms/SteGUI/FC-6 SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE,
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280617.l8S6HiiT023411@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:17:11 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:17:11 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 06:19:16 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:19:16 -0400
Subject: rpms/SteGUI/F-7 SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE,
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280619.l8S6JGoP023526@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23487/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:18:44 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:18:44 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 07:45:08 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 28 Sep 2007 03:45:08 -0400
Subject: rpms/amarok/F-7 amarok-1.4.7-utf8.patch, NONE, 1.1 amarok.spec, 1.81,
	1.82
Message-ID: <200709280745.l8S7j8Ne031937@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/F-7

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-utf8.patch 
Log Message:
* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
  of Unicode filenames to MTP devices


amarok-1.4.7-utf8.patch:

--- NEW FILE amarok-1.4.7-utf8.patch ---
--- amarok-1.4.7.old/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-08-07 13:48:28.000000000 -0400
+++ amarok-1.4.7/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-09-27 03:18:19.000000000 -0400
@@ -295,9 +295,9 @@
     debug() << "Parent id : " << parent_id << endl;
 
     m_critical_mutex.lock();
-    debug() << "Sending track... " << bundle.url().path().latin1() << endl;
+    debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
-        m_device, bundle.url().path().latin1(), trackmeta,
+        m_device, bundle.url().path().utf8(), trackmeta,
         progressCallback, this, parent_id
     );
     m_critical_mutex.unlock();


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- amarok.spec	2 Sep 2007 12:44:48 -0000	1.81
+++ amarok.spec	28 Sep 2007 07:44:31 -0000	1.82
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,7 +12,10 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+# KDE bug 147126: amarok freezes when trying to play mp3 files without mp3 support
 Patch0:     amarok-1.4.7-147126.patch
+# Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
+Patch1:     amarok-1.4.7-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -87,6 +90,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .147126
+%patch1 -p1 -b .utf8
 
 
 
@@ -243,6 +247,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
+- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
+  of Unicode filenames to MTP devices
+
 * Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
 - add patch for kde bug 147126 : amarok freezes when trying to play
   mp3 files without mp3 support



From fedora-extras-commits at redhat.com  Fri Sep 28 07:45:11 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 28 Sep 2007 03:45:11 -0400
Subject: rpms/amarok/devel amarok-1.4.7-utf8.patch, NONE, 1.1 amarok.spec,
	1.84, 1.85
Message-ID: <200709280745.l8S7jBAW031941@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-utf8.patch 
Log Message:
* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
  of Unicode filenames to MTP devices


amarok-1.4.7-utf8.patch:

--- NEW FILE amarok-1.4.7-utf8.patch ---
--- amarok-1.4.7.old/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-08-07 13:48:28.000000000 -0400
+++ amarok-1.4.7/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-09-27 03:18:19.000000000 -0400
@@ -295,9 +295,9 @@
     debug() << "Parent id : " << parent_id << endl;
 
     m_critical_mutex.lock();
-    debug() << "Sending track... " << bundle.url().path().latin1() << endl;
+    debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
-        m_device, bundle.url().path().latin1(), trackmeta,
+        m_device, bundle.url().path().utf8(), trackmeta,
         progressCallback, this, parent_id
     );
     m_critical_mutex.unlock();


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- amarok.spec	2 Sep 2007 12:44:51 -0000	1.84
+++ amarok.spec	28 Sep 2007 07:44:38 -0000	1.85
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,7 +12,10 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+# KDE bug 147126: amarok freezes when trying to play mp3 files without mp3 support
 Patch0:     amarok-1.4.7-147126.patch
+# Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
+Patch1:     amarok-1.4.7-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -87,6 +90,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .147126
+%patch1 -p1 -b .utf8
 
 
 
@@ -243,6 +247,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
+- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
+  of Unicode filenames to MTP devices
+
 * Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
 - add patch for kde bug 147126 : amarok freezes when trying to play
   mp3 files without mp3 support



From fedora-extras-commits at redhat.com  Fri Sep 28 08:27:54 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 04:27:54 -0400
Subject: rpms/lat/devel .cvsignore, 1.7, 1.8 lat.spec, 1.16, 1.17 sources,
	1.7, 1.8
Message-ID: <200709280827.l8S8RsvA007110@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7088

Modified Files:
	.cvsignore lat.spec sources 
Log Message:
Update to 1.2.3
Clarify license as GPL version 2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2007 09:04:17 -0000	1.7
+++ .cvsignore	28 Sep 2007 08:27:20 -0000	1.8
@@ -1 +1 @@
-lat-1.2.2.tar.gz
+lat-1.2.3.tar.gz


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/lat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lat.spec	9 Jun 2007 15:38:08 -0000	1.16
+++ lat.spec	28 Sep 2007 08:27:20 -0000	1.17
@@ -1,8 +1,8 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.2
-Release:            3%{?dist}
-License:            GPL
+Version:            1.2.3
+Release:            1%{?dist}
+License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
 Source0:            http://dev.mmgsecurity.com/downloads/lat/1.2/lat-%{version}.tar.gz
@@ -114,6 +114,10 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 1.2.3-1
+- Update to 1.2.3
+- Clarify license as GPL version 2
+
 * Sat Jun  9 2007 Paul Howarth <paul at city-fan.org> 1.2.2-3
 - ExcludeArch ppc64 due to missing mono support on that arch (#241911)
 - Require yelp (#243403)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2007 09:04:17 -0000	1.7
+++ sources	28 Sep 2007 08:27:20 -0000	1.8
@@ -1 +1 @@
-b33c91e664be723849745db5f85ecb76  lat-1.2.2.tar.gz
+0725508d180720d260a70c5b39d387ba  lat-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 08:49:33 2007
From: fedora-extras-commits at redhat.com (Jonathan Dieter (jdieter))
Date: Fri, 28 Sep 2007 04:49:33 -0400
Subject: rpms/yum-presto import.log,1.10,1.11
Message-ID: <200709280849.l8S8nXcm007631@cvs-int.fedora.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7585

Modified Files:
	import.log 
Log Message:
Fix a couple of typos that caused yum to hang if certain error paths were hit.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	14 Aug 2007 00:23:26 -0000	1.10
+++ import.log	28 Sep 2007 08:48:59 -0000	1.11
@@ -7,3 +7,4 @@
 yum-presto-0_3_10-1:F-7:yum-presto-0.3.10-1.src.rpm:1180594674
 yum-presto-0_4_0-1_fc7:HEAD:yum-presto-0.4.0-1.fc7.src.rpm:1184166008
 yum-presto-0_4_1-1_fc7:HEAD:yum-presto-0.4.1-1.fc7.src.rpm:1187050973
+yum-presto-0_4_2-1_fc7:HEAD:yum-presto-0.4.2-1.fc7.src.rpm:1190969008



From fedora-extras-commits at redhat.com  Fri Sep 28 08:49:36 2007
From: fedora-extras-commits at redhat.com (Jonathan Dieter (jdieter))
Date: Fri, 28 Sep 2007 04:49:36 -0400
Subject: rpms/yum-presto/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 yum-presto.spec, 1.4, 1.5
Message-ID: <200709280849.l8S8nakD007638@cvs-int.fedora.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7585/devel

Modified Files:
	.cvsignore sources yum-presto.spec 
Log Message:
Fix a couple of typos that caused yum to hang if certain error paths were hit.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2007 00:23:29 -0000	1.5
+++ .cvsignore	28 Sep 2007 08:49:03 -0000	1.6
@@ -1 +1 @@
-yum-presto-0.4.1.tar.bz2
+yum-presto-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2007 00:23:29 -0000	1.5
+++ sources	28 Sep 2007 08:49:03 -0000	1.6
@@ -1 +1 @@
-432f8f39a38a407691b59a0625f62cc7  yum-presto-0.4.1.tar.bz2
+49e9856a966754bac397b25bb4dc9461  yum-presto-0.4.2.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-presto.spec	14 Aug 2007 00:23:29 -0000	1.4
+++ yum-presto.spec	28 Sep 2007 08:49:03 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -41,7 +41,11 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
-* Sun Aug  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.1
+* Fri Sep 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.2-1
+- Fix a couple of typos that caused yum to hang if certain error paths were
+  hit.
+
+* Sun Aug  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.1-1
 - Applied small patch by Luke Macken to fix problems when not run directly
   from yum.
 - Fix for situation where repository may be removed and then added again



From fedora-extras-commits at redhat.com  Fri Sep 28 08:54:16 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 04:54:16 -0400
Subject: rpms/lat/F-7 .cvsignore,1.7,1.8 lat.spec,1.14,1.15 sources,1.7,1.8
Message-ID: <200709280854.l8S8sG6M007741@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7714

Modified Files:
	.cvsignore lat.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2007 09:04:17 -0000	1.7
+++ .cvsignore	28 Sep 2007 08:53:42 -0000	1.8
@@ -1 +1 @@
-lat-1.2.2.tar.gz
+lat-1.2.3.tar.gz


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/lat.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lat.spec	16 Mar 2007 14:58:14 -0000	1.14
+++ lat.spec	28 Sep 2007 08:53:42 -0000	1.15
@@ -1,8 +1,8 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.2
-Release:            2%{?dist}
-License:            GPL
+Version:            1.2.3
+Release:            1%{?dist}
+License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
 Source0:            http://dev.mmgsecurity.com/downloads/lat/1.2/lat-%{version}.tar.gz
@@ -16,11 +16,14 @@
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
 Requires:           scrollkeeper, gnome-sharp
 %endif
-Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
+Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
 
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
+# Mono not available on ppc64 (#241911)
+ExcludeArch:        ppc64
+
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
@@ -111,6 +114,14 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 1.2.3-1
+- Update to 1.2.3
+- Clarify license as GPL version 2
+
+* Sat Jun  9 2007 Paul Howarth <paul at city-fan.org> 1.2.2-3
+- ExcludeArch ppc64 due to missing mono support on that arch (#241911)
+- Require yelp (#243403)
+
 * Fri Mar 16 2007 Paul Howarth <paul at city-fan.org> 1.2.2-2
 - Upstream now installs correctly into %%{_libdir} rather than %%{_prefix}/lib
   so there's no need to override the destination directory in %%install; this


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2007 09:04:17 -0000	1.7
+++ sources	28 Sep 2007 08:53:42 -0000	1.8
@@ -1 +1 @@
-b33c91e664be723849745db5f85ecb76  lat-1.2.2.tar.gz
+0725508d180720d260a70c5b39d387ba  lat-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 09:08:10 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 28 Sep 2007 05:08:10 -0400
Subject: rpms/uim/devel uim.spec,1.47,1.48
Message-ID: <200709280908.l8S98Ax9014265@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- uim.spec	28 Sep 2007 01:07:50 -0000	1.47
+++ uim.spec	28 Sep 2007 09:07:38 -0000	1.48
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -385,7 +385,7 @@
 %dir %{_datadir}/uim
 
 %changelog
-* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-9
 - Add Requires: uim-gtk2 in uim-gnome.
 
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8



From fedora-extras-commits at redhat.com  Fri Sep 28 09:17:38 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 05:17:38 -0400
Subject: rpms/gtkwave/devel .cvsignore, 1.41, 1.42 gtkwave.spec, 1.45,
	1.46 sources, 1.41, 1.42
Message-ID: <200709280917.l8S9Hc0P014492@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14468

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	4 Sep 2007 15:54:23 -0000	1.41
+++ .cvsignore	28 Sep 2007 09:17:04 -0000	1.42
@@ -1 +1 @@
-gtkwave-3.1.0.tar.gz
+gtkwave-3.1.1.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gtkwave.spec	4 Sep 2007 15:54:23 -0000	1.45
+++ gtkwave.spec	28 Sep 2007 09:17:04 -0000	1.46
@@ -1,6 +1,6 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.1.0
+Version:	3.1.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 3.1.1-1
+- update to 3.1.1
+
 * Tue Sep  4 2007 Paul Howarth <paul at city-fan.org> 3.1.0-1
 - update to 3.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	4 Sep 2007 15:54:23 -0000	1.41
+++ sources	28 Sep 2007 09:17:04 -0000	1.42
@@ -1 +1 @@
-b041a02ba825062c062ee8ac1633bbec  gtkwave-3.1.0.tar.gz
+8342dbbb915666cd46730e90d64721b3  gtkwave-3.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 10:50:44 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 06:50:44 -0400
Subject: rpms/yumex/devel .cvsignore, 1.37, 1.38 sources, 1.54,
	1.55 yumex.spec, 1.60, 1.61
Message-ID: <200709281050.l8SAoiRu022988@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22925

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Aug 2007 12:20:20 -0000	1.37
+++ .cvsignore	28 Sep 2007 10:50:10 -0000	1.38
@@ -1 +1 @@
-yumex-2.0.1.tar.gz
+yumex-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	22 Aug 2007 12:20:20 -0000	1.54
+++ sources	28 Sep 2007 10:50:10 -0000	1.55
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yumex.spec	22 Aug 2007 12:20:20 -0000	1.60
+++ yumex.spec	28 Sep 2007 10:50:10 -0000	1.61
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
+Version:  2.0.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 10:52:03 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 06:52:03 -0400
Subject: rpms/yumex/F-7 sources,1.53,1.54 yumex.spec,1.60,1.61
Message-ID: <200709281052.l8SAq34S023075@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23003

Modified Files:
	sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	22 Aug 2007 12:50:29 -0000	1.53
+++ sources	28 Sep 2007 10:51:30 -0000	1.54
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/yumex.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yumex.spec	3 Sep 2007 09:34:33 -0000	1.60
+++ yumex.spec	28 Sep 2007 10:51:30 -0000	1.61
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
-Release:  2%{?dist}
+Version:  2.0.2
+Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -68,8 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-2
-- Test build for Bohdi Testing
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 11:06:07 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 07:06:07 -0400
Subject: rpms/yumex/EL-5 sources,1.46,1.47 yumex.spec,1.52,1.53
Message-ID: <200709281106.l8SB67E0029450@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29420

Modified Files:
	sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/EL-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	22 Aug 2007 12:57:48 -0000	1.46
+++ sources	28 Sep 2007 11:05:28 -0000	1.47
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/EL-5/yumex.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- yumex.spec	22 Aug 2007 12:57:48 -0000	1.52
+++ yumex.spec	28 Sep 2007 11:05:28 -0000	1.53
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
+Version:  2.0.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 11:10:57 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 28 Sep 2007 07:10:57 -0400
Subject: rpms/quilt/devel quilt.spec,1.15,1.16
Message-ID: <200709281110.l8SBAvU0029609@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29587

Modified Files:
	quilt.spec 
Log Message:
clog


Index: quilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- quilt.spec	22 Aug 2007 03:57:57 -0000	1.15
+++ quilt.spec	28 Sep 2007 11:10:24 -0000	1.16
@@ -7,11 +7,11 @@
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.46
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext gawk
+BuildRequires: gettext gawk util-linux-ng
 Requires: coreutils
 Requires: diffutils
 Requires: gzip
@@ -20,7 +20,7 @@
 Requires: gawk
 Requires: diffstat
 Requires: %{_sbindir}/sendmail
-Requires: util-linux
+Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
 
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 28 2007 - jwboyer at jdub.homelinux.org 0.46-4
+- BR util-linux-ng for getopt
+
 * Tue Aug 21 2007 - jwboyer at jdub.homelinux.org 0.46-3
 - BR gawk
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:04:01 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 28 Sep 2007 08:04:01 -0400
Subject: comps comps-f7.xml.in, 1.257, 1.258 comps-f8.xml.in, 1.131,
	1.132 comps-fe6.xml.in, 1.376, 1.377
Message-ID: <200709281204.l8SC41AE004625@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4595

Modified Files:
	comps-f7.xml.in comps-f8.xml.in comps-fe6.xml.in 
Log Message:
Solarwolf comps.



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- comps-f7.xml.in	26 Sep 2007 17:24:25 -0000	1.257
+++ comps-f7.xml.in	28 Sep 2007 12:03:31 -0000	1.258
@@ -1395,6 +1395,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
+      <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- comps-f8.xml.in	28 Sep 2007 01:21:23 -0000	1.131
+++ comps-f8.xml.in	28 Sep 2007 12:03:31 -0000	1.132
@@ -1550,6 +1550,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <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>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- comps-fe6.xml.in	19 Sep 2007 22:47:04 -0000	1.376
+++ comps-fe6.xml.in	28 Sep 2007 12:03:31 -0000	1.377
@@ -533,6 +533,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
+      <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 28 12:18:59 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:18:59 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.30,1.31
Message-ID: <200709281219.l8SCIx22005284@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5256

Modified Files:
	sqlite.spec 
Log Message:
- Use bconds for the spec build conditionals
- Enable -tcl subpackage again (#309041)



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sqlite.spec	15 Aug 2007 08:04:07 -0000	1.30
+++ sqlite.spec	28 Sep 2007 12:18:24 -0000	1.31
@@ -1,12 +1,11 @@
-# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
-%define tcl 0%{?_with_tcl:1}
-# --with static enables static library in -devel subpackage
-%define static 0%{?_with_static:1}
+# bcond default logic is nicely backwards...
+%bcond_without tcl
+%bcond_with static
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -14,7 +13,7 @@
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{tcl}
+%if %{with tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -38,7 +37,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{tcl}
+%if %{with tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -53,7 +52,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
-%configure %{!?_with_tcl:--disable-tcl} \
+%configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks 
 make %{?_smp_mflags}
@@ -66,11 +65,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{static}
+%if ! %{with static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{tcl}
+%if %{with tcl}
 %check
 make test
 %endif
@@ -95,17 +94,21 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{static}
+%if %{with static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{tcl}
+%if %{with tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.5.2-2
+- Use bconds for the spec build conditionals
+- Enable -tcl subpackage again (#309041)
+
 * Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
 - Update to 3.4.2
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:20:08 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:20:08 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.31,1.32
Message-ID: <200709281220.l8SCK8Qg005322@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5300

Modified Files:
	sqlite.spec 
Log Message:
- changelog version typo



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sqlite.spec	28 Sep 2007 12:18:24 -0000	1.31
+++ sqlite.spec	28 Sep 2007 12:19:34 -0000	1.32
@@ -105,7 +105,7 @@
 %endif
 
 %changelog
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.5.2-2
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
 - Use bconds for the spec build conditionals
 - Enable -tcl subpackage again (#309041)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:49:47 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:49:47 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.32,1.33
Message-ID: <200709281249.l8SCnl68006159@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6073

Modified Files:
	sqlite.spec 
Log Message:
- Add another build conditional for enabling %check, disabled by default.
  Previously %check was tied to building with tcl so it hasn't been in use,
  now check fails on koji builders on one of the lock tests but succeeds in
  local builds / mock, dunno...



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sqlite.spec	28 Sep 2007 12:19:34 -0000	1.32
+++ sqlite.spec	28 Sep 2007 12:49:12 -0000	1.33
@@ -1,11 +1,12 @@
 # bcond default logic is nicely backwards...
 %bcond_without tcl
 %bcond_with static
+%bcond_with check
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -69,7 +70,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{with tcl}
+%if %{with check}
 %check
 make test
 %endif
@@ -105,6 +106,9 @@
 %endif
 
 %changelog
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
+- Add another build conditional for enabling %%check
+
 * Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
 - Use bconds for the spec build conditionals
 - Enable -tcl subpackage again (#309041)



From fedora-extras-commits at redhat.com  Fri Sep 28 13:04:47 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 28 Sep 2007 09:04:47 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.55, 1.56 sources, 1.59,
	1.60 system-config-users.spec, 1.64, 1.65
Message-ID: <200709281304.l8SD4lbZ012545@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12517

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
remove po/POTFILES.in to appease transifex (#299811)
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	15 Sep 2007 22:15:06 -0000	1.55
+++ .cvsignore	28 Sep 2007 13:04:15 -0000	1.56
@@ -1 +1 @@
-system-config-users-1.2.67.tar.bz2
+system-config-users-1.2.68.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	15 Sep 2007 22:15:06 -0000	1.59
+++ sources	28 Sep 2007 13:04:15 -0000	1.60
@@ -1 +1 @@
-abf42a04901188e1cf2dc36378b0e035  system-config-users-1.2.67.tar.bz2
+35c11e707dc1f557a2cf57729630296d  system-config-users-1.2.68.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- system-config-users.spec	15 Sep 2007 22:15:06 -0000	1.64
+++ system-config-users.spec	28 Sep 2007 13:04:15 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.67
+Version: 1.2.68
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,10 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Fri Sep 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.68
+- remove po/POTFILES.in to appease transifex (#299811)
+- pick up updated translations
+
 * Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.67
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Fri Sep 28 13:19:37 2007
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Fri, 28 Sep 2007 09:19:37 -0400
Subject: rpms/xeuphoric/devel xeuphoric.spec,1.4,1.5
Message-ID: <200709281319.l8SDJbcI012994@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/pkgs/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12963

Modified Files:
	xeuphoric.spec 
Log Message:



Index: xeuphoric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xeuphoric/devel/xeuphoric.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xeuphoric.spec	26 Aug 2007 15:49:09 -0000	1.4
+++ xeuphoric.spec	28 Sep 2007 13:19:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xeuphoric
 Version:        0.18.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An X based ORIC emulator
 Group:          Applications/Emulators
 # The ROMs are believed to be public domain
@@ -14,8 +14,8 @@
 BuildRequires:  libXext-devel
 Requires:       %{name}-roms
 Requires:       hicolor-icon-theme
-ExcludeArch:    x86_64 ia64 ppc ppc64
-# excluded due to compilation problems - upstream developer changing RSN (me!) -Paul
+# Known to fail on x86_64, ppc, ppc64, ia64 and alpha
+ExclusiveArch:  %{ix86}
 
 %description
 xeuphoric is an X based ORIC emulator which has full support for sound,
@@ -137,12 +137,16 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
@@ -160,11 +164,14 @@
 
 
 %changelog
-* Tue Aug 21 2007 Ian Chapman <packages at amiga-hardware.com> 0.18.2-8
+* Fri Sep 28 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-9
+- Changed to exclusivearch %%{ix86}. (BZ #310391)
+
+* Tue Aug 21 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-8
 - Release bump for F8 mass rebuild
 - License change due to new guidelines
 
-* Fri Jun 29 2007 Ian Chapman <packages at amiga-hardware.com> 0.18.2-7
+* Fri Jun 29 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-7
 - Various cleanups to the SPEC including conforming to new guidelines
 - Fix BZ #245091
 - Additional .desktop files for other emulator models



From fedora-extras-commits at redhat.com  Fri Sep 28 13:54:02 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 28 Sep 2007 09:54:02 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.80, 1.81 libsemanage.spec,
	1.135, 1.136 sources, 1.82, 1.83
Message-ID: <200709281354.l8SDs2lY013824@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13800

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Fri Sep 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
- Upgrade to latest from NSA
	* Fix error checking on getpw*_r functions from Todd Miller.
	* Make genhomedircon skip invalid homedir contexts from Todd Miller.
	* Set default user and prefix from seusers from Dan Walsh.
	* Add swigify Makefile target from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	27 Sep 2007 00:20:08 -0000	1.80
+++ .cvsignore	28 Sep 2007 13:53:30 -0000	1.81
@@ -86,3 +86,4 @@
 libsemanage-2.0.5.tgz
 libsemanage-2.0.6.tgz
 libsemanage-2.0.9.tgz
+libsemanage-2.0.10.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- libsemanage.spec	27 Sep 2007 00:20:09 -0000	1.135
+++ libsemanage.spec	28 Sep 2007 13:53:30 -0000	1.136
@@ -2,12 +2,11 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -78,6 +76,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
+- Upgrade to latest from NSA
+	* Fix error checking on getpw*_r functions from Todd Miller.
+	* Make genhomedircon skip invalid homedir contexts from Todd Miller.
+	* Set default user and prefix from seusers from Dan Walsh.
+	* Add swigify Makefile target from Dan Walsh.
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
 - Upgrade to latest from NSA
 	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	27 Sep 2007 00:20:09 -0000	1.82
+++ sources	28 Sep 2007 13:53:30 -0000	1.83
@@ -1 +1 @@
-c241e659ddab751e036c3e770583e95c  libsemanage-2.0.9.tgz
+345de8b74ec346600c514641a3876eee  libsemanage-2.0.10.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 14:00:06 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 28 Sep 2007 10:00:06 -0400
Subject: rpms/xml-commons-apis/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xml-commons-apis.spec, 1.1, 1.2
Message-ID: <200709281400.l8SE06Xb013970@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/xml-commons-apis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940

Modified Files:
	.cvsignore sources xml-commons-apis.spec 
Log Message:
Update to 1.3.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2007 20:00:46 -0000	1.2
+++ .cvsignore	28 Sep 2007 13:59:34 -0000	1.3
@@ -1 +1 @@
-xml-commons-external-1.3.03-src.tar.gz
+xml-commons-external-1.3.04-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 20:00:46 -0000	1.2
+++ sources	28 Sep 2007 13:59:34 -0000	1.3
@@ -1 +1 @@
-0858a0ba09dc990303887412d722fef4  xml-commons-external-1.3.03-src.tar.gz
+639be783e71e05689b12399ea3d2f625  xml-commons-external-1.3.04-src.tar.gz


Index: xml-commons-apis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/xml-commons-apis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-commons-apis.spec	19 Mar 2007 20:00:46 -0000	1.1
+++ xml-commons-apis.spec	28 Sep 2007 13:59:34 -0000	1.2
@@ -34,14 +34,14 @@
 
 Name:           xml-commons-apis
 Summary:        APIs for DOM, SAX, and JAXP
-Version:        1.3.03
+Version:        1.3.04
 Release:        0jpp.1%{?dist}
 Epoch:          0
 License:        Apache Software License/W3C/Public Domain
 URL:            http://xml.apache.org/commons/
-Source0:        xml-commons-external-1.3.03-src.tar.gz
-# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_03/java/external/
-# tar czf xml-commons-external-1.3.03-src.tar.gz external
+Source0:        xml-commons-external-1.3.04-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/
+# tar czf xml-commons-external-1.3.04-src.tar.gz external
 Requires:       jpackage-utils >= 0:1.5
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
@@ -108,9 +108,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xml-apis.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p build/xml-apis-ext.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-ext-%{version}.jar
 
 # Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}*.jar; do ln -sf ${jar} dom3-${jar}; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}-%{version}.jar; do ln -sf ${jar} dom3-${jar}; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 # for better interoperability with the jpp apis packages
 ln -sf %{name}.jar ${RPM_BUILD_ROOT}%{_javadir}/jaxp13.jar
@@ -165,17 +167,13 @@
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-ext-%{version}.jar.*
 %endif
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc build/docs/*
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/*
@@ -188,6 +186,9 @@
 %endif
 
 %changelog
+* Tue Mar 06 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.04-0jpp.1
+- Update to 1.3.04
+
 * Tue Mar 06 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.03-0jpp.1
 - Split xml-commons package up into 2 separate package: xml-commons-apis
   and xml-commons-which.



From fedora-extras-commits at redhat.com  Fri Sep 28 14:04:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 10:04:07 -0400
Subject: rpms/xkeyboard-config/devel sources, 1.4, 1.5 xkeyboard-config.spec,
	1.11, 1.12
Message-ID: <200709281404.l8SE47Jh022392@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21671

Modified Files:
	sources xkeyboard-config.spec 
Log Message:
pick up the respun 1.1 release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2007 04:38:14 -0000	1.4
+++ sources	28 Sep 2007 14:03:34 -0000	1.5
@@ -1 +1 @@
-deef7884b9d9cc280f0d2ef4b60e4d98  xkeyboard-config-1.1.tar.bz2
+2c76b91bd31bff78db771566578fe520  xkeyboard-config-1.1.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xkeyboard-config.spec	26 Sep 2007 04:38:14 -0000	1.11
+++ xkeyboard-config.spec	28 Sep 2007 14:03:34 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-2
+- Pick up the respun 1.1 release
+
 * Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-1
 - Update to 1.1
 - Drop upstreamed patches



From fedora-extras-commits at redhat.com  Fri Sep 28 14:05:42 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:05:42 -0400
Subject: fedora-release/compose - New directory
Message-ID: <200709281405.l8SE5g7e022477@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22462/compose

Log Message:
Directory /cvs/fedora/fedora-release/compose added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 14:09:02 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:09:02 -0400
Subject: fedora-release fedora-release.spec,1.53,1.54
Message-ID: <200709281409.l8SE92H5022646@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22596

Modified Files:
	fedora-release.spec 
Log Message:
Bump for test3, add compose configs for reference.



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- fedora-release.spec	14 Sep 2007 17:27:54 -0000	1.53
+++ fedora-release.spec	28 Sep 2007 14:09:00 -0000	1.54
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	7.91
-Release:	2
+Version:	7.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -49,6 +49,11 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for file in compose/*; do
+  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
+done
+
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -73,10 +78,16 @@
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
+- Bump for F8 Test2.
+- Package up the compose kickstart files
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
 - Use failovermethod=priority in yum configs (243698)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 14:09:03 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:09:03 -0400
Subject: fedora-release/compose README, NONE, 1.1 f8-fedora.ks, NONE,
	1.1 livecd-fedora-base-desktop.ks, NONE,
	1.1 livecd-fedora-desktop.ks, NONE, 1.1 livecd-fedora-kde.ks,
	NONE, 1.1 livedvd-fedora-kde.ks, NONE, 1.1
Message-ID: <200709281409.l8SE93NL022651@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22596/compose

Added Files:
	README f8-fedora.ks livecd-fedora-base-desktop.ks 
	livecd-fedora-desktop.ks livecd-fedora-kde.ks 
	livedvd-fedora-kde.ks 
Log Message:
Bump for test3, add compose configs for reference.



--- NEW FILE README ---
These are the reference config files used to create Fedora releases.

f8-fedora.ks - The traditional DVD release, pick and choose packages.

livecd-fedora-base-desktop.ks - The base Live desktop config

livecd-fedora-desktop.ks - The Fedora Desktop Live config

livecd-fedora-kde.ks - The Fedora KDE Live config


--- NEW FILE f8-fedora.ks ---
# Kickstart file for composing the "Fedora" spin of Fedora 8

# Use a part of 'iso' to define how large you want your isos.
# Only used when composing to more than one iso.
#part iso --size=4998

# Add the repos you wish to use to compose here.  At least one of them needs group data.
repo --name=rawhide  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch

# Package manifest for the compose.  Uses repo group metadata to translate groups.
# (@base is added by default unless you add --nobase to %packages)
%packages
# core
@core
@base-x
kernel*
# Hardware stuff
@hardware-support
@dial-up
# Desktop Packages
@gnome-desktop
@kde-desktop
echo-icon-theme
tracker
gnash
liferea
# apps
@authoring-and-publishing
@editors
emacs
@games
@graphical-internet
@graphics
@office
@sound-and-video
@text-internet
@system-tools
wireshark-gnome
# Devel packages
@development-libs
@development-tools
@gnome-software-development
@kde-software-development
@web-development
@x-software-development
# Server packages
@dns-server
@ftp-server
@mail-server
@mysql
@network-server
@news-server
@printing
@server-cfg
@smb-server
@sql-server
@web-server --optional
# Virt group
@virtualization --optional
# filesystem stuff
reiserfs-utils
xfsprogs
jfsutils
# Languages
@afrikaans-support
@arabic-support
@assamese-support
@basque-support
@bengali-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@faeroese-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@korean-support
@lithuanian-support
@malay-support
@malayalam-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tamil-support
@telugu-support
@thai-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@welsh-support
@xhosa-support
@zulu-support
# Compose Needs
anaconda-runtime
iscsi-initiator-utils
memtest86+
vnc-server
%end


--- NEW FILE livecd-fedora-base-desktop.ks ---
lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --enablemd5
selinux --enforcing
firewall --disabled
xconfig --startxonboot
part / --size 4096
services --enabled=NetworkManager,dhcdbd --disabled=network,sshd

repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

%packages
@base-x
@base
@core
@admin-tools
@dial-up
@hardware-support
@printing
kernel
memtest86+

# save some space
-specspo
-esc
-samba-client
-a2ps
-redhat-lsb
-sox
-hplip
-hpijs
# smartcards won't really work on the livecd.  
-coolkey
-ccid
# duplicate functionality
-pinfo
-vorbis-tools
-wget
# lose the compat stuff
-compat*

# scanning takes quite a bit of space :/
-xsane
-xsane-gimp
-sane-backends

# lots of people want to have this
gparted

# livecd bits to set up the livecd and be able to install
anaconda
isomd5sum

# make sure debuginfo doesn't end up on the live image
-*debuginfo
%end

%post
# FIXME: it'd be better to get this installed from a package
cat > /etc/rc.d/init.d/fedora-live << EOF
#!/bin/bash
#
# live: Init script for live image
#
# chkconfig: 345 00 99
# description: Init script for live image.

. /etc/init.d/functions

if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
    exit 0
fi

exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
}

touch /.liveimg-configured

# mount live image
if [ -b /dev/live ]; then
   mkdir -p /mnt/live
   mount -o ro /dev/live /mnt/live
fi

# enable swaps unless requested otherwise
swaps=\`blkid -t TYPE=swap -o device\`
if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
  for s in \$swaps ; do
    action "Enabling swap partition \$s" swapon \$s
  done
fi

# configure X, allowing user to override xdriver
for o in \`cat /proc/cmdline\` ; do
    case \$o in
    xdriver=*)
        xdriver="--set-driver=\${o#xdriver=}"
        ;;
    esac
done

exists system-config-display --noui --reconfig --set-depth=24 \$xdriver

# unmute sound card
exists alsaunmute 0 2> /dev/null

# add fedora user with no passwd
useradd -c "Fedora Live" fedora
passwd -d fedora > /dev/null

# turn off firstboot for livecd boots
echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot

# don't start yum-updatesd for livecd boots
chkconfig --level 345 yum-updatesd off

# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
chkconfig --level 345 crond off
chkconfig --level 345 atd off
chkconfig --level 345 anacron off
chkconfig --level 345 readahead_early off
chkconfig --level 345 readahead_later off

# Stopgap fix for RH #217966; should be fixed in HAL instead
touch /media/.hal-mtab
EOF

chmod 755 /etc/rc.d/init.d/fedora-live
/sbin/restorecon /etc/rc.d/init.d/fedora-live
/sbin/chkconfig --add fedora-live

# save a little bit of space at least...
rm -f /boot/initrd*

%end


%post --nochroot
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
%end


--- NEW FILE livecd-fedora-desktop.ks ---
%include livecd-fedora-base-desktop.ks

%packages
@games
@graphical-internet
@graphics
@sound-and-video
@gnome-desktop
nss-mdns
# we don't include @office so that we don't get OOo.  but some nice bits
abiword
gnumeric
evince
gnome-blog
#planner
#inkscape

@afrikaans-support
@albanian-support
@arabic-support
@armenian-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
@bhutanese-support
@bosnian-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@ethiopic-support
@faeroese-support
@filipino-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@georgian-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@inuktitut-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@khmer-support
@korean-support
@lao-support
@latvian-support
@lithuanian-support
@malay-support
@malayalam-support
@maori-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@samoan-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@somali-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tagalog-support
@tamil-support
@telugu-support
@thai-support
@tibetan-support
@tonga-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@vietnamese-support
@welsh-support
@xhosa-support
@zulu-support

# dictionaries are big
-aspell-*
-m17n-db-*
-man-pages-*
-scim-tables-*
-scim-lang-*
-wqy-bitmap-fonts

# save some space
-gnome-user-docs
-gimp-help
-evolution-help
-autofs

%end

%post
# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf

cat >> /etc/rc.d/init.d/fedora-live << EOF
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
    chown fedora:fedora /home/fedora/.face
    # TODO: would be nice to get e-d-s to pick this one up too... but how?
fi

EOF

%end


--- NEW FILE livecd-fedora-kde.ks ---
%include livecd-fedora-base-desktop.ks

%packages
@kde-desktop
kdegames
beryl-kde
k3b
koffice-kword
koffice-kspread
koffice-kpresenter
koffice-filters
twinkle
filelight
krusader

# if it is enough space include koffice-krita (~40 megs) and ktorrent (~3 megs)
koffice-krita
ktorrent

# some other extra packages
gnupg
synaptics
hal-cups-utils
nss-mdns

# ignore comps.xml and make sure these packages are included
knetworkmanager
kpowersave
redhat-artwork-kde
rhgb
man-pages
smolt-firstboot

#some changes that we don't want...
-specspo
-scribus
-kdeaddons
-kdemultimedia-extras
-kdeartwork-extras
-kmymoney2
-basket
-speedcrunch
-autofs

# try to remove some packages from livecd-fedora-base-desktop.ks
-scim*
-gdm
-authconfig-gtk
-m17n*
-PolicyKit-gnome
-gnome-doc-utils-stylesheets
-anthy
-kasumi
-pygtkglext
-python-devel
-libchewing

# workaround for the moment (requirements of hplip)
python-imaging
python-reportlab

%end

%post
# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf


# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF

# add initscript
cat >> /etc/rc.d/init.d/fedora-live << EOF

if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    # use image also for kdm
    mkdir -p /usr/share/apps/kdm/faces
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
fi

# make fedora user use KDE
echo "startkde" > /home/fedora/.xsession
chmod a+x /home/fedora/.xsession
chown fedora:fedora /home/fedora/.xsession

# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc

# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc

# disable screensaver
sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc

# adding some autostarted applications
cp /usr/share/applications/fedora-knetworkmanager.desktop /usr/share/autostart/

# workaround to put liveinst on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
EOF

%end


--- NEW FILE livedvd-fedora-kde.ks ---
%include livecd-fedora-kde.ks

%packages

# add full language support
@afrikaans-support
@albanian-support
@arabic-support
@armenian-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
@bhutanese-support
@bosnian-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@ethiopic-support
@faeroese-support
@filipino-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@georgian-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@inuktitut-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@khmer-support
@korean-support
@lao-support
@latvian-support
@lithuanian-support
@malay-support
@malayalam-support
@maori-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@samoan-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@somali-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tagalog-support
@tamil-support
@telugu-support
@thai-support
@tibetan-support
@tonga-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@vietnamese-support
@welsh-support
@xhosa-support
@zulu-support

# and some extra packages
koffice-*

%end 

%post

# Use gdm here for language selection

# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
#DISPLAYMANAGER="KDE"
EOF

%end 



From fedora-extras-commits at redhat.com  Fri Sep 28 14:25:17 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:25:17 -0400
Subject: rpms/fedora-release/devel .cvsignore, 1.28, 1.29 fedora-release.spec,
	1.60, 1.61 sources, 1.48, 1.49
Message-ID: <200709281425.l8SEPHvx023334@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
- Bump for F8 Test2.
- Package up the compose kickstart files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	30 Aug 2007 10:27:31 -0000	1.28
+++ .cvsignore	28 Sep 2007 14:24:44 -0000	1.29
@@ -1 +1 @@
-fedora-release-7.91.tar.gz
+fedora-release-7.92.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- fedora-release.spec	14 Sep 2007 17:29:12 -0000	1.60
+++ fedora-release.spec	28 Sep 2007 14:24:44 -0000	1.61
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	7.91
-Release:	2
+Version:	7.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -49,6 +49,11 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for file in compose/*; do
+  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
+done
+
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -73,10 +78,16 @@
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
+- Bump for F8 Test2.
+- Package up the compose kickstart files
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
 - Use failovermethod=priority in yum configs (243698)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	14 Sep 2007 17:29:12 -0000	1.48
+++ sources	28 Sep 2007 14:24:44 -0000	1.49
@@ -1 +1 @@
-1692ee19be5132c951ca19297b22e227  fedora-release-7.91.tar.gz
+c6bd0782ce305e07da65d050126b7ed6  fedora-release-7.92.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 14:30:29 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Fri, 28 Sep 2007 10:30:29 -0400
Subject: rpms/tracker/F-7 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tracker.spec,
	1.14, 1.15 tracker-handler.py, 1.1, NONE
Message-ID: <200709281430.l8SEUTE3023539@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23504

Modified Files:
	.cvsignore sources tracker.spec 
Removed Files:
	tracker-handler.py 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
- Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jul 2007 03:13:16 -0000	1.6
+++ .cvsignore	28 Sep 2007 14:29:57 -0000	1.7
@@ -1 +1 @@
-tracker-0.6.0.tar.bz2
+tracker-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jul 2007 03:13:16 -0000	1.6
+++ sources	28 Sep 2007 14:29:57 -0000	1.7
@@ -1 +1 @@
-c7b52531533482593ba6260603c175a3  tracker-0.6.0.tar.bz2
+f718aa38b7527229f5567834ae247a38  tracker-0.6.3.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/tracker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tracker.spec	24 Jul 2007 03:13:16 -0000	1.14
+++ tracker.spec	28 Sep 2007 14:29:57 -0000	1.15
@@ -1,22 +1,17 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.0
+Version:	0.6.3
 Release:	1%{?dist}
-License:	GPL
+License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
-Source0:	http://www.gnome.org/~jamiemcc/tracker/tracker-0.6.0.tar.bz2
-Source1:	tracker-handler.py
+Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
-BuildRequires:	gnome-desktop-devel, gamin-devel
+BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-%if "%fedora" >= "6"
-BuildRequires:	sqlite-devel
-%else
-BuildRequires:	dbus-devel, dbus-glib
-%endif
+BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -38,7 +33,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	dbus-glib-devel
+Requires:	dbus-glib-devel gtk2-devel
 
 %description devel
 This package contains the static libraries and header files needed for
@@ -55,19 +50,18 @@
 
 %prep
 %setup -q
-cp -pr %{SOURCE1} python/deskbar-handler/
-# remove shebangs from the python files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i python/deskbar-handler/*.py
-
-%build
-%if "%fedora" >= "6"
-%configure --disable-static --enable-external-sqlite	\
-	--enable-preferences --enable-deskbar-applet	\
-	--with-deskbar-applet-handler-dir=%{_libdir}/deskbar-applet/handlers
+%define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
+%if "%deskbar_applet_ver" >= "2.19.4"
+ %define deskbar_applet_dir %(pkg-config --variable modulesdir deskbar-applet)
+ %define deskbar_type module
 %else
-%configure --disable-static --enable-preferences	\
-	--enable-deskbar-applet
+ %define deskbar_applet_dir %(pkg-config --variable handlersdir deskbar-applet)
+ %define deskbar_type handler
 %endif
+
+%build
+%configure --disable-static --enable-deskbar-applet=%{deskbar_type}	\
+		--enable-external-qdbm
 # 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
@@ -125,12 +119,33 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
-%{_libdir}/deskbar-applet/handlers/*.py*
+%{deskbar_applet_dir}/tracker*.py*
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
+- Version 0.6.3
+
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
+- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
+
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Version 0.6.2
+
+* Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-2
+- Rebuild
+
+* Wed Aug 08 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
+* Fri Aug 03 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.0-3
+- License tag update
+
+* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 0.6.0-2.1
+- rebuild for toolchain bug
+
 * Mon Jul 23 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Manually specify path to deskbar-applet handler directory, koji can't find it


--- tracker-handler.py DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 14:31:52 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 28 Sep 2007 10:31:52 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-3w-9xxx-mem_len.patch, 1.1,
	1.2 kernel-xen.spec, 1.51, 1.52
Message-ID: <200709281431.l8SEVqtt023665@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)

(merge from CVS branch private-ehabkost-bz309611-test-branch)


linux-2.6-3w-9xxx-mem_len.patch:

Index: linux-2.6-3w-9xxx-mem_len.patch
===================================================================
RCS file: linux-2.6-3w-9xxx-mem_len.patch
diff -N linux-2.6-3w-9xxx-mem_len.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-3w-9xxx-mem_len.patch	28 Sep 2007 14:31:49 -0000	1.2
@@ -0,0 +1,52 @@
+From: Eduardo Habkost <ehabkost at redhat.com>
+Date: Thu, 27 Sep 2007 18:37:44 -0300
+Subject: 3w-9xxx: use PCI resource lenght correctly
+
+Trying to ioremap() a larger area than pci_resource_len()
+may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
+as length parameter to ioremap() instead of PAGE_SIZE.
+
+Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
+---
+Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
++++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
+@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
+ {
+ 	struct Scsi_Host *host = NULL;
+ 	TW_Device_Extension *tw_dev;
+-	u32 mem_addr;
++	int bar;
++	unsigned long mem_addr, mem_len;
+ 	int retval = -ENODEV;
+ 
+ 	retval = pci_enable_device(pdev);
+@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
+ 	}
+ 
+ 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
+-		mem_addr = pci_resource_start(pdev, 1);
++		bar = 1;
+ 	else
+-		mem_addr = pci_resource_start(pdev, 2);
++		bar = 2;
++
++	mem_addr = pci_resource_start(pdev, bar);
++	mem_len = pci_resource_len(pdev, bar);
+ 
+ 	/* Save base address */
+-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
++	tw_dev->base_addr = ioremap(mem_addr, mem_len);
+ 	if (!tw_dev->base_addr) {
+ 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
+ 		goto out_release_mem_region;
+@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
+ 
+ 	pci_set_drvdata(pdev, host);
+ 
+-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
++	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
+ 	       host->host_no, mem_addr, pdev->irq);
+ 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
+ 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
+++ kernel-xen.spec	28 Sep 2007 14:31:49 -0000	1.52
@@ -442,6 +442,7 @@
 
 # SCSI bits.
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-ctlbits.patch
@@ -1002,6 +1003,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2072,6 +2076,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Fri Sep 28 14:33:25 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Fri, 28 Sep 2007 10:33:25 -0400
Subject: rpms/whowatch/devel Makefile, 1.3, 1.4 sources, 1.4,
	1.5 whowatch-1.4.patch, NONE, 1.1 whowatch.spec, 1.10,
	1.11 dead.package, 1.1, NONE
Message-ID: <200709281433.l8SEXPm3023723@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/whowatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23698/devel

Added Files:
	Makefile sources whowatch-1.4.patch whowatch.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Sep 2007 14:32:52 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: whowatch
+# $Id$
+NAME := whowatch
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Sep 2007 14:32:52 -0000	1.5
@@ -0,0 +1 @@
+0870155e8b75b99f9954e76fb20f9528  whowatch-1.4.tar.gz

whowatch-1.4.patch:

--- NEW FILE whowatch-1.4.patch ---
--- process.c	2000-06-06 15:46:12.000000000 +0530
+++ ../process.c	2007-09-24 23:36:02.000000000 +0530
@@ -74,7 +74,7 @@
 		memset(z, 0, sizeof *z);
 		check_line(l);
 		z->line = l++;
-		(struct process *) p->priv = z;
+		p->priv = z;
 		z->proc = p;
 		if (*current){
 			z->next = *current;


Index: whowatch.spec
===================================================================
RCS file: whowatch.spec
diff -N whowatch.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ whowatch.spec	28 Sep 2007 14:32:52 -0000	1.11
@@ -0,0 +1,56 @@
+Summary: Display information about users currently logged on 
+Name: whowatch
+Version: 1.4
+Release: 4%{?dist}
+License: GPLv2
+Group: Applications/System
+URL: http://wizard.ae.krakow.pl/~mike/
+
+Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz
+Patch0: %{name}-%{version}.patch
+BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: ncurses-devel
+
+%description
+Whowatch is an interactive console utility that displays informations about
+the users currently logged on to the machine, in real time. Besides standard
+information (login, tty, host, user's process) you can see type of login
+(ie. ssh, telnet). You can also see selected user's processes tree or all
+system processes tree.  In the process tree mode there is ability to send
+INT or KILL signal to selected process.
+
+%prep
+
+%setup -q
+%patch0 -p0
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \
+			%{buildroot}%{_bindir}
+#%makeinstall
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING KEYS README TODO
+%doc %{_mandir}/man1/whowatch.1*
+%{_bindir}/whowatch
+
+%changelog
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-4
+- fixed broken patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-3
+- fixed issues regarding patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-2
+- fixed few issues  
+* Sat Sep 22 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-1
+-Initial packaging. 
+


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 14:36:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 10:36:44 -0400
Subject: rpms/higlayout/devel higlayout.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709281436.l8SEaieq023936@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894/devel

Modified Files:
	.cvsignore sources 
Added Files:
	higlayout.spec 
Log Message:
initial higlayout import



--- NEW FILE higlayout.spec ---
Name:           higlayout
Version:        1.0
Release:        1%{?dist}
Summary:        Easy to use and powerful layout manager for Java
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.autel.cz/dmi/tutorial.html
Source0:        http://www.autel.cz/dmi/HIGLayout%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  java-javadoc java-gcj-compat-devel

%description
%{summary}.


%package        javadoc
Summary:        Java API documentation for %{name}
Group:          Documentation

%description    javadoc
%{summary}.


%prep
%setup -q -c
sed -i -e 's/\r//g' examples/*.java tutorial/*.html *.txt
rm -r apidoc/*


%build
pushd src
%{javac} cz/autel/dmi/*.java
%{jar} cf ../%{name}.jar cz/autel/dmi/*.class
%{javadoc} -link %{_javadocdir}/java -d ../apidoc cz.autel.dmi
popd


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%post javadoc
rm -f %{_javadocdir}/%{name} && \
ln -s %{name}-%{version} %{_javadocdir}/%{name} || :


%files
%defattr(-,root,root,-)
%doc Changes.txt LGPLicense.txt readme.txt examples/ tutorial/
%{_javadir}/%{name}*.jar
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}


%changelog
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.2
- Rebuild.

* Sun Mar 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/higlayout/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:32:08 -0000	1.1
+++ .cvsignore	28 Sep 2007 14:36:12 -0000	1.2
@@ -0,0 +1 @@
+HIGLayout1.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/higlayout/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:32:08 -0000	1.1
+++ sources	28 Sep 2007 14:36:12 -0000	1.2
@@ -0,0 +1 @@
+5bd79f33157824499b0fc03d6a5e080a  HIGLayout1.0.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 14:37:24 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 10:37:24 -0400
Subject: rpms/startup-notification/devel startup-notification.spec, 1.17,
	1.18
Message-ID: <200709281437.l8SEbOCO023997@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/startup-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931

Modified Files:
	startup-notification.spec 
Log Message:
update spec as per 226435



Index: startup-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/startup-notification/devel/startup-notification.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- startup-notification.spec	23 Aug 2007 17:58:36 -0000	1.17
+++ startup-notification.spec	28 Sep 2007 14:36:51 -0000	1.18
@@ -4,7 +4,7 @@
 Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: http://download.gnome.org/sources/startup-notification/0.9/%{name}-%{version}.tar.bz2
-License: LGPL
+License: LGPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
@@ -91,7 +91,7 @@
 - change to new modular X dependencies
 - move configure to build instead of prep
 - use make install DESTDIR=$RPM_BUILD_ROOT instead of
-  %makeinstall
+  makeinstall macro
 
 * Wed Mar  2 2005 Mark McLoughlin <markmc at redhat.com> 0.8-2
 - Rebuild with gcc4



From fedora-extras-commits at redhat.com  Fri Sep 28 14:40:41 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Fri, 28 Sep 2007 10:40:41 -0400
Subject: rpms/whowatch/F-7 Makefile, 1.3, 1.4 sources, 1.4,
	1.5 whowatch-1.4.patch, NONE, 1.1 whowatch.spec, 1.10,
	1.11 dead.package, 1.1, NONE
Message-ID: <200709281440.l8SEef9e024107@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/whowatch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24077/F-7

Added Files:
	Makefile sources whowatch-1.4.patch whowatch.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Sep 2007 14:40:08 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: whowatch
+# $Id$
+NAME := whowatch
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Sep 2007 14:40:08 -0000	1.5
@@ -0,0 +1 @@
+0870155e8b75b99f9954e76fb20f9528  whowatch-1.4.tar.gz

whowatch-1.4.patch:

--- NEW FILE whowatch-1.4.patch ---
--- process.c	2000-06-06 15:46:12.000000000 +0530
+++ ../process.c	2007-09-24 23:36:02.000000000 +0530
@@ -74,7 +74,7 @@
 		memset(z, 0, sizeof *z);
 		check_line(l);
 		z->line = l++;
-		(struct process *) p->priv = z;
+		p->priv = z;
 		z->proc = p;
 		if (*current){
 			z->next = *current;


Index: whowatch.spec
===================================================================
RCS file: whowatch.spec
diff -N whowatch.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ whowatch.spec	28 Sep 2007 14:40:08 -0000	1.11
@@ -0,0 +1,56 @@
+Summary: Display information about users currently logged on 
+Name: whowatch
+Version: 1.4
+Release: 4%{?dist}
+License: GPLv2
+Group: Applications/System
+URL: http://wizard.ae.krakow.pl/~mike/
+
+Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz
+Patch0: %{name}-%{version}.patch
+BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: ncurses-devel
+
+%description
+Whowatch is an interactive console utility that displays informations about
+the users currently logged on to the machine, in real time. Besides standard
+information (login, tty, host, user's process) you can see type of login
+(ie. ssh, telnet). You can also see selected user's processes tree or all
+system processes tree.  In the process tree mode there is ability to send
+INT or KILL signal to selected process.
+
+%prep
+
+%setup -q
+%patch0 -p0
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \
+			%{buildroot}%{_bindir}
+#%makeinstall
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING KEYS README TODO
+%doc %{_mandir}/man1/whowatch.1*
+%{_bindir}/whowatch
+
+%changelog
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-4
+- fixed broken patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-3
+- fixed issues regarding patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-2
+- fixed few issues  
+* Sat Sep 22 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-1
+-Initial packaging. 
+


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 15:06:07 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 11:06:07 -0400
Subject: rpms/ode/devel .cvsignore,1.5,1.6 ode.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200709281506.l8SF67Et030885@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30851

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-0.1.rc1
- New upstream release 0.9-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 14:13:44 -0000	1.5
+++ .cvsignore	28 Sep 2007 15:05:34 -0000	1.6
@@ -1 +1 @@
-ode-src-0.8.1-rc1.zip
+ode-src-0.9-rc1.zip


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ode.spec	11 Sep 2007 14:13:44 -0000	1.8
+++ ode.spec	28 Sep 2007 15:05:34 -0000	1.9
@@ -1,7 +1,7 @@
 %define prever rc1
 
 Name:           ode
-Version:        0.8.1
+Version:        0.9
 Release:        0.1.%{prever}%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-0.1.rc1
+- New upstream release 0.9-rc1
+
 * Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
 - New upstream release 0.8.1-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 14:13:44 -0000	1.5
+++ sources	28 Sep 2007 15:05:34 -0000	1.6
@@ -1 +1 @@
-4c8de285f55460ae3a2385fb607270e7  ode-src-0.8.1-rc1.zip
+94187243d98df4c687f11afa11743d54  ode-src-0.9-rc1.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 15:10:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 11:10:59 -0400
Subject: rpms/higlayout/F-7 higlayout.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709281510.l8SFAxYZ031166@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/higlayout/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31108

Modified Files:
	.cvsignore sources 
Added Files:
	higlayout.spec 
Log Message:
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission



--- NEW FILE higlayout.spec ---
Name:           higlayout
Version:        1.0
Release:        1%{?dist}
Summary:        Easy to use and powerful layout manager for Java
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.autel.cz/dmi/tutorial.html
Source0:        http://www.autel.cz/dmi/HIGLayout%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  java-javadoc java-gcj-compat-devel

%description
%{summary}.


%package        javadoc
Summary:        Java API documentation for %{name}
Group:          Documentation

%description    javadoc
%{summary}.


%prep
%setup -q -c
sed -i -e 's/\r//g' examples/*.java tutorial/*.html *.txt
rm -r apidoc/*


%build
pushd src
%{javac} cz/autel/dmi/*.java
%{jar} cf ../%{name}.jar cz/autel/dmi/*.class
%{javadoc} -link %{_javadocdir}/java -d ../apidoc cz.autel.dmi
popd


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%post javadoc
rm -f %{_javadocdir}/%{name} && \
ln -s %{name}-%{version} %{_javadocdir}/%{name} || :


%files
%defattr(-,root,root,-)
%doc Changes.txt LGPLicense.txt readme.txt examples/ tutorial/
%{_javadir}/%{name}*.jar
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}


%changelog
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.2
- Rebuild.

* Sun Mar 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/higlayout/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:32:08 -0000	1.1
+++ .cvsignore	28 Sep 2007 15:10:27 -0000	1.2
@@ -0,0 +1 @@
+HIGLayout1.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/higlayout/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:32:08 -0000	1.1
+++ sources	28 Sep 2007 15:10:27 -0000	1.2
@@ -0,0 +1 @@
+5bd79f33157824499b0fc03d6a5e080a  HIGLayout1.0.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 15:12:43 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Fri, 28 Sep 2007 11:12:43 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.67, 1.68 pykickstart.spec, 1.74,
	1.75 sources, 1.75, 1.76
Message-ID: <200709281512.l8SFChbW031477@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31345

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	12 Sep 2007 21:53:38 -0000	1.67
+++ .cvsignore	28 Sep 2007 15:12:10 -0000	1.68
@@ -1,3 +1,4 @@
 pykickstart-1.11.tar.gz
 pykickstart-1.12.tar.gz
 pykickstart-1.13.tar.gz
+pykickstart-1.14.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pykickstart.spec	12 Sep 2007 21:53:38 -0000	1.74
+++ pykickstart.spec	28 Sep 2007 15:12:10 -0000	1.75
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.13
+Version: 1.14
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -41,8 +41,13 @@
 %doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
+%{_bindir}/ksflatten
 
 %changelog
+* Fri Sep 28 2007 Chris Lumens <clumens at redhat.com> 1.14-1
+- Fix output formatting for packages section header (#310211).
+- Add a script to flatten kickstart files containing includes (katzj).
+
 * Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
 - Add a function to convert URL method strings into repo objects
   (jkeating).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	12 Sep 2007 22:06:37 -0000	1.75
+++ sources	28 Sep 2007 15:12:10 -0000	1.76
@@ -1 +1 @@
-806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz
+b9bfcbfe53bab64d72762cedba97b871  pykickstart-1.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:24:27 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 28 Sep 2007 11:24:27 -0400
Subject: rpms/jd/devel .cvsignore, 1.147, 1.148 jd.spec, 1.173, 1.174 sources,
	1.148, 1.149
Message-ID: <200709281524.l8SFORbs032074@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
- svn 1355



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	18 Sep 2007 13:46:29 -0000	1.147
+++ .cvsignore	28 Sep 2007 15:23:54 -0000	1.148
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-svn1355.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- jd.spec	18 Sep 2007 13:46:29 -0000	1.173
+++ jd.spec	28 Sep 2007 15:23:54 -0000	1.174
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
+%define         strtag        svn1355
 %define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-#BuildRequires:	subversion
+BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
+- svn 1355
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	18 Sep 2007 13:46:29 -0000	1.148
+++ sources	28 Sep 2007 15:23:54 -0000	1.149
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:27:58 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 28 Sep 2007 11:27:58 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.127, 1.128 jd.spec, 1.146, 1.147 sources, 
	1.128, 1.129
Message-ID: <200709281527.l8SFRwrb032202@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32180

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
- svn 1355



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- .cvsignore	18 Sep 2007 13:46:23 -0000	1.127
+++ .cvsignore	28 Sep 2007 15:27:25 -0000	1.128
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-svn1355.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- jd.spec	18 Sep 2007 13:46:23 -0000	1.146
+++ jd.spec	28 Sep 2007 15:27:25 -0000	1.147
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
+%define         strtag        svn1355
 %define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-#BuildRequires:	subversion
+BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
+- svn 1355
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	18 Sep 2007 13:46:23 -0000	1.128
+++ sources	28 Sep 2007 15:27:25 -0000	1.129
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:33:06 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 28 Sep 2007 11:33:06 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-3w-9xxx-mem_len.patch, NONE,
	1.1 kernel-xen.spec, 1.62, 1.63
Message-ID: <200709281533.l8SFX6xK032377@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)


linux-2.6-3w-9xxx-mem_len.patch:

--- NEW FILE linux-2.6-3w-9xxx-mem_len.patch ---
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 27 Sep 2007 18:37:44 -0300
Subject: 3w-9xxx: use PCI resource lenght correctly

Trying to ioremap() a larger area than pci_resource_len()
may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
as length parameter to ioremap() instead of PAGE_SIZE.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
===================================================================
--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
+++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
 {
 	struct Scsi_Host *host = NULL;
 	TW_Device_Extension *tw_dev;
-	u32 mem_addr;
+	int bar;
+	unsigned long mem_addr, mem_len;
 	int retval = -ENODEV;
 
 	retval = pci_enable_device(pdev);
@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
 	}
 
 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
-		mem_addr = pci_resource_start(pdev, 1);
+		bar = 1;
 	else
-		mem_addr = pci_resource_start(pdev, 2);
+		bar = 2;
+
+	mem_addr = pci_resource_start(pdev, bar);
+	mem_len = pci_resource_len(pdev, bar);
 
 	/* Save base address */
-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
+	tw_dev->base_addr = ioremap(mem_addr, mem_len);
 	if (!tw_dev->base_addr) {
 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
 		goto out_release_mem_region;
@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
 
 	pci_set_drvdata(pdev, host);
 
-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
+	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
 	       host->host_no, mem_addr, pdev->irq);
 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kernel-xen.spec	27 Sep 2007 16:15:49 -0000	1.62
+++ kernel-xen.spec	28 Sep 2007 15:32:34 -0000	1.63
@@ -497,6 +497,7 @@
 # SCSI bits.
 Patch1100: linux-2.6-scsi-bounce-isa.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NIC driver fixes
 Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
@@ -1168,6 +1169,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2362,6 +2366,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Fri Sep 28 15:45:38 2007
From: fedora-extras-commits at redhat.com (Todd M. Zullinger (tmz))
Date: Fri, 28 Sep 2007 11:45:38 -0400
Subject: rpms/rpmlint/devel rpmlint.config,1.15,1.16 rpmlint.spec,1.39,1.40
Message-ID: <200709281545.l8SFjcBm000385@cvs-int.fedora.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv362

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
- Sync Fedora license list with Revision 0.55 (Wiki rev 92).



Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmlint.config	3 Sep 2007 17:30:14 -0000	1.15
+++ rpmlint.config	28 Sep 2007 15:45:05 -0000	1.16
@@ -28,7 +28,7 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 87 of that page.
+    # Last synced with Revision 0.55 (Wiki revision 92) of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -59,20 +59,26 @@
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'FTL',
     'Giftware',
     'Glide',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
     'GPLv2+',
+    'GPLv2+ with exceptions',
     'GPLv3',
+    'GPLv3 with exceptions',
     'GPLv3+',
+    'GPLv3+ with exceptions',
     'IBM',
     'IJG',
     'ImageMagick',
     'iMatix',
+    'Imlib2',
     'Intel ACPI',
     'Interbase',
     'ISC',
@@ -99,6 +105,7 @@
     'Nokia',
     'OpenLDAP',
     'OpenPBS',
+    'OReilly',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -150,6 +157,7 @@
     'Free Art',
     # Font licenses
     'Arphic',
+    'Baekmuk',
     'Bitstream Vera',
     'mplus',
     'OFL',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpmlint.spec	3 Sep 2007 17:35:01 -0000	1.39
+++ rpmlint.spec	28 Sep 2007 15:45:05 -0000	1.40
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
 * Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
 - 0.81, fixes #239611, #240840, #241471, #244835.
 - Improve Fedora license check (Todd Zullinger).



From fedora-extras-commits at redhat.com  Fri Sep 28 15:56:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 28 Sep 2007 11:56:00 -0400
Subject: rpms/smolt/devel selinux.patch,NONE,1.1 smolt.spec,1.30,1.31
Message-ID: <200709281556.l8SFu0xg000770@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv733

Modified Files:
	smolt.spec 
Added Files:
	selinux.patch 
Log Message:
Fixed selinux issue in #311181

selinux.patch:

--- NEW FILE selinux.patch ---
--- /tmp/smolt.py	2007-09-28 10:47:24.000000000 -0500
+++ client/smolt.py	2007-08-13 15:46:43.000000000 -0500
@@ -196,24 +196,18 @@
             self.formfactor = hostInfo['system.formfactor']
         except:
             self.formfactor = 'Unknown'
-
         try:
-            import selinux
-            try:
-                if selinux.is_selinux_enabled() == 1:
-                    self.selinux_enabled = True
-                else:
-                    self.selinux_enabled = False
-            except:
-                self.selinux_enabled = False
+            retcode = os.system('/usr/sbin/selinuxenabled')
+            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
+        except:
+            self.selinux_enabled = False
+        if self.selinux_enabled:
             try:
-                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
+                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
             except:
-                self.selinux_enforce = "Unknown"
-        except ImportError:
-            self.selinux_enabled = "Not installed"
-            self.selinux_enforce = "Not Installed"
-    
+                self.selinux_enforce = 'Disabled'
+        else:
+            self.selinux_enforce = 'Disabled'
 
 def ignoreDevice(device):
     ignore = 1
@@ -273,8 +267,8 @@
         except:
             raise SystemBusError, _('Could not bind to dbus.  Is dbus running?')
         
+        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
         try:
-            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
             all_dev_lst = mgr.GetAllDevices()
         except:
             raise SystemBusError, _('Could not connect to hal, is it running?'), _('Run "service haldaemon start" as root')


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- smolt.spec	28 Sep 2007 02:35:16 -0000	1.30
+++ smolt.spec	28 Sep 2007 15:55:27 -0000	1.31
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -12,6 +12,7 @@
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
 Patch0: firstboot.patch
 Patch1: languages.patch
+Patch2: selinux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -68,6 +69,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 cd client/
@@ -181,6 +183,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-7
+- Fixed Selinux
+
 * Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
 - Added translations
 



From fedora-extras-commits at redhat.com  Fri Sep 28 15:59:16 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 11:59:16 -0400
Subject: rpms/i810switch/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE i810switch-0.6.2.makefile.patch, 1.1,
	NONE i810switch-0.6.5-add-i945.patch, 1.1, NONE i810switch.spec,
	1.10, NONE sources, 1.3, NONE
Message-ID: <200709281559.l8SFxGZR000918@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile i810switch-0.6.2.makefile.patch 
	i810switch-0.6.5-add-i945.patch i810switch.spec sources 
Log Message:
make i810switch a dead.package


--- NEW FILE dead.package ---
i810switch functionality has been replaced by xrandr code provided by
the X server itself.  Users of i810switch should use xrandr now.
-Matt Domsch <Matt_Domsch at dell.com> 28-September-2007


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- i810switch-0.6.2.makefile.patch DELETED ---


--- i810switch-0.6.5-add-i945.patch DELETED ---


--- i810switch.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:32 -0700
Subject: [pkgdb] NetworkManager (Fedora, devel) updated by jkeating
Message-ID: <200709281600.l8SG0cpG020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of NetworkManager in Fedora devel to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:32 -0700
Subject: [pkgdb] NetworkManager (Fedora, 7) updated by jkeating
Message-ID: <200709281600.l8SG0cpJ020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of NetworkManager in Fedora 7 to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:51 -0700
Subject: [pkgdb] wpa_supplicant (Fedora, devel) updated by jkeating
Message-ID: <200709281600.l8SG0cpM020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of wpa_supplicant in Fedora devel to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wpa_supplicant



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:51 -0700
Subject: [pkgdb] wpa_supplicant (Fedora, 7) updated by jkeating
Message-ID: <200709281600.l8SG0uIn020387@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of wpa_supplicant in Fedora 7 to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wpa_supplicant



From fedora-extras-commits at redhat.com  Fri Sep 28 16:09:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 12:09:18 -0400
Subject: rpms/gdm/devel stupid-bullets.patch, NONE,
	1.1 gdm-2.20.0-change-defaults.patch, 1.2, 1.3 gdm.spec, 1.292, 1.293
Message-ID: <200709281609.l8SG9Ir8007638@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610

Modified Files:
	gdm-2.20.0-change-defaults.patch gdm.spec 
Added Files:
	stupid-bullets.patch 
Log Message:
fix the stupid bullets


stupid-bullets.patch:

--- NEW FILE stupid-bullets.patch ---
diff -up gdm-2.20.0/gui/greeter/greeter_canvas_item.c.stupid-bullets gdm-2.20.0/gui/greeter/greeter_canvas_item.c
--- gdm-2.20.0/gui/greeter/greeter_canvas_item.c.stupid-bullets	2007-09-28 11:25:25.000000000 -0400
+++ gdm-2.20.0/gui/greeter/greeter_canvas_item.c	2007-09-28 11:26:08.000000000 -0400
@@ -469,7 +469,7 @@ greeter_item_create_canvas_item (Greeter
     else if (gdm_config_get_bool (GDM_KEY_ENTRY_CIRCLES))
       gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x25cf);
     else
-	    gtk_entry_set_invisible_char (GTK_ENTRY (entry), '*');
+	    gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x2022);
 
     gtk_widget_modify_font (entry, item->data.text.fonts[GREETER_ITEM_STATE_NORMAL]);
 

gdm-2.20.0-change-defaults.patch:

Index: gdm-2.20.0-change-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm-2.20.0-change-defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.20.0-change-defaults.patch	20 Sep 2007 18:31:17 -0000	1.2
+++ gdm-2.20.0-change-defaults.patch	28 Sep 2007 16:09:09 -0000	1.3
@@ -174,15 +174,6 @@
  # Normally there is a session type called 'Last' that is shown which refers to
  # the last session the user used.  If off, we will be in 'switchdesk' mode
  # where the session saving stuff is disabled in GDM
-@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
- #Use24Clock=auto
- # Use circles in the password field.  Looks kind of cool actually, but only
- # works with certain fonts.
--#UseCirclesInEntry=false
-+UseCirclesInEntry=true
- # Do not show any visible feedback in the password field. This is standard for
- # instance in console, xdm and ssh.
- #UseInvisibleInEntry=false
 @@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
  # list then provide a list that is delimited by /: to the GraphicalThemes
  # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- gdm.spec	27 Sep 2007 17:20:23 -0000	1.292
+++ gdm.spec	28 Sep 2007 16:09:09 -0000	1.293
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -59,6 +59,7 @@
 Patch38: hang.patch
 
 Patch100: gdm-2.20.0-change-defaults.patch
+Patch101: stupid-bullets.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -145,6 +146,7 @@
 %patch38 -p1 -b .hang
 
 %patch100 -p1 -b .change-defaults
+%patch101 -p1 -b .stupid-bullets
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -355,6 +357,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-7
+- Fix the stupid bullets again
+
 * Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-6
 - The previously mentioned typo didn't matter before because the
   compiled in default matched what the config file was supposed to



From fedora-extras-commits at redhat.com  Fri Sep 28 16:19:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 12:19:17 -0400
Subject: rpms/gnome-screensaver/devel stupid-bullets.patch, NONE,
	1.1 gnome-screensaver.spec, 1.168, 1.169
Message-ID: <200709281619.l8SGJHiY007989@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7956

Modified Files:
	gnome-screensaver.spec 
Added Files:
	stupid-bullets.patch 
Log Message:
fix stupid bullets


stupid-bullets.patch:

--- NEW FILE stupid-bullets.patch ---
diff -up gnome-screensaver-2.20.0/data/lock-dialog-default.glade.stupid-bullets gnome-screensaver-2.20.0/data/lock-dialog-default.glade
--- gnome-screensaver-2.20.0/data/lock-dialog-default.glade.stupid-bullets	2007-09-28 08:14:04.000000000 -0800
+++ gnome-screensaver-2.20.0/data/lock-dialog-default.glade	2007-09-28 08:14:12.000000000 -0800
@@ -178,7 +178,6 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">True</property>
 			      <accessibility>
 				<atkrelation target="auth-prompt-label" type="labelled-by"/>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-screensaver.spec	25 Sep 2007 01:40:19 -0000	1.168
+++ gnome-screensaver.spec	28 Sep 2007 16:18:44 -0000	1.169
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
+Patch5: stupid-bullets.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -73,6 +74,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch4 -p1 -b .gnome-keyring
+%patch5 -p1 -b .stupid-bullets
 
 %build
 # grr, autoreconf seems to break with intltool 0.36.0, unless
@@ -138,6 +140,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-6
+- Use small bullets in the password entry
+
 * Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
 - Fix up GConf requires (#220547)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 16:23:07 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:23:07 -0700
Subject: [pkgdb] totem: mpg has requested watchcommits
Message-ID: <200709281623.l8SGNCBT020851@bastion.fedora.phx.redhat.com>

Marco Pesenti Gritti (mpg) has requested the watchcommits acl on totem (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:23:51 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 28 Sep 2007 12:23:51 -0400
Subject: rpms/smolt/devel selinux.patch,1.1,1.2 smolt.spec,1.31,1.32
Message-ID: <200709281623.l8SGNpte008470@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8443

Modified Files:
	selinux.patch smolt.spec 
Log Message:
Fixed patch

selinux.patch:

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux.patch	28 Sep 2007 15:55:27 -0000	1.1
+++ selinux.patch	28 Sep 2007 16:23:47 -0000	1.2
@@ -1,46 +1,46 @@
---- /tmp/smolt.py	2007-09-28 10:47:24.000000000 -0500
-+++ client/smolt.py	2007-08-13 15:46:43.000000000 -0500
-@@ -196,24 +196,18 @@
+--- /tmp/smolt.py	2007-09-28 11:17:42.000000000 -0500
++++ client/smolt.py	2007-09-28 10:46:22.000000000 -0500
+@@ -196,18 +196,24 @@
              self.formfactor = hostInfo['system.formfactor']
          except:
              self.formfactor = 'Unknown'
--
++
          try:
--            import selinux
--            try:
--                if selinux.is_selinux_enabled() == 1:
--                    self.selinux_enabled = True
--                else:
--                    self.selinux_enabled = False
--            except:
--                self.selinux_enabled = False
-+            retcode = os.system('/usr/sbin/selinuxenabled')
-+            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
-+        except:
-+            self.selinux_enabled = False
-+        if self.selinux_enabled:
+-            retcode = os.system('/usr/sbin/selinuxenabled')
+-            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
+-        except:
+-            self.selinux_enabled = False
+-        if self.selinux_enabled:
++            import selinux
              try:
--                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
-+                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
+-                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
++                if selinux.is_selinux_enabled() == 1:
++                    self.selinux_enabled = True
++                else:
++                    self.selinux_enabled = False
              except:
--                self.selinux_enforce = "Unknown"
--        except ImportError:
--            self.selinux_enabled = "Not installed"
--            self.selinux_enforce = "Not Installed"
--    
-+                self.selinux_enforce = 'Disabled'
-+        else:
-+            self.selinux_enforce = 'Disabled'
+-                self.selinux_enforce = 'Disabled'
+-        else:
+-            self.selinux_enforce = 'Disabled'
++                self.selinux_enabled = False
++            try:
++                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
++            except:
++                self.selinux_enforce = "Unknown"
++        except ImportError:
++            self.selinux_enabled = "Not installed"
++            self.selinux_enforce = "Not Installed"
++    
  
  def ignoreDevice(device):
      ignore = 1
-@@ -273,8 +267,8 @@
+@@ -267,8 +273,8 @@
          except:
              raise SystemBusError, _('Could not bind to dbus.  Is dbus running?')
          
-+        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
+-        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
          try:
--            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
++            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
              all_dev_lst = mgr.GetAllDevices()
          except:
              raise SystemBusError, _('Could not connect to hal, is it running?'), _('Run "service haldaemon start" as root')


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- smolt.spec	28 Sep 2007 15:55:27 -0000	1.31
+++ smolt.spec	28 Sep 2007 16:23:47 -0000	1.32
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -183,7 +183,7 @@
 %{_bindir}/smoltGui
 
 %changelog
-* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-7
+* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-8
 - Fixed Selinux
 
 * Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6



From fedora-extras-commits at redhat.com  Fri Sep 28 16:25:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:25:23 -0700
Subject: [pkgdb] totem had acl change status
Message-ID: <200709281625.l8SGPSRG020930@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchcommits acl on totem (Fedora OLPC 2) to Approved for Marco Pesenti Gritti (mpg)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:25:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:25:35 -0700
Subject: [pkgdb] totem had acl change status
Message-ID: <200709281625.l8SGPeYV020961@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the commit acl on totem (Fedora OLPC 2) to Approved for Marco Pesenti Gritti (mpg)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:29:40 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 28 Sep 2007 12:29:40 -0400
Subject: rpms/totem/OLPC-2 totem-2.18.2-plugin-build.patch, NONE,
	1.1 totem-2.18.3-pluginmime.patch, NONE, 1.1 totem.spec, 1.108, 1.109
Message-ID: <200709281629.l8SGTeEK008732@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/totem/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698

Modified Files:
	totem.spec 
Added Files:
	totem-2.18.2-plugin-build.patch totem-2.18.3-pluginmime.patch 
Log Message:
* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-7
- Apply patches to make it build and to make it recognize wav



totem-2.18.2-plugin-build.patch:

--- NEW FILE totem-2.18.2-plugin-build.patch ---
--- configure.orig	2007-07-19 17:43:05.000000000 +0200
+++ configure	2007-07-19 17:43:43.000000000 +0200
@@ -899,13 +899,13 @@
 INTLTOOL_XGETTEXT
 ALL_LINGUAS
 PKG_CONFIG
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS
 HELP_DIR
 OMF_DIR
 DOC_USER_FORMATS
 ENABLE_SK_TRUE
 ENABLE_SK_FALSE
+HAVE_GNOME_DOC_UTILS_TRUE
+HAVE_GNOME_DOC_UTILS_FALSE
 CXX
 CXXFLAGS
 ac_ct_CXX
@@ -968,6 +968,7 @@
 MOZILLA_IDLDIR
 ENABLE_BROWSER_PLUGINS_TRUE
 ENABLE_BROWSER_PLUGINS_FALSE
+MOZILLA_EXTRA_CXXFLAGS
 LIBXPCOMGLUE_S
 ENABLE_BASIC_PLUGIN_TRUE
 ENABLE_BASIC_PLUGIN_FALSE
@@ -1032,8 +1033,6 @@
 CPPFLAGS
 CPP
 PKG_CONFIG
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS
 CXX
 CXXFLAGS
 CCC
@@ -1729,11 +1728,6 @@
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
-  GDU_MODULE_VERSION_CHECK_CFLAGS
-              C compiler flags for GDU_MODULE_VERSION_CHECK, overriding
-              pkg-config
-  GDU_MODULE_VERSION_CHECK_LIBS
-              linker flags for GDU_MODULE_VERSION_CHECK, overriding pkg-config
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
@@ -6328,6 +6322,149 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                 return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  DATADIRNAME=share
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	case $host in
+    *-*-solaris*)
+                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char bind_textdomain_codeset (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_bind_textdomain_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+
+
 
 
 
@@ -6457,126 +6594,29 @@
 
 fi
 
-if test "x$PACKAGE" != "xgnome-doc-utils"; then
-  GDU_REQUIRED_VERSION=0.3.2
-  if test -n ""; then
-    GDU_REQUIRED_VERSION=
-  fi
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GDU_MODULE_VERSION_CHECK" >&5
-echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6; }
+gdu_cv_version_required=0.3.2
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then
-        pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then
-        pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
+if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
+  gdu_cv_have_gdu=yes
 else
-  pkg_failed=yes
+  gdu_cv_have_gdu=no
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-
 
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+if test "$gdu_cv_have_gdu" = "yes"; then
+	:
 else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
-        else
-	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5
-
-	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
+	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
    { (exit 1); exit 1; }; }
-else
-	GDU_MODULE_VERSION_CHECK_CFLAGS=$pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS
-	GDU_MODULE_VERSION_CHECK_LIBS=$pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
 fi
 
 
+
 # Check whether --with-help-dir was given.
 if test "${with_help_dir+set}" = set; then
   withval=$with_help_dir;
@@ -6616,7 +6656,7 @@
   enable_scrollkeeper=yes
 fi
 
- if test "x$enable_scrollkeeper" = "xyes"; then
+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
   ENABLE_SK_TRUE=
   ENABLE_SK_FALSE='#'
 else
@@ -6625,6 +6665,15 @@
 fi
 
 
+ if test "$gdu_cv_have_gdu" = "yes"; then
+  HAVE_GNOME_DOC_UTILS_TRUE=
+  HAVE_GNOME_DOC_UTILS_FALSE='#'
+else
+  HAVE_GNOME_DOC_UTILS_TRUE='#'
+  HAVE_GNOME_DOC_UTILS_FALSE=
+fi
+
+
 
 
 ac_ext=cpp
@@ -7651,7 +7700,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7654 "configure"' > conftest.$ac_ext
+  echo '#line 7703 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9436,11 +9485,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9439: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9443: \$? = $ac_status" >&5
+   echo "$as_me:9492: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9704,11 +9753,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9707: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9711: \$? = $ac_status" >&5
+   echo "$as_me:9760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9808,11 +9857,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9811: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9815: \$? = $ac_status" >&5
+   echo "$as_me:9864: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11273,7 +11322,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 11276 "configure"' > conftest.$ac_ext
+    echo '#line 11325 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11292,7 +11341,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -12137,7 +12186,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12140 "configure"
+#line 12189 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12237,7 +12286,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12240 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12568,9 +12617,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -12704,11 +12750,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -12720,7 +12766,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -12800,7 +12846,7 @@
 link_all_deplibs=$link_all_deplibs
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -14576,11 +14622,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14579: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14583: \$? = $ac_status" >&5
+   echo "$as_me:14629: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14680,11 +14726,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14683: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14687: \$? = $ac_status" >&5
+   echo "$as_me:14733: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15216,7 +15262,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15219 "configure"' > conftest.$ac_ext
+    echo '#line 15265 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15235,7 +15281,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -15620,9 +15666,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_CXX
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -15756,11 +15799,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -15772,7 +15815,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -15852,7 +15895,7 @@
 link_all_deplibs=$link_all_deplibs_CXX
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -16274,11 +16317,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16277: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16320: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16281: \$? = $ac_status" >&5
+   echo "$as_me:16324: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16378,11 +16421,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16381: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16424: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16385: \$? = $ac_status" >&5
+   echo "$as_me:16428: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17823,7 +17866,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17826 "configure"' > conftest.$ac_ext
+    echo '#line 17869 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17842,7 +17885,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -18227,9 +18270,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18363,11 +18403,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18379,7 +18419,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18459,7 +18499,7 @@
 link_all_deplibs=$link_all_deplibs_F77
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18600,11 +18640,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18603: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18643: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18607: \$? = $ac_status" >&5
+   echo "$as_me:18647: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18868,11 +18908,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18871: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18875: \$? = $ac_status" >&5
+   echo "$as_me:18915: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18972,11 +19012,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18975: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19015: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18979: \$? = $ac_status" >&5
+   echo "$as_me:19019: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20437,7 +20477,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 20440 "configure"' > conftest.$ac_ext
+    echo '#line 20480 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -20456,7 +20496,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -20841,9 +20881,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -20977,11 +21014,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -20993,7 +21030,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -21073,7 +21110,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -21324,9 +21361,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -21460,11 +21494,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -21476,7 +21510,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -21556,7 +21590,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23410,6 +23444,101 @@
 fi
 
 
+# Checks for -fshort-wchar compiler variable, and adds it to
+# MOZILLA_XPCOM_CFLAGS if found
+
+# **************************************************************
+# This is really gcc-only
+# Do this test using CXX only since some versions of gcc
+# 2.95-2.97 have a signed wchar_t in c++ only and some versions
+# only have short-wchar support for c++.
+# **************************************************************
+
+MOZILLA_EXTRA_CXXFLAGS=
+
+if test "$enable_browser_plugins" = "yes" ; then
+	ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+	_SAVE_CXXFLAGS=$CXXFLAGS
+	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
+
+	{ echo "$as_me:$LINENO: checking for compiler -fshort-wchar option" >&5
+echo $ECHO_N "checking for compiler -fshort-wchar option... $ECHO_C" >&6; }
+if test "${gecko_cv_have_usable_wchar_option+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+	                  int main () {
+	                    return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ;
+	                  }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gecko_cv_have_usable_wchar_option="yes"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gecko_cv_have_usable_wchar_option="no"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $gecko_cv_have_usable_wchar_option" >&5
+echo "${ECHO_T}$gecko_cv_have_usable_wchar_option" >&6; }
+
+	CXXFLAGS="$_SAVE_CXXFLAGS"
+
+	ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+	if test "$gecko_cv_have_usable_wchar_option" = "yes"; then
+	        MOZILLA_EXTRA_CXXFLAGS="-fshort-wchar"
+	fi
+fi
+
+
+
 # check for libxpcomglue_s
 
 LIBXPCOMGLUE_S=
@@ -23429,7 +23558,7 @@
 	CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
 	CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
 	LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
-	LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
+	LDFLAGS="$LDFLAGS $MOZILLA_EXTRA_CXXFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
 
 	{ echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5
 echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; }
@@ -23497,7 +23626,7 @@
 
 
 	if test "$have_libxpcomglue_s" = "yes"; then
-		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
+		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
 	else
 		{ echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5
 echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;}
@@ -23587,7 +23716,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 	__SAVE_CPPFLAGS=$CPPFLAGS
-	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
+	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS $MOZILLA_EXTRA_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
 
 
 
@@ -25929,6 +26058,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -26774,13 +26910,13 @@
 INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
 ALL_LINGUAS!$ALL_LINGUAS$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
-GDU_MODULE_VERSION_CHECK_CFLAGS!$GDU_MODULE_VERSION_CHECK_CFLAGS$ac_delim
-GDU_MODULE_VERSION_CHECK_LIBS!$GDU_MODULE_VERSION_CHECK_LIBS$ac_delim
 HELP_DIR!$HELP_DIR$ac_delim
 OMF_DIR!$OMF_DIR$ac_delim
 DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
 ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
 ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
@@ -26884,6 +27020,7 @@
 MOZILLA_IDLDIR!$MOZILLA_IDLDIR$ac_delim
 ENABLE_BROWSER_PLUGINS_TRUE!$ENABLE_BROWSER_PLUGINS_TRUE$ac_delim
 ENABLE_BROWSER_PLUGINS_FALSE!$ENABLE_BROWSER_PLUGINS_FALSE$ac_delim
+MOZILLA_EXTRA_CXXFLAGS!$MOZILLA_EXTRA_CXXFLAGS$ac_delim
 LIBXPCOMGLUE_S!$LIBXPCOMGLUE_S$ac_delim
 ENABLE_BASIC_PLUGIN_TRUE!$ENABLE_BASIC_PLUGIN_TRUE$ac_delim
 ENABLE_BASIC_PLUGIN_FALSE!$ENABLE_BASIC_PLUGIN_FALSE$ac_delim
@@ -26939,7 +27076,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- browser-plugin/Makefile.in.orig	2007-07-19 17:51:04.000000000 +0200
+++ browser-plugin/Makefile.in	2007-07-19 17:51:19.000000000 +0200
@@ -295,8 +295,6 @@
 GCONFTOOL = @GCONFTOOL@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -359,6 +357,7 @@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MOZILLA = @MOZILLA@
+MOZILLA_EXTRA_CXXFLAGS = @MOZILLA_EXTRA_CXXFLAGS@
 MOZILLA_IDLDIR = @MOZILLA_IDLDIR@
 MOZILLA_INCLUDE_ROOT = @MOZILLA_INCLUDE_ROOT@
 MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
@@ -580,6 +579,7 @@
 
 @ENABLE_BASIC_PLUGIN_TRUE at libtotem_basic_plugin_la_CXXFLAGS = \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -640,6 +640,7 @@
 
 @ENABLE_GMP_PLUGIN_TRUE at libtotem_gmp_plugin_la_CXXFLAGS = \
 @ENABLE_GMP_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_GMP_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -694,6 +695,7 @@
 
 @ENABLE_COMPLEX_PLUGIN_TRUE at libtotem_complex_plugin_la_CXXFLAGS = \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -748,6 +750,7 @@
 
 @ENABLE_NARROWSPACE_PLUGIN_TRUE at libtotem_narrowspace_plugin_la_CXXFLAGS = \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -802,6 +805,7 @@
 
 @ENABLE_MULLY_PLUGIN_TRUE at libtotem_mully_plugin_la_CXXFLAGS = \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\

totem-2.18.3-pluginmime.patch:

--- NEW FILE totem-2.18.3-pluginmime.patch ---
--- browser-plugin/totemBasicPlugin.cpp.old	2007-09-28 16:04:07.000000000 +0200
+++ browser-plugin/totemBasicPlugin.cpp	2007-09-28 16:04:30.000000000 +0200
@@ -52,9 +52,9 @@
 	{ "application/ogg", "ogg", NULL, FALSE },
 	{ "video/mpeg", "mpg, mpeg, mpe", NULL, FALSE },
 	{ "audio/wav", "wav", NULL, FALSE },
-	{ "audio/x-wav", "wav", NULL, TRUE },
+	{ "audio/x-wav", "wav", NULL, FALSE },
 	{ "audio/mpeg", "mp3", NULL, FALSE },
-	{ "audio/x-mpeg", "mp3", NULL, TRUE }
+	{ "audio/x-mpeg", "mp3", NULL, FALSE }
 };
 
 totemScriptablePlugin::totemScriptablePlugin (totemPlugin *aPlugin)


Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- totem.spec	6 Jul 2007 17:24:53 -0000	1.108
+++ totem.spec	28 Sep 2007 16:29:07 -0000	1.109
@@ -5,13 +5,15 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 2.18.2
-Release: 5%{?dist} 
+Release: 7
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
 Source0: http://download.gnome.org/sources/totem/2.18/totem-%{version}.tar.bz2
 Patch0: totem-gtk-init-gst.patch
 Patch1: totem-2.18.1-remove-libsn.patch
+Patch2: totem-2.18.2-plugin-build.patch
+Patch3: totem-2.18.3-pluginmime.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -85,6 +87,8 @@
 %setup -q
 %patch0 -p1 -b .gtk-init-gst
 %patch1 -p1 -b .remove-libsn
+%patch2 -p0 -b .plugin-build
+%patch3 -p0 -b .pluginmime
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -188,6 +192,12 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-7
+- Apply patches to make it build and to make it recognize wav
+
+* Thu Jul 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-6.marco
+- Add a patch to make it build with 1.9 alpha 6
+
 * Fri Jul 06 2007 John (J5) Palmieri <johnp at redhat.com> - 2.18.2-5
 - Bump and recompile
 



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:29 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281646.l8SGkYCn021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:43 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281646.l8SGkYCq021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:49 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281646.l8SGkYCt021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:27 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 12:47:27 -0400
Subject: comps comps-f8.xml.in,1.132,1.133
Message-ID: <200709281647.l8SGlR7G009872@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417

Modified Files:
	comps-f8.xml.in 
Log Message:
remove i810switch for F8


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- comps-f8.xml.in	28 Sep 2007 12:03:31 -0000	1.132
+++ comps-f8.xml.in	28 Sep 2007 16:46:57 -0000	1.133
@@ -2014,7 +2014,6 @@
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
-      <packagereq type="optional">i810switch</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:47 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281647.l8SGlquD021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:48 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:48 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281647.l8SGlquG021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:51 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281647.l8SGlquJ021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:02 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281648.l8SGm7XW021541@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:06 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:06 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281648.l8SGm7XZ021541@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:04 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281648.l8SGm9ZZ021547@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:19:35 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 13:19:35 -0400
Subject: rpms/gdm/devel gdm-2.20.0-fix-savedie.patch, NONE, 1.1 gdm.spec,
	1.293, 1.294
Message-ID: <200709281719.l8SHJZb7018937@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18896

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.0-fix-savedie.patch 
Log Message:
- Another crack at 240853


gdm-2.20.0-fix-savedie.patch:

--- NEW FILE gdm-2.20.0-fix-savedie.patch ---
diff -up gdm-2.20.0/gui/gdmlogin.c.fix-savedie gdm-2.20.0/gui/gdmlogin.c
--- gdm-2.20.0/gui/gdmlogin.c.fix-savedie	2007-09-28 13:16:05.000000000 -0400
+++ gdm-2.20.0/gui/gdmlogin.c	2007-09-28 13:16:09.000000000 -0400
@@ -1796,6 +1796,9 @@ process_operation (guchar       op_code,
 	gdm_kill_thingies ();
 	gdk_flush ();
 
+	printf ("%c\n", STX);
+	fflush (stdout);
+
 	_exit (EXIT_SUCCESS);
 
     case GDM_QUERY_CAPSLOCK:
diff -up gdm-2.20.0/gui/greeter/greeter.c.fix-savedie gdm-2.20.0/gui/greeter/greeter.c
--- gdm-2.20.0/gui/greeter/greeter.c.fix-savedie	2007-09-28 13:15:48.000000000 -0400
+++ gdm-2.20.0/gui/greeter/greeter.c	2007-09-28 13:15:53.000000000 -0400
@@ -574,6 +574,8 @@ process_operation (guchar       op_code,
 	gdm_wm_save_wm_order ();
 
 	gdk_flush ();
+	printf ("%c\n", STX);
+	fflush (stdout);
 
 	_exit (EXIT_SUCCESS);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- gdm.spec	28 Sep 2007 16:09:09 -0000	1.293
+++ gdm.spec	28 Sep 2007 17:19:01 -0000	1.294
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -58,6 +58,9 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240853 
+Patch39: gdm-2.20.0-fix-savedie.patch
+
 Patch100: gdm-2.20.0-change-defaults.patch
 Patch101: stupid-bullets.patch
 
@@ -144,6 +147,7 @@
 %patch35 -p1 -b .gdmsetup-path
 %patch37 -p1 -b .selinux
 %patch38 -p1 -b .hang
+%patch39 -p1 -b .fix-savedie
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
@@ -357,6 +361,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-8
+- Another crack at 240853
+
 * Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-7
 - Fix the stupid bullets again
 



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:02 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sT022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:02 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sW022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:03 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sZ022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:18 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:18 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMO022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:21 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMR022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:20 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAg022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:32 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAj022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:33 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:33 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMU022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:35 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAm022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:54:50 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 13:54:50 -0400
Subject: rpms/irqbalance/devel irqbalance-0.55-cputree-parse.patch, NONE,
	1.1 irqbalance-pie.patch, NONE, 1.1 irqbalance.spec, 1.44, 1.45
Message-ID: <200709281754.l8SHsoC3020364@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20339

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-0.55-cputree-parse.patch irqbalance-pie.patch 
Log Message:
Resolves: bz310821

irqbalance-0.55-cputree-parse.patch:

--- NEW FILE irqbalance-0.55-cputree-parse.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/cputree.c.orig irqbalance-0.55/irqbalance-0.55/cputree.c
--- irqbalance-0.55/irqbalance-0.55/cputree.c.orig	2006-12-10 15:04:59.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/cputree.c	2007-09-28 12:43:35.000000000 -0400
@@ -26,6 +26,8 @@
 
 #define _GNU_SOURCE
 
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -131,34 +133,30 @@ static void fill_cache_domain(void)
 }
 
 
-static void do_one_cpu(char *path)
+static void do_one_cpu(int dfd, char *d_name)
 {
 	struct cpu_core *cpu;
 	FILE *file;
 	char new_path[PATH_MAX];
 
 	/* skip offline cpus */
-	snprintf(new_path, PATH_MAX, "%s/online", path);
-	file = fopen(new_path, "r");
-	if (file) {
-		char *line = NULL;
-		size_t size = 0;
-		if (getline(&line, &size, file)==0)
+	snprintf(new_path, PATH_MAX, "%s/online", d_name);
+	int fd = openat(dfd, new_path, O_RDONLY);
+	if (fd != -1) {
+		char buf[1];
+		ssize_t n = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (n != sizeof(buf))
 			return;
-		fclose(file);
-		if (line && line[0]=='0') {
-			free(line);
+		if (buf[0] == '0')
 			return;
-		}
-		free(line);
 	}
 
-	cpu = malloc(sizeof(struct cpu_core));
+	cpu = calloc(1, sizeof(struct cpu_core));
 	if (!cpu)
 		return;
-	memset(cpu, 0, sizeof(struct cpu_core));
 
-	cpu->number = strtoul(&path[27], NULL, 10);
+	cpu->number = strtoul(&d_name[3], NULL, 10);
 	
 	cpu_set(cpu->number, cpu->mask);
 
@@ -170,43 +168,45 @@ static void do_one_cpu(char *path)
 		return;
 	}
 
+	char *line = NULL;
+	size_t size = 0;
 
 	/* try to read the package mask; if it doesn't exist assume solitary */
-	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	cpu_set(cpu->number, cpu->package_mask);
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->package_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
 
 	/* try to read the cache mask; if it doesn't exist assume solitary */
 	/* We want the deepest cache level available so try index1 first, then index2 */
 	cpu_set(cpu->number, cpu->cache_mask);
-	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
-	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	} else if (fd != -1)
+		close(fd);
+
+	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
+
+	free(line);
 
 	/* 
 	   blank out the banned cpus from the various masks so that interrupts
@@ -311,18 +311,19 @@ void parse_cpu_tree(void)
 {
 	DIR *dir;
 	struct dirent *entry;
+	int dfd;
 
 	cpus_complement(unbanned_cpus, banned_cpus);
 
 	dir = opendir("/sys/devices/system/cpu");
 	if (!dir)
 		return;
+	dfd = dirfd(dir);
 	do {
 		entry = readdir(dir);
-                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-			char new_path[PATH_MAX];
-			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
-			do_one_cpu(new_path);
+                if (entry && strlen(entry->d_name)>3 && memcmp(entry->d_name,"cpu",3) == 0
+		    && isdigit(entry->d_name[3])) {
+			do_one_cpu(dfd, entry->d_name);
 		}
 	} while (entry);
 	closedir(dir);  

irqbalance-pie.patch:

--- NEW FILE irqbalance-pie.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
--- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 13:35:46.000000000 -0400
@@ -5,7 +5,7 @@ all: irqbalance
 LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
 
 irqbalance: .depend $(LIBS)
-	gcc  -g -O2 -D_FORTIFY_SOURCE=2 -Wall  `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
+	gcc  -g -D_FORTIFY_SOURCE=2 -Wall -Os -Wl,-z,relro,-z,now -pie -fpie `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
 
 clean:
 	rm -f irqbalance *~ *.o .depend


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- irqbalance.spec	29 Aug 2007 05:10:52 -0000	1.44
+++ irqbalance.spec	28 Sep 2007 17:54:17 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        0.55 
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		2	
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -17,6 +17,9 @@
 BuildRequires:	glib2-devel pkgconfig imake
 Requires:	glib2
 
+Patch0: irqbalance-pie.patch
+Patch1: irqbalance-0.55-cputree-parse.patch
+
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
@@ -24,6 +27,9 @@
 %prep
 %setup -q -c -a 0
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,6 +76,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Neil Horman <nhorman at redhat.com> - 2:0.55-5
+- Install pie patch
+- Grab Ulis cpuparse cleanup (bz 310821)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2:0.55-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 18:09:25 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 14:09:25 -0400
Subject: rpms/gdm/devel gdm.spec,1.294,1.295
Message-ID: <200709281809.l8SI9PoK028321@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28284

Modified Files:
	gdm.spec 
Log Message:
update bug link



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- gdm.spec	28 Sep 2007 17:19:01 -0000	1.294
+++ gdm.spec	28 Sep 2007 18:08:52 -0000	1.295
@@ -58,7 +58,7 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240853 
+# http://bugzilla.gnome.org/show_bug.cgi?id=473480
 Patch39: gdm-2.20.0-fix-savedie.patch
 
 Patch100: gdm-2.20.0-change-defaults.patch



From fedora-extras-commits at redhat.com  Fri Sep 28 18:35:44 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 14:35:44 -0400
Subject: rpms/irqbalance/devel irqbalance-pie.patch, 1.1, 1.2 irqbalance.spec,
	1.45, 1.46
Message-ID: <200709281835.l8SIZibX029381@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358

Modified Files:
	irqbalance-pie.patch irqbalance.spec 
Log Message:
updating pie patch

irqbalance-pie.patch:

Index: irqbalance-pie.patch
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance-pie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- irqbalance-pie.patch	28 Sep 2007 17:54:17 -0000	1.1
+++ irqbalance-pie.patch	28 Sep 2007 18:35:42 -0000	1.2
@@ -1,7 +1,12 @@
 diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
 --- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
-+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 13:35:46.000000000 -0400
-@@ -5,7 +5,7 @@ all: irqbalance
++++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 14:10:01.000000000 -0400
+@@ -1,11 +1,11 @@
+-CFLAGS+=-g -Os -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
++CFLAGS+=-g -Os -Os -pie -fpie -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
+ 
+ all: irqbalance
+ 
  LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
  
  irqbalance: .depend $(LIBS)


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- irqbalance.spec	28 Sep 2007 17:54:17 -0000	1.45
+++ irqbalance.spec	28 Sep 2007 18:35:42 -0000	1.46
@@ -27,7 +27,7 @@
 %prep
 %setup -q -c -a 0
 
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep 28 18:59:46 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 14:59:46 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.22,1.23 sources,1.16,1.17
Message-ID: <200709281859.l8SIxkql030867@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30803

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mugshot.spec	20 Sep 2007 21:37:26 -0000	1.22
+++ mugshot.spec	28 Sep 2007 18:59:14 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.54
+Version:        1.1.55
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 1.1.55-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Sep 2007 21:37:26 -0000	1.16
+++ sources	28 Sep 2007 18:59:14 -0000	1.17
@@ -1 +1 @@
-fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz
+8281a8cbe1ebc7501adaf32f5790b900  mugshot-1.1.55.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 18:59:55 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 14:59:55 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.20,1.21 sources,1.16,1.17
Message-ID: <200709281859.l8SIxtmK030905@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bigboard.spec	14 Sep 2007 21:09:31 -0000	1.20
+++ bigboard.spec	28 Sep 2007 18:59:22 -0000	1.21
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.16
+Version:        0.5.19
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -28,6 +28,7 @@
 BuildRequires:	pygtk2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:	gnome-keyring-devel
 BuildRequires:  mugshot-devel >= 1.1.52
 
@@ -93,6 +94,16 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.5.19-1
+- new upstream
+
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
+- new upstream
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
+- new upstream
+- add br
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Sep 2007 21:09:31 -0000	1.16
+++ sources	28 Sep 2007 18:59:22 -0000	1.17
@@ -1 +1 @@
-43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz
+e162eaefa748b62539282828896ed8b2  bigboard-0.5.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 19:00:10 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 15:00:10 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.7, 1.8 sources, 1.7,
	1.8
Message-ID: <200709281900.l8SJ0Aat030956@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30847

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- online-desktop.spec	20 Sep 2007 21:57:32 -0000	1.7
+++ online-desktop.spec	28 Sep 2007 18:59:38 -0000	1.8
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.15
+Version:        0.2.17
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -15,7 +15,6 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
-Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -187,6 +186,12 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.2.17-1
+- new upstream
+
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
 - dbus service


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Sep 2007 21:57:32 -0000	1.7
+++ sources	28 Sep 2007 18:59:38 -0000	1.8
@@ -1 +1 @@
-97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz
+a1a052200e2c422053da2fdd0dfda2e1  online-desktop-0.2.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 19:04:06 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 15:04:06 -0400
Subject: rpms/irqbalance/F-7 irqbalance-0.55-cputree-parse.patch, NONE,
	1.1 irqbalance-pie.patch, NONE, 1.1 irqbalance.spec, 1.42, 1.43
Message-ID: <200709281904.l8SJ4647004773@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4746

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-0.55-cputree-parse.patch irqbalance-pie.patch 
Log Message:
ulis cputree parse fix

irqbalance-0.55-cputree-parse.patch:

--- NEW FILE irqbalance-0.55-cputree-parse.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/cputree.c.orig irqbalance-0.55/irqbalance-0.55/cputree.c
--- irqbalance-0.55/irqbalance-0.55/cputree.c.orig	2006-12-10 15:04:59.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/cputree.c	2007-09-28 12:43:35.000000000 -0400
@@ -26,6 +26,8 @@
 
 #define _GNU_SOURCE
 
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -131,34 +133,30 @@ static void fill_cache_domain(void)
 }
 
 
-static void do_one_cpu(char *path)
+static void do_one_cpu(int dfd, char *d_name)
 {
 	struct cpu_core *cpu;
 	FILE *file;
 	char new_path[PATH_MAX];
 
 	/* skip offline cpus */
-	snprintf(new_path, PATH_MAX, "%s/online", path);
-	file = fopen(new_path, "r");
-	if (file) {
-		char *line = NULL;
-		size_t size = 0;
-		if (getline(&line, &size, file)==0)
+	snprintf(new_path, PATH_MAX, "%s/online", d_name);
+	int fd = openat(dfd, new_path, O_RDONLY);
+	if (fd != -1) {
+		char buf[1];
+		ssize_t n = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (n != sizeof(buf))
 			return;
-		fclose(file);
-		if (line && line[0]=='0') {
-			free(line);
+		if (buf[0] == '0')
 			return;
-		}
-		free(line);
 	}
 
-	cpu = malloc(sizeof(struct cpu_core));
+	cpu = calloc(1, sizeof(struct cpu_core));
 	if (!cpu)
 		return;
-	memset(cpu, 0, sizeof(struct cpu_core));
 
-	cpu->number = strtoul(&path[27], NULL, 10);
+	cpu->number = strtoul(&d_name[3], NULL, 10);
 	
 	cpu_set(cpu->number, cpu->mask);
 
@@ -170,43 +168,45 @@ static void do_one_cpu(char *path)
 		return;
 	}
 
+	char *line = NULL;
+	size_t size = 0;
 
 	/* try to read the package mask; if it doesn't exist assume solitary */
-	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	cpu_set(cpu->number, cpu->package_mask);
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->package_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
 
 	/* try to read the cache mask; if it doesn't exist assume solitary */
 	/* We want the deepest cache level available so try index1 first, then index2 */
 	cpu_set(cpu->number, cpu->cache_mask);
-	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
-	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	} else if (fd != -1)
+		close(fd);
+
+	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
+
+	free(line);
 
 	/* 
 	   blank out the banned cpus from the various masks so that interrupts
@@ -311,18 +311,19 @@ void parse_cpu_tree(void)
 {
 	DIR *dir;
 	struct dirent *entry;
+	int dfd;
 
 	cpus_complement(unbanned_cpus, banned_cpus);
 
 	dir = opendir("/sys/devices/system/cpu");
 	if (!dir)
 		return;
+	dfd = dirfd(dir);
 	do {
 		entry = readdir(dir);
-                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-			char new_path[PATH_MAX];
-			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
-			do_one_cpu(new_path);
+                if (entry && strlen(entry->d_name)>3 && memcmp(entry->d_name,"cpu",3) == 0
+		    && isdigit(entry->d_name[3])) {
+			do_one_cpu(dfd, entry->d_name);
 		}
 	} while (entry);
 	closedir(dir);  

irqbalance-pie.patch:

--- NEW FILE irqbalance-pie.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
--- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 14:10:01.000000000 -0400
@@ -1,11 +1,11 @@
-CFLAGS+=-g -Os -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
+CFLAGS+=-g -Os -Os -pie -fpie -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
 
 all: irqbalance
 
 LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
 
 irqbalance: .depend $(LIBS)
-	gcc  -g -O2 -D_FORTIFY_SOURCE=2 -Wall  `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
+	gcc  -g -D_FORTIFY_SOURCE=2 -Wall -Os -Wl,-z,relro,-z,now -pie -fpie `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
 
 clean:
 	rm -f irqbalance *~ *.o .depend


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/F-7/irqbalance.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- irqbalance.spec	12 Dec 2006 16:43:01 -0000	1.42
+++ irqbalance.spec	28 Sep 2007 19:03:34 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        0.55 
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		2	
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -17,12 +17,17 @@
 BuildRequires:	glib2-devel pkgconfig imake
 Requires:	glib2
 
+Patch0: irqbalance-pie.patch
+Patch1: irqbalance-0.55-cputree-parse.patch
+
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
 
 %prep
 %setup -q -c -a 0
+%patch0 -p1
+%patch1 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +75,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Neil Horman <nhorman at redhat.com> - 0.55-3
+- Installed pie build patch
+- Grabbed Uli's cputree parsing fixes
+
 * Tue Dec 12 2006 Neil Horman <nhorman at redhat.com> - 0.55-2
 - Fixing typos in spec file (bz 219301)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:17:39 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:17:39 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec,1.9,1.10
Message-ID: <200709282017.l8SKHdu3013922@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13791

Modified Files:
	gnome-python2-extras.spec 
Log Message:

* Fri Sep 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-6.fc8
- Add a gnome-python2-gdl subpackage (RH bug #303141).



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-python2-extras.spec	22 Aug 2007 15:00:20 -0000	1.9
+++ gnome-python2-extras.spec	28 Sep 2007 20:17:04 -0000	1.10
@@ -8,12 +8,13 @@
 %define firefox_version 2.0.0.6
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
+%define anjuta_gdl_version 0.7.1
 
 ### Abstract ###
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -34,6 +35,7 @@
 
 ### Build Dependencies ###
 
+BuildRequires: anjuta-gdl >= %{anjuta_gdl_version}
 BuildRequires: firefox-devel = %{firefox_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
@@ -50,10 +52,20 @@
 The gnome-python-extra package contains the source packages for additional 
 Python bindings for GNOME. It should be used together with gnome-python.
 
-%package -n gnome-python2-gtkhtml2
+%package -n gnome-python2-gdl
+Summary: Python bindings for the GNOME Development Library
+Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: anjuta-gdl >= %{anjuta_gdl_version}
+
+%description -n gnome-python2-gdl
+This module contains a wrapper that allows the use of the GNOME Development
+Library (gdl) via Python.
+
+%package -n gnome-python2-gtkhtml2
 Summary: Python bindings for interacting with gtkhtml2
 Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
 Requires: gtkhtml2 >= %{gtkhtml2_version}
 Obsoletes: pygnome-gtkhtml
 
@@ -132,6 +144,10 @@
 %{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
 %{_datadir}/pygtk
 
+%files -n gnome-python2-gdl
+%defattr(-,root,root,-)
+%{python_sitearch}/gtk-2.0/gdl.so
+
 %files -n gnome-python2-gtkhtml2
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkhtml*
@@ -164,6 +180,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Fri Sep 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-6.fc8
+- Add a gnome-python2-gdl subpackage (RH bug #303141).
+
 * Wed Aug 22 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-5.fc8
 - Mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:27:40 2007
From: fedora-extras-commits at redhat.com (Fernando Nasser (fnasser))
Date: Fri, 28 Sep 2007 16:27:40 -0400
Subject: rpms/icu4j/devel icu4j-updatetimestamp.patch, NONE, 1.1 icu4j.spec, 
	1.5, 1.6
Message-ID: <200709282027.l8SKRe8d014648@cvs-int.fedora.redhat.com>

Author: fnasser

Update of /cvs/extras/rpms/icu4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14614

Modified Files:
	icu4j.spec 
Added Files:
	icu4j-updatetimestamp.patch 
Log Message:
Update timestamp to match Eclipse 3.3.1 release.

icu4j-updatetimestamp.patch:

--- NEW FILE icu4j-updatetimestamp.patch ---
# release-3-6-1-eclipse331-20070906
--- icu4j-3.6.1/build.properties	2007-04-27 11:42:26.000000000 -0400
+++ icu4j-3.6.1/build.properties	2007-09-06 15:18:03.000000000 -0400
@@ -14,4 +14,4 @@
 copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others.  All Rights Reserved.
 corp=IBM Corporation
 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.6.1.v20070417
+icu4j.eclipse.build.version.string=3.6.1.v20070906



Index: icu4j.spec
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icu4j.spec	29 Aug 2007 18:52:59 -0000	1.5
+++ icu4j.spec	28 Sep 2007 20:27:07 -0000	1.6
@@ -48,7 +48,7 @@
 
 Name:           icu4j
 Version:        3.6.1
-Release:        1jpp.3%{?dist}
+Release:        1jpp.4%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT style 
@@ -57,6 +57,7 @@
 Source0:	http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-disable-javadocs.patch
+Patch2:         %{name}-updatetimestamp.patch
 BuildRequires:  ant
 BuildRequires:  java-javadoc
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -112,6 +113,7 @@
 %setup -q -c
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 %{__sed} -i 's/\r//' license.html
 %{__sed} -i 's/\r//' APIChangeReport.html
@@ -231,6 +233,9 @@
 %endif
 
 %changelog
+* Fri Sep 28 2007 Andrew Overholt <overholt at redhat.com> 3.6.1-1jpp.4
+- Update timestamp to match Eclipse 3.3.1 release.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.6.1-1jpp.3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:28:21 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:28:21 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.10,
	1.11
Message-ID: <200709282028.l8SKSL1g014721@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14647

Modified Files:
	gnome-python2-extras.spec 
Log Message:
No anjuta-gdl on ppc64, apparently.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python2-extras.spec	28 Sep 2007 20:17:04 -0000	1.10
+++ gnome-python2-extras.spec	28 Sep 2007 20:27:48 -0000	1.11
@@ -57,6 +57,7 @@
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: anjuta-gdl >= %{anjuta_gdl_version}
+ExcludeArch: ppc64
 
 %description -n gnome-python2-gdl
 This module contains a wrapper that allows the use of the GNOME Development



From fedora-extras-commits at redhat.com  Fri Sep 28 20:33:49 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 28 Sep 2007 16:33:49 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15145

Modified Files:
	java-1.7.0-icedtea.spec sources 
Log Message:
* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
- Fixed testing. Output is stored in a file and passes/debug info is not shown.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
+++ java-1.7.0-icedtea.spec	28 Sep 2007 20:33:17 -0000	1.13
@@ -113,6 +113,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  mauve_output
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -300,7 +301,7 @@
   make
   echo ====================MAUVE TESTING========================
   $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-    -showpasses -debug -timeout 30000 2>&1 || :
+	-timeout 30000 2>&1 | tee %{SOURCE8}
   echo ====================MAUVE TESTING END====================
 popd
 
@@ -732,6 +733,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+- Fixed testing. Output is stored in a file and passes/debug info is not shown.
+
 * Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
 - Apply patch to use system tzdata.
 - Require tzdata-java.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2007 19:19:37 -0000	1.7
+++ sources	28 Sep 2007 20:33:17 -0000	1.8
@@ -1,5 +1,4 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
-d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 20:35:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 28 Sep 2007 16:35:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-setup-e820-workaround.patch, NONE, 
	1.1 kernel.spec, 1.196, 1.197
Message-ID: <200709282035.l8SKZKIG015291@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15259

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-setup-e820-workaround.patch 
Log Message:
* Fri Sep 28 2007 Chuck Ebbert <cebbert at redhat.com>
- fix X86 memory detection (bz #311491)


linux-2.6-x86-setup-e820-workaround.patch:

--- NEW FILE linux-2.6-x86-setup-e820-workaround.patch ---
commit 4ee5b10abeb2b5581be10d3022694cd19084e9b0
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Thu Sep 27 17:17:12 2007 -0700

    [x86 setup] Correct the SMAP check for INT 0x15, AX=0xe820
    
    The e820 probe code was checking %edx, not %eax, for the SMAP
    signature on return.  This worked on *almost* all systems, since %edx
    still contained SMAP from the call on entry, but on a handful of
    systems it failed -- plus, we would have missed real mismatches.
    
    The error output is "=d" to make sure gcc knows %edx is clobbered
    here.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index bccaa1c..3783539 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -28,11 +28,14 @@ static int detect_memory_e820(void)
 
 	do {
 		size = sizeof(struct e820entry);
-		id = SMAP;
+
+		/* Important: %edx is clobbered by some BIOSes,
+		   so it must be either used for the error output
+		   or explicitly marked clobbered. */
 		asm("int $0x15; setc %0"
-		    : "=am" (err), "+b" (next), "+d" (id), "+c" (size),
+		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
 		      "=m" (*desc)
-		    : "D" (desc), "a" (0xe820));
+		    : "D" (desc), "d" (SMAP), "a" (0xe820));
 
 		/* Some BIOSes stop returning SMAP in the middle of
 		   the search loop.  We don't know exactly how the BIOS


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kernel.spec	28 Sep 2007 02:36:06 -0000	1.196
+++ kernel.spec	28 Sep 2007 20:34:48 -0000	1.197
@@ -581,6 +581,7 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
+Patch77: linux-2.6-x86-setup-e820-workaround.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -1020,6 +1021,8 @@
 ApplyPatch linux-2.6-x86-debug-boot.patch
 # shorter i386 oops reports (scheduled for 2.6.24)
 ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
+# fix e820 detection
+ApplyPatch linux-2.6-x86-setup-e820-workaround.patch
 
 #
 # PowerPC
@@ -1814,6 +1817,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix X86 memory detection (bz #311491)
+
 * Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
 - Add i965 drm patch to fix vblank interrupts - should be upstream soon
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:36:09 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 28 Sep 2007 16:36:09 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200709282036.l8SKa9nj015342@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15295

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded mauve_output log




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Sep 2007 19:19:37 -0000	1.8
+++ .cvsignore	28 Sep 2007 20:35:36 -0000	1.9
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
+mauve_output


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Sep 2007 20:33:17 -0000	1.8
+++ sources	28 Sep 2007 20:35:36 -0000	1.9
@@ -1,4 +1,6 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
+d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+c78b32f88b61b3645da34179fbb5ece0  mauve_output



From fedora-extras-commits at redhat.com  Fri Sep 28 20:37:37 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:37:37 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.11,
	1.12
Message-ID: <200709282037.l8SKbbpG015379@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Third try's a charm.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-python2-extras.spec	28 Sep 2007 20:27:48 -0000	1.11
+++ gnome-python2-extras.spec	28 Sep 2007 20:37:05 -0000	1.12
@@ -35,7 +35,7 @@
 
 ### Build Dependencies ###
 
-BuildRequires: anjuta-gdl >= %{anjuta_gdl_version}
+BuildRequires: anjuta-gdl-devel >= %{anjuta_gdl_version}
 BuildRequires: firefox-devel = %{firefox_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}



From fedora-extras-commits at redhat.com  Fri Sep 28 21:00:31 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 17:00:31 -0400
Subject: rpms/i810switch/FC-6 i810switch.spec,1.9,1.10
Message-ID: <200709282100.l8SL0VKw016872@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16718

Modified Files:
	i810switch.spec 
Log Message:
add i945 detection, fixes BZ297371


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-6/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	28 Sep 2007 20:59:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:01:15 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 17:01:15 -0400
Subject: rpms/i810switch/FC-6 i810switch-0.6.5-add-i945.patch,NONE,1.1
Message-ID: <200709282101.l8SL1FTq023031@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22931

Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 support

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;



From fedora-extras-commits at redhat.com  Fri Sep 28 21:03:30 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Fri, 28 Sep 2007 17:03:30 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.449, 1.450 anaconda.spec, 1.585, 
	1.586 sources, 1.578, 1.579
Message-ID: <200709282103.l8SL3Ulq023289@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23144

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- .cvsignore	27 Sep 2007 22:02:49 -0000	1.449
+++ .cvsignore	28 Sep 2007 21:02:58 -0000	1.450
@@ -1 +1 @@
-anaconda-11.3.0.35.tar.bz2
+anaconda-11.3.0.36.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- anaconda.spec	27 Sep 2007 22:02:49 -0000	1.585
+++ anaconda.spec	28 Sep 2007 21:02:58 -0000	1.586
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.35
+Version: 11.3.0.36
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 28 2007 Chris Lumens <clumens at redhat.com> 11.3.0.36-1
+- Fix rescue CD + nfs tree as well.
+- More wireless driver blacklist fixing (katzj).
+
 * Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
 - Support modname.option=value for passing options to kernel modules
 - Fix rescue CD + nfsiso (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- sources	27 Sep 2007 22:02:49 -0000	1.578
+++ sources	28 Sep 2007 21:02:58 -0000	1.579
@@ -1 +1 @@
-cfa6cb69f049ec352fb3c0d6b6301c81  anaconda-11.3.0.35.tar.bz2
+6ea4859bf0bfdc62c21006363b01b435  anaconda-11.3.0.36.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 21:16:04 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 28 Sep 2007 17:16:04 -0400
Subject: rpms/cups/devel .cvsignore, 1.35, 1.36 cups.spec, 1.364,
	1.365 sources, 1.38, 1.39
Message-ID: <200709282116.l8SLG4Tl025790@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565

Modified Files:
	.cvsignore cups.spec sources 
Log Message:
* Fri Sep 28 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.3-1
- 1.3.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	19 Sep 2007 11:02:14 -0000	1.35
+++ .cvsignore	28 Sep 2007 21:15:32 -0000	1.36
@@ -27,3 +27,4 @@
 cups-1.3rc2-source.tar.bz2
 cups-1.3.0-source.tar.bz2
 cups-1.3.2-source.tar.bz2
+cups-1.3.3-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- cups.spec	25 Sep 2007 10:24:22 -0000	1.364
+++ cups.spec	28 Sep 2007 21:15:32 -0000	1.365
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -447,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 28 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.3-1
+- 1.3.3.
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
 - Don't strip foomatic recommended strings from make/model names.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	19 Sep 2007 11:02:14 -0000	1.38
+++ sources	28 Sep 2007 21:15:32 -0000	1.39
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-0f5f95847d7ca209da25936e47699bfe  cups-1.3.2-source.tar.bz2
+d4911e68b6979d16bc7a55f68d16cc53  cups-1.3.3-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 21:18:33 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 28 Sep 2007 17:18:33 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.12,
 1.13 sources, 1.7, 1.8
In-Reply-To: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>
References: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>
Message-ID: <46FD6FA9.7070006@redhat.com>

Lillian Angel wrote:
> Author: langel
> 
> Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15145
> 
> Modified Files:
> 	java-1.7.0-icedtea.spec sources 
> Log Message:
> * Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
> - Fixed testing. Output is stored in a file and passes/debug info is not shown.
> 
> 
> 
> 
> Index: java-1.7.0-icedtea.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -r1.12 -r1.13
> --- java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
> +++ java-1.7.0-icedtea.spec	28 Sep 2007 20:33:17 -0000	1.13
> @@ -113,6 +113,7 @@
>  Source5:  README.plugin
>  Source6:  mauve-%{mauvedate}.tar.gz
>  Source7:  mauve_tests
> +Source8:  mauve_output
>  Patch0:   java-1.7.0-icedtea-makefile.patch
>  Patch1:   java-1.7.0-icedtea-jhat.patch
>  Patch2:   java-1.7.0-icedtea-win32.patch
> @@ -300,7 +301,7 @@
>    make
>    echo ====================MAUVE TESTING========================
>    $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
> -    -showpasses -debug -timeout 30000 2>&1 || :
> +	-timeout 30000 2>&1 | tee %{SOURCE8}
>    echo ====================MAUVE TESTING END====================
>  popd
>  
> @@ -732,6 +733,9 @@
>  %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
>  
>  %changelog
> +* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
> +- Fixed testing. Output is stored in a file and passes/debug info is not shown.

You can't store the output back into the source file -- that violates the 
"pristine source" rpm philosophy (not to mention that mock likely makes the 
source read-only so the build would fail).  I meant include it in the files 
list, probably as %doc.  In any case, don't build this into Rawhide, for 
stability reasons.  Just wait until sometime next week when F8t3 is out.

Tom



From fedora-extras-commits at redhat.com  Fri Sep 28 21:27:39 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 28 Sep 2007 17:27:39 -0400
Subject: rpms/gcc/devel gcc41-virtual-inline-backtrace.patch, NONE,
	1.1 gcc41.spec, 1.177, 1.178
Message-ID: <200709282127.l8SLRdcR026346@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26296

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-virtual-inline-backtrace.patch 
Log Message:
4.1.2-29

gcc41-virtual-inline-backtrace.patch:

--- NEW FILE gcc41-virtual-inline-backtrace.patch ---
2007-09-27  Jakub Jelinek  <jakub at redhat.com>

	* builtins.c (expand_builtin, expand_builtin_object_size,
	expand_builtin_memory_chk, maybe_emit_chk_warning,
	maybe_emit_sprintf_chk_warning): Use new %K format string specifier
	for diagnostics.
	* expr.c (expand_expr_real_1): Likewise.
	* langhooks-def.h (struct diagnostic_info): Add forward decl.
	(lhd_print_error_function): Add third argument.
	* langhooks.h (struct diagnostic_info): Add forward decl.
	(struct lang_hooks): Add third argument to print_error_function.
	* diagnostic.h (diagnostic_info): Add abstract_origin field.
	(diagnostic_last_function_changed, diagnostic_set_last_function): Add
	second argument.
	(diagnostic_report_current_function): Likewise.
	* toplev.c (announce_function): Pass NULL as second argument to
	diagnostic_set_last_function.
	* diagnostic.c (diagnostic_report_current_function): Add second
	argument, pass it as third argument to lang_hooks.print_error_function.
	(default_diagnostic_starter): Pass DIAGNOSTIC as second argument
	to diagnostic_report_current_function.
	(diagnostic_report_diagnostic): Initialize diagnostic->abstract_origin
	and message.abstract_origin.
	(verbatim): Initialize abstract_origin.
	* pretty-print.h (text_info): Add abstract_origin field.
	* pretty-print.c (pp_base_format): Handle %K.
	* langhooks.c (lhd_print_error_function): Add third argument.  If
	diagnostic->abstract_origin, print virtual backtrace.
	* c-format.c (gcc_diag_char_table, gcc_tdiag_char_table,
	gcc_cdiag_char_table, gcc_cxxdiag_char_table): Support %K.
	(init_dynamic_diag_info): Likewise.
cp/
	* error.c (cxx_print_error_function): Add third argument, pass
	it over to lhd_print_error_function.
	(cp_print_error_function): If diagnostic->abstract_origin, print
	virtual backtrace.
	* cp-tree.h (struct diagnostic_info): New forward decl.
	(cxx_print_error_function): Add third argument.
testsuite/
	* lib/prune.exp: Prune also "^In function .*$" lines and
	"^    inlined from .*$" lines.
java/
	* lang.c (java_print_error_function): Add third argument.

--- gcc/java/lang.c.jj	2007-02-20 22:35:09.000000000 +0100
+++ gcc/java/lang.c	2007-09-28 22:47:38.000000000 +0200
@@ -55,7 +55,8 @@ static bool java_post_options (const cha
 static int java_handle_option (size_t scode, const char *arg, int value);
 static void put_decl_string (const char *, int);
 static void put_decl_node (tree);
-static void java_print_error_function (diagnostic_context *, const char *);
+static void java_print_error_function (diagnostic_context *, const char *,
+				       diagnostic_info *);
 static tree java_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
 					      void *, struct pointer_set_t *);
 static int merge_init_test_initialization (void * *, void *);
@@ -511,7 +512,8 @@ static GTY(()) tree last_error_function_
 static GTY(()) tree last_error_function;
 static void
 java_print_error_function (diagnostic_context *context ATTRIBUTE_UNUSED,
-			   const char *file)
+			   const char *file,
+			   diagnostic_info *diagnostic ATTRIBUTE_UNUSED)
 {
   /* Don't print error messages with bogus function prototypes.  */
   if (inhibit_error_function_printing)
--- gcc/diagnostic.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/diagnostic.c	2007-09-28 22:45:19.000000000 +0200
@@ -272,10 +272,11 @@ diagnostic_action_after_output (diagnost
 /* Prints out, if necessary, the name of the current function
    that caused an error.  Called from all error and warning functions.  */
 void
-diagnostic_report_current_function (diagnostic_context *context)
+diagnostic_report_current_function (diagnostic_context *context,
+				    diagnostic_info *diagnostic)
 {
   diagnostic_report_current_module (context);
-  lang_hooks.print_error_function (context, input_filename);
+  lang_hooks.print_error_function (context, input_filename, diagnostic);
 }
 
 void
@@ -313,7 +314,7 @@ static void
 default_diagnostic_starter (diagnostic_context *context,
 			    diagnostic_info *diagnostic)
 {
-  diagnostic_report_current_function (context);
+  diagnostic_report_current_function (context, diagnostic);
   pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic));
 }
 
@@ -361,6 +362,8 @@ diagnostic_report_diagnostic (diagnostic
 		      " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
 
       diagnostic->message.locus = &diagnostic->location;
+      diagnostic->message.abstract_origin = &diagnostic->abstract_origin;
+      diagnostic->abstract_origin = NULL;
       pp_format (context->printer, &diagnostic->message);
       (*diagnostic_starter (context)) (context, diagnostic);
       pp_output_formatted_text (context->printer);
@@ -368,6 +371,7 @@ diagnostic_report_diagnostic (diagnostic
       pp_flush (context->printer);
       diagnostic_action_after_output (context, diagnostic);
       diagnostic->message.format_spec = saved_format_spec;
+      diagnostic->abstract_origin = NULL;
     }
 
   context->lock--;
@@ -419,6 +423,7 @@ verbatim (const char *gmsgid, ...)
   text.args_ptr = &ap;
   text.format_spec = _(gmsgid);
   text.locus = NULL;
+  text.abstract_origin = NULL;
   pp_format_verbatim (global_dc->printer, &text);
   pp_flush (global_dc->printer);
   va_end (ap);
--- gcc/builtins.c.jj	2007-09-25 12:26:50.000000000 +0200
+++ gcc/builtins.c	2007-09-28 22:47:00.000000000 +0200
@@ -5982,13 +5982,13 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_VA_ARG_PACK:
       /* All valid uses of __builtin_va_arg_pack () are removed during
 	 inlining.  */
-      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      error ("%Kinvalid use of %<__builtin_va_arg_pack ()%>", exp);
       return const0_rtx;
 
     case BUILT_IN_VA_ARG_PACK_LEN:
       /* All valid uses of __builtin_va_arg_pack_len () are removed during
 	 inlining.  */
-      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      error ("%Kinvalid use of %<__builtin_va_arg_pack_len ()%>", exp);
       return const0_rtx;
 
       /* Return the address of the first anonymous stack arg.  */
@@ -10286,12 +10286,11 @@ expand_builtin_object_size (tree exp)
   int object_size_type;
   tree fndecl = get_callee_fndecl (exp);
   tree arglist = TREE_OPERAND (exp, 1);
-  location_t locus = EXPR_LOCATION (exp);
 
   if (!validate_arglist (arglist, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE))
     {
-      error ("%Hfirst argument of %D must be a pointer, second integer constant",
-	     &locus, fndecl);
+      error ("%Kfirst argument of %D must be a pointer, second integer constant",
+	     exp, fndecl);
       expand_builtin_trap ();
       return const0_rtx;
     }
@@ -10303,8 +10302,8 @@ expand_builtin_object_size (tree exp)
       || tree_int_cst_sgn (ost) < 0
       || compare_tree_int (ost, 3) > 0)
     {
-      error ("%Hlast argument of %D is not integer constant between 0 and 3",
-	     &locus, fndecl);
+      error ("%Klast argument of %D is not integer constant between 0 and 3",
+	     exp, fndecl);
       expand_builtin_trap ();
       return const0_rtx;
     }
@@ -10348,9 +10347,8 @@ expand_builtin_memory_chk (tree exp, rtx
 
       if (! integer_all_onesp (size) && tree_int_cst_lt (size, len))
 	{
-	  location_t locus = EXPR_LOCATION (exp);
-	  warning (0, "%Hcall to %D will always overflow destination buffer",
-		   &locus, get_callee_fndecl (exp));
+	  warning (0, "%Kcall to %D will always overflow destination buffer",
+		   exp, get_callee_fndecl (exp));
 	  return 0;
 	}
 
@@ -10463,7 +10461,6 @@ maybe_emit_chk_warning (tree exp, enum b
   int arg_mask, is_strlen = 0;
   tree arglist = TREE_OPERAND (exp, 1), a;
   tree len, size;
-  location_t locus;
 
   switch (fcode)
     {
@@ -10525,9 +10522,8 @@ maybe_emit_chk_warning (tree exp, enum b
       src = c_strlen (src, 1);
       if (! src || ! host_integerp (src, 1))
 	{
-	  locus = EXPR_LOCATION (exp);
-	  warning (0, "%Hcall to %D might overflow destination buffer",
-		   &locus, get_callee_fndecl (exp));
+	  warning (0, "%Kcall to %D might overflow destination buffer",
+		   exp, get_callee_fndecl (exp));
 	  return;
 	}
       else if (tree_int_cst_lt (src, size))
@@ -10536,9 +10532,8 @@ maybe_emit_chk_warning (tree exp, enum b
   else if (! host_integerp (len, 1) || ! tree_int_cst_lt (size, len))
     return;
 
-  locus = EXPR_LOCATION (exp);
-  warning (0, "%Hcall to %D will always overflow destination buffer",
-	   &locus, get_callee_fndecl (exp));
+  warning (0, "%Kcall to %D will always overflow destination buffer",
+	   exp, get_callee_fndecl (exp));
 }
 
 /* Emit warning if a buffer overflow is detected at compile time
@@ -10604,9 +10599,8 @@ maybe_emit_sprintf_chk_warning (tree exp
 
   if (! tree_int_cst_lt (len, size))
     {
-      location_t locus = EXPR_LOCATION (exp);
-      warning (0, "%Hcall to %D will always overflow destination buffer",
-	       &locus, get_callee_fndecl (exp));
+      warning (0, "%Kcall to %D will always overflow destination buffer",
+	       exp, get_callee_fndecl (exp));
     }
 }
 
--- gcc/diagnostic.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/diagnostic.h	2007-09-28 22:45:58.000000000 +0200
@@ -37,10 +37,13 @@ typedef enum
 /* A diagnostic is described by the MESSAGE to send, the FILE and LINE of
    its context and its KIND (ice, error, warning, note, ...)  See complete
    list in diagnostic.def.  */
-typedef struct
+typedef struct diagnostic_info
 {
   text_info message;
   location_t location;
+  /* TREE_BLOCK if the diagnostic is to be reported in some inline
+     function inlined into other function, otherwise NULL.  */
+  tree abstract_origin;
   /* The kind of diagnostic it is about.  */
   diagnostic_t kind;
   /* Which OPT_* directly controls this diagnostic.  */
@@ -130,13 +133,15 @@ struct diagnostic_context
 
 /* True if the last function in which a diagnostic was reported is
    different from the current one.  */
-#define diagnostic_last_function_changed(DC) \
-  ((DC)->last_function != current_function_decl)
+#define diagnostic_last_function_changed(DC, DI) \
+  ((DC)->last_function != ((DI)->abstract_origin \
+			   ? (DI)->abstract_origin : current_function_decl))
 
 /* Remember the current function as being the last one in which we report
    a diagnostic.  */
-#define diagnostic_set_last_function(DC) \
-  (DC)->last_function = current_function_decl
+#define diagnostic_set_last_function(DC, DI) \
+  (DC)->last_function = (((DI) && (DI)->abstract_origin) \
+			 ? (DI)->abstract_origin : current_function_decl)
 
 /* True if the last module or file in which a diagnostic was reported is
    different from the current one.  */
@@ -178,7 +183,8 @@ extern diagnostic_context *global_dc;
 /* Diagnostic related functions.  */
 extern void diagnostic_initialize (diagnostic_context *);
 extern void diagnostic_report_current_module (diagnostic_context *);
-extern void diagnostic_report_current_function (diagnostic_context *);
+extern void diagnostic_report_current_function (diagnostic_context *,
+						diagnostic_info *);
 extern void diagnostic_report_diagnostic (diagnostic_context *,
 					  diagnostic_info *);
 #ifdef ATTRIBUTE_GCC_DIAG
--- gcc/toplev.c.jj	2007-04-03 13:18:27.000000000 +0200
+++ gcc/toplev.c	2007-09-28 22:45:19.000000000 +0200
@@ -448,7 +448,7 @@ announce_function (tree decl)
 	fprintf (stderr, " %s", lang_hooks.decl_printable_name (decl, 2));
       fflush (stderr);
       pp_needs_newline (global_dc->printer) = true;
-      diagnostic_set_last_function (global_dc);
+      diagnostic_set_last_function (global_dc, (diagnostic_info *) NULL);
     }
 }
 
--- gcc/pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/pretty-print.c	2007-09-28 22:45:19.000000000 +0200
@@ -188,6 +188,7 @@ pp_base_indent (pretty_printer *pp)
    %Ns: likewise, but length specified as constant in the format string.
    %H: location_t.
    %J: a decl tree, from which DECL_SOURCE_LOCATION will be recorded.
+   %K: a statement, from which EXPR_LOCATION and TREE_BLOCK will be recorded.
    Flag 'q': quote formatted text (must come immediately after '%').
 
    Arguments can be used sequentially, or through %N$ resp. *N$
@@ -487,6 +488,33 @@ pp_base_format (pretty_printer *pp, text
 	  }
 	  break;
 
+	case 'K':
+	  {
+	    tree t = va_arg (*text->args_ptr, tree), block;
+	    gcc_assert (text->locus != NULL);
+	    *text->locus = EXPR_LOCATION (t);
+	    gcc_assert (text->abstract_origin != NULL);
+	    block = TREE_BLOCK (t);
+	    *text->abstract_origin = NULL;
+	    while (block
+		   && TREE_CODE (block) == BLOCK
+		   && BLOCK_ABSTRACT_ORIGIN (block))
+	      {
+		tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		  ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		if (TREE_CODE (ao) == FUNCTION_DECL)
+		  {
+		    *text->abstract_origin = block;
+		    break;
+		  }
+		block = BLOCK_SUPERCONTEXT (block);
+	      }
+	  }
+	  break;
+
 	case '.':
 	  {
 	    int n;
--- gcc/pretty-print.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/pretty-print.h	2007-09-28 22:45:19.000000000 +0200
@@ -36,6 +36,7 @@ typedef struct
   va_list *args_ptr;
   int err_no;  /* for %m */
   location_t *locus;
+  tree *abstract_origin;
 } text_info;
 
 /* How often diagnostics are prefixed by their locations:
--- gcc/testsuite/lib/prune.exp.jj	2007-02-20 22:37:09.000000000 +0100
+++ gcc/testsuite/lib/prune.exp	2007-09-28 22:45:19.000000000 +0200
@@ -19,9 +19,10 @@
 proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
 
-    regsub -all "(^|\n)\[^\n\]*: In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
+    regsub -all "(^|\n)(\[^\n\]*: )?In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*:   instantiated from \[^\n\]*" $text "" text
+    regsub -all "(^|\n)    inlined from \[^\n\]*" $text "" text
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
--- gcc/cp/error.c.jj	2007-09-25 11:15:31.000000000 +0200
+++ gcc/cp/error.c	2007-09-28 22:45:19.000000000 +0200
@@ -2150,9 +2150,10 @@ cv_to_string (tree p, int v)
 
 /* Langhook for print_error_function.  */
 void
-cxx_print_error_function (diagnostic_context *context, const char *file)
+cxx_print_error_function (diagnostic_context *context, const char *file,
+			  diagnostic_info *diagnostic)
 {
-  lhd_print_error_function (context, file);
+  lhd_print_error_function (context, file, diagnostic);
   pp_base_set_prefix (context->printer, file);
   maybe_print_instantiation_context (context);
 }
@@ -2180,23 +2181,105 @@ static void
 cp_print_error_function (diagnostic_context *context,
 			 diagnostic_info *diagnostic)
 {
-  if (diagnostic_last_function_changed (context))
+  if (diagnostic_last_function_changed (context, diagnostic))
     {
       const char *old_prefix = context->printer->prefix;
       const char *file = LOCATION_FILE (diagnostic->location);
-      char *new_prefix = file ? file_name_as_prefix (file) : NULL;
+      tree abstract_origin = diagnostic->abstract_origin;
+      char *new_prefix = (file && abstract_origin == NULL)
+			 ? file_name_as_prefix (file) : NULL;
 
       pp_base_set_prefix (context->printer, new_prefix);
 
       if (current_function_decl == NULL)
 	pp_base_string (context->printer, "At global scope:");
       else
-	pp_printf (context->printer, "In %s %qs:",
-		   function_category (current_function_decl),
-		   cxx_printable_name (current_function_decl, 2));
+	{
+	  tree fndecl, ao;
+
+	  if (abstract_origin)
+	    {
+	      ao = BLOCK_ABSTRACT_ORIGIN (abstract_origin);
+	      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		ao = BLOCK_ABSTRACT_ORIGIN (ao);
+	      gcc_assert (TREE_CODE (ao) == FUNCTION_DECL);
+	      fndecl = ao;
+	    }
+	  else
+	    fndecl = current_function_decl;
+
+	  pp_printf (context->printer, "In %s %qs",
+		     function_category (fndecl),
+		     cxx_printable_name (fndecl, 2));
+
+	  while (abstract_origin)
+	    {
+	      location_t *locus;
+	      tree block = abstract_origin;
+
+	      locus = &BLOCK_SOURCE_LOCATION (block);
+	      fndecl = NULL;
+	      block = BLOCK_SUPERCONTEXT (block);
+	      while (block && TREE_CODE (block) == BLOCK
+		     && BLOCK_ABSTRACT_ORIGIN (block))
+		{
+		  ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		  while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		    ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		  if (TREE_CODE (ao) == FUNCTION_DECL)
+		    {
+		      fndecl = ao;
+		      break;
+		    }
+		  else if (TREE_CODE (ao) != BLOCK)
+		    break;
+
+		  block = BLOCK_SUPERCONTEXT (block);
+		}
+	      if (fndecl)
+		abstract_origin = block;
+	      else
+		{
+		  while (block && TREE_CODE (block) == BLOCK)
+		    block = BLOCK_SUPERCONTEXT (block);
+
+		  if (TREE_CODE (block) == FUNCTION_DECL)
+		    fndecl = block;
+		  abstract_origin = NULL;
+		}
+	      if (fndecl)
+		{
+		  expanded_location s = expand_location (*locus);
+		  pp_base_character (context->printer, ',');
+		  pp_base_newline (context->printer);
+		  if (s.file != NULL)
+		    {
+#ifdef USE_MAPPED_LOCATION
+		      if (flag_show_column && s.column != 0)
+			pp_printf (context->printer,
+				   "    inlined from %qs at %s:%d:%d",
+				   cxx_printable_name (fndecl, 2),
+				   s.file, s.line, s.column);
+		      else
+#endif
+			pp_printf (context->printer,
+				   "    inlined from %qs at %s:%d",
+				   cxx_printable_name (fndecl, 2),
+				   s.file, s.line);
+
+		    }
+		  else
+		    pp_printf (context->printer, "    inlined from %qs",
+			       cxx_printable_name (fndecl, 2));
+		}
+	    }
+	  pp_base_character (context->printer, ':');
+	}
       pp_base_newline (context->printer);
 
-      diagnostic_set_last_function (context);
+      diagnostic_set_last_function (context, diagnostic);
       pp_base_destroy_prefix (context->printer);
       context->printer->prefix = old_prefix;
     }
--- gcc/cp/cp-tree.h.jj	2007-09-25 11:45:25.000000000 +0200
+++ gcc/cp/cp-tree.h	2007-09-28 22:45:19.000000000 +0200
@@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA.  */
 #include "c-common.h"
 #include "name-lookup.h"
 struct diagnostic_context;
+struct diagnostic_info;
 
 /* Usage of TREE_LANG_FLAG_?:
    0: IDENTIFIER_MARKED (IDENTIFIER_NODEs)
@@ -3832,7 +3833,8 @@ extern void cxx_print_decl			(FILE *, tr
 extern void cxx_print_type			(FILE *, tree, int);
 extern void cxx_print_identifier		(FILE *, tree, int);
 extern void cxx_print_error_function	(struct diagnostic_context *,
-						 const char *);
+						 const char *,
+						 struct diagnostic_info *);
 extern void build_self_reference		(void);
 extern int same_signature_p			(tree, tree);
 extern void warn_hidden				(tree);
--- gcc/c-format.c.jj	2007-09-25 12:27:55.000000000 +0200
+++ gcc/c-format.c	2007-09-28 22:50:35.000000000 +0200
@@ -547,7 +547,7 @@ static const format_char_info gcc_diag_c
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "J", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",    "",   NULL },
+  { "JK",  0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -570,7 +570,7 @@ static const format_char_info gcc_tdiag_
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "DFJT", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
+  { "DFJKT", 0, STD_C89, { T89_V, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -593,7 +593,7 @@ static const format_char_info gcc_cdiag_
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "DEFJT", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
+  { "DEFJKT", 0, STD_C89, { T89_V, BADLEN, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -616,7 +616,7 @@ static const format_char_info gcc_cxxdia
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "ADEFJTV",0,STD_C89,{ T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+#",   "",   NULL },
+  { "ADEFJKTV",0,STD_C89,{ T89_V, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+#",   "",   NULL },
 
   /* These accept either an 'int' or an 'enum tree_code' (which is handled as an 'int'.)  */
   { "CLOPQ",0,STD_C89, { T89_I,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
@@ -2601,6 +2601,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (diag_fci, 'J');
 	  diag_fci[i].types[0].type = &t;
 	  diag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (diag_fci, 'K');
+	  diag_fci[i].types[0].type = &t;
+	  diag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_tdiag__ format specifics.  */
@@ -2625,6 +2628,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (tdiag_fci, 'J');
 	  tdiag_fci[i].types[0].type = &t;
 	  tdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (tdiag_fci, 'K');
+	  tdiag_fci[i].types[0].type = &t;
+	  tdiag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_cdiag__ format specifics.  */
@@ -2649,6 +2655,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (cdiag_fci, 'J');
 	  cdiag_fci[i].types[0].type = &t;
 	  cdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (cdiag_fci, 'K');
+	  cdiag_fci[i].types[0].type = &t;
+	  cdiag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_cxxdiag__ format specifics.  */
@@ -2673,6 +2682,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (cxxdiag_fci, 'J');
 	  cxxdiag_fci[i].types[0].type = &t;
 	  cxxdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (cxxdiag_fci, 'K');
+	  cxxdiag_fci[i].types[0].type = &t;
+	  cxxdiag_fci[i].pointer_count = 1;
 	}
     }
 }
--- gcc/expr.c.jj	2007-09-25 15:19:15.000000000 +0200
+++ gcc/expr.c	2007-09-28 22:45:19.000000000 +0200
@@ -7512,21 +7512,21 @@ expand_expr_real_1 (tree exp, rtx target
       /* All valid uses of __builtin_va_arg_pack () are removed during
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
-	error ("invalid use of %<__builtin_va_arg_pack ()%>");
+	error ("%Kinvalid use of %<__builtin_va_arg_pack ()%>", exp);
       {
 	tree fndecl = get_callee_fndecl (exp), attr;
 
 	if (fndecl
 	    && (attr = lookup_attribute ("error",
 					 DECL_ATTRIBUTES (fndecl))) != NULL)
-	  error ("call to %qs declared with attribute error: %s",
-		 lang_hooks.decl_printable_name (fndecl, 1),
+	  error ("%Kcall to %qs declared with attribute error: %s",
+		 exp, lang_hooks.decl_printable_name (fndecl, 1),
 		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
 	if (fndecl
 	    && (attr = lookup_attribute ("warning",
 					 DECL_ATTRIBUTES (fndecl))) != NULL)
-	  warning (0, "call to %qs declared with attribute warning: %s",
-		   lang_hooks.decl_printable_name (fndecl, 1),
+	  warning (0, "%Kcall to %qs declared with attribute warning: %s",
+		   exp, lang_hooks.decl_printable_name (fndecl, 1),
 		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
 
 	/* Check for a built-in function.  */
--- gcc/langhooks.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/langhooks.c	2007-09-28 22:45:19.000000000 +0200
@@ -494,12 +494,15 @@ lhd_initialize_diagnostics (struct diagn
 /* The default function to print out name of current function that caused
    an error.  */
 void
-lhd_print_error_function (diagnostic_context *context, const char *file)
+lhd_print_error_function (diagnostic_context *context, const char *file,
+			  diagnostic_info *diagnostic)
 {
-  if (diagnostic_last_function_changed (context))
+  if (diagnostic_last_function_changed (context, diagnostic))
     {
       const char *old_prefix = context->printer->prefix;
-      char *new_prefix = file ? file_name_as_prefix (file) : NULL;
+      tree abstract_origin = diagnostic->abstract_origin;
+      char *new_prefix = (file && abstract_origin == NULL)
+			 ? file_name_as_prefix (file) : NULL;
 
       pp_set_prefix (context->printer, new_prefix);
 
@@ -507,17 +510,95 @@ lhd_print_error_function (diagnostic_con
 	pp_printf (context->printer, _("At top level:"));
       else
 	{
-	  if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)
+	  tree fndecl, ao;
+
+	  if (abstract_origin)
+	    {
+	      ao = BLOCK_ABSTRACT_ORIGIN (abstract_origin);
+	      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		ao = BLOCK_ABSTRACT_ORIGIN (ao);
+	      gcc_assert (TREE_CODE (ao) == FUNCTION_DECL);
+	      fndecl = ao;
+	    }
+	  else
+	    fndecl = current_function_decl;
+
+	  if (TREE_CODE (TREE_TYPE (fndecl)) == METHOD_TYPE)
 	    pp_printf
-	      (context->printer, _("In member function %qs:"),
-	       lang_hooks.decl_printable_name (current_function_decl, 2));
+	      (context->printer, _("In member function %qs"),
+	       lang_hooks.decl_printable_name (fndecl, 2));
 	  else
 	    pp_printf
-	      (context->printer, _("In function %qs:"),
-	       lang_hooks.decl_printable_name (current_function_decl, 2));
+	      (context->printer, _("In function %qs"),
+	       lang_hooks.decl_printable_name (fndecl, 2));
+
+	  while (abstract_origin)
+	    {
+	      location_t *locus;
+	      tree block = abstract_origin;
+
+	      locus = &BLOCK_SOURCE_LOCATION (block);
+	      fndecl = NULL;
+	      block = BLOCK_SUPERCONTEXT (block);
+	      while (block && TREE_CODE (block) == BLOCK
+		     && BLOCK_ABSTRACT_ORIGIN (block))
+		{
+		  ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		  while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		    ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		  if (TREE_CODE (ao) == FUNCTION_DECL)
+		    {
+		      fndecl = ao;
+		      break;
+		    }
+		  else if (TREE_CODE (ao) != BLOCK)
+		    break;
+
+		  block = BLOCK_SUPERCONTEXT (block);
+		}
+	      if (fndecl)
+		abstract_origin = block;
+	      else
+		{
+		  while (block && TREE_CODE (block) == BLOCK)
+		    block = BLOCK_SUPERCONTEXT (block);
+
+		  if (TREE_CODE (block) == FUNCTION_DECL)
+		    fndecl = block;
+		  abstract_origin = NULL;
+		}
+	      if (fndecl)
+		{
+		  expanded_location s = expand_location (*locus);
+		  pp_character (context->printer, ',');
+		  pp_newline (context->printer);
+		  if (s.file != NULL)
+		    {
+#ifdef USE_MAPPED_LOCATION
+		      if (flag_show_column && s.column != 0)
+			pp_printf (context->printer,
+				   _("    inlined from %qs at %s:%d:%d"),
+				   lang_hooks.decl_printable_name (fndecl, 2),
+				   s.file, s.line, s.column);
+		      else
+#endif
+			pp_printf (context->printer,
+				   _("    inlined from %qs at %s:%d"),
+				   lang_hooks.decl_printable_name (fndecl, 2),
+				   s.file, s.line);
+
+		    }
+		  else
+		    pp_printf (context->printer, _("    inlined from %qs"),
+			       lang_hooks.decl_printable_name (fndecl, 2));
+		}
+	    }
+	  pp_character (context->printer, ':');
 	}
 
-      diagnostic_set_last_function (context);
+      diagnostic_set_last_function (context, diagnostic);
       pp_flush (context->printer);
       context->printer->prefix = old_prefix;
       free ((char*) new_prefix);
--- gcc/langhooks.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/langhooks.h	2007-09-28 22:45:19.000000000 +0200
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 /* This file should be #include-d after tree.h.  */
 
 struct diagnostic_context;
+struct diagnostic_info;
 
 struct gimplify_omp_ctx;
 
@@ -391,7 +392,8 @@ struct lang_hooks
   tree (*lang_get_callee_fndecl) (tree);
 
   /* Called by report_error_function to print out function name.  */
-  void (*print_error_function) (struct diagnostic_context *, const char *);
+  void (*print_error_function) (struct diagnostic_context *, const char *,
+				struct diagnostic_info *);
 
   /* Called from expr_size to calculate the size of the value of an
      expression in a language-dependent way.  Returns a tree for the size
--- gcc/langhooks-def.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/langhooks-def.h	2007-09-28 22:45:19.000000000 +0200
@@ -25,6 +25,7 @@ Boston, MA 02110-1301, USA.  */
 #include "hooks.h"
 
 struct diagnostic_context;
+struct diagnostic_info;
 
 /* Provide a hook routine for alias sets that always returns 1.  This is
    used by languages that haven't deal with alias sets yet.  */
@@ -57,7 +58,7 @@ extern int lhd_types_compatible_p (tree,
 extern rtx lhd_expand_expr (tree, rtx, enum machine_mode, int, rtx *);
 extern int lhd_expand_decl (tree);
 extern void lhd_print_error_function (struct diagnostic_context *,
-				      const char *);
+				      const char *, struct diagnostic_info *);
 extern void lhd_set_decl_assembler_name (tree);
 extern bool lhd_can_use_bit_fields_p (void);
 extern bool lhd_warn_unused_global_decl (tree);


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gcc41.spec	25 Sep 2007 16:09:05 -0000	1.177
+++ gcc41.spec	28 Sep 2007 21:27:06 -0000	1.178
@@ -1,6 +1,6 @@
 %define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 28
+%define gcc_release 29
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -145,6 +145,7 @@
 Patch29: gcc41-jdwp.patch
 Patch30: gcc41-pr20880.patch
 Patch31: gcc41-pr32694.patch
+Patch32: gcc41-virtual-inline-backtrace.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -459,6 +460,7 @@
 %patch29 -p0 -b .jdwp~
 %patch30 -p0 -b .pr20880~
 %patch31 -p0 -b .pr32694~
+%patch32 -p0 -b .virtual-inline-backtrace~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1613,6 +1615,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 28 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-29
+- print virtual inline backtrace in some diagnostic messages to help
+  locate bugs reported with -D_FORTIFY_SOURCE{,=2}
+
 * Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-28
 - update from gcc-4_1-branch (-r127672:128736)
   - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:15 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:15 -0700
Subject: [pkgdb] lybniz was added for firewing
Message-ID: <200709282129.l8SLTKid029327@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package lybniz with summary A function graph plotter
Kevin Fenzi (kevin) has approved Package lybniz
Kevin Fenzi (kevin) has added a Fedora devel branch for lybniz with an owner of firewing
Kevin Fenzi (kevin) has approved lybniz in Fedora devel
Kevin Fenzi (kevin) has approved Package lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, 6) updated by kevin
Message-ID: <200709282129.l8SLTdkN029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, devel) updated by kevin
Message-ID: <200709282129.l8SLTdkQ029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, 7) updated by kevin
Message-ID: <200709282129.l8SLTdkT029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:25 -0400
Subject: rpms/lybniz - New directory
Message-ID: <200709282130.l8SLUPQ1026616@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz

Log Message:
Directory /cvs/extras/rpms/lybniz added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:30 -0400
Subject: rpms/lybniz/devel - New directory
Message-ID: <200709282130.l8SLUUe5026630@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz/devel

Log Message:
Directory /cvs/extras/rpms/lybniz/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:32 -0400
Subject: rpms/lybniz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282130.l8SLUW8K026656@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz

Added Files:
	Makefile import.log 
Log Message:
Setup of module lybniz


--- NEW FILE Makefile ---
# Top level Makefile for module lybniz
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:34 -0400
Subject: rpms/lybniz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709282130.l8SLUY0L026673@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lybniz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lybniz
# $Id: Makefile,v 1.1 2007/09/28 21:30:32 kevin Exp $
NAME := lybniz
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:31:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:31:34 -0700
Subject: [pkgdb] aboot was added for oliver
Message-ID: <200709282131.l8SLVdgO029552@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aboot with summary A bootloader which can be started from the SRM console
Kevin Fenzi (kevin) has approved Package aboot
Kevin Fenzi (kevin) has added a Fedora devel branch for aboot with an owner of oliver
Kevin Fenzi (kevin) has approved aboot in Fedora devel
Kevin Fenzi (kevin) has approved Package aboot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aboot (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aboot (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aboot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aboot



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:31:35 -0700
Subject: [pkgdb] aboot (Fedora, devel) updated by kevin
Message-ID: <200709282131.l8SLVdgR029552@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on aboot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aboot



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:47 -0400
Subject: rpms/aboot - New directory
Message-ID: <200709282131.l8SLVlAW026976@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot

Log Message:
Directory /cvs/extras/rpms/aboot added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:52 -0400
Subject: rpms/aboot/devel - New directory
Message-ID: <200709282131.l8SLVqbW026991@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot/devel

Log Message:
Directory /cvs/extras/rpms/aboot/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:55 -0400
Subject: rpms/aboot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282131.l8SLVtW3027018@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot

Added Files:
	Makefile import.log 
Log Message:
Setup of module aboot


--- NEW FILE Makefile ---
# Top level Makefile for module aboot
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:57 -0400
Subject: rpms/aboot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709282131.l8SLVv85027037@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aboot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aboot
# $Id: Makefile,v 1.1 2007/09/28 21:31:56 kevin Exp $
NAME := aboot
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:32:30 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 28 Sep 2007 17:32:30 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.85,1.86
Message-ID: <200709282132.l8SLWUTb027085@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.9-91.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sysprof-kmod.spec	27 Sep 2007 20:15:46 -0000	1.85
+++ sysprof-kmod.spec	28 Sep 2007 21:31:58 -0000	1.86
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.7-85.fc7}
+%{!?kversion: %define kversion 2.6.22.9-91.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:08 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:33:08 -0400
Subject: rpms/cobbler/devel .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282133.l8SLX8Kg027155@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27084

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:26:04 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:32:35 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:26:04 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:32:35 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:26:04 -0000	1.27
+++ sources	28 Sep 2007 21:32:35 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:33:27 -0700
Subject: [pkgdb] quilt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709282133.l8SLXWcT029761@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for quilt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of quilt in Fedora EPEL 5 to jwboyer
Kevin Fenzi (kevin) approved watchbugzilla on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved watchcommits on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved commit on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved build on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved approveacls on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved checkout on quilt (Fedora EPEL 5) for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:33:27 -0700
Subject: [pkgdb] quilt (Fedora EPEL, 4) updated by kevin
Message-ID: <200709282133.l8SLXWcX029761@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for quilt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) changed owner of quilt in Fedora EPEL 4 to jwboyer
Kevin Fenzi (kevin) approved watchbugzilla on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved watchcommits on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved commit on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved build on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved approveacls on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved checkout on quilt (Fedora EPEL 4) for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:56 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:33:56 -0400
Subject: rpms/cobbler/F-7 .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282133.l8SLXu8K027391@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:28:07 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:33:23 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:28:07 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:33:23 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:28:07 -0000	1.27
+++ sources	28 Sep 2007 21:33:23 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:35:20 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:35:20 -0400
Subject: rpms/cobbler/FC-6 .cvsignore, 1.29, 1.30 cobbler.spec, 1.32,
	1.33 sources, 1.30, 1.31
Message-ID: <200709282135.l8SLZKUA027428@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27403

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Aug 2007 16:29:32 -0000	1.29
+++ .cvsignore	28 Sep 2007 21:34:47 -0000	1.30
@@ -26,3 +26,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cobbler.spec	30 Aug 2007 16:29:32 -0000	1.32
+++ cobbler.spec	28 Sep 2007 21:34:47 -0000	1.33
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2007 16:29:32 -0000	1.30
+++ sources	28 Sep 2007 21:34:47 -0000	1.31
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:08 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:36:08 -0400
Subject: rpms/cobbler/EL-5 .cvsignore, 1.29, 1.30 cobbler.spec, 1.32,
	1.33 sources, 1.30, 1.31
Message-ID: <200709282136.l8SLa8hG027466@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27434

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Aug 2007 16:31:08 -0000	1.29
+++ .cvsignore	28 Sep 2007 21:35:35 -0000	1.30
@@ -26,3 +26,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cobbler.spec	30 Aug 2007 16:31:08 -0000	1.32
+++ cobbler.spec	28 Sep 2007 21:35:35 -0000	1.33
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2007 16:31:08 -0000	1.30
+++ sources	28 Sep 2007 21:35:35 -0000	1.31
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:20 -0700
Subject: [pkgdb] quake3 was added for jwrdegoede
Message-ID: <200709282136.l8SLaPIs029982@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package quake3 with summary Quake 3 Arena tournament 3D shooter game
Kevin Fenzi (kevin) has approved Package quake3
Kevin Fenzi (kevin) has added a Fedora devel branch for quake3 with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved quake3 in Fedora devel
Kevin Fenzi (kevin) has approved Package quake3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quake3 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quake3 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quake3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:29 -0700
Subject: [pkgdb] quake3 (Fedora, devel) updated by kevin
Message-ID: <200709282136.l8SLaY9k030007@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on quake3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:29 -0700
Subject: [pkgdb] quake3 (Fedora, 7) updated by kevin
Message-ID: <200709282136.l8SLaY9n030007@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for quake3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on quake3 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:01 -0400
Subject: rpms/quake3 - New directory
Message-ID: <200709282137.l8SLb1rn027523@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3

Log Message:
Directory /cvs/extras/rpms/quake3 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:07 -0400
Subject: rpms/quake3/devel - New directory
Message-ID: <200709282137.l8SLb7wl027532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3/devel

Log Message:
Directory /cvs/extras/rpms/quake3/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:10 -0400
Subject: rpms/quake3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282137.l8SLbAjV027563@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3

Added Files:
	Makefile import.log 
Log Message:
Setup of module quake3


--- NEW FILE Makefile ---
# Top level Makefile for module quake3
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:13 -0400
Subject: rpms/quake3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709282137.l8SLbDFm027579@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module quake3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: quake3
# $Id: Makefile,v 1.1 2007/09/28 21:37:11 kevin Exp $
NAME := quake3
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:38:30 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 17:38:30 -0400
Subject: rpms/gdm/devel gdm.spec,1.295,1.296
Message-ID: <200709282138.l8SLcUix027707@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27677

Modified Files:
	gdm.spec 
Log Message:
- drop redhat-artwork dep, add fedorainfinity-gdm-theme dep



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gdm.spec	28 Sep 2007 18:08:52 -0000	1.295
+++ gdm.spec	28 Sep 2007 21:37:57 -0000	1.296
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -78,7 +78,7 @@
 Requires: usermode
 Requires: /sbin/nologin
 Requires: system-logos
-Requires: redhat-artwork >= 5.0.11-1
+Requires: fedorainfinity-gdm-theme 
 Requires: xorg-x11-server-utils
 Requires: xorg-x11-xkb-utils
 Requires: xorg-x11-xinit
@@ -361,6 +361,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-9
+- drop redhat-artwork dep, add fedorainfinity-gdm-theme dep
+
 * Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-8
 - Another crack at 240853
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:41:27 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:41:27 -0400
Subject: rpms/cobbler/EL-4 .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282141.l8SLfR5g027833@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27811

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:38:41 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:40:55 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:38:41 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:40:55 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:38:41 -0000	1.27
+++ sources	28 Sep 2007 21:40:55 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:42:54 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 17:42:54 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.165,1.166
Message-ID: <200709282142.l8SLgscE027880@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27846

Modified Files:
	nautilus.spec 
Log Message:
- drop redhat-artwork dep. Alex says we don't need it anymore 



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- nautilus.spec	18 Sep 2007 16:23:17 -0000	1.165
+++ nautilus.spec	28 Sep 2007 21:42:22 -0000	1.166
@@ -10,7 +10,6 @@
 %define desktop_file_utils_version 0.7
 %define gnome_desktop_version 2.9.91
 %define redhat_menus_version 0.25
-%define redhat_artwork_version 0.41
 %define gnome_vfs2_version 2.19.3
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -30,7 +29,6 @@
 Requires:       filesystem >= 2.1.1-1
 Requires:       desktop-backgrounds-basic >= %{desktop_backgrounds_version}
 Requires:       redhat-menus >= %{redhat_menus_version}
-Requires:       redhat-artwork >= %{redhat_artwork_version}
 Requires:       gnome-vfs2 >= %{gnome_vfs2_version}
 Requires:       gnome-vfs2-smb
 Requires:       eel2 >= %{eel2_version}
@@ -221,6 +219,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- drop redhat-artwork dep. Alex says we don't need it anymore 
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:43:34 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:43:34 -0400
Subject: rpms/koan/devel .cvsignore, 1.15, 1.16 koan.spec, 1.23, 1.24 sources,
	1.18, 1.19
Message-ID: <200709282143.l8SLhYGP027908@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Aug 2007 21:43:08 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:43:02 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- koan.spec	18 Sep 2007 14:54:01 -0000	1.23
+++ koan.spec	28 Sep 2007 21:43:02 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	14 Aug 2007 21:43:08 -0000	1.18
+++ sources	28 Sep 2007 21:43:02 -0000	1.19
@@ -1 +1,2 @@
 f8a7fe8642f564ed79fb46510917e04b  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:46:42 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:46:42 -0400
Subject: rpms/koan/F-7 .cvsignore, 1.15, 1.16 koan.spec, 1.20, 1.21 sources, 
	1.18, 1.19
Message-ID: <200709282146.l8SLkgxO027967@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27936

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 16:42:19 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:46:08 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/koan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- koan.spec	30 Aug 2007 16:42:19 -0000	1.20
+++ koan.spec	28 Sep 2007 21:46:08 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Aug 2007 16:42:19 -0000	1.18
+++ sources	28 Sep 2007 21:46:08 -0000	1.19
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:47:24 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 28 Sep 2007 17:47:24 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.55, 1.56 sources, 1.63,
	1.64 sugar.spec, 1.74, 1.75
Message-ID: <200709282147.l8SLlOOF028024@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27975

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.60.20070928gitb8ec83c5b8
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	20 Sep 2007 19:50:20 -0000	1.55
+++ .cvsignore	28 Sep 2007 21:46:51 -0000	1.56
@@ -1 +1 @@
-sugar-0.65-git5a595ea04e.tar.bz2
+sugar-0.65-gitb8ec83c5b8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	26 Sep 2007 15:32:16 -0000	1.63
+++ sources	28 Sep 2007 21:46:51 -0000	1.64
@@ -1 +1 @@
-de11dc9d6a1bb99b36f7beeea453e210  sugar-0.65-git5a595ea04e.tar.bz2
+6696631569d4e9fc895c63109b0e600c  sugar-0.65-gitb8ec83c5b8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sugar.spec	26 Sep 2007 15:32:16 -0000	1.74
+++ sugar.spec	28 Sep 2007 21:46:51 -0000	1.75
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070926git
-%define commitid 5a595ea04e
+%define alphatag 20070928git
+%define commitid b8ec83c5b8
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.59.%{alphatag}5a595ea04e
+Release: 0.60.%{alphatag}b8ec83c5b8
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.60.20070928gitb8ec83c5b8
+- New snapshot
+
 * Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:47:32 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:47:32 -0400
Subject: rpms/koan/FC-6 .cvsignore, 1.17, 1.18 koan.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <200709282147.l8SLlWYD028064@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27998

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Aug 2007 16:43:41 -0000	1.17
+++ .cvsignore	28 Sep 2007 21:47:00 -0000	1.18
@@ -14,3 +14,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	30 Aug 2007 16:43:41 -0000	1.22
+++ koan.spec	28 Sep 2007 21:47:00 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Aug 2007 16:43:41 -0000	1.19
+++ sources	28 Sep 2007 21:47:00 -0000	1.20
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:48:25 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:48:25 -0400
Subject: rpms/koan/EL-4 .cvsignore, 1.15, 1.16 koan.spec, 1.19, 1.20 sources,
	1.18, 1.19
Message-ID: <200709282148.l8SLmPX1028117@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28075

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 16:45:52 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:47:53 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koan.spec	30 Aug 2007 16:45:52 -0000	1.19
+++ koan.spec	28 Sep 2007 21:47:53 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Aug 2007 16:45:52 -0000	1.18
+++ sources	28 Sep 2007 21:47:53 -0000	1.19
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:49:21 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:49:21 -0400
Subject: rpms/koan/EL-5 .cvsignore, 1.17, 1.18 koan.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <200709282149.l8SLnLnm028175@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28125

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Aug 2007 16:44:48 -0000	1.17
+++ .cvsignore	28 Sep 2007 21:48:48 -0000	1.18
@@ -14,3 +14,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	30 Aug 2007 16:44:48 -0000	1.22
+++ koan.spec	28 Sep 2007 21:48:48 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Aug 2007 16:44:48 -0000	1.19
+++ sources	28 Sep 2007 21:48:48 -0000	1.20
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:18:05 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:18:05 -0400
Subject: rpms/lybniz/devel lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709282218.l8SMI5bd003129@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3056/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Initial lybniz import


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:17:32 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:17:32 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:27:33 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:27:33 -0400
Subject: rpms/lybniz/F-7 lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE, 1.1
Message-ID: <200709282227.l8SMRXvj003632@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3621/F-7

Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Copy devel/ to F-7 & FC-6 (initial import for F-7 & FC-6)


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release



From fedora-extras-commits at redhat.com  Fri Sep 28 22:27:36 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:27:36 -0400
Subject: rpms/lybniz/FC-6 lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE, 1.1
Message-ID: <200709282227.l8SMRanJ003652@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3621/FC-6

Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Copy devel/ to F-7 & FC-6 (initial import for F-7 & FC-6)


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 28 Sep 2007 18:37:26 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.43,1.44
Message-ID: <200709282237.l8SMbQTE003953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3896

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.9-91.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- em8300-kmod.spec	25 Sep 2007 16:53:03 -0000	1.43
+++ em8300-kmod.spec	28 Sep 2007 22:36:54 -0000	1.44
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.7-85.fc7}
+%{!?kversion: %define kversion 2.6.22.9-91.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.9-91.fc7.
+
 * Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.7-85.fc7.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:40 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:37:40 -0400
Subject: rpms/lybniz/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709282237.l8SMbeue003957@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890/F-7

Modified Files:
	.cvsignore sources 
Log Message:
Oops, forgot to "make new-sources"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:37:08 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:37:08 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:43 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:37:43 -0400
Subject: rpms/lybniz/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709282237.l8SMbh2p003961@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
Oops, forgot to "make new-sources"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:37:11 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:37:11 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 23:09:53 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 28 Sep 2007 19:09:53 -0400
Subject: rpms/system-switch-java/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 system-switch-java.spec, 1.7,
	1.8 system-switch-java-trailing-newlines.patch, 1.1, NONE
Message-ID: <200709282309.l8SN9rSW011360@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/system-switch-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338

Modified Files:
	.cvsignore sources system-switch-java.spec 
Removed Files:
	system-switch-java-trailing-newlines.patch 
Log Message:
* Fri Sep 28 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.1-1
- Import system-switch-java 1.1.1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jun 2007 23:11:27 -0000	1.3
+++ .cvsignore	28 Sep 2007 23:09:21 -0000	1.4
@@ -1 +1 @@
-system-switch-java-1.1.0.tar.gz
+system-switch-java-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jun 2007 23:11:27 -0000	1.3
+++ sources	28 Sep 2007 23:09:21 -0000	1.4
@@ -1 +1 @@
-c6608498dfb9c239fdc4b6deffd50a9a  system-switch-java-1.1.0.tar.gz
+9a4cb0fa553a2addb92619ead408b271  system-switch-java-1.1.1.tar.gz


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-switch-java.spec	21 Jul 2007 05:20:04 -0000	1.7
+++ system-switch-java.spec	28 Sep 2007 23:09:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name: system-switch-java
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Summary: A tool for changing the default Java toolset
 
 Group: Applications/System
@@ -8,7 +8,6 @@
 URL: ftp://sources.redhat.com/pub/rhug
 Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-desktop.patch
-Patch1: %{name}-trailing-newlines.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -36,7 +35,6 @@
 %prep
 %setup -q
 %patch0
-%patch1
 
 %build
 %configure
@@ -69,6 +67,9 @@
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Fri Sep 28 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.1-1
+- Import system-switch-java 1.1.1.
+
 * Sat Jul 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-4
 - Tolerate trailing newlines in alternatives file.
 - Bump release number.


--- system-switch-java-trailing-newlines.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 23:14:09 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 19:14:09 -0400
Subject: rpms/lybniz/F-7 lybniz.spec,1.1,1.2
Message-ID: <200709282314.l8SNE9gR011509@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460/F-7

Modified Files:
	lybniz.spec 
Log Message:
Buildsys can't find source? Bump.




Index: lybniz.spec
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/lybniz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lybniz.spec	28 Sep 2007 22:27:31 -0000	1.1
+++ lybniz.spec	28 Sep 2007 23:13:37 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           lybniz
 Version:        1.3
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        A function graph plotter
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5.1
+- Bump
+
 * Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
 - Fix changelog version
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:14:12 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 19:14:12 -0400
Subject: rpms/lybniz/FC-6 lybniz.spec,1.1,1.2
Message-ID: <200709282314.l8SNECnu011512@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460/FC-6

Modified Files:
	lybniz.spec 
Log Message:
Buildsys can't find source? Bump.




Index: lybniz.spec
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/lybniz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lybniz.spec	28 Sep 2007 22:27:34 -0000	1.1
+++ lybniz.spec	28 Sep 2007 23:13:39 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           lybniz
 Version:        1.3
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        A function graph plotter
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5.1
+- Bump
+
 * Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
 - Fix changelog version
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:23:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 28 Sep 2007 19:23:30 -0400
Subject: rpms/grace/devel grace-detect-netcdf.diff, NONE, 1.1 grace.spec,
	1.17, 1.18
Message-ID: <200709282323.l8SNNU8R011960@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11930

Modified Files:
	grace.spec 
Added Files:
	grace-detect-netcdf.diff 
Log Message:
* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
- Correctly detect netcdf (signature has changed).
- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.


grace-detect-netcdf.diff:

--- NEW FILE grace-detect-netcdf.diff ---
--- configure.old	2007-02-16 22:44:49.000000000 +0000
+++ configure	2007-09-28 23:03:29.000000000 +0100
@@ -15181,7 +15181,7 @@
       int main(void) {
         char *vlib;
         vlib = nc_inq_libvers();
-        if (strcmp(vlib, "3.0") < 0) {
+        if (strcmp(vlib, "\"3.0\"") < 0) {
           exit(1);
         }
         exit(0);


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grace.spec	27 Sep 2007 16:16:02 -0000	1.17
+++ grace.spec	28 Sep 2007 23:22:58 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -14,13 +14,14 @@
 Source2:        %{name}.png
 Source3:	cephes-license.email
 Source4:	LICENSE.cephes
-Patch:          %{name}-gracerc-no_auxiliary.diff
+Patch0:         %{name}-gracerc-no_auxiliary.diff
+Patch1:	        %{name}-detect-netcdf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  xbae-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
 BuildRequires:  desktop-file-utils, font-utils
 
 %if "%{fedora}" < "5"
@@ -31,6 +32,10 @@
 
 Requires:	nedit
 Requires:	htmlview
+%if "%{fedora}" < "8"
+Requires(post): chkfontpath
+Requires(postun): chkfontpath
+%endif
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -53,7 +58,9 @@
 
 %prep
 %setup -q
-%patch
+%patch0
+%patch1
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae
@@ -70,7 +77,6 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -130,14 +136,19 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%if "%{fedora}" >= "8"
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -145,6 +156,9 @@
 
 
 %postun
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -164,8 +178,9 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
+%if "%{fedora}" >= "8"
 %{catalogue}/%{name}-type1
-
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -177,6 +192,11 @@
 
 
 %changelog
+* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
 - Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:39:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 28 Sep 2007 19:39:38 -0400
Subject: rpms/grace/F-7 grace-detect-netcdf.diff, NONE, 1.1 grace.spec, 1.16,
	1.17
Message-ID: <200709282339.l8SNdckl012632@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12593

Modified Files:
	grace.spec 
Added Files:
	grace-detect-netcdf.diff 
Log Message:
* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
- Correctly detect netcdf (signature has changed).
- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.


grace-detect-netcdf.diff:

--- NEW FILE grace-detect-netcdf.diff ---
--- configure.old	2007-02-16 22:44:49.000000000 +0000
+++ configure	2007-09-28 23:03:29.000000000 +0100
@@ -15181,7 +15181,7 @@
       int main(void) {
         char *vlib;
         vlib = nc_inq_libvers();
-        if (strcmp(vlib, "3.0") < 0) {
+        if (strcmp(vlib, "\"3.0\"") < 0) {
           exit(1);
         }
         exit(0);


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-7/grace.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grace.spec	28 Aug 2007 17:42:40 -0000	1.16
+++ grace.spec	28 Sep 2007 23:39:06 -0000	1.17
@@ -1,6 +1,9 @@
+%define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
+
 Name:           grace
 Version:        5.1.21
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -11,13 +14,14 @@
 Source2:        %{name}.png
 Source3:	cephes-license.email
 Source4:	LICENSE.cephes
-Patch:          %{name}-gracerc-no_auxiliary.diff
+Patch0:         %{name}-gracerc-no_auxiliary.diff
+Patch1:	        %{name}-detect-netcdf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  xbae-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
 BuildRequires:  desktop-file-utils, font-utils
 
 %if "%{fedora}" < "5"
@@ -28,8 +32,10 @@
 
 Requires:	nedit
 Requires:	htmlview
+%if "%{fedora}" < "8"
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
+%endif
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -52,7 +58,9 @@
 
 %prep
 %setup -q
-%patch
+%patch0
+%patch1
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae
@@ -69,7 +77,6 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -129,13 +136,19 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%if "%{fedora}" >= "8"
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -143,7 +156,9 @@
 
 
 %postun
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -163,7 +178,9 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
-
+%if "%{fedora}" >= "8"
+%{catalogue}/%{name}-type1
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -175,6 +192,14 @@
 
 
 %changelog
+* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
+- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Sat Sep 29 03:08:10 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Fri, 28 Sep 2007 23:08:10 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.11, 1.12 pulseaudio.spec, 1.20, 
	1.21 sources, 1.13, 1.14
Message-ID: <200709290308.l8T38AZa011045@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11023

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
Another SVN snapshot, fixing a couple of subtle bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Sep 2007 03:04:46 -0000	1.11
+++ .cvsignore	29 Sep 2007 03:07:37 -0000	1.12
@@ -1 +1 @@
-pulseaudio-0.9.7.svn20070925.tar.gz
+pulseaudio-0.9.7.svn20070929.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pulseaudio.spec	25 Sep 2007 15:55:23 -0000	1.20
+++ pulseaudio.spec	29 Sep 2007 03:07:37 -0000	1.21
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.13.svn20070925%{?dist}
+Release:	0.14.svn20070929%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070925.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070929.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -332,6 +332,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Sat Sep 29 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.14.svn20070929
+- Another SVN snapshot, fixing a couple of subtle bugs
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.13.svn20070925
 - Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Sep 2007 03:04:46 -0000	1.13
+++ sources	29 Sep 2007 03:07:37 -0000	1.14
@@ -1 +1 @@
-2503ce94200e8c79b1f1e77fd922b0e3  pulseaudio-0.9.7.svn20070925.tar.gz
+0100c6c74af31d3c1f918ed52bd929ee  pulseaudio-0.9.7.svn20070929.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 04:24:17 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 29 Sep 2007 00:24:17 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.50, 1.51 NetworkManager.spec,
	1.173, 1.174 sources, 1.69, 1.70
Message-ID: <200709290424.l8T4OH6B018739@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18717

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2914
- New snapshot
	- Add WPA passphrase support to password dialog
	- Applet now reflects actual VPN behavior of one active connection
	- Applet now notices VPN active connections on startup
	- Fix connections with some WPA and WEP keys




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	28 Sep 2007 03:29:30 -0000	1.50
+++ .cvsignore	29 Sep 2007 04:23:37 -0000	1.51
@@ -16,3 +16,5 @@
 NetworkManager-0.7.0.svn2886.tar.gz
 NetworkManager-0.7.0.svn2907.tar.gz
 nm-applet-0.7.0.svn202.tar.gz
+NetworkManager-0.7.0.svn2914.tar.gz
+nm-applet-0.7.0.svn207.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- NetworkManager.spec	28 Sep 2007 03:29:30 -0000	1.173
+++ NetworkManager.spec	29 Sep 2007 04:23:37 -0000	1.174
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2907
+%define snapshot svn2914
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn202.tar.gz
+Source1: nm-applet-%{version}.svn207.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -260,6 +260,13 @@
 
 
 %changelog
+* Fri Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2914
+- New snapshot
+	- Add WPA passphrase support to password dialog
+	- Applet now reflects actual VPN behavior of one active connection
+	- Applet now notices VPN active connections on startup
+	- Fix connections with some WPA and WEP keys
+
 * Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
 - New snapshot
 	- VPN support (only vpnc plugin ported at this time)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	28 Sep 2007 03:29:30 -0000	1.69
+++ sources	29 Sep 2007 04:23:37 -0000	1.70
@@ -1,2 +1,2 @@
-14197b29863a439baa51f1b9bc5403da  NetworkManager-0.7.0.svn2907.tar.gz
-89e397896518d51c02a6a1f700564a9c  nm-applet-0.7.0.svn202.tar.gz
+44be9d03bdb526f100d73a2a88cc7d00  NetworkManager-0.7.0.svn2914.tar.gz
+7ed286b81c305d7541ca1571dfab0a40  nm-applet-0.7.0.svn207.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 04:55:22 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 29 Sep 2007 00:55:22 -0400
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.11,
	1.12 NetworkManager-vpnc.spec, 1.26, 1.27 sources, 1.12,
	1.13 NetworkManager-vpnc-0.6.4-servpath.patch, 1.1, NONE
Message-ID: <200709290455.l8T4tMYU019176@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19152

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Removed Files:
	NetworkManager-vpnc-0.6.4-servpath.patch 
Log Message:
* Thu Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2914
- Fix .name file on 64-bit systems




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Sep 2007 03:52:58 -0000	1.11
+++ .cvsignore	29 Sep 2007 04:54:48 -0000	1.12
@@ -4,3 +4,4 @@
 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


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- NetworkManager-vpnc.spec	28 Sep 2007 04:43:29 -0000	1.26
+++ NetworkManager-vpnc.spec	29 Sep 2007 04:54:48 -0000	1.27
@@ -4,7 +4,7 @@
 %define vpnc_version        0.3.3-3
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn2910
+%define svn_snapshot svn2914
 
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
@@ -15,7 +15,6 @@
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.gz
-Patch3:    NetworkManager-vpnc-0.6.4-servpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch3 -p1 -b .servpath
 
 
 %build
@@ -98,6 +96,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Sep 2007 03:52:58 -0000	1.12
+++ sources	29 Sep 2007 04:54:48 -0000	1.13
@@ -1 +1 @@
-248b55f9601a6c34bdf9f422f5de2f0c  NetworkManager-vpnc-0.7.0.svn2910.tar.gz
+ffd945cc9327717b981fbbf14a5cb8b9  NetworkManager-vpnc-0.7.0.svn2914.tar.gz


--- NetworkManager-vpnc-0.6.4-servpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 05:13:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Sat, 29 Sep 2007 01:13:11 -0400
Subject: rpms/aboot/devel aboot-1.0.doc_install_fix.patch, NONE,
	1.1 aboot-optflags.patch, NONE, 1.1 aboot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709290513.l8T5DBq9025710@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25672/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aboot-1.0.doc_install_fix.patch aboot-optflags.patch 
	aboot.spec 
Log Message:

Initial import. Review bz#294641


aboot-1.0.doc_install_fix.patch:

--- NEW FILE aboot-1.0.doc_install_fix.patch ---
diff -up aboot-1.0_pre20040408/doc/man/Makefile.install_fix aboot-1.0_pre20040408/doc/man/Makefile
--- aboot-1.0_pre20040408/doc/man/Makefile.install_fix	2007-09-17 11:36:51.000000000 +0200
+++ aboot-1.0_pre20040408/doc/man/Makefile	2007-09-17 11:42:28.000000000 +0200
@@ -32,20 +32,20 @@ clean:
 	rm -f aboot.8 aboot.conf.5 abootconf.8 isomarkboot.1 sdisklabel.8 netabootwrap.1 manpage.log manpage.links manpage.refs
 
 aboot.8: aboot.sgml
-	nsgmls aboot.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man aboot.sgml
 
 aboot.conf.5: aboot.conf.sgml
-	nsgmls aboot.conf.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man aboot.conf.sgml
 
 abootconf.8: abootconf.sgml
-	nsgmls abootconf.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man abootconf.sgml
 
 isomarkboot.1: isomarkboot.sgml
-	nsgmls isomarkboot.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man isomarkboot.sgml
 
 netabootwrap.1: netabootwrap.sgml
-	nsgmls netabootwrap.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man netabootwrap.sgml
 
 sdisklabel.8: sdisklabel.sgml
-	nsgmls sdisklabel.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man sdisklabel.sgml

aboot-optflags.patch:

--- NEW FILE aboot-optflags.patch ---
diff -up aboot-1.0_pre20040408/Makefile.optflags aboot-1.0_pre20040408/Makefile
--- aboot-1.0_pre20040408/Makefile.optflags	2007-09-27 15:31:38.000000000 +0200
+++ aboot-1.0_pre20040408/Makefile	2007-09-27 15:32:03.000000000 +0200
@@ -18,6 +18,7 @@ VMLINUXGZ	= $(KSRC)/arch/alpha/boot/vmli
 
 # for boot testing
 #CFGDEFS       	= -DDEBUG_ISO -DDEBUG_ROCK -DDEBUG_EXT2 -DDEBUG
+CFGDEFS = $(OPTFLAGS)
 
 # root, aka prefix
 root		=


--- NEW FILE aboot.spec ---
%define			prever	pre20040408
Summary:		A bootloader which can be started from the SRM console
Name:			aboot
Version:		1.0
Release:		0.1.%{prever}%{?dist}
ExclusiveArch:	alpha
License:		GPLv2+
Group:			System Environment/Base
URL:			http://www.sf.net/projects/aboot
Source0:		http://aboot.sourceforge.net/tarballs/aboot-%{version}_%{prever}.tar.bz2
Patch0:			aboot_1.0~%{prever}-2.diff.gz
Patch1:			aboot-1.0.doc_install_fix.patch
Patch2:			aboot-optflags.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:	kernel-devel, docbook-utils

%description
The aboot program is the preferred way of booting Linux when using SRM
firmware (the firmware normally used to boot an DEC UNIX). Aboot supports
the creation of bootable block devices and contains a program which can
load Linux kernels from a filesystem which is bootable by SRM.  Aboot
also supports direct booting from various filesystems (ext2, ISO9660,
UFS), booting of executable object files (ELF and ECOFF), booting of
compressed kernels, network booting (using bootp), partition tables in
DEC UNIX format, and interactive booting and default configurations for
SRM consoles that cannot pass long option strings.

If you are installing Fedora or Red Hat Linux on an Alpha, you'll need to
install the aboot package.

%prep
%setup -q -n %{name}-%{version}_%{prever}
%patch0 -p1
%patch1 -p1 -b .doc_install_fix
%patch2 -p1 -b .optflags

%build
sed -ie "s^KSRC.*=.*$^KSRC=/lib/modules/`uname -r`/build^" Makefile
export OPTFLAGS="%{optflags}"
make
cd doc/man && make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
chmod go= $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
make root=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT/sbin install

mv -f sdisklabel/README sdisklabel/README-sdisklabel || true

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc INSTALL README ChangeLog TODO aboot.conf sdisklabel/README-sdisklabel COPYING
%attr(644, root, root) /boot/bootlx
/sbin/abootconf
/sbin/e2writeboot
/sbin/isomarkboot
/sbin/swriteboot
%defattr(0644,root,root)
%{_mandir}/man8/*
%{_mandir}/man5/*
%{_mandir}/man1/*

%changelog
* Thu Sep 27 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0-0.1.pre20040408
- bz#294641:
  - New versioning - versioning guidelines
  - Add patch to add global rpm cflags and use 'em
  - Fix manpage attrs - defattr

* Fri Sep 21 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0_pre20040408-2
- Fix some rpmlint warnings, bz#294641
- Fix license: GPLv2+, bz#294641

* Mon Aug 20 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0_pre20040408-1
- Rebuild in koji
- Cleanup spec; Merge RH, AC, MDK spec
- To be included into upstream fp.o hopefully

* Mon Apr  18 2005 Balint Cristian <rezso at rdsor.ro>
- Latest from CVS
- Build for alphacore 1.0
- Fix build with 2.6

* Tue Nov 30 1999 Matt Wilson <msw at redhat.com>
- changed to use ext2 patch based from Ruediger Oertel <ro at suse.de>

* Mon Nov 22 1999 Matt Wilson <msw at redhat.com>
- patched ext2 read code to deal with rev1 filesystems
- added a patch to properly guess IDE cdroms
  (well, sort of)

* Tue Sep 07 1999 Cristian Gafton <gafton at redhat.com>
- add patch to allow it to boot on *large* disks

* Mon Apr 26 1999 Cristian Gafton <gafton at redhat.com>
- patch from Jay Estabrook to make it work with EXT2 filesystems larger
  than 2Gb

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 9)

* Tue Jan 19 1999 Erik Troan <ewt at redhat.com>
- built for Red HAt 6.0

* Tue Sep 15 1998 Richard Henderson <rth at cygnus.com>
- use aboot.lds for elf, so that the phdr comes out right.
- relax the need to have a compiled kernel installed.
- make sdisklabel take partition sizes in sectors, not kilobytes.

* Thu Aug 20 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- corrected a small but essential error in the ELF patch

* Mon Aug  3 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- added a patch to allow booting of ELF images created with binutils >= 2.9
- compiled against glibc 2.0.94

* Sun May 31 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- made changes needed for glibc2 and 2.1.x kernels



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aboot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:31:56 -0000	1.1
+++ .cvsignore	29 Sep 2007 05:12:37 -0000	1.2
@@ -0,0 +1,2 @@
+aboot-1.0_pre20040408.tar.bz2
+aboot_1.0~pre20040408-2.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aboot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:31:56 -0000	1.1
+++ sources	29 Sep 2007 05:12:37 -0000	1.2
@@ -0,0 +1,2 @@
+ac1214102d8304f326655e3e36d89847  aboot-1.0_pre20040408.tar.bz2
+4958ed11b630af923417d0950229704a  aboot_1.0~pre20040408-2.diff.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 06:51:26 2007
From: fedora-extras-commits at redhat.com (Roberto Bagnara (bagnara))
Date: Sat, 29 Sep 2007 02:51:26 -0400
Subject: rpms/ppl/devel ppl.spec,1.6,1.7
Message-ID: <200709290651.l8T6pQad001008@cvs-int.fedora.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv986

Modified Files:
	ppl.spec 
Log Message:
The value of the `License' tag is now `GPLv2+'.
`ppl-swiprolog' dependency on `readline-devel' removed (again).



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ppl.spec	24 Sep 2007 17:30:03 -0000	1.6
+++ ppl.spec	29 Sep 2007 06:50:53 -0000	1.7
@@ -1,10 +1,10 @@
 Name:		ppl
 Version:	0.9
-Release:	15%{?dist}
+Release:	16%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
-License:	GPL
+License:	GPLv2+
 URL:		http://www.cs.unipr.it/ppl/
 Source:		ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{version}.tar.gz
 Patch0:		ppl-0.9-docfiles.patch
@@ -81,7 +81,7 @@
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
 BuildRequires:	pl >= 5.6.0
-Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0, readline-devel
+Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
@@ -277,10 +277,14 @@
 rm -rf %{buildroot}
 
 %changelog
-* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
-- Rebuild for new libgmpxx
+* Sat Sep 29 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-16
+- The value of the `License' tag is now `GPLv2+'.
+- `ppl-swiprolog' dependency on `readline-devel' removed (again).
 
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9-14
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> 0.9-15
+- Rebuild for new libgmpxx.
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> 0.9-14
 - Rebuild for selinux ppc32 issue.
 
 * Fri Jul 06 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-13



From fedora-extras-commits at redhat.com  Sat Sep 29 07:50:52 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 29 Sep 2007 03:50:52 -0400
Subject: rpms/pidgin/devel pidgin.spec,1.33,1.34
Message-ID: <200709290750.l8T7oqn0008019@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7997

Modified Files:
	pidgin.spec 
Log Message:
Build against avahi proper instead of its HOWL compatibility layer



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pidgin.spec	18 Sep 2007 15:27:17 -0000	1.33
+++ pidgin.spec	29 Sep 2007 07:50:19 -0000	1.34
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -142,7 +142,7 @@
 BuildRequires:  dbus-glib-devel >= 0.70
 %endif
 %if %{bonjour_support}
-BuildRequires:	avahi-compat-howl-devel
+BuildRequires:	avahi-devel
 %endif
 # Meanwhile integration (F7+)
 %if %{meanwhile_integration}
@@ -507,6 +507,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Michel Salim <michel.sylvan at gmail.com> - 2.2.0-3
+- Build against avahi proper instead of its HOWL compatibility layer
+
 * Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
 - License clarification
 - Backport patches to fix memory leaks



From fedora-extras-commits at redhat.com  Sat Sep 29 08:04:57 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:04:57 -0400
Subject: rpms/kazehakase/FC-6 .cvsignore, 1.5, 1.6 kazehakase.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200709290804.l8T84vBw015122@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/FC-6

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2007 17:08:05 -0000	1.5
+++ .cvsignore	29 Sep 2007 08:04:25 -0000	1.6
@@ -1 +1,3 @@
-kazehakase-0.4.8.tar.gz
+gscripttable.h.gz
+kazehakase-0.4.9.tar.gz
+kazehakase-svn3235-3237-diff.patch.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/kazehakase.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kazehakase.spec	29 Aug 2007 17:08:05 -0000	1.13
+++ kazehakase.spec	29 Sep 2007 08:04:25 -0000	1.14
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,11 +221,34 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 
-* Thu May 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1.dist.1
-- gecko engine update
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228.dist.1
+- Mass rebuild (buildID or binutils issue)
+
+* Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228
+- Rebuild against new gecko engine.
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-8.svn3228
+- Try svn 3228
+- Disable GTK_DISABLE_DEPRECATED for now
+- License update
+
+* Sat Jul 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-7.svn3227
+- Try svn 3227 to drop GLib patch
+
+* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-5
+- Rebuild against new gecko engine
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
+- Patch to follow the newest GLib symbol
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-2
+- Parse GLib version dependency 
 
 * Wed May 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1
 - 0.4.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2007 17:08:05 -0000	1.5
+++ sources	29 Sep 2007 08:04:25 -0000	1.6
@@ -1 +1,3 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+b94a93fe75d0e7a1645822bfa72145b2  gscripttable.h.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz
+e8882d501ce52ec38af8dca4d1d66a33  kazehakase-svn3235-3237-diff.patch.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:04:55 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:04:55 -0400
Subject: rpms/kazehakase/F-7 .cvsignore, 1.5, 1.6 kazehakase.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200709290804.l8T84tIL015119@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/F-7

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2007 17:08:02 -0000	1.5
+++ .cvsignore	29 Sep 2007 08:04:21 -0000	1.6
@@ -1 +1,3 @@
-kazehakase-0.4.8.tar.gz
+gscripttable.h.gz
+kazehakase-0.4.9.tar.gz
+kazehakase-svn3235-3237-diff.patch.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/kazehakase.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kazehakase.spec	29 Aug 2007 17:08:02 -0000	1.17
+++ kazehakase.spec	29 Sep 2007 08:04:21 -0000	1.18
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,15 +221,35 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 
-* Tue Jul 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-4.dist.1
-- Rebuild against new gecko engine
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228.dist.1
+- Mass rebuild (buildID or binutils issue)
+
+* Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228
+- Rebuild against new gecko engine.
 
-* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-4
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-8.svn3228
+- Try svn 3228
+- Disable GTK_DISABLE_DEPRECATED for now
+- License update
+
+* Sat Jul 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-7.svn3227
+- Try svn 3227 to drop GLib patch
+
+* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-5
 - Rebuild against new gecko engine
 
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
+- Patch to follow the newest GLib symbol
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-2
+- Parse GLib version dependency 
+
 * Wed May 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1
 - 0.4.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2007 17:08:02 -0000	1.5
+++ sources	29 Sep 2007 08:04:21 -0000	1.6
@@ -1 +1,3 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+b94a93fe75d0e7a1645822bfa72145b2  gscripttable.h.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz
+e8882d501ce52ec38af8dca4d1d66a33  kazehakase-svn3235-3237-diff.patch.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:05:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:05:01 -0400
Subject: rpms/kazehakase/devel .cvsignore, 1.8, 1.9 kazehakase.spec, 1.34,
	1.35 sources, 1.8, 1.9
Message-ID: <200709290805.l8T851pU015152@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/devel

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2007 16:45:12 -0000	1.8
+++ .cvsignore	29 Sep 2007 08:04:29 -0000	1.9
@@ -1 +1 @@
-kazehakase-0.4.8.tar.gz
+kazehakase-0.4.9.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kazehakase.spec	29 Aug 2007 16:58:08 -0000	1.34
+++ kazehakase.spec	29 Sep 2007 08:04:29 -0000	1.35
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,6 +221,9 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2007 16:45:12 -0000	1.8
+++ sources	29 Sep 2007 08:04:29 -0000	1.9
@@ -1 +1 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:05:34 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Sep 2007 04:05:34 -0400
Subject: rpms/quake3/devel quake3-1.34-syslibs.patch, NONE,
	1.1 quake3-demo.sh, 
	NONE, 1.1 quake3.autodlrc, NONE, 1.1 quake3.desktop, NONE,
	1.1 quake3.png, NONE, 1.1 quake3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709290805.l8T85Y54015202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	quake3-1.34-syslibs.patch quake3-demo.sh quake3.autodlrc 
	quake3.desktop quake3.png quake3.spec 
Log Message:
initial quake3 import


quake3-1.34-syslibs.patch:

--- NEW FILE quake3-1.34-syslibs.patch ---
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+* memsrc.c
+*
+* Copyright (C) 1994-1996, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains decompression data source routines for the case of
+* reading JPEG data from a memory buffer that is preloaded with the entire
+* JPEG file. This would not seem especially useful at first sight, but
+* a number of people have asked for it.
+* This is really just a stripped-down version of jdatasrc.c. Comparison
+* of this code with jdatasrc.c may be helpful in seeing how to make
+* custom source managers for other purposes.
+*/
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+/* Expanded data source object for memory input */
+
+typedef struct {
+struct jpeg_source_mgr pub; /* public fields */
+
+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+
+/*
+* Initialize source --- called by jpeg_read_header
+* before any data is actually read.
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+/* No work, since jpeg_memory_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.
+*/
+}
+
+
+/*
+* Fill the input buffer --- called whenever buffer is emptied.
+*
+* In this application, this routine should never be called; if it is called,
+* the decompressor has overrun the end of the input buffer, implying we
+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
+* might be the most appropriate response.
+*
+* But what we choose to do in this code is to supply dummy EOI markers
+* in order to force the decompressor to finish processing and supply
+* some sort of output image, no matter how corrupted.
+*/
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+WARNMS(cinfo, JWRN_JPEG_EOF);
+
+/* Create a fake EOI marker */
+src->eoi_buffer[0] = (JOCTET) 0xFF;
+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
+src->pub.next_input_byte = src->eoi_buffer;
+src->pub.bytes_in_buffer = 2;
+
+return TRUE;
+}
+
+
+/*
+* Skip data --- used to skip over a potentially large amount of
+* uninteresting data (such as an APPn marker).
+*
+* If we overrun the end of the buffer, we let fill_input_buffer deal with
+* it. An extremely large skip could cause some time-wasting here, but
+* it really isn't supposed to happen ... and the decompressor will never
+* skip more than 64K anyway.
+*/
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+if (num_bytes > 0) {
+while (num_bytes > (long) src->pub.bytes_in_buffer) {
+num_bytes -= (long) src->pub.bytes_in_buffer;
+(void) fill_input_buffer(cinfo);
+/* note we assume that fill_input_buffer will never return FALSE,
+* so suspension need not be handled.
+*/
+}
+src->pub.next_input_byte += (size_t) num_bytes;
+src->pub.bytes_in_buffer -= (size_t) num_bytes;
+}
+}
+
+
+/*
+* An additional method that can be provided by data source modules is the
+* resync_to_restart method for error recovery in the presence of RST markers.
+* For the moment, this source module just uses the default resync method
+* provided by the JPEG library. That method assumes that no backtracking
+* is possible.
+*/
+
+
+/*
+* Terminate source --- called by jpeg_finish_decompress
+* after all data has been read. Often a no-op.
+*
+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+* application must deal with any cleanup that should happen even
+* for error exit.
+*/
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+/* no work necessary here */
+}
+
+
+/*
+* Prepare for input from a memory buffer.
+*/
+
+GLOBAL(void)
+jpeg_memory_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
+* 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.
+*/
+if (cinfo->src == NULL) { /* first time for this JPEG object? */
+cinfo->src = (struct jpeg_source_mgr *)
+(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+sizeof(my_source_mgr));
+}
+
+src = (my_src_ptr) cinfo->src;
+src->pub.init_source = init_source;
+src->pub.fill_input_buffer = fill_input_buffer;
+src->pub.skip_input_data = skip_input_data;
+src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+src->pub.term_source = term_source;
+
+src->pub.next_input_byte = buffer;
+src->pub.bytes_in_buffer = 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-25 19:37:48.000000000 +0200
+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
  * You may also wish to include "jerror.h".
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <jpeglib.h>
+#include "jpeg_memsrc.h"
+#else
 #define JPEG_INTERNALS
 #include "../jpeg-6/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;
   byte  *buf;
+  size_t bufsize;
+#ifdef USE_SYSTEM_JPEG
+  int i,j;
+  byte *inptr, *outptr;
+#endif
 
   /* 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
   }
 
   memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
+  row_stride = cinfo.output_width * 4;
 
   out = ri.Malloc(memcount);
 
@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
 	buf = ((out+(row_stride*cinfo.output_scanline)));
 	buffer = &buf;
     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+#ifdef USE_SYSTEM_JPEG
+    /* we have RGB data, we need to expand this out to ARGB */
+    inptr = buf + cinfo.output_width * 3 - 1;
+    outptr = buf + row_stride - 1;
+
+    for (i = 0; i < cinfo.output_width; i++) {
+      /* endian dependent? maybe for big endian this must be done after the
+         color/pixel copy? */
+      *outptr-- = 255;
+      for (j = 0; j < 3; j++) {
+        JOCTET color = *inptr--;
+        *outptr-- = color;
+      }
+    }
+#endif
   }
   
   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.
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include <jpeglib.h>
+
+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
+  size_t bufsize);
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:17:27.000000000 +0200
+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
@@ -15,10 +15,23 @@
  * Note that the max_memory_to_use option is ignored by this implementation.
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <stdio.h>
+#include <stdlib.h>
+#include <jpeglib.h>
+
+#undef GLOBAL
+#define GLOBAL
+#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
 
 #include "../renderer/tr_local.h"
 
@@ -83,7 +96,13 @@ GLOBAL void
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
+#ifdef USE_SYSTEM_JPEG
+  fprintf(stderr,
+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
+  exit(1);
+#else
   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#endif
 }
 
 
diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
--- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
@@ -96,6 +96,10 @@ ifndef USE_OPENAL
 USE_OPENAL=1
 endif
 
+ifndef USE_SYSTEM_JPEG
+USE_SYSTEM_JPEG=1
+endif
+
 ifndef USE_OPENAL_DLOPEN
 USE_OPENAL_DLOPEN=0
 endif
@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
   endif
   endif
 
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+  BASE_CFLAGS = 
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL=1
@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
+  endif
+
   ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
   else
@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    CLIENT_LDFLAGS += -ljpeg
+  endif
+
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -970,40 +982,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/jccoefct.o  \
-  $(B)/client/jccolor.o \
-  $(B)/client/jfdctflt.o \
-  $(B)/client/jcdctmgr.o \
-  $(B)/client/jcphuff.o \
-  $(B)/client/jcmainct.o \
-  $(B)/client/jcmarker.o \
-  $(B)/client/jcmaster.o \
-  $(B)/client/jcomapi.o \
-  $(B)/client/jcparam.o \
-  $(B)/client/jcprepct.o \
-  $(B)/client/jcsample.o \
-  $(B)/client/jdapimin.o \
-  $(B)/client/jdapistd.o \
-  $(B)/client/jdatasrc.o \
-  $(B)/client/jdcoefct.o \
-  $(B)/client/jdcolor.o \
-  $(B)/client/jddctmgr.o \
-  $(B)/client/jdhuff.o \
-  $(B)/client/jdinput.o \
-  $(B)/client/jdmainct.o \
-  $(B)/client/jdmarker.o \
-  $(B)/client/jdmaster.o \
-  $(B)/client/jdpostct.o \
-  $(B)/client/jdsample.o \
-  $(B)/client/jdtrans.o \
-  $(B)/client/jerror.o \
-  $(B)/client/jidctflt.o \
-  $(B)/client/jmemmgr.o \
   $(B)/client/jmemnobs.o \
-  $(B)/client/jutils.o \
   \
   $(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
+
+ifneq ($(USE_SYSTEM_JPEG),1)
+  Q3OBJ += \
+    $(B)/client/jcapimin.o \
+    $(B)/client/jchuff.o   \
+    $(B)/client/jcinit.o \
+    $(B)/client/jccoefct.o  \
+    $(B)/client/jccolor.o \
+    $(B)/client/jfdctflt.o \
+    $(B)/client/jcdctmgr.o \
+    $(B)/client/jcphuff.o \
+    $(B)/client/jcmainct.o \
+    $(B)/client/jcmarker.o \
+    $(B)/client/jcmaster.o \
+    $(B)/client/jcomapi.o \
+    $(B)/client/jcparam.o \
+    $(B)/client/jcprepct.o \
+    $(B)/client/jcsample.o \
+    $(B)/client/jdapimin.o \
+    $(B)/client/jdapistd.o \
+    $(B)/client/jdatasrc.o \
+    $(B)/client/jdcoefct.o \
+    $(B)/client/jdcolor.o \
+    $(B)/client/jddctmgr.o \
+    $(B)/client/jdhuff.o \
+    $(B)/client/jdinput.o \
+    $(B)/client/jdmainct.o \
+    $(B)/client/jdmarker.o \
+    $(B)/client/jdmaster.o \
+    $(B)/client/jdpostct.o \
+    $(B)/client/jdsample.o \
+    $(B)/client/jdtrans.o \
+    $(B)/client/jerror.o \
+    $(B)/client/jidctflt.o \
+    $(B)/client/jmemmgr.o \
+    $(B)/client/jutils.o
+else
+Q3OBJ += $(B)/client/jpeg_memsrc.o
+endif
 
 ifeq ($(ARCH),i386)
   Q3OBJ += \


--- NEW FILE quake3-demo.sh ---
#!/bin/bash

set -e

. /usr/share/opengl-games-utils/opengl-game-functions.sh

checkDriOK quake3

if [ ! -f $HOME/.q3a/baseq3/pak0.pk3 ]; then
  set +e
  /usr/share/autodl/AutoDL.py /usr/share/quake3/quake3.autodlrc
  STATUS=$?
  set -e
  # status 2 means download was ok, but the user choice not to start the game
  if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
    cd ~/.q3a
    unzip -qq -u quake3-latest-pk3s.zip
    tail -n +165 linuxq3ademo-1.11-6.x86.gz.sh | gzip -d -c | \
      tar x demoq3/pak0.pk3
    # remove any old versions (if present) otherwise the mv fails
    rm -fr baseq3 missionpack
    mv quake3-latest-pk3s/* .
    mv demoq3/pak0.pk3 baseq3
    rm quake3-latest-pk3s.zip linuxq3ademo-1.11-6.x86.gz.sh
    rmdir quake3-latest-pk3s demoq3
  fi
  if [ "$STATUS" != "0" ]; then
    exit $STATUS
  fi
fi

exec quake3 "$@"


--- NEW FILE quake3.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Quake 3, an ID software game, the original Quake 3 datafiles are needed.

Click Accept, to download the demo version of the Quake3 datafiles, which can be freely downloaded from the internet.

If you own the full version you can use that instead, copy the .pk3 files from the registered version to <home folder>/.q3a/baseq3, and run quake3 again.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]LIMITED USE SOFTWARE LICENSE AGREEMENT

This Limited Use Software License Agreement (the "Agreement") is a legal agreement between you, the end-user, and Id Software, Inc. ("ID").  BY CONTINUING THE INSTALLATION OF THIS GAME DEMO PROGRAM ENTITLED QUAKE III: ARENA (THE "SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS  AGREEMENT.

1.    Grant of License.  Subject to the terms and provisions of this Agreement, ID grants to you the non-exclusive and limited right to use the Software only in executable or object code form. The term "Software" includes all elements of the Software, including, without limitation, data files and screen displays.  You are not receiving any ownership or proprietary right, title or interest in or to the Software or the  copyright, trademarks, or other rights related thereto.  For purposes of this section, "use" means loading the Software into RAM and/or onto computer hard drive, as well as installation of the Software on a hard disk or other storage device and means the uses permitted in section 3. hereinbelow.  You agree that the Software will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act (or any other law governing such matters) by you or anyone at your direction and that you will not utilize and will not authoriz!
 e anyone to utilize, in any other manner, the Software in violation of any applicable law.  The Software may not be downloaded or otherwise exported or exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.

2.    Prohibitions. You, either directly or indirectly, shall not do any of the following acts:

a.    rent the Software;

b.    sell the Software;

c.    lease or lend the Software;

d.    offer the Software on a "pay-per-play" basis;

e.    distribute the Software (except as permitted by section 3. hereinbelow);

f.    in any other manner and through any medium whatsoever commercially exploit the Software or use the Software for any commercial purpose;

g.    disassemble, reverse engineer, decompile, modify or alter the Software including, without limitation, creating or developing extra or add-on levels for the Software;

h.    translate the Software;

i.    reproduce or copy the Software (except as permitted by section 3. hereinbelow);

j.    publicly display the Software;

k.    prepare or develop derivative works based upon the Software; or

l.    remove or alter any legal notices or other markings or legends, such as trademark and copyright notices, affixed on or within the Software.

3.    Permitted Distribution and Copying.  So long as this Agreement accompanies each copy you make of  the Software, and so long as you fully comply, at all times, with this Agreement, ID grants to you the non-exclusive and limited right to copy the Software and to distribute such copies of the Software free of charge for non-commercial purposes which shall include the free of charge distribution of copies of the Software as mounted on the covers of magazines; provided, however, you shall not copy or distribute the Software in any infringing manner or in any manner which violates any law or  third party right and you shall not distribute the Software together with any material which is infringing, libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You agree to label conspicuously as "SHAREWARE" or "DEMO" each CD or other non-electronic copy of the Software that you make and distribute.  ID reserves all rights not granted in this Agreement. Y!
 ou shall not commercially distribute the Software  unless you first  enter into a separate contract with ID, a copy of which you may request, but which ID may decline to execute. For more information visit www.quake3arena.com.

4.    Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C., ??101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder complies with this Agreement.  You agree that you are receiving a copy of the Software by license only and not by sale and that the "first sale" doctrine of 17 U.S.C. ??109 does not apply to your receipt or use of the Software.

5.    NO WARRANTIES.  ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC REQUIREMENTS.  ADDITIONAL STATEMENTS SUCH AS PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. THIS SECTION 5. SHALL SURVIVE CANCELLATION OR TERMINATION OF THIS AGREEMENT.

6.    Governing Law, Venue, Indemnity and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Copyright and other proprietary matters will be governed by United States laws and international treaties.  Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas and you agree to submit to the jurisdiction of the courts in Dallas, Texas for any such litigation. You agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from your breach of this Agreement.  You agree that your unauthorized use of the Software, or any part thereof, may immediately and irreparably damage ID such that ID could not be adequately compensated solely by a !
 monetary award and that at ID's option ID shall be entitled to an injunctive order, in addition to all other available remedies including a monetary award, appropriately restraining and/or prohibiting such unauthorized use without the necessity of ID posting bond or other security. IN ANY CASE, ID AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, LICENSEES, SUBLICENSEES, SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM BY ANY OTHER PARTY.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not !
 apply to you. This Section 6. shall survive cancellation or te!
 rminatio
n of this Agreement.

7.    U.S. Government Restricted Rights. To the extent applicable, the United States Government shall only have those rights to use the Software as expressly stated and expressly limited and restricted in this Agreement, as provided in 48 C.F.R. ???? 227.7201 through 227.7204, inclusive.

8.    General Provisions.  Neither this Agreement nor any part or portion hereof shall be assigned or sublicensed by you.  ID may assign its rights under this Agreement in ID's sole discretion.  Should any provision of this Agreement be held to be void, invalid, unenforceable or illegal by a court of competent jurisdiction, the validity and enforceability of the other provisions shall not be affected thereby.  If any provision is determined to be unenforceable by a court of competent jurisdiction, you agree to a modification of such provision to provide for enforcement of the provision's intent, to the extent permitted by applicable law. Failure of ID to enforce any provision of this Agreement shall not constitute or be construed as a waiver of such provision or of the right to enforce such provision.  Immediately upon your failure to comply with or breach of any term or provision of this Agreement, THIS AGREEMENT AND YOUR LICENSE SHALL AUTOMATICALLY TERMINATE, WITHOUT NOTIC!
 E, AND ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.   In the event this Agreement is terminated, you shall have no right to use the Software, in any manner, and you shall immediately destroy all copies of the Software in your possession, custody or control.

YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]quake3-latest-pk3s.zip[/FILENAME]
	[MD5]308929f1a6b7068c9912c0759e3b0695[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]http://offload1.icculus.org/~zakk/quake3-latest-pk3s.zip[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]linuxq3ademo-1.11-6.x86.gz.sh[/FILENAME]
	[MD5]484610c1ce34272223a52ec331c99d5d[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE quake3.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Quake 3 Arena
Comment=Quake 3 Arena demo launcher, will automatically download the needed data-files
Exec=quake3-demo
Icon=quake3
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE quake3.spec ---
%define prever rc4

Name:           quake3
Version:        1.34
Release:        0.3.%{prever}%{?dist}
Summary:        Quake 3 Arena tournament 3D shooter game
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}
# 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
# rm -fr code/tools/lcc
# popd
# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
Source0:        %{name}-%{version}-%{prever}.tar.bz2
Source1:        %{name}-demo.sh
Source2:        %{name}.autodlrc
Source3:        %{name}.desktop
Source4:        %{name}.png
Patch0:         %{name}-1.34-syslibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
%ifarch %{ix86} x86_64
BuildRequires:  nasm
%endif
Requires:       hicolor-icon-theme autodownloader opengl-games-utils unzip

%description
This package contains the Quake 3 Arena engine. It comes with an applications
menu entry, which will offer to download and install the Quake 3 demo datafiles
for you. If you own a copy of quake 3, you will need to copy the pak?.pk3 files
from the original 1.32 Quake 3 Arena point release as well as pak0.pk3 from the
original CD-ROM to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.


%prep
%setup -q -n %{name}-%{version}-%{prever}
%patch0 -p1 -b .syslibs


%build
# 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" \
    DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
    CROSS_COMPILING=1


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}

install -m 755 build/release-linux-*/ioquake3.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3
install -m 755 build/release-linux-*/ioquake3-smp.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3-smp
install -m 755 build/release-linux-*/ioq3ded.* \
  $RPM_BUILD_ROOT%{_bindir}/q3ded
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/quake3-demo
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
%doc TODO code/jpeg-6/README
%{_bindir}/%{name}*
%{_bindir}/q3ded
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site

* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.2.rc4
- Use autodownloader to download demo files, thus making the game playable
  without the original CD
- Submit for Fedora inclusion now that the game is playable without the CD
- Update to 1.34-rc4
- Use system libjpeg, system SDL, OpenAL and curl headers

* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc2.svn908
- Update to today's svn code (rev. 908), rc2 from the 1.34 branch.

* Mon May 29 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn792
- Update to today's svn code (rev. 792).
- Update the nostrip patch.
- Fix wrapper script since the binary has been renamed from quake3 to
  ioquake3.<arch>, which we rename to plain ioquake3 (in the patch).
- Include new documentation.

* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn649
- Update to today's svn code (rev. 649).
- Update nostrip patch, now pass OPTFLAGS to the build too.
- Build requires subversion (required for make dist).

* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 1.33-0.2.svn470
- Update to today's svn sode (rev. 470).
- Add modular xorg build conditional.
- Revisit nostrip patch for the new code.
- Add (new?) openal-devel build requirement.
- Update %%doc files.

* Sun Nov 13 2005 Matthias Saou <http://freshrpms.net/> 1.33-0.1.svn338
- Update to GPL'ed 1.33 and spec file cleanup.

* Sun Oct 15 2000 Matthias Saou <http://freshrpms.net/> 1.17-1
- Initial RPM based on Loki's 1.17 point release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:37:11 -0000	1.1
+++ .cvsignore	29 Sep 2007 08:04:58 -0000	1.2
@@ -0,0 +1 @@
+quake3-1.34-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:37:11 -0000	1.1
+++ sources	29 Sep 2007 08:04:58 -0000	1.2
@@ -0,0 +1 @@
+14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 08:08:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Sep 2007 04:08:01 -0400
Subject: rpms/quake3/F-7 quake3-1.34-syslibs.patch, NONE, 1.1 quake3-demo.sh,
	NONE, 1.1 quake3.autodlrc, NONE, 1.1 quake3.desktop, NONE,
	1.1 quake3.png, NONE, 1.1 quake3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709290808.l8T881RB015553@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15522

Modified Files:
	.cvsignore sources 
Added Files:
	quake3-1.34-syslibs.patch quake3-demo.sh quake3.autodlrc 
	quake3.desktop quake3.png quake3.spec 
Log Message:
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site


quake3-1.34-syslibs.patch:

--- NEW FILE quake3-1.34-syslibs.patch ---
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+* memsrc.c
+*
+* Copyright (C) 1994-1996, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains decompression data source routines for the case of
+* reading JPEG data from a memory buffer that is preloaded with the entire
+* JPEG file. This would not seem especially useful at first sight, but
+* a number of people have asked for it.
+* This is really just a stripped-down version of jdatasrc.c. Comparison
+* of this code with jdatasrc.c may be helpful in seeing how to make
+* custom source managers for other purposes.
+*/
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+/* Expanded data source object for memory input */
+
+typedef struct {
+struct jpeg_source_mgr pub; /* public fields */
+
+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+
+/*
+* Initialize source --- called by jpeg_read_header
+* before any data is actually read.
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+/* No work, since jpeg_memory_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.
+*/
+}
+
+
+/*
+* Fill the input buffer --- called whenever buffer is emptied.
+*
+* In this application, this routine should never be called; if it is called,
+* the decompressor has overrun the end of the input buffer, implying we
+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
+* might be the most appropriate response.
+*
+* But what we choose to do in this code is to supply dummy EOI markers
+* in order to force the decompressor to finish processing and supply
+* some sort of output image, no matter how corrupted.
+*/
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+WARNMS(cinfo, JWRN_JPEG_EOF);
+
+/* Create a fake EOI marker */
+src->eoi_buffer[0] = (JOCTET) 0xFF;
+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
+src->pub.next_input_byte = src->eoi_buffer;
+src->pub.bytes_in_buffer = 2;
+
+return TRUE;
+}
+
+
+/*
+* Skip data --- used to skip over a potentially large amount of
+* uninteresting data (such as an APPn marker).
+*
+* If we overrun the end of the buffer, we let fill_input_buffer deal with
+* it. An extremely large skip could cause some time-wasting here, but
+* it really isn't supposed to happen ... and the decompressor will never
+* skip more than 64K anyway.
+*/
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+if (num_bytes > 0) {
+while (num_bytes > (long) src->pub.bytes_in_buffer) {
+num_bytes -= (long) src->pub.bytes_in_buffer;
+(void) fill_input_buffer(cinfo);
+/* note we assume that fill_input_buffer will never return FALSE,
+* so suspension need not be handled.
+*/
+}
+src->pub.next_input_byte += (size_t) num_bytes;
+src->pub.bytes_in_buffer -= (size_t) num_bytes;
+}
+}
+
+
+/*
+* An additional method that can be provided by data source modules is the
+* resync_to_restart method for error recovery in the presence of RST markers.
+* For the moment, this source module just uses the default resync method
+* provided by the JPEG library. That method assumes that no backtracking
+* is possible.
+*/
+
+
+/*
+* Terminate source --- called by jpeg_finish_decompress
+* after all data has been read. Often a no-op.
+*
+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+* application must deal with any cleanup that should happen even
+* for error exit.
+*/
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+/* no work necessary here */
+}
+
+
+/*
+* Prepare for input from a memory buffer.
+*/
+
+GLOBAL(void)
+jpeg_memory_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
+* 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.
+*/
+if (cinfo->src == NULL) { /* first time for this JPEG object? */
+cinfo->src = (struct jpeg_source_mgr *)
+(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+sizeof(my_source_mgr));
+}
+
+src = (my_src_ptr) cinfo->src;
+src->pub.init_source = init_source;
+src->pub.fill_input_buffer = fill_input_buffer;
+src->pub.skip_input_data = skip_input_data;
+src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+src->pub.term_source = term_source;
+
+src->pub.next_input_byte = buffer;
+src->pub.bytes_in_buffer = 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-25 19:37:48.000000000 +0200
+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
  * You may also wish to include "jerror.h".
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <jpeglib.h>
+#include "jpeg_memsrc.h"
+#else
 #define JPEG_INTERNALS
 #include "../jpeg-6/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;
   byte  *buf;
+  size_t bufsize;
+#ifdef USE_SYSTEM_JPEG
+  int i,j;
+  byte *inptr, *outptr;
+#endif
 
   /* 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
   }
 
   memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
+  row_stride = cinfo.output_width * 4;
 
   out = ri.Malloc(memcount);
 
@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
 	buf = ((out+(row_stride*cinfo.output_scanline)));
 	buffer = &buf;
     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+#ifdef USE_SYSTEM_JPEG
+    /* we have RGB data, we need to expand this out to ARGB */
+    inptr = buf + cinfo.output_width * 3 - 1;
+    outptr = buf + row_stride - 1;
+
+    for (i = 0; i < cinfo.output_width; i++) {
+      /* endian dependent? maybe for big endian this must be done after the
+         color/pixel copy? */
+      *outptr-- = 255;
+      for (j = 0; j < 3; j++) {
+        JOCTET color = *inptr--;
+        *outptr-- = color;
+      }
+    }
+#endif
   }
   
   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.
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include <jpeglib.h>
+
+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
+  size_t bufsize);
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:17:27.000000000 +0200
+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
@@ -15,10 +15,23 @@
  * Note that the max_memory_to_use option is ignored by this implementation.
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <stdio.h>
+#include <stdlib.h>
+#include <jpeglib.h>
+
+#undef GLOBAL
+#define GLOBAL
+#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
 
 #include "../renderer/tr_local.h"
 
@@ -83,7 +96,13 @@ GLOBAL void
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
+#ifdef USE_SYSTEM_JPEG
+  fprintf(stderr,
+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
+  exit(1);
+#else
   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#endif
 }
 
 
diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
--- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
@@ -96,6 +96,10 @@ ifndef USE_OPENAL
 USE_OPENAL=1
 endif
 
+ifndef USE_SYSTEM_JPEG
+USE_SYSTEM_JPEG=1
+endif
+
 ifndef USE_OPENAL_DLOPEN
 USE_OPENAL_DLOPEN=0
 endif
@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
   endif
   endif
 
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+  BASE_CFLAGS = 
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL=1
@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
+  endif
+
   ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
   else
@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    CLIENT_LDFLAGS += -ljpeg
+  endif
+
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -970,40 +982,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/jccoefct.o  \
-  $(B)/client/jccolor.o \
-  $(B)/client/jfdctflt.o \
-  $(B)/client/jcdctmgr.o \
-  $(B)/client/jcphuff.o \
-  $(B)/client/jcmainct.o \
-  $(B)/client/jcmarker.o \
-  $(B)/client/jcmaster.o \
-  $(B)/client/jcomapi.o \
-  $(B)/client/jcparam.o \
-  $(B)/client/jcprepct.o \
-  $(B)/client/jcsample.o \
-  $(B)/client/jdapimin.o \
-  $(B)/client/jdapistd.o \
-  $(B)/client/jdatasrc.o \
-  $(B)/client/jdcoefct.o \
-  $(B)/client/jdcolor.o \
-  $(B)/client/jddctmgr.o \
-  $(B)/client/jdhuff.o \
-  $(B)/client/jdinput.o \
-  $(B)/client/jdmainct.o \
-  $(B)/client/jdmarker.o \
-  $(B)/client/jdmaster.o \
-  $(B)/client/jdpostct.o \
-  $(B)/client/jdsample.o \
-  $(B)/client/jdtrans.o \
-  $(B)/client/jerror.o \
-  $(B)/client/jidctflt.o \
-  $(B)/client/jmemmgr.o \
   $(B)/client/jmemnobs.o \
-  $(B)/client/jutils.o \
   \
   $(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
+
+ifneq ($(USE_SYSTEM_JPEG),1)
+  Q3OBJ += \
+    $(B)/client/jcapimin.o \
+    $(B)/client/jchuff.o   \
+    $(B)/client/jcinit.o \
+    $(B)/client/jccoefct.o  \
+    $(B)/client/jccolor.o \
+    $(B)/client/jfdctflt.o \
+    $(B)/client/jcdctmgr.o \
+    $(B)/client/jcphuff.o \
+    $(B)/client/jcmainct.o \
+    $(B)/client/jcmarker.o \
+    $(B)/client/jcmaster.o \
+    $(B)/client/jcomapi.o \
+    $(B)/client/jcparam.o \
+    $(B)/client/jcprepct.o \
+    $(B)/client/jcsample.o \
+    $(B)/client/jdapimin.o \
+    $(B)/client/jdapistd.o \
+    $(B)/client/jdatasrc.o \
+    $(B)/client/jdcoefct.o \
+    $(B)/client/jdcolor.o \
+    $(B)/client/jddctmgr.o \
+    $(B)/client/jdhuff.o \
+    $(B)/client/jdinput.o \
+    $(B)/client/jdmainct.o \
+    $(B)/client/jdmarker.o \
+    $(B)/client/jdmaster.o \
+    $(B)/client/jdpostct.o \
+    $(B)/client/jdsample.o \
+    $(B)/client/jdtrans.o \
+    $(B)/client/jerror.o \
+    $(B)/client/jidctflt.o \
+    $(B)/client/jmemmgr.o \
+    $(B)/client/jutils.o
+else
+Q3OBJ += $(B)/client/jpeg_memsrc.o
+endif
 
 ifeq ($(ARCH),i386)
   Q3OBJ += \


--- NEW FILE quake3-demo.sh ---
#!/bin/bash

set -e

. /usr/share/opengl-games-utils/opengl-game-functions.sh

checkDriOK quake3

if [ ! -f $HOME/.q3a/baseq3/pak0.pk3 ]; then
  set +e
  /usr/share/autodl/AutoDL.py /usr/share/quake3/quake3.autodlrc
  STATUS=$?
  set -e
  # status 2 means download was ok, but the user choice not to start the game
  if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
    cd ~/.q3a
    unzip -qq -u quake3-latest-pk3s.zip
    tail -n +165 linuxq3ademo-1.11-6.x86.gz.sh | gzip -d -c | \
      tar x demoq3/pak0.pk3
    # remove any old versions (if present) otherwise the mv fails
    rm -fr baseq3 missionpack
    mv quake3-latest-pk3s/* .
    mv demoq3/pak0.pk3 baseq3
    rm quake3-latest-pk3s.zip linuxq3ademo-1.11-6.x86.gz.sh
    rmdir quake3-latest-pk3s demoq3
  fi
  if [ "$STATUS" != "0" ]; then
    exit $STATUS
  fi
fi

exec quake3 "$@"


--- NEW FILE quake3.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Quake 3, an ID software game, the original Quake 3 datafiles are needed.

Click Accept, to download the demo version of the Quake3 datafiles, which can be freely downloaded from the internet.

If you own the full version you can use that instead, copy the .pk3 files from the registered version to <home folder>/.q3a/baseq3, and run quake3 again.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]LIMITED USE SOFTWARE LICENSE AGREEMENT

This Limited Use Software License Agreement (the "Agreement") is a legal agreement between you, the end-user, and Id Software, Inc. ("ID").  BY CONTINUING THE INSTALLATION OF THIS GAME DEMO PROGRAM ENTITLED QUAKE III: ARENA (THE "SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS  AGREEMENT.

1.    Grant of License.  Subject to the terms and provisions of this Agreement, ID grants to you the non-exclusive and limited right to use the Software only in executable or object code form. The term "Software" includes all elements of the Software, including, without limitation, data files and screen displays.  You are not receiving any ownership or proprietary right, title or interest in or to the Software or the  copyright, trademarks, or other rights related thereto.  For purposes of this section, "use" means loading the Software into RAM and/or onto computer hard drive, as well as installation of the Software on a hard disk or other storage device and means the uses permitted in section 3. hereinbelow.  You agree that the Software will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act (or any other law governing such matters) by you or anyone at your direction and that you will not utilize and will not authoriz!
 e anyone to utilize, in any other manner, the Software in violation of any applicable law.  The Software may not be downloaded or otherwise exported or exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.

2.    Prohibitions. You, either directly or indirectly, shall not do any of the following acts:

a.    rent the Software;

b.    sell the Software;

c.    lease or lend the Software;

d.    offer the Software on a "pay-per-play" basis;

e.    distribute the Software (except as permitted by section 3. hereinbelow);

f.    in any other manner and through any medium whatsoever commercially exploit the Software or use the Software for any commercial purpose;

g.    disassemble, reverse engineer, decompile, modify or alter the Software including, without limitation, creating or developing extra or add-on levels for the Software;

h.    translate the Software;

i.    reproduce or copy the Software (except as permitted by section 3. hereinbelow);

j.    publicly display the Software;

k.    prepare or develop derivative works based upon the Software; or

l.    remove or alter any legal notices or other markings or legends, such as trademark and copyright notices, affixed on or within the Software.

3.    Permitted Distribution and Copying.  So long as this Agreement accompanies each copy you make of  the Software, and so long as you fully comply, at all times, with this Agreement, ID grants to you the non-exclusive and limited right to copy the Software and to distribute such copies of the Software free of charge for non-commercial purposes which shall include the free of charge distribution of copies of the Software as mounted on the covers of magazines; provided, however, you shall not copy or distribute the Software in any infringing manner or in any manner which violates any law or  third party right and you shall not distribute the Software together with any material which is infringing, libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You agree to label conspicuously as "SHAREWARE" or "DEMO" each CD or other non-electronic copy of the Software that you make and distribute.  ID reserves all rights not granted in this Agreement. Y!
 ou shall not commercially distribute the Software  unless you first  enter into a separate contract with ID, a copy of which you may request, but which ID may decline to execute. For more information visit www.quake3arena.com.

4.    Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C., ??101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder complies with this Agreement.  You agree that you are receiving a copy of the Software by license only and not by sale and that the "first sale" doctrine of 17 U.S.C. ??109 does not apply to your receipt or use of the Software.

5.    NO WARRANTIES.  ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC REQUIREMENTS.  ADDITIONAL STATEMENTS SUCH AS PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. THIS SECTION 5. SHALL SURVIVE CANCELLATION OR TERMINATION OF THIS AGREEMENT.

6.    Governing Law, Venue, Indemnity and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Copyright and other proprietary matters will be governed by United States laws and international treaties.  Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas and you agree to submit to the jurisdiction of the courts in Dallas, Texas for any such litigation. You agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from your breach of this Agreement.  You agree that your unauthorized use of the Software, or any part thereof, may immediately and irreparably damage ID such that ID could not be adequately compensated solely by a !
 monetary award and that at ID's option ID shall be entitled to an injunctive order, in addition to all other available remedies including a monetary award, appropriately restraining and/or prohibiting such unauthorized use without the necessity of ID posting bond or other security. IN ANY CASE, ID AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, LICENSEES, SUBLICENSEES, SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM BY ANY OTHER PARTY.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not !
 apply to you. This Section 6. shall survive cancellation or te!
 rminatio
n of this Agreement.

7.    U.S. Government Restricted Rights. To the extent applicable, the United States Government shall only have those rights to use the Software as expressly stated and expressly limited and restricted in this Agreement, as provided in 48 C.F.R. ???? 227.7201 through 227.7204, inclusive.

8.    General Provisions.  Neither this Agreement nor any part or portion hereof shall be assigned or sublicensed by you.  ID may assign its rights under this Agreement in ID's sole discretion.  Should any provision of this Agreement be held to be void, invalid, unenforceable or illegal by a court of competent jurisdiction, the validity and enforceability of the other provisions shall not be affected thereby.  If any provision is determined to be unenforceable by a court of competent jurisdiction, you agree to a modification of such provision to provide for enforcement of the provision's intent, to the extent permitted by applicable law. Failure of ID to enforce any provision of this Agreement shall not constitute or be construed as a waiver of such provision or of the right to enforce such provision.  Immediately upon your failure to comply with or breach of any term or provision of this Agreement, THIS AGREEMENT AND YOUR LICENSE SHALL AUTOMATICALLY TERMINATE, WITHOUT NOTIC!
 E, AND ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.   In the event this Agreement is terminated, you shall have no right to use the Software, in any manner, and you shall immediately destroy all copies of the Software in your possession, custody or control.

YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]quake3-latest-pk3s.zip[/FILENAME]
	[MD5]308929f1a6b7068c9912c0759e3b0695[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]http://offload1.icculus.org/~zakk/quake3-latest-pk3s.zip[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]linuxq3ademo-1.11-6.x86.gz.sh[/FILENAME]
	[MD5]484610c1ce34272223a52ec331c99d5d[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE quake3.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Quake 3 Arena
Comment=Quake 3 Arena demo launcher, will automatically download the needed data-files
Exec=quake3-demo
Icon=quake3
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE quake3.spec ---
%define prever rc4

Name:           quake3
Version:        1.34
Release:        0.3.%{prever}%{?dist}
Summary:        Quake 3 Arena tournament 3D shooter game
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}
# 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
# rm -fr code/tools/lcc
# popd
# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
Source0:        %{name}-%{version}-%{prever}.tar.bz2
Source1:        %{name}-demo.sh
Source2:        %{name}.autodlrc
Source3:        %{name}.desktop
Source4:        %{name}.png
Patch0:         %{name}-1.34-syslibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
%ifarch %{ix86} x86_64
BuildRequires:  nasm
%endif
Requires:       hicolor-icon-theme autodownloader opengl-games-utils unzip

%description
This package contains the Quake 3 Arena engine. It comes with an applications
menu entry, which will offer to download and install the Quake 3 demo datafiles
for you. If you own a copy of quake 3, you will need to copy the pak?.pk3 files
from the original 1.32 Quake 3 Arena point release as well as pak0.pk3 from the
original CD-ROM to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.


%prep
%setup -q -n %{name}-%{version}-%{prever}
%patch0 -p1 -b .syslibs


%build
# 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" \
    DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
    CROSS_COMPILING=1


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}

install -m 755 build/release-linux-*/ioquake3.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3
install -m 755 build/release-linux-*/ioquake3-smp.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3-smp
install -m 755 build/release-linux-*/ioq3ded.* \
  $RPM_BUILD_ROOT%{_bindir}/q3ded
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/quake3-demo
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
%doc TODO code/jpeg-6/README
%{_bindir}/%{name}*
%{_bindir}/q3ded
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site

* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.2.rc4
- Use autodownloader to download demo files, thus making the game playable
  without the original CD
- Submit for Fedora inclusion now that the game is playable without the CD
- Update to 1.34-rc4
- Use system libjpeg, system SDL, OpenAL and curl headers

* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc2.svn908
- Update to today's svn code (rev. 908), rc2 from the 1.34 branch.

* Mon May 29 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn792
- Update to today's svn code (rev. 792).
- Update the nostrip patch.
- Fix wrapper script since the binary has been renamed from quake3 to
  ioquake3.<arch>, which we rename to plain ioquake3 (in the patch).
- Include new documentation.

* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn649
- Update to today's svn code (rev. 649).
- Update nostrip patch, now pass OPTFLAGS to the build too.
- Build requires subversion (required for make dist).

* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 1.33-0.2.svn470
- Update to today's svn sode (rev. 470).
- Add modular xorg build conditional.
- Revisit nostrip patch for the new code.
- Add (new?) openal-devel build requirement.
- Update %%doc files.

* Sun Nov 13 2005 Matthias Saou <http://freshrpms.net/> 1.33-0.1.svn338
- Update to GPL'ed 1.33 and spec file cleanup.

* Sun Oct 15 2000 Matthias Saou <http://freshrpms.net/> 1.17-1
- Initial RPM based on Loki's 1.17 point release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:37:11 -0000	1.1
+++ .cvsignore	29 Sep 2007 08:07:29 -0000	1.2
@@ -0,0 +1 @@
+quake3-1.34-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:37:11 -0000	1.1
+++ sources	29 Sep 2007 08:07:29 -0000	1.2
@@ -0,0 +1 @@
+14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:29:28 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Sat, 29 Sep 2007 06:29:28 -0400
Subject: comps/po bg.po,1.5,1.6
Message-ID: <200709291029.l8TATS1C031102@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31068/po

Modified Files:
	bg.po 
Log Message:
2007-09-29  Doncho Nicolaev Gunchev <gunchev at gmail.com> (via
mr700 at fedoraproject.org)

  * po/bg.po: Updated Bulgarian translation, 1 language name unknown




Index: bg.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bg.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bg.po	17 Sep 2007 19:22:12 -0000	1.5
+++ bg.po	29 Sep 2007 10:28:58 -0000	1.6
@@ -1,19 +1,18 @@
-# translation of comps.po to Bulgarian
 # translation of comps.pot to Bulgarian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # ?????????????? ???????????????????? <nikolay at sarmadzhiev.com>, 2004, 2005.
 # Doncho N. Gunchev <gunchev at gmail.com>, 2007.
-# Miroslav Ivanov <satyr at globalnet.bg>, 2007.
+# Miroslav Ivanov <kiro.kopeleto at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps\n"
+"Project-Id-Version: bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-03-29 11:11+0300\n"
-"Last-Translator: Miroslav Ivanov <satyr at globalnet.bg>\n"
-"Language-Team: Bulgarian <bg at li.org>\n"
+"POT-Creation-Date: 2007-09-29 01:43-0700\n"
+"PO-Revision-Date: 2007-09-29 13:24+0300\n"
+"Last-Translator: Doncho N. Gunchev <gunchev at gmail.com>\n"
+"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +21,7 @@
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "???????? ?????????????? ?????????? ???????????????? ?????????? ???? ?????????? ????????????."
+msgstr "???????? ?????????????? ?????????????? ??????????, ?????????? ???????????? ?????????? ???? ?????????? ????????????."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -42,12 +41,12 @@
 #: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
 #: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
 #: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
 #: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
@@ -62,7 +61,7 @@
 #: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
 #: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
-msgstr "?????????????? ??????????"
+msgstr "?????????????? ??????????"
 
 #: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
 #: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
@@ -72,12 +71,12 @@
 #: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
 #: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
 #: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
-msgstr "?????????????????????? ???? ????????????????????????"
+msgstr "?????????????????????? ???? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
@@ -97,12 +96,12 @@
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr "???????????? ??????????????"
+msgstr "???????????? ?????????????? ???? ??????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
-msgstr "???????????????????? ?? ???????????? ??????????????????????"
+msgstr "?????????????????????? ?? ??????????"
 
 #: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
 #: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
@@ -115,8 +114,8 @@
 "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 ""
-"?????????????? ???????????? ?????????????????? ???? ???????????????? ?? ??????????/?????????? - ???? ?????????????????? ???? ?????????????? "
-"?????????????? ???? ?????????????????????? ???? ?????????????????? ????????????."
+"???? ?????????? ???? ?????????????? ?????????????? ???? ?????????????????????? ???? ????????????, ?????????? ?? ???????????????????????? "
+"??????????????, ???????? ?????????? ???????????? ?????????????????? ???????????? ?? ?????????? ?? ?????????? ???? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
 #: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
@@ -145,7 +144,7 @@
 #: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60
 #: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid "Graphical Internet"
-msgstr "???????????????? ????????????????"
+msgstr "???????????????? ????????????????"
 
 #: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61
 #: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
@@ -160,7 +159,7 @@
 #: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
 #: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
 msgid "Hebrew Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70
 #: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
@@ -177,7 +176,7 @@
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
-"???????????????????????? ????????????????, ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? "
+"???????????????????????? ???????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? "
 "????????????????????."
 
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
@@ -196,17 +195,17 @@
 #: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
 msgid "Japanese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83
 #: ../comps-el4.xml.in.h:30
 msgid "Java"
-msgstr "?????????? (Java)"
+msgstr "Java"
 
 #: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84
 #: ../comps-el4.xml.in.h:31
 msgid "Java Development"
-msgstr "??????????(Java) ????????????????????????"
+msgstr "Java ????????????????????"
 
 #: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
 #: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
@@ -216,7 +215,7 @@
 #: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
 #: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE Software Development"
-msgstr "KDE ?????????????????? ???????????????????? "
+msgstr "KDE ?????????????????? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
@@ -240,12 +239,12 @@
 #: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101
 #: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "News Server"
-msgstr "News ????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104
 #: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "Office/Productivity"
-msgstr "????????/????????????????????????????????"
+msgstr "????????/??????????????????????????"
 
 #: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106
 #: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
@@ -266,7 +265,7 @@
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
-"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????."
+"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -280,7 +279,7 @@
 "and edit files. These include Emacs and Vi."
 msgstr ""
 "????????????????????, ?????????? ???????????????? ???????????????? ??????????????????,  ???????????????????? ?????????????????????? ?? "
-"?????????????????????????? ???? ??????????????. ???? ???????????????? ??????????(emacs) ?? ????(vi)."
+"?????????????????????????? ???? ??????????????. ???? ???????????????? emacs ?? vi."
 
 #: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128
 #: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
@@ -290,12 +289,12 @@
 #: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
 #: ../comps-el4.xml.in.h:45
 msgid "Support for developing programs in the Java programming language."
-msgstr "?????????????????? ???? ???????????? ???? ???????????????? ???? ?????????? (Java)."
+msgstr "?????????????????? ???? ???????????????????? ???? ???????????????? ???? ???????????????????? ???????? Java."
 
 #: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
 #: ../comps-el4.xml.in.h:46
 msgid "Support for running programs written in the Java programming language."
-msgstr "?????????????????? ???? ???????????????? ???????????? ???? ?????????? (Java)."
+msgstr "?????????????????? ???? ???????????????? ???????????????? ???? ???????????????????? ???????? Java."
 
 #: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136
 #: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45
@@ -305,22 +304,22 @@
 #: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140
 #: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "Text-based Internet"
-msgstr "??????????-?????????????? ????????????????"
+msgstr "???????????????? ????????????????"
 
 #: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49
 #: ../comps-el5.xml.in.h:47
 msgid "The XEmacs text editor."
-msgstr "XEmacs ?????????????? ????????????????."
+msgstr "?????????????????? ???????????????? XEmacs."
 
 #: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143
 #: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr "???????????????????????? ???????????????? ???????? ??????????, PDF ?????????????? ?? ??????????."
+msgstr "???????????????????????? ???????????????? ???????? ????????????, ???????????????? ???? ?????????????? ???? PDF ?? ??????????."
 
 #: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
 #: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr "???????????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????."
+msgstr "???????? ???????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
@@ -335,18 +334,18 @@
 "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, Postscript ?????? ??????????."
 
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr "?????????????????????????? ???????????????????? ???????????????????????? ???? ?????? ???????????? ???? ??????????????????."
+msgstr "???????? ?????????????????????? ???????????????????? ???????????????????? ???? ?????? ???????????? ?? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run an FTP server on the system."
-msgstr "?????????????????????????? ???????????????????? ???????????????????????? ???? FTP ???????????? ???? ??????????????????."
+msgstr "???????? ?????????????????????????? ???????????????????? ???????????????????? ???? FTP ???????????? ?? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
 #: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
@@ -355,17 +354,19 @@
 "python, and debuggers."
 msgstr ""
 "?????????????????????????? ???????????????? ???????????????? ?????????????????????? ???? ???????????????????? ???????? automake, "
-"gcc, perl, python ?? ????????????????."
+"gcc, perl, python, ?????????? ?? ????????????????."
 
 #: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
 #: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid "This group allows you to configure the system as a news server."
-msgstr "?????????????? ?????????????????? ?????????????????????????? ???? ?????????????????? ???????? News ????????????."
+msgstr ""
+"???????? ?????????????? ?????????????????? ?????????????????????? ???? ?????????????????? ???? ???????????? ???????? ???????????????????? "
+"????????????."
 
 #: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
 #: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "?????????????? ?????????????? ??????????, ?????? ?? ?????? ??????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????? ???? ???????????????? ????????, ?????? ?? ??????."
 
 #: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
 #: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
@@ -373,14 +374,14 @@
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr ""
-"?????????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? ???????????????????? ?? "
-"????????????????????????????."
+"???????? ?????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? "
+"????????????????????, ?????????????????????????? ?? ?????????????????????????? ???? ?????????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
 #: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
-"?????????????? ???????????????? ????????????, ?????????? ???????????????????? ???????????????????????????? ?? ?????????????????????? ???? "
+"???????? ?????????? ???????????????? ????????????, ?????????? ???????????????????? ?????? ???????????????????????? ?? ?????????????????? ???? "
 "??????????????????????."
 
 #: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
@@ -389,8 +390,8 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"?????????????? ?????????????? ??????????-???????????????? ??????????, ?????? ?? ?????? ??????????????. ???????? ???????????????????? ???? "
-"???? ?????????????? ???? ??."
+"???????? ?????????? ?????????????? ???????????????? ?????????????? ???? ????????, ?????? ?? ??????. ???????? ???????????????????? ???? "
+"???? ?????????????? ???? ?????????????? ???? ???????????????? ??."
 
 #: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
 #: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
@@ -398,22 +399,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-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????????? ?????????????????? ????????????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -423,23 +422,21 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????????? ?????????????????? ????????????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????."
 
 #: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -447,14 +444,14 @@
 "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-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179
 #: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid "Various core pieces of the system."
-msgstr "???????????????? ?????????????? ???? ???????????? ???? ??????????????????."
+msgstr "???????????????? ???????????? ?????????? ???? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
 #: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
@@ -479,12 +476,12 @@
 #: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
 #: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "X Window System"
-msgstr "?? ???????????????????? ??????????????"
+msgstr "?????????????? ???? ???????????????? ??"
 
 #: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75
 #: ../comps-el5.xml.in.h:75
 msgid "XEmacs"
-msgstr "????????????"
+msgstr "XEmacs"
 
 #: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
 #: ../comps-f8.xml.in.h:199
@@ -499,22 +496,20 @@
 #: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29
 #: ../comps-el5.xml.in.h:8
 msgid "Czech Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????? ?????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
-msgstr "?????????????????? ???? ???????????????? (????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -522,58 +517,55 @@
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9
 msgid "Assamese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11
 msgid "Base"
-msgstr "????????"
+msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
-msgstr "???????????? ?????????????????? ???? Ruby ???????? ???? ????????????????????????."
+msgstr "???????????? ?????????????????? ???? ?????????? ???? ???????????????????????? ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14
 msgid "Basque Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
-msgstr "?????????????????? ???? ?????????????????????? (?????????????????? ????????????)"
+msgstr "?????????????????? ???? ?????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
 msgid "Breton Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22
 msgid "Bulgarian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23
 msgid "Catalan Support"
-msgstr "??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24
 msgid "Chinese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25
 msgid "Clustering"
@@ -585,23 +577,23 @@
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27
 msgid "Core"
-msgstr "??????????"
+msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28
 msgid "Croatian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
 msgid "DNS Name Server"
-msgstr "DNS Nameserver"
+msgstr "DNS ???????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
 msgid "Danish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35
 msgid "Development Libraries"
-msgstr "???????????????????? ???? ????????????????????????"
+msgstr "???????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37
 msgid "Dial-up Networking Support"
@@ -609,40 +601,39 @@
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38
 msgid "Dutch Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:38
 msgid "Eclipse"
-msgstr "????????????"
+msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43
 msgid "English (UK) Support"
-msgstr "?????????????????? ???? ?????????????????? ??????????????????"
+msgstr "?????????????????? ???? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44
 msgid "Estonian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45
 msgid "Ethiopic Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47
 msgid "Faeroese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53
 msgid "French Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57
 msgid ""
@@ -654,64 +645,62 @@
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58
 msgid "Gaelic Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59
 msgid "Galician Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65
 msgid "Greek Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66
 msgid "Gujarati Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69
 msgid "Hindi Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70
 msgid "Hungarian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71
 msgid "Icelandic Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72
 msgid "Indonesian Support"
-msgstr "?????????????????? ???? ????????????????????????"
+msgstr "?????????????????? ???? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
 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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81
 msgid "Italian Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87
 msgid ""
@@ -726,56 +715,52 @@
 msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91
 msgid "Languages"
 msgstr "??????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
-msgstr "???????????????? ?????????????? ??????????????"
+msgstr "???????????????????????? ?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96
 msgid "Legacy Software Development"
-msgstr "?????????????????? ?????????????????? ???? ???????????????? ??????????????"
+msgstr "???????????????????? ???? ?????????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97
 msgid "Legacy Software Support"
-msgstr "?????????????????? ???? ???????????? ??????????????"
+msgstr "?????????????????? ???? ?????????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98
 msgid "Lithuanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101
 msgid "Malay Support"
-msgstr "?????????????????? ???? ??????????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102
 msgid "Malayalam Support"
 msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -783,7 +768,7 @@
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106
 msgid "MySQL Database"
-msgstr "MySQL ??????????????????"
+msgstr "???????? ?????????? MySQL"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110
 msgid "Northern Sotho Support"
@@ -791,57 +776,55 @@
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111
 msgid "Norwegian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114
 msgid "Oriya Support"
 msgstr "?????????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118
 msgid "Portuguese Support"
-msgstr "?????????????????? ???? ??????????????????????"
+msgstr "?????????????????? ???? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119
 msgid "PostgreSQL Database"
-msgstr "PostgreSQL ??????????????????"
+msgstr "???????? ?????????? PostgreSQL"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120
 msgid "Printing Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121
 msgid "Punjabi Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122
 msgid "Romanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123
 msgid "Ruby"
-msgstr "????????"
+msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124
 msgid "Russian Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127
 msgid "Server Configuration Tools"
@@ -853,29 +836,27 @@
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131
 msgid "Slovak Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132
 msgid "Slovenian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133
 msgid "Smallest possible installation"
 msgstr "??????-?????????????? ???????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 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
 msgid "Southern Ndebele Support"
@@ -887,7 +868,7 @@
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140
 msgid "Spanish Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143
 msgid "Swati Support"
@@ -895,12 +876,11 @@
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144
 msgid "Swedish Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -912,35 +892,36 @@
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150
 msgid "Thai Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:142
 msgid "The Eclipse Integrated Development Environment."
-msgstr "???????????? - ?????????? ???? ????????????????????."
+msgstr "?????????????????????????? ?????????? ???? ???????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
 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
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
-"???????????????? ???????????????????? ???????????????????????? ???? ???????????????????? ???? ?? ???????????????????????? ??????????????."
+"???????????????? ???????????????????? ???????????????????????? ???? ???????????????????? ???? ?????????????????? ???? ???????????????? ??."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr "???????????????? ???????????????? ??????????????-???????????????? ??????????????, ???????? DHCP, Kerberos ?? NIS."
+msgstr "???????? ???????????? ???????????????? ?????????????? ?????????????? ???????? DHCP, Kerberos ?? NIS."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"???????????????? ???????????????? ?????????????? ???? ?????????? ?????????????? ??????????????????, ???????? ???????????? ?? rsh."
+"???????????????? ???????????????? ?????????????? ???? ?????????? ?????????????? ??????????????????, ???????? rsh ?? telnet."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
 msgid "These packages provide a virtualization environment."
@@ -948,14 +929,14 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr "???????? ???????????????? ???????????????????? ???????????????????????? ?? ???????????????? ????????????."
+msgstr "???????? ???????????? ???????????????????? ???????????????????????? ?? ???????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr ""
-"???????????????? ???????????????????? ?????????????????????? ???? ???????????????? ?????????????? - ?????????????????????? ?????????????? ?? "
+"???????????????? ???????????????????? ?????????????????????? ???? ???????????????? ?????????????? ?? ???????????????? ???????????????? ?? "
 "???????????? ???? ??????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
@@ -969,46 +950,45 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
-"?????????????? ?????????????? ???????????? Red Hat's ?????????????????????????? ?????????????????????? ???? ?????????????????? ???? "
-"??????????????."
+"???????? ?????????? ?????????????? ???????????????? ?????????????????????? ???? ?????????????????? ???? ?????????????? ???? Red Hat."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr ""
-"?????????????? ?????????????? ???????????????????? ?????????? ???? ????????????. ?????????????? ?? ???????????????? ???? ?????????????????? "
-"???? ?????????? ????????????/?????????????? ??????????."
+"?????????????? ?????????????? ?????????????????????? ?????????? ???? ????????????. ?????????????? ?? ???????????????? ???? ?????????????????? "
+"???? ?????????? ?????????????? ???? ????????????/?????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr "???????????????? ???????????????????? ???????????????????????? ???? DNS nameserver (BIND)."
+msgstr ""
+"???????? ?????????? ???????????? ?????????????????? ???????????????????????? ???? DNS ???????????? ???? ?????????? (BIND)."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr ""
-"???????????????? ???????????????????? ?????????????????????? ???? ?????????????? ?????????? ???????????? ?? ???? ?????????????? ??????????????."
+"???????? ?????????? ???????????? ?????????????????? ?????????????????????? ???? ?????????????? ?????????? ???????????? ?? MS Windows "
+"(tm) ??????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178
 msgid "This package group contains packages useful for use with MySQL."
-msgstr "?????????????? ?????????????? ???????????? ???? ???????????????????? ?? MySQL."
+msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? MySQL."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "?????????? ?????????????? ???????????? ???? ???????????????????? ?? Postgresql."
+msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? Postgresql."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1020,25 +1000,23 @@
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184
 msgid "Turkish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185
 msgid "Ukrainian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1046,7 +1024,7 @@
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194
 msgid "Welsh Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196
 msgid "Windows File Server"
@@ -1062,375 +1040,45 @@
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202
 msgid "Zulu Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???? ???????????????????????? ??????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "????????????"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ?? ???????????????? ???? ?????????????????? ???? ?????????? ?? ?????????????????? ??????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???????????? - ?????????? ???? ????????????????????."
+msgstr "?????????????????????????? ?????????? ???? ???????????????????? ???????????????? ???? Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????? ????????????????"
 
 #: ../comps-f8.xml.in.h:99
 #, fuzzy
 msgid "Low Saxon Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? Low ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ???? ??????????"
-
-#~ msgid "Emacs"
-#~ msgstr "??????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ?????????????? ????????????????."
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????????? ???? ??????????????????????(??????????????????)"
-
-#~ msgid "British Support"
-#~ msgstr "?????????????????? ???? ??????????????????"
-
-#~ msgid "Canadian Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???? ???????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????? ???? ???????????? ???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "?????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "??????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "?????????????????? ???? ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "?????????????????? ???? ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "?????????????????? ???? ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "?????????????????? ???? ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "???????????????????????? ???????????????? ???? ???? ???????????? ???? ???????????????????????????? ????????????."
-
-#~ msgid "KDE"
-#~ msgstr "??D??"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ?????????????? ??????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????????????????? ???? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "???????????? ???????????? ???? x86 ??????????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????? ???? Multilib ??????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ??????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????????? ???? ???????????????????????????? ???? ???????????? ???? ????-???????????????????? ??????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "System"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "???????????????? ???????????????????? ?????????????????????? IMAP ?????? Postfix ???????????????? ??????????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "???????????????? ???????????????????? ?????????????????????? ???? ???????????????????????? ???? ???????????????? ?????????????? ???? "
-#~ "Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????? ???????????????????? ???? ????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????????? ?????????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc86 ???????????????????? ?????????????????????? - ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???????????????????????? ???? x86 ???????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ???????????????????? ?????????????????????? - ??????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????? (??????????????????)"
-
-#~ msgid "English"
-#~ msgstr "??????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????"
-
-#~ msgid "German"
-#~ msgstr "????????????"
-
-#~ msgid "Italian"
-#~ msgstr "????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "(??????????????????????) ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "???????????????? (????????????????)"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? "
-#~ "???????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????????? "
-#~ "???????????????? ????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "???????????????? (??????????????????????)"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???????????????????????? ???? ppc64 ???????????????????? ??????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "??????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ??????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "?????????? ???? ????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????? ???? ????????????????????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ?????????????????????? ?????????????????? ???? ?????????? ???? ????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???????????????????????? ?????????????????? ???? GFS ???? ???????????????? ????????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "???????? ???????????????? ???????????????????? ???????????????????????? ?? ???????????????? ????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "?????????????????????? ?????????? ???? Java ?? ?????????????????????? ???? ????????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "??????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "???????????????????????? ????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ?????????????????????? ???????????????????????? ???????????????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "???????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????????? ??????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "???????????????????? ?? ?????????????????????? ???? ?????????????? ??????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????????? ???? ??????????????????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????? ???? ?????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "???????????? ???? ???????????????????????? multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????? ?????????????????????? ?????????????????????????????? ???? ???????????????????? ??????????????????????."
+msgstr "????-?????????? ???????????? ?? ?????????????????? ?? ???????????????? ????????????????"



From fedora-extras-commits at redhat.com  Sat Sep 29 10:39:07 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:39:07 -0400
Subject: rpms/cupsddk/devel .cvsignore, 1.2, 1.3 cupsddk.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200709291039.l8TAd7YS031520@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31395

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:04:16 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:38:34 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/cupsddk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cupsddk.spec	29 Aug 2007 15:21:54 -0000	1.2
+++ cupsddk.spec	29 Sep 2007 10:38:34 -0000	1.3
@@ -15,8 +15,8 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
@@ -113,6 +113,9 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
 - More specific license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:04:16 -0000	1.2
+++ sources	29 Sep 2007 10:38:34 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:53:10 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:53:10 -0400
Subject: rpms/cupsddk/F-7 .cvsignore, 1.2, 1.3 cupsddk.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709291053.l8TArA3f032261@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32194

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:06:15 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:52:35 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/cupsddk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cupsddk.spec	31 Jul 2007 17:06:15 -0000	1.1
+++ cupsddk.spec	29 Sep 2007 10:52:35 -0000	1.2
@@ -15,9 +15,9 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 3%{?dist}
-License: GPL
+Version: 1.2.1
+Release: 1%{?dist}
+License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
 Patch0: cupsddk-no-gzip-man-pages.patch
@@ -113,6 +113,12 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
+- More specific license tag.
+
 * Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-3
 - Fix directory ownership.
 - Better group for driver sub-package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:06:15 -0000	1.2
+++ sources	29 Sep 2007 10:52:35 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:57:58 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:57:58 -0400
Subject: rpms/cupsddk/FC-6 .cvsignore, 1.2, 1.3 cupsddk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709291057.l8TAvw5Y032350@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32328

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:08:03 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:57:24 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/cupsddk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cupsddk.spec	31 Jul 2007 17:08:03 -0000	1.1
+++ cupsddk.spec	29 Sep 2007 10:57:24 -0000	1.2
@@ -15,9 +15,9 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 3%{?dist}
-License: GPL
+Version: 1.2.1
+Release: 1%{?dist}
+License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
 Patch0: cupsddk-no-gzip-man-pages.patch
@@ -113,6 +113,12 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
+- More specific license tag.
+
 * Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-3
 - Fix directory ownership.
 - Better group for driver sub-package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:08:03 -0000	1.2
+++ sources	29 Sep 2007 10:57:24 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 11:48:02 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 29 Sep 2007 07:48:02 -0400
Subject: rpms/jokosher/devel .cvsignore, 1.4, 1.5 jokosher.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200709291148.l8TBm2rY006816@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/jokosher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6794/devel

Modified Files:
	.cvsignore jokosher.spec sources 
Log Message:


updating to latest svn




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2007 19:10:42 -0000	1.4
+++ .cvsignore	29 Sep 2007 11:47:29 -0000	1.5
@@ -1 +1 @@
-jokosher-1.0.tar.gz
+jokosher-20070929svn.tar.gz


Index: jokosher.spec
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/jokosher.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jokosher.spec	4 Sep 2007 12:37:20 -0000	1.10
+++ jokosher.spec	29 Sep 2007 11:47:29 -0000	1.11
@@ -5,12 +5,12 @@
 
 Name: jokosher
 Version: 1.0
-Release: 0.1.20070904svn%{?dist}
+Release: 0.1.20070929svn%{?dist}
 Summary: A simple and easy-to-use Open Source multi-track editor
 Group: Applications/Multimedia
 License: GPLv2+ with exceptions
 URL: http://%{name}.org
-Source0: http://www.%{name}.org/downloads/source/%{name}-1.0.tar.gz
+Source0: http://www.%{name}.org/downloads/source/%{name}-20070929svn.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -104,7 +104,11 @@
 %{_datadir}/omf/%{name}/
 
 %changelog
-* Tue Sep  4 2007 Christopher Brown <chris at localhost.localdomain> - 1.0-0.1.20070904svn
+* Sat Sep 29 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070929svn
+- change to python-setuptools-devel
+- update to latest svn
+
+* Tue Sep  4 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070904svn
 - change to python-setuptools-devel
 - update to latest svn
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2007 12:37:20 -0000	1.8
+++ sources	29 Sep 2007 11:47:29 -0000	1.9
@@ -1 +1 @@
-9dd1b9c8b7298121136182be574a3c29  jokosher-1.0.tar.gz
+1610e580e4e6e9e238837986a8c228dc  jokosher-20070929svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 14:09:55 2007
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Sat, 29 Sep 2007 10:09:55 -0400
Subject: rpms/sqlite/EL-4 sources,1.17,1.18 sqlite.spec,1.31,1.32
Message-ID: <200709291409.l8TE9tHv027488@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/pkgs/rpms/sqlite/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27462

Modified Files:
	sources sqlite.spec 
Log Message:
Update from devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Aug 2007 19:10:18 -0000	1.17
+++ sources	29 Sep 2007 14:09:23 -0000	1.18
@@ -1 +1 @@
-a2cb1fafad5c2587e513dcbd18ace097  sqlite-3.3.6.tar.gz
+2feec9b429f9298c9f288420c8b449f8  sqlite-3.4.2.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sqlite.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sqlite.spec	17 Aug 2007 19:10:18 -0000	1.31
+++ sqlite.spec	29 Sep 2007 14:09:23 -0000	1.32
@@ -1,23 +1,20 @@
-# Note, this is an RPM built based off of the CentOS Spec Files.  Before doing
-#       any updates please ensure you do not conflict with the other Centos
-#       package.
-# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
-%define tcl 0%{?_with_tcl:1}
-# --with static enables static library in -devel subpackage
-%define static 0%{?_with_static:1}
+# bcond default logic is nicely backwards...
+%bcond_without tcl
+%bcond_with static
+%bcond_with check
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.3.6
-Release: 0.3%{?dist}
+Version: 3.4.2
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Obsoletes: sqlite3 sqlite3-devel
-BuildRequires: ncurses-devel readline-devel
+BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{tcl}
+%if %{with tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,7 +38,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{tcl}
+%if %{with tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -55,9 +52,10 @@
 %setup -q
 
 %build
-%configure %{!?_with_tcl:--disable-tcl} \
+export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
+%configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
-           --enable-threads-override-locks
+           --enable-threads-override-locks 
 make %{?_smp_mflags}
 make doc
 
@@ -68,11 +66,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{static}
+%if ! %{with static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{tcl}
+%if %{with check}
 %check
 make test
 %endif
@@ -97,23 +95,46 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{static}
+%if %{with static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{tcl}
+%if %{with tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
-* Fri Aug 17 2007 Mike McGrath <mmcgrath at redhat.com> - 3.3.6-0.3
-- Official EPEL build
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
+- Add another build conditional for enabling %%check
 
-* Wed Jul 25 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 3.3.6-0.2
-- Prepend 0 to release
-- Rebuild for EPEL
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
+- Use bconds for the spec build conditionals
+- Enable -tcl subpackage again (#309041)
+
+* Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
+- Update to 3.4.2
+
+* Sat Jul 21 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Sun Jun 24 2007 Paul Nasrat <pnsarat at redhat.com> - 3.4.0-2
+- Disable load for now (#245486)
+
+* Tue Jun 19 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Fri Jun 01 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.17-2
+- Enable load 
+- Build fts1 and fts2
+- Don't sync on dirs (#237427)
+
+* Tue May 29 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.17-1
+- Update to 3.3.17
+
+* Mon Mar 19 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.13-1
+- Update to 3.3.13
 
 * Fri Aug 11 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.6-2
 - Fix conditional typo (patch from Gareth Armstrong)



From fedora-extras-commits at redhat.com  Sat Sep 29 14:43:35 2007
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sat, 29 Sep 2007 10:43:35 -0400
Subject: rpms/moodss/devel moodss.spec,1.26,1.27
Message-ID: <200709291443.l8TEhZmU028369@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28351

Modified Files:
	moodss.spec 
Log Message:
moved to GPLv2 and require sqlite-tcl.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- moodss.spec	21 Nov 2006 21:48:31 -0000	1.26
+++ moodss.spec	29 Sep 2007 14:43:02 -0000	1.27
@@ -1,14 +1,14 @@
 Name: moodss
 Version: 21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
-License: GPL
+License: GPLv2
 Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Jean-Luc Fontaine <jfontain at free.fr> 21.5-2
+- moved to GPLv2 and require sqlite-tcl
+
 * Sun Nov 12 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.5-1
 - 21.5 upstream release
 



From fedora-extras-commits at redhat.com  Sat Sep 29 15:02:08 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 11:02:08 -0400
Subject: rpms/osgcal/devel .cvsignore, 1.3, 1.4 osgcal.spec, 1.9,
	1.10 sources, 1.3, 1.4 osgcal-0.1.44-64bit.patch, 1.1, NONE
Message-ID: <200709291502.l8TF28rY002873@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2811

Modified Files:
	.cvsignore osgcal.spec sources 
Removed Files:
	osgcal-0.1.44-64bit.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2006 18:42:47 -0000	1.3
+++ .cvsignore	29 Sep 2007 15:01:35 -0000	1.4
@@ -1 +1 @@
-osgcal-0.1.44.tar.gz
+osgcal-0.1.46.tar.gz


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/osgcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- osgcal.spec	29 Jan 2007 23:58:04 -0000	1.9
+++ osgcal.spec	29 Sep 2007 15:01:35 -0000	1.10
@@ -1,18 +1,17 @@
 Name:           osgcal
-Version:        0.1.44
-Release:        4%{?dist}
+Version:        0.1.46
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://gna.org/projects/underware
-Source0:        http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1.44-64bit.patch
+Source0:        http://osgcal.dachary.org/download/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  OpenSceneGraph-devel cal3d-devel libxml2-devel glib2-devel
-BuildRequires:  libungif-devel libGL-devel SDL-devel xorg-x11-server-Xvfb
-BuildRequires:  xorg-x11-server-Xorg
+BuildRequires:  OpenSceneGraph-devel libungif-devel libGL-devel SDL-devel
+BuildRequires:  xorg-x11-server-Xorg cal3d-devel libxml2-devel glib2-devel
+BuildRequires:  xorg-x11-server-Xvfb
 
 
 %description
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bit~
 
 # Avoid lib64 rpaths
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -83,6 +81,15 @@
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-1
+- Upstream sync
+- Remove no longer needed 64-bit patch
+- Update source URL
+
+* Tue Sep 11 2007 Christopher Stone <chris.stone at gmail.com> 0.1.45-1
+- Upstream sync
+- Update 64-bit patch
+
 * Mon Jan 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.44-4
 - Disable make check
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2006 18:42:47 -0000	1.3
+++ sources	29 Sep 2007 15:01:35 -0000	1.4
@@ -1 +1 @@
-c6f43aa6014fc7fdc7cc0ab9e4b5a885  osgcal-0.1.44.tar.gz
+96ac955dab57b1b5d74c8afeac46da46  osgcal-0.1.46.tar.gz


--- osgcal-0.1.44-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 15:07:14 2007
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Sat, 29 Sep 2007 11:07:14 -0400
Subject: rpms/sqlite/EL-4 sqlite.spec,1.32,1.33
Message-ID: <200709291507.l8TF7Ead003256@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/pkgs/rpms/sqlite/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3213

Modified Files:
	sqlite.spec 
Log Message:
Use f7 base as no bcond


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sqlite.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sqlite.spec	29 Sep 2007 14:09:23 -0000	1.32
+++ sqlite.spec	29 Sep 2007 15:06:41 -0000	1.33
@@ -1,12 +1,12 @@
-# bcond default logic is nicely backwards...
-%bcond_without tcl
-%bcond_with static
-%bcond_with check
+# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
+%define tcl 0%{?_with_tcl:1}
+# --with static enables static library in -devel subpackage
+%define static 0%{?_with_static:1}
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -14,7 +14,7 @@
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{with tcl}
+%if %{tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -38,7 +38,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{with tcl}
+%if %{tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -53,7 +53,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
-%configure %{!?with_tcl:--disable-tcl} \
+%configure %{!?_with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks 
 make %{?_smp_mflags}
@@ -66,11 +66,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{with static}
+%if ! %{static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{with check}
+%if %{tcl}
 %check
 make test
 %endif
@@ -95,24 +95,17 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{with static}
+%if %{static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{with tcl}
+%if %{tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
-- Add another build conditional for enabling %%check
-
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
-- Use bconds for the spec build conditionals
-- Enable -tcl subpackage again (#309041)
-
 * Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
 - Update to 3.4.2
 



From fedora-extras-commits at redhat.com  Sat Sep 29 17:46:57 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 13:46:57 -0400
Subject: rpms/openalpp/devel dead.package,NONE,1.1 openalpp.spec,1.14,NONE
Message-ID: <200709291746.l8THkvMe012686@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/openalpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12677

Added Files:
	dead.package 
Removed Files:
	openalpp.spec 
Log Message:
End of life.  May this package rest in peace.


--- NEW FILE dead.package ---
Obsoleted by osgal-0.6.1


--- openalpp.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 17:53:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 13:53:17 -0400
Subject: rpms/abcde/devel abcde.spec,1.14,1.15
Message-ID: <200709291753.l8THrH2o013140@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	abcde.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
- Requires: which



Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- abcde.spec	13 Aug 2007 19:19:12 -0000	1.14
+++ abcde.spec	29 Sep 2007 17:52:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@
 Requires:       cd-discid
 Requires:       cdparanoia
 Requires:       wget
+Requires:       which
 Requires(hint): vorbis-tools
 Requires(hint): flac
 
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
 - License: GPLv2+
 - Add (empty) %%build section.



From fedora-extras-commits at redhat.com  Sat Sep 29 18:15:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 14:15:10 -0400
Subject: rpms/colordiff/devel colordiff.spec,1.8,1.9
Message-ID: <200709291815.l8TIFAuX020761@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718

Modified Files:
	colordiff.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-4
- Requires: which



Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colordiff.spec	13 Aug 2007 19:38:09 -0000	1.8
+++ colordiff.spec	29 Sep 2007 18:14:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           colordiff
 Version:        1.0.6a
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
@@ -15,6 +15,7 @@
 Requires:       gzip
 Requires:       less
 Requires:       diffutils
+Requires:       which
 Provides:       cdiff
 
 %description
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-3
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Sat Sep 29 18:41:52 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:41:52 -0700
Subject: [pkgdb] qwt was added for frankb
Message-ID: <200709291841.l8TIfv8l018719@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qwt with summary Qt Widgets for Technical Applications
Kevin Fenzi (kevin) has approved Package qwt
Kevin Fenzi (kevin) has added a Fedora devel branch for qwt with an owner of frankb
Kevin Fenzi (kevin) has approved qwt in Fedora devel
Kevin Fenzi (kevin) has approved Package qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, 6) updated by kevin
Message-ID: <200709291842.l8TIgK2U018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, devel) updated by kevin
Message-ID: <200709291842.l8TIgK2W018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, 7) updated by kevin
Message-ID: <200709291842.l8TIgK2P018743@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709291842.l8TIgK2Z018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:48 -0400
Subject: rpms/qwt - New directory
Message-ID: <200709291842.l8TIgmgV022471@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt

Log Message:
Directory /cvs/extras/rpms/qwt added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:50 -0400
Subject: rpms/qwt/devel - New directory
Message-ID: <200709291842.l8TIgoOX022488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt/devel

Log Message:
Directory /cvs/extras/rpms/qwt/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:53 -0400
Subject: rpms/qwt Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709291842.l8TIgrGY022515@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt

Added Files:
	Makefile import.log 
Log Message:
Setup of module qwt


--- NEW FILE Makefile ---
# Top level Makefile for module qwt
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:56 -0400
Subject: rpms/qwt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709291842.l8TIgucd022533@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qwt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qwt
# $Id: Makefile,v 1.1 2007/09/29 18:42:53 kevin Exp $
NAME := qwt
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 fedora-extras-commits at redhat.com  Sat Sep 29 18:44:22 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:22 -0700
Subject: [pkgdb] fbreader was added for salimma
Message-ID: <200709291844.l8TIiRMa018944@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package fbreader with summary E-book reader
Kevin Fenzi (kevin) has approved Package fbreader
Kevin Fenzi (kevin) has added a Fedora devel branch for fbreader with an owner of salimma
Kevin Fenzi (kevin) has approved fbreader in Fedora devel
Kevin Fenzi (kevin) has approved Package fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora, 7) updated by kevin
Message-ID: <200709291844.l8TIiwrG018970@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora EPEL, 4) updated by kevin
Message-ID: <200709291844.l8TIiwG0018969@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora EPEL, 5) updated by kevin
Message-ID: <200709291844.l8TIiwrJ018970@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora, devel) updated by kevin
Message-ID: <200709291844.l8TIiwG3018969@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:22 -0400
Subject: rpms/fbreader - New directory
Message-ID: <200709291845.l8TIjMtp022924@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader

Log Message:
Directory /cvs/extras/rpms/fbreader added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:25 -0400
Subject: rpms/fbreader/devel - New directory
Message-ID: <200709291845.l8TIjP0c022940@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader/devel

Log Message:
Directory /cvs/extras/rpms/fbreader/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:28 -0400
Subject: rpms/fbreader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709291845.l8TIjSUH022967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader

Added Files:
	Makefile import.log 
Log Message:
Setup of module fbreader


--- NEW FILE Makefile ---
# Top level Makefile for module fbreader
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:32 -0400
Subject: rpms/fbreader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709291845.l8TIjW8l022986@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fbreader


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fbreader
# $Id: Makefile,v 1.1 2007/09/29 18:45:29 kevin Exp $
NAME := fbreader
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 fedora-extras-commits at redhat.com  Sat Sep 29 18:52:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 14:52:14 -0400
Subject: rpms/osgal/devel .cvsignore, 1.4, 1.5 osgal.spec, 1.7, 1.8 sources, 
	1.4, 1.5
Message-ID: <200709291852.l8TIqE5e023545@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23495

Modified Files:
	.cvsignore osgal.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 04:08:56 -0000	1.4
+++ .cvsignore	29 Sep 2007 18:51:41 -0000	1.5
@@ -1 +1 @@
-osgal-cvs-20060903.tar.gz
+osgal-0.6.1.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- osgal.spec	5 Feb 2007 03:22:36 -0000	1.7
+++ osgal.spec	29 Sep 2007 18:51:41 -0000	1.8
@@ -1,17 +1,22 @@
 Name:           osgal
-Version:        20060903
-Release:        3%{?dist}
+Epoch:          1
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
-Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
+BuildRequires:  OpenSceneGraph-devel OpenThreads-devel
+BuildRequires:  openal-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel libtool
 
+Provides:       openalpp = 20060714
+Obsoletes:      openalpp < 20060714
+
 %description
 osgAL is a toolkit for handling spatial (3D) sound in the OpenSceneGraph
 rendering library.
@@ -20,7 +25,8 @@
 Summary:        Library development files for osgal
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       openalpp-devel
+Requires:       OpenSceneGraph-devel OpenThreads-devel
+Requires:       openal-devel freealut-devel libvorbis-devel
 
 %description devel
 This package contains headers and libraries required to build applications
@@ -28,7 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-cvs-%{version}
+%setup -q -n %{name}-%{version}
 sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in
 chmod -x {include,src}/osg*/*
 autoreconf --force --install
@@ -70,13 +76,19 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html/*
+%doc doc/*html
 %{_includedir}/osgAL
+%{_includedir}/openalpp
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.6.1-1
+- Upstream sync
+- Move openalpp-devel Requires to this package
+- Obsolete/Provides openalpp
+
 * Sun Feb 04 2007 Christopher Stone <chris.stone at gmail.com> 20060903-3
 - Fix setting of CFLAGS in configure.in bug #227290
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 04:08:56 -0000	1.4
+++ sources	29 Sep 2007 18:51:41 -0000	1.5
@@ -1 +1 @@
-92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz
+94adc3997ec67da05193084af689b22a  osgal-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:53 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfj019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:50 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiB019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:55 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfm019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:00 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:00 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfp019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the approveacls acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:29 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiE019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:26 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRF019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:32 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRI019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:35 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRL019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:40 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiH019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:38 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEhBt019983@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:15:16 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291915.l8TJEhBw019983@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the approveacls acl on mailgraph (Fedora devel) to Obsolete for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:15:26 -0400
Subject: rpms/qwt import.log,1.1,1.2
Message-ID: <200709291915.l8TJFQ51000839@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2007 18:42:51 -0000	1.1
+++ import.log	29 Sep 2007 19:14:53 -0000	1.2
@@ -0,0 +1 @@
+qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:15:28 -0400
Subject: rpms/qwt/devel qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291915.l8TJFSah000847@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:14:56 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:18:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:18:24 -0400
Subject: rpms/qwt import.log,1.2,1.3
Message-ID: <200709291918.l8TJIOgn001587@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Sep 2007 19:14:53 -0000	1.2
+++ import.log	29 Sep 2007 19:17:52 -0000	1.3
@@ -1 +1,2 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
+qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426



From fedora-extras-commits at redhat.com  Sat Sep 29 19:18:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:18:26 -0400
Subject: rpms/qwt/FC-6 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291918.l8TJIQ4G001612@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:20:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:20:43 -0400
Subject: rpms/qwt import.log,1.3,1.4
Message-ID: <200709291920.l8TJKhAb002540@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2459

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Sep 2007 19:17:52 -0000	1.3
+++ import.log	29 Sep 2007 19:20:10 -0000	1.4
@@ -1,2 +1,3 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
 qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426
+qwt-5_0_2-5FC5:F-7:qwt-5.0.2-5FC5.src.rpm:1191093569



From fedora-extras-commits at redhat.com  Sat Sep 29 19:20:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:20:45 -0400
Subject: rpms/qwt/F-7 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291920.l8TJKj0c002548@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2459/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:20:13 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:20:13 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:23:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:23:42 -0400
Subject: rpms/qwt import.log,1.4,1.5
Message-ID: <200709291923.l8TJNg8E002815@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2775

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	29 Sep 2007 19:20:10 -0000	1.4
+++ import.log	29 Sep 2007 19:23:09 -0000	1.5
@@ -1,3 +1,4 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
 qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426
 qwt-5_0_2-5FC5:F-7:qwt-5.0.2-5FC5.src.rpm:1191093569
+qwt-5_0_2-5FC5:EL-5:qwt-5.0.2-5FC5.src.rpm:1191093745



From fedora-extras-commits at redhat.com  Sat Sep 29 19:23:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:23:44 -0400
Subject: rpms/qwt/EL-5 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291923.l8TJNi6I002819@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2775/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:23:12 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:23:12 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:34:15 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 15:34:15 -0400
Subject: rpms/abcde/EL-5 abcde.spec,1.13,1.14
Message-ID: <200709291934.l8TJYFSi003235@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3174

Modified Files:
	abcde.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
- Requires: which



Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/EL-5/abcde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- abcde.spec	10 Sep 2007 15:21:37 -0000	1.13
+++ abcde.spec	29 Sep 2007 19:33:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@
 Requires:       cd-discid
 Requires:       cdparanoia
 Requires:       wget
+Requires:       which
 Requires(hint): vorbis-tools
 Requires(hint): flac
 
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
 - License: GPLv2+
 - Add (empty) %%build section.



From fedora-extras-commits at redhat.com  Sat Sep 29 19:47:59 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 29 Sep 2007 15:47:59 -0400
Subject: rpms/glibc import.log,1.19,1.20
Message-ID: <200709291947.l8TJlxU0003803@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3759

Modified Files:
	import.log 
Log Message:
2.6.90-16



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	20 Sep 2007 00:29:54 -0000	1.19
+++ import.log	29 Sep 2007 19:47:26 -0000	1.20
@@ -16,3 +16,4 @@
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
 glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332
 glibc-2_6_90-15:HEAD:glibc-2.6.90-15.src.rpm:1190248175
+glibc-2_6_90-16:HEAD:glibc-2.6.90-16.src.rpm:1191094837



From fedora-extras-commits at redhat.com  Sat Sep 29 19:48:02 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 29 Sep 2007 15:48:02 -0400
Subject: rpms/glibc/devel .cvsignore, 1.217, 1.218 glibc-fedora.patch, 1.239,
	1.240 glibc.spec, 1.328, 1.329 sources, 1.241, 1.242
Message-ID: <200709291948.l8TJm27G003812@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3759/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- .cvsignore	20 Sep 2007 00:29:56 -0000	1.217
+++ .cvsignore	29 Sep 2007 19:47:29 -0000	1.218
@@ -1,2 +1,2 @@
-glibc-20070920T0007.tar.bz2
-glibc-fedora-20070920T0007.tar.bz2
+glibc-20070929T1859.tar.bz2
+glibc-fedora-20070929T1859.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- glibc-fedora.patch	20 Sep 2007 00:29:56 -0000	1.239
+++ glibc-fedora.patch	29 Sep 2007 19:47:29 -0000	1.240
@@ -1,6 +1,6 @@
---- glibc-20070920T0007/ChangeLog	19 Sep 2007 22:22:51 -0000	1.10857
-+++ glibc-20070920T0007-fedora/ChangeLog	20 Sep 2007 00:11:36 -0000	1.8782.2.272
-@@ -2244,6 +2244,13 @@
+--- glibc-20070929T1859/ChangeLog	29 Sep 2007 06:58:31 -0000	1.10869
++++ glibc-20070929T1859-fedora/ChangeLog	29 Sep 2007 19:10:46 -0000	1.8782.2.273
+@@ -2384,6 +2384,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
-@@ -2539,6 +2546,10 @@
+@@ -2679,6 +2686,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]
-@@ -3796,6 +3807,15 @@
+@@ -3936,6 +3947,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-20070920T0007/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070920T0007-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070929T1859/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070920T0007-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070929T1859/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070920T0007-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070929T1859/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070929T1859-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-20070920T0007/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070920T0007-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070929T1859/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070929T1859-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-20070920T0007/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
-+++ glibc-20070920T0007-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
+--- glibc-20070929T1859/debug/tst-chk1.c	26 Sep 2007 20:45:09 -0000	1.18
++++ glibc-20070929T1859-fedora/debug/tst-chk1.c	29 Sep 2007 19:10:47 -0000	1.1.2.18
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -340,7 +340,7 @@
    /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
       and sufficient GCC support, as the string operations overflow
       from a.buf1 into a.buf2.  */
-@@ -345,7 +348,7 @@ do_test (void)
+@@ -353,7 +356,7 @@ do_test (void)
    memset (a.buf1 + 9, 'j', l0 + 2);
    CHK_FAIL_END
  
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20070920T0007/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070920T0007-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+--- glibc-20070929T1859/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070929T1859-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070920T0007/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070920T0007-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070929T1859/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
-+++ glibc-20070920T0007-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
+--- glibc-20070929T1859/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070929T1859-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -475,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070920T0007/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070929T1859/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070929T1859/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070920T0007-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070929T1859/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070929T1859-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -494,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070920T0007/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
-+++ glibc-20070920T0007-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
+--- glibc-20070929T1859/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070929T1859-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -509,8 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070920T0007/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070920T0007-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070929T1859/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070929T1859-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 !!!
@@ -602,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070920T0007/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070920T0007-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070929T1859/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070929T1859-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,
@@ -635,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070920T0007/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070920T0007-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070929T1859/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070929T1859-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -645,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070920T0007/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070920T0007-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070929T1859/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070929T1859-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -688,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070920T0007/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070920T0007-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070929T1859/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070929T1859-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>"
@@ -704,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070920T0007/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070920T0007-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070929T1859/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070929T1859-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -717,8 +717,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-20070920T0007/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070929T1859/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -789,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070920T0007/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070920T0007-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070929T1859/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070929T1859-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -818,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070920T0007/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070920T0007-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070929T1859/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070929T1859-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>
@@ -895,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070920T0007/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070920T0007-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070929T1859/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070929T1859-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -952,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070920T0007/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070920T0007-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070929T1859/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070929T1859-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -963,9 +963,9 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070920T0007/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
-+++ glibc-20070920T0007-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
-@@ -282,7 +282,10 @@
+--- glibc-20070929T1859/misc/sys/cdefs.h	26 Sep 2007 20:43:16 -0000	1.71
++++ glibc-20070929T1859-fedora/misc/sys/cdefs.h	29 Sep 2007 19:10:48 -0000	1.58.2.9
+@@ -291,7 +291,10 @@
  
  /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
     inline semantics, unless -fgnu89-inline is used.  */
@@ -977,7 +977,7 @@
  # if defined __GNUC_STDC_INLINE__ || defined __cplusplus
  #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
  #  define __extern_always_inline \
-@@ -295,7 +298,10 @@
+@@ -304,7 +307,10 @@
  
  /* GCC 4.3 and above allow passing all anonymous arguments of an
     __extern_always_inline function to some other vararg function.  */
@@ -989,16 +989,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20070920T0007/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070920T0007-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070929T1859/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070929T1859-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-20070920T0007/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
-+++ glibc-20070920T0007-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+--- glibc-20070929T1859/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070929T1859-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
 @@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1039,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070920T0007/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070920T0007-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070929T1859/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070929T1859-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1073,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070920T0007/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070920T0007-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070929T1859/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070929T1859-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;
@@ -1099,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070920T0007/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070929T1859/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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>
 +
@@ -1108,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070920T0007/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
-+++ glibc-20070920T0007-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
+--- glibc-20070929T1859/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070929T1859-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1175,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070920T0007/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070920T0007-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070929T1859/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070929T1859-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1195,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070920T0007/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070920T0007-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070929T1859/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070929T1859-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1208,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070920T0007/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070920T0007-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070929T1859/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070929T1859-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1250,8 +1250,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070920T0007/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
-+++ glibc-20070920T0007-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+--- glibc-20070929T1859/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070929T1859-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
 @@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1268,8 +1268,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070920T0007/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070929T1859/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1286,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070920T0007/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070920T0007-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070929T1859/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070929T1859-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
@@ -1303,8 +1303,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-20070920T0007/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070920T0007-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070929T1859/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070929T1859-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1318,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070920T0007/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070929T1859/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070929T1859-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))
@@ -1331,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070920T0007/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070929T1859/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070929T1859-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.  */
@@ -1684,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070920T0007/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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.
@@ -1771,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070920T0007/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070920T0007-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070929T1859/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070929T1859-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
@@ -1781,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070920T0007/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070920T0007-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070929T1859/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070929T1859-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);
      }
@@ -1797,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070929T1859-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1814,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070929T1859-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1863,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070929T1859-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;
@@ -1907,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070929T1859-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>
@@ -1934,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070929T1859-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"
@@ -1945,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070929T1859-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;
@@ -1992,8 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070929T1859-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
  
@@ -2012,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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.
@@ -2074,8 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070929T1859-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)
@@ -2108,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070929T1859-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.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- glibc.spec	20 Sep 2007 00:29:56 -0000	1.328
+++ glibc.spec	29 Sep 2007 19:47:29 -0000	1.329
@@ -1,9 +1,9 @@
-%define glibcdate 20070920T0007
+%define glibcdate 20070929T1859
 %define glibcname glibc
-%define glibcsrcdir glibc-20070920T0007
+%define glibcsrcdir glibc-20070929T1859
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 15
+%define glibcrelease 16
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,15 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-16
+- misc fixes (BZ#4963, BZ#4972, BZ#5028, BZ#5043, BZ#5058)
+- improve -D_FORTIFY_SOURCE{,=2} diagnostic through warning/error
+  attributes
+- fix wcscpy, wcpcpy, fgetws, fgetws_unlocked, swprintf and vswprintf
+  fortification inlines
+- fix a scalability issue with lazy binding in heavily multithreaded
+  programs
+
 * Thu Sep 20 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-15
 - $5$ (SHA-256) and $6$ (SHA-512) support in crypt
   (#228697, #249477, #173834)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- sources	20 Sep 2007 00:29:56 -0000	1.241
+++ sources	29 Sep 2007 19:47:29 -0000	1.242
@@ -1,2 +1,2 @@
-68c585139617d926f94df1b5b2f57d13  glibc-20070920T0007.tar.bz2
-2ebd905d6bb60c826db1d0fd99dcec02  glibc-fedora-20070920T0007.tar.bz2
+519315d1475507b2a1eac7f95a6c5041  glibc-20070929T1859.tar.bz2
+922aeab2a07fd5f7dabc34fce941d6fa  glibc-fedora-20070929T1859.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 22:08:46 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 18:08:46 -0400
Subject: rpms/osgal/devel osgal.spec,1.8,1.9
Message-ID: <200709292208.l8TM8k2G029471@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29448

Modified Files:
	osgal.spec 
Log Message:
add some rpmlint fixes


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- osgal.spec	29 Sep 2007 18:51:41 -0000	1.8
+++ osgal.spec	29 Sep 2007 22:08:11 -0000	1.9
@@ -5,7 +5,7 @@
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +24,8 @@
 %package devel
 Summary:        Library development files for osgal
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       OpenSceneGraph-devel OpenThreads-devel
-Requires:       openal-devel freealut-devel libvorbis-devel
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       OpenThreads-devel openal-devel freealut-devel libvorbis-devel
 
 %description devel
 This package contains headers and libraries required to build applications
@@ -34,13 +33,17 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in
-chmod -x {include,src}/osg*/*
 autoreconf --force --install
 
-# Fix rpmlint errors
+# Fix rpmlint warnings
+chmod -x {include,src}/osg*/*
 chmod -x AUTHORS COPYING NEWS README
+iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 -t utf-8 NEWS > NEWS.conv && mv -f NEWS.conv NEWS
+iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README
+sed -i 's/\r//' AUTHORS NEWS README doc/*html
 
 
 %build
@@ -84,10 +87,11 @@
 
 
 %changelog
-* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.6.1-1
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 1:0.6.1-1
 - Upstream sync
 - Move openalpp-devel Requires to this package
 - Obsolete/Provides openalpp
+- Fix up some rpmlint warnings
 
 * Sun Feb 04 2007 Christopher Stone <chris.stone at gmail.com> 20060903-3
 - Fix setting of CFLAGS in configure.in bug #227290



From fedora-extras-commits at redhat.com  Sun Sep 30 00:13:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 20:13:25 -0400
Subject: rpms/osgcal/devel osgcal.spec,1.10,1.11
Message-ID: <200709300013.l8U0DPQT026018@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26000

Modified Files:
	osgcal.spec 
Log Message:
fix some rpmlint warnings


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/osgcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- osgcal.spec	29 Sep 2007 15:01:35 -0000	1.10
+++ osgcal.spec	30 Sep 2007 00:12:53 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           osgcal
 Version:        0.1.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://gna.org/projects/underware
 Source0:        http://osgcal.dachary.org/download/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +37,7 @@
 
 # Fix rpmlint warnings
 chmod -x include/osgCal/HardwareModel
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 
 
 %build
@@ -81,6 +82,10 @@
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-2
+- Update License
+- Fix encoding on Changelog
+
 * Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-1
 - Upstream sync
 - Remove no longer needed 64-bit patch



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:32 -0400
Subject: rpms/fbreader/EL-4 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2aWha010115@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:35:57 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:35:57 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:44 -0400
Subject: rpms/fbreader/EL-5 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2aih1010120@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:03 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:03 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:49 -0400
Subject: rpms/fbreader/F-7 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2antF010124@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:52 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:52 -0400
Subject: rpms/fbreader/devel fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709300236.l8U2aqXx010129@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:19 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:19 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:39:08 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:39:08 -0400
Subject: rpms/fbreader/devel fbreader.spec,NONE,1.1
Message-ID: <200709300239.l8U2d8G2010208@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10201

Added Files:
	fbreader.spec 
Log Message:
fbreader.spec for devel


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package



From fedora-extras-commits at redhat.com  Sun Sep 30 03:07:36 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:07:36 -0400
Subject: rpms/ghc/devel .cvsignore, 1.8, 1.9 ghc.spec, 1.21, 1.22 sources,
	1.10, 1.11
Message-ID: <200709300307.l8U37a7G016994@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16961

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
Update to ghc-6.8.0.20070928



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 May 2007 17:09:49 -0000	1.8
+++ .cvsignore	30 Sep 2007 03:06:57 -0000	1.9
@@ -1,2 +1,2 @@
-ghc-6.6.1-src.tar.bz2
-ghc-6.6.1-src-extralibs.tar.bz2
+ghc-6.8.0.20070928-src-extralibs.tar.bz2
+ghc-6.8.0.20070928-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ghc.spec	10 May 2007 19:52:43 -0000	1.21
+++ ghc.spec	30 Sep 2007 03:06:57 -0000	1.22
@@ -1,12 +1,24 @@
-%define ghcver ghc661
+%define ghcver ghc680
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
+# 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
+# your built tree to a directory of the same name suffixed with
+# ".built", using "cp -al".  Finally, set this variable, and it will
+# copy the already-built tree into place during %build instead of
+# actually doing the build.
+#
+# Obviously, this can only work if you leave the %build section
+# completely untouched between builds.
+%define package_debugging 0
+
 Name:		ghc
-Version:	6.6.1
-Release:	3%{?dist}
+Version:	6.8.0.20070928
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	ppc64
@@ -15,15 +27,15 @@
 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
 URL:		http://haskell.org/ghc/
-Requires:	%{ghcver} = %{version}-%{release}
+Requires:	%{ghcver} = %{version}-%{release}, chkconfig
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, sed
-Buildrequires:  gmp-devel, readline-devel
-Buildrequires:  libX11-devel, libXt-devel
-Buildrequires:  freeglut-devel, openal-devel
+BuildRequires:  gmp-devel, readline-devel
+BuildRequires:  libX11-devel, libXt-devel
+BuildRequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
-Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
+BuildRequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
 Prefix:		%{_prefix}
 
@@ -82,31 +94,49 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
-%setup -q -n ghc-%{version} -b1
+%setup -q -n %{name}-%{version} -b1
 
 %build
+%if %{package_debugging}
+cd ..
+rm -rf %{name}-%{version}
+cp -al %{name}-%{version}.built %{name}-%{version}
+cd %{name}-%{version}
+exit 0
+%endif
+
 %if !%{build_prof}
 echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
+./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}
 
 # drop truncated copy of header (#222865)
 rm libraries/network/include/Typeable.h
 
-make all
+make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} all
 %if %{build_doc}
-make html
+make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} html
+make %{_smp_mflags} -C libraries HADDOCK_DOCS=YES
+( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} install
+make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/%{name}-%{version} install
 
 %if %{build_doc}
-make mandir=$RPM_BUILD_ROOT%{_mandir} datadir=$RPM_BUILD_ROOT%{_docdir}/ghc-%{version} XMLDocWays="html" install-docs
+make DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name}-%{version} \
+  XMLDocWays="html" HADDOCK_DOCS=YES install-docs
+mv ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries \
+  ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}
+cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
 %endif
 
 SRC_TOP=$PWD
@@ -126,6 +156,7 @@
 # create package.conf.old
 touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
 
+mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs-ghc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +171,22 @@
 
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/{hasktags,runghc,runhaskell} >/dev/null 2>&1 || :
 
+# Alas, GHC, Hugs, and nhc all come with different set of tools in
+# addition to a runFOO:
+#
+#   * GHC:  hsc2hs
+#   * Hugs: hsc2hs, cpphs
+#   * nhc:  cpphs
+#
+# Therefore it is currently not possible to use --slave below to form
+# link groups under a single name 'runhaskell'. Either these tools
+# should be disentangled from the Haskell implementations, or all
+# implementations should have the same set of tools. *sigh*
+
+update-alternatives --install %{_bindir}/runhaskell runhaskell \
+  %{_bindir}/runghc 500
+update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
+  %{_bindir}/hsc2hs-ghc 500
 
 %post -n %{ghcver}
 ## tweak prefix in drivers scripts if relocating
@@ -152,6 +199,13 @@
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || :
 
 
+%preun
+if test "$1" = 0; then
+  update-alternatives --remove runhaskell %{_bindir}/runghc
+  update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-ghc
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -181,6 +235,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-1
+- prepare for GHC 6.8.1 by building a release candidate snapshot
+
 * Thu May 10 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.6.1-3
 - install man page for ghc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 May 2007 17:09:49 -0000	1.10
+++ sources	30 Sep 2007 03:06:57 -0000	1.11
@@ -1,2 +1,2 @@
-dea271503463bd28c27f25ab90998633  ghc-6.6.1-src.tar.bz2
-43a26b81608b206c056adc3032f7da2a  ghc-6.6.1-src-extralibs.tar.bz2
+8699ec00c510077ad6c632aea19ec1e0  ghc-6.8.0.20070928-src-extralibs.tar.bz2
+2f3d20ad0c68cd77a06b708e4d8360c5  ghc-6.8.0.20070928-src.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 03:19:26 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:19:26 -0400
Subject: rpms/ghc/devel ghc.spec,1.22,1.23
Message-ID: <200709300319.l8U3JQVI017379@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17348

Modified Files:
	ghc.spec 
Log Message:
Work around rpm braindamage: you can't have "%" in comments!?



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ghc.spec	30 Sep 2007 03:06:57 -0000	1.22
+++ ghc.spec	30 Sep 2007 03:18:21 -0000	1.23
@@ -9,10 +9,10 @@
 # the misery, do a complete build once using "rpmbuild -bc", then copy
 # your built tree to a directory of the same name suffixed with
 # ".built", using "cp -al".  Finally, set this variable, and it will
-# copy the already-built tree into place during %build instead of
+# copy the already-built tree into place during build instead of
 # actually doing the build.
 #
-# Obviously, this can only work if you leave the %build section
+# Obviously, this can only work if you leave the build section
 # completely untouched between builds.
 %define package_debugging 0
 



From fedora-extras-commits at redhat.com  Sun Sep 30 03:54:26 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:54:26 -0400
Subject: rpms/ghc/devel ghc.spec,1.23,1.24
Message-ID: <200709300354.l8U3sQCf018070@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18052

Modified Files:
	ghc.spec 
Log Message:
Add happy to buldreqs


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ghc.spec	30 Sep 2007 03:18:21 -0000	1.23
+++ ghc.spec	30 Sep 2007 03:53:49 -0000	1.24
@@ -18,7 +18,7 @@
 
 Name:		ghc
 Version:	6.8.0.20070928
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	ppc64
@@ -29,7 +29,7 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}, chkconfig
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ghc, sed
+BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, readline-devel
 BuildRequires:  libX11-devel, libXt-devel
 BuildRequires:  freeglut-devel, openal-devel
@@ -235,6 +235,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-2
+- add happy to BuildRequires
+
 * Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-1
 - prepare for GHC 6.8.1 by building a release candidate snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:06 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:06 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.128, 1.129 jd.spec, 1.147, 1.148 sources, 
	1.129, 1.130
Message-ID: <200709301132.l8UBW6Lk026280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- .cvsignore	28 Sep 2007 15:27:25 -0000	1.128
+++ .cvsignore	30 Sep 2007 11:31:34 -0000	1.129
@@ -1 +1 @@
-jd-1.9.6-svn1355.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- jd.spec	28 Sep 2007 15:27:25 -0000	1.147
+++ jd.spec	30 Sep 2007 11:31:34 -0000	1.148
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1355
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
-- svn 1355
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
 
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- sources	28 Sep 2007 15:27:25 -0000	1.129
+++ sources	30 Sep 2007 11:31:34 -0000	1.130
@@ -1 +1 @@
-4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:09 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:09 -0400
Subject: rpms/jd/FC-6 .cvsignore, 1.30, 1.31 jd.spec, 1.36, 1.37 sources,
	1.31, 1.32
Message-ID: <200709301132.l8UBW9d0026285@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	18 Sep 2007 13:46:26 -0000	1.30
+++ .cvsignore	30 Sep 2007 11:31:37 -0000	1.31
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jd.spec	18 Sep 2007 13:46:26 -0000	1.36
+++ jd.spec	30 Sep 2007 11:31:37 -0000	1.37
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	18 Sep 2007 13:46:26 -0000	1.31
+++ sources	30 Sep 2007 11:31:37 -0000	1.32
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:11 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:11 -0400
Subject: rpms/jd/devel .cvsignore, 1.148, 1.149 jd.spec, 1.174, 1.175 sources,
	1.149, 1.150
Message-ID: <200709301132.l8UBWBbv026290@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	28 Sep 2007 15:23:54 -0000	1.148
+++ .cvsignore	30 Sep 2007 11:31:39 -0000	1.149
@@ -1 +1 @@
-jd-1.9.6-svn1355.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- jd.spec	28 Sep 2007 15:23:54 -0000	1.174
+++ jd.spec	30 Sep 2007 11:31:39 -0000	1.175
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1355
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
-- svn 1355
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
 
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- sources	28 Sep 2007 15:23:54 -0000	1.149
+++ sources	30 Sep 2007 11:31:39 -0000	1.150
@@ -1 +1 @@
-4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 13:27:05 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 30 Sep 2007 09:27:05 -0400
Subject: rpms/libdockapp/devel libdockapp.spec,1.2,1.3
Message-ID: <200709301327.l8UDR5UX008361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdockapp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8342

Modified Files:
	libdockapp.spec 
Log Message:
* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson



Index: libdockapp.spec
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/devel/libdockapp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdockapp.spec	24 May 2007 08:13:29 -0000	1.2
+++ libdockapp.spec	30 Sep 2007 13:26:32 -0000	1.3
@@ -1,8 +1,9 @@
 %define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
 
 Name:           libdockapp
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DockApp Development Standard Library
 
 Group:          System Environment/Libraries
@@ -43,8 +44,6 @@
 %package        fonts
 Summary:        Fonts provided with %{name}
 Group:          User Interface/X
-Requires(post):   chkfontpath
-Requires(postun): chkfontpath
 
 %description fonts
 Bitmap X fonts provided with libdockapp.
@@ -74,6 +73,9 @@
 cp -a examples examples-devel
 rm examples-devel/Makefile*
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,8 +83,6 @@
 %post -p /sbin/ldconfig
 
 %post fonts
-/usr/sbin/chkfontpath -qa %{_datadir}/X11/fonts/dockapp
-
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/X11/fonts
 fi
@@ -94,7 +94,6 @@
   if [ -x /usr/bin/fc-cache ]; then
     /usr/bin/fc-cache %{_datadir}/X11/fonts
   fi
-  /usr/sbin/chkfontpath -qr %{_datadir}/X11/fonts/dockapp
 fi
 
 %files
@@ -112,8 +111,12 @@
 # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
 %{_x11fontdir}/
 #%{_x11fontdir}/dockapp/
+%{catalogue}/dockapp
 
 %changelog
+* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
+- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson
+
 * Thu May 24 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-3
 - fix libtool bug on ppc64
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:15 -0400
Subject: rpms/perl-MP3-Info/F-7 .cvsignore, 1.4, 1.5 perl-MP3-Info.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiFtZ026177@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/F-7

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:47 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:42 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	8 Sep 2007 19:03:05 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:47 -0000	1.4
+++ sources	30 Sep 2007 14:43:42 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:19 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:19 -0400
Subject: rpms/perl-MP3-Info/FC-6 .cvsignore, 1.4, 1.5 perl-MP3-Info.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiJod026182@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/FC-6

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:50 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:45 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 19:03:09 -0000	1.7
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:50 -0000	1.4
+++ sources	30 Sep 2007 14:43:45 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:21 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:21 -0400
Subject: rpms/perl-MP3-Info/devel .cvsignore, 1.4, 1.5 perl-MP3-Info.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiLJP026187@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/devel

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:53 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:49 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	8 Sep 2007 19:03:13 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:53 -0000	1.4
+++ sources	30 Sep 2007 14:43:49 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:46:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 10:46:45 -0400
Subject: extras-buildsys ChangeLog,1.220,1.221
Message-ID: <200709301446.l8UEkjHa026320@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26266

Modified Files:
	ChangeLog 
Log Message:
Fix rpmUtils imports


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog	18 Sep 2007 18:26:18 -0000	1.220
+++ ChangeLog	30 Sep 2007 14:46:43 -0000	1.221
@@ -1,9 +1,14 @@
+2007-09-30  Ville Skytt??  <scop at fedoraproject.org>
+
+	* server/PackageJob.py
+	  - Fix rpmUtils imports
+
 2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
 
 	* etc/plague-builder.init, etc/plague-server.init
 	   - Fix usage help output
 
-2007-05-20  Ville Skytt??  <ville.skytta at iki.fi>
+2007-05-20  Ville Skytt??  <scop at fedoraproject.org>
 
     * common/AuthedXMLRPCServer.py
         - Fix SimpleXMLRPCDispatcher initialization for Python 2.5
@@ -1061,7 +1066,7 @@
             returning Error 500 Internal Server Error when, for example, the
             build server isn't running
 
-    Patch from Ville Skytt?? <ville.skytta at iki.fi>
+    Patch from Ville Skytt?? <scop at fedoraproject.org>
     * www/template/head.psp
       www/indiv.psp
         - Use HTTP GET instead of POST to stop nags about form data resubmission



From fedora-extras-commits at redhat.com  Sun Sep 30 14:46:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 10:46:46 -0400
Subject: extras-buildsys/server PackageJob.py,1.58,1.59
Message-ID: <200709301446.l8UEkkvs026326@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26266/server

Modified Files:
	PackageJob.py 
Log Message:
Fix rpmUtils imports


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- PackageJob.py	13 Nov 2006 20:10:48 -0000	1.58
+++ PackageJob.py	30 Sep 2007 14:46:43 -0000	1.59
@@ -21,7 +21,8 @@
 import commands
 import threading
 import time
-import rpmUtils
+import rpmUtils.miscutils
+import rpmUtils.transaction
 import exceptions
 import shutil
 import copy



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:14 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.9,1.10
Message-ID: <200709301447.l8UElEFS026358@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MP3-Info.spec	30 Sep 2007 14:43:42 -0000	1.9
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:42 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:17 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.8,1.9
Message-ID: <200709301447.l8UElH4Y026361@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	30 Sep 2007 14:43:45 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:44 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:20 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.9,1.10
Message-ID: <200709301447.l8UElKGm026364@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MP3-Info.spec	30 Sep 2007 14:43:49 -0000	1.9
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:47 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:09:35 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:09:35 -0400
Subject: rpms/php-pear-Net-UserAgent-Detect/devel .cvsignore, 1.3,
	1.4 php-pear-Net-UserAgent-Detect.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709301509.l8UF9ZUa006687@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6644

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2007 02:27:20 -0000	1.3
+++ .cvsignore	30 Sep 2007 15:09:02 -0000	1.4
@@ -1 +1 @@
-Net_UserAgent_Detect-2.3.0.tgz
+Net_UserAgent_Detect-2.4.0.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Net-UserAgent-Detect.spec	2 May 2007 02:27:20 -0000	1.2
+++ php-pear-Net-UserAgent-Detect.spec	30 Sep 2007 15:09:02 -0000	1.3
@@ -2,12 +2,12 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.3.0
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
 Group:          Development/Languages
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Net_UserAgent_Detect
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.4.0-1
+- Upstream sync
+
 * Tue May 01 2007 Christopher Stone <chris.stone at gmail.com> 2.3.0-1
 - Upstream sync
 - Update license to 3.01


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2007 02:27:20 -0000	1.3
+++ sources	30 Sep 2007 15:09:02 -0000	1.4
@@ -1 +1 @@
-f2ceeeb15c7b30e82bc6045b93e366c4  Net_UserAgent_Detect-2.3.0.tgz
+861df334ae59f0502b9af53e4397f97f  Net_UserAgent_Detect-2.4.0.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 15:09:36 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 30 Sep 2007 11:09:36 -0400
Subject: rpms/tig/devel .cvsignore,1.4,1.5 sources,1.4,1.5 tig.spec,1.5,1.6
Message-ID: <200709301509.l8UF9aqO006692@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/tig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6651

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
tig-0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2007 14:14:37 -0000	1.4
+++ .cvsignore	30 Sep 2007 15:09:03 -0000	1.5
@@ -1 +1 @@
-tig-0.9.tar.gz
+tig-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2007 14:14:37 -0000	1.4
+++ sources	30 Sep 2007 15:09:03 -0000	1.5
@@ -1 +1 @@
-29576aee510e0cd1a16702560cf487ce  tig-0.9.tar.gz
+b596682b3cd5892db22d7168d6f99bd1  tig-0.9.1.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/tig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tig.spec	20 Sep 2007 14:14:37 -0000	1.5
+++ tig.spec	30 Sep 2007 15:09:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           tig
-Version:        0.9
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 James Bowes <jbowes at redhat.com> - 0.9.1-1
+- tig-0.9.1
+
 * Thu Sep 20 2007 James Bowes <jbowes at redhat.com> - 0.9-1
 - tig-0.9
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:17:56 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 30 Sep 2007 11:17:56 -0400
Subject: rpms/git/devel .cvsignore, 1.45, 1.46 git.spec, 1.40, 1.41 sources, 
	1.45, 1.46
Message-ID: <200709301517.l8UFHusO006935@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903

Modified Files:
	.cvsignore git.spec sources 
Log Message:
git 1.5.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	27 Sep 2007 01:34:46 -0000	1.45
+++ .cvsignore	30 Sep 2007 15:17:23 -0000	1.46
@@ -1 +1 @@
-git-1.5.3.2.tar.gz
+git-1.5.3.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- git.spec	27 Sep 2007 01:34:46 -0000	1.40
+++ git.spec	30 Sep 2007 15:17:23 -0000	1.41
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.3.2
+Version: 	1.5.3.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Sun Sep 30 2007 James Bowes <jbowes at redhat.com> 1.5.3.3-1
+- git-1.5.3.3
+
 * Wed Sep 26 2007 James Bowes <jbowes at redhat.com> 1.5.3.2-1
 - git-1.5.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	27 Sep 2007 01:34:46 -0000	1.45
+++ sources	30 Sep 2007 15:17:23 -0000	1.46
@@ -1 +1 @@
-9930f19e22c121b8a803337cbda1e661  git-1.5.3.2.tar.gz
+978bda72a636d805dd3058efec5e6f2e  git-1.5.3.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 15:20:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 11:20:28 -0400
Subject: extras-buildsys ChangeLog,1.221,1.222
Message-ID: <200709301520.l8UFKSAJ007024@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6993

Modified Files:
	ChangeLog 
Log Message:
Fix inaccurate down_message comment


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- ChangeLog	30 Sep 2007 14:46:43 -0000	1.221
+++ ChangeLog	30 Sep 2007 15:20:25 -0000	1.222
@@ -3,6 +3,9 @@
 	* server/PackageJob.py
 	  - Fix rpmUtils imports
 
+	* www/config.psp
+	  - Fix inaccurate down_message comment
+
 2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
 
 	* etc/plague-builder.init, etc/plague-server.init



From fedora-extras-commits at redhat.com  Sun Sep 30 15:20:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 11:20:28 -0400
Subject: extras-buildsys/www config.psp,1.4,1.5
Message-ID: <200709301520.l8UFKScd007030@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6993/www

Modified Files:
	config.psp 
Log Message:
Fix inaccurate down_message comment


Index: config.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.psp	19 Nov 2005 05:43:24 -0000	1.4
+++ config.psp	30 Sep 2007 15:20:26 -0000	1.5
@@ -10,7 +10,7 @@
 config_opts['user_ca_cert'] = CERT_BASE_DIR + "fedora-upload-ca.cert"
 config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert"
 
-# Leave blank (zero-length) to disable
+# Leave blank (zero-length) to use the default
 config_opts['down_message'] = ""
 
 %>



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:11 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:11 -0400
Subject: rpms/php-pecl-radius/EL-5 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYBqj007383@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/EL-5

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:42:42 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:39 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:14 -0400
Subject: rpms/php-pecl-radius/F-7 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYEtW007386@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/F-7

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:26 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:42 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:16 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:16 -0400
Subject: rpms/php-pecl-radius/FC-6 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYGxF007389@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/FC-6

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:29 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:44 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:19 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:19 -0400
Subject: rpms/php-pecl-radius/devel php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYJZX007392@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/devel

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:31 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:47 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:51:02 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 11:51:02 -0400
Subject: rpms/yum-cron/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301551.l8UFp2e7009226@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9137/devel

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 14:52:22 -0000	1.3
+++ .cvsignore	30 Sep 2007 15:50:30 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 14:52:22 -0000	1.3
+++ sources	30 Sep 2007 15:50:30 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 14:52:22 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 15:50:30 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:44 -0400
Subject: extras-buildsys ChangeLog,1.126.2.52,1.126.2.53
Message-ID: <200709301626.l8UGQi3E018252@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
Merge some bits from HEAD


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.52
retrieving revision 1.126.2.53
diff -u -r1.126.2.52 -r1.126.2.53
--- ChangeLog	17 Dec 2006 17:39:34 -0000	1.126.2.52
+++ ChangeLog	30 Sep 2007 16:26:42 -0000	1.126.2.53
@@ -1,3 +1,11 @@
+2007-09-30  Ville Skytt??  <scop at fedoraproject.org>
+
+	* server/PackageJob.py
+	  - Fix rpmUtils imports
+
+	* common/AuthedXMLRPCServer.py
+	  - Fix SimpleXMLRPCDispatcher initialization for Python 2.5
+
 2006-12-17  Dan Williams  <dcbw at redhat.com>
 
 	Toshio Kuratomi <toshio at tiki-lounge.com>
@@ -652,7 +660,7 @@
             returning Error 500 Internal Server Error when, for example, the
             build server isn't running
 
-    Patch from Ville Skytt?? <ville.skytta at iki.fi>
+    Patch from Ville Skytt?? <scop at fedoraproject.org>
     * www/template/head.psp
       www/indiv.psp
         - Use HTTP GET instead of POST to stop nags about form data resubmission



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:44 -0400
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.6.4.4,1.6.4.5
Message-ID: <200709301626.l8UGQiV0018258@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206/common

Modified Files:
      Tag: STABLE_0_4
	AuthedXMLRPCServer.py 
Log Message:
Merge some bits from HEAD


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -u -r1.6.4.4 -r1.6.4.5
--- AuthedXMLRPCServer.py	26 Feb 2006 17:12:00 -0000	1.6.4.4
+++ AuthedXMLRPCServer.py	30 Sep 2007 16:26:42 -0000	1.6.4.5
@@ -75,7 +75,10 @@
         self.authinfo_callback = authinfo_callback
 
         if sys.version_info[:3] > (2, 2, 3):
-            SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+            if sys.version_info[:2] < (2, 5):
+                SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+            else:
+                SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, False, None)
         else:
             self.funcs = {}
             self.instance = None



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:45 -0400
Subject: extras-buildsys/server PackageJob.py,1.31.2.11,1.31.2.12
Message-ID: <200709301626.l8UGQj0V018264@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206/server

Modified Files:
      Tag: STABLE_0_4
	PackageJob.py 
Log Message:
Merge some bits from HEAD


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.11
retrieving revision 1.31.2.12
diff -u -r1.31.2.11 -r1.31.2.12
--- PackageJob.py	10 Nov 2006 14:31:47 -0000	1.31.2.11
+++ PackageJob.py	30 Sep 2007 16:26:42 -0000	1.31.2.12
@@ -21,7 +21,8 @@
 import commands
 import threading
 import time
-import rpmUtils
+import rpmUtils.miscutils
+import rpmUtils.transaction
 import exceptions
 import shutil
 import copy



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:00 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:00 -0400
Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ0HG018576@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/EL-5

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:02 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:28 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:03 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:03 -0400
Subject: rpms/php-pecl-xdebug/F-7 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ3d9018579@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/F-7

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:06 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:31 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:06 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:06 -0400
Subject: rpms/php-pecl-xdebug/FC-6 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ6Gd018582@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/FC-6

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:10 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:33 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:09 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:09 -0400
Subject: rpms/php-pecl-xdebug/devel php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ9KN018587@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/devel

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:14 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:36 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 17:05:22 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:05:22 -0400
Subject: rpms/yum-cron/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301705.l8UH5Mf7026411@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26148/EL-5

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 15:04:18 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:04:48 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 15:04:18 -0000	1.3
+++ sources	30 Sep 2007 17:04:48 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 15:04:18 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:04:48 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:06:48 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:06:48 -0400
Subject: rpms/yum-cron/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301706.l8UH6meN026764@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26476/FC-6

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 15:02:13 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:06:16 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 15:02:13 -0000	1.3
+++ sources	30 Sep 2007 17:06:16 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 15:02:13 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:06:16 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:08:20 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:08:20 -0400
Subject: rpms/yum-cron/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301708.l8UH8Kex028233@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27233/F-7

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 14:59:33 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:07:47 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 14:59:33 -0000	1.3
+++ sources	30 Sep 2007 17:07:47 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 14:59:33 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:07:47 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:23 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:23 -0400
Subject: rpms/python-fpconst/F-7 .cvsignore, 1.2, 1.3 python-fpconst.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGNZQ029656@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/F-7

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:50 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/python-fpconst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-fpconst.spec	9 Dec 2006 01:16:19 -0000	1.5
+++ python-fpconst.spec	30 Sep 2007 17:15:50 -0000	1.6
@@ -1,13 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}.2
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -18,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -39,7 +46,13 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
 * Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
 - Add python-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:50 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:25 -0400
Subject: rpms/python-fpconst/FC-6 .cvsignore, 1.2, 1.3 python-fpconst.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGPQ3029661@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/FC-6

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:53 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/python-fpconst.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-fpconst.spec	6 Sep 2006 18:50:23 -0000	1.3
+++ python-fpconst.spec	30 Sep 2007 17:15:53 -0000	1.4
@@ -1,15 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  python-devel
 
 %description
 This python module implements constants and functions for working with
@@ -17,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -38,7 +46,19 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
+* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
+- Add python-devel to BR
+
+* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.1
+- python(abi) = 0:2.5
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3
 - No longer %%ghost pyo files.  Bug #205414
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:53 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:28 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:28 -0400
Subject: rpms/python-fpconst/devel .cvsignore, 1.2, 1.3 python-fpconst.spec, 
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGS4w029666@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/devel

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:56 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/python-fpconst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-fpconst.spec	9 Dec 2006 01:16:19 -0000	1.5
+++ python-fpconst.spec	30 Sep 2007 17:15:56 -0000	1.6
@@ -1,13 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}.2
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -18,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -39,7 +46,13 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
 * Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
 - Add python-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:56 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 18:00:50 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:00:50 -0400
Subject: rpms/chmlib/devel chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301800.l8UI0o4G000325@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/devel

Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:06 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:06 -0400
Subject: rpms/chmlib/EL-4 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI166l005538@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/EL-4

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/EL-4/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:06:15 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:31 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:09 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:09 -0400
Subject: rpms/chmlib/EL-5 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI19QC005928@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/EL-5

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/EL-5/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:08:26 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:36 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:12 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:12 -0400
Subject: rpms/chmlib/F-7 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI1C4N006327@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/F-7

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/F-7/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:10:17 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:39 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:17 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:17 -0400
Subject: rpms/chmlib/FC-6 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI1Hg9006454@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/FC-6

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/FC-6/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:03:07 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:42 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:03:20 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:03:20 -0400
Subject: rpms/chmlib/devel chmlib.spec,1.13,1.14
Message-ID: <200709301803.l8UI3Kwu006584@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6554

Modified Files:
	chmlib.spec 
Log Message:
Accidentally forgot to commit spec-file


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:00:16 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:02:47 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:26 -0700
Subject: [pkgdb] qwt-doc was added for frankb
Message-ID: <200709301844.l8UIiVrq010788@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qwt-doc with summary Documentation of qwt
Kevin Fenzi (kevin) has approved Package qwt-doc
Kevin Fenzi (kevin) has added a Fedora devel branch for qwt-doc with an owner of frankb
Kevin Fenzi (kevin) has approved qwt-doc in Fedora devel
Kevin Fenzi (kevin) has approved Package qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, 7) updated by kevin
Message-ID: <200709301844.l8UIifP8010812@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, 6) updated by kevin
Message-ID: <200709301844.l8UIifNO010811@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora EPEL, 5) updated by kevin
Message-ID: <200709301844.l8UIifPB010812@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, devel) updated by kevin
Message-ID: <200709301844.l8UIifNR010811@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:01 -0400
Subject: rpms/qwt-doc - New directory
Message-ID: <200709301845.l8UIj10P007949@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc

Log Message:
Directory /cvs/extras/rpms/qwt-doc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:02 -0400
Subject: rpms/qwt-doc/devel - New directory
Message-ID: <200709301845.l8UIj2kr007963@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc/devel

Log Message:
Directory /cvs/extras/rpms/qwt-doc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:05 -0400
Subject: rpms/qwt-doc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709301845.l8UIj5mH007988@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc

Added Files:
	Makefile import.log 
Log Message:
Setup of module qwt-doc


--- NEW FILE Makefile ---
# Top level Makefile for module qwt-doc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:07 -0400
Subject: rpms/qwt-doc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709301845.l8UIj7f8008004@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qwt-doc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qwt-doc
# $Id: Makefile,v 1.1 2007/09/30 18:45:05 kevin Exp $
NAME := qwt-doc
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 fedora-extras-commits at redhat.com  Sun Sep 30 18:47:12 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:12 -0700
Subject: [pkgdb] R-DynDoc was added for pingou
Message-ID: <200709301847.l8UIlHKj011058@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package R-DynDoc with summary Functions for dynamic documents
Kevin Fenzi (kevin) has approved Package R-DynDoc
Kevin Fenzi (kevin) has added a Fedora devel branch for R-DynDoc with an owner of pingou
Kevin Fenzi (kevin) has approved R-DynDoc in Fedora devel
Kevin Fenzi (kevin) has approved Package R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, 7) updated by kevin
Message-ID: <200709301847.l8UIlQbZ011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, 6) updated by kevin
Message-ID: <200709301847.l8UIlQbc011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, devel) updated by kevin
Message-ID: <200709301847.l8UIlQbf011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:36 -0400
Subject: rpms/R-DynDoc - New directory
Message-ID: <200709301847.l8UIladR008665@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc

Log Message:
Directory /cvs/extras/rpms/R-DynDoc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:42 -0400
Subject: rpms/R-DynDoc/devel - New directory
Message-ID: <200709301847.l8UIlg7q008677@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc/devel

Log Message:
Directory /cvs/extras/rpms/R-DynDoc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:45 -0400
Subject: rpms/R-DynDoc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709301847.l8UIljXt008705@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc

Added Files:
	Makefile import.log 
Log Message:
Setup of module R-DynDoc


--- NEW FILE Makefile ---
# Top level Makefile for module R-DynDoc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:48 -0400
Subject: rpms/R-DynDoc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709301847.l8UIlmPa008722@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-DynDoc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-DynDoc
# $Id: Makefile,v 1.1 2007/09/30 18:47:46 kevin Exp $
NAME := R-DynDoc
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 fedora-extras-commits at redhat.com  Sun Sep 30 18:54:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Sep 2007 14:54:31 -0400
Subject: rpms/pingus/devel .cvsignore, 1.3, 1.4 pingus.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200709301854.l8UIsVUd009285@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pingus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9260

Modified Files:
	.cvsignore pingus.spec sources 
Log Message:
* Sun Sep 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
- New upstream release 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2007 20:40:24 -0000	1.3
+++ .cvsignore	30 Sep 2007 18:53:59 -0000	1.4
@@ -1 +1 @@
-pingus-0.7.0.tar.bz2
+pingus-0.7.1.tar.bz2


Index: pingus.spec
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/pingus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pingus.spec	29 Aug 2007 21:00:22 -0000	1.7
+++ pingus.spec	30 Sep 2007 18:53:59 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           pingus
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        Guide the penguins safely home before they drop of the cliff
 Group:          Amusements/Games
@@ -8,7 +8,6 @@
 Source0:        http://pingus.seul.org/files/%{name}-%{version}.tar.bz2
 Source1:        pingus.desktop
 Source2:        pingus.png
-Patch0:         pingus-0.7.0-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel boost-devel libpng-devel
 BuildRequires:  physfs-devel scons desktop-file-utils
@@ -25,12 +24,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
+iconv -f ISO8859-2 -t UTF8 AUTHORS > AUTHORS.tmp
+mv AUTHORS.tmp AUTHORS
 
 
 %build
-export CCFLAGS="$RPM_OPT_FLAGS"
-scons
+scons CCFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -77,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
+- New upstream release 0.7.1
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.0-1
 - New upstream release 0.7.0 final
 - This changes pingus from a ClanLib app into an SDL app


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 20:40:24 -0000	1.3
+++ sources	30 Sep 2007 18:53:59 -0000	1.4
@@ -1 +1 @@
-d967a3c233aa094236eb2ce6a3e20dd8  pingus-0.7.0.tar.bz2
+b4fcf66d0dc5e1d6148447988f87d3b1  pingus-0.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:07:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:07:02 -0400
Subject: rpms/qwt-doc import.log,1.1,1.2
Message-ID: <200709301907.l8UJ7206015929@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15876

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Sep 2007 18:45:03 -0000	1.1
+++ import.log	30 Sep 2007 19:06:30 -0000	1.2
@@ -0,0 +1 @@
+qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149



From fedora-extras-commits at redhat.com  Sun Sep 30 19:07:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:07:04 -0400
Subject: rpms/qwt-doc/devel qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301907.l8UJ74mr015933@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:06:32 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:09:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:09:04 -0400
Subject: rpms/qwt-doc import.log,1.2,1.3
Message-ID: <200709301909.l8UJ94sA016178@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Sep 2007 19:06:30 -0000	1.2
+++ import.log	30 Sep 2007 19:08:31 -0000	1.3
@@ -1 +1,2 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
+qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281



From fedora-extras-commits at redhat.com  Sun Sep 30 19:09:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:09:06 -0400
Subject: rpms/qwt-doc/FC-6 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301909.l8UJ960d016182@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:08:34 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:08:34 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:11:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:11:04 -0400
Subject: rpms/qwt-doc import.log,1.3,1.4
Message-ID: <200709301911.l8UJB4Is016341@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	30 Sep 2007 19:08:31 -0000	1.3
+++ import.log	30 Sep 2007 19:10:31 -0000	1.4
@@ -1,2 +1,3 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
 qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281
+qwt-doc-5_0_2-4FC5:F-7:qwt-doc-5.0.2-4FC5.src.rpm:1191179404



From fedora-extras-commits at redhat.com  Sun Sep 30 19:11:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:11:07 -0400
Subject: rpms/qwt-doc/F-7 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301911.l8UJB7qE016345@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:10:34 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:10:34 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:13:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:13:24 -0400
Subject: rpms/qwt-doc import.log,1.4,1.5
Message-ID: <200709301913.l8UJDOn9016659@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	30 Sep 2007 19:10:31 -0000	1.4
+++ import.log	30 Sep 2007 19:12:52 -0000	1.5
@@ -1,3 +1,4 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
 qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281
 qwt-doc-5_0_2-4FC5:F-7:qwt-doc-5.0.2-4FC5.src.rpm:1191179404
+qwt-doc-5_0_2-4FC5:EL-5:qwt-doc-5.0.2-4FC5.src.rpm:1191179538



From fedora-extras-commits at redhat.com  Sun Sep 30 19:13:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:13:28 -0400
Subject: rpms/qwt-doc/EL-5 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301913.l8UJDSvb016663@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:12:54 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:12:54 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 20:08:48 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Sep 2007 16:08:48 -0400
Subject: rpms/neverball/devel neverball.desktop, 1.3, 1.4 neverball.spec,
	1.14, 1.15 neverputt.desktop, 1.2, 1.3
Message-ID: <200709302008.l8UK8m0K024466@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/neverball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24439

Modified Files:
	neverball.desktop neverball.spec neverputt.desktop 
Log Message:
Add wrapper for detecting DRI when launching game (BZ #304811)




Index: neverball.desktop
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- neverball.desktop	9 Mar 2007 21:37:25 -0000	1.3
+++ neverball.desktop	30 Sep 2007 20:08:15 -0000	1.4
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Neverball
 Comment=Ball guiding game.
-Exec=neverball
+Exec=neverball-wrapper
 Terminal=false
 Icon=neverball.png
 Type=Application


Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- neverball.spec	20 Aug 2007 19:57:37 -0000	1.14
+++ neverball.spec	30 Sep 2007 20:08:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -15,6 +15,7 @@
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
 BuildRequires:  libGL-devel
+Requires: opengl-games-utils
 
 %description
 Tilt the floor to roll a ball through an obstacle course within the
@@ -41,6 +42,8 @@
 install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png
 install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png
 cp -ap  data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverball-wrapper
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverputt-wrapper
 
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
@@ -62,6 +65,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 29 2007 Wart <wart at kobold.org> - 1.4.0-10
+- Add wrapper for detecting DRI when launching game (BZ #304811)
+
 * Mon Aug 20 2007 Wart <wart at kobold.org> - 1.4.0-9
 - License tag clarification
 


Index: neverputt.desktop
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverputt.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- neverputt.desktop	9 Mar 2007 21:37:25 -0000	1.2
+++ neverputt.desktop	30 Sep 2007 20:08:15 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Neverputt
 Comment=Minigolf like game
-Exec=neverputt
+Exec=neverputt-wrapper
 Terminal=false
 Icon=neverputt.png
 Type=Application



From fedora-extras-commits at redhat.com  Sun Sep 30 21:10:46 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 30 Sep 2007 17:10:46 -0400
Subject: rpms/scribes/devel .cvsignore, 1.16, 1.17 scribes.spec, 1.34,
	1.35 sources, 1.16, 1.17
Message-ID: <200709302110.l8ULAkMf002378@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2306

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3.2.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Jun 2007 02:00:27 -0000	1.16
+++ .cvsignore	30 Sep 2007 21:10:14 -0000	1.17
@@ -1 +1,2 @@
 scribes-0.3.2.8.tar.bz2
+scribes-0.3.2.9.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- scribes.spec	10 Jun 2007 03:56:21 -0000	1.34
+++ scribes.spec	30 Sep 2007 21:10:14 -0000	1.35
@@ -3,11 +3,11 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2.8
-Release:	3%{?dist}
+Version:	0.3.2.9
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://scribes.sourceforge.net/           
 
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -158,6 +158,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.9-1
+- Update to new upstream release (0.3.2.9).
+- Update License tag (GPLv2+).
+
 * Sat Jun 09 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.8-3
 - Revert previous Yelp dependency addition. It's in the default install (via
   comps) and the only bad thing to happen if it's not available is that


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Jun 2007 02:00:27 -0000	1.16
+++ sources	30 Sep 2007 21:10:14 -0000	1.17
@@ -1 +1,2 @@
 a593994bb80dd35a26a02676ba69e786  scribes-0.3.2.8.tar.bz2
+c2cc2dcc28853b950d618c5ef9a8c170  scribes-0.3.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 21:19:19 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Sun, 30 Sep 2007 17:19:19 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.24, 1.25 libvirt.spec, 1.64,
	1.65 sources, 1.25, 1.26
Message-ID: <200709302119.l8ULJJiq002896@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2846

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.3.3 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	21 Aug 2007 15:14:54 -0000	1.24
+++ .cvsignore	30 Sep 2007 21:18:47 -0000	1.25
@@ -21,3 +21,4 @@
 libvirt-0.3.0.tar.gz
 libvirt-0.3.1.tar.gz
 libvirt-0.3.2.tar.gz
+libvirt-0.3.3.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libvirt.spec	24 Aug 2007 15:34:27 -0000	1.64
+++ libvirt.spec	30 Sep 2007 21:18:47 -0000	1.65
@@ -2,8 +2,8 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.3.2
-Release: 2%{?dist}%{?extra_release}
+Version: 0.3.3
+Release: 1%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -25,6 +25,9 @@
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+BuildRequires: avahi-devel
+BuildRequires: dnsmasq
+BuildRequires: bridge-utils
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -180,6 +183,13 @@
 %doc docs/examples/python
 
 %changelog
+* Sun Sep 30 2007 Daniel Veillard <veillard at redhat.com> - 0.3.3-1
+- Release of 0.3.3
+- Avahi support
+- NUMA support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
 * Fri Aug 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.2-2.fc8
 - also build on arches where Xen is not available
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	21 Aug 2007 15:14:54 -0000	1.25
+++ sources	30 Sep 2007 21:18:47 -0000	1.26
@@ -1 +1 @@
-8e6735446ae8a95cf47877725282d775  libvirt-0.3.2.tar.gz
+583fa13938df63bd404cc1b7cf553874  libvirt-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 21:19:30 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 30 Sep 2007 17:19:30 -0400
Subject: rpms/scribes/F-7 .cvsignore, 1.15, 1.16 scribes.spec, 1.31,
	1.32 sources, 1.15, 1.16
Message-ID: <200709302119.l8ULJUmN002938@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2870/F-7

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3.2.9, sync other changes from devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 Jun 2007 02:44:37 -0000	1.15
+++ .cvsignore	30 Sep 2007 21:18:58 -0000	1.16
@@ -1 +1 @@
-scribes-0.3.2.8.tar.bz2
+scribes-0.3.2.9.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/scribes.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scribes.spec	11 Jun 2007 02:44:37 -0000	1.31
+++ scribes.spec	30 Sep 2007 21:18:58 -0000	1.32
@@ -3,11 +3,11 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2.8
+Version:	0.3.2.9
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://scribes.sourceforge.net/           
 
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 BuildRequires:	automake
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
+BuildRequires:	intltool
 
 ## pygtk2 depends on gtk2 as a run-time dependency, which in turn depends on
 ## hicolor-icon-theme; thus the %%_datadir/icons/hicolor directory tree is not
@@ -67,9 +68,9 @@
 * Translations into several different languages,
 ...and more are in development!
 
-In order to make use of its runtime documentation facilities, you will need to
-install Yelp. Also, you may install the python-psyco package (x86-only) for a
-boost in startup speed.
+You may install the python-psyco package (x86-only) for a boost in startup
+speed. Also, you will need to install the Yelp package for Scribes' built-in
+help and documentation. 
 
 
 %prep
@@ -101,10 +102,7 @@
 	--remove-category=Application	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-## Fix some plugin script permissions...
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
+rm -f %{buildroot}/%{_datadir}/%{name}/plugins/*/.__junk
 %find_lang %{name}
 
 
@@ -160,6 +158,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.9-1
+- Update to new upstream release (0.3.2.9).
+- Update License tag (GPLv2+).
+
 * Sun Jun 10 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.8-1
 - Update to new upstream release (0.3.2.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Jun 2007 02:44:37 -0000	1.15
+++ sources	30 Sep 2007 21:18:58 -0000	1.16
@@ -1 +1 @@
-a593994bb80dd35a26a02676ba69e786  scribes-0.3.2.8.tar.bz2
+c2cc2dcc28853b950d618c5ef9a8c170  scribes-0.3.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 22:59:11 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 18:59:11 -0400
Subject: rpms/mlton/F-7 mlton-20070826-debuginfo.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 mlton.spec, 1.9, 1.10 sources, 1.3,
	1.4 mlton-20051202-pdf-docs.patch, 1.1,
	NONE mlton-20061107-debuginfo.patch, 1.1,
	NONE mlton-20061107-optflags.patch, 1.1, NONE
Message-ID: <200709302259.l8UMxBWA012448@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12423

Modified Files:
	.cvsignore mlton.spec sources 
Added Files:
	mlton-20070826-debuginfo.patch 
Removed Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Log Message:
synchronize devel version to F-7

mlton-20070826-debuginfo.patch:

--- NEW FILE mlton-20070826-debuginfo.patch ---
diff -ur mlton-20070826~/Makefile mlton-20070826/Makefile
--- mlton-20070826~/Makefile	2007-08-26 17:04:14.000000000 -0400
+++ mlton-20070826/Makefile	2007-08-26 18:28:15.000000000 -0400
@@ -430,17 +430,6 @@
 	if $(GZIP_MAN); then						\
 		cd "$(TMAN)" && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in "$(TLIB)/$(AOUT)$(EXE)" "$(TBIN)/$(LEX)$(EXE)"	\
-			"$(TBIN)/$(NLFFIGEN)$(EXE)" "$(TBIN)/$(PROF)$(EXE)"	\
-			"$(TBIN)/$(YACC)$(EXE)"; do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note "$$f"; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2006 00:23:17 -0000	1.3
+++ .cvsignore	30 Sep 2007 22:58:38 -0000	1.4
@@ -1 +1 @@
-mlton-20061107.tar.bz2
+mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/mlton.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mlton.spec	8 Aug 2007 01:53:29 -0000	1.9
+++ mlton.spec	30 Sep 2007 22:58:38 -0000	1.10
@@ -1,23 +1,18 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20061107
-Release:	3%{?dist}
+Version:	20070826
+Release:	10%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	MIT
 URL:		http://mlton.org/
-Source0:	mlton-%{version}.tar.bz2
-%if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1:	mlton-bootstrap.i386.tar.bz2
-Source2:	mlton-bootstrap.ppc.tar.bz2
-%endif
+Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
+#Source1:	mlton-20061107-1.ppc-linux.tgz
 
-Patch0:		mlton-20051202-pdf-docs.patch
-Patch1:		mlton-20061107-debuginfo.patch
-Patch2:		mlton-20061107-optflags.patch
+Patch0:		mlton-20070826-debuginfo.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +24,8 @@
 
 Requires:	gmp-devel gcc
 
-# not yet available for 64-bit arch (#198764)
-ExcludeArch:	x86_64 ppc64
+# need to bootstrap ppc64 still
+ExcludeArch:	ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -45,35 +40,30 @@
 %prep
 %setup -q
 
-# instantiate version numbers
-make version VERSION=%{version}
-
-# build documentation as PDF
-%patch -P 0 -p1 -b .pdf-docs
 # disable strip so debuginfo packages work
-%patch -P 1 -p1 -b .debuginfo
-# enable RPM_OPT_FLAGS
-%patch -P 2 -p1 -b .optflags
-
-# set correct version of PDF guide until this is fixed upstream
-sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
+%patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%ifarch i386
 %setup -T -D -q -a 1
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
+	usr/bin/mlton
 %endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
-	bootstrap/usr/bin/mlton
-%endif
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+  sed -e '/perl(mltex.thm)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
 
 
 %build
 %if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
 %endif
 
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -82,7 +72,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT MAN_PREFIX_EXTRA=/share \
-	TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+	ULIB=%{_lib}/mlton
 
 # remove unecessary regression test
 rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
@@ -107,8 +98,40 @@
 
 
 %changelog
-* Fri May 25 2007 Adam Goode <adam at spicenitz.org> - 20061107-2.1
-- ExcludeArch: ppc64
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
+- Disable bootstrap
+
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
+- Re-bootstrap ppc
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
+- Really fix SRPM conditionals
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
+- Work around strange SRPM problem in conditionals
+- Fix changelog (forgot release 5?)
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+- Build on ppc now that #247407 is fixed
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
+- Do not condition bootstrap source tag
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
+* Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
+- Exclude ppc for now (GCC internal compiler error!)
+
+* Sun Aug 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-1
+- Update to new release
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-4
+- Exclude ppc64 for now
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-3
+- Update license tag
+- Rebuild for buildid
 
 * Fri Nov 24 2006 Adam Goode <adam at spicenitz.org> - 20061107-2
 - Use RPM_OPT_FLAGS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 00:23:17 -0000	1.3
+++ sources	30 Sep 2007 22:58:38 -0000	1.4
@@ -1 +1 @@
-eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2
+08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz


--- mlton-20051202-pdf-docs.patch DELETED ---


--- mlton-20061107-debuginfo.patch DELETED ---


--- mlton-20061107-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 23:03:20 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 19:03:20 -0400
Subject: rpms/mlton/F-7 mlton.spec,1.10,1.11
Message-ID: <200709302303.l8UN3KjQ018628@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595

Modified Files:
	mlton.spec 
Log Message:
* Sun Sep 30 2007 Adam Goode <adam at spicenitz.org> - 20070826-10.1
- Enable bootstrap for x86_64 for Fedora 7



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/mlton.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mlton.spec	30 Sep 2007 22:58:38 -0000	1.10
+++ mlton.spec	30 Sep 2007 23:02:47 -0000	1.11
@@ -1,8 +1,12 @@
+%ifarch x86_64
+%define mlton_bootstrap 1
+%else
 %define mlton_bootstrap 0
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	10%{?dist}
+Release:	10%{?dist}.1
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -10,7 +14,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-#Source1:	mlton-20061107-1.ppc-linux.tgz
+Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -98,6 +102,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Adam Goode <adam at spicenitz.org> - 20070826-10.1
+- Enable bootstrap for x86_64 for Fedora 7
+
 * Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
 - Disable bootstrap
 



From fedora-extras-commits at redhat.com  Sun Sep 30 23:05:01 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 19:05:01 -0400
Subject: rpms/mlton/F-7 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709302305.l8UN51ND018695@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18668

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Sep 2007 22:58:38 -0000	1.4
+++ .cvsignore	30 Sep 2007 23:04:28 -0000	1.5
@@ -1 +1,2 @@
+mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Sep 2007 22:58:38 -0000	1.4
+++ sources	30 Sep 2007 23:04:28 -0000	1.5
@@ -1 +1,2 @@
+a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 23:14:52 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Sun, 30 Sep 2007 19:14:52 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.47,1.48
Message-ID: <200709302314.l8UNEqkn018898@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18809

Modified Files:
	fonts-chinese.spec 
Log Message:
* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Taipei fonts was moved to a separate package taipeifonts.
  <<<<< Improved: % defattr(-,root,root,-)
  <<<<<-Put taipeifonts after cjkunifonts in the requires.

* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Tidy up spec file.



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- fonts-chinese.spec	31 Aug 2007 08:20:41 -0000	1.47
+++ fonts-chinese.spec	30 Sep 2007 23:14:19 -0000	1.48
@@ -1,74 +1,44 @@
-%define basefontdir    %{_datadir}/fonts/chinese
-%define miscfontdir    %{basefontdir}/misc
-%define catalogue      /etc/X11/fontpath.d
-
-%define taipeiver 1.2
-
-Summary:     Traditional Chinese bitmap fonts and meta-package for Chinese fonts
 Name:         fonts-chinese
-Version:      3.03
-Release:      10%{?dist}
-License:      Public Domain
+Summary:      Meta-package for Chinese fonts
+License:      GPLv2+
 Group:        User Interface/X
+Version:      3.03
+Release:      12%{?dist}
 BuildArch:    noarch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-
-Source1:     taipeifonts-%{taipeiver}.tar.gz
-Source2:     taipeifonts.alias
+BuildRoot:    %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:       xorg-x11-font-utils
-Obsoletes:           ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28, ttf-moe_sung, ttf-moe_kai, ttf-arphic_bming, ttf-arphic_bkai, taipeifonts
-Requires:            cjkunifonts-uming, cjkunifonts-ukai
+Requires:     cjkunifonts-uming, cjkunifonts-ukai
+Requires:     taipeifonts
 
 %description
-This package includes some Traditional Chinese bitmap fonts and also acts
-as a meta-package for general Chinese fonts support.
+This is a meta-package for Chinese fonts support.
 
 %prep
-%setup -q -T -c -a1
+%{nil}
 
 %build
-pushd taipeifonts-%{taipeiver}/
-bdftopcf taipei24.bdf | gzip -c > taipei24.pcf.gz
-bdftopcf taipei20.bdf | gzip -c > taipei20.pcf.gz
-bdftopcf taipei16.bdf | gzip -c > taipei16.pcf.gz
-popd
+%{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
-
-# for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -s %{miscfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
-
-# for fonts.*
-mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
-
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%dir %{basefontdir}
-%dir %{miscfontdir}
-%{miscfontdir}/*.gz
-%{miscfontdir}/fonts.alias
-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%verify(not md5 size mtime) %{miscfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
-%{catalogue}/%{name}
+%defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Taipei fonts was moved to a separate package taipeifonts.
+  <<<<< Improved: % defattr(-,root,root,-)
+  <<<<<-Put taipeifonts after cjkunifonts in the requires.
+
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Tidy up spec file.
+
 * Fri Aug 31 2007 Jens Petersen <petersen at redhat.com> - 3.03-10.fc8
 - finish moving Uming and Ukai truetype fonts over to cjkunifonts (#266281):
 - update summary and description
@@ -82,7 +52,7 @@
 - Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
 -- remove ttfontdir and cidmapdir
 -- update license to Public Domain for taipeifonts
--- remove %{_datadir}/fonts/zh_*/TrueType/ compat dirs
+-- remove % {_datadir}/fonts/zh_*/TrueType/ compat dirs
 -- remove fc-cache from post and postun scriptlets
 
 * Mon Aug 27 2007 Caius Chance <cchance at redhat.com> - 3.03-9.fc8



From fedora-extras-commits at redhat.com  Sun Sep 30 23:26:12 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 30 Sep 2007 19:26:12 -0400
Subject: rpms/codeina/devel codeina-f8-wishlist.patch, NONE, 1.1 codeina.spec,
	1.4, 1.5 codeina-python-dirs.patch, 1.1, NONE
Message-ID: <200709302326.l8UNQC98019132@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/codeina/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19098

Modified Files:
	codeina.spec 
Added Files:
	codeina-f8-wishlist.patch 
Removed Files:
	codeina-python-dirs.patch 
Log Message:
* Mon Oct 01 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2
- Big patch from myself (fixes from Thomas) to:
- Show a title to the price column (#299251)
- Not redownload already downloaded packages, and check whether corrupted
  (#305421)
- Select free matching codecs by default (#305411)
- Clearly show an empty list and a warning when no codecs match the required
  ones, so users don't get confused


codeina-f8-wishlist.patch:

--- NEW FILE codeina-f8-wishlist.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 827)
+++ ChangeLog	(working copy)
@@ -1,3 +1,24 @@
+2007-09-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Bastien Nocera
+
+	* codeina/httpdownload.py:
+	* codeina/listview.py:
+	* codeina/main.py:
+	* codeina/productlist.py:
+	* codeina/requiredplugin.py:
+	* data/available-plugins.xml.in:
+	  Add sha1sums to plugins, and use it to verify plugin download.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=305421
+	  Add price column header.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=299251
+	  Select free and matching codecs by default.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=305411
+	  Don't silently switch to the "all available" view when requesting a
+	  plugin that's not available, instead, show an empty list, and
+	  error
+	  message with an explanation on how to see all the plugins
+
 === release 0.10.1 ===
 
 2007-08-27  Thomas Vander Stichele  <thomas at apestaart dot org>
Index: codeina/requiredplugin.py
===================================================================
--- codeina/requiredplugin.py	(revision 827)
+++ codeina/requiredplugin.py	(working copy)
@@ -51,6 +51,10 @@
                     if self.req_type in self.valid_req_types:
                         self.valid = True
 
+    def __repr__(self):
+        return "<%s for %s> " % (self.__class__.__name__, self.req_string)
+
+
   # currently we're only interested in specialising mp3, we should probably
   # do something more generic later that covers other common formats too
     def is_mp3_decoder(self):
Index: codeina/listview.py
===================================================================
--- codeina/listview.py	(revision 827)
+++ codeina/listview.py	(working copy)
@@ -35,6 +35,10 @@
 
 
 class ListView(gtk.VBox):
+    """
+    @ivar productlist: list of products, set when creating the listview
+    @type productlist: L{codeina.productlist.ProductList}
+    """
 
     def __init__(self):
         gtk.VBox.__init__(self)
@@ -53,7 +57,9 @@
         self.view = gtk.TreeView()
         row_height = self.get_estimated_row_height()
         row_padding = 2  # assumed, random number
-        self.view.set_size_request(-1, (row_height + row_padding) * 8)
+        headers_height = 12 # assumed
+        self.view.set_size_request(-1,
+            (row_height + row_padding) * 8 + headers_height)
         self.productlist = None
         self.store = gtk.ListStore(object)
         self.store.set_default_sort_func(self.sort_func, self)
@@ -61,9 +67,8 @@
         self.model = self.store.filter_new()
         self.model.set_visible_func(self.visible_func, self)
         self.view.set_model(self.model)
-        self.view.set_headers_visible(False)
         self.view.set_rules_hint(True)
-        column = gtk.TreeViewColumn("product")
+        column = gtk.TreeViewColumn(_("Product"))
         text_renderer = gtk.CellRendererText()
         text_renderer.set_property('xpad', 6)
         text_renderer.set_property('ypad', 3)
@@ -79,7 +84,7 @@
       # the expand property to False, so that things behave right if the
       # user makes the window wider
 
-        column = gtk.TreeViewColumn('install-status')
+        column = gtk.TreeViewColumn(_('Installed?'))
         status_renderer = gtk.CellRendererText()
         column.pack_start(status_renderer, True)
         status_renderer.set_property('xalign', 0.5)
@@ -90,7 +95,7 @@
         column.set_expand(False)
         self.view.append_column(column)
 
-        column = gtk.TreeViewColumn('price')
+        column = gtk.TreeViewColumn(_('Price'))
         price_renderer = gtk.CellRendererText()
         column.pack_end(price_renderer, False)
         price_renderer.set_property('xalign', 1.0)
@@ -102,7 +107,7 @@
 
      # Put check boxes in separate column for nicer activation
 
-        column = gtk.TreeViewColumn("toggle")
+        column = gtk.TreeViewColumn("")
         toggle_renderer = gtk.CellRendererToggle()
         toggle_renderer.set_property('activatable', True)
         toggle_renderer.connect('toggled', self.cell_toggled_cb, self)
@@ -145,13 +150,16 @@
             return False
         flav = product.get_best_flavor_for_current_system()
         if not flav:
+            print "product %r does not have flavor" % product
             product.set_selected(False)
             return False
         if not self.required_plugins:
             return True
         else:
+            print "Checking visibility of product %r" % product
             for req in self.required_plugins:
                 if product.provides_requirement(req):
+                    print "provides requirement %r, showing" % req
                     return True
             return False
 
@@ -229,7 +237,7 @@
                              data):
         product = tree_model.get_value(tree_iter, 0)
         if product.price:
-            renderer.set_property('text', "%.0f???" % product.price)
+            renderer.set_property('text', "%.0f ???" % product.price)
         else:
             renderer.set_property('text', _("Free"))
         return
@@ -238,11 +246,16 @@
         self.store.clear()
         if self.productlist:
             for p in self.productlist.products:
+                print "appending product %r" % p
                 row = self.store.append()
                 self.store.set_value(row, 0, p)
         return
 
     def set_product_list(self, product_list):
+        """
+        @ivar productlist: list of products the view should handle
+        @type productlist: L{codeina.productlist.ProductList}
+        """
         if self.productlist != product_list:
             self.productlist = product_list
             self.fill_with_products()
Index: codeina/httpdownload.py
===================================================================
--- codeina/httpdownload.py	(revision 827)
+++ codeina/httpdownload.py	(working copy)
@@ -31,7 +31,9 @@
 import thread
 import urllib2
 import xdg.BaseDirectory
+import sha
 
+from codeina.extern.log import log
 from gettext import gettext as _
 
 # Defaults to ~/.local/share/codeina/downloads/ in most cases
@@ -43,7 +45,7 @@
 Downloads a HTTP URI to file in a separate thread and iterates the
 GLib/Gtk main context until either the download is done or an error occurred
 """
-class HttpDownload:
+class HttpDownload(log.Loggable):
     """
     @ivar  content_length: size in bytes of the download
     """
@@ -59,6 +61,7 @@
 
     def __init__ (self):
         self.url = None
+        self.sha1sum = None
         self.directory = None
         self.fn = None
         self.done = False
@@ -71,7 +74,7 @@
     def get_error_msg_from_error(self, err):
         msg = _("Unexpected error of type %s") % type(err)
         try:
-            raise err        
+            raise err
         except urllib2.HTTPError, e:
             if e.code == 403:
               msg = _("Access to this file is forbidden")
@@ -105,7 +108,11 @@
         return msg
 
     """ Iterates the default GLib main context until the download is done """
-    def run(self, url, directory, fn, message=None):
+    def run(self, url, directory, fn, sha1sum, message=None):
+        self.debug("Running download for %s (sha1sum=%s)" % (os.path.join(directory, fn), sha1sum))
+        if sha1sum and self.verify(os.path.join(directory, fn), sha1sum):
+            self.debug("Already downloaded %s" % os.path.join(directory, fn))
+            return None
 
         if self.url:
             return _("Download already in progress")
@@ -116,6 +123,7 @@
         self.url = url
         self.directory = directory
         self.fn = fn
+        self.sha1sum = sha1sum
         self.done = False
         self.err = None
         self.bytes_read = -1
@@ -165,6 +173,23 @@
 
         return not self.done
 
+    """ Check whether a file matches the SHA1 sum given """
+    def verify(self, fn, sha1sum):
+        if not sha1sum:
+            self.debug("No sha1sum or filename, can't check (%s), "
+                "so assuming true" % fn)
+            return True
+
+        fs = open(fn,'rb').read()
+        real_sha1sum = sha.new(fs).hexdigest()
+        if real_sha1sum == sha1sum:
+            self.debug("%s matched its sha1sum" % fn)
+            return True
+
+        self.debug("%s didn't match its sha1sum (got %s expected %s)" % (
+            fn, real_sha1sum, sha1sum))
+        return False
+
     """ Thread where all the downloading and file writing happens """
     def thread_func(self):
 
@@ -191,8 +216,8 @@
                 pass
 
           # Now create a temp file there
-            tmpfile_handle, tmpfile_path = tempfile.mkstemp('.incomplete',\
-                                                            'codeina-download',\
+            tmpfile_handle, tmpfile_path = tempfile.mkstemp('.incomplete',
+                                                            'codeina-download',
                                                             self.directory)
 
             while not self.cancelled:
@@ -211,6 +236,12 @@
                     os.remove(tmpfile_path)
                 except:
                     pass
+            elif not self.verify(tmpfile_path, self.sha1sum):
+                try:
+                    os.remove(tmpfile_path)
+                except:
+                    pass
+                err = _("Downloaded file is corrupted")
             else:
                 os.rename(tmpfile_path, os.path.join(self.directory, self.fn))
 
@@ -277,11 +308,11 @@
     def destroy(self):
         self.dlg.destroy()
 
-    def run(self, url, directory, fn, message):
+    def run(self, url, directory, fn, sha1sum, message):
         if message:
             self.set_dialog_text(message)
         self.dlg.present()
-        err = HttpDownload.run(self, url, directory, fn, None)
+        err = HttpDownload.run(self, url, directory, fn, sha1sum, None)
         self.dlg.hide()
         return err
 
@@ -310,11 +341,16 @@
 
 
 if __name__ == "__main__":
-  # Different URLs for different errors
+    log.init('CODEINA_DEBUG')
+    log.setPackageScrubList('codeina')
+
+    # Different URLs for different errors
     #url='http://shop.fluendo.com/images/mpeg.png'
     #url='http://shop.fluendo.com/tpm-codeina-test.bz2'
     #url='http://example.com/gimme-a-404'
-    url='http://antihost.atari/tpm-codeina-test.bz2'
+    #url='http://antihost.atari/tpm-codeina-test.bz2'
+    url="http://shop.fluendo.com/pub/fluendo-mp3-2.i386.tar.bz2"
+    sha1sum='117f85e118dab2d9f7c9bb10554fbc4e8f7fdf38'
 
     download_dir = DEFAULT_DOWNLOAD_DIR
 
@@ -322,7 +358,7 @@
 
   # Do the downloading, with dialog
     d = HttpDownloadDialog()
-    e = d.run(url, download_dir, fn, "Downloading '%s'" % fn)
+    e = d.run(url, download_dir, fn, sha1sum, "Downloading '%s'" % fn)
     if d.cancelled:
         print "Download cancelled"
     elif e:
Index: codeina/productlist.py
===================================================================
--- codeina/productlist.py	(revision 827)
+++ codeina/productlist.py	(working copy)
@@ -103,13 +103,19 @@
         d['summary'] = self._get_localized(summaries)
         d['flavors'] = flavors
         product = Product(**d)
+
+        # Select the free-not-fully-installed plugins by default
+        if price == 0.0:
+            product.selected = not product.is_fully_installed()
+
         return product
 
     def _parse_flavor(self, node):
         d = {}
         required = ('system', 'arch', 'distro', 'distro-version',
             'core-req', 'base-req', 'last-modified', 'uri', 'comment')
-        attrs = self.parseAttributes(node, required=required)
+        optional = ('sha1sum',)
+        attrs = self.parseAttributes(node, required=required, optional=optional)
         for i in range(0, len(required)):
             # pesky - -> _ translation for attributes
             key = '_'.join(required[i].split('-'))
@@ -125,7 +131,6 @@
         flavor = ProductFlavor(**d)
         return flavor
 
-
     def _parse_name(self, node):
         # parse a name and its language
         # return tuple of language, name
@@ -204,6 +209,9 @@
 
     selected = False # for list view
 
+    def __repr__(self):
+        return "<%s for %s> " % (self.__class__.__name__, self.name)
+
     def get_selected(self):
         return self.selected
 
@@ -398,6 +406,7 @@
     version = None
     uri = None
     comment = None
+    sha1sum = None
 
     def is_compatible(self, system, arch, distro, core_version,
                       base_version):
@@ -418,18 +427,22 @@
 
 
 if __name__ == "__main__":
-    plist = ProductList()
-    try:
-        plist.read_from_xml(open("available-plugins.xml").read())
-        print "done, %d products:" % len(plist.products)
-        for p in plist.products:
-            print " * %s (%.2f EUR)" % (p.name, p.price)
-            for f in p.flavors:
-                print "     - %s %s %s" % (f.system, f.arch, f.distro)
-    except:
-        print "oops, couldn't parse products XML list"
+    xml_data = open("../data/available-plugins.xml")
+    parser = ProductListParser()
+    plist = parser.parse(xml_data)
+    print "done, %d products:" % len(plist.products)
+    for p in plist.products:
+        print " * %s (%.2f EUR)" % (p.name, p.price)
+        for f in p.flavors:
+            print "     - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
 
-#  flavs = plist.products[0].find_compatible_flavors ("Linux", "ppc64", None, Version("0.10.9"), Version ("0.10.9"))
-#  print "Matching flavors:"
-#  for f in flavs:
-#    print " - %s %s %s %s" % (f.product.name, f.system, f.arch, f.distro)
+    f = plist.products[9].get_best_flavor_for_current_system()
+    print "Best flavor:"
+    print " - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
+
+    flavs = plist.products[9].find_compatible_flavors ("Linux", "i386", None, check.Version("0.10.4"), check.Version("0.10.4"))
+#    flavs = plist.products[0].find_compatible_flavors ("Linux", "ppc64", None, Version("0.10.9"), Version ("0.10.9"))
+    print "Matching flavors:"
+    for f in flavs:
+        print " - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
+
Index: codeina/main.py
===================================================================
--- codeina/main.py	(revision 827)
+++ codeina/main.py	(working copy)
@@ -241,6 +241,18 @@
 
         self.vbox.pack_start(self.listview, True)
 
+      # The label showing we have no matching plugins
+
+        self.no_plugins_box = gtk.HBox()
+        img = gtk.Image()
+        img.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG)
+        self.no_plugins_box.pack_start(img, False, 0, 6)
+        label = gtk.Label(
+            _("There are no plugins available for the requested functionality.")
+            + "\n" + _("Please select the full plugins list in the View menu."))
+        self.no_plugins_box.pack_start(label, False)
+        self.vbox.pack_start(self.no_plugins_box, False)
+
       # status bar
 
         self.statusbar = gtk.Statusbar()
@@ -248,13 +260,15 @@
         self.statusbar.show()
         self.vbox.pack_end(self.statusbar, False)
 
-      # only show matching plugin packages if there are required plugins (?)
+      # only show matching plugin packages if there are required plugins
 
         if self.required_plugins and len(self.required_plugins) > 0:
+            self.debug("Showing the matching plugins list")
             self.actiongroup.get_action('ViewMatching').set_active(True)
         else:
+            self.debug("Showing all the plugins")
             self.actiongroup.get_action('ViewAllAvailable').set_active(True)
-            self.actiongroup.get_action('ViewMatching').set_visible(False)
+            self.actiongroup.get_action('ViewMatching').set_sensitive(False)
 
       # button box
 
@@ -341,7 +355,7 @@
         button.set_property('can-default', True)
         return button
 
-    def download_uri(self, dialog, name, uri):
+    def download_uri(self, dialog, name, uri, sha1sum):
         """
         Download the given uri.
 
@@ -352,7 +366,8 @@
         self.debug("Trying to download '%s'" % uri)
         dl_dir = DEFAULT_DOWNLOAD_DIR
         fn = os.path.basename(uri)
-        err_msg = dialog.run(uri, dl_dir, fn, _("Downloading '%s'") % name)
+        err_msg = dialog.run(uri, dl_dir, fn, sha1sum,
+            _("Downloading '%s'") % name)
         if dialog.cancelled:
             self.debug("Download cancelled")
             return None
@@ -378,7 +393,7 @@
 
         Returns: whether the EULA was accepted.
         """
-        path = self.download_uri(dialog, name, eula_uri)
+        path = self.download_uri(dialog, name, eula_uri, None)
         if not path:
             self.debug('Could not download EULA')
             return False
@@ -412,7 +427,10 @@
                     continue
 
             flavor = p.get_best_flavor_for_current_system()
-            path = self.download_uri(d, p.name, flavor.uri)
+            self.debug("Selected flavour %s %s %s %s %s" % (
+                flavor.system, flavor.arch, flavor.distro,
+                os.path.basename(flavor.uri), flavor.sha1sum))
+            path = self.download_uri(d, p.name, flavor.uri, flavor.sha1sum)
 
             if not path:
                 self.debug('User cancelled')
@@ -513,8 +531,12 @@
             self.listview.show_matching(self.required_plugins)
             no_rows_txt = _(
                 'No matching plugins available for your system yet.')
+
         if self.listview.get_visible_rows() == 0:
             self.set_status_text(no_rows_txt)
+            self.no_plugins_box.show_all()
+        else:
+            self.no_plugins_box.hide()
 
     def do_install(self, filenames):
         failed_installs = []
Index: data/available-plugins.xml.in
===================================================================
--- data/available-plugins.xml.in	(revision 827)
+++ data/available-plugins.xml.in	(working copy)
@@ -50,13 +50,15 @@
                     core-req="0.10.3" base-req="0.10.3"
                     last-modified="2007-05-25"
                     uri="http://shop.fluendo.com/pub/fluendo-mp3-2.i386.tar.bz2"
-                    comment="Tested on FC3, FC4, FC5, and Ubuntu 6.10 (edgy)"
+		    comment="Tested on FC3, FC4, FC5, and Ubuntu 6.10 (edgy)"
+		    sha1sum="117f85e118dab2d9f7c9bb10554fbc4e8f7fdf38"
     />
     <flavor system="Linux" arch="x86_64" distro="generic" distro-version="any"
                     core-req="0.10.3" base-req="0.10.3"
                     last-modified="2007-05-25"
                     uri="http://shop.fluendo.com/pub/fluendo-mp3-2.x86_64.tar.bz2"
-                    comment=""
+		    comment=""
+		    sha1sum="47e2169453c4025e88edd6e4e1b64da26cbf64c6"
     />
   </product>
 


Index: codeina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/codeina/devel/codeina.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeina.spec	27 Aug 2007 15:17:49 -0000	1.4
+++ codeina.spec	30 Sep 2007 23:25:40 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:           codeina
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GStreamer Codec Installation Application
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 # Upstream SVN repository is at https://core.fluendo.com/gstreamer/svn/codeina/trunk/
 Source:         http://www.fluendo.com/downloads/codeina/%{name}-%{version}.tar.bz2
 Source1:        gst-install-plugins-helper.sh
+Patch0:         codeina-f8-wishlist.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:       python >= 2.3
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .old
 
 %build
 %configure
@@ -62,6 +64,15 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Oct 01 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2
+- Big patch from myself (fixes from Thomas) to:
+- Show a title to the price column (#299251)
+- Not redownload already downloaded packages, and check whether corrupted
+  (#305421)
+- Select free matching codecs by default (#305411)
+- Clearly show an empty list and a warning when no codecs match the required
+  ones, so users don't get confused
+
 * Mon Aug 27 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.10.1-1
 - New release


--- codeina-python-dirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 23:44:36 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Sun, 30 Sep 2007 19:44:36 -0400
Subject: rpms/fonts-chinese/devel .cvsignore,1.9,1.10 sources,1.11,1.12
Message-ID: <200709302344.l8UNia17019637@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602

Modified Files:
	.cvsignore sources 
Log Message:
Removed taipeifont sources from 'sources' and '.cvsignore' list.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Nov 2006 00:39:49 -0000	1.9
+++ .cvsignore	30 Sep 2007 23:44:04 -0000	1.10
@@ -2,19 +2,3 @@
 *.bz2
 *.gz
 *.rpm
-bkai00mp.ttf
-bsmi00lp.ttf
-gbsn00lp.ttf
-gkai00mp.ttf
-uming-v0.1-pre2.ttf
-ukai-v0.1-pre2.ttf
-ttf-arphic-uming_0.1-0.dot.3.tar.gz
-ttf-arphic-ukai_0.1-0.dot.3.tar.gz
-taipeifonts-1.2.tar.gz
-ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz
-ttf-arphic-ukai_0.1.20060513.rh20060829a.tar.gz
-ttf-arphic-ukai_0.1.20060513.orig.tar.gz
-ttf-arphic-uming_0.1.20060513.orig.tar.gz
-ttf-arphic-uming_0.1.20060513.rh20060829a.tar.gz
-ttf-arphic-uming_0.1.20060928.orig.tar.gz
-ttf-arphic-ukai_0.1.20060928.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Aug 2007 08:17:29 -0000	1.11
+++ sources	30 Sep 2007 23:44:04 -0000	1.12
@@ -1 +0,0 @@
-9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 23:55:52 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 30 Sep 2007 19:55:52 -0400
Subject: comps comps-f8.xml.in,1.133,1.134
Message-ID: <200709302355.l8UNtqDC020089@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20065

Modified Files:
	comps-f8.xml.in 
Log Message:
[development-tools] add alex



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- comps-f8.xml.in	28 Sep 2007 16:46:57 -0000	1.133
+++ comps-f8.xml.in	30 Sep 2007 23:55:21 -0000	1.134
@@ -901,6 +901,7 @@
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">valgrind</packagereq>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alex</packagereq>
       <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  1 00:21:15 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Fri, 31 Aug 2007 20:21:15 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.7,1.8
Message-ID: <200709010021.l810LFbo024916@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24895

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
- Rebuild




Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PolicyKit-gnome.spec	31 Aug 2007 21:02:07 -0000	1.7
+++ PolicyKit-gnome.spec	1 Sep 2007 00:20:42 -0000	1.8
@@ -10,7 +10,7 @@
 Summary: GNOME dialogs for PolicyKit
 Name: PolicyKit-gnome
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
@@ -79,6 +79,9 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
+* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
+- Rebuild
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
 - Require newer PolicyKit release
 



From fedora-extras-commits at redhat.com  Sat Sep  1 00:33:24 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Fri, 31 Aug 2007 20:33:24 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc4-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.677, 1.678 git-wireless-dev.patch, 1.34, 1.35 kernel.spec,
	1.140, 1.141 linux-2.6-utrace-tracehook.patch, 1.7, 1.8 sources,
	1.640, 1.641 upstream, 1.562,
	1.563 patch-2.6.23-rc4-git2.bz2.sign, 1.1, NONE
Message-ID: <200709010033.l810XOC1025155@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116

Modified Files:
	.cvsignore git-wireless-dev.patch kernel.spec 
	linux-2.6-utrace-tracehook.patch sources upstream 
Added Files:
	patch-2.6.23-rc4-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc4-git2.bz2.sign 
Log Message:
* Fri Aug 31 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc4-git3



--- NEW FILE patch-2.6.23-rc4-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG2GXryGugalF9Dw4RAudlAJ0cG+35KDaw26rUDzqZAdfJPIYTQQCfX3rm
lWU6c92/5zGPhNlbgpL6WX8=
=G6DG
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- .cvsignore	31 Aug 2007 17:20:37 -0000	1.677
+++ .cvsignore	1 Sep 2007 00:32:49 -0000	1.678
@@ -6,4 +6,4 @@
 patch-2.6.23-rc4.bz2
 patch-2.6.23-rc4.bz2
 patch-2.6.23-rc3-git10.bz2
-patch-2.6.23-rc4-git2.bz2
+patch-2.6.23-rc4-git3.bz2

git-wireless-dev.patch:

Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- git-wireless-dev.patch	30 Aug 2007 20:27:31 -0000	1.34
+++ git-wireless-dev.patch	1 Sep 2007 00:32:49 -0000	1.35
@@ -2428,7 +2428,7 @@
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  P:	Michael Chan
  M:	mchan at broadcom.com
-@@ -2057,6 +2095,16 @@ L:	http://lists.sourceforge.net/mailman/
+@@ -2096,6 +2096,16 @@ L:	http://lists.sourceforge.net/mailman/
  W:	http://ipw2200.sourceforge.net
  S:	Supported
  
@@ -2442,7 +2442,7 @@
 +T:	git git://intellinuxwireless.org/repos/iwlwifi
 +S:	Supported
 +
- IOC3 DRIVER
+ IOC3 ETHERNET DRIVER
  P:	Ralf Baechle
  M:	ralf at linux-mips.org
 @@ -3012,6 +3060,15 @@ L:	kpreempt-tech at lists.sourceforge.net


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- kernel.spec	31 Aug 2007 22:08:01 -0000	1.140
+++ kernel.spec	1 Sep 2007 00:32:50 -0000	1.141
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1786,6 +1786,9 @@
 
 %changelog
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc4-git3
+
+* Fri Aug 31 2007 Dave Jones <davej at redhat.com>
 - Fix booting on Dell I5150.
   Apparently some VESA BIOS implementations clobber registers when called.
 

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-tracehook.patch	21 Aug 2007 19:42:55 -0000	1.7
+++ linux-2.6-utrace-tracehook.patch	1 Sep 2007 00:32:50 -0000	1.8
@@ -2906,7 +2906,7 @@
  	if (!thread_group_leader(p))
  		goto out;
  
--	if (p->real_parent == group_leader) {
+-	if (p->real_parent->tgid == group_leader->tgid) {
 +	if (p->parent == group_leader) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -r1.640 -r1.641
--- sources	31 Aug 2007 17:20:37 -0000	1.640
+++ sources	1 Sep 2007 00:32:50 -0000	1.641
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 cb7b0d6e6424f31ba41b9ba304b69833  patch-2.6.23-rc4.bz2
-a2de401162c4ca56878b05ea3777b1f6  patch-2.6.23-rc4-git2.bz2
+549f9a03a741881b70a4bae593246b22  patch-2.6.23-rc4-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- upstream	31 Aug 2007 17:20:37 -0000	1.562
+++ upstream	1 Sep 2007 00:32:50 -0000	1.563
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4-git2.bz2
+patch-2.6.23-rc4-git3.bz2


--- patch-2.6.23-rc4-git2.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 01:57:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 18:57:52 -0700
Subject: [pkgdb] rubygems (Fedora EPEL, 5) updated by kevin
Message-ID: <200709010157.l811vrog022678@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for rubygems
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rubygems (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rubygems (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rubygems (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygems



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:00:02 -0700
Subject: [pkgdb] maniadrive-music (Fedora, devel) updated by kevin
Message-ID: <200709010200.l81203HY022728@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive-music (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maniadrive-music



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:00:01 -0700
Subject: [pkgdb] maniadrive-music was added for jwrdegoede
Message-ID: <200709010200.l81202FO022719@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package maniadrive-music with summary Replacement soundtrack for the non free ManiaDrive soundtrack
Kevin Fenzi (kevin) has approved Package maniadrive-music
Kevin Fenzi (kevin) has added a Fedora devel branch for maniadrive-music with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved maniadrive-music in Fedora devel
Kevin Fenzi (kevin) has approved Package maniadrive-music
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maniadrive-music (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on maniadrive-music (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maniadrive-music (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maniadrive-music



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:26 -0400
Subject: rpms/maniadrive-music - New directory
Message-ID: <200709010200.l8120QqL032742@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music

Log Message:
Directory /cvs/extras/rpms/maniadrive-music added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:30 -0400
Subject: rpms/maniadrive-music/devel - New directory
Message-ID: <200709010200.l8120UH3032756@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive-music/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:35 -0400
Subject: rpms/maniadrive-music Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010200.l8120Zod000313@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive-music


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive-music
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:00:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:00:38 -0400
Subject: rpms/maniadrive-music/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709010200.l8120c1d000329@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL32713/rpms/maniadrive-music/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive-music


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive-music
# $Id: Makefile,v 1.1 2007/09/01 02:00:35 kevin Exp $
NAME := maniadrive-music
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:06:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:38 -0400
Subject: rpms/eclipse-rpm-editor - New directory
Message-ID: <200709010206.l8126cMH006489@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor

Log Message:
Directory /cvs/extras/rpms/eclipse-rpm-editor added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:44 -0400
Subject: rpms/eclipse-rpm-editor/devel - New directory
Message-ID: <200709010206.l8126i4i006503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-rpm-editor/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:49 -0400
Subject: rpms/eclipse-rpm-editor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010206.l8126nAI006532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-rpm-editor


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-rpm-editor
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:06:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:06:52 -0400
Subject: rpms/eclipse-rpm-editor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709010206.l8126q1j006551@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAQ6460/rpms/eclipse-rpm-editor/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-rpm-editor


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-rpm-editor
# $Id: Makefile,v 1.1 2007/09/01 02:06:49 kevin Exp $
NAME := eclipse-rpm-editor
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:09:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:09:55 -0700
Subject: [pkgdb] sepostgresql was added for kaigai
Message-ID: <200709010209.l8129tNc022869@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package sepostgresql with summary Security-Enhanced PostgreSQL
Kevin Fenzi (kevin) has approved Package sepostgresql
Kevin Fenzi (kevin) has added a Fedora devel branch for sepostgresql with an owner of kaigai
Kevin Fenzi (kevin) has approved sepostgresql in Fedora devel
Kevin Fenzi (kevin) has approved Package sepostgresql
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sepostgresql (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sepostgresql (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sepostgresql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sepostgresql



From fedora-extras-commits at redhat.com  Sat Sep  1 02:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:09:56 -0700
Subject: [pkgdb] sepostgresql (Fedora, devel) updated by kevin
Message-ID: <200709010209.l8129u21022878@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on sepostgresql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sepostgresql



From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:26 -0400
Subject: rpms/sepostgresql - New directory
Message-ID: <200709010210.l812AQnG006783@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql

Log Message:
Directory /cvs/extras/rpms/sepostgresql added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:35 -0400
Subject: rpms/sepostgresql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709010210.l812AZwY006838@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sepostgresql


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sepostgresql
# $Id: Makefile,v 1.1 2007/09/01 02:10:32 kevin Exp $
NAME := sepostgresql
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 fedora-extras-commits at redhat.com  Sat Sep  1 02:10:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:32 -0400
Subject: rpms/sepostgresql Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709010210.l812AWsh006822@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql

Added Files:
	Makefile import.log 
Log Message:
Setup of module sepostgresql


--- NEW FILE Makefile ---
# Top level Makefile for module sepostgresql
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep  1 02:10:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 22:10:29 -0400
Subject: rpms/sepostgresql/devel - New directory
Message-ID: <200709010210.l812AT3Y006797@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscA6749/rpms/sepostgresql/devel

Log Message:
Directory /cvs/extras/rpms/sepostgresql/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep  1 02:13:38 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Fri, 31 Aug 2007 22:13:38 -0400
Subject: rpms/PolicyKit/devel PolicyKit.spec,1.3,1.4
Message-ID: <200709010213.l812Dcto006896@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6876

Modified Files:
	PolicyKit.spec 
Log Message:
Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
- Rebuild




Index: PolicyKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/PolicyKit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PolicyKit.spec	31 Aug 2007 20:43:37 -0000	1.3
+++ PolicyKit.spec	1 Sep 2007 02:13:04 -0000	1.4
@@ -14,7 +14,7 @@
 Summary: Toolkit for privilege control
 Name: PolicyKit
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary
@@ -141,6 +141,9 @@
 %{_datadir}/gtk-doc/html/polkit/*
 
 %changelog
+* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
+- Rebuild
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
 - Upstream release 0.5
 



From fedora-extras-commits at redhat.com  Sat Sep  1 02:58:32 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 31 Aug 2007 22:58:32 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.477,1.478
Message-ID: <200709010258.l812wWl2007713@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7683

Modified Files:
	eclipse.spec 
Log Message:
fix pde package provides and oboletes


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- eclipse.spec	31 Aug 2007 16:43:09 -0000	1.477
+++ eclipse.spec	1 Sep 2007 02:57:59 -0000	1.478
@@ -31,6 +31,7 @@
 Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
+#Source4:        fedora-eclipse-product-plugin-3.3.0.1.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -271,6 +272,21 @@
 Summary:        Eclipse Plugin Development Environment
 Group:          Text Editors/Integrated Development Environments (IDE)
 Provides:	eclipse-sdk
+# Can remove for F9
+Obsoletes:	eclipse-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-pde-sdk
+Obsoletes:      eclipse-pde-sdk 1:3.3.0-13.fc8
+Provides:       eclipse-cvs-client-sdk
+Obsoletes:      eclipse-cvs-client-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-jdt-sdk
+Obsoletes:      eclipse-jdt-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-pde-sdk
+Obsoletes:      eclipse-pde-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-platform-sdk
+Obsoletes:      eclipse-platform-sdk < 1:3.3.0-13.fc8
+Provides:       eclipse-rcp-sdk
+Obsoletes:      eclipse-rcp-sdk < 1:3.3.0-13.fc8
+# end remove for F9
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
@@ -613,6 +629,7 @@
 fi
 
 tar jxf %{SOURCE20}
+#unzip -qq %{SOURCE4}
 
 %build
 ORIGCLASSPATH=$CLASSPATH



From fedora-extras-commits at redhat.com  Sat Sep  1 03:51:02 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 31 Aug 2007 23:51:02 -0400
Subject: rpms/snort/devel snort.spec,1.26,1.27
Message-ID: <200709010351.l813p2bc019653@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18805

Modified Files:
	snort.spec 
Log Message:
 fix detection of libnet10 and mysql (on 64 bit platforms)



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- snort.spec	28 Aug 2007 03:59:10 -0000	1.26
+++ snort.spec	1 Sep 2007 03:50:29 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.7.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -13,12 +13,13 @@
 BuildRequires:  libpcap-devel >= 0.4
 BuildRequires:  perl
 BuildRequires:  pcre-devel
+BuildRequires:  sed
 
 %package        plain+flexresp
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10-devel
+BuildRequires:  libnet10
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -142,6 +143,8 @@
 %prep
 %setup -q
 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
 
 %build
 
@@ -179,6 +182,7 @@
 # mysql+flexresp
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -191,6 +195,7 @@
 # mysql
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                              --with-mysql-libraries=%{_libdir}/mysql \
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
@@ -256,6 +261,7 @@
 # bloat
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -471,6 +477,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
+- fix detection of mysql and libnet10
+
 * Mon Aug 27 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-1
 - update to 2.7.0.1
 



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:43 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:43 -0400
Subject: rpms/latexmk/F-7 .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1,
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814IhkO026149@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/F-7

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:34:53 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:10 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:10 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:10 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:34 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:10 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:34:53 -0000	1.2
+++ sources	1 Sep 2007 04:18:10 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:46 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:46 -0400
Subject: rpms/latexmk/FC-6 .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1, 
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814Ikss026164@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/FC-6

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:41:17 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:13 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:13 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:41:17 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:13 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:37 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:13 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:41:17 -0000	1.2
+++ sources	1 Sep 2007 04:18:13 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:18:48 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Sat, 1 Sep 2007 00:18:48 -0400
Subject: rpms/latexmk/devel .cvsignore, 1.2, 1.3 latexmk-README.fedora, 1.1, 
	1.2 latexmk-conf.patch, 1.1, 1.2 latexmk-perl.patch, 1.1,
	1.2 latexmk.conf, 1.1, 1.2 latexmk.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709010418.l814Im3Q026179@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/devel

Modified Files:
	.cvsignore latexmk-README.fedora latexmk-conf.patch 
	latexmk-perl.patch latexmk.conf latexmk.spec sources 
Log Message:
* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
- New version 3.20.
- Texlive isn't as near as I thought; require the tetex packages for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Mar 2007 15:34:53 -0000	1.2
+++ .cvsignore	1 Sep 2007 04:18:15 -0000	1.3
@@ -1 +1 @@
-latexmk-308n.zip
+latexmk-320.zip


Index: latexmk-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-README.fedora	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-README.fedora	1 Sep 2007 04:18:15 -0000	1.2
@@ -100,4 +100,3 @@
 
          $pdf_previewer = 'start acroread';
          $pdf_update_method = 1;
-

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-conf.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-conf.patch	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,10 +1,10 @@
-diff -dur latexmk-3.08n.ORIG/latexmk.1 latexmk-3.08n/latexmk.1
---- latexmk-3.08n.ORIG/latexmk.1	2007-02-16 13:03:38.000000000 -0700
-+++ latexmk-3.08n/latexmk.1	2007-02-27 11:59:26.000000000 -0700
+diff -dur latexmk-3.20.ORIG/latexmk.1 latexmk-3.20/latexmk.1
+--- latexmk-3.20.ORIG/latexmk.1	2007-07-03 14:22:44.000000000 -0600
++++ latexmk-3.20/latexmk.1	2007-08-31 21:44:15.000000000 -0600
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "16 February 2007" ""
+-.TH LATEXMK 1L "3 July 2007" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "16 February 2007" "" ""
++.TH "LATEXMK" "1L" "3 July 2007" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -14,95 +14,80 @@
 +.SH "DESCRIPTION"
  .I LatexMk
  completely automates the process of compiling a LaTeX document.
- Essentially, it is a highly specialized relative of the general
-@@ -13,10 +13,10 @@
- to run continuously with a previewer; in that case the latex program,
- etc, are rerun 
- whenever one of the source files is modified.  
--.PP
-+.PP 
- \fILatexmk\fR will normally determine which are the source files by
- examining the log file.  It has an option to parse the TeX file instead
----- see later. When \fIlatexmk\fR is run, it will examine the timestamps
-+\-\-\- see later. When \fIlatexmk\fR is run, it will examine the timestamps
- on the source files.
- If any of the source files have been changed since the last document
- generation, \fIlatexmk\fR will run the various LaTeX processing
-@@ -27,39 +27,39 @@
- With some macro packages and document styles four, or even more, runs may
- be needed. If necessary, \fIlatexmk\fR will also run bibtex and/or
- makeindex.  
--.PP
--[If the option \fB-it\fR to scan the LaTeX file is used, the main LaTeX
-+.PP 
-+[If the option \fB\-it\fR to scan the LaTeX file is used, the main LaTeX
- file and all input and included files (recursively) are scanned for
- LaTeX commands 
- for inputting and including other TeX files and figure files.  Then on
- subsequent runs, 
--\fIlatexmk\fR with the \fB-it\fR switch reads the dependency 
-+\fIlatexmk\fR with the \fB\-it\fR switch reads the dependency 
- information from this file.  If the dependencies of the document are
- changed (e.g., by adding or removing an \\input command), an additional
--pass of \fIlatexmk -i\fR or \fIlatexmk -I\fR will update the dependency
-+pass of \fIlatexmk \-i\fR or \fIlatexmk \-I\fR will update the dependency
- file.]
+ Essentially, it is like a specialized relative of the general
+@@ -15,8 +15,8 @@
+ document.  It 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 updates the
+-on-screen view of the compiled document.
+-.PP
++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
+@@ -30,14 +30,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 run
-+\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 viewer is selected automatically depending on the \fB-ps\fR,
--\fB-pdf\fR  or \fB-pdfps\fR options.    The kind of file to be viewed can
--also be explicitly selected by using the \fB-view\fR option
--(\fB-view=ps\fR, etc).
--.PP
-+type of viewer is selected automatically depending on the \fB\-ps\fR,
-+\fB\-pdf\fR  or \fB\-pdfps\fR options.    The kind of file to be viewed can
-+also be explicitly selected by using the \fB\-view\fR option
-+(\fB\-view=ps\fR, etc).
-+.PP 
- The second previewing option is 
--the powerful \fB-pvc\fR option (mnemonic:  "preview continuously").  
-+the powerful \fB\-pvc\fR option (mnemonic:  "preview continuously").  
- Particularly when a document is reaching the final stages of editing, it
- is often useful to have a previewer open continuously and have it update
- its display whenever changes are made to the source file(s), and this
--is done by  the \fB-pvc\fR option.  With this option, \fIlatexmk\fR
-+is done by  the \fB\-pvc\fR option.  With this option, \fIlatexmk\fR
- runs a previewer for the 
- document,  and then \fIlatexmk\fR repeatedly monitors the source files of
- the document to see if any changes have been made since the last dependent
- file
- was produced.  When changes are detected, \fIlatexmk\fR runs the
- appropriate LaTeX commands to regenerate the .dvi, .ps and/or .pdf files
--(depending on the which of the \fB-ps\fR, \fB-pdf\fR  and \fB-pdfps\fR
-+(depending on the which of the \fB\-ps\fR, \fB\-pdf\fR  and \fB\-pdfps\fR
- options was specified).  A good previewer (like 
- \fIgv\fR) will then automatically update its display.  
- Thus the user can simply edit a file and, when the
-@@ -67,24 +67,24 @@
- 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 will have to manually make the previewer update
- its display, which can be (xdvi and gsview) 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. 
+-\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
+@@ -47,31 +47,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. 
+ 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
+@@ -79,10 +79,10 @@
+ \fR.fdb_latexmk\fR, by default) that contains the source file
+ information.
+ 
 -.SH LATEXMK OPTIONS AND ARGUMENTS
 -(All options can be introduced by single or double "-" characters,
 -e.g., "latexmk -help" or "latexmk --help".)
@@ -114,7 +99,7 @@
  .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
-@@ -97,72 +97,72 @@
+@@ -95,79 +95,79 @@
  	latexmk foo
  
  then \fIlatexmk\fR will operate on the file "foo.tex".  
@@ -128,14 +113,13 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ 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, default is 0.95 which is OK unless your
+ 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>
@@ -144,7 +128,7 @@
  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.  Default is 220.0
+ 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
@@ -154,37 +138,47 @@
  .TP 
 -.B -c
 +.B \-c
- Clean up (remove) all regenerateable files generated by \fIlatex\fR and
- \fIbibtex\fR except dvi, postscript and pdf.  In addition, files 
- specified by the $clean_ext configuration variable are removed.
+ Clean up (remove) all regenerateable files generated by \fIlatex\fR
+ and \fIbibtex\fR except dvi, postscript and pdf.  In addition, files
+ specified by the $clean_ext configuration variable are removed.  But
+ the file containing a database of source file information is not
+ 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 than a make.
+ if you want to do a cleanup then a make.
  .TP 
 -.B -C
 +.B \-C
  Clean up (remove) all regenerateable files generated by \fIlatex\fR
  and \fIbibtex\fR including aux, dep, dvi, postscript and pdf.  In
  addition, those specified by the $clean_ext and $clean_full_ext
- configuration variables.
- 
--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 -c1
-+.TP 
-+.B \-c1
- Clean up (remove) all regenerateable files generated by \fIlatex\fR
- and \fIbibtex\fR except aux and dep.  In addition, files specified by
- the $clean_ext and $clean_full_ext configuration variables are
- removed.
+ configuration variables are removed.  But the file containing a
+ database of source file information is not 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 than a make.
  .TP 
+-.B -CA
++.B \-CA
+ Clean up (remove) absolutely all regenerateable files generated by
+ \fIlatex\fR and \fIbibtex\fR including aux, dep, dvi, postscript and
+ pdf.  In addition, those specified by the $clean_ext, $clean_full_ext,
+ and @generated_exts configuration variables are removed, and the file
+ containing a database of source file information.
+ 
+-This cleanup is instead of a regular make.  It is the same as \fB-C
+--CF\fR.  See the \fB-gg\fR option if you want to do a cleanup then a
++This cleanup is instead of a regular make.  It is the same as \fB\-C
++\-CF\fR.  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 a 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
@@ -199,8 +193,7 @@
  
 -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 and the postscript file is always generated, even if it is newer
- than the dvi file.
+ assumed.
 -.TP
 -.B -dF
 +.TP 
@@ -208,15 +201,22 @@
  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
-@@ -170,157 +170,157 @@
+@@ -175,117 +175,117 @@
  
  Example usage: To use dviselect to select only the even pages of the dvi file:
  
 -	latexmk -dF 'dviselect even' foo.tex
 -.TP
--.B -dvi
+-.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
@@ -227,18 +227,13 @@
  overridden, if some other file is made (a .ps file) that is generated from
  the dvi file, or if no generated file at all is requested.)
 -.TP
--.B -diagnostics
-+.TP 
-+.B \-diagnostics
- Whenever a log file is parsed to determine the input and included
- files, print a list of these files.
--.TP
 -.B -f
 +.TP 
 +.B \-f
  Force \fIlatexmk\fR to continue document processing despite errors.
- Normally, when \fIlatexmk\fR detects that \fIlatex\fR has found an error
- which will not be resolved by further processing, the program terminates.
+ 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
@@ -249,31 +244,12 @@
 +\fB\-f\fR option.  This could be used to override a setting in a
  configuration file.
 -.TP
--.B -F
-+.TP 
-+.B \-F
- Force \fIlatexmk\fR to include files that don't exist when generating
- dependency files.  A warning is produced instead of an error message and
- the program terminating.  If the file name is not an absolute path, it
- is assumed to be relative to the current working directory.  (Note: This
--option is only relevant if you are using the \fB-it\fR to obtain the
-+option is only relevant if you are using the \fB\-it\fR to obtain the
- dependency information from the tex files.  The default is to obtain
--this information from the log file and it that case the \fB-F\fR
-+this information from the log file and it that case the \fB\-F\fR
- option has no effect.)
--.TP
--.B -F-
--Turn off \fB-F\fR.
--.TP
 -.B -g
 +.TP 
-+.B \-F\-
-+Turn off \fB\-F\fR.
-+.TP 
 +.B \-g
- Force \fIlatexmk\fR to process document, disregarding the timestamps of the 
- source files.
+ Force \fIlatexmk\fR to process document fully, even under situations
+ where \fIlatexmk\fR would normally decide that no changes in the
+ source files have occured since the previous run. 
  This option is useful, for example, if you change some options and
  wish to reprocess the files.
 -.TP
@@ -286,74 +262,22 @@
 +Turn off \fB\-g\fR.
 +.TP 
 +.B \-gg
- "Super go mode" or "clean make": clean out generated files as if the
--\fB-C\fR had been given, and then do a regular make.
+ "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\-C\fR had been given, and then do a regular make.
++\fB\-CA\fR had been given, and then do a regular make.
 +.TP 
 +.B \-h, \-help
  Print help information.
 -.TP
--.B -i
-+.TP 
-+.B \-i
- Generate new dependency file if root file is newer
- than dependency file or dependency file does not exist.
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -i-
--Turn off \fB-i\fR.
--.TP
--.B -il
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-i\-
-+Turn off \fB\-i\fR.
-+.TP 
-+.B \-il
- Extract dependency information from log file.  This is normally the best
- method, so it is the default. However, some packages do not put
- information on files read in the log file, and then it may be better to
--tell \fIlatexmk\fR to get the information from the TeX file(s) --- see the 
--switch \fB-it\fR. 
-+tell \fIlatexmk\fR to get the information from the TeX file(s) \-\-\- see the 
-+switch \fB\-it\fR. 
- (Default)
--.TP
--.B -it
-+.TP 
-+.B \-it
- Extract dependency information by scanning the source TeX file(s), rather
- than the log file.
- This is the method used by earlier versions of \fIlatexmk\fR.  It relies on
- parsing TeX files, which can be confused by definitions of new commands,
--etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file --- see
--the switch \fB-il\fR.  
--.TP
--.B -I
-+etc.  Normally it is better to tell \fIlatexmk\fR to scan the log file \-\-\- see
-+the switch \fB\-il\fR.  
-+.TP 
-+.B \-I
- Always generate new dependency file, even if newer
- dependency file exists.  
- The dependency information is taken from the log file or the source file,
--depending on the setting made by the \fB-il\fR and \fB-it\fR switches.
--.TP
--.B -I-
--Turn off \fB-I\fR.
--.TP
 -.B -l
-+depending on the setting made by the \fB\-il\fR and \fB\-it\fR switches.
-+.TP 
-+.B \-I\-
-+Turn off \fB\-I\fR.
 +.TP 
 +.B \-l
  Run in landscape mode, using the landscape mode for the previewers and
- the dvi to postscript converters.
+ 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.
@@ -376,28 +300,31 @@
  different directory).  This option turns off this default behavior.
 -.TP
 -.B -new-viewer-
--The inverse of the \fR-new-viewer\fB option.  It puts \fIlatexmk\fR
+-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 \fR\-new\-viewer\fB option.  It puts \fIlatexmk\fR
++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 file.  By default, this is done using lpr after
- generating the postscript version.  But you can use the
--\fB-print=...\fR option to print the dvi or pdf files instead, and you can
-+\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. 
- 
--Under MS-Windows you must have configured the print commands used by
-+Under MS\-Windows you must have configured the print commands used by
- \fIlatexmk\fR.
+ Print out the document.  By default on a UNIX or Linux system, this is
+ done using lpr after generating the postscript file.  But you can use
+-the \fB-print=...\fR option to print the dvi or pdf files instead, and
++the \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, the correct behavior for printing very much depends on your
+-system's software.  In particular, under MS-Windows you must have
++system's software.  In 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.
++commands used by \fIlatexmk\fR.  This can be non\-trivial.
  
 -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,
@@ -452,7 +379,7 @@
  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
-@@ -328,112 +328,112 @@
+@@ -293,54 +293,54 @@
  
  Example usage: Use psnup to print two pages on the one page:
  
@@ -510,12 +437,13 @@
 -\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 UNIX "gv -watch" does this for postscript files; it
-+updated.  (Under UNIX "gv \-watch" does this for postscript files; it
- would also do it for pdf files except for an apparent bug in gv that
- causes an error when the newly updated pdf file is read.) Other
- previewers will need a manual update.  
+ 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,
@@ -527,13 +455,17 @@
 +to use a dvi or ps viewer, as set by one of the \fB\-view=dvi\fR and
 +\fB\-view=ps\fR options.
  
- Note that if \fIlatexmk\fR dies because it encounters an error, the
+ There are some other methods for arranging an update, notably useful
+ for many versions of xdvi and xpdf.  These are best set in
+@@ -348,65 +348,65 @@
+ 
+ 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 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.)
+ 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.
@@ -550,18 +482,21 @@
 +Same as \-silent
 +.TP 
 +.B \-r <rcfile>
- Read the specified initialization file ("RC file") before processing.  
--Be careful about the ordering: Standard initialization files --- see
--the section below on "Initialization (RC) files" --- are read first,
-+Be careful about the ordering: Standard initialization files \-\-\- see
-+the section below on "Initialization (RC) files" \-\-\- are read first,
- then the options on the command line in the order they are given.
+ Read the specified initialization file ("RC file") before processing.
+ 
+-Be careful about the ordering: (1) Standard initialization files --
+-see the section below on "Initialization (RC) files" -- are read
++Be careful about the ordering: (1) Standard initialization files \-\-
++see the section below on "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 previously
- specified options.  But all of these can be overridden by later
- options. 
- See below for more details about initialization (RC) files.
+ override both the standard initialization files and \fIpreviously\fR
+ specified options.  But all of these can be overridden by \fIlater\fR
+ options.  See below for more details about initialization (RC) files.
 -.TP
 -.B -silent
 +.TP 
@@ -578,7 +513,7 @@
 -.B -v, -version
 +.TP 
 +.B \-v, \-version
- Print version number of \fILatexmk\fR.
+ Print version number of \fIlatexmk\fR.
 -.TP
 -.B -verbose
 -Opposite of \fB-silent\fR.  This is the default setting.
@@ -604,6 +539,7 @@
 +.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"
@@ -620,7 +556,7 @@
  					file, start a previewer.  Then
  					watch for changes in the source
  					file thesis.tex and any files it
-@@ -443,55 +443,56 @@
+@@ -416,55 +416,56 @@
  					encounters an error, latexmk will
  					keep running.
  
@@ -643,7 +579,7 @@
     "/usr/local/lib/latexmk/LatexMk".
 -   On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 -.PP
-+   On Fedora Core systems, it only looks for "/etc/latexmk.conf".
++   On Fedora systems, it only looks for "/etc/latexmk.conf".
 +   On a MS\-WINDOWS system it looks for "C:\\latexmk\\LatexMk".
 +.PP 
  2) The user's RC file in "$HOME/.latexmkrc", where $HOME is the value
@@ -698,7 +634,7 @@
  for the setting of an array of strings.
  
  Some of the variables set the names of the commands that \fIlatexmk\fR
-@@ -499,37 +500,37 @@
+@@ -472,37 +473,37 @@
  
  \fB"Detaching" a command\fR: If a command is to be run detached this
  is indicated by preceding it with "start", as in
@@ -745,8 +681,8 @@
 +.PP 
  This means that an appropriate command has not been configured.  The
  string after the 'NONE' is effectively a comment.
- \fBOptions to commands\fR:
-@@ -538,9 +539,9 @@
+ 
+@@ -512,9 +513,9 @@
  Suppose you want \fIlatexmk\fR to use latex with source specials
  enabled.  Then you might use the following line in an initialization
  file:
@@ -759,7 +695,7 @@
  
  \fBAdvanced tricks\fR: Normally \fIlatexmk\fR assumes certain behavior
  for commands and in particular it assumes certain kinds and ordering
-@@ -548,50 +549,50 @@
+@@ -522,50 +523,50 @@
  example you might want to use Distiller to convert postscript files to
  pdf files.  You cannot simply change the name of the ps2pdf conversion
  program, as in
@@ -826,7 +762,7 @@
  .B @BIBINPUTS
  This is an array variable that specifies directories where
  \fIlatexmk\fR should look for .bib files.  By default it is set from
-@@ -614,13 +615,13 @@
+@@ -588,13 +589,13 @@
  
  This variable is likely to become obsolete in a future version of
  \fIlatexmk\fR which uses a better method of searching for files.
@@ -842,10 +778,10 @@
 -.TP
 +.TP 
  .B $cleanup_mode [0]
- If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for  cleanup
+ 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
-@@ -628,21 +629,21 @@
- and $clean_full_ext variables.)
+@@ -602,21 +603,21 @@
+ $clean_full_ext and @generated_exts variables.)
  
  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
@@ -855,9 +791,9 @@
 +.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.  
 -.TP
-+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.  
 +.TP 
  .B $clean_full_ext [""]
 -Extra extensions of files for \fIlatexmk\fR to remove when the \fB-C\fR
@@ -875,10 +811,10 @@
  .B @default_files [('*.tex')]
  Default list of files to be processed.  
  
-@@ -667,30 +668,30 @@
- 
- Note that more than file may be given, and that the default extension
- is '.tex'.  Wild cards are allowed.  
+@@ -643,30 +644,30 @@
+ 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]
@@ -916,7 +852,7 @@
  pdf file.
  
  WARNING 2: If you want to use one of the programs dvipdfm or dvipdfmx
-@@ -700,24 +701,24 @@
+@@ -676,29 +677,29 @@
  the command line.  See the extra_scripts directory of the latexmk
  distribution, where the necessary scripts dvipdfm_call, etc are to be
  found, together with instructions for their use in the file README1.
@@ -925,10 +861,10 @@
  .B $dvips ["dvips"]
  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 appended.
+-$dvips_pdf_switch -- see below -- will be appended.
 -.TP
 -.B $dvips_landscape ["dvips -tlandscape"]
-+$dvips_pdf_switch \-\-\- see below \-\-\- will be appended.
++$dvips_pdf_switch \-\- see below \-\- will be appended.
 +.TP 
 +.B $dvips_landscape ["dvips \-tlandscape"]
  The program to used as a filter to convert a .dvi file to a .ps file
@@ -937,13 +873,19 @@
 -.B $dvips_pdf_switch ["-P pdf"]
 +.TP 
 +.B $dvips_pdf_switch ["\-P pdf"]
- \fBSwitch(es)\fR for dvips program when pdf file is to be generated from
+ 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"]
- \fBSwitch(es)\fR for dvips program when silent mode is on.
+ 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. 
 -.TP
 -.B $dvi_update_method [2 under UNIX, 1 under MS-Windows]
 +.TP 
@@ -951,14 +893,16 @@
  How the dvi viewer updates its display when the dvi file has changed.
    0 => update is automatic, 
    1=> manual update by user, which may only mean a mouse click on the
-@@ -725,35 +726,35 @@
+@@ -706,26 +707,26 @@
     2 => Send the signal, whose number is in the variable
  $dvi_update_signal.  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 $dvi_update_command.   
 -.TP
 -.B $dvi_update_signal [Under UNIX: SIGUSR1, which is a system-dependent value]
-+acroread under MS\-Windows.)
 +.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
@@ -967,50 +911,25 @@
  value is the one appropriate for xdvi on a UNIX system.
 -.TP
 +.TP 
- .B $force_generate_and_save_includes [0]
- If nonzero, specifies that the dependency file should always be
--generated.  Equivalent to specifying the \fB-I\fR option.
+ .B $fdb_ext ["fdb_latex"]
+ 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
-+generated.  Equivalent to specifying the \fB\-I\fR option.
 +.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.
--Note that specifying the \fB-pvc\fR sets $forec_mode to 1.
+-Note that specifying the \fB-pvc\fR sets $force_mode to 1.
 -.TP
 +\fB\-f\fR option.
-+Note that specifying the \fB\-pvc\fR sets $forec_mode to 1.
-+.TP 
- .B $force_include_mode [0]
- If nonzero, force \fIlatexmk\fR to include files that don't exist when
- generating dependency files.  A warning is produced instead of an error
- message and the program terminating.  If the file name is not an
- absolute path, it is assumed to be relative to the current working
--directory.  Equivalent to specifying the \fB-F\fR option.
--.TP
-+directory.  Equivalent to specifying the \fB\-F\fR option.
-+.TP 
- .B $generate_and_save_includes [0]
- If nonzero, generates dependency file if it does not exist or is older
- than the root file (the base .tex file).  Equivalent to specifying
--the \fB-i\fR option.
--.TP
-+the \fB\-i\fR option.
++Note that specifying the \fB\-pvc\fR sets $force_mode to 1.
 +.TP 
- .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc')]
+ .B @generated_exts [( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext)]
  This contains a list of extensions for files that are generated
  (directly or indirectly) during a LaTeX run and that are read in by
-@@ -761,7 +762,7 @@
- from the .log file, it will ignore files with the extensions in
- \fI at generated_exts\fR, since NORMALLY they are not true source files,
- and the time stamps of these may mislead \fIlatexmk\fR as to whether
--the real output files are up-to-date.
-+the real output files are up\-to\-date.
- 
- The extensions "aux" and "bbl" are always excluded from the dependents,
- because they get special treatment, so they do not need to be in this
-@@ -775,43 +776,43 @@
+@@ -750,38 +751,38 @@
  
  adds the extension 'end' to the list of predefined generated
  extensions. 
@@ -1022,15 +941,6 @@
 -.TP
 +\fB\-g\fR option.
 +.TP 
- .B $includes_from_log [1]
- If nonzero, extract dependency information from the log file, rather than
--the source TeX file(s); this is equivalent to the \fB-il\fR option.
-+the source TeX file(s); this is equivalent to the \fB\-il\fR option.
- If zero, extract dependency information by scanning the source TeX file(s);
--this is equivalent to the \fB-it\fR option. 
--.TP
-+this is equivalent to the \fB\-it\fR option. 
-+.TP 
  .B $index_mode [0 and then as determined from the results of a run]
  If nonzero, run \fImakeindex\fR to produce index of document.  
  Normally you should not need to set this variable in an RC file, since
@@ -1040,8 +950,9 @@
  .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.
--.TP
 +dvi to postscript converters.  Equivalent to the \fB\-l\fR option.
+ Normally not needed with current previewers.
+-.TP
 +.TP 
  .B $latex ["latex"]
  The LaTeX processing program.  Note that as with other programs, you
@@ -1064,17 +975,17 @@
  .B $lpr ["lpr"]
 -[Default is "NONE lpr" under MS-WINDOWS.]
 +[Default is "NONE lpr" under MS\-WINDOWS.]
- The printing program to print postscript files.
+ 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 can use it with the option '/p':
- 
-@@ -822,14 +823,14 @@
- is necessary because one part of the command name ('Program Files')
- contains a space which would otherwise be misinterpreted. 
+ you have gsview installed, you could use it with the option '/p':
  
+@@ -795,14 +796,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"]
@@ -1089,7 +1000,7 @@
  e.g.,
  
      $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p';
-@@ -839,18 +840,18 @@
+@@ -812,18 +813,18 @@
  is necessary because one part of the command name ('Program Files')
  contains a space which would otherwise be misinterpreted. 
  
@@ -1113,17 +1024,15 @@
  .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.  
-@@ -858,148 +859,148 @@
+@@ -831,153 +832,153 @@
  file, by using the command specified by the $ps2pdf variable.  
  If equal to 3, generate a pdf version of the document from the dvi
  file, by using the command specified by the $dvipdf variable.  
 -Equivalent to the \fB-pdf-\fR, \fB-pdf\fR, \fB-pdfdvi\fR, 
--\fB-pdfps\fR options,
-+Equivalent to the \fB\-pdf\-\fR, \fB\-pdf\fR, \fB\-pdfdvi\fR, 
-+\fB\-pdfps\fR options,
- and is stored in the dependency file
- if generated.
+-\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"]
  The LaTeX processing program in the version that makes a pdf file instead
@@ -1132,7 +1041,7 @@
 -.B $pdflatex_silent_switch  ["-interaction=batchmode"]
 +.TP 
 +.B $pdflatex_silent_switch  ["\-interaction=batchmode"]
- \fBSwitch(es)\fR for the LaTeX processing program when silent mode is on.
+ 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
@@ -1157,11 +1066,20 @@
  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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $pdf_update_command.
+ 
 -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.  
@@ -1203,24 +1121,24 @@
 +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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  
+-line options \fB-view=\fR, and the variable \fI$view\fR.  
 -.TP
-+line options $\fB\-view=\fR.  
++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.  Recommend that this is not set from an RC file or
-+\fB\-p\fR option.  Recommend that this is not set from an RC file or
- you could waste lots of paper.
+-\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"]
@@ -1241,9 +1159,9 @@
  previewer. 
  The command line options for this command under the different flavors of
  UNIX are quite variable.  The command given above is suitable for Solaris
- 2.6 and above, and \fBlatexmk\fR corrects it for Linux and OSX.
+ 2.6 and above, and \fIlatexmk\fR corrects it for Linux and OSX.
  
- NOTE: The variable $pid_position must also be set: see its description.
+ NOTE: The variable \fI$pid_position\fR must also be set; see its description.
 -.TP
 +.TP 
  .B $ps2pdf ["ps2pdf"]
@@ -1280,11 +1198,19 @@
  Windows, this will cause to be run whatever command the system has
  associated with .ps files.]  
 -.TP
++.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 $dvi_update_method for the codes.
+ changed. See $dvi_update_method for the codes, with the change that
+ for the value 4, to run a command to do the update, the command is
+ specified by the variable $ps_update_command.
 -.TP
 -.B $ps_update_signal [Under UNIX: SIGHUP, which is a system-dependent value]
 +.TP 
@@ -1303,39 +1229,33 @@
 +.TP 
  .B $texfile_search [""]
  This is an obsolete variable, replaced by the \fI at default_files\fR
--variable -- see the description of \fI at default_files\fR for how it
-+variable \-\- see the description of \fI at default_files\fR for how it
- works.  
- 
- For backward compatibility, if you choose to set it,
--\fI$texfile_search\fR is a string of space-separated filenames, and
-+\fI$texfile_search\fR is a string of space\-separated filenames, and
+ 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
--.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS-Windows]
 +.TP 
-+.B $tmpdir ["/tmp" under UNIX, value of environment variable TEMP under MS\-Windows]
- Directory to store temporary files that \fIlatexmk\fR generates while
- running.  Currently it only has a minor use, when making a banner to
- insert in a postscript file.  There should be no trailing separator.
- It should not be necessary to change this value except when running
- under Cygwin.
--
-+.TP 
- .B @TEXINPUTS
- This is an array variable that under circumstances specifies
- directories where \fIlatexmk\fR should look for .tex files.  By
-@@ -1008,58 +1009,58 @@
- element list consisting of the current directory is set.  The format
- is as for the @BIBINPUTS variable (qv).
- 
--This variable is almost obsolete.  It is only used when the \fB-it\fR
-+This variable is almost obsolete.  It is only used when the \fB\-it\fR
- option is used to force \fIlatexmk\fR to scan the .tex files to find
- the input files instead of scanning the .log file, which it does by
- default. Since the .log file contains full path information, you
- should not need, normally, to set the @TEXINPUTS variable.
+ .B $tmpdir [See below for default]
+ Directory to store temporary files that \fIlatexmk\fR may generate while
+ running.  
+@@ -986,62 +987,62 @@
+ \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 to "/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"
@@ -1402,7 +1322,7 @@
  Search for .bib files is not correct if they are not in the current
  directory; the problem is that the log file generated by bibtex does not
  give the full path to the .bib files.  The easiest fix at the moment is to
-@@ -1080,27 +1081,27 @@
+@@ -1062,29 +1063,29 @@
  Gv on UNIX/LINUX works for both postscript and pdf.
  Ghostview on UNIX/LINUX needs a manual update (reopen); it views
  postscript and pdf. 
@@ -1417,7 +1337,9 @@
  instead.) 
 -.SH THANKS TO
 +.SH "THANKS TO"
- David Coppit (username david at node coppit.org) made many useful
+ 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. (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
@@ -1426,7 +1348,7 @@
 +.SH "AUTHOR"
  Current version, with substantial modifications, enhancements and bug
  fixes by John Collins (username collins at node phys.psu.edu).
- (Version 3.08g).
+ (Version 3.09).
  
  It can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
@@ -1438,10 +1360,10 @@
 -.br
 +.br 
  Original script called "go" by David J. Musliner (RCS Version 3.2)
-diff -dur latexmk-3.08n.ORIG/latexmk.pl latexmk-3.08n/latexmk.pl
---- latexmk-3.08n.ORIG/latexmk.pl	2007-02-27 11:55:42.000000000 -0700
-+++ latexmk-3.08n/latexmk.pl	2007-02-27 11:57:13.000000000 -0700
-@@ -804,10 +804,8 @@
+diff -dur latexmk-3.20.ORIG/latexmk.pl latexmk-3.20/latexmk.pl
+--- latexmk-3.20.ORIG/latexmk.pl	2007-08-31 21:46:47.000000000 -0600
++++ latexmk-3.20/latexmk.pl	2007-08-31 21:45:50.000000000 -0600
+@@ -584,10 +584,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.
@@ -1449,7 +1371,7 @@
 -     ( '/opt/local/share/latexmk/LatexMk', 
 -       '/usr/local/share/latexmk/LatexMk',
 -       '/usr/local/lib/latexmk/LatexMk' );
-+    ## Fedora Core change: only look in /etc
++    ## Fedora change: only look in /etc
 +    @rc_system_files = ( '/etc/latexmk.conf' );
  
      $search_path_separator = ':';  # Separator of elements in search_path

latexmk-perl.patch:

Index: latexmk-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk-perl.patch	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk-perl.patch	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,5 +1,5 @@
---- latexmk.pl.ORIG	2007-02-20 10:19:23.000000000 -0700
-+++ latexmk.pl	2007-02-20 10:22:18.000000000 -0700
+--- latexmk.pl.ORIG	2007-08-17 12:21:57.000000000 -0600
++++ latexmk.pl	2007-08-31 21:38:25.000000000 -0600
 @@ -1,23 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -x -S "$0" ${1+"$@"}' && 
 -eval 'exec perl -x -S  "$0" $argv:q'
@@ -22,5 +22,5 @@
 -# Source of the above: manpage for perlrun
 -
  
- # ATTEMPT TO ALLOW FILENAMES WITH SPACES:
- #    (as of 1 Apr 2006)
+ # Delete #??!! when working
+ 


Index: latexmk.conf
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- latexmk.conf	30 Mar 2007 15:34:53 -0000	1.1
+++ latexmk.conf	1 Sep 2007 04:18:15 -0000	1.2
@@ -1,4 +1,4 @@
-# This is the system-wide configuration file for latexmk.
+# This is the system-wide configuration file for latexmk version 3.20.
 # See the latexmk(1) man page for more information.
 #
 # The following options are given their default values.
@@ -62,7 +62,7 @@
 # $dvips = 'dvips';
 
 # The command to convert a DVI file into a PostScript file in landscape mode
-# $dvips = 'dvips -tlandscape';
+# $dvips_landscape = 'dvips -tlandscape';
 
 # Command line switch for dvips when a PDF file is to be generated
 # $dvips_pdf_switch = '-P pdf';
@@ -70,16 +70,20 @@
 # Command line switch for dvips to make it run in silent mode
 # $dvips_silent_switch = '-q';
 
+# The command to run when the DVI viewer is set to be updated by a command
+# $dvi_update_command = '';
+
 # How to make the DVI viewer update its display when the DVI file changes.
 # See the man page for a description of each method.
 # $dvi_update_method = 2;
 $dvi_update_method = 1;
 
 # When DVI update method 2 is used, the number of the Unix signal to send
-# $dvi_update_signal = SIGUSR1 (a system-dependent value)
+# $dvi_update_signal = SIGUSR1
 
-# If nonzero, the dependency file is always generated
-# $force_generate_and_save_includes = 0;
+# The extension of the file which latexmk generates to contain a database
+# of information on source files.
+# $fdb_ext = 'fdb_latex';
 
 # If nonzero, continue processing past minor LaTeX errors
 # This option is made nonzero if the -pvs command line option is used.
@@ -89,22 +93,14 @@
 # dependency files.
 # $force_include_mode = 0;
 
-# If nonzero, generate the dependency file if it does not exist or is older
-# than the base .tex file
-# $generate_and_save_includes = 0;
-
 # The list of extensions for files that are generated in one run and consumed
 # by later runs of one of the LaTeX tools.  The 'aux' and 'bbl' extensions are
 # treated specially, and hence are not in this list.
-# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc' );
+# @generated_exts = ( 'ind', 'lof', 'lot', 'out', 'toc', $fdb_ext );
 
 # If nonzero, process files regardless of timestamps
 # $go_mode = 0;
 
-# If nonzero, extract dependency information from the log file instead of the
-# .tex file.  If zero, extract dependency information from the .tex file.
-# $includes_from_log = 1;
-
 # If nonzero, run makeindex to produce a document index.  Normally, latexmk
 # should be able to figure out when this is necessary.
 # $index_mode = 0;
@@ -153,12 +149,15 @@
 # $pdf_previewer = 'start acroread';
 $pdf_previewer = 'xdg-open';
 
+# The command to run when the PDF viewer is set to be updated by a command
+# $pdf_update_command = '';
+
 # How to make the PDF viewer update its display when the PDF file changes.
 # See the man page for a description of each method.
 # $pdf_update_method = 1;
 
 # When PDF update method 2 is used, the number of the Unix signal to send
-# $pdf_update_signal = SIGHUP (a system-dependent value)
+# $pdf_update_signal = SIGHUP
 
 # Where the pid is in the output of $pscmd; see the man page
 # $pid_position = 1;
@@ -180,7 +179,7 @@
 # $print_type = 'ps';
 
 # Command used to list all the processes currently run by the user
-# $pscmd = "ps --width 200 -f -u $ENV{USER}";
+# $pscmd = "ps -f -u $ENV{USER}";
 
 # Command to convert a PostScript file to a PDF file
 # $ps2pdf = 'ps2pdf';
@@ -194,7 +193,11 @@
 
 # The command to invoke a PostScript previewer in landscape mode
 # $ps_previewer_landscape = 'start gv -swap -watch';
-$ps_previwer = 'xdg-open';
+$ps_previewer_landscape = 'xdg-open';
+
+# The command to run when the PostScript viewer is set to be updated by a
+# command
+# $ps_update_command = '';
 
 # How to make the PostScript viewer update its display when the PostScript
 # file changes.  See the man page for a description of each method.
@@ -203,7 +206,7 @@
 
 # When PostScript update method 2 is used, the number of the Unix signal to
 # send
-# $ps_update_signal = SIGHUP (a system-dependent value)
+# $ps_update_signal = SIGHUP
 
 # The time to sleep in seconds between checking for source file changes when
 # running in continuous update mode
@@ -211,3 +214,9 @@
 
 # The directory to store temporary files; omit the trailing '/'
 # $tmpdir = '/tmp';
+
+# Which kind of file is to be previewed if a previewer is used.  The possible
+# values are 'default', 'dvi', 'ps', and 'pdf'.  The value of 'default' means
+# that the PDF is viewed if it is generated, else PostScript is viewed if it is
+# generated, else DVI is viewed.
+# $view = 'default';


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- latexmk.spec	22 Aug 2007 03:38:40 -0000	1.3
+++ latexmk.spec	1 Sep 2007 04:18:15 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        3.08n
-Release:        5%{?dist}
+Version:        3.20
+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-308n.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-320.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 Patch0:         latexmk-perl.patch
@@ -14,9 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# F7 and earlier use tetex, F8 and later use texlive, so require the binaries
-Requires:       /usr/bin/latex, /usr/bin/bibtex, /usr/bin/makeindex
-Requires:       ghostscript, xdg-utils
+Requires:       tetex, tetex-latex, ghostscript, xdg-utils
 
 %description
 Latexmk is a perl script for running LaTeX the correct number of times to
@@ -41,9 +39,6 @@
 # the man page accordingly.
 %patch1 -p1
 
-# Get rid of the DOS batch files so we can %doc extra-scripts below
-rm -f extra-scripts/*.bat
-
 %build
 
 %install
@@ -66,6 +61,10 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Fri Aug 31 2007 Jerry James <loganjerry at gmail.com> - 3.20-1
+- New version 3.20.
+- Texlive isn't as near as I thought; require the tetex packages for now.
+
 * Tue Aug 21 2007 Jerry James <loganjerry at gmail.com> - 3.08n-5
 - Update license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Mar 2007 15:34:53 -0000	1.2
+++ sources	1 Sep 2007 04:18:15 -0000	1.3
@@ -1 +1 @@
-0849be9d5aabe03e6de7159c8d10a191  latexmk-308n.zip
+fba0740fd6e5b9001c1300b3425cb659  latexmk-320.zip



From fedora-extras-commits at redhat.com  Sat Sep  1 04:55:54 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 00:55:54 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.20,1.21
Message-ID: <200709010455.l814tscY026743@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26714

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
- setuptools seems to be broken WRT having an active and inactive version
  of an egg.  Have to make both versions inactive and manually setup a copy
  that can be started via import. (Necessary for the sqlalchemy0.3 compat
  package.)



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-sqlalchemy.spec	27 Aug 2007 21:52:02 -0000	1.20
+++ python-sqlalchemy.spec	1 Sep 2007 04:55:09 -0000	1.21
@@ -7,7 +7,7 @@
 
 Name:           python-sqlalchemy
 Version:        0.4.0
-Release:        0.1.%{betaver}%{?dist}
+Release:        0.3.%{betaver}%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -18,7 +18,11 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires:  python-setuptools-devel >= 0.6c3
+%else
 BuildRequires:  python-setuptools >= 0.6c3
+%endif
 
 %description
 SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
@@ -34,12 +38,17 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
+mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} --always-unzip dist/*.egg
+cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
+mv sqlalchemy ..
+ln -s ../sqlalchemy .
+
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
 
@@ -50,10 +59,19 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE PKG-INFO CHANGES doc examples
-%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg-info
+%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
 %{python_sitelib}/sqlalchemy/
 
 %changelog
+* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
+- setuptools seems to be broken WRT having an active and inactive version
+  of an egg.  Have to make both versions inactive and manually setup a copy
+  that can be started via import. (Necessary for the sqlalchemy0.3 compat
+  package.)
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.2.beta4
+- Modify setuptools to handle the -devel subpackage split in F-8.
+
 * Mon Aug 27 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-0.1.beta4
 - Update to 0.4 beta4.
 



From fedora-extras-commits at redhat.com  Sat Sep  1 06:21:27 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sat,  1 Sep 2007 02:21:27 -0400
Subject: fedora-security/audit fc7,1.87,1.88
Message-ID: <200709010621.l816LRYD007602@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7532

Modified Files:
	fc7 
Log Message:
CVE for qgit



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fc7	31 Aug 2007 16:23:03 -0000	1.87
+++ fc7	1 Sep 2007 06:21:24 -0000	1.88
@@ -5,11 +5,11 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070823
-# Up to date FC7 as of 20070827
+# Up to date CVE as of CVE email 20070829
+# Up to date FC7 as of 20070829
 
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-GENERIC-MAP-NOMATCH VULNERABLE (qgit) #268381
+CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861
 CVE-2007-4560 VULNERABLE (clamav) #260583
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal



From fedora-extras-commits at redhat.com  Sat Sep  1 08:24:03 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:24:03 -0400
Subject: rpms/icewm/devel .cvsignore,1.2,1.3 sources,1.3,1.4
Message-ID: <200709010824.l818O3ZB021516@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21492

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	1 Sep 2007 08:23:31 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsR8MAqz and /tmp/cvs54w68R differ



From fedora-extras-commits at redhat.com  Sat Sep  1 08:25:37 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:25:37 -0400
Subject: rpms/icewm/F-7 .cvsignore,1.2,1.3 sources,1.3,1.4
Message-ID: <200709010825.l818PbLB021569@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21539

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	1 Sep 2007 08:25:04 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsc0A5YM and /tmp/cvsRppX9U differ



From fedora-extras-commits at redhat.com  Sat Sep  1 08:26:50 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:26:50 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.4,1.5
Message-ID: <200709010826.l818Qo9T021604@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21578

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:34 -0000	1.4
+++ icewm.spec	1 Sep 2007 08:26:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,12 +11,10 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
 BuildRequires:	imlib-devel
@@ -136,6 +134,12 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.



From fedora-extras-commits at redhat.com  Sat Sep  1 08:29:32 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:29:32 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.5,1.6
Message-ID: <200709010829.l818TW5v021672@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21644

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	1 Sep 2007 08:26:17 -0000	1.5
+++ icewm.spec	1 Sep 2007 08:28:59 -0000	1.6
@@ -17,6 +17,7 @@
 BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -135,6 +136,7 @@
 
 %changelog
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
 - Fix broken source file.
 
 * Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:06 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818h7dF026108@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:11 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:11 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hBW7026117@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:16 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:16 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hGZg026131@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:25 -0700
Subject: [pkgdb] eclipse-rpm-editor was added for alcapcom
Message-ID: <200709010843.l818hIr0007916@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-rpm-editor with summary RPM Specfile editor for Eclipse
Kevin Fenzi (kevin) has approved Package eclipse-rpm-editor
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-rpm-editor with an owner of alcapcom
Kevin Fenzi (kevin) has approved eclipse-rpm-editor in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, 7) updated by kevin
Message-ID: <200709010843.l818hISh007925@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora 7) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:18 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:18 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hIXW026141@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, devel) updated by kevin
Message-ID: <200709010843.l818hJXK007937@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora devel) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 02:05:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 31 Aug 2007 19:05:47 -0700
Subject: [pkgdb] eclipse-rpm-editor (Fedora, 6) updated by kevin
Message-ID: <200709010843.l818hKpH007950@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for eclipse-rpm-editor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-rpm-editor (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved watchcommits on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved commit on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved build on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved approveacls on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) approved checkout on eclipse-rpm-editor (Fedora 6) for overholt
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-rpm-editor (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpm-editor



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:07 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:07 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hLSx007962@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:17 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:17 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hL0q007972@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:31 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hVj9026156@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:31 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hWD4007981@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:33 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:33 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818hX88007990@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:37 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:37 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchbugzilla
Message-ID: <200709010843.l818hbZq026165@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on cabextract (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:38 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:38 -0700
Subject: [pkgdb] cabextract: pertusus has requested watchcommits
Message-ID: <200709010843.l818hc0j026175@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on cabextract (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:43:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:43:40 -0700
Subject: [pkgdb] cabextract: pertusus has requested commit
Message-ID: <200709010843.l818heSc007999@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on cabextract (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:40 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010844.l818ifLu026192@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:43 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:43 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010844.l818ihG4026201@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:49 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:49 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010844.l818inkX026216@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:54 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010844.l818itoY026226@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:57 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010844.l818ivRj026235@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:02 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:02 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010845.l818j2XM026244@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:31 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:31 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kVFU026256@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:42 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:42 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010846.l818kW3x008035@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:48 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kXam008044@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:50 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:50 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010846.l818kX2L008053@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:34 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:34 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kYK0026268@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:44:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:44:55 -0700
Subject: [pkgdb] fltk: pertusus has requested watchcommits
Message-ID: <200709010846.l818kYAU008063@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on fltk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:01 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:01 -0700
Subject: [pkgdb] fltk: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kY1l008072@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on fltk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:45:03 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:45:03 -0700
Subject: [pkgdb] fltk: pertusus has requested commit
Message-ID: <200709010846.l818kZB4008081@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on fltk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:32 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:32 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818kZ2E008091@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:39 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:39 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kdRZ008103@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:40 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:40 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818ke3M026281@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:42 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:42 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kgsq008115@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:46 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kkOi026293@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:47 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:47 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818klOR008128@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:48 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010846.l818kmqE026305@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:57 -0700
Subject: [pkgdb] tidy: pertusus has requested watchbugzilla
Message-ID: <200709010846.l818kv2j008140@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on tidy (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:58 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:58 -0700
Subject: [pkgdb] tidy: pertusus has requested watchcommits
Message-ID: <200709010846.l818kxSK026318@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on tidy (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:46:59 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:46:59 -0700
Subject: [pkgdb] tidy: pertusus has requested commit
Message-ID: <200709010847.l818l0S7008153@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on tidy (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:46 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010847.l818lk93008166@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:47 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:47 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010847.l818ll71026331@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:48 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:48 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010847.l818lm8b008175@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:53 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:53 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010847.l818lrEi026340@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:54 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010847.l818lt28008185@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:55 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010847.l818ltw6026350@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:47:59 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:47:59 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010848.l818m0Hw008194@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:00 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:00 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010848.l818m0eK026359@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:01 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:01 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010848.l818m2vh008203@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:04 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:04 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchbugzilla
Message-ID: <200709010848.l818m4VX026368@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on xdg-utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:06 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested watchcommits
Message-ID: <200709010848.l818m6cR008212@app4.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchcommits acl on xdg-utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:48:07 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 01:48:07 -0700
Subject: [pkgdb] xdg-utils: pertusus has requested commit
Message-ID: <200709010848.l818m7Kl026378@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on xdg-utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 08:49:13 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 04:49:13 -0400
Subject: rpms/icewm/devel icewm.spec,1.5,1.6
Message-ID: <200709010849.l818nDLe022107@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22087

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	27 Aug 2007 16:46:11 -0000	1.5
+++ icewm.spec	1 Sep 2007 08:48:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -17,6 +17,7 @@
 BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -134,7 +135,11 @@
 
 
 %changelog
-* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-1
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
 - Fix bad %%{_fedora} if/else.
 
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1



From fedora-extras-commits at redhat.com  Sat Sep  1 09:04:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 1 Sep 2007 05:04:15 -0400
Subject: rpms/maniadrive-music/devel maniadrive-music.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709010904.l8194FOx028367@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28293/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-music.spec 
Log Message:
initial maniadrive import



--- NEW FILE maniadrive-music.spec ---
Name:           maniadrive-music
Version:        1.0
Release:        2%{?dist}
Summary:        Replacement soundtrack for the non free ManiaDrive soundtrack
Group:          Amusements/Games
License:        CC-BY and Free Art and GPL+
URL:            http://www.dogmazic.net/
Source0:        maniadrive-replacement-music.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
# to make sure this gets removed when maniadrive gets removed
Requires:       maniadrive 
# for /usr/share/maniadrive ownership
Requires:       maniadrive-data

%description
Soundtrack for ManiaDrive. This is not the original ManiaDrive soundtrack as
the original soundtrack is licensed under a CC BY-NC-SA license, which is not
acceptable to Fedora. This replacement music was carefully chosen to keep the
same atmosphere as the original music.

This soundtrack contains music from the following artists / groups:

Black moon
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Black+moon

Kitoy
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Kitoy

little
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=little

Mage
http://cqfd-corp.org/

Neub (aka Revision 1.1)
http://cqfd-corp.org/

Syndrome:
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Syndrome

Zzjmc
http://www.dogmazic.net/static.php?op=musiqueIndex.php&group=Zzjmc


%prep
%setup -q -n mania_music


%build
# nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/maniadrive/mania_music
install -p -m 644 *.ogg $RPM_BUILD_ROOT%{_datadir}/maniadrive/mania_music


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.fedora COPYING
%{_datadir}/maniadrive/mania_music


%changelog
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
- Include 3 songs, instead of 1 song, from the original Maniadrive soundtrack,
  now that upstream has clarified the license status of the 2 added songs

* Sat Aug 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-music/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:00:35 -0000	1.1
+++ .cvsignore	1 Sep 2007 09:03:41 -0000	1.2
@@ -0,0 +1 @@
+maniadrive-replacement-music.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-music/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:00:35 -0000	1.1
+++ sources	1 Sep 2007 09:03:41 -0000	1.2
@@ -0,0 +1 @@
+8d97c24a6c087752b30986d84cb39fb2  maniadrive-replacement-music.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 09:04:55 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sat, 1 Sep 2007 05:04:55 -0400
Subject: rpms/icewm/FC-6 .cvsignore, 1.1, 1.2 icewm.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709010904.l8194tBN028429@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28371

Modified Files:
	.cvsignore icewm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2007 19:36:05 -0000	1.1
+++ .cvsignore	1 Sep 2007 09:04:21 -0000	1.2
@@ -0,0 +1 @@
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:42 -0000	1.4
+++ icewm.spec	1 Sep 2007 09:04:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,13 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsZOzzXU and /tmp/cvsOZICtE differ



From fedora-extras-commits at redhat.com  Sat Sep  1 09:20:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 1 Sep 2007 05:20:10 -0400
Subject: rpms/xine-lib/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xine-lib.spec, 1.22, 1.23 xine-lib-1.1.7-open.patch, 1.1, NONE
Message-ID: <200709010920.l819KAik030173@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30148

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-1.1.7-open.patch 
Log Message:
* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
- 1.1.8, "open" patch applied upstream.
- Build XCB plugins by default for Fedora 8+ only.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Jun 2007 20:40:52 -0000	1.8
+++ .cvsignore	1 Sep 2007 09:19:38 -0000	1.9
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jun 2007 20:40:52 -0000	1.8
+++ sources	1 Sep 2007 09:19:38 -0000	1.9
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2  xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6  xine-lib-1.1.7-autotools.patch.bz2
+6cbfae9d31fc138c7cb3c3d178e1286d  xine-lib-1.1.8-pruned.tar.bz2
+b4a7c7a9af428b26667402d6dc180107  xine-lib-1.1.8-autotools.patch.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine-lib.spec	25 Aug 2007 21:23:05 -0000	1.22
+++ xine-lib.spec	1 Sep 2007 09:19:38 -0000	1.23
@@ -13,11 +13,16 @@
 %else
 %define         have_vidix 0
 %endif
+%if 0%{?fedora} >= 8
+%define         with_xcb 1
+%else
+%define         with_xcb 0
+%endif
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -30,13 +35,15 @@
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
-Patch2:         %{name}-1.1.7-open.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
 BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
-BuildRequires:  libGLU-devel libxcb-devel
+BuildRequires:  libGLU-devel
+%if %{with_xcb}
+BuildRequires:  libxcb-devel
+%endif
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
@@ -114,7 +121,9 @@
 %if 0%{!?_without_directfb:1}
   - DirectFB output
 %endif
-
+%if %{with_xcb}
+  - XCB output
+%endif
 
 
 %prep
@@ -124,7 +133,6 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-%patch2 -p1 -b .open
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -321,8 +329,10 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%if %{with_xcb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif
 
 
 %files devel
@@ -338,6 +348,10 @@
 
 
 %changelog
+* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
 * Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
 - Split the aRts plugin into its own subpackage
 


--- xine-lib-1.1.7-open.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 09:36:49 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:36:49 -0400
Subject: rpms/gcc/devel gcc41.spec,1.168,1.169
Message-ID: <200709010936.l819an6M030501@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30462

Modified Files:
	gcc41.spec 
Log Message:
4.1.2-21


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gcc41.spec	31 Aug 2007 21:09:32 -0000	1.168
+++ gcc41.spec	1 Sep 2007 09:36:16 -0000	1.169
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 20
+%define gcc_release 21
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -887,7 +887,7 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortranbegin.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a .
+mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/
 mv -f $RPM_BUILD_ROOT%{_prefix}/include/mf-runtime.h include/
 
 %ifarch sparc ppc
@@ -909,9 +909,12 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortranbegin.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libmudflap{,th}.*a 64/
 ln -sf lib32/libstdc++.a libstdc++.a
 ln -sf ../lib64/libstdc++.a 64/libstdc++.a
+ln -sf lib32/libmudflap.a libmudflap.a
+ln -sf ../lib64/libmudflap.a 64/libmudflap.a
+ln -sf lib32/libmudflapth.a libmudflapth.a
+ln -sf ../lib64/libmudflapth.a 64/libmudflapth.a
 %endif
 %ifarch %{multilib_64_archs}
 mkdir -p 32
@@ -931,11 +934,14 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortranbegin.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libmudflap{,th}.*a 32/
 %endif
 %ifarch sparc64 ppc64
 ln -sf ../lib32/libstdc++.a 32/libstdc++.a
 ln -sf lib64/libstdc++.a libstdc++.a
+ln -sf ../lib32/libmudflap.a 32/libmudflap.a
+ln -sf lib64/libmudflap.a libmudflap.a
+ln -sf ../lib32/libmudflapth.a 32/libmudflapth.a
+ln -sf lib64/libmudflapth.a libmudflapth.a
 %if %{build_java}
 ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
 ln -sf lib64/libgcj_bc.so libgcj_bc.so
@@ -943,6 +949,8 @@
 %else
 %ifarch %{multilib_64_archs}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflap.a 32/libmudflap.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflapth.a 32/libmudflapth.a
 %if %{build_java}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
 %endif
@@ -1219,6 +1227,10 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
@@ -1229,6 +1241,16 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
+%endif
+%ifarch sparc sparc64 ppc ppc64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
 %endif
 %dir %{_prefix}/libexec/getconf
 %{_prefix}/libexec/getconf/default
@@ -1576,27 +1598,29 @@
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
+%ifarch sparc ppc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
+%endif
+%ifarch sparc64 ppc64
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
+%endif
+%ifnarch sparc sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
 %endif
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Aug  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
+- fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
+  (#270281)
+
 * Fri Aug 31 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20
 - backport __attribute__((__gnu_inline__)) support for C++
 - fix ppc/ppc64 __sync_* builtins with aligned 8 or 16-bit values



From fedora-extras-commits at redhat.com  Sat Sep  1 09:38:23 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:38:23 -0400
Subject: rpms/gcc/devel gcc41.spec,1.169,1.170
Message-ID: <200709010938.l819cNMg030546@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30514

Modified Files:
	gcc41.spec 
Log Message:
4.1.2-21


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gcc41.spec	1 Sep 2007 09:36:16 -0000	1.169
+++ gcc41.spec	1 Sep 2007 09:37:50 -0000	1.170
@@ -1617,7 +1617,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Sat Aug  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
+* Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)
 



From fedora-extras-commits at redhat.com  Sat Sep  1 09:50:41 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 1 Sep 2007 05:50:41 -0400
Subject: rpms/gcc/F-7 gcc41-c++-gnu_inline.patch, NONE,
	1.1 gcc41-ppc-sync-qihi.patch, NONE,
	1.1 gcc41-ppc64-ia64-GNU-stack.patch, NONE, 1.1 gcc41.spec,
	1.161, 1.162
Message-ID: <200709010950.l819ofXC030729@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-c++-gnu_inline.patch gcc41-ppc-sync-qihi.patch 
	gcc41-ppc64-ia64-GNU-stack.patch 
Log Message:
4.1.2-20.fc7

gcc41-c++-gnu_inline.patch:

--- NEW FILE gcc41-c++-gnu_inline.patch ---
2007-08-31  Jakub Jelinek  <jakub at redhat.com>

	* cp-tree.h (cp_disregard_inline_limits): New prototype.
	* decl.c (cp_disregard_inline_limits): New function.
	* cp-objcp-common.h
	(LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS): Define.

2007-08-30  Jakub Jelinek  <jakub at redhat.com>

	* gcc.dg/inline-24.c: New test.
	* g++.dg/opt/inline11.C: New test.

2007-08-27  Alexandre Oliva  <aoliva at redhat.com>

	* doc/extend.texi (gnu_inline funtion attribute): Document C++
	behavior.

	* decl.c (GNU_INLINE_P): New.
	(duplicate_decls): Handle gnu_inline.  Merge attributes and
	some flags in overriding definitions.
	(redeclaration_error_message): Handle gnu_inline.
	(start_preparsed_function): Likewise.

	* g++.dg/ext/gnu-inline-common.h: New.
	* g++.dg/ext/gnu-inline-global-reject.C: New.
	* g++.dg/ext/gnu-inline-global.C: New.
	* g++.dg/ext/gnu-inline-namespace.C: New.
	* g++.dg/ext/gnu-inline-anon-namespace.C: New.
	* g++.dg/ext/gnu-inline-class.C: New.
	* g++.dg/ext/gnu-inline-class-static.C: New.
	* g++.dg/ext/gnu-inline-template-class.C: New.
	* g++.dg/ext/gnu-inline-template-func.C: New.

--- gcc/cp/cp-tree.h.jj	2007-08-31 09:47:43.000000000 +0200
+++ gcc/cp/cp-tree.h	2007-08-31 14:09:08.000000000 +0200
@@ -4417,6 +4417,7 @@ extern linkage_kind decl_linkage		(tree)
 extern tree cp_walk_subtrees (tree*, int*, walk_tree_fn,
 			      void*, struct pointer_set_t*);
 extern int cp_cannot_inline_tree_fn		(tree*);
+extern int cp_disregard_inline_limits		(tree);
 extern tree cp_add_pending_fn_decls		(void*,tree);
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
--- gcc/cp/decl.c.jj	2007-08-31 09:47:43.000000000 +0200
+++ gcc/cp/decl.c	2007-08-31 14:27:12.000000000 +0200
@@ -1097,6 +1097,10 @@ check_redeclaration_exception_specificat
     }
 }
 
+#define GNU_INLINE_P(fn) (DECL_DECLARED_INLINE_P (fn)			\
+			  && lookup_attribute ("gnu_inline",		\
+					       DECL_ATTRIBUTES (fn)))
+
 /* If NEWDECL is a redeclaration of OLDDECL, merge the declarations.
    If the redeclaration is invalid, a diagnostic is issued, and the
    error_mark_node is returned.  Otherwise, OLDDECL is returned.
@@ -1626,19 +1630,45 @@ duplicate_decls (tree newdecl, tree oldd
 	= chainon (DECL_TEMPLATE_SPECIALIZATIONS (olddecl),
 		   DECL_TEMPLATE_SPECIALIZATIONS (newdecl));
 
+      DECL_ATTRIBUTES (old_result)
+	= (*targetm.merge_decl_attributes) (old_result, new_result);
+
       if (DECL_FUNCTION_TEMPLATE_P (newdecl))
 	{
-	  DECL_INLINE (old_result)
-	    |= DECL_INLINE (new_result);
-	  DECL_DECLARED_INLINE_P (old_result)
-	    |= DECL_DECLARED_INLINE_P (new_result);
-	  check_redeclaration_exception_specification (newdecl, olddecl);
+	  if (GNU_INLINE_P (old_result) != GNU_INLINE_P (new_result)
+	      && DECL_INITIAL (new_result))
+	    {
+	      if (DECL_INITIAL (old_result))
+		{
+		  DECL_INLINE (old_result) = 0;
+		  DECL_UNINLINABLE (old_result) = 1;
+		}
+	      else
+		{
+		  DECL_INLINE (old_result) = DECL_INLINE (new_result);
+		  DECL_UNINLINABLE (old_result) = DECL_UNINLINABLE (new_result);
+		}
+	      DECL_EXTERNAL (old_result) = DECL_EXTERNAL (new_result);
+	      DECL_NOT_REALLY_EXTERN (old_result)
+		= DECL_NOT_REALLY_EXTERN (new_result);
+	      DECL_INTERFACE_KNOWN (old_result)
+		= DECL_INTERFACE_KNOWN (new_result);
+	      DECL_DECLARED_INLINE_P (old_result)
+		= DECL_DECLARED_INLINE_P (new_result);
+	    }
+	  else
+	    {
+	      DECL_INLINE (old_result)
+		|= DECL_INLINE (new_result);
+	      DECL_DECLARED_INLINE_P (old_result)
+		|= DECL_DECLARED_INLINE_P (new_result);
+	      check_redeclaration_exception_specification (newdecl, olddecl);
+	    }
 	}
 
       /* If the new declaration is a definition, update the file and
 	 line information on the declaration.  */
-      if (DECL_INITIAL (old_result) == NULL_TREE
-	  && DECL_INITIAL (new_result) != NULL_TREE)
+      if (DECL_INITIAL (new_result) != NULL_TREE)
 	{
 	  DECL_SOURCE_LOCATION (olddecl)
 	    = DECL_SOURCE_LOCATION (old_result)
@@ -1795,9 +1825,29 @@ duplicate_decls (tree newdecl, tree oldd
   new_template = NULL_TREE;
   if (DECL_LANG_SPECIFIC (newdecl) && DECL_LANG_SPECIFIC (olddecl))
     {
-      DECL_INTERFACE_KNOWN (newdecl) |= DECL_INTERFACE_KNOWN (olddecl);
-      DECL_NOT_REALLY_EXTERN (newdecl) |= DECL_NOT_REALLY_EXTERN (olddecl);
-      DECL_COMDAT (newdecl) |= DECL_COMDAT (olddecl);
+      bool old_decl_gnu_inline;
+
+      if ((DECL_INTERFACE_KNOWN (olddecl)
+	   && TREE_CODE (olddecl) == FUNCTION_DECL)
+	  || (TREE_CODE (olddecl) == TEMPLATE_DECL
+	      && TREE_CODE (DECL_TEMPLATE_RESULT (olddecl)) == FUNCTION_DECL))
+	{
+	  tree fn = olddecl;
+
+	  if (TREE_CODE (fn) == TEMPLATE_DECL)
+	    fn = DECL_TEMPLATE_RESULT (olddecl);
+
+	  old_decl_gnu_inline = GNU_INLINE_P (fn) && DECL_INITIAL (fn);
+	}
+      else
+	old_decl_gnu_inline = false;
+
+      if (!old_decl_gnu_inline)
+	{
+	  DECL_INTERFACE_KNOWN (newdecl) |= DECL_INTERFACE_KNOWN (olddecl);
+	  DECL_NOT_REALLY_EXTERN (newdecl) |= DECL_NOT_REALLY_EXTERN (olddecl);
+	  DECL_COMDAT (newdecl) |= DECL_COMDAT (olddecl);
+	}
       DECL_TEMPLATE_INSTANTIATED (newdecl)
 	|= DECL_TEMPLATE_INSTANTIATED (olddecl);
 
@@ -1871,6 +1921,13 @@ duplicate_decls (tree newdecl, tree oldd
 	  /* [temp.expl.spec/14] We don't inline explicit specialization
 	     just because the primary template says so.  */
 	}
+      else if (new_defines_function && DECL_INITIAL (olddecl))
+	{
+	  /* C++ is always in in unit-at-a-time mode, so we never
+	     inline re-defined extern inline functions.  */
+	  DECL_INLINE (newdecl) = 0;
+	  DECL_UNINLINABLE (newdecl) = 1;
+	}
       else
 	{
 	  if (DECL_PENDING_INLINE_INFO (newdecl) == 0)
@@ -2113,9 +2170,25 @@ redeclaration_error_message (tree newdec
 	{
 	  if (DECL_NAME (olddecl) == NULL_TREE)
 	    return "%q#D not declared in class";
-	  else
+	  else if (!GNU_INLINE_P (olddecl)
+		   || GNU_INLINE_P (newdecl))
 	    return "redefinition of %q#D";
 	}
+
+      if (DECL_DECLARED_INLINE_P (olddecl) && DECL_DECLARED_INLINE_P (newdecl))
+	{
+	  bool olda = GNU_INLINE_P (olddecl);
+	  bool newa = GNU_INLINE_P (newdecl);
+
+	  if (olda != newa)
+	    {
+	      if (newa)
+		return "%q+D redeclared inline with %<gnu_inline%> attribute";
+	      else
+		return "%q+D redeclared inline without %<gnu_inline%> attribute";
+	    }
+	}
+
       return 0;
     }
   else if (TREE_CODE (newdecl) == TEMPLATE_DECL)
@@ -2141,9 +2214,24 @@ redeclaration_error_message (tree newdec
       ot = DECL_TEMPLATE_RESULT (olddecl);
       if (DECL_TEMPLATE_INFO (ot))
 	ot = DECL_TEMPLATE_RESULT (template_for_substitution (ot));
-      if (DECL_INITIAL (nt) && DECL_INITIAL (ot))
+      if (DECL_INITIAL (nt) && DECL_INITIAL (ot)
+	  && (!GNU_INLINE_P (ot) || GNU_INLINE_P (nt)))
 	return "redefinition of %q#D";
 
+      if (DECL_DECLARED_INLINE_P (ot) && DECL_DECLARED_INLINE_P (nt))
+	{
+	  bool olda = GNU_INLINE_P (ot);
+	  bool newa = GNU_INLINE_P (nt);
+
+	  if (olda != newa)
+	    {
+	      if (newa)
+		return "%q+D redeclared inline with %<gnu_inline%> attribute";
+	      else
+		return "%q+D redeclared inline without %<gnu_inline%> attribute";
+	    }
+	}
+
       return NULL;
     }
   else if (TREE_CODE (newdecl) == VAR_DECL
@@ -10447,6 +10535,14 @@ start_preparsed_function (tree decl1, tr
       && lookup_attribute ("noinline", attrs))
     warning (0, "inline function %q+D given attribute noinline", decl1);
 
+  /* Handle gnu_inline attribute.  */
+  if (GNU_INLINE_P (decl1))
+    {
+      DECL_EXTERNAL (decl1) = 1;
+      DECL_NOT_REALLY_EXTERN (decl1) = 0;
+      DECL_INTERFACE_KNOWN (decl1) = 1;
+    }
+
   if (DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl1))
     /* This is a constructor, we must ensure that any default args
        introduced by this definition are propagated to the clones
@@ -10702,8 +10798,9 @@ start_preparsed_function (tree decl1, tr
   else
     {
       /* This is a definition, not a reference.
-	 So clear DECL_EXTERNAL.  */
-      DECL_EXTERNAL (decl1) = 0;
+	 So clear DECL_EXTERNAL, unless this is a GNU extern inline.  */
+      if (!GNU_INLINE_P (decl1))
+	DECL_EXTERNAL (decl1) = 0;
 
       if ((DECL_DECLARED_INLINE_P (decl1)
 	   || DECL_TEMPLATE_INSTANTIATION (decl1))
@@ -11698,4 +11795,17 @@ cxx_comdat_group (tree decl)
   return IDENTIFIER_POINTER (name);
 }
 
+/* We want to inline __gnu_inline__ functions even if this would
+   violate inlining limits.  Some glibc and linux constructs depend on
+   such functions always being inlined when optimizing.  */
+
+int
+cp_disregard_inline_limits (tree fn)
+{
+  if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) != NULL)
+    return 1;
+
+  return (!flag_really_no_inline && GNU_INLINE_P (fn));
+}
+
 #include "gt-cp-decl.h"
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 22:37:34.000000000 +0100
+++ gcc/cp/cp-objcp-common.h	2007-08-31 13:58:32.000000000 +0200
@@ -107,6 +107,9 @@ extern tree objcp_tsubst_copy_and_build 
 #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN
 #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \
   cp_cannot_inline_tree_fn
+#undef LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS
+#define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \
+  cp_disregard_inline_limits
 #undef LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS
 #define LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS \
   cp_add_pending_fn_decls
--- gcc/doc/extend.texi.jj	2007-08-31 09:47:40.000000000 +0200
+++ gcc/doc/extend.texi	2007-08-31 13:00:28.000000000 +0200
@@ -1587,8 +1587,8 @@ refer to the single copy in the library.
 definitions of the functions need not be precisely the same, although
 if they do not have the same effect your program may behave oddly.
 
-If the function is neither @code{extern} nor @code{static}, then the
-function is compiled as a standalone function, as well as being
+In C, if the function is neither @code{extern} nor @code{static}, then
+the function is compiled as a standalone function, as well as being
 inlined where possible.
 
 This is how GCC traditionally handled functions declared
@@ -1606,6 +1606,10 @@ assume that it is always present, whethe
 In versions prior to 4.3, the only effect of explicitly including it is
 to disable warnings about using inline functions in C99 mode.
 
+In C++, this attribute does not depend on @code{extern} in any way,
+but it still requires the @code{inline} keyword to enable its special
+behavior.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/testsuite/gcc.dg/inline-24.c.jj	2007-08-31 14:11:45.000000000 +0200
+++ gcc/testsuite/gcc.dg/inline-24.c	2007-08-30 18:43:55.000000000 +0200
@@ -0,0 +1,28 @@
+/* Verify that gnu_inline inlines disregard inlining limits.  */
+/* { dg-do link } */
+/* { dg-options "-O2" } */
+
+extern int foo (int);
+extern int baz (int);
+
+extern inline __attribute__((gnu_inline))
+int foo (int x)
+{
+  int i;
+  if (!__builtin_constant_p (x))
+    {
+#define B(n) baz (1##n) + baz (2##n) + baz (3##n) \
+	     + baz (4##n) + baz (5##n) + baz (6##n)
+#define C(n) B(1##n) + B(2##n) + B(3##n) + B(4##n) + B(5##n) + B(6##n)
+#define D(n) C(1##n) + C(2##n) + C(3##n) + C(4##n) + C(5##n) + C(6##n)
+      return D(0) + D(1) + D(2) + D(3) + D(4)
+	     + D(5) + D(6) + D(7) + D(8) + D(9);
+    }
+  return 0;
+}
+
+int
+main (void)
+{
+  return foo (0);
+}
--- gcc/testsuite/g++.dg/opt/inline11.C.jj	2007-08-31 14:12:05.000000000 +0200
+++ gcc/testsuite/g++.dg/opt/inline11.C	2007-08-30 18:43:55.000000000 +0200
@@ -0,0 +1,28 @@
+/* Verify that gnu_inline inlines disregard inlining limits.  */
+/* { dg-do link } */
+/* { dg-options "-O2" } */
+
+extern int foo (int);
+extern int baz (int);
+
+extern inline __attribute__((gnu_inline))
+int foo (int x)
+{
+  int i;
+  if (!__builtin_constant_p (x))
+    {
+#define B(n) baz (1##n) + baz (2##n) + baz (3##n) \
+	     + baz (4##n) + baz (5##n) + baz (6##n)
+#define C(n) B(1##n) + B(2##n) + B(3##n) + B(4##n) + B(5##n) + B(6##n)
+#define D(n) C(1##n) + C(2##n) + C(3##n) + C(4##n) + C(5##n) + C(6##n)
+      return D(0) + D(1) + D(2) + D(3) + D(4)
+	     + D(5) + D(6) + D(7) + D(8) + D(9);
+    }
+  return 0;
+}
+
+int
+main (void)
+{
+  return foo (0);
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-global-reject.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-global-reject.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,55 @@
+/* Test __attribute__((gnu_inline)).
+
+   Check that we reject various forms of duplicate definitions.
+*/
+
+/* { dg-do compile } */
+
+#include "gnu-inline-common.h"
+
+#undef fn
+#define fn pfx(func_decl_inline_before)
+decl(inline, fn) // { dg-error "previous" "" }
+gnuindef(fn, 0) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_decl_inline_after)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+decl(inline, fn) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_def_gnuin_redef)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_redef)
+def(inline, fn, 0) // { dg-error "previous" "" }
+def(inline, fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_after)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+def(inline, fn, 1) // { dg-error "redeclare" "" }
+
+#undef fn
+#define fn pfx(func_def_inline_before)
+def(inline, fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_def_before)
+def(, fn, 0) // { dg-error "previous" "" }
+gnuindef(fn, 1) // { dg-error "redefinition" "" }
+
+#undef fn
+#define fn pfx(func_decl_static_inline_before)
+decl(static inline, fn) // { dg-error "previous" "" }
+gnuindef(fn, 0) // { dg-error "redeclared" "" }
+
+#undef fn
+#define fn pfx(func_def_static_inline_after)
+decl(static, fn)
+gnuindef(fn, 0) // { dg-error "previous" "" }
+decl(static, fn)
+def(static inline, fn, 1) // { dg-error "redeclare" "" }
--- gcc/testsuite/g++.dg/ext/gnu-inline-template-func.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-template-func.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+#define defpfx template <typename T>
+
+#include "gnu-inline-global.C"
+
+template int func1<int>(void);
+template int func2<int>(void);
+template int func3<int>(void);
+template int func4<int>(void);
+template int func5<int>(void);
--- gcc/testsuite/g++.dg/ext/gnu-inline-common.h.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-common.h	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,24 @@
+#ifndef gnu
+# define gnu_inline __attribute__((gnu_inline)) inline
+#endif
+
+#define declspec(spec, name) spec int name (void)
+#ifdef IN_CLASS
+# define decl(spec, name)
+#else
+# define decl(spec, name) defpfx declspec(spec, name);
+#endif
+#define def(spec, name, ret) defpfx declspec(spec, name) { return ret; }
+#define gnuindef(name, ret) def(gnu_inline, name, ret)
+
+#ifndef pfx
+# ifdef IN_CLASS
+#  define pfx(x) IN_CLASS::x
+# else
+#  define pfx(x) x
+# endif
+#endif
+
+#ifndef defpfx
+# define defpfx
+#endif
--- gcc/testsuite/g++.dg/ext/gnu-inline-anon-namespace.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-anon-namespace.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler-not "func1" } } */
+/* { dg-final { scan-assembler-not "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler-not "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+namespace {
+#include "gnu-inline-global.C"
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-class-static.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-class-static.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+#undef IN_CLASS
+#define IN_CLASS gnu_test_static
+
+struct IN_CLASS {
+  static int func1(void);
+  static int func2(void);
+  static int func3(void);
+  static int func4(void);
+  static int func5(void);
+};
+
+#include "gnu-inline-global.C"
--- gcc/testsuite/g++.dg/ext/gnu-inline-global.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-global.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,50 @@
+/* Test __attribute__((gnu_inline)).
+
+   Check that __attribute__((gnu_inline)) has no effect, in the
+   absence of extern and/or inline.
+
+   Check that we don't get out-of-line definitions for extern inline
+   gnu_inline functions, regardless of declarations or definitions.
+
+   Check that such functions can be overridden by out-of-line
+   definitions.
+
+ */
+
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+#include "gnu-inline-common.h"
+
+#undef fn
+#define fn pfx(func1) // must be emitted out-of-line
+gnuindef(fn, 0)
+def(, fn, 2)
+
+#undef fn
+#define fn pfx(func2) // must be emitted out-of-line
+decl(extern, fn)
+gnuindef(fn, 0)
+def(, fn, 2)
+
+#undef fn
+#define fn pfx(func3) // must not be emitted
+decl(extern, fn)
+gnuindef(fn, 0)
+
+#undef fn
+#define fn pfx(func4) // must be emitted out-of-line
+decl(extern, fn)
+gnuindef(fn, 0)
+def(, fn, 1)
+
+#undef fn
+#define fn pfx(func5) // must NOT be emitted, because it's static and unused
+decl(static, fn)
+gnuindef(fn, 0)
+def(, fn, 1)
--- gcc/testsuite/g++.dg/ext/gnu-inline-template-class.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-template-class.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+template <typename T> struct gnu_test {
+  int func1(void);
+  int func2(void);
+  int func3(void);
+  int func4(void);
+  int func5(void);
+};
+
+#define defpfx template <typename T>
+#define IN_CLASS gnu_test<T>
+
+#include "gnu-inline-global.C"
+
+template struct gnu_test<int>;
--- gcc/testsuite/g++.dg/ext/gnu-inline-namespace.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-namespace.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler-not "func5" } } */
+
+namespace gnu_test {
+#include "gnu-inline-global.C"
+}
--- gcc/testsuite/g++.dg/ext/gnu-inline-class.C.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/gnu-inline-class.C	2007-08-31 13:00:28.000000000 +0200
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */ // such that static functions are optimized out
+/* { dg-final { scan-assembler "func1" } } */
+/* { dg-final { scan-assembler "func2" } } */
+/* { dg-final { scan-assembler-not "func3" } } */
+/* { dg-final { scan-assembler "func4" } } */
+/* { dg-final { scan-assembler "func5" } } */
+
+#define IN_CLASS gnu_test
+
+struct IN_CLASS {
+  int func1(void);
+  int func2(void);
+  int func3(void);
+  int func4(void);
+  int func5(void);
+};
+
+#include "gnu-inline-global.C"

gcc41-ppc-sync-qihi.patch:

--- NEW FILE gcc41-ppc-sync-qihi.patch ---
2007-08-29  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_emit_sync): For QI or HI mode
	used_m, even if it is 32-bit aligned, adjust used_m MEM to have
	SImode and update m.  Don't run gen_lowpart_common on arbitrary
	memory address, force it to register first.

	* gcc.dg/sync-2.c (AI_ALIGN): Define if not defined.
	(AI): Add AI_ALIGN.
	* gcc.dg/sync-3.c: New test.

--- gcc/config/rs6000/rs6000.c.jj	2007-08-27 14:56:36.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2007-08-29 22:15:41.000000000 +0200
@@ -12757,14 +12757,16 @@ rs6000_emit_sync (enum rtx_code code, en
 	    ishift = GET_MODE_BITSIZE (SImode) - GET_MODE_BITSIZE (mode);
 
 	  shift = GEN_INT (ishift);
+	  used_m = change_address (used_m, SImode, 0);
 	}
       else
 	{
 	  rtx addrSI, aligned_addr;
 	  int shift_mask = mode == QImode ? 0x18 : 0x10;
 
-	  addrSI = force_reg (SImode, gen_lowpart_common (SImode,
-							  XEXP (used_m, 0)));
+	  addrSI = gen_lowpart_common (SImode,
+				       force_reg (Pmode, XEXP (used_m, 0)));
+	  addrSI = force_reg (SImode, addrSI);
 	  shift = gen_reg_rtx (SImode);
 
 	  emit_insn (gen_rlwinm (shift, addrSI, GEN_INT (3),
@@ -12777,14 +12779,14 @@ rs6000_emit_sync (enum rtx_code code, en
 				       1, OPTAB_LIB_WIDEN);
 	  used_m = change_address (used_m, SImode, aligned_addr);
 	  set_mem_align (used_m, 32);
-	  /* It's safe to keep the old alias set of USED_M, because
-	     the operation is atomic and only affects the original
-	     USED_M.  */
-	  if (GET_CODE (m) == NOT)
-	    m = gen_rtx_NOT (SImode, used_m);
-	  else
-	    m = used_m;
 	}
+      /* It's safe to keep the old alias set of USED_M, because
+	 the operation is atomic and only affects the original
+	 USED_M.  */
+      if (GET_CODE (m) == NOT)
+	m = gen_rtx_NOT (SImode, used_m);
+      else
+	m = used_m;
 
       if (GET_CODE (op) == NOT)
 	{
--- gcc/testsuite/gcc.dg/sync-2.c.jj	2006-10-05 00:25:32.000000000 +0200
+++ gcc/testsuite/gcc.dg/sync-2.c	2007-08-29 21:49:47.000000000 +0200
@@ -8,7 +8,11 @@
 extern void abort (void);
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 
-static char AI[18];
+#ifndef AI_ALIGN
+#define AI_ALIGN
+#endif
+
+static char AI[18] AI_ALIGN;
 static char init_qi[18] = { 3,5,7,9,0,0,0,0,-1,0,0,0,0,0,-1,0,0,0 };
 static char test_qi[18] = { 3,5,7,9,1,4,22,-12,7,8,9,7,1,-12,7,8,9,7 };
 
--- gcc/testsuite/gcc.dg/sync-3.c.jj	2007-08-29 21:49:59.000000000 +0200
+++ gcc/testsuite/gcc.dg/sync-3.c	2007-08-29 22:00:31.000000000 +0200
@@ -0,0 +1,10 @@
+/* { dg-do run } */
+/* { dg-require-effective-target sync_char_short } */
+/* { dg-options "-O2" } */
+/* { dg-options "-march=i486 -O2" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-mcpu=v9 -O2" { target sparc*-*-* } } */
+
+/* Test functionality of the intrinsics for 'short' and 'char'.  */
+
+#define AI_ALIGN __attribute__((__aligned__ (4)))
+#include "sync-2.c"

gcc41-ppc64-ia64-GNU-stack.patch:

--- NEW FILE gcc41-ppc64-ia64-GNU-stack.patch ---
2007-08-27  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_elf_end_indicate_exec_stack): New.
	* config/rs6000/linux64.h (TARGET_ASM_FILE_END): Use
	rs6000_elf_end_indicate_exec_stack.
	* config/ia64/ia64.c (ia64_linux_file_end): new.
	* config/ia64/linux.h (TARGET_ASM_FILE_END): Use ia64_linux_file_end.

--- gcc/config/rs6000/rs6000.c.jj	2007-06-27 12:10:19.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2007-08-27 19:27:24.000000000 +0200
@@ -638,6 +638,7 @@ static void rs6000_file_start (void);
 static unsigned int rs6000_elf_section_type_flags (tree, const char *, int);
 static void rs6000_elf_asm_out_constructor (rtx, int);
 static void rs6000_elf_asm_out_destructor (rtx, int);
+static void rs6000_elf_end_indicate_exec_stack (void) ATTRIBUTE_UNUSED;
 static void rs6000_elf_select_section (tree, int, unsigned HOST_WIDE_INT);
 static void rs6000_elf_unique_section (tree, int);
 static void rs6000_elf_select_rtx_section (enum machine_mode, rtx,
@@ -18896,6 +18897,20 @@ rs6000_elf_declare_function_name (FILE *
     }
   ASM_OUTPUT_LABEL (file, name);
 }
+
+static void
+rs6000_elf_end_indicate_exec_stack (void)
+{
+  if (TARGET_32BIT)
+    file_end_indicate_exec_stack ();
+  else
+    {
+      int saved_trampolines_created = trampolines_created;
+      trampolines_created = 0;
+      file_end_indicate_exec_stack ();
+      trampolines_created = saved_trampolines_created;
+    }
+}
 #endif
 
 #if TARGET_XCOFF
--- gcc/config/rs6000/linux64.h.jj	2006-11-08 17:53:15.000000000 +0100
+++ gcc/config/rs6000/linux64.h	2007-08-27 19:25:09.000000000 +0200
@@ -549,7 +549,7 @@ while (0)
 #undef DRAFT_V4_STRUCT_RET
 #define DRAFT_V4_STRUCT_RET (!TARGET_64BIT)
 
-#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+#define TARGET_ASM_FILE_END rs6000_elf_end_indicate_exec_stack
 
 #define TARGET_POSIX_IO
 
--- gcc/config/ia64/linux.h.jj	2006-07-14 18:00:58.000000000 +0200
+++ gcc/config/ia64/linux.h	2007-08-27 19:21:12.000000000 +0200
@@ -5,7 +5,7 @@
 
 #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
 
-#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+#define TARGET_ASM_FILE_END ia64_linux_file_end
 
 /* This is for -profile to use -lc_p instead of -lc.  */
 #undef CC1_SPEC
--- gcc/config/ia64/ia64.c.jj	2007-01-05 23:54:11.000000000 +0100
+++ gcc/config/ia64/ia64.c	2007-08-27 19:21:43.000000000 +0200
@@ -246,6 +246,8 @@ static void ia64_hpux_add_extern_decl (t
      ATTRIBUTE_UNUSED;
 static void ia64_hpux_file_end (void)
      ATTRIBUTE_UNUSED;
+static void ia64_linux_file_end (void)
+     ATTRIBUTE_UNUSED;
 static void ia64_init_libfuncs (void)
      ATTRIBUTE_UNUSED;
 static void ia64_hpux_init_libfuncs (void)
@@ -9096,4 +9098,13 @@ ia64_invalid_binary_op (int op ATTRIBUTE
   return NULL;
 }
 
+static void
+ia64_linux_file_end (void)
+{
+  int saved_trampolines_created = trampolines_created;
+  trampolines_created = 0;
+  file_end_indicate_exec_stack ();
+  trampolines_created = saved_trampolines_created;
+}
+
 #include "gt-ia64.h"


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gcc41.spec	27 Aug 2007 11:08:53 -0000	1.161
+++ gcc41.spec	1 Sep 2007 09:50:08 -0000	1.162
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 18
+%define gcc_release 20
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -142,6 +142,9 @@
 Patch28: gcc41-sparc-niagara.patch
 Patch29: gcc41-ppc-tramp.patch
 Patch30: gcc41-rh253102.patch
+Patch31: gcc41-c++-gnu_inline.patch
+Patch32: gcc41-ppc-sync-qihi.patch
+Patch33: gcc41-ppc64-ia64-GNU-stack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -455,6 +458,9 @@
 %patch28 -p0 -b .sparc-niagara~
 %patch29 -p0 -b .ppc-tramp~
 %patch30 -p0 -b .rh253102~
+%patch31 -p0 -b .c++-gnu_inline~
+%patch32 -p0 -b .ppc-sync-qihi~
+%patch33 -p0 -b .ppc64-ia64-GNU-stack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -879,7 +885,7 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortranbegin.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
-mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a .
+mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/
 mv -f $RPM_BUILD_ROOT%{_prefix}/include/mf-runtime.h include/
 
 %ifarch sparc ppc
@@ -901,9 +907,12 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortranbegin.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libmudflap{,th}.*a 64/
 ln -sf lib32/libstdc++.a libstdc++.a
 ln -sf ../lib64/libstdc++.a 64/libstdc++.a
+ln -sf lib32/libmudflap.a libmudflap.a
+ln -sf ../lib64/libmudflap.a 64/libmudflap.a
+ln -sf lib32/libmudflapth.a libmudflapth.a
+ln -sf ../lib64/libmudflapth.a 64/libmudflapth.a
 %endif
 %ifarch %{multilib_64_archs}
 mkdir -p 32
@@ -923,11 +932,14 @@
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortranbegin.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libmudflap{,th}.*a 32/
 %endif
 %ifarch sparc64 ppc64
 ln -sf ../lib32/libstdc++.a 32/libstdc++.a
 ln -sf lib64/libstdc++.a libstdc++.a
+ln -sf ../lib32/libmudflap.a 32/libmudflap.a
+ln -sf lib64/libmudflap.a libmudflap.a
+ln -sf ../lib32/libmudflapth.a 32/libmudflapth.a
+ln -sf lib64/libmudflapth.a libmudflapth.a
 %if %{build_java}
 ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
 ln -sf lib64/libgcj_bc.so libgcj_bc.so
@@ -935,6 +947,8 @@
 %else
 %ifarch %{multilib_64_archs}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflap.a 32/libmudflap.a
+ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflapth.a 32/libmudflapth.a
 %if %{build_java}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
 %endif
@@ -1211,6 +1225,10 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
@@ -1221,6 +1239,16 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_s.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
+%endif
+%ifarch sparc sparc64 ppc ppc64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
 %endif
 %dir %{_prefix}/libexec/getconf
 %{_prefix}/libexec/getconf/default
@@ -1568,27 +1596,34 @@
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
+%ifarch sparc ppc
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
+%endif
+%ifarch sparc64 ppc64
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
+%endif
+%ifnarch sparc sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
-%ifarch sparc ppc
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
-%endif
-%ifarch %{multilib_64_archs}
-%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
 %endif
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20.fc7
+- fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
+  (#270281)
+- backport __attribute__((__gnu_inline__)) support for C++
+- fix ppc/ppc64 __sync_* builtins with aligned 8 or 16-bit values
+- don't set executable flag on .note.GNU-stack on ppc64/ia64 even
+  when trampolines are used - trampolines on those architectures
+  don't need executable stack
+
 * Mon Aug 27 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-18.fc7
 - update from gcc-4_1-branch (-r124365:127672)
   - PRs c++/32112, c++/17763, rtl-optimization/32450, target/31331,



From fedora-extras-commits at redhat.com  Sat Sep  1 10:44:24 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Sep 2007 06:44:24 -0400
Subject: extras-repoclosure rc-run.py,1.27,1.28
Message-ID: <200709011044.l81AiOdX005397@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5377

Modified Files:
	rc-run.py 
Log Message:
make needsign repoid variable, too


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rc-run.py	15 Jun 2007 16:36:30 -0000	1.27
+++ rc-run.py	1 Sep 2007 10:44:20 -0000	1.28
@@ -93,7 +93,7 @@
         if a == "summary":
             reportcmd += " --mail=summary"
     elif o == "--needsign":
-        rs.AddRepo('fedora-extras-needsign','Fedora Extras Needsign',a)
+        rs.AddRepo('fedora-extras-needsign-%s'%int(now),'Fedora Extras Needsign',a)
         reportcmd += " --needsign"
     elif o == "--testing":
         withtesting = True



From fedora-extras-commits at redhat.com  Sat Sep  1 11:44:36 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 07:44:36 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.131, 1.132 sources, 1.246,
	1.247
Message-ID: <200709011144.l81BiaNd014508@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14136

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	16 Aug 2007 07:04:22 -0000	1.131
+++ .cvsignore	1 Sep 2007 11:44:03 -0000	1.132
@@ -1,96 +1,17 @@
-ooo-icons-bluecurve-OOO_1_1-9.tar.gz
-openoffice-gallery-extra.tar.bz2
-openoffice-png48x48.tar.bz2
 openoffice-template-extra.tar.bz2
-pl_PL.zip
-pt_BR.zip
-pt_PT.zip
-ru_RU.zip
-sk_SK.zip
-sl_SI.zip
-sv_SE.zip
-thes_de_DE.zip
-thes_hu_HU.zip
-uk_UA.zip
-ooo-build-cvs20040914.tar.bz2
-ooo-icons-bluecurve-OOO_1_1-10.tar.gz
-libwpd-snap-20040823.tar.gz
-ooo-build-cvs20040915.tar.bz2
 extra-templates.tar.bz2
 extra-gallery.tar.bz2
-ooo-build-cvs20040918.tar.bz2
 extra-dictionaries.tar.bz2
-ooo-build-cvs20041001.tar.bz2
-ooo-icons-bluecurve-OOO_1_1-11.tar.gz
-gnome-vfs.patch
-nb_NO-translation.gsi
-nn_NO-translation.gsi
-gu_IN-translation.gsi
-ta_IN-translation.gsi
-translation-gu_IN.gsi
-translation-ta_IN.gsi
-translation-nb_NO.gsi
-translation-nn_NO.gsi
-OOO_1_1_3.tar.bz2
-ooo-build-cvs20050121.tar.bz2
-ooo-build-cvs20050202.tar.bz2
-ooo-build-cvs20050205.tar.bz2
-SRC680_m80.tar.bz2
-Archive-Zip-1.13.tar.gz
-SRC680_m81.tar.bz2
-SRC680_m82.tar.bz2
-SRC680_m83.tar.bz2
-SRC680_m84.tar.bz2
-openoffice.org-myspell-contrib.tar.gz
-SRC680_m85.tar.bz2
-SRC680_m87.tar.bz2
-hsqldb_1_8_0_RC9.zip
-SRC680_m88.tar.bz2
-SRC680_m89.tar.bz2
-SRC680_m91.tar.bz2
-SRC680_m92.tar.bz2
 GSI_gu-IN.sdf
 GSI_kn-IN.sdf
 GSI_ta-IN.sdf
 GSI_nn.sdf
 GSI_nb.sdf
-SRC680_m93.tar.bz2
-db-3.2.9.patch
-db-3.2.9.tar.gz
-SRC680_m95.tar.bz2
-SRC680_m96.tar.bz2
-openoffice.org-jakubicons.tar.gz
-SRC680_m97.tar.bz2
-SRC680_m98.tar.bz2
-SRC680_m99.tar.bz2
-SRC680_m100.tar.bz2
-SRC680_m103.tar.bz2
-SRC680_m104.tar.bz2
 GSI_pa-IN.sdf
-SRC680_m106.tar.bz2
-GSI_ru.sdf
-SRC680_m108.tar.bz2
-SRC680_m109.tar.bz2
 GSI_bn-IN.sdf
 GSI_bn.sdf
 openoffice.org-simple-crash_report.sh
-SRC680_m110.tar.bz2
-SRC680_m111.tar.bz2
-hsqldb_1_8_0.zip
-SRC680_m112.tar.bz2
 GSI_cs.sdf
-SRC680_m113.tar.bz2
-SRC680_m114.tar.bz2
-SRC680_m115.tar.bz2
-SRC680_m116.tar.bz2
-SRC680_m117.tar.bz2
-SRC680_m118.tar.bz2
-SRC680_m119.tar.bz2
-SRC680_m120.tar.bz2
-gcj-sed.sh
-SRC680_m121.tar.bz2
-SRC680_m122.tar.bz2
-SRC680_m123.tar.bz2
 UseSystemFPicker.xcu
 RegisterAndLicence.xcu
 GSI_ga.sdf
@@ -106,4 +27,4 @@
 openoffice.org.langpack.template.tar.gz
 pa-IN-179.sdf
 unowinreg.dll
-OOG680_m1.tar.bz2
+OOG680_m3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- sources	21 Aug 2007 09:56:23 -0000	1.246
+++ sources	1 Sep 2007 11:44:03 -0000	1.247
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-258dd14f8fe05484206bc2f80d1aa5ad  OOG680_m2.tar.bz2
+c7ee60da19dc9c0cccd3c2c7559a6c51  OOG680_m3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 11:46:35 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 07:46:35 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1277,1.1278
Message-ID: <200709011146.l81BkZsl015835@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15394

Modified Files:
	openoffice.org.spec 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1277
retrieving revision 1.1278
diff -u -r1.1277 -r1.1278
--- openoffice.org.spec	29 Aug 2007 11:16:43 -0000	1.1277
+++ openoffice.org.spec	1 Sep 2007 11:46:02 -0000	1.1278
@@ -1,6 +1,6 @@
 %define oootag OOG680
-%define ooomilestone 2
-%define rh_rpm_release 4
+%define ooomilestone 3
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2746,6 +2746,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
+- release candidate
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 



From fedora-extras-commits at redhat.com  Sat Sep  1 11:52:49 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sat, 1 Sep 2007 07:52:49 -0400
Subject: rpms/libapreq2/devel libapreq2.spec,1.28,1.29
Message-ID: <200709011152.l81BqnHf016182@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16157

Modified Files:
	libapreq2.spec 
Log Message:
Get ready to rebuild against new apr.



Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libapreq2.spec	28 Aug 2007 21:17:10 -0000	1.28
+++ libapreq2.spec	1 Sep 2007 11:52:17 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc2.6%{?dist}
+Release:        0.rc2.7%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.7
+- rebuild against apr-1.2.9-3 (bug #254241)
+
 * Wed Aug 29 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.6
 - rebuild against expat 2.0.1 (bug #195888)
 



From fedora-extras-commits at redhat.com  Sat Sep  1 11:53:34 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sat, 1 Sep 2007 07:53:34 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.40, 1.41 sources, 1.41,
	1.42 sugar.spec, 1.49, 1.50
Message-ID: <200709011153.l81BrYHX016213@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16188

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	30 Aug 2007 21:42:20 -0000	1.40
+++ .cvsignore	1 Sep 2007 11:53:01 -0000	1.41
@@ -1 +1 @@
-sugar-0.65-gite65fef5c79.tar.bz2
+sugar-0.65-gitfeb462d08d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	30 Aug 2007 21:42:20 -0000	1.41
+++ sources	1 Sep 2007 11:53:01 -0000	1.42
@@ -1 +1 @@
-8609394b634b2dab85cd0527a5946bb2  sugar-0.65-gite65fef5c79.tar.bz2
+8c33fbc69907b1fc89c302c652307acc  sugar-0.65-gitfeb462d08d.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sugar.spec	30 Aug 2007 21:42:20 -0000	1.49
+++ sugar.spec	1 Sep 2007 11:53:01 -0000	1.50
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070830git
-%define commitid e65fef5c79
+%define alphatag 20070901git
+%define commitid feb462d08d
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.33.%{alphatag}e65fef5c79
+Release: 0.34.%{alphatag}feb462d08d
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.33.20070830gite65fef5c79
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep  1 12:23:22 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:23:22 -0400
Subject: rpms/dietlibc/F-7 dietlibc-0.31-defpath.patch, NONE,
	1.1 dietlibc-0.31-stacksmash-dyn.patch, NONE,
	1.1 dietlibc-0.31-stacksmash.patch, NONE, 1.1 lastver, NONE,
	1.1 verinfo, NONE, 1.1
Message-ID: <200709011223.l81CNMYq022625@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22611

Added Files:
	dietlibc-0.31-defpath.patch dietlibc-0.31-stacksmash-dyn.patch 
	dietlibc-0.31-stacksmash.patch lastver verinfo 
Log Message:
initial checkin


dietlibc-0.31-defpath.patch:

--- NEW FILE dietlibc-0.31-defpath.patch ---
diff -up dietlibc-0.31/include/paths.h.~1~ dietlibc-0.31/include/paths.h
--- dietlibc-0.31/include/paths.h.defpath
+++ dietlibc-0.31/include/paths.h
@@ -2,7 +2,7 @@
 #define _PATHS_H
 
 #define _PATH_BSHELL "/bin/sh"
-#define _PATH_DEFPATH "/bin:/usr/bin:"
+#define _PATH_DEFPATH "/bin:/usr/bin"
 
 #define _PATH_DEVNULL "/dev/null"
 

dietlibc-0.31-stacksmash-dyn.patch:

--- NEW FILE dietlibc-0.31-stacksmash-dyn.patch ---
diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.~1~	2007-09-01 14:13:21.000000000 +0200
+++ dietlibc-0.31/lib/stack_smash_handler2.c	2007-09-01 14:13:40.000000000 +0200
@@ -2,6 +2,7 @@
 #include <write12.h>
 
 void __stack_chk_fail(void);
+void __stack_chk_fail_local(void) __attribute__((__alias__("__stack_chk_fail")));
 
 /* earlier versions of ProPolice actually gave the address and function
  * name as arguments to the handler, so it could print some useful

dietlibc-0.31-stacksmash.patch:

--- NEW FILE dietlibc-0.31-stacksmash.patch ---
2007-09-01  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/stack_smash_handler2: modified __stack_chk_fail() to trigger
	a segfault by accessing address 0x0. Every system with an MMU
	known by me, segfaults by dereferencing a NULL pointer

	* Makefile: added hack to compile stack_smash_handler2 with
	'--fno-omit-frame-pointer'.

diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.stacksmash
+++ dietlibc-0.31/lib/stack_smash_handler2.c
@@ -8,5 +8,13 @@ void __stack_chk_fail(void);
  * diagnostics.  No more. :-( */
 void __stack_chk_fail(void) {
   __write2("smashed stack detected, program terminated.\n");
-  _exit(127);
+
+  /* trigger a segfault which can be inspected within a debugger (inclusive
+   * stack-trace). 'abort(3)' at this place would be too heavy weighted.
+   *
+   * TODO: limit this to systems which are known to have an MMU (resp. is
+   * dietlibc with stack-protector used on systems without an MMU?)
+   */
+  while (1)
+	  *(char *)0 = 0;
 }
--- dietlibc-0.31/Makefile.stacksmash
+++ dietlibc-0.31/Makefile
@@ -172,9 +172,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
 $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+$(OBJDIR)/stack_smash_handler2.o:	XCFLAGS:=-fno-omit-frame-pointer
 
 $(OBJDIR)/%.o: %.c
-	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+	$(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
 endif
 


--- NEW FILE lastver ---
0.31


--- NEW FILE verinfo ---
http://www.kernel.org/pub/linux/libs/dietlibc/
dietlibc-(.*?).tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 12:34:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:34:44 -0400
Subject: rpms/dietlibc/devel dietlibc-0.31-defpath.patch, NONE,
	1.1 dietlibc-0.31-stacksmash-dyn.patch, NONE,
	1.1 dietlibc-0.31-stacksmash.patch, NONE, 1.1 lastver, NONE,
	1.1 verinfo, NONE, 1.1
Message-ID: <200709011234.l81CYiHI022786@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22772

Added Files:
	dietlibc-0.31-defpath.patch dietlibc-0.31-stacksmash-dyn.patch 
	dietlibc-0.31-stacksmash.patch lastver verinfo 
Log Message:
initial checkin


dietlibc-0.31-defpath.patch:

--- NEW FILE dietlibc-0.31-defpath.patch ---
diff -up dietlibc-0.31/include/paths.h.~1~ dietlibc-0.31/include/paths.h
--- dietlibc-0.31/include/paths.h.defpath
+++ dietlibc-0.31/include/paths.h
@@ -2,7 +2,7 @@
 #define _PATHS_H
 
 #define _PATH_BSHELL "/bin/sh"
-#define _PATH_DEFPATH "/bin:/usr/bin:"
+#define _PATH_DEFPATH "/bin:/usr/bin"
 
 #define _PATH_DEVNULL "/dev/null"
 

dietlibc-0.31-stacksmash-dyn.patch:

--- NEW FILE dietlibc-0.31-stacksmash-dyn.patch ---
diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.~1~	2007-09-01 14:13:21.000000000 +0200
+++ dietlibc-0.31/lib/stack_smash_handler2.c	2007-09-01 14:13:40.000000000 +0200
@@ -2,6 +2,7 @@
 #include <write12.h>
 
 void __stack_chk_fail(void);
+void __stack_chk_fail_local(void) __attribute__((__alias__("__stack_chk_fail")));
 
 /* earlier versions of ProPolice actually gave the address and function
  * name as arguments to the handler, so it could print some useful

dietlibc-0.31-stacksmash.patch:

--- NEW FILE dietlibc-0.31-stacksmash.patch ---
2007-09-01  Enrico Scholz  <enrico.scholz at informatik.tu-chemnitz.de>
	* lib/stack_smash_handler2: modified __stack_chk_fail() to trigger
	a segfault by accessing address 0x0. Every system with an MMU
	known by me, segfaults by dereferencing a NULL pointer

	* Makefile: added hack to compile stack_smash_handler2 with
	'--fno-omit-frame-pointer'.

diff -up dietlibc-0.31/lib/stack_smash_handler2.c.~1~ dietlibc-0.31/lib/stack_smash_handler2.c
--- dietlibc-0.31/lib/stack_smash_handler2.c.stacksmash
+++ dietlibc-0.31/lib/stack_smash_handler2.c
@@ -8,5 +8,13 @@ void __stack_chk_fail(void);
  * diagnostics.  No more. :-( */
 void __stack_chk_fail(void) {
   __write2("smashed stack detected, program terminated.\n");
-  _exit(127);
+
+  /* trigger a segfault which can be inspected within a debugger (inclusive
+   * stack-trace). 'abort(3)' at this place would be too heavy weighted.
+   *
+   * TODO: limit this to systems which are known to have an MMU (resp. is
+   * dietlibc with stack-protector used on systems without an MMU?)
+   */
+  while (1)
+	  *(char *)0 = 0;
 }
--- dietlibc-0.31/Makefile.stacksmash
+++ dietlibc-0.31/Makefile
@@ -172,9 +172,10 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h
 $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c
 	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
+$(OBJDIR)/stack_smash_handler2.o:	XCFLAGS:=-fno-omit-frame-pointer
 
 $(OBJDIR)/%.o: %.c
-	$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
+	$(CROSS)$(CC) $(INC) $(CFLAGS) $(XCFLAGS) -c $< -o $@ -D__dietlibc__
 	$(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
 endif
 


--- NEW FILE lastver ---
0.31


--- NEW FILE verinfo ---
http://www.kernel.org/pub/linux/libs/dietlibc/
dietlibc-(.*?).tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 12:36:11 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 08:36:11 -0400
Subject: rpms/dietlibc/devel sources,1.6,1.7 dietlibc.spec,1.27,1.28
Message-ID: <200709011236.l81CaBt0022850@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22829

Modified Files:
	sources dietlibc.spec 
Log Message:
- updated to 0.31
- removed the no-stack-protector bits
- improved stack-smash code a little bit
- disabled dynamic lib for all arches



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jul 2006 14:18:32 -0000	1.6
+++ sources	1 Sep 2007 12:35:38 -0000	1.7
@@ -1,2 +1,2 @@
-2465d652fff6f1fad3da3b98e60e83c9  dietlibc-0.30.tar.bz2
-698d7624167aad89acfef504da0161ad  dietlibc-0.30.tar.bz2.sig
+acb98d469ee932d902fdf6de07802b7c  dietlibc-0.31.tar.bz2
+77dadb56faa06c1a5177d76806e79b28  dietlibc-0.31.tar.bz2.sig


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dietlibc.spec	17 Jan 2007 01:02:35 -0000	1.27
+++ dietlibc.spec	1 Sep 2007 12:35:38 -0000	1.28
@@ -6,7 +6,7 @@
 ##
 
 %ifarch %ix86 x86_64 arm
-%global do_dyn		1
+%global do_dyn		0
 %else
 %global do_dyn 		0
 %endif
@@ -26,8 +26,8 @@
 
 Summary:	Small libc implementation
 Name:		dietlibc
-Version:	0.30
-Release:	%release_func 4
+Version:	0.31
+Release:	%release_func 1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -35,16 +35,20 @@
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
-Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
+Patch31:	dietlibc-0.31-defpath.patch
+Patch32:	dietlibc-0.31-stacksmash.patch
+Patch33:	dietlibc-0.31-stacksmash-dyn.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
-
+%{!?with_dyn:Obsoletes:	dietlibc-lib < %version-%release}
 
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
 
 %description
 The diet libc is a libc that is optimized for small size. It can be
@@ -64,14 +68,14 @@
 %setup -q
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
-%patch20 -p1 -b .nostackprotector
 %patch30 -p1 -b .longdouble
+%patch31 -p1 -b .defpath
+%patch32 -p1 -b .stacksmash
+%patch33 -p1 -b .stacksmash-dyn
 
 sed -i -e 's!strip !: !g' Makefile
-sed -i -e 's!^#define WANT_SSP$!// \0!g;
-           s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 
@@ -90,7 +94,7 @@
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
-
+rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
 %clean
@@ -116,6 +120,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
+- updated to 0.31
+- removed the no-stack-protector bits
+- improved stack-smash code a little bit
+- disabled dynamic lib for all arches
+
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:08:04 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 1 Sep 2007 09:08:04 -0400
Subject: rpms/sepostgresql/devel sepostgresql-8.2.4-0.434.patch, NONE,
	1.1 sepostgresql-fedora-prefix.patch, NONE, 1.1 sepostgresql.8,
	NONE, 1.1 sepostgresql.fc, NONE, 1.1 sepostgresql.if, NONE,
	1.1 sepostgresql.init, NONE, 1.1 sepostgresql.spec, NONE,
	1.1 sepostgresql.te, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011308.l81D84Hg029482@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29424/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sepostgresql-8.2.4-0.434.patch 
	sepostgresql-fedora-prefix.patch sepostgresql.8 
	sepostgresql.fc sepostgresql.if sepostgresql.init 
	sepostgresql.spec sepostgresql.te 
Log Message:
import sepostgresql-8.2.4-0.434 as the initial version in Fedora rawhide


sepostgresql-8.2.4-0.434.patch:

--- NEW FILE sepostgresql-8.2.4-0.434.patch ---
diff -rpNU3 postgresql-8.2.4/configure.in sepostgresql-8.2.4/configure.in
--- postgresql-8.2.4/configure.in	2007-04-20 12:20:42.000000000 +0900
+++ sepostgresql-8.2.4/configure.in	2007-04-29 13:49:53.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.4/doc/postgres.tar.gz and sepostgresql-8.2.4/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.4/src/Makefile.global.in sepostgresql-8.2.4/src/Makefile.global.in
--- postgresql-8.2.4/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.4/src/backend/Makefile sepostgresql-8.2.4/src/backend/Makefile
--- postgresql-8.2.4/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.4/src/backend/access/common/heaptuple.c sepostgresql-8.2.4/src/backend/access/common/heaptuple.c
--- postgresql-8.2.4/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.4/src/backend/access/heap/heapam.c sepostgresql-8.2.4/src/backend/access/heap/heapam.c
--- postgresql-8.2.4/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
 		TransactionId xid[2];	/* xmax, xmin */
[...8179 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.4/src/include/utils/syscache.h sepostgresql-8.2.4/src/include/utils/syscache.h
--- postgresql-8.2.4/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.4/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);

sepostgresql-fedora-prefix.patch:

--- NEW FILE sepostgresql-fedora-prefix.patch ---
Index: trunk/src/Makefile.global.in
===================================================================
--- trunk/src/Makefile.global.in	(revision 430)
+++ trunk/src/Makefile.global.in	(working copy)
@@ -73,14 +73,14 @@
 datadir := @datadir@
 ifeq "$(findstring pgsql, $(datadir))" ""
 ifeq "$(findstring postgres, $(datadir))" ""
-override datadir := $(datadir)/postgresql
+override datadir := $(datadir)/sepgsql
 endif
 endif
 
 sysconfdir := @sysconfdir@
 ifeq "$(findstring pgsql, $(sysconfdir))" ""
 ifeq "$(findstring postgres, $(sysconfdir))" ""
-override sysconfdir := $(sysconfdir)/postgresql
+override sysconfdir := $(sysconfdir)/sepgsql
 endif
 endif
 
@@ -89,7 +89,7 @@
 pkglibdir = $(libdir)
 ifeq "$(findstring pgsql, $(pkglibdir))" ""
 ifeq "$(findstring postgres, $(pkglibdir))" ""
-override pkglibdir := $(pkglibdir)/postgresql
+override pkglibdir := $(pkglibdir)/sepgsql
 endif
 endif
 
@@ -98,7 +98,7 @@
 pkgincludedir = $(includedir)
 ifeq "$(findstring pgsql, $(pkgincludedir))" ""
 ifeq "$(findstring postgres, $(pkgincludedir))" ""
-override pkgincludedir := $(pkgincludedir)/postgresql
+override pkgincludedir := $(pkgincludedir)/sepgsql
 endif
 endif
 
@@ -109,7 +109,7 @@
 ifneq (,$(docdir))
 ifeq "$(findstring pgsql, $(docdir))" ""
 ifeq "$(findstring postgres, $(docdir))" ""
-override docdir := $(docdir)/postgresql
+override docdir := $(docdir)/sepgsql
 endif
 endif
 endif
Index: trunk/src/bin/pg_ctl/pg_ctl.c
===================================================================
--- trunk/src/bin/pg_ctl/pg_ctl.c	(revision 429)
+++ trunk/src/bin/pg_ctl/pg_ctl.c	(working copy)
@@ -557,7 +557,7 @@
 
 		postmaster_path = pg_malloc(MAXPGPATH);
 
-		if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,
+		if ((ret = find_other_exec(argv0, "sepostgres", PM_VERSIONSTR,
 								   postmaster_path)) < 0)
 		{
 			char		full_path[MAXPGPATH];
Index: trunk/src/bin/initdb/initdb.c
===================================================================
--- trunk/src/bin/initdb/initdb.c	(revision 429)
+++ trunk/src/bin/initdb/initdb.c	(working copy)
@@ -2646,7 +2646,7 @@
 	sprintf(pgdenv, "PGDATA=%s", pg_data);
 	putenv(pgdenv);
 
-	if ((ret = find_other_exec(argv[0], "postgres", PG_VERSIONSTR,
+	if ((ret = find_other_exec(argv[0], "sepostgres", PG_VERSIONSTR,
 							   backend_exec)) < 0)
 	{
 		char		full_path[MAXPGPATH];
Index: trunk/src/bin/pg_dump/pg_dumpall.c
===================================================================
--- trunk/src/bin/pg_dump/pg_dumpall.c	(revision 429)
+++ trunk/src/bin/pg_dump/pg_dumpall.c	(working copy)
@@ -139,7 +139,7 @@
 		}
 	}
 
-	if ((ret = find_other_exec(argv[0], "pg_dump", PGDUMP_VERSIONSTR,
+	if ((ret = find_other_exec(argv[0], "sepg_dump", PGDUMP_VERSIONSTR,
 							   pg_dump_bin)) < 0)
 	{
 		char		full_path[MAXPGPATH];


--- NEW FILE sepostgresql.8 ---
.TH "sepostgresql" "8" "Jul 15 2007" "kaigai at kaigai.gr.jp" "Security-Enhanced PostgreSQL"

.SH "NAME"
sepostgresql \- Security-Enhances PostgreSQL

.SH "DESCRIPTION"
Security-Enhanced PostgreSQL (SE-PostgreSQL) is an enhancement of PostgreSQL, to apply fine grained mandatory access control for database objects based on the security policy of SELinux. 
These features enable to apply flexible integrated access control policy between operating system and database management system, during all stages of the life of the information.
.PP
This document describes the way to customize SE-PostgreSQL on the default security policy.

.SH "BOOLEANS"
The SELinux policy is customizable via BOOLEAN variable. This variable has two states, 1 (on) or 0 (off). A part of the policy is enabled or disabled depending on related boolean variables.

\fBsepgsql_enable_unconfined\fP toggles whether \fIunconfined_t\fP and \fIsysadm_t\fP domains are allowed to access database objects without any restruction on type enforcement, or not.
When \fIsepgsql_enable_unconfined\fP is off, those domains are also restricted its operation as other domains begin applied. In the default, it is set to on.
You can set it as follows:

.EX
setsebool -P sepgsql_enable_unconfined ( \fBon\fP | off )
.EE

\fBsepgsql_enable_users_ddl\fP toggles whether non-administrative domain is allowed to use DDL statement like CREATE TABLE and so on.
In the default, it is set to on. You can set it as follows:

.EX
setsebool -P sepgsql_enable_users_ddl ( \fBon\fP | off )
.EE

\fBsepgsql_enable_auditallow\fP toggles output of audit messages in the case when required permission checks are allowed. In the default, it is set to off. You can set it as follows:

.EX
setsebool -P sepgsql_enable_auditallow ( on | \fBoff\fP )
.EE

\fBsepgsql_enable_auditdeny\fP toggles output of audit messages in the case when required permission checks are denied. In the default, it is set to on. You can set it as follows:

.EX
setsebool -P sepgsql_enable_auditdeny ( \fBon\fP | off )
.EE

\fBsepgsql_enable_audittuple\fP toggles output of audit messages for any tuple. Because audit messages for tuples in a large size table can cause flood of messages, we can set \fIsepgsql_enable_audittuple\fP independently from any other object classes.
Audit messages for tuples are generated in the only case when \fIsepgsql_enable_audittuple\fP and either \fIsepgsql_enable_auditallow\fP or \fIsepgsql_enable_auditdeny\fP are enabled.
In the default, it is set to off. You can set it as follows:

.EX
setsebool -P sepgsql_enable_audittuple ( on | \fBoff\fP )
.EE

.SH "TYPES"

\fBsepgsql_db_t\fP is a only type for database itself.
It is attched for newly created databases in the default.

\fBsepgsql_table_t\fP is a type for tables, columns and tuples.
It is attached for newly created the objects in the default.
Non-administrative clients can do any kinds of operations except for relabeling.

\fBsepgsql_secret_table_t\fP is a type for tables, columns and tuples.
Non-administrative clients cannot access the objects with this type.

\fBsepgsql_ro_table_t\fP is a type for read-only tables, columns and tuples.
Non-administrative clients cannot modify the objects with this type.

\fBsepgsql_fixed_table_t\fP is a type for non-manupulatable tables, columns and tuples.
Non-administrative clients cannot update or delete the objects with this type.

\fBsepgsql_proc_t\fP is a type for procedures.
It is attached for newly created procedures by adminictrative domain.
Any client can call these procedures with this type.

\fBsepgsql_userproc_t\fP is a type for procedures.
It is attached for newly created procedures by non-administrative domain.
Administrative domains cannot call the procedure for safety. He have to relabel it into \fIsepgsql_proc_t\fP at first. It is a policy to avoid to execute doubtful code under administrative domain.

\fBsepgsql_trusted_proc_t\fP is a type for trusted procedures.
Calling procedures with this type invokes domain transition.
Then the function works as an administrative domain, so database administrator can provide limited path to access protected object.

\fBsepgsql_blob_t\fP is a type for binary large objects (blob).
It is attached for newly created blob in the default.
Non-administrative clients can read and write the blobs with this type.

\fBsepgsql_ro_blob_t\fP is a type for read-only binary large objects (blob).
Non-administrative clients cannot write the blobs with this type.

.SH "BACKUP and RESTORE"
\fI--enable-selinux\fP option in \fBsepg_dump\fP and \fBsepg_dumpall\fP enable to dump database image with security context. We can restore the dumped image using the standard \fIpg_restore\fP and so on.

.EX
Example)
$ sepg_dump -Ft -b --enable-selinux postgres | gzip -c > postgres.tgz
.EE

.SH AUTHOR	
This manual page was written by KaiGai Kohei <kaigai at kaigai.gr.jp>

.SH "SEE ALSO"

selinux(8), boolean(8)


--- NEW FILE sepostgresql.fc ---
#
# SE-PostgreSQL install path
#
/usr/bin/sepostgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
/usr/bin/initdb.sepgsql		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
/usr/bin/sepg_ctl		--	gen_context(system_u:object_r:initrc_exec_t,s0)

/var/lib/sepgsql(/.*)?			gen_context(system_u:object_r:postgresql_db_t,s0)
/var/lib/sepgsql/pgstartup\.log		gen_context(system_u:object_r:postgresql_log_t,s0)
/var/log/sepostgresql\.log.*	--	gen_context(system_u:object_r:postgresql_log_t,s0)


--- NEW FILE sepostgresql.if ---
########################################
## <summary>
##     marks as a server process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     Type marked as a database object type.
##     </summary>
## </param>
#
interface(`sepgsql_server_domain',`
	gen_require(`
		attribute sepgsql_server_type;
	')
	typeattribute $1 sepgsql_server_type;
')

########################################
## <summary>
##     Marks as a SE-PostgreSQL loadable shared library module
## </summary>
## <param name="type">
##     <summary>
##     Type marked as a database object type.
##     </summary>
## </param>
#
interface(`sepgsql_module_object',`
	gen_require(`
		attribute sepgsql_module_type;
	')
	typeattribute $1 sepgsql_module_type;
')

########################################
## <summary>
##     marks as a administrative client process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     A domain marked as a administrative client domain
##     </summary>
## </param>
#
interface(`sepgsql_unconfined_domain',`
	gen_require(`
		attribute sepgsql_admin_domain;
		attribute sepgsql_users_domain;
	')
	typeattribute $1 sepgsql_admin_domain;
	typeattribute $1 sepgsql_users_domain;
')

########################################
## <summary>
##     marks as a generic client process of SE-PostgreSQL.
## </summary>
## <param name="type">
##     <summary>
##     A domain marked as a generic client domain
##     </summary>
## </param>
#
interface(`sepgsql_client_domain',`
	gen_require(`
		attribute sepgsql_users_domain;
	')
	typeattribute $1 sepgsql_users_domain;
')


--- NEW FILE sepostgresql.init ---
#!/bin/sh
# sepostgresql	This is the init script for starting up SE-PostgreSQL
#
# chkconfig: - 62 38
# description: Starts and stops the SE-PostgreSQL backend daemon
# processname: postmaster
# pidfile: /var/run/postmaster.pid
#---------------------------------------------------------------------

PGVERSION="8.2.4"
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
SEPGVERSION="0.434"

# source function library
. /etc/rc.d/init.d/functions

# get config
. /etc/sysconfig/network

# find the name of the script
NAME=`basename $0`
if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then
    NAME=${NAME:3}
fi

# set defaults for configurable variables
SEPGSQL_BIN="/usr/bin"
SEPGSQL_DATA="/var/lib/sepgsql/data"
SEPGSQL_OPTS="-i -p 5432"
SEPGSQL_STARTUP_LOG="/var/lib/sepgsql/pgstartup.log"
SEPGSQL_LOG="/var/log/sepostgresql.log"
SEPGSQL_FALLBACK_CONTEXT="user_u:user_r:user_t"

# override defaults from /etc/sysconfig/sepostgresql
test -f /etc/sysconfig/${NAME} && . /etc/sysconfig/${NAME}

export SEPGSQL_FALLBACK_CONTEXT

# Check that networking is up.
test "${NETWORKING}" = "no" && exit 0
test -f "${SEPGSQL_BIN}/postmaster" || exit 1

script_result=0

do_start() {
    PSQL_START=$"Starting ${NAME} service: "
    echo -n "$PSQL_START"

    # make sure startup-time log file is valid
    if [ ! -e "${SEPGSQL_STARTUP_LOG}" -a ! -h "${SEPGSQL_STARTUP_LOG}" ]; then
        touch "${SEPGSQL_STARTUP_LOG}" || exit 1
        chown sepgsql:sepgsql "${SEPGSQL_STARTUP_LOG}"
        chmod 600 "${SEPGSQL_STARTUP_LOG}"
        /sbin/restorecon "${SEPGSQL_STARTUP_LOG}"
    fi
    
    # check for the SEPGSQL_DATA structure
    if [ -f "${SEPGSQL_DATA}/PG_VERSION" ] && [ -d "${SEPGSQL_DATA}/base" ]; then
        if [ x`cat "${SEPGSQL_DATA}/PG_VERSION"` != x"${PGMAJORVERSION}" ]; then
            echo_failure
            echo
            echo "HINT: An old version of the database format was found."
            echo "HINT: You need to upgrade the data format before using SE-PostgreSQL."
            exit 1
        fi
    else
        echo_failure
        echo
        echo "HINT: ${SEPGSQL_DATA} is missing."
        echo "HINT: Use '/etc/init.d/${NAME} initdb'"
        echo "HINT:   to initialize the database cluster first."
        exit 1
    fi

    # make sure SEPGSQL_LOG
    touch ${SEPGSQL_LOG}
    chown sepgsql:sepgsql ${SEPGSQL_LOG}
    chmod 600 ${SEPGSQL_LOG}
    test -x /sbin/restorecon && /sbin/restorecon ${SEPGSQL_LOG}

    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -c "./sepg_ctl -l ${SEPGSQL_LOG} -D ${SEPGSQL_DATA} -o '${SEPGSQL_OPTS}' start" \
        >> ${SEPGSQL_STARTUP_LOG} 2>&1 < /dev/null
    sleep 1
    PID=`/sbin/runuser sepgsql -c "./sepg_ctl -D ${SEPGSQL_DATA} status 2>/dev/null \
	| sed 's/^.*PID: //g' | sed 's/[^0-9].*$//g'"`
    if [ ${PIPESTATUS[0]} -eq 0 ]; then
        echo "$PID" > "/var/run/${NAME}.pid"
        touch "/var/lock/subsys/${NAME}.lock"
        echo_success
    else
        script_result=1
        echo_failure
    fi
    echo
}

do_stop() {
    echo -n $"Stopping ${NAME} service: "
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -c "./sepg_ctl -D ${SEPGSQL_DATA} stop" \
        >> ${SEPGSQL_STARTUP_LOG} 2>&1 < /dev/null
    ret=$?
    if [ $ret -eq 0 ]; then
        echo_success
    else
        echo_failure
        script_result=1
    fi
    echo
    rm -f "/var/run/${NAME}.pid"
    rm -f "/var/lock/subsys/${NAME}.lock"
}

do_status() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" 2>/dev/null \
        | head -1 | sed "s/^sepg_ctl:/${NAME}:/g"

    if [ ${PIPESTATUS[0]} -ne 0 ]; then
        script_result=3
        test -e "/var/run/${NAME}.pid"          && script_result=1
        test -e "/var/lock/subsys/${NAME}.lock" && script_result=2
    fi
}

do_condrestart() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" &>/dev/null && do_stop && do_start
}

do_condstop() {
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} status" &>/dev/null && do_stop
}

do_reload() {
    echo -n $"Reloading ${NAME} service: "
    cd ${SEPGSQL_BIN}
    /sbin/runuser sepgsql -- -c "./sepg_ctl -D ${SEPGSQL_DATA} reload" &>/dev/null < /dev/null
    if [ $? -eq 0 ]; then
        echo_success
    else
        echo_failure
        script_result=1
    fi
    echo
}

do_initdb() {
    echo -n $"Initializing database: "

    if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
	echo_failure
	echo
	echo "HINT: Data directory is not empty"
	script_result=1
    else
	if [ ! -e "${SEPGSQL_DATA}" -a ! -h "${SEPGSQL_DATA}" ]; then
	    mkdir -p "${SEPGSQL_DATA}" || exit 1
	    chown sepgsql:sepgsql "${SEPGSQL_DATA}"
	    chmod 600 "${SEPGSQL_DATA}"
	fi
	# cleanup SELinux labeling for "${SEPGSQL_DATA}"
	test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
	# Initialize the database
        cd ${SEPGSQL_BIN}
	/sbin/runuser -- sepgsql -c "./initdb.sepgsql -A 'ident sameuser' ${SEPGSQL_DATA}" \
	    >> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
	if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
	    echo_success
	else
	    echo_failure
	    script_result=1
	fi
	echo
    fi
}

# see how we were called.
case "$1" in
    start)
        do_start
	;;
    stop)
        do_stop
	;;
    status)
	do_status
	;;
    restart)
	do_stop
	do_start
	;;
    condrestart)
        do_condrestart
	;;
    condstop)
        do_condstop
	;;
    reload|force-reload)
        do_reload
	;;
    initdb)
        do_initdb
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload|initdb}"
        exit 1
    ;;
esac

exit $script_result


--- NEW FILE sepostgresql.spec ---
#
# Security Enhanced PostgreSQL (SE-PostgreSQL)
#
# Copyright 2007 KaiGai Kohei <kaigai at kaigai.gr.jp>
# -----------------------------------------------------

# SELinux policy types
%define selinux_variants mls strict targeted

# SE-PostgreSQL status extension
%{!?sepgextension:%define sepgextension .beta}

Summary: Security Enhanced PostgreSQL
Name: sepostgresql
Version: 8.2.4
Release: 0.434%{?sepgextension}%{?dist}
License: BSD
Group: Applications/Databases
Url: http://code.google.com/p/sepgsql/
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
Source1: sepostgresql.init
Source2: sepostgresql.if
Source3: sepostgresql.te
Source4: sepostgresql.fc
Source5: sepostgresql.8
Patch0: sepostgresql-8.2.4-0.434.patch
Patch1: sepostgresql-fedora-prefix.patch
BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
Requires(pre): shadow-utils
Requires(post): policycoreutils /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): policycoreutils
Requires: postgresql-server = %{version}
Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.13 selinux-policy >= 3.0.6

%description
Security Enhanced PostgreSQL is an extension of PostgreSQL
based on SELinux security policy, that applies fine grained
mandatory access control to many objects within the database,
and takes advantage of user authorization integrated within
the operating system. SE-PostgreSQL works as a userspace
reference monitor to check any SQL query.

%prep
%setup -q -n postgresql-%{version}
%patch0 -p1
%patch1 -p1
mkdir selinux-policy
cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} selinux-policy

%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS

# build Binary Policy Module
pushd selinux-policy
for selinuxvariant in %{selinux_variants}
do
    make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile
    mv %{name}.pp %{name}.pp.${selinuxvariant}
    make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean
done
popd

# build SE-PostgreSQL
autoconf
%configure      --disable-rpath                 \
                --enable-selinux                \
%if %{defined sepgextension}
                --enable-debug                  \
                --enable-cassert                \
%endif
                --libdir=%{_libdir}/sepgsql     \
                --datadir=%{_datadir}/sepgsql

# parallel build, if possible
SECCLASS_DB_DATABASE=`grep ^define %{_datadir}/selinux/devel/include/support/all_perms.spt | cat -n | grep all_db_database_perms | awk '{print $1}'`
make CUSTOM_COPT="-D SECCLASS_DB_DATABASE=${SECCLASS_DB_DATABASE}" %{?_smp_mflags}

%install
rm -rf %{buildroot}

pushd selinux-policy
for selinuxvariant in %{selinux_variants}
do
    install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
    install -p -m 644 %{name}.pp.${selinuxvariant} \
        %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{name}.pp
done
popd

make DESTDIR=%{buildroot}  install

# avoid to conflict with native postgresql package
mv %{buildroot}%{_bindir}  %{buildroot}%{_bindir}.orig
install -d %{buildroot}%{_bindir}
mv %{buildroot}%{_bindir}.orig/initdb        %{buildroot}%{_bindir}/initdb.sepgsql
mv %{buildroot}%{_bindir}.orig/pg_ctl        %{buildroot}%{_bindir}/sepg_ctl
mv %{buildroot}%{_bindir}.orig/postgres      %{buildroot}%{_bindir}/sepostgres
mv %{buildroot}%{_bindir}.orig/pg_dump       %{buildroot}%{_bindir}/sepg_dump
mv %{buildroot}%{_bindir}.orig/pg_dumpall    %{buildroot}%{_bindir}/sepg_dumpall

# /usr/lib/sepgsql
mv %{buildroot}%{_libdir}/sepgsql  %{buildroot}%{_libdir}/sepgsql.orig
install -d %{buildroot}%{_libdir}/sepgsql
mv %{buildroot}%{_libdir}/sepgsql.orig/*_and_*.so  %{buildroot}%{_libdir}/sepgsql
mv %{buildroot}%{_libdir}/sepgsql.orig/plpgsql.so  %{buildroot}%{_libdir}/sepgsql

# remove unnecessary files
rm -rf %{buildroot}%{_bindir}.orig
rm -rf %{buildroot}%{_libdir}/sepgsql.orig
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_usr}/doc
rm -rf %{buildroot}%{_datadir}/sepgsql/timezone
rm -rf %{buildroot}%{_mandir}

# /var/lib/sepgsql
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql/data
install -d -m 700 %{buildroot}%{_localstatedir}/lib/sepgsql/backups

# /etc/rc.d/init.d/*
mkdir -p %{buildroot}%{_initrddir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sepostgresql

# /usr/share/man/*
mkdir -p %{buildroot}%{_mandir}/man8
install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man8

%clean
rm -rf %{buildroot}

%pre
getent group  sepgsql >/dev/null || groupadd -r sepgsql
getent passwd sepgsql >/dev/null || \
    useradd -r -g sepgsql -d %{_localstatedir}/lib/sepgsql -s /bin/bash \
            -c "SE-PostgreSQL server" sepgsql
exit 0

%post
/sbin/chkconfig --add %{name}
/sbin/ldconfig

for selinuxvariant in %{selinux_variants}
do
    %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue;

    %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \
        %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || :
    %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{name}.pp >& /dev/null || :
done

# Fix up non-standard file contexts
/sbin/fixfiles -R %{name} restore || :
/sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :

%preun
if [ $1 -eq 0 ]; then           # rpm -e case
    /sbin/service %{name} condstop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi

%postun
/sbin/ldconfig
if [ $1 -ge 1 ]; then           # rpm -U case
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
if [ $1 -eq 0 ]; then           # rpm -e case
    for selinuxvariant in %{selinux_variants}
    do
        %{_sbindir}/semodule -s ${selinuxvariant} -l >& /dev/null || continue;

        %{_sbindir}/semodule -s ${selinuxvariant} -l | egrep -q '^%{name}' && \
            %{_sbindir}/semodule -s ${selinuxvariant} -r %{name} >& /dev/null || :
    done
    /sbin/fixfiles -R %{name} restore || :
    test -d %{_localstatedir}/lib/sepgsql && /sbin/restorecon -R %{_localstatedir}/lib/sepgsql || :
fi

%files
%defattr(-,root,root,-)
%doc COPYRIGHT README HISTORY
%{_initrddir}/sepostgresql
%{_bindir}/initdb.sepgsql
%{_bindir}/sepg_ctl
%{_bindir}/sepostgres
%{_bindir}/sepg_dump
%{_bindir}/sepg_dumpall
%{_mandir}/man8/sepostgresql.*
%dir %{_libdir}/sepgsql
%{_libdir}/sepgsql/plpgsql.so
%{_libdir}/sepgsql/*_and_*.so
%dir %{_datadir}/sepgsql
%{_datadir}/sepgsql/postgres.bki
%{_datadir}/sepgsql/postgres.description
%{_datadir}/sepgsql/postgres.shdescription
%{_datadir}/sepgsql/system_views.sql
%{_datadir}/sepgsql/*.sample
%{_datadir}/sepgsql/timezonesets/
%{_datadir}/sepgsql/conversion_create.sql
%{_datadir}/sepgsql/information_schema.sql
%{_datadir}/sepgsql/sql_features.txt
%attr(644,root,root) %{_datadir}/selinux/*/sepostgresql.pp
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups

%changelog
* Thu Aug 28 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.434.beta
- add Requires: postgresql-server, instead of Conflicts: tag
  (Some sharable files are removed from sepostgresql package)

* Fri Aug 24 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.429.beta
- add policycoreutils to Requires(post/postun)
- upstreamed selinux-policy got SE-PostgreSQL related object classes definition.

* Sat Aug 18 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.427.beta
- sepg_dumpall uses /usr/bin/sepg_dump

* Fri Aug 17 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.423.beta
- fix policy not to execute sepgsql_user_proc_t from administrative domain

* Fri Aug 10 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.418.beta
- object classes are renamed with "db_" prefix
- /etc/init.d/sepostgresql script is improved.

* Thu Aug 2 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.409.beta
- specfile updated based on the following comments
  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=249522#c5

* Mon Jul 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.407.beta
- fix spec file based on Fedora reviewing process
- add rawhide support

* Mon Jul 23 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.402.beta
- add manpage of sepostgresql
- fix specfile convention for Fedora suitable

* Sun Jul 15 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.398.beta
- SECCLASS_DATABASE is updated (fc7->62, fc6->61)

* Sun Jul  1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.391.beta
- Mark as a beta version.

* Sat Jun 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.384.alpha
- add fallback context support with $SEPGSQL_FALLBACK_CONTEXT
- add sepgsql_enable_users_ddl boolean to restrict sepgsql_sysobj_t
- BUGFIX: incorrect inherited attribute expanding for RECORD type (attno=0)
- BUGFIX: trigger functions were not checked in COPY FROM statement

* Tue Jun 26 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.376.alpha
- add pgaceExecutorStart() to hook ExecutorStart()

* Mon Jun 25 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.372.alpha
- add table name prefix for column name on audit messages
- use security_label_raw_in as an alternative for security_label_in
- add hook for query execution path with SPI_ interface
- add trigger function suppoer
- BUGFIX: remove unnecessary checks for COPY TO/FROM on non-table relation
- BUGFIX: remove unnecessary checks for LOCK on non-table relation
- BUGFIX: incorrect object id for tuples within pg_security
- BUGFIX: CommandCounterIncrement() might be called during heap_create_with_catalog.
- BUGFIX: correct self-deadlock
- update security policy: sepgsql_sysobj_t, sepgsql_user_proc_t, sepgsql_ro_blob_t

* Tue Jun 19 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.351.alpha
- BUGFIX: sepgsql_compute_avc_datum() accessed userspace AVC without
          holding any lock.
- improve build scripts.

* Sat Jun 16 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.320.alpha
- update: sepostgresql.pp security policy fot strict/mls suitable
- BUGFIX: column:drop evaluation for ALTER TABLE tbl DROP col; statement
- add --enable-security option for pg_dumpall command
- add {use} permission for table/column/tuple object classes

* Tue May 29 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.306.alpha
- BUGFIX: RangeTblEntry->requiredPerms are polluted.

* Sun May 27 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.304.alpha
- add support for dynamic object class/access vector mapping
- BUGFIX: Lack of implicit labeling on COPY FROM statement for system catalogs
- BUGFIX: Incorrect security context handling for inherited tables

* Fri May 25 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.292.alpha
- add pg_dump/pg_dumpall/pg_restore with --enable-security option
- add support on OUTER JOIN by rewriting query.
- add security_context support on COPY TO/FROM statement
- add unlabeled security context support (enable to obtain /selinux/initial_contexts/*)
- BUGFIX: lack of checks on JOIN ON condition
- BUGFIX: pseudo relation object (sequence, toast, ...) are not handled as database obj.
- BUGFIX: lack of tuple:insert checks at COPY FROM statement
- BUGFIX: server crash when CREATE TABLE command with newly defined CONTEXT = '...'.

* Wed May 16 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.266.alpha
- BUGFIX: incorrect security context of newly generated system object.
- BUGFIX: missing error text when audit log is disabled.
- BUGFIX: incorrect Oid of newly generated tuples within pg_security.
- BUGFIX: sepgsql_enable_audittuple is misconditioned.
- add checks for T_RowExpr/T_RowCompareExpr/T_BooleanTest
                 T_DistinctExpr/T_ConvertRowtypeExpr
- add support CONTEXT = 'xxx' for CREATE TABLE/FUNCTION/DATABASE statement

* Sun Apr 30 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.240.alpha
- update base version 8.2.3 -> 8.2.4
- BUGFIX: unexpected expose in OUTER JOIN statement.
          add rewrite OUTER JOIN into SUBQUERY to ensure filtering violated tuples.
- BUGFIX: strange operation in text_to_security_label()
- BUGFIX: infinite recursive call on security label -> oid mapping
- BUGFIX: sepgsql_avc_init() is called in policy state monitoring process
          to avoid nonsense initialization of avc_shmem.

* Fri Apr 27 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.232.alpha
- object class numbers were redefined. (SECCLASS_DATABASE got into 61)
- is_selinux_enabled() was cached on the shared memory segment.
- BUGFIX: server went into infinit loop on foreign key constraint.

* Mon Apr 16 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.226.alpha
- BUGFIX: cases when several variables with same type in a single table

* Sat Apr 07 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.214.alpha
- add the first implementation of SE-PostgreSQL on PGACE framework

* Wed Mar 21 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.212.alpha
- BUGFIX: SetOperation didn't handle its subquery correctly.
  So, it caused server crash.

* Wed Mar 07 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.209.alpha
- BUGFIX: var->varlevelsup was ignored, so outer references
  from subqueries cause a fault.

* Tue Feb 27 2007 <kaigai at kaigai.gr.jp> - 8.2.3-0.178.alpha
- Initial RPM build


--- NEW FILE sepostgresql.te ---
policy_module(sepostgresql, 0.434)

gen_require(`
	all_userspace_class_perms

	type postgresql_t;
	type lib_t, shlib_t;
	type unlabeled_t;

	attribute domain;
	attribute file_type;
')

########################################
#
# Declarations
#

# ---- Booleans ----
gen_tunable(sepgsql_enable_unconfined, true)
gen_tunable(sepgsql_enable_auditallow, false)
gen_tunable(sepgsql_enable_auditdeny,  true)
gen_tunable(sepgsql_enable_audittuple, false)
gen_tunable(sepgsql_enable_users_ddl,  true)

# ---- Database client type ----
attribute sepgsql_admin_domain;
attribute sepgsql_users_domain;

# ---- Database object type ----
attribute sepgsql_server_type;
attribute sepgsql_database_type;
attribute sepgsql_table_type;
attribute sepgsql_procedure_type;
attribute sepgsql_blob_type;
attribute sepgsql_module_type;

#---------------------------------------
# SE-PostgreSQL userspace-managed objects

# for database class
type sepgsql_db_t,		sepgsql_database_type;

# for table/column/tuple class
type sepgsql_table_t,		sepgsql_table_type;
type sepgsql_sysobj_t,		sepgsql_table_type;
type sepgsql_secret_table_t,	sepgsql_table_type;
type sepgsql_ro_table_t,	sepgsql_table_type;
type sepgsql_fixed_table_t,	sepgsql_table_type;

# for procedure class
type sepgsql_proc_t,		sepgsql_procedure_type;
type sepgsql_user_proc_t,	sepgsql_procedure_type;
type sepgsql_trusted_proc_t,	sepgsql_procedure_type;

# for blob class
type sepgsql_blob_t,		sepgsql_blob_type;
type sepgsql_ro_blob_t,		sepgsql_blob_type;
type sepgsql_secret_blob_t,	sepgsql_blob_type;

#---------------------------------------
# SE-PostgreSQL trusted procedure domain
type sepgsql_trusted_domain_t;
domain_type(sepgsql_trusted_domain_t)
sepgsql_unconfined_domain(sepgsql_trusted_domain_t)

#---------------------------------------
# SE-PostgreSQL loadable shared library modules
sepgsql_module_object(lib_t)
sepgsql_module_object(shlib_t)

#---------------------------------------
# unlabeled object (unlabeled_t)
typeattribute unlabeled_t sepgsql_database_type;
typeattribute unlabeled_t sepgsql_table_type;
typeattribute unlabeled_t sepgsql_procedure_type;
typeattribute unlabeled_t sepgsql_blob_type;

########################################
#
# SE-PostgreSQL server domain's policy
#
optional_policy(`
	gen_require(`
		type postgresql_t;
	')
	sepgsql_server_domain(postgresql_t)
')

########################################
#
# SE-PostgreSQL client domains
#

# -- unconfined_t --
optional_policy(`
	gen_require(`
		type unconfined_t;
	')
	sepgsql_unconfined_domain(unconfined_t)
')

# -- sysadm_t --
optional_policy(`
	gen_require(`
		type sysadm_t;
	')
	sepgsql_unconfined_domain(sysadm_t)
')

# -- user_t --
optional_policy(`
	gen_require(`
		type user_t;
	')
	sepgsql_client_domain(user_t)
')

# -- staff_t --
optional_policy(`
	gen_require(`
		type staff_t;
	')
	sepgsql_client_domain(staff_t)
')

# -- guest_t --
optional_policy(`
	gen_require(`
		type guest_t;
	')
	sepgsql_client_domain(guest_t)
')

# -- httpd_t (PHP script) --
optional_policy(`
	gen_require(`
		type httpd_t;
	')
	sepgsql_client_domain(httpd_t)
')

# -- httpd_sys_script_t (CGI script) --
optional_policy(`
	gen_require(`
		type httpd_sys_script_t;
	')
	sepgsql_client_domain(httpd_sys_script_t)
')

########################################
#
# SE-PostgreSQL Type Transition
#
type_transition domain domain : db_database sepgsql_db_t;
type_transition { domain - sepgsql_server_type } sepgsql_database_type : db_table sepgsql_table_t;
type_transition sepgsql_server_type sepgsql_database_type : db_table sepgsql_sysobj_t;
type_transition domain sepgsql_database_type : db_blob sepgsql_blob_t;

########################################
#
# SE-PostgreSQL policy for server domain
#
allow sepgsql_server_type self : netlink_selinux_socket create_socket_perms;
selinux_get_fs_mount(sepgsql_server_type)
selinux_get_enforce_mode(sepgsql_server_type)
selinux_validate_context(sepgsql_server_type)
selinux_compute_access_vector(sepgsql_server_type)
selinux_compute_create_context(sepgsql_server_type)
selinux_compute_relabel_context(sepgsql_server_type)

allow sepgsql_server_type sepgsql_database_type : db_database all_db_database_perms;
allow sepgsql_server_type sepgsql_module_type : db_database { install_module };
allow sepgsql_server_type sepgsql_table_type : db_table all_db_table_perms;
allow sepgsql_server_type sepgsql_table_type : db_column all_db_column_perms;
allow sepgsql_server_type sepgsql_table_type : db_tuple all_db_tuple_perms;
allow sepgsql_server_type sepgsql_procedure_type : db_procedure all_db_procedure_perms;
allow sepgsql_server_type sepgsql_blob_type : db_blob all_db_blob_perms;
# type transition for procedure
type_transition sepgsql_server_type sepgsql_database_type : db_procedure sepgsql_proc_t;

########################################
#
# SE-PostgreSQL policy for administrative domain
#
tunable_policy(`sepgsql_enable_unconfined',`
	allow sepgsql_admin_domain sepgsql_database_type : db_database all_db_database_perms;
	allow sepgsql_admin_domain sepgsql_module_type : db_database { install_module };
	allow sepgsql_admin_domain sepgsql_table_type : db_table all_db_table_perms;
	allow sepgsql_admin_domain sepgsql_table_type : db_column all_db_column_perms;
	allow sepgsql_admin_domain sepgsql_table_type : db_tuple all_db_tuple_perms;
	allow sepgsql_admin_domain { sepgsql_procedure_type - sepgsql_user_proc_t } : db_procedure all_db_procedure_perms;
	allow sepgsql_admin_domain sepgsql_user_proc_t : db_procedure { create drop getattr setattr relabelfrom relabelto };
	allow sepgsql_admin_domain sepgsql_blob_type : db_blob all_db_blob_perms;
	allow sepgsql_admin_domain sepgsql_server_type : db_blob { import export };
	# type transition for procedure
	type_transition sepgsql_admin_domain sepgsql_database_type : db_procedure sepgsql_proc_t;
',`
	# type transition for procedure
	type_transition sepgsql_admin_domain sepgsql_database_type : db_procedure sepgsql_user_proc_t;	
')

########################################
#
# SE-PostgreSQL policy for generic domain
#

allow sepgsql_users_domain sepgsql_db_t : db_database { getattr access };

allow sepgsql_users_domain sepgsql_table_t : db_table { getattr use select update insert delete };
allow sepgsql_users_domain sepgsql_table_t : db_column { getattr use select update insert };
allow sepgsql_users_domain sepgsql_table_t : db_tuple { use select update insert delete };

allow sepgsql_users_domain sepgsql_sysobj_t : db_table { getattr use select };
allow sepgsql_users_domain sepgsql_sysobj_t : db_column { getattr use select };
allow sepgsql_users_domain sepgsql_sysobj_t : db_tuple { use select };
tunable_policy(`sepgsql_enable_users_ddl',`
	allow sepgsql_users_domain sepgsql_table_t : db_table { create drop setattr };
	allow sepgsql_users_domain sepgsql_table_t : db_column { create drop setattr };
	allow sepgsql_users_domain sepgsql_sysobj_t : db_tuple { update insert delete };
')

allow sepgsql_users_domain sepgsql_secret_table_t : db_table { getattr };
allow sepgsql_users_domain sepgsql_secret_table_t : db_column { getattr };

allow sepgsql_users_domain sepgsql_ro_table_t : db_table { getattr use select };
allow sepgsql_users_domain sepgsql_ro_table_t : db_column { getattr use select };
allow sepgsql_users_domain sepgsql_ro_table_t : db_tuple { use select };

allow sepgsql_users_domain sepgsql_fixed_table_t : db_table { getattr use select insert };
allow sepgsql_users_domain sepgsql_fixed_table_t : db_column { getattr use select insert };
allow sepgsql_users_domain sepgsql_fixed_table_t : db_tuple { use select insert };

allow sepgsql_users_domain sepgsql_proc_t : db_procedure { getattr execute };
allow { sepgsql_users_domain - sepgsql_admin_domain} sepgsql_user_proc_t : db_procedure { create drop getattr setattr execute };
allow sepgsql_users_domain sepgsql_trusted_proc_t : db_procedure { getattr execute entrypoint };

allow sepgsql_users_domain sepgsql_blob_t : db_blob { create drop getattr setattr read write };
allow sepgsql_users_domain sepgsql_ro_blob_t : db_blob { getattr read };
allow sepgsql_users_domain sepgsql_secret_blob_t : db_blob { getattr };

# type transition for procedure
type_transition { sepgsql_users_domain - sepgsql_admin_domain } sepgsql_database_type : db_procedure sepgsql_user_proc_t;

# trusted procedure
type_transition sepgsql_users_domain sepgsql_trusted_proc_t : process sepgsql_trusted_domain_t;
allow sepgsql_users_domain sepgsql_trusted_domain_t : process { transition };

########################################
#
# SE-PostgreSQL loadable shared library policy
#

allow sepgsql_database_type sepgsql_module_type : db_database { load_module };

########################################
#
# SE-PostgreSQL audit switch
#
tunable_policy(`sepgsql_enable_auditallow',`
	auditallow domain sepgsql_database_type : db_database all_db_database_perms;
	auditallow domain sepgsql_table_type : db_table all_db_table_perms;
	auditallow domain sepgsql_table_type : db_column all_db_column_perms;
	auditallow domain sepgsql_procedure_type : db_procedure all_db_procedure_perms;
	auditallow domain sepgsql_blob_type : db_blob all_db_blob_perms;
	auditallow domain sepgsql_server_type : db_blob { import export };
	auditallow domain file_type : db_database { install_module };
')
tunable_policy(`sepgsql_enable_audittuple && sepgsql_enable_auditallow',`
	auditallow domain sepgsql_table_type : db_tuple all_db_tuple_perms;
')
tunable_policy(`! sepgsql_enable_auditdeny',`
	dontaudit domain sepgsql_database_type : db_database all_db_database_perms;
	dontaudit domain sepgsql_table_type : db_table all_db_table_perms;
	dontaudit domain sepgsql_table_type : db_column all_db_column_perms;
	dontaudit domain sepgsql_procedure_type : db_procedure all_db_procedure_perms;
	dontaudit domain sepgsql_blob_type : db_blob all_db_blob_perms;
	dontaudit domain sepgsql_server_type : db_blob { import export };
	dontaudit domain file_type : db_database { install_module };
')
tunable_policy(`! sepgsql_enable_audittuple || ! sepgsql_enable_auditdeny',`
	dontaudit domain sepgsql_table_type : db_tuple all_db_tuple_perms;
')


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:10:32 -0000	1.1
+++ .cvsignore	1 Sep 2007 13:07:32 -0000	1.2
@@ -0,0 +1 @@
+postgresql-8.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:10:32 -0000	1.1
+++ sources	1 Sep 2007 13:07:32 -0000	1.2
@@ -0,0 +1 @@
+f7f2548c41b87ceb63a495dc47a67440  postgresql-8.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 13:10:29 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:10:29 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.28,1.29
Message-ID: <200709011310.l81DATal029677@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29617

Modified Files:
	dietlibc.spec 
Log Message:
reenabled '-fno-stack-protector' for non-i386/x86_64 archs


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dietlibc.spec	1 Sep 2007 12:35:38 -0000	1.28
+++ dietlibc.spec	1 Sep 2007 13:09:57 -0000	1.29
@@ -35,6 +35,7 @@
 Source1:	http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
+Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
 Patch31:	dietlibc-0.31-defpath.patch
 Patch32:	dietlibc-0.31-stacksmash.patch
@@ -73,9 +74,18 @@
 %patch32 -p1 -b .stacksmash
 %patch33 -p1 -b .stacksmash-dyn
 
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
+sed -i -e 's!^#define WANT_SSP$!// \0!g;
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
 sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:16:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sat, 1 Sep 2007 09:16:36 -0400
Subject: comps comps-f8.xml.in,1.84,1.85
Message-ID: <200709011316.l81DGa2C029782@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29748

Modified Files:
	comps-f8.xml.in 
Log Message:
add groups for Fonts and Legacy Fonts



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- comps-f8.xml.in	31 Aug 2007 07:06:30 -0000	1.84
+++ comps-f8.xml.in	1 Sep 2007 13:16:06 -0000	1.85
@@ -355,14 +355,7 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
-      <packagereq type="optional">efont-unicode-bdf</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">fonts-japanese</packagereq>
-      <packagereq type="optional">fonts-KOI8-R</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
@@ -381,10 +374,6 @@
       <packagereq type="optional">xdaliclock</packagereq>
       <packagereq type="optional">xkeycaps</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">xorg-x11-resutils</packagereq>
       <packagereq type="optional">xorg-x11-server-Xnest</packagereq>
       <packagereq type="optional">xorg-x11-server-Xvfb</packagereq>
@@ -398,6 +387,94 @@
     </packagelist>
   </group>
   <group>
+    <id>fonts</id>
+    <_name>Fonts</_name>
+    <_description>Fonts packages for rendering text on the desktop.</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">dejavu-lgc-fonts</packagereq>
+      <packagereq type="default">fonts-arabic</packagereq>
+      <packagereq type="default">fonts-bengali</packagereq>
+      <packagereq type="default">fonts-chinese</packagereq>
+      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">fonts-hindi</packagereq>
+      <packagereq type="default">fonts-kannada</packagereq>
+      <packagereq type="default">fonts-korean</packagereq>
+      <packagereq type="default">fonts-malayalam</packagereq>
+      <packagereq type="default">fonts-oriya</packagereq>
+      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">fonts-sinhala</packagereq>
+      <packagereq type="default">fonts-tamil</packagereq>
+      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">liberation-fonts</packagereq>
+      <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">bitstream-vera-fonts</packagereq>
+      <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">dejavu-fonts</packagereq>
+      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
+      <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-truetype-apl</packagereq>
+      <packagereq type="optional">freefont</packagereq>
+      <packagereq type="optional">gentium-fonts</packagereq>
+      <packagereq type="optional">hunky-fonts</packagereq>
+      <packagereq type="optional">linux-libertine-fonts</packagereq>
+      <packagereq type="optional">mathml-fonts</packagereq>
+      <packagereq type="optional">mgopen-fonts</packagereq>
+      <packagereq type="optional">sazanami-fonts-mincho</packagereq>
+      <packagereq type="optional">tibetan-machine-uni-fonts</packagereq>
+      <packagereq type="optional">VLGothic-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-syriac</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>legacy-fonts</id>
+    <_name>Legacy Fonts</_name>
+    <_description>Older bitmap and vector fonts packages</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">bitmap-fonts</packagereq>
+      <packagereq type="default">fonts-hebrew</packagereq>
+      <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-75dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
+      <packagereq type="default">xorg-x11-fonts-misc</packagereq>
+      <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
+      <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
+      <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">bitmap-fonts-cjk</packagereq>
+      <packagereq type="optional">efont-unicode-bdf</packagereq>
+      <packagereq type="optional">fonts-hebrew-fancy</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">fonts-KOI8-R</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-x11-apl</packagereq>
+      <packagereq type="optional">ghostscript-fonts</packagereq>
+      <packagereq type="optional">libdockapp-fonts</packagereq>
+      <packagereq type="optional">terminus-font-console</packagereq>
+      <packagereq type="optional">terminus-font-x11</packagereq>
+      <packagereq type="optional">urw-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-15-75dpi</packagereq>
+      <packagereq type="optional">zvbi-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>basque-support</id>
     <_name>Basque Support</_name>
     <_description/>
@@ -4060,8 +4137,10 @@
       <groupid>base</groupid>
       <groupid>base-x</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>java</groupid>
+      <groupid>legacy-fonts</groupid>
       <groupid>legacy-software-support</groupid>
       <groupid>system-tools</groupid>
       <groupid>virtualization</groupid>



From fedora-extras-commits at redhat.com  Sat Sep  1 13:21:14 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:21:14 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.29,1.30
Message-ID: <200709011321.l81DLEPp029845@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29827

Modified Files:
	dietlibc.spec 
Log Message:
made binaries non-executable to avoid "No build ID note" errors


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dietlibc.spec	1 Sep 2007 13:09:57 -0000	1.29
+++ dietlibc.spec	1 Sep 2007 13:20:41 -0000	1.30
@@ -104,6 +104,8 @@
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
+
+chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
 rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
@@ -132,9 +134,10 @@
 %changelog
 * Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
 - updated to 0.31
-- removed the no-stack-protector bits
+- removed the no-stack-protector bits for i386 and x86_64 archs
 - improved stack-smash code a little bit
 - disabled dynamic lib for all arches
+- made binaries non-executable to avoid "No build ID note" errors
 
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6



From fedora-extras-commits at redhat.com  Sat Sep  1 13:22:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:22:44 -0400
Subject: rpms/dietlibc/devel dietlibc.spec,1.30,1.31
Message-ID: <200709011322.l81DMiKc029911@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29888

Modified Files:
	dietlibc.spec 
Log Message:
fixed typo


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dietlibc.spec	1 Sep 2007 13:20:41 -0000	1.30
+++ dietlibc.spec	1 Sep 2007 13:22:12 -0000	1.31
@@ -137,7 +137,7 @@
 - removed the no-stack-protector bits for i386 and x86_64 archs
 - improved stack-smash code a little bit
 - disabled dynamic lib for all arches
-- made binaries non-executable to avoid "No build ID note" errors
+- made objects non-executable to avoid "No build ID note" errors
 
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6



From fedora-extras-commits at redhat.com  Sat Sep  1 13:37:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 09:37:44 -0400
Subject: rpms/dietlibc/F-7 sources,1.6,1.7 dietlibc.spec,1.27,1.28
Message-ID: <200709011337.l81DbiOC030367@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228/F-7

Modified Files:
	sources dietlibc.spec 
Log Message:
- updated to 0.31
- removed the no-stack-protector bits for i386 and x86_64 archs
- improved stack-smash code a little bit
- disabled dynamic lib for all arches
- made objects non-executable to avoid "No build ID note" errors



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jul 2006 14:18:32 -0000	1.6
+++ sources	1 Sep 2007 13:37:11 -0000	1.7
@@ -1,2 +1,2 @@
-2465d652fff6f1fad3da3b98e60e83c9  dietlibc-0.30.tar.bz2
-698d7624167aad89acfef504da0161ad  dietlibc-0.30.tar.bz2.sig
+acb98d469ee932d902fdf6de07802b7c  dietlibc-0.31.tar.bz2
+77dadb56faa06c1a5177d76806e79b28  dietlibc-0.31.tar.bz2.sig


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/dietlibc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dietlibc.spec	17 Jan 2007 01:02:35 -0000	1.27
+++ dietlibc.spec	1 Sep 2007 13:37:11 -0000	1.28
@@ -6,7 +6,7 @@
 ##
 
 %ifarch %ix86 x86_64 arm
-%global do_dyn		1
+%global do_dyn		0
 %else
 %global do_dyn 		0
 %endif
@@ -26,8 +26,8 @@
 
 Summary:	Small libc implementation
 Name:		dietlibc
-Version:	0.30
-Release:	%release_func 4
+Version:	0.31
+Release:	%release_func 1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -37,14 +37,19 @@
 Patch10:	dietlibc-0.29-scall.patch
 Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
+Patch31:	dietlibc-0.31-defpath.patch
+Patch32:	dietlibc-0.31-stacksmash.patch
+Patch33:	dietlibc-0.31-stacksmash-dyn.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
-
+%{!?with_dyn:Obsoletes:	dietlibc-lib < %version-%release}
 
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
 
 %description
 The diet libc is a libc that is optimized for small size. It can be
@@ -64,14 +69,23 @@
 %setup -q
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
-%patch20 -p1 -b .nostackprotector
 %patch30 -p1 -b .longdouble
+%patch31 -p1 -b .defpath
+%patch32 -p1 -b .stacksmash
+%patch33 -p1 -b .stacksmash-dyn
 
-sed -i -e 's!strip !: !g' Makefile
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
-           s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
+sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 
@@ -91,6 +105,8 @@
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
 
+chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
+rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
 %clean
@@ -116,6 +132,13 @@
 
 
 %changelog
+* Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
+- updated to 0.31
+- removed the no-stack-protector bits for i386 and x86_64 archs
+- improved stack-smash code a little bit
+- disabled dynamic lib for all arches
+- made objects non-executable to avoid "No build ID note" errors
+
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6
 



From fedora-extras-commits at redhat.com  Sat Sep  1 13:49:31 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 09:49:31 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.132,
	1.133 openoffice.org.spec, 1.1278,
	1.1279 openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch,
	1.1, NONE
Message-ID: <200709011349.l81DnVfj030552@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	.cvsignore openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch 
Log Message:
drop openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- .cvsignore	1 Sep 2007 11:44:03 -0000	1.132
+++ .cvsignore	1 Sep 2007 13:48:59 -0000	1.133
@@ -1,30 +1,7 @@
-openoffice-template-extra.tar.bz2
-extra-templates.tar.bz2
-extra-gallery.tar.bz2
-extra-dictionaries.tar.bz2
-GSI_gu-IN.sdf
-GSI_kn-IN.sdf
-GSI_ta-IN.sdf
-GSI_nn.sdf
-GSI_nb.sdf
-GSI_pa-IN.sdf
-GSI_bn-IN.sdf
-GSI_bn.sdf
-openoffice.org-simple-crash_report.sh
-GSI_cs.sdf
-UseSystemFPicker.xcu
-RegisterAndLicence.xcu
-GSI_ga.sdf
-javavendors.xml
-GSI_hi-IN.sdf
 evolocal.odb
 documentation.openoffice.org-templates.tar.gz
 redhat-templates.tar.gz
 Tigert-templates.tar.gz
 ooo64726.sdf
-AutoSaveCommon.xcu
-AutoSaveRecovery.xcu
-openoffice.org.langpack.template.tar.gz
-pa-IN-179.sdf
 unowinreg.dll
 OOG680_m3.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -r1.1278 -r1.1279
--- openoffice.org.spec	1 Sep 2007 11:46:02 -0000	1.1278
+++ openoffice.org.spec	1 Sep 2007 13:48:59 -0000	1.1279
@@ -80,55 +80,54 @@
 Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch18: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
-Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch20: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch23: workspace.fpicker6.patch
-Patch24: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch25: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch26: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch27: pseudoworkspace.valgrind1.patch
-Patch28: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch29: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch30: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch31: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch32: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch33: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch34: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch35: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch36: workspace.tl37.patch
-Patch37: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch38: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch39: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch40: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch41: workspace.configrefactor01.patch
-Patch42: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch43: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch44: openoffice.org-2.2.0.rh232389.tango.patch
-Patch45: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch46: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch47: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch48: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch49: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch50: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch51: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch52: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch53: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch54: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch56: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch57: workspace.unifysound01.patch
-Patch58: workspace.npower7.patch
-Patch59: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch60: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch61: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch62: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch63: workspace.dba23e.patch
-Patch64: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch65: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch66: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch21: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch22: workspace.fpicker6.patch
+Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch24: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch25: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch26: pseudoworkspace.valgrind1.patch
+Patch27: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch28: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch29: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch30: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch31: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch32: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch33: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch34: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch35: workspace.tl37.patch
+Patch36: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch37: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch38: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch39: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch40: workspace.configrefactor01.patch
+Patch41: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch43: openoffice.org-2.2.0.rh232389.tango.patch
+Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch45: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch46: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch47: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch48: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch49: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch50: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch51: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch52: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch53: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch56: workspace.unifysound01.patch
+Patch57: workspace.npower7.patch
+Patch58: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch59: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch60: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch61: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch62: workspace.dba23e.patch
+Patch63: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch64: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch65: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1016,59 +1015,58 @@
 %patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch16 -p1 -b .ooo54603.fontconfig.patch
 %patch17 -p1 -b .ooo69368.fixxmlsec.patch
-%patch18 -p1 -b .ooo67740.doublefree.xmlhelp.patch
-%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch20 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch21 -p1
-%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch23 -p1 -b .workspace.fpicker6.patch
-%patch24 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch25 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch26 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch27 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch28 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch29 -p1 -b .rh217065.syncbackspace.patch
-%patch30 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch31 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH32} >> svtools/source/dialogs/localize.sdf
-%patch33 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch34 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch35 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch36 -p1 -b .tl37.patch
-%patch37 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch38 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch39 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch40 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch41 -p0 -b .workspace.configrefactor01.patch
-%patch42 -p0 -b .ooo68717.gstreamer.video.patch
-%patch43 -p1 -b .ooo63159.sal.dtype.patch
-%patch44 -p1 -b .rh232389.tango.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch20 -p1
+%patch21 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch22 -p1 -b .workspace.fpicker6.patch
+%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch24 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch25 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch26 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch27 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch28 -p1 -b .rh217065.syncbackspace.patch
+%patch29 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch30 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH31} >> svtools/source/dialogs/localize.sdf
+%patch32 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch33 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch34 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch35 -p1 -b .tl37.patch
+%patch36 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch37 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch38 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch39 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch40 -p0 -b .workspace.configrefactor01.patch
+%patch41 -p0 -b .ooo68717.gstreamer.video.patch
+%patch42 -p1 -b .ooo63159.sal.dtype.patch
+%patch43 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch45 -p1 -b .ooo53397.linkopt.patch
+%patch44 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch46 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch47 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch48 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch45 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch46 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch47 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 %if %{linkopt}
-%patch49 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch48 -p0 -b .ooo77885.stoc.stocmerge.patch
 %endif
-%patch50 -p1 -b .ooo80816.selinux.bridges.patch
-%patch51 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch52 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch53 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch54 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch55 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH56}
-%patch57 -p1 -b .workspace.unifysound01.patch
-%patch58 -p1 -b .workspace.npower7.patch
-%patch59 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch60 -p1 -b .ooo80735.cppu.map.patch
-%patch61 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch62 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch63 -p1 -b .workspace.dba23e.patch
-%patch64 -p1 -b .ooo80967.ucb.neon27.patch
-%patch65 -p1 -b .ooo80931.sysui.genericname.patch
-%patch66 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch49 -p1 -b .ooo80816.selinux.bridges.patch
+%patch50 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch51 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch52 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch53 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch54 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH55}
+%patch56 -p1 -b .workspace.unifysound01.patch
+%patch57 -p1 -b .workspace.npower7.patch
+%patch58 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch59 -p1 -b .ooo80735.cppu.map.patch
+%patch60 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch61 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch62 -p1 -b .workspace.dba23e.patch
+%patch63 -p1 -b .ooo80967.ucb.neon27.patch
+%patch64 -p1 -b .ooo80931.sysui.genericname.patch
+%patch65 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2748,6 +2746,7 @@
 %changelog
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
+- drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 13:58:49 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 09:58:49 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1279,
	1.1280 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch,
	1.2, NONE
Message-ID: <200709011358.l81DwnBT030813@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30785

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch 
Log Message:
drop openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -r1.1279 -r1.1280
--- openoffice.org.spec	1 Sep 2007 13:48:59 -0000	1.1279
+++ openoffice.org.spec	1 Sep 2007 13:58:16 -0000	1.1280
@@ -107,27 +107,26 @@
 Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
 Patch43: openoffice.org-2.2.0.rh232389.tango.patch
 Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch45: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch46: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch47: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch48: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch49: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch50: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch51: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch52: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch53: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch56: workspace.unifysound01.patch
-Patch57: workspace.npower7.patch
-Patch58: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch59: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch60: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch61: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch62: workspace.dba23e.patch
-Patch63: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch64: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch65: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch45: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch46: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch47: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch48: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch49: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch50: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch51: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch52: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch53: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch55: workspace.unifysound01.patch
+Patch56: workspace.npower7.patch
+Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch59: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch60: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch61: workspace.dba23e.patch
+Patch62: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch63: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch64: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1044,29 +1043,28 @@
 %if %{linkopt}
 %patch44 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch45 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch46 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch47 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch45 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch46 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 %if %{linkopt}
-%patch48 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch47 -p0 -b .ooo77885.stoc.stocmerge.patch
 %endif
-%patch49 -p1 -b .ooo80816.selinux.bridges.patch
-%patch50 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch51 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch52 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch53 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch54 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH55}
-%patch56 -p1 -b .workspace.unifysound01.patch
-%patch57 -p1 -b .workspace.npower7.patch
-%patch58 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch59 -p1 -b .ooo80735.cppu.map.patch
-%patch60 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch61 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch62 -p1 -b .workspace.dba23e.patch
-%patch63 -p1 -b .ooo80967.ucb.neon27.patch
-%patch64 -p1 -b .ooo80931.sysui.genericname.patch
-%patch65 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch48 -p1 -b .ooo80816.selinux.bridges.patch
+%patch49 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch50 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch51 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch52 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch53 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH54}
+%patch55 -p1 -b .workspace.unifysound01.patch
+%patch56 -p1 -b .workspace.npower7.patch
+%patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch58 -p1 -b .ooo80735.cppu.map.patch
+%patch59 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch60 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch61 -p1 -b .workspace.dba23e.patch
+%patch62 -p1 -b .ooo80967.ucb.neon27.patch
+%patch63 -p1 -b .ooo80931.sysui.genericname.patch
+%patch64 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2747,6 +2745,7 @@
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
+- drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:02:09 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:02:09 -0400
Subject: rpms/eclipse-rpm-editor/devel
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011402.l81E29iH004478@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:01:35 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:01:35 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:04:24 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:04:24 -0400
Subject: rpms/eclipse-rpm-editor/F-7
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011404.l81E4OxZ004680@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4581/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:03:51 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:03:51 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:04:41 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat, 1 Sep 2007 10:04:41 -0400
Subject: rpms/snort/devel snort-2.7.0.1-glibc.patch, NONE, 1.1 snort.spec,
	1.27, 1.28
Message-ID: <200709011404.l81E4fm6004720@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4613

Modified Files:
	snort.spec 
Added Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
update for glibc open


snort-2.7.0.1-glibc.patch:

--- NEW FILE snort-2.7.0.1-glibc.patch ---
diff -ur snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c
--- snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c	2007-07-03 15:41:53.000000000 -0500
+++ snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c	2007-08-31 23:37:33.000000000 -0500
@@ -346,7 +346,7 @@
 
     /* open this description, create it if necessary, always wait on
      * sync to disk w/ every write, only write */
-    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
+    fd = open(filename, O_CREAT, 0660|O_TRUNC|O_SYNC|O_WRONLY);
 
     if(fd < 0)
     {
diff -ur snort-2.7.0.1-orig/src/util.c snort-2.7.0.1/src/util.c
--- snort-2.7.0.1-orig/src/util.c	2007-07-03 15:41:31.000000000 -0500
+++ snort-2.7.0.1/src/util.c	2007-08-31 23:37:41.000000000 -0500
@@ -1841,7 +1841,7 @@
     close(2);
 
 #ifdef DEBUG
-    open("/tmp/snort.debug", O_CREAT | O_RDWR);
+    open("/tmp/snort.debug", O_CREAT, 0660 | O_RDWR);
 #else
     open("/dev/null", O_RDWR);
 #endif


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- snort.spec	1 Sep 2007 03:50:29 -0000	1.27
+++ snort.spec	1 Sep 2007 14:04:08 -0000	1.28
@@ -1,12 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.7.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
+Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -142,6 +143,7 @@
 
 %prep
 %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
@@ -477,6 +479,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-3
+- fix for glibc open
+
 * Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
 - fix detection of mysql and libnet10
 



From fedora-extras-commits at redhat.com  Sat Sep  1 14:05:57 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sat, 1 Sep 2007 10:05:57 -0400
Subject: rpms/eclipse-rpm-editor/FC-6
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, NONE,
	1.1 eclipse-rpm-editor.spec, NONE, 1.1 fetch-specfile-editor.sh,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709011405.l81E5vIw004856@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
	eclipse-rpm-editor.spec fetch-specfile-editor.sh 
Log Message:
Initial package.


eclipse-rpm-editor-remove-rpmlint-plugin.patch:

--- NEW FILE eclipse-rpm-editor-remove-rpmlint-plugin.patch ---
--- org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml.ori	2007-08-19 15:04:15.000000000 +0200
+++ org.eclipse.linuxtools.rpm.ui.editor-feature/feature.xml	2007-09-01 15:31:46.000000000 +0200
@@ -33,13 +33,6 @@
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.rpm.rpmlint"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.linuxtools.rpm.ui.editor"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-rpm-editor.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define svn_rev             2610

Name:           eclipse-rpm-editor
Version:        0.1.0
Release:        4%{?dist}
Summary:        RPM Specfile editor for Eclipse
Group:          Development/Tools
License:        EPL
URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
# This tarball was made using the included script, like so:
#   sh ./fetch-specfile-editor.sh %{svn_rev}
Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
Source1:        fetch-specfile-editor.sh
# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
# So this patch remove the rpmlint plugin temporarily 
Patch0:         %{name}-remove-rpmlint-plugin.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
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-changelog >= 2.5.1
Requires: eclipse-platform >= 3.3.1 
Requires: eclipse-changelog >= 2.5.1
# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
# the rpmlint plugin
Requires: rpmlint >= 0.80
Requires: rpmdevtools

%description
The Eclipse Specfile Editor package contains Eclipse plugins that are
useful for maintenance of RPM specfiles within the Eclipse IDE.

%prep
%setup -q -n specfile-editor-fetched-src-%{svn_rev}
%patch0

%build
# See comments in the script to understand this.
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} changelog
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

java -cp $SDK/startup.jar \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -Dtype=feature \
     -Did=org.eclipse.linuxtools.rpm.ui.editor \
     -DbaseLocation=$SDK \
     -DsourceDirectory=$(pwd) \
     -DbuildDirectory=$(pwd)/build \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
%endif

%changelog
* Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
- Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 

* Thu Aug 29 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-3
- Fix the description tag (see comment 9 of #253434for more details).
- Lower the rpmlint required version form 0.81 to 0.80.

* Sun Aug 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-2
- Fix License tag.

* Wed Aug 15 2007 Alphonse Van Assche <alcapcom at gmail.com> 0.1.0-1
- Initial package.


--- NEW FILE fetch-specfile-editor.sh ---
#!/bin/sh
name=specfile-editor
svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"

# Usage message
usage="usage: $0 <svn_rev>"
tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
   echo >&2 "$usage"
   exit 1
fi

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
pushd $tar_name &> /dev/null
for bundle in \
"org.eclipse.linuxtools.rpm.ui.editor" \
"org.eclipse.linuxtools.rpm.rpmlint" \
"org.eclipse.linuxtools.rpm.ui.editor-feature"; 
do 
svn export $svn_repo/$bundle 
done
popd &> /dev/null
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Sep 2007 02:06:49 -0000	1.1
+++ .cvsignore	1 Sep 2007 14:05:22 -0000	1.2
@@ -0,0 +1 @@
+specfile-editor-fetched-src-2610.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Sep 2007 02:06:49 -0000	1.1
+++ sources	1 Sep 2007 14:05:22 -0000	1.2
@@ -0,0 +1 @@
+4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 14:08:40 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:08:40 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1280,
	1.1281 openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch, 1.1, NONE
Message-ID: <200709011408.l81E8eLG004974@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4940

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch 
Log Message:
drop openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -r1.1280 -r1.1281
--- openoffice.org.spec	1 Sep 2007 13:58:16 -0000	1.1280
+++ openoffice.org.spec	1 Sep 2007 14:08:07 -0000	1.1281
@@ -121,12 +121,11 @@
 Patch56: workspace.npower7.patch
 Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch59: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch60: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch61: workspace.dba23e.patch
-Patch62: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch63: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch64: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch60: workspace.dba23e.patch
+Patch61: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch62: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch63: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,12 +1058,11 @@
 %patch56 -p1 -b .workspace.npower7.patch
 %patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch58 -p1 -b .ooo80735.cppu.map.patch
-%patch59 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch60 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch61 -p1 -b .workspace.dba23e.patch
-%patch62 -p1 -b .ooo80967.ucb.neon27.patch
-%patch63 -p1 -b .ooo80931.sysui.genericname.patch
-%patch64 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch60 -p1 -b .workspace.dba23e.patch
+%patch61 -p1 -b .ooo80967.ucb.neon27.patch
+%patch62 -p1 -b .ooo80931.sysui.genericname.patch
+%patch63 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2746,6 +2744,7 @@
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+- drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:17:02 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:17:02 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1281,
	1.1282 workspace.dba23e.patch, 1.1, NONE
Message-ID: <200709011417.l81EH2B7005160@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5095

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.dba23e.patch 
Log Message:
drop workspace.dba23e.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -r1.1281 -r1.1282
--- openoffice.org.spec	1 Sep 2007 14:08:07 -0000	1.1281
+++ openoffice.org.spec	1 Sep 2007 14:16:29 -0000	1.1282
@@ -122,10 +122,9 @@
 Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch60: workspace.dba23e.patch
-Patch61: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch62: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch63: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch61: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch62: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,10 +1058,9 @@
 %patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch58 -p1 -b .ooo80735.cppu.map.patch
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch60 -p1 -b .workspace.dba23e.patch
-%patch61 -p1 -b .ooo80967.ucb.neon27.patch
-%patch62 -p1 -b .ooo80931.sysui.genericname.patch
-%patch63 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch60 -p1 -b .ooo80967.ucb.neon27.patch
+%patch61 -p1 -b .ooo80931.sysui.genericname.patch
+%patch62 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2745,6 +2743,7 @@
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+- drop integrated workspace.dba23e.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- workspace.dba23e.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:26:53 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sat, 1 Sep 2007 10:26:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1282,
	1.1283 openoffice.org-2.3.0.ooo80931.sysui.genericname.patch,
	1.1, NONE
Message-ID: <200709011426.l81EQr7a005370@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5346

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo80931.sysui.genericname.patch 
Log Message:
drop openoffice.org-2.3.0.ooo80931.sysui.genericname.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1282
retrieving revision 1.1283
diff -u -r1.1282 -r1.1283
--- openoffice.org.spec	1 Sep 2007 14:16:29 -0000	1.1282
+++ openoffice.org.spec	1 Sep 2007 14:26:21 -0000	1.1283
@@ -123,8 +123,7 @@
 Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch61: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
-Patch62: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,8 +1058,7 @@
 %patch58 -p1 -b .ooo80735.cppu.map.patch
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
-%patch61 -p1 -b .ooo80931.sysui.genericname.patch
-%patch62 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2744,6 +2742,7 @@
 - drop integrated openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - drop integrated openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 - drop integrated workspace.dba23e.patch
+- drop integrated openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
 
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.4
 - add openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch


--- openoffice.org-2.3.0.ooo80931.sysui.genericname.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:43 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:43 -0400
Subject: rpms/clamav/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81EihrH005622@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/clamav/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.91.2


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/clamav/
clamav-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:46 -0400
Subject: rpms/gif2png/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eik4k005639@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/gif2png/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/gif2png/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2.5.1


--- NEW FILE verinfo ---
http://www.catb.org/~esr/gif2png/
gif2png-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:49 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:49 -0400
Subject: rpms/gif2png/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Ein1a005658@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/gif2png/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/gif2png/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2.5.1


--- NEW FILE verinfo ---
http://www.catb.org/~esr/gif2png/
gif2png-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:52 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:52 -0400
Subject: rpms/kismet/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eiqbw005678@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/kismet/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2007-01-R1b


--- NEW FILE verinfo ---
http://www.kismetwireless.net/code/
kismet-([^-]+-[^-]*-[^-]*)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:58 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:58 -0400
Subject: rpms/libextractor/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81Eiw51005717@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libextractor/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.18a


--- NEW FILE verinfo ---
http://gnunet.org/libextractor/download/
libextractor-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:01 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:01 -0400
Subject: rpms/libextractor/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej1r8005734@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libextractor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libextractor/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.18a


--- NEW FILE verinfo ---
http://gnunet.org/libextractor/download/
libextractor-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:04 -0400
Subject: rpms/libtasn1/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej4C6005751@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libtasn1/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.3.10


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
libtasn1-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:44:55 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:44:55 -0400
Subject: rpms/kismet/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011444.l81EitMF005695@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/kismet/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
2007-01-R1b


--- NEW FILE verinfo ---
http://www.kismetwireless.net/code/
kismet-([^-]+-[^-]*-[^-]*)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:08 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:08 -0400
Subject: rpms/libtasn1/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ej8JE005770@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/libtasn1/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.3.10


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
libtasn1-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:11 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:11 -0400
Subject: rpms/mimetic/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjBUL005792@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/mimetic/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.9.3


--- NEW FILE verinfo ---
http://codesink.org/download/
mimetic-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:14 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:14 -0400
Subject: rpms/mimetic/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjENn005809@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/mimetic/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.9.3


--- NEW FILE verinfo ---
http://codesink.org/download/
mimetic-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:17 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:17 -0400
Subject: rpms/opencdk/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjHLD005828@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/opencdk/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.13


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/opencdk/
opencdk-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:20 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:20 -0400
Subject: rpms/opencdk/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjKPi005845@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/opencdk/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.5.13


--- NEW FILE verinfo ---
ftp://ftp.gnutls.org/pub/gnutls/opencdk/
opencdk-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:23 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:23 -0400
Subject: rpms/tinyca2/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjNxn005864@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tinyca2/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7.5


--- NEW FILE verinfo ---
http://tinyca.sm-zone.net/
tinyca2-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:26 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:26 -0400
Subject: rpms/tor/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjQsk005881@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tor/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.1.2.17


--- NEW FILE verinfo ---
http://tor.eff.org/dist/
tor-([^-]*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:29 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:29 -0400
Subject: rpms/tor/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjTOA005898@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/tor/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.1.2.17


--- NEW FILE verinfo ---
http://tor.eff.org/dist/
tor-([^-]*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:32 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:32 -0400
Subject: rpms/x11-ssh-askpass/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjWd2005915@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/x11-ssh-askpass/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.2.4.1


--- NEW FILE verinfo ---
http://www.jmknoble.net/software/x11-ssh-askpass/
x11-ssh-askpass-([0-9]\..*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:35 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:35 -0400
Subject: rpms/x11-ssh-askpass/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjZbG005932@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/x11-ssh-askpass/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.2.4.1


--- NEW FILE verinfo ---
http://www.jmknoble.net/software/x11-ssh-askpass/
x11-ssh-askpass-([0-9]\..*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:41 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:41 -0400
Subject: rpms/xca/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjfGE005966@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xca/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.6.4


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xca/
xca-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:38 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:38 -0400
Subject: rpms/xca/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Ejcit005949@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xca/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.6.4


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xca/
xca-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:44 -0400
Subject: rpms/xmlrpc-c/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81Eji77005984@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xmlrpc-c/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.06.17


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xmlrpc-c/
xmlrpc-c-(1\.06\..*?)\.t



From fedora-extras-commits at redhat.com  Sat Sep  1 14:45:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:45:46 -0400
Subject: rpms/xmlrpc-c/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709011445.l81EjkmH006001@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572/xmlrpc-c/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
1.06.17


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/xmlrpc-c/
xmlrpc-c-(1\.06\..*?)\.t



From fedora-extras-commits at redhat.com  Sat Sep  1 14:52:38 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 1 Sep 2007 10:52:38 -0400
Subject: rpms/x11-ssh-askpass/devel x11-ssh-askpass.spec,1.2,1.3
Message-ID: <200709011452.l81Eqcjv006120@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/x11-ssh-askpass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6102

Modified Files:
	x11-ssh-askpass.spec 
Log Message:
rebuilt with -Wl,--as-needed



Index: x11-ssh-askpass.spec
===================================================================
RCS file: /cvs/extras/rpms/x11-ssh-askpass/devel/x11-ssh-askpass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x11-ssh-askpass.spec	15 Sep 2006 17:53:46 -0000	1.2
+++ x11-ssh-askpass.spec	1 Sep 2007 14:52:05 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:		x11-ssh-askpass
 Version:	1.2.4.1
-Release:	%release_func 2
+Release:	%release_func 3
 Summary:	A passphrase dialog for X and not only for OpenSSH
 
 Group:		Applications/System
@@ -18,7 +18,7 @@
 Source10:	X11-ssh-askpass.csh
 Source11:	X11-ssh-askpass.sh
 Patch0:		x11-ssh-askpass-1.2.4-random.patch
-BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)
+BuildRoot:	%_tmppath/%name-%version-%release-root
 
 Provides:		openssh-askpass-x11
 Requires(pre):		%appdefaultsdir
@@ -47,6 +47,7 @@
 
 %global makeflags	XAPPLOADDIR='%appdefaultsdir'
 %build
+export LDFLAGS='-Wl,--as-needed'
 %configure --libexecdir=%_libexecdir/openssh
 xmkmf
 make includes  %makeflags
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.2.4.1-3
+- rebuilt with -Wl,--as-needed
+
 * Fri Sep 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.2.4.1-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Sep  1 16:29:14 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 1 Sep 2007 12:29:14 -0400
Subject: rpms/php-pecl-memcache/EL-4 memcache-php439.patch, NONE,
	1.1 php-pecl-memcache.spec, NONE, 1.1 sources, 1.1, 1.2 README,
	1.1, NONE
Message-ID: <200709011629.l81GTEtj021389@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21365

Modified Files:
	sources 
Added Files:
	memcache-php439.patch php-pecl-memcache.spec 
Removed Files:
	README 
Log Message:
    new package (with EL4 specific specfile)

memcache-php439.patch:

--- NEW FILE memcache-php439.patch ---
--- memcache-2.1.2/memcache_session.c.orig	2007-09-01 18:10:33.000000000 +0200
+++ memcache-2.1.2/memcache_session.c	2007-09-01 18:11:35.000000000 +0200
@@ -32,6 +32,10 @@
 #include "ext/standard/url.h"
 #include "php_memcache.h"
 
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#       define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
 #if HAVE_MEMCACHE_SESSION
 
 ps_module ps_mod_memcache = {


--- NEW FILE php-pecl-memcache.spec ---
# ---- specific SPEC file only for RHEL4 (too much conditional stuff) ----

%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}

%define pecl_name memcache

Summary:      Extension to work with the Memcached caching daemon
Name:         php-pecl-memcache
Version:      2.1.2
Release:      1%{?dist}.1
License:      PHP
Group:        Development/Languages
URL:          http://pecl.php.net/package/%{pecl_name}

Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
Patch0:       memcache-php439.patch

BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel, zlib-devel
BuildRequires: autoconf, automake, libtool, openssl-devel
Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}

%description
Memcached is a caching daemon designed especially for
dynamic web applications to decrease database load by
storing objects in memory.

This extension allows you to work with memcached through
handy OO and procedural interfaces.

Memcache can be used as a PHP session handler.

%prep 
%setup -c -q
%patch0 -p0 -b .php439

%build
cd %{pecl_name}-%{version}
phpize
%configure
%{__make} %{?_smp_mflags}


%install
cd %{pecl_name}-%{version}
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot}

# Drop in the bit of configuration
%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension=%{pecl_name}.so

; Options for the %{pecl_name} module

; Whether to transparently failover to other servers on errors
;memcache.allow_failover=1

; Defines how many servers to try when setting and getting data.
;memcache.max_failover_attempts=20

; Data will be transferred in chunks of this size
;memcache.chunk_size=8192

; The default TCP port number to use when connecting to the memcached server 
;memcache.default_port=11211

; Options to use the memcache session handler

; Use memcache as a session handler
;session.save_handler=memcache

; Defines a comma separated of server urls to use for session storage
;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
EOF


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-, root, root, -)
%doc %{pecl_name}-%{version}/CREDITS %{pecl_name}-%{version}/README %{pecl_name}-%{version}/example.php
%config(noreplace) %{_sysconfdir}/php.d/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so


%changelog
* Sat Sep  1 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1.el4.1
- specific spec for EL4
- memcache-php439.patch, see http://pecl.php.net/bugs/bug.php?id=11953

* Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
- initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 01:05:19 -0000	1.1
+++ sources	1 Sep 2007 16:28:41 -0000	1.2
@@ -0,0 +1 @@
+cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz


--- README DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 16:30:28 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sat, 1 Sep 2007 12:30:28 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.678, 1.679 kernel.spec, 1.141,
	1.142 linux-2.6-ps3-gelic-wireless.patch, 1.3, 1.4 sources,
	1.641, 1.642 upstream, 1.563,
	1.564 linux-2.6-vesa-reg-clobber.patch, 1.1,
	NONE patch-2.6.23-rc4-git3.bz2.sign, 1.1, NONE
Message-ID: <200709011630.l81GUSxW021492@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21449

Modified Files:
	.cvsignore kernel.spec linux-2.6-ps3-gelic-wireless.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc5.bz2.sign 
Removed Files:
	linux-2.6-vesa-reg-clobber.patch 
	patch-2.6.23-rc4-git3.bz2.sign 
Log Message:
* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc5



--- NEW FILE patch-2.6.23-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG2QjeyGugalF9Dw4RAipyAJ9m2CT5piDTfxEOWGCLRoZip93hJACePlKV
kSJyXg0nslXsxAN6TsUTp1A=
=74cz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- .cvsignore	1 Sep 2007 00:32:49 -0000	1.678
+++ .cvsignore	1 Sep 2007 16:29:55 -0000	1.679
@@ -3,7 +3,7 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4.bz2
+patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5.bz2
 patch-2.6.23-rc3-git10.bz2
 patch-2.6.23-rc4-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kernel.spec	1 Sep 2007 00:32:50 -0000	1.141
+++ kernel.spec	1 Sep 2007 16:29:55 -0000	1.142
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -667,7 +667,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1600: linux-2.6-vesa-reg-clobber.patch
 
 %endif
 
@@ -1191,9 +1190,6 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
-# Some VESA BIOSs clobber registers on return.
-ApplyPatch linux-2.6-vesa-reg-clobber.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1785,6 +1781,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc5
+
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc4-git3
 

linux-2.6-ps3-gelic-wireless.patch:

Index: linux-2.6-ps3-gelic-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ps3-gelic-wireless.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-ps3-gelic-wireless.patch	31 Jul 2007 11:33:24 -0000	1.3
+++ linux-2.6-ps3-gelic-wireless.patch	1 Sep 2007 16:29:55 -0000	1.4
@@ -42,16 +42,17 @@
  obj-$(CONFIG_SKY2) += sky2.o
 --- a/drivers/net/ps3_gelic_net.c
 +++ b/drivers/net/ps3_gelic_net.c
-@@ -556,6 +556,9 @@ static int gelic_net_stop(struct net_dev
+@@ -556,6 +556,10 @@ static int gelic_net_stop(struct net_dev
  {
  	struct gelic_net_card *card = netdev_priv(netdev);
  
 +#ifdef CONFIG_GELIC_WIRELESS
 +	gelicw_down(netdev);
 +#endif
- 	netif_poll_disable(netdev);
++
  	netif_stop_queue(netdev);
  
+ 	/* turn off DMA, force end */
 @@ -1067,6 +1070,9 @@ static irqreturn_t gelic_net_interrupt(i
  		gelic_net_kick_txdma(card, card->tx_chain.tail);
  		spin_unlock_irqrestore(&card->tx_dma_lock, flags);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- sources	1 Sep 2007 00:32:50 -0000	1.641
+++ sources	1 Sep 2007 16:29:55 -0000	1.642
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-cb7b0d6e6424f31ba41b9ba304b69833  patch-2.6.23-rc4.bz2
-549f9a03a741881b70a4bae593246b22  patch-2.6.23-rc4-git3.bz2
+8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- upstream	1 Sep 2007 00:32:50 -0000	1.563
+++ upstream	1 Sep 2007 16:29:55 -0000	1.564
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc4.bz2
-patch-2.6.23-rc4-git3.bz2
+patch-2.6.23-rc5.bz2


--- linux-2.6-vesa-reg-clobber.patch DELETED ---


--- patch-2.6.23-rc4-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  1 16:33:08 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 1 Sep 2007 12:33:08 -0400
Subject: rpms/jd/devel .cvsignore, 1.140, 1.141 jd.spec, 1.166, 1.167 sources,
	1.141, 1.142
Message-ID: <200709011633.l81GX8MT021562@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21540

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
- svn 1304



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore	30 Aug 2007 06:43:07 -0000	1.140
+++ .cvsignore	1 Sep 2007 16:32:36 -0000	1.141
@@ -1 +1 @@
-jd-1.9.6-svn1294.tgz
+jd-1.9.6-svn1304.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- jd.spec	30 Aug 2007 06:50:14 -0000	1.166
+++ jd.spec	1 Sep 2007 16:32:36 -0000	1.167
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1294
+%define         strtag        svn1304
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -44,7 +44,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}.1
+Release:        %{rel}
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -84,8 +84,6 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-%{__cp} -p jd.png src/icons/jd96.png
-
 %{__make} %{?_smp_mflags}
 
 %install
@@ -121,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1294
-- svn 1294
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
+- svn 1304
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	30 Aug 2007 06:43:07 -0000	1.141
+++ sources	1 Sep 2007 16:32:36 -0000	1.142
@@ -1 +1 @@
-c41fe3b983317b842a40c44c53849958  jd-1.9.6-svn1294.tgz
+60cc39b08265a902ce8d7f561715b389  jd-1.9.6-svn1304.tgz



From fedora-extras-commits at redhat.com  Sat Sep  1 16:34:38 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sat, 1 Sep 2007 12:34:38 -0400
Subject: rpms/kernel/devel linux-2.6-libata-terminate-list.patch, NONE,
	1.1 kernel.spec, 1.142, 1.143
Message-ID: <200709011634.l81GYcOQ021643@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21620

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-terminate-list.patch 
Log Message:
* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
- Terminate list in ata-piix


linux-2.6-libata-terminate-list.patch:

--- NEW FILE linux-2.6-libata-terminate-list.patch ---

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e40c94f..3b8bf18 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -955,7 +955,8 @@ static int piix_broken_suspend(void)
 				DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
 			},
 		},
-		{ }
+
+		{ }	/* terminate list */
 	};
 	static const char *oemstrs[] = {
 		"Tecra M3,",
@@ -1187,6 +1188,8 @@ static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
 				DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
 			},
 		},
+
+		{ }	/* terminate list */
 	};
 	u32 iocfg;
 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kernel.spec	1 Sep 2007 16:29:55 -0000	1.142
+++ kernel.spec	1 Sep 2007 16:34:06 -0000	1.143
@@ -623,6 +623,7 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
+Patch662: linux-2.6-libata-terminate-list.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1116,6 +1117,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
+# Terminate list in ata-piix
+ApplyPatch linux-2.6-libata-terminate-list.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1782,6 +1785,9 @@
 
 %changelog
 * Sat Sep 01 2007 Dave Jones <davej at redhat.com>
+- Terminate list in ata-piix
+
+* Sat Sep 01 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc5
 
 * Fri Aug 31 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Sat Sep  1 16:55:17 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat, 1 Sep 2007 12:55:17 -0400
Subject: rpms/snort/F-7 snort-2.7.0.1-glibc.patch, NONE, 1.1 snort.spec, 1.23,
	1.24 sources, 1.8, 1.9
Message-ID: <200709011655.l81GtHOM022397@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22262

Modified Files:
	snort.spec sources 
Added Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
 update to 2.7.0.1 includes move to alternatives.  needs lots of testing 


snort-2.7.0.1-glibc.patch:

--- NEW FILE snort-2.7.0.1-glibc.patch ---
diff -ur snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c
--- snort-2.7.0.1-orig/src/preprocessors/flow/portscan/server_stats.c	2007-07-03 15:41:53.000000000 -0500
+++ snort-2.7.0.1/src/preprocessors/flow/portscan/server_stats.c	2007-08-31 23:37:33.000000000 -0500
@@ -346,7 +346,7 @@
 
     /* open this description, create it if necessary, always wait on
      * sync to disk w/ every write, only write */
-    fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
+    fd = open(filename, O_CREAT, 0660|O_TRUNC|O_SYNC|O_WRONLY);
 
     if(fd < 0)
     {
diff -ur snort-2.7.0.1-orig/src/util.c snort-2.7.0.1/src/util.c
--- snort-2.7.0.1-orig/src/util.c	2007-07-03 15:41:31.000000000 -0500
+++ snort-2.7.0.1/src/util.c	2007-08-31 23:37:41.000000000 -0500
@@ -1841,7 +1841,7 @@
     close(2);
 
 #ifdef DEBUG
-    open("/tmp/snort.debug", O_CREAT | O_RDWR);
+    open("/tmp/snort.debug", O_CREAT, 0660 | O_RDWR);
 #else
     open("/dev/null", O_RDWR);
 #endif


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/snort.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- snort.spec	19 Feb 2007 21:36:01 -0000	1.23
+++ snort.spec	1 Sep 2007 16:54:38 -0000	1.24
@@ -1,24 +1,20 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.1.3
-Release:        1%{?dist}
-License:        GPL
+Version:        2.7.0.1
+Release:        3%{?dist}
+License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
-Source2:	README.fedora
-Patch0:		snort-2.4.3-configure64.patch
+Source2:        README.fedora
+Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Prefix:         /usr
 Requires:       libpcap >= 0.4
-%if "%{?fedora}" <= "5"
-BuildRequires:  libpcap >= 0.4
-%else
 BuildRequires:  libpcap-devel >= 0.4
-%endif
 BuildRequires:  perl
 BuildRequires:  pcre-devel
+BuildRequires:  sed
 
 %package        plain+flexresp
 Summary:        Snort with Flexible Response
@@ -86,7 +82,7 @@
 attacks and probes, such as buffer overflows, stealth port scans,
 CGI attacks, SMB probes, OS fingerprinting attempts, and much more.
 Snort has a real-time alerting capabilty, with alerts being sent to syslog,
-a seperate "alert" file, or as a WinPopup message via Samba's smbclient
+a separate "alert" file, or as a WinPopup message via Samba's smbclient
 
 Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort
 
@@ -147,14 +143,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+%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
 
 %build
 
-SNORT_BASE_CONFIG="--prefix=%{_prefix} \
-                   --sysconfdir=%{_sysconfdir} \
-                   --with-libpcap-includes=/usr/include/pcap \
+SNORT_BASE_CONFIG="--with-libpcap-includes=/usr/include/pcap \
                    --enable-dynamicplugin"
 export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
@@ -188,6 +184,7 @@
 # mysql+flexresp
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -200,6 +197,7 @@
 # mysql
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                              --with-mysql-libraries=%{_libdir}/mysql \
                               --with-postgresql=no \
                               --with-oracle=no \
                               --with-odbc=no
@@ -265,6 +263,7 @@
 # bloat
 {
 %configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                                   --with-mysql-libraries=%{_libdir}/mysql \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
@@ -281,7 +280,7 @@
 
 %install
 if [ -d %{buildroot} ]; then
-	rm -rf %{buildroot}
+        rm -rf %{buildroot}
 fi
 
 mkdir -p %{buildroot}%{_sysconfdir}/snort
@@ -307,24 +306,17 @@
 install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
 install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
 
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-
-
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-
-install snort_dynamicpreprocessor/libsf_dns_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_dns_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
-install snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns'; do
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+       install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
+done
 
 }
 
 install snort.8 %{buildroot}%{_mandir}/man8
 install etc/generators  etc/gen-msg.map  etc/sid etc/sid-msg.map  etc/threshold.conf  etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
-install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
+install -p -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
 perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
@@ -332,55 +324,121 @@
 
 %clean
 if [ -d %{buildroot} ]; then
-	rm -rf %{buildroot}
+         rm -rf %{buildroot}
 fi
 
 
 %post
-# make a symlink if there is no link
-ln -sf %{_sbindir}/snort-plain %{_sbindir}/snort
 /sbin/chkconfig --add snortd
 /sbin/ldconfig
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-plain 10
+fi
 
 
 %preun
 /etc/rc.d/init.d/snortd stop
 if [ $1 = 0 ] ; then
    /sbin/chkconfig --del snortd
-   if [ -L %{_sbindir}/snort ]; then rm %{_sbindir}/snort; fi
+   %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain
 fi
 
 
 %post plain+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-plain+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-plain+flexresp 20
+fi
+
+%postun plain+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain+flexresp 
+fi
 
 
 %post mysql
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-mysql 30
+fi
+
+%postun mysql
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql
+fi
 
 
 %post mysql+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-mysql+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-mysql+flexresp 40
+fi
+
+%postun mysql+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql+flexresp
+fi
 
 
 %post postgresql
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-postgresql 50
+fi
+
+%postun postgresql
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql
+fi
 
 
 %post postgresql+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-postgresql+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-postgresql+flexresp 60
+fi
+
+%postun postgresql+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql+flexresp
+fi
 
 
 %post snmp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-snmp 60
+fi
+
+%postun snmp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp 
+fi
 
 
 %post snmp+flexresp
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-snmp+flexresp %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-snmp+flexresp 70
+fi
+
+%postun snmp+flexresp
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp+flexresp 
+fi
 
 
 %post bloat
-if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then ln -sf %{_sbindir}/snort-bloat %{_sbindir}/snort; fi
+if [ $1 -eq 1 ] ; then
+  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
+    snort %{_bindir}/snort-bloat 80
+fi
+
+%postun bloat
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-bloat 
+fi
 
 
 %files
@@ -421,6 +479,22 @@
 
 
 %changelog
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-3
+- fix for glibc open
+
+* Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-2
+- fix detection of mysql and libnet10
+
+* Mon Aug 27 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-1
+- update to 2.7.0.1
+
+* Thu Jun 14 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.4-2
+- remove the release conditionals
+
+* Sun May 06 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.4-1
+- update to 2.6.1.4 
+- use alternatives
+
 * Mon Feb 19 2007 Dennis Gilmore <dennis at ausil.us> - 2.6.1.3-1
 - update to 2.6.1.3 which fixes CVE-2006-5276
 
@@ -510,7 +584,7 @@
 - moved /var/snort/dev/null creation to install time
 
 * Tue Nov 21 2000 Chris Green <cmg at uab.edu>
-- changed to %{SnortPrefix}
+- changed to %%{SnortPrefix}
 - upgrade to patch2
 
 * Mon Jul 31 2000 Wim Vandersmissen <wim at bofh.st>
@@ -523,9 +597,9 @@
 
 * Sat Jul 22 2000 Wim Vandersmissen <wim at bofh.st>
 - Updated to version 1.6.3
-- Fixed the user/group stuff (moved to %post)
-- Added userdel/groupdel to %postun
-- Automagically adds the right IP, nameservers to %{_sysconfdir}/rules.base
+- Fixed the user/group stuff (moved to %%post)
+- Added userdel/groupdel to %%postun
+- Automagically adds the right IP, nameservers to %%{_sysconfdir}/rules.base
 
 * Sat Jul 08 2000 Dave Wreski <dave at linuxsecurity.com>
 - Updated to version 1.6.2
@@ -543,7 +617,7 @@
 - Fixed permissions on /var/log/snort
 - Created /var/log/snort/archive for archival of snort logs
 - Added post/preun to add/remove snortd to/from rc?.d directories
-- Defined configuration files as %config
+- Defined configuration files as %%config
 
 * Tue Mar 28 2000 William Stearns <wstearns at pobox.com>
 - Quick update to 1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Feb 2007 21:36:01 -0000	1.8
+++ sources	1 Sep 2007 16:54:38 -0000	1.9
@@ -1 +1 @@
-8b46997afd728fbdaafdc9b1d0278b07  snort-2.6.1.3.tar.gz
+06d3fa0b326dcdca59a19811f32b013a  snort-2.7.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 17:41:04 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 1 Sep 2007 13:41:04 -0400
Subject: rpms/kdelibs/F-7 kdelibs.spec,1.219,1.220
Message-ID: <200709011741.l81Hf4Bi030239@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/F-7

Modified Files:
	kdelibs.spec 
Log Message:
Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict (allows using the old /opt/kde4 versions for now)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kdelibs.spec	23 Aug 2007 15:13:43 -0000	1.219
+++ kdelibs.spec	1 Sep 2007 17:40:32 -0000	1.220
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -164,7 +164,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Conflicts: kdelibs4-devel
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -522,6 +521,10 @@
 
 
 %changelog
+* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
+- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
+  (allows using the old /opt/kde4 versions for now)
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
 - vcard30 patch (kde#115219,rh#253496)
 - -devel: restore awol Requires (< f8 only) (#253801)



From fedora-extras-commits at redhat.com  Sat Sep  1 17:41:07 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 1 Sep 2007 13:41:07 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.232,1.233
Message-ID: <200709011741.l81Hf7It030242@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel

Modified Files:
	kdelibs.spec 
Log Message:
Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict (allows using the old /opt/kde4 versions for now)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kdelibs.spec	23 Aug 2007 14:39:59 -0000	1.232
+++ kdelibs.spec	1 Sep 2007 17:40:35 -0000	1.233
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -164,7 +164,6 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Conflicts: kdelibs4-devel
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -522,6 +521,10 @@
 
 
 %changelog
+* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
+- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
+  (allows using the old /opt/kde4 versions for now)
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-21
 - vcard30 patch (kde#115219,rh#253496)
 - -devel: restore awol Requires (< f8 only) (#253801)



From fedora-extras-commits at redhat.com  Sat Sep  1 17:56:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 01 Sep 2007 10:56:12 -0700
Subject: [pkgdb] libmodplug (Fedora EPEL, 5) updated by kevin
Message-ID: <200709011756.l81HuDnl031187@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libmodplug
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libmodplug (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libmodplug (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libmodplug (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmodplug



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:58 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011803.l81I3wQO031294@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:10 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4AId031307@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:11 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4BhI031316@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:18 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:18 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4IwW031327@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:19 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:19 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4JfW031337@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:57 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4LR1011336@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:03:59 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:03:59 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4Nqw011345@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:03 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4OfZ011354@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora devel) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:13 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:13 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4PWX011363@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:14 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:14 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4QJr011373@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora 7) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:21 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:21 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4RQn011391@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:20 -0700
Subject: [pkgdb] kile had acl change status
Message-ID: <200709011804.l81I4Rsr011382@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kile (Fedora 6) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kile



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:39 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4eTg011404@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:40 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:40 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4fJt031356@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:41 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4gx3011413@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:04:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:04:56 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011804.l81I4uPt031371@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:03 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I53pt031381@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 5) to Obsolete for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:05 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I55nx011423@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:06 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:06 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I56jW031391@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:07 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:07 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I572q011437@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:09 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:09 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I59Ld031400@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:10 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5Bfh011446@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:11 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5CXt031410@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:27 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5RcQ031422@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:27 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5SNI011455@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:28 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011805.l81I5SLj031431@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on cabextract (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:46 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:46 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5l69031441@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:47 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:47 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5ltq011477@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:49 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5nlf031451@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:52 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:52 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5qFj011486@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:53 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:53 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5rVR031460@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:54 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:54 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5sAc011495@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:56 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5u1D031469@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:57 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5vbR011509@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:05:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:05:58 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011805.l81I5wC0031479@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:01 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I61OI011519@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:02 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:02 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I623B031488@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:03 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I63Mn011528@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:22 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:22 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6MXX031499@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:21 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:21 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6LnJ011538@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:23 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:23 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6NtF011551@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:25 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:25 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6PNh031512@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:27 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6SU2011568@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:30 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Uc5031537@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:29 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Trn011581@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:28 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6Shx031524@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:35 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6ZnU031549@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:37 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6bpc031561@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:41 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6fTR031574@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on tidy (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:43 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:43 -0700
Subject: [pkgdb] tidy had acl change status
Message-ID: <200709011806.l81I6h96031586@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on tidy (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tidy



From fedora-extras-commits at redhat.com  Sat Sep  1 18:06:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:06:58 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011806.l81I6wB9031599@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on fltk (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:03 -0700
Subject: [pkgdb] fltk had acl change status
Message-ID: <200709011807.l81I73Yq031609@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on fltk (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fltk



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:11 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011807.l81I7BMs031618@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:13 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:13 -0700
Subject: [pkgdb] cabextract had acl change status
Message-ID: <200709011807.l81I7DIX031628@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on cabextract (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cabextract



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:37 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7bKM031640@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:39 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7d9q031649@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora devel) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:42 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:42 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7gGf031658@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:44 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:44 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7jOi031668@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora EPEL 4) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:48 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:48 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7mGV031677@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:51 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7pPb031686@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora EPEL 5) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:55 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:55 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7ts8031696@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on xdg-utils (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:07:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 01 Sep 2007 11:07:58 -0700
Subject: [pkgdb] xdg-utils had acl change status
Message-ID: <200709011807.l81I7wGL031705@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the approveacls acl on xdg-utils (Fedora 7) to Approved for Patrice Dumas (pertusus)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xdg-utils



From fedora-extras-commits at redhat.com  Sat Sep  1 18:08:06 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Sat, 1 Sep 2007 14:08:06 -0400
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.4,1.5
Message-ID: <200709011808.l81I86r0005365@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-doxia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342

Modified Files:
	maven-doxia.spec 
Log Message:

- Rebuild without maven (fpr initial ppc build)




Index: maven-doxia.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-doxia.spec	20 Mar 2007 21:58:46 -0000	1.4
+++ maven-doxia.spec	1 Sep 2007 18:07:33 -0000	1.5
@@ -33,6 +33,9 @@
 
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
+
+%define _without_maven 1
+
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -40,7 +43,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.1.a7.3jpp.3%{?dist}
+Release:        0.1.a7.3jpp.4%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        Apache Software License
@@ -275,6 +278,9 @@
 %endif
 
 %changelog
+* Sat Sep 01 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.4
+- Rebuild without maven (fpr initial ppc build)
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.3
 - Added switch to ignore failures for the time being
 



From fedora-extras-commits at redhat.com  Sat Sep  1 18:12:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  1 Sep 2007 14:12:30 -0400
Subject: fedora-security/audit fc7,1.88,1.89
Message-ID: <200709011812.l81ICU1V006286@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6162

Modified Files:
	fc7 
Log Message:
Fix some typos



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fc7	1 Sep 2007 06:21:24 -0000	1.88
+++ fc7	1 Sep 2007 18:12:28 -0000	1.89
@@ -365,7 +365,7 @@
 CVE-2007-0777 version (seamonkey, fixed 1.0.8)
 CVE-2007-0775 version (seamonkey, fixed 1.0.8)
 *CVE-2007-0774 (mod_jk)
-VE-2007-0772 version (kernel, fixed 2.6.20.1) [since FEDORA-2007-291]
+CVE-2007-0772 version (kernel, fixed 2.6.20.1) [since FEDORA-2007-291]
 CVE-2007-0771 patch (kernel, fixed 2.6.20-1.2933) #227952
 CVE-2007-0770 patch (GraphicsMagick, fixed 1.1.7-7) #228758
 CVE-2007-0770 ignore (ImageMagick) only if incomplete CVE-2006-5456
@@ -608,7 +608,7 @@
 CVE-2006-5330 ignore, no-ship (flash-plugin)
 *CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 *CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
-VE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 *CVE-2006-5276 VULNERABLE (snort) #229265
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 backport (xorg-x11-xinit) #212167 [since FEDORA-2007-1409]
@@ -1242,7 +1242,7 @@
 *CVE-2006-0017 (fedora directory server)
 *CVE-2006-0016 (fedora directory server)
 *CVE-2005-4838 (tomcat)
-VE-2005-4837 version (net-snmp, fixed 5.2.2)
+CVE-2005-4837 version (net-snmp, fixed 5.2.2)
 *CVE-2005-4836 (tomcat)
 CVE-2005-4811 version (kernel, fixed 2.6.13)
 CVE-2005-4809 VULNERABLE (firefox)
@@ -1381,7 +1381,7 @@
 *CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 version (poppler, fixed 0.4.4)
 CVE-2005-3191 version (kdegraphics, fixed 3.5.1)
-VE-2005-3191 version (cups, fixed 1.2.0)
+CVE-2005-3191 version (cups, fixed 1.2.0)
 *CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -1400,7 +1400,7 @@
 CVE-2005-3107 version (kernel, fixed 2.6.11)
 CVE-2005-3106 version (kernel, fixed 2.6.11)
 CVE-2005-3105 version (kernel, fixed 2.6.12)
-VE-2005-3089 version (firefox, fixed 1.0.7)
+CVE-2005-3089 version (firefox, fixed 1.0.7)
 CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped
 CVE-2005-3055 version (kernel, fixed 2.6.14)
 CVE-2005-3054 ignore (php)
@@ -2724,7 +2724,7 @@
 CVE-2002-0069 version (squid, fixed 2.4STABLE4)
 CVE-2002-0068 version (squid, fixed 2.4STABLE4)
 CVE-2002-0067 version (squid, fixed 2.4STABLE4)
-VE-2002-0063 version (cups, fixed 1.1.14)
+CVE-2002-0063 version (cups, fixed 1.1.14)
 CVE-2002-0062 version (ncurses, only 5.0)
 CVE-2002-0060 version (kernel, fixed 2.5.5)
 *CVE-2002-0059 ** zlib (cvs, dump, gcc, libgcj, kernel, vnc)



From fedora-extras-commits at redhat.com  Sat Sep  1 18:26:48 2007
From: fedora-extras-commits at redhat.com (Florian La Roche (laroche))
Date: Sat, 1 Sep 2007 14:26:48 -0400
Subject: devel/asciidoc .cvsignore, 1.3, 1.4 asciidoc.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200709011826.l81IQmEw006548@cvs-int.fedora.redhat.com>

Author: laroche

Update of /cvs/extras/devel/asciidoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6514

Modified Files:
	.cvsignore asciidoc.spec sources 
Log Message:
- 8.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/asciidoc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Mar 2007 01:49:21 -0000	1.3
+++ .cvsignore	1 Sep 2007 18:26:15 -0000	1.4
@@ -1 +1 @@
-asciidoc-8.1.0.tar.gz
+asciidoc-8.2.2.tar.gz


Index: asciidoc.spec
===================================================================
RCS file: /cvs/extras/devel/asciidoc/asciidoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- asciidoc.spec	20 Mar 2007 01:49:21 -0000	1.5
+++ asciidoc.spec	1 Sep 2007 18:26:15 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Text based document generation
 Name: asciidoc
-Version: 8.1.0
+Version: 8.2.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -68,6 +68,9 @@
 %doc README BUGS CHANGELOG COPYRIGHT doc examples
 
 %changelog
+* Sat Sep 01 2007 Florian La Roche <laroche at redhat.com> - 8.2.2-1
+- new upstream version 8.2.2
+
 * Mon Mar 19 2007 Chris Wright <chrisw at redhat.com> - 8.1.0-1
 - update to asciidoc 8.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/asciidoc/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Mar 2007 01:49:21 -0000	1.3
+++ sources	1 Sep 2007 18:26:15 -0000	1.4
@@ -1 +1 @@
-6d3e050b72a8b6df112c2f9aad7a4016  asciidoc-8.1.0.tar.gz
+58d8a0761608da6bfa7af3e886c05592  asciidoc-8.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  1 18:49:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat,  1 Sep 2007 14:49:39 -0400
Subject: fedora-security/audit epel4,NONE,1.1 epel5,NONE,1.1
Message-ID: <200709011849.l81IndoP007028@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7006

Added Files:
	epel4 epel5 
Log Message:
Initial epel4 and epel5 audit files to check.



--- NEW FILE epel4 ---
#
# ** are items that need attention
# *CVE are items that need verification for EPEL-4
# (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)

# Up to date CVE as of CVE email 20070829
# Up to date EPEL4 as of 
#
*CVE-2007-4631 VULNERABLE (qgit) #268381
*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
*CVE-2007-4560 VULNERABLE (clamav) #260583
*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
*CVE-2007-4400 VULNERABLE (konversation) #253545
*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3725 ** (clamav)
*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3113 VULNERABLE (cacti) #243592
*CVE-2007-3112 VULNERABLE (cacti) #243592
*CVE-2007-3025 ignore (clamav, Solaris only)
*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2958 VULNERABLE (claws-mail) #254121
*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
*CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
*CVE-2007-2165 VULNERABLE (proftpd) #237533
*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
*CVE-2007-1997 version (clamav, fixed in 0.90.2)
*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
*CVE-2007-1558 version (claws-mail, fixed 2.9.1) #237293
*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1055 version (mediawiki, fixed 1.8.3)
*CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0898 version (clamav, fixed 0.90) #229202
*CVE-2007-0897 version (clamav, fixed 0.90) #229202
*CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
*CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
*CVE-2006-6481 version (clamav, fixed 0.88.7)
*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
*CVE-2006-6374 ** (phpMyAdmin) #218853
*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-5874 version (clamav, fixed 0.88.1)
*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4684 version (zope, fixed 2.9.2)
*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
*CVE-2006-4248 ignore (thttpd, Debian specific issue)
*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
*CVE-2006-2489 version (nagios, fixed 2.3.1)
*CVE-2006-2427 ignore (clamav) not an issue bz#192076
*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
*CVE-2006-2017 version (dnsmasq, fixed 2.30)
*CVE-2006-1989 version (clamav, fixed 0.88.2)
*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
*CVE-2006-0162 version (clamav, fixed 0.88)
*CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
*CVE-2006-0106 version (wine, fixed 0.9.10)
*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
*CVE-2005-4803 version (graphviz, fixed 2.2.1)
*CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)


--- NEW FILE epel5 ---
#
# ** are items that need attention
# *CVE are items that need verification for EPEL-5
# (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)

# Up to date CVE as of CVE email 20070829
# Up to date EPEL5 as of 
#
*CVE-2007-4631 VULNERABLE (qgit) #268381
*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
*CVE-2007-4560 VULNERABLE (clamav) #260583
*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
*CVE-2007-4400 VULNERABLE (konversation) #253545
*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
*CVE-2007-3725 ** (clamav)
*CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
*CVE-2007-3528 version (dar, fixed 2.3.4) #246760 [since FEDORA-2007-0904]
*CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3113 VULNERABLE (cacti) #243592
*CVE-2007-3112 VULNERABLE (cacti) #243592
*CVE-2007-3025 ignore (clamav, Solaris only)
*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
*CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
*CVE-2007-2165 VULNERABLE (proftpd) #237533
*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
*CVE-2007-1997 version (clamav, fixed in 0.90.2)
*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
*CVE-2007-1515 version (imp, fixed 4.1.4)
*CVE-2007-1474 version (horde, fixed 3.1.4)
*CVE-2007-1474 ignore (imp, < 4.x only)
*CVE-2007-1473 version (horde, fixed 3.1.4)
*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
*CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
*CVE-2007-1263 version (gpgme, fixed 1.1.4)
*CVE-2007-1055 version (mediawiki, fixed 1.8.3)
*CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
*CVE-2007-0898 version (clamav, fixed 0.90) #229202
*CVE-2007-0897 version (clamav, fixed 0.90) #229202
*CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
*CVE-2007-0469 version (rubygems, fixed 0.9.1)
*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
*CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
*CVE-2006-6481 version (clamav, fixed 0.88.7)
*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
*CVE-2006-6374 ** (phpMyAdmin) #218853
*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
*CVE-2006-6235 patch (gnupg2, fixed 2.0.1-2) #218821
*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
*CVE-2006-6169 version (gnupg2, fixed 2.0.1) #217950
*CVE-2006-6085 version (kile, fixed 1.9.3) #217238
*CVE-2006-5874 version (clamav, fixed 0.88.1)
*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
*CVE-2006-5111 version (libksba, fixed 0.9.14)
*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
*CVE-2006-4684 version (zope, fixed 2.9.2)
*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
*CVE-2006-4248 ignore (thttpd, Debian specific issue)
*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
*CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
*CVE-2006-2489 version (nagios, fixed 2.3.1)
*CVE-2006-2427 ignore (clamav) not an issue bz#192076
*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
*CVE-2006-2017 version (dnsmasq, fixed 2.30)
*CVE-2006-1989 version (clamav, fixed 0.88.2)
*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
*CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
*CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
*CVE-2006-0162 version (clamav, fixed 0.88)
*CVE-2006-0106 version (wine, fixed 0.9.10)
*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
*CVE-2005-4803 version (graphviz, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Sat Sep  1 20:04:10 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 1 Sep 2007 16:04:10 -0400
Subject: rpms/fwfstab/devel fwfstab.spec,1.5,1.6
Message-ID: <200709012004.l81K4ACf022039@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014

Modified Files:
	fwfstab.spec 
Log Message:
* Sat Sep 1 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-6
- /still/ not working, perhaps I do need python as a BR




Index: fwfstab.spec
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/devel/fwfstab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwfstab.spec	28 Aug 2007 15:06:20 -0000	1.5
+++ fwfstab.spec	1 Sep 2007 20:03:37 -0000	1.6
@@ -1,10 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%{!?fedoraver: %define fedoraver  %(test -e /etc/fedora-release && rpm -q fedora-release --qf "%{VERSION}")}
-
 Name:        fwfstab
 Version:     0.01.1
-Release:     5%{?dist}
+Release:     6%{?dist}
 BuildArch:   noarch
 Summary:     A graphical file system table editor
 
@@ -16,6 +14,8 @@
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   desktop-file-utils
+BuildRequires:   python-devel >= 2.4
+Requires:        python >= 2.4
 Requires:        pygtk2 pygtk2-libglade
 Requires:        redhat-artwork usermode
 
@@ -80,6 +80,9 @@
 %doc README COPYING CHANGELOG
 
 %changelog
+* Sat Sep 1 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-6
+- /still/ not working, perhaps I do need python as a BR
+
 * Tue Aug 28 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-5
 - Rebuild because of bad file locations
 



From fedora-extras-commits at redhat.com  Sat Sep  1 20:19:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 01 Sep 2007 13:19:59 -0700
Subject: [pkgdb] gkrellm: scop has requested watchcommits
Message-ID: <200709012019.l81KJxv9000358@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on gkrellm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:10 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRAFg000408@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on gkrellm (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:26 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:26 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRQLu000417@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on gkrellm (Fedora 7) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm



From fedora-extras-commits at redhat.com  Sat Sep  1 20:27:29 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Sat, 01 Sep 2007 13:27:29 -0700
Subject: [pkgdb] gkrellm had acl change status
Message-ID: <200709012027.l81KRTVm000426@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on gkrellm (Fedora 7) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm



From fedora-extras-commits at redhat.com  Sat Sep  1 21:39:46 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 14:39:46 -0700
Subject: [pkgdb] nco: pertusus has requested commit
Message-ID: <200709012139.l81LdlYM000969@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the commit acl on nco (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nco



From fedora-extras-commits at redhat.com  Sat Sep  1 21:39:49 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 01 Sep 2007 14:39:49 -0700
Subject: [pkgdb] nco: pertusus has requested watchbugzilla
Message-ID: <200709012139.l81Ldniw000978@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has requested the watchbugzilla acl on nco (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nco



From fedora-extras-commits at redhat.com  Sat Sep  1 21:59:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 1 Sep 2007 17:59:58 -0400
Subject: rpms/libmpcdec/EL-4 .cvsignore, 1.3, 1.4 libmpcdec.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200709012159.l81LxwRY031299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmpcdec/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31277

Modified Files:
	.cvsignore libmpcdec.spec sources 
Log Message:
* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
- libmpcdec-1.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Dec 2006 14:29:40 -0000	1.3
+++ .cvsignore	1 Sep 2007 21:59:25 -0000	1.4
@@ -1,2 +1,2 @@
-clog
 libmpcdec-1.2.2.tar.bz2
+libmpcdec-1.2.6.tar.bz2


Index: libmpcdec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/libmpcdec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmpcdec.spec	8 Dec 2006 14:31:37 -0000	1.5
+++ libmpcdec.spec	1 Sep 2007 21:59:25 -0000	1.6
@@ -1,13 +1,13 @@
 
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
-Version: 1.2.2
-Release: 4%{?dist}.1
+Version: 1.2.6
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
-Source:	 http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
+Source0: http://files.musepack.net/source/libmpcdec-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -62,12 +62,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/*
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
+- libmpcdec-1.2.6
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-4
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Apr 2006 18:02:00 -0000	1.2
+++ sources	1 Sep 2007 21:59:25 -0000	1.3
@@ -1 +1 @@
-f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2
+7f7a060e83b4278acf4b77d7a7b9d2c0  libmpcdec-1.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 22:01:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 1 Sep 2007 18:01:12 -0400
Subject: rpms/libmpcdec/EL-5 .cvsignore, 1.2, 1.3 libmpcdec.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709012201.l81M1Cto004823@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmpcdec/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401

Modified Files:
	.cvsignore libmpcdec.spec sources 
Log Message:
* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
- libmpcdec-1.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Apr 2006 18:02:00 -0000	1.2
+++ .cvsignore	1 Sep 2007 22:00:39 -0000	1.3
@@ -1 +1,2 @@
 libmpcdec-1.2.2.tar.bz2
+libmpcdec-1.2.6.tar.bz2


Index: libmpcdec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/libmpcdec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmpcdec.spec	29 Aug 2006 18:08:41 -0000	1.4
+++ libmpcdec.spec	1 Sep 2007 22:00:39 -0000	1.5
@@ -1,13 +1,13 @@
 
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
-Version: 1.2.2
-Release: 4%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
-Source:	 http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
+Source0: http://files.musepack.net/source/libmpcdec-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -62,12 +62,14 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/*
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.2.6-1
+- libmpcdec-1.2.6
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-4
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmpcdec/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Apr 2006 18:02:00 -0000	1.2
+++ sources	1 Sep 2007 22:00:39 -0000	1.3
@@ -1 +1 @@
-f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2
+7f7a060e83b4278acf4b77d7a7b9d2c0  libmpcdec-1.2.6.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  1 22:22:06 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 18:22:06 -0400
Subject: rpms/tango-icon-theme/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tango-icon-theme.spec, 1.3, 1.4
Message-ID: <200709012222.l81MM6d4005215@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5174

Modified Files:
	.cvsignore sources tango-icon-theme.spec 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2007 03:29:01 -0000	1.3
+++ .cvsignore	1 Sep 2007 22:21:33 -0000	1.4
@@ -1 +1 @@
-tango-icon-theme-0.8.0.tar.bz2
+tango-icon-theme-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2007 03:29:01 -0000	1.3
+++ sources	1 Sep 2007 22:21:33 -0000	1.4
@@ -1 +1 @@
-0bb6a808b514a530adb6fe54e9e3b004  tango-icon-theme-0.8.0.tar.bz2
+32d5258f448b5982af9cfa4364f31d41  tango-icon-theme-0.8.1.tar.gz


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tango-icon-theme.spec	1 Mar 2007 03:29:01 -0000	1.3
+++ tango-icon-theme.spec	1 Sep 2007 22:21:33 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		tango-icon-theme
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
@@ -9,7 +9,7 @@
 Group:		User Interface/Desktops
 URL:		http://tango-project.org/
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.bz2
+Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+- Update to new upstream release (0.8.1)
+
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1
 - Update to new upstream release (0.8.0).
 - Fix URL, and some other whitespace issues in the spec.



From fedora-extras-commits at redhat.com  Sat Sep  1 22:24:13 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 18:24:13 -0400
Subject: rpms/tango-icon-theme/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tango-icon-theme.spec, 1.3, 1.4
Message-ID: <200709012224.l81MODC3005331@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309

Modified Files:
	.cvsignore sources tango-icon-theme.spec 
Log Message:
Update to 0.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Mar 2007 03:29:01 -0000	1.3
+++ .cvsignore	1 Sep 2007 22:23:41 -0000	1.4
@@ -1 +1 @@
-tango-icon-theme-0.8.0.tar.bz2
+tango-icon-theme-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2007 03:29:01 -0000	1.3
+++ sources	1 Sep 2007 22:23:41 -0000	1.4
@@ -1 +1 @@
-0bb6a808b514a530adb6fe54e9e3b004  tango-icon-theme-0.8.0.tar.bz2
+32d5258f448b5982af9cfa4364f31d41  tango-icon-theme-0.8.1.tar.gz


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/tango-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tango-icon-theme.spec	1 Mar 2007 03:29:01 -0000	1.3
+++ tango-icon-theme.spec	1 Sep 2007 22:23:41 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		tango-icon-theme
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
@@ -9,7 +9,7 @@
 Group:		User Interface/Desktops
 URL:		http://tango-project.org/
 
-Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.bz2
+Source0:	http://tango-project.org/releases/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+- Update to new upstream release (0.8.1)
+
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1
 - Update to new upstream release (0.8.0).
 - Fix URL, and some other whitespace issues in the spec.



From fedora-extras-commits at redhat.com  Sun Sep  2 01:01:13 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:01:13 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchbugzilla
Message-ID: <200709020101.l8211GTi002529@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 01:03:49 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:03:49 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchcommits
Message-ID: <200709020103.l8213nEJ002555@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchcommits acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 01:06:30 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:06:30 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has requested watchbugzilla
Message-ID: <200709020106.l8216Uf7002589@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 01:06:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 01 Sep 2007 18:06:35 -0700
Subject: [pkgdb] knetworkmanager: mmcgrath has given up watchcommits
Message-ID: <200709020106.l8216ZV1002598@app3.fedora.phx.redhat.com>

Michael Patrick McGrath (mmcgrath) has given up the watchcommits acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 01:57:15 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 21:57:15 -0400
Subject: rpms/deluge/devel deluge-use-mt-boost.patch,1.1,1.2
Message-ID: <200709020157.l821vFgE026695@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26674

Modified Files:
	deluge-use-mt-boost.patch 
Log Message:
Sync use-mt-boost patch with version 0.5.4.1 setup script.

deluge-use-mt-boost.patch:

Index: deluge-use-mt-boost.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge-use-mt-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-use-mt-boost.patch	4 Aug 2007 19:23:57 -0000	1.1
+++ deluge-use-mt-boost.patch	2 Sep 2007 01:57:12 -0000	1.2
@@ -1,14 +1,14 @@
---- ./setup.py.old	2007-08-04 10:55:23.000000000 -0700
-+++ ./setup.py	2007-08-04 11:03:52.000000000 -0700
-@@ -110,10 +110,7 @@ if not OS == "win":
+--- setup.py.old	2007-09-01 18:43:32.000000000 -0700
++++ setup.py	2007-09-01 18:45:34.000000000 -0700
+@@ -110,10 +110,7 @@
                       '/usr/include/python' + python_version]
  
- 	if OS == "linux":
--		if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)" /etc/issue')) == 0:
--			boosttype = 'nomt'
--		else:
--			boosttype = 'mt'
-+		boosttype = 'mt'
- 	elif OS == "freebsd":
- 		boosttype = 'nomt'
- 	else:
+     if OS == "linux":
+-        if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0:
+-            boosttype = 'nomt'
+-        else:
+-            boosttype = 'mt'
++        boosttype = 'mt'
+     elif OS == "freebsd":
+         boosttype = 'nomt'
+     else:



From fedora-extras-commits at redhat.com  Sun Sep  2 02:06:52 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 22:06:52 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.6,1.7
Message-ID: <200709020206.l8226qnG000367@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv343

Modified Files:
	python-TestGears.spec 
Log Message:
- Remove the .pth file (setuptools will generate its own otherwise it's
  unneeded.)
- Fix directory ownership.



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-TestGears.spec	10 Dec 2006 06:12:32 -0000	1.6
+++ python-TestGears.spec	2 Sep 2007 02:06:19 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-TestGears
 Version:        0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Unit testing for Python
 
 Group:          Development/Languages
@@ -30,25 +30,22 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-echo "TestGears-%{version}-py%{pyver}.egg-info" > %{buildroot}%{python_sitelib}/TestGears.pth
-
-echo '%defattr (0644,root,root,0755)' > pyfiles
-find %{buildroot}%{python_sitelib} -type d | \
-    sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
-find %{buildroot}%{python_sitelib} -not -type d -name '*.py*' | \
-    sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f pyfiles
-%defattr(-,root,root,-)
+%files
+%defattr(0644,root,root,0755)
 %doc docs LICENSE.txt TODO.txt
-%{python_sitelib}/TestGears-%{version}-py%{pyver}.egg-info/*
-%{python_sitelib}/TestGears.pth
+%{python_sitelib}/*
 
 %changelog
+* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-5
+- Remove the .pth file (setuptools will generate its own otherwise it's
+  unneeded.)
+- Fix directory ownership.
+
 * Sun Dec 10 2006 Luke Macken <lmacken at redhat.com> 0.2-4
 - Rebuld for python 2.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 02:14:40 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 1 Sep 2007 22:14:40 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.9, 1.10 deluge.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709020214.l822EegE000436@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv411

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Jul 2007 02:45:37 -0000	1.9
+++ .cvsignore	2 Sep 2007 02:14:06 -0000	1.10
@@ -1 +1 @@
-deluge-0.5.3.tar.gz
+deluge-0.5.4.1.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- deluge.spec	26 Jul 2007 03:13:27 -0000	1.19
+++ deluge.spec	2 Sep 2007 02:14:06 -0000	1.20
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.3
+Version:	0.5.4.1
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Sep 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
+- Update to new upstream release (0.5.4.1). 
+
 * Wed Jul 25 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.3-1
 - Update to new upstream release candidate (0.5.3)
 - Drop %%ifarch invocations for 64-bit builds. The internal setup script now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Jul 2007 02:45:37 -0000	1.9
+++ sources	2 Sep 2007 02:14:06 -0000	1.10
@@ -1 +1 @@
-382141fdf1c55dc75a183da02d2239fb  deluge-0.5.3.tar.gz
+36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  2 03:02:26 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:02:26 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.7,1.8
Message-ID: <200709020302.l8232Q2g007365@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7335

Modified Files:
	python-TestGears.spec 
Log Message:
* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-6
- python-setuptools change for rawhide.



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-TestGears.spec	2 Sep 2007 02:06:19 -0000	1.7
+++ python-TestGears.spec	2 Sep 2007 03:01:53 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           python-TestGears
 Version:        0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Unit testing for Python
 
 Group:          Development/Languages
@@ -14,7 +14,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools
+BuildRequires:  python-devel
+%if 0%{fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 TestGears provides automatic discovery of unittest.TestCases and the ability
@@ -41,6 +46,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-6
+- python-setuptools change for rawhide.
+
 * Sat Sep 1 2007 Toshio Kuratomi <a.badger at gmail.com> 0.2-5
 - Remove the .pth file (setuptools will generate its own otherwise it's
   unneeded.)



From fedora-extras-commits at redhat.com  Sun Sep  2 03:03:38 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:03:38 -0400
Subject: rpms/python-TestGears/devel python-TestGears.spec,1.8,1.9
Message-ID: <200709020303.l8233cao007447@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-TestGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7377

Modified Files:
	python-TestGears.spec 
Log Message:
Remember to make %{fedora} optional %{?fedora}



Index: python-TestGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TestGears/devel/python-TestGears.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-TestGears.spec	2 Sep 2007 03:01:53 -0000	1.8
+++ python-TestGears.spec	2 Sep 2007 03:03:04 -0000	1.9
@@ -15,7 +15,7 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools



From fedora-extras-commits at redhat.com  Sun Sep  2 03:11:04 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 1 Sep 2007 23:11:04 -0400
Subject: rpms/python-decoratortools/devel python-decoratortools.spec, 1.2,
	1.3
Message-ID: <200709020311.l823B4JJ007641@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-decoratortools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7623

Modified Files:
	python-decoratortools.spec 
Log Message:
- Verify that .pth files are correct.
- Update license tag for new guidelines.
- Update setuptools BR for changes in rawhide.



Index: python-decoratortools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decoratortools/devel/python-decoratortools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-decoratortools.spec	21 Aug 2007 21:10:41 -0000	1.2
+++ python-decoratortools.spec	2 Sep 2007 03:10:31 -0000	1.3
@@ -5,16 +5,21 @@
 
 Name:           python-decoratortools
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use class and function decorators -- even in Python 2.3
 Group:          Development/Languages
-License:        PSF or ZPL
+License:        Python or ZPLv2.1
 URL:            http://cheeseshop.python.org/pypi/DecoratorTools
 Source0:        http://cheeseshop.python.org/packages/source/D/DecoratorTools/%{module}-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 Want to use decorators, but still need to support Python 2.3? Wish you could
@@ -32,7 +37,7 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %clean
@@ -48,6 +53,11 @@
 
 
 %changelog
+* Sat Sep 01 2007 Toshio Kuratomi <a.badger at gmail.com> - 1.5-2
+- Verify that .pth files are correct.
+- Update license tag for new guidelines.
+- Update setuptools BR for changes in rawhide.
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> - 1.5-1
 - 1.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:42:14 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:42:14 -0400
Subject: rpms/python-clientform/devel python-clientform.spec,1.14,1.15
Message-ID: <200709020442.l824gEC7014912@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-clientform/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887

Modified Files:
	python-clientform.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-clientform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-clientform/devel/python-clientform.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-clientform.spec	18 Aug 2007 23:02:14 -0000	1.14
+++ python-clientform.spec	2 Sep 2007 04:41:42 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           python-clientform
 Version:        0.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python module for client-side HTML forms
 
 Group:          Development/Languages
@@ -13,7 +13,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 ClientForm is a Python module for handling HTML forms on the client side,
@@ -48,6 +54,9 @@
 %{python_sitelib}/ClientForm-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.2.7-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> 0.2.7-1
 - 0.2.7
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:43:02 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:43:02 -0400
Subject: rpms/python-configobj/devel python-configobj.spec,1.6,1.7
Message-ID: <200709020443.l824h2TH014977@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-configobj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14955

Modified Files:
	python-configobj.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-configobj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-configobj/devel/python-configobj.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-configobj.spec	3 Mar 2007 21:08:34 -0000	1.6
+++ python-configobj.spec	2 Sep 2007 04:42:29 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-configobj
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Config file reading, writing, and validation
 
 Group:          System Environment/Libraries
@@ -12,7 +12,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 ConfigObj is a simple but powerful config file reader and writer: an ini file
@@ -61,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 4.4.0-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Mar  3 2007 Luke Macken <lmacken at redhat.com> - 4.4.0-1
 - 4.4.0
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:43:52 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:43:52 -0400
Subject: rpms/python-formencode/devel python-formencode.spec,1.15,1.16
Message-ID: <200709020443.l824hq1h015075@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053

Modified Files:
	python-formencode.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-formencode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-formencode.spec	10 Apr 2007 15:10:22 -0000	1.15
+++ python-formencode.spec	2 Sep 2007 04:43:19 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           python-formencode
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
 Group:          Development/Libraries
@@ -16,7 +16,13 @@
 BuildArch:      noarch
 
 Requires: python-setuptools
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 
 %description
@@ -48,6 +54,9 @@
 %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.7.1-2
+- Update for python-setuptools changes in rawhide
+
 * Mon Apr  9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.7.1-1
 - Upgrade to bugfix 0.7.1 release.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:44:39 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:44:39 -0400
Subject: rpms/python-mechanize/devel python-mechanize.spec,1.6,1.7
Message-ID: <200709020444.l824idr5015140@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-mechanize/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Modified Files:
	python-mechanize.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-mechanize.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mechanize/devel/python-mechanize.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-mechanize.spec	3 Mar 2007 20:24:27 -0000	1.6
+++ python-mechanize.spec	2 Sep 2007 04:44:06 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-mechanize
 Version:        0.1.6
-Release:        0.1.b%{?dist}
+Release:        0.2.b%{?dist}
 Summary:        Stateful programmatic web browsing
 
 Group:          System Environment/Libraries
@@ -14,7 +14,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-clientform
 
 
@@ -61,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 0.1.6-0.2.b
+- Update for python-setuptools changes in rawhide
+
 * Sat Mar  3 2007 Luke Macken <lmacken at redhat.com> - 0.1.6-0.1.b
 - 0.1.6b
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:45:26 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:45:26 -0400
Subject: rpms/python-myghty/devel python-myghty.spec,1.10,1.11
Message-ID: <200709020445.l824jQYJ015213@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15183

Modified Files:
	python-myghty.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-myghty.spec	10 Dec 2006 03:28:50 -0000	1.10
+++ python-myghty.spec	2 Sep 2007 04:44:53 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           python-myghty
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -12,7 +12,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -48,6 +54,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.1-4
+- Update for python-setuptools changes in rawhide
+
 * Sat Dec  9 2006 Luke Macken <Lmacken at redhat.com> 1.1-2
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:46:12 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:46:12 -0400
Subject: rpms/python-nose/devel python-nose.spec,1.8,1.9
Message-ID: <200709020446.l824kCBi015284@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15259

Modified Files:
	python-nose.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-nose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-nose.spec	21 Aug 2007 21:14:45 -0000	1.8
+++ python-nose.spec	2 Sep 2007 04:45:39 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           python-nose
 Version:        0.10.0
-Release:        0.2.%{_betatag}%{?dist}
+Release:        0.3.%{_betatag}%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
 Group:          Development/Languages
@@ -16,7 +16,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 nose: a discovery-based unittest extension.
@@ -48,6 +54,9 @@
 %{python_sitelib}/nose
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.10.0-0.3.b1
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> 0.10.0-0.2.b1
 - 0.10.0b1
 - Update license tag to LGPLv2



From fedora-extras-commits at redhat.com  Sun Sep  2 04:46:58 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:46:58 -0400
Subject: rpms/python-paste/devel python-paste.spec,1.7,1.8
Message-ID: <200709020446.l824kwHM015362@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15327

Modified Files:
	python-paste.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/devel/python-paste.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paste.spec	8 Jul 2007 22:40:06 -0000	1.7
+++ python-paste.spec	2 Sep 2007 04:46:25 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           python-paste
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for using a Web Server Gateway Interface stack
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 These provide several pieces of "middleware" (or filters) that can be nested
@@ -60,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.4-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.4-1
 - 1.4
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:47:45 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:47:45 -0400
Subject: rpms/python-paste-deploy/devel python-paste-deploy.spec,1.7,1.8
Message-ID: <200709020447.l824ljso015423@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-deploy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15405

Modified Files:
	python-paste-deploy.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste-deploy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-deploy/devel/python-paste-deploy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-paste-deploy.spec	8 Jul 2007 22:40:07 -0000	1.7
+++ python-paste-deploy.spec	2 Sep 2007 04:47:12 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           python-paste-deploy
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load, configure, and compose WSGI applications and servers
 Group:          System Environment/Libraries
 License:        MIT
@@ -11,7 +11,12 @@
 Source0:        http://cheeseshop.python.org/packages/source/P/PasteDeploy/PasteDeploy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-paste
 
 %description
@@ -51,6 +56,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.3.1-2
+- Update for python-setuptools changes in rawhide
+
 * Sun Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.3.1-1
 - 1.3.1
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:48:31 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:48:31 -0400
Subject: rpms/python-paste-script/devel python-paste-script.spec,1.9,1.10
Message-ID: <200709020448.l824mV2S015499@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	python-paste-script.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/python-paste-script.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-paste-script.spec	8 Jul 2007 22:40:08 -0000	1.9
+++ python-paste-script.spec	2 Sep 2007 04:47:58 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-paste-script
 Version:        1.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
@@ -12,7 +12,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-paste, python-paste-deploy, python-cheetah
 
 %description
@@ -58,6 +63,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.3.5-2
+- Update for python-setuptools changes in rawhide
+
 * Sun Jul  8 2007 Luke Macken <lmacken at redhat.com> - 1.3.5-1
 - 1.3.5
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:49:18 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:49:18 -0400
Subject: rpms/python-ruledispatch/devel python-ruledispatch.spec,1.6,1.7
Message-ID: <200709020449.l824nIGw015564@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-ruledispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15542

Modified Files:
	python-ruledispatch.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-ruledispatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ruledispatch/devel/python-ruledispatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-ruledispatch.spec	21 Aug 2007 20:40:36 -0000	1.6
+++ python-ruledispatch.spec	2 Sep 2007 04:48:45 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           python-ruledispatch
 Version:        0.5a0
-Release:        0.6.svn%{svnrev}%{?dist}
+Release:        0.7.svn%{svnrev}%{?dist}
 Summary:        A generic function package for Python
 
 Group:          Development/Languages
@@ -14,7 +14,12 @@
 Source0:        http://www.turbogears.org/preview/download/eggs/RuleDispatch-%{version}.dev-%{svnrev}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel python-setuptools >= 0.6a9
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-protocols >= 1.0
 
 %description
@@ -48,6 +53,9 @@
 %{python_sitearch}/dispatch/tests/*.pyo
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 0.5a0-0.7.svn2305
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> 0.5a0-0.6.svn2305
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:50:05 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:50:05 -0400
Subject: rpms/python-simplejson/devel python-simplejson.spec,1.11,1.12
Message-ID: <200709020450.l824o5Bc015637@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-simplejson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607

Modified Files:
	python-simplejson.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-simplejson.spec	21 Aug 2007 20:41:55 -0000	1.11
+++ python-simplejson.spec	2 Sep 2007 04:49:32 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           python-simplejson
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
@@ -12,7 +12,13 @@
 Source0:        http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 
 %description
 simplejson is a simple, fast, complete, correct and extensible
@@ -60,6 +66,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-3
+- Update for python-setuptools changes in rawhide
+
 * Tue Aug 21 2007 Luke Macken <lmacken at redhat.com> - 1.7.1-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:50:55 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:50:55 -0400
Subject: rpms/python-turbocheetah/devel python-turbocheetah.spec,1.4,1.5
Message-ID: <200709020450.l824otdR015738@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbocheetah/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15715

Modified Files:
	python-turbocheetah.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-turbocheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbocheetah/devel/python-turbocheetah.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-turbocheetah.spec	9 Dec 2006 19:59:19 -0000	1.4
+++ python-turbocheetah.spec	2 Sep 2007 04:50:22 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           python-turbocheetah
 Version:        0.9.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        TurboGears plugin to support use of Cheetah templates
 
 Group:          Development/Languages
@@ -16,7 +16,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-cheetah >= 1.0
 
 %description
@@ -52,6 +57,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 0.9.5-8
+- Update for python-setuptools changes in rawhide
+
 * Sat Dec  9 2006 Luke Macken <lmacken at redhat.com> - 0.9.5-7
 - Add python-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:51:42 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:51:42 -0400
Subject: rpms/python-turbokid/devel python-turbokid.spec,1.7,1.8
Message-ID: <200709020451.l824pgLj015803@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15781

Modified Files:
	python-turbokid.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/python-turbokid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-turbokid.spec	18 Aug 2007 07:09:11 -0000	1.7
+++ python-turbokid.spec	2 Sep 2007 04:51:09 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:           python-turbokid
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
 Group:          Development/Languages
@@ -15,7 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 Requires:       python-kid >= 0.9.6
 
 %description
@@ -49,6 +54,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
+- Update for python-setuptools changes in rawhide
+
 * Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-1
 - 1.0.2
 



From fedora-extras-commits at redhat.com  Sun Sep  2 04:52:34 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 2 Sep 2007 00:52:34 -0400
Subject: rpms/TurboGears/devel TurboGears.spec,1.18,1.19
Message-ID: <200709020452.l824qYiQ015870@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15850

Modified Files:
	TurboGears.spec 
Log Message:
Update for python-setuptools changes in rawhide


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurboGears.spec	11 May 2007 07:23:36 -0000	1.18
+++ TurboGears.spec	2 Sep 2007 04:51:56 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -15,7 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools >= 0.6c2 python-devel
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 # ElementTree is part of python 2.5 on FC7+
 %if 0%{?fedora} <= 6
@@ -82,6 +87,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+- Update for python-setuptools changes in rawhide
+
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2
 - Update etree patch to work with Python2.4
 - Update setuptools patch



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:07 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:07 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709020458.l824w8xe004425@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora devel) to Approved for Michael Patrick McGrath (mmcgrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:17 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:17 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709020458.l824wHp2004434@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora devel) to Approved for Michael Patrick McGrath (mmcgrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 04:58:22 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 21:58:22 -0700
Subject: [pkgdb] knetworkmanager had groupAcl changed
Message-ID: <200709020458.l824wM0O004443@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Sun Sep  2 05:06:57 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Sat, 01 Sep 2007 22:06:57 -0700
Subject: [pkgdb] snort had acl change status
Message-ID: <200709020506.l8256wYA004574@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on snort (Fedora devel) to Approved for Florian La Roche (laroche)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/snort



From fedora-extras-commits at redhat.com  Sun Sep  2 05:41:11 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sun, 2 Sep 2007 01:41:11 -0400
Subject: rpms/kernel/devel linux-2.6-net-oops.patch, NONE, 1.1 kernel.spec, 
	1.143, 1.144
Message-ID: <200709020541.l825fB9k022444@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22421

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-oops.patch 
Log Message:
* Sun Sep 02 2007 Dave Jones <davej at redhat.com>
- Fix oops in IPv4.


linux-2.6-net-oops.patch:

--- NEW FILE linux-2.6-net-oops.patch ---
>From davej  Sun Sep  2 00:26:18 2007
Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932819AbXIBEUT at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-104.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,USER_IN_WHITELIST autolearn=ham version=3.2.3
Envelope-to: davej at kernelslacker.org
Delivery-date: Sun, 02 Sep 2007 05:20:51 +0100
Received: from testure.choralone.org [194.9.77.134]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
	for <davej at localhost> (single-drop); Sun, 02 Sep 2007 00:26:18 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
	by testure.choralone.org with esmtp (Exim 4.67)
	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S932819AbXIBEUT at vger.kernel.org>)
	id 1IRgx8-0005Ex-Ra
	for davej at kernelslacker.org; Sun, 02 Sep 2007 05:20:51 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S932819AbXIBEUT (ORCPT <rfc822;davej at kernelslacker.org>);
	Sun, 2 Sep 2007 00:20:19 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1750977AbXIBEUF
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sun, 2 Sep 2007 00:20:05 -0400
Received: from rhun.apana.org.au ([64.62.148.172]:1945 "EHLO
	arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750969AbXIBEUD (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sun, 2 Sep 2007 00:20:03 -0400
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by arnor.apana.org.au with esmtp (Exim 4.50 #1 (Debian))
	id 1IRgwL-0001Kl-Aa; Sun, 02 Sep 2007 14:20:01 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
	id 1IRgwF-0004G0-00; Sun, 02 Sep 2007 12:19:55 +0800
From:	Herbert Xu <herbert at gondor.apana.org.au>
To:	lists at nerdbynature.de (Christian Kujau)
Subject: Re: Oops in 2.6.23-rc5
Cc:	linux-kernel at vger.kernel.org, netdev at vger.kernel.org,
	torvalds at linux-foundation.org, davem at davemloft.net
Organization: Core
In-Reply-To: <alpine.DEB.0.999.0709012236460.6640 at sheep.housecafe.de>
X-Newsgroups: apana.lists.os.linux.kernel,apana.lists.os.linux.netdev
User-Agent: tin/1.7.4-20040225 ("Benbecula") (UNIX) (Linux/2.6.17-rc4 (i686))
Message-Id: <E1IRgwF-0004G0-00 at gondolin.me.apana.org.au>
Date:	Sun, 02 Sep 2007 12:19:55 +0800
Sender:	linux-kernel-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-kernel at vger.kernel.org
Status: RO
Content-Length: 1586
Lines: 43

Christian Kujau <lists at nerdbynature.de> wrote:
> 
> today I switched from 2.6.22.3 to 2.6.23-rc5 (skipped quite a few -rc 
> versions due to lack of time), and the box keeps panicking under certain 
> circumstances. I suspected disk related problems, because: when the box 
> is up, I usually resume ~10 bittorrent files. When doing this, each
> file (~200MB...1GB) is checked and disk activity is pretty high (20MB/s
> or so), and after 1 minute of doing so the box panicks. Every time.

You want this patch (by davem).

Unfortunately people are travelling so I'm not sure when it'll
get picked up by Linus.

Cheers,
-- 
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
--
From: davem at davemloft.net (David Miller)

> ip is at tcp_rto_min+0x20/0x40

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1ee7212..bbad2cd 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -560,7 +560,7 @@ static u32 tcp_rto_min(struct sock *sk)
 	struct dst_entry *dst = __sk_dst_get(sk);
 	u32 rto_min = TCP_RTO_MIN;
 
-	if (dst_metric_locked(dst, RTAX_RTO_MIN))
+	if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
 		rto_min = dst->metrics[RTAX_RTO_MIN-1];
 	return rto_min;
 }
-
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/devel/kernel.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kernel.spec	1 Sep 2007 16:34:06 -0000	1.143
+++ kernel.spec	2 Sep 2007 05:40:37 -0000	1.144
@@ -668,6 +668,7 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
+Patch1600: linux-2.6-net-oops.patch
 
 %endif
 
@@ -1193,6 +1194,10 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# Fix TCP oops.
+ApplyPatch linux-2.6-net-oops.patch
+
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1784,6 +1789,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Dave Jones <davej at redhat.com>
+- Fix oops in IPv4.
+
 * Sat Sep 01 2007 Dave Jones <davej at redhat.com>
 - Terminate list in ata-piix
 



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:39 -0400
Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826MdoF029068@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/devel

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	18 Jan 2007 03:45:55 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:06 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:43 -0400
Subject: rpms/perl-File-Flat/F-7 perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826Mhoh029071@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/F-7

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/F-7/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	18 Jan 2007 03:45:55 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:10 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 06:22:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 02:22:46 -0400
Subject: rpms/perl-File-Flat/FC-6 perl-File-Flat.spec,1.7,1.8
Message-ID: <200709020622.l826MkJu029074@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Flat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28994/FC-6

Modified Files:
	perl-File-Flat.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
- License update.



Index: perl-File-Flat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Flat/FC-6/perl-File-Flat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Flat.spec	19 Jan 2007 03:04:18 -0000	1.7
+++ perl-File-Flat.spec	2 Sep 2007 06:22:13 -0000	1.8
@@ -1,8 +1,8 @@
 Name: 		perl-File-Flat
 Version: 	1.00
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Implements a flat filesystem
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Flat/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Flat-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-2
+- License update.
+
 * Thu Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.00-1
 - Upstream update.
 - BR: perl(File::Copy::Recursive).



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:27 -0400
Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QR36003583@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/devel

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:25:55 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:31 -0400
Subject: rpms/perl-File-NCopy/F-7 perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QVYD003586@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/F-7

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/F-7/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:25:58 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:26:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:26:34 -0400
Subject: rpms/perl-File-NCopy/FC-6 perl-File-NCopy.spec,1.4,1.5
Message-ID: <200709020726.l827QYin003589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-NCopy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533/FC-6

Modified Files:
	perl-File-NCopy.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-NCopy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-NCopy/FC-6/perl-File-NCopy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-NCopy.spec	5 Sep 2006 09:35:39 -0000	1.4
+++ perl-File-NCopy.spec	2 Sep 2007 07:26:01 -0000	1.5
@@ -1,13 +1,14 @@
 Name: 		perl-File-NCopy
 Version: 	0.34
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	Copy files to directories, or a single file to another file
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-NCopy/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/File-NCopy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
@@ -42,6 +43,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:30 -0400
Subject: rpms/perl-File-Slurp/devel perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oULE004592@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/devel

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:49:57 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:33 -0400
Subject: rpms/perl-File-Slurp/F-7 perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oXPG004595@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/F-7

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/F-7/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:50:01 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 07:50:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 03:50:36 -0400
Subject: rpms/perl-File-Slurp/FC-6 perl-File-Slurp.spec,1.6,1.7
Message-ID: <200709020750.l827oane004598@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Slurp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4537/FC-6

Modified Files:
	perl-File-Slurp.spec 
Log Message:
* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Slurp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Slurp/FC-6/perl-File-Slurp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Slurp.spec	5 Sep 2006 09:03:20 -0000	1.6
+++ perl-File-Slurp.spec	2 Sep 2007 07:50:04 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Slurp
 Version: 	9999.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Efficient Reading/Writing of Complete Files
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Slurp/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.04
 BuildRequires:	perl(Test::Pod) >= 1.14
 
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-3
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 9999.12-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:04:50 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:04:50 -0400
Subject: rpms/hardinfo/F-7 libzfix.patch,NONE,1.1 hardinfo.spec,1.4,1.5
Message-ID: <200709020904.l8294oEQ016944@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/hardinfo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hardinfo.spec	3 Aug 2007 08:28:02 -0000	1.4
+++ hardinfo.spec	2 Sep 2007 09:04:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -10,6 +10,7 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch 
 Patch2: fixuserdsp.patch
+Patch3: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -32,6 +33,8 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
+#fix libz.so detection
+%patch3 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -63,6 +66,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
+- Fix libz detection RH #274381
+
 * Fri Aug 03 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
 - Update License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:08:08 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:08:08 -0400
Subject: rpms/hardinfo/devel libzfix.patch,NONE,1.1 hardinfo.spec,1.17,1.18
Message-ID: <200709020908.l829881p017119@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17084

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hardinfo.spec	15 Aug 2007 13:11:16 -0000	1.17
+++ hardinfo.spec	2 Sep 2007 09:07:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System     
@@ -10,8 +10,8 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch
 Patch2: fixuserdsp.patch
-Patch3: debug.patch
 Patch4: fix_crash.patch
+Patch5: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -34,10 +34,10 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
-#enable debug output
-#%patch3 -p1 -b .debug
 #fix double free bug
 %patch4 -p1 -b .crash
+#fix libz.so detection
+%patch5 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-18
+- Fix libz detection RH #274381
+
 * Wed Aug 15 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-17
 - Disable debug 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 09:27:44 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 2 Sep 2007 05:27:44 -0400
Subject: rpms/hardinfo/FC-6 libzfix.patch,NONE,1.1 hardinfo.spec,1.3,1.4
Message-ID: <200709020927.l829Riq6017588@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17560

Modified Files:
	hardinfo.spec 
Added Files:
	libzfix.patch 
Log Message:
fix bug 274381

libzfix.patch:

--- NEW FILE libzfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/zlib.h hardinfo-0.4.2.2/arch/common/zlib.h
--- hardinfo-0.4.2.2.orign/arch/common/zlib.h	2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/zlib.h	2007-09-02 11:01:14.000000000 +0200
@@ -24,15 +24,20 @@ benchmark_zlib(void)
     static gint (*compress) (gchar *dst, glong *dstlen,
                              const gchar *src, glong srclen) = NULL;
 
+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
+    int z;
+
     if (!(compress && compressBound)) {
-	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
+	
+	for(z = 0; z<5; z++) {
+		libz = g_module_open(libz_locations[z] , G_MODULE_BIND_LAZY);
+		if(libz) break;
+	}
+
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
-            if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;
-            }
-	}
+        }	
 
 	if (!g_module_symbol(libz, "compress", (gpointer) & compress)
 	    || !g_module_symbol(libz, "compressBound", (gpointer) & compressBound)) {


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/hardinfo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hardinfo.spec	3 Aug 2007 08:29:30 -0000	1.3
+++ hardinfo.spec	2 Sep 2007 09:27:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -10,6 +10,7 @@
 Patch0: multilibfix.patch  
 Patch1: fixsensors.patch 
 Patch2: fixuserdsp.patch
+Patch3: libzfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -32,6 +33,8 @@
 %patch1 -p1 -b .fixsensors
 #use correct uids
 %patch2 -p1 -b .fixuserdsp
+#fix libz.so detection
+%patch3 -p1 -b .libzfix
 
 %build
 export LIBDIR=%{_libdir}
@@ -63,6 +66,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
+- Fix libz detection RH #274381
+
 * Fri Aug 03 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-4
 - Update License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 10:40:02 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sun, 2 Sep 2007 06:40:02 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec,1.1,1.2
Message-ID: <200709021040.l82Ae2rx024675@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24648

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
- Only build the plugin where the changelog plugin can be build, only
  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
  of dependencies on the cdt plugin.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-rpm-editor.spec	1 Sep 2007 14:01:35 -0000	1.1
+++ eclipse-rpm-editor.spec	2 Sep 2007 10:39:28 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -38,6 +38,14 @@
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
 
+# These plugins are really noarch but they the changelog plugin need cdt which 
+# we only build on these architectures.
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%else
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%endif
+
 %description
 The Eclipse Specfile Editor package contains Eclipse plugins that are
 useful for maintenance of RPM specfiles within the Eclipse IDE.
@@ -109,6 +117,11 @@
 %endif
 
 %changelog
+* Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
+- Only build the plugin where the changelog plugin can be build, only
+  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
+  of dependencies on the cdt plugin.
+
 * Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
 - Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 10:48:22 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Sun, 2 Sep 2007 06:48:22 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec,1.1,1.2
Message-ID: <200709021048.l82AmMLC025031@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24990

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
- Only build the plugin where the changelog plugin can be build, only
  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
  of dependencies on the cdt plugin.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-rpm-editor.spec	1 Sep 2007 14:05:22 -0000	1.1
+++ eclipse-rpm-editor.spec	2 Sep 2007 10:47:44 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -37,6 +37,13 @@
 # the rpmlint plugin
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
+# These plugins are really noarch but they the changelog plugin need cdt which
+# we only build on these architectures.
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%else
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+%endif
 
 %description
 The Eclipse Specfile Editor package contains Eclipse plugins that are
@@ -109,6 +116,11 @@
 %endif
 
 %changelog
+* Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
+- Only build the plugin where the changelog plugin can be build, only
+  x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because
+  of dependencies on the cdt plugin.
+
 * Sat Sep 1 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-4
 - Disable temporarily rpmlint Plug-In because rpmlint 0.80 is not supported. 
 



From fedora-extras-commits at redhat.com  Sun Sep  2 11:18:41 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mefoster))
Date: Sun, 02 Sep 2007 04:18:41 -0700
Subject: [pkgdb] kaffeine: mef has requested commit
Message-ID: <200709021118.l82BIhMc007588@app3.fedora.phx.redhat.com>

Mary Ellen Foster (mef) has requested the commit acl on kaffeine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Sun Sep  2 11:28:46 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:28:46 -0400
Subject: rpms/dhcp-forwarder/F-7 dhcp-forwarder.spec,1.17,1.18
Message-ID: <200709021128.l82BSkAA031669@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31649/dhcp-forwarder/F-7

Modified Files:
	dhcp-forwarder.spec 
Log Message:
updated URLs



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/F-7/dhcp-forwarder.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dhcp-forwarder.spec	18 Jan 2007 07:37:48 -0000	1.17
+++ dhcp-forwarder.spec	2 Sep 2007 11:28:13 -0000	1.18
@@ -24,12 +24,12 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
-Release: %release_func 12
+Release:	%release_func 12.1
 License:	GPL
 Group:		System Environment/Daemons
-URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
-Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
-Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
+URL:		http://www.nongnu.org/dhcp-fwd/
+Source0:	http://download.savannah.gnu.org/releases/dhcp-fwd/%name-%version.tar.bz2
+Source1:	http://download.savannah.gnu.org/releases/dhcp-fwd/%name-%version.tar.bz2.asc
 Patch0:		dhcp-forwarder-0.7-bigend.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(dhcp-forwarder)
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.7-13
+- updated URL
+
 * Thu Jan 18 2007 David Woodhouse <dwmw2 at infradead.org> 0.7-12
 - rebuilt with PPC support
 



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:13 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:13 -0400
Subject: rpms/dhcp-forwarder/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUDTe031735@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/dhcp-forwarder/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/dhcp-fwd/
dhcp-forwarder-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:10 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:10 -0400
Subject: rpms/clamav/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUAeV031718@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/clamav/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.91.2


--- NEW FILE verinfo ---
http://prdownloads.sourceforge.net/sourceforge/clamav/
clamav-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:16 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:16 -0400
Subject: rpms/dhcp-forwarder/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUG85031752@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/dhcp-forwarder/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/dhcp-fwd/
dhcp-forwarder-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:19 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:19 -0400
Subject: rpms/ip-sentinel/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUJXM031769@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/ip-sentinel/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.12


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/ip-sentinel/
ip-sentinel-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:22 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:22 -0400
Subject: rpms/ip-sentinel/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUM2q031786@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/ip-sentinel/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.12


--- NEW FILE verinfo ---
http://download.savannah.gnu.org/releases/ip-sentinel/
ip-sentinel-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:25 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:25 -0400
Subject: rpms/milter-greylist/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUP3B031803@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/milter-greylist/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
3.0


--- NEW FILE verinfo ---
http://hcpnet.free.fr/milter-greylist/
milter-greylist-(3\.0.*?)\.t(?:gz|ar)



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:28 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:28 -0400
Subject: rpms/milter-greylist/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUS52031822@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/milter-greylist/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
3.0


--- NEW FILE verinfo ---
http://hcpnet.free.fr/milter-greylist/
milter-greylist-(3\.0.*?)\.t(?:gz|ar)



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:32 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:32 -0400
Subject: rpms/tinyca2/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUWh0031839@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/tinyca2/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.7.5


--- NEW FILE verinfo ---
http://tinyca.sm-zone.net/
tinyca2-(.*?)\.tar\.



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:34 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:34 -0400
Subject: rpms/util-vserver/F-7 lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUYMp031856@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/util-vserver/F-7

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.30.213


--- NEW FILE verinfo ---
http://ftp.linux-vserver.org/pub/utils/util-vserver/
util-vserver-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 11:30:37 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 2 Sep 2007 07:30:37 -0400
Subject: rpms/util-vserver/devel lastver,NONE,1.1 verinfo,NONE,1.1
Message-ID: <200709021130.l82BUbi3031873@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31693/util-vserver/devel

Added Files:
	lastver verinfo 
Log Message:
initial checkin



--- NEW FILE lastver ---
0.30.213


--- NEW FILE verinfo ---
http://ftp.linux-vserver.org/pub/utils/util-vserver/
util-vserver-(.*?)\.tar\.bz2



From fedora-extras-commits at redhat.com  Sun Sep  2 12:45:21 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:45:21 -0400
Subject: rpms/amarok/F-7 amarok-1.4.7-147126.patch, NONE, 1.1 amarok.spec,
	1.80, 1.81
Message-ID: <200709021245.l82CjLrm006743@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6683/F-7

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-147126.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
- add patch for kde bug 147126 : amarok freezes when trying to play
  mp3 files without mp3 support


amarok-1.4.7-147126.patch:

--- NEW FILE amarok-1.4.7-147126.patch ---
diff -up ./amarok/src/statusbar/statusBarBase.cpp.147126 ./amarok/src/statusbar/statusBarBase.cpp
--- ./amarok/src/statusbar/statusBarBase.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/statusbar/statusBarBase.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -25,6 +25,7 @@
 #include "squeezedtextlabel.h"
 #include "statusBarBase.h"
 #include "threadmanager.h"
+#include "enginecontroller.h"
 
 #include <kio/job.h>
 #include <kiconloader.h>
@@ -343,9 +344,13 @@ StatusBar::longMessageThreadSafe( const 
 void
 StatusBar::customEvent( QCustomEvent *e )
 {
-    QString *s = static_cast<QString*>( e->data() );
-    longMessage( *s );
-    delete s;
+    if(e->type() == 1000 ){
+      QString *s = static_cast<QString*>( e->data() );
+      longMessage( *s );
+      delete s;
+    }else if(e->type() == 2000 ){
+      EngineController::instance()->unplayableNotification();
+    }
 }
 
 
diff -up ./amarok/src/enginecontroller.cpp.147126 ./amarok/src/enginecontroller.cpp
--- ./amarok/src/enginecontroller.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -244,13 +244,10 @@ bool EngineController::canDecode( const 
     if( engine() != EngineController::instance()->m_voidEngine )
     {
         //we special case this as otherwise users hate us
-        if ( !valid && ext.lower() == "mp3" && !installDistroCodec(AmarokConfig::soundSystem()) )
-            Amarok::StatusBar::instance()->longMessageThreadSafe(
-                    i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
-                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
-                        "the installation of the multimedia-framework that the current engine uses. "
-                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
-                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+        if ( !valid && ext.lower() == "mp3"){
+            QCustomEvent * e = new QCustomEvent( 2000 );
+            QApplication::postEvent( Amarok::StatusBar::instance(), e );
+ }
 
         // Cache this result for the next lookup
         if ( !ext.isEmpty() )
@@ -260,6 +257,17 @@ bool EngineController::canDecode( const 
     return valid;
 }
 
+void EngineController::unplayableNotification() {
+
+    if( !installDistroCodec(AmarokConfig::soundSystem()))
+        Amarok::StatusBar::instance()->longMessageThreadSafe(
+                  i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
+                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
+                        "the installation of the multimedia-framework that the current engine uses. "
+                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
+                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+}
+
 bool EngineController::installDistroCodec( const QString& engine /*Filetype type*/)
 {
     KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
diff -up ./amarok/src/enginecontroller.h.147126 ./amarok/src/enginecontroller.h
--- ./amarok/src/enginecontroller.h.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.h	2007-09-02 13:55:38.000000000 +0200
@@ -52,6 +52,7 @@ public:
     uint                     trackPosition() const;
 
     EngineBase* loadEngine();
+    void unplayableNotification();
 
     uint trackLength() const { return m_bundle.length() * 1000; }
     const MetaBundle &bundle() const;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- amarok.spec	18 Aug 2007 06:56:53 -0000	1.80
+++ amarok.spec	2 Sep 2007 12:44:48 -0000	1.81
@@ -4,14 +4,15 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    2%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
-License:    GPL
+License:    GPLv2+
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0:     amarok-1.4.7-147126.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -85,6 +86,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .147126
 
 
 
@@ -241,6 +243,13 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
+- add patch for kde bug 147126 : amarok freezes when trying to play
+  mp3 files without mp3 support
+
+* Fri Aug 24 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-3
+- rebuild with libgpod-0.5.2
+
 * Sat Aug 18 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-2
 - version 1.4.7
 



From fedora-extras-commits at redhat.com  Sun Sep  2 12:45:24 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:45:24 -0400
Subject: rpms/amarok/devel amarok-1.4.7-147126.patch, NONE, 1.1 amarok.spec, 
	1.83, 1.84
Message-ID: <200709021245.l82CjO4B006746@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6683/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-147126.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
- add patch for kde bug 147126 : amarok freezes when trying to play
  mp3 files without mp3 support


amarok-1.4.7-147126.patch:

--- NEW FILE amarok-1.4.7-147126.patch ---
diff -up ./amarok/src/statusbar/statusBarBase.cpp.147126 ./amarok/src/statusbar/statusBarBase.cpp
--- ./amarok/src/statusbar/statusBarBase.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/statusbar/statusBarBase.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -25,6 +25,7 @@
 #include "squeezedtextlabel.h"
 #include "statusBarBase.h"
 #include "threadmanager.h"
+#include "enginecontroller.h"
 
 #include <kio/job.h>
 #include <kiconloader.h>
@@ -343,9 +344,13 @@ StatusBar::longMessageThreadSafe( const 
 void
 StatusBar::customEvent( QCustomEvent *e )
 {
-    QString *s = static_cast<QString*>( e->data() );
-    longMessage( *s );
-    delete s;
+    if(e->type() == 1000 ){
+      QString *s = static_cast<QString*>( e->data() );
+      longMessage( *s );
+      delete s;
+    }else if(e->type() == 2000 ){
+      EngineController::instance()->unplayableNotification();
+    }
 }
 
 
diff -up ./amarok/src/enginecontroller.cpp.147126 ./amarok/src/enginecontroller.cpp
--- ./amarok/src/enginecontroller.cpp.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.cpp	2007-09-02 13:55:38.000000000 +0200
@@ -244,13 +244,10 @@ bool EngineController::canDecode( const 
     if( engine() != EngineController::instance()->m_voidEngine )
     {
         //we special case this as otherwise users hate us
-        if ( !valid && ext.lower() == "mp3" && !installDistroCodec(AmarokConfig::soundSystem()) )
-            Amarok::StatusBar::instance()->longMessageThreadSafe(
-                    i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
-                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
-                        "the installation of the multimedia-framework that the current engine uses. "
-                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
-                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+        if ( !valid && ext.lower() == "mp3"){
+            QCustomEvent * e = new QCustomEvent( 2000 );
+            QApplication::postEvent( Amarok::StatusBar::instance(), e );
+ }
 
         // Cache this result for the next lookup
         if ( !ext.isEmpty() )
@@ -260,6 +257,17 @@ bool EngineController::canDecode( const 
     return valid;
 }
 
+void EngineController::unplayableNotification() {
+
+    if( !installDistroCodec(AmarokConfig::soundSystem()))
+        Amarok::StatusBar::instance()->longMessageThreadSafe(
+                  i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
+                        "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
+                        "the installation of the multimedia-framework that the current engine uses. "
+                        "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
+                    .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+}
+
 bool EngineController::installDistroCodec( const QString& engine /*Filetype type*/)
 {
     KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
diff -up ./amarok/src/enginecontroller.h.147126 ./amarok/src/enginecontroller.h
--- ./amarok/src/enginecontroller.h.147126	2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.h	2007-09-02 13:55:38.000000000 +0200
@@ -52,6 +52,7 @@ public:
     uint                     trackPosition() const;
 
     EngineBase* loadEngine();
+    void unplayableNotification();
 
     uint trackLength() const { return m_bundle.length() * 1000; }
     const MetaBundle &bundle() const;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- amarok.spec	25 Aug 2007 21:29:02 -0000	1.83
+++ amarok.spec	2 Sep 2007 12:44:51 -0000	1.84
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,6 +12,7 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0:     amarok-1.4.7-147126.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -85,6 +86,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .147126
 
 
 
@@ -241,6 +243,10 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
+- add patch for kde bug 147126 : amarok freezes when trying to play
+  mp3 files without mp3 support
+
 * Fri Aug 24 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-3
 - rebuild with libgpod-0.5.2
 



From fedora-extras-commits at redhat.com  Sun Sep  2 12:46:12 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:46:12 -0400
Subject: rpms/glest-data/F-7 .cvsignore, 1.2, 1.3 glest-data.spec, 1.3,
	1.4 glest-get-translations.sh, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709021246.l82CkCFt006884@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793/F-7

Modified Files:
	.cvsignore glest-data.spec glest-get-translations.sh sources 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:45:40 -0000	1.3
@@ -1,2 +1,2 @@
-glest-translations-2.0.0.tar.gz
-glest_data_2.0.0.zip
+glest-translations-2.0.1.tar.gz
+glest_data_2.0.1.zip


Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/glest-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glest-data.spec	18 Aug 2007 07:09:51 -0000	1.3
+++ glest-data.spec	2 Sep 2007 12:45:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glest-data
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Data files for the game Glest
 
 Group:          Amusements/Games
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+
 * Mon Aug 13 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - fix ExcludArch tag, it does not parse commas (thanks Florian)
 


Index: glest-get-translations.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/glest-get-translations.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest-get-translations.sh	27 Nov 2006 19:54:30 -0000	1.1
+++ glest-get-translations.sh	2 Sep 2007 12:45:40 -0000	1.2
@@ -7,10 +7,12 @@
     exit 2
 fi
 
+majorver=`echo $version | sed -r -e 's/^([0-9]+)[0-9\.]+$/\1/g'`
+
 rm -rf translations
 mkdir translations
 cd translations
-wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
+wget -r -N -l 1 -np -nd -A "*_$majorver.*.zip" http://www.glest.org/files/contrib/translations/
 rm -f robots.txt
 cd ..
 tar -czf glest-translations-$version.tar.gz translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 19:54:30 -0000	1.2
+++ sources	2 Sep 2007 12:45:40 -0000	1.3
@@ -1,2 +1,2 @@
-aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
-8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip
+02afa4d079313239a3c972492be54a47  glest-translations-2.0.1.tar.gz
+0ca333baa78328f97c30a22063ea19fc  glest_data_2.0.1.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 12:46:15 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:46:15 -0400
Subject: rpms/glest-data/devel .cvsignore, 1.2, 1.3 glest-data.spec, 1.5,
	1.6 glest-get-translations.sh, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709021246.l82CkFQV006896@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793/devel

Modified Files:
	.cvsignore glest-data.spec glest-get-translations.sh sources 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:45:43 -0000	1.3
@@ -1,2 +1,2 @@
-glest-translations-2.0.0.tar.gz
-glest_data_2.0.0.zip
+glest-translations-2.0.1.tar.gz
+glest_data_2.0.1.zip


Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glest-data.spec	13 Aug 2007 08:43:17 -0000	1.5
+++ glest-data.spec	2 Sep 2007 12:45:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glest-data
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Data files for the game Glest
 
 Group:          Amusements/Games
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+
 * Mon Aug 13 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - fix ExcludArch tag, it does not parse commas (thanks Florian)
 


Index: glest-get-translations.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-get-translations.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest-get-translations.sh	27 Nov 2006 19:54:30 -0000	1.1
+++ glest-get-translations.sh	2 Sep 2007 12:45:43 -0000	1.2
@@ -7,10 +7,12 @@
     exit 2
 fi
 
+majorver=`echo $version | sed -r -e 's/^([0-9]+)[0-9\.]+$/\1/g'`
+
 rm -rf translations
 mkdir translations
 cd translations
-wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
+wget -r -N -l 1 -np -nd -A "*_$majorver.*.zip" http://www.glest.org/files/contrib/translations/
 rm -f robots.txt
 cd ..
 tar -czf glest-translations-$version.tar.gz translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 19:54:30 -0000	1.2
+++ sources	2 Sep 2007 12:45:43 -0000	1.3
@@ -1,2 +1,2 @@
-aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
-8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip
+02afa4d079313239a3c972492be54a47  glest-translations-2.0.1.tar.gz
+0ca333baa78328f97c30a22063ea19fc  glest_data_2.0.1.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 12:47:54 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:47:54 -0400
Subject: rpms/glest/F-7 .cvsignore, 1.2, 1.3 glest.spec, 1.7, 1.8 sources,
	1.2, 1.3 glest-2.0.0-gcc41.patch, 1.1, NONE
Message-ID: <200709021247.l82ClsA0007056@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7013/F-7

Modified Files:
	.cvsignore glest.spec sources 
Removed Files:
	glest-2.0.0-gcc41.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:47:21 -0000	1.3
@@ -1 +1 @@
-glest_source_2.0.0.zip
+glest_source_2.0.1.zip


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/glest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glest.spec	20 Dec 2006 11:59:40 -0000	1.7
+++ glest.spec	2 Sep 2007 12:47:21 -0000	1.8
@@ -1,15 +1,14 @@
 Name:           glest
-Version:        2.0.0
-Release:        5%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
+Source0:        http://dl.sf.net/glest/glest_source_%{version}.zip
 Source1:        glest.sh
 Patch0:         glest-2.0.0-unicode.patch
-Patch1:         glest-2.0.0-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -21,7 +20,7 @@
 Requires:       glx-utils
 
 # Does not work on PPC (see README.Linux). Bug 219540.
-ExcludeArch:    ppc
+ExcludeArch:    ppc ppc64
 
 %description
 Glest is a free 3D real time strategy game, that can be modified
@@ -33,9 +32,8 @@
 
 
 %prep
-%setup -q -n %{name}_source_%{version}
+%setup -q -c
 %patch0 -p1 -b .unicode
-%patch1 -p1 -b .gcc41
 find . -type f | xargs sed -i -e "s/\r//g" 
 #find . -type f | while read file; do
 #  grep -qs "\r\n" $file && dos2unix $file
@@ -96,6 +94,17 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+- patch1 merged upstream
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-7
+- fix ExcludArch tag (no comma allowed)
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-6
+- rebuild for BuildID
+- fix license tag
+
 * Wed Dec 20 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-5
 - require glx-utils, glxinfo is used in the wrapper script
 - don't try to update the configuration on startup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 20:05:47 -0000	1.2
+++ sources	2 Sep 2007 12:47:21 -0000	1.3
@@ -1 +1 @@
-f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip
+2d35a5d08331957f63240cadc9766b75  glest_source_2.0.1.zip


--- glest-2.0.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 12:47:56 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 2 Sep 2007 08:47:56 -0400
Subject: rpms/glest/devel .cvsignore, 1.2, 1.3 glest.spec, 1.10, 1.11 sources,
	1.2, 1.3 glest-2.0.0-gcc41.patch, 1.1, NONE
Message-ID: <200709021247.l82Clu4l007061@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7013/devel

Modified Files:
	.cvsignore glest.spec sources 
Removed Files:
	glest-2.0.0-gcc41.patch 
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
- version 2.0.1
- patch1 merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
+++ .cvsignore	2 Sep 2007 12:47:24 -0000	1.3
@@ -1 +1 @@
-glest_source_2.0.0.zip
+glest_source_2.0.1.zip


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- glest.spec	26 Aug 2007 08:44:36 -0000	1.10
+++ glest.spec	2 Sep 2007 12:47:24 -0000	1.11
@@ -1,15 +1,14 @@
 Name:           glest
-Version:        2.0.0
-Release:        7%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
+Source0:        http://dl.sf.net/glest/glest_source_%{version}.zip
 Source1:        glest.sh
 Patch0:         glest-2.0.0-unicode.patch
-Patch1:         glest-2.0.0-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -33,9 +32,8 @@
 
 
 %prep
-%setup -q -n %{name}_source_%{version}
+%setup -q -c
 %patch0 -p1 -b .unicode
-%patch1 -p1 -b .gcc41
 find . -type f | xargs sed -i -e "s/\r//g" 
 #find . -type f | while read file; do
 #  grep -qs "\r\n" $file && dos2unix $file
@@ -96,6 +94,10 @@
 
 
 %changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-1
+- version 2.0.1
+- patch1 merged upstream
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-7
 - fix ExcludArch tag (no comma allowed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 20:05:47 -0000	1.2
+++ sources	2 Sep 2007 12:47:24 -0000	1.3
@@ -1 +1 @@
-f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip
+2d35a5d08331957f63240cadc9766b75  glest_source_2.0.1.zip


--- glest-2.0.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 13:47:23 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 09:47:23 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.40,1.41
Message-ID: <200709021347.l82DlNPu013989@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13960

Modified Files:
	apr-util.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
- rebuild for fixed APR 32-bit ABI
- remove sqlite driver from main package (#274521)



Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- apr-util.spec	22 Aug 2007 19:02:56 -0000	1.40
+++ apr-util.spec	2 Sep 2007 13:46:51 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.8
-Release: 11
+Release: 12
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -133,7 +133,6 @@
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
-%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
 %files pgsql
 %defattr(-,root,root,-)
@@ -156,6 +155,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
+- rebuild for fixed APR 32-bit ABI
+- remove sqlite driver from main package (#274521)
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.2.8-11
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 13:57:42 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 09:57:42 -0400
Subject: rpms/httpd/devel httpd-2.2.4-oldflush.patch, NONE, 1.1 httpd.spec, 
	1.113, 1.114
Message-ID: <200709021357.l82DvgtA014203@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.2.4-oldflush.patch 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
- rebuild for fixed APR


httpd-2.2.4-oldflush.patch:

--- NEW FILE httpd-2.2.4-oldflush.patch ---
--- httpd-2.2.4/server/util_filter.c.oldflush
+++ httpd-2.2.4/server/util_filter.c
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
                                                 void *ctx)
 {
     ap_filter_t *f = ctx;
+    apr_status_t rv;
 
-    return ap_pass_brigade(f, bb);
+    rv = ap_pass_brigade(f, bb);
+
+    /* apr_brigade_write* require that the flush function ensures that
+     * the brigade is empty upon return; otherwise the brigade may be
+     * left with a transient bucket whose contents have fallen out of
+     * scope.  Call cleanup here unconditionally to avoid the issue in
+     * all cases. */
+    apr_brigade_cleanup(bb);
+
+    return rv;
 }
 
 AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- httpd.spec	22 Aug 2007 19:03:11 -0000	1.113
+++ httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
@@ -6,7 +6,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 9
+Release: 10
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -474,6 +474,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
+- rebuild for fixed APR
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 2.2.4-9
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:05:55 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:05:55 -0400
Subject: rpms/php/devel php.spec,1.146,1.147
Message-ID: <200709021405.l82E5tPq020388@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20345

Modified Files:
	php.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
- rebuild for fixed APR



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- php.spec	28 Aug 2007 18:37:03 -0000	1.146
+++ php.spec	2 Sep 2007 14:05:18 -0000	1.147
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language
 Name: php
 Version: 5.2.3
-Release: 8
+Release: 9
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -716,6 +716,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
+- rebuild for fixed APR
+
 * Tue Aug 28 2007 Joe Orton <jorton at redhat.com> 5.2.3-8
 - add ldconfig post/postun for -embedded (Hans de Goede)
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:06:22 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:06:22 -0400
Subject: rpms/mod_python/devel mod_python.spec,1.38,1.39
Message-ID: <200709021406.l82E6MnW020453@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20370

Modified Files:
	mod_python.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 3.3.1-5
- rebuild for fixed 32-bit APR



Index: mod_python.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_python.spec	21 Aug 2007 11:21:02 -0000	1.38
+++ mod_python.spec	2 Sep 2007 14:05:49 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: An embedded Python interpreter for the Apache HTTP Server
 Name: mod_python
 Version: 3.3.1
-Release: 4
+Release: 5
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch1: mod_python-3.1.3-ldflags.patch
@@ -59,6 +59,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 3.3.1-5
+- rebuild for fixed 32-bit APR
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 3.3.1-4
 - fix License
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:06:51 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:06:51 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.18,1.19
Message-ID: <200709021406.l82E6pkZ020497@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_kerb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20433

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
- rebuild for fixed 32-bit APR



Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_auth_kerb.spec	30 Aug 2007 13:56:58 -0000	1.18
+++ mod_auth_kerb.spec	2 Sep 2007 14:06:19 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.3
-Release: 4
+Release: 5
 License: BSD and MIT
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -52,6 +52,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 5.3-4
 - clarify License tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:07:30 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:07:30 -0400
Subject: rpms/mod_perl/devel mod_perl.spec,1.51,1.52
Message-ID: <200709021407.l82E7UeN020567@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540

Modified Files:
	mod_perl.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
- rebuild for fixed 32-bit APR



Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mod_perl.spec	23 Aug 2007 07:57:57 -0000	1.51
+++ mod_perl.spec	2 Sep 2007 14:06:57 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.3
-Release:        12
+Release:        13
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@
 %{_includedir}/httpd/*
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 2.0.3-12
 - rebuild for expat soname bump
 



From fedora-extras-commits at redhat.com  Sun Sep  2 14:15:34 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:15:34 -0400
Subject: rpms/apr/devel apr.spec,1.70,1.71
Message-ID: <200709021415.l82EFYrQ021076@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20868

Modified Files:
	apr.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
- fix API/ABI of 32-bit builds (#254241)



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- apr.spec	31 Aug 2007 21:07:37 -0000	1.70
+++ apr.spec	2 Sep 2007 14:15:02 -0000	1.71
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.9
-Release: 3
+Release: 4
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,6 +18,7 @@
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
+Patch7: apr-1.2.9-openlfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, e2fsprogs-devel, python
 
@@ -47,6 +48,7 @@
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
+%patch7 -p1 -b .openlfs
 
 %build
 # regenerate configure script etc.
@@ -60,7 +62,6 @@
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom
-
 make %{?_smp_mflags}
 
 %install
@@ -86,6 +87,15 @@
       $RPM_BUILD_ROOT%{_libdir}/libapr-*.a
 
 %check
+%if "%{_lib}" == "lib"
+# Fail if LFS support isn't preent in a 32-bit build, since this
+# breaks ABI and the soname doesn't change: see #254241
+if ! grep off64_t include/apr.h; then
+  cat config.log
+  : LFS support not present in 32-bit build
+  exit 1
+fi
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +124,7 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
-* Fri Aug 31 2007 Joe Orton <jorton at redhat.com> 1.2.9-3
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
 - fix API/ABI of 32-bit builds (#254241)
 
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1.2.9-2



From fedora-extras-commits at redhat.com  Sun Sep  2 14:53:31 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 10:53:31 -0400
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.29,1.30
Message-ID: <200709021453.l82ErVtD023524@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_pgsql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23497

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-6
- rebuild for fixed APR



Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_auth_pgsql.spec	21 Aug 2007 12:52:47 -0000	1.29
+++ mod_auth_pgsql.spec	2 Sep 2007 14:52:58 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache HTTP Server using a PostgreSQL database
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 5
+Release: 6
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-6
+- rebuild for fixed APR
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2.0.3-5
 - fix License, and package the license text
 



From fedora-extras-commits at redhat.com  Sun Sep  2 15:06:18 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 2 Sep 2007 11:06:18 -0400
Subject: rpms/gstreamer-plugins-good/devel
	gstreamer-0.10.6-id3demux-segment.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.44, 1.45
Message-ID: <200709021506.l82F6IEJ029775@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29753

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gstreamer-0.10.6-id3demux-segment.patch 
Log Message:
* Sun Sep 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-5
- Add a patch to fix id3demux, so that MP3s can be played back
  (#273561)


gstreamer-0.10.6-id3demux-segment.patch:

--- NEW FILE gstreamer-0.10.6-id3demux-segment.patch ---
--- gstid3demux.c	2007/05/25 20:51:36	1.29
+++ gstid3demux.c	2007/07/10 10:16:38	1.30
@@ -646,10 +646,7 @@
 
         /* Might need a new segment before the buffer */
         if (id3demux->need_newseg) {
-          if (!gst_id3demux_send_new_segment (id3demux)) {
-            GST_DEBUG_OBJECT (id3demux, "Failed to send new segment event");
-            goto error;
-          }
+          gst_id3demux_send_new_segment (id3demux);
           id3demux->need_newseg = FALSE;
         }
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gstreamer-plugins-good.spec	28 Aug 2007 22:29:07 -0000	1.44
+++ gstreamer-plugins-good.spec	2 Sep 2007 15:05:45 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.6
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -14,6 +14,7 @@
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
 Patch0:		gst-plugins-good-0.10.4-docs.patch
+Patch1:		gstreamer-0.10.6-id3demux-segment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}
@@ -95,6 +96,9 @@
 %prep
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p1 -b .docs
+pushd gst/id3demux/
+%patch1 -p0 -b .segment
+popd
 
 %build
 
@@ -232,8 +236,12 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sun Sep 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-5
+- Add a patch to fix id3demux, so that MP3s can be played back
+  (#273561)
+
 * Tue Aug 28 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.6-4
--Add the ladspa plugins (#253375)
+- Add the ladspa plugins (#253375)
 
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 0.10.6-3
 - Rebuild for build id



From fedora-extras-commits at redhat.com  Sun Sep  2 15:24:46 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 2 Sep 2007 11:24:46 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, NONE,
	1.1 xscreensaver.spec, 1.43, 1.44
Message-ID: <200709021524.l82FOkOJ030274@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30252

Modified Files:
	xscreensaver.spec 
Added Files:
	update-xscreensaver-hacks 
Log Message:
* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
- Try to make XScreenSaver.ad modular



--- NEW FILE update-xscreensaver-hacks ---
#!/bin/bash

_SYSCONFDIR=${sysconfdir:-/etc}
_PREFIX=${prefix:-/usr}
_DATADIR=${datadir:-${_PREFIX}/share}

ADDIR=${ADDIR:-${install_prefix}${_SYSCONFDIR}/xscreensaver}
CONFDIR=${CONFDIR:-${install_prefix}${_DATADIR}/xscreensaver/hacks.conf.d}
ADFILE=${ADFILE:-$ADDIR/XScreenSaver.ad}

fix_hackconf ()
{
	if [ ! -s $1 ] ; then
		echo "$1 is empty" &>2
		echo ""
		return 1
	fi

	tmpconf=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_1=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_2=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_3=`mktemp /tmp/hackconf.XXXXXXXX`
	sed -n -e '$p' $1 > $tmpconf_1
	sed -e '$d' $1 > $tmpconf_2
	for file in $tmpconf_1 $tmpconf_2 ; do
		if ( [ -s $file ] && grep -q '\\n\(\|\\\)[^\\].*$' $file ) ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
	done
	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
	fi
	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
	while [ -s $tmpconf_2 ] ; do
		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
		sed -i -e '1d' $tmpconf_2
		if grep -q '\\..*$' $tmpconf_3 ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
		if ! grep -q '\\$' $tmpconf_3 ; then
			sed -i -e 's|\(^.*$\)|\1\\|' $tmpconf_3
		fi
		cat $tmpconf_3 >> $tmpconf
	done
	cat $tmpconf_1 >> $tmpconf
	rm -f $tmpconf_1 $tmpconf_2 $tmpconf_3
	echo $tmpconf
	return 0
	
}

for suffix in header tail ; do
	if [ ! -r $ADDIR/XScreenSaver.ad.$suffix ] ; then
		echo "$ADDIR/XScreenSaver.ad.$suffix missing"
		exit 1
	fi
done

tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
cat $ADDIR/XScreenSaver.ad.header > $tmpfile

for hackconf in $CONFDIR/*.conf ; do
	hackconf_fixed=`fix_hackconf $hackconf`
	if [ -n "$hackconf_fixed" ] ; then
		cat $hackconf >> $tmpfile
		rm -f $hackconf_fixed
	fi
done
sed -i -e '$s|\\n\\$|\\n|' $tmpfile

cat $ADDIR/XScreenSaver.ad.tail >> $tmpfile
install -c -p -m 644 $tmpfile $ADFILE
rm -f $tmpfile




Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xscreensaver.spec	28 Aug 2007 19:18:51 -0000	1.43
+++ xscreensaver.spec	2 Sep 2007 15:24:14 -0000	1.44
@@ -2,7 +2,7 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define extrarel      %{nil}
 
@@ -16,6 +16,7 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
+%define modular_conf  1
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,7 @@
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+Source10:        update-xscreensaver-hacks
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
@@ -272,6 +274,64 @@
 
 make %{?_smp_mflags}
 
+%if %{modular_conf}
+# Make XScreenSavar.ad modular
+CONFD=xscreensaver
+rm -rf $CONFD
+mkdir $CONFD
+
+# preserve the original adfile
+cp -p driver/XScreenSaver.ad $CONFD
+
+# First split XScreenSaver.ad into 3 parts
+cat driver/XScreenSaver.ad | \
+   sed -n -e '1,/\*programs/p' > $CONFD/XScreenSaver.ad.header
+cat driver/XScreenSaver.ad | sed -e '1,/\*programs/d' | \
+   sed -n -e '1,/\\n$/p' > $CONFD/XScreenSaver.ad.hacks
+cat driver/XScreenSaver.ad | sed -e '1,/\\n$/d' > $CONFD/XScreenSaver.ad.tail
+
+# Seperate XScreenSaver.ad.hacks into each hacks
+cd $CONFD
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/ ; cd hacks.conf.d
+
+while [ -s XScreenSaver.ad.hacks ] ; do
+# cut hacks file by \n
+   sed -n -e '1,1p' XScreenSaver.ad.hacks > .tmp
+   if grep -q '\\n[\\]*$' .tmp ; then
+      sed -i -e '1d' XScreenSaver.ad.hacks
+   else
+      sed -n -e '1,/\\n[\\]*$/p' XScreenSaver.ad.hacks > .tmp
+      sed -i -e '1,/\\n[\\]*$/d' XScreenSaver.ad.hacks
+   fi
+
+# name modular hack conf
+   set +x
+   cp -p .tmp .tmp.2
+   modname='\'
+   while ( echo $modname | grep -q '\\' ) ; do
+      sed -n -e '1,1p' .tmp.2 | sed -e \
+         's|^[-]*[ \t][ \t]*\([a-zA-Z][a-zA-Z-]*:[ \t][ \t]*\)*\("[^"][^"]*"[ \t][ \t]*\)*||' | \
+         sed -e 's|[ \t].*$||' > .mod.name
+      modname=`cat .mod.name`
+      sed -i -e '1,1d' .tmp.2
+   done
+   N=1
+   Filen=$modname.conf
+   while [ -f $Filen ] ; do
+      N=$((N+1))
+      Filen=$modname-$N.conf
+   done
+   sed -e 's|\\n$|\\n\\|' .tmp > $Filen
+   echo "   created: $Filen"
+
+# clean up
+   rm -f .tmp* .mod.name
+
+done
+set -x
+cd ../..
+%endif
+
 %install
 archdir=`./config.guess`
 cd $archdir
@@ -323,6 +383,57 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+%if %{modular_conf}
+# install update script
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}
+echo "%{_bindir}/update-xscreensaver-hacks" >> $dd/base.files
+
+# make hack conf modular
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
+cp -p xscreensaver/XScreenSaver.ad* \
+   $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+cp -p xscreensaver/hacks.conf.d/*.conf \
+   $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
+
+for adfile in xscreensaver/XScreenSaver.ad.* ; do
+   filen=`basename $adfile`
+   echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
+done
+echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
+echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+   $dd/base.files
+
+# check symlink
+rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+pushd ../../../..
+if [ ! $(pwd) == $RPM_BUILD_ROOT ] ; then
+   echo "Possibly symlink broken"
+   exit 1
+fi
+popd
+popd
+
+ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
+   $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+set +x
+for conf in xscreensaver/hacks.conf.d/*.conf ; do
+   modname=`basename $conf | sed -e 's|.conf||' | sed -e 's|-.*||'`
+   if grep -q -i $modname $dd/extras.files ; then
+        hackfile=$dd/extras.files
+   else
+        hackfile=$dd/gl-extras.files
+   fi
+   echo "%{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`" >> $hackfile
+   echo -n " Added: %{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`"
+   echo " >> `basename $hackfile`"
+done
+set -x
+%endif
+
 # add documents
 pushd $dd &> /dev/null
 for f in README* ; do
@@ -332,7 +443,7 @@
 
 # add directory
 pushd $RPM_BUILD_ROOT
-for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+for dir in `find . -type d | grep xscreensaver` ; do
    echo "%%dir ${dir#.}" >> $dd/base.files
 done
 popd
@@ -414,6 +525,16 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%if %{modular_conf}
+%post extras
+%{_bindir}/update-xscreensaver-hacks
+exit 0
+
+%post gl-extras
+%{_bindir}/update-xscreensaver-hacks
+exit 0
+%endif
+
 %files
 %defattr(-,root,root,-)
 
@@ -433,6 +554,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
+- Try to make XScreenSaver.ad modular
+
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
 



From fedora-extras-commits at redhat.com  Sun Sep  2 16:50:00 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Sun, 2 Sep 2007 12:50:00 -0400
Subject: rpms/audit/devel .cvsignore, 1.81, 1.82 audit.spec, 1.144,
	1.145 sources, 1.101, 1.102 audit-1.6-audispd.patch, 1.1,
	NONE s-c-audit-0.4.3.patch, 1.1, NONE
Message-ID: <200709021650.l82Go0vw008209@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8180

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.6-audispd.patch s-c-audit-0.4.3.patch 
Log Message:
* Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
- External plugin support in place
- Fix reference counting in auparse python bindings (#263961)
- Moved default af_unix plugin socket to /var/run/audispd_events



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	27 Aug 2007 20:29:41 -0000	1.81
+++ .cvsignore	2 Sep 2007 16:49:22 -0000	1.82
@@ -78,3 +78,4 @@
 audit-1.5.5.tar.gz
 audit-1.5.6.tar.gz
 audit-1.6.tar.gz
+audit-1.6.1.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- audit.spec	29 Aug 2007 17:18:22 -0000	1.144
+++ audit.spec	2 Sep 2007 16:49:22 -0000	1.145
@@ -1,16 +1,14 @@
 %define sca_version 0.4.3
-%define sca_release 2
+%define sca_release 3
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch1: s-c-audit-0.4.3.patch
-Patch2: audit-1.6-audispd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -69,8 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -158,6 +154,7 @@
 
 %files libs-devel
 %defattr(-,root,root)
+%doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
@@ -175,7 +172,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -194,7 +191,7 @@
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/*
+%attr(640,root,root) /etc/audisp/plugins.d/*
 
 %files -n system-config-audit -f system-config-audit.lang
 %defattr(-,root,root,-)
@@ -212,6 +209,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
+- External plugin support in place
+- Fix reference counting in auparse python bindings (#263961)
+- Moved default af_unix plugin socket to /var/run/audispd_events
+
 * Wed Aug 29 2007 Steve Grubb <sgrubb at redhat.com> 1.6-3
 - Add newline to audispd string formatted events
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	27 Aug 2007 20:29:41 -0000	1.101
+++ sources	2 Sep 2007 16:49:22 -0000	1.102
@@ -1 +1 @@
-538b2fc33878e420da1daabc769d1e1b  audit-1.6.tar.gz
+ce393ed76e25dd95f2d54ae27e7a25be  audit-1.6.1.tar.gz


--- audit-1.6-audispd.patch DELETED ---


--- s-c-audit-0.4.3.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 17:00:26 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sun,  2 Sep 2007 13:00:26 -0400
Subject: status-report-scripts pyGetReviewByFlags,1.7,1.8
Message-ID: <200709021700.l82H0RXm008494@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8476

Modified Files:
	pyGetReviewByFlags 
Log Message:
Adjust to new xmlrpc interface location.



Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyGetReviewByFlags	26 Jul 2007 18:01:12 -0000	1.7
+++ pyGetReviewByFlags	2 Sep 2007 17:00:23 -0000	1.8
@@ -17,7 +17,7 @@
 import tempfile
 import glob
 
-url = 'http://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
+url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
 
 flagData = {
     # 'FLAG' : (baseFlagFilename, openMsg, closeMsg),



From fedora-extras-commits at redhat.com  Sun Sep  2 17:20:55 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 13:20:55 -0400
Subject: rpms/icewm/EL-4 .cvsignore, 1.2, 1.3 icewm.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200709021720.l82HKtlQ015384@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362

Modified Files:
	.cvsignore icewm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Feb 2007 09:55:58 -0000	1.2
+++ .cvsignore	2 Sep 2007 17:20:22 -0000	1.3
@@ -1 +1 @@
-icewm-1.2.30.tar.gz
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/icewm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icewm.spec	27 Aug 2007 14:00:27 -0000	1.3
+++ icewm.spec	2 Sep 2007 17:20:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,13 @@
 
 
 %changelog
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsYSaXQR and /tmp/cvsI3AzIk differ



From fedora-extras-commits at redhat.com  Sun Sep  2 17:26:29 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 2 Sep 2007 13:26:29 -0400
Subject: rpms/piklab/devel piklab.spec,1.18,1.19
Message-ID: <200709021726.l82HQTtQ015515@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430/devel

Modified Files:
	piklab.spec 
Log Message:



Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- piklab.spec	18 Aug 2007 09:52:47 -0000	1.18
+++ piklab.spec	2 Sep 2007 17:25:56 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.14.5
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications ?? base de microcontr??leurs PIC et de dsPIC
 
@@ -70,14 +70,15 @@
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --add-category "Application" \
-  --remove-category "QT" \
+
+desktop-file-install --vendor=fedora \
+  --dir %{buildroot}%{_datadir}/applications \
+  --add-category "Science" \
+  --remove-category "Development" \
+  --remove-category "IDE" \
   --remove-key="Patterns" \
   --delete-original \
-  src/data/app_data/%{name}.desktop
+  %{buildroot}/usr/share/applications/kde/piklab.desktop
 
 %{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
 %{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
@@ -102,18 +103,18 @@
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
 %{_datadir}/doc/HTML/en/%{name}/
@@ -124,6 +125,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Sun Sep 02 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.14.5-2
+  - fixing desktop file
+
 * Fri Aug 17 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.14.5-1
   - New upstream version
   - %%patch0 is no more needed



From fedora-extras-commits at redhat.com  Sun Sep  2 18:22:24 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 2 Sep 2007 14:22:24 -0400
Subject: rpms/subversion/devel subversion.spec,1.100,1.101
Message-ID: <200709021822.l82IMOwe022380@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22336

Modified Files:
	subversion.spec 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.4.4-7
- rebuild for fixed 32-bit APR 



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- subversion.spec	30 Aug 2007 14:37:01 -0000	1.100
+++ subversion.spec	2 Sep 2007 18:21:51 -0000	1.101
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.4
-Release: 6
+Release: 7
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -274,6 +274,9 @@
 %endif
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.4.4-7
+- rebuild for fixed 32-bit APR 
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 1.4.4-6
 - clarify License tag; re-enable test suite
 



From fedora-extras-commits at redhat.com  Sun Sep  2 18:56:39 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 14:56:39 -0400
Subject: rpms/subcommander/devel subcommander.spec,1.3,1.4
Message-ID: <200709021856.l82IudTZ022920@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/subcommander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22897

Modified Files:
	subcommander.spec 
Log Message:
Rebuild agains new neon lib


Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- subcommander.spec	8 Aug 2007 18:22:03 -0000	1.3
+++ subcommander.spec	2 Sep 2007 18:56:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		subcommander
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -66,6 +66,9 @@
 %doc README CHANGES COPYING
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-7
+- Rebuild agains updated neon lib (#243638)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-6
 - Changing license tag
 



From fedora-extras-commits at redhat.com  Sun Sep  2 19:31:09 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:31:09 -0400
Subject: rpms/suck/F-7 README.Fedora,1.1,1.2 suck.spec,1.10,1.11
Message-ID: <200709021931.l82JV96e029333@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267

Modified Files:
	README.Fedora suck.spec 
Log Message:
Add IPv6 support


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	8 Nov 2004 05:23:08 -0000	1.1
+++ README.Fedora	2 Sep 2007 19:30:36 -0000	1.2
@@ -75,7 +75,7 @@
 
 Then you can create a newsgroup with the following command:
 
-$ ctlinnd newgroups de.test
+$ ctlinnd newgroup de.test
 
 In this example a group for posting test articles was created on the local
 newsserver.


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- suck.spec	25 Mar 2007 19:10:10 -0000	1.10
+++ suck.spec	2 Sep 2007 19:30:36 -0000	1.11
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 14%{?dist}
+Release: 17%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -11,10 +11,12 @@
 Patch1: suck-4.3.2-perl.patch
 Patch2: suck-4.3.2-samples.patch
 Patch3: suck-4.3.2-parallel-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+Patch4: suck-4.3.2-ipv6.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 License: Public Domain
 Group: System Environment/Daemons
-BuildRequires: inn-devel >= 2.3, perl >= 3:5.8
+BuildRequires: inn-devel >= 2.3, perl-devel >= 3:5.8
 BuildRequires: openssl-devel, autoconf
 Requires: inn >= 2.3
 Conflicts: leafnode
@@ -30,6 +32,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp %{SOURCE3} .
 
@@ -42,12 +45,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall mandir=${RPM_BUILD_ROOT}%{_mandir}/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/news/bin
+make install DESTDIR=${RPM_BUILD_ROOT} \
+     bindir=${RPM_BUILD_ROOT}%{_bindir} \
+     mandir=${RPM_BUILD_ROOT}%{_mandir}/man1
+
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
-mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
-cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_libdir}/news/bin/getnews
+cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
 cp sample/put.news.sm ${RPM_BUILD_ROOT}/var/lib/news/suck/
 cp sample/put.news.sm.pl ${RPM_BUILD_ROOT}/var/lib/news/suck/
 cp %{SOURCE1} ${RPM_BUILD_ROOT}/var/lib/news/suck
@@ -66,8 +72,8 @@
 %{_bindir}/rpost
 %{_bindir}/testhost
 %{_bindir}/lmove
-%{_libdir}/news/bin/getnews
-%dir /var/lib/news/suck/
+%{_prefix}/lib/news/bin/getnews
+%attr(-,news,news) %dir /var/lib/news/suck/
 /var/lib/news/suck/put.news.sm
 /var/lib/news/suck/put.news.sm.pl
 /var/lib/news/suck/active-ignore
@@ -77,9 +83,19 @@
 %{_mandir}/man1/lmove.1*
 
 %dir /etc/sysconfig/suck/
-%config(noreplace) /etc/sysconfig/suck/site
+%config(noreplace) %{_sysconfdir}/sysconfig/suck/site
 
 %changelog
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
+- Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
+
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16
+- Adding IPv6 support
+- Fix typo in README.Fedora
+
+* Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-15
+- Rebuild for build id feature
+
 * Sun Mar 25 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-14
 - Add parallel build putch
 



From fedora-extras-commits at redhat.com  Sun Sep  2 19:34:38 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:34:38 -0400
Subject: rpms/suck/F-7 suck-4.3.2-ipv6.patch,NONE,1.1 suck.spec,1.11,1.12
Message-ID: <200709021934.l82JYcXE029470@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29404

Modified Files:
	suck.spec 
Added Files:
	suck-4.3.2-ipv6.patch 
Log Message:
Add forgotten file

suck-4.3.2-ipv6.patch:

--- NEW FILE suck-4.3.2-ipv6.patch ---
diff -urN suck-4.3.2.orig/active.c suck-4.3.2/active.c
--- suck-4.3.2.orig/active.c	2001-09-15 00:06:40.000000000 +0200
+++ suck-4.3.2/active.c	2007-08-15 13:33:49.000000000 +0200
@@ -181,7 +181,6 @@
 	
 	/* connect to localhost NNTP server */
 	int fd;
-	struct hostent *hi;
 	char *inbuf;
 	unsigned int port;
 
@@ -190,7 +189,7 @@
 		do_debug("Connecting to %s on port %d\n", master->localhost, port);
 	}
 	
-	if((fd = connect_to_nntphost(master->localhost, &hi, NULL, port, master->local_ssl, &master->local_ssl_struct)) >= 0) {
+	if((fd = connect_to_nntphost(master->localhost, NULL, 0, NULL, port, master->local_ssl, &master->local_ssl_struct)) >= 0) {
 		/* get the announcement line */
 		if(sgetline(fd, &inbuf, master->local_ssl, master->local_ssl_struct) < 0) {
 			close(fd);
diff -urN suck-4.3.2.orig/both.c suck-4.3.2/both.c
--- suck-4.3.2.orig/both.c	2003-03-25 23:38:45.000000000 +0100
+++ suck-4.3.2/both.c	2007-08-15 13:33:49.000000000 +0200
@@ -138,35 +138,13 @@
 	return retval;
 }
 
-/*---------------------------------------------*/
-struct hostent *get_hostent(const char *host) {
-	struct in_addr saddr;
-	int c;
-	struct hostent *hi = NULL;
-
-	if(host==NULL) { 
-		error_log(ERRLOG_REPORT,both_phrases[0], NULL); 
-	}
-	else {
-		c=*host;
-		if(isdigit(c)) {
- 			saddr.s_addr = inet_addr(host); 
- 			hi = gethostbyaddr((char *)&saddr,sizeof(struct in_addr),AF_INET);
-		}
-		else {
-			hi = gethostbyname(host);
-		}
-	}
-	return hi;
-}
 /*--------------------------------------------*/
-int connect_to_nntphost(const char *host, struct hostent **hi, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl) {
-	char *ptr, *realhost;
-	struct in_addr *aptr;
-	struct in_addr saddr;
-	struct sockaddr_in address;
+int connect_to_nntphost(const char *host, char *hname, size_t hnlength, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl)
+{
+	char *realhost, *pport;
 	char sport[10];
-	int sockfd = -1;
+	struct addrinfo *l, hint = { 0 };
+	int r, sockfd = -1;
 	
 #ifdef HAVE_LIBSSL
 	SSL *ssl_struct = NULL;
@@ -184,65 +162,60 @@
 	}
 #endif
 	/* handle host:port type syntax */
-	realhost = strdup(host);
-	if(realhost == NULL) {
-		MyPerror("out of memory copying host name");
-		return sockfd;
-	}
-	ptr = strchr(realhost, ':');
-	if(ptr != NULL) {
-		*ptr = '\0';  /* null terminate host name */
-		portnr = atoi(++ptr); /* get port number */
-	}
-	
-	
-	
-	sprintf(sport, "%hu", portnr);	/* cause print_phrases wants all strings */
-	print_phrases(msgs, both_phrases[1], sport, NULL);
-
-	/* Find the internet address of the NNTP server */
- 	*hi = get_hostent(realhost);
- 	if(*hi == NULL) {
+	realhost = alloca(strlen(host) + 1);
+	strcpy(realhost, host);
+	pport = strchr(realhost, ':');
+	if(pport != NULL) {
+		*pport = '\0';	/* null terminate host name */
+		++pport;	/* get port number */
+	}
+	else
+	{
+		snprintf(sport, sizeof(sport), "%hu", portnr);	/* cause print_phrases wants all strings */
+		pport = sport;
+	}
+	print_phrases(msgs, both_phrases[1], pport, NULL);
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+	r = getaddrinfo(realhost, pport, &hint, &l);
+	if(r != 0 || l == NULL)
+	{
 		error_log(ERRLOG_REPORT,"%v1%: ",realhost, NULL);
   		MyPerror(both_phrases[2]);
-		free(realhost);
  	}
-	else {
-		free(realhost);
-		print_phrases(msgs, both_phrases[3], (*hi)->h_name, NULL);
- 		while((ptr = *((*hi)->h_aliases)) != NULL) {
-			print_phrases(msgs, both_phrases[4], ptr, NULL );
-			(*hi)->h_aliases++;
-		}
- 		if((*hi)->h_addrtype != AF_INET) {
-  			error_log(ERRLOG_REPORT, both_phrases[5], NULL);
-		}
-		else {
-			while((aptr = (struct in_addr *)*((*hi)->h_addr_list)++) != NULL) {
-				saddr = *aptr;
-				print_phrases(msgs, both_phrases[17], inet_ntoa(*aptr), NULL);
-			}
-
-			/* Create a socket */
- 			if((sockfd = socket( AF_INET, SOCK_STREAM, SOCKET_PROTOCOL)) == -1) {
-				MyPerror(both_phrases[6]);
-			}
-			else { 
-				address.sin_family = AF_INET;
-				address.sin_port = htons(portnr);  /* NNTP port */
-				address.sin_addr= saddr;
-
-				/* Establish a connection */
-				if(connect(sockfd, (struct sockaddr *)&address, sizeof address ) == -1) {
-					MyPerror(both_phrases[7]);
-					close(sockfd);
-					sockfd = -1;
-				}
-				else {
-					print_phrases(msgs,both_phrases[8], (*hi)->h_name, NULL);
+	else
+	{
+		struct addrinfo *p = l;
+		print_phrases(msgs, both_phrases[3], p->ai_canonname, NULL);
+                if((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1)
+		{
+            		MyPerror(both_phrases[6]);
+                }
+                else
+		{
+                        if(connect(sockfd, p->ai_addr, p->ai_addrlen) == -1)
+			{
+                                MyPerror(both_phrases[7]);
+                                close(sockfd);
+                                sockfd = -1;
+                        }
+                        else
+			{
+				char lhost[256], lport[64];
+				r = getnameinfo(p->ai_addr, p->ai_addrlen, lhost, sizeof(lhost),
+						lport, sizeof(lport), 0);
+				if(r == 0)
+				{
+                        		print_phrases(msgs,both_phrases[8], lhost, NULL);
+					if(hname && hnlength)
+					{
+						strncpy(hname, lhost, hnlength);
+						hname[hnlength] = '\0';
+					}
 				}
-			}
+                        }
 		}
+		freeaddrinfo(l);
 #ifdef HAVE_LIBSSL
 		if(sockfd > -1 && do_ssl == TRUE) {
 			if((ssl_struct = SSL_new(test1)) == NULL) {
diff -urN suck-4.3.2.orig/both.h suck-4.3.2/both.h
--- suck-4.3.2.orig/both.h	2002-08-28 00:54:34.000000000 +0200
+++ suck-4.3.2/both.h	2007-08-15 13:33:49.000000000 +0200
@@ -9,7 +9,7 @@
 /* declarations */
 int sgetline(int fd, char **sbuf, int, void *);
 int sputline(int fd, const char *outbuf, int, void *);
-int connect_to_nntphost(const char *host, struct hostent **, FILE *, unsigned short int, int, void **);
+int connect_to_nntphost(const char *host, char *hname, size_t hnlength, FILE *msgs, unsigned short int portnr, int do_ssl, void **ssl);
 void disconnect_from_nntphost(int, int, void **);
 char *number(char *sp, int *intPtr);
 char *get_long(char *, long *);
diff -urN suck-4.3.2.orig/rpost.c suck-4.3.2/rpost.c
--- suck-4.3.2.orig/rpost.c	2007-08-15 13:33:17.000000000 +0200
+++ suck-4.3.2/rpost.c	2007-08-15 13:33:49.000000000 +0200
@@ -28,7 +28,7 @@
 #ifndef PL_na
 # define PL_na (na)
 #endif
-#endif /* OLD_PERL */u
+#endif /* OLD_PERL */
 #endif
 
 #ifdef HAVE_DIRENT_H
@@ -117,7 +117,7 @@
 int main(int argc, char *argv[], char *env[]) {
 	char *inbuf;
 	int response, retval, loop, fargc, i;
-	struct hostent *hi;
+	char hname[256];
 	struct stat sbuf;
 	char **args, **fargs;
 	Args myargs;
@@ -244,7 +244,7 @@
 			retval = RETVAL_ERROR;
 		}
 		else {
-			myargs.sockfd = connect_to_nntphost( myargs.host, &hi, myargs.status_fptr, myargs.portnr, myargs.do_ssl, &myargs.ssl_struct);
+			myargs.sockfd = connect_to_nntphost(myargs.host, hname, sizeof(hname), myargs.status_fptr, myargs.portnr, myargs.do_ssl, &myargs.ssl_struct);
 			if(myargs.sockfd < 0) {
 				retval = RETVAL_ERROR;
 			}
@@ -299,7 +299,7 @@
 				retval = do_article(&myargs, stdin);
 			}
 	
-			print_phrases(myargs.status_fptr, rpost_phrases[4], hi->h_name, NULL);
+			print_phrases(myargs.status_fptr, rpost_phrases[4], hname, NULL);
 			if(myargs.debug == TRUE) {
 				do_debug("Sending quit");
 			}
diff -urN suck-4.3.2.orig/suck.c suck-4.3.2/suck.c
--- suck-4.3.2.orig/suck.c	2003-03-28 20:24:54.000000000 +0100
+++ suck-4.3.2/suck.c	2007-08-15 13:33:49.000000000 +0200
@@ -665,7 +665,6 @@
 
 	char *inbuf;
 	int nr, resp, retval = RETVAL_OK;
-	struct hostent *hi;
 	FILE *fp;
 	
 	
@@ -696,7 +695,7 @@
 	}
 	fp = (which_time == CONNECT_FIRST) ? master->msgs : NULL;
 
-	master->sockfd = connect_to_nntphost( master->host, &hi, fp, master->portnr, master->do_ssl, &master->ssl_struct);
+	master->sockfd = connect_to_nntphost( master->host, NULL, 0, fp, master->portnr, master->do_ssl, &master->ssl_struct);
 	
 	if(master->sockfd < 0 ) {
 		retval = RETVAL_ERROR;
diff -urN suck-4.3.2.orig/testhost.c suck-4.3.2/testhost.c
--- suck-4.3.2.orig/testhost.c	2003-03-23 16:34:46.000000000 +0100
+++ suck-4.3.2/testhost.c	2007-08-15 13:33:49.000000000 +0200
@@ -59,7 +59,6 @@
 int main(int argc, char *argv[]) {
 
 	int sockfd, response, loop, cmd, quiet, mode_reader, do_ssl, retval = RETVAL_OK;
-	struct hostent *hi;
 	struct stat sbuf;
 	unsigned short int portnr;
 	FILE *fptr = stdout;		/* used to print output to */
@@ -229,7 +228,7 @@
 	if(retval == RETVAL_OK) {
 		load_phrases(phrases);	/* this is here so everything displays okay */
 
-		sockfd = connect_to_nntphost( host, &hi, (quiet == FALSE)?  fptr : NULL, portnr, do_ssl, &ssl_struct);
+		sockfd = connect_to_nntphost(host, NULL, 0, (quiet == FALSE)?  fptr : NULL, portnr, do_ssl, &ssl_struct);
 		if(sockfd < 0 ) {
 			retval = RETVAL_ERROR;
 		}


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- suck.spec	2 Sep 2007 19:30:36 -0000	1.11
+++ suck.spec	2 Sep 2007 19:34:05 -0000	1.12
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}
+Release: 17%{?dist}.1
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -86,7 +86,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
 
 %changelog
-* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17.1
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16



From fedora-extras-commits at redhat.com  Sun Sep  2 19:44:08 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:44:08 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.4, 1.5 inadyn.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <200709021944.l82Ji8ug029719@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/inadyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29697

Modified Files:
	.cvsignore inadyn.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2005 16:28:46 -0000	1.4
+++ .cvsignore	2 Sep 2007 19:43:36 -0000	1.5
@@ -1 +1 @@
-inadyn.v1.96.zip
+inadyn.v1.96.2.zip


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- inadyn.spec	8 Aug 2007 18:04:24 -0000	1.16
+++ inadyn.spec	2 Sep 2007 19:43:36 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           inadyn
 
-Version:        1.96
-Release: 	4%{?dist}
+Version:        1.96.2
+Release: 	1%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -82,6 +82,9 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96.2-1
+- New upstream release (#270801)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96-4
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2005 16:28:46 -0000	1.4
+++ sources	2 Sep 2007 19:43:36 -0000	1.5
@@ -1 +1 @@
-0d5ab08003ac08c36f55a562d0c4b1c1  inadyn.v1.96.zip
+d394ed5ab7a9313992bdc62c412cb369  inadyn.v1.96.2.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 19:50:12 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 2 Sep 2007 15:50:12 -0400
Subject: rpms/inadyn/F-7 inadyn.spec,1.15,1.16 sources,1.4,1.5
Message-ID: <200709021950.l82JoCwx029878@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/inadyn/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29851

Modified Files:
	inadyn.spec sources 
Log Message:
New upstream version


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/F-7/inadyn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- inadyn.spec	3 Sep 2006 19:31:43 -0000	1.15
+++ inadyn.spec	2 Sep 2007 19:49:39 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           inadyn
 
-Version:        1.96
-Release: 	3%{?dist}
+Version:        1.96.2
+Release: 	1%{?dist}
 
 Summary:        Dynamic DNS Client
 
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://inadyn.ina-tech.net
 Source0:        http://inadyn.ina-tech.net/inadyn.v%{version}.zip
 Source1:        inadyn.conf
@@ -82,6 +82,12 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Sun Sep  2 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96.2-1
+- New upstream release (#270801)
+
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.96-4
+- Changing license tag
+
 * Sun Sep  3 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.96-3
 - Rebuilt for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2005 16:28:46 -0000	1.4
+++ sources	2 Sep 2007 19:49:39 -0000	1.5
@@ -1 +1 @@
-0d5ab08003ac08c36f55a562d0c4b1c1  inadyn.v1.96.zip
+d394ed5ab7a9313992bdc62c412cb369  inadyn.v1.96.2.zip



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:05 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:05 -0400
Subject: rpms/icewm/EL-4 icewm.spec,1.4,1.5
Message-ID: <200709021951.l82Jp5lx030015@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/EL-4

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-4/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	2 Sep 2007 17:20:22 -0000	1.4
+++ icewm.spec	2 Sep 2007 19:50:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:08 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:08 -0400
Subject: rpms/icewm/EL-5 .cvsignore, 1.1, 1.2 icewm.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709021951.l82Jp88S030024@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/EL-5

Modified Files:
	.cvsignore icewm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2007 19:36:05 -0000	1.1
+++ .cvsignore	2 Sep 2007 19:50:35 -0000	1.2
@@ -0,0 +1 @@
+icewm-1.2.32.tar.gz


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/icewm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icewm.spec	27 Aug 2007 14:00:31 -0000	1.4
+++ icewm.spec	2 Sep 2007 19:50:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		1%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,14 +11,13 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _rhel	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --el)}
-%define _fedora	%{expand:%%(/usr/lib/rpm/redhat/dist.sh --fc)}
-
-%if 0%{_fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
+%else
+BuildRequires:	popt
 %endif
 
+BuildRequires:	libXinerama-devel
 BuildRequires:	imlib-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	libXinerama-devel
@@ -136,6 +135,16 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
+* Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
+- Fix missing BR: libXinerama-devel.
+- Fix broken source file.
+
+* Mon Aug 27 2007 <gilboad[AT]gmail.com> - 1.2.32-2
+- Fix bad %%{_fedora} if/else.
+
 * Sun Aug 26 2007 <gilboad[AT]gmail.com> - 1.2.32-1
 - Fixed license tag.
 - Fixed F8 BR - popt-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvs4k5Nd3 and /tmp/cvsAbnpcP differ



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:10 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:10 -0400
Subject: rpms/icewm/F-7 icewm.spec,1.6,1.7
Message-ID: <200709021951.l82JpAPN030027@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/F-7

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/F-7/icewm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icewm.spec	1 Sep 2007 08:28:59 -0000	1.6
+++ icewm.spec	2 Sep 2007 19:50:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:13 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:13 -0400
Subject: rpms/icewm/FC-6 icewm.spec,1.5,1.6
Message-ID: <200709021951.l82JpDNv030030@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/FC-6

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/FC-6/icewm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icewm.spec	1 Sep 2007 09:04:21 -0000	1.5
+++ icewm.spec	2 Sep 2007 19:50:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 19:51:16 2007
From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa))
Date: Sun, 2 Sep 2007 15:51:16 -0400
Subject: rpms/icewm/devel icewm.spec,1.6,1.7
Message-ID: <200709021951.l82JpGvK030033@cvs-int.fedora.redhat.com>

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890/devel

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icewm.spec	1 Sep 2007 08:48:41 -0000	1.6
+++ icewm.spec	2 Sep 2007 19:50:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.32
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -11,7 +11,7 @@
 Source2:		icewm.desktop
 Source4:		icewm-startup
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{fedora} >= 8
+%if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Sep 02 2007 <gilboad[AT]gmail.com> - 1.2.32-4
+- Fix mangled if/else. (Again...)
+
 * Sat Sep 01 2007 <gilboad[AT]gmail.com> - 1.2.32-3
 - Fix missing BR: libXinerama-devel.
 - Fix broken source file.



From fedora-extras-commits at redhat.com  Sun Sep  2 20:46:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:46:38 -0400
Subject: rpms/lesstif/devel lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE,
	1.1 lesstif.spec, 1.15, 1.16 lesstif-0.95.0-cutpaste64.patch,
	1.1, NONE lesstif-64.patch, 1.1, NONE
Message-ID: <200709022046.l82Kkcgu005542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5515

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lesstif.spec	30 Aug 2007 22:43:44 -0000	1.15
+++ lesstif.spec	2 Sep 2007 20:46:05 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)


--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 20:49:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:49:15 -0400
Subject: rpms/lesstif/F-7 lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE, 1.1 mwm.desktop,
	NONE, 1.1 lesstif-0.95.0-cutpaste64.patch, 1.1,
	NONE lesstif-64.patch, 1.1, NONE
Message-ID: <200709022049.l82KnFnO005630@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5616

Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch mwm.desktop 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
- Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
- Fix accelkeys which use more then one modifier (bz 214018)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


--- NEW FILE mwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mwm
Comment=Lesstif Motif window manager clone based on fvwm
Exec=mwm
Terminal=False
TryExec=mwm

[Window Manager]
SessionManaged=true



--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 20:51:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:51:44 -0400
Subject: rpms/lesstif/F-7 lesstif.spec,1.11,1.12
Message-ID: <200709022051.l82KpiSF005713@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695

Modified Files:
	lesstif.spec 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lesstif.spec	30 Aug 2007 22:47:17 -0000	1.11
+++ lesstif.spec	2 Sep 2007 20:51:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)



From fedora-extras-commits at redhat.com  Sun Sep  2 20:57:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 2 Sep 2007 16:57:10 -0400
Subject: rpms/lesstif/FC-6 lesstif-0.95.0-XxxxProperty-64bit.patch, NONE,
	1.1 lesstif-0.95.0-attach-bottom-self.patch, NONE,
	1.1 lesstif-0.95.0-xtungrab-warning.patch, NONE, 1.1 mwm.desktop,
	NONE, 1.1 lesstif.spec, 1.9,
	1.10 lesstif-0.95.0-cutpaste64.patch, 1.1, NONE lesstif-64.patch,
	1.1, NONE
Message-ID: <200709022057.l82KvAaN005922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5890

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-xtungrab-warning.patch mwm.desktop 
Removed Files:
	lesstif-0.95.0-cutpaste64.patch lesstif-64.patch 
Log Message:
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
- Stop lessstif from spewing messages about XtUngrab... (bz 210384)


lesstif-0.95.0-XxxxProperty-64bit.patch:

--- NEW FILE lesstif-0.95.0-XxxxProperty-64bit.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
 				     XmClipboard * clip);
 static void _XmClipboardDeleteFormat(Display *display, int id);
 static int _XmClipboardRegisterFormat(Display *display, char *format_name,
-				      int format_len);
+				      long format_len);
 static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
 static void _XmClipboardDeleteItem(Display *display, Window window,
 				   XmClipboard * clip, unsigned item);
@@ -241,7 +241,7 @@
 
 
 static int
-_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
 {
     Atom fmt;
     int flen;
@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
 
 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
 					alloc_size + alloc_incr + 1);
-	memcpy(&ret_buf[offset], prop, alloc_incr);
+        /* Fixup X*Property long == 32 bits confusion if needed */
+        if (actual_format == 32 && sizeof(long) != 4)
+        {
+            int i;
+            unsigned long *in = (unsigned long *)prop;
+            
+            for (i = 0; i < nitems; i++)
+                ret_buf[offset + i] = in[i];
+        }
+        else
+	    memcpy(&ret_buf[offset], prop, alloc_incr);
 	alloc_size += alloc_incr;
 
 	switch (actual_format)
@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
 {
     Window root;
     Atom item;
-    int nunits, tstart, tlen;
+    int i, nunits, tstart, tlen;
     long transferlen;
+    long *convert_buf = NULL;
 
     root = DefaultRootWindow(display);
     item = _XmClipboardGetAtomFromId(display, id);
@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
     case 32:
 	len >>= 2;
 	nunits = transferlen;
+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+	   data, MEUHH */
+	if (sizeof(long) != 4)
+	    convert_buf = XtMalloc(len * sizeof(long));
+        for (i = 0; i < len; i++)
+            convert_buf[i] = data[i];
 	break;
 
     case 16:
@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
 	}
 
 	XChangeProperty(display, root, item, item, format, mode,
-			(unsigned char *)&data[tstart], tlen);
+			convert_buf? (unsigned char *)&convert_buf[tstart] :
+                                     (unsigned char *)&data[tstart],
+                        tlen);
 
 	len -= tlen;
 	mode = PropModeAppend;
@@ -1178,7 +1178,7 @@
     }
     else
     {
-	*format = *((int *)(prop));
+	*format = *((long *)(prop));
 	ret = True;
     }
 
diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
@@ -92,15 +92,28 @@
 void
 PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
 {
-    PropMotifWmInfo info;
+    long info[PROP_MWM_INFO_ELEMENTS];
 
-    /* set the MWM_INFO property on the Root */
+    /* set the MWM_INFO property on the Root, notice that we
+       use an array of longs here and not the PropMotifWmInfo struct,
+       this is because this struct looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when setting 32 bit properties XChangeProperty expects an array of
+       longs, which it will convert to 32 bit values if need. Thus passing an
+       actual PropMotifWmInfo struct will mess things up on archs where longs
+       are 64 bit. */
+    
     if (custom)
-	info.flags = MWM_INFO_STARTUP_CUSTOM;
+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
     else
-	info.flags = MWM_INFO_STARTUP_STANDARD;
+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
 
-    info.wmWindow = scr->root_win;
+    info[1] = scr->root_win; /* set wmWindow "member" */
 
     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
 		    32, PropModeReplace,
@@ -129,7 +142,18 @@
     int actual_format, ret;
     Atom actual_type;
     unsigned long nitems, bytesafter;
-    PropMotifWmInfo *info;
+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
+       this is because this type looks like this in lesstif:
+       
+       typedef struct {
+           CARD32 flags;
+           CARD32 wmWindow;
+       } PropMotifWmInfo;
+       
+       But when getting 32 bit properties XGetWindowProperty returns an array
+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
+       mess things up on archs where longs are 64 bit. */
+    unsigned long *info;
 
     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
@@ -138,7 +162,7 @@
 			   (unsigned char **)&info) == Success)
     {
 	if (nitems > 0 && info)
-	    ret = info->flags;
+	    ret = info[0]; /* Return flags "member" */
 	else
 	    ret = 0;
 	XFree((char *)info);
@@ -284,7 +308,21 @@
     {
 
 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
+	{
+	    /* Fixup X*Property long == 32 bits confusion if needed */
+	    if (sizeof(long) != 4)
+	    {
+	        long *prop_hints = (long *)win->mwm_hints;
+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
+	        win->mwm_hints->flags       = prop_hints[0];
+	        win->mwm_hints->functions   = prop_hints[1];
+	        win->mwm_hints->decorations = prop_hints[2];
+	        win->mwm_hints->input_mode  = prop_hints[3];
+	        win->mwm_hints->status      = prop_hints[4];
+	        XFree(prop_hints);
+	    }
 	    return;
+        }
 
 	XFree((char *)win->mwm_hints);
     }

lesstif-0.95.0-attach-bottom-self.patch:

--- NEW FILE lesstif-0.95.0-attach-bottom-self.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/Form.c~ lesstif-0.95.0/lib/Xm-2.1/Form.c
--- lesstif-0.95.0/lib/Xm-2.1/Form.c~	2007-09-01 20:24:58.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/Form.c	2007-09-01 20:24:58.000000000 +0200
@@ -2538,7 +2538,7 @@ _XmFormLayout(Widget f, Widget cw, XtWid
 		_XmWarning(child, "bottom ATTACH_SELF %s %d"
 			   " no test coverage", __FILE__, __LINE__);
 #endif
-		SETH(XtHeight(child) - XtY(child));	/* FIX ME */
+		SETH(XtHeight(child));
 		FCP_Atta(con, BOTTOM).percent = (FCP_Y(con) + FCP_H(con) +
 					       _XmGetOffset(child, BOTTOM)) *
 		    Form_FractionBase(f) / fh;

lesstif-0.95.0-xtungrab-warning.patch:

--- NEW FILE lesstif-0.95.0-xtungrab-warning.patch ---
diff -up lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c
--- lesstif-0.95.0/lib/Xm-2.1/RowColumn.c~	2007-09-02 22:03:10.000000000 +0200
+++ lesstif-0.95.0/lib/Xm-2.1/RowColumn.c	2007-09-02 22:06:16.000000000 +0200
@@ -1014,6 +1014,10 @@ initialize(Widget request, Widget new_w,
 
 }
 
+static void xtWarnCB(String message)
+{
+}
+
 static void
 destroy(Widget w)
 {
@@ -1033,14 +1039,19 @@ destroy(Widget w)
 
          if (realpar != NULL)
          {
+             XtErrorHandler old_handler;
              XtRemoveEventHandler(realpar,
                                   ButtonPressMask|ButtonReleaseMask,
                                   False, _XmPopupButtonPressHandler,
                                   (XtPointer)w );
-	     /* Fix a grab problem -- dwilliss */
-	     fprintf(stderr, "XtUngrabButton(%s,%u,%u)\n",
-			     XtName(realpar), RC_PostButton(w), RC_PostModifiers(w));
+             /* Yes this may not be necessary, shut up Xt see:
+                http://sourceforge.net/tracker/index.php?func=detail&aid=1217326&group_id=8596&atid=108596 */
+             old_handler = XtAppSetWarningHandler(
+                                        XtWidgetToApplicationContext(realpar),
+                                        xtWarnCB);
 	     XtUngrabButton(realpar, RC_PostButton(w), RC_PostModifiers(w));
+	     XtAppSetWarningHandler(XtWidgetToApplicationContext(realpar),
+	                            old_handler);
          }
      }
 


--- NEW FILE mwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mwm
Comment=Lesstif Motif window manager clone based on fvwm
Exec=mwm
Terminal=False
TryExec=mwm

[Window Manager]
SessionManaged=true



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lesstif.spec	30 Aug 2007 23:00:09 -0000	1.9
+++ lesstif.spec	2 Sep 2007 20:56:37 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -46,13 +46,12 @@
 Patch4: lesstif-0.95.0-c++fix.patch
 Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.diff.gz
 Patch6: lesstif-0.95.0-scroll.patch
-# patch from kgallowa at redhat.com, to achieve API conformance with 
-# openmotif on 64 bit.
-Patch7: lesstif-64.patch
 Patch8: lesstif-0.95-resource-fix.patch
 Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-cutpaste64.patch
+Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
 Patch11: lesstif-0.95.0-accelkeys.patch
+Patch12: lesstif-0.95.0-attach-bottom-self.patch
+Patch13: lesstif-0.95.0-xtungrab-warning.patch
 
 Url: http://www.lesstif.org/
 
@@ -146,11 +145,12 @@
 %patch4 -p1 -b .VendorSP
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -305,6 +305,12 @@
 
 
 %changelog
+* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
+- Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
+  cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)
+- Fix z88: http://www.z88.uni-bayreuth.de/ not working with lesstif
+- Stop lessstif from spewing messages about XtUngrab... (bz 210384)
+
 * Thu Aug 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-18
 - Fix cut and paste from / to lesstif apps on 64 bits machines (bz 243508)
 - Fix accelkeys which use more then one modifier (bz 214018)


--- lesstif-0.95.0-cutpaste64.patch DELETED ---


--- lesstif-64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  2 22:25:12 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 2 Sep 2007 18:25:12 -0400
Subject: rpms/vala/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vala.spec,
	1.4, 1.5
Message-ID: <200709022225.l82MPCcx019995@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19918

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
Update to 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2007 16:02:02 -0000	1.5
+++ .cvsignore	2 Sep 2007 22:24:39 -0000	1.6
@@ -1 +1 @@
-vala-0.0.8.tar.bz2
+vala-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2007 16:02:02 -0000	1.5
+++ sources	2 Sep 2007 22:24:39 -0000	1.6
@@ -1 +1 @@
-54c7b20e570121c9151ec9534ed68b79  vala-0.0.8.tar.bz2
+d6552982b10582d0b01c3d612fb098b2  vala-0.1.3.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vala.spec	25 Mar 2007 16:02:02 -0000	1.4
+++ vala.spec	2 Sep 2007 22:24:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           vala
-Version:        0.0.8
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -70,6 +70,7 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +81,9 @@
 
 
 %changelog
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Mon Sep  3 00:49:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 2 Sep 2007 20:49:22 -0400
Subject: comps comps-f8.xml.in,1.85,1.86
Message-ID: <200709030049.l830nMQw001300@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1282

Modified Files:
	comps-f8.xml.in 
Log Message:
add ratpoison to Window Managers



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- comps-f8.xml.in	1 Sep 2007 13:16:06 -0000	1.85
+++ comps-f8.xml.in	3 Sep 2007 00:48:52 -0000	1.86
@@ -3794,6 +3794,7 @@
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">openbox</packagereq>
       <packagereq type="optional">pekwm</packagereq>
+      <packagereq type="optional">ratpoison</packagereq>
       <packagereq type="optional">windowlab</packagereq>
       <packagereq type="optional">WindowMaker</packagereq>
       <packagereq type="optional">wmx</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 02:42:00 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 2 Sep 2007 22:42:00 -0400
Subject: comps comps-f8.xml.in,1.86,1.87
Message-ID: <200709030242.l832g0al014917@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886

Modified Files:
	comps-f8.xml.in 
Log Message:
add matchbox-window-manager



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- comps-f8.xml.in	3 Sep 2007 00:48:52 -0000	1.86
+++ comps-f8.xml.in	3 Sep 2007 02:41:29 -0000	1.87
@@ -3790,6 +3790,7 @@
       <packagereq type="optional">fvwm</packagereq>
       <packagereq type="optional">hackedbox</packagereq>
       <packagereq type="optional">icewm</packagereq>
+      <packagereq type="optional">matchbox-window-manager</packagereq>
       <packagereq type="optional">obconf</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">openbox</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 03:12:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 2 Sep 2007 23:12:30 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.161,1.162
Message-ID: <200709030312.l833CUiO021375@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21357

Modified Files:
	gnome-vfs2.spec 
Log Message:
break dep cycle



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gnome-vfs2.spec	12 Aug 2007 02:17:02 -0000	1.161
+++ gnome-vfs2.spec	3 Sep 2007 03:11:57 -0000	1.162
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.19.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -24,7 +24,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_version}
+#Requires:      gnome-mount >= %{gnome_mount_version}
 Requires:      GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
@@ -229,6 +229,10 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Sun Sep  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-3
+- Temporarily drop gnome-mount requires to break PolicyKit-gnome 
+  dependency cycle
+
 * Sat Aug 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-2
 - Fix the build
 - Update the license field



From fedora-extras-commits at redhat.com  Mon Sep  3 03:17:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 2 Sep 2007 23:17:58 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.162,1.163
Message-ID: <200709030317.l833HwfO021606@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21586

Modified Files:
	gnome-vfs2.spec 
Log Message:
drop one more



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-vfs2.spec	3 Sep 2007 03:11:57 -0000	1.162
+++ gnome-vfs2.spec	3 Sep 2007 03:17:26 -0000	1.163
@@ -48,7 +48,7 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+#BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:10 -0400
Subject: rpms/perl-HTML-Format/devel perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JAiO021722@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/devel

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/devel/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:37 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:12 -0400
Subject: rpms/perl-HTML-Format/F-7 perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JCiu021825@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/F-7

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/F-7/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:40 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:19:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:19:15 -0400
Subject: rpms/perl-HTML-Format/FC-6 perl-HTML-Format.spec,1.4,1.5
Message-ID: <200709030319.l833JFca021828@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656/FC-6

Modified Files:
	perl-HTML-Format.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/FC-6/perl-HTML-Format.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Format.spec	5 Sep 2006 09:24:15 -0000	1.4
+++ perl-HTML-Format.spec	3 Sep 2007 03:18:43 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
 Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
 BuildRequires:	perl(Font::AFM) >= 1.17
 
@@ -63,6 +64,10 @@
 %{_mandir}/man3/HTML*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.04-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:24:50 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:24:50 -0400
Subject: rpms/perl-HTML-Format/devel perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030324.l833Oo5J022448@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22430

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/devel/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:37 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:24:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:25:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:25:57 -0400
Subject: rpms/perl-HTML-Format/F-7 perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030325.l833PvU0022523@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22502

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/F-7/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:40 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:25:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:27:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:27:25 -0400
Subject: rpms/perl-HTML-Format/FC-6 perl-HTML-Format.spec,1.5,1.6
Message-ID: <200709030327.l833RPPx022617@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTML-Format/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22572

Modified Files:
	perl-HTML-Format.spec 
Log Message:
Bump release tag.


Index: perl-HTML-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Format/FC-6/perl-HTML-Format.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTML-Format.spec	3 Sep 2007 03:18:43 -0000	1.5
+++ perl-HTML-Format.spec	3 Sep 2007 03:26:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Format
 Version:        2.04
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:45 -0400
Subject: rpms/perl-File-Find-Rule/devel perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bj9O022858@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/devel

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/devel/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:13 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:48 -0400
Subject: rpms/perl-File-Find-Rule/F-7 perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bmDD022861@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/F-7

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/F-7/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:16 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:37:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 2 Sep 2007 23:37:51 -0400
Subject: rpms/perl-File-Find-Rule/FC-6 perl-File-Find-Rule.spec,1.6,1.7
Message-ID: <200709030337.l833bpJl022864@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808/FC-6

Modified Files:
	perl-File-Find-Rule.spec 
Log Message:
* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
- Update license tag.
- Add BR: perl(ExtUtils::MakeMaker).



Index: perl-File-Find-Rule.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule/FC-6/perl-File-Find-Rule.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Find-Rule.spec	5 Sep 2006 09:37:58 -0000	1.6
+++ perl-File-Find-Rule.spec	3 Sep 2007 03:37:18 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-File-Find-Rule
 Version: 	0.30
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Perl module implementing an alternative interface to File::Find
-License: 	Artistic or GPL
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Find-Rule/
 Source0: 	http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: 	noarch
 BuildRequires:	perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires: 	perl(Number::Compare)
 BuildRequires: 	perl(Text::Glob)
 
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 03 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-3
+- Update license tag.
+- Add BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.30-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 03:43:46 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Sun, 2 Sep 2007 23:43:46 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.35,1.36
Message-ID: <200709030343.l833hk6W023167@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131/F-7

Modified Files:
	stardict.spec 
Log Message:
small fix on rpmlint warning


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stardict.spec	27 Aug 2007 02:38:46 -0000	1.35
+++ stardict.spec	3 Sep 2007 03:43:13 -0000	1.36
@@ -7,7 +7,7 @@
 Version:	%{version}
 Release:	3%{?dist}
 Group: 		Applications/System
-License: 	GPL
+License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.0-floatwin.patch
@@ -68,7 +68,7 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%{_sysconfdir}/gconf/schemas/*.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict



From fedora-extras-commits at redhat.com  Mon Sep  3 03:43:48 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Sun, 2 Sep 2007 23:43:48 -0400
Subject: rpms/stardict/devel stardict.spec,1.35,1.36
Message-ID: <200709030343.l833hmOE023170@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23131/devel

Modified Files:
	stardict.spec 
Log Message:
small fix on rpmlint warning


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stardict.spec	23 Aug 2007 03:17:40 -0000	1.35
+++ stardict.spec	3 Sep 2007 03:43:16 -0000	1.36
@@ -7,7 +7,7 @@
 Version:	%{version}
 Release:	3%{?dist}
 Group: 		Applications/System
-License: 	GPL
+License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.0-floatwin.patch
@@ -68,7 +68,7 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%{_sysconfdir}/gconf/schemas/*.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict



From fedora-extras-commits at redhat.com  Mon Sep  3 04:07:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 00:07:42 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.8,1.9
Message-ID: <200709030407.l8347gBP029377@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29355

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
fix BRs



Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PolicyKit-gnome.spec	1 Sep 2007 00:20:42 -0000	1.8
+++ PolicyKit-gnome.spec	3 Sep 2007 04:07:09 -0000	1.9
@@ -10,7 +10,7 @@
 Summary: GNOME dialogs for PolicyKit
 Name: PolicyKit-gnome
 Version: 0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
@@ -25,6 +25,7 @@
 BuildRequires: PolicyKit-devel >= %{polkit_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: intltool >= %{intltool_version}
+BuildRequires: gettext
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: gtk2 >= %{gtk2_version}
@@ -79,6 +80,9 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 0.5-4
+- Add gettext BR
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
 - Rebuild
 



From fedora-extras-commits at redhat.com  Mon Sep  3 04:26:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 00:26:53 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.50, 1.51 gnome-vfs2.spec, 1.163,
	1.164 sources, 1.52, 1.53
Message-ID: <200709030426.l834QruL029622@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Jul 2007 16:54:22 -0000	1.50
+++ .cvsignore	3 Sep 2007 04:26:21 -0000	1.51
@@ -1 +1 @@
-gnome-vfs-2.19.3.tar.bz2
+gnome-vfs-2.19.91.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-vfs2.spec	3 Sep 2007 03:17:26 -0000	1.163
+++ gnome-vfs2.spec	3 Sep 2007 04:26:21 -0000	1.164
@@ -13,8 +13,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.19.3
-Release: 3%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -24,7 +24,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-#Requires:      gnome-mount >= %{gnome_mount_version}
+Requires:      gnome-mount >= %{gnome_mount_version}
 Requires:      GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
@@ -48,7 +48,7 @@
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-#BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
@@ -72,8 +72,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=356772
 Patch8: gnome-vfs-2.16.0-no-dbus.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=465836
-Patch9: posix.patch
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -126,7 +124,6 @@
 %patch201 -p0 -b .console
 
 %patch8 -p1 -b .no-dbus
-%patch9 -p1 -b .posix
 
 %build
 
@@ -229,6 +226,11 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Re-add gnome-mount dependency
+- Update to 2.19.91
+- Drop upstreamed posix patch
+
 * Sun Sep  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-3
 - Temporarily drop gnome-mount requires to break PolicyKit-gnome 
   dependency cycle


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	27 Jul 2007 16:54:22 -0000	1.52
+++ sources	3 Sep 2007 04:26:21 -0000	1.53
@@ -1 +1 @@
-3668d49286cf73c15c3c5f383f1e6966  gnome-vfs-2.19.3.tar.bz2
+6a08abf1f6f0188d7f4ae1e21a9b9551  gnome-vfs-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:06:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 01:06:42 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.59, 1.60 nautilus.spec, 1.163,
	1.164 sources, 1.63, 1.64
Message-ID: <200709030506.l8356gNs003748@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	14 Aug 2007 02:47:35 -0000	1.59
+++ .cvsignore	3 Sep 2007 05:06:08 -0000	1.60
@@ -1 +1 @@
-nautilus-2.19.90.tar.bz2
+nautilus-2.19.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- nautilus.spec	14 Aug 2007 02:47:35 -0000	1.163
+++ nautilus.spec	3 Sep 2007 05:06:08 -0000	1.164
@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.19.90
+Version: 	2.19.91
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -221,6 +221,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	14 Aug 2007 02:47:35 -0000	1.63
+++ sources	3 Sep 2007 05:06:08 -0000	1.64
@@ -1 +1 @@
-1503bfe9934edebfd0ae34e5f880b425  nautilus-2.19.90.tar.bz2
+0fe63741bbd8052ee0329b3312a2724c  nautilus-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:26:10 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:26:10 -0400
Subject: rpms/libgeda/FC-6 .cvsignore, 1.9, 1.10 libgeda.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200709030526.l835QAHK006018@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994/FC-6

Modified Files:
	.cvsignore libgeda.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:39:02 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:25:38 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/libgeda.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgeda.spec	14 Jul 2007 11:39:02 -0000	1.12
+++ libgeda.spec	3 Sep 2007 05:25:38 -0000	1.13
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
+Version:         20070902
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
-License:         GPL
+License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:39:02 -0000	1.9
+++ sources	3 Sep 2007 05:25:38 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:27:56 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:27:56 -0400
Subject: rpms/libgeda/F-7 .cvsignore, 1.9, 1.10 libgeda.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709030527.l835RupB006116@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6090/F-7

Modified Files:
	.cvsignore libgeda.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:42:10 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:27:23 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/libgeda.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgeda.spec	14 Jul 2007 11:42:10 -0000	1.11
+++ libgeda.spec	3 Sep 2007 05:27:23 -0000	1.12
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
+Version:         20070902
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
-License:         GPL
+License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:42:10 -0000	1.9
+++ sources	3 Sep 2007 05:27:23 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:28:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 01:28:42 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.57, 1.58 file-roller.spec, 1.99,
	1.100 sources, 1.58, 1.59
Message-ID: <200709030528.l835SgI7006201@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6154

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	13 Aug 2007 23:37:37 -0000	1.57
+++ .cvsignore	3 Sep 2007 05:28:09 -0000	1.58
@@ -1 +1 @@
-file-roller-2.19.90.tar.bz2
+file-roller-2.19.91.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- file-roller.spec	24 Aug 2007 14:44:35 -0000	1.99
+++ file-roller.spec	3 Sep 2007 05:28:09 -0000	1.100
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.90
-Release: 	2%{?dist}
+Version:	2.19.91
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	13 Aug 2007 23:37:37 -0000	1.58
+++ sources	3 Sep 2007 05:28:09 -0000	1.59
@@ -1 +1 @@
-c94ae2947227f42b30dcfd366e49dab4  file-roller-2.19.90.tar.bz2
+0afe74b6c2b67e30e5fa6ee2256dcead  file-roller-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 05:29:34 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:29:34 -0400
Subject: rpms/libgeda/devel .cvsignore, 1.9, 1.10 libgeda.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709030529.l835TYkZ006270@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6212/devel

Modified Files:
	.cvsignore libgeda.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2007 11:44:32 -0000	1.9
+++ .cvsignore	3 Sep 2007 05:29:01 -0000	1.10
@@ -1 +1 @@
-libgeda-1.1.1.tar.gz
+libgeda-1.2.0.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgeda.spec	23 Aug 2007 23:20:59 -0000	1.11
+++ libgeda.spec	3 Sep 2007 05:29:01 -0000	1.12
@@ -1,24 +1,26 @@
-%define          real_ver 1.1.1
+%define          real_ver 1.2.0
 
 Name:            libgeda
-Version:         20070708
-Release:         2%{?dist}
+Version:         20070902
+Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
 License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel gawk
+
+Obsoletes:       libgeda-doc < 20070526
+Provides:        libgeda-doc = %{version}-%{release}
 
-Obsoletes:       libgeda-doc
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -28,7 +30,7 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel guile-devel
+Requires:        gtk2-devel guile-devel
 
 
 %description devel
@@ -91,6 +93,9 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
 - mass rebuild for fedora 8 - ppc32
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2007 11:44:32 -0000	1.9
+++ sources	3 Sep 2007 05:29:01 -0000	1.10
@@ -1 +1 @@
-1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz
+43f2b2daabee59ffeae84fe13c10c51d  libgeda-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:32:27 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:32:27 -0400
Subject: rpms/geda-utils/FC-6 .cvsignore, 1.7, 1.8 geda-utils.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030532.l835WRxm006424@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6400/FC-6

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:23:14 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:31:55 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-utils.spec	14 Jul 2007 12:23:14 -0000	1.7
+++ geda-utils.spec	3 Sep 2007 05:31:55 -0000	1.8
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,6 +78,12 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:23:14 -0000	1.7
+++ sources	3 Sep 2007 05:31:55 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:33:43 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:33:43 -0400
Subject: rpms/geda-utils/F-7 .cvsignore, 1.7, 1.8 geda-utils.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030533.l835XhCQ006510@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6485/F-7

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:24:38 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:33:11 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/geda-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-utils.spec	14 Jul 2007 12:24:38 -0000	1.7
+++ geda-utils.spec	3 Sep 2007 05:33:11 -0000	1.8
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,6 +78,12 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:24:38 -0000	1.7
+++ sources	3 Sep 2007 05:33:11 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:35:29 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:35:29 -0400
Subject: rpms/geda-utils/devel .cvsignore, 1.7, 1.8 geda-utils.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200709030535.l835ZT4p006638@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6588/devel

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:27:01 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:34:57 -0000	1.8
@@ -1 +1 @@
-geda-utils-1.1.1.tar.gz
+geda-utils-1.2.0.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/geda-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-utils.spec	24 Aug 2007 00:20:04 -0000	1.8
+++ geda-utils.spec	3 Sep 2007 05:34:57 -0000	1.9
@@ -1,19 +1,19 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-utils
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/utils/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel
+BuildRequires:  libgeda-devel gawk
 Requires:       geda-symbols
 
 %if "%{?fedora}" > "6"
@@ -78,8 +78,11 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:27:01 -0000	1.7
+++ sources	3 Sep 2007 05:34:57 -0000	1.8
@@ -1 +1 @@
-2472e2bc8eaeeefd17d1cbbbd8bc5df2  geda-utils-1.1.1.tar.gz
+7430311688713ae4e924344970deecc5  geda-utils-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:37:00 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:37:00 -0400
Subject: rpms/geda-symbols/FC-6 .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <200709030537.l835b05G006764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701/FC-6

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:08:59 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:36:28 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:08:59 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:36:28 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:08:59 -0000	1.8
+++ sources	3 Sep 2007 05:36:28 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:37:31 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:37:31 -0400
Subject: rpms/geda-gsymcheck/FC-6 .cvsignore, 1.8, 1.9 geda-gsymcheck.spec,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709030537.l835bVZw006832@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6755/FC-6

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:35:57 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:36:58 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/geda-gsymcheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gsymcheck.spec	14 Jul 2007 12:35:57 -0000	1.8
+++ geda-gsymcheck.spec	3 Sep 2007 05:36:58 -0000	1.9
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,6 +58,12 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:35:57 -0000	1.8
+++ sources	3 Sep 2007 05:36:58 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:23 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:23 -0400
Subject: rpms/geda-symbols/F-7 .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <200709030539.l835dNmc007002@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6935/F-7

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:10:29 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:50 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:10:29 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:38:50 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:10:29 -0000	1.8
+++ sources	3 Sep 2007 05:38:50 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:26 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:26 -0400
Subject: rpms/geda-gschem/FC-6 .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.10, 
	1.11 gschem.desktop, 1.3, 1.4 sources, 1.8, 1.9
Message-ID: <200709030539.l835dQqE007010@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6939/FC-6

Modified Files:
	.cvsignore geda-gschem.spec gschem.desktop sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:47:12 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:54 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gschem.spec	14 Jul 2007 11:47:12 -0000	1.10
+++ geda-gschem.spec	3 Sep 2007 05:38:54 -0000	1.11
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,12 +124,18 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: gschem.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/gschem.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gschem.desktop	4 Feb 2007 22:33:04 -0000	1.3
+++ gschem.desktop	3 Sep 2007 05:38:54 -0000	1.4
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gschem
+Name=gEDA Schematic Editor
 GenericName=gEDA Schematic Editor
 Comment=Editor for creating electronic circuit diagrams
 Exec=gschem
 Icon=gschem
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
+Categories=Science;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:47:12 -0000	1.8
+++ sources	3 Sep 2007 05:38:54 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:39:30 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:39:30 -0400
Subject: rpms/geda-gsymcheck/F-7 .cvsignore, 1.8, 1.9 geda-gsymcheck.spec,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709030539.l835dUIY007047@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6944/F-7

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:37:27 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:38:57 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/geda-gsymcheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gsymcheck.spec	14 Jul 2007 12:37:27 -0000	1.8
+++ geda-gsymcheck.spec	3 Sep 2007 05:38:57 -0000	1.9
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,6 +58,12 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:37:27 -0000	1.8
+++ sources	3 Sep 2007 05:38:57 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:40:53 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:40:53 -0400
Subject: rpms/geda-gschem/F-7 .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.10,
	1.11 gschem.desktop, 1.3, 1.4 sources, 1.8, 1.9
Message-ID: <200709030540.l835erw5007236@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7158/F-7

Modified Files:
	.cvsignore geda-gschem.spec gschem.desktop sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:48:33 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:20 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/geda-gschem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gschem.spec	14 Jul 2007 11:48:33 -0000	1.10
+++ geda-gschem.spec	3 Sep 2007 05:40:20 -0000	1.11
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
+Version:          20070902
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
-License:          GPL
+License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,12 +124,18 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: gschem.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/gschem.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gschem.desktop	4 Feb 2007 22:34:32 -0000	1.3
+++ gschem.desktop	3 Sep 2007 05:40:20 -0000	1.4
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gschem
+Name=gEDA Schematic Editor
 GenericName=gEDA Schematic Editor
 Comment=Editor for creating electronic circuit diagrams
 Exec=gschem
 Icon=gschem
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
+Categories=Science;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:48:33 -0000	1.8
+++ sources	3 Sep 2007 05:40:20 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:41:07 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:41:07 -0400
Subject: rpms/geda-symbols/devel .cvsignore, 1.8, 1.9 geda-symbols.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030541.l835f7Hv007292@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7202/devel

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:12:11 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:34 -0000	1.9
@@ -1 +1 @@
-geda-symbols-1.1.1.tar.gz
+geda-symbols-1.2.0.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/geda-symbols.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-symbols.spec	14 Jul 2007 12:12:11 -0000	1.9
+++ geda-symbols.spec	3 Sep 2007 05:40:34 -0000	1.10
@@ -1,15 +1,15 @@
-%define     real_ver 1.1.1
+%define     real_ver 1.2.0
 
 Name:       geda-symbols
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -31,9 +31,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/script.sed
-%{__rm} %{buildroot}%{_datadir}/gEDA/sym/vhdl/verilog2vhdl.sh
-
 # Required by geda-gschem geda-gsymcheck geda-doc geda-gattrib geda-gnetlist geda-utils
 %{__install} -d %{buildroot}%{_datadir}/gEDA/bitmap
 %{__install} -d %{buildroot}%{_docdir}/gEDA/man
@@ -68,6 +65,12 @@
 %{_datadir}/gEDA/scheme/geda-font.scm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:12:11 -0000	1.8
+++ sources	3 Sep 2007 05:40:34 -0000	1.9
@@ -1 +1 @@
-673de2dcbe99ec6ec8f42f9aa7f6d074  geda-symbols-1.1.1.tar.gz
+cbbab791d2e9557513da2fbb2c40ba19  geda-symbols-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:41:25 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:41:25 -0400
Subject: rpms/geda-gsymcheck/devel .cvsignore, 1.8, 1.9 geda-gsymcheck.spec, 
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200709030541.l835fPv5007332@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7230/devel

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:39:18 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:40:53 -0000	1.9
@@ -1 +1 @@
-geda-gsymcheck-1.1.1.tar.gz
+geda-gsymcheck-1.2.0.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/geda-gsymcheck.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gsymcheck.spec	24 Aug 2007 00:17:59 -0000	1.9
+++ geda-gsymcheck.spec	3 Sep 2007 05:40:53 -0000	1.10
@@ -1,19 +1,19 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gsymcheck
-Version:          20070708
-Release:          2%{?dist}
+Version:          20070902
+Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
 License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gsymcheck/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    libgeda-devel
-Requires:         geda-symbols libgeda
+BuildRequires:    libgeda-devel gawk
+Requires:         geda-symbols
 
 %description
 Gsymcheck is a utility to check symbols for gschem.
@@ -58,8 +58,11 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:39:18 -0000	1.8
+++ sources	3 Sep 2007 05:40:53 -0000	1.9
@@ -1 +1 @@
-6060aa73bf8c9f700f1d703e880f28fe  geda-gsymcheck-1.1.1.tar.gz
+bf23cf68e82f14f1e44b83fa9b951b90  geda-gsymcheck-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:18 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:18 -0400
Subject: rpms/geda-gnetlist/FC-6 .cvsignore, 1.8, 1.9 geda-gnetlist.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030543.l835hIFO007487@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7420/FC-6

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:30:07 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:42:45 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/geda-gnetlist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gnetlist.spec	14 Jul 2007 12:30:07 -0000	1.9
+++ geda-gnetlist.spec	3 Sep 2007 05:42:45 -0000	1.10
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,6 +82,12 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:30:07 -0000	1.8
+++ sources	3 Sep 2007 05:42:45 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:41 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:41 -0400
Subject: rpms/geda-gschem/devel .cvsignore, 1.8, 1.9 geda-gschem.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <200709030543.l835hfhH007548@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7456/devel

Modified Files:
	.cvsignore geda-gschem.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 11:50:06 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:43:08 -0000	1.9
@@ -1 +1 @@
-geda-gschem-1.1.1.tar.gz
+geda-gschem-1.2.0.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geda-gschem.spec	24 Aug 2007 00:31:47 -0000	1.11
+++ geda-gschem.spec	3 Sep 2007 05:43:08 -0000	1.12
@@ -1,22 +1,22 @@
-%define           real_ver 1.1.1
+%define           real_ver 1.2.0
 
 Name:             geda-gschem
-Version:          20070708
-Release:          2%{?dist}
+Version:          20070902
+Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
 License:          GPLv2
 
 URL:              http://www.geda.seul.org/tools/gschem/index.html
-Source:           http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:           http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:          gschem.desktop
 # Source 2: from the geda package
 Source2:          gschem.xpm
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
+BuildRequires:    libgeda-devel, desktop-file-utils, autoconf, libstroke-devel gawk
 Requires:         geda-symbols
 
 
@@ -41,7 +41,7 @@
 install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
 install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
 
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
     --add-category Engineering  \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -124,14 +124,17 @@
 %{_datadir}/gEDA/gschem-gtkrc
 %{_datadir}/gEDA/gschem-darkbg
 %{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/gschem.desktop
+%{_datadir}/applications/fedora-gschem.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
 %{_mandir}/man1/gschem.*
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 11:50:06 -0000	1.8
+++ sources	3 Sep 2007 05:43:08 -0000	1.9
@@ -1 +1 @@
-1b46633048ceabffc1cd2cb2bca70907  geda-gschem-1.1.1.tar.gz
+2bd5b949f0579bd5bc8dc91d6ddfd8cd  geda-gschem-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:43:59 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:43:59 -0400
Subject: rpms/geda-gattrib/FC-6 .cvsignore, 1.7, 1.8 gattrib.desktop, 1.4,
	1.5 geda-gattrib.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200709030543.l835hxIP007596@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7495/FC-6

Modified Files:
	.cvsignore gattrib.desktop geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:14:03 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:43:27 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: gattrib.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/gattrib.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gattrib.desktop	14 Jul 2007 12:14:03 -0000	1.4
+++ gattrib.desktop	3 Sep 2007 05:43:27 -0000	1.5
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gattrib
+Name=gEDA Attribute Editor
 GenericName=gEDA Attribute Editor
 Comment=Editor for component attributes on circuit diagrams
 Exec=gattrib
 Icon=gattrib
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
+Categories=Science;


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geda-gattrib.spec	14 Jul 2007 12:14:03 -0000	1.8
+++ geda-gattrib.spec	3 Sep 2007 05:43:27 -0000	1.9
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,10 +77,17 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:14:03 -0000	1.7
+++ sources	3 Sep 2007 05:43:27 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:06 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:06 -0400
Subject: rpms/geda-gnetlist/F-7 .cvsignore, 1.8, 1.9 geda-gnetlist.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709030546.l835k6hO007764@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/F-7

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:31:53 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:45:33 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/geda-gnetlist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gnetlist.spec	14 Jul 2007 12:31:53 -0000	1.9
+++ geda-gnetlist.spec	3 Sep 2007 05:45:33 -0000	1.10
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,6 +82,12 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:31:53 -0000	1.8
+++ sources	3 Sep 2007 05:45:33 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:36 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 01:46:36 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.36,1.37
Message-ID: <200709030546.l835kaTk007902@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7749/F-7

Modified Files:
	stardict.spec 
Log Message:
add doc


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- stardict.spec	3 Sep 2007 03:43:13 -0000	1.36
+++ stardict.spec	3 Sep 2007 05:46:03 -0000	1.37
@@ -5,7 +5,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -68,10 +68,11 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict
+%doc README COPYING ChangeLog AUTHORS doc/FAQ doc/HACKING doc/HowToCreateDictionary doc/StarDictFileFormat doc/Translation
 
 
 %post
@@ -82,6 +83,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
+- Small fix on spec file.
+
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:39 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 01:46:39 -0400
Subject: rpms/stardict/devel stardict.spec,1.36,1.37
Message-ID: <200709030546.l835kdWT007905@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7749/devel

Modified Files:
	stardict.spec 
Log Message:
add doc


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- stardict.spec	3 Sep 2007 03:43:16 -0000	1.36
+++ stardict.spec	3 Sep 2007 05:46:06 -0000	1.37
@@ -5,7 +5,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -68,10 +68,11 @@
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict
+%doc README COPYING ChangeLog AUTHORS doc/FAQ doc/HACKING doc/HowToCreateDictionary doc/StarDictFileFormat doc/Translation
 
 
 %post
@@ -82,6 +83,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
+- Small fix on spec file.
+
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:40 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:40 -0400
Subject: rpms/geda-examples/FC-6 .cvsignore, 1.7, 1.8 geda-examples.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030546.l835kefH007910@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/FC-6

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:01:17 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:46:07 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:01:17 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:46:07 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:01:17 -0000	1.7
+++ sources	3 Sep 2007 05:46:07 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:52 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:52 -0400
Subject: rpms/geda-docs/FC-6 .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030546.l835kqDZ007961@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7858/FC-6

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:55:48 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:46:19 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:55:48 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:46:19 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:55:48 -0000	1.6
+++ sources	3 Sep 2007 05:46:19 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:46:57 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:46:57 -0400
Subject: rpms/geda-gattrib/F-7 .cvsignore, 1.7, 1.8 gattrib.desktop, 1.4,
	1.5 geda-gattrib.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709030546.l835kvGQ007976@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7867/F-7

Modified Files:
	.cvsignore gattrib.desktop geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:17:14 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:46:24 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: gattrib.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/gattrib.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gattrib.desktop	27 Jun 2007 20:46:40 -0000	1.4
+++ gattrib.desktop	3 Sep 2007 05:46:24 -0000	1.5
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Gattrib
+Name=gEDA Attribute Editor
 GenericName=gEDA Attribute Editor
 Comment=Editor for component attributes on circuit diagrams
 Exec=gattrib
 Icon=gattrib
 Terminal=false
 Type=Application
-Categories=Qt;KDE;Education;Science;
+Categories=Science;


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/geda-gattrib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geda-gattrib.spec	14 Jul 2007 12:17:14 -0000	1.9
+++ geda-gattrib.spec	3 Sep 2007 05:46:24 -0000	1.10
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
+Version:        20070902
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,10 +77,17 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:17:14 -0000	1.7
+++ sources	3 Sep 2007 05:46:24 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:24 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:24 -0400
Subject: rpms/geda-examples/F-7 .cvsignore, 1.7, 1.8 geda-examples.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200709030548.l835mOXH008255@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139/F-7

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:04:23 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:47:52 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:04:23 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:47:52 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:04:23 -0000	1.7
+++ sources	3 Sep 2007 05:47:52 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:30 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:30 -0400
Subject: rpms/geda-gnetlist/devel .cvsignore, 1.8, 1.9 geda-gnetlist.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200709030548.l835mU64008292@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8121/devel

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2007 12:33:36 -0000	1.8
+++ .cvsignore	3 Sep 2007 05:47:57 -0000	1.9
@@ -1 +1 @@
-geda-gnetlist-1.1.1.tar.gz
+geda-gnetlist-1.2.0.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/geda-gnetlist.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gnetlist.spec	24 Aug 2007 00:15:33 -0000	1.10
+++ geda-gnetlist.spec	3 Sep 2007 05:47:57 -0000	1.11
@@ -1,19 +1,19 @@
-%define         gedadocdir %{_docdir}/gEDA/
-%define         real_ver   1.1.1
+%define         gedadocdir %{_docdir}/gEDA
+%define         real_ver   1.2.0
 
 Name:           geda-gnetlist
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
+BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff gawk
 Requires:       geda-symbols
 
 %description
@@ -50,7 +50,7 @@
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
 install -d %{buildroot}%{gedadocdir}/examples
-install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+cp -pr examples/* %{buildroot}%{gedadocdir}/examples
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -82,8 +82,11 @@
 %{gedadocdir}/examples/*
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2007 12:33:36 -0000	1.8
+++ sources	3 Sep 2007 05:47:57 -0000	1.9
@@ -1 +1 @@
-a68c798125ed13d480b642ecb8b88f51  geda-gnetlist-1.1.1.tar.gz
+fe435c8124df5ee85e46f3f1e329ff70  geda-gnetlist-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:44 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:44 -0400
Subject: rpms/geda-gattrib/devel .cvsignore, 1.7, 1.8 geda-gattrib.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200709030548.l835miJV008332@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8208/devel

Modified Files:
	.cvsignore geda-gattrib.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:19:00 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:48:11 -0000	1.8
@@ -1 +1 @@
-geda-gattrib-1.1.1.tar.gz
+geda-gattrib-1.2.0.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-gattrib.spec	24 Aug 2007 00:31:31 -0000	1.10
+++ geda-gattrib.spec	3 Sep 2007 05:48:11 -0000	1.11
@@ -1,21 +1,21 @@
-%define         real_ver   1.1.1
+%define         real_ver   1.2.0
 
 Name:           geda-gattrib
-Version:        20070708
-Release:        2%{?dist}
+Version:        20070902
+Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
 License:        GPLv2
 
 URL:            http://www.geda.seul.org/tools/gattrib/index.html
-Source:         http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:         http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils
+BuildRequires:  libgeda-devel, desktop-file-utils gawk
 
 Requires:       geda-symbols
 
@@ -77,12 +77,16 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
+%{_datadir}/gEDA/gattrib-menus.xml
 %{_datadir}/applications/fedora-gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
-- mass rebuild for fedora 8 - ppc
+- mass rebuild for fedora 8 - ppc32
 
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:19:00 -0000	1.7
+++ sources	3 Sep 2007 05:48:11 -0000	1.8
@@ -1 +1 @@
-93a75bd89b6290cbe7548134ffa24200  geda-gattrib-1.1.1.tar.gz
+39acaa05c12c78f5a1fece22760e9d91  geda-gattrib-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:48:49 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:48:49 -0400
Subject: rpms/geda-docs/F-7 .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030548.l835mnGY008340@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8196/F-7

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:57:47 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:48:16 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:57:47 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:48:16 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:57:47 -0000	1.6
+++ sources	3 Sep 2007 05:48:16 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:50:14 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:50:14 -0400
Subject: rpms/geda-examples/devel .cvsignore, 1.7, 1.8 geda-examples.spec,
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200709030550.l835oEGD008498@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8452/devel

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 12:06:44 -0000	1.7
+++ .cvsignore	3 Sep 2007 05:49:42 -0000	1.8
@@ -1 +1 @@
-geda-examples-1.1.1.tar.gz
+geda-examples-1.2.0.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/geda-examples.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-examples.spec	14 Jul 2007 12:06:44 -0000	1.7
+++ geda-examples.spec	3 Sep 2007 05:49:42 -0000	1.8
@@ -1,16 +1,16 @@
-%define     gedaexampledir %{_docdir}/gEDA/examples
-%define     real_ver   1.1.1
+%define     gedadocdir %{_docdir}/gEDA
+%define     real_ver   1.2.0
 
 Name:       geda-examples
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:   geda-gschem
@@ -38,53 +38,17 @@
 # please note that geda-spice is not provided
 # neither geda/gaf nor the fedoraproject due to license restrictions
 sed -i  \
-'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
+'s|.INCLUDE /home/sdb/TwoStageAmp/Simulation.cmd|.INCLUDE %{gedadocdir}/TwoStageAmp/Simulation.cmd|' \
     TwoStageAmp/spice.netlist
 
-sed -i -e \
-'s|file=./models/2N3904.mod|file=%{_datadir}/gEDA/models/bjt/2N3904.mod|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-sed -i -e \
-'s|file=Simulation.cmd|file=%{gedaexampledir}/TwoStageAmp/Simulation.cmd|' \
-    TwoStageAmp/TwoStageAmp.sch
-
-
 %build
-%configure
+%configure --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-#the above installs nothing, do this again manually
-%{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
-%{__rm} lightning_detector/Makefile*
-%{__rm} lightning_detector/sym/Makefile*
-%{__cp} -pr lightning_detector/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/gTAG
-%{__rm} gTAG/Makefile*
-%{__cp} -pr gTAG/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/TwoStageAmp/
-%{__rm} TwoStageAmp/Makefile*
-%{__rm} TwoStageAmp/sym/Makefile*
-%{__cp} -pr TwoStageAmp/ %{buildroot}%{gedaexampledir}/
-
-
-install -d %{buildroot}%{gedaexampledir}/RF_Amp/
-%{__rm} RF_Amp/Makefile*
-%{__rm} RF_Amp/model/Makefile*
-%{__rm} RF_Amp/sym/Makefile*
-%{__cp} -pr RF_Amp/ %{buildroot}%{gedaexampledir}/
-
-# removed duplicates
-%{__rm} -rf %{buildroot}%{_docdir}/geda-doc/
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -102,12 +66,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{gedaexampledir}/lightning_detector
-%{gedaexampledir}/gTAG
-%{gedaexampledir}/TwoStageAmp
-%{gedaexampledir}/RF_Amp
+%{gedadocdir}/examples/lightning_detector
+%{gedadocdir}/examples/gTAG
+%{gedadocdir}/examples/TwoStageAmp
+%{gedadocdir}/examples/RF_Amp
+%{gedadocdir}/examples/README
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 12:06:44 -0000	1.7
+++ sources	3 Sep 2007 05:49:42 -0000	1.8
@@ -1 +1 @@
-6e753905ac9dfea18caad67aedb12983  geda-examples-1.1.1.tar.gz
+ca177c15be955876c87095a84658e0ff  geda-examples-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 05:50:19 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Mon, 3 Sep 2007 01:50:19 -0400
Subject: rpms/geda-docs/devel .cvsignore, 1.6, 1.7 geda-docs.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200709030550.l835oJ99008508@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454/devel

Modified Files:
	.cvsignore geda-docs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 11:59:26 -0000	1.6
+++ .cvsignore	3 Sep 2007 05:49:46 -0000	1.7
@@ -1 +1 @@
-geda-docs-1.1.1.tar.gz
+geda-docs-1.2.0.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/geda-docs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-docs.spec	14 Jul 2007 11:59:26 -0000	1.5
+++ geda-docs.spec	3 Sep 2007 05:49:46 -0000	1.6
@@ -1,21 +1,21 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.1.1
+%define     real_ver   1.2.0
 
 Name:       geda-docs
-Version:    20070708
+Version:    20070902
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
 Group:      Applications/Engineering
-License:    GPL
+License:    GPLv2
 
 URL:        http://www.geda.seul.org
-Source:     http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.2/%{relver}/%{name}-%{real_ver}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
 
-Requires:   geda-symbols libgeda
+Requires:   geda-symbols
 
 
 %description
@@ -58,6 +58,12 @@
 
 
 %Changelog
+* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
+- New upstream release
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
+- mass rebuild for fedora 8 - ppc32
+
 * Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-docs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 11:59:26 -0000	1.6
+++ sources	3 Sep 2007 05:49:46 -0000	1.7
@@ -1 +1 @@
-404005b322df348e747069927695cb56  geda-docs-1.1.1.tar.gz
+bbd67ab610a41bf44716cfdc651c0eb8  geda-docs-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:01 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:01 -0400
Subject: rpms/libtasn1/F-7 lastver, 1.1, 1.2 libtasn1.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709030639.l836d12s015372@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/F-7

Modified Files:
	lastver libtasn1.spec sources 
Log Message:
updated to 1.1


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:02 -0000	1.1
+++ lastver	3 Sep 2007 06:38:27 -0000	1.2
@@ -1 +1 @@
-0.3.10
+1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:24 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:27 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:24 -0000	1.11
+++ sources	3 Sep 2007 06:38:27 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:04 -0400
Subject: rpms/libtasn1/FC-6 libtasn1.spec,1.18,1.19 sources,1.11,1.12
Message-ID: <200709030639.l836d4NU015376@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/FC-6

Modified Files:
	libtasn1.spec sources 
Log Message:
updated to 1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:14 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:31 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:14 -0000	1.11
+++ sources	3 Sep 2007 06:38:31 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 06:39:06 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 02:39:06 -0400
Subject: rpms/libtasn1/devel lastver, 1.1, 1.2 libtasn1.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709030639.l836d6U9015382@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15311/devel

Modified Files:
	lastver libtasn1.spec sources 
Log Message:
updated to 1.1


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:05 -0000	1.1
+++ lastver	3 Sep 2007 06:38:34 -0000	1.2
@@ -1 +1 @@
-0.3.10
+1.1


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtasn1.spec	14 Jun 2007 18:34:09 -0000	1.18
+++ libtasn1.spec	3 Sep 2007 06:38:34 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.10
+Version:	1.1
 Release: 	%release_func 1
 
 License:	LGPL
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
+- updated to 1.1
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 18:34:09 -0000	1.11
+++ sources	3 Sep 2007 06:38:34 -0000	1.12
@@ -1,2 +1,2 @@
-650145edefc26d4910a4f603cdab2535  libtasn1-0.3.10.tar.gz
-4e1d3b76a07ed3b63fc2ce24b5f6c3b4  libtasn1-0.3.10.tar.gz.sig
+93b43cc5013bda4d8bf64508f1566c54  libtasn1-1.1.tar.gz
+485ef927abdd7bc51bcdfe8c93431f4d  libtasn1-1.1.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep  3 07:03:11 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 3 Sep 2007 03:03:11 -0400
Subject: rpms/db4/devel .cvsignore, 1.11, 1.12 db4.spec, 1.51, 1.52 sources, 
	1.11, 1.12
Message-ID: <200709030703.l8373BTa021855@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/db4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21833

Modified Files:
	.cvsignore db4.spec sources 
Log Message:
update to 4.6.19 (#273461)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Jul 2007 08:21:33 -0000	1.11
+++ .cvsignore	3 Sep 2007 07:02:38 -0000	1.12
@@ -6,3 +6,4 @@
 db-4.3.29.tar.gz
 db-4.5.20.tar.gz
 db-4.6.18.tar.gz
+db-4.6.19.tar.gz


Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- db4.spec	29 Aug 2007 12:53:44 -0000	1.51
+++ db4.spec	3 Sep 2007 07:02:38 -0000	1.52
@@ -7,8 +7,8 @@
 
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
-Version: 4.6.18
-Release: 2%{?dist}
+Version: 4.6.19
+Release: 1%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch2: db-4.3.29-sparc64.patch
@@ -349,6 +349,9 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 4.6.19-1
+- update to 4.6.19 (#273461)
+
 * Thu Aug 29 2007 Jindrich Novy <jnovy at redhat.com> 4.6.18-2
 - rebuild for BuildID
 - BR util-linux-ng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Jul 2007 08:21:33 -0000	1.11
+++ sources	3 Sep 2007 07:02:38 -0000	1.12
@@ -1,2 +1,2 @@
 42cc6c1e1e25818bd3e3f91328edb0f1  db.1.85.tar.gz
-95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 07:55:32 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 3 Sep 2007 03:55:32 -0400
Subject: rpms/bind/F-7 bind-9.4-2119_revert.patch, NONE, 1.1 bind.spec, 1.190,
	1.191
Message-ID: <200709030755.l837tWH6022948@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22860

Modified Files:
	bind.spec 
Added Files:
	bind-9.4-2119_revert.patch 
Log Message:
- temporary revert ISC 2119 change which conflicts with our
  "libbind-errno" patch (#254501)


bind-9.4-2119_revert.patch:

--- NEW FILE bind-9.4-2119_revert.patch ---
diff -up bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs bind-9.4.2b1/lib/bind/resolv/res_init.c
--- bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs	2007-08-31 09:01:10.000000000 +0200
+++ bind-9.4.2b1/lib/bind/resolv/res_init.c	2007-08-31 09:13:41.000000000 +0200
@@ -166,9 +166,7 @@ __res_vinit(res_state statp, int preinit
 #endif
 	int dots;
 	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
 
-	RES_SET_H_ERRNO(statp, 0);
 	if (statp->_u._ext.ext != NULL)
 		res_ndestroy(statp);
 
@@ -218,22 +216,8 @@ __res_vinit(res_state statp, int preinit
 		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather then immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
+	} else
+		return (-1);
 #ifdef RESOLVSORT
 	statp->nsort = 0;
 #endif
@@ -362,7 +346,7 @@ __res_vinit(res_state statp, int preinit
 		    continue;
 		}
 		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
+		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
 		    struct addrinfo hints, *ai;
 		    char sbuf[NI_MAXSERV];
 		    const size_t minsiz =
@@ -498,7 +482,7 @@ __res_vinit(res_state statp, int preinit
 	if ((cp = getenv("RES_OPTIONS")) != NULL)
 		res_setoptions(statp, cp, "env");
 	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
+	return (0);
 }
 
 static void


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- bind.spec	22 Aug 2007 10:56:52 -0000	1.190
+++ bind.spec	3 Sep 2007 07:54:59 -0000	1.191
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.1.%{RELEASEVER}%{?dist}
+Release: 	0.2.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +73,7 @@
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
+Patch72:	bind-9.4-2119_revert.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -298,6 +299,7 @@
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
+%patch72 -p1 -b .2119_revert
 :;
 
 
@@ -783,6 +785,10 @@
 
 
 %changelog
+* Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
+- temporary revert ISC 2119 change which conflicts with our
+  "libbind-errno" patch (#254501)
+
 * Tue Aug 21 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.1.b1
 - updated to 9.4.2b1
 - dropped patches



From fedora-extras-commits at redhat.com  Mon Sep  3 07:57:38 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 03:57:38 -0400
Subject: rpms/gimp-help/F-7 .cvsignore, 1.9, 1.10 gimp-help.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200709030757.l837vc3F023208@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp-help/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.13
don't use "%makeinstall ..." but "make DESTDIR=... install" for installing



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Apr 2007 14:09:03 -0000	1.9
+++ .cvsignore	3 Sep 2007 07:57:05 -0000	1.10
@@ -1 +1 @@
-gimp-help-2-0.12.tar.gz
+gimp-help-2-0.13.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/gimp-help.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gimp-help.spec	12 Apr 2007 14:09:03 -0000	1.12
+++ gimp-help.spec	3 Sep 2007 07:57:05 -0000	1.13
@@ -1,4 +1,4 @@
-%define gimphelpver 2-0.12
+%define gimphelpver 2-0.13
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
@@ -28,7 +28,7 @@
 
 %install
 rm -rf %buildroot
-%makeinstall GIMP_DATADIR=%{buildroot}%{_datadir}/gimp/%{gimpsubver}
+make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %buildroot
@@ -40,6 +40,10 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.13
+- version 2-0.13
+- don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing
+
 * Thu Apr 12 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.12
 - version 2-0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Apr 2007 14:09:03 -0000	1.9
+++ sources	3 Sep 2007 07:57:05 -0000	1.10
@@ -1 +1 @@
-fc1e2153eafa04fa701b23818029c3e1  gimp-help-2-0.12.tar.gz
+a0d3ab0e503cacaaaa031958bfad43e5  gimp-help-2-0.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:15 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:15 -0400
Subject: rpms/util-vserver/devel util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.30, 1.31 sources, 1.11, 1.12 lastver,
	1.1, 1.2 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wF8q023346@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/devel

Modified Files:
	util-vserver.spec sources lastver 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- util-vserver.spec	4 Aug 2007 10:51:59 -0000	1.30
+++ util-vserver.spec	3 Sep 2007 07:57:42 -0000	1.31
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -198,16 +194,7 @@
 
 
 %check || :
-## REMOVE ME! Cause for the PPC workaround should be fixed by
-## http://svn.linux-vserver.org/projects/util-vserver/changeset/2545
-## which is going into 0.30.214
-%ifarch ppc
-  rc=true
-%else
-  rc=false
-%endif
-
-%__make check || $rc
+%__make check
 
 
 %clean
@@ -369,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 May 2007 20:40:16 -0000	1.11
+++ sources	3 Sep 2007 07:57:42 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	2 Sep 2007 11:30:35 -0000	1.1
+++ lastver	3 Sep 2007 07:57:42 -0000	1.2
@@ -1 +1 @@
-0.30.213
+0.30.214


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:17 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:17 -0400
Subject: rpms/util-vserver/FC-6 util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.26, 1.27 sources, 1.11,
	1.12 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wHhN023351@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/FC-6

Modified Files:
	util-vserver.spec sources 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util-vserver.spec	4 Aug 2007 10:52:07 -0000	1.26
+++ util-vserver.spec	3 Sep 2007 07:57:45 -0000	1.27
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -360,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jun 2007 07:10:45 -0000	1.11
+++ sources	3 Sep 2007 07:57:45 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:20 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 03:58:20 -0400
Subject: rpms/util-vserver/F-7 util-vserver-0.30.214-stat.patch, NONE,
	1.1 util-vserver.spec, 1.26, 1.27 sources, 1.11, 1.12 lastver,
	1.1, 1.2 util-vserver-0.30.213-yum32.patch, 1.1, NONE
Message-ID: <200709030758.l837wKUM023356@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/F-7

Modified Files:
	util-vserver.spec sources lastver 
Added Files:
	util-vserver-0.30.214-stat.patch 
Removed Files:
	util-vserver-0.30.213-yum32.patch 
Log Message:
updated to 0.30.214


util-vserver-0.30.214-stat.patch:

--- NEW FILE util-vserver-0.30.214-stat.patch ---
Index: lib_internal/util-safechdir.h
===================================================================
--- lib_internal/util-safechdir.h	(revision 2605)
+++ lib_internal/util-safechdir.h	(working copy)
@@ -19,7 +19,8 @@
 #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
 
-struct stat;
+#include <sys/stat.h>
+
 int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
 
 #define EsafeChdir(PATH,EXP_STAT) \


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util-vserver.spec	4 Aug 2007 10:52:10 -0000	1.26
+++ util-vserver.spec	3 Sep 2007 07:57:48 -0000	1.27
@@ -6,13 +6,9 @@
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-%bcond_with		dietlibc
-%else
 %bcond_without		dietlibc
-%endif
-
 %bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -27,14 +23,14 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.213
-Release:	%release_func 2
+Version:	0.30.214
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.213-yum32.patch
+Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -175,7 +171,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .yum32
+%patch0 -p0 -b .stat
 
 
 %build
@@ -360,6 +356,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
 * Sat Aug  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.213-2
 - added patch to make 'vyum' work with a patched yum-3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Jun 2007 07:05:05 -0000	1.11
+++ sources	3 Sep 2007 07:57:48 -0000	1.12
@@ -1,2 +1,2 @@
-2a444e725f7789f751ade259a38553ed  util-vserver-0.30.213.tar.bz2
-876de69ad4303e746052907867b7bb88  util-vserver-0.30.213.tar.bz2.asc
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	2 Sep 2007 11:30:32 -0000	1.1
+++ lastver	3 Sep 2007 07:57:48 -0000	1.2
@@ -1 +1 @@
-0.30.213
+0.30.214


--- util-vserver-0.30.213-yum32.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 07:58:40 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 03:58:40 -0400
Subject: rpms/rapidsvn/devel rapidsvn.spec,1.10,1.11
Message-ID: <200709030758.l837weoq023369@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/rapidsvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23326

Modified Files:
	rapidsvn.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.9.4-6
- rebuild for fixed 32-bit APR



Index: rapidsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rapidsvn.spec	23 Aug 2007 14:30:16 -0000	1.10
+++ rapidsvn.spec	3 Sep 2007 07:58:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           rapidsvn
 Version:        0.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Graphical interface for the Subversion revision control system
 
 Group:          Development/Tools
@@ -151,6 +151,9 @@
 %{_libdir}/libsvncpp.so
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.9.4-6
+- rebuild for fixed 32-bit APR
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 0.9.4-5
 - don't link against neon directly
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:02:13 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:02:13 -0400
Subject: rpms/kdesvn/devel kdesvn.spec,1.31,1.32
Message-ID: <200709030802.l8382DiK029631@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29470

Modified Files:
	kdesvn.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.13.0-4
- rebuild for fixed 32-bit APR (#254241)



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdesvn.spec	28 Aug 2007 14:17:08 -0000	1.31
+++ kdesvn.spec	3 Sep 2007 08:01:38 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        0.13.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 0.13.0-4
+- rebuild for fixed 32-bit APR (#254241)
+
 * Tue Aug 28 2007 Orion Poplawski <orion at cora.nwra.com> - 0.13.0-3
 - Rebuild for new expat
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:04:07 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:04:07 -0400
Subject: rpms/hunspell-pl/devel .cvsignore, 1.25, 1.26 hunspell-pl.spec, 1.27,
	1.28 sources, 1.25, 1.26
Message-ID: <200709030804.l83847OM029991@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29967

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	3 Aug 2007 09:46:04 -0000	1.25
+++ .cvsignore	3 Sep 2007 08:03:34 -0000	1.26
@@ -1 +1 @@
-alt-myspell-pl-20070803.tar.bz2
+alt-myspell-pl-20070903.tar.bz2


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hunspell-pl.spec	9 Aug 2007 07:18:22 -0000	1.27
+++ hunspell-pl.spec	3 Sep 2007 08:03:34 -0000	1.28
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20070803
+%define upstreamid 20070903
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.kurnik.pl/dictionary/alt-myspell-pl-%{upstreamid}.tar.bz2
@@ -34,6 +34,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 0.20070903-1
+- new version
+
 * Thu Aug 09 2007 Caolan McNamara <caolanm at redhat.com> - 0.20070803-1
 - clarify that is tri-licensed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	3 Aug 2007 09:46:04 -0000	1.25
+++ sources	3 Sep 2007 08:03:34 -0000	1.26
@@ -1 +1 @@
-be1adb5fd0d06e462e2d1fc79a820092  alt-myspell-pl-20070803.tar.bz2
+de1cc0ea7b480ccc36bf39b3332758b7  alt-myspell-pl-20070903.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 08:17:52 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:17:52 -0400
Subject: rpms/hunspell-it/devel .cvsignore, 1.2, 1.3 hunspell-it.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200709030817.l838Hq4r030633@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-it/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591

Modified Files:
	.cvsignore hunspell-it.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Feb 2007 09:20:23 -0000	1.2
+++ .cvsignore	3 Sep 2007 08:17:20 -0000	1.3
@@ -1 +1 @@
-italiano_2_3_beta_2006_07_23.zip
+italiano_2_4_2007_09_01.zip


Index: hunspell-it.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/hunspell-it.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-it.spec	3 Aug 2007 09:10:30 -0000	1.2
+++ hunspell-it.spec	3 Sep 2007 08:17:20 -0000	1.3
@@ -1,9 +1,9 @@
 Name: hunspell-it
 Summary: Italian hunspell dictionaries
-%define upstreamid 20060723
-Version: 2.3
-Release: 0.2.%{upstreamid}%{?dist}
-Source: http://downloads.sourceforge.net/sourceforge/linguistico/italiano_2_3_beta_2006_07_23.zip
+%define upstreamid 20070901
+Version: 2.4
+Release: 0.1.%{upstreamid}%{?dist}
+Source: http://downloads.sourceforge.net/sourceforge/linguistico/italiano_2_4_2007_09_01.zip
 Group: Applications/Text
 URL: http://linguistico.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,10 +38,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc GPL.txt history.txt license.txt notes.txt README_it_IT.txt README.txt thanks.txt
+%doc it_IT_README.txt it_IT_COPYING it_IT_AUTHORS it_IT_license.txt it_IT_notes.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 2.4-0.1.20070901
+- latest version
+
 * Fri Aug 03 2007 Caolan McNamara <caolanm at redhat.com> - 2.3-0.2.20060723
 - clarify license version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-it/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Feb 2007 09:20:23 -0000	1.2
+++ sources	3 Sep 2007 08:17:20 -0000	1.3
@@ -1 +1 @@
-fe9240990c600bca2ad33cb906651087  italiano_2_3_beta_2006_07_23.zip
+e7fbd9e2dfb25ea3288cdb918e1e1260  italiano_2_4_2007_09_01.zip



From fedora-extras-commits at redhat.com  Mon Sep  3 08:23:47 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 3 Sep 2007 04:23:47 -0400
Subject: rpms/bind/devel bind-9.5-2119_revert.patch, NONE,
	1.1 bind-9.5-fix_h_errno.patch, NONE, 1.1 bind.spec, 1.211, 1.212
Message-ID: <200709030823.l838NlqT030850@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30818

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-2119_revert.patch bind-9.5-fix_h_errno.patch 
Log Message:
- temporary revert ISC 2119 change and add "libbind-errno" patch
  (#254501) again


bind-9.5-2119_revert.patch:

--- NEW FILE bind-9.5-2119_revert.patch ---
diff -up bind-9.5.0a6/lib/bind/resolv/res_init.c.2119 bind-9.5.0a6/lib/bind/resolv/res_init.c
--- bind-9.5.0a6/lib/bind/resolv/res_init.c.2119	2007-07-09 03:43:23.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_init.c	2007-09-03 10:10:24.000000000 +0200
@@ -166,9 +166,7 @@ __res_vinit(res_state statp, int preinit
 #endif
 	int dots;
 	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
 
-	RES_SET_H_ERRNO(statp, 0);
 	if (statp->_u._ext.ext != NULL)
 		res_ndestroy(statp);
 
@@ -218,22 +216,8 @@ __res_vinit(res_state statp, int preinit
 		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather then immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
+	} else
+		return (-1);
 #ifdef RESOLVSORT
 	statp->nsort = 0;
 #endif
@@ -362,7 +346,7 @@ __res_vinit(res_state statp, int preinit
 		    continue;
 		}
 		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
+		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
 		    struct addrinfo hints, *ai;
 		    char sbuf[NI_MAXSERV];
 		    const size_t minsiz =
@@ -498,7 +482,7 @@ __res_vinit(res_state statp, int preinit
 	if ((cp = getenv("RES_OPTIONS")) != NULL)
 		res_setoptions(statp, cp, "env");
 	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
+	return (0);
 }
 
 static void

bind-9.5-fix_h_errno.patch:

--- NEW FILE bind-9.5-fix_h_errno.patch ---
--- bind-9.3.1rc1/lib/bind/irs/irs_data.c.fix_h_errno	2004-11-29 20:15:43.000000000 -0500
+++ bind-9.3.1rc1/lib/bind/irs/irs_data.c	2005-03-09 21:05:52.000000000 -0500
@@ -222,12 +222,7 @@
 void
 __h_errno_set(struct __res_state *res, int err) {
 
-
-#if (__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
-	res->res_h_errno = err;
-#else
 	h_errno = res->res_h_errno = err;
-#endif
 }
 
 #endif /*__BIND_NOSTATIC*/
--- bind-9.3.1rc1/lib/bind/resolv/res_query.c.fix_h_errno	2004-03-16 07:34:19.000000000 -0500
+++ bind-9.3.1rc1/lib/bind/resolv/res_query.c	2005-03-09 21:53:34.000000000 -0500
@@ -192,6 +192,8 @@
 		}
 		return (-1);
 	}
+	if( n > 0 )
+		RES_SET_H_ERRNO(statp,0);
 	return (n);
 }
 


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- bind.spec	23 Aug 2007 12:57:57 -0000	1.211
+++ bind.spec	3 Sep 2007 08:23:14 -0000	1.212
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.1.%{RELEASEVER}%{?dist}
+Release: 	11.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,8 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch75:	bind-9.5-update.patch
+Patch76:	bind-9.5-2119_revert.patch
+Patch77:	bind-9.5-fix_h_errno.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -246,6 +248,8 @@
 %endif
 %patch73 -p1 -b .libidn
 %patch75 -p1 -b .update
+%patch76 -p1 -b .2119
+%patch77 -p1 -b .errno
 :;
 
 
@@ -642,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.2.a6
+- temporary revert ISC 2119 change and add "libbind-errno" patch
+  (#254501) again
+
 * Thu Aug 23 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.1.a6
 - removed end dots from Summary sections (skasal at redhat.com)
 - fixed wrong file creation by autotools patch (skasal at redhat.com)



From fedora-extras-commits at redhat.com  Mon Sep  3 08:25:34 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:25:34 -0400
Subject: rpms/icu/devel .cvsignore, 1.7, 1.8 icu.spec, 1.52, 1.53 sources,
	1.7, 1.8
Message-ID: <200709030825.l838PYDM030942@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30881

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Aug 2007 13:04:35 -0000	1.7
+++ .cvsignore	3 Sep 2007 08:25:02 -0000	1.8
@@ -1 +1 @@
-icu4c-3_8_d01-src.tgz
+icu4c-3_8_d02-src.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- icu.spec	29 Aug 2007 07:17:49 -0000	1.52
+++ icu.spec	3 Sep 2007 08:25:02 -0000	1.53
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   3.8
-Release:   0.2.d01%{?dist}
+Release:   0.2.d02%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -140,6 +140,9 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Mon Sep 03 2007 Caolan McNamara <caolanm at redhat.com> - 3.8-0.2.d02
+- next release candidate
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> - 3.8-0.2.d01
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Aug 2007 13:04:35 -0000	1.7
+++ sources	3 Sep 2007 08:25:02 -0000	1.8
@@ -1 +1 @@
-ae40391450c73775e615640308fc3b7a  icu4c-3_8_d01-src.tgz
+990c5a62be169e02c254297881e85808  icu4c-3_8_d02-src.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 08:27:43 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 3 Sep 2007 04:27:43 -0400
Subject: rpms/icu/devel icu.spec,1.53,1.54
Message-ID: <200709030827.l838Rhaf031030@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31012

Modified Files:
	icu.spec 
Log Message:
next version


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- icu.spec	3 Sep 2007 08:25:02 -0000	1.53
+++ icu.spec	3 Sep 2007 08:27:10 -0000	1.54
@@ -5,7 +5,7 @@
 Group:     Development/Tools
 License:   MIT
 URL:       http://www.icu-project.org/
-Source0:   http://download.icu-project.org/files/icu4c/3.8/icu4c-3_8_d01-src.tgz
+Source0:   http://download.icu-project.org/files/icu4c/3.8/icu4c-3_8_d02-src.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, autoconf
 



From fedora-extras-commits at redhat.com  Mon Sep  3 08:31:06 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:31:06 -0400
Subject: rpms/mod_fcgid/devel mod_fcgid.spec,1.6,1.7
Message-ID: <200709030831.l838V6At031163@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31133

Modified Files:
	mod_fcgid.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
- rebuild for fixed 32-bit APR (#254241)



Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_fcgid.spec	23 Aug 2007 09:32:38 -0000	1.6
+++ mod_fcgid.spec	3 Sep 2007 08:30:33 -0000	1.7
@@ -11,7 +11,7 @@
 
 Name:		mod_fcgid
 Version:	2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -155,6 +155,9 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
+- rebuild for fixed 32-bit APR (#254241)
+
 * Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 2.1-5
 - Update source URL to point to downloads.sf.net rather than dl.sf.net
 - Upstream released new tarball without changing version number, though the



From fedora-extras-commits at redhat.com  Mon Sep  3 08:32:44 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 3 Sep 2007 04:32:44 -0400
Subject: rpms/mod_security/devel mod_security.spec,1.20,1.21
Message-ID: <200709030832.l838WisI031251@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31231

Modified Files:
	mod_security.spec 
Log Message:
* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
- rebuild for fixed 32-bit APR (#254241)



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_security.spec	29 Aug 2007 05:02:39 -0000	1.20
+++ mod_security.spec	3 Sep 2007 08:32:11 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
+- rebuild for fixed 32-bit APR (#254241)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.1.1-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 09:19:39 2007
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 3 Sep 2007 05:19:39 -0400
Subject: rpms/mod_dnssd/devel mod_dnssd.spec,1.4,1.5
Message-ID: <200709030919.l839JdgL005801@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/mod_dnssd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5780

Modified Files:
	mod_dnssd.spec 
Log Message:
Rebuild for new 32-bit APR ABI


Index: mod_dnssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_dnssd/devel/mod_dnssd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_dnssd.spec	21 Aug 2007 16:55:23 -0000	1.4
+++ mod_dnssd.spec	3 Sep 2007 09:19:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_dnssd
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An Apache HTTPD module which adds Zeroconf support
 
 Group:          System Environment/Daemons
@@ -40,6 +40,9 @@
 %{_libdir}/httpd/modules/mod_dnssd.so
 
 %changelog
+* Mon Sep  3 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-5
+- Rebuild for new 32-bit APR ABI
+
 * Tue Aug 21 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.5-4
 - Fix License tag
 - Rebuild for F8t2



From fedora-extras-commits at redhat.com  Mon Sep  3 09:35:05 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 3 Sep 2007 05:35:05 -0400
Subject: rpms/yumex/F-7 yumex.spec,1.59,1.60
Message-ID: <200709030935.l839Z5qZ006112@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6083

Modified Files:
	yumex.spec 
Log Message:
Test Build for Bodhi Testing


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/yumex.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- yumex.spec	22 Aug 2007 12:50:29 -0000	1.59
+++ yumex.spec	3 Sep 2007 09:34:33 -0000	1.60
@@ -2,7 +2,7 @@
 
 Name:     yumex
 Version:  2.0.1
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-2
+- Test build for Bohdi Testing
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Mon Sep  3 09:37:12 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 05:37:12 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.37,1.38
Message-ID: <200709030937.l839bCJQ006200@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6152/F-7

Modified Files:
	stardict.spec 
Log Message:
use desktop-file-install


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stardict.spec	3 Sep 2007 05:46:03 -0000	1.37
+++ stardict.spec	3 Sep 2007 09:36:39 -0000	1.38
@@ -19,6 +19,7 @@
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
 BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser
+BuildRequires: desktop-file-utils
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -52,6 +53,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
+desktop-file-install --vendor fedora --delete-original	\
+  --add-category X-Red-Hat-Base				\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
+
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
 
@@ -84,7 +91,7 @@
 
 %changelog
 * Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
-- Small fix on spec file.
+- Small fix on spec file. Use desktop-file-install.
 
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.



From fedora-extras-commits at redhat.com  Mon Sep  3 09:37:15 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 05:37:15 -0400
Subject: rpms/stardict/devel stardict.spec,1.37,1.38
Message-ID: <200709030937.l839bFvY006203@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6152/devel

Modified Files:
	stardict.spec 
Log Message:
use desktop-file-install


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stardict.spec	3 Sep 2007 05:46:06 -0000	1.37
+++ stardict.spec	3 Sep 2007 09:36:42 -0000	1.38
@@ -19,6 +19,7 @@
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
 BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext, perl-XML-Parser
+BuildRequires: desktop-file-utils
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -52,6 +53,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
+desktop-file-install --vendor fedora --delete-original	\
+  --add-category X-Red-Hat-Base				\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
+
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
 
@@ -84,7 +91,7 @@
 
 %changelog
 * Mon Sep 03 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-4
-- Small fix on spec file.
+- Small fix on spec file. Use desktop-file-install.
 
 * Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
 - Add floatwin and espeak patch.



From fedora-extras-commits at redhat.com  Mon Sep  3 09:55:47 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 05:55:47 -0400
Subject: rpms/g-wrap/devel g-wrap.spec,1.42,1.43
Message-ID: <200709030955.l839tlPf006525@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6462

Modified Files:
	g-wrap.spec 
Log Message:



Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- g-wrap.spec	31 Aug 2007 20:19:59 -0000	1.42
+++ g-wrap.spec	3 Sep 2007 09:55:14 -0000	1.43
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         3%{?dist}.1
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:10 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:10 -0400
Subject: rpms/g-wrap/EL-5 g-wrap.spec,1.43,1.44
Message-ID: <200709031001.l83A1AOn012428@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/EL-5

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/EL-5/g-wrap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- g-wrap.spec	31 Aug 2007 20:06:08 -0000	1.43
+++ g-wrap.spec	3 Sep 2007 10:00:37 -0000	1.44
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:13 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:13 -0400
Subject: rpms/g-wrap/F-7 g-wrap.spec,1.39,1.40
Message-ID: <200709031001.l83A1DEk012530@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/F-7

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/F-7/g-wrap.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- g-wrap.spec	31 Aug 2007 19:53:12 -0000	1.39
+++ g-wrap.spec	3 Sep 2007 10:00:40 -0000	1.40
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:01:16 2007
From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom))
Date: Mon, 3 Sep 2007 06:01:16 -0400
Subject: rpms/g-wrap/devel g-wrap.spec,1.43,1.44
Message-ID: <200709031001.l83A1GRL012537@cvs-int.fedora.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601/devel

Modified Files:
	g-wrap.spec 
Log Message:
bump release tag


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- g-wrap.spec	3 Sep 2007 09:55:14 -0000	1.43
+++ g-wrap.spec	3 Sep 2007 10:00:43 -0000	1.44
@@ -1,6 +1,6 @@
 Name:            g-wrap
 Version:         1.9.9
-Release:         3%{?dist}.1
+Release:         4%{?dist}
 Summary:         A tool for creating Scheme interfaces to C libraries
 
 Group:           Development/Libraries
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-4
+- Bump release tag.
+
 * Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
 - Fixed BR & Requires.
 - Moved *.m4 files to -devel package as its should.



From fedora-extras-commits at redhat.com  Mon Sep  3 10:17:28 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 3 Sep 2007 06:17:28 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.59,1.60
Message-ID: <200709031017.l83AHSec013260@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13238

Modified Files:
	kdevelop.spec 
Log Message:
rebuilt against apr




Index: kdevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdevelop.spec	29 Aug 2007 23:11:28 -0000	1.59
+++ kdevelop.spec	3 Sep 2007 10:16:55 -0000	1.60
@@ -10,7 +10,7 @@
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Than Ngo <than at redhat.com> - 9:3.4.1-5
+- rebuilt against apr
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.4.1-4
 - License: GPLv2
 - (Build)Requires: kdelibs3-devel kdesdk3-devel



From fedora-extras-commits at redhat.com  Mon Sep  3 10:48:51 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 3 Sep 2007 06:48:51 -0400
Subject: rpms/curl/devel curl.spec,1.56,1.57
Message-ID: <200709031048.l83AmpUd015037@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017

Modified Files:
	curl.spec 
Log Message:
revert back to use OpenSSL (#266021)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- curl.spec	27 Aug 2007 12:42:14 -0000	1.56
+++ curl.spec	3 Sep 2007 10:48:12 -0000	1.57
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,8 +12,9 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.16.4-ftp.patch
 URL: http://curl.haxx.se/
+Requires: openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel, nss-devel
+BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -25,7 +26,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig, automake
+Requires: openssl-devel, libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -41,11 +42,11 @@
 %patch3 -p1 -b .ftp
 
 %build
-if pkg-config nss ; then
-	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
+if pkg-config openssl ; then
+	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
 fi
-%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
+%configure --with-ssl=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
@@ -99,6 +100,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
+- revert back to use OpenSSL (#266021)
+
 * Mon Aug 27 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-3
 - don't use openssl, use nss instead
 



From fedora-extras-commits at redhat.com  Mon Sep  3 11:08:55 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Mon, 3 Sep 2007 07:08:55 -0400
Subject: rpms/pikloops/devel pikloops.spec,1.5,1.6
Message-ID: <200709031108.l83B8t51021407@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikloops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21388

Modified Files:
	pikloops.spec 
Log Message:
Fix desktop file


Index: pikloops.spec
===================================================================
RCS file: /cvs/extras/rpms/pikloops/devel/pikloops.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pikloops.spec	21 Aug 2007 17:10:47 -0000	1.5
+++ pikloops.spec	3 Sep 2007 11:08:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		pikloops
 Version:	0.2.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Code generator for PIC delays
 Summary(fr):	G??n??rateur de code de temporisation pour PIC
 
@@ -35,11 +35,10 @@
 %{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
+desktop-file-install --vendor=fedora \
+  --remove-category "Education" \
+  --dir %{buildroot}%{_datadir}/applications \
   --delete-original \
-  --add-category "X-Fedora" \
   src/%{name}.desktop
 
 # Fix absolute symlink
@@ -77,12 +76,15 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/doc/HTML/*/%{name}/
 %{_datadir}/icons/crystalsvg/*/apps/%{name}.png
 
 %changelog
+* Sun Sep 02 2007 Chitlesh Goorah <chitlesh[AT]fedoraproject[DOT]org> - 0.2.3-3
+  - Fix desktop file
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.2.3-2
   - Licence tag clarification
 



From fedora-extras-commits at redhat.com  Mon Sep  3 11:48:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 3 Sep 2007 07:48:24 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.20,1.21
Message-ID: <200709031148.l83BmOX6021968@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21943

Modified Files:
	hamlib.spec 
Log Message:
Rebuild, License tag update


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hamlib.spec	10 May 2007 03:52:04 -0000	1.20
+++ hamlib.spec	3 Sep 2007 11:47:51 -0000	1.21
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name: 		hamlib
-Version: 	1.2.5
-Release: 	5%{?dist}
-
-License: 	LGPL
-Group: 		System Environment/Libraries
-Summary: 	Run-time library to control radio transceivers and receivers
-Source: 	ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
+Name:           hamlib
+Version:        1.2.5
+Release:        6%{?dist}
+
+License:        GPLv2+ and LGPLv2+
+Group:          System Environment/Libraries
+Summary:        Run-time library to control radio transceivers and receivers
+Source:         ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
 
 # For whatever reason @SWIG@ isn't being set by the configure script.
 Patch: hamlib-bindings.patch
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
+- Rebuild, License tag update
+
 * Wed May  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.5-5
 - Move HTML devel documentation to the proper subpackage (#228364)
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:26:23 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 3 Sep 2007 08:26:23 -0400
Subject: rpms/grip/devel grip-3.2.0-lookup.patch, NONE, 1.1 grip.spec, 1.17,
	1.18
Message-ID: <200709031226.l83CQNxg028643@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28622

Modified Files:
	grip.spec 
Added Files:
	grip-3.2.0-lookup.patch 
Log Message:
* Mon Sep 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-17
- search for ripper and encoder executables in path (#249150)
- updated License:


grip-3.2.0-lookup.patch:

--- NEW FILE grip-3.2.0-lookup.patch ---
diff -ur grip-3.2.0/src/gripcfg.c grip-3.2.0.new/src/gripcfg.c
--- grip-3.2.0/src/gripcfg.c	2007-07-23 09:49:12.000000000 +0200
+++ grip-3.2.0.new/src/gripcfg.c	2007-07-23 09:50:46.000000000 +0200
@@ -62,13 +62,6 @@
 				      {"",""}
 };
 
-static CFGEntry encoder_cfg_entries[]={
-  {"name",CFG_ENTRY_STRING,256,NULL},
-  {"cmdline",CFG_ENTRY_STRING,256,NULL},
-  {"exe",CFG_ENTRY_STRING,256,NULL},
-  {"extension",CFG_ENTRY_STRING,10,NULL}
-};
-
 static void UseProxyChanged(GtkWidget *widget,gpointer data)
 {
   GripInfo *ginfo;
@@ -781,7 +774,7 @@
   };
 
 #ifdef CDPAR
-  if(ripcfg==0) return;
+  if(ripcfg==0) return TRUE;
 #endif
 
   sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
@@ -825,6 +818,9 @@
 
   if(LoadEncoderConfig(ginfo,ginfo->selected_encoder)) {
     strcpy(buf,ginfo->mp3exename);
+    /* in addition to searching the path during rip and encode
+     * also do a path lookup of the executable during config switches */
+    FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
     gtk_entry_set_text(GTK_ENTRY(uinfo->mp3exename_entry),buf);
 
     strcpy(buf,ginfo->mp3cmdline);
diff -ur grip-3.2.0/src/rip.c grip-3.2.0.new/src/rip.c
--- grip-3.2.0/src/rip.c	2004-04-15 20:21:15.000000000 +0200
+++ grip-3.2.0.new/src/rip.c	2007-07-23 09:47:34.000000000 +0200
@@ -1100,8 +1100,6 @@
 {
   static char res[PATH_MAX];
   EncodeTrack *enc_track;
-  gchar *conv_str,*st;
-  gsize rb,wb;
 
   enc_track=(EncodeTrack *)data;
 
@@ -1250,12 +1248,17 @@
 {
   GripInfo *ginfo;
   gboolean result;
+  char buf[sizeof(ginfo->ripexename) > sizeof(ginfo->mp3exename) ? sizeof(ginfo->ripexename) : sizeof(ginfo->mp3exename)];
 
   ginfo=(GripInfo *)data;
 
   if(widget) ginfo->doencode=FALSE;
   else ginfo->doencode=TRUE;
 
+  /* Let's find the ripper in the path; this changes the config */
+  FindExeInPath(ginfo->ripexename, buf, sizeof(buf));
+  strncpy(ginfo->ripexename, buf, sizeof(ginfo->ripexename));
+
   if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
     DisplayMsg(_("Invalid rip executable\nCheck your rip config"));
 
@@ -1263,6 +1266,9 @@
     return;
   }
 
+  /* the same for mp3exename */
+  FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
+  strncpy(ginfo->mp3exename, buf, sizeof(ginfo->mp3exename));
   if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
     DisplayMsg(_("Invalid encoder executable\nCheck your encoder config"));
 
@@ -1504,8 +1510,9 @@
       ginfo->rippid=fork();
       
       if(ginfo->rippid==0) {
+	int i;
 	CloseStuff(ginfo);
-	nice(ginfo->ripnice);
+	i=nice(ginfo->ripnice);
 	execv(ginfo->ripexename,char_args);
 	
 	LogStatus(ginfo,_("Exec failed\n"));
@@ -1539,6 +1546,7 @@
   int paranoia_mode;
   int dup_output_fd;
   FILE *output_fp;
+  int i;
 
   ginfo=(GripInfo *)arg;
 
@@ -1559,7 +1567,7 @@
   
   ginfo->rip_smile_level=0;
   
-  nice(ginfo->ripnice);
+  i=nice(ginfo->ripnice);
 
   dup_output_fd=dup(GetStatusWindowPipe(ginfo->gui_info.rip_status_window));
   output_fp=fdopen(dup_output_fd,"w");
@@ -1742,9 +1750,10 @@
   ginfo->mp3pid[cpu]=fork();
   
   if(ginfo->mp3pid[cpu]==0) {
+    int i;
     CloseStuff(ginfo);
     setsid();
-    nice(ginfo->mp3nice);
+    i=nice(ginfo->mp3nice);
     execv(ginfo->mp3exename,char_args);
     _exit(0);
   }


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grip.spec	17 Mar 2007 11:34:08 -0000	1.17
+++ grip.spec	3 Sep 2007 12:25:50 -0000	1.18
@@ -1,9 +1,9 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
-License: GPL
+License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz
 Source1: grip.1
@@ -12,6 +12,7 @@
 Patch3: grip-3.2.0-id3.c.patch
 Patch4: grip.desktop.patch
 Patch5: grip-64bit-fix.patch
+Patch6: grip-3.2.0-lookup.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .id3
 %patch4
 %patch5
+%patch6 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-17
+- search for ripper and encoder executables in path (#249150)
+- updated License:
+
 * Wed Jan 17 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-16
 - fixes for #220777, #222574, #232755
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:36:19 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 3 Sep 2007 08:36:19 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.30,1.31
Message-ID: <200709031236.l83CaJ50028816@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dvd+rw-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798

Modified Files:
	dvd+rw-tools.spec 
Log Message:
* Fri Aug 31 2007 Matthias Saou <http://freshrpms.net/> 7.0-7
- Minor spec file cleanups (tabs vs. spaces, etc.).
- Use install instead of cp for the html file to avoid umask differences.



Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dvd+rw-tools.spec	17 Aug 2007 12:26:46 -0000	1.30
+++ dvd+rw-tools.spec	3 Sep 2007 12:35:47 -0000	1.31
@@ -1,20 +1,20 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.0
-Release: 	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
-Source1: 	index.html
+Source1:	index.html
 Patch1:		dvd+rw-tools-7.0-phys.patch
 Patch2:		dvd+rw-tools-7.0-pthread.patch
-Patch3: 	dvd+rw-tools-7.0.manpatch
-Patch4: 	dvd+rw-tools-7.0-wexit.patch
-Patch5: 	dvd+rw-tools-7.0-bacula.patch
-Patch6: 	dvd+rw-tools-7.0-glibc2.6.90.patch
+Patch3:		dvd+rw-tools-7.0.manpatch
+Patch4:		dvd+rw-tools-7.0-wexit.patch
+Patch5:		dvd+rw-tools-7.0-bacula.patch
+Patch6:		dvd+rw-tools-7.0-glibc2.6.90.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kernel-headers m4
 
 %description
@@ -22,36 +22,39 @@
 information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
 
 %prep
-%setup -q  -n %{name}-%{version}
+%setup -q
 %patch1 -p1 -b .phys
 %patch2 -p1 -b .pthread
 %patch3 -p1 -b .manpatch
 %patch4 -p1 -b .wexit
 %patch5 -p1 -b .bacula
 %patch6 -p1 -b .glibc2.6.90
+install -m 644 %{SOURCE1} index.html
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-
 make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}
 
-cp -p %SOURCE1 index.html
-
 %install
 rm -rf %{buildroot}
+# make install DESTDIR= does not work here
 %makeinstall
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-%{_prefix}/bin/*
+%defattr(-,root,root,-)
 %doc index.html LICENSE
+%{_bindir}/*
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Aug 31 2007 Matthias Saou <http://freshrpms.net/> 7.0-7
+- Minor spec file cleanups (tabs vs. spaces, etc.).
+- Use install instead of cp for the html file to avoid umask differences.
+
 * Fri Aug 17 2007 Harald Hoyer <harald at rawhide.home> - 7.0-6
 - changed license to GPLv2
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:37:47 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 08:37:47 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.11,1.12
Message-ID: <200709031237.l83Cbli6028958@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867

Modified Files:
	rss-glx.spec 
Log Message:
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rss-glx.spec	29 Aug 2007 14:54:53 -0000	1.11
+++ rss-glx.spec	3 Sep 2007 12:37:14 -0000	1.12
@@ -17,9 +17,15 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
+%if "%{fedora}" >= "8"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
+%define modular_xss 0%{?!_without_modular_xss:1}
 %define gss 0%{?!_without_gss:1}
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
@@ -30,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9%{?dist}
+Release: 9.1%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -43,11 +49,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
 %if %with_matrixview
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
+%if %modular_x
+BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -73,7 +79,12 @@
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %modular_xss
+Requires(post): xscreensaver-base >= 1:5.03-2
+Requires(preun): xscreensaver-base >= 1:5.03-2
+%else
+Requires: xscreensaver-base < 1:5.03-2
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -180,11 +191,8 @@
         popd >& /dev/null
         # external hacks description and symlinks for XScreenSaver
         cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
-name ${name}
-    command ${cmd} -r
-    enabled
-    visuals GL
-
+GL:     "${name}" \\
+        ${cmd} -r \\n\\
 EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
@@ -233,9 +241,9 @@
     %{_bindir}/update-xscreensaver-hacks
 fi
 
-%postun xscreensaver
+%preun xscreensaver
 if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+    %{_bindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -247,7 +255,7 @@
 
 %files xscreensaver
 %defattr(-, root, root)
-%dir %{xssexthacksconfdir}
+# xscreensaver-base provides %{xssexthacksconfdir}
 %config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
@@ -268,6 +276,11 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
 - Buildrequire gawk.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 12:46:40 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Mon, 3 Sep 2007 08:46:40 -0400
Subject: rpms/fetchmail/F-7 fetchmail-6.3.7-CVE-2007-4565.patch, NONE,
	1.1 fetchmail.spec, 1.51, 1.52
Message-ID: <200709031246.l83CkeMC029204@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.7-CVE-2007-4565.patch 
Log Message:
Fix license, Fix fetchmail NULL pointer dereference (CVE-2007-4565)

fetchmail-6.3.7-CVE-2007-4565.patch:

--- NEW FILE fetchmail-6.3.7-CVE-2007-4565.patch ---
--- fetchmail-6.3.7/sink.c_old	2007-08-31 12:17:54.000000000 +0200
+++ fetchmail-6.3.7/sink.c	2007-08-31 12:16:08.000000000 +0200
@@ -262,7 +262,7 @@
     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
 
     /* don't bounce in reply to undeliverable bounces */
-    if (!msg->return_path[0] ||
+    if (!msg || !msg->return_path[0] ||
 	strcmp(msg->return_path, "<>") == 0 ||
 	strcasecmp(msg->return_path, md1) == 0 ||
 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/F-7/fetchmail.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- fetchmail.spec	19 Feb 2007 00:47:48 -0000	1.51
+++ fetchmail.spec	3 Sep 2007 12:46:08 -0000	1.52
@@ -4,13 +4,15 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.7-CVE-2007-4565.patch
 URL: http://fetchmail.berlios.de/
-License: GPL
+# For a breakdown of the licensing, see COPYING
+License: GPL+ and GPLv2 and Public Domain
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
@@ -46,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .cve_2007_4565
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -83,6 +86,11 @@
 %endif
 
 %changelog
+* Mon Sep  3 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.7-2
+- Fix license
+- Fix fetchmail NULL pointer dereference (CVE-2007-4565)
+  Resolves: #260861
+
 * Mon Feb 19 2007 Miloslav Trmac <mitr at redhat.com> - 6.3.7-1
 - Update to fetchmail-6.3.7
 



From fedora-extras-commits at redhat.com  Mon Sep  3 13:24:47 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 09:24:47 -0400
Subject: rpms/ocaml/devel ocaml.spec,1.31,1.32
Message-ID: <200709031324.l83DOl9R003481@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3454/devel

Modified Files:
	ocaml.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
- Don't include the release number in fedora-ocaml-release file, so
  that packages built against this won't depend on the Fedora release.



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ocaml.spec	29 Aug 2007 13:24:23 -0000	1.31
+++ ocaml.spec	3 Sep 2007 13:24:15 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -234,7 +234,7 @@
 cp %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/
 cp %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-echo %{version}-%{release} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
+echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
 
 %clean
@@ -421,6 +421,10 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
+- Don't include the release number in fedora-ocaml-release file, so
+  that packages built against this won't depend on the Fedora release.
+
 * Wed Aug 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.10.0-4
 - added BR util-linux-ng
 



From fedora-extras-commits at redhat.com  Mon Sep  3 14:35:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 10:35:42 -0400
Subject: rpms/ocaml/devel ocaml-find-requires.sh, 1.1, 1.2 ocaml.spec, 1.32,
	1.33
Message-ID: <200709031435.l83EZgA4011385@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11350

Modified Files:
	ocaml-find-requires.sh ocaml.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
- ocaml-runtime provides ocaml(runtime) = 3.10.0, and
  ocaml-find-requires.sh modified so that it adds this requires
  to other packages.  Now can upgrade base ocaml packages without
  needing to rebuild everything else.



Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-find-requires.sh	2 Jul 2007 15:13:39 -0000	1.1
+++ ocaml-find-requires.sh	3 Sep 2007 14:35:10 -0000	1.2
@@ -66,8 +66,7 @@
 sort -u
 
 if [ -n "$emit_compiler_version" ]; then
-    # Every OCaml program depends on the precise version of the
-    # compiler which was used to compile it.
-    # rpm -q --qf '%{NAME} = %{VERSION}-%{RELEASE}\n' ocaml
-    echo "ocaml = `cat /usr/lib*/ocaml/fedora-ocaml-release`"
+    # Every OCaml program depends on the version of the
+    # runtime which was used to compile it.
+    echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`"
 fi


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ocaml.spec	3 Sep 2007 13:24:15 -0000	1.32
+++ ocaml.spec	3 Sep 2007 14:35:10 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -38,6 +38,7 @@
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
+Provides:	ocaml(compiler) = %{version}
 ExcludeArch:    ppc64
 
 %description
@@ -54,6 +55,7 @@
 Group:          System Environment/Libraries
 Summary:        Objective Caml runtime environment
 Requires:       util-linux-ng
+Provides:	ocaml(runtime) = %{version}
 
 %description runtime
 Objective Caml is a high-level, strongly-typed, functional and
@@ -421,6 +423,12 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
+- ocaml-runtime provides ocaml(runtime) = 3.10.0, and
+  ocaml-find-requires.sh modified so that it adds this requires
+  to other packages.  Now can upgrade base ocaml packages without
+  needing to rebuild everything else.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-5
 - Don't include the release number in fedora-ocaml-release file, so
   that packages built against this won't depend on the Fedora release.



From fedora-extras-commits at redhat.com  Mon Sep  3 14:36:20 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 3 Sep 2007 10:36:20 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.12,1.13
Message-ID: <200709031436.l83EaKcB011450@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386

Modified Files:
	rss-glx.spec 
Log Message:
fix %xssexthacksconfdir



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rss-glx.spec	3 Sep 2007 12:37:14 -0000	1.12
+++ rss-glx.spec	3 Sep 2007 14:35:48 -0000	1.13
@@ -1,5 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
-%define xssexthacksconfdir %{_sysconfdir}/xscreensaver/hacks.d
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %define xssbindir %{_libexecdir}/xscreensaver
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers



From fedora-extras-commits at redhat.com  Mon Sep  3 14:52:54 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 10:52:54 -0400
Subject: rpms/yum-cron/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031452.l83EqsV7011776@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753/devel

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fix cron.daily bug which was skippin gupdates, integrate checkonly patch
into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:44:39 -0000	1.2
+++ .cvsignore	3 Sep 2007 14:52:22 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:44:39 -0000	1.2
+++ sources	3 Sep 2007 14:52:22 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 15:19:53 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 14:52:22 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:00:06 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:00:06 -0400
Subject: rpms/yum-cron/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031500.l83F06je012283@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/F-7

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.  Integrated checkonly patch into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 19:15:49 -0000	1.2
+++ .cvsignore	3 Sep 2007 14:59:33 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 19:15:49 -0000	1.2
+++ sources	3 Sep 2007 14:59:33 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:40:45 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 14:59:33 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:02:47 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:02:47 -0400
Subject: rpms/yum-cron/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031502.l83F2l20018314@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18253/FC-6

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.
Integrated checkonly patch into souce tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:53:53 -0000	1.2
+++ .cvsignore	3 Sep 2007 15:02:13 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:53:53 -0000	1.2
+++ sources	3 Sep 2007 15:02:13 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:47:04 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 15:02:13 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:04:51 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Mon, 3 Sep 2007 11:04:51 -0400
Subject: rpms/yum-cron/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-cron.spec, 1.4, 1.5 yum-cron-0.3.checkonly.patch, 1.1, NONE
Message-ID: <200709031504.l83F4pMM018442@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18391/EL-5

Modified Files:
	.cvsignore sources yum-cron.spec 
Removed Files:
	yum-cron-0.3.checkonly.patch 
Log Message:
Fixed bug in cron.daily script which was preventing updates from
running.
Integrated checkonly patch into source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 18:53:53 -0000	1.2
+++ .cvsignore	3 Sep 2007 15:04:18 -0000	1.3
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 18:53:53 -0000	1.2
+++ sources	3 Sep 2007 15:04:18 -0000	1.3
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/yum-cron.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-cron.spec	28 Aug 2007 16:49:15 -0000	1.4
+++ yum-cron.spec	3 Sep 2007 15:04:18 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw at weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.


--- yum-cron-0.3.checkonly.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:24:39 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:24:39 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.1,
	1.2 xscreensaver.spec, 1.44, 1.45
Message-ID: <200709031524.l83FOdEx019180@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19160

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
- Don't split hack part of XScreenSaver.ad into each hack piece
  and make update script allow multiple config lines
  (along with rss-glx)



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-xscreensaver-hacks	2 Sep 2007 15:24:14 -0000	1.1
+++ update-xscreensaver-hacks	3 Sep 2007 15:24:07 -0000	1.2
@@ -11,7 +11,7 @@
 fix_hackconf ()
 {
 	if [ ! -s $1 ] ; then
-		echo "$1 is empty" &>2
+		echo "$1 is empty" >&2
 		echo ""
 		return 1
 	fi
@@ -37,15 +37,12 @@
 	while [ -s $tmpconf_2 ] ; do
 		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
 		sed -i -e '1d' $tmpconf_2
-		if grep -q '\\..*$' $tmpconf_3 ; then
+		if ! grep -q '\([ \t]\\$\|\\n\\$\)' $tmpconf_3 ; then
 			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
 			echo ""
 			echo "ignoring $1" >&2
 			return 1
 		fi
-		if ! grep -q '\\$' $tmpconf_3 ; then
-			sed -i -e 's|\(^.*$\)|\1\\|' $tmpconf_3
-		fi
 		cat $tmpconf_3 >> $tmpconf
 	done
 	cat $tmpconf_1 >> $tmpconf


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xscreensaver.spec	2 Sep 2007 15:24:14 -0000	1.44
+++ xscreensaver.spec	3 Sep 2007 15:24:07 -0000	1.45
@@ -2,7 +2,7 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -292,44 +292,9 @@
 
 # Seperate XScreenSaver.ad.hacks into each hacks
 cd $CONFD
-mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/ ; cd hacks.conf.d
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
 
-while [ -s XScreenSaver.ad.hacks ] ; do
-# cut hacks file by \n
-   sed -n -e '1,1p' XScreenSaver.ad.hacks > .tmp
-   if grep -q '\\n[\\]*$' .tmp ; then
-      sed -i -e '1d' XScreenSaver.ad.hacks
-   else
-      sed -n -e '1,/\\n[\\]*$/p' XScreenSaver.ad.hacks > .tmp
-      sed -i -e '1,/\\n[\\]*$/d' XScreenSaver.ad.hacks
-   fi
-
-# name modular hack conf
-   set +x
-   cp -p .tmp .tmp.2
-   modname='\'
-   while ( echo $modname | grep -q '\\' ) ; do
-      sed -n -e '1,1p' .tmp.2 | sed -e \
-         's|^[-]*[ \t][ \t]*\([a-zA-Z][a-zA-Z-]*:[ \t][ \t]*\)*\("[^"][^"]*"[ \t][ \t]*\)*||' | \
-         sed -e 's|[ \t].*$||' > .mod.name
-      modname=`cat .mod.name`
-      sed -i -e '1,1d' .tmp.2
-   done
-   N=1
-   Filen=$modname.conf
-   while [ -f $Filen ] ; do
-      N=$((N+1))
-      Filen=$modname-$N.conf
-   done
-   sed -e 's|\\n$|\\n\\|' .tmp > $Filen
-   echo "   created: $Filen"
-
-# clean up
-   rm -f .tmp* .mod.name
-
-done
-set -x
-cd ../..
 %endif
 
 %install
@@ -393,7 +358,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
 cp -p xscreensaver/XScreenSaver.ad* \
    $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
-cp -p xscreensaver/hacks.conf.d/*.conf \
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
    $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
 
 for adfile in xscreensaver/XScreenSaver.ad.* ; do
@@ -403,6 +368,8 @@
 echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
 echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
    $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+   >> $dd/base.files
 
 # check symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
@@ -419,19 +386,6 @@
 ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
    $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
 
-set +x
-for conf in xscreensaver/hacks.conf.d/*.conf ; do
-   modname=`basename $conf | sed -e 's|.conf||' | sed -e 's|-.*||'`
-   if grep -q -i $modname $dd/extras.files ; then
-        hackfile=$dd/extras.files
-   else
-        hackfile=$dd/gl-extras.files
-   fi
-   echo "%{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`" >> $hackfile
-   echo -n " Added: %{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`"
-   echo " >> `basename $hackfile`"
-done
-set -x
 %endif
 
 # add documents
@@ -526,11 +480,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{modular_conf}
-%post extras
-%{_bindir}/update-xscreensaver-hacks
-exit 0
-
-%post gl-extras
+%post base
 %{_bindir}/update-xscreensaver-hacks
 exit 0
 %endif
@@ -554,8 +504,13 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
+- Don't split hack part of XScreenSaver.ad into each hack piece
+  and make update script allow multiple config lines
+  (along with rss-glx)
+
 * Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
-- Try to make XScreenSaver.ad modular
+- Try to make XScreenSaver.ad modular (bug 200881)
 
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
@@ -565,7 +520,7 @@
   - Don't use include-directory patch anymore
   - Make all xscreensaver related directories owned by -base subpackage
     because now -extras and -gl-extras subpackage require it.
-  - Mark man files as %%doc explicitly, because %_mandir is expanded
+  - Mark man files as %%doc explicitly, because %%_mandir is expanded
     in files list
 - Fix write_long() (actually no_malloc_number_to_string())
 



From fedora-extras-commits at redhat.com  Mon Sep  3 15:33:48 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Mon, 3 Sep 2007 11:33:48 -0400
Subject: rpms/audit/F-7 audit-1.6-python.patch, NONE,
	1.1 s-c-audit-0.4.3.patch, 
	NONE, 1.1 audit.spec, 1.136, 1.137 audit-1.3.1-python.patch, 1.3, NONE
Message-ID: <200709031533.l83FXmIJ019615@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554

Modified Files:
	audit.spec 
Added Files:
	audit-1.6-python.patch s-c-audit-0.4.3.patch 
Removed Files:
	audit-1.3.1-python.patch 
Log Message:
* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
- Update s-c-audit to version 0.4.3
- Fix reference counting in auparse python bindings (#263961) 


audit-1.6-python.patch:

--- NEW FILE audit-1.6-python.patch ---
diff -ur /home/mitr/a/audit-1.6/bindings/python/auparse_python.c audit-1.6/bindings/python/auparse_python.c
--- /home/mitr/a/audit-1.6/bindings/python/auparse_python.c	2007-05-30 22:37:40.000000000 +0200
+++ audit-1.6/bindings/python/auparse_python.c	2007-08-29 18:03:35.000000000 +0200
@@ -57,8 +57,8 @@
 {
     if (self->sec == NULL) {
         if ((self->sec = PyInt_FromLong(self->event.sec)) == NULL) return NULL;
-        Py_INCREF(self->sec);
     }
+    Py_INCREF(self->sec);
     return self->sec;
 }
 
@@ -67,8 +67,8 @@
 {
     if (self->milli == NULL) {
         if ((self->milli = PyInt_FromLong(self->event.milli)) == NULL) return NULL;
-        Py_INCREF(self->milli);
     }
+    Py_INCREF(self->milli);
     return self->milli;
 }
 
@@ -77,8 +77,8 @@
 {
     if (self->serial == NULL) {
         if ((self->serial = PyInt_FromLong(self->event.serial)) == NULL) return NULL;
-        Py_INCREF(self->serial);
     }
+    Py_INCREF(self->serial);
     return self->serial;
 }
 
@@ -88,7 +88,9 @@
     if (self->event.host == NULL) {
         Py_RETURN_NONE;
     } else {
-        if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	if (self->host == NULL) {
+	    if ((self->host = PyString_FromString(self->event.host)) == NULL) return NULL;
+	}
         Py_INCREF(self->host);
         return self->host;
     }

s-c-audit-0.4.3.patch:

--- NEW FILE s-c-audit-0.4.3.patch ---
diff -ur audit-1.5.6.orig/system-config-audit/ChangeLog audit-1.5.6/system-config-audit/ChangeLog
--- audit-1.5.6.orig/system-config-audit/ChangeLog	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/ChangeLog	2007-08-28 14:20:16.000000000 -0400
@@ -1,3 +1,21 @@
+2007-08-28  Miloslav Trma??  <mitr at redhat.com>
+
+	* configure.ac: Release 0.4.3.
+	* NEWS: Update.
+
+	* src/audit_rules.py (Field.option_text): New parameter rule.  Use
+	-p only in rules with -w, -F perm= otherwise.
+	(Rule.command_text): Add -k only after -S.
+
+2007-08-02  Miloslav Trma??  <mitr at redhat.com>
+
+	* src/main_window.py (N_): Remove useless definition.
+
+2007-07-23  Miloslav Trma??  <mitr at redhat.com>
+
+	* src/watch_list_dialog.py (_WatchTable._validate_rule): Fix a
+	crash when the rule has no AUDIT_WATCH or AUDIT_PERM field.
+
 2007-07-17  Miloslav Trma??  <mitr at redhat.com>
 
 	* system-config-audit.desktop.in (Categories): Add System, to move the
diff -ur audit-1.5.6.orig/system-config-audit/configure.ac audit-1.5.6/system-config-audit/configure.ac
--- audit-1.5.6.orig/system-config-audit/configure.ac	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/configure.ac	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([system-config-audit], [0.4.2], [mitr at redhat.com])
+AC_INIT([system-config-audit], [0.4.3], [mitr at redhat.com])
 AC_COPYRIGHT(
 [Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
 
diff -ur audit-1.5.6.orig/system-config-audit/NEWS audit-1.5.6/system-config-audit/NEWS
--- audit-1.5.6.orig/system-config-audit/NEWS	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/NEWS	2007-08-28 14:08:59.000000000 -0400
@@ -1,5 +1,10 @@
+Changes in release 0.4.3:
+* Fix order of -k and -S, and using -p without -w, in audit rules
+* Fix a crash validating a non-watch rule
+* Move the menu entry to the Administration submenu in GNOME
+
 Changes in release 0.4.2:
-* Modify to run on RHEL 5.
+* Modify to run on RHEL 5
 
 Changes in release 0.4.1:
 * Add an install-fedora Makefile target
diff -ur audit-1.5.6.orig/system-config-audit/src/audit_rules.py audit-1.5.6/system-config-audit/src/audit_rules.py
--- audit-1.5.6.orig/system-config-audit/src/audit_rules.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/audit_rules.py	2007-08-28 14:08:59.000000000 -0400
@@ -347,13 +347,18 @@
         self.op = self.OP_EQ
         self.value = self.get_field_type(self.var).parse_value(string, self.op)
 
-    def option_text(self):
-        '''Return a string representing this field as an auditctl option.'''
+    def option_text(self, rule):
+        '''Return a string representing this field as an auditctl option.
+
+        Use rule to determine the correct syntax.
+
+        '''
         val = self._value_text()
         if self.var == audit.AUDIT_FILTERKEY:
             assert self.op == self.OP_EQ
             return '-k %s' % val
-        elif self.var == audit.AUDIT_PERM:
+        elif (self.var == audit.AUDIT_PERM and
+              len([f for f in rule.fields if f.var == audit.AUDIT_WATCH]) == 1):
             assert self.op == self.OP_EQ
             return '-p %s' % val
         else:
@@ -443,16 +448,21 @@
             o.append('-w %s' % watches[0].value)
             watch_used = True
         # Add fields before syscalls because -F arch=... may change the meaning
-        # of syscall names
+        # of syscall names.  But add AUDIT_FILTERKEY only after -S, auditctl
+        # stubbornly insists on that order.
         for f in self.fields:
-            if f.var != audit.AUDIT_WATCH or not watch_used:
-                o.append(f.option_text())
+            if (f.var != audit.AUDIT_FILTERKEY and
+                (f.var != audit.AUDIT_WATCH or not watch_used)):
+                o.append(f.option_text(self))
         if list is not rules.exclude_rules:
             for s in self.syscalls:
                 if s == self.SYSCALLS_ALL:
                     o.append('-S all')
                 else:
                     o.append('-S %s' % util.syscall_string(s, self.machine))
+        for f in self.fields:
+            if f.var == audit.AUDIT_FILTERKEY:
+                o.append(f.option_text(self))
         return ' '.join(o)
 
     def __eq__(self, rule):
diff -ur audit-1.5.6.orig/system-config-audit/src/main_window.py audit-1.5.6/system-config-audit/src/main_window.py
--- audit-1.5.6.orig/system-config-audit/src/main_window.py	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/main_window.py	2007-08-28 14:08:59.000000000 -0400
@@ -32,8 +32,6 @@
 import settings
 import util
 
-def N_(s): return s
-
 def exit_watch_rules(rules):
     '''Split exit rules to lists for WatchListDialog and RuleListDialog.
 
diff -ur audit-1.5.6.orig/system-config-audit/src/server.c audit-1.5.6/system-config-audit/src/server.c
--- audit-1.5.6.orig/system-config-audit/src/server.c	2007-08-28 14:08:15.000000000 -0400
+++ audit-1.5.6/system-config-audit/src/server.c	2007-08-28 14:08:59.000000000 -0400
@@ -200,7 +200,7 @@
       err = errno;
       goto err_fd;
     }
-  if (st.st_size > SIZE_MAX)
+  if (st.st_size > (off_t)SIZE_MAX)
     {
       err = EFBIG;
       goto err_fd;


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-7/audit.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- audit.spec	28 Aug 2007 13:25:30 -0000	1.136
+++ audit.spec	3 Sep 2007 15:33:16 -0000	1.137
@@ -1,14 +1,17 @@
-%define sca_version 0.4.2
+%define sca_version 0.4.3
+%define sca_release 1
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.5.7-updates.patch
+Patch2: s-c-audit-0.4.3.patch
+Patch3: audit-1.6-python.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -55,17 +58,10 @@
 The audit-libs-python package contains the bindings so that libaudit
 and libauparse can be used by python.
 
-%package audispd-plugins
-Summary: Default plugins for the audit dispatcher
-License: LGPL
-Group: System Environment/Daemons
-
-%description audispd-plugins
-The audispd-plugins package contains plugins for the audit dispatcher.
-
 %package -n system-config-audit
 Summary: Utility for editing audit configuration
 Version: %{sca_version}
+Release: %{sca_release}%{?dist}
 License: GPL
 Group: Applications/System
 Requires: pygtk2-libglade usermode usermode-gtk
@@ -76,8 +72,11 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+(cd system-config-audit; ./autogen.sh)
 aclocal && autoconf && autoheader && automake
 %configure --sbindir=/sbin --libdir=/%{_lib}
 make
@@ -162,6 +161,7 @@
 
 %files libs-devel
 %defattr(-,root,root)
+%doc contrib/skeleton.c
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 %{_libdir}/libaudit.so
@@ -179,7 +179,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
+%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -214,6 +214,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Mon Sep 03 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-2
+- Update s-c-audit to version 0.4.3
+- Fix reference counting in auparse python bindings (#263961) 
+
 * Tue Aug 28 2007 Steve Grubb <sgrubb at redhat.com> 1.5.6-1
 - New upstream version
 


--- audit-1.3.1-python.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 15:35:11 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:35:11 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.45,1.46
Message-ID: <200709031535.l83FZB4l019719@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19684

Modified Files:
	xscreensaver.spec 
Log Message:
- move hack update scripts to %%_sbindir


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xscreensaver.spec	3 Sep 2007 15:24:07 -0000	1.45
+++ xscreensaver.spec	3 Sep 2007 15:34:39 -0000	1.46
@@ -350,8 +350,9 @@
 
 %if %{modular_conf}
 # install update script
-install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}
-echo "%{_bindir}/update-xscreensaver-hacks" >> $dd/base.files
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
+echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
 
 # make hack conf modular
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
@@ -481,7 +482,7 @@
 
 %if %{modular_conf}
 %post base
-%{_bindir}/update-xscreensaver-hacks
+%{_sbindir}/update-xscreensaver-hacks
 exit 0
 %endif
 
@@ -506,8 +507,9 @@
 %changelog
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
 - Don't split hack part of XScreenSaver.ad into each hack piece
-  and make update script allow multiple config lines
-  (along with rss-glx)
+  and make update script allow multiple hacks in one config file
+  (along with rss-glx, bug 200881)
+- move hack update scripts to %%_sbindir
 
 * Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
 - Try to make XScreenSaver.ad modular (bug 200881)



From fedora-extras-commits at redhat.com  Mon Sep  3 15:41:35 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 3 Sep 2007 11:41:35 -0400
Subject: rpms/vpnc/devel vpnc-0.4.0-sizeofbug.patch, NONE, 1.1 vpnc.spec,
	1.23, 1.24
Message-ID: <200709031541.l83FfZpJ020045@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20019

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
- fix long standing bug causing problems on x86_64 (#232565) now for real


vpnc-0.4.0-sizeofbug.patch:

--- NEW FILE vpnc-0.4.0-sizeofbug.patch ---
diff -up vpnc-0.4.0/vpnc.c.sizeofbug vpnc-0.4.0/vpnc.c
--- vpnc-0.4.0/vpnc.c.sizeofbug	2007-09-03 17:30:03.000000000 +0200
+++ vpnc-0.4.0/vpnc.c	2007-09-03 17:30:45.000000000 +0200
@@ -1971,7 +1971,7 @@ static void setup_link(struct sa_block *
 		rp->next->next->next = us;
 	}
 
-	gcry_create_nonce((uint8_t *) & msgid, sizeof(&msgid));
+	gcry_create_nonce((uint8_t *) & msgid, sizeof(msgid));
 	if (msgid == 0)
 		msgid = 1;
 


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vpnc.spec	22 Aug 2007 21:15:39 -0000	1.23
+++ vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -16,6 +16,7 @@
 Patch0:         vpnc-0.4.0-pie.patch
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.4.0-cloexec.patch
+Patch3:		vpnc-0.4.0-sizeofbug.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,11 +44,9 @@
 %patch0 -p1 -b .pie
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
+%patch3 -p1 -b .sizeofbug
 
 %build
-%ifarch x86_64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector//g)
-%endif
 make PREFIX=/usr
 
 %install
@@ -100,6 +99,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
+- fix long standing bug causing problems on x86_64 (#232565) now for real
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-3
 - license tag fix
 



From fedora-extras-commits at redhat.com  Mon Sep  3 15:53:05 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 3 Sep 2007 11:53:05 -0400
Subject: rpms/claws-mail/F-7 .cvsignore, 1.10, 1.11 claws-mail.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200709031553.l83Fr5Uh020318@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20277/F-7

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade
- new license tag (upstream switch to GPLv3+)
- fix #254121 (CVE-2007-2958)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jul 2007 15:21:28 -0000	1.10
+++ .cvsignore	3 Sep 2007 15:52:21 -0000	1.11
@@ -1 +1 @@
-claws-mail-2.10.0.tar.bz2
+claws-mail-3.0.0.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail.spec	22 Aug 2007 06:51:36 -0000	1.17
+++ claws-mail.spec	3 Sep 2007 15:52:21 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        2.10.0
-Release:        4%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
-License:        GPLv2+ and LGPLv2+
+License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-2.10.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,12 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-1
+- version upgrade
+- new license tag (upstream switch to GPLv3+)
+- fix #254121 (CVE-2007-2958)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-4
 - new license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jul 2007 15:21:28 -0000	1.10
+++ sources	3 Sep 2007 15:52:21 -0000	1.11
@@ -1 +1 @@
-ed409002b5e6b60b682ae3ee7f87a86d  claws-mail-2.10.0.tar.bz2
+9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 15:53:11 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 3 Sep 2007 11:53:11 -0400
Subject: rpms/claws-mail/devel .cvsignore, 1.10, 1.11 claws-mail.spec, 1.17, 
	1.18 sources, 1.10, 1.11
Message-ID: <200709031553.l83FrBOP020323@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20277/devel

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade
- new license tag (upstream switch to GPLv3+)
- fix #254121 (CVE-2007-2958)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jul 2007 14:29:49 -0000	1.10
+++ .cvsignore	3 Sep 2007 15:52:35 -0000	1.11
@@ -1 +1 @@
-claws-mail-2.10.0.tar.bz2
+claws-mail-3.0.0.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail.spec	22 Aug 2007 06:51:39 -0000	1.17
+++ claws-mail.spec	3 Sep 2007 15:52:35 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        2.10.0
-Release:        4%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
-License:        GPLv2+ and LGPLv2+
+License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-2.10.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,10 +207,15 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-1
+- version upgrade
+- new license tag (upstream switch to GPLv3+)
+- fix #254121 (CVE-2007-2958)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-4
 - new license tag
-- rebuild for ppc32
 
 * Wed Jul 18 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jul 2007 14:29:49 -0000	1.10
+++ sources	3 Sep 2007 15:52:35 -0000	1.11
@@ -1 +1 @@
-ed409002b5e6b60b682ae3ee7f87a86d  claws-mail-2.10.0.tar.bz2
+9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep  3 15:58:19 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 11:58:19 -0400
Subject: rpms/jd/devel .cvsignore, 1.141, 1.142 jd.spec, 1.167, 1.168 sources,
	1.142, 1.143
Message-ID: <200709031558.l83FwJ08020499@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20428

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
- svn 1311



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	1 Sep 2007 16:32:36 -0000	1.141
+++ .cvsignore	3 Sep 2007 15:57:38 -0000	1.142
@@ -1 +1 @@
-jd-1.9.6-svn1304.tgz
+jd-1.9.6-svn1311.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- jd.spec	1 Sep 2007 16:32:36 -0000	1.167
+++ jd.spec	3 Sep 2007 15:57:38 -0000	1.168
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1304
+%define         strtag        svn1311
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1304
-- svn 1304
+* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
+- svn 1311
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- sources	1 Sep 2007 16:32:36 -0000	1.142
+++ sources	3 Sep 2007 15:57:38 -0000	1.143
@@ -1 +1 @@
-60cc39b08265a902ce8d7f561715b389  jd-1.9.6-svn1304.tgz
+ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 16:03:58 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon,  3 Sep 2007 12:03:58 -0400
Subject: fedora-security/manifest dist-fc7-updates,1.3,1.4
Message-ID: <200709031603.l83G3wfv026494@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/manifest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408

Modified Files:
	dist-fc7-updates 
Log Message:
Up-to-date



Index: dist-fc7-updates
===================================================================
RCS file: /cvs/fedora/fedora-security/manifest/dist-fc7-updates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dist-fc7-updates	30 Aug 2007 10:18:12 -0000	1.3
+++ dist-fc7-updates	3 Sep 2007 16:03:55 -0000	1.4
@@ -124,7 +124,7 @@
 aiccu-2007.01.15-1.fc7                    fe7-merge             jkeating
 aide-0.12-2.fc7                           fe7-merge             jkeating
 aiksaurus-1.2.1-15.fc6                    fe7-merge             jkeating
-aircrack-ng-0.9-1.fc7                     dist-fc7              till
+aircrack-ng-0.9.1-1.fc7                   dist-fc7-updates      till
 airsnort-0.2.7e-11.fc7                    fe7-merge             jkeating
 akode-2.0.1-6.fc7                         fe7-merge             jkeating
 alacarte-0.11.3-3.fc7                     dist-fc7              jkeating
@@ -147,7 +147,7 @@
 alsamixergui-0.9.0-0.3.rc1.fc6            fe7-merge             jkeating
 altermime-0.3.7-2.fc6                     fe7-merge             jkeating
 am-utils-6.1.5-6.fc7                      dist-fc7              jkeating
-amanda-2.5.1p3-2.fc7                      dist-fc7-updates      rbrich
+amanda-2.5.1p3-3.fc7                      dist-fc7-updates      rbrich
 amarok-1.4.6-2.fc7                        dist-fc7-updates      abompard
 amarokFS-0.5-1.fc7                        fe7-merge             jkeating
 amavisd-new-2.5.1-1.fc7                   dist-fc7-updates      steve
@@ -187,7 +187,7 @@
 archmage-0.0.8-1.fc7                      fe7-merge             jkeating
 ardour-0.99.3-8.fc7                       fe7-merge             jkeating
 argus-2.0.6.fixes.1-13.fc7                fe7-merge             jkeating
-aria2-0.11.1-1.fc7                        dist-fc7-updates      ecik
+aria2-0.11.2-1.fc7                        dist-fc7-updates      ecik
 arj-3.10.22-1.fc6                         fe7-merge             jkeating
 arm-gp2x-linux-SDL-1.2.9-4.fc7            dist-fc7-updates      jwrdegoede
 arm-gp2x-linux-binutils-2.16.1-2.fc7      dist-fc7-updates      jwrdegoede
@@ -249,7 +249,7 @@
 at-3.1.10-13.fc7                          dist-fc7-updates      mmaslano
 at-spi-1.18.1-1.fc7                       dist-fc7              jkeating
 atanks-2.4-1.fc7                          dist-fc7-updates      icon
-aterm-1.0.0-7.fc7                         fe7-merge             jkeating
+aterm-1.0.1-1.fc7                         dist-fc7-updates      awjb
 athcool-0.3.11-5.fc6                      fe7-merge             jkeating
 atitvout-0.4-6                            fe7-merge             jkeating
 atk-1.18.0-1.fc7                          dist-fc7              jkeating
@@ -276,7 +276,7 @@
 autoconf213-2.13-17.fc7                   dist-fc7              jkeating
 autodir-0.99.9-2.fc7                      dist-fc7              thias
 autodownloader-0.2.0-2.fc7                dist-fc7              jwrdegoede
-autofs-5.0.1-25                           dist-fc7-updates      iankent
+autofs-5.0.1-26                           dist-fc7-updates      iankent
 autogen-5.8.9-1.fc7                       fe7-merge             jkeating
 automake-1.10-5                           dist-fc7              jkeating
 automake14-1.4p6-15.fc7                   dist-fc7              jkeating
@@ -314,7 +314,7 @@
 bazaar-1.4.2-8.fc6                        fe7-merge             jkeating
 bbkeys-0.9.0-6.fc7                        fe7-merge             jkeating
 bc-1.06-26                                dist-fc7              jkeating
-bcel-5.1-10jpp.3.fc7                      dist-fc7-updates      pcheung
+bcel-5.1-10jpp.4.fc7                      dist-fc7-updates      pcheung
 bcfg2-0.9.4-4.fc7                         dist-fc7-updates      jcollie
 bchunk-1.2.0-4                            fe7-merge             jkeating
 bcm43xx-fwcutter-006-1.fc7                fe7-merge             jkeating
@@ -330,7 +330,7 @@
 beryl-manager-0.2.1-1.fc7                 dist-fc7-updates      jwilson
 beryl-plugins-0.2.1-1.fc7                 dist-fc7-updates      jwilson
 beryl-settings-0.2.1-1.fc7                dist-fc7-updates      jwilson
-bibletime-1.6.3b-3.fc7                    fe7-merge             jkeating
+bibletime-1.6.4-2.fc7                     dist-fc7-updates      anderson
 bidiv-1.5-4.fc6                           fe7-merge             jkeating
 bigloo-3.0a-4.fc7                         dist-fc7-updates      gemi
 bind-9.4.1-9.P1.fc7                       dist-fc7-updates      atkac
@@ -377,7 +377,7 @@
 bouml-doc-2.30-3.fc7                      dist-fc7-updates      rishi
 bouncycastle-1.34-3.fc7                   dist-fc7              jkeating
 brandy-1.0.19-4.fc6                       fe7-merge             jkeating
-brasero-0.5.2-1.fc7                       fe7-merge             jkeating
+brasero-0.6.1-1.fc7                       dist-fc7-updates      denis
 bridge-utils-1.1-2                        dist-fc6              jkeating
 brltty-3.7.2-3.fc7                        dist-fc7              jkeating
 bsd-games-2.17-20.fc7                     fe7-merge             jkeating
@@ -418,6 +418,7 @@
 camstream-0.26.3-11.fc7                   fe7-merge             jkeating
 castor-0.9.5-1jpp.7                       dist-fc6              jkeating
 catfish-0.3-0.1.b.fc7                     dist-fc7              mtasaka
+cbios-0.21-3.fc7                          dist-fc7-updates      oddsocks
 ccache-2.4-8.fc7                          fe7-merge             jkeating
 ccid-1.2.1-1.fc7                          dist-fc7              jkeating
 ccrtp-1.5.1-1.fc7                         fe7-merge             jkeating
@@ -515,7 +516,7 @@
 conserver-8.1.16-1.fc7                    fe7-merge             jkeating
 contact-lookup-applet-0.16-1.fc7          dist-fc7-updates      bpepple
 contacts-0.5-1.fc7                        dist-fc7-updates      denis
-control-center-2.18.0-18.fc7              dist-fc7              hadess
+control-center-2.18.0-20.fc7              dist-fc7-updates      rstrode
 convmv-1.10-2.fc6                         fe7-merge             jkeating
 cook-2.30-1.fc7                           dist-fc7-updates      gemi
 coolkey-1.1.0-1.fc7                       dist-fc7              jkeating
@@ -537,7 +538,7 @@
 createrepo-0.4.10-1.fc7                   dist-fc7-updates      pnasrat
 crm114-0-0.4.20070301.fc7                 fe7-merge             jkeating
 cronolog-1.6.2-4.fc7                      fe7-merge             jkeating
-crontabs-1.10-14.fc7                      dist-fc7              jkeating
+crontabs-1.10-15.fc7                      dist-fc7-updates      mmaslano
 crossfire-1.10.0-1.fc7                    dist-fc7-updates      wart
 crossfire-client-1.10.0-1.fc7             dist-fc7-updates      wart
 crossfire-maps-1.10.0-1.fc7               dist-fc7-updates      wart
@@ -545,8 +546,8 @@
 cryptix-3.2.0-9jpp.1                      dist-fc6              jkeating
 cryptix-asn1-20011119-7jpp.2              dist-fc6              jkeating
 crypto-utils-2.3-2                        dist-fc7              jkeating
-cryptsetup-luks-1.0.3-4.fc7               dist-fc7              jkeating
-crystal-1.0.4-1.fc7                       dist-fc7-updates      chitlesh
+cryptsetup-luks-1.0.5-4.fc7.1             dist-fc7-updates      till
+crystal-1.0.5-1.fc7                       dist-fc7-updates      chitlesh
 crystal-clear-20050622-5.fc7              dist-fc7-updates      chitlesh
 crystal-project-20070620-3.fc7            dist-fc7-updates      chitlesh
 crystal-stacker-1.5-3.fc6                 fe7-merge             jkeating
@@ -598,7 +599,7 @@
 dbus-qt-0.70-1.fc7                        fe7-merge             jkeating
 dbus-sharp-0.63-6.fc6                     dist-fc6              jkeating
 dclib-0.3.8-2.fc7                         fe7-merge             jkeating
-dcraw-8.53-2.fc7                          dist-fc7              jkeating
+dcraw-8.77-1.fc7                          dist-fc7-updates      nphilipp
 dd2-0.2.1-1.fc7                           fe7-merge             jkeating
 dd_rescue-1.12-6.fc7                      fe7-merge             jkeating
 ddclient-3.7.1-1.fc7                      fe7-merge             jkeating
@@ -730,7 +731,7 @@
 ekg2-0-0.7.20070427.fc7                   dist-fc7-updates      rathann
 ekiga-2.0.9-1.fc7                         dist-fc7              jkeating
 elektra-0.6.10-2.fc7                      fe7-merge             jkeating
-elfutils-0.128-2.fc7                      dist-fc7-updates      roland
+elfutils-0.129-1.fc7                      dist-fc7-updates      roland
 elilo-3.6-2                               dist-fc6              jkeating
 elinks-0.11.2-1.fc7                       dist-fc7              jkeating
 elisa-0.3.1-1.fc7                         dist-fc7-updates      thias
@@ -802,7 +803,7 @@
 fail2ban-0.8.1-10.fc7                     dist-fc7-updates      athimm
 fakechroot-2.5-12.fc7                     fe7-merge             jkeating
 fakeroot-1.6.4-15.fc7                     fe7-merge             jkeating
-fann-2.0.0-3.fc7                          dist-fc7-updates      tsmetana
+fann-2.0.0-4.fc7                          dist-fc7-updates      tsmetana
 farsight-0.1.20-2.fc7                     dist-fc7-updates      bpepple
 fast-user-switch-applet-2.17.4-4.fc7      dist-fc7              jkeating
 fatsort-0.9.7.1-1.fc7                     dist-fc7-updates      till
@@ -974,7 +975,7 @@
 gdhcpd-0.3.2-4.fc7                        dist-fc7-updates      drago01
 gdk-pixbuf-0.22.0-34.fc7                  fe7-merge             jkeating
 gdl-0.9-0.pre4.1.fc7                      fe7-merge             jkeating
-gdm-2.18.4-1.fc7                          dist-fc7-updates      rstrode
+gdm-2.18.4-2.fc7                          dist-fc7-updates      rstrode
 gdmap-0.7.5-6.fc6                         fe7-merge             jkeating
 gdome2-0.8.1-5.2.fc7                      fe7-merge             jkeating
 gds2pov-0.20070815-1.fc7                  dist-fc7-updates      chitlesh
@@ -1048,7 +1049,7 @@
 glib-java-0.2.6-8.fc7                     dist-fc7              jkeating
 glib2-2.12.13-1.fc7                       dist-fc7-updates      mclasen
 glibc-2.6-4                               dist-fc7-updates      jakub
-glibmm24-2.12.8-1.fc7                     fe7-merge             jkeating
+glibmm24-2.12.10-1.fc7                    dist-fc7-updates      denis
 glimmer-3.02-1.fc7                        fe7-merge             jkeating
 glipper-0.95.1-2.fc7                      fe7-merge             jkeating
 glitz-0.5.6-5.fc7                         fe7-merge             jkeating
@@ -1131,7 +1132,7 @@
 gnome-vfs2-obexftp-0.2-7.fc7              dist-fc7-updates      hadess
 gnome-vfsmm26-2.18.0-1.fc7                fe7-merge             jkeating
 gnome-volume-manager-2.17.0-7.fc7         dist-fc7              mclasen
-gnomebaker-0.6.1-1.fc7                    dist-fc7-updates      tsmetana
+gnomebaker-0.6.1-2.fc7                    dist-fc7-updates      tsmetana
 gnomeradio-1.6-3.fc6                      fe7-merge             jkeating
 gnomescan-0.4.0.2-1.fc7                   fe7-merge             jkeating
 gnomesword-2.2.3-1.fc7                    fe7-merge             jkeating
@@ -1375,7 +1376,7 @@
 ifd-egate-0.05-17                         dist-fc7              jkeating
 ifm-5.1-5.fc6                             fe7-merge             jkeating
 ifplugd-0.28-6.fc7                        fe7-merge             jkeating
-iftop-0.17-4.fc7                          fe7-merge             jkeating
+iftop-0.17-6.fc7                          dist-fc7-updates      robert
 ike-scan-1.9-2.fc7.1                      dist-fc7-updates      sindrepb
 iksemel-1.2-13.fc7                        fe7-merge             jkeating
 ikvm-0.22-10.fc6                          fe7-merge             jkeating
@@ -1479,7 +1480,7 @@
 jfsutils-1.1.10-4.1                       dist-fc6              jkeating
 jgroups-2.2.9.2-3jpp.2                    dist-fc6              jkeating
 jhead-2.7-1.fc7                           fe7-merge             jkeating
-jigdo-0.7.3-3.fc7                         fe7-merge             jkeating
+jigdo-0.7.3-4.fc7                         dist-fc7-updates      iburrell
 jlex-1.2.6-5jpp.1                         dist-fc6              jkeating
 jline-0.9.9-1jpp.1.fc7                    fe7-merge             jkeating
 joe-3.5-3.fc7                             dist-fc7              jkeating
@@ -1516,7 +1517,7 @@
 kasumi-2.2-4.fc7                          dist-fc7-updates      tagoh
 katapult-0.3.2.1-1.fc7                    dist-fc7-updates      chitlesh
 kawa-1.9.0-2.fc7                          fe7-merge             jkeating
-kazehakase-0.4.7-4.fc7                    dist-fc7-updates      mtasaka
+kazehakase-0.4.8-1.fc7                    dist-fc7-updates      mtasaka
 kbackup-0.5.1-7.fc7                       dist-fc7-updates      dionysos
 kbd-1.12-22.fc7                           dist-fc7-updates      vcrhonek
 kbibtex-0.1.5.52-10.fc7                   dist-fc7-updates      noltec
@@ -1526,24 +1527,21 @@
 kchmviewer-3.0-2.fc7                      fe7-merge             jkeating
 kcometen3-1.1-4.fc7                       fe7-merge             jkeating
 kdbg-2.0.5-2.fc7                          dist-fc7              jkeating
-kde-filesystem-3.5-11.fc7                 dist-fc7-updates      rdieter
+kde-filesystem-3.5-13.fc7                 dist-fc7-updates      rdieter
 kde-i18n-3.5.7-1.fc7                      dist-fc7-updates      than
 kde-settings-3.5-30.fc7                   dist-fc7-updates      than
 kdeaccessibility-3.5.7-1.fc7              dist-fc7-updates      than
 kdeaddons-3.5.7-1.fc7                     dist-fc7-updates      than
 kdeadmin-3.5.7-1.fc7.1                    dist-fc7-updates      than
 kdeartwork-3.5.7-2.fc7                    dist-fc7-updates      rdieter
-kdeartwork-extras-3.5.6-3.fc7             fe7-merge             jkeating
 kdebase-3.5.7-13.fc7                      dist-fc7-updates      rdieter
 kdebindings-3.5.7-1.fc7.1                 dist-fc7-updates      than
 kdebluetooth-1.0-0.31.beta3.fc7           dist-fc7-updates      gilboa
 kdeedu-3.5.7-1.fc7                        dist-fc7-updates      than
 kdegames-3.5.7-1.fc7                      dist-fc7-updates      rdieter
 kdegraphics-3.5.7-2.fc7                   dist-fc7-updates      rdieter
-kdegraphics-extras-3.5.5-1.fc7            fe7-merge             jkeating
-kdelibs-3.5.7-20.fc7                      dist-fc7-updates      rdieter
+kdelibs-3.5.7-21.fc7                      dist-fc7-updates      rdieter
 kdemultimedia-3.5.7-2.fc7                 dist-fc7-updates      rdieter
-kdemultimedia-extras-3.5.6-5.fc7          fe7-merge             jkeating
 kdenetwork-3.5.7-1.fc7.1                  dist-fc7-updates      rdieter
 kdepim-3.5.7-3.fc7                        dist-fc7-updates      rdieter
 kdesdk-3.5.7-7.fc7                        dist-fc7-updates      rdieter
@@ -1624,7 +1622,7 @@
 ksudoku-0.3-2.fc7                         fe7-merge             jkeating
 ksynaptics-0.3.3-1.fc7                    dist-fc7-updates      orion
 ktechlab-0.3.6-6.fc7                      dist-fc7-updates      chitlesh
-ktorrent-2.2.1-1.fc7                      dist-fc7-updates      liquidat
+ktorrent-2.2.1-3.fc7                      dist-fc7-updates      liquidat
 ktrack-0.3.0-15.rc1.fc6                   fe7-merge             jkeating
 kudzu-1.2.71.1-1                          dist-fc7-updates      notting
 kvm-24-1                                  dist-fc7              katzj
@@ -1658,7 +1656,7 @@
 lftp-3.5.10-3.fc7                         dist-fc7              jkeating
 lib3ds-1.2.0-10.fc7                       fe7-merge             jkeating
 lib765-0.4.1-1.fc7                        dist-fc7-updates      oddsocks
-libAfterImage-1.07-8.fc6                  fe7-merge             jkeating
+libAfterImage-1.15-2.fc7                  dist-fc7-updates      awjb
 libEMF-1.0.3-3.fc7                        fe7-merge             jkeating
 libFS-1.0.0-3.1                           dist-fc6              jkeating
 libFoundation-1.1.3-10.fc6                fe7-merge             jkeating
@@ -1956,6 +1954,7 @@
 lineak-xosdplugin-0.9-2.fc6               fe7-merge             jkeating
 lineakd-0.9-5.fc6                         fe7-merge             jkeating
 link-grammar-4.2.2-2.fc6                  fe7-merge             jkeating
+linkchecker-4.7-8.fc7                     dist-fc7-updates      mikep
 linphone-1.7.1-2.fc7                      dist-fc7              jcollie
 linux-atm-2.5.0-1.20050118cvs             dist-fc6              jkeating
 linux-libertine-fonts-2.4.9-1.fc7         fe7-merge             jkeating
@@ -2105,7 +2104,7 @@
 mirrormagic-2.0.2-3.fc7                   fe7-merge             jkeating
 mkbootdisk-1.5.3-2.1                      dist-fc6              jkeating
 mkinitrd-6.0.9-7.1                        dist-fc7-updates      pjones
-mksh-30-1.fc7                             dist-fc7-updates      robert
+mksh-30-2.fc7                             dist-fc7-updates      robert
 mktemp-1.5-25.fc7                         dist-fc7              jkeating
 mkvtoolnix-2.0.2-1.fc7                    fe7-merge             jkeating
 mlmmj-1.2.14-2.fc7                        fe7-merge             jkeating
@@ -2283,7 +2282,7 @@
 ntfs-config-1.0-0.4.rc5.fc7               dist-fc7-updates      laxathom
 ntfsprogs-1.13.1-6.fc7                    dist-fc7-updates      spot
 ntl-5.4-5.fc7                             fe7-merge             jkeating
-ntp-4.2.4p2-1.fc7                         dist-fc7-updates      mlichvar
+ntp-4.2.4p2-3.fc7                         dist-fc7-updates      mlichvar
 numactl-0.9.8-2.fc7                       dist-fc7              jkeating
 numlockx-1.0-11.fc6                       fe7-merge             jkeating
 numpy-1.0.3-0.1.fc7                       dist-fc7-updates      jwilson
@@ -2331,6 +2330,7 @@
 openldap-2.3.34-3.fc7                     dist-fc7-updates      jsafrane
 openlierox-0.57-0.3.beta2.fc7             fe7-merge             jkeating
 openmpi-1.1-8.fc7                         dist-fc7              jkeating
+openmsx-0.6.2-4.fc7                       dist-fc7-updates      oddsocks
 openobex-1.3-5.fc7                        dist-fc7              jkeating
 openoffice.org-2.2.0-14.11                dist-fc7-updates      caolanm
 openoffice.org-dict-cs_CZ-20060303-5.fc7  fe7-merge             jkeating
@@ -2466,6 +2466,7 @@
 perl-Cache-Simple-TimedExpiry-0.27-1.fc7  fe7-merge             jkeating
 perl-Cairo-1.023-1.fc7                    fe7-merge             jkeating
 perl-Calendar-Simple-1.17-1.fc6           fe7-merge             jkeating
+perl-Callback-1.07-1.fc7                  dist-fc7-updates      mkpai
 perl-Carp-Assert-0.20-1.fc7               fe7-merge             jkeating
 perl-Carp-Assert-More-1.12-3.fc6          fe7-merge             jkeating
 perl-Carp-Clan-5.9-1.fc7                  dist-fc7-updates      rnorwood
@@ -2555,7 +2556,7 @@
 perl-Crypt-Primes-0.50-3.fc7              fe7-merge             jkeating
 perl-Crypt-RSA-1.58-2.fc7                 fe7-merge             jkeating
 perl-Crypt-Random-1.25-3.fc7              fe7-merge             jkeating
-perl-Crypt-SSLeay-0.53-1.fc7              dist-fc7              jkeating
+perl-Crypt-SSLeay-0.56-1.fc7              dist-fc7-updates      rnorwood
 perl-Crypt-Simple-0.06-4.fc7              dist-fc7-updates      allisson
 perl-Crypt-SmbHash-0.12-5.fc7             fe7-merge             jkeating
 perl-Curses-1.15-1.fc6                    fe7-merge             jkeating
@@ -2869,7 +2870,7 @@
 perl-Net-CIDR-Lite-0.20-3.fc7             fe7-merge             jkeating
 perl-Net-CUPS-0.51-2.fc7                  fe7-merge             jkeating
 perl-Net-DBus-0.33.5-1.fc7                dist-fc7-updates      cweyl
-perl-Net-DNS-0.60-1.fc7                   dist-fc7-updates      rnorwood
+perl-Net-DNS-0.61-1.fc7                   dist-fc7-updates      rnorwood
 perl-Net-DNS-SEC-0.14-2.fc7               dist-fc7-updates      hardaker
 perl-Net-Domain-TLD-1.65-1.fc7            fe7-merge             jkeating
 perl-Net-GPSD-0.35-1.fc7                  fe7-merge             jkeating
@@ -2904,7 +2905,7 @@
 perl-OpenFrame-3.05-6.fc7                 fe7-merge             jkeating
 perl-PAR-Dist-0.21-2.fc7                  fe7-merge             jkeating
 perl-PBS-0.31-3.fc6                       fe7-merge             jkeating
-perl-PDF-API2-0.60-3.fc7                  dist-fc7              bjohnson
+perl-PDF-API2-0.62-2.fc7                  dist-fc7-updates      bjohnson
 perl-PDL-2.4.3-1.fc7                      dist-fc7              jkeating
 perl-POE-0.9989-1.fc7                     fe7-merge             jkeating
 perl-POE-API-Peek-1.0802-1.fc7            fe7-merge             jkeating
@@ -2948,6 +2949,7 @@
 perl-PerlIO-eol-0.14-1.fc7                fe7-merge             jkeating
 perl-PerlIO-via-dynamic-0.12-2.fc6        fe7-merge             jkeating
 perl-PerlIO-via-symlink-0.05-3.fc6        fe7-merge             jkeating
+perl-Perlbal-XS-HTTPHeaders-0.19-2.fc7    dist-fc7-updates      ruben
 perl-Pipeline-3.12-4.fc7                  fe7-merge             jkeating
 perl-Pod-Coverage-0.18-2.fc6              fe7-merge             jkeating
 perl-Pod-Escapes-1.04-5.fc6               fe7-merge             jkeating
@@ -3249,7 +3251,7 @@
 physfs-1.0.1-5.fc6                        fe7-merge             jkeating
 piccolo-1.04-2jpp.2.fc7                   fe7-merge             jkeating
 picocom-1.4-3.fc6                         fe7-merge             jkeating
-pidgin-2.1.0-2.fc7                        dist-fc7-updates      wtogami
+pidgin-2.1.1-1.fc7                        dist-fc7-updates      wtogami
 pidgin-guifications-2.14-2.fc7            dist-fc7              wtogami
 pidgin-libnotify-0.13-1.fc7               dist-fc7-updates      pgordon
 pidgin-rhythmbox-2.0-1.fc7                fe7-merge             jkeating
@@ -3290,7 +3292,7 @@
 plotmm-0.1.2-5.fc6                        fe7-merge             jkeating
 plotutils-2.5-3.fc6                       fe7-merge             jkeating
 plplot-5.7.3-2.fc7                        fe7-merge             jkeating
-plt-scheme-370-3.fc7                      dist-fc7              gemi
+plt-scheme-371-1.fc7                      dist-fc7-updates      gemi
 pm-utils-0.99.3-6.fc7                     dist-fc7              pjones
 pmd-3.6-1jpp.3.fc7                        fe7-merge             jkeating
 pmount-0.9.13-1.fc7                       dist-fc7              pertusus
@@ -3397,7 +3399,7 @@
 pymsn-0.2.2-1.fc7                         fe7-merge             jkeating
 pyorbit-2.14.2-2.fc7                      dist-fc7              jkeating
 pypar2-1.4-1.fc7                          dist-fc7-updates      mxcarron
-pyparsing-1.4.6-1.fc7                     fe7-merge             jkeating
+pyparsing-1.4.7-1.fc7                     dist-fc7-updates      jamatos
 pyparted-1.8.5-4.fc7                      dist-fc7              jkeating
 pypoker-eval-134.0-1.fc7                  dist-fc7              xulchris
 pyscript-0.6-6.fc7                        fe7-merge             jkeating
@@ -3472,7 +3474,7 @@
 python-meld3-0.6-2.fc7.1                  fe7-merge             jkeating
 python-metar-1.3.0-2.fc7                  fe7-merge             jkeating
 python-musicbrainz2-0.4.1-1.fc7           fe7-merge             jkeating
-python-mutagen-1.11-1.fc7                 fe7-merge             jkeating
+python-mutagen-1.12-1.fc7                 dist-fc7-updates      ecik
 python-myghty-1.1-3.fc7                   fe7-merge             jkeating
 python-nevow-0.9.18-2.fc7                 fe7-merge             jkeating
 python-nltk_lite-0.6.6-2.fc7              fe7-merge             jkeating
@@ -3563,10 +3565,10 @@
 qpidc-0.2-5.fc7                           fe7-merge             jkeating
 qps-1.9.19-0.2.b.fc7                      fe7-merge             jkeating
 qscintilla-1.7.1-1.fc7                    fe7-merge             jkeating
-qsf-1.2.6-2.fc7                           dist-fc7              mlichvar
+qsf-1.2.7-1.fc7                           dist-fc7-updates      mlichvar
 qstat-2.11-1.fc7                          fe7-merge             jkeating
 qsynth-0.2.5-6.fc6                        fe7-merge             jkeating
-qt-3.3.8-4.fc7                            dist-fc7              jkeating
+qt-3.3.8-6.fc7                            dist-fc7-updates      than
 qt-qsa-1.1.5-1.fc7                        dist-fc7-updates      belegdol
 qt4-4.3.1-3.fc7                           dist-fc7-updates      rdieter
 qt4-qsa-1.2.2-4.fc7                       dist-fc7-updates      frankb
@@ -3600,7 +3602,7 @@
 rcs-5.7-30.1                              dist-fc6              jkeating
 rdate-1.4-6                               dist-fc6              jkeating
 rdesktop-1.5.0-2.fc7                      dist-fc7              jkeating
-rdiff-backup-1.0.5-2.fc7                  fe7-merge             jkeating
+rdiff-backup-1.0.5-5.fc7                  dist-fc7-updates      kevin
 rdist-6.1.5-44                            dist-fc6              jkeating
 re2c-0.12.1-2.fc7                         dist-fc7-updates      thias
 readahead-1.4.1-2.fc7                     dist-fc7              jkeating
@@ -3662,7 +3664,7 @@
 rpy-0.4.6-17.fc7                          dist-fc7-updates      spot
 rrdtool-1.2.23-6.fc7                      dist-fc7-updates      jwilson
 rsh-0.17-40.fc7                           dist-fc7              jkeating
-rsibreak-0.8.0-1.fc6                      fe7-merge             jkeating
+rsibreak-0.8.0-2.fc7                      dist-fc7-updates      liquidat
 rsnapshot-1.3.0-1.fc7                     dist-fc7-updates      xris
 rss-glx-0.8.1.p-6.fc6                     fe7-merge             jkeating
 rss2email-2.60-3.fc7                      fe7-merge             jkeating
@@ -3678,7 +3680,7 @@
 ruby-bsearch-1.5-1.fc7                    fe7-merge             jkeating
 ruby-cairo-1.4.1-2.fc7                    fe7-merge             jkeating
 ruby-fam-0.2.0-3.fc7                      fe7-merge             jkeating
-ruby-gettext-package-1.9.0-2.fc7          dist-fc7              mtasaka
+ruby-gettext-package-1.10.0-1.fc7         dist-fc7-updates      mtasaka
 ruby-gnome2-0.16.0-7.fc7                  dist-fc7-updates      allisson
 ruby-mecab-0.96-1.fc7                     dist-fc7-updates      mtasaka
 ruby-mysql-2.7.1-2.fc6                    fe7-merge             jkeating
@@ -3695,7 +3697,7 @@
 rwall-0.17-25.2.2                         dist-fc6              jkeating
 rwho-0.17-26                              dist-fc6              jkeating
 rxvt-2.7.10-11.fc6                        fe7-merge             jkeating
-rxvt-unicode-8.2-1.fc7                    dist-fc7-updates      awjb
+rxvt-unicode-8.3-1.fc7                    dist-fc7-updates      awjb
 rzip-2.1-1.fc7                            fe7-merge             jkeating
 s390utils-1.5.4-4.fc7                     dist-fc7              jkeating
 s3switch-0.0-9.20020912.fc6               fe7-merge             jkeating
@@ -3812,7 +3814,7 @@
 sofia-sip-1.12.6-10.fc7                   dist-fc7-updates      jcollie
 sofsip-cli-0.13-3.fc7                     dist-fc7-updates      jcollie
 solfege-3.6.5-1.fc7                       fe7-merge             jkeating
-sonata-1.2.2-1.fc7                        dist-fc7-updates      ecik
+sonata-1.2.3-1.fc7                        dist-fc7-updates      ecik
 soprano-0.9.0-2.fc7                       dist-fc7-updates      rdieter
 sopwith-1.7.1-4                           fe7-merge             jkeating
 sound-juicer-2.16.4-1.fc7                 dist-fc7              jkeating
@@ -3825,11 +3827,11 @@
 spamassassin-3.2.3-1.fc7                  dist-fc7-updates      wtogami
 spambayes-1.0.4-4.fc7                     fe7-merge             jkeating
 spampd-2.30-3.fc7                         fe7-merge             jkeating
-spandsp-0.0.4-0.2.pre6.fc7                dist-fc7-updates      jcollie
+spandsp-0.0.4-0.3.pre7.fc7                dist-fc7-updates      jcollie
 sparse-0.3-1.fc7                          dist-fc7              roland
 specspo-14-1.fc7                          dist-fc7              mbacovsk
 specto-0.2.2-1.fc7                        dist-fc7-updates      laxathom
-speedcrunch-0.8-4.fc7                     dist-fc7-updates      liquidat
+speedcrunch-0.8-5.fc7                     dist-fc7-updates      liquidat
 speex-1.2-0.2.beta1                       dist-fc7              jkeating
 spicctrl-1.9-5.fc7                        fe7-merge             jkeating
 splint-3.1.1-15.fc6                       fe7-merge             jkeating
@@ -3948,7 +3950,7 @@
 tango-icon-theme-0.8.0-1.fc7              fe7-merge             jkeating
 tango-icon-theme-extras-0.1.0-1.fc7       fe7-merge             jkeating
 tanukiwrapper-3.2.1-2jpp.3                dist-fc6              jkeating
-tar-1.15.1-26.fc7                         dist-fc7              jkeating
+tar-1.15.1-27.fc7                         dist-fc7-updates      rbrich
 taskjuggler-2.4.0-2.fc7                   dist-fc7-updates      ovasik
 tasks-0.9-1.fc7                           dist-fc7-updates      dyoung
 tastymenu-0.8.2-1.fc7                     dist-fc7-updates      nixaff4
@@ -3989,7 +3991,7 @@
 telepathy-salut-0.1.3-1.fc7               dist-fc7-updates      bpepple
 telepathy-stream-engine-0.3.23-1.fc7      dist-fc7-updates      bpepple
 telescope-server-0-0.1.20070315.fc7       fe7-merge             jkeating
-tellico-1.2.10-1.fc7                      fe7-merge             jkeating
+tellico-1.2.13-1.fc7                      dist-fc7-updates      jamatos
 telnet-0.17-38.fc7                        dist-fc7              jkeating
 tenr-de-styles-pkg-1.1-1.fc7              fe7-merge             jkeating
 termcap-5.5-1.20060701.1                  dist-fc6              jkeating
@@ -4050,7 +4052,7 @@
 tklib-0.4.1-5.fc6                         fe7-merge             jkeating
 tktable-2.9-9.fc6                         fe7-merge             jkeating
 tla-1.3.4-5.fc6                           fe7-merge             jkeating
-tmda-1.1.11-4.fc7                         dist-fc7-updates      bjohnson
+tmda-1.1.12-1.fc7                         dist-fc7-updates      bjohnson
 tmpwatch-2.9.11-1                         dist-fc7              jkeating
 tn5250-0.17.3-14.fc7                      dist-fc7              jkeating
 tog-pegasus-2.6.0-2.fc7                   dist-fc7              jkeating
@@ -4101,7 +4103,7 @@
 udev-113-11.fc7                           dist-fc7-updates      harald
 udftools-1.0.0b3-7.fc6                    fe7-merge             jkeating
 udunits-1.12.4-11.fc6                     fe7-merge             jkeating
-ufraw-0.11-8.fc7                          dist-fc7-updates      nphilipp
+ufraw-0.12-1.fc7                          dist-fc7-updates      nphilipp
 ufsparse-2.1.1-1.fc6                      fe7-merge             jkeating
 uim-1.4.1-4.fc7                           dist-fc7-updates      tagoh
 ularn-1.5p4-8.fc7                         fe7-merge             jkeating
@@ -4120,7 +4122,7 @@
 upx-3.01-1.fc7                            dist-fc7-updates      limb
 uqm-0.6.2-1.fc7                           fe7-merge             jkeating
 uqm-content-0.6.0-2                       fe7-merge             jkeating
-urlgfe-1.0-1.fc7                          fe7-merge             jkeating
+urlgfe-1.0.2-1.fc7                        dist-fc7-updates      mtasaka
 urw-fonts-2.3-6.1.1                       dist-fc6              jkeating
 usbsink-0.3.1-1.fc7                       fe7-merge             jkeating
 usbutils-0.71-2.1                         dist-fc6              jkeating
@@ -4189,7 +4191,7 @@
 wallpapoz-0.4.1-1.fc7                     dist-fc7-updates      mtasaka
 wammu-0.19-3.fc7                          dist-fc7-updates      laxathom
 warzone2100-2.0.7-3.fc7                   dist-fc7-updates      karlik
-wavbreaker-0.8.1-2.fc7                    dist-fc7-updates      dmaley
+wavbreaker-0.8.1-3.fc7                    dist-fc7-updates      dmaley
 wavpack-4.41-1.fc7                        dist-fc7              peter
 wbxml2-0.9.2-8.fc7                        fe7-merge             jkeating
 wcstools-3.6.8-2.fc7                      fe7-merge             jkeating
@@ -4227,7 +4229,7 @@
 wmix-3.1-1.fc6                            fe7-merge             jkeating
 wmweather+-2.9-4.fc6                      fe7-merge             jkeating
 wmx-6pl1-14.fc6                           fe7-merge             jkeating
-wordpress-2.2.1-1.fc7                     dist-fc7-updates      jwb
+wordpress-2.2.2-0.fc7                     dist-fc7-updates      jwb
 words-3.0-12.fc7                          dist-fc7              jkeating
 wordtrans-1.1-0.2.pre13.fc7               dist-fc7              jkeating
 workrave-1.8.4-3.fc7                      fe7-merge             jkeating
@@ -4382,7 +4384,7 @@
 xmms-sid-0.8.0-0.3.beta15.fc6             fe7-merge             jkeating
 xmms-skins-1.2.10-15                      fe7-merge             jkeating
 xmms-speex-0.9.1-9.fc7                    fe7-merge             jkeating
-xmoto-0.3.1-1.fc7                         dist-fc7-updates      limb
+xmoto-0.3.3-1.fc7                         dist-fc7-updates      limb
 xmoto-edit-0.2.4-8.fc7                    dist-fc7-updates      limb
 xom-1.0-3jpp.4.fc7                        fe7-merge             jkeating
 xorg-sgml-doctools-1.1.1-1.fc7            dist-fc7              jkeating
@@ -4480,7 +4482,7 @@
 xrestop-0.4-1.fc7                         dist-fc7              jkeating
 xsane-0.994-3.fc7                         dist-fc7              jkeating
 xscorch-0.2.0-10.fc7                      dist-fc7-updates      mgarski
-xscreensaver-5.02-1.fc7.1                 dist-fc7              mtasaka
+xscreensaver-5.03-1.fc7                   dist-fc7-updates      mtasaka
 xsp-1.2.1-1.fc7                           fe7-merge             jkeating
 xsri-2.1.0-10.fc6                         dist-fc6              jkeating
 xsupplicant-1.2.8-1.fc7.1                 fe7-merge             jkeating



From fedora-extras-commits at redhat.com  Mon Sep  3 16:46:09 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 3 Sep 2007 12:46:09 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.125, 1.126 jd.spec, 1.144, 1.145 sources, 
	1.126, 1.127
Message-ID: <200709031646.l83Gk9WF027962@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27937

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
- svn 1311



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- .cvsignore	25 Aug 2007 17:13:36 -0000	1.125
+++ .cvsignore	3 Sep 2007 16:45:33 -0000	1.126
@@ -1 +1 @@
-jd-1.9.6-svn1285.tgz
+jd-1.9.6-svn1311.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- jd.spec	25 Aug 2007 17:13:36 -0000	1.144
+++ jd.spec	3 Sep 2007 16:45:33 -0000	1.145
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1285
+%define         strtag        svn1311
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Aug 26 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1285
-- svn 1285
+* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
+- svn 1311
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	25 Aug 2007 17:13:36 -0000	1.126
+++ sources	3 Sep 2007 16:45:33 -0000	1.127
@@ -1 +1 @@
-adf45ea6466f7253259bc8d47860a9fd  jd-1.9.6-svn1285.tgz
+ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz



From fedora-extras-commits at redhat.com  Mon Sep  3 17:15:19 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 3 Sep 2007 13:15:19 -0400
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.7,1.8
Message-ID: <200709031715.l83HFJeb002254@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2208

Modified Files:
	ocaml-findlib.spec 
Log Message:
* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
- Bump version to force rebuild against ocaml -6 release.



Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-findlib.spec	30 Aug 2007 08:25:47 -0000	1.7
+++ ocaml-findlib.spec	3 Sep 2007 17:14:46 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.1.2pl1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 
 Patch0:         findlib-camlp4-path.patch
 
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml >= 3.10.0-6
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
 BuildRequires:  ocaml-ocamldoc
@@ -30,7 +30,6 @@
 Objective CAML package manager and build helper.
 
 
-
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -111,6 +110,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
+- Bump version to force rebuild against ocaml -6 release.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-12
 - Added BR: gawk.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 17:30:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 13:30:46 -0400
Subject: rpms/rpmlint/devel rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 rpmlint.config, 1.14,
	1.15 rpmlint.spec, 1.37, 1.38 sources, 1.16,
	1.17 rpmlint-0.80-fedoralicensing.patch, 1.1, NONE
Message-ID: <200709031730.l83HUkVU002668@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2637

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch 
Removed Files:
	rpmlint-0.80-fedoralicensing.patch 
Log Message:
* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
- 0.81.
- Improve Fedora license check (Todd Zullinger).
- Sync Fedora license list with Wiki rev 87.


rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Apr 2007 20:45:44 -0000	1.16
+++ .cvsignore	3 Sep 2007 17:30:14 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmlint.config	29 Aug 2007 19:47:29 -0000	1.14
+++ rpmlint.config	3 Sep 2007 17:30:14 -0000	1.15
@@ -28,7 +28,7 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 84 of that page.
+    # Last synced with Wiki revision 87 of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -98,6 +98,7 @@
     'Netscape',
     'Nokia',
     'OpenLDAP',
+    'OpenPBS',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -153,6 +154,7 @@
     'mplus',
     'OFL',
     'Utopia',
+    'XANO',
     # Others
     'Redistributable, no modification permitted',
     'Freely redistributable without restriction',
@@ -187,9 +189,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
 addFilter(" doc-file-dependency .* /bin/sh$")
 addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rpmlint.spec	29 Aug 2007 19:47:29 -0000	1.37
+++ rpmlint.spec	3 Sep 2007 17:30:14 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.80
-Release:        3%{?dist}
+Version:        0.81
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -11,7 +11,7 @@
 Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
-Patch2:         %{name}-0.80-fedoralicensing.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -70,6 +70,11 @@
 
 
 %changelog
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
 * Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Apr 2007 20:45:44 -0000	1.16
+++ sources	3 Sep 2007 17:30:14 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2


--- rpmlint-0.80-fedoralicensing.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 17:35:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 13:35:33 -0400
Subject: rpms/rpmlint/devel rpmlint.spec,1.38,1.39
Message-ID: <200709031735.l83HZXjP002906@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2855

Modified Files:
	rpmlint.spec 
Log Message:
Note fixed bug numbers


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rpmlint.spec	3 Sep 2007 17:30:14 -0000	1.38
+++ rpmlint.spec	3 Sep 2007 17:35:01 -0000	1.39
@@ -71,7 +71,7 @@
 
 %changelog
 * Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
-- 0.81.
+- 0.81, fixes #239611, #240840, #241471, #244835.
 - Improve Fedora license check (Todd Zullinger).
 - Sync Fedora license list with Wiki rev 87.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 17:39:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:39:03 -0400
Subject: extras-repoclosure rc-run.py,1.28,1.29
Message-ID: <200709031739.l83Hd3Kc003305@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3285

Modified Files:
	rc-run.py 
Log Message:
delete previous needsign repomd instead of playing tricks with tmp repoids or global md timeout values


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rc-run.py	1 Sep 2007 10:44:20 -0000	1.28
+++ rc-run.py	3 Sep 2007 17:39:01 -0000	1.29
@@ -5,7 +5,7 @@
 # If executed as "rc-run-all.py" it processes all releases.
 
 import fcntl, os, sys
-import errno, shutil, stat
+import errno, glob, shutil, stat
 import datetime, time
 import tempfile
 import getopt
@@ -19,6 +19,11 @@
 import Utils, RepoSupport
 
 
+def delneedsignmd(cachedir):
+    for dir in glob.glob('./*-needsign-*'):
+        shutil.rmtree(dir)
+
+
 def makereport():
     try:
         os.remove(logfilename)
@@ -36,6 +41,7 @@
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
         Utils.fix_mdcache_access(workdir,cachedir)
+        delneedsignmd(cachedir)
         rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:
@@ -51,7 +57,6 @@
 os.umask(cfg.signersumask)  # only for our /srv environment
 
 # Delete old log files.
-import glob
 now = time.time()
 for file in glob.glob('./rc-fe*.txt'):
     if ( (now - os.stat(file).st_mtime) > 3600*24*14 ):
@@ -93,7 +98,7 @@
         if a == "summary":
             reportcmd += " --mail=summary"
     elif o == "--needsign":
-        rs.AddRepo('fedora-extras-needsign-%s'%int(now),'Fedora Extras Needsign',a)
+        rs.AddRepo('fedora-extras-needsign','Fedora Extras Needsign',a)
         reportcmd += " --needsign"
     elif o == "--testing":
         withtesting = True



From fedora-extras-commits at redhat.com  Mon Sep  3 17:43:10 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:43:10 -0400
Subject: rpms/util-vserver/devel util-vserver.spec,1.31,1.32
Message-ID: <200709031743.l83HhAgU003612@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3537

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- util-vserver.spec	3 Sep 2007 07:57:42 -0000	1.31
+++ util-vserver.spec	3 Sep 2007 17:42:38 -0000	1.32
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 17:47:27 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Mon, 3 Sep 2007 13:47:27 -0400
Subject: rpms/deluge/devel .cvsignore, 1.11, 1.12 deluge.spec, 1.25,
	1.26 sources, 1.11, 1.12
Message-ID: <200709031747.l83HlRDD003991@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 RC1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Aug 2007 01:10:33 -0000	1.11
+++ .cvsignore	3 Sep 2007 17:46:55 -0000	1.12
@@ -1 +1 @@
-deluge-0.5.4.1.tar.gz
+deluge-0.5.4.1.95.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- deluge.spec	22 Aug 2007 01:10:33 -0000	1.25
+++ deluge.spec	3 Sep 2007 17:46:55 -0000	1.26
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1
+Version:	0.5.4.1.95
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
+- Update to new upstream release candidate (0.5.5 RC1)
+
 * Mon Aug 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
 - Update to new upstream release (0.5.4.1)
 - Build with new binutils to gain BuildID debugging goodness.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Aug 2007 01:10:33 -0000	1.11
+++ sources	3 Sep 2007 17:46:55 -0000	1.12
@@ -1 +1 @@
-36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
+4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 17:49:21 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:49:21 -0400
Subject: extras-repoclosure rc-run.py,1.29,1.30
Message-ID: <200709031749.l83HnL1V004396@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4370

Modified Files:
	rc-run.py 
Log Message:
consider cachedir arg, and do it earlier


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rc-run.py	3 Sep 2007 17:39:01 -0000	1.29
+++ rc-run.py	3 Sep 2007 17:49:18 -0000	1.30
@@ -20,7 +20,7 @@
 
 
 def delneedsignmd(cachedir):
-    for dir in glob.glob('./*-needsign-*'):
+    for dir in glob.glob(os.path.join(cachedir,'*-needsign-*')):
         shutil.rmtree(dir)
 
 
@@ -29,6 +29,8 @@
         os.remove(logfilename)
     except:
         pass
+    Utils.fix_mdcache_access(workdir,cachedir)
+    delneedsignmd(cachedir)
     for arch in rs.ReleaseArchsDict()[release]:
         print '%s (%s)' % (release,arch)
         rcargs = ('-a %s ' % rs.targetarchs[arch])
@@ -40,8 +42,6 @@
             rcargs += ('-r %s ' % repoid)
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
-        Utils.fix_mdcache_access(workdir,cachedir)
-        delneedsignmd(cachedir)
         rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:



From fedora-extras-commits at redhat.com  Mon Sep  3 17:56:45 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  3 Sep 2007 13:56:45 -0400
Subject: upgradecheck upgradecheckspam.py,1.3,1.4 upgradecheck.py,1.35,1.36
Message-ID: <200709031756.l83Huj9k005959@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5925

Modified Files:
	upgradecheckspam.py upgradecheck.py 
Log Message:
no .fc4 anymore


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upgradecheckspam.py	24 Jul 2007 18:04:23 -0000	1.3
+++ upgradecheckspam.py	3 Sep 2007 17:56:43 -0000	1.4
@@ -41,7 +41,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('4', '5', '6', '7', '8')
+dists = ('5', '6', '7', '8')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- upgradecheck.py	17 Aug 2007 18:19:32 -0000	1.35
+++ upgradecheck.py	3 Sep 2007 17:56:43 -0000	1.36
@@ -41,7 +41,7 @@
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('4', '5', '6', '7', '8')
+dists = ('5', '6', '7', '8')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')



From fedora-extras-commits at redhat.com  Mon Sep  3 17:57:25 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:57:25 -0400
Subject: rpms/util-vserver/F-7 util-vserver.spec,1.27,1.28
Message-ID: <200709031757.l83HvP64006129@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5987/F-7

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- util-vserver.spec	3 Sep 2007 07:57:48 -0000	1.27
+++ util-vserver.spec	3 Sep 2007 17:56:53 -0000	1.28
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 17:57:28 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 3 Sep 2007 13:57:28 -0400
Subject: rpms/util-vserver/FC-6 util-vserver.spec,1.27,1.28
Message-ID: <200709031757.l83HvSX6006140@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5987/FC-6

Modified Files:
	util-vserver.spec 
Log Message:
disabled dietlibc build for ppc64 again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- util-vserver.spec	3 Sep 2007 07:57:45 -0000	1.27
+++ util-vserver.spec	3 Sep 2007 17:56:55 -0000	1.28
@@ -6,7 +6,12 @@
 
 ## Fedora Extras specific customization below...
 
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
 %bcond_with		xalan
 
 ##



From fedora-extras-commits at redhat.com  Mon Sep  3 18:07:35 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 3 Sep 2007 14:07:35 -0400
Subject: status-report-scripts pyGetReviewByFlags,1.8,1.9
Message-ID: <200709031807.l83I7ZER014250@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14150

Modified Files:
	pyGetReviewByFlags 
Log Message:
Update URL since bugzilla.r.c no longer works within the colo.



Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyGetReviewByFlags	2 Sep 2007 17:00:23 -0000	1.8
+++ pyGetReviewByFlags	3 Sep 2007 18:07:33 -0000	1.9
@@ -17,7 +17,10 @@
 import tempfile
 import glob
 
-url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
+# This URL will work publically
+#url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
+# This URL will work in the Phoenix colo
+url = 'https://bzprx.vip.phx.redhat.com/xmlrpc.cgi'
 
 flagData = {
     # 'FLAG' : (baseFlagFilename, openMsg, closeMsg),



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:18:21 -0700
Subject: [pkgdb] klear (Fedora, 7) updated by kevin
Message-ID: <200709031818.l83IIMs5022785@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for klear
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on klear (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on klear (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/klear



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:18:21 -0700
Subject: [pkgdb] klear (Fedora, devel) updated by kevin
Message-ID: <200709031818.l83IIMNn022794@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on klear (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/klear



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:45 -0400
Subject: rpms/klear - New directory
Message-ID: <200709031818.l83IIjtV016589@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear

Log Message:
Directory /cvs/extras/rpms/klear added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:48 -0400
Subject: rpms/klear/devel - New directory
Message-ID: <200709031818.l83IImnb016611@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear/devel

Log Message:
Directory /cvs/extras/rpms/klear/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:51 -0400
Subject: rpms/klear Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031818.l83IIpuJ016643@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear

Added Files:
	Makefile import.log 
Log Message:
Setup of module klear


--- NEW FILE Makefile ---
# Top level Makefile for module klear
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:18:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:18:54 -0400
Subject: rpms/klear/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709031818.l83IIslR016666@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr16492/rpms/klear/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module klear


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: klear
# $Id: Makefile,v 1.1 2007/09/03 18:18:51 kevin Exp $
NAME := klear
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:19:12 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:19:12 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec, 1.2,
	1.3 eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031819.l83IJC0b016812@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481

Modified Files:
	eclipse-rpm-editor.spec 
Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-rpm-editor.spec	2 Sep 2007 10:39:28 -0000	1.2
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:18:40 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -13,9 +13,6 @@
 #   sh ./fetch-specfile-editor.sh %{svn_rev}
 Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
 Source1:        fetch-specfile-editor.sh
-# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
-# So this patch remove the rpmlint plugin temporarily 
-Patch0:         %{name}-remove-rpmlint-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -52,7 +49,6 @@
 
 %prep
 %setup -q -n specfile-editor-fetched-src-%{svn_rev}
-%patch0
 
 %build
 # See comments in the script to understand this.
@@ -106,7 +102,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
-#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
+%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
 %dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
 %doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
 %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
@@ -117,6 +113,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
+- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
+
 * Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
 - Only build the plugin where the changelog plugin can be build, only
   x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because


--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, 6) updated by kevin
Message-ID: <200709031821.l83ILmO0022822@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for audio-convert-mod
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on audio-convert-mod (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, devel) updated by kevin
Message-ID: <200709031821.l83ILnM1022840@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:21:43 -0700
Subject: [pkgdb] audio-convert-mod (Fedora, 7) updated by kevin
Message-ID: <200709031821.l83ILmox022831@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for audio-convert-mod
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on audio-convert-mod (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:21:56 -0400
Subject: rpms/audio-convert-mod - New directory
Message-ID: <200709031821.l83ILuLp017277@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod

Log Message:
Directory /cvs/extras/rpms/audio-convert-mod added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:21:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:21:59 -0400
Subject: rpms/audio-convert-mod/devel - New directory
Message-ID: <200709031821.l83ILxUX017293@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod/devel

Log Message:
Directory /cvs/extras/rpms/audio-convert-mod/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:22:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:22:03 -0400
Subject: rpms/audio-convert-mod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031822.l83IM38s017321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod

Added Files:
	Makefile import.log 
Log Message:
Setup of module audio-convert-mod


--- NEW FILE Makefile ---
# Top level Makefile for module audio-convert-mod
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:22:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:22:06 -0400
Subject: rpms/audio-convert-mod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709031822.l83IM6WR017339@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb17212/rpms/audio-convert-mod/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module audio-convert-mod


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: audio-convert-mod
# $Id: Makefile,v 1.1 2007/09/03 18:22:03 kevin Exp $
NAME := audio-convert-mod
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:24:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:24:01 -0700
Subject: [pkgdb] maniadrive was added for jwrdegoede
Message-ID: <200709031824.l83IO17X022871@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package maniadrive with summary 3D stunt driving game
Kevin Fenzi (kevin) has approved Package maniadrive
Kevin Fenzi (kevin) has added a Fedora devel branch for maniadrive with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved maniadrive in Fedora devel
Kevin Fenzi (kevin) has approved Package maniadrive
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maniadrive (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on maniadrive (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maniadrive (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maniadrive



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:24:02 -0700
Subject: [pkgdb] maniadrive (Fedora, devel) updated by kevin
Message-ID: <200709031824.l83IO2iR022880@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maniadrive



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:19 -0400
Subject: rpms/maniadrive - New directory
Message-ID: <200709031824.l83IOJ2u017664@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive

Log Message:
Directory /cvs/extras/rpms/maniadrive added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:24 -0400
Subject: rpms/maniadrive/devel - New directory
Message-ID: <200709031824.l83IOOKS017673@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:30 -0400
Subject: rpms/maniadrive Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031824.l83IOUP8017705@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:24:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:24:32 -0400
Subject: rpms/maniadrive/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709031824.l83IOWtv017721@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV17635/rpms/maniadrive/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive
# $Id: Makefile,v 1.1 2007/09/03 18:24:30 kevin Exp $
NAME := maniadrive
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:25:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:25:47 -0700
Subject: [pkgdb] maniadrive-data (Fedora, devel) updated by kevin
Message-ID: <200709031825.l83IPlUh022901@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on maniadrive-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/maniadrive-data



From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:02 -0400
Subject: rpms/maniadrive-data - New directory
Message-ID: <200709031826.l83IQ2dO017786@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data

Log Message:
Directory /cvs/extras/rpms/maniadrive-data added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:06 -0400
Subject: rpms/maniadrive-data/devel - New directory
Message-ID: <200709031826.l83IQ6bw017802@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data/devel

Log Message:
Directory /cvs/extras/rpms/maniadrive-data/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:09 -0400
Subject: rpms/maniadrive-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031826.l83IQ9X6017827@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data

Added Files:
	Makefile import.log 
Log Message:
Setup of module maniadrive-data


--- NEW FILE Makefile ---
# Top level Makefile for module maniadrive-data
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:26:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:26:11 -0400
Subject: rpms/maniadrive-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709031826.l83IQBcN017843@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL17756/rpms/maniadrive-data/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maniadrive-data


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maniadrive-data
# $Id: Makefile,v 1.1 2007/09/03 18:26:09 kevin Exp $
NAME := maniadrive-data
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, 6) updated by kevin
Message-ID: <200709031832.l83IWXZn022979@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora 6 to rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libedit



From fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, 7) updated by kevin
Message-ID: <200709031832.l83IWXmf022988@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora 7 to rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libedit



From fedora-extras-commits at redhat.com  Mon Sep  3 18:32:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:32:33 -0700
Subject: [pkgdb] libedit (Fedora, devel) updated by kevin
Message-ID: <200709031832.l83IWYLl022997@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of libedit in Fedora devel to rishi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libedit



From fedora-extras-commits at redhat.com  Mon Sep  3 18:34:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:34:20 -0700
Subject: [pkgdb] perl-Class-MethodMaker (Fedora EPEL, 4) updated by kevin
Message-ID: <200709031834.l83IYKG7023039@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Class-MethodMaker
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From fedora-extras-commits at redhat.com  Mon Sep  3 18:34:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:34:20 -0700
Subject: [pkgdb] perl-Class-MethodMaker (Fedora EPEL, 5) updated by kevin
Message-ID: <200709031834.l83IYKUE023048@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Class-MethodMaker
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Class-MethodMaker (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-MethodMaker



From fedora-extras-commits at redhat.com  Mon Sep  3 18:36:44 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:36:44 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec, 1.2,
	1.3 eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031836.l83IaiI9018274@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239

Modified Files:
	eclipse-rpm-editor.spec 
Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-rpm-editor.spec	2 Sep 2007 10:47:44 -0000	1.2
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:36:12 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -13,9 +13,6 @@
 #   sh ./fetch-specfile-editor.sh %{svn_rev}
 Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
 Source1:        fetch-specfile-editor.sh
-# The current rawhide rpmlint version (0.80) is not compatible with the plugin.
-# So this patch remove the rpmlint plugin temporarily 
-Patch0:         %{name}-remove-rpmlint-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -37,7 +34,8 @@
 # the rpmlint plugin
 Requires: rpmlint >= 0.80
 Requires: rpmdevtools
-# These plugins are really noarch but they the changelog plugin need cdt which
+
+# These plugins are really noarch but they the changelog plugin need cdt which 
 # we only build on these architectures.
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -51,7 +49,6 @@
 
 %prep
 %setup -q -n specfile-editor-fetched-src-%{svn_rev}
-%patch0
 
 %build
 # See comments in the script to understand this.
@@ -105,7 +102,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
-#%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
+%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
 %dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
 %doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
 %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
@@ -116,6 +113,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
+- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
+
 * Sun Sep 2 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-5
 - Only build the plugin where the changelog plugin can be build, only
   x86 x86_64 ppc and ia64 arches are supported by the changelog plugin because


--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:37:07 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:37:07 -0400
Subject: rpms/eclipse-rpm-editor/F-7
	eclipse-rpm-editor-remove-rpmlint-plugin.patch, 1.1, NONE
Message-ID: <200709031837.l83Ib7D9018330@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18323

Removed Files:
	eclipse-rpm-editor-remove-rpmlint-plugin.patch 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
- Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.



--- eclipse-rpm-editor-remove-rpmlint-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, 7) updated by kevin
Message-ID: <200709031842.l83IgvEh023133@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for mencal
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mencal (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mencal



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, 6) updated by kevin
Message-ID: <200709031842.l83IgvjG023124@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for mencal
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mencal (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mencal



From fedora-extras-commits at redhat.com  Mon Sep  3 18:42:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 03 Sep 2007 11:42:57 -0700
Subject: [pkgdb] mencal (Fedora, devel) updated by kevin
Message-ID: <200709031842.l83IgvIg023142@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on mencal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mencal



From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:16 -0400
Subject: rpms/mencal - New directory
Message-ID: <200709031843.l83IhGIL018641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal

Log Message:
Directory /cvs/extras/rpms/mencal added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:21 -0400
Subject: rpms/mencal/devel - New directory
Message-ID: <200709031843.l83IhLIL018655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal/devel

Log Message:
Directory /cvs/extras/rpms/mencal/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:25 -0400
Subject: rpms/mencal Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709031843.l83IhPBQ018680@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal

Added Files:
	Makefile import.log 
Log Message:
Setup of module mencal


--- NEW FILE Makefile ---
# Top level Makefile for module mencal
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep  3 18:43:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 3 Sep 2007 14:43:27 -0400
Subject: rpms/mencal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709031843.l83IhRIw018696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd18612/rpms/mencal/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mencal


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mencal
# $Id: Makefile,v 1.1 2007/09/03 18:43:25 kevin Exp $
NAME := mencal
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 fedora-extras-commits at redhat.com  Mon Sep  3 18:46:04 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 14:46:04 -0400
Subject: rpms/clutter/devel .cvsignore, 1.4, 1.5 clutter.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709031846.l83Ik4ki019157@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19088/devel

Modified Files:
	.cvsignore clutter.spec sources 
Log Message:

Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jul 2007 02:42:36 -0000	1.4
+++ .cvsignore	3 Sep 2007 18:45:31 -0000	1.5
@@ -1 +1 @@
-clutter-0.3.1.tar.gz
+clutter-0.4.1.tar.gz


Index: clutter.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clutter.spec	22 Jul 2007 02:42:36 -0000	1.4
+++ clutter.spec	3 Sep 2007 18:45:31 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           clutter
-Version:        0.3.1
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.3/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel  mesa-libGL-devel gtk2-devel 
@@ -54,19 +54,22 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %exclude %{_libdir}/*.la
-%{_libdir}/libclutter-glx-0.3.so.0
-%{_libdir}/libclutter-glx-0.3.so.0.301.0
+%{_libdir}/libclutter-glx-0.4.so.0
+%{_libdir}/libclutter-glx-0.4.so.0.401.0
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/*
-%{_libdir}/libclutter-glx-0.3.so
-%{_libdir}/pkgconfig/clutter-0.3.pc
-%{_libdir}/pkgconfig/clutter-glx-0.3.pc
+%{_libdir}/libclutter-glx-0.4.so
+%{_libdir}/pkgconfig/clutter-0.4.pc
+%{_libdir}/pkgconfig/clutter-glx-0.4.pc
 %{_datadir}/gtk-doc/html/clutter
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.1-1
+- Update to 0.4.1
+
 * Sat Jul 21 2007 Allisson Azevedo <allisson at gmail.com> 0.3.1-1
 - Update to 0.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2007 02:42:36 -0000	1.4
+++ sources	3 Sep 2007 18:45:31 -0000	1.5
@@ -1 +1 @@
-549311509899e239d379939fe911156f  clutter-0.3.1.tar.gz
+ac824b3639067e83bdecd4ce83a942e2  clutter-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 18:50:21 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:50:21 -0400
Subject: rpms/eclipse-rpm-editor/devel eclipse-rpm-editor.spec,1.3,1.4
Message-ID: <200709031850.l83IoL9O019360@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
- Requires rpmlint >= 0.81



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-rpm-editor.spec	3 Sep 2007 18:18:40 -0000	1.3
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:49:48 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -30,9 +30,7 @@
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
 Requires: eclipse-changelog >= 2.5.1
-# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
-# the rpmlint plugin
-Requires: rpmlint >= 0.80
+Requires: rpmlint >= 0.81
 Requires: rpmdevtools
 
 # These plugins are really noarch but they the changelog plugin need cdt which 
@@ -113,6 +111,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
+- Requires rpmlint >= 0.81
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
 - Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 18:51:16 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 3 Sep 2007 14:51:16 -0400
Subject: rpms/eclipse-rpm-editor/FC-6 eclipse-rpm-editor.spec,1.3,1.4
Message-ID: <200709031851.l83IpGfP019418@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	eclipse-rpm-editor.spec 
Log Message:
* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
- Requires rpmlint >= 0.81



Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/FC-6/eclipse-rpm-editor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-rpm-editor.spec	3 Sep 2007 18:36:12 -0000	1.3
+++ eclipse-rpm-editor.spec	3 Sep 2007 18:50:44 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -30,9 +30,7 @@
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
 Requires: eclipse-changelog >= 2.5.1
-# rpmlint need rpmlint-0.80-rpmlint-on-specfiles.patch to be compatible with 
-# the rpmlint plugin
-Requires: rpmlint >= 0.80
+Requires: rpmlint >= 0.81
 Requires: rpmdevtools
 
 # These plugins are really noarch but they the changelog plugin need cdt which 
@@ -113,6 +111,9 @@
 %endif
 
 %changelog
+* Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
+- Requires rpmlint >= 0.81
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-6
 - Remove rpmlint-remove-rpmlint-plugin.patch because rpmlint 0.81 is out.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:08 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:08 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested commit
Message-ID: <200709031900.l83J089a023282@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the commit acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:10 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:10 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0AeD023288@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:13 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:13 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0Dvw023297@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:18 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:18 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0IAc023303@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:19 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:19 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchbugzilla
Message-ID: <200709031900.l83J0Jue023309@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchbugzilla acl on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:23 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:23 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0NVj023316@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:23 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:23 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested approveacls
Message-ID: <200709031900.l83J0OpK023322@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the approveacls acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:00:26 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:00:26 -0700
Subject: [pkgdb] audio-convert-mod: firewing has requested watchcommits
Message-ID: <200709031900.l83J0Qr1023328@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has requested the watchcommits acl on audio-convert-mod (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:02 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:02 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J124u023336@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the approveacls acl on audio-convert-mod (Fedora devel) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:05 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:05 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J15MA023379@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 6) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:06 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:06 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J16kS023386@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the watchcommits acl on audio-convert-mod (Fedora 6) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:09 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:09 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J19FY023393@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the watchbugzilla acl on audio-convert-mod (Fedora 7) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:11 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:11 -0700
Subject: [pkgdb] audio-convert-mod had acl change status
Message-ID: <200709031901.l83J1Bbf023399@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 7) to Approved for Stewart Adam (firewing)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:52 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:52 -0700
Subject: [pkgdb] audio-convert-mod had groupAcl changed
Message-ID: <200709031901.l83J1qwR023412@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:01:55 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (s.adam))
Date: Mon, 03 Sep 2007 12:01:55 -0700
Subject: [pkgdb] audio-convert-mod had groupAcl changed
Message-ID: <200709031901.l83J1tPu023418@app3.fedora.phx.redhat.com>

Stewart Adam (firewing) has set the commit acl on audio-convert-mod (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audio-convert-mod



From fedora-extras-commits at redhat.com  Mon Sep  3 19:18:52 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:18:52 -0400
Subject: rpms/maniadrive/devel maniadrive-1.2-fixes.patch, NONE,
	1.1 maniadrive-track-editor.desktop, NONE,
	1.1 maniadrive.desktop, NONE, 1.1 maniadrive.png, NONE,
	1.1 maniadrive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709031918.l83JIqoK026113@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-1.2-fixes.patch maniadrive-track-editor.desktop 
	maniadrive.desktop maniadrive.png maniadrive.spec 
Log Message:

initial maniadrive import


maniadrive-1.2-fixes.patch:

--- NEW FILE maniadrive-1.2-fixes.patch ---
diff -up ManiaDrive-1.2-src/raydium/ode.h.foobar ManiaDrive-1.2-src/raydium/ode.h
--- ManiaDrive-1.2-src/raydium/ode.h.foobar	2006-08-11 12:11:13.000000000 +0200
+++ ManiaDrive-1.2-src/raydium/ode.h	2007-08-12 00:30:29.000000000 +0200
@@ -11,7 +11,7 @@
 // ugly workaround to avoid odemath.h ...
 #define _ODE_ODEMATH_H_
 #endif
-#include "../ode/include/ode/ode.h"
+#include <ode/ode.h>
 
 #define RAYDIUM_ODE_MAX_OBJECTS			64
 #define RAYDIUM_ODE_MAX_ELEMENTS		256
diff -up ManiaDrive-1.2-src/raydium/php.c.foobar ManiaDrive-1.2-src/raydium/php.c
--- ManiaDrive-1.2-src/raydium/php.c.foobar	2006-08-13 03:55:37.000000000 +0200
+++ ManiaDrive-1.2-src/raydium/php.c	2007-08-12 00:33:15.000000000 +0200
@@ -151,6 +151,7 @@ int raydium_php_exec(char *name)  
     raydium_php_init_request(name);
 
     zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
+    zend_alter_ini_entry("safe_mode", 10, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
     zend_alter_ini_entry("default_socket_timeout",23,"10",2, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
@@ -301,7 +302,7 @@ sapi_globals = ts_resource(sapi_globals_
 tsrm_ls = ts_resource(0);
 #endif
 raydium_sapi_module.phpinfo_as_text=1;
-path=malloc(strlen(PHP_INI_PATH));
+path=malloc(strlen(PHP_INI_PATH)+1);
 strcpy(path,PHP_INI_PATH);
 raydium_sapi_module.php_ini_path_override=path;
 sapi_startup(&raydium_sapi_module);
diff -up ManiaDrive-1.2-src/mania_drive.c.foobar ManiaDrive-1.2-src/mania_drive.c
--- ManiaDrive-1.2-src/mania_drive.c.foobar	2006-08-21 22:56:03.000000000 +0200
+++ ManiaDrive-1.2-src/mania_drive.c	2007-08-12 00:30:29.000000000 +0200
@@ -19,7 +19,7 @@ char *version="ManiaDrive 1.2custom";
 #define STORY_FILE_PRO		"mania_drive.story.pro"
 #define HISTORY_STATE_FILE	raydium_file_home_path("mania_drive.state")
 
-#define MUSIC_MENU	"mania_music/i_got_it_bad_-_The_Napoleon_Blown_Aparts.ogg"
+#define MUSIC_MENU	"mania_music/893_[Black_moon]_The_devil_into_you_[Creative_Commons___by_2.0]_[www.dogmazic.net].ogg"
 #define RESOLUTION_LIST "320x240\n640x480\n800x600\n1024x768"
 
 GLfloat sun[]={1.0,0.9,0.5,1.0};
@@ -2493,6 +2493,7 @@ int full_sx_i,full_sy_i;
 int mode;
 
 raydium_init_args_name(argc,argv,"mania_drive");
+chdir("/usr/share/maniadrive");
 
 raydium_parser_db_get("ManiaDrive-Windowed",str,"0");
 windowed_mode=atoi(str);
@@ -2559,7 +2560,7 @@ raydium_parser_db_get("ManiaDrive-Camera
 camera_lag=(lagActive[0]=='y'?1:0);
 sscanf(lagSpeed,"%f",&camera_lag_speed);
 
-raydium_parser_db_get("ManiaDrive-ShadowSupport",str,"1");
+raydium_parser_db_get("ManiaDrive-ShadowSupport",str,"0");
 shadow_support=atoi(str);
 
 raydium_parser_db_get("ManiaDrive-MusicVolume",str,"1.0");
diff -up ManiaDrive-1.2-src/mania2.c.foobar ManiaDrive-1.2-src/mania2.c
--- ManiaDrive-1.2-src/mania2.c.foobar	2006-08-17 15:36:32.000000000 +0200
+++ ManiaDrive-1.2-src/mania2.c	2007-08-12 00:30:29.000000000 +0200
@@ -15,7 +15,7 @@ char *title="CQFD Corp. Mania2";
 #ifdef WIN32
 #define MANIA_BINARY "mania_drive.exe"
 #else
-#define MANIA_BINARY "./mania_drive.static"
+#define MANIA_BINARY "/usr/bin/maniadrive"
 #endif
 
 
@@ -1027,6 +1027,7 @@ data_init();
 current_track[0]=0;
 
 raydium_init_args_name(argc,argv,"mania_drive");
+chdir("/usr/share/maniadrive");
 
 raydium_window_create(700,700,RAYDIUM_RENDERING_WINDOW,window);
 
diff -up ManiaDrive-1.2-src/Makefile.foobar ManiaDrive-1.2-src/Makefile
--- ManiaDrive-1.2-src/Makefile.foobar	2006-07-22 12:52:04.000000000 +0200
+++ ManiaDrive-1.2-src/Makefile	2007-08-12 00:30:29.000000000 +0200
@@ -7,8 +7,8 @@ CC = gcc
 CC = gcc
 AR = ar
 RANLIB = ranlib
-SYSTEM_LIBS =  -lGL -lGLU -lXinerama -lm -ljpeg -lopenal -lalut -lvorbis -lvorbisfile -logg -lresolv -lcrypt -lz -lcurl -lxml2 -lGLEW
+SYSTEM_LIBS =  -lGL -lGLU -lXinerama -lm -ljpeg -lopenal -lalut -lvorbisfile -lGLEW
-OTHER_LIBS =  raydium/ode/lib/libode.a raydium/php/libs/libphp5.a
+OTHER_LIBS = -lode -lphp5
 INCLUDE_PATH =  -Iraydium/ode/include/ -Iraydium/php/ -Iraydium/php/include -Iraydium/php/main/ -Iraydium/php/Zend -Iraydium/php/TSRM -I/usr/include/curl
 LIBS_PATH =  -L/usr/X11R6/lib/
 CFLAGS=-Wall


--- NEW FILE maniadrive-track-editor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ManiaDrive Track Editor
Comment=Create new tracks for ManiaDrive
Exec=maniadrive-track-editor
Icon=maniadrive.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;


--- NEW FILE maniadrive.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=ManiaDrive
Comment=Drive a car on acrobatic tracks
Exec=maniadrive
Icon=maniadrive.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;


--- NEW FILE maniadrive.spec ---
Name:           maniadrive
Version:        1.2
Release:        2%{?dist}
Summary:        3D stunt driving game
Group:          Amusements/Games
License:        GPLv2+
URL:            http://maniadrive.raydium.org/
Source0:        http://downloads.sourceforge.net/%{name}/ManiaDrive-%{version}-src.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Source3:        %{name}-track-editor.desktop
Patch0:         %{name}-1.2-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  glew-devel ode-devel php-devel php-embedded-devel
BuildRequires:  freealut-devel libjpeg-devel libXinerama-devel
BuildRequires:  libvorbis-devel desktop-file-utils
Requires:       %{name}-data = %{version}, php-soap, hicolor-icon-theme
# for people who try to install this using upstream capitalization
Provides:       ManiaDrive = %{version}-%{release}

%description
ManiaDrive is an arcade car game on acrobatic tracks, with a quick and nervous
gameplay (tracks almost never exceed one minute). Features: Complex car
physics, Challenging "story mode", LAN and Internet mode, Live scores,
Track editor, Dedicated server with HTTP interface and More than 30 blocks.


%package track-editor
Summary:        ManiaDrive track editor
Group:          Amusements/Games
Requires:       %{name} = %{version}-%{release}

%description track-editor
Track editor for ManiaDrive, an arcade car game on acrobatic tracks.


# upstream only does raydium svn snapshots, the closest thing to a release
# schedule are the snapshots included in maniadrive, so we package the included
# raydium snapshot as raydium
  
%package -n raydium
Summary:        3D stunt driving game
Group:          System Environment/Libraries
URL:            http://raydium.org/

%description -n raydium
Raydium is a game engine. It provides a set of functions which allow quick and
flexible games creation. There are a lot of other 3D/game engines (and some
are very complete, such as Ogre, Crystal Space, etc). Raydium does not try to
be as complex as these engines, but on the contrary is aiming at quick and
simple development.


%package -n raydium-devel
Summary:        Development files for raydium
Group:          Development/Libraries
Requires:       raydium = %{version}-%{release}
Requires:       php-devel glew-devel freealut-devel libjpeg-devel ode-devel
Requires:       libvorbis-devel

%description -n raydium-devel
The raydium-devel package contains libraries and header files for
developing applications that use raydium.


%prep
%setup -q -n ManiaDrive-%{version}-src
%patch0 -p1
rm -r rayphp/r3s rayphp/README


%build
# note the Makefile builds raydium, not maniadrive !
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC `php-config --includes`" \
  LINKING_OPTIONS=-Wl,-soname,libraydium-%{version}.so
  
# only one C-file and no makefile for maniadrive and the editor, so DIY
gcc $RPM_OPT_FLAGS -o %{name} `php-config --includes` -DFORCE_LIBRAYDIUM \
  mania_drive.c -L. -lraydium

gcc $RPM_OPT_FLAGS -o %{name}-track-editor `php-config --includes` \
  -DFORCE_LIBRAYDIUM mania2.c -L. -lraydium


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/raydium/headers
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raydium
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name}-track-editor $RPM_BUILD_ROOT%{_bindir}
install -m 755 libraydium.so.0.0 \
  $RPM_BUILD_ROOT%{_libdir}/libraydium-%{version}.so
ln -s libraydium-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libraydium.so
install -p -m 644 raydium/*.h  $RPM_BUILD_ROOT%{_includedir}/raydium
install -p -m 644 raydium/headers/*.h \
  $RPM_BUILD_ROOT%{_includedir}/raydium/headers
cp -a rayphp $RPM_BUILD_ROOT%{_datadir}/raydium

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE2}
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%post -n raydium -p /sbin/ldconfig

%postun -n raydium -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# no docs these are all in the -data package
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png

%files track-editor
%defattr(-,root,root,-)
%{_bindir}/%{name}-track-editor
%{_datadir}/applications/fedora-%{name}-track-editor.desktop

%files -n raydium
%defattr(-,root,root,-)
%{_libdir}/libraydium-%{version}.so
%{_datadir}/raydium

%files -n raydium-devel
%defattr(-,root,root,-)
%{_libdir}/libraydium.so
%{_includedir}/raydium


%changelog
* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
- Improved and spell-fixed raydium description
- Fix a number of unused direct shlib dependencies in libraydium-1.2.so
- Add Requires on various -devel packages to the raydium-devel subpackage so
  that all headers included by the raydium headers will be present

* Fri Aug 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:24:30 -0000	1.1
+++ .cvsignore	3 Sep 2007 19:18:20 -0000	1.2
@@ -0,0 +1 @@
+ManiaDrive-1.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:24:30 -0000	1.1
+++ sources	3 Sep 2007 19:18:20 -0000	1.2
@@ -0,0 +1 @@
+90dec2154802225980f8b4ebd6570069  ManiaDrive-1.2-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:19:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:19:11 -0400
Subject: rpms/maniadrive-data/devel maniadrive-data-1.2-fixes.patch, NONE,
	1.1 maniadrive-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709031919.l83JJBM7026152@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26084/devel

Modified Files:
	.cvsignore sources 
Added Files:
	maniadrive-data-1.2-fixes.patch maniadrive-data.spec 
Log Message:
initial maniadrive-data import


maniadrive-data-1.2-fixes.patch:

--- NEW FILE maniadrive-data-1.2-fixes.patch ---
diff -up ManiaDrive-1.2-data/README~ ManiaDrive-1.2-data/README
--- ManiaDrive-1.2-data/README~	2007-08-11 15:28:59.000000000 +0200
+++ ManiaDrive-1.2-data/README	2007-08-11 15:28:59.000000000 +0200
@@ -17,18 +17,8 @@ Also features:
  - Full soundtrack
  
 License for Code & Art (except music): GNU General Public License (GPL)
-License for Music: Creative Commons 2.0 (CC2)
-
-Sound Track Details:
- * I got it bad (1:48) by The Napoleon Blown Aparts
- * Mine tonite (2:08) by Rocket City Riot
- * The Devil... (4:15) by Black Moon
- * erase and rewind (2:28) by Horstreich
- * Nowhere to go (2:06) by The Napoleon Blown Aparts
- * MeMak Racer 1 (1:28) by Neub (aka Revision 1.1)
- * revenge of yesterday (1:59) by Horstreich
- * Superstar Destroyer (2:47) by Zen Ace Ten (website is down ?)
- * Bienvenue au Mexique (1:26) by Mage
+License for Music: Creative Commons (CC BY) / Free Art License / GNU GPL,
+see README.fedora in the music package
 				    
 Xfennec and the whole Raydium Team thanks you for downloading this game !
 Raydium 3D Game Engine - http://raydium.org/
diff -up ManiaDrive-1.2-data/game/php.ini~ ManiaDrive-1.2-data/game/php.ini
--- ManiaDrive-1.2-data/game/php.ini~	2007-08-11 22:35:16.000000000 +0200
+++ ManiaDrive-1.2-data/game/php.ini	2007-08-11 22:35:16.000000000 +0200
@@ -1,4 +1,2 @@
 [PHP]
-extension_dir = "./"
-extension=php_curl.dll
-extension=php_soap.dll
\ No newline at end of file
+extension=soap.so
diff -up ManiaDrive-1.2-data/game/mania_tracklist.php~ ManiaDrive-1.2-data/game/mania_tracklist.php
--- ManiaDrive-1.2-data/game/mania_tracklist.php~	2007-08-11 22:35:55.000000000 +0200
+++ ManiaDrive-1.2-data/game/mania_tracklist.php	2007-08-11 22:35:55.000000000 +0200
@@ -28,10 +28,5 @@ foreach($file as $t)
     $nl="\n";
     }
 
-// save list to disk
-$fp=fopen("mania_tracklist.txt","wb");
-fwrite($fp,$list);
-fclose($fp);
-
 //var_dump($list);
 ?>


--- NEW FILE maniadrive-data.spec ---
Name:           maniadrive-data
Version:        1.2
Release:        2%{?dist}
Summary:        Data files for maniadrive, a 3D stunt driving game
Group:          Amusements/Games
License:        GPL+
URL:            http://maniadrive.raydium.org/
# This is:
# http://downloads.sourceforge.net/%{name}/ManiaDrive-%{version}-data.tar.gz
# With the game/mania_music directory removed because that contains non free
# music (CC BY-NC-SA licensed)
Source0:        ManiaDrive-%{version}-data.tar.gz
Patch0:         maniadrive-data-1.2-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
# to make sure this gets removed when maniadrive gets removed
Requires:       maniadrive

%description
Data files for maniadrive, a 3D stunt driving game. Notice this package does
not include the original ManiaDrive soundtrack as the original soundtrack is
licensed under a CC BY-NC-SA license, which is not acceptable to Fedora.

A replacement soundtrack is available in the maniadrive-music package (and will
get automatically installed together with maniadrive itself).


%prep
%setup -q -n ManiaDrive-%{version}-data
%patch0 -p1
sed -i 's/\r//g' game/php.ini game/mania.cfg game/*.tri game/*.mni
iconv -f ISO-8859-1 -t UTF8 README > README.tmp
mv README.tmp README


%build
# nothing to build, data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}
cp -a game $RPM_BUILD_ROOT%{_datadir}/maniadrive
ln -s ../raydium/rayphp $RPM_BUILD_ROOT%{_datadir}/maniadrive/rayphp


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_datadir}/maniadrive


%changelog
* Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
- Correct License tag from GPLv2+ to GPL+
- Convert README to UTF-8

* Sat Aug 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:26:09 -0000	1.1
+++ .cvsignore	3 Sep 2007 19:18:38 -0000	1.2
@@ -0,0 +1 @@
+ManiaDrive-1.2-data.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maniadrive-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:26:09 -0000	1.1
+++ sources	3 Sep 2007 19:18:38 -0000	1.2
@@ -0,0 +1 @@
+612460892e26f258f2e43757f70cd4ff  ManiaDrive-1.2-data.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:20:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 3 Sep 2007 15:20:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.41, 1.42 sources, 1.42,
	1.43 sugar.spec, 1.50, 1.51
Message-ID: <200709031920.l83JKHk3026229@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26203

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	1 Sep 2007 11:53:01 -0000	1.41
+++ .cvsignore	3 Sep 2007 19:19:44 -0000	1.42
@@ -1 +1 @@
-sugar-0.65-gitfeb462d08d.tar.bz2
+sugar-0.65-git0b3f687749.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	1 Sep 2007 11:53:01 -0000	1.42
+++ sources	3 Sep 2007 19:19:44 -0000	1.43
@@ -1 +1 @@
-8c33fbc69907b1fc89c302c652307acc  sugar-0.65-gitfeb462d08d.tar.bz2
+65e93be43c62389c4905d521f409f6ed  sugar-0.65-git0b3f687749.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sugar.spec	1 Sep 2007 11:53:01 -0000	1.50
+++ sugar.spec	3 Sep 2007 19:19:44 -0000	1.51
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070901git
-%define commitid feb462d08d
+%define alphatag 20070903git
+%define commitid 0b3f687749
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.34.%{alphatag}feb462d08d
+Release: 0.39.%{alphatag}0b3f687749
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
+- New snapshot
+
 * Sat Sep  1 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.34.20070901gitfeb462d08d
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:29:10 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 3 Sep 2007 15:29:10 -0400
Subject: comps comps-f8.xml.in,1.87,1.88
Message-ID: <200709031929.l83JTAaf026370@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26352

Modified Files:
	comps-f8.xml.in 
Log Message:
add maniadrive


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- comps-f8.xml.in	3 Sep 2007 02:41:29 -0000	1.87
+++ comps-f8.xml.in	3 Sep 2007 19:28:40 -0000	1.88
@@ -1461,6 +1461,7 @@
       <packagereq type="optional">Maelstrom</packagereq>
       <packagereq type="optional">magicor</packagereq>
       <packagereq type="optional">manaworld</packagereq>
+      <packagereq type="optional">maniadrive</packagereq>
       <packagereq type="optional">methane</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">monkey-bubble</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:23 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchcommits
Message-ID: <200709031936.l83JaOm2023734@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on lesstif (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:31 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchcommits
Message-ID: <200709031936.l83JaVk1023743@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on lesstif (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:32 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:32 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested commit
Message-ID: <200709031936.l83JaWai023752@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on lesstif (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Mon Sep  3 19:36:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 03 Sep 2007 12:36:37 -0700
Subject: [pkgdb] lesstif: jwrdegoede has requested watchbugzilla
Message-ID: <200709031936.l83Jab8T023772@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on lesstif (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Mon Sep  3 19:38:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 15:38:04 -0400
Subject: rpms/slim/F-7 slim.spec,1.1,1.2
Message-ID: <200709031938.l83Jc4mS026702@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26681

Modified Files:
	slim.spec 
Log Message:
minor bugfix from devel


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slim.spec	6 Aug 2007 20:53:25 -0000	1.1
+++ slim.spec	3 Sep 2007 19:37:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -27,7 +27,7 @@
 # we use 'include' in the pam file, so
 Requires:       pam >= 0.80
 # reuse the images
-Requires:       desktop-backgrounds-basic fedora-logos
+Requires:       desktop-backgrounds-basic system-logos
 
 %description
 SLiM (Simple Login Manager) is a graphical login manager for X11.
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
+- require system-logos instead of fedora-logos (#250365)
+
 * Tue May 22 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-5
 - make sure to own datadir slim parent too
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:39:21 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 15:39:21 -0400
Subject: rpms/clutter-gst/devel .cvsignore, 1.2, 1.3 clutter-gst.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200709031939.l83JdLZx026791@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26762/devel

Modified Files:
	.cvsignore clutter-gst.spec sources 
Log Message:

Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2007 10:41:19 -0000	1.2
+++ .cvsignore	3 Sep 2007 19:38:49 -0000	1.3
@@ -1 +1 @@
-clutter-gst-0.1.1.tar.gz
+clutter-gst-0.4.0.tar.gz


Index: clutter-gst.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/clutter-gst.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clutter-gst.spec	15 May 2007 10:41:19 -0000	1.1
+++ clutter-gst.spec	3 Sep 2007 19:38:49 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           clutter-gst
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.1/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
@@ -45,20 +45,23 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/libclutter-gst-0.1.la
-%{_libdir}/libclutter-gst-0.1.so.0
-%{_libdir}/libclutter-gst-0.1.so.0.1.0
+%exclude %{_libdir}/libclutter-gst-0.4.la
+%{_libdir}/libclutter-gst-0.4.so.0
+%{_libdir}/libclutter-gst-0.4.so.0.400.0
 %{_datadir}/gtk-doc/html/clutter-gst
 
 %files devel
 %defattr(-,root,root,-)
 %doc
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-0.1.pc
-%{_libdir}/libclutter-gst-0.1.so
+%{_libdir}/pkgconfig/clutter-gst-0.4.pc
+%{_libdir}/libclutter-gst-0.4.so
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.0-1
+- Update to 0.4.0
+
 * Sun May 13 2007 Allisson Azevedo <allisson at gmail.com> 0.1.1-2
 - INSTALL removed from docs
 - fix make install for keeping timestamps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2007 10:41:19 -0000	1.2
+++ sources	3 Sep 2007 19:38:49 -0000	1.3
@@ -1 +1 @@
-13fb455ab14c32a06758ed02076f7fa5  clutter-gst-0.1.1.tar.gz
+9b6ff997131619705a9d3796d38929c9  clutter-gst-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:45:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 15:45:02 -0400
Subject: rpms/slim/devel slim-1.3.0-make.patch,NONE,1.1 slim.spec,1.2,1.3
Message-ID: <200709031945.l83Jj2b7026914@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26884

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.0-make.patch 
Log Message:
new version, with pam

slim-1.3.0-make.patch:

--- NEW FILE slim-1.3.0-make.patch ---
--- slim-1.3.0/Makefile.orig	2007-07-15 16:09:28.000000000 +0200
+++ slim-1.3.0/Makefile	2007-08-06 19:01:49.000000000 +0200
@@ -5,7 +5,9 @@
 #######################################################
 CXX=/usr/bin/g++
 CC=/usr/bin/gcc
-CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+INSTALL=install
+OPTFLAGS=-O2 -g -Wall
+CFLAGS=$(OPTFLAGS) -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
 LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
@@ -42,10 +44,10 @@ slim: $(OBJECTS)
 	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 install: slim install-theme
-	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
-	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
+	$(INSTALL) -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
+	$(INSTALL) -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
 	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
-		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+		$(INSTALL) -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
 
 clean:
 	@rm -f slim *.o
@@ -61,9 +63,9 @@ dist:
 
 
 install-theme:
-	install -D -m 644 themes/default/slim.theme \
+	$(INSTALL) -D -m 644 themes/default/slim.theme \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
-	install -D -m 644 themes/default/panel.png \
+	$(INSTALL) -D -m 644 themes/default/panel.png \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
-	install -D -m 644 themes/default/background.jpg \
+	$(INSTALL) -D -m 644 themes/default/background.jpg \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slim.spec	6 Aug 2007 16:45:41 -0000	1.2
+++ slim.spec	3 Sep 2007 19:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           slim
-Version:        1.2.6
-Release:        6%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,7 +14,7 @@
 Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         slim-1.2.6-make.patch
+Patch0:         slim-1.3.0-make.patch
 Patch1:         slim-1.2.6-usexwd.patch
 Patch2:         slim-1.2.6-fedora.patch
 
@@ -48,7 +48,7 @@
 cp -p %{SOURCE3} README.Fedora
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-1
+- version upgrade
+
 * Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
 - require system-logos instead of fedora-logos (#250365)
 



From fedora-extras-commits at redhat.com  Mon Sep  3 19:54:29 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 15:54:29 -0400
Subject: rpms/clutter-gtk/devel .cvsignore, 1.2, 1.3 clutter-gtk.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200709031954.l83JsTSK027218@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27177/devel

Modified Files:
	.cvsignore clutter-gtk.spec sources 
Log Message:

Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 May 2007 02:35:18 -0000	1.2
+++ .cvsignore	3 Sep 2007 19:53:57 -0000	1.3
@@ -1 +1 @@
-clutter-gtk-0.1.0.tar.gz
+clutter-gtk-0.4.0.tar.gz


Index: clutter-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/clutter-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clutter-gtk.spec	12 May 2007 02:35:18 -0000	1.1
+++ clutter-gtk.spec	3 Sep 2007 19:53:57 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           clutter-gtk
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.1/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel clutter-devel       
@@ -50,21 +50,24 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
-%exclude %{_libdir}/libcluttergtk-1.0.la
-%{_libdir}/libcluttergtk-1.0.so.0
-%{_libdir}/libcluttergtk-1.0.so.0.100.0
+%exclude %{_libdir}/libclutter-gtk-0.4.la
+%{_libdir}/libclutter-gtk-0.4.so.0
+%{_libdir}/libclutter-gtk-0.4.so.0.400.0
 %{_datadir}/gtk-doc/html/clutter-gtk
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/pkgconfig/clutter-gtk.pc
-%{_libdir}/libcluttergtk-1.0.so
-%{_includedir}/clutter-0.2/clutter-gtk
+%{_libdir}/pkgconfig/clutter-gtk-0.4.pc
+%{_libdir}/libclutter-gtk-0.4.so
+%{_includedir}/clutter-0.4/clutter-gtk
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.0-1
+- Update to 0.4.0
+
 * Thu May 10 2007 Allisson Azevedo <allisson at gmail.com> 0.1.0-3
 - fix devel files section
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 May 2007 02:35:18 -0000	1.2
+++ sources	3 Sep 2007 19:53:57 -0000	1.3
@@ -1 +1 @@
-0b0b30203a432d581aae91d1ca7d6367  clutter-gtk-0.1.0.tar.gz
+c3daf6a39749a10d4f5c9fbd3ea1da72  clutter-gtk-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:23 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:23 -0400
Subject: rpms/CGAL/F-7 .cvsignore,1.3,1.4 CGAL.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200709031959.l83JxN8J027528@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/F-7

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Jun 2007 14:33:23 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:50 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/CGAL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CGAL.spec	23 Aug 2007 21:58:08 -0000	1.8
+++ CGAL.spec	3 Sep 2007 19:58:50 -0000	1.9
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jun 2007 14:33:23 -0000	1.3
+++ sources	3 Sep 2007 19:58:50 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:26 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:26 -0400
Subject: rpms/CGAL/FC-5 .cvsignore, 1.3, 1.4 CGAL.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200709031959.l83JxQwV027533@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/FC-5

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2007 16:01:29 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:53 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/CGAL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CGAL.spec	23 Aug 2007 21:58:11 -0000	1.6
+++ CGAL.spec	3 Sep 2007 19:58:53 -0000	1.7
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2007 16:01:29 -0000	1.3
+++ sources	3 Sep 2007 19:58:53 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:29 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:29 -0400
Subject: rpms/CGAL/FC-6 .cvsignore, 1.3, 1.4 CGAL.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200709031959.l83JxTNO027539@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/FC-6

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jun 2007 16:01:43 -0000	1.3
+++ .cvsignore	3 Sep 2007 19:58:56 -0000	1.4
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/CGAL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CGAL.spec	23 Aug 2007 21:58:14 -0000	1.6
+++ CGAL.spec	3 Sep 2007 19:58:56 -0000	1.7
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -16,13 +16,19 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Required packages.
+# Required devel packages.
 BuildRequires: gmp-devel
 BuildRequires: boost-devel >= %boost_version
 BuildRequires: qt-devel >= 3.0
 BuildConflicts:qt-devel < 4
 BuildRequires: zlib-devel
 BuildRequires: blas-devel lapack-devel
+%if 0%fedora > 7
+BuildRequires: mpfr-devel
+%endif
+
+# Required tools
+BuildRequires: gawk
 
 # for chmod in prep:
 BuildRequires: coreutils
@@ -104,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -225,6 +231,15 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+- Add BR: mpfr since F-8.
+
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+- Add BR: gawk
+
 * Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
 - License: tag fixed.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jun 2007 16:01:43 -0000	1.3
+++ sources	3 Sep 2007 19:58:56 -0000	1.4
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 19:59:31 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 15:59:31 -0400
Subject: rpms/CGAL/devel .cvsignore, 1.4, 1.5 CGAL.spec, 1.11, 1.12 sources, 
	1.4, 1.5
Message-ID: <200709031959.l83JxVG6027545@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27452/devel

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
- New upstream bug-fixes release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jun 2007 09:49:28 -0000	1.4
+++ .cvsignore	3 Sep 2007 19:58:59 -0000	1.5
@@ -1 +1 @@
-CGAL-3.3.tar.gz
+CGAL-3.3.1.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CGAL.spec	24 Aug 2007 08:16:39 -0000	1.11
+++ CGAL.spec	3 Sep 2007 19:58:59 -0000	1.12
@@ -1,8 +1,8 @@
 %define boost_version 1.32
 
 Name:           CGAL
-Version:        3.3
-Release:        7%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -110,7 +110,7 @@
                --with-MPFR \
                --with-QT3MT \
                --with-REFBLASSHARED \
-               --with-LAPACK \
+               --with-DEFAULTLAPACK \
                --with-OPENGL \
                --disable-static
 
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+- New upstream bug-fixes release.
+
 * Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
 - Add BR: mpfr since F-8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jun 2007 09:49:28 -0000	1.4
+++ sources	3 Sep 2007 19:58:59 -0000	1.5
@@ -1 +1 @@
-d45186e2721e1e503a2838a5931d52c5  CGAL-3.3.tar.gz
+733339b6b05b48d4c7934a6e735b6fc0  CGAL-3.3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:01:08 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:01:08 -0400
Subject: rpms/audio-convert-mod/devel audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032001.l83K18uT000809@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27632/devel

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:00:35 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:00:35 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:06:56 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Mon, 3 Sep 2007 16:06:56 -0400
Subject: rpms/pyclutter/devel .cvsignore, 1.2, 1.3 pyclutter.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709032006.l83K6ue0001490@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/pyclutter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1422/devel

Modified Files:
	.cvsignore pyclutter.spec sources 
Log Message:

Update to 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Apr 2007 02:26:36 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:06:23 -0000	1.3
@@ -1 +1 @@
-pyclutter-0.2.0.tar.gz
+pyclutter-0.4.1.tar.gz


Index: pyclutter.spec
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/pyclutter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyclutter.spec	2 Apr 2007 02:26:36 -0000	1.1
+++ pyclutter.spec	3 Sep 2007 20:06:23 -0000	1.2
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyclutter
-Version:        0.2.0
-Release:        5%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Python modules that allow you to use the Clutter toolkit
 
 Group:          Development/Languages
-License:        GPL
+License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.2/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
@@ -63,6 +63,9 @@
 
 %changelog
 
+* Mon Sep  3 2007 Allisson Azevedo <allisson at gmail.com> 0.4.1-1
+- Update to 0.4.1
+
 * Sun Mar 29 2007 Allisson Azevedo <allisson at gmail.com> 0.2.0-5
 - Fix requires for devel package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyclutter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Apr 2007 02:26:36 -0000	1.2
+++ sources	3 Sep 2007 20:06:23 -0000	1.3
@@ -1 +1 @@
-cb2565cd0014ccc3f1f2700c8c6f3193  pyclutter-0.2.0.tar.gz
+0e13f33dda075dc11e68ab3c52974c08  pyclutter-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:07:57 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:07:57 -0400
Subject: rpms/audio-convert-mod/F-7 audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032007.l83K7vDj001601@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1550

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial F-7 import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:07:24 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:07:24 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:08:22 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Mon, 3 Sep 2007 16:08:22 -0400
Subject: rpms/audio-convert-mod/FC-6 audio-convert-mod.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709032008.l83K8MAc001660@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1575

Modified Files:
	.cvsignore sources 
Added Files:
	audio-convert-mod.spec 
Log Message:
Initial FC-6 import



--- NEW FILE audio-convert-mod.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pythonname audio_convert_mod
Name:              audio-convert-mod
Version:           3.45.1
Release:           1%{?dist}
BuildArch:         noarch
Summary:           A simple audio file converter supporting many formats
Group:             Applications/Multimedia
License:           GPLv2+
URL:               http://www.diffingo.com/content/view/13/47/lang,en/
Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     desktop-file-utils
BuildRequires:     gettext
BuildRequires:     python >= 2.4
Requires:          python >= 2.4
Requires:          pygtk2, pygtk2-libglade
Requires:          flac, vorbis-tools, wavpack

%description
%{name} is a simple audio file converter supporting various formats
via external binaries. It facilitates the batch conversion of audio files
from one format to another by access from the menu or by the user script where
at a right-click files can be converted at once. It also supports file
tags/metadata where applicable.


%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

rm -f ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-uninstall

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%dir %{python_sitelib}/%{pythonname}

%{_bindir}/*
%{_datadir}/%{name}/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/%{pythonname}/*

%doc AUTHORS README COPYING CHANGELOG TODO

%changelog
* Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
- Update to 3.45.1 (see CHANGELOG file for details on version changes)
- Remove uninstall script from package
- Update License tag per guideline changes
- Use sitelib, not sitearch

* Fri Aug 3 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-1
- Update to 3.45.0 (see CHANGELOG file for details on version changes)

* Tue Jul 31 2007 Stewart Adam <s.adam at diffingo.com> 3.45.0-0.1
- Initial RPM release, 3.45.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:22:03 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:07:49 -0000	1.2
@@ -0,0 +1 @@
+audio-convert-mod-3.45.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:22:03 -0000	1.1
+++ sources	3 Sep 2007 20:07:49 -0000	1.2
@@ -0,0 +1 @@
+899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:11:37 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:11:37 -0400
Subject: rpms/klear/devel klear.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709032011.l83KBbMR001886@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/klear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/devel

Modified Files:
	.cvsignore sources 
Added Files:
	klear.spec 
Log Message:



--- NEW FILE klear.spec ---
Name:           klear
Version:        0.6.1
Release:        1%{?dist}
Summary:        DVB TV application and harddisk-recorder for linux

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://www.klear.org/
Source0:        http://www.klear.org/sources/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scons kdebase-devel xine-lib-devel chrpath libXtst-devel gettext desktop-file-utils

%description
Klear is a graphical TV viewer with an integrated recording system 
for Linux.
It's designed as a DVB desktop application with all common features.
A clear, nifty and feature rich DVB viewer and recorder 
for your desktop machine.

%prep
%setup -q


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

chmod -x src/App/Engines/KlearXine/CKlearEngineXine.h
chmod -x src/App/CKlearAppRecorder.h
chmod -x src/GUI/Controller/CKlearControllerConfig.h
chmod -x src/App/CKlearAppRecorder.cpp
#this file should not be here...
%{__rm} -f po/it_old.po

export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons configure \
        kdeincludes=/usr/include/kde/ \
        libdir=%{_libdir} \
        %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons install DESTDIR=$RPM_BUILD_ROOT
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/klear



desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applnk/Multimedia   \
       %{buildroot}/%{_datadir}/applnk/Multimedia/klear.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
touch --no-create %{_datadir}/icons/hicolor

%postun
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc distfiles/AUTHORS distfiles/BUGS distfiles/changelog distfiles/COPYING distfiles/copyright distfiles/README
%{_bindir}/klear
%{_datadir}/applnk/Multimedia/klear.desktop
%{_datadir}/apps/klear
%{_datadir}/icons/hicolor/??x??/apps/klear.png



%changelog
* Sun Sep 02 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.1-1
- Update to 0.6.1
- Replace GPL with GPLv2
* Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.0-2
- Added RPM_OPT_FLAGS (the good way this time)
- Using desktop-file-install for the desktop file
- Removed qt-devel from BR since it's required by kdebase-devel  
- Removed QTLIB export since it's already present in qt.sh
- Corrected preceding changelog day
* Wed Mar 28 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-1
- Added RPM_OPT_FLAGS
- Added QT environment variables
* Sun Mar 18 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-0.1
- Initial RPM creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klear/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:18:51 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:11:05 -0000	1.2
@@ -0,0 +1 @@
+klear-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klear/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:18:51 -0000	1.1
+++ sources	3 Sep 2007 20:11:05 -0000	1.2
@@ -0,0 +1 @@
+9ca6f2ac404ecba0195b1449cc76c7c6  klear-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:13:48 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:13:48 -0400
Subject: rpms/klear/F-7 klear.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709032013.l83KDmEF001979@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/klear/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1958/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	klear.spec 
Log Message:



--- NEW FILE klear.spec ---
Name:           klear
Version:        0.6.1
Release:        1%{?dist}
Summary:        DVB TV application and harddisk-recorder for linux

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://www.klear.org/
Source0:        http://www.klear.org/sources/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scons kdebase-devel xine-lib-devel chrpath libXtst-devel gettext desktop-file-utils

%description
Klear is a graphical TV viewer with an integrated recording system 
for Linux.
It's designed as a DVB desktop application with all common features.
A clear, nifty and feature rich DVB viewer and recorder 
for your desktop machine.

%prep
%setup -q


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

chmod -x src/App/Engines/KlearXine/CKlearEngineXine.h
chmod -x src/App/CKlearAppRecorder.h
chmod -x src/GUI/Controller/CKlearControllerConfig.h
chmod -x src/App/CKlearAppRecorder.cpp
#this file should not be here...
%{__rm} -f po/it_old.po

export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons configure \
        kdeincludes=/usr/include/kde/ \
        libdir=%{_libdir} \
        %{?_smp_mflags}



%install
rm -rf $RPM_BUILD_ROOT
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons install DESTDIR=$RPM_BUILD_ROOT
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/klear



desktop-file-install --vendor=""                     \
       --dir=%{buildroot}%{_datadir}/applnk/Multimedia   \
       %{buildroot}/%{_datadir}/applnk/Multimedia/klear.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
touch --no-create %{_datadir}/icons/hicolor

%postun
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc distfiles/AUTHORS distfiles/BUGS distfiles/changelog distfiles/COPYING distfiles/copyright distfiles/README
%{_bindir}/klear
%{_datadir}/applnk/Multimedia/klear.desktop
%{_datadir}/apps/klear
%{_datadir}/icons/hicolor/??x??/apps/klear.png



%changelog
* Sun Sep 02 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.1-1
- Update to 0.6.1
- Replace GPL with GPLv2
* Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.6.0-2
- Added RPM_OPT_FLAGS (the good way this time)
- Using desktop-file-install for the desktop file
- Removed qt-devel from BR since it's required by kdebase-devel  
- Removed QTLIB export since it's already present in qt.sh
- Corrected preceding changelog day
* Wed Mar 28 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-1
- Added RPM_OPT_FLAGS
- Added QT environment variables
* Sun Mar 18 2007 Johan Cwiklinski <johan.cwiklinski at fedoraproject.org> 0.6.0-0.1
- Initial RPM creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klear/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:18:51 -0000	1.1
+++ .cvsignore	3 Sep 2007 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+klear-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klear/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:18:51 -0000	1.1
+++ sources	3 Sep 2007 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+9ca6f2ac404ecba0195b1449cc76c7c6  klear-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:15:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 3 Sep 2007 16:15:39 -0400
Subject: rpms/slim/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709032015.l83KFdos002136@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106

Modified Files:
	.cvsignore sources 
Log Message:
new version, with pam


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2007 09:49:49 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:15:06 -0000	1.3
@@ -1 +1 @@
-slim-1.2.6.tar.gz
+slim-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2007 09:49:49 -0000	1.2
+++ sources	3 Sep 2007 20:15:06 -0000	1.3
@@ -1 +1 @@
-1bf891f046014a03236c21ce6cbe455b  slim-1.2.6.tar.gz
+1c1a87f3cbd3c334c874585e42701961  slim-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:46 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:46 -0400
Subject: rpms/CGAL/F-7 CGAL.spec,1.9,1.10
Message-ID: <200709032025.l83KPk6j002379@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/F-7

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-7/CGAL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CGAL.spec	3 Sep 2007 19:58:50 -0000	1.9
+++ CGAL.spec	3 Sep 2007 20:25:08 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:49 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:49 -0400
Subject: rpms/CGAL/FC-5 CGAL.spec,1.7,1.8
Message-ID: <200709032025.l83KPn8T002382@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/FC-5

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-5/CGAL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CGAL.spec	3 Sep 2007 19:58:53 -0000	1.7
+++ CGAL.spec	3 Sep 2007 20:25:16 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:52 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:52 -0400
Subject: rpms/CGAL/FC-6 CGAL.spec,1.7,1.8
Message-ID: <200709032025.l83KPqmJ002385@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/FC-6

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/FC-6/CGAL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CGAL.spec	3 Sep 2007 19:58:56 -0000	1.7
+++ CGAL.spec	3 Sep 2007 20:25:19 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:25:55 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 3 Sep 2007 16:25:55 -0400
Subject: rpms/CGAL/devel CGAL.spec,1.12,1.13
Message-ID: <200709032025.l83KPtUi002388@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2308/devel

Modified Files:
	CGAL.spec 
Log Message:
* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
- Fix soversion.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CGAL.spec	3 Sep 2007 19:58:59 -0000	1.12
+++ CGAL.spec	3 Sep 2007 20:25:22 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -207,7 +207,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.0
+%{_libdir}/libCGAL*.so.2.0.1
 
 
 %files devel
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+- Fix soversion.
+
 * Mon Sep  3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
 - New upstream bug-fixes release.
 



From fedora-extras-commits at redhat.com  Mon Sep  3 20:51:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 3 Sep 2007 16:51:48 -0400
Subject: rpms/gkrellm/EL-5 .cvsignore, 1.2, 1.3 gkrellm-2.1.28-config.patch, 
	1.1, 1.2 gkrellm.spec, 1.4, 1.5 sources, 1.2,
	1.3 gkrellm-2.1.24-libdir.patch, 1.1,
	NONE gkrellm-2.2.9-gkrellmd.conf.patch, 1.1,
	NONE gkrellm-2.2.9-hwmon.patch, 1.1,
	NONE gkrellm-2.2.9-libsensors.patch, 1.1, NONE
Message-ID: <200709032051.l83KpmpD004902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4871

Modified Files:
	.cvsignore gkrellm-2.1.28-config.patch gkrellm.spec sources 
Removed Files:
	gkrellm-2.1.24-libdir.patch gkrellm-2.2.9-gkrellmd.conf.patch 
	gkrellm-2.2.9-hwmon.patch gkrellm-2.2.9-libsensors.patch 
Log Message:
Sync with devel to prepare for first EPEL build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jul 2006 18:35:32 -0000	1.2
+++ .cvsignore	3 Sep 2007 20:51:14 -0000	1.3
@@ -1 +1 @@
-gkrellm-2.2.9.tar.bz2
+gkrellm-2.3.0.tar.bz2

gkrellm-2.1.28-config.patch:

Index: gkrellm-2.1.28-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm-2.1.28-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellm-2.1.28-config.patch	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellm-2.1.28-config.patch	3 Sep 2007 20:51:14 -0000	1.2
@@ -1,6 +1,7 @@
---- gkrellm-2.1.28/server/gkrellmd.conf.rh1	2004-03-10 14:06:21.883901449 +0100
-+++ gkrellm-2.1.28/server/gkrellmd.conf	2004-03-10 14:12:20.712149159 +0100
-@@ -17,18 +17,19 @@
+diff -up gkrellm-2.3.0/server/gkrellmd.conf.config gkrellm-2.3.0/server/gkrellmd.conf
+--- gkrellm-2.3.0/server/gkrellmd.conf.config	2006-11-28 20:34:37.000000000 +0100
++++ gkrellm-2.3.0/server/gkrellmd.conf	2007-07-22 14:00:54.000000000 +0200
+@@ -17,21 +17,22 @@ port 19150
  # List of hosts allowed to connect.  If no hosts are specified in a
  # gkrellmd.conf file or on the command line, all hosts will be allowed.
  #
@@ -17,7 +18,11 @@
 -#user	nobody
 -#group	proc
 +user	gkrellmd
-+group	proc
++group	gkrellmd
+ 
+ # Create a PID file for the running gkrellmd.  Default is no PID file.
+-#pidfile /var/run/gkrellmd.pid
++pidfile /var/run/gkrellmd.pid
  
  # Run in background and detach from the controlling terminal
 -#detach
@@ -25,7 +30,7 @@
  
  # Time interval between checks for various monitors.  If nfs-interval
  # is <= 0 then gkrellmd will not read data for nfs file system types.
-@@ -51,7 +52,7 @@
+@@ -61,7 +62,7 @@ port 19150
  # Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
  # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
  #
@@ -34,7 +39,7 @@
  
  # Configure gkrellm clients to attempt automatic reconnects to a
  # gkrellmd server every reconnect-timeout seconds after a disconnected
-@@ -60,7 +61,7 @@
+@@ -70,7 +71,7 @@ port 19150
  # Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
  # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
  #


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm.spec	4 Oct 2006 22:26:33 -0000	1.4
+++ gkrellm.spec	3 Sep 2007 20:51:14 -0000	1.5
@@ -1,26 +1,20 @@
 Name:           gkrellm
-Version:        2.2.9
-Release:        10%{?dist}
+Version:        2.3.0
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gkrellm.net/
 Source0:        http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
-Patch0:         gkrellm-2.1.24-libdir.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-Patch5:         gkrellm-2.2.9-hwmon.patch
-Patch6:         gkrellm-2.2.9-libsensors.patch
-Patch7:         gkrellm-2.2.9-gkrellmd.conf.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-%ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -63,14 +57,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch1 -p1 -z .config
+%patch2 -p1 -z .sansfont
+%patch3 -p1 -z .width
+%patch4 -p1 -z .libdir2
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -83,15 +73,8 @@
 
 
 %build
-%ifarch %{ix86} x86_64
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_LIBSENSORS"
-SYS_LIBS="-lsensors"
-%else
-CFLAGS="$RPM_OPT_FLAGS"
-SYS_LIBS=
-%endif
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$CFLAGS" SYS_LIBS="$SYS_LIBS"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -116,7 +99,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor gnome             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -184,6 +166,23 @@
 
 
 %changelog
+* Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
+- Update License tag for new Licensing Guidelines compliance
+
+* Sun Jul 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-1
+- New upstream release 2.3.0
+
+* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-3
+- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is
+  available there now.
+
+* Wed Nov  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
+- Add special case for via 686 volt sensors <sigh> (bug 213304)
+
+* Tue Oct 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-1
+- New upstream release 2.2.10
+- Drop integrated lmsensors and sysfs sensors patches
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.2.9-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jul 2006 18:35:32 -0000	1.2
+++ sources	3 Sep 2007 20:51:14 -0000	1.3
@@ -1 +1 @@
-5334155797901724f4eb46a82ad72395  gkrellm-2.2.9.tar.bz2
+8ced6843f4681ad8501fd04285ecff1f  gkrellm-2.3.0.tar.bz2


--- gkrellm-2.1.24-libdir.patch DELETED ---


--- gkrellm-2.2.9-gkrellmd.conf.patch DELETED ---


--- gkrellm-2.2.9-hwmon.patch DELETED ---


--- gkrellm-2.2.9-libsensors.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:13 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:13 -0400
Subject: rpms/kftpgrabber/F-7 kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsDMc005000@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/F-7

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/F-7/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 15:54:19 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:41 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:16 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:16 -0400
Subject: rpms/kftpgrabber/FC-6 kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsGD1005003@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/FC-6

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/FC-6/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 16:18:34 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:43 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 20:54:18 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 3 Sep 2007 16:54:18 -0400
Subject: rpms/kftpgrabber/devel kftpgrabber.spec,1.1,1.2
Message-ID: <200709032054.l83KsIH9005006@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/kftpgrabber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4938/devel

Modified Files:
	kftpgrabber.spec 
Log Message:
Updating licence tag



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/extras/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kftpgrabber.spec	18 May 2007 15:54:19 -0000	1.1
+++ kftpgrabber.spec	3 Sep 2007 20:53:46 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FTP client for K Desktop Environment
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Mon Sep 03 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-3
+- Fix licence tag
 * Sun May 13 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-2
 - Removed INSTALL from devel docs as it is unnecessary file
 * Sat May 12 2007 Johan Cwiklinski <johan at x-tnd.be> 0.8.1-1



From fedora-extras-commits at redhat.com  Mon Sep  3 21:03:33 2007
From: fedora-extras-commits at redhat.com (Paul F. Kunz (pfkeb))
Date: Mon, 3 Sep 2007 17:03:33 -0400
Subject: rpms/HippoDraw/FC-6 HippoDraw.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709032103.l83L3XtC011120@cvs-int.fedora.redhat.com>

Author: pfkeb

Update of /cvs/pkgs/rpms/HippoDraw/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	HippoDraw.spec 
Log Message:
Initial commit.



--- NEW FILE HippoDraw.spec ---
Name:    HippoDraw
Version: 1.21.1
Release: 2%{?dist}
Summary: Interactive and Python scriptable data analysis application

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Group: Applications/Engineering
License: GPL
URL: http://www.slac.stanford.edu/grp/ek/hippodraw/
Source0: ftp://ftp.slac.stanford.edu/users/pfkeb/hippodraw/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires: cfitsio-devel qt-devel desktop-file-utils doxygen graphviz
# in FC7 need graphiz that can generate .gof files
%if 0%{?fedora} >= 7
BuildRequires:graphviz-gd python-numarray
%endif
BuildRequires: tetex-latex tetex-dvips netpbm-progs ghostscript
Requires:  tetex-latex tetex-dvips netpbm-progs ghostscript

%description
HippoDraw is a highly interactive data analysis
environment that can be used as a stand-a-lone application or as a
Python extension module.

%package python
Summary: %{name} Python module
Group: Development/Languages
BuildRequires: boost-devel python-devel python-numarray
Requires: %{name} = %{version}-%{release}
Requires: python-numarray


%description  python
Provides Python module to use %{name} from Python scripts.

%package devel
Summary:  Library and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel boost-devel cfitsio-devel python-numarray

%description devel
The %{name}-devel package contains libraries and header files for
building applications use %{name}.

%package devel-docs
Summary: Class library documentation
Group: Documentation
Requires: %{name}-devel = %{version}-%{release}

%description devel-docs
This package contains the html documentation files for the %{name}
class library.  User documentation is part of the main package.

%prep
%setup -q

%build
# Exclude or avoid packages that might be installed in /usr/local
# Exclude wcslib that might be installed from rpm which is older version.
%{configure} --without-wcslib-lib --without-minuit2-lib --without-root-lib\
    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no
make %{?_smp_mflags}
make docs


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
make install DESTDIR=$RPM_BUILD_ROOT install-docs INSTALL="install -p"

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      qt/app/HippoDraw.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)

%{_bindir}/hippodraw
%{_libdir}/*.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/hippoApp.png
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/LICENSE
%{_datadir}/doc/%{name}-%{version}/DISCLAIMER.rtf
%dir %{_datadir}/doc/%{name}-%{version}/html
%{_datadir}/doc/%{name}-%{version}/html/*.html
%{_datadir}/doc/%{name}-%{version}/html/*.png
%{_datadir}/doc/%{name}-%{version}/html/*.css
%{_datadir}/doc/%{name}-%{version}/html/*.gif
%{_datadir}/doc/%{name}-%{version}/html/hippodraw.adp
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/hippoApp.png

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%exclude %{_includedir}/%{name}/numarray/num_util.h
%{_libdir}/*.so

%files devel-docs
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version}/html/lib

%files python
%defattr(-,root,root,-)
%dir %{python_sitearch}/%{name}
%dir %{python_sitelib}/%{name}
%ifarch x86_64 ppc64
%{python_sitearch}/hippo.pth
%endif
%{python_sitelib}/hippo.pth
%{python_sitearch}/%{name}/hippomodule.*
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo
%{_datadir}/%{name}/examples

%changelog
* Mon Jul 30 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-2
- Use exclude instead of ghost
- declare file site_arch/hippo.pth only on 64 bit platforms

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21.1-1
- fixed python_sitearch and python_sitelib

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-1
- Added require for devel-docs sub package

* Wed Jul 18 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.9-1
- remove some files from install
- remove dependency on cfitsio, it is automaticly generated
- fixed defattr

* Mon Jul 16 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.8-1
- Fixed desktop file

* Thu Jun 28 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.7-2
- Update to 1.20.7

* Sun Apr 22 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.9-2
- lower case filename for the app icon

* Mon Mar 26 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.8-1
- Update to 1.19.8 and fix install of config.h

* Mon Mar 12 2007 Paul F. Kunz <paul_kunz at lac.stanford.edu> - 1.19.6-2
- Added requirements of boost-devel and cfitsio-devel to -devel package


* Sun Mar 11 2007 Paul F. Kunz <Paul_Kunz at slac.stanford.edu> - 1.19.6-1
- Added make docs to build step
- Fix placement of Requires
- add requirement of qt-devel to -devel package

* Sat Mar 10 2007 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.19.5-1
- bump version number of sources
- put disclaimer and license in versioned directory

* Fri Mar  9 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- libaxiswidget.so was removed from sources
- Move rename doc package to devel-docs
- Documentation moved to directory with version in name

* Thu Mar  8 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- desktop file was fixed in sources
- Added build requirement on graphviz
- use install -p on install
- doc package depends on devel to be installed
- Change sitelib to sitearch for Python install

* Mon Mar  5 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- add requirement of latex and accessories for use of it

* Fri Mar  2 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- remove setting of QTDIR
- Use suggested python_sitelib macro
- update icon cache after install and uninstall
- do not use the -p option in post and postun

* Thu Mar  1 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- avoid boost in /usr/local if there

* Sun Oct 22 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.9-1
- Update version
- fix install step

* Wed Oct 11 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-5
- Take ownership of doc directory

* Tue Oct 10 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-4
- Need to own certain directories

* Mon Oct 9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-3

- Rebuild with modified upstream sources which removed explicit
  linking against X libs

- Rebuild with modified upstream source with fix for boost_python
  library

* Mon Oct  9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-2
- Fix incorrect macro in -doc description

* Sat Oct  7 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-1
- Update source version
- Get QTDIR from pkg-config
- remove redundant BuildRequires
- Do not have to expliectly set --prefix

* Wed Oct  4 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-3
- use configure macro
- Use RPM_BUILD_ROOT consistently

* Mon Oct  2 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-2
- removed tab use spaces
- Added documentation to -python subpackage
- Add doc file to -devel subpackage

* Sun Sep 24 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.5-1
- Move documentation to standard place

* Fri Sep 22 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.5-1
- Added desktop file
- Update to 1.18.5

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.4-1
- Get rid of wcslib which has no rpm

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Sort documentation in appropriate packages

* Sun Sep 17 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- added devel package
- made Python package

* Sat Sep 16 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Fixed to install in /usr/
- Make conform to recommended standard


* Sun Jul  2 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.17.6-1
- Add requirement of Minuit2
- Added requirement on cfitsio



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Aug 2007 00:24:33 -0000	1.1
+++ .cvsignore	3 Sep 2007 21:02:59 -0000	1.2
@@ -0,0 +1 @@
+HippoDraw-1.21.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 00:24:33 -0000	1.1
+++ sources	3 Sep 2007 21:03:00 -0000	1.2
@@ -0,0 +1 @@
+59f16e27ca93627da8e5d538fb32dd6e  HippoDraw-1.21.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 21:12:29 2007
From: fedora-extras-commits at redhat.com (Paul F. Kunz (pfkeb))
Date: Mon, 3 Sep 2007 17:12:29 -0400
Subject: rpms/HippoDraw/F-7 HippoDraw.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709032112.l83LCTN9011445@cvs-int.fedora.redhat.com>

Author: pfkeb

Update of /cvs/pkgs/rpms/HippoDraw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11416/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	HippoDraw.spec 
Log Message:
Initial commit



--- NEW FILE HippoDraw.spec ---
Name:    HippoDraw
Version: 1.21.1
Release: 2%{?dist}
Summary: Interactive and Python scriptable data analysis application

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Group: Applications/Engineering
License: GPL
URL: http://www.slac.stanford.edu/grp/ek/hippodraw/
Source0: ftp://ftp.slac.stanford.edu/users/pfkeb/hippodraw/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires: cfitsio-devel qt-devel desktop-file-utils doxygen graphviz
# in FC7 need graphiz that can generate .gof files
%if 0%{?fedora} >= 7
BuildRequires:graphviz-gd python-numarray
%endif
BuildRequires: tetex-latex tetex-dvips netpbm-progs ghostscript
Requires:  tetex-latex tetex-dvips netpbm-progs ghostscript

%description
HippoDraw is a highly interactive data analysis
environment that can be used as a stand-a-lone application or as a
Python extension module.

%package python
Summary: %{name} Python module
Group: Development/Languages
BuildRequires: boost-devel python-devel python-numarray
Requires: %{name} = %{version}-%{release}
Requires: python-numarray


%description  python
Provides Python module to use %{name} from Python scripts.

%package devel
Summary:  Library and header files for %{name} library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel boost-devel cfitsio-devel python-numarray

%description devel
The %{name}-devel package contains libraries and header files for
building applications use %{name}.

%package devel-docs
Summary: Class library documentation
Group: Documentation
Requires: %{name}-devel = %{version}-%{release}

%description devel-docs
This package contains the html documentation files for the %{name}
class library.  User documentation is part of the main package.

%prep
%setup -q

%build
# Exclude or avoid packages that might be installed in /usr/local
# Exclude wcslib that might be installed from rpm which is older version.
%{configure} --without-wcslib-lib --without-minuit2-lib --without-root-lib\
    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no
make %{?_smp_mflags}
make docs


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
make install DESTDIR=$RPM_BUILD_ROOT install-docs INSTALL="install -p"

find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
desktop-file-install --vendor fedora \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      qt/app/HippoDraw.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun 

/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)

%{_bindir}/hippodraw
%{_libdir}/*.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/hippoApp.png
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/LICENSE
%{_datadir}/doc/%{name}-%{version}/DISCLAIMER.rtf
%dir %{_datadir}/doc/%{name}-%{version}/html
%{_datadir}/doc/%{name}-%{version}/html/*.html
%{_datadir}/doc/%{name}-%{version}/html/*.png
%{_datadir}/doc/%{name}-%{version}/html/*.css
%{_datadir}/doc/%{name}-%{version}/html/*.gif
%{_datadir}/doc/%{name}-%{version}/html/hippodraw.adp
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/hippoApp.png

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%exclude %{_includedir}/%{name}/numarray/num_util.h
%{_libdir}/*.so

%files devel-docs
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version}/html/lib

%files python
%defattr(-,root,root,-)
%dir %{python_sitearch}/%{name}
%dir %{python_sitelib}/%{name}
%ifarch x86_64 ppc64
%{python_sitearch}/hippo.pth
%endif
%{python_sitelib}/hippo.pth
%{python_sitearch}/%{name}/hippomodule.*
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%{python_sitelib}/%{name}/*.pyo
%{_datadir}/%{name}/examples

%changelog
* Mon Jul 30 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-2
- Use exclude instead of ghost
- declare file site_arch/hippo.pth only on 64 bit platforms

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21.1-1
- fixed python_sitearch and python_sitelib

* Wed Jul 25 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.21-1
- Added require for devel-docs sub package

* Wed Jul 18 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.9-1
- remove some files from install
- remove dependency on cfitsio, it is automaticly generated
- fixed defattr

* Mon Jul 16 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.8-1
- Fixed desktop file

* Thu Jun 28 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.20.7-2
- Update to 1.20.7

* Sun Apr 22 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.9-2
- lower case filename for the app icon

* Mon Mar 26 2007 Paul F. Kunz <paul_kunz at slac.stanford.edu> - 1.19.8-1
- Update to 1.19.8 and fix install of config.h

* Mon Mar 12 2007 Paul F. Kunz <paul_kunz at lac.stanford.edu> - 1.19.6-2
- Added requirements of boost-devel and cfitsio-devel to -devel package


* Sun Mar 11 2007 Paul F. Kunz <Paul_Kunz at slac.stanford.edu> - 1.19.6-1
- Added make docs to build step
- Fix placement of Requires
- add requirement of qt-devel to -devel package

* Sat Mar 10 2007 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.19.5-1
- bump version number of sources
- put disclaimer and license in versioned directory

* Fri Mar  9 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- libaxiswidget.so was removed from sources
- Move rename doc package to devel-docs
- Documentation moved to directory with version in name

* Thu Mar  8 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.4-1
- desktop file was fixed in sources
- Added build requirement on graphviz
- use install -p on install
- doc package depends on devel to be installed
- Change sitelib to sitearch for Python install

* Mon Mar  5 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- add requirement of latex and accessories for use of it

* Fri Mar  2 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- remove setting of QTDIR
- Use suggested python_sitelib macro
- update icon cache after install and uninstall
- do not use the -p option in post and postun

* Thu Mar  1 2007 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.19.2-1
- avoid boost in /usr/local if there

* Sun Oct 22 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.9-1
- Update version
- fix install step

* Wed Oct 11 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-5
- Take ownership of doc directory

* Tue Oct 10 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.8-4
- Need to own certain directories

* Mon Oct 9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-3

- Rebuild with modified upstream sources which removed explicit
  linking against X libs

- Rebuild with modified upstream source with fix for boost_python
  library

* Mon Oct  9 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-2
- Fix incorrect macro in -doc description

* Sat Oct  7 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.8-1
- Update source version
- Get QTDIR from pkg-config
- remove redundant BuildRequires
- Do not have to expliectly set --prefix

* Wed Oct  4 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-3
- use configure macro
- Use RPM_BUILD_ROOT consistently

* Mon Oct  2 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.6-2
- removed tab use spaces
- Added documentation to -python subpackage
- Add doc file to -devel subpackage

* Sun Sep 24 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.5-1
- Move documentation to standard place

* Fri Sep 22 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.5-1
- Added desktop file
- Update to 1.18.5

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at dhcp-237-226.slac.stanford.edu> - 1.18.4-1
- Get rid of wcslib which has no rpm

* Mon Sep 18 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Sort documentation in appropriate packages

* Sun Sep 17 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- added devel package
- made Python package

* Sat Sep 16 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.18.4-1
- Fixed to install in /usr/
- Make conform to recommended standard


* Sun Jul  2 2006 Paul F. Kunz <pfkeb at kunz-pbdsl3.stanford.edu> - 1.17.6-1
- Add requirement of Minuit2
- Added requirement on cfitsio



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Aug 2007 00:24:33 -0000	1.1
+++ .cvsignore	3 Sep 2007 21:11:55 -0000	1.2
@@ -0,0 +1 @@
+HippoDraw-1.21.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HippoDraw/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Aug 2007 00:24:33 -0000	1.1
+++ sources	3 Sep 2007 21:11:55 -0000	1.2
@@ -0,0 +1 @@
+59f16e27ca93627da8e5d538fb32dd6e  HippoDraw-1.21.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep  3 21:59:01 2007
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Mon, 3 Sep 2007 17:59:01 -0400
Subject: rpms/scrip/F-7 scrip.spec,1.3,1.4
Message-ID: <200709032159.l83Lx1R3012402@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/pkgs/rpms/scrip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378

Modified Files:
	scrip.spec 
Log Message:
sync with the updated scrip in devel


Index: scrip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scrip/F-7/scrip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scrip.spec	1 Sep 2006 03:10:51 -0000	1.3
+++ scrip.spec	3 Sep 2007 21:58:28 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           scrip
 Version:        1.4
-Release:        6%{?dist}
+Release:        9%{?dist}
 Summary:        Spherical Coordinate Remapping and Interpolation Package (SCRIP)
 
 Group:          Applications/Engineering
 #  The license is very similar to BSD with one exception: modified 
 #  sources cannot be redistributed using the "SCRIP" name.
 License:        SCRIP License
-URL:            http://climate.lanl.gov/Software/SCRIP/index.htm
+URL:            http://climate.lanl.gov/Software/SCRIP/
 Source0:        http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz
 Source1:        http://climate.lanl.gov/Software/SCRIP/copyright.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +30,7 @@
 
 %build
 cd source
-%{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-L%{_libdir}/netcdf-3 -lnetcdf"
+%{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-lnetcdff -lnetcdf"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -46,6 +46,15 @@
 %{_bindir}/*
 
 %changelog
+* Sun Aug 26 2007 Ed Hill <ed at eh3.com> - 1.4-9
+- add -lnetcdff for new netcdf v3.6.2
+
+* Sat Aug 25 2007 Ed Hill <ed at eh3.com> - 1.4-8
+- rebuild for BuildID
+
+* Sun Jun 24 2007 Ed Hill <ed at eh3.com> - 1.4-7
+- fix URL (Fedora bz 245388)
+
 * Thu Aug 31 2006 Ed Hill <ed at eh3.com> - 1.4-6
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Mon Sep  3 23:58:06 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 3 Sep 2007 19:58:06 -0400
Subject: devel/pykickstart .cvsignore, 1.64, 1.65 pykickstart.spec, 1.71,
	1.72 sources, 1.71, 1.72
Message-ID: <200709032358.l83Nw6rX026716@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pykickstart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26687

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
- fix a few tracebacks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	31 Aug 2007 14:44:14 -0000	1.64
+++ .cvsignore	3 Sep 2007 23:57:34 -0000	1.65
@@ -1,28 +1 @@
-pykickstart-0.36.tar.gz
-pykickstart-0.39.tar.gz
-pykickstart-0.40.tar.gz
-pykickstart-0.41.tar.gz
-pykickstart-0.42.tar.gz
-pykickstart-0.43.tar.gz
-pykickstart-0.90.tar.gz
-pykickstart-0.91.tar.gz
-pykickstart-0.92.tar.gz
-pykickstart-0.93.tar.gz
-pykickstart-0.94.tar.gz
-pykickstart-0.95.tar.gz
-pykickstart-0.96.tar.gz
-pykickstart-0.97.tar.gz
-pykickstart-0.98.tar.gz
-pykickstart-0.99.tar.gz
-pykickstart-0.100.tar.gz
-pykickstart-1.0.tar.gz
-pykickstart-1.1.tar.gz
-pykickstart-1.2.tar.gz
-pykickstart-1.3.tar.gz
-pykickstart-1.4.tar.gz
-pykickstart-1.5.tar.gz
-pykickstart-1.6.tar.gz
-pykickstart-1.7.tar.gz
-pykickstart-1.8.tar.gz
-pykickstart-1.9.tar.gz
-pykickstart-1.10.tar.gz
+pykickstart-1.11.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/pykickstart.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- pykickstart.spec	31 Aug 2007 14:44:14 -0000	1.71
+++ pykickstart.spec	3 Sep 2007 23:57:34 -0000	1.72
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.10
+Version: 1.11
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -42,6 +42,9 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
+- fix a few tracebacks
+
 * Fri Aug 31 2007 Chris Lumens <clumens at redhat.com> 1.10-1
 - Add network --ipv6=.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pykickstart/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	31 Aug 2007 14:44:14 -0000	1.71
+++ sources	3 Sep 2007 23:57:34 -0000	1.72
@@ -1 +1 @@
-4ac7366f53d8f0cce0836d0aa7bd9e8c  pykickstart-1.10.tar.gz
+52d10943bca9bf61e9a5dd652b2acdca  pykickstart-1.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 00:10:18 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 3 Sep 2007 20:10:18 -0400
Subject: devel/squashfs-tools squashfs-tools.spec,1.13,1.14
Message-ID: <200709040010.l840AIfq000565@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/squashfs-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv542

Modified Files:
	squashfs-tools.spec 
Log Message:
* Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1
- update to 3.2r2



Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/squashfs-tools/squashfs-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- squashfs-tools.spec	20 Mar 2007 19:31:34 -0000	1.13
+++ squashfs-tools.spec	4 Sep 2007 00:09:45 -0000	1.14
@@ -1,8 +1,8 @@
-Summary: squashfs utilities
+Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 3.2
 Release: 1
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
 Source0: squashfs3.2-r2.tar.gz
@@ -26,7 +26,9 @@
 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/usr/sbin/unsquashfs
+install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+
+chmod -x README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,7 +38,7 @@
 %defattr(-,root,root,-)
 %doc README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
 /sbin/mksquashfs
-/usr/sbin/unsquashfs
+%{_sbindir}/unsquashfs
 
 %changelog
 * Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1



From fedora-extras-commits at redhat.com  Tue Sep  4 02:45:52 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 22:45:52 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.59, 1.60 gtkhtml3.spec, 1.99,
	1.100 sources, 1.59, 1.60
Message-ID: <200709040245.l842jq29015158@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
- Update to 3.15.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	28 Aug 2007 10:48:34 -0000	1.59
+++ .cvsignore	4 Sep 2007 02:45:19 -0000	1.60
@@ -1 +1 @@
-gtkhtml-3.15.91.tar.bz2
+gtkhtml-3.15.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gtkhtml3.spec	28 Aug 2007 10:48:34 -0000	1.99
+++ gtkhtml3.spec	4 Sep 2007 02:45:19 -0000	1.100
@@ -8,7 +8,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.15.91
+Version: 3.15.92
 Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -130,6 +130,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
+- Update to 3.15.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 3.15.91-1.fc8
 - Update to 3.15.91
 - Remove patch for Red Hat bug #129212/GNOME bug #262907 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	28 Aug 2007 10:48:34 -0000	1.59
+++ sources	4 Sep 2007 02:45:19 -0000	1.60
@@ -1 +1 @@
-886fcadabbeb22d5757fcb43d0ee3031  gtkhtml-3.15.91.tar.bz2
+a37457a6de11ae2fa6661ecf2ae33958  gtkhtml-3.15.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 02:47:12 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 22:47:12 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.38,1.39
Message-ID: <200709040247.l842lCRM015356@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212/F-7

Modified Files:
	stardict.spec 
Log Message:
fix spec


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stardict.spec	3 Sep 2007 09:36:39 -0000	1.38
+++ stardict.spec	4 Sep 2007 02:46:40 -0000	1.39
@@ -57,7 +57,7 @@
 desktop-file-install --vendor fedora --delete-original	\
   --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
@@ -69,7 +69,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %{_bindir}/stardict
-%{_datadir}/applications/stardict.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/stardict
 %{_libdir}/stardict
 %{_datadir}/idl/*



From fedora-extras-commits at redhat.com  Tue Sep  4 02:47:15 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Mon, 3 Sep 2007 22:47:15 -0400
Subject: rpms/stardict/devel stardict.spec,1.38,1.39
Message-ID: <200709040247.l842lFVV015359@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15212/devel

Modified Files:
	stardict.spec 
Log Message:
fix spec


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stardict.spec	3 Sep 2007 09:36:42 -0000	1.38
+++ stardict.spec	4 Sep 2007 02:46:43 -0000	1.39
@@ -57,7 +57,7 @@
 desktop-file-install --vendor fedora --delete-original	\
   --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 %find_lang %{name}
@@ -69,7 +69,7 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %{_bindir}/stardict
-%{_datadir}/applications/stardict.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/stardict
 %{_libdir}/stardict
 %{_datadir}/idl/*



From fedora-extras-commits at redhat.com  Tue Sep  4 03:06:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:06:10 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.58, 1.59 file-roller.spec,
	1.100, 1.101 sources, 1.59, 1.60
Message-ID: <200709040306.l8436AiX021576@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21551

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	3 Sep 2007 05:28:09 -0000	1.58
+++ .cvsignore	4 Sep 2007 03:05:36 -0000	1.59
@@ -1 +1 @@
-file-roller-2.19.91.tar.bz2
+file-roller-2.19.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- file-roller.spec	3 Sep 2007 05:28:09 -0000	1.100
+++ file-roller.spec	4 Sep 2007 03:05:36 -0000	1.101
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.91
+Version:	2.19.92
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	3 Sep 2007 05:28:09 -0000	1.59
+++ sources	4 Sep 2007 03:05:36 -0000	1.60
@@ -1 +1 @@
-0afe74b6c2b67e30e5fa6ee2256dcead  file-roller-2.19.91.tar.bz2
+f19d29d7406e5773202da1782d7d1d0b  file-roller-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:12:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:12:20 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.29, 1.30 librsvg2.spec, 1.61,
	1.62 sources, 1.30, 1.31
Message-ID: <200709040312.l843CKZR021738@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21704

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Jul 2007 17:31:20 -0000	1.29
+++ .cvsignore	4 Sep 2007 03:11:47 -0000	1.30
@@ -1 +1 @@
-librsvg-2.18.0.tar.bz2
+librsvg-2.18.1.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- librsvg2.spec	23 Aug 2007 17:25:41 -0000	1.61
+++ librsvg2.spec	4 Sep 2007 03:11:47 -0000	1.62
@@ -11,14 +11,14 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.18.0
-Release: 4%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 
 License: 	LGPLv2+
-Group: System Environment/Libraries
+Group: 		System Environment/Libraries
 Source: 	http://download.gnome.org/sources/librsvg/2.18/librsvg-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
-Requires:		gtk2 >= %{gtk2_version}
+Requires:	gtk2 >= %{gtk2_version}
 Requires:	libxml2 >= %{libxml2_version}
 Requires:	freetype >= %{freetype_version}
 Requires:       cairo >= %{cairo_version}
@@ -47,8 +47,8 @@
 
 
 %package devel
-Summary: Libraries and include files for developing with librsvg
-Group: Development/Libraries
+Summary: 	Libraries and include files for developing with librsvg
+Group: 		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk2-devel >= %{gtk2_version}
 Requires:	libxml2-devel >= %{libxml2_version}
@@ -101,7 +101,7 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
+%doc AUTHORS COPYING COPYING.LIB NEWS README
 %{_libdir}/*.so.*
 %{_libdir}/gtk-2.0/*/engines/libsvg.so
 %{_libdir}/gtk-2.0/*/loaders/svg_loader.so
@@ -118,6 +118,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-4
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Jul 2007 17:31:20 -0000	1.30
+++ sources	4 Sep 2007 03:11:47 -0000	1.31
@@ -1 +1 @@
-cf3b600b874c6940594db512b4260382  librsvg-2.18.0.tar.bz2
+ab250b52cffb436e76f763e72f58e03d  librsvg-2.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:16:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:16:14 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.25,
	1.26 gnome-doc-utils.spec, 1.41, 1.42 sources, 1.25, 1.26
Message-ID: <200709040316.l843GE1l021832@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	31 Jul 2007 01:15:18 -0000	1.25
+++ .cvsignore	4 Sep 2007 03:15:41 -0000	1.26
@@ -1 +1 @@
-gnome-doc-utils-0.11.1.tar.bz2
+gnome-doc-utils-0.11.2.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-doc-utils.spec	7 Aug 2007 06:10:31 -0000	1.41
+++ gnome-doc-utils.spec	4 Sep 2007 03:15:41 -0000	1.42
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.11.1
+Version: 0.11.2
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: %{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.11/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.2-1
+- Update to 0.11.2
+
 * Thu Aug  2 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.1-2
 - Update the license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	31 Jul 2007 01:15:18 -0000	1.25
+++ sources	4 Sep 2007 03:15:41 -0000	1.26
@@ -1 +1 @@
-a63c55de0f8f343598dce60d071b2828  gnome-doc-utils-0.11.1.tar.bz2
+6999661ccbca9b0f409f6a735821e447  gnome-doc-utils-0.11.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:16:48 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:16:48 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.70,
	1.71 evolution-data-server-1.9.92-e-passwords.patch, 1.8,
	1.9 evolution-data-server.spec, 1.185, 1.186 sources, 1.70, 1.71
Message-ID: <200709040316.l843GmTo021867@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21829

Modified Files:
	.cvsignore evolution-data-server-1.9.92-e-passwords.patch 
	evolution-data-server.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
- Update to 1.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	28 Aug 2007 14:03:43 -0000	1.70
+++ .cvsignore	4 Sep 2007 03:16:15 -0000	1.71
@@ -1 +1 @@
-evolution-data-server-1.11.91.tar.bz2
+evolution-data-server-1.11.92.tar.bz2

evolution-data-server-1.9.92-e-passwords.patch:

Index: evolution-data-server-1.9.92-e-passwords.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.9.92-e-passwords.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- evolution-data-server-1.9.92-e-passwords.patch	28 Aug 2007 14:03:43 -0000	1.8
+++ evolution-data-server-1.9.92-e-passwords.patch	4 Sep 2007 03:16:15 -0000	1.9
@@ -1,5 +1,5 @@
---- evolution-data-server-1.11.91/libedataserverui/e-passwords.c.e-passwords	2007-08-24 08:48:15.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserverui/e-passwords.c	2007-08-28 15:25:45.000000000 +0200
+--- evolution-data-server-1.11.92/libedataserverui/e-passwords.c.e-passwords	2007-09-02 14:54:22.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserverui/e-passwords.c	2007-09-03 23:13:10.000000000 -0400
 @@ -23,18 +23,29 @@
   */
  
@@ -340,10 +340,7 @@
  static void
 -ep_msg_free(EPassMsg *msg)
 +ep_msg_dispatch (EPassMsg *msg)
- {
--	e_msgport_destroy(msg->msg.reply_port);
--	g_free(msg->password);
--	g_free(msg);
++{
 +	msg->callback (msg);
 +	e_flag_set (msg->done);
 +}
@@ -361,13 +358,11 @@
 +	g_async_queue_unlock (express_queue);
 +
 +	return success;
- }
- 
- static void
--ep_msg_send(EPassMsg *msg)
++}
++
++static void
 +ep_msg_send (EPassMsg *msg)
- {
--	int needidle = 0;
++{
 +	GMainContext *context;
 +
 +	context = g_main_context_default (); 
@@ -377,12 +372,7 @@
 +
 +	if (!(msg->expedite && ep_msg_expedite (msg)))
 +		g_thread_pool_push (dispatcher, msg, NULL);
- 
--	LOCK();
--	e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
--	if (!idle_id) {
--		if (!msg->ismain)
--			idle_id = g_idle_add(ep_idle_dispatch, NULL);
++
 +	/* Don't block the main loop. */
 +	if (g_main_context_is_owner (context))
 +		while (!e_flag_is_set (msg->done))
@@ -393,7 +383,10 @@
 +
 +static void
 +ep_msg_free (EPassMsg *msg)
-+{
+ {
+-	e_msgport_destroy(msg->msg.reply_port);
+-	g_free(msg->password);
+-	g_free(msg);
 +	e_flag_free (msg->done);
 +	g_slice_free (EPassMsg, msg);
 +}
@@ -414,9 +407,10 @@
 +	data->flags = flags;
 +
 +	return data;
-+}
-+
-+static void
+ }
+ 
+ static void
+-ep_msg_send(EPassMsg *msg)
 +ep_dialog_data_free (EPassDialogData *data)
 +{
 +	e_flag_free (data->done);
@@ -425,9 +419,15 @@
 +
 +static gboolean
 +ep_dialog_run (EPassMsg *msg)
-+{
+ {
+-	int needidle = 0;
 +	/* This function must run in the main thread. */
-+
+ 
+-	LOCK();
+-	e_dlist_addtail(&request_list, (EDListNode *)&msg->msg);
+-	if (!idle_id) {
+-		if (!msg->ismain)
+-			idle_id = g_idle_add(ep_idle_dispatch, NULL);
 +	EPassDialogData *data = msg->data;
 +	GtkBox *box;
 +	GtkWidget *dialog;
@@ -524,7 +524,7 @@
  {
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
-@@ -203,11 +436,8 @@ ep_clear_passwords_keyring(EPassMsg *msg
+@@ -203,11 +436,8 @@
  
  	result = gnome_keyring_get_default_keyring_sync (&default_keyring);
  	if (!default_keyring) {
@@ -538,7 +538,7 @@
  	        default_keyring = g_strdup ("default");			
  	}
  
-@@ -232,38 +462,44 @@ ep_clear_passwords_keyring(EPassMsg *msg
+@@ -232,38 +462,44 @@
  	}
  	
  	g_free (default_keyring);
@@ -552,15 +552,15 @@
 +ep_clear_passwords_keyfile (EPassMsg *msg)
  {
 -	char *path;
--
--	path = g_strdup_printf ("/Evolution/Passwords-%s", msg->component);
 +	gchar *group;
 +	GError *error = NULL;
  
--	gnome_config_private_clean_section (path);
--	gnome_config_private_sync_file ("/Evolution");
+-	path = g_strdup_printf ("/Evolution/Passwords-%s", msg->component);
 +	group = ep_key_file_get_group (msg->component);
  
+-	gnome_config_private_clean_section (path);
+-	gnome_config_private_sync_file ("/Evolution");
+-
 -	g_free (path);
 +	g_key_file_remove_group (key_file, group, &error);
 +	if (error == NULL)
@@ -601,7 +601,7 @@
  {
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
-@@ -272,11 +508,8 @@ ep_forget_passwords_keyring(EPassMsg *ms
+@@ -272,11 +508,8 @@
  
  	result = gnome_keyring_get_default_keyring_sync (&default_keyring);
  	if (!default_keyring) {
@@ -615,7 +615,7 @@
  	        default_keyring = g_strdup ("default");			
  	}	
  	d(g_print("Get Default %d\n", result));
-@@ -301,68 +534,53 @@ ep_forget_passwords_keyring(EPassMsg *ms
+@@ -301,68 +534,53 @@
  	g_free (default_keyring);
  
  	/* free up the session passwords */
@@ -711,7 +711,7 @@
  		guint32 item_id;
  
  		if (!strcmp (uri->protocol, "ldap") && !uri->user) {
-@@ -394,48 +612,48 @@ ep_remember_password_keyring(EPassMsg *m
+@@ -394,48 +612,48 @@
  		gnome_keyring_attribute_list_free (attributes);
  
  		/* now remove it from our session hash */
@@ -789,7 +789,7 @@
  }
  
  #ifdef WITH_GNOME_KEYRING
-@@ -446,7 +664,6 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -446,7 +664,6 @@
  	GnomeKeyringResult result;
  	GList *matches = NULL, *tmp;	
  	char *default_keyring = NULL;	
@@ -797,7 +797,7 @@
  	EUri *uri = e_uri_new (msg->key);
  
  	if (!strcmp (uri->protocol, "ldap") && !uri->user) {
-@@ -460,12 +677,7 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -460,12 +677,7 @@
  		uri->user = keycopy;
  	}
  	    
@@ -811,7 +811,7 @@
  
  	if (!uri->host && !uri->user)
  		/* No need to remove from keyring for pass phrases */
-@@ -524,36 +736,45 @@ ep_forget_password_keyring (EPassMsg *ms
+@@ -524,36 +736,45 @@
  	g_free (default_keyring);
  
  exit:
@@ -878,7 +878,7 @@
  
  #ifdef WITH_GNOME_KEYRING
  static void
-@@ -562,11 +783,11 @@ ep_get_password_keyring (EPassMsg *msg)
+@@ -562,11 +783,11 @@
  	char *passwd;
  	GnomeKeyringAttributeList *attributes;
  	GnomeKeyringResult result;
@@ -893,7 +893,7 @@
  	} else {
  		EUri *uri = e_uri_new (msg->key);
  		
-@@ -630,288 +851,154 @@ ep_get_password_keyring (EPassMsg *msg)
+@@ -630,288 +851,154 @@
  		
  		e_uri_free (uri);
  	}
@@ -958,11 +958,6 @@
 -		g_free (okey);
 -		g_free (value);
 -	}
--
--	g_hash_table_insert (passwords, g_strdup (msg->key), g_strdup (msg->oldpass));
--
--	if (!msg->noreply)
--		e_msgport_reply(&msg->msg);
 +#ifdef WITH_GNOME_KEYRING
 +	if (gnome_keyring_is_available ())
 +		ep_get_password_keyring (msg);
@@ -971,36 +966,36 @@
 +#else
 +	ep_get_password_keyfile (msg);
 +#endif
++}
+ 
+-	g_hash_table_insert (passwords, g_strdup (msg->key), g_strdup (msg->oldpass));
++static void
++ep_add_password (EPassMsg *msg)
++{
++	gchar *key = g_strdup (msg->key);
++	gchar *password = g_strdup (msg->password);
+ 
+-	if (!msg->noreply)
+-		e_msgport_reply(&msg->msg);
++	g_hash_table_insert (password_cache, key, password);
  }
  
 -static void ep_ask_password(EPassMsg *msg);
 -
  static void
 -pass_response(GtkDialog *dialog, int response, void *data)
-+ep_add_password (EPassMsg *msg)
++ep_ask_password (EPassMsg *msg)
  {
 -	EPassMsg *msg = data;
 -	int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
 -	EDList pending = E_DLIST_INITIALISER(pending);
 -	EPassMsg *mw, *mn;
-+	gchar *key = g_strdup (msg->key);
-+	gchar *password = g_strdup (msg->password);
- 
--	if (response == GTK_RESPONSE_OK) {
--		msg->password = g_strdup(gtk_entry_get_text((GtkEntry *)msg->entry));
-+	g_hash_table_insert (password_cache, key, password);
-+}
- 
--		if (type != E_PASSWORDS_REMEMBER_NEVER) {
--			int noreply = msg->noreply;
-+static void
-+ep_ask_password (EPassMsg *msg)
-+{
 +	EPassDialogData *data = msg->data;
 +	gchar *password;
 +	gint remember;
  
--			*msg->remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msg->check));
+-	if (response == GTK_RESPONSE_OK) {
+-		msg->password = g_strdup(gtk_entry_get_text((GtkEntry *)msg->entry));
 +	/* Open the express queue for this key.  This allows us to catch
 +	 * incoming operations on this key while waiting for the user to
 +	 * provide a password.  Once we have the password, immediately
@@ -1009,10 +1004,17 @@
 +	express_key = msg->key;
 +	g_async_queue_unlock (express_queue);
  
--			msg->noreply = 1;
+-		if (type != E_PASSWORDS_REMEMBER_NEVER) {
+-			int noreply = msg->noreply;
 +	if (data->flags & E_PASSWORDS_REPROMPT)
 +		ep_get_password (msg);
  
+-			*msg->remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (msg->check));
++	/* Run the password dialog in the main thread. */
++	g_idle_add ((GSourceFunc) ep_dialog_run, msg);
+ 
+-			msg->noreply = 1;
+-
 -			if (*msg->remember || type == E_PASSWORDS_REMEMBER_FOREVER) {
 -				msg->oldpass = msg->password;
 -				ep_add_password(msg);
@@ -1028,18 +1030,26 @@
 -			if (*msg->remember && type == E_PASSWORDS_REMEMBER_FOREVER)
 -				ep_remember_password_file(msg);				    
 -#endif				    
-+	/* Run the password dialog in the main thread. */
-+	g_idle_add ((GSourceFunc) ep_dialog_run, msg);
++	/* Wait for the user to respond. */
++	e_flag_wait (data->done);
  
 -			msg->noreply = noreply;
 -		}
--	}
-+	/* Wait for the user to respond. */
-+	e_flag_wait (data->done);
++	/* If the user cancelled the dialog then we need to dispatch
++	 * any messages that we trapped in the express queue. */
++	if (data->response != GTK_RESPONSE_OK) {
++		g_async_queue_lock (express_queue);
++		express_key = NULL;
++		while ((msg = g_async_queue_try_pop_unlocked (express_queue)))
++			ep_msg_dispatch (msg);
++		g_async_queue_unlock (express_queue);
++		return;
+ 	}
  
 -	gtk_widget_destroy((GtkWidget *)dialog);
 -	password_dialog = NULL;
--
++	remember = data->flags & E_PASSWORDS_REMEMBER_MASK;
+ 
 -	/* ok, here things get interesting, we suck up any pending
 -	 * operations on this specific password, and return the same
 -	 * result or ignore other operations */
@@ -1067,23 +1077,20 @@
 -		}
 -		mw = mn;
 -		mn = (EPassMsg *)mn->msg.ln.next;
-+	/* If the user cancelled the dialog then we need to dispatch
-+	 * any messages that we trapped in the express queue. */
-+	if (data->response != GTK_RESPONSE_OK) {
-+		g_async_queue_lock (express_queue);
-+		express_key = NULL;
-+		while ((msg = g_async_queue_try_pop_unlocked (express_queue)))
-+			ep_msg_dispatch (msg);
-+		g_async_queue_unlock (express_queue);
-+		return;
- 	}
+-	}
 -	UNLOCK();
--
++	if (remember == E_PASSWORDS_REMEMBER_NEVER)
++		goto cleanup;
+ 
 -	if (!msg->noreply)
 -		e_msgport_reply(&msg->msg);
--
++	if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER)
++		ep_add_password (msg);
+ 
 -	ep_idle_dispatch(NULL);
 -}
++	if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER)
++		ep_remember_password (msg);
  
 -static void
 -ep_ask_password(EPassMsg *msg)
@@ -1092,12 +1099,9 @@
 -	int type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
 -	guint noreply = msg->noreply;
 -	AtkObject *a11y;
-+	remember = data->flags & E_PASSWORDS_REMEMBER_MASK;
- 
+-
 -	msg->noreply = 1;
-+	if (remember == E_PASSWORDS_REMEMBER_NEVER)
-+		goto cleanup;
- 
+-
 -	/*password_dialog = (GtkDialog *)e_error_new(msg->parent, "mail:ask-session-password", msg->prompt, NULL);*/
 -	password_dialog = (GtkDialog *)gtk_message_dialog_new (msg->parent,
 -							       0,
@@ -1105,15 +1109,11 @@
 -							       GTK_BUTTONS_OK_CANCEL,
 -							       "%s", msg->prompt);
 -	gtk_window_set_title(GTK_WINDOW(password_dialog), msg->title);
-+	if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER)
-+		ep_add_password (msg);
- 
+-
 -	gtk_widget_ensure_style (GTK_WIDGET (password_dialog));
 -	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->vbox), 0);
 -	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (password_dialog)->action_area), 12);
-+	if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER)
-+		ep_remember_password (msg);
- 
+-
 -	gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK);
 +cleanup:
  
@@ -1271,7 +1271,7 @@
   * 
   * Set the offline-state of the application.  This is a work-around
   * for having the backends fully offline aware, and returns a
-@@ -920,10 +1007,11 @@ e_passwords_shutdown (void)
+@@ -920,10 +1007,11 @@
   * FIXME: This is not a permanent api, review post 2.0.
   **/
  void
@@ -1286,7 +1286,7 @@
  }
  
  /**
-@@ -934,151 +1022,138 @@ e_passwords_set_online(int state)
+@@ -934,151 +1022,138 @@
  void
  e_passwords_forget_passwords (void)
  {
@@ -1322,15 +1322,15 @@
 -	EPassMsg *msg = ep_msg_new(ep_clear_passwords_file);		
 -#endif
 +	EPassMsg *msg;
-+
-+	g_return_if_fail (component != NULL);
-+
-+	msg = ep_msg_new (ep_clear_passwords, FALSE);
-+	msg->component = component;
  
 -	msg->component = component_name;
 -	ep_msg_send(msg);
 -	ep_msg_free(msg);
++	g_return_if_fail (component != NULL);
++
++	msg = ep_msg_new (ep_clear_passwords, FALSE);
++	msg->component = component;
++
 +	ep_msg_send (msg);
 +	ep_msg_free (msg);
  }
@@ -1436,14 +1436,14 @@
  	msg->key = key;
  
 -	ep_msg_send(msg);
--
--	passwd = msg->password;
--	msg->password = NULL;
--	ep_msg_free(msg);
 +	ep_msg_send (msg);
 +	password = msg->password;
 +	ep_msg_free (msg);
  
+-	passwd = msg->password;
+-	msg->password = NULL;
+-	ep_msg_free(msg);
+-
 -	return passwd;
 +	return password;
  }
@@ -1492,7 +1492,7 @@
   * @prompt: prompt string
   * @type: whether or not to offer to remember the password,
   * and for how long.
-@@ -1093,241 +1168,44 @@ e_passwords_add_password (const char *ke
+@@ -1093,245 +1168,44 @@
   * return value is non-%NULL and @remember_type is not
   * E_PASSWORDS_DO_NOT_REMEMBER.
   **/
@@ -1511,8 +1511,10 @@
  			  GtkWindow *parent)
  {
 -	char *passwd;
--	EPassMsg *msg = ep_msg_new(ep_ask_password);
-+	EPassMsg *msg;
+ 	EPassMsg *msg;
+-
+-	g_return_val_if_fail (component_name != NULL, NULL);
+-	g_return_val_if_fail (key != NULL, NULL);
 +	EPassDialogData *data;
 +	gboolean remember;
 +	gchar *password;
@@ -1524,6 +1526,7 @@
  	if ((type & E_PASSWORDS_ONLINE) && !ep_online_state)
  		return NULL;
  
+-	msg = ep_msg_new (ep_ask_password);
 -	msg->title = title;
 -	msg->component = component_name;
 -	msg->key = key;
@@ -1762,8 +1765,8 @@
 -	return (char *)plain;
 +	return password;
  }
---- evolution-data-server-1.11.91/libedataserverui/e-passwords.h.e-passwords	2007-07-05 08:01:52.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserverui/e-passwords.h	2007-08-28 15:32:45.000000000 +0200
+--- evolution-data-server-1.11.92/libedataserverui/e-passwords.h.e-passwords	2007-09-02 14:54:22.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserverui/e-passwords.h	2007-09-03 23:13:10.000000000 -0400
 @@ -28,45 +28,65 @@
  
  G_BEGIN_DECLS
@@ -1861,9 +1864,9 @@
  
  G_END_DECLS
  
---- evolution-data-server-1.11.91/libedataserver/e-msgport.h.e-passwords	2007-07-05 08:01:55.000000000 +0200
-+++ evolution-data-server-1.11.91/libedataserver/e-msgport.h	2007-08-28 15:18:31.000000000 +0200
-@@ -54,7 +54,7 @@ typedef struct _EMsgPort EMsgPort;
+--- evolution-data-server-1.11.92/libedataserver/e-msgport.h.e-passwords	2007-07-05 02:01:55.000000000 -0400
++++ evolution-data-server-1.11.92/libedataserver/e-msgport.h	2007-09-03 23:13:10.000000000 -0400
+@@ -54,7 +54,7 @@
  
  /* header for any message */
  typedef struct _EMsg {


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- evolution-data-server.spec	28 Aug 2007 14:03:43 -0000	1.185
+++ evolution-data-server.spec	4 Sep 2007 03:16:15 -0000	1.186
@@ -26,7 +26,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.11.91
+Version: 1.11.92
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -381,6 +381,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
+- Update to 1.11.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 1.11.91-1.fc8
 - Update to 1.11.91
 - Removed patch for RH bug #215634 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	28 Aug 2007 14:03:43 -0000	1.70
+++ sources	4 Sep 2007 03:16:15 -0000	1.71
@@ -1 +1 @@
-5f405c32980d086091efbcedd4655724  evolution-data-server-1.11.91.tar.bz2
+51fc0b011c240eaefeadbdbcc9517af7  evolution-data-server-1.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:21:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:21:41 -0400
Subject: rpms/libgnomekbd/devel .cvsignore, 1.8, 1.9 libgnomekbd.spec, 1.24, 
	1.25 sources, 1.8, 1.9
Message-ID: <200709040321.l843LfM3022041@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22009

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Aug 2007 00:45:33 -0000	1.8
+++ .cvsignore	4 Sep 2007 03:21:08 -0000	1.9
@@ -1 +1 @@
-libgnomekbd-2.19.90.tar.bz2
+libgnomekbd-2.19.91.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgnomekbd.spec	13 Aug 2007 17:06:36 -0000	1.24
+++ libgnomekbd.spec	4 Sep 2007 03:21:08 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.19.90
-Release:        2%{?dist}
+Version:       	2.19.91
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -11,8 +11,6 @@
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
 Patch5:         libgnomekbd-2.17.2-redraw.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=466301
-Patch6:		bad-free.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,7 +55,6 @@
 %setup -q
 %patch1 -p1 -b .werror
 %patch5 -p1 -b .redraw
-%patch6 -p1 -b .bad-free
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -126,6 +123,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-2
 - Fix a bad free
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Aug 2007 00:45:33 -0000	1.8
+++ sources	4 Sep 2007 03:21:08 -0000	1.9
@@ -1 +1 @@
-1f962042ac9d8f64596e532791b15a29  libgnomekbd-2.19.90.tar.bz2
+9ca7372fba612b99d1e085e648e6c232  libgnomekbd-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:23:56 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:23:56 -0400
Subject: rpms/evolution/devel .cvsignore, 1.76, 1.77 evolution.spec, 1.283, 
	1.284 sources, 1.76, 1.77
Message-ID: <200709040323.l843NueP022203@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22153

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	28 Aug 2007 16:00:34 -0000	1.76
+++ .cvsignore	4 Sep 2007 03:23:24 -0000	1.77
@@ -1 +1 @@
-evolution-2.11.91.tar.bz2
+evolution-2.11.92.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- evolution.spec	29 Aug 2007 22:40:09 -0000	1.283
+++ evolution.spec	4 Sep 2007 03:23:24 -0000	1.284
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.91
-Release: 3%{?dist}
+Version: 2.11.92
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -698,6 +698,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
+- Update to 2.11.92
+
 * Wed Aug 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.91-3.fc8
 - Revise patch for GNOME bug #362638 to fix GNOME bug #357175
   (Evolution fails to close after IMAP alert has been displayed).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	28 Aug 2007 16:00:34 -0000	1.76
+++ sources	4 Sep 2007 03:23:24 -0000	1.77
@@ -1 +1 @@
-aeeedfac1769b5d24a61fb76d40f4b5f  evolution-2.11.91.tar.bz2
+4149faf2ee5f0b0ed10114b076fb0ade  evolution-2.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:26:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:26:27 -0400
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.76,1.77
Message-ID: <200709040326.l843QRr9022314@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22296

Modified Files:
	gtk2-engines.spec 
Log Message:
2.11.7



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gtk2-engines.spec	16 Aug 2007 20:20:55 -0000	1.76
+++ gtk2-engines.spec	4 Sep 2007 03:25:55 -0000	1.77
@@ -1,6 +1,6 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.11.6
+Version:        2.11.7
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.7-1
+- Update to 2.11.7
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-1
 - Update to 2.11.6
 



From fedora-extras-commits at redhat.com  Tue Sep  4 03:29:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:29:52 -0400
Subject: rpms/gtk2-engines/devel .cvsignore,1.38,1.39 sources,1.39,1.40
Message-ID: <200709040329.l843TqeE022422@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22402

Modified Files:
	.cvsignore sources 
Log Message:
update source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	16 Aug 2007 20:20:55 -0000	1.38
+++ .cvsignore	4 Sep 2007 03:29:19 -0000	1.39
@@ -1 +1 @@
-gtk-engines-2.11.6.tar.bz2
+gtk-engines-2.11.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Aug 2007 20:20:55 -0000	1.39
+++ sources	4 Sep 2007 03:29:19 -0000	1.40
@@ -1 +1 @@
-74327bc3f6e26439602bf5fcaf9531ea  gtk-engines-2.11.6.tar.bz2
+fa962bb9be3d50d2d5006696637f4e9a  gtk-engines-2.11.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:32:57 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:32:57 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.36, 1.37 libgtop2.spec, 1.55,
	1.56 sources, 1.36, 1.37
Message-ID: <200709040332.l843WvfS022525@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgtop2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22503

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	10 Jul 2007 14:18:36 -0000	1.36
+++ .cvsignore	4 Sep 2007 03:32:24 -0000	1.37
@@ -1 +1 @@
-libgtop-2.19.5.tar.bz2
+libgtop-2.19.92.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgtop2.spec	22 Aug 2007 18:57:49 -0000	1.55
+++ libgtop2.spec	4 Sep 2007 03:32:24 -0000	1.56
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.19.5
-Release: 	3%{?dist}
+Version: 	2.19.92
+Release: 	1%{?dist}
 License: 	GPLv2+
 URL:            http://download.gnome.org/sources/libgtop/2.19
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 2.19.5-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	10 Jul 2007 14:18:36 -0000	1.36
+++ sources	4 Sep 2007 03:32:24 -0000	1.37
@@ -1 +1 @@
-233dfd63b9dc39f08308e73509edd14d  libgtop-2.19.5.tar.bz2
+12edde75a0b7cf92ac89206f89f9e275  libgtop-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:38:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:38:48 -0400
Subject: rpms/librsvg2/devel .cvsignore, 1.30, 1.31 librsvg2.spec, 1.62,
	1.63 sources, 1.31, 1.32
Message-ID: <200709040338.l843cmsg022654@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22623

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	4 Sep 2007 03:11:47 -0000	1.30
+++ .cvsignore	4 Sep 2007 03:38:15 -0000	1.31
@@ -1 +1 @@
-librsvg-2.18.1.tar.bz2
+librsvg-2.18.2.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- librsvg2.spec	4 Sep 2007 03:11:47 -0000	1.62
+++ librsvg2.spec	4 Sep 2007 03:38:15 -0000	1.63
@@ -11,7 +11,7 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
-Version: 2.18.1
+Version: 2.18.2
 Release: 1%{?dist}
 
 License: 	LGPLv2+
@@ -118,6 +118,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Sep 2007 03:11:47 -0000	1.31
+++ sources	4 Sep 2007 03:38:15 -0000	1.32
@@ -1 +1 @@
-ab250b52cffb436e76f763e72f58e03d  librsvg-2.18.1.tar.bz2
+4691ad687281e943260021272c28043e  librsvg-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:43:21 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Mon, 3 Sep 2007 23:43:21 -0400
Subject: rpms/libedit/devel .cvsignore, 1.4, 1.5 libedit.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709040343.l843hLep022806@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/devel

Modified Files:
	.cvsignore libedit.spec sources 
Log Message:
Initial import into devel.

 Modified Files:
 	devel/.cvsignore devel/libedit.spec devel/sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2007 22:43:13 -0000	1.4
+++ .cvsignore	4 Sep 2007 03:42:48 -0000	1.5
@@ -1 +1 @@
-libedit-20070302-2.10.tar.gz
+libedit-20070831-2.10.tar.gz


Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/libedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libedit.spec	23 Mar 2007 22:43:13 -0000	1.5
+++ libedit.spec	4 Sep 2007 03:42:48 -0000	1.6
@@ -1,95 +1,72 @@
-%define	snap	20070302
+%define snap 20070831
 
-Name:           libedit
-Version:        2.10
-Release:        1.%{snap}cvs%{?dist}
-Summary:        The NetBSD Editline library (libedit)
-
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.thrysoee.dk/editline/
-Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: The NetBSD Editline library
+Name: libedit
+Version: 2.10
+Release: 1.%{snap}cvs%{?dist}
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.thrysoee.dk/editline/
+Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 
-BuildRequires:  ncurses-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: gawk
+BuildRequires: ncurses-devel
 
 %description
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
-
-%package	devel
-Summary:	Development files for %{name}
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ncurses-devel
-
-%description	devel
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
+Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
+It provides generic line editing, history, and tokenization functions, similar
+to those found in GNU Readline.
+
+%package devel
+Summary: Development files for %{name}
+Group: System Environment/Libraries
+
+Requires: %{name} = %{version}-%{release}
+Requires: ncurses-devel
+Requires: pkgconfig
 
+%description devel
 This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog INSTALL THANKS COPYING
-%{_libdir}/*.so.*
+%doc ChangeLog COPYING THANKS
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.a
+%doc examples/fileman.c examples/test.c
+%{_includedir}/histedit.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*
-%{_mandir}/man5/*
+%{_mandir}/man5/editrc.5.gz
 
-%changelog
-* Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.10-1.20070302cvs
-- Take ownership of libedit package.
-- Import libedit 2.10 20070302 snapshot.
-
-* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.9-3.20060603cvs
-- Rebuild for FC6
-
-* Thu Jun 29 2006 Michael J. Knox <michael at knox.net.nz> - 2.9-3.20060603cvs
-- updated to current snapshot
-- fixed incoherent-version-in-changelog rpmlint messages
-
-* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> - 2.9-2.20060213cvs
-- removed licence file I supplied, have requested upstream to provide one
-- removed unrequire build dep
-
-* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-1.20060213cvs
-- removed .la
-- added post and postun calls.
-- fixed package groups and release.
-- added %{name}.COPYING to include NetBSD BSD license.
+%dir %{_includedir}/editline
+%{_includedir}/editline/readline.h
 
-* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-20060103cvs
-- initial package for NetBSD's editline.
+%changelog
+* Sun Sep 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.10-1.20070831cvs
+- Initial build. Imported SPEC from Rawhide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2007 22:43:13 -0000	1.4
+++ sources	4 Sep 2007 03:42:48 -0000	1.5
@@ -1 +1 @@
-c67689f79ceb0e538ecdb0f893c64393  libedit-20070302-2.10.tar.gz
+e8abd1169825efecfccb0f7b4c338bb5  libedit-20070831-2.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 03:43:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:43:40 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.47,
	1.48 gnome-icon-theme.spec, 1.73, 1.74 sources, 1.50, 1.51
Message-ID: <200709040343.l843hebN022846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22780

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	13 Aug 2007 22:36:53 -0000	1.47
+++ .cvsignore	4 Sep 2007 03:43:08 -0000	1.48
@@ -1 +1 @@
-gnome-icon-theme-2.19.90.tar.bz2
+gnome-icon-theme-2.19.91.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-icon-theme.spec	13 Aug 2007 22:36:53 -0000	1.73
+++ gnome-icon-theme.spec	4 Sep 2007 03:43:08 -0000	1.74
@@ -1,6 +1,6 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.19.90
+Version: 2.19.91
 Release: 1%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.19/%{name}-%{version}.tar.bz2
 License: GPL+
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Further correction of the license field


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Aug 2007 22:36:53 -0000	1.50
+++ sources	4 Sep 2007 03:43:08 -0000	1.51
@@ -1 +1 @@
-b93906d1b0f3dde2a142b8aef58226ce  gnome-icon-theme-2.19.90.tar.bz2
+8885d86e508185f1fd807e99f0d1f4fe  gnome-icon-theme-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:47:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:47:39 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.49, 1.50 gnome-themes.spec,
	1.95, 1.96 sources, 1.54, 1.55
Message-ID: <200709040347.l843ldFH022978@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22942

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	13 Aug 2007 21:51:08 -0000	1.49
+++ .cvsignore	4 Sep 2007 03:47:07 -0000	1.50
@@ -1 +1 @@
-gnome-themes-2.19.90.tar.bz2
+gnome-themes-2.19.92.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-themes.spec	13 Aug 2007 19:47:59 -0000	1.95
+++ gnome-themes.spec	4 Sep 2007 03:47:07 -0000	1.96
@@ -2,7 +2,7 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.19.90
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.19/%{name}-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Update the license field


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	13 Aug 2007 21:51:08 -0000	1.54
+++ sources	4 Sep 2007 03:47:07 -0000	1.55
@@ -1,2 +1,2 @@
-b20596f776b30b2b478338e8afdea543  gnome-themes-2.19.90.tar.bz2
+b556ea726a1adbe2bf5f20cea14a9e89  gnome-themes-2.19.92.tar.bz2
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:48:57 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Mon, 3 Sep 2007 23:48:57 -0400
Subject: rpms/libedit/F-7 .cvsignore, 1.4, 1.5 libedit.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709040348.l843mvTH023058@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libedit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23032/F-7

Modified Files:
	.cvsignore libedit.spec sources 
Log Message:
Initial import into F-7.

 Modified Files:
 	F-7/.cvsignore F-7/libedit.spec F-7/sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Mar 2007 22:43:13 -0000	1.4
+++ .cvsignore	4 Sep 2007 03:48:24 -0000	1.5
@@ -1 +1 @@
-libedit-20070302-2.10.tar.gz
+libedit-20070831-2.10.tar.gz


Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/libedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libedit.spec	23 Mar 2007 22:43:13 -0000	1.5
+++ libedit.spec	4 Sep 2007 03:48:24 -0000	1.6
@@ -1,95 +1,72 @@
-%define	snap	20070302
+%define snap 20070831
 
-Name:           libedit
-Version:        2.10
-Release:        1.%{snap}cvs%{?dist}
-Summary:        The NetBSD Editline library (libedit)
-
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.thrysoee.dk/editline/
-Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: The NetBSD Editline library
+Name: libedit
+Version: 2.10
+Release: 1.%{snap}cvs%{?dist}
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.thrysoee.dk/editline/
+Source0: http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
 
-BuildRequires:  ncurses-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: gawk
+BuildRequires: ncurses-devel
 
 %description
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
-
-%package	devel
-Summary:	Development files for %{name}
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ncurses-devel
-
-%description	devel
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line
-editor library provides generic line editing, history, and
-tokenization functions, similar to those found in GNU Readline.
+Libedit is an autotool- and libtoolized port of the NetBSD Editline library.
+It provides generic line editing, history, and tokenization functions, similar
+to those found in GNU Readline.
+
+%package devel
+Summary: Development files for %{name}
+Group: System Environment/Libraries
+
+Requires: %{name} = %{version}-%{release}
+Requires: ncurses-devel
+Requires: pkgconfig
 
+%description devel
 This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog INSTALL THANKS COPYING
-%{_libdir}/*.so.*
+%doc ChangeLog COPYING THANKS
+%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.a
+%doc examples/fileman.c examples/test.c
+%{_includedir}/histedit.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*
-%{_mandir}/man5/*
+%{_mandir}/man5/editrc.5.gz
 
-%changelog
-* Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.10-1.20070302cvs
-- Take ownership of libedit package.
-- Import libedit 2.10 20070302 snapshot.
-
-* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.9-3.20060603cvs
-- Rebuild for FC6
-
-* Thu Jun 29 2006 Michael J. Knox <michael at knox.net.nz> - 2.9-3.20060603cvs
-- updated to current snapshot
-- fixed incoherent-version-in-changelog rpmlint messages
-
-* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> - 2.9-2.20060213cvs
-- removed licence file I supplied, have requested upstream to provide one
-- removed unrequire build dep
-
-* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-1.20060213cvs
-- removed .la
-- added post and postun calls.
-- fixed package groups and release.
-- added %{name}.COPYING to include NetBSD BSD license.
+%dir %{_includedir}/editline
+%{_includedir}/editline/readline.h
 
-* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> - 2.9-20060103cvs
-- initial package for NetBSD's editline.
+%changelog
+* Sun Sep 03 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.10-1.20070831cvs
+- Initial build. Imported SPEC from Rawhide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Mar 2007 22:43:13 -0000	1.4
+++ sources	4 Sep 2007 03:48:24 -0000	1.5
@@ -1 +1 @@
-c67689f79ceb0e538ecdb0f893c64393  libedit-20070302-2.10.tar.gz
+e8abd1169825efecfccb0f7b4c338bb5  libedit-20070831-2.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 03:54:49 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 3 Sep 2007 23:54:49 -0400
Subject: rpms/evolution-exchange/devel .cvsignore, 1.7,
	1.8 evolution-exchange.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200709040354.l843snFq023215@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23169

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2007 16:13:42 -0000	1.7
+++ .cvsignore	4 Sep 2007 03:54:17 -0000	1.8
@@ -1 +1 @@
-evolution-exchange-2.11.91.tar.bz2
+evolution-exchange-2.11.92.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- evolution-exchange.spec	28 Aug 2007 16:13:42 -0000	1.8
+++ evolution-exchange.spec	4 Sep 2007 03:54:17 -0000	1.9
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.11.91
+Version: 2.11.92
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -162,6 +162,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
+- Update to 2.11.92
+
 * Tue Aug 28 2007 Milan Crha <mcrha at redhat.com> - 2.11.91-1.fc8
 - Update to 2.11.91
 - Removed patch for GNOME bug #466987 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Aug 2007 16:13:42 -0000	1.7
+++ sources	4 Sep 2007 03:54:17 -0000	1.8
@@ -1 +1 @@
-4343c780ed7b70683fe1a34fb642e661  evolution-exchange-2.11.91.tar.bz2
+34383a2be637b3baeb058072ef584ca7  evolution-exchange-2.11.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 03:55:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 3 Sep 2007 23:55:01 -0400
Subject: rpms/eog/devel .cvsignore, 1.49, 1.50 eog.spec, 1.94, 1.95 sources, 
	1.49, 1.50
Message-ID: <200709040355.l843t1VD023262@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23192

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	14 Aug 2007 03:35:38 -0000	1.49
+++ .cvsignore	4 Sep 2007 03:54:28 -0000	1.50
@@ -1 +1 @@
-eog-2.19.5.tar.bz2
+eog-2.19.92.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- eog.spec	16 Aug 2007 05:18:41 -0000	1.94
+++ eog.spec	4 Sep 2007 03:54:28 -0000	1.95
@@ -13,8 +13,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.19.5
-Release: 3%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2
 Patch0: eog-2.19.4-svgz.patch
@@ -152,6 +152,9 @@
 %{_libdir}/pkgconfig/eog.pc
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.5-3
 - Hide it from the menus _again_
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	14 Aug 2007 03:35:38 -0000	1.49
+++ sources	4 Sep 2007 03:54:28 -0000	1.50
@@ -1 +1 @@
-7d734ee59cf8168cde9f5a874fdfd0df  eog-2.19.5.tar.bz2
+773960d53b71b4e3c539c139db3bd277  eog-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:02:04 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:02:04 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.22, 1.23 gconf-editor.spec,
	1.45, 1.46 sources, 1.22, 1.23
Message-ID: <200709040402.l84424RW029358@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29318

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Mar 2007 04:36:29 -0000	1.22
+++ .cvsignore	4 Sep 2007 04:01:29 -0000	1.23
@@ -1 +1 @@
-gconf-editor-2.18.0.tar.bz2
+gconf-editor-2.18.2.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gconf-editor.spec	23 Aug 2007 17:43:16 -0000	1.45
+++ gconf-editor.spec	4 Sep 2007 04:01:29 -0000	1.46
@@ -7,8 +7,8 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.18.0
-Release: 3%{?dist}
+Version: 2.18.2
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
@@ -104,6 +104,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-3
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Mar 2007 04:36:29 -0000	1.22
+++ sources	4 Sep 2007 04:01:29 -0000	1.23
@@ -1 +1 @@
-cbaefa1ff8a548a3d381c67aed426fb7  gconf-editor-2.18.0.tar.bz2
+e40f51b3cb2809b882c29d45b71657bd  gconf-editor-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:05:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:05:02 -0400
Subject: rpms/eog/devel eog.spec,1.95,1.96
Message-ID: <200709040405.l84452Yr029504@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469

Modified Files:
	eog.spec 
Log Message:
fix file lists



Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- eog.spec	4 Sep 2007 03:54:28 -0000	1.95
+++ eog.spec	4 Sep 2007 04:04:28 -0000	1.96
@@ -141,7 +141,6 @@
 %{_datadir}/applications/*
 %{_datadir}/omf/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/pixmaps/eog
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_libdir}/eog



From fedora-extras-commits at redhat.com  Tue Sep  4 04:17:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:17:24 -0400
Subject: rpms/pango/devel .cvsignore, 1.62, 1.63 pango.spec, 1.123,
	1.124 sources, 1.62, 1.63
Message-ID: <200709040417.l844HOiV029707@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29676

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	23 Aug 2007 16:52:41 -0000	1.62
+++ .cvsignore	4 Sep 2007 04:16:52 -0000	1.63
@@ -1 +1 @@
-pango-1.18.0.tar.bz2
+pango-1.18.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- pango.spec	23 Aug 2007 16:52:41 -0000	1.123
+++ pango.spec	4 Sep 2007 04:16:52 -0000	1.124
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.18.0
+Version: 1.18.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
+- Update to 1.18.1
+
 * Thu Aug 23 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.18.0-1
 - Update to 1.18.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	23 Aug 2007 16:52:41 -0000	1.62
+++ sources	4 Sep 2007 04:16:52 -0000	1.63
@@ -1 +1 @@
-5a3cbda73be7277a20d97f2bc89b0737  pango-1.18.0.tar.bz2
+282dcff56292359f6a5c75be0b4fe3df  pango-1.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:24:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:24:11 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.4, 1.5 gtksourceview2.spec, 
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709040424.l844OBnW030060@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29991

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
1.90.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2007 14:38:02 -0000	1.4
+++ .cvsignore	4 Sep 2007 04:23:39 -0000	1.5
@@ -1 +1 @@
-gtksourceview-1.90.3.tar.bz2
+gtksourceview-1.90.4.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtksourceview2.spec	7 Aug 2007 20:30:43 -0000	1.6
+++ gtksourceview2.spec	4 Sep 2007 04:23:39 -0000	1.7
@@ -5,8 +5,8 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.3
-Release: 2%{?dist} 
+Version: 1.90.4
+Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
@@ -69,7 +69,7 @@
 
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
-%doc README AUTHORS COPYING NEWS MAINTAINERS ChangeLog
+%doc README AUTHORS COPYING NEWS MAINTAINERS 
 %{_datadir}/gtksourceview-2.0
 %{_libdir}/*.so.*
 
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
+- Update to 1.90.4
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.3-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2007 14:38:02 -0000	1.4
+++ sources	4 Sep 2007 04:23:39 -0000	1.5
@@ -1 +1 @@
-584f6bd1c4cc4411f6be7fe96e0c3af5  gtksourceview-1.90.3.tar.bz2
+d4a1029c968ca61f8f65d3c22d4de07e  gtksourceview-1.90.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:27:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:27:31 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.25, 1.26 gcalctool.spec, 1.46,
	1.47 sources, 1.26, 1.27
Message-ID: <200709040427.l844RVAv030190@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30153

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Aug 2007 18:54:20 -0000	1.25
+++ .cvsignore	4 Sep 2007 04:26:59 -0000	1.26
@@ -1 +1 @@
-gcalctool-5.19.90.tar.bz2
+gcalctool-5.19.92.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gcalctool.spec	13 Aug 2007 18:54:20 -0000	1.46
+++ gcalctool.spec	4 Sep 2007 04:26:59 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.19.90
+Version:        5.19.92
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -56,7 +56,6 @@
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # delete this crap
@@ -97,11 +96,13 @@
 %{_bindir}/gcalctool
 %{_bindir}/gnome-calculator
 %{_datadir}/applications/gnome-gcalctool.desktop
-%{_datadir}/omf/gcalctool/
 %doc %{_mandir}/man1/gcalctool.1.gz
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.92-1
+- Update to 5.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.90-1
 - Update to 5.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Aug 2007 18:54:20 -0000	1.26
+++ sources	4 Sep 2007 04:26:59 -0000	1.27
@@ -1 +1 @@
-237e1b4805cf24ca2a7e5cdf741e4a2f  gcalctool-5.19.90.tar.bz2
+1b2a327311134d830a4b3628b51468f0  gcalctool-5.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:30:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:30:56 -0400
Subject: rpms/gok/devel .cvsignore, 1.24, 1.25 gok.spec, 1.52, 1.53 sources, 
	1.24, 1.25
Message-ID: <200709040430.l844Uupm030296@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30272

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Jul 2007 13:50:10 -0000	1.24
+++ .cvsignore	4 Sep 2007 04:30:23 -0000	1.25
@@ -1 +1 @@
-gok-1.3.1.tar.bz2
+gok-1.3.2.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gok.spec	29 Aug 2007 03:55:21 -0000	1.52
+++ gok.spec	4 Sep 2007 04:30:23 -0000	1.53
@@ -2,8 +2,8 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -110,7 +110,6 @@
 %{_bindir}/create-branching-keyboard
 %{_libdir}/bonobo/servers/GNOME_Gok.server
 %{_datadir}/gok
-%{_datadir}/omf/gok
 %{_datadir}/icons/hicolor/48x48/apps/gok.png
 %exclude %{_datadir}/applications/gok.desktop
 
@@ -122,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.2-1
+- Update to 1.3.2
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.1-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Jul 2007 13:50:10 -0000	1.24
+++ sources	4 Sep 2007 04:30:23 -0000	1.25
@@ -1 +1 @@
-4d985fe794aa794c6ab0c9efb1825af4  gok-1.3.1.tar.bz2
+643a6ef0e1752b41d4a3d2415c9cb174  gok-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 04:39:04 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:39:04 -0400
Subject: rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.13,
	1.14 evolution-2.9.1-kill-ememory.patch, 1.3, 1.4 evolution.spec,
	1.284, 1.285 evolution-2.11.91-compilation-breakage.patch, 1.1, NONE
Message-ID: <200709040439.l844d4X9030590@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30562

Modified Files:
	evolution-2.8.1-kill-ethread.patch 
	evolution-2.9.1-kill-ememory.patch evolution.spec 
Removed Files:
	evolution-2.11.91-compilation-breakage.patch 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92


evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- evolution-2.8.1-kill-ethread.patch	29 Aug 2007 22:40:09 -0000	1.13
+++ evolution-2.8.1-kill-ethread.patch	4 Sep 2007 04:39:01 -0000	1.14
@@ -1,4893 +1,4256 @@
-diff -up evolution-2.11.91/mail/mail-send-recv.c.kill-ethread evolution-2.11.91/mail/mail-send-recv.c
---- evolution-2.11.91/mail/mail-send-recv.c.kill-ethread	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.91/mail/mail-send-recv.c	2007-08-29 17:39:34.000000000 -0400
-@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d,
- /* ********************************************************************** */
+--- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,32 +44,30 @@
  
- struct _refresh_folders_msg {
+ 
+ struct _folder_unsub_t {
 -	struct _mail_msg msg;
 +	MailMsg base;
- 
- 	struct _send_info *info;
- 	GPtrArray *folders;
- 	CamelStore *store;
+ 	
+ 	char *uri;
  };
  
 -static char *
--refresh_folders_desc (struct _mail_msg *mm, int done)
+-folder_unsubscribe__desc (struct _mail_msg *mm, int done)
 +static gchar *
-+refresh_folders_desc (struct _refresh_folders_msg *m)
- {
- 	return g_strdup_printf(_("Checking for new mail"));
- }
- 
- static void
--refresh_folders_get (struct _mail_msg *mm)
-+refresh_folders_exec (struct _refresh_folders_msg *m)
++folder_unsubscribe_desc (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 	CamelFolder *folder;
- 	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri);
++	return g_strdup_printf (
++		_("Unsubscribing from folder \"%s\""), msg->uri);
  }
  
  static void
--refresh_folders_got (struct _mail_msg *mm)
-+refresh_folders_done (struct _refresh_folders_msg *m)
+-folder_unsubscribe__unsub (struct _mail_msg *mm)
++folder_unsubscribe_exec (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
--
- 	receive_done("", m->info);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+ 	extern CamelSession *session;
+ 	const char *path = NULL;
+ 	CamelStore *store;
+ 	CamelURL *url;
+ 	
+-	if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex)))
++	if (!(store = camel_session_get_store (session, msg->uri, &mm->ex)))
+ 		return;
+ 	
+-	url = camel_url_new (unsub->uri, NULL);
++	url = camel_url_new (msg->uri, NULL);
+ 	if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+ 		path = url->fragment;
+ 	else if (url->path && url->path[0])
+@@ -82,18 +80,17 @@
  }
  
  static void
--refresh_folders_free (struct _mail_msg *mm)
-+refresh_folders_free (struct _refresh_folders_msg *m)
+-folder_unsubscribe__free (struct _mail_msg *mm)
++folder_unsubscribe_free (struct _folder_unsub_t *msg)
  {
--	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
- 	int i;
- 
- 	for (i=0;i<m->folders->len;i++)
-@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg *
- 	camel_object_unref(m->store);
+-	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
+-	
+-	g_free (unsub->uri);
++	g_free (msg->uri);
  }
  
--static struct _mail_msg_op refresh_folders_op = {
--	refresh_folders_desc,
--	refresh_folders_get,
--	refresh_folders_got,
--	refresh_folders_free,
-+static MailMsgInfo refresh_folders_info = {
-+	sizeof (struct _refresh_folders_msg),
-+	(MailMsgDescFunc) refresh_folders_desc,
-+	(MailMsgExecFunc) refresh_folders_exec,
-+	(MailMsgDoneFunc) refresh_folders_done,
-+	(MailMsgFreeFunc) refresh_folders_free
+-static struct _mail_msg_op unsubscribe_op = {
+-	folder_unsubscribe__desc,
+-	folder_unsubscribe__unsub,
+-	NULL,
+-	folder_unsubscribe__free,
++static MailMsgInfo unsubscribe_info = {
++	sizeof (struct _folder_unsub_t),
++	(MailMsgDescFunc) folder_unsubscribe_desc,
++	(MailMsgExecFunc) folder_unsubscribe_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) folder_unsubscribe_free
  };
  
- static void
-@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore
  
- 		get_folders(store, folders, info);
+@@ -105,8 +102,8 @@
+ 	if (target->uri == NULL)
+ 		return;
+ 	
+-	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
++	unsub = mail_msg_new (&unsubscribe_info);
+ 	unsub->uri = g_strdup (target->uri);
+ 	
+-	e_thread_put (mail_thread_new, (EMsg *) unsub);
++	mail_msg_unordered_push (unsub);
+ }
+--- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-09-02 14:56:39.000000000 -0400
++++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c	2007-09-04 00:19:08.000000000 -0400
+@@ -44,7 +44,7 @@
+ 		return;
+ 	}
+ 	
+-	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new);
++	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push);
+ }
  
--		m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m));
-+		m = mail_msg_new(&refresh_folders_info);
- 		m->store = store;
- 		camel_object_ref(store);
- 		m->folders = folders;
- 		m->info = sinfo;
+ static void
+--- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread	2007-09-02 14:56:45.000000000 -0400
++++ evolution-2.11.92/plugins/save-attachments/save-attachments.c	2007-09-04 00:19:08.000000000 -0400
+@@ -403,5 +403,5 @@
+ 	camel_object_ref(data->folder);
+ 	data->uid = g_strdup(target->uids->pdata[0]);
  
--		e_thread_put(mail_thread_new, (EMsg *)m);
-+		mail_msg_unordered_push (m);
- 	} else {
- 		receive_done ("", data);
- 	}
-diff -up evolution-2.11.91/mail/mail-component.c.kill-ethread evolution-2.11.91/mail/mail-component.c
---- evolution-2.11.91/mail/mail-component.c.kill-ethread	2007-08-24 02:49:43.000000000 -0400
-+++ evolution-2.11.91/mail/mail-component.c	2007-08-29 17:39:34.000000000 -0400
-@@ -1005,7 +1005,7 @@ impl_handleURI (PortableServer_Servant s
- 		if (camel_url_get_param(url, "uid") != NULL) {
- 			char *curi = em_uri_to_camel(uri);
+-	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
++	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
+ }
+--- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
++++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-04 00:19:08.000000000 -0400
+@@ -121,7 +121,7 @@
+ }
  
--			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new);
-+			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push);
- 			g_free(curi);
- 		} else {
- 			g_warning("email uri's must include a uid parameter");
-diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/mail-ops.c
---- evolution-2.11.91/mail/mail-ops.c.kill-ethread	2007-07-05 02:09:38.000000000 -0400
-+++ evolution-2.11.91/mail/mail-ops.c	2007-08-29 17:39:34.000000000 -0400
-@@ -75,7 +75,7 @@
- /* used for both just filtering a folder + uid's, and for filtering a whole folder */
- /* used both for fetching mail, and for filtering mail */
- struct _filter_mail_msg {
+ struct _EMCreateFolder {
 -	struct _mail_msg msg;
 +	MailMsg base;
  	
- 	CamelFolder *source_folder; /* where they come from */
[...12250 lines suppressed...]
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre
- 				  G_CALLBACK (cal_opened_cb),
- 				  ca);
- 	}	
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state++;
+ 	if (busy_state == 1) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
  
- /**
-@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
- void
- alarm_queue_add_client (ECal *client)
+ void mail_disable_stop(void)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_add_async;
--
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	g_object_ref (client);
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_add_async;
-+	msg->client = g_object_ref (client);
+-	struct _mail_msg *m;
++	MailMsg *m;
  
--	d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
--	e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+	message_push ((Message *) msg);
+ 	MAIL_MT_LOCK(status_lock);
+ 	busy_state--;
+ 	if (busy_state == 0) {
+-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
+-		e_msgport_put(mail_gui_port, (EMsg *)m);
++		m = mail_msg_new(&set_busy_info);
++		mail_msg_main_loop_push(m);
+ 	}
+ 	MAIL_MT_UNLOCK(status_lock);
  }
+@@ -930,7 +911,7 @@
+ /* ******************************************************************************** */
  
- /* Removes a component an its alarms */
-@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
-  * Removes a calendar client from the alarm queueing system.
-  **/
- static void
--alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
-+alarm_queue_remove_async (struct _alarm_client_msg *msg)
- {
- 	ClientAlarms *ca;
--	struct _alarm_client_msg *list = msg->data;
--	ECal *client = list->client;
-+	ECal *client = msg->client;
+ struct _op_status_msg {
+-	struct _mail_msg msg;
++	MailMsg base;
  
- 	g_return_if_fail (alarm_queue_inited);
- 	g_return_if_fail (client != NULL);
-@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al
- 	g_free (ca);
+ 	struct _CamelOperation *op;
+ 	char *what;
+@@ -938,16 +919,16 @@
+ 	void *data;
+ };
  
- 	g_hash_table_remove (client_alarms_hash, client);
-+
-+	g_slice_free (struct _alarm_client_msg, msg);
+-static void do_op_status(struct _mail_msg *mm)
++static void
++op_status_exec (struct _op_status_msg *m)
+ {
+ 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
+-	struct _mail_msg *msg;
+-	struct _mail_msg_priv *data;
++	MailMsg *msg;
++	MailMsgPrivate *data;
+ 	char *out, *p, *o, c;
+ 	int pc;
+ 	
+-	g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ()));
++	g_return_if_fail (mail_in_main_thread ());
+ 	
+ 	MAIL_MT_LOCK (mail_msg_lock);
+ 	
+@@ -986,8 +967,8 @@
+ 				progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
+ 			
+ 			MAIL_MT_UNLOCK (mail_msg_lock);
+-			if (msg->ops->describe_msg)
+-				what = msg->ops->describe_msg (msg, FALSE);
++			if (msg->info->desc)
++				what = msg->info->desc (msg);
+ 			/* uncommenting because message is not very useful for a user, see bug 271734*/
+ 			else {
+ 				what = g_strdup("");
+@@ -1001,11 +982,7 @@
+ 			MAIL_MT_LOCK (mail_msg_lock);
+ 			if (data->activity_state == 3) {
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+-				if (msg->cancel)
+-					camel_operation_unref (msg->cancel);
+-				camel_exception_clear (&msg->ex);
+-				g_free (msg->priv);
+-				g_free (msg);
++				mail_msg_free (msg);
+ 			} else {
+ 				data->activity_state = 2;
+ 				MAIL_MT_UNLOCK (mail_msg_lock);
+@@ -1021,18 +998,17 @@
  }
  
- /** alarm_queue_remove_client
-@@ -2156,22 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
- void
- alarm_queue_remove_client (ECal *client, gboolean immediately)
+ static void
+-do_op_status_free (struct _mail_msg *mm)
++op_status_free (struct _op_status_msg *m)
  {
--	AlarmMsg *msg;
--	struct _alarm_client_msg *list;
-+	struct _alarm_client_msg *msg;
- 
--	/* These two structures will be freed by the msg destroy function*/
--	msg = malloc (sizeof (AlarmMsg));
--	msg->receive_msg = alarm_queue_remove_async;
+-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
 -
--	list = malloc (sizeof (struct _alarm_client_msg));
--	list->client = client;
--	msg->data = list;
-+	msg = g_slice_new (struct _alarm_client_msg);
-+	msg->header.func = (MessageFunc) alarm_queue_remove_async;
-+	msg->client = client;
+ 	g_free (m->what);
+ }
  
--	d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
- 	if (immediately)
--		alarm_queue_remove_async (NULL, msg, NULL);
-+		alarm_queue_remove_async (msg);
- 	else
--		e_thread_put(alarm_operation_thread, (EMsg *)msg);
-+		message_push ((Message *) msg);
+-static struct _mail_msg_op op_status_op = {
+-	NULL,
+-	do_op_status,
+-	NULL,
+-	do_op_status_free,
++static MailMsgInfo op_status_info = {
++	sizeof (struct _op_status_msg),
++	(MailMsgDescFunc) NULL,
++	(MailMsgExecFunc) op_status_exec,
++	(MailMsgDoneFunc) NULL,
++	(MailMsgFreeFunc) op_status_free
+ };
+ 
+ static void
+@@ -1042,7 +1018,7 @@
+ 	
+ 	d(printf("got operation statys: %s %d%%\n", what, pc));
+ 
+-	m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
++	m = mail_msg_new(&op_status_info);
+ 	m->op = op;
+ 	m->what = g_strdup(what);
+ 	switch (pc) {
+@@ -1055,7 +1031,7 @@
+ 	}
+ 	m->pc = pc;
+ 	m->data = data;
+-	e_msgport_put(mail_gui_port, (EMsg *)m);
++	mail_msg_main_loop_push(m);
  }
  
- /* Update non-time related variables for various structures on modification of an existing component 
+ /* ******************** */

evolution-2.9.1-kill-ememory.patch:

Index: evolution-2.9.1-kill-ememory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.9.1-kill-ememory.patch	4 Jun 2007 20:07:28 -0000	1.3
+++ evolution-2.9.1-kill-ememory.patch	4 Sep 2007 04:39:01 -0000	1.4
@@ -30,7 +30,7 @@
 -	default:
 -		string = NULL;
 -		index = NORMALISED_LAST;
--		g_assert_not_reached ();
+-		g_warning ("Should not be reached\n");
 -	}
 -	
 -	/* slight optimisation */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- evolution.spec	4 Sep 2007 03:23:24 -0000	1.284
+++ evolution.spec	4 Sep 2007 04:39:01 -0000	1.285
@@ -121,9 +121,6 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# The usual compilation breakage...
-Patch35: evolution-2.11.91-compilation-breakage.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -255,7 +252,6 @@
 %patch31 -p1 -b .meeting-list-view
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .compilation-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib


--- evolution-2.11.91-compilation-breakage.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 04:47:30 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:47:30 -0400
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.11.92-compilation-breakage.patch, NONE,
	1.1 evolution-exchange.spec, 1.9, 1.10
Message-ID: <200709040447.l844lUqG030738@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30713

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.11.92-compilation-breakage.patch 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92


evolution-exchange-2.11.92-compilation-breakage.patch:

--- NEW FILE evolution-exchange-2.11.92-compilation-breakage.patch ---
--- evolution-exchange-2.11.92/calendar/e-cal-backend-exchange.c.compilation-breakage	2007-09-04 00:44:22.000000000 -0400
+++ evolution-exchange-2.11.92/calendar/e-cal-backend-exchange.c	2007-09-04 00:45:07.000000000 -0400
@@ -46,6 +46,7 @@
 #include <mapi.h>
 
 #include <e-folder-exchange.h>
+#include <exchange-account.h>
 #include "exchange-component.h"
 #include <exchange-hierarchy.h>
 


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- evolution-exchange.spec	4 Sep 2007 03:54:17 -0000	1.9
+++ evolution-exchange.spec	4 Sep 2007 04:46:50 -0000	1.10
@@ -50,6 +50,9 @@
 # Remove deprecated e_passwords_shutdown().
 Patch15: evolution-exchange-2.11.4-e-passwords.patch
 
+# The usual compilation breakage...
+Patch16: evolution-exchange-2.11.91-compilation-breakage.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -89,6 +92,7 @@
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
+%patch16 -p1 -b .compilation-breakage
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"



From fedora-extras-commits at redhat.com  Tue Sep  4 04:49:43 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 00:49:43 -0400
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.10,1.11
Message-ID: <200709040449.l844nhlv030843@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825

Modified Files:
	evolution-exchange.spec 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- evolution-exchange.spec	4 Sep 2007 04:46:50 -0000	1.10
+++ evolution-exchange.spec	4 Sep 2007 04:49:10 -0000	1.11
@@ -51,7 +51,7 @@
 Patch15: evolution-exchange-2.11.4-e-passwords.patch
 
 # The usual compilation breakage...
-Patch16: evolution-exchange-2.11.91-compilation-breakage.patch
+Patch16: evolution-exchange-2.11.92-compilation-breakage.patch
 
 ### Dependencies ###
 



From fedora-extras-commits at redhat.com  Tue Sep  4 04:58:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 00:58:56 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.4, 1.5 pygtksourceview.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200709040458.l844wunf031084@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31056

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
1.90.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2007 15:01:37 -0000	1.4
+++ .cvsignore	4 Sep 2007 04:58:19 -0000	1.5
@@ -1 +1 @@
-pygtksourceview-1.90.3.tar.bz2
+pygtksourceview-1.90.4.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pygtksourceview.spec	1 Aug 2007 16:28:47 -0000	1.7
+++ pygtksourceview.spec	4 Sep 2007 04:58:19 -0000	1.8
@@ -5,7 +5,7 @@
 %define gtksourceview_version 1.90.3
 
 Name:           pygtksourceview
-Version:        1.90.3
+Version:        1.90.4
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
+- Update to 1.90.4
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.3-1
 - Update to 1.90.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2007 15:01:37 -0000	1.4
+++ sources	4 Sep 2007 04:58:19 -0000	1.5
@@ -1 +1 @@
-a7f1c81c4637550a4bc2c3ee2a3182b7  pygtksourceview-1.90.3.tar.bz2
+dd8fcd11ba555ed6444bfffcd7cffe45  pygtksourceview-1.90.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:03:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:03:50 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.60, 1.61 gnome-utils.spec,
	1.151, 1.152 sources, 1.64, 1.65
Message-ID: <200709040503.l8453op1004656@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4630

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	13 Aug 2007 19:09:18 -0000	1.60
+++ .cvsignore	4 Sep 2007 05:03:17 -0000	1.61
@@ -1 +1 @@
-gnome-utils-2.19.90.tar.bz2
+gnome-utils-2.19.91.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- gnome-utils.spec	23 Aug 2007 17:54:11 -0000	1.151
+++ gnome-utils.spec	4 Sep 2007 05:03:17 -0000	1.152
@@ -1,5 +1,5 @@
-%define glib2_version 2.9.1
-%define gtk2_version 2.6.0
+%define glib2_version 2.13.3
+%define gtk2_version 2.10.0
 %define desktop_file_utils_version 0.9
 %define gnome_doc_utils_version 0.3.2
 %define libgnome_version 2.13.7
@@ -9,8 +9,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.90
-Release:        2%{?dist}
+Version:        2.19.91
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -111,14 +111,11 @@
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  --remove-category Application				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --copy-generic-name-to-name				    \
-  --remove-category Application				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
 
 %find_lang gnome-utils-2.0 --all-name --with-gnome
@@ -182,10 +179,12 @@
 %files -f gnome-utils-2.0.lang
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
-%doc gnome-dictionary/AUTHORS gnome-dictionary/README
+%doc gnome-dictionary/AUTHORS 
+%doc gnome-dictionary/README
 %doc gsearchtool/AUTHORS
 %doc gfloppy/AUTHORS
-%doc baobab/AUTHORS baobab/README
+%doc baobab/AUTHORS 
+%doc baobab/README
 %{_sysconfdir}/security/console.apps/gnome-system-log
 %{_sysconfdir}/pam.d/gnome-system-log
 %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
@@ -228,12 +227,6 @@
 %{_mandir}/man1/gnome-system-log.1.gz
 %{_mandir}/man1/gfloppy.1.gz
 %{_mandir}/man1/baobab.1.gz
-%{_datadir}/omf/gnome-dictionary/
-%{_datadir}/omf/gnome-search-tool/
-%{_datadir}/omf/gnome-system-log/
-%{_datadir}/omf/gfloppy/
-%{_datadir}/omf/baobab/
-
 
 %files devel
 %{_libdir}/libgdict-1.0.so
@@ -243,6 +236,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1:2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	13 Aug 2007 19:09:18 -0000	1.64
+++ sources	4 Sep 2007 05:03:17 -0000	1.65
@@ -1 +1 @@
-45b4cd75d077a425b3212bf1d38d5192  gnome-utils-2.19.90.tar.bz2
+b1d4fd889d9a556f11f17a06ebb8ef81  gnome-utils-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:05:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:05:03 -0400
Subject: rpms/pygtksourceview/devel pygtksourceview.spec,1.8,1.9
Message-ID: <200709040505.l845535X004739@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4669

Modified Files:
	pygtksourceview.spec 
Log Message:
Bump required gtksourceview version



Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygtksourceview.spec	4 Sep 2007 04:58:19 -0000	1.8
+++ pygtksourceview.spec	4 Sep 2007 05:04:29 -0000	1.9
@@ -2,7 +2,7 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.3
+%define gtksourceview_version 1.90.4
 
 Name:           pygtksourceview
 Version:        1.90.4



From fedora-extras-commits at redhat.com  Tue Sep  4 05:06:02 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 4 Sep 2007 01:06:02 -0400
Subject: rpms/evolution/devel evolution.spec,1.285,1.286
Message-ID: <200709040506.l84562nY004831@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801

Modified Files:
	evolution.spec 
Log Message:

* Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
- Update to 2.11.92



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- evolution.spec	4 Sep 2007 04:39:01 -0000	1.285
+++ evolution.spec	4 Sep 2007 05:05:26 -0000	1.286
@@ -523,6 +523,7 @@
 %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
 %{_libdir}/gnome-pilot/conduits/e-address.conduit
 
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
 %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
 %{_libdir}/gnome-pilot/conduits/e-calendar.conduit
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:07:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:07:39 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.30, 1.31 gnome-keyring.spec, 
	1.53, 1.54 sources, 1.30, 1.31
Message-ID: <200709040507.l8457d6M004933@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4909

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Aug 2007 00:55:47 -0000	1.30
+++ .cvsignore	4 Sep 2007 05:07:06 -0000	1.31
@@ -1 +1 @@
-gnome-keyring-2.19.90.tar.bz2
+gnome-keyring-2.19.91.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-keyring.spec	13 Aug 2007 00:55:47 -0000	1.53
+++ gnome-keyring.spec	4 Sep 2007 05:07:06 -0000	1.54
@@ -2,7 +2,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.19.90
+Version: 2.19.91
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Aug 2007 00:55:47 -0000	1.30
+++ sources	4 Sep 2007 05:07:06 -0000	1.31
@@ -1 +1 @@
-4a33ec4a99d0bafb791ca37740987e0a  gnome-keyring-2.19.90.tar.bz2
+31859dc08b8034fe95a32d461904ce52  gnome-keyring-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:09:44 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Tue, 4 Sep 2007 01:09:44 -0400
Subject: rpms/stardict/F-7 stardict.spec,1.39,1.40
Message-ID: <200709040509.l8459i6t005039@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5004/F-7

Modified Files:
	stardict.spec 
Log Message:
small change


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stardict.spec	4 Sep 2007 02:46:40 -0000	1.39
+++ stardict.spec	4 Sep 2007 05:09:11 -0000	1.40
@@ -55,7 +55,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor fedora --delete-original	\
-  --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:09:48 2007
From: fedora-extras-commits at redhat.com (Hu Zheng (zhu))
Date: Tue, 4 Sep 2007 01:09:48 -0400
Subject: rpms/stardict/devel stardict.spec,1.39,1.40
Message-ID: <200709040509.l8459m5f005042@cvs-int.fedora.redhat.com>

Author: zhu

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5004/devel

Modified Files:
	stardict.spec 
Log Message:
small change


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- stardict.spec	4 Sep 2007 02:46:43 -0000	1.39
+++ stardict.spec	4 Sep 2007 05:09:15 -0000	1.40
@@ -55,7 +55,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor fedora --delete-original	\
-  --add-category X-Red-Hat-Base				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 



From fedora-extras-commits at redhat.com  Tue Sep  4 05:14:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:14:35 -0400
Subject: rpms/gthumb/devel .cvsignore, 1.31, 1.32 gthumb.spec, 1.78,
	1.79 sources, 1.32, 1.33
Message-ID: <200709040514.l845EZPm005100@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5073

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
2.10.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	28 Jun 2007 02:47:19 -0000	1.31
+++ .cvsignore	4 Sep 2007 05:14:02 -0000	1.32
@@ -1 +1 @@
-gthumb-2.10.5.tar.bz2
+gthumb-2.10.6.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gthumb.spec	28 Aug 2007 21:44:53 -0000	1.78
+++ gthumb.spec	4 Sep 2007 05:14:02 -0000	1.79
@@ -10,8 +10,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.10.5
-Release: 5%{?dist}
+Version: 2.10.6
+Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -128,10 +128,12 @@
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*
-%{_datadir}/omf/*
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.6-1
+- Update to 2.10.6
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.10.5-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	28 Jun 2007 02:47:19 -0000	1.32
+++ sources	4 Sep 2007 05:14:02 -0000	1.33
@@ -1 +1 @@
-5b9a050da06abecce058d9fca57d5307  gthumb-2.10.5.tar.bz2
+6a52800a3adc55a705c9f7f38de9182a  gthumb-2.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:18:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:18:09 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.26, 1.27 gnome-mag.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <200709040518.l845I9vq005232@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5205

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Jun 2007 18:13:08 -0000	1.26
+++ .cvsignore	4 Sep 2007 05:17:36 -0000	1.27
@@ -1 +1 @@
-gnome-mag-0.14.6.tar.bz2
+gnome-mag-0.14.8.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-mag.spec	29 Aug 2007 03:53:02 -0000	1.48
+++ gnome-mag.spec	4 Sep 2007 05:17:36 -0000	1.49
@@ -2,8 +2,8 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.6
-Release: 2%{?dist}
+Version: 0.14.8
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -73,6 +73,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.8-1
+- Update to 0.14.8
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.14.6-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Jun 2007 18:13:08 -0000	1.27
+++ sources	4 Sep 2007 05:17:36 -0000	1.28
@@ -1 +1 @@
-c5eafb3c492d2b84c37b9a12e3b7a19e  gnome-mag-0.14.6.tar.bz2
+b0d784200b99a96ecc0304095e31dd55  gnome-mag-0.14.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:22:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:22:20 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.41,
	1.42 gnome-screensaver.spec, 1.162, 1.163 sources, 1.44, 1.45
Message-ID: <200709040522.l845MKvZ005342@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.19.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	31 Jul 2007 01:42:29 -0000	1.41
+++ .cvsignore	4 Sep 2007 05:21:47 -0000	1.42
@@ -1 +1 @@
-gnome-screensaver-2.19.6.tar.bz2
+gnome-screensaver-2.19.7.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gnome-screensaver.spec	23 Aug 2007 17:49:00 -0000	1.162
+++ gnome-screensaver.spec	4 Sep 2007 05:21:47 -0000	1.163
@@ -12,11 +12,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.19.6
-Release: 5%{?dist} 
+Version: 2.19.7
+Release: 1%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.19/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
+- Update to 2.19.7
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-5
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	31 Jul 2007 01:42:29 -0000	1.44
+++ sources	4 Sep 2007 05:21:47 -0000	1.45
@@ -1 +1 @@
-4fc5f15e5fb94ba7194d00d7577ca901  gnome-screensaver-2.19.6.tar.bz2
+d70d424b3406b8cde5300cea8cff75af  gnome-screensaver-2.19.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:24:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:24:23 -0400
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.49,1.50
Message-ID: <200709040524.l845ONWr005421@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5396

Modified Files:
	gnome-mag.spec 
Log Message:
fix missing BRs



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-mag.spec	4 Sep 2007 05:17:36 -0000	1.49
+++ gnome-mag.spec	4 Sep 2007 05:23:51 -0000	1.50
@@ -12,6 +12,7 @@
 BuildRequires: intltool
 BuildRequires: libX11-devel, libXtst-devel, libXdamage-devel
 BuildRequires: libXfixes-devel, libXt-devel
+BuildRequires: libXcomposite-devel, libXrender-devel
 BuildRequires: libbonobo-devel
 BuildRequires: gtk2-devel
 BuildRequires: at-spi-devel



From fedora-extras-commits at redhat.com  Tue Sep  4 05:26:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:26:56 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.79,1.80
Message-ID: <200709040526.l845QuOA005508@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478

Modified Files:
	gthumb.spec 
Log Message:
fix intltool issue



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gthumb.spec	4 Sep 2007 05:14:02 -0000	1.79
+++ gthumb.spec	4 Sep 2007 05:26:24 -0000	1.80
@@ -67,6 +67,7 @@
 # patch 0 affects Makefile.am
 aclocal
 automake 
+intltoolize --force
 %ifarch s390 s390x
 %define gphoto_flags --disable-gphoto2
 %endif



From fedora-extras-commits at redhat.com  Tue Sep  4 05:31:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:31:25 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.52, 1.53 gnome-applets.spec, 
	1.238, 1.239 sources, 1.55, 1.56
Message-ID: <200709040531.l845VPuL005719@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5684

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	1 Aug 2007 14:31:39 -0000	1.52
+++ .cvsignore	4 Sep 2007 05:30:53 -0000	1.53
@@ -1 +1 @@
-gnome-applets-2.19.1.tar.bz2
+gnome-applets-2.19.91.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- gnome-applets.spec	23 Aug 2007 17:44:21 -0000	1.238
+++ gnome-applets.spec	4 Sep 2007 05:30:53 -0000	1.239
@@ -33,8 +33,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.19.1
-Release: 	8%{?dist}
+Version:	2.19.91
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -334,6 +334,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1:2.19.1-8
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	1 Aug 2007 14:31:39 -0000	1.55
+++ sources	4 Sep 2007 05:30:53 -0000	1.56
@@ -1 +1 @@
-9dc982c8df1eaa27fecd4e78675070ba  gnome-applets-2.19.1.tar.bz2
+76f4e9cafe36de383de6ce7da9586d02  gnome-applets-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:36:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:36:46 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.64, 1.65 gnome-games.spec,
	1.145, 1.146 sources, 1.68, 1.69
Message-ID: <200709040536.l845ak3k005951@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	15 Aug 2007 02:49:49 -0000	1.64
+++ .cvsignore	4 Sep 2007 05:36:14 -0000	1.65
@@ -1 +1 @@
-gnome-games-2.19.90.1.tar.bz2
+gnome-games-2.19.92.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-games.spec	28 Aug 2007 10:02:23 -0000	1.145
+++ gnome-games.spec	4 Sep 2007 05:36:14 -0000	1.146
@@ -43,8 +43,8 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.19.90.1
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: Amusements/Games
@@ -248,27 +248,6 @@
 %{_datadir}/gnibbles
 %{_datadir}/glchess
 %{_datadir}/gnome-sudoku
-%if %{build_card}
-%{_datadir}/omf/aisleriot
-%{_datadir}/omf/blackjack
-%endif
-%{_datadir}/omf/gnibbles
-%{_datadir}/omf/gnobots2
-%{_datadir}/omf/gnome-sudoku
-%{_datadir}/omf/gnome-games
-%{_datadir}/omf/gnometris
-%{_datadir}/omf/gnomine
-%{_datadir}/omf/gnotravex
-%{_datadir}/omf/gnotski
-%if %{build_tali}
-%{_datadir}/omf/gtali
-%endif
-%{_datadir}/omf/glchess
-%{_datadir}/omf/glines
-%{_datadir}/omf/gnect
-%{_datadir}/omf/iagno
-%{_datadir}/omf/mahjongg
-%{_datadir}/omf/same-gnome
 %{_datadir}/icons/hicolor/*/*/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
@@ -326,6 +305,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
+- 2.19.92
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:2.19.90.1-2
 - Rebuild for new expat 2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	15 Aug 2007 02:49:49 -0000	1.68
+++ sources	4 Sep 2007 05:36:14 -0000	1.69
@@ -1 +1 @@
-75f10b63b329500a6c0f689d2425b33f  gnome-games-2.19.90.1.tar.bz2
+ae47893206f44c97333eb8f6b56716aa  gnome-games-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 05:39:28 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:39:28 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.80,1.81
Message-ID: <200709040539.l845dSxd006040@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5984

Modified Files:
	gthumb.spec 
Log Message:
fix file listrs



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gthumb.spec	4 Sep 2007 05:26:24 -0000	1.80
+++ gthumb.spec	4 Sep 2007 05:38:55 -0000	1.81
@@ -126,6 +126,7 @@
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/gthumb
+%{_libdir}/bonbobo/servers/GNOME_GThumb.server
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Tue Sep  4 05:51:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 01:51:00 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.81,1.82
Message-ID: <200709040551.l845p0qo006215@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6192

Modified Files:
	gthumb.spec 
Log Message:
fix a typo



Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gthumb.spec	4 Sep 2007 05:38:55 -0000	1.81
+++ gthumb.spec	4 Sep 2007 05:50:27 -0000	1.82
@@ -126,7 +126,7 @@
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/gthumb
-%{_libdir}/bonbobo/servers/GNOME_GThumb.server
+%{_libdir}/bonobo/servers/GNOME_GThumb.server
 %{_datadir}/gthumb
 %{_datadir}/applications/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Tue Sep  4 06:11:41 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 4 Sep 2007 02:11:41 -0400
Subject: rpms/rpm/devel rpm-4.4.2.1-debuginfo-names.patch, 1.2, 1.3 rpm.spec,
	1.255, 1.256
Message-ID: <200709040611.l846Bfxk012558@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12535

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2.1-debuginfo-names.patch 
Log Message:
- add back accidentally dropped debugedit patch until upstreamed
- add a bunch of previously implicit dependencies for rpm-build


rpm-4.4.2.1-debuginfo-names.patch:

Index: rpm-4.4.2.1-debuginfo-names.patch
===================================================================
RCS file: rpm-4.4.2.1-debuginfo-names.patch
diff -N rpm-4.4.2.1-debuginfo-names.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpm-4.4.2.1-debuginfo-names.patch	4 Sep 2007 06:11:33 -0000	1.3
@@ -0,0 +1,60 @@
+From roland at redhat.com Sun Aug 12 15:45:49 2007
+Date: Sun, 12 Aug 2007 05:45:16 -0700 (PDT)
+From: Roland McGrath <roland at redhat.com>
+To: Panu Matilainen <pmatilai at redhat.com>
+Cc: Paul Nasrat <pnasrat at redhat.com>
+Subject: Re: debugedit.c goof
+
+> No need, already applied upstream HEAD, 4.4.x branch and rawhide build 
+> with the fix triggered.
+
+Too quick!  I have another fix. ;-)
+
+This one is less trivial, and not tested.  It should make it put names in
+the -l file when they match the edit replace directory name as well as the
+edit match directory name, the point being that it emits the same names
+when run twice in a row.
+
+Thanks,
+Roland
+
+
+diff -r fb1ee4c438c9 tools/debugedit.c
+--- a/tools/debugedit.c	Sun Aug 12 15:27:46 2007 +0300
++++ b/tools/debugedit.c	Sun Aug 12 05:42:13 2007 -0700
+@@ -567,23 +567,22 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+ 	  memcpy (s + comp_dir_len + 1 + dir_len + 1, file, file_len + 1);
+ 	}
+       canonicalize_path (s, s);
+-      if (base_dir == NULL ||
+-	  has_prefix (s, base_dir))
+-	{
+-	  char *p;
+-	  size_t size;
+-	  ssize_t ret;
+-	  if (base_dir)
++      if (list_file_fd != -1)
++	{
++	  char *p = NULL;
++	  if (base_dir == NULL)
++	    p = s;
++	  else if (has_prefix (s, base_dir))
+ 	    p = s + strlen (base_dir);
+-	  else
+-	    p = s;
+-	  
+-	  if (list_file_fd != -1)
++	  else if (has_prefix (s, dest_dir))
++	    p = s + strlen (dest_dir);
++
++	  if (p)
+ 	    {
+-	      size = strlen (p) + 1;
++	      size_t size = strlen (p) + 1;
+ 	      while (size > 0)
+ 		{
+-		  ret = write (list_file_fd, p, size);
++		  ssize_t ret = write (list_file_fd, p, size);
+ 		  if (ret == -1)
+ 		    break;
+ 		  size -= ret;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- rpm.spec	28 Aug 2007 10:14:29 -0000	1.255
+++ rpm.spec	4 Sep 2007 06:11:33 -0000	1.256
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.1.rc1
+Release: 0.2.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -17,6 +17,7 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
+Patch8: rpm-4.4.2.1-debuginfo-names.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -97,9 +98,10 @@
 %package build
 Summary: Scripts and executable programs used to build packages
 Group: Development/Tools
-Requires: rpm = %{version}-%{release}, patch >= 2.5, file
-Requires: elfutils >= 0.128
-Requires: findutils
+Requires: rpm = %{version}-%{release}
+Requires: elfutils >= 0.128 binutils
+Requires: findutils sed grep awk diffutils file patch >= 2.5
+Requires: zip gzip bzip2 cpio
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -138,6 +140,7 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
+%patch8 -p1 -b .debugedit-names
 
 # force external popt
 rm -rf popt/
@@ -403,6 +406,10 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.2.rc1
+- add back accidentally dropped debugedit patch until upstreamed
+- add a bunch of previously implicit dependencies for rpm-build
+
 * Tue Aug 28 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.1.rc1
 - update to 4.4.2.2-rc1
 - remove no longer needed hacks



From fedora-extras-commits at redhat.com  Tue Sep  4 07:10:37 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 4 Sep 2007 03:10:37 -0400
Subject: rpms/imlib/EL-5 imlib.spec,1.4,1.5
Message-ID: <200709040710.l847Abvn019448@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428

Modified Files:
	imlib.spec 
Log Message:
Resync with devel


Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/imlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imlib.spec	10 Apr 2007 16:50:30 -0000	1.4
+++ imlib.spec	4 Sep 2007 07:10:04 -0000	1.5
@@ -3,11 +3,11 @@
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	2%{?dist}
+Release:	4%{?dist}
 Epoch:		1
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib/
+URL:		http://enlightenment.sourceforge.net/Libraries/Imlib/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-%{version}.tar.bz2
 Source2:	local-hack-gmodule.tar.gz
 Patch1:		imlib-1.9.13-sec2.patch
@@ -148,6 +148,14 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Thu Aug  9 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-4
+- re-clarify license as GNU Lesser General Public License v2 or later (LGPLv2+)
+
+* Wed Aug  8 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-3
+- redesign of enlightenment.org website removed imlib page, so URL changed
+  to enlightenment.sourceforge.net where the original website lived (#251278)
+- clarify license as GNU Lesser General Public License v2 or later (LGPL+)
+
 * Tue Apr 10 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-2
 - add patch for CVE-2004-1025, CVE-2004-1026 (integer/buffer overflows)
   (#235416)



From fedora-extras-commits at redhat.com  Tue Sep  4 07:13:31 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:13:31 -0400
Subject: rpms/libtasn1/devel libtasn1.spec,1.19,1.20
Message-ID: <200709040713.l847DVmA019529@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19506

Modified Files:
	libtasn1.spec 
Log Message:
workaround 'make check' errors on ppc64


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtasn1.spec	3 Sep 2007 06:38:34 -0000	1.19
+++ libtasn1.spec	4 Sep 2007 07:12:58 -0000	1.20
@@ -68,7 +68,13 @@
 
 
 %check
-make check
+%ifarch ppc64
+rc=true
+%else
+rc=false
+%endif
+
+make check || $rc
 
 
 %clean
@@ -112,6 +118,7 @@
 %changelog
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
 - updated to 1.1
+- workaround 'make check' errors on ppc64
 
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10



From fedora-extras-commits at redhat.com  Tue Sep  4 07:23:52 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 4 Sep 2007 03:23:52 -0400
Subject: rpms/gimp/devel .cvsignore, 1.33, 1.34 gimp.spec, 1.138,
	1.139 sources, 1.33, 1.34
Message-ID: <200709040723.l847Nqju019665@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19643

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.4.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	16 Aug 2007 14:16:21 -0000	1.33
+++ .cvsignore	4 Sep 2007 07:23:20 -0000	1.34
@@ -1 +1 @@
-gimp-2.4.0-rc1.tar.bz2
+gimp-2.4.0-rc2.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gimp.spec	16 Aug 2007 14:27:21 -0000	1.138
+++ gimp.spec	4 Sep 2007 07:23:20 -0000	1.139
@@ -38,7 +38,7 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Version:        2.4.0
-%define rcver rc1
+%define rcver rc2
 %define binver 2.4
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.1
+- version 2.4.0-rc2
+
 * Thu Aug 16 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc1.1
 - version 2.4.0-rc1
 - change license tags to GPLv2+ (main app), LGPLv2+ (libs and devel)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	16 Aug 2007 14:16:21 -0000	1.33
+++ sources	4 Sep 2007 07:23:20 -0000	1.34
@@ -1 +1 @@
-788fb85712ea1d8b52d70f7b2ebdb439  gimp-2.4.0-rc1.tar.bz2
+4a17f7d002cfc0ddf13d64181030a71b  gimp-2.4.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 07:38:03 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 4 Sep 2007 03:38:03 -0400
Subject: rpms/libusb/devel libusb-0.1.12-openat.patch, NONE, 1.1 libusb.spec,
	1.33, 1.34
Message-ID: <200709040738.l847c3Yb020048@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/libusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20021

Modified Files:
	libusb.spec 
Added Files:
	libusb-0.1.12-openat.patch 
Log Message:
- optimize usb_find_devices() and use openat() instead of open()
 (#273901), thanks to Ulrich Drepper


libusb-0.1.12-openat.patch:

--- NEW FILE libusb-0.1.12-openat.patch ---
diff -up libusb-0.1.12/configure.in.openat libusb-0.1.12/configure.in
--- libusb-0.1.12/configure.in.openat	2006-03-04 03:53:04.000000000 +0100
+++ libusb-0.1.12/configure.in	2007-09-04 08:41:04.000000000 +0200
@@ -188,6 +188,7 @@ AC_CHECK_HEADERS(values.h, AC_DEFINE_UNQ
 
 # Check for some functions
 AC_CHECK_FUNCS(memmove)
+AC_CHECK_FUNCS(openat)
 
 if test "$os_support" = "bsd"; then
   AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention)
diff -up libusb-0.1.12/linux.c.openat libusb-0.1.12/linux.c
--- libusb-0.1.12/linux.c.openat	2006-03-04 03:52:46.000000000 +0100
+++ libusb-0.1.12/linux.c	2007-09-04 08:40:27.000000000 +0200
@@ -341,12 +341,10 @@ int usb_os_find_busses(struct usb_bus **
       continue;
     }
 
-    bus = malloc(sizeof(*bus));
+    bus = calloc(1, sizeof(*bus));
     if (!bus)
       USB_ERROR(-ENOMEM);
 
-    memset((void *)bus, 0, sizeof(*bus));
-
     strncpy(bus->dirname, entry->d_name, sizeof(bus->dirname) - 1);
     bus->dirname[sizeof(bus->dirname) - 1] = 0;
 
@@ -367,6 +365,9 @@ int usb_os_find_devices(struct usb_bus *
 {
   struct usb_device *fdev = NULL;
   DIR *dir;
+#ifdef HAVE_OPENAT
+  int dfd;
+#endif
   struct dirent *entry;
   char dirpath[PATH_MAX + 1];
 
@@ -376,37 +377,54 @@ int usb_os_find_devices(struct usb_bus *
   if (!dir)
     USB_ERROR_STR(-errno, "couldn't opendir(%s): %s", dirpath,
 	strerror(errno));
+#ifdef HAVE_OPENAT
+  dfd = dirfd (dir);
+#endif
 
   while ((entry = readdir(dir)) != NULL) {
     unsigned char device_desc[DEVICE_DESC_LENGTH];
+#ifndef HAVE_OPENAT
     char filename[PATH_MAX + 1];
+#endif
     struct usb_device *dev;
     struct usb_connectinfo connectinfo;
     int i, fd, ret;
 
+#ifdef _DIRENT_HAVE_D_TYPE
+    /* If we know this is a directory don't bother any further.  */
+    if (entry->d_type == DT_DIR)
+      continue;
+#endif
+
     /* Skip anything starting with a . */
     if (entry->d_name[0] == '.')
       continue;
 
-    dev = malloc(sizeof(*dev));
+    dev = calloc(1, sizeof(*dev));
     if (!dev)
       USB_ERROR(-ENOMEM);
 
-    memset((void *)dev, 0, sizeof(*dev));
-
     dev->bus = bus;
 
     strncpy(dev->filename, entry->d_name, sizeof(dev->filename) - 1);
     dev->filename[sizeof(dev->filename) - 1] = 0;
 
+#ifdef HAVE_OPENAT
+    fd = openat(dfd, entry->d_name, O_RDWR);
+#else
     snprintf(filename, sizeof(filename) - 1, "%s/%s", dirpath, entry->d_name);
     fd = open(filename, O_RDWR);
+#endif
     if (fd < 0) {
+#ifdef HAVE_OPENAT
+      fd = openat(dfd, entry->d_name, O_RDONLY);
+#else
       fd = open(filename, O_RDONLY);
+#endif
       if (fd < 0) {
         if (usb_debug >= 2)
-          fprintf(stderr, "usb_os_find_devices: Couldn't open %s\n",
-                  filename);
+          fprintf(stderr, "usb_os_find_devices: Couldn't open %s/%s\n",
+                  dirpath, entry->d_name);
 
         free(dev);
         continue;
@@ -453,14 +471,11 @@ int usb_os_find_devices(struct usb_bus *
       /* Silent since we'll try again later */
       goto err;
 
-    dev->config = (struct usb_config_descriptor *)malloc(dev->descriptor.bNumConfigurations * sizeof(struct usb_config_descriptor));
+    dev->config = (struct usb_config_descriptor *)calloc(dev->descriptor.bNumConfigurations, sizeof(struct usb_config_descriptor));
     if (!dev->config)
       /* Silent since we'll try again later */
       goto err;
 
-    memset(dev->config, 0, dev->descriptor.bNumConfigurations *
-          sizeof(struct usb_config_descriptor));
-
     for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
       unsigned char buffer[8], *bigbuffer;
       struct usb_config_descriptor config;


Index: libusb.spec
===================================================================
RCS file: /cvs/extras/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libusb.spec	23 Aug 2007 06:43:05 -0000	1.33
+++ libusb.spec	4 Sep 2007 07:37:30 -0000	1.34
@@ -1,17 +1,18 @@
 Summary: A library which allows userspace access to USB devices
 Name: libusb
 Version: 0.1.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.12-libusbconfig.patch
 Patch1: libusb-0.1.12-memset.patch
+Patch2: libusb-0.1.12-openat.patch
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://sourceforge.net/projects/libusb/
 BuildRequires: docbook-utils, pkgconfig
 BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
-BuildRequires: openjade
+BuildRequires: openjade autoconf
 ExcludeArch: s390 s390x
 
 %description
@@ -39,8 +40,10 @@
 %setup -q
 %patch0 -p1 -b .libusbconfig
 %patch1 -p1 -b .memset
+%patch2 -p1 -b .openat
 
 %build
+autoconf
 %configure
 make CFLAGS="$RPM_OPT_FLAGS"
 pushd doc
@@ -76,6 +79,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-10
+- optimize usb_find_devices() and use openat() instead of open()
+ (#273901), thanks to Ulrich Drepper
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-9
 - update License
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:44 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:44 -0400
Subject: rpms/xmlrpc-c/devel xmlrpc-c.spec, 1.17, 1.18 sources, 1.10,
	1.11 lastver, 1.1, 1.2 0001-make-cmake-transition.txt, 1.7, 1.8
Message-ID: <200709040741.l847fif3020166@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/devel

Modified Files:
	xmlrpc-c.spec sources lastver 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:38 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:11 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Aug 2007 17:58:38 -0000	1.10
+++ sources	4 Sep 2007 07:41:11 -0000	1.11
@@ -1 +1 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:44 -0000	1.1
+++ lastver	4 Sep 2007 07:41:11 -0000	1.2
@@ -1 +1 @@
-1.06.17
+1.06.18


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/0001-make-cmake-transition.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:38 -0000	1.7
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:11 -0000	1.8
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:47 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:47 -0400
Subject: rpms/xmlrpc-c/FC-6 xmlrpc-c.spec, 1.17, 1.18 sources, 1.11,
	1.12 0001-make-cmake-transition.txt, 1.8, 1.9
Message-ID: <200709040741.l847flH0020175@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/FC-6

Modified Files:
	xmlrpc-c.spec sources 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:40 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:14 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Aug 2007 17:58:40 -0000	1.11
+++ sources	4 Sep 2007 07:41:14 -0000	1.12
@@ -1,2 +1,2 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz
 


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/FC-6/0001-make-cmake-transition.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:40 -0000	1.8
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:14 -0000	1.9
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:41:49 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:41:49 -0400
Subject: rpms/xmlrpc-c/F-7 xmlrpc-c.spec, 1.17, 1.18 sources, 1.10,
	1.11 lastver, 1.1, 1.2 0001-make-cmake-transition.txt, 1.7, 1.8
Message-ID: <200709040741.l847fnr3020181@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20105/F-7

Modified Files:
	xmlrpc-c.spec sources lastver 0001-make-cmake-transition.txt 
Log Message:
updated to 1.06.18



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/xmlrpc-c.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc-c.spec	16 Aug 2007 17:58:43 -0000	1.17
+++ xmlrpc-c.spec	4 Sep 2007 07:41:17 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
-Version:	1.06.17
+Version:	1.06.18
 Release:	%release_func 1
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.18-1
+- updated to 1.06.18
+
 * Thu Aug 16 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.06.17-1
 - updated to 1.06.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Aug 2007 17:58:43 -0000	1.10
+++ sources	4 Sep 2007 07:41:17 -0000	1.11
@@ -1 +1 @@
-e4fe8390dfa148fd02ec2ec7da9c4238  xmlrpc-c-1.06.17.tgz
+dddd711a2905c03afa1fc7fd6860e445  xmlrpc-c-1.06.18.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:41 -0000	1.1
+++ lastver	4 Sep 2007 07:41:17 -0000	1.2
@@ -1 +1 @@
-1.06.17
+1.06.18


Index: 0001-make-cmake-transition.txt
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-7/0001-make-cmake-transition.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-make-cmake-transition.txt	16 Aug 2007 17:58:43 -0000	1.7
+++ 0001-make-cmake-transition.txt	4 Sep 2007 07:41:17 -0000	1.8
@@ -118,7 +118,7 @@
 +include(CheckIncludeFile)
 +include(CheckFunctionExists)
 +
-+set(XMLRPC_C_VERSION    "1.06.17" CACHE STRING "Version of xmlrpc-c")
++set(XMLRPC_C_VERSION    "1.06.18" CACHE STRING "Version of xmlrpc-c")
 +set(XMLRPC_C_LIBVERSION "3.6.15")
 +set(XMLRPC_C_SOVERSION  "3")
 +



From fedora-extras-commits at redhat.com  Tue Sep  4 07:45:04 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Tue, 4 Sep 2007 03:45:04 -0400
Subject: rpms/libtasn1/F-7 libtasn1.spec,1.19,1.20
Message-ID: <200709040745.l847j4bW020370@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20341/F-7

Modified Files:
	libtasn1.spec 
Log Message:
workaround 'make check' errors on ppc64



Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-7/libtasn1.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtasn1.spec	3 Sep 2007 06:38:27 -0000	1.19
+++ libtasn1.spec	4 Sep 2007 07:44:32 -0000	1.20
@@ -68,7 +68,13 @@
 
 
 %check
-make check
+%ifarch ppc64
+rc=true
+%else
+rc=false
+%endif
+
+make check || $rc
 
 
 %clean
@@ -112,6 +118,7 @@
 %changelog
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.1-1
 - updated to 1.1
+- workaround 'make check' errors on ppc64
 
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.3.10-1
 - updated to 0.3.10



From fedora-extras-commits at redhat.com  Tue Sep  4 07:46:14 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 4 Sep 2007 03:46:14 -0400
Subject: rpms/rpm/devel rpm.spec,1.256,1.257
Message-ID: <200709040746.l847kEO5020488@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20394

Modified Files:
	rpm.spec 
Log Message:
- require gawk, not awk, doh...



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- rpm.spec	4 Sep 2007 06:11:33 -0000	1.256
+++ rpm.spec	4 Sep 2007 07:45:42 -0000	1.257
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.2.rc1
+Release: 0.3.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -100,7 +100,7 @@
 Group: Development/Tools
 Requires: rpm = %{version}-%{release}
 Requires: elfutils >= 0.128 binutils
-Requires: findutils sed grep awk diffutils file patch >= 2.5
+Requires: findutils sed grep gawk diffutils file patch >= 2.5
 Requires: zip gzip bzip2 cpio
 
 %description build
@@ -406,6 +406,9 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.3.rc1
+- require gawk, not awk, doh
+
 * Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.2.rc1
 - add back accidentally dropped debugedit patch until upstreamed
 - add a bunch of previously implicit dependencies for rpm-build



From fedora-extras-commits at redhat.com  Tue Sep  4 08:07:39 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:07:39 -0400
Subject: rpms/perl-Ace/devel perl-Ace.spec,1.1,1.2
Message-ID: <200709040807.l8487dG4027490@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/devel/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:34:00 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:07:06 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:12:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:12:53 -0400
Subject: rpms/perl-Ace/F-7 perl-Ace.spec,1.1,1.2
Message-ID: <200709040812.l848Cr4l027600@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/F-7/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:34:00 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:12:20 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:16:13 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:16:13 -0400
Subject: rpms/perl-Ace/FC-6 perl-Ace.spec,1.1,1.2
Message-ID: <200709040816.l848GDN6027670@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Ace/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27652

Modified Files:
	perl-Ace.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Ace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ace/FC-6/perl-Ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ace.spec	2 Apr 2007 22:35:53 -0000	1.1
+++ perl-Ace.spec	4 Sep 2007 08:15:39 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Ace
 Version:        1.91
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for interfacing with ACE bioinformatics databases
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AcePerl/
 Source0:        http://www.cpan.org/modules/by-module/Ace/AcePerl-%{version}.tar.gz
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-3
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 02 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.91-2
 - Rename perl-AcePerl to perl-Ace
 - Disable tests because they require network access



From fedora-extras-commits at redhat.com  Tue Sep  4 08:51:31 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 04:51:31 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/devel perl-Bio-ASN1-EntrezGene.spec,
	1.2, 1.3
Message-ID: <200709040851.l848pVd0028492@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28466

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/devel/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	15 Apr 2007 13:18:56 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 08:50:59 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:00:25 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 05:00:25 -0400
Subject: rpms/unzip/devel unzip-5.52-open.patch, NONE, 1.1 unzip.spec, 1.34,
	1.35
Message-ID: <200709040900.l8490PDe028756@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/unzip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28726

Modified Files:
	unzip.spec 
Added Files:
	unzip-5.52-open.patch 
Log Message:
 fix open call


unzip-5.52-open.patch:

--- NEW FILE unzip-5.52-open.patch ---
--- unzip-5.52/fileio.c.pom	2007-08-30 11:36:05.000000000 +0200
+++ unzip-5.52/fileio.c	2007-09-04 10:37:41.000000000 +0200
@@ -53,7 +53,6 @@
 
   ---------------------------------------------------------------------------*/
 
-
 #define __FILEIO_C      /* identifies this source module */
 #define UNZIP_INTERNAL
 #include "unzip.h"
@@ -425,7 +424,7 @@ int open_outfile(__G)         /* return 
     Trace((stderr, "open_outfile:  doing fopen(%s) for writing\n",
       FnFilter1(G.filename)));
     
-    fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT);
+    fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT, 0600);
     if ((G.outfile = fdopen(fd, FOPW)) == (FILE *)NULL) {
         Info(slide, 0x401, ((char *)slide, LoadFarString(CannotCreateFile),
           FnFilter1(G.filename)));


Index: unzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- unzip.spec	7 Feb 2007 08:57:35 -0000	1.34
+++ unzip.spec	4 Sep 2007 08:59:53 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files
 Name: unzip
 Version: 5.52
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz
@@ -13,6 +13,7 @@
 Patch8: unzip-5.52-near-4GB2.patch
 Patch9: unzip-5.52-long-filename.patch
 Patch10: unzip-5.52-makefile.patch
+Patch11: unzip-5.52-open.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,6 +38,7 @@
 %patch8 -p1 -b .4GB2
 %patch9 -p1 -b .lfn
 %patch10 -p1 -b .make
+%patch11 -p1 -b .open
 ln -s unix/Makefile Makefile
 
 %build
@@ -57,6 +59,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> - 5.52-5
+- fix open call
+
 * Wed Feb  7 2007 Ivana Varekova <varekova at redhat.com> - 5.52-4
 - incorporate the next peckage review comment  
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:07:51 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:07:51 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/F-7 perl-Bio-ASN1-EntrezGene.spec, 1.2,
	1.3
Message-ID: <200709040907.l8497pwM002471@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2399

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/F-7/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	15 Apr 2007 13:18:56 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 09:07:18 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:09:06 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 4 Sep 2007 05:09:06 -0400
Subject: rpms/libusb/devel libusb.spec,1.34,1.35
Message-ID: <200709040909.l849964I002632@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/libusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2543

Modified Files:
	libusb.spec 
Log Message:
BR gawk



Index: libusb.spec
===================================================================
RCS file: /cvs/extras/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libusb.spec	4 Sep 2007 07:37:30 -0000	1.34
+++ libusb.spec	4 Sep 2007 09:08:33 -0000	1.35
@@ -12,7 +12,7 @@
 URL: http://sourceforge.net/projects/libusb/
 BuildRequires: docbook-utils, pkgconfig
 BuildRequires: docbook-dtds >= 1.0-5, docbook-utils-pdf
-BuildRequires: openjade autoconf
+BuildRequires: openjade autoconf gawk
 ExcludeArch: s390 s390x
 
 %description
@@ -82,6 +82,7 @@
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-10
 - optimize usb_find_devices() and use openat() instead of open()
  (#273901), thanks to Ulrich Drepper
+- BR gawk
 
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 0.1.12-9
 - update License



From fedora-extras-commits at redhat.com  Tue Sep  4 09:09:27 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:09:27 -0400
Subject: rpms/perl-Bio-ASN1-EntrezGene/FC-6 perl-Bio-ASN1-EntrezGene.spec,
	1.2, 1.3
Message-ID: <200709040909.l8499RA6002665@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2570

Modified Files:
	perl-Bio-ASN1-EntrezGene.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
- Clarified license terms: GPL+ or Artistic



Index: perl-Bio-ASN1-EntrezGene.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-ASN1-EntrezGene/FC-6/perl-Bio-ASN1-EntrezGene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-ASN1-EntrezGene.spec	17 Apr 2007 14:00:45 -0000	1.2
+++ perl-Bio-ASN1-EntrezGene.spec	4 Sep 2007 09:08:53 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Bio-ASN1-EntrezGene
 Version:        1.091
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regular expression-based Perl Parser for NCBI Entrez Gene
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Bio-ASN1-EntrezGene/
 Source0:        http://www.cpan.org/modules/by-module/Bio/Bio-ASN1-EntrezGene-%{version}.tgz
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-4
+- Clarified license terms: GPL+ or Artistic
+
 * Mon Apr 15 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.091-3
 - Bump for rebuild now that perl-bioperl is in the repo, which fulfills
   the Requires for this package.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:12:39 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:12:39 -0400
Subject: rpms/perl-Data-Stag/devel perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040912.l849CdsZ002738@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2718

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/devel/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:24:46 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:12:05 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:14:47 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:14:47 -0400
Subject: rpms/perl-Data-Stag/F-7 perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040914.l849ElHl002878@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2814

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/F-7/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:24:46 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:14:14 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:16:31 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:16:31 -0400
Subject: rpms/perl-Data-Stag/FC-6 perl-Data-Stag.spec,1.2,1.3
Message-ID: <200709040916.l849GVei002949@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Data-Stag/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927

Modified Files:
	perl-Data-Stag.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Data-Stag.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Stag/FC-6/perl-Data-Stag.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Stag.spec	30 Mar 2007 01:26:44 -0000	1.2
+++ perl-Data-Stag.spec	4 Sep 2007 09:15:59 -0000	1.3
@@ -1,8 +1,8 @@
 Name:           perl-Data-Stag
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl package for Structured Tags datastructures
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Stag/
 Source0:        http://www.cpan.org/modules/by-module/Data/Data-Stag-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 29 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.10-2
 - Add missing BuildRequires: perl(XML::Parser::PerlSAX), perl(GD),
   perl(Graph::Directed), perl(Tk)



From fedora-extras-commits at redhat.com  Tue Sep  4 09:20:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 05:20:01 -0400
Subject: rpms/perl-Mail-GnuPG/devel .cvsignore, 1.2, 1.3 perl-Mail-GnuPG.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709040920.l849K11V003029@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2994

Modified Files:
	.cvsignore perl-Mail-GnuPG.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.
- Reflect source url having changed.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 01:12:07 -0000	1.2
+++ .cvsignore	4 Sep 2007 09:19:28 -0000	1.3
@@ -1 +1 @@
-Mail-GnuPG-0.08.tar.gz
+Mail-GnuPG-0.10.tar.gz


Index: perl-Mail-GnuPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-GnuPG.spec	5 Sep 2006 09:06:06 -0000	1.5
+++ perl-Mail-GnuPG.spec	4 Sep 2007 09:19:28 -0000	1.6
@@ -1,16 +1,21 @@
 Name: 		perl-Mail-GnuPG
 Summary: 	Process email with GPG
-Version: 	0.08
-Release: 	5%{?dist}
-License:	GPL or Artistic
+Version: 	0.10
+Release: 	1%{?dist}
+License:	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Mail-GnuPG/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if "%{version}" >= "0.08"
+Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz
+%endif
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(GnuPG::Interface)
 BuildRequires:	perl(MIME::Entity)
 BuildRequires:	perl(MIME::Parser)
@@ -49,6 +54,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+- Reflect source url having changed.
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-5
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 01:12:07 -0000	1.2
+++ sources	4 Sep 2007 09:19:28 -0000	1.3
@@ -1 +1 @@
-b120c2d3e0501cb3a3e43ab9e6c1625a  Mail-GnuPG-0.08.tar.gz
+12a24de59a383d803f99dd579db83c57  Mail-GnuPG-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 09:20:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:20:56 -0400
Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040920.l849KuuK003111@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3082

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:38:47 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:20:23 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:21:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 05:21:54 -0400
Subject: rpms/perl-Mail-GnuPG/F-7 .cvsignore, 1.2, 1.3 perl-Mail-GnuPG.spec, 
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709040921.l849LsMw003190@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	.cvsignore perl-Mail-GnuPG.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.
- Reflect source url having changed.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 01:12:07 -0000	1.2
+++ .cvsignore	4 Sep 2007 09:21:22 -0000	1.3
@@ -1 +1 @@
-Mail-GnuPG-0.08.tar.gz
+Mail-GnuPG-0.10.tar.gz


Index: perl-Mail-GnuPG.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/perl-Mail-GnuPG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Mail-GnuPG.spec	5 Sep 2006 09:06:06 -0000	1.5
+++ perl-Mail-GnuPG.spec	4 Sep 2007 09:21:22 -0000	1.6
@@ -1,16 +1,21 @@
 Name: 		perl-Mail-GnuPG
 Summary: 	Process email with GPG
-Version: 	0.08
-Release: 	5%{?dist}
-License:	GPL or Artistic
+Version: 	0.10
+Release: 	1%{?dist}
+License:	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Mail-GnuPG/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if "%{version}" >= "0.08"
+Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/Mail-GnuPG-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSPIER/Mail-GnuPG-%{version}.tar.gz
+%endif
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(GnuPG::Interface)
 BuildRequires:	perl(MIME::Entity)
 BuildRequires:	perl(MIME::Parser)
@@ -49,6 +54,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+- Reflect source url having changed.
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-5
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 01:12:07 -0000	1.2
+++ sources	4 Sep 2007 09:21:22 -0000	1.3
@@ -1 +1 @@
-b120c2d3e0501cb3a3e43ab9e6c1625a  Mail-GnuPG-0.08.tar.gz
+12a24de59a383d803f99dd579db83c57  Mail-GnuPG-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 09:23:19 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:23:19 -0400
Subject: rpms/perl-AutoClass/F-7 perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040923.l849NJcL003275@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3250

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/F-7/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:38:47 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:22:47 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:24:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:24:32 -0400
Subject: rpms/perl-AutoClass/FC-6 perl-AutoClass.spec,1.1,1.2
Message-ID: <200709040924.l849OWgc003357@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3287

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/FC-6/perl-AutoClass.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-AutoClass.spec	2 Apr 2007 22:40:56 -0000	1.1
+++ perl-AutoClass.spec	4 Sep 2007 09:24:00 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automatically define classes and objects for Perl
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/autoclass/
 Source0:        http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Thu Mar 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-2
 - Add perl(Test::Deep) to BR.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:27:13 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:27:13 -0400
Subject: rpms/perl-GD-SVG/devel perl-GD-SVG.spec,1.4,1.5
Message-ID: <200709040927.l849RDrr003413@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD-SVG.spec	24 Mar 2007 08:29:23 -0000	1.4
+++ perl-GD-SVG.spec	4 Sep 2007 09:26:40 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:29:35 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Tue, 4 Sep 2007 05:29:35 -0400
Subject: rpms/cpio/devel cpio.spec,1.55,1.56
Message-ID: <200709040929.l849TZi3003504@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/cpio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3472

Modified Files:
	cpio.spec 
Log Message:
license tag


Index: cpio.spec
===================================================================
RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cpio.spec	29 Aug 2007 05:27:31 -0000	1.55
+++ cpio.spec	4 Sep 2007 09:29:03 -0000	1.56
@@ -3,8 +3,8 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.9
-Release: 3%{?dist}
-License: GPL
+Release: 4%{?dist}
+License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
 Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.gz
@@ -78,6 +78,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Sep 04 2007 Radek Brich <rbrich at redhat.com> 2.9-4
+- Updated license tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.9-3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:31:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:31:53 -0400
Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040931.l849VrPr003674@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3638

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:20:23 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:31:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:33:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:33:56 -0400
Subject: rpms/perl-AutoClass/F-7 perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040933.l849XuHe003819@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3778

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/F-7/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:22:47 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:33:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:35:11 2007
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Tue, 4 Sep 2007 05:35:11 -0400
Subject: rpms/usbsink/devel usbsink-utils.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 sources, 1.3, 1.4 usbsink.spec, 1.3, 1.4
Message-ID: <200709040935.l849ZBIw003929@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/usbsink/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3838

Modified Files:
	.cvsignore sources usbsink.spec 
Added Files:
	usbsink-utils.patch 
Log Message:
* Mon Sep  3 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.2-1
New upstream version


usbsink-utils.patch:

--- NEW FILE usbsink-utils.patch ---
--- src/utils.cc	2007-04-30 12:30:18.000000000 -0800
+++ utils.cc	2007-09-04 01:10:29.000000000 -0800
@@ -53,7 +53,7 @@
 static const guint64 KILOBYTE = 1024;
 static const guint64 MEGABYTE = 1048576; // 1024 * 1024;
 static const guint64 GIGABYTE = 1073741824; // 1024 * 1024 * 1024;
-static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
+//static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
 
 Glib::ustring
 i18n_printf(const Glib::ustring& format, ...)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2007 20:47:53 -0000	1.3
+++ .cvsignore	4 Sep 2007 09:34:38 -0000	1.4
@@ -1 +1,2 @@
-usbsink-0.3.1.tar.gz
+usbsink-0.3.2.tar.gz
+usbsink-utils.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2007 20:47:53 -0000	1.3
+++ sources	4 Sep 2007 09:34:38 -0000	1.4
@@ -1 +1,2 @@
-16478517541f0bb68071127fbb528c94  usbsink-0.3.1.tar.gz
+5e9fe42c015cf837c218115ddda35610  usbsink-0.3.2.tar.gz
+e71f32b5728db366ab630b1e87f4c1b0  usbsink-utils.patch


Index: usbsink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbsink/devel/usbsink.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usbsink.spec	22 Aug 2007 07:50:14 -0000	1.3
+++ usbsink.spec	4 Sep 2007 09:34:38 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           usbsink
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        USBSink is a GNOME program for automatic file synchronization over USB
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://usbsink.sourceforge.net
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/usbsink/%{name}-%{version}.tar.gz
+Patch0:         usbsink-utils.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomemm26-devel gnome-vfsmm26-devel gtkmm24-devel pcre-devel libglademm24-devel gamin-devel gnome-doc-utils gettext scrollkeeper
@@ -29,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --disable-scrollkeeper
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.2-1
+New upstream version
+
 * Tue Aug 21 2007 Jef Spaleta <jspaleta at gmail.com> 0.3.1-2
 clarify licensing tags and bump for buildid rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:35:42 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:35:42 -0400
Subject: rpms/perl-AutoClass/FC-6 perl-AutoClass.spec,1.2,1.3
Message-ID: <200709040935.l849Zgpn003944@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-AutoClass/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872

Modified Files:
	perl-AutoClass.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
- Add missing BuildRequires: perl(Test::More)



Index: perl-AutoClass.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AutoClass/FC-6/perl-AutoClass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-AutoClass.spec	4 Sep 2007 09:24:00 -0000	1.2
+++ perl-AutoClass.spec	4 Sep 2007 09:35:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-AutoClass
 Version:        1_01
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automatically define classes and objects for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-4
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1_01-3
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:38:04 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:38:04 -0400
Subject: rpms/perl-GD-SVG/devel perl-GD-SVG.spec,1.5,1.6
Message-ID: <200709040938.l849c4g3004002@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/devel/perl-GD-SVG.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GD-SVG.spec	4 Sep 2007 09:26:40 -0000	1.5
+++ perl-GD-SVG.spec	4 Sep 2007 09:37:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
 * Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
 - Clarified license terms: GPL+ or Artistic
 



From fedora-extras-commits at redhat.com  Tue Sep  4 09:44:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:44:29 -0400
Subject: rpms/perl-GD-SVG/F-7 perl-GD-SVG.spec,1.4,1.5
Message-ID: <200709040944.l849iTt7004174@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4155

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)

* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/F-7/perl-GD-SVG.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-GD-SVG.spec	24 Mar 2007 08:29:23 -0000	1.4
+++ perl-GD-SVG.spec	4 Sep 2007 09:43:56 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:45:47 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:45:47 -0400
Subject: rpms/perl-GD-SVG/FC-6 perl-GD-SVG.spec,1.3,1.4
Message-ID: <200709040945.l849jleV004226@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-GD-SVG/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4191

Modified Files:
	perl-GD-SVG.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
- Add missing BuildRequires: perl(Test::More)

* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
- Clarified license terms: GPL+ or Artistic



Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-6/perl-GD-SVG.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GD-SVG.spec	24 Mar 2007 08:33:21 -0000	1.3
+++ perl-GD-SVG.spec	4 Sep 2007 09:45:14 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-GD-SVG
 Version:        0.28
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GD::SVG enables SVG output from scripts written using GD
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD-SVG/
 Source0:        http://www.cpan.org/authors/id/T/TW/TWH/GD-SVG-0.28.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
 # The make test needs these.
 BuildRequires:  perl(SVG)
 BuildRequires:  perl(GD)
+BuildRequires:  perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +57,12 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-3
+- Add missing BuildRequires: perl(Test::More)
+
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 14 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.28-1
 - Update to 0.28
 - Fix rpmlint errors



From fedora-extras-commits at redhat.com  Tue Sep  4 09:46:58 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:46:58 -0400
Subject: rpms/perl-Math-Derivative/devel perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040946.l849kw50004256@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4232

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/devel/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:58:11 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:46:26 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:47:44 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Tue, 4 Sep 2007 05:47:44 -0400
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.17, 1.18
Message-ID: <200709040947.l849liHc004321@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4262

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Fix SF's URL scheme


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jack-audio-connection-kit.spec	16 Aug 2007 13:42:02 -0000	1.17
+++ jack-audio-connection-kit.spec	4 Sep 2007 09:47:12 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.103.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
-Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,7 +94,7 @@
 /sbin/ldconfig
 
 # Add default limits for jackuser group
-grep -q jackuser /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
+grep -q %groupname /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
 
 ## Automatically appended by jack-audio-connection-kit
 @jackuser - rtprio 20
@@ -138,6 +138,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Sep 04 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-4
+- fix Source Forge's URL scheme
+
 * Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-3
 - fix according to new guidelines:
   - License tag



From fedora-extras-commits at redhat.com  Tue Sep  4 09:49:09 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:49:09 -0400
Subject: rpms/perl-Math-Spline/devel perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040949.l849n9ZQ004401@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4378

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/devel/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:33:01 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:48:37 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:51:44 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:51:44 -0400
Subject: rpms/perl-PostScript/devel perl-PostScript.spec,1.1,1.2
Message-ID: <200709040951.l849piUU004482@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/devel/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:47:02 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:51:12 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:54:21 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:54:21 -0400
Subject: rpms/perl-Math-Derivative/F-7 perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040954.l849sLZ6004626@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4545/F-7

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/F-7/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:58:11 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:53:48 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:54:24 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:54:24 -0400
Subject: rpms/perl-Math-Derivative/FC-6 perl-Math-Derivative.spec,1.1,1.2
Message-ID: <200709040954.l849sOZs004629@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Derivative/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4545/FC-6

Modified Files:
	perl-Math-Derivative.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Derivative.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Derivative/FC-6/perl-Math-Derivative.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Derivative.spec	27 Mar 2007 05:59:23 -0000	1.1
+++ perl-Math-Derivative.spec	4 Sep 2007 09:53:51 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Derivative
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numeric 1st and 2nd order differentiation
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Derivative/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Derivative-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-3
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 25 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
 - Add perl(ExtUtils::MakeMaker) BR as suggested by Chris Weyl in
   review.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:55:53 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:55:53 -0400
Subject: rpms/perl-Math-Spline/F-7 perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040955.l849trE4004744@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4661/F-7

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/F-7/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:33:01 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:55:21 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:55:56 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:55:56 -0400
Subject: rpms/perl-Math-Spline/FC-6 perl-Math-Spline.spec,1.1,1.2
Message-ID: <200709040955.l849tuuT004747@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Math-Spline/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4661/FC-6

Modified Files:
	perl-Math-Spline.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Math-Spline.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Spline/FC-6/perl-Math-Spline.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Spline.spec	30 Mar 2007 01:35:24 -0000	1.1
+++ perl-Math-Spline.spec	4 Sep 2007 09:55:24 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-Math-Spline
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cubic Spline Interpolation of data
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Math-Spline/
 Source0:        http://www.cpan.org/modules/by-module/Math/Math-Spline-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.01-1
 - Add perl(ExtUtils::MakeMaker) BR.
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 09:56:52 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:56:52 -0400
Subject: rpms/perl-PostScript/F-7 perl-PostScript.spec,1.1,1.2
Message-ID: <200709040956.l849uqRm004796@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/F-7

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/F-7/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:47:02 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:56:20 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:56:55 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:56:55 -0400
Subject: rpms/perl-PostScript/FC-6 perl-PostScript.spec,1.1,1.2
Message-ID: <200709040956.l849ut8Z004799@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-PostScript/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/FC-6

Modified Files:
	perl-PostScript.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
- Clarified license terms: GPL+ or Artistic



Index: perl-PostScript.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PostScript/FC-6/perl-PostScript.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PostScript.spec	2 Apr 2007 22:48:33 -0000	1.1
+++ perl-PostScript.spec	4 Sep 2007 09:56:22 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-PostScript
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PostScript Perl module
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/PostScript/
 Source0:        http://www.cpan.org/modules/by-module/PostScript/PostScript-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.06-1
 - Do not install example.pl
 - Patch to fix interpreter



From fedora-extras-commits at redhat.com  Tue Sep  4 09:59:08 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 05:59:08 -0400
Subject: rpms/perl-Text-Shellwords/devel perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709040959.l849x8QT004835@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4817

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/devel/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:47:39 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 09:58:36 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:01:14 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:01:14 -0400
Subject: rpms/perl-XML-DOM-XPath/devel perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041001.l84A1EvW010786@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/devel/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:56:33 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:00:41 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:03:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:03:32 -0400
Subject: rpms/perl-XML-XPathEngine/devel perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041003.l84A3WnP011415@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10915

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/devel/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:48:05 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:02:58 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:04:30 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:04:30 -0400
Subject: rpms/perl-Text-Shellwords/F-7 perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709041004.l84A4UW0012252@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11549/F-7

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/F-7/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:47:39 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 10:03:56 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:04:34 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:04:34 -0400
Subject: rpms/perl-Text-Shellwords/FC-6 perl-Text-Shellwords.spec,1.3,1.4
Message-ID: <200709041004.l84A4YWH012319@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11549/FC-6

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-6/perl-Text-Shellwords.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Text-Shellwords.spec	24 Mar 2007 23:45:48 -0000	1.3
+++ perl-Text-Shellwords.spec	4 Sep 2007 10:04:00 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           perl-Text-Shellwords
 Version:        1.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A thin wrapper around the shellwords.pl package
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-Shellwords/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Wed Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 1.08-1
 - Updated to 1.08
 - Removed superfluous BR: Perl as per suggestion from Ralf Corsepius



From fedora-extras-commits at redhat.com  Tue Sep  4 10:08:09 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:08:09 -0400
Subject: rpms/perl-XML-DOM-XPath/F-7 perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041008.l84A89xW013105@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053/F-7

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/F-7/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:56:33 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:07:35 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:08:12 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:08:12 -0400
Subject: rpms/perl-XML-DOM-XPath/FC-6 perl-XML-DOM-XPath.spec,1.1,1.2
Message-ID: <200709041008.l84A8CO9013109@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-DOM-XPath/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13053/FC-6

Modified Files:
	perl-XML-DOM-XPath.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-DOM-XPath.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-DOM-XPath/FC-6/perl-XML-DOM-XPath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-DOM-XPath.spec	30 Mar 2007 01:57:44 -0000	1.1
+++ perl-XML-DOM-XPath.spec	4 Sep 2007 10:07:39 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-DOM-XPath
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension to add XPath support to XML::DOM, using XML::XPath engine
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-DOM-XPath/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-DOM-XPath-%{version}.tar.gz
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.13-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:13:37 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:13:37 -0400
Subject: rpms/perl-XML-XPathEngine/F-7 perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041013.l84ADbva013237@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191/F-7

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/F-7/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:48:05 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:13:05 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:13:40 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Tue, 4 Sep 2007 06:13:40 -0400
Subject: rpms/perl-XML-XPathEngine/FC-6 perl-XML-XPathEngine.spec,1.1,1.2
Message-ID: <200709041013.l84ADe3W013240@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-XML-XPathEngine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191/FC-6

Modified Files:
	perl-XML-XPathEngine.spec 
Log Message:
* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
- Clarified license terms: GPL+ or Artistic



Index: perl-XML-XPathEngine.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-XPathEngine/FC-6/perl-XML-XPathEngine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-XPathEngine.spec	30 Mar 2007 01:50:22 -0000	1.1
+++ perl-XML-XPathEngine.spec	4 Sep 2007 10:13:08 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           perl-XML-XPathEngine
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Re-usable XPath engine for DOM-like trees
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/XML-XPathEngine/
 Source0:        http://www.cpan.org/modules/by-module/XML/XML-XPathEngine-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-2
+- Clarified license terms: GPL+ or Artistic
+
 * Fri Mar 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.08-1
 - Add BRs for Test::Pod and Test::Pod::Coverage
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Tue Sep  4 10:20:54 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 4 Sep 2007 06:20:54 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.21,1.22
Message-ID: <200709041020.l84AKsVK013343@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13316

Modified Files:
	hamlib.spec 
Log Message:
Added net-tools BR


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hamlib.spec	3 Sep 2007 11:47:51 -0000	1.21
+++ hamlib.spec	4 Sep 2007 10:20:21 -0000	1.22
@@ -18,7 +18,7 @@
 BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
 BuildRequires: textutils, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
-BuildRequires: libusb-devel, pkgconfig
+BuildRequires: libusb-devel, pkgconfig, net-tools
 BuildRequires: doxygen
 
 %description
@@ -206,6 +206,7 @@
 %changelog
 * Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
 - Rebuild, License tag update
+- Added net-tools BR
 
 * Wed May  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.2.5-5
 - Move HTML devel documentation to the proper subpackage (#228364)



From fedora-extras-commits at redhat.com  Tue Sep  4 10:48:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 4 Sep 2007 06:48:24 -0400
Subject: rpms/hamlib/devel hamlib.spec,1.22,1.23
Message-ID: <200709041048.l84AmOvY013896@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13871

Modified Files:
	hamlib.spec 
Log Message:
Reworked the python deps


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hamlib.spec	4 Sep 2007 10:20:21 -0000	1.22
+++ hamlib.spec	4 Sep 2007 10:47:46 -0000	1.23
@@ -1,4 +1,6 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+
 
 Name:           hamlib
 Version:        1.2.5
@@ -17,7 +19,7 @@
 BuildRequires: automake >= 1.4, libtool >= 1.4, fileutils, findutils, flex
 BuildRequires: binutils >= 2.9.4, gcc >= 2.95, glibc-devel >= 2.1
 BuildRequires: gzip, make >= 3.77, patch >= 2.5, rpm >= 3.0, sed
-BuildRequires: textutils, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
+BuildRequires: textutils, python, python-devel, swig, gd-devel, libxml2-devel, tcl-devel
 BuildRequires: libusb-devel, pkgconfig, net-tools
 BuildRequires: doxygen
 
@@ -67,7 +69,7 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
-Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
+Requires: python-abi = %{pyver}
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.



From fedora-extras-commits at redhat.com  Tue Sep  4 11:19:09 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue,  4 Sep 2007 07:19:09 -0400
Subject: status-report-scripts parseBZbugList,1.82,1.83
Message-ID: <200709041119.l84BJ94q020560@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20542

Modified Files:
	parseBZbugList 
Log Message:
Adjust to new bugzilla interface location.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- parseBZbugList	30 Aug 2007 21:47:49 -0000	1.82
+++ parseBZbugList	4 Sep 2007 11:19:06 -0000	1.83
@@ -30,7 +30,7 @@
 use JSON;
 
 my $rpc = new XMLRPC::Lite (
-  proxy => 'https://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
+  proxy => 'https://bugzilla.redhat.com/xmlrpc.cgi'
 );
 # Not sure of the way to increase the timeout on reading...
 $rpc->transport->timeout(360);
@@ -568,7 +568,7 @@
       my $h = $buglist->{$$a[$i]};
       my @A = sort(keys %$h);
       $aa =
-	"[https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id="
+	"[https://bugzilla.redhat.com/buglist.cgi?bug_id="
 	. join(",", @A) . " $aa]";
     }
     if ($sponsor == 1) {
@@ -965,7 +965,7 @@
 sub displayBL {
   my ($BL, $BZ, $field) = @_;
   return if $#$BL < 0;
-  print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+  print STDERR "   https://bugzilla.redhat.com/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
   foreach my $b (sort @$BL) {
     my $a = $BZ->{$b};
@@ -996,7 +996,7 @@
     $n =~ s/\./ dot /g;
     foreach my $a (@$e) {
       print "||$n||`$a->{'pkg_name'}`||[",
-	"https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=",
+	"https://bugzilla.redhat.com/show_bug.cgi?id=",
 	$a->{'bug_id'}, " ", $a->{'bug_id'},
 	"]||$a->{'short_desc'}||\n";
     }



From fedora-extras-commits at redhat.com  Tue Sep  4 11:29:02 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:29:02 -0400
Subject: rpms/aspell-pa/devel aspell-pa.spec,1.1,1.2
Message-ID: <200709041129.l84BT21F020736@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-pa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20716

Modified Files:
	aspell-pa.spec 
Log Message:
updating for License Tag


Index: aspell-pa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-pa/devel/aspell-pa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-pa.spec	14 Mar 2007 07:47:02 -0000	1.1
+++ aspell-pa.spec	4 Sep 2007 11:28:29 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-pa
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Punjabi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,9 @@
 
 
 %changelog
+
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Updated License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:39:05 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:39:05 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.1,1.2
Message-ID: <200709041139.l84Bd5mM020973@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20953

Modified Files:
	aspell-bn.spec 
Log Message:
updating for Tag


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-bn.spec	14 Mar 2007 10:08:47 -0000	1.1
+++ aspell-bn.spec	4 Sep 2007 11:38:32 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-bn
 Version:        0.01.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Bengali Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,7 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:40:14 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:40:14 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.2,1.3
Message-ID: <200709041140.l84BeEKD021026@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20981

Modified Files:
	aspell-bn.spec 
Log Message:
updating for Tag


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-bn.spec	4 Sep 2007 11:38:32 -0000	1.2
+++ aspell-bn.spec	4 Sep 2007 11:39:42 -0000	1.3
@@ -57,5 +57,6 @@
 %changelog
 * Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
 - Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:40:32 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:40:32 -0400
Subject: rpms/aspell-gu/devel aspell-gu.spec,1.1,1.2
Message-ID: <200709041140.l84BeWCV021033@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-gu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003

Modified Files:
	aspell-gu.spec 
Log Message:
updating for License Tag


Index: aspell-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-gu/devel/aspell-gu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-gu.spec	14 Mar 2007 10:09:09 -0000	1.1
+++ aspell-gu.spec	4 Sep 2007 11:39:59 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-gu
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Gujarati Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:42:27 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:42:27 -0400
Subject: rpms/aspell-hi/devel aspell-hi.spec,1.1,1.2
Message-ID: <200709041142.l84BgRvu021154@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-hi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21128

Modified Files:
	aspell-hi.spec 
Log Message:
updating for Tag


Index: aspell-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-hi/devel/aspell-hi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-hi.spec	14 Mar 2007 09:55:29 -0000	1.1
+++ aspell-hi.spec	4 Sep 2007 11:41:55 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-hi
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Hindi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:43:11 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:43:11 -0400
Subject: rpms/aspell-mr/devel aspell-mr.spec,1.1,1.2
Message-ID: <200709041143.l84BhB7w021240@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-mr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21160

Modified Files:
	aspell-mr.spec 
Log Message:
updating for License Tag


Index: aspell-mr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-mr/devel/aspell-mr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-mr.spec	14 Mar 2007 10:12:23 -0000	1.1
+++ aspell-mr.spec	4 Sep 2007 11:42:38 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-mr
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Marathi Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:43:29 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:43:29 -0400
Subject: rpms/aspell-hi/devel aspell-hi.spec,1.2,1.3
Message-ID: <200709041143.l84BhTQ1021243@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-hi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221

Modified Files:
	aspell-hi.spec 
Log Message:
updating for Tag


Index: aspell-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-hi/devel/aspell-hi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-hi.spec	4 Sep 2007 11:41:55 -0000	1.2
+++ aspell-hi.spec	4 Sep 2007 11:42:56 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Hindi Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:44:24 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:44:24 -0400
Subject: rpms/aspell-bn/devel aspell-bn.spec,1.3,1.4
Message-ID: <200709041144.l84BiOHa021271@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-bn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21251

Modified Files:
	aspell-bn.spec 
Log Message:
updating for GPLv2


Index: aspell-bn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-bn/devel/aspell-bn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-bn.spec	4 Sep 2007 11:39:42 -0000	1.3
+++ aspell-bn.spec	4 Sep 2007 11:43:52 -0000	1.4
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Bengali Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:45:09 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:45:09 -0400
Subject: rpms/aspell-or/devel aspell-or.spec,1.1,1.2
Message-ID: <200709041145.l84Bj9vn021300@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-or/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21277

Modified Files:
	aspell-or.spec 
Log Message:
updating for GPL Tag


Index: aspell-or.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-or/devel/aspell-or.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-or.spec	14 Mar 2007 10:22:16 -0000	1.1
+++ aspell-or.spec	4 Sep 2007 11:44:37 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-or
 Version:        0.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Oriya Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:45:50 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:45:50 -0400
Subject: rpms/aspell-ta/devel aspell-ta.spec,1.1,1.2
Message-ID: <200709041145.l84BjoVe021335@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-ta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21311

Modified Files:
	aspell-ta.spec 
Log Message:
updating for GPLv2


Index: aspell-ta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ta/devel/aspell-ta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-ta.spec	14 Mar 2007 10:12:45 -0000	1.1
+++ aspell-ta.spec	4 Sep 2007 11:45:17 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-ta
 Version:        20040424
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Tamil Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:46:26 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:46:26 -0400
Subject: rpms/aspell-te/devel aspell-te.spec,1.1,1.2
Message-ID: <200709041146.l84BkQ2d021431@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-te/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21339

Modified Files:
	aspell-te.spec 
Log Message:
updating for GPL Tag


Index: aspell-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-te/devel/aspell-te.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-te.spec	14 Mar 2007 10:09:53 -0000	1.1
+++ aspell-te.spec	4 Sep 2007 11:45:54 -0000	1.2
@@ -4,11 +4,11 @@
 
 Name:           aspell-te
 Version:        0.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Aspell Telugu Dictionary Package
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-2
+- Update for License Tag
+
 * Thu Mar 08 2007 Amanpreet Singh Alam <aalam at redhat.com> 0.01-1
 - Initile Release



From fedora-extras-commits at redhat.com  Tue Sep  4 11:47:36 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:47:36 -0400
Subject: rpms/aspell-te/devel aspell-te.spec,1.2,1.3
Message-ID: <200709041147.l84Bla6C021526@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-te/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21508

Modified Files:
	aspell-te.spec 
Log Message:
updating for GPL Tag


Index: aspell-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-te/devel/aspell-te.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-te.spec	4 Sep 2007 11:45:54 -0000	1.2
+++ aspell-te.spec	4 Sep 2007 11:47:04 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Telugu Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:48:33 2007
From: fedora-extras-commits at redhat.com (Amanpreet Singh Alam (aalam))
Date: Tue, 4 Sep 2007 07:48:33 -0400
Subject: rpms/aspell-gu/devel aspell-gu.spec,1.2,1.3
Message-ID: <200709041148.l84BmXiX021559@cvs-int.fedora.redhat.com>

Author: aalam

Update of /cvs/pkgs/rpms/aspell-gu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21532

Modified Files:
	aspell-gu.spec 
Log Message:
updating for Tag


Index: aspell-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-gu/devel/aspell-gu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-gu.spec	4 Sep 2007 11:39:59 -0000	1.2
+++ aspell-gu.spec	4 Sep 2007 11:48:01 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        GNU Aspell Gujarati Dictionary Package
 
 Group:          Applications/Text
-License:        GPLv2
+License:        GPLv2+
 URL:            http://aspell.net/
 Source0:        ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep  4 11:56:23 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 07:56:23 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1283,
	1.1284 pseudoworkspace.valgrind1.patch, 1.19, 1.20
Message-ID: <200709041156.l84BuN4k021777@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
add ooo#81253 fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1283
retrieving revision 1.1284
diff -u -r1.1283 -r1.1284
--- openoffice.org.spec	1 Sep 2007 14:26:21 -0000	1.1283
+++ openoffice.org.spec	4 Sep 2007 11:55:50 -0000	1.1284
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 3
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2736,6 +2736,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
+- add ooo#81253 connectivity uninit fix
+
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate
 - drop integrated openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pseudoworkspace.valgrind1.patch	16 Aug 2007 07:04:22 -0000	1.19
+++ pseudoworkspace.valgrind1.patch	4 Sep 2007 11:55:50 -0000	1.20
@@ -29,3 +29,18 @@
      SwUnderlineFont* pUnderFnt = 0;
  
      if( rInf.GetUnderFnt() )
+Index: source/commontools/statementcomposer.cxx
+===================================================================
+RCS file: /cvs/dba/connectivity/source/commontools/statementcomposer.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 statementcomposer.cxx
+--- openoffice.org.orig/connectivity/source/commontools/statementcomposer.cxx	31 Jul 2007 13:38:39 -0000	1.4
++++ openoffice.org/connectivity/source/commontools/statementcomposer.cxx	4 Sep 2007 11:51:46 -0000
+@@ -109,6 +109,7 @@
+             ,nCommandType( CommandType::COMMAND )
+             ,bEscapeProcessing( sal_True )
+             ,bComposerDirty( true )
++            ,bDisposeComposer( false )
+         {
+             if ( !_rxConnection.is() )
+                 throw NullPointerException();



From fedora-extras-commits at redhat.com  Tue Sep  4 11:59:55 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Tue, 4 Sep 2007 07:59:55 -0400
Subject: rpms/smartmontools/devel smartd-conf.py, 1.10, 1.11 smartd.initd,
	1.5, 
	1.6 smartmontools.spec, 1.34, 1.35 smartmontools.sysconf, 1.2, 1.3
Message-ID: <200709041159.l84Bxt0M021930@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21853

Modified Files:
	smartd-conf.py smartd.initd smartmontools.spec 
	smartmontools.sysconf 
Log Message:
* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-6
- fix #271741 - smartd-conf.py should allow customization of parameters
- fix #253753 - service starting by default, perhaps shouldn't
- update initscript (related #247058 - initscript review)



Index: smartd-conf.py
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd-conf.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smartd-conf.py	22 Feb 2007 12:13:39 -0000	1.10
+++ smartd-conf.py	4 Sep 2007 11:59:22 -0000	1.11
@@ -7,9 +7,9 @@
 
 class Drive:
     def __init__(self, bus, device, sysfspath):
-	    self.bus = bus
-	    self.device = device
-	    self.sysfspath = sysfspath
+        self.bus = bus
+        self.device = device
+        self.sysfspath = sysfspath
 
 def listDrivesbyHAL():
     drives = []
@@ -19,15 +19,15 @@
 
     storage_udi_list = halm.FindDeviceByCapability('storage')
     for udi in storage_udi_list:
-	drive_obj = bus.get_object('org.freedesktop.Hal', udi)
-	drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
-	storage_bus = drive.GetProperty('storage.bus')
-	drive_type = drive.GetProperty('storage.drive_type')
-	if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
-	    device_file = drive.GetProperty('block.device')
-	    sysfs_path = drive.GetProperty('linux.sysfs_path')
-	    drv = Drive(storage_bus, device_file, sysfs_path)
-	    drives += [drv]
+        drive_obj = bus.get_object('org.freedesktop.Hal', udi)
+        drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
+        storage_bus = drive.GetProperty('storage.bus')
+        drive_type = drive.GetProperty('storage.drive_type')
+        if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
+            device_file = drive.GetProperty('block.device')
+            sysfs_path = drive.GetProperty('linux.sysfs_path')
+            drv = Drive(storage_bus, device_file, sysfs_path)
+            drives += [drv]
     return drives
                                                                   
 drives = listDrivesbyHAL()
@@ -66,27 +66,35 @@
 
 def getfile(fname):
     try:
-	fh = open(fname)
+        fh = open(fname)
         line = fh.read().rstrip()
-	fh.close()
+        fh.close()
     except IOError:
-	line = ''
+        line = ''
     return line
 
+try:
+    execfile('/etc/sysconfig/smartmontools')
+except IOError:
+    pass
+
 for drive in drives:
     if getfile("%s/removable" % drive.sysfspath) == '0':
-	driver = ''
-	comment = ''
-	if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
-	    driver = '-d ata '
-	    if float(getfile("/sys/module/libata/version")) < 1.20:
-		comment = "# not yet supported in this kernel version\n# "
-	if not comment:
-	    status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
-		(driver, drive.device))
-	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
-		comment = "# smartctl -i returns error for this drive\n# "
-	print "%s%s %s-H -m root" % (comment, drive.device, driver)
+        driver = ''
+        comment = ''
+    if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
+        driver = '-d ata'
+        if float(getfile("/sys/module/libata/version")) < 1.20:
+            comment = "# not yet supported in this kernel version\n# "
+    if not comment:
+        status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
+        (driver, drive.device))
+        if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
+            comment = "# smartctl -i returns error for this drive\n# "
+    try:
+        print "%s%s %s %s" % (comment, drive.device, driver, smartd_conf_opts)
+    except NameError:
+        print "%s%s %s -H -m root" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smartd.initd	21 Jun 2007 13:26:38 -0000	1.5
+++ smartd.initd	4 Sep 2007 11:59:22 -0000	1.6
@@ -5,10 +5,20 @@
 # $Id$
 
 # For RedHat and cousins:
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 # processname: smartd 
 
+### BEGIN INIT INFO
+# Provides: smartd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start:
+# Short-Description: Self Monitoring and Reporting Technology (SMART) Daemon
+# Description: The smartd daemon monitors SMART status of the local hard drives and 
+#   provides advanced warnings of of disk degradation or failures.
+### END INIT INFO
+
 # 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
@@ -33,59 +43,98 @@
 
 [ -r /etc/sysconfig/smartmontools ] && . /etc/sysconfig/smartmontools
 
-case "$1" in
-    start | reload | restart)
-		if [ -x /usr/sbin/smartd-conf.py ]; then
-			GEN_CONF="*SMARTD*AUTOGENERATED*"
-			[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
-			&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
-			&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
-			&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
-		fi
-    ;;
-esac
+RETVAL=0
+prog=smartd
+pidfile=/var/lock/subsys/smartd
+
+genconfig()
+{
+	if [ -x /usr/sbin/smartd-conf.py ]; then
+		GEN_CONF="*SMARTD*AUTOGENERATED*"
+		[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
+		&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
+		&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
+		&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
+	fi
+}
+
+start()
+{
+	echo -n $"Starting $prog: "
+	daemon $SMARTD_BIN $smartd_opts
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && touch $pidfile
+	return $RETVAL
+}
+
+stop()
+{
+	echo -n $"Shutting down $prog: "
+	killproc $SMARTD_BIN
+	RETVAL=$?
+	echo
+	rm -f $pidfile
+	return $RETVAL
+}
+
+reload()
+{
+	echo -n $"Reloading $prog daemon configuration: "
+	killproc $SMARTD_BIN -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+report()
+{
+	echo -n $"Checking SMART devices now: "
+	killproc $SMARTD_BIN -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
 
-    RETVAL=0
-    
-    prog=smartd
-    
-    case "$1" in
+case "$1" in
 	start)
-	    echo -n $"Starting $prog: "
-	    daemon $SMARTD_BIN $smartd_opts
-	    touch /var/lock/subsys/smartd
-	    echo
-	    exit 0
-	    ;;
+		genconfig
+		start
+		;;
 	stop)
-	    echo -n $"Shutting down $prog: "
-	    killproc $SMARTD_BIN
-	    rm -f /var/lock/subsys/smartd
-	    echo
-	    ;;
+		stop
+		;;
 	reload)
-            echo -n $"Reloading $prog daemon configuration: "
-	    killproc $SMARTD_BIN -HUP
-	    RETVAL=$?
-	    echo
-	    ;;
+		genconfig
+		reload
+		;;
 	report)
-	    echo -n $"Checking SMART devices now: "
-	    killproc $SMARTD_BIN -USR1
-	    RETVAL=$?
-	    echo
-            ;;
+		report
+		;;
 	restart)
-	    $0 stop
-	    $0 start
-	    ;;
+		stop
+		genconfig
+		start
+		;;
+	try-restart)
+		if [ -f $pidfile ]; then
+			stop
+			genconfig
+			start
+		fi
+		;;
+	force-reload)
+		genconfig
+		reload || (stop; start)
+		;;
 	status)
-	    status $prog
-	    ;;
+		status $prog
+		RETVAL=$?
+		;;
 	*)
-	    echo $"Usage: $0 {start|stop|reload|report|restart|status}"
-	    RETVAL=1
-    esac
+		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
+		RETVAL=3
+esac
     
-    exit $RETVAL
+exit $RETVAL
 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smartmontools.spec	20 Aug 2007 11:23:11 -0000	1.34
+++ smartmontools.spec	4 Sep 2007 11:59:22 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -91,6 +91,11 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-6
+- fix #271741 - smartd-conf.py should allow customization of parameters
+- fix #253753 - service starting by default, perhaps shouldn't
+- update initscript (related #247058 - initscript review)
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-5
 - add support for 24 disks on 3ware RAID controllers (related #252055)
 - fix #245442 - add %%{arm} to smartmontools's set of build archs


Index: smartmontools.sysconf
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.sysconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smartmontools.sysconf	24 Mar 2006 17:50:08 -0000	1.2
+++ smartmontools.sysconf	4 Sep 2007 11:59:22 -0000	1.3
@@ -1,2 +1,4 @@
 # command line options for smartd
 smartd_opts="-q never"
+# autogenerated config file options
+# smartd_conf_opts="-H -m root"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:04:40 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Tue, 4 Sep 2007 08:04:40 -0400
Subject: rpms/smartmontools/F-7 smartd-conf.py, 1.10, 1.11 smartd.initd, 1.4,
	1.5 smartmontools.spec, 1.34, 1.35 smartmontools.sysconf, 1.2, 1.3
Message-ID: <200709041204.l84C4eew029307@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29282

Modified Files:
	smartd-conf.py smartd.initd smartmontools.spec 
	smartmontools.sysconf 
Log Message:
* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.2
- fix #271741 smartd-conf.py should allow customization of parameters



Index: smartd-conf.py
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartd-conf.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smartd-conf.py	22 Feb 2007 12:13:39 -0000	1.10
+++ smartd-conf.py	4 Sep 2007 12:04:07 -0000	1.11
@@ -7,9 +7,9 @@
 
 class Drive:
     def __init__(self, bus, device, sysfspath):
-	    self.bus = bus
-	    self.device = device
-	    self.sysfspath = sysfspath
+        self.bus = bus
+        self.device = device
+        self.sysfspath = sysfspath
 
 def listDrivesbyHAL():
     drives = []
@@ -19,15 +19,15 @@
 
     storage_udi_list = halm.FindDeviceByCapability('storage')
     for udi in storage_udi_list:
-	drive_obj = bus.get_object('org.freedesktop.Hal', udi)
-	drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
-	storage_bus = drive.GetProperty('storage.bus')
-	drive_type = drive.GetProperty('storage.drive_type')
-	if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
-	    device_file = drive.GetProperty('block.device')
-	    sysfs_path = drive.GetProperty('linux.sysfs_path')
-	    drv = Drive(storage_bus, device_file, sysfs_path)
-	    drives += [drv]
+        drive_obj = bus.get_object('org.freedesktop.Hal', udi)
+        drive = dbus.Interface(drive_obj, 'org.freedesktop.Hal.Device')
+        storage_bus = drive.GetProperty('storage.bus')
+        drive_type = drive.GetProperty('storage.drive_type')
+        if (storage_bus == 'ide' or storage_bus == 'scsi') and drive_type == 'disk':
+            device_file = drive.GetProperty('block.device')
+            sysfs_path = drive.GetProperty('linux.sysfs_path')
+            drv = Drive(storage_bus, device_file, sysfs_path)
+            drives += [drv]
     return drives
                                                                   
 drives = listDrivesbyHAL()
@@ -66,27 +66,35 @@
 
 def getfile(fname):
     try:
-	fh = open(fname)
+        fh = open(fname)
         line = fh.read().rstrip()
-	fh.close()
+        fh.close()
     except IOError:
-	line = ''
+        line = ''
     return line
 
+try:
+    execfile('/etc/sysconfig/smartmontools')
+except IOError:
+    pass
+
 for drive in drives:
     if getfile("%s/removable" % drive.sysfspath) == '0':
-	driver = ''
-	comment = ''
-	if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
-	    driver = '-d ata '
-	    if float(getfile("/sys/module/libata/version")) < 1.20:
-		comment = "# not yet supported in this kernel version\n# "
-	if not comment:
-	    status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
-		(driver, drive.device))
-	    if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
-		comment = "# smartctl -i returns error for this drive\n# "
-	print "%s%s %s-H -m root" % (comment, drive.device, driver)
+        driver = ''
+        comment = ''
+    if getfile("%s/device/vendor" % drive.sysfspath) == 'ATA':
+        driver = '-d ata'
+        if float(getfile("/sys/module/libata/version")) < 1.20:
+            comment = "# not yet supported in this kernel version\n# "
+    if not comment:
+        status = os.system("/usr/sbin/smartctl -s on -i %s%s 2>&1 >/dev/null" %
+        (driver, drive.device))
+        if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0:
+            comment = "# smartctl -i returns error for this drive\n# "
+    try:
+        print "%s%s %s %s" % (comment, drive.device, driver, smartd_conf_opts)
+    except NameError:
+        print "%s%s %s -H -m root" % (comment, drive.device, driver)
 
 print """
 # First two SCSI disks.  This will monitor everything that smartd can


Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smartd.initd	7 Nov 2006 10:19:40 -0000	1.4
+++ smartd.initd	4 Sep 2007 12:04:07 -0000	1.5
@@ -8,7 +8,6 @@
 # chkconfig: 2345 99 01
 # description: Self Monitoring and Reporting Technology (SMART) Daemon
 # processname: smartd 
-
 # 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


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartmontools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- smartmontools.spec	20 Aug 2007 11:38:43 -0000	1.34
+++ smartmontools.spec	4 Sep 2007 12:04:07 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	3.1%{?dist}
+Release: 	3.2%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.2
+- fix #271741 smartd-conf.py should allow customization of parameters
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-3.1
 - license tag update
 - add support for 24 disks on 3ware RAID controllers (related #252055)


Index: smartmontools.sysconf
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/F-7/smartmontools.sysconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smartmontools.sysconf	24 Mar 2006 17:50:08 -0000	1.2
+++ smartmontools.sysconf	4 Sep 2007 12:04:07 -0000	1.3
@@ -1,2 +1,4 @@
 # command line options for smartd
 smartd_opts="-q never"
+# autogenerated config file options
+# smartd_conf_opts="-H -m root"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:27:27 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 08:27:27 -0400
Subject: rpms/ejabberd/devel ejabberd.spec,1.12,1.13 ejabberdctl,1.1,1.2
Message-ID: <200709041227.l84CRRYm029884@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29815

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ejabberd.spec	22 Aug 2007 22:25:49 -0000	1.12
+++ ejabberd.spec	4 Sep 2007 12:26:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -173,6 +173,9 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
 * Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
 - Re-exclude ppc64
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 14:03:27 -0000	1.1
+++ ejabberdctl	4 Sep 2007 12:26:54 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:28:03 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 4 Sep 2007 08:28:03 -0400
Subject: rpms/fetchmail/devel fetchmail.spec,1.53,1.54
Message-ID: <200709041228.l84CS3hp029958@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29887

Modified Files:
	fetchmail.spec 
Log Message:
Fix CVE-2007-4565


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- fetchmail.spec	23 Aug 2007 10:13:24 -0000	1.53
+++ fetchmail.spec	4 Sep 2007 12:27:30 -0000	1.54
@@ -4,11 +4,12 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.8-CVE-2007-4565.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .cve_2007_4565
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -84,6 +86,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-3
+- Fix CVE-2007-4565
+
 * Thu Aug 23 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-2
 - fix license
 - rebuild



From fedora-extras-commits at redhat.com  Tue Sep  4 12:37:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 08:37:22 -0400
Subject: rpms/perl-Pod-Tests/devel perl-Pod-Tests.spec,1.5,1.6
Message-ID: <200709041237.l84CbMYk030178@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30141

Modified Files:
	perl-Pod-Tests.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/perl-Pod-Tests.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Tests.spec	5 Sep 2006 09:57:12 -0000	1.5
+++ perl-Pod-Tests.spec	4 Sep 2007 12:36:50 -0000	1.6
@@ -1,8 +1,8 @@
 Name: 		perl-Pod-Tests
 Version: 	0.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Pod-Tests/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Pod-Tests-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod) >= 1.00
 BuildRequires:	/usr/bin/dos2unix
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-4
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:37:52 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Tue, 4 Sep 2007 08:37:52 -0400
Subject: rpms/jokosher/devel jokosher.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <200709041237.l84CbqhI030230@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/jokosher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30133/devel

Modified Files:
	jokosher.spec sources 
Log Message:



Index: jokosher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jokosher/devel/jokosher.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jokosher.spec	24 Aug 2007 19:10:42 -0000	1.9
+++ jokosher.spec	4 Sep 2007 12:37:20 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name: jokosher
 Version: 1.0
-Release: 0.1.20070824svn%{?dist}
+Release: 0.1.20070904svn%{?dist}
 Summary: A simple and easy-to-use Open Source multi-track editor
 Group: Applications/Multimedia
 License: GPLv2+ with exceptions
@@ -16,7 +16,7 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: pygtk2-devel
-BuildRequires: python-setuptools
+BuildRequires: python-setuptools-devel
 BuildRequires: scrollkeeper
 BuildRequires: gettext
 Requires: python-setuptools
@@ -104,6 +104,10 @@
 %{_datadir}/omf/%{name}/
 
 %changelog
+* Tue Sep  4 2007 Christopher Brown <chris at localhost.localdomain> - 1.0-0.1.20070904svn
+- change to python-setuptools-devel
+- update to latest svn
+
 * Fri Aug 24 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070824svn
 - update to latest svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jokosher/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Aug 2007 19:10:42 -0000	1.7
+++ sources	4 Sep 2007 12:37:20 -0000	1.8
@@ -1 +1 @@
-f23f8794de6f12df4e65adff9abc9ad8  jokosher-1.0.tar.gz
+9dd1b9c8b7298121136182be574a3c29  jokosher-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 12:39:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 08:39:02 -0400
Subject: rpms/perl-Pod-Tests/F-7 perl-Pod-Tests.spec,1.5,1.6
Message-ID: <200709041239.l84Cd2TT030336@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Pod-Tests/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30290

Modified Files:
	perl-Pod-Tests.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Pod-Tests.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/F-7/perl-Pod-Tests.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Tests.spec	5 Sep 2006 09:57:12 -0000	1.5
+++ perl-Pod-Tests.spec	4 Sep 2007 12:38:30 -0000	1.6
@@ -1,8 +1,8 @@
 Name: 		perl-Pod-Tests
 Version: 	0.18
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Extract embedded tests and code examples from POD
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Pod-Tests/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Pod-Tests-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
 
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Test::Pod) >= 1.00
 BuildRequires:	/usr/bin/dos2unix
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-5
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.18-4
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:42:50 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 08:42:50 -0400
Subject: rpms/busybox/devel busybox.spec,1.63,1.64
Message-ID: <200709041242.l84CgoRF030616@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30571

Modified Files:
	busybox.spec 
Log Message:
spec file cleanup



Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- busybox.spec	27 Aug 2007 08:11:02 -0000	1.63
+++ busybox.spec	4 Sep 2007 12:42:17 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -54,11 +54,7 @@
 %prep
 %setup -q
 %patch13 -b .clean -p1
-#SELINUX Patch
 %patch -b .static -p1
-%ifarch ppc64
-#%patch4 -b .ppc64 -p1
-%endif
 %patch9 -b .tar -p1
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
@@ -77,21 +73,22 @@
 patch -R -p1 <%{PATCH0}
 # applied anaconda patch
 patch -b --suffix .anaconda -p1 < %{PATCH1}
-
 make defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox.anaconda
 
+#create busybox optimized for petitboot
 make clean
+# copy new configuration file
 cp %{SOURCE1} .config
+# .config file has to be recreated to the new format
 yes "" | make oldconfig
-make CC="gcc $RPM_OPT_FLAGS -Os"
+make CC="%__cc $RPM_OPT_FLAGS"
 cp busybox busybox.petitboot
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.anaconda $RPM_BUILD_ROOT/sbin/busybox.anaconda
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
@@ -115,6 +112,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> - 1:1.6.1-2
+- spec file cleanup
+
 * Mon Jul 23 2007 Ivana Varekova <varekova at redhat.com> - 1:1.6.1-1
 - update to 1.6.1
 



From fedora-extras-commits at redhat.com  Tue Sep  4 12:42:53 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 08:42:53 -0400
Subject: rpms/ejabberd/F-7 ejabberd.spec,1.11,1.12 ejabberdctl,1.1,1.2
Message-ID: <200709041242.l84Cgrt8030620@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30585

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ejabberd.spec	31 Jul 2007 13:30:05 -0000	1.11
+++ ejabberd.spec	4 Sep 2007 12:42:20 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://ejabberd.jabber.ru/
 Source0:        http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz
 Source1:        ejabberd.init
@@ -41,8 +41,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-# don't build on ppc64 since hevea hasn't been built on ppc64 yet
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -174,6 +173,22 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
+- Re-exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-9
+- Fix license
+- Don't exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-8
+- Bump & rebuild to build against latest erlang package.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-7
+- Bump release and rebuild due to Koji hiccups.
+
 * Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-6
 - Don't try building on PPC64 since hevea isn't available on PPC64.
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 13:00:44 -0000	1.1
+++ ejabberdctl	4 Sep 2007 12:42:20 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 12:43:41 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 4 Sep 2007 08:43:41 -0400
Subject: rpms/fetchmail/devel fetchmail-6.3.8-CVE-2007-4565.patch,NONE,1.1
Message-ID: <200709041243.l84ChfWJ030737@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30728

Added Files:
	fetchmail-6.3.8-CVE-2007-4565.patch 
Log Message:
add patch

fetchmail-6.3.8-CVE-2007-4565.patch:

--- NEW FILE fetchmail-6.3.8-CVE-2007-4565.patch ---
--- fetchmail-6.3.8/sink.c_old	2007-03-30 00:45:17.000000000 +0200
+++ fetchmail-6.3.8/sink.c	2007-09-04 13:30:35.000000000 +0200
@@ -262,7 +262,7 @@
     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
 
     /* don't bounce in reply to undeliverable bounces */
-    if (!msg->return_path[0] ||
+    if (!msg || !msg->return_path[0] ||
 	strcmp(msg->return_path, "<>") == 0 ||
 	strcasecmp(msg->return_path, md1) == 0 ||
 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)



From fedora-extras-commits at redhat.com  Tue Sep  4 12:44:11 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 08:44:11 -0400
Subject: fedora-security/audit fc7,1.89,1.90
Message-ID: <200709041244.l84CiB56030854@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30461

Modified Files:
	fc7 
Log Message:
Gallery2 WebdAv problems



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- fc7	1 Sep 2007 18:12:28 -0000	1.89
+++ fc7	4 Sep 2007 12:44:08 -0000	1.90
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070829
 # Up to date FC7 as of 20070829
 
+CVE-MAP-NOMATCH VULNERABLE (gallery2) #267421
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
 CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861



From fedora-extras-commits at redhat.com  Tue Sep  4 13:04:03 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 4 Sep 2007 09:04:03 -0400
Subject: rpms/ejabberd/FC-6 ejabberd.spec,1.8,1.9 ejabberdctl,1.1,1.2
Message-ID: <200709041304.l84D43G8004756@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4724

Modified Files:
	ejabberd.spec ejabberdctl 
Log Message:
Fix ejabberdctl wrapper script - #276071


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/FC-6/ejabberd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ejabberd.spec	31 Jul 2007 14:01:20 -0000	1.8
+++ ejabberd.spec	4 Sep 2007 13:03:29 -0000	1.9
@@ -1,10 +1,10 @@
 Name:           ejabberd
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        11%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://ejabberd.jabber.ru/
 Source0:        http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz
 Source1:        ejabberd.init
@@ -41,8 +41,7 @@
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-# don't build on ppc64 since hevea hasn't been built on ppc64 yet
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -174,6 +173,22 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-10
+- Re-exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-9
+- Fix license
+- Don't exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-8
+- Bump & rebuild to build against latest erlang package.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-7
+- Bump release and rebuild due to Koji hiccups.
+
 * Tue Jul 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-6
 - Don't try building on PPC64 since hevea isn't available on PPC64.
 


Index: ejabberdctl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/FC-6/ejabberdctl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberdctl	31 Jul 2007 14:01:20 -0000	1.1
+++ ejabberdctl	4 Sep 2007 13:03:29 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $@"
+exec /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra $*"



From fedora-extras-commits at redhat.com  Tue Sep  4 13:08:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:08:13 -0400
Subject: rpms/gdm/devel .cvsignore, 1.53, 1.54 gdm.spec, 1.278, 1.279 sources,
	1.56, 1.57
Message-ID: <200709041308.l84D8DXs005371@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.19.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	16 Aug 2007 03:38:00 -0000	1.53
+++ .cvsignore	4 Sep 2007 13:07:40 -0000	1.54
@@ -1,2 +1 @@
-gdm-2.19.6.tar.bz2
-fedora-faces-20070319.tar.bz2
+gdm-2.19.7.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- gdm.spec	24 Aug 2007 15:33:07 -0000	1.278
+++ gdm.spec	4 Sep 2007 13:07:40 -0000	1.279
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.6
-Release: 5%{?dist}
+Version: 2.19.7
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -52,9 +52,6 @@
 # make gdmsetup work with consolehelper
 Patch35: gdmsetup-path.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=467335
-Patch36: gdm-2.19.5-disable-typeahead.patch
-
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.6-selinux.patch
 
@@ -139,7 +136,6 @@
 %patch32 -p1 -b .a11y-fixes
 %patch33 -p1 -b .pass-ats-to-session
 %patch35 -p1 -b .gdmsetup-path
-%patch36 -p1 -b .disable-typeahead
 %patch37 -p1 -b .selinux
 
 %patch100 -p1 -b .change-defaults
@@ -355,6 +351,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Sep  4 2007 Matthias  Clasen <mclasen at redhat.com> - 1:2.19.7-1
+- Update to 2.19.7
+
 * Fri Aug 24 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.6-5
 - use pam_selinux instead of home grown selinux code (bug 254164)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	16 Aug 2007 03:38:00 -0000	1.56
+++ sources	4 Sep 2007 13:07:40 -0000	1.57
@@ -1,2 +1,2 @@
-89ffb6d595f82f9d04d68121b81c697b  gdm-2.19.6.tar.bz2
+27f04ecfaeabcd238f8df66660d50d7b  gdm-2.19.7.tar.bz2
 7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:13:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:13:19 -0400
Subject: rpms/gedit/devel .cvsignore, 1.64, 1.65 gedit.spec, 1.137,
	1.138 sources, 1.66, 1.67
Message-ID: <200709041313.l84DDJG6005674@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5641

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	16 Aug 2007 02:49:13 -0000	1.64
+++ .cvsignore	4 Sep 2007 13:12:46 -0000	1.65
@@ -1 +1 @@
-gedit-2.19.90.tar.bz2
+gedit-2.19.91.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gedit.spec	16 Aug 2007 02:49:13 -0000	1.137
+++ gedit.spec	4 Sep 2007 13:12:46 -0000	1.138
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.90
+Version: 	2.19.91
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.90-1
 - Update to 2.19.90
 - %%find_lang also finds omf files now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	16 Aug 2007 02:49:13 -0000	1.66
+++ sources	4 Sep 2007 13:12:46 -0000	1.67
@@ -1 +1 @@
-1613de3334030d96e1d7ed86eb526448  gedit-2.19.90.tar.bz2
+eb5fbd8c0f986665235cfc7fa3137e67  gedit-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:24:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:24:31 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.54,
	1.55 gnome-system-monitor.spec, 1.94, 1.95 sources, 1.54, 1.55
Message-ID: <200709041324.l84DOVvF006033@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5993

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.19.91.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	31 Jul 2007 00:33:27 -0000	1.54
+++ .cvsignore	4 Sep 2007 13:23:58 -0000	1.55
@@ -1 +1 @@
-gnome-system-monitor-2.19.6.tar.bz2
+gnome-system-monitor-2.19.91.1.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-system-monitor.spec	23 Aug 2007 18:18:16 -0000	1.94
+++ gnome-system-monitor.spec	4 Sep 2007 13:23:58 -0000	1.95
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.19.6
-Release: 4%{?dist}
+Version: 2.19.91.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -96,9 +96,11 @@
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/gnome-system-monitor/
-%{_datadir}/omf/gnome-system-monitor/
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-4
 - Rebuild for ppc toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	31 Jul 2007 00:33:27 -0000	1.54
+++ sources	4 Sep 2007 13:23:58 -0000	1.55
@@ -1 +1 @@
-7359406ff33ef6b368fd576f0a83219e  gnome-system-monitor-2.19.6.tar.bz2
+2f63214c75995014046d3c401e64fd4d  gnome-system-monitor-2.19.91.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:42:10 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 09:42:10 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1284,
	1.1285 pseudoworkspace.valgrind1.patch, 1.20, 1.21
Message-ID: <200709041342.l84DgAFf006479@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6451

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
add ooo#81258 sw uninit fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -r1.1284 -r1.1285
--- openoffice.org.spec	4 Sep 2007 11:55:50 -0000	1.1284
+++ openoffice.org.spec	4 Sep 2007 13:41:37 -0000	1.1285
@@ -2738,6 +2738,7 @@
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - add ooo#81253 connectivity uninit fix
+- add ooo#81258 sw uninit fix
 
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pseudoworkspace.valgrind1.patch	4 Sep 2007 11:55:50 -0000	1.20
+++ pseudoworkspace.valgrind1.patch	4 Sep 2007 13:41:37 -0000	1.21
@@ -44,3 +44,76 @@
          {
              if ( !_rxConnection.is() )
                  throw NullPointerException();
+Index: source/ui/config/usrpref.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 usrpref.cxx
+--- openoffice.org.orig/sw/source/ui/config/usrpref.cxx	27 Jun 2007 12:49:41 -0000	1.32
++++ openoffice.org/sw/source/ui/config/usrpref.cxx	4 Sep 2007 13:34:50 -0000
+@@ -79,16 +79,16 @@
+ }
+ 
+ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
+-	aContentConfig(bWeb, *this),
+-	aLayoutConfig(bWeb, *this),
+-	aGridConfig(bWeb, *this),
+-	aCursorConfig(*this),
+-	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
+ 	nFldUpdateFlags(0),
+     nLinkUpdateMode(0),
+     bIsHScrollMetricSet(sal_False),
+     bIsVScrollMetricSet(sal_False),
+-    nDefTab( MM50 * 4 )
++    nDefTab( MM50 * 4 ),
++	aContentConfig(bWeb, *this),
++	aLayoutConfig(bWeb, *this),
++	aGridConfig(bWeb, *this),
++	aCursorConfig(*this),
++	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
+ {
+     MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
+     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+Index: source/ui/inc/usrpref.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/inc/usrpref.hxx,v
+retrieving revision 1.11
+diff -u -r1.11 usrpref.hxx
+--- openoffice.org.orig/sw/source/ui/inc/usrpref.hxx	27 Jun 2007 12:50:12 -0000	1.11
++++ openoffice.org/sw/source/ui/inc/usrpref.hxx	4 Sep 2007 13:34:54 -0000
+@@ -141,6 +141,17 @@
+  ---------------------------------------------------------------------------*/
+ class SwMasterUsrPref : public SwViewOption
+ {
++	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
++	sal_Int32	nLinkUpdateMode;
++	FieldUnit	eUserMetric;
++	FieldUnit   eHScrollMetric;
++	sal_Bool    bIsHScrollMetricSet;
++	FieldUnit   eVScrollMetric;
++	sal_Bool    bIsVScrollMetricSet;
++
++	sal_Int32	nDefTab;			//default tab stop distance
++
++
+ 	friend class SwContentViewConfig;
+ 	friend class SwLayoutViewConfig;
+ 	friend class SwGridConfig;
+@@ -153,17 +164,6 @@
+ 	SwCursorConfig		aCursorConfig;
+ 	SwWebColorConfig* 	pWebColorConfig;
+ 
+-	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
+-	sal_Int32	nLinkUpdateMode;
+-	FieldUnit	eUserMetric;
+-    FieldUnit   eHScrollMetric;
+-    sal_Bool    bIsHScrollMetricSet;
+-    FieldUnit   eVScrollMetric;
+-    sal_Bool    bIsVScrollMetricSet;
+-
+-
+-	sal_Int32	nDefTab;			//default tab stop distance
+-
+ public:
+ 	SwMasterUsrPref(BOOL bWeb);
+ 	~SwMasterUsrPref();



From fedora-extras-commits at redhat.com  Tue Sep  4 13:44:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:44:13 -0400
Subject: rpms/beagle/devel .cvsignore, 1.21, 1.22 beagle.spec, 1.100,
	1.101 sources, 1.24, 1.25
Message-ID: <200709041344.l84DiDqQ006570@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6548

Modified Files:
	.cvsignore beagle.spec sources 
Log Message:
0.2.18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 May 2007 03:53:59 -0000	1.21
+++ .cvsignore	4 Sep 2007 13:43:41 -0000	1.22
@@ -1 +1 @@
-beagle-0.2.17.tar.bz2
+beagle-0.2.18.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- beagle.spec	20 May 2007 04:06:53 -0000	1.100
+++ beagle.spec	4 Sep 2007 13:43:41 -0000	1.101
@@ -1,9 +1,10 @@
 Name:           beagle
-Version:        0.2.17
+Version:        0.2.18
 Release:        1%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
-License:        LGPL
+# see COPYING for details
+License:        ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LPGLv2+)
 URL:            http://beagle-project.org/
 Source0:        http://download.gnome.org/sources/beagle/0.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -331,6 +332,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.18-1
+- Update to 0.2.18
+- Update the license field
+
 * Sat May 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.17-1
 - Update to 0.2.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	20 May 2007 03:53:59 -0000	1.24
+++ sources	4 Sep 2007 13:43:41 -0000	1.25
@@ -1 +1 @@
-75903ca41fe8b7729d1a02987625e90f  beagle-0.2.17.tar.bz2
+8bab6ce40fff497120dbfcfd0a789c65  beagle-0.2.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:45:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:45:57 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041345.l84DjvvW006654@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6636

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:45:24 -0000	1.6
@@ -1,14 +1,15 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{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
@@ -41,6 +42,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 13:47:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:47:55 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/F-7
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041347.l84DltxW006756@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6722

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:47:22 -0000	1.6
@@ -1,14 +1,15 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{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
@@ -41,6 +42,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 13:52:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 09:52:16 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.60, 1.61 epiphany.spec, 1.159,
	1.160 sources, 1.61, 1.62
Message-ID: <200709041352.l84DqGXR006943@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	14 Aug 2007 02:11:58 -0000	1.60
+++ .cvsignore	4 Sep 2007 13:51:44 -0000	1.61
@@ -1 +1 @@
-epiphany-2.19.90.tar.bz2
+epiphany-2.19.91.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- epiphany.spec	24 Aug 2007 14:42:56 -0000	1.159
+++ epiphany.spec	4 Sep 2007 13:51:44 -0000	1.160
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -190,6 +190,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
+- Update to 2.19.91
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	14 Aug 2007 02:11:58 -0000	1.61
+++ sources	4 Sep 2007 13:51:44 -0000	1.62
@@ -1 +1 @@
-037ed0468cc44b81ce069bc9f9b46d1d  epiphany-2.19.90.tar.bz2
+9bd85a26913b90b8c81ec6b300f9ecf8  epiphany-2.19.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 13:57:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 09:57:27 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel
	perl-Cache-Simple-TimedExpiry.spec, 1.6, 1.7
Message-ID: <200709041357.l84DvRZP007162@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7138

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
Add BR: perl(Test::More) to work around bodhi and mock using divering package sets.


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:45:24 -0000	1.6
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:56:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -42,6 +43,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
 - Update license tag.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Tue Sep  4 14:01:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:01:38 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/F-7
	perl-Cache-Simple-TimedExpiry.spec, 1.6, 1.7
Message-ID: <200709041401.l84E1cl6013232@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10598

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
Add BR: perl(Test::More) to work around bodhi and mock using divering package sets.


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/F-7/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 13:47:22 -0000	1.6
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 14:01:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -42,6 +43,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
 - Update license tag.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Tue Sep  4 14:03:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:03:06 -0400
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-6
	perl-Cache-Simple-TimedExpiry.spec, 1.5, 1.6
Message-ID: <200709041403.l84E36th013388@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13317

Modified Files:
	perl-Cache-Simple-TimedExpiry.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
- BR: perl(Test::More).



Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/FC-6/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:20:49 -0000	1.5
+++ perl-Cache-Simple-TimedExpiry.spec	4 Sep 2007 14:02:33 -0000	1.6
@@ -1,14 +1,16 @@
 Name: 		perl-Cache-Simple-TimedExpiry
 Version: 	0.27
-Release: 	1%{?dist}
+Release: 	3%{?dist}
 Summary: 	A lightweight cache with timed expiration
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Cache-Simple-TimedExpiry/
 Source0: 	http://www.cpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(ExtUtils::MakeMaker)
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,6 +43,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-3
+- BR: perl(Test::More).
+
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Nov 27 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:03:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:03:22 -0400
Subject: rpms/orca/devel .cvsignore, 1.18, 1.19 orca.spec, 1.30, 1.31 sources,
	1.19, 1.20
Message-ID: <200709041403.l84E3MOh013428@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13338

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Aug 2007 22:41:14 -0000	1.18
+++ .cvsignore	4 Sep 2007 14:02:48 -0000	1.19
@@ -1 +1 @@
-orca-2.19.90.tar.bz2
+orca-2.19.92.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- orca.spec	13 Aug 2007 22:41:14 -0000	1.30
+++ orca.spec	4 Sep 2007 14:02:48 -0000	1.31
@@ -15,7 +15,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.19.90
+Version:	2.19.92
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Aug 2007 22:41:14 -0000	1.19
+++ sources	4 Sep 2007 14:02:48 -0000	1.20
@@ -1 +1 @@
-b62dd64bd77b1528d52a054af2975225  orca-2.19.90.tar.bz2
+d41a3d88509537f7674285d8a564f6b6  orca-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 14:07:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:07:39 -0400
Subject: rpms/beagle/devel beagle.spec,1.101,1.102
Message-ID: <200709041407.l84E7dNY013583@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557

Modified Files:
	beagle.spec 
Log Message:
fix desktop file



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- beagle.spec	4 Sep 2007 13:43:41 -0000	1.101
+++ beagle.spec	4 Sep 2007 14:07:05 -0000	1.102
@@ -148,7 +148,7 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   --add-category X-GNOME-SystemSettings				\
   --remove-category Utility                                     \
-  --add-only-show-in=GNOME                                      \
+  --remove-category Application					\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop



From fedora-extras-commits at redhat.com  Tue Sep  4 14:08:35 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 4 Sep 2007 10:08:35 -0400
Subject: rpms/gd/devel gd-2.0.34-fonts.patch, NONE,
	1.1 gd-2.0.34-multilib.patch, 1.1, 1.2 gd.spec, 1.43, 1.44
Message-ID: <200709041408.l84E8ZZV013663@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13637

Modified Files:
	gd-2.0.34-multilib.patch gd.spec 
Added Files:
	gd-2.0.34-fonts.patch 
Log Message:
- fix font paths (#225786#5)
- fix pkgconfig Libs flag (#225786#4)


gd-2.0.34-fonts.patch:

--- NEW FILE gd-2.0.34-fonts.patch ---
--- gd-2.0.34/Makefile.in.pom	2007-09-04 15:08:18.000000000 +0200
+++ gd-2.0.34/Makefile.in	2007-09-04 15:58:05.000000000 +0200
@@ -227,7 +227,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -D_DEFAULT_FONTPATH="/usr/share/X11/fonts/TTF/:/usr/share/fonts/bitstream-vera/:/usr/share/fonts/dejavu-lgc/:/usr/share/fonts/default/Type1/:/usr/share/X11/fonts/Type1"
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@

gd-2.0.34-multilib.patch:

Index: gd-2.0.34-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd-2.0.34-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gd-2.0.34-multilib.patch	8 Feb 2007 13:09:04 -0000	1.1
+++ gd-2.0.34-multilib.patch	4 Sep 2007 14:08:31 -0000	1.2
@@ -1,3 +1,21 @@
+--- /dev/null   2007-09-04 12:46:47.564263777 +0200 
++++ gd-2.0.34/config/gdlib.pc.in        2007-09-04 15:17:09.000000000 +0200 
+@@ -0,0 +1,15 @@ 
++prefix=@prefix@ 
++exec_prefix=@exec_prefix@ 
++libdir=@libdir@ 
++includedir=@includedir@ 
++bindir=@bindir@ 
++ldflags=@LDFLAGS@ 
++ 
++ 
++Name: gd-devel 
++Description: A graphics library for quick creation of PNG or JPEG images 
++Version: @VERSION@ 
++Requires: 
++Libs: -ldg 
++Libs.private: @LIBS@ 
++Cflags: -I at includedir@ 
 --- gd-2.0.34/Makefile.in.pom	2007-02-03 02:41:46.000000000 +0100
 +++ gd-2.0.34/Makefile.in	2007-02-08 13:34:06.000000000 +0100
 @@ -341,6 +341,7 @@
@@ -42,23 +60,6 @@
  	uninstall-includeHEADERS uninstall-info-am \
  	uninstall-libLTLIBRARIES
  
---- gd-2.0.34/config/gdlib.pc.in.pom	2007-02-08 13:29:04.000000000 +0100
-+++ gd-2.0.34/config/gdlib.pc.in	2007-01-29 09:51:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+bindir=@bindir@
-+ldflags=@LDFLAGS@
-+
-+
-+Name: gd-devel
-+Description: A graphics library for quick creation of PNG or JPEG images
-+Version: @VERSION@
-+Requires:
-+Libs: @LIBS@
-+Cflags: -I at includedir@
 --- gd-2.0.34/config/gdlib-config.in.pom	2007-02-03 02:41:00.000000000 +0100
 +++ gd-2.0.34/config/gdlib-config.in	2007-02-08 13:27:25.000000000 +0100
 @@ -7,9 +7,10 @@


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gd.spec	27 Aug 2007 08:47:16 -0000	1.43
+++ gd.spec	4 Sep 2007 14:08:31 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.34
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         System Environment/Libraries
 License:       MIT and GPL
 URL:           http://www.libgd.org/Main_Page
@@ -13,6 +13,7 @@
 Patch6:        gd-2.0.33-overflow.patch
 Patch7:        gd-2.0.33-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
+Patch9:	       gd-2.0.34-fonts.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
 BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@@ -59,6 +60,7 @@
 %patch5 -p1 -b .sparc64 
 %patch7 -p1 -b .AALineThick
 %patch8 -p1 -b .bb
+%patch9 -p1 -b .fonts
 
 %build
 %configure --disable-rpath
@@ -98,6 +100,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-3
+- fix font paths (#225786#5)
+- fix pkgconfig Libs flag (#225786#4)
+
 * Thu Feb 22 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-2
 - incorporate package review feedback
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:13:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:13:39 -0400
Subject: rpms/vino/devel .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 vino.spec,
	1.55, 1.56
Message-ID: <200709041413.l84EDdCH013812@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13779

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Aug 2007 03:39:50 -0000	1.24
+++ .cvsignore	4 Sep 2007 14:13:05 -0000	1.25
@@ -1 +1 @@
-vino-2.19.90.tar.bz2
+vino-2.19.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Aug 2007 03:39:50 -0000	1.24
+++ sources	4 Sep 2007 14:13:05 -0000	1.25
@@ -1 +1 @@
-72de250a85a897f0c83ebfc42582f69d  vino-2.19.90.tar.bz2
+6589eb5b2f9e5e3f2dfd516ff48158a8  vino-2.19.92.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vino.spec	14 Aug 2007 03:42:55 -0000	1.55
+++ vino.spec	4 Sep 2007 14:13:05 -0000	1.56
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.19.90
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.19/%{name}-%{version}.tar.bz2
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 - Update the license field



From fedora-extras-commits at redhat.com  Tue Sep  4 14:19:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:19:05 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 tomboy.spec, 1.53, 1.54
Message-ID: <200709041419.l84EJ5Nv013934@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13912

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Aug 2007 19:56:09 -0000	1.17
+++ .cvsignore	4 Sep 2007 14:18:32 -0000	1.18
@@ -1 +1 @@
-tomboy-0.7.4.tar.bz2
+tomboy-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Aug 2007 19:56:09 -0000	1.17
+++ sources	4 Sep 2007 14:18:32 -0000	1.18
@@ -1 +1 @@
-cdf1d9d70773046b9e20281d692a86a5  tomboy-0.7.4.tar.bz2
+f7a7959bbfe1b67c1f5de32eb118a65a  tomboy-0.7.6.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- tomboy.spec	25 Aug 2007 16:59:22 -0000	1.53
+++ tomboy.spec	4 Sep 2007 14:18:32 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.7.4
-Release: 	3%{?dist}
+Version:        0.7.6
+Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -100,12 +100,14 @@
 %{_datadir}/icons/hicolor/scalable/apps/tomboy.svg
 %{_datadir}/icons/hicolor/scalable/apps/tomboy-tag.svg
 %{_datadir}/pixmaps/tomboy.png
-%{_datadir}/omf/tomboy
 
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.6-1
+- Update to 0.7.6
+
 * Sat Aug 25 2007 Ray Strode <rstrode at redhat.com> - 0.7.4-3
 - Not sure why ppc64 is excluded and it's causing a broken
   conduit dep, try adding it back to the build.



From fedora-extras-commits at redhat.com  Tue Sep  4 14:33:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:33:17 -0400
Subject: rpms/beagle/devel beagle.spec,1.102,1.103
Message-ID: <200709041433.l84EXH4N014298@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14270

Modified Files:
	beagle.spec 
Log Message:
more desktop file fixes



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- beagle.spec	4 Sep 2007 14:07:05 -0000	1.102
+++ beagle.spec	4 Sep 2007 14:32:45 -0000	1.103
@@ -140,8 +140,6 @@
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
-  --add-category X-Red-Hat-Base					\
-  --add-only-show-in=GNOME                                      \
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop
 
 desktop-file-install --vendor gnome --delete-original		\
@@ -149,6 +147,7 @@
   --add-category X-GNOME-SystemSettings				\
   --remove-category Utility                                     \
   --remove-category Application					\
+  --remove-category AdvancedSettings				\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop



From fedora-extras-commits at redhat.com  Tue Sep  4 14:48:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 10:48:20 -0400
Subject: rpms/tomboy/devel tomboy-wrapper.patch, NONE, 1.1 tomboy.spec, 1.54,
	1.55
Message-ID: <200709041448.l84EmK49014575@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14530

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-wrapper.patch 
Log Message:
update patch


tomboy-wrapper.patch:

--- NEW FILE tomboy-wrapper.patch ---
diff -up tomboy-0.7.6/Tomboy/tomboy.in.wrapper tomboy-0.7.6/Tomboy/tomboy.in
--- tomboy-0.7.6/Tomboy/tomboy.in.wrapper	2007-09-03 08:25:31.000000000 -0400
+++ tomboy-0.7.6/Tomboy/tomboy.in	2007-09-04 10:45:19.000000000 -0400
@@ -1,20 +1,10 @@
 #!/bin/sh
 
-if [ "x$PWD" = "x at srcdir@" ] ; then
-    echo "*** Running uninstalled @target@ ***"
+export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
+export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 
-    export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH:./Addins/PrintNotes/.libs"
-    export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-    export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
-
-    THIS_EXE="--debug ./@target@"
-else
-    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-    export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
-    export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
-
-    THIS_EXE="@pkglibdir@/@target@"
-fi
+THIS_EXE="@pkglibdir@/@target@"
 
 if [ -n "@extragac@" ]; then
     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tomboy.spec	4 Sep 2007 14:18:32 -0000	1.54
+++ tomboy.spec	4 Sep 2007 14:47:47 -0000	1.55
@@ -10,7 +10,7 @@
 # Mono.Addins is MIT
 URL:            http://www.beatniksoftware.com/tomboy/
 Source0:        http://download.gnome.org/sources/tomboy/0.7/%{name}-%{version}.tar.bz2
-Patch1:         tomboy-0.7.2-wrapper.patch
+Patch1:         tomboy-wrapper.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Tue Sep  4 14:49:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:49:32 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.11, 1.12
Message-ID: <200709041449.l84EnWBa014657@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14601

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Locale-Maketext-Lexicon.spec	11 Jun 2007 07:49:11 -0000	1.11
+++ perl-Locale-Maketext-Lexicon.spec	4 Sep 2007 14:49:00 -0000	1.12
@@ -1,11 +1,11 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.64
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Extract translatable strings from source
 %if "%{version}" > "0.60"
 License:	MIT
 %else
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 %endif
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
@@ -17,6 +17,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # Required by the tests
 %if "%{version}" > "0.60"
 BuildRequires:  /usr/bin/msgunfmt
@@ -67,6 +69,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
 * Mon Jun 11 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-1
 - Upgrade to 0.64.
 - Reflect source-url having changed.



From fedora-extras-commits at redhat.com  Tue Sep  4 14:51:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 10:51:46 -0400
Subject: rpms/perl-Locale-Maketext-Lexicon/F-7 .cvsignore, 1.7,
	1.8 perl-Locale-Maketext-Lexicon.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709041451.l84Epk4M014815@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Feb 2007 06:40:39 -0000	1.7
+++ .cvsignore	4 Sep 2007 14:51:13 -0000	1.8
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.62.tar.gz
+Locale-Maketext-Lexicon-0.64.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Locale-Maketext-Lexicon.spec	16 Feb 2007 06:40:39 -0000	1.10
+++ perl-Locale-Maketext-Lexicon.spec	4 Sep 2007 14:51:13 -0000	1.11
@@ -1,18 +1,24 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.62
-Release: 	1%{?dist}
+Version: 	0.64
+Release: 	2%{?dist}
 Summary: 	Extract translatable strings from source
 %if "%{version}" > "0.60"
 License:	MIT
 %else
-License:        GPL or Artistic
+License:	GPL+ or Artistic
 %endif
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Locale-Maketext-Lexicon/
+%if "%{version}" >= "0.64"
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-%{version}.tar.gz
+%else
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Lexicon-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # Required by the tests
 %if "%{version}" > "0.60"
 BuildRequires:  /usr/bin/msgunfmt
@@ -63,6 +69,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-2
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+
+* Mon Jun 11 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.64-1
+- Upgrade to 0.64.
+- Reflect source-url having changed.
+
 * Fri Feb 16 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.62-1
 - Upgrade to 0.62.
 - Reflect licence change from Artistic/GPL to MIT.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Feb 2007 06:40:39 -0000	1.7
+++ sources	4 Sep 2007 14:51:13 -0000	1.8
@@ -1 +1 @@
-989642c1a83ddc7f1337d77422ee40cf  Locale-Maketext-Lexicon-0.62.tar.gz
+ce0fc6dfbf41fc4a72d1431e9551a634  Locale-Maketext-Lexicon-0.64.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:11:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 11:11:46 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.55,1.56
Message-ID: <200709041511.l84FBkHw021766@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21742

Modified Files:
	tomboy.spec 
Log Message:
fix file list



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tomboy.spec	4 Sep 2007 14:47:47 -0000	1.55
+++ tomboy.spec	4 Sep 2007 15:11:13 -0000	1.56
@@ -89,6 +89,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_libdir}/%{name}
 %{_bindir}/%{name}
+%{_bindir}/tomboy-panel
 %{_libdir}/%{name}/*
 %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
 %{_libdir}/pkgconfig/*.pc



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:46 -0400
Subject: rpms/rt3/devel rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGk47021945@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/devel

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	29 Dec 2006 09:00:39 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:14 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:49 -0400
Subject: rpms/rt3/F-7 rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGnQ4021948@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/F-7

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-7/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	29 Dec 2006 09:00:39 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:17 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:16:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:16:52 -0400
Subject: rpms/rt3/FC-6 rt3.spec,1.16,1.17
Message-ID: <200709041516.l84FGq7Q021951@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21881/FC-6

Modified Files:
	rt3.spec 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
- Update license tag.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/FC-6/rt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt3.spec	5 Jan 2007 09:51:34 -0000	1.16
+++ rt3.spec	4 Sep 2007 15:16:20 -0000	1.17
@@ -13,11 +13,11 @@
 
 Name:		rt3
 Version:	3.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.bestpractical.com/rt
 Source0:	http://www.bestpractical.com/pub/rt/release/rt-%{version}.tar.gz
 Source3:	rt3.conf.in
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
+- Update license tag.
+
 * Fri Dec 29 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-1
 - Upstream update.
 - Add perl(GD::*) deps.



From fedora-extras-commits at redhat.com  Tue Sep  4 15:25:00 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Tue, 4 Sep 2007 11:25:00 -0400
Subject: rpms/dstat/devel dstat.spec,1.4,1.5
Message-ID: <200709041525.l84FP0de022257@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/dstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22234

Modified Files:
	dstat.spec 
Log Message:
license tag


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dstat.spec	1 May 2007 18:07:18 -0000	1.4
+++ dstat.spec	4 Sep 2007 15:24:28 -0000	1.5
@@ -4,8 +4,8 @@
 Summary: Versatile resource statistics tool
 Name: dstat
 Version: 0.6.6
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
@@ -13,7 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
-#Requires: python # Picked up automatically
+BuildRequires: python
+Requires: python
 
 %description
 Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat.
@@ -31,28 +32,22 @@
 confusion, less mistakes.
 
 %prep
-
 %setup -q
 
 %build
-
-# Plugins .py files are modules, not executable python
-%{__chmod} a-x plugins/*.py
-%{__chmod} a-x examples/*
 # Make sure the docs are in unix format
 %{__sed} -i 's/\r//' docs/*.html
 # Remove the broken symlink
 %{__rm} -rf examples/dstat.py
+%{__chmod} a-x examples/*
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-# Install the docs
+# Install the man page
 cd docs
 %{__make} install DESTDIR=%{buildroot}
-
-/usr/lib/rpm/brp-python-bytecompile # FC4 and FC5 run this automatically
-
+# Plugins .py files are modules, not executable python
 %{__chmod} a-x %{buildroot}/%{_datadir}/dstat/*.py
 %{__chmod} a+x %{buildroot}/%{_datadir}/dstat/dstat.py
 
@@ -73,6 +68,10 @@
 %{_datadir}/dstat/*.pyc
 
 %changelog
+* Tue Sep 04 2007 Radek Brich <rbrich at redhat.com> - 0.6.6-2
+- Updated license tag.
+- Spec clean up.
+
 * Tue May 01 2007 Scott Baker <scott at perturb.org> - 0.6.6-1
 - Bumped to latest release
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:28:19 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 11:28:19 -0400
Subject: rpms/mash/devel .cvsignore, 1.12, 1.13 mash.spec, 1.10, 1.11 sources,
	1.13, 1.14
Message-ID: <200709041528.l84FSJpr022388@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22338

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Aug 2007 02:59:18 -0000	1.12
+++ .cvsignore	4 Sep 2007 15:27:47 -0000	1.13
@@ -1 +1 @@
-mash-0.2.0.tar.gz
+mash-0.2.1.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mash.spec	29 Aug 2007 02:40:32 -0000	1.10
+++ mash.spec	4 Sep 2007 15:27:47 -0000	1.11
@@ -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.2.0
+Version:        0.2.1
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.1-1
+- add nspluginwrapper to multilib whitelist (#275021)
+
 * Tue Aug 28 2007 Bill Nottingham <notting at redhat.com> 0.2.0-1
 - updates to work with pungi 1.0.0, conflict with older pungi
 - fix some multilib compose issues (<drago01 at gmail.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Aug 2007 02:59:18 -0000	1.13
+++ sources	4 Sep 2007 15:27:47 -0000	1.14
@@ -1 +1 @@
-7976838633b47a3e6889b247f1f2d430  mash-0.2.0.tar.gz
+1eab12ece2d64daf0360e30ddb25071e  mash-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:28:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 11:28:31 -0400
Subject: rpms/rt3/devel .cvsignore, 1.6, 1.7 rt3.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200709041528.l84FSVxP022395@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22361

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.4-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Dec 2006 09:00:39 -0000	1.6
+++ .cvsignore	4 Sep 2007 15:27:58 -0000	1.7
@@ -1 +1 @@
-rt-3.6.3.tar.gz
+rt-3.6.4.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rt3.spec	4 Sep 2007 15:16:14 -0000	1.17
+++ rt3.spec	4 Sep 2007 15:27:58 -0000	1.18
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.3
-Release:	2%{?dist}
+Version:	3.6.4
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -243,6 +243,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.4-1
+- Upstream update.
+
 * Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.3-2
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Dec 2006 09:00:39 -0000	1.6
+++ sources	4 Sep 2007 15:27:58 -0000	1.7
@@ -1 +1 @@
-d6b2fa930441f16b6530aa00665eb8c7  rt-3.6.3.tar.gz
+b7a42c308a07b1f7a496d4d816bb87cc  rt-3.6.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:33:16 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 11:33:16 -0400
Subject: rpms/poppler/devel poppler.spec,1.45,1.46
Message-ID: <200709041533.l84FXGWB022616@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22588

Modified Files:
	poppler.spec 
Log Message:
* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.6-1
- Update to 0.6



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- poppler.spec	16 Aug 2007 00:15:21 -0000	1.45
+++ poppler.spec	4 Sep 2007 15:32:44 -0000	1.46
@@ -2,8 +2,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.5.91
-Release: 2%{?dist}
+Version: 0.6
+Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -12,7 +12,6 @@
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
 # https://bugs.freedesktop.org/show_bug.cgi?id=12016
-Patch0: debug-spew.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -75,7 +74,6 @@
 
 %prep
 %setup -c -q -a1
-%patch -p1 -b .debug-spew
 
 %build
 ( cd  %{name}-%{version}
@@ -139,6 +137,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.6-1
+- Update to 0.6
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.91-2
 - Remove debug spew
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:40:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 11:40:07 -0400
Subject: rpms/poppler/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200709041540.l84Fe7a1022835@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22807

Modified Files:
	.cvsignore sources 
Log Message:
Add new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Aug 2007 03:03:27 -0000	1.18
+++ .cvsignore	4 Sep 2007 15:39:35 -0000	1.19
@@ -1 +1,2 @@
-poppler-0.5.91.tar.gz
+poppler-0.6.tar.gz
+poppler-data-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Aug 2007 03:03:27 -0000	1.18
+++ sources	4 Sep 2007 15:39:35 -0000	1.19
@@ -1,2 +1,2 @@
-0cc1b0f183b1559f10154bb57268c6e1  poppler-0.5.91.tar.gz
+96883867572aa1e55e979ec75369c562  poppler-0.6.tar.gz
 5c700eb06dda9dafec09cd85225e34d4  poppler-data-0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:47:10 2007
From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor))
Date: Tue, 4 Sep 2007 11:47:10 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.17,1.18
Message-ID: <200709041547.l84FlAlj025245@cvs-int.fedora.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/F-7

Modified Files:
	mugshot.spec 
Log Message:
- Don't put two autostart files in the autostart directory
  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
  (Nils Philippsen)



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mugshot.spec	22 Aug 2007 20:32:18 -0000	1.17
+++ mugshot.spec	4 Sep 2007 15:46:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -81,7 +81,7 @@
 desktop-file-install 					\
   --dir=$RPM_BUILD_ROOT%{_datadir}/gnome/autostart 	\
   --vendor=mugshot   					\
-  mugshot.desktop
+  mugshot-autostart.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,11 +206,15 @@
 %{_libdir}/mugshot
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
-%{_datadir}/gnome/autostart/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
+- Don't put two autostart files in the autostart directory
+  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
+  (Nils Philippsen)
+
 * Wed Aug 21 2007 Colin Walters <walters at redhat.com> - 1.1.50-1
 - 1.1.50
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:47:13 2007
From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor))
Date: Tue, 4 Sep 2007 11:47:13 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.16,1.17
Message-ID: <200709041547.l84FlDFQ025248@cvs-int.fedora.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/devel

Modified Files:
	mugshot.spec 
Log Message:
- Don't put two autostart files in the autostart directory
  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
  (Nils Philippsen)



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mugshot.spec	21 Aug 2007 19:11:30 -0000	1.16
+++ mugshot.spec	4 Sep 2007 15:46:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -81,7 +81,7 @@
 desktop-file-install 					\
   --dir=$RPM_BUILD_ROOT%{_datadir}/gnome/autostart 	\
   --vendor=mugshot   					\
-  mugshot.desktop
+  mugshot-autostart.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,11 +206,15 @@
 %{_libdir}/mugshot
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
-%{_datadir}/gnome/autostart/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
+- Don't put two autostart files in the autostart directory
+  (https://bugzilla.redhat.com/show_bug.cgi?id=274921)
+  (Nils Philippsen)
+
 * Wed Aug 21 2007 Colin Walters <walters at redhat.com> - 1.1.50-1
 - 1.1.50
 



From fedora-extras-commits at redhat.com  Tue Sep  4 15:54:10 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 11:54:10 -0400
Subject: rpms/dhcp/F-7 dhcp.spec,1.164,1.165 linux,1.5,1.6
Message-ID: <200709041554.l84FsA3r025560@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25480

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- dhcp.spec	9 Jul 2007 14:59:25 -0000	1.164
+++ dhcp.spec	4 Sep 2007 15:53:38 -0000	1.165
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  38%{?dist}
+Release:  39%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -434,6 +434,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
 * Mon Jul 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-38
 - Remove -TERM option from killproc command (#245317)
 


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux	11 Apr 2007 19:38:56 -0000	1.5
+++ linux	4 Sep 2007 15:53:38 -0000	1.6
@@ -410,15 +410,10 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
-	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
-	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
-	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
-	    for s in $new_ntp_servers ${localClocks[@]};
-	      do
-	      echo 'server '$s >> /etc/ntp.conf;
+	    /bin/egrep -v '^server .*  # added by /sbin/dhclient-script$'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    for s in $new_ntp_servers; do
+	      echo "server $s  # added by /sbin/dhclient-script" >> /etc/ntp.conf;
 	    done
-	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
 		: ;
 	    else



From fedora-extras-commits at redhat.com  Tue Sep  4 15:54:55 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 4 Sep 2007 11:54:55 -0400
Subject: rpms/gtkwave/devel .cvsignore, 1.40, 1.41 gtkwave.spec, 1.44,
	1.45 sources, 1.40, 1.41
Message-ID: <200709041554.l84FstC3025617@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25566

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	27 Jul 2007 08:49:24 -0000	1.40
+++ .cvsignore	4 Sep 2007 15:54:23 -0000	1.41
@@ -1 +1 @@
-gtkwave-3.0.30.tar.gz
+gtkwave-3.1.0.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gtkwave.spec	24 Aug 2007 15:36:07 -0000	1.44
+++ gtkwave.spec	4 Sep 2007 15:54:23 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.0.30
-Release:	3%{?dist}
+Version:	3.1.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://home.nc.rr.com/gtkwave/
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Sep  4 2007 Paul Howarth <paul at city-fan.org> 3.1.0-1
+- update to 3.1.0
+
 * Fri Aug 24 2007 Paul Howarth <paul at city-fan.org> 3.0.30-3
 - clarify license as GPL, version 2 or later
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	27 Jul 2007 08:49:24 -0000	1.40
+++ sources	4 Sep 2007 15:54:23 -0000	1.41
@@ -1 +1 @@
-a5b3875938564da41773b31cc2cb1607  gtkwave-3.0.30.tar.gz
+b041a02ba825062c062ee8ac1633bbec  gtkwave-3.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 15:55:19 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 11:55:19 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.168,1.169 linux,1.5,1.6
Message-ID: <200709041555.l84FtJL4025677@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- dhcp.spec	16 Aug 2007 18:33:06 -0000	1.168
+++ dhcp.spec	4 Sep 2007 15:54:47 -0000	1.169
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  3%{?dist}
+Release:  4%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
 * Wed Aug 15 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-3
 - Remove the -x switch enabling extended new option info.  If given to
   dhclient now, it's ignored.


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux	11 Apr 2007 19:38:56 -0000	1.5
+++ linux	4 Sep 2007 15:54:47 -0000	1.6
@@ -410,15 +410,10 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
-	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
-	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
-	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
-	    for s in $new_ntp_servers ${localClocks[@]};
-	      do
-	      echo 'server '$s >> /etc/ntp.conf;
+	    /bin/egrep -v '^server .*  # added by /sbin/dhclient-script$'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    for s in $new_ntp_servers; do
+	      echo "server $s  # added by /sbin/dhclient-script" >> /etc/ntp.conf;
 	    done
-	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
 		: ;
 	    else



From fedora-extras-commits at redhat.com  Tue Sep  4 15:56:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 11:56:58 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.47,1.48
Message-ID: <200709041556.l84Fuwvu025846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25815

Modified Files:
	gcalctool.spec 
Log Message:
fix desktop file handling



Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gcalctool.spec	4 Sep 2007 04:26:59 -0000	1.47
+++ gcalctool.spec	4 Sep 2007 15:56:25 -0000	1.48
@@ -52,10 +52,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-sed -i -e "s/OnlyShowIn=GNOME;//" $RPM_BUILD_ROOT%{_datadir}/applications/*
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+desktop-file-install --vendor gnome --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  --remove-only-show-in GNOME				\
+  --remove-only-show-in XFCE				\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # delete this crap



From fedora-extras-commits at redhat.com  Tue Sep  4 16:02:09 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 12:02:09 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1285,1.1286
Message-ID: <200709041602.l84G29Zf031838@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804

Modified Files:
	openoffice.org.spec 
Log Message:
increase inline-limit to 128


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1285
retrieving revision 1.1286
diff -u -r1.1285 -r1.1286
--- openoffice.org.spec	4 Sep 2007 13:41:37 -0000	1.1285
+++ openoffice.org.spec	4 Sep 2007 16:01:34 -0000	1.1286
@@ -1090,7 +1090,10 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=64"
+#something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+#the frame from tools->bibliography not closable wrt the mutex in
+#LoadEnvListener so use >= 128
+export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
 #add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
 export CXX="$CXX -fno-threadsafe-statics"
 #convert _smp_mflags to dmake equivalent



From fedora-extras-commits at redhat.com  Tue Sep  4 16:04:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 12:04:25 -0400
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.9,
	1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709041604.l84G4Pg9032187@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2007 04:39:53 -0000	1.9
+++ .cvsignore	4 Sep 2007 16:03:51 -0000	1.10
@@ -1 +1 @@
-DBIx-SearchBuilder-1.48.tar.gz
+DBIx-SearchBuilder-1.49.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-DBIx-SearchBuilder.spec	12 Mar 2007 04:39:53 -0000	1.13
+++ perl-DBIx-SearchBuilder.spec	4 Sep 2007 16:03:51 -0000	1.14
@@ -6,10 +6,10 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.48
+Version: 	1.49
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://www.cpan.org/modules/by-module/DBIx/DBIx-SearchBuilder-%{version}.tar.gz
@@ -91,8 +91,12 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
+- Upstream update.
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.48-1
-- Upstream updata.
+- Upstream update.
 - BR: perl(ExtUtils::MakeMaker).
 
 * Fri Mar 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.46-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2007 04:39:53 -0000	1.9
+++ sources	4 Sep 2007 16:03:51 -0000	1.10
@@ -1 +1 @@
-3ce3e7a7a00a6d7f5bab0d215bedf9fe  DBIx-SearchBuilder-1.48.tar.gz
+08bc3cba4d7f39e1e70999e6f77254c7  DBIx-SearchBuilder-1.49.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:18:19 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 4 Sep 2007 12:18:19 -0400
Subject: rpms/abiword/devel abiword-2.4.6-toc-layout.patch, NONE,
	1.1 abiword.spec, 1.44, 1.45
Message-ID: <200709041618.l84GIJMT002189@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.6-toc-layout.patch 
Log Message:
Fix 248103


abiword-2.4.6-toc-layout.patch:

--- NEW FILE abiword-2.4.6-toc-layout.patch ---
r21892 | sum1 | 2007-09-04 01:28:58 +0200 (Tue, 04 Sep 2007) | 4 lines
Fix Red Hat Bug 248103, TOC layout crash when importing RTF.

--- abiword-2.4.6.orig/abi/src/text/fmt/xp/fl_DocLayout.cpp	2007-09-04 17:19:39.000000000 +0200
+++ abiword-2.4.6/abi/src/text/fmt/xp/fl_DocLayout.cpp	2007-09-04 17:23:30.000000000 +0200
@@ -595,14 +595,19 @@ void FL_DocLayout::fillLayouts(void)
 		fl_ContainerLayout * pCL = pLastSec->getLastLayout();
 		fl_BlockLayout * pBL = NULL;
 		bool bRebreak = false;
-		if(pCL->getContainerType() == FL_CONTAINER_BLOCK)
+		if(pCL && (pCL->getContainerType() == FL_CONTAINER_BLOCK))
+
 		{
 	              pBL = static_cast<fl_BlockLayout *>(pCL);
 		}
-		else
+		else if(pCL)
 		{
 	              pBL = pCL->getPrevBlockInDocument();
 		}
+		else
+		{
+	              UT_ASSERT_HARMLESS(pCL);
+		}
 		if(pBL)
 		{
 		      fp_Line * pLine = static_cast<fp_Line *>(pBL->getLastContainer());


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- abiword.spec	6 Apr 2007 16:10:03 -0000	1.44
+++ abiword.spec	4 Sep 2007 16:17:46 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -41,6 +41,7 @@
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
 Patch2: abiword-2.4.6-fontmanager.patch
+Patch3: abiword-2.4.6-toc-layout.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .fontmanager
+%patch3 -p1 -b .toc-layout
 
 %build
 cd abi
@@ -132,6 +134,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Sep 04 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:2.4.6-6.fc7
+- Fix 248103
+
 * Fri Apr 06 2007 Marc Maurer <uwog at abisource.com> - 1:2.4.6-5.fc7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 16:21:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 4 Sep 2007 12:21:39 -0400
Subject: rpms/perl-DBIx-SearchBuilder/F-7 .cvsignore, 1.9,
	1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709041621.l84GLdw0002793@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2672

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2007 04:39:53 -0000	1.9
+++ .cvsignore	4 Sep 2007 16:21:06 -0000	1.10
@@ -1 +1 @@
-DBIx-SearchBuilder-1.48.tar.gz
+DBIx-SearchBuilder-1.49.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-DBIx-SearchBuilder.spec	12 Mar 2007 04:39:53 -0000	1.13
+++ perl-DBIx-SearchBuilder.spec	4 Sep 2007 16:21:06 -0000	1.14
@@ -6,10 +6,10 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.48
+Version: 	1.49
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://www.cpan.org/modules/by-module/DBIx/DBIx-SearchBuilder-%{version}.tar.gz
@@ -91,8 +91,12 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.49-1
+- Upstream update.
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.48-1
-- Upstream updata.
+- Upstream update.
 - BR: perl(ExtUtils::MakeMaker).
 
 * Fri Mar 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.46-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2007 04:39:53 -0000	1.9
+++ sources	4 Sep 2007 16:21:06 -0000	1.10
@@ -1 +1 @@
-3ce3e7a7a00a6d7f5bab0d215bedf9fe  DBIx-SearchBuilder-1.48.tar.gz
+08bc3cba4d7f39e1e70999e6f77254c7  DBIx-SearchBuilder-1.49.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:23:58 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 12:23:58 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.65, 1.66 pykickstart.spec, 1.72,
	1.73 sources, 1.72, 1.73
Message-ID: <200709041623.l84GNwTu003317@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3147

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	3 Sep 2007 23:57:34 -0000	1.65
+++ .cvsignore	4 Sep 2007 16:23:25 -0000	1.66
@@ -1 +1,2 @@
 pykickstart-1.11.tar.gz
+pykickstart-1.12.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pykickstart.spec	3 Sep 2007 23:57:34 -0000	1.72
+++ pykickstart.spec	4 Sep 2007 16:23:25 -0000	1.73
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.11
+Version: 1.12
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -42,6 +42,13 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
+- Fix lots of problems in processing the bootloader, device, network, and
+  raid commands.
+- Add %end when writing out scripts and packages.
+- Add a makefile target to run pychecker to cut down on errors in
+  releases.
+
 * Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
 - fix a few tracebacks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	3 Sep 2007 23:57:34 -0000	1.72
+++ sources	4 Sep 2007 16:23:25 -0000	1.73
@@ -1 +1 @@
-52d10943bca9bf61e9a5dd652b2acdca  pykickstart-1.11.tar.gz
+b623f52865d338ad158e3e03aac426bc  pykickstart-1.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 16:28:23 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 12:28:23 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.50, 1.51 sources, 
	1.61, 1.62 system-config-kickstart.spec, 1.65, 1.66
Message-ID: <200709041628.l84GSNHf004206@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4084

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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	28 Aug 2007 21:38:41 -0000	1.50
+++ .cvsignore	4 Sep 2007 16:27:50 -0000	1.51
@@ -1 +1,2 @@
 system-config-kickstart-2.7.7.1.tar.gz
+system-config-kickstart-2.7.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Aug 2007 21:38:41 -0000	1.61
+++ sources	4 Sep 2007 16:27:50 -0000	1.62
@@ -1 +1 @@
-dddda96f1eb6b40f8d964bb040328948  system-config-kickstart-2.7.7.1.tar.gz
+678a2b3f72edc142162aefc857124ccd  system-config-kickstart-2.7.12.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- system-config-kickstart.spec	28 Aug 2007 15:35:04 -0000	1.65
+++ system-config-kickstart.spec	4 Sep 2007 16:27:50 -0000	1.66
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
-Version: 2.7.11
+Version: 2.7.12
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
@@ -73,6 +73,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 2.7.12-1
+- Rework network device dialog to not use four input boxes for each address.
+- Don't require a gateway or nameserver address (#215191).
+
 * Tue Aug 28 2007 Chris Lumens <clumens at redhat.com> 2.7.11-1
 - The base repo's name has changed (#254601).
 



From fedora-extras-commits at redhat.com  Tue Sep  4 16:30:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 12:30:32 -0400
Subject: rpms/control-center/devel .cvsignore, 1.61, 1.62 control-center.spec,
	1.300, 1.301 sources, 1.64, 1.65
Message-ID: <200709041630.l84GUWjx004572@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4460

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	30 Aug 2007 08:45:16 -0000	1.61
+++ .cvsignore	4 Sep 2007 16:29:59 -0000	1.62
@@ -1 +1 @@
-gnome-control-center-2.19.91.tar.bz2
+gnome-control-center-2.19.92.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- control-center.spec	30 Aug 2007 09:13:51 -0000	1.300
+++ control-center.spec	4 Sep 2007 16:29:59 -0000	1.301
@@ -21,7 +21,7 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.19.91
+Version: 2.19.92
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -330,7 +330,6 @@
 %{_datadir}/gnome-control-center/pixmaps
 %{_datadir}/gnome-control-center/*.xml
 %{_datadir}/applications/*.desktop
-%{_datadir}/omf/control-center
 %{_datadir}/desktop-directories/*
 %{_datadir}/dbus-1/services/*
 %{_datadir}/mime/packages/gnome-theme-package.xml
@@ -387,6 +386,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 30 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.91.-1
 - Update to 2.19.91
 - Update the background and the default-apps patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	30 Aug 2007 08:45:16 -0000	1.64
+++ sources	4 Sep 2007 16:29:59 -0000	1.65
@@ -1 +1 @@
-d077ed6d4c775845bfc4bd3aba9fb65b  gnome-control-center-2.19.91.tar.bz2
+c7019c6351c46a413a90256762c33e57  gnome-control-center-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 16:35:17 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 12:35:17 -0400
Subject: rpms/krb5/devel krb5-1.6.2-key_exp.patch,1.1,1.2
Message-ID: <200709041635.l84GZHIO005188@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5050/devel

Modified Files:
	krb5-1.6.2-key_exp.patch 
Log Message:
- Do what the rfc says we should do, rather than what the error message
  suggests we're doing.


krb5-1.6.2-key_exp.patch:

Index: krb5-1.6.2-key_exp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.2-key_exp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krb5-1.6.2-key_exp.patch	26 Jul 2007 19:06:51 -0000	1.1
+++ krb5-1.6.2-key_exp.patch	4 Sep 2007 16:34:44 -0000	1.2
@@ -1,13 +1,20 @@
 Sadique Puthen notes that the warning on the client side seems to be correspond
-to the wrong attribute on the KDC....
+to the wrong attribute on the KDC.  Do what RFC4120 says we should do.
 --- krb5-1.6.2/src/kdc/do_as_req.c	2007-06-25 15:49:06.000000000 -0400
 +++ krb5-1.6.2/src/kdc/do_as_req.c	2007-06-25 15:49:08.000000000 -0400
-@@ -371,7 +371,7 @@ process_as_req(krb5_kdc_req *request, kr
+@@ -371,7 +371,14 @@ process_as_req(krb5_kdc_req *request, kr
  	goto errout;
      }
      reply_encpart.nonce = request->nonce;
 -    reply_encpart.key_exp = client.expiration;
-+    reply_encpart.key_exp = client.pw_expiration;
++    if (client.expiration == 0) {
++       reply_encpart.key_exp = client.pw_expiration;
++    } else if (client.pw_expiration == 0) {
++       reply_encpart.key_exp = client.expiration;
++    } else {
++       reply_encpart.key_exp = client.pw_expiration < client.expiration ?;
++                               client.pw_expiration : client.expiration;
++    }
      reply_encpart.flags = enc_tkt_reply.flags;
      reply_encpart.server = ticket_reply.server;
  



From fedora-extras-commits at redhat.com  Tue Sep  4 16:41:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Tue, 4 Sep 2007 12:41:43 -0400
Subject: rpms/evince/devel .cvsignore, 1.36, 1.37 evince.spec, 1.91,
	1.92 sources, 1.35, 1.36
Message-ID: <200709041641.l84GfhGJ005985@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
- Update to 2.19.92.  Evince now follows GNOME version numbers.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 Jul 2007 01:30:57 -0000	1.36
+++ .cvsignore	4 Sep 2007 16:41:10 -0000	1.37
@@ -1 +1 @@
-evince-0.9.3.tar.bz2
+evince-2.19.92.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- evince.spec	15 Aug 2007 13:50:43 -0000	1.91
+++ evince.spec	4 Sep 2007 16:41:10 -0000	1.92
@@ -4,8 +4,8 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	0.9.3
-Release:	5%{?dist}
+Version:	2.19.92
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
+- Update to 2.19.92.  Evince now follows GNOME version numbers.
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.9.3-5
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	31 Jul 2007 01:30:57 -0000	1.35
+++ sources	4 Sep 2007 16:41:10 -0000	1.36
@@ -1 +1 @@
-64259f5b7084f5c98b463eb42b000114  evince-0.9.3.tar.bz2
+274db35fee7c46b7d081e1ae86f495c2  evince-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 16:57:52 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 12:57:52 -0400
Subject: rpms/gkrellm/devel gkrellm-2.3.0-gnutls.patch, NONE,
	1.1 gkrellm.spec, 1.9, 1.10
Message-ID: <200709041657.l84GvqKJ007352@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7331

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-gnutls.patch 
Log Message:
* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
- Fix gnutls detection/build and use it instead of openssl.
- Sync user and group creation with current Fedora guidelines.


gkrellm-2.3.0-gnutls.patch:

--- NEW FILE gkrellm-2.3.0-gnutls.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-04 00:10:36.000000000 +0300
@@ -41,6 +41,7 @@ echo "Checking for gnutls... " 1>& 5
 
 cat << EOF > test.c
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <errno.h>
 #include <pthread.h>
 
diff -up gkrellm-2.3.0/src/mail.c~ gkrellm-2.3.0/src/mail.c
--- gkrellm-2.3.0/src/mail.c~	2007-07-07 02:45:25.000000000 +0300
+++ gkrellm-2.3.0/src/mail.c	2007-09-04 00:10:49.000000000 +0300
@@ -34,6 +34,7 @@
 
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <pthread.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellm.spec	7 Aug 2007 20:52:50 -0000	1.9
+++ gkrellm.spec	4 Sep 2007 16:57:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,11 +9,12 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Patch0:         gkrellm-2.3.0-gnutls.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +35,7 @@
 %package daemon
 Summary:        The GNU Krell Monitors Server
 Group:          System Environment/Daemons
-Requires(pre):  /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .gnutls
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
@@ -119,9 +121,10 @@
 
 
 %pre daemon
-# the daemon shouldn't run as nobody
-/usr/sbin/groupadd -r gkrellmd 2> /dev/null || :
-/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2> /dev/null || :
+getent group gkrellmd >/dev/null || groupadd -r gkrellmd
+getent passwd gkrellmd >/dev/null || \
+useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd
+:
 
 %post daemon
 /sbin/chkconfig --add gkrellmd || :
@@ -166,6 +169,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
+- Fix gnutls detection/build and use it instead of openssl.
+- Sync user and group creation with current Fedora guidelines.
+
 * Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:00:54 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 13:00:54 -0400
Subject: fedora-security/audit fc7,1.90,1.91
Message-ID: <200709041700.l84H0sBt007794@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7775

Modified Files:
	fc7 
Log Message:
CVE for gallery2



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fc7	4 Sep 2007 12:44:08 -0000	1.90
+++ fc7	4 Sep 2007 17:00:52 -0000	1.91
@@ -8,7 +8,7 @@
 # Up to date CVE as of CVE email 20070829
 # Up to date FC7 as of 20070829
 
-CVE-MAP-NOMATCH VULNERABLE (gallery2) #267421
+CVE-2007-4650 VULNERABLE (gallery2) #267421
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
 CVE-2007-4631 VULNERABLE (qgit) #268381
 CVE-2007-4565 VULNERABLE (fetchmail) #260861



From fedora-extras-commits at redhat.com  Tue Sep  4 17:27:10 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Tue, 4 Sep 2007 13:27:10 -0400
Subject: rpms/postgresql/devel ecpg_config.h, NONE, 1.1 postgresql.spec, 1.82,
	1.83
Message-ID: <200709041727.l84HRA9e014996@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948

Modified Files:
	postgresql.spec 
Added Files:
	ecpg_config.h 
Log Message:
Fix multilib problem introduced in 8.2.x: new include file ecpg_config.h
is architecture-dependent.


--- NEW FILE ecpg_config.h ---
/*
 * Kluge to support multilib installation of both 32- and 64-bit RPMS:
 * we need to arrange that header files that appear in both RPMs are
 * identical.  Hence, this file is architecture-independent and calls
 * in an arch-dependent file that will appear in just one RPM.
 *
 * To avoid breaking arches not explicitly supported by Red Hat, we
 * use this indirection file *only* on known multilib arches.
 *
 * Note: this may well fail if user tries to use gcc's -I- option.
 * But that option is deprecated anyway.
 */
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- postgresql.spec	25 Aug 2007 20:53:39 -0000	1.82
+++ postgresql.spec	4 Sep 2007 17:26:37 -0000	1.83
@@ -81,7 +81,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -91,6 +91,7 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
@@ -484,6 +485,8 @@
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+    install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
     ;;
   *)
     ;;
@@ -819,6 +822,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Tom Lane <tgl at redhat.com> 8.2.4-6
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+
 * Sat Aug 25 2007 Tom Lane <tgl at redhat.com> 8.2.4-5
 - Use nicer solution for tzdata file substitution: upstream discussion
   concluded that hardwiring the path was better than a symlink after all.



From fedora-extras-commits at redhat.com  Tue Sep  4 17:31:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 4 Sep 2007 13:31:32 -0400
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.4,1.5
Message-ID: <200709041731.l84HVWHg015146@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15106

Modified Files:
	ocaml-lablgl.spec 
Log Message:



Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-lablgl.spec	30 Aug 2007 09:47:31 -0000	1.4
+++ ocaml-lablgl.spec	4 Sep 2007 17:31:00 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgl
 Version:        1.02
-Release:	13%{?dist}
+Release:	14%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:35:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 13:35:26 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, NONE,
	1.1 openoffice.org.spec, 1.1286,
	1.1287 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch,
	1.4, NONE
Message-ID: <200709041735.l84HZQXT015869@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15817

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 
Removed Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 
Log Message:
remove gcj assumptions

openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch:

--- NEW FILE openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch ---
Index: source/javavm/javavm.cxx
===================================================================
RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
retrieving revision 1.72
diff -u -p -u -r1.72 javavm.cxx
--- openoffice.org.orig/stoc/source/javavm/javavm.cxx	3 Jan 2006 12:44:05 -0000	1.72
+++ openoffice.org/stoc/source/javavm/javavm.cxx	30 Jan 2006 10:12:21 -0000
@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
         {
         case JFW_E_NONE: bStarted = true; break;
         case JFW_E_NO_SELECT:
+        case JFW_E_VM_CREATION_FAILED:
         {
             // No Java configured. We silenty run the java configuration
             // Java.
@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             continue;
             break;
         }
+#if 0
         case JFW_E_VM_CREATION_FAILED:
         {
             //Error:
@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
             askForRetry(css::uno::makeAny(exc));
             return css::uno::Any();
         }
+#endif
         case JFW_E_RUNNING_JVM:
         {
             //This service should make sure that we do not start java twice.
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.12
diff -u -r1.12 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Sep 2006 10:54:01 -0000	1.12
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Nov 2006 16:04:59 -0000
@@ -67,7 +67,6 @@
 {
     static char const* ar[]= {
           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-          "/gcj-4.1.1/libjvm.so",
           "/libgcj.so.7",
           "/libgcj.so.6"
     };


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -r1.1286 -r1.1287
--- openoffice.org.spec	4 Sep 2007 16:01:34 -0000	1.1286
+++ openoffice.org.spec	4 Sep 2007 17:34:53 -0000	1.1287
@@ -50,7 +50,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, libgcj-devel, java-devel, zlib-devel, xerces-j2, prelink
+BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -58,7 +58,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -76,7 +76,7 @@
 %if %{gtkprintui}
 Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
 Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
@@ -146,8 +146,8 @@
 Group: Applications/Productivity
 Requires: liberation-fonts
 Requires: hunspell-en
-Requires: libgcj >= 4.0.0, bsh, java = 1.5.0
-Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
+Requires: bsh, java >= 1.5.0
+Requires: hsqldb, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -283,7 +283,7 @@
 Summary: Software Development Kit for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: unzip, java-1.5.0-gcj-devel
+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}.
@@ -1007,7 +1007,7 @@
 %if %{gtkprintui}
 %patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch14 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
 %patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch16 -p1 -b .ooo54603.fontconfig.patch
 %patch17 -p1 -b .ooo69368.fixxmlsec.patch


--- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 17:47:50 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 13:47:50 -0400
Subject: rpms/offlineimap/devel offlineimap-5.99.2-unclosed_listitem.patch, 
	NONE, 1.1 offlineimap.spec, 1.4, 1.5
Message-ID: <200709041747.l84HlojJ016327@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	offlineimap.spec 
Added Files:
	offlineimap-5.99.2-unclosed_listitem.patch 
Log Message:
* Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml


offlineimap-5.99.2-unclosed_listitem.patch:

--- NEW FILE offlineimap-5.99.2-unclosed_listitem.patch ---
diff -up offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem offlineimap-5.99.2/offlineimap.sgml
--- offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem	2007-09-04 19:43:19.000000000 +0200
+++ offlineimap-5.99.2/offlineimap.sgml	2007-09-04 19:43:09.000000000 +0200
@@ -230,6 +230,7 @@ remoteuser = jgoerzen
 	      IMAP server and point both &OfflineIMAP; and your mail
 	      reader at it.
 	    </para>
+	  </listitem>
 	</itemizedlist>
       </refsect2>
 


Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- offlineimap.spec	16 Aug 2007 14:29:15 -0000	1.4
+++ offlineimap.spec	4 Sep 2007 17:47:17 -0000	1.5
@@ -9,6 +9,7 @@
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
 Source0:        http://software.complete.org/offlineimap/static/download_area/%{version}/%{name}_%{version}.tar.gz
+Patch0:         offlineimap-5.99.2-unclosed_listitem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -29,10 +30,12 @@
 
 %prep
 %setup -q -n %name
+%patch0 -p1
 
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
+make doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +58,7 @@
 * Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
+- add unclosed listitem in offlineimap.sgml
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 17:53:00 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 13:53:00 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1287,1.1288
Message-ID: <200709041753.l84Hr0Ih016448@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16411

Modified Files:
	openoffice.org.spec 
Log Message:
fiddle


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1287
retrieving revision 1.1288
diff -u -r1.1287 -r1.1288
--- openoffice.org.spec	4 Sep 2007 17:34:53 -0000	1.1287
+++ openoffice.org.spec	4 Sep 2007 17:52:28 -0000	1.1288
@@ -1,7 +1,11 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-
+#temp, fix configure
+%ifnarch %{ix86} x86_64
+%define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define 
+%endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
@@ -1071,7 +1075,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-!
 afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdk_line} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh



From fedora-extras-commits at redhat.com  Tue Sep  4 17:55:15 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 4 Sep 2007 13:55:15 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.42,1.43
Message-ID: <200709041755.l84HtFKT016662@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16620

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- create links for default.png etc until more artwork shows up



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- desktop-backgrounds.spec	30 Aug 2007 19:39:27 -0000	1.42
+++ desktop-backgrounds.spec	4 Sep 2007 17:54:42 -0000	1.43
@@ -1,10 +1,10 @@
-%define rh_backgrounds_version 14
+%define rh_backgrounds_version 15
 %define infinity_version 0.0.1
 
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 2
+Release: 3
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -87,9 +87,11 @@
 	rm -rf ${bgdir}/${I}
 done
 
-# default background is now in fedora-logos
-rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default.png
-rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default-wide.png
+# create links until artwork shows up
+(cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
+ ln -s infinity/am00.png default.png;
+ ln -s infinity/am00.png default-wide.png;
+ ln -s infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +110,7 @@
 %{_datadir}/backgrounds/images/stone_bird.jpg
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
+%{_datadir}/backgrounds/images/*.png
 %{_datadir}/backgrounds/infinity/*.png
 %{_datadir}/backgrounds/infinity/infinity.xml
 %dir %{_datadir}/gnome-background-properties
@@ -131,6 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
+- create links for default.png etc until more artwork shows up
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 7.92-2
 - need to include less infinity backgrounds for now; the space usage 
   kill livecds



From fedora-extras-commits at redhat.com  Tue Sep  4 17:56:20 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 13:56:20 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-init_leases.patch, NONE,
	1.1 dhcpv6.spec, 1.61, 1.62
Message-ID: <200709041756.l84HuKTj016793@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)


dhcpv6-0.10-init_leases.patch:

--- NEW FILE dhcpv6-0.10-init_leases.patch ---
diff -up dhcp-0.10/lease.c.init_leases dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.init_leases	2007-09-04 12:25:35.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-04 13:48:44.000000000 -0400
@@ -180,18 +180,25 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
+	struct stat stbuf;
 	file = fopen(name, "a+");
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (!lstat(file, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- dhcpv6.spec	21 Aug 2007 15:34:14 -0000	1.61
+++ dhcpv6.spec	4 Sep 2007 17:55:48 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,6 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
+Patch7:  %{name}-0.10-init_leases.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -79,6 +80,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
+%patch7 -p1 -b .init_leases
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -173,6 +175,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
+- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 0.10-46
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep  4 17:58:45 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 13:58:45 -0400
Subject: rpms/system-config-kickstart/devel sources,1.62,1.63
Message-ID: <200709041758.l84Hwj58016923@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16899

Modified Files:
	sources 
Log Message:
Another try at this build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Sep 2007 16:27:50 -0000	1.62
+++ sources	4 Sep 2007 17:58:13 -0000	1.63
@@ -1 +1 @@
-678a2b3f72edc142162aefc857124ccd  system-config-kickstart-2.7.12.tar.gz
+8b7269b51fa7b40a235b62f2a0c8039c  system-config-kickstart-2.7.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 17:59:43 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Tue, 4 Sep 2007 13:59:43 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-init_leases.patch, NONE, 1.1 dhcpv6.spec,
	1.56, 1.57
Message-ID: <200709041759.l84Hxhbm016997@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)


dhcpv6-0.10-init_leases.patch:

--- NEW FILE dhcpv6-0.10-init_leases.patch ---
diff -up dhcp-0.10/lease.c.init_leases dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.init_leases	2007-09-04 12:25:35.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-04 13:48:44.000000000 -0400
@@ -180,18 +180,25 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
+	struct stat stbuf;
 	file = fopen(name, "a+");
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (!lstat(file, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- dhcpv6.spec	2 Aug 2007 19:15:37 -0000	1.56
+++ dhcpv6.spec	4 Sep 2007 17:59:11 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,6 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
+Patch7:  %{name}-0.10-init_leases.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -68,6 +69,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
+%patch7 -p1 -b .init_leases
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -160,6 +162,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
+- Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
+
 * Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-42
 - Init script fixes (#237973)
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:08:36 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:08:36 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.35, 1.36 bug-buddy.spec, 1.78,
	1.79 sources, 1.35, 1.36
Message-ID: <200709041808.l84I8aFn023281@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.19.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Mar 2007 04:50:07 -0000	1.35
+++ .cvsignore	4 Sep 2007 18:08:03 -0000	1.36
@@ -1 +1 @@
-bug-buddy-2.18.0.tar.bz2
+bug-buddy-2.19.91.svn20070904.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- bug-buddy.spec	31 Mar 2007 00:44:57 -0000	1.78
+++ bug-buddy.spec	4 Sep 2007 18:08:03 -0000	1.79
@@ -1,26 +1,27 @@
 %define pango_version 1.2.0
-%define gtk2_version 2.3.0
+%define gtk2_version 2.11.3
 %define desktop_file_utils_version 0.12-2.fc7
 %define gnome_doc_utils_version 0.2.0
 %define gconf_version 2.14
 
+%define alphatag svn20070904
+
 Name: bug-buddy
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}.%{alphatag}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
-License: GPL
+License: GPLv2 and BSD
 Group: Applications/System
-URL: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/
-Source: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.17/%{name}-%{version}.tar.bz2
-Patch0: bug-buddy-2.18.0-dupe-apps.patch
+URL: http://www.gnome.org
+Source: http://download.gnome.org/sources/bug-buddy/2.19/%{name}-%{version}.%{alphatag}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libxml2-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gnome-vfs2-devel
-BuildRequires: libglade2-devel
 BuildRequires: libgnomecanvas-devel
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -58,8 +59,7 @@
 supports the GNOME, KDE, Debian, and Ximian bug tracking systems.
 
 %prep
-%setup -q
-%patch0 -p1 -b .dupe-apps
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-scrollkeeper
@@ -78,6 +78,12 @@
   --remove-category Application				\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/breakpad-0.1
+rm -rf $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{a,la}
+mv $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so.0.0.0 \
+   $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.{a,la,so.*}
+
 %find_lang %{name}
 
 %clean
@@ -115,14 +121,19 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%doc AUTHORS COPYING NEWS README 
 %{_datadir}/icons/hicolor/48x48/apps/bug-buddy.png
 %{_datadir}/bug-buddy
 %{_datadir}/applications/*
 %{_bindir}/*
+%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+%{_libdir}/bug-buddy/libbreakpad.*
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91.fc8.svn20070904-1
+- Update to a post-2.19.91 snapshot 
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-2
 - Make bug-buddy more robust 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Mar 2007 04:50:07 -0000	1.35
+++ sources	4 Sep 2007 18:08:03 -0000	1.36
@@ -1 +1 @@
-3b3d99f2450f300d73a201bc5c00498d  bug-buddy-2.18.0.tar.bz2
+0f08f484de7870771b4e4fc494a99c4c  bug-buddy-2.19.91.svn20070904.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 18:53:55 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:53:55 -0400
Subject: rpms/offlineimap/F-7 offlineimap-5.99.2-unclosed_listitem.patch,
	NONE, 1.1
Message-ID: <200709041853.l84IrtPv025077@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063

Added Files:
	offlineimap-5.99.2-unclosed_listitem.patch 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc


offlineimap-5.99.2-unclosed_listitem.patch:

--- NEW FILE offlineimap-5.99.2-unclosed_listitem.patch ---
diff -up offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem offlineimap-5.99.2/offlineimap.sgml
--- offlineimap-5.99.2/offlineimap.sgml.unclosed_listitem	2007-09-04 19:43:19.000000000 +0200
+++ offlineimap-5.99.2/offlineimap.sgml	2007-09-04 19:43:09.000000000 +0200
@@ -230,6 +230,7 @@ remoteuser = jgoerzen
 	      IMAP server and point both &OfflineIMAP; and your mail
 	      reader at it.
 	    </para>
+	  </listitem>
 	</itemizedlist>
       </refsect2>
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:54:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:54:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1289,1.1290
Message-ID: <200709041854.l84IsQUm025136@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057

Modified Files:
	openoffice.org.spec 
Log Message:
tweak


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -r1.1289 -r1.1290
--- openoffice.org.spec	4 Sep 2007 18:36:39 -0000	1.1289
+++ openoffice.org.spec	4 Sep 2007 18:53:54 -0000	1.1290
@@ -4,6 +4,9 @@
 #temp, fix configure
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+%else
+%define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -53,7 +56,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
+BuildRequires:	gdb, java_devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -61,7 +64,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu



From fedora-extras-commits at redhat.com  Tue Sep  4 19:01:28 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 4 Sep 2007 15:01:28 -0400
Subject: devel/kvm .cvsignore, 1.14, 1.15 kvm.spec, 1.21, 1.22 sources, 1.14,
	1.15
Message-ID: <200709041901.l84J1SKK031739@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25707

Modified Files:
	.cvsignore kvm.spec sources 
Log Message:
* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
- update to kvm-36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/kvm/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Aug 2007 21:47:03 -0000	1.14
+++ .cvsignore	4 Sep 2007 19:00:54 -0000	1.15
@@ -1 +1 @@
-kvm-35.tar.gz
+kvm-36.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kvm.spec	27 Aug 2007 21:43:49 -0000	1.21
+++ kvm.spec	4 Sep 2007 19:00:54 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 35
-Release: 3%{?dist}
+Version: 36
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -87,6 +87,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
+- update to kvm-36
+
 * Mon Aug 27 2007 Daniel P. Berrange <berrange at redhat.com> - 35-3.fc8
 - Added patch for VNC password auth and TLS+x509 cert auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/kvm/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Aug 2007 21:47:03 -0000	1.14
+++ sources	4 Sep 2007 19:00:54 -0000	1.15
@@ -1 +1 @@
-d83569154ecca5da5514a130865d88c6  kvm-35.tar.gz
+0fdbc4a6228f3876166fc0d6f01bb668  kvm-36.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 19:02:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:02:08 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.81,1.82
Message-ID: <200709041902.l84J2839031831@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31685

Modified Files:
	bug-buddy.spec 
Log Message:
fix file lists for !i386



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- bug-buddy.spec	4 Sep 2007 18:33:28 -0000	1.81
+++ bug-buddy.spec	4 Sep 2007 19:01:33 -0000	1.82
@@ -129,7 +129,9 @@
 %{_datadir}/applications/*
 %{_bindir}/*
 %{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
+%ifarch i386
 %{_libdir}/bug-buddy/libbreakpad.*
+%endif
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog



From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:03:54 -0400
Subject: rpms/blktrace - New directory
Message-ID: <200709041903.l84J3sHM031977@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace

Log Message:
Directory /cvs/extras/rpms/blktrace added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:03:59 -0400
Subject: rpms/blktrace/devel - New directory
Message-ID: <200709041903.l84J3x8e031991@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace/devel

Log Message:
Directory /cvs/extras/rpms/blktrace/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:04:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:04:04 -0400
Subject: rpms/blktrace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709041904.l84J44h4032018@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace

Added Files:
	Makefile import.log 
Log Message:
Setup of module blktrace


--- NEW FILE Makefile ---
# Top level Makefile for module blktrace
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  4 19:04:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:04:08 -0400
Subject: rpms/blktrace/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709041904.l84J48km032034@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse31948/rpms/blktrace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module blktrace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: blktrace
# $Id: Makefile,v 1.1 2007/09/04 19:04:04 kevin Exp $
NAME := blktrace
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 fedora-extras-commits at redhat.com  Tue Sep  4 19:10:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:10:13 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.51, 1.52 gnome-desktop.spec, 
	1.97, 1.98 sources, 1.51, 1.52
Message-ID: <200709041910.l84JADOK032420@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32330

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 03:12:31 -0000	1.51
+++ .cvsignore	4 Sep 2007 19:09:30 -0000	1.52
@@ -1 +1 @@
-gnome-desktop-2.19.90.tar.bz2
+gnome-desktop-2.19.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome-desktop.spec	31 Aug 2007 19:14:39 -0000	1.97
+++ gnome-desktop.spec	4 Sep 2007 19:09:30 -0000	1.98
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.19.90
-Release: 7%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -125,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92 (translation updates)
+
 * Fri Aug 31 2007 Soren Sandmann <sandmann at redhat.com> - 2.19.90-7
 - Plug a leak in the slideshow parser
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 03:12:31 -0000	1.51
+++ sources	4 Sep 2007 19:09:30 -0000	1.52
@@ -1 +1 @@
-7d92bc0ed7a790ca5e890431828c21fe  gnome-desktop-2.19.90.tar.bz2
+b56187d2724b6715fbc9b2da7279d2bf  gnome-desktop-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:18:16 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:18:16 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1291,1.1292
Message-ID: <200709041918.l84JIGfQ032675@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32649

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1291
retrieving revision 1.1292
diff -u -r1.1291 -r1.1292
--- openoffice.org.spec	4 Sep 2007 18:56:53 -0000	1.1291
+++ openoffice.org.spec	4 Sep 2007 19:17:44 -0000	1.1292
@@ -1,11 +1,13 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-#temp, fix configure
+#temporary until I fix configure to find gcj's jdk_home on its own
+#and when the default java-devel pulled in is icedtea on intel-alikes
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
+%define jdk_line 
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2746,6 +2748,9 @@
 
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
+- rebuild against icu
+- rebuild against icedtea
+- don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix
 



From fedora-extras-commits at redhat.com  Tue Sep  4 19:20:11 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:20:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1292,1.1293
Message-ID: <200709041920.l84JKBGs000306@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32750

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -r1.1292 -r1.1293
--- openoffice.org.spec	4 Sep 2007 19:17:44 -0000	1.1292
+++ openoffice.org.spec	4 Sep 2007 19:19:39 -0000	1.1293
@@ -7,7 +7,6 @@
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
-%define jdk_line 
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build



From fedora-extras-commits at redhat.com  Tue Sep  4 19:22:19 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 4 Sep 2007 15:22:19 -0400
Subject: devel/kvm kvm.spec, 1.22, 1.23 qemu-0.9.0-vnc-authentication.patch, 
	1.1, 1.2
Message-ID: <200709041922.l84JMJQ5000384@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359

Modified Files:
	kvm.spec qemu-0.9.0-vnc-authentication.patch 
Log Message:
* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
- rebase vnc auth patch



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kvm.spec	4 Sep 2007 19:00:54 -0000	1.22
+++ kvm.spec	4 Sep 2007 19:21:46 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -42,7 +42,7 @@
 
 %patch101 -p1
 %patch102 -p0
-%patch103 -p1
+%patch103 -p1 -b .vnc
 
 %build
 LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -87,6 +87,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
+- rebase vnc auth patch
+
 * Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-1
 - update to kvm-36
 

qemu-0.9.0-vnc-authentication.patch:

Index: qemu-0.9.0-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/devel/kvm/qemu-0.9.0-vnc-authentication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-0.9.0-vnc-authentication.patch	27 Aug 2007 21:43:49 -0000	1.1
+++ qemu-0.9.0-vnc-authentication.patch	4 Sep 2007 19:21:46 -0000	1.2
@@ -1,76 +1,72 @@
-diff -rupN kvm-35.orig/qemu/configure kvm-35.new/qemu/configure
---- kvm-35.orig/qemu/configure	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/configure	2007-08-27 17:08:38.000000000 -0400
-@@ -86,6 +86,7 @@ alsa="no"
- fmod="no"
- fmod_lib=""
- fmod_inc=""
-+vnc_tls="yes"
- bsd="no"
- linux="no"
- kqemu="no"
-@@ -228,6 +229,8 @@ for opt do
-   ;;
-   --fmod-inc=*) fmod_inc="$optarg"
-   ;;
-+  --disable-vnc-tls) vnc_tls="no"
-+  ;;
-   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"
-   ;;
-   --disable-slirp) slirp="no"
-@@ -303,6 +306,7 @@ echo "  --enable-coreaudio       enable 
- echo "  --enable-alsa            enable ALSA audio driver"
- echo "  --enable-fmod            enable FMOD audio driver"
- echo "  --enabled-dsound         enable DirectSound audio driver"
-+echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
- echo "  --enable-system          enable all system emulation targets"
- echo "  --disable-system         disable all system emulation targets"
- echo "  --enable-linux-user      enable all linux usermode emulation targets"
-@@ -548,6 +552,16 @@ else
- fi # -z $sdl
+diff -up kvm-36/qemu/vl.h.vnc kvm-36/qemu/vl.h
+--- kvm-36/qemu/vl.h.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/vl.h	2007-09-04 15:15:08.000000000 -0400
+@@ -118,6 +118,7 @@ void hw_error(const char *fmt, ...);
+ extern const char *bios_dir;
  
- ##########################################
-+# VNC TLS detection
-+if test "$vnc_tls" = "yes" ; then
-+  `pkg-config gnutls` || vnc_tls="no"
-+fi
-+if test "$vnc_tls" = "yes" ; then
-+  vnc_tls_cflags=`pkg-config --cflags gnutls`
-+  vnc_tls_libs=`pkg-config --libs gnutls`
-+fi
-+
-+##########################################
- # alsa sound support libraries
+ extern int vm_running;
++extern const char *qemu_name;
  
- if test "$alsa" = "yes" ; then
-@@ -632,6 +646,11 @@ else
-     fmod_support=""
- fi
- echo "FMOD support      $fmod $fmod_support"
-+echo "VNC TLS support   $vnc_tls"
-+if test "$vnc_tls" = "yes" ; then
-+    echo "    TLS CFLAGS    $vnc_tls_cflags"
-+    echo "    TLS LIBS      $vnc_tls_libs"
-+fi
- echo "kqemu support     $kqemu"
- echo "kvm support       $kvm"
- echo "Documentation     $build_docs"
-@@ -776,6 +795,12 @@ if test "$fmod" = "yes" ; then
-   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
-   echo "#define CONFIG_FMOD 1" >> $config_h
- fi
-+if test "$vnc_tls" = "yes" ; then
-+  echo "CONFIG_VNC_TLS=yes" >> $config_mak
-+  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
-+  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
-+  echo "#define CONFIG_VNC_TLS 1" >> $config_h
-+fi
- qemu_version=`head $source_path/VERSION`
- echo "VERSION=$qemu_version" >>$config_mak
- echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
-diff -rupN kvm-35.orig/qemu/d3des.c kvm-35.new/qemu/d3des.c
---- kvm-35.orig/qemu/d3des.c	1969-12-31 19:00:00.000000000 -0500
-+++ kvm-35.new/qemu/d3des.c	2007-08-27 17:08:38.000000000 -0400
+ typedef struct vm_change_state_entry VMChangeStateEntry;
+ typedef void VMChangeStateHandler(void *opaque, int running);
+@@ -943,7 +944,10 @@ void sdl_display_init(DisplayState *ds, 
+ void cocoa_display_init(DisplayState *ds, int full_screen);
+ 
+ /* vnc.c */
+-void vnc_display_init(DisplayState *ds, const char *display);
++void vnc_display_init(DisplayState *ds);
++void vnc_display_close(DisplayState *ds);
++int vnc_display_open(DisplayState *ds, const char *display);
++int vnc_display_password(DisplayState *ds, const char *password);
+ void do_info_vnc(void);
+ 
+ /* x_keymap.c */
+diff -up kvm-36/qemu/monitor.c.vnc kvm-36/qemu/monitor.c
+--- kvm-36/qemu/monitor.c.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/monitor.c	2007-09-04 15:15:08.000000000 -0400
+@@ -422,7 +422,7 @@ static void do_io_statistics(const char 
+     }
+ }
+ 
+-static void do_change(const char *device, const char *filename)
++static void do_change_block(const char *device, const char *filename)
+ {
+     BlockDriverState *bs;
+     int i;
+@@ -447,6 +447,30 @@ static void do_change(const char *device
+     }
+ }
+ 
++static void do_change_vnc(const char *target)
++{
++    if (strcmp(target, "passwd") == 0 ||
++	strcmp(target, "password") == 0) {
++	char password[9];
++	monitor_readline("Password: ", 1, password, sizeof(password)-1);
++	password[sizeof(password)-1] = '\0';
++	if (vnc_display_password(NULL, password) < 0)
++	    term_printf("could not set VNC server password\n");
++    } else {
++	if (vnc_display_open(NULL, target) < 0)
++	    term_printf("could not start VNC server on %s\n", target);
++    }
++}
++
++static void do_change(const char *device, const char *target)
++{
++    if (strcmp(device, "vnc") == 0) {
++	do_change_vnc(target);
++    } else {
++	do_change_block(device, target);
++    }
++}
++
+ static void do_screen_dump(const char *filename)
+ {
+     vga_hw_screen_dump(filename);
+diff -up /dev/null kvm-36/qemu/d3des.c
+--- /dev/null	2007-08-31 09:05:50.271024097 -0400
++++ kvm-36/qemu/d3des.c	2007-09-04 15:15:08.000000000 -0400
 @@ -0,0 +1,434 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -506,64 +502,9 @@
 + *
 + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
 + **********************************************************************/
-diff -rupN kvm-35.orig/qemu/d3des.h kvm-35.new/qemu/d3des.h
---- kvm-35.orig/qemu/d3des.h	1969-12-31 19:00:00.000000000 -0500
-+++ kvm-35.new/qemu/d3des.h	2007-08-27 17:08:38.000000000 -0400
-@@ -0,0 +1,51 @@
-+/*
-+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
-+ * triple-length support removed for use in VNC.
-+ *
-+ * These changes are:
-+ *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
-+ *
-+ * This software 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.
-+ */
-+
-+/* d3des.h -
-+ *
-+ *	Headers and defines for d3des.c
-+ *	Graven Imagery, 1992.
-+ *
-+ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
-+ *	(GEnie : OUTER; CIS : [71755,204])
-+ */
-+
-+#define EN0	0	/* MODE == encrypt */
-+#define DE1	1	/* MODE == decrypt */
-+
-+extern void deskey(unsigned char *, int);
-+/*		      hexkey[8]     MODE
-+ * Sets the internal key register according to the hexadecimal
-+ * key contained in the 8 bytes of hexkey, according to the DES,
-+ * for encryption or decryption according to MODE.
-+ */
-+
-+extern void usekey(unsigned long *);
-+/*		    cookedkey[32]
-+ * Loads the internal key register with the data in cookedkey.
-+ */
-+
-+extern void cpkey(unsigned long *);
-+/*		   cookedkey[32]
-+ * Copies the contents of the internal key register into the storage
-+ * located at &cookedkey[0].
-+ */
-+
-+extern void des(unsigned char *, unsigned char *);
-+/*		    from[8]	      to[8]
-+ * Encrypts/Decrypts (according to the key currently loaded in the
-+ * internal key register) one block of eight bytes at address 'from'
-+ * into the block at address 'to'.  They can be the same.
-+ */
-+
-+/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
-+ ********************************************************************/
-diff -rupN kvm-35.orig/qemu/Makefile.target kvm-35.new/qemu/Makefile.target
---- kvm-35.orig/qemu/Makefile.target	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/Makefile.target	2007-08-27 17:08:38.000000000 -0400
+diff -up kvm-36/qemu/Makefile.target.vnc kvm-36/qemu/Makefile.target
+--- kvm-36/qemu/Makefile.target.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/Makefile.target	2007-09-04 15:15:08.000000000 -0400
 @@ -365,6 +365,11 @@ LIBS += -lkvm
  DEPLIBS += ../user/libkvm.a
  endif
@@ -594,146 +535,9 @@
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
  
  sdlaudio.o: sdlaudio.c
-diff -rupN kvm-35.orig/qemu/monitor.c kvm-35.new/qemu/monitor.c
---- kvm-35.orig/qemu/monitor.c	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/monitor.c	2007-08-27 17:08:38.000000000 -0400
-@@ -422,7 +422,7 @@ static void do_io_statistics(const char 
-     }
- }
- 
--static void do_change(const char *device, const char *filename)
-+static void do_change_block(const char *device, const char *filename)
- {
-     BlockDriverState *bs;
-     int i;
-@@ -447,6 +447,30 @@ static void do_change(const char *device
-     }
- }
- 
-+static void do_change_vnc(const char *target)
-+{
-+    if (strcmp(target, "passwd") == 0 ||
-+	strcmp(target, "password") == 0) {
-+	char password[9];
-+	monitor_readline("Password: ", 1, password, sizeof(password)-1);
-+	password[sizeof(password)-1] = '\0';
-+	if (vnc_display_password(NULL, password) < 0)
-+	    term_printf("could not set VNC server password\n");
-+    } else {
-+	if (vnc_display_open(NULL, target) < 0)
-+	    term_printf("could not start VNC server on %s\n", target);
-+    }
-+}
-+
-+static void do_change(const char *device, const char *target)
-+{
-+    if (strcmp(device, "vnc") == 0) {
-+	do_change_vnc(target);
-+    } else {
-+	do_change_block(device, target);
-+    }
-+}
-+
- static void do_screen_dump(const char *filename)
- {
-     vga_hw_screen_dump(filename);
-diff -rupN kvm-35.orig/qemu/vl.c kvm-35.new/qemu/vl.c
---- kvm-35.orig/qemu/vl.c	2007-08-27 17:07:03.000000000 -0400
-+++ kvm-35.new/qemu/vl.c	2007-08-27 17:11:10.000000000 -0400
-@@ -180,6 +180,7 @@ const char *option_rom[MAX_OPTION_ROMS];
- int nb_option_roms;
- int semihosting_enabled = 0;
- int autostart = 1;
-+const char *qemu_name;
- int time_drift_fix = 0;
- const char *cpu_vendor_string;
- 
-@@ -6227,12 +6228,10 @@ void main_loop_wait(int timeout)
-         IOHandlerRecord **pioh;
- 
-         for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
--            if (ioh->deleted)
--                continue;
--            if (FD_ISSET(ioh->fd, &rfds)) {
-+            if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
-                 ioh->fd_read(ioh->opaque);
-             }
--            if (FD_ISSET(ioh->fd, &wfds)) {
-+            if (!ioh->deleted && ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
-                 ioh->fd_write(ioh->opaque);
-             }
-         }
-@@ -6404,6 +6403,7 @@ void help(void)
- #if defined(TARGET_PPC) || defined(TARGET_SPARC)
-            "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
- #endif
-+           "-name string    set the name of the guest\n"
-            "\n"
-            "Network options:\n"
-            "-net nic[,vlan=n][,macaddr=addr][,model=type]\n"
-@@ -6570,6 +6570,7 @@ enum {
-     QEMU_OPTION_daemonize,
-     QEMU_OPTION_option_rom,
-     QEMU_OPTION_semihosting,
-+    QEMU_OPTION_name,
-     QEMU_OPTION_incoming,
-     QEMU_OPTION_tdf,
- #if defined(__linux__)
-@@ -6668,6 +6669,7 @@ const QEMUOption qemu_options[] = {
- #if defined(TARGET_ARM)
-     { "semihosting", 0, QEMU_OPTION_semihosting },
- #endif
-+    { "name", HAS_ARG, QEMU_OPTION_name },
-     { "tdf", 0, QEMU_OPTION_tdf }, /* enable time drift fix */
- #if defined(__linux__)
-     { "no-rtc", 0, QEMU_OPTION_no_rtc },
-@@ -7389,6 +7391,9 @@ int main(int argc, char **argv)
-             case QEMU_OPTION_semihosting:
-                 semihosting_enabled = 1;
-                 break;
-+            case QEMU_OPTION_name:
-+                qemu_name = optarg;
-+                break;
-             case QEMU_OPTION_tdf:
-                 time_drift_fix = 1;
- #if defined(__linux__)
-@@ -7616,7 +7621,9 @@ int main(int argc, char **argv)
-     if (nographic) {
-         dumb_display_init(ds);
-     } else if (vnc_display != NULL) {
--	vnc_display_init(ds, vnc_display);
-+        vnc_display_init(ds);
-+        if (vnc_display_open(ds, vnc_display) < 0)
-+            exit(1);
-     } else {
- #if defined(CONFIG_SDL)
-         sdl_display_init(ds, full_screen);
-diff -rupN kvm-35.orig/qemu/vl.h kvm-35.new/qemu/vl.h
---- kvm-35.orig/qemu/vl.h	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/vl.h	2007-08-27 17:08:38.000000000 -0400
-@@ -118,6 +118,7 @@ void hw_error(const char *fmt, ...);
- extern const char *bios_dir;
- 
- extern int vm_running;
-+extern const char *qemu_name;
- 
- typedef struct vm_change_state_entry VMChangeStateEntry;
- typedef void VMChangeStateHandler(void *opaque, int running);
-@@ -943,7 +944,10 @@ void sdl_display_init(DisplayState *ds, 
- void cocoa_display_init(DisplayState *ds, int full_screen);
- 
- /* vnc.c */
--void vnc_display_init(DisplayState *ds, const char *display);
-+void vnc_display_init(DisplayState *ds);
-+void vnc_display_close(DisplayState *ds);
-+int vnc_display_open(DisplayState *ds, const char *display);
-+int vnc_display_password(DisplayState *ds, const char *password);
- void do_info_vnc(void);
- 
- /* x_keymap.c */
-diff -rupN kvm-35.orig/qemu/vnc.c kvm-35.new/qemu/vnc.c
---- kvm-35.orig/qemu/vnc.c	2007-08-14 23:17:30.000000000 -0400
-+++ kvm-35.new/qemu/vnc.c	2007-08-27 17:11:58.000000000 -0400
+diff -up kvm-36/qemu/vnc.c.vnc kvm-36/qemu/vnc.c
+--- kvm-36/qemu/vnc.c.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/vnc.c	2007-09-04 15:15:09.000000000 -0400
 @@ -30,6 +30,28 @@
  
  #include "vnc_keysym.h"
@@ -952,23 +756,7 @@
  
      vs->width = vs->ds->width;
      vs->height = vs->ds->height;
-@@ -1109,8 +1259,13 @@ static int protocol_client_init(VncState
- 	
-     vnc_write(vs, pad, 3);           /* padding */
- 
--    vnc_write_u32(vs, 4);        
--    vnc_write(vs, "QEMU", 4);
-+    if (qemu_name)
-+        size = snprintf(buf, sizeof(buf), "QEMU (%s)", qemu_name);
-+    else
-+        size = snprintf(buf, sizeof(buf), "QEMU");
-+
-+    vnc_write_u32(vs, size);
-+    vnc_write(vs, buf, size);
-     vnc_flush(vs);
- 
-     vnc_read_when(vs, protocol_client_msg, 1);
-@@ -1118,23 +1273,587 @@ static int protocol_client_init(VncState
+@@ -1126,23 +1276,587 @@ static int protocol_client_init(VncState
      return 0;
  }
  
@@ -1563,7 +1351,7 @@
  
      return 0;
  }
-@@ -1147,9 +1866,10 @@ static void vnc_listen_read(void *opaque
+@@ -1155,9 +1869,10 @@ static void vnc_listen_read(void *opaque
  
      vs->csock = accept(vs->lsock, (struct sockaddr *)&addr, &addrlen);
      if (vs->csock != -1) {
@@ -1575,7 +1363,7 @@
  	vnc_flush(vs);
  	vnc_read_when(vs, protocol_version, 12);
  	memset(vs->old_data, 0, vs->ds->linesize * vs->ds->height);
-@@ -1162,16 +1882,8 @@ static void vnc_listen_read(void *opaque
+@@ -1170,16 +1885,8 @@ static void vnc_listen_read(void *opaque
  
  extern int parse_host_port(struct sockaddr_in *saddr, const char *str);
  
@@ -1593,7 +1381,7 @@
      VncState *vs;
  
      vs = qemu_mallocz(sizeof(VncState));
-@@ -1180,7 +1892,8 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1188,7 +1895,8 @@ void vnc_display_init(DisplayState *ds, 
  
      ds->opaque = vs;
      vnc_state = vs;
@@ -1603,7 +1391,7 @@
  
      vs->lsock = -1;
      vs->csock = -1;
-@@ -1205,16 +1918,232 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1213,16 +1921,232 @@ void vnc_display_init(DisplayState *ds, 
      memset(vs->dirty_row, 0xFF, sizeof(vs->dirty_row));
  
      vnc_dpy_resize(vs->ds, 640, 400);
@@ -1838,7 +1626,7 @@
  	}
  
  	uaddr.sun_family = AF_UNIX;
-@@ -1228,40 +2157,53 @@ void vnc_display_init(DisplayState *ds, 
+@@ -1236,40 +2160,53 @@ void vnc_display_init(DisplayState *ds, 
  	addr = (struct sockaddr *)&iaddr;
  	addrlen = sizeof(iaddr);
  
@@ -1907,3 +1695,199 @@
 -    }
 +    return qemu_set_fd_handler2(vs->lsock, vnc_listen_poll, vnc_listen_read, NULL, vs);
  }
+diff -up /dev/null kvm-36/qemu/d3des.h
+--- /dev/null	2007-08-31 09:05:50.271024097 -0400
++++ kvm-36/qemu/d3des.h	2007-09-04 15:15:08.000000000 -0400
+@@ -0,0 +1,51 @@
++/*
++ * This is D3DES (V5.09) by Richard Outerbridge with the double and
++ * triple-length support removed for use in VNC.
++ *
++ * These changes are:
++ *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
++ *
++ * This software 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.
++ */
++
++/* d3des.h -
++ *
++ *	Headers and defines for d3des.c
++ *	Graven Imagery, 1992.
++ *
++ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
++ *	(GEnie : OUTER; CIS : [71755,204])
++ */
++
++#define EN0	0	/* MODE == encrypt */
++#define DE1	1	/* MODE == decrypt */
++
++extern void deskey(unsigned char *, int);
++/*		      hexkey[8]     MODE
++ * Sets the internal key register according to the hexadecimal
++ * key contained in the 8 bytes of hexkey, according to the DES,
++ * for encryption or decryption according to MODE.
++ */
++
++extern void usekey(unsigned long *);
++/*		    cookedkey[32]
++ * Loads the internal key register with the data in cookedkey.
++ */
++
++extern void cpkey(unsigned long *);
++/*		   cookedkey[32]
++ * Copies the contents of the internal key register into the storage
++ * located at &cookedkey[0].
++ */
++
++extern void des(unsigned char *, unsigned char *);
++/*		    from[8]	      to[8]
++ * Encrypts/Decrypts (according to the key currently loaded in the
++ * internal key register) one block of eight bytes at address 'from'
++ * into the block at address 'to'.  They can be the same.
++ */
++
++/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
++ ********************************************************************/
+diff -up kvm-36/qemu/configure.vnc kvm-36/qemu/configure
+--- kvm-36/qemu/configure.vnc	2007-08-21 10:09:33.000000000 -0400
++++ kvm-36/qemu/configure	2007-09-04 15:15:08.000000000 -0400
+@@ -86,6 +86,7 @@ alsa="no"
+ fmod="no"
+ fmod_lib=""
+ fmod_inc=""
++vnc_tls="yes"
+ bsd="no"
+ linux="no"
+ kqemu="no"
+@@ -228,6 +229,8 @@ for opt do
+   ;;
+   --fmod-inc=*) fmod_inc="$optarg"
+   ;;
++  --disable-vnc-tls) vnc_tls="no"
++  ;;
+   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"
+   ;;
+   --disable-slirp) slirp="no"
+@@ -303,6 +306,7 @@ echo "  --enable-coreaudio       enable 
+ echo "  --enable-alsa            enable ALSA audio driver"
+ echo "  --enable-fmod            enable FMOD audio driver"
+ echo "  --enabled-dsound         enable DirectSound audio driver"
++echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
+ echo "  --enable-system          enable all system emulation targets"
+ echo "  --disable-system         disable all system emulation targets"
+ echo "  --enable-linux-user      enable all linux usermode emulation targets"
+@@ -548,6 +552,16 @@ else
+ fi # -z $sdl
+ 
+ ##########################################
++# VNC TLS detection
++if test "$vnc_tls" = "yes" ; then
++  `pkg-config gnutls` || vnc_tls="no"
++fi
++if test "$vnc_tls" = "yes" ; then
++  vnc_tls_cflags=`pkg-config --cflags gnutls`
++  vnc_tls_libs=`pkg-config --libs gnutls`
++fi
++
++##########################################
+ # alsa sound support libraries
+ 
+ if test "$alsa" = "yes" ; then
+@@ -632,6 +646,11 @@ else
+     fmod_support=""
+ fi
+ echo "FMOD support      $fmod $fmod_support"
++echo "VNC TLS support   $vnc_tls"
++if test "$vnc_tls" = "yes" ; then
++    echo "    TLS CFLAGS    $vnc_tls_cflags"
++    echo "    TLS LIBS      $vnc_tls_libs"
++fi
+ echo "kqemu support     $kqemu"
+ echo "kvm support       $kvm"
+ echo "Documentation     $build_docs"
+@@ -776,6 +795,12 @@ if test "$fmod" = "yes" ; then
+   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
+   echo "#define CONFIG_FMOD 1" >> $config_h
+ fi
++if test "$vnc_tls" = "yes" ; then
++  echo "CONFIG_VNC_TLS=yes" >> $config_mak
++  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
++  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
++  echo "#define CONFIG_VNC_TLS 1" >> $config_h
++fi
+ qemu_version=`head $source_path/VERSION`
+ echo "VERSION=$qemu_version" >>$config_mak
+ echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
+diff -up kvm-36/qemu/vl.c.vnc kvm-36/qemu/vl.c
+--- kvm-36/qemu/vl.c.vnc	2007-09-04 15:15:08.000000000 -0400
++++ kvm-36/qemu/vl.c	2007-09-04 15:15:08.000000000 -0400
+@@ -184,6 +184,7 @@ const char *option_rom[MAX_OPTION_ROMS];
+ int nb_option_roms;
+ int semihosting_enabled = 0;
+ int autostart = 1;
++const char *qemu_name;
+ int time_drift_fix = 0;
+ const char *cpu_vendor_string;
+ 
+@@ -6231,12 +6232,10 @@ void main_loop_wait(int timeout)
+         IOHandlerRecord **pioh;
+ 
+         for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
+-            if (ioh->deleted)
+-                continue;
+-            if (FD_ISSET(ioh->fd, &rfds)) {
++            if (!ioh->deleted && ioh->fd_read && FD_ISSET(ioh->fd, &rfds)) {
+                 ioh->fd_read(ioh->opaque);
+             }
+-            if (FD_ISSET(ioh->fd, &wfds)) {
++            if (!ioh->deleted && ioh->fd_write && FD_ISSET(ioh->fd, &wfds)) {
+                 ioh->fd_write(ioh->opaque);
+             }
+         }
+@@ -6408,6 +6407,7 @@ void help(void)
+ #if defined(TARGET_PPC) || defined(TARGET_SPARC)
+            "-g WxH[xDEPTH]  Set the initial graphical resolution and depth\n"
+ #endif
++           "-name string    set the name of the guest\n"
+            "\n"
+            "Network options:\n"
+            "-net nic[,vlan=n][,macaddr=addr][,model=type]\n"
+@@ -6574,6 +6574,7 @@ enum {
+     QEMU_OPTION_daemonize,
+     QEMU_OPTION_option_rom,
+     QEMU_OPTION_semihosting,
++    QEMU_OPTION_name,
+     QEMU_OPTION_incoming,
+     QEMU_OPTION_tdf,
+ #if defined(__linux__)
+@@ -6672,6 +6673,7 @@ const QEMUOption qemu_options[] = {
+ #if defined(TARGET_ARM)
+     { "semihosting", 0, QEMU_OPTION_semihosting },
+ #endif
++    { "name", HAS_ARG, QEMU_OPTION_name },
+     { "tdf", 0, QEMU_OPTION_tdf }, /* enable time drift fix */
+ #if defined(__linux__)
+     { "no-rtc", 0, QEMU_OPTION_no_rtc },
+@@ -7393,6 +7395,9 @@ int main(int argc, char **argv)
+             case QEMU_OPTION_semihosting:
+                 semihosting_enabled = 1;
+                 break;
++            case QEMU_OPTION_name:
++                qemu_name = optarg;
++                break;
+             case QEMU_OPTION_tdf:
+                 time_drift_fix = 1;
+ #if defined(__linux__)
+@@ -7620,7 +7625,9 @@ int main(int argc, char **argv)
+     if (nographic) {
+         dumb_display_init(ds);
+     } else if (vnc_display != NULL) {
+-	vnc_display_init(ds, vnc_display);
++        vnc_display_init(ds);
++        if (vnc_display_open(ds, vnc_display) < 0)
++            exit(1);
+     } else {
+ #if defined(CONFIG_SDL)
+         sdl_display_init(ds, full_screen);



From fedora-extras-commits at redhat.com  Tue Sep  4 19:24:00 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 15:24:00 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1293,1.1294
Message-ID: <200709041924.l84JO0CI000625@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	openoffice.org.spec 
Log Message:
force in java-icedtea for ant


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1293
retrieving revision 1.1294
diff -u -r1.1293 -r1.1294
--- openoffice.org.spec	4 Sep 2007 19:19:39 -0000	1.1293
+++ openoffice.org.spec	4 Sep 2007 19:23:28 -0000	1.1294
@@ -7,6 +7,7 @@
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
 %define jdk_ver 1.5.0
 %else
+%define jdk_line ''
 %define jdk_ver 1.7.0
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build



From fedora-extras-commits at redhat.com  Tue Sep  4 19:28:21 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:28:21 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.42, 1.43 gnome-session.spec, 
	1.136, 1.137 sources, 1.42, 1.43
Message-ID: <200709041928.l84JSLx6000786@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv755

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	13 Aug 2007 23:40:25 -0000	1.42
+++ .cvsignore	4 Sep 2007 19:27:48 -0000	1.43
@@ -1 +1 @@
-gnome-session-2.19.90.tar.bz2
+gnome-session-2.19.92.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-session.spec	23 Aug 2007 17:51:16 -0000	1.136
+++ gnome-session.spec	4 Sep 2007 19:27:48 -0000	1.137
@@ -11,8 +11,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -185,6 +185,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	13 Aug 2007 23:40:25 -0000	1.42
+++ sources	4 Sep 2007 19:27:48 -0000	1.43
@@ -1 +1 @@
-3bc117a08247a491cb29564bb753de08  gnome-session-2.19.90.tar.bz2
+52e05bcb16fbd904e01a5aebb2ce75d1  gnome-session-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 20:00:38 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 16:00:38 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.35,
	1.36 gnome-power-manager.spec, 1.95, 1.96 sources, 1.35, 1.36
Message-ID: <200709042000.l84K0cbj001705@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	30 Jul 2007 02:40:31 -0000	1.35
+++ .cvsignore	4 Sep 2007 20:00:05 -0000	1.36
@@ -1 +1 @@
-gnome-power-manager-2.19.6.tar.bz2
+gnome-power-manager-2.19.92.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-power-manager.spec	29 Aug 2007 03:53:48 -0000	1.95
+++ gnome-power-manager.spec	4 Sep 2007 20:00:05 -0000	1.96
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.19.6
-Release: 3%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.19/gnome-power-manager-%{version}.tar.bz2
@@ -117,7 +117,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
-%changelog
+%changelog 
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.6-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	30 Jul 2007 02:40:31 -0000	1.35
+++ sources	4 Sep 2007 20:00:05 -0000	1.36
@@ -1 +1 @@
-e8eb02cc9169ba459f4d347110835ef4  gnome-power-manager-2.19.6.tar.bz2
+4fa8c70075ac56a22824b2d751df2302  gnome-power-manager-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 20:08:23 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 4 Sep 2007 16:08:23 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.16, 1.17 sources, 
	1.16, 1.17 sugar-presence-service.spec, 1.16, 1.17
Message-ID: <200709042008.l84K8NVP007859@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7826

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 21:53:36 -0000	1.16
+++ .cvsignore	4 Sep 2007 20:07:50 -0000	1.17
@@ -1 +1 @@
-sugar-presence-service-0.65-git25218b4642.tar.bz2
+sugar-presence-service-0.65-gita79f7b6488.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 21:53:37 -0000	1.16
+++ sources	4 Sep 2007 20:07:50 -0000	1.17
@@ -1 +1 @@
-2f0b0019c025c54a47451796a24e9b7c  sugar-presence-service-0.65-git25218b4642.tar.bz2
+5385e5faea01bb8499463accf2edbfd7  sugar-presence-service-0.65-gita79f7b6488.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-presence-service.spec	30 Aug 2007 21:53:37 -0000	1.16
+++ sugar-presence-service.spec	4 Sep 2007 20:07:50 -0000	1.17
@@ -1,9 +1,9 @@
-%define alphatag 20070830git
-%define commitid 25218b4642
+%define alphatag 20070904git
+%define commitid a79f7b6488
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.11.%{alphatag}25218b4642
+Release: 0.12.%{alphatag}a79f7b6488
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.11.20070830git25218b4642
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep  4 20:16:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 4 Sep 2007 16:16:06 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.42, 1.43 sources, 1.43,
	1.44 sugar.spec, 1.51, 1.52
Message-ID: <200709042016.l84KG6ri008052@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8028

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	3 Sep 2007 19:19:44 -0000	1.42
+++ .cvsignore	4 Sep 2007 20:15:33 -0000	1.43
@@ -1 +1 @@
-sugar-0.65-git0b3f687749.tar.bz2
+sugar-0.65-git0ad6398cf1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	3 Sep 2007 19:19:44 -0000	1.43
+++ sources	4 Sep 2007 20:15:33 -0000	1.44
@@ -1 +1 @@
-65e93be43c62389c4905d521f409f6ed  sugar-0.65-git0b3f687749.tar.bz2
+584319f7d8c0f95e44ccea0315528d4f  sugar-0.65-git0ad6398cf1.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sugar.spec	3 Sep 2007 19:19:44 -0000	1.51
+++ sugar.spec	4 Sep 2007 20:15:33 -0000	1.52
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070903git
-%define commitid 0b3f687749
+%define alphatag 20070904git
+%define commitid 0ad6398cf1
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.39.%{alphatag}0b3f687749
+Release: 0.40.%{alphatag}0ad6398cf1
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
+- New snapshot
+
 * Mon Sep  3 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.39.20070903git0b3f687749
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep  4 19:57:45 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 15:57:45 -0400
Subject: rpms/comps-extras/devel .cvsignore, 1.16, 1.17 comps-extras.spec,
	1.25, 1.26 sources, 1.20, 1.21
Message-ID: <200709041957.l84Jvj0t001553@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1531

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
update to 13-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	26 Apr 2007 14:45:21 -0000	1.16
+++ .cvsignore	4 Sep 2007 19:57:12 -0000	1.17
@@ -1 +1 @@
-comps-extras-12.tar.gz
+comps-extras-13.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comps-extras.spec	26 Apr 2007 14:45:21 -0000	1.25
+++ comps-extras.spec	4 Sep 2007 19:57:12 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 12
+Version: 13
 Release: 1
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
@@ -34,6 +34,9 @@
 %{_datadir}/pixmaps/comps/*
 
 %changelog
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> - 13-1
+- add fonts icons, tweak sound & video, system tools
+
 * Thu Apr 26 2007 Bill Nottingham <notting at redhat.com> - 12-1
 - updates to match current icon theme
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Apr 2007 14:45:21 -0000	1.20
+++ sources	4 Sep 2007 19:57:12 -0000	1.21
@@ -1 +1 @@
-a6594a5f0739ee1d7e6477c0783fec86  comps-extras-12.tar.gz
+41e7dc244d279416fd78ddc3ab4810ab  comps-extras-13.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 20:19:00 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 4 Sep 2007 16:19:00 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.51,
	1.52 selinux-policy.spec, 1.491, 1.492
Message-ID: <200709042019.l84KJ054008148@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8125

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
- Allow ktalkd to look at terminals


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- policy-20070501.patch	22 Aug 2007 14:14:52 -0000	1.51
+++ policy-20070501.patch	4 Sep 2007 20:18:57 -0000	1.52
@@ -467,6 +467,17 @@
  	role system_r types dmesg_t;
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te
+--- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-05-07 14:51:05.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-08-30 10:26:28.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ # Allow dmidecode to read /dev/mem
+ dev_read_raw_memory(dmidecode_t)
++dev_search_sysfs(dmidecode_t)
+ 
+ mls_file_read_up(dmidecode_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.4/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-05-07 14:51:05.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te	2007-08-07 09:42:35.000000000 -0400
@@ -1266,6 +1277,15 @@
 -ifdef(`targeted_policy',`',`
  HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:ROLE_gpg_secret_t,s0)
 -')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.6.4/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-07 14:51:02.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/apps/java.fc	2007-08-27 09:50:36.000000000 -0400
+@@ -22,3 +22,5 @@
+ /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/eclipse/eclipse --	gen_context(system_u:object_r:java_exec_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.6.4/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/apps/java.if	2007-08-07 09:42:35.000000000 -0400
@@ -1465,7 +1485,7 @@
  	auth_search_pam_console_data($1_userhelper_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.fc	2007-09-04 15:55:30.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -1488,7 +1508,16 @@
  /usr/lib(64)?/cyrus-imapd/.*	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/dpkg/.+		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib(64)?/emacsen-common/.*		gen_context(system_u:object_r:bin_t,s0)
-@@ -248,6 +254,7 @@
+@@ -164,6 +170,8 @@
+ /usr/libexec/openssh/sftp-server --	gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/local/lib(64)?/ipsec/.*	-- 	gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Brother/lpd(/.*)?		gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Brother/Printer/[^/]*/cupswrapper(/.*)?      gen_context(system_u:object_r:bin_t,s0)
+ 
+ /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ 
+@@ -248,6 +256,7 @@
  /var/ftp/bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  
  /usr/lib/yp/.+			--	gen_context(system_u:object_r:bin_t,s0)
@@ -1496,7 +1525,7 @@
  
  /var/qmail/bin                  -d      gen_context(system_u:object_r:bin_t,s0)
  /var/qmail/bin(/.*)?                    gen_context(system_u:object_r:bin_t,s0)
-@@ -256,3 +263,13 @@
+@@ -256,3 +265,14 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -1510,6 +1539,7 @@
 +/etc/apcupsd/mastertimeout  --    gen_context(system_u:object_r:bin_t,s0)
 +/etc/apcupsd/offbattery  --    gen_context(system_u:object_r:bin_t,s0)
 +/etc/apcupsd/onbattery  --    gen_context(system_u:object_r:bin_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.6.4/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2007-05-07 14:51:04.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/corecommands.if	2007-08-07 09:42:35.000000000 -0400
@@ -1604,7 +1634,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-04 13:41:27.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1643,7 +1673,15 @@
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  network_port(mail, tcp,2000,s0)
-@@ -159,6 +165,9 @@
+@@ -152,6 +158,7 @@
+ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
+ network_port(uucpd, tcp,540,s0)
+ network_port(vnc, tcp,5900,s0)
++network_port(wccp, udp,2048,s0)
+ network_port(xen, tcp,8002,s0)
+ network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
+ network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
+@@ -159,6 +166,9 @@
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -1970,7 +2008,7 @@
  /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-14 08:16:29.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-27 09:57:21.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2073,7 +2111,7 @@
  ')
  
  ########################################
-@@ -3310,6 +3346,24 @@
+@@ -3310,6 +3346,43 @@
  
  ########################################
  ## <summary>
@@ -2095,10 +2133,29 @@
 +
 +########################################
 +## <summary>
++##	dontaudit Add and remove entries from /usr directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_dontaudit_rw_usr_dirs',`
++	gen_require(`
++		type usr_t;
++	')
++
++	dontaudit $1 usr_t:dir rw_dir_perms;
++')
++
++
++########################################
++## <summary>
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3386,6 +3440,24 @@
+@@ -3386,6 +3459,24 @@
  
  ########################################
  ## <summary>
@@ -2123,7 +2180,7 @@
  ##	Read symbolic links in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3432,6 +3504,24 @@
+@@ -3432,6 +3523,24 @@
  
  ########################################
  ## <summary>
@@ -2148,7 +2205,7 @@
  ##	Do not audit attempts to search /usr/src.
  ## </summary>
  ## <param name="domain">
-@@ -3637,7 +3727,7 @@
+@@ -3637,7 +3746,7 @@
  		type var_t;
  	')
  
@@ -2157,7 +2214,7 @@
  ')
  
  ########################################
-@@ -3993,7 +4083,7 @@
+@@ -3993,7 +4102,7 @@
  		type var_lock_t;
  	')
  
@@ -2166,7 +2223,7 @@
  ')
  
  ########################################
-@@ -4012,7 +4102,7 @@
+@@ -4012,7 +4121,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2175,7 +2232,7 @@
  ')
  
  ########################################
-@@ -4181,7 +4271,7 @@
+@@ -4181,7 +4290,7 @@
  		type var_run_t;
  	')
  
@@ -2184,7 +2241,7 @@
  ')
  
  ########################################
-@@ -4529,6 +4619,8 @@
+@@ -4529,6 +4638,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2193,7 +2250,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4551,6 +4643,8 @@
+@@ -4551,6 +4662,8 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2202,7 +2259,7 @@
  ')
  
  ########################################
-@@ -4588,3 +4682,28 @@
+@@ -4588,3 +4701,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')
@@ -2380,7 +2437,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.6.4/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/filesystem.te	2007-08-27 09:16:30.000000000 -0400
 @@ -43,6 +43,11 @@
  #
  # Non-persistent/pseudo filesystems
@@ -2393,7 +2450,7 @@
  type bdev_t;
  fs_type(bdev_t)
  genfscon bdev / gen_context(system_u:object_r:bdev_t,s0)
-@@ -54,17 +59,29 @@
+@@ -54,17 +59,30 @@
  
  type capifs_t;
  fs_type(capifs_t)
@@ -2417,13 +2474,14 @@
 +type fusefs_t;
 +fs_noxattr_type(fusefs_t)
 +allow fusefs_t self:filesystem associate;
++allow fusefs_t fs_t:filesystem associate;
 +genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0)
 +genfscon fuseblk / gen_context(system_u:object_r:fusefs_t,s0)
 +
  type futexfs_t;
  fs_type(futexfs_t)
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
-@@ -83,6 +100,11 @@
+@@ -83,6 +101,11 @@
  fs_type(inotifyfs_t)
  genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0)
  
@@ -2435,7 +2493,7 @@
  type nfsd_fs_t;
  fs_type(nfsd_fs_t)
  genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0)
-@@ -105,6 +127,16 @@
+@@ -105,6 +128,16 @@
  genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0)
  files_mountpoint(rpc_pipefs_t)
  
@@ -2829,7 +2887,7 @@
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-13 19:33:33.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-30 13:53:01.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3080,7 +3138,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.6.4/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-08-20 18:21:53.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.te	2007-08-27 09:57:52.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(apache,1.6.0)
@@ -3266,7 +3324,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -463,6 +526,10 @@
+@@ -463,6 +526,18 @@
  ')
  
  optional_policy(`
@@ -3274,10 +3332,18 @@
 +')
 +
 +optional_policy(`
++	dbus_system_bus_client_template(httpd,httpd_t)
++	dbus_send_system_bus(httpd_t)
++	tunable_policy(`allow_httpd_dbus_avahi',`
++		avahi_dbus_chat(httpd_t)
++	')
++')
++
++optional_policy(`
  	daemontools_service_domain(httpd_t, httpd_exec_t)
  ')
  
-@@ -486,7 +553,6 @@
+@@ -486,7 +561,6 @@
  
  optional_policy(`
  	nagios_read_config(httpd_t)
@@ -3285,7 +3351,15 @@
  ')
  
  optional_policy(`
-@@ -606,6 +672,10 @@
+@@ -506,6 +580,7 @@
+ ')
+ 
+ optional_policy(`
++	files_dontaudit_rw_usr_dirs(httpd_t)
+ 	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
+ 	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
+ ')
+@@ -606,6 +681,10 @@
  manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -3296,7 +3370,7 @@
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -668,6 +738,12 @@
+@@ -668,6 +747,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -3309,7 +3383,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -685,18 +761,6 @@
+@@ -685,18 +770,6 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -3328,7 +3402,7 @@
  ########################################
  #
  # Apache system script local policy
-@@ -706,7 +770,8 @@
+@@ -706,7 +779,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -3338,7 +3412,7 @@
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -720,21 +785,64 @@
+@@ -720,21 +794,64 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -3358,15 +3432,15 @@
  
 -tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
 +tunable_policy(`httpd_use_nfs', `
-+	fs_read_nfs_files(httpd_sys_script_t)
-+	fs_read_nfs_symlinks(httpd_sys_script_t)
-+')
-+
-+tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
  	fs_read_nfs_files(httpd_sys_script_t)
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
++tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs', `
++	fs_read_nfs_files(httpd_sys_script_t)
++	fs_read_nfs_symlinks(httpd_sys_script_t)
++')
++
 +tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
 +	allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
 +	allow httpd_sys_script_t self:udp_socket create_socket_perms;
@@ -3408,23 +3482,23 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_sys_script_t)
  	fs_read_cifs_symlinks(httpd_sys_script_t)
-@@ -754,14 +862,8 @@
+@@ -754,14 +871,8 @@
  # Apache unconfined script local policy
  #
  
 -unconfined_domain(httpd_unconfined_script_t)
 -
--optional_policy(`
+ optional_policy(`
 -	cron_system_entry(httpd_t, httpd_exec_t)
 -')
 -
- optional_policy(`
+-optional_policy(`
 -	nscd_socket_use(httpd_unconfined_script_t)
 +	unconfined_domain(httpd_unconfined_script_t)
  ')
  
  ########################################
-@@ -784,7 +886,26 @@
+@@ -784,7 +895,19 @@
  
  miscfiles_read_localization(httpd_rotatelogs_t)
  
@@ -3437,6 +3511,8 @@
 +
 +files_search_var_lib(httpd_bugzilla_script_t)
 +
++mta_send_mail(httpd_bugzilla_script_t)
++
 +optional_policy(`
 +	mysql_search_db(httpd_bugzilla_script_t)
 +	mysql_stream_connect(httpd_bugzilla_script_t)
@@ -3444,15 +3520,6 @@
 +
 +optional_policy(`
 +	postgresql_stream_connect(httpd_bugzilla_script_t)
-+')
-+
-+
-+optional_policy(`
-+	dbus_system_bus_client_template(httpd,httpd_t)
-+	dbus_send_system_bus(httpd_t)
-+	tunable_policy(`allow_httpd_dbus_avahi',`
-+		avahi_dbus_chat(httpd_t)
-+	')
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-2.6.4/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-05-07 14:51:01.000000000 -0400
@@ -5289,7 +5356,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.6.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-04 11:12:55.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -5298,6 +5365,15 @@
  
  ## <desc>
  ## <p>
+@@ -62,7 +63,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
+ dontaudit kadmind_t self:capability sys_tty_config;
+-allow kadmind_t self:process signal_perms;
++allow kadmind_t self:process { setfscreate signal_perms };
+ allow kadmind_t self:netlink_route_socket r_netlink_socket_perms;
+ allow kadmind_t self:unix_dgram_socket { connect create write };
+ allow kadmind_t self:tcp_socket connected_stream_socket_perms;
 @@ -91,6 +92,7 @@
  kernel_read_kernel_sysctls(kadmind_t)
  kernel_list_proc(kadmind_t)
@@ -5324,7 +5400,15 @@
  
  userdom_dontaudit_use_unpriv_user_fds(kadmind_t)
  userdom_dontaudit_search_sysadm_home_dirs(kadmind_t)
-@@ -227,6 +233,7 @@
+@@ -142,6 +148,7 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(kadmind_t)
++	seutil_read_file_contexts(kadmind_t)
+ ')
+ 
+ optional_policy(`
+@@ -227,6 +234,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
  sysnet_read_config(krb5kdc_t)
@@ -5332,7 +5416,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
-@@ -248,3 +255,36 @@
+@@ -248,3 +256,36 @@
  optional_policy(`
  	udev_read_db(krb5kdc_t)
  ')
@@ -5369,6 +5453,37 @@
 +		pcscd_stream_connect(kerberosclient)
 +	')
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.6.4/policy/modules/services/ktalk.te
+--- nsaserefpolicy/policy/modules/services/ktalk.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ktalk.te	2007-09-04 09:20:32.000000000 -0400
+@@ -49,6 +49,8 @@
+ manage_files_pattern(ktalkd_t,ktalkd_var_run_t,ktalkd_var_run_t)
+ files_pid_filetrans(ktalkd_t,ktalkd_var_run_t,file)
+ 
++auth_use_nsswitch(ktalkd_t)
++
+ kernel_read_kernel_sysctls(ktalkd_t)
+ kernel_read_system_state(ktalkd_t)
+ kernel_read_network_state(ktalkd_t)
+@@ -75,17 +77,9 @@
+ 
+ miscfiles_read_localization(ktalkd_t)
+ 
+-sysnet_read_config(ktalkd_t)
+-
+ ifdef(`targeted_policy',`
+ 	term_dontaudit_use_generic_ptys(ktalkd_t)
+ 	term_dontaudit_use_unallocated_ttys(ktalkd_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(ktalkd_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(ktalkd_t)
+-')
++term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.6.4/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/lpd.if	2007-08-07 09:42:35.000000000 -0400
@@ -5613,8 +5728,8 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-2.6.4/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2007-08-07 09:42:35.000000000 -0400
-@@ -4,13 +4,13 @@
++++ serefpolicy-2.6.4/policy/modules/services/nagios.fc	2007-09-01 07:24:41.000000000 -0400
+@@ -4,13 +4,14 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
  
@@ -5625,6 +5740,7 @@
  
  /var/log/nagios(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
  /var/log/netsaint(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
++/var/spool/nagios(/.*)?			gen_context(system_u:object_r:nagios_spool_t,s0)
  
  ifdef(`distro_debian',`
  /usr/sbin/nagios		--	gen_context(system_u:object_r:nagios_exec_t,s0)
@@ -5633,7 +5749,7 @@
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-2.6.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/nagios.te	2007-09-04 12:41:37.000000000 -0400
 @@ -10,10 +10,6 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t,nagios_exec_t)
@@ -5645,7 +5761,26 @@
  type nagios_etc_t;
  files_config_file(nagios_etc_t)
  
-@@ -73,8 +69,10 @@
+@@ -26,6 +22,9 @@
+ type nagios_var_run_t;
+ files_pid_file(nagios_var_run_t)
+ 
++type nagios_spool_t;
++files_type(nagios_spool_t)
++
+ type nrpe_t;
+ type nrpe_exec_t;
+ init_daemon_domain(nrpe_t,nrpe_exec_t)
+@@ -60,6 +59,8 @@
+ manage_files_pattern(nagios_t,nagios_var_run_t,nagios_var_run_t)
+ files_pid_filetrans(nagios_t,nagios_var_run_t,file)
+ 
++rw_fifo_files_pattern(nagios_t, nagios_spool_t, nagios_spool_t)
++
+ kernel_read_system_state(nagios_t)
+ kernel_read_kernel_sysctls(nagios_t)
+ 
+@@ -73,8 +74,10 @@
  corenet_udp_sendrecv_all_nodes(nagios_t)
  corenet_tcp_sendrecv_all_ports(nagios_t)
  corenet_udp_sendrecv_all_ports(nagios_t)
@@ -5656,7 +5791,7 @@
  
  domain_use_interactive_fds(nagios_t)
  # for ps
-@@ -97,8 +95,6 @@
+@@ -97,8 +100,6 @@
  
  miscfiles_read_localization(nagios_t)
  
@@ -5665,7 +5800,7 @@
  userdom_dontaudit_use_unpriv_user_fds(nagios_t)
  userdom_dontaudit_search_sysadm_home_dirs(nagios_t)
  
-@@ -121,7 +117,7 @@
+@@ -121,7 +122,7 @@
  ')
  
  optional_policy(`
@@ -5674,7 +5809,7 @@
  ')
  
  optional_policy(`
-@@ -141,42 +137,31 @@
+@@ -141,42 +142,31 @@
  #
  # Nagios CGI local policy
  #
@@ -5687,41 +5822,41 @@
 -
 -read_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
--
++allow httpd_nagios_script_t self:process signal_perms;
+ 
 -allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
-+allow httpd_nagios_script_t self:process signal_perms;
++read_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
++read_lnk_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
  
 -allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
 -read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
-+read_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
-+read_lnk_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
- 
--kernel_read_system_state(nagios_cgi_t)
 +allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms;
 +read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
 +read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
  
--corecmd_exec_bin(nagios_cgi_t)
+-kernel_read_system_state(nagios_cgi_t)
 +allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms;
 +read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
 +read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
  
--domain_dontaudit_read_all_domains_state(nagios_cgi_t)
+-corecmd_exec_bin(nagios_cgi_t)
 +kernel_read_system_state(httpd_nagios_script_t)
  
+-domain_dontaudit_read_all_domains_state(nagios_cgi_t)
++domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
+ 
 -files_read_etc_files(nagios_cgi_t)
 -files_read_etc_runtime_files(nagios_cgi_t)
 -files_read_kernel_symbol_table(nagios_cgi_t)
-+domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
- 
--libs_use_ld_so(nagios_cgi_t)
--libs_use_shared_libs(nagios_cgi_t)
 +files_read_etc_runtime_files(httpd_nagios_script_t)
 +files_read_kernel_symbol_table(httpd_nagios_script_t)
  
+-libs_use_ld_so(nagios_cgi_t)
+-libs_use_shared_libs(nagios_cgi_t)
+-
 -logging_send_syslog_msg(nagios_cgi_t)
 -logging_search_logs(nagios_cgi_t)
 -
@@ -5951,10 +6086,61 @@
 +	samba_read_var_files(nscd_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.fc serefpolicy-2.6.4/policy/modules/services/ntp.fc
+--- nsaserefpolicy/policy/modules/services/ntp.fc	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ntp.fc	2007-09-04 11:51:35.000000000 -0400
+@@ -17,3 +17,8 @@
+ /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
+ 
+ /var/run/ntpd\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
++
++/etc/ntp/crypto(/.*)?         gen_context(system_u:object_r:ntpd_key_t,s0)
++/etc/ntp/keys              -- gen_context(system_u:object_r:ntpd_key_t,s0)
++
++/etc/rc\.d/init\.d/ntpd	--	gen_context(system_u:object_r:ntpd_script_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-2.6.4/policy/modules/services/ntp.if
+--- nsaserefpolicy/policy/modules/services/ntp.if	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/ntp.if	2007-09-04 11:52:25.000000000 -0400
+@@ -53,3 +53,22 @@
+ 	corecmd_search_bin($1)
+ 	domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
+ ')
++
++########################################
++## <summary>
++##	Execute ntp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`ntp_script_domtrans',`
++	gen_require(`
++		type ntpd_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1,ntpd_script_exec_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.6.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-08-07 09:42:35.000000000 -0400
-@@ -36,6 +36,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/ntp.te	2007-09-04 11:51:02.000000000 -0400
+@@ -25,6 +25,12 @@
+ type ntpdate_exec_t;
+ init_system_domain(ntpd_t,ntpdate_exec_t)
+ 
++type ntpd_key_t;
++files_type(ntpd_key_t)
++
++type ntpd_script_exec_t;
++init_script_type(ntpd_script_exec_t)
++
+ ########################################
+ #
+ # Local policy
+@@ -36,6 +42,7 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
  allow ntpd_t self:fifo_file { read write getattr };
@@ -5962,7 +6148,16 @@
  allow ntpd_t self:unix_dgram_socket create_socket_perms;
  allow ntpd_t self:unix_stream_socket create_socket_perms;
  allow ntpd_t self:tcp_socket create_stream_socket_perms;
-@@ -81,6 +82,8 @@
+@@ -49,6 +56,8 @@
+ manage_files_pattern(ntpd_t,ntpd_log_t,ntpd_log_t)
+ logging_log_filetrans(ntpd_t,ntpd_log_t,{ file dir })
+ 
++read_files_pattern(ntpd_t,ntpd_key_t,ntpd_key_t)
++
+ # for some reason it creates a file in /tmp
+ manage_dirs_pattern(ntpd_t,ntpd_tmp_t,ntpd_tmp_t)
+ manage_files_pattern(ntpd_t,ntpd_tmp_t,ntpd_tmp_t)
+@@ -81,6 +90,8 @@
  
  fs_getattr_all_fs(ntpd_t)
  fs_search_auto_mountpoints(ntpd_t)
@@ -5971,7 +6166,7 @@
  
  auth_use_nsswitch(ntpd_t)
  
-@@ -106,6 +109,8 @@
+@@ -106,6 +117,8 @@
  
  sysnet_read_config(ntpd_t)
  
@@ -5980,7 +6175,7 @@
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
  userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-@@ -137,6 +142,10 @@
+@@ -137,6 +150,10 @@
  ')
  
  optional_policy(`
@@ -6349,8 +6544,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.6.4/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-08-07 09:42:35.000000000 -0400
-@@ -38,8 +38,6 @@
++++ serefpolicy-2.6.4/policy/modules/services/pegasus.te	2007-09-01 07:03:12.000000000 -0400
+@@ -38,12 +38,11 @@
  allow pegasus_t self:unix_stream_socket create_stream_socket_perms;
  allow pegasus_t self:tcp_socket create_stream_socket_perms;
  
@@ -6359,7 +6554,12 @@
  allow pegasus_t pegasus_conf_t:dir rw_dir_perms;
  allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink };
  allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms;
-@@ -96,13 +94,13 @@
+ 
++manage_dirs_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ manage_files_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ manage_lnk_files_pattern(pegasus_t,pegasus_data_t,pegasus_data_t)
+ filetrans_pattern(pegasus_t,pegasus_conf_t,pegasus_data_t,{ file dir })
+@@ -96,13 +95,13 @@
  
  auth_use_nsswitch(pegasus_t)
  auth_domtrans_chk_passwd(pegasus_t)
@@ -6376,7 +6576,7 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-@@ -116,6 +114,7 @@
+@@ -116,6 +115,7 @@
  miscfiles_read_localization(pegasus_t)
  
  sysnet_read_config(pegasus_t)
@@ -6384,7 +6584,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
  userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
-@@ -129,6 +128,7 @@
+@@ -129,6 +129,7 @@
  
  optional_policy(`
  	logging_send_syslog_msg(pegasus_t)
@@ -6539,8 +6739,34 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.6.4/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-08-13 19:36:56.000000000 -0400
-@@ -84,6 +84,12 @@
++++ serefpolicy-2.6.4/policy/modules/services/postfix.te	2007-09-04 16:10:20.000000000 -0400
+@@ -6,6 +6,14 @@
+ # Declarations
+ #
+ 
++## <desc>
++## <p>
++## Allow postfix_local domain full write access to mail_spool directories
++## 
++## </p>
++## </desc>
++gen_tunable(allow_postfix_local_write_mail_spool,false)
++
+ attribute postfix_user_domains;
+ # domains that transition to the
+ # postfix user domains
+@@ -27,6 +35,10 @@
+ postfix_server_domain_template(local)
+ mta_mailserver_delivery(postfix_local_t)
+ 
++tunable_policy(`allow_postfix_local_write_mail_spool', `
++	mta_rw_spool(postfix_local_t)
++')
++
+ type postfix_local_tmp_t;
+ files_tmp_file(postfix_local_tmp_t)
+ 
+@@ -84,6 +96,12 @@
  type postfix_var_run_t;
  files_pid_file(postfix_var_run_t)
  
@@ -6553,7 +6779,7 @@
  ########################################
  #
  # Postfix master process local policy
-@@ -169,12 +175,18 @@
+@@ -169,12 +187,18 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
  
@@ -6572,7 +6798,7 @@
  	cyrus_stream_connect(postfix_master_t)
  ')
  
-@@ -184,9 +196,17 @@
+@@ -184,9 +208,17 @@
  ')
  
  optional_policy(`
@@ -6590,7 +6816,7 @@
  ###########################################################
  #
  # Partially converted rules.  THESE ARE ONLY TEMPORARY
-@@ -268,6 +288,8 @@
+@@ -268,6 +300,8 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -6599,7 +6825,7 @@
  mta_read_aliases(postfix_local_t)
  mta_delete_spool(postfix_local_t)
  # For reading spamassasin
-@@ -386,7 +408,7 @@
+@@ -386,7 +420,7 @@
  # Postfix pipe local policy
  #
  
@@ -6608,7 +6834,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -395,6 +417,10 @@
+@@ -395,6 +429,10 @@
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
  optional_policy(`
@@ -6619,7 +6845,7 @@
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -441,6 +467,10 @@
+@@ -441,6 +479,10 @@
  ')
  
  optional_policy(`
@@ -6630,7 +6856,7 @@
  	ppp_use_fds(postfix_postqueue_t)
  	ppp_sigchld(postfix_postqueue_t)
  ')
-@@ -519,8 +549,6 @@
+@@ -519,8 +561,6 @@
  # Postfix smtp delivery local policy
  #
  
@@ -6639,7 +6865,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -528,6 +556,8 @@
+@@ -528,6 +568,8 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -6648,7 +6874,7 @@
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
  ')
-@@ -536,6 +566,7 @@
+@@ -536,6 +578,7 @@
  #
  # Postfix smtpd local policy
  #
@@ -6656,7 +6882,7 @@
  allow postfix_smtpd_t postfix_master_t:tcp_socket rw_stream_socket_perms;
  
  # connect to master process
-@@ -552,9 +583,45 @@
+@@ -552,9 +595,45 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -7456,7 +7682,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-23 17:07:33.000000000 -0400
 @@ -28,6 +28,35 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -7579,10 +7805,14 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +363,10 @@
+@@ -319,6 +363,14 @@
  ')
  
  optional_policy(`
++	kerberos_read_keytab(smbd_t)
++')
++
++optional_policy(`
 +	lpd_exec_lpr(smbd_t)
 +')
 +
@@ -7590,7 +7820,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +387,23 @@
+@@ -339,6 +391,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -7614,7 +7844,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +417,7 @@
+@@ -352,7 +421,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -7623,7 +7853,7 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +427,12 @@
+@@ -362,9 +431,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -7637,7 +7867,7 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -391,6 +459,7 @@
+@@ -391,6 +463,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -7645,7 +7875,7 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -457,6 +526,7 @@
+@@ -457,6 +530,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -7653,7 +7883,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +584,7 @@
+@@ -514,7 +588,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -7662,7 +7892,7 @@
  ')
  
  optional_policy(`
-@@ -534,7 +604,6 @@
+@@ -534,7 +608,6 @@
  allow swat_t self:process signal_perms;
  allow swat_t self:fifo_file rw_file_perms;
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
@@ -7670,7 +7900,7 @@
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
  allow swat_t self:netlink_route_socket r_netlink_socket_perms;
-@@ -588,6 +657,7 @@
+@@ -588,6 +661,7 @@
  fs_getattr_xattr_fs(swat_t)
  
  auth_domtrans_chk_passwd(swat_t)
@@ -7678,7 +7908,7 @@
  
  libs_use_ld_so(swat_t)
  libs_use_shared_libs(swat_t)
-@@ -625,19 +695,25 @@
+@@ -625,19 +699,25 @@
  # Winbind local policy
  #
  
@@ -7705,7 +7935,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +721,8 @@
+@@ -645,6 +725,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -7714,7 +7944,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +760,9 @@
+@@ -682,7 +764,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -7724,7 +7954,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +775,6 @@
+@@ -695,9 +779,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -7734,7 +7964,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +790,6 @@
+@@ -713,10 +794,6 @@
  ')
  
  optional_policy(`
@@ -7745,7 +7975,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +809,7 @@
+@@ -736,6 +813,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -7753,7 +7983,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +837,25 @@
+@@ -763,4 +841,25 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -7921,7 +8151,7 @@
  /usr/sbin/snmp(trap)?d	--	gen_context(system_u:object_r:snmpd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.6.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/snmp.te	2007-09-04 10:34:35.000000000 -0400
 @@ -9,9 +9,6 @@
  type snmpd_exec_t;
  init_daemon_domain(snmpd_t,snmpd_exec_t)
@@ -7949,7 +8179,26 @@
  allow snmpd_t snmpd_log_t:file manage_file_perms;
  logging_log_filetrans(snmpd_t,snmpd_log_t,file)
  
-@@ -135,18 +130,19 @@
+@@ -50,6 +45,7 @@
+ 
+ kernel_read_device_sysctls(snmpd_t)
+ kernel_read_kernel_sysctls(snmpd_t)
++kernel_read_fs_sysctls(snmpd_t)
+ kernel_read_net_sysctls(snmpd_t)
+ kernel_read_proc_symlinks(snmpd_t)
+ kernel_read_system_state(snmpd_t)
+@@ -84,9 +80,7 @@
+ files_read_etc_files(snmpd_t)
+ files_read_usr_files(snmpd_t)
+ files_read_etc_runtime_files(snmpd_t)
+-files_search_home(snmpd_t)
+-files_getattr_boot_dirs(snmpd_t)
+-files_dontaudit_getattr_home_dir(snmpd_t)
++auth_read_all_dirs_except_shadow(snmpd_t)
+ 
+ fs_getattr_all_dirs(snmpd_t)
+ fs_getattr_all_fs(snmpd_t)
+@@ -135,18 +129,19 @@
  
  optional_policy(`
  	mta_read_config(snmpd_t)
@@ -8101,8 +8350,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.6.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-08-07 09:42:35.000000000 -0400
-@@ -108,6 +108,8 @@
++++ serefpolicy-2.6.4/policy/modules/services/squid.te	2007-09-04 13:40:38.000000000 -0400
+@@ -91,6 +91,7 @@
+ corenet_udp_bind_gopher_port(squid_t)
+ corenet_tcp_bind_squid_port(squid_t)
+ corenet_udp_bind_squid_port(squid_t)
++corenet_udp_bind_wccp_port(squid_t)
+ corenet_tcp_connect_ftp_port(squid_t)
+ corenet_tcp_connect_gopher_port(squid_t)
+ corenet_tcp_connect_http_port(squid_t)
+@@ -108,6 +109,8 @@
  
  fs_getattr_all_fs(squid_t)
  fs_search_auto_mountpoints(squid_t)
@@ -8111,7 +8368,7 @@
  
  selinux_dontaudit_getattr_dir(squid_t)
  
-@@ -181,7 +183,11 @@
+@@ -181,7 +184,11 @@
  	udev_read_db(squid_t)
  ')
  
@@ -9005,7 +9262,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.6.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/fstools.te	2007-09-04 10:57:17.000000000 -0400
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -9014,7 +9271,17 @@
  role system_r types fsadm_t;
  
  type fsadm_log_t;
-@@ -184,3 +185,9 @@
+@@ -108,8 +109,7 @@
+ 
+ term_use_console(fsadm_t)
+ 
+-corecmd_list_bin(fsadm_t)
+-corecmd_read_bin_symlinks(fsadm_t)
++corecmd_exec_bin(fsadm_t)
+ #RedHat bug #201164
+ corecmd_exec_shell(fsadm_t)
+ 
+@@ -184,3 +184,9 @@
  	fs_dontaudit_write_ramfs_pipes(fsadm_t)
  	rhgb_stub(fsadm_t)
  ')
@@ -9175,7 +9442,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.6.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.if	2007-09-04 11:59:57.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -9191,16 +9458,164 @@
  	role system_r types $1;
  
  	domtrans_pattern(initrc_t,$2,$1)
-@@ -1088,7 +1091,7 @@
+@@ -554,18 +557,19 @@
+ #
+ interface(`init_spec_domtrans_script',`
+ 	gen_require(`
+-		type initrc_t, initrc_exec_t;
++		type initrc_t;
++		attribute initscript;
  	')
  
- 	files_search_tmp($1)
--	rw_files_pattern($1,initrc_tmp_t,initrc_tmp_t)
-+	allow $1 initrc_tmp_t:file rw_file_perms;
+ 	files_list_etc($1)
+-	spec_domtrans_pattern($1,initrc_exec_t,initrc_t)
++	spec_domtrans_pattern($1,initscript,initrc_t)
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
++		range_transition $1 initscript:process s0;
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++		range_transition $1 initscript:process s0 - mls_systemhigh;
+ 	')
+ ')
+ 
+@@ -581,18 +585,46 @@
+ #
+ interface(`init_domtrans_script',`
+ 	gen_require(`
+-		type initrc_t, initrc_exec_t;
++		type initrc_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	domtrans_pattern($1,initrc_exec_t,initrc_t)
++	domtrans_pattern($1,initscript,initrc_t)
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
++		range_transition $1 initscript:process s0;
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++		range_transition $1 initscript:process s0 - mls_systemhigh;
++	')
++')
++
++########################################
++## <summary>
++##	Execute init a specific script with an automatic domain transition.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`init_script_domtrans_spec',`
++	gen_require(`
++		type initrc_t;
++	')
++
++	files_list_etc($1)
++	domtrans_pattern($1,$2,initrc_t)
++
++	ifdef(`enable_mcs',`
++		range_transition $1 $2:process s0;
++	')
++
++	ifdef(`enable_mls',`
++		range_transition $1 $2:process s0 - mls_systemhigh;
+ 	')
+ ')
+ 
+@@ -623,11 +655,11 @@
+ # cjp: added for gentoo integrated run_init
+ interface(`init_script_file_domtrans',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	domain_auto_trans($1,initrc_exec_t,$2)
++	domain_auto_trans($1,initscript,$2)
  ')
  
  ########################################
-@@ -1248,7 +1251,7 @@
+@@ -698,11 +730,11 @@
+ #
+ interface(`init_getattr_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	allow $1 initrc_exec_t:file getattr;
++	allow $1 initscript:file getattr;
+ ')
+ 
+ ########################################
+@@ -717,11 +749,11 @@
+ #
+ interface(`init_exec_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_list_etc($1)
+-	can_exec($1,initrc_exec_t)
++	can_exec($1,initscript)
+ ')
+ 
+ ########################################
+@@ -948,6 +980,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Send messages to init scripts over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`init_dbus_send_script',`
++	gen_require(`
++		type initrc_t;
++		class dbus send_msg;
++	')
++
++	allow $1 initrc_t:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ##	Send and receive messages from
+ ##	init scripts over dbus.
+ ## </summary>
+@@ -1026,11 +1077,11 @@
+ #
+ interface(`init_read_script_files',`
+ 	gen_require(`
+-		type initrc_exec_t;
++		attribute initscript;
+ 	')
+ 
+ 	files_search_etc($1)
+-	allow $1 initrc_exec_t:file read_file_perms;
++	allow $1 initscript:file read_file_perms;
+ ')
+ 
+ ########################################
+@@ -1248,7 +1299,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -9209,7 +9624,7 @@
  ')
  
  ########################################
-@@ -1269,3 +1272,42 @@
+@@ -1269,3 +1320,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -9252,9 +9667,31 @@
 +
 +	allow $1 init_t:process ptrace;
 +')
++
++########################################
++## <summary>
++##	Make the specified type usable for initscripts
++##	in a filesystem.
++## </summary>
++## <param name="type">
++##	<summary>
++##	Type to be used for files.
++##	</summary>
++## </param>
++#
++interface(`init_script_type',`
++	gen_require(`
++		type initrc_t;
++		attribute initscript;
++	')
++
++	typeattribute $1 initscript;
++	domain_entry_file(initrc_t,$1)
++
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.6.4/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/init.te	2007-09-04 12:06:53.000000000 -0400
 @@ -10,13 +10,20 @@
  # Declarations
  #
@@ -9277,7 +9714,26 @@
  ')
  
  # used for direct running of init scripts
-@@ -82,7 +89,7 @@
+@@ -28,6 +35,9 @@
+ # Mark process types as daemons
+ attribute daemon;
+ 
++# Mark /etc/init.d scripts types as initscripts
++attribute initscript;
++
+ #
+ # init_t is the domain of the init process.
+ #
+@@ -54,7 +64,7 @@
+ mls_trusted_object(initctl_t)
+ 
+ type initrc_t;
+-type initrc_exec_t;
++type initrc_exec_t, initscript;
+ domain_type(initrc_t)
+ domain_entry_file(initrc_t,initrc_exec_t)
+ role system_r types initrc_t;
+@@ -82,7 +92,7 @@
  #
  
  # Use capabilities. old rule:
@@ -9286,7 +9742,7 @@
  # is ~sys_module really needed? observed: 
  # sys_boot
  # sys_tty_config
-@@ -198,7 +205,7 @@
+@@ -198,7 +208,7 @@
  #
  
  allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -9295,7 +9751,7 @@
  dontaudit initrc_t self:capability sys_module; # sysctl is triggering this
  allow initrc_t self:passwd rootok;
  
-@@ -213,8 +220,7 @@
+@@ -213,10 +223,9 @@
  allow initrc_t initrc_devpts_t:chr_file rw_term_perms;
  term_create_pty(initrc_t,initrc_devpts_t)
  
@@ -9303,9 +9759,12 @@
 -init_exec(initrc_t)
 +init_telinit(initrc_t)
  
- can_exec(initrc_t,initrc_exec_t)
+-can_exec(initrc_t,initrc_exec_t)
++can_exec(initrc_t,initscript)
  
-@@ -508,6 +514,12 @@
+ manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
+ manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
+@@ -508,6 +517,12 @@
  	')
  ')
  
@@ -9318,7 +9777,7 @@
  ifdef(`targeted_policy',`
  	domain_subj_id_change_exemption(initrc_t)
  	unconfined_domain(initrc_t)
-@@ -520,11 +532,22 @@
+@@ -520,11 +535,22 @@
  	tunable_policy(`allow_daemons_use_tty',`
  		term_use_unallocated_ttys(daemon)
  		term_use_generic_ptys(daemon)
@@ -9343,7 +9802,7 @@
  ',`
  	# cjp: require doesnt work in the else of optionals :\
  	# this also would result in a type transition
-@@ -735,6 +758,9 @@
+@@ -735,6 +761,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -10539,7 +10998,16 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-08-22 08:36:58.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te	2007-09-04 11:49:43.000000000 -0400
+@@ -45,7 +45,7 @@
+ dontaudit dhcpc_t self:capability sys_tty_config;
+ # for access("/etc/bashrc", X_OK) on Red Hat
+ dontaudit dhcpc_t self:capability { dac_read_search sys_module };
+-allow dhcpc_t self:process signal_perms;
++allow dhcpc_t self:process { ptrace signal_perms };
+ allow dhcpc_t self:fifo_file rw_file_perms;
+ allow dhcpc_t self:tcp_socket create_stream_socket_perms;
+ allow dhcpc_t self:udp_socket create_socket_perms;
 @@ -164,6 +164,10 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)
@@ -10551,15 +11019,18 @@
  	optional_policy(`
  		networkmanager_dbus_chat(dhcpc_t)
  	')
-@@ -211,6 +215,7 @@
- 	# dhclient sometimes starts ntpd
- 	init_exec_script_files(dhcpc_t)
- 	ntp_domtrans(dhcpc_t)
-+	ntp_domtrans_ntpdate(dhcpc_t)
+@@ -208,9 +212,7 @@
  ')
  
  optional_policy(`
-@@ -221,6 +226,7 @@
+-	# dhclient sometimes starts ntpd
+-	init_exec_script_files(dhcpc_t)
+-	ntp_domtrans(dhcpc_t)
++	ntp_script_domtrans(dhcpc_t)
+ ')
+ 
+ optional_policy(`
+@@ -221,6 +223,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -10567,7 +11038,7 @@
  ')
  
  optional_policy(`
-@@ -259,6 +265,7 @@
+@@ -259,6 +262,7 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -10577,7 +11048,7 @@
  allow ifconfig_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/udev.te	2007-08-31 06:15:18.000000000 -0400
 @@ -18,11 +18,6 @@
  type udev_etc_t alias etc_udev_t;
  files_config_file(udev_etc_t)
@@ -10609,17 +11080,19 @@
  
  kernel_read_system_state(udev_t)
  kernel_getattr_core_if(udev_t)
-@@ -83,16 +80,23 @@
+@@ -82,6 +79,11 @@
+ kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
  kernel_signal(udev_t)
- 
++files_read_kernel_modules(udev_t)
++
 +#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182
 +kernel_rw_net_sysctls(udev_t)
 +kernel_read_network_state(udev_t)
-+
+ 
  corecmd_exec_all_executables(udev_t)
  
- dev_rw_sysfs(udev_t)
+@@ -89,10 +91,13 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
  dev_delete_generic_files(udev_t)
@@ -10633,7 +11106,7 @@
  files_read_etc_runtime_files(udev_t)
  files_read_etc_files(udev_t)
  files_exec_etc_files(udev_t)
-@@ -142,8 +146,14 @@
+@@ -142,8 +147,14 @@
  seutil_read_file_contexts(udev_t)
  seutil_domtrans_restorecon(udev_t)
  
@@ -10648,7 +11121,7 @@
  
  userdom_use_sysadm_ttys(udev_t)
  userdom_dontaudit_search_all_users_home_content(udev_t)
-@@ -176,6 +186,10 @@
+@@ -176,6 +187,10 @@
  ')
  
  optional_policy(`
@@ -10659,7 +11132,7 @@
  	consoletype_exec(udev_t)
  ')
  
-@@ -184,6 +198,10 @@
+@@ -184,6 +199,10 @@
  ')
  
  optional_policy(`
@@ -10670,7 +11143,7 @@
  	hal_dgram_send(udev_t)
  ')
  
-@@ -194,5 +212,24 @@
+@@ -194,5 +213,24 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- selinux-policy.spec	22 Aug 2007 14:14:52 -0000	1.491
+++ selinux-policy.spec	4 Sep 2007 20:18:57 -0000	1.492
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -162,7 +162,7 @@
 selinuxenabled; \
 if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log 2> /dev/null; \
+	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
+- Allow ktalkd to look at terminals
+
 * Tue Aug 21 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-40
 - Allow modutil sys_nice
 - Allow automount to run smbclient



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:37 -0400
Subject: rpms/armacycles-ad/devel - New directory
Message-ID: <200709041900.l84J0bSu025542@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad/devel

Log Message:
Directory /cvs/extras/rpms/armacycles-ad/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:34 -0400
Subject: rpms/armacycles-ad - New directory
Message-ID: <200709041900.l84J0YqR025528@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad

Log Message:
Directory /cvs/extras/rpms/armacycles-ad added to the repository




From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 12:03:39 -0700
Subject: [pkgdb] blktrace (Fedora, devel) updated by kevin
Message-ID: <200709041903.l84J3eX0005434@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on blktrace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blktrace



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:41 -0400
Subject: rpms/armacycles-ad Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709041900.l84J0fG5025567@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad

Added Files:
	Makefile import.log 
Log Message:
Setup of module armacycles-ad


--- NEW FILE Makefile ---
# Top level Makefile for module armacycles-ad
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep  4 19:03:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 12:03:38 -0700
Subject: [pkgdb] blktrace was added for sandeen
Message-ID: <200709041903.l84J3dYi005425@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package blktrace with summary block IO tracer
Kevin Fenzi (kevin) has approved Package blktrace
Kevin Fenzi (kevin) has added a Fedora devel branch for blktrace with an owner of sandeen
Kevin Fenzi (kevin) has approved blktrace in Fedora devel
Kevin Fenzi (kevin) has approved Package blktrace
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on blktrace (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on blktrace (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on blktrace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/blktrace



From fedora-extras-commits at redhat.com  Tue Sep  4 18:59:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 11:59:08 -0700
Subject: [pkgdb] armacycles-ad was added for limb
Message-ID: <200709041859.l84Ix8fO005296@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package armacycles-ad with summary A lightcycle game in 3D
Kevin Fenzi (kevin) has approved Package armacycles-ad
Kevin Fenzi (kevin) has added a Fedora devel branch for armacycles-ad with an owner of limb
Kevin Fenzi (kevin) has approved armacycles-ad in Fedora devel
Kevin Fenzi (kevin) has approved Package armacycles-ad
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on armacycles-ad (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on armacycles-ad (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on armacycles-ad (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/armacycles-ad



From fedora-extras-commits at redhat.com  Tue Sep  4 18:57:26 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:57:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1290,1.1291
Message-ID: <200709041857.l84IvQe9025381@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25348

Modified Files:
	openoffice.org.spec 
Log Message:
sigh, butterfingers


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1290
retrieving revision 1.1291
diff -u -r1.1290 -r1.1291
--- openoffice.org.spec	4 Sep 2007 18:53:54 -0000	1.1290
+++ openoffice.org.spec	4 Sep 2007 18:56:53 -0000	1.1291
@@ -56,7 +56,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java_devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
+BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel



From fedora-extras-commits at redhat.com  Tue Sep  4 19:00:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 15:00:44 -0400
Subject: rpms/armacycles-ad/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709041900.l84J0ihU025583@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf25450/rpms/armacycles-ad/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module armacycles-ad


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: armacycles-ad
# $Id: Makefile,v 1.1 2007/09/04 19:00:41 kevin Exp $
NAME := armacycles-ad
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 fedora-extras-commits at redhat.com  Tue Sep  4 19:16:47 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:16:47 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.51, 1.52 libwnck.spec, 1.82,
	1.83 sources, 1.51, 1.52
Message-ID: <200709041916.l84JGlL6032629@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32594

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 02:50:55 -0000	1.51
+++ .cvsignore	4 Sep 2007 19:16:14 -0000	1.52
@@ -1 +1 @@
-libwnck-2.19.90.tar.bz2
+libwnck-2.19.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- libwnck.spec	21 Aug 2007 20:04:00 -0000	1.82
+++ libwnck.spec	4 Sep 2007 19:16:14 -0000	1.83
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.19/%{name}-%{version}.tar.bz2
 License: LGPLv2+
@@ -100,6 +100,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92 (translations)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 02:50:55 -0000	1.51
+++ sources	4 Sep 2007 19:16:14 -0000	1.52
@@ -1 +1 @@
-07f05c75ef405fbb7a668ff7adad917e  libwnck-2.19.90.tar.bz2
+bab1a1f8b635d9c76aa13f388138a600  libwnck-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:36:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 15:36:17 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.58, 1.59 gnome-panel.spec,
	1.214, 1.215 sources, 1.58, 1.59
Message-ID: <200709041936.l84JaHqr000972@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv945

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	14 Aug 2007 03:06:22 -0000	1.58
+++ .cvsignore	4 Sep 2007 19:35:44 -0000	1.59
@@ -1 +1 @@
-gnome-panel-2.19.6.tar.bz2
+gnome-panel-2.19.92.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- gnome-panel.spec	23 Aug 2007 17:47:32 -0000	1.214
+++ gnome-panel.spec	4 Sep 2007 19:35:44 -0000	1.215
@@ -21,8 +21,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.19.6
-Release: 2%{?dist} 
+Version: 2.19.92
+Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -302,6 +302,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	14 Aug 2007 03:06:22 -0000	1.58
+++ sources	4 Sep 2007 19:35:44 -0000	1.59
@@ -1 +1 @@
-b9cf4ab373b8d7970c477091b44ace0f  gnome-panel-2.19.6.tar.bz2
+698ff684d9c6ca02191e302b12ac94e1  gnome-panel-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 19:08:49 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 4 Sep 2007 15:08:49 -0400
Subject: rpms/mash/devel .cvsignore, 1.13, 1.14 mash.spec, 1.11, 1.12 sources,
	1.14, 1.15
Message-ID: <200709041908.l84J8neo032275@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32213

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Sep 2007 15:27:47 -0000	1.13
+++ .cvsignore	4 Sep 2007 19:08:16 -0000	1.14
@@ -1 +1 @@
-mash-0.2.1.tar.gz
+mash-0.2.2.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mash.spec	4 Sep 2007 15:27:47 -0000	1.11
+++ mash.spec	4 Sep 2007 19:08:16 -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:           mash
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,8 +44,9 @@
 %{_datadir}/mash
 
 %changelog
-* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.1-1
+* Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.2-1
 - add nspluginwrapper to multilib whitelist (#275021)
+- fix kernel-devel (#247321)
 
 * Tue Aug 28 2007 Bill Nottingham <notting at redhat.com> 0.2.0-1
 - updates to work with pungi 1.0.0, conflict with older pungi


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Sep 2007 15:27:47 -0000	1.14
+++ sources	4 Sep 2007 19:08:16 -0000	1.15
@@ -1 +1 @@
-1eab12ece2d64daf0360e30ddb25071e  mash-0.2.1.tar.gz
+a667f16ef419392f001cc012e1ce95be  mash-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 18:50:59 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:50:59 -0400
Subject: rpms/offlineimap/F-7 offlineimap.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200709041850.l84IoxlO024876@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24849

Modified Files:
	offlineimap.spec sources 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/F-7/offlineimap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- offlineimap.spec	9 Dec 2006 04:13:45 -0000	1.3
+++ offlineimap.spec	4 Sep 2007 18:50:27 -0000	1.4
@@ -1,17 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           offlineimap
-Version:        4.0.16
-Release:        3%{?dist}
+Version:        5.99.2
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
-License:        GPL
+License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
 Source0:        http://software.complete.org/offlineimap/static/download_area/%{version}/%{name}_%{version}.tar.gz
+Patch0:         offlineimap-5.99.2-unclosed_listitem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
@@ -29,10 +31,14 @@
 
 %prep
 %setup -q -n %name
+%patch0 -p1
+
 
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
+docbook2man offlineimap.sgml
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,18 +46,30 @@
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -p offlineimap.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+#%doc manual.* todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
 %{_mandir}/man1/offlineimap.1.gz
 
+
 %changelog
+* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
+- update to new version
+- update license Tag
+- add unclosed listitem in offlineimap.sgml
+- add missing BR: docbook-utils
+- build manpage
+- remove todo and manual files from %%doc
+
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5
 - added BR: python-devel, which is needed now
@@ -91,5 +109,3 @@
 
 * Fri Apr 28 2006 Adam Spiers <offlineimap at adamspiers.org> 4.0.11-1
 - Initial build.
-
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Dec 2006 17:47:54 -0000	1.2
+++ sources	4 Sep 2007 18:50:27 -0000	1.3
@@ -1 +1 @@
-3de813eec9afa373006ac5cad7299389  offlineimap_4.0.16.tar.gz
+18912c9f7bc5a24f660906ca5c84e6f4  offlineimap_5.99.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 19:13:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 15:13:56 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.7, 1.8 pulseaudio.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200709041913.l84JDu23032529@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32505

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new snapshot from CVS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Aug 2007 22:48:59 -0000	1.7
+++ .cvsignore	4 Sep 2007 19:13:23 -0000	1.8
@@ -1 +1,2 @@
-pulseaudio-0.9.7.svn20070823.tar.gz
+libflashsupport-pulse-000.svn20070904.tar.gz
+pulseaudio-0.9.7.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pulseaudio.spec	22 Aug 2007 22:48:59 -0000	1.15
+++ pulseaudio.spec	4 Sep 2007 19:13:23 -0000	1.16
@@ -3,27 +3,31 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.8.svn20070823%{?dist}
-License:	GPL
+Release:	0.9.svn20070904%{?dist}
+License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070823.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070904.tar.gz
+Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
 BuildRequires: liboil-devel, m4, libcap-devel, libtool-ltdl-devel, pkgconfig
-BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel GConf2-devel
-BuildRequires: lirc-devel doxygen
+BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel, GConf2-devel
+BuildRequires: lirc-devel, doxygen
 #jack-audio-connection-kit-devel
-BuildRequires: hal-devel libatomic_ops-devel
+BuildRequires: hal-devel, libatomic_ops-devel
 # Libtool is dragging in rpaths.  Fedora's libtool should get rid of the
 # unneccessary ones.
 BuildRequires: libtool
 BuildRequires:	libXt-devel, xorg-x11-proto-devel
+BuildRequires: openssl-devel
+Obsoletes:	pulseaudio-devel
 
 Patch1: 	pulseaudio-0.9.6-nochown.patch
 
 %description
+A
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
@@ -78,19 +82,9 @@
 %description module-gconf
 GConf configuration backend for the PulseAudio sound server.
 
-%package devel
-Summary:	Headers and libraries for PulseAudio server module development
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-module-x11 = %{version}-%{release}
-Requires:	%{name}-lib-devel = %{version}-%{release}
-
-%description devel
-Headers and libraries for developing modules for the PulseAudio sound server.
-
 %package lib
 Summary:	Libraries for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
 
 %description lib
@@ -99,7 +93,7 @@
 
 %package lib-glib2
 Summary:	GLIB 2.x bindings for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:		System Environment/Libraries
 
 %description lib-glib2
@@ -108,7 +102,7 @@
 
 %package lib-zeroconf
 Summary:    Zeroconf support for PulseAudio clients
-License:	LGPL
+License:	LGPLv2+
 Group:      System Environment/Libraries
 
 %description lib-zeroconf
@@ -117,7 +111,7 @@
 
 %package lib-devel
 Summary:	Headers and libraries for PulseAudio client development
-License:	LGPL
+License:	LGPLv2+
 Group:		Development/Libraries
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	%{name}-lib-glib2 = %{version}-%{release}
@@ -130,7 +124,7 @@
 
 %package utils
 Summary:	PulseAudio sound server utilities
-License:	LGPL
+License:	LGPLv2+
 Group:		Applications/Multimedia
 Requires:	%{name}-lib = %{version}-%{release}
 
@@ -138,22 +132,30 @@
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q 
+%setup -q -T -b1 -n libflashsupport-pulse-000
+%setup -q -T -b0
 %patch1 -p1
 
 %build
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
+pwd
+pushd ../libflashsupport-pulse-000
+%configure --disable-rpath
+make LIBTOOL=/usr/bin/libtool
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+pushd ../libflashsupport-pulse-000
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la
 # configure --disable-static had no effect; delete manually.
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
-
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
 
 %clean
@@ -193,7 +195,6 @@
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %attr(4755,root,root) %{_bindir}/pulseaudio
-%{_libdir}/libpulsecore.so.*
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
@@ -226,7 +227,7 @@
 %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-cli.so
-#%{_libdir}/pulse-%{drvver}/modules/module-combine.so
+%{_libdir}/pulse-%{drvver}/modules/module-combine.so
 %{_libdir}/pulse-%{drvver}/modules/module-detect.so
 %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnfd.so
 %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnpid.so
@@ -242,7 +243,6 @@
 %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-null-sink.so
-#%{_libdir}/pulse-%{drvver}/modules/module-oss-mmap.so
 %{_libdir}/pulse-%{drvver}/modules/module-oss.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so
@@ -256,6 +256,7 @@
 #%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
+%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
 
 %files esound-compat
 %defattr(-,root,root)
@@ -290,11 +291,6 @@
 %{_libdir}/pulse-%{drvver}/modules/module-gconf.so
 %{_libexecdir}/pulse/gconf-helper
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/pulsecore/
-%{_libdir}/libpulsecore.so
-
 %files lib
 %defattr(-,root,root)
 %doc README LICENSE GPL LGPL
@@ -302,6 +298,7 @@
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.*
 %{_libdir}/libpulse-simple.so.*
+%{_libdir}/libflashsupport.so
 
 %files lib-glib2
 %defattr(-,root,root)
@@ -335,6 +332,11 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Thu Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
+- Update SVN snapshot
+- ship libflashsupport in our package
+- drop pulseaudio-devel since libpulsecore is not linked statically
+
 * Thu Aug 23 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.8.svn20070823
 - Update SVN snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Aug 2007 22:48:59 -0000	1.9
+++ sources	4 Sep 2007 19:13:23 -0000	1.10
@@ -1 +1,2 @@
-255641dd5e7869c2d13ddc11e0c604f6  pulseaudio-0.9.7.svn20070823.tar.gz
+cf255bd6fe00de595fedbf128f7d5062  libflashsupport-pulse-000.svn20070904.tar.gz
+487c4d60344d8c69e97b3ed39226b21f  pulseaudio-0.9.7.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 18:34:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:34:00 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.80,1.81
Message-ID: <200709041834.l84IY0kJ024359@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24340

Modified Files:
	bug-buddy.spec 
Log Message:
add BRs



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- bug-buddy.spec	4 Sep 2007 18:11:17 -0000	1.80
+++ bug-buddy.spec	4 Sep 2007 18:33:28 -0000	1.81
@@ -41,6 +41,7 @@
 BuildRequires: libsoup-devel >= 2.2.90
 BuildRequires: libgtop2-devel >= 2.13.3
 BuildRequires: evolution-data-server-devel >= 1.9.1
+BuildRequires: elfutils-libelf-devel
 
 Requires: gdb
 



From fedora-extras-commits at redhat.com  Tue Sep  4 18:37:11 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue, 4 Sep 2007 14:37:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1288,1.1289
Message-ID: <200709041837.l84IbBuC024529@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24499

Modified Files:
	openoffice.org.spec 
Log Message:
bare define


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -r1.1288 -r1.1289
--- openoffice.org.spec	4 Sep 2007 17:52:28 -0000	1.1288
+++ openoffice.org.spec	4 Sep 2007 18:36:39 -0000	1.1289
@@ -4,7 +4,6 @@
 #temp, fix configure
 %ifnarch %{ix86} x86_64
 %define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
-%define 
 %endif
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1



From fedora-extras-commits at redhat.com  Tue Sep  4 18:36:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:36:18 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.8,1.9
Message-ID: <200709041836.l84IaIeN024489@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24436

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- offlineimap.spec	4 Sep 2007 18:25:20 -0000	1.8
+++ offlineimap.spec	4 Sep 2007 18:35:45 -0000	1.9
@@ -54,7 +54,7 @@
 %files
 %defattr(-,root,root,-)
 #%doc manual.* todo
-%doc README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/



From fedora-extras-commits at redhat.com  Tue Sep  4 18:11:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:11:50 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.79,1.80
Message-ID: <200709041811.l84IBoib023514@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23489

Modified Files:
	bug-buddy.spec 
Log Message:
add bug ref



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- bug-buddy.spec	4 Sep 2007 18:08:03 -0000	1.79
+++ bug-buddy.spec	4 Sep 2007 18:11:17 -0000	1.80
@@ -80,6 +80,7 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/breakpad-0.1
 rm -rf $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{a,la}
+# http://bugzilla.gnome.org/show_bug.cgi?id=473645
 mv $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so.0.0.0 \
    $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.{a,la,so.*}



From fedora-extras-commits at redhat.com  Tue Sep  4 18:25:53 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:25:53 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.7,1.8
Message-ID: <200709041825.l84IPrsK024064@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24037

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage
- remove todo and manual files from %doc



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- offlineimap.spec	4 Sep 2007 18:12:45 -0000	1.7
+++ offlineimap.spec	4 Sep 2007 18:25:20 -0000	1.8
@@ -53,7 +53,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
+#%doc manual.* todo
+%doc README COPY* UPGRADING offlineimap.conf* FAQ.html todo
 %doc ChangeLog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
@@ -67,6 +68,7 @@
 - add unclosed listitem in offlineimap.sgml
 - add missing BR: docbook-utils
 - build manpage
+- remove todo and manual files from %%doc
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 18:01:43 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:01:43 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.5,1.6
Message-ID: <200709041801.l84I1hs4022978@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22736

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- offlineimap.spec	4 Sep 2007 17:47:17 -0000	1.5
+++ offlineimap.spec	4 Sep 2007 18:01:09 -0000	1.6
@@ -13,6 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
@@ -55,10 +56,11 @@
 %{_mandir}/man1/offlineimap.1.gz
 
 %changelog
-* Thu Aug 16 2007 Till Maas <opensource till name> - 5.99.2-1
+* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
 - add unclosed listitem in offlineimap.sgml
+- add missing BR: docbook-utils
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5
@@ -99,5 +101,3 @@
 
 * Fri Apr 28 2006 Adam Spiers <offlineimap at adamspiers.org> 4.0.11-1
 - Initial build.
-
-



From fedora-extras-commits at redhat.com  Tue Sep  4 18:13:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 4 Sep 2007 14:13:18 -0400
Subject: rpms/offlineimap/devel offlineimap.spec,1.6,1.7
Message-ID: <200709041813.l84IDICt023660@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23597

Modified Files:
	offlineimap.spec 
Log Message:
* Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
- update to new version
- update license Tag
- add unclosed listitem in offlineimap.sgml
- add missing BR: docbook-utils
- build manpage



Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- offlineimap.spec	4 Sep 2007 18:01:09 -0000	1.6
+++ offlineimap.spec	4 Sep 2007 18:12:45 -0000	1.7
@@ -33,10 +33,12 @@
 %setup -q -n %name
 %patch0 -p1
 
+
 %build
 python setup.py build
 cp -p debian/changelog ChangeLog
-make doc
+docbook2man offlineimap.sgml
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,9 +46,11 @@
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -p offlineimap.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc manual.* README COPY* UPGRADING offlineimap.conf* FAQ.html todo
@@ -55,12 +59,14 @@
 %{python_sitelib}/offlineimap/
 %{_mandir}/man1/offlineimap.1.gz
 
+
 %changelog
 * Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
 - update to new version
 - update license Tag
 - add unclosed listitem in offlineimap.sgml
 - add missing BR: docbook-utils
+- build manpage
 
 * Sat Dec 09 2006 Till Maas <opensource till name> - 4.0.16-3
 - rebuild for python2.5



From fedora-extras-commits at redhat.com  Tue Sep  4 18:10:56 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 14:10:56 -0400
Subject: rpms/krb5/devel CVE-2007-3999.patch, NONE, 1.1 CVE-2007-4000.patch, 
	NONE, 1.1 krb5.spec, 1.131, 1.132
Message-ID: <200709041810.l84IAu2W023484@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417/devel

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999.patch CVE-2007-4000.patch 
Log Message:
- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)


CVE-2007-3999.patch:

--- NEW FILE CVE-2007-3999.patch ---
*** src/lib/rpc/svc_auth_gss.c  (revision 20254)
--- src/lib/rpc/svc_auth_gss.c  (local)
***************
*** 339,345 ****
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}
--- 339,345 ----
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}

CVE-2007-4000.patch:

--- NEW FILE CVE-2007-4000.patch ---
*** src/lib/kadm5/srv/svr_policy.c      (revision 20254)
--- src/lib/kadm5/srv/svr_policy.c      (local)
***************
*** 211,218 ****
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
!     if( ret && (cnt==0) )
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))
--- 211,219 ----
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
!       return ret;
!     if (cnt != 1)
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- krb5.spec	25 Aug 2007 05:12:34 -0000	1.131
+++ krb5.spec	4 Sep 2007 18:10:23 -0000	1.132
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 4%{?dist}
+Release: 5%{?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
@@ -84,6 +84,8 @@
 Patch57: krb5-1.6.2-login_chdir.patch
 Patch58: krb5-1.6.2-key_exp.patch
 Patch59: krb5-kpasswd_tcp.patch
+Patch65: CVE-2007-3999.patch
+Patch66: CVE-2007-4000.patch
 
 Patch60: krb5-1.6.1-pam.patch
 Patch61: krb5-trunk-manpaths.patch
@@ -206,6 +208,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
+- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
+
 * Sat Aug 25 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-4
 - cover more cases in labeling files on creation
 - add missing gawk build dependency
@@ -1208,6 +1213,8 @@
 %patch51 -p0 -b .ldap_init
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
+%patch64 -p0 -b .2007-3999
+%patch65 -p0 -b .2007-4000
 #%patch55 -p1 -b .empty
 #%patch56 -p1 -b .doublelog
 #%patch57 -p1 -b .login_chdir



From fedora-extras-commits at redhat.com  Tue Sep  4 18:10:53 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 4 Sep 2007 14:10:53 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999.patch, NONE, 1.1 CVE-2007-4000.patch,
	NONE, 1.1 krb5.spec, 1.113, 1.114
Message-ID: <200709041810.l84IArJt023480@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417/F-7

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999.patch CVE-2007-4000.patch 
Log Message:
- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)


CVE-2007-3999.patch:

--- NEW FILE CVE-2007-3999.patch ---
*** src/lib/rpc/svc_auth_gss.c  (revision 20254)
--- src/lib/rpc/svc_auth_gss.c  (local)
***************
*** 339,345 ****
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}
--- 339,345 ----
  	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
! 	if (oa->oa_length && oa->oa_length <= sizeof(rpchdr)) {
  		memcpy((caddr_t)buf, oa->oa_base, oa->oa_length);
  		buf += RNDUP(oa->oa_length) / sizeof(int32_t);
  	}

CVE-2007-4000.patch:

--- NEW FILE CVE-2007-4000.patch ---
*** src/lib/kadm5/srv/svr_policy.c      (revision 20254)
--- src/lib/kadm5/srv/svr_policy.c      (local)
***************
*** 211,218 ****
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt);
!     if( ret && (cnt==0) )
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))
--- 211,219 ----
      if((mask & KADM5_POLICY))
  	return KADM5_BAD_MASK;
  		
!     if ((ret = krb5_db_get_policy(handle->context, entry->policy, &p, &cnt)))
!       return ret;
!     if (cnt != 1)
  	return KADM5_UNK_POLICY;

      if ((mask & KADM5_PW_MAX_LIFE))


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- krb5.spec	27 Jun 2007 18:41:04 -0000	1.113
+++ krb5.spec	4 Sep 2007 18:10:20 -0000	1.114
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -77,6 +77,8 @@
 Patch55: krb5-1.6.1-empty.patch
 Patch56: krb5-1.6.1-get_opt_fixup.patch
 Patch57: krb5-1.6.1-ftp-nospew.patch
+Patch58: CVE-2007-3999.patch
+Patch59: CVE-2007-4000.patch
 
 Patch62: krb5-any-fixup-patch.txt
 
@@ -196,6 +198,9 @@
 %endif
 
 %changelog
+* Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
+- incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
+
 * Wed Jun 27 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-2.1
 - incorporate fixes for MITKRB5-SA-2007-004 (CVE-2007-2442,CVE-2007-2443)
   and MITKRB5-SA-2007-005 (CVE-2007-2798)
@@ -1142,6 +1147,8 @@
 #%patch55 -p1 -b .empty
 %patch56 -p0 -b .get_opt_fixup
 %patch57 -p1 -b .ftp-nospew
+%patch58 -p0 -b .2007-3999
+%patch59 -p0 -b .2007-4000
 %patch70 -p0 -b .2007-004
 %patch71 -p0 -b .2007-005
 cp src/krb524/README README.krb524



From fedora-extras-commits at redhat.com  Tue Sep  4 18:25:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 14:25:16 -0400
Subject: rpms/gkrellm/EL-5 gkrellm-2.3.0-gnutls.patch, NONE, 1.1 gkrellm.spec,
	1.5, 1.6
Message-ID: <200709041825.l84IPGT8024031@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23986

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-gnutls.patch 
Log Message:
Resync with devel

gkrellm-2.3.0-gnutls.patch:

--- NEW FILE gkrellm-2.3.0-gnutls.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-04 00:10:36.000000000 +0300
@@ -41,6 +41,7 @@ echo "Checking for gnutls... " 1>& 5
 
 cat << EOF > test.c
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <errno.h>
 #include <pthread.h>
 
diff -up gkrellm-2.3.0/src/mail.c~ gkrellm-2.3.0/src/mail.c
--- gkrellm-2.3.0/src/mail.c~	2007-07-07 02:45:25.000000000 +0300
+++ gkrellm-2.3.0/src/mail.c	2007-09-04 00:10:49.000000000 +0300
@@ -34,6 +34,7 @@
 
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
+#include <gcrypt.h>
 #include <pthread.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm.spec	3 Sep 2007 20:51:14 -0000	1.5
+++ gkrellm.spec	4 Sep 2007 18:24:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -9,11 +9,12 @@
 Source1:        gkrellmd.init
 Source2:        gkrellm.desktop
 Source3:        gkrellm.png
+Patch0:         gkrellm-2.3.0-gnutls.patch
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
-BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +35,7 @@
 %package daemon
 Summary:        The GNU Krell Monitors Server
 Group:          System Environment/Daemons
-Requires(pre):  /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .gnutls
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
@@ -119,9 +121,10 @@
 
 
 %pre daemon
-# the daemon shouldn't run as nobody
-/usr/sbin/groupadd -r gkrellmd 2> /dev/null || :
-/usr/sbin/useradd -s /sbin/nologin -M -d / -c "GNU Krell daemon" -r -g gkrellmd gkrellmd 2> /dev/null || :
+getent group gkrellmd >/dev/null || groupadd -r gkrellmd
+getent passwd gkrellmd >/dev/null || \
+useradd -r -g gkrellmd -M -d / -s /sbin/nologin -c "GNU Krell daemon" gkrellmd
+:
 
 %post daemon
 /sbin/chkconfig --add gkrellmd || :
@@ -166,6 +169,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
+- Fix gnutls detection/build and use it instead of openssl.
+- Sync user and group creation with current Fedora guidelines.
+
 * Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:50 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:50 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmpmY006354@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchbugzilla acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:51 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:51 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmpwJ006363@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchcommits acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble



From fedora-extras-commits at redhat.com  Tue Sep  4 20:48:55 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 04 Sep 2007 13:48:55 -0700
Subject: [pkgdb] telepathy-gabble had acl change status
Message-ID: <200709042048.l84KmtOG006372@app3.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the approveacls acl on telepathy-gabble (Fedora OLPC 2) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble



From fedora-extras-commits at redhat.com  Tue Sep  4 20:54:01 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 4 Sep 2007 16:54:01 -0400
Subject: rpms/kernel/devel kernel.spec, 1.144,
	1.145 linux-2.6-utrace-core.patch, 1.5,
	1.6 linux-2.6-utrace-ptrace-compat.patch, 1.4,
	1.5 linux-2.6-utrace-tracehook.patch, 1.8, 1.9
Message-ID: <200709042054.l84Ks1LL008639@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8604

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
utrace update (#232837, #248532)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kernel.spec	2 Sep 2007 05:40:37 -0000	1.144
+++ kernel.spec	4 Sep 2007 20:53:27 -0000	1.145
@@ -1789,6 +1789,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#232837, #248532)
+
 * Sun Sep 02 2007 Dave Jones <davej at redhat.com>
 - Fix oops in IPv4.
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-core.patch	21 Aug 2007 19:42:55 -0000	1.5
+++ linux-2.6-utrace-core.patch	4 Sep 2007 20:53:27 -0000	1.6
@@ -20,7 +20,7 @@
 ---
 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2263 +++++++++++++++++++++++++++++++++++++
+ kernel/utrace.c                   | 2344 +++++++++++++++++++++++++++++++++++++
  Documentation/utrace.txt          |  579 +++++++++
  Documentation/DocBook/Makefile    |    2 
  Documentation/DocBook/utrace.tmpl |   23 
@@ -28,7 +28,7 @@
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
  init/Kconfig                      |   20 
- 9 files changed, 3504 insertions(+), 18 deletions(-)
+ 9 files changed, 3585 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -46,7 +46,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/kernel/utrace.c
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,2263 @@
+@@ -0,0 +1,2344 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -522,7 +522,7 @@
 + */
 +struct utrace_attached_engine *
 +utrace_attach(struct task_struct *target, int flags,
-+	     const struct utrace_engine_ops *ops, void *data)
++	      const struct utrace_engine_ops *ops, void *data)
 +{
 +	struct utrace *utrace;
 +	struct utrace_attached_engine *engine;
@@ -624,10 +624,13 @@
 +EXPORT_SYMBOL_GPL(utrace_attach);
 +
 +/*
-+ * When an engine is detached, the target thread may still see it and make
-+ * callbacks until it quiesces.  We reset its event flags to just QUIESCE
-+ * and install a special ops vector whose callback is dead_engine_delete.
-+ * When the target thread quiesces, it can safely free the engine itself.
++ * When an engine is detached, the target thread may still see it
++ * and make callbacks until it quiesces.  We install a special ops
++ * vector whose callbacks are all dead_engine_delete.  When the
++ * target thread quiesces, it can safely free the engine itself.
++ * We must cover all callbacks in case of races between checking
++ * engine->flags and utrace_detach changing engine->ops.
++ * Only report_reap is never called due to a special case in utrace_reap.
 + */
 +static u32
 +dead_engine_delete(struct utrace_attached_engine *engine,
@@ -636,9 +639,38 @@
 +	return UTRACE_ACTION_DETACH;
 +}
 +
++/*
++ * Don't use .report_xxx = ... style here because this way makes it easier
++ * to be sure we're forced to have an initializer here for every member.
++ */
 +static const struct utrace_engine_ops dead_engine_ops =
 +{
-+	.report_quiesce = &dead_engine_delete
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 unsigned long, struct task_struct *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 pid_t)) &dead_engine_delete,
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *, u32, siginfo_t *,
++		 const struct k_sigaction *, struct k_sigaction *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 int)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 const struct linux_binprm *, struct pt_regs *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 long, long *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *))
++	&dead_engine_delete,
++	NULL,			/* report_reap */
++	NULL,			/* allow_access_process_vm */
++	NULL,			/* unsafe_exec */
++	NULL,			/* tracer_task */
 +};
 +
 +
@@ -844,9 +876,32 @@
 +		return ret;
 +	}
 +
-+	flags = engine->flags;
-+	engine->flags = UTRACE_EVENT(QUIESCE) | UTRACE_ACTION_QUIESCE;
++	/*
++	 * This must work while the target thread races with us doing:
++	 *	if (engine->flags & UTRACE_EVENT(x)) REPORT(x, ...);
++	 * The REPORT macro uses smp_rmb() between checking engine->flags
++	 * and using engine->ops.  Here we change engine->ops first, then
++	 * use smp_wmb() before changing engine->flags.  This ensures it
++	 * can check the old flags before using the old ops, or check the
++	 * old flags before using the new ops, or check the new flags
++	 * before using the new ops, but can never check the new flags
++	 * before using the old ops.  Hence, dead_engine_ops might be used
++	 * with any old flags in place.  So, it has report_* callback
++	 * pointers for every event type.  Since it has to have those
++	 * anyway, we enable (for after any potential race) all the events
++	 * that have no overhead to enable.  We want it to get into that
++	 * callback and complete the detach ASAP.
++	 */
 +	rcu_assign_pointer(engine->ops, &dead_engine_ops);
++	smp_wmb();
++	flags = engine->flags;
++	engine->flags = (UTRACE_EVENT(QUIESCE)
++			 | UTRACE_EVENT(CLONE)
++			 | UTRACE_EVENT(VFORK_DONE)
++			 | UTRACE_EVENT(EXEC)
++			 | UTRACE_EVENT(EXIT)
++			 | UTRACE_EVENT(JCTL)
++			 | UTRACE_ACTION_QUIESCE);
 +
 +	if (quiesce(target, 1)) {
 +		remove_engine(engine, target, utrace);
@@ -971,7 +1026,7 @@
 +{
 +	struct utrace *utrace;
 +	int report;
-+	unsigned long old_flags, old_utrace_flags;
++	unsigned long old_flags, old_utrace_flags, set_utrace_flags;
 +	int ret = -EALREADY;
 +
 +#ifdef ARCH_HAS_SINGLE_STEP
@@ -1005,6 +1060,22 @@
 +	}
 +
 +	/*
++	 * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL).
++	 * That bit indicates utrace_report_jctl has not run yet and so the
++	 * target cannot be considered quiescent.  But if the bit wasn't
++	 * already set, it can't be in running in there and really is
++	 * quiescent now in its existing job control stop.  We set
++	 * UTRACE_ACTION_QUIESCE to be sure that once it resumes it will
++	 * recompute its flags in utrace_quiescent.
++	 */
++	set_utrace_flags = flags;
++	if (((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL))
++	    && target->state == TASK_STOPPED) {
++		set_utrace_flags &= ~UTRACE_EVENT(JCTL);
++		set_utrace_flags |= UTRACE_ACTION_QUIESCE;
++	}
++
++	/*
 +	 * When setting these flags, it's essential that we really
 +	 * synchronize with exit_notify.  They cannot be set after
 +	 * exit_notify takes the tasklist_lock.  By holding the read
@@ -1014,20 +1085,20 @@
 +	 * knows positively that utrace_report_death will be called or
 +	 * that it won't.
 +	 */
-+	if ((flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
-+					   | DEATH_EVENTS)) {
++	if ((set_utrace_flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
++						      | DEATH_EVENTS)) {
 +		read_lock(&tasklist_lock);
 +		if (unlikely(target->exit_state)) {
 +			read_unlock(&tasklist_lock);
 +			spin_unlock(&utrace->lock);
 +			return ret;
 +		}
-+		target->utrace_flags |= flags;
++		target->utrace_flags |= set_utrace_flags;
 +		read_unlock(&tasklist_lock);
 +	}
 +
 +	engine->flags = flags;
-+	target->utrace_flags |= flags;
++	target->utrace_flags |= set_utrace_flags;
 +	ret = 0;
 +
 +	report = 0;
@@ -1149,10 +1220,20 @@
 +	return ret;
 +}
 +
-+#define REPORT(callback, ...) do { \
-+	u32 ret = (*rcu_dereference(engine->ops)->callback) \
-+		(engine, tsk, ##__VA_ARGS__); \
-+	action = update_action(tsk, utrace, engine, ret); \
++/*
++ * This macro is always used after checking engine->flags.
++ * The smp_rmb() here pairs with smp_wmb() in utrace_detach.
++ * engine->ops changes before engine->flags, so the flags we
++ * just tested properly enabled this report for the real ops,
++ * or harmlessly enabled it for dead_engine_ops.
++ */
++#define REPORT(callback, ...)						\
++	do {								\
++		u32 ret;						\
++		smp_rmb();						\
++		ret = (*rcu_dereference(engine->ops)->callback)		\
++			(engine, tsk, ##__VA_ARGS__);			\
++		action = update_action(tsk, utrace, engine, ret);	\
 +	} while (0)
 +
 +
@@ -3755,7 +3836,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1080,6 +1080,11 @@ struct task_struct {
+@@ -1081,6 +1081,11 @@ struct task_struct {
  	struct audit_context *audit_context;
  	seccomp_t seccomp;
  

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat.patch	21 Aug 2007 19:42:55 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat.patch	4 Sep 2007 20:53:27 -0000	1.5
@@ -24,7 +24,7 @@
  arch/powerpc/lib/sstep.c        |    3 
  kernel/fork.c                   |    2 
  kernel/exit.c                   |   13 
- kernel/ptrace.c                 | 2054 +++++++++++++++++++++++++++++++++++++--
+ kernel/ptrace.c                 | 2055 +++++++++++++++++++++++++++++++++++++--
  kernel/sys_ni.c                 |    4 
  kernel/Makefile                 |    3 
  include/linux/sched.h           |    4 
@@ -32,7 +32,7 @@
  include/asm-x86_64/tracehook.h  |    1 
  include/asm-x86_64/ptrace-abi.h |    3 
  init/Kconfig                    |   15 
- 20 files changed, 2641 insertions(+), 780 deletions(-)
+ 20 files changed, 2642 insertions(+), 780 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
 
 --- linux-2.6/fs/proc/base.c
@@ -1331,7 +1331,7 @@
  		tsk = next_thread(tsk);
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -19,213 +19,2007 @@
+@@ -19,213 +19,2008 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1394,19 +1394,66 @@
 +};
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* Initialized below. */
+ 
+ /*
+- * Check that we have indeed attached to the thing..
++ * We use this bit in task_struct.exit_code of a ptrace'd task to indicate
++ * a ptrace stop.  It must not overlap with any bits used in real exit_code's.
++ * Those are (PTRACE_EVENT_* << 8) | 0xff.
+  */
+-int ptrace_check_attach(struct task_struct *child, int kill)
++#define PTRACE_TRAPPED_MASK	0x10000
++
 +
 +static void
 +ptrace_state_unlink(struct ptrace_state *state)
-+{
+ {
+-	return -ENOSYS;
 +	task_lock(state->parent);
 +	list_del_rcu(&state->entry);
 +	task_unlock(state->parent);
-+}
-+
+ }
+ 
+-static int may_attach(struct task_struct *task)
 +static struct ptrace_state *
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
-+{
+ {
+-	/* May we inspect the given task?
+-	 * This check is used both for attaching with ptrace
+-	 * and for allowing access to sensitive information in /proc.
+-	 *
+-	 * ptrace_attach denies several cases that /proc allows
+-	 * because setting up the necessary parent/child relationship
+-	 * or halting the specified task is impossible.
+-	 */
+-	int dumpable = 0;
+-	/* Don't let security modules deny introspection */
+-	if (task == current)
+-		return 0;
+-	if (((current->uid != task->euid) ||
+-	     (current->uid != task->suid) ||
+-	     (current->uid != task->uid) ||
+-	     (current->gid != task->egid) ||
+-	     (current->gid != task->sgid) ||
+-	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-	smp_rmb();
+-	if (task->mm)
+-		dumpable = get_dumpable(task->mm);
+-	if (!dumpable && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-
+-	return security_ptrace(current, task);
+-}
+-
+-int ptrace_may_attach(struct task_struct *task)
+-{
+-	int err;
+-	task_lock(task);
+-	err = may_attach(task);
+-	task_unlock(task);
+-	return !err;
 +	struct ptrace_state *state;
 +
 +	NO_LOCKS;
@@ -1466,17 +1513,14 @@
 +	BUG_ON(state->rcu.next);
 +	call_rcu(&state->rcu, ptrace_state_free);
 +}
- 
- /*
-- * Check that we have indeed attached to the thing..
++
++/*
 + * Update the tracing engine state to match the new ptrace state.
-  */
--int ptrace_check_attach(struct task_struct *child, int kill)
++ */
 +static int __must_check
 +ptrace_update(struct task_struct *target, struct ptrace_state *state,
 +	      unsigned long flags, int from_stopped)
- {
--	return -ENOSYS;
++{
 +	int ret;
 +
 +	START_CHECK;
@@ -1541,9 +1585,8 @@
 +	END_CHECK;
 +
 +	return ret;
- }
- 
--static int may_attach(struct task_struct *task)
++}
++
 +/*
 + * This does ptrace_update and also installs state in engine->data.
 + * Only after utrace_set_flags succeeds (in ptrace_update) inside
@@ -1555,42 +1598,7 @@
 + */
 +static int __must_check
 +ptrace_setup_finish(struct task_struct *target, struct ptrace_state *state)
- {
--	/* May we inspect the given task?
--	 * This check is used both for attaching with ptrace
--	 * and for allowing access to sensitive information in /proc.
--	 *
--	 * ptrace_attach denies several cases that /proc allows
--	 * because setting up the necessary parent/child relationship
--	 * or halting the specified task is impossible.
--	 */
--	int dumpable = 0;
--	/* Don't let security modules deny introspection */
--	if (task == current)
--		return 0;
--	if (((current->uid != task->euid) ||
--	     (current->uid != task->suid) ||
--	     (current->uid != task->uid) ||
--	     (current->gid != task->egid) ||
--	     (current->gid != task->sgid) ||
--	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--	smp_rmb();
--	if (task->mm)
--		dumpable = get_dumpable(task->mm);
--	if (!dumpable && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--
--	return security_ptrace(current, task);
--}
--
--int ptrace_may_attach(struct task_struct *task)
--{
--	int err;
--	task_lock(task);
--	err = may_attach(task);
--	task_unlock(task);
--	return !err;
++{
 +	int ret;
 +
 +	NO_LOCKS;
@@ -1607,12 +1615,11 @@
 +	NO_LOCKS;
 +
 +	return ret;
- }
- 
--int ptrace_attach(struct task_struct *task)
++}
++
 +
 +static int ptrace_traceme(void)
- {
++{
 +	struct utrace_attached_engine *engine;
 +	struct ptrace_state *state;
 +	int retval;
@@ -1664,10 +1671,11 @@
 +	NO_LOCKS;
 +
 +	return retval;
-+}
-+
+ }
+ 
+-int ptrace_attach(struct task_struct *task)
 +static int ptrace_attach(struct task_struct *task)
-+{
+ {
 +	struct utrace_attached_engine *engine;
 +	struct ptrace_state *state;
  	int retval;
@@ -1685,9 +1693,8 @@
 -	retval = may_attach(task);
 -	if (retval)
 +	if (!task->mm)		/* kernel threads */
- 		goto bad;
- 
--	retval = -ENOSYS;
++		goto bad;
++
 +	pr_debug("%d ptrace_attach %d state %lu exit_code %x\n",
 +		 current->pid, task->pid, task->state, task->exit_code);
 +
@@ -1699,9 +1706,10 @@
 +		retval = PTR_ERR(engine);
 +		if (retval == -EEXIST)
 +			retval = -EPERM;
-+		goto bad;
+ 		goto bad;
 +	}
-+
+ 
+-	retval = -ENOSYS;
 +	pr_debug("%d ptrace_attach %d after utrace_attach: %lu exit_code %x\n",
 +		 current->pid, task->pid, task->state, task->exit_code);
 +
@@ -1735,8 +1743,6 @@
 +	if (retval)
 +		(void) utrace_detach(task, engine);
 +	else {
-+		int stopped = 0;
-+
 +		NO_LOCKS;
 +
 +		/*
@@ -1746,48 +1752,14 @@
 +		 * We cannot call into the signal code if it's dead.
 +		 */
 +		read_lock(&tasklist_lock);
-+		if (likely(!task->exit_state)) {
++		if (likely(!task->exit_state))
 +			force_sig_specific(SIGSTOP, task);
-+
-+			spin_lock_irq(&task->sighand->siglock);
-+			stopped = (task->state == TASK_STOPPED);
-+			spin_unlock_irq(&task->sighand->siglock);
-+		}
 +		read_unlock(&tasklist_lock);
 +
-+		if (stopped) {
-+			const struct utrace_regset *regset;
-+
-+			/*
-+			 * Set QUIESCE immediately, so we can allow
-+			 * ptrace requests while he's in TASK_STOPPED.
-+			 */
-+			retval = ptrace_update(task, state, /* XXX child death+other thread waits race could have freed state already */
-+					       UTRACE_ACTION_QUIESCE, 0);
-+			if (retval)
-+				/*
-+				 * Anything is possible here.  It might not
-+				 * really have been quiescent yet.  It
-+				 * might have just woken up and died.
-+				 */
-+				BUG_ON(retval != -ESRCH && retval != -EALREADY);
-+			retval = 0;
-+
-+			/*
-+			 * Do now the regset 0 writeback that we do on every
-+			 * stop, since it's never been done.  On register
-+			 * window machines, this makes sure the user memory
-+			 * backing the register data is up to date.
-+			 */
-+			regset = utrace_regset(task, engine,
-+					       utrace_native_view(task), 0);
-+			if (regset->writeback)
-+				(*regset->writeback)(task, regset, 1);
-+		}
-+
 +		pr_debug("%d ptrace_attach %d complete (%sstopped)"
 +			 " state %lu code %x",
-+			 current->pid, task->pid, stopped ? "" : "not ",
++			 current->pid, task->pid,
++			 task->state == TASK_STOPPED ? "" : "not ",
 +			 task->state, task->exit_code);
 +	}
  
@@ -2584,13 +2556,13 @@
 +	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-+
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2752,7 +2724,29 @@
 +		 * check fails we are sure to get a wakeup if it stops.
 +		 */
 +		exit_code = xchg(&p->exit_code, 0);
-+		if (exit_code)
++		if (exit_code & PTRACE_TRAPPED_MASK)
++			goto found;
++
++		/*
++		 * If p was in job-control stop (TASK_STOPPED) rather than
++		 * ptrace stop (TASK_TRACED), then SIGCONT can asynchronously
++		 * clear it back to TASK_RUNNING.  Until it gets scheduled
++		 * and clears its own ->exit_code, our xchg below will see
++		 * its stop signal.  But, we must not report it if it's no
++		 * longer in TASK_STOPPED, as vanilla wait would not--the
++		 * caller can tell if it sent the SIGCONT before calling
++		 * wait.  We must somehow distinguish this from the case
++		 * where p is in TASK_RUNNING with p->exit_code set because
++		 * it is on its way to entering TASK_TRACED (QUIESCE) for our
++		 * stop.  So, ptrace_report sets the PTRACE_TRAPPED_MASK bit
++		 * in exit_code when it's setting QUIESCE.  For a job control
++		 * control stop, that bit will never have been set.  Since
++		 * the bit's not set now, we should only report right now if
++		 * p is still stopped.  For this case we are protected by
++		 * races the same wait that vanilla do_wait (exit.c) is:
++		 * wait_chldexit is woken after p->state is set to TASK_STOPPED.
++		 */
++		if (p->state == TASK_STOPPED)
 +			goto found;
 +
 +		// XXX should handle WCONTINUED
@@ -2803,6 +2797,7 @@
 +	}
 +	else {
 +		why = CLD_TRAPPED;
++		exit_code &= ~PTRACE_TRAPPED_MASK;
 +		status = exit_code;
 +		exit_code = (status << 8) | 0x7f;
 +	}
@@ -2981,8 +2976,14 @@
 +	 */
 +	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
 +
++	/*
++	 * The PTRACE_TRAPPED_MASK bit distinguishes to ptrace_do_wait that
++	 * this is a ptrace report, so we expect to enter TASK_TRACED but
++	 * might not be there yet when examined.
++	 */
 +	BUG_ON(code == 0);
-+	tsk->exit_code = code;
++	WARN_ON(code &~ 0x7ff);
++	tsk->exit_code = code | PTRACE_TRAPPED_MASK;
 +	do_notify(tsk, state->parent, CLD_TRAPPED);
 +
 +	pr_debug("%d ptrace_report quiescing exit_code %x\n",
@@ -3178,15 +3179,13 @@
 +	NO_LOCKS;
 +	printk(KERN_ERR "ptrace out of memory, lost child %d of %d",
 +	       child->pid, parent->pid);
- }
- 
--int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
++}
++
 +static u32
 +ptrace_report_clone(struct utrace_attached_engine *engine,
 +		    struct task_struct *parent,
 +		    unsigned long clone_flags, struct task_struct *child)
- {
--	int copied;
++{
 +	int event, option;
 +	struct ptrace_state *state;
 +
@@ -3217,9 +3216,7 @@
 +	}
 +	else
 +		event = 0;
- 
--	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
--	return (copied == sizeof(data)) ? 0 : -EIO;
++
 +	if (!(clone_flags & CLONE_UNTRACED)
 +	    && (event || (clone_flags & CLONE_PTRACE))) {
 +		/*
@@ -3279,7 +3276,7 @@
 +	state->have_eventmsg = 0;
 +	state->u.siginfo = info;
 +	return ptrace_report(engine, tsk, state, signo) | UTRACE_SIGNAL_IGN;
- }
++}
 +
 +static u32
 +ptrace_report_jctl(struct utrace_attached_engine *engine,
@@ -3370,12 +3367,14 @@
 +			   struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
-+}
-+
+ }
+ 
+-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
 +		   struct task_struct *tsk, long orig_code, long *code)
-+{
+ {
+-	int copied;
 +	struct ptrace_state *state = get_ptrace_state(engine, tsk);
 +	if (unlikely(state == NULL))
 +		return UTRACE_ACTION_RESUME;
@@ -3402,9 +3401,11 @@
 +	}
 +
 +	END_CHECK;
-+
+ 
+-	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
+-	return (copied == sizeof(data)) ? 0 : -EIO;
 +	return unsafe;
-+}
+ }
 +
 +static struct task_struct *
 +ptrace_tracer_task(struct utrace_attached_engine *engine,
@@ -3503,7 +3504,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1178,6 +1178,10 @@ struct task_struct {
+@@ -1179,6 +1179,10 @@ struct task_struct {
  	atomic_t fs_excl;	/* holding fs exclusive resources */
  	struct rcu_head rcu;
  

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-utrace-tracehook.patch	1 Sep 2007 00:32:50 -0000	1.8
+++ linux-2.6-utrace-tracehook.patch	4 Sep 2007 20:53:27 -0000	1.9
@@ -221,7 +221,7 @@
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  
-@@ -427,7 +433,7 @@ static int do_task_stat(struct task_stru
+@@ -441,7 +447,7 @@ static int do_task_stat(struct task_stru
  
  		sid = signal_session(sig);
  		pgid = process_group(task);
@@ -257,7 +257,7 @@
  #include <linux/mount.h>
  #include <linux/security.h>
  #include <linux/syscalls.h>
-@@ -1161,13 +1161,7 @@ EXPORT_SYMBOL(prepare_binprm);
+@@ -1153,13 +1153,7 @@ EXPORT_SYMBOL(prepare_binprm);
  
  static int unsafe_exec(struct task_struct *p)
  {
@@ -272,7 +272,7 @@
  	if (atomic_read(&p->fs->count) > 1 ||
  	    atomic_read(&p->files->count) > 1 ||
  	    atomic_read(&p->sighand->count) > 1)
-@@ -1311,6 +1305,7 @@ int search_binary_handler(struct linux_b
+@@ -1303,6 +1297,7 @@ int search_binary_handler(struct linux_b
  				bprm->file = NULL;
  				current->did_exec = 1;
  				proc_exec_connector(current);
@@ -382,7 +382,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2754,11 +2760,6 @@ static int selinux_task_alloc_security(s
+@@ -2757,11 +2763,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -394,7 +394,7 @@
  	return 0;
  }
  
-@@ -4541,6 +4542,7 @@ static int selinux_setprocattr(struct ta
+@@ -4544,6 +4545,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -402,7 +402,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -4629,18 +4631,24 @@ static int selinux_setprocattr(struct ta
+@@ -4632,18 +4634,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -2621,7 +2621,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1448,8 +1445,7 @@ void do_notify_parent(struct task_struct
+@@ -1447,8 +1444,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2631,7 +2631,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1474,7 +1470,7 @@ void do_notify_parent(struct task_struct
+@@ -1473,7 +1469,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2640,7 +2640,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1502,20 +1498,13 @@ void do_notify_parent(struct task_struct
+@@ -1501,20 +1497,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2662,7 +2662,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1540,6 +1529,15 @@ static void do_notify_parent_cldstop(str
+@@ -1539,6 +1528,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2678,7 +2678,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1552,107 +1550,6 @@ static void do_notify_parent_cldstop(str
+@@ -1551,107 +1549,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2786,7 +2786,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1661,7 +1558,7 @@ finish_stop(int stop_count)
+@@ -1660,7 +1557,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -2795,7 +2795,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1788,44 +1685,24 @@ relock:
+@@ -1787,44 +1684,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -2856,7 +2856,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1874,7 +1751,7 @@ relock:
+@@ -1873,7 +1750,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -2865,7 +2865,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1903,13 +1780,13 @@ relock:
+@@ -1902,13 +1779,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -2881,7 +2881,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1921,7 +1798,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
+@@ -1920,7 +1797,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
  EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_proc);
@@ -2902,12 +2902,12 @@
  	stats->ac_stime	 = cputime_to_msecs(tsk->stime) * USEC_PER_MSEC;
 --- linux-2.6/kernel/sys.c
 +++ linux-2.6/kernel/sys.c
-@@ -1470,7 +1470,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
+@@ -1469,7 +1469,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
  	if (!thread_group_leader(p))
  		goto out;
  
 -	if (p->real_parent->tgid == group_leader->tgid) {
-+	if (p->parent == group_leader) {
++	if (p->parent->tgid == group_leader->tgid) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))
  			goto out;
@@ -3100,7 +3100,7 @@
  
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -938,7 +938,6 @@ struct task_struct {
+@@ -939,7 +939,6 @@ struct task_struct {
  	void *stack;
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
@@ -3108,7 +3108,7 @@
  
  	int lock_depth;		/* BKL lock depth */
  
-@@ -972,12 +971,6 @@ struct task_struct {
+@@ -973,12 +972,6 @@ struct task_struct {
  #endif
  
  	struct list_head tasks;
@@ -3121,7 +3121,7 @@
  
  	struct mm_struct *mm, *active_mm;
  
-@@ -997,15 +990,13 @@ struct task_struct {
+@@ -998,15 +991,13 @@ struct task_struct {
  	unsigned long stack_canary;
  #endif
  	/* 
@@ -3139,7 +3139,7 @@
  	 */
  	struct list_head children;	/* list of my children */
  	struct list_head sibling;	/* linkage in my parent's children list */
-@@ -1145,8 +1136,6 @@ struct task_struct {
+@@ -1146,8 +1137,6 @@ struct task_struct {
  
  	struct io_context *io_context;
  
@@ -3148,7 +3148,7 @@
  /*
   * current io wait handle: wait queue entry to use for io waits
   * If this thread is processing aio, this points at the waitqueue
-@@ -1523,6 +1512,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1526,6 +1515,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern void do_notify_parent(struct task_struct *, int);



From fedora-extras-commits at redhat.com  Tue Sep  4 21:12:27 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue,  4 Sep 2007 17:12:27 -0400
Subject: fedora-security/audit fc6,1.250,1.251 fc7,1.91,1.92
Message-ID: <200709042112.l84LCRpQ015323@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15261

Modified Files:
	fc6 fc7 
Log Message:
gd



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- fc6	28 Aug 2007 16:44:20 -0000	1.250
+++ fc6	4 Sep 2007 21:12:24 -0000	1.251
@@ -35,6 +35,13 @@
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]
+CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277421
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245809
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3392 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fc7	4 Sep 2007 17:00:52 -0000	1.91
+++ fc7	4 Sep 2007 21:12:24 -0000	1.92
@@ -86,13 +86,13 @@
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 version (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-0033]
 CVE-2007-3507 version (flac123, fixed 0.0.10) #246322 [since FEDORA-2007-1045]
-CVE-2007-3478 ** (gd)
-CVE-2007-3477 ** (gd)
-CVE-2007-3476 ** (gd)
-CVE-2007-3475 ** (gd)
-CVE-2007-3474 ** (gd)
-CVE-2007-3473 ** (gd)
-CVE-2007-3472 ** (gd)
+CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277411
 CVE-2007-3410 backport (HelixPlayer) #245838 [since FEDORA-2007-0756]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245807
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]



From fedora-extras-commits at redhat.com  Tue Sep  4 21:15:02 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Tue, 4 Sep 2007 17:15:02 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.478,1.479
Message-ID: <200709042115.l84LF2q8015892@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366

Modified Files:
	eclipse.spec 
Log Message:
* 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.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- eclipse.spec	1 Sep 2007 02:57:59 -0000	1.478
+++ eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
@@ -23,15 +23,14 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        13%{?dist} 
+Release:        14%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
-Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-#Source4:        fedora-eclipse-product-plugin-3.3.0.1.zip
+Source4:        org.fedoraproject.ide.platform-3.3.0.1.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -223,6 +222,7 @@
 Requires: eclipse-cvs-client
 Requires: eclipse-subclipse
 Requires: eclipse-changelog
+Requires: eclipse-rpm-editor
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64 alpha
@@ -233,7 +233,7 @@
 %endif
 
 %description    platform
-The Eclipse Platform is the base of all IDE plugins.  This does not include the
+The Fedora Eclipse Platform is the base of all IDE plugins.  This does not include the
 Java Development Tools or the Plugin Development Environment.
 
 %package        jdt
@@ -384,9 +384,6 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties
 popd
 
-# Splashscreen
-cp %{SOURCE1} plugins/org.eclipse.platform/splash.bmp
-
 # FIXME this should be patched upstream with a flag to turn on and off 
 # all output should be directed to stdout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
@@ -629,7 +626,6 @@
 fi
 
 tar jxf %{SOURCE20}
-#unzip -qq %{SOURCE4}
 
 %build
 ORIGCLASSPATH=$CLASSPATH
@@ -688,8 +684,7 @@
 SDK=$(cd eclipse && pwd)
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
 pushd equinox-incubator
-mkdir -p build
-mkdir -p home
+mkdir -p build home
 homedir=$(cd home && pwd)
 
 # This can go away when package build handles plugins (not just features)
@@ -745,11 +740,13 @@
 ln -s plugins/$LAUNCHERNAME startup.jar
 popd
 
-## The FileInitializer app isn't part of the SDK (yet?) but we want it to be
-## around for other RPMs
+# Install the file initializer app
 cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
+# Install the Fedora Eclipse product plugin
+unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins %{SOURCE4}
+
 # Set up an extension location and a link file for the arch-specific dir
 echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link
 echo "name=Eclipse Platform" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension
@@ -824,8 +821,10 @@
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app
 
-# Set eclipse.product to be org.eclipse.platform.ide 
-sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
+# Set eclipse.product to org.fedoraproject.ide.platform 
+sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the launcher so
@@ -886,19 +885,17 @@
 popd
 
 # Icons
-PLATFORMSUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//")
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse48.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse32.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s ../../../../%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse.png \
+ln -s ../../../../%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %ifarch %{ix86} x86_64
 # Remove unused icon.xpm
 # see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
@@ -1360,6 +1357,7 @@
 %{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
+%{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform
 %ifarch %{ix86} x86_64 ppc
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
 %endif
@@ -1571,6 +1569,10 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Tue Sep  4 21:18:28 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 17:18:28 -0400
Subject: rpms/armacycles-ad/devel armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709042118.l84LISj1017586@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Sep 2007 19:00:41 -0000	1.1
+++ .cvsignore	4 Sep 2007 21:17:55 -0000	1.2
@@ -0,0 +1 @@
+armagetronad-0.2.8.2.1.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	4 Sep 2007 21:17:55 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:19:33 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 4 Sep 2007 17:19:33 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23, 
	1.24 telepathy-gabble.spec, 1.31, 1.32
Message-ID: <200709042119.l84LJXju017805@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17714

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	29 Aug 2007 20:05:22 -0000	1.23
+++ .cvsignore	4 Sep 2007 21:19:00 -0000	1.24
@@ -3,3 +3,4 @@
 telepathy-gabble-0.5.12.1.20070626darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070711darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
+telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	29 Aug 2007 20:05:22 -0000	1.23
+++ sources	4 Sep 2007 21:19:00 -0000	1.24
@@ -1 +1 @@
-f013d23c75ac7c79d24f1358f5740007  telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
+07d399b2e41a5ba90d410e5102b5c872  telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- telepathy-gabble.spec	29 Aug 2007 20:19:36 -0000	1.31
+++ telepathy-gabble.spec	4 Sep 2007 21:19:00 -0000	1.32
@@ -1,13 +1,13 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070829darcs_olpcrollup 
+%define alphatag 20070904darcs_olpctrial3a
 
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.12.1
-Release:        1.4.%{alphatag}%{?dist}
+Version:        0.5.13
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
+- New snapshot
+
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.12.1-1.4.20070829darcs_olpcrollup
 - New tube fixes
 



From fedora-extras-commits at redhat.com  Tue Sep  4 21:19:58 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 4 Sep 2007 17:19:58 -0400
Subject: rpms/blktrace/devel blktrace-cflags.patch, NONE, 1.1 blktrace.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709042119.l84LJwtQ017853@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/blktrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17777/devel

Modified Files:
	.cvsignore sources 
Added Files:
	blktrace-cflags.patch blktrace.spec 
Log Message:
Initial package version


blktrace-cflags.patch:

--- NEW FILE blktrace-cflags.patch ---
--- blktrace/btt/Makefile.orig	2007-08-15 12:00:39.260464020 -0500
+++ blktrace/btt/Makefile	2007-08-15 12:01:29.568789170 -0500
@@ -6,10 +6,11 @@
 #
 
 CC	= gcc
+CFLAGS	= -O2 -Wall -W -g
 INCS	= -I. -I..
 OCFLAGS	= -UCOUNT_IOS -UDEBUG -DNDEBUG
-XCFLAGS	= -Wall -W -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS	= $(INCS) -O2 $(XCFLAGS) $(OCFLAGS)
+XCFLAGS	= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_CFLAGS = $(CFLAGS) $(INCS) $(XCFLAGS) $(OCFLAGS)
 
 PROGS	= btt
 LIBS	= $(PLIBS) $(ELIBS)
@@ -21,19 +22,19 @@
 all: depend $(PROGS)
 
 rbtree.o: ../rbtree.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 depend:
-	@$(CC) -MM $(CFLAGS) -I.. *.c 1> .depend
+	@$(CC) -MM $(ALL_CFLAGS) -I.. *.c 1> .depend
 
 clean: docsclean
 	-rm -f *.o $(PROGS) .depend
 
 %.o: %.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 btt: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 docs:
 	$(MAKE) -C doc all


--- NEW FILE blktrace.spec ---
Summary: Utilities for performing block layer IO tracing in the linux kernel
Name: blktrace
Version: 0.0
Release: 0.4.20070730162628git%{?dist}
License: GPLv2+
Group: Development/System
Source:  http://brick.kernel.dk/snaps/blktrace-git-20070730162628.tar.gz
Url: http://brick.kernel.dk/snaps

Patch1: blktrace-cflags.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
blktrace is a block layer IO tracing mechanism which provides detailed
information about request queue operations to user space.  This package
includes both blktrace, a utility which gathers event traces from the kernel;
and blkparse, a utility which formats trace data collected by blktrace.

You should install the blktrace package if you need to gather detailed
information about IO patterns.

%prep
%setup -q -n blktrace
%patch1 -p1 -b .cflags

%build
make CFLAGS="%{optflags}" all

%install
rm -rf %{buildroot}
make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/usr/share/man install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README COPYING
/usr/bin/*
%attr(0644,root,root) /usr/share/man/man1/*
%attr(0644,root,root) /usr/share/man/man8/*

%changelog
* Wed Aug 15 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.4.20070730162628git
- Fix up btt/Makefile to accept rpm's CFLAGS

* Tue Aug 14 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.3.20070730162628git
- Just drop the pdf build, bloats the buildroot for such a simple tool

* Wed Aug 01 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.2.20070730162628git
- Add ghostscript to BuildRequires, use attr macro for man pages

* Wed Aug 01 2007 Eric Sandeen <sandeen at redhat.com> - 0.0-0.1.20070730162628git
- New package, initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Sep 2007 19:04:04 -0000	1.1
+++ .cvsignore	4 Sep 2007 21:19:25 -0000	1.2
@@ -0,0 +1 @@
+blktrace-git-20070730162628.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:04:04 -0000	1.1
+++ sources	4 Sep 2007 21:19:25 -0000	1.2
@@ -0,0 +1 @@
+74d9ba563e07eeb3d662c6735cbcdaa0  blktrace-git-20070730162628.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep  4 21:24:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 17:24:02 -0400
Subject: rpms/hddtemp/devel hddtemp.init,1.3,1.4 hddtemp.spec,1.22,1.23
Message-ID: <200709042124.l84LO2Qp018020@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989

Modified Files:
	hddtemp.init hddtemp.spec 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
- Adjust server chkconfig start/stop priorities to start before gkrellmd,
  other cosmetic init script tweaks.



Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hddtemp.init	9 Jul 2007 21:13:32 -0000	1.3
+++ hddtemp.init	4 Sep 2007 21:23:29 -0000	1.4
@@ -2,7 +2,7 @@
 #
 # hddtemp       This shell script takes care of starting and stopping hddtemp.
 #
-# chkconfig:    - 90 10
+# chkconfig:    - 80 20
 # description:  hddtemp provides information about hard drives' temperature
 # processname:  hddtemp
 # config:       __ETCDIR__/sysconfig/hddtemp
@@ -27,13 +27,13 @@
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
 HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
-exec="__SBINDIR__/hddtemp"
-prog=$(basename $exec)
+exec=__SBINDIR__/hddtemp
+prog=${exec##*/}
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
     if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
-        action $"Unconfigured: $prog, see__ETCDIR__/sysconfig/hddtemp: " /bin/false
+        action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
         retval=6
     else
         echo -n $"Starting hard disk temperature monitor daemon ($prog): "


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hddtemp.spec	16 Aug 2007 09:13:24 -0000	1.22
+++ hddtemp.spec	4 Sep 2007 21:23:30 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.13.%{beta}%{?dist}
+Release:        0.14.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -95,6 +95,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
+- Adjust server chkconfig start/stop priorities to start before gkrellmd,
+  other cosmetic init script tweaks.
+
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Tue Sep  4 21:25:28 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 4 Sep 2007 17:25:28 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.32,1.33
Message-ID: <200709042125.l84LPS6R018061@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18033

Modified Files:
	telepathy-gabble.spec 
Log Message:
Fix for actual directory name


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- telepathy-gabble.spec	4 Sep 2007 21:19:00 -0000	1.32
+++ telepathy-gabble.spec	4 Sep 2007 21:24:56 -0000	1.33
@@ -6,14 +6,14 @@
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.13
+Version:        0.5.13.1
 Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.13.%{alphatag}.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,7 +60,7 @@
 
 
 %changelog
-* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13-0.1.20070904darcs_olpctrial3a
+* Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13.1-0.1.20070904darcs_olpctrial3a
 - New snapshot
 
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.12.1-1.4.20070829darcs_olpcrollup



From fedora-extras-commits at redhat.com  Tue Sep  4 18:48:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 4 Sep 2007 14:48:35 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.28, 1.29 gnome-menus.spec, 1.65,
	1.66 sources, 1.28, 1.29
Message-ID: <200709041848.l84ImZiq024818@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24769

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Aug 2007 21:58:11 -0000	1.28
+++ .cvsignore	4 Sep 2007 18:48:02 -0000	1.29
@@ -1 +1 @@
-gnome-menus-2.19.90.tar.bz2
+gnome-menus-2.19.92.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-menus.spec	23 Aug 2007 22:17:21 -0000	1.65
+++ gnome-menus.spec	4 Sep 2007 18:48:02 -0000	1.66
@@ -5,8 +5,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -98,6 +98,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 - BuildRequires: gawk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Aug 2007 21:58:11 -0000	1.28
+++ sources	4 Sep 2007 18:48:02 -0000	1.29
@@ -1 +1 @@
-69b746d6776269882ff05c2f20e32390  gnome-menus-2.19.90.tar.bz2
+ba03799545df6d7258e9b7b6c5b78aff  gnome-menus-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:32:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 4 Sep 2007 17:32:58 -0400
Subject: rpms/hddtemp/devel hddtemp.spec,1.23,1.24
Message-ID: <200709042132.l84LWwfN020282@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20240

Modified Files:
	hddtemp.spec 
Log Message:
Mark hddtemp.db as %%config(noreplace).


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hddtemp.spec	4 Sep 2007 21:23:30 -0000	1.23
+++ hddtemp.spec	4 Sep 2007 21:32:25 -0000	1.24
@@ -90,7 +90,7 @@
 %{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
-%config /usr/share/misc/hddtemp.db
+%config(noreplace) /usr/share/misc/hddtemp.db
 %{_mandir}/man8/hddtemp.8*
 
 
@@ -98,6 +98,7 @@
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
 - Adjust server chkconfig start/stop priorities to start before gkrellmd,
   other cosmetic init script tweaks.
+- Mark hddtemp.db as %%config(noreplace).
 
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
 - License: GPLv2+



From fedora-extras-commits at redhat.com  Tue Sep  4 21:33:08 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 4 Sep 2007 17:33:08 -0400
Subject: rpms/rhgb/devel rhgb-0.17.6-drop-strings.patch, NONE, 1.1 rhgb.spec,
	1.80, 1.81
Message-ID: <200709042133.l84LX80M020287@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/rhgb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20249

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-0.17.6-drop-strings.patch 
Log Message:
- don't show strings like 
  "Starting random number generator"
  and
  "Starting console mouse services"
  anymore, since the subset we support aren't that good
  anyway, and it causes a lot of stutter when booting


rhgb-0.17.6-drop-strings.patch:

--- NEW FILE rhgb-0.17.6-drop-strings.patch ---
diff -up rhgb-0.17.6/src/main.c.drop-strings rhgb-0.17.6/src/main.c
--- rhgb-0.17.6/src/main.c.drop-strings	2007-09-04 14:59:11.000000000 -0400
+++ rhgb-0.17.6/src/main.c	2007-09-04 15:02:08.000000000 -0400
@@ -636,7 +636,7 @@ update_progress_bar (const char *step)
 	       */
 	      if (text)
 		{
-		  splash_set_label (splash, text);
+		  splash_set_label (splash, NULL);
 		}
 	    }
 	  break;


Index: rhgb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- rhgb.spec	28 Aug 2007 04:35:43 -0000	1.80
+++ rhgb.spec	4 Sep 2007 21:32:35 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -21,6 +21,7 @@
 Patch1: rhgb-0.17.6-dont-show-details-after-timeout.patch
 Patch2: rhgb-0.17.6-support-manual-switch.patch
 Patch3: rhgb-0.17.6-change-color.patch
+Patch4: rhgb-0.17.6-drop-strings.patch
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -31,6 +32,7 @@
 %patch1 -p1 -b .dont-show-details-after-timeout
 %patch2 -p1 -b .support-manual-switch
 %patch3 -p1 -b .change-color
+%patch4 -p1 -b .drop-strings
 
 %build
 %configure
@@ -60,6 +62,14 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 0.17.6-7
+- don't show strings like 
+  "Starting random number generator"
+  and
+  "Starting console mouse services"
+  anymore, since the subset we support aren't that good
+  anyway, and it causes a lot of stutter when booting
+
 * Mon Aug 27 2007 Ray Strode <rstrode at redhat.com> - 0.17.6-6
 - more color changes
 - drop image that isn't used in new theme



From fedora-extras-commits at redhat.com  Tue Sep  4 21:35:10 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 17:35:10 -0400
Subject: rpms/armacycles-ad/F-7 armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709042135.l84LZA7m020440@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20400

Modified Files:
	sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	4 Sep 2007 21:34:37 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 21:41:11 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 4 Sep 2007 17:41:11 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.441, 1.442 anaconda.spec, 1.577, 
	1.578 sources, 1.569, 1.570
Message-ID: <200709042141.l84LfBSv020624@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- .cvsignore	31 Aug 2007 16:40:49 -0000	1.441
+++ .cvsignore	4 Sep 2007 21:40:38 -0000	1.442
@@ -1 +1,2 @@
 anaconda-11.3.0.26.tar.bz2
+anaconda-11.3.0.27.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- anaconda.spec	31 Aug 2007 16:40:49 -0000	1.577
+++ anaconda.spec	4 Sep 2007 21:40:38 -0000	1.578
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.26
+Version: 11.3.0.27
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 11.3.0.27-1
+- Honor hostname= command line option (dcantrell, #186560).
+- Set the hostname if provided by the user or by DHCP (dcantrell, #180451).
+- Blacklist floppy and iscsi modules (notting).
+- Fix traceback on GUI network config screen (dcantrell).
+- Kickstart networking interface fixes (dcantrell, #260621).
+- Don't traceback when reading kickstart post scripts (#276851).
+- On kickstart installs, output the incoming packages section to
+  anaconda-ks.cfg.
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.26-1
 - Some kickstart fixes (clumens, #269721)
 - More libraries (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- sources	31 Aug 2007 16:40:49 -0000	1.569
+++ sources	4 Sep 2007 21:40:38 -0000	1.570
@@ -1 +1 @@
-652dbaf824f5ce9579a3f6fb82a15a29  anaconda-11.3.0.26.tar.bz2
+1a854b0ef23af7429158c1f8e2198541  anaconda-11.3.0.27.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 22:00:19 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 4 Sep 2007 18:00:19 -0400
Subject: rpms/kernel/devel .cvsignore, 1.679, 1.680 kernel.spec, 1.145,
	1.146 linux-2.6-highres-timers.patch, 1.8,
	1.9 patch-2.6.23-rc4.bz2.sign, 1.1, NONE
Message-ID: <200709042200.l84M0J5M021164@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21122

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch 
Removed Files:
	patch-2.6.23-rc4.bz2.sign 
Log Message:
* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix oops in cpuidle under QEMU



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -r1.679 -r1.680
--- .cvsignore	1 Sep 2007 16:29:55 -0000	1.679
+++ .cvsignore	4 Sep 2007 21:59:46 -0000	1.680
@@ -4,6 +4,3 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc3-git10.bz2
-patch-2.6.23-rc4-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kernel.spec	4 Sep 2007 20:53:27 -0000	1.145
+++ kernel.spec	4 Sep 2007 21:59:46 -0000	1.146
@@ -1789,6 +1789,9 @@
 
 
 %changelog
+* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
+- Fix oops in cpuidle under QEMU
+
 * Tue Sep  4 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#232837, #248532)
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-highres-timers.patch	24 Aug 2007 21:12:24 -0000	1.8
+++ linux-2.6-highres-timers.patch	4 Sep 2007 21:59:46 -0000	1.9
@@ -1417,7 +1417,7 @@
 +
 +	struct acpi_processor *pr = processors[cpu];
 +
-+	if (!pr->flags.power_setup_done)
++	if (!pr || !pr->flags.power_setup_done)
 +		return -EINVAL;
 +
 +	if (pr->flags.power == 0) {


--- patch-2.6.23-rc4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep  4 22:06:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 4 Sep 2007 18:06:56 -0400
Subject: rpms/kernel/devel linux-2.6-ata-via-fix-dma-mode.patch, NONE,
	1.1 kernel.spec, 1.146, 1.147
Message-ID: <200709042206.l84M6upI027319@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ata-via-fix-dma-mode.patch 
Log Message:
* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
- fix DMA mode on VIA 6421


linux-2.6-ata-via-fix-dma-mode.patch:

--- NEW FILE linux-2.6-ata-via-fix-dma-mode.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b4154d4a01c6cc98b97dc239ca4302316c8f98da
Commit:     b4154d4a01c6cc98b97dc239ca4302316c8f98da
Parent:     7d05154840db52201d8e719fd0f091b8381e362f
Author:     Ondrej Zary <linux at rainbow-software.org>
AuthorDate: Sat Sep 1 00:55:21 2007 +0200
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Sat Sep 1 06:52:18 2007 -0400

    Fix sata_via write errors on PATA drive connected to VT6421
    
    I think that I've found and fixed the problem. There is a copy/paste bug in
    vt6421_set_dma_mode() function which causes wrong values to be written to
    PATA_UDMA_TIMING register.
    
    This patch fixes a copy/paste bug that breaks DMA modes on VT6421 PATA port.
    
    Signed-off-by: Ondrej Zary <linux at rainbow-software.org>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/sata_via.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index a4e6317..57fd30d 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 	static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
 }
 
 static const unsigned int svia_bar_sizes[] = {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kernel.spec	4 Sep 2007 21:59:46 -0000	1.146
+++ kernel.spec	4 Sep 2007 22:06:22 -0000	1.147
@@ -624,6 +624,7 @@
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-terminate-list.patch
+Patch663: linux-2.6-ata-via-fix-dma-mode.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1120,6 +1121,8 @@
 ApplyPatch linux-2.6-libata-acpi-enable.patch
 # Terminate list in ata-piix
 ApplyPatch linux-2.6-libata-terminate-list.patch
+# fix DMA on vt6421
+ApplyPatch linux-2.6-ata-via-fix-dma-mode.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1790,6 +1793,9 @@
 
 %changelog
 * Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix DMA mode on VIA 6421
+
+* Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
 - Fix oops in cpuidle under QEMU
 
 * Tue Sep  4 2007 Roland McGrath <roland at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep  4 22:22:31 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 4 Sep 2007 18:22:31 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.20,
	1.21 epiphany-extensions.spec, 1.34, 1.35 sources, 1.20, 1.21
Message-ID: <200709042222.l84MMV7q027625@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.19.90


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	8 Aug 2007 19:57:50 -0000	1.20
+++ .cvsignore	4 Sep 2007 22:21:58 -0000	1.21
@@ -1 +1 @@
-epiphany-extensions-2.19.6.tar.bz2
+epiphany-extensions-2.19.90.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- epiphany-extensions.spec	24 Aug 2007 14:43:48 -0000	1.34
+++ epiphany-extensions.spec	4 Sep 2007 22:21:58 -0000	1.35
@@ -3,7 +3,7 @@
 %global gecko_version		1.8.1.6
 
 Name:		epiphany-extensions
-Version:	%{ephy_major}.6
+Version:	%{ephy_major}.90
 Release:	1%{?dist}
 Summary:	Extensions for Epiphany, the GNOME web browser
 
@@ -29,6 +29,7 @@
 
 Requires:	epiphany >= %{ephy_min_version}
 Requires:	gecko-libs = %{gecko_version}
+Requires:	pygtk2 >= 2.11
 
 Requires(pre):	GConf2
 
@@ -107,10 +108,16 @@
 
 
 %changelog
+* Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 2.19.90-1
+- Update to new upstream release (2.19.90), which contains reworked
+  installation rules for the icons and a fix for the Greasemonkey
+  extension so that it does not break when the directory is not
+  created (GNOME bug 437648).
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-1
 - Rebuild for build ID
 
-* Wed Aug  8 2007 Christopher Aillon <caillon at redhat.com> - 2.19.6-1
+* Wed Aug 08 2007 Christopher Aillon <caillon at redhat.com> - 2.19.6-1
 - Update to 2.19.6
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Aug 2007 19:57:50 -0000	1.20
+++ sources	4 Sep 2007 22:21:58 -0000	1.21
@@ -1 +1 @@
-202a16def45f5d00f74fb8015e410b21  epiphany-extensions-2.19.6.tar.bz2
+67b210fa2048a5fa0a7ccc317eea9f32  epiphany-extensions-2.19.90.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep  4 22:42:19 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 4 Sep 2007 18:42:19 -0400
Subject: comps comps-f8.xml.in,1.88,1.89
Message-ID: <200709042242.l84MgJQx029943@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29921

Modified Files:
	comps-f8.xml.in 
Log Message:
Armacycles-ad comps, f8



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- comps-f8.xml.in	3 Sep 2007 19:28:40 -0000	1.88
+++ comps-f8.xml.in	4 Sep 2007 22:41:48 -0000	1.89
@@ -1387,6 +1387,7 @@
       <packagereq type="optional">alienblaster</packagereq>
       <packagereq type="optional">alphabet-soup</packagereq>
       <packagereq type="optional">ants</packagereq>
+      <packagereq type="optional">armacycles-ad</packagereq>
       <packagereq type="optional">arrows</packagereq>
       <packagereq type="optional">asc</packagereq>
       <packagereq type="optional">asc-music</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep  4 23:43:42 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 19:43:42 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.8, 1.9 pulseaudio.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709042343.l84Nhg0W004907@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4879

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2007 19:13:23 -0000	1.8
+++ .cvsignore	4 Sep 2007 23:43:10 -0000	1.9
@@ -1,2 +1,2 @@
+pulseaudio-0.9.7.svn20070905.tar.gz
 libflashsupport-pulse-000.svn20070904.tar.gz
-pulseaudio-0.9.7.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pulseaudio.spec	4 Sep 2007 19:13:23 -0000	1.16
+++ pulseaudio.spec	4 Sep 2007 23:43:10 -0000	1.17
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.9.svn20070904%{?dist}
+Release:	0.10.svn20070905%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070904.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070905.tar.gz
 Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +27,6 @@
 Patch1: 	pulseaudio-0.9.6-nochown.patch
 
 %description
-A
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
@@ -37,6 +36,7 @@
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
 Conflicts:	esound
+Obsoletes:      esound
 
 %description esound-compat
 A compatibility script that allows applications to call /usr/bin/esd
@@ -140,7 +140,7 @@
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
-pwd
+export PULSEAUDIO_SOURCES=`pwd`
 pushd ../libflashsupport-pulse-000
 %configure --disable-rpath
 make LIBTOOL=/usr/bin/libtool
@@ -332,7 +332,10 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
-* Thu Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.10.svn20070905
+- Update SVN snapshot
+
+* Tue Sep 4 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.9.svn20070904
 - Update SVN snapshot
 - ship libflashsupport in our package
 - drop pulseaudio-devel since libpulsecore is not linked statically


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Sep 2007 19:13:23 -0000	1.10
+++ sources	4 Sep 2007 23:43:10 -0000	1.11
@@ -1,2 +1,2 @@
-cf255bd6fe00de595fedbf128f7d5062  libflashsupport-pulse-000.svn20070904.tar.gz
-487c4d60344d8c69e97b3ed39226b21f  pulseaudio-0.9.7.svn20070904.tar.gz
+44a399ac877526b09a9c0e9ee4a9be93  pulseaudio-0.9.7.svn20070905.tar.gz
+07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 00:31:25 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 4 Sep 2007 20:31:25 -0400
Subject: rpms/pavucontrol/devel .cvsignore, 1.3, 1.4 pavucontrol.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200709050031.l850VPoj012080@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12039

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
new svn snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 10:30:44 -0000	1.3
+++ .cvsignore	5 Sep 2007 00:30:52 -0000	1.4
@@ -1 +1 @@
-pavucontrol-0.9.5.svn20070816.tar.gz
+pavucontrol-0.9.5.svn20070905.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pavucontrol.spec	16 Aug 2007 10:30:44 -0000	1.2
+++ pavucontrol.spec	5 Sep 2007 00:30:52 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070905%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:	pavucontrol-0.9.5.svn20070816.tar.gz
+Source0:	pavucontrol-0.9.5.svn20070905.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,7 +53,10 @@
 
 
 %changelog
-* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5.svn20070816
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.2.svn20070905
+- Update from SVN snapshot
+
+* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.1.svn20070816
 - Update from SVN snapshot
 
 * Sat Sep  9 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.4-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 10:30:44 -0000	1.3
+++ sources	5 Sep 2007 00:30:52 -0000	1.4
@@ -1 +1 @@
-03240516703fc62c3cf642c2f486c663  pavucontrol-0.9.5.svn20070816.tar.gz
+a04b6fd8abe33c2a3447bbfa85a8067c  pavucontrol-0.9.5.svn20070905.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 00:37:50 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 20:37:50 -0400
Subject: rpms/usermode/devel .cvsignore, 1.50, 1.51 sources, 1.54,
	1.55 usermode.spec, 1.71, 1.72
Message-ID: <200709050037.l850bowl012307@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12269

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
- Fix handling of PAM conversations with no questions
  Resolves: #267361
- Update License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	11 Jun 2007 21:35:02 -0000	1.50
+++ .cvsignore	5 Sep 2007 00:37:17 -0000	1.51
@@ -1 +1 @@
-usermode-1.92.tar.bz2
+usermode-1.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	11 Jun 2007 21:35:02 -0000	1.54
+++ sources	5 Sep 2007 00:37:17 -0000	1.55
@@ -1 +1 @@
-6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- usermode.spec	11 Jun 2007 21:35:02 -0000	1.71
+++ usermode.spec	5 Sep 2007 00:37:17 -0000	1.72
@@ -4,9 +4,9 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.92
-Release: 1
-License: GPL
+Version: 1.93
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
@@ -116,6 +116,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
 * Mon Jun 11 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-1
 - Fix userhelper hangs in non-UTF8 locales
   Resolves: #242420



From fedora-extras-commits at redhat.com  Wed Sep  5 00:40:28 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 20:40:28 -0400
Subject: rpms/usermode/F-7 .cvsignore, 1.49, 1.50 sources, 1.53,
	1.54 usermode.spec, 1.70, 1.71
Message-ID: <200709050040.l850eSfC012399@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12374

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
- Fix handling of PAM conversations with no questions
  Resolves: #267361
- Update License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	15 Jun 2007 08:47:17 -0000	1.49
+++ .cvsignore	5 Sep 2007 00:39:55 -0000	1.50
@@ -1 +1 @@
-usermode-1.92.tar.bz2
+usermode-1.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	15 Jun 2007 08:47:17 -0000	1.53
+++ sources	5 Sep 2007 00:39:55 -0000	1.54
@@ -1 +1 @@
-6b962175592a2b4668b7251fa18d97f4  usermode-1.92.tar.bz2
+82a157127cc827c0ad4d33fc52a92cb0  usermode-1.93.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-7/usermode.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- usermode.spec	15 Jun 2007 08:47:17 -0000	1.70
+++ usermode.spec	5 Sep 2007 00:39:55 -0000	1.71
@@ -4,9 +4,9 @@
 
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.92
-Release: 0.fc7
-License: GPL
+Version: 1.93
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
@@ -116,7 +116,12 @@
 %{_datadir}/applications/*
 
 %changelog
-* Mon Jun 15 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-0.f7
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
+* Mon Jun 11 2007 Miloslav Trma?? <mitr at redhat.com> - 1.92-1
 - Fix userhelper hangs in non-UTF8 locales
   Resolves: #242420
 - Clean up menu categories in desktop files



From fedora-extras-commits at redhat.com  Wed Sep  5 00:48:33 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 4 Sep 2007 20:48:33 -0400
Subject: rpms/kinput2/devel kinput2.spec, 1.14, 1.15 xinput.d-kinput2-canna, 
	1.1, 1.2 xinput.d-kinput2-wnn, 1.1, 1.2
Message-ID: <200709050048.l850mXuN012588@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12559

Modified Files:
	kinput2.spec xinput.d-kinput2-canna xinput.d-kinput2-wnn 
Log Message:
* Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
- Add QT_IM_MODULE=xim to the xinput script.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kinput2.spec	23 Aug 2007 12:25:43 -0000	1.14
+++ kinput2.spec	5 Sep 2007 00:48:01 -0000	1.15
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -253,6 +253,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
+- Add QT_IM_MODULE=xim to the xinput script.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-33
 - Rebuild
 


Index: xinput.d-kinput2-canna
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/xinput.d-kinput2-canna,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.d-kinput2-canna	30 Jun 2005 09:39:32 -0000	1.1
+++ xinput.d-kinput2-canna	5 Sep 2007 00:48:01 -0000	1.2
@@ -2,3 +2,4 @@
 XIM_PROGRAM=kinput2
 XIM_ARGS="-canna +kinput -xim"
 GTK_IM_MODULE=xim
+QT_IM_MODULE=xim


Index: xinput.d-kinput2-wnn
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/xinput.d-kinput2-wnn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.d-kinput2-wnn	30 Jun 2005 09:39:32 -0000	1.1
+++ xinput.d-kinput2-wnn	5 Sep 2007 00:48:01 -0000	1.2
@@ -2,3 +2,4 @@
 XIM_PROGRAM=kinput2
 XIM_ARGS="-wnn +kinput -xim"
 GTK_IM_MODULE=xim
+QT_IM_MODULE=xim



From fedora-extras-commits at redhat.com  Wed Sep  5 01:07:59 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 4 Sep 2007 21:07:59 -0400
Subject: rpms/libuser/devel libuser.spec,1.67,1.68
Message-ID: <200709050107.l8517xMV018813@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/libuser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793

Modified Files:
	libuser.spec 
Log Message:
* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-3
- s/popt/popt-devel/ in BuildRequires
  Resolves: #277541



Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- libuser.spec	8 Aug 2007 15:20:11 -0000	1.67
+++ libuser.spec	5 Sep 2007 01:07:26 -0000	1.68
@@ -5,12 +5,12 @@
 
 Name: libuser
 Version: 0.56.4
-Release: 2
+Release: 3
 Group: System Environment/Base
 License: LGPLv2+
 Source: libuser-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt, python-devel
+BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python-devel
 BuildRequires: cyrus-sasl-devel, openldap-devel
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -108,6 +108,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep  5 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-3
+- s/popt/popt-devel/ in BuildRequires
+  Resolves: #277541
+
 * Wed Aug  8 2007 Miloslav Trma?? <mitr at redhat.com> - 0.56.4-2
 - Split the Python module to a separate subpackage (original patch by Yanko
   Kaneti)



From fedora-extras-commits at redhat.com  Wed Sep  5 02:38:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:38:36 -0700
Subject: [pkgdb] hddtemp (Fedora EPEL, 5) updated by kevin
Message-ID: <200709050238.l852cbjf009396@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for hddtemp
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hddtemp (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hddtemp (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hddtemp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hddtemp



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:40:18 -0700
Subject: [pkgdb] gimmage (Fedora, 7) updated by kevin
Message-ID: <200709050240.l852eKfW009449@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for gimmage
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gimmage (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on gimmage (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 04 Sep 2007 19:40:18 -0700
Subject: [pkgdb] gimmage (Fedora, devel) updated by kevin
Message-ID: <200709050240.l852eLBJ009458@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gimmage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:49 -0400
Subject: rpms/gimmage - New directory
Message-ID: <200709050240.l852en2r032370@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage

Log Message:
Directory /cvs/extras/rpms/gimmage added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:53 -0400
Subject: rpms/gimmage/devel - New directory
Message-ID: <200709050240.l852erme032384@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage/devel

Log Message:
Directory /cvs/extras/rpms/gimmage/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 02:40:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:40:58 -0400
Subject: rpms/gimmage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709050240.l852ewx5032409@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage

Added Files:
	Makefile import.log 
Log Message:
Setup of module gimmage


--- NEW FILE Makefile ---
# Top level Makefile for module gimmage
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  5 02:41:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 22:41:01 -0400
Subject: rpms/gimmage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709050241.l852f1kD032425@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ32341/rpms/gimmage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gimmage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gimmage
# $Id: Makefile,v 1.1 2007/09/05 02:40:58 kevin Exp $
NAME := gimmage
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 fedora-extras-commits at redhat.com  Wed Sep  5 03:07:53 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 4 Sep 2007 23:07:53 -0400
Subject: rpms/graphviz/devel graphviz-arith.patch, NONE, 1.1 graphviz.spec, 
	1.37, 1.38
Message-ID: <200709050307.l8537ruQ006547@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/graphviz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	graphviz.spec 
Added Files:
	graphviz-arith.patch 
Log Message:

* Tue Sep 04 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-3
- Patch to resurrect arith.h


graphviz-arith.patch:

--- NEW FILE graphviz-arith.patch ---
Index: lib/common/Makefile.am
===================================================================
RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lib/common/Makefile.am	26 Jul 2007 13:53:25 -0000	1.46
+++ lib/common/Makefile.am	4 Sep 2007 23:39:07 -0000	1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $
+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
@@ -14,11 +14,10 @@
 AM_CFLAGS = -D_BLD_common=1
 endif
 
-pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h
+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
 noinst_HEADERS = render.h utils.h memory.h \
-	geomprocs.h colorprocs.h colortbl.h entities.h \
-	logic.h arith.h globals.h \
-	const.h macros.h htmllex.h htmltable.h pointset.h
+	geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
+	logic.h const.h macros.h htmllex.h htmltable.h pointset.h
 noinst_LTLIBRARIES = libcommon_C.la
 
 if WITH_CODEGENS


Index: graphviz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- graphviz.spec	23 Aug 2007 16:40:18 -0000	1.37
+++ graphviz.spec	5 Sep 2007 03:07:20 -0000	1.38
@@ -8,7 +8,7 @@
 Summary: Graph Visualization Tools
 Version: 2.14.1
 
-%define truerelease 2
+%define truerelease 3
 %{?distroagnostic: %define release %{truerelease}}
 %{!?distroagnostic: %define release %{truerelease}%{?dist}}
 
@@ -18,6 +18,7 @@
 License: CPL
 URL:     http://www.graphviz.org/
 Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz
+Patch0:  %{name}-arith.patch
 
 #-- feature and package selection -------------------------------------------
 #   depends on %dist and %fedora (or %rhl or %rhel) which are set
@@ -437,6 +438,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %if ! %{SHARP}
@@ -509,6 +511,9 @@
 #-- changelog --------------------------------------------------
 
 %changelog
+* Tue Sep 04 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-3
+- Patch to resurrect arith.h
+
 * Thu Aug 23 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.14.1-2
 - Added perl-devel to BR for F7+
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:36:53 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 4 Sep 2007 23:36:53 -0400
Subject: rpms/vala/devel vala.spec,1.5,1.6
Message-ID: <200709050336.l853arKE007235@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7200

Modified Files:
	vala.spec 
Log Message:
Enable binding generation tools


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vala.spec	2 Sep 2007 22:24:39 -0000	1.5
+++ vala.spec	5 Sep 2007 03:36:20 -0000	1.6
@@ -44,7 +44,7 @@
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -75,12 +75,17 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
+%{_bindir}/*gen
 %{_libdir}/libvala.so
+%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
 
 
 %changelog
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
 * Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
 - Update to 0.1.3
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:40:20 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 4 Sep 2007 23:40:20 -0400
Subject: rpms/vala/devel vala.spec,1.6,1.7
Message-ID: <200709050340.l853eKiY007336@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7295

Modified Files:
	vala.spec 
Log Message:
Bump release number


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vala.spec	5 Sep 2007 03:36:20 -0000	1.6
+++ vala.spec	5 Sep 2007 03:39:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Wed Sep  5 03:44:53 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 4 Sep 2007 23:44:53 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.10, 1.11 deluge.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200709050344.l853ir9D009534@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9359

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 RC1 (intended to stay in updates-testing until 0.5.5 final is released).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Sep 2007 02:14:06 -0000	1.10
+++ .cvsignore	5 Sep 2007 03:44:20 -0000	1.11
@@ -1 +1,2 @@
 deluge-0.5.4.1.tar.gz
+deluge-0.5.4.1.95.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- deluge.spec	2 Sep 2007 02:14:06 -0000	1.20
+++ deluge.spec	5 Sep 2007 03:44:20 -0000	1.21
@@ -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:	0.5.4.1
+Version:	0.5.4.1.95
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://deluge-torrent.org/downloads/%{name}-%{version}.tar.gz
@@ -105,6 +105,10 @@
 
 
 %changelog
+* Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
+- Update to new upstream release candidate (0.5.5 RC1)
+- Update License tag for new License version guidelines.
+
 * Sat Sep 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1-1
 - Update to new upstream release (0.5.4.1). 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Sep 2007 02:14:06 -0000	1.10
+++ sources	5 Sep 2007 03:44:20 -0000	1.11
@@ -1 +1,2 @@
 36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
+4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 03:53:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 23:53:54 -0400
Subject: rpms/fwrestart/devel fwrestart.spec,1.5,1.6
Message-ID: <200709050353.l853rs1P009717@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698

Modified Files:
	fwrestart.spec 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 03:53:22 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 



From fedora-extras-commits at redhat.com  Wed Sep  5 03:55:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 4 Sep 2007 23:55:16 -0400
Subject: rpms/fwrestart/devel sources,1.4,1.5 .cvsignore,1.4,1.5
Message-ID: <200709050355.l853tGiU009764@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9732

Modified Files:
	sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 03:54:43 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 03:54:43 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:04:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:04:06 -0400
Subject: rpms/fwrestart/F-7 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050404.l85446XA015909@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15855

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:03:33 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:03:33 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:03:33 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:05:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:05:30 -0400
Subject: rpms/fwrestart/FC-6 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050405.l8545UOt016027@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15932

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:04:56 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:04:56 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:04:56 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:07:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:07:41 -0400
Subject: rpms/fwrestart/EL-4 fwrestart.spec, 1.4, 1.5 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050407.l8547f44016133@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16089

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/fwrestart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwrestart.spec	9 May 2006 03:10:05 -0000	1.4
+++ fwrestart.spec	5 Sep 2007 04:07:08 -0000	1.5
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
+Version: 1.05
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Mon May  8 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-1
 - Update to 1.04
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 03:10:05 -0000	1.4
+++ sources	5 Sep 2007 04:07:08 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 03:10:05 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:07:08 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:09:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 00:09:01 -0400
Subject: rpms/fwrestart/EL-5 fwrestart.spec, 1.5, 1.6 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200709050409.l85491Jo016227@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fwrestart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16196

Modified Files:
	fwrestart.spec sources .cvsignore 
Log Message:
Update to 1.0.5
Clarify License



Index: fwrestart.spec
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/fwrestart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwrestart.spec	28 Aug 2006 04:11:41 -0000	1.5
+++ fwrestart.spec	5 Sep 2007 04:08:27 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: A way to more safely re-load firewall rules remotely
 Name: fwrestart
-Version: 1.04
-Release: 2%{?dist}
-License: GPL
+Version: 1.05
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://www.tummy.com/Community/software/
-Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz
+Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.05.tar.gz
 BuildRequires: python
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,6 +45,10 @@
 %{_sbindir}/fwrestart
 
 %changelog
+* Tue Sep  4 2007 Kevin Fenzi <kevin at tummy.com> - 1.05-1
+- Update to 1.0.5
+- Clarify License
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.04-2
 - Rebuild for fc6 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 May 2006 02:58:20 -0000	1.4
+++ sources	5 Sep 2007 04:08:27 -0000	1.5
@@ -1 +1 @@
-90fdd16491da250877911cd08a257ebe  fwrestart-1.04.tar.gz
+e1d60aaae0a7c8446f025e016efb8d8f  fwrestart-1.05.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwrestart/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 May 2006 02:58:20 -0000	1.4
+++ .cvsignore	5 Sep 2007 04:08:27 -0000	1.5
@@ -1 +1 @@
-fwrestart-1.04.tar.gz
+fwrestart-1.05.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 04:53:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed,  5 Sep 2007 00:53:06 -0400
Subject: fedora-security/audit epel5,1.1,1.2
Message-ID: <200709050453.l854r6GR016943@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	epel5 
Log Message:
Process a bunch of epel5 entries



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel5	1 Sep 2007 18:49:37 -0000	1.1
+++ epel5	5 Sep 2007 04:53:03 -0000	1.2
@@ -109,58 +109,58 @@
 *CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
 *CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 *CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
-*CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
-*CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
-*CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-5111 version (libksba, fixed 0.9.14)
-*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4684 version (zope, fixed 2.9.2)
-*CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
-*CVE-2006-4248 ignore (thttpd, Debian specific issue)
-*CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
-*CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
-*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
-*CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
-*CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
-*CVE-2006-2489 version (nagios, fixed 2.3.1)
-*CVE-2006-2427 ignore (clamav) not an issue bz#192076
-*CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
-*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
-*CVE-2006-2017 version (dnsmasq, fixed 2.30)
-*CVE-2006-1989 version (clamav, fixed 0.88.2)
-*CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
-*CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
-*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
-*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
-*CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
-*CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
-*CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
-*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
-*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
-*CVE-2006-0322 version (mediawiki, fixed 1.5.8)
-*CVE-2006-0162 version (clamav, fixed 0.88)
-*CVE-2006-0106 version (wine, fixed 0.9.10)
-*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
-*CVE-2005-4803 version (graphviz, fixed 2.2.1)
+CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
+CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
+CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
+CVE-2006-5111 version (libksba, fixed 0.9.14)
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4684 version (zope, fixed 2.9.2)
+CVE-2006-4249 version (plone, fixed 2.5.1-3) #213983
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
+CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
+CVE-2006-4192 version (libmodplug, fixed 0.8-3)
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
+CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
+CVE-2006-3458 version (zope, fixed 2.9.3-3) #198106
+CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
+CVE-2006-2489 version (nagios, fixed 2.3.1)
+CVE-2006-2427 ignore (clamav) not an issue bz#192076
+CVE-2006-2237 version (awstats, fixed 6.5-5) bz#190923
+CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
+CVE-2006-2017 version (dnsmasq, fixed 2.30)
+CVE-2006-1989 version (clamav, fixed 0.88.2)
+CVE-2006-1945 version (awstats, fixed 6.5-4) bz#190922
+CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
+CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
+CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
+CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
+CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353
+CVE-2006-1079 version (thttpd, fixed 2.25b-11) bz#191095
+CVE-2006-1078 version (thttpd, fixed 2.25b-11) bz#191095
+CVE-2006-0847 version (python-cherrypy, fixed 2.1.1)
+CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0760 version (lighttpd, fixed 1.4.10)
+CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
+CVE-2006-0322 version (mediawiki, fixed 1.5.8)
+CVE-2006-0162 version (clamav, fixed 0.88)
+CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
+CVE-2005-4803 version (graphviz, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Wed Sep  5 04:59:02 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 00:59:02 -0400
Subject: rpms/exempi/devel exempi.spec,1.2,1.3
Message-ID: <200709050459.l854x2Bp017040@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17020

Modified Files:
	exempi.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-2
- Rebuild for expat 2.0



Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/exempi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exempi.spec	22 Aug 2007 12:08:15 -0000	1.2
+++ exempi.spec	5 Sep 2007 04:58:23 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
 Version:	1.99.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-2
+- Rebuild for expat 2.0
+
 * Wed Aug 22 2007 Deji Akingunola <dakingun at gmail.com> - 1.99.4-1
 - Update tp 1.99.4
 



From fedora-extras-commits at redhat.com  Wed Sep  5 05:11:47 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:11:47 -0400
Subject: rpms/autofs/devel autofs-5.0.2-add-ldap-schema-discovery.patch, 1.1,
	1.2 autofs.spec, 1.221, 1.222
Message-ID: <200709050511.l855BlmR023157@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23125

Modified Files:
	autofs-5.0.2-add-ldap-schema-discovery.patch autofs.spec 
Log Message:
* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
- fix LDAP schema discovery.


autofs-5.0.2-add-ldap-schema-discovery.patch:

Index: autofs-5.0.2-add-ldap-schema-discovery.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.2-add-ldap-schema-discovery.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.2-add-ldap-schema-discovery.patch	28 Aug 2007 05:45:31 -0000	1.1
+++ autofs-5.0.2-add-ldap-schema-discovery.patch	5 Sep 2007 05:11:13 -0000	1.2
@@ -1,25 +1,6 @@
-diff --git a/include/defaults.h b/include/defaults.h
-index ef58467..9aec11a 100644
---- a/include/defaults.h
-+++ b/include/defaults.h
-@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
- unsigned int defaults_get_browse_mode(void);
- unsigned int defaults_get_logging(void);
- const char *defaults_get_ldap_server(void);
--const char *defaults_get_map_obj_class(void);
--const char *defaults_get_entry_obj_class(void);
--const char *defaults_get_map_attr(void);
--const char *defaults_get_entry_attr(void);
--const char *defaults_get_value_attr(void);
-+struct ldap_schema *defaults_get_default_schema(void);
-+struct ldap_schema *defaults_get_schema(void);
- unsigned int defaults_get_append_options(void);
- const char *defaults_get_auth_conf_file(void);
- 
-diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
-index 0a9deca..1378b9e 100644
---- a/include/lookup_ldap.h
-+++ b/include/lookup_ldap.h
+diff -up autofs-5.0.2/include/lookup_ldap.h.add-ldap-schema-discovery autofs-5.0.2/include/lookup_ldap.h
+--- autofs-5.0.2/include/lookup_ldap.h.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/include/lookup_ldap.h	2007-09-05 12:52:35.000000000 +0800
 @@ -10,6 +10,14 @@
  #include <krb5.h>
  #endif
@@ -48,164 +29,158 @@
  
  	/* TLS and SASL authentication information */
  	char        *auth_conf;
-diff --git a/lib/defaults.c b/lib/defaults.c
-index 4b4acba..b146f13 100644
---- a/lib/defaults.c
-+++ b/lib/defaults.c
-@@ -18,6 +18,7 @@
- #include <string.h>
+diff -up autofs-5.0.2/include/defaults.h.add-ldap-schema-discovery autofs-5.0.2/include/defaults.h
+--- autofs-5.0.2/include/defaults.h.add-ldap-schema-discovery	2007-06-18 15:18:08.000000000 +0800
++++ autofs-5.0.2/include/defaults.h	2007-09-05 12:52:35.000000000 +0800
+@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
+ unsigned int defaults_get_browse_mode(void);
+ unsigned int defaults_get_logging(void);
+ const char *defaults_get_ldap_server(void);
+-const char *defaults_get_map_obj_class(void);
+-const char *defaults_get_entry_obj_class(void);
+-const char *defaults_get_map_attr(void);
+-const char *defaults_get_entry_attr(void);
+-const char *defaults_get_value_attr(void);
++struct ldap_schema *defaults_get_default_schema(void);
++struct ldap_schema *defaults_get_schema(void);
+ unsigned int defaults_get_append_options(void);
+ const char *defaults_get_auth_conf_file(void);
  
- #include "defaults.h"
-+#include "lookup_ldap.h"
- #include "log.h"
+diff -up autofs-5.0.2/modules/lookup_ldap.c.add-ldap-schema-discovery autofs-5.0.2/modules/lookup_ldap.c
+--- autofs-5.0.2/modules/lookup_ldap.c.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-05 12:53:10.000000000 +0800
+@@ -42,6 +42,13 @@
  
- #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
-@@ -41,16 +42,8 @@
- #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
  
- static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
++static struct ldap_schema common_schema[] = {
++	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
++	{"automountMap", "ou", "automount", "cn", "automountInformation"},
++	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
++};
++static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++
+ int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
+ {
+ 	int rv;
+@@ -738,54 +745,15 @@ done:
+ 	return 1;
+ }
+ 
+-static int get_default_schema(struct lookup_context *ctxt)
+-{
+-	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
+-	if (!ctxt->map_obj_class)
+-		return 0;
 -
--static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
+-	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
+-	if (!ctxt->entry_obj_class)
+-		goto free_moc;
 -
--static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
--static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
--static const char *default_map_attr		= DEFAULT_MAP_ATTR;
--static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
--static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
+-	ctxt->map_attr = (char *) defaults_get_map_attr();
+-	if (!ctxt->map_attr)
+-		goto free_eoc;
 -
--static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
-+static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
-+static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
- 
- static char *get_env_string(const char *name)
+-	ctxt->entry_attr = (char *) defaults_get_entry_attr();
+-	if (!ctxt->entry_attr)
+-		goto free_ma;
+-
+-	ctxt->value_attr = (char *) defaults_get_value_attr();
+-	if (!ctxt->value_attr)
+-		goto free_ea;
+-
+-	return 1;
+-
+-free_ea:
+-	free(ctxt->entry_attr);
+-free_ma:
+-	free(ctxt->map_attr);
+-free_eoc:
+-	free(ctxt->entry_obj_class);
+-free_moc:
+-	free(ctxt->map_obj_class);
+-
+-	ctxt->map_obj_class = NULL;
+-	ctxt->entry_obj_class = NULL;
+-	ctxt->map_attr = NULL;
+-	ctxt->entry_attr = NULL;
+-
+-	return 0;
+-}
+-
+ static void free_context(struct lookup_context *ctxt)
  {
-@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(void)
- 	return (const char *) server;
+-	if (ctxt->map_obj_class) {
+-		free(ctxt->map_obj_class);
+-		free(ctxt->entry_obj_class);
+-		free(ctxt->map_attr);
+-		free(ctxt->entry_attr);
++	if (ctxt->schema) {
++		free(ctxt->schema->map_class);
++		free(ctxt->schema->map_attr);
++		free(ctxt->schema->entry_class);
++		free(ctxt->schema->entry_attr);
++		free(ctxt->schema->value_attr);
++		free(ctxt->schema);
+ 	}
+ 	if (ctxt->auth_conf)
+ 		free(ctxt->auth_conf);
+@@ -808,19 +776,15 @@ static void free_context(struct lookup_c
+ 	return;
  }
  
--const char *defaults_get_map_obj_class(void)
-+struct ldap_schema *defaults_get_default_schema(void)
+-static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
  {
--	char *moc;
-+	struct ldap_schema *schema;
-+	char *mc, *ma, *ec, *ea, *va;
- 
--	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
--	if (!moc)
--		return strdup(default_map_obj_class);
-+	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
-+	if (!mc)
-+		return NULL;
- 
--	return (const char *) moc;
--}
-+	ma = strdup(DEFAULT_MAP_ATTR);
-+	if (!ma) {
-+		free(mc);
-+		return NULL;
-+	}
- 
--const char *defaults_get_entry_obj_class(void)
--{
--	char *eoc;
-+	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
-+	if (!ec) {
-+		free(mc);
-+		free(ma);
-+		return NULL;
-+	}
- 
--	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
--	if (!eoc)
--		return strdup(default_entry_obj_class);
-+	ea = strdup(DEFAULT_ENTRY_ATTR);
-+	if (!ea) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		return NULL;
-+	}
- 
--	return (const char *) eoc;
--}
-+	va = strdup(DEFAULT_VALUE_ATTR);
-+	if (!va) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		free(ea);
-+		return NULL;
-+	}
- 
--const char *defaults_get_map_attr(void)
--{
--	char *ma;
-+	schema = malloc(sizeof(struct ldap_schema));
-+	if (!schema) {
-+		free(mc);
-+		free(ma);
-+		free(ec);
-+		free(ea);
-+		free(va);
-+		return NULL;
-+	}
+ 	char buf[PARSE_MAX_BUF];
+ 	char *query, *dn;
+ 	LDAPMessage *result, *e;
+-	char *class, *key;
+ 	char *attrs[2];
+ 	int scope;
+ 	int rv, l;
  
--	ma = get_env_string(ENV_NAME_MAP_ATTR);
--	if (!ma)
--		return strdup(default_map_attr);
-+	schema->map_class = mc;
-+	schema->map_attr = ma;
-+	schema->entry_class = ec;
-+	schema->entry_attr = ea;
-+	schema->value_attr = va;
+-	class = ctxt->map_obj_class;
+-	key = ctxt->map_attr;
+-
+ 	attrs[0] = LDAP_NO_ATTRS;
+ 	attrs[1] = NULL;
  
--	return (const char *) ma;
-+	return schema;
+@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, stru
+ 	return 1;
  }
  
--const char *defaults_get_entry_attr(void)
-+struct ldap_schema *defaults_get_schema(void)
- {
--	char *ea;
++static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
++{
 +	struct ldap_schema *schema;
 +	char *mc, *ma, *ec, *ea, *va;
- 
--	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
--	if (!ea)
--		return strdup(default_entry_attr);
-+	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
++
++	mc = strdup(s->map_class);
 +	if (!mc)
 +		return NULL;
- 
--	return (const char *) ea;
--}
-+	ma = get_env_string(ENV_NAME_MAP_ATTR);
++
++	ma = strdup(s->map_attr);
 +	if (!ma) {
 +		free(mc);
 +		return NULL;
 +	}
- 
--const char *defaults_get_value_attr(void)
--{
--	char *va;
-+	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
++
++	ec = strdup(s->entry_class);
 +	if (!ec) {
 +		free(mc);
 +		free(ma);
 +		return NULL;
 +	}
 +
-+	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
++	ea = strdup(s->entry_attr);
 +	if (!ea) {
 +		free(mc);
 +		free(ma);
 +		free(ec);
 +		return NULL;
 +	}
- 
- 	va = get_env_string(ENV_NAME_VALUE_ATTR);
--	if (!va)
--		return strdup(default_value_attr);
++
++	va = strdup(s->value_attr);
 +	if (!va) {
 +		free(mc);
 +		free(ma);
@@ -229,287 +204,287 @@
 +	schema->entry_class = ec;
 +	schema->entry_attr = ea;
 +	schema->value_attr = va;
- 
--	return (const char *) va;
++
 +	return schema;
- }
- 
- unsigned int defaults_get_append_options(void)
-diff --git a/man/auto.master.5.in b/man/auto.master.5.in
-index 69c796e..249c9a7 100644
---- a/man/auto.master.5.in
-+++ b/man/auto.master.5.in
-@@ -191,17 +191,25 @@ The old style
- is also understood. Alternatively, the type can be obtained from the Name Service Switch
- configuration, in which case the map name alone must be given.
- .P
--The default LDAP schema is the NIS schema described in RFC 2307.
--Entries in the nisMap schema are \fBnisObject\fP objects in
-+If no schema is set in the autofs configuration then autofs will check
-+each of the commonly used schema for a valid entry and if one is found
-+it will used for subsequent lookups.
-+.P
-+There are three common schemas in use:
-+.TP
-+.I nisMap
-+Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
- the specified subtree, where the \fBcn\fP attribute is the key
- (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
- contains the information used by the automounter.
--.P
--Entries in the automountMap schema are \fBautomount\fP objects in
--the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
--(depending on local usage) is the key (the wildcard key is "/"), and the
--\fBautomountInformation\fP attribute contains the information used by the
--automounter.
-+.TP
-+.I automountMap
-+The \fBautomountMap\fP schema has two variations that differ in the attribute
-+used for the map key. Entries in the automountMap schema are \fBautomount\fP
-+objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
-+attribute (depending on local usage) is the key (the wildcard key is "/"),
-+and the \fBautomountInformation\fP attribute contains the information used
-+by the automounter. Note that the \fBcn\fP attribute is case insensitive.
- .P
- The object classes and attributes used for accessing automount maps in
- LDAP can be changed by setting entries in the autofs configuration
-@@ -209,61 +217,44 @@ located in
- .nh
- .BR @@autofsconfdir@@/autofs .
- .hy
-+.TP
-+.B NOTE:
-+If a schema is given in the configuration then all the schema configuration
-+values must be set, any partial schema specification will be ignored.
- .P
- The configuration settings available are:
- .TP
--\fBMAP_OBJECT_CLASS\fP
--The map object class. Its Default value is "nisMap". In the
--.nh
--automountMap
--.hy
--schema this corresponds to the class
--.nh
--.BR automountMap .
--.hy
-+.B MAP_OBJECT_CLASS
-+The map object class. In the \fBnisMap\fP schema this corresponds to the class
-+\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
-+\fBautomountMap\fP.
- .TP
- .B ENTRY_OBJECT_CLASS
--The map entry object class. Its default value is \fBnisObject\fP.
--In the automountMap schema this corresponds to the class
--.nh
--.BR automount .
--.hy
-+The map entry object class. In the \fBnisMap\fP schema this corresponds
-+to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
-+corresponds to the class \fBautomount\fP.
- .TP
- .B MAP_ATTRIBUTE
- The attribute used to identify the name of the map to which this
--entry belongs. Its default value is
--.nh
--.BR nisMapName .
--.hy
--In the
--.nh
--automountMap
--.hy
--schema this corresponds to the attributes \fBou\fP or
--.nh
--.BR automountMapName .
--.hy
-+entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
-+\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
-+attribute \fBou\fP or \fBautomountMapName\fP.
- .TP
- .B ENTRY_ATTRIBUTE
--The attribute used to identify a map key. Its default value is
--In the
--.nh
--automountMap
--.hy
--schema this corresponds to the attribute
--.nh
--.BR automountKey .
--.hy
-+The attribute used to identify a map key. In the \fBnisMap\fP schema this
-+corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
-+it corresponds to the attribute \fBautomountKey\fP.
- .TP
- .B VALUE_ATTRIBUTE
--The attribute used to identify the value of the map entry. Its default
--value is
--.nh
--.BR BnisMapEntry .
--.hy
--In the automountMap schema this corresponds to the attribute
--.nh
--.BR automountInformation .
-+The attribute used to identify the value of the map entry. In the \fBnisMap\fP
-+schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
-+schema it corresponds to the attribute \fBautomountInformation\fP.
-+.TP
-+.B NOTE:
-+It is essential that entries use class and attribute in a consistent
-+manner for correct operation of autofs. For example mixing \fBcn\fP and
-+\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
-+work as expected.
- .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
- LDAP authenticated binds, TLS encrypted connections and certification
- may be used by setting appropriate values in the autofs authentication
-diff --git a/man/automount.8 b/man/automount.8
-index fc1846a..da67a5c 100644
---- a/man/automount.8
-+++ b/man/automount.8
-@@ -102,6 +102,8 @@ started they will be recoverd unless they are no longer present in
- the map in which case they need to umounted manually.
- .SH "SEE ALSO"
- .BR autofs (5),
-+.BR autofs (8),
-+.BR auto.master (5),
- .BR mount (8).
- .SH BUGS
- Don't know, I've fixed everything I know about.
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index a412797..d5e666b 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -42,6 +42,13 @@
- 
- int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
- 
-+static struct ldap_schema common_schema[] = {
-+	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
-+	{"automountMap", "ou", "automount", "cn", "automountInformation"},
-+	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
-+};
-+static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++}
 +
- int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
- {
- 	int rv;
-@@ -738,54 +745,15 @@ done:
- 	return 1;
- }
++static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++{
++	struct ldap_schema *schema;
++	unsigned int i;
++
++	if (ctxt->schema)
++		return 0;
++
++	for (i = 0; i < common_schema_count; i++) {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (get_query_dn(ldap, ctxt, class, key)) {
++			schema = alloc_common_schema(&common_schema[i]);
++			if (!schema) {
++				error(LOGOPT_ANY,
++				      MODPREFIX "failed to allocate schema");
++				return 0;
++			}
++			ctxt->schema = schema;
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
+ /*
+  * This initializes a context (persistent non-global data) for queries to
+  * this module.  Return zero if we succeed.
+@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
  
--static int get_default_schema(struct lookup_context *ctxt)
--{
--	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
--	if (!ctxt->map_obj_class)
--		return 0;
--
--	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
--	if (!ctxt->entry_obj_class)
--		goto free_moc;
--
--	ctxt->map_attr = (char *) defaults_get_map_attr();
--	if (!ctxt->map_attr)
--		goto free_eoc;
--
--	ctxt->entry_attr = (char *) defaults_get_entry_attr();
--	if (!ctxt->entry_attr)
--		goto free_ma;
--
--	ctxt->value_attr = (char *) defaults_get_value_attr();
--	if (!ctxt->value_attr)
--		goto free_ea;
--
--	return 1;
+-	/* Get default schema for queries */
+-	if (!get_default_schema(ctxt)) {
+-		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
+-		free_context(ctxt);
+-		return 1;
+-	}
 -
--free_ea:
--	free(ctxt->entry_attr);
--free_ma:
--	free(ctxt->map_attr);
--free_eoc:
--	free(ctxt->entry_obj_class);
--free_moc:
--	free(ctxt->map_obj_class);
+ #ifdef WITH_SASL
+ 	/*
+ 	 * Determine which authentication mechanism to use.  We sanity-
+@@ -954,13 +995,31 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	ret = get_query_dn(ldap, ctxt);
+-	unbind_ldap_connection(ldap, ctxt);
+-	if (!ret) {
+-		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
+-		free_context(ctxt);
+-		return 1;
++	/*
++	 * Get default schema for queries.
++	 * If the schema isn't defined in the configuration then check for
++	 * presence of a map dn in the common schemas.
++	 */
++	ctxt->schema = defaults_get_schema();
++	if (!ctxt->schema) {
++		if (!find_query_dn(ldap, ctxt)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY,
++			      MODPREFIX "failed to find valid query dn");
++			free_context(ctxt);
++			return 1;
++		}
++	} else {
++		const char *class = ctxt->schema->map_class;
++		const char *key = ctxt->schema->map_attr;
++		if (!get_query_dn(ldap, ctxt, class, key)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
++			free_context(ctxt);
++			return 1;
++		}
+ 	}
++	unbind_ldap_connection(ldap, ctxt);
+ 
+ 	/* Open the parser, if we can. */
+ 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+@@ -990,9 +1049,9 @@ int lookup_read_master(struct master *ma
+ 	int scope = LDAP_SCOPE_SUBTREE;
+ 	LDAP *ldap;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1141,9 +1200,9 @@ static int read_one_map(struct autofs_po
+ 
+ 	mc = source->mc;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1438,9 +1497,9 @@ static int lookup_one(struct autofs_poin
+ 		return CHE_FAIL;
+ 	}
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+diff -up autofs-5.0.2/lib/defaults.c.add-ldap-schema-discovery autofs-5.0.2/lib/defaults.c
+--- autofs-5.0.2/lib/defaults.c.add-ldap-schema-discovery	2007-06-18 15:18:08.000000000 +0800
++++ autofs-5.0.2/lib/defaults.c	2007-09-05 12:52:35.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <string.h>
+ 
+ #include "defaults.h"
++#include "lookup_ldap.h"
+ #include "log.h"
+ 
+ #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
+@@ -41,16 +42,8 @@
+ #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ 
+ static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
 -
--	ctxt->map_obj_class = NULL;
--	ctxt->entry_obj_class = NULL;
--	ctxt->map_attr = NULL;
--	ctxt->entry_attr = NULL;
+-static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
 -
--	return 0;
--}
+-static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
+-static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
+-static const char *default_map_attr		= DEFAULT_MAP_ATTR;
+-static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
+-static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
 -
- static void free_context(struct lookup_context *ctxt)
+-static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
++static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
++static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
+ 
+ static char *get_env_string(const char *name)
  {
--	if (ctxt->map_obj_class) {
--		free(ctxt->map_obj_class);
--		free(ctxt->entry_obj_class);
--		free(ctxt->map_attr);
--		free(ctxt->entry_attr);
-+	if (ctxt->schema) {
-+		free(ctxt->schema->map_class);
-+		free(ctxt->schema->map_attr);
-+		free(ctxt->schema->entry_class);
-+		free(ctxt->schema->entry_attr);
-+		free(ctxt->schema->value_attr);
-+		free(ctxt->schema);
- 	}
- 	if (ctxt->auth_conf)
- 		free(ctxt->auth_conf);
-@@ -808,19 +776,15 @@ static void free_context(struct lookup_context *ctxt)
- 	return;
+@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(voi
+ 	return (const char *) server;
  }
  
--static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
-+static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
+-const char *defaults_get_map_obj_class(void)
++struct ldap_schema *defaults_get_default_schema(void)
  {
- 	char buf[PARSE_MAX_BUF];
- 	char *query, *dn;
- 	LDAPMessage *result, *e;
--	char *class, *key;
- 	char *attrs[2];
- 	int scope;
- 	int rv, l;
+-	char *moc;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
  
--	class = ctxt->map_obj_class;
--	key = ctxt->map_attr;
--
- 	attrs[0] = LDAP_NO_ATTRS;
- 	attrs[1] = NULL;
+-	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
+-	if (!moc)
+-		return strdup(default_map_obj_class);
++	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
  
-@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
- 	return 1;
+-	return (const char *) moc;
+-}
++	ma = strdup(DEFAULT_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_entry_obj_class(void)
+-{
+-	char *eoc;
++	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
+ 
+-	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
+-	if (!eoc)
+-		return strdup(default_entry_obj_class);
++	ea = strdup(DEFAULT_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+-	return (const char *) eoc;
+-}
++	va = strdup(DEFAULT_VALUE_ATTR);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
+ 
+-const char *defaults_get_map_attr(void)
+-{
+-	char *ma;
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
+ 
+-	ma = get_env_string(ENV_NAME_MAP_ATTR);
+-	if (!ma)
+-		return strdup(default_map_attr);
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) ma;
++	return schema;
  }
  
-+static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
-+{
+-const char *defaults_get_entry_attr(void)
++struct ldap_schema *defaults_get_schema(void)
+ {
+-	char *ea;
 +	struct ldap_schema *schema;
 +	char *mc, *ma, *ec, *ea, *va;
-+
-+	mc = strdup(s->map_class);
+ 
+-	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
+-	if (!ea)
+-		return strdup(default_entry_attr);
++	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
 +	if (!mc)
 +		return NULL;
-+
-+	ma = strdup(s->map_attr);
+ 
+-	return (const char *) ea;
+-}
++	ma = get_env_string(ENV_NAME_MAP_ATTR);
 +	if (!ma) {
 +		free(mc);
 +		return NULL;
-+	}
-+
-+	ec = strdup(s->entry_class);
++	}
+ 
+-const char *defaults_get_value_attr(void)
+-{
+-	char *va;
++	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
 +	if (!ec) {
 +		free(mc);
 +		free(ma);
 +		return NULL;
 +	}
 +
-+	ea = strdup(s->entry_attr);
++	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
 +	if (!ea) {
 +		free(mc);
 +		free(ma);
 +		free(ec);
 +		return NULL;
 +	}
-+
-+	va = strdup(s->value_attr);
+ 
+ 	va = get_env_string(ENV_NAME_VALUE_ATTR);
+-	if (!va)
+-		return strdup(default_value_attr);
 +	if (!va) {
 +		free(mc);
 +		free(ma);
@@ -533,118 +508,146 @@
 +	schema->entry_class = ec;
 +	schema->entry_attr = ea;
 +	schema->value_attr = va;
-+
-+	return schema;
-+}
-+
-+static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
-+{
-+	struct ldap_schema *schema;
-+	unsigned int i;
-+
-+	if (ctxt->schema)
-+		return 0;
-+
-+	for (i = 0; i < common_schema_count; i++) {
-+		const char *class = common_schema[i].map_class;
-+		const char *key = common_schema[i].map_attr;
-+		if (get_query_dn(ldap, ctxt, class, key)) {
-+			schema = alloc_common_schema(&common_schema[i]);
-+			if (!schema) {
-+				error(LOGOPT_ANY,
-+				      MODPREFIX "failed to allocate schema");
-+				return 0;
-+			}
-+			ctxt->schema = schema;
-+			return 1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
- /*
-  * This initializes a context (persistent non-global data) for queries to
-  * this module.  Return zero if we succeed.
-@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
- 		return 1;
- 	}
- 
--	/* Get default schema for queries */
--	if (!get_default_schema(ctxt)) {
--		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
--		free_context(ctxt);
--		return 1;
--	}
--
- #ifdef WITH_SASL
- 	/*
- 	 * Determine which authentication mechanism to use.  We sanity-
-@@ -954,13 +995,22 @@ int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **co
- 		return 1;
- 	}
- 
--	ret = get_query_dn(ldap, ctxt);
--	unbind_ldap_connection(ldap, ctxt);
--	if (!ret) {
--		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
--		free_context(ctxt);
--		return 1;
-+	/*
-+	 * Get default schema for queries.
-+	 * If the schema isn't defined in the configuration then check for
-+	 * presence of a map dn in the common schemas.
-+	 */
-+	ctxt->schema = defaults_get_schema();
-+	if (!ctxt->schema) {
-+		if (!find_query_dn(ldap, ctxt)) {
-+			unbind_ldap_connection(ldap, ctxt);
-+			error(LOGOPT_ANY,
-+			      MODPREFIX "failed to find valid query dn");
-+			free_context(ctxt);
-+			return 1;
-+		}
- 	}
-+	unbind_ldap_connection(ldap, ctxt);
- 
- 	/* Open the parser, if we can. */
- 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
-@@ -990,9 +1040,9 @@ int lookup_read_master(struct master *master, time_t age, void *context)
- 	int scope = LDAP_SCOPE_SUBTREE;
- 	LDAP *ldap;
- 
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
- 
- 	attrs[0] = entry;
- 	attrs[1] = info;
-@@ -1141,9 +1191,9 @@ static int read_one_map(struct autofs_point *ap,
- 
- 	mc = source->mc;
- 
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
- 
- 	attrs[0] = entry;
- 	attrs[1] = info;
-@@ -1438,9 +1488,9 @@ static int lookup_one(struct autofs_point *ap,
- 		return CHE_FAIL;
- 	}
  
--	class = ctxt->entry_obj_class;
--	entry = ctxt->entry_attr;
--	info = ctxt->value_attr;
-+	class = ctxt->schema->entry_class;
-+	entry = ctxt->schema->entry_attr;
-+	info = ctxt->schema->value_attr;
+-	return (const char *) va;
++	return schema;
+ }
  
- 	attrs[0] = entry;
- 	attrs[1] = info;
+ unsigned int defaults_get_append_options(void)
+diff -up autofs-5.0.2/man/auto.master.5.in.add-ldap-schema-discovery autofs-5.0.2/man/auto.master.5.in
+--- autofs-5.0.2/man/auto.master.5.in.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/man/auto.master.5.in	2007-09-05 12:52:35.000000000 +0800
+@@ -191,17 +191,25 @@ The old style
+ is also understood. Alternatively, the type can be obtained from the Name Service Switch
+ configuration, in which case the map name alone must be given.
+ .P
+-The default LDAP schema is the NIS schema described in RFC 2307.
+-Entries in the nisMap schema are \fBnisObject\fP objects in
++If no schema is set in the autofs configuration then autofs will check
++each of the commonly used schema for a valid entry and if one is found
++it will used for subsequent lookups.
++.P
++There are three common schemas in use:
++.TP
++.I nisMap
++Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
+ the specified subtree, where the \fBcn\fP attribute is the key
+ (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
+ contains the information used by the automounter.
+-.P
+-Entries in the automountMap schema are \fBautomount\fP objects in
+-the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
+-(depending on local usage) is the key (the wildcard key is "/"), and the
+-\fBautomountInformation\fP attribute contains the information used by the
+-automounter.
++.TP
++.I automountMap
++The \fBautomountMap\fP schema has two variations that differ in the attribute
++used for the map key. Entries in the automountMap schema are \fBautomount\fP
++objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
++attribute (depending on local usage) is the key (the wildcard key is "/"),
++and the \fBautomountInformation\fP attribute contains the information used
++by the automounter. Note that the \fBcn\fP attribute is case insensitive.
+ .P
+ The object classes and attributes used for accessing automount maps in
+ LDAP can be changed by setting entries in the autofs configuration
+@@ -209,61 +217,44 @@ located in
+ .nh
+ .BR @@autofsconfdir@@/autofs .
+ .hy
++.TP
++.B NOTE:
++If a schema is given in the configuration then all the schema configuration
++values must be set, any partial schema specification will be ignored.
+ .P
+ The configuration settings available are:
+ .TP
+-\fBMAP_OBJECT_CLASS\fP
+-The map object class. Its Default value is "nisMap". In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the class
+-.nh
+-.BR automountMap .
+-.hy
++.B MAP_OBJECT_CLASS
++The map object class. In the \fBnisMap\fP schema this corresponds to the class
++\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
++\fBautomountMap\fP.
+ .TP
+ .B ENTRY_OBJECT_CLASS
+-The map entry object class. Its default value is \fBnisObject\fP.
+-In the automountMap schema this corresponds to the class
+-.nh
+-.BR automount .
+-.hy
++The map entry object class. In the \fBnisMap\fP schema this corresponds
++to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
++corresponds to the class \fBautomount\fP.
+ .TP
+ .B MAP_ATTRIBUTE
+ The attribute used to identify the name of the map to which this
+-entry belongs. Its default value is
+-.nh
+-.BR nisMapName .
+-.hy
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attributes \fBou\fP or
+-.nh
+-.BR automountMapName .
+-.hy
++entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
++\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
++attribute \fBou\fP or \fBautomountMapName\fP.
+ .TP
+ .B ENTRY_ATTRIBUTE
+-The attribute used to identify a map key. Its default value is
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attribute
+-.nh
+-.BR automountKey .
+-.hy
++The attribute used to identify a map key. In the \fBnisMap\fP schema this
++corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
++it corresponds to the attribute \fBautomountKey\fP.
+ .TP
+ .B VALUE_ATTRIBUTE
+-The attribute used to identify the value of the map entry. Its default
+-value is
+-.nh
+-.BR BnisMapEntry .
+-.hy
+-In the automountMap schema this corresponds to the attribute
+-.nh
+-.BR automountInformation .
++The attribute used to identify the value of the map entry. In the \fBnisMap\fP
++schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
++schema it corresponds to the attribute \fBautomountInformation\fP.
++.TP
++.B NOTE:
++It is essential that entries use class and attribute in a consistent
++manner for correct operation of autofs. For example mixing \fBcn\fP and
++\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
++work as expected.
+ .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
+ LDAP authenticated binds, TLS encrypted connections and certification
+ may be used by setting appropriate values in the autofs authentication
+diff -up autofs-5.0.2/man/automount.8.add-ldap-schema-discovery autofs-5.0.2/man/automount.8
+--- autofs-5.0.2/man/automount.8.add-ldap-schema-discovery	2007-09-05 12:52:35.000000000 +0800
++++ autofs-5.0.2/man/automount.8	2007-09-05 12:52:35.000000000 +0800
+@@ -102,6 +102,8 @@ started they will be recoverd unless the
+ the map in which case they need to umounted manually.
+ .SH "SEE ALSO"
+ .BR autofs (5),
++.BR autofs (8),
++.BR auto.master (5),
+ .BR mount (8).
+ .SH BUGS
+ Don't know, I've fixed everything I know about.


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- autofs.spec	28 Aug 2007 06:14:02 -0000	1.221
+++ autofs.spec	5 Sep 2007 05:11:13 -0000	1.222
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 14
+Release: 15
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
+- fix LDAP schema discovery.
+
 * Tue Aug 28 2007 Ian Kent <ikent at redhat.com> - 5.0.2-14
 - update patch to prevent failure on empty master map.
 - if there's no "automount" entry in nsswitch.conf use "files" source.



From fedora-extras-commits at redhat.com  Wed Sep  5 05:33:47 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:33:47 -0400
Subject: rpms/autofs/F-7 autofs-5.0.1-add-ldap-schema-discovery.patch, 1.2, 
	1.3 autofs-5.0.1-add-ldaps-support.patch, NONE, 1.1 autofs.spec,
	1.217, 1.218
Message-ID: <200709050533.l855XlLR025722@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25676

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-add-ldap-schema-discovery.patch 
	autofs-5.0.1-add-ldaps-support.patch 
Log Message:
* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.1-28
- add ldaps support (required by schema discovery).
- add back LDAP schema discovery if no schema is configured.


autofs-5.0.1-add-ldap-schema-discovery.patch:

Index: autofs-5.0.1-add-ldap-schema-discovery.patch
===================================================================
RCS file: autofs-5.0.1-add-ldap-schema-discovery.patch
diff -N autofs-5.0.1-add-ldap-schema-discovery.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:33:14 -0000	1.3
@@ -0,0 +1,656 @@
+diff -up autofs-5.0.1/include/lookup_ldap.h.add-ldap-schema-discovery autofs-5.0.1/include/lookup_ldap.h
+--- autofs-5.0.1/include/lookup_ldap.h.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/include/lookup_ldap.h	2007-09-05 13:27:06.000000000 +0800
+@@ -7,8 +7,17 @@
+ #include <openssl/err.h>
+ #include <sasl/sasl.h>
+ #include <libxml/tree.h>
++#include <krb5.h>
+ #endif
+ 
++struct ldap_schema {
++	char *map_class;
++	char *map_attr;
++	char *entry_class;
++	char *entry_attr;
++	char *value_attr;
++};
++
+ struct lookup_context {
+ 	char *mapname;
+ 
+@@ -21,11 +30,7 @@ struct lookup_context {
+ 	int version;
+ 
+ 	/* LDAP lookup configuration */
+-	char *map_obj_class;
+-	char *entry_obj_class;
+-	char *map_attr;
+-	char *entry_attr;
+-	char *value_attr;
++	struct ldap_schema *schema;
+ 
+ 	/* TLS and SASL authentication information */
+ 	char        *auth_conf;
+diff -up autofs-5.0.1/include/defaults.h.add-ldap-schema-discovery autofs-5.0.1/include/defaults.h
+--- autofs-5.0.1/include/defaults.h.add-ldap-schema-discovery	2007-09-05 13:27:05.000000000 +0800
++++ autofs-5.0.1/include/defaults.h	2007-09-05 13:27:06.000000000 +0800
+@@ -43,11 +43,8 @@ unsigned int defaults_get_timeout(void);
+ unsigned int defaults_get_browse_mode(void);
+ unsigned int defaults_get_logging(void);
+ const char *defaults_get_ldap_server(void);
+-const char *defaults_get_map_obj_class(void);
+-const char *defaults_get_entry_obj_class(void);
+-const char *defaults_get_map_attr(void);
+-const char *defaults_get_entry_attr(void);
+-const char *defaults_get_value_attr(void);
++struct ldap_schema *defaults_get_default_schema(void);
++struct ldap_schema *defaults_get_schema(void);
+ unsigned int defaults_get_append_options(void);
+ const char *defaults_get_auth_conf_file(void);
+ 
+diff -up autofs-5.0.1/modules/lookup_ldap.c.add-ldap-schema-discovery autofs-5.0.1/modules/lookup_ldap.c
+--- autofs-5.0.1/modules/lookup_ldap.c.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/modules/lookup_ldap.c	2007-09-05 13:27:39.000000000 +0800
+@@ -42,6 +42,13 @@
+ 
+ int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
+ 
++static struct ldap_schema common_schema[] = {
++	{"nisMap", "nisMapName", "nisObject", "cn", "nisMapEntry"},
++	{"automountMap", "ou", "automount", "cn", "automountInformation"},
++	{"automountMap", "automountMapName", "automount", "automountKey", "automountInformation"},
++};
++static unsigned int common_schema_count = sizeof(common_schema)/sizeof(struct ldap_schema);
++
+ int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
+ {
+ 	int rv;
+@@ -738,54 +745,15 @@ done:
+ 	return 1;
+ }
+ 
+-static int get_default_schema(struct lookup_context *ctxt)
+-{
+-	ctxt->map_obj_class = (char *) defaults_get_map_obj_class();
+-	if (!ctxt->map_obj_class)
+-		return 0;
+-
+-	ctxt->entry_obj_class = (char *) defaults_get_entry_obj_class();
+-	if (!ctxt->entry_obj_class)
+-		goto free_moc;
+-
+-	ctxt->map_attr = (char *) defaults_get_map_attr();
+-	if (!ctxt->map_attr)
+-		goto free_eoc;
+-
+-	ctxt->entry_attr = (char *) defaults_get_entry_attr();
+-	if (!ctxt->entry_attr)
+-		goto free_ma;
+-
+-	ctxt->value_attr = (char *) defaults_get_value_attr();
+-	if (!ctxt->value_attr)
+-		goto free_ea;
+-
+-	return 1;
+-
+-free_ea:
+-	free(ctxt->entry_attr);
+-free_ma:
+-	free(ctxt->map_attr);
+-free_eoc:
+-	free(ctxt->entry_obj_class);
+-free_moc:
+-	free(ctxt->map_obj_class);
+-
+-	ctxt->map_obj_class = NULL;
+-	ctxt->entry_obj_class = NULL;
+-	ctxt->map_attr = NULL;
+-	ctxt->entry_attr = NULL;
+-
+-	return 0;
+-}
+-
+ static void free_context(struct lookup_context *ctxt)
+ {
+-	if (ctxt->map_obj_class) {
+-		free(ctxt->map_obj_class);
+-		free(ctxt->entry_obj_class);
+-		free(ctxt->map_attr);
+-		free(ctxt->entry_attr);
++	if (ctxt->schema) {
++		free(ctxt->schema->map_class);
++		free(ctxt->schema->map_attr);
++		free(ctxt->schema->entry_class);
++		free(ctxt->schema->entry_attr);
++		free(ctxt->schema->value_attr);
++		free(ctxt->schema);
+ 	}
+ 	if (ctxt->auth_conf)
+ 		free(ctxt->auth_conf);
+@@ -808,19 +776,15 @@ static void free_context(struct lookup_c
+ 	return;
+ }
+ 
+-static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++static int get_query_dn(LDAP *ldap, struct lookup_context *ctxt, const char *class, const char *key)
+ {
+ 	char buf[PARSE_MAX_BUF];
+ 	char *query, *dn;
+ 	LDAPMessage *result, *e;
+-	char *class, *key;
+ 	char *attrs[2];
+ 	int scope;
+ 	int rv, l;
+ 
+-	class = ctxt->map_obj_class;
+-	key = ctxt->map_attr;
+-
+ 	attrs[0] = LDAP_NO_ATTRS;
+ 	attrs[1] = NULL;
+ 
+@@ -890,6 +854,90 @@ static int get_query_dn(LDAP *ldap, stru
+ 	return 1;
+ }
+ 
++static struct ldap_schema *alloc_common_schema(struct ldap_schema *s)
++{
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
++
++	mc = strdup(s->map_class);
++	if (!mc)
++		return NULL;
++
++	ma = strdup(s->map_attr);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
++
++	ec = strdup(s->entry_class);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
++
++	ea = strdup(s->entry_attr);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
++
++	va = strdup(s->value_attr);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
++
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
++
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
++
++	return schema;
++}
++
++static int find_query_dn(LDAP *ldap, struct lookup_context *ctxt)
++{
++	struct ldap_schema *schema;
++	unsigned int i;
++
++	if (ctxt->schema)
++		return 0;
++
++	for (i = 0; i < common_schema_count; i++) {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (get_query_dn(ldap, ctxt, class, key)) {
++			schema = alloc_common_schema(&common_schema[i]);
++			if (!schema) {
++				error(LOGOPT_ANY,
++				      MODPREFIX "failed to allocate schema");
++				return 0;
++			}
++			ctxt->schema = schema;
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
+ /*
+  * This initializes a context (persistent non-global data) for queries to
+  * this module.  Return zero if we succeed.
+@@ -926,13 +974,6 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	/* Get default schema for queries */
+-	if (!get_default_schema(ctxt)) {
+-		error(LOGOPT_ANY, MODPREFIX "cannot set default schema");
+-		free_context(ctxt);
+-		return 1;
+-	}
+-
+ #ifdef WITH_SASL
+ 	/*
+ 	 * Determine which authentication mechanism to use.  We sanity-
+@@ -954,13 +995,31 @@ int lookup_init(const char *mapfmt, int 
+ 		return 1;
+ 	}
+ 
+-	ret = get_query_dn(ldap, ctxt);
+-	unbind_ldap_connection(ldap, ctxt);
+-	if (!ret) {
+-		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
+-		free_context(ctxt);
+-		return 1;
++	/*
++	 * Get default schema for queries.
++	 * If the schema isn't defined in the configuration then check for
++	 * presence of a map dn in the common schemas.
++	 */
++	ctxt->schema = defaults_get_schema();
++	if (!ctxt->schema) {
++		if (!find_query_dn(ldap, ctxt)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY,
++			      MODPREFIX "failed to find valid query dn");
++			free_context(ctxt);
++			return 1;
++		}
++	} else {
++		const char *class = common_schema[i].map_class;
++		const char *key = common_schema[i].map_attr;
++		if (!get_query_dn(ldap, ctxt, class, key)) {
++			unbind_ldap_connection(ldap, ctxt);
++			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
++			free_context(ctxt);
++			return 1;
++		}
+ 	}
++	unbind_ldap_connection(ldap, ctxt);
+ 
+ 	/* Open the parser, if we can. */
+ 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
+@@ -990,9 +1049,9 @@ int lookup_read_master(struct master *ma
+ 	int scope = LDAP_SCOPE_SUBTREE;
+ 	LDAP *ldap;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1141,9 +1200,9 @@ static int read_one_map(struct autofs_po
+ 
+ 	mc = source->mc;
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+@@ -1438,9 +1497,9 @@ static int lookup_one(struct autofs_poin
+ 		return CHE_FAIL;
+ 	}
+ 
+-	class = ctxt->entry_obj_class;
+-	entry = ctxt->entry_attr;
+-	info = ctxt->value_attr;
++	class = ctxt->schema->entry_class;
++	entry = ctxt->schema->entry_attr;
++	info = ctxt->schema->value_attr;
+ 
+ 	attrs[0] = entry;
+ 	attrs[1] = info;
+diff -up autofs-5.0.1/lib/defaults.c.add-ldap-schema-discovery autofs-5.0.1/lib/defaults.c
+--- autofs-5.0.1/lib/defaults.c.add-ldap-schema-discovery	2007-09-05 13:27:05.000000000 +0800
++++ autofs-5.0.1/lib/defaults.c	2007-09-05 13:27:06.000000000 +0800
+@@ -18,6 +18,7 @@
+ #include <string.h>
+ 
+ #include "defaults.h"
++#include "lookup_ldap.h"
+ #include "log.h"
+ 
+ #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
+@@ -41,16 +42,8 @@
+ #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
+ 
+ static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
+-
+-static const char *default_ldap_server		= DEFAULT_LDAP_SERVER;
+-
+-static const char *default_map_obj_class	= DEFAULT_MAP_OBJ_CLASS;
+-static const char *default_entry_obj_class	= DEFAULT_ENTRY_OBJ_CLASS;
+-static const char *default_map_attr		= DEFAULT_MAP_ATTR;
+-static const char *default_entry_attr		= DEFAULT_ENTRY_ATTR;
+-static const char *default_value_attr		= DEFAULT_VALUE_ATTR;
+-
+-static const char *default_auth_conf_file = DEFAULT_AUTH_CONF_FILE;
++static const char *default_ldap_server	   = DEFAULT_LDAP_SERVER;
++static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
+ 
+ static char *get_env_string(const char *name)
+ {
+@@ -285,59 +278,120 @@ const char *defaults_get_ldap_server(voi
+ 	return (const char *) server;
+ }
+ 
+-const char *defaults_get_map_obj_class(void)
++struct ldap_schema *defaults_get_default_schema(void)
+ {
+-	char *moc;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
+ 
+-	moc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
+-	if (!moc)
+-		return strdup(default_map_obj_class);
++	mc = strdup(DEFAULT_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
+ 
+-	return (const char *) moc;
+-}
++	ma = strdup(DEFAULT_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_entry_obj_class(void)
+-{
+-	char *eoc;
++	ec = strdup(DEFAULT_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
+ 
+-	eoc = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
+-	if (!eoc)
+-		return strdup(default_entry_obj_class);
++	ea = strdup(DEFAULT_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+-	return (const char *) eoc;
+-}
++	va = strdup(DEFAULT_VALUE_ATTR);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
+ 
+-const char *defaults_get_map_attr(void)
+-{
+-	char *ma;
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
+ 
+-	ma = get_env_string(ENV_NAME_MAP_ATTR);
+-	if (!ma)
+-		return strdup(default_map_attr);
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) ma;
++	return schema;
+ }
+ 
+-const char *defaults_get_entry_attr(void)
++struct ldap_schema *defaults_get_schema(void)
+ {
+-	char *ea;
++	struct ldap_schema *schema;
++	char *mc, *ma, *ec, *ea, *va;
+ 
+-	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
+-	if (!ea)
+-		return strdup(default_entry_attr);
++	mc = get_env_string(ENV_NAME_MAP_OBJ_CLASS);
++	if (!mc)
++		return NULL;
+ 
+-	return (const char *) ea;
+-}
++	ma = get_env_string(ENV_NAME_MAP_ATTR);
++	if (!ma) {
++		free(mc);
++		return NULL;
++	}
+ 
+-const char *defaults_get_value_attr(void)
+-{
+-	char *va;
++	ec = get_env_string(ENV_NAME_ENTRY_OBJ_CLASS);
++	if (!ec) {
++		free(mc);
++		free(ma);
++		return NULL;
++	}
++
++	ea = get_env_string(ENV_NAME_ENTRY_ATTR);
++	if (!ea) {
++		free(mc);
++		free(ma);
++		free(ec);
++		return NULL;
++	}
+ 
+ 	va = get_env_string(ENV_NAME_VALUE_ATTR);
+-	if (!va)
+-		return strdup(default_value_attr);
++	if (!va) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		return NULL;
++	}
++
++	schema = malloc(sizeof(struct ldap_schema));
++	if (!schema) {
++		free(mc);
++		free(ma);
++		free(ec);
++		free(ea);
++		free(va);
++		return NULL;
++	}
++
++	schema->map_class = mc;
++	schema->map_attr = ma;
++	schema->entry_class = ec;
++	schema->entry_attr = ea;
++	schema->value_attr = va;
+ 
+-	return (const char *) va;
++	return schema;
+ }
+ 
+ unsigned int defaults_get_append_options(void)
+diff -up autofs-5.0.1/man/auto.master.5.in.add-ldap-schema-discovery autofs-5.0.1/man/auto.master.5.in
+--- autofs-5.0.1/man/auto.master.5.in.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/man/auto.master.5.in	2007-09-05 13:27:06.000000000 +0800
+@@ -188,17 +188,25 @@ The old style
+ is also understood. Alternatively, the type can be obtained from the Name Service Switch
+ configuration, in which case the map name alone must be given.
+ .P
+-The default LDAP schema is the NIS schema described in RFC 2307.
+-Entries in the nisMap schema are \fBnisObject\fP objects in
++If no schema is set in the autofs configuration then autofs will check
++each of the commonly used schema for a valid entry and if one is found
++it will used for subsequent lookups.
++.P
++There are three common schemas in use:
++.TP
++.I nisMap
++Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
+ the specified subtree, where the \fBcn\fP attribute is the key
+ (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
+ contains the information used by the automounter.
+-.P
+-Entries in the automountMap schema are \fBautomount\fP objects in
+-the specified subtree, where the \fBcn\fP or \fBautomountKey\fP attribute
+-(depending on local usage) is the key (the wildcard key is "/"), and the
+-\fBautomountInformation\fP attribute contains the information used by the
+-automounter.
++.TP
++.I automountMap
++The \fBautomountMap\fP schema has two variations that differ in the attribute
++used for the map key. Entries in the automountMap schema are \fBautomount\fP
++objects in the specified subtree, where the \fBcn\fP or \fBautomountKey\fP
++attribute (depending on local usage) is the key (the wildcard key is "/"),
++and the \fBautomountInformation\fP attribute contains the information used
++by the automounter. Note that the \fBcn\fP attribute is case insensitive.
+ .P
+ The object classes and attributes used for accessing automount maps in
+ LDAP can be changed by setting entries in the autofs configuration
+@@ -206,61 +214,44 @@ located in
+ .nh
+ .BR @@autofsconfdir@@/autofs .
+ .hy
++.TP
++.B NOTE:
++If a schema is given in the configuration then all the schema configuration
++values must be set, any partial schema specification will be ignored.
+ .P
+ The configuration settings available are:
+ .TP
+-\fBMAP_OBJECT_CLASS\fP
+-The map object class. Its Default value is "nisMap". In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the class
+-.nh
+-.BR automountMap .
+-.hy
++.B MAP_OBJECT_CLASS
++The map object class. In the \fBnisMap\fP schema this corresponds to the class
++\fBnisMap\fP and in the \fBautomountMap\fP schema it corresponds to the class
++\fBautomountMap\fP.
+ .TP
+ .B ENTRY_OBJECT_CLASS
+-The map entry object class. Its default value is \fBnisObject\fP.
+-In the automountMap schema this corresponds to the class
+-.nh
+-.BR automount .
+-.hy
++The map entry object class. In the \fBnisMap\fP schema this corresponds
++to the class \fBnisObject\fP and in the \fBautomountMap\fP schema it
++corresponds to the class \fBautomount\fP.
+ .TP
+ .B MAP_ATTRIBUTE
+ The attribute used to identify the name of the map to which this
+-entry belongs. Its default value is
+-.nh
+-.BR nisMapName .
+-.hy
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attributes \fBou\fP or
+-.nh
+-.BR automountMapName .
+-.hy
++entry belongs.  In the \fBnisMap\fP schema this corresponds to the attribute
++\fBnisMapName\fP and in the \fBautomountMap\fP schema it corresponds to the
++attribute \fBou\fP or \fBautomountMapName\fP.
+ .TP
+ .B ENTRY_ATTRIBUTE
+-The attribute used to identify a map key. Its default value is
+-In the
+-.nh
+-automountMap
+-.hy
+-schema this corresponds to the attribute
+-.nh
+-.BR automountKey .
+-.hy
++The attribute used to identify a map key. In the \fBnisMap\fP schema this
++corresponds to the attribute \fBcn\fP and in the \fBautomountMap\fP schema
++it corresponds to the attribute \fBautomountKey\fP.
+ .TP
+ .B VALUE_ATTRIBUTE
+-The attribute used to identify the value of the map entry. Its default
+-value is
+-.nh
+-.BR BnisMapEntry .
+-.hy
+-In the automountMap schema this corresponds to the attribute
+-.nh
+-.BR automountInformation .
++The attribute used to identify the value of the map entry. In the \fBnisMap\fP
++schema this corresponds to the attribute \fBnisMapEntry\fP and in the \fBautomountMap\fP
++schema it corresponds to the attribute \fBautomountInformation\fP.
++.TP
++.B NOTE:
++It is essential that entries use class and attribute in a consistent
++manner for correct operation of autofs. For example mixing \fBcn\fP and
++\fBautomountKey\fP attributes in \fBautomount\fP schema map entries won't
++work as expected.
+ .SH LDAP AUTHENTICATION, ENCRYPTED AND CERTIFIED CONNECTIONS
+ LDAP authenticated binds, TLS encrypted connections and certification
+ may be used by setting appropriate values in the autofs authentication
+diff -up autofs-5.0.1/man/automount.8.in.add-ldap-schema-discovery autofs-5.0.1/man/automount.8.in
+--- autofs-5.0.1/man/automount.8.in.add-ldap-schema-discovery	2007-09-05 13:27:06.000000000 +0800
++++ autofs-5.0.1/man/automount.8.in	2007-09-05 13:27:06.000000000 +0800
+@@ -104,6 +104,8 @@ started they will be recoverd unless the
+ the map in which case they need to umounted manually.
+ .SH "SEE ALSO"
+ .BR autofs (5),
++.BR autofs (8),
++.BR auto.master (5),
+ .BR mount (8).
+ .SH BUGS
+ Don't know, I've fixed everything I know about.

autofs-5.0.1-add-ldaps-support.patch:

--- NEW FILE autofs-5.0.1-add-ldaps-support.patch ---
--- autofs-5.0.1/include/lookup_ldap.h.add-ldaps-support	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/include/lookup_ldap.h	2007-06-20 11:41:02.000000000 +0800
@@ -13,6 +13,7 @@ struct lookup_context {
 	char *mapname;
 
 	char *server;
+	int port;
 	char *base;
 	char *qdn;
 
--- autofs-5.0.1/modules/Makefile.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/modules/Makefile	2007-06-20 11:41:02.000000000 +0800
@@ -64,6 +64,7 @@ install: all
 	-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
 	ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
 	ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
+	ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
 	ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so
 ifeq ($(EXT2FS), 1)
  ifeq ($(EXT3FS), 1)
--- autofs-5.0.1/modules/lookup_ldap.c.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/modules/lookup_ldap.c	2007-06-20 11:41:52.000000000 +0800
@@ -100,14 +100,8 @@ LDAP *init_ldap_connection(struct lookup
 	ctxt->version = 3;
 
 	/* Initialize the LDAP context. */
-	/* LDAP_PORT should not be hard-coded, here.  If we are going to
-	 * parse ldap strings ourselves, then we can put the port specified
-	 * in the host:port format here.  Otherwise, we can just pass the
-	 * host:port string to the ldap_init call and let the library handle
-	 * it.   -JM
-	 */
-	ldap = ldap_init(ctxt->server, LDAP_PORT);
-	if (!ldap) {
+	rv = ldap_initialize(&ldap, ctxt->server);
+	if (rv != LDAP_OPT_SUCCESS) {
 		crit(LOGOPT_ANY,
 		     MODPREFIX "couldn't initialize LDAP connection to %s",
 		     ctxt->server ? ctxt->server : "default server");
@@ -119,8 +113,8 @@ LDAP *init_ldap_connection(struct lookup
 	if (rv != LDAP_OPT_SUCCESS) {
 		/* fall back to LDAPv2 */
 		ldap_unbind_ext(ldap, NULL, NULL);
-		ldap = ldap_init(ctxt->server, LDAP_PORT);
-		if (!ldap) {
+		rv = ldap_initialize(&ldap, ctxt->server);
+		if (rv != LDAP_OPT_SUCCESS) {
 			crit(LOGOPT_ANY, MODPREFIX "couldn't initialize LDAP");
 			return NULL;
 		}
@@ -348,7 +342,7 @@ int parse_ldap_config(struct lookup_cont
 		goto out;
 	}
 
-	if (!usetls)
+	if (!usetls || ctxt->port == LDAPS_PORT)
 		use_tls = LDAP_TLS_DONT_USE;
 	else {
 		if (!strcasecmp(usetls, "yes"))
@@ -551,16 +545,31 @@ int auth_init(struct lookup_context *ctx
  */
 static int parse_server_string(const char *url, struct lookup_context *ctxt)
 {
-	char buf[MAX_ERR_BUF], *tmp = NULL;
-	const char *ptr;
-	int l;
+	char buf[MAX_ERR_BUF], *tmp = NULL, proto[9];
+	const char *ptr, *name;
+	int l, al_len;
 
+	memset(proto, 0, 9);
 	ptr = url;
 
 	debug(LOGOPT_NONE,
 	      MODPREFIX
 	      "Attempting to parse LDAP information from string \"%s\".", ptr);
 
+	ctxt->port = LDAP_PORT;
+	if (!strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6)) {
+		if (*(ptr + 4) == 's') {
+			ctxt->port = LDAPS_PORT;
+			memcpy(proto, ptr, 6);
+			strcat(proto, "//");
+			ptr += 6;
+		} else {
+			memcpy(proto, ptr, 5);
+			strcat(proto, "//");
+			ptr += 5;
+		}
+	}
+
 	if (!strncmp(ptr, "//", 2)) {
 		const char *s = ptr + 2;
 		const char *q = NULL;
@@ -568,7 +577,13 @@ static int parse_server_string(const cha
 		/* Isolate the server(s). */
 		if ((q = strchr(s, '/'))) {
 			l = q - s;
-			tmp = malloc(l + 1);
+			if (*proto) {
+				al_len = l + strlen(proto) + 2;
+				tmp = malloc(al_len);
+			} else {
+				al_len = l + 1;
+				tmp = malloc(al_len);
+			}
 			if (!tmp) {
 				char *estr;
 				estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -576,8 +591,13 @@ static int parse_server_string(const cha
 				return 0;
 			}
 			ctxt->server = tmp;
-			memset(ctxt->server, 0, l + 1);
-			memcpy(ctxt->server, s, l);
+			memset(ctxt->server, 0, al_len);
+			if (*proto) {
+				strcpy(ctxt->server, proto);
+				memcpy(ctxt->server + strlen(proto), s, l);
+				strcat(ctxt->server, "/");
+			} else
+				memcpy(ctxt->server, s, l);
 			ptr = q + 1;
 		} else {
 			crit(LOGOPT_ANY,
@@ -600,7 +620,7 @@ static int parse_server_string(const cha
 	} else if (strchr(ptr, ':') != NULL) {
 		char *q = NULL;
 
-		/* Isolate the server(s). Include the port spec */
+		/* Isolate the server. Include the port spec */
 		q = strchr(ptr, ':');
 		if (isdigit(*q))
 			while (isdigit(*q))
@@ -613,8 +633,14 @@ static int parse_server_string(const cha
 		}
 
 		l = q - ptr;
+		if (*proto) {
+			al_len = l + strlen(proto) + 2;
+			tmp = malloc(al_len);
+		} else {
+			al_len = l + 1;
+			tmp = malloc(al_len);
+		}
 		/* Isolate the server's name. */
-		tmp = malloc(l + 1);
 		if (!tmp) {
 			char *estr;
 			estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -622,8 +648,13 @@ static int parse_server_string(const cha
 			return 0;
 		}
 		ctxt->server = tmp;
-		memset(ctxt->server, 0, l + 1);
-		memcpy(ctxt->server, ptr, l);
+		memset(ctxt->server, 0, al_len);
+		if (*proto) {
+			strcpy(ctxt->server, proto);
+			memcpy(ctxt->server + strlen(proto), ptr, l);
+			strcat(ctxt->server, "/");
+		} else
+			memcpy(ctxt->server, ptr, l);
 		ptr += l + 1;
 	}
 
@@ -639,29 +670,41 @@ static int parse_server_string(const cha
 	 * the later LDAP calls will fail.
 	 */
 	l = strlen(ptr);
-	if (strchr(ptr, '=')) {
+	if ((name = strchr(ptr, '='))) {
 		char *base;
 
+		/*
+		 * An '=' with no ',' means a mapname has been given so just
+		 * grab it alone to keep it independent of schema otherwize
+		 * we expect a full dn.
+		 */
 		if (!strchr(ptr, ',')) {
-			debug(LOGOPT_NONE,
-			      MODPREFIX "LDAP dn not fuly specified");
-			if (ctxt->server)
-				free(ctxt->server);
-			return 0;
-		}
-
-		base = malloc(l + 1);
-		if (!base) {
-			char *estr;
-			estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
-			if (ctxt->server)
-				free(ctxt->server);
-			return 0;
+			char *map = strdup(name + 1);
+			if (map)
+				ctxt->mapname = map;
+			else {
+				char *estr;
+				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+				if (ctxt->server)
+					free(ctxt->server);
+				return 0;
+			}
+			
+		} else {
+			base = malloc(l + 1);
+			if (!base) {
+				char *estr;
+				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				crit(LOGOPT_ANY, MODPREFIX "malloc: %s", estr);
+				if (ctxt->server)
+					free(ctxt->server);
+				return 0;
+			}
+			ctxt->base = base;
+			memset(ctxt->base, 0, l + 1);
+			memcpy(ctxt->base, ptr, l);
 		}
-		ctxt->base = base;
-		memset(ctxt->base, 0, l + 1);
-		memcpy(ctxt->base, ptr, l);
 	} else {
 		char *map = malloc(l + 1);
 		if (!map) {
@@ -676,6 +719,14 @@ static int parse_server_string(const cha
 		memset(ctxt->mapname, 0, l + 1);
 		memcpy(map, ptr, l);
 	}
+
+	if (!ctxt->server && *proto) {
+		if (!strncmp(proto, "ldaps", 5)) {
+			warn(LOGOPT_ANY, MODPREFIX
+			     "server must be given to force ldaps, connection "
+			     "will use LDAP client configured protocol");
+		}
+	}
 done:
 	if (ctxt->mapname)
 		debug(LOGOPT_NONE, MODPREFIX "mapname %s", ctxt->mapname);
--- autofs-5.0.1/daemon/lookup.c.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/daemon/lookup.c	2007-06-20 11:41:02.000000000 +0800
@@ -169,20 +169,30 @@ int lookup_nss_read_master(struct master
 			char source[10];
 
 			memset(source, 0, 10);
-			/* TODO: ldaps is not yet handled by ldap module */
-			/* TODO: must tighten up this test */
-			if (!strncmp(name, "file", 4) ||
-			    !strncmp(name, "yp", 2) ||
-			    !strncmp(name, "nis", 3) ||
-			    !strncmp(name, "nisplus", 7) ||
-			    !strncmp(name, "ldap", 4)) {
+			if (!strncmp(name, "file:", 5) ||
+			    !strncmp(name, "yp:", 3) ||
+			    !strncmp(name, "nis:", 4) ||
+			    !strncmp(name, "nisplus:", 8) ||
+			    !strncmp(name, "ldap:", 5) ||
+			    !strncmp(name, "ldaps:", 6)) {
 				strncpy(source, name, tmp - name);
 
-				master->name = tmp + 1;
-
-				debug(LOGOPT_NONE,
-				      "reading master %s %s",
-				      source, master->name);
+				/*
+				 * If it's an ldap map leave the source in the
+				 * name so the lookup module can work out if
+				 * ldaps has been requested.
+				 */
+				if (strncmp(name, "ldap", 4)) {
+					master->name = tmp + 1;
+					debug(LOGOPT_NONE,
+					      "reading master %s %s",
+					      source, master->name);
+				} else {
+					master->name = name;
+					debug(LOGOPT_NONE,
+					      "reading master %s %s",
+					      source, tmp + 1);
+				}
 
 				result = do_read_master(master, source, age);
 				master->name = name;
--- autofs-5.0.1/lib/master_parse.y.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/lib/master_parse.y	2007-06-20 11:41:02.000000000 +0800
@@ -290,6 +290,19 @@ map:	PATH
 			local_free_vars();
 			YYABORT;
 		}
+		/* Add back the type for lookup_ldap.c to handle ldaps */
+		if (*local_argv[0]) {
+			tmp = malloc(strlen(type) + strlen(local_argv[0]) + 2);
+			if (!tmp) {
+				local_free_vars();
+				YYABORT;
+			}
+			strcpy(tmp, type);
+			strcat(tmp, ":");
+			strcat(tmp, local_argv[0]);
+			free(local_argv[0]);
+			local_argv[0] = tmp;
+		}
 	}
 	;
 
@@ -343,12 +356,12 @@ dnattrs: DNATTR EQUAL DNNAME
 		strcat($$, ",");
 		strcat($$, $5);
 	}
-	| DNATTR
+	| DNNAME
 	{
-		master_notify($1);
-		YYABORT;
+		/* Matches map in old style syntax ldap:server:map */
+		strcpy($$, $1);
 	}
-	| DNNAME
+	| DNATTR
 	{
 		master_notify($1);
 		YYABORT;
--- autofs-5.0.1/lib/master_tok.l.add-ldaps-support	2007-06-20 11:41:02.000000000 +0800
+++ autofs-5.0.1/lib/master_tok.l	2007-06-20 11:41:02.000000000 +0800
@@ -104,7 +104,7 @@ DNATTRSTR	(cn|nisMapName|automountMapNam
 DNNAMESTR	([[:alnum:]_.\-]+)
 
 INTMAP		(-hosts|-null)
-MTYPE           ((file|program|yp|nis|nisplus|ldap|hesiod|userdir)(,(sun|hesiod))?)
+MTYPE           ((file|program|yp|nis|nisplus|ldap|ldaps|hesiod|userdir)(,(sun|hesiod))?)
 
 
 OPTTOUT		(-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
--- autofs-5.0.1/man/auto.master.5.in.add-ldaps-support	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/man/auto.master.5.in	2007-06-20 11:41:02.000000000 +0800
@@ -101,8 +101,9 @@ The map is a hesiod database whose
 .B filsys
 entries are used for maps.
 .TP
-.B ldap
-The map is stored in an LDAP directory.
+.B ldap \fPor\fB ldaps
+The map is stored in an LDAP directory. If \fBldaps\fP is used the
+appropriate certificate must be configured in the LDAP client.
 .RE
 .TP
 \fBformat\fP


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- autofs.spec	30 Aug 2007 17:24:46 -0000	1.217
+++ autofs.spec	5 Sep 2007 05:33:14 -0000	1.218
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 27
+Release: 28
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -44,6 +44,8 @@
 Patch32: autofs-5.0.1-consistent-random-selection-option-name.patch
 Patch33: autofs-5.0.2-fix-mount-nfs-nosymlink.patch
 Patch34: autofs-5.0.2-default-nsswitch.patch
+Patch35: autofs-5.0.1-add-ldaps-support.patch
+Patch36: autofs-5.0.1-add-ldap-schema-discovery.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
 Conflicts: kernel < 2.6.17
@@ -119,6 +121,8 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -171,8 +175,9 @@
 %{_libdir}/autofs/
 
 %changelog
-* Thu Aug 31 2007 Ian Kent <ikent at redhat.com> - 5.0.1-27
-- revert ldap schema discovery patch.
+* Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.1-28
+- add ldaps support (required by schema discovery).
+- add back LDAP schema discovery if no schema is configured.
 
 * Tue Aug 28 2007 Ian Kent <ikent at redhat.com> - 5.0.1-26
 - fix "nosymlink" option handling and add desription to man page.



From fedora-extras-commits at redhat.com  Wed Sep  5 05:42:45 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Wed, 5 Sep 2007 01:42:45 -0400
Subject: rpms/autofs/F-7 autofs-5.0.1-add-ldap-schema-discovery.patch, 1.3,
	1.4
Message-ID: <200709050542.l855gj2n025956@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25906

Modified Files:
	autofs-5.0.1-add-ldap-schema-discovery.patch 
Log Message:
- fix typo in schema discrovery patch.


autofs-5.0.1-add-ldap-schema-discovery.patch:

Index: autofs-5.0.1-add-ldap-schema-discovery.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs-5.0.1-add-ldap-schema-discovery.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:33:14 -0000	1.3
+++ autofs-5.0.1-add-ldap-schema-discovery.patch	5 Sep 2007 05:42:12 -0000	1.4
@@ -279,8 +279,8 @@
 +			return 1;
 +		}
 +	} else {
-+		const char *class = common_schema[i].map_class;
-+		const char *key = common_schema[i].map_attr;
++		const char *class = ctxt->schema->map_class;
++		const char *key = ctxt->schema->map_attr;
 +		if (!get_query_dn(ldap, ctxt, class, key)) {
 +			unbind_ldap_connection(ldap, ctxt);
 +			error(LOGOPT_ANY, MODPREFIX "failed to get query dn");



From fedora-extras-commits at redhat.com  Wed Sep  5 05:59:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 01:59:12 -0400
Subject: rpms/hddtemp/EL-5 hddtemp.init,1.2,1.3 hddtemp.spec,1.20,1.21
Message-ID: <200709050559.l855xCZE026257@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26235

Modified Files:
	hddtemp.init hddtemp.spec 
Log Message:
Sync with devel


Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hddtemp.init	4 Dec 2004 22:43:31 -0000	1.2
+++ hddtemp.init	5 Sep 2007 05:58:37 -0000	1.3
@@ -1,37 +1,46 @@
-#!/bin/sh
+#!/bin/bash
 #
 # hddtemp       This shell script takes care of starting and stopping hddtemp.
 #
-# chkconfig:    - 90 10
+# chkconfig:    - 80 20
 # description:  hddtemp provides information about hard drives' temperature
 # processname:  hddtemp
 # config:       __ETCDIR__/sysconfig/hddtemp
 
+### BEGIN INIT INFO
+# Provides: hddtemp
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Short-Description: Hard drive temperature monitor daemon
+# Description: Provides information about hard drives' temperatures.
+### END INIT INFO
+
 . __ETCDIR__/sysconfig/hddtemp
 
 # Source function library.
 . __INITDIR__/functions
 
-# Source networking configuration.
-. __ETCDIR__/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
 # Backwards compatibility.
 [ -z "$HDDTEMP_OPTIONS" -a -n "$HDDTEMPARGS" ] && \
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
 HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
-exec="__SBINDIR__/hddtemp"
-prog=$(basename $exec)
+exec=__SBINDIR__/hddtemp
+prog=${exec##*/}
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
-    echo -n $"Starting hard disk temperature monitor daemon ($prog): "
-    daemon $exec -d $HDDTEMP_OPTIONS
-    retval=$?
-    echo
+    if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
+        retval=6
+    else
+        echo -n $"Starting hard disk temperature monitor daemon ($prog): "
+        daemon $exec -d $HDDTEMP_OPTIONS
+        retval=$?
+        echo
+    fi
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
 }
@@ -55,16 +64,22 @@
     start|stop|restart)
         $1
         ;;
-    reload|force-reload)
+    force-reload)
         restart
         ;;
     status)
         status $prog
         ;;
     try-restart|condrestart)
-        [ ! -f $lockfile ] || restart
+        if status $prog >/dev/null ; then
+            restart
+        fi
+        ;;
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-5/hddtemp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hddtemp.spec	21 Mar 2007 19:09:04 -0000	1.20
+++ hddtemp.spec	5 Sep 2007 05:58:37 -0000	1.21
@@ -2,11 +2,11 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.11.%{beta}%{?dist}
+Release:        0.14.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://www.guzu.net/linux/hddtemp.php
 Source0:        http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2
 Source1:        http://www.guzu.net/linux/hddtemp.db
@@ -90,11 +90,22 @@
 %{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
-%config /usr/share/misc/hddtemp.db
+%config(noreplace) /usr/share/misc/hddtemp.db
 %{_mandir}/man8/hddtemp.8*
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.14.beta15
+- Adjust server chkconfig start/stop priorities to start before gkrellmd,
+  other cosmetic init script tweaks.
+- Mark hddtemp.db as %%config(noreplace).
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.13.beta15
+- License: GPLv2+
+
+* Tue Jul 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.12.beta15
+- Improve init script LSB compliance.
+
 * Tue Jan  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.11.beta15
 - SATA sense fix (#221100, Jens Axboe).
 



From fedora-extras-commits at redhat.com  Wed Sep  5 06:16:25 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 5 Sep 2007 02:16:25 -0400
Subject: comps comps-f8.xml.in,1.89,1.90
Message-ID: <200709050616.l856GPZr032656@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629

Modified Files:
	comps-f8.xml.in 
Log Message:
lang goo. Jens, please look over the scim/m17n stuff.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- comps-f8.xml.in	4 Sep 2007 22:41:48 -0000	1.89
+++ comps-f8.xml.in	5 Sep 2007 06:15:55 -0000	1.90
@@ -68,9 +68,11 @@
     <packagelist>
       <packagereq type="mandatory">fonts-arabic</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-ar</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-arabic</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
@@ -563,6 +565,7 @@
     <langonly>br</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-br</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-br</packagereq>
     </packagelist>
   </group>
   <group>
@@ -618,6 +621,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bulgarian</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
     </packagelist>
@@ -663,6 +667,8 @@
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">stardict</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-zh_CN</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-zh_TW</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1072,8 +1078,10 @@
       <packagereq type="conditional" requires="hunspell">hunspell-nl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Dutch</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-nl</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-nl</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1273,6 +1281,7 @@
     <langonly>am</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ethiopic</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-amharic</packagereq>
       <packagereq type="optional">m17n-db-amharic</packagereq>
     </packagelist>
   </group>
@@ -1326,10 +1335,12 @@
       <packagereq type="conditional" requires="hunspell">hunspell-fr</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-French</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fr</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-fr</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-fr</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-fr</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1576,10 +1587,12 @@
       <packagereq type="conditional" requires="hunspell">hunspell-de</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-German</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-de</packagereq>
+      <packagereq type="conditional" requires="LabPlot-doc">LabPlot-doc-de</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-de</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-de</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1913,6 +1926,7 @@
     <langonly>el</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-el</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-el</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-el</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Greek</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-el</packagereq>
@@ -1986,6 +2000,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hebrew</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-he</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-he_IL</packagereq>
+      <packagereq type="conditional" requires="tetex">tetex-fonts-hebrew</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
@@ -2004,6 +2019,7 @@
       <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-hi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq>
@@ -2051,6 +2067,7 @@
     <langonly>id</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-id</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-id</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-id</packagereq>
     </packagelist>
   </group>
@@ -2094,9 +2111,11 @@
       <packagereq type="conditional" requires="hunspell">hunspell-it</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Italian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-it</packagereq>
+      <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="openoffice.org-core">openoffice.org-langpack-it</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-it</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2113,6 +2132,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-ja</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
       <packagereq type="optional">anthy</packagereq>
@@ -2523,6 +2543,17 @@
     </packagelist>
   </group>
   <group>
+    <id>low-saxon-support</id>
+    <_name>Low Saxon Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>nds</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-nds</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
     <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
@@ -2600,6 +2631,7 @@
     <langonly>mi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-mi_tn</packagereq>
+      <packagereq type="conditional" requires="moodle">moodle-mi_wwow</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2619,6 +2651,17 @@
     </packagelist>
   </group>
   <group>
+    <id>mongolian-support</id>
+    <_name>Mongolian Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>mn</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="moodle">moodle-mn</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mysql</id>
     <_name>MySQL Database</_name>
     <_description>This package group contains packages useful for use with MySQL.</_description>
@@ -2690,6 +2733,19 @@
     </packagelist>
   </group>
   <group>
+    <id>nepali-support</id>
+    <_name>Nepali Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ne</langonly>
+    <packagelist>
+      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-nepali</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>news-server</id>
     <_name>News Server</_name>
     <_description>This group allows you to configure the system as a news server.</_description>
@@ -2723,6 +2779,7 @@
     <langonly>nb</langonly>
     <packagelist>
       <packagereq type="conditional" requires="aspell">aspell-no</packagereq>
+      <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="kdelibs">kde-i18n-Norwegian</packagereq>
@@ -2843,6 +2900,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Polish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pl</packagereq>
+      <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="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq>
@@ -2950,7 +3008,9 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
+      <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
       <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
@@ -2977,6 +3037,7 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-sr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq>
@@ -3228,6 +3289,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-es</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-es</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-es</packagereq>
+      <packagereq type="conditional" requires="tesseract">tesseract-langpack-es</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3279,6 +3341,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-sv</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Swedish</packagereq>
       <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="openoffice.org-core">openoffice.org-langpack-sv</packagereq>
       <packagereq type="optional">m17n-db-swedish</packagereq>
@@ -3555,6 +3618,7 @@
       <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="xorg-x11-server-Xorg">scim-lang-thai</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-thai</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3674,6 +3738,7 @@
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
       <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-vietnamese</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4020,10 +4085,13 @@
       <groupid>lao-support</groupid>
       <groupid>latvian-support</groupid>
       <groupid>lithuanian-support</groupid>
+      <groupid>low-saxon-support</groupid>
       <groupid>malay-support</groupid>
       <groupid>malayalam-support</groupid>
       <groupid>maori-support</groupid>
       <groupid>marathi-support</groupid>
+      <groupid>mongolian-support</groupid>
+      <groupid>nepali-support</groupid>
       <groupid>northern-sotho-support</groupid>
       <groupid>norwegian-support</groupid>
       <groupid>oriya-support</groupid>



From fedora-extras-commits at redhat.com  Wed Sep  5 06:18:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 02:18:12 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.32,1.33
Message-ID: <200709050618.l856ICnj032705@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32678

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.4-45.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- em8300-kmod.spec	18 Aug 2007 15:07:56 -0000	1.32
+++ em8300-kmod.spec	5 Sep 2007 06:17:33 -0000	1.33
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.2-42.fc6}
+%{!?kversion: %define kversion 2.6.22.4-45.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.4-45.fc6.
+
 * Sat Aug 18 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-1
 - 0.16.3.
 - Build for kernel 2.6.22.2-42.fc6.



From fedora-extras-commits at redhat.com  Wed Sep  5 06:50:37 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 02:50:37 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo74751.bean.mawt.patch, NONE,
	1.1 openoffice.org.spec, 1.1294, 1.1295
Message-ID: <200709050650.l856obYx001180@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1156

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo74751.bean.mawt.patch 
Log Message:
add mawt patch for x86_64

openoffice.org-2.3.0.ooo74751.bean.mawt.patch:

--- NEW FILE openoffice.org-2.3.0.ooo74751.bean.mawt.patch ---
--- openoffice.org.orig/config_office/set_soenv.in	3 Aug 2007 13:09:48 -0000	1.156
+++ openoffice.org/config_office/set_soenv.in	29 Aug 2007 09:22:29 -0000
@@ -428,6 +428,7 @@
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
    }
    elsif ($platform =~ m/^sparc/)
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -r1.1294 -r1.1295
--- openoffice.org.spec	4 Sep 2007 19:23:28 -0000	1.1294
+++ openoffice.org.spec	5 Sep 2007 06:50:00 -0000	1.1295
@@ -57,16 +57,16 @@
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, xerces-j2, prelink
+BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
+BuildRequires:	gdb, java-devel >= %{jdk_ver}, zlib-devel, vigra-devel, hsqldb
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
 BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
+BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1067,6 +1068,7 @@
 %patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch62 -p1 -b .ooo74751.bean.mawt.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2750,6 +2752,7 @@
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu
 - rebuild against icedtea
+- add openoffice.org-2.3.0.ooo74751.bean.mawt.patch to allow build against icedtea
 - don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix



From fedora-extras-commits at redhat.com  Wed Sep  5 06:52:20 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 02:52:20 -0400
Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.21,
	1.22
Message-ID: <200709050652.l856qKd6001254@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1233

Modified Files:
	pseudoworkspace.valgrind1.patch 
Log Message:
fs reckons true is a better default

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pseudoworkspace.valgrind1.patch	4 Sep 2007 13:41:37 -0000	1.21
+++ pseudoworkspace.valgrind1.patch	5 Sep 2007 06:52:18 -0000	1.22
@@ -40,7 +40,7 @@
              ,nCommandType( CommandType::COMMAND )
              ,bEscapeProcessing( sal_True )
              ,bComposerDirty( true )
-+            ,bDisposeComposer( false )
++            ,bDisposeComposer( true )
          {
              if ( !_rxConnection.is() )
                  throw NullPointerException();



From fedora-extras-commits at redhat.com  Wed Sep  5 07:08:33 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:08:33 -0400
Subject: rpms/python-twisted-conch/F-7 python-twisted-conch.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709050708.l8578Xch007558@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-conch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7525

Modified Files:
	python-twisted-conch.spec sources 
Log Message:
update to latest version



Index: python-twisted-conch.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-7/python-twisted-conch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-conch.spec	27 Dec 2006 14:04:14 -0000	1.1
+++ python-twisted-conch.spec	5 Sep 2007 07:08:00 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedConch
 
 Name:           %{python}-twisted-conch
-Version:        0.7.0
-Release:        4%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Twisted SSHv2 implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://twistedmatrix.com/trac/wiki/TwistedConch
-Source0:        http://tmrc.mit.edu/mirror/twisted/Conch/0.7/TwistedConch-%{version}.tar.bz2 
+Source0:        http://tmrc.mit.edu/mirror/twisted/Conch/0.8/TwistedConch-%{version}.tar.bz2 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-crypto
 
 # a noarch-turned-arch package should not have debuginfo
@@ -80,6 +80,10 @@
 %{python_sitearch}/twisted/plugins/twisted_conch.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.8.0-1
+- new version
+
 * Tue Dec 26 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.7.0-4
 - fixed URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-conch/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2006 14:04:14 -0000	1.2
+++ sources	5 Sep 2007 07:08:00 -0000	1.3
@@ -1 +1 @@
-0236162d53cf7f34ed341d9179e7783b  TwistedConch-0.7.0.tar.bz2
+f3ccdd8da6b6e26b0a1eae5e54b9b0e2  TwistedConch-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:13:15 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:13:15 -0400
Subject: rpms/python-twisted-names/devel .cvsignore, 1.2,
	1.3 python-twisted-names.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709050713.l857DFZC007684@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-names/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7658

Modified Files:
	.cvsignore python-twisted-names.spec sources 
Log Message:
update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Dec 2006 14:28:40 -0000	1.2
+++ .cvsignore	5 Sep 2007 07:12:41 -0000	1.3
@@ -1 +1 @@
-TwistedNames-0.3.0.tar.bz2
+TwistedNames-0.4.0.tar.bz2


Index: python-twisted-names.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/python-twisted-names.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-names.spec	19 Dec 2006 14:28:40 -0000	1.1
+++ python-twisted-names.spec	5 Sep 2007 07:12:41 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNames
 
 Name:           %{python}-twisted-names
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted DNS implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.3/TwistedNames-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.4/TwistedNames-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -69,6 +69,10 @@
 %{python_sitearch}/twisted/plugins/twisted_names.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- updated to latest version
+
 * Thu Dec 14 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Dec 2006 14:28:40 -0000	1.2
+++ sources	5 Sep 2007 07:12:41 -0000	1.3
@@ -1 +1 @@
-5aa672d0e26718466351351e7bfcf22a  TwistedNames-0.3.0.tar.bz2
+fae00c3c1489b6818d16b84f8ffcc807  TwistedNames-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:24:49 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 03:24:49 -0400
Subject: rpms/python-twisted-names/F-7 python-twisted-names.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709050724.l857OnTZ008113@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-names/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8091

Modified Files:
	python-twisted-names.spec sources 
Log Message:
update to 0.4.0


Index: python-twisted-names.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/F-7/python-twisted-names.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-names.spec	19 Dec 2006 14:28:40 -0000	1.1
+++ python-twisted-names.spec	5 Sep 2007 07:24:16 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNames
 
 Name:           %{python}-twisted-names
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted DNS implementation
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.3/TwistedNames-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Names/0.4/TwistedNames-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -69,6 +69,10 @@
 %{python_sitearch}/twisted/plugins/twisted_names.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- updated to latest version
+
 * Thu Dec 14 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-names/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Dec 2006 14:28:40 -0000	1.2
+++ sources	5 Sep 2007 07:24:16 -0000	1.3
@@ -1 +1 @@
-5aa672d0e26718466351351e7bfcf22a  TwistedNames-0.3.0.tar.bz2
+fae00c3c1489b6818d16b84f8ffcc807  TwistedNames-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 07:26:10 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 03:26:10 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.40, 1.41 sources, 1.41, 
	1.42 system-config-samba.spec, 1.45, 1.46
Message-ID: <200709050726.l857QAA7008210@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8176

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
bundle the GPL
pull in updated translations
gracefully handle unknown configuration options (#247541)
don't throw exceptions when encountering lines without trailing newlines (#253464)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	13 Aug 2007 20:02:25 -0000	1.40
+++ .cvsignore	5 Sep 2007 07:25:38 -0000	1.41
@@ -1 +1 @@
-system-config-samba-1.2.47.tar.bz2
+system-config-samba-1.2.50.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	13 Aug 2007 20:02:25 -0000	1.41
+++ sources	5 Sep 2007 07:25:38 -0000	1.42
@@ -1 +1 @@
-e8236b65144f134fe82d452fb2bd8c57  system-config-samba-1.2.47.tar.bz2
+f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- system-config-samba.spec	13 Aug 2007 20:02:25 -0000	1.45
+++ system-config-samba.spec	5 Sep 2007 07:25:38 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.47
+Version: 1.2.50
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -57,11 +57,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-samba ] ; then
-  rm -rf /usr/share/system-config-samba/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -70,7 +65,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-#%doc COPYING
+%doc COPYING
 %doc doc/*
 /usr/bin/system-config-samba
 %dir /usr/share/system-config-samba
@@ -81,6 +76,20 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
+- bundle the GPL
+
+* Thu Aug 30 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.49
+- pull in updated translations
+
+* Tue Aug 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.48
+- gracefully handle unknown configuration options (#247541)
+
+* Mon Aug 27 2007 Nils Philippsen <nphilipp at redhat.com>
+- don't throw exceptions when encountering lines without trailing newlines
+  (#253464)
+- don't remove *.pyc files upon uninstalling the package (#256401)
+
 * Mon Aug 13 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.47
 - improve detection of commented out default values (#251477)
 - use non-capital default values



From fedora-extras-commits at redhat.com  Wed Sep  5 07:37:08 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 5 Sep 2007 03:37:08 -0400
Subject: rpms/opencdk/devel sources, 1.7, 1.8 opencdk.spec, 1.11,
	1.12 lastver, 1.1, 1.2
Message-ID: <200709050737.l857b8wS008579@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540

Modified Files:
	sources opencdk.spec lastver 
Log Message:
updated to 0.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2007 23:33:48 -0000	1.7
+++ sources	5 Sep 2007 07:36:36 -0000	1.8
@@ -1,2 +1,2 @@
-65324874074ba7c67028b93979e6d1d9  opencdk-0.5.13.tar.gz
-fc8b34d300b89629491144726c846caf  opencdk-0.5.13.tar.gz.sig
+7bfc820bcdc08f0c31f860710368071e  opencdk-0.6.4.tar.bz2
+aa4c75dc6dbf83bc7a7b3b53772f1e12  opencdk-0.6.4.tar.bz2.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opencdk.spec	3 Feb 2007 23:33:48 -0000	1.11
+++ opencdk.spec	5 Sep 2007 07:36:36 -0000	1.12
@@ -4,14 +4,14 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.13
+Version:	0.6.4
 Release:	%release_func 1
 
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
-Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz
-Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz.sig
+Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2
+Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	libgcrypt-devel zlib-devel perl
 
@@ -85,7 +85,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/DETAILS doc/*.html
+%doc doc/*.html
 %_bindir/*-config
 %_includedir/*
 %_libdir/*.a
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.4-1
+- updated to 0.6.4
+
 * Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.13-1
 - updated to 0.5.13
 - build with '-Wl,--as-needed' and removed superfluous libs from the


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:17 -0000	1.1
+++ lastver	5 Sep 2007 07:36:36 -0000	1.2
@@ -1 +1 @@
-0.5.13
+0.6.4



From fedora-extras-commits at redhat.com  Wed Sep  5 07:40:51 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 5 Sep 2007 03:40:51 -0400
Subject: rpms/opencdk/F-7 sources, 1.7, 1.8 opencdk.spec, 1.11, 1.12 lastver,
	1.1, 1.2
Message-ID: <200709050740.l857epPl008713@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8685

Modified Files:
	sources opencdk.spec lastver 
Log Message:
updated to 0.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2007 23:33:48 -0000	1.7
+++ sources	5 Sep 2007 07:40:19 -0000	1.8
@@ -1,2 +1,2 @@
-65324874074ba7c67028b93979e6d1d9  opencdk-0.5.13.tar.gz
-fc8b34d300b89629491144726c846caf  opencdk-0.5.13.tar.gz.sig
+7bfc820bcdc08f0c31f860710368071e  opencdk-0.6.4.tar.bz2
+aa4c75dc6dbf83bc7a7b3b53772f1e12  opencdk-0.6.4.tar.bz2.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/opencdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opencdk.spec	3 Feb 2007 23:33:48 -0000	1.11
+++ opencdk.spec	5 Sep 2007 07:40:19 -0000	1.12
@@ -4,14 +4,14 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.13
+Version:	0.6.4
 Release:	%release_func 1
 
 License:	GPL
 Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/gnutls/download.html
-Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz
-Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.gz.sig
+Source0:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2
+Source1:	ftp://ftp.gnutls.org/pub/gnutls/opencdk/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	libgcrypt-devel zlib-devel perl
 
@@ -85,7 +85,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/DETAILS doc/*.html
+%doc doc/*.html
 %_bindir/*-config
 %_includedir/*
 %_libdir/*.a
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.4-1
+- updated to 0.6.4
+
 * Sun Feb  4 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.13-1
 - updated to 0.5.13
 - build with '-Wl,--as-needed' and removed superfluous libs from the


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/opencdk/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver	1 Sep 2007 14:45:14 -0000	1.1
+++ lastver	5 Sep 2007 07:40:19 -0000	1.2
@@ -1 +1 @@
-0.5.13
+0.6.4



From fedora-extras-commits at redhat.com  Wed Sep  5 08:30:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed,  5 Sep 2007 04:30:53 -0400
Subject: fedora-security/audit fc6,1.251,1.252 fc7,1.92,1.93
Message-ID: <200709050830.l858UrGT015757@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692

Modified Files:
	fc6 fc7 
Log Message:
releng pushed loooots of stuff



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- fc6	4 Sep 2007 21:12:24 -0000	1.251
+++ fc6	5 Sep 2007 08:30:51 -0000	1.252
@@ -5,9 +5,9 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
 # Up to date CVE as of CVE email 20070823
-# Up to date FC6 as of 20070827
+# Up to date FC6 as of 20070905
 
-CVE-2007-4565 VULNERABLE (fetchmail) #260881
+CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash
@@ -16,12 +16,15 @@
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
-CVE-2007-4131 VULNERABLE (tar) #253684
-CVE-2007-4029 VULNERABLE (libvorbis) #250600
+CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
+CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-614]
+CVE-2007-4000 backport (krb5) [since FEDORA-2007-690]
+CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]
+CVE-2007-3848 version (kernel) [since FEDORA-2007-679]
 CVE-2007-3847 VULNERABLE (httpd) #250756
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
@@ -50,7 +53,7 @@
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3387 VULNERABLE (poppler) #251513
 CVE-2007-3387 backport (tetex) #251515 [since FEDORA-2007-669]
-CVE-2007-3387 VULNERABLE (kdegraphics) #251511
+CVE-2007-3387 backport (kdegraphics) #251511 [since FEDORA-2007-685]
 CVE-2007-3387 backport (cups) #251519 [since FEDORA-2007-644]
 CVE-2007-3384 ignore (tomcat) only affects 3.3.x and just affects an example
 CVE-2007-3381 version (gdm, fixed 2.18.4) #250277 [since FEDORA-2007-653]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fc7	4 Sep 2007 21:12:24 -0000	1.92
+++ fc7	5 Sep 2007 08:30:51 -0000	1.93
@@ -6,22 +6,22 @@
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
 # Up to date CVE as of CVE email 20070829
-# Up to date FC7 as of 20070829
+# Up to date FC7 as of 20070905
 
-CVE-2007-4650 VULNERABLE (gallery2) #267421
-CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
+CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 VULNERABLE (qgit) #268381
-CVE-2007-4565 VULNERABLE (fetchmail) #260861
+CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 VULNERABLE (clamav) #260583
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
+CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4534 VULNERABLE (vavoom) #256621
-CVE-2007-4533 VULNERABLE (vavoom) #256621
-CVE-2007-4532 VULNERABLE (vavoom) #256621
+CVE-2007-4534 backport (vavoom) #256621 [since CVE-2007-4533]
+CVE-2007-4533 backport (vavoom) #256621 [since CVE-2007-4533]
+CVE-2007-4532 backport (vavoom) #256621 [since CVE-2007-4533]
 CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
@@ -42,12 +42,14 @@
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-0414]
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
-CVE-2007-4139 VULNERABLE (wordpress) #250751
+CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
-CVE-2007-4131 VULNERABLE (tar) #253684
+CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4065 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
+CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252295 [since FEDORA-2007-1697]
@@ -142,7 +144,7 @@
 CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3007 ignore (php) safe mode isn't safe
 *CVE-2007-2975 (openfire)
-CVE-2007-2958 VULNERABLE (claws-mail) #254121
+CVE-2007-2958 version (claws-mail) #254121 [since FEDORA-2007-2009]
 CVE-2007-2958 backport (sylpheed) #254123 [since FEDORA-2007-1841]
 CVE-2007-2956 backport (qtpfsgui) #251674 [since FEDORA-2007-1581]
 CVE-2007-2949 version (gimp, fixed, 2.2.16) [since FEDORA-2007-0725]



From fedora-extras-commits at redhat.com  Wed Sep  5 08:33:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:33:44 -0400
Subject: rpms/openoffice.org/devel sources,1.247,1.248
Message-ID: <200709050833.l858XioQ015865@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15799

Modified Files:
	sources 
Log Message:
update for sandbox


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- sources	1 Sep 2007 11:44:03 -0000	1.247
+++ sources	5 Sep 2007 08:33:11 -0000	1.248
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-c7ee60da19dc9c0cccd3c2c7559a6c51  OOG680_m3.tar.bz2
+5b759a306c3ecd9284fdf6ba8e31388a  OOG680_m3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 08:35:53 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:35:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1295,1.1296
Message-ID: <200709050835.l858ZrU5015962@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15944

Modified Files:
	openoffice.org.spec 
Log Message:
icedtea issue


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -r1.1295 -r1.1296
--- openoffice.org.spec	5 Sep 2007 06:50:00 -0000	1.1295
+++ openoffice.org.spec	5 Sep 2007 08:35:20 -0000	1.1296
@@ -1,15 +1,7 @@
 %define oootag OOG680
 %define ooomilestone 3
 %define rh_rpm_release 2
-#temporary until I fix configure to find gcj's jdk_home on its own
-#and when the default java-devel pulled in is icedtea on intel-alikes
-%ifnarch %{ix86} x86_64
-%define jdk_line --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
-%define jdk_ver 1.5.0
-%else
-%define jdk_line ''
-%define jdk_ver 1.7.0
-%endif
+
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
@@ -25,6 +17,13 @@
 %else
 %define stlport_abi_lockin 0
 %endif
+#temporary until 
+#a) jdk_line I fix configure to find gcj's jdk_home on its own
+#b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
+#c) and figure out if we want sandbox.jar
+%ifnarch %{ix86} x86_64
+%define jdk_is_gcj
+%endif
 
 %if %{stlport_abi_lockin}
 %define stlflags --with-stlport4
@@ -32,6 +31,14 @@
 %define stlflags --without-stlport4
 %endif
 
+%if %{jdk_is_gcj}
+%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+%else
+%define jdkflags ''
+%define jdk_ver 1.7.0
+%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 sk sl sr-CS 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
 %else
@@ -1081,7 +1088,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdk_line} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1623,6 +1630,9 @@
 %{instdir}/program/classes/officebean.jar
 %{instdir}/program/classes/report.jar
 %{instdir}/program/classes/ridl.jar
+%if ! %{jdk_is_gcj}
+%{instdir}/program/classes/sandbox.jar
+%endif
 %{instdir}/program/classes/sdbc_hsqldb.jar
 %{instdir}/program/classes/ScriptFramework.jar
 %{instdir}/program/classes/ScriptProviderForBeanShell.jar
@@ -2756,6 +2766,7 @@
 - don't prefer gcj over icedtea when both installed
 - add ooo#81253 connectivity uninit fix
 - add ooo#81258 sw uninit fix
+- package sandbox.jar where available
 
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate



From fedora-extras-commits at redhat.com  Wed Sep  5 08:38:45 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 04:38:45 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1296,1.1297
Message-ID: <200709050838.l858cjeK016101@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074

Modified Files:
	openoffice.org.spec 
Log Message:
icedtea issue


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1296
retrieving revision 1.1297
diff -u -r1.1296 -r1.1297
--- openoffice.org.spec	5 Sep 2007 08:35:20 -0000	1.1296
+++ openoffice.org.spec	5 Sep 2007 08:38:13 -0000	1.1297
@@ -21,8 +21,10 @@
 #a) jdk_line I fix configure to find gcj's jdk_home on its own
 #b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
 #c) and figure out if we want sandbox.jar
-%ifnarch %{ix86} x86_64
-%define jdk_is_gcj
+%ifarch %{ix86} x86_64
+%define jdk_is_gcj 0
+%else
+%define jdk_is_gcj 1
 %endif
 
 %if %{stlport_abi_lockin}



From fedora-extras-commits at redhat.com  Wed Sep  5 08:50:23 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 5 Sep 2007 04:50:23 -0400
Subject: rpms/gimmage/devel gimmage-0.2.3-desktop.patch, NONE,
	1.1 gimmage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709050850.l858oNmH016432@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gimmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16387/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gimmage-0.2.3-desktop.patch gimmage.spec 
Log Message:
Initial release


gimmage-0.2.3-desktop.patch:

--- NEW FILE gimmage-0.2.3-desktop.patch ---
--- gimmage-0.2.3/gimmage.desktop.in.orig	2007-09-04 12:01:18.000000000 +0200
+++ gimmage-0.2.3/gimmage.desktop.in	2007-09-04 12:01:35.000000000 +0200
@@ -3,6 +3,7 @@
 Exec=@prefix@/bin/gimmage
 Icon=gimmage.png
 Type=Application
-Categories=Application;Graphics;
+Categories=Graphics;Viewer;
 Comment=A simple image viewer.
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
\ No newline at end of file
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
+Encoding=UTF-8


--- NEW FILE gimmage.spec ---

Name:      gimmage
Version:   0.2.3
Release:   1%{?dist}
Summary:   A Simple GNOME Image Viewer
Group:     Applications/Multimedia
License:   GPLv2+
URL:       http://gimmage.berlios.de/
Source0:   http://download.berlios.de/gimmage/%{name}-%{version}.tar.gz
Patch0:    gimmage-0.2.3-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkmm24-devel >= 2.10.0
BuildRequires:  cairomm-devel
BuildRequires:  curl-devel
BuildRequires:  file-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext intltool


%description
Gimmage is a simple image viewer that aims to have a minimalist
interface and tries to be keyboard operable for browsing through a
large number of images quickly.


%prep
%setup -q
%patch0 -p1 -b .desktop


%build
%configure \
        --disable-static \
        --disable-rpath \
        --disable-dependency-tracking

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora \
    --delete-original \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Tue Sep  4 2007 Denis Leroy <denis at poolshark.org> - 0.2.3-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 02:40:58 -0000	1.1
+++ .cvsignore	5 Sep 2007 08:49:50 -0000	1.2
@@ -0,0 +1 @@
+gimmage-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 02:40:58 -0000	1.1
+++ sources	5 Sep 2007 08:49:50 -0000	1.2
@@ -0,0 +1 @@
+f51cca53b3d33415e75a91cf81b6ac39  gimmage-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:03:30 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 5 Sep 2007 05:03:30 -0400
Subject: rpms/gimmage/F-7 gimmage-0.2.3-desktop.patch, NONE, 1.1 gimmage.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709050903.l8593Uig022766@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gimmage/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742

Modified Files:
	.cvsignore sources 
Added Files:
	gimmage-0.2.3-desktop.patch gimmage.spec 
Log Message:
Initial release

gimmage-0.2.3-desktop.patch:

--- NEW FILE gimmage-0.2.3-desktop.patch ---
--- gimmage-0.2.3/gimmage.desktop.in.orig	2007-09-04 12:01:18.000000000 +0200
+++ gimmage-0.2.3/gimmage.desktop.in	2007-09-04 12:01:35.000000000 +0200
@@ -3,6 +3,7 @@
 Exec=@prefix@/bin/gimmage
 Icon=gimmage.png
 Type=Application
-Categories=Application;Graphics;
+Categories=Graphics;Viewer;
 Comment=A simple image viewer.
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
\ No newline at end of file
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
+Encoding=UTF-8


--- NEW FILE gimmage.spec ---

Name:      gimmage
Version:   0.2.3
Release:   1%{?dist}
Summary:   A Simple GNOME Image Viewer
Group:     Applications/Multimedia
License:   GPLv2+
URL:       http://gimmage.berlios.de/
Source0:   http://download.berlios.de/gimmage/%{name}-%{version}.tar.gz
Patch0:    gimmage-0.2.3-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkmm24-devel >= 2.10.0
BuildRequires:  cairomm-devel
BuildRequires:  curl-devel
BuildRequires:  file-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext intltool


%description
Gimmage is a simple image viewer that aims to have a minimalist
interface and tries to be keyboard operable for browsing through a
large number of images quickly.


%prep
%setup -q
%patch0 -p1 -b .desktop


%build
%configure \
        --disable-static \
        --disable-rpath \
        --disable-dependency-tracking

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora \
    --delete-original \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:


%postun
update-desktop-database &> /dev/null ||:


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Tue Sep  4 2007 Denis Leroy <denis at poolshark.org> - 0.2.3-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 02:40:58 -0000	1.1
+++ .cvsignore	5 Sep 2007 09:02:56 -0000	1.2
@@ -0,0 +1 @@
+gimmage-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimmage/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 02:40:58 -0000	1.1
+++ sources	5 Sep 2007 09:02:56 -0000	1.2
@@ -0,0 +1 @@
+f51cca53b3d33415e75a91cf81b6ac39  gimmage-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:24:34 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 05:24:34 -0400
Subject: rpms/perl-Graph/devel .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200709050924.l859OY2Y023241@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23211

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Aug 2007 12:15:36 -0000	1.4
+++ .cvsignore	5 Sep 2007 09:24:01 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/perl-Graph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Graph.spec	23 Aug 2007 13:35:58 -0000	1.6
+++ perl-Graph.spec	5 Sep 2007 09:24:01 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,8 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Aug 2007 12:15:36 -0000	1.5
+++ sources	5 Sep 2007 09:24:01 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 09:25:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 05:25:29 -0400
Subject: rpms/perl-Graph/devel perl-Graph.spec,1.7,1.8
Message-ID: <200709050925.l859PTt0023278@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23247

Modified Files:
	perl-Graph.spec 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/devel/perl-Graph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Graph.spec	5 Sep 2007 09:24:01 -0000	1.7
+++ perl-Graph.spec	5 Sep 2007 09:24:56 -0000	1.8
@@ -63,6 +63,7 @@
 
 %changelog
 * Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
 
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.



From fedora-extras-commits at redhat.com  Wed Sep  5 09:29:42 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Wed, 5 Sep 2007 05:29:42 -0400
Subject: rpms/klamav/F-7 klamav-0.41.1-open-mode.patch, NONE, 1.1 klamav.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200709050929.l859TgMe023387@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/klamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23360

Modified Files:
	klamav.spec sources 
Added Files:
	klamav-0.41.1-open-mode.patch 
Log Message:
Update to 0.41.1

klamav-0.41.1-open-mode.patch:

--- NEW FILE klamav-0.41.1-open-mode.patch ---
--- klamav-0.41.1/src/klamd/misc.c.open-mode	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/klamd/misc.c	2007-08-19 17:45:49.000000000 +0300
@@ -157,7 +157,7 @@ int filecopy(const char *src, const char
     if((s = open(src, O_RDONLY|O_BINARY)) == -1)
 	return -1;
 
-    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) {
+    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, S_IRWXU)) == -1) {
 	close(s);
 	return -1;
     }


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/klamav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- klamav.spec	6 Mar 2007 09:59:14 -0000	1.3
+++ klamav.spec	5 Sep 2007 09:29:09 -0000	1.4
@@ -1,14 +1,13 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
-Version: 0.41
-Release: 2%{?dist}
-# Catch from http://ovh.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}-source.tar.gz
-Source0: %{name}-%{version}.tar.bz2
-#Source0: http://surfnet.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}.tar.bz2
+Version: 0.41.1
+Release: 5%{?dist}
+Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-suse-clamav-path.diff
+Patch1: klamav-0.41.1-open-mode.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
-License: GPL
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: clamav >= 0.90
 Requires: clamav-update >= 0.90
@@ -17,6 +16,7 @@
 BuildRequires: curl-devel
 BuildRequires: gmp-devel
 BuildRequires: desktop-file-utils
+BuildRequires: sqlite-devel >= 3.0
 
 %description
 ClamAV Anti-Virus protection for the KDE desktop.
@@ -24,14 +24,15 @@
 %prep
 %setup -q
 %patch0 -p0 -b .suse-clamav-path
+%patch1 -p1 -b .open-mode
 
 %build
-%configure --disable-rpath
-%{__make} %{?_smp_mflags}
+%configure --disable-rpath --without-included-sqlite
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf "${RPM_BUILD_ROOT}"
-%{__make} DESTDIR="${RPM_BUILD_ROOT}" install
+make DESTDIR="${RPM_BUILD_ROOT}" install
 
 # Fix absolute link
 ln -sf ../common ${RPM_BUILD_ROOT}%{_datadir}/doc/HTML/en/klamav02/
@@ -42,8 +43,6 @@
 %{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop.orig
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
-    --add-category Utilities \
     --delete-original \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
@@ -81,6 +80,16 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Sun Aug 19 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-5
+- fix desktop Categories
+- use system sqlite
+
+* Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-3
+- update to 0.41.1
+- fix License tag according to new guidelines
+- do not use __make macro
+- fix __open_missing_mode error
+
 * Tue Mar 06 2007 Andy Shevchenko <andy at smile.org.ua> 0.41-2
 - rebuild against new clamav
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2007 12:30:41 -0000	1.3
+++ sources	5 Sep 2007 09:29:09 -0000	1.4
@@ -1 +1 @@
-275fe29fda8db6f83717761f42534392  klamav-0.41.tar.bz2
+066e4c7089f9ef42958583bd5438e9e2  klamav-0.41.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 09:44:27 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 5 Sep 2007 05:44:27 -0400
Subject: rpms/gd/F-7 gd-2.0.35-AALineThick.patch, NONE,
	1.1 gd-2.0.35-overflow.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gd.spec, 1.42, 1.43 sources, 1.11,
	1.12 gd-2.0.33-AALineThick.patch, 1.1,
	NONE gd-2.0.33-overflow.patch, 1.1, NONE
Message-ID: <200709050944.l859iRC5023750@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23717

Modified Files:
	.cvsignore gd.spec sources 
Added Files:
	gd-2.0.35-AALineThick.patch gd-2.0.35-overflow.patch 
Removed Files:
	gd-2.0.33-AALineThick.patch gd-2.0.33-overflow.patch 
Log Message:
update to 2.0.35
fix several vulnerabilities #277421


gd-2.0.35-AALineThick.patch:

--- NEW FILE gd-2.0.35-AALineThick.patch ---
--- gd-2.0.35/gd.c.pom	2007-06-19 22:25:51.000000000 +0200
+++ gd-2.0.35/gd.c	2007-09-05 11:25:16.000000000 +0200
@@ -3474,6 +3474,8 @@ static void gdImageAALine (gdImagePtr im
 	/* keep them as 32bits */
 	long x, y, inc;
 	long dx, dy,tmp;
+	int w, wid, wstart; 
+	int thick = im->thick; 
 
 	if (!im->trueColor) {
 		/* TBB: don't crash when the image is of the wrong type */
@@ -3502,6 +3504,25 @@ static void gdImageAALine (gdImagePtr im
 		gdImageSetAAPixelColor(im, x1, y1, col, 0xFF);
 		return;
 	}
+	else { 
+	    double ag; 
+	    if (dy < dx)  
+		ag  = cos (atan2 (dy, dx)); 
+	    else  
+		ag = sin (atan2 (dy, dx)); 
+	    if (ag != 0)
+	    {
+		wid = thick / ag; 
+	    }
+	    else
+	    {
+		wid = 1;
+	    } 
+	    if (wid == 0)
+	    {
+		wid = 1;
+	    } 
+	} 
 	if (abs(dx) > abs(dy)) {
 		if (dx < 0) {
 			tmp = x1;
@@ -3518,8 +3539,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dy * 65536) / dx;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((x >> 16) <= x2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (y >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, x >> 16, (y >> 16) + 1,col, (~y >> 8) & 0xFF);
+			wstart = (y >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) {    
+			    gdImageSetAAPixelColor(im, (x >> 16) , w , col , (y >> 8) & 0xFF); 
+			    gdImageSetAAPixelColor(im, (x >> 16) , w + 1 , col, (~y >> 8) & 0xFF); 
+			} 
 			x += (1 << 16);
 			y += inc;
 		}
@@ -3539,8 +3563,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dx * 65536) / dy;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((y>>16) <= y2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (x >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, (x >> 16) + 1, (y >> 16),col, (~x >> 8) & 0xFF);
+			wstart = (x >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) { 
+			    gdImageSetAAPixelColor(im, w , y >> 16  , col, (x >> 8) & 0xFF);                    
+			    gdImageSetAAPixelColor(im, w + 1, y >> 16, col, (~x >> 8) & 0xFF);   
+			}
 			x += inc;
 			y += (1<<16);
 		}

gd-2.0.35-overflow.patch:

--- NEW FILE gd-2.0.35-overflow.patch ---
--- gd-2.0.35/gd_gd.c.pom	2006-04-05 17:52:22.000000000 +0200
+++ gd-2.0.35/gd_gd.c	2007-09-05 11:31:39.000000000 +0200
@@ -149,6 +149,10 @@ _gdCreateFromFile (gdIOCtx * in, int *sx
     {
       im = gdImageCreate (*sx, *sy);
     }
+  if (!im) 
+    { 
+      goto fail1; 
+    } 
   if (!_gdGetColors (in, im, gd2xFlag))
     {
       goto fail2;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2007 13:09:04 -0000	1.12
+++ .cvsignore	5 Sep 2007 09:43:55 -0000	1.13
@@ -1 +1 @@
-gd-2.0.34.tar.bz2
+gd-2.0.35.tar.bz2


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/gd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gd.spec	22 Feb 2007 12:44:56 -0000	1.42
+++ gd.spec	5 Sep 2007 09:43:55 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.0.34
-Release:       2%{?dist}
+Version:       2.0.35
+Release:       1%{?dist}
 Group:         System Environment/Libraries
 License:       BSD-style
 URL:           http://www.libgd.org/Main_Page
@@ -10,8 +10,8 @@
 Patch3:        gd-2.0.34-multilib.patch
 Patch4:        gd-loop.patch
 Patch5:        gd-2.0.34-sparc64.patch
-Patch6:        gd-2.0.33-overflow.patch
-Patch7:        gd-2.0.33-AALineThick.patch
+Patch6:        gd-2.0.35-overflow.patch
+Patch7:        gd-2.0.35-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
@@ -98,6 +98,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ivana varekova <varekova at redhat.com> 2.0.35-1
+- update to 2.0.35
+- fix several vulnerabilities #277421
+
 * Thu Feb 22 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-2
 - incorporate package review feedback
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gd/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2007 13:09:04 -0000	1.11
+++ sources	5 Sep 2007 09:43:55 -0000	1.12
@@ -1 +1 @@
-8c25c322f12030b1c24488efd577fec0  gd-2.0.34.tar.bz2
+6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  gd-2.0.35.tar.bz2


--- gd-2.0.33-AALineThick.patch DELETED ---


--- gd-2.0.33-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 09:56:57 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Wed, 5 Sep 2007 05:56:57 -0400
Subject: rpms/bind/devel bind.spec,1.212,1.213 named.init,1.58,1.59
Message-ID: <200709050956.l859uvpF024042@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24016

Modified Files:
	bind.spec named.init 
Log Message:
- initscript failure message is now printed correctly (#277981,
  Quentin Armitage (quentin armitage org uk) )



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- bind.spec	3 Sep 2007 08:23:14 -0000	1.212
+++ bind.spec	5 Sep 2007 09:56:24 -0000	1.213
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.2.%{RELEASEVER}%{?dist}
+Release: 	11.3.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -646,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.3.a6
+- initscript failure message is now printed correctly (#277981,
+  Quentin Armitage (quentin armitage org uk) )
+
 * Mon Sep 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.2.a6
 - temporary revert ISC 2119 change and add "libbind-errno" patch
   (#254501) again


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- named.init	23 Aug 2007 09:09:35 -0000	1.58
+++ named.init	5 Sep 2007 09:56:24 -0000	1.59
@@ -137,12 +137,12 @@
     [ -x /usr/bin/logger ] && echo "$named_err" | /usr/bin/logger -pdaemon.error -tnamed;
     exit 2;
   fi;
+  echo
   if [ $RETVAL -eq 0 ]; then
     touch /var/lock/subsys/named;
   else
     exit 7;
   fi
-  echo
   return 0;
 }
 



From fedora-extras-commits at redhat.com  Wed Sep  5 10:16:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:16:07 -0400
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.9,1.10
Message-ID: <200709051016.l85AG7In030359@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30339

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
- Upstream update.
- Update license.



Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-Autouse.spec	5 Sep 2006 11:56:37 -0000	1.9
+++ perl-Class-Autouse.spec	5 Sep 2007 10:15:35 -0000	1.10
@@ -1,8 +1,8 @@
 Name: 		perl-Class-Autouse
-Version: 	1.27
+Version: 	1.28
 Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Autouse/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
@@ -14,6 +14,9 @@
 BuildRequires: 	perl(Test::More) >= 0.47
 BuildRequires: 	perl(Carp)
 BuildRequires: 	perl(File::Spec) >= 0.80
+# FIXME: Class-Autouse actually wants perl(List::Util) >= 1.19
+# perl is currently being shipped with perl(List::Util) == 1.18
+# Should be safe to ignore
 BuildRequires:	perl(List::Util) >= 1.18
 
 # for improved tests
@@ -44,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -53,6 +56,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
+- Upstream update.
+- Update license.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.27-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 10:18:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:18:39 -0400
Subject: rpms/perl-Class-Autouse/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200709051018.l85AId7E030458@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30432

Modified Files:
	.cvsignore sources 
Log Message:
Update.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2006 11:56:37 -0000	1.7
+++ .cvsignore	5 Sep 2007 10:18:06 -0000	1.8
@@ -1 +1 @@
-Class-Autouse-1.27.tar.gz
+Class-Autouse-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2006 11:56:37 -0000	1.7
+++ sources	5 Sep 2007 10:18:06 -0000	1.8
@@ -1 +1 @@
-f6b69cae6db84d6c1728384e6e7bd281  Class-Autouse-1.27.tar.gz
+d9909d00aba3238dae31e27e4695dcc2  Class-Autouse-1.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:21:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 06:21:25 -0400
Subject: rpms/perl-Class-Autouse/F-7 .cvsignore, 1.7,
	1.8 perl-Class-Autouse.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709051021.l85ALPYj030697@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-Autouse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30666

Modified Files:
	.cvsignore perl-Class-Autouse.spec sources 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
- Upstream update.
- Update license.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Sep 2006 11:56:37 -0000	1.7
+++ .cvsignore	5 Sep 2007 10:20:53 -0000	1.8
@@ -1 +1 @@
-Class-Autouse-1.27.tar.gz
+Class-Autouse-1.28.tar.gz


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/perl-Class-Autouse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Class-Autouse.spec	5 Sep 2006 11:56:37 -0000	1.9
+++ perl-Class-Autouse.spec	5 Sep 2007 10:20:53 -0000	1.10
@@ -1,8 +1,8 @@
 Name: 		perl-Class-Autouse
-Version: 	1.27
+Version: 	1.28
 Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Class-Autouse/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Autouse-%{version}.tar.gz
@@ -14,6 +14,9 @@
 BuildRequires: 	perl(Test::More) >= 0.47
 BuildRequires: 	perl(Carp)
 BuildRequires: 	perl(File::Spec) >= 0.80
+# FIXME: Class-Autouse actually wants perl(List::Util) >= 1.19
+# perl is currently being shipped with perl(List::Util) == 1.18
+# Should be safe to ignore
 BuildRequires:	perl(List::Util) >= 1.18
 
 # for improved tests
@@ -44,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -53,6 +56,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.28-1
+- Upstream update.
+- Update license.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.27-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Sep 2006 11:56:37 -0000	1.7
+++ sources	5 Sep 2007 10:20:53 -0000	1.8
@@ -1 +1 @@
-f6b69cae6db84d6c1728384e6e7bd281  Class-Autouse-1.27.tar.gz
+d9909d00aba3238dae31e27e4695dcc2  Class-Autouse-1.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:25:33 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 06:25:33 -0400
Subject: rpms/perl-Graph/F-7 .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200709051025.l85APXex030837@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30801

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Aug 2007 13:02:59 -0000	1.4
+++ .cvsignore	5 Sep 2007 10:25:00 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/perl-Graph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Graph.spec	23 Aug 2007 13:40:26 -0000	1.5
+++ perl-Graph.spec	5 Sep 2007 10:25:00 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Aug 2007 13:02:59 -0000	1.5
+++ sources	5 Sep 2007 10:25:00 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:37:44 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:37:44 -0400
Subject: rpms/GeoIP/devel .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200709051037.l85Abi8I031503@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31480

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:37:12 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	5 Sep 2007 10:37:12 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	5 Sep 2007 10:37:12 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 10:48:36 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Wed, 5 Sep 2007 06:48:36 -0400
Subject: rpms/perl-Graph/FC-6 .cvsignore, 1.4, 1.5 perl-Graph.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200709051048.l85Amap3031852@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Graph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31816

Modified Files:
	.cvsignore perl-Graph.spec sources 
Log Message:
* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
- Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Aug 2007 12:02:14 -0000	1.4
+++ .cvsignore	5 Sep 2007 10:48:00 -0000	1.5
@@ -1 +1 @@
-Graph-0.83.tar.gz
+Graph-0.84.tar.gz


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/perl-Graph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Graph.spec	23 Aug 2007 13:43:23 -0000	1.5
+++ perl-Graph.spec	5 Sep 2007 10:48:00 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           perl-Graph
-Version:        0.83
-Release:        3%{?dist}
-Summary:        A Perl module for dealing with graphs, the abstract data structures
+Version:        0.84
+Release:        1%{?dist}
+Summary:        Perl module for dealing with graphs, the abstract data structures
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.84-1
+- Update to latest upstream.
+
 * Thu Aug 23 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.83-3
 - License tag to GPL+ or Artistic as per new guidelines.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 12:02:14 -0000	1.5
+++ sources	5 Sep 2007 10:48:00 -0000	1.6
@@ -1 +1 @@
-43d8d636943fe3df8d7e9a663c0f987f  Graph-0.83.tar.gz
+cd42d5c04964a2b7db5f6c200c716ded  Graph-0.84.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 10:51:18 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:51:18 -0400
Subject: rpms/GeoIP/FC-6 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <200709051051.l85ApITm031937@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31891

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release
- Small fixes to fetch scripts



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Apr 2007 08:42:04 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/GeoIP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeoIP.spec	1 Apr 2007 08:42:04 -0000	1.9
+++ GeoIP.spec	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,10 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release
+- Small fixes to fetch scripts
+
 * Sun Apr 1 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 - Sync with devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Apr 2007 08:42:04 -0000	1.9
+++ sources	5 Sep 2007 10:50:40 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-a650a3e4fb2f7c3984c4081cd5949d73  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 10:55:09 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 06:55:09 -0400
Subject: rpms/GeoIP/F-7 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200709051055.l85At970032080@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32049

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	5 Sep 2007 10:54:30 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	5 Sep 2007 10:54:30 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	5 Sep 2007 10:54:30 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Wed Sep  5 11:00:30 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Wed, 05 Sep 2007 04:00:30 -0700
Subject: [pkgdb] kdnssd-avahi had acl change status
Message-ID: <200709051100.l85B0kbl013968@app3.fedora.phx.redhat.com>

Martin Bacovsky (mbacovsk) has set the watchbugzilla acl on kdnssd-avahi (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdnssd-avahi



From fedora-extras-commits at redhat.com  Wed Sep  5 11:00:49 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Wed, 05 Sep 2007 04:00:49 -0700
Subject: [pkgdb] kdnssd-avahi had acl change status
Message-ID: <200709051100.l85B0oLK013977@app3.fedora.phx.redhat.com>

Martin Bacovsky (mbacovsk) has set the commit acl on kdnssd-avahi (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdnssd-avahi



From fedora-extras-commits at redhat.com  Wed Sep  5 11:08:01 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:08:01 -0700
Subject: [pkgdb] mt-st Orphaned
Message-ID: <200709051108.l85B81C3014103@app3.fedora.phx.redhat.com>

Package mt-st in Fedora devel was orphaned by Jindrich Novy (jnovy)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:08:50 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Wed, 5 Sep 2007 07:08:50 -0400
Subject: rpms/mod_perl/devel filter-provides.sh, 1.1, 1.2 mod_perl.spec, 1.52,
	1.53
Message-ID: <200709051108.l85B8oXN008136@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8081

Modified Files:
	filter-provides.sh mod_perl.spec 
Log Message:
* Wed Sep  5 2007 Joe Orton <jorton at redhat.com> 2.0.3-14
- filter perl(HTTP::Request::Common) Provide from -devel (#247250)



Index: filter-provides.sh
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/filter-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filter-provides.sh	20 Apr 2007 10:01:30 -0000	1.1
+++ filter-provides.sh	5 Sep 2007 11:08:17 -0000	1.2
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 /usr/lib/rpm/perl.prov $* | \
-    sed -e '/perl(warnings)/d'
+    sed -e '/perl(warnings)/d' \
+        -e '/HTTP::Request::Common)/d'
+


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_perl.spec	2 Sep 2007 14:06:57 -0000	1.52
+++ mod_perl.spec	5 Sep 2007 11:08:17 -0000	1.53
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.3
-Release:        13
+Release:        14
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@
 %{_includedir}/httpd/*
 
 %changelog
+* Wed Sep  5 2007 Joe Orton <jorton at redhat.com> 2.0.3-14
+- filter perl(HTTP::Request::Common) Provide from -devel (#247250)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.0.3-13
 - rebuild for fixed 32-bit APR
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:19 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:19 -0400
Subject: rpms/xtide/F-7 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xtide.spec,
	1.30, 1.31
Message-ID: <200709051109.l85B9JhW008216@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/F-7

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 19:05:12 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:46 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 19:05:12 -0000	1.21
+++ sources	5 Sep 2007 11:08:46 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-7/xtide.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xtide.spec	11 Jun 2007 07:15:29 -0000	1.30
+++ xtide.spec	5 Sep 2007 11:08:46 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPL
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,17 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
+- Mass rebuild (buildID or binutils issue)
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.1
+- License update
+
 * Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3
 - Require needed fonts (bug reported from upstream)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:22 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:22 -0400
Subject: rpms/xtide/FC-6 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xtide.spec, 1.29, 1.30
Message-ID: <200709051109.l85B9MoA008221@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/FC-6

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 19:05:26 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:49 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 19:05:26 -0000	1.21
+++ sources	5 Sep 2007 11:08:49 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-6/xtide.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xtide.spec	11 Jun 2007 11:56:12 -0000	1.29
+++ xtide.spec	5 Sep 2007 11:08:49 -0000	1.30
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPL
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,17 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
+- Mass rebuild (buildID or binutils issue)
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.1
+- License update
+
 * Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3
 - Require needed fonts (bug reported from upstream)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:09:25 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 5 Sep 2007 07:09:25 -0400
Subject: rpms/xtide/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xtide.spec, 1.32, 1.33
Message-ID: <200709051109.l85B9P5N008226@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8109/devel

Modified Files:
	.cvsignore sources xtide.spec 
Log Message:
* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
- 2.9.4
  (Relicensed: GPLv2+ -> GPLv3+)
- Update user creation script



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 May 2007 18:05:32 -0000	1.21
+++ .cvsignore	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 Harminics-USpart-recreate-sh.tar.bz2
 harmonics-dwf-20070318-dump-US.tar.bz2
-xtide-2.9.3.tar.bz2
+xtide-2.9.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 May 2007 18:05:32 -0000	1.21
+++ sources	5 Sep 2007 11:08:52 -0000	1.22
@@ -1,3 +1,3 @@
 83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
 7fb1a017c99b2a0894b823302bf7ebf7  harmonics-dwf-20070318-dump-US.tar.bz2
-0a3bd1bb4c6cfdc431876596b680b107  xtide-2.9.3.tar.bz2
+e87667669df1755579bca7085aef1580  xtide-2.9.4.tar.bz2


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xtide.spec	21 Aug 2007 18:54:31 -0000	1.32
+++ xtide.spec	5 Sep 2007 11:08:52 -0000	1.33
@@ -3,8 +3,8 @@
 
 Summary:         Calculate tide all over the world
 Name:            xtide
-Version:         2.9.3
-Release:         3%{?dist}.2
+Version:         2.9.4
+Release:         1%{?dist}
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
@@ -18,7 +18,7 @@
 Source40:        Harminics-USpart-recreate-sh.tar.bz2
 Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
 
-License:         GPLv2+
+License:         GPLv3+
 Group:           Applications/Engineering
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,7 @@
 Requires:        xorg-x11-fonts-base
 Requires:        xtide-common
 
-Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      shadow-utils
 Requires(preun):    /sbin/service
 Requires(preun):    /sbin/chkconfig
 Requires(postun):   /sbin/service
@@ -196,13 +196,18 @@
    /sbin/service xttpd condrestart &>/dev/null || :
 fi
 
-%pre 
-%{_sbindir}/useradd \
+%pre
+getent group xttpd &>/dev/null || \
+   %{_sbindir}/groupadd -r xttpd
+getent passwd xttpd &> /dev/null || \
+   %{_sbindir}/useradd \
    -c "XTide web server" \
+   -g xttpd \
    -d %{_sysconfdir}/%{name} \
    -r \
    -s /sbin/nologin \
-   xttpd 2>/dev/null || :
+   xttpd 2>/dev/null
+exit 0
 
 %preun
 if [ $1 = 0 ] ; then
@@ -245,6 +250,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Wed Sep  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.4-1
+- 2.9.4
+  (Relicensed: GPLv2+ -> GPLv3+)
+- Update user creation script
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.3-3.dist.2
 - Mass rebuild (buildID or binutils issue)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:27 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:27 -0700
Subject: [pkgdb] mtx Orphaned
Message-ID: <200709051122.l85BMR7c014213@app3.fedora.phx.redhat.com>

Package mtx in Fedora 7 was orphaned by Jindrich Novy (jnovy)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:40 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:40 -0700
Subject: [pkgdb] mtx: jnovy has requested watchcommits
Message-ID: <200709051122.l85BMeGs014220@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mtx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:45 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:45 -0700
Subject: [pkgdb] mtx: jnovy has requested approveacls
Message-ID: <200709051122.l85BMj3K014227@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mtx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:57 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Wed, 5 Sep 2007 07:22:57 -0400
Subject: rpms/rpm/devel rpm.spec,1.257,1.258
Message-ID: <200709051122.l85BMvIN008617@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8586

Modified Files:
	rpm.spec 
Log Message:
- remove duplicated libraries from rpm-devel (#278151)



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- rpm.spec	4 Sep 2007 07:45:42 -0000	1.257
+++ rpm.spec	5 Sep 2007 11:22:24 -0000	1.258
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.3.rc1
+Release: 0.4.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -333,10 +333,7 @@
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/librpm-4.4.so
-%{_libdir}/librpmdb-4.4.so
-%{_libdir}/librpmio-4.4.so
-%{_libdir}/librpmbuild-4.4.so
+%{_libdir}/librpm*-*.so
 
 %files build
 %defattr(-,root,root)
@@ -392,7 +389,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/rpm
-%{_libdir}/librpm*.so
+%{_libdir}/librp*[a-z].so
 %{_libdir}/librpm*.a
 %{_mandir}/man8/rpmcache.8*
 %{_mandir}/man8/rpmgraph.8*
@@ -406,6 +403,9 @@
 %endif
 
 %changelog
+* Wed Sep 05 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.4.rc1
+- remove duplicated libraries from rpm-devel (#278151)
+
 * Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.3.rc1
 - require gawk, not awk, doh
 



From fedora-extras-commits at redhat.com  Wed Sep  5 11:22:58 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:22:58 -0700
Subject: [pkgdb] mtx: jnovy has requested watchcommits
Message-ID: <200709051122.l85BMwF5014233@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mtx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:23:01 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:23:01 -0700
Subject: [pkgdb] mtx: jnovy has requested approveacls
Message-ID: <200709051123.l85BN12A014239@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mtx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:06 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:06 -0700
Subject: [pkgdb] mt-st: jnovy has requested watchcommits
Message-ID: <200709051124.l85BO6GT014266@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mt-st (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:10 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:10 -0700
Subject: [pkgdb] mt-st: jnovy has requested approveacls
Message-ID: <200709051124.l85BOANW014272@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mt-st (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:15 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:15 -0700
Subject: [pkgdb] mt-st: jnovy has requested watchcommits
Message-ID: <200709051124.l85BOFuG014278@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the watchcommits acl on mt-st (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:24:19 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 05 Sep 2007 04:24:19 -0700
Subject: [pkgdb] mt-st: jnovy has requested approveacls
Message-ID: <200709051124.l85BOJEY014284@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has requested the approveacls acl on mt-st (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:25:43 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 5 Sep 2007 07:25:43 -0400
Subject: rpms/lighttpd/devel lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.17-sighup.patch, NONE, 1.1 .cvsignore, 1.20,
	1.21 lighttpd.spec, 1.36, 1.37 sources, 1.20,
	1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709051125.l85BPhqd008766@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8726

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch lighttpd-1.4.17-sighup.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.17.


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )

lighttpd-1.4.17-sighup.patch:

--- NEW FILE lighttpd-1.4.17-sighup.patch ---
Index: /branches/lighttpd-1.4.x/src/server.c
===================================================================
--- /branches/lighttpd-1.4.x/src/server.c (revision 1980)
+++ /branches/lighttpd-1.4.x/src/server.c (revision 1982)
@@ -69,4 +69,5 @@
 static volatile sig_atomic_t handle_sig_alarm = 1;
 static volatile sig_atomic_t handle_sig_hup = 0;
+static volatile sig_atomic_t forwarded_sig_hup = 0;
 
 #if defined(HAVE_SIGACTION) && defined(SA_SIGINFO)
@@ -95,6 +96,17 @@
 		break;
 	case SIGHUP:
-		handle_sig_hup = 1;
-		memcpy(&last_sighup_info, si, sizeof(*si));
+		/** 
+		 * we send the SIGHUP to all procs in the process-group
+		 * this includes ourself
+		 * 
+		 * make sure we only send it once and don't create a 
+		 * infinite loop
+		 */
+		if (!forwarded_sig_hup) {
+			handle_sig_hup = 1;
+			memcpy(&last_sighup_info, si, sizeof(*si));
+		} else {
+			forwarded_sig_hup = 0;
+		}
 		break;
 	case SIGCHLD:
@@ -989,5 +1001,5 @@
 	if (num_childs > 0) {
 		int child = 0;
-		while (!child && !srv_shutdown) {
+		while (!child && !srv_shutdown && !graceful_shutdown) {
 			if (num_childs > 0) {
 				switch (fork()) {
@@ -1004,12 +1016,59 @@
 				int status;
 
-				/* ignore EINTR */
-				if (-1 != wait(&status)) num_childs++;
-			}
-		}
-		if (srv_shutdown) {
-			kill(0, SIGTERM);
-		}
-		if (!child) return 0;
+				if (-1 != wait(&status)) {
+					/** 
+					 * one of our workers went away 
+					 */
+					num_childs++;
+				} else {
+					switch (errno) {
+					case EINTR:
+						/**
+						 * if we receive a SIGHUP we have to close our logs ourself as we don't 
+						 * have the mainloop who can help us here
+						 */
+						if (handle_sig_hup) {
+							handle_sig_hup = 0;
+
+							log_error_cycle(srv);
+
+							/**
+							 * forward to all procs in the process-group
+							 * 
+							 * we also send it ourself
+							 */
+							if (!forwarded_sig_hup) {
+								forwarded_sig_hup = 1;
+								kill(0, SIGHUP);
+							}
+						}
+						break;
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		/**
+		 * for the parent this is the exit-point 
+		 */
+		if (!child) {
+			/** 
+			 * kill all children too 
+			 */
+			if (graceful_shutdown) {
+				kill(0, SIGINT);
+			} else if (srv_shutdown) {
+				kill(0, SIGTERM);
+			}
+
+			log_error_close(srv);
+			network_close(srv);
+			connections_free(srv);
+			plugins_free(srv);
+			server_free(srv);
+			return 0;
+		}
 	}
 #endif
@@ -1102,7 +1161,7 @@
 				log_error_write(srv, __FILE__, __LINE__, "sdsd", 
 					"logfiles cycled UID =",
-					last_sigterm_info.si_uid,
+					last_sighup_info.si_uid,
 					"PID =",
-					last_sigterm_info.si_pid);
+					last_sighup_info.si_pid);
 #else
 				log_error_write(srv, __FILE__, __LINE__, "s", 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:08:02 -0000	1.20
+++ .cvsignore	5 Sep 2007 11:25:10 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.17.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- lighttpd.spec	23 Aug 2007 10:23:42 -0000	1.36
+++ lighttpd.spec	5 Sep 2007 11:25:10 -0000	1.37
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
-Release: 3%{?dist}
+Version: 1.4.17
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -15,7 +15,8 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
+Patch1: lighttpd-1.4.17-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -72,6 +73,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
+%patch1 -p3 -b .sighup
 
 
 %build
@@ -120,6 +122,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -160,6 +165,7 @@
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -179,6 +185,12 @@
 
 
 %changelog
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
 - Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:08:02 -0000	1.20
+++ sources	5 Sep 2007 11:25:10 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+85c99c2d6baf8ad9e38e6267efe7d9aa  lighttpd-1.4.17.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 11:30:14 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 05 Sep 2007 04:30:14 -0700
Subject: [pkgdb] mtx Owned
Message-ID: <200709051130.l85BUERx014327@app3.fedora.phx.redhat.com>

Package mtx in Fedora devel is now owned by Radek Brich (rbrich)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mtx



From fedora-extras-commits at redhat.com  Wed Sep  5 11:30:43 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 5 Sep 2007 07:30:43 -0400
Subject: rpms/docbook-style-xsl/devel .cvsignore, 1.20,
	1.21 docbook-style-xsl.spec, 1.37, 1.38 sources, 1.20, 1.21
Message-ID: <200709051130.l85BUhSJ008957@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8886

Modified Files:
	.cvsignore docbook-style-xsl.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	29 Aug 2007 15:19:55 -0000	1.20
+++ .cvsignore	5 Sep 2007 11:30:11 -0000	1.21
@@ -1 +1,3 @@
 docbook-xsl-1.73.1.tar.gz
+docbook-xsl-1.73.2.tar.gz
+docbook-xsl-doc-1.73.2.tar.bz2


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- docbook-style-xsl.spec	30 Aug 2007 13:45:43 -0000	1.37
+++ docbook-style-xsl.spec	5 Sep 2007 11:30:11 -0000	1.38
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.73.1
-Release: 2%{?dist}
+Version: 1.73.2
+Release: 1%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -99,10 +99,13 @@
 
 
 %changelog
-* Thu Jul 30 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-2
+* Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
+- new upstream version
+
+* Thu Aug 30 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-2
 - removed patch for #249294(included in new version other way)
 
-* Wed Jul 29 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-1
+* Wed Aug 29 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.1-1
 - new upstream version(fixing some bugs)
 - small new-methods patch change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2007 15:19:55 -0000	1.20
+++ sources	5 Sep 2007 11:30:11 -0000	1.21
@@ -1,2 +1,2 @@
-e183c80a6a18cc3a8eeb3f3d749dbf76  docbook-xsl-doc-1.73.1.tar.bz2
-238a90e48d0a1b48b7876f8239bb0b5b  docbook-xsl-1.73.1.tar.gz
+7dd72a38c7d25e1396fa26b6ee53eae9  docbook-xsl-1.73.2.tar.gz
+d41ce59b783b60383cca765902a41039  docbook-xsl-doc-1.73.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 11:32:43 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 05 Sep 2007 04:32:43 -0700
Subject: [pkgdb] mt-st Owned
Message-ID: <200709051132.l85BWhn8014341@app3.fedora.phx.redhat.com>

Package mt-st in Fedora devel is now owned by Radek Brich (rbrich)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-st



From fedora-extras-commits at redhat.com  Wed Sep  5 11:38:45 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 5 Sep 2007 07:38:45 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.107,1.108
Message-ID: <200709051138.l85BcjgZ009185@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9165

Modified Files:
	kdegraphics.spec 
Log Message:
* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-4
- respin (for poppler)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdegraphics.spec	20 Aug 2007 20:08:54 -0000	1.107
+++ kdegraphics.spec	5 Sep 2007 11:38:13 -0000	1.108
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -311,6 +311,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-4
+- respin (for poppler)
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-3
 - (Build)Requires: kdelibs3(-devel)
 - Provides: kdegraphics3(-devel)



From fedora-extras-commits at redhat.com  Wed Sep  5 11:40:10 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:40:10 -0400
Subject: rpms/mod_geoip/devel .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051140.l85BeAhg009275@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:39:37 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:39:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:39:37 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:43:07 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:43:07 -0400
Subject: rpms/mod_geoip/F-7 .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051143.l85Bh7H5009369@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9345

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:42:35 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:42:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:42:35 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:44:12 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 07:44:12 -0400
Subject: rpms/mod_geoip/FC-6 .cvsignore, 1.3, 1.4 mod_geoip.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709051144.l85BiCcf009450@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_geoip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9412

Modified Files:
	.cvsignore mod_geoip.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
- New upstream release
- Employ some macro sanity..



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 May 2006 07:03:36 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:43:39 -0000	1.4
@@ -1 +1 @@
-mod_geoip2_1.1.8.tar.gz
+mod_geoip2_1.2.0.tar.gz


Index: mod_geoip.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/mod_geoip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_geoip.spec	3 Sep 2006 08:40:33 -0000	1.3
+++ mod_geoip.spec	5 Sep 2007 11:43:39 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: GeoIP module for the Apache HTTP Server
 Name: mod_geoip
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: Apache Software License
 Group: System Environment/Daemons
 URL: http://www.maxmind.com/app/mod_geoip
@@ -26,7 +26,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
 
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 LoadModule geoip_module modules/mod_geoip.so
 
 <IfModule mod_geoip.c>
@@ -46,6 +46,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.0-1
+- New upstream release
+- Employ some macro sanity..
+
 * Sun Sep 3 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.1.8-2
 - Bump and rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_geoip/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2006 07:03:36 -0000	1.3
+++ sources	5 Sep 2007 11:43:39 -0000	1.4
@@ -1 +1 @@
-165607221c6a95ace7d840c5aea39696  mod_geoip2_1.1.8.tar.gz
+890f514e817e15d148c7becf8da9781b  mod_geoip2_1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 11:56:15 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 5 Sep 2007 07:56:15 -0400
Subject: rpms/powermanga/devel powermanga-0.90-install.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 powermanga.spec, 1.17, 1.18 sources,
	1.3, 1.4 powermanga-0.80-install.patch, 1.1, NONE
Message-ID: <200709051156.l85BuFEh009782@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9705

Modified Files:
	.cvsignore powermanga.spec sources 
Added Files:
	powermanga-0.90-install.patch 
Removed Files:
	powermanga-0.80-install.patch 
Log Message:
Update to 0.90.


powermanga-0.90-install.patch:

--- NEW FILE powermanga-0.90-install.patch ---
diff -Naupr powermanga-0.90.orig/data/curves/Makefile powermanga-0.90/data/curves/Makefile
--- powermanga-0.90.orig/data/curves/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile	2007-09-04 16:33:04.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/curves/Makefile.am powermanga-0.90/data/curves/Makefile.am
--- powermanga-0.90.orig/data/curves/Makefile.am	2007-07-13 07:31:49.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile.am	2007-09-04 16:32:47.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 
 dist_pkgdata_DATA = \
   bezier_curve_000.bin \
diff -Naupr powermanga-0.90.orig/data/curves/Makefile.in powermanga-0.90/data/curves/Makefile.in
--- powermanga-0.90.orig/data/curves/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/curves/Makefile.in	2007-09-04 16:32:56.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/curves
+pkgdatadir = $(datadir)/powermanga/data/curves
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile powermanga-0.90/data/levels/curves_phase/Makefile
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile	2007-09-04 16:33:33.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile.am powermanga-0.90/data/levels/curves_phase/Makefile.am
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile.am	2007-07-13 07:31:50.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile.am	2007-09-04 16:33:19.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 
 dist_pkgdata_DATA = \
   curves_00.bin \
diff -Naupr powermanga-0.90.orig/data/levels/curves_phase/Makefile.in powermanga-0.90/data/levels/curves_phase/Makefile.in
--- powermanga-0.90.orig/data/levels/curves_phase/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/levels/curves_phase/Makefile.in	2007-09-04 16:33:27.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/curves_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/curves_phase
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile powermanga-0.90/data/levels/grids_phase/Makefile
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile	2007-09-04 16:33:57.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile.am powermanga-0.90/data/levels/grids_phase/Makefile.am
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile.am	2007-07-13 08:22:53.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile.am	2007-09-04 16:33:44.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 
 dist_pkgdata_DATA = \
  grid_00.bin \
diff -Naupr powermanga-0.90.orig/data/levels/grids_phase/Makefile.in powermanga-0.90/data/levels/grids_phase/Makefile.in
--- powermanga-0.90.orig/data/levels/grids_phase/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/levels/grids_phase/Makefile.in	2007-09-04 16:33:51.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data/levels/grids_phase
+pkgdatadir = $(datadir)/powermanga/data/levels/grids_phase
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/data/Makefile powermanga-0.90/data/Makefile
--- powermanga-0.90.orig/data/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/data/Makefile	2007-09-04 16:17:22.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/data/Makefile.am powermanga-0.90/data/Makefile.am
--- powermanga-0.90.orig/data/Makefile.am	2007-07-13 09:07:28.000000000 +0200
+++ powermanga-0.90/data/Makefile.am	2007-09-04 16:16:54.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 
 dist_pkgdata_DATA = \
   menu_order_keystrokes.bin 
diff -Naupr powermanga-0.90.orig/data/Makefile.in powermanga-0.90/data/Makefile.in
--- powermanga-0.90.orig/data/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/data/Makefile.in	2007-09-04 16:17:12.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/data
+pkgdatadir = $(datadir)/powermanga/data
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile powermanga-0.90/graphics/bitmap/fonts/Makefile
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile	2007-09-04 17:08:20.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.am powermanga-0.90/graphics/bitmap/fonts/Makefile.am
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.am	2007-07-13 22:38:33.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile.am	2007-09-04 17:08:28.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 
 dist_pkgdata_DATA = \
   font_big.spr \
diff -Naupr powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.in powermanga-0.90/graphics/bitmap/fonts/Makefile.in
--- powermanga-0.90.orig/graphics/bitmap/fonts/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/fonts/Makefile.in	2007-09-04 17:08:40.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap/fonts
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile powermanga-0.90/graphics/bitmap/Makefile
--- powermanga-0.90.orig/graphics/bitmap/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile	2007-09-04 16:29:15.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile.am powermanga-0.90/graphics/bitmap/Makefile.am
--- powermanga-0.90.orig/graphics/bitmap/Makefile.am	2007-07-14 09:19:18.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile.am	2007-09-04 16:28:59.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 
 dist_pkgdata_DATA = \
   main_menu.spr \
diff -Naupr powermanga-0.90.orig/graphics/bitmap/Makefile.in powermanga-0.90/graphics/bitmap/Makefile.in
--- powermanga-0.90.orig/graphics/bitmap/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/bitmap/Makefile.in	2007-09-04 16:29:08.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/bitmap
+pkgdatadir = $(datadir)/powermanga/graphics/bitmap
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/Makefile powermanga-0.90/graphics/Makefile
--- powermanga-0.90.orig/graphics/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/Makefile	2007-09-04 16:20:30.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/Makefile.am powermanga-0.90/graphics/Makefile.am
--- powermanga-0.90.orig/graphics/Makefile.am	2007-08-02 18:19:51.000000000 +0200
+++ powermanga-0.90/graphics/Makefile.am	2007-09-04 16:20:15.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 
 dist_pkgdata_DATA = \
   256_colors_palette.bin \
diff -Naupr powermanga-0.90.orig/graphics/Makefile.in powermanga-0.90/graphics/Makefile.in
--- powermanga-0.90.orig/graphics/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/Makefile.in	2007-09-04 16:20:23.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics
+pkgdatadir = $(datadir)/powermanga/graphics
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile powermanga-0.90/graphics/sprites/guardians/Makefile
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile	2007-09-04 16:31:11.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile.am powermanga-0.90/graphics/sprites/guardians/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile.am	2007-07-13 21:25:51.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile.am	2007-09-04 16:30:53.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 
 dist_pkgdata_DATA = \
   guardian_00.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/guardians/Makefile.in powermanga-0.90/graphics/sprites/guardians/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/guardians/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/sprites/guardians/Makefile.in	2007-09-04 16:31:05.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/guardians
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/guardians
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile powermanga-0.90/graphics/sprites/Makefile
--- powermanga-0.90.orig/graphics/sprites/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile	2007-09-04 16:30:28.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile.am powermanga-0.90/graphics/sprites/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/Makefile.am	2007-07-13 21:46:20.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile.am	2007-09-04 16:30:14.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 
 dist_pkgdata_DATA = \
   all_enemies.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/Makefile.in powermanga-0.90/graphics/sprites/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/Makefile.in	2007-09-03 09:44:39.000000000 +0200
+++ powermanga-0.90/graphics/sprites/Makefile.in	2007-09-04 16:30:21.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites
+pkgdatadir = $(datadir)/powermanga/graphics/sprites
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile powermanga-0.90/graphics/sprites/meteors/Makefile
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile	2007-09-04 16:31:39.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile.am powermanga-0.90/graphics/sprites/meteors/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile.am	2007-07-12 21:30:55.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile.am	2007-09-04 16:31:24.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 
 dist_pkgdata_DATA = \
   meteor_00.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/meteors/Makefile.in powermanga-0.90/graphics/sprites/meteors/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/meteors/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/meteors/Makefile.in	2007-09-04 16:31:32.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/meteors
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/meteors
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile powermanga-0.90/graphics/sprites/spaceships/Makefile
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile	2007-09-04 16:32:02.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.am powermanga-0.90/graphics/sprites/spaceships/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.am	2007-07-13 13:06:05.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile.am	2007-09-04 16:31:49.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 
 dist_pkgdata_DATA = \
   spaceship_1_frame_0.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.in powermanga-0.90/graphics/sprites/spaceships/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/spaceships/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/spaceships/Makefile.in	2007-09-04 16:31:55.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/spaceships
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/spaceships
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile powermanga-0.90/graphics/sprites/stars/Makefile
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile	2007-09-04 16:32:23.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile.am powermanga-0.90/graphics/sprites/stars/Makefile.am
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile.am	2007-07-13 20:22:31.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile.am	2007-09-04 16:32:10.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 
 dist_pkgdata_DATA = \
   star_big_0.spr \
diff -Naupr powermanga-0.90.orig/graphics/sprites/stars/Makefile.in powermanga-0.90/graphics/sprites/stars/Makefile.in
--- powermanga-0.90.orig/graphics/sprites/stars/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/graphics/sprites/stars/Makefile.in	2007-09-04 16:32:17.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/graphics/sprites/stars
+pkgdatadir = $(datadir)/powermanga/graphics/sprites/stars
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/Makefile powermanga-0.90/Makefile
--- powermanga-0.90.orig/Makefile	2007-09-03 09:45:01.000000000 +0200
+++ powermanga-0.90/Makefile	2007-09-04 16:37:08.000000000 +0200
@@ -81,7 +81,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/Makefile.am powermanga-0.90/Makefile.am
--- powermanga-0.90.orig/Makefile.am	2007-08-13 08:43:21.000000000 +0200
+++ powermanga-0.90/Makefile.am	2007-09-04 16:36:19.000000000 +0200
@@ -2,6 +2,6 @@
 SUBDIRS = texts src graphics graphics/bitmap graphics/bitmap/fonts graphics/sprites graphics/sprites/guardians graphics/sprites/stars graphics/sprites/meteors graphics/sprites/spaceships data data/curves data/levels/curves_phase data/levels/grids_phase sounds sounds/handheld_console
 EXTRA_DIST = bootstrap
 
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 dist_pkgdata_DATA = powermanga.6
 
diff -Naupr powermanga-0.90.orig/Makefile.in powermanga-0.90/Makefile.in
--- powermanga-0.90.orig/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/Makefile.in	2007-09-04 16:37:00.000000000 +0200
@@ -81,7 +81,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-pkgdatadir = $(mandir)
+pkgdatadir = $(mandir)/man6
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile powermanga-0.90/sounds/handheld_console/Makefile
--- powermanga-0.90.orig/sounds/handheld_console/Makefile	2007-09-03 09:45:03.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile	2007-09-04 16:34:27.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile.am powermanga-0.90/sounds/handheld_console/Makefile.am
--- powermanga-0.90.orig/sounds/handheld_console/Makefile.am	2007-08-13 08:43:23.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile.am	2007-09-04 16:34:15.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 dist_pkgdata_DATA = \
   music_congratulations.ogg \
   music_game.ogg \
diff -Naupr powermanga-0.90.orig/sounds/handheld_console/Makefile.in powermanga-0.90/sounds/handheld_console/Makefile.in
--- powermanga-0.90.orig/sounds/handheld_console/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/sounds/handheld_console/Makefile.in	2007-09-04 16:34:21.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sound/handheld_console
+pkgdatadir = $(datadir)/powermanga/sound/handheld_console
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/sounds/Makefile powermanga-0.90/sounds/Makefile
--- powermanga-0.90.orig/sounds/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/sounds/Makefile	2007-09-04 16:21:05.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/sounds/Makefile.am powermanga-0.90/sounds/Makefile.am
--- powermanga-0.90.orig/sounds/Makefile.am	2007-08-13 08:43:22.000000000 +0200
+++ powermanga-0.90/sounds/Makefile.am	2007-09-04 16:20:49.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 
 dist_pkgdata_DATA = \
   music_congratulations.zik \
diff -Naupr powermanga-0.90.orig/sounds/Makefile.in powermanga-0.90/sounds/Makefile.in
--- powermanga-0.90.orig/sounds/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/sounds/Makefile.in	2007-09-04 16:20:58.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/sounds
+pkgdatadir = $(datadir)/powermanga/sounds
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
diff -Naupr powermanga-0.90.orig/src/Makefile powermanga-0.90/src/Makefile
--- powermanga-0.90.orig/src/Makefile	2007-09-03 09:45:02.000000000 +0200
+++ powermanga-0.90/src/Makefile	2007-09-04 16:28:42.000000000 +0200
@@ -224,7 +224,7 @@ target_os = linux-gnu
 target_vendor = pc
 top_builddir = ..
 top_srcdir = ..
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
@@ -1271,13 +1271,13 @@ uninstall-am: uninstall-gamesPROGRAMS
 
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 # 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.
diff -Naupr powermanga-0.90.orig/src/Makefile.am powermanga-0.90/src/Makefile.am
--- powermanga-0.90.orig/src/Makefile.am	2007-08-31 22:46:43.000000000 +0200
+++ powermanga-0.90/src/Makefile.am	2007-09-04 16:27:50.000000000 +0200
@@ -1,5 +1,5 @@
 
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 
@@ -10,13 +10,13 @@ powermanga_CFLAGS = -DPREFIX=\"$(prefix)
 powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 
 if ASSEMBLY
diff -Naupr powermanga-0.90.orig/src/Makefile.in powermanga-0.90/src/Makefile.in
--- powermanga-0.90.orig/src/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/src/Makefile.in	2007-09-04 16:28:23.000000000 +0200
@@ -224,7 +224,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-gamesdir = $(prefix)/games
+gamesdir = $(bindir)
 scoredir = /var/games
 score = powermanga.hi
 powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
@@ -1271,13 +1271,13 @@ uninstall-am: uninstall-gamesPROGRAMS
 
 
 install-data-hook:
-	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
-	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
-	$(INSTALL) -d $(DESTDIR)/$(scoredir)
+	-chown root:games "$(DESTDIR)$(gamesdir)/powermanga"
+	-chmod 2755 "$(DESTDIR)$(gamesdir)/powermanga"
+	$(INSTALL) -d $(DESTDIR)$(scoredir)
 	-for suffix in "-easy" "" "-hard"; do \
-	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
+	  touch "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chown root:games "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
+	  chmod 644 "$(DESTDIR)$(scoredir)/$(score)$$suffix"; \
 	done
 # 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.
diff -Naupr powermanga-0.90.orig/src/tools.c powermanga-0.90/src/tools.c
--- powermanga-0.90.orig/src/tools.c	2007-08-31 22:46:43.000000000 +0200
+++ powermanga-0.90/src/tools.c	2007-09-04 17:05:55.000000000 +0200
@@ -498,7 +498,7 @@ locate_data_file (const char *const name
 #else
   struct stat s;
 #endif
-  const char *subdir = "/share/games/powermanga/";
+  const char *subdir = "/share/powermanga/";
 
   if (name == NULL)
     {
diff -Naupr powermanga-0.90.orig/texts/Makefile powermanga-0.90/texts/Makefile
--- powermanga-0.90.orig/texts/Makefile	2007-09-03 09:45:03.000000000 +0200
+++ powermanga-0.90/texts/Makefile	2007-09-04 16:21:32.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 ACLOCAL = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run aclocal-1.10
 AMTAR = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run tar
 AUTOCONF = ${SHELL} /home/bruno/dev/tempo/powermanga-0.90/autotools/missing --run autoconf
diff -Naupr powermanga-0.90.orig/texts/Makefile.am powermanga-0.90/texts/Makefile.am
--- powermanga-0.90.orig/texts/Makefile.am	2007-07-13 13:24:49.000000000 +0200
+++ powermanga-0.90/texts/Makefile.am	2007-09-04 16:21:16.000000000 +0200
@@ -1,5 +1,5 @@
 
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 
 dist_pkgdata_DATA = \
   about_en.txt \
diff -Naupr powermanga-0.90.orig/texts/Makefile.in powermanga-0.90/texts/Makefile.in
--- powermanga-0.90.orig/texts/Makefile.in	2007-09-03 09:44:40.000000000 +0200
+++ powermanga-0.90/texts/Makefile.in	2007-09-04 16:21:24.000000000 +0200
@@ -54,7 +54,7 @@ am__installdirs = "$(DESTDIR)$(pkgdatadi
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/games/powermanga/texts
+pkgdatadir = $(datadir)/powermanga/texts
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2006 15:38:49 -0000	1.3
+++ .cvsignore	5 Sep 2007 11:55:43 -0000	1.4
@@ -1 +1 @@
-powermanga-0.80.tgz
+powermanga-0.90.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- powermanga.spec	22 Aug 2007 18:56:36 -0000	1.17
+++ powermanga.spec	5 Sep 2007 11:55:43 -0000	1.18
@@ -1,17 +1,22 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.80
-Release: 6
-License: GPLv2+
+Version: 0.90
+Release: 1
+License: GPLv3+
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
 Source2: powermanga.desktop
-Patch0: powermanga-0.80-install.patch
+Patch0: powermanga-0.90-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+BuildRequires: gawk
 BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: zlib-devel
+BuildRequires: libpng-devel
+BuildRequires: desktop-file-utils
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -25,7 +30,8 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
+# The original configure script sets that mandatory -std=c99
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -std=c99"
 
 
 %install
@@ -47,10 +53,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE2}
 
-# Workaround for the "texts" dir not being installed, although it's needed
-%{__mkdir_p} %{buildroot}%{_datadir}/powermanga/texts
-%{__install} -p -m 0644 texts/*.txt \
-    %{buildroot}%{_datadir}/powermanga/texts/
+# Default to English
 echo "Lang=en" > \
     %{buildroot}%{_datadir}/powermanga/texts/config.ini
 
@@ -83,6 +86,13 @@
 
 
 %changelog
+* Mon Sep  3 2007 Matthias Saou <http://freshrpms.net/> 0.90-1
+- Update to 0.90.
+- Update License field (changed to GPLv3+).
+- Update install patch, include fix for "fonts" directory.
+- No longer manually install texts, but install the config.ini.
+- Add gawk and libpng-devel build requirements.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.80-6
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2006 15:38:49 -0000	1.3
+++ sources	5 Sep 2007 11:55:43 -0000	1.4
@@ -1 +1 @@
-8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz
+0465ca49dc85e3943a06b3da7e0b92ad  powermanga-0.90.tgz


--- powermanga-0.80-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 12:00:49 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 08:00:49 -0400
Subject: rpms/python-twisted-mail/devel .cvsignore, 1.2,
	1.3 python-twisted-mail.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051200.l85C0npq010027@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935

Modified Files:
	.cvsignore python-twisted-mail.spec sources 
Log Message:
update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2007 10:17:00 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:00:16 -0000	1.3
@@ -1 +1 @@
-TwistedMail-0.3.0.tar.bz2
+TwistedMail-0.4.0.tar.bz2


Index: python-twisted-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/python-twisted-mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-mail.spec	4 Jan 2007 10:17:00 -0000	1.1
+++ python-twisted-mail.spec	5 Sep 2007 12:00:16 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedMail
 
 Name:           %{python}-twisted-mail
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted Mail library, server and client
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.3/TwistedMail-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.4/TwistedMail-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-names
 
 # a noarch-turned-arch package should not have debuginfo
@@ -75,6 +75,10 @@
 %{python_sitearch}/twisted/plugins/twisted_mail.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- new version
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-4
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 10:17:00 -0000	1.2
+++ sources	5 Sep 2007 12:00:16 -0000	1.3
@@ -1 +1 @@
-33667938b399ee5513c59b5d4087294b  TwistedMail-0.3.0.tar.bz2
+b2e1428b527333878434777f284f0e91  TwistedMail-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 12:01:03 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 08:01:03 -0400
Subject: rpms/python-twisted-mail/F-7 python-twisted-mail.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051201.l85C1323012620@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9958

Modified Files:
	python-twisted-mail.spec sources 
Log Message:
update to 0.4.0


Index: python-twisted-mail.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/F-7/python-twisted-mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-mail.spec	4 Jan 2007 10:17:00 -0000	1.1
+++ python-twisted-mail.spec	5 Sep 2007 12:00:30 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedMail
 
 Name:           %{python}-twisted-mail
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A Twisted Mail library, server and client
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.3/TwistedMail-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Mail/0.4/TwistedMail-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-names
 
 # a noarch-turned-arch package should not have debuginfo
@@ -75,6 +75,10 @@
 %{python_sitearch}/twisted/plugins/twisted_mail.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.0-1
+- new version
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.3.0-4
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-mail/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 10:17:00 -0000	1.2
+++ sources	5 Sep 2007 12:00:30 -0000	1.3
@@ -1 +1 @@
-33667938b399ee5513c59b5d4087294b  TwistedMail-0.3.0.tar.bz2
+b2e1428b527333878434777f284f0e91  TwistedMail-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 12:06:06 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 5 Sep 2007 08:06:06 -0400
Subject: rpms/docbook-style-xsl/F-7 .cvsignore, 1.17,
	1.18 docbook-style-xsl.spec, 1.32, 1.33 sources, 1.17, 1.18
Message-ID: <200709051206.l85C66XW016276@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16205

Modified Files:
	.cvsignore docbook-style-xsl.spec sources 
Log Message:
new usptream version(fixes #277631)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Jan 2007 23:11:59 -0000	1.17
+++ .cvsignore	5 Sep 2007 12:05:32 -0000	1.18
@@ -1,14 +1,2 @@
-docbook-xsl-1.65.1.tar.gz
-docbook-xsl-1.66.1.tar.gz
-docbook-xsl-1.67.0.tar.gz
-docbook-xsl-1.67.2.tar.bz2
-docbook-xsl-1.68.0.tar.bz2
-docbook-xsl-1.68.1.tar.bz2
-docbook-xsl-1.69.0.tar.bz2
-docbook-xsl-doc-1.69.0.tar.bz2
-docbook-xsl-1.69.1.tar.bz2
-docbook-xsl-doc-1.69.1.tar.bz2
-docbook-xsl-1.71.1.tar.bz2
-docbook-xsl-doc-1.71.1.tar.bz2
-docbook-xsl-1.72.0.tar.gz
-docbook-xsl-doc-1.72.0.tar.bz2
+docbook-xsl-doc-1.73.2.tar.bz2
+docbook-xsl-1.73.2.tar.gz


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/docbook-style-xsl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- docbook-style-xsl.spec	24 Jan 2007 12:56:26 -0000	1.32
+++ docbook-style-xsl.spec	5 Sep 2007 12:05:32 -0000	1.33
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.72.0
-Release: 2%{?dist}
+Version: 1.73.2
+Release: 1%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
+- new upstream(required for fix of #277631
+
 * Wed Jan 24 2007 Tomas Mraz <tmraz at redhat.com> 1.72.0-2
 - Install missing *.ent from common.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Jan 2007 23:11:59 -0000	1.17
+++ sources	5 Sep 2007 12:05:32 -0000	1.18
@@ -1,2 +1,2 @@
-3493dd2e82e0da3d3cab58d5263c634c  docbook-xsl-1.72.0.tar.gz
-f6b71552c992f16f477f0513f569985c  docbook-xsl-doc-1.72.0.tar.bz2
+d41ce59b783b60383cca765902a41039  docbook-xsl-doc-1.73.2.tar.bz2
+7dd72a38c7d25e1396fa26b6ee53eae9  docbook-xsl-1.73.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:35:49 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:35:49 -0400
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051235.l85CZnSE017045@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:00:35 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:35:16 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:00:35 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:35:16 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:00:35 -0000	1.2
+++ sources	5 Sep 2007 12:35:16 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:38:47 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:38:47 -0400
Subject: rpms/audio-convert-mod/F-7 .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051238.l85Cclgg017180@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17154

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:07:24 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:38:14 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:07:24 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:38:14 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:07:24 -0000	1.2
+++ sources	5 Sep 2007 12:38:14 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:41:16 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Wed, 5 Sep 2007 08:41:16 -0400
Subject: rpms/pavucontrol/devel pavucontrol.spec,1.3,1.4
Message-ID: <200709051241.l85CfGPj017274@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17254/devel

Modified Files:
	pavucontrol.spec 
Log Message:
Add versioned dependency on pulseaudio-libs


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pavucontrol.spec	5 Sep 2007 00:30:52 -0000	1.3
+++ pavucontrol.spec	5 Sep 2007 12:40:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.2.svn20070905%{?dist}
+Release:        0.3.svn20070905%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:  pulseaudio-lib-devel gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
+Requires:	pulseaudio-lib >= 0.9.7-0.10
 
 %description
 PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
@@ -53,6 +54,9 @@
 
 
 %changelog
+* Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.3.svn20070905
+- Add versioned dependency on pulseaudio-libs
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.2.svn20070905
 - Update from SVN snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep  5 12:42:35 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Wed, 5 Sep 2007 08:42:35 -0400
Subject: rpms/audio-convert-mod/FC-6 .cvsignore, 1.2,
	1.3 audio-convert-mod.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051242.l85CgZOU017320@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17290

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
Update to 3.45.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2007 20:07:49 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:42:03 -0000	1.3
@@ -1 +1 @@
-audio-convert-mod-3.45.1.tar.gz
+audio-convert-mod-3.45.2.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/audio-convert-mod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audio-convert-mod.spec	3 Sep 2007 20:07:49 -0000	1.1
+++ audio-convert-mod.spec	5 Sep 2007 12:42:03 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
-Version:           3.45.1
+Version:           3.45.2
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -59,6 +59,10 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
+- Update to 3.45.2 (see CHANGELOG file for details on version changes)
+- Fixes RH#277871
+
 * Fri Aug 24 2007 Stewart Adam <s.adam at diffingo.com> 3.45.1-1
 - Update to 3.45.1 (see CHANGELOG file for details on version changes)
 - Remove uninstall script from package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2007 20:07:49 -0000	1.2
+++ sources	5 Sep 2007 12:42:03 -0000	1.3
@@ -1 +1 @@
-899db3d0ae12e0e226cc9d6eb8ef1e4a  audio-convert-mod-3.45.1.tar.gz
+22e309010837b60b60194c0e052b4cd8  audio-convert-mod-3.45.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 12:43:12 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Wed, 5 Sep 2007 08:43:12 -0400
Subject: rpms/pavucontrol/devel pavucontrol.spec,1.4,1.5
Message-ID: <200709051243.l85ChCHr017390@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17362

Modified Files:
	pavucontrol.spec 
Log Message:
make build-time dependency versioned, too


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pavucontrol.spec	5 Sep 2007 12:40:43 -0000	1.4
+++ pavucontrol.spec	5 Sep 2007 12:42:39 -0000	1.5
@@ -10,7 +10,8 @@
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-lib-devel gtkmm24-devel libglademm24-devel
+BuildRequires:  pulseaudio-lib-devel >= 0.9.7-0.10
+BuildRequires:  gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
 Requires:	pulseaudio-lib >= 0.9.7-0.10



From fedora-extras-commits at redhat.com  Wed Sep  5 12:46:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 08:46:36 -0400
Subject: rpms/ppracer/devel ppracer.spec,1.19,1.20
Message-ID: <200709051246.l85Ckaef017485@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17467

Modified Files:
	ppracer.spec 
Log Message:
change license to GPLv2+



Index: ppracer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ppracer.spec	14 Feb 2007 14:29:59 -0000	1.19
+++ ppracer.spec	5 Sep 2007 12:46:03 -0000	1.20
@@ -7,8 +7,8 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 10%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2+
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +94,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 0.3.1-11
+- change license to GPLv2+
+
 * Wed Feb 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.3.1-10
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep  5 12:47:06 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 05 Sep 2007 05:47:06 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709051247.l85Cl6R3015211@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kaffeine (Fedora devel) to Approved for Mary Ellen Foster (mef)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep  5 12:47:07 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 05 Sep 2007 05:47:07 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709051247.l85Cl7U9015220@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kaffeine (Fedora devel) to Approved for Mary Ellen Foster (mef)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep  5 12:52:14 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 08:52:14 -0400
Subject: devel/squashfs-tools squashfs-tools.spec,1.14,1.15
Message-ID: <200709051252.l85CqEDq017611@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/squashfs-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17586

Modified Files:
	squashfs-tools.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2-2
- fixes from package review (#226430)



Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/squashfs-tools/squashfs-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- squashfs-tools.spec	4 Sep 2007 00:09:45 -0000	1.14
+++ squashfs-tools.spec	5 Sep 2007 12:51:42 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 3.2
-Release: 1
+Release: 2
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
@@ -41,6 +41,9 @@
 %{_sbindir}/unsquashfs
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2-2
+- fixes from package review (#226430)
+
 * Tue Mar 20 2007 Jeremy Katz <katzj at redhat.com> - 3.2-1
 - update to 3.2r2
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:00:16 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:00:16 -0400
Subject: rpms/python-twisted-news/devel .cvsignore, 1.2,
	1.3 python-twisted-news.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051300.l85D0GmU017918@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-news/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17863

Modified Files:
	.cvsignore python-twisted-news.spec sources 
Log Message:
updated to 0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2007 11:26:54 -0000	1.2
+++ .cvsignore	5 Sep 2007 12:59:43 -0000	1.3
@@ -1 +1 @@
-TwistedNews-0.2.0.tar.bz2
+TwistedNews-0.3.0.tar.bz2


Index: python-twisted-news.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/python-twisted-news.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-news.spec	4 Jan 2007 11:26:54 -0000	1.1
+++ python-twisted-news.spec	5 Sep 2007 12:59:43 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNews
 
 Name:           %{python}-twisted-news
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Twisted News is an NNTP server and programming library
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.2/TwistedNews-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.3/TwistedNews-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-mail
 
 # a noarch-turned-arch package should not have debuginfo
@@ -63,6 +63,10 @@
 %{python_sitearch}/twisted/plugins/twisted_news.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.3.0-1
+- update to latest release
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 11:26:54 -0000	1.2
+++ sources	5 Sep 2007 12:59:43 -0000	1.3
@@ -1 +1 @@
-62a93645867bacad4a4ca4d45e9ce090  TwistedNews-0.2.0.tar.bz2
+cacbebf47882e57ca04d5c2ec3601830  TwistedNews-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:00:21 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:00:21 -0400
Subject: rpms/python-twisted-news/F-7 python-twisted-news.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051300.l85D0LCW017956@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-news/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886

Modified Files:
	python-twisted-news.spec sources 
Log Message:
update to 0.3.0


Index: python-twisted-news.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/F-7/python-twisted-news.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-news.spec	4 Jan 2007 11:26:54 -0000	1.1
+++ python-twisted-news.spec	5 Sep 2007 12:59:49 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedNews
 
 Name:           %{python}-twisted-news
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Twisted News is an NNTP server and programming library
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.2/TwistedNews-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/News/0.3/TwistedNews-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  python-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 Requires:       %{python}-twisted-mail
 
 # a noarch-turned-arch package should not have debuginfo
@@ -63,6 +63,10 @@
 %{python_sitearch}/twisted/plugins/twisted_news.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.3.0-1
+- update to latest release
+
 * Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.0-3
 - add python-devel BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-news/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2007 11:26:54 -0000	1.2
+++ sources	5 Sep 2007 12:59:49 -0000	1.3
@@ -1 +1 @@
-62a93645867bacad4a4ca4d45e9ce090  TwistedNews-0.2.0.tar.bz2
+cacbebf47882e57ca04d5c2ec3601830  TwistedNews-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:02:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 09:02:40 -0400
Subject: rpms/bzflag/devel bzflag.spec,1.30,1.31
Message-ID: <200709051302.l85D2eTc023982@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23946

Modified Files:
	bzflag.spec 
Log Message:
change license tag from LGPL to LGPLv2, the licensing is a bit ambigious about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to clarify this: http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248



Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bzflag.spec	22 Jun 2007 21:09:45 -0000	1.30
+++ bzflag.spec	5 Sep 2007 13:02:06 -0000	1.31
@@ -16,8 +16,8 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.8
-Release: 4%{?dist}
-License: LGPL
+Release: 5%{?dist}
+License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
@@ -96,6 +96,12 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-5
+- change license tag from LGPL to LGPLv2, the licensing is a bit ambigious
+  about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to
+  clarify this:
+  http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248
+
 * Fri Jun 22 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license tag from GPL to LGPL
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:04:45 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 5 Sep 2007 09:04:45 -0400
Subject: rpms/ejabberd/devel .cvsignore, 1.4, 1.5 ejabberd.spec, 1.13,
	1.14 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709051304.l85D4jGe024093@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24065

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:21:08 -0000	1.4
+++ .cvsignore	5 Sep 2007 13:04:12 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ejabberd.spec	4 Sep 2007 12:26:54 -0000	1.13
+++ ejabberd.spec	5 Sep 2007 13:04:12 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 14:03:27 -0000	1.2
+++ mod_ctlextra.erl	5 Sep 2007 13:04:12 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:21:08 -0000	1.4
+++ sources	5 Sep 2007 13:04:12 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 13:50:03 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 09:50:03 -0400
Subject: rpms/rsync/devel rsync-2.6.9-hlink-segv.patch, NONE, 1.1 rsync.spec,
	1.42, 1.43
Message-ID: <200709051350.l85Do3Qe025246@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.9-hlink-segv.patch 
Log Message:

Fix bug 244564



rsync-2.6.9-hlink-segv.patch:

--- NEW FILE rsync-2.6.9-hlink-segv.patch ---
--- rsync-2.6.9-orig/hlink.c	2007-06-17 11:51:28.000000000 +0200
+++ rsync-2.6.9/hlink.c	2007-06-17 11:58:22.000000000 +0200
@@ -315,6 +315,9 @@ void hard_link_cluster(struct file_struc
 		if (file->F_HLINDEX != SKIPPED_LINK)
 			continue;
 		hlink2 = f_name(file, NULL);
+#ifdef SUPPORT_ACLS
+		sx.acc_acl = sx.def_acl = NULL;
+#endif
 		statret = link_stat(hlink2, &sx.st, 0);
 		maybe_hard_link(file, ndx, hlink2, statret, &sx,
 				hlink1, &st, itemizing, code);


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.spec	19 Feb 2007 23:12:06 -0000	1.42
+++ rsync.spec	5 Sep 2007 13:49:27 -0000	1.43
@@ -1,17 +1,18 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
+Patch2: rsync-2.6.9-hlink-segv.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
-License: GPL
+License: GPLv2+
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -29,6 +30,7 @@
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 %patch1 -p1 -b .acl_xattrs_bug
+%patch2 -p1 -b .hlink_segv
 
 %build
 rm -fr autom4te.cache
@@ -58,6 +60,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc8
+- Add patch to fix crash bug with hardlinks and ACLs patches
+
 * Mon Feb 19 2007 Adam Jackson <ajax at redhat.com> 2.6.9-2
 - Add dist tag to Release to fix upgrades from FC5 or FC6.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:50:50 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Wed, 5 Sep 2007 09:50:50 -0400
Subject: rpms/revisor/devel revisor.spec,1.21,1.22 sources,1.24,1.25
Message-ID: <200709051350.l85DooQO025326@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256/devel

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-1rc6



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- revisor.spec	30 Aug 2007 12:38:42 -0000	1.21
+++ revisor.spec	5 Sep 2007 13:50:17 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc5%{?dist}
+Release: 1rc6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -17,15 +17,15 @@
 # Translation
 Requires: rhpl
 # Kickstart
-Requires: system-config-kickstart, pykickstart > 0.43
+Requires: system-config-kickstart, pykickstart
 # Compose tools
-Requires: pungi, livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
 Requires: notify-python
 Requires: usermode
 Requires: pam
 # At least these requirements are invalid for EPEL
-Requires: python >= 2.5
+Requires: python >= 2.4
 Requires: fedora-release >= 7
 BuildArch: noarch
 ExcludeArch: ppc ppc64
@@ -170,7 +170,9 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Thu Aug 30 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc5
+* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+- Removed pungi dependency
+- Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5
 - Split comps in their own package
 - Add rebrand module


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Aug 2007 12:38:42 -0000	1.24
+++ sources	5 Sep 2007 13:50:17 -0000	1.25
@@ -1 +1 @@
-664dd74d6f0084d557c746e550edcea8  revisor-2.0.4.3.tar.gz
+cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 13:52:03 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Wed, 5 Sep 2007 09:52:03 -0400
Subject: rpms/revisor/F-7 revisor.spec,1.15,1.16 sources,1.16,1.17
Message-ID: <200709051352.l85Dq3I0025452@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25392/F-7

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-1rc6



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/revisor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- revisor.spec	30 Aug 2007 12:45:01 -0000	1.15
+++ revisor.spec	5 Sep 2007 13:51:30 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc5%{?dist}
+Release: 1rc6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -17,15 +17,15 @@
 # Translation
 Requires: rhpl
 # Kickstart
-Requires: system-config-kickstart, pykickstart > 0.43
+Requires: system-config-kickstart, pykickstart
 # Compose tools
-Requires: pungi, livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
 Requires: notify-python
 Requires: usermode
 Requires: pam
 # At least these requirements are invalid for EPEL
-Requires: python >= 2.5
+Requires: python >= 2.4
 Requires: fedora-release >= 7
 BuildArch: noarch
 ExcludeArch: ppc ppc64
@@ -170,7 +170,9 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Thu Aug 30 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc5
+* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+- Removed pungi dependency
+- Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5
 - Split comps in their own package
 - Add rebrand module


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 12:45:01 -0000	1.16
+++ sources	5 Sep 2007 13:51:30 -0000	1.17
@@ -1 +1 @@
-664dd74d6f0084d557c746e550edcea8  revisor-2.0.4.3.tar.gz
+cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 13:52:57 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:52:57 -0400
Subject: rpms/python-twisted-words/devel .cvsignore, 1.2,
	1.3 python-twisted-words.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709051352.l85DqvRp025602@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-words/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517

Modified Files:
	.cvsignore python-twisted-words.spec sources 
Log Message:
update to 0.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Dec 2006 23:19:24 -0000	1.2
+++ .cvsignore	5 Sep 2007 13:52:24 -0000	1.3
@@ -1 +1 @@
-TwistedWords-0.4.0.tar.bz2
+TwistedWords-0.5.0.tar.bz2


Index: python-twisted-words.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/python-twisted-words.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-words.spec	28 Dec 2006 23:19:24 -0000	1.1
+++ python-twisted-words.spec	5 Sep 2007 13:52:24 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedWords
 
 Name:           %{python}-twisted-words
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Twisted Words contains Instant Messaging implementations
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.4/TwistedWords-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.5/TwistedWords-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -74,6 +74,10 @@
 %{python_sitearch}/twisted/plugins/twisted_words.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.5.0-1
+- updated to latest version
+
 * Wed Dec 27 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.4.0-3
 - BR python-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Dec 2006 23:19:24 -0000	1.2
+++ sources	5 Sep 2007 13:52:24 -0000	1.3
@@ -1 +1 @@
-37d34da233aefe4a7a41b97bc9222b6a  TwistedWords-0.4.0.tar.bz2
+7004f93a2358abe093bed55c2fff25ef  TwistedWords-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:53:06 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 5 Sep 2007 09:53:06 -0400
Subject: rpms/python-twisted-words/F-7 python-twisted-words.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709051353.l85Dr6OJ025643@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-words/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547

Modified Files:
	python-twisted-words.spec sources 
Log Message:
update to 0.5.0


Index: python-twisted-words.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/F-7/python-twisted-words.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-words.spec	28 Dec 2006 23:19:24 -0000	1.1
+++ python-twisted-words.spec	5 Sep 2007 13:52:34 -0000	1.2
@@ -5,17 +5,17 @@
 %define origname TwistedWords
 
 Name:           %{python}-twisted-words
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Twisted Words contains Instant Messaging implementations
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.twistedmatrix.com
-Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.4/TwistedWords-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Words/0.5/TwistedWords-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{python}-twisted-core >= 2.4.0
+BuildRequires:  %{python}-twisted-core >= 2.5.0
 BuildRequires:  %{python}-devel
 
 # for FC3 and earlier
@@ -23,7 +23,7 @@
 Requires:       python(abi) = %{pybasever}
 %endif
 
-Requires:       %{python}-twisted-core
+Requires:       %{python}-twisted-core >= 2.5.0
 
 # a noarch-turned-arch package should not have debuginfo
 %define debug_package %{nil}
@@ -74,6 +74,10 @@
 %{python_sitearch}/twisted/plugins/twisted_words.py*
 
 %changelog
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.5.0-1
+- updated to latest version
+
 * Wed Dec 27 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.4.0-3
 - BR python-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-words/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Dec 2006 23:19:24 -0000	1.2
+++ sources	5 Sep 2007 13:52:34 -0000	1.3
@@ -1 +1 @@
-37d34da233aefe4a7a41b97bc9222b6a  TwistedWords-0.4.0.tar.bz2
+7004f93a2358abe093bed55c2fff25ef  TwistedWords-0.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 13:57:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 09:57:27 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.4, 1.5
Message-ID: <200709051357.l85DvRap025836@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25783

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:56:54 -0000	1.5
@@ -2,7 +2,7 @@
 Version: 	0.63
 Release: 	5%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 13:59:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 09:59:34 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/F-7 perl-ExtUtils-AutoInstall.spec,
	1.4, 1.5
Message-ID: <200709051359.l85DxYqM025954@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25931

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:59:01 -0000	1.5
@@ -2,7 +2,7 @@
 Version: 	0.63
 Release: 	5%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:01:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:01:44 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/devel perl-ExtUtils-AutoInstall.spec,
	1.5, 1.6
Message-ID: <200709051401.l85E1iss031970@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31668

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
bump release.


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:56:54 -0000	1.5
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:01:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Wed Sep  5 14:03:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:03:32 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/F-7 perl-ExtUtils-AutoInstall.spec,
	1.5, 1.6
Message-ID: <200709051403.l85E3W0p032093@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32058

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
bump release.


Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/F-7/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2007 13:59:01 -0000	1.5
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:02:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Wed Sep  5 14:04:40 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 10:04:40 -0400
Subject: rpms/rsync/F-7 rsync-2.6.9-hlink-segv.patch, NONE, 1.1 rsync.spec, 
	1.42, 1.43
Message-ID: <200709051404.l85E4enP032243@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32156

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.9-hlink-segv.patch 
Log Message:
* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc7
- Add patch to fix crash bug with hardlinks and ACLs patches


rsync-2.6.9-hlink-segv.patch:

--- NEW FILE rsync-2.6.9-hlink-segv.patch ---
--- rsync-2.6.9-orig/hlink.c	2007-06-17 11:51:28.000000000 +0200
+++ rsync-2.6.9/hlink.c	2007-06-17 11:58:22.000000000 +0200
@@ -315,6 +315,9 @@ void hard_link_cluster(struct file_struc
 		if (file->F_HLINDEX != SKIPPED_LINK)
 			continue;
 		hlink2 = f_name(file, NULL);
+#ifdef SUPPORT_ACLS
+		sx.acc_acl = sx.def_acl = NULL;
+#endif
 		statret = link_stat(hlink2, &sx.st, 0);
 		maybe_hard_link(file, ndx, hlink2, statret, &sx,
 				hlink1, &st, itemizing, code);


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-7/rsync.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.spec	19 Feb 2007 23:12:06 -0000	1.42
+++ rsync.spec	5 Sep 2007 14:04:07 -0000	1.43
@@ -1,17 +1,18 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
+Patch2: rsync-2.6.9-hlink-segv.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
-License: GPL
+License: GPLv2+
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -29,6 +30,7 @@
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 %patch1 -p1 -b .acl_xattrs_bug
+%patch2 -p1 -b .hlink_segv
 
 %build
 rm -fr autom4te.cache
@@ -58,6 +60,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Sep 5 2007 Simo Sorce <ssorce at redhat.com> 2.6.9-3.fc7
+- Add patch to fix crash bug with hardlinks and ACLs patches
+
 * Mon Feb 19 2007 Adam Jackson <ajax at redhat.com> 2.6.9-2
 - Add dist tag to Release to fix upgrades from FC5 or FC6.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:05:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 10:05:00 -0400
Subject: rpms/perl-ExtUtils-AutoInstall/FC-6 perl-ExtUtils-AutoInstall.spec, 
	1.4, 1.5
Message-ID: <200709051405.l85E50En032260@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32223

Modified Files:
	perl-ExtUtils-AutoInstall.spec 
Log Message:
* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
- Update license tag.
- BR: perl(ExtUtils::MakeMaker).
- BR: perl(CPAN).



Index: perl-ExtUtils-AutoInstall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/FC-6/perl-ExtUtils-AutoInstall.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-ExtUtils-AutoInstall.spec	5 Sep 2006 09:33:09 -0000	1.4
+++ perl-ExtUtils-AutoInstall.spec	5 Sep 2007 14:04:26 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-ExtUtils-AutoInstall
 Version: 	0.63
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Automatic install of dependencies via CPAN
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/ExtUtils-AutoInstall/
 Source: 	http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz
@@ -12,8 +12,10 @@
 BuildArch: 	noarch
 
 %{?_with_perl_CPANPLUS:BuildRequires:  perl(CPANPLUS) >= 0.043}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Sort::Versions) >= 1.2
 BuildRequires:	perl(LWP::Simple)
+BuildRequires:	perl(CPAN)
 
 %description
 ExtUtils::AutoInstall lets module writers specify a more sophisticated
@@ -48,6 +50,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 05 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-6
+- Update license tag.
+- BR: perl(ExtUtils::MakeMaker).
+- BR: perl(CPAN).
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.63-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:23:53 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 10:23:53 -0400
Subject: devel/fedora-logos fedora-logos.spec,1.79,1.80
Message-ID: <200709051423.l85ENrfD000360@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/fedora-logos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv328

Modified Files:
	fedora-logos.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
- merge back changes that got lost



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/devel/fedora-logos/fedora-logos.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- fedora-logos.spec	31 Aug 2007 15:48:07 -0000	1.79
+++ fedora-logos.spec	5 Sep 2007 14:23:21 -0000	1.80
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 7.92.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 Source1: infinity-grub.xpm.gz
@@ -22,10 +22,7 @@
 Conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
-# for /usr/share/icons/Bluecurve
-Requires: redhat-artwork
-# for /usr/share/icons/hicolor
-Requires: hicolor-icon-theme
+Requires(post): coreutils
 
 %description
 The fedora-logos package (the "Packages") contain image files which
@@ -161,9 +158,24 @@
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
+for i in 16 24 32 36 48 96; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
+  cp $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places/start-here.png
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/Bluecurve || :
+touch --no-create %{_datadir}/icons/Fedora || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Bluecurve || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Fedora || :
+fi
+
 %files
 %defattr(-, root, root)
 %doc COPYING
@@ -177,11 +189,15 @@
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/Bluecurve/*/apps/*
+%{_datadir}/icons/Fedora/*/places/*
 %{_datadir}/gnome-screensaver/*
 %{_datadir}/applications/screensavers/*
 #%{_datadir}/backgrounds/images/*
 #%{_datadir}/gnome-background-properties/*.xml
-
+# we multi-own these directories, so as not to require the packages that
+# provide them, thereby dragging in excess dependencies.
+%{_datadir}/icons/Bluecurve
+%{_datadir}/icons/hicolor
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh
 /usr/lib/anaconda-runtime/*.jpg
@@ -190,6 +206,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
+- merge back changes that got lost
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-3
 - fix grub splash image to be an actual image
 
@@ -209,6 +228,19 @@
   (requested by Paul Frields)
 - update license field to be more clear
 
+* Wed Jul 04 2007 Florian La Roche <laroche at redhat.com> 6.0.98-5
+- require coreutils for the %%post script
+
+* Fri Jun 15 2007 Adam Jackson <ajax at redhat.com> 6.0.98-4
+- Remove the Requires on redhat-artwork and fedora-icon-theme, and just
+  multi-own the directories.  Fixes some hilarious dependency chains.
+
+* Mon Apr 23 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-3
+- Clean up %%post scriptlet (#237428)
+
+* Fri Apr 20 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-2
+- Add a Fedora icon theme
+
 * Thu Apr 05 2007 Than Ngo <than at redhat.com> - 6.0.98-1
 - fix ksplash BlueCurve theme
 



From fedora-extras-commits at redhat.com  Wed Sep  5 14:25:24 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Wed, 5 Sep 2007 10:25:24 -0400
Subject: rpms/rsync/devel rsync.spec,1.43,1.44
Message-ID: <200709051425.l85EPOj6000445@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410

Modified Files:
	rsync.spec 
Log Message:

F8 requires an explicit popt-devel in BuildRequires now




Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rsync.spec	5 Sep 2007 13:49:27 -0000	1.43
+++ rsync.spec	5 Sep 2007 14:24:52 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.9
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
@@ -9,7 +9,7 @@
 Source1: rsync.xinetd
 Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
 Patch2: rsync-2.6.9-hlink-segv.patch
-BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
+BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 License: GPLv2+



From fedora-extras-commits at redhat.com  Wed Sep  5 14:50:22 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 5 Sep 2007 10:50:22 -0400
Subject: rpms/evolution/devel evolution.spec,1.286,1.287
Message-ID: <200709051450.l85EoMcF001157@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1128

Modified Files:
	evolution.spec 
Log Message:
Add a reminder comment for myself.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- evolution.spec	4 Sep 2007 05:05:26 -0000	1.286
+++ evolution.spec	5 Sep 2007 14:49:49 -0000	1.287
@@ -694,6 +694,9 @@
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
+# Look into re-enabling the inline-audio plugin once 2.12 ships.
+# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
+
 %changelog
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92



From fedora-extras-commits at redhat.com  Wed Sep  5 15:02:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:02:01 -0400
Subject: rpms/gkrellm/devel gkrellm.spec,1.10,1.11 gkrellmd.init,1.1,1.2
Message-ID: <200709051502.l85F210x007319@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7277

Modified Files:
	gkrellm.spec gkrellmd.init 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
- Rewrite gkrellmd init script: better LSB compliance, hddtemp
  interoperability, avoidance of X error messages, general cleanup.



Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gkrellm.spec	4 Sep 2007 16:57:14 -0000	1.10
+++ gkrellm.spec	5 Sep 2007 15:01:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
+- Rewrite gkrellmd init script: better LSB compliance, hddtemp
+  interoperability, avoidance of X error messages, general cleanup.
+
 * Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
 - Fix gnutls detection/build and use it instead of openssl.
 - Sync user and group creation with current Fedora guidelines.


Index: gkrellmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellmd.init	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellmd.init	5 Sep 2007 15:01:26 -0000	1.2
@@ -6,53 +6,70 @@
 # processname: gkrellmd
 # config: /etc/gkrellmd.conf
 
+### BEGIN INIT INFO
+# Provides: gkrellmd
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: hddtemp
+# Should-Stop: hddtemp
+# Short-Description: GNU Krell Monitors Server
+### END INIT INFO
+
 # source function library
 . /etc/rc.d/init.d/functions
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-# The process must be configured first.
-[ -f /etc/gkrellmd.conf ] || exit 0
-
-RETVAL=0
-
-prog="gkrellmd"
+exec=/usr/sbin/gkrellmd
+prog=${exec##*/}
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    if [ -f /etc/gkrellmd.conf ] ; then
+        echo -n $"Starting GNU Krell Monitors server ($prog): "
+        DISPLAY= daemon --user gkrellmd $exec -d
+        rv=$?
+        echo
+    else
+        action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false
+        rv=6
+    fi
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop() {
+    echo -n $"Stopping GNU Krell Monitors server ($prog): "
+    killproc $prog
+    rv=$?
+    [ $rv -eq 0 ] && rm -f $lockfile
+    echo
+    return $rv
+}
+
+restart() {
+    stop
+    start
+}
 
 case "$1" in
-  start)
-	echo -n $"Starting $prog: "
-        daemon --user gkrellmd /usr/sbin/gkrellmd -d
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd
-	echo
-	;;
-  stop)
-	echo -n $"Shutting down $prog: "
-	killproc gkrellmd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd
-	echo
-	;;
-  restart|reload|force-reload)
-        $0 stop
-        $0 start
-	RETVAL=$?
+    start|stop|restart)
+        $1
         ;;
-  condrestart|try-restart)
-        if [ -f /var/lock/subsys/gkrellmd ]; then
-                $0 stop
-		$0 start
+    force-reload)
+        restart
+        ;;
+    status)
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
         fi
-	RETVAL=$?
         ;;
-  status)
-        status gkrellmd
-	RETVAL=$?
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL



From fedora-extras-commits at redhat.com  Wed Sep  5 15:20:07 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:20:07 -0400
Subject: rpms/xsane/devel xsane.spec,1.48,1.49
Message-ID: <200709051520.l85FK7dD007957@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935

Modified Files:
	xsane.spec 
Log Message:
change license to GPLv2+



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xsane.spec	24 Apr 2007 11:52:54 -0000	1.48
+++ xsane.spec	5 Sep 2007 15:19:35 -0000	1.49
@@ -11,7 +11,7 @@
 Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
 Patch3: xsane-0.994-showeulaonce.patch
-License: GPL
+License: GPLv2+
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@@ -117,6 +117,9 @@
 fi
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+- change license to GPLv2+
+
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3
 - don't include obsolete Application category in desktop file (#226658)
 



From fedora-extras-commits at redhat.com  Wed Sep  5 15:28:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:28:29 -0400
Subject: rpms/xsane/devel xsane.spec,1.49,1.50
Message-ID: <200709051528.l85FSTY7008163@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8133

Modified Files:
	xsane.spec 
Log Message:
fix changelog date



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xsane.spec	5 Sep 2007 15:19:35 -0000	1.49
+++ xsane.spec	5 Sep 2007 15:27:57 -0000	1.50
@@ -117,7 +117,7 @@
 fi
 
 %changelog
-* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
 - change license to GPLv2+
 
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3



From fedora-extras-commits at redhat.com  Wed Sep  5 15:29:19 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 5 Sep 2007 11:29:19 -0400
Subject: rpms/ufraw/devel ufraw.spec,1.25,1.26
Message-ID: <200709051529.l85FTJYx008224@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8202

Modified Files:
	ufraw.spec 
Log Message:
change license to GPLv2



Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ufraw.spec	6 Aug 2007 07:52:48 -0000	1.25
+++ ufraw.spec	5 Sep 2007 15:28:46 -0000	1.26
@@ -20,9 +20,9 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
-License: GPL
+License: GPLv2
 URL: http://ufraw.sourceforge.net
 Source0: http://dl.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
@@ -165,6 +165,9 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.12-2
+- change license to GPLv2
+
 * Mon Aug 06 2007 Nils Philippsen <nphilipp at redhat.com> - 0.12-1
 - version 0.12
 - drop obsolete exiv2, cmserrorhandler patches



From fedora-extras-commits at redhat.com  Wed Sep  5 15:33:01 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 5 Sep 2007 11:33:01 -0400
Subject: rpms/bacula/devel bacula.spec,1.3,1.4
Message-ID: <200709051533.l85FX1wQ008418@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8388

Modified Files:
	bacula.spec 
Log Message:
* Wed Sep 5 2007 Andreas Thienemann <andreas at bawue.net> - 2.0.3-11
- Remove spooldir in client, fixing #251879
- Remove dependency on libtermcap, fixing #251158



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula.spec	29 Aug 2007 04:19:10 -0000	1.3
+++ bacula.spec	5 Sep 2007 15:32:29 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -38,7 +38,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
 BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel, pkgconfig
-BuildRequires: libtermcap-devel, gtk2-devel, libgnomeui-devel, GConf2-devel
+BuildRequires: gtk2-devel, libgnomeui-devel, GConf2-devel
 BuildRequires: glibc-devel, ORBit2-devel, libart_lgpl-devel, freetype-devel
 BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
 BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
@@ -355,6 +355,8 @@
 # Shell function to configure and build a Bacula tree
 build() {
 cp -rl ../bacula-%{version}/* .
+export CFLAGS=-I%{_includedir}/ncurses
+export CPPFLAGS=-I%{_includedir}/ncurses
 %configure \
 	--sysconfdir=%{_sysconfdir}/bacula \
 	--with-dir-user=bacula \
@@ -743,7 +745,6 @@
 %{_sbindir}/bacula-fd
 %{_initrddir}/bacula-fd
 %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
-%dir %{_localstatedir}/spool/bacula
 %{_mandir}/man8/bacula-fd.8*
 
 
@@ -919,6 +920,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Andreas Thienemann <andreas at bawue.net> - 2.0.3-11
+- Remove spooldir in client, fixing #251879
+- Remove dependency on libtermcap, fixing #251158
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.3-10
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 15:34:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:34:28 -0400
Subject: rpms/gkrellm/EL-5 gkrellmd.init,1.1,1.2 gkrellm.spec,1.6,1.7
Message-ID: <200709051534.l85FYSXh008473@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8448

Modified Files:
	gkrellmd.init gkrellm.spec 
Log Message:
Resync with devel


Index: gkrellmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellmd.init	19 Jul 2006 18:35:32 -0000	1.1
+++ gkrellmd.init	5 Sep 2007 15:33:56 -0000	1.2
@@ -6,53 +6,70 @@
 # processname: gkrellmd
 # config: /etc/gkrellmd.conf
 
+### BEGIN INIT INFO
+# Provides: gkrellmd
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start: hddtemp
+# Should-Stop: hddtemp
+# Short-Description: GNU Krell Monitors Server
+### END INIT INFO
+
 # source function library
 . /etc/rc.d/init.d/functions
 
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
-# The process must be configured first.
-[ -f /etc/gkrellmd.conf ] || exit 0
-
-RETVAL=0
-
-prog="gkrellmd"
+exec=/usr/sbin/gkrellmd
+prog=${exec##*/}
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    if [ -f /etc/gkrellmd.conf ] ; then
+        echo -n $"Starting GNU Krell Monitors server ($prog): "
+        DISPLAY= daemon --user gkrellmd $exec -d
+        rv=$?
+        echo
+    else
+        action $"Unconfigured: $prog, /etc/gkrellmd.conf not found" /bin/false
+        rv=6
+    fi
+    [ $rv -eq 0 ] && touch $lockfile
+    return $rv
+}
+
+stop() {
+    echo -n $"Stopping GNU Krell Monitors server ($prog): "
+    killproc $prog
+    rv=$?
+    [ $rv -eq 0 ] && rm -f $lockfile
+    echo
+    return $rv
+}
+
+restart() {
+    stop
+    start
+}
 
 case "$1" in
-  start)
-	echo -n $"Starting $prog: "
-        daemon --user gkrellmd /usr/sbin/gkrellmd -d
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gkrellmd
-	echo
-	;;
-  stop)
-	echo -n $"Shutting down $prog: "
-	killproc gkrellmd
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gkrellmd
-	echo
-	;;
-  restart|reload|force-reload)
-        $0 stop
-        $0 start
-	RETVAL=$?
+    start|stop|restart)
+        $1
         ;;
-  condrestart|try-restart)
-        if [ -f /var/lock/subsys/gkrellmd ]; then
-                $0 stop
-		$0 start
+    force-reload)
+        restart
+        ;;
+    status)
+        status $prog
+        ;;
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
         fi
-	RETVAL=$?
         ;;
-  status)
-        status gkrellmd
-	RETVAL=$?
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
         ;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
-	exit 1
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm.spec	4 Sep 2007 18:24:44 -0000	1.6
+++ gkrellm.spec	5 Sep 2007 15:33:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
+- Rewrite gkrellmd init script: better LSB compliance, hddtemp
+  interoperability, avoidance of X error messages, general cleanup.
+
 * Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-3
 - Fix gnutls detection/build and use it instead of openssl.
 - Sync user and group creation with current Fedora guidelines.



From fedora-extras-commits at redhat.com  Wed Sep  5 15:36:28 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 11:36:28 -0400
Subject: devel/anaconda .cvsignore, 1.442, 1.443 anaconda.spec, 1.578,
	1.579 sources, 1.570, 1.571
Message-ID: <200709051536.l85FaSic008533@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8510

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
- Make sure we find out about all nics (dcantrell)
- Hard drive install fixing (clumens, #287241)
- Make sure iniparse is in the image (notting, #276941)
- Add the short hostname to the localhost entry (dcantrell, #253979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- .cvsignore	4 Sep 2007 21:40:38 -0000	1.442
+++ .cvsignore	5 Sep 2007 15:35:55 -0000	1.443
@@ -1,2 +1 @@
-anaconda-11.3.0.26.tar.bz2
-anaconda-11.3.0.27.tar.bz2
+anaconda-11.3.0.28.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- anaconda.spec	4 Sep 2007 21:40:38 -0000	1.578
+++ anaconda.spec	5 Sep 2007 15:35:55 -0000	1.579
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.27
+Version: 11.3.0.28
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
+- Make sure we find out about all nics (dcantrell)
+- Hard drive install fixing (clumens, #287241)
+- Make sure iniparse is in the image (notting, #276941)
+- Add the short hostname to the localhost entry (dcantrell, #253979)
+
 * Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 11.3.0.27-1
 - Honor hostname= command line option (dcantrell, #186560).
 - Set the hostname if provided by the user or by DHCP (dcantrell, #180451).


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- sources	4 Sep 2007 21:40:38 -0000	1.570
+++ sources	5 Sep 2007 15:35:55 -0000	1.571
@@ -1 +1 @@
-1a854b0ef23af7429158c1f8e2198541  anaconda-11.3.0.27.tar.bz2
+9e00bb0aebbbe4e388a77e3dcec5866d  anaconda-11.3.0.28.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 15:57:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 11:57:17 -0400
Subject: rpms/gkrellm/EL-5 gkrellm-2.3.0-sensorscheck.patch, NONE,
	1.1 gkrellm.spec, 1.7, 1.8
Message-ID: <200709051557.l85FvHef008996@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8967

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-sensorscheck.patch 
Log Message:
* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4.1
- Adapt to lm_sensors availability/setup in EL.


gkrellm-2.3.0-sensorscheck.patch:

--- NEW FILE gkrellm-2.3.0-sensorscheck.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-03 23:47:50.000000000 +0300
@@ -129,6 +129,7 @@ cat << EOF > test.c
 
 int main()
 	{
+	/*
 	FILE	*f;
 
 	f = fopen("/etc/sensors.conf", "r");
@@ -137,6 +138,7 @@ int main()
 	if (sensors_init(f) != 0)
 		return 1;
 	fclose(f);
+	*/
 	return 0;
 	}
 EOF


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellm.spec	5 Sep 2007 15:33:56 -0000	1.7
+++ gkrellm.spec	5 Sep 2007 15:56:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -14,8 +14,11 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
+Patch5:         gkrellm-2.3.0-sensorscheck.patch
 BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
+%ifarch %{ix86} x86_64 alpha
 BuildRequires:  lm_sensors-devel
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -63,6 +66,7 @@
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
+%patch5 -p1 -z .sensorscheck
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -169,6 +173,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4.1
+- Adapt to lm_sensors availability/setup in EL.
+
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.0-4
 - Rewrite gkrellmd init script: better LSB compliance, hddtemp
   interoperability, avoidance of X error messages, general cleanup.



From fedora-extras-commits at redhat.com  Wed Sep  5 16:18:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 12:18:26 -0400
Subject: rpms/gkrellm-volume/devel gkrellm-volume.spec,1.10,1.11
Message-ID: <200709051618.l85GIQAP015678@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15597

Modified Files:
	gkrellm-volume.spec 
Log Message:
* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
- Convert docs to UTF-8.



Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/devel/gkrellm-volume.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gkrellm-volume.spec	16 Aug 2007 10:07:06 -0000	1.10
+++ gkrellm-volume.spec	5 Sep 2007 16:17:53 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -27,6 +27,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
+- Convert docs to UTF-8.
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-5
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:19:28 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 5 Sep 2007 12:19:28 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec, 1.3337,
	1.3338 linux-2.6-utrace-core.patch, 1.3,
	1.4 linux-2.6-utrace-ptrace-compat.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.3, 1.4
Message-ID: <200709051619.l85GJSiu015800@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15753

Modified Files:
	kernel-2.6.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch 
Log Message:
* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
- Update utrace



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3337
retrieving revision 1.3338
diff -u -r1.3337 -r1.3338
--- kernel-2.6.spec	30 Aug 2007 21:54:14 -0000	1.3337
+++ kernel-2.6.spec	5 Sep 2007 16:18:54 -0000	1.3338
@@ -2306,6 +2306,9 @@
 %endif
 
 %changelog
+* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
+- Update utrace
+
 * Thu Aug 30 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-core.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-core.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-core.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -24,11 +24,11 @@
  Documentation/utrace.txt          |  579 +++++++++
  include/linux/sched.h             |    5 
  include/linux/tracehook.h         |   85 +
- include/linux/utrace.h            |  544 +++++++++
+ include/linux/utrace.h            |  544 ++++++++
  init/Kconfig                      |   18 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2263 ++++++++++++++++++++++++++++++++++++++
- 9 files changed, 3502 insertions(+), 18 deletions(-)
+ kernel/utrace.c                   | 2344 ++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 3583 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -50,7 +50,7 @@
 ===================================================================
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2263 @@
+@@ -0,0 +1,2344 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -526,7 +526,7 @@
 + */
 +struct utrace_attached_engine *
 +utrace_attach(struct task_struct *target, int flags,
-+	     const struct utrace_engine_ops *ops, void *data)
++	      const struct utrace_engine_ops *ops, void *data)
 +{
 +	struct utrace *utrace;
 +	struct utrace_attached_engine *engine;
@@ -628,10 +628,13 @@
 +EXPORT_SYMBOL_GPL(utrace_attach);
 +
 +/*
-+ * When an engine is detached, the target thread may still see it and make
-+ * callbacks until it quiesces.  We reset its event flags to just QUIESCE
-+ * and install a special ops vector whose callback is dead_engine_delete.
-+ * When the target thread quiesces, it can safely free the engine itself.
++ * When an engine is detached, the target thread may still see it
++ * and make callbacks until it quiesces.  We install a special ops
++ * vector whose callbacks are all dead_engine_delete.  When the
++ * target thread quiesces, it can safely free the engine itself.
++ * We must cover all callbacks in case of races between checking
++ * engine->flags and utrace_detach changing engine->ops.
++ * Only report_reap is never called due to a special case in utrace_reap.
 + */
 +static u32
 +dead_engine_delete(struct utrace_attached_engine *engine,
@@ -640,9 +643,38 @@
 +	return UTRACE_ACTION_DETACH;
 +}
 +
++/*
++ * Don't use .report_xxx = ... style here because this way makes it easier
++ * to be sure we're forced to have an initializer here for every member.
++ */
 +static const struct utrace_engine_ops dead_engine_ops =
 +{
-+	.report_quiesce = &dead_engine_delete
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 unsigned long, struct task_struct *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 pid_t)) &dead_engine_delete,
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *, u32, siginfo_t *,
++		 const struct k_sigaction *, struct k_sigaction *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 int)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 const struct linux_binprm *, struct pt_regs *))
++	&dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 struct pt_regs *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *,
++		 long, long *)) &dead_engine_delete,
++	(u32 (*)(struct utrace_attached_engine *, struct task_struct *))
++	&dead_engine_delete,
++	NULL,			/* report_reap */
++	NULL,			/* allow_access_process_vm */
++	NULL,			/* unsafe_exec */
++	NULL,			/* tracer_task */
 +};
 +
 +
@@ -848,9 +880,32 @@
 +		return ret;
 +	}
 +
-+	flags = engine->flags;
-+	engine->flags = UTRACE_EVENT(QUIESCE) | UTRACE_ACTION_QUIESCE;
++	/*
++	 * This must work while the target thread races with us doing:
++	 *	if (engine->flags & UTRACE_EVENT(x)) REPORT(x, ...);
++	 * The REPORT macro uses smp_rmb() between checking engine->flags
++	 * and using engine->ops.  Here we change engine->ops first, then
++	 * use smp_wmb() before changing engine->flags.  This ensures it
++	 * can check the old flags before using the old ops, or check the
++	 * old flags before using the new ops, or check the new flags
++	 * before using the new ops, but can never check the new flags
++	 * before using the old ops.  Hence, dead_engine_ops might be used
++	 * with any old flags in place.  So, it has report_* callback
++	 * pointers for every event type.  Since it has to have those
++	 * anyway, we enable (for after any potential race) all the events
++	 * that have no overhead to enable.  We want it to get into that
++	 * callback and complete the detach ASAP.
++	 */
 +	rcu_assign_pointer(engine->ops, &dead_engine_ops);
++	smp_wmb();
++	flags = engine->flags;
++	engine->flags = (UTRACE_EVENT(QUIESCE)
++			 | UTRACE_EVENT(CLONE)
++			 | UTRACE_EVENT(VFORK_DONE)
++			 | UTRACE_EVENT(EXEC)
++			 | UTRACE_EVENT(EXIT)
++			 | UTRACE_EVENT(JCTL)
++			 | UTRACE_ACTION_QUIESCE);
 +
 +	if (quiesce(target, 1)) {
 +		remove_engine(engine, target, utrace);
@@ -975,7 +1030,7 @@
 +{
 +	struct utrace *utrace;
 +	int report;
-+	unsigned long old_flags, old_utrace_flags;
++	unsigned long old_flags, old_utrace_flags, set_utrace_flags;
 +	int ret = -EALREADY;
 +
 +#ifdef ARCH_HAS_SINGLE_STEP
@@ -1009,6 +1064,22 @@
 +	}
 +
 +	/*
++	 * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL).
++	 * That bit indicates utrace_report_jctl has not run yet and so the
++	 * target cannot be considered quiescent.  But if the bit wasn't
++	 * already set, it can't be in running in there and really is
++	 * quiescent now in its existing job control stop.  We set
++	 * UTRACE_ACTION_QUIESCE to be sure that once it resumes it will
++	 * recompute its flags in utrace_quiescent.
++	 */
++	set_utrace_flags = flags;
++	if (((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL))
++	    && target->state == TASK_STOPPED) {
++		set_utrace_flags &= ~UTRACE_EVENT(JCTL);
++		set_utrace_flags |= UTRACE_ACTION_QUIESCE;
++	}
++
++	/*
 +	 * When setting these flags, it's essential that we really
 +	 * synchronize with exit_notify.  They cannot be set after
 +	 * exit_notify takes the tasklist_lock.  By holding the read
@@ -1018,20 +1089,20 @@
 +	 * knows positively that utrace_report_death will be called or
 +	 * that it won't.
 +	 */
-+	if ((flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
-+					   | DEATH_EVENTS)) {
++	if ((set_utrace_flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP
++						      | DEATH_EVENTS)) {
 +		read_lock(&tasklist_lock);
 +		if (unlikely(target->exit_state)) {
 +			read_unlock(&tasklist_lock);
 +			spin_unlock(&utrace->lock);
 +			return ret;
 +		}
-+		target->utrace_flags |= flags;
++		target->utrace_flags |= set_utrace_flags;
 +		read_unlock(&tasklist_lock);
 +	}
 +
 +	engine->flags = flags;
-+	target->utrace_flags |= flags;
++	target->utrace_flags |= set_utrace_flags;
 +	ret = 0;
 +
 +	report = 0;
@@ -1153,10 +1224,20 @@
 +	return ret;
 +}
 +
-+#define REPORT(callback, ...) do { \
-+	u32 ret = (*rcu_dereference(engine->ops)->callback) \
-+		(engine, tsk, ##__VA_ARGS__); \
-+	action = update_action(tsk, utrace, engine, ret); \
++/*
++ * This macro is always used after checking engine->flags.
++ * The smp_rmb() here pairs with smp_wmb() in utrace_detach.
++ * engine->ops changes before engine->flags, so the flags we
++ * just tested properly enabled this report for the real ops,
++ * or harmlessly enabled it for dead_engine_ops.
++ */
++#define REPORT(callback, ...)						\
++	do {								\
++		u32 ret;						\
++		smp_rmb();						\
++		ret = (*rcu_dereference(engine->ops)->callback)		\
++			(engine, tsk, ##__VA_ARGS__);			\
++		action = update_action(tsk, utrace, engine, ret);	\
 +	} while (0)
 +
 +
@@ -2951,7 +3032,7 @@
  struct linux_binprm;
  struct pt_regs;
  
-@@ -342,6 +343,7 @@ utrace_regset_copyin_ignore(unsigned int
+@@ -353,6 +354,7 @@ utrace_regset_copyin_ignore(unsigned int
   */
  static inline void tracehook_init_task(struct task_struct *child)
  {
@@ -2959,7 +3040,7 @@
  }
  
  /*
-@@ -350,6 +352,9 @@ static inline void tracehook_init_task(s
+@@ -361,6 +363,9 @@ static inline void tracehook_init_task(s
   */
  static inline void tracehook_release_task(struct task_struct *p)
  {
@@ -2969,7 +3050,7 @@
  }
  
  /*
-@@ -359,7 +364,20 @@ static inline void tracehook_release_tas
+@@ -370,7 +375,20 @@ static inline void tracehook_release_tas
   */
  static inline int tracehook_check_released(struct task_struct *p)
  {
@@ -2991,7 +3072,7 @@
  }
  
  /*
-@@ -370,7 +388,7 @@ static inline int tracehook_check_releas
+@@ -381,7 +399,7 @@ static inline int tracehook_check_releas
  static inline int tracehook_notify_cldstop(struct task_struct *tsk,
  					   const siginfo_t *info)
  {
@@ -3000,7 +3081,7 @@
  }
  
  /*
-@@ -384,7 +402,11 @@ static inline int tracehook_notify_cldst
+@@ -395,7 +413,11 @@ static inline int tracehook_notify_cldst
  static inline int tracehook_notify_death(struct task_struct *tsk,
  					 int *noreap, void **death_cookie)
  {
@@ -3013,7 +3094,7 @@
  	*noreap = 0;
  	return 0;
  }
-@@ -397,7 +419,8 @@ static inline int tracehook_notify_death
+@@ -408,7 +430,8 @@ static inline int tracehook_notify_death
  static inline int tracehook_consider_fatal_signal(struct task_struct *tsk,
  						  int sig)
  {
@@ -3023,7 +3104,7 @@
  }
  
  /*
-@@ -410,7 +433,7 @@ static inline int tracehook_consider_ign
+@@ -421,7 +444,7 @@ static inline int tracehook_consider_ign
  						    int sig,
  						    void __user *handler)
  {
@@ -3032,7 +3113,7 @@
  }
  
  
-@@ -421,7 +444,7 @@ static inline int tracehook_consider_ign
+@@ -432,7 +455,7 @@ static inline int tracehook_consider_ign
   */
  static inline int tracehook_induce_sigpending(struct task_struct *tsk)
  {
@@ -3041,7 +3122,7 @@
  }
  
  /*
-@@ -436,6 +459,8 @@ static inline int tracehook_get_signal(s
+@@ -447,6 +470,8 @@ static inline int tracehook_get_signal(s
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -3050,7 +3131,7 @@
  	return 0;
  }
  
-@@ -448,6 +473,8 @@ static inline int tracehook_get_signal(s
+@@ -459,6 +484,8 @@ static inline int tracehook_get_signal(s
   */
  static inline int tracehook_finish_stop(int last_one)
  {
@@ -3059,7 +3140,7 @@
  	return 0;
  }
  
-@@ -459,7 +486,7 @@ static inline int tracehook_finish_stop(
+@@ -470,7 +497,7 @@ static inline int tracehook_finish_stop(
   */
  static inline int tracehook_inhibit_wait_stopped(struct task_struct *child)
  {
@@ -3068,7 +3149,7 @@
  }
  
  /*
-@@ -469,7 +496,7 @@ static inline int tracehook_inhibit_wait
+@@ -480,7 +507,7 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_inhibit_wait_zombie(struct task_struct *child)
  {
@@ -3077,7 +3158,7 @@
  }
  
  /*
-@@ -479,7 +506,7 @@ static inline int tracehook_inhibit_wait
+@@ -490,7 +517,7 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_inhibit_wait_continued(struct task_struct *child)
  {
@@ -3086,7 +3167,7 @@
  }
  
  
-@@ -489,13 +516,9 @@ static inline int tracehook_inhibit_wait
+@@ -500,13 +527,9 @@ static inline int tracehook_inhibit_wait
   */
  static inline int tracehook_unsafe_exec(struct task_struct *tsk)
  {
@@ -3102,7 +3183,7 @@
  }
  
  /*
-@@ -510,6 +533,8 @@ static inline int tracehook_unsafe_exec(
+@@ -521,6 +544,8 @@ static inline int tracehook_unsafe_exec(
   */
  static inline struct task_struct *tracehook_tracer_task(struct task_struct *p)
  {
@@ -3111,7 +3192,7 @@
  	return NULL;
  }
  
-@@ -521,6 +546,8 @@ static inline int tracehook_allow_access
+@@ -532,6 +557,8 @@ static inline int tracehook_allow_access
  {
  	if (tsk == current)
  		return 1;
@@ -3120,7 +3201,7 @@
  	return 0;
  }
  
-@@ -532,7 +559,7 @@ static inline int tracehook_allow_access
+@@ -543,7 +570,7 @@ static inline int tracehook_allow_access
   */
  static inline int tracehook_expect_breakpoints(struct task_struct *tsk)
  {
@@ -3129,7 +3210,7 @@
  }
  
  
-@@ -555,6 +582,10 @@ static inline int tracehook_expect_break
+@@ -566,6 +593,10 @@ static inline int tracehook_expect_break
  static inline void tracehook_report_death(struct task_struct *tsk,
  					  int exit_state, void *death_cookie)
  {
@@ -3140,7 +3221,7 @@
  }
  
  /*
-@@ -564,14 +595,18 @@ static inline void tracehook_report_deat
+@@ -575,14 +606,18 @@ static inline void tracehook_report_deat
   */
  static inline void tracehook_report_delayed_group_leader(struct task_struct *p)
  {
@@ -3160,7 +3241,7 @@
  }
  
  /*
-@@ -580,6 +615,8 @@ static inline void tracehook_report_exec
+@@ -591,6 +626,8 @@ static inline void tracehook_report_exec
   */
  static inline void tracehook_report_exit(long *exit_code)
  {
@@ -3169,7 +3250,7 @@
  }
  
  /*
-@@ -594,6 +631,8 @@ static inline void tracehook_report_exit
+@@ -605,6 +642,8 @@ static inline void tracehook_report_exit
  static inline void tracehook_report_clone(unsigned long clone_flags,
  					  struct task_struct *child)
  {
@@ -3178,7 +3259,7 @@
  }
  
  /*
-@@ -607,6 +646,8 @@ static inline void tracehook_report_clon
+@@ -618,6 +657,8 @@ static inline void tracehook_report_clon
  						   pid_t pid,
  						   struct task_struct *child)
  {
@@ -3187,7 +3268,7 @@
  }
  
  /*
-@@ -618,6 +659,8 @@ static inline void tracehook_report_clon
+@@ -629,6 +670,8 @@ static inline void tracehook_report_clon
  static inline void tracehook_report_vfork_done(struct task_struct *child,
  					       pid_t child_pid)
  {
@@ -3196,7 +3277,7 @@
  }
  
  /*
-@@ -625,6 +668,9 @@ static inline void tracehook_report_vfor
+@@ -636,6 +679,9 @@ static inline void tracehook_report_vfor
   */
  static inline void tracehook_report_syscall(struct pt_regs *regs, int is_exit)
  {
@@ -3206,7 +3287,7 @@
  }
  
  /*
-@@ -644,6 +690,11 @@ static inline void tracehook_report_hand
+@@ -655,6 +701,11 @@ static inline void tracehook_report_hand
  						  const sigset_t *oldset,
  						  struct pt_regs *regs)
  {

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-ptrace-compat.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-ptrace-compat.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -28,9 +28,9 @@
  kernel/Makefile                 |    3 
  kernel/exit.c                   |   13 
  kernel/fork.c                   |    2 
- kernel/ptrace.c                 | 2051 +++++++++++++++++++++++++++++++++++++---
+ kernel/ptrace.c                 | 2052 +++++++++++++++++++++++++++++++++++++---
  kernel/sys_ni.c                 |    4 
- 18 files changed, 2632 insertions(+), 174 deletions(-)
+ 18 files changed, 2633 insertions(+), 174 deletions(-)
 
 Index: b/fs/proc/base.c
 ===================================================================
@@ -87,7 +87,7 @@
 ===================================================================
 --- a/arch/i386/kernel/ptrace.c
 +++ b/arch/i386/kernel/ptrace.c
-@@ -735,6 +735,46 @@ const struct utrace_regset_view *utrace_
+@@ -739,6 +739,46 @@ const struct utrace_regset_view *utrace_
  	return &utrace_i386_native;
  }
  
@@ -138,7 +138,7 @@
 ===================================================================
 --- a/arch/x86_64/ia32/ptrace32.c
 +++ b/arch/x86_64/ia32/ptrace32.c
-@@ -166,11 +166,6 @@ static int getreg32(struct task_struct *
+@@ -167,11 +167,6 @@ static int getreg32(struct task_struct *
  
  #undef R32
  
@@ -150,7 +150,7 @@
  static int
  ia32_genregs_get(struct task_struct *target,
  		 const struct utrace_regset *regset,
-@@ -600,3 +595,54 @@ const struct utrace_regset_view utrace_i
+@@ -604,3 +599,54 @@ const struct utrace_regset_view utrace_i
  	.name = "i386", .e_machine = EM_386,
  	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
  };
@@ -222,7 +222,7 @@
 ===================================================================
 --- a/arch/x86_64/kernel/ptrace.c
 +++ b/arch/x86_64/kernel/ptrace.c
-@@ -714,6 +714,52 @@ const struct utrace_regset_view *utrace_
+@@ -717,6 +717,52 @@ const struct utrace_regset_view *utrace_
  }
  
  
@@ -683,7 +683,7 @@
 ===================================================================
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
-@@ -19,194 +19,2007 @@
+@@ -19,194 +19,2008 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -746,19 +746,66 @@
 +};
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* Initialized below. */
+ 
+ /*
+- * Check that we have indeed attached to the thing..
++ * We use this bit in task_struct.exit_code of a ptrace'd task to indicate
++ * a ptrace stop.  It must not overlap with any bits used in real exit_code's.
++ * Those are (PTRACE_EVENT_* << 8) | 0xff.
+  */
+-int ptrace_check_attach(struct task_struct *child, int kill)
++#define PTRACE_TRAPPED_MASK	0x10000
++
 +
 +static void
 +ptrace_state_unlink(struct ptrace_state *state)
-+{
+ {
+-	return -ENOSYS;
 +	task_lock(state->parent);
 +	list_del_rcu(&state->entry);
 +	task_unlock(state->parent);
-+}
-+
+ }
+ 
+-static int may_attach(struct task_struct *task)
 +static struct ptrace_state *
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
-+{
+ {
+-	/* May we inspect the given task?
+-	 * This check is used both for attaching with ptrace
+-	 * and for allowing access to sensitive information in /proc.
+-	 *
+-	 * ptrace_attach denies several cases that /proc allows
+-	 * because setting up the necessary parent/child relationship
+-	 * or halting the specified task is impossible.
+-	 */
+-	int dumpable = 0;
+-	/* Don't let security modules deny introspection */
+-	if (task == current)
+-		return 0;
+-	if (((current->uid != task->euid) ||
+-	     (current->uid != task->suid) ||
+-	     (current->uid != task->uid) ||
+-	     (current->gid != task->egid) ||
+-	     (current->gid != task->sgid) ||
+-	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-	smp_rmb();
+-	if (task->mm)
+-		dumpable = task->mm->dumpable;
+-	if (!dumpable && !capable(CAP_SYS_PTRACE))
+-		return -EPERM;
+-
+-	return security_ptrace(current, task);
+-}
+-
+-int ptrace_may_attach(struct task_struct *task)
+-{
+-	int err;
+-	task_lock(task);
+-	err = may_attach(task);
+-	task_unlock(task);
+-	return !err;
 +	struct ptrace_state *state;
 +
 +	NO_LOCKS;
@@ -818,17 +865,14 @@
 +	BUG_ON(state->rcu.next);
 +	call_rcu(&state->rcu, ptrace_state_free);
 +}
- 
- /*
-- * Check that we have indeed attached to the thing..
++
++/*
 + * Update the tracing engine state to match the new ptrace state.
-  */
--int ptrace_check_attach(struct task_struct *child, int kill)
++ */
 +static int __must_check
 +ptrace_update(struct task_struct *target, struct ptrace_state *state,
 +	      unsigned long flags, int from_stopped)
- {
--	return -ENOSYS;
++{
 +	int ret;
 +
 +	START_CHECK;
@@ -893,9 +937,8 @@
 +	END_CHECK;
 +
 +	return ret;
- }
- 
--static int may_attach(struct task_struct *task)
++}
++
 +/*
 + * This does ptrace_update and also installs state in engine->data.
 + * Only after utrace_set_flags succeeds (in ptrace_update) inside
@@ -907,42 +950,7 @@
 + */
 +static int __must_check
 +ptrace_setup_finish(struct task_struct *target, struct ptrace_state *state)
- {
--	/* May we inspect the given task?
--	 * This check is used both for attaching with ptrace
--	 * and for allowing access to sensitive information in /proc.
--	 *
--	 * ptrace_attach denies several cases that /proc allows
--	 * because setting up the necessary parent/child relationship
--	 * or halting the specified task is impossible.
--	 */
--	int dumpable = 0;
--	/* Don't let security modules deny introspection */
--	if (task == current)
--		return 0;
--	if (((current->uid != task->euid) ||
--	     (current->uid != task->suid) ||
--	     (current->uid != task->uid) ||
--	     (current->gid != task->egid) ||
--	     (current->gid != task->sgid) ||
--	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--	smp_rmb();
--	if (task->mm)
--		dumpable = task->mm->dumpable;
--	if (!dumpable && !capable(CAP_SYS_PTRACE))
--		return -EPERM;
--
--	return security_ptrace(current, task);
--}
--
--int ptrace_may_attach(struct task_struct *task)
--{
--	int err;
--	task_lock(task);
--	err = may_attach(task);
--	task_unlock(task);
--	return !err;
++{
 +	int ret;
 +
 +	NO_LOCKS;
@@ -1087,8 +1095,6 @@
 +	if (retval)
 +		(void) utrace_detach(task, engine);
 +	else {
-+		int stopped = 0;
-+
 +		NO_LOCKS;
 +
 +		/*
@@ -1098,48 +1104,14 @@
 +		 * We cannot call into the signal code if it's dead.
 +		 */
 +		read_lock(&tasklist_lock);
-+		if (likely(!task->exit_state)) {
++		if (likely(!task->exit_state))
 +			force_sig_specific(SIGSTOP, task);
-+
-+			spin_lock_irq(&task->sighand->siglock);
-+			stopped = (task->state == TASK_STOPPED);
-+			spin_unlock_irq(&task->sighand->siglock);
-+		}
 +		read_unlock(&tasklist_lock);
 +
-+		if (stopped) {
-+			const struct utrace_regset *regset;
-+
-+			/*
-+			 * Set QUIESCE immediately, so we can allow
-+			 * ptrace requests while he's in TASK_STOPPED.
-+			 */
-+			retval = ptrace_update(task, state, /* XXX child death+other thread waits race could have freed state already */
-+					       UTRACE_ACTION_QUIESCE, 0);
-+			if (retval)
-+				/*
-+				 * Anything is possible here.  It might not
-+				 * really have been quiescent yet.  It
-+				 * might have just woken up and died.
-+				 */
-+				BUG_ON(retval != -ESRCH && retval != -EALREADY);
-+			retval = 0;
-+
-+			/*
-+			 * Do now the regset 0 writeback that we do on every
-+			 * stop, since it's never been done.  On register
-+			 * window machines, this makes sure the user memory
-+			 * backing the register data is up to date.
-+			 */
-+			regset = utrace_regset(task, engine,
-+					       utrace_native_view(task), 0);
-+			if (regset->writeback)
-+				(*regset->writeback)(task, regset, 1);
-+		}
-+
 +		pr_debug("%d ptrace_attach %d complete (%sstopped)"
 +			 " state %lu code %x",
-+			 current->pid, task->pid, stopped ? "" : "not ",
++			 current->pid, task->pid,
++			 task->state == TASK_STOPPED ? "" : "not ",
 +			 task->state, task->exit_code);
 +	}
  
@@ -1488,7 +1460,13 @@
 +			else
 +				ret = (*regset->get)(target, regset,
 +						     pos, n, kdata, udata);
-+		}
+ 		}
+-		if (copy_to_user(dst, buf, retval))
+-			return -EFAULT;
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +
 +		if (kdata)
 +			kdata += n;
@@ -1536,7 +1514,8 @@
 +	if (request == PTRACE_ATTACH) {
 +		ret = ptrace_attach(child);
 +		goto out_tsk;
-+	}
+ 	}
+-	return copied;
 +
 +	rcu_read_lock();
 +	engine = utrace_attach(child, UTRACE_ATTACH_MATCH_OPS,
@@ -1563,13 +1542,7 @@
 +			if (child->state == TASK_STOPPED)
 +				ret = 0;
 +			unlock_task_sighand(child, &flags);
- 		}
--		if (copy_to_user(dst, buf, retval))
--			return -EFAULT;
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		if (ret == 0) {
 +			ret = ptrace_update(child, state,
 +					    UTRACE_ACTION_QUIESCE, 0);
@@ -1586,8 +1559,7 @@
 +		}
 +
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
- 	}
--	return copied;
++	}
 +
 +	rcu_read_unlock();
 +
@@ -1783,11 +1755,7 @@
 +		if (ret == 0) {
 +			ret = val;
 +			force_successful_syscall_return();
- 		}
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		goto out_tsk;
 +	}
 +
@@ -1807,8 +1775,7 @@
 +			break;
 +		ret = put_user(tmp, (unsigned long __user *) data);
 +		break;
- 	}
--	return copied;
++	}
 +
 +	case PTRACE_POKETEXT: /* write the word at location addr. */
 +	case PTRACE_POKEDATA:
@@ -1837,9 +1804,14 @@
 +					   (siginfo_t __user *) data,
 +					   sizeof(siginfo_t)))
 +				ret = -EFAULT;
-+		}
+ 		}
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		break;
-+	}
+ 	}
+-	return copied;
 +
 +out_tsk:
 +	NO_LOCKS;
@@ -1936,13 +1908,13 @@
 +	return ret;
  }
 +#endif
++
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
-+
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2104,7 +2076,29 @@
 +		 * check fails we are sure to get a wakeup if it stops.
 +		 */
 +		exit_code = xchg(&p->exit_code, 0);
-+		if (exit_code)
++		if (exit_code & PTRACE_TRAPPED_MASK)
++			goto found;
++
++		/*
++		 * If p was in job-control stop (TASK_STOPPED) rather than
++		 * ptrace stop (TASK_TRACED), then SIGCONT can asynchronously
++		 * clear it back to TASK_RUNNING.  Until it gets scheduled
++		 * and clears its own ->exit_code, our xchg below will see
++		 * its stop signal.  But, we must not report it if it's no
++		 * longer in TASK_STOPPED, as vanilla wait would not--the
++		 * caller can tell if it sent the SIGCONT before calling
++		 * wait.  We must somehow distinguish this from the case
++		 * where p is in TASK_RUNNING with p->exit_code set because
++		 * it is on its way to entering TASK_TRACED (QUIESCE) for our
++		 * stop.  So, ptrace_report sets the PTRACE_TRAPPED_MASK bit
++		 * in exit_code when it's setting QUIESCE.  For a job control
++		 * control stop, that bit will never have been set.  Since
++		 * the bit's not set now, we should only report right now if
++		 * p is still stopped.  For this case we are protected by
++		 * races the same wait that vanilla do_wait (exit.c) is:
++		 * wait_chldexit is woken after p->state is set to TASK_STOPPED.
++		 */
++		if (p->state == TASK_STOPPED)
 +			goto found;
 +
 +		// XXX should handle WCONTINUED
@@ -2155,6 +2149,7 @@
 +	}
 +	else {
 +		why = CLD_TRAPPED;
++		exit_code &= ~PTRACE_TRAPPED_MASK;
 +		status = exit_code;
 +		exit_code = (status << 8) | 0x7f;
 +	}
@@ -2333,8 +2328,14 @@
 +	 */
 +	utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
 +
++	/*
++	 * The PTRACE_TRAPPED_MASK bit distinguishes to ptrace_do_wait that
++	 * this is a ptrace report, so we expect to enter TASK_TRACED but
++	 * might not be there yet when examined.
++	 */
 +	BUG_ON(code == 0);
-+	tsk->exit_code = code;
++	WARN_ON(code &~ 0x7ff);
++	tsk->exit_code = code | PTRACE_TRAPPED_MASK;
 +	do_notify(tsk, state->parent, CLD_TRAPPED);
 +
 +	pr_debug("%d ptrace_report quiescing exit_code %x\n",

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-regset.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-regset.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-regset.patch	5 Sep 2007 16:18:54 -0000	1.4
@@ -12,25 +12,27 @@
 ---
 
  arch/i386/kernel/i387.c             |  143 +++---
- arch/i386/kernel/ptrace.c           |  822 ++++++++++++++++++++---------------
- arch/x86_64/ia32/ptrace32.c         |  719 ++++++++++++++++++++-----------
- arch/x86_64/ia32/fpu32.c            |   92 +++-
- arch/x86_64/kernel/ptrace.c         |  730 +++++++++++++++++++------------
+ arch/i386/kernel/ptrace.c           |  826 ++++++++++++++++++++----------------
  arch/powerpc/kernel/Makefile        |    4 
- arch/powerpc/kernel/ptrace32.c      |  443 -------------------
- arch/powerpc/kernel/ptrace.c        |  718 +++++++++++++++----------------
  arch/powerpc/kernel/ptrace-common.h |  145 ------
- kernel/ptrace.c                     |    8 
- include/linux/tracehook.h           |  244 ++++++++++
- include/asm-i386/i387.h             |   13 -
+ arch/powerpc/kernel/ptrace.c        |  718 +++++++++++++++----------------
+ arch/powerpc/kernel/ptrace32.c      |  443 -------------------
+ arch/x86_64/ia32/fpu32.c            |   92 +++-
+ arch/x86_64/ia32/ptrace32.c         |  725 ++++++++++++++++++++-----------
+ arch/x86_64/kernel/ptrace.c         |  733 +++++++++++++++++++------------
+ include/asm-i386/i387.h             |   13 
  include/asm-x86_64/fpu32.h          |    3 
  include/asm-x86_64/tracehook.h      |    8 
- 14 files changed, 2124 insertions(+), 1968 deletions(-)
+ include/linux/tracehook.h           |  255 ++++++++++-
+ kernel/ptrace.c                     |    8 
+ 14 files changed, 2147 insertions(+), 1969 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
  delete arch/powerpc/kernel/ptrace-common.h
 
---- linux-2.6/arch/i386/kernel/i387.c
-+++ linux-2.6/arch/i386/kernel/i387.c
+Index: b/arch/i386/kernel/i387.c
+===================================================================
+--- a/arch/i386/kernel/i387.c
++++ b/arch/i386/kernel/i387.c
 @@ -222,14 +222,10 @@ void set_fpu_twd( struct task_struct *ts
   * FXSR floating point environment conversions.
   */
@@ -240,19 +242,22 @@
  }
  
  /*
---- linux-2.6/arch/i386/kernel/ptrace.c
-+++ linux-2.6/arch/i386/kernel/ptrace.c
-@@ -17,7 +17,9 @@
+Index: b/arch/i386/kernel/ptrace.c
+===================================================================
+--- a/arch/i386/kernel/ptrace.c
++++ b/arch/i386/kernel/ptrace.c
+@@ -17,7 +17,10 @@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
 +#include <linux/module.h>
++#include <linux/elf.h>
  
 +#include <asm/tracehook.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
  #include <asm/system.h>
-@@ -28,10 +30,6 @@
+@@ -28,10 +31,6 @@
  #include <asm/desc.h>
  #include <asm/tracehook.h>
  
@@ -263,7 +268,7 @@
  
  /*
   * Determines which flags the user has access to [1 = access, 0 = no access].
-@@ -40,9 +38,6 @@
+@@ -40,9 +39,6 @@
   */
  #define FLAG_MASK 0x00050dd5
  
@@ -273,7 +278,7 @@
  /*
   * Offset of eflags on child stack..
   */
-@@ -90,28 +85,35 @@ static int putreg(struct task_struct *ch
+@@ -90,28 +86,35 @@ static int putreg(struct task_struct *ch
  	unsigned long regno, unsigned long value)
  {
  	switch (regno >> 2) {
@@ -331,7 +336,7 @@
  	}
  	if (regno > FS*4)
  		regno -= 1*4;
-@@ -125,20 +127,28 @@ static unsigned long getreg(struct task_
+@@ -125,20 +128,28 @@ static unsigned long getreg(struct task_
  	unsigned long retval = ~0UL;
  
  	switch (regno >> 2) {
@@ -374,7 +379,7 @@
  	}
  	return retval;
  }
-@@ -230,11 +240,11 @@ void tracehook_enable_single_step(struct
+@@ -230,11 +241,11 @@ void tracehook_enable_single_step(struct
  	/*
  	 * If TF was already set, don't do anything else
  	 */
@@ -388,7 +393,7 @@
  
  	/*
  	 * ..but if TF is changed by the instruction we will trace,
-@@ -255,29 +265,311 @@ void tracehook_disable_single_step(struc
+@@ -255,20 +266,300 @@ void tracehook_disable_single_step(struc
  	/* But touch TF only if it was set by us.. */
  	if (test_and_clear_tsk_thread_flag(child, TIF_FORCED_TF)) {
  		struct pt_regs *regs = get_child_regs(child);
@@ -697,6 +702,9 @@
  /*
   * Perform get_thread_area on behalf of the traced child.
   */
+@@ -273,11 +564,13 @@ void ptrace_disable(struct task_struct *
+  * Perform get_thread_area on behalf of the traced child.
+  */
  static int
 -ptrace_get_thread_area(struct task_struct *child,
 -		       int idx, struct user_desc __user *user_desc)
@@ -712,7 +720,7 @@
  
  /*
   * Get the current Thread-Local Storage area:
-@@ -299,23 +591,29 @@ ptrace_get_thread_area(struct task_struc
+@@ -299,23 +592,29 @@ ptrace_get_thread_area(struct task_struc
  #define GET_PRESENT(desc)	(((desc)->b >> 15) & 1)
  #define GET_USEABLE(desc)	(((desc)->b >> 20) & 1)
  
@@ -759,7 +767,7 @@
  
  	return 0;
  }
-@@ -324,304 +622,120 @@ ptrace_get_thread_area(struct task_struc
+@@ -324,304 +623,123 @@ ptrace_get_thread_area(struct task_struc
   * Perform set_thread_area on behalf of the traced child.
   */
  static int
@@ -1110,16 +1118,19 @@
 + */
 +static const struct utrace_regset native_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = FRAME_SIZE, .size = sizeof(long), .align = sizeof(long),
 +		.get = genregs_get, .set = genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpregs_active,
 +		.get = fpregs_get, .set = fpregs_set
 +	},
 +	{
++		.core_note_type = NT_PRXFPREG,
 +		.n = sizeof(struct user_fxsr_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpxregs_active,
@@ -1160,11 +1171,15 @@
  void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
  {
  	struct siginfo info;
---- linux-2.6/arch/x86_64/ia32/ptrace32.c
-+++ linux-2.6/arch/x86_64/ia32/ptrace32.c
-@@ -16,7 +16,11 @@
+Index: b/arch/x86_64/ia32/ptrace32.c
+===================================================================
+--- a/arch/x86_64/ia32/ptrace32.c
++++ b/arch/x86_64/ia32/ptrace32.c
+@@ -15,8 +15,13 @@
+ #include <linux/syscalls.h>
  #include <linux/unistd.h>
  #include <linux/mm.h>
++#include <linux/err.h>
  #include <linux/ptrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/module.h>
@@ -1174,7 +1189,7 @@
  #include <asm/compat.h>
  #include <asm/uaccess.h>
  #include <asm/user32.h>
-@@ -25,7 +29,8 @@
+@@ -25,7 +30,8 @@
  #include <asm/debugreg.h>
  #include <asm/i387.h>
  #include <asm/fpu32.h>
@@ -1184,7 +1199,7 @@
  
  /*
   * Determines which flags the user has access to [1 = access, 0 = no access].
-@@ -35,34 +40,41 @@
+@@ -35,34 +41,41 @@
  #define FLAG_MASK 0x54dd5UL
  
  #define R32(l,q) \
@@ -1239,7 +1254,7 @@
  		if ((val & 3) != 3) return -EIO;
  		stack[offsetof(struct pt_regs, cs)/8] = val & 0xffff;
  		break;
-@@ -78,57 +90,16 @@ static int putreg32(struct task_struct *
+@@ -78,57 +91,16 @@ static int putreg32(struct task_struct *
  	R32(eip, rip);
  	R32(esp, rsp);
  
@@ -1300,7 +1315,7 @@
  	}
  	return 0;
  }
-@@ -136,24 +107,33 @@ static int putreg32(struct task_struct *
+@@ -136,24 +108,33 @@ static int putreg32(struct task_struct *
  #undef R32
  
  #define R32(l,q) \
@@ -1347,7 +1362,7 @@
  		break;
  
  	R32(cs, cs);
-@@ -167,239 +147,456 @@ static int getreg32(struct task_struct *
+@@ -167,239 +148,459 @@ static int getreg32(struct task_struct *
  	R32(eax, rax);
  	R32(orig_eax, orig_rax);
  	R32(eip, rip);
@@ -1396,7 +1411,7 @@
  
 -static long ptrace32_siginfo(unsigned request, u32 pid, u32 addr, u32 data)
 +asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
- {
++{
 +	return -ENOSYS;
 +}
 +
@@ -1405,7 +1420,7 @@
 +		 const struct utrace_regset *regset,
 +		 unsigned int pos, unsigned int count,
 +		 void *kbuf, void __user *ubuf)
-+{
+ {
 +	if (kbuf) {
 +		u32 *kp = kbuf;
 +		while (count > 0) {
@@ -1473,7 +1488,13 @@
 +		void *kbuf, void __user *ubuf)
 +{
 +	struct user_i387_ia32_struct fp;
-+	int ret;
+ 	int ret;
+-	compat_siginfo_t __user *si32 = compat_ptr(data);
+-	siginfo_t ssi; 
+-	siginfo_t __user *si = compat_alloc_user_space(sizeof(siginfo_t));
+-	if (request == PTRACE_SETSIGINFO) {
+-		memset(&ssi, 0, sizeof(siginfo_t));
+-		ret = copy_siginfo_from_user32(&ssi, si32);
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -1497,13 +1518,7 @@
 +		const void *kbuf, const void __user *ubuf)
 +{
 +	struct user_i387_ia32_struct fp;
- 	int ret;
--	compat_siginfo_t __user *si32 = compat_ptr(data);
--	siginfo_t ssi; 
--	siginfo_t __user *si = compat_alloc_user_space(sizeof(siginfo_t));
--	if (request == PTRACE_SETSIGINFO) {
--		memset(&ssi, 0, sizeof(siginfo_t));
--		ret = copy_siginfo_from_user32(&ssi, si32);
++	int ret;
 +
 +	if (tsk_used_math(target)) {
 +		if (target == current)
@@ -1645,41 +1660,33 @@
 -		else
 -			ret = put_user(val, (unsigned int __user *)datap); 
 -		break; 
-+	target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
- 
+-
 -	case PTRACE_POKEDATA:
 -	case PTRACE_POKETEXT:
 -		ret = 0;
 -		if (access_process_vm(child, addr, &data, sizeof(u32), 1)!=sizeof(u32))
 -			ret = -EIO; 
 -		break;
-+	return ret;
-+}
++	target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
  
 -	case PTRACE_PEEKUSR:
 -		ret = getreg32(child, addr, &val);
 -		if (ret == 0)
 -			ret = put_user(val, (__u32 __user *)datap);
 -		break;
-+static int
-+ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
-+{
-+	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
-+		return 8;
-+	return 0;
++	return ret;
 +}
  
 -	case PTRACE_POKEUSR:
 -		ret = putreg32(child, addr, data);
 -		break;
 +static int
-+ia32_dbregs_get(struct task_struct *target,
-+		const struct utrace_regset *regset,
-+		unsigned int pos, unsigned int count,
-+		void *kbuf, void __user *ubuf)
++ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
 +{
-+	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
-+		u32 val;
++	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
++		return 8;
++	return 0;
++}
  
 -	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 -		int i;
@@ -1692,6 +1699,15 @@
 -			getreg32(child, i, &val);
 -			ret |= __put_user(val,(u32 __user *)datap);
 -			datap += sizeof(u32);
++static int
++ia32_dbregs_get(struct task_struct *target,
++		const struct utrace_regset *regset,
++		unsigned int pos, unsigned int count,
++		void *kbuf, void __user *ubuf)
++{
++	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
++		u32 val;
++
 +		/*
 +		 * The hardware updates the status register on a debug trap,
 +		 * but do_debug (traps.c) saves it for us when that happens.
@@ -1934,8 +1950,8 @@
 +	put_cpu();
 +
 +	return 0;
- }
- 
++}
++
 +/*
 + * Determine how many TLS slots are in use.
 + */
@@ -1950,8 +1966,8 @@
 +			break;
 +	}
 +	return i;
-+}
-+
+ }
+ 
 +
 +/*
 + * This should match arch/i386/kernel/ptrace.c:native_regsets.
@@ -1959,17 +1975,20 @@
 + */
 +static const struct utrace_regset ia32_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = sizeof(struct user_regs_struct32)/4,
 +		.size = 4, .align = 4,
 +		.get = ia32_genregs_get, .set = ia32_genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_ia32_struct) / 4,
 +		.size = 4, .align = 4,
 +		.active = ia32_fpregs_active,
 +		.get = ia32_fpregs_get, .set = ia32_fpregs_set
 +	},
 +	{
++		.core_note_type = NT_PRXFPREG,
 +		.n = sizeof(struct user32_fxsr_struct) / 4,
 +		.size = 4, .align = 4,
 +		.active = ia32_fpxregs_active,
@@ -1994,8 +2013,10 @@
 +	.name = "i386", .e_machine = EM_386,
 +	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
 +};
---- linux-2.6/arch/x86_64/ia32/fpu32.c
-+++ linux-2.6/arch/x86_64/ia32/fpu32.c
+Index: b/arch/x86_64/ia32/fpu32.c
+===================================================================
+--- a/arch/x86_64/ia32/fpu32.c
++++ b/arch/x86_64/ia32/fpu32.c
 @@ -9,6 +9,7 @@
  #include <asm/processor.h>
  #include <asm/uaccess.h>
@@ -2148,19 +2169,22 @@
 +
 +	return 0;
 +}
---- linux-2.6/arch/x86_64/kernel/ptrace.c
-+++ linux-2.6/arch/x86_64/kernel/ptrace.c
-@@ -19,7 +19,9 @@
+Index: b/arch/x86_64/kernel/ptrace.c
+===================================================================
+--- a/arch/x86_64/kernel/ptrace.c
++++ b/arch/x86_64/kernel/ptrace.c
+@@ -19,7 +19,10 @@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
 +#include <linux/module.h>
++#include <linux/elf.h>
  
 +#include <asm/tracehook.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
  #include <asm/system.h>
-@@ -30,6 +32,7 @@
+@@ -30,6 +33,7 @@
  #include <asm/desc.h>
  #include <asm/proto.h>
  #include <asm/ia32.h>
@@ -2168,7 +2192,7 @@
  
  /*
   * does not yet catch signals sent when the child dies.
-@@ -228,52 +231,61 @@ static int putreg(struct task_struct *ch
+@@ -228,52 +232,61 @@ static int putreg(struct task_struct *ch
  	if (test_tsk_thread_flag(child, TIF_IA32))
  		value &= 0xffffffff;
  	switch (regno) {
@@ -2276,7 +2300,7 @@
  	}
  	put_stack_long(child, regno - sizeof(struct pt_regs), value);
  	return 0;
-@@ -282,298 +294,426 @@ static int putreg(struct task_struct *ch
+@@ -282,295 +295,380 @@ static int putreg(struct task_struct *ch
  static unsigned long getreg(struct task_struct *child, unsigned long regno)
  {
  	unsigned long val;
@@ -2906,6 +2930,10 @@
  	return ret;
  }
  
+@@ -574,6 +672,51 @@ long arch_ptrace(struct task_struct *chi
+ 	return ret;
+ }
+ 
 +
 +/*
 + * These are our native regset flavors.
@@ -2913,10 +2941,12 @@
 + */
 +static const struct utrace_regset native_regsets[] = {
 +	{
++		.core_note_type = NT_PRSTATUS,
 +		.n = sizeof(struct user_regs_struct)/8, .size = 8, .align = 8,
 +		.get = genregs_get, .set = genregs_set
 +	},
 +	{
++		.core_note_type = NT_PRFPREG,
 +		.n = sizeof(struct user_i387_struct) / sizeof(long),
 +		.size = sizeof(long), .align = sizeof(long),
 +		.active = fpregs_active,
@@ -2952,8 +2982,10 @@
  asmlinkage void syscall_trace_enter(struct pt_regs *regs)
  {
  	/* do the secure computing check first */
---- linux-2.6/arch/powerpc/kernel/Makefile
-+++ linux-2.6/arch/powerpc/kernel/Makefile
+Index: b/arch/powerpc/kernel/Makefile
+===================================================================
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
 @@ -10,12 +10,14 @@ CFLAGS_prom_init.o      += -fPIC
  CFLAGS_btext.o		+= -fPIC
  endif
@@ -2970,8 +3002,10 @@
  				   paca.o cpu_setup_ppc970.o \
  				   cpu_setup_pa6t.o \
  				   firmware.o sysfs.o nvram_64.o
---- linux-2.6/arch/powerpc/kernel/ptrace32.c
-+++ linux-2.6/arch/powerpc/kernel/ptrace32.c
+Index: b/arch/powerpc/kernel/ptrace32.c
+===================================================================
+--- a/arch/powerpc/kernel/ptrace32.c
++++ /dev/null
 @@ -1,443 +0,0 @@
 -/*
 - * ptrace for 32-bit processes running on a 64-bit kernel.
@@ -3416,8 +3450,10 @@
 -	unlock_kernel();
 -	return ret;
 -}
---- linux-2.6/arch/powerpc/kernel/ptrace.c
-+++ linux-2.6/arch/powerpc/kernel/ptrace.c
+Index: b/arch/powerpc/kernel/ptrace.c
+===================================================================
+--- a/arch/powerpc/kernel/ptrace.c
++++ b/arch/powerpc/kernel/ptrace.c
 @@ -27,9 +27,8 @@
  #include <linux/signal.h>
  #include <linux/seccomp.h>
@@ -4229,8 +4265,10 @@
  
  void do_syscall_trace_enter(struct pt_regs *regs)
  {
---- linux-2.6/arch/powerpc/kernel/ptrace-common.h
-+++ linux-2.6/arch/powerpc/kernel/ptrace-common.h
+Index: b/arch/powerpc/kernel/ptrace-common.h
+===================================================================
+--- a/arch/powerpc/kernel/ptrace-common.h
++++ /dev/null
 @@ -1,145 +0,0 @@
 -/*
 - *    Copyright (c) 2002 Stephen Rothwell, IBM Coproration
@@ -4377,8 +4415,10 @@
 -}
 -
 -#endif /* _PPC64_PTRACE_COMMON_H */
---- linux-2.6/kernel/ptrace.c
-+++ linux-2.6/kernel/ptrace.c
+Index: b/kernel/ptrace.c
+===================================================================
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
 @@ -99,12 +99,6 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
@@ -4402,8 +4442,10 @@
  	return -ENOSYS;
  }
 -#endif /* __ARCH_SYS_PTRACE */
---- linux-2.6/include/linux/tracehook.h
-+++ linux-2.6/include/linux/tracehook.h
+Index: b/include/linux/tracehook.h
+===================================================================
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
 @@ -52,10 +52,10 @@ struct pt_regs;
   * should be one that can be evaluated in modules, i.e. uses exported symbols.
   *
@@ -4419,7 +4461,7 @@
   * Enabling or disabling redundantly is harmless.
   *
   *	void tracehook_enable_block_step(struct task_struct *tsk);
-@@ -93,6 +93,242 @@ struct pt_regs;
+@@ -93,6 +93,253 @@ struct pt_regs;
   */
  
  
@@ -4459,6 +4501,17 @@
 +	unsigned int bias;	/* Bias from natural indexing.  */
 +
 +	/*
++	 * If nonzero, this gives the n_type field (NT_* value) of the
++	 * core file note in which this regset's data appears.
++	 * NT_PRSTATUS is a special case in that the regset data starts
++	 * at offsetof(struct elf_prstatus, pr_reg) into the note data;
++	 * that is part of the per-machine ELF formats userland knows
++	 * about.  In other cases, the core file note contains exactly
++	 * the whole regset (n*size) and nothing else.
++	 */
++	unsigned int core_note_type;
++
++	/*
 +	 * Return -%ENODEV if not available on the hardware found.
 +	 * Return %0 if no interesting state in this thread.
 +	 * Return >%0 number of @size units of interesting state.
@@ -4662,8 +4715,10 @@
  /*
   * Following are entry points from core code, where the user debugging
   * support can affect the normal behavior.  The locking situation is
---- linux-2.6/include/asm-i386/i387.h
-+++ linux-2.6/include/asm-i386/i387.h
+Index: b/include/asm-i386/i387.h
+===================================================================
+--- a/include/asm-i386/i387.h
++++ b/include/asm-i386/i387.h
 @@ -130,17 +130,12 @@ extern int save_i387( struct _fpstate __
  extern int restore_i387( struct _fpstate __user *buf );
  
@@ -4686,8 +4741,10 @@
  
  /*
   * FPU state for core dumps...
---- linux-2.6/include/asm-x86_64/fpu32.h
-+++ linux-2.6/include/asm-x86_64/fpu32.h
+Index: b/include/asm-x86_64/fpu32.h
+===================================================================
+--- a/include/asm-x86_64/fpu32.h
++++ b/include/asm-x86_64/fpu32.h
 @@ -7,4 +7,7 @@ int restore_i387_ia32(struct task_struct
  int save_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf, 
  		   struct pt_regs *regs, int fsave);
@@ -4696,8 +4753,10 @@
 +int set_fpregs32(struct task_struct *, const struct user_i387_ia32_struct *);
 +
  #endif
---- linux-2.6/include/asm-x86_64/tracehook.h
-+++ linux-2.6/include/asm-x86_64/tracehook.h
+Index: b/include/asm-x86_64/tracehook.h
+===================================================================
+--- a/include/asm-x86_64/tracehook.h
++++ b/include/asm-x86_64/tracehook.h
 @@ -48,4 +48,12 @@ static inline void tracehook_abort_sysca
  	regs->orig_rax = -1L;
  }



From fedora-extras-commits at redhat.com  Wed Sep  5 16:20:18 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:20:18 -0400
Subject: rpms/pinot/devel dbusxapianindex_reload03.patch, NONE,
	1.1 pinot.spec, 1.10, 1.11
Message-ID: <200709051620.l85GKIeB015831@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15807

Modified Files:
	pinot.spec 
Added Files:
	dbusxapianindex_reload03.patch 
Log Message:
fix preferences segfault

dbusxapianindex_reload03.patch:

--- NEW FILE dbusxapianindex_reload03.patch ---
--- pinot-0.76_bak/Index/DBusXapianIndex.cpp	2007-08-22 21:58:20.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.cpp	2007-09-01 11:23:26.000000000 +0800
@@ -17,15 +17,6 @@
  */
 
 #include <iostream>
-extern "C"
-{
-#if DBUS_VERSION < 1000000
-#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-}
 
 #include "Languages.h"
 #include "XapianDatabaseFactory.h"
@@ -302,7 +293,7 @@
 /// Asks the D-Bus service to reload its configuration.
 bool DBusXapianIndex::reload(void)
 {
-	bool reloading = false;
+	gboolean reloading = FALSE;
 
 	DBusGConnection *pBus = getBusConnection();
 	if (pBus == NULL)
@@ -333,7 +324,12 @@
 	g_object_unref(pBusProxy);
 	// FIXME: don't we have to call dbus_g_connection_unref(pBus); ?
 
-	return reloading;
+	if (reloading == TRUE)
+	{
+		return true;
+	}
+
+	return false;
 }
 
 
--- pinot-0.76_bak/Index/DBusXapianIndex.h	2007-08-22 21:54:40.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.h	2007-09-01 11:23:37.000000000 +0800
@@ -21,12 +21,15 @@
 
 #include <string>
 #include <set>
+#include "config.h"
 extern "C"
 {
 #if DBUS_VERSION < 1000000
 #define DBUS_API_SUBJECT_TO_CHANGE
 #endif
 #include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 }
 
 #include "XapianIndex.h"
--- pinot-0.76_bak/UI/GTK2/src/pinot.cc	2007-08-22 22:01:28.000000000 +0800
+++ pinot-0.76/UI/GTK2/src/pinot.cc	2007-09-01 10:55:10.000000000 +0800
@@ -29,6 +29,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
+#include "config.h"
 extern "C"
 {
 #if DBUS_VERSION < 1000000
@@ -50,7 +51,6 @@
 #include "ViewHistory.h"
 #include "DownloaderInterface.h"
 #include "XapianIndex.h"
-#include "config.h"
 #include "NLS.h"
 #include "PinotSettings.h"
 #include "mainWindow.hh"


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pinot.spec	23 Aug 2007 15:38:33 -0000	1.10
+++ pinot.spec	5 Sep 2007 16:19:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.76        
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -8,6 +8,7 @@
 URL: http://pinot.berlios.de/            
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
+Patch1: dbusxapianindex_reload03.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -50,7 +51,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .lang_detect
-
+%patch1 -p1 -b .dbus_reload
 
 %build
 %configure
@@ -113,6 +114,9 @@
 %{_libdir}/deskbar-applet/handlers/pinot-*
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-2
+- Add upstream patch to fix preferences segfault
+
 * Thu Aug 23 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-1
 - Update to final 0.76
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:24:43 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:24:43 -0400
Subject: rpms/hardinfo/devel hardinfo.spec,1.18,1.19 libzfix.patch,1.1,1.2
Message-ID: <200709051624.l85GOhsT017948@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17923

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hardinfo.spec	2 Sep 2007 09:07:35 -0000	1.18
+++ hardinfo.spec	5 Sep 2007 16:24:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System     
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-19
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-18
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:07:35 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:24:10 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:27:29 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:27:29 -0400
Subject: rpms/hardinfo/F-7 hardinfo.spec,1.5,1.6 libzfix.patch,1.1,1.2
Message-ID: <200709051627.l85GRTSr018068@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18021

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/hardinfo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hardinfo.spec	2 Sep 2007 09:04:17 -0000	1.5
+++ hardinfo.spec	5 Sep 2007 16:26:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-7
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:04:17 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:26:56 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:27:51 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 5 Sep 2007 12:27:51 -0400
Subject: rpms/hardinfo/FC-6 hardinfo.spec,1.4,1.5 libzfix.patch,1.1,1.2
Message-ID: <200709051627.l85GRpPI018111@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18044

Modified Files:
	hardinfo.spec libzfix.patch 
Log Message:
fix libz location


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/hardinfo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hardinfo.spec	2 Sep 2007 09:27:11 -0000	1.4
+++ hardinfo.spec	5 Sep 2007 16:27:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 5%{?dist}
+Release: 7%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-6
+- Fix libz location (/lib(64) vs /usr/lib(64))
+
 * Sun Sep 02 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-5
 - Fix libz detection RH #274381
 

libzfix.patch:

Index: libzfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/libzfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzfix.patch	2 Sep 2007 09:27:11 -0000	1.1
+++ libzfix.patch	5 Sep 2007 16:27:18 -0000	1.2
@@ -5,7 +5,7 @@
      static gint (*compress) (gchar *dst, glong *dstlen,
                               const gchar *src, glong srclen) = NULL;
  
-+    char* libz_locations[5] = {"libz","/usr/lib/libz.so","/usr/lib64/libz.so","/usr/lib/libz.so.1","/usr/lib64/libz.so.1"};
++    char* libz_locations[5] = {"libz","/lib/libz.so","/lib64/libz.so","/lib/libz.so.1","/lib64/libz.so.1"};
 +    int z;
 +
      if (!(compress && compressBound)) {



From fedora-extras-commits at redhat.com  Wed Sep  5 16:32:49 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 5 Sep 2007 12:32:49 -0400
Subject: rpms/pixman/devel .cvsignore, 1.4, 1.5 pixman.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <200709051632.l85GWncQ018351@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18302/devel

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
pixman 0.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 17:20:46 -0000	1.4
+++ .cvsignore	5 Sep 2007 16:32:16 -0000	1.5
@@ -1 +1 @@
-pixman-20070827.tar.bz2
+pixman-0.9.5.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pixman.spec	27 Aug 2007 17:20:46 -0000	1.6
+++ pixman.spec	5 Sep 2007 16:32:16 -0000	1.7
@@ -2,20 +2,21 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.9.0
-Release:        7.%{gitdate}%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://gitweb.freedesktop.org/?p=pixman.git;a=summary
-# Git snapshot.  To recreate:
-# ./make-pixman-snapshot.sh %{gitrev}
-Source0:        pixman-%{gitdate}.tar.bz2
+URL:            http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+# To make git snapshots:
+# ./make-pixman-snapshot.sh %{?gitrev}
+# if no revision specified, makes a new one from HEAD.
+Source0:        pixman-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake autoconf libtool pkgconfig
+# BuildRequires:  automake autoconf libtool pkgconfig
 
 %description
 Pixman is a pixel manipulation library for X and cairo.
@@ -30,10 +31,9 @@
 Development library for pixman.
 
 %prep
-%setup -q -n %{name}-%{gitdate}
+%setup -q
 
 %build
-./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 0.9.5-1
+- Update to 0.9.5 release.
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.9.0-7.20070827
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 17:20:46 -0000	1.4
+++ sources	5 Sep 2007 16:32:16 -0000	1.5
@@ -1 +1 @@
-9800e9d33a255efcd982e2acc57c2ddd  pixman-20070827.tar.bz2
+f9fea77e46ec7a3a16e925e137f146e7  pixman-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 16:33:19 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:33:19 -0400
Subject: rpms/hunspell/devel .cvsignore, 1.11, 1.12 hunspell.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <200709051633.l85GXJeN018406@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18343

Modified Files:
	.cvsignore hunspell.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2007 07:15:28 -0000	1.11
+++ .cvsignore	5 Sep 2007 16:32:47 -0000	1.12
@@ -1 +1 @@
-hunspell-1.1.11-2.tar.gz
+hunspell-1.1.12-2.tar.gz


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hunspell.spec	28 Aug 2007 07:15:28 -0000	1.27
+++ hunspell.spec	5 Sep 2007 16:32:47 -0000	1.28
@@ -1,8 +1,8 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
-Version:   1.1.11.2
+Version:   1.1.12.2
 Release:   1%{?dist}
-Source:    http://downloads.sourceforge.net/%{name}/hunspell-1.1.11-2.tar.gz
+Source:    http://downloads.sourceforge.net/%{name}/hunspell-1.1.12-2.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +25,7 @@
 Includes and definitions for developing with hunspell
 
 %prep
-%setup -q -n hunspell-1.1.11
+%setup -q -n hunspell-1.1.12
 
 %build
 libtoolize --automake --force
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
+* Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> - 1.1.12.2-1
+- next version
+
 * Tue Aug 28 2007 Caolan McNamara <caolanm at redhat.com> - 1.1.11.2-1
 - next version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2007 07:15:28 -0000	1.11
+++ sources	5 Sep 2007 16:32:47 -0000	1.12
@@ -1 +1 @@
-828b4a742b9636046ebf208fc2d6324b  hunspell-1.1.11-2.tar.gz
+f4bb481a318eb388e07773f22be853d5  hunspell-1.1.12-2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 16:36:24 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:36:24 -0400
Subject: rpms/libgsf/devel .cvsignore, 1.18, 1.19 libgsf.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <200709051636.l85GaOkU018588@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18549

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Jul 2007 10:39:45 -0000	1.18
+++ .cvsignore	5 Sep 2007 16:35:52 -0000	1.19
@@ -1 +1 @@
-libgsf-1.14.5.tar.bz2
+libgsf-1.14.6.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgsf.spec	29 Aug 2007 07:18:59 -0000	1.47
+++ libgsf.spec	5 Sep 2007 16:35:52 -0000	1.48
@@ -3,8 +3,8 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.5
-Release: 3%{?dist}
+Version: 1.14.6
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -114,6 +114,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> 1.14.6-1
+- next version
+
 * Wed Aug 29 2007 Caolan McNamara <caolanm at redhat.com> 1.14.5-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Jul 2007 10:39:45 -0000	1.18
+++ sources	5 Sep 2007 16:35:52 -0000	1.19
@@ -1 +1 @@
-0c1a70ca77aef5706544c1b4082a632a  libgsf-1.14.5.tar.bz2
+5939265125356730fc1d90c8ee3af7eb  libgsf-1.14.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 16:43:13 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 5 Sep 2007 12:43:13 -0400
Subject: rpms/system-config-firewall/devel
	system-config-firewall-1.0.5-sysconfig.patch, NONE,
	1.1 system-config-firewall.spec, 1.5, 1.6
Message-ID: <200709051643.l85GhD0w018848@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819

Modified Files:
	system-config-firewall.spec 
Added Files:
	system-config-firewall-1.0.5-sysconfig.patch 
Log Message:
- fixed problem if /etc/sysconfig/system-config-securtylevel and 
  /etc/sysconfig/system-config-firewall are not readable



system-config-firewall-1.0.5-sysconfig.patch:

--- NEW FILE system-config-firewall-1.0.5-sysconfig.patch ---
diff -up system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig system-config-firewall-1.0.5/src/fw_sysconfig.py
--- system-config-firewall-1.0.5/src/fw_sysconfig.py.sysconfig	2007-08-17 17:24:58.000000000 +0200
+++ system-config-firewall-1.0.5/src/fw_sysconfig.py	2007-09-05 18:39:06.000000000 +0200
@@ -31,7 +31,7 @@ def read_sysconfig_config(merge_config=N
     try:
         fd = open(filename, 'r')
     except:
-        return None
+        return merge_config
     argv = [ ]
     for line in fd.xreadlines():
         if not line:


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-firewall.spec	31 Aug 2007 17:39:11 -0000	1.5
+++ system-config-firewall.spec	5 Sep 2007 16:42:34 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -11,6 +11,7 @@
 Source0: %{name}-%{version}.tar.bz2
 Patch0: system-config-firewall-1.0.5-lokkit.patch
 Patch1: system-config-firewall-1.0.5-modules.patch
+Patch2: system-config-firewall-1.0.5-sysconfig.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -49,6 +50,7 @@
 %setup -q
 %patch0 -p1 -b .lokkit
 %patch1 -p1 -b .modules
+%patch2 -p1 -b .sysconfig
 
 %install
 rm -rf %{buildroot}
@@ -122,6 +124,10 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Wed Sep  5 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-4
+- fixed problem if /etc/sysconfig/system-config-securtylevel and 
+  /etc/sysconfig/system-config-firewall are not readable
+
 * Fri Aug 31 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-3
 - fixed problem if IP*TABLES_MODULES is not set in config files
 



From fedora-extras-commits at redhat.com  Wed Sep  5 16:59:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 5 Sep 2007 12:59:44 -0400
Subject: rpms/libgsf/devel libgsf.spec,1.48,1.49
Message-ID: <200709051659.l85GxiQx019459@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435

Modified Files:
	libgsf.spec 
Log Message:
new libgsf


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgsf.spec	5 Sep 2007 16:35:52 -0000	1.48
+++ libgsf.spec	5 Sep 2007 16:59:04 -0000	1.49
@@ -13,6 +13,9 @@
 BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
@@ -61,12 +64,34 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang libgsf
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.la
 
-%post -p /sbin/ldconfig
+#%pre
+#if [ "$1" -gt 1 ]; then
+#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#    gconftool-2 --makefile-uninstall-rule \
+#      %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas >/dev/null
+#    # If the schema file has ever been renamed::
+#    #gconftool-2 --makefile-uninstall-rule \
+#    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null
+#fi
+
+%post
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.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/gsf-office-thumbnailer.schemas > /dev/null
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -76,6 +101,7 @@
 %{_libdir}/libgsf-1.so.*
 %{_bindir}/gsf-office-thumbnailer
 %{_mandir}/man1/gsf-office-thumbnailer.1.gz
+%{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
 
 %files gnome
 %defattr(-,root,root,-)
@@ -94,6 +120,7 @@
 %dir %{_includedir}/libgsf-1
 %{_includedir}/libgsf-1/gsf
 %{_includedir}/libgsf-1/gsf-win32
+%{_includedir}/libgsf-1/gsf-gvfs
 %{_datadir}/gtk-doc/html/gsf
 %{_mandir}/man1/gsf.1.gz
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:09:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:09:30 -0400
Subject: comps comps-f8.xml.in,1.90,1.91
Message-ID: <200709051709.l85H9U9Y025736@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25653

Modified Files:
	comps-f8.xml.in 
Log Message:
add vinagre



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- comps-f8.xml.in	5 Sep 2007 06:15:55 -0000	1.90
+++ comps-f8.xml.in	5 Sep 2007 17:08:59 -0000	1.91
@@ -1697,6 +1697,7 @@
       <packagereq type="optional">themes-backgrounds-gnome</packagereq>
       <packagereq type="optional">tracker-search-tool</packagereq>
       <packagereq type="optional">verbiste-gnome</packagereq>
+      <packagereq type="optional">vinagre</packagereq>
       <packagereq type="optional">wallpapoz</packagereq>
       <packagereq type="optional">wp_tray</packagereq>
       <packagereq type="optional">xscreensaver-extras-gss</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 17:23:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Wed, 05 Sep 2007 10:23:56 -0700
Subject: [pkgdb] kudzu: ajax has requested commit
Message-ID: <200709051723.l85HNvW3018256@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on kudzu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kudzu



From fedora-extras-commits at redhat.com  Wed Sep  5 17:28:22 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 13:28:22 -0400
Subject: rpms/iso-codes/devel .cvsignore, 1.9, 1.10 iso-codes.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200709051728.l85HSMoT026061@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25975

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.4-1
- Update to 1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Aug 2007 03:15:51 -0000	1.9
+++ .cvsignore	5 Sep 2007 17:27:50 -0000	1.10
@@ -1 +1 @@
-iso-codes-1.3.tar.gz
+iso-codes_1.4.orig.tar.gz


Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iso-codes.spec	9 Aug 2007 03:42:32 -0000	1.13
+++ iso-codes.spec	5 Sep 2007 17:27:50 -0000	1.14
@@ -3,7 +3,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -63,6 +63,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.4-1
+- Update to 1.4
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> 1.3-1
 - Update to 1.3
 - Update the license field


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Aug 2007 03:15:51 -0000	1.9
+++ sources	5 Sep 2007 17:27:50 -0000	1.10
@@ -1 +1 @@
-5f275f795f39795f3747bb1c60276e08  iso-codes-1.3.tar.gz
+c0389096d35645b36a55d0ab6529e5a3  iso-codes_1.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 17:30:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Wed, 5 Sep 2007 13:30:44 -0400
Subject: rpms/gnome-session/devel gnome-session-2.17.5-window-manager.patch, 
	1.4, 1.5 gnome-session.spec, 1.137, 1.138
Message-ID: <200709051730.l85HUiXh026233@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26210

Modified Files:
	gnome-session-2.17.5-window-manager.patch gnome-session.spec 
Log Message:
* Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
- Update gnome-session-2.17.5-window-manager.patch to apply (remove
  chunks that are now upstream).


gnome-session-2.17.5-window-manager.patch:

Index: gnome-session-2.17.5-window-manager.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session-2.17.5-window-manager.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-session-2.17.5-window-manager.patch	10 Aug 2007 19:09:52 -0000	1.4
+++ gnome-session-2.17.5-window-manager.patch	5 Sep 2007 17:30:41 -0000	1.5
@@ -49,30 +49,3 @@
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
-@@ -82,6 +87,7 @@ fi
- OPT1=
- OPT2=
- OPT3=
-+OPT4=
- if [ ! -z "$SMID" ] ; then
-   case `basename $WINDOW_MANAGER` in
-     sawfish|sawmill|metacity)
-@@ -117,14 +123,16 @@ fi
- 
- case `basename $WINDOW_MANAGER` in
-   compiz)
-+    export LIBGL_ALWAYS_INDIRECT=1
-     gtk-window-decorator &
--    OPT3=gconf
-+    OPT3=glib
-+    OPT4=gconf
-     ;;
-   beryl)
-     emerald &
-     ;;
- esac
- 
--exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
-+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
- 
- echo "ERROR: No window manager could run!"


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-session.spec	4 Sep 2007 19:27:48 -0000	1.137
+++ gnome-session.spec	5 Sep 2007 17:30:41 -0000	1.138
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -185,6 +185,10 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
+- Update gnome-session-2.17.5-window-manager.patch to apply (remove
+  chunks that are now upstream).
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:35:31 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 13:35:31 -0400
Subject: rpms/iso-codes/devel iso-codes.spec,1.14,1.15
Message-ID: <200709051735.l85HZVKs026524@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26488

Modified Files:
	iso-codes.spec 
Log Message:
fix the Source: line



Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iso-codes.spec	5 Sep 2007 17:27:50 -0000	1.14
+++ iso-codes.spec	5 Sep 2007 17:34:58 -0000	1.15
@@ -8,7 +8,7 @@
 License:	LGPLv2+
 Group:	System Environment/Base
 URL:	http://alioth.debian.org/projects/pkg-isocodes/
-Source:	http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes-%{version}.tar.gz
+Source:	http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_%{version}.orig.tar.gz
 BuildRequires:	gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Sep  5 17:36:22 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 5 Sep 2007 13:36:22 -0400
Subject: rpms/koffice/devel koffice.spec,1.65,1.66
Message-ID: <200709051736.l85HaMik026631@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26595

Modified Files:
	koffice.spec 
Log Message:
* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-11
- rebuild (for poppler) 
- re-enable (kross)ruby support (f8+)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- koffice.spec	22 Aug 2007 08:00:10 -0000	1.65
+++ koffice.spec	5 Sep 2007 17:35:50 -0000	1.66
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -51,8 +51,7 @@
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
-# rawhide/ruby is busted atm -- Rex
-%if 0%{?fedora} != 8 || 0%{?rhel} > 4
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
@@ -695,8 +694,13 @@
 
 
 %changelog
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-11
+- rebuild (for poppler) 
+- re-enable (kross)ruby support (f8+)
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 1.6.3-10
+1.6.3-10
 - rebuild for buildid
 
 * Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org>



From fedora-extras-commits at redhat.com  Wed Sep  5 17:42:00 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 5 Sep 2007 13:42:00 -0400
Subject: rpms/mod_evasive/devel mod_evasive.spec,1.2,1.3
Message-ID: <200709051742.l85Hg0qm026822@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/mod_evasive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26790

Modified Files:
	mod_evasive.spec 
Log Message:
Rebuild for APR changes.



Index: mod_evasive.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_evasive/devel/mod_evasive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_evasive.spec	29 Aug 2007 04:17:37 -0000	1.2
+++ mod_evasive.spec	5 Sep 2007 17:41:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mod_evasive
 Version:        1.10.1
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Denial of Service evasion module for Apache
 
 Group:          System Environment/Daemons
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.10.1-4.1
+- Rebuild for APR changes
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.10.1-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 17:43:53 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 5 Sep 2007 13:43:53 -0400
Subject: rpms/eclipse/devel .cvsignore,1.36,1.37 sources,1.48,1.49
Message-ID: <200709051743.l85Hhrag026901@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879

Modified Files:
	.cvsignore sources 
Log Message:
upload source zip for fedora eclipse platform plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	29 Jun 2007 19:40:48 -0000	1.36
+++ .cvsignore	5 Sep 2007 17:43:20 -0000	1.37
@@ -1,3 +1,3 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3.zip
-eclipse-fedora-splash-3.3.0.png
+org.fedoraproject.ide.platform-3.3.0.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	29 Jun 2007 19:40:48 -0000	1.48
+++ sources	5 Sep 2007 17:43:20 -0000	1.49
@@ -1,3 +1,3 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-3f5ee621f738ee107e312817dadacab4  eclipse-fedora-splash-3.3.0.png
 91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
+2a0ca56fa68d685a0f3d23c09000d723  org.fedoraproject.ide.platform-3.3.0.1.zip



From fedora-extras-commits at redhat.com  Wed Sep  5 17:53:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:53:51 -0400
Subject: rpms/libxklavier/devel .cvsignore, 1.12, 1.13 libxklavier.spec, 1.32,
	1.33 sources, 1.12, 1.13
Message-ID: <200709051753.l85Hrpxj027177@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27151

Modified Files:
	.cvsignore libxklavier.spec sources 
Log Message:
3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 May 2007 03:27:30 -0000	1.12
+++ .cvsignore	5 Sep 2007 17:53:18 -0000	1.13
@@ -1 +1 @@
-libxklavier-3.2.tar.bz2
+libxklavier-3.3.tar.gz


Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libxklavier.spec	23 Aug 2007 17:57:19 -0000	1.32
+++ libxklavier.spec	5 Sep 2007 17:53:18 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	3.2
-Release: 	3%{?dist}
+Version:	3.3
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -11,7 +11,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
-Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -25,6 +25,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gtk-doc
 Requires: libxml2-devel
 
 %description devel
@@ -55,7 +56,7 @@
 %files
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README COPYING.LIB 
+%doc AUTHORS NEWS README COPYING.LIB 
 %{_libdir}/lib*.so.*
 %{_datadir}/libxklavier
 
@@ -68,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 3.3-1
+- Update to 3.3
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 3.2-3
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 03:27:30 -0000	1.12
+++ sources	5 Sep 2007 17:53:18 -0000	1.13
@@ -1 +1 @@
-d248f96fdfc0e4f0ed583428eda9a997  libxklavier-3.2.tar.bz2
+0b9a62ad4f007e6c42a70a4f6e0aecbf  libxklavier-3.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 17:58:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 13:58:50 -0400
Subject: rpms/libxklavier/devel libxklavier.spec,1.33,1.34
Message-ID: <200709051758.l85HwoW5027327@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27283

Modified Files:
	libxklavier.spec 
Log Message:
3.3



Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libxklavier.spec	5 Sep 2007 17:53:18 -0000	1.33
+++ libxklavier.spec	5 Sep 2007 17:58:18 -0000	1.34
@@ -11,7 +11,7 @@
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
-Source: http://download.gnome.org/sources/libxklavier/3.2/libxklavier-3.2.tar.gz
+Source: http://download.gnome.org/sources/libxklavier/3.3/libxklavier-3.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description



From fedora-extras-commits at redhat.com  Wed Sep  5 18:10:56 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:10:56 -0400
Subject: rpms/xulrunner/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xulrunner.spec, 1.6, 1.7
Message-ID: <200709051810.l85IAu2D001137@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1112

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Clean up the changelog and move to alpha7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 04:34:18 -0000	1.2
+++ .cvsignore	5 Sep 2007 18:10:23 -0000	1.3
@@ -1 +1 @@
-xulrunner-1.9.alpha6pre.20070628.tar.bz2
+xulrunner-1.9a7-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 04:34:18 -0000	1.2
+++ sources	5 Sep 2007 18:10:23 -0000	1.3
@@ -1 +1 @@
-868349f0f0045acd8174e1fefc0f124e  xulrunner-1.9.alpha6pre.20070628.tar.bz2
+566f4424ca0d30b2dacbdd8fb2670077  xulrunner-1.9a7-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xulrunner.spec	31 Aug 2007 22:26:41 -0000	1.6
+++ xulrunner.spec	5 Sep 2007 18:10:23 -0000	1.7
@@ -14,14 +14,14 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha6.pre.1%{?dist}
+Release:        0.alpha7.1%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball xulrunner-%{version}-source.tar.bz2
 %else
-%define tarball xulrunner-1.9.alpha6pre.20070628.tar.bz2
+%define tarball xulrunner-1.9a7-source.tar.bz2
 %endif
 Source0:        %{tarball}
 Source10:       %{name}-mozconfig
@@ -368,746 +368,5 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Sun Jun  3 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-2
-- Properly clean up threads with newer NSPR
-
-* Wed May 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-1
-- Final version
-
-* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc3
-- Update to 2.0.0.4 RC3
-
-* Tue Apr 17 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-4
-- Fix permissions of the man page
-
-* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-3
-- Ensure initial homepage on all locales is our proper default
-
-* Sun Mar 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-2
-- Fix the symlink to default bookmarks
-- Use mktemp for temp dirs
-
-* Tue Mar 20 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-1
-- Update to 2.0.0.3
-
-* Tue Mar 20 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.2-3
-- Default bookmarks no longer live here; use system-bookmarks
-
-* Mon Mar 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.2-2
-- Oops, define the variables I expect to use.
-
-* Fri Feb 23 2007 Martin Stransky <stransky at redhat.com> 2.0.0.2-1
-- Update to 2002
-
-* Wed Feb 21 2007 David Woodhouse <dwmw2 at redhat.com> 2.0.0.1-6
-- Fix PPC64 runtime
-- Fix firefox script to use 32-bit browser by default on PPC64 hardware
-
-* Fri Feb  9 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-5
-- Start using the specified locale
-
-* Tue Jan 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-4
-- Fix the DND implementation to not grab, so it works with new GTK+.
-
-* Thu Jan 18 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-3
-- Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed.
-
-* Fri Dec 22 2006 Christopher Aillon <caillon at redhat.com> 2.0.0.1-2
-- Strip out some frequent warnings; they muddy up the build output
-
-* Thu Dec 21 2006 Christopher Aillon <caillon at redhat.com> 2.0.0.1-1
-- Update to 2001
-
-* Fri Oct 27 2006 Christopher Aillon <caillon at redhat.com> 2.0-2
-- Tweak the .desktop file
-
-* Tue Oct 24 2006 Christopher Aillon <caillon at redhat.com> 2.0-1
-- Update to 2.0
-- Add patch from Behdad to fix pango printing.
-
-* Wed Oct 11 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-7
-- Add virtual provides for gecko applications.
-
-* Wed Oct  4 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-6
-- Bring the invisible character to parity with GTK+
-
-* Tue Sep 26 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-5
-- Fix crash when changing gtk key theme
-- Fix gtkmozembed window visibility
-- Prevent UI freezes while changing GNOME theme
-- Remove verbiage about pango; no longer required by upstream.
-
-* Tue Sep 19 2006 Christopher Aillon <caillon at redhat/com> 1.5.0.7-4
-- Arrrr! Add Obsoletes: mozilla to avoid GRE conflicts, me hearties!
-
-* Mon Sep 18 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-3
-- Bring back the GRE files for embeddors
-
-* Thu Sep 14 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-2
-- Update default bookmarks for FC6
-
-* Wed Sep 13 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-1
-- Update to 1.5.0.7
-
-* Thu Sep  7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-12
-- Icon tweaks and minor spec-file variable cleanup: s/ffdir/mozappdir/g
-
-* Wed Sep  6 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-11
-- Fix for cursor position in editor widgets by tagoh and behdad (#198759)
-
-* Sun Sep  3 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-10
-- Enable GCC visibility
-- export XLIB_SKIP_ARGB_VISUALS=1 as a temporary workaround to prevent
-  a broken Adobe/Macromedia Flash Player plugin taking the X server.
-
-* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
-- Build with -rpath (#161958)
-
-* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 
-- Remove "Pango breaks MathML" from firefox.sh.in
-
-* Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8
-- Turn visibility back off again for now, as it still breaks the build.
-
-* Sat Aug 26 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-7
-- Remove "Pango breaks MathML" from firefox-1.5-pango-about.patch
-
-* Thu Aug 24 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-6
-- Remove debugging statement from firefox-1.5-pango-mathml.patch
-
-* Wed Aug 23 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-5
-- Attempt to turn visibility back on since the GCC issues should have
-  been fixed.
-
-* Tue Aug 22 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-4
-- Update NSS requires to workaround a bug introduced by NSS changes.
-  https://bugzilla.mozilla.org/show_bug.cgi?id=294542
-  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201922
-
-* Tue Aug 22 2006 Behdad Esfahbod <besfahbo at redhat.com>
-- Add a better nopangoxft patch that doesn't depend on pangocairo
-- Add firefox-1.5-pango-mathml.patch (bug 150393)
-
-* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-3
-- Rebuild
-
-* Thu Aug 03 2006 Kai Engert <kengert at redhat.com> - 1.5.0.6-2
-- Update to 1.5.0.6
-
-* Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-8
-- Pass --libdir to configure
-
-* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
-- Dereference links in %%install so the files get put in the
-  right place.
-
-* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
-- Actually, those pkgconfig files really shouldn't be here as we use
-  system nss and nspr.
-
-* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-5
-- Add more pkgconfig files
-
-* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4
-- Add pkgconfig files
-
-* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-3
-- Don't strip provides when building the devel package
-
-* Wed Jul 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
-- Update to 1.5.0.5
-
-* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.4-4
-- Ugh:
-  - Mozilla the platform is deprecated
-  - XULrunner has been promised for a while but is still not 1.0
-  - Ship a firefox-devel for now as we need a devel platform.
-  - The plan is to kill firefox-devel when xulrunner 1.0 ships. 
-- Clean up the files list a little bit.
-
-* Thu Jun 15 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-3
-- Force "gmake -j1" on ppc ppc64 s390 s390x
-
-* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
-- Firefox 1.5.0.4
-
-* Thu May  4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.3-2
-- Firefox 1.5.0.3
-
-* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-4
-- Really drop the broken langpacks this time.
-
-* Tue Apr 18 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-3
-- Drop some broken langpacks
-
-* Thu Apr 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
-- Firefox 1.5.0.2
-
-* Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
-- Add a notice to the about dialog denoting this is a pango enabled build.
-- Tweak the user agent denoting this is a pango enabled build.
-
-* Mon Mar  6 2006 Warren Togami <wtogami at redhat.com> - 1.5.0.1-7
-- make links point to the correct release
-
-* Mon Mar  6 2006 Ray Strode <rstrode at redhat.com> - 1.5.0.1-6
-- Add new bookmarks file from Warren (bug 182386)
-
-* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de>
-- add buildrequires libXt-devel for X11/Intrinsic.h, X11/Shell.h
-
-* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-5
-- Rebuild
-
-* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-4
-- Ensure our wrapper handles URLs with commas/spaces (Ilya Konstantinov)
-- Fix a pango typo
-
-* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-3
-- Improve the langpack install stuff
-- Fix up dumpstack.patch to match the finalized change
-
-* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.1-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2
-- Update language packs to 1.5.0.1
-- Add dumpstack.patch
-
-* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
-- Update to 1.5.0.1
-
-* Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
-- Ship langpacks again from upstream
-- Stop providing MozillaFirebird and mozilla-firebird
-
-* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.5-4
-- Looks like we can build ppc64 again.  Happy New Year!
-
-* Fri Dec 16 2005 Christopher Aillon <caillon at redhat.com> - 1.5-3
-- Once again, disable ppc64 because of a new issue.
-  See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944
-
-* Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> - 1.5-2
-- Use the system NSS libraries
-- Build on ppc64
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Nov 29 2005 Christopher Aillon <caillon at redhat.com> - 1.5-1
-- Update to Firefox 1.5
-
-* Mon Nov 28 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.1.rc3
-- Fix issue with popup dialogs and other actions causing lockups
-
-* Fri Nov 18 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.rc3
-- Update to 1.5 rc3
-
-* Thu Nov  3 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.rc1
-- Update to 1.5 rc1
-- Clean up the default bookmarks
-
-* Sat Oct  8 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.beta2
-- Update to 1.5 beta 2
-
-* Wed Sep 14 2005 Christopher Aillon <caillon at redhat.com> - 1.5-0.5.0.beta1
-- Update to 1.5 beta 1.
-- Add patch to svg rendering to adjust for cairo behavior.
-- Happy birthday, dad!
-
-* Sat Aug 27 2005 Christopher Aillon <caillon at redhat.com> - 1.1-0.2.8.deerpark.alpha2
-- Re-enable SVG, canvas, and system cairo.
-- Fix issue with typing in proxy preference panel
-
-* Thu Aug 18 2005 Jeremy Katz <katzj at redhat.com> - 1.1-0.2.7.deerpark.alpha2.1
-- another fix to not use pango_xft
-
-* Mon Aug 15 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.6.deerpark.alpha2
-- Rebuild
-
-* Fri Jul 29 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.5.deerpark.alpha2
-- Re-enable ppc now that its binutils are fixed.
-- Disable SVG and canvas again.  The in-tree copy does not build against new pango.
-- When clicking a link and going back via history, don't keep the link focused.
-
-* Fri Jul 22 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.4.deerpark.alpha2
-- Add patch from Christian Persch to make the file chooser modal
-- Change default behavior of opening links from external apps to: New Tab
-- New build options:
-  --enable-svg
-  --enable-canvas
-
-* Wed Jul 20 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.3.deerpark.alpha2
-- Update firefox-1.1-uriloader.patch to fix crashes when calling into gnome-vfs2
-
-* Tue Jul 19 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.2.deerpark.alpha2
-- Do away with firefox-rebuild-databases.pl
-
-* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.2.1.deerpark.alpha2
-- Rebuild
-
-* Mon Jul 18 2005 Christopher Aillon <caillon at redhat.com> 1.1-0.0.1.deerpark.alpha2
-- Update to Deer Park Alpha 2
-  - STILL TODO:
-    - This build is not localized yet.
-    - Theme issues not yet resolved.
-    - Building on ppc platforms is busted, disable them for now.
-    - Forward port all remaining patches.
-
-* Sun Jul 17 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-6
-- Avoid a crash on 64bit platforms
-- Use system NSPR
-
-* Thu Jun 23 2005 Kristian H??gsberg <krh at redhat.com>  0:1.0.4-5
-- Add firefox-1.0-pango-cairo.patch to get rid of the last few Xft
-  references, fixing the "no fonts" problem.
-- Copy over changes from FC4 branch.
-
-* Tue May 24 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-4
-- Only install searchplugins for en-US, since there isn't any way
-  to dynamically select searchplugins per locale yet.
-
-* Mon May 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-3
-- Add support for locales:
-    af-ZA, ast-ES, ca-AD, cs-CZ, cy-GB, da-DK, de-DE, el-GR,
-    en-GB  es-AR, es-ES, eu-ES, fi-FI, fr-FR, ga-IE, he-IL,
-    hu-HU, it-IT, ko-KR, ja-JP, ja-JPM, mk-MK, nb-NO, nl-NL,
-    pa-IN, pl-PL, pt-BR, pt-PT, ro-RO, ru-RU, sk-SK, sl-SI,
-    sq-AL, sv-SE, tr-TR, zh-CN, zh-TW
-
-* Wed May 11 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.4-2
-- Update to 1.0.4
-
-* Mon May  9 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-5
-- Correctly position the IM candidate window for most locales
-  Note: it is still incorrectly positioned for zh_TW after this fix
-- Add temporary workaround to not create files in the user's $HOME (#149664)
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-4
-- Rebuild
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com>
-- Patch from Marcel Mol supporting launching with filenames
-  containing whitespace.
-
-* Tue May  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-3
-- Firefox script fixes to support multilib installs.
-- Add upstream patch to fix bidi justification of pango
-- Add patch to fix launching of helper applications
-
-* Wed Apr 27 2005 Warren Togami <wtogami at redhat.com>
-- remove JVM version probing (#116445)
-- correct confusing PANGO vars in startup script
-
-* Fri Apr 15 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-2
-- Add patch to properly link against libgfxshared_s.a
-
-* Fri Apr 15 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-1
-- Update to security release 1.0.3
-
-* Tue Apr 12 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-4
-- Update useragent patch to match upstream.
-- Add nspr-config 64 bit patch from rstrode at redhat.com
-
-* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-3
-- Updated firefox icon (https://bugzilla.mozilla.org/show_bug.cgi?id=261679)
-- Fix for some more cursor issues in textareas (149991, 150002, 152089)
-
-* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-2
-- Make the "browser.link.open_external" pref work (David Fraser)
-
-* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.2-1
-- Firefox 1.0.2
-
-* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-6
-- Add patch to fix italic rendering errors with certain fonts (e.g. Tahoma)
-- Re-enable jsd since there is now a venkman version that works with Firefox.
-
-* Tue Mar  8 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-5
-- Add patch to compile against new fortified glibc macros
-
-* Fri Mar  4 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-4
-- Build against gcc4, add build patches to do so.
-
-* Thu Mar  3 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-3
-- Remerge firefox-1.0-pango-selection.patch
-- Add execshield patches for ia64 and ppc
-- BuildRequires libgnome-devel, libgnomeui-devel
-
-* Sun Feb 27 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-2
-- Add upstream fix to reduce round trips to xserver during remote control
-- Add upstream fix to call g_set_application_name
-
-* Thu Feb 24 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-1
-- Update to 1.0.1 fixing several security flaws.
-- Temporarily disable langpacks to workaround startup issues (#145806)
-- Request the correct system colors from gtk (#143423)
-
-* Tue Dec 28 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-8
-- Add upstream langpacks
-
-* Sat Dec 25 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-7
-- Make sure we get a URL passed in to firefox (#138861)
-- Mark some generated files as ghost (#136015)
-
-* Wed Dec 15 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-6
-- Don't have downloads "disappear" when downloading to desktop (#139015)
-- Add RPM version to the useragent
-- BuildRequires pango-devel
-
-* Sat Dec 11 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-5
-- Fix spacing in textareas when using pango for rendering
-- Enable pango rendering by default.
-- Enable smooth scrolling by default
-
-* Fri Dec  3 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-4
-- Add StartupWMClass patch from Damian Christey (#135830)
-- Use system colors by default (#137810)
-- Re-add s390(x)
-
-* Sat Nov 20 2004 Christopher Blizzard <blizzard at redhat.com> 0:1.0-3
-- Add patch that uses pango for selection.
-
-* Fri Nov 12 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-2
-- Fix livemarks icon issue. (#138989)
-
-* Tue Nov  8 2004 Christopher Aillon <caillon at redhat.com> 0:1.0-1
-- Firefox 1.0
-
-* Thu Nov  4 2004 Christopher Aillon <caillon at redhat.com> 0:0.99-1.0RC1.3
-- Add support for GNOME stock icons. (bmo #233461)
-
-* Sat Oct 30 2004 Warren Togami <wtogami at redhat.com> 0:0.99-1.0RC1.2
-- #136330 BR freetype-devel with conditions
-- #135050 firefox should own mozilla plugin dir
-
-* Sat Oct 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.99-1.0RC1.1
-- Update to firefox-rc1
-- Add patch for s390(x)
-
-* Tue Oct 26 2004 Christopher Aillon <caillon at redhat.com>
-- Fix LD_LIBRARY_PATH at startup (Steve Knodle)
-
-* Fri Oct 22 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.21
-- Prevent inlining of stack direction detection (#135255)
-
-* Tue Oct 19 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.20
-- More file chooser fixes:
-    Pop up a confirmation dialog before overwriting files (#134648)
-    Allow saving as complete once again
-- Fix for upstream 263263.
-
-* Tue Oct 19 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.18
-- Fix for upstream 262689.
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com 0:0.10.1-1.0PR1.16
-- Update pango patch to one that defaults to off
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com> 0:0.10.1-1.0PR1.15
-- Fix problem where default apps aren't showing up in the download
-  dialog (#136261)
-- Fix default height being larger than the available area, cherry picked
-  from upstream
-
-* Mon Oct 18 2004 Christopher Blizzard <blizzard at redhat.com> 0:0.10.1-1.0PR1.13
-- Actually turn on pango in the mozconfig
-
-* Sat Oct 16 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.12
-- Disable the default application checks. (#133713)
-- Disable the software update feature. (#136017)
-
-* Wed Oct 13 2004 Christopher Blizzard <blizzard at redhat.com>
-- Use pango for rendering
-
-* Tue Oct 12 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.10
-- Fix for 64 bit crash at startup (b.m.o #256603)
-
-* Fri Oct  8 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.9
-- Fix compile issues (#134914)
-- Add patch to fix button focus issues (#133507)
-- Add patches to fix tab focus stealing issue (b.m.o #124750)
-
-* Fri Oct  1 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.1-1.0PR1.8
-- Update to 0.10.1
-- Fix tab switching keybindings (#133504)
-
-* Fri Oct  1 2004 Bill Nottingham <notting at redhat.com> 0:0.10.0-1.0PR1.7
-- filter out library Provides: and internal Requires:
-
-* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.6
-- Prereq desktop-file-utils >= 0.9
-
-* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.5
-- Add clipboard access prevention patch.
-
-* Wed Sep 29 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.4
-- Add the xul mime type to the .desktop file
-
-* Tue Sep 28 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.3
-- Backport the GTK+ file chooser.
-- Update desktop database after uninstall.
-
-* Mon Sep 27 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.2
-- Change the vendor to mozilla not fedora
-- Build with --disable-strip so debuginfo packages work (#133738)
-- Add pkgconfig patch (bmo #261090)
-
-* Fri Sep 24 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.1
-- Add a BR for desktop-file-utils
-- Update default configuration options to use the firefox mozconfig (#132916)
-- Use Red Hat bookmarks (#133262)
-- Update default homepage (#132721)
-- Fix JS math on AMD64 (#133226)
-- Build with MOZILLA_OFICIAL (#132917)
-
-* Tue Sep 14 2004 Christopher Aillon <caillon at redhat.com> 0:0.10.0-1.0PR1.0
-- Update to 1.0PR1
-- Update man page references to say Firefox instead of Firebird
-- Remove gcc34 and extensions patch; they are now upstream
-- Update desktop database
-- Minor tweaks to the .desktop file
-
-* Fri Sep 03 2004 Christopher Aillon <caillon at redhat.com> 0:0.9.3-8
-- Fixup .desktop entry Name, GenericName, and Comment (#131602)
-- Add MimeType desktop entry (patch from jrb at redhat.com)
-- Build with --disable-xprint
-
-* Tue Aug 31 2004 Warren Togami <wtogami at redhat.com> 0:0.9.3-7
-- rawhide import
-- fedora.us #1765 NetBSD's freetype 2.1.8 compat patch
-
-* Sun Aug 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.6
-- and mng support is disabled again as it seams that there is
-  no real mng support in the code
-
-* Sat Aug 28 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.5
-- remove ldconfig from scriptlets (bug #1846 comment #40)
-- reenabled mng support (bug #1971)
-- removed --enable-strip to let rpm to the stripping (bug #1971)
-- honor system settings in firefox.sh (bug #1971)
-- setting umask 022 in scriptlets (bug #1962)
-
-* Sat Aug 07 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.4
-- copy the icon to the right place(TM)
-
-* Fri Aug 06 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.3
-- readded the xpm removed in 0:0.9.2-0.fdr.5
-
-* Thu Aug 05 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.2
-- added mozilla-1.7-psfonts.patch from rawhide mozilla
-
-* Thu Aug 05 2004 Adrian Reber <adrian at lisas.de> 0:0.9.3-0.fdr.1
-- updated to 0.9.3
-- removed following from .mozconfig:
-    ac_add_options --with-system-mng
-    ac_add_options --enable-xprint
-    ac_add_options --disable-dtd-debug
-    ac_add_options --disable-freetype2
-    ac_add_options --enable-strip-libs
-    ac_add_options --enable-reorder
-    ac_add_options --enable-mathml
-    ac_add_options --without-system-nspr
-
-* Tue Aug 03 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.5
-- applied parts of the patch from Matthias Saou (bug #1846)
-- delete empty directories in %%{ffdir}/chrome
-- more cosmetic changes to the spec file
-
-* Wed Jul 14 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.4
-- mozilla-default-plugin-less-annoying.patch readded
-
-* Tue Jul 13 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.3
-- added krb5-devel as build requirement
-
-* Tue Jul 13 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.2
-- added patch from bugzilla.mozilla.org (bug #247846)
-- removed Xvfb hack
-
-* Fri Jul 09 2004 Adrian Reber <adrian at lisas.de> 0:0.9.2-0.fdr.1
-- updated to 0.9.2
-
-* Mon Jul 05 2004 Warren Togami <wtogami at redhat.com> 0:0.9.1-0.fdr.3
-- mharris suggestion for backwards compatibilty with Xvfb hack
-
-* Tue Jun 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.1-0.fdr.2
-- added massive hack from the debian package to create the
-  extension directory
-
-* Tue Jun 29 2004 Adrian Reber <adrian at lisas.de> 0:0.9.1-0.fdr.1
-- updated to 0.9.1
-
-* Wed Jun 17 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.4
-- remove extensions patch
-- add post hack to create extensions
-- enable negotiateauth extension
-- copy icon to browser/app/default.xpm
-- --enable-official-branding
-
-* Wed Jun 17 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.3
-- extensions patch
-
-* Wed Jun 16 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.2
-- added gnome-vfs2-devel as BuildRequires
-- added gcc-3.4 patch 
-
-* Wed Jun 16 2004 Adrian Reber <adrian at lisas.de> 0:0.9-0.fdr.1
-- updated to 0.9
-- dropped x86_64 patches
-- dropped xremote patches
-
-* Wed May 26 2004 Adrian Reber <adrian at lisas.de> 0:0.8-0.fdr.13
-- remove unused files: mozilla-config
-
-* Sun May 23 2004 David Hill <djh[at]ii.net> 0:0.8-0.fdr.12
-- update mozconfig (fixes bug #1443)
-- installation directory includes version number
-
-* Mon May 10 2004 Justin M. Forbes <64bit_fedora at comcast.net> 0:0.8-0.fdr.11
-- merge x86_64 release 10 with fedora.us release 10 bump release to 11
-
-* Mon Apr 19 2004 Justin M. Forbes <64bit_fedora at comcast.net> 0:0.8-0.fdr.10
-- rebuild for FC2
-- change Source71 to properly replace Source7 for maintainability
-
-* Sun Apr 18 2004 Warren Togami <wtogami at redhat.com> 0:0.8-0.fdr.10
-- 3rd xremote patch
-- test -Os rather than -O2
-
-* Sun Apr 18 2004 Gene Czarcinski <gene at czarc.net>
-- more x86_64 fixes
-- fix firefix-xremote-client for x86_64 (similar to what is done for
-  firefox.sh.in)
-
-* Sat Apr 03 2004 Warren Togami <wtogami at redhat.com> 0:0.8-0.fdr.9
-- xremote patch for thunderbird integration #1113
-- back out ugly hack from /usr/bin/firefox
-- correct default bookmarks
-
-* Wed Feb 25 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.7
-- readded the new firefox icons
-
-* Sat Feb 21 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.6
-- removed new firefox icons
-
-* Wed Feb 18 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.5
-- nothing
-
-* Thu Feb 12 2004 Gene Czarcinski <czar at acm.org>
-- update for x86_64 ... usr mozilla-1.6 patches
-- change "firefox-i*" to "firefox-*" in above stuff
-
-* Tue Feb 10 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.4
-- another icon changed
-
-* Tue Feb 10 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.3
-- startup script modified
-
-* Mon Feb 09 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.2
-- new firefox icon
-- more s/firebird/firefox/
-
-* Mon Feb 09 2004 Adrian Reber <adrian at lisas.de> - 0:0.8-0.fdr.1
-- new version: 0.8
-- new name: firefox
-
-* Sun Oct 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.7-0.fdr.2
-- s/0.6.1/0.7/
-- changed user-app-dir back to .phoenix as .mozilla-firebird
-  is not working as expected
-- manpage now also available as MozillaFirebird.1
-
-* Thu Oct 16 2003 Adrian Reber <adrian at lisas.de> - 0:0.7-0.fdr.1
-- updated to 0.7
-- provides webclient
-- run regxpcom and regchrome after installation and removal
-- added a man page from the debian package
-- changed user-app-dir from .phoenix to .mozilla-firebird
-
-* Tue Jul 29 2003 Adrian Reber <adrian at lisas.de> - 0:0.6.1-0.fdr.2
-- now with mozilla-default-plugin-less-annoying.patch; see bug #586
-
-* Tue Jul 29 2003 Adrian Reber <adrian at lisas.de> - 0:0.6.1-0.fdr.1
-- updated to 0.6.1
-- changed buildrequires for XFree86-devel from 0:4.3.0 to 0:4.2.1 
-  it should now also build on RH80
-
-* Sun Jul 13 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.5.rh90
-- enabled the type ahead extension: bug #484
-
-* Sun Jul 13 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.4.rh90
-- renamed it again back to MozillaFirbird
-- added libmng-devel to BuildRequires
-- startup homepage is now www.fedora.us
-- improved the startup script to use the unix remote protocol 
-  to open a new window
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.3.rh90
-- new icon from http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png
-- now using gtk2 as toolkit
-- renamed again back to mozilla-firebird (I like it better)
-- Provides: MozillaFirebird for compatibility with previous releases
-- changed default bookmarks.html to contain links to www.fedora.us
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.2.rh90
-- renamed package to MozillaFirebird and all files with the old name
-- enabled mng, mathml, xinerama support
-- now honouring RPM_OPT_FLAGS
-
-* Thu May 19 2003 Adrian Reber <adrian at lisas.de> - 0:0.6-0.fdr.1.rh90
-- updated to 0.6
-
-* Thu May 01 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.1.cvs20030501.rh90
-- Updated to CVS.
-- Renamed to mozilla-firebird.
-
-* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.3.cvs20030409.rh90
-- Updated to CVS.
-- Removed hard-coded library path.
-
-* Sat Apr 05 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.3.cvs20030402.rh90
-- Changed Prereq to Requires.
-- Changed BuildRequires to gtk+-devel (instead of file).
-- Recompressed source with bzip2.
-- Removed post.
-
-* Tue Apr 02 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.2.cvs20030402.rh90
-- Added desktop-file-utils to BuildRequires.
-- Changed category to X-Fedora-Extra.
-- Updated to CVS.
-
-* Sun Mar 30 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.6-0.fdr.0.2.cvs20030328.rh90
-- Added Epoch:0.
-- Added libgtk-1.2.so.0 to the BuildRequires
-
-* Fri Mar 28 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030328.rh90
-- Updated to latest CVS.
-- Moved phoenix startup script into its own file
-
-* Wed Mar 26 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030326.rh90
-- Updated to latest CVS.
-- Changed release to 9 vs 8.1.
-- Added cvs script.
-- added encoding to desktop file.
-
-* Sun Mar 23 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030323.rh81
-- Updated to latest CVS.
-- added release specification XFree86-devel Build Requirement.
-- changed chmod to %attr
-
-* Fri Mar 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-0.fdr.0.1.cvs20030317.rh81
-- Fixed naming scheme.
-- Fixed .desktop file.
-
-* Mon Mar 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030317.1
-- Updated to CVS.
-
-* Fri Mar 14 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030313.2
-- General Tweaking.
-
-* Thu Mar 13 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030313.1
-- Updated CVS.
-- Modified mozconfig.
-
-* Sun Mar 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.6-cvs20030309.1
-- Initial RPM release.
+* Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
+- Initial cut at XULRunner 1.9 Alpha 7



From fedora-extras-commits at redhat.com  Wed Sep  5 18:15:18 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:15:18 -0700
Subject: [pkgdb] netlabel_tools: james has requested approveacls
Message-ID: <200709051815.l85IFJuX018801@app3.fedora.phx.redhat.com>

James Antill (james) has requested the approveacls acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:17:14 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:17:14 -0700
Subject: [pkgdb] netlabel_tools: james has given up approveacls
Message-ID: <200709051817.l85IHEHe018812@app3.fedora.phx.redhat.com>

James Antill (james) has given up the approveacls acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:19:57 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:19:57 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051819.l85IJvgl018828@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchbugzilla acl on netlabel_tools (Fedora devel) to Approved for James Antill (james)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:19:58 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:19:58 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051819.l85IJwc9018834@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora devel) to Approved for James Antill (james)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:20:01 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:20:01 -0700
Subject: [pkgdb] netlabel_tools: james has given up commit
Message-ID: <200709051820.l85IK1uN018846@app3.fedora.phx.redhat.com>

James Antill (james) has given up the commit acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:20:03 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:20:03 -0700
Subject: [pkgdb] netlabel_tools: james has given up watchbugzilla
Message-ID: <200709051820.l85IK42s018852@app3.fedora.phx.redhat.com>

James Antill (james) has given up the watchbugzilla acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:24:57 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:24:57 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.7,1.8
Message-ID: <200709051824.l85IOvBD001406@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374

Modified Files:
	xulrunner.spec 
Log Message:
remove the psfonts patch for now as it doesn't apply



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xulrunner.spec	5 Sep 2007 18:10:23 -0000	1.7
+++ xulrunner.spec	5 Sep 2007 18:24:24 -0000	1.8
@@ -126,7 +126,7 @@
 #%patch5  -p1 -b .visibility
 
 #%patch20 -p0
-%patch21 -p1 -b .psfonts
+#%patch21 -p1 -b .psfonts
 #%patch22 -p0 -b .default-applications
 #%patch40 -p1 -b .bullet-bill
 %patch41 -p1 -b .undo-uriloader



From fedora-extras-commits at redhat.com  Wed Sep  5 18:29:17 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 5 Sep 2007 14:29:17 -0400
Subject: rpms/alfont/devel alfont.spec,1.1,1.2
Message-ID: <200709051829.l85ITHmx001506@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1483

Modified Files:
	alfont.spec 
Log Message:
* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-3
- Update license tag



Index: alfont.spec
===================================================================
RCS file: /cvs/extras/rpms/alfont/devel/alfont.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alfont.spec	3 Dec 2006 20:22:33 -0000	1.1
+++ alfont.spec	5 Sep 2007 18:28:44 -0000	1.2
@@ -1,9 +1,9 @@
 Name:           alfont
 Version:        2.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Font rendering library for the Allegro game library
 Group:          System Environment/Libraries
-License:        BSD-like
+License:        FTL
 URL:            http://chernsha.sitesled.com/
 # this is http://chernsha.sitesled.com/AlFont206.rar repackaged in .tgz format
 Source0:        %{name}-%{version}.tar.gz
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-3
+- Update license tag
+
 * Sun Dec  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.6-2
 - Link the .so file with allegro (bz 217998)
 - Add "Requires: allegro-devel" to the -devel subpackage



From fedora-extras-commits at redhat.com  Wed Sep  5 18:36:37 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:36:37 -0700
Subject: [pkgdb] netlabel_tools: james has requested approveacls
Message-ID: <200709051836.l85Iab0w019014@app3.fedora.phx.redhat.com>

James Antill (james) has requested the approveacls acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:36:52 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:36:52 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051836.l85IaqGJ019020@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora 6 is now owned by James Antill (james)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:20 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:37:20 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.8,1.9
Message-ID: <200709051837.l85IbKZq001771@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1721

Modified Files:
	xulrunner.spec 
Log Message:
more patch disabling for now


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xulrunner.spec	5 Sep 2007 18:24:24 -0000	1.8
+++ xulrunner.spec	5 Sep 2007 18:36:47 -0000	1.9
@@ -129,8 +129,8 @@
 #%patch21 -p1 -b .psfonts
 #%patch22 -p0 -b .default-applications
 #%patch40 -p1 -b .bullet-bill
-%patch41 -p1 -b .undo-uriloader
-%patch42 -p0 -b .uriloader
+#%patch41 -p1 -b .undo-uriloader
+#%patch42 -p0 -b .uriloader
 #%patch81 -p1 -b .nopangoxft
 #%patch82 -p1 -b .pango-mathml
 #%patch83 -p1 -b .pango-cursor-position



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:46 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 5 Sep 2007 14:37:46 -0400
Subject: rpms/freetype1/devel freetype1.spec,1.2,1.3
Message-ID: <200709051837.l85IbkBg001817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freetype1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1753

Modified Files:
	freetype1.spec 
Log Message:
* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.4.pre
- Update license tag



Index: freetype1.spec
===================================================================
RCS file: /cvs/extras/rpms/freetype1/devel/freetype1.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freetype1.spec	22 Aug 2007 12:22:51 -0000	1.2
+++ freetype1.spec	5 Sep 2007 18:37:14 -0000	1.3
@@ -4,14 +4,14 @@
 
 Name:           freetype1
 Version:        1.4
-Release:        0.3.pre%{?dist}
+Release:        0.4.pre%{?dist}
 Summary:        Free TrueType font rendering engine, compatibility version
 Group:          System Environment/Libraries
-License:        BSD-like
+License:        FTL
 URL:            http://www.freetype.org
 # notice we don't use %{version} as this package is based on 1.3.1, which is
 # then patched to a 1.4 pre release.
-Source:         http://dl.sf.net/sourceforge/freetype/freetype-1.3.1.tar.gz
+Source:         http://downloads.sourceforge.net/freetype/freetype-1.3.1.tar.gz
 Patch0:         freetype-1.3.1-1.4pre.patch
 Patch1:         freetype-1.4-disable-ft1-bci.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.4.pre
+- Update license tag
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4-0.3.pre
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Wed Sep  5 18:37:56 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:37:56 -0700
Subject: [pkgdb] python had acl change status
Message-ID: <200709051837.l85Ibus7019034@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on python (Fedora devel) to Approved for Jeremy Katz (katzj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python



From fedora-extras-commits at redhat.com  Wed Sep  5 18:38:16 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 11:38:16 -0700
Subject: [pkgdb] python-docs had acl change status
Message-ID: <200709051838.l85IcHT7019043@app3.fedora.phx.redhat.com>

James Antill (james) has set the commit acl on python-docs (Fedora devel) to Approved for Jeremy Katz (katzj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-docs



From fedora-extras-commits at redhat.com  Wed Sep  5 18:52:09 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 14:52:09 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.77, 1.78 libsemanage.spec,
	1.130, 1.131 sources, 1.79, 1.80
Message-ID: <200709051852.l85Iq9Fl002158@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2097

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	20 Aug 2007 23:30:14 -0000	1.77
+++ .cvsignore	5 Sep 2007 18:51:36 -0000	1.78
@@ -83,3 +83,4 @@
 libsemanage-2.0.2.tgz
 libsemanage-2.0.3.tgz
 libsemanage-2.0.4.tgz
+libsemanage-2.0.5.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- libsemanage.spec	20 Aug 2007 23:30:14 -0000	1.130
+++ libsemanage.spec	5 Sep 2007 18:51:36 -0000	1.131
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
+- Upgrade to latest from NSA
+
 * Mon Aug 20 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
 - Upgrade to latest from NSA
 	* Allow dontaudits to be turned off via semanage interface when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	20 Aug 2007 23:30:14 -0000	1.79
+++ sources	5 Sep 2007 18:51:36 -0000	1.80
@@ -1 +1 @@
-947b51b687e2fe0b5b591df8f2994ff1  libsemanage-2.0.4.tgz
+9d34a0b2f3033ee90489dbb516653b49  libsemanage-2.0.5.tgz



From fedora-extras-commits at redhat.com  Wed Sep  5 18:52:32 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 5 Sep 2007 14:52:32 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec, 1.43,
	1.44 infinity.xml, 1.1, 1.2
Message-ID: <200709051852.l85IqWGS002203@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2128

Modified Files:
	desktop-backgrounds.spec infinity.xml 
Log Message:
- create links for default.png etc until more artwork shows up
- start animated backgrounds at midnight



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- desktop-backgrounds.spec	4 Sep 2007 17:54:42 -0000	1.43
+++ desktop-backgrounds.spec	5 Sep 2007 18:52:00 -0000	1.44
@@ -89,9 +89,9 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -s infinity/am00.png default.png;
- ln -s infinity/am00.png default-wide.png;
- ln -s infinity/am00.png default-5_4.png)
+ ln -sf infinity/am00.png default.png;
+ ln -sf infinity/am00.png default-wide.png;
+ ln -sf infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,8 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
-* Tue Sep  4 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
+* Wed Sep  5 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
 - create links for default.png etc until more artwork shows up
+- start animated backgrounds at midnight
 
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 7.92-2
 - need to include less infinity backgrounds for now; the space usage 


Index: infinity.xml
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/infinity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- infinity.xml	30 Aug 2007 19:39:27 -0000	1.1
+++ infinity.xml	5 Sep 2007 18:52:00 -0000	1.2
@@ -3,9 +3,9 @@
     <year>2007</year>
     <month>8</month>
     <day>28</day>
-    <hour>12</hour>
-    <minute>21</minute>
-    <second>23</second>
+    <hour>0</hour>
+    <minute>0</minute>
+    <second>0</second>
   </starttime>
 
 <static>



From fedora-extras-commits at redhat.com  Wed Sep  5 18:56:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 5 Sep 2007 14:56:59 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.44,1.45
Message-ID: <200709051856.l85IuxKe002450@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2351

Modified Files:
	desktop-backgrounds.spec 
Log Message:
revert some weirdness where I changed a version I shouldn't have



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- desktop-backgrounds.spec	5 Sep 2007 18:52:00 -0000	1.44
+++ desktop-backgrounds.spec	5 Sep 2007 18:56:26 -0000	1.45
@@ -1,4 +1,4 @@
-%define rh_backgrounds_version 15
+%define rh_backgrounds_version 14
 %define infinity_version 0.0.1
 
 Summary: Desktop backgrounds



From fedora-extras-commits at redhat.com  Wed Sep  5 18:58:06 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 14:58:06 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.9,1.10
Message-ID: <200709051858.l85Iw6qC002532@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2456

Modified Files:
	xulrunner.spec 
Log Message:
xptcall not implemented on ppc? ExcludeArch for now



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xulrunner.spec	5 Sep 2007 18:36:47 -0000	1.9
+++ xulrunner.spec	5 Sep 2007 18:57:33 -0000	1.10
@@ -9,7 +9,7 @@
 
 %define official_branding 0
 
-ExcludeArch: ppc64
+ExcludeArch: ppc64 ppc
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:48 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:48 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested commit
Message-ID: <200709051900.l85J0nfs019247@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the commit acl on netlabel_tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:51 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:51 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested watchbugzilla
Message-ID: <200709051900.l85J0q1s019257@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the watchbugzilla acl on netlabel_tools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:00:59 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:00:59 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested approveacls
Message-ID: <200709051900.l85J0xXv019266@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the approveacls acl on netlabel_tools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:01 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:01:01 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested watchbugzilla
Message-ID: <200709051901.l85J12xG019277@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the watchbugzilla acl on netlabel_tools (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:05 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:01:05 -0700
Subject: [pkgdb] netlabel_tools: sconklin has requested approveacls
Message-ID: <200709051901.l85J16g3019324@app3.fedora.phx.redhat.com>

Steve Conklin (sconklin) has requested the approveacls acl on netlabel_tools (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:01:59 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:01:59 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051901.l85J1xSS019337@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora devel) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:01 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:01 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J22VN019347@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora devel) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:07 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:07 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J27mi019356@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora 7) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:10 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:10 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2A6V019366@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora 7) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 15:02:15 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch,1.23,1.24
Message-ID: <200709051902.l85J2Ft9008687@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637

Modified Files:
	libsemanage-rhat.patch 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libsemanage-rhat.patch	20 Aug 2007 23:30:14 -0000	1.23
+++ libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
@@ -74,10 +74,25 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
+--- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
+@@ -37,10 +37,10 @@
+ 	int expand_check;
+ 	int save_previous;
+ 	int save_linked;
+-	int disable_genhomedircon;
+ 	mode_t file_mode;
+ 	struct external_prog *load_policy;
+ 	struct external_prog *setfiles;
++	struct external_prog *genhomedircon;
+ 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
+ } semanage_conf_t;
+ 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-07-16 14:20:38.000000000 -0400
+--- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1120,7 +1120,7 @@
+@@ -1130,7 +1120,7 @@
  
        skip_reload:
  
@@ -86,12 +101,3 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1262,7 +1262,7 @@
- 		goto cleanup;
- 	}
- 
--	if ((retval =
-+	if (sh->do_rebuild_file_context && (retval =
- 	     semanage_exec_prog(sh, sh->conf->genhomedircon,
- 				sh->conf->store_path, "")) != 0) {
- 		ERR(sh, "genhomedircon returned error code %d.", retval);



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:15 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:15 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2Fga019375@app3.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on netlabel_tools (Fedora 6) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:02:18 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Wed, 05 Sep 2007 12:02:18 -0700
Subject: [pkgdb] netlabel_tools had acl change status
Message-ID: <200709051902.l85J2Ijj019385@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on netlabel_tools (Fedora 6) to Approved for Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:03:19 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:03:19 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051903.l85J3JJ2019405@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora devel is now owned by Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:06:26 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Wed, 05 Sep 2007 12:06:26 -0700
Subject: [pkgdb] netlabel_tools Owned
Message-ID: <200709051906.l85J6Qbx019439@app3.fedora.phx.redhat.com>

Package netlabel_tools in Fedora 7 is now owned by Steve Conklin (sconklin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netlabel_tools



From fedora-extras-commits at redhat.com  Wed Sep  5 19:20:34 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:20:34 -0400
Subject: rpms/rubygem-mongrel/devel cgi_multipart_eof_fix-2.3.gem, NONE,
	1.1 rubygem-mongrel.spec, 1.1,
	1.2 remove-cgi-multipart-eof-fix-dep.patch, 1.1, NONE
Message-ID: <200709051920.l85JKYTF009296@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9261/devel

Modified Files:
	rubygem-mongrel.spec 
Added Files:
	cgi_multipart_eof_fix-2.3.gem 
Removed Files:
	remove-cgi-multipart-eof-fix-dep.patch 
Log Message:
include cgi multipart fix so that this spec can also be used on EL-5



--- NEW FILE cgi_multipart_eof_fix-2.3.gem ---
data.tar.gz
?F
?????????~6?y????Y??hck3}????'??_???O?"??????-???_????Y???Uh?]????qV*????
%??X??F??2????B??A?(r?2??K?e??x???a??????????r???^:?}{????z?V[?N?<????????]5	?????A?k???3??Xn?eUz??A}?????@/?????/??;??5O???f?u{????i?v????q?y??u??4??:S+?B??}G?3D#???
z?Tj??%??T?w??P??+??_EUh?v???N???"?S&x?m?r
k0r	?HB? x?p`*B?!?+*???s??m??f???>6??s??as,&p}???K????:??rvx????<lb?r
???<?M?YY????X?IeO*???	?`o??vQ??a???4DB??KH?U????}O???i4?P(
z?J?J
L:g?????4~8?;??(}??d(T????	?+47?????@W+??(D?Q?
=C?????K/???(?_?+2E???(J?? ?n?"KO??h
?r???n??|f?G2??Yq|?????p>=?.?????!p???;?b
G?s?z?t??La??;h6{??G?4-???^?qE7J?.????>??+???-?Nsw???m?????xR?????GO??????V?R	?[\?????p?Uan??G??2K??m8tm??j?Lf!?6??U?}
{^;?8$???p??? $?N???o????r<???g/c??
??fp?????V??x_?#7?HD*Q??c2?S7
?????`???%??????????idI?'???e?N3&.6_@??\{b0@?NA?ix??K?c???????? "t*?1???D???_	l?0C9?=?????nU??dp??MK?
F1p???;?0@?x3?y???b?KHDk?Od?<K?????F!
_?B??!o$,??4H??d?l?U?en????v???{%>????"]?b??????????T?p?2?4??????rC9??\d at F&.?Z>[??y4(?@???QWW?'?
?????`??]??t??u???\????????????/???/??}Uj?2?}?2
?$??T???L1?A??t,?T???Y??!&b?;??4P4}?bc??Y"t???CD??E?'???
???E?=??=?=??DX3H?
b?q??$??A?y?T5??Y?HS??j??+??N~?^????&cMxr?<??I`(D?G??8
????$???:???????M??L?gGq(5??0"?B?A?R?(??h????My%??????5Ar+???Z???4u???4?????G?M??+?[?I?{M?S?z?<??{J??`BYdA?????e	?eXsU+?Q??k?V-+?????	????c????v????t?~??}?'?s???C?R*)??g*Q??K???????X??_??????z??U????????O??o:????xY?7?l????xR????ctD?(???
{?ih??? D?[?h*?=Co3???????e }u?SEo??
b??E??qU??Q?aa??x?X?q?K?eg??0tf?*??_?BX`???:z?Kt(????<9rc4K?)?S??r??1???H????BRD?`?$)2	b??$?m??bu???L???tb???X????H:?^.?E??d??	??D[???	w?^z????h??(!C?#??????14??
F. ?x?h7S
[?:?/?C?IG??????????D?P??y????????H?_1j,Ep<?L?*tF??@(SXX?p9??<Qsb%l4?b>?7?)?{,l?-Y?]y?fJL???????`????H*X??9I???<	????Z??Us?????d????'?S?
??8Ay???.?yQn???-?W1
^?W
*????y\	A ???nI??????Q?I2??????x??i=???[???S??1B$??$?m?7?'?u9/!qD??0)????h?I?a???<?
8i^<?~?y?
??CI;+?D?e? ???>???e?Y5_+??:?w?kW????I??u
??????N?????????c??
?=??7????Y??B?N:??ShwZ???????{g???j?V?u?wx??:~U?:??Z??n?}\?!?i7?0?	?8jv("???l??oy??V??F<hw`Nv;?????.?r?9i?6q2???? ??????(????????????)?????????[??w')??5e?Q0?67m???JM	???.
???q???????IS??s;?`?tt?_}/?/+?Z???DU??D?6o?zW?G??????????????3?W?-??	?w??-%?b??&?6???;?F????N??F??????????9?????W????FE\)y$7c%?A~vfn?;Ru??qzl????3????F?
????/???mY????R??????U????<b?_?e`??O?,v"??$K??????h????????^c?a??>z?h??<?????.?????,?}t??Y???0????????a`??r0???=|?????;???FHQ???4?V`<|??;?v?>??'?(??L????hk`?t
?*????W? ?oO?z?????r?Z???.???Q>???SV?5?5????Zv?P???\??????x at 0?|?r??Z????????E-?6????h?
?	?YN?DF????i7
i?k3W"#??	?F??'?
???%?RKs?YH?Lz??h?J?????P??L9?-C>?3'??S???.??j????
?>G(?? 2??????X?i?]#????j?G???2*x??9Z??a?VI?QO????0y6 ?k??_??w?8?ys?W????H?([?I$?A?t??R??H?"?????h????e???`Q=??<?S????+&(C?y?
?iB9k^?
n?b?l_
?h??1S[??I???????;.?}?*???????p?/???enn?
(??,??]?pM
???????lZ^'??B????I{_??u???zu?ceg?F???R.?DN????k?.A6??0?m??o?J~!'??\R???-?????]??V]?1??&??1v?????xv??b?X??6<??iC?\??N;???????#a??H???????_w?'???f????y?]?`F??????y?7te?h???????{?f??@??:???Vp?"SVQ?;??????eR-?>???T?5+g?91???????kz??*??(<W(tl??&??1??
Ib???F?Sn???l?p???????}?
D~>?;????t~J?G
m?v?:???4??bD?"ho?<|#?'+???j5+O0=??f
?
+/????????m?OJ??lkK?^>?[??T?p?B@???b??????w??l<??^???????>O?j?|dR?E??Re????2D??/J(??K?&J???q??)gK??c>?qp???D?C?S?&a?y
??????\??7M??j&_hK???N\?;???0?vr???fz?$??vb>????S?V?%B?SU?Sl?K????
?K???
????????6?@?5	???}D????
??/$?????&????z$?*???Y?;

??G
???!??^??????????|?#
?F
i??B??\???3??9??"*q_????<?,??????U?QE?A????J7Z?????-? ??p(?????S??x??4?A?Z???z?>
t?h??`??<??
P??????2???e?:+?dK(K>???K?X??????i
wC?t?U?P?-h??5?
?m??y?1j?b??X???{??`?38???w1?(???9>J?%??+g??r5?<_u??q??8?M?q??????z?S???????@???H???'wRV???s??u2_;?!????E?O????g?6&???75 ??x? )??8='E??x6?2R??t??T??"??RsU'??t!
mC?}/?0??Z?9?s?&???Dkt??6b??Y?D2??"????????[iuCjo?W????<,??[Q???Vb???7?'???y???n????!?<,?<?h,e$????X?Q?in??E/'zOq?Y8??????&M?????>?
??3(

Index: rubygem-mongrel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/rubygem-mongrel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-mongrel.spec	28 Aug 2007 15:11:34 -0000	1.1
+++ rubygem-mongrel.spec	5 Sep 2007 19:20:01 -0000	1.2
@@ -8,14 +8,15 @@
 Name: rubygem-%{gemname}
 
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Libraries
-License: GPLv2+ or Ruby
+# The entire source code is (GPLv2+ or Ruby) except for the code in
+# cgi_multipart_eof_fix-2.3.gem  which is AFL
+License: (GPLv2+ or Ruby) and AFL
 URL: http://mongrel.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: remove-cgi-multipart-eof-fix-dep.patch
+Source1: http://gems.rubyforge.org/gems/cgi_multipart_eof_fix-2.3.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires: ruby >= 1.8.6
 Requires: rubygems
 BuildRequires: ruby-devel
 Requires: rubygem(daemons) >= 1.0.3
@@ -38,6 +39,8 @@
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE1}
 install -d -m0755 %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{geminstdir}/lib/http11.so %{buildroot}%{ruby_sitearch}
 strip %{buildroot}%{ruby_sitearch}/http11.so
@@ -50,7 +53,7 @@
 chmod a+x %{buildroot}%{geminstdir}/examples/webrick_compare.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/blog.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
-patch -p0 -d %{buildroot} < %{PATCH0}
+chmod a+x %{buildroot}%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/cgi_multipart_eof_fix_test.rb
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,12 +78,27 @@
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%dir %{gemdir}/gems/cgi_multipart_eof_fix-2.3/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/lib/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/CHANGELOG
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/LICENSE
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/Manifest
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/README
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/cgi_multipart_eof_fix.gemspec
+%doc %{gemdir}/doc/cgi_multipart_eof_fix-2.3
+%{gemdir}/cache/cgi_multipart_eof_fix-2.3.gem
+%{gemdir}/specifications/cgi_multipart_eof_fix-2.3.gemspec
+
 %changelog
-* Fri Aug 24 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-4
+* Mon Sep  1 2007 Scott Seago <sseago at redhat.com> - 1.0.1-5
+- Include cgi multipart fix
+
+* Fri Aug 24 2007 Scott Seago <sseago at redhat.com> - 1.0.1-4
 - rpmlint fixes
 - added Ruby >= 1.8.6 Requires
 
-* Thu Aug 23 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-3
+* Thu Aug 23 2007 Scott Seago <sseago at redhat.com> - 1.0.1-3
 - Removed requirement for rubygem(cgi_multipart_eof_fix)
 - Patched source to work without cgi_multipart_eof_fix
 


--- remove-cgi-multipart-eof-fix-dep.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:23:41 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:23:41 -0400
Subject: rpms/rubygem-mongrel/F-7 cgi_multipart_eof_fix-2.3.gem, NONE,
	1.1 rubygem-mongrel.spec, 1.1,
	1.2 remove-cgi-multipart-eof-fix-dep.patch, 1.1, NONE
Message-ID: <200709051923.l85JNf3j009463@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9439/F-7

Modified Files:
	rubygem-mongrel.spec 
Added Files:
	cgi_multipart_eof_fix-2.3.gem 
Removed Files:
	remove-cgi-multipart-eof-fix-dep.patch 
Log Message:
added cgi multipart fix to rpm to allow for EL-5 inclusion



--- NEW FILE cgi_multipart_eof_fix-2.3.gem ---
data.tar.gz
?F
?????????~6?y????Y??hck3}????'??_???O?"??????-???_????Y???Uh?]????qV*????
%??X??F??2????B??A?(r?2??K?e??x???a??????????r???^:?}{????z?V[?N?<????????]5	?????A?k???3??Xn?eUz??A}?????@/?????/??;??5O???f?u{????i?v????q?y??u??4??:S+?B??}G?3D#???
z?Tj??%??T?w??P??+??_EUh?v???N???"?S&x?m?r
k0r	?HB? x?p`*B?!?+*???s??m??f???>6??s??as,&p}???K????:??rvx????<lb?r
???<?M?YY????X?IeO*???	?`o??vQ??a???4DB??KH?U????}O???i4?P(
z?J?J
L:g?????4~8?;??(}??d(T????	?+47?????@W+??(D?Q?
=C?????K/???(?_?+2E???(J?? ?n?"KO??h
?r???n??|f?G2??Yq|?????p>=?.?????!p???;?b
G?s?z?t??La??;h6{??G?4-???^?qE7J?.????>??+???-?Nsw???m?????xR?????GO??????V?R	?[\?????p?Uan??G??2K??m8tm??j?Lf!?6??U?}
{^;?8$???p??? $?N???o????r<???g/c??
??fp?????V??x_?#7?HD*Q??c2?S7
?????`???%??????????idI?'???e?N3&.6_@??\{b0@?NA?ix??K?c???????? "t*?1???D???_	l?0C9?=?????nU??dp??MK?
F1p???;?0@?x3?y???b?KHDk?Od?<K?????F!
_?B??!o$,??4H??d?l?U?en????v???{%>????"]?b??????????T?p?2?4??????rC9??\d at F&.?Z>[??y4(?@???QWW?'?
?????`??]??t??u???\????????????/???/??}Uj?2?}?2
?$??T???L1?A??t,?T???Y??!&b?;??4P4}?bc??Y"t???CD??E?'???
???E?=??=?=??DX3H?
b?q??$??A?y?T5??Y?HS??j??+??N~?^????&cMxr?<??I`(D?G??8
????$???:???????M??L?gGq(5??0"?B?A?R?(??h????My%??????5Ar+???Z???4u???4?????G?M??+?[?I?{M?S?z?<??{J??`BYdA?????e	?eXsU+?Q??k?V-+?????	????c????v????t?~??}?'?s???C?R*)??g*Q??K???????X??_??????z??U????????O??o:????xY?7?l????xR????ctD?(???
{?ih??? D?[?h*?=Co3???????e }u?SEo??
b??E??qU??Q?aa??x?X?q?K?eg??0tf?*??_?BX`???:z?Kt(????<9rc4K?)?S??r??1???H????BRD?`?$)2	b??$?m??bu???L???tb???X????H:?^.?E??d??	??D[???	w?^z????h??(!C?#??????14??
F. ?x?h7S
[?:?/?C?IG??????????D?P??y????????H?_1j,Ep<?L?*tF??@(SXX?p9??<Qsb%l4?b>?7?)?{,l?-Y?]y?fJL???????`????H*X??9I???<	????Z??Us?????d????'?S?
??8Ay???.?yQn???-?W1
^?W
*????y\	A ???nI??????Q?I2??????x??i=???[???S??1B$??$?m?7?'?u9/!qD??0)????h?I?a???<?
8i^<?~?y?
??CI;+?D?e? ???>???e?Y5_+??:?w?kW????I??u
??????N?????????c??
?=??7????Y??B?N:??ShwZ???????{g???j?V?u?wx??:~U?:??Z??n?}\?!?i7?0?	?8jv("???l??oy??V??F<hw`Nv;?????.?r?9i?6q2???? ??????(????????????)?????????[??w')??5e?Q0?67m???JM	???.
???q???????IS??s;?`?tt?_}/?/+?Z???DU??D?6o?zW?G??????????????3?W?-??	?w??-%?b??&?6???;?F????N??F??????????9?????W????FE\)y$7c%?A~vfn?;Ru??qzl????3????F?
????/???mY????R??????U????<b?_?e`??O?,v"??$K??????h????????^c?a??>z?h??<?????.?????,?}t??Y???0????????a`??r0???=|?????;???FHQ???4?V`<|??;?v?>??'?(??L????hk`?t
?*????W? ?oO?z?????r?Z???.???Q>???SV?5?5????Zv?P???\??????x at 0?|?r??Z????????E-?6????h?
?	?YN?DF????i7
i?k3W"#??	?F??'?
???%?RKs?YH?Lz??h?J?????P??L9?-C>?3'??S???.??j????
?>G(?? 2??????X?i?]#????j?G???2*x??9Z??a?VI?QO????0y6 ?k??_??w?8?ys?W????H?([?I$?A?t??R??H?"?????h????e???`Q=??<?S????+&(C?y?
?iB9k^?
n?b?l_
?h??1S[??I???????;.?}?*???????p?/???enn?
(??,??]?pM
???????lZ^'??B????I{_??u???zu?ceg?F???R.?DN????k?.A6??0?m??o?J~!'??\R???-?????]??V]?1??&??1v?????xv??b?X??6<??iC?\??N;???????#a??H???????_w?'???f????y?]?`F??????y?7te?h???????{?f??@??:???Vp?"SVQ?;??????eR-?>???T?5+g?91???????kz??*??(<W(tl??&??1??
Ib???F?Sn???l?p???????}?
D~>?;????t~J?G
m?v?:???4??bD?"ho?<|#?'+???j5+O0=??f
?
+/????????m?OJ??lkK?^>?[??T?p?B@???b??????w??l<??^???????>O?j?|dR?E??Re????2D??/J(??K?&J???q??)gK??c>?qp???D?C?S?&a?y
??????\??7M??j&_hK???N\?;???0?vr???fz?$??vb>????S?V?%B?SU?Sl?K????
?K???
????????6?@?5	???}D????
??/$?????&????z$?*???Y?;

??G
???!??^??????????|?#
?F
i??B??\???3??9??"*q_????<?,??????U?QE?A????J7Z?????-? ??p(?????S??x??4?A?Z???z?>
t?h??`??<??
P??????2???e?:+?dK(K>???K?X??????i
wC?t?U?P?-h??5?
?m??y?1j?b??X???{??`?38???w1?(???9>J?%??+g??r5?<_u??q??8?M?q??????z?S???????@???H???'wRV???s??u2_;?!????E?O????g?6&???75 ??x? )??8='E??x6?2R??t??T??"??RsU'??t!
mC?}/?0??Z?9?s?&???Dkt??6b??Y?D2??"????????[iuCjo?W????<,??[Q???Vb???7?'???y???n????!?<,?<?h,e$????X?Q?in??E/'zOq?Y8??????&M?????>?
??3(

Index: rubygem-mongrel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/rubygem-mongrel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-mongrel.spec	28 Aug 2007 15:13:13 -0000	1.1
+++ rubygem-mongrel.spec	5 Sep 2007 19:23:09 -0000	1.2
@@ -8,14 +8,15 @@
 Name: rubygem-%{gemname}
 
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Libraries
-License: GPLv2+ or Ruby
+# The entire source code is (GPLv2+ or Ruby) except for the code in
+# cgi_multipart_eof_fix-2.3.gem  which is AFL
+License: (GPLv2+ or Ruby) and AFL
 URL: http://mongrel.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: remove-cgi-multipart-eof-fix-dep.patch
+Source1: http://gems.rubyforge.org/gems/cgi_multipart_eof_fix-2.3.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires: ruby >= 1.8.6
 Requires: rubygems
 BuildRequires: ruby-devel
 Requires: rubygem(daemons) >= 1.0.3
@@ -38,6 +39,8 @@
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE1}
 install -d -m0755 %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{geminstdir}/lib/http11.so %{buildroot}%{ruby_sitearch}
 strip %{buildroot}%{ruby_sitearch}/http11.so
@@ -50,7 +53,7 @@
 chmod a+x %{buildroot}%{geminstdir}/examples/webrick_compare.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/blog.rb 
 chmod a+x %{buildroot}%{geminstdir}/examples/camping/tepee.rb
-patch -p0 -d %{buildroot} < %{PATCH0}
+chmod a+x %{buildroot}%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/cgi_multipart_eof_fix_test.rb
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,12 +78,27 @@
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%dir %{gemdir}/gems/cgi_multipart_eof_fix-2.3/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/lib/
+%{gemdir}/gems/cgi_multipart_eof_fix-2.3/test/
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/CHANGELOG
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/LICENSE
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/Manifest
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/README
+%doc %{gemdir}/gems/cgi_multipart_eof_fix-2.3/cgi_multipart_eof_fix.gemspec
+%doc %{gemdir}/doc/cgi_multipart_eof_fix-2.3
+%{gemdir}/cache/cgi_multipart_eof_fix-2.3.gem
+%{gemdir}/specifications/cgi_multipart_eof_fix-2.3.gemspec
+
 %changelog
-* Fri Aug 24 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-4
+* Mon Sep  1 2007 Scott Seago <sseago at redhat.com> - 1.0.1-5
+- Include cgi multipart fix
+
+* Fri Aug 24 2007 Scott Seago <sseago at redhat.com> - 1.0.1-4
 - rpmlint fixes
 - added Ruby >= 1.8.6 Requires
 
-* Thu Aug 23 2007 Scott Seago <dlutter at redhat.com> - 1.0.1-3
+* Thu Aug 23 2007 Scott Seago <sseago at redhat.com> - 1.0.1-3
 - Removed requirement for rubygem(cgi_multipart_eof_fix)
 - Patched source to work without cgi_multipart_eof_fix
 


--- remove-cgi-multipart-eof-fix-dep.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:24:39 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 5 Sep 2007 15:24:39 -0400
Subject: comps comps-f8.xml.in,1.91,1.92
Message-ID: <200709051924.l85JOdPT009525@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9419

Modified Files:
	comps-f8.xml.in 
Log Message:
* Add bluez-gnome as a default for desktops
* Remove dvd+rw-tools from Desktop, it's pulled in by nautilus-cd-burner
* Make bluez-utils-cups a default printing package, as bluez-utils is a default
  base package
* Add bluez-utils-alsa as a default audio package



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- comps-f8.xml.in	5 Sep 2007 17:08:59 -0000	1.91
+++ comps-f8.xml.in	5 Sep 2007 19:24:09 -0000	1.92
@@ -1613,8 +1613,8 @@
       <packagereq type="default">alacarte</packagereq>
       <packagereq type="default">at-spi</packagereq>
       <packagereq type="default">bug-buddy</packagereq>
+      <packagereq type="default">bluez-gnome</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
-      <packagereq type="default">dvd+rw-tools</packagereq>
       <packagereq type="default">eog</packagereq>
       <packagereq type="default">esc</packagereq>
       <packagereq type="default">evince</packagereq>
@@ -2942,7 +2942,7 @@
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
-      <packagereq type="optional">bluez-utils-cups</packagereq>
+      <packagereq type="default">bluez-utils-cups</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3154,6 +3154,7 @@
     <packagelist>
       <packagereq type="mandatory">alsa-utils</packagereq>
       <packagereq type="mandatory">vorbis-tools</packagereq>
+      <packagereq type="default">bluez-utils-alsa</packagereq>
       <packagereq type="default">cdparanoia</packagereq>
       <packagereq type="default">genisoimage</packagereq>
       <packagereq type="default">gstreamer-plugins-good</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 19:27:15 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 5 Sep 2007 15:27:15 -0400
Subject: comps comps-f8.xml.in,1.92,1.93
Message-ID: <200709051927.l85JRFoN009576@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9548

Modified Files:
	comps-f8.xml.in 
Log Message:
* Add gnome-vfs2-obexftp to the default Desktop list (for Bluetooth browsing)
* Add gnome-phone-manager to the default Desktop



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- comps-f8.xml.in	5 Sep 2007 19:24:09 -0000	1.92
+++ comps-f8.xml.in	5 Sep 2007 19:26:45 -0000	1.93
@@ -1627,6 +1627,7 @@
       <packagereq type="default">gnome-bluetooth</packagereq>
       <packagereq type="default">gnome-media</packagereq>
       <packagereq type="default">gnome-netstatus</packagereq>
+      <packagereq type="default">gnome-phone-manager</packagereq>
       <packagereq type="default">gnome-pilot</packagereq>
       <packagereq type="default">gnome-power-manager</packagereq>
       <packagereq type="default">gnome-screensaver</packagereq>
@@ -1635,6 +1636,7 @@
       <packagereq type="default">gnome-user-docs</packagereq>
       <packagereq type="default">gnome-user-share</packagereq>
       <packagereq type="default">gnome-utils</packagereq>
+      <packagereq type="default">gnome-vfs2-obexftp</packagereq>
       <packagereq type="default">gnome-vfs2-smb</packagereq>
       <packagereq type="default">gnome-volume-manager</packagereq>
       <packagereq type="default">gok</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep  5 19:30:34 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:30:34 -0400
Subject: rpms/rubygem-mongrel/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 cgi_multipart_eof_fix-2.3.gem, 1.1, NONE
Message-ID: <200709051930.l85JUYcC009680@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9635/F-7

Modified Files:
	.cvsignore sources 
Removed Files:
	cgi_multipart_eof_fix-2.3.gem 
Log Message:
moving gem to upload


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 21:29:03 -0000	1.2
+++ .cvsignore	5 Sep 2007 19:30:01 -0000	1.3
@@ -1 +1,2 @@
 mongrel-1.0.1.gem
+cgi_multipart_eof_fix-2.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 21:29:03 -0000	1.2
+++ sources	5 Sep 2007 19:30:01 -0000	1.3
@@ -1 +1,2 @@
 e3caa5d827d0d4bf03acc7245b71694f  mongrel-1.0.1.gem
+fca23cd955342af53f590c10c06ec87f  cgi_multipart_eof_fix-2.3.gem


--- cgi_multipart_eof_fix-2.3.gem DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:30:36 2007
From: fedora-extras-commits at redhat.com (Scott Seago (sseago))
Date: Wed, 5 Sep 2007 15:30:36 -0400
Subject: rpms/rubygem-mongrel/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 cgi_multipart_eof_fix-2.3.gem, 1.1, NONE
Message-ID: <200709051930.l85JUaew009684@cvs-int.fedora.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/rubygem-mongrel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9635/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	cgi_multipart_eof_fix-2.3.gem 
Log Message:
moving gem to upload


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 21:27:39 -0000	1.2
+++ .cvsignore	5 Sep 2007 19:30:04 -0000	1.3
@@ -1 +1,2 @@
 mongrel-1.0.1.gem
+cgi_multipart_eof_fix-2.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 21:27:39 -0000	1.2
+++ sources	5 Sep 2007 19:30:04 -0000	1.3
@@ -1 +1,2 @@
 e3caa5d827d0d4bf03acc7245b71694f  mongrel-1.0.1.gem
+fca23cd955342af53f590c10c06ec87f  cgi_multipart_eof_fix-2.3.gem


--- cgi_multipart_eof_fix-2.3.gem DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:38:32 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 5 Sep 2007 15:38:32 -0400
Subject: rpms/claws-mail-plugins/F-7 .cvsignore, 1.8,
	1.9 claws-mail-plugins.spec, 1.14, 1.15 sources, 1.8, 1.9
Message-ID: <200709051938.l85JcWhO009965@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9894/F-7

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jul 2007 17:04:58 -0000	1.8
+++ .cvsignore	5 Sep 2007 19:38:00 -0000	1.9
@@ -1 +1 @@
-claws-mail-extra-plugins-2.10.0.tar.bz2
+claws-mail-extra-plugins-3.0.0.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- claws-mail-plugins.spec	22 Aug 2007 07:55:13 -0000	1.14
+++ claws-mail-plugins.spec	5 Sep 2007 19:38:00 -0000	1.15
@@ -1,26 +1,27 @@
 # define plugin version
-%define acpinotifier	1.0.11
-%define attachwarner    0.2.7
-%define attremover	1.0.6
-%define cachesaver	0.10.5
-%define fetchinfo	0.4.19
-%define gtkhtml2viewer  0.15.1
-%define mailmbox	1.13.1
-%define newmail		0.0.10
-%define notification	0.11
-%define pdfviewer       0.5
-%define perl		0.9.9
-%define rssyl		0.14
-%define smime		0.7.1
-%define synce		0.7.1
-%define vcalendar	1.96
+%define acpinotifier	1.0.12
+%define attachwarner    0.2.8
+%define attremover	1.0.7
+%define cachesaver	0.10.6
+%define fetchinfo	0.4.20
+%define gtkhtml2viewer  0.15.2
+%define mailmbox	1.14
+%define newmail		0.0.11
+%define notification	0.12
+%define pdfviewer       0.6
+%define perl		0.9.10
+%define rssyl		0.15
+%define smime		0.7.2
+%define spamreport      0.2
+%define synce		0.7.2
+%define vcalendar	1.97
 Name:           claws-mail-plugins
-Version:        2.10.0
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
-License:        GPLv2 and GPLv2+ and MIT
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  synce-devel
+BuildRequires:  libsynce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
@@ -55,6 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
+Requires:       %{name}-spamreport = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -208,6 +210,14 @@
 This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
 mails, verify signatures or sign and encrypt your own mails.
 
+%package spam-report
+Summary:        Report spam mail to various places
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description spam-report
+This plugin can report spam mails to various places.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -300,6 +310,11 @@
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#smime
+cd ../spam_report-%{spamreport}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 #synce
 cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
@@ -373,6 +388,10 @@
 cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 
+#spamreport
+cd ../spam_report-%{spamreport}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+
 
 #synce
 cd ../synce_plugin-%{synce}
@@ -507,6 +526,7 @@
 %{_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(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
@@ -569,6 +589,18 @@
 %doc smime-%{smime}/NEWS
 %{_libdir}/claws-mail/plugins/smime*
 
+%files spam-report
+%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(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(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
+
 %files synce
 %defattr(-,root,root,-)
 %doc synce_plugin-%{synce}/AUTHORS
@@ -599,6 +631,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0
+- version upgrade
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-2
 - new license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jul 2007 17:04:58 -0000	1.8
+++ sources	5 Sep 2007 19:38:00 -0000	1.9
@@ -1 +1 @@
-1dc867cb2b781a65eace390fd1deb424  claws-mail-extra-plugins-2.10.0.tar.bz2
+c59f022987fb8136b6d4a8a0611d2d39  claws-mail-extra-plugins-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 19:38:35 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 5 Sep 2007 15:38:35 -0400
Subject: rpms/claws-mail-plugins/devel .cvsignore, 1.8,
	1.9 claws-mail-plugins.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200709051938.l85JcZji009970@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9894/devel

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jul 2007 16:58:44 -0000	1.8
+++ .cvsignore	5 Sep 2007 19:38:03 -0000	1.9
@@ -1 +1 @@
-claws-mail-extra-plugins-2.10.0.tar.bz2
+claws-mail-extra-plugins-3.0.0.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- claws-mail-plugins.spec	22 Aug 2007 07:55:16 -0000	1.16
+++ claws-mail-plugins.spec	5 Sep 2007 19:38:03 -0000	1.17
@@ -1,26 +1,27 @@
 # define plugin version
-%define acpinotifier	1.0.11
-%define attachwarner    0.2.7
-%define attremover	1.0.6
-%define cachesaver	0.10.5
-%define fetchinfo	0.4.19
-%define gtkhtml2viewer  0.15.1
-%define mailmbox	1.13.1
-%define newmail		0.0.10
-%define notification	0.11
-%define pdfviewer       0.5
-%define perl		0.9.9
-%define rssyl		0.14
-%define smime		0.7.1
-%define synce		0.7.1
-%define vcalendar	1.96
+%define acpinotifier	1.0.12
+%define attachwarner    0.2.8
+%define attremover	1.0.7
+%define cachesaver	0.10.6
+%define fetchinfo	0.4.20
+%define gtkhtml2viewer  0.15.2
+%define mailmbox	1.14
+%define newmail		0.0.11
+%define notification	0.12
+%define pdfviewer       0.6
+%define perl		0.9.10
+%define rssyl		0.15
+%define smime		0.7.2
+%define spamreport      0.2
+%define synce		0.7.2
+%define vcalendar	1.97
 Name:           claws-mail-plugins
-Version:        2.10.0
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
-License:        GPLv2 and GPLv2+ and MIT
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  synce-devel
+BuildRequires:  libsynce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
@@ -55,6 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
+Requires:       %{name}-spamreport = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -208,6 +210,14 @@
 This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
 mails, verify signatures or sign and encrypt your own mails.
 
+%package spam-report
+Summary:        Report spam mail to various places
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description spam-report
+This plugin can report spam mails to various places.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -300,6 +310,11 @@
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#smime
+cd ../spam_report-%{spamreport}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 #synce
 cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
@@ -373,6 +388,10 @@
 cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 
+#spamreport
+cd ../spam_report-%{spamreport}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+
 
 #synce
 cd ../synce_plugin-%{synce}
@@ -507,6 +526,7 @@
 %{_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(fi) %{_datadir}/locale/fi/LC_MESSAGES/notification_plugin.mo
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/notification_plugin.mo
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
@@ -569,6 +589,18 @@
 %doc smime-%{smime}/NEWS
 %{_libdir}/claws-mail/plugins/smime*
 
+%files spam-report
+%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(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(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/spam_report.mo
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/spam_report.mo
+
 %files synce
 %defattr(-,root,root,-)
 %doc synce_plugin-%{synce}/AUTHORS
@@ -599,10 +631,13 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0
+- version upgrade
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-2
 - new license tag
-- rebuild for ppc32
 
 * Tue Jul 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.10.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jul 2007 16:58:44 -0000	1.8
+++ sources	5 Sep 2007 19:38:03 -0000	1.9
@@ -1 +1 @@
-1dc867cb2b781a65eace390fd1deb424  claws-mail-extra-plugins-2.10.0.tar.bz2
+c59f022987fb8136b6d4a8a0611d2d39  claws-mail-extra-plugins-3.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 19:43:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 5 Sep 2007 15:43:56 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc5-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.680, 1.681 kernel.spec, 1.147,
	1.148 linux-2.6-build-nonintconfig.patch, 1.10, 1.11 sources,
	1.642, 1.643 upstream, 1.564,
	1.565 linux-2.6-ata-via-fix-dma-mode.patch, 1.1,
	NONE linux-2.6-libata-terminate-list.patch, 1.1,
	NONE linux-2.6-net-oops.patch, 1.1, NONE
Message-ID: <200709051943.l85JhuOQ010055@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10022

Modified Files:
	.cvsignore kernel.spec linux-2.6-build-nonintconfig.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc5-git1.bz2.sign 
Removed Files:
	linux-2.6-ata-via-fix-dma-mode.patch 
	linux-2.6-libata-terminate-list.patch linux-2.6-net-oops.patch 
Log Message:
* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc5-git1



--- NEW FILE patch-2.6.23-rc5-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG3avpyGugalF9Dw4RAiyrAJ9Sanwlphian9OKCBEtyrPnCYqgagCfe8fA
ClqxNm8hZwVxdOsNb4oqA8k=
=YXZA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- .cvsignore	4 Sep 2007 21:59:46 -0000	1.680
+++ .cvsignore	5 Sep 2007 19:43:23 -0000	1.681
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kernel.spec	4 Sep 2007 22:06:22 -0000	1.147
+++ kernel.spec	5 Sep 2007 19:43:23 -0000	1.148
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -623,8 +623,6 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
-Patch662: linux-2.6-libata-terminate-list.patch
-Patch663: linux-2.6-ata-via-fix-dma-mode.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -669,7 +667,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1600: linux-2.6-net-oops.patch
 
 %endif
 
@@ -1119,10 +1116,6 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
-# Terminate list in ata-piix
-ApplyPatch linux-2.6-libata-terminate-list.patch
-# fix DMA on vt6421
-ApplyPatch linux-2.6-ata-via-fix-dma-mode.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1197,9 +1190,6 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
-# Fix TCP oops.
-ApplyPatch linux-2.6-net-oops.patch
-
 
 # END OF PATCH APPLICATIONS
 
@@ -1792,6 +1782,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc5-git1
+
 * Tue Sep 04 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix DMA mode on VIA 6421
 

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-build-nonintconfig.patch	26 Jul 2007 17:09:28 -0000	1.10
+++ linux-2.6-build-nonintconfig.patch	5 Sep 2007 19:43:23 -0000	1.11
@@ -33,10 +33,10 @@
  static const char *get_help(struct menu *menu)
  {
  	if (menu_has_help(menu))
-@@ -103,6 +107,14 @@ static void conf_askvalue(struct symbol 
+@@ -103,6 +107,16 @@ static void conf_askvalue(struct symbol 
  		fflush(stdout);
  		fgets(line, 128, stdin);
- 		return;
+ 		return 1;
 +	case dont_ask:
 +		if (!sym_has_value(sym)) {
 +			fprintf(stderr,"CONFIG_%s\n",sym->name);
@@ -44,10 +44,12 @@
 +		}
 +		/*FALLTHROUGH*/
 +	case dont_ask_dont_tell:
-+		return;
++		if (sym_has_value(sym))
++			return 0;
++		return 1;
  	case set_default:
  		printf("%s\n", def);
- 		return;
+ 		return 1;
 @@ -346,6 +358,11 @@ static int conf_choice(struct menu *menu
  			printf("?");
  		printf("]: ");


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -r1.642 -r1.643
--- sources	1 Sep 2007 16:29:55 -0000	1.642
+++ sources	5 Sep 2007 19:43:23 -0000	1.643
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2
+4cfdcb5e00c1db78237b15e6ce955367  patch-2.6.23-rc5-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- upstream	1 Sep 2007 16:29:55 -0000	1.564
+++ upstream	5 Sep 2007 19:43:23 -0000	1.565
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc5.bz2
+patch-2.6.23-rc5-git1.bz2


--- linux-2.6-ata-via-fix-dma-mode.patch DELETED ---


--- linux-2.6-libata-terminate-list.patch DELETED ---


--- linux-2.6-net-oops.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:15 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:15 -0700
Subject: [pkgdb] eclipse Orphaned
Message-ID: <200709051948.l85JmG01019775@app3.fedora.phx.redhat.com>

Package eclipse in Fedora devel was orphaned by Ben Konrath (bkonrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:17 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:17 -0700
Subject: [pkgdb] eclipse Orphaned
Message-ID: <200709051948.l85JmHRh019784@app3.fedora.phx.redhat.com>

Package eclipse in Fedora 7 was orphaned by Ben Konrath (bkonrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:38 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:38 -0700
Subject: [pkgdb] eclipse-pydev Orphaned
Message-ID: <200709051948.l85JmdXY019794@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora devel was orphaned by Ben Konrath (bkonrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Wed Sep  5 19:48:40 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 12:48:40 -0700
Subject: [pkgdb] eclipse-pydev Orphaned
Message-ID: <200709051948.l85JmeGo019804@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora 7 was orphaned by Ben Konrath (bkonrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:32 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 05 Sep 2007 12:49:32 -0700
Subject: [pkgdb] eclipse Owned
Message-ID: <200709051949.l85JnWkv019818@app3.fedora.phx.redhat.com>

Package eclipse in Fedora devel is now owned by Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:37 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 15:49:37 -0400
Subject: rpms/xulrunner/devel camellia256.patch, NONE, 1.1 xulrunner.spec,
	1.10, 1.11
Message-ID: <200709051949.l85Jnb67010469@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10444

Modified Files:
	xulrunner.spec 
Added Files:
	camellia256.patch 
Log Message:
temporarily revert support for camellia 256 as our NSS doesn't support it yet


camellia256.patch:

--- NEW FILE camellia256.patch ---
Temporarily revert https://bugzilla.mozilla.org/attachment.cgi?id=266361

Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.147
diff -u -8 -p -r1.147 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	14 May 2007 21:09:58 -0000	1.147
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	28 May 2007 09:51:50 -0000
@@ -902,16 +902,19 @@ static CipherPref CipherPrefs[] = {
  {"security.ssl3.rsa_des_ede3_sha", SSL_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA and a SHA1 MAC
  {"security.ssl3.rsa_fips_des_sha", SSL_RSA_FIPS_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC (FIPS)
  {"security.ssl3.rsa_des_sha", SSL_RSA_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC
  {"security.ssl3.rsa_1024_rc4_56_sha", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA}, // 56-bit RC4 encryption with RSA and a SHA1 MAC (export)
  {"security.ssl3.rsa_1024_des_cbc_sha", TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA and a SHA1 MAC (export)
  {"security.ssl3.rsa_rc4_40_md5", SSL_RSA_EXPORT_WITH_RC4_40_MD5}, // 40-bit RC4 encryption with RSA and an MD5 MAC (export)
  {"security.ssl3.rsa_rc2_40_md5", SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5}, // 40-bit RC2 encryption with RSA and an MD5 MAC (export)
  /* Extra SSL3/TLS cipher suites */
+ {"security.ssl3.dhe_rsa_camellia_256_sha", TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA, DHE, and a SHA1 MAC
+ {"security.ssl3.dhe_dss_camellia_256_sha", TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with DSA, DHE, and a SHA1 MAC
+ {"security.ssl3.rsa_camellia_256_sha", TLS_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_aes_256_sha", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_aes_256_sha", TLS_DHE_DSS_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA and a SHA1 MAC
    /* TLS_DHE_DSS_WITH_RC4_128_SHA // 128-bit RC4 encryption with DSA, DHE, and a SHA1 MAC
       If this cipher gets included at a later time, it should get added at this position */
  {"security.ssl3.ecdhe_ecdsa_aes_256_sha", TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with ECDHE-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdhe_ecdsa_aes_128_sha", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with ECDHE-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdhe_ecdsa_des_ede3_sha", TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDHE-ECDSA and a SHA1 MAC
@@ -927,16 +930,19 @@ static CipherPref CipherPrefs[] = {
  {"security.ssl3.ecdh_ecdsa_des_ede3_sha", TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_ecdsa_rc4_128_sha", TLS_ECDH_ECDSA_WITH_RC4_128_SHA}, // 128-bit RC4 encryption with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_ecdsa_null_sha", TLS_ECDH_ECDSA_WITH_NULL_SHA}, // No encryption with ECDH-ECDSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_aes_256_sha", TLS_ECDH_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_des_ede3_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_rc4_128_sha", TLS_ECDH_RSA_WITH_RC4_128_SHA}, // 128-bit RC4 encryption with ECDH-RSA and a SHA1 MAC
  {"security.ssl3.ecdh_rsa_null_sha", TLS_ECDH_RSA_WITH_NULL_SHA}, // No encryption with ECDH-RSA and a SHA1 MAC
+ {"security.ssl3.dhe_rsa_camellia_128_sha", TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA, DHE, and a SHA1 MAC
+ {"security.ssl3.dhe_dss_camellia_128_sha", TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with DSA, DHE, and a SHA1 MAC
+ {"security.ssl3.rsa_camellia_128_sha", TLS_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_aes_128_sha", TLS_DHE_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_aes_128_sha", TLS_DHE_DSS_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA and a SHA1 MAC
  {"security.ssl3.dhe_rsa_des_ede3_sha", SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_des_ede3_sha", SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_rsa_des_sha", SSL_DHE_RSA_WITH_DES_CBC_SHA}, // 56-bit DES encryption with RSA, DHE, and a SHA1 MAC
  {"security.ssl3.dhe_dss_des_sha", SSL_DHE_DSS_WITH_DES_CBC_SHA}, // 56-bit DES encryption with DSA, DHE, and a SHA1 MAC
  {"security.ssl3.rsa_null_sha", SSL_RSA_WITH_NULL_SHA}, // No encryption with RSA authentication and a SHA1 MAC
Index: mozilla/netwerk/base/public/security-prefs.js
===================================================================
RCS file: /cvsroot/mozilla/netwerk/base/public/security-prefs.js,v
retrieving revision 1.15
diff -u -8 -p -r1.15 security-prefs.js
--- mozilla/netwerk/base/public/security-prefs.js	16 May 2006 00:33:43 -0000	1.15
+++ mozilla/netwerk/base/public/security-prefs.js	28 May 2007 09:52:49 -0000
@@ -15,16 +15,22 @@ pref("security.ssl3.rsa_rc4_128_sha", tr
 pref("security.ssl3.rsa_fips_des_ede3_sha", true);
 pref("security.ssl3.rsa_des_ede3_sha", true);
 pref("security.ssl3.rsa_fips_des_sha", false);
 pref("security.ssl3.rsa_des_sha", false);
 pref("security.ssl3.rsa_1024_rc4_56_sha", false);
 pref("security.ssl3.rsa_1024_des_cbc_sha", false);
 pref("security.ssl3.rsa_rc4_40_md5", false);
 pref("security.ssl3.rsa_rc2_40_md5", false);
+pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
+pref("security.ssl3.dhe_dss_camellia_256_sha", true);
+pref("security.ssl3.rsa_camellia_256_sha", true);
+pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
+pref("security.ssl3.dhe_dss_camellia_128_sha", true);
+pref("security.ssl3.rsa_camellia_128_sha", true);
 pref("security.ssl3.dhe_rsa_aes_256_sha", true);
 pref("security.ssl3.dhe_dss_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_des_ede3_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", true);
 pref("security.ssl3.ecdhe_ecdsa_null_sha", false);



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xulrunner.spec	5 Sep 2007 18:57:33 -0000	1.10
+++ xulrunner.spec	5 Sep 2007 19:49:05 -0000	1.11
@@ -35,6 +35,7 @@
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
+Patch2:         camellia256.patch
 
 # customization patches
 Patch21:        firefox-0.7.3-psfonts.patch
@@ -121,6 +122,7 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
+%patch2   -Rp1 -b .camellia256
 #%patch3  -p1
 #%patch4  -p1
 #%patch5  -p1 -b .visibility
@@ -370,3 +372,4 @@
 %changelog
 * Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
 - Initial cut at XULRunner 1.9 Alpha 7
+- Temporarily revert camellia 256 support since our nss doesn't support it yet



From fedora-extras-commits at redhat.com  Wed Sep  5 19:49:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 05 Sep 2007 12:49:34 -0700
Subject: [pkgdb] eclipse Owned
Message-ID: <200709051949.l85JnYWa019825@app3.fedora.phx.redhat.com>

Package eclipse in Fedora 7 is now owned by Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse



From fedora-extras-commits at redhat.com  Wed Sep  5 19:55:34 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Wed, 5 Sep 2007 15:55:34 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.11,1.12
Message-ID: <200709051955.l85JtYOT010581@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558

Modified Files:
	xulrunner.spec 
Log Message:
attempt to fix patch command


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xulrunner.spec	5 Sep 2007 19:49:05 -0000	1.11
+++ xulrunner.spec	5 Sep 2007 19:55:01 -0000	1.12
@@ -122,7 +122,7 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
-%patch2   -Rp1 -b .camellia256
+%patch2   -R -p1 -b .camellia256
 #%patch3  -p1
 #%patch4  -p1
 #%patch5  -p1 -b .visibility



From fedora-extras-commits at redhat.com  Wed Sep  5 20:01:16 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Wed, 5 Sep 2007 16:01:16 -0400
Subject: rpms/nss/devel nss-create-obj.patch, NONE, 1.1 nss-enable-pem.patch,
	NONE, 1.1 .cvsignore, 1.10, 1.11 nss.spec, 1.26, 1.27 sources,
	1.10, 1.11
Message-ID: <200709052001.l85K1GCB016708@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763

Modified Files:
	.cvsignore nss.spec sources 
Added Files:
	nss-create-obj.patch nss-enable-pem.patch 
Log Message:
* Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
- Add 3.12 ckfw and libnsspem


nss-create-obj.patch:

--- NEW FILE nss-create-obj.patch ---
Index: mozilla/security/nss/lib/nss/nss.def
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/nss/nss.def,v
retrieving revision 1.158.2.7
diff -u -r1.158.2.7 nss.def
--- mozilla/security/nss/lib/nss/nss.def     25 Apr 2007 23:26:53 -0000      1.158.2.7
+++ mozilla/security/nss/lib/nss/nss.def     31 Aug 2007 18:54:54 -0000
@@ -899,3 +899,10 @@
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12 {
+;+    global:
+PK11_CreateGenericObject;
+PK11_WriteRawAttribute;
+;+    local:
+;+       *;
+;+};
Index: mozilla/security/nss/lib/pk11wrap/pk11obj.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11obj.c,v
retrieving revision 1.11.2.3
diff -u -r1.11.2.3 pk11obj.c
--- mozilla/security/nss/lib/pk11wrap/pk11obj.c	5 Jan 2007 09:44:05 -0000	1.11.2.3
+++ mozilla/security/nss/lib/pk11wrap/pk11obj.c	9 May 2007 20:58:17 -0000
@@ -388,7 +388,7 @@
 
 SECStatus
 PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
-				CK_ATTRIBUTE *theTemplate, int count, 
+				const CK_ATTRIBUTE *theTemplate, int count, 
 				PRBool token, CK_OBJECT_HANDLE *objectID)
 {
 	CK_SESSION_HANDLE rwsession;
@@ -1306,7 +1306,7 @@
 	PK11_DestroyGenericObject(objects);
     }
     /* delete all the objects before it in the list */
-    for (objects = prevObject; objects;  objects = nextObject) {
+    for (objects = prevObject; objects;  objects = prevObject) {
 	prevObject = objects->prev;
 	PK11_DestroyGenericObject(objects);
     }
@@ -1314,6 +1314,96 @@
 }
 
 
+/*
+ * Hand Create a new object and return the Generic object for our new object.
+ */
+PK11GenericObject *
+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template,
+		int count,  PRBool token)
+{
+    CK_OBJECT_HANDLE objectID;
+    PK11GenericObject *obj;
+    CK_RV crv;
+
+    PK11_EnterSlotMonitor(slot);
+    crv = PK11_CreateNewObject(slot, slot->session, template, count, 
+			       token, &objectID);
+    PK11_ExitSlotMonitor(slot);
+    if (crv != CKR_OK) {
+	PORT_SetError(PK11_MapError(crv));
+	return NULL;
+    }
+
+    obj = PORT_New(PK11GenericObject);
+    if ( !obj ) {
+	/* error set by PORT_New */
+	return NULL;
+    }
+
+    /* initialize it */	
+    obj->slot = PK11_ReferenceSlot(slot);
+    obj->objectID = objectID;
+    obj->next = NULL;
+    obj->prev = NULL;
+    return obj;
+}
+
+/*
+ * Change an attribute on a raw object
+ */
+SECStatus
+PK11_WriteRawAttribute(PK11ObjectType objType, void *objSpec, 
+				CK_ATTRIBUTE_TYPE attrType, SECItem *item)
+{
+    PK11SlotInfo *slot = NULL;
+    CK_OBJECT_HANDLE handle;
+    CK_ATTRIBUTE setTemplate;
+    CK_RV crv;
+    CK_SESSION_HANDLE rwsession;
+
+    switch (objType) {
+    case PK11_TypeGeneric:
+	slot = ((PK11GenericObject *)objSpec)->slot;
+	handle = ((PK11GenericObject *)objSpec)->objectID;
+	break;
+    case PK11_TypePrivKey:
+	slot = ((SECKEYPrivateKey *)objSpec)->pkcs11Slot;
+	handle = ((SECKEYPrivateKey *)objSpec)->pkcs11ID;
+	break;
+    case PK11_TypePubKey:
+	slot = ((SECKEYPublicKey *)objSpec)->pkcs11Slot;
+	handle = ((SECKEYPublicKey *)objSpec)->pkcs11ID;
+	break;
+    case PK11_TypeSymKey:
+	slot = ((PK11SymKey *)objSpec)->slot;
+	handle = ((PK11SymKey *)objSpec)->objectID;
+	break;
+    case PK11_TypeCert: /* don't handle cert case for now */
+    default:
+	break;
+    }
+    if (slot == NULL) {
+	PORT_SetError(SEC_ERROR_UNKNOWN_OBJECT_TYPE);
+	return SECFailure;
+    }
+
+    PK11_SETATTRS(&setTemplate, attrType, (CK_CHAR *) item->data, item->len);
+    rwsession = PK11_GetRWSession(slot);
+    if (rwsession == CK_INVALID_SESSION) {
+    	PORT_SetError(SEC_ERROR_BAD_DATA);
+    	return SECFailure;
+    }
+    crv = PK11_GETTAB(slot)->C_SetAttributeValue(rwsession, handle,
+			&setTemplate, 1);
+    PK11_RestoreROSession(slot, rwsession);
+    if (crv != CKR_OK) {
+	PORT_SetError(PK11_MapError(crv));
+	return SECFailure;
+    }
+    return SECSuccess;
+}
+
+
 SECStatus
 PK11_ReadRawAttribute(PK11ObjectType objType, void *objSpec, 
 				CK_ATTRIBUTE_TYPE attrType, SECItem *item)
Index: mozilla/security/nss/lib/pk11wrap/pk11pub.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11pub.h,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 pk11pub.h
--- mozilla/security/nss/lib/pk11wrap/pk11pub.h	2 Mar 2006 00:12:27 -0000	1.14.2.1
+++ mozilla/security/nss/lib/pk11wrap/pk11pub.h	9 May 2007 20:58:17 -0000
@@ -688,8 +688,13 @@
 				 PK11GenericObject *object);
 SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
 SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
+PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, 
+				   const CK_ATTRIBUTE *template, 
+				   int count, PRBool token);
 SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, 
 				CK_ATTRIBUTE_TYPE attr, SECItem *item);
+SECStatus PK11_WriteRawAttribute(PK11ObjectType type, void *object, 
+				CK_ATTRIBUTE_TYPE attr, SECItem *item);
 
 
 /**********************************************************************
Index: mozilla/security/nss/lib/pk11wrap/secmodi.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/secmodi.h,v
retrieving revision 1.23
diff -u -r1.23 secmodi.h
--- mozilla/security/nss/lib/pk11wrap/secmodi.h	9 Sep 2005 02:03:57 -0000	1.23
+++ mozilla/security/nss/lib/pk11wrap/secmodi.h	9 May 2007 20:58:17 -0000
@@ -105,7 +105,7 @@
 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
 		(x)->pValue=(v); (x)->ulValueLen = (l);
 SECStatus PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
-                               CK_ATTRIBUTE *theTemplate, int count,
+                               const CK_ATTRIBUTE *theTemplate, int count,
                                 PRBool token, CK_OBJECT_HANDLE *objectID);
 
 SECStatus pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech);

nss-enable-pem.patch:

--- NEW FILE nss-enable-pem.patch ---
Index: mozilla/security/nss/lib/ckfw/manifest.mn
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
retrieving revision 1.9
diff -u -r1.9 manifest.mn
--- mozilla/security/nss/lib/ckfw/manifest.mn   16 Dec 2005 00:48:01 -0000      1.9
+++ mozilla/security/nss/lib/ckfw/manifest.mn   31 Aug 2007 17:58:23 -0000
@@ -38,7 +38,7 @@
 
 CORE_DEPTH = ../../..
 
-DIRS = builtins 
+DIRS = builtins pem
 
 PRIVATE_EXPORTS = \
        ck.h              \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Jun 2007 00:01:44 -0000	1.10
+++ .cvsignore	5 Sep 2007 20:00:42 -0000	1.11
@@ -1,2 +1,4 @@
 nss-3.11.5-fbst-stripped.tar.gz
 nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
+nss-3.12-alpha-ckfw.tar.gz
+nss-3.12-alpha-pem.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nss.spec	28 Aug 2007 11:04:07 -0000	1.26
+++ nss.spec	5 Sep 2007 20:00:42 -0000	1.27
@@ -1,12 +1,13 @@
 %define nspr_version 4.6.2
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %define fips_source_version 3.11.5
+%define ckfw_source_version 3.12-alpha
 %define ckbi_version 1.64
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-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
@@ -29,12 +30,16 @@
 Source5:          blank-secmod.db
 Source7:          fake-kstat.h
 Source10:         %{name}-%{fips_source_version}-fbst-stripped.tar.gz
+Source11:         %{name}-%{ckfw_source_version}-ckfw.tar.gz
+Source12:         %{name}-%{ckfw_source_version}-pem.tar.gz
 
 Patch1:           nss-no-rpath.patch
 Patch2:           nss-smartcard-auth.patch
 Patch3:           nss-use-netstat-hack.patch
 Patch4:           nss-decouple-softokn.patch
 Patch5:           nss-disable-build-freebl-softoken.patch
+Patch6:           nss-enable-pem.patch
+Patch7:           nss-create-obj.patch
 
 
 %description
@@ -86,9 +91,12 @@
 %prep
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 10
+%setup -q -T -D -n %{name}-%{version} -a 11
+%setup -q -T -D -n %{name}-%{version} -a 12
 
 %define old_nss_lib %{name}-%{fips_source_version}/mozilla/security/nss/lib
 %define new_nss_lib mozilla/security/nss/lib
+%define new_ckfw_lib %{name}-%{ckfw_source_version}/mozilla/security/nss/lib
 
 # Ensure we will not use new freebl/softoken code
 rm -rf %{new_nss_lib}/freebl
@@ -98,6 +106,10 @@
 cp -a %{old_nss_lib}/freebl %{new_nss_lib}
 cp -a %{old_nss_lib}/softoken %{new_nss_lib}
 
+# set up ckfw
+rm -rf %{new_nss_lib}/ckfw
+cp -a %{new_ckfw_lib}/ckfw %{new_nss_lib}
+
 # Ensure the newer NSS tree will not build code, except the loader
 mv -i %{new_nss_lib}/freebl/loader.c %{new_nss_lib}/freebl/loader.c.save
 rm -rf %{new_nss_lib}/freebl/*.c %{new_nss_lib}/freebl/*.s
@@ -114,6 +126,8 @@
 %patch2 -p0 -b .smartcard-auth
 %patch4 -p0 -b .decouple-softokn
 %patch5 -p0 -b .nofbst
+%patch6 -p0 -b .libpem
+%patch7 -p0 -b .create-obj
 
 # Apply the patches to the tree where we build freebl/softoken
 cd nss-%{fips_source_version}
@@ -228,7 +242,7 @@
 done
 
 # Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so
+for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -298,6 +312,7 @@
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libnssckbi.so
+%{_libdir}/libnsspem.so
 %{_libdir}/libfreebl3.so
 %{unsupported_tools_directory}/shlibsign
 %ghost %{_libdir}/libsoftokn3.chk
@@ -370,6 +385,7 @@
 %{_includedir}/nss3/nssilckt.h
 %{_includedir}/nss3/nssilock.h
 %{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nsspem.h
 %{_includedir}/nss3/nssrwlk.h
 %{_includedir}/nss3/nssrwlkt.h
 %{_includedir}/nss3/ocsp.h
@@ -437,6 +453,9 @@
 
 
 %changelog
+* Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
+- Add 3.12 ckfw and libnsspem
+
 * Tue Aug 28 2007 Kai Engert <kengert at redhat.com> - 3.11.7-6
 - Updated license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 00:01:44 -0000	1.10
+++ sources	5 Sep 2007 20:00:42 -0000	1.11
@@ -1,2 +1,4 @@
 68c5e1bd8ba091e5a50babcd9e552bc5  nss-3.11.5-fbst-stripped.tar.gz
 c1053d1e001a5b1eb4b7c296a968ca5c  nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
+baa96599af6f0a2b656479d8e4efd58f  nss-3.12-alpha-ckfw.tar.gz
+84bad7e42304a6d4fdf2b83f5295b938  nss-3.12-alpha-pem.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:04:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 16:04:57 -0400
Subject: rpms/rpmlint/F-7 rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 rpmlint.config, 1.10,
	1.11 rpmlint.spec, 1.33, 1.34 sources, 1.16,
	1.17 rpmlint-0.80-fedoralicensing.patch, 1.1, NONE
Message-ID: <200709052004.l85K4vao016921@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch 
Removed Files:
	rpmlint-0.80-fedoralicensing.patch 
Log Message:
Sync with devel

rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Apr 2007 20:45:44 -0000	1.16
+++ .cvsignore	5 Sep 2007 20:04:24 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint.config	16 Aug 2007 15:41:16 -0000	1.10
+++ rpmlint.config	5 Sep 2007 20:04:24 -0000	1.11
@@ -28,9 +28,11 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 68 of that page.
+    # Last synced with Wiki revision 87 of that page.
+    'Adobe',
     'Affero GPL',
     'AFL',
+    'ARL',
     'ASL 1.0',
     'ASL 1.0+',
     'ASL 1.1',
@@ -59,6 +61,7 @@
     'EU Datagrid',
     'Giftware',
     'Glide',
+    'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
     'GPLv2',
@@ -68,6 +71,7 @@
     'GPLv3+',
     'IBM',
     'IJG',
+    'ImageMagick',
     'iMatix',
     'Intel ACPI',
     'Interbase',
@@ -94,8 +98,11 @@
     'Netscape',
     'Nokia',
     'OpenLDAP',
+    'OpenPBS',
     'OSL 1.0',
     'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
     'OSL 2.0',
     'OSL 2.0+',
     'OSL 3.0',
@@ -110,6 +117,7 @@
     'Ruby',
     'Sleepycat',
     'SISSL',
+    'SLIB',
     'SPL',
     'TCL',
     'UCD',
@@ -125,11 +133,15 @@
     'ZPLv1.0+',
     'ZPLv2.0',
     'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
     'zlib',
     # Documentation licenses
     'CDL',
     'FBSDDL',
     'GFDL',
+    'IEEE',
+    'OFSFDL',
     'Open Publication',
     # Content licenses
     'CC-BY',
@@ -142,6 +154,7 @@
     'mplus',
     'OFL',
     'Utopia',
+    'XANO',
     # Others
     'Redistributable, no modification permitted',
     'Freely redistributable without restriction',
@@ -176,9 +189,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
 addFilter(" doc-file-dependency .* /bin/sh$")
 addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rpmlint.spec	16 Aug 2007 15:41:16 -0000	1.33
+++ rpmlint.spec	5 Sep 2007 20:04:24 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.80
-Release:        3%{?dist}
+Version:        0.81
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -11,7 +11,7 @@
 Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
-Patch2:         %{name}-0.80-fedoralicensing.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -70,6 +70,14 @@
 
 
 %changelog
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-3
 - Sync Fedora license list with Wiki rev 68.
 - Move pre-2006 changelog entries to CHANGES.package.old.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Apr 2007 20:45:44 -0000	1.16
+++ sources	5 Sep 2007 20:04:24 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2


--- rpmlint-0.80-fedoralicensing.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 20:11:05 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 5 Sep 2007 16:11:05 -0400
Subject: rpms/rogue/devel .cvsignore, 1.2, 1.3 rogue.spec, 1.11, 1.12 sources,
	1.2, 1.3 rogue-5.4-setgid.patch, 1.3,
	NONE rogue-5.4.2-64bit.patch, 1.1,
	NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch,
	1.1, NONE rogue-rpmopts.patch, 1.1, NONE
Message-ID: <200709052011.l85KB5F2017213@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17191

Modified Files:
	.cvsignore rogue.spec sources 
Removed Files:
	rogue-5.4-setgid.patch rogue-5.4.2-64bit.patch 
	rogue-5.4.2-warnings.patch rogue-includes.patch 
	rogue-rpmopts.patch 
Log Message:
Update to 5.4.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 15:59:40 -0000	1.2
+++ .cvsignore	5 Sep 2007 20:10:32 -0000	1.3
@@ -1 +1 @@
-rogue5.4.2-src.tar.gz
+rogue5.4.4-src.tar.gz


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rogue.spec	28 Aug 2007 18:02:38 -0000	1.11
+++ rogue.spec	5 Sep 2007 20:10:32 -0000	1.12
@@ -1,19 +1,14 @@
 Name:           rogue
-Version:        5.4.2
-Release:        10%{?dist}
+Version:        5.4.4
+Release:        1%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
 License:        BSD
 URL:            http://rogue.rogueforge.net/
-Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.2-src.tar.gz
+Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
 Source1:        rogue.desktop
 Source2:        rogue.png
-Patch0:         rogue-rpmopts.patch
-Patch1:         rogue-includes.patch
-Patch2:         rogue-5.4-setgid.patch
-Patch3:         rogue-5.4.2-64bit.patch
-Patch4:         rogue-5.4.2-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,27 +19,18 @@
 an entire genre.
 
 %prep
-%setup -q -c -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%{__sed} -i 's/\r//' rogue54.html
-%{__sed} -i 's/\r//' readme54.html
-chmod a-x *.c *.h
+%setup -q -n %{name}%{version}
 
 
 %build
-make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck
+make %{_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue
-install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6
-mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -52,8 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
-touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,11 +63,13 @@
 %{_datadir}/icons/hicolor/32x32/apps/rogue.png
 %dir %attr(0775,games,games) %{_var}/games/roguelike
 %config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr
-%doc LICENSE.TXT rogue54.doc rogue54.html readme54.html
-
+%doc %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Sun Sep 2 2007 Wart <wart at kobold.org> 5.4.4-1
+- Update to 5.4.4
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.4.2-10
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 15:59:40 -0000	1.2
+++ sources	5 Sep 2007 20:10:32 -0000	1.3
@@ -1 +1 @@
-bd656cb017a579eba835a0ee445a0a32  rogue5.4.2-src.tar.gz
+033288f46444b06814c81ea69d96e075  rogue5.4.4-src.tar.gz


--- rogue-5.4-setgid.patch DELETED ---


--- rogue-5.4.2-64bit.patch DELETED ---


--- rogue-5.4.2-warnings.patch DELETED ---


--- rogue-includes.patch DELETED ---


--- rogue-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep  5 20:28:50 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 5 Sep 2007 16:28:50 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.479,1.480
Message-ID: <200709052028.l85KSo8K017542@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512

Modified Files:
	eclipse.spec 
Log Message:
* 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.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
+++ eclipse.spec	5 Sep 2007 20:28:17 -0000	1.480
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        14%{?dist} 
+Release:        15%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -107,11 +107,13 @@
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.31
-BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
+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-8jpp
+BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
 BuildRequires: mx4j >= 2.1
-BuildRequires: tomcat5 >= 5.5.23
-BuildRequires: tomcat5-jasper >= 5.5.23
-BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23
+BuildRequires: tomcat5 >= 5.5.23-9jpp.4
+BuildRequires: tomcat5-jasper >= 5.5.23-9jpp.4
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4
 BuildRequires: jetty
 BuildRequires: lucene >= 1.9.1
 BuildRequires: lucene-contrib >= 1.9.1
@@ -208,12 +210,14 @@
 #Requires: ant-apache-bsf ant-commons-net
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
+Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
+Requires: jakarta-commons-el >= 1.0-8jpp
+Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: mx4j >= 2.1
-Requires: tomcat5 >= 5.5.23
-Requires: tomcat5-jasper-eclipse >= 5.5.23
-Requires: tomcat5-servlet-2.4-api >= 5.5.23
-Requires: tomcat5-jsp-2.0-api >= 5.5.23
+Requires: tomcat5 >= 5.5.23-9jpp.4
+Requires: tomcat5-jasper-eclipse >= 5.5.23-9jpp.4
+Requires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4
+Requires: tomcat5-jsp-2.0-api >= 5.5.23-9jpp.4
 Requires: jetty
 Requires: jsch >= 0.1.31
 Requires: lucene >= 1.9.1
@@ -595,7 +599,7 @@
 ln -s  %{_datadir}/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar \
    plugins/org.apache.jasper_5.5.17.v200706111724.jar
 
-# link to serlet-api
+# link to servlet-api
 rm plugins/javax.servlet_2.4.0.v200706111738.jar
 ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar
 
@@ -1569,6 +1573,10 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Wed Sep  5 20:35:28 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Wed, 5 Sep 2007 16:35:28 -0400
Subject: rpms/bouml/devel .cvsignore, 1.3, 1.4 bouml.spec, 1.4, 1.5 sources, 
	1.5, 1.6
Message-ID: <200709052035.l85KZSH6017754@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17687

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.1-1 in devel.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 20:44:51 -0000	1.3
+++ .cvsignore	5 Sep 2007 20:34:56 -0000	1.4
@@ -1 +1 @@
-bouml_2.30.2.tar.gz
+bouml_2.31.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouml.spec	21 Aug 2007 20:44:51 -0000	1.4
+++ bouml.spec	5 Sep 2007 20:34:56 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.30.2
+Version: 2.31.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -96,6 +96,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
+- Version bump to 2.31.1.
+
 * Wed Aug 22 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.30.2-1
 - Version bump to 2.30.2.
 - Cleaned up SPEC.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 20:44:51 -0000	1.5
+++ sources	5 Sep 2007 20:34:56 -0000	1.6
@@ -1 +1 @@
-1232a026271cb09fa02b6763a739b8d4  bouml_2.30.2.tar.gz
+51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:37:22 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Wed, 5 Sep 2007 16:37:22 -0400
Subject: rpms/bouml/F-7 .cvsignore, 1.5, 1.6 bouml.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200709052037.l85KbMkM017904@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17864

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.1-1 in F-7.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Aug 2007 20:48:26 -0000	1.5
+++ .cvsignore	5 Sep 2007 20:36:49 -0000	1.6
@@ -1 +1 @@
-bouml_2.30.2.tar.gz
+bouml_2.31.1.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/bouml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bouml.spec	21 Aug 2007 20:48:26 -0000	1.4
+++ bouml.spec	5 Sep 2007 20:36:49 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.30.2
+Version: 2.31.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -96,6 +96,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
+- Version bump to 2.31.1.
+
 * Wed Aug 22 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.30.2-1
 - Version bump to 2.30.2.
 - Cleaned up SPEC.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Aug 2007 20:48:26 -0000	1.5
+++ sources	5 Sep 2007 20:36:49 -0000	1.6
@@ -1 +1 @@
-1232a026271cb09fa02b6763a739b8d4  bouml_2.30.2.tar.gz
+51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:19 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:19 -0700
Subject: [pkgdb] eclipse-mylyn: bkonrath has given up commit
Message-ID: <200709052047.l85KlJ5V020375@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-mylyn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-mylyn



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:46 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:46 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchbugzilla
Message-ID: <200709052047.l85Klk7X020389@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-nlspackager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nlspackager



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:52 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:52 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchbugzilla
Message-ID: <200709052047.l85KlqpU020399@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-nlspackager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nlspackager



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:54 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:54 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up commit
Message-ID: <200709052047.l85KltbL020409@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-nlspackager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nlspackager



From fedora-extras-commits at redhat.com  Wed Sep  5 20:47:59 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:47:59 -0700
Subject: [pkgdb] eclipse-nlspackager: bkonrath has given up watchcommits
Message-ID: <200709052047.l85Klxh1020418@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on eclipse-nlspackager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-nlspackager



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:14 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:14 -0700
Subject: [pkgdb] eclipse-pydev: bkonrath has given up commit
Message-ID: <200709052048.l85KmFEE020424@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-pydev (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:28 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchbugzilla
Message-ID: <200709052048.l85KmSfv020433@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-sdk-nls (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:30 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:30 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up commit
Message-ID: <200709052048.l85KmU1N020443@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-sdk-nls (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:33 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:33 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchcommits
Message-ID: <200709052048.l85KmXID020452@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on eclipse-sdk-nls (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:35 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:35 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up watchbugzilla
Message-ID: <200709052048.l85KmZ5A020461@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on eclipse-sdk-nls (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:37 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:37 -0700
Subject: [pkgdb] eclipse-sdk-nls: bkonrath has given up commit
Message-ID: <200709052048.l85Kmb49020472@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on eclipse-sdk-nls (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-sdk-nls



From fedora-extras-commits at redhat.com  Wed Sep  5 20:48:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:48:49 -0700
Subject: [pkgdb] jakarta-commons-el: bkonrath has given up commit
Message-ID: <200709052048.l85KmnAv020481@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-el (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-el



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:04 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:04 -0700
Subject: [pkgdb] jakarta-commons-logging: bkonrath has given up commit
Message-ID: <200709052049.l85Kn4mJ020494@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-logging (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:07 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:07 -0700
Subject: [pkgdb] jakarta-commons-logging: bkonrath has given up commit
Message-ID: <200709052049.l85Kn7u9020504@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on jakarta-commons-logging (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-logging



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:16 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:16 -0700
Subject: [pkgdb] jsch: bkonrath has given up watchcommits
Message-ID: <200709052049.l85KnGRp020513@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on jsch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:19 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:19 -0700
Subject: [pkgdb] jsch: bkonrath has given up watchcommits
Message-ID: <200709052049.l85KnJVf020522@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on jsch (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jsch



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:28 -0700
Subject: [pkgdb] junit4: bkonrath has given up watchbugzilla
Message-ID: <200709052049.l85KnS1q020531@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchbugzilla acl on junit4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/junit4



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:30 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:30 -0700
Subject: [pkgdb] junit4: bkonrath has given up commit
Message-ID: <200709052049.l85KnUoH020541@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on junit4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/junit4



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:38 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:38 -0700
Subject: [pkgdb] lucene: bkonrath has given up watchcommits
Message-ID: <200709052049.l85Kncfk020550@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the watchcommits acl on lucene (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lucene



From fedora-extras-commits at redhat.com  Wed Sep  5 20:49:42 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 05 Sep 2007 13:49:42 -0700
Subject: [pkgdb] lucene: bkonrath has given up commit
Message-ID: <200709052049.l85KngCt020559@app3.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has given up the commit acl on lucene (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lucene



From fedora-extras-commits at redhat.com  Wed Sep  5 21:03:49 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 17:03:49 -0400
Subject: devel/yum yum-showasdep.patch, NONE, 1.1 sources, 1.61,
	1.62 yum.spec, 1.175, 1.176
Message-ID: <200709052103.l85L3nIU024655@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24632

Modified Files:
	sources yum.spec 
Added Files:
	yum-showasdep.patch 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
- test patch for only packages which are not being otherwise updated to not 
  be shown as being updated for deps


yum-showasdep.patch:

--- NEW FILE yum-showasdep.patch ---
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 4075116..672f960 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -374,6 +374,7 @@ class Depsolve(object):
                     if po.pkgtup == new:
                         txmbr = self.tsInfo.addUpdate(po, requiringPo)
                         txmbr.setAsDep(po=needpo)
+                        txmbr.reason = "dep"
                         self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: Updating %s to resolve dep.', po)
                 checkdeps = 1
                 
@@ -549,6 +550,7 @@ class Depsolve(object):
             # FIXME: we should probably handle updating multiple packages...
             txmbr = self.tsInfo.addUpdate(best, inst[0])
             txmbr.setAsDep()
+            txmbr.reason = "dep"
         else:
             self.verbose_logger.debug('TSINFO: Marking %s as install for %s', best,
                 name)
@@ -628,6 +630,7 @@ class Depsolve(object):
                 'TSINFO: Updating %s to resolve conflict.', po)
             txmbr = self.tsInfo.addUpdate(po, confpkg)
             txmbr.setAsDep()
+            txmbr.reason = "dep"
             CheckDeps = 1
             
         else:
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 3ed67c5..46e1afb 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -226,10 +226,10 @@ class TransactionData:
         self.depremoved = []
         self.depinstalled = []
         self.depupdated = []
-        
+
         for txmbr in self.getMembers():
             if txmbr.output_state == TS_UPDATE:
-                if txmbr.isDep:
+                if txmbr.isDep and txmbr.reason == "dep":
                     self.depupdated.append(txmbr)
                 else:
                     self.updated.append(txmbr)


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Aug 2007 22:43:46 -0000	1.61
+++ sources	5 Sep 2007 21:03:16 -0000	1.62
@@ -1,2 +1 @@
-89cf296107d580655aaf83fb7206edfc  yum-3.2.3.tar.gz
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- yum.spec	29 Aug 2007 16:10:24 -0000	1.175
+++ yum.spec	5 Sep 2007 21:03:16 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0: installonlyn-enable.patch
 Patch1: version-None-tuple.patch
 Patch2: rpmdb-unresolved.patch
+Patch3: yum-showasdep.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -50,6 +51,7 @@
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .ver-to-none
 %patch2 -p1 -b .unresolved
+%patch3 -p1 -b .showdep
 
 %build
 make
@@ -95,6 +97,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
+- test patch for only packages which are not being otherwise updated to not 
+  be shown as being updated for deps
+
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-3
 - patch from git-HEAD - unresolved deps
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:12:04 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Wed, 05 Sep 2007 14:12:04 -0700
Subject: [pkgdb] eclipse-pydev Owned
Message-ID: <200709052112.l85LC4mP020817@app3.fedora.phx.redhat.com>

Package eclipse-pydev in Fedora 7 is now owned by Jeff Johnston (jjohnstn)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Wed Sep  5 21:14:55 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 5 Sep 2007 17:14:55 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.1,1.2
Message-ID: <200709052114.l85LEtrH025010@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Remove epoch in plugin provides.
- Bump release number.
- Resolves: rhbz#274001




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.7.0-icedtea.spec	28 Aug 2007 14:56:44 -0000	1.1
+++ java-1.7.0-icedtea.spec	5 Sep 2007 21:14:23 -0000	1.2
@@ -94,7 +94,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.14.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.15.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -253,7 +253,7 @@
 
 # Standard JPackage plugin provides.
 Provides: java-plugin = %{javaver}
-Provides: java-%{javaver}-plugin = %{epoch}:%{version}
+Provides: java-%{javaver}-plugin = %{version}
 
 %description plugin
 The IcedTea web browser plugin.
@@ -715,6 +715,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Remove epoch in plugin provides.
+- Bump release number.
+- Resolves: rhbz#274001
+
 * Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18.snapshot
 - Include idlj man page in files list.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:20:24 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 5 Sep 2007 17:20:24 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.2,1.3
Message-ID: <200709052120.l85LKOEa025092@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Rename javadoc master alternative javadocdir.
- Resolves: rhbz#269901




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.7.0-icedtea.spec	5 Sep 2007 21:14:23 -0000	1.2
+++ java-1.7.0-icedtea.spec	5 Sep 2007 21:19:51 -0000	1.3
@@ -601,12 +601,13 @@
 
 %post javadoc
 alternatives \
-  --install %{_javadocdir}/java javadoc %{_javadocdir}/%{name}/api %{priority}
+  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
+  %{priority}
 
 %postun javadoc
 if [ $1 -eq 0 ]
 then
-  alternatives --remove javadoc %{_javadocdir}/%{name}/api
+  alternatives --remove javadocdir %{_javadocdir}/%{name}/api
 fi
 
 %post plugin
@@ -716,6 +717,10 @@
 
 %changelog
 * Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Rename javadoc master alternative javadocdir.
+- Resolves: rhbz#269901
+
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Remove epoch in plugin provides.
 - Bump release number.
 - Resolves: rhbz#274001



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, 6) updated by kevin
Message-ID: <200709052125.l85LPrTP020952@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pixie



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, 7) updated by kevin
Message-ID: <200709052125.l85LPr3p020959@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pixie



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora, devel) updated by kevin
Message-ID: <200709052125.l85LPrlE020977@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pixie



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora EPEL, 4) updated by kevin
Message-ID: <200709052125.l85LPrhu020968@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pixie



From fedora-extras-commits at redhat.com  Wed Sep  5 21:25:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:25:53 -0700
Subject: [pkgdb] Pixie (Fedora EPEL, 5) updated by kevin
Message-ID: <200709052125.l85LPrJP020987@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for Pixie
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Pixie (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Pixie (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Pixie



From fedora-extras-commits at redhat.com  Wed Sep  5 21:26:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:26:56 -0400
Subject: rpms/Pixie - New directory
Message-ID: <200709052126.l85LQu5q025719@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie

Log Message:
Directory /cvs/extras/rpms/Pixie added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:01 -0400
Subject: rpms/Pixie/devel - New directory
Message-ID: <200709052127.l85LR1I4025733@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie/devel

Log Message:
Directory /cvs/extras/rpms/Pixie/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:05 -0400
Subject: rpms/Pixie Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709052127.l85LR58p025759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie

Added Files:
	Makefile import.log 
Log Message:
Setup of module Pixie


--- NEW FILE Makefile ---
# Top level Makefile for module Pixie
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep  5 21:27:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 17:27:07 -0400
Subject: rpms/Pixie/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709052127.l85LR7ai025780@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK25681/rpms/Pixie/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Pixie


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: Pixie
# $Id: Makefile,v 1.1 2007/09/05 21:27:05 kevin Exp $
NAME := Pixie
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 fedora-extras-commits at redhat.com  Wed Sep  5 21:27:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 14:27:42 -0700
Subject: [pkgdb] gkrellm-volume (Fedora EPEL, 5) updated by kevin
Message-ID: <200709052127.l85LRgrg021003@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gkrellm-volume
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gkrellm-volume (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-volume



From fedora-extras-commits at redhat.com  Wed Sep  5 21:30:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 17:30:51 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.45,
	1.46 selinux-policy.spec, 1.512, 1.513
Message-ID: <200709052130.l85LUpsY026275@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26218

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
- Allow sendmail to create etc_aliases_t


policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policy-20070703.patch	28 Aug 2007 15:35:11 -0000	1.45
+++ policy-20070703.patch	5 Sep 2007 21:30:18 -0000	1.46
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.6/config/appconfig-mcs/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -26,32 +26,32 @@
 +system_r:sysadm_su_t:s0		system_r:unconfined_t:s0
 +system_r:unconfined_t:s0	system_r:unconfined_t:s0
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.6/config/appconfig-mcs/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/default_type	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-08-28 15:53:39.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
  staff_r:staff_t
 -unconfined_r:unconfined_t
  user_r:user_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.6/config/appconfig-mcs/failsafe_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/failsafe_context	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-08-28 15:53:39.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mcs/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-08-28 15:53:39.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/root_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -71,17 +71,17 @@
 -#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 user_r:user_t:s0
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.6/config/appconfig-mcs/seusers
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/seusers	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-08-28 15:53:39.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +__default__:system_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mcs/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -92,15 +92,15 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.6/config/appconfig-mcs/userhelper_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mcs/userhelper_context	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-08-28 15:53:39.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mcs/user_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -109,18 +109,18 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_su_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mcs/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mcs/xguest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,5 @@
 +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_crond_t:s0
 +system_r:xdm_t		xguest_r:xguest_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.6/config/appconfig-mls/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -148,9 +148,9 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +staff_r:staff_sudo_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.6/config/appconfig-mls/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/default_type	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-08-28 15:53:39.000000000 -0400
 @@ -1,6 +1,5 @@
 -auditadm_r:auditadm_t
 -secadm_r:secadm_t
@@ -160,17 +160,17 @@
 -unconfined_r:unconfined_t
  user_r:user_t
 +auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/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.0.6/config/appconfig-mls/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-08-28 15:53:39.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.6/config/appconfig-mls/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.6/config/appconfig-mls/root_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -189,9 +189,9 @@
  #
 -#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 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mls/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -202,9 +202,9 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.6/config/appconfig-mls/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-mls/user_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -213,17 +213,17 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 +user_r:user_su_t:s0		user_r:user_t:s0
 +user_r:user_sudo_t:s0		user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.6/config/appconfig-standard/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-standard/guest_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.6/config/appconfig-standard/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/config/appconfig-standard/staff_u_default_contexts	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
[...4671 lines suppressed...]
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13209,19 +13938,19 @@
 +	fs_manage_nfs_files(xend_t)
 +	fs_read_nfs_symlinks(xend_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.6/policy/modules/users/guest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.6/policy/modules/users/guest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.6/policy/modules/users/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/guest.te	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -13232,19 +13961,19 @@
 +optional_policy(`
 +	hal_dbus_chat(xguest_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.6/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.6/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.6/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/logadm.te	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -13279,25 +14008,25 @@
 +
 +files_dontaudit_search_all_dirs(logadm_t)
 +files_dontaudit_getattr_all_files(logadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.6/policy/modules/users/metadata.xml
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/metadata.xml	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.6/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.fc	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.6/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.if	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-08-28 15:53:40.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.6/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.6/policy/modules/users/webadm.te	2007-08-22 08:03:53.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-08-31 15:27:24.000000000 -0400
+@@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
 +########################################
@@ -13308,69 +14037,41 @@
 +userdom_base_user_template(webadm)
 +allow webadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
 +
-+# Allow webadm_t to restart the apache service
-+domain_dontaudit_search_all_domains_state(webadm_t)
-+apache_domtrans(webadm_t)
-+init_exec_script_files(webadm_t)
-+domain_role_change_exemption(webadm_t)
-+domain_obj_id_change_exemption(webadm_t)
-+role_transition webadm_r httpd_exec_t system_r;
-+allow webadm_r system_r;
-+
-+apache_manage_all_content(webadm_t)
-+apache_manage_config(webadm_t)
-+apache_manage_log(webadm_t)
-+apache_manage_modules(webadm_t)
-+apache_manage_lock(webadm_t)
-+apache_manage_pid(webadm_t)
-+apache_read_state(webadm_t)
-+apache_signal(webadm_t)
-+apache_getattr(webadm_t)
-+apache_relabel(webadm_t)
++bool webadm_read_user_files false;
++bool webadm_manage_user_files false;
++
++if (webadm_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(webadm_t)
++   userdom_read_unpriv_users_tmp_files(webadm_t)
++}
 +
-+seutil_domtrans_restorecon(webadm_t)
++if (webadm_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(webadm_t)
++   userdom_read_unpriv_users_tmp_files(webadm_t)
++   userdom_write_unpriv_users_tmp_files(webadm_t)
++}
 +
 +files_dontaudit_search_all_dirs(webadm_t)
-+files_dontaudit_getattr_all_files(webadm_t)
 +files_manage_generic_locks(webadm_t)
 +files_list_var(webadm_t)
 +selinux_get_enforce_mode(webadm_t)
-+
++seutil_domtrans_restorecon(webadm_t)
 +
 +logging_send_syslog_msg(webadm_t)
 +
-+ifdef(`targeted_policy',`
-+	term_use_generic_ptys(webadm_t)
-+	term_use_unallocated_ttys(webadm_t)
-+')
-+
 +userdom_dontaudit_search_sysadm_home_dirs(webadm_t)
 +userdom_dontaudit_search_generic_user_home_dirs(webadm_t)
 +
-+bool webadm_read_user_files false;
-+bool webadm_manage_user_files false;
-+
-+if (webadm_read_user_files) {
-+	userdom_read_unpriv_users_home_content_files(webadm_t)
-+	userdom_read_unpriv_users_tmp_files(webadm_t)
-+}
-+
-+if (webadm_manage_user_files) {
-+	userdom_manage_unpriv_users_home_content_dirs(webadm_t)
-+	userdom_read_unpriv_users_tmp_files(webadm_t)
-+	userdom_write_unpriv_users_tmp_files(webadm_t)
-+}
++apache_admin(webadm_t, webadm_r, { webadm_tty_device_t webadm_devpts_t })
 +
 +gen_require(`
 +	type gadmin_t;
 +')
 +allow gadmin_t webadm_t:process transition;
 +allow webadm_t gadmin_t:dir getattr;
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.6/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.6/policy/support/obj_perm_sets.spt	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-08-28 15:53:40.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -13394,9 +14095,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.6/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.6/policy/users	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/users	2007-08-28 15:53:40.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -13431,9 +14132,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, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.6/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.6/Rules.modular	2007-08-22 08:03:53.000000000 -0400
++++ serefpolicy-3.0.7/Rules.modular	2007-08-28 15:53:40.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- selinux-policy.spec	28 Aug 2007 15:35:11 -0000	1.512
+++ selinux-policy.spec	5 Sep 2007 21:30:18 -0000	1.513
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -162,7 +162,7 @@
 selinuxenabled; \
 if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
-	restorecon -R /var/log 2> /dev/null; \
+	restorecon -R /var/log /var/run 2> /dev/null; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
 
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
+- Allow sendmail to create etc_aliases_t
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-2
 - Allow login programs to read symlinks on homedirs
 



From fedora-extras-commits at redhat.com  Wed Sep  5 21:41:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  5 Sep 2007 17:41:26 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec, 1.40, 1.41 template.init, 1.4,
	1.5
Message-ID: <200709052141.l85LfQd5026767@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26747

Modified Files:
	rpmdevtools.spec template.init 
Log Message:
Init script template cleanups.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rpmdevtools.spec	28 Aug 2007 14:25:55 -0000	1.40
+++ rpmdevtools.spec	5 Sep 2007 21:41:23 -0000	1.41
@@ -111,6 +111,9 @@
 
 
 %changelog
+* 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.
 


Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template.init	5 Jul 2007 20:08:18 -0000	1.4
+++ template.init	5 Sep 2007 21:41:23 -0000	1.5
@@ -26,12 +26,6 @@
 # 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="/path/to/<daemonname>"
 prog=$(basename $exec)
 
@@ -62,32 +56,27 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdr_status() {
-    status $prog
-}
-
 case "$1" in
     start|stop|restart|reload)
         $1
         ;;
     force-reload)
-        force_reload
+        restart
         ;;
     status)
-        fdr_status
+        status $prog
         ;;
-    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
 	;;
+    reload)
+        # If config can be reloaded without restarting, implement it here,
+        # remove the "exit", and add "reload" to the usage message below.
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac



From fedora-extras-commits at redhat.com  Wed Sep  5 21:53:37 2007
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 5 Sep 2007 17:53:37 -0400
Subject: rpms/libnjb/devel .cvsignore, 1.6, 1.7 libnjb.rules, 1.2,
	1.3 libnjb.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200709052153.l85LrbIa027435@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27400

Modified Files:
	.cvsignore libnjb.rules libnjb.spec sources 
Log Message:
New upstream version, include HAL FDI file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jan 2006 21:17:38 -0000	1.6
+++ .cvsignore	5 Sep 2007 21:53:04 -0000	1.7
@@ -1 +1 @@
-libnjb-2.2.5.tar.gz
+libnjb-2.2.6.tar.gz


Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libnjb.rules	17 Aug 2007 22:20:57 -0000	1.2
+++ libnjb.rules	5 Sep 2007 21:53:04 -0000	1.3
@@ -1,13 +1,14 @@
-# libnjb.rules a udev rules file for libnjb devices
-# created by Linus Walleij, ENJOY!
+# nomad.rules a udev rules file for NOMAD jukeboxes.
+# Put this file in /etc/udev/rules.d
+# Hacked a bit for Fedora along the lines of libsane rules.
 
 ACTION!="add", GOTO="nomad_rules_end"
-SUBSYSTEM=="usb", GOTO="nomad_rules"
-SUBSYSTEM=="usb_device", GOTO="nomad_rules"
-
+ATTR{dev}!="?*", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_usb_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_usb_device_rules"
 GOTO="nomad_rules_end"
 
-LABEL="nomad_rules"
+LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
 ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
@@ -38,4 +39,38 @@
 # Creative Zen Sleek
 ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k"
 
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_device_rules"
+
+# Creative Nomad Jukebox
+ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 2
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 3
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen USB 2.0
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen NX
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Xtra
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+# Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Touch
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+# Creative Zen (Zen Micro variant)
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Micro
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+# Second Generation Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+# Dell Pocket DJ
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+# Creative Zen Sleek
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
+
 LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libnjb.spec	17 Aug 2007 22:20:57 -0000	1.9
+++ libnjb.spec	5 Sep 2007 21:53:04 -0000	1.10
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:		libnjb
-Version:	2.2.5
-Release:	4%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -67,6 +67,8 @@
 # Install device permissions
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -82,6 +84,7 @@
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -96,6 +99,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Linus Walleij <triad at df.lth.se> 2.2.6-1
+- Long overdue upstream release.
+- Shape up udev rules so they look like the libsane stuff.
+- Add HAL FDI file.
 * Fri Aug 17 2007 Linus Walleij <triad at df.lth.se> 2.2.5-4
 - Fixup libnjb udev rules to work with new udev and HAL.
 * Mon Aug 28 2006 Linus Walleij <triad at df.lth.se> 2.2.5-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jan 2006 21:17:38 -0000	1.6
+++ sources	5 Sep 2007 21:53:04 -0000	1.7
@@ -1 +1 @@
-f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz
+e1b3a89f6157c553ea46a78446429a0d  libnjb-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 21:55:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  5 Sep 2007 17:55:26 -0400
Subject: fedora-rpmdevtools rpminfo, NONE, 1.3.2.1 .cvsignore, 1.4.2.1,
	1.4.2.2 COPYING, 1.4, 1.4.2.1 rpmdev-diff, 1.1,
	1.1.2.1 rpmdev-extract, 1.1, 1.1.2.1 rpmdev-newspec, 1.4,
	1.4.2.1 rpmdev-rmdevelrpms, 1.2.2.2, 1.2.2.3 rpmdev-vercmp,
	1.1.2.2, 1.1.2.3 rpmdev-wipetree, 1.1,
	1.1.2.1 rpmdevtools.spec, 1.19.2.4, 1.19.2.5 rpmls, 1.1.2.1,
	1.1.2.2 template.init, 1.3.2.1, 1.3.2.2
Message-ID: <200709052155.l85LtQRR027568@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27539

Modified Files:
      Tag: rpmdevtools-5
	.cvsignore COPYING rpmdev-diff rpmdev-extract rpmdev-newspec 
	rpmdev-rmdevelrpms rpmdev-vercmp rpmdev-wipetree 
	rpmdevtools.spec rpmls template.init 
Added Files:
      Tag: rpmdevtools-5
	rpminfo 
Log Message:
Sync applicable bits from 6.x/HEAD.


--- NEW FILE rpminfo ---
#!/bin/sh
#
# Prints information for executables and libraries
#
# Copyright (C) 2004,2007 Red Hat, Inc.
# Authors:
# Thomas Woerner <twoerner 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, see <http://www.gnu.org/licenses/>.
#
# version 2004-07-07-02


LANG=C
READELF=/usr/bin/readelf
EU_READELF=/usr/bin/eu-readelf
OBJDUMP=/usr/bin/objdump
TMPDIR=/tmp

progname=`basename $0`

usage()  {
    cat <<EOF
Usage: $progname [-h] [-v] [-q] [-c] [-e | -l] [-p | -np | -P | -nP | -r]
                 [-s] [-o <file>] {-i | [<rpm package>...]}

  -h  | --help                 print help
  -v  | --verbose              be more verbose (to stderr)
  -q  | --quiet                only list files
  -qq                          really quiet: do not print rpath in split mode
  -i  | --installed            all installed packages
  -e  | --executables          list executables
  -l  | --libraries            list libraries
  -p  | --pic                  list pic
  -np | --no_pic               list no pic
  -P  | --pie                  list pie
  -nP | --no_pie               list no pie
  -r  | --rpath                list files containing rpath
  -ro | --rpath_odd            list files containing odd rpath
  -s  | --split                split output (.pie, .pic, .dso_pic, .rpath..)
                               output must be specified
  -t  | --test                 test for odd rpath
  -o <file> | --output=<file>  output in file <file>
  -T <dir> | --tmp-dir=<dir>   temporary directory

  Default options: -e -l -p -np -P -nP -r -t

EOF
    exit -1
}

opt() {
    [ -z "$1" ] && return

    if [ -n "$opts" ]; then
	[ $split -eq 0 ] && opts="${opts}, " || opts="${opts},"
    fi
    opts="${opts}$1"
}

check_rpath() {
    [ $rpath -ne 1 ] && return 

    local path=`$OBJDUMP -p "$1" 2>/dev/null | grep RPATH `
    if [ -n "$path" ]; then
	path=`echo $path | awk '{print $2}'`
        ## check rpath elements
	local odd=0
	if [ $test -eq 1 ]; then
	    [ -z "$path" ] && odd=1
	    OLDIFS=$IFS
	    IFS=:
	    for dir in $path; do
		[ -z "$dir" ] && odd=1
		[ "$dir" = "." ] && odd=2
		[ "$dir" = "/lib" ] && odd=3
		[ "$dir" = "/lib64" ] && odd=4
		[ "$dir" = "/usr/lib" ] && odd=5
		[ "$dir" = "/usr/lib64" ] && odd=6
		[ "$dir" = "/usr/X11R6/lib" ] && odd=7
		[ "$dir" = "/usr/X11R6/lib64" ] && odd=8
		[ "${dir:0:10}" = "/usr/local" ] && odd=9
		[ "${dir:0:12}" = "/usr/lib/qt-" ] && odd=10
		[ "${dir:0:8}" = "/usr/src" ] && odd=11
		echo $dir | egrep -q "/\." && odd=12
	    done
	    IFS=$OLDIFS
	fi
	[ $odd -eq 0 ] && opt "RPATH $path" || opt "-RPATH $path"
    fi
}

check_file() {
    local file=$1
    
    [ -L "$file" ] && return
    [ ! -f "$file" ] && return
    
    file -b "$file" 2>/dev/null | grep -q ELF || return
    
    if $EU_READELF -h "$file" 2>/dev/null | egrep -q 'Type:[[:space:]]*EXEC';
    then
	if [ $exec -eq 1 ]; then
	    if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
		if [ -u "$file" ]; then
		    [ $no_pie -eq 1 ] && opt "!PIE"
		else
		    [ $no_pic -eq 1 ] && opt "!PIC"
		fi
	    else
		# suid
		if [ -u "$file" ]; then
		    [ $no_pie -eq 1 ] && opt "!PIE"
		else
		    [ $pic -eq 1 ] && opt "PIC"
		fi
	    fi
	    check_rpath "$file"
	fi
    else
	if $EU_READELF -d "$file" 2>/dev/null | egrep -q '  DEBUG[[:space:]]*$';
	then
	    if [ $exec -eq 1 ]; then
		[ $pie -eq 1 ] && opt "PIE"
		check_rpath "$file"
	    fi
	else
	    if [ $lib -eq 1 ]; then
		if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
		    [ $no_pic -eq 1 ] && opt "DSO !PIC"
		else
		    [ $pic -eq 1 ] && opt "DSO PIC"
		fi
		check_rpath "$file"
	    fi
	fi
    fi
}

check_package() {
    package=$1

    local pkg=
    local prefix=
    local files=`rpm -ql $package 2>/dev/null`

    if echo $files | grep -q "not installed"; then
	# not installed
	if [ -f $package ]; then
	    rpm -qp $package >& /dev/null
	    if [ $? -eq 1 ]; then
		# no rpm package
		package=
	    else
		prefix=$temp_prefix`basename $package`
		if [ ${package:0:1} != "/" ]; then
		    package=`pwd`"/"$package
		fi
		local error=0
		mkdir $prefix 2> /dev/null && pushd "$prefix" >& /dev/null
		if [ $? -eq 0 ]; then
		    rpm2cpio "$package" \
			| cpio -i --make-directories >& /dev/null
		    [ $? -eq 0 ] || echo "Error while extracting package '$package'.. ignoring!" > /dev/stderr
		    files=`rpm -qlp $package 2>/dev/null`
		    popd >& /dev/null
		    chmod -R u+rwx $prefix 2>/dev/null 
		else
		    error=1
		fi
		if [ $error -eq 1 ]; then
		    echo "Can not create package directory.. skipping package '$package'!" > /dev/stderr
		    return
		fi
	    fi 
	else
	    # not a file
	    package=
	fi
    fi

    if [ -z "$package" ]; then
	echo "'$1' is not installed and is no rpm package..  skipping!" > /dev/stderr
	return
    fi

    local in_pie=0
    local in_non_pie=0
    local in_pic=0
    local in_dso_pic=0
    local in_non_pic=0
    local in_dso_non_pic=0
    local in_rpath=0
    local in_rpath_odd=0

    for file in $files; do
	opts=

	check_file "$prefix$file"

	[ -z "$opts" ] && continue
		
	if [ $split -eq 1 ]; then
	    pkg=`basename $package`
	    OLDIFS=$IFS
	    IFS=,
	    for opt in $opts; do
		o=
		[ "$opt" = "PIE" ] && o=pie
		[ "$opt" = "!PIE" ] && o=non_pie
		[ "$opt" = "PIC" ] && o=pic
		[ "$opt" = "DSO PIC" ] && o=dso_pic
		[ "$opt" = "!PIC" ] && o=non_pic
		[ "$opt" = "DSO !PIC" ] && o=dso_non_pic
		[ "${opt:0:6}" = "RPATH " ] && o=rpath && opt=${opt:6}
		[ "${opt:0:7}" = "-RPATH " ] && o=rpath_odd && opt=${opt:7}
		if [ -n "$o" ]; then
		    eval local in=\${in_$o}
		    if [ $in -eq 0 ]; then
			echo -e "\n$pkg" >> $output.$o
			eval in_$o=1
		    fi
		    if [ "${o:0:5}" = "rpath" -a $quiet -lt 2 ]; then
			echo -e "\t$file\tRPATH $opt" >> $output.$o
		    else
			echo -e "\t$file" >> $output.$o
		    fi
		fi
	    done
	    IFS=$OLDIFS
	else
	    if [ -z "$pkg" ]; then
		pkg=`basename $package`
		echo -e "\n$pkg" >> $output
	    fi
	    
	    if [ $quiet -eq 0 ]; then
		echo -e "\t$file\t$opts" >> $output
	    else
		echo -e "\t$file" >> $output
	    fi
	fi
    done

    if [ -n "$prefix" ]; then
	rm -rf $prefix
    fi
}

verbose=0
quiet=0
installed=0
exec=0
lib=0
pic=0
no_pic=0
pie=0
no_pie=0
rpath=0
split=0
test=0
output=
packages=
while [ $OPTIND -le $# ]; do
    eval pkg=\${$OPTIND}

    if [ ${pkg:0:1} = "-" ]; then
	[ "$pkg" = "-h" -o "$pkg" = "--help" ] && usage
	[ "$pkg" = "-v" -o "$pkg" = "--verbose" ] && verbose=1
	[ "$pkg" = "-q" -o "$pkg" = "--quiet" ] && quiet=1
	[ "$pkg" = "-qq" ] && quiet=2
	[ "$pkg" = "-i" -o "$pkg" = "--installed" ] && installed=1
	[ "$pkg" = "-e" -o "$pkg" = "--executables" ] && exec=1
	[ "$pkg" = "-l" -o "$pkg" = "--libraries" ] && lib=1
	[ "$pkg" = "-p" -o "$pkg" = "--pic" ] && pic=1
	[ "$pkg" = "-np" -o "$pkg" = "--no_pic" ] && no_pic=1
	[ "$pkg" = "-P" -o "$pkg" = "--pie" ] && pie=1
	[ "$pkg" = "-nP" -o "$pkg" = "--no_pie" ] && no_pie=1
	[ "$pkg" = "-r" -o "$pkg" = "--rpath" ] && rpath=1
	[ "$pkg" = "-s" -o "$pkg" = "--split" ] && split=1
	[ "$pkg" = "-t" -o "$pkg" = "--test" ] && test=1
	if [ "$pkg" = "-o" ]; then
	    OPTIND=$((OPTIND+1))
	    eval output=\${$OPTIND}
	fi
	if [ "${pkg:0:9}" = "--output=" ]; then
	    output=${pkg:9};
	fi
	if [ "$pkg" = "-T" ]; then
	    OPTIND=$((OPTIND+1))
	    eval TMPDIR=\${$OPTIND}
	fi
	if [ "${pkg:0:10}" = "--tmp-dir=" ]; then
	    TMPDIR=${pkg:10};
	fi
    else
	packages="$packages $pkg"
    fi
    
    OPTIND=$((OPTIND+1))
done

if [ ! -x "$READELF" ]; then
    echo "$progname: '$READELF' does not exist or is not executable.. exiting!"
    exit -1
fi
if [ ! -x "$EU_READELF" ]; then
    echo "$progname: '$EU_READELF' does not exist or is not executable.. exiting!"
    exit -1
fi
if [ ! -x "$OBJDUMP" ]; then
    echo "$progname: '$OBJDUMP' does not exist or is not executable.. exiting!"
    exit -1
fi

if [ ! -d "$TMPDIR" -o ! -w "$TMPDIR" ]; then
    echo "$progname: '$TMPDIR' does not exist or is not writable.. exiting!"
    exit -1
fi

[ -z "$packages" -a $installed -eq 0 ] && usage

if [ $exec -eq 0 -a $lib -eq 0 ]; then
    exec=1; lib=1
fi

if [ $pic -eq 0 -a $no_pic -eq 0 -a $pie -eq 0 -a $no_pie -eq 0 -a $rpath -eq 0 ]; then
    pic=1; no_pic=1; pie=1; no_pie=1; rpath=1; test=1
fi

if [ $split -eq 1 ]; then
    if [ -z "$output" ]; then
	echo "You can not use split without an output file prefix.. exiting!"
	exit -1
    else
	rm -f $output.*
    fi
fi
[ -n "$output" ] && rm -f $output || output=/dev/stdout

temp_prefix=`mktemp -d -q $TMPDIR/$progname.XXXXXX`
if [ $? -ne 0 -o -z $temp_prefix ]; then
    echo "Could not create temporary directory.. exiting!" > /dev/stderr
    exit -1
fi
temp_prefix="$temp_prefix/"

trap "chmod -R u+rwx $temp_prefix 2>/dev/null; rm -rf $temp_prefix; exit -1" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30

pkg_num=0
for pkg in $packages; do
    pkg_num=$((pkg_num+1))
done
pkg_no=1
for pkg in $packages; do
    tmp=`rpm -q $pkg | sort -u 2>/dev/null`
    [ $verbose -eq 1 ] && \
	printf "(%*d/%d) => %s\n" ${#pkg_num} $pkg_no $pkg_num $pkg \
	> /dev/stderr
    if echo $tmp | grep -q "not installed"; then
	check_package $pkg
    else
	for package in $tmp; do
	    check_package $package
	done
    fi
    pkg_no=$((pkg_no+1))
done

if [ $installed -eq 1 ]; then
    rpmqa=`rpm -qa | sort -u`
    for i in $rpmqa; do
	check_package "$i"
    done
fi

exit 0


Index: .cvsignore
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/.cvsignore,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- .cvsignore	5 Jul 2007 21:19:44 -0000	1.4.2.1
+++ .cvsignore	5 Sep 2007 21:55:24 -0000	1.4.2.2
@@ -9,5 +9,4 @@
 configure
 install-sh
 missing
-rpminfo
 spectool-*


Index: COPYING
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- COPYING	18 Aug 2005 05:49:16 -0000	1.4
+++ COPYING	5 Sep 2007 21:55:24 -0000	1.4.2.1
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 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.
 
@@ -15,7 +15,7 @@
 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 Library General Public License instead.)  You can apply it to
+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
@@ -55,7 +55,7 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@
     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
@@ -168,7 +168,7 @@
 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
@@ -225,7 +225,7 @@
 
 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
@@ -278,7 +278,7 @@
 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
@@ -303,10 +303,9 @@
     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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.
 
@@ -336,5 +335,5 @@
 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 Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.


Index: rpmdev-diff
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-diff,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-diff	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-diff	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -3,6 +3,9 @@
 
 # rpmdev-diff -- Diff contents of two archives
 #
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skytt?? <scop at fedoraproject.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
@@ -11,7 +14,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -34,11 +37,13 @@
 version()
 {
     cat <<EOF
-rpmdev-diff version 1.0
+rpmdev-diff version 1.1
 
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.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.
 
 Written by Ville Skytt??.
 EOF


Index: rpmdev-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-extract,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-extract	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-extract	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -3,6 +3,9 @@
 
 # rpmdev-extract -- Extract various archives in "tar xvf" style
 #
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skytt?? <scop at fedoraproject.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
@@ -11,7 +14,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -27,14 +30,18 @@
 force=
 dir=
 
+shopt -s extglob
+
 version()
 {
     cat <<EOF
-rpmdev-extract version 1.0
+rpmdev-extract version 1.1
 
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.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.
 
 Written by Ville Skytt??.
 EOF
@@ -142,7 +149,11 @@
             cabextract -f "$f"
             ;;
         rpm)
-            name=`rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            name=`rpm -qp --qf="%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            if [ -z "$name" ] ; then # workaround for #250990
+                bname="`basename "$f"`"
+                name=${bname/?(\.*([^\.]))\.rpm/}
+            fi
             mkdir -p "$name"
             cd "$name"
             rpm2cpio "$f" \


Index: rpmdev-newspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-newspec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- rpmdev-newspec	9 Sep 2006 17:04:18 -0000	1.4
+++ rpmdev-newspec	5 Sep 2007 21:55:24 -0000	1.4.2.1
@@ -1,5 +1,24 @@
 #!/bin/bash
 
+# rpmdev-newspec -- generate new rpm .spec file from template
+#
+# Copyright (c) Warren Togami <warren at togami.com>,
+#               Ville Skytt?? <scop at fedoraproject.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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SPECDIR="/etc/rpmdevtools"
 DEFTYPE="minimal"
 DEFSPEC="newpackage.spec"


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- rpmdev-rmdevelrpms	7 Jul 2007 08:55:42 -0000	1.2.2.2
+++ rpmdev-rmdevelrpms	5 Sep 2007 21:55:24 -0000	1.2.2.3
@@ -3,7 +3,8 @@
 
 # rpmdev-rmdevelrpms -- Find (and optionally remove) "development" RPMs
 #
-# Author:  Ville Skytt?? <ville.skytta at iki.fi>
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author:  Ville Skytt?? <scop at fedoraproject.org>
 # Credits: Seth Vidal (yum), Thomas Vander Stichele (mach)
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
 # 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 Library General Public License for more details.
+# 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
@@ -24,7 +25,7 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.7"
+__version__ = "1.8"
 
 
 dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
@@ -154,8 +155,10 @@
     print "rpmdev-rmdevelrpms version %s" % __version__
     print '''
 Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
-This  program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+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.
 
 Written by Ville Skytt??.'''
     sys.exit(0)


Index: rpmdev-vercmp
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-vercmp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rpmdev-vercmp	7 Jul 2007 08:47:26 -0000	1.1.2.2
+++ rpmdev-vercmp	5 Sep 2007 21:55:24 -0000	1.1.2.3
@@ -1,6 +1,22 @@
 #!/usr/bin/python
 #
-# Seth Vidal - yadda yadda yadda GPL Yadda yadda yadda Use at own risk
+# rpmdev-vercmp -- compare rpm versions
+#
+# Copyright (c) Seth Vidal
+#
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import rpm
 import sys


Index: rpmdev-wipetree
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-wipetree,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-wipetree	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-wipetree	5 Sep 2007 21:55:24 -0000	1.1.2.1
@@ -1,10 +1,23 @@
 #!/bin/sh
 #
-# rpmdev-wipetree
-# Erases all files within the rpm build dir
+# rpmdev-wipetree -- erase all files within the rpm build dir
 #
-# Author:  Warren Togami <warren at togami.com>
-# License: GPL
+# Copyright (c) Warren Togami <warren at togami.com>,
+#               Ville Skytt?? <scop at fedoraproject.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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # Sanity Check: Forbid root user
 if [ $(id -u) -eq 0 ]; then


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- rpmdevtools.spec	7 Jul 2007 10:34:04 -0000	1.19.2.4
+++ rpmdevtools.spec	5 Sep 2007 21:55:24 -0000	1.19.2.5
@@ -8,7 +8,8 @@
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License:        GPLv2+ and GPLv2
 URL:            http://fedoraproject.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
@@ -135,6 +136,13 @@
 
 
 %changelog
+* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Init script template cleanups.
+- Update rpminfo to version 2004-07-07-02.
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+- 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> - 5.4-1
 - 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.


Index: rpmls
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmls,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rpmls	5 Jul 2007 21:19:44 -0000	1.1.2.1
+++ rpmls	5 Sep 2007 21:55:24 -0000	1.1.2.2
@@ -10,12 +10,14 @@
 # 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 Library General Public License for more details.
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
 
+unset CDPATH
+
 owner=
 if [ "$1" = "-l" ] ; then
     owner='%-8{fileusername} %-8{filegroupname} '
@@ -23,8 +25,15 @@
 fi
 qf="[%-11{filemodes:perms} $owner%{filenames}\\n]"
 
-for file in "$@" ; do
-    p=
-    case "$file" in *.[rs]pm) p=p ;; esac
-    rpm -q$p --qf="$qf" "$file"
+for arg in "$@" ; do
+    case "$arg" in
+        *.[rs]pm)
+            # dirname/basename: workaround for #250990
+            cd "$(dirname "$arg")"
+            rpm -qp --qf="$qf" "$(basename "$arg")"
+            cd - >/dev/null 2>&1
+            ;;
+        *)
+            rpm -q --qf="$qf" "$arg"
+    esac
 done


Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- template.init	5 Jul 2007 21:19:44 -0000	1.3.2.1
+++ template.init	5 Sep 2007 21:55:24 -0000	1.3.2.2
@@ -26,12 +26,6 @@
 # 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="/path/to/<daemonname>"
 prog=$(basename $exec)
 
@@ -62,32 +56,27 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdr_status() {
-    status $prog
-}
-
 case "$1" in
     start|stop|restart|reload)
         $1
         ;;
     force-reload)
-        force_reload
+        restart
         ;;
     status)
-        fdr_status
+        status $prog
         ;;
-    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
 	;;
+    reload)
+        # If config can be reloaded without restarting, implement it here,
+        # remove the "exit", and add "reload" to the usage message below.
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac



From fedora-extras-commits at redhat.com  Wed Sep  5 21:59:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 5 Sep 2007 17:59:02 -0400
Subject: rpms/gkrellm-volume/EL-5 gkrellm-volume.spec,1.9,1.10
Message-ID: <200709052159.l85Lx2N5027741@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-volume/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27719

Modified Files:
	gkrellm-volume.spec 
Log Message:
Sync with devel for first EL build.


Index: gkrellm-volume.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-volume/EL-5/gkrellm-volume.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellm-volume.spec	30 Aug 2006 20:34:41 -0000	1.9
+++ gkrellm-volume.spec	5 Sep 2007 21:58:29 -0000	1.10
@@ -2,11 +2,11 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://gkrellm.luon.net/volume.phtml
 Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
 Patch0:         %{name}-version.patch
@@ -27,6 +27,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1
+f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -55,6 +56,12 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-6
+- Convert docs to UTF-8.
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-5
+- License: GPLv2+
+
 * Wed Aug 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.13-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:03:40 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:03:40 -0400
Subject: rpms/vala/F-7 vala.spec,1.4,1.5
Message-ID: <200709052203.l85M3em7001415@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374/F-7

Modified Files:
	vala.spec 
Log Message:
Update license and URL fields; pushed to F-7 as well



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vala.spec	25 Mar 2007 16:02:02 -0000	1.4
+++ vala.spec	5 Sep 2007 22:03:06 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           vala
-Version:        0.0.8
-Release:        1%{?dist}
+Version:        0.1.3
+Release:        3%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+License:        LGPLv2.1
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -44,7 +44,7 @@
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -70,16 +70,28 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
+%{_bindir}/*gen
 %{_libdir}/libvala.so
+%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
 
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:03:43 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:03:43 -0400
Subject: rpms/vala/devel vala.spec,1.7,1.8
Message-ID: <200709052203.l85M3hsW001418@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374/devel

Modified Files:
	vala.spec 
Log Message:
Update license and URL fields; pushed to F-7 as well



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vala.spec	5 Sep 2007 03:39:48 -0000	1.7
+++ vala.spec	5 Sep 2007 22:03:10 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           vala
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+License:        LGPLv2.1
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
 * Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
 - Enable binding generation tools
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:06:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 18:06:44 -0400
Subject: rpms/vala/F-7 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200709052206.l85M6iWQ001571@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1551

Modified Files:
	.cvsignore sources 
Log Message:
Fix F-7 sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2007 16:02:02 -0000	1.5
+++ .cvsignore	5 Sep 2007 22:06:11 -0000	1.6
@@ -1 +1 @@
-vala-0.0.8.tar.bz2
+vala-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2007 16:02:02 -0000	1.5
+++ sources	5 Sep 2007 22:06:11 -0000	1.6
@@ -1 +1 @@
-54c7b20e570121c9151ec9534ed68b79  vala-0.0.8.tar.bz2
+d6552982b10582d0b01c3d612fb098b2  vala-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep  5 22:37:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 5 Sep 2007 18:37:11 -0400
Subject: rpms/xkeyboard-config/devel dellm65.patch, NONE, 1.1 kinesis.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xkeyboard-config.spec, 1.9, 1.10
Message-ID: <200709052237.l85MbBDo002488@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2440

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Added Files:
	dellm65.patch kinesis.patch 
Log Message:
1.0


dellm65.patch:

--- NEW FILE dellm65.patch ---
diff -up xkeyboard-config-1.0/symbols/inet.dellm65 xkeyboard-config-1.0/symbols/inet
--- xkeyboard-config-1.0/symbols/inet.dellm65	2007-04-23 18:09:07.000000000 -0400
+++ xkeyboard-config-1.0/symbols/inet	2007-09-05 18:30:51.000000000 -0400
@@ -2451,3 +2451,18 @@ xkb_symbols "logitech_g15" {
     key <XFER> {         [     XF86Launch8 ] };
 
 };
+
+//
+// Dell Precision M65
+//
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I04>   {       [ XF86PowerOff          ]       };
+
+    key <LWIN> {        [       Super_L         ]       };
+};
+
diff -up xkeyboard-config-1.0/geometry/dell.dellm65 xkeyboard-config-1.0/geometry/dell
--- xkeyboard-config-1.0/geometry/dell.dellm65	2007-05-31 17:17:44.000000000 -0400
+++ xkeyboard-config-1.0/geometry/dell	2007-09-05 18:30:51.000000000 -0400
@@ -181,3 +181,362 @@ default xkb_geometry "dell101" {
     alias <AA00> = <LCTL>;
 
 }; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+
diff -up xkeyboard-config-1.0/rules/base.m_g.part.dellm65 xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.dellm65	2007-09-05 18:32:22.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part	2007-09-05 18:32:41.000000000 -0400
@@ -1,5 +1,6 @@
  $msmodels	=	microsoft(natural)
   dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
diff -up xkeyboard-config-1.0/rules/base.lists.part.dellm65 xkeyboard-config-1.0/rules/base.lists.part
--- xkeyboard-config-1.0/rules/base.lists.part.dellm65	2007-09-05 18:31:07.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.lists.part	2007-09-05 18:31:20.000000000 -0400
@@ -33,7 +33,7 @@
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 \
               cymotionlinux \
-              dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
+              dellm65 dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
               emachines ennyah_dkb1008 evdev \
               genius geniuscomfy geniuscomfy2 geniuskb19e \
               gyration honeywell_euroboard \
diff -up xkeyboard-config-1.0/rules/base.xml.in.dellm65 xkeyboard-config-1.0/rules/base.xml.in
--- xkeyboard-config-1.0/rules/base.xml.in.dellm65	2007-07-11 18:57:28.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.xml.in	2007-09-05 18:30:51.000000000 -0400
@@ -46,6 +46,12 @@
     </model>
     <model>
       <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>everex</name>
         <_description>Everex STEPnote</_description>
         <vendor>Everex</vendor>

kinesis.patch:

--- NEW FILE kinesis.patch ---
diff -up xkeyboard-config-1.0/rules/base.m_g.part.kinesis xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.kinesis	2007-09-05 15:18:32.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part	2007-09-05 15:19:01.000000000 -0400
@@ -11,4 +11,5 @@
  $macbooks      =       macintosh(%m)
  $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
   *		=       pc(pc104)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 22:43:06 -0000	1.2
+++ .cvsignore	5 Sep 2007 22:36:39 -0000	1.3
@@ -1 +1 @@
-xkeyboard-config-0.8.tar.bz2
+xkeyboard-config-1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 22:43:06 -0000	1.2
+++ sources	5 Sep 2007 22:36:39 -0000	1.3
@@ -1 +1 @@
-48e694ebe816065670dda2a36f0581a2  xkeyboard-config-0.8.tar.bz2
+bcf08a6bf76bd5661f730d36a1d66517  xkeyboard-config-1.0.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xkeyboard-config.spec	1 Sep 2006 10:52:10 -0000	1.9
+++ xkeyboard-config.spec	5 Sep 2007 22:36:39 -0000	1.10
@@ -3,26 +3,19 @@
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 0.8
-Release: 7%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch0: xkeyboard-config-0.8-composify-ralt.patch
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=7990
-Patch1: xkeyboard-config-0.8-thinkpad.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=7991
-Patch2: xkeyboard-config-0.8-kinesis.patch
+Patch0: kinesis.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=7992
-Patch3: xkeyboard-config-0.8-dell.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=8068
-Patch4: xkeyboard-config-0.8-macbook.patch
-# backport from upstream cvs
-Patch5: xkeyboard-config-0.8-korean.patch
+Patch1: dellm65.patch
 
 BuildArch: noarch
 
@@ -52,18 +45,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .composify-ralt
 
-%patch1 -p1 -b .thinkpad
-%patch2 -p1 -b .kinesis
-%patch3 -p1 -b .dell
-%patch4 -p1 -b .macbook
-%patch5 -p1 -b .korean
+%patch0 -p1 -b .kinesis
+%patch1 -p1 -b .dellm65
 
 %build
-#autoreconf needed for macbook patch
-autoreconf
-
 %configure \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
@@ -98,6 +84,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 1.0-1
+- Update to 1.0
+- Drop upstreamed patches
+- Update remaining patches
+
 * Fri Sep  1 2006 Alexander Larsson <alexl at redhat.com> - 0.8-7
 - Update macbook patch to be closer to what got in upstream
 - (kp enter is ralt, not the option key)



From fedora-extras-commits at redhat.com  Wed Sep  5 22:50:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 18:50:42 -0400
Subject: rpms/perl-Params-Util/devel perl-Params-Util.spec,1.21,1.22
Message-ID: <200709052250.l85MogMR002972@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2947

Modified Files:
	perl-Params-Util.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Params-Util.spec	30 May 2007 06:29:53 -0000	1.21
+++ perl-Params-Util.spec	5 Sep 2007 22:50:09 -0000	1.22
@@ -1,8 +1,8 @@
 Name: 		perl-Params-Util
-Version: 	0.25
+Version: 	0.29
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Util/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
@@ -42,7 +42,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
+%if "%{version}" == "0.29"
+# AUTOMATED_TESTING is broken - Shouldn't do any harm
+make test
+%else
 make test AUTOMATED_TESTING=1
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -51,6 +56,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
+- Upstream update.
+- Update licence tag.
+- Conditionally disable AUTOMATED_TESTING.
+
+* Sat Jul 28 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.26-1
+- Upstream update.
+
 * Wed May 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.25-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Sep  5 22:53:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 18:53:00 -0400
Subject: rpms/perl-Params-Util/devel .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <200709052253.l85Mr0p2003065@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3042

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 May 2007 06:29:53 -0000	1.19
+++ .cvsignore	5 Sep 2007 22:52:27 -0000	1.20
@@ -1 +1 @@
-Params-Util-0.25.tar.gz
+Params-Util-0.29.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 May 2007 06:29:53 -0000	1.19
+++ sources	5 Sep 2007 22:52:27 -0000	1.20
@@ -1 +1 @@
-d3a95845d71e1a014ae7bbb02bee240c  Params-Util-0.25.tar.gz
+caa6ff878ffe3b097a7f07242e690be3  Params-Util-0.29.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 23:20:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:20:48 -0400
Subject: rpms/perl-Params-Util/F-7 .cvsignore, 1.19,
	1.20 perl-Params-Util.spec, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <200709052320.l85NKmNU009552@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
- Upstream update.
- Update licence tag.
- Conditionally disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 May 2007 06:39:26 -0000	1.19
+++ .cvsignore	5 Sep 2007 23:20:15 -0000	1.20
@@ -1 +1 @@
-Params-Util-0.25.tar.gz
+Params-Util-0.29.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/perl-Params-Util.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Params-Util.spec	30 May 2007 06:39:26 -0000	1.21
+++ perl-Params-Util.spec	5 Sep 2007 23:20:15 -0000	1.22
@@ -1,8 +1,8 @@
 Name: 		perl-Params-Util
-Version: 	0.25
+Version: 	0.29
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Util/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-%{version}.tar.gz
@@ -42,7 +42,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
+%if "%{version}" == "0.29"
+# AUTOMATED_TESTING is broken - Shouldn't do any harm
+make test
+%else
 make test AUTOMATED_TESTING=1
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -51,6 +56,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.29-1
+- Upstream update.
+- Update licence tag.
+- Conditionally disable AUTOMATED_TESTING.
+
+* Sat Jul 28 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.26-1
+- Upstream update.
+
 * Wed May 30 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.25-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Util/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 May 2007 06:39:26 -0000	1.19
+++ sources	5 Sep 2007 23:20:15 -0000	1.20
@@ -1 +1 @@
-d3a95845d71e1a014ae7bbb02bee240c  Params-Util-0.25.tar.gz
+caa6ff878ffe3b097a7f07242e690be3  Params-Util-0.29.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep  5 23:36:54 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 5 Sep 2007 19:36:54 -0400
Subject: devel/yum-updatesd .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 yum-updatesd.spec, 1.1, 1.2
Message-ID: <200709052336.l85Nasg6009962@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9927

Modified Files:
	.cvsignore sources yum-updatesd.spec 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
- add option for configurable SMTP server
- fix email sending (Rich Fearn, #251196)
- make updates checking in the presence of NetworkManager smarter (#213732)
- ensure group info gets updated
- work with yum 3.0.x (jantill)
- don't poll gamin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2007 15:20:20 -0000	1.2
+++ .cvsignore	5 Sep 2007 23:36:21 -0000	1.3
@@ -1 +1 @@
-yum-updatesd-0.4.tar.bz2
+yum-updatesd-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2007 15:20:20 -0000	1.2
+++ sources	5 Sep 2007 23:36:21 -0000	1.3
@@ -1 +1 @@
-9ae8c8c5d92442f2430096cbbe17ecfd  yum-updatesd-0.4.tar.bz2
+369b99f963dc9a4eb8fbb3c52bd0b8cd  yum-updatesd-0.5.tar.bz2


Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yum-updatesd.spec	24 Jul 2007 15:20:20 -0000	1.1
+++ yum-updatesd.spec	5 Sep 2007 23:36:21 -0000	1.2
@@ -1,11 +1,10 @@
 Summary: Update notification daemon
 Name: yum-updatesd
 Epoch: 1
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
-# source is from the 0.4 tag at http://linux.duke.edu/yum/git/yum-updatesd.git
 Source0: %{name}-%{version}.tar.bz2
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -62,6 +61,14 @@
 
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
+- add option for configurable SMTP server
+- fix email sending (Rich Fearn, #251196)
+- make updates checking in the presence of NetworkManager smarter (#213732)
+- ensure group info gets updated
+- work with yum 3.0.x (jantill)
+- don't poll gamin
+
 * Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 1:0.4-1
 - minor review fixes.  add --oneshot mode
 



From fedora-extras-commits at redhat.com  Wed Sep  5 23:38:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:38:54 -0400
Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec,1.8,1.9
Message-ID: <200709052338.l85NcstQ010054@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-LongString/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10034

Modified Files:
	perl-Test-LongString.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
- BR: perl(ExtUtils::MakeMaker).
- Update license tag.



Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-LongString.spec	21 Feb 2007 10:10:48 -0000	1.8
+++ perl-Test-LongString.spec	5 Sep 2007 23:38:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-LongString
 Version: 	0.11
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Perl module to test long strings
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-LongString/
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Test-LongString-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Required by the tests
 BuildRequires: perl(Test::Builder) >= 0.12
 # 0.11 would require 1.04, but we only have 1.02
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
+- BR: perl(ExtUtils::MakeMaker).
+- Update license tag.
+
 * Wed Feb 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
 - Upstream update.
 - For now, ignore BR: perl(Test::Builder::Tester) > 1.04.



From fedora-extras-commits at redhat.com  Wed Sep  5 23:40:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 5 Sep 2007 19:40:54 -0400
Subject: rpms/perl-Test-LongString/F-7 perl-Test-LongString.spec,1.8,1.9
Message-ID: <200709052340.l85NesIV010131@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-LongString/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10113

Modified Files:
	perl-Test-LongString.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
- BR: perl(ExtUtils::MakeMaker).
- Update license tag.



Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-LongString/F-7/perl-Test-LongString.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-LongString.spec	21 Feb 2007 10:10:48 -0000	1.8
+++ perl-Test-LongString.spec	5 Sep 2007 23:40:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-LongString
 Version: 	0.11
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Perl module to test long strings
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-LongString/
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Test-LongString-%{version}.tar.gz
@@ -10,6 +10,7 @@
 
 BuildArch: noarch
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Required by the tests
 BuildRequires: perl(Test::Builder) >= 0.12
 # 0.11 would require 1.04, but we only have 1.02
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-2
+- BR: perl(ExtUtils::MakeMaker).
+- Update license tag.
+
 * Wed Feb 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
 - Upstream update.
 - For now, ignore BR: perl(Test::Builder::Tester) > 1.04.



From fedora-extras-commits at redhat.com  Wed Sep  5 23:59:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Wed, 5 Sep 2007 19:59:18 -0400
Subject: rpms/oddjob/devel .cvsignore, 1.6, 1.7 oddjob.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200709052359.l85NxIjY010531@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10504

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
- update to 0.29



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jul 2006 18:39:13 -0000	1.6
+++ .cvsignore	5 Sep 2007 23:58:45 -0000	1.7
@@ -1 +1,2 @@
 oddjob-0.27-1.tar.gz
+oddjob-0.29-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- oddjob.spec	13 Feb 2007 23:39:12 -0000	1.14
+++ oddjob.spec	5 Sep 2007 23:58:45 -0000	1.15
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.27
-Release: 10
+Version: 0.29
+Release: 1%{?dist}
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -12,17 +12,25 @@
 BuildRequires: pam-devel, python-devel, pkgconfig
 BuildRequires: cyrus-sasl-devel, krb5-devel, openldap-devel
 BuildRequires: docbook-dtds, xmlto
-BuildRequires: python-devel
 Requires(post): /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(pre): /sbin/chkconfig
 URL: http://people.redhat.com/nalin/oddjob/
-Requires: %{name}-libs = %{version}-%{release}
 
 %description
 oddjob is a D-BUS service which performs particular tasks for clients which
 connect to it and issue requests using the system-wide message bus.
 
+%package mkhomedir
+Group: System Environment/Daemons
+Summary: An oddjob helper which creates and populates home directories
+Requires: %{name} = %{version}-%{release}
+
+%description mkhomedir
+This package contains the oddjob helper which can be used by the
+pam_oddjob_mkhomedir module to create a home directory for a user
+at login-time.
+
 %package devel
 Group: Development/Libraries
 Summary: Files for developing oddjob clients
@@ -43,6 +51,16 @@
 This package contains dynamic libraries which are used by simple oddjob client
 applications.
 
+%package python
+Group: System Environment/Libraries
+Summary: A Python binding for oddjob clients
+Requires: %{name}-libs = %{version}-%{release}
+
+%description python
+This package contains a python module which allows client applications
+written in the Python language to issue requests to the oddjobd server
+using the message bus.
+
 %package sample
 Group: System Environment/Daemons
 Summary: A sample oddjob service.
@@ -61,10 +79,11 @@
 %endif
 %configure \
 	--disable-static \
-	--with-selinux-acls=default \
+	--with-selinux-acls \
 	--with-selinux-labels \
 	--with-python --enable-xml-docs --enable-compat-dtd \
-	--libexecdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
+	--disable-dependency-tracking \
 	$sample_flag
 make %{_smp_mflags}
 
@@ -94,7 +113,7 @@
 
 %files
 %defattr(-,root,root)
-%doc *.dtd COPYING QUICKSTART python/sample.py doc/oddjob.html
+%doc *.dtd COPYING QUICKSTART python/sample.py doc/oddjob.html src/reload
 %if ! %{build_sample}
 %doc sample-install-root/sample
 %endif
@@ -104,19 +123,30 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
-%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
+%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/mkhomedir
-%{_libdir}/%{name}/sanity.sh
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/sanity.sh
 %{_mandir}/*/oddjob*.*
 
+%files mkhomedir
+%defattr(-,root,root)
+%doc src/mkhomedirfor src/mkmyhomedir
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/mkhomedir
+/%{_lib}/security/pam_oddjob_mkhomedir.so
+%{_mandir}/*/pam_oddjob_mkhomedir.*
+%config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob-mkhomedir.conf
+%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/liboddjob.so.*
+
+%files python
+%defattr(-,root,root)
 %{_libdir}/python*/site-packages/*
-/%{_lib}/security/*.so
-%{_mandir}/*/pam_*.*
 
 %files devel
 %defattr(-,root,root)
@@ -145,15 +175,19 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 13 2007 Nalin Dahyabhai <nalin at redhat.com> 0.27-10
-- make -devel depend on -libs, which supplies the libraries to which it
-  symlinks (#228377)
+* Wed Sep  5 2007 Nalin Dahyabhai <nalin at redhat.com> 0.29-1
+- split off mkhomedir bits into a subpackage (#236820)
+- take a pass at new-init-ifying the init script (#247005)
+
+* Thu Aug 16 2007 Nalin Dahyabhai <nalin at redhat.com>
+- move helpers to libexecdir, keeping pkglibdir around in the package (#237207)
+
+* Mon Apr  9 2007 Nalin Dahyabhai <nalin at redhat.com> 0.28-1
+- split off python subpackage, make -devel depend on -libs, let autodeps
+  provide the main package's dependency on -libs (#228377)
 
-* Sun Dec 10 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-9
-- add BuildRequires: on python-devel
-
-* Thu Sep  7 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-8
-- rebuild
+* Thu Feb 15 2007 Nalin Dahyabhai <nalin at redhat.com> 0.27-8
+- configure with --disable-dependency-tracking (Ville Skytt??, #228928)
 
 * Thu Jul 25 2006 Nalin Dahyabhai <nalin at redhat.com> 0.27-7
 - unmark the init script as a %%config file (part of #197182)
@@ -224,7 +258,7 @@
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration
   - oddjobd can reload its configuration now
-  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper (#246681)
 
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jul 2006 18:39:13 -0000	1.6
+++ sources	5 Sep 2007 23:58:45 -0000	1.7
@@ -1 +1 @@
-22af2ce420a85b0526b6af7fc12e0e26  oddjob-0.27-1.tar.gz
+51aac71afb06315afd6d6434cf5aa3cc  oddjob-0.29-1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 00:04:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:04:49 -0400
Subject: rpms/zeroinstall-injector/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 zeroinstall-injector.spec, 1.5, 1.6
Message-ID: <200709060004.l8604nqK016622@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578/F-7

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2006 00:00:33 -0000	1.3
+++ .cvsignore	6 Sep 2007 00:04:15 -0000	1.4
@@ -1 +1 @@
-zeroinstall-injector-0.24.tar.gz.gpg
+zeroinstall-injector-0.30.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2006 00:00:33 -0000	1.3
+++ sources	6 Sep 2007 00:04:15 -0000	1.4
@@ -1 +1 @@
-d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg
+c539dc6ffa39f18700220f5565d8eac3  zeroinstall-injector-0.30.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zeroinstall-injector.spec	19 Dec 2006 03:56:40 -0000	1.5
+++ zeroinstall-injector.spec	6 Sep 2007 00:04:15 -0000	1.6
@@ -1,30 +1,41 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define cache_dir /var/cache/0install.net
+
 Name:    zeroinstall-injector
-Version: 0.24
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
-License: LGPL
+License: LGPLv2.1
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
 Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel gnupg
-Requires: PyXML pygtk2 gnupg
+BuildRequires: python-devel gnupg desktop-file-utils
+Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires: /usr/sbin/useradd
 
 %description
-A running process is created by combining many different libraries (and other
-components). In the Zero Install world, we have all versions of each library
-available at all times. The problem then is how to choose which versions to
-use.
-
-The injector solves this problem by selecting components to meet a program's
-requirements, according to a policy you give it. The injector finds out which
-versions are available, and downloads and runs the ones you choose.
+The Zero Install Injector makes it easy for users to install software without
+needing root privileges. It takes the URL of a program and runs it
+(downloading it first if necessary). Any dependencies of the program are
+fetched in the same way. The user controls which version of the program and
+its dependencies to use.
+
+Zero Install is a decentralised installation system (there is no central
+repository; all packages are identified by URLs), loosly-coupled (if different
+programs require different versions of a library then both versions are
+installed in parallel, without conflicts), and has an emphasis on security
+(all package descriptions are GPG-signed, and contain cryptographic hashes of
+the contents of each version). Each version of each program is stored in its
+own sub-directory within the Zero Install cache (nothing is installed to
+directories outside of the cache, such as /usr/bin) and no code from the
+package is run during install or uninstall. The system can automatically check
+for updates when software is run.
 
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
@@ -36,15 +47,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
+mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
+
+desktop-file-install --vendor="fedora" \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# Add the "zeroinst" user.
+# This is not used by default, but is required if you want to
+# set up sharing of downloads later.
+/usr/sbin/useradd -c 'Zero Install shared cache' \
+    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
+%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
@@ -53,11 +79,20 @@
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
+%{python_sitelib}/zeroinstall/0launch-gui/zero-install.glade
 %{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
-
+%dir %{cache_dir}
+%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
+- Update to 0.30
+- License is now versioned
+- Incorporate changes from Thomas Leonard:
+  * create zeroinst user
+  * create shared cache
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> 0.24-3
 - Rebuild for development branch
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:04:52 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:04:52 -0400
Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.3, 1.4 sources, 1.3, 
	1.4 zeroinstall-injector.spec, 1.5, 1.6
Message-ID: <200709060004.l8604qF6016632@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16578/devel

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2006 00:00:33 -0000	1.3
+++ .cvsignore	6 Sep 2007 00:04:19 -0000	1.4
@@ -1 +1 @@
-zeroinstall-injector-0.24.tar.gz.gpg
+zeroinstall-injector-0.30.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2006 00:00:33 -0000	1.3
+++ sources	6 Sep 2007 00:04:19 -0000	1.4
@@ -1 +1 @@
-d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg
+c539dc6ffa39f18700220f5565d8eac3  zeroinstall-injector-0.30.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zeroinstall-injector.spec	19 Dec 2006 03:56:40 -0000	1.5
+++ zeroinstall-injector.spec	6 Sep 2007 00:04:19 -0000	1.6
@@ -1,30 +1,41 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define cache_dir /var/cache/0install.net
+
 Name:    zeroinstall-injector
-Version: 0.24
-Release: 3%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
-License: LGPL
+License: LGPLv2.1
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
 Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel gnupg
-Requires: PyXML pygtk2 gnupg
+BuildRequires: python-devel gnupg desktop-file-utils
+Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires: /usr/sbin/useradd
 
 %description
-A running process is created by combining many different libraries (and other
-components). In the Zero Install world, we have all versions of each library
-available at all times. The problem then is how to choose which versions to
-use.
-
-The injector solves this problem by selecting components to meet a program's
-requirements, according to a policy you give it. The injector finds out which
-versions are available, and downloads and runs the ones you choose.
+The Zero Install Injector makes it easy for users to install software without
+needing root privileges. It takes the URL of a program and runs it
+(downloading it first if necessary). Any dependencies of the program are
+fetched in the same way. The user controls which version of the program and
+its dependencies to use.
+
+Zero Install is a decentralised installation system (there is no central
+repository; all packages are identified by URLs), loosly-coupled (if different
+programs require different versions of a library then both versions are
+installed in parallel, without conflicts), and has an emphasis on security
+(all package descriptions are GPG-signed, and contain cryptographic hashes of
+the contents of each version). Each version of each program is stored in its
+own sub-directory within the Zero Install cache (nothing is installed to
+directories outside of the cache, such as /usr/bin) and no code from the
+package is run during install or uninstall. The system can automatically check
+for updates when software is run.
 
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
@@ -36,15 +47,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
+mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
+
+desktop-file-install --vendor="fedora" \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# Add the "zeroinst" user.
+# This is not used by default, but is required if you want to
+# set up sharing of downloads later.
+/usr/sbin/useradd -c 'Zero Install shared cache' \
+    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
+%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
@@ -53,11 +79,20 @@
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
+%{python_sitelib}/zeroinstall/0launch-gui/zero-install.glade
 %{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
-
+%dir %{cache_dir}
+%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
+- Update to 0.30
+- License is now versioned
+- Incorporate changes from Thomas Leonard:
+  * create zeroinst user
+  * create shared cache
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> 0.24-3
 - Rebuild for development branch
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:12:37 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:12:37 -0400
Subject: rpms/GeoIP/EL-4 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200709060012.l860CbSE016885@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2007 11:57:50 -0000	1.9
+++ .cvsignore	6 Sep 2007 00:12:04 -0000	1.10
@@ -1,5 +1,5 @@
-GeoIP-1.4.2.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
+GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/GeoIP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeoIP.spec	12 Feb 2007 11:57:50 -0000	1.11
+++ GeoIP.spec	6 Sep 2007 00:12:04 -0000	1.12
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,6 +79,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
 * Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2007 11:57:50 -0000	1.9
+++ sources	6 Sep 2007 00:12:04 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-48a9f71cc61aae720a473309d39db98b  fetch-geoipdata-city.pl
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:14:56 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:14:56 -0400
Subject: rpms/GeoIP/EL-4 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709060014.l860EuVX016934@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16910

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 00:12:04 -0000	1.10
+++ .cvsignore	6 Sep 2007 00:14:24 -0000	1.11
@@ -1,5 +1,5 @@
+GeoIP-1.4.3.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
-GeoIP-1.4.3.tar.gz
 LICENSE.txt
 README.Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Sep 2007 00:12:04 -0000	1.10
+++ sources	6 Sep 2007 00:14:24 -0000	1.11
@@ -1,5 +1,5 @@
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
-d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:17:52 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:17:52 -0400
Subject: rpms/GeoIP/EL-5 .cvsignore, 1.9, 1.10 GeoIP.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <200709060017.l860Hqo6017037@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17015

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
- New upstream release.
- Fix GeoIPCity fetcher script
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Apr 2007 08:42:04 -0000	1.9
+++ .cvsignore	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,4 +1,4 @@
-GeoIP-1.4.2.tar.gz
+GeoIP-1.4.3.tar.gz
 fetch-geoipdata-city.pl
 fetch-geoipdata.pl
 LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/GeoIP.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeoIP.spec	1 Apr 2007 08:42:04 -0000	1.9
+++ GeoIP.spec	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,9 +1,9 @@
 Name: GeoIP           
-Version: 1.4.2
+Version: 1.4.3
 Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
-License: LGPL
+License: LGPLv2+
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
 Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
@@ -79,10 +79,13 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Apr 1 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.3-1
+- New upstream release.
+- Fix GeoIPCity fetcher script
+- Update License tag
+
+* Mon Feb 12 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.2-1
 - New upstream release.
-- Sync with devel
-- Fix dumb typo in fetch-geoipdata-city.pl
 
 * Mon Jan 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.4.1-2
 - License is actually LGPL now.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Apr 2007 08:42:04 -0000	1.9
+++ sources	6 Sep 2007 00:17:20 -0000	1.10
@@ -1,5 +1,5 @@
-d310da791d1d760edad25d33f2166fcd  GeoIP-1.4.2.tar.gz
-a650a3e4fb2f7c3984c4081cd5949d73  fetch-geoipdata-city.pl
+d364ec127a1092749d589a79001f2d8c  GeoIP-1.4.3.tar.gz
+76628bd54dca89ba21fcbb6f54f3c668  fetch-geoipdata-city.pl
 c7c0ff588272cc686515d4c66b076cba  fetch-geoipdata.pl
 8c0bc6e8ebe6ec3bc1580021edb4bba1  LICENSE.txt
 38e97c6ac82ac7b44f6d1f40c30580a5  README.Fedora



From fedora-extras-commits at redhat.com  Thu Sep  6 00:31:54 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 20:31:54 -0400
Subject: rpms/tracker/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tracker.spec, 1.19, 1.20
Message-ID: <200709060031.l860Vsqb017732@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17704

Modified Files:
	.cvsignore sources tracker.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
- Version 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2007 23:47:52 -0000	1.7
+++ .cvsignore	6 Sep 2007 00:31:22 -0000	1.8
@@ -1 +1 @@
-tracker-0.6.1.tar.bz2
+tracker-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2007 23:47:52 -0000	1.7
+++ sources	6 Sep 2007 00:31:22 -0000	1.8
@@ -1 +1 @@
-3f706dc73fffa0a7b633b0c0aff6a263  tracker-0.6.1.tar.bz2
+d4d66cd73e6c59ac392565be622370f2  tracker-0.6.2.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tracker.spec	25 Aug 2007 12:24:50 -0000	1.19
+++ tracker.spec	6 Sep 2007 00:31:22 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.1
-Release:	2%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
@@ -11,11 +11,7 @@
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-%if "%fedora" >= "6"
-BuildRequires:	sqlite-devel
-%else
-BuildRequires:	dbus-devel, dbus-glib
-%endif
+BuildRequires:	sqlite-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -54,17 +50,14 @@
 
 %prep
 %setup -q
-# remove shebangs from the python files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i python/deskbar-handler/*.py
+%define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
 
 %build
-%if "%fedora" >= "6"
-%configure --disable-static --enable-external-sqlite	\
-	--enable-preferences --enable-deskbar-applet	\
-	--with-deskbar-applet-handler-dir=%{_libdir}/deskbar-applet/handlers
+%configure --disable-static --enable-deskbar-applet=auto	\
+%if "%deskbar_applet_ver" >= "2.19"
+	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/modules
 %else
-%configure --disable-static --enable-preferences	\
-	--enable-deskbar-applet
+	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/handlers
 %endif
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -123,12 +116,19 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
+%if "%deskbar_applet_ver" >= "2.19"
+%{_libdir}/deskbar-applet/modules/tracker*.py*
+%else
 %{_libdir}/deskbar-applet/handlers/*.py*
+%endif
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Version 0.6.2
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:33:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 5 Sep 2007 20:33:53 -0400
Subject: comps comps-f8.xml.in,1.93,1.94
Message-ID: <200709060033.l860XrUn017799@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17680

Modified Files:
	comps-f8.xml.in 
Log Message:
- add cjkunifonts to base-x and fonts groups
- install just cjkunifonts-uming by default instead of fonts-chinese



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- comps-f8.xml.in	5 Sep 2007 19:26:45 -0000	1.93
+++ comps-f8.xml.in	6 Sep 2007 00:33:23 -0000	1.94
@@ -310,11 +310,11 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
       <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-chinese</packagereq>
       <packagereq type="default">fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
       <packagereq type="default">fonts-hindi</packagereq>
@@ -357,6 +357,7 @@
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
+      <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">FreeWnn</packagereq>
@@ -395,10 +396,10 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
       <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-chinese</packagereq>
       <packagereq type="default">fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hindi</packagereq>
       <packagereq type="default">fonts-kannada</packagereq>
@@ -414,9 +415,11 @@
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep  6 00:34:53 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 5 Sep 2007 20:34:53 -0400
Subject: rpms/referencer/devel referencer.spec,1.5,1.6
Message-ID: <200709060034.l860Yrfr017837@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17807

Modified Files:
	referencer.spec 
Log Message:
* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
- Rebuild against newer poppler library



Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- referencer.spec	25 Aug 2007 12:22:18 -0000	1.5
+++ referencer.spec	6 Sep 2007 00:34:20 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.0.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
@@ -68,6 +68,9 @@
 %{_datadir}/referencer/
 
 %changelog
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
+- Rebuild against newer poppler library
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:36:23 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 5 Sep 2007 20:36:23 -0400
Subject: rpms/python-GeoIP/devel .cvsignore, 1.2, 1.3 python-GeoIP.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709060036.l860aN2X017981@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17957

Modified Files:
	.cvsignore python-GeoIP.spec sources 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Feb 2006 22:33:22 -0000	1.2
+++ .cvsignore	6 Sep 2007 00:35:51 -0000	1.3
@@ -1 +1,2 @@
 GeoIP-Python-1.2.1.tar.gz
+GeoIP-Python-1.2.1-ccodes.patch


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	6 Sep 2007 00:35:51 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,10 @@
 
 
 %changelog
+* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Feb 2006 22:33:22 -0000	1.2
+++ sources	6 Sep 2007 00:35:51 -0000	1.3
@@ -1 +1,2 @@
 5683420ea34490029ee0285ff048fda0  GeoIP-Python-1.2.1.tar.gz
+07b7d26c645581af0b797dc145e79dca  GeoIP-Python-1.2.1-ccodes.patch



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, 6) updated by kevin
Message-ID: <200709060040.l860ecYe022540@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-IPC-RUN3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-IPC-RUN3 (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora 6) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora 6) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, 7) updated by kevin
Message-ID: <200709060040.l860ecbl022549@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-IPC-RUN3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-IPC-RUN3 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora 7) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora 7) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:40:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 05 Sep 2007 17:40:37 -0700
Subject: [pkgdb] perl-IPC-RUN3 (Fedora, devel) updated by kevin
Message-ID: <200709060040.l860ecns022558@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on perl-IPC-RUN3 (Fedora devel) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-IPC-RUN3 (Fedora devel) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-IPC-RUN3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-RUN3



From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:31 -0400
Subject: rpms/perl-IPC-RUN3 - New directory
Message-ID: <200709060041.l860fVqh018224@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3

Log Message:
Directory /cvs/extras/rpms/perl-IPC-RUN3 added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:34 -0400
Subject: rpms/perl-IPC-RUN3/devel - New directory
Message-ID: <200709060041.l860fYdc018250@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-RUN3/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:37 -0400
Subject: rpms/perl-IPC-RUN3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709060041.l860fb2c018275@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-RUN3


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-RUN3
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 00:41:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 5 Sep 2007 20:41:40 -0400
Subject: rpms/perl-IPC-RUN3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709060041.l860feck018291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-IPC-RUN3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX18174/rpms/perl-IPC-RUN3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-RUN3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IPC-RUN3
# $Id: Makefile,v 1.1 2007/09/06 00:41:37 kevin Exp $
NAME := perl-IPC-RUN3
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 fedora-extras-commits at redhat.com  Thu Sep  6 00:41:58 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:41:58 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.6,1.7
Message-ID: <200709060041.l860fwkI018463@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18167/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
- Fix desktop-file-install problems



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zeroinstall-injector.spec	6 Sep 2007 00:04:15 -0000	1.6
+++ zeroinstall-injector.spec	6 Sep 2007 00:41:26 -0000	1.7
@@ -52,6 +52,8 @@
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
 desktop-file-install --vendor="fedora" \
+    --remove-category="Application" \
+    --delete-original
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
@@ -69,7 +71,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
-%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/



From fedora-extras-commits at redhat.com  Thu Sep  6 00:42:03 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:42:03 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.6,1.7
Message-ID: <200709060042.l860g3Y7018467@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18167/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
- Fix desktop-file-install problems



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zeroinstall-injector.spec	6 Sep 2007 00:04:19 -0000	1.6
+++ zeroinstall-injector.spec	6 Sep 2007 00:41:30 -0000	1.7
@@ -52,6 +52,8 @@
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
 desktop-file-install --vendor="fedora" \
+    --remove-category="Application" \
+    --delete-original
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 
@@ -69,7 +71,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
-%{_datadir}/applications/zeroinstall-zero2desktop.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/zeroinstall-zero2desktop.png
 %dir %{python_sitelib}/zeroinstall/
 %dir %{python_sitelib}/zeroinstall/0launch-gui/



From fedora-extras-commits at redhat.com  Thu Sep  6 00:48:00 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 5 Sep 2007 20:48:00 -0400
Subject: rpms/rogue/F-7 .cvsignore, 1.2, 1.3 rogue.spec, 1.10, 1.11 sources, 
	1.2, 1.3 rogue-5.4-setgid.patch, 1.3,
	NONE rogue-5.4.2-64bit.patch, 1.1,
	NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch,
	1.1, NONE rogue-rpmopts.patch, 1.1, NONE
Message-ID: <200709060048.l860m0Ot018608@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18570

Modified Files:
	.cvsignore rogue.spec sources 
Removed Files:
	rogue-5.4-setgid.patch rogue-5.4.2-64bit.patch 
	rogue-5.4.2-warnings.patch rogue-includes.patch 
	rogue-rpmopts.patch 
Log Message:
Update to 5.4.4




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 15:59:40 -0000	1.2
+++ .cvsignore	6 Sep 2007 00:47:28 -0000	1.3
@@ -1 +1 @@
-rogue5.4.2-src.tar.gz
+rogue5.4.4-src.tar.gz


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/rogue.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rogue.spec	16 Jul 2007 15:03:41 -0000	1.10
+++ rogue.spec	6 Sep 2007 00:47:28 -0000	1.11
@@ -1,19 +1,14 @@
 Name:           rogue
-Version:        5.4.2
-Release:        9%{?dist}
+Version:        5.4.4
+Release:        1%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
 License:        BSD
 URL:            http://rogue.rogueforge.net/
-Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.2-src.tar.gz
+Source0:        http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
 Source1:        rogue.desktop
 Source2:        rogue.png
-Patch0:         rogue-rpmopts.patch
-Patch1:         rogue-includes.patch
-Patch2:         rogue-5.4-setgid.patch
-Patch3:         rogue-5.4.2-64bit.patch
-Patch4:         rogue-5.4.2-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,27 +19,18 @@
 an entire genre.
 
 %prep
-%setup -q -c -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%{__sed} -i 's/\r//' rogue54.html
-%{__sed} -i 's/\r//' readme54.html
-chmod a-x *.c *.h
+%setup -q -n %{name}%{version}
 
 
 %build
-make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck
+make %{_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue
-install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6
-mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -52,8 +38,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
-touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,11 +63,13 @@
 %{_datadir}/icons/hicolor/32x32/apps/rogue.png
 %dir %attr(0775,games,games) %{_var}/games/roguelike
 %config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr
-%doc LICENSE.TXT rogue54.doc rogue54.html readme54.html
-
+%doc %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Sun Sep 2 2007 Wart <wart at kobold.org> 5.4.4-1
+- Update to 5.4.4
+
 * Sun Jul 15 2007 Wart <wart at kobold.org> 5.4.2-9
 - New upstream home page and download URL
 - Add patch when reading long values from the save file on 64-bit arch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rogue/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 15:59:40 -0000	1.2
+++ sources	6 Sep 2007 00:47:28 -0000	1.3
@@ -1 +1 @@
-bd656cb017a579eba835a0ee445a0a32  rogue5.4.2-src.tar.gz
+033288f46444b06814c81ea69d96e075  rogue5.4.4-src.tar.gz


--- rogue-5.4-setgid.patch DELETED ---


--- rogue-5.4.2-64bit.patch DELETED ---


--- rogue-5.4.2-warnings.patch DELETED ---


--- rogue-includes.patch DELETED ---


--- rogue-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 00:53:07 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 5 Sep 2007 20:53:07 -0400
Subject: rpms/Pixie/devel Pixie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709060053.l860r7TX018685@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18658/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Pixie.spec 
Log Message:
Initial import



--- NEW FILE Pixie.spec ---
Name:           Pixie
Version:        2.2.2
Release:        1%{?dist}
Summary:        3D renderer Renderman compliant

Group:          Applications/Multimedia
License:        LGPLv2+
URL:            http://www.cs.utexas.edu/~okan/Pixie/pixie.htm
Source0:        http://downloads.sourceforge.net/pixie/%{name}-src-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  autoconf, automake, libtool, tcsh

BuildRequires:  bison
BuildRequires:  doxygen
BuildRequires:  flex

BuildRequires:  fltk-devel
BuildRequires:  OpenEXR-devel

BuildRequires:  libX11-devel
BuildRequires:  libICE-devel
BuildRequires:  libtiff-devel


%description
Pixie is a RenderMan like photorealistic renderer.
It is being developed in the hope that it will be
useful for graphics research and for people who
can not afford a commercial renderer.

%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}.

%package        docs
Summary:        Documentation for %{name}
Group:          Documentation

%description docs
This package contains documentation files for %{name}.


%prep
%setup -q -n %{name}

# Use autotool to prevent to do special tweaks
#csh makeunix

# Fix a logical problem in configure which link to the static version
sed -i.r_static -e 's|--ldstaticflags|--ldflags|' configure



%build
%configure \
  --program-prefix=%{name}_ \
  --disable-static \
  --enable-shared \
  --disable-static-fltk \
  --disable-selfcontained \
  --with-x


# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" CPPROG="cp -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

mkdir -p __doc
cp -pr $RPM_BUILD_ROOT%{_datadir}/doc/Pixie/* __doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
# zero-length + wrong-file-end-of-line-encoding tweaks
rm __doc/StaticSite_NotIncludedStatic.html
sed -i 's/\r//'  __doc/css/broswerforms_compact.css

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING DEVNOTES README
%{_bindir}/*
%{_mandir}/man1/*.gz
%{_datadir}/Pixie/
%{_libdir}/*.so.*
%{_libdir}/Pixie/

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files docs
%defattr(-,root,root,-)
%doc __doc/*


%changelog
* Fri Jul 27 2007 kwizart < kwizart at gmail.com > - 2.2.2-1
- Update to 2.2.2

* Mon Jul 16 2007 kwizart < kwizart at gmail.com > - 2.2.1-2
- Fixed typo with libs
- Fixed timestamp with install -p

* Sat Jul 14 2007 kwizart < kwizart at gmail.com > - 2.2.1-1
- Update to 2.2.1
- Rename to Pixie
- Preserve timestamp at install step
- Improve directory ownership
- Move docs to sub-package
- Move libs to sub-package (multilibs)
- Add a dyn patch to link to shared ftgl

* Mon May 21 2007 kwizart < kwizart at gmail.com > - 2.1.1-1
- Initial spec file for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pixie/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Sep 2007 21:27:05 -0000	1.1
+++ .cvsignore	6 Sep 2007 00:52:35 -0000	1.2
@@ -0,0 +1 @@
+Pixie-src-2.2.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pixie/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Sep 2007 21:27:05 -0000	1.1
+++ sources	6 Sep 2007 00:52:35 -0000	1.2
@@ -0,0 +1 @@
+c4360ceca89319bcf60a15be96cbd245  Pixie-src-2.2.2.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 00:55:41 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:55:41 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.7,1.8
Message-ID: <200709060055.l860tfPs018826@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Missing backlash in desktop-file-install command



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zeroinstall-injector.spec	6 Sep 2007 00:41:26 -0000	1.7
+++ zeroinstall-injector.spec	6 Sep 2007 00:55:09 -0000	1.8
@@ -53,7 +53,7 @@
 
 desktop-file-install --vendor="fedora" \
     --remove-category="Application" \
-    --delete-original
+    --delete-original \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 



From fedora-extras-commits at redhat.com  Thu Sep  6 00:55:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 5 Sep 2007 20:55:44 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.7,1.8
Message-ID: <200709060055.l860timC018829@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Missing backlash in desktop-file-install command



Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zeroinstall-injector.spec	6 Sep 2007 00:41:30 -0000	1.7
+++ zeroinstall-injector.spec	6 Sep 2007 00:55:11 -0000	1.8
@@ -53,7 +53,7 @@
 
 desktop-file-install --vendor="fedora" \
     --remove-category="Application" \
-    --delete-original
+    --delete-original \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-zero2desktop.desktop
 



From fedora-extras-commits at redhat.com  Thu Sep  6 02:24:21 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 22:24:21 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.46,
	1.47 selinux-policy.spec, 1.513, 1.514
Message-ID: <200709060224.l862OLb6031920@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31897

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
- Allow sendmail to create etc_aliases_t


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- policy-20070703.patch	5 Sep 2007 21:30:18 -0000	1.46
+++ policy-20070703.patch	6 Sep 2007 02:24:18 -0000	1.47
@@ -3164,7 +3164,7 @@
 +/etc/rc\.d/init\.d/httpd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.0.7/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-05 07:16:31.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-05 22:22:33.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3409,7 +3409,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1013,46 +1047,143 @@
+@@ -1013,46 +1047,141 @@
  ##	</summary>
  ## </param>
  #
@@ -3554,8 +3554,6 @@
 +	# Allow $1 to restart the apache service
 +	apache_script_domtrans($1)
 +	domain_system_change_exemption($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 httpd_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -6184,8 +6182,8 @@
 +/etc/rc\.d/init\.d/mysqld	--	gen_context(system_u:object_r:mysqld_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.0.7/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-04 16:56:14.000000000 -0400
-@@ -157,3 +157,80 @@
++++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-05 22:11:26.000000000 -0400
+@@ -157,3 +157,79 @@
  	logging_search_logs($1)
  	allow $1 mysqld_log_t:file { write append setattr ioctl };
  ')
@@ -6241,13 +6239,12 @@
 +		type mysqld_script_exec_t;
 +	')
 +
-+	allow $1 mysqld_t:process { ptrace signal_perms };
++	allow $1 mysqld_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, mysqld_t, mysqld_t)
 +	
 +	# Allow $1 to restart the apache service
 +	mysql_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 mysqld_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -7324,8 +7321,8 @@
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.0.7/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-05 15:13:11.000000000 -0400
-@@ -113,3 +113,78 @@
++++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-05 22:13:10.000000000 -0400
+@@ -113,3 +113,77 @@
          # Some versions of postgresql put the sock file in /tmp
  	allow $1 postgresql_tmp_t:sock_file write;
  ')
@@ -7379,13 +7376,12 @@
 +		type postgresql_log_t;
 +	')
 +
-+	allow $1 postgresql_t:process { ptrace signal_perms };
++	allow $1 postgresql_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, postgresql_t, postgresql_t)
 +
 +	# Allow $1 to restart the apache service
 +	postgresql_script_domtrans($1)
 +	domain_system_change_exemption($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 postgresql_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -10347,7 +10343,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.7/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-04 12:01:50.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-05 22:21:18.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -10418,7 +10414,7 @@
  
  manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
  manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
-@@ -496,6 +511,39 @@
+@@ -496,6 +511,43 @@
  ')
  
  optional_policy(`
@@ -10449,8 +10445,12 @@
 +
 +	tunable_policy(`allow_daemons_use_tty',`
 +		unconfined_use_terminals(daemon)
++		term_use_all_user_ttys(daemon)
++		term_use_all_user_ptys(daemon)
 + 	', `
 +		unconfined_dontaudit_use_terminals(daemon)
++		term_dontaudit_use_all_user_ttys(daemon)
++		term_dontaudit_use_all_user_ptys(daemon)
 + 	')
 +')
 + 
@@ -10458,7 +10458,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -631,12 +679,6 @@
+@@ -631,12 +683,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -10471,7 +10471,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -702,6 +744,9 @@
+@@ -702,6 +748,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -10720,7 +10720,7 @@
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.7/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-04 17:01:26.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-05 22:22:05.000000000 -0400
 @@ -33,8 +33,13 @@
  ## </param>
  #
@@ -11014,12 +11014,12 @@
 +		type auditd_var_run_t;
 +	')
 +
-+	allow $1 auditd_t:process { ptrace signal_perms };
++	allow $1 auditd_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, auditd_t, auditd_t)
++
 +	# Allow $1 to restart the apache service
 +	audit_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 audit_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -11068,14 +11068,14 @@
 +		type var_log_t;
 +	')
 +
-+	allow $1 syslogd_t:process { ptrace signal_perms };
-+	allow $1 klogd_t:process { ptrace signal_perms };
++	allow $1 syslogd_t:process { ptrace signal_perms getattr };
++	allow $1 klogd_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, syslogd_t, syslogd_t)
++	read_files_pattern($1, klogd_t, klogd_t)
 +
 +	# Allow $1 to restart the apache service
 +	syslog_script_domtrans($1)
-+	domain_role_change_exemption($1)
 +	domain_system_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
 +	role_transition $2 syslog_script_exec_t system_r;
 +	allow $2 system_r;
 +
@@ -12585,7 +12585,16 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-04 16:56:00.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-05 22:07:53.000000000 -0400
+@@ -45,7 +45,7 @@
+ 	type $1_tty_device_t; 
+ 	term_user_tty($1_t,$1_tty_device_t)
+ 
+-	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession };
++	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
+ 	allow $1_t self:fd use;
+ 	allow $1_t self:fifo_file rw_fifo_file_perms;
+ 	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -62,6 +62,10 @@
  
  	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
@@ -14025,7 +14034,7 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-08-31 15:27:24.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-05 21:49:04.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- selinux-policy.spec	5 Sep 2007 21:30:18 -0000	1.513
+++ selinux-policy.spec	6 Sep 2007 02:24:18 -0000	1.514
@@ -194,8 +194,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs n y
-%installCmds targeted mcs n y
+%setupCmds targeted mcs y y
+%installCmds targeted mcs y y
 %endif
 
 %if %{BUILD_MLS}
@@ -207,8 +207,8 @@
 %if %{BUILD_OLPC}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds olpc mcs n y
-%installCmds olpc mcs n y
+%setupCmds olpc mcs y y
+%installCmds olpc mcs y y
 %endif
 
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs



From fedora-extras-commits at redhat.com  Thu Sep  6 02:48:07 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 5 Sep 2007 22:48:07 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.24,
	1.25 libsemanage.spec, 1.131, 1.132
Message-ID: <200709060248.l862m7iO032457@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32429

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
+++ libsemanage-rhat.patch	6 Sep 2007 02:48:04 -0000	1.25
@@ -74,21 +74,6 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
---- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
-@@ -37,10 +37,10 @@
- 	int expand_check;
- 	int save_previous;
- 	int save_linked;
--	int disable_genhomedircon;
- 	mode_t file_mode;
- 	struct external_prog *load_policy;
- 	struct external_prog *setfiles;
-+	struct external_prog *genhomedircon;
- 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
- } semanage_conf_t;
- 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libsemanage.spec	5 Sep 2007 18:51:36 -0000	1.131
+++ libsemanage.spec	6 Sep 2007 02:48:04 -0000	1.132
@@ -10,7 +10,7 @@
 Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libselinux-devel >= %{libselinuxver} swig
+BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel
 BuildRequires: libsepol-devel >= %{libsepolver} 
 BuildRequires: python-devel bison flex
 
@@ -33,7 +33,7 @@
 %package devel
 Summary: Header files and libraries used to build policy manipulation tools
 Group: Development/Libraries
-Requires: libsemanage = %{version}-%{release}
+Requires: libsemanage = %{version}-%{release} ustr
 
 %description devel
 The semanage-devel package contains the static libraries and header files



From fedora-extras-commits at redhat.com  Thu Sep  6 03:52:55 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Wed, 5 Sep 2007 23:52:55 -0400
Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.7,1.8
Message-ID: <200709060352.l863qte0006892@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/mod_auth_pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874

Modified Files:
	mod_auth_pam.spec 
Log Message:
Rebuild for new APR libs



Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_auth_pam.spec	21 Mar 2007 03:26:04 -0000	1.7
+++ mod_auth_pam.spec	6 Sep 2007 03:52:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Wed Sep  5 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.1.1-5
+- Rebuild for new APR libs
+
 * Tue Mar 20 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.1.1-4
 - Rebuild for Fedora 7
 



From fedora-extras-commits at redhat.com  Thu Sep  6 04:07:37 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 00:07:37 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.12,1.13
Message-ID: <200709060407.l8647b3M012976@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12949

Modified Files:
	xulrunner.spec 
Log Message:
fix file not found error



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xulrunner.spec	5 Sep 2007 19:55:01 -0000	1.12
+++ xulrunner.spec	6 Sep 2007 04:07:04 -0000	1.13
@@ -225,7 +225,7 @@
 
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
-%{__cp} rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
+%{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
 # set up our default bookmarks



From fedora-extras-commits at redhat.com  Thu Sep  6 05:48:57 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Thu, 6 Sep 2007 01:48:57 -0400
Subject: rpms/php-pear-Mail-Mime/devel .cvsignore, 1.3,
	1.4 php-pear-Mail-Mime.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709060548.l865mvTG020300@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-pear-Mail-Mime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20276

Modified Files:
	.cvsignore php-pear-Mail-Mime.spec sources 
Log Message:
Update to 1.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 May 2007 18:25:28 -0000	1.3
+++ .cvsignore	6 Sep 2007 05:48:24 -0000	1.4
@@ -1 +1 @@
-Mail_Mime-1.4.0.tgz
+Mail_Mime-1.5.2.tgz


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/php-pear-Mail-Mime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Mail-Mime.spec	16 May 2007 18:25:28 -0000	1.2
+++ php-pear-Mail-Mime.spec	6 Sep 2007 05:48:24 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.4.0
+Version:	1.5.2
 Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
@@ -13,7 +13,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1:1.4.9-1.2
+BuildRequires:	php-pear >= 1.6.0
 Requires:	php-pear(PEAR)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
@@ -77,6 +77,9 @@
 %{pear_phpdir}/Mail
 
 %changelog
+* Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-1
+- Upgraded to 1.5.2
+
 * Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.4.0-1
 - Upgraded to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 May 2007 18:25:28 -0000	1.3
+++ sources	6 Sep 2007 05:48:24 -0000	1.4
@@ -1 +1 @@
-71bf9236960ccc1196a6ff1729044cbf  Mail_Mime-1.4.0.tgz
+30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 06:28:56 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 02:28:56 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.7,1.8
Message-ID: <200709060628.l866SueJ026900@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26880

Modified Files:
	Config_EPEL.py 
Log Message:
apply patch enabling testing/stable



Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Config_EPEL.py	15 Aug 2007 02:29:22 -0000	1.7
+++ Config_EPEL.py	6 Sep 2007 06:28:54 -0000	1.8
@@ -28,12 +28,13 @@
     mail = True
     repoprune = True
     repoview = True
+    pushtotesting = True
     signkeycheck = True
-    doublesync = False
+
 
 top_workdir = '/srv/rpmbuild'
 
-treedir = top_workdir+'/%s/tree/%s/testing' % (project, project)
+treedir = top_workdir+'/%s/tree/%s' % (project, project)
 stagesdir = top_workdir+'/repodir'
 
 # Where we store mails to be sent, our main lockfile, ...
@@ -41,32 +42,42 @@
 rundir = top_workdir+'/epel-push-rundir'
 cachedir = rundir+'/mdcache'
 
-alldists = [ '5', '4' ] # also the order in build reports
+alldists = [ '5', 'testing/5', '4', 'testing/4' ] # also the order in build reports
 
 frozendists = []
 
 archdict = { 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386']
+            'testing/4':['ppc','x86_64', 'i386'],
+            'testing/5':['ppc','x86_64', 'i386']
             }
 
-multilibdists = [ '5', '4' ]
+multilibdists = [ '5', 'testing/5', '4', 'testing/4' ]
 
 # map: dist -> target arch -> list of pkg name regexp patterns
 # We don't check virtual package names, unless it's a virtual -devel pkg.
 # black-list takes precedence over white-list
-multiblacklists = { '5' : { 'x86_64' : [ 'gnustep-make', 'nagios*'] },
-               '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios*'] },
+multiblacklists = {
+    '5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    '4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
+    'testing/5' : { 'x86_64' : [ 'gnustep-make', 'nagios.*'] },
+    'testing/4' : { 'x86_64' : [ 'ghex', 'graphviz', 'libgnomeuimm26', 'nagios.*'] },
                }
+
 multiwhitelists = { 
-               '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
-               '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    '4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/5' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
+    'testing/4' : { 'x86_64' : [ '.*-devel', 'wine', 'wine-arts', 'wine-devel' ] },
                }
 
 # packages to exclude from being pruned: dist => Python regexp list
-repoprune_keepdict = {'3': ["-kmod$","amaya","gnome-vfsmm26","libgnomemm26","libgnomeuimm26","xtide","wxGTK"],
+repoprune_keepdict = {
                       '4': ["-kmod$"],
                       '5': ["-kmod$"],
+                      'testing/4': ["-kmod$"],
+                      'testing/5': ["-kmod$"],
                       }
 
 # repository symlinks to remove/create since they confuse createrepo
@@ -76,8 +87,8 @@
 comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
 comps_up_pass2 = 'make -f Makefile'
 comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
-comps_map = { '5' : 'comps-el5.xml',
-              '4' : 'comps-el4.xml',
+comps_map = { 'testing/5' : 'comps-el5.xml',
+              'testing/4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}
@@ -94,13 +105,13 @@
               }
 
 # For RepoSupport.py features.
-testrepos = { '4' : [],
-              '5' : [],
-              'development' : []
+testrepos = { '4' : ['fedora-epel-testing'],
+              '5' : ['fedora-epel-testing']
               }
 
 # For RepoSupport.py features.
-reponames = { 'fedora-epel' : 'Fedora EPEL'
+reponames = { 'fedora-epel' : 'Fedora EPEL',
+              'fedora-epel-testing' : 'Fedora EPEL Test Updates'
               }
 
 # For RepoSupport.py features.



From fedora-extras-commits at redhat.com  Thu Sep  6 06:41:58 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 02:41:58 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.8,1.9
Message-ID: <200709060641.l866fwcd027110@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27088

Modified Files:
	Config_EPEL.py 
Log Message:
fix config



Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Config_EPEL.py	6 Sep 2007 06:28:54 -0000	1.8
+++ Config_EPEL.py	6 Sep 2007 06:41:56 -0000	1.9
@@ -48,7 +48,7 @@
 
 archdict = { 
             '4':['ppc','x86_64', 'i386'],
-            '5':['ppc','x86_64', 'i386']
+            '5':['ppc','x86_64', 'i386'],
             'testing/4':['ppc','x86_64', 'i386'],
             'testing/5':['ppc','x86_64', 'i386']
             }
@@ -84,11 +84,13 @@
 repobuild_linkdict = {}
 
 # comps.xml updating and installation
-comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
+comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedoraproject.org:/cvs/extras update'
 comps_up_pass2 = 'make -f Makefile'
 comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
 comps_map = { 'testing/5' : 'comps-el5.xml',
+              '5' : 'comps-el5.xml',
               'testing/4' : 'comps-el4.xml',
+              '4' : 'comps-el4.xml',
               }
 
 diversion_dict = {}



From fedora-extras-commits at redhat.com  Thu Sep  6 07:14:32 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu,  6 Sep 2007 03:14:32 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.3,1.4
Message-ID: <200709060714.l867EWh5001076@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1053

Modified Files:
	List.py 
Log Message:
testing is in the dist version not testing/ dir



Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- List.py	27 Feb 2007 23:11:02 -0000	1.3
+++ List.py	6 Sep 2007 07:14:30 -0000	1.4
@@ -26,6 +26,8 @@
         dists = cfg.alldists
     
     for dist in dists:
+        if dist.startswith('testing/'):
+            dist = dist.replace('testing/', '')
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
         print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)



From fedora-extras-commits at redhat.com  Thu Sep  6 07:32:36 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 6 Sep 2007 03:32:36 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.9, 1.10 im-chooser.spec, 1.17, 
	1.18 sources, 1.8, 1.9
Message-ID: <200709060732.l867WaHP001438@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Jul 2007 00:21:29 -0000	1.9
+++ .cvsignore	6 Sep 2007 07:32:03 -0000	1.10
@@ -9,3 +9,4 @@
 im-chooser-0.3.4.tar.gz
 im-chooser-0.4.0.tar.gz
 im-chooser-0.4.1.tar.gz
+im-chooser-0.5.0.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- im-chooser.spec	8 Aug 2007 12:25:24 -0000	1.17
+++ im-chooser.spec	6 Sep 2007 07:32:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		im-chooser
-Version:	0.4.1
-Release:	3%{?dist}
+Version:	0.5.0
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
+- New upstream release.
+
 * Wed Aug  8 2007 Akira TAGOH <tagoh at redhat.com>
 - Update License tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Jul 2007 00:21:29 -0000	1.8
+++ sources	6 Sep 2007 07:32:04 -0000	1.9
@@ -1 +1 @@
-24173c61117247138d63977b1d26841b  im-chooser-0.4.1.tar.gz
+4dfee80e78c97bedcfbb9fcc8e3df977  im-chooser-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 07:36:22 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 6 Sep 2007 03:36:22 -0400
Subject: rpms/system-config-network/F-7 .cvsignore, 1.20, 1.21 sources, 1.22,
	1.23 system-config-network.spec, 1.28, 1.29
Message-ID: <200709060736.l867aMKc001672@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1645

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
corrected version mess with FC6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	22 Aug 2007 10:39:44 -0000	1.20
+++ .cvsignore	6 Sep 2007 07:35:49 -0000	1.21
@@ -1 +1 @@
-system-config-network-1.3.95.2.tar.gz
+system-config-network-1.3.96.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Aug 2007 10:39:44 -0000	1.22
+++ sources	6 Sep 2007 07:35:49 -0000	1.23
@@ -1 +1 @@
-70f208421f7fde2db6235de63f35e93b  system-config-network-1.3.95.2.tar.gz
+80d28c1e3e9404fe3e14c1b0b1480aae  system-config-network-1.3.96.2.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-7/system-config-network.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- system-config-network.spec	22 Aug 2007 10:39:44 -0000	1.28
+++ system-config-network.spec	6 Sep 2007 07:35:49 -0000	1.29
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.3.95.2
+Version: 1.3.96.2
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
@@ -95,7 +95,7 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Thu Aug 21 2007 Harald Hoyer <harald at redhat.com> - 1.3.95.2-1
+* Thu Aug 21 2007 Harald Hoyer <harald at redhat.com> - 1.3.96.2-1
 - translation update (bug #234705, #246469)
 - fixed #221289
 - rhbz #211980, rhbz #213181



From fedora-extras-commits at redhat.com  Thu Sep  6 08:06:48 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 04:06:48 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.133, 1.134 sources, 1.248,
	1.249
Message-ID: <200709060806.l8686mNm008787@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8722

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- .cvsignore	1 Sep 2007 13:48:59 -0000	1.133
+++ .cvsignore	6 Sep 2007 08:06:15 -0000	1.134
@@ -4,4 +4,4 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
-OOG680_m3.tar.bz2
+OOG680_m4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- sources	5 Sep 2007 08:33:11 -0000	1.248
+++ sources	6 Sep 2007 08:06:15 -0000	1.249
@@ -4,4 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-5b759a306c3ecd9284fdf6ba8e31388a  OOG680_m3.tar.bz2
+913fa35cd89e620a2b6ac9315c632721  OOG680_m4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 08:11:08 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 04:11:08 -0400
Subject: rpms/bind/devel bind-9.5-pool_badfree.patch, NONE, 1.1 bind.spec,
	1.213, 1.214
Message-ID: <200709060811.l868B8HO009043@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8889

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-pool_badfree.patch 
Log Message:
- fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
  tmraz redhat com)


bind-9.5-pool_badfree.patch:

--- NEW FILE bind-9.5-pool_badfree.patch ---
Written-by: Tomas Mraz <tmraz at redhat.com>
Reviewed-by: Adam Tkac <atkac at redhat.com>

diff -up bind-9.5.0a6/lib/dns/resolver.c.badfree bind-9.5.0a6/lib/dns/resolver.c
--- bind-9.5.0a6/lib/dns/resolver.c.badfree	2007-06-19 01:47:41.000000000 +0200
+++ bind-9.5.0a6/lib/dns/resolver.c	2007-09-05 16:20:21.000000000 +0200
@@ -7455,17 +7455,17 @@ dns_resolver_createdispatchpool(dns_reso
 	return (result);
 
   cleanup:
-	for (i = 0; i < ndisps; i++) {
-		if (res->dispatchv4pool[i] != NULL)
-			dns_dispatch_detach(&res->dispatchv4pool[i]);
-		if (res->dispatchv6pool[i] != NULL)
-			dns_dispatch_detach(&res->dispatchv6pool[i]);
-	}
 	if (res->dispatchv4pool != NULL) {
+		for (i = 0; i < ndisps; i++)
+			if (res->dispatchv4pool[i] != NULL)
+				dns_dispatch_detach(&res->dispatchv4pool[i]);
 		isc_mem_put(res->mctx, res->dispatchv4pool,
 			    sizeof(dns_dispatch_t *) * ndisps);
 	}
 	if (res->dispatchv6pool != NULL) {
+		for (i = 0; i < ndisps; i++)
+			if (res->dispatchv6pool[i] != NULL)
+				dns_dispatch_detach(&res->dispatchv6pool[i]);
 		isc_mem_put(res->mctx, res->dispatchv6pool,
 			    sizeof(dns_dispatch_t *) * ndisps);
 	}


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- bind.spec	5 Sep 2007 09:56:24 -0000	1.213
+++ bind.spec	6 Sep 2007 08:10:34 -0000	1.214
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.3.%{RELEASEVER}%{?dist}
+Release: 	11.9.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,7 @@
 Patch75:	bind-9.5-update.patch
 Patch76:	bind-9.5-2119_revert.patch
 Patch77:	bind-9.5-fix_h_errno.patch
+Patch78:	bind-9.5-pool_badfree.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -250,6 +251,7 @@
 %patch75 -p1 -b .update
 %patch76 -p1 -b .2119
 %patch77 -p1 -b .errno
+%patch78 -p1 -b .badfree
 :;
 
 
@@ -646,6 +648,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.9.a6
+- fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
+  tmraz redhat com)
+
 * Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.3.a6
 - initscript failure message is now printed correctly (#277981,
   Quentin Armitage (quentin armitage org uk) )



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:12 -0400
Subject: rpms/wqy-bitmap-fonts/F-7 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868ECtm009271@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/F-7

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/F-7/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	21 May 2007 21:57:56 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:39 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:15 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:15 -0400
Subject: rpms/wqy-bitmap-fonts/FC-5 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868EF06009274@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/FC-5

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-5/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	22 May 2007 01:07:17 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:42 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:19 -0400
Subject: rpms/wqy-bitmap-fonts/FC-6 wqy-bitmap-fonts.spec,1.1,1.2
Message-ID: <200709060814.l868EJPE009277@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/FC-6

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-6/wqy-bitmap-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wqy-bitmap-fonts.spec	21 May 2007 20:53:46 -0000	1.1
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:46 -0000	1.2
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:14:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 04:14:22 -0400
Subject: rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.5,1.6
Message-ID: <200709060814.l868EMXD009280@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9178/devel

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
update license field from GPL to GPLv2



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wqy-bitmap-fonts.spec	28 Aug 2007 03:15:14 -0000	1.5
+++ wqy-bitmap-fonts.spec	6 Sep 2007 08:13:49 -0000	1.6
@@ -8,7 +8,7 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 8%{?dist}
-License: GPL
+License: GPLv2
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:51 -0400
Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868Jpox009422@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/devel

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:28 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:19 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:54 -0400
Subject: rpms/perl-Module-Refresh/F-7 perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868JsE8009426@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/F-7

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/F-7/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:28 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:21 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:19:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 04:19:57 -0400
Subject: rpms/perl-Module-Refresh/FC-6 perl-Module-Refresh.spec,1.8,1.9
Message-ID: <200709060819.l868Jv7u009429@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Module-Refresh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9347/FC-6

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
- Update license tag.



Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/FC-6/perl-Module-Refresh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Refresh.spec	8 May 2007 07:48:33 -0000	1.8
+++ perl-Module-Refresh.spec	6 Sep 2007 08:19:24 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Module-Refresh
 Version: 	0.13
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Refresh %INC files when updated on disk
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Module-Refresh/
 Source0: 	http://www.cpan.org/modules/by-module/Module/Module-Refresh-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-2
+- Update license tag.
+
 * Tue May 08 2007 Ralf Cors??pius <<rc040203 at freenet.de> - 0.13-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 08:27:02 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 04:27:02 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, NONE,
	1.1 openoffice.org.spec, 1.1297, 1.1298
Message-ID: <200709060827.l868R2xX009625@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch 
Log Message:
next version

openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:

--- NEW FILE openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch ---
Index: ./source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
retrieving revision 1.10
diff -u -r1.10 EnhancedCustomShapeFunctionParser.cxx
--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	24 Oct 2006 13:42:15 -0000	1.10
+++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx	6 Sep 2007 08:10:27 -0000
@@ -1201,7 +1201,7 @@
     const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
             ::boost::spirit::parse( aStart,
                                     aEnd,
-                                    aExpressionGrammer,
+                                    aExpressionGrammer >> ::boost::spirit::end_p,
                                     ::boost::spirit::space_p ) );
     OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -r1.1297 -r1.1298
--- openoffice.org.spec	5 Sep 2007 08:38:13 -0000	1.1297
+++ openoffice.org.spec	6 Sep 2007 08:26:29 -0000	1.1298
@@ -1,6 +1,6 @@
 %define oootag OOG680
-%define ooomilestone 3
-%define rh_rpm_release 2
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -142,6 +142,7 @@
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1078,6 +1079,7 @@
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
+%patch63 -p1 -b .ooo77672.boost.use.end_p.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1109,12 +1111,17 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-#something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
-#the frame from tools->bibliography not closable wrt the mutex in
-#LoadEnvListener so use >= 128
-export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
-#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
-export CXX="$CXX -fno-threadsafe-statics"
+export ARCH_FLAGS
+
+##very not happy with gcc at the moment wrt launching the bibliography, 
+##let's go conservative for a bit
+##something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+##the frame from tools->bibliography not closable wrt the mutex in
+##LoadEnvListener so use >= 128, but want 64
+#export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
+##add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+#export CXX="$CXX -fno-threadsafe-statics"
+
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
@@ -1152,26 +1159,27 @@
 export GNOME_MIME_THEME=hicolor
 ./create_tree.sh
 
-#start of jakub based suggestion on prelink optimization 
-cd ../../../../desktop/source/app
-%if ! %{linkopt}
-sed -i -e "s/OBJ/SLO/" makefile.mk
-dmake
-%endif
-cd ../../util
-%if ! %{linkopt}
-%if %{stlport_abi_lockin}
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
-%else
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
-%endif
-%endif
-$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-#end of jakub based suggestion on prelink optimization
+#disable for now, breaks icedtea
+##start of jakub based suggestion on prelink optimization 
+#cd ../../../../desktop/source/app
+#%if ! %{linkopt}
+#sed -i -e "s/OBJ/SLO/" makefile.mk
+#dmake
+#%endif
+#cd ../../util
+#%if ! %{linkopt}
+#%if %{stlport_abi_lockin}
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
+#%else
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
+#%endif
+#%endif
+#$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+##end of jakub based suggestion on prelink optimization
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 
 %install
@@ -1191,14 +1199,15 @@
     echo - ---dump log end---
     dmake openoffice_en-US
 fi
-%if ! %{linkopt}
-cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-%endif
-cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
+#disable for now, breaks icedtea
+#%if ! %{linkopt}
+#cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
+#%endif
+#cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
 chmod -R +w $RPM_BUILD_ROOT/%{instdir}
 %if %{langpacks}
 dmake ooolanguagepack
@@ -2358,7 +2367,7 @@
 %{instdir}/program/resource/date680en-US.res
 %{instdir}/program/resource/sc680en-US.res
 %{instdir}/program/scalc
-%{instdir}/program/scalc.bin
+#%{instdir}/program/scalc.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2411,7 +2420,7 @@
 %{instdir}/help/en/sdraw.*
 %dir %{instdir}/program
 %{instdir}/program/sdraw
-%{instdir}/program/sdraw.bin
+#%{instdir}/program/sdraw.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2478,7 +2487,7 @@
 %{instdir}/program/libswui680*.so
 %{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
-%{instdir}/program/swriter.bin
+#%{instdir}/program/swriter.bin
 %dir %{instdir}/program/classes
 %{instdir}/program/classes/writer2latex.jar
 %dir %{instdir}/share
@@ -2547,7 +2556,7 @@
 %{instdir}/program/libanimcore.so
 %{instdir}/program/libplaceware*.so
 %{instdir}/program/simpress
-%{instdir}/program/simpress.bin
+#%{instdir}/program/simpress.bin
 %dir %{instdir}/share
 %dir %{instdir}/share/config
 %{instdir}/share/config/soffice.cfg
@@ -2761,6 +2770,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
+- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
+  makes drawing shapes work properly again
+- next version
+- disable custom launchers, it breaks icedtea for some reason I haven't time to
+  figure out
+
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu
 - rebuild against icedtea



From fedora-extras-commits at redhat.com  Thu Sep  6 08:59:11 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal))
Date: Thu, 6 Sep 2007 04:59:11 -0400
Subject: rpms/resapplet/devel resapplet.desktop.in, 1.1, 1.2 resapplet.spec, 
	1.4, 1.5
Message-ID: <200709060859.l868xBZY011382@cvs-int.fedora.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/resapplet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11362

Modified Files:
	resapplet.desktop.in resapplet.spec 
Log Message:
- resapplet.desktop.in; s/SystemTools/System/, to conform with
  http://standards.freedesktop.org/menu-spec/latest/apa.html
- Fix License: tag, add Url:


Index: resapplet.desktop.in
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.desktop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resapplet.desktop.in	20 Dec 2006 10:10:02 -0000	1.1
+++ resapplet.desktop.in	6 Sep 2007 08:58:39 -0000	1.2
@@ -6,6 +6,6 @@
 Terminal=false
 Type=Application
 TryExec=resapplet
-Categories=GNOME;Application;SystemTools;X-Ximian-System-Toplevel;
+Categories=GNOME;Application;System;X-Ximian-System-Toplevel;
 StartupNotify=false
 Encoding=UTF-8


Index: resapplet.spec
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- resapplet.spec	22 Dec 2006 21:22:48 -0000	1.4
+++ resapplet.spec	6 Sep 2007 08:58:39 -0000	1.5
@@ -2,7 +2,9 @@
 Name:		resapplet
 Version:	0.1.1
 Release:	5%{?dist}
-License:	GPL
+License:	GPLv2+ and GPLv2
+# This is the best we have to silence rpmlint:
+URL:		http://svn.gnome.org/viewcvs/resapplet/
 Group:		User Interface/Desktops
 # Source obtained from OpenSuSE
 Source:		resapplet-%{version}.tar.bz2
@@ -31,7 +33,7 @@
 %setup -q -a 1
 cp -a %{S:2} . ; rm resapplet.desktop
 if %version != 0.1.1 ; then
-echo "Please remove Source2 and Source3 and verify, that translations work."
+echo "Please remove Source2 and Source3 and verify that translations work."
 exit 1
 fi
 %patch0 -p0
@@ -60,7 +62,6 @@
 
 desktop-file-install --vendor fedora --delete-original		\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-	--add-category System					\
 	--add-category Utility					\
 	--add-category X-Red-Hat-Base				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/resapplet.desktop
@@ -93,6 +94,15 @@
 %{_datadir}/icons/gnome/48x48/apps/resapplet.png
 
 %changelog
+* Thu Sep  6 2007 Stepan Kasal <skasal at redhat.com> 0.1.1-6
+- resapplet.desktop.in; s/SystemTools/System/, to conform with
+  http://standards.freedesktop.org/menu-spec/latest/apa.html
+- Fix License: tag, add Url:
+
+* Fri Dec 22 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-5
+- Call automake with "--add-missing".
+- Call aclocal before intltoolize.
+
 * Tue Dec 12 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-4
 - remove suse icons
 - add scriplets 
@@ -104,4 +114,4 @@
 - spec file changes
 
 * Wed Dec  6 2006 Radek Vok??l <rvokal at redhat.com> 0.1.1-1
-- initial Fedora built
+- initial Fedora build



From fedora-extras-commits at redhat.com  Thu Sep  6 09:00:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?= (kasal))
Date: Thu, 6 Sep 2007 05:00:10 -0400
Subject: rpms/resapplet/devel resapplet.spec,1.5,1.6
Message-ID: <200709060900.l8690AbS011410@cvs-int.fedora.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/resapplet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11388

Modified Files:
	resapplet.spec 
Log Message:
forgot release++


Index: resapplet.spec
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/resapplet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- resapplet.spec	6 Sep 2007 08:58:39 -0000	1.5
+++ resapplet.spec	6 Sep 2007 08:59:37 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Resolution Switching Applet
 Name:		resapplet
 Version:	0.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+ and GPLv2
 # This is the best we have to silence rpmlint:
 URL:		http://svn.gnome.org/viewcvs/resapplet/



From fedora-extras-commits at redhat.com  Thu Sep  6 09:04:16 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 05:04:16 -0400
Subject: rpms/lftp/devel lftp.spec,1.59,1.60
Message-ID: <200709060904.l8694GSZ017383@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358

Modified Files:
	lftp.spec 
Log Message:
rebuild


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- lftp.spec	12 Apr 2007 08:01:49 -0000	1.59
+++ lftp.spec	6 Sep 2007 09:03:42 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.10
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
+- rebuild
+
 * Wed Apr 11 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-3
 - Correct mistake removing devel package & calling chkconfig
 - Resolves #235436



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:35 -0400
Subject: rpms/perl-Test-ClassAPI/devel perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695ZoK017579@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/devel

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/devel/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:02:28 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:02 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:41 -0400
Subject: rpms/perl-Test-ClassAPI/F-7 perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695fQ3017586@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/F-7

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/F-7/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:02:28 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:06 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:05:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:05:45 -0400
Subject: rpms/perl-Test-ClassAPI/FC-6 perl-Test-ClassAPI.spec,1.6,1.7
Message-ID: <200709060905.l8695jkf017589@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-ClassAPI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17493/FC-6

Modified Files:
	perl-Test-ClassAPI.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
- Update license tag.



Index: perl-Test-ClassAPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-ClassAPI/FC-6/perl-Test-ClassAPI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-ClassAPI.spec	12 Mar 2007 05:04:08 -0000	1.6
+++ perl-Test-ClassAPI.spec	6 Sep 2007 09:05:11 -0000	1.7
@@ -1,8 +1,8 @@
 Name: 		perl-Test-ClassAPI
 Version: 	1.04
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Provides basic first-pass API testing for large class trees
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-ClassAPI/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-ClassAPI-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-2
+- Update license tag.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.04-1
 - Upstream update.
 - BR: perl(ExtUtils::MakeMaker).



From fedora-extras-commits at redhat.com  Thu Sep  6 09:06:24 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 6 Sep 2007 05:06:24 -0400
Subject: rpms/glibmm24/devel glibmm.spec,1.26,1.27
Message-ID: <200709060906.l8696OSw017733@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17595

Modified Files:
	glibmm.spec 
Log Message:
Removed Perl code autogeneration tools (#278191)


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- glibmm.spec	22 Aug 2007 11:17:56 -0000	1.26
+++ glibmm.spec	6 Sep 2007 09:05:52 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           glibmm24
 Version:        2.13.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
-BuildRequires:  glib2-devel >= 2.9.0
+BuildRequires:  glib2-devel >= 2.13.0
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@@ -42,6 +42,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf tools
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation, put everything under gtk-doc
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-3
+- Removed Perl code autogeneration tools (#278191)
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-2
 - License tag update
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:06:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 05:06:32 -0400
Subject: rpms/xinetd/devel xinetd.spec, 1.48, 1.49 filter-requires-xinetd.sh,
	1.1, NONE xinetd-inetdconvert, 1.3, NONE
Message-ID: <200709060906.l8696Wv0017764@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17616

Modified Files:
	xinetd.spec 
Removed Files:
	filter-requires-xinetd.sh xinetd-inetdconvert 
Log Message:
removed inetdconvert script, nobody is using inetd
Resolves: 275511


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xinetd.spec	22 Aug 2007 07:21:10 -0000	1.48
+++ xinetd.spec	6 Sep 2007 09:05:59 -0000	1.49
@@ -1,6 +1,3 @@
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE99}
-
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
@@ -11,9 +8,7 @@
 URL: http://www.xinetd.org
 Source: http://www.xinetd.org/xinetd-%{version}.tar.gz
 Source1: xinetd.init
-Source2: xinetd-inetdconvert
 Source3: xinetd.sysconf
-Source99: filter-requires-xinetd.sh
 Patch0: xinetd-2.3.11-pie.patch
 Patch1: xinetd-2.3.12-tcp_rpc.patch
 Patch2: xinetd-2.3.14-label.patch
@@ -66,7 +61,6 @@
 install -m 644 contrib/xinetd.conf $RPM_BUILD_ROOT/etc
 install -m 644 contrib/xinetd.d/* $RPM_BUILD_ROOT/etc/xinetd.d
 install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/xinetd
-install -m 755 %SOURCE2 $RPM_BUILD_ROOT/usr/sbin/inetdconvert
 
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/itox*
 rm -f $RPM_BUILD_ROOT/usr/sbin/itox
@@ -105,10 +99,12 @@
 %config /etc/rc.d/init.d/xinetd
 %config(noreplace) /etc/xinetd.d/*
 /usr/sbin/xinetd
-/usr/sbin/inetdconvert
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-14
+- removed inetdconvert script, nobody is using inetd
+
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> - 2:2.3.14-13
 - updated license field
 


--- filter-requires-xinetd.sh DELETED ---


--- xinetd-inetdconvert DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 09:08:32 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 05:08:32 -0400
Subject: rpms/mgetty/devel mgetty.spec,1.40,1.41
Message-ID: <200709060908.l8698Wv0017903@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/mgetty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17838

Modified Files:
	mgetty.spec 
Log Message:
rebulid


Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mgetty.spec	23 Jan 2007 12:02:51 -0000	1.40
+++ mgetty.spec	6 Sep 2007 09:08:00 -0000	1.41
@@ -5,7 +5,7 @@
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
 Version: 1.1.33
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
 Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
 Source2: logrotate.mgetty
@@ -342,6 +342,9 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 1.1.33-11
+- rebuild
+
 * Tue Jan 23 2007 Maros Barabas <mbarabas at redhat.com> - 1.1.33-10
 - fixed install-info scriptlets (post,preun)
 - Resolves #223710



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:49 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 6 Sep 2007 05:14:49 -0400
Subject: rpms/gnuplot/devel gnuplot-4.2.0-refers_to.patch, NONE,
	1.1 gnuplot.spec, 1.41, 1.42 gnuplot-4.0.0-refers_to.patch, 1.1, NONE
Message-ID: <200709060914.l869EnMv018214@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18094

Modified Files:
	gnuplot.spec 
Added Files:
	gnuplot-4.2.0-refers_to.patch 
Removed Files:
	gnuplot-4.0.0-refers_to.patch 
Log Message:
- change font paths, change documenatation


gnuplot-4.2.0-refers_to.patch:

--- NEW FILE gnuplot-4.2.0-refers_to.patch ---
--- gnuplot-4.2.0/src/variable.c.refto	2006-06-27 04:36:30.000000000 +0200
+++ gnuplot-4.2.0/src/variable.c	2007-09-06 10:02:54.000000000 +0200
@@ -263,8 +263,9 @@ static const struct path_table fontpath_
     { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
 #endif
     /* Linux paths */
-    { "/usr/X11R6/lib/X11/fonts/Type1" },
-    { "/usr/X11R6/lib/X11/fonts/truetype" },
+    { "/usr/share/fonts/default/ghostscript/" },
+    { "/usr/share/fonts/default/Type1/" },
+    { "/usr/share/fonts/bitstream-vera/" },
     /* HP-UX */
     { "/usr/lib/X11/fonts!"},
     /* Ghostscript */


Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnuplot.spec	29 Aug 2007 13:00:27 -0000	1.41
+++ gnuplot.spec	6 Sep 2007 09:14:15 -0000	1.42
@@ -5,13 +5,13 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
-Patch1: gnuplot-4.0.0-refers_to.patch
+Patch1: gnuplot-4.2.0-refers_to.patch
 Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
@@ -53,6 +53,7 @@
 make html
 cd psdoc
 make 
+make ps_symbols.ps ps_fontfile_doc.pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,8 +76,8 @@
 %files
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
-#docs/gnuplot.html 
-%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.gpi tutorial/tutorial.dvi demo
+%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
+%doc docs/psdoc/ps_fontfile_doc.pdf
 %dir %{_libexecdir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -97,12 +98,13 @@
 %{_datadir}/emacs/site-lisp/gnuplot-gui.elc
 %{_datadir}/emacs/site-lisp/gnuplot.el
 %{_datadir}/emacs/site-lisp/gnuplot.elc
-#%{_datadir}/emacs/site-lisp/info-look.20.2.el
-#%{_datadir}/emacs/site-lisp/info-look.20.3.el
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
 
 %changelog
+* Thu Sep  6 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-4
+- change font paths, change documenatation
+
 * Tue Aug 28 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-3
 - Rebuild for selinux ppc32 issue.
 - Remove obsolete file


--- gnuplot-4.0.0-refers_to.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:52 -0400
Subject: rpms/perl-Params-Validate/devel perl-Params-Validate.spec, 1.15,
	1.16
Message-ID: <200709060914.l869EqIJ018217@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/devel

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Params-Validate.spec	22 Aug 2007 04:28:28 -0000	1.15
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:19 -0000	1.16
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	2%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
 * Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:56 -0400
Subject: rpms/perl-Params-Validate/F-7 perl-Params-Validate.spec,1.14,1.15
Message-ID: <200709060914.l869EuaC018220@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/F-7

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/F-7/perl-Params-Validate.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Validate.spec	12 Mar 2007 04:54:27 -0000	1.14
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:22 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	1%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
+* Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
+- Mass rebuild.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-1
 - BR: perl(ExtUtils::MakeMaker).
 - Upstream update.



From fedora-extras-commits at redhat.com  Thu Sep  6 09:14:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:14:59 -0400
Subject: rpms/perl-Params-Validate/FC-6 perl-Params-Validate.spec,1.13,1.14
Message-ID: <200709060914.l869ExxN018228@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Params-Validate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18149/FC-6

Modified Files:
	perl-Params-Validate.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
- Update license tag.



Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Params-Validate/FC-6/perl-Params-Validate.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Params-Validate.spec	12 Mar 2007 04:56:24 -0000	1.13
+++ perl-Params-Validate.spec	6 Sep 2007 09:14:26 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
 Version: 	0.88
-Release: 	1%{?dist}
-License: 	GPL or Artistic
+Release: 	3%{?dist}
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
@@ -55,6 +55,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-3
+- Update license tag.
+
+* Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-2
+- Mass rebuild.
+
 * Mon Mar 12 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.88-1
 - BR: perl(ExtUtils::MakeMaker).
 - Upstream update.



From fedora-extras-commits at redhat.com  Thu Sep  6 09:39:11 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 05:39:11 -0400
Subject: rpms/openldap/devel openldap.spec,1.90,1.91
Message-ID: <200709060939.l869dBH1018717@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18697

Modified Files:
	openldap.spec 
Log Message:
added images to the guide.html
Resolves: #273581


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- openldap.spec	22 Aug 2007 07:17:45 -0000	1.90
+++ openldap.spec	6 Sep 2007 09:38:38 -0000	1.91
@@ -615,6 +615,7 @@
 %doc db-%{db_version}/LICENSE.bdb-backend
 %doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html
 %doc openldap-%{version_23}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
+%doc openldap-%{version_23}/doc/guide/admin/*.gif
 %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
@@ -670,6 +671,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-4%{?dist}
+- added images to the guide.html (#273581)
+
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-3%{?dist}
 - just rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:34 -0400
Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869hYFj018867@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/devel

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:23:07 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:02 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:23:07 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:02 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:23:07 -0000	1.7
+++ sources	6 Sep 2007 09:43:02 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:37 -0400
Subject: rpms/perl-DBIx-DBSchema/F-7 .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869hbWx018877@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/F-7

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:31:28 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:04 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:31:28 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:04 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:31:28 -0000	1.7
+++ sources	6 Sep 2007 09:43:04 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 09:43:40 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 05:43:40 -0400
Subject: rpms/perl-DBIx-DBSchema/FC-6 .cvsignore, 1.7,
	1.8 perl-DBIx-DBSchema.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709060943.l869heBw018882@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-6

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
- Upstream update.
- Update license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 11:47:20 -0000	1.7
+++ .cvsignore	6 Sep 2007 09:43:07 -0000	1.8
@@ -1 +1 @@
-DBIx-DBSchema-0.33.tar.gz
+DBIx-DBSchema-0.34.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/perl-DBIx-DBSchema.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBIx-DBSchema.spec	2 Jul 2007 11:47:20 -0000	1.9
+++ perl-DBIx-DBSchema.spec	6 Sep 2007 09:43:07 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.33
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://www.cpan.org/modules/by-module/DBIx/DBIx-DBSchema-%{version}.tar.gz
 Patch0:         DBIx-DBSchema-0.28-version.diff
@@ -16,7 +16,7 @@
 BuildRequires:	perl(DBI)
 BuildRequires:	perl(FreezeThaw)
 
-# Required for by the tests
+# Required by the tests
 BuildRequires:	perl(DBD::Pg) >= 1.32
 
 %description
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.34-1
+- Upstream update.
+- Update license tag.
+
 * Mon Jul 02 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 11:47:20 -0000	1.7
+++ sources	6 Sep 2007 09:43:07 -0000	1.8
@@ -1 +1 @@
-27e27112d88a65daf4d4dd9d1787284e  DBIx-DBSchema-0.33.tar.gz
+62f07d6e7554d1bdbb16b2af825d421a  DBIx-DBSchema-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 10:20:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Thu, 6 Sep 2007 06:20:00 -0400
Subject: rpms/openldap/devel .cvsignore, 1.33, 1.34 openldap.spec, 1.91,
	1.92 sources, 1.33, 1.34 openldap-2.3.37-fortify-open.patch, 1.1, NONE
Message-ID: <200709061020.l86AK0Qm025426@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25397

Modified Files:
	.cvsignore openldap.spec sources 
Removed Files:
	openldap-2.3.37-fortify-open.patch 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	7 Aug 2007 07:11:51 -0000	1.33
+++ .cvsignore	6 Sep 2007 10:19:28 -0000	1.34
@@ -8,3 +8,4 @@
 openldap-2.3.34.tgz
 openldap-2.3.37.tgz
 db-4.6.18.tar.gz
+openldap-2.3.38.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- openldap.spec	6 Sep 2007 09:38:38 -0000	1.91
+++ openldap.spec	6 Sep 2007 10:19:28 -0000	1.92
@@ -2,7 +2,7 @@
 %define db_version 4.6.18
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.37
+%define version_23 2.3.38
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -37,7 +37,6 @@
 Patch7: openldap-2.3.34-quiet-slaptest.patch
 Patch8: openldap-2.3.34-pthread.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
-Patch10: openldap-2.3.37-fortify-open.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -174,7 +173,6 @@
 %patch7 -p1 -b .quiet-slaptest
 %patch8 -p1 -b .pthread
 %patch9 -p1 -b .smbk5pwd
-%patch10 -p1 -b .fortify-open
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -671,7 +669,8 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
-* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-4%{?dist}
+* Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-1%{?dist}
+- new upstream version
 - added images to the guide.html (#273581)
 
 * Wed Aug 22 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-3%{?dist}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	7 Aug 2007 07:08:43 -0000	1.33
+++ sources	6 Sep 2007 10:19:28 -0000	1.34
@@ -1,4 +1,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
-f5c6cec07469ce8f64710eba3aeb58f8  openldap-2.3.37.tgz
 95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+f83b0f2b62f6a06dc1ca83a1f0426efd  openldap-2.3.38.tgz


--- openldap-2.3.37-fortify-open.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 10:54:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 06:54:52 -0400
Subject: rpms/perl-HTTP-Server-Simple-Mason/devel
	perl-HTTP-Server-Simple-Mason.spec, 1.4, 1.5
Message-ID: <200709061054.l86AsqWc026049@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26024

Modified Files:
	perl-HTTP-Server-Simple-Mason.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
- Update license tag.



Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple-Mason.spec	5 Sep 2006 10:00:10 -0000	1.4
+++ perl-HTTP-Server-Simple-Mason.spec	6 Sep 2007 10:54:14 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-HTTP-Server-Simple-Mason
 Version: 	0.09
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
 Source: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-%{version}.tar.gz
@@ -16,6 +16,7 @@
 BuildRequires:	perl(Hook::LexWrap)
 
 # Required by the tests
+BuildRequires:  perl(Test::More)
 BuildRequires: 	perl(Test::Pod) >= 1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
 
@@ -54,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 11:07:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 07:07:12 -0400
Subject: rpms/perl-HTTP-Server-Simple-Mason/F-7
	perl-HTTP-Server-Simple-Mason.spec, 1.4, 1.5
Message-ID: <200709061107.l86B7Cld032281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32256

Modified Files:
	perl-HTTP-Server-Simple-Mason.spec 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
- Update license tag.



Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-7/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple-Mason.spec	5 Sep 2006 10:00:10 -0000	1.4
+++ perl-HTTP-Server-Simple-Mason.spec	6 Sep 2007 11:06:39 -0000	1.5
@@ -1,8 +1,8 @@
 Name: 		perl-HTTP-Server-Simple-Mason
 Version: 	0.09
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
-License:	GPL or Artistic
+License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
 Source: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-%{version}.tar.gz
@@ -16,6 +16,7 @@
 BuildRequires:	perl(Hook::LexWrap)
 
 # Required by the tests
+BuildRequires:  perl(Test::More)
 BuildRequires: 	perl(Test::Pod) >= 1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
 
@@ -54,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-6
+- Update license tag.
+
 * Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-5
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 11:22:01 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 07:22:01 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, NONE,
	1.1 openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, 1.1,
	1.2 openoffice.org.spec, 1.1298, 1.1299
Message-ID: <200709061122.l86BM1vU032597@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32571

Modified Files:
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch 
Log Message:
add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch

openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch ---
Index: inc/com/sun/star/uno/Any.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Any.h,v
retrieving revision 1.12
diff -u -r1.12 Any.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Any.h	10 Jan 2006 15:52:55 -0000	1.12
+++ openoffice.org/cppu/inc/com/sun/star/uno/Any.h	6 Sep 2007 11:00:18 -0000
@@ -70,7 +70,7 @@
     return true if the any contains an assignable value (no data loss), e.g. the any contains a
     short and you >>= it into a long variable.
 */
-class Any : public uno_Any
+class CPPU_GCC_DLLPUBLIC_EXPORT Any : public uno_Any
 {
 public:
 	// these are here to force memory de/allocation to sal lib.
Index: inc/com/sun/star/uno/Type.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Type.h,v
retrieving revision 1.15
diff -u -r1.15 Type.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Type.h	9 Mar 2006 10:44:42 -0000	1.15
+++ openoffice.org/cppu/inc/com/sun/star/uno/Type.h	6 Sep 2007 11:00:18 -0000
@@ -79,7 +78,7 @@
 
     @see typelib_TypeDescriptionReference
 */
-class Type
+class CPPU_GCC_DLLPUBLIC_EXPORT Type
 {
 	/** the C typelib reference pointer
         @internal

openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:

Index: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch	6 Sep 2007 08:26:29 -0000	1.1
+++ openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch	6 Sep 2007 11:21:59 -0000	1.2
@@ -14,3 +14,28 @@
                                      ::boost::spirit::space_p ) );
      OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
  
+Index: source/engine/smilfunctionparser.cxx
+===================================================================
+RCS file: /cvs/graphics/slideshow/source/engine/smilfunctionparser.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 smilfunctionparser.cxx
+--- openoffice.org.orig/slideshow/source/engine/smilfunctionparser.cxx	17 Jul 2007 14:41:21 -0000	1.7
++++ openoffice.org/slideshow/source/engine/smilfunctionparser.cxx	6 Sep 2007 10:48:58 -0000
+@@ -579,7 +579,7 @@
+             const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
+                   ::boost::spirit::parse( aStart,
+                                           aEnd,
+-                                          aExpressionGrammer,
++                                          aExpressionGrammer >> ::boost::spirit::end_p,
+                                           ::boost::spirit::space_p ) );
+             OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+ 
+@@ -625,7 +625,7 @@
+             const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( 
+                   ::boost::spirit::parse( aStart,
+                                           aEnd,
+-                                          aExpressionGrammer,
++                                          aExpressionGrammer >> ::boost::spirit::end_p,
+                                           ::boost::spirit::space_p ) );
+             OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -r1.1298 -r1.1299
--- openoffice.org.spec	6 Sep 2007 08:26:29 -0000	1.1298
+++ openoffice.org.spec	6 Sep 2007 11:21:59 -0000	1.1299
@@ -143,6 +143,7 @@
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
+Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1080,6 +1081,7 @@
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
+%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl



From fedora-extras-commits at redhat.com  Thu Sep  6 11:26:29 2007
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Thu, 6 Sep 2007 07:26:29 -0400
Subject: rpms/libnjb/F-7 libnjb.rules, 1.1, 1.2 libnjb.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200709061126.l86BQTBn032641@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619

Modified Files:
	libnjb.rules libnjb.spec sources 
Log Message:
New upstream release, fix udev rules, add HAL FDI file.



Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.rules	25 Jan 2006 21:12:33 -0000	1.1
+++ libnjb.rules	6 Sep 2007 11:25:56 -0000	1.2
@@ -1,37 +1,76 @@
-# libnjb.rules a udev rules file for libnjb devices
-# created by Linus Walleij, ENJOY!
+# nomad.rules a udev rules file for NOMAD jukeboxes.
+# Put this file in /etc/udev/rules.d
+# Hacked a bit for Fedora along the lines of libsane rules.
 
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"
+ACTION!="add", GOTO="nomad_rules_end"
+ATTR{dev}!="?*", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_usb_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_usb_device_rules"
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
-SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 2
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4100", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 3
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4101", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4108", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen USB 2.0
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="410b", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen NX
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4109", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Xtra
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4110", SYMLINK+="libnjb-%k"
 # Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4111", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Touch
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411b", SYMLINK+="libnjb-%k"
 # Creative Zen (Zen Micro variant)
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411d", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Micro
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411e", SYMLINK+="libnjb-%k"
 # Second Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4126", SYMLINK+="libnjb-%k"
 # Dell Pocket DJ
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4127", SYMLINK+="libnjb-%k"
 # Creative Zen Sleek
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4136", SYMLINK+="libnjb-%k"
-# Third Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="412f", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_device_rules"
+
+# Creative Nomad Jukebox
+ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 2
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 3
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen USB 2.0
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen NX
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Xtra
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+# Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Touch
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+# Creative Zen (Zen Micro variant)
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Micro
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+# Second Generation Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+# Dell Pocket DJ
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+# Creative Zen Sleek
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
 
 LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libnjb.spec	28 Aug 2006 16:23:06 -0000	1.8
+++ libnjb.spec	6 Sep 2007 11:25:56 -0000	1.9
@@ -1,18 +1,9 @@
 # SPEC file for libnjb, primary target is the Fedora Extras
 # RPM repository.
-#
-# For testing a certain distribution, rely on macros that
-# you define in your ".rpmmacros" file. For example, for
-# test building a Fedora Extras package, define the following
-# two macros in .rpmmacros:
-#
-# %dist .fc5
-# %fedora 5
-#
 
 Name:		libnjb
-Version:	2.2.5
-Release:	3%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -76,6 +67,8 @@
 # Install device permissions
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -91,6 +84,7 @@
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -105,6 +99,12 @@
 
 
 %changelog
+* Wed Sep 5 2007 Linus Walleij <triad at df.lth.se> 2.2.6-1
+- Long overdue upstream release.
+- Shape up udev rules so they look like the libsane stuff.
+- Add HAL FDI file.
+* Fri Aug 17 2007 Linus Walleij <triad at df.lth.se> 2.2.5-4
+- Fixup libnjb udev rules to work with new udev and HAL.
 * Mon Aug 28 2006 Linus Walleij <triad at df.lth.se> 2.2.5-3
 - Rebuild for Fedora Extras 6.
 * Tue Feb 14 2006 Linus Walleij <triad at df.lth.se> 2.2.5-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jan 2006 21:17:38 -0000	1.6
+++ sources	6 Sep 2007 11:25:56 -0000	1.7
@@ -1 +1 @@
-f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz
+e1b3a89f6157c553ea46a78446429a0d  libnjb-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 11:28:49 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 07:28:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, NONE,
	1.1 openoffice.org.spec, 1.1299, 1.1300
Message-ID: <200709061128.l86BSnXs000312@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32706

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch 
Log Message:
add more warnings patches

openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch ---
Index: source/uno/treecontrolpeer.cxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.cxx,v
retrieving revision 1.4
diff -u -r1.4 treecontrolpeer.cxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.cxx	2 Jul 2007 09:29:44 -0000	1.4
+++ openoffice.org/svtools/source/uno/treecontrolpeer.cxx	6 Sep 2007 11:22:59 -0000
@@ -284,7 +284,7 @@
 
 // --------------------------------------------------------------------
 
-UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos /* = LIST_APPEND */ )
+UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos /* = LIST_APPEND */ )
 {
 	UnoTreeListEntry* pEntry = 0;
 	if( mpTreeImpl )
Index: source/uno/treecontrolpeer.hxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.hxx,v
retrieving revision 1.2
diff -u -r1.2 treecontrolpeer.hxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.hxx	27 Jun 2007 12:18:50 -0000	1.2
+++ openoffice.org/svtools/source/uno/treecontrolpeer.hxx	6 Sep 2007 11:22:59 -0000
@@ -138,7 +138,7 @@
 	void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
 	void addNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
 
-	UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos = LIST_APPEND );
+	UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos = LIST_APPEND );
 	bool updateEntry( UnoTreeListEntry* pEntry );
 
 	void updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -r1.1299 -r1.1300
--- openoffice.org.spec	6 Sep 2007 11:21:59 -0000	1.1299
+++ openoffice.org.spec	6 Sep 2007 11:28:16 -0000	1.1300
@@ -144,6 +144,7 @@
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
 Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
 Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1082,6 +1083,7 @@
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
 %patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2772,6 +2774,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.2
+- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
+
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
 - ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
   makes drawing shapes work properly again



From fedora-extras-commits at redhat.com  Thu Sep  6 11:36:45 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 07:36:45 -0400
Subject: rpms/bind/devel bind-9.5-_res_errno.patch, NONE, 1.1 bind.spec,
	1.214, 1.215 bind-9.5-2119_revert.patch, 1.1,
	NONE bind-9.5-fix_h_errno.patch, 1.1, NONE
Message-ID: <200709061136.l86BajCa000570@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-_res_errno.patch 
Removed Files:
	bind-9.5-2119_revert.patch bind-9.5-fix_h_errno.patch 
Log Message:
- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
  obsoleted by upstream bind-9.5-_res_errno.patch


bind-9.5-_res_errno.patch:

--- NEW FILE bind-9.5-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org> (upstream)
Reviewed-by: Adam Tkac <atkac redhat com>

diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- bind.spec	6 Sep 2007 08:10:34 -0000	1.214
+++ bind.spec	6 Sep 2007 11:36:13 -0000	1.215
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	11.9.%{RELEASEVER}%{?dist}
+Release: 	12.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,9 +65,8 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch75:	bind-9.5-update.patch
-Patch76:	bind-9.5-2119_revert.patch
-Patch77:	bind-9.5-fix_h_errno.patch
 Patch78:	bind-9.5-pool_badfree.patch
+Patch79:	bind-9.5-_res_errno.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -249,9 +248,8 @@
 %endif
 %patch73 -p1 -b .libidn
 %patch75 -p1 -b .update
-%patch76 -p1 -b .2119
-%patch77 -p1 -b .errno
 %patch78 -p1 -b .badfree
+%patch79 -p1 -b .errno
 :;
 
 
@@ -648,6 +646,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.a6
+- bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
+  obsoleted by upstream bind-9.5-_res_errno.patch
+
 * Wed Sep 05 2007 Adam Tkac <atkac redhat com> 32:9.5.0-11.9.a6
 - fixed wrong resolver's dispatch pool cleanup (#275011, patch from 
   tmraz redhat com)


--- bind-9.5-2119_revert.patch DELETED ---


--- bind-9.5-fix_h_errno.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 11:50:32 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 07:50:32 -0400
Subject: rpms/ocaml/devel ocaml-find-provides.sh, 1.1,
	1.2 ocaml-find-requires.sh, 1.2, 1.3 ocaml.spec, 1.33, 1.34
Message-ID: <200709061150.l86BoWVh000829@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv801

Modified Files:
	ocaml-find-provides.sh ocaml-find-requires.sh ocaml.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-7
- Run chrpath to delete rpaths used on some of the stublibs.
- Ignore Parsetree module in dependency calculation.
- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
  over-match module names.



Index: ocaml-find-provides.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-find-provides.sh	2 Jul 2007 15:13:39 -0000	1.1
+++ ocaml-find-provides.sh	6 Sep 2007 11:49:59 -0000	1.2
@@ -56,9 +56,9 @@
 # Get a list of the modules these file(s) provide.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -E "$modules_re" |
+grep -E '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |
 grep -Ev "$ignore_modules_re" |
-sort -u
\ No newline at end of file
+sort -u


Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-find-requires.sh	3 Sep 2007 14:35:10 -0000	1.2
+++ ocaml-find-requires.sh	6 Sep 2007 11:49:59 -0000	1.3
@@ -58,7 +58,7 @@
 # Get a list of the modules these file(s) depend on.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -Ev "$modules_re" |
+grep -Ev '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ocaml.spec	3 Sep 2007 14:35:10 -0000	1.33
+++ ocaml.spec	6 Sep 2007 11:49:59 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -35,6 +35,7 @@
 BuildRequires:  libXt-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
+BuildRequires:  chrpath
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
@@ -189,7 +190,7 @@
 cp %{SOURCE2} refman.pdf
 
 %define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
 %define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 %build
@@ -238,6 +239,9 @@
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
+# Remove rpaths from stublibs .so files.
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -423,6 +427,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-7
+- Run chrpath to delete rpaths used on some of the stublibs.
+- Ignore Parsetree module in dependency calculation.
+- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
+  over-match module names.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-6
 - ocaml-runtime provides ocaml(runtime) = 3.10.0, and
   ocaml-find-requires.sh modified so that it adds this requires



From fedora-extras-commits at redhat.com  Thu Sep  6 11:56:41 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 07:56:41 -0400
Subject: rpms/gnash/devel .cvsignore, 1.4, 1.5 gnash.spec, 1.7, 1.8 sources, 
	1.4, 1.5 gnash-CVE-2007-2500.patch, 1.1,
	NONE gnash-README.fedora, 1.1,
	NONE gnash-configure-pkgconfig.patch, 1.1,
	NONE gnash-continue_on_info_install_error.patch, 1.1,
	NONE gnash-plugin-tempfile-dir.patch, 1.1, NONE
Message-ID: <200709061156.l86Buff9000985@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv954

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-CVE-2007-2500.patch gnash-README.fedora 
	gnash-configure-pkgconfig.patch 
	gnash-continue_on_info_install_error.patch 
	gnash-plugin-tempfile-dir.patch 
Log Message:
* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
- update to 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2007 14:11:00 -0000	1.4
+++ .cvsignore	6 Sep 2007 11:56:09 -0000	1.5
@@ -1 +1 @@
-gnash-0.8.0.tar.bz2
+gnash-0.8.1.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnash.spec	3 Aug 2007 15:10:50 -0000	1.7
+++ gnash.spec	6 Sep 2007 11:56:09 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           gnash
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -68,7 +68,7 @@
 %prep
 %setup -q
 
-chmod a-x libgeometry/snappingrange.h
+chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -83,31 +83,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so \
- $RPM_BUILD_ROOT/%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
+# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
 rm \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
- $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+rm \
+ $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # asspec info isn't generated rightly
 rm \
- $RPM_BUILD_ROOT/%{_infodir}/asspec.info
-# omf is broken
-rm -rf \
- $RPM_BUILD_ROOT/%{_datadir}/omf
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# omf was broken
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
-rm \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm \
+# $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -118,7 +119,8 @@
 %post 
 /sbin/ldconfig
 # currently help system is broken
-#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
@@ -135,15 +137,17 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
-%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/
+#%{_libdir}/libgnash*-*.so
+#%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-#%{_datadir}/omf/gnash/
+%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -151,7 +155,7 @@
 
 %files klash
 %defattr(-,root,root,-)
-%{_bindir}/klash
+%{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 #%{_datadir}/config/klashrc
@@ -162,6 +166,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
+- update to 0.8.1
+
 * Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
 - rebuild for boost soname change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2007 14:11:00 -0000	1.4
+++ sources	6 Sep 2007 11:56:09 -0000	1.5
@@ -1 +1 @@
-b3a3b22d608b5050b1b2743bc348c536  gnash-0.8.0.tar.bz2
+28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz


--- gnash-CVE-2007-2500.patch DELETED ---


--- gnash-README.fedora DELETED ---


--- gnash-configure-pkgconfig.patch DELETED ---


--- gnash-continue_on_info_install_error.patch DELETED ---


--- gnash-plugin-tempfile-dir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:02:35 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 08:02:35 -0400
Subject: rpms/ocaml-curl/devel ocaml-curl.spec,1.2,1.3
Message-ID: <200709061202.l86C2Z01007057@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7031

Modified Files:
	ocaml-curl.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-5
- Force rebuild because of changed build-requires/provides scripts in OCaml.



Index: ocaml-curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curl/devel/ocaml-curl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-curl.spec	30 Aug 2007 09:29:00 -0000	1.2
+++ ocaml-curl.spec	6 Sep 2007 12:02:02 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curl
 Version:        0.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml Curl library (ocurl)
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, curl-devel >= 7.9.8
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, curl-devel >= 7.9.8
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-5
+- Force rebuild because of changed build-requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.2.1-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:04:59 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 6 Sep 2007 08:04:59 -0400
Subject: rpms/bind/F-7 bind-9.4-_res_errno.patch, NONE, 1.1 bind.spec, 1.191,
	1.192 bind-9.4-2119_revert.patch, 1.1,
	NONE libbind-9.3.1rc1-fix_h_errno.patch, 1.1, NONE
Message-ID: <200709061205.l86C4xpN007214@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135

Modified Files:
	bind.spec 
Added Files:
	bind-9.4-_res_errno.patch 
Removed Files:
	bind-9.4-2119_revert.patch libbind-9.3.1rc1-fix_h_errno.patch 
Log Message:
- patches bind-9.4-2119_revert.patch and
  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
  bind-9.4-_res_errno.patch


bind-9.4-_res_errno.patch:

--- NEW FILE bind-9.4-_res_errno.patch ---
Written-by: Mark Andrews <Mark_Andrews isc org>
Reviewed-by: Adam Tkac <atkac redhat com>

diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
--- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- bind.spec	3 Sep 2007 07:54:59 -0000	1.191
+++ bind.spec	6 Sep 2007 12:04:26 -0000	1.192
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.2.%{RELEASEVER}%{?dist}
+Release: 	0.3.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +56,6 @@
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
 Patch12: 	bind-9.3.1rc1-sdb.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
-Patch14: 	libbind-9.3.1rc1-fix_h_errno.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch17: 	bind-9.3.2b1-fix_sdb_ldap.patch
 Patch22: 	bind-9.3.1-sdb_dbus.patch
@@ -73,7 +72,7 @@
 Patch68:	bind-9.4.1-ldap-api.patch
 Patch70:	bind-9.4-update.patch
 Patch71:	bind-9.4-dbus.patch
-Patch72:	bind-9.4-2119_revert.patch
+Patch73:	bind-9.4-_res_errno.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -259,7 +258,6 @@
 %endif
 %if %{LIBBIND}
 %patch13 -p1 -b .fix_libbind_includedir
-%patch14 -p1 -b .fix_h_errno
 %endif
 %patch16 -p1 -b .redhat_doc
 %if %{WITH_DBUS}
@@ -299,7 +297,7 @@
 %endif
 %patch66 -p1 -b .freeze
 %patch70 -p1 -b .update
-%patch72 -p1 -b .2119_revert
+%patch73 -p1 -b .errno
 :;
 
 
@@ -785,6 +783,11 @@
 
 
 %changelog
+* Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
+- patches bind-9.4-2119_revert.patch and
+  libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by
+  bind-9.4-_res_errno.patch
+
 * Fri Aug 31 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.2.b1
 - temporary revert ISC 2119 change which conflicts with our
   "libbind-errno" patch (#254501)


--- bind-9.4-2119_revert.patch DELETED ---


--- libbind-9.3.1rc1-fix_h_errno.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:19:41 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 6 Sep 2007 08:19:41 -0400
Subject: rpms/hplip/devel hplip.fdi, NONE, 1.1 hplip-udev-rules.patch, 1.2, 
	1.3 hplip.spec, 1.157, 1.158
Message-ID: <200709061219.l86CJf8l007600@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7576

Modified Files:
	hplip-udev-rules.patch hplip.spec 
Added Files:
	hplip.fdi 
Log Message:
* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
- Reverted udev rules change.
- Ship a HAL FDI file to get correct access control on the USB device
  nodes (bug #251470).
- Make libsane-hpaio requires the main hplip package, needed for
  libhpip.so (bug #280281).



--- NEW FILE hplip.fdi ---
<?xml version="1.0" encoding="UTF-8"?> 

<deviceinfo version="0.2">
  <device>
    <!-- HPLIP-driven printers and scanners -->
    <match key="info.bus" contains="usb_device">
      <match key="usb_device.vendor_id" int="0x03f0">
        <append key="info.capabilities" type="strlist">scanner</append>
      </match>
    </match>

    <!-- Set ACLs -->
    <match key="info.capabilities" contains="scanner">
      <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">scanner</merge>
    </match>
  </device>
</deviceinfo>

hplip-udev-rules.patch:

Index: hplip-udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-udev-rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-udev-rules.patch	30 Aug 2007 15:27:19 -0000	1.2
+++ hplip-udev-rules.patch	6 Sep 2007 12:19:39 -0000	1.3
@@ -1,14 +1,12 @@
---- hplip-2.7.7/55-hpmud.rules.udev-rules	2007-05-17 17:48:16.000000000 +0100
-+++ hplip-2.7.7/55-hpmud.rules	2007-08-09 10:22:42.000000000 +0100
-@@ -1,5 +1,9 @@
+--- hplip-2.7.6/55-hpmud.rules.udev-rules	2007-07-20 14:13:01.000000000 +0100
++++ hplip-2.7.6/55-hpmud.rules	2007-07-20 14:13:32.000000000 +0100
+@@ -1,5 +1,7 @@
  # TODO: add PROGRAM rule for 7/xx/xx printer class interface
 -SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
 +SUBSYSTEM!="usb", GOTO="hpmud_rules_end"
 +ATTR{devnum}!="?*", GOTO="hpmud_rules_end"
 +ATTR{busnum}!="?*", GOTO="hpmud_rules_end"
-+ENV{PHYSDEVDRIVER}=="usblp", GOTO="hpmud_rules_end"
  ACTION!="add", GOTO="hpmud_rules_end"
 -SYSFS{idVendor}=="03f0", GROUP="lp"
 +SYSFS{idVendor}=="03f0", GROUP="lp", MODE="0664"
-+SYSFS{idVendor}=="03f0", SYMLINK+="scanner-%k"
  LABEL="hpmud_rules_end"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- hplip.spec	30 Aug 2007 15:27:19 -0000	1.157
+++ hplip.spec	6 Sep 2007 12:19:39 -0000	1.158
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -12,7 +12,8 @@
 Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
-Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source1: hplip.fdi
 Patch1: hplip-desktop.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
@@ -34,6 +35,7 @@
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 Requires: python-imaging
+Requires: hal
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -79,6 +81,7 @@
 License: GPL
 Obsoletes: libsane-hpoj <= 0.91
 Requires: sane-backends
+Requires: %{name} = %{version}-%{release}
 ExcludeArch: s390 s390x
 
 %description -n libsane-hpaio
@@ -153,6 +156,9 @@
 	--add-category Application				\
 	hplip.desktop
 
+mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+
 # Remove files we don't want to package.
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
@@ -165,6 +171,7 @@
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_sysconfdir}/udev/rules.d/*
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -271,6 +278,13 @@
 exit 0
 
 %changelog
+* Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
+- Reverted udev rules change.
+- Ship a HAL FDI file to get correct access control on the USB device
+  nodes (bug #251470).
+- Make libsane-hpaio requires the main hplip package, needed for
+  libhpip.so (bug #280281).
+
 * Thu Aug 30 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-3
 - Updated udev rules to allow scanning by console user.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:23:50 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 08:23:50 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1300,1.1301
Message-ID: <200709061223.l86CNoEJ007714@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7692

Modified Files:
	openoffice.org.spec 
Log Message:
build failed, so merge 2 with 1


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -r1.1300 -r1.1301
--- openoffice.org.spec	6 Sep 2007 11:28:16 -0000	1.1300
+++ openoffice.org.spec	6 Sep 2007 12:23:17 -0000	1.1301
@@ -2774,14 +2774,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.2
-- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
-
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
-- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
-  makes drawing shapes work properly again
 - next version
+- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p to
+  make drawing shapes work properly again with new boost 1.34
+- add openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 - disable custom launchers, it breaks icedtea for some reason I haven't time to
   figure out
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:24:01 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:24:01 -0400
Subject: extras-buildsys/utils/pushscript RepoSupport.py, 1.4,
	1.5 RepoSupportExample.py, 1.2, NONE
Message-ID: <200709061224.l86CO1dF007768@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7713

Modified Files:
	RepoSupport.py 
Removed Files:
	RepoSupportExample.py 
Log Message:
- access to the testing repo ids is needed
- delete the unneeded example




Index: RepoSupport.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoSupport.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepoSupport.py	25 Feb 2007 16:25:50 -0000	1.4
+++ RepoSupport.py	6 Sep 2007 12:23:58 -0000	1.5
@@ -46,9 +46,13 @@
         return self.archdict
 
     def ReleaseRepoList(self,dist):
-        """return list of repository base-ids for the given release"""
+        """return list of base repository ids for the given release"""
         return self.baserepos.get(dist) or []
 
+    def TestRepoList(self,dist):
+        """return list of testing repository ids for the given release"""
+        return self.testrepos.get(dist) or []
+
     def ExtRepoList(self,dist):
         return self.extrepos.get(dist) or []
 


--- RepoSupportExample.py DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 12:25:34 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 08:25:34 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.27,
	1.28 policycoreutils.spec, 1.443, 1.444
Message-ID: <200709061225.l86CPYxA007858@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
- Bump libsemanage version for disable dontaudit
- New gui features for creating admin users


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policycoreutils-gui.patch	31 Aug 2007 21:17:12 -0000	1.27
+++ policycoreutils-gui.patch	6 Sep 2007 12:25:31 -0000	1.28
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-08-31 15:06:49.000000000 -0400
-@@ -0,0 +1,2313 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-05 22:33:12.000000000 -0400
+@@ -0,0 +1,2312 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,8 +1028,7 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="can_focus">True</property>
-+	  <property name="show_tabs">True</property>
++	  <property name="show_tabs">False</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -3231,8 +3230,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-08-31 15:06:45.000000000 -0400
-@@ -0,0 +1,444 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-05 22:33:06.000000000 -0400
+@@ -0,0 +1,432 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3265,8 +3264,6 @@
 +import gnome
 +import sys
 +import polgen
-+import sepolgen.interfaces as interfaces
-+import sepolgen.defaults as defaults
 +import re
 +
 +##
@@ -3305,13 +3302,6 @@
 +else:
 +    xml = gtk.glade.XML ("/usr/share/system-config-selinux/polgen.glade", domain=PROGNAME)
 +
-+fn = defaults.interface_info()
-+try:
-+    fd = open(fn)
-+except:
-+    sys.stderr.write("could not open interface info [%s]\n" % fn)
-+    sys.exit(1)
-+
 +FILE = 1
 +DIR = 2
 +
@@ -3400,11 +3390,8 @@
 +        col = gtk.TreeViewColumn(_("Application"), gtk.CellRendererText(), text = 0)
 +        self.admin_treeview.append_column(col)
 +
-+        # List of per_role_template interfaces
-+        ifs = interfaces.InterfaceSet()
-+        ifs.from_file(fd)
-+        fd.close()
-+        for i in ifs.interfaces.keys():
++        for i in polgen.methods:
++            print i
 +            m = re.findall("(.*)%s" % polgen.USER_TRANSITION_INTERFACE, i) 
 +            if len(m) > 0:
 +                iter = self.transition_store.append()
@@ -3442,7 +3429,7 @@
 +                self.forward_button.set_label(gtk.STOCK_APPLY)
 +        
 +    def back(self,arg):
-+        type = self.confine_application()
++        type = self.get_type()
 +        if self.pages[type][self.current_page] == self.FINISH_PAGE:
 +            self.forward_button.set_label(gtk.STOCK_GO_FORWARD)
 +
@@ -3679,8 +3666,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-08-31 15:06:41.000000000 -0400
-@@ -0,0 +1,656 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-05 22:26:53.000000000 -0400
+@@ -0,0 +1,715 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3715,6 +3702,8 @@
 +from templates import script
 +from templates import user
 +import seobject
++import sepolgen.interfaces as interfaces
++import sepolgen.defaults as defaults
 +
 +##
 +## I18N
@@ -3733,6 +3722,20 @@
 +    import __builtin__
 +    __builtin__.__dict__['_'] = unicode
 +
++methods = []
++fn = defaults.interface_info()
++try:
++    fd = open(fn)
++    # List of per_role_template interfaces
++    ifs = interfaces.InterfaceSet()
++    ifs.from_file(fd)
++    fd.close()
++    methods = ifs.interfaces.keys()
++except:
++    sys.stderr.write("could not open interface info [%s]\n" % fn)
++    sys.exit(1)
++
++
 +ALL = 0
 +RESERVED = 1
 +UNRESERVED = 2
@@ -3792,6 +3795,7 @@
 +                self.need_udp_type=False
 +		self.admin_domains = []
 +		self.transition_domains = []
++                self.roles = []
 +                
 +        def __isnetset(self, l):
 +            return l[ALL] or l[RESERVED] or l[UNRESERVED] or len(l[PORTS]) > 0
@@ -3799,6 +3803,9 @@
 +        def set_admin_domains(self, admin_domains):
 +            self.admin_domains = admin_domains
 +
++        def set_admin_roles(self, roles):
++            self.roles = roles
++
 +        def set_transition_domains(self, transition_domains):
 +            self.transition_domains = transition_domains
 +
@@ -3906,7 +3913,21 @@
 +                if self.use_pam:
 +                    newte = re.sub("TEMPLATETYPE", self.name, executable.te_pam_rules)
 +                return newte
-+            
++
++        def generate_network_action(self, protocol, action, port_name):
++            line = ""
++            method = "corenet_%s_%s_%s" % (protocol, action, port_name)
++            if method in methods:
++                line = "%s(%s_t)\n" % (method, self.name)
++            else:
++                line = """
++gen_require(`
++    type %s_t;
++')
++allow %s_t %s_t:%s_socket name_%s;
++""" % (port_name, self.name, port_name, protocol, action)
++            return line
++                
 +	def generate_network_types(self):
 +                for i in self.in_tcp[PORTS]:
 +                    rec = self.find_port(int(i))
@@ -3914,7 +3935,8 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("tcp", "bind", port_name)
++#                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +
@@ -3924,7 +3946,8 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("tcp", "connect", port_name)
++#                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +                        
@@ -3934,7 +3957,8 @@
 +                        self.need_udp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
++                        line = self.generate_network_action("udp", "bind", port_name)
++#                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_udp_ports:
 +                            self.found_udp_ports.append(line)
 +                
@@ -4022,8 +4046,10 @@
 +
 +        def generate_admin_rules(self):
 +            newte = ""
++            newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++            
 +            for app in self.admin_domains:
-+                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
 +                newte += re.sub("APPLICATION", app, tmp)
 +            return newte
 +
@@ -4132,6 +4158,17 @@
 +	def generate_default_rules(self):
 +		return self.DEFAULT_TYPES[self.type][1]()
 +		
++	def generate_roles_rules(self):
++            newte = ""
++            if self.type in ( TUSER, XUSER):
++                roles = ""
++                if len(self.roles) > 0:
++                    newte += re.sub("TEMPLATETYPE", self.name, user.te_newrole_rules)
++                    for role in self.roles:
++                        tmp = re.sub("TEMPLATETYPE", self.name, user.te_roles_rules)
++                        newte += re.sub("ROLE", role, tmp)
++            return newte
++        
 +	def generate_te(self):
 +		newte = self.generate_default_types()
 +		for d in self.DEFAULT_DIRS:
@@ -4157,6 +4194,7 @@
 +		newte += self.generate_uid_rules()		
 +		newte += self.generate_syslog_rules()		
 +                newte += self.generate_pam_rules()		
++                newte += self.generate_roles_rules()
 +                newte += self.generate_transition_rules()
 +                newte += self.generate_admin_rules()
 +		return newte
@@ -4188,6 +4226,18 @@
 +
 +		return newfc
 +	
++	def generate_user_sh(self):
++            newsh = ""
++            if self.type in ( TUSER, XUSER):
++                roles = ""
++                for role in self.roles:
++                    roles += " %s_r" % role
++                if roles != "":
++                    roles += " system_r"
++                tmp = re.sub("TEMPLATETYPE", self.name, script.users)
++                newsh += re.sub("ROLES", roles, tmp)
++            return newsh
++        
 +	def generate_sh(self):
 +		newsh = re.sub("TEMPLATETYPE", self.name, script.compile)
 +		newsh = re.sub("PACKAGEFILENAME", self.file_name, newsh)
@@ -4208,6 +4258,8 @@
 +                    if self.find_port(i) == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
++
++                newsh += self.generate_user_sh()
 +			
 +		return newsh
 +	
@@ -4265,7 +4317,7 @@
 +    mypolicy.set_use_syslog(True)
 +    mypolicy.set_use_pam(True)
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +
 +    mypolicy = policy("myuser", USER)
 +    mypolicy.set_program("/usr/bin/myuser")
@@ -4277,7 +4329,7 @@
 +    mypolicy.set_use_pam(True)
 +    mypolicy.add_file("/var/lib/myuser/myuser.sock")
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
 +
 +    mypolicy = policy("myrwho", DAEMON)
@@ -4290,7 +4342,7 @@
 +    mypolicy.set_use_pam(True)
 +    mypolicy.add_dir("/var/run/myrwho")
 +    mypolicy.add_dir("/var/lib/myrwho")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myinetd", INETD)
 +    mypolicy.set_program("/usr/bin/mytest")
@@ -4308,16 +4360,12 @@
 +    mypolicy.add_dir("/etc/daemon")
 +    mypolicy.add_dir("/etc/daemon/special")
 +    mypolicy.set_out_tcp(0,"8000")
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +
 +    mypolicy = policy("mytuser", TUSER)
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
-+    mypolicy.set_in_udp(1, 0, 0, "1513")
-+    mypolicy.set_use_uid(True)
-+    mypolicy.set_use_syslog(True)
-+    mypolicy.set_use_pam(True)
-+    mypolicy.set_transition_domains(["mozilla", "ssh"])
-+    print mypolicy.generate("/tmp")
++    mypolicy.set_transition_domains(["sudo"])
++    mypolicy.set_admin_roles(["mydbadm"])
++    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myxuser", XUSER)
 +    mypolicy.set_in_tcp(1, 1, 1, "")
@@ -4326,13 +4374,11 @@
 +    mypolicy.set_use_syslog(True)
 +    mypolicy.set_use_pam(True)
 +    mypolicy.set_transition_domains(["mozilla"])
-+    print mypolicy.generate("/tmp")
++    print mypolicy.generate("/var/tmp")
 +    
-+    mypolicy = policy("myruser", RUSER)
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
-+    mypolicy.set_in_udp(1, 0, 0, "1513")
-+    mypolicy.set_admin_domains(["postgresql", "mysql", "apache"])
-+    print mypolicy.generate("/tmp")
++    mypolicy = policy("mydbadm", RUSER)
++    mypolicy.set_admin_domains(["postgresql", "mysql"])
++    print mypolicy.generate("/var/tmp")
 +    
 +    sys.exit(0)
 +    
@@ -8762,8 +8808,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-08-31 15:41:21.000000000 -0400
-@@ -0,0 +1,222 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-05 22:25:10.000000000 -0400
+@@ -0,0 +1,229 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8906,7 +8952,8 @@
 +#
 +interface(`TEMPLATETYPE_domtrans',`
 +	gen_require(`
-+		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
++		type TEMPLATETYPE_t;
++                type TEMPLATETYPE_exec_t;
 +	')
 +
 +	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
@@ -8961,13 +9008,19 @@
 +## <rolecap/>
 +#
 +interface(`TEMPLATETYPE_admin',`
++	gen_require(`
++		type TEMPLATETYPE_t;
++	')
++
++	allow $1 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, TEMPLATETYPE_t, TEMPLATETYPE_t)
++	        
 +"""
 +
 +if_initscript_admin="""
 +	# Allow $1 to restart the apache service
 +	TEMPLATETYPE_script_domtrans($1)
-+	domain_role_change_exemption($1)
-+	domain_obj_id_change_exemption($1)
++	domain_system_change_exemption($1)
 +	role_transition $2 TEMPLATETYPE_script_exec_t system_r;
 +	allow $2 system_r;
 +"""
@@ -9226,8 +9279,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-08-31 15:07:36.000000000 -0400
-@@ -0,0 +1,42 @@
++++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-05 22:25:46.000000000 -0400
+@@ -0,0 +1,45 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9270,6 +9323,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
++users="""\
++/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
++"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-08-31 15:07:36.000000000 -0400
@@ -9418,8 +9474,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-08-31 15:07:36.000000000 -0400
-@@ -0,0 +1,97 @@
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-05 22:25:03.000000000 -0400
+@@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9511,11 +9567,53 @@
 +"""
 +
 +te_admin_rules="""
++allow TEMPLATETYPE_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
++files_dontaudit_search_all_dirs(TEMPLATETYPE_t)
++
++selinux_get_enforce_mode(TEMPLATETYPE_t)
++seutil_domtrans_restorecon(TEMPLATETYPE_t)
++seutil_search_default_contexts(mydbadm_t)
++
++logging_send_syslog_msg(TEMPLATETYPE_t)
++
++kernel_read_system_state(TEMPLATETYPE_t)
++
++domain_dontaudit_search_all_domains_state(TEMPLATETYPE_t)
++domain_dontaudit_ptrace_all_domains(TEMPLATETYPE_t)
++
++userdom_dontaudit_search_sysadm_home_dirs(TEMPLATETYPE_t)
++userdom_dontaudit_search_generic_user_home_dirs(TEMPLATETYPE_t)
++
++bool TEMPLATETYPE_read_user_files false;
++bool TEMPLATETYPE_manage_user_files false;
++
++if (TEMPLATETYPE_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(TEMPLATETYPE_t)
++   userdom_read_unpriv_users_tmp_files(TEMPLATETYPE_t)
++}
++
++if (TEMPLATETYPE_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(TEMPLATETYPE_t)
++   userdom_read_unpriv_users_tmp_files(TEMPLATETYPE_t)
++   userdom_write_unpriv_users_tmp_files(TEMPLATETYPE_t)
++}
++
++"""
++
++te_admin_domain_rules="""
 +optional_policy(`
 +	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r, { TEMPLATETYPE_tty_device_t TEMPLATETYPE_devpts_t })
 +')
 +"""
 +
++te_roles_rules="""
++userdom_role_change_template(TEMPLATETYPE, ROLE)
++"""
++
++te_newrole_rules="""
++seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++"""
++
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- policycoreutils.spec	31 Aug 2007 21:17:12 -0000	1.443
+++ policycoreutils.spec	6 Sep 2007 12:25:31 -0000	1.444
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.6-1
-%define	libsemanagever	2.0.4-1
+%define	libsepolver	2.0.9-1
+%define	libsemanagever	2.0.5-1
 %define	libselinuxver	2.0.23-3
 %define	sepolgenver	1.0.9
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,10 @@
 fi
 
 %changelog
+* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
+- Bump libsemanage version for disable dontaudit
+- New gui features for creating admin users
+
 * Fri Aug 31 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-8
 - Fix generated code for admin policy
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:27:18 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Thu, 6 Sep 2007 08:27:18 -0400
Subject: rpms/gcc/devel gcc41-builtin-chk-anticipated.patch, NONE,
	1.1 gcc41-builtin-throw.patch, NONE,
	1.1 gcc41-builtin-va-arg-pack.patch, NONE, 1.1 gcc41.spec, 1.170,
	1.171
Message-ID: <200709061227.l86CRING007957@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack.patch 
Log Message:
4.1.2-22

gcc41-builtin-chk-anticipated.patch:

--- NEW FILE gcc41-builtin-chk-anticipated.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33289
	* decl.c (builtin_function_1): Set DECL_ANTICIPATED also
	on __*_chk non-__builtin_* decls.

	* g++.dg/eh/builtin4.C: New test.

--- gcc/cp/decl.c.jj	2007-08-31 14:28:19.000000000 +0200
+++ gcc/cp/decl.c	2007-09-04 21:28:06.000000000 +0200
@@ -3517,6 +3529,17 @@ builtin_function_1 (tree decl, tree cont
      anticipated but not actually declared.  */
   if (name[0] != '_' || name[1] != '_')
     DECL_ANTICIPATED (decl) = 1;
+  else if (strncmp (name + 2, "builtin_", strlen ("builtin_")) != 0)
+    {
+      size_t len = strlen (name);
+
+      /* Treat __*_chk fortification functions as anticipated as well,
+	 unless they are __builtin_*.  */
+      if (len > strlen ("___chk")
+	  && memcmp (name + len - strlen ("_chk"),
+		     "_chk", strlen ("_chk") + 1) == 0)
+	DECL_ANTICIPATED (decl) = 1;
+    }
 
   return decl;
 }
--- gcc/testsuite/g++.dg/eh/builtin4.C.jj	2007-09-04 22:06:06.000000000 +0200
+++ gcc/testsuite/g++.dg/eh/builtin4.C	2007-09-04 22:07:03.000000000 +0200
@@ -0,0 +1,6 @@
+// PR c++/33289
+// { dg-do compile }
+
+typedef __SIZE_TYPE__ size_t;
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();

gcc41-builtin-throw.patch:

--- NEW FILE gcc41-builtin-throw.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	* builtin-attrs.def (ATTR_NONNULL_3): New.
	(DEF_FORMAT_ATTRIBUTE): Use just ATTR_NONNULL_##FA instead of
	ATTR_NOTHROW_NONNULL_##FA.
	(DEF_FORMAT_ATTRIBUTE_NOTHROW, DEF_FORMAT_ATTRIBUTE_BOTH): New macros.
	(ATTR_FORMAT_PRINTF_NOTHROW_2_0, ATTR_PRINTF_NOTHROW_2_3,
	ATTR_FORMAT_PRINTF_NOTHROW_3_0, ATTR_FORMAT_PRINTF_NOTHROW_3_4,
	ATTR_FORMAT_PRINTF_NOTHROW_4_0, ATTR_PRINTF_NOTHROW_4_5,
	ATTR_FORMAT_PRINTF_NOTHROW_5_0, ATTR_FORMAT_PRINTF_NOTHROW_5_6,
	ATTR_FORMAT_SCANF_NOTHROW_2_0, ATTR_FORMAT_SCANF_NOTHROW_2_3,
	ATTR_FORMAT_STRFTIME_NOTHROW_3_0, ATTR_FORMAT_STRFMON_NOTHROW_3_4):
	New.
	(ATTR_FORMAT_PRINTF_4_0, ATTR_PRINTF_4_5, ATTR_FORMAT_PRINTF_5_0,
	ATTR_FORMAT_PRINTF_5_6, ATTR_FORMAT_STRFTIME_3_0,
	ATTR_FORMAT_NOTHROW_3_4): Remove.
	* builtins.def (snprintf, sprintf, sscanf, vsnprintf, vsprintf,
	vsscanf, strfmon, strftime, __snprintf_chk, __sprintf_chk,
	__vsnprintf_chk, __vsprintf_chk): Use ATTR_FORMAT_*_NOTHROW_*
	instead of ATTR_FORMAT_*_*.

--- gcc/builtin-attrs.def.jj	2007-08-13 15:11:18.000000000 +0200
+++ gcc/builtin-attrs.def	2007-09-03 11:26:13.000000000 +0200
@@ -118,6 +118,8 @@ DEF_ATTR_TREE_LIST (ATTR_NONNULL_LIST, A
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_1, ATTR_NONNULL, ATTR_LIST_1, ATTR_NULL)
 /* Functions whose second parameter is a nonnull pointer.  */
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_2, ATTR_NONNULL, ATTR_LIST_2, ATTR_NULL)
+/* Functions whose third parameter is a nonnull pointer.  */
+DEF_ATTR_TREE_LIST (ATTR_NONNULL_3, ATTR_NONNULL, ATTR_LIST_3, ATTR_NULL)
 /* Nothrow functions with the sentinel(1) attribute. */
 DEF_ATTR_TREE_LIST (ATTR_NOTHROW_SENTINEL_1, ATTR_SENTINEL, ATTR_LIST_1, \
 			ATTR_NOTHROW_LIST)
@@ -157,24 +159,38 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_
   DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
 		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
   DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_NOTHROW(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
+		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_BOTH(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)	 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
 		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_4)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_5)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_6)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_4)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_5)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_6)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(STRFTIME,3,3_0)
-DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFTIME,3,3_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3_4)
 #undef DEF_FORMAT_ATTRIBUTE
+#undef DEF_FORMAT_ATTRIBUTE_NOTHROW
+#undef DEF_FORMAT_ATTRIBUTE_BOTH
 
 /* Construct a tree for a format_arg attribute.  */
 #define DEF_FORMAT_ARG_ATTRIBUTE(FA)					\
--- gcc/builtins.def.jj	2007-08-30 18:46:59.000000000 +0200
+++ gcc/builtins.def	2007-09-03 10:52:18.000000000 +0200
@@ -553,16 +553,16 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTCHAR
 DEF_LIB_BUILTIN        (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_SCANF, "scanf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_SCANF_1_2)
-DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
-DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_2_3)
+DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_2_3)
+DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_NOTHROW_2_3)
 DEF_LIB_BUILTIN        (BUILT_IN_VFPRINTF, "vfprintf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
 DEF_C99_BUILTIN        (BUILT_IN_VFSCANF, "vfscanf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
 DEF_LIB_BUILTIN        (BUILT_IN_VPRINTF, "vprintf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_1_0)
 DEF_C99_BUILTIN        (BUILT_IN_VSCANF, "vscanf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_1_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)
-DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_3_0)
+DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_NOTHROW_2_0)
 
 /* Category: ctype builtins.  */
 DEF_LIB_BUILTIN        (BUILT_IN_ISALNUM, "isalnum", BT_FN_INT_INT, ATTR_PURE_NOTHROW_LIST)
@@ -693,8 +693,8 @@ DEF_GCC_BUILTIN        (BUILT_IN_RETURN_
 DEF_GCC_BUILTIN        (BUILT_IN_SAVEREGS, "saveregs", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_STDARG_START, "stdarg_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_3_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_UNWIND_INIT, "unwind_init", BT_FN_VOID, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_SETJMP_BUF, "update_setjmp_buf", BT_FN_VOID_PTR_INT, ATTR_NULL)
@@ -730,10 +730,10 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCAT_
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCPY_CHK, "__strcpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCAT_CHK, "__strncat_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCPY_CHK, "__strncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_5_6)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_4_5)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_5_0)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_4_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_5_6)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_4_5)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_5_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_4_0)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_FPRINTF_CHK, "__fprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PRINTF_CHK, "__printf_chk", BT_FN_INT_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_VFPRINTF_CHK, "__vfprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)

gcc41-builtin-va-arg-pack.patch:

--- NEW FILE gcc41-builtin-va-arg-pack.patch ---
2007-09-05  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
	* tree.h (CALL_EXPR_VA_ARG_PACK): Define.
	* tree-inline.h (copy_body_data): Add call_expr field.
	* tree-inline.c (expand_call_inline): Initialize call_expr.
	(copy_bb): Append anonymous inline fn arguments to arguments
	when inlining a CALL_EXPR_VA_ARG_PACK call.
	* builtins.c (expand_builtin): Issue an error if
	BUILT_IN_VA_ARG_PACK is seen during expand.
	(fold_builtin_1): Don't fold calls with
	__builtin_va_arg_pack () call as last argument.
	* gimplify.c (gimplify_call_expr): If last argument to a vararg
	function is __builtin_va_arg_pack (), decrease number of call
	arguments and instead set CALL_EXPR_VA_ARG_PACK on the CALL_EXPR.
	* fold-const.c (fold): Don't fold CALL_EXPRs with
	CALL_EXPR_VA_ARG_PACK bit set.
	* expr.c (expand_expr_real_1): Issue an error if
	CALL_EXPR_VA_ARG_PACK CALL_EXPR is seen during expand.
	* tree-pretty-print.c (dump_generic_node): Handle printing
	CALL_EXPR_VA_ARG_PACK bit on CALL_EXPRs.
	* doc/extend.texi (__builtin_va_arg_pack): Document.

	* gcc.c-torture/execute/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1a.c: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:09.000000000 +0200
+++ gcc/builtins.def	2007-09-06 10:19:24.000000000 +0200
@@ -665,6 +665,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_
 DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY, "va_copy", BT_FN_VOID_VALIST_REF_VALIST_ARG, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/tree.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree.h	2007-09-06 11:50:56.000000000 +0200
@@ -411,6 +411,8 @@ struct tree_common GTY(())
            VAR_DECL or FUNCTION_DECL or IDENTIFIER_NODE
        ASM_VOLATILE_P in
            ASM_EXPR
+       CALL_EXPR_VA_ARG_PACK in
+	  CALL_EXPR
        TYPE_CACHED_VALUES_P in
           ..._TYPE
        SAVE_EXPR_RESOLVED_P in
@@ -1066,6 +1068,11 @@ extern void omp_clause_range_check_faile
 #define SAVE_EXPR_RESOLVED_P(NODE) \
   (TREE_CHECK (NODE, SAVE_EXPR)->common.public_flag)
 
+/* Set on a CALL_EXPR if this stdarg call should be passed the argument
+   pack.  */
+#define CALL_EXPR_VA_ARG_PACK(NODE) \
+  (CALL_EXPR_CHECK(NODE)->common.public_flag)
+
 /* In any expression, decl, or constant, nonzero means it has side effects or
    reevaluation of the whole expression could produce a different value.
    This is set if any subexpression is a function call, a side effect or a
--- gcc/tree-inline.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/tree-inline.h	2007-09-06 10:19:24.000000000 +0200
@@ -57,6 +57,10 @@ typedef struct copy_body_data
   /* Current BLOCK.  */
   tree block;
 
+  /* CALL_EXPR if va arg parameter packs should be expanded or NULL
+     is not.  */
+  tree call_expr;
+
   /* Exception region the inlined call lie in.  */
   int eh_region;
   /* Take region number in the function being copied, add this value and
--- gcc/tree-inline.c.jj	2007-04-26 09:41:49.000000000 +0200
+++ gcc/tree-inline.c	2007-09-06 12:35:57.000000000 +0200
@@ -725,6 +725,22 @@ copy_bb (copy_body_data *id, basic_block
 
           bsi_insert_after (&copy_bsi, stmt, BSI_NEW_STMT);
 	  call = get_call_expr_in (stmt);
+	  if (call && CALL_EXPR_VA_ARG_PACK (call) && id->call_expr)
+	    {
+	      tree arglist, *a, p;
+	      TREE_OPERAND (call, 1) = copy_list (TREE_OPERAND (call, 1));
+
+	      for (a = &TREE_OPERAND (call, 1); *a; a = &TREE_CHAIN (*a))
+		;
+
+	      p = DECL_ARGUMENTS (id->src_fn);
+	      for (arglist = TREE_OPERAND (id->call_expr, 1);
+		   p; p = TREE_CHAIN (p), arglist = TREE_CHAIN (arglist))
+		;
+
+	      *a = copy_list (arglist);
+	      CALL_EXPR_VA_ARG_PACK (call) = 0;
+	    }
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
@@ -2085,6 +2101,7 @@ expand_call_inline (basic_block bb, tree
   /* Record the function we are about to inline.  */
   id->src_fn = fn;
   id->src_node = cg_edge->callee;
+  id->call_expr = t;
 
   initialize_inlined_parameters (id, args, TREE_OPERAND (t, 2), fn, bb);
 
--- gcc/builtins.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/builtins.c	2007-09-06 11:04:56.000000000 +0200
@@ -5979,6 +5979,12 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_ARGS_INFO:
       return expand_builtin_args_info (arglist);
 
+    case BUILT_IN_VA_ARG_PACK:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
@@ -9017,7 +9023,27 @@ fold_builtin_1 (tree fndecl, tree arglis
 {
   tree type = TREE_TYPE (TREE_TYPE (fndecl));
   enum built_in_function fcode;
+  tree a;
+
+  if (arglist)
+    {
+      for (a = arglist; TREE_CHAIN (a); a = TREE_CHAIN (a))
+	;
 
+      /* Before gimplification CALL_EXPR_VA_ARG_PACK is not set, but
+	 instead last argument is __builtin_va_arg_pack ().  Defer folding
+	 even in that case, until arguments are finalized.  */
+      if (TREE_CODE (TREE_VALUE (a)) == CALL_EXPR)
+	{
+	  tree fndecl2 = get_callee_fndecl (TREE_VALUE (a));
+	  if (fndecl2
+	      && TREE_CODE (fndecl2) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (fndecl2) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (fndecl2) == BUILT_IN_VA_ARG_PACK)
+	    return NULL_TREE;
+	}
+    }
+
   if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
     return targetm.fold_builtin (fndecl, arglist, ignore);
 
--- gcc/gimplify.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/gimplify.c	2007-09-06 11:42:01.000000000 +0200
@@ -2018,6 +2018,55 @@ gimplify_call_expr (tree *expr_p, tree *
   ret = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, NULL,
 		       is_gimple_call_addr, fb_rvalue);
 
+  if (ret != GS_ERROR && TREE_OPERAND (*expr_p, 1))
+    {
+      int nargs;
+
+      for (nargs = 1, arglist = TREE_OPERAND (*expr_p, 1);
+	   TREE_CHAIN (arglist);
+	   arglist = TREE_CHAIN (arglist))
+	nargs++;
+
+      if (TREE_CODE (TREE_VALUE (arglist)) == CALL_EXPR)
+	{
+	  tree last_arg = TREE_VALUE (arglist);
+	  tree last_arg_fndecl = get_callee_fndecl (last_arg);
+
+	  if (last_arg_fndecl
+	      && TREE_CODE (last_arg_fndecl) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (last_arg_fndecl) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (last_arg_fndecl) == BUILT_IN_VA_ARG_PACK)
+	    {
+	      tree p = NULL_TREE, *aptr;
+	      int i;
+
+	      if (decl && DECL_ARGUMENTS (decl))
+		p = DECL_ARGUMENTS (decl);
+	      else if (decl)
+		p = TYPE_ARG_TYPES (TREE_TYPE (decl));
+	      else if (POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (*expr_p, 0))))
+		p = TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE
+						(TREE_OPERAND (*expr_p, 0))));
+	      for (i = 0; p; p = TREE_CHAIN (p))
+		i++;
+
+	      if (i < nargs)
+		{
+		  TREE_OPERAND (*expr_p, 1)
+		    = copy_list (TREE_OPERAND (*expr_p, 1));
+
+		  for (aptr = &TREE_OPERAND (*expr_p, 1);
+		       TREE_CHAIN (*aptr);
+		       aptr = &TREE_CHAIN (*aptr))
+		    ;
+
+		  *aptr = NULL_TREE;
+		  CALL_EXPR_VA_ARG_PACK (*expr_p) = 1;
+		}
+	    }
+	}
+    }
+
   if (PUSH_ARGS_REVERSED)
     TREE_OPERAND (*expr_p, 1) = nreverse (TREE_OPERAND (*expr_p, 1));
   for (arglist = TREE_OPERAND (*expr_p, 1); arglist;
@@ -2037,7 +2086,7 @@ gimplify_call_expr (tree *expr_p, tree *
   if (ret != GS_ERROR)
     {
       decl = get_callee_fndecl (*expr_p);
-      if (decl && DECL_BUILT_IN (decl))
+      if (decl && DECL_BUILT_IN (decl) && !CALL_EXPR_VA_ARG_PACK (*expr_p))
 	{
 	  tree arglist = TREE_OPERAND (*expr_p, 1);
 	  tree new = fold_builtin (decl, arglist, !want_value);
--- gcc/fold-const.c.jj	2007-08-31 09:47:39.000000000 +0200
+++ gcc/fold-const.c	2007-09-06 11:40:55.000000000 +0200
@@ -10409,6 +10409,8 @@ fold (tree expr)
 	  op0 = TREE_OPERAND (t, 0);
 	  op1 = TREE_OPERAND (t, 1);
 	  op2 = TREE_OPERAND (t, 2);
+	  if (code == CALL_EXPR && CALL_EXPR_VA_ARG_PACK (t))
+	    return expr;
 	  tem = fold_ternary (code, type, op0, op1, op2);
 	  return tem ? tem : expr;
 	default:
--- gcc/expr.c.jj	2007-04-24 22:58:53.000000000 +0200
+++ gcc/expr.c	2007-09-06 10:19:24.000000000 +0200
@@ -7475,6 +7475,10 @@ expand_expr_real_1 (tree exp, rtx target
       return expand_expr (OBJ_TYPE_REF_EXPR (exp), target, tmode, modifier);
 
     case CALL_EXPR:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      if (CALL_EXPR_VA_ARG_PACK (exp))
+	error ("invalid use of %<__builtin_va_arg_pack ()%>");
       /* Check for a built-in function.  */
       if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
 	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
--- gcc/doc/extend.texi.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-06 10:19:25.000000000 +0200
@@ -552,6 +552,32 @@ the containing function.  You should spe
 returned by @code{__builtin_apply}.
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack ()
+This built-in function represents all anonymous arguments of an inline
+function.  It can be used only in inline functions which will be always
+inlined, never compiled as a separate function, such as those using
+ at code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+It must be only passed as last argument to some other function
+with variable arguments.  This is useful for writing small wrapper
+inlines for variable argument functions, when using preprocessor
+macros is undesirable.  For example:
+ at smallexample
+extern int myprintf (FILE *f, const char *format, ...);
+extern inline __attribute__ ((__gnu_inline__)) int
+myprintf (FILE *f, const char *format, ...)
+@{
+  int r = fprintf (f, "myprintf: ");
+  if (r < 0)
+    return r;
+  int s = fprintf (f, format, __builtin_va_arg_pack ());
+  if (s < 0)
+    return s;
+  return r + s;
+@}
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/tree-pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree-pretty-print.c	2007-09-06 10:24:51.000000000 +0200
@@ -1128,6 +1128,15 @@ dump_generic_node (pretty_printer *buffe
       op1 = TREE_OPERAND (node, 1);
       if (op1)
 	dump_generic_node (buffer, op1, spc, flags, false);
+      if (CALL_EXPR_VA_ARG_PACK (node))
+	{
+	  if (op1)
+	    {
+	      pp_character (buffer, ',');
+	      pp_space (buffer);
+	    }
+	  pp_string (buffer, "__builtin_va_arg_pack ()");
+	}
       pp_character (buffer, ')');
 
       op1 = TREE_OPERAND (node, 2);
--- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
@@ -0,0 +1,143 @@
+/* __builtin_va_arg_pack () builtin tests.  */
+
+#include <stdarg.h>
+
+extern void abort (void);
+
+int v1 = 8;
+long int v2 = 3;
+void *v3 = (void *) &v2;
+struct A { char c[16]; } v4 = { "foo" };
+long double v5 = 40;
+char seen[20];
+int cnt;
+
+__attribute__ ((noinline)) int
+foo1 (int x, int y, ...)
+{
+  int i;
+  long int l;
+  void *v;
+  struct A a;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt;
+  if (y != 6)
+    abort ();
+  i = va_arg (ap, int);
+  if (i != 5)
+    abort ();
+  switch (x)
+    {
+    case 0:
+      i = va_arg (ap, int);
+      if (i != 9 || v1 != 9)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      v = (void *) va_arg (ap, struct A *);
+      if (v != (void *) &v4)
+	abort ();
+      l = va_arg (ap, long int);
+      if (l != 3 || v2 != 4)
+	abort ();
+      break;
+    case 1:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != ld)
+	abort ();
+      i = va_arg (ap, int);
+      if (i != 8)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x;
+}
+
+__attribute__ ((noinline)) int
+foo2 (int x, int y, ...)
+{
+  long long int ll;
+  void *v;
+  struct A a, b;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt | 64;
+  if (y != 10)
+    abort ();
+  switch (x)
+    {
+    case 11:
+      break;
+    case 12:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != 40)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      b = va_arg (ap, struct A);
+      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      ll = va_arg (ap, long long int);
+      if (ll != 16LL)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x + 8;
+}
+
+__attribute__ ((noinline)) int
+foo3 (void)
+{
+  return 6;
+}
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+bar (int x, ...)
+{
+  if (x < 10)
+    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
+  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  if (bar (0, ++v1, v4, &v4, v2++) != 0)
+    abort ();
+  if (bar (1, ++v5, 8, v3) != 1)
+    abort ();
+  if (bar (2) != 2)
+    abort ();
+  if (bar (v1 + 2) != 19)
+    abort ();
+  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1.c	2007-09-06 12:52:00.000000000 +0200
@@ -0,0 +1,46 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+extern inline __attribute__((always_inline)) int
+f2 (int y, ...)
+{
+  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f3 (int y, ...)
+{
+  return bar (y, "", 5, __builtin_va_arg_pack ());
+}
+
+extern inline __attribute__((always_inline)) int
+f4 (int y, ...)
+{
+  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f5 (int y, ...)
+{
+  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f6 (int y, ...)
+{
+  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
+}
+
+int
+test (void)
+{
+  int a = f2 (5, "a", 6);
+  a += f3 (6, "ab", 17LL);
+  a += f4 (7, 1, 2, 3);
+  a += f5 (8, 7L);
+  a += f6 (9);
+  return a;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1a.c.jj	2007-09-06 12:51:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1a.c	2007-09-06 12:52:09.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+int
+f1 (int x, ...)
+{
+  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gcc41.spec	1 Sep 2007 09:37:50 -0000	1.170
+++ gcc41.spec	6 Sep 2007 12:26:46 -0000	1.171
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 21
+%define gcc_release 22
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -147,6 +147,9 @@
 Patch31: gcc41-c++-gnu_inline.patch
 Patch32: gcc41-ppc-sync-qihi.patch
 Patch33: gcc41-ppc64-ia64-GNU-stack.patch
+Patch34: gcc41-builtin-chk-anticipated.patch
+Patch35: gcc41-builtin-throw.patch
+Patch36: gcc41-builtin-va-arg-pack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -463,6 +466,9 @@
 %patch31 -p0 -b .c++-gnu_inline~
 %patch32 -p0 -b .ppc-sync-qihi~
 %patch33 -p0 -b .ppc64-ia64-GNU-stack~
+%patch34 -p0 -b .builtin-chk-anticipated~
+%patch35 -p0 -b .builtin-throw~
+%patch36 -p0 -b .builtin-va-arg-pack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1617,6 +1623,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22
+- backport __builtin_va_arg_pack () support
+- make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked
+  and __builtin___{,v}{,f}printf_chk can throw
+- handle __*_chk builtins without __builtin_ in the name as anticipated in
+  C++
+
 * Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)



From fedora-extras-commits at redhat.com  Thu Sep  6 12:30:57 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Thu, 6 Sep 2007 08:30:57 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-chk-anticipated.patch, NONE,
	1.1 gcc41-builtin-throw.patch, NONE,
	1.1 gcc41-builtin-va-arg-pack.patch, NONE, 1.1 gcc41.spec, 1.162,
	1.163
Message-ID: <200709061230.l86CUvYG008107@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8080

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack.patch 
Log Message:
4.1.2-21.fc7


gcc41-builtin-chk-anticipated.patch:

--- NEW FILE gcc41-builtin-chk-anticipated.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33289
	* decl.c (builtin_function_1): Set DECL_ANTICIPATED also
	on __*_chk non-__builtin_* decls.

	* g++.dg/eh/builtin4.C: New test.

--- gcc/cp/decl.c.jj	2007-08-31 14:28:19.000000000 +0200
+++ gcc/cp/decl.c	2007-09-04 21:28:06.000000000 +0200
@@ -3517,6 +3529,17 @@ builtin_function_1 (tree decl, tree cont
      anticipated but not actually declared.  */
   if (name[0] != '_' || name[1] != '_')
     DECL_ANTICIPATED (decl) = 1;
+  else if (strncmp (name + 2, "builtin_", strlen ("builtin_")) != 0)
+    {
+      size_t len = strlen (name);
+
+      /* Treat __*_chk fortification functions as anticipated as well,
+	 unless they are __builtin_*.  */
+      if (len > strlen ("___chk")
+	  && memcmp (name + len - strlen ("_chk"),
+		     "_chk", strlen ("_chk") + 1) == 0)
+	DECL_ANTICIPATED (decl) = 1;
+    }
 
   return decl;
 }
--- gcc/testsuite/g++.dg/eh/builtin4.C.jj	2007-09-04 22:06:06.000000000 +0200
+++ gcc/testsuite/g++.dg/eh/builtin4.C	2007-09-04 22:07:03.000000000 +0200
@@ -0,0 +1,6 @@
+// PR c++/33289
+// { dg-do compile }
+
+typedef __SIZE_TYPE__ size_t;
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();
+extern "C" int __sprintf_chk (char *__restrict, int, size_t, const char *, ...) throw ();

gcc41-builtin-throw.patch:

--- NEW FILE gcc41-builtin-throw.patch ---
2007-09-06  Jakub Jelinek  <jakub at redhat.com>

	* builtin-attrs.def (ATTR_NONNULL_3): New.
	(DEF_FORMAT_ATTRIBUTE): Use just ATTR_NONNULL_##FA instead of
	ATTR_NOTHROW_NONNULL_##FA.
	(DEF_FORMAT_ATTRIBUTE_NOTHROW, DEF_FORMAT_ATTRIBUTE_BOTH): New macros.
	(ATTR_FORMAT_PRINTF_NOTHROW_2_0, ATTR_PRINTF_NOTHROW_2_3,
	ATTR_FORMAT_PRINTF_NOTHROW_3_0, ATTR_FORMAT_PRINTF_NOTHROW_3_4,
	ATTR_FORMAT_PRINTF_NOTHROW_4_0, ATTR_PRINTF_NOTHROW_4_5,
	ATTR_FORMAT_PRINTF_NOTHROW_5_0, ATTR_FORMAT_PRINTF_NOTHROW_5_6,
	ATTR_FORMAT_SCANF_NOTHROW_2_0, ATTR_FORMAT_SCANF_NOTHROW_2_3,
	ATTR_FORMAT_STRFTIME_NOTHROW_3_0, ATTR_FORMAT_STRFMON_NOTHROW_3_4):
	New.
	(ATTR_FORMAT_PRINTF_4_0, ATTR_PRINTF_4_5, ATTR_FORMAT_PRINTF_5_0,
	ATTR_FORMAT_PRINTF_5_6, ATTR_FORMAT_STRFTIME_3_0,
	ATTR_FORMAT_NOTHROW_3_4): Remove.
	* builtins.def (snprintf, sprintf, sscanf, vsnprintf, vsprintf,
	vsscanf, strfmon, strftime, __snprintf_chk, __sprintf_chk,
	__vsnprintf_chk, __vsprintf_chk): Use ATTR_FORMAT_*_NOTHROW_*
	instead of ATTR_FORMAT_*_*.

--- gcc/builtin-attrs.def.jj	2007-08-13 15:11:18.000000000 +0200
+++ gcc/builtin-attrs.def	2007-09-03 11:26:13.000000000 +0200
@@ -118,6 +118,8 @@ DEF_ATTR_TREE_LIST (ATTR_NONNULL_LIST, A
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_1, ATTR_NONNULL, ATTR_LIST_1, ATTR_NULL)
 /* Functions whose second parameter is a nonnull pointer.  */
 DEF_ATTR_TREE_LIST (ATTR_NONNULL_2, ATTR_NONNULL, ATTR_LIST_2, ATTR_NULL)
+/* Functions whose third parameter is a nonnull pointer.  */
+DEF_ATTR_TREE_LIST (ATTR_NONNULL_3, ATTR_NONNULL, ATTR_LIST_3, ATTR_NULL)
 /* Nothrow functions with the sentinel(1) attribute. */
 DEF_ATTR_TREE_LIST (ATTR_NOTHROW_SENTINEL_1, ATTR_SENTINEL, ATTR_LIST_1, \
 			ATTR_NOTHROW_LIST)
@@ -157,24 +159,38 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_
   DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
 		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
   DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_NOTHROW(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
+		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
+#define DEF_FORMAT_ATTRIBUTE_BOTH(TYPE, FA, VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL,		 \
+		      ATTR_##TYPE, ATTR_LIST_##VALUES)			 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT,	 \
+		      ATTR_##TYPE##_##VALUES, ATTR_NONNULL_##FA)	 \
+  DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_NOTHROW_##VALUES, ATTR_FORMAT,\
 		      ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,3,3_4)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,4,4_5)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_0)
-DEF_FORMAT_ATTRIBUTE(PRINTF,5,5_6)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(PRINTF,3,3_4)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,4,4_5)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(PRINTF,5,5_6)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_0)
 DEF_FORMAT_ATTRIBUTE(SCANF,1,1_2)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_0)
-DEF_FORMAT_ATTRIBUTE(SCANF,2,2_3)
-DEF_FORMAT_ATTRIBUTE(STRFTIME,3,3_0)
-DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_0)
+DEF_FORMAT_ATTRIBUTE_BOTH(SCANF,2,2_3)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFTIME,3,3_0)
+DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3_4)
 #undef DEF_FORMAT_ATTRIBUTE
+#undef DEF_FORMAT_ATTRIBUTE_NOTHROW
+#undef DEF_FORMAT_ATTRIBUTE_BOTH
 
 /* Construct a tree for a format_arg attribute.  */
 #define DEF_FORMAT_ARG_ATTRIBUTE(FA)					\
--- gcc/builtins.def.jj	2007-08-30 18:46:59.000000000 +0200
+++ gcc/builtins.def	2007-09-03 10:52:18.000000000 +0200
@@ -553,16 +553,16 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTCHAR
 DEF_LIB_BUILTIN        (BUILT_IN_PUTS, "puts", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PUTS_UNLOCKED, "puts_unlocked", BT_FN_INT_CONST_STRING, ATTR_NONNULL_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_SCANF, "scanf", BT_FN_INT_CONST_STRING_VAR, ATTR_FORMAT_SCANF_1_2)
-DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
-DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_2_3)
+DEF_C99_BUILTIN        (BUILT_IN_SNPRINTF, "snprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_SPRINTF, "sprintf", BT_FN_INT_STRING_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_2_3)
+DEF_LIB_BUILTIN        (BUILT_IN_SSCANF, "sscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VAR, ATTR_FORMAT_SCANF_NOTHROW_2_3)
 DEF_LIB_BUILTIN        (BUILT_IN_VFPRINTF, "vfprintf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
 DEF_C99_BUILTIN        (BUILT_IN_VFSCANF, "vfscanf", BT_FN_INT_FILEPTR_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
 DEF_LIB_BUILTIN        (BUILT_IN_VPRINTF, "vprintf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_1_0)
 DEF_C99_BUILTIN        (BUILT_IN_VSCANF, "vscanf", BT_FN_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_1_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)
-DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_2_0)
-DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSNPRINTF, "vsnprintf", BT_FN_INT_STRING_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_3_0)
+DEF_LIB_BUILTIN        (BUILT_IN_VSPRINTF, "vsprintf", BT_FN_INT_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_2_0)
+DEF_C99_BUILTIN        (BUILT_IN_VSSCANF, "vsscanf", BT_FN_INT_CONST_STRING_CONST_STRING_VALIST_ARG, ATTR_FORMAT_SCANF_NOTHROW_2_0)
 
 /* Category: ctype builtins.  */
 DEF_LIB_BUILTIN        (BUILT_IN_ISALNUM, "isalnum", BT_FN_INT_INT, ATTR_PURE_NOTHROW_LIST)
@@ -693,8 +693,8 @@ DEF_GCC_BUILTIN        (BUILT_IN_RETURN_
 DEF_GCC_BUILTIN        (BUILT_IN_SAVEREGS, "saveregs", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_STDARG_START, "stdarg_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_3_4)
-DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_3_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
+DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_UNWIND_INIT, "unwind_init", BT_FN_VOID, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_SETJMP_BUF, "update_setjmp_buf", BT_FN_VOID_PTR_INT, ATTR_NULL)
@@ -730,10 +730,10 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCAT_
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCPY_CHK, "__strcpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCAT_CHK, "__strncat_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCPY_CHK, "__strncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_5_6)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_4_5)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_5_0)
-DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_4_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_5_6)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_NOTHROW_4_5)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_5_0)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSPRINTF_CHK, "__vsprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_NOTHROW_4_0)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_FPRINTF_CHK, "__fprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_3_4)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_PRINTF_CHK, "__printf_chk", BT_FN_INT_INT_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_2_3)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_VFPRINTF_CHK, "__vfprintf_chk", BT_FN_INT_FILEPTR_INT_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_3_0)

gcc41-builtin-va-arg-pack.patch:

--- NEW FILE gcc41-builtin-va-arg-pack.patch ---
2007-09-05  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
	* tree.h (CALL_EXPR_VA_ARG_PACK): Define.
	* tree-inline.h (copy_body_data): Add call_expr field.
	* tree-inline.c (expand_call_inline): Initialize call_expr.
	(copy_bb): Append anonymous inline fn arguments to arguments
	when inlining a CALL_EXPR_VA_ARG_PACK call.
	* builtins.c (expand_builtin): Issue an error if
	BUILT_IN_VA_ARG_PACK is seen during expand.
	(fold_builtin_1): Don't fold calls with
	__builtin_va_arg_pack () call as last argument.
	* gimplify.c (gimplify_call_expr): If last argument to a vararg
	function is __builtin_va_arg_pack (), decrease number of call
	arguments and instead set CALL_EXPR_VA_ARG_PACK on the CALL_EXPR.
	* fold-const.c (fold): Don't fold CALL_EXPRs with
	CALL_EXPR_VA_ARG_PACK bit set.
	* expr.c (expand_expr_real_1): Issue an error if
	CALL_EXPR_VA_ARG_PACK CALL_EXPR is seen during expand.
	* tree-pretty-print.c (dump_generic_node): Handle printing
	CALL_EXPR_VA_ARG_PACK bit on CALL_EXPRs.
	* doc/extend.texi (__builtin_va_arg_pack): Document.

	* gcc.c-torture/execute/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1.c: New test.
	* gcc.dg/va-arg-pack-1a.c: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:09.000000000 +0200
+++ gcc/builtins.def	2007-09-06 10:19:24.000000000 +0200
@@ -665,6 +665,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_
 DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY, "va_copy", BT_FN_VOID_VALIST_REF_VALIST_ARG, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/tree.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree.h	2007-09-06 11:50:56.000000000 +0200
@@ -411,6 +411,8 @@ struct tree_common GTY(())
            VAR_DECL or FUNCTION_DECL or IDENTIFIER_NODE
        ASM_VOLATILE_P in
            ASM_EXPR
+       CALL_EXPR_VA_ARG_PACK in
+	  CALL_EXPR
        TYPE_CACHED_VALUES_P in
           ..._TYPE
        SAVE_EXPR_RESOLVED_P in
@@ -1066,6 +1068,11 @@ extern void omp_clause_range_check_faile
 #define SAVE_EXPR_RESOLVED_P(NODE) \
   (TREE_CHECK (NODE, SAVE_EXPR)->common.public_flag)
 
+/* Set on a CALL_EXPR if this stdarg call should be passed the argument
+   pack.  */
+#define CALL_EXPR_VA_ARG_PACK(NODE) \
+  (CALL_EXPR_CHECK(NODE)->common.public_flag)
+
 /* In any expression, decl, or constant, nonzero means it has side effects or
    reevaluation of the whole expression could produce a different value.
    This is set if any subexpression is a function call, a side effect or a
--- gcc/tree-inline.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/tree-inline.h	2007-09-06 10:19:24.000000000 +0200
@@ -57,6 +57,10 @@ typedef struct copy_body_data
   /* Current BLOCK.  */
   tree block;
 
+  /* CALL_EXPR if va arg parameter packs should be expanded or NULL
+     is not.  */
+  tree call_expr;
+
   /* Exception region the inlined call lie in.  */
   int eh_region;
   /* Take region number in the function being copied, add this value and
--- gcc/tree-inline.c.jj	2007-04-26 09:41:49.000000000 +0200
+++ gcc/tree-inline.c	2007-09-06 12:35:57.000000000 +0200
@@ -725,6 +725,22 @@ copy_bb (copy_body_data *id, basic_block
 
           bsi_insert_after (&copy_bsi, stmt, BSI_NEW_STMT);
 	  call = get_call_expr_in (stmt);
+	  if (call && CALL_EXPR_VA_ARG_PACK (call) && id->call_expr)
+	    {
+	      tree arglist, *a, p;
+	      TREE_OPERAND (call, 1) = copy_list (TREE_OPERAND (call, 1));
+
+	      for (a = &TREE_OPERAND (call, 1); *a; a = &TREE_CHAIN (*a))
+		;
+
+	      p = DECL_ARGUMENTS (id->src_fn);
+	      for (arglist = TREE_OPERAND (id->call_expr, 1);
+		   p; p = TREE_CHAIN (p), arglist = TREE_CHAIN (arglist))
+		;
+
+	      *a = copy_list (arglist);
+	      CALL_EXPR_VA_ARG_PACK (call) = 0;
+	    }
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
@@ -2085,6 +2101,7 @@ expand_call_inline (basic_block bb, tree
   /* Record the function we are about to inline.  */
   id->src_fn = fn;
   id->src_node = cg_edge->callee;
+  id->call_expr = t;
 
   initialize_inlined_parameters (id, args, TREE_OPERAND (t, 2), fn, bb);
 
--- gcc/builtins.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/builtins.c	2007-09-06 11:04:56.000000000 +0200
@@ -5979,6 +5979,12 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_ARGS_INFO:
       return expand_builtin_args_info (arglist);
 
+    case BUILT_IN_VA_ARG_PACK:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
@@ -9017,7 +9023,27 @@ fold_builtin_1 (tree fndecl, tree arglis
 {
   tree type = TREE_TYPE (TREE_TYPE (fndecl));
   enum built_in_function fcode;
+  tree a;
+
+  if (arglist)
+    {
+      for (a = arglist; TREE_CHAIN (a); a = TREE_CHAIN (a))
+	;
 
+      /* Before gimplification CALL_EXPR_VA_ARG_PACK is not set, but
+	 instead last argument is __builtin_va_arg_pack ().  Defer folding
+	 even in that case, until arguments are finalized.  */
+      if (TREE_CODE (TREE_VALUE (a)) == CALL_EXPR)
+	{
+	  tree fndecl2 = get_callee_fndecl (TREE_VALUE (a));
+	  if (fndecl2
+	      && TREE_CODE (fndecl2) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (fndecl2) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (fndecl2) == BUILT_IN_VA_ARG_PACK)
+	    return NULL_TREE;
+	}
+    }
+
   if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
     return targetm.fold_builtin (fndecl, arglist, ignore);
 
--- gcc/gimplify.c.jj	2007-08-31 09:47:46.000000000 +0200
+++ gcc/gimplify.c	2007-09-06 11:42:01.000000000 +0200
@@ -2018,6 +2018,55 @@ gimplify_call_expr (tree *expr_p, tree *
   ret = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, NULL,
 		       is_gimple_call_addr, fb_rvalue);
 
+  if (ret != GS_ERROR && TREE_OPERAND (*expr_p, 1))
+    {
+      int nargs;
+
+      for (nargs = 1, arglist = TREE_OPERAND (*expr_p, 1);
+	   TREE_CHAIN (arglist);
+	   arglist = TREE_CHAIN (arglist))
+	nargs++;
+
+      if (TREE_CODE (TREE_VALUE (arglist)) == CALL_EXPR)
+	{
+	  tree last_arg = TREE_VALUE (arglist);
+	  tree last_arg_fndecl = get_callee_fndecl (last_arg);
+
+	  if (last_arg_fndecl
+	      && TREE_CODE (last_arg_fndecl) == FUNCTION_DECL
+	      && DECL_BUILT_IN_CLASS (last_arg_fndecl) == BUILT_IN_NORMAL
+	      && DECL_FUNCTION_CODE (last_arg_fndecl) == BUILT_IN_VA_ARG_PACK)
+	    {
+	      tree p = NULL_TREE, *aptr;
+	      int i;
+
+	      if (decl && DECL_ARGUMENTS (decl))
+		p = DECL_ARGUMENTS (decl);
+	      else if (decl)
+		p = TYPE_ARG_TYPES (TREE_TYPE (decl));
+	      else if (POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (*expr_p, 0))))
+		p = TYPE_ARG_TYPES (TREE_TYPE (TREE_TYPE
+						(TREE_OPERAND (*expr_p, 0))));
+	      for (i = 0; p; p = TREE_CHAIN (p))
+		i++;
+
+	      if (i < nargs)
+		{
+		  TREE_OPERAND (*expr_p, 1)
+		    = copy_list (TREE_OPERAND (*expr_p, 1));
+
+		  for (aptr = &TREE_OPERAND (*expr_p, 1);
+		       TREE_CHAIN (*aptr);
+		       aptr = &TREE_CHAIN (*aptr))
+		    ;
+
+		  *aptr = NULL_TREE;
+		  CALL_EXPR_VA_ARG_PACK (*expr_p) = 1;
+		}
+	    }
+	}
+    }
+
   if (PUSH_ARGS_REVERSED)
     TREE_OPERAND (*expr_p, 1) = nreverse (TREE_OPERAND (*expr_p, 1));
   for (arglist = TREE_OPERAND (*expr_p, 1); arglist;
@@ -2037,7 +2086,7 @@ gimplify_call_expr (tree *expr_p, tree *
   if (ret != GS_ERROR)
     {
       decl = get_callee_fndecl (*expr_p);
-      if (decl && DECL_BUILT_IN (decl))
+      if (decl && DECL_BUILT_IN (decl) && !CALL_EXPR_VA_ARG_PACK (*expr_p))
 	{
 	  tree arglist = TREE_OPERAND (*expr_p, 1);
 	  tree new = fold_builtin (decl, arglist, !want_value);
--- gcc/fold-const.c.jj	2007-08-31 09:47:39.000000000 +0200
+++ gcc/fold-const.c	2007-09-06 11:40:55.000000000 +0200
@@ -10409,6 +10409,8 @@ fold (tree expr)
 	  op0 = TREE_OPERAND (t, 0);
 	  op1 = TREE_OPERAND (t, 1);
 	  op2 = TREE_OPERAND (t, 2);
+	  if (code == CALL_EXPR && CALL_EXPR_VA_ARG_PACK (t))
+	    return expr;
 	  tem = fold_ternary (code, type, op0, op1, op2);
 	  return tem ? tem : expr;
 	default:
--- gcc/expr.c.jj	2007-04-24 22:58:53.000000000 +0200
+++ gcc/expr.c	2007-09-06 10:19:24.000000000 +0200
@@ -7475,6 +7475,10 @@ expand_expr_real_1 (tree exp, rtx target
       return expand_expr (OBJ_TYPE_REF_EXPR (exp), target, tmode, modifier);
 
     case CALL_EXPR:
+      /* All valid uses of __builtin_va_arg_pack () are removed during
+	 inlining.  */
+      if (CALL_EXPR_VA_ARG_PACK (exp))
+	error ("invalid use of %<__builtin_va_arg_pack ()%>");
       /* Check for a built-in function.  */
       if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
 	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
--- gcc/doc/extend.texi.jj	2007-08-31 13:00:28.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-06 10:19:25.000000000 +0200
@@ -552,6 +552,32 @@ the containing function.  You should spe
 returned by @code{__builtin_apply}.
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack ()
+This built-in function represents all anonymous arguments of an inline
+function.  It can be used only in inline functions which will be always
+inlined, never compiled as a separate function, such as those using
+ at code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+It must be only passed as last argument to some other function
+with variable arguments.  This is useful for writing small wrapper
+inlines for variable argument functions, when using preprocessor
+macros is undesirable.  For example:
+ at smallexample
+extern int myprintf (FILE *f, const char *format, ...);
+extern inline __attribute__ ((__gnu_inline__)) int
+myprintf (FILE *f, const char *format, ...)
+@{
+  int r = fprintf (f, "myprintf: ");
+  if (r < 0)
+    return r;
+  int s = fprintf (f, format, __builtin_va_arg_pack ());
+  if (s < 0)
+    return s;
+  return r + s;
+@}
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/tree-pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/tree-pretty-print.c	2007-09-06 10:24:51.000000000 +0200
@@ -1128,6 +1128,15 @@ dump_generic_node (pretty_printer *buffe
       op1 = TREE_OPERAND (node, 1);
       if (op1)
 	dump_generic_node (buffer, op1, spc, flags, false);
+      if (CALL_EXPR_VA_ARG_PACK (node))
+	{
+	  if (op1)
+	    {
+	      pp_character (buffer, ',');
+	      pp_space (buffer);
+	    }
+	  pp_string (buffer, "__builtin_va_arg_pack ()");
+	}
       pp_character (buffer, ')');
 
       op1 = TREE_OPERAND (node, 2);
--- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
@@ -0,0 +1,143 @@
+/* __builtin_va_arg_pack () builtin tests.  */
+
+#include <stdarg.h>
+
+extern void abort (void);
+
+int v1 = 8;
+long int v2 = 3;
+void *v3 = (void *) &v2;
+struct A { char c[16]; } v4 = { "foo" };
+long double v5 = 40;
+char seen[20];
+int cnt;
+
+__attribute__ ((noinline)) int
+foo1 (int x, int y, ...)
+{
+  int i;
+  long int l;
+  void *v;
+  struct A a;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt;
+  if (y != 6)
+    abort ();
+  i = va_arg (ap, int);
+  if (i != 5)
+    abort ();
+  switch (x)
+    {
+    case 0:
+      i = va_arg (ap, int);
+      if (i != 9 || v1 != 9)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      v = (void *) va_arg (ap, struct A *);
+      if (v != (void *) &v4)
+	abort ();
+      l = va_arg (ap, long int);
+      if (l != 3 || v2 != 4)
+	abort ();
+      break;
+    case 1:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != ld)
+	abort ();
+      i = va_arg (ap, int);
+      if (i != 8)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x;
+}
+
+__attribute__ ((noinline)) int
+foo2 (int x, int y, ...)
+{
+  long long int ll;
+  void *v;
+  struct A a, b;
+  long double ld;
+  va_list ap;
+
+  va_start (ap, y);
+  if (x < 0 || x >= 20 || seen[x])
+    abort ();
+  seen[x] = ++cnt | 64;
+  if (y != 10)
+    abort ();
+  switch (x)
+    {
+    case 11:
+      break;
+    case 12:
+      ld = va_arg (ap, long double);
+      if (ld != 41 || v5 != 40)
+	abort ();
+      a = va_arg (ap, struct A);
+      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
+	abort ();
+      b = va_arg (ap, struct A);
+      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
+	abort ();
+      v = va_arg (ap, void *);
+      if (v != &v2)
+	abort ();
+      ll = va_arg (ap, long long int);
+      if (ll != 16LL)
+	abort ();
+      break;
+    case 2:
+      break;
+    default:
+      abort ();
+    }
+  va_end (ap);
+  return x + 8;
+}
+
+__attribute__ ((noinline)) int
+foo3 (void)
+{
+  return 6;
+}
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+bar (int x, ...)
+{
+  if (x < 10)
+    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
+  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  if (bar (0, ++v1, v4, &v4, v2++) != 0)
+    abort ();
+  if (bar (1, ++v5, 8, v3) != 1)
+    abort ();
+  if (bar (2) != 2)
+    abort ();
+  if (bar (v1 + 2) != 19)
+    abort ();
+  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1.c	2007-09-06 12:52:00.000000000 +0200
@@ -0,0 +1,46 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+extern inline __attribute__((always_inline)) int
+f2 (int y, ...)
+{
+  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f3 (int y, ...)
+{
+  return bar (y, "", 5, __builtin_va_arg_pack ());
+}
+
+extern inline __attribute__((always_inline)) int
+f4 (int y, ...)
+{
+  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f5 (int y, ...)
+{
+  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
+}
+
+extern inline __attribute__((always_inline)) int
+f6 (int y, ...)
+{
+  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
+}
+
+int
+test (void)
+{
+  int a = f2 (5, "a", 6);
+  a += f3 (6, "ab", 17LL);
+  a += f4 (7, 1, 2, 3);
+  a += f5 (8, 7L);
+  a += f6 (9);
+  return a;
+}
--- gcc/testsuite/gcc.dg/va-arg-pack-1a.c.jj	2007-09-06 12:51:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-1a.c	2007-09-06 12:52:09.000000000 +0200
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int bar (int, const char *, int, ...);
+int baz (int, const char *, long int);
+
+int
+f1 (int x, ...)
+{
+  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gcc41.spec	1 Sep 2007 09:50:08 -0000	1.162
+++ gcc41.spec	6 Sep 2007 12:30:25 -0000	1.163
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 20
+%define gcc_release 21
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -145,6 +145,9 @@
 Patch31: gcc41-c++-gnu_inline.patch
 Patch32: gcc41-ppc-sync-qihi.patch
 Patch33: gcc41-ppc64-ia64-GNU-stack.patch
+Patch34: gcc41-builtin-chk-anticipated.patch
+Patch35: gcc41-builtin-throw.patch
+Patch36: gcc41-builtin-va-arg-pack.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -461,6 +464,9 @@
 %patch31 -p0 -b .c++-gnu_inline~
 %patch32 -p0 -b .ppc-sync-qihi~
 %patch33 -p0 -b .ppc64-ia64-GNU-stack~
+%patch34 -p0 -b .builtin-chk-anticipated~
+%patch35 -p0 -b .builtin-throw~
+%patch36 -p0 -b .builtin-va-arg-pack~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1615,6 +1621,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21.fc7
+- backport __builtin_va_arg_pack () support
+- make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked
+  and __builtin___{,v}{,f}printf_chk can throw
+- handle __*_chk builtins without __builtin_ in the name as anticipated in
+  C++
+
 * Sat Sep  1 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-20.fc7
 - fix libmudflap-devel multilib conflict on ppc/ppc64 and sparc/sparc64
   (#270281)



From fedora-extras-commits at redhat.com  Thu Sep  6 12:33:16 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:33:16 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.12,1.13
Message-ID: <200709061233.l86CXGqt008226@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8175

Modified Files:
	MultiLib.py 
Log Message:
- multi-lib resolver needs to work in testing repos and be
able to copy new multi-lib deps from stable in order to avoid
broken deps



Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MultiLib.py	8 Mar 2007 12:02:18 -0000	1.12
+++ MultiLib.py	6 Sep 2007 12:33:13 -0000	1.13
@@ -108,12 +108,12 @@
             hdr = rpmUtils.miscutils.hdrFromPackage(ts,srpmloc)
             excludearch = hdr['excludearch']
         except rpmUtils.RpmUtilsError, e:  # source rpm not there or bad
-            print 'ERROR: %s' % e
+            print 'ERROR: %s' % ''.join(e)
             print srpmloc
             print 'referenced by: %s' % fname
             # TODO: We don't want such builds! Do something about it.
-            # Is this case possible at all? Or only during dep resolving
-            # and when running into old pkgs?
+            # This is normal for multi-lib, where a test update pulls in
+            # deps from stable as long as it stays in updates-testing.
             srcrpm = None
             excludearch = []
         
@@ -172,8 +172,6 @@
         self.resolved = {}
         self.seenbefore = []
         self.needed = {}
-        self.needed['rpms'] = []
-        self.needed['debug'] = []
 
     def readMetadata(self):
         self.doRepoSetup()
@@ -182,18 +180,22 @@
             self.repos.populateSack(which=[repo.id], with='filelists')
 
     def addNeededPkg(self,pkg):
+        self.needed.setdefault(pkg.repoid,{})
+        self.needed[pkg.repoid].setdefault('rpms',[])
+        self.needed[pkg.repoid].setdefault('debug',[])
+        
         (n,a,e,v,r) = pkg.returnPackageTuple()
         file = '%s-%s-%s.%s.rpm' % (n,v,r,a)
-        if file not in self.needed['rpms']:
-            self.needed['rpms'].append(file)
+        if file not in self.needed[pkg.repoid]['rpms']:
+            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['debug']:
-                self.needed['debug'].append(debugrpm)
+            if debugrpm not in self.needed[pkg.repoid]['debug']:
+                self.needed[pkg.repoid]['debug'].append(debugrpm)
                 print ' +', debugrpm
 
     def resolveRequires(self,pkg):
@@ -240,15 +242,22 @@
         return False
     missingdict[targetarch].setdefault('rpms',[])
     missingdict[targetarch].setdefault('debug',[])
-    
+
+    dotesting = dist.startswith('testing/')
+    testdist = dist
+    if dotesting:
+        dist = dist.replace('testing/','')
+
     rs = RepoSupport.RepoSupport(cfg)
     conf = rs.GenerateConfig([dist])
 
     repoids = []
     srcarch = rpmUtils.arch.getBaseArch( rpmUtils.arch.multilibArches[targetarch][0] )
-    # Only look at basearch repo.
     a = srcarch
-    for r in rs.ReleaseRepoList(dist):
+    repolist = rs.ReleaseRepoList(dist)
+    if dotesting:
+        repolist += rs.TestRepoList(dist)
+    for r in repolist:
         if r.find(cfg.project) < 0:  # only look at our project's repos
             continue
         repoids.append(rs.RepoId(r,dist,a))
@@ -256,7 +265,7 @@
 
     # Only look at multicompat packages.
     my = Resolver(arch = srcarch, config = conf,
-                  pushcfg=cfg, dist=dist, targetarch=targetarch)
+                  pushcfg=cfg, dist=testdist, targetarch=targetarch)
     os.remove(conf)
     for repo in my.repos.repos.values():
         if repo.id not in repoids:
@@ -278,7 +287,7 @@
     Utils.fix_mdcache_access(cfg.rundir,cfg.cachedir)
 
     ts = rpmUtils.transaction.initReadOnlyTransaction()
-    compatrepodir = os.path.join(cfg.treedir,dist,srcarch)
+    compatrepodir = os.path.join(cfg.treedir,testdist,srcarch)
     for f in missingdict[targetarch]['rpms']:
         print f
         fpath = os.path.join(compatrepodir,f)
@@ -287,19 +296,41 @@
 
     changed = False
     print 'Installing needed packages for %s:' % targetarch
-    for f in my.needed['rpms']+missingdict[targetarch]['rpms']:
-        srcfile = os.path.join(cfg.treedir,dist,srcarch,f)
-        destfile = os.path.join(cfg.treedir,dist,targetarch,f)
+
+    def addrpm(f,src,dest):
+        srcfile = os.path.join(src,f)
+        destfile = os.path.join(dest,f)
+        if not os.path.exists(srcfile):
+            print 'WARNING: missing', srcfile
+            return False
         if not os.path.exists(destfile):  # silent extra-check
+            print 'Adding:', destfile
             Utils.install_link_or_copy(srcfile,destfile)
+            return True
+        else:
+            return False
+
+    destreporoot = os.path.join(cfg.treedir,testdist,targetarch)
+    srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+    for f in missingdict[targetarch]['rpms']:
+        if addrpm(f,srcreporoot,destreporoot):
             changed = True
-    for f in my.needed['debug']:
-        srcfile = os.path.join(cfg.treedir,dist,srcarch,'debug',f)
-        destfile = os.path.join(cfg.treedir,dist,targetarch,'debug',f)
-        if os.path.exists(srcfile):
-            if not os.path.exists(destfile):  # silent extra-check
-                Utils.install_link_or_copy(srcfile,destfile)
+    
+    for repoid in my.needed.keys():
+        if repoid.find('testing')<0:
+            # Make available new multi-lib deps from non-testing repo.
+            srcreporoot = os.path.join(cfg.treedir,dist,srcarch)
+        else:
+            srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+        for f in my.needed[repoid]['rpms']:
+            if addrpm(f,srcreporoot,destreporoot):
+                changed = True
+        destdebugreporoot = os.path.join(destreporoot,'debug')
+        srcdebugreporoot = os.path.join(srcreporoot,'debug')
+        for f in my.needed[repoid]['debug']:
+            if addrpm(f,srcdebugreporoot,destdebugreporoot):
                 changed = True
+
     print 'done.'
         
     return changed



From fedora-extras-commits at redhat.com  Thu Sep  6 12:37:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 08:37:33 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.125,
	1.126 libselinux.spec, 1.282, 1.283
Message-ID: <200709061237.l86CbXec008388@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8354

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- libselinux-rhat.patch	3 Aug 2007 20:06:53 -0000	1.125
+++ libselinux-rhat.patch	6 Sep 2007 12:37:00 -0000	1.126
@@ -1,12 +1,46 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.24/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.24/src/matchpathcon.c	2007-07-23 10:21:34.000000000 -0400
-@@ -65,7 +65,7 @@
- #ifdef __GNUC__
-     __attribute__ ((format(printf, 1, 2)))
- #endif
--    (*myprintf) (const char *fmt,...);
-+    (*myprintf) (const char *fmt,...) = &default_printf;
- 
- void set_matchpathcon_printf(void (*f) (const char *fmt, ...))
- {
+Index: libselinux/src/selinuxswig_python.i
+===================================================================
+--- libselinux/src/selinuxswig_python.i	(revision 2549)
++++ libselinux/src/selinuxswig_python.i	(working copy)
+@@ -98,4 +98,41 @@
+ 	}
+ }
+ 
++%typemap(in) char * const [] {
++	int i, size;
++	PyObject * s;
++
++	if (!PySequence_Check($input)) {
++		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
++		return NULL;
++	}
++
++	size = PySequence_Size($input);
++	
++	$1 = (char**) malloc(size + 1);
++
++	for(i = 0; i < size; i++) {
++		if (!PyString_Check(PySequence_GetItem($input, i))) {
++			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
++			return NULL;
++		}
++	}
++		
++	for(i = 0; i < size; i++) {
++		s = PySequence_GetItem($input, i);
++		$1[i] = (char*) malloc(PyString_Size(s) + 1);
++		strcpy($1[i], PyString_AsString(s));
++	}
++	$1[size] = NULL;
++}
++
++%typemap(freearg,match="in") char * const [] {
++	int i = 0;
++	while($1[i]) {
++		free($1[i]);
++		i++;
++	}
++	free($1);
++}
++
+ %include "selinuxswig.i"


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- libselinux.spec	28 Aug 2007 15:27:49 -0000	1.282
+++ libselinux.spec	6 Sep 2007 12:37:00 -0000	1.283
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.31
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -122,6 +124,9 @@
 
 %changelog
 
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
+- Apply James Athway patch to fix rpm_execcon python binding
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-3
 - Move libselinux.so back into main package, breaks procps
 



From fedora-extras-commits at redhat.com  Thu Sep  6 12:46:22 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 08:46:22 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1301,1.1302
Message-ID: <200709061246.l86CkMi6008558@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8530

Modified Files:
	openoffice.org.spec 
Log Message:
shite, forgot libsoffice.so


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -r1.1301 -r1.1302
--- openoffice.org.spec	6 Sep 2007 12:23:17 -0000	1.1301
+++ openoffice.org.spec	6 Sep 2007 12:45:50 -0000	1.1302
@@ -1942,7 +1942,7 @@
 %{instdir}/program/setofficelang*
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
-%{instdir}/program/libsoffice.so
+#%{instdir}/program/libsoffice.so
 %{instdir}/program/sofficerc
 %{instdir}/program/spadmin
 %{instdir}/program/spadmin.bin



From fedora-extras-commits at redhat.com  Thu Sep  6 12:55:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 08:55:03 -0400
Subject: extras-buildsys/utils/pushscript RepoSupport.py,1.5,1.6
Message-ID: <200709061255.l86Ct33c009415@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9397

Modified Files:
	RepoSupport.py 
Log Message:
refresh metadata sooner


Index: RepoSupport.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoSupport.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepoSupport.py	6 Sep 2007 12:23:58 -0000	1.5
+++ RepoSupport.py	6 Sep 2007 12:55:00 -0000	1.6
@@ -83,6 +83,7 @@
 reposdir=/dev/null
 exactarch=1
 obsoletes=1
+metadata_expire=300
 retries=20
 
 """ % (cachedir)



From fedora-extras-commits at redhat.com  Thu Sep  6 13:23:24 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 09:23:24 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.13,1.14
Message-ID: <200709061323.l86DNOro015717@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15699

Modified Files:
	MultiLib.py 
Log Message:
consider that testing requires stable


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MultiLib.py	6 Sep 2007 12:33:13 -0000	1.13
+++ MultiLib.py	6 Sep 2007 13:23:21 -0000	1.14
@@ -320,14 +320,22 @@
         if repoid.find('testing')<0:
             # Make available new multi-lib deps from non-testing repo.
             srcreporoot = os.path.join(cfg.treedir,dist,srcarch)
+            addfromext = True
         else:
             srcreporoot = os.path.join(cfg.treedir,testdist,srcarch)
+            addfromext = False
         for f in my.needed[repoid]['rpms']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,f)):
+                    continue
             if addrpm(f,srcreporoot,destreporoot):
                 changed = True
         destdebugreporoot = os.path.join(destreporoot,'debug')
         srcdebugreporoot = os.path.join(srcreporoot,'debug')
         for f in my.needed[repoid]['debug']:
+            if addfromext:
+                if os.path.exists(os.path.join(cfg.treedir,dist,targetarch,'debug',f)):
+                    continue
             if addrpm(f,srcdebugreporoot,destdebugreporoot):
                 changed = True
 



From fedora-extras-commits at redhat.com  Thu Sep  6 13:29:33 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:29:33 -0400
Subject: rpms/system-config-vsftpd/devel system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061329.l86DTXdx015930@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15907

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:29:00 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:29:00 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:43:08 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:43:08 -0400
Subject: rpms/system-config-vsftpd/F-7 system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061343.l86Dh8vI016272@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16239

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:42:36 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:42:36 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:48:58 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 09:48:58 -0400
Subject: rpms/kbackup/devel kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore, 
	1.3, 1.4 kbackup.spec, 1.11, 1.12 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061348.l86Dmw0q016538@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16402

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
----------------------------------------------------------------------


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 13:48:25 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/kbackup.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kbackup.spec	21 Aug 2007 16:56:54 -0000	1.11
+++ kbackup.spec	6 Sep 2007 13:48:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	8%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
@@ -8,9 +8,8 @@
 License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,11 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-8
   - Licence tag clarification
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 13:48:25 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 13:50:39 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Thu, 6 Sep 2007 09:50:39 -0400
Subject: rpms/system-config-vsftpd/FC-6 system-config-vsftpd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709061350.l86DodxT016649@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/system-config-vsftpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622

Modified Files:
	.cvsignore sources 
Added Files:
	system-config-vsftpd.spec 
Log Message:
First build


--- NEW FILE system-config-vsftpd.spec ---
Name: system-config-vsftpd
Version: 0.4.5
Release: 1%{?dist}
Summary: A graphical interface for administering vsftpd server

Group: Applications/System
License: GPLv2+
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
Requires: python >= 2.4, pygtk2, pygtk2-libglade, usermode

%description
System-config-vsftpd is a graphical utility for administrating 
Very Secure FTP Daemon ( VSFTPD ).

%prep
%setup -q -n %{name}-%{version}

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT
make usermode DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"  --delete-original         \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

#%preun
#if [ $1 = 0 ]; then
#  if [ -d /usr/share/system-config-vsftpd ] ; then
#    rm -rf /usr/share/system-config-vsftpd/*.pyc
#  fi
#fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_sbindir}/%{name}

%{_mandir}/man1/*
%dir %{_datadir}/%{name}
%dir %{_datadir}/pixmaps/system-config-vsftpd
%dir %{_datadir}/pixmaps/system-config-vsftpd/ico

%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.pyc
%{_datadir}/%{name}/*.pyo

%{_datadir}/pixmaps/system-config-vsftpd.png
%{_datadir}/pixmaps/system-config-vsftpd/ico/*.png
%{_datadir}/kontrol-panel
%{_datadir}/applications
%{_datadir}/%{name}/system-config-vsftpd.glade

%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}

%changelog
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
- fix number of clients if passive com. used
- disable sensitive File->New and File->Open due to malfunction
- Add About dialog
- Add uninstall method to Makefile, few cosmetic changes in Makefile

* Wed Aug 22 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.4-1
- Few changes in spec file because adding to Fedora-extras
- First steps of adding virtual users tab (still disabled
  in this version)
- Few cosmetic fixes

* Thu Aug 09 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.3-2
- Added dialog for choosing a config file
- In transfer log on calendar day-change first possible IP
  is selected
- Changed version formating from X.x-y to X.x.y
- Removed warnings on gtk <2.10 in set_grid_lines function
- Added variable __LOCAL in main.py->__init__ for testing

* Wed Aug 08 2007 Maros Barabas <mbarabas at redhat.com> - 0.4-2
- Changed transfer log 

* Mon Jun 18 2007 Maros Barabas <mbarabas at redhat.com> - 0.3-1
- initializing


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 20:19:03 -0000	1.1
+++ .cvsignore	6 Sep 2007 13:50:07 -0000	1.2
@@ -0,0 +1 @@
+system-config-vsftpd-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 20:19:03 -0000	1.1
+++ sources	6 Sep 2007 13:50:07 -0000	1.2
@@ -0,0 +1 @@
+3044217ab5b2dc6451d1d19d64c7af75  system-config-vsftpd-0.4.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 13:58:25 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 09:58:25 -0400
Subject: rpms/kbackup/F-7 kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 kbackup.spec, 1.10, 1.11 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061358.l86DwPcO016862@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16823

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
  - Licence tag clarification


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 13:57:53 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/kbackup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kbackup.spec	12 Jul 2007 12:34:22 -0000	1.10
+++ kbackup.spec	6 Sep 2007 13:57:53 -0000	1.11
@@ -1,16 +1,15 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
 Group:		Applications/Archiving
-License:	GPL
+License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,12 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+  - Licence tag clarification
+
 * Thu Jul 12 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-7
   - Disable parallel building until this is fixed by upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 13:57:53 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 14:00:58 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 6 Sep 2007 10:00:58 -0400
Subject: rpms/kbackup/FC-6 kbackup-0.5.2.fr.po.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 kbackup.spec, 1.8, 1.9 sources, 1.3,
	1.4 kbackup-0.5.1.docbook-fr.patch, 1.1,
	NONE kbackup-0.5.1.fr.po.patch, 1.1,
	NONE kbackup-0.5.desktop.Encoding.patch, 1.1,
	NONE kbackup-0.5.fr.po.patch, 1.1, NONE
Message-ID: <200709061400.l86E0wEe016976@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/kbackup/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16948

Modified Files:
	.cvsignore kbackup.spec sources 
Added Files:
	kbackup-0.5.2.fr.po.patch 
Removed Files:
	kbackup-0.5.1.docbook-fr.patch kbackup-0.5.1.fr.po.patch 
	kbackup-0.5.desktop.Encoding.patch kbackup-0.5.fr.po.patch 
Log Message:
  - New upstream version
  - Update patch 1
  - Remove patch 2 that is no more needed
  - Licence tag clarification


kbackup-0.5.2.fr.po.patch:

--- NEW FILE kbackup-0.5.2.fr.po.patch ---
--- po/fr.po.orig	2007-08-19 15:10:39.000000000 +0200
+++ po/fr.po	2007-09-06 15:18:37.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-17 19:52+0200\n"
-"PO-Revision-Date: 2007-07-17 14:52+0200\n"
+"PO-Revision-Date: 2007-09-06 15:18+0200\n"
 "Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
 "Language-Team: Fran??ais <traduc at traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -379,17 +379,13 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
-"R??gis Floret\n"
-"Alain Portal"
+msgstr "R??gis Floret,Alain Portal"
 
 #: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
-"regis <r.floret at laposte.net>\n"
-"alain.portal at univ-montp2.fr"
+msgstr "r.floret at laposte.net,alain.portal at univ-montp2.fr"
 
 #: SettingsDialog.ui.h:18
 msgid "650 MB CD"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 08:40:37 -0000	1.3
+++ .cvsignore	6 Sep 2007 14:00:25 -0000	1.4
@@ -1 +1 @@
-kbackup-0.5.1.tar.bz2
+kbackup-0.5.2.tar.bz2


Index: kbackup.spec
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/kbackup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kbackup.spec	12 Jul 2007 12:36:37 -0000	1.8
+++ kbackup.spec	6 Sep 2007 14:00:25 -0000	1.9
@@ -1,16 +1,15 @@
 Name:		kbackup
-Version:	0.5.1
-Release:	7%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos donn??es de mani??re simple et conviviale
 
 Group:		Applications/Archiving
-License:	GPL
+License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
 Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-%{version}.desktop.Encoding.patch
-Patch1:		%{name}-%{version}.fr.po.patch
-Patch2:		%{name}-%{version}.docbook-fr.patch
+Patch0:		%{name}-0.5.1.desktop.Encoding.patch
+Patch1:		%{name}-0.5.2.fr.po.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
@@ -35,7 +34,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -104,6 +102,12 @@
 %{_datadir}/mimelnk/text/x-kbp.desktop
 
 %changelog
+* Thu Sep  6 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.2-1
+  - New upstream version
+  - Update patch 1
+  - Remove patch 2 that is no more needed
+  - Licence tag clarification
+
 * Thu Jul 12 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.5.1-7
   - Disable parallel building until this is fixed by upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbackup/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 08:40:37 -0000	1.3
+++ sources	6 Sep 2007 14:00:25 -0000	1.4
@@ -1 +1 @@
-9aafae574623d173c454357e0afa0b12  kbackup-0.5.1.tar.bz2
+33d55815990c198ccecffd5e85b2a5ae  kbackup-0.5.2.tar.bz2


--- kbackup-0.5.1.docbook-fr.patch DELETED ---


--- kbackup-0.5.1.fr.po.patch DELETED ---


--- kbackup-0.5.desktop.Encoding.patch DELETED ---


--- kbackup-0.5.fr.po.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 14:15:55 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 10:15:55 -0400
Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.8,1.9
Message-ID: <200709061415.l86EFtQS023250@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226

Modified Files:
	ocaml-findlib.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-14
- Ignore Parsetree module, it's a part of the toplevel.



Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-findlib.spec	3 Sep 2007 17:14:46 -0000	1.8
+++ ocaml-findlib.spec	6 Sep 2007 14:15:23 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-findlib
 Version:        1.1.2pl1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -23,7 +23,7 @@
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-14
+- Ignore Parsetree module, it's a part of the toplevel.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-13
 - Bump version to force rebuild against ocaml -6 release.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:48 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 10:26:48 -0400
Subject: rpms/firefox/devel firefox.spec,1.193,1.194
Message-ID: <200709061426.l86EQm8r023744@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23708

Modified Files:
	firefox.spec 
Log Message:
* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
- Fix default page for all locales



Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- firefox.spec	29 Aug 2007 17:03:19 -0000	1.193
+++ firefox.spec	6 Sep 2007 14:26:15 -0000	1.194
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -192,7 +192,14 @@
 %endif
 
 # set up our default bookmarks
-cp %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
+%{__cp} %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
+
+# set up our default homepage
+%{__cat} >> %{SOURCE12} << EOF
+pref("browser.startup.homepage", "%{homepage}");
+pref("startup.homepage_override_url", "%{homepage}");
+pref("startup.homepage_welcome_url", "%{homepage}");
+EOF
 
 
 #---------------------------------------------------------------------
@@ -431,6 +438,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
+- Fix default page for all locales
+
 * Wed Aug 29 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-5
 - Tweak the default home page
 



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:53 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:26:53 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchbugzilla
Message-ID: <200709061426.l86EQt4C030478@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchbugzilla acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:26:54 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:26:54 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061426.l86EQtV9030490@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:01 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:01 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchbugzilla
Message-ID: <200709061427.l86ER1Ra030503@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchbugzilla acl on knetworkmanager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:02 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:02 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061427.l86ER7at030512@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:07 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:07 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested commit
Message-ID: <200709061427.l86ER78o030530@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the commit acl on knetworkmanager (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:06 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:06 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested watchcommits
Message-ID: <200709061427.l86ER7E6030521@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the watchcommits acl on knetworkmanager (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:12 2007
From: fedora-extras-commits at redhat.com (Roland Wolters (wolters.liste))
Date: Thu, 06 Sep 2007 07:27:12 -0700
Subject: [pkgdb] knetworkmanager: liquidat has requested commit
Message-ID: <200709061427.l86ERC5Q030541@app3.fedora.phx.redhat.com>

Roland Wolters (liquidat) has requested the commit acl on knetworkmanager (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:27:51 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 10:27:51 -0400
Subject: rpms/mash/devel .cvsignore, 1.14, 1.15 mash.spec, 1.12, 1.13 sources,
	1.15, 1.16
Message-ID: <200709061427.l86ERpMr023820@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23796

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Sep 2007 19:08:16 -0000	1.14
+++ .cvsignore	6 Sep 2007 14:27:19 -0000	1.15
@@ -1 +1 @@
-mash-0.2.2.tar.gz
+mash-0.2.3.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mash.spec	4 Sep 2007 19:08:16 -0000	1.12
+++ mash.spec	6 Sep 2007 14:27:19 -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:           mash
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.2.3-1
+- blacklist java-1.7.0-icedtea-devel (#271761)
+
 * Tue Sep  4 2007 Bill Nottingham <notting at redhat.com> 0.2.2-1
 - add nspluginwrapper to multilib whitelist (#275021)
 - fix kernel-devel (#247321)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Sep 2007 19:08:16 -0000	1.15
+++ sources	6 Sep 2007 14:27:19 -0000	1.16
@@ -1 +1 @@
-a667f16ef419392f001cc012e1ce95be  mash-0.2.2.tar.gz
+e3da610758f7d1c7ce5568dc44746541  mash-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 14:30:33 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 6 Sep 2007 10:30:33 -0400
Subject: rpms/firefox/devel firefox-redhat-default-prefs.js,1.8,1.9
Message-ID: <200709061430.l86EUXQw023929@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23897

Modified Files:
	firefox-redhat-default-prefs.js 
Log Message:
* Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
- Fix default page for all locales



Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- firefox-redhat-default-prefs.js	10 Apr 2007 20:27:00 -0000	1.8
+++ firefox-redhat-default-prefs.js	6 Sep 2007 14:30:01 -0000	1.9
@@ -2,9 +2,6 @@
 pref("app.update.autoInstallEnabled", false);
 pref("browser.display.use_system_colors",   true);
 pref("browser.link.open_external",          3);
-pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_override_url", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_welcome_url", "file:///usr/share/doc/HTML/index.html");
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");



From fedora-extras-commits at redhat.com  Thu Sep  6 14:34:29 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 6 Sep 2007 10:34:29 -0400
Subject: devel/yum-updatesd yum-updatesd.spec,1.2,1.3
Message-ID: <200709061434.l86EYTMu024158@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24139

Modified Files:
	yum-updatesd.spec 
Log Message:
add source url


Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-updatesd.spec	5 Sep 2007 23:36:21 -0000	1.2
+++ yum-updatesd.spec	6 Sep 2007 14:33:56 -0000	1.3
@@ -5,7 +5,7 @@
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.bz2
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
 BuildRequires: python



From fedora-extras-commits at redhat.com  Thu Sep  6 14:46:55 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 10:46:55 -0400
Subject: rpms/gnash/devel gnash.spec,1.8,1.9
Message-ID: <200709061446.l86EktPq024535@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24476

Modified Files:
	gnash.spec 
Log Message:
agg is now the default renderer


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnash.spec	6 Sep 2007 11:56:09 -0000	1.8
+++ gnash.spec	6 Sep 2007 14:46:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@
 # modular Xorg 
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
+BuildRequires:  agg-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
@@ -166,8 +167,9 @@
 #%{_bindir}/cygnal
 
 %changelog
-* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-1
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
+- agg is now the default renderer
 
 * Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
 - rebuild for boost soname change



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:15 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:15 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnGqJ030736@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora devel) to Approved for Roland Wolters (liquidat)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:30 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:30 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnUJH030750@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the watchcommits acl on knetworkmanager (Fedora 7) to Approved for Roland Wolters (liquidat)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:32 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:32 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnWiK030759@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 7) to Approved for Roland Wolters (liquidat)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:39 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:39 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnebO030769@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 5) to Approved for Roland Wolters (liquidat)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 14:49:45 2007
From: fedora-extras-commits at redhat.com (Dennis Gilmore (dennis))
Date: Thu, 06 Sep 2007 07:49:45 -0700
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <200709061449.l86EnjNZ030778@app3.fedora.phx.redhat.com>

Dennis Gilmore (ausil) has set the commit acl on knetworkmanager (Fedora 6) to Approved for Roland Wolters (liquidat)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knetworkmanager



From fedora-extras-commits at redhat.com  Thu Sep  6 15:00:03 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 11:00:03 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.47,
	1.48 selinux-policy.spec, 1.514, 1.515
Message-ID: <200709061500.l86F031i026973@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26942

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
- Define user_home_type as home_type


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- policy-20070703.patch	6 Sep 2007 02:24:18 -0000	1.47
+++ policy-20070703.patch	6 Sep 2007 15:00:00 -0000	1.48
@@ -368,6 +368,41 @@
 +	hal_use_fds(alsa_t)
 +	hal_write_log(alsa_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.7/policy/modules/admin/amanda.if
+--- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-29 14:10:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 10:18:35.000000000 -0400
+@@ -71,6 +71,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Search amanda var library directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`amanda_search_var_lib',`
++	gen_require(`
++		type amanda_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 amanda_var_lib_t:dir search_dir_perms;
++
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to read /etc/dumpdates.
+ ## </summary>
+ ## <param name="domain">
+@@ -141,3 +161,4 @@
+ 
+ 	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-08-28 15:53:39.000000000 -0400
@@ -4634,7 +4669,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 10:19:10.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -4724,7 +4759,7 @@
  ifdef(`distro_debian',`
  	optional_policy(`
  		# Debian logcheck has the home dir set to its cache
-@@ -180,6 +201,15 @@
+@@ -180,11 +201,24 @@
  	locallogin_link_keys(crond_t)
  ')
  
@@ -4740,7 +4775,16 @@
  tunable_policy(`fcron_crond', `
  	allow crond_t system_cron_spool_t:file manage_file_perms;
  ')
-@@ -239,7 +269,6 @@
+ 
+ optional_policy(`
++	amanda_search_var_lib(crond_t)
++')
++
++optional_policy(`
+ 	amavis_search_lib(crond_t)
+ ')
+ 
+@@ -239,7 +273,6 @@
  allow system_crond_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_crond_t,cron_var_lib_t,file)
  
@@ -4748,7 +4792,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
-@@ -249,6 +278,8 @@
+@@ -249,6 +282,8 @@
  # for this purpose.
  allow system_crond_t system_cron_spool_t:file entrypoint;
  
@@ -4757,7 +4801,7 @@
  # Permit a transition from the crond_t domain to this domain.
  # The transition is requested explicitly by the modified crond 
  # via setexeccon.  There is no way to set up an automatic
-@@ -270,9 +301,16 @@
+@@ -270,9 +305,16 @@
  filetrans_pattern(system_crond_t,crond_tmp_t,system_crond_tmp_t,{ file lnk_file })
  files_tmp_filetrans(system_crond_t,system_crond_tmp_t,file)
  
@@ -4775,7 +4819,7 @@
  
  kernel_read_kernel_sysctls(system_crond_t)
  kernel_read_system_state(system_crond_t)
-@@ -326,7 +364,7 @@
+@@ -326,7 +368,7 @@
  init_read_utmp(system_crond_t)
  init_dontaudit_rw_utmp(system_crond_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -4784,7 +4828,7 @@
  
  libs_use_ld_so(system_crond_t)
  libs_use_shared_libs(system_crond_t)
-@@ -334,6 +372,7 @@
+@@ -334,6 +376,7 @@
  libs_exec_ld_so(system_crond_t)
  
  logging_read_generic_logs(system_crond_t)
@@ -4792,7 +4836,7 @@
  logging_send_syslog_msg(system_crond_t)
  
  miscfiles_read_localization(system_crond_t)
-@@ -384,6 +423,14 @@
+@@ -384,6 +427,14 @@
  ')
  
  optional_policy(`
@@ -4807,7 +4851,7 @@
  	mrtg_append_create_logs(system_crond_t)
  ')
  
-@@ -424,8 +471,7 @@
+@@ -424,8 +475,7 @@
  ')
  
  optional_policy(`
@@ -4817,7 +4861,7 @@
  ')
  
  optional_policy(`
-@@ -433,9 +479,13 @@
+@@ -433,9 +483,13 @@
  ')
  
  optional_policy(`
@@ -12585,7 +12629,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-05 22:07:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 10:57:49.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13255,15 +13299,11 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1852,21 +1935,57 @@
+@@ -1856,17 +1939,53 @@
+ ##	</summary>
  ## </param>
- ## <param name="domain">
- ##	<summary>
--##	Domain to not audit
-+##	Domain to not audit
-+##	</summary>
-+## </param>
-+#
+ #
+-template(`userdom_dontaudit_list_user_home_dirs',`
 +template(`userdom_dontaudit_list_user_home_dirs',`
 +	gen_require(`
 +		type $1_home_dir_t;
@@ -13296,10 +13336,9 @@
 +## <param name="domain">
 +##	<summary>
 +##	Domain allowed access.
- ##	</summary>
- ## </param>
- #
--template(`userdom_dontaudit_list_user_home_dirs',`
++##	</summary>
++## </param>
++#
 +template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
 -		type $1_home_dir_t;
@@ -13378,7 +13417,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5695,297 @@
+@@ -5559,3 +5695,299 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -13633,8 +13672,10 @@
 +interface(`userdom_user_home_type',`
 +	gen_require(`
 +		attribute user_home_type;
++		attribute home_type;
 +	')
 +	typeattribute $1 user_home_type;
++	typeattribute $1 home_type;
 +')
 +
 +########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- selinux-policy.spec	6 Sep 2007 02:24:18 -0000	1.514
+++ selinux-policy.spec	6 Sep 2007 15:00:00 -0000	1.515
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
+- Define user_home_type as home_type
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-3
 - Allow sendmail to create etc_aliases_t
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:05:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 11:05:40 -0400
Subject: rpms/mash/F-7 mash-multilib.patch,NONE,1.1 mash.spec,1.6,1.7
Message-ID: <200709061505.l86F5eiQ000667@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv626

Modified Files:
	mash.spec 
Added Files:
	mash-multilib.patch 
Log Message:
backport multilib fixes


mash-multilib.patch:

--- NEW FILE mash-multilib.patch ---
--- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
+++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
@@ -87,18 +109,18 @@
         self.name = 'devel'
     
     def select(self, po):
-        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
+        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
         whitelist = ['perl']
         if po.name in blacklist:
             return False
-        if po.name.startswith('kernel'):
-            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
-                if p_name == 'kernel-devel':
-                    return False
         if po.name in whitelist:
             return True
         if RuntimeMultilibMethod.select(self,po):
             return True
+        if po.name.startswith('kernel'):
+            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
+                if p_name == 'kernel-devel':
+                    return False
         if po.name.endswith('-devel'):
             return True
         return False


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mash.spec	21 Jun 2007 17:30:43 -0000	1.6
+++ mash.spec	6 Sep 2007 15:05:07 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -12,6 +12,7 @@
 Requires:       yum, createrepo, koji
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch:		mash-multilib.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{__python} setup.py build
@@ -43,6 +45,9 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.1.18-2
+- backport some multilib fixes from HEAD (#247321, #271761)
+
 * Thu Jun 21 2007 Bill Nottingham <notting at redhat.com> 0.1.18-1
 - pull in cyrus-sasl plugins (#245176)
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:07:08 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 6 Sep 2007 11:07:08 -0400
Subject: rpms/ejabberd/F-7 .cvsignore, 1.4, 1.5 ejabberd.spec, 1.12,
	1.13 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709061507.l86F78II000764@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv731

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:21:08 -0000	1.4
+++ .cvsignore	6 Sep 2007 15:06:36 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/ejabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ejabberd.spec	4 Sep 2007 12:42:20 -0000	1.12
+++ ejabberd.spec	6 Sep 2007 15:06:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 12:50:20 -0000	1.2
+++ mod_ctlextra.erl	6 Sep 2007 15:06:36 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:21:08 -0000	1.4
+++ sources	6 Sep 2007 15:06:36 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 15:13:15 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 11:13:15 -0400
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.7, 1.8 phpMyAdmin.htaccess, 1.1,
	1.2 phpMyAdmin.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061513.l86FDF0u001093@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1022

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jul 2007 13:20:29 -0000	1.7
+++ .cvsignore	6 Sep 2007 15:12:42 -0000	1.8
@@ -1 +1 @@
-phpMyAdmin-2.10.3-all-languages.tar.bz2
+phpMyAdmin-2.11.0-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 15:12:42 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 15:12:42 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 15:12:42 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 15:32:20 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:32:20 -0400
Subject: rpms/ocaml-expat/devel ocaml-expat.spec,1.4,1.5
Message-ID: <200709061532.l86FWKXT001573@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-expat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	ocaml-expat.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-8
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-expat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-expat/devel/ocaml-expat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-expat.spec	30 Aug 2007 09:30:13 -0000	1.4
+++ ocaml-expat.spec	6 Sep 2007 15:31:47 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-expat
 Version:        0.9.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml wrapper for the Expat XML parsing library
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath
 BuildRequires:  util-linux-ng, gawk
 
 %define _use_internal_dependency_generator 0
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-8
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.9.1-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:33:43 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:33:43 -0400
Subject: rpms/ocaml-pcre/devel ocaml-pcre.spec,1.3,1.4
Message-ID: <200709061533.l86FXhfo001675@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Modified Files:
	ocaml-pcre.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-8
- Force rebuild because of base OCaml.



Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-pcre.spec	30 Aug 2007 09:31:27 -0000	1.3
+++ ocaml-pcre.spec	6 Sep 2007 15:33:11 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pcre
 Version:        5.11.4
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, pcre-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, pcre-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -87,6 +88,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-8
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:35:11 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:35:11 -0400
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.4,1.5
Message-ID: <200709061535.l86FZBHM001826@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ulex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1733

Modified Files:
	ocaml-ulex.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-ulex.spec	30 Aug 2007 09:32:46 -0000	1.4
+++ ocaml-ulex.spec	6 Sep 2007 15:34:38 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ulex
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml lexer generator for Unicode
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml = 3.10.0, ocaml-findlib-devel, ocaml-camlp4-devel
+BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib-devel, ocaml-camlp4-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:36:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:36:42 -0400
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.2,1.3
Message-ID: <200709061536.l86Fag0b001981@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xml-light/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891

Modified Files:
	ocaml-xml-light.spec 
Log Message:
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-xml-light.spec	30 Aug 2007 09:33:23 -0000	1.2
+++ ocaml-xml-light.spec	6 Sep 2007 15:36:09 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimal XML parser and printer for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-4
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-3
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:38:10 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:38:10 -0400
Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.2,1.3
Message-ID: <200709061538.l86FcAY9002106@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2049

Modified Files:
	ocaml-curses.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-5.20020319
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-curses.spec	30 Aug 2007 09:29:36 -0000	1.2
+++ ocaml-curses.spec	6 Sep 2007 15:37:38 -0000	1.3
@@ -10,7 +10,7 @@
 
 Name:           ocaml-curses
 Version:        0.1
-Release:        4.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        OCaml bindings for ncurses
 
 Group:          Development/Libraries
@@ -20,7 +20,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ncurses-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ncurses-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-5.20020319
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.1-4.20020319
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:39:53 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:39:53 -0400
Subject: rpms/ocaml-extlib/devel ocaml-extlib.spec,1.2,1.3
Message-ID: <200709061539.l86Fdrsn002182@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-extlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2161

Modified Files:
	ocaml-extlib.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-7
- Force rebuild because of base OCaml.



Index: ocaml-extlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-extlib.spec	30 Aug 2007 09:30:49 -0000	1.2
+++ ocaml-extlib.spec	6 Sep 2007 15:39:20 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-extlib
 Version:        1.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml ExtLib additions to the standard library
 
 Group:          Development/Libraries
@@ -16,7 +16,8 @@
 Patch0:         extlib-ocamldoc-debian.patch
 Patch1:         extlib-install.patch
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -113,6 +114,12 @@
 %{_libdir}/ocaml/extlib/*.ml
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-7
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-6
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:41:38 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:41:38 -0400
Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.3,1.4
Message-ID: <200709061541.l86FfcBW002282@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ssl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211

Modified Files:
	ocaml-ssl.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-5
- Force rebuild because of updated requires/provides scripts in OCaml.



Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-ssl.spec	30 Aug 2007 09:32:10 -0000	1.3
+++ ocaml-ssl.spec	6 Sep 2007 15:41:06 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ssl
 Version:        0.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SSL bindings for OCaml
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml, ocaml-findlib-devel, openssl-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, openssl-devel
 BuildRequires:  gawk
 Requires:       openssl
 
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-5
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:41:50 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 11:41:50 -0400
Subject: rpms/ocaml-calendar/devel ocaml-calendar.spec,1.2,1.3
Message-ID: <200709061541.l86FfoTc002331@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2237

Modified Files:
	ocaml-calendar.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-9
- Force rebuild because of updated requires/provides scripts in OCaml.

* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-8
- Force rebuild because of base OCaml.



Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-calendar.spec	30 Aug 2007 09:27:46 -0000	1.2
+++ ocaml-calendar.spec	6 Sep 2007 15:41:18 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-calendar
 Version:        1.10
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-BuildRequires:  ocaml >= 3.06, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -79,6 +80,12 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-9
+- Force rebuild because of updated requires/provides scripts in OCaml.
+
+* Mon Sep  3 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-8
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.10-7
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 15:42:03 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 11:42:03 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.480,1.481
Message-ID: <200709061542.l86Fg3l2002374@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2246

Modified Files:
	eclipse.spec 
Log Message:
* 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.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- eclipse.spec	5 Sep 2007 20:28:17 -0000	1.480
+++ eclipse.spec	6 Sep 2007 15:41:30 -0000	1.481
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        15%{?dist} 
+Release:        16%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -556,7 +556,6 @@
   find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
-%if %{gcj_support}
 # remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
 for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
   version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
@@ -570,7 +569,6 @@
   linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
   sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
 done
-%endif
 
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.31.jar
@@ -672,17 +670,10 @@
 # Build the rest of Eclipse
 export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
 export JAVA_HOME=%{java_home}
-%if %{gcj_support}
 ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-%else
-ant \
-  -Dnobootstrap=true \
-  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-  -Dlibsconfig=true -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-%endif
 
 ## Build the FileInitializer application
 SDK=$(cd eclipse && pwd)
@@ -1573,6 +1564,9 @@
 %endif
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Sep  6 15:48:39 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 6 Sep 2007 11:48:39 -0400
Subject: rpms/git/devel .cvsignore, 1.43, 1.44 git.spec, 1.37, 1.38 sources, 
	1.43, 1.44
Message-ID: <200709061548.l86FmdaN002632@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2598

Modified Files:
	.cvsignore git.spec sources 
Log Message:
* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
- git-1.5.3.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	24 Aug 2007 00:28:24 -0000	1.43
+++ .cvsignore	6 Sep 2007 15:48:06 -0000	1.44
@@ -1 +1 @@
-git-1.5.2.5.tar.gz
+git-1.5.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- git.spec	24 Aug 2007 00:28:24 -0000	1.37
+++ git.spec	6 Sep 2007 15:48:06 -0000	1.38
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.2.5
+Version: 	1.5.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
+- git-1.5.3.1-1
+
 * Thu Aug 23 2007 James Bowes <jbowes at redhat.com> 1.5.2.5-1
 - git-1.5.2.5-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	24 Aug 2007 00:28:24 -0000	1.43
+++ sources	6 Sep 2007 15:48:06 -0000	1.44
@@ -1 +1 @@
-4e8de9e56882f3214a92f6d7dc3c49ec  git-1.5.2.5.tar.gz
+afef243b2d271004d13b0381ac2ee580  git-1.5.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 15:58:23 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 6 Sep 2007 11:58:23 -0400
Subject: rpms/gnash/F-7 .cvsignore, 1.4, 1.5 gnash.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <200709061558.l86FwNLm002835@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
- update to 0.8.1
- agg is now the default renderer



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2007 16:57:21 -0000	1.4
+++ .cvsignore	6 Sep 2007 15:57:50 -0000	1.5
@@ -1 +1 @@
-gnash-0.8.0.tar.bz2
+gnash-0.8.1.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/gnash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnash.spec	17 Jun 2007 16:57:21 -0000	1.6
+++ gnash.spec	6 Sep 2007 15:57:50 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           gnash
-Version:        0.8.0
-Release:        1%{?dist}
+Version:        0.8.1
+Release:        2%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -17,6 +17,7 @@
 # modular Xorg 
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
+BuildRequires:  agg-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
@@ -68,7 +69,7 @@
 %prep
 %setup -q
 
-chmod a-x libgeometry/snappingrange.h
+chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -83,31 +84,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so \
- $RPM_BUILD_ROOT/%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
+# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
 rm \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
- $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+rm \
+ $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # asspec info isn't generated rightly
 rm \
- $RPM_BUILD_ROOT/%{_infodir}/asspec.info
-# omf is broken
-rm -rf \
- $RPM_BUILD_ROOT/%{_datadir}/omf
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# omf was broken
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
-rm \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm \
+# $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -118,7 +120,8 @@
 %post 
 /sbin/ldconfig
 # currently help system is broken
-#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
@@ -135,15 +138,17 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
-%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/
+#%{_libdir}/libgnash*-*.so
+#%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-#%{_datadir}/omf/gnash/
+%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -151,7 +156,7 @@
 
 %files klash
 %defattr(-,root,root,-)
-%{_bindir}/klash
+%{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
 #%{_datadir}/config/klashrc
@@ -162,6 +167,13 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
+- update to 0.8.1
+- agg is now the default renderer
+
+* Fri Aug  3 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-2
+- rebuild for boost soname change
+
 * Sun Jun 17 2007 Patrice Dumas <pertusus at free.fr> 0.8.0-1
 - update to 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2007 16:57:21 -0000	1.4
+++ sources	6 Sep 2007 15:57:50 -0000	1.5
@@ -1 +1 @@
-b3a3b22d608b5050b1b2743bc348c536  gnash-0.8.0.tar.bz2
+28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:06:36 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 6 Sep 2007 12:06:36 -0400
Subject: rpms/nss/devel nss-create-obj.patch,1.1,1.2 nss.spec,1.27,1.28
Message-ID: <200709061606.l86G6ai6009041@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9015

Modified Files:
	nss-create-obj.patch nss.spec 
Log Message:
* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
- fix a C++ mode compilation error


nss-create-obj.patch:

Index: nss-create-obj.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-create-obj.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-create-obj.patch	5 Sep 2007 20:00:42 -0000	1.1
+++ nss-create-obj.patch	6 Sep 2007 16:06:32 -0000	1.2
@@ -49,7 +49,7 @@
 + * Hand Create a new object and return the Generic object for our new object.
 + */
 +PK11GenericObject *
-+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template,
++PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template_,
 +		int count,  PRBool token)
 +{
 +    CK_OBJECT_HANDLE objectID;
@@ -57,7 +57,7 @@
 +    CK_RV crv;
 +
 +    PK11_EnterSlotMonitor(slot);
-+    crv = PK11_CreateNewObject(slot, slot->session, template, count, 
++    crv = PK11_CreateNewObject(slot, slot->session, template_, count, 
 +			       token, &objectID);
 +    PK11_ExitSlotMonitor(slot);
 +    if (crv != CKR_OK) {
@@ -150,7 +150,7 @@
  SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
  SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
 +PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, 
-+				   const CK_ATTRIBUTE *template, 
++				   const CK_ATTRIBUTE *template_, 
 +				   int count, PRBool token);
  SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, 
  				CK_ATTRIBUTE_TYPE attr, SECItem *item);


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nss.spec	5 Sep 2007 20:00:42 -0000	1.27
+++ nss.spec	6 Sep 2007 16:06:32 -0000	1.28
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -453,6 +453,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
+- fix a C++ mode compilation error
+
 * Wed Sep 05 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.7-7
 - Add 3.12 ckfw and libnsspem
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:08:33 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 12:08:33 -0400
Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.5,1.6
Message-ID: <200709061608.l86G8X8q009139@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ulex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9110

Modified Files:
	ocaml-ulex.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-6
- Ignore Parsetree module.



Index: ocaml-ulex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-ulex.spec	6 Sep 2007 15:34:38 -0000	1.5
+++ ocaml-ulex.spec	6 Sep 2007 16:08:00 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ulex
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OCaml lexer generator for Unicode
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-6
+- Ignore Parsetree module.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.0-5
 - Force rebuild because of updated requires/provides scripts in OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:20:06 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 12:20:06 -0400
Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.3,1.4
Message-ID: <200709061620.l86GK6G4009546@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-xml-light/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9491

Modified Files:
	ocaml-xml-light.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-5
- Don't package test.cmi file (it's a test program).



Index: ocaml-xml-light.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-xml-light.spec	6 Sep 2007 15:36:09 -0000	1.3
+++ ocaml-xml-light.spec	6 Sep 2007 16:19:33 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Minimal XML parser and printer for OCaml
 
 Group:          Development/Libraries
@@ -57,6 +57,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+rm -f test.cmi
 ocamlfind install xml-light META *.mli *.cmi *.cma *.a *.cmxa *.cmx
 
 
@@ -88,6 +89,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-5
+- Don't package test.cmi file (it's a test program).
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 2.2.cvs20070817-4
 - Force rebuild because of updated requires/provides scripts in OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:22:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 6 Sep 2007 12:22:01 -0400
Subject: rpms/jd/devel .cvsignore, 1.142, 1.143 jd.spec, 1.168, 1.169 sources,
	1.143, 1.144
Message-ID: <200709061622.l86GM131009756@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
- svn 1314



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- .cvsignore	3 Sep 2007 15:57:38 -0000	1.142
+++ .cvsignore	6 Sep 2007 16:21:29 -0000	1.143
@@ -1 +1 @@
-jd-1.9.6-svn1311.tgz
+jd-1.9.6-svn1314.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- jd.spec	3 Sep 2007 15:57:38 -0000	1.168
+++ jd.spec	6 Sep 2007 16:21:29 -0000	1.169
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1311
+%define         strtag        svn1314
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -119,8 +119,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
-- svn 1311
+* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
+- svn 1314
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- sources	3 Sep 2007 15:57:38 -0000	1.143
+++ sources	6 Sep 2007 16:21:29 -0000	1.144
@@ -1 +1 @@
-ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz
+2255ee977583bd11cd408a5d849a9c4e  jd-1.9.6-svn1314.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:29:25 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 12:29:25 -0400
Subject: rpms/avahi/devel avahi.spec,1.93,1.94
Message-ID: <200709061629.l86GTPGR010087@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002

Modified Files:
	avahi.spec 
Log Message:
- Ship ssh static service file by default, don't ship ssh-sftp by default
- resolves: #269741: split off avahi-ui-tools package
- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel



Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- avahi.spec	28 Aug 2007 18:31:08 -0000	1.93
+++ avahi.spec	6 Sep 2007 16:28:52 -0000	1.94
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -50,12 +50,21 @@
 convenient.
 
 %package tools
-Summary: Tools for mDNS browsing and publishing
+Summary: Command line tools for mDNS browsing and publishing
 Group: System Environment/Base
 Requires: %{name} = %{version}, gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
 
 %description tools
-Tools that use avahi to browse and publish mDNS services and hosts.
+Command line tools that use avahi to browse and publish mDNS services.
+
+%package ui-tools
+Summary: UI tools for mDNS browsing
+Group: System Environment/Base
+Requires: %{name} = %{version}
+Requires: %{name}-ui = %{version}
+
+%description ui-tools
+Graphical user interface tools that use Avahi to browse for mDNS services.
 
 %package glib
 Summary: Glib libraries for avahi
@@ -90,6 +99,7 @@
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}
 Requires: %{name}-ui = %{version}
+Requires: %{name}-glib-devel = %{version}
 
 %description ui-devel
 The avahi-ui-devel package contains the header files and libraries
@@ -234,7 +244,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # remove example 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service
 
 # remove desktop file for avahi-discover
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
@@ -340,7 +350,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
+%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/avahi-daemon
 %dir %{_sysconfdir}/avahi
 %dir %{_sysconfdir}/avahi/etc
@@ -349,7 +359,7 @@
 %dir %{_sysconfdir}/avahi/services
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
-%config(noreplace) %{_sysconfdir}/avahi/services/sftp-ssh.service
+%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(0755,root,root) %{_sbindir}/avahi-daemon
 %attr(0755,root,root) %{_libdir}/libavahi-common.so.*
@@ -379,9 +389,16 @@
 # These are .py files only, so they don't go in lib64
 %{_prefix}/lib/python?.?/site-packages/*
 %{_mandir}/man1/*
-%{_datadir}/applications/b*.desktop
 %{_datadir}/avahi/interfaces/
 %exclude %{_bindir}/avahi-discover-standalone
+%exclude %{_bindir}/b*
+%exclude %{_mandir}/man1/b*
+
+%files ui-tools
+%defattr(0644, root, root, 0755)
+%attr(0755,root,root) %{_bindir}/b*
+%{_mandir}/man1/b*
+%{_datadir}/applications/b*.desktop
 
 %files devel
 %defattr(0644, root, root, 0755)
@@ -466,6 +483,11 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-4
+- Ship ssh static service file by default, don't ship ssh-sftp by default
+- resolves: #269741: split off avahi-ui-tools package
+- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel
+
 * Tue Aug 28 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.21-3
 - resolves: #246875: Initscript Review
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:30:58 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:30:58 -0400
Subject: rpms/phpMyAdmin/EL-4 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061630.l86GUwC2010230@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/EL-4

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:25 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:30:26 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 16:30:26 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:31:01 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:31:01 -0400
Subject: rpms/phpMyAdmin/EL-5 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061631.l86GV1Xg010241@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/EL-5

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:28 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:29 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:30:28 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:29 -0000	1.7
+++ sources	6 Sep 2007 16:30:28 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:31:04 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:31:04 -0400
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709061631.l86GV4Hc010247@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162/FC-6

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:30:31 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- phpMyAdmin.spec	23 Jul 2007 13:20:26 -0000	1.9
+++ phpMyAdmin.spec	6 Sep 2007 16:30:31 -0000	1.10
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:26 -0000	1.7
+++ sources	6 Sep 2007 16:30:31 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:34:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 6 Sep 2007 12:34:00 -0400
Subject: rpms/phpMyAdmin/F-7 phpMyAdmin.htaccess, 1.1, 1.2 phpMyAdmin.spec, 
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200709061634.l86GY0ju010464@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10437

Modified Files:
	phpMyAdmin.htaccess phpMyAdmin.spec sources 
Log Message:
Updated new version, altered license and fixed mod_security issue listed in #279801


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/phpMyAdmin.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.htaccess	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.htaccess	6 Sep 2007 16:33:27 -0000	1.2
@@ -22,11 +22,11 @@
 </Directory>
 
 # This configuration prevents mod_security at phpMyAdmin directories from
-# filtering SQL etc.
+# filtering SQL etc.  This may break your mod_security implementation.
 #
-<IfModule mod_security.c>
-    <LocationMatch "/phpMyAdmin/(.+)">
-        SecFilterInheritance Off
-    </LocationMatch>
-</IfModule>
+#<IfModule mod_security.c>
+#    <LocationMatch "/phpMyAdmin/(.+)">
+#        SecFilterInheritance Off
+#    </LocationMatch>
+#</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/phpMyAdmin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phpMyAdmin.spec	23 Jul 2007 13:20:24 -0000	1.10
+++ phpMyAdmin.spec	6 Sep 2007 16:33:27 -0000	1.11
@@ -1,12 +1,12 @@
 Name: phpMyAdmin
-Version: 2.10.3
+Version: 2.11.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.phpmyadmin.net/	
-Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-all-languages.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Mike McGrath <mmcgrath at redhat.com> 2.11.0-1
+- Upstream released new version
+- Altered sources file as required
+- Added proper license
+
 * Mon Jul 23 2007 Mike McGrath <mmcgrath at redhat.com> 2.10.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jul 2007 13:20:24 -0000	1.7
+++ sources	6 Sep 2007 16:33:27 -0000	1.8
@@ -1 +1 @@
-7866cc1033ba79b5f71354c66d109033  phpMyAdmin-2.10.3-all-languages.tar.bz2
+64cf56f3b44725e5edcdea871166641f  phpMyAdmin-2.11.0-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:02 -0400
Subject: rpms/perl-Class-ReturnValue/devel .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg2JG011131@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/devel

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 02:52:23 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:30 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/perl-Class-ReturnValue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-ReturnValue.spec	17 Aug 2007 02:52:24 -0000	1.7
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 02:52:24 -0000	1.3
+++ sources	6 Sep 2007 16:41:30 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:05 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:05 -0400
Subject: rpms/perl-Class-ReturnValue/F-7 .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg5xA011144@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/F-7

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 03:12:08 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:33 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/perl-Class-ReturnValue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Class-ReturnValue.spec	17 Aug 2007 03:12:08 -0000	1.7
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 03:12:08 -0000	1.3
+++ sources	6 Sep 2007 16:41:33 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 12:42:08 -0400
Subject: rpms/perl-Class-ReturnValue/FC-6 .cvsignore, 1.3,
	1.4 perl-Class-ReturnValue.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200709061642.l86Gg89R011157@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10945/FC-6

Modified Files:
	.cvsignore perl-Class-ReturnValue.spec sources 
Log Message:
* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Aug 2007 03:13:55 -0000	1.3
+++ .cvsignore	6 Sep 2007 16:41:36 -0000	1.4
@@ -1 +1 @@
-Class-ReturnValue-0.54.tar.gz
+Class-ReturnValue-0.55.tar.gz


Index: perl-Class-ReturnValue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/perl-Class-ReturnValue.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-ReturnValue.spec	17 Aug 2007 03:13:55 -0000	1.6
+++ perl-Class-ReturnValue.spec	6 Sep 2007 16:41:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      	perl-Class-ReturnValue
 Summary:   	Class::ReturnValue Perl module
-Version:   	0.54
+Version:   	0.55
 Release:   	1%{?dist}
 License:   	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -44,23 +44,12 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+* Thu Sep 06 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.55-1
 - Upstream update.
-
-* Thu Apr 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-6
-- Reflect perl package split.
-
-* Tue Sep 05 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-5
-- Mass rebuild.
-
-* Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.53-4
-- Rebuild for perl-5.8.8.
-
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-3
 - Spec cleanup.
 
-* Thu Aug 25 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-2
-- Spec cleanup.
+* Fri Aug 17 2007 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
+- Upstream update.
 
 * Mon Aug 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.53-1
 - Upstream update.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 03:13:55 -0000	1.3
+++ sources	6 Sep 2007 16:41:36 -0000	1.4
@@ -1 +1 @@
-977202e0a642c09a93287e6b64e4b040  Class-ReturnValue-0.54.tar.gz
+047fbbcfd90d5c399a1feba55781329e  Class-ReturnValue-0.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 16:42:20 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 6 Sep 2007 12:42:20 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.50,1.51
Message-ID: <200709061642.l86GgKpK011194@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11028

Modified Files:
	kernel-xen.spec 
Log Message:
Include modules.block and modules.networking on the package (bug #280731)



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	30 Aug 2007 22:14:44 -0000	1.50
+++ kernel-xen.spec	6 Sep 2007 16:41:47 -0000	1.51
@@ -1648,7 +1648,10 @@
     rm -f modinfo
     rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
-    rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.*
+    for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+    do
+        rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+    done
 
     # Move the devel headers out of the root file system
     mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
@@ -2023,6 +2026,8 @@
 /lib/modules/%{KVERREL}/extra
 /lib/modules/%{KVERREL}/updates
 /lib/modules/%{KVERREL}/weak-updates
+/lib/modules/%{KVERREL}/modules.block
+/lib/modules/%{KVERREL}/modules.networking
 %ghost /boot/initrd-%{KVERREL}.img
 
 %files devel
@@ -2071,6 +2076,8 @@
 /lib/modules/%{KVERREL}debug/extra
 /lib/modules/%{KVERREL}debug/updates
 /lib/modules/%{KVERREL}debug/weak-updates
+/lib/modules/%{KVERREL}debug/modules.block
+/lib/modules/%{KVERREL}debug/modules.networking
 %ghost /boot/initrd-%{KVERREL}debug.img
 
 %package debug-devel
@@ -2123,6 +2130,8 @@
 /lib/modules/%{KVERREL}PAE/extra
 /lib/modules/%{KVERREL}PAE/updates
 /lib/modules/%{KVERREL}PAE/weak-updates
+/lib/modules/%{KVERREL}PAE/modules.block
+/lib/modules/%{KVERREL}PAE/modules.networking
 %ghost /boot/initrd-%{KVERREL}PAE.img
 
 %files PAE-devel
@@ -2163,6 +2172,8 @@
 /lib/modules/%{KVERREL}PAE-debug/extra
 /lib/modules/%{KVERREL}PAE-debug/updates
 /lib/modules/%{KVERREL}PAE-debug/weak-updates
+/lib/modules/%{KVERREL}PAE-debug/modules.block
+/lib/modules/%{KVERREL}PAE-debug/modules.networking
 %ghost /boot/initrd-%{KVERREL}PAE-debug.img
 
 %package PAE-debug-devel
@@ -2216,6 +2227,8 @@
 /lib/modules/%{KVERREL}smp/extra
 /lib/modules/%{KVERREL}smp/updates
 /lib/modules/%{KVERREL}smp/weak-updates
+/lib/modules/%{KVERREL}smp/modules.block
+/lib/modules/%{KVERREL}smp/modules.networking
 %ghost /boot/initrd-%{KVERREL}smp.img
 
 %files smp-devel
@@ -2264,6 +2277,8 @@
 /lib/modules/%{KVERREL}xen/extra
 /lib/modules/%{KVERREL}xen/updates
 /lib/modules/%{KVERREL}xen/weak-updates
+/lib/modules/%{KVERREL}xen/modules.block
+/lib/modules/%{KVERREL}xen/modules.networking
 %ghost /boot/initrd-%{KVERREL}xen.img
 
 %files -n kernel-xen-devel
@@ -2307,6 +2322,8 @@
 /lib/modules/%{KVERREL}kdump/extra
 /lib/modules/%{KVERREL}kdump/updates
 /lib/modules/%{KVERREL}kdump/weak-updates
+/lib/modules/%{KVERREL}kdump/modules.block
+/lib/modules/%{KVERREL}kdump/modules.networking
 %ghost /boot/initrd-%{KVERREL}kdump.img
 
 %files kdump-devel
@@ -2332,6 +2349,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 06 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Include modules.block and modules.networking on the package (bug #280731)
+
 * Thu Aug 30 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Provides: xen-hypervisor-abi = 3.1 (bug #269581)
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:58:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 12:58:45 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.215,
	1.216 redhat-panel-default-setup.entries, 1.13, 1.14
Message-ID: <200709061658.l86GwjpA014303@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14150

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Log Message:
Improved handling of launchers for preferred apps



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- gnome-panel.spec	4 Sep 2007 19:35:44 -0000	1.215
+++ gnome-panel.spec	6 Sep 2007 16:58:07 -0000	1.216
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -92,6 +92,12 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=456371
 Patch7: clock-timezones.patch
 
+# the next three patches belong together
+# http://bugzilla.gnome.org/show_bug.cgi?id=470966
+Patch8: launcher-desktop-files.patch
+Patch9: desktop-file-monitoring.patch
+Patch10: preferred-apps.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -124,6 +130,9 @@
 %patch4 -p1 -b .search
 #%patch6 -p0 -b .compiz-support
 %patch7 -p1 -b .clock-timezones
+%patch8 -p1 -b .launcher-desktop-files
+%patch9 -p1 -b .desktop-file-monitoring
+%patch10 -p1 -b .preferred-apps
 
 . %{SOURCE4}
 
@@ -302,6 +311,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-2
+- Improve the handling of preferred apps in launchers
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- redhat-panel-default-setup.entries	13 Feb 2007 20:58:10 -0000	1.13
+++ redhat-panel-default-setup.entries	6 Sep 2007 16:58:07 -0000	1.14
@@ -276,7 +276,7 @@
       <key>objects/web_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-web.desktop</string>
+        <string>preferred-web-browser.desktop</string>
       </value>
     </entry>
 
@@ -330,7 +330,7 @@
       <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/redhat-email.desktop</string>
+        <string>preferred-mail-reader.desktop</string>
       </value>
     </entry>
 



From fedora-extras-commits at redhat.com  Thu Sep  6 16:59:37 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 12:59:37 -0400
Subject: rpms/gnome-panel/devel desktop-file-monitoring.patch, NONE,
	1.1 launcher-desktop-files.patch, NONE, 1.1 preferred-apps.patch,
	NONE, 1.1
Message-ID: <200709061659.l86Gxb47014481@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14451

Added Files:
	desktop-file-monitoring.patch launcher-desktop-files.patch 
	preferred-apps.patch 
Log Message:
add new patches


desktop-file-monitoring.patch:

--- NEW FILE desktop-file-monitoring.patch ---
diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.h
--- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-05 23:24:37.000000000 -0400
@@ -13,6 +13,7 @@
 
 #include "applet.h"
 #include "panel-widget.h"
+#include <libgnomevfs/gnome-vfs.h>
 
 G_BEGIN_DECLS
 
@@ -29,6 +30,8 @@ typedef struct {
 	GSList 		  *error_dialogs;
 
 	gulong             destroy_handler;
+
+	GnomeVFSMonitorHandle *monitor; 
 } Launcher;
 
 void panel_launcher_create           (PanelToplevel *toplevel,
diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h
--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-05 23:24:37.000000000 -0400
@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
 				 const char       *uri);
 
 G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog);
+
 
 void panel_ditem_register_save_uri_func (PanelDItemEditor  *dialog,
 					 PanelDitemSaveUri  save_uri,
diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.c
--- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-06 00:33:52.000000000 -0400
@@ -285,6 +287,8 @@ static void
 destroy_launcher (GtkWidget *widget,
 		  Launcher  *launcher)
 {
+	if (launcher->monitor)
+		gnome_vfs_monitor_cancel (launcher->monitor);
 	launcher_properties_destroy (launcher);
 	launcher_widget_destroy_open_dialogs (launcher);
 }
@@ -458,6 +462,37 @@ drag_data_get_cb (GtkWidget        *widg
 
 }
 
+static void setup_button (Launcher *launcher);
+
+static void
+desktop_file_changed (GnomeVFSMonitorHandle    *handle,
+		      const gchar              *monitor_uri,
+		      const gchar              *info_uri,
+		      GnomeVFSMonitorEventType  event_type,
+		      gpointer                  user_data)
+{
+	Launcher *launcher = user_data;
+	GKeyFile *key_file;
+
+	if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED ||
+	    event_type == GNOME_VFS_MONITOR_EVENT_CREATED) {
+		gchar *path;
+
+		path = gnome_vfs_get_local_path_from_uri (monitor_uri);
+
+		key_file = g_key_file_new ();
+		if (g_key_file_load_from_file (key_file, path,
+					       G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+					       NULL)) {
+			g_key_file_free (launcher->key_file);
+			launcher->key_file = key_file;
+			setup_button (launcher);        
+		}
+
+		g_free (path);
+	}
+}
+
 static Launcher *
 create_launcher (const char *location)
 {
@@ -534,6 +569,25 @@ create_launcher (const char *location)
 	launcher->key_file = key_file;
 	launcher->prop_dialog = NULL;
 	launcher->destroy_handler = 0;
+	launcher->monitor = NULL;
+
+	/* Watch for changes to the desktop file. Since we don't want 
+	 * to do this for every launcher, we only do it if the desktop 
+	 * file contains a X-Panel-Monitor entry.
+	 */
+	if (g_key_file_get_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", NULL)) {
+		gchar *uri;
+
+
+
+		uri = g_strdup_printf ("file:%s", new_location);
+		gnome_vfs_monitor_add (&launcher->monitor, 
+				       uri,
+				       GNOME_VFS_MONITOR_FILE,
+				       desktop_file_changed,
+				       launcher);
+		g_free (uri);
+	}
 
 	/* Icon will be setup later */
 	launcher->button = button_widget_new (NULL /* icon */,
@@ -662,6 +716,15 @@ static void
 launcher_changed (PanelDItemEditor *dialog,
 		  Launcher         *launcher)
 {
+	/* If the user manually changes launcher properties,
+	 * we stop monitoring the desktop file to not overwrite
+	 * user changes.
+	 */
+	if (launcher->monitor) {
+		gnome_vfs_monitor_cancel (launcher->monitor);
+		launcher->monitor = NULL;
+	}
+
 	/* Setup the button look */
 	setup_button (launcher);
 }
@@ -733,6 +796,43 @@ launcher_save_uri (PanelDItemEditor *dia
 	return NULL;
 }
 
+static const char *
+desktop_file_to_monitor (PanelDItemEditor *editor)
+{
+	const char *entry;
+	GKeyFile *key_file;
+
+	/* When the user selects a desktop file in the ditem editor,
+	 * start monitoring the desktop file for changes.
+	 */
+	entry = panel_ditem_editor_get_orig_desktop_file (editor);
+	if (entry) {
+		key_file = g_key_file_new ();
+		if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
+		    !panel_util_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) 
+			entry = NULL;
+		g_key_file_free (key_file);
+	}
+
+	return entry;
+}
+
+static void
+start_monitoring (Launcher *launcher)
+{
+	gchar *uri;
+
+	uri = g_strdup_printf ("file:%s", launcher->location);
+	if (launcher->monitor)
+		gnome_vfs_monitor_cancel (launcher->monitor);
+	gnome_vfs_monitor_add (&launcher->monitor, 
+			       uri,
+			       GNOME_VFS_MONITOR_FILE,
+			       desktop_file_changed,
+			       launcher);
+	g_free (uri);
+}
+ 
 static void
 launcher_saved (GtkWidget *dialog,
 		Launcher  *launcher)
@@ -740,11 +840,15 @@ launcher_saved (GtkWidget *dialog,
 	const char  *uri;
 	GConfClient *client;
 	const char  *key;
+	const char *path;
 
 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
 	if (panel_launcher_get_filename (uri) != NULL)
 		uri = panel_launcher_get_filename (uri);
 
+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
+		uri = path;
+
 	if (uri && launcher->location && strcmp (uri, launcher->location)) {
 		client = panel_gconf_get_client ();
 
@@ -757,6 +861,9 @@ launcher_saved (GtkWidget *dialog,
 		if (launcher->location)
 			g_free (launcher->location);
 		launcher->location = g_strdup (uri);
+
+		if (path)
+			start_monitoring (launcher);
 	}
 }
 
@@ -923,6 +1030,7 @@ launcher_new_saved (GtkWidget *dialog,
 	PanelWidget *panel;
 	int          pos;
 	const char  *uri;
+	const char  *path;
 
 	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
 	panel = g_object_get_data (G_OBJECT (dialog), "panel");
@@ -930,6 +1038,10 @@ launcher_new_saved (GtkWidget *dialog,
 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
 	if (panel_launcher_get_filename (uri) != NULL)
 		uri = panel_launcher_get_filename (uri);
+
+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
+		uri = path;
+
 	panel_launcher_create (panel->toplevel, pos, uri);
 }
 
diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-05 23:24:37.000000000 -0400
+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-05 23:24:37.000000000 -0400
@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
 
 	/* the directory of the theme for the icon, see bug #119208 */
 	char *icon_theme_dir;
+
+	char *orig_desktop_file;
 };
 
 /* Time in seconds after which we save the file on the disk */
@@ -367,6 +369,10 @@ panel_ditem_editor_destroy (GtkObject *o
 		g_free (dialog->priv->icon_theme_dir);
 	dialog->priv->icon_theme_dir = NULL;
 
+	if (dialog->priv->orig_desktop_file != NULL)
+		g_free (dialog->priv->orig_desktop_file);
+	dialog->priv->orig_desktop_file = NULL;
+
 	GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);
 }
 
@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd
 							   TRUE);
 	}
 
+	/* When the user changes any fields, unset the orig_desktop_file
+	 * field since the editor contents are not entirely from a desktop
+	 * file anymore.
+	 */ 
+	g_free (dialog->priv->orig_desktop_file);
+	dialog->priv->orig_desktop_file = NULL;
+
 	dialog->priv->dirty = TRUE;
 	g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
 }
@@ -1003,6 +1016,13 @@ update_editor_from_desktop_file (PanelDI
 		 */ 
 		setup_icon_entry (dialog, icon);
 
+		/* We set the orig_desktop_file field to let the
+		 * launcher know that the editor contents are coming
+		 * directly from a desktop file.
+		 */ 
+		g_free (dialog->priv->orig_desktop_file);
+		dialog->priv->orig_desktop_file = g_strdup (uri);
+
 		return TRUE;    
 	}
 
@@ -1826,3 +1846,12 @@ panel_ditem_register_save_uri_func (Pane
 	dialog->priv->save_uri = save_uri;
 	dialog->priv->save_uri_data = data;
 }
+
+G_CONST_RETURN char *
+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)
+{
+	g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
+
+	return dialog->priv->orig_desktop_file;
+}
+

launcher-desktop-files.patch:

--- NEW FILE launcher-desktop-files.patch ---
diff -up gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c
--- gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file	2007-08-28 00:20:51.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c	2007-08-28 00:20:57.000000000 -0400
@@ -973,6 +973,42 @@ panel_ditem_editor_icon_changed (PanelDI
 	g_free (file);
 }
 
+static gboolean
+update_editor_from_desktop_file (PanelDItemEditor *dialog,
+				 const gchar      *uri)
+{
+	GKeyFile *key_file;
+	char *name;
+	char *comment;
+	char *exec;
+	char *icon;
+
+	key_file = g_key_file_new ();
+	if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
+		if (panel_util_key_file_get_boolean (key_file, "Terminal", FALSE)) 
+			gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
+		else
+			gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0); 
+
+		name = panel_util_key_file_get_locale_string (key_file, "Name");
+		comment = panel_util_key_file_get_locale_string (key_file, "Comment");
+		icon = panel_util_key_file_get_locale_string (key_file, "Icon");
+		exec = panel_util_key_file_get_string (key_file, "Exec");
+
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");            
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");           
+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");         
+		/* Note: we need to set the icon last, since the editor
+		 * tries to guess the icon when the command is modified
+		 */ 
+		setup_icon_entry (dialog, icon);
+
+		return TRUE;    
+	}
+
+	return FALSE;
+}
+
 static void
 command_browse_chooser_response (GtkFileChooser   *chooser,
 				 gint              response_id,
@@ -986,7 +1022,11 @@ command_browse_chooser_response (GtkFile
 		case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
 		case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
 			text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-			uri = panel_util_make_exec_uri_for_desktop (text);
+			if (g_str_has_suffix (text, ".desktop") &&
+			    update_editor_from_desktop_file (dialog, text))
+				uri = NULL;
+			else 
+				uri = panel_util_make_exec_uri_for_desktop (text);
 			g_free (text);
 			break;
 		case PANEL_DITEM_EDITOR_TYPE_LINK:
@@ -996,8 +1036,9 @@ command_browse_chooser_response (GtkFile
 			g_assert_not_reached ();
 		}
 
-		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-				    uri);
+		if (uri)
+			gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
+				    	    uri);
 		g_free (uri);
 	}
 

preferred-apps.patch:

--- NEW FILE preferred-apps.patch ---
diff -up gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps gnome-panel-2.19.6/gnome-panel/main.c
--- gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps	2007-08-28 01:01:57.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/main.c	2007-08-28 01:02:42.000000000 -0400
@@ -26,6 +26,7 @@
 #include "panel-action-protocol.h"
 #include "panel-lockdown.h"
 #include "panel-icon-names.h"
+#include "launcher.h"
 #include "xstuff.h"
 
 #include "nothing.cP"
@@ -81,6 +82,7 @@ main (int argc, char **argv)
 			      GCONF_CLIENT_PRELOAD_NONE,
 			      NULL);
 
+	panel_preferred_apps_init ();
 	panel_global_config_load ();
 	panel_lockdown_init ();
 	panel_profile_load ();
diff -up gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.c
--- gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps	2007-08-28 00:49:14.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/launcher.c	2007-08-28 01:01:47.000000000 -0400
@@ -22,6 +22,7 @@
 #include <libgnomeui/gnome-url.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <gdk/gdkx.h>
+#include <gmenu-tree.h>
 
 #include "launcher.h"
 
@@ -39,6 +40,7 @@
 #include "panel-compatibility.h"
 #include "panel-ditem-editor.h"
 #include "panel-icon-names.h"
+#include "panel-run-dialog.h"
 
 static GdkScreen *
 launcher_get_screen (Launcher *launcher)
@@ -1264,3 +1266,166 @@ panel_launcher_set_dnd_enabled (Launcher
 	} else
 		gtk_drag_source_unset (launcher->button);
 }
+
+static gchar *
+find_desktop_file_from_exec (const gchar *exec)
+{
+	GSList *all_applications, *l;
+	gchar *path = NULL;
+	gchar **tokens, **tokens2;
+	gint i, match = 0;
+
+	/* FIXME no need to construct a humongous list here */
+	all_applications = get_all_applications ();
+
+	for (l = all_applications; l; l = l->next) {
+		GMenuTreeEntry *entry = l->data;
+		const char     *entry_exec;
+
+		entry_exec = gmenu_tree_entry_get_exec (entry);
+
+		if (strcmp (exec, entry_exec) == 0) {
+			path = gmenu_tree_entry_get_desktop_file_path (entry);
+			break;
+		}
+
+		tokens = g_strsplit (exec, " ", -1);
+		tokens2 = g_strsplit (entry_exec, " ", -1);
+
+		for (i = 0; tokens[i] && tokens2[i]; i++) {
+			if (strcmp (tokens[i], tokens2[i]) != 0)
+				break;
+		}
+		if (i > match) {
+			match = i;
+			path = gmenu_tree_entry_get_desktop_file_path (entry);
+		}
+
+		g_strfreev (tokens);
+		g_strfreev (tokens2);
+	}
+
+	path = g_strdup (path);
+	g_slist_free (all_applications);
+
+	return path;
+}
+
+static void
+update_preferred_app (const gchar *filename,
+		      const gchar *key,
+		      const gchar *exec)
+{
+	gchar *location;
+	GKeyFile *key_file;
+	GError *error = NULL;
+	gchar *data;
+	gsize len;
+	gboolean needs_terminal;
+
+	location = find_desktop_file_from_exec (exec);
+	key_file = g_key_file_new ();
+	if (!panel_util_key_file_load_from_uri (key_file, location,
+						G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+						NULL)) {
+		/* FIXME would be much better if preferred apps were backed by desktop files */
+		g_key_file_set_string (key_file, "Desktop Entry", "Version", "1.0");
+		g_key_file_set_string (key_file, "Desktop Entry", "Encoding", "UTF-8");
+		g_key_file_set_string (key_file, "Desktop Entry", "Type", "Application");
+		g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec);
+		if (strstr (key, "http")) {
+			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Web Browser");
+			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Web Browser");
+			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Browse the Web");
+			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-web-browser.png");
+		}
+		else if (strstr (key, "mailto")) {
+			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Mail Reader");
+			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Mail Reader");
+			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Send email");
+			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-email.png");
+		}
+		if (g_str_has_suffix (key, "command")) {
+			int len;
+			char *key2;
+
+			len = strlen (key);
+			key2 = g_new (char, len - strlen ("command") + strlen ("needs_terminal") + 1);
+			strncpy (key2, key,  len - strlen ("command"));
+			strcpy (key2 + len - strlen ("command"), "needs_terminal");
+			needs_terminal = gconf_client_get_bool (panel_gconf_get_client (),
+								key2,
+								NULL);
+			g_free (key2);
+		}
+		else
+			needs_terminal = FALSE;
+		g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal", needs_terminal);
+	}
+
+	g_free (location);
+
+	g_key_file_set_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", TRUE);
+	g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay", TRUE);
+
+	data = g_key_file_to_data (key_file, &len, &error);
+	if (error) {
+		g_printerr (_("Failed to convert data for '%s': %s"), 
+			    filename, error->message);
+		g_error_free (error);
+		g_key_file_free (key_file);
+
+		return; 
+	}
+	if (!g_file_set_contents (filename, data, len, &error)) {
+		g_printerr (_("Failed to save '%s': %s"), 
+			    filename, error->message);
+		g_error_free (error);
+	}
+
+	g_key_file_free (key_file);
+	g_free (data);
+}
+
+static void
+preferred_app_changed (GConfClient *client,
+		       gint         notify_id,
+		       GConfEntry  *entry,
+		       const gchar  *filename)
+{
+	update_preferred_app (filename, 
+	gconf_entry_get_key (entry), 
+	gconf_value_get_string (entry->value));
+}
+
+void
+panel_preferred_apps_init (void)
+{
+	GConfClient *client;
+	gchar *filename, *exec;
+	gint i;
+
+	const gchar *keys[] = {
+		"/desktop/gnome/url-handlers/http/command",
+		"/desktop/gnome/url-handlers/mailto/command", 
+		NULL };
+	const gchar *files[] = {
+		"preferred-web-browser.desktop",
+		"preferred-mail-reader.desktop",
+		NULL }; 
+
+	client = panel_gconf_get_client ();
+
+	for (i = 0; keys[i]; i++) {
+		filename = g_build_filename (g_get_user_data_dir (), 
+					     "applications", files[i], NULL);
+		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
+			exec = gconf_client_get_string (client, keys[i], NULL);
+			update_preferred_app (filename, keys[i], exec);
+			g_free (exec);
+		}
+		gconf_client_notify_add (client, keys[i],
+					 (GConfClientNotifyFunc) preferred_app_changed,
+					 filename, g_free, NULL);
+	}
+}
diff -up gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.h
--- gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps	2007-08-28 00:46:47.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/launcher.h	2007-08-28 00:47:10.000000000 -0400
@@ -75,6 +75,7 @@ void            launcher_properties_dest
 void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
 						 gboolean  dnd_enabled);
 
+void            panel_preferred_apps_init       (void);
 
 G_END_DECLS
 
diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h
--- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps	2007-08-28 00:48:11.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h	2007-08-28 00:48:34.000000000 -0400
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
 void panel_run_dialog_present           (GdkScreen  *screen,
 					 guint32    activate_time);
 
+GSList *get_all_applications           (void);
+
 G_END_DECLS
 
 #endif /* __PANEL_RUN_DIALOG_H__ */
diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c
--- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps	2007-08-28 00:47:26.000000000 -0400
+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c	2007-08-28 00:47:51.000000000 -0400
@@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
 	return list;
 }
 
-static GSList *
+GSList *
 get_all_applications (void)
 {
 	GMenuTree          *tree;



From fedora-extras-commits at redhat.com  Thu Sep  6 17:15:57 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:15:57 -0400
Subject: rpms/ocaml-csv/devel ocaml-csv.spec,1.2,1.3
Message-ID: <200709061715.l86HFvsX023301@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-csv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23171

Modified Files:
	ocaml-csv.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-5
- Force rebuild because of base OCaml.



Index: ocaml-csv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-csv/devel/ocaml-csv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-csv.spec	30 Aug 2007 09:28:23 -0000	1.2
+++ ocaml-csv.spec	6 Sep 2007 17:15:23 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-csv
 Version:        1.1.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml library for reading and writing CSV files
 
 Group:          Development/Libraries
@@ -16,7 +16,8 @@
 Patch0:         csv-extlib.patch
 Patch1:         csv-install.patch
 
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-extlib-devel
+BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml-findlib-devel, ocaml-extlib-devel
 BuildRequires:  gawk
 
 %define _use_internal_dependency_generator 0
@@ -107,6 +108,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-5
+- Force rebuild because of base OCaml.
+
 * Thu Aug 30 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.6-4
 - Force rebuild because of changed BRs in base OCaml.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:24:49 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:24:49 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.4, 1.5 ocaml-libvirt.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709061724.l86HOnCX023803@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23759/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
- New upstream version 0.3.2.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2007 09:49:16 -0000	1.4
+++ .cvsignore	6 Sep 2007 17:24:16 -0000	1.5
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.5.tar.gz
+ocaml-libvirt-0.3.2.6.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-libvirt.spec	30 Aug 2007 09:49:16 -0000	1.3
+++ ocaml-libvirt.spec	6 Sep 2007 17:24:16 -0000	1.4
@@ -8,7 +8,7 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.5
+Version:        0.3.2.6
 Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
@@ -22,7 +22,7 @@
 # Note for people building from this spec file:
 # These BR's can be found in Fedora development, or here:
 # http://www.annexia.org/tmp/ocaml/
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-extlib-devel
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
+- New upstream version 0.3.2.6.
+
 * Wed Aug 29 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.5-1
 - New upstream version 0.3.2.5.
 - Keep TODO out of the main package, but add (renamed) TODO.libvirt and


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2007 09:49:16 -0000	1.4
+++ sources	6 Sep 2007 17:24:16 -0000	1.5
@@ -1 +1 @@
-1ee9bac2181ee3123ebe018ead0a1933  ocaml-libvirt-0.3.2.5.tar.gz
+9e58cf2cb88d0db8e50915e147054e52  ocaml-libvirt-0.3.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 17:27:42 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 6 Sep 2007 13:27:42 -0400
Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.4,1.5
Message-ID: <200709061727.l86HRgW7023950@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23923

Modified Files:
	ocaml-libvirt.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
  scripts.



Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-libvirt.spec	6 Sep 2007 17:24:16 -0000	1.4
+++ ocaml-libvirt.spec	6 Sep 2007 17:27:10 -0000	1.5
@@ -9,7 +9,7 @@
 
 Name:           ocaml-libvirt
 Version:        0.3.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -22,7 +22,7 @@
 # Note for people building from this spec file:
 # These BR's can be found in Fedora development, or here:
 # http://www.annexia.org/tmp/ocaml/
-BuildRequires:  ocaml
+BuildRequires:  ocaml >= 3.10.0-7
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-extlib-devel
@@ -204,6 +204,10 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
+- Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
+  scripts.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-1
 - New upstream version 0.3.2.6.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:31:27 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 6 Sep 2007 13:31:27 -0400
Subject: rpms/redhat-menus/devel redhat-menus.spec,1.83,1.84
Message-ID: <200709061731.l86HVR8L024379@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24320

Modified Files:
	redhat-menus.spec 
Log Message:
- create /etx/xdg/menus/settings-merged by default



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- redhat-menus.spec	3 Jul 2007 02:48:28 -0000	1.83
+++ redhat-menus.spec	6 Sep 2007 17:30:54 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -61,6 +61,10 @@
 # this is in gnome-menus now
 rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/System.directory
 
+# create the settings-merged to prevent gamin from looking for it
+# in a loop
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/settings-merged ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,11 +79,15 @@
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-merged
 %dir %{_sysconfdir}/xdg/menus/preferences-post-merged
+%dir %{_sysconfdir}/xdg/menus/settings-merged
 %config %{_sysconfdir}/xdg/menus/*.menu
 %{_datadir}/desktop-menu-patches/*.desktop
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Sep  6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
+- create /etx/xdg/menus/settings-merged by default
+
 * Wed Jul  2 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-8
 - More category finetuning
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:35:00 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 13:35:00 -0400
Subject: rpms/kernel/devel kernel.spec, 1.148,
	1.149 linux-2.6-execshield.patch, 1.71, 1.72
Message-ID: <200709061735.l86HZ0Yi024517@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24459

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- exec-shield: enable interrupts in do_iret_error()



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kernel.spec	5 Sep 2007 19:43:23 -0000	1.148
+++ kernel.spec	6 Sep 2007 17:34:27 -0000	1.149
@@ -1782,6 +1782,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- exec-shield: enable interrupts in do_iret_error()
+
 * Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc5-git1
 

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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- linux-2.6-execshield.patch	3 Aug 2007 16:45:32 -0000	1.71
+++ linux-2.6-execshield.patch	6 Sep 2007 17:34:27 -0000	1.72
@@ -367,7 +367,7 @@
  	 * Walk the list again, actually closing and freeing it,
 --- linux-2.6.22.noarch/arch/i386/kernel/traps.c~	2007-07-20 13:50:07.000000000 -0400
 +++ linux-2.6.22.noarch/arch/i386/kernel/traps.c	2007-07-20 13:52:09.000000000 -0400
-@@ -573,7 +573,84 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+@@ -573,7 +573,88 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
@@ -429,14 +429,18 @@
 + * The fixup code for errors in iret jumps to here (iret_exc).  It loses
 + * the original trap number and error code.  The bogus trap 32 and error
 + * code 0 are what the vanilla kernel delivers via:
-+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
++ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
++ *
++ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
 + *
 + * In case of a general protection fault in the iret instruction, we
 + * need to check for a lazy CS update for exec-shield.
 + */
 +fastcall void do_iret_error(struct pt_regs *regs, long error_code)
 +{
-+	int ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
++	int ok;
++	local_irq_enable();
++	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
 +	put_cpu();
 +	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
 +	    error_code, 32, SIGSEGV) != NOTIFY_STOP) {



From fedora-extras-commits at redhat.com  Thu Sep  6 17:36:15 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 6 Sep 2007 13:36:15 -0400
Subject: rpms/git/devel git.spec,1.38,1.39
Message-ID: <200709061736.l86HaFX7024613@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24592

Modified Files:
	git.spec 
Log Message:
* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
- Include git-gui and git-citool docs



Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- git.spec	6 Sep 2007 15:48:06 -0000	1.38
+++ git.spec	6 Sep 2007 17:35:42 -0000	1.39
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.3.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -194,10 +194,10 @@
 %{_bindir}/git-citool
 %{_datadir}/git-gui/
 # Not Yet...
-# %{!?_without_docs: %{_mandir}/man1/git-gui.1}
-# %{!?_without_docs: %doc Documentation/git-gui.html}
-# %{!?_without_docs: %{_mandir}/man1/git-citool.1}
-# %{!?_without_docs: %doc Documentation/git-citool.html}
+%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
+%{!?_without_docs: %doc Documentation/git-gui.html}
+%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
+%{!?_without_docs: %doc Documentation/git-citool.html}
 
 %files -n gitk
 %defattr(-,root,root)
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
+- Include git-gui and git-citool docs
+
 * Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-1
 - git-1.5.3.1-1
 



From fedora-extras-commits at redhat.com  Thu Sep  6 17:39:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 13:39:49 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.481,1.482
Message-ID: <200709061739.l86HdnqZ024836@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24812

Modified Files:
	eclipse.spec 
Log Message:
fix files listing in jdt


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- eclipse.spec	6 Sep 2007 15:41:30 -0000	1.481
+++ eclipse.spec	6 Sep 2007 17:39:17 -0000	1.482
@@ -1502,9 +1502,9 @@
 %{_libdir}/gcj/%{name}/jdimodel.jar.*
 %{_libdir}/gcj/%{name}/jdi.jar.*
 %else
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
 %endif
 
 %files pde



From fedora-extras-commits at redhat.com  Thu Sep  6 17:46:14 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 13:46:14 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1302,1.1303
Message-ID: <200709061746.l86HkE23025005@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24968

Modified Files:
	openoffice.org.spec 
Log Message:
drop the warnings silencer and force nss ver to make sure we have the template fixed one for building


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -r1.1302 -r1.1303
--- openoffice.org.spec	6 Sep 2007 12:45:50 -0000	1.1302
+++ openoffice.org.spec	6 Sep 2007 17:45:42 -0000	1.1303
@@ -75,7 +75,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -1082,7 +1082,7 @@
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
 %patch63 -p1 -b .ooo77672.boost.use.end_p.patch
-%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+#%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 
 %if %{linkopt}



From fedora-extras-commits at redhat.com  Thu Sep  6 17:48:55 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Thu, 6 Sep 2007 13:48:55 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient-addosgimanifest.patch, NONE,
	1.1 jakarta-commons-httpclient.spec, 1.18, 1.19
Message-ID: <200709061748.l86Hmt7M025057@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-httpclient/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25034

Modified Files:
	jakarta-commons-httpclient.spec 
Added Files:
	jakarta-commons-httpclient-addosgimanifest.patch 
Log Message:
Add OSGi MANIFEST.MF information



jakarta-commons-httpclient-addosgimanifest.patch:

--- NEW FILE jakarta-commons-httpclient-addosgimanifest.patch ---
--- MANIFEST.MF	2007-09-06 12:31:02.000000000 -0400
+++ /tmp/orb/org.apache.commons.httpclient/META-INF/MANIFEST.MF	2007-09-06 12:30:45.000000000 -0400
@@ -3,4 +3,27 @@
 Specification-Version: 1.0
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: @version@
-
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.httpclient
+Bundle-Version: 3.0.1.qualifier
+Import-Package: javax.crypto;resolution:=optional,
+ javax.crypto.spec;resolution:=optional,
+ javax.net;resolution:=optional,
+ javax.net.ssl;resolution:=optional,
+ org.apache.commons.codec;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.binary;version="[1.2.0,2.0.0)",
+ org.apache.commons.codec.net;version="[1.2.0,2.0.0)",
+ org.apache.commons.logging;version="[1.0.4,2.0.0)"
+Export-Package: org.apache.commons.httpclient;version="3.0.1",
+ org.apache.commons.httpclient.auth;version="3.0.1",
+ org.apache.commons.httpclient.cookie;version="3.0.1",
+ org.apache.commons.httpclient.methods;version="3.0.1",
+ org.apache.commons.httpclient.methods.multipart;version="3.0.1",
+ org.apache.commons.httpclient.params;version="3.0.1",
+ org.apache.commons.httpclient.protocol;version="3.0.1",
+ org.apache.commons.httpclient.util;version="3.0.1"
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.2


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-httpclient.spec	16 Mar 2007 18:10:37 -0000	1.18
+++ jakarta-commons-httpclient.spec	6 Sep 2007 17:48:22 -0000	1.19
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,14 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.0.1
-Release:        1jpp.1%{?dist}
+Release:        1jpp.2%{?dist}
 Epoch:          1
 Summary: Jakarta Commons HTTPClient implements the client side of HTTP standards
 License:        Apache Software License
 Source0:        http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0.1-src.tar.gz
 Patch0:         %{name}-disablecryptotests.patch
+# Add OSGi MANIFEST.MF bits
+Patch1:         %{name}-addosgimanifest.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries/Java
 %if ! %{gcj_support}
@@ -124,6 +126,11 @@
 
 %patch0
 
+pushd src/conf
+%{__sed} -i 's/\r//' MANIFEST.MF
+%patch1
+popd
+
 # Use javax classes, not com.sun ones
 # assume no filename contains spaces
 pushd src
@@ -225,6 +232,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1:3.0.1-1jpp.2
+- Add OSGi MANIFEST.MF information.
+
 * Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> - 1:3.0.1-1jpp.1
 - Merge with upstream and more rpmlint cleanup.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 18:17:30 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Thu, 6 Sep 2007 14:17:30 -0400
Subject: rpms/audit/devel audit-1.6.1-event-host.patch, NONE, 1.1 audit.spec,
	1.145, 1.146
Message-ID: <200709061817.l86IHUnF031526@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31504

Modified Files:
	audit.spec 
Added Files:
	audit-1.6.1-event-host.patch 
Log Message:
* Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
- Fix uninitialized variable in auparse (John Dennis)


audit-1.6.1-event-host.patch:

--- NEW FILE audit-1.6.1-event-host.patch ---
diff -r -u audit-1.6.1.orig/auparse/auparse.c audit-1.6.1/auparse/auparse.c
--- audit-1.6.1.orig/auparse/auparse.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/auparse.c	2007-09-06 12:31:27.000000000 -0400
@@ -574,6 +574,7 @@
 {
 	char *ptr, *tmp;
 
+        e->host = NULL;         // FIXME
 	tmp = strndupa(b, 80);
 	ptr = strtok(tmp, " ");
 	if (ptr) {
diff -r -u audit-1.6.1.orig/auparse/ellist.c audit-1.6.1/auparse/ellist.c
--- audit-1.6.1.orig/auparse/ellist.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/ellist.c	2007-09-06 10:21:14.000000000 -0400
@@ -35,6 +35,7 @@
 	l->e.milli = 0L;       
 	l->e.sec = 0L;         
 	l->e.serial = 0L;
+	l->e.host = NULL;
 }
 hidden_def(aup_list_create);
 
@@ -258,6 +259,7 @@
 	l->e.milli = 0L;       
 	l->e.sec = 0L;         
 	l->e.serial = 0L;      
+	l->e.host = NULL;      
 }
 hidden_def(aup_list_clear);
 
@@ -269,6 +271,7 @@
 	e->sec = l->e.sec;
         e->milli = l->e.milli;
         e->serial = l->e.serial;
+        e->host = l->e.host;
 	return 1;
 }
 hidden_def(aup_list_get_event);
@@ -281,6 +284,7 @@
 	l->e.sec = e->sec;
         l->e.milli = e->milli;
         l->e.serial = e->serial;
+        l->e.host = e->host;
 	return 1;
 }
 hidden_def(aup_list_set_event);
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.c audit-1.6.1/auparse/test/auparse_test.c
--- audit-1.6.1.orig/auparse/test/auparse_test.c	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.c	2007-09-06 10:21:14.000000000 -0400
@@ -42,7 +42,7 @@
 				printf("Error getting timestamp - aborting\n");
 				exit(1);
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			auparse_first_field(au);
 			do {
 				printf("        %s=%s (%s)\n",
@@ -80,7 +80,7 @@
 				printf("Error getting timestamp - aborting\n");
 				exit(1);
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			printf("\n");
 			record_cnt++;
 		} while(auparse_next_record(au) > 0);
@@ -207,7 +207,7 @@
 			if (e == NULL) {
 				return;
 			}
-			printf("    event time: %u.%u:%lu\n", (unsigned)e->sec, e->milli, e->serial);
+			printf("    event time: %u.%u:%lu, host=%s\n", (unsigned)e->sec, e->milli, e->serial, e->host);
 			auparse_first_field(au);
 			do {
 				printf("        %s=%s (%s)\n",
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.py audit-1.6.1/auparse/test/auparse_test.py
--- audit-1.6.1.orig/auparse/test/auparse_test.py	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.py	2007-09-06 11:57:52.000000000 -0400
@@ -10,12 +10,19 @@
 import sys
 import time
 load_path = '../../bindings/python/build/lib.linux-i686-2.4'
-if True:
+if False:
     sys.path.insert(0, load_path)
 
 import auparse
 import audit
 
+def none_to_null(s):
+    'used so output matches C version'
+    if s is None:
+        return '(null)'
+    else:
+        return s
+
 def walk_test(au):
     event_cnt = 1
 
@@ -39,7 +46,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             au.first_field()
             while True:
                 print "        %s=%s (%s)" % (au.get_field_name(), au.get_field_str(), au.interpret_field())
@@ -71,7 +78,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             print
             record_cnt += 1
             if not au.next_record(): break
@@ -131,7 +138,7 @@
                 print "Error getting timestamp - aborting"
                 sys.exit(1)
 
-            print "    event time: %d.%d:%d" % (event.sec, event.milli, event.serial)
+            print "    event time: %d.%d:%d, host=%s" % (event.sec, event.milli, event.serial, none_to_null(event.host))
             au.first_field()
             while True:
                 print "        %s=%s (%s)" % (au.get_field_name(), au.get_field_str(), au.interpret_field())
diff -r -u audit-1.6.1.orig/auparse/test/auparse_test.ref audit-1.6.1/auparse/test/auparse_test.ref
--- audit-1.6.1.orig/auparse/test/auparse_test.ref	2007-09-06 10:19:41.000000000 -0400
+++ audit-1.6.1/auparse/test/auparse_test.ref	2007-09-06 13:01:19.000000000 -0400
@@ -11,7 +11,7 @@
 event 1 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=1 file=None
-    event time: 1143146623.787:142
+    event time: 1143146623.787:142, host=(null)
         type=LOGIN (LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -21,7 +21,7 @@
 event 2 has 1 records
     record 1 of type 1300(SYSCALL) has 24 fields
     line=2 file=None
-    event time: 1143146623.875:143
+    event time: 1143146623.875:143, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=188 (setxattr)
@@ -50,7 +50,7 @@
 event 3 has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=3 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
         type=USER_LOGIN (USER_LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -68,7 +68,7 @@
 event has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=1 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
 
 Test 3 Done
 
@@ -76,7 +76,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -91,7 +91,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -121,13 +121,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=./test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -142,7 +142,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=./test.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -158,7 +158,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=./test.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -174,7 +174,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=./test.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -184,7 +184,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=./test.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -200,7 +200,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=./test.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -216,7 +216,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=./test.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -235,7 +235,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -250,7 +250,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -280,13 +280,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=test.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -301,7 +301,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=test.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -317,7 +317,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=test.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -333,7 +333,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=test.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -343,7 +343,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=test.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -359,7 +359,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=test.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -375,7 +375,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=test.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -391,7 +391,7 @@
 event 8 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read (read)
@@ -406,7 +406,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -436,13 +436,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=test2.log
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -457,7 +457,7 @@
 event 9 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=test2.log
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -473,7 +473,7 @@
 event 10 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=test2.log
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -489,7 +489,7 @@
 event 11 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=test2.log
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -499,7 +499,7 @@
 event 12 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=test2.log
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -515,7 +515,7 @@
 event 13 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=test2.log
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -531,7 +531,7 @@
 event 14 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=test2.log
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)
@@ -572,7 +572,7 @@
 event 1 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=1 file=None
-    event time: 1143146623.787:142
+    event time: 1143146623.787:142, host=(null)
         type=LOGIN (LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -582,7 +582,7 @@
 event 2 has 1 records
     record 1 of type 1300(SYSCALL) has 24 fields
     line=2 file=None
-    event time: 1143146623.875:143
+    event time: 1143146623.875:143, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=188 (setxattr)
@@ -611,7 +611,7 @@
 event 3 has 1 records
     record 1 of type 1112(USER_LOGIN) has 10 fields
     line=3 file=None
-    event time: 1143146623.879:146
+    event time: 1143146623.879:146, host=(null)
         type=USER_LOGIN (USER_LOGIN)
         pid=2027 (2027)
         uid=0 (root)
@@ -629,7 +629,7 @@
 event 1 has 4 records
     record 1 of type 1400(AVC) has 11 fields
     line=1 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=AVC (AVC)
         seresult=denied (denied)
         seperms=read,write (read,write)
@@ -644,7 +644,7 @@
 
     record 2 of type 1300(SYSCALL) has 26 fields
     line=2 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=SYSCALL (SYSCALL)
         arch=c000003e (x86_64)
         syscall=2 (open)
@@ -674,13 +674,13 @@
 
     record 3 of type 1307(CWD) has 2 fields
     line=3 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=CWD (CWD)
         cwd="/var/spool/postfix" (/var/spool/postfix)
 
     record 4 of type 1302(PATH) has 10 fields
     line=4 file=None
-    event time: 1170021493.977:293
+    event time: 1170021493.977:293, host=(null)
         type=PATH (PATH)
         item=0 (0)
         name="maildrop" (maildrop)
@@ -695,7 +695,7 @@
 event 2 has 1 records
     record 1 of type 1101(USER_ACCT) has 11 fields
     line=5 file=None
-    event time: 1170021601.340:294
+    event time: 1170021601.340:294, host=(null)
         type=USER_ACCT (USER_ACCT)
         pid=13015 (13015)
         uid=0 (root)
@@ -711,7 +711,7 @@
 event 3 has 1 records
     record 1 of type 1103(CRED_ACQ) has 11 fields
     line=6 file=None
-    event time: 1170021601.342:295
+    event time: 1170021601.342:295, host=(null)
         type=CRED_ACQ (CRED_ACQ)
         pid=13015 (13015)
         uid=0 (root)
@@ -727,7 +727,7 @@
 event 4 has 1 records
     record 1 of type 1006(LOGIN) has 5 fields
     line=7 file=None
-    event time: 1170021601.343:296
+    event time: 1170021601.343:296, host=(null)
         type=LOGIN (LOGIN)
         pid=13015 (13015)
         uid=0 (root)
@@ -737,7 +737,7 @@
 event 5 has 1 records
     record 1 of type 1105(USER_START) has 11 fields
     line=8 file=None
-    event time: 1170021601.344:297
+    event time: 1170021601.344:297, host=(null)
         type=USER_START (USER_START)
         pid=13015 (13015)
         uid=0 (root)
@@ -753,7 +753,7 @@
 event 6 has 1 records
     record 1 of type 1104(CRED_DISP) has 11 fields
     line=9 file=None
-    event time: 1170021601.364:298
+    event time: 1170021601.364:298, host=(null)
         type=CRED_DISP (CRED_DISP)
         pid=13015 (13015)
         uid=0 (root)
@@ -769,7 +769,7 @@
 event 7 has 1 records
     record 1 of type 1106(USER_END) has 11 fields
     line=10 file=None
-    event time: 1170021601.366:299
+    event time: 1170021601.366:299, host=(null)
         type=USER_END (USER_END)
         pid=13015 (13015)
         uid=0 (root)


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- audit.spec	2 Sep 2007 16:49:22 -0000	1.145
+++ audit.spec	6 Sep 2007 18:16:57 -0000	1.146
@@ -1,14 +1,15 @@
 %define sca_version 0.4.3
-%define sca_release 3
+%define sca_release 4
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+Patch1: audit-1.6.1-event-host.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -67,6 +68,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -209,6 +211,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
+- Fix uninitialized variable in auparse (John Dennis)
+
 * Sun Sep 2 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-1
 - External plugin support in place
 - Fix reference counting in auparse python bindings (#263961)



From fedora-extras-commits at redhat.com  Thu Sep  6 18:45:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 14:45:43 -0400
Subject: rpms/mesa/devel mesa-7.0.1-965-sampler-crash.patch, NONE,
	1.1 mesa.spec, 1.139, 1.140
Message-ID: <200709061845.l86Ijh9U032042@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32021

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.0.1-965-sampler-crash.patch 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)


mesa-7.0.1-965-sampler-crash.patch:

--- NEW FILE mesa-7.0.1-965-sampler-crash.patch ---
commit 410d8f7cdb40889e66f5c6794878ad9a5f572ee7
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Aug 29 10:13:10 2007 -0400

    i965: samplers group in fours in WM_STATE. fix bug#9415

diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c
index ff5cb31..5b4f2ab 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
@@ -117,7 +117,7 @@ static void upload_wm_unit(struct brw_context *brw )
    wm.thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
 
    /* CACHE_NEW_SAMPLER */
-   wm.wm4.sampler_count = brw->wm.sampler_count;
+   wm.wm4.sampler_count = (brw->wm.sampler_count + 1) / 4;
    wm.wm4.sampler_state_pointer = brw->wm.sampler_gs_offset >> 5;
 
    /* BRW_NEW_FRAGMENT_PROGRAM */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mesa.spec	28 Aug 2007 13:39:17 -0000	1.139
+++ mesa.spec	6 Sep 2007 18:45:11 -0000	1.140
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -52,6 +52,7 @@
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.0.1-stable-branch.patch
 Patch27: mesa-7.0-use_master-r300.patch
+Patch28: mesa-7.0.1-965-sampler-crash.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -183,6 +184,7 @@
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .stable
 %patch27 -p1 -b .r300
+%patch28 -p1 -b .965-sampler
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -412,6 +414,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
+- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
+
 * Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 7.0.1-4
 - Rebuild for new libexpat.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 18:55:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 14:55:56 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.61, 1.62 gnome-utils.spec,
	1.152, 1.153 sources, 1.65, 1.66
Message-ID: <200709061855.l86Itu8r032283@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	4 Sep 2007 05:03:17 -0000	1.61
+++ .cvsignore	6 Sep 2007 18:55:24 -0000	1.62
@@ -1 +1 @@
-gnome-utils-2.19.91.tar.bz2
+gnome-utils-2.19.92.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gnome-utils.spec	4 Sep 2007 05:03:17 -0000	1.152
+++ gnome-utils.spec	6 Sep 2007 18:55:24 -0000	1.153
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.91
+Version:        2.19.92
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -236,6 +236,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	4 Sep 2007 05:03:17 -0000	1.65
+++ sources	6 Sep 2007 18:55:24 -0000	1.66
@@ -1 +1 @@
-b1d4fd889d9a556f11f17a06ebb8ef81  gnome-utils-2.19.91.tar.bz2
+87d0ebb61b53f5a5011cb4b380e1cf86  gnome-utils-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 19:06:08 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 15:06:08 -0400
Subject: rpms/avahi/devel avahi-0.6.21-libdns_sd-fix.patch, NONE,
	1.1 avahi-0.6.21-initscript.patch, 1.1, 1.2 avahi.spec, 1.94, 1.95
Message-ID: <200709061906.l86J686B006205@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6158

Modified Files:
	avahi-0.6.21-initscript.patch avahi.spec 
Added Files:
	avahi-0.6.21-libdns_sd-fix.patch 
Log Message:
- resolves #249044: Update init script to use runlevel 96
- resolves #251700: Fix assertion in libdns_sd-compat


avahi-0.6.21-libdns_sd-fix.patch:

--- NEW FILE avahi-0.6.21-libdns_sd-fix.patch ---
Index: avahi-compat-libdns_sd/compat.c
===================================================================
--- avahi-compat-libdns_sd/compat.c	(revision 1535)
+++ avahi-compat-libdns_sd/compat.c	(revision 1536)
@@ -990,6 +990,16 @@
                     return;
                 }
             }
+
+            if (!sdref->service_name_chosen) {
+
+                assert(sdref->service_name);
+                
+                if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) {
+                    reg_report_error(sdref, kDNSServiceErr_NoMemory);
+                    return;
+                }
+            }
             
             /* Register the service */
 

avahi-0.6.21-initscript.patch:

Index: avahi-0.6.21-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi-0.6.21-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.21-initscript.patch	28 Aug 2007 18:31:08 -0000	1.1
+++ avahi-0.6.21-initscript.patch	6 Sep 2007 19:05:34 -0000	1.2
@@ -1,7 +1,19 @@
-diff -up avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript avahi-0.6.21/initscript/fedora/avahi-daemon.in
---- avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript	2007-08-28 15:00:24.000000000 +0200
-+++ avahi-0.6.21/initscript/fedora/avahi-daemon.in	2007-08-28 17:34:28.000000000 +0200
-@@ -14,20 +14,25 @@ OTHER_AVAHI_OPTS=""
+Index: initscript/fedora/avahi-dnsconfd.in
+===================================================================
+--- initscript/fedora/avahi-dnsconfd.in	(revision 1531)
++++ initscript/fedora/avahi-dnsconfd.in	(revision 1535)
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ #
+-# avahi-daemon:       Starts the Avahi dns configuration daemon
++# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 97 02
++# chkconfig: - 96 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script \
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced \
+ #       on the local LAN. This is useful for configuring unicast DNS servers in \
+@@ -14,18 +14,24 @@
  
  # Source function library.
  . /etc/init.d/functions
@@ -10,40 +22,58 @@
  
 -# Check that networking is configured.
 -[ ${NETWORKING} = "no" ] && exit 0
- 
- AVAHI_BIN=@sbindir@/avahi-daemon
+-
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
 -test -x $AVAHI_BIN || exit 5
-+
+ 
 +if [ $1 == 'status' ]; then
 +    test -x $AVAHI_BIN || exit 4
 +else 
 +    test -x $AVAHI_BIN || exit 5
 +fi
++
+ LOCKFILE=/var/lock/subsys/avahi-dnsconfd
  
- LOCKFILE=/var/lock/subsys/avahi-daemon
- 
- base=${0##*/}
- 
++base=${0##*/}
++
  start() {
 +    # Check that networking is configured.
 +    [ ${NETWORKING} = "no" ] && exit 1
 +
- 	echo -n $"Starting Avahi daemon... "
- 	if [ -s /etc/localtime ]; then
- 	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
-@@ -96,7 +101,7 @@ case "$1" in
+ 	echo -n $"Starting Avahi DNS daemon... "
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+@@ -58,7 +64,6 @@
+ 	return $RETVAL
+ }
+ 
+-
+ restart() {
+ 	stop
+ 	start
+@@ -92,7 +97,7 @@
  	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 -	exit 1
 +	exit 2
+ 	;;
  esac
  
- exit $RETVAL
-diff -up avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in
---- avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript	2007-08-28 17:35:07.000000000 +0200
-+++ avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in	2007-08-28 17:36:48.000000000 +0200
-@@ -14,18 +14,21 @@ OTHER_AVAHI_OPTS=""
+Index: initscript/fedora/avahi-daemon.in
+===================================================================
+--- initscript/fedora/avahi-daemon.in	(revision 1531)
++++ initscript/fedora/avahi-daemon.in	(revision 1535)
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi Daemon
+ #
+-# chkconfig: 345 97 02
++# chkconfig: 345 96 02
+ # description: This is a daemon which runs on client machines to perform \
+ #              Zeroconf service discovery on a network. avahi-daemon must be \
+ #              running on systems  that use Avahi for service discovery. \
+@@ -14,20 +14,24 @@
  
  # Source function library.
  . /etc/init.d/functions
@@ -53,29 +83,33 @@
 -# Check that networking is configured.
 -[ ${NETWORKING} = "no" ] && exit 0
 -
- AVAHI_BIN=@sbindir@/avahi-dnsconfd
+ AVAHI_BIN=@sbindir@/avahi-daemon
 -test -x $AVAHI_BIN || exit 5
+ 
 +if [ $1 == 'status' ]; then
 +    test -x $AVAHI_BIN || exit 4
 +else 
 +    test -x $AVAHI_BIN || exit 5
 +fi
++
+ LOCKFILE=/var/lock/subsys/avahi-daemon
  
- LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+ base=${0##*/}
  
  start() {
 +    # Check that networking is configured.
 +    [ ${NETWORKING} = "no" ] && exit 1
 +
- 	echo -n $"Starting Avahi DNS daemon... "
-         $AVAHI_BIN -D
- 	RETVAL=$?
-@@ -92,7 +95,7 @@ case "$1" in
+ 	echo -n $"Starting Avahi daemon... "
+ 	if [ -s /etc/localtime ]; then
+ 	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
+@@ -96,7 +100,8 @@
  	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 -	exit 1
 +	exit 2
- 	;;
++        ;;
  esac
  
+ exit $RETVAL


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- avahi.spec	6 Sep 2007 16:28:52 -0000	1.94
+++ avahi.spec	6 Sep 2007 19:05:35 -0000	1.95
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -39,6 +39,7 @@
 Patch1:     avahi-0.6.21-avahi-browse-help-fix.patch
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch3:     avahi-0.6.21-initscript.patch
+Patch4:     avahi-0.6.21-libdns_sd-fix.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -221,8 +222,9 @@
 %patch1 -p0 -b .avahi-browse-help-fix
 %if %{WITH_MONO}
 %patch2 -p1 -b .MONO_SHARED_DIR
-%patch3 -p1 -b .initscript
 %endif
+%patch3 -p0 -b .initscript
+%patch4 -p0 -b .dns_sd
 
 %build
 
@@ -483,6 +485,10 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-5
+- resolves #249044: Update init script to use runlevel 96
+- resolves #251700: Fix assertion in libdns_sd-compat
+
 * Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-4
 - Ship ssh static service file by default, don't ship ssh-sftp by default
 - resolves: #269741: split off avahi-ui-tools package



From fedora-extras-commits at redhat.com  Thu Sep  6 19:09:16 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 6 Sep 2007 15:09:16 -0400
Subject: rpms/obexftp/devel .cvsignore, 1.4, 1.5 obexftp.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709061909.l86J9GPa006339@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/obexftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6313

Modified Files:
	.cvsignore obexftp.spec sources 
Log Message:
- updated to 0.22-rc7
- added pkgconfig file
- make perl BR more specific



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Aug 2007 19:06:25 -0000	1.4
+++ .cvsignore	6 Sep 2007 19:08:43 -0000	1.5
@@ -1 +1 @@
-obexftp-0.22-rc6.tar.bz2
+obexftp-0.22-rc7.tar.bz2


Index: obexftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/obexftp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obexftp.spec	27 Aug 2007 18:59:03 -0000	1.7
+++ obexftp.spec	6 Sep 2007 19:08:43 -0000	1.8
@@ -2,13 +2,13 @@
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
 %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
-%define pre rc6
+%define pre rc7
 
 Name: obexftp
 Summary: Tool to access devices via the OBEX protocol
 Group: Applications/File
 Version: 0.22
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 License: GPLv2+
 URL: http://openobex.triq.net/
 Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.bz2
@@ -19,7 +19,7 @@
 BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: openobex-devel >= 1.2
-BuildRequires: perl-devel
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: python-devel
 BuildRequires: tcl-devel
 
@@ -74,6 +74,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: openobex-devel >= 1.2
+Requires: pkgconfig
 
 %description devel
 This package contains the header files, static libraries and development
@@ -120,6 +121,7 @@
 %{_includedir}/multicobex/
 %{_includedir}/obexftp/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/obexftp.pc
 
 %files -n python-%{name}
 %defattr(-, root, root, -)
@@ -138,6 +140,11 @@
 %{ruby_sitearch}/obexftp.so
 
 %changelog
+* Thu Sep 06 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.22-0.5.rc7
+- updated to 0.22-rc7
+- added pkgconfig file
+- make perl BR more specific
+
 * Mon Aug 27 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.22-0.4.rc6
 - rebuilt for BuildID
 - updated license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexftp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Aug 2007 19:06:25 -0000	1.4
+++ sources	6 Sep 2007 19:08:43 -0000	1.5
@@ -1 +1 @@
-79c50f564bdeeba662fd0fa384bfa183  obexftp-0.22-rc6.tar.bz2
+3c2a9807288fd6c6f564d10fbc2bc8c0  obexftp-0.22-rc7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 19:11:32 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 6 Sep 2007 15:11:32 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24, 
	1.25 telepathy-gabble.spec, 1.33, 1.34
Message-ID: <200709061911.l86JBWTO006609@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6574

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	4 Sep 2007 21:19:00 -0000	1.24
+++ .cvsignore	6 Sep 2007 19:10:58 -0000	1.25
@@ -4,3 +4,4 @@
 telepathy-gabble-0.5.12.1.20070711darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
+telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Sep 2007 21:19:00 -0000	1.24
+++ sources	6 Sep 2007 19:10:58 -0000	1.25
@@ -1 +1 @@
-07d399b2e41a5ba90d410e5102b5c872  telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
+6bf82d42255c15f819639c78765c27af  telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- telepathy-gabble.spec	4 Sep 2007 21:24:56 -0000	1.33
+++ telepathy-gabble.spec	6 Sep 2007 19:10:58 -0000	1.34
@@ -1,19 +1,19 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070904darcs_olpctrial3a
+%define alphatag 20070906darcs_olpctrial3a
 
 %define telepathy_glibi_version 0.5.14
 
 Name:           telepathy-gabble
-Version:        0.5.13.1
+Version:        0.5.14.1
 Release:        0.1.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.13.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.%{alphatag}.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
+- New snapshot
+
 * Tue Sep 04 2007 Dan Williams <dcbw at redhat.com> - 0.5.13.1-0.1.20070904darcs_olpctrial3a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 19:22:50 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 6 Sep 2007 15:22:50 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.51,1.52
Message-ID: <200709061922.l86JMorV006956@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6909

Modified Files:
	kernel-xen.spec 
Log Message:
Actually include the code that generates modules.{networking,block}



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kernel-xen.spec	6 Sep 2007 16:41:47 -0000	1.51
+++ kernel-xen.spec	6 Sep 2007 19:22:17 -0000	1.52
@@ -1633,6 +1633,20 @@
     # mark modules executable so that strip-to-file can strip them
     cat modnames | xargs chmod u+x
 
+    fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA |
+    sed -n 's,^.*/\([^/]*\.ko\):  *U \(.*\)$,\1 \2,p' > drivers.undef
+
+    collect_modules_list()
+    {
+      sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef |
+      LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
+    }
+
+    collect_modules_list networking \
+    			 'register_netdev|ieee80211_register_hw|usbnet_probe'
+    collect_modules_list block \
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue'
+
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do



From fedora-extras-commits at redhat.com  Thu Sep  6 19:24:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 6 Sep 2007 15:24:32 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.153,1.154
Message-ID: <200709061924.l86JOW7v007049@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6994

Modified Files:
	gnome-utils.spec 
Log Message:
fix file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-utils.spec	6 Sep 2007 18:55:24 -0000	1.153
+++ gnome-utils.spec	6 Sep 2007 19:24:00 -0000	1.154
@@ -216,8 +216,6 @@
 %{_datadir}/pixmaps/gsearchtool/thumbnail_frame.png
 %{_datadir}/icons/hicolor/24x24/apps/baobab.png
 %{_datadir}/icons/hicolor/scalable/apps/baobab.svg
-%{_datadir}/icons/hicolor/48x48/apps/gnome-dictionary.png
-%{_datadir}/icons/hicolor/scalable/apps/gnome-dictionary.svg
 %{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server



From fedora-extras-commits at redhat.com  Thu Sep  6 19:26:44 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Thu, 6 Sep 2007 15:26:44 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.5, 1.6 openoffice.org.spec, 1.1303, 1.1304
Message-ID: <200709061926.l86JQi7O007195@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7172

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
scale back on visibility

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	2 Dec 2006 11:40:26 -0000	1.5
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	6 Sep 2007 19:26:41 -0000	1.6
@@ -9,22 +9,22 @@
      case ${sd_arg} in
      -calc)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+	sd_binary="scalc.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -draw)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+	sd_binary="sdraw.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -impress)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+	sd_binary="simpress.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -writer)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+	sd_binary="swriter.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      *)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1303
retrieving revision 1.1304
diff -u -r1.1303 -r1.1304
--- openoffice.org.spec	6 Sep 2007 17:45:42 -0000	1.1303
+++ openoffice.org.spec	6 Sep 2007 19:26:41 -0000	1.1304
@@ -1100,6 +1100,9 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#visibility seem to be f*cked up right now
+unset HAVE_GCC_VISIBILITY_FEATURE
+#unneccessary to build for both hash types
 unset HAVE_LD_HASH_STYLE
 #faster build
 export nodep=true
@@ -2782,6 +2785,7 @@
 - add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 - disable custom launchers, it breaks icedtea for some reason I haven't time to
   figure out
+- disable visibility for now, seems screwed up.
 
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:09 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 6 Sep 2007 15:37:09 -0400
Subject: rpms/gnu-smalltalk/devel gst-2.3.6-am.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 gnu-smalltalk.spec, 1.21, 1.22 sources, 1.7,
	1.8 gst-2.3.5-am.patch, 1.1, NONE
Message-ID: <200709061937.l86Jb9ro007602@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561

Modified Files:
	.cvsignore gnu-smalltalk.spec sources 
Added Files:
	gst-2.3.6-am.patch 
Removed Files:
	gst-2.3.5-am.patch 
Log Message:
New upstream release

gst-2.3.6-am.patch:

--- NEW FILE gst-2.3.6-am.patch ---
diff -up smalltalk-2.3.6/configure.automake smalltalk-2.3.6/configure
--- smalltalk-2.3.6/configure.automake	2007-09-06 09:34:49.000000000 +0200
+++ smalltalk-2.3.6/configure	2007-09-06 20:56:08.000000000 +0200
@@ -723,7 +723,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='GNU Smalltalk'
-PACKAGE_TARNAME='smalltalk'
+PACKAGE_TARNAME='gnu-smalltalk'
 PACKAGE_VERSION='2.3.6'
 PACKAGE_STRING='GNU Smalltalk 2.3.6'
 PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
@@ -947,8 +947,7 @@ CPP
 EMACS
 EMACSLOADPATH'
 ac_subdirs_all='libffi
-snprintfv
-sigsegv'
+snprintfv'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1498,7 +1497,7 @@ Fine tuning of the installation director
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/smalltalk]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gnu-smalltalk]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -2434,7 +2433,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='smalltalk'
+ PACKAGE='gnu-smalltalk'
  VERSION='2.3.6'
 
 
@@ -5239,7 +5238,140 @@ esac
 fi
 
 if test $enable_generational_gc != no; then
-  subdirs="$subdirs sigsegv"
+  if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for sigsegv.h" >&5
+echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
+echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sigsegv.h usability" >&5
+echo $ECHO_N "checking sigsegv.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <sigsegv.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sigsegv.h presence" >&5
+echo $ECHO_N "checking sigsegv.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sigsegv.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sigsegv.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sigsegv.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sigsegv.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sigsegv.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sigsegv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to help-smalltalk at gnu.org ##
+## ------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for sigsegv.h" >&5
+echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sigsegv_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sigsegv_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
+echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
+
+fi
+if test $ac_cv_header_sigsegv_h = yes; then
+  MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la"
+fi
+
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -8462,7 +8594,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8465 "configure"' > conftest.$ac_ext
+  echo '#line 8597 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10020,11 +10152,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10023: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10155: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10027: \$? = $ac_status" >&5
+   echo "$as_me:10159: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10263,11 +10395,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10266: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10398: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10270: \$? = $ac_status" >&5
+   echo "$as_me:10402: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10323,11 +10455,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10326: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10458: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10330: \$? = $ac_status" >&5
+   echo "$as_me:10462: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12471,7 +12603,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12474 "configure"
+#line 12606 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12569,7 +12701,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12572 "configure"
+#line 12704 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18084,7 +18216,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18087 "configure"
+#line 18219 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff -up smalltalk-2.3.6/Makefile.in.automake smalltalk-2.3.6/Makefile.in
--- smalltalk-2.3.6/Makefile.in.automake	2007-09-06 09:34:44.000000000 +0200
+++ smalltalk-2.3.6/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -276,7 +276,7 @@ MODULES_TK = @MODULES_TK@
 NCURSES_DISABLED = @NCURSES_DISABLED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-PACKAGE = smalltalk
+PACKAGE = gnu-smalltalk
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -324,7 +324,7 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-imagedir = @imagedir@
+imagedir = ${libdir}/@PACKAGE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -349,7 +349,7 @@ target_alias = @target_alias@
 # Automake requirements
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
 	i18n tcp examples blox-tk . gtk tests doc
 
 SUBDIRS = lib-src lightning $(subdirs) $(am__append_1) libgst i18n tcp \
@@ -1122,19 +1122,19 @@ dist-hook: gst-package
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
 	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+	-rm -f $(DESTDIR)$(imagesdir)/packages.xml
 	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
diff -up smalltalk-2.3.6/Makefile.am.automake smalltalk-2.3.6/Makefile.am
--- smalltalk-2.3.6/Makefile.am.automake	2007-09-06 09:29:42.000000000 +0200
+++ smalltalk-2.3.6/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -19,9 +19,9 @@
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
 
-PACKAGE=smalltalk
+PACKAGE=gnu-smalltalk
 
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
 	i18n tcp examples blox-tk . gtk tests doc
 
 SUBDIRS = lib-src lightning $(subdirs)
@@ -50,6 +50,7 @@ dist_noinst_SCRIPTS = build-aux/texi2dvi
 ###########################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
+imagedir = ${libdir}/@PACKAGE@
 nodist_pkgconfig_DATA = gnu-smalltalk.pc
 
 pkglib_DATA = libc.la
@@ -158,19 +159,19 @@ dist-hook: gst-package
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
 	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+	-rm -f $(DESTDIR)$(imagesdir)/packages.xml
 	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
diff -up smalltalk-2.3.6/configure.ac.automake smalltalk-2.3.6/configure.ac
--- smalltalk-2.3.6/configure.ac.automake	2007-09-06 09:28:23.000000000 +0200
+++ smalltalk-2.3.6/configure.ac	2007-09-06 20:56:00.000000000 +0200
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 2.3.6, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 2.3.6, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -80,7 +80,7 @@ AC_ARG_ENABLE(generational-gc,
         *) enable_generational_gc=yes ;;
 esac])
 if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
+  AC_CHECK_HEADER(sigsegv.h, MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la")
   AC_DEFINE(HAVE_SIGSEGV_H, 1,
     [Define to 1 if libsigsegv is being used])
 fi
diff -up smalltalk-2.3.6/examples/Makefile.in.automake smalltalk-2.3.6/examples/Makefile.in
--- smalltalk-2.3.6/examples/Makefile.in.automake	2007-09-06 09:34:34.000000000 +0200
+++ smalltalk-2.3.6/examples/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -281,7 +281,7 @@ sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
 EXTRA_LTLIBRARIES = gdbm.la zlib.la
 pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la
diff -up smalltalk-2.3.6/examples/Makefile.am.automake smalltalk-2.3.6/examples/Makefile.am
--- smalltalk-2.3.6/examples/Makefile.am.automake	2007-05-24 22:10:25.000000000 +0200
+++ smalltalk-2.3.6/examples/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -1,4 +1,4 @@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
 
diff -up smalltalk-2.3.6/libgst/Makefile.in.automake smalltalk-2.3.6/libgst/Makefile.in
--- smalltalk-2.3.6/libgst/Makefile.in.automake	2007-09-06 09:34:39.000000000 +0200
+++ smalltalk-2.3.6/libgst/Makefile.in	2007-09-06 20:54:50.000000000 +0200
@@ -41,10 +41,8 @@ host_triplet = @host@
 @HAVE_INSTALLED_LIGHTNING_FALSE at am__append_1 = -I$(top_srcdir)/lightning -I$(top_builddir)/lightning \
 @HAVE_INSTALLED_LIGHTNING_FALSE@  -I$(top_srcdir) -I$(top_builddir)
 
- at HAVE_SIGSEGV_TRUE@am__append_2 = -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
 EXTRA_PROGRAMS = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
- at HAVE_SIGSEGV_TRUE@am__append_3 = $(top_builddir)/sigsegv/src/libsigsegv.la
- at HAVE_SIGSEGV_TRUE@am__append_4 = $(top_builddir)/sigsegv/src/libsigsegv.la
+ at HAVE_SIGSEGV_TRUE@am__append_2 = -lsigsegv
 subdir = libgst
 DIST_COMMON = $(dist_noinst_DATA) $(include_HEADERS) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
@@ -97,8 +95,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
- at HAVE_SIGSEGV_TRUE@am__DEPENDENCIES_1 =  \
- at HAVE_SIGSEGV_TRUE@	$(top_builddir)/sigsegv/src/libsigsegv.la
+am__DEPENDENCIES_1 =
 am_libgst_la_OBJECTS = interp.lo lib.lo gst-parse.lo lex.lo str.lo \
 	tree.lo byte.lo comp.lo sym.lo dict.lo oop.lo opt.lo save.lo \
 	cint.lo heap.lo input.lo sysdep.lo callin.lo xlat.lo events.lo \
@@ -314,8 +311,7 @@ AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatad
 	-DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
 	-I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
 	-I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-	@INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \
-	$(am__append_1) $(am__append_2)
+	@INCSNPRINTFV@ -I$(top_builddir)/lib-src $(am__append_1)
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 CLEANFILES = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
@@ -323,10 +319,10 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
 # definitions for libgst.la
 libgst_la_LIBADD = $(top_builddir)/lib-src/library.la \
 	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ \
-	@LIBGMP@ $(am__append_3)
+	@LIBGMP@ $(am__append_2)
 libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ \
-	$(am__append_4)
+	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
 	-export-symbols-regex "^gst_.*"
 
diff -up smalltalk-2.3.6/libgst/Makefile.am.automake smalltalk-2.3.6/libgst/Makefile.am
--- smalltalk-2.3.6/libgst/Makefile.am.automake	2007-02-13 17:32:35.000000000 +0100
+++ smalltalk-2.3.6/libgst/Makefile.am	2007-09-06 20:54:50.000000000 +0200
@@ -8,17 +8,13 @@ AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatad
   -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
   -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
   -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-  @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
+  @INCSNPRINTFV@ -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
 AM_CPPFLAGS += -I$(top_srcdir)/lightning -I$(top_builddir)/lightning \
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
-
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -33,8 +29,7 @@ libgst_la_DEPENDENCIES=$(top_builddir)/l
 	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
 
 if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
+libgst_la_LIBADD += -lsigsegv
 endif
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
@@ -113,6 +108,7 @@ $(srcdir)/match.stamp: byte.def byte.c o
 	@echo timestamp > $(srcdir)/match.stamp
 
 
+
 # rules for invoking genprims
 # Try to economize in the rebuilds, by avoiding unnecessary
 # changes to the timestamp of prims.inl


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jun 2007 18:50:46 -0000	1.7
+++ .cvsignore	6 Sep 2007 19:36:36 -0000	1.8
@@ -1 +1 @@
-smalltalk-2.3.5.tar.gz
+smalltalk-2.3.6.tar.gz


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnu-smalltalk.spec	9 Aug 2007 17:49:00 -0000	1.21
+++ gnu-smalltalk.spec	6 Sep 2007 19:36:36 -0000	1.22
@@ -1,9 +1,9 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 2.3.5
-Release: 3%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-2.3.5-am.patch
+Patch1: gst-2.3.6-am.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -142,6 +142,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Thu Sep  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.5-3
 - Try to fix smp_mflags issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jun 2007 18:50:46 -0000	1.7
+++ sources	6 Sep 2007 19:36:36 -0000	1.8
@@ -1 +1 @@
-552df4030532f4c1dcc24cfb0c5ad097  smalltalk-2.3.5.tar.gz
+c2fd207d55a873531ad89750f7f6478e  smalltalk-2.3.6.tar.gz


--- gst-2.3.5-am.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:13 -0700
Subject: [pkgdb] micq was added for ondrejj
Message-ID: <200709061937.l86JbFb4001127@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package micq with summary Text/line based ICQ client with many features
Kevin Fenzi (kevin) has approved Package micq
Kevin Fenzi (kevin) has added a Fedora devel branch for micq with an owner of ondrejj
Kevin Fenzi (kevin) has approved micq in Fedora devel
Kevin Fenzi (kevin) has approved Package micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, 6) updated by kevin
Message-ID: <200709061937.l86JbODx001136@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, 7) updated by kevin
Message-ID: <200709061937.l86JbODv001145@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for micq
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on micq (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:37:23 -0700
Subject: [pkgdb] micq (Fedora, devel) updated by kevin
Message-ID: <200709061937.l86JbOMl001155@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on micq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:54 -0400
Subject: rpms/micq - New directory
Message-ID: <200709061937.l86JbsiM007704@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq

Log Message:
Directory /cvs/extras/rpms/micq added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:56 -0400
Subject: rpms/micq/devel - New directory
Message-ID: <200709061937.l86Jbu9x007720@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq/devel

Log Message:
Directory /cvs/extras/rpms/micq/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:37:59 -0400
Subject: rpms/micq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061937.l86JbxeE007747@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq

Added Files:
	Makefile import.log 
Log Message:
Setup of module micq


--- NEW FILE Makefile ---
# Top level Makefile for module micq
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:38:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:38:01 -0400
Subject: rpms/micq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709061938.l86Jc1wC007763@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJo7649/rpms/micq/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module micq


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: micq
# $Id: Makefile,v 1.1 2007/09/06 19:37:59 kevin Exp $
NAME := micq
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:40:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:30 -0400
Subject: rpms/tomcat-native - New directory
Message-ID: <200709061940.l86JeU6S008087@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native

Log Message:
Directory /cvs/extras/rpms/tomcat-native added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:34 -0400
Subject: rpms/tomcat-native/devel - New directory
Message-ID: <200709061940.l86JeYM2008096@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native/devel

Log Message:
Directory /cvs/extras/rpms/tomcat-native/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:39 -0400
Subject: rpms/tomcat-native Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061940.l86JedRr008128@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native

Added Files:
	Makefile import.log 
Log Message:
Setup of module tomcat-native


--- NEW FILE Makefile ---
# Top level Makefile for module tomcat-native
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:40:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:40:42 -0400
Subject: rpms/tomcat-native/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709061940.l86Jeg2t008145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYB8058/rpms/tomcat-native/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tomcat-native


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tomcat-native
# $Id: Makefile,v 1.1 2007/09/06 19:40:40 kevin Exp $
NAME := tomcat-native
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:41:59 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 15:41:59 -0400
Subject: rpms/kernel/devel linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 
	NONE, 1.1 linux-2.6-x86-fix-hang-on-C7.patch, NONE,
	1.1 linux-2.6-xen-fix-bootup.patch, NONE, 1.1 kernel.spec, 1.149,
	1.150
Message-ID: <200709061941.l86JfxAb008354@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8301

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-x86-fix-hang-on-C7.patch 
	linux-2.6-xen-fix-bootup.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- fix Xen boot problem
- fix boot hang on Via C7 CPU
- Fix oops in networking code


linux-2.6-skb_copy_and_csum_datagram_iovec.patch:

--- NEW FILE linux-2.6-skb_copy_and_csum_datagram_iovec.patch ---
[NET]: Do not dereference iov if length is zero

When msg_iovlen is zero we shouldn't try to dereference
msg_iov.  Right now the only thing that tries to do so
is skb_copy_and_csum_datagram_iovec.  Since the total
length should also be zero if msg_iovlen is zero, it's
sufficient to check the total length there and simply
return if it's zero.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
---
diff --git a/net/core/datagram.c b/net/core/datagram.c
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(str
 	__wsum csum;
 	int chunk = skb->len - hlen;
 
+	if (!chunk)
+		return 0;
+
 	/* Skip filled elements.
 	 * Pretty silly, look at memcpy_toiovec, though 8)
 	 */

linux-2.6-x86-fix-hang-on-C7.patch:

--- NEW FILE linux-2.6-x86-fix-hang-on-C7.patch ---
The CLFLUSH for the modified code line in text_poke was supposed
to speed up CPU recovery. Unfortunately it seems to cause hangs
on some VIA C3s (at least on VIA Esther Model 10 Stepping 9)
Remove it.

Thanks to Stefan Becker for reporting/testing.

Signed-off-by: Andi Kleen <ak at suse.de>

---
 arch/i386/kernel/alternative.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: linux/arch/i386/kernel/alternative.c
===================================================================
--- linux.orig/arch/i386/kernel/alternative.c
+++ linux/arch/i386/kernel/alternative.c
@@ -445,8 +445,6 @@ void __kprobes text_poke(void *addr, uns
 {
 	memcpy(addr, opcode, len);
 	sync_core();
-	/* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline
-	   case. */
-	if (cpu_has_clflush)
-		asm("clflush (%0) " :: "r" (addr) : "memory");
+	/* Could also do a CLFLUSH here to speed up CPU recovery; but
+	   that causes hangs on some VIA CPUs. */
 }

linux-2.6-xen-fix-bootup.patch:

--- NEW FILE linux-2.6-xen-fix-bootup.patch ---
commit 92ea189254b87727d6be407558d9c18fed0937bb
Author: Christian Ehrhardt <lk at c--e.de>
Date:   Mon Sep 3 20:32:38 2007 +0200

    [x86 setup] Work around bug in Xen HVM
    
    Apparently XEN does not keep the contents of the 48-bit gdt_48 data
    structure that is passed to lgdt in the XEN machine state. Instead it
    appears to save the _address_ of the 48-bit descriptor
    somewhere. Unfortunately this data happens to reside on the stack and
    is probably no longer availiable at the time of the actual protected
    mode jump.
    
    This is Xen bug but given that there is a one-line patch to work
    around this problem, the linux kernel should probably do this.  My fix
    is to make the gdt_48 description in setup_gdt static (in setup_idt
    this is already the case). This allows the kernel to boot under
    Xen HVM again.
    
    Signed-off-by: Christian Ehrhardt <lk at c--e.de>
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 6be9ca8..f7958f1 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -122,7 +122,7 @@ static void setup_gdt(void)
 		/* DS: data, read/write, 4 GB, base 0 */
 		[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
 	};
-	struct gdt_ptr gdt;
+	static struct gdt_ptr gdt;
 
 	gdt.len = sizeof(boot_gdt)-1;
 	gdt.ptr = (u32)&boot_gdt + (ds() << 4);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kernel.spec	6 Sep 2007 17:34:27 -0000	1.149
+++ kernel.spec	6 Sep 2007 19:41:27 -0000	1.150
@@ -667,6 +667,9 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
+Patch1520: linux-2.6-xen-fix-bootup.patch
+Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
 
 %endif
 
@@ -1190,6 +1193,14 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# Fix Xen bootup
+ApplyPatch linux-2.6-xen-fix-bootup.patch
+
+# fix oops in with sunrpc
+ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+
+# fix hang on C7 CPU
+ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1783,6 +1794,11 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix Xen boot problem
+- fix boot hang on Via C7 CPU
+- Fix oops in networking code
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - exec-shield: enable interrupts in do_iret_error()
 
 * Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep  6 19:42:28 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 15:42:28 -0400
Subject: comps comps-f8.xml.in,1.94,1.95
Message-ID: <200709061942.l86JgSl3008359@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307

Modified Files:
	comps-f8.xml.in 
Log Message:
Make all 75dpi bitmap fonts optional instead of default or mandatory. (#254086)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- comps-f8.xml.in	6 Sep 2007 00:33:23 -0000	1.94
+++ comps-f8.xml.in	6 Sep 2007 19:41:58 -0000	1.95
@@ -300,9 +300,7 @@
       <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq type="mandatory">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="mandatory">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-misc</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="mandatory">xorg-x11-fonts-Type1</packagereq>
@@ -377,6 +375,8 @@
       <packagereq type="optional">xdaliclock</packagereq>
       <packagereq type="optional">xkeycaps</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-resutils</packagereq>
       <packagereq type="optional">xorg-x11-server-Xnest</packagereq>
       <packagereq type="optional">xorg-x11-server-Xvfb</packagereq>
@@ -445,9 +445,7 @@
       <packagereq type="default">bitmap-fonts</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-misc</packagereq>
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
@@ -467,7 +465,9 @@
       <packagereq type="optional">terminus-font-console</packagereq>
       <packagereq type="optional">terminus-font-x11</packagereq>
       <packagereq type="optional">urw-fonts</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
@@ -621,12 +621,12 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bg</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bg</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bulgarian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -748,10 +748,10 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hr</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hr_HR</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-croatian</packagereq>
     </packagelist>
   </group>
@@ -766,7 +766,6 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-cs</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-cs</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Czech</packagereq>
@@ -775,6 +774,7 @@
       <packagereq type="conditional" requires="moodle">moodle-cs</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-dict-cs_CZ</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-cs_CZ</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1267,12 +1267,12 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ee</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Estonian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-et</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-et</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-et_EE</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2042,13 +2042,13 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hungarian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-hu</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hu_HU</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2902,7 +2902,6 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pl</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Polish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-pl</packagereq>
@@ -2910,6 +2909,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-pl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-pl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pl_PL</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2977,9 +2977,9 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Romanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3017,7 +3017,7 @@
       <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
-      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
     </packagelist>
@@ -3045,7 +3045,6 @@
       <packagereq type="conditional" requires="aspell">aspell-sr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-sr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sr-Latn</packagereq>
@@ -3053,6 +3052,7 @@
       <packagereq type="conditional" requires="moodle">moodle-sr_cr_bo</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sr_lt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sr_CS</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-serbian</packagereq>
     </packagelist>
   </group>
@@ -3099,12 +3099,12 @@
     <packagelist>
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sk</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-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>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="optional">m17n-db-slovak</packagereq>
     </packagelist>
   </group>
@@ -3119,12 +3119,12 @@
       <packagereq type="mandatory">fonts-ISO8859-2</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-sl</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-sl</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Slovenian</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-sl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sl</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sl_SI</packagereq>
+      <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3689,7 +3689,7 @@
       <packagereq type="conditional" requires="moodle">moodle-tr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-tr_TR</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
+      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3707,7 +3707,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-uk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Thu Sep  6 19:44:27 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 6 Sep 2007 15:44:27 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.45,1.46
Message-ID: <200709061944.l86JiR3d008448@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8420

Modified Files:
	desktop-backgrounds.spec 
Log Message:
fix symlinks



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- desktop-backgrounds.spec	5 Sep 2007 18:56:26 -0000	1.45
+++ desktop-backgrounds.spec	6 Sep 2007 19:43:55 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 3
+Release: 4
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -89,9 +89,9 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -sf infinity/am00.png default.png;
- ln -sf infinity/am00.png default-wide.png;
- ln -sf infinity/am00.png default-5_4.png)
+ ln -sf ../infinity/am00.png default.png;
+ ln -sf ../infinity/am00.png default-wide.png;
+ ln -sf ../infinity/am00.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,6 +134,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> - 7.92-4
+- fix symlinks
+
 * Wed Sep  5 2007 Ray Strode <rstrode at redhat.com> - 7.92-3
 - create links for default.png etc until more artwork shows up
 - start animated backgrounds at midnight



From fedora-extras-commits at redhat.com  Thu Sep  6 19:45:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:45:13 -0700
Subject: [pkgdb] aspell-sk was added for ondrejj
Message-ID: <200709061945.l86JjDSD001243@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aspell-sk with summary Slovak dictionaries for Aspell
Kevin Fenzi (kevin) has approved Package aspell-sk
Kevin Fenzi (kevin) has added a Fedora devel branch for aspell-sk with an owner of ondrejj
Kevin Fenzi (kevin) has approved aspell-sk in Fedora devel
Kevin Fenzi (kevin) has approved Package aspell-sk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aspell-sk (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aspell-sk (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aspell-sk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aspell-sk



From fedora-extras-commits at redhat.com  Thu Sep  6 19:48:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 6 Sep 2007 15:48:09 -0400
Subject: rpms/kernel/devel linux-2.6-sched-cfs-fix-mc.patch, NONE,
	1.1 kernel.spec, 1.150, 1.151
Message-ID: <200709061948.l86Jm96H008671@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8627

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-sched-cfs-fix-mc.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- fix imbalance in scheduler on multicore systems


linux-2.6-sched-cfs-fix-mc.patch:

--- NEW FILE linux-2.6-sched-cfs-fix-mc.patch ---
Try to fix MC/HT scheduler optimization breakage again, with out breaking
the FUZZ logic.

First fix the check
	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
with this
	if (*imbalance < busiest_load_per_task)

As the current check is always false for nice 0 tasks (as SCHED_LOAD_SCALE_FUZZ
is same as busiest_load_per_task for nice 0 tasks).

With the above change, imbalance was getting reset to 0 in the corner case
condition, making the FUZZ logic fail. Fix it by not corrupting the
imbalance and change the imbalance, only when it finds that the
HT/MC optimization is needed.

Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 9fe473a..03e5e8d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2511,7 +2511,7 @@ group_next:
 	 * a think about bumping its value to force at least one task to be
 	 * moved
 	 */
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
+	if (*imbalance < busiest_load_per_task) {
 		unsigned long tmp, pwr_now, pwr_move;
 		unsigned int imbn;
 
@@ -2563,10 +2563,8 @@ small_imbalance:
 		pwr_move /= SCHED_LOAD_SCALE;
 
 		/* Move if we gain throughput */
-		if (pwr_move <= pwr_now)
-			goto out_balanced;
-
-		*imbalance = busiest_load_per_task;
+		if (pwr_move > pwr_now)
+			*imbalance = busiest_load_per_task;
 	}
 
 	return busiest;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- kernel.spec	6 Sep 2007 19:41:27 -0000	1.150
+++ kernel.spec	6 Sep 2007 19:47:37 -0000	1.151
@@ -670,6 +670,7 @@
 Patch1520: linux-2.6-xen-fix-bootup.patch
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
+Patch1535: linux-2.6-sched-cfs-fix-mc.patch
 
 %endif
 
@@ -1202,6 +1203,9 @@
 # fix hang on C7 CPU
 ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
 
+# fix scheduler on multicore
+ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1794,6 +1798,9 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix imbalance in scheduler on multicore systems
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix Xen boot problem
 - fix boot hang on Via C7 CPU
 - Fix oops in networking code



From fedora-extras-commits at redhat.com  Thu Sep  6 19:49:49 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 6 Sep 2007 15:49:49 -0400
Subject: rpms/openssh/devel openssh-4.3p2-cve-2007-3102.patch, NONE,
	1.1 openssh-4.7p1-audit.patch, NONE,
	1.1 openssh-4.7p1-log-in-chroot.patch, NONE,
	1.1 openssh-4.7p1-mls.patch, NONE,
	1.1 openssh-4.7p1-nss-keys.patch, NONE,
	1.1 openssh-4.7p1-pam-session.patch, NONE,
	1.1 openssh-4.7p1-redhat.patch, NONE,
	1.1 openssh-4.7p1-selinux.patch, NONE,
	1.1 openssh-4.7p1-sftp-drain-acks.patch, NONE,
	1.1 openssh-4.7p1-vendor.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 openssh.spec, 1.112, 1.113 sources, 1.19,
	1.20 openssh-3.9p1-log-in-chroot.patch, 1.1,
	NONE openssh-4.3p2-pam-session.patch, 1.3,
	NONE openssh-4.5p1-audit.patch, 1.1,
	NONE openssh-4.5p1-mls.patch, 1.5,
	NONE openssh-4.5p1-nss-keys.patch, 1.3,
	NONE openssh-4.5p1-redhat.patch, 1.1,
	NONE openssh-4.5p1-selinux.patch, 1.2,
	NONE openssh-4.5p1-sftp-drain-acks.patch, 1.1,
	NONE openssh-4.5p1-vendor.patch, 1.1, NONE
Message-ID: <200709061949.l86Jnn6i008844@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8741

Modified Files:
	.cvsignore openssh.spec sources 
Added Files:
	openssh-4.3p2-cve-2007-3102.patch openssh-4.7p1-audit.patch 
	openssh-4.7p1-log-in-chroot.patch openssh-4.7p1-mls.patch 
	openssh-4.7p1-nss-keys.patch openssh-4.7p1-pam-session.patch 
	openssh-4.7p1-redhat.patch openssh-4.7p1-selinux.patch 
	openssh-4.7p1-sftp-drain-acks.patch openssh-4.7p1-vendor.patch 
Removed Files:
	openssh-3.9p1-log-in-chroot.patch 
	openssh-4.3p2-pam-session.patch openssh-4.5p1-audit.patch 
	openssh-4.5p1-mls.patch openssh-4.5p1-nss-keys.patch 
	openssh-4.5p1-redhat.patch openssh-4.5p1-selinux.patch 
	openssh-4.5p1-sftp-drain-acks.patch openssh-4.5p1-vendor.patch 
Log Message:
* Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
- upgrade to latest upstream
- use libedit in sftp (#203009)
- fixed audit log injection problem (CVE-2007-3102)


openssh-4.3p2-cve-2007-3102.patch:

--- NEW FILE openssh-4.3p2-cve-2007-3102.patch ---
--- openssh-4.3p2/loginrec.c.inject-fix	2007-06-20 21:18:00.000000000 +0200
+++ openssh-4.3p2/loginrec.c	2007-07-13 15:25:35.000000000 +0200
@@ -1389,11 +1389,44 @@
 #endif /* USE_WTMPX */
 
 #ifdef HAVE_LINUX_AUDIT
+static void
+_audit_hexscape(const char *what, char *where, unsigned int size)
+{
+	const char *ptr = what;
+	const char *hex = "0123456789ABCDEF";
+
+	while (*ptr) {
+		if (*ptr == '"' || *ptr < 0x21 || *ptr > 0x7E) {
+			unsigned int i;
+			ptr = what;
+			for (i = 0; *ptr && i+2 < size; i += 2) {
+				where[i] = hex[((unsigned)*ptr & 0xF0)>>4]; /* Upper nibble */
+				where[i+1] = hex[(unsigned)*ptr & 0x0F];   /* Lower nibble */
+				ptr++;
+			}
+			where[i] = '\0';
+			return;
+		}
+		ptr++;
+	}
+	where[0] = '"';
+	if ((unsigned)(ptr - what) < size - 3)
+	{
+		size = ptr - what + 3;
+	}
+	strncpy(where + 1, what, size - 3);
+	where[size-2] = '"';
+	where[size-1] = '\0';
+}
+
+#define AUDIT_LOG_SIZE 128
+#define AUDIT_ACCT_SIZE (AUDIT_LOG_SIZE - 8)
+
 int
 linux_audit_record_event(int uid, const char *username,
 	const char *hostname, const char *ip, const char *ttyn, int success)
 {
-	char buf[64];
+	char buf[AUDIT_LOG_SIZE];
 	int audit_fd, rc;
 
 	audit_fd = audit_open();
@@ -1406,8 +1439,11 @@
 	}
 	if (username == NULL)
 		snprintf(buf, sizeof(buf), "uid=%d", uid);
-	else
-		snprintf(buf, sizeof(buf), "acct=%s", username);
+	else {
+		char encoded[AUDIT_ACCT_SIZE];
+		_audit_hexscape(username, encoded, sizeof(encoded));
+		snprintf(buf, sizeof(buf), "acct=%s", encoded);
+	}
 	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
 		buf, hostname, ip, ttyn, success);
 	close(audit_fd);

openssh-4.7p1-audit.patch:

--- NEW FILE openssh-4.7p1-audit.patch ---
diff -up openssh-4.7p1/auth.c.audit openssh-4.7p1/auth.c
--- openssh-4.7p1/auth.c.audit	2007-03-26 18:35:28.000000000 +0200
+++ openssh-4.7p1/auth.c	2007-09-06 17:07:44.000000000 +0200
@@ -286,6 +286,12 @@ auth_log(Authctxt *authctxt, int authent
 		    get_canonical_hostname(options.use_dns), "ssh", &loginmsg);
 # endif
 #endif
+#if HAVE_LINUX_AUDIT
+	if (authenticated == 0 && !authctxt->postponed) {
+		linux_audit_record_event(-1, authctxt->user, NULL,
+			get_remote_ipaddr(), "sshd", 0);
+	}
+#endif
 #ifdef SSH_AUDIT_EVENTS
 	if (authenticated == 0 && !authctxt->postponed)
 		audit_event(audit_classify_auth(method));
@@ -492,6 +498,10 @@ getpwnamallow(const char *user)
 		record_failed_login(user,
 		    get_canonical_hostname(options.use_dns), "ssh");
 #endif
+#ifdef HAVE_LINUX_AUDIT
+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
+			"sshd", 0);
+#endif
 #ifdef SSH_AUDIT_EVENTS
 		audit_event(SSH_INVALID_USER);
 #endif /* SSH_AUDIT_EVENTS */
diff -up openssh-4.7p1/loginrec.c.audit openssh-4.7p1/loginrec.c
--- openssh-4.7p1/loginrec.c.audit	2007-04-29 04:10:58.000000000 +0200
+++ openssh-4.7p1/loginrec.c	2007-09-06 17:07:44.000000000 +0200
@@ -176,6 +176,10 @@
 #include "auth.h"
 #include "buffer.h"
 
+#ifdef HAVE_LINUX_AUDIT
+# include <libaudit.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif
@@ -202,6 +206,9 @@ int utmp_write_entry(struct logininfo *l
 int utmpx_write_entry(struct logininfo *li);
 int wtmp_write_entry(struct logininfo *li);
 int wtmpx_write_entry(struct logininfo *li);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_write_entry(struct logininfo *li);
+#endif
 int lastlog_write_entry(struct logininfo *li);
 int syslogin_write_entry(struct logininfo *li);
 
@@ -440,6 +447,10 @@ login_write(struct logininfo *li)
 
 	/* set the timestamp */
 	login_set_current_time(li);
+#ifdef HAVE_LINUX_AUDIT
+	if (linux_audit_write_entry(li) == 0)
+		fatal("linux_audit_write_entry failed: %s", strerror(errno));
+#endif
 #ifdef USE_LOGIN
 	syslogin_write_entry(li);
 #endif
@@ -1394,6 +1405,51 @@ wtmpx_get_entry(struct logininfo *li)
 }
 #endif /* USE_WTMPX */
 
+#ifdef HAVE_LINUX_AUDIT
+int
+linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success)
+{
+	char buf[64];
+	int audit_fd, rc;
+
+	audit_fd = audit_open();
+	if (audit_fd < 0) {
+	 	if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+					errno == EAFNOSUPPORT)
+			return 1; /* No audit support in kernel */
+		else
+			return 0; /* Must prevent login */
+	}
+	if (username == NULL)
+		snprintf(buf, sizeof(buf), "uid=%d", uid);
+	else
+		snprintf(buf, sizeof(buf), "acct=%s", username);
+	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
+		buf, hostname, ip, ttyn, success);
+	close(audit_fd);
+	if (rc >= 0)
+		return 1;
+	else
+		return 0;
+}
+
+int
+linux_audit_write_entry(struct logininfo *li)
+{
+	switch(li->type) {
+	case LTYPE_LOGIN:
+		return (linux_audit_record_event(li->uid, NULL, li->hostname,
+			NULL, li->line, 1));
+	case LTYPE_LOGOUT:
+		return (1);	/* We only care about logins */
+	default:
+		logit("%s: invalid type field", __func__);
+		return (0);
+	}
+}
+#endif /* HAVE_LINUX_AUDIT */
+
 /**
  ** Low-level libutil login() functions
  **/
diff -up openssh-4.7p1/config.h.in.audit openssh-4.7p1/config.h.in
--- openssh-4.7p1/config.h.in.audit	2007-09-04 08:50:04.000000000 +0200
+++ openssh-4.7p1/config.h.in	2007-09-06 17:07:44.000000000 +0200
@@ -1334,6 +1334,9 @@
 /* Define if you want SELinux support. */
 #undef WITH_SELINUX
 
+/* Define if you want Linux audit support. */
+#undef HAVE_LINUX_AUDIT
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff -up openssh-4.7p1/loginrec.h.audit openssh-4.7p1/loginrec.h
--- openssh-4.7p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/loginrec.h	2007-09-06 17:07:44.000000000 +0200
@@ -127,5 +127,9 @@ char *line_stripname(char *dst, const ch
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 
 void record_failed_login(const char *, const char *, const char *);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success);
+#endif /* HAVE_LINUX_AUDIT */
 
 #endif /* _HAVE_LOGINREC_H_ */
diff -up openssh-4.7p1/configure.ac.audit openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.audit	2007-09-06 17:07:44.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 17:15:23.000000000 +0200
@@ -3216,6 +3216,18 @@ AC_ARG_WITH(selinux,
 	fi ]
 )
 
+# Check whether user wants Linux audit support
+LINUX_AUDIT_MSG="no"
+AC_ARG_WITH(linux-audit,
+	[  --with-linux-audit   Enable Linux audit support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
+		LINUX_AUDIT_MSG="yes"
+		AC_CHECK_HEADERS(libaudit.h)
+		SSHDLIBS="$SSHDLIBS -laudit"
+	fi ]
+)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -4037,6 +4049,7 @@ echo "                       PAM support
 echo "                   OSF SIA support: $SIA_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
+echo "               Linux audit support: $LINUX_AUDIT_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"

openssh-4.7p1-log-in-chroot.patch:

--- NEW FILE openssh-4.7p1-log-in-chroot.patch ---
diff -up openssh-4.7p1/sshd.c.log-chroot openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.log-chroot	2007-09-06 17:24:13.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:24:13.000000000 +0200
@@ -596,6 +596,10 @@ privsep_preauth_child(void)
 	/* Demote the private keys to public keys. */
 	demote_sensitive_data();
 
+	/* Open the syslog permanently so the chrooted process still
+	   can write to syslog. */
+	open_log();
+	
 	/* Change our root directory */
 	if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1)
 		fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR,
diff -up openssh-4.7p1/log.c.log-chroot openssh-4.7p1/log.c
--- openssh-4.7p1/log.c.log-chroot	2007-05-20 07:08:16.000000000 +0200
+++ openssh-4.7p1/log.c	2007-09-06 17:29:34.000000000 +0200
@@ -56,6 +56,7 @@ static LogLevel log_level = SYSLOG_LEVEL
 static int log_on_stderr = 1;
 static int log_facility = LOG_AUTH;
 static char *argv0;
+static int log_fd_keep;
 
 extern char *__progname;
 
@@ -370,10 +371,21 @@ do_log(LogLevel level, const char *fmt, 
 		syslog_r(pri, &sdata, "%.500s", fmtbuf);
 		closelog_r(&sdata);
 #else
+	    if (!log_fd_keep) {
 		openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
+	    }
 		syslog(pri, "%.500s", fmtbuf);
+	    if (!log_fd_keep) {
 		closelog();
+	    }
 #endif
 	}
 	errno = saved_errno;
 }
+
+void
+open_log(void)
+{
+	openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility);
+	log_fd_keep = 1;
+}
diff -up openssh-4.7p1/log.h.log-chroot openssh-4.7p1/log.h
--- openssh-4.7p1/log.h.log-chroot	2006-08-18 16:32:21.000000000 +0200
+++ openssh-4.7p1/log.h	2007-09-06 17:24:13.000000000 +0200
@@ -62,4 +62,6 @@ void     debug3(const char *, ...) __att
 
 void	 do_log(LogLevel, const char *, va_list);
 void	 cleanup_exit(int) __dead;
+
+void     open_log(void);
 #endif

openssh-4.7p1-mls.patch:

--- NEW FILE openssh-4.7p1-mls.patch ---
diff -up openssh-4.7p1/misc.c.mls openssh-4.7p1/misc.c
--- openssh-4.7p1/misc.c.mls	2007-01-05 06:24:48.000000000 +0100
+++ openssh-4.7p1/misc.c	2007-09-06 17:39:28.000000000 +0200
@@ -418,6 +418,7 @@ char *
 colon(char *cp)
 {
 	int flag = 0;
+	int start = 1;
 
 	if (*cp == ':')		/* Leading colon is part of file name. */
 		return (0);
@@ -431,8 +432,13 @@ colon(char *cp)
 			return (cp+1);
 		if (*cp == ':' && !flag)
 			return (cp);
-		if (*cp == '/')
-			return (0);
+		if (start) {
+		/* Slash on beginning or after dots only denotes file name. */
+			if (*cp == '/')
+				return (0);
+			if (*cp != '.')
+				start = 0;
+		}
 	}
 	return (0);
 }
diff -up openssh-4.7p1/session.c.mls openssh-4.7p1/session.c
--- openssh-4.7p1/session.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/session.c	2007-09-06 17:39:28.000000000 +0200
@@ -1347,10 +1347,6 @@ do_setusercontext(struct passwd *pw)
 #endif
 	if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
 		fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
-
-#ifdef WITH_SELINUX
-	ssh_selinux_setup_exec_context(pw->pw_name);
-#endif
 }
 
 static void
diff -up openssh-4.7p1/openbsd-compat/port-linux.c.mls openssh-4.7p1/openbsd-compat/port-linux.c
--- openssh-4.7p1/openbsd-compat/port-linux.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/openbsd-compat/port-linux.c	2007-08-07 17:38:18.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.4 2007/06/27 22:48:03 djm Exp $ */
+/* $Id: port-linux.c,v 1.3 2006/09/01 05:38:41 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh at redhat.com>
@@ -33,12 +33,23 @@
 #include "key.h"
 #include "hostfile.h"
 #include "auth.h"
+#include "xmalloc.h"
 
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
+#include <selinux/context.h>
 #include <selinux/get_context_list.h>
+#include <selinux/get_default_type.h>
+#include <selinux/av_permissions.h>
+
+#ifdef HAVE_LINUX_AUDIT
+#include <libaudit.h>
+#include <unistd.h>
+#endif
 
 extern Authctxt *the_authctxt;
+extern int inetd_flag;
+extern int rexeced_flag;
 
 /* Wrapper around is_selinux_enabled() to log its return value once only */
 static int
@@ -54,17 +65,173 @@ ssh_selinux_enabled(void)
 	return (enabled);
 }
 
+/* Send audit message */
+static int
+send_audit_message(int success, security_context_t default_context,
+		       security_context_t selected_context)
+{
+	int rc=0;
+#ifdef HAVE_LINUX_AUDIT
+	char *msg = NULL;
+	int audit_fd = audit_open();
+	security_context_t default_raw=NULL;
+	security_context_t selected_raw=NULL;
+	rc = -1;
+	if (audit_fd < 0) {
+		if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+                                        errno == EAFNOSUPPORT)
+                        return 0; /* No audit support in kernel */
+		error("Error connecting to audit system.");
+		return rc;
+	}
+	if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) {
+		error("Error translating default context.");
+		default_raw = NULL;
+	}
+	if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) {
+		error("Error translating selected context.");
+		selected_raw = NULL;
+	}
+	if (asprintf(&msg, "sshd: default-context=%s selected-context=%s",
+		     default_raw ? default_raw : (default_context ? default_context: "?"),
+		     selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) {
+		error("Error allocating memory.");
+		goto out;
+	}
+	if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE,
+				   msg, NULL, NULL, NULL, success) <= 0) {
+		error("Error sending audit message.");
+		goto out;
+	}
+	rc = 0;
+      out:
+	free(msg);
+	freecon(default_raw);
+	freecon(selected_raw);
+	close(audit_fd);
+#endif
+	return rc;
+}
+
+static int
+mls_range_allowed(security_context_t src, security_context_t dst)
+{
+	struct av_decision avd;
+	int retval;
+	unsigned int bit = CONTEXT__CONTAINS;
+
+	debug("%s: src:%s dst:%s", __func__, src, dst);
+	retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd);
+	if (retval || ((bit & avd.allowed) != bit))
+		return 0;
+
+	return 1;
+}
+
+static int
+get_user_context(const char *sename, const char *role, const char *lvl,
+	security_context_t *sc) {
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) {
+	        /* User may have requested a level completely outside of his 
+	           allowed range. We get a context just for auditing as the
+	           range check below will certainly fail for default context. */
+#endif
+		if (get_default_context(sename, NULL, sc) != 0) {
+			*sc = NULL;
+			return -1;
+		}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	}
+#endif
+	if (role != NULL && role[0]) {
+		context_t con;
+		char *type=NULL;
+		if (get_default_type(role, &type) != 0) {
+			error("get_default_type: failed to get default type for '%s'",
+				role);
+			goto out;
+		}
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_role_set(con, role);
+		context_type_set(con, type);
+		freecon(*sc);
+		*sc = strdup(context_str(con));
+		context_free(con);
+		if (!*sc) 
+			return -1;
+	}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl != NULL && lvl[0]) {
+		/* verify that the requested range is obtained */
+		context_t con;
+		security_context_t obtained_raw;
+		security_context_t requested_raw;
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_range_set(con, lvl);
+		if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) {
+			context_free(con);
+			goto out;
+		}
+		if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) {
+			freecon(obtained_raw);
+			context_free(con);
+			goto out;
+		}
+
+		debug("get_user_context: obtained context '%s' requested context '%s'",
+			obtained_raw, requested_raw);
+		if (strcmp(obtained_raw, requested_raw)) {
+			/* set the context to the real requested one but fail */
+			freecon(requested_raw);
+			freecon(obtained_raw);
+			freecon(*sc);
+			*sc = strdup(context_str(con));
+			context_free(con);
+			return -1;
+		}
+		freecon(requested_raw);
+		freecon(obtained_raw);
+		context_free(con);
+	}
+#endif
+	return 0;
+      out:
+        freecon(*sc);
+        *sc = NULL;
+        return -1;
+}
+
 /* Return the default security context for the given username */
-static security_context_t
-ssh_selinux_getctxbyname(char *pwname)
+static int
+ssh_selinux_getctxbyname(char *pwname,
+	security_context_t *default_sc, security_context_t *user_sc)
 {
-	security_context_t sc = NULL;
 	char *sename, *lvl;
+	const char *reqlvl = NULL;
 	char *role = NULL;
-	int r = 0;
+	int r = -1;
+	context_t con = NULL;
+
+	*default_sc = NULL;
+	*user_sc = NULL;
+	if (the_authctxt) {
+		if (the_authctxt->role != NULL) {
+			char *slash;
+			role = xstrdup(the_authctxt->role);
+			if ((slash = strchr(role, '/')) != NULL) {
+				*slash = '\0';
+				reqlvl = slash + 1;
+			}
+		}
+	}
 
-	if (the_authctxt) 
-		role=the_authctxt->role;
 #ifdef HAVE_GETSEUSERBYNAME
 	if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) {
 		sename = NULL;
@@ -72,37 +239,62 @@ ssh_selinux_getctxbyname(char *pwname)
 	}
 #else
 	sename = pwname;
-	lvl = NULL;
+	lvl = "";
 #endif
 
 	if (r == 0) {
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
-		if (role != NULL && role[0])
-			r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc);
-		else
-			r = get_default_context_with_level(sename, lvl, NULL, &sc);
+		r = get_default_context_with_level(sename, lvl, NULL, default_sc);
 #else
-		if (role != NULL && role[0])
-			r = get_default_context_with_role(sename, role, NULL, &sc);
-		else
-			r = get_default_context(sename, NULL, &sc);
+		r = get_default_context(sename, NULL, default_sc);
 #endif
 	}
 
-	if (r != 0) {
-		switch (security_getenforce()) {
-		case -1:
-			fatal("%s: ssh_selinux_getctxbyname: "
-			    "security_getenforce() failed", __func__);
-		case 0:
-			error("%s: Failed to get default SELinux security "
-			    "context for %s", __func__, pwname);
-			break;
-		default:
-			fatal("%s: Failed to get default SELinux security "
-			    "context for %s (in enforcing mode)",
-			    __func__, pwname);
+	if (r == 0) {
+		/* If launched from xinetd, we must use current level */
+		if (inetd_flag && !rexeced_flag) {
+			security_context_t sshdsc=NULL;
+
+			if (getcon_raw(&sshdsc) < 0)
+				fatal("failed to allocate security context");
+
+			if ((con=context_new(sshdsc)) == NULL)
+				fatal("failed to allocate selinux context");
+			reqlvl = context_range_get(con);
+			freecon(sshdsc);
+			if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0)
+			    /* we actually don't change level */
+			    reqlvl = "";
+
+			debug("%s: current connection level '%s'", __func__, reqlvl);
 		}
+		
+		if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) {
+			r = get_user_context(sename, role, reqlvl, user_sc);
+		
+			if (r == 0 && reqlvl != NULL && reqlvl[0]) {
+				security_context_t default_level_sc = *default_sc;
+				if (role != NULL && role[0]) {
+					if (get_user_context(sename, role, lvl, &default_level_sc) < 0)
+						default_level_sc = *default_sc;
+				}
+				/* verify that the requested range is contained in the user range */
+				if (mls_range_allowed(default_level_sc, *user_sc)) {
+					logit("permit MLS level %s (user range %s)", reqlvl, lvl);
+				} else {
+					r = -1;
+					error("deny MLS level %s (user range %s)", reqlvl, lvl);
+				}
+				if (default_level_sc != *default_sc)
+					freecon(default_level_sc);
+			}
+		} else {
+			*user_sc = *default_sc;
+		}
+	}
+	if (r != 0) {
+		error("%s: Failed to get default SELinux security "
+		    "context for %s", __func__, pwname);
 	}
 
 #ifdef HAVE_GETSEUSERBYNAME
@@ -111,14 +303,20 @@ ssh_selinux_getctxbyname(char *pwname)
 	if (lvl != NULL)
 		xfree(lvl);
 #endif
+	if (role != NULL)
+		xfree(role);
+	if (con)
+		context_free(con);
 
-	return (sc);
+	return (r);
 }
 
 /* Set the execution context to the default for the specified user */
 void
 ssh_selinux_setup_exec_context(char *pwname)
 {
+	int r = 0;
+	security_context_t default_ctx = NULL;
 	security_context_t user_ctx = NULL;
 
 	if (!ssh_selinux_enabled())
@@ -126,22 +324,39 @@ ssh_selinux_setup_exec_context(char *pwn
 
 	debug3("%s: setting execution context", __func__);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
-	if (setexeccon(user_ctx) != 0) {
+	r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx);
+	if (r >= 0) {
+		r = setexeccon(user_ctx);
+		if (r < 0) {
+			error("%s: Failed to set SELinux execution context %s for %s",
+			    __func__, user_ctx, pwname);
+		}
+	}
+	if (user_ctx == NULL) {
+		user_ctx = default_ctx;
+	}
+	if (r < 0 || user_ctx != default_ctx) {
+		/* audit just the case when user changed a role or there was
+		   a failure */
+		send_audit_message(r >= 0, default_ctx, user_ctx);
+	}
+	if (r < 0) {
 		switch (security_getenforce()) {
 		case -1:
 			fatal("%s: security_getenforce() failed", __func__);
 		case 0:
-			error("%s: Failed to set SELinux execution "
-			    "context for %s", __func__, pwname);
+			error("%s: SELinux failure. Continuing in permissive mode.",
+			    __func__);
 			break;
 		default:
-			fatal("%s: Failed to set SELinux execution context "
-			    "for %s (in enforcing mode)", __func__, pwname);
+			fatal("%s: SELinux failure. Aborting connection.",
+			    __func__);
 		}
 	}
-	if (user_ctx != NULL)
+	if (user_ctx != NULL && user_ctx != default_ctx)
 		freecon(user_ctx);
+	if (default_ctx != NULL)
+		freecon(default_ctx);
 
 	debug3("%s: done", __func__);
 }
@@ -159,7 +374,10 @@ ssh_selinux_setup_pty(char *pwname, cons
 
 	debug3("%s: setting TTY context on %s", __func__, tty);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
+	if (getexeccon(&user_ctx) < 0) {
+		error("%s: getexeccon: %s", __func__, strerror(errno));
+		goto out;
+	}
 
 	/* XXX: should these calls fatal() upon failure in enforcing mode? */
 
diff -up openssh-4.7p1/sshd.c.mls openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.mls	2007-09-06 17:39:28.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:39:28.000000000 +0200
@@ -1838,6 +1838,9 @@ main(int ac, char **av)
 		restore_uid();
 	}
 #endif
+#ifdef WITH_SELINUX
+	ssh_selinux_setup_exec_context(authctxt->pw->pw_name);
+#endif
 #ifdef USE_PAM
 	if (options.use_pam) {
 		do_pam_setcred(1);

openssh-4.7p1-nss-keys.patch:

--- NEW FILE openssh-4.7p1-nss-keys.patch ---
diff -up openssh-4.7p1/key.c.nss-keys openssh-4.7p1/key.c
--- openssh-4.7p1/key.c.nss-keys	2007-08-08 06:28:26.000000000 +0200
+++ openssh-4.7p1/key.c	2007-09-06 17:43:59.000000000 +0200
@@ -93,6 +93,54 @@ key_new(int type)
 	return k;
 }
 
+#ifdef HAVE_LIBNSS
+Key *
+key_new_nss(int type)
+{
+	Key *k = key_new(type);
+
+	k->nss = xcalloc(1, sizeof(*k->nss));
+	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
+
+	return k;
+}
+
+Key *
+key_new_nss_copy(int type, const Key *c)
+{
+	Key *k = key_new_nss(type);
+
+	switch (k->type) {
+		case KEY_RSA:
+			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
+				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+		case KEY_DSA:
+			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
+				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
+				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
+				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+	}
+		
+	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
+	if (k->nss->privk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
+
+	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
+	if (k->nss->pubk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
+	
+	if (c->nss->privk->wincx)
+		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
+
+	return k;
+}
+#endif
+
+
 Key *
 key_new_private(int type)
 {
@@ -148,6 +196,19 @@ key_free(Key *k)
 		fatal("key_free: bad key type %d", k->type);
 		break;
 	}
+#ifdef HAVE_LIBNSS
+	if (k->flags & KEY_FLAG_NSS) {
+		if (k->nss->privk->wincx != NULL) {
+			memset(k->nss->privk->wincx, 0,
+				strlen(k->nss->privk->wincx));
+			xfree(k->nss->privk->wincx);
+			k->nss->privk->wincx = NULL;
+		}
+		SECKEY_DestroyPrivateKey(k->nss->privk);
+		SECKEY_DestroyPublicKey(k->nss->pubk);
+		xfree(k->nss);
+	}
+#endif
 	xfree(k);
 }
 
diff -up openssh-4.7p1/ssh-dss.c.nss-keys openssh-4.7p1/ssh-dss.c
--- openssh-4.7p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
+++ openssh-4.7p1/ssh-dss.c	2007-09-06 17:43:59.000000000 +0200
@@ -39,6 +39,10 @@
 #include "log.h"
 #include "key.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 #define INTBLOB_LEN	20
 #define SIGBLOB_LEN	(2*INTBLOB_LEN)
 
@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
 		error("ssh_dss_sign: no DSA key");
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECItem *rawsig;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
+			error("ssh_dss_sign: sign failed");
+			return -1;
+		}
+		
+		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
+			error("ssh_dss_sign: der decode failed");
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+		if (rawsig->len != SIGBLOB_LEN) {
+			error("ssh_dss_sign: unsupported signature length %d",
+				rawsig->len);
+			SECITEM_ZfreeItem(rawsig, PR_TRUE);
+			return -1;
+		}
+		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
+		SECITEM_ZfreeItem(rawsig, PR_TRUE);
+	} else {
+#endif
 	EVP_DigestInit(&md, evp_md);
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
 	DSA_SIG_free(sig);
-
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	if (datafellows & SSH_BUG_SIGBLOB) {
 		if (lenp != NULL)
 			*lenp = SIGBLOB_LEN;
diff -up openssh-4.7p1/ssh-agent.c.nss-keys openssh-4.7p1/ssh-agent.c
--- openssh-4.7p1/ssh-agent.c.nss-keys	2007-03-21 10:45:07.000000000 +0100
+++ openssh-4.7p1/ssh-agent.c	2007-09-06 17:43:59.000000000 +0200
@@ -79,6 +79,10 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
+
 #if defined(HAVE_SYS_PRCTL_H)
 #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
 #endif
@@ -701,6 +705,114 @@ send:
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+process_add_nss_key (SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0, death = 0, confirm = 0;
+	Key **keys, *k;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	while (buffer_len(&e->request)) {
+		switch (buffer_get_char(&e->request)) {
+		case SSH_AGENT_CONSTRAIN_LIFETIME:
+			death = time(NULL) + buffer_get_int(&e->request);
+			break;
+		case SSH_AGENT_CONSTRAIN_CONFIRM:
+			confirm = 1;
+			break;
+		default:
+			break;
+		}
+	}
+	if (lifetime && !death)
+		death = time(NULL) + lifetime;
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	/* password is owned by keys[0] now */
+	xfree(tokenname);
+	xfree(keyname);
+
+	if (keys == NULL) {
+		memset(password, 0, strlen(password));
+		xfree(password);
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		tab = idtab_lookup(version);
+		if (lookup_identity(k, version) == NULL) {
+			id = xmalloc(sizeof(Identity));
+			id->key = k;
+			id->comment = nss_get_key_label(k);
+			id->death = death;
+			id->confirm = confirm;
+			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
+			tab->nentries++;
+			success = 1;
+		} else {
+			key_free(k);
+		}
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+
+static void
+process_remove_nss_key(SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0;
+	Key **keys, *k = NULL;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	xfree(tokenname);
+	xfree(keyname);
+	xfree(password);
+
+	if (keys == NULL || keys[0] == NULL) {
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		if ((id = lookup_identity(k, version)) != NULL) {
+			tab = idtab_lookup(version);
+			TAILQ_REMOVE(&tab->idlist, id, next);
+			tab->nentries--;
+			free_identity(id);
+			success = 1;
+		}
+		key_free(k);
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+#endif /* HAVE_LIBNSS */
+
 /* dispatch incoming messages */
 
 static void
@@ -793,6 +905,15 @@ process_message(SocketEntry *e)
 		process_remove_smartcard_key(e);
 		break;
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	case SSH_AGENTC_ADD_NSS_KEY:
+	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
+		process_add_nss_key(e);
+		break;
+	case SSH_AGENTC_REMOVE_NSS_KEY:
+		process_remove_nss_key(e);
+		break;
+#endif /* SMARTCARD */
 	default:
 		/* Unknown message.  Respond with failure. */
 		error("Unknown message %d", type);
diff -up openssh-4.7p1/authfd.h.nss-keys openssh-4.7p1/authfd.h
--- openssh-4.7p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
+++ openssh-4.7p1/authfd.h	2007-09-06 17:43:59.000000000 +0200
@@ -49,6 +49,12 @@
 #define SSH2_AGENTC_ADD_ID_CONSTRAINED		25
 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
 
+/* nss */
+#define SSH_AGENTC_ADD_NSS_KEY			30
+#define SSH_AGENTC_REMOVE_NSS_KEY		31
+#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED	32
+
+
 #define	SSH_AGENT_CONSTRAIN_LIFETIME		1
 #define	SSH_AGENT_CONSTRAIN_CONFIRM		2
 
@@ -83,6 +89,8 @@ int	 ssh_remove_all_identities(Authentic
 int	 ssh_lock_agent(AuthenticationConnection *, int, const char *);
 int	 ssh_update_card(AuthenticationConnection *, int, const char *,
     const char *, u_int, u_int);
+int	 ssh_update_nss_key(AuthenticationConnection *, int, const char *,
+    const char *, const char *, u_int, u_int);
 
 int
 ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
diff -up openssh-4.7p1/configure.ac.nss-keys openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.nss-keys	2007-09-06 17:43:59.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 17:51:48.000000000 +0200
@@ -3228,6 +3228,20 @@ AC_ARG_WITH(linux-audit,
 	fi ]
 )
 
+# Check whether user wants NSS support
+LIBNSS_MSG="no"
+AC_ARG_WITH(nss,
+	[  --with-nss   Enable NSS support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.])
+		LIBNSS_MSG="yes"
+		CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4"
+		AC_CHECK_HEADERS(pk11pub.h)
+		LIBS="$LIBS -lnss3"
+	fi
+	])
+AC_SUBST(LIBNSS)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -4050,6 +4064,7 @@ echo "                   OSF SIA support
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
 echo "               Linux audit support: $LINUX_AUDIT_MSG"
+echo "                       NSS support: $LIBNSS_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"
diff -up /dev/null openssh-4.7p1/README.nss
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/README.nss	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,36 @@
+How to use NSS tokens with OpenSSH?
+
+This version of OpenSSH contains experimental support for authentication using
+keys stored in tokens stored in NSS database. This for example includes any
+PKCS#11 tokens which are installed in your NSS database.
+
+As the code is experimental and preliminary only SSH protocol 2 is supported.
+The NSS certificate and token databases are looked for in the ~/.ssh
+directory or in a directory specified by environment variable NSS_DB_PATH.
+
+Common operations:
+
+(1) tell the ssh client to use the NSS keys:
+
+	$ ssh -o 'UseNSS yes' otherhost
+	
+	if you want to use a specific token:
+	
+	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
+
+(2) or tell the agent to use the NSS keys:
+
+	$ ssh-add -n
+	
+	if you want to use a specific token:
+	
+	$ ssh-add -n -T 'My PKCS11 Token'
+
+(3) extract the public key from token so it can be added to the
+server:
+
+	$ ssh-keygen -n
+	
+	if you want to use a specific token and/or key:
+	
+	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'
diff -up openssh-4.7p1/authfd.c.nss-keys openssh-4.7p1/authfd.c
--- openssh-4.7p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
+++ openssh-4.7p1/authfd.c	2007-09-06 17:43:59.000000000 +0200
@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
 	return decode_reply(type);
 }
 
+int
+ssh_update_nss_key(AuthenticationConnection *auth, int add,
+    const char *tokenname, const char *keyname,
+    const char *pass, u_int life, u_int confirm)
+{
+	Buffer msg;
+	int type, constrained = (life || confirm);
+
+	if (add) {
+		type = constrained ?
+		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
+		    SSH_AGENTC_ADD_NSS_KEY;
+	} else
+		type = SSH_AGENTC_REMOVE_NSS_KEY;
+
+	buffer_init(&msg);
+	buffer_put_char(&msg, type);
+	buffer_put_cstring(&msg, tokenname);
+	buffer_put_cstring(&msg, keyname);
+	buffer_put_cstring(&msg, pass);
+
+	if (constrained) {
+		if (life != 0) {
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
+			buffer_put_int(&msg, life);
+		}
+		if (confirm != 0)
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
+	}
+
+	if (ssh_request_reply(auth, &msg, &msg) == 0) {
+		buffer_free(&msg);
+		return 0;
+	}
+	type = buffer_get_char(&msg);
+	buffer_free(&msg);
+	return decode_reply(type);
+}
+
 /*
  * Removes all identities from the agent.  This call is not meant to be used
  * by normal applications.
diff -up openssh-4.7p1/readconf.h.nss-keys openssh-4.7p1/readconf.h
--- openssh-4.7p1/readconf.h.nss-keys	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/readconf.h	2007-09-06 17:43:59.000000000 +0200
@@ -84,6 +84,8 @@ typedef struct {
 	char   *preferred_authentications;
 	char   *bind_address;	/* local socket address for connection to sshd */
 	char   *smartcard_device; /* Smartcard reader device */
+	int     use_nss;        /* Use NSS library for keys */
+	char   *nss_token;      /* Look for NSS keys on token */
 	int	verify_host_key_dns;	/* Verify host key using DNS */
 
 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
diff -up /dev/null openssh-4.7p1/nsskeys.c
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/nsskeys.c	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc. 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 ``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 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.
+ */
+
+#include "includes.h"
+#ifdef HAVE_LIBNSS
+
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openssl/evp.h>
+
+#include <nss.h>
+#include <keyhi.h>
+#include <pk11pub.h>
+#include <cert.h>
+
+#include "xmalloc.h"
+#include "key.h"
+#include "log.h"
+#include "misc.h"
+#include "nsskeys.h"
+#include "pathnames.h"
+
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char *password = arg;
+	if (retry || password == NULL)
+		return NULL;
+	
+	return PL_strdup(password);
+}
+
+int
+nss_init(PK11PasswordFunc pwfn)
+{
+	char *dbpath;
+	char buf[MAXPATHLEN];
+
+	if (NSS_IsInitialized())
+		return 0;
+
+	if ((dbpath=getenv("NSS_DB_PATH")) == NULL) {
+		struct passwd *pw;
+		if ((pw = getpwuid(getuid())) == NULL ||
+			pw->pw_dir == NULL) {
+			return -1;
+		}
+		snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
+			    _PATH_SSH_USER_DIR);
+		dbpath = buf;
+	}
+
+	if (NSS_Init(dbpath) != SECSuccess)
+		return -1;
+
+	if (pwfn == NULL) {
+		pwfn = password_cb;
+	}
+
+	PK11_SetPasswordFunc(pwfn);
+	
+	return 0;
+}
+
+static Key *
+make_key_from_privkey(SECKEYPrivateKey *privk, char *password)
+{
+	Key *k;
+	switch (SECKEY_GetPrivateKeyType(privk)) {
+		case rsaKey:
+			k = key_new_nss(KEY_RSA);
+			break;
+		case dsaKey:
+			k = key_new_nss(KEY_DSA);
+			break;
+		default:
+			return NULL;
+	}
+	k->nss->pubk = SECKEY_ConvertToPublicKey(privk);
+	if (k->nss->pubk != NULL) {
+		k->nss->privk = SECKEY_CopyPrivateKey(privk);
+	}
+	if (k->nss->privk != NULL) {
+		if (password != NULL) {
+			k->nss->privk->wincx = xstrdup(password);
+		}
+		return k;
+	}
+	key_free(k);
+	return NULL;
+}
+
+static Key **
+add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated)
+{
+	if (*allocated < *i + 2) {
+		*allocated += 16;
+		keys = xrealloc(keys, *allocated, sizeof(k));
+	}
+	keys[*i] = k;
+	(*i)++;
+	keys[*i] = NULL;
+	return keys;
+}
+
+static int
+nss_convert_pubkey(Key *k)
+{
+	u_char *n;
+	unsigned int len;
+	char *p;
+
+	switch (k->type) {
+		case KEY_RSA:
+			n = k->nss->pubk->u.rsa.modulus.data;
+			len = k->nss->pubk->u.rsa.modulus.len;
+
+			if (BN_bin2bn(n, len, k->rsa->n) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.rsa.publicExponent.data;
+			len = k->nss->pubk->u.rsa.publicExponent.len;
+
+			if (BN_bin2bn(n, len, k->rsa->e) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+		case KEY_DSA:
+			n = k->nss->pubk->u.dsa.params.prime.data;
+			len = k->nss->pubk->u.dsa.params.prime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->p) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.subPrime.data;
+			len = k->nss->pubk->u.dsa.params.subPrime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->q) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.base.data;
+			len = k->nss->pubk->u.dsa.params.base.len;
+
+			if (BN_bin2bn(n, len, k->dsa->g) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.publicValue.data;
+			len = k->nss->pubk->u.dsa.publicValue.len;
+
+			if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+	}
+
+	p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
+	debug("fingerprint %u %s", key_size(k), p);
+	xfree(p);
+
+	return 0;
+}
+
+static Key **
+nss_find_privkeys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key *k = NULL;
+	Key **keys = NULL;
+	PK11SlotList *slots;
+	PK11SlotListElement *sle;
+	size_t allocated = 0;
+	size_t i = 0;
+
+	if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) {
+		if (tokenname == NULL) {
+			debug("No NSS token found");
+		} else {
+			debug("NSS token not found: %s", tokenname);
+		}
+		return NULL;
+	}
+	
+	for (sle = slots->head; sle; sle = sle->next) {
+		SECKEYPrivateKeyList *list;
+		SECKEYPrivateKeyListNode *node;
+		char *tmppass = password;
+				
+		if (PK11_NeedLogin(sle->slot)) {
+			if (password == NULL) {
+				char *prompt;
+				if (asprintf(&prompt, "Enter passphrase for token %s: ",
+					PK11_GetTokenName(sle->slot)) < 0)
+					fatal("password_cb: asprintf failed");
+				tmppass = read_passphrase(prompt, RP_ALLOW_STDIN);
+			}
+			PK11_Authenticate(sle->slot, PR_TRUE, tmppass);
+		}
+
+		debug("Looking for: %s:%s", tokenname, keyname);
+		list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname,
+			tmppass);
+		if (list == NULL && keyname != NULL) {
+			char *fooname;
+			/* NSS bug workaround */
+			if (asprintf(&fooname, "%s~", keyname) < 0) {
+				error("nss_find_privkey: asprintf failed");
+				PK11_FreeSlotList(slots);
+				return NULL;
+			}
+			list = PK11_ListPrivKeysInSlot(sle->slot, fooname,
+			tmppass);
+			free(fooname);
+		}
+		if (list == NULL && keyname != NULL) {
+			CERTCertificate *cert;
+			SECKEYPrivateKey *privk;
+			cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(),
+				(char *)keyname);
+			if (cert == NULL)
+				goto cleanup;
+			privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass);
+			CERT_DestroyCertificate(cert);
+			if (privk == NULL)
+				goto cleanup;
+			if ((k=make_key_from_privkey(privk, tmppass)) != NULL) {
+				nss_convert_pubkey(k);
+				keys = add_key_to_list(k, keys, &i, &allocated);
+			}
+			SECKEY_DestroyPrivateKey(privk);
+		} else {
+			if (list == NULL)
+				goto cleanup;
+			for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+				node=PRIVKEY_LIST_NEXT(node))
+				if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) {
+					nss_convert_pubkey(k);
+					keys = add_key_to_list(k, keys, &i, &allocated);
+				}
+			SECKEY_DestroyPrivateKeyList(list);
+		}
+cleanup:
+		if (password == NULL && tmppass != NULL) {
+			memset(tmppass, 0, strlen(tmppass));
+			xfree(tmppass);
+		}
+	}
+	PK11_FreeSlotList(slots);
+
+	return keys;
+}
+
+Key **
+nss_get_keys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key **keys;
+
+	if (nss_init(NULL) == -1) {
+		error("Failed to initialize NSS library");
+		return NULL;
+	}
+
+	keys = nss_find_privkeys(tokenname, keyname, password);
+	if (keys == NULL && keyname != NULL) {
+		error("Cannot find key in nss, token removed");
+		return NULL;
+	}
+#if 0
+	keys = xcalloc(3, sizeof(Key *));
+
+	if (k->type == KEY_RSA) {
+		n = key_new_nss_copy(KEY_RSA1, k);
+
+		keys[0] = n;
+		keys[1] = k;
+		keys[2] = NULL;
+	} else {
+		keys[0] = k;
+		keys[1] = NULL;
+	}
+#endif
+	return keys;
+}
+
+char *
+nss_get_key_label(Key *key)
+{
+	char *label, *nickname;
+	
+	nickname = PK11_GetPrivateKeyNickname(key->nss->privk);
+	label = xstrdup(nickname);
+	PORT_Free(nickname);
+
+	return label;
+}
+
+#endif /* HAVE_LIBNSS */
diff -up openssh-4.7p1/ssh.c.nss-keys openssh-4.7p1/ssh.c
--- openssh-4.7p1/ssh.c.nss-keys	2007-08-08 06:32:41.000000000 +0200
+++ openssh-4.7p1/ssh.c	2007-09-06 17:43:59.000000000 +0200
@@ -104,6 +104,9 @@
 #ifdef SMARTCARD
 #include "scard.h"
 #endif
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
 
 extern char *__progname;
 
@@ -1217,9 +1220,11 @@ load_public_identity_files(void)
 	int i = 0;
 	Key *public;
 	struct passwd *pw;
-#ifdef SMARTCARD
+#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
 	Key **keys;
+#endif
 
+#ifdef SMARTCARD
 	if (options.smartcard_device != NULL &&
 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
@@ -1240,6 +1245,27 @@ load_public_identity_files(void)
 		xfree(keys);
 	}
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	if (options.use_nss &&
+	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
+		int count;
+		for (count = 0; keys[count] != NULL; count++) {
+			memmove(&options.identity_files[1], &options.identity_files[0],
+			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
+			memmove(&options.identity_keys[1], &options.identity_keys[0],
+			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
+			options.num_identity_files++;
+			options.identity_keys[0] = keys[count];
+			options.identity_files[0] = nss_get_key_label(keys[count]);
+		}
+		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
+			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
+		i += count;
+		xfree(keys);
+	}
+#endif /* HAVE_LIBNSS */
+
 	if ((pw = getpwuid(original_real_uid)) == NULL)
 		fatal("load_public_identity_files: getpwuid failed");
 	if (gethostname(thishost, sizeof(thishost)) == -1)
diff -up /dev/null openssh-4.7p1/nsskeys.h
--- /dev/null	2007-09-04 17:17:14.474470098 +0200
+++ openssh-4.7p1/nsskeys.h	2007-09-06 17:43:59.000000000 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc.  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 ``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 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.
+ */
+
+#ifndef NSSKEYS_H
+#define NSSKEYS_H
+#ifdef HAVE_LIBNSS
+#include <pk11func.h>
+#include <prtypes.h>
+
+int	nss_init(PK11PasswordFunc);
+Key	**nss_get_keys(const char *, const char *, char *);
+char	*nss_get_key_label(Key *);
+/*void	 sc_close(void);*/
+/*int	 sc_put_key(Key *, const char *);*/
+
+#endif
+#endif
diff -up openssh-4.7p1/Makefile.in.nss-keys openssh-4.7p1/Makefile.in
--- openssh-4.7p1/Makefile.in.nss-keys	2007-06-11 06:01:42.000000000 +0200
+++ openssh-4.7p1/Makefile.in	2007-09-06 17:53:14.000000000 +0200
@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
-	entropy.o scard-opensc.o gss-genr.o umac.o
+	entropy.o scard-opensc.o gss-genr.o umac.o nsskeys.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 	sshconnect.o sshconnect1.o sshconnect2.o
diff -up openssh-4.7p1/key.h.nss-keys openssh-4.7p1/key.h
--- openssh-4.7p1/key.h.nss-keys	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/key.h	2007-09-06 17:43:59.000000000 +0200
@@ -29,11 +29,17 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <keyhi.h>
+#endif
+
 typedef struct Key Key;
 enum types {
 	KEY_RSA1,
 	KEY_RSA,
 	KEY_DSA,
+	KEY_NSS,
 	KEY_UNSPEC
 };
 enum fp_type {
@@ -47,16 +53,30 @@ enum fp_rep {
 
 /* key is stored in external hardware */
 #define KEY_FLAG_EXT		0x0001
+#define KEY_FLAG_NSS		0x0002
+
+#ifdef HAVE_LIBNSS
+typedef struct NSSKey NSSKey;
+struct NSSKey {
+	SECKEYPrivateKey *privk;
+	SECKEYPublicKey *pubk;
+};
+#endif
 
 struct Key {
 	int	 type;
 	int	 flags;
 	RSA	*rsa;
 	DSA	*dsa;
+#ifdef HAVE_LIBNSS
+	NSSKey  *nss;
+#endif
 };
 
 Key		*key_new(int);
 Key		*key_new_private(int);
+Key 		*key_new_nss(int);
+Key		*key_new_nss_copy(int, const Key *);
 void		 key_free(Key *);
 Key		*key_demote(const Key *);
 int		 key_equal(const Key *, const Key *);
diff -up openssh-4.7p1/ssh-add.c.nss-keys openssh-4.7p1/ssh-add.c
--- openssh-4.7p1/ssh-add.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-add.c	2007-09-06 17:43:59.000000000 +0200
@@ -43,6 +43,14 @@
 
 #include <openssl/evp.h>
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <secmod.h>
+#include <pk11pub.h>
+#include <keyhi.h>
+#include <cert.h>
+#endif
+
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdarg.h>
@@ -56,6 +64,7 @@
 #include "rsa.h"
 #include "log.h"
 #include "key.h"
+#include "nsskeys.h"
 #include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
@@ -306,6 +315,117 @@ do_file(AuthenticationConnection *ac, in
 	return 0;
 }
 
+#ifdef HAVE_LIBNSS
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char **passcache = arg;
+	char *password, *p2 = NULL;
+	char *prompt;
+	
+	if (retry)
+		return NULL;
+	
+	if (asprintf(&prompt, "Enter passphrase for token %s: ",
+		PK11_GetTokenName(slot)) < 0)
+		fatal("password_cb: asprintf failed");
+
+	password = read_passphrase(prompt, RP_ALLOW_STDIN);
+	
+	if (password != NULL && (p2=PL_strdup(password)) == NULL) {
+		memset(password, 0, strlen(password));
+		fatal("password_cb: PL_strdup failed");
+	}
+
+	if (passcache != NULL) {
+		if (*passcache != NULL) {
+			memset(*passcache, 0, strlen(*passcache));
+			xfree(*passcache);
+		}
+		*passcache = password;
+	} else {
+		memset(password, 0, strlen(password));
+		xfree(password);
+	}
+	
+	return p2;
+}
+
+static int
+add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add)
+{
+	SECKEYPrivateKeyList *list;
+	SECKEYPrivateKeyListNode *node;
+	char *passcache = NULL;
+	char *tokenname;
+	
+	int count = 0;
+	
+	if (PK11_NeedLogin(slot))
+		PK11_Authenticate(slot, PR_TRUE, &passcache);
+		
+	if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) {
+		return 0;
+	}
+	
+	tokenname = PK11_GetTokenName(slot);
+	
+	for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+		node=PRIVKEY_LIST_NEXT(node)) {
+		char *keyname;
+		SECKEYPublicKey *pub;
+		
+		keyname = PK11_GetPrivateKeyNickname(node->key);
+		if (keyname == NULL || *keyname == '\0') {
+			/* no nickname to refer to */
+			CERTCertificate *cert;
+			char *kn;
+			cert = PK11_GetCertFromPrivateKey(node->key);
+			if (cert == NULL)
+				continue;
+			kn = strchr(cert->nickname, ':');
+			if (kn == NULL)
+				kn = cert->nickname;
+			else
+				kn++;
+			keyname = PORT_Strdup(kn);
+			CERT_DestroyCertificate(cert);
+			if (keyname == NULL)
+				continue;
+		}
+		pub = SECKEY_ConvertToPublicKey(node->key);
+		if (pub == NULL) {
+			fprintf(stderr, "No public key for: %s:%s\n",
+				tokenname, keyname);
+			continue; /* not possible to obtain public key */
+		}
+		SECKEY_DestroyPublicKey(pub);
+		
+		if (ssh_update_nss_key(ac, add, tokenname, keyname,
+			passcache?passcache:"",	lifetime, confirm)) {
+			fprintf(stderr, "Key %s: %s:%s\n",
+				add?"added":"removed", tokenname, keyname);
+			count++;
+		} else {
+			fprintf(stderr, "Could not %s key: %s:%s\n",
+				add?"add":"remove", tokenname, keyname);
+		}
+		
+		PORT_Free(keyname);
+		count++;
+	}
+
+	if (passcache != NULL) {
+		memset(passcache, 0, strlen(passcache));
+		xfree(passcache);
+	}
+	
+	SECKEY_DestroyPrivateKeyList(list);
+	
+	return count;
+}
+#endif
+
 static void
 usage(void)
 {
@@ -333,6 +453,10 @@ main(int argc, char **argv)
 	AuthenticationConnection *ac = NULL;
 	char *sc_reader_id = NULL;
 	int i, ch, deleting = 0, ret = 0;
+#ifdef HAVE_LIBNSS
+	char *token_id = NULL;
+	int use_nss = 0;
+#endif
 
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
@@ -350,7 +474,7 @@ main(int argc, char **argv)
 		    "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -372,6 +496,11 @@ main(int argc, char **argv)
 			if (delete_all(ac) == -1)
 				ret = 1;
 			goto done;
+#ifdef HAVE_LIBNSS
+		case 'n':
+			use_nss = 1;
+			break;
+#endif
 		case 's':
 			sc_reader_id = optarg;
 			break;
@@ -386,6 +515,11 @@ main(int argc, char **argv)
 				goto done;
 			}
 			break;
+#ifdef HAVE_LIBNSS
+		case 'T':
+			token_id = optarg;
+			break;
+#endif
 		default:
 			usage();
 			ret = 1;
@@ -399,6 +533,40 @@ main(int argc, char **argv)
 			ret = 1;
 		goto done;
 	}
+#ifdef HAVE_LIBNSS
+	if (use_nss) {
+		PK11SlotList *slots;
+		PK11SlotListElement *sle;
+		int count = 0;
+		if (nss_init(password_cb) == -1) {
+			fprintf(stderr, "Failed to initialize NSS library\n");
+			ret = 1;
+			goto done;
+		}
+		
+		if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE,
+			NULL)) == NULL) {
+			fprintf(stderr, "No tokens found\n");
+			ret = 1;
+			goto nss_done;
+		}
+
+		for (sle = slots->head; sle; sle = sle->next) {
+			int rv;
+			if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) {
+				ret = 1;
+			}
+			count += rv;
+		}
+		if (count == 0) {
+			ret = 1;
+		}
+nss_done:		
+		NSS_Shutdown();
+		clear_pass();
+		goto done;
+	}
+#endif
 	if (argc == 0) {
 		char buf[MAXPATHLEN];
 		struct passwd *pw;
diff -up openssh-4.7p1/ssh-rsa.c.nss-keys openssh-4.7p1/ssh-rsa.c
--- openssh-4.7p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
+++ openssh-4.7p1/ssh-rsa.c	2007-09-06 17:43:59.000000000 +0200
@@ -32,6 +32,10 @@
 #include "compat.h"
 #include "ssh.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
 
 /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
 		error("ssh_rsa_sign: no RSA key");
 		return -1;
 	}
+
+	slen = RSA_size(key->rsa);
+	sig = xmalloc(slen);
+
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECOidTag alg;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
+			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
+			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
+
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			alg) != SECSuccess) {
+			error("ssh_rsa_sign: sign failed");
+			return -1;
+		}
+		if (sigitem.len > slen) {
+			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
+			xfree(sig);
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		if (sigitem.len < slen) {
+			memset(sig, 0, slen - sigitem.len);
+		}
+		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+	} else {
+#endif
 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
 
-	slen = RSA_size(key->rsa);
-	sig = xmalloc(slen);
-
 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
 	memset(digest, 'd', sizeof(digest));
 
@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
 		xfree(sig);
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	/* encode signature */
 	buffer_init(&b);
 	buffer_put_cstring(&b, "ssh-rsa");
diff -up openssh-4.7p1/ssh-keygen.c.nss-keys openssh-4.7p1/ssh-keygen.c
--- openssh-4.7p1/ssh-keygen.c.nss-keys	2007-02-19 12:10:25.000000000 +0100
+++ openssh-4.7p1/ssh-keygen.c	2007-09-06 17:48:08.000000000 +0200
@@ -52,6 +52,11 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include "nsskeys.h"
+#endif
+
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS		2048
 #define DEFAULT_BITS_DSA	1024
@@ -499,6 +504,26 @@ do_download(struct passwd *pw, const cha
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname)
+{
+	Key **keys = NULL;
+	int i;
+	
+	keys = nss_get_keys(tokenname, keyname, NULL);
+	if (keys == NULL)
+		fatal("cannot find public key in NSS");
+	for (i = 0; keys[i]; i++) {
+		key_write(keys[i], stdout);
+		key_free(keys[i]);
+		fprintf(stdout, "\n");
+	}
+	xfree(keys);
+	exit(0);
+}
+#endif /* HAVE_LIBNSS */
+
 static void
 do_fingerprint(struct passwd *pw)
 {
@@ -1056,7 +1081,8 @@ main(int argc, char **argv)
 	Key *private, *public;
 	struct passwd *pw;
 	struct stat st;
-	int opt, type, fd, download = 0;
+	int opt, type, fd, download = 1;
+	int use_nss = 0;
 	u_int32_t memory = 0, generator_wanted = 0, trials = 100;
 	int do_gen_candidates = 0, do_screen_candidates = 0;
 	int log_level = SYSLOG_LEVEL_INFO;
@@ -1090,7 +1116,7 @@ main(int argc, char **argv)
 	}
 
 	while ((opt = getopt(argc, argv,
-	    "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
+	    "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
 		switch (opt) {
 		case 'b':
 			bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);
@@ -1130,6 +1156,10 @@ main(int argc, char **argv)
 		case 'g':
 			print_generic = 1;
 			break;
+		case 'n':
+			use_nss = 1;
+			download = 1;
+			break;
 		case 'P':
 			identity_passphrase = optarg;
 			break;
@@ -1161,10 +1191,10 @@ main(int argc, char **argv)
 		case 't':
 			key_type_name = optarg;
 			break;
-		case 'D':
-			download = 1;
-			/*FALLTHROUGH*/
 		case 'U':
+			download = 0;
+			/*FALLTHROUGH*/
+		case 'D':
 			reader_id = optarg;
 			break;
 		case 'v':
@@ -1269,6 +1299,17 @@ main(int argc, char **argv)
 			exit(0);
 		}
 	}
+
+	if (use_nss) {
+#ifdef HAVE_LIBNSS
+		if (download)
+			do_nss_download(pw, reader_id, identity_file);
+		else
+			fatal("no support for NSS key upload.");
+#else
+		fatal("no support for NSS keys.");
+#endif
+	}
 	if (reader_id != NULL) {
 #ifdef SMARTCARD
 		if (download)
diff -up openssh-4.7p1/readconf.c.nss-keys openssh-4.7p1/readconf.c
--- openssh-4.7p1/readconf.c.nss-keys	2007-03-21 10:46:03.000000000 +0100
+++ openssh-4.7p1/readconf.c	2007-09-06 17:43:59.000000000 +0200
@@ -124,6 +124,7 @@ typedef enum {
 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
+	oUseNSS, oNSSToken,
 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
@@ -209,6 +210,13 @@ static struct {
 #else
 	{ "smartcarddevice", oUnsupported },
 #endif
+#ifdef HAVE_LIBNSS
+	{ "usenss", oUseNSS },
+	{ "nsstoken", oNSSToken },
+#else
+	{ "usenss", oUnsupported },
+	{ "nsstoken", oNSSToken },
+#endif
 	{ "clearallforwardings", oClearAllForwardings },
 	{ "enablesshkeysign", oEnableSSHKeysign },
 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
@@ -601,6 +609,14 @@ parse_string:
 		charptr = &options->smartcard_device;
 		goto parse_string;
 
+	case oUseNSS:
+		intptr = &options->use_nss;
+		goto parse_flag;
+
+	case oNSSToken:
+		charptr = &options->nss_token;
+		goto parse_command;
+
 	case oProxyCommand:
 		charptr = &options->proxy_command;
 parse_command:
@@ -1049,6 +1065,8 @@ initialize_options(Options * options)
 	options->preferred_authentications = NULL;
 	options->bind_address = NULL;
 	options->smartcard_device = NULL;
+	options->use_nss = -1;
+	options->nss_token = NULL;
 	options->enable_ssh_keysign = - 1;
 	options->no_host_authentication_for_localhost = - 1;
 	options->identities_only = - 1;
@@ -1177,6 +1195,8 @@ fill_default_options(Options * options)
 		options->no_host_authentication_for_localhost = 0;
 	if (options->identities_only == -1)
 		options->identities_only = 0;
+	if (options->use_nss == -1)
+		options->use_nss = 0;
 	if (options->enable_ssh_keysign == -1)
 		options->enable_ssh_keysign = 0;
 	if (options->rekey_limit == -1)

openssh-4.7p1-pam-session.patch:

--- NEW FILE openssh-4.7p1-pam-session.patch ---
diff -up openssh-4.7p1/session.c.pam-session openssh-4.7p1/session.c
--- openssh-4.7p1/session.c.pam-session	2007-08-16 15:28:04.000000000 +0200
+++ openssh-4.7p1/session.c	2007-09-06 17:37:46.000000000 +0200
@@ -422,11 +422,6 @@ do_exec_no_pty(Session *s, const char *c
 
 	session_proctitle(s);
 
-#if defined(USE_PAM)
-	if (options.use_pam && !use_privsep)
-		do_pam_setcred(1);
-#endif /* USE_PAM */
-
 	/* Fork the child. */
 	if ((pid = fork()) == 0) {
 		is_child = 1;
@@ -557,14 +552,6 @@ do_exec_pty(Session *s, const char *comm
 	ptyfd = s->ptyfd;
 	ttyfd = s->ttyfd;
 
-#if defined(USE_PAM)
-	if (options.use_pam) {
-		do_pam_set_tty(s->tty);
-		if (!use_privsep)
-			do_pam_setcred(1);
-	}
-#endif
-
 	/* Fork the child. */
 	if ((pid = fork()) == 0) {
 		is_child = 1;
@@ -1300,17 +1287,9 @@ do_setusercontext(struct passwd *pw)
 # ifdef __bsdi__
 		setpgid(0, 0);
 # endif
-#ifdef GSSAPI
-		if (options.gss_authentication) {
-			temporarily_use_uid(pw);
-			ssh_gssapi_storecreds();
-			restore_uid();
-		}
-#endif
 # ifdef USE_PAM
 		if (options.use_pam) {
-			do_pam_session();
-			do_pam_setcred(use_privsep);
+			do_pam_setcred(0);
 		}
 # endif /* USE_PAM */
 		if (setusercontext(lc, pw, pw->pw_uid,
@@ -1337,13 +1316,6 @@ do_setusercontext(struct passwd *pw)
 			exit(1);
 		}
 		endgrent();
-#ifdef GSSAPI
-		if (options.gss_authentication) {
-			temporarily_use_uid(pw);
-			ssh_gssapi_storecreds();
-			restore_uid();
-		}
-#endif
 # ifdef USE_PAM
 		/*
 		 * PAM credentials may take the form of supplementary groups.
@@ -1351,8 +1323,7 @@ do_setusercontext(struct passwd *pw)
 		 * Reestablish them here.
 		 */
 		if (options.use_pam) {
-			do_pam_session();
-			do_pam_setcred(use_privsep);
+			do_pam_setcred(0);
 		}
 # endif /* USE_PAM */
 # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
diff -up openssh-4.7p1/sshd.c.pam-session openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.pam-session	2007-09-06 17:37:46.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 17:37:46.000000000 +0200
@@ -1831,7 +1831,21 @@ main(int ac, char **av)
 	audit_event(SSH_AUTH_SUCCESS);
 #endif
 
-	/*
+#ifdef GSSAPI
+	if (options.gss_authentication) {
+		temporarily_use_uid(authctxt->pw);
+		ssh_gssapi_storecreds();
+		restore_uid();
+	}
+#endif
+#ifdef USE_PAM
+	if (options.use_pam) {
+		do_pam_setcred(1);
+		do_pam_session();
+	}
+#endif
+
+ 	/*
 	 * In privilege separation, we fork another child and prepare
 	 * file descriptor passing.
 	 */
diff -up openssh-4.7p1/monitor.c.pam-session openssh-4.7p1/monitor.c
--- openssh-4.7p1/monitor.c.pam-session	2007-09-06 17:37:46.000000000 +0200
+++ openssh-4.7p1/monitor.c	2007-09-06 17:37:46.000000000 +0200
@@ -1566,6 +1566,11 @@ mm_answer_term(int sock, Buffer *req)
 	/* The child is terminating */
 	session_destroy_all(&mm_session_close);
 
+#ifdef USE_PAM
+	if (options.use_pam)
+		sshpam_cleanup();
+#endif
+
 	while (waitpid(pmonitor->m_pid, &status, 0) == -1)
 		if (errno != EINTR)
 			exit(1);
diff -up openssh-4.7p1/auth-pam.c.pam-session openssh-4.7p1/auth-pam.c
--- openssh-4.7p1/auth-pam.c.pam-session	2007-08-10 06:32:34.000000000 +0200
+++ openssh-4.7p1/auth-pam.c	2007-09-06 17:37:46.000000000 +0200
@@ -598,15 +598,17 @@ static struct pam_conv store_conv = { ss
 void
 sshpam_cleanup(void)
 {
-	debug("PAM: cleanup");
-	if (sshpam_handle == NULL)
+	if (sshpam_handle == NULL || (use_privsep && !mm_is_monitor()))
 		return;
+	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
 	if (sshpam_cred_established) {
+		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
 	if (sshpam_session_open) {
+		debug("PAM: closing session");
 		pam_close_session(sshpam_handle, PAM_SILENT);
 		sshpam_session_open = 0;
 	}

openssh-4.7p1-redhat.patch:

--- NEW FILE openssh-4.7p1-redhat.patch ---
diff -up openssh-4.7p1/sshd_config.redhat openssh-4.7p1/sshd_config
--- openssh-4.7p1/sshd_config.redhat	2007-03-21 10:42:25.000000000 +0100
+++ openssh-4.7p1/sshd_config	2007-09-06 16:23:58.000000000 +0200
@@ -33,6 +33,7 @@ Protocol 2
 # Logging
 # obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
+SyslogFacility AUTHPRIV
 #LogLevel INFO
 
 # Authentication:
@@ -59,9 +60,11 @@ Protocol 2
 # To disable tunneled clear text passwords, change to no here!
 #PasswordAuthentication yes
 #PermitEmptyPasswords no
+PasswordAuthentication yes
 
 # Change to no to disable s/key passwords
 #ChallengeResponseAuthentication yes
+ChallengeResponseAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -71,7 +74,9 @@ Protocol 2
 
 # GSSAPI options
 #GSSAPIAuthentication no
+GSSAPIAuthentication yes
 #GSSAPICleanupCredentials yes
+GSSAPICleanupCredentials yes
 
 # Set this to 'yes' to enable PAM authentication, account processing, 
 # and session processing. If this is enabled, PAM authentication will 
@@ -83,10 +88,16 @@ Protocol 2
 # PAM authentication, then enable this but set PasswordAuthentication
 # and ChallengeResponseAuthentication to 'no'.
 #UsePAM no
+UsePAM yes
 
+# Accept locale-related environment variables
+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
+AcceptEnv LC_IDENTIFICATION LC_ALL
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
+X11Forwarding yes
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PrintMotd yes
diff -up openssh-4.7p1/ssh_config.redhat openssh-4.7p1/ssh_config
--- openssh-4.7p1/ssh_config.redhat	2007-06-11 06:04:42.000000000 +0200
+++ openssh-4.7p1/ssh_config	2007-09-06 16:21:49.000000000 +0200
@@ -43,3 +43,13 @@
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+Host *
+	GSSAPIAuthentication yes
+# If this option is set to yes then remote X11 clients will have full access
+# to the original X11 display. As virtually no X11 client supports the untrusted
+# mode correctly we set this to yes.
+	ForwardX11Trusted yes
+# Send locale-related environment variables
+	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
+	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
+	SendEnv LC_IDENTIFICATION LC_ALL
diff -up openssh-4.7p1/sshd_config.0.redhat openssh-4.7p1/sshd_config.0
--- openssh-4.7p1/sshd_config.0.redhat	2007-09-04 08:50:11.000000000 +0200
+++ openssh-4.7p1/sshd_config.0	2007-09-06 16:21:49.000000000 +0200
@@ -435,9 +435,9 @@ DESCRIPTION
 
      SyslogFacility
              Gives the facility code that is used when logging messages from
-             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
-             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
-             fault is AUTH.
+             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+             The default is AUTH.
 
      TCPKeepAlive
              Specifies whether the system should send TCP keepalive messages
diff -up openssh-4.7p1/sshd_config.5.redhat openssh-4.7p1/sshd_config.5
--- openssh-4.7p1/sshd_config.5.redhat	2007-06-11 06:07:13.000000000 +0200
+++ openssh-4.7p1/sshd_config.5	2007-09-06 16:21:49.000000000 +0200
@@ -748,7 +748,7 @@ Note that this option applies to protoco
 .It Cm SyslogFacility
 Gives the facility code that is used when logging messages from
 .Xr sshd 8 .
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
 The default is AUTH.
 .It Cm TCPKeepAlive

openssh-4.7p1-selinux.patch:

--- NEW FILE openssh-4.7p1-selinux.patch ---
diff -up openssh-4.7p1/configure.ac.selinux openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.selinux	2007-09-06 19:46:32.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 19:52:23.000000000 +0200
@@ -3211,6 +3211,7 @@ AC_ARG_WITH(selinux,
 		AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
 		    AC_MSG_ERROR(SELinux support requires libselinux library))
 		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
+		LIBS="$LIBS $LIBSELINUX"
 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
 		LIBS="$save_LIBS"
 	fi ]
diff -up openssh-4.7p1/auth1.c.selinux openssh-4.7p1/auth1.c
--- openssh-4.7p1/auth1.c.selinux	2007-09-06 19:46:32.000000000 +0200
+++ openssh-4.7p1/auth1.c	2007-09-06 19:46:32.000000000 +0200
@@ -388,7 +388,7 @@ void
 do_authentication(Authctxt *authctxt)
 {
 	u_int ulen;
-	char *user, *style = NULL;
+	char *user, *style = NULL, *role=NULL;
 
 	/* Get the name of the user that we wish to log in as. */
 	packet_read_expect(SSH_CMSG_USER);
@@ -397,11 +397,19 @@ do_authentication(Authctxt *authctxt)
 	user = packet_get_string(&ulen);
 	packet_check_eom();
 
+	if ((role = strchr(user, '/')) != NULL)
+		*role++ = '\0';
+
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = '\0';
+	else
+		if (role && (style = strchr(role, ':')) != NULL)
+			*style++ = '\0';
+			
 
 	authctxt->user = user;
 	authctxt->style = style;
+	authctxt->role = role;
 
 	/* Verify that the user is a valid user. */
 	if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
diff -up openssh-4.7p1/monitor_wrap.h.selinux openssh-4.7p1/monitor_wrap.h
--- openssh-4.7p1/monitor_wrap.h.selinux	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.7p1/monitor_wrap.h	2007-09-06 19:46:32.000000000 +0200
@@ -41,6 +41,7 @@ int mm_is_monitor(void);
 DH *mm_choose_dh(int, int, int);
 int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int);
 void mm_inform_authserv(char *, char *);
+void mm_inform_authrole(char *);
 struct passwd *mm_getpwnamallow(const char *);
 char *mm_auth2_read_banner(void);
 int mm_auth_password(struct Authctxt *, char *);
diff -up openssh-4.7p1/monitor.h.selinux openssh-4.7p1/monitor.h
--- openssh-4.7p1/monitor.h.selinux	2006-03-26 05:30:02.000000000 +0200
+++ openssh-4.7p1/monitor.h	2007-09-06 19:46:32.000000000 +0200
@@ -30,7 +30,7 @@
 
 enum monitor_reqtype {
 	MONITOR_REQ_MODULI, MONITOR_ANS_MODULI,
-	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,
+	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE,
 	MONITOR_REQ_SIGN, MONITOR_ANS_SIGN,
 	MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM,
 	MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER,
diff -up openssh-4.7p1/monitor_wrap.c.selinux openssh-4.7p1/monitor_wrap.c
--- openssh-4.7p1/monitor_wrap.c.selinux	2007-06-11 06:01:42.000000000 +0200
+++ openssh-4.7p1/monitor_wrap.c	2007-09-06 19:46:32.000000000 +0200
@@ -294,6 +294,23 @@ mm_inform_authserv(char *service, char *
 	buffer_free(&m);
 }
 
+/* Inform the privileged process about role */
+
+void
+mm_inform_authrole(char *role)
+{
+	Buffer m;
+
+	debug3("%s entering", __func__);
+
+	buffer_init(&m);
+	buffer_put_cstring(&m, role ? role : "");
+
+	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m);
+
+	buffer_free(&m);
+}
+
 /* Do the password authentication */
 int
 mm_auth_password(Authctxt *authctxt, char *password)
diff -up openssh-4.7p1/openbsd-compat/port-linux.c.selinux openssh-4.7p1/openbsd-compat/port-linux.c
--- openssh-4.7p1/openbsd-compat/port-linux.c.selinux	2007-06-28 00:48:03.000000000 +0200
+++ openssh-4.7p1/openbsd-compat/port-linux.c	2007-09-06 19:46:32.000000000 +0200
@@ -30,11 +30,16 @@
 #ifdef WITH_SELINUX
 #include "log.h"
 #include "port-linux.h"
+#include "key.h"
+#include "hostfile.h"
+#include "auth.h"
 
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
 #include <selinux/get_context_list.h>
 
+extern Authctxt *the_authctxt;
+
 /* Wrapper around is_selinux_enabled() to log its return value once only */
 static int
 ssh_selinux_enabled(void)
@@ -53,23 +58,36 @@ ssh_selinux_enabled(void)
 static security_context_t
 ssh_selinux_getctxbyname(char *pwname)
 {
-	security_context_t sc;
-	char *sename = NULL, *lvl = NULL;
-	int r;
+	security_context_t sc = NULL;
+	char *sename, *lvl;
+	char *role = NULL;
+	int r = 0;
 
+	if (the_authctxt) 
+		role=the_authctxt->role;
 #ifdef HAVE_GETSEUSERBYNAME
-	if (getseuserbyname(pwname, &sename, &lvl) != 0)
-		return NULL;
+	if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) {
+		sename = NULL;
+		lvl = NULL;
+	}
 #else
 	sename = pwname;
 	lvl = NULL;
 #endif
 
+	if (r == 0) {
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
-	r = get_default_context_with_level(sename, lvl, NULL, &sc);
+		if (role != NULL && role[0])
+			r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc);
+		else
+			r = get_default_context_with_level(sename, lvl, NULL, &sc);
 #else
-	r = get_default_context(sename, NULL, &sc);
+		if (role != NULL && role[0])
+			r = get_default_context_with_role(sename, role, NULL, &sc);
+		else
+			r = get_default_context(sename, NULL, &sc);
 #endif
+	}
 
 	if (r != 0) {
 		switch (security_getenforce()) {
diff -up openssh-4.7p1/auth.h.selinux openssh-4.7p1/auth.h
--- openssh-4.7p1/auth.h.selinux	2006-08-18 16:32:46.000000000 +0200
+++ openssh-4.7p1/auth.h	2007-09-06 19:46:32.000000000 +0200
@@ -58,6 +58,7 @@ struct Authctxt {
 	char		*service;
 	struct passwd	*pw;		/* set if 'valid' */
 	char		*style;
+	char		*role;
 	void		*kbdintctxt;
 #ifdef BSD_AUTH
 	auth_session_t	*as;
diff -up openssh-4.7p1/auth2.c.selinux openssh-4.7p1/auth2.c
--- openssh-4.7p1/auth2.c.selinux	2007-05-20 06:58:41.000000000 +0200
+++ openssh-4.7p1/auth2.c	2007-09-06 19:46:32.000000000 +0200
@@ -141,7 +141,7 @@ input_userauth_request(int type, u_int32
 {
 	Authctxt *authctxt = ctxt;
 	Authmethod *m = NULL;
-	char *user, *service, *method, *style = NULL;
+	char *user, *service, *method, *style = NULL, *role = NULL;
 	int authenticated = 0;
 
 	if (authctxt == NULL)
@@ -153,6 +153,9 @@ input_userauth_request(int type, u_int32
 	debug("userauth-request for user %s service %s method %s", user, service, method);
 	debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
 
+	if ((role = strchr(user, '/')) != NULL)
+		*role++ = 0;
+
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = 0;
 
@@ -178,8 +181,11 @@ input_userauth_request(int type, u_int32
 		    use_privsep ? " [net]" : "");
 		authctxt->service = xstrdup(service);
 		authctxt->style = style ? xstrdup(style) : NULL;
-		if (use_privsep)
+		authctxt->role = role ? xstrdup(role) : NULL;
+		if (use_privsep) {
 			mm_inform_authserv(service, style);
+			mm_inform_authrole(role);
+		}
 	} else if (strcmp(user, authctxt->user) != 0 ||
 	    strcmp(service, authctxt->service) != 0) {
 		packet_disconnect("Change of username or service not allowed: "
diff -up openssh-4.7p1/monitor.c.selinux openssh-4.7p1/monitor.c
--- openssh-4.7p1/monitor.c.selinux	2007-05-20 07:10:16.000000000 +0200
+++ openssh-4.7p1/monitor.c	2007-09-06 19:46:32.000000000 +0200
@@ -133,6 +133,7 @@ int mm_answer_sign(int, Buffer *);
 int mm_answer_pwnamallow(int, Buffer *);
 int mm_answer_auth2_read_banner(int, Buffer *);
 int mm_answer_authserv(int, Buffer *);
+int mm_answer_authrole(int, Buffer *);
 int mm_answer_authpassword(int, Buffer *);
 int mm_answer_bsdauthquery(int, Buffer *);
 int mm_answer_bsdauthrespond(int, Buffer *);
@@ -204,6 +205,7 @@ struct mon_table mon_dispatch_proto20[] 
     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
+    {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
 #ifdef USE_PAM
@@ -657,6 +659,7 @@ mm_answer_pwnamallow(int sock, Buffer *m
 	else {
 		/* Allow service/style information on the auth context */
 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
+		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
 	}
 
@@ -702,6 +705,23 @@ mm_answer_authserv(int sock, Buffer *m)
 }
 
 int
+mm_answer_authrole(int sock, Buffer *m)
+{
+	monitor_permit_authentications(1);
+
+	authctxt->role = buffer_get_string(m, NULL);
+	debug3("%s: role=%s",
+	    __func__, authctxt->role);
+
+	if (strlen(authctxt->role) == 0) {
+		xfree(authctxt->role);
+		authctxt->role = NULL;
+	}
+
+	return (0);
+}
+
+int
 mm_answer_authpassword(int sock, Buffer *m)
 {
 	static int call_count;

openssh-4.7p1-sftp-drain-acks.patch:

--- NEW FILE openssh-4.7p1-sftp-drain-acks.patch ---
diff -up openssh-4.7p1/sftp-client.c.drain-acks openssh-4.7p1/sftp-client.c
--- openssh-4.7p1/sftp-client.c.drain-acks	2007-02-19 12:13:39.000000000 +0100
+++ openssh-4.7p1/sftp-client.c	2007-09-06 17:54:41.000000000 +0200
@@ -992,7 +992,8 @@ int
 do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
     int pflag)
 {
-	int local_fd, status;
+	int local_fd;
+	int status = SSH2_FX_OK;
 	u_int handle_len, id, type;
 	u_int64_t offset;
 	char *handle, *data;
@@ -1074,7 +1075,7 @@ do_upload(struct sftp_conn *conn, char *
 		 * Simulate an EOF on interrupt, allowing ACKs from the
 		 * server to drain.
 		 */
-		if (interrupted)
+		if (interrupted || status != SSH2_FX_OK)
 			len = 0;
 		else do
 			len = read(local_fd, data, conn->transfer_buflen);
@@ -1131,18 +1132,6 @@ do_upload(struct sftp_conn *conn, char *
 				fatal("Can't find request for ID %u", r_id);
 			TAILQ_REMOVE(&acks, ack, tq);
 
-			if (status != SSH2_FX_OK) {
-				error("Couldn't write to remote file \"%s\": %s",
-				    remote_path, fx2txt(status));
-				if (showprogress)
-					stop_progress_meter();
-				do_close(conn, handle, handle_len);
-				close(local_fd);
-				xfree(data);
-				xfree(ack);
-				status = -1;
-				goto done;
-			}
 			debug3("In write loop, ack for %u %u bytes at %llu",
 			    ack->id, ack->len, (unsigned long long)ack->offset);
 			++ackid;
@@ -1154,21 +1143,25 @@ do_upload(struct sftp_conn *conn, char *
 		stop_progress_meter();
 	xfree(data);
 
+	if (status != SSH2_FX_OK) {
+		error("Couldn't write to remote file \"%s\": %s",
+		    remote_path, fx2txt(status));
+		status = -1;
+	}
+
 	if (close(local_fd) == -1) {
 		error("Couldn't close local file \"%s\": %s", local_path,
 		    strerror(errno));
-		do_close(conn, handle, handle_len);
 		status = -1;
-		goto done;
 	}
 
 	/* Override umask and utimes if asked */
 	if (pflag)
 		do_fsetstat(conn, handle, handle_len, &a);
 
-	status = do_close(conn, handle, handle_len);
+	if (do_close(conn, handle, handle_len) != SSH2_FX_OK)
+		status = -1;
 
-done:
 	xfree(handle);
 	buffer_free(&msg);
 	return(status);

openssh-4.7p1-vendor.patch:

--- NEW FILE openssh-4.7p1-vendor.patch ---
diff -up openssh-4.7p1/configure.ac.vendor openssh-4.7p1/configure.ac
--- openssh-4.7p1/configure.ac.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/configure.ac	2007-09-06 16:27:47.000000000 +0200
@@ -3792,6 +3792,12 @@ AC_ARG_WITH(lastlog,
 		fi
 	]
 )
+AC_ARG_ENABLE(vendor-patchlevel,
+  [  --enable-vendor-patchlevel=TAG  specify a vendor patch level],
+  [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL="$enableval"],
+  [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL=none])
 
 dnl lastlog, [uw]tmpx? detection
 dnl  NOTE: set the paths in the platform section to avoid the
@@ -4041,6 +4047,7 @@ echo "       IP address in \$DISPLAY hac
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
 echo "              Random number source: $RAND_MSG"
+echo "                Vendor patch level: $SSH_VENDOR_PATCHLEVEL"
 if test ! -z "$USE_RAND_HELPER" ; then
 echo "     ssh-rand-helper collects from: $RAND_HELPER_MSG"
 fi
diff -up openssh-4.7p1/sshd_config.5.vendor openssh-4.7p1/sshd_config.5
--- openssh-4.7p1/sshd_config.5.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config.5	2007-09-06 16:27:47.000000000 +0200
@@ -725,6 +725,14 @@ This option applies to protocol version 
 .It Cm ServerKeyBits
 Defines the number of bits in the ephemeral protocol version 1 server key.
 The minimum value is 512, and the default is 768.
+.It Cm ShowPatchLevel
+Specifies whether
+.Nm sshd
+will display the patch level of the binary in the identification string.
+The patch level is set at compile-time.
+The default is
+.Dq no .
+This option applies to protocol version 1 only.
 .It Cm StrictModes
 Specifies whether
 .Xr sshd 8
diff -up openssh-4.7p1/servconf.h.vendor openssh-4.7p1/servconf.h
--- openssh-4.7p1/servconf.h.vendor	2007-02-19 12:25:38.000000000 +0100
+++ openssh-4.7p1/servconf.h	2007-09-06 16:27:47.000000000 +0200
@@ -120,6 +120,7 @@ typedef struct {
 	int	max_startups;
 	int	max_authtries;
 	char   *banner;			/* SSH-2 banner message */
+	int	show_patchlevel;	/* Show vendor patch level to clients */
 	int	use_dns;
 	int	client_alive_interval;	/*
 					 * poke the client this often to
diff -up openssh-4.7p1/servconf.c.vendor openssh-4.7p1/servconf.c
--- openssh-4.7p1/servconf.c.vendor	2007-05-20 07:03:16.000000000 +0200
+++ openssh-4.7p1/servconf.c	2007-09-06 16:29:11.000000000 +0200
@@ -113,6 +113,7 @@ initialize_server_options(ServerOptions 
 	options->max_startups = -1;
 	options->max_authtries = -1;
 	options->banner = NULL;
+	options->show_patchlevel = -1;
 	options->use_dns = -1;
 	options->client_alive_interval = -1;
 	options->client_alive_count_max = -1;
@@ -250,6 +251,9 @@ fill_default_server_options(ServerOption
 	if (options->permit_tun == -1)
 		options->permit_tun = SSH_TUNMODE_NO;
 
+	if (options->show_patchlevel == -1)
+		options->show_patchlevel = 0;
+
 	/* Turn privilege separation on by default */
 	if (use_privsep == -1)
 		use_privsep = 1;
@@ -293,6 +297,7 @@ typedef enum {
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
 	sMatch, sPermitOpen, sForceCommand,
 	sUsePrivilegeSeparation,
+	sShowPatchLevel,
 	sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@ -390,6 +395,7 @@ static struct {
 	{ "maxstartups", sMaxStartups, SSHCFG_GLOBAL },
 	{ "maxauthtries", sMaxAuthTries, SSHCFG_GLOBAL },
 	{ "banner", sBanner, SSHCFG_ALL },
+	{ "showpatchlevel", sShowPatchLevel, SSHCFG_GLOBAL },
 	{ "usedns", sUseDNS, SSHCFG_GLOBAL },
 	{ "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL },
 	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
@@ -1005,6 +1011,10 @@ parse_flag:
 		intptr = &use_privsep;
 		goto parse_flag;
 
+	case sShowPatchLevel:
+		intptr = &options->show_patchlevel;
+		goto parse_flag;
+
 	case sAllowUsers:
 		while ((arg = strdelim(&cp)) && *arg != '\0') {
 			if (options->num_allow_users >= MAX_ALLOW_USERS)
diff -up openssh-4.7p1/sshd_config.0.vendor openssh-4.7p1/sshd_config.0
--- openssh-4.7p1/sshd_config.0.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config.0	2007-09-06 16:27:47.000000000 +0200
@@ -418,6 +418,11 @@ DESCRIPTION
              Defines the number of bits in the ephemeral protocol version 1
              server key.  The minimum value is 512, and the default is 768.
 
+     ShowPatchLevel
+	     Specifies whether sshd will display the specific patch level of
+	     the binary in the server identification string.  The patch level
+	     is set at compile-time.  The default is M-bM-^@M-^\noM-bM-^@M-^].
+
      StrictModes
              Specifies whether sshd(8) should check file modes and ownership
              of the user's files and home directory before accepting login.
diff -up openssh-4.7p1/sshd_config.vendor openssh-4.7p1/sshd_config
--- openssh-4.7p1/sshd_config.vendor	2007-09-06 16:27:47.000000000 +0200
+++ openssh-4.7p1/sshd_config	2007-09-06 16:27:47.000000000 +0200
@@ -109,6 +109,7 @@ X11Forwarding yes
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
+#ShowPatchLevel no
 #UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
diff -up openssh-4.7p1/sshd.c.vendor openssh-4.7p1/sshd.c
--- openssh-4.7p1/sshd.c.vendor	2007-06-05 10:22:32.000000000 +0200
+++ openssh-4.7p1/sshd.c	2007-09-06 16:27:47.000000000 +0200
@@ -419,7 +419,8 @@ sshd_exchange_identification(int sock_in
 		major = PROTOCOL_MAJOR_1;
 		minor = PROTOCOL_MINOR_1;
 	}
-	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_VERSION);
+	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor,
+		 (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION);
 	server_version_string = xstrdup(buf);
 
 	/* Send our protocol version identification. */
@@ -1434,7 +1435,8 @@ main(int ac, char **av)
 		exit(1);
 	}
 
-	debug("sshd version %.100s", SSH_RELEASE);
+	debug("sshd version %.100s",
+	      (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE);
 
 	/* Store privilege separation user for later use if required. */
 	if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Dec 2006 13:42:47 -0000	1.19
+++ .cvsignore	6 Sep 2007 19:49:16 -0000	1.20
@@ -1 +1 @@
-openssh-4.5p1-noacss.tar.bz2
+openssh-4.7p1-noacss.tar.bz2


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openssh.spec	9 Aug 2007 18:33:41 -0000	1.112
+++ openssh.spec	6 Sep 2007 19:49:16 -0000	1.113
@@ -1,10 +1,5 @@
+# Do we want SELinux & Audit
 %define WITH_SELINUX 1
-%if %{WITH_SELINUX}
-# Audit patch applicable only over SELinux patch
-%define WITH_AUDIT 1
-%else
-%define WITH_AUDIT 0
-%endif
 
 # OpenSSH privilege separation requires a user & group ID
 %define sshd_uid    74
@@ -28,6 +23,9 @@
 # Do we want kerberos5 support (1=yes 0=no)
 %define kerberos5 1
 
+# Do we want libedit support
+%define libedit 1
+
 # Do we want NSS tokens support
 %define nss 1
 
@@ -59,42 +57,44 @@
 # Turn off some stuff for resuce builds
 %if %{rescue}
 %define kerberos5 0
+%define libedit 0
 %endif
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
-Version: 4.5p1
-Release: 8%{?dist}%{?rescue_rel}
+Version: 4.7p1
+Release: 1%{?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.sig
+#Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
 # This package differs from the upstream OpenSSH tarball in that
 # the ACSS cipher is removed by running openssh-nukeacss.sh in
 # the unpacked source directory.
 Source0: openssh-%{version}-noacss.tar.bz2
 Source1: openssh-nukeacss.sh
-Patch0: openssh-4.5p1-redhat.patch
+Patch0: openssh-4.7p1-redhat.patch
 Patch2: openssh-3.8.1p1-skip-initial.patch
 Patch3: openssh-3.8.1p1-krb5-config.patch
-Patch4: openssh-4.5p1-vendor.patch
+Patch4: openssh-4.7p1-vendor.patch
 Patch5: openssh-4.3p2-initscript.patch
-Patch12: openssh-4.5p1-selinux.patch
-Patch16: openssh-4.5p1-audit.patch
+Patch10: openssh-4.7p1-pam-session.patch
+Patch12: openssh-4.7p1-selinux.patch
+Patch13: openssh-4.7p1-mls.patch
+Patch16: openssh-4.7p1-audit.patch
+Patch17: openssh-4.3p2-cve-2007-3102.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
 Patch26: openssh-4.2p1-pam-no-stack.patch
-Patch27: openssh-3.9p1-log-in-chroot.patch
+Patch27: openssh-4.7p1-log-in-chroot.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
 Patch39: openssh-4.3p2-no-v6only.patch
 Patch44: openssh-4.3p2-allow-ip-opts.patch
-Patch48: openssh-4.3p2-pam-session.patch
 Patch49: openssh-4.3p2-gssapi-canohost.patch
-Patch50: openssh-4.5p1-mls.patch
-Patch51: openssh-4.5p1-nss-keys.patch
-Patch52: openssh-4.5p1-sftp-drain-acks.patch
+Patch51: openssh-4.7p1-nss-keys.patch
+Patch52: openssh-4.7p1-sftp-drain-acks.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +126,10 @@
 BuildRequires: krb5-devel
 %endif
 
+%if %{libedit}
+BuildRequires: libedit-devel
+%endif
+
 %if %{nss}
 BuildRequires: nss-devel
 %endif
@@ -133,9 +137,6 @@
 %if %{WITH_SELINUX}
 Requires: libselinux >= 1.27.7
 BuildRequires: libselinux-devel >= 1.27.7
-%endif
-
-%if %{WITH_AUDIT}
 Requires: audit-libs >= 1.0.8
 BuildRequires: audit-libs >= 1.0.8
 %endif
@@ -204,13 +205,14 @@
 %patch4 -p1 -b .vendor
 %patch5 -p1 -b .initscript
 
+%patch10 -p1 -b .pam-session
+
 %if %{WITH_SELINUX}
 #SELinux
 %patch12 -p1 -b .selinux
-%endif
-
-%if %{WITH_AUDIT}
+%patch13 -p1 -b .mls
 %patch16 -p1 -b .audit
+%patch17 -p1 -b .inject-fix
 %endif
 
 %patch22 -p1 -b .keep-above
@@ -223,9 +225,7 @@
 %patch38 -p1 -b .grab-info
 %patch39 -p1 -b .no-v6only
 %patch44 -p1 -b .ip-opts
-%patch48 -p1 -b .pam-sesssion
 %patch49 -p1 -b .canohost
-%patch50 -p1 -b .mls
 %patch51 -p1 -b .nss-keys
 %patch52 -p1 -b .drain-acks
 
@@ -282,15 +282,17 @@
 	--with-pam \
 %endif
 %if %{WITH_SELINUX}
-	--with-selinux \
-%endif
-%if %{WITH_AUDIT}
-	--with-linux-audit \
+	--with-selinux --with-linux-audit \
 %endif
 %if %{kerberos5}
-	--with-kerberos5${krb5_prefix:+=${krb5_prefix}}
+	--with-kerberos5${krb5_prefix:+=${krb5_prefix}} \
 %else
-	--without-kerberos5
+	--without-kerberos5 \
+%endif
+%if %{libedit}
+	--with-libedit
+%else
+	--without-libedit
 %endif
 
 %if %{static_libcrypto}
@@ -478,6 +480,11 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
+- upgrade to latest upstream
+- use libedit in sftp (#203009)
+- fixed audit log injection problem (CVE-2007-3102)
+
 * Thu Aug  9 2007 Tomas Mraz <tmraz at redhat.com> - 4.5p1-8
 - fix sftp client problems on write error (#247802)
 - allow disabling autocreation of server keys (#235466)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Dec 2006 13:42:47 -0000	1.19
+++ sources	6 Sep 2007 19:49:16 -0000	1.20
@@ -1 +1 @@
-9ef9bf019945105f2ac1760c95c9b339  openssh-4.5p1-noacss.tar.bz2
+21634329a8f1cd0e7a7974ade7280bdc  openssh-4.7p1-noacss.tar.bz2


--- openssh-3.9p1-log-in-chroot.patch DELETED ---


--- openssh-4.3p2-pam-session.patch DELETED ---


--- openssh-4.5p1-audit.patch DELETED ---


--- openssh-4.5p1-mls.patch DELETED ---


--- openssh-4.5p1-nss-keys.patch DELETED ---


--- openssh-4.5p1-redhat.patch DELETED ---


--- openssh-4.5p1-selinux.patch DELETED ---


--- openssh-4.5p1-sftp-drain-acks.patch DELETED ---


--- openssh-4.5p1-vendor.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:07 -0400
Subject: rpms/aspell-sk - New directory
Message-ID: <200709061950.l86Jo7i9008889@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk

Log Message:
Directory /cvs/extras/rpms/aspell-sk added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:11 -0400
Subject: rpms/aspell-sk/devel - New directory
Message-ID: <200709061950.l86JoB6A008905@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk/devel

Log Message:
Directory /cvs/extras/rpms/aspell-sk/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:15 -0400
Subject: rpms/aspell-sk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709061950.l86JoFEi008932@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk

Added Files:
	Makefile import.log 
Log Message:
Setup of module aspell-sk


--- NEW FILE Makefile ---
# Top level Makefile for module aspell-sk
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep  6 19:50:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 6 Sep 2007 15:50:17 -0400
Subject: rpms/aspell-sk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709061950.l86JoHl8008948@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspr8853/rpms/aspell-sk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aspell-sk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aspell-sk
# $Id: Makefile,v 1.1 2007/09/06 19:50:15 kevin Exp $
NAME := aspell-sk
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 fedora-extras-commits at redhat.com  Thu Sep  6 19:51:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 06 Sep 2007 12:51:33 -0700
Subject: [pkgdb] revisor (Fedora EPEL, 5) updated by kevin
Message-ID: <200709061951.l86JpXKW001287@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for revisor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on revisor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on revisor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on revisor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/revisor



From fedora-extras-commits at redhat.com  Thu Sep  6 19:56:10 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 6 Sep 2007 15:56:10 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.43, 1.44 sources, 1.44,
	1.45 sugar.spec, 1.52, 1.53
Message-ID: <200709061956.l86JuAd2009549@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9497

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Sep 2007 20:15:33 -0000	1.43
+++ .cvsignore	6 Sep 2007 19:55:37 -0000	1.44
@@ -1 +1 @@
-sugar-0.65-git0ad6398cf1.tar.bz2
+sugar-0.65-gitd9a30c23ff.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	4 Sep 2007 20:15:33 -0000	1.44
+++ sources	6 Sep 2007 19:55:37 -0000	1.45
@@ -1 +1 @@
-584319f7d8c0f95e44ccea0315528d4f  sugar-0.65-git0ad6398cf1.tar.bz2
+b363c82dcf6fcb7f2c64c71d8d739332  sugar-0.65-gitd9a30c23ff.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sugar.spec	4 Sep 2007 20:15:33 -0000	1.52
+++ sugar.spec	6 Sep 2007 19:55:37 -0000	1.53
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070904git
-%define commitid 0ad6398cf1
+%define alphatag 20070906git
+%define commitid d9a30c23ff
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.40.%{alphatag}0ad6398cf1
+Release: 0.41.%{alphatag}d9a30c23ff
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
+- New snapshot
+
 * Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.40.20070904git0ad6398cf1
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 19:58:55 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 6 Sep 2007 15:58:55 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sugar-artwork.spec, 1.23, 1.24
Message-ID: <200709061958.l86JwtMt009664@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9641

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Aug 2007 21:50:24 -0000	1.22
+++ .cvsignore	6 Sep 2007 19:58:23 -0000	1.23
@@ -1 +1 @@
-sugar-artwork-0.34-gitd2120f79b7.tar.bz2
+sugar-artwork-0.34-gitf89f6e00cc.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Aug 2007 21:50:24 -0000	1.22
+++ sources	6 Sep 2007 19:58:23 -0000	1.23
@@ -1 +1 @@
-d833f608800c2bb959596c44b8b312d6  sugar-artwork-0.34-gitd2120f79b7.tar.bz2
+c45cc536ac31f86a95377c1f93bb0a27  sugar-artwork-0.34-gitf89f6e00cc.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-artwork.spec	30 Aug 2007 21:50:24 -0000	1.23
+++ sugar-artwork.spec	6 Sep 2007 19:58:23 -0000	1.24
@@ -1,10 +1,10 @@
-%define alphatag 20070830git
-%define commitid d2120f79b7
+%define alphatag 20070906git
+%define commitid f89f6e00cc
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.23.%{alphatag}d2120f79b7
+Release: 0.24.%{alphatag}f89f6e00cc
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
+- New snapshot
+
 * Thu Aug 30 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.23.20070830gitd2120f79b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:07:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:07:18 -0400
Subject: rpms/krb5/F-7 kadmind.init,1.10,1.11
Message-ID: <200709062007.l86K7IRg015934@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15901

Modified Files:
	kadmind.init 
Log Message:
- fix incorrect call to "test" in the kadmin init script



Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/kadmind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadmind.init	27 Jun 2007 18:14:25 -0000	1.10
+++ kadmind.init	6 Sep 2007 20:06:44 -0000	1.11
@@ -32,7 +32,7 @@
   	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
 	    # Make an educated guess -- if they're using kldap somewhere,
 	    # then we don't know for sure that this is an error.
-  	    if [ ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ] ; then
+  	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
 	    fi
 	    exit 0



From fedora-extras-commits at redhat.com  Thu Sep  6 20:07:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:07:52 -0400
Subject: rpms/krb5/devel kadmind.init,1.10,1.11
Message-ID: <200709062007.l86K7qFv015988@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15931

Modified Files:
	kadmind.init 
Log Message:
- fix incorrect call to test in the kadmin init script


Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadmind.init	18 May 2007 22:16:16 -0000	1.10
+++ kadmind.init	6 Sep 2007 20:07:18 -0000	1.11
@@ -32,7 +32,7 @@
   	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
 	    # Make an educated guess -- if they're using kldap somewhere,
 	    # then we don't know for sure that this is an error.
-  	    if [ ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ] ; then
+  	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
 	    fi
 	    exit 0



From fedora-extras-commits at redhat.com  Thu Sep  6 20:08:18 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:08:18 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999-2.patch,NONE,1.1 krb5.spec,1.114,1.115
Message-ID: <200709062008.l86K8IL0016007@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15967

Modified Files:
	krb5.spec 
Added Files:
	CVE-2007-3999-2.patch 
Log Message:
- incorporate updated fix for CVE-2007-3999

CVE-2007-3999-2.patch:

--- NEW FILE CVE-2007-3999-2.patch ---
*** src/lib/rpc/svc_auth_gss.c	(revision 20474)
--- src/lib/rpc/svc_auth_gss.c	(local)
***************
*** 355,360 ****
--- 355,369 ----
  	memset(rpchdr, 0, sizeof(rpchdr));
  
  	/* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
+ 	oa = &msg->rm_call.cb_cred;
+ 	if (oa->oa_length > MAX_AUTH_BYTES)
+ 		return (FALSE);
+ 
+ 	/* 8 XDR units from the IXDR macro calls. */
+ 	if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT +
+ 			      RNDUP(oa->oa_length)))
+ 		return (FALSE);
+ 
  	buf = (int32_t *)(void *)rpchdr;
  	IXDR_PUT_LONG(buf, msg->rm_xid);
  	IXDR_PUT_ENUM(buf, msg->rm_direction);
***************
*** 362,368 ****
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
- 	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
  	if (oa->oa_length) {
--- 371,376 ----


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- krb5.spec	4 Sep 2007 18:10:20 -0000	1.114
+++ krb5.spec	6 Sep 2007 20:07:45 -0000	1.115
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -77,7 +77,7 @@
 Patch55: krb5-1.6.1-empty.patch
 Patch56: krb5-1.6.1-get_opt_fixup.patch
 Patch57: krb5-1.6.1-ftp-nospew.patch
-Patch58: CVE-2007-3999.patch
+Patch58: CVE-2007-3999-2.patch
 Patch59: CVE-2007-4000.patch
 
 Patch62: krb5-any-fixup-patch.txt
@@ -198,6 +198,10 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
+- incorporate updated fix for CVE-2007-3999
+- fix incorrect call to "test" in the kadmin init script
+
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
 
@@ -1147,7 +1151,7 @@
 #%patch55 -p1 -b .empty
 %patch56 -p0 -b .get_opt_fixup
 %patch57 -p1 -b .ftp-nospew
-%patch58 -p0 -b .2007-3999
+%patch58 -p0 -b .2007-3999-2
 %patch59 -p0 -b .2007-4000
 %patch70 -p0 -b .2007-004
 %patch71 -p0 -b .2007-005



From fedora-extras-commits at redhat.com  Thu Sep  6 20:08:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:08:52 -0400
Subject: rpms/krb5/devel krb5.spec,1.132,1.133
Message-ID: <200709062008.l86K8qN2016070@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16011

Modified Files:
	krb5.spec 
Log Message:
- incorporate updated fix for CVE-2007-3999


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- krb5.spec	4 Sep 2007 18:10:23 -0000	1.132
+++ krb5.spec	6 Sep 2007 20:08:19 -0000	1.133
@@ -84,7 +84,7 @@
 Patch57: krb5-1.6.2-login_chdir.patch
 Patch58: krb5-1.6.2-key_exp.patch
 Patch59: krb5-kpasswd_tcp.patch
-Patch65: CVE-2007-3999.patch
+Patch65: CVE-2007-3999-2.patch
 Patch66: CVE-2007-4000.patch
 
 Patch60: krb5-1.6.1-pam.patch
@@ -208,6 +208,10 @@
 %endif
 
 %changelog
+* Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
+- incorporate updated fix for CVE-2007-3999
+- fix incorrect call to "test" in the kadmin init script
+
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)
 
@@ -1213,7 +1217,7 @@
 %patch51 -p0 -b .ldap_init
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
-%patch64 -p0 -b .2007-3999
+%patch64 -p0 -b .2007-3999-2
 %patch65 -p0 -b .2007-4000
 #%patch55 -p1 -b .empty
 #%patch56 -p1 -b .doublelog



From fedora-extras-commits at redhat.com  Thu Sep  6 20:09:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:09:48 -0400
Subject: rpms/krb5/devel krb5.spec,1.133,1.134
Message-ID: <200709062009.l86K9mmZ016139@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16109

Modified Files:
	krb5.spec 
Log Message:
bump the revision


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- krb5.spec	6 Sep 2007 20:08:19 -0000	1.133
+++ krb5.spec	6 Sep 2007 20:09:14 -0000	1.134
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 5%{?dist}
+Release: 6%{?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 fedora-extras-commits at redhat.com  Thu Sep  6 20:11:25 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:11:25 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.23,1.24
Message-ID: <200709062011.l86KBPST016238@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16192

Modified Files:
	libXaw.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
- Move Xaw6 to a compat package, nothing in the distro needs it.



Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libXaw.spec	21 Aug 2007 20:11:15 -0000	1.23
+++ libXaw.spec	6 Sep 2007 20:10:52 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -26,6 +26,13 @@
 %description
 X.Org X11 libXaw runtime library
 
+%package compat
+Summary: X.Org X11 libXaw version 6 compatibility
+Group: System Environment/Libraries
+
+%description compat
+X.Org X11 libXaw version 6 compatibility
+
 %package devel
 Summary: X.Org X11 libXaw development package
 Group: Development/Libraries
@@ -45,14 +52,8 @@
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure --disable-xaw8 \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-xaw8 --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -72,13 +73,18 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/libXaw.so.6
 %{_libdir}/libXaw.so.7
-%{_libdir}/libXaw6.so.6
-%{_libdir}/libXaw6.so.6.0.1
 %{_libdir}/libXaw7.so.7
 %{_libdir}/libXaw7.so.7.0.0
 
+%files compat
+%defattr(-,root,root,-)
+%{_libdir}/libXaw.so.6
+%{_libdir}/libXaw6.so
+%{_libdir}/libXaw6.so.6
+%{_libdir}/libXaw6.so.6.0.1
+%{_libdir}/pkgconfig/xaw6.pc
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
@@ -87,13 +93,7 @@
 # FIXME:  Is this C file really supposed to be here?
 %{_includedir}/X11/Xaw/Template.c
 %{_libdir}/libXaw.so
-%if %{with_static}
-%{_libdir}/libXaw6.a
-%{_libdir}/libXaw7.a
-%endif
-%{_libdir}/libXaw6.so
 %{_libdir}/libXaw7.so
-%{_libdir}/pkgconfig/xaw6.pc
 %{_libdir}/pkgconfig/xaw7.pc
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
@@ -101,6 +101,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
+- Move Xaw6 to a compat package, nothing in the distro needs it.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-9
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:11:30 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:11:30 -0400
Subject: rpms/varnish/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 varnish.spec, 1.1, 1.2
Message-ID: <200709062011.l86KBUfT016274@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
Update to 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 May 2007 18:03:11 -0000	1.2
+++ .cvsignore	6 Sep 2007 20:10:56 -0000	1.3
@@ -1 +1 @@
-varnish-1.0.4.tar.gz
+varnish-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 May 2007 18:03:11 -0000	1.2
+++ sources	6 Sep 2007 20:10:56 -0000	1.3
@@ -1 +1 @@
-2a917e485700d44b28c0d0b626ea90d8  varnish-1.0.4.tar.gz
+fb4159a46a32b8c5bceca88f22e999a5  varnish-1.1.1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnish.spec	21 May 2007 18:03:11 -0000	1.1
+++ varnish.spec	6 Sep 2007 20:10:56 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -10,6 +10,7 @@
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -28,40 +29,51 @@
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
 #Requires: ncurses
+#Obsoletes: libvarnish1
 
 %description libs
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
-#
-#%description devel
-#Development libraries for %{name}.
-#Varnish is a high-performance HTTP accelerator
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
+
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
 
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
+#./autogen.sh
+
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
-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;
+        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
 sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
 
+
+%if "%dist" == "el4"
+    sed -i 's,daemon --pidfile \${\?PIDFILE}\?,daemon,g;
+            s,status -p \$PIDFILE,status,g;
+            s,killproc -p \$PIDFILE,killproc,g' \
+    redhat/varnish.initrc redhat/varnishlog.initrc
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -69,8 +81,8 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
@@ -105,12 +117,30 @@
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
+%{_libdir}/libvcl.so
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+%doc LICENSE
+
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+    -c "Varnish http accelerator user" varnish
+exit 0
 
 %post
 /sbin/chkconfig --add varnish
@@ -135,9 +165,23 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
+- Bumped the version number to 1.1.1.
+* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
+- Update for 1.1 branch
+- Added the devel package for the header files and static library files
+- Added a varnish user, and fixed the init script accordingly
+
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at linpro.no> - 1.1-1
+- Bump Version and Release for 1.1
+
+* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
+- Fixed initrc-script bug only visible on el4 (fixes #107)
+
 * Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
 - Repack from unchanged 1.0.4 tarball
 - Final review request and CVS request for Fedora Extras
+- Repack with extra obsoletes for upgrading from older sf.net package
 
 * Fri May 18 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.0.4-1
 - Bump Version and Release for 1.0.4



From fedora-extras-commits at redhat.com  Thu Sep  6 20:14:06 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Thu, 06 Sep 2007 13:14:06 -0700
Subject: [pkgdb] redhat-rpm-config: ajax has requested watchcommits
Message-ID: <200709062014.l86KEARM001609@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on redhat-rpm-config (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redhat-rpm-config



From fedora-extras-commits at redhat.com  Thu Sep  6 20:18:26 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:18:26 -0400
Subject: rpms/varnish/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 varnish.spec,
	1.1, 1.2
Message-ID: <200709062018.l86KIQl3016532@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16503

Modified Files:
	.cvsignore sources varnish.spec 
Log Message:
Update to 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jun 2007 18:48:43 -0000	1.2
+++ .cvsignore	6 Sep 2007 20:17:54 -0000	1.3
@@ -1 +1 @@
-varnish-1.0.4.tar.gz
+varnish-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jun 2007 18:48:43 -0000	1.2
+++ sources	6 Sep 2007 20:17:54 -0000	1.3
@@ -1 +1 @@
-2a917e485700d44b28c0d0b626ea90d8  varnish-1.0.4.tar.gz
+fb4159a46a32b8c5bceca88f22e999a5  varnish-1.1.1.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnish.spec	4 Jun 2007 18:54:10 -0000	1.1
+++ varnish.spec	6 Sep 2007 20:17:54 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -10,6 +10,7 @@
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
 Requires: logrotate
+Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -28,40 +29,51 @@
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
 #Requires: ncurses
+#Obsoletes: libvarnish1
 
 %description libs
 Libraries for %{name}.
 Varnish is a high-performance HTTP accelerator.
 
-## Removed the -devel package for now
-#%package devel
-#Summary: Development libraries for %{name}
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: kernel >= 2.6.0  varnish-libs = %{version}-%{release}
-#
-#%description devel
-#Development libraries for %{name}.
-#Varnish is a high-performance HTTP accelerator
+%package libs-devel
+Summary: Development files for %{name}-libs
+Group: System Environment/Libraries
+BuildRequires: ncurses-devel
+Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
+
+%description libs-devel
+Development files for %{name}-libs
+Varnish is a high-performance HTTP accelerator
 
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
+#./autogen.sh
+
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# (ie for the devel package)
-%configure --disable-static
+%configure --disable-static --localstatedir=/var/lib
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
-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;
+        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
 sed -e ' s/8080/80/g ' etc/default.vcl > redhat/default.vcl
 
+
+%if "%dist" == "el4"
+    sed -i 's,daemon --pidfile \${\?PIDFILE}\?,daemon,g;
+            s,status -p \$PIDFILE,status,g;
+            s,killproc -p \$PIDFILE,killproc,g' \
+    redhat/varnish.initrc redhat/varnishlog.initrc
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -69,8 +81,8 @@
 # None of these for fedora
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
-# Remove this line to build the devel package
-find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
+# Remove this line to build a devel package with symlinks
+#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
 
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
@@ -105,12 +117,30 @@
 %{_libdir}/*.so.*
 %doc LICENSE
 
-## Removed the -devel package for now
-#%files devel
-#%defattr(-,root,root,-)
-#%{_libdir}/libvarnish.so
-#%{_libdir}/libvarnishapi.so
-#%{_libdir}/libvcl.so
+%files libs-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvarnish.so
+%{_libdir}/libvarnishapi.so
+%{_libdir}/libvarnishcompat.so
+%{_libdir}/libvcl.so
+%{_includedir}/varnish/shmlog.h
+%{_includedir}/varnish/shmlog_tags.h
+%{_includedir}/varnish/stat_field.h
+%{_includedir}/varnish/stats.h
+%{_includedir}/varnish/varnishapi.h
+%{_libdir}/pkgconfig/varnishapi.pc
+#%{_libdir}/libvarnish.a
+#%{_libdir}/libvarnishapi.a
+#%{_libdir}/libvarnishcompat.a
+#%{_libdir}/libvcl.a
+%doc LICENSE
+
+%pre
+getent group varnish >/dev/null || groupadd -r varnish
+getent passwd varnish >/dev/null || \
+useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
+    -c "Varnish http accelerator user" varnish
+exit 0
 
 %post
 /sbin/chkconfig --add varnish
@@ -135,9 +165,23 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
+- Bumped the version number to 1.1.1.
+* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
+- Update for 1.1 branch
+- Added the devel package for the header files and static library files
+- Added a varnish user, and fixed the init script accordingly
+
+* Thu Jul 05 2007 Dag-Erling Sm??rgrav <des at linpro.no> - 1.1-1
+- Bump Version and Release for 1.1
+
+* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
+- Fixed initrc-script bug only visible on el4 (fixes #107)
+
 * Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
 - Repack from unchanged 1.0.4 tarball
 - Final review request and CVS request for Fedora Extras
+- Repack with extra obsoletes for upgrading from older sf.net package
 
 * Fri May 18 2007 Dag-Erling Sm??rgrav <des at des.no> - 1.0.4-1
 - Bump Version and Release for 1.0.4



From fedora-extras-commits at redhat.com  Thu Sep  6 20:20:58 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 16:20:58 -0400
Subject: rpms/krb5/devel CVE-2007-3999-2.patch,NONE,1.1
Message-ID: <200709062020.l86KKw6X016675@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16656

Added Files:
	CVE-2007-3999-2.patch 
Log Message:
- incorporate updated fix for CVE-2007-3999


CVE-2007-3999-2.patch:

--- NEW FILE CVE-2007-3999-2.patch ---
*** src/lib/rpc/svc_auth_gss.c	(revision 20474)
--- src/lib/rpc/svc_auth_gss.c	(local)
***************
*** 355,360 ****
--- 355,369 ----
  	memset(rpchdr, 0, sizeof(rpchdr));
  
  	/* XXX - Reconstruct RPC header for signing (from xdr_callmsg). */
+ 	oa = &msg->rm_call.cb_cred;
+ 	if (oa->oa_length > MAX_AUTH_BYTES)
+ 		return (FALSE);
+ 
+ 	/* 8 XDR units from the IXDR macro calls. */
+ 	if (sizeof(rpchdr) < (8 * BYTES_PER_XDR_UNIT +
+ 			      RNDUP(oa->oa_length)))
+ 		return (FALSE);
+ 
  	buf = (int32_t *)(void *)rpchdr;
  	IXDR_PUT_LONG(buf, msg->rm_xid);
  	IXDR_PUT_ENUM(buf, msg->rm_direction);
***************
*** 362,368 ****
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_prog);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_vers);
  	IXDR_PUT_LONG(buf, msg->rm_call.cb_proc);
- 	oa = &msg->rm_call.cb_cred;
  	IXDR_PUT_ENUM(buf, oa->oa_flavor);
  	IXDR_PUT_LONG(buf, oa->oa_length);
  	if (oa->oa_length) {
--- 371,376 ----



From fedora-extras-commits at redhat.com  Thu Sep  6 20:24:14 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:24:14 -0400
Subject: rpms/varnish/F-7 varnish.spec,1.2,1.3
Message-ID: <200709062024.l86KOEKd016846@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16807

Modified Files:
	varnish.spec 
Log Message:
1.1.1-2: Removed autogen call (only diff from relase tarball)


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- varnish.spec	6 Sep 2007 20:17:54 -0000	1.2
+++ varnish.spec	6 Sep 2007 20:23:42 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -165,8 +165,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
+- Removed autogen call (only diff from relase tarball)
+
 * Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
 - Bumped the version number to 1.1.1.
+
 * Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
 - Update for 1.1 branch
 - Added the devel package for the header files and static library files



From fedora-extras-commits at redhat.com  Thu Sep  6 20:25:04 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:25:04 -0400
Subject: rpms/tomcat-native/devel tomcat-native.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062025.l86KP4lJ016891@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tomcat-native.spec 
Log Message:
Initial import (#273761)


--- NEW FILE tomcat-native.spec ---
Name:           tomcat-native
Version:        1.1.10
Release:        0.2%{?dist}
Summary:        Tomcat native library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://tomcat.apache.org/tomcat-6.0-doc/apr.html
Source0:        http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel
BuildRequires:  jpackage-utils
BuildRequires:  apr-devel >= 1.2.1
BuildRequires:  openssl-devel
# Upstream compatibility:
Provides:       tcnative = %{version}-%{release}

%description
Tomcat can use the Apache Portable Runtime to provide superior
scalability, performance, and better integration with native server
technologies.  The Apache Portable Runtime is a highly portable library
that is at the heart of Apache HTTP Server 2.x.  APR has many uses,
including access to advanced IO functionality (such as sendfile, epoll
and OpenSSL), OS level functionality (random number generation, system
status, etc), and native process handling (shared memory, NT pipes and
Unix sockets).  This package contains the Tomcat native library which
provides support for using APR in Tomcat.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd jni/native
%configure \
    --with-apr=%{_bindir}/apr-1-config \
    --with-java-home=%{java_home} \
    --with-java-platform=2
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make -C jni/native install DESTDIR=$RPM_BUILD_ROOT
# Perhaps a devel package sometime?  Not for now; no headers are installed.
rm -f $RPM_BUILD_ROOT%{_libdir}/libtcnative*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE.txt
# Note: unversioned *.so needed here :(
%{_libdir}/libtcnative*.so*


%changelog
* Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
- License: ASL 2.0.

* Mon Apr 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.1
- 1.1.10.

* Tue Apr  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9-0.1
- 1.1.9.

* Sat Jan  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-0.1
- 1.1.8.

* Tue Dec 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-0.1
- 1.1.7.

* Mon Nov 13 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-0.1
- 1.1.6.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.4-0.1
- 1.1.4, specfile cleanup.

* Wed Jun 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.3-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:40:40 -0000	1.1
+++ .cvsignore	6 Sep 2007 20:24:32 -0000	1.2
@@ -0,0 +1 @@
+tomcat-native-1.1.10-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:40:40 -0000	1.1
+++ sources	6 Sep 2007 20:24:32 -0000	1.2
@@ -0,0 +1 @@
+8d2eaef338a1a02f3d929a575d5e1453  tomcat-native-1.1.10-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:26:38 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:26:38 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.87, 1.88 hwdata.spec, 1.92,
	1.93 sources, 1.90, 1.91
Message-ID: <200709062026.l86KQcTr017022@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/hwdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16990/devel

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.207-1
- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite
  so dumb.  90kHz hsync is way out of range for any common single-link DVI
  panel, for example. (#247271)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	12 Jul 2007 10:57:02 -0000	1.87
+++ .cvsignore	6 Sep 2007 20:26:06 -0000	1.88
@@ -1 +1 @@
-hwdata-0.206.tar.gz
+hwdata-0.207.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- hwdata.spec	12 Jul 2007 10:57:02 -0000	1.92
+++ hwdata.spec	6 Sep 2007 20:26:06 -0000	1.93
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.206
+Version: 0.207
 Release: 1%{?dist}
 License: GPL/MIT
 Group: System Environment/Base
@@ -35,6 +35,11 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.207-1
+- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite
+  so dumb.  90kHz hsync is way out of range for any common single-link DVI
+  panel, for example. (#247271)
+
 * Thu Jul 12 2007 Karsten Hopp <karsten at redhat.com> 0.206-1
 - build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwdata/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	12 Jul 2007 10:57:02 -0000	1.90
+++ sources	6 Sep 2007 20:26:06 -0000	1.91
@@ -1 +1 @@
-bbf951781b3ef98ea0bd594fcc95ee89  hwdata-0.206.tar.gz
+0dee4e77c08ce7f14b53fe3732418c9e  hwdata-0.207.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:27:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:27:29 -0400
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.1,1.2
Message-ID: <200709062027.l86KRTjo017094@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17068

Modified Files:
	tomcat-native.spec 
Log Message:
* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
- First Fedora build.



Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-native.spec	6 Sep 2007 20:24:32 -0000	1.1
+++ tomcat-native.spec	6 Sep 2007 20:26:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.10
-Release:        0.2%{?dist}
+Release:        1%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -61,11 +61,14 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE.txt
-# Note: unversioned *.so needed here :(
+# Note: unversioned *.so needed here due to how Tomcat loads the lib :(
 %{_libdir}/libtcnative*.so*
 
 
 %changelog
+* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
+- First Fedora build.
+
 * Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
 - License: ASL 2.0.
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:08 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Thu, 6 Sep 2007 16:29:08 -0400
Subject: rpms/varnish/devel varnish.spec,1.2,1.3
Message-ID: <200709062029.l86KT8Yl017271@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17206

Modified Files:
	varnish.spec 
Log Message:
1.1.1-2: Removed autogen call (only diff from relase tarball)


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- varnish.spec	6 Sep 2007 20:10:56 -0000	1.2
+++ varnish.spec	6 Sep 2007 20:28:35 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -165,8 +165,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
+- Removed autogen call (only diff from relase tarball)
+
 * Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
 - Bumped the version number to 1.1.1.
+
 * Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
 - Update for 1.1 branch
 - Added the devel package for the header files and static library files



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:08 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:08 -0700
Subject: [pkgdb] libassuan: nalin has requested watchcommits
Message-ID: <200709062029.l86KT8AX001738@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchcommits acl on libassuan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libassuan



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:16 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:16 -0700
Subject: [pkgdb] gpa: nalin has requested watchbugzilla
Message-ID: <200709062029.l86KTHlw001748@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchbugzilla acl on gpa (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpa



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:27 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:27 -0700
Subject: [pkgdb] gnupg2: nalin has requested watchbugzilla
Message-ID: <200709062029.l86KTRBX001757@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchbugzilla acl on gnupg2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg2



From fedora-extras-commits at redhat.com  Thu Sep  6 20:29:28 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 06 Sep 2007 13:29:28 -0700
Subject: [pkgdb] gnupg2: nalin has requested watchcommits
Message-ID: <200709062029.l86KTTmb001767@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has requested the watchcommits acl on gnupg2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg2



From fedora-extras-commits at redhat.com  Thu Sep  6 20:34:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 6 Sep 2007 16:34:19 -0400
Subject: rpms/tomcat-native/EL-5 tomcat-native.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062034.l86KYJMC017382@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tomcat-native/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359

Modified Files:
	.cvsignore sources 
Added Files:
	tomcat-native.spec 
Log Message:
First EPEL import (#273761)


--- NEW FILE tomcat-native.spec ---
Name:           tomcat-native
Version:        1.1.10
Release:        1%{?dist}
Summary:        Tomcat native library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://tomcat.apache.org/tomcat-6.0-doc/apr.html
Source0:        http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel
BuildRequires:  jpackage-utils
BuildRequires:  apr-devel >= 1.2.1
BuildRequires:  openssl-devel
# Upstream compatibility:
Provides:       tcnative = %{version}-%{release}

%description
Tomcat can use the Apache Portable Runtime to provide superior
scalability, performance, and better integration with native server
technologies.  The Apache Portable Runtime is a highly portable library
that is at the heart of Apache HTTP Server 2.x.  APR has many uses,
including access to advanced IO functionality (such as sendfile, epoll
and OpenSSL), OS level functionality (random number generation, system
status, etc), and native process handling (shared memory, NT pipes and
Unix sockets).  This package contains the Tomcat native library which
provides support for using APR in Tomcat.


%prep
%setup -q -n %{name}-%{version}-src


%build
cd jni/native
%configure \
    --with-apr=%{_bindir}/apr-1-config \
    --with-java-home=%{java_home} \
    --with-java-platform=2
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make -C jni/native install DESTDIR=$RPM_BUILD_ROOT
# Perhaps a devel package sometime?  Not for now; no headers are installed.
rm -f $RPM_BUILD_ROOT%{_libdir}/libtcnative*.*a
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE.txt
# Note: unversioned *.so needed here due to how Tomcat loads the lib :(
%{_libdir}/libtcnative*.so*


%changelog
* Thu Sep  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-1
- First Fedora build.

* Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.2
- License: ASL 2.0.

* Mon Apr 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.10-0.1
- 1.1.10.

* Tue Apr  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.9-0.1
- 1.1.9.

* Sat Jan  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-0.1
- 1.1.8.

* Tue Dec 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-0.1
- 1.1.7.

* Mon Nov 13 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-0.1
- 1.1.6.

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.4-0.1
- 1.1.4, specfile cleanup.

* Wed Jun 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.3-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:40:40 -0000	1.1
+++ .cvsignore	6 Sep 2007 20:33:46 -0000	1.2
@@ -0,0 +1 @@
+tomcat-native-1.1.10-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:40:40 -0000	1.1
+++ sources	6 Sep 2007 20:33:46 -0000	1.2
@@ -0,0 +1 @@
+8d2eaef338a1a02f3d929a575d5e1453  tomcat-native-1.1.10-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 20:36:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:36:59 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.14,1.15
Message-ID: <200709062036.l86Kaxt9017542@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-cyrix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17509

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.0-5
- Fix license.  Disown the module and driver directories. (#226585)



Index: xorg-x11-drv-cyrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cyrix/devel/xorg-x11-drv-cyrix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-cyrix.spec	21 Aug 2007 19:11:28 -0000	1.14
+++ xorg-x11-drv-cyrix.spec	6 Sep 2007 20:36:26 -0000	1.15
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,14 +50,15 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/cyrix_drv.so
 %{_datadir}/hwdata/videoaliases/cyrix.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/cyrix.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.0-5
+- Fix license.  Disown the module and driver directories. (#226585)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-4
 - Rebuild for build id
 
@@ -90,7 +91,7 @@
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
-- Set "ExclusiveArch: %{ix86}"
+- Set "ExclusiveArch: %%{ix86}"
 
 * Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
 - Initial spec file for cyrix video driver generated automatically



From fedora-extras-commits at redhat.com  Thu Sep  6 20:40:02 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:40:02 -0400
Subject: rpms/xorg-x11-drv-neomagic/devel xorg-x11-drv-neomagic.spec, 1.12, 
	1.13
Message-ID: <200709062040.l86Ke29V017676@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655

Modified Files:
	xorg-x11-drv-neomagic.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.1-4
- Fix license.  Disown the module and driver dirs. (#226610)



Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-neomagic.spec	21 Aug 2007 19:21:34 -0000	1.12
+++ xorg-x11-drv-neomagic.spec	6 Sep 2007 20:39:29 -0000	1.13
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.1.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,18 +50,18 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/neomagic_drv.so
 %{_datadir}/hwdata/videoaliases/neomagic.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.1.1-4
+- Fix license.  Disown the module and driver dirs. (#226610)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.1-3
 - Rebuild for build id
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.1.1-2.1
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2



From fedora-extras-commits at redhat.com  Thu Sep  6 20:41:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 06 Sep 2007 13:41:27 -0700
Subject: [pkgdb] gpa had acl change status
Message-ID: <200709062041.l86KfRHf001853@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on gpa (Fedora devel) to Approved for Nalin Somabhai Dahyabhai (nalin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpa



From fedora-extras-commits at redhat.com  Thu Sep  6 20:41:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:41:43 -0400
Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.16,1.17
Message-ID: <200709062041.l86Kfhig017779@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17760

Modified Files:
	xorg-x11-drv-nsc.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 2.8.1-4
- Fix license.  Disown the module and driver dirs. (#226611)



Index: xorg-x11-drv-nsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nsc.spec	24 Jan 2007 21:13:38 -0000	1.16
+++ xorg-x11-drv-nsc.spec	6 Sep 2007 20:41:10 -0000	1.17
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
 Version:   2.8.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,14 +58,14 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/nsc_drv.so
 %{_datadir}/hwdata/videoaliases/nsc.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 2.8.1-4
+- Fix license.  Disown the module and driver dirs. (#226611)
+
 * Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 2.8.1-2
 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for
   selinux conformance.  (#220749)



From fedora-extras-commits at redhat.com  Thu Sep  6 20:42:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 06 Sep 2007 13:42:56 -0700
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <200709062042.l86KgvaY001888@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on gnupg2 (Fedora devel) to Approved for Nalin Somabhai Dahyabhai (nalin)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg2



From fedora-extras-commits at redhat.com  Thu Sep  6 20:44:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:44:08 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.19,1.20
Message-ID: <200709062044.l86Ki8lj017853@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.8.1-9
- Disown the manual directory. (#226622)



Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-sisusb.spec	23 Aug 2007 20:31:16 -0000	1.19
+++ xorg-x11-drv-sisusb.spec	6 Sep 2007 20:43:35 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version:   0.8.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -49,10 +49,12 @@
 %files
 %defattr(-,root,root,-)
 %{driverdir}/sisusb_drv.so
-%dir %{_mandir}
 %{_mandir}/man4/*.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.8.1-9
+- Disown the manual directory. (#226622)
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.8.1-8
 - sisusb-0.8.1-open-is-not-fopen.patch: Despite the similarity, you can not
   pass character literals to open that match the string literals you'd pass



From fedora-extras-commits at redhat.com  Thu Sep  6 20:48:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:48:00 -0400
Subject: rpms/xorg-x11-drv-vga/devel xorg-x11-drv-vga.spec,1.15,1.16
Message-ID: <200709062048.l86Km0LO017951@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17933

Modified Files:
	xorg-x11-drv-vga.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 4.1.0-5
- Fix license.  Disown the module and driver dirs. (#226632)



Index: xorg-x11-drv-vga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vga/devel/xorg-x11-drv-vga.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-vga.spec	21 Aug 2007 19:23:21 -0000	1.15
+++ xorg-x11-drv-vga.spec	6 Sep 2007 20:47:28 -0000	1.16
@@ -7,9 +7,9 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,8 +41,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-# FIXME: Remove all libtool archives (*.la) from modules directory.  This
-# should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
@@ -50,14 +48,14 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/vga_drv.so
 %{_datadir}/hwdata/videoaliases/vga.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 4.1.0-5
+- Fix license.  Disown the module and driver dirs. (#226632)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 4.1.0-4
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep  6 20:56:50 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 16:56:50 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.155, 1.156 kudzu.spec, 1.176,
	1.177 sources, 1.174, 1.175
Message-ID: <200709062056.l86Kuo4a018138@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18112/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
- Add pcidom to the exported slot list of pciDevice.
- Add clog target to Makefile.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	23 Aug 2007 15:09:29 -0000	1.155
+++ .cvsignore	6 Sep 2007 20:56:17 -0000	1.156
@@ -1 +1 @@
-kudzu-1.2.74.tar.gz
+kudzu-1.2.75.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kudzu.spec	23 Aug 2007 15:09:29 -0000	1.176
+++ kudzu.spec	6 Sep 2007 20:56:17 -0000	1.177
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.74
+Version: 1.2.75
 Release: 1
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
@@ -72,6 +72,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
+- Add pcidom to the exported slot list of pciDevice.
+- Add clog target to Makefile.
+
 * Thu Aug 23 2007 Jeremy Katz <katzj at redhat.com> - 1.2.74-1
 - fix module names for new firewire stack changing (#231708)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- sources	23 Aug 2007 15:09:29 -0000	1.174
+++ sources	6 Sep 2007 20:56:17 -0000	1.175
@@ -1 +1 @@
-07c14196f3ffd5f1484e0c464dd77cbd  kudzu-1.2.74.tar.gz
+1ca8fbb5ac6c829978501cd8a7aa3ad0  kudzu-1.2.75.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:00:40 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:00:40 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.49, 1.50 rhpxl.spec, 1.60,
	1.61 sources, 1.56, 1.57
Message-ID: <200709062100.l86L0ePI018212@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18190

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.49-1
- rhpxl 0.49.  Fixes domainful PPC machines, and avoids probing for serial
  mice since they make USB devices go boom.
- Fix License.
- Update URL to point to the new home.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	4 May 2007 14:25:22 -0000	1.49
+++ .cvsignore	6 Sep 2007 21:00:08 -0000	1.50
@@ -1 +1 @@
-rhpxl-0.47.tar.gz
+rhpxl-0.49.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- rhpxl.spec	24 Aug 2007 12:14:13 -0000	1.60
+++ rhpxl.spec	6 Sep 2007 21:00:08 -0000	1.61
@@ -3,20 +3,16 @@
 Summary: Python library for configuring and running X
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
-Version: 0.47
-Release: 3%{?dist}
-# This is a Red Hat maintained package which is specific to
-# our distribution.  Thus the source is only available from
-# within this srpm.
-Source0: %{name}-%{version}.tar.gz
-License: GPL
+Version: 0.49
+Release: 1%{?dist}
+Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
+License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, gettext, libXrandr-devel, libX11-devel
 ExcludeArch: s390 s390x
-Requires: python, rhpl, kudzu >= 1.2.0, newt, hwdata >= 0.169
+Requires: python, rhpl, kudzu >= 1.2.75, newt, hwdata >= 0.169
 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.0.1-6
-Conflicts: libXfont < 0.99.2-2
 
 %description
 The rhpxl (pronounced 'rapunzel') package contains a Python library for
@@ -45,6 +41,12 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.49-1
+- rhpxl 0.49.  Fixes domainful PPC machines, and avoids probing for serial
+  mice since they make USB devices go boom.
+- Fix License.
+- Update URL to point to the new home.
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.47-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	13 Jun 2007 14:33:15 -0000	1.56
+++ sources	6 Sep 2007 21:00:08 -0000	1.57
@@ -1 +1 @@
-d77d07a38b72db1df9dd909f3bc5faff  rhpxl-0.47.tar.gz
+ad8a3151b455d435c4928611f421fc0a  rhpxl-0.49.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:02:12 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 17:02:12 -0400
Subject: rpms/krb5/F-7 CVE-2007-3999.patch,1.1,NONE
Message-ID: <200709062102.l86L2CGw024179@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24170

Removed Files:
	CVE-2007-3999.patch 
Log Message:
- bye-bye obsolete patch



--- CVE-2007-3999.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 21:03:04 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 6 Sep 2007 17:03:04 -0400
Subject: rpms/krb5/devel CVE-2007-3999.patch,1.1,NONE
Message-ID: <200709062103.l86L34mf024265@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24258

Removed Files:
	CVE-2007-3999.patch 
Log Message:
bye-bye obsolete patch


--- CVE-2007-3999.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 21:07:53 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:07:53 -0400
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.24,1.25
Message-ID: <200709062107.l86L7rhU024387@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-via/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24369

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
- Explain why there's no ldconfig for the xvmc drivers. (#226633)



Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-via.spec	24 Aug 2007 12:06:50 -0000	1.24
+++ xorg-x11-drv-via.spec	6 Sep 2007 21:07:20 -0000	1.25
@@ -4,16 +4,10 @@
 
 %define with_xvmc 1
 
-%ifarch %{ix86} x86_64
-%define with_dri 1
-%else
-%define with_dri 0
-%endif
-
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -28,9 +22,7 @@
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
-%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
-%endif
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
@@ -51,12 +43,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static \
-%if %{with_dri}
-           --enable-dri
-%else
-           --disable-dri
-%endif
+%configure --disable-static --enable-dri
 
 make
 
@@ -68,13 +55,15 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-# FIXME: Remove all libtool archives (*.la) from modules directory.  This
-# should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# There's no %post ldconfig for these, because even though they're DSOs,
+# they're not meant to ever be linked against.  They're dlopen'd by
+# libXvMC.so itself.
+
 %files
 %defattr(-,root,root,-)
 %{driverdir}/via_drv.so
@@ -95,6 +84,9 @@
 %endif
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
+- Explain why there's no ldconfig for the xvmc drivers. (#226633)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.2.2-3
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:14:20 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Thu, 6 Sep 2007 17:14:20 -0400
Subject: rpms/gq/F-7 gq.spec,1.4,1.5
Message-ID: <200709062114.l86LEKaU024554@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24530

Modified Files:
	gq.spec 
Log Message:
- Add default-codeset to configure




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/F-7/gq.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gq.spec	21 Aug 2007 16:58:44 -0000	1.4
+++ gq.spec	6 Sep 2007 21:13:48 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:21:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:21:33 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.5,1.6
Message-ID: <200709062121.l86LLXLd024722@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683

Modified Files:
	online-desktop.spec 
Log Message:
* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
- new upstream



Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- online-desktop.spec	27 Aug 2007 18:48:12 -0000	1.5
+++ online-desktop.spec	6 Sep 2007 21:21:01 -0000	1.6
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://developer.mugshot.org/
-#X-SCM:         scm:svn:http://svn.mugshot.org/svn/online-desktop/trunk
+#X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -91,10 +91,13 @@
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
+%{_datadir}/gnome/*.session
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
+%dir %{python_sitelib}/ddm
+%{python_sitelib}/ddm/*
 %doc COPYING README
 
 %files flickr
@@ -176,6 +179,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.2.9-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:22:33 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Thu, 6 Sep 2007 17:22:33 -0400
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.2,
	1.3 setroubleshoot-plugins.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709062122.l86LMXmR024768@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24734/devel

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
update to upstream 1.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2007 17:26:59 -0000	1.2
+++ .cvsignore	6 Sep 2007 21:21:59 -0000	1.3
@@ -1 +1 @@
-setroubleshoot-plugins-1.10.0.tar.gz
+setroubleshoot-plugins-1.10.2.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setroubleshoot-plugins.spec	23 Aug 2007 17:26:59 -0000	1.1
+++ setroubleshoot-plugins.spec	6 Sep 2007 21:21:59 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 1.10.0
+Version: 1.10.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -9,7 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: python
+BuildRequires: perl-XML-Parser
+BuildRequires: intltool gettext python
 Requires: dbus
 
 %define pkgdocdir %{_datadir}/doc/%{name}-%{version}
@@ -49,6 +50,12 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Sep  6 2007 Dan Walsh <dwalsh at redhat.com> - 1.10.2-1
+	- Change priority on use_nfs_home_dir to 55
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
+	- add BuildRequires perl-XML-Parser
+
 * Fri Jul 20 2007 John Dennis <jdennis at redhat.com> - 1.10.0-1
         - move all plugins and their translations from setroubleshoot-server
           package to this new independent package to allow easier updating


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2007 17:26:59 -0000	1.2
+++ sources	6 Sep 2007 21:21:59 -0000	1.3
@@ -1 +1 @@
-811a719a5207830a47f0a87439fbccd5  setroubleshoot-plugins-1.10.0.tar.gz
+acb5d5e49bbf237916ade9e2f9c91373  setroubleshoot-plugins-1.10.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:26:06 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 6 Sep 2007 17:26:06 -0400
Subject: rpms/xorg-x11-server/devel
	xserver-1.3.0-xrandr-timestamp-buglet.patch, NONE,
	1.1 xorg-x11-server.spec, 1.248, 1.249
Message-ID: <200709062126.l86LQ6rW024933@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24877

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-xrandr-timestamp-buglet.patch 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
- xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
  stop working after several hours. (Marius Gedminas, #273801)


xserver-1.3.0-xrandr-timestamp-buglet.patch:

--- NEW FILE xserver-1.3.0-xrandr-timestamp-buglet.patch ---
--- a/randr/rrscreen.c.orig	2006-07-05 21:31:44.000000000 +0300
+++ b/randr/rrscreen.c	2007-02-03 00:00:10.000000000 +0200
@@ -723,7 +723,6 @@
     pScrPriv = rrGetScrPriv(pScreen);
     
     time = ClientTimeToServerTime(stuff->timestamp);
-    configTime = ClientTimeToServerTime(stuff->configTimestamp);
     
     oldWidth = pScreen->width;
     oldHeight = pScreen->height;
@@ -738,11 +737,15 @@
 	return BadAlloc;
     
     /*
-     * if the client's config timestamp is not the same as the last config
+     * If the client's config timestamp is not the same as the last config
      * timestamp, then the config information isn't up-to-date and
-     * can't even be validated
+     * can't even be validated.
+     *
+     * Note that the client only knows about the milliseconds part of the
+     * timestamp, so using CompareTimeStamps here would cause randr to suddenly
+     * stop working after several hours have passed (freedesktop bug #6502).
      */
-    if (CompareTimeStamps (configTime, pScrPriv->lastConfigTime) != 0)
+    if (stuff->configTimestamp != pScrPriv->lastConfigTime.milliseconds)
     {
 	rep.status = RRSetConfigInvalidConfigTime;
 	goto sendReply;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- xorg-x11-server.spec	24 Aug 2007 21:52:40 -0000	1.248
+++ xorg-x11-server.spec	6 Sep 2007 21:25:33 -0000	1.249
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   22%{?dist}
+Release:   23%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 Patch22:   xserver-1.3.0-fbdevhw-magic-numbers.patch
 Patch23:   xserver-1.3.0-ramdac-export.patch
 Patch24:   xserver-1.3.0-reput-video.patch
+Patch25:   xserver-1.3.0-xrandr-timestamp-buglet.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -296,6 +297,7 @@
 %patch22 -p1 -b .magic-numbers
 %patch23 -p1 -b .ramdac
 %patch24 -p1 -b .reput
+%patch25 -p1 -b .xrandr-timestamp
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -606,6 +608,10 @@
 
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
+- xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
+  stop working after several hours. (Marius Gedminas, #273801)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-22
 - Bump BuildRequires: xorg-x11-xtrans-devel to pull in abstract socket
   support.



From fedora-extras-commits at redhat.com  Thu Sep  6 21:28:18 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  6 Sep 2007 17:28:18 -0400
Subject: upgradecheck upgradecheck.py,1.36,1.37
Message-ID: <200709062128.l86LSIS6025019@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24999

Modified Files:
	upgradecheck.py 
Log Message:
good bye, fedora-maintainers


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- upgradecheck.py	3 Sep 2007 17:56:43 -0000	1.36
+++ upgradecheck.py	6 Sep 2007 21:28:15 -0000	1.37
@@ -33,7 +33,7 @@
     sys.exit(1)
 
 mail_from = "buildsys at fedoraproject.org"
-mail_to = "fedora-maintainers at redhat.com"
+mail_to = "fedora-devel-list at redhat.com"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
 smtp_server = None
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:39:09 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:39:09 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.17,1.18
Message-ID: <200709062139.l86Ld9xm025442@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25424

Modified Files:
	mugshot.spec 
Log Message:
new upstream


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mugshot.spec	4 Sep 2007 15:46:40 -0000	1.17
+++ mugshot.spec	6 Sep 2007 21:38:36 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.50
-Release:        2%{?dist}
+Version:        1.1.51
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -204,12 +204,17 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
+- 1.1.51
+
 * Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
 - Don't put two autostart files in the autostart directory
   (https://bugzilla.redhat.com/show_bug.cgi?id=274921)



From fedora-extras-commits at redhat.com  Thu Sep  6 21:41:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:41:35 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.30,1.31
Message-ID: <200709062141.l86LfZgD025530@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25507

Modified Files:
	bigboard.spec 
Log Message:
new upstream


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bigboard.spec	27 Aug 2007 18:49:55 -0000	1.30
+++ bigboard.spec	6 Sep 2007 21:41:03 -0000	1.31
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.11
+Version:        0.5.12
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -53,10 +53,6 @@
 %doc COPYING
 %dir %{_libexecdir}/bigboard
 %attr(0755,root,root) %{_libexecdir}/bigboard/*
-%dir %{python_sitearch}/mugshot
-%{python_sitearch}/mugshot/*.py
-%{python_sitearch}/mugshot/*.pyc
-%{python_sitearch}/mugshot/*.pyo
 %dir %{python_sitearch}/bigboard
 %{python_sitearch}/bigboard/*.so
 %{python_sitearch}/bigboard/*.py
@@ -79,12 +75,11 @@
 %{python_sitearch}/bigboard_externals/*
 %dir %{_datadir}/bigboard
 %{_datadir}/bigboard/*
-%{_datadir}/bigboard/*.png
-%{_datadir}/gnome/autostart/*.desktop
-%{_bindir}/bigboard
-%{_bindir}/gconf-online-sync
-%{_libdir}/bonobo/servers/BigBoard_Applet.server
-%{_libexecdir}/bigboard-applet
+%{_datadir}/gnome/*
+%{_datadir}/gnome-2.0/*
+%{_bindir}/*
+%{_libdir}/bonobo/servers/*
+%{_libexecdir}/bigboard-applets
 # no desktop file included because the bigboard is launched as part of online
 # desktop mode
 
@@ -95,6 +90,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.5.11-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep  6 21:43:11 2007
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 6 Sep 2007 17:43:11 -0400
Subject: rpms/nss/devel nss.spec,1.28,1.29 sources,1.11,1.12
Message-ID: <200709062143.l86LhBfa025643@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25595

Modified Files:
	nss.spec sources 
Log Message:
* Thu Sep 06 2007 Rob Crittenden <rcritten at redhat.com> - 3.11.7-9
- Fix off-by-one error in the PEM module



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nss.spec	6 Sep 2007 16:06:32 -0000	1.28
+++ nss.spec	6 Sep 2007 21:42:39 -0000	1.29
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.7
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -453,6 +453,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Rob Crittenden <rcritten at redhat.com> - 3.11.7-9
+- Fix off-by-one error in the PEM module
+
 * Thu Sep 06 2007 Kai Engert <kengert at redhat.com> - 3.11.7-8
 - fix a C++ mode compilation error
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Sep 2007 20:00:42 -0000	1.11
+++ sources	6 Sep 2007 21:42:39 -0000	1.12
@@ -1,4 +1,4 @@
 68c5e1bd8ba091e5a50babcd9e552bc5  nss-3.11.5-fbst-stripped.tar.gz
 c1053d1e001a5b1eb4b7c296a968ca5c  nss-3.11.7-no-fbst-with-ckbi-1.64.tar.gz
 baa96599af6f0a2b656479d8e4efd58f  nss-3.12-alpha-ckfw.tar.gz
-84bad7e42304a6d4fdf2b83f5295b938  nss-3.12-alpha-pem.tar.gz
+cb4e4fc7c06ad3b02178ed453273abec  nss-3.12-alpha-pem.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:50:26 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:50:26 -0400
Subject: rpms/online-desktop/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200709062150.l86LoQmU025803@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25743

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 18:48:12 -0000	1.5
+++ .cvsignore	6 Sep 2007 21:49:53 -0000	1.6
@@ -1 +1 @@
-online-desktop-0.2.9.tar.gz
+online-desktop-0.2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 18:48:12 -0000	1.5
+++ sources	6 Sep 2007 21:49:53 -0000	1.6
@@ -1 +1 @@
-b75bd28551b0ec5282d67b450124ea1c  online-desktop-0.2.9.tar.gz
+67e6eadf468433ab122d2b5acaac5ade  online-desktop-0.2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:50:52 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:50:52 -0400
Subject: rpms/bigboard/devel .cvsignore,1.22,1.23 sources,1.23,1.24
Message-ID: <200709062150.l86LoqhB025845@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25778

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Aug 2007 18:49:55 -0000	1.22
+++ .cvsignore	6 Sep 2007 21:50:19 -0000	1.23
@@ -1 +1 @@
-bigboard-0.5.11.tar.gz
+bigboard-0.5.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Aug 2007 18:49:55 -0000	1.23
+++ sources	6 Sep 2007 21:50:19 -0000	1.24
@@ -1 +1 @@
-651d5d896702a1bb8a3ecbcaedd668b3  bigboard-0.5.11.tar.gz
+fe6047806ed00354145f471b2c5baef7  bigboard-0.5.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:51:54 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 6 Sep 2007 17:51:54 -0400
Subject: rpms/cdlabelgen/devel .cvsignore, 1.4, 1.5 cdlabelgen.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709062151.l86LpsIS025950@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/cdlabelgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25897

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
- updated to 4.0.0
- preserve timestamps upon install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2006 18:00:25 -0000	1.4
+++ .cvsignore	6 Sep 2007 21:51:21 -0000	1.5
@@ -1 +1 @@
-cdlabelgen-3.6.0.tgz
+cdlabelgen-4.0.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/cdlabelgen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdlabelgen.spec	17 Aug 2007 11:55:57 -0000	1.4
+++ cdlabelgen.spec	6 Sep 2007 21:51:21 -0000	1.5
@@ -1,7 +1,7 @@
 Name: cdlabelgen
 Summary: Generates frontcards and traycards for inserting in CD jewelcases
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
 Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
 URL: http://www.aczoom.com/tools/cdinsert/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +17,13 @@
 %setup -q
 
 %build
-make
-#pod2man cdlabelgen > cdlabelgen.1
+# nothing to build
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -pm755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -pm644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -pm644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,6 +36,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 06 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 4.0.0-1
+- updated to 4.0.0
+- preserve timestamps upon install
+
 * Fri Aug 17 2007 Harald Hoyer <harald at rawhide.home> - 3.6.0-2
 - changed License tag to BSD with advertising
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2006 18:00:25 -0000	1.4
+++ sources	6 Sep 2007 21:51:21 -0000	1.5
@@ -1 +1 @@
-6867ad98ec198de3fcf24ffd11525f8c  cdlabelgen-3.6.0.tgz
+0b8225fd914b5c7aa1d3e616b1c8accc  cdlabelgen-4.0.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:51:58 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 6 Sep 2007 17:51:58 -0400
Subject: rpms/mugshot/devel .cvsignore,1.10,1.11 sources,1.11,1.12
Message-ID: <200709062151.l86Lpw6X025954@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25920

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Aug 2007 19:13:26 -0000	1.10
+++ .cvsignore	6 Sep 2007 21:51:26 -0000	1.11
@@ -1 +1 @@
-mugshot-1.1.50.tar.gz
+mugshot-1.1.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Aug 2007 19:13:26 -0000	1.11
+++ sources	6 Sep 2007 21:51:26 -0000	1.12
@@ -1 +1 @@
-d3c656d2d77da635fc73908c46fa960b  mugshot-1.1.50.tar.gz
+dabad9f5dfd3e76e2c4c63722e9f6ebd  mugshot-1.1.51.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 21:58:03 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 6 Sep 2007 17:58:03 -0400
Subject: rpms/imlib2/devel imlib2.spec,1.27,1.28
Message-ID: <200709062158.l86Lw33w026253@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233

Modified Files:
	imlib2.spec 
Log Message:
* Thu Sep  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
- Update license tag



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- imlib2.spec	9 Aug 2007 06:13:30 -0000	1.27
+++ imlib2.spec	6 Sep 2007 21:57:30 -0000	1.28
@@ -1,8 +1,8 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
 Version:        1.4.0
-Release:        2%{?dist}
-License:        MIT with advertising??
+Release:        3%{?dist}
+License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
 Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -132,6 +132,9 @@
 %{_libdir}/imlib2/loaders/id3.*
 
 %changelog
+* Thu Sep  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-3
+- Update license tag
+
 * Wed Aug  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-2
 - put the id3tag loader in its own imlib2-id3tag-loader subpackage as it links
   to libid3tag, which is GPLv2+, and we don't want the imlib2 main package to



From fedora-extras-commits at redhat.com  Thu Sep  6 22:11:34 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 6 Sep 2007 18:11:34 -0400
Subject: rpms/zope/EL-5 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 sources, 1.18, 1.19 zope.spec, 1.34,
	1.35 zope-2.7.3-config.patch, 1.2, NONE
Message-ID: <200709062211.l86MBYdl032477@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32439/EL-5

Modified Files:
	.cvsignore sources zope.spec 
Added Files:
	zope-2.10.4-config.patch 
Removed Files:
	zope-2.7.3-config.patch 
Log Message:
Update zope to 2.10.4


zope-2.10.4-config.patch:

--- NEW FILE zope-2.10.4-config.patch ---
--- skel/etc/zope.conf.in.orig	2007-08-14 00:14:05.000000000 -0600
+++ skel/etc/zope.conf.in	2007-08-14 00:14:49.000000000 -0600
@@ -148,6 +148,7 @@
 #
 #    effective-user chrism
 
+effective-user zope
 
 # Directive: enable-product-installation
 #
@@ -288,6 +289,7 @@
 #
 #     mime-types  $INSTANCE/etc/mime.types
 
+mime-types  /etc/mime.types
 
 # Directive: structured-text-header-level
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Aug 2007 16:42:01 -0000	1.18
+++ .cvsignore	6 Sep 2007 22:11:00 -0000	1.19
@@ -1 +1 @@
-Zope-2.9.8-final.tgz
+Zope-2.10.4-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Aug 2007 16:42:01 -0000	1.18
+++ sources	6 Sep 2007 22:11:00 -0000	1.19
@@ -1 +1 @@
-ad7acd2378568264cc301657ee79d361  Zope-2.9.8-final.tgz
+07dde81bdfe42ca00f73912b3d73e0ec  Zope-2.10.4-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/zope.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zope.spec	6 Aug 2007 16:42:01 -0000	1.34
+++ zope.spec	6 Sep 2007 22:11:00 -0000	1.35
@@ -1,4 +1,4 @@
-%define python_minver 2.4.2
+%define python_minver 2.4.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -14,12 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.8
-Release: 1%{?dist}
+Version: 2.10.4
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz
+Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,13 +28,10 @@
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz
-Patch0:  zope-2.7.3-config.patch
-#Patch1:  zope.configure-2.9.5.patch
-
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
-Requires:      python >= %{python_minver}
+Patch0: zope-2.10.4-config.patch
+
+BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} 
+Requires:      python >= %{python_minver}, libxml2-python, python-elementtree
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -50,10 +47,7 @@
 
 %prep
 %setup -q -n Zope-%{version}-final
-%patch0 -p2 -b .config
-#%patch1 -p1
-# remove the backup, or we'll install it too...
-rm -f skel/etc/zope.conf.in.config
+%patch0 -p0
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -107,10 +101,14 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
-#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+chmod 750 $RPM_BUILD_ROOT%{instance_home}
+
+# Set needed permissions
+# We might go as far as to only allow zope r/w to the .pyc files
+for dir in %{instance_home}/{Products,log,lib,var}; do
+    chmod 775 $RPM_BUILD_ROOT$dir
+done
 
-chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # included in %%doc
@@ -156,7 +154,7 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc doc/* README.Fedora
+%doc doc/* README.Fedora ZopePublicLicense.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
@@ -174,187 +172,17 @@
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
-%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
-%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+%attr(-, root, %{zope_group}) %{instance_home}/*
 %{python_sitearch}/zope.pth
 
 
 %changelog
-* Mon Aug 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.8-1
-- Updated to 2.9.8
+* Mon Sep 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-3
+- Updated Requires for libxml2-python and python-elementtree
 
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-2
-- Added zope.pth to fix misc. zope scripts including some zeo stuff
+* Tue Aug 14 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-2
+- Added config patch
 
-* Mon Apr 2 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-1
-- Removed hotfix 20070320
-- Updated to 2.9.7
-- Removed no longer needed patch for acceptable python version
-
-* Wed Mar 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-2
-- Added hotfix 20070320 (#233378)
-
-* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
-- Updated to 2.9.6 added Five back into Zope (#221252)
-
-* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
-- Updated to 2.9.5 and removed not needed patches
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
-- Removed Five from zope package (plone 2.5.1 now provides the needed
-  version.)
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-2
-- fix path on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-1
-- update to 2.9.4
-
-* Wed Aug  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.9.3-4
-- Security: fix world-writable permissions on logrotate config files
-  and README.Fedora (#200794).
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-3
-- try to fix build on x86_64 (take 2)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-2
-- try to fix build on x86_64 (take 1)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-1
-- version 2.9.3
-- add Hotfix_20060705
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
-- version 2.9.2
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
-- version 2.8.5
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
-- rebuild
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
-- add warning about zope 2.8 & python 2.4 (bug 171681)
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
-- version 2.8.3
-
-* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
-- version 2.8.2
-
-* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
-- version 2.8.1
-
-* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
-- rebuild
-
-* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
-- version 2.8.0
-
-* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-2
-- don't remove the zope user un postun (to keep the Data.fs to the
-  correct owner after removal)
-
-* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1%{?dist}
-- version 2.7.6
-- use disttag
-
-* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
-- add hotfix
-
-* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
-- version 2.7.5
-- drop Epoch
-- change release tag for FC4
-- convert some tabs into spaces
-
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
-- version 2.7.4
-- flag the documentation as %%doc
-- make %%zope_home go+rx to allow users to create instances and to allow
-  access to docs
-- add a logrotate cron job
-- flag config files as %%config even in %%zope_home and %%instance_home
-
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
-- activate "security-policy-implementation python" in zope.conf
-
-* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
-- revert to zope's default directory tree to allow multiple instances
-- make the zopectl script multiple-instaces-aware.
-- add README.Fedora
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.4
-- compile scripts in %zope_home/bin too
-- keep skel dir in %zope_home to fix mkzopeinstance
-- BuildRequire python, since python-devel doesn't require it.
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.3
-- compile .pyc instead of just touch-ing them
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
-- deal with leftover .pyc files
-- minor spec cleanups
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.1
-- fix scriptlets requirements
-- use standard buildroot
-- replace %%buildroot by RPM_BUILD_ROOT
-- update to 2.7.3
-- drop Hotfix
-- drop patch 1, fixed upstream
-
-* Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
-  http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
-- add patch to warn the user that the initial user cannot be added while
-  Zope is running (from Chris McDonough)
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.1
-- version 2.7.2
-- remove leftover byte-compilation in %%post
-- Zope 2.7.x really requires python >= 2.3.3
-
-* Wed Jul 14 2004 Rex Dieter <rexdieter at sf.net> 2.7.1-0.fdr.1
-- 2.7.1
-- move files created in %%post back into rpm.  Unowned files are bad.
-- make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
-- don't use Requires(preun,postun)
-- use %%_smp_mflags
-
-* Tue Apr 28 2004 Chris McDonough <chrism at plope.com> 2.7.0-0.fdr.1
-- Prep for submission to Fedora.us by revising work done by Matthias
-- Refer to source files by URL instead of by name
-- Write version.txt into software home in post
-- Don't ship byte-compiled files, instead compile them in post
-- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup)
-- Add patch for objectmanager bug that could effect sites that depend
-  on userid/username separation
-- Improved init script (OK and FAILED now are printed at the appropriate
-  times)
-- Remove runzope workaround by adding a <zoperunner> stanza to the
-  config file.
-- Start in runlevels 345.
-- Known issues:
-  - zopectl is started and runs as the root user at boot time,
-    (although Zope itself runs as the zope user)
-  - no distro-specific docs telling people which port the software
-    runs on or how to add a user via zopectl adduser.
-
-* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6.fr
-- Initial RPM release.
-- The startup/stop needs to be modified further.
-- Currently "zopectl" returns an error although Zope does start...
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-1
+- Initial Package
 


--- zope-2.7.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep  6 22:17:15 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 6 Sep 2007 18:17:15 -0400
Subject: rpms/plone/EL-5 .cvsignore, 1.15, 1.16 plone.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <200709062217.l86MHFsh032653@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32627/EL-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 May 2007 22:07:25 -0000	1.15
+++ .cvsignore	6 Sep 2007 22:16:42 -0000	1.16
@@ -1 +1 @@
-Plone-2.5.3-final.tar.gz
+Plone-3.0.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/plone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plone.spec	23 May 2007 22:29:19 -0000	1.28
+++ plone.spec	6 Sep 2007 22:16:43 -0000	1.29
@@ -1,17 +1,18 @@
-%define python_minver 2.4.2
-%define zope_minver 2.9.4
+%define python_minver 2.4.3
+%define zope_minver 2.10.4
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
+%define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        2.5.3
+Version:        3.0
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://plone.googlecode.com/files/Plone-%{version}-final.tar.gz
+Source0:        http://plone.googlecode.com/files/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,12 +21,12 @@
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
-It is easy to use, translated into over 30 languages and carefully follows
+It is easy to use, translated into over 35 languages and carefully follows
 standards. It's under active development and easily extensible with add-on
 products.
 
 %prep
-%setup -q -n Plone-%{version}-final
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -37,15 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{software_home}/Products
-cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
-
-# Remove Five because Zope provides the correct verison of Five
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
-
-# Avoid conflicts, put those in %%doc
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
-
+install -d $RPM_BUILD_ROOT%{software_home}/lib/python
+cp -pr Products/* $RPM_BUILD_ROOT%{software_home}/Products
+cp -pr lib/python/* $RPM_BUILD_ROOT%{software_home}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,88 +53,16 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt CONTENTS.txt
-%{software_home}/Products/*
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyc
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyo
-
+%doc README.txt RELEASENOTES.txt INSTALL.txt
+%{software_home}/*
 
 %changelog
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.3-1
-- Fixed CacheFu squid scripts (removed pyc and pyo)
-- Updated to 2.5.3
-
-* Sun Jan 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.2-1
-- Updated to 2.5.2
-- Removed Plone Hotfix 20061031
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-6
-- Retag
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-5
-- Updated so zope now provides Five
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-4
-- Updated so plone now provides the correct version of the Five product
-
-* Sat Nov 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-3
-- add Plone Hotfix 20061031 (bug 213983)
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- rebuild
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- version 2.5.1
-
-* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
-- Update PasswordResetTool to fix CVE-2006-4247
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
-- Zope 2.9.4 went back to zope/lib/python on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-2
-- fix path on x86_64
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-1
-- Version 2.5
-- Drop Hotfix, included
-- condrestart Zope on %%post
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
-- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
-- restart Zope on upgrade (will migrate it to %%postun for the
-  next release, but we need to make sure zope is restarted for
-  this one (security)
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
-- version 2.1.2
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
-- version 2.1.1
-
-* Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
-- version 2.1 final
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr>
-- rebuild
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.3.rc2
-- update to rc2
-- drop buildarch: noarch since _libdir depends on arch (on x86_64)
-- put readmes in %%doc
-
-* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.2.rc1
-- update to rc1
-
-* Wed Jun 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.1.alpha2
-- update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
+- Moved plone install back to software_home
+- Updated to Plone 3.0 final release
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.5-2
-- apply Matthias' suggestions: cleanup %%description, drop Epoch, and
-  use a better Group.
+* Wed Aug 2 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.2rc2
+- Moved plone install from software_home to instance_home (workaround)
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.5-1
-- initial Fedora Extras RPM
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.1rc2
+- Initial Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 May 2007 22:07:25 -0000	1.15
+++ sources	6 Sep 2007 22:16:43 -0000	1.16
@@ -1 +1 @@
-36117b0757982d66d445b6c6b9df0e25  Plone-2.5.3-final.tar.gz
+84a4513fdabd191c85e364e159979590  Plone-3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:35:43 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Thu, 6 Sep 2007 18:35:43 -0400
Subject: rpms/nfs4-acl-tools/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709062235.l86MZhNW000853@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs4-acl-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv779

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded nfs4-acl-tests-0.1.tar.bz2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs4-acl-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Mar 2007 16:44:55 -0000	1.2
+++ .cvsignore	6 Sep 2007 22:35:11 -0000	1.3
@@ -1 +1,2 @@
 nfs4-acl-tools-0.3.1.tar.gz
+nfs4-acl-tests-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs4-acl-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Mar 2007 16:44:55 -0000	1.2
+++ sources	6 Sep 2007 22:35:11 -0000	1.3
@@ -1 +1,2 @@
 1869c246a3418df6a568ea40def12e88  nfs4-acl-tools-0.3.1.tar.gz
+78ce03a2605c623bf1612c810b278ec2  nfs4-acl-tests-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep  6 22:39:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:39:53 -0400
Subject: rpms/perl-IPC-Run3/devel perl-IPC-Run3.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062239.l86MdrBA001040@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1012

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:39:21 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:39:21 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:39:21 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:40:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:40:59 -0400
Subject: rpms/perl-IPC-Run3/F-7 perl-IPC-Run3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062240.l86Mex8o001179@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137/F-7

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:40:27 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:40:27 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:40:27 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 22:41:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 6 Sep 2007 18:41:02 -0400
Subject: rpms/perl-IPC-Run3/FC-6 perl-IPC-Run3.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 Makefile, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709062241.l86Mf294001186@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-IPC-Run3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137/FC-6

Modified Files:
	.cvsignore Makefile sources 
Added Files:
	perl-IPC-Run3.spec 
Log Message:
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.



--- NEW FILE perl-IPC-Run3.spec ---
Name:           perl-IPC-Run3
Version:        0.037
Release:        2%{?dist}
Summary:        Run a subprocess in batch mode (a la system) on Unix, Win32, etc
License:        GPL+ or BSD or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Run3/
Source0:        http://www.cpan.org/modules/by-module/IPC/IPC-Run3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
# For improved tests
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to run a subprocess and redirect stdin, stdout,
and/or stderr to files and perl data structures. It aims to satisfy 99% of
the need for using system, qx, and open3 with a simple, extremely Perlish
API and none of the bloat and rarely used features of IPC::Run.

%prep
%setup -q -n IPC-Run3-%{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
* Fri Sep 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-2
- Initial import.
- Update license tag.

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> 0.037-1
- Initial submission.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 00:41:37 -0000	1.1
+++ .cvsignore	6 Sep 2007 22:40:30 -0000	1.2
@@ -0,0 +1 @@
+IPC-Run3-0.037.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	6 Sep 2007 00:41:37 -0000	1.1
+++ Makefile	6 Sep 2007 22:40:30 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: perl-IPC-RUN3
+# Makefile for source rpm: perl-IPC-Run3
 # $Id$
-NAME := perl-IPC-RUN3
+NAME := perl-IPC-Run3
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run3/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 00:41:37 -0000	1.1
+++ sources	6 Sep 2007 22:40:30 -0000	1.2
@@ -0,0 +1 @@
+075b81f65ebc22faa6641893d5a9d174  IPC-Run3-0.037.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:00:08 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu,  6 Sep 2007 19:00:08 -0400
Subject: fedora-accounts website.py,1.12,1.13
Message-ID: <200709062300.l86N08hQ001578@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1551

Modified Files:
	website.py 
Log Message:
Make cookie handling more secure.



Index: website.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/website.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- website.py	9 Aug 2007 03:31:11 -0000	1.12
+++ website.py	6 Sep 2007 23:00:06 -0000	1.13
@@ -243,13 +243,19 @@
         return
     return arow
 
-def set_auth(username='', password=''):
-    c = Cookie.SmartCookie()
+def set_auth(username=None, password=None):
+    if not username:
+        username = ''
+    if not password:
+        password = ''
+    c = Cookie.SimpleCookie()
     c.load(os.environ.get('HTTP_COOKIE', ''))
     if c.has_key('auth_username'):
         c['auth_username'] = username
+        c['auth_username']['secure'] = True
     if c.has_key('auth_password'):
         c['auth_password'] = password
+        c['auth_password']['secure'] = True
     if c:
         print c
     return c
@@ -286,7 +292,9 @@
             del c['auth_password']
     else:
         c['auth_username'] = auth_username
+        c['auth_username']['secure'] = True
         c['auth_password'] = auth_password
+        c['auth_password']['secure'] = True
     print c
     return auth_username, auth_password
 



From fedora-extras-commits at redhat.com  Thu Sep  6 23:34:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 6 Sep 2007 19:34:35 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.65,
	1.66 policy-20070703.patch, 1.48, 1.49 selinux-policy.spec,
	1.515, 1.516
Message-ID: <200709062334.l86NYZnK008367@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8340

Modified Files:
	modules-targeted.conf policy-20070703.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
- Fix java labeling 



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- modules-targeted.conf	27 Aug 2007 21:43:05 -0000	1.65
+++ modules-targeted.conf	6 Sep 2007 23:34:02 -0000	1.66
@@ -928,7 +928,7 @@
 #
 # Policy for sendmail.
 # 
-qmail = module
+qmail = off
 
 # Layer: admin
 # Module: quota

policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.48 -r 1.49 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- policy-20070703.patch	6 Sep 2007 15:00:00 -0000	1.48
+++ policy-20070703.patch	6 Sep 2007 23:34:02 -0000	1.49
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -28,7 +28,7 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
@@ -37,13 +37,13 @@
  user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-09-06 15:43:06.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
@@ -51,7 +51,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -73,7 +73,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-09-06 15:43:06.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
@@ -81,7 +81,7 @@
 +__default__:system_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -94,13 +94,13 @@
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -111,7 +111,7 @@
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -120,7 +120,7 @@
 +system_r:xdm_t		xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -150,7 +150,7 @@
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,6 +1,5 @@
 -auditadm_r:auditadm_t
 -secadm_r:secadm_t
@@ -162,7 +162,7 @@
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/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.0.7/config/appconfig-mls/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-09-06 15:43:06.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
@@ -170,7 +170,7 @@
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -191,7 +191,7 @@
 +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -204,7 +204,7 @@
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -215,7 +215,7 @@
 +user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -223,7 +223,7 @@
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t	staff_r:staff_t sysadm_r:sysadm_t
 +system_r:remote_login_t	staff_r:staff_t
@@ -236,7 +236,7 @@
 +sysadm_r:sysadm_sudo_t	sysadm_r:sysadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	system_r:unconfined_t user_r:user_t
 +system_r:remote_login_t	system_r:unconfined_t user_r:user_t
@@ -247,7 +247,7 @@
 +user_r:user_sudo_t	system_r:unconfined_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -256,7 +256,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.7/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -268,7 +268,7 @@
  .TP
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.0.7/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-08-30 11:24:32.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -30,7 +30,7 @@
  .EX
[...1983 lines suppressed...]
@@ -12074,7 +12115,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-04 11:49:28.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -12133,7 +12174,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.7/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-08-31 06:47:15.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-09-06 15:43:06.000000000 -0400
 @@ -68,8 +68,9 @@
  allow udev_t udev_tbl_t:file manage_file_perms;
  dev_filetrans(udev_t,udev_tbl_t,file)
@@ -12235,7 +12276,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.7/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-09-06 15:43:06.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -12422,7 +12463,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-08-29 06:26:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-06 15:43:06.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -12620,7 +12661,7 @@
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.0.7/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,5 @@
  HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
@@ -12629,7 +12670,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 10:57:49.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13719,7 +13760,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-05 13:26:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-06 15:43:06.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -13828,12 +13869,12 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.0.7/policy/modules/system/virt.fc
 --- nsaserefpolicy/policy/modules/system/virt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +/var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.0.7/policy/modules/system/virt.if
 --- nsaserefpolicy/policy/modules/system/virt.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,58 @@
 +## <summary>Virtualization </summary>
 +
@@ -13895,14 +13936,14 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.0.7/policy/modules/system/virt.te
 --- nsaserefpolicy/policy/modules/system/virt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,3 @@
 +# var/lib files
 +type virt_var_lib_t;
 +files_type(virt_var_lib_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.7/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-09-06 15:43:06.000000000 -0400
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -13930,7 +13971,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-06 15:43:06.000000000 -0400
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13990,17 +14031,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -14013,17 +14054,17 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -14060,22 +14101,22 @@
 +files_dontaudit_getattr_all_files(logadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-05 21:49:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -14121,7 +14162,7 @@
 +allow webadm_t gadmin_t:dir getattr;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-09-06 15:43:06.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -14147,7 +14188,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/users	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/users	2007-09-06 15:43:06.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -14184,7 +14225,7 @@
 +gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/Rules.modular	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/Rules.modular	2007-09-06 15:43:06.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- selinux-policy.spec	6 Sep 2007 15:00:00 -0000	1.515
+++ selinux-policy.spec	6 Sep 2007 23:34:02 -0000	1.516
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
+- Fix java labeling 
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-4
 - Define user_home_type as home_type
 



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:19 -0400
Subject: rpms/wqy-bitmap-fonts/F-7 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdJAt008684@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/F-7

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/F-7/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:39 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:46 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:21 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:21 -0400
Subject: rpms/wqy-bitmap-fonts/FC-5 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdL0L008687@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/FC-5

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-5/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:42 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:49 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:24 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:24 -0400
Subject: rpms/wqy-bitmap-fonts/FC-6 wqy-bitmap-fonts.spec,1.2,1.3
Message-ID: <200709062339.l86NdOua008690@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/FC-6

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/FC-6/wqy-bitmap-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:46 -0000	1.2
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:52 -0000	1.3
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 6%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:39:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 6 Sep 2007 19:39:27 -0400
Subject: rpms/wqy-bitmap-fonts/devel wqy-bitmap-fonts.spec,1.6,1.7
Message-ID: <200709062339.l86NdRS1008719@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/wqy-bitmap-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/devel

Modified Files:
	wqy-bitmap-fonts.spec 
Log Message:
add "with exceptions" to GPLv2 License to cover font embedding exception



Index: wqy-bitmap-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/wqy-bitmap-fonts/devel/wqy-bitmap-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wqy-bitmap-fonts.spec	6 Sep 2007 08:13:49 -0000	1.6
+++ wqy-bitmap-fonts.spec	6 Sep 2007 23:38:55 -0000	1.7
@@ -8,7 +8,9 @@
 Summary: WenQuanYi Bitmap Chinese Fonts
 Version: 0.8.1
 Release: 8%{?dist}
-License: GPLv2
+# for font embedding exception please see
+# http://www.gnu.org/licenses/gpl-faq.html#FontException
+License: GPLv2 with exceptions
 URL: http://wqy.sourceforge.net/en/
 Group: User Interface/X
 Source: http://downloads.sourceforge.net/wqy/wqy-bitmapfont-bdf-all-cvs20070506.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep  6 23:54:48 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Thu, 6 Sep 2007 19:54:48 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.9, 1.10 pulseaudio.spec, 1.17, 
	1.18 sources, 1.11, 1.12
Message-ID: <200709062354.l86NsmWl008999@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new svn snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2007 23:43:10 -0000	1.9
+++ .cvsignore	6 Sep 2007 23:54:15 -0000	1.10
@@ -1,2 +1,2 @@
-pulseaudio-0.9.7.svn20070905.tar.gz
+pulseaudio-0.9.7.svn20070907.tar.gz
 libflashsupport-pulse-000.svn20070904.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pulseaudio.spec	4 Sep 2007 23:43:10 -0000	1.17
+++ pulseaudio.spec	6 Sep 2007 23:54:15 -0000	1.18
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.10.svn20070905%{?dist}
+Release:	0.11.svn20070907%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070905.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070907.tar.gz
 Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -197,6 +197,7 @@
 %attr(4755,root,root) %{_bindir}/pulseaudio
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
+%{_libdir}/libpulsecore.so.*
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
 %{_libdir}/pulse-%{drvver}/modules/libauthkey-prop.so
 %{_libdir}/pulse-%{drvver}/modules/libauthkey.so
@@ -314,6 +315,7 @@
 %doc doxygen/html
 %{_includedir}/pulse/
 %{_libdir}/libpulse.so
+%{_libdir}/libpulsecore.so
 %{_libdir}/libpulse-mainloop-glib.so
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
@@ -332,6 +334,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Fri Sep 7 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.11.svn20070907
+- Update SVN snapshot, don't link libpulsecore.so statically anymore
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.10.svn20070905
 - Update SVN snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Sep 2007 23:43:10 -0000	1.11
+++ sources	6 Sep 2007 23:54:15 -0000	1.12
@@ -1,2 +1,2 @@
-44a399ac877526b09a9c0e9ee4a9be93  pulseaudio-0.9.7.svn20070905.tar.gz
+2cf935e7b91fb0cffca558c511df8213  pulseaudio-0.9.7.svn20070907.tar.gz
 07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 01:28:23 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 6 Sep 2007 21:28:23 -0400
Subject: rpms/eclipse/devel .cvsignore,1.37,1.38 sources,1.49,1.50
Message-ID: <200709070128.l871SN1X023801@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774

Modified Files:
	.cvsignore sources 
Log Message:
add update fedora eclipse product plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	5 Sep 2007 17:43:20 -0000	1.37
+++ .cvsignore	7 Sep 2007 01:27:51 -0000	1.38
@@ -1,3 +1,3 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3.zip
-org.fedoraproject.ide.platform-3.3.0.1.zip
+org.fedoraproject.ide.platform-3.3.0.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	5 Sep 2007 17:43:20 -0000	1.49
+++ sources	7 Sep 2007 01:27:51 -0000	1.50
@@ -1,3 +1,3 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
-2a0ca56fa68d685a0f3d23c09000d723  org.fedoraproject.ide.platform-3.3.0.1.zip
+735e884062912dba926e205de8ad8fce  org.fedoraproject.ide.platform-3.3.0.2.zip



From fedora-extras-commits at redhat.com  Fri Sep  7 02:19:57 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 6 Sep 2007 22:19:57 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.4,1.5
Message-ID: <200709070219.l872JvXl031651@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
- New upstream release



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fvwm.spec	22 Aug 2007 03:42:50 -0000	1.4
+++ fvwm.spec	7 Sep 2007 02:19:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		fvwm
-Version:	2.5.21
-Release:	5%{?dist}
+Version:	2.5.23
+Release:	1%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+- New upstream release
+
 * Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5
 - Update license tag
 - Rebuild for buildid



From fedora-extras-commits at redhat.com  Fri Sep  7 02:22:57 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 6 Sep 2007 22:22:57 -0400
Subject: rpms/fvwm/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709070222.l872MvST032088@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31999

Modified Files:
	.cvsignore sources 
Log Message:
files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2007 02:33:14 -0000	1.2
+++ .cvsignore	7 Sep 2007 02:22:25 -0000	1.3
@@ -1 +1 @@
-fvwm-2.5.21.tar.bz2
+fvwm-2.5.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2007 02:33:14 -0000	1.2
+++ sources	7 Sep 2007 02:22:25 -0000	1.3
@@ -1 +1 @@
-c11efef91420e686d54f772e7162e879  fvwm-2.5.21.tar.bz2
+c301f9aad1203c26818a6651e3d1afc8  fvwm-2.5.23.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 04:36:37 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 7 Sep 2007 00:36:37 -0400
Subject: rpms/w3c-libwww/devel w3c-libwww.spec,1.4,1.5
Message-ID: <200709070436.l874abdx022140@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073

Modified Files:
	w3c-libwww.spec 
Log Message:
- enable reentrant



Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- w3c-libwww.spec	23 Aug 2007 05:49:08 -0000	1.4
+++ w3c-libwww.spec	7 Sep 2007 04:36:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.5.20060206cvs%{?dist}
+Release:       0.6.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -74,7 +74,8 @@
 echo timestamp > stamp-h.in
 
 %build
-%configure --enable-shared --disable-static --with-gnu-ld --with-regex --with-zlib --with-ssl
+%configure --enable-shared --disable-static --with-gnu-ld --with-regex \
+--with-zlib --with-ssl --enable-reentrant
 export tagname=CC
 make %{?_smp_mflags}
 
@@ -121,6 +122,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Fri Sep 07 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.6.20060206cvs
+- enable reentrant
+
 * Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.5.20060206cvs
 - rebuild for buildid



From fedora-extras-commits at redhat.com  Fri Sep  7 04:52:21 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Fri, 7 Sep 2007 00:52:21 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.81,1.82
Message-ID: <200709070452.l874qLNV023014@cvs-int.fedora.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22965

Modified Files:
	m17n-db.spec 
Log Message:
Removed incorrect version of hi-typewriter.mim


Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- m17n-db.spec	20 Aug 2007 05:59:38 -0000	1.81
+++ m17n-db.spec	7 Sep 2007 04:51:42 -0000	1.82
@@ -1,12 +1,11 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.4.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
 Source0:    %{name}-%{version}.tar.gz
-Source1:    hi-typewriter.mim
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:     number_pad_itrans-222634.patch
@@ -203,7 +202,8 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
 mv $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/pkgconfig/m17n-db.pc
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
+#Remove hi-typewriter keymap till we get correct version of it
+#install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 # For installing the translation files
 %find_lang %name
@@ -273,6 +273,9 @@
 %{_datadir}/m17n/ug-*.mim
 
 %changelog
+* Fri Sep 07 2007 Parag Nemade <pnemade at redhat.com> - 1.4.0-6.fc8
+- Removed incorrect version of hi-typewriter.mim
+
 * Mon Aug 20 2007 Parag Nemade <pnemade at redhat.com> - 1.4.0-5.fc8
 - Added Obsoletes to m17n-db-gregorian
 - Added Obsoletes to m17n-db-uyghur



From fedora-extras-commits at redhat.com  Fri Sep  7 05:03:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:03:49 -0400
Subject: rpms/aspell-sk/devel aspell-sk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709070503.l8753n1T029527@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aspell-sk.spec 
Log Message:
Initial aspell-sk import.




--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:50:15 -0000	1.1
+++ .cvsignore	7 Sep 2007 05:03:16 -0000	1.2
@@ -0,0 +1 @@
+aspell-sk-0.52-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:03:16 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:47 -0400
Subject: rpms/aspell-sk/EL-4 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875AlaV030102@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/EL-4

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:14 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:51 -0400
Subject: rpms/aspell-sk/EL-5 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875ApNZ030109@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/EL-5

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:18 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:55 -0400
Subject: rpms/aspell-sk/F-7 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875Atau030116@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/F-7

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:21 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:10:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:10:59 -0400
Subject: rpms/aspell-sk/FC-6 aspell-sk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709070510.l875Axj9030123@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/aspell-sk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964/FC-6

Modified Files:
	sources 
Added Files:
	aspell-sk.spec 
Log Message:
Adding branch spec and source files.



--- NEW FILE aspell-sk.spec ---
%define lang sk
%define langrelease 0

Name:           aspell-%{lang}
Version:        0.52
Release:        3%{?dist}
Summary:        Slovak dictionaries for Aspell

Group:          Applications/Text
License:        GPLv2
URL:            http://sk-spell.sk.cx/?id=6
Source0:        http://www.sk-spell.sk.cx/files/%{name}-%{version}-%{langrelease}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  aspell >= 12:0.60
Requires:       aspell >= 12:0.60

%define debug_package %{nil}                                                    

%description
Provides the word list/dictionaries for the following: Slovak


%prep
%setup -q -n %{name}-%{version}-%{langrelease}


%build
sh 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 doc/*
%{_libdir}/aspell-*/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-3
- changed requirement to aspell >= 12:0.60 because of there worldlist
  incompatibility
- debug_package set to nil to prevent empty debuginfo package
- configure is called with sh interpreter to prevent rpmlint errors

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-2
- added macros to Source tag
- cleanups

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.52-1
- initial release
- configure rename to reconfigure to skip rpmlint errors


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-sk/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:50:15 -0000	1.1
+++ sources	7 Sep 2007 05:10:25 -0000	1.2
@@ -0,0 +1 @@
+ce90b109f7c602bde949880920bbbbfd  aspell-sk-0.52-0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 05:17:55 2007
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Fri, 7 Sep 2007 01:17:55 -0400
Subject: rpms/php-pear-Mail-Mime/devel php-pear-Mail-Mime.spec,1.3,1.4
Message-ID: <200709070517.l875HtpT030733@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/php-pear-Mail-Mime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30669

Modified Files:
	php-pear-Mail-Mime.spec 
Log Message:
Fix requires and buildrequires (thanks remi)



Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail-Mime/devel/php-pear-Mail-Mime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Mail-Mime.spec	6 Sep 2007 05:48:24 -0000	1.3
+++ php-pear-Mail-Mime.spec	7 Sep 2007 05:17:22 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		php-pear-Mail-Mime
 Version:	1.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
@@ -13,8 +13,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1.6.0
-Requires:	php-pear(PEAR)
+BuildRequires:	php-pear >= 1:1.4.9-1.2
+Requires:	php-pear(PEAR) >= 1.6.0
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -77,6 +77,9 @@
 %{pear_phpdir}/Mail
 
 %changelog
+* Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-2
+- Add Requirement for pear-1.6.0
+
 * Wed May 16 2007 Brandon Holbrook <fedora at theholbrooks.org> 1.5.2-1
 - Upgraded to 1.5.2
 



From fedora-extras-commits at redhat.com  Fri Sep  7 05:24:50 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 7 Sep 2007 01:24:50 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.482,1.483
Message-ID: <200709070524.l875Oopr031085@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31045

Modified Files:
	eclipse.spec 
Log Message:
* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-17
- Update Fedora Eclipse product plugin to fix Welcome page.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- eclipse.spec	6 Sep 2007 17:39:17 -0000	1.482
+++ eclipse.spec	7 Sep 2007 05:24:17 -0000	1.483
@@ -23,14 +23,14 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        16%{?dist} 
+Release:        17%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-Source4:        org.fedoraproject.ide.platform-3.3.0.1.zip
+Source4:        org.fedoraproject.ide.platform-3.3.0.2.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -1564,6 +1564,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 05:41:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:41:54 -0400
Subject: rpms/micq/devel micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709070541.l875fsxf032189@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119/devel

Modified Files:
	.cvsignore sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ initial import.


micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/micq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Sep 2007 19:37:59 -0000	1.1
+++ .cvsignore	7 Sep 2007 05:41:22 -0000	1.2
@@ -0,0 +1 @@
+micq-0.5.4.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:41:22 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 05:44:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:44:18 -0400
Subject: rpms/micq/F-7 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709070544.l875iIaH032433@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355/F-7

Modified Files:
	sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ spec, patch and source file

micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:43:46 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 05:44:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Fri, 7 Sep 2007 01:44:21 -0400
Subject: rpms/micq/FC-6 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709070544.l875iLVc032438@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/micq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355/FC-6

Modified Files:
	sources 
Added Files:
	micq-glibc-open.patch micq.spec 
Log Message:
mICQ spec, patch and source file

micq-glibc-open.patch:

--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open	2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c	2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
--- micq-0.5.4.2/src/file_util.c.open	2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c	2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
     }
 #ifdef ENABLE_REMOTECONTROL
     conns = ConnectionC (TYPE_REMOTE);
-    conns->open = &RemoteOpen;
+    (conns->open) = &RemoteOpen;
     conns->flags |= CONN_AUTOLOGIN;
     conns->pref_server = strdup ("scripting");
     conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open	2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c	2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open	2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp	2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetMICQ (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open	2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c	2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE micq.spec ---
Summary:        Text/line based ICQ client with many features
Name:           micq
Version:        0.5.4.2
Release:        4%{?dist}
Source:         http://www.micq.org/source/%{name}-%{version}.tgz
Patch1:         micq-glibc-open.patch
URL:            http://www.micq.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.

%prep
%setup -q -n micq-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Sep 2007 19:37:59 -0000	1.1
+++ sources	7 Sep 2007 05:43:49 -0000	1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489  micq-0.5.4.2.tgz



From fedora-extras-commits at redhat.com  Fri Sep  7 06:01:35 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 7 Sep 2007 02:01:35 -0400
Subject: rpms/pcmciautils/devel pcmciautils-014-newrules.patch, 1.4,
	1.5 pcmciautils.spec, 1.27, 1.28
Message-ID: <200709070601.l8761Z7j006735@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/pcmciautils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6706

Modified Files:
	pcmciautils-014-newrules.patch pcmciautils.spec 
Log Message:
* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 014-11
- fixed udev rule


pcmciautils-014-newrules.patch:

Index: pcmciautils-014-newrules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils-014-newrules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pcmciautils-014-newrules.patch	22 Aug 2007 14:12:09 -0000	1.4
+++ pcmciautils-014-newrules.patch	7 Sep 2007 06:01:30 -0000	1.5
@@ -23,7 +23,7 @@
  # returns, so that "strong" matches have a higher priority.
 -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
 -		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}=1
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1"
  
  # PCMCIA sockets:
  #


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pcmciautils.spec	22 Aug 2007 14:12:09 -0000	1.27
+++ pcmciautils.spec	7 Sep 2007 06:01:30 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
 Version: 014
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
@@ -54,6 +54,9 @@
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 014-11
+- fixed udev rule
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 014-10
 - changed license tag
 - added arm architecture



From fedora-extras-commits at redhat.com  Fri Sep  7 06:45:19 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 7 Sep 2007 02:45:19 -0400
Subject: rpms/gnash/devel gnash.spec,1.9,1.10
Message-ID: <200709070645.l876jJEY009494@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9438

Modified Files:
	gnash.spec 
Log Message:
* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
- better documentation generation



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnash.spec	6 Sep 2007 14:46:22 -0000	1.9
+++ gnash.spec	7 Sep 2007 06:44:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -80,6 +80,18 @@
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
+# texinfo and therefore info generation is broken, still we have the
+# code to regenerate them
+pushd doc/C
+rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
+   actionscript.info actionscript.texi
+make man html info
+pushd asspec
+rm asspec.info asspec.html asspec.texi
+make html info
+popd
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +123,8 @@
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
+# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+
 %find_lang %{name}
 
 %clean
@@ -119,14 +133,17 @@
 
 %post 
 /sbin/ldconfig
-# currently help system is broken
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
+# the info is empty, but doesn't hurt
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
 fi
 
 %postun
@@ -136,7 +153,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html 
+%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
 %doc doc/C/images
 %{_bindir}/gtk-gnash
 %{_bindir}/gnash
@@ -167,6 +184,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
+- better documentation generation
+
 * Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
 - agg is now the default renderer



From fedora-extras-commits at redhat.com  Fri Sep  7 07:12:59 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 7 Sep 2007 03:12:59 -0400
Subject: rpms/gcc/devel gcc41-builtin-va-arg-pack.patch, 1.1, 1.2 gcc41.spec,
	1.171, 1.172
Message-ID: <200709070712.l877Cxu5016867@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840

Modified Files:
	gcc41-builtin-va-arg-pack.patch gcc41.spec 
Log Message:
4.1.2-23

gcc41-builtin-va-arg-pack.patch:

Index: gcc41-builtin-va-arg-pack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-builtin-va-arg-pack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-builtin-va-arg-pack.patch	6 Sep 2007 12:26:46 -0000	1.1
+++ gcc41-builtin-va-arg-pack.patch	7 Sep 2007 07:12:55 -0000	1.2
@@ -1,3 +1,11 @@
+2007-09-07  Jakub Jelinek  <jakub at redhat.com>
+
+	* tree.c (cp_cannot_inline_tree_fn): Don't mark varargs_function_p
+	as uninlinable.
+
+	* g++.dg/ext/va-arg-pack-1.C: New test.
+	* g++.dg/ext/va-arg-pack-2.C: New test.
+
 2007-09-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
@@ -291,6 +299,21 @@
        pp_character (buffer, ')');
  
        op1 = TREE_OPERAND (node, 2);
+--- gcc/cp/tree.c.jj	2007-03-12 08:28:01.000000000 +0100
++++ gcc/cp/tree.c	2007-09-07 09:03:07.000000000 +0200
+@@ -2078,12 +2078,6 @@ cp_cannot_inline_tree_fn (tree* fnp)
+       return 1;
+     }
+ 
+-  if (varargs_function_p (fn))
+-    {
+-      DECL_UNINLINABLE (fn) = 1;
+-      return 1;
+-    }
+-
+   if (! function_attribute_inlinable_p (fn))
+     {
+       DECL_UNINLINABLE (fn) = 1;
 --- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
 +++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
 @@ -0,0 +1,143 @@
@@ -500,3 +523,200 @@
 +{
 +  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
 +}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-1.C.jj	2007-09-07 08:52:55.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-1.C	2007-09-07 08:53:45.000000000 +0200
+@@ -0,0 +1,145 @@
++// __builtin_va_arg_pack () builtin tests.
++// { dg-do run }
++// { dg-options "-O2" }
++
++#include <stdarg.h>
++
++extern "C" void abort (void);
++
++int v1 = 8;
++long int v2 = 3;
++void *v3 = (void *) &v2;
++struct A { char c[16]; } v4 = { "foo" };
++long double v5 = 40;
++char seen[20];
++int cnt;
++
++__attribute__ ((noinline)) int
++foo1 (int x, int y, ...)
++{
++  int i;
++  long int l;
++  void *v;
++  struct A a;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt;
++  if (y != 6)
++    abort ();
++  i = va_arg (ap, int);
++  if (i != 5)
++    abort ();
++  switch (x)
++    {
++    case 0:
++      i = va_arg (ap, int);
++      if (i != 9 || v1 != 9)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      v = (void *) va_arg (ap, struct A *);
++      if (v != (void *) &v4)
++	abort ();
++      l = va_arg (ap, long int);
++      if (l != 3 || v2 != 4)
++	abort ();
++      break;
++    case 1:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != ld)
++	abort ();
++      i = va_arg (ap, int);
++      if (i != 8)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x;
++}
++
++__attribute__ ((noinline)) int
++foo2 (int x, int y, ...)
++{
++  long long int ll;
++  void *v;
++  struct A a, b;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt | 64;
++  if (y != 10)
++    abort ();
++  switch (x)
++    {
++    case 11:
++      break;
++    case 12:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != 40)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      b = va_arg (ap, struct A);
++      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      ll = va_arg (ap, long long int);
++      if (ll != 16LL)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x + 8;
++}
++
++__attribute__ ((noinline)) int
++foo3 (void)
++{
++  return 6;
++}
++
++extern inline __attribute__ ((always_inline, gnu_inline)) int
++bar (int x, ...)
++{
++  if (x < 10)
++    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
++  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
++}
++
++int
++main (void)
++{
++  if (bar (0, ++v1, v4, &v4, v2++) != 0)
++    abort ();
++  if (bar (1, ++v5, 8, v3) != 1)
++    abort ();
++  if (bar (2) != 2)
++    abort ();
++  if (bar (v1 + 2) != 19)
++    abort ();
++  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
++    abort ();
++  return 0;
++}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-2.C.jj	2007-09-07 08:53:23.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-2.C	2007-09-07 08:54:25.000000000 +0200
+@@ -0,0 +1,46 @@
++// { dg-do compile }
++// { dg-options "-O2" }
++
++int bar (int, const char *, int, ...);
++int baz (int, const char *, long int);
++
++extern inline __attribute__((always_inline)) int
++f2 (int y, ...)
++{
++  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f3 (int y, ...)
++{
++  return bar (y, "", 5, __builtin_va_arg_pack ());
++}
++
++extern inline __attribute__((always_inline)) int
++f4 (int y, ...)
++{
++  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f5 (int y, ...)
++{
++  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f6 (int y, ...)
++{
++  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
++}
++
++int
++test (void)
++{
++  int a = f2 (5, "a", 6);
++  a += f3 (6, "ab", 17LL);
++  a += f4 (7, 1, 2, 3);
++  a += f5 (8, 7L);
++  a += f6 (9);
++  return a;
++}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gcc41.spec	6 Sep 2007 12:26:46 -0000	1.171
+++ gcc41.spec	7 Sep 2007 07:12:55 -0000	1.172
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 22
+%define gcc_release 23
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1623,6 +1623,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23
+- fix __builtin_va_arg_pack () support for C++
+
 * Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22
 - backport __builtin_va_arg_pack () support
 - make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked



From fedora-extras-commits at redhat.com  Fri Sep  7 07:14:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 7 Sep 2007 03:14:03 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-va-arg-pack.patch, 1.1, 1.2 gcc41.spec, 
	1.163, 1.164
Message-ID: <200709070714.l877E3q5017046@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17019

Modified Files:
	gcc41-builtin-va-arg-pack.patch gcc41.spec 
Log Message:
4.1.2-22.fc7

gcc41-builtin-va-arg-pack.patch:

Index: gcc41-builtin-va-arg-pack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41-builtin-va-arg-pack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-builtin-va-arg-pack.patch	6 Sep 2007 12:30:25 -0000	1.1
+++ gcc41-builtin-va-arg-pack.patch	7 Sep 2007 07:13:59 -0000	1.2
@@ -1,3 +1,11 @@
+2007-09-07  Jakub Jelinek  <jakub at redhat.com>
+
+	* tree.c (cp_cannot_inline_tree_fn): Don't mark varargs_function_p
+	as uninlinable.
+
+	* g++.dg/ext/va-arg-pack-1.C: New test.
+	* g++.dg/ext/va-arg-pack-2.C: New test.
+
 2007-09-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* builtins.def (BUILT_IN_VA_ARG_PACK): New built-in.
@@ -291,6 +299,21 @@
        pp_character (buffer, ')');
  
        op1 = TREE_OPERAND (node, 2);
+--- gcc/cp/tree.c.jj	2007-03-12 08:28:01.000000000 +0100
++++ gcc/cp/tree.c	2007-09-07 09:03:07.000000000 +0200
+@@ -2078,12 +2078,6 @@ cp_cannot_inline_tree_fn (tree* fnp)
+       return 1;
+     }
+ 
+-  if (varargs_function_p (fn))
+-    {
+-      DECL_UNINLINABLE (fn) = 1;
+-      return 1;
+-    }
+-
+   if (! function_attribute_inlinable_p (fn))
+     {
+       DECL_UNINLINABLE (fn) = 1;
 --- gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c.jj	2007-09-06 10:19:25.000000000 +0200
 +++ gcc/testsuite/gcc.c-torture/execute/va-arg-pack-1.c	2007-09-06 10:19:25.000000000 +0200
 @@ -0,0 +1,143 @@
@@ -500,3 +523,200 @@
 +{
 +  return bar (5, "", 6, __builtin_va_arg_pack ());	/* { dg-error "invalid use of" } */
 +}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-1.C.jj	2007-09-07 08:52:55.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-1.C	2007-09-07 08:53:45.000000000 +0200
+@@ -0,0 +1,145 @@
++// __builtin_va_arg_pack () builtin tests.
++// { dg-do run }
++// { dg-options "-O2" }
++
++#include <stdarg.h>
++
++extern "C" void abort (void);
++
++int v1 = 8;
++long int v2 = 3;
++void *v3 = (void *) &v2;
++struct A { char c[16]; } v4 = { "foo" };
++long double v5 = 40;
++char seen[20];
++int cnt;
++
++__attribute__ ((noinline)) int
++foo1 (int x, int y, ...)
++{
++  int i;
++  long int l;
++  void *v;
++  struct A a;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt;
++  if (y != 6)
++    abort ();
++  i = va_arg (ap, int);
++  if (i != 5)
++    abort ();
++  switch (x)
++    {
++    case 0:
++      i = va_arg (ap, int);
++      if (i != 9 || v1 != 9)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      v = (void *) va_arg (ap, struct A *);
++      if (v != (void *) &v4)
++	abort ();
++      l = va_arg (ap, long int);
++      if (l != 3 || v2 != 4)
++	abort ();
++      break;
++    case 1:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != ld)
++	abort ();
++      i = va_arg (ap, int);
++      if (i != 8)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x;
++}
++
++__attribute__ ((noinline)) int
++foo2 (int x, int y, ...)
++{
++  long long int ll;
++  void *v;
++  struct A a, b;
++  long double ld;
++  va_list ap;
++
++  va_start (ap, y);
++  if (x < 0 || x >= 20 || seen[x])
++    abort ();
++  seen[x] = ++cnt | 64;
++  if (y != 10)
++    abort ();
++  switch (x)
++    {
++    case 11:
++      break;
++    case 12:
++      ld = va_arg (ap, long double);
++      if (ld != 41 || v5 != 40)
++	abort ();
++      a = va_arg (ap, struct A);
++      if (__builtin_memcmp (a.c, v4.c, sizeof (a.c)) != 0)
++	abort ();
++      b = va_arg (ap, struct A);
++      if (__builtin_memcmp (b.c, v4.c, sizeof (b.c)) != 0)
++	abort ();
++      v = va_arg (ap, void *);
++      if (v != &v2)
++	abort ();
++      ll = va_arg (ap, long long int);
++      if (ll != 16LL)
++	abort ();
++      break;
++    case 2:
++      break;
++    default:
++      abort ();
++    }
++  va_end (ap);
++  return x + 8;
++}
++
++__attribute__ ((noinline)) int
++foo3 (void)
++{
++  return 6;
++}
++
++extern inline __attribute__ ((always_inline, gnu_inline)) int
++bar (int x, ...)
++{
++  if (x < 10)
++    return foo1 (x, foo3 (), 5, __builtin_va_arg_pack ());
++  return foo2 (x, foo3 () + 4, __builtin_va_arg_pack ());
++}
++
++int
++main (void)
++{
++  if (bar (0, ++v1, v4, &v4, v2++) != 0)
++    abort ();
++  if (bar (1, ++v5, 8, v3) != 1)
++    abort ();
++  if (bar (2) != 2)
++    abort ();
++  if (bar (v1 + 2) != 19)
++    abort ();
++  if (bar (v1 + 3, v5--, v4, v4, v3, 16LL) != 20)
++    abort ();
++  return 0;
++}
+--- gcc/testsuite/g++.dg/ext/va-arg-pack-2.C.jj	2007-09-07 08:53:23.000000000 +0200
++++ gcc/testsuite/g++.dg/ext/va-arg-pack-2.C	2007-09-07 08:54:25.000000000 +0200
+@@ -0,0 +1,46 @@
++// { dg-do compile }
++// { dg-options "-O2" }
++
++int bar (int, const char *, int, ...);
++int baz (int, const char *, long int);
++
++extern inline __attribute__((always_inline)) int
++f2 (int y, ...)
++{
++  return bar (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f3 (int y, ...)
++{
++  return bar (y, "", 5, __builtin_va_arg_pack ());
++}
++
++extern inline __attribute__((always_inline)) int
++f4 (int y, ...)
++{
++  return bar (y, "", 4, __builtin_va_arg_pack (), 6);	/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f5 (int y, ...)
++{
++  return baz (y, "", __builtin_va_arg_pack ());		/* { dg-error "invalid use of" } */
++}
++
++extern inline __attribute__((always_inline)) int
++f6 (int y, ...)
++{
++  return __builtin_va_arg_pack ();			/* { dg-error "invalid use of" } */
++}
++
++int
++test (void)
++{
++  int a = f2 (5, "a", 6);
++  a += f3 (6, "ab", 17LL);
++  a += f4 (7, 1, 2, 3);
++  a += f5 (8, 7L);
++  a += f6 (9);
++  return a;
++}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gcc41.spec	6 Sep 2007 12:30:25 -0000	1.163
+++ gcc41.spec	7 Sep 2007 07:13:59 -0000	1.164
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 21
+%define gcc_release 22
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1621,6 +1621,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22.fc7
+- fix __builtin_va_arg_pack () support for C++
+
 * Thu Sep  6 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-21.fc7
 - backport __builtin_va_arg_pack () support
 - make sure __builtin_{,v}{,f}{print,scan}f, __builtin_{,f}printf_unlocked



From fedora-extras-commits at redhat.com  Fri Sep  7 07:21:01 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 03:21:01 -0400
Subject: rpms/ice/F-7 ice.spec,1.1,1.2
Message-ID: <200709070721.l877L1jw017421@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385/F-7

Modified Files:
	ice.spec 
Log Message:
Added required Obsoletes: for the zeroc names



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ice.spec	31 Aug 2007 05:07:00 -0000	1.1
+++ ice.spec	7 Sep 2007 07:20:28 -0000	1.2
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -92,6 +92,7 @@
 Summary: Tools for developing Ice applications in C++
 Group: Development/Tools
 Provides: ice-c++-devel = %{version}-%{release}
+Obsoletes: ice-c++-devel < %{version}-%{release}
 Requires: ice = %{version}-%{release}
 %description devel
 Tools for developing Ice applications in C++.
@@ -130,6 +131,7 @@
 Summary: The Ice runtime for C#
 Group: System Environment/Libraries
 Provides: ice-dotnet = %{version}-%{release}
+Obsoletes: ice-dotnet < %{version}-%{release}
 Requires: ice = %{version}-%{release}, mono-core >= 1.2.2
 %description csharp
 The Ice runtime for C#
@@ -579,6 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+- Also add Obsoletes: for the old zeroc names
+
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag
 - Minor typo corrections in README.Fedora



From fedora-extras-commits at redhat.com  Fri Sep  7 07:21:03 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 03:21:03 -0400
Subject: rpms/ice/devel ice.spec,1.1,1.2
Message-ID: <200709070721.l877L3uH017443@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17385/devel

Modified Files:
	ice.spec 
Log Message:
Added required Obsoletes: for the zeroc names



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ice.spec	31 Aug 2007 05:02:22 -0000	1.1
+++ ice.spec	7 Sep 2007 07:20:31 -0000	1.2
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -92,6 +92,7 @@
 Summary: Tools for developing Ice applications in C++
 Group: Development/Tools
 Provides: ice-c++-devel = %{version}-%{release}
+Obsoletes: ice-c++-devel < %{version}-%{release}
 Requires: ice = %{version}-%{release}
 %description devel
 Tools for developing Ice applications in C++.
@@ -130,6 +131,7 @@
 Summary: The Ice runtime for C#
 Group: System Environment/Libraries
 Provides: ice-dotnet = %{version}-%{release}
+Obsoletes: ice-dotnet < %{version}-%{release}
 Requires: ice = %{version}-%{release}, mono-core >= 1.2.2
 %description csharp
 The Ice runtime for C#
@@ -579,6 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+- Also add Obsoletes: for the old zeroc names
+
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag
 - Minor typo corrections in README.Fedora



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:21 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:21 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878ENPE007907@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchbugzilla acl on lesstif (Fedora devel) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:24 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:24 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EOdJ007916@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the commit acl on lesstif (Fedora devel) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:28 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:28 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878ETxq007926@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchcommits acl on lesstif (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:32 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:32 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EXD6007937@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the watchcommits acl on lesstif (Fedora 6) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Fri Sep  7 08:14:34 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 07 Sep 2007 01:14:34 -0700
Subject: [pkgdb] lesstif had acl change status
Message-ID: <200709070814.l878EYSr007946@app3.fedora.phx.redhat.com>

Patrice Dumas (pertusus) has set the commit acl on lesstif (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lesstif



From fedora-extras-commits at redhat.com  Fri Sep  7 08:30:32 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:30:32 -0400
Subject: rpms/ice/F-7 ice.spec,1.2,1.3
Message-ID: <200709070830.l878UWqG027857@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27747/F-7

Modified Files:
	ice.spec 
Log Message:
Fixed bad date in changelog



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ice.spec	7 Sep 2007 07:20:28 -0000	1.2
+++ ice.spec	7 Sep 2007 08:29:59 -0000	1.3
@@ -581,7 +581,7 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
 - Also add Obsoletes: for the old zeroc names
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9



From fedora-extras-commits at redhat.com  Fri Sep  7 08:30:35 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:30:35 -0400
Subject: rpms/ice/devel ice.spec,1.2,1.3
Message-ID: <200709070830.l878UZap027860@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27747/devel

Modified Files:
	ice.spec 
Log Message:
Fixed bad date in changelog



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ice.spec	7 Sep 2007 07:20:31 -0000	1.2
+++ ice.spec	7 Sep 2007 08:30:02 -0000	1.3
@@ -581,7 +581,7 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  9 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
 - Also add Obsoletes: for the old zeroc names
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9



From fedora-extras-commits at redhat.com  Fri Sep  7 08:37:50 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:37:50 -0400
Subject: rpms/ice/F-7 ice.spec,1.3,1.4
Message-ID: <200709070837.l878bovi028415@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307/F-7

Modified Files:
	ice.spec 
Log Message:
Bump release so I can rebuild with the correct date (sigh ...)



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ice.spec	7 Sep 2007 08:29:59 -0000	1.3
+++ ice.spec	7 Sep 2007 08:37:18 -0000	1.4
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -581,8 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
+- Fix bad date in changelog
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag



From fedora-extras-commits at redhat.com  Fri Sep  7 08:37:53 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Fri, 7 Sep 2007 04:37:53 -0400
Subject: rpms/ice/devel ice.spec,1.3,1.4
Message-ID: <200709070837.l878brfm028420@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307/devel

Modified Files:
	ice.spec 
Log Message:
Bump release so I can rebuild with the correct date (sigh ...)



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ice.spec	7 Sep 2007 08:30:02 -0000	1.3
+++ ice.spec	7 Sep 2007 08:37:21 -0000	1.4
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -581,8 +581,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-10
+* Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
+- Fix bad date in changelog
 
 * Wed Aug 29 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-9
 - Add "with exceptions" to license tag



From fedora-extras-commits at redhat.com  Fri Sep  7 08:42:57 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Fri,  7 Sep 2007 04:42:57 -0400
Subject: fedora-security/audit fc6,1.252,1.253 fc7,1.93,1.94
Message-ID: <200709070842.l878gvaJ028628@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28608/audit

Modified Files:
	fc6 fc7 
Log Message:
PHP wireshark kerberos



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- fc6	5 Sep 2007 08:30:51 -0000	1.252
+++ fc6	7 Sep 2007 08:42:54 -0000	1.253
@@ -4,9 +4,18 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070823
+# Up to date CVE as of CVE email 20070907
 # Up to date FC6 as of 20070905
 
+CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
+CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
+CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
+CVE-2007-4660 VULNERABLE (php, fixed 5.2.4) 
+CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
+CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- fc7	5 Sep 2007 08:30:51 -0000	1.93
+++ fc7	7 Sep 2007 08:42:54 -0000	1.94
@@ -5,9 +5,18 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070829
+# Up to date CVE as of CVE email 20070907
 # Up to date FC7 as of 20070905
 
+CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
+CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
+CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
+CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
+CVE-2007-4660 VULNERABLE (php, fixed 5.2.4)
+CVE-2007-4659 VULNERABLE (php, fixed 5.2.4) #276531 Tracking bug!
+CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 VULNERABLE (qgit) #268381



From fedora-extras-commits at redhat.com  Fri Sep  7 08:47:09 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Fri, 7 Sep 2007 04:47:09 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.42,1.43
Message-ID: <200709070847.l878l9CC028799@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28752

Modified Files:
	gnuplot.spec 
Log Message:
- move emacs files to */site-lisp/gnuplot subdirectory



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnuplot.spec	6 Sep 2007 09:14:15 -0000	1.42
+++ gnuplot.spec	7 Sep 2007 08:46:37 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -62,6 +62,10 @@
 install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
+install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/gnuplot
+mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
+mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
+
 %post 
 /sbin/install-info --quiet %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
 
@@ -94,14 +98,16 @@
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/gnuplot-gui.el
-%{_datadir}/emacs/site-lisp/gnuplot-gui.elc
-%{_datadir}/emacs/site-lisp/gnuplot.el
-%{_datadir}/emacs/site-lisp/gnuplot.elc
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.el
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.elc
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.el
+%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.elc
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
-
 %changelog
+* Fri Sep  7 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-5
+- move emacs files to */site-lisp/gnuplot subdirectory
+
 * Thu Sep  6 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-4
 - change font paths, change documenatation
 



From fedora-extras-commits at redhat.com  Fri Sep  7 09:09:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 7 Sep 2007 05:09:06 -0400
Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.5,1.6
Message-ID: <200709070909.l87996g9003672@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3654

Modified Files:
	ocaml-lablgl.spec 
Log Message:
rebuild


Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-lablgl.spec	4 Sep 2007 17:31:00 -0000	1.5
+++ ocaml-lablgl.spec	7 Sep 2007 09:08:32 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgl
 Version:        1.02
-Release:	14%{?dist}
+Release:	15%{?dist}
 
 Summary:        LablGL is an OpenGL interface for Objective Caml
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.02-15
+- Rebuild
+
 * Thu Aug 30 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.02-13
 - Rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 10:07:38 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Fri, 7 Sep 2007 06:07:38 -0400
Subject: rpms/revisor/devel revisor.spec,1.22,1.23 sources,1.25,1.26
Message-ID: <200709071007.l87A7cYS012543@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12453/devel

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-7



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- revisor.spec	5 Sep 2007 13:50:17 -0000	1.22
+++ revisor.spec	7 Sep 2007 10:07:05 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -170,7 +170,8 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
+- Bugfixes
 - Removed pungi dependency
 - Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	5 Sep 2007 13:50:17 -0000	1.25
+++ sources	7 Sep 2007 10:07:05 -0000	1.26
@@ -1 +1 @@
-cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz
+eb0bf848e92d6605e36b9146db85de23  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 10:08:55 2007
From: fedora-extras-commits at redhat.com (Jeroen van Meeuwen (kanarip))
Date: Fri, 7 Sep 2007 06:08:55 -0400
Subject: rpms/revisor/F-7 revisor.spec,1.16,1.17 sources,1.17,1.18
Message-ID: <200709071008.l87A8tvn012683@cvs-int.fedora.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12647/F-7

Modified Files:
	revisor.spec sources 
Log Message:
2.0.4.3-7



Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/revisor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- revisor.spec	5 Sep 2007 13:51:30 -0000	1.16
+++ revisor.spec	7 Sep 2007 10:08:21 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
 Version: 2.0.4.3
-Release: 1rc6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -170,7 +170,8 @@
 %{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
+- Bugfixes
 - Removed pungi dependency
 - Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Sep 2007 13:51:30 -0000	1.17
+++ sources	7 Sep 2007 10:08:21 -0000	1.18
@@ -1 +1 @@
-cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz
+eb0bf848e92d6605e36b9146db85de23  revisor-2.0.4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 10:57:25 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 06:57:25 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.37, 1.38 gnome-media.spec,
	1.100, 1.101 sources, 1.36,
	1.37 gnome-media-2.17.90-disable-scrollkeeper.patch, 1.1,
	NONE gnome-media-cd-last-track-mode.patch, 1.1,
	NONE gnome-media-set-modal.patch, 1.1, NONE
Message-ID: <200709071057.l87AvPCd017785@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17565

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	gnome-media-2.17.90-disable-scrollkeeper.patch 
	gnome-media-cd-last-track-mode.patch 
	gnome-media-set-modal.patch 
Log Message:
* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
- Update to 2.19.92
- Remove upstreamed/obsolete patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Mar 2007 16:00:54 -0000	1.37
+++ .cvsignore	7 Sep 2007 10:56:48 -0000	1.38
@@ -1 +1 @@
-gnome-media-2.18.0.tar.bz2
+gnome-media-2.19.92.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-media.spec	25 Aug 2007 13:36:49 -0000	1.100
+++ gnome-media.spec	7 Sep 2007 10:56:48 -0000	1.101
@@ -11,15 +11,12 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.18.0
-Release:        6%{?dist}
+Version:        2.19.92
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
-Patch0:         gnome-media-2.17.90-disable-scrollkeeper.patch
-Patch1:         gnome-media-2.13.5-hide-help-button.patch
-Patch2:         gnome-media-set-modal.patch
-Patch3:         gnome-media-cd-last-track-mode.patch
+Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -47,10 +44,8 @@
 BuildRequires:  gstreamer-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_version}
 BuildRequires:  nautilus-cd-burner-devel
-BuildRequires:  scrollkeeper
-BuildRequires:  gettext
+BuildRequires:  gnome-doc-utils
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  autoconf automake libtool intltool
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -79,19 +74,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .scrollkeeper-disable
-%patch1 -p1 -b .hide-help-button
-%patch2 -p0 -b .modal
-cd gnome-cd/
-%patch3 -p0 -b .last-track-mode
+%patch0 -p1 -b .hide-help-button
 
 %build
-libtoolize --force
-intltoolize --force
-autoreconf
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 %configure  --disable-schemas-install
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -199,6 +187,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+- Remove upstreamed/obsolete patches
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-6
 - Run intltoolize before autoreconf, to avoid intltool version
   mismatches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2007 16:00:54 -0000	1.36
+++ sources	7 Sep 2007 10:56:48 -0000	1.37
@@ -1 +1 @@
-a472d8c7733b119376bc6127ee55a82d  gnome-media-2.18.0.tar.bz2
+f095fceca0175e04afb966e0366a9bc4  gnome-media-2.19.92.tar.gz


--- gnome-media-2.17.90-disable-scrollkeeper.patch DELETED ---


--- gnome-media-cd-last-track-mode.patch DELETED ---


--- gnome-media-set-modal.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 11:01:39 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 07:01:39 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.101,1.102
Message-ID: <200709071101.l87B1dp6024575@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18571

Modified Files:
	gnome-media.spec 
Log Message:
upstream configure uses .tar.gz



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gnome-media.spec	7 Sep 2007 10:56:48 -0000	1.101
+++ gnome-media.spec	7 Sep 2007 11:01:04 -0000	1.102
@@ -15,7 +15,7 @@
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
+Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 



From fedora-extras-commits at redhat.com  Fri Sep  7 11:21:38 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 07:21:38 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.102,1.103
Message-ID: <200709071121.l87BLchN027496@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27409

Modified Files:
	gnome-media.spec 
Log Message:
Yep, doesn't build with smp_flags



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gnome-media.spec	7 Sep 2007 11:01:04 -0000	1.102
+++ gnome-media.spec	7 Sep 2007 11:21:06 -0000	1.103
@@ -79,7 +79,7 @@
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 %configure  --disable-schemas-install
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Fri Sep  7 11:29:17 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 07:29:17 -0400
Subject: rpms/freenx/devel .cvsignore, 1.5, 1.6 freenx.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709071129.l87BTHtL028422@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28259

Modified Files:
	.cvsignore freenx.spec sources 
Log Message:
Bump to 0.7.0, BZ 252976.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Apr 2007 21:03:12 -0000	1.5
+++ .cvsignore	7 Sep 2007 11:28:44 -0000	1.6
@@ -1 +1 @@
-freenx-0.6.0.tar.gz
+freenx-0.7.0.tar.gz


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	29 Apr 2007 21:03:12 -0000	1.6
+++ freenx.spec	7 Sep 2007 11:28:44 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Apr 2007 21:03:12 -0000	1.5
+++ sources	7 Sep 2007 11:28:44 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 11:32:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 7 Sep 2007 07:32:15 -0400
Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.2,1.3
Message-ID: <200709071132.l87BWFr5028854@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28749

Modified Files:
	ocaml-lablgtk.spec 
Log Message:
rebuild


Index: ocaml-lablgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-lablgtk.spec	30 Aug 2007 09:49:34 -0000	1.2
+++ ocaml-lablgtk.spec	7 Sep 2007 11:31:42 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           ocaml-lablgtk
 Version:        2.6.0
-Release:        9.20060908cvs%{?dist}
+Release:        10.20060908cvs%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Gerard Milmeister <gemi at bluewin.ch> - 2.6.0-10.20060908cvs
+- rebuild
+
 * Thu Aug 30 2007 Gerard Milmeister <gemi at bluewin.ch> - 2.6.0-9.20060908cvs
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 11:39:10 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 07:39:10 -0400
Subject: rpms/freenx/F-7 freenx.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709071139.l87BdAiR029830@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29711

Modified Files:
	freenx.spec sources 
Log Message:
Bump to 0.7.0, BZ 252976.



Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	29 Apr 2007 21:03:12 -0000	1.6
+++ freenx.spec	7 Sep 2007 11:38:37 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Apr 2007 21:03:12 -0000	1.5
+++ sources	7 Sep 2007 11:38:37 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 12:00:14 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:00:14 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.103,1.104
Message-ID: <200709071200.l87C0EaF032165@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	gnome-media.spec 
Log Message:
Disable the sound recorder in configure, and add gettext as a BR



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-media.spec	7 Sep 2007 11:21:06 -0000	1.103
+++ gnome-media.spec	7 Sep 2007 11:59:42 -0000	1.104
@@ -45,7 +45,7 @@
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_version}
 BuildRequires:  nautilus-cd-burner-devel
 BuildRequires:  gnome-doc-utils
-BuildRequires:  perl(XML::Parser)
+BuildRequires:  gettext perl(XML::Parser)
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -78,7 +78,7 @@
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
-%configure  --disable-schemas-install
+%configure --disable-schemas-install --enable-grecord=no
 make #%{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:26 -0700
Subject: [pkgdb] gnupg: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKR6H010256@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on gnupg (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:28 -0700
Subject: [pkgdb] gnupg: rdieter has requested commit
Message-ID: <200709071220.l87CKSsF010265@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on gnupg (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:41 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKfpe010274@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgcrypt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:47 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:47 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchbugzilla
Message-ID: <200709071220.l87CKleI010286@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgcrypt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 12:20:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:20:49 -0700
Subject: [pkgdb] libgcrypt: rdieter has requested watchcommits
Message-ID: <200709071220.l87CKnEd010296@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgcrypt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:03 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:03 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchbugzilla
Message-ID: <200709071221.l87CL3H5010305@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libgpg-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:04 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchcommits
Message-ID: <200709071221.l87CL4SB010314@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgpg-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:08 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested watchcommits
Message-ID: <200709071221.l87CL87V010327@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libgpg-error (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 12:21:09 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 07 Sep 2007 05:21:09 -0700
Subject: [pkgdb] libgpg-error: rdieter has requested commit
Message-ID: <200709071221.l87CL9rF010336@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libgpg-error (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 12:24:20 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Fri, 7 Sep 2007 08:24:20 -0400
Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.38,1.39
Message-ID: <200709071224.l87COKO8008603@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8489

Modified Files:
	docbook-style-xsl.spec 
Log Message:
added PreReq: libxml2 >= 2.4.8(#253962)


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- docbook-style-xsl.spec	5 Sep 2007 11:30:11 -0000	1.38
+++ docbook-style-xsl.spec	7 Sep 2007 12:23:48 -0000	1.39
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.73.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -12,6 +12,8 @@
 PreReq: docbook-dtd-xml
 # xml-common was using /usr/share/xml until 0.6.3-8.
 PreReq: xml-common >= 0.6.3-8
+# required because of usage of /usr/bin/xmlcatalog
+PreReq: libxml2 >= 2.4.8
 # PassiveTeX before 1.21 can't handle the newer stylesheets.
 Conflicts: passivetex < 1.21
 
@@ -99,6 +101,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-2
+- Added PreReq of libxml2(#253962)
+
 * Wed Sep  5 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:27:09 2007
From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera))
Date: Fri, 7 Sep 2007 08:27:09 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.28,1.29
Message-ID: <200709071227.l87CR9nx009040@cvs-int.fedora.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8968

Modified Files:
	fonts-indic.spec 
Log Message:
Renamed the package to reflect upstream project


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fonts-indic.spec	27 Jul 2007 09:27:07 -0000	1.28
+++ fonts-indic.spec	7 Sep 2007 12:26:37 -0000	1.29
@@ -2,9 +2,9 @@
 %define update_cache    /usr/bin/fc-cache 
 %define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
-Name:        fonts-indic
+Name:        lohit-fonts
 Version:     2.1.5
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     GPL
 Group:       User Interface/X
 BuildArch:   noarch
@@ -13,23 +13,23 @@
 Source:    fonts-indic-%{version}.tar.gz
 
 Summary: Free Indian truetype/opentype fonts
-%description
+%description 
 This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil,
 Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
-%package -n fonts-%1\
+%package -n lohit-fonts-%1\
 Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      User Interface/X \
-Obsoletes:  ttfonts-%2 <= 1.6-1\
-Provides :  ttfonts-%2 <= 1.6-1\
+Provides:  fonts-%1 = %{version}-%{release}\
+Obsoletes :  fonts-%1 < 2.1.5-3\
 Requires:   fontconfig\
 \
-%description -n fonts-%1\
+%description -n lohit-fonts-%1\
 These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
 \
-%files -n fonts-%1\
+%files -n lohit-fonts-%1\
 %defattr(-, root, root)\
 %dir %{xfontdir}\
 %dir %{xfontdir}/%1\
@@ -37,12 +37,12 @@
 %ghost %{xfontdir}/%1/fonts.cache-1\
 %{xfontdir}/%1/*ttf\
 \
-%post -n fonts-%1 \
+%post -n lohit-fonts-%1 \
 if [ -x %{_bindir}/fc-cache ]; then \
   %{_bindir}/fc-cache /usr/share/fonts \
 fi \
 \
-%postun -n fonts-%1 \
+%postun -n lohit-fonts-%1 \
 if [ "$1" = "0" ]; then \
   if [ -x %{_bindir}/fc-cache ]; then \
     %{_bindir}/fc-cache /usr/share/fonts \
@@ -60,7 +60,7 @@
 %mk_pkg telugu te
 
 %prep
-%setup -q
+%setup -q -n fonts-indic-%{version}
 
 %build
 echo "Nothing to do in Build."
@@ -80,6 +80,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
+- Renamed the package to reflect the upstream project name #253158
+
 * Fri Jul 27 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-2.fc8
 - SPEC cleanup as part of merge review #225763
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:36:09 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:36:09 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.104,1.105
Message-ID: <200709071236.l87Ca9iq010235@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158

Modified Files:
	gnome-media.spec 
Log Message:
Add new icons as well



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-media.spec	7 Sep 2007 11:59:42 -0000	1.104
+++ gnome-media.spec	7 Sep 2007 12:35:37 -0000	1.105
@@ -171,6 +171,7 @@
 %{_datadir}/idl/GNOME_Media_CDDBSlave2.idl
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/omf/gnome-media
 %{_datadir}/gnome-media
 %{_datadir}/gstreamer-properties



From fedora-extras-commits at redhat.com  Fri Sep  7 12:40:04 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 7 Sep 2007 08:40:04 -0400
Subject: rpms/gimp/devel gimp.spec,1.139,1.140
Message-ID: <200709071240.l87Ce47k010563@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10537

Modified Files:
	gimp.spec 
Log Message:
rebuild to pick up new version of poppler



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gimp.spec	4 Sep 2007 07:23:20 -0000	1.139
+++ gimp.spec	7 Sep 2007 12:39:31 -0000	1.140
@@ -45,7 +45,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}1%{?dist}
+Release:        %{?rcver:0.%{rcver}.}2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.2
+- rebuild to pick up new version of poppler
+
 * Tue Sep 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.1
 - version 2.4.0-rc2
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:44:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 08:44:19 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.105,1.106
Message-ID: <200709071244.l87CiJ9p010774@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10716

Modified Files:
	gnome-media.spec 
Log Message:
No OMF dir anymore



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-media.spec	7 Sep 2007 12:35:37 -0000	1.105
+++ gnome-media.spec	7 Sep 2007 12:43:46 -0000	1.106
@@ -172,7 +172,6 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/omf/gnome-media
 %{_datadir}/gnome-media
 %{_datadir}/gstreamer-properties
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:50:37 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 7 Sep 2007 08:50:37 -0400
Subject: rpms/curl/devel curl.spec,1.57,1.58
Message-ID: <200709071250.l87CobpJ010980@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10953

Modified Files:
	curl.spec 
Log Message:
- add support for the NSS PKCS#11 pem reader so the command-line is the
  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
- switch to NSS again



Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- curl.spec	3 Sep 2007 10:48:12 -0000	1.57
+++ curl.spec	7 Sep 2007 12:50:04 -0000	1.58
@@ -4,17 +4,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 4%{?dist}
+Release: 5%{?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.16.4-ftp.patch
+Patch4: curl-7.16.4-nsspem.patch
 URL: http://curl.haxx.se/
-Requires: openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: nss-devel >= 3.11.7-7
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -26,7 +27,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel, libidn-devel, pkgconfig, automake
+Requires: libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -40,13 +41,14 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .ftp
+%patch4 -p1 -b .nsspem
 
 %build
-if pkg-config openssl ; then
-	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
+if pkg-config nss ; then
+	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
 fi
-%configure --with-ssl=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
@@ -100,6 +102,11 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
+- add support for the NSS PKCS#11 pem reader so the command-line is the
+  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
+- switch to NSS again
+
 * Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
 - revert back to use OpenSSL (#266021)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 12:51:11 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 7 Sep 2007 08:51:11 -0400
Subject: rpms/curl/devel curl-7.16.4-nsspem.patch,NONE,1.1
Message-ID: <200709071251.l87CpB0R011028@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11015

Added Files:
	curl-7.16.4-nsspem.patch 
Log Message:
add nsspem patch


curl-7.16.4-nsspem.patch:

--- NEW FILE curl-7.16.4-nsspem.patch ---
diff -up curl-7.16.4/configure.nsspem curl-7.16.4/configure
--- curl-7.16.4/configure.nsspem	2007-06-25 11:18:41.000000000 +0200
+++ curl-7.16.4/configure	2007-09-06 08:35:31.000000000 +0200
@@ -26760,7 +26760,7 @@ echo "$as_me: WARNING: Use --with-ssl, -
 fi
 
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   { echo "$as_me:$LINENO: checking CA cert bundle install path" >&5
 echo $ECHO_N "checking CA cert bundle install path... $ECHO_C" >&6; }
diff -up curl-7.16.4/configure.ac.nsspem curl-7.16.4/configure.ac
--- curl-7.16.4/configure.ac.nsspem	2007-06-12 23:39:21.000000000 +0200
+++ curl-7.16.4/configure.ac	2007-09-06 08:35:31.000000000 +0200
@@ -1468,7 +1468,7 @@ dnl ************************************
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   AC_MSG_CHECKING([CA cert bundle install path])
 
diff -up curl-7.16.4/lib/nss.c.nsspem curl-7.16.4/lib/nss.c
--- curl-7.16.4/lib/nss.c.nsspem	2007-05-25 23:56:27.000000000 +0200
+++ curl-7.16.4/lib/nss.c	2007-09-06 09:26:39.000000000 +0200
@@ -55,6 +55,7 @@
 #include <ssl.h>
 #include <sslerr.h>
 #include <secerr.h>
+#include <secmod.h>
 #include <sslproto.h>
 #include <prtypes.h>
 #include <pk11pub.h>
@@ -69,10 +70,19 @@
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif
 
+#define SSL_DIR "/etc/pki/nssdb"
+
+/* enough to fit the string "PEM Token #[0|1]" */
+#define SLOTSIZE 13
+
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
 static int initialized = 0;
-static int noverify = 0;
+static int verify_done = 0;
+char * select_nickname = NULL;
+
+/* Global so our callbacks can update as appropriate */
+static int curlerr;
 
 #define HANDSHAKE_TIMEOUT 30
 
@@ -87,15 +97,25 @@ typedef struct {
   PRInt32 version; /* protocol version valid for this cipher */
 } cipher_s;
 
-/* the table itself is defined in nss_engine_init.c */
 #ifdef NSS_ENABLE_ECC
 #define ciphernum 48
 #else
 #define ciphernum 23
 #endif
 
+#define PK11_SETATTRS(x,id,v,l) \
+	do { \
+		(x)->type = (id); \
+		(x)->pValue=(v); \
+		(x)->ulValueLen = (l); \
+	} while (0)
+
+#define CERT_NewTempCertificate __CERT_NewTempCertificate
+
 enum sslversion { SSL2 = 1, SSL3 = 2, TLS = 4 };
 
+pphrase_arg_t *parg = NULL;
+
 cipher_s cipherlist[ciphernum] = {
   /* SSL2 cipher suites */
   {"rc4", SSL_EN_RC4_128_WITH_MD5, SSL2},
@@ -154,6 +174,9 @@ cipher_s cipherlist[ciphernum] = {
 #endif
 };
 
+const char* pem_library = "libnsspem.so";
+static SECMODModule* mod = NULL;
+
 static SECStatus set_ciphers(struct SessionHandle *data, PRFileDesc * model,
                              char *cipher_list)
 {
@@ -197,9 +220,7 @@ static SECStatus set_ciphers(struct Sess
     }
 
     if(found == PR_FALSE) {
-      char buf[1024];
-      snprintf(buf, 1024, "Unknown cipher in list: %s", cipher);
-      failf(data, buf);
+      failf(data, "Unknown cipher in list: %s", cipher);
       return SECFailure;
     }
 
@@ -220,27 +241,240 @@ static SECStatus set_ciphers(struct Sess
   return SECSuccess;
 }
 
+/*
+ * Determine whether the nickname passed in is a filename that needs to
+ * be loaded as a PEM or a regular NSS nickname. 
+ *
+ * returns 1 for a file
+ * returns 0 for not a file (NSS nickname)
+ */
+static int is_file(const char *filename) {
+    struct stat st;
+
+    if (filename == NULL)
+      return 0;
+
+    if (stat(filename, &st) == 0) {
+      if (S_ISREG(st.st_mode))
+        return 1;
+    }
+    return 0;
+}
+
+static int
+nss_load_cert(struct SessionHandle *data, const char *filename, PRBool cacert)
+{
+  CERTCertificate *cert;
+  void *proto_win = NULL;
+  CK_SLOT_ID slotID;
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_BBOOL ckfalse = CK_FALSE;
+  CK_OBJECT_CLASS objClass = CKO_CERTIFICATE;
+  char *nickname = NULL;
+  char *slotname = NULL;
+  char *n;
+
+  /* If there is no slash in the filename it is assumed to be a regular
+   * NSS nickname.
+   */
+  if (is_file(filename)) {
+    n = strrchr(filename, '/');
+    if (n)
+      n++;
+  } else {
+    /* A nickname from the NSS internal database */
+    nickname = strdup(filename);
+    goto done;
+  }
+
+  attrs = theTemplate;
+
+  /* All CA and trust objects go into slot 0. Other slots are used
+   * for storing certificates. With each new user certificate we increment
+   * the slot count. We only support 1 user certificate right now.
+   */
+  if (cacert) {
+    slotID = 0;
+  } else {
+    slotID = 1;
+  } 
+  
+  slotname = (char *)malloc(SLOTSIZE);
+  nickname = (char *)malloc(PATH_MAX);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+  snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", slotID, n);
+
+  slot = PK11_FindSlotByName(slotname);
+  
+  if (!slot) {
+    free(slotname);
+    free(nickname);
+    return 0;
+  }
+  
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)filename, strlen(filename)+1); attrs++;
+  if (cacert) {
+    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  } else {
+    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) ); attrs++;
+  }
+
+  /* This load the certificate in our PEM module into the appropriate
+   * slot.
+   */
+  rv = PK11_CreateGenericObject(slot, theTemplate, 4, PR_FALSE /* isPerm */);
+
+  PK11_FreeSlot(slot);
+
+  free(slotname);
+  if (rv == NULL) {
+      free(nickname);
+      return 0;
+  }
+
+done:
+  /* Double-check that the certificate or nickname requested exists in
+   * either the token or the NSS certificate database.
+   */
+  if (!cacert) {
+    cert = PK11_FindCertFromNickname((char *)nickname, proto_win);
+
+    /* An invalid nickname was passed in */
+    if (cert == NULL) {
+      PR_SetError(SEC_ERROR_UNKNOWN_CERT, 0);
+      return 0;
+    }
+
+    CERT_DestroyCertificate(cert);
+  }
+  free(nickname);
+
+  return 1;
+}
+
+static int nss_load_key(char *key_file)
+{
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_OBJECT_CLASS objClass = CKO_PRIVATE_KEY;
+  CK_SLOT_ID slotID;
+  char *slotname = NULL;
+
+  attrs = theTemplate;
+
+  /* FIXME: grok the various file types */
+
+  /* FIXME: shouldn't be hardcoded */
+  slotID = 1;
+
+  slotname = (char *)malloc(SLOTSIZE);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+
+  slot = PK11_FindSlotByName(slotname);
+  free(slotname);
+
+  if (!slot) {
+    return 0;
+  }
+
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)key_file, 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) {
+    PR_SetError(SEC_ERROR_BAD_KEY, 0);
+    return 0;
+  }
+
+  /* This will force the token to be seen as re-inserted */
+  PK11_IsPresent(slot);
+
+  parg->retryCount = 0;
+  /* parg is initialized in nss_Init_Tokens() */
+  if (PK11_Authenticate(slot, PR_TRUE, parg) != SECSuccess) {
+    return 0;
+  }
+
+  return 1;
+}
+
+static int display_error(struct connectdata *conn, PRInt32 err, const char *filename) {
+  switch(err) {
+    case SEC_ERROR_BAD_PASSWORD:
+      failf(conn->data, "Unable to load client key: Incorrect password\n");
+      return 1;
+    case SEC_ERROR_UNKNOWN_CERT:
+      failf(conn->data, "Unable to load certificate %s\n", filename);
+      return 1;
+  }
+  return 0; /* The caller will print a generic error */
+}
+
+static int cert_stuff(struct connectdata *conn, char *cert_file, char *key_file)
+{
+  struct SessionHandle *data = conn->data;
+  int rv = 0;
+
+  if (cert_file)
+    rv = nss_load_cert(data, cert_file, PR_FALSE);  
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), cert_file))
+        failf(data, "Unable to load client cert %d.", PR_GetError());
+      return 0;
+    }
+  if (key_file || (is_file(cert_file) )) {
+    if (key_file)
+      rv = nss_load_key(key_file);
+    else
+      rv = nss_load_key(cert_file);
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), key_file))
+        failf(data, "Unable to load client key %d.", PR_GetError());
+
+      return 0;
+    }
+  }
+  return 1;
+}
+
 static char * nss_get_password(PK11SlotInfo * slot, PRBool retry, void *arg)
 {
   pphrase_arg_t *parg = (pphrase_arg_t *) arg;
-  (void)slot; /* unused */
-  (void)retry; /* unused */
+  parg->retryCount++;
+  if (parg->retryCount > 2)
+    return NULL;
   if(parg->data->set.key_passwd)
     return (char *)PORT_Strdup((char *)parg->data->set.key_passwd);
   else
     return NULL;
 }
 
-static SECStatus nss_Init_Tokens(struct connectdata * conn)
+static char * nss_no_password(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+   return NULL;
+}
+
+static SECStatus nss_Init_Tokens(struct SessionHandle *data)
 {
   PK11SlotList *slotList;
   PK11SlotListElement *listEntry;
   SECStatus ret, status = SECSuccess;
-  pphrase_arg_t *parg;
 
-  parg = (pphrase_arg_t *) malloc(sizeof(*parg));
+  if (!parg)
+      parg = (pphrase_arg_t *) malloc(sizeof(*parg));
   parg->retryCount = 0;
-  parg->data = conn->data;
+  parg->data = data;
 
   PK11_SetPasswordFunc(nss_get_password);
 
@@ -253,10 +487,10 @@ static SECStatus nss_Init_Tokens(struct 
 
     if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {
       if(slot == PK11_GetInternalKeySlot()) {
-        failf(conn->data, "The NSS database has not been initialized.\n");
+        failf(data, "The NSS database has not been initialized.\n");
       }
       else {
-        failf(conn->data, "The token %s has not been initialized.",
+        failf(data, "The token %s has not been initialized.",
               PK11_GetTokenName(slot));
       }
       PK11_FreeSlot(slot);
@@ -265,6 +499,8 @@ static SECStatus nss_Init_Tokens(struct 
 
     ret = PK11_Authenticate(slot, PR_TRUE, parg);
     if(SECSuccess != ret) {
+      if (PR_GetError() == SEC_ERROR_BAD_PASSWORD)
+        infof(data, "The password for token '%s' is incorrect\n", PK11_GetTokenName(slot));
       status = SECFailure;
       break;
     }
@@ -272,15 +508,59 @@ static SECStatus nss_Init_Tokens(struct 
     PK11_FreeSlot(slot);
   }
 
-  free(parg);
   return status;
 }
 
 static SECStatus BadCertHandler(void *arg, PRFileDesc * socket)
 {
   SECStatus success = SECSuccess;
-  (void)arg;
-  (void)socket;
+  struct connectdata *conn = (struct connectdata *)arg;
+  PRErrorCode err = PR_GetError();
+  CERTCertificate *cert = NULL;
+  char *subject, *issuer;
+
+  if (verify_done)
+      return success;
+
+  verify_done = 1;
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  CERT_DestroyCertificate(cert);
+
+  switch(err) {
+  case SEC_ERROR_CA_CERT_INVALID:
+    infof(conn->data, "Issuer certificate is invalid: '%s'\n", issuer);
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    break;
+  case SEC_ERROR_UNTRUSTED_ISSUER:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Certificate is signed by an untrusted issuer: '%s'\n", issuer);
+    break;
+  case SSL_ERROR_BAD_CERT_DOMAIN:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "common name: %s (does not match '%s')\n",
+          subject, conn->host.dispname);
+    break;
+  case SEC_ERROR_EXPIRED_CERTIFICATE:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Remote Certificate has expired.\n");
+    break;
+  default:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Bad certificate received. Subject = '%s', Issuer = '%s'\n", subject, issuer);
+    break;
+  }
+  if (success == SECSuccess)
+    infof(conn->data, "SSL certificate verify ok.\n");
+  PR_Free(subject);
+  PR_Free(issuer);
+  curlerr = CURLE_SSL_CACERT;
 
   return success;
 }
@@ -295,6 +575,52 @@ static SECStatus HandshakeCallback(PRFil
   return SECSuccess;
 }
 
+static void display_conn_info(struct connectdata *conn, PRFileDesc * socket)
+{
+  SSLChannelInfo channel;
+  SSLCipherSuiteInfo suite;
+  CERTCertificate *cert;
+  char *subject, *issuer, *common_name;
+  PRExplodedTime printableTime;
+  char timeString[256];
+  PRTime notBefore, notAfter;
+
+  if (SSL_GetChannelInfo(socket, &channel, sizeof channel) ==
+    SECSuccess && channel.length == sizeof channel &&
+    channel.cipherSuite) {
+    if (SSL_GetCipherSuiteInfo(channel.cipherSuite,
+      &suite, sizeof suite) == SECSuccess) {
+      infof(conn->data, "SSL connection using %s\n", suite.cipherSuiteName);
+    }
+  }
+
+  infof(conn->data, "Server certificate:\n");
+
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  common_name = CERT_GetCommonName(&cert->subject);
+  infof(conn->data, "\tsubject: %s\n", subject);
+
+  CERT_GetCertTimes(cert, &notBefore, &notAfter);
+  PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\tstart date: %s\n", timeString);
+  PR_ExplodeTime(notAfter, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\texpire date: %s\n", timeString);
+  infof(conn->data, "\tcommon name: %s\n", common_name);
+  infof(conn->data, "\tissuer: %s\n", issuer);
+
+  PR_Free(subject);
+  PR_Free(issuer);
+  PR_Free(common_name);
+
+  CERT_DestroyCertificate(cert);
+
+  return;
+}
+
 /**
  *
  * Callback to pick the SSL client certificate.
@@ -309,24 +635,42 @@ static SECStatus SelectClientCert(void *
   char *nickname = (char *)arg;
   void *proto_win = NULL;
   SECStatus secStatus = SECFailure;
+  PK11SlotInfo *slot;
   (void)caNames;
 
   proto_win = SSL_RevealPinArg(socket);
 
+  if (!nickname)
+    return secStatus;
+
   cert = PK11_FindCertFromNickname(nickname, proto_win);
   if(cert) {
-    privKey = PK11_FindKeyByAnyCert(cert, proto_win);
-    if(privKey) {
-      secStatus = SECSuccess;
-    }
-    else {
-      CERT_DestroyCertificate(cert);
+
+    if (!strncmp(nickname, "PEM Token", 9)) {
+      CK_SLOT_ID slotID = 1; /* hardcoded for now */
+      char * slotname = (char *)malloc(SLOTSIZE);
+      snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+      slot = PK11_FindSlotByName(slotname);
+      privKey = PK11_FindPrivateKeyFromCert(slot, cert, NULL);
+      PK11_FreeSlot(slot);
+      free(slotname);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
+    } else {
+      privKey = PK11_FindKeyByAnyCert(cert, proto_win);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
     }
   }
 
   if(secStatus == SECSuccess) {
     *pRetCert = cert;
     *pRetKey = privKey;
+  } else {
+    if (cert)
+      CERT_DestroyCertificate(cert);
   }
 
   return secStatus;
@@ -397,6 +741,8 @@ void Curl_nss_close(struct connectdata *
     }
     connssl->use = FALSE; /* get back to ordinary socket usage */
   }
+  if (select_nickname)
+    free(select_nickname);
 }
 
 /*
@@ -418,31 +764,52 @@ CURLcode Curl_nss_connect(struct connect
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   SECStatus rv;
-  int curlerr = CURLE_SSL_CONNECT_ERROR;
+  char *configstring = NULL;
+  char *certDir = NULL;
+
+  curlerr = CURLE_SSL_CONNECT_ERROR;
+  certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
+
+  if (!certDir) {
+    struct stat st;
+
+    if (stat(SSL_DIR, &st) == 0)
+      if (S_ISDIR(st.st_mode)) {
+        certDir = "/etc/pki/nssdb";
+      }
+  }
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   if(!initialized) {
-    if(!data->set.ssl.CAfile) {
-      if(data->set.ssl.verifypeer) {
-        failf(data, "No NSS cacert database specified.");
-        return CURLE_SSL_CACERT_BADFILE;
-      }
-      else {
-        rv = NSS_NoDB_Init(NULL);
-        noverify = 1;
-      }
+    if(!certDir) {
+      rv = NSS_NoDB_Init(NULL);
     }
     else {
-      rv = NSS_Initialize(data->set.ssl.CAfile, NULL, NULL, "secmod.db",
+      rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
                           NSS_INIT_READONLY);
     }
     if(rv != SECSuccess) {
       curlerr = CURLE_SSL_CACERT_BADFILE;
       goto error;
     }
-  }
+    configstring = (char *)malloc(4096);
+
+    NSS_SetDomesticPolicy();
 
-  NSS_SetDomesticPolicy();
+    PR_snprintf(configstring, 4096, "library=%s name=PEM", pem_library);
+//    PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"NSS=\"trustorder=75\"\"", pem_library);
+//     PR_snprintf(configstring, 4096, "library=/usr/lib/libnsspem.so name=PEM parameters=\"/etc/pki/tls/certs/ca-bundle.crt\" NSS=\"trustorder=75\"");
+
+    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!mod || !mod->loaded) {
+      if (mod) {
+        SECMOD_DestroyModule(mod);
+        mod = NULL;
+      }
+      infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL PEM certificates will not work.\n", pem_library);
+    }
+    free(configstring);
+  }
 
   model = PR_NewTCPSocket();
   if(!model)
@@ -482,26 +849,92 @@ CURLcode Curl_nss_connect(struct connect
     goto error;
 
   if(data->set.ssl.cipher_list) {
-    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess)
+    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess) {
+      curlerr = CURLE_SSL_CIPHER;
       goto error;
+    }
   }
 
-  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, NULL)
-     != SECSuccess)
+  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
+     != SECSuccess) {
     goto error;
+  }
   if(SSL_HandshakeCallback(model, (SSLHandshakeCallback) HandshakeCallback,
                            NULL) != SECSuccess)
     goto error;
 
+  if (mod && data->set.ssl.CAfile) {
+    rv = nss_load_cert(data, data->set.ssl.CAfile, PR_TRUE);
+  } else if (data->set.ssl.CApath) {
+    struct stat st;
+    PRDir      *dir;
+    PRDirEntry *entry;
+
+    if (stat(data->set.ssl.CApath, &st) == -1)
+      curlerr = CURLE_SSL_CACERT_BADFILE;
+      goto error;
+
+    if (S_ISDIR(st.st_mode)) {
+      dir = PR_OpenDir(data->set.ssl.CApath);
+      int rv;
+      do {
+        entry = PR_ReadDir(dir, PR_SKIP_BOTH | PR_SKIP_HIDDEN);
+
+        if (entry) {
+          char fullpath[PATH_MAX];
+
+          snprintf(fullpath, sizeof(fullpath), "%s/%s", data->set.ssl.CApath, entry->name);
+          rv = nss_load_cert(data, fullpath, PR_TRUE);
+        }
+      /* This is purposefully tolerant of errors so non-PEM files
+       * can be in the same directory */
+      } while (entry != NULL);
+      PR_CloseDir(dir);
+    }
+  }
+  infof(data,
+        "  CAfile: %s\n"
+        "  CApath: %s\n",
+        data->set.ssl.CAfile ? data->set.ssl.CAfile : "none",
+        data->set.ssl.CApath ? data->set.ssl.CApath : "none");
+
   if(data->set.cert) {
+    char * n;
+    char * nickname;
+
+    nickname = (char *)malloc(PATH_MAX);
+    if (is_file(data->set.cert)) {
+      n = strrchr(data->set.cert, '/');
+      if (n) {
+          n++; /* skip last slash */
+          snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", 1, n);
+      }
+    } else {
+        strncpy(nickname, data->set.cert, PATH_MAX);
+    }
+    if(nss_Init_Tokens(conn->data) != SECSuccess) {
+      free(nickname);
+      goto error;
+    }
+    if (!cert_stuff(conn, data->set.cert, data->set.key)) {
+      /* failf() is already done in cert_stuff() */
+      free(nickname);
+      return CURLE_SSL_CERTPROBLEM;
+    }
+
+    select_nickname = strdup(nickname);
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)data->set.cert) != SECSuccess) {
+                                 (void *)select_nickname) != SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }
-    if(nss_Init_Tokens(conn) != SECSuccess)
-      goto error;
+
+    free(nickname);
+    free(parg);
+
+    /* No longer return the password, lets us free parg */
+    PK11_SetPasswordFunc(nss_no_password);
   }
 
   /* Import our model socket  onto the existing file descriptor */
@@ -509,6 +942,7 @@ CURLcode Curl_nss_connect(struct connect
   connssl->handle = SSL_ImportFD(model, connssl->handle);
   if(!connssl->handle)
     goto error;
+  PR_Close(model); /* We don't need this any more */
 
   /* Force handshake on next I/O */
   SSL_ResetHandshake(connssl->handle, /* asServer */ PR_FALSE);
@@ -518,14 +952,17 @@ CURLcode Curl_nss_connect(struct connect
   /* Force the handshake now */
   if (SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
-      != SECSuccess)
+      != SECSuccess) {
     goto error;
+  }
+
+  display_conn_info(conn, connssl->handle);
 
   return CURLE_OK;
 
 error:
   err = PR_GetError();
-  failf(data, "NSS error %d", err);
+  infof(data, "NSS error %d\n", err);
   if(model)
     PR_Close(model);
   return curlerr;



From fedora-extras-commits at redhat.com  Fri Sep  7 12:52:37 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 7 Sep 2007 08:52:37 -0400
Subject: rpms/udev/devel udev-115-git-20070907.patch, NONE,
	1.1 udev-115-looplast.patch, NONE,
	1.1 udev-115-rulesinstall.patch, NONE, 1.1 udev.spec, 1.218, 1.219
Message-ID: <200709071252.l87CqbvU011183@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11134

Modified Files:
	udev.spec 
Added Files:
	udev-115-git-20070907.patch udev-115-looplast.patch 
	udev-115-rulesinstall.patch 
Log Message:
* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
- some upstream fixes from git
- last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)


udev-115-git-20070907.patch:

--- NEW FILE udev-115-git-20070907.patch ---
diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
deleted file mode 100644
index ee349dc..0000000
--- a/etc/udev/gentoo/05-udev-early.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
-SUBSYSTEM=="module",	OPTIONS="ignore_device"
-
-# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
new file mode 100644
index 0000000..7bc55c6
--- /dev/null
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -0,0 +1,47 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="kernel_compat_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+
+# needed for kernels <2.6.16
+SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+
+# needed for kernels <2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
+
+
+# needed for kernels <2.6.22
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+
+
+
+# this driver is broken and should not be loaded automatically
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
+# needed for kernels <2.6.21
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
+
+# No need for more code, as MODALIAS is present
+ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
+
+# needed for kernels <2.6.22
+SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+
+LABEL="kernel_compat_end"
+
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index dd32971..7c2ac81 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -1,13 +1,9 @@
+# do not edit this file, it will be overwritten on update
+
 # /etc/udev/rules/50-udev.rules:  device naming rules for udev
 #
 # Gentoo specific rules
 #
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
 
 # Net devices can have arbitrary names, even
 # ones set by the user. Not try to match normal
@@ -241,10 +237,6 @@ KERNEL=="umad*",	NAME="infiniband/%k"
 KERNEL=="issm*",	NAME="infiniband/%k"
 
 
-# usbfs-like device nodes
-# the way to go up to kernel 2.6.21 (and above if setting USB_DEVICE_CLASS=y)
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
-# starting from kernel 2.6.22 use this rule
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
 	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
 
diff --git a/etc/udev/gentoo/80-hotplug.rules b/etc/udev/gentoo/80-hotplug.rules
deleted file mode 100644
index 0637dbc..0000000
--- a/etc/udev/gentoo/80-hotplug.rules
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/udev/rules/80-hotplug.rules:  module loading rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Module autoloading
-ACTION!="add", GOTO="hotplug_load_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="hotplug_load_end"
-
diff --git a/etc/udev/gentoo/90-network.rules b/etc/udev/gentoo/90-network.rules
new file mode 100644
index 0000000..50903af
--- /dev/null
+++ b/etc/udev/gentoo/90-network.rules
@@ -0,0 +1,8 @@
+# do not edit this file, it will be overwritten on update
+
+# /etc/udev/rules/90-network.rules:  triggering network init-scripts
+
+# Activate our network if we can
+SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
+SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
+
diff --git a/etc/udev/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
deleted file mode 100644
index 40ada28..0000000
--- a/etc/udev/gentoo/95-udev-late.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/udev/rules/95-udev-late.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
-# event to be catched by udevmonitor
-RUN+="socket:/org/kernel/udev/monitor"
-
diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index bff2fe5..bdce004 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -17,18 +17,15 @@ KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # mem
-KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
-KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
-KERNEL=="urandom",		MODE="0644"
-KERNEL=="full",			MODE="0666"
 
 # input
 KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0600"
 KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644", SYMLINK+="%k"
 
 # video4linux
@@ -58,7 +55,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{
 KERNEL=="parport[0-9]*",	GROUP="lp"
 SUBSYSTEM=="printer",		KERNEL=="lp*", GROUP="lp"
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*",		GROUP="lp" SYMLINK+="par%n"
+KERNEL=="lp[0-9]*",		GROUP="lp", SYMLINK+="par%n"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
 
 # block, tapes, block-releated
@@ -71,7 +68,7 @@ KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
 KERNEL=="sch[0-9]*",		GROUP="disk"
 KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk""
+KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
@@ -80,6 +77,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="qft0",			SYMLINK+="ftape"
+SUBSYSTEM=="bsg"		NAME="bsg/%k"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
@@ -91,7 +89,8 @@ KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",			MODE="0666"
-KERNEL=="rtc",			MODE="0644"
+KERNEL=="rtc|rtc0",		MODE="0644"
+KERNEL=="rtc0",			SYMLINK+="rtc"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
 KERNEL=="mmtimer",		MODE="0644"
@@ -103,3 +102,6 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 
+# do not delete static device nodes
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+
diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index e71f135..3388266 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -7,6 +7,7 @@ SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 
diff --git a/etc/udev/rules.d/95-udev-late.rules b/etc/udev/rules.d/95-udev-late.rules
index 1755d08..4a015b9 100644
--- a/etc/udev/rules.d/95-udev-late.rules
+++ b/etc/udev/rules.d/95-udev-late.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"
 
diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6d1d19c..ff2c47c 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -142,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-	uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+	uint64_t sboff;
 
 	/* version 0 at the end of the device */
+	sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
 	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
 		return 0;
 
 	/* version 1.0 at the end of the device */
+	sboff = (size & ~(0x1000 - 1)) - 0x2000;
 	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
 		return 0;
 
diff --git a/extras/volume_id/vol_id.8 b/extras/volume_id/vol_id.8
index 7594253..daa583b 100644
--- a/extras/volume_id/vol_id.8
+++ b/extras/volume_id/vol_id.8
@@ -1,6 +1,6 @@
 .\"     Title: vol_id
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: vol_id
 .\"    Source: volume_id
@@ -11,69 +11,69 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-vol_id \- probe filesystem type and read label and uuid
+vol_id - probe filesystem type and read label and uuid
 .SH "SYNOPSIS"
 .HP 7
 \fBvol_id\fR [\fB\-\-export\fR] [\fB\-\-type\fR] [\fB\-\-label\fR] [\fB\-\-label\-raw\fR] [\fB\-\-uuid\fR] [\fB\-\-skip\-raid\fR] [\fB\-\-probe\-all\fR] [\fB\-\-help\fR] [\fIdevice\fR]
 .SH "DESCRIPTION"
 .PP
 \fBvol_id\fR
-is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem.
+is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume\. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem\.
 .SH "OPTIONS"
 .PP
 \fB\-\-export\fR
 .RS 4
-Print all values in key/value format to import them into the environment.
+Print all values in key/value format to import them into the environment\.
 .RE
 .PP
 \fB\-\-type\fR
 .RS 4
-Print the filesystem type.
+Print the filesystem type\.
 .RE
 .PP
 \fB\-\-label\fR
 .RS 4
-Print the safe version of volume label suitable for use as filename.
+Print the safe version of volume label suitable for use as filename\.
 .RE
 .PP
 \fB\-\-label\-raw\fR
 .RS 4
-Print the raw volume label.
+Print the raw volume label\.
 .RE
 .PP
 \fB\-\-uuid\fR
 .RS 4
-Print the uuid of a volume.
+Print the uuid of a volume\.
 .RE
 .PP
 \fB\-\-skip\-raid\fR
 .RS 4
-Skip detection of raid metadata.
+Skip detection of raid metadata\.
 .RE
 .PP
 \fB\-\-probe\-all\fR
 .RS 4
-Probe for all types and print all matches.
+Probe for all types and print all matches\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Set the syslog priority.
+Set the syslog priority\.
 .RE
 .SH "EXIT STATUS"
 .PP
 \fBvol_id\fR
-will only return successful if the value asked for is not empty. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored.
+will only return successful if the value asked for is not empty\. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored\.
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udev.7 b/udev.7
index 821a476..874c9ab 100644
--- a/udev.7
+++ b/udev.7
@@ -1,6 +1,6 @@
 .\"     Title: udev
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udev
 .\"    Source: udev
@@ -11,213 +11,213 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udev \- dynamic device management
+udev - dynamic device management
 .SH "DESCRIPTION"
 .PP
-udev provides a dynamic device directory containing only the files for actually present devices. It creates or removes device node files in the
+udev provides a dynamic device directory containing only the files for actually present devices\. It creates or removes device node files in the
 \fI/dev\fR
-directory, or it renames network interfaces.
+directory, or it renames network interfaces\.
 .PP
 Usually udev runs as
 \fBudevd\fR(8)
-and receives uevents directly from the kernel if a device is added or removed from the system.
+and receives uevents directly from the kernel if a device is added or removed from the system\.
 .PP
-If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling.
+If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device\. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling\.
 .SH "CONFIGURATION"
 .PP
 All udev configuration files are placed in
-\fI/etc/udev/*\fR. Every file consists of a set of lines of text. All empty lines or lines beginning with '#' will be ignored.
+\fI/etc/udev/*\fR\. Every file consists of a set of lines of text\. All empty lines or lines beginning with \'#\' will be ignored\.
 .SS "Configuration file"
 .PP
 udev expects its main configuration file at
-\fI/etc/udev/udev.conf\fR. It consists of a set of variables allowing the user to override default udev values. The following variables can be set:
+\fI/etc/udev/udev\.conf\fR\. It consists of a set of variables allowing the user to override default udev values\. The following variables can be set:
 .PP
 \fBudev_root\fR
 .RS 4
-Specifies where to place the device nodes in the filesystem. The default value is
-\fI/dev\fR.
+Specifies where to place the device nodes in the filesystem\. The default value is
+\fI/dev\fR\.
 .RE
 .PP
 \fBudev_rules\fR
 .RS 4
 The name of the udev rules file or directory to look for files with the suffix
-\fI.rules\fR. Multiple rule files are read in lexical order. The default value is
-\fI/etc/udev/rules.d\fR.
+\fI\.rules\fR\. Multiple rule files are read in lexical order\. The default value is
+\fI/etc/udev/rules\.d\fR\.
 .RE
 .PP
 \fBudev_log\fR
 .RS 4
-The logging priority. Valid values are the numerical syslog priorities or their textual representations:
+The logging priority\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .SS "Rules files"
 .PP
 The udev rules are read from the files located in the
-\fI/etc/udev/rules.d\fR
-directory or at the location specified value in the configuration file. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned.
+\fI/etc/udev/rules\.d\fR
+directory or at the location specified value in the configuration file\. Every line in the rules file contains at least one key value pair\. There are two kind of keys, match and assignment keys\. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned\.
 .PP
-A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling. If no matching rule is found, the default device node name is used.
+A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling\. If no matching rule is found, the default device node name is used\.
 .PP
-A rule may consist of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are:
+A rule may consist of a list of one or more key value pairs separated by a comma\. Each key has a distinct operation, depending on the used operator\. Valid operators are:
 .PP
 \fB==\fR
 .RS 4
-Compare for equality.
+Compare for equality\.
 .RE
 .PP
 \fB!=\fR
 .RS 4
-Compare for non\-equality.
+Compare for non\-equality\.
 .RE
 .PP
 \fB=\fR
 .RS 4
-Assign a value to a key. Keys that represent a list, are reset and only this single value is assigned.
+Assign a value to a key\. Keys that represent a list, are reset and only this single value is assigned\.
 .RE
 .PP
 \fB+=\fR
 .RS 4
-Add the value to a key that holds a list of entries.
+Add the value to a key that holds a list of entries\.
 .RE
 .PP
 \fB:=\fR
 .RS 4
-Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules.
+Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules\.
 .RE
 .PP
-The following key names can be used to match against device properties. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device.
+The following key names can be used to match against device properties\. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event\. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device\.
 .PP
 \fBACTION\fR
 .RS 4
-Match the name of the event action.
+Match the name of the event action\.
 .RE
 .PP
 \fBDEVPATH\fR
 .RS 4
-Match the devpath of the event device.
+Match the devpath of the event device\.
 .RE
 .PP
 \fBKERNEL\fR
 .RS 4
-Match the name of the event device.
+Match the name of the event device\.
 .RE
 .PP
 \fBSUBSYSTEM\fR
 .RS 4
-Match the subsystem of the event device.
+Match the subsystem of the event device\.
 .RE
 .PP
 \fBDRIVER\fR
 .RS 4
-Match the driver name of the event device. Only set for devices which are bound to a driver at the time the event is generated.
+Match the driver name of the event device\. Only set for devices which are bound to a driver at the time the event is generated\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Match sysfs attribute values of the event device. Up to five
+Match sysfs attribute values of the event device\. Up to five
 \fBATTR\fR
-keys can be specified per rule. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself. Depending on the type of operator, this key is also used to set the value of a sysfs attribute.
+keys can be specified per rule\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\. Depending on the type of operator, this key is also used to set the value of a sysfs attribute\.
 .RE
 .PP
 \fBKERNELS\fR
 .RS 4
-Search the devpath upwards for a matching device name.
+Search the devpath upwards for a matching device name\.
 .RE
 .PP
 \fBSUBSYSTEMS\fR
 .RS 4
-Search the devpath upwards for a matching device subsystem name.
+Search the devpath upwards for a matching device subsystem name\.
 .RE
 .PP
 \fBDRIVERS\fR
 .RS 4
-Search the devpath upwards for a matching device driver name.
+Search the devpath upwards for a matching device driver name\.
 .RE
 .PP
 \fBATTRS{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Search the devpath upwards for a device with matching sysfs attribute values. Up to five
+Search the devpath upwards for a device with matching sysfs attribute values\. Up to five
 \fBATTRS\fR
-keys can be specified per rule, but all of them must match on the same device. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself.
+keys can be specified per rule, but all of them must match on the same device\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Match against the value of an environment variable. Up to five
+Match against the value of an environment variable\. Up to five
 \fBENV\fR
-keys can be specified per rule. Depending on the type of operator, this key is also used to export a variable to the environment.
+keys can be specified per rule\. Depending on the type of operator, this key is also used to export a variable to the environment\.
 .RE
 .PP
 \fBTEST{\fR\fB\fIoctal mode mask\fR\fR\fB}\fR
 .RS 4
-Test the existence of a file. An octal mode mask can be specified if needed.
+Test the existence of a file\. An octal mode mask can be specified if needed\.
 .RE
 .PP
 \fBPROGRAM\fR
 .RS 4
-Execute external program. The key is true, if the program returns with exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout, is available in the RESULT key.
+Execute external program\. The key is true, if the program returns with exit code zero\. The whole event environment is available to the executed program\. The program\'s output printed to stdout, is available in the RESULT key\.
 .RE
 .PP
 \fBRESULT\fR
 .RS 4
-Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call.
+Match the returned string of the last PROGRAM call\. This key can be used in the same or in any later rule after a PROGRAM call\.
 .RE
 .PP
-Most of the fields support a shell style pattern matching. The following pattern characters are supported:
+Most of the fields support a shell style pattern matching\. The following pattern characters are supported:
 .PP
 \fB*\fR
 .RS 4
-Matches zero, or any number of characters.
+Matches zero, or any number of characters\.
 .RE
 .PP
 \fB?\fR
 .RS 4
-Matches any single character.
+Matches any single character\.
 .RE
 .PP
 \fB[]\fR
 .RS 4
-Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched.
+Matches any single character specified within the brackets\. For example, the pattern string \'tty[SR]\' would match either \'ttyS\' or \'ttyR\'\. Ranges are also supported within this match with the \'\-\' character\. For example, to match on the range of all digits, the pattern [0\-9] would be used\. If the first character following the \'[\' is a \'!\', any characters not enclosed are matched\.
 .RE
 .PP
 The following keys can get values assigned:
 .PP
 \fBNAME\fR
 .RS 4
-The name of the node to be created, or the name the network interface should be renamed to. Only one rule can set the node name, all later rules with a NAME key will be ignored.
+The name of the node to be created, or the name the network interface should be renamed to\. Only one rule can set the node name, all later rules with a NAME key will be ignored\.
 .RE
 .PP
 \fBSYMLINK\fR
 .RS 4
-The name of a symlink targeting the node. Every matching rule can add this value to the list of symlinks to be created along with the device node. Multiple symlinks may be specified by separating the names by the space character.
+The name of a symlink targeting the node\. Every matching rule can add this value to the list of symlinks to be created along with the device node\. Multiple symlinks may be specified by separating the names by the space character\.
 .RE
 .PP
 \fBOWNER, GROUP, MODE\fR
 .RS 4
-The permissions for the device node. Every specified value overwrites the compiled\-in default value.
+The permissions for the device node\. Every specified value overwrites the compiled\-in default value\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value that should be written to a sysfs attribute of the event device. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute.
+The value that should be written to a sysfs attribute of the event device\. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Export a variable to the environment. Depending on the type of operator, this key is also to match against an environment variable.
+Export a variable to the environment\. Depending on the type of operator, this key is also to match against an environment variable\.
 .RE
 .PP
 \fBRUN\fR
 .RS 4
-Add a program to the list of programs to be executed for a specific device. This can only be used for very short running tasks. Running an event process for a long period of time may block all further events for this or a dependent device. Long running tasks need to be immediately detached from the event process itself.
+Add a program to the list of programs to be executed for a specific device\. This can only be used for very short running tasks\. Running an event process for a long period of time may block all further events for this or a dependent device\. Long running tasks need to be immediately detached from the event process itself\.
 .RE
 .PP
 \fBLABEL\fR
 .RS 4
-Named label where a GOTO can jump to.
+Named label where a GOTO can jump to\.
 .RE
 .PP
 \fBGOTO\fR
@@ -229,72 +229,68 @@ Jumps to the next LABEL with a matching name
 .RS 4
 Import a set of variables into the event environment, depending on
 \fItype\fR:
-.RS 4
 .PP
 \fBprogram\fR
 .RS 4
-Execute an external program specified as the assigned value and import its output, which must be in environment key format.
+Execute an external program specified as the assigned value and import its output, which must be in environment key format\.
 .RE
 .PP
 \fBfile\fR
 .RS 4
-Import a text file specified as the assigned value, which must be in environment key format.
+Import a text file specified as the assigned value, which must be in environment key format\.
 .RE
 .PP
 \fBparent\fR
 .RS 4
-Import the stored keys from the parent device by reading the database entry of the parent device. The value assigned to
+Import the stored keys from the parent device by reading the database entry of the parent device\. The value assigned to
 \fBIMPORT{parent}\fR
-is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons).
-.RE
+is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons)\.
 .RE
-.IP "" 4
+.sp
 If no option is given, udev will choose between
 \fBprogram\fR
 and
 \fBfile\fR
-based on the executable bit of the file permissions.
+based on the executable bit of the file permissions\.
 .RE
 .PP
 \fBWAIT_FOR_SYSFS\fR
 .RS 4
-Wait for the specified sysfs file of the device to be created. Can be used to fight against kernel sysfs timing issues.
+Wait for the specified sysfs file of the device to be created\. Can be used to fight against kernel sysfs timing issues\.
 .RE
 .PP
 \fBOPTIONS\fR
 .RS 4
 Rule and device options:
-.RS 4
 .PP
 \fBlast_rule\fR
 .RS 4
-Stops further rules application. No later rules will have any effect.
+Stops further rules application\. No later rules will have any effect\.
 .RE
 .PP
 \fBignore_device\fR
 .RS 4
-Ignore this event completely.
+Ignore this event completely\.
 .RE
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device. This may be useful as a workaround for broken device drivers.
+Do not remove the device node when the device goes away\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Specify the priority of the created symlinks. Devices with higher priorities overwrite existing symlinks of other devices.
+Specify the priority of the created symlinks\. Devices with higher priorities overwrite existing symlinks of other devices\.
 .RE
 .PP
 \fBall_partitions\fR
 .RS 4
-Create the device nodes for all available partitions of a block device. This may be useful for removable media devices where media changes are not detected.
+Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
 .RE
 .PP
 \fBstring_escape=\fR\fB\fInone|replace\fR\fR
 .RS 4
-Usually control and other possibly unsafe characters are replaced in strings used for device naming. The mode of replacement can be specified with this option.
-.RE
+Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
 .RE
 .RE
 .PP
@@ -306,23 +302,23 @@ The
 \fBGROUP\fR
 and
 \fBRUN\fR
-fields support simple printf\-like string substitutions. The
+fields support simple printf\-like string substitutions\. The
 \fBRUN\fR
-format chars gets applied after all rules have been processed, right before the program is executed. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are:
+format chars gets applied after all rules have been processed, right before the program is executed\. It allows the use of the complete environment set by earlier matching rules\. For all other fields, substitutions are applied while the individual rule is being processed\. The available substitutions are:
 .PP
 \fB$kernel\fR, \fB%k\fR
 .RS 4
-The kernel name for this device.
+The kernel name for this device\.
 .RE
 .PP
 \fB$number\fR, \fB%n\fR
 .RS 4
-The kernel number for this device. For example, 'sda3' has kernel number of '3'
+The kernel number for this device\. For example, \'sda3\' has kernel number of \'3\'
 .RE
 .PP
 \fB$devpath\fR, \fB%p\fR
 .RS 4
-The devpath of the device.
+The devpath of the device\.
 .RE
 .PP
 \fB$id\fR, \fB%b\fR
@@ -332,85 +328,90 @@ The name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
-\fB$driver\fR, \fB%d\fR
+\fB$driver\fR
 .RS 4
 The driver name of the device matched while searching the devpath upwards for
 \fBSUBSYSTEMS\fR,
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 .RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute. If the attribute is a symlink, the last element of the symlink target is returned as the value.
+The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
 .RE
 .PP
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value of an environment variable.
+The value of an environment variable\.
 .RE
 .PP
 \fB$major\fR, \fB%M\fR
 .RS 4
-The kernel major number for the device.
+The kernel major number for the device\.
 .RE
 .PP
 \fB$minor\fR, \fB%m\fR
 .RS 4
-The kernel minor number for the device.
+The kernel minor number for the device\.
 .RE
 .PP
 \fB$result\fR, \fB%c\fR
 .RS 4
-The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
-\fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted:
+The string returned by the external program requested with PROGRAM\. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
+\fB%c{N}\fR\. If the number is followed by the \'+\' char this part plus all remaining parts of the result string are substituted:
 \fB%c{N+}\fR
 .RE
 .PP
 \fB$parent\fR, \fB%P\fR
 .RS 4
-The node name of the parent device.
+The node name of the parent device\.
+.RE
+.PP
+\fB$name\fR
+.RS 4
+The name of the device node\. The value is only set if an earlier rule assigned a value, or during a remove events\.
 .RE
 .PP
 \fB$root\fR, \fB%r\fR
 .RS 4
-The udev_root value.
+The udev_root value\.
 .RE
 .PP
 \fB$sys\fR, \fB%S\fR
 .RS 4
-The sysfs mount point.
+The sysfs mount point\.
 .RE
 .PP
 \fB$tempnode\fR, \fB%N\fR
 .RS 4
-The name of a created temporary device node to provide access to the device from a external program before the real node is created.
+The name of a created temporary device node to provide access to the device from a external program before the real node is created\.
 .RE
 .PP
 \fB%%\fR
 .RS 4
-The '%' character itself.
+The \'%\' character itself\.
 .RE
 .PP
 \fB$$\fR
 .RS 4
-The '$' character itself.
+The \'$\' character itself\.
 .RE
 .PP
-The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute
+The count of characters to be substituted may be limited by specifying the format length value\. For example, \'%3s{file}\' will only insert the first three characters of the sysfs attribute
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>
+<greg at kroah\.com>
 and Kay Sievers
-<kay.sievers at vrfy.org>. With much help from Dan Stekloff
-<dsteklof at us.ibm.com>
-and many others.
+<kay\.sievers at vrfy\.org>\. With much help from Dan Stekloff
+<dsteklof at us\.ibm\.com>
+and many others\.
 .SH "SEE ALSO"
 .PP
 \fBudevd\fR(8),
diff --git a/udev.h b/udev.h
index f13eb83..33b39aa 100644
--- a/udev.h
+++ b/udev.h
@@ -69,6 +69,7 @@ struct udevice {
 	struct sysfs_device dev_local;
 	struct sysfs_device *dev_parent;	/* current parent device used for matching */
 	char action[NAME_SIZE];
+	char *devpath_old;
 
 	/* node */
 	char name[PATH_SIZE];
@@ -131,6 +132,7 @@ extern int udev_node_remove(struct udevice *udev);
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
+extern int udev_db_rename(const char *devpath_old, const char *devpath);
 extern int udev_db_get_device(struct udevice *udev, const char *devpath);
 extern int udev_db_get_devices_by_name(const char *name, struct list_head *name_list);
 extern int udev_db_get_all_entries(struct list_head *name_list);
diff --git a/udev.xml b/udev.xml
index b43abb7..83a9d75 100644
--- a/udev.xml
+++ b/udev.xml
@@ -416,8 +416,8 @@
                   <varlistentry>
                     <term><option>ignore_remove</option></term>
                     <listitem>
-                      <para>Ignore any later remove event for this device. This may be useful
-                      as a workaround for broken device drivers.</para>
+                      <para>Do not remove the device node when the device goes away. This may be
+                      useful as a workaround for broken device drivers.</para>
                     </listitem>
                   </varlistentry>
                   <varlistentry>
@@ -488,7 +488,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>$driver</option>, <option>%d</option></term>
+              <term><option>$driver</option></term>
               <listitem>
                 <para>The driver name of the device matched while searching the devpath upwards for
                   <option>SUBSYSTEMS</option>, <option>KERNELS</option>, <option>DRIVERS</option> and <option>ATTRS</option>.
@@ -548,6 +548,14 @@
             </varlistentry>
 
             <varlistentry>
+              <term><option>$name</option></term>
+              <listitem>
+                <para>The name of the device node. The value is only set if an earlier
+                rule assigned a value, or during a remove events.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
               <term><option>$root</option>, <option>%r</option></term>
               <listitem>
                 <para>The udev_root value.</para>
diff --git a/udev_db.c b/udev_db.c
index abc1e5a..29aa031 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -117,6 +117,16 @@ out:
 	return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+	char filename[PATH_SIZE];
+	char filename_old[PATH_SIZE];
+
+	devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+	devpath_to_db_path(devpath, filename, sizeof(filename));
+	return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
diff --git a/udev_device.c b/udev_device.c
index 23ba313..62217ff 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -168,6 +168,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
@@ -262,10 +266,6 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* import database entry, and delete it */
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
-			if (udev->ignore_remove) {
-				info("ignore_remove for '%s'", udev->name);
-				goto exit;
-			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
@@ -281,6 +281,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'", udev->name);
+			goto exit;
+		}
 		/* remove the node */
 		retval = udev_node_remove(udev);
 
diff --git a/udev_node.c b/udev_node.c
index fcd52d0..25eed86 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -133,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
 				    stats.st_rdev == stats2.st_rdev) {
 					info("replace device node '%s' with symlink to our node '%s'", slink, node);
 				} else {
-					err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+					err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
 					goto exit;
 				}
 			}
diff --git a/udev_rules.c b/udev_rules.c
index 0dcbf15..dcd0914 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -475,10 +475,12 @@ static int pass_env_to_socket(const char *sockname, const char *devpath, const c
 
 	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
 	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
 		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
 		bufpos++;
 	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
 
 	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
 	if (count < 0)
@@ -604,6 +606,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
 		SUBST_SYS,
 		SUBST_ENV,
@@ -625,6 +628,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
 		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
 		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
 		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
 		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
@@ -843,6 +847,10 @@ found:
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
@@ -986,7 +994,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
-	if (rule->test.operation != KEY_OP_UNSET) {
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
 		char filename[PATH_SIZE];
 		char devpath[PATH_SIZE];
 		char *attr;
@@ -1031,7 +1040,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
 		int found;
 
-		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
 		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
@@ -1464,9 +1473,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET ||
-		    rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
@@ -1477,6 +1491,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				struct name_entry *entry;
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 3afc31a..9e43581 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -469,6 +469,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid TEST operation");
+				goto invalid;
+			}
 			attr = get_key_attribute(key + sizeof("TEST")-1);
 			if (attr != NULL)
 				rule->test_mode_mask = strtol(attr, NULL, 8);
diff --git a/udev_selinux.c b/udev_selinux.c
index 1ad6e8a..3fa84a0 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
diff --git a/udev_sysfs.c b/udev_sysfs.c
index 34ae9ac..d5b04c3 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -355,6 +355,8 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
 
 	dbg("open '%s'/'%s'", devpath, attr_name);
 	sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+	if(sysfs_len >= sizeof(path_full))
+		sysfs_len = sizeof(path_full) - 1;
 	path = &path_full[sysfs_len];
 	strlcat(path_full, devpath, sizeof(path_full));
 	strlcat(path_full, "/", sizeof(path_full));
diff --git a/udevd.8 b/udevd.8
index 25996d1..46edde4 100644
--- a/udevd.8
+++ b/udevd.8
@@ -1,6 +1,6 @@
 .\"     Title: udevd
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevd, udevcontrol
 .\"    Source: udev
@@ -11,7 +11,7 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevd \- event managing daemon
+udevd - event managing daemon
 .SH "SYNOPSIS"
 .HP 6
 \fBudevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\-trace\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
@@ -19,87 +19,87 @@ udevd \- event managing daemon
 \fBudevcontrol \fR\fB\fIcommand\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevd listens to kernel uevents and passes the incoming events to udev. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling.
+udevd listens to kernel uevents and passes the incoming events to udev\. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling\.
 .SH "OPTIONS"
 .PP
 \fB\-\-daemon\fR
 .RS 4
-Detach and run in the background.
+Detach and run in the background\.
 .RE
 .PP
 \fB\-\-debug\-trace\fR
 .RS 4
-Run all events completely serialized. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel.
+Run all events completely serialized\. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel\.
 .RE
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print log messages to stdout.
+Print log messages to stdout\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version number.
+Print version number\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .PP
 \fBlog_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set the internal log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
+Set the internal log level of udevd\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .PP
 \fBstop_exec_queue\fR
 .RS 4
-Signal udevd to stop executing new events. Incoming events will be queued.
+Signal udevd to stop executing new events\. Incoming events will be queued\.
 .RE
 .PP
 \fBstart_exec_queue\fR
 .RS 4
-Signal udevd to enable the execution of events.
+Signal udevd to enable the execution of events\.
 .RE
 .PP
 \fBreload_rules\fR
 .RS 4
-Signal udevd to reload the rules from the config.
+Signal udevd to reload the rules from the config\.
 .RE
 .PP
 \fBenv \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set global variable.
+Set global variable\.
 .RE
 .PP
 \fBmax_childs\fR
 .RS 4
-Set the maximum number of events, udevd will handle at the same time.
+Set the maximum number of events, udevd will handle at the same time\.
 .RE
 .PP
 \fBmax_childs_running\fR
 .RS 4
-Set the maximum number of events, which are allowed to run at the same time.
+Set the maximum number of events, which are allowed to run at the same time\.
 .RE
 .PP
 \fBhelp\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevd.c b/udevd.c
index 8f56de6..5ff5d3f 100644
--- a/udevd.c
+++ b/udevd.c
@@ -130,6 +130,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
 	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+	udev->devpath_old = msg->devpath_old;
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -156,14 +157,14 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	struct udevd_uevent_msg *loop_msg;
 	int fd;
 
-	/* add location of queue files */
+	/* location of queue file */
 	strlcpy(filename, udev_root, sizeof(filename));
 	strlcat(filename, "/", sizeof(filename));
 	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
 	strlcat(filename, msg->devpath, sizeof(filename));
 	path_encode(&filename[start], sizeof(filename) - start);
 
-	/* add location of failed files */
+	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
@@ -174,6 +175,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	case EVENT_QUEUED:
 		unlink(filename_failed);
 		delete_path(filename_failed);
+
 		create_path(filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
@@ -181,10 +183,25 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		return;
 	case EVENT_FINISHED:
 	case EVENT_FAILED:
-		unlink(filename_failed);
-		delete_path(filename_failed);
+		if (msg->devpath_old != NULL) {
+			/* "move" event - rename failed file to current name, do not delete failed */
+			char filename_failed_old[PATH_SIZE];
+
+			strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+			strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+			start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+			strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+			path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+			if (rename(filename_failed_old, filename_failed) == 0)
+				info("renamed devpath, moved failed state of '%s' to %s'",
+				     msg->devpath_old, msg->devpath);
+		} else {
+			unlink(filename_failed);
+			delete_path(filename_failed);
+		}
 
-		/* don't remove, if events for the same path are still pending */
+		/* skip if events for the same path are still pending */
 		list_for_each_entry(loop_msg, &running_list, node)
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
@@ -193,7 +210,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
 
-		/* move failed events to the failed directory */
+		/* move failed event to the failed directory */
 		if (state == EVENT_FAILED) {
 			create_path(filename_failed);
 			rename(filename, filename_failed);
@@ -201,7 +218,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			unlink(filename);
 		}
 
-		/* clean up the queue directory */
+		/* clean up possibly empty queue directory */
 		delete_path(filename);
 
 		return;
@@ -212,7 +229,7 @@ static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
 	list_del(&msg->node);
 
-	/* mark as failed, if add event returns non-zero */
+	/* mark as failed, if "add" event returns non-zero */
 	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
 		export_event_state(msg, EVENT_FAILED);
 	else
@@ -280,6 +297,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
+	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
@@ -469,11 +487,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 		if (loop_msg->seqnum >= msg->seqnum)
 			break;
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still pending %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -481,22 +504,27 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still pending %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 
-	/* check runing-queue for still running events */
+	/* check run queue for still running events */
 	list_for_each_entry(loop_msg, &running_list, node) {
 		if (limit && childs_count++ > limit) {
 			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
 			return 1;
 		}
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still running %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -504,7 +532,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still running %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 	return 0;
@@ -588,6 +616,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
+		else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+			msg->devpath_old = &key[12];
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
 			msg->physdevpath = &key[12];
 		else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
diff --git a/udevd.h b/udevd.h
index 4ca6d1d..9be34cb 100644
--- a/udevd.h
+++ b/udevd.h
@@ -66,6 +66,7 @@ struct udevd_uevent_msg {
 	char *driver;
 	dev_t devt;
 	unsigned long long seqnum;
+	char *devpath_old;
 	char *physdevpath;
 	unsigned int timeout;
 	char *envp[UEVENT_NUM_ENVP+1];
diff --git a/udevinfo.8 b/udevinfo.8
index 337f206..6115f29 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -1,6 +1,6 @@
 .\"     Title: udevinfo
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevinfo
 .\"    Source: udev
@@ -11,32 +11,32 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevinfo \- query udev device information
+udevinfo - query udev device information
 .SH "SYNOPSIS"
 .HP 9
 \fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevinfo queries the udev database for device information stored in the udev database. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device.
+udevinfo queries the udev database for device information stored in the udev database\. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\.
 .SH "OPTIONS"
 .PP
 \fB\-\-query=\fR\fB\fItype\fR\fR
 .RS 4
-Query the database for specified type of device data. It needs the
+Query the database for specified type of device data\. It needs the
 \fB\-\-path\fR
 or
 \fB\-\-name\fR
-to identify the specified device. Valid queries are:
+to identify the specified device\. Valid queries are:
 \fBname\fR,
 \fBsymlink\fR,
 \fBpath\fR,
 \fBenv\fR,
-\fBall\fR.
+\fBall\fR\.
 .RE
 .PP
 \fB\-\-path=\fR\fB\fIdevpath\fR\fR
 .RS 4
-The devpath of the device to query.
+The devpath of the device to query\.
 .RE
 .PP
 \fB\-\-name=\fR\fB\fInode\fR\fR
@@ -47,36 +47,36 @@ The name of the device node or a symlink to query
 \fB\-\-root\fR
 .RS 4
 The udev root directory:
-\fI/dev\fR. If used in conjunction with a
+\fI/dev\fR\. If used in conjunction with a
 \fBname\fR
 or
 \fBsymlink\fR
-query, the query returns the absolute path including the root directory.
+query, the query returns the absolute path including the root directory\.
 .RE
 .PP
 \fB\-\-attribute\-walk\fR
 .RS 4
-Print all sysfs properties of the specified device that can be used in udev rules to match the specified device. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules.
+Print all sysfs properties of the specified device that can be used in udev rules to match the specified device\. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules\.
 .RE
 .PP
 \fB\-\-export\-db\fR
 .RS 4
-Export the content of the udev database.
+Export the content of the udev database\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version.
+Print version\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevinfo.c b/udevinfo.c
index d0b1c44..be9aa76 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -79,6 +79,8 @@ static void print_all_attributes(const char *devpath, const char *key)
 			if (attr_value == NULL)
 				continue;
 			len = strlcpy(value, attr_value, sizeof(value));
+			if(len >= sizeof(value))
+				len = sizeof(value) - 1;
 			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
 			/* remove trailing newlines */
diff --git a/udevmonitor.8 b/udevmonitor.8
index 0adb998..5b624a7 100644
--- a/udevmonitor.8
+++ b/udevmonitor.8
@@ -1,6 +1,6 @@
 .\"     Title: udevmonitor
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevmonitor
 .\"    Source: udev
@@ -11,38 +11,38 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevmonitor \- print the kernel and udev event sequence to the console
+udevmonitor - print the kernel and udev event sequence to the console
 .SH "SYNOPSIS"
 .HP 12
 \fBudevmonitor\fR [\fB\-\-environment\fR] [\fB\-\-kernel\fR] [\fB\-\-udev\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event.
+udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\.
 .SH "OPTIONS"
 .PP
 \fB\-\-environment\fR
 .RS 4
-Print the complete environment for all events. Can be used to compare the kernel supplied and the udev added environment values.
+Print the complete environment for all events\. Can be used to compare the kernel supplied and the udev added environment values\.
 .RE
 .PP
 \fB\-\-kernel\fR
 .RS 4
-Print the kernel uevents.
+Print the kernel uevents\.
 .RE
 .PP
 \fB\-\-udev\fR
 .RS 4
-Print the udev event after the rule processing.
+Print the udev event after the rule processing\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevmonitor.c b/udevmonitor.c
index a9cc061..644a955 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -43,7 +43,6 @@ static int init_udev_monitor_socket(void)
 {
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
-	const int feature_on = 1;
 	int retval;
 
 	memset(&saddr, 0x00, sizeof(saddr));
@@ -67,9 +66,6 @@ static int init_udev_monitor_socket(void)
 		return -1;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
 	return 0;
 }
 
diff --git a/udevsettle.8 b/udevsettle.8
index 818a7ff..39054d9 100644
--- a/udevsettle.8
+++ b/udevsettle.8
@@ -1,6 +1,6 @@
 .\"     Title: udevsettle
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevsettle
 .\"    Source: udev
@@ -11,29 +11,29 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevsettle \- wait until queued kernel/udev events are handled
+udevsettle - wait until queued kernel/udev events are handled
 .SH "SYNOPSIS"
 .HP 11
 \fBudevsettle\fR [\fB\-\-timeout=\fR\fB\fIseconds\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Waits watching the udev event queue and exits if all current events are handled.
+Waits watching the udev event queue and exits if all current events are handled\.
 .SH "OPTIONS"
 .PP
 \fB\-\-timeout=\fR\fB\fIseconds\fR\fR
 .RS 4
-maximum seconds to wait for the queue to become empty.
+maximum seconds to wait for the queue to become empty\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevstart.8 b/udevstart.8
index ac7d070..6b463cf 100644
--- a/udevstart.8
+++ b/udevstart.8
@@ -1,6 +1,6 @@
 .\"     Title: udevstart
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevstart
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevstart \- populate initial device directory
+udevstart - populate initial device directory
 .SH "SYNOPSIS"
 .HP 10
 \fBudevstart\fR
 .SH "DESCRIPTION"
 .PP
-udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules. udevstart is used to create the initial device directory after system bootup.
+udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules\. udevstart is used to create the initial device directory after system bootup\.
 .SH "AUTHOR"
 .PP
 Written by Harald Hoyer
-<harald at redhat.com>.
+<harald at redhat\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtest.8 b/udevtest.8
index 9ab9249..a090465 100644
--- a/udevtest.8
+++ b/udevtest.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtest
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevtest
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtest \- simulate a udev run and print the action to the console
+udevtest - simulate a udev run and print the action to the console
 .SH "SYNOPSIS"
 .HP 21
 \fBudevtest \fR\fB\fIdevice\-path\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed.
+udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed\.
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>.
+<greg at kroah\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.8 b/udevtrigger.8
index 5ef9e8f..06c7e45 100644
--- a/udevtrigger.8
+++ b/udevtrigger.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtrigger
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevtrigger
 .\"    Source: udev
@@ -11,66 +11,66 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtrigger \- request kernel devices events for coldplug
+udevtrigger - request kernel devices events for coldplug
 .SH "SYNOPSIS"
 .HP 12
 \fBudevtrigger\fR [\fB\-\-verbose\fR] [\fB\-\-dry\-run\fR] [\fB\-\-retry\-failed\fR] [\fB\-\-help\fR] [\fB\-\-action=\fR\fB\fIaction\fR\fR] [\fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR] [\fB\-\-attr\-nomatch=\fR\fB\fIattribute=value\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Trigger kernel device uevents to replay missing events at system coldplug.
+Trigger kernel device uevents to replay missing events at system coldplug\.
 .SH "OPTIONS"
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print the list of devices which will be triggered.
+Print the list of devices which will be triggered\.
 .RE
 .PP
 \fB\-\-dry\-run\fR
 .RS 4
-Do not actually trigger the event.
+Do not actually trigger the event\.
 .RE
 .PP
 \fB\-\-retry\-failed\fR
 .RS 4
-Trigger only the events which are failed during a previous run.
+Trigger only the events which are failed during a previous run\.
 .RE
 .PP
 \fB\-\-action=\fR\fB\fIaction\fR\fR
 .RS 4
-Type of event to be triggered. The default value is "add".
+Type of event to be triggered\. The default value is "add"\.
 .RE
 .PP
 \fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Do not trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .PP
 \fB\-\-attr\-nomatch\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Do not trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 and Hannes Reinecke
-<hare at suse.de>.
+<hare at suse\.de>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.c b/udevtrigger.c
index cf8f209..309c54a 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -435,6 +435,8 @@ static void scan_failed(void)
 				continue;
 
 			start = strlcpy(device, sysfs_path, sizeof(device));
+			if(start >= sizeof(device))
+				start = sizeof(device) - 1;
 			strlcat(device, dent->d_name, sizeof(device));
 			path_decode(&device[start]);
 			device_list_insert(device);

udev-115-looplast.patch:

--- NEW FILE udev-115-looplast.patch ---
--- udev-115/etc/udev/rules.d/50-udev-default.rules.looplast	2007-09-07 14:32:01.000000000 +0200
+++ udev-115/etc/udev/rules.d/50-udev-default.rules	2007-09-07 14:33:14.000000000 +0200
@@ -9,6 +9,9 @@ KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*",
 KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
 KERNEL=="tty0",			SYMLINK+="systty"
 
+# loop
+KERNEL=="loop[0-9]", SUBSYSTEM=="block", GROUP="disk", MODE="0640", OPTIONS+="last_rule"
+
 # serial
 KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
 KERNEL=="ppp",			MODE="0600", OPTIONS+="ignore_remove"

udev-115-rulesinstall.patch:

--- NEW FILE udev-115-rulesinstall.patch ---
--- udev-115/Makefile.rulesinstall	2007-09-07 14:46:07.000000000 +0200
+++ udev-115/Makefile	2007-09-07 14:46:38.000000000 +0200
@@ -234,9 +234,9 @@ install-config:
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@ for i in $(shell ls -1 etc/udev/rules.d); do \
-		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
-			$(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+	@ for i in etc/udev/rules.d/*.rules; do \
+		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+			$(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
 		fi \
 	done
 	@ extras="$(EXTRAS)"; for target in $$extras; do \


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- udev.spec	24 Aug 2007 08:37:19 -0000	1.218
+++ udev.spec	7 Sep 2007 12:52:05 -0000	1.219
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -20,6 +20,9 @@
 
 Patch1: udev-089-nopie.patch
 Patch2: udev-091-lib64.patch
+Patch3: udev-115-git-20070907.patch
+Patch4: udev-115-looplast.patch
+Patch5: udev-115-rulesinstall.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -69,6 +72,9 @@
 %setup -q  
 %patch1 -p1 -b .nopie
 %patch2 -p1 -b .lib64
+%patch3 -p1 -b .git20070907
+%patch4 -p1 -b .looplast
+%patch5 -p1 -b .rulesinstall
 
 rm -f etc/udev/redhat/51-hotplug.rules etc/udev/redhat/50* etc/udev/redhat/06*
 %build
@@ -183,7 +189,6 @@
 
 for i in \
 	etc/udev/redhat/*.rules \
-	etc/udev/rules.d/*.rules \
 	etc/udev/packages/40-ia64.rules \
 	etc/udev/packages/40-alsa.rules \
 	etc/udev/packages/40-ppc.rules \
@@ -347,6 +352,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
+- some upstream fixes from git
+- last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)
+
 * Thu Aug 24 2007 Harald Hoyer <harald at redhat.com> - 115-1
 - version 115
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:16:16 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:16:16 -0400
Subject: rpms/qtparted/devel qtparted.pam,1.1,1.2 qtparted.spec,1.22,1.23
Message-ID: <200709071316.l87DGG5e018158@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18102

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Fix qtparted.pam (#237075).


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:15:44 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qtparted.spec	29 Mar 2007 21:54:08 -0000	1.22
+++ qtparted.spec	7 Sep 2007 13:15:44 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
 * Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
 - Rebuild again.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:21:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:21:10 -0400
Subject: rpms/qtparted/F-7 qtparted.pam,1.1,1.2 qtparted.spec,1.22,1.23
Message-ID: <200709071321.l87DLAmw018428@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18389

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/F-7/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:20:38 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/F-7/qtparted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qtparted.spec	29 Mar 2007 21:54:08 -0000	1.22
+++ qtparted.spec	7 Sep 2007 13:20:38 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
 * Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
 - Rebuild again.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:22:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 7 Sep 2007 09:22:01 -0400
Subject: rpms/liboil/devel liboil.spec,1.21,1.22
Message-ID: <200709071322.l87DM19Y018505@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18376

Modified Files:
	liboil.spec 
Log Message:
* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
- Revert the previous commit, it's still broken, see:
  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172



Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- liboil.spec	30 Aug 2007 13:36:23 -0000	1.21
+++ liboil.spec	7 Sep 2007 13:21:28 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -11,7 +11,12 @@
 Patch1: liboil-0.3.9-s390.patch
 # PPC64 isn't being detected properly
 # http://bugzilla.redhat.com/242418
-Patch2: liboil-0.3.12-ppc64-configure.patch
+# Patch2: liboil-0.3.12-ppc64-configure.patch
+
+# Disable PPC altogether, as oil_prototype_from_string() crashes in malloc
+# otherwise
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c16
+Patch2: liboil-0.3.12-disable-altivec.patch
 
 # Fix SIGILL handling for CPU tests
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
@@ -51,10 +56,10 @@
 %patch4 -p0 -b .altivec2
 popd
 
-# Disable automatic use of Altivec by the compiler, so that liboil only
-# uses it when it's available.
-cp configure foo
-sed -i 's/\([^,]\)-maltivec/\1-Wa,-maltivec/' configure
+# Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
+sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure
+sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure
 
 %build
 %configure
@@ -98,6 +103,10 @@
 
 
 %changelog
+* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
+- Revert the previous commit, it's still broken, see:
+  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172
+
 * Thu Aug 30 2007 - David Woodhouse <dwmw2 at infradead.org> - 0.3.12-10
 - Re-enable explicit Altivec but don't let the compiler use it automatically
 - Start applying the ppc64-configure patch again



From fedora-extras-commits at redhat.com  Fri Sep  7 13:26:28 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 09:26:28 -0400
Subject: rpms/libselinux/F-7 libselinux-rhat.patch, 1.121,
	1.122 libselinux.spec, 1.268, 1.269
Message-ID: <200709071326.l87DQSU1018777@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18754

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
- fix swig binding for rpm_execcon


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-rhat.patch,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- libselinux-rhat.patch	11 Jul 2007 16:05:02 -0000	1.121
+++ libselinux-rhat.patch	7 Sep 2007 13:26:25 -0000	1.122
@@ -1,1095 +1,6 @@
-diff -up libselinux-2.0.14/src/selinuxswig_wrap.c.rhat libselinux-2.0.14/src/selinuxswig_wrap.c
---- libselinux-2.0.14/src/selinuxswig_wrap.c.rhat	2007-04-24 10:36:20.000000000 -0400
-+++ libselinux-2.0.14/src/selinuxswig_wrap.c	2007-07-11 12:00:41.000000000 -0400
-@@ -2449,11 +2449,11 @@ SWIG_Python_MustGetPtr(PyObject *obj, sw
- /* -------- TYPES TABLE (BEGIN) -------- */
- 
- #define SWIGTYPE_p_SELboolean swig_types[0]
--#define SWIGTYPE_p_access_vector_t swig_types[1]
--#define SWIGTYPE_p_char swig_types[2]
--#define SWIGTYPE_p_int swig_types[3]
--#define SWIGTYPE_p_p_char swig_types[4]
--#define SWIGTYPE_p_p_p_char swig_types[5]
-+#define SWIGTYPE_p_char swig_types[1]
-+#define SWIGTYPE_p_int swig_types[2]
-+#define SWIGTYPE_p_p_char swig_types[3]
-+#define SWIGTYPE_p_p_p_char swig_types[4]
-+#define SWIGTYPE_p_p_security_context_t swig_types[5]
- #define SWIGTYPE_p_security_context_t swig_types[6]
- #define SWIGTYPE_p_unsigned_int swig_types[7]
- static swig_type_info *swig_types[9];
-@@ -2485,6 +2485,99 @@ static swig_module_info swig_module = {s
- 
- 
- 	#include "selinux/selinux.h"
-+	#include "selinux/get_context_list.h"
-+
-+
-+SWIGINTERN swig_type_info*
-+SWIG_pchar_descriptor(void)
-+{
-+  static int init = 0;
-+  static swig_type_info* info = 0;
-+  if (!init) {
-+    info = SWIG_TypeQuery("_p_char");
-+    init = 1;
-+  }
-+  return info;
-+}
-+
-+
-+SWIGINTERNINLINE PyObject *
-+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-+{
-+  if (carray) {
-+    if (size > INT_MAX) {
-+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-+      return pchar_descriptor ? 
-+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
-+    } else {
-+      return PyString_FromStringAndSize(carray, (int)(size));
-+    }
-+  } else {
-+    return SWIG_Py_Void();
-+  }
-+}
-+
-+
-+SWIGINTERNINLINE PyObject * 
-+SWIG_FromCharPtr(const char *cptr)
-+{ 
-+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
-+}
-+
-+
-+SWIGINTERN int
-+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
-+{
-+  if (PyString_Check(obj)) {
-+    char *cstr; Py_ssize_t len;
-+    PyString_AsStringAndSize(obj, &cstr, &len);
-+    if (cptr)  {
-+      if (alloc) {
-+	/* 
-+	   In python the user should not be able to modify the inner
-+	   string representation. To warranty that, if you define
-+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-+	   buffer is always returned.
-+
-+	   The default behavior is just to return the pointer value,
-+	   so, be careful.
-+	*/ 
-+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-+	if (*alloc != SWIG_OLDOBJ) 
-+#else
-+	if (*alloc == SWIG_NEWOBJ) 
-+#endif
-+	  {
-+	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-+	    *alloc = SWIG_NEWOBJ;
-+	  }
-+	else {
-+	  *cptr = cstr;
-+	  *alloc = SWIG_OLDOBJ;
-+	}
-+      } else {
-+	*cptr = PyString_AsString(obj);
-+      }
-+    }
-+    if (psize) *psize = len + 1;
-+    return SWIG_OK;
-+  } else {
-+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-+    if (pchar_descriptor) {
-+      void* vptr = 0;
-+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
-+	if (cptr) *cptr = (char *) vptr;
-+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
-+	if (alloc) *alloc = SWIG_OLDOBJ;
-+	return SWIG_OK;
-+      }
-+    }
-+  }
-+  return SWIG_TypeError;
-+}
-+
-+
-+
- 
- 
-   #define SWIG_From_long   PyInt_FromLong 
-@@ -2644,74 +2737,6 @@ SWIG_AsVal_int (PyObject * obj, int *val
- }
- 
- 
--SWIGINTERN swig_type_info*
--SWIG_pchar_descriptor(void)
--{
--  static int init = 0;
--  static swig_type_info* info = 0;
--  if (!init) {
--    info = SWIG_TypeQuery("_p_char");
--    init = 1;
--  }
--  return info;
--}
--
--
--SWIGINTERN int
--SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
--{
--  if (PyString_Check(obj)) {
--    char *cstr; Py_ssize_t len;
--    PyString_AsStringAndSize(obj, &cstr, &len);
--    if (cptr)  {
--      if (alloc) {
--	/* 
--	   In python the user should not be able to modify the inner
--	   string representation. To warranty that, if you define
--	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
--	   buffer is always returned.
--
--	   The default behavior is just to return the pointer value,
--	   so, be careful.
--	*/ 
--#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
--	if (*alloc != SWIG_OLDOBJ) 
--#else
--	if (*alloc == SWIG_NEWOBJ) 
--#endif
--	  {
--	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
--	    *alloc = SWIG_NEWOBJ;
--	  }
--	else {
--	  *cptr = cstr;
--	  *alloc = SWIG_OLDOBJ;
--	}
--      } else {
--	*cptr = PyString_AsString(obj);
--      }
--    }
--    if (psize) *psize = len + 1;
--    return SWIG_OK;
--  } else {
--    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--    if (pchar_descriptor) {
--      void* vptr = 0;
--      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
--	if (cptr) *cptr = (char *) vptr;
--	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
--	if (alloc) *alloc = SWIG_OLDOBJ;
--	return SWIG_OK;
--      }
--    }
--  }
--  return SWIG_TypeError;
--}
--
--
--
--
--
- SWIGINTERN int
- SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
- {
-@@ -2781,33 +2806,396 @@ SWIG_AsVal_unsigned_SS_int (PyObject * o
-   return res;
- }
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+SWIGINTERN PyObject *_wrap_get_ordered_context_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t arg2 ;
-+  security_context_t **arg3 = (security_context_t **) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  void *argp3 = 0 ;
-+  int res3 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_ordered_context_list",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_security_context_t, 0 |  0 );
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_ordered_context_list" "', argument " "3"" of type '" "security_context_t **""'"); 
-+  }
-+  arg3 = (security_context_t **)(argp3);
-+  result = (int)get_ordered_context_list((char const *)arg1,arg2,arg3);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_ordered_context_list_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t **arg4 = (security_context_t **) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  void *argp4 = 0 ;
-+  int res4 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  PyObject * obj3 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_ordered_context_list_with_level",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list_with_level" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_ordered_context_list_with_level" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_security_context_t, 0 |  0 );
-+  if (!SWIG_IsOK(res4)) {
-+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "get_ordered_context_list_with_level" "', argument " "4"" of type '" "security_context_t **""'"); 
-+  }
-+  arg4 = (security_context_t **)(argp4);
-+  result = (int)get_ordered_context_list_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t arg2 ;
-+  security_context_t *arg3 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  security_context_t temp3 = NULL ;
-+  char *temp30 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  {
-+    arg3 = &temp3;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OO:get_default_context",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  result = (int)get_default_context((char const *)arg1,arg2,arg3);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg3)
-+    temp30 = *arg3;
-+    else
-+    temp30 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp30));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t *arg4 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  security_context_t temp4 = NULL ;
-+  char *temp40 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  {
-+    arg4 = &temp4;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_level",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_level" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_level" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  result = (int)get_default_context_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg4)
-+    temp40 = *arg4;
-+    else
-+    temp40 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_role(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  security_context_t arg3 ;
-+  security_context_t *arg4 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  security_context_t temp4 = NULL ;
-+  char *temp40 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  
-+  {
-+    arg4 = &temp4;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_role",&obj0,&obj1,&obj2)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_role" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_role" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  {
-+    arg3 = (security_context_t)PyString_AsString(obj2);
-+  }
-+  result = (int)get_default_context_with_role((char const *)arg1,(char const *)arg2,arg3,arg4);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg4)
-+    temp40 = *arg4;
-+    else
-+    temp40 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_get_default_context_with_rolelevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  char *arg3 = (char *) 0 ;
-+  security_context_t arg4 ;
-+  security_context_t *arg5 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  int res3 ;
-+  char *buf3 = 0 ;
-+  int alloc3 = 0 ;
-+  security_context_t temp5 = NULL ;
-+  char *temp50 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  PyObject * obj2 = 0 ;
-+  PyObject * obj3 = 0 ;
-+  
-+  {
-+    arg5 = &temp5;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_default_context_with_rolelevel",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_rolelevel" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_rolelevel" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_default_context_with_rolelevel" "', argument " "3"" of type '" "char const *""'");
-+  }
-+  arg3 = (char *)(buf3);
-+  {
-+    arg4 = (security_context_t)PyString_AsString(obj3);
-+  }
-+  result = (int)get_default_context_with_rolelevel((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg5)
-+    temp50 = *arg5;
-+    else
-+    temp50 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp50));
-+  }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_query_user_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t *arg1 = (security_context_t *) 0 ;
-+  security_context_t *arg2 = (security_context_t *) 0 ;
-+  int result;
-+  security_context_t temp1 = NULL ;
-+  security_context_t temp2 = NULL ;
-+  char *temp10 = NULL ;
-+  char *temp20 = NULL ;
-+  
-+  {
-+    arg1 = &temp1;
-+  }
-+  {
-+    arg2 = &temp2;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)":query_user_context")) SWIG_fail;
-+  result = (int)query_user_context(arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg1)
-+    temp10 = *arg1;
-+    else
-+    temp10 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
-+  }
-+  {
-+    if (*arg2)
-+    temp20 = *arg2;
-+    else
-+    temp20 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
-+  }
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
- 
--SWIGINTERNINLINE PyObject *
--SWIG_FromCharPtrAndSize(const char* carray, size_t size)
--{
--  if (carray) {
--    if (size > INT_MAX) {
--      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--      return pchar_descriptor ? 
--	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
--    } else {
--      return PyString_FromStringAndSize(carray, (int)(size));
--    }
--  } else {
--    return SWIG_Py_Void();
-+SWIGINTERN PyObject *_wrap_manual_user_enter_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  security_context_t *arg2 = (security_context_t *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  security_context_t temp2 = NULL ;
-+  char *temp20 = NULL ;
-+  PyObject * obj0 = 0 ;
-+  
-+  {
-+    arg2 = &temp2;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)"O:manual_user_enter_context",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "manual_user_enter_context" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  result = (int)manual_user_enter_context((char const *)arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  {
-+    if (*arg2)
-+    temp20 = *arg2;
-+    else
-+    temp20 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
-   }
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
- }
- 
- 
--SWIGINTERNINLINE PyObject * 
--SWIG_FromCharPtr(const char *cptr)
--{ 
--  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
--}
--
--#ifdef __cplusplus
--extern "C" {
--#endif
- SWIGINTERN PyObject *_wrap_is_selinux_enabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   int result;
-@@ -2834,6 +3222,48 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_freecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t arg1 ;
-+  PyObject * obj0 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"O:freecon",&obj0)) SWIG_fail;
-+  {
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-+  }
-+  freecon(arg1);
-+  resultobj = SWIG_Py_Void();
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_freeconary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t *arg1 = (security_context_t *) 0 ;
-+  security_context_t temp1 = NULL ;
-+  char *temp10 = NULL ;
-+  
-+  {
-+    arg1 = &temp1;
-+  }
-+  if (!PyArg_ParseTuple(args,(char *)":freeconary")) SWIG_fail;
-+  freeconary(arg1);
-+  resultobj = SWIG_Py_Void();
-+  {
-+    if (*arg1)
-+    temp10 = *arg1;
-+    else
-+    temp10 = "";
-+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
-+  }
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_getcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   security_context_t *arg1 = (security_context_t *) 0 ;
-@@ -3777,6 +4207,55 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_matchpathcon_init_prefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  char *arg2 = (char *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  int res2 ;
-+  char *buf2 = 0 ;
-+  int alloc2 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:matchpathcon_init_prefix",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchpathcon_init_prefix" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
-+  if (!SWIG_IsOK(res2)) {
-+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "matchpathcon_init_prefix" "', argument " "2"" of type '" "char const *""'");
-+  }
-+  arg2 = (char *)(buf2);
-+  result = (int)matchpathcon_init_prefix((char const *)arg1,(char const *)arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_matchpathcon_fini(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)":matchpathcon_fini")) SWIG_fail;
-+  matchpathcon_fini();
-+  resultobj = SWIG_Py_Void();
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_matchmediacon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   char *arg1 = (char *) 0 ;
-@@ -3994,6 +4473,19 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_selinux_securetty_types_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *result = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)":selinux_securetty_types_path")) SWIG_fail;
-+  result = (char *)selinux_securetty_types_path();
-+  resultobj = SWIG_FromCharPtr((const char *)result);
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
- SWIGINTERN PyObject *_wrap_selinux_booleans_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
-   char *result = 0 ;
-@@ -4085,27 +4577,17 @@ fail:
- }
- 
- 
--SWIGINTERN PyObject *_wrap_selinux_check_passwd_access(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_selinux_check_securetty_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
--  access_vector_t arg1 ;
-+  security_context_t arg1 ;
-   int result;
--  void *argp1 ;
--  int res1 = 0 ;
-   PyObject * obj0 = 0 ;
-   
--  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_passwd_access",&obj0)) SWIG_fail;
-+  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_securetty_context",&obj0)) SWIG_fail;
-   {
--    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
--    if (!SWIG_IsOK(res1)) {
--      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'"); 
--    }  
--    if (!argp1) {
--      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'");
--    } else {
--      arg1 = *((access_vector_t *)(argp1));
--    }
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-   }
--  result = (int)selinux_check_passwd_access(arg1);
-+  result = (int)selinux_check_securetty_context(arg1);
-   resultobj = SWIG_From_int((int)(result));
-   return resultobj;
- fail:
-@@ -4113,30 +4595,26 @@ fail:
- }
- 
- 
--SWIGINTERN PyObject *_wrap_checkPasswdAccess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_set_selinuxmnt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-   PyObject *resultobj = 0;
--  access_vector_t arg1 ;
--  int result;
--  void *argp1 ;
--  int res1 = 0 ;
-+  char *arg1 = (char *) 0 ;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-   PyObject * obj0 = 0 ;
-   
--  if (!PyArg_ParseTuple(args,(char *)"O:checkPasswdAccess",&obj0)) SWIG_fail;
--  {
--    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
--    if (!SWIG_IsOK(res1)) {
--      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'"); 
--    }  
--    if (!argp1) {
--      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'");
--    } else {
--      arg1 = *((access_vector_t *)(argp1));
--    }
-+  if (!PyArg_ParseTuple(args,(char *)"O:set_selinuxmnt",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_selinuxmnt" "', argument " "1"" of type '" "char *""'");
-   }
--  result = (int)checkPasswdAccess(arg1);
--  resultobj = SWIG_From_int((int)(result));
-+  arg1 = (char *)(buf1);
-+  set_selinuxmnt(arg1);
-+  resultobj = SWIG_Py_Void();
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-   return resultobj;
- fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-   return NULL;
- }
- 
-@@ -4153,6 +4631,10 @@ SWIGINTERN PyObject *_wrap_rpm_execcon(P
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
-+  void *argp3 = 0 ;
-+  int res3 = 0 ;
-+  void *argp4 = 0 ;
-+  int res4 = 0 ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -4169,58 +4651,16 @@ SWIGINTERN PyObject *_wrap_rpm_execcon(P
-     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
-   }
-   arg2 = (char *)(buf2);
--  {
--    /* Check if is a list */
--    if (PyList_Check(obj2)) {
--      int size = PyList_Size(obj2);
--      int i = 0;
--      arg3 = (char **) malloc((size+1)*sizeof(char *));
--      if (arg3 == NULL) {
--        PyErr_SetString(PyExc_MemoryError,"Out of memory");
--        return NULL;
--      }
--      for (i = 0; i < size; i++) {
--        PyObject *o = PyList_GetItem(obj2,i);
--        if (PyString_Check(o))
--        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
--        else {
--          PyErr_SetString(PyExc_TypeError,"list must contain strings");
--          free(arg3);
--          return NULL;
--        }
--      }
--      arg3[i] = 0;
--    } else {
--      PyErr_SetString(PyExc_TypeError,"not a list");
--      return NULL;
--    }
--  }
--  {
--    /* Check if is a list */
--    if (PyList_Check(obj3)) {
--      int size = PyList_Size(obj3);
--      int i = 0;
--      arg4 = (char **) malloc((size+1)*sizeof(char *));
--      if (arg4 == NULL) {
--        PyErr_SetString(PyExc_MemoryError,"Out of memory");
--        return NULL;
--      }
--      for (i = 0; i < size; i++) {
--        PyObject *o = PyList_GetItem(obj3,i);
--        if (PyString_Check(o))
--        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
--        else {
--          PyErr_SetString(PyExc_TypeError,"list must contain strings");
--          free(arg4);
--          return NULL;
--        }
--      }
--      arg4[i] = 0;
--    } else {
--      PyErr_SetString(PyExc_TypeError,"not a list");
--      return NULL;
--    }
-+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
-+  if (!SWIG_IsOK(res3)) {
-+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char **""'"); 
-+  }
-+  arg3 = (char **)(argp3);
-+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
-+  if (!SWIG_IsOK(res4)) {
-+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char **""'"); 
-   }
-+  arg4 = (char **)(argp4);
-   result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
-   resultobj = SWIG_From_int((int)(result));
-   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-@@ -4387,9 +4827,101 @@ fail:
- }
- 
- 
-+SWIGINTERN PyObject *_wrap_selinux_file_context_cmp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  security_context_t arg1 ;
-+  security_context_t arg2 ;
-+  int result;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_cmp",&obj0,&obj1)) SWIG_fail;
-+  {
-+    arg1 = (security_context_t)PyString_AsString(obj0);
-+  }
-+  {
-+    arg2 = (security_context_t)PyString_AsString(obj1);
-+  }
-+  result = (int)selinux_file_context_cmp(arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  return resultobj;
-+fail:
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_selinux_file_context_verify(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  mode_t arg2 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  unsigned int val2 ;
-+  int ecode2 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  PyObject * obj1 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_verify",&obj0,&obj1)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_file_context_verify" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
-+  if (!SWIG_IsOK(ecode2)) {
-+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "selinux_file_context_verify" "', argument " "2"" of type '" "mode_t""'");
-+  } 
-+  arg2 = (mode_t)(val2);
-+  result = (int)selinux_file_context_verify((char const *)arg1,arg2);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
-+SWIGINTERN PyObject *_wrap_selinux_lsetfilecon_default(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+  PyObject *resultobj = 0;
-+  char *arg1 = (char *) 0 ;
-+  int result;
-+  int res1 ;
-+  char *buf1 = 0 ;
-+  int alloc1 = 0 ;
-+  PyObject * obj0 = 0 ;
-+  
-+  if (!PyArg_ParseTuple(args,(char *)"O:selinux_lsetfilecon_default",&obj0)) SWIG_fail;
-+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-+  if (!SWIG_IsOK(res1)) {
-+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_lsetfilecon_default" "', argument " "1"" of type '" "char const *""'");
-+  }
-+  arg1 = (char *)(buf1);
-+  result = (int)selinux_lsetfilecon_default((char const *)arg1);
-+  resultobj = SWIG_From_int((int)(result));
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return resultobj;
-+fail:
-+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-+  return NULL;
-+}
-+
-+
- static PyMethodDef SwigMethods[] = {
-+	 { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL},
-+	 { (char *)"get_ordered_context_list_with_level", _wrap_get_ordered_context_list_with_level, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context", _wrap_get_default_context, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_level", _wrap_get_default_context_with_level, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_role", _wrap_get_default_context_with_role, METH_VARARGS, NULL},
-+	 { (char *)"get_default_context_with_rolelevel", _wrap_get_default_context_with_rolelevel, METH_VARARGS, NULL},
-+	 { (char *)"query_user_context", _wrap_query_user_context, METH_VARARGS, NULL},
-+	 { (char *)"manual_user_enter_context", _wrap_manual_user_enter_context, METH_VARARGS, NULL},
- 	 { (char *)"is_selinux_enabled", _wrap_is_selinux_enabled, METH_VARARGS, NULL},
- 	 { (char *)"is_selinux_mls_enabled", _wrap_is_selinux_mls_enabled, METH_VARARGS, NULL},
-+	 { (char *)"freecon", _wrap_freecon, METH_VARARGS, NULL},
-+	 { (char *)"freeconary", _wrap_freeconary, METH_VARARGS, NULL},
- 	 { (char *)"getcon", _wrap_getcon, METH_VARARGS, NULL},
- 	 { (char *)"setcon", _wrap_setcon, METH_VARARGS, NULL},
- 	 { (char *)"getpidcon", _wrap_getpidcon, METH_VARARGS, NULL},
-@@ -4426,6 +4958,8 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"set_matchpathcon_flags", _wrap_set_matchpathcon_flags, METH_VARARGS, NULL},
- 	 { (char *)"matchpathcon_init", _wrap_matchpathcon_init, METH_VARARGS, NULL},
- 	 { (char *)"matchpathcon", _wrap_matchpathcon, METH_VARARGS, NULL},
-+	 { (char *)"matchpathcon_init_prefix", _wrap_matchpathcon_init_prefix, METH_VARARGS, NULL},
-+	 { (char *)"matchpathcon_fini", _wrap_matchpathcon_fini, METH_VARARGS, NULL},
- 	 { (char *)"matchmediacon", _wrap_matchmediacon, METH_VARARGS, NULL},
- 	 { (char *)"selinux_getenforcemode", _wrap_selinux_getenforcemode, METH_VARARGS, NULL},
- 	 { (char *)"selinux_policy_root", _wrap_selinux_policy_root, METH_VARARGS, NULL},
-@@ -4440,6 +4974,7 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"selinux_homedir_context_path", _wrap_selinux_homedir_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_media_context_path", _wrap_selinux_media_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_contexts_path", _wrap_selinux_contexts_path, METH_VARARGS, NULL},
-+	 { (char *)"selinux_securetty_types_path", _wrap_selinux_securetty_types_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_booleans_path", _wrap_selinux_booleans_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_customizable_types_path", _wrap_selinux_customizable_types_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_users_path", _wrap_selinux_users_path, METH_VARARGS, NULL},
-@@ -4447,14 +4982,17 @@ static PyMethodDef SwigMethods[] = {
- 	 { (char *)"selinux_translations_path", _wrap_selinux_translations_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_netfilter_context_path", _wrap_selinux_netfilter_context_path, METH_VARARGS, NULL},
- 	 { (char *)"selinux_path", _wrap_selinux_path, METH_VARARGS, NULL},
--	 { (char *)"selinux_check_passwd_access", _wrap_selinux_check_passwd_access, METH_VARARGS, NULL},
--	 { (char *)"checkPasswdAccess", _wrap_checkPasswdAccess, METH_VARARGS, NULL},
-+	 { (char *)"selinux_check_securetty_context", _wrap_selinux_check_securetty_context, METH_VARARGS, NULL},
-+	 { (char *)"set_selinuxmnt", _wrap_set_selinuxmnt, METH_VARARGS, NULL},
- 	 { (char *)"rpm_execcon", _wrap_rpm_execcon, METH_VARARGS, NULL},
- 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
- 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
- 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
- 	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
- 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
-+	 { (char *)"selinux_file_context_cmp", _wrap_selinux_file_context_cmp, METH_VARARGS, NULL},
-+	 { (char *)"selinux_file_context_verify", _wrap_selinux_file_context_verify, METH_VARARGS, NULL},
-+	 { (char *)"selinux_lsetfilecon_default", _wrap_selinux_lsetfilecon_default, METH_VARARGS, NULL},
- 	 { NULL, NULL, 0, NULL }
- };
- 
-@@ -4462,41 +5000,41 @@ static PyMethodDef SwigMethods[] = {
- /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
- 
- static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0};
--static swig_type_info _swigt__p_access_vector_t = {"_p_access_vector_t", "access_vector_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***", 0, 0, (void*)0, 0};
-+static swig_type_info _swigt__p_p_security_context_t = {"_p_p_security_context_t", "security_context_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_security_context_t = {"_p_security_context_t", "security_context_t *", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|mode_t *", 0, 0, (void*)0, 0};
- 
- static swig_type_info *swig_type_initial[] = {
-   &_swigt__p_SELboolean,
--  &_swigt__p_access_vector_t,
-   &_swigt__p_char,
-   &_swigt__p_int,
-   &_swigt__p_p_char,
-   &_swigt__p_p_p_char,
-+  &_swigt__p_p_security_context_t,
-   &_swigt__p_security_context_t,
-   &_swigt__p_unsigned_int,
- };
- 
- static swig_cast_info _swigc__p_SELboolean[] = {  {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}};
--static swig_cast_info _swigc__p_access_vector_t[] = {  {&_swigt__p_access_vector_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
-+static swig_cast_info _swigc__p_p_security_context_t[] = {  {&_swigt__p_p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_security_context_t[] = {  {&_swigt__p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
- 
- static swig_cast_info *swig_cast_initial[] = {
-   _swigc__p_SELboolean,
--  _swigc__p_access_vector_t,
-   _swigc__p_char,
-   _swigc__p_int,
-   _swigc__p_p_char,
-   _swigc__p_p_p_char,
-+  _swigc__p_p_security_context_t,
-   _swigc__p_security_context_t,
-   _swigc__p_unsigned_int,
- };
-@@ -5019,6 +5557,7 @@ SWIGEXPORT void SWIG_init(void) {
-   SWIG_InstallConstants(d,swig_const_table);
-   
-   
-+  SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
-   SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
-   SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
- }
 diff -up libselinux-2.0.14/src/selinuxswig.i.rhat libselinux-2.0.14/src/selinuxswig.i
 --- libselinux-2.0.14/src/selinuxswig.i.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/src/selinuxswig.i	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/src/selinuxswig.i	2007-09-07 09:21:26.000000000 -0400
 @@ -21,6 +21,7 @@
  %module selinux
  %{
@@ -1139,10 +50,10 @@
 -extern int checkPasswdAccess(access_vector_t requested);
 +#extern int selinux_check_passwd_access(access_vector_t requested);
 +#extern int checkPasswdAccess(access_vector_t requested);
- 
++
 +extern int selinux_check_securetty_context(security_context_t tty_context);
 +void set_selinuxmnt(char *mnt);
-+
+ 
 +#ifdef SWIGpython
  // This tells SWIG to treat char ** as a special case
 -%typemap(python,in) char ** {
@@ -1150,15 +61,59 @@
    /* Check if is a list */
    if (PyList_Check($input)) {
      int size = PyList_Size($input);
-@@ -143,6 +158,7 @@ extern int checkPasswdAccess(access_vect
+@@ -143,10 +158,48 @@ extern int checkPasswdAccess(access_vect
      return NULL;
    }
  }
 +#endif
  
- extern int rpm_execcon(unsigned int verified, 
- 		       const char *filename, 
-@@ -164,3 +180,7 @@ extern int selinux_raw_to_trans_context(
+-extern int rpm_execcon(unsigned int verified, 
+-		       const char *filename, 
+-		       char **, char **);
++%typemap(in) char * const [] {
++	int i, size;
++	PyObject * s;
++
++	if (!PySequence_Check($input)) {
++		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
++		return NULL;
++	}
++
++	size = PySequence_Size($input);
++	
++	$1 = (char**) malloc(size + 1);
++
++	for(i = 0; i < size; i++) {
++		if (!PyString_Check(PySequence_GetItem($input, i))) {
++			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
++			return NULL;
++		}
++	}
++		
++	for(i = 0; i < size; i++) {
++		s = PySequence_GetItem($input, i);
++		$1[i] = (char*) malloc(PyString_Size(s) + 1);
++		strcpy($1[i], PyString_AsString(s));
++	}
++	$1[size] = NULL;
++}
++
++%typemap(freearg,match="in") char * const [] {
++	int i = 0;
++	while($1[i]) {
++		free($1[i]);
++		i++;
++	}
++	free($1);
++}
++
++extern int rpm_execcon(unsigned int verified,
++		       const char *filename,
++		       char *const argv[], char *const envp[]);
+ 
+ extern int is_context_customizable (security_context_t scontext);
+ 
+@@ -164,3 +217,7 @@ extern int selinux_raw_to_trans_context(
  }
  extern int selinux_getpolicytype(char **enforce);
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
@@ -1168,7 +123,7 @@
 +int selinux_lsetfilecon_default(const char *path);
 diff -up libselinux-2.0.14/src/selinux.py.rhat libselinux-2.0.14/src/selinux.py
 --- libselinux-2.0.14/src/selinux.py.rhat	2007-04-24 10:36:20.000000000 -0400
-+++ libselinux-2.0.14/src/selinux.py	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/src/selinux.py	2007-09-07 09:17:52.000000000 -0400
 @@ -48,8 +48,19 @@ except AttributeError:
  del types
  
@@ -1226,8 +181,8 @@
  
  
 diff -up libselinux-2.0.14/include/selinux/flask.h.rhat libselinux-2.0.14/include/selinux/flask.h
---- libselinux-2.0.14/include/selinux/flask.h.rhat	2007-07-11 12:02:16.000000000 -0400
-+++ libselinux-2.0.14/include/selinux/flask.h	2007-07-11 12:02:23.000000000 -0400
+--- libselinux-2.0.14/include/selinux/flask.h.rhat	2007-04-24 10:36:21.000000000 -0400
++++ libselinux-2.0.14/include/selinux/flask.h	2007-09-07 09:17:52.000000000 -0400
 @@ -64,6 +64,8 @@
  #define SECCLASS_PACKET                                  57
  #define SECCLASS_KEY                                     58
@@ -1238,8 +193,8 @@
  /*
   * Security identifier indices for initial entities
 diff -up libselinux-2.0.14/include/selinux/av_permissions.h.rhat libselinux-2.0.14/include/selinux/av_permissions.h
---- libselinux-2.0.14/include/selinux/av_permissions.h.rhat	2007-07-11 12:02:07.000000000 -0400
-+++ libselinux-2.0.14/include/selinux/av_permissions.h	2007-07-11 12:02:09.000000000 -0400
+--- libselinux-2.0.14/include/selinux/av_permissions.h.rhat	2007-04-24 10:36:21.000000000 -0400
++++ libselinux-2.0.14/include/selinux/av_permissions.h	2007-09-07 09:17:52.000000000 -0400
 @@ -290,12 +290,16 @@
  #define NODE__RAWIP_RECV                          0x00000010UL
  #define NODE__RAWIP_SEND                          0x00000020UL
@@ -1297,7 +252,7 @@
 +#define MEMPROTECT__MMAP_ZERO                     0x00000001UL
 diff -up libselinux-2.0.14/man/man8/selinux.8.rhat libselinux-2.0.14/man/man8/selinux.8
 --- libselinux-2.0.14/man/man8/selinux.8.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man8/selinux.8	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man8/selinux.8	2007-09-07 09:17:52.000000000 -0400
 @@ -62,14 +62,13 @@ compile-time tunable options and a set o
  .B system-config-securitylevel
  allows customization of these booleans and tunables.
@@ -1316,7 +271,7 @@
  .SH AUTHOR	
 diff -up libselinux-2.0.14/man/man8/matchpathcon.8.rhat libselinux-2.0.14/man/man8/matchpathcon.8
 --- libselinux-2.0.14/man/man8/matchpathcon.8.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man8/matchpathcon.8	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man8/matchpathcon.8	2007-09-07 09:17:52.000000000 -0400
 @@ -10,16 +10,16 @@ Prints the file path and the default sec
  .SH OPTIONS
  .B \-n
@@ -1340,7 +295,7 @@
  
 diff -up libselinux-2.0.14/man/man3/avc_compute_create.3.rhat libselinux-2.0.14/man/man3/avc_compute_create.3
 --- libselinux-2.0.14/man/man3/avc_compute_create.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_compute_create.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_compute_create.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_compute_create \- obtain SELinux label for new object.
  .SH "SYNOPSIS"
@@ -1352,7 +307,7 @@
  .BI "int avc_compute_create(security_id_t " ssid ", security_id_t " tsid ,
 diff -up libselinux-2.0.14/man/man3/getexeccon.3.rhat libselinux-2.0.14/man/man3/getexeccon.3
 --- libselinux-2.0.14/man/man3/getexeccon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getexeccon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getexeccon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -1,16 +1,16 @@
  .TH "getexeccon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -1395,7 +350,7 @@
  runs a helper for rpm in an appropriate security context.  The
 diff -up libselinux-2.0.14/man/man3/getfilecon.3.rhat libselinux-2.0.14/man/man3/getfilecon.3
 --- libselinux-2.0.14/man/man3/getfilecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getfilecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getfilecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,9 +5,9 @@ getfilecon, fgetfilecon, lgetfilecon \- 
  .B #include <selinux/selinux.h>
  .sp
@@ -1418,7 +373,7 @@
  .SH "RETURN VALUE"
 diff -up libselinux-2.0.14/man/man3/selinux_binary_policy_path.3.rhat libselinux-2.0.14/man/man3/selinux_binary_policy_path.3
 --- libselinux-2.0.14/man/man3/selinux_binary_policy_path.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_binary_policy_path.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_binary_policy_path.3	2007-09-07 09:17:52.000000000 -0400
 @@ -10,27 +10,27 @@ directories and files.
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
@@ -1460,7 +415,7 @@
  
 diff -up libselinux-2.0.14/man/man3/security_class_to_string.3.rhat libselinux-2.0.14/man/man3/security_class_to_string.3
 --- libselinux-2.0.14/man/man3/security_class_to_string.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_class_to_string.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_class_to_string.3	2007-09-07 09:17:52.000000000 -0400
 @@ -8,7 +8,7 @@ between SELinux class and permission val
  
  .SH "SYNOPSIS"
@@ -1472,7 +427,7 @@
  .BI "const char * security_class_to_string(security_class_t " tclass ");"
 diff -up libselinux-2.0.14/man/man3/getfscreatecon.3.rhat libselinux-2.0.14/man/man3/getfscreatecon.3
 --- libselinux-2.0.14/man/man3/getfscreatecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getfscreatecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getfscreatecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@ getfscreatecon, setfscreatecon \- get or
  .B #include <selinux/selinux.h>
  .sp
@@ -1498,7 +453,7 @@
  save, reset, and restore the fscreate context to avoid unexpected behaviors.
 diff -up libselinux-2.0.14/man/man3/freecon.3.rhat libselinux-2.0.14/man/man3/freecon.3
 --- libselinux-2.0.14/man/man3/freecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/freecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/freecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ freecon, freeconary \- free memory assoc
  .B #include <selinux/selinux.h>
  .sp
@@ -1510,7 +465,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/security_getenforce.3.rhat libselinux-2.0.14/man/man3/security_getenforce.3
 --- libselinux-2.0.14/man/man3/security_getenforce.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_getenforce.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_getenforce.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ security_getenforce, security_setenforce
  .B #include <selinux/selinux.h>
  .sp
@@ -1522,7 +477,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/selinux_getenforcemode.3.rhat libselinux-2.0.14/man/man3/selinux_getenforcemode.3
 --- libselinux-2.0.14/man/man3/selinux_getenforcemode.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_getenforcemode.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_getenforcemode.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,13 +5,13 @@ selinux_getenforcemode \- get the enforc
  .B #include <selinux/selinux.h>
  .sp
@@ -1541,7 +496,7 @@
  Sets the value of enforce to -1 if SELinux should be disabled.
 diff -up libselinux-2.0.14/man/man3/matchmediacon.3.rhat libselinux-2.0.14/man/man3/matchmediacon.3
 --- libselinux-2.0.14/man/man3/matchmediacon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/matchmediacon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/matchmediacon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,14 +6,14 @@ matchmediacon \- get the default SELinux
  .B #include <selinux/selinux.h>
  .sp
@@ -1562,7 +517,7 @@
  .SH "RETURN VALUE"
 diff -up libselinux-2.0.14/man/man3/getseuserbyname.3.rhat libselinux-2.0.14/man/man3/getseuserbyname.3
 --- libselinux-2.0.14/man/man3/getseuserbyname.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getseuserbyname.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getseuserbyname.3	2007-09-07 09:17:52.000000000 -0400
 @@ -12,7 +12,7 @@ a given Linux username.  The SELinux use
  then be passed to other libselinux functions such as 
  get_ordered_context_list_with_level and get_default_context_with_level.
@@ -1574,7 +529,7 @@
  using free.  
 diff -up libselinux-2.0.14/man/man3/is_context_customizable.3.rhat libselinux-2.0.14/man/man3/is_context_customizable.3
 --- libselinux-2.0.14/man/man3/is_context_customizable.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/is_context_customizable.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/is_context_customizable.3	2007-09-07 09:17:52.000000000 -0400
 @@ -8,7 +8,7 @@ is_context_customizable \- check whether
  
  .SH "DESCRIPTION"
@@ -1586,7 +541,7 @@
  
 diff -up libselinux-2.0.14/man/man3/security_compute_av.3.rhat libselinux-2.0.14/man/man3/security_compute_av.3
 --- libselinux-2.0.14/man/man3/security_compute_av.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_compute_av.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_compute_av.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@ the SELinux policy database in the kerne
  
  .SH "SYNOPSIS"
@@ -1598,7 +553,7 @@
  .BI "int security_compute_av(security_context_t "scon ", security_context_t "tcon ", security_class_t "tclass ", access_vector_t "requested ", struct av_decision *" avd );
 diff -up libselinux-2.0.14/man/man3/setfilecon.3.rhat libselinux-2.0.14/man/man3/setfilecon.3
 --- libselinux-2.0.14/man/man3/setfilecon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/setfilecon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/setfilecon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,9 +6,9 @@ setfilecon, fsetfilecon, lsetfilecon \- 
  .B #include <selinux/selinux.h>
  .sp
@@ -1613,7 +568,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/matchpathcon.3.rhat libselinux-2.0.14/man/man3/matchpathcon.3
 --- libselinux-2.0.14/man/man3/matchpathcon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/matchpathcon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/matchpathcon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,18 +6,18 @@ matchpathcon \- get the default SELinux 
  .B #include <selinux/selinux.h>
  .sp
@@ -1694,7 +649,7 @@
  Returns 0 on success or -1 otherwise.
 diff -up libselinux-2.0.14/man/man3/avc_init.3.rhat libselinux-2.0.14/man/man3/avc_init.3
 --- libselinux-2.0.14/man/man3/avc_init.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_init.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_init.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,17 +6,17 @@
  avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown.
  .SH "SYNOPSIS"
@@ -1719,7 +674,7 @@
  .sp
 diff -up libselinux-2.0.14/man/man3/security_load_booleans.3.rhat libselinux-2.0.14/man/man3/security_load_booleans.3
 --- libselinux-2.0.14/man/man3/security_load_booleans.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/security_load_booleans.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/security_load_booleans.3	2007-09-07 09:17:52.000000000 -0400
 @@ -7,15 +7,15 @@ security_get_boolean_pending \- routines
  .B #include <selinux/selinux.h>
  .sp
@@ -1777,7 +732,7 @@
  .SH AUTHOR	
 diff -up libselinux-2.0.14/man/man3/avc_add_callback.3.rhat libselinux-2.0.14/man/man3/avc_add_callback.3
 --- libselinux-2.0.14/man/man3/avc_add_callback.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_add_callback.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_add_callback.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,26 +6,26 @@
  avc_add_callback \- additional event notification for SELinux userspace object managers.
  .SH "SYNOPSIS"
@@ -1814,7 +769,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/avc_has_perm.3.rhat libselinux-2.0.14/man/man3/avc_has_perm.3
 --- libselinux-2.0.14/man/man3/avc_has_perm.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_has_perm.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_has_perm.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_has_perm, avc_has_perm_noaudit, avc_audit, avc_entry_ref_init \- obtain and audit SELinux access decisions.
  .SH "SYNOPSIS"
@@ -1851,7 +806,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/get_ordered_context_list.3.rhat libselinux-2.0.14/man/man3/get_ordered_context_list.3
 --- libselinux-2.0.14/man/man3/get_ordered_context_list.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/get_ordered_context_list.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/get_ordered_context_list.3	2007-09-07 09:17:52.000000000 -0400
 @@ -4,7 +4,7 @@ get_ordered_context_list, get_ordered_co
  
  .SH "SYNOPSIS"
@@ -1863,7 +818,7 @@
  .BI "int get_ordered_context_list(const char *" user ", security_context_t "fromcon ", security_context_t **" list );
 diff -up libselinux-2.0.14/man/man3/getcon.3.rhat libselinux-2.0.14/man/man3/getcon.3
 --- libselinux-2.0.14/man/man3/getcon.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/getcon.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/getcon.3	2007-09-07 09:17:52.000000000 -0400
 @@ -1,21 +1,21 @@
  .TH "getcon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -1894,7 +849,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/man/man3/avc_cache_stats.3.rhat libselinux-2.0.14/man/man3/avc_cache_stats.3
 --- libselinux-2.0.14/man/man3/avc_cache_stats.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_cache_stats.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_cache_stats.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics.
  .SH "SYNOPSIS"
@@ -1906,7 +861,7 @@
  .BI "void avc_av_stats(void);"
 diff -up libselinux-2.0.14/man/man3/avc_context_to_sid.3.rhat libselinux-2.0.14/man/man3/avc_context_to_sid.3
 --- libselinux-2.0.14/man/man3/avc_context_to_sid.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/avc_context_to_sid.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/avc_context_to_sid.3	2007-09-07 09:17:52.000000000 -0400
 @@ -6,7 +6,7 @@
  avc_context_to_sid, avc_sid_to_context, sidput, sidget, avc_get_initial_sid \- obtain and manipulate SELinux security ID's.
  .SH "SYNOPSIS"
@@ -1918,7 +873,7 @@
  .BI "int avc_context_to_sid(security_context_t " ctx ", security_id_t *" sid ");"
 diff -up libselinux-2.0.14/man/man3/selinux_policy_root.3.rhat libselinux-2.0.14/man/man3/selinux_policy_root.3
 --- libselinux-2.0.14/man/man3/selinux_policy_root.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/selinux_policy_root.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/selinux_policy_root.3	2007-09-07 09:17:52.000000000 -0400
 @@ -5,7 +5,7 @@ selinux_policy_root \- return the path o
  .B #include <selinux/selinux.h>
  .sp
@@ -1930,7 +885,7 @@
  .B selinux_policy_root
 diff -up libselinux-2.0.14/man/man3/context_new.3.rhat libselinux-2.0.14/man/man3/context_new.3
 --- libselinux-2.0.14/man/man3/context_new.3.rhat	2007-04-24 10:36:21.000000000 -0400
-+++ libselinux-2.0.14/man/man3/context_new.3	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/man/man3/context_new.3	2007-09-07 09:17:52.000000000 -0400
 @@ -4,27 +4,27 @@ context_new, context_str, context_free, 
  
  .SH "SYNOPSIS"
@@ -1972,7 +927,7 @@
  .SH "DESCRIPTION"
 diff -up libselinux-2.0.14/Makefile.rhat libselinux-2.0.14/Makefile
 --- libselinux-2.0.14/Makefile.rhat	2007-04-24 10:36:19.000000000 -0400
-+++ libselinux-2.0.14/Makefile	2007-07-11 12:00:41.000000000 -0400
++++ libselinux-2.0.14/Makefile	2007-09-07 09:17:52.000000000 -0400
 @@ -2,6 +2,9 @@ all: 
  	$(MAKE) -C src 
  	$(MAKE) -C utils


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- libselinux.spec	11 Aug 2007 10:32:35 -0000	1.268
+++ libselinux.spec	7 Sep 2007 13:26:25 -0000	1.269
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -122,6 +122,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
+- fix swig binding for rpm_execcon
+
 * Fri Aug 10 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-5
 - Move libselinux.so to devel package
 



From fedora-extras-commits at redhat.com  Fri Sep  7 13:38:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 7 Sep 2007 09:38:10 -0400
Subject: rpms/qtparted/FC-6 qtparted.pam,1.1,1.2 qtparted.spec,1.19,1.20
Message-ID: <200709071338.l87DcABe019420@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/qtparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19358

Modified Files:
	qtparted.pam qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.pam
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/FC-6/qtparted.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtparted.pam	8 Nov 2004 05:17:31 -0000	1.1
+++ qtparted.pam	7 Sep 2007 13:37:38 -0000	1.2
@@ -1,6 +1,8 @@
 #%PAM-1.0
 auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_permit.so
+auth       sufficient   pam_timestamp.so
+auth       include      system-auth
 session    required     pam_permit.so
 session    optional     pam_xauth.so
+session    optional     pam_timestamp.so
+account    required     pam_permit.so


Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/FC-6/qtparted.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qtparted.spec	8 Mar 2007 00:39:19 -0000	1.19
+++ qtparted.spec	7 Sep 2007 13:37:38 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        12%{?dist}
+Release:        15%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,15 @@
 
 
 %changelog
+* Thu Sep 06 2007 Steven Pritchard <steve at kspei.com> 0.4.5-15
+- Fix qtparted.pam (#237075).
+
+* Thu Mar 29 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-14
+- Rebuild again.
+
+* Tue Mar 20 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-13
+- Rebuild.
+
 * Tue Jan 16 2007 Steven Pritchard <steve at kspei.com> - 0.4.5-12
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:12 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:12 -0400
Subject: devel/vim 7.1.088,NONE,1.1
Message-ID: <200709071403.l87E3CEs026731@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719

Added Files:
	7.1.088 
Log Message:
- patchlevel 88


--- NEW FILE 7.1.088 ---
To: vim-dev at vim.org
Subject: patch 7.1.088 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.088 (extra)
Problem:    The coordinates used by ":winpos" differ from what getwinposx()
	    and getwinposy() return.
Solution:   Use MoveWindowStructure() instead of MoveWindow(). (Michael Henry)
Files:	    src/gui_mac.c


*** ../vim-7.1.087/src/gui_mac.c	Tue Jun 19 16:33:53 2007
--- src/gui_mac.c	Wed Aug 29 20:33:34 2007
***************
*** 3149,3155 ****
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindow(gui.VimWindow, x, y, TRUE);
  }
  
      void
--- 3149,3155 ----
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y, TRUE);
  }
  
      void
***************
*** 5556,5562 ****
   * SetDialogTracksCursor() : Get the I-beam cursor over input box
   * MoveDialogItem():	    Probably better than SetDialogItem
   * SizeDialogItem():		(but is it Carbon Only?)
!  * AutoSizeDialog():	    Magic resize of dialog based on text lenght
   */
  }
  #endif /* FEAT_DIALOG_GUI */
--- 5556,5562 ----
   * SetDialogTracksCursor() : Get the I-beam cursor over input box
   * MoveDialogItem():	    Probably better than SetDialogItem
   * SizeDialogItem():		(but is it Carbon Only?)
!  * AutoSizeDialog():	    Magic resize of dialog based on text length
   */
  }
  #endif /* FEAT_DIALOG_GUI */
*** ../vim-7.1.087/src/version.c	Tue Aug 21 18:02:58 2007
--- src/version.c	Thu Aug 30 10:32:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     88,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
10E. You start counting in hex.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:19 -0400
Subject: devel/vim 7.1.089,NONE,1.1
Message-ID: <200709071403.l87E3Jeq026767@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26751

Added Files:
	7.1.089 
Log Message:
- patchlevel 89


--- NEW FILE 7.1.089 ---
To: vim-dev at vim.org
Subject: patch 7.1.089
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.089
Problem:    ":let loaded_getscriptPlugin" doesn't clear to eol, result is
	    "#1in".
Solution:   Clear to the end of the screen after displaying the first variable
	    value.
Files:	    src/eval.c


*** ../vim-7.1.088/src/eval.c	Tue Aug 14 22:40:13 2007
--- src/eval.c	Wed Aug 29 22:40:15 2007
***************
*** 369,385 ****
  static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
  static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
  static char_u *skip_var_one __ARGS((char_u *arg));
! static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty));
! static void list_glob_vars __ARGS((void));
! static void list_buf_vars __ARGS((void));
! static void list_win_vars __ARGS((void));
  #ifdef FEAT_WINDOWS
! static void list_tab_vars __ARGS((void));
  #endif
! static void list_vim_vars __ARGS((void));
! static void list_script_vars __ARGS((void));
! static void list_func_vars __ARGS((void));
! static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg));
  static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
  static int check_changedtick __ARGS((char_u *arg));
  static char_u *get_lval __ARGS((char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int quiet, int fne_flags));
--- 369,385 ----
  static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
  static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
  static char_u *skip_var_one __ARGS((char_u *arg));
! static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty, int *first));
! static void list_glob_vars __ARGS((int *first));
! static void list_buf_vars __ARGS((int *first));
! static void list_win_vars __ARGS((int *first));
  #ifdef FEAT_WINDOWS
! static void list_tab_vars __ARGS((int *first));
  #endif
! static void list_vim_vars __ARGS((int *first));
! static void list_script_vars __ARGS((int *first));
! static void list_func_vars __ARGS((int *first));
! static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg, int *first));
  static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
  static int check_changedtick __ARGS((char_u *arg));
  static char_u *get_lval __ARGS((char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int quiet, int fne_flags));
***************
*** 704,711 ****
  static hashtab_T *find_var_ht __ARGS((char_u *name, char_u **varname));
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
! static void list_one_var __ARGS((dictitem_T *v, char_u *prefix));
! static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string));
  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
  static int var_check_ro __ARGS((int flags, char_u *name));
  static int var_check_fixed __ARGS((int flags, char_u *name));
--- 704,711 ----
  static hashtab_T *find_var_ht __ARGS((char_u *name, char_u **varname));
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
! static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
! static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string, int *first));
  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
  static int var_check_ro __ARGS((int flags, char_u *name));
  static int var_check_fixed __ARGS((int flags, char_u *name));
***************
*** 1699,1704 ****
--- 1699,1705 ----
      int		semicolon = 0;
      char_u	op[2];
      char_u	*argend;
+     int		first = TRUE;
  
      argend = skip_var_list(arg, &var_count, &semicolon);
      if (argend == NULL)
***************
*** 1715,1733 ****
  	    EMSG(_(e_invarg));
  	else if (!ends_excmd(*arg))
  	    /* ":let var1 var2" */
! 	    arg = list_arg_vars(eap, arg);
  	else if (!eap->skip)
  	{
  	    /* ":let" */
! 	    list_glob_vars();
! 	    list_buf_vars();
! 	    list_win_vars();
  #ifdef FEAT_WINDOWS
! 	    list_tab_vars();
  #endif
! 	    list_script_vars();
! 	    list_func_vars();
! 	    list_vim_vars();
  	}
  	eap->nextcmd = check_nextcmd(arg);
      }
--- 1716,1734 ----
  	    EMSG(_(e_invarg));
  	else if (!ends_excmd(*arg))
  	    /* ":let var1 var2" */
! 	    arg = list_arg_vars(eap, arg, &first);
  	else if (!eap->skip)
  	{
  	    /* ":let" */
! 	    list_glob_vars(&first);
! 	    list_buf_vars(&first);
! 	    list_win_vars(&first);
  #ifdef FEAT_WINDOWS
! 	    list_tab_vars(&first);
  #endif
! 	    list_script_vars(&first);
! 	    list_func_vars(&first);
! 	    list_vim_vars(&first);
  	}
  	eap->nextcmd = check_nextcmd(arg);
      }
***************
*** 1932,1941 ****
   * If "empty" is TRUE also list NULL strings as empty strings.
   */
      static void
! list_hashtable_vars(ht, prefix, empty)
      hashtab_T	*ht;
      char_u	*prefix;
      int		empty;
  {
      hashitem_T	*hi;
      dictitem_T	*di;
--- 1933,1943 ----
   * If "empty" is TRUE also list NULL strings as empty strings.
   */
      static void
! list_hashtable_vars(ht, prefix, empty, first)
      hashtab_T	*ht;
      char_u	*prefix;
      int		empty;
+     int		*first;
  {
      hashitem_T	*hi;
      dictitem_T	*di;
***************
*** 1950,1956 ****
  	    di = HI2DI(hi);
  	    if (empty || di->di_tv.v_type != VAR_STRING
  					   || di->di_tv.vval.v_string != NULL)
! 		list_one_var(di, prefix);
  	}
      }
  }
--- 1952,1958 ----
  	    di = HI2DI(hi);
  	    if (empty || di->di_tv.v_type != VAR_STRING
  					   || di->di_tv.vval.v_string != NULL)
! 		list_one_var(di, prefix, first);
  	}
      }
  }
***************
*** 1959,1990 ****
   * List global variables.
   */
      static void
! list_glob_vars()
  {
!     list_hashtable_vars(&globvarht, (char_u *)"", TRUE);
  }
  
  /*
   * List buffer variables.
   */
      static void
! list_buf_vars()
  {
      char_u	numbuf[NUMBUFLEN];
  
!     list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:", TRUE);
  
      sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
!     list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER, numbuf);
  }
  
  /*
   * List window variables.
   */
      static void
! list_win_vars()
  {
!     list_hashtable_vars(&curwin->w_vars.dv_hashtab, (char_u *)"w:", TRUE);
  }
  
  #ifdef FEAT_WINDOWS
--- 1961,1998 ----
   * List global variables.
   */
      static void
! list_glob_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&globvarht, (char_u *)"", TRUE, first);
  }
  
  /*
   * List buffer variables.
   */
      static void
! list_buf_vars(first)
!     int *first;
  {
      char_u	numbuf[NUMBUFLEN];
  
!     list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:",
! 								 TRUE, first);
  
      sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
!     list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER,
! 							       numbuf, first);
  }
  
  /*
   * List window variables.
   */
      static void
! list_win_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&curwin->w_vars.dv_hashtab,
! 						 (char_u *)"w:", TRUE, first);
  }
  
  #ifdef FEAT_WINDOWS
***************
*** 1992,2000 ****
   * List tab page variables.
   */
      static void
! list_tab_vars()
  {
!     list_hashtable_vars(&curtab->tp_vars.dv_hashtab, (char_u *)"t:", TRUE);
  }
  #endif
  
--- 2000,2010 ----
   * List tab page variables.
   */
      static void
! list_tab_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&curtab->tp_vars.dv_hashtab,
! 						 (char_u *)"t:", TRUE, first);
  }
  #endif
  
***************
*** 2002,2040 ****
   * List Vim variables.
   */
      static void
! list_vim_vars()
  {
!     list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE);
  }
  
  /*
   * List script-local variables, if there is a script.
   */
      static void
! list_script_vars()
  {
      if (current_SID > 0 && current_SID <= ga_scripts.ga_len)
! 	list_hashtable_vars(&SCRIPT_VARS(current_SID), (char_u *)"s:", FALSE);
  }
  
  /*
   * List function variables, if there is a function.
   */
      static void
! list_func_vars()
  {
      if (current_funccal != NULL)
  	list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
! 						       (char_u *)"l:", FALSE);
  }
  
  /*
   * List variables in "arg".
   */
      static char_u *
! list_arg_vars(eap, arg)
      exarg_T	*eap;
      char_u	*arg;
  {
      int		error = FALSE;
      int		len;
--- 2012,2055 ----
   * List Vim variables.
   */
      static void
! list_vim_vars(first)
!     int *first;
  {
!     list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE, first);
  }
  
  /*
   * List script-local variables, if there is a script.
   */
      static void
! list_script_vars(first)
!     int *first;
  {
      if (current_SID > 0 && current_SID <= ga_scripts.ga_len)
! 	list_hashtable_vars(&SCRIPT_VARS(current_SID),
! 						(char_u *)"s:", FALSE, first);
  }
  
  /*
   * List function variables, if there is a function.
   */
      static void
! list_func_vars(first)
!     int *first;
  {
      if (current_funccal != NULL)
  	list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
! 						(char_u *)"l:", FALSE, first);
  }
  
  /*
   * List variables in "arg".
   */
      static char_u *
! list_arg_vars(eap, arg, first)
      exarg_T	*eap;
      char_u	*arg;
+     int		*first;
  {
      int		error = FALSE;
      int		len;
***************
*** 2091,2105 ****
  			{
  			    switch (*name)
  			    {
! 				case 'g': list_glob_vars(); break;
! 				case 'b': list_buf_vars(); break;
! 				case 'w': list_win_vars(); break;
  #ifdef FEAT_WINDOWS
! 				case 't': list_tab_vars(); break;
  #endif
! 				case 'v': list_vim_vars(); break;
! 				case 's': list_script_vars(); break;
! 				case 'l': list_func_vars(); break;
  				default:
  					  EMSG2(_("E738: Can't list variables for %s"), name);
  			    }
--- 2106,2120 ----
  			{
  			    switch (*name)
  			    {
! 				case 'g': list_glob_vars(first); break;
! 				case 'b': list_buf_vars(first); break;
! 				case 'w': list_win_vars(first); break;
  #ifdef FEAT_WINDOWS
! 				case 't': list_tab_vars(first); break;
  #endif
! 				case 'v': list_vim_vars(first); break;
! 				case 's': list_script_vars(first); break;
! 				case 'l': list_func_vars(first); break;
  				default:
  					  EMSG2(_("E738: Can't list variables for %s"), name);
  			    }
***************
*** 2116,2122 ****
  			    *arg = NUL;
  			    list_one_var_a((char_u *)"",
  				    arg == arg_subsc ? name : name_start,
! 				    tv.v_type, s == NULL ? (char_u *)"" : s);
  			    *arg = c;
  			    vim_free(tf);
  			}
--- 2131,2139 ----
  			    *arg = NUL;
  			    list_one_var_a((char_u *)"",
  				    arg == arg_subsc ? name : name_start,
! 				    tv.v_type,
! 				    s == NULL ? (char_u *)"" : s,
! 				    first);
  			    *arg = c;
  			    vim_free(tf);
  			}
***************
*** 18001,18009 ****
   * List the value of one internal variable.
   */
      static void
! list_one_var(v, prefix)
      dictitem_T	*v;
      char_u	*prefix;
  {
      char_u	*tofree;
      char_u	*s;
--- 18024,18033 ----
   * List the value of one internal variable.
   */
      static void
! list_one_var(v, prefix, first)
      dictitem_T	*v;
      char_u	*prefix;
+     int		*first;
  {
      char_u	*tofree;
      char_u	*s;
***************
*** 18011,18026 ****
  
      s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
! 						s == NULL ? (char_u *)"" : s);
      vim_free(tofree);
  }
  
      static void
! list_one_var_a(prefix, name, type, string)
      char_u	*prefix;
      char_u	*name;
      int		type;
      char_u	*string;
  {
      /* don't use msg() or msg_attr() to avoid overwriting "v:statusmsg" */
      msg_start();
--- 18035,18051 ----
  
      s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
      list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
! 					 s == NULL ? (char_u *)"" : s, first);
      vim_free(tofree);
  }
  
      static void
! list_one_var_a(prefix, name, type, string, first)
      char_u	*prefix;
      char_u	*name;
      int		type;
      char_u	*string;
+     int		*first;  /* when TRUE clear rest of screen and set to FALSE */
  {
      /* don't use msg() or msg_attr() to avoid overwriting "v:statusmsg" */
      msg_start();
***************
*** 18052,18057 ****
--- 18077,18087 ----
  
      if (type == VAR_FUNC)
  	msg_puts((char_u *)"()");
+     if (*first)
+     {
+ 	msg_clr_eos();
+ 	*first = FALSE;
+     }
  }
  
  /*
*** ../vim-7.1.088/src/version.c	Thu Aug 30 10:34:19 2007
--- src/version.c	Thu Aug 30 11:06:32 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     89,
  /**/

-- 
Edison's greatest achievement came in 1879, when he invented the
electric company.  Edison's design was a brilliant adaptation of the
simple electrical circuit: the electric company sends electricity
through a wire to a customer, then immediately gets the electricity
back through another wire

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:27 -0400
Subject: devel/vim 7.1.090,NONE,1.1
Message-ID: <200709071403.l87E3Rhm026799@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26788

Added Files:
	7.1.090 
Log Message:
- patchlevel 90


--- NEW FILE 7.1.090 ---
To: vim-dev at vim.org
Subject: patch 7.1.090
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.090
Problem:    Compiler warning on Mac OS X 10.5.
Solution:   Don't redeclare sigaltstack(). (Hisashi T Fujinaka)
Files:	    src/os_unix.c


*** ../vim-7.1.089/src/os_unix.c	Sat Aug 11 22:22:56 2007
--- src/os_unix.c	Wed Aug 22 22:28:48 2007
***************
*** 753,759 ****
      if (signal_stack != NULL)
      {
  # ifdef HAVE_SIGALTSTACK
! #  ifdef __APPLE__
  	/* missing prototype.  Adding it to osdef?.h.in doesn't work, because
  	 * "struct sigaltstack" needs to be declared. */
  	extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct sigaltstack *oss));
--- 753,760 ----
      if (signal_stack != NULL)
      {
  # ifdef HAVE_SIGALTSTACK
! #  if defined(__APPLE__) && (!defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
! 		|| MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
  	/* missing prototype.  Adding it to osdef?.h.in doesn't work, because
  	 * "struct sigaltstack" needs to be declared. */
  	extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct sigaltstack *oss));
***************
*** 5688,5694 ****
  
  /*
   * Closes connection to gpm
!  * returns non-zero if connection succesfully closed
   */
      static void
  gpm_close()
--- 5689,5695 ----
  
  /*
   * Closes connection to gpm
!  * returns non-zero if connection successfully closed
   */
      static void
  gpm_close()
*** ../vim-7.1.089/src/version.c	Thu Aug 30 11:10:38 2007
--- src/version.c	Thu Aug 30 11:46:07 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     90,
  /**/

-- 
       We're knights of the round table
       We dance whene'er we're able
       We do routines and chorus scenes
       With footwork impeccable.
       We dine well here in Camelot
       We eat ham and jam and spam a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:35 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:35 -0400
Subject: devel/vim 7.1.091,NONE,1.1
Message-ID: <200709071403.l87E3ZU7026830@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26819

Added Files:
	7.1.091 
Log Message:
- patchlevel 91


--- NEW FILE 7.1.091 ---
To: vim-dev at vim.org
Subject: patch 7.1.091 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.091 (extra)
Problem:    Win32: Can't embed Vim inside another application.
Solution:   Add the --windowid argument. (Nageshwar)
Files:	    runtime/doc/gui_w32.txt, runtime/doc/starting.txt,
	    runtime/doc/vi_diff.txt, src/globals.h, src/gui_w32.c, src/main.c


*** ../vim-7.1.090/runtime/doc/gui_w32.txt	Sat May 12 15:35:53 2007
--- runtime/doc/gui_w32.txt	Tue Aug 14 17:32:27 2007
***************
*** 1,4 ****
! *gui_w32.txt*   For Vim version 7.1.  Last change: 2007 May 03
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *gui_w32.txt*   For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 52,57 ****
--- 52,67 ----
  								*gui-w32s*
  There is a specific version of gvim.exe that runs under the Win32s subsystem
  of Windows 3.1 or 3.11.  See |win32s|.
+ 
+ 
+ Using Vim as a plugin					*gui-w32-windowid*
+ 
+ When gvim starts up normally, it creates its own top level window.  If you
+ pass Vim the command-line option |--windowid| with a decimal or hexadecimal
+ value, Vim will create a window that is a child of the window with the given
+ ID.  This enables Vim to act as a plugin in another application.  This really
+ is a programmer's interface, and is of no use without a supporting application
+ to spawn Vim correctly.
  
  ==============================================================================
  2. Vim as default editor				*vim-default-editor*
*** ../vim-7.1.090/runtime/doc/starting.txt	Sat May 12 16:56:17 2007
--- runtime/doc/starting.txt	Tue Aug 14 17:34:22 2007
***************
*** 1,4 ****
! *starting.txt*  For Vim version 7.1.  Last change: 2007 May 12
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *starting.txt*  For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 547,552 ****
--- 547,557 ----
  		GTK+ GUI Vim only.  Make gvim try to use GtkPlug mechanism, so
  		that it runs inside another window.  See |gui-gtk-socketid|
  		for details. {not in Vi}
+ 
+ --windowid {id}						*--windowid*
+ 		Win32 GUI Vim only.  Make gvim try to use the window {id} as a
+ 		parent, so that it runs inside that window.  See
+ 		|gui-w32-windowid| for details. {not in Vi}
  
  --echo-wid						*--echo-wid*
  		GTK+ GUI Vim only.  Make gvim echo the Window ID on stdout,
*** ../vim-7.1.090/runtime/doc/vi_diff.txt	Sat May 12 14:54:28 2007
--- runtime/doc/vi_diff.txt	Tue Aug 14 17:35:10 2007
***************
*** 1,4 ****
! *vi_diff.txt*   For Vim version 7.1.  Last change: 2007 May 07
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *vi_diff.txt*   For Vim version 7.1.  Last change: 2007 Aug 14
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 826,831 ****
--- 826,833 ----
  --servername {name}	Vim: Specify Vim server name
  
  --socketid {id}		Vim: GTK window socket to run Vim in
+ 
+ --windowid {id}		Vim: Win32 window ID to run Vim in
  
  --version	Vim: show version message and exit.
  
*** ../vim-7.1.090/src/globals.h	Thu May 10 19:26:02 2007
--- src/globals.h	Wed Aug 29 22:27:45 2007
***************
*** 876,882 ****
  EXTERN int no_mapping INIT(= FALSE);	/* currently no mapping allowed */
  EXTERN int no_zero_mapping INIT(= 0);	/* mapping zero not allowed */
  EXTERN int allow_keys INIT(= FALSE);	/* allow key codes when no_mapping
! 					     * is set */
  EXTERN int no_u_sync INIT(= 0);		/* Don't call u_sync() */
  
  EXTERN int restart_edit INIT(= 0);	/* call edit when next cmd finished */
--- 876,882 ----
  EXTERN int no_mapping INIT(= FALSE);	/* currently no mapping allowed */
  EXTERN int no_zero_mapping INIT(= 0);	/* mapping zero not allowed */
  EXTERN int allow_keys INIT(= FALSE);	/* allow key codes when no_mapping
! 					 * is set */
  EXTERN int no_u_sync INIT(= 0);		/* Don't call u_sync() */
  
  EXTERN int restart_edit INIT(= 0);	/* call edit when next cmd finished */
***************
*** 1250,1255 ****
--- 1250,1263 ----
  #ifdef FEAT_GUI_GTK
  EXTERN guint32	gtk_socket_id INIT(= 0);
  EXTERN int	echo_wid_arg INIT(= FALSE);	/* --echo-wid argument */
+ #endif
+ 
+ #ifdef FEAT_GUI_W32
+ /*
+  * The value of the --windowid argument.
+  * For embedding gvim inside another application.
+  */
+ EXTERN int	win_socket_id INIT(= 0);
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
*** ../vim-7.1.090/src/gui_w32.c	Tue Aug 14 16:57:04 2007
--- src/gui_w32.c	Tue Aug 14 17:13:41 2007
***************
*** 23,28 ****
--- 23,30 ----
   * e.g., replace LONG with LONG_PTR, etc.
   */
  
+ #include "vim.h"
+ 
  /*
   * These are new in Windows ME/XP, only defined in recent compilers.
   */
***************
*** 1432,1447 ****
  	}
      }
      else
! 	/* Open toplevel window. */
  	s_hwnd = CreateWindow(
! 	    szVimWndClass, "Vim MSWindows GUI",
! 	    WS_OVERLAPPEDWINDOW,
! 	    gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x,
! 	    gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y,
! 	    100,				/* Any value will do */
! 	    100,				/* Any value will do */
! 	    NULL, NULL,
! 	    s_hinst, NULL);
  
      if (s_hwnd == NULL)
  	return FAIL;
--- 1434,1462 ----
  	}
      }
      else
!     {
! 	/* If the provided windowid is not valid reset it to zero, so that it
! 	 * is ignored and we open our own window. */
! 	if (IsWindow((HWND)win_socket_id) <= 0)
! 	    win_socket_id = 0;
! 
! 	/* Create a window.  If win_socket_id is not zero without border and
! 	 * titlebar, it will be reparented below. */
  	s_hwnd = CreateWindow(
! 		szVimWndClass, "Vim MSWindows GUI",
! 		win_socket_id == 0 ? WS_OVERLAPPEDWINDOW : WS_POPUP,
! 		gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x,
! 		gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y,
! 		100,				/* Any value will do */
! 		100,				/* Any value will do */
! 		NULL, NULL,
! 		s_hinst, NULL);
! 	if (s_hwnd != NULL && win_socket_id != 0)
! 	{
! 	    SetParent(s_hwnd, (HWND)win_socket_id);
! 	    ShowWindow(s_hwnd, SW_SHOWMAXIMIZED);
! 	}
!     }
  
      if (s_hwnd == NULL)
  	return FAIL;
*** ../vim-7.1.090/src/main.c	Fri Aug 10 21:32:41 2007
--- src/main.c	Tue Aug 14 17:22:52 2007
***************
*** 275,280 ****
--- 275,281 ----
       *   -display or --display
       *   --server...
       *   --socketid
+      *   --windowid
       */
      early_arg_scan(&params);
  
***************
*** 1489,1495 ****
   * Get the name of the display, before gui_prepare() removes it from
   * argv[].  Used for the xterm-clipboard display.
   *
!  * Also find the --server... arguments and --socketid
   */
  /*ARGSUSED*/
      static void
--- 1490,1496 ----
   * Get the name of the display, before gui_prepare() removes it from
   * argv[].  Used for the xterm-clipboard display.
   *
!  * Also find the --server... arguments and --socketid and --windowid
   */
  /*ARGSUSED*/
      static void
***************
*** 1536,1559 ****
  #  endif
  	}
  # endif
! # ifdef FEAT_GUI_GTK
  	else if (STRICMP(argv[i], "--socketid") == 0)
  	{
! 	    unsigned int    socket_id;
  	    int		    count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), "%x", &socket_id);
  	    else
! 		count = sscanf(argv[i+1], "%u", &socket_id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
! 		gtk_socket_id = socket_id;
  	    i++;
  	}
  	else if (STRICMP(argv[i], "--echo-wid") == 0)
  	    echo_wid_arg = TRUE;
  # endif
--- 1537,1571 ----
  #  endif
  	}
  # endif
! 
! # if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
! #  ifdef FEAT_GUI_W32
! 	else if (STRICMP(argv[i], "--windowid") == 0)
! #  else
  	else if (STRICMP(argv[i], "--socketid") == 0)
+ #  endif
  	{
! 	    unsigned int    id;
  	    int		    count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), "%x", &id);
  	    else
! 		count = sscanf(argv[i+1], "%u", &id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
! #  ifdef FEAT_GUI_W32
! 		win_socket_id = id;
! #  else
! 		gtk_socket_id = id;
! #  endif
  	    i++;
  	}
+ # endif
+ # ifdef FEAT_GUI_GTK
  	else if (STRICMP(argv[i], "--echo-wid") == 0)
  	    echo_wid_arg = TRUE;
  # endif
***************
*** 1683,1690 ****
  		    }
  		}
  #endif
! #ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "socketid", 8) == 0)
  		{
  		    /* already processed -- snatch the following arg */
  		    if (argc > 1)
--- 1695,1706 ----
  		    }
  		}
  #endif
! #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
! # ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "socketid", 8) == 0)
+ # else
+ 		else if (STRNICMP(argv[0] + argv_idx, "windowid", 8) == 0)
+ # endif
  		{
  		    /* already processed -- snatch the following arg */
  		    if (argc > 1)
***************
*** 1693,1698 ****
--- 1709,1716 ----
  			++argv;
  		    }
  		}
+ #endif
+ #ifdef FEAT_GUI_GTK
  		else if (STRNICMP(argv[0] + argv_idx, "echo-wid", 8) == 0)
  		{
  		    /* already processed, skip */
***************
*** 3120,3125 ****
--- 3138,3144 ----
  #endif
  #ifdef FEAT_GUI_W32
      main_msg(_("-P <parent title>\tOpen Vim inside parent application"));
+     main_msg(_("--windowid <HWND>\tOpen Vim inside another win32 widget"));
  #endif
  
  #ifdef FEAT_GUI_GNOME
*** ../vim-7.1.090/src/version.c	Thu Aug 30 11:46:46 2007
--- src/version.c	Thu Aug 30 12:21:02 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     91,
  /**/

-- 
       We're knights of the Round Table
       Our shows are formidable
       But many times
       We're given rhymes
       That are quite unsingable
       We're opera mad in Camelot
       We sing from the diaphragm a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:42 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:42 -0400
Subject: devel/vim 7.1.092,NONE,1.1
Message-ID: <200709071403.l87E3gBl026860@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26849

Added Files:
	7.1.092 
Log Message:
- patchlevel 92


--- NEW FILE 7.1.092 ---
To: vim-dev at vim.org
Subject: patch 7.1.092 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.092 (extra, after 7.1.088)
Problem:    Wrong arguments for MoveWindowStructure().
Solution:   Remove "TRUE". (Michael Henry)
Files:	    src/gui_mac.c


*** ../vim-7.1.091/src/gui_mac.c	Thu Aug 30 10:34:19 2007
--- src/gui_mac.c	Thu Aug 30 12:48:41 2007
***************
*** 3149,3155 ****
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y, TRUE);
  }
  
      void
--- 3149,3155 ----
      /* TODO:  Should make sure the window is move within range
       *	      e.g.: y > ~16 [Menu bar], x > 0, x < screen width
       */
!     MoveWindowStructure(gui.VimWindow, x, y);
  }
  
      void
***************
*** 5293,5299 ****
      short	itemType;
      short	useIcon;
      short	width;
!     short	totalButtonWidth = 0;   /* the width of all button together
  					   including spacing */
      short	widestButton = 0;
      short	dfltButtonEdge     = 20;  /* gut feeling */
--- 5293,5299 ----
      short	itemType;
      short	useIcon;
      short	width;
!     short	totalButtonWidth = 0;   /* the width of all buttons together
  					   including spacing */
      short	widestButton = 0;
      short	dfltButtonEdge     = 20;  /* gut feeling */
***************
*** 5483,5489 ****
      {
  
  	macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
! 	/* With vertical, it's better to have all button the same lenght */
  	if (vertical)
  	{
  	    macSizeDialogItem(theDialog, button, widestButton, 0);
--- 5483,5489 ----
      {
  
  	macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
! 	/* With vertical, it's better to have all buttons the same length */
  	if (vertical)
  	{
  	    macSizeDialogItem(theDialog, button, widestButton, 0);
*** ../vim-7.1.091/src/version.c	Thu Aug 30 12:24:21 2007
--- src/version.c	Thu Aug 30 12:47:24 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     92,
  /**/

-- 
       In war we're tough and able.
       Quite indefatigable
       Between our quests
       We sequin vests
       And impersonate Clark Gable
       It's a busy life in Camelot.
       I have to push the pram a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:49 -0400
Subject: devel/vim 7.1.093,NONE,1.1
Message-ID: <200709071403.l87E3nkW026890@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26879

Added Files:
	7.1.093 
Log Message:
- patchlevel 93


--- NEW FILE 7.1.093 ---
To: vim-dev at vim.org
Subject: patch 7.1.093
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.093
Problem:    Reading past end of a screen line when determining cell width.
	    (Dominique Pelle)
Solution:   Add an argument to mb_off2cells() for the maximum offset.
Files:	    src/globals.h, src/gui.c, src/mbyte.c, src/proto/mbyte.pro,
	    src/screen.c


*** ../vim-7.1.092/src/globals.h	Thu Aug 30 12:24:21 2007
--- src/globals.h	Wed Aug 29 22:27:45 2007
***************
*** 801,807 ****
  EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
  EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
  EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
! EXTERN int (*mb_off2cells) __ARGS((unsigned off)) INIT(= latin_off2cells);
  EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
  EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);
  
--- 801,807 ----
  EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
  EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
  EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
! EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
  EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
  EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);
  
*** ../vim-7.1.092/src/gui.c	Wed Aug 15 20:07:53 2007
--- src/gui.c	Wed Aug 29 22:16:51 2007
***************
*** 1080,1086 ****
  		cur_width = gui.char_width;
  	    }
  #ifdef FEAT_MBYTE
! 	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col) > 1)
  	    {
  		/* Double wide character. */
  		if (shape_table[idx].shape != SHAPE_VER)
--- 1080,1087 ----
  		cur_width = gui.char_width;
  	    }
  #ifdef FEAT_MBYTE
! 	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col,
! 				    LineOffset[gui.row] + screen_Columns) > 1)
  	    {
  		/* Double wide character. */
  		if (shape_table[idx].shape != SHAPE_VER)
***************
*** 1159,1165 ****
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
!  	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
--- 1160,1166 ----
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
! 	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
*** ../vim-7.1.092/src/mbyte.c	Sat Aug 11 13:57:31 2007
--- src/mbyte.c	Thu Aug 30 13:48:30 2007
***************
*** 1310,1329 ****
  /*
   * mb_off2cells() function pointer.
   * Return number of display cells for char at ScreenLines[off].
!  * Caller must make sure "off" and "off + 1" are valid!
   */
  /*ARGSUSED*/
      int
! latin_off2cells(off)
      unsigned	off;
  {
      return 1;
  }
  
      int
! dbcs_off2cells(off)
      unsigned	off;
  {
      /* Number of cells is equal to number of bytes, except for euc-jp when
       * the first byte is 0x8e. */
      if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
--- 1310,1335 ----
  /*
   * mb_off2cells() function pointer.
   * Return number of display cells for char at ScreenLines[off].
!  * We make sure that the offset used is less than "max_off".
   */
  /*ARGSUSED*/
      int
! latin_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
      return 1;
  }
  
      int
! dbcs_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
+     /* never check beyond end of the line */
+     if (off >= max_off)
+ 	return 1;
+ 
      /* Number of cells is equal to number of bytes, except for euc-jp when
       * the first byte is 0x8e. */
      if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
***************
*** 1332,1341 ****
  }
  
      int
! utf_off2cells(off)
      unsigned	off;
  {
!     return ScreenLines[off + 1] == 0 ? 2 : 1;
  }
  
  /*
--- 1338,1348 ----
  }
  
      int
! utf_off2cells(off, max_off)
      unsigned	off;
+     unsigned	max_off;
  {
!     return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1;
  }
  
  /*
***************
*** 2899,2910 ****
      if (composing_hangul)
  	return TRUE;
  #endif
!     if (enc_dbcs != 0)
! 	return dbcs_off2cells(LineOffset[row] + col) > 1;
!     if (enc_utf8)
! 	return (col + 1 < Columns
! 		&& ScreenLines[LineOffset[row] + col + 1] == 0);
!     return FALSE;
  }
  
  # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
--- 2906,2913 ----
      if (composing_hangul)
  	return TRUE;
  #endif
!     return (*mb_off2cells)(LineOffset[row] + col,
! 					LineOffset[row] + screen_Columns) > 1;
  }
  
  # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
*** ../vim-7.1.092/src/proto/mbyte.pro	Sat May  5 20:02:52 2007
--- src/proto/mbyte.pro	Wed Aug 29 20:49:02 2007
***************
*** 12,20 ****
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
  int latin_char2cells __ARGS((int c));
! int latin_off2cells __ARGS((unsigned off));
! int dbcs_off2cells __ARGS((unsigned off));
! int utf_off2cells __ARGS((unsigned off));
  int latin_ptr2char __ARGS((char_u *p));
  int utf_ptr2char __ARGS((char_u *p));
  int mb_ptr2char_adv __ARGS((char_u **pp));
--- 12,20 ----
  int utf_ptr2cells __ARGS((char_u *p));
  int dbcs_ptr2cells __ARGS((char_u *p));
  int latin_char2cells __ARGS((int c));
! int latin_off2cells __ARGS((unsigned off, unsigned max_off));
! int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
! int utf_off2cells __ARGS((unsigned off, unsigned max_off));
  int latin_ptr2char __ARGS((char_u *p));
  int utf_ptr2char __ARGS((char_u *p));
  int mb_ptr2char_adv __ARGS((char_u **pp));
*** ../vim-7.1.092/src/screen.c	Sun Aug  5 20:10:16 2007
--- src/screen.c	Thu Aug 30 10:31:26 2007
***************
*** 1024,1030 ****
  	    type = VALID;
      }
  
!     /* Trick: we want to avoid clearning the screen twice.  screenclear() will
       * set "screen_cleared" to TRUE.  The special value MAYBE (which is still
       * non-zero and thus not FALSE) will indicate that screenclear() was not
       * called. */
--- 1024,1030 ----
  	    type = VALID;
      }
  
!     /* Trick: we want to avoid clearing the screen twice.  screenclear() will
       * set "screen_cleared" to TRUE.  The special value MAYBE (which is still
       * non-zero and thus not FALSE) will indicate that screenclear() was not
       * called. */
***************
*** 4632,4638 ****
  
  	/*
  	 * At end of screen line and there is more to come: Display the line
! 	 * so far.  If there is no more to display it is catched above.
  	 */
  	if ((
  #ifdef FEAT_RIGHTLEFT
--- 4632,4638 ----
  
  	/*
  	 * At end of screen line and there is more to come: Display the line
! 	 * so far.  If there is no more to display it is caught above.
  	 */
  	if ((
  #ifdef FEAT_RIGHTLEFT
***************
*** 4709,4717 ****
  #endif
  #ifdef FEAT_MBYTE
  			 && !(has_mbyte
! 			     && ((*mb_off2cells)(LineOffset[screen_row]) == 2
  				 || (*mb_off2cells)(LineOffset[screen_row - 1]
! 							+ (int)Columns - 2) == 2))
  #endif
  		   )
  		{
--- 4709,4721 ----
  #endif
  #ifdef FEAT_MBYTE
  			 && !(has_mbyte
! 			     && ((*mb_off2cells)(LineOffset[screen_row],
! 				     LineOffset[screen_row] + screen_Columns)
! 									  == 2
  				 || (*mb_off2cells)(LineOffset[screen_row - 1]
! 							+ (int)Columns - 2,
! 				     LineOffset[screen_row] + screen_Columns)
! 									== 2))
  #endif
  		   )
  		{
***************
*** 4871,4876 ****
--- 4875,4884 ----
  {
      unsigned	    off_from;
      unsigned	    off_to;
+ #ifdef FEAT_MBYTE
+     unsigned	    max_off_from;
+     unsigned	    max_off_to;
+ #endif
      int		    col = 0;
  #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT)
      int		    hl;
***************
*** 4897,4902 ****
--- 4905,4914 ----
  
      off_from = (unsigned)(current_ScreenLine - ScreenLines);
      off_to = LineOffset[row] + coloff;
+ #ifdef FEAT_MBYTE
+     max_off_from = off_from + screen_Columns;
+     max_off_to = LineOffset[row] + screen_Columns;
+ #endif
  
  #ifdef FEAT_RIGHTLEFT
      if (rlflag)
***************
*** 4931,4937 ****
      {
  #ifdef FEAT_MBYTE
  	if (has_mbyte && (col + 1 < endcol))
! 	    char_cells = (*mb_off2cells)(off_from);
  	else
  	    char_cells = 1;
  #endif
--- 4943,4949 ----
      {
  #ifdef FEAT_MBYTE
  	if (has_mbyte && (col + 1 < endcol))
! 	    char_cells = (*mb_off2cells)(off_from, max_off_from);
  	else
  	    char_cells = 1;
  #endif
***************
*** 5008,5014 ****
  		 * ScreenLinesUC[] is sufficient. */
  		if (char_cells == 1
  			&& col + 1 < endcol
! 			&& (*mb_off2cells)(off_to) > 1)
  		{
  		    /* Writing a single-cell character over a double-cell
  		     * character: need to redraw the next cell. */
--- 5020,5026 ----
  		 * ScreenLinesUC[] is sufficient. */
  		if (char_cells == 1
  			&& col + 1 < endcol
! 			&& (*mb_off2cells)(off_to, max_off_to) > 1)
  		{
  		    /* Writing a single-cell character over a double-cell
  		     * character: need to redraw the next cell. */
***************
*** 5017,5024 ****
  		}
  		else if (char_cells == 2
  			&& col + 2 < endcol
! 			&& (*mb_off2cells)(off_to) == 1
! 			&& (*mb_off2cells)(off_to + 1) > 1)
  		{
  		    /* Writing the second half of a double-cell character over
  		     * a double-cell character: need to redraw the second
--- 5029,5036 ----
  		}
  		else if (char_cells == 2
  			&& col + 2 < endcol
! 			&& (*mb_off2cells)(off_to, max_off_to) == 1
! 			&& (*mb_off2cells)(off_to + 1, max_off_to) > 1)
  		{
  		    /* Writing the second half of a double-cell character over
  		     * a double-cell character: need to redraw the second
***************
*** 5037,5046 ****
  	     * char over the left halve of an existing one. */
  	    if (has_mbyte && col + char_cells == endcol
  		    && ((char_cells == 1
! 			    && (*mb_off2cells)(off_to) > 1)
  			|| (char_cells == 2
! 			    && (*mb_off2cells)(off_to) == 1
! 			    && (*mb_off2cells)(off_to + 1) > 1)))
  		clear_next = TRUE;
  #endif
  
--- 5049,5058 ----
  	     * char over the left halve of an existing one. */
  	    if (has_mbyte && col + char_cells == endcol
  		    && ((char_cells == 1
! 			    && (*mb_off2cells)(off_to, max_off_to) > 1)
  			|| (char_cells == 2
! 			    && (*mb_off2cells)(off_to, max_off_to) == 1
! 			    && (*mb_off2cells)(off_to + 1, max_off_to) > 1)))
  		clear_next = TRUE;
  #endif
  
***************
*** 5180,5189 ****
  			/* find previous character by counting from first
  			 * column and get its width. */
  			unsigned off = LineOffset[row];
  
  			while (off < off_to)
  			{
! 			    prev_cells = (*mb_off2cells)(off);
  			    off += prev_cells;
  			}
  		    }
--- 5192,5202 ----
  			/* find previous character by counting from first
  			 * column and get its width. */
  			unsigned off = LineOffset[row];
+ 			unsigned max_off = LineOffset[row] + screen_Columns;
  
  			while (off < off_to)
  			{
! 			    prev_cells = (*mb_off2cells)(off, max_off);
  			    off += prev_cells;
  			}
  		    }
***************
*** 5369,5375 ****
  static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
  
  /*
!  * Get the lenght of an item as it will be shown in the status line.
   */
      static int
  status_match_len(xp, s)
--- 5382,5388 ----
  static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
  
  /*
!  * Get the length of an item as it will be shown in the status line.
   */
      static int
  status_match_len(xp, s)
***************
*** 5435,5441 ****
      int		row;
      char_u	*buf;
      int		len;
!     int		clen;		/* lenght in screen cells */
      int		fillchar;
      int		attr;
      int		i;
--- 5448,5454 ----
      int		row;
      char_u	*buf;
      int		len;
!     int		clen;		/* length in screen cells */
      int		fillchar;
      int		attr;
      int		i;
***************
*** 6187,6192 ****
--- 6200,6206 ----
      char_u	*ptr = text;
      int		c;
  #ifdef FEAT_MBYTE
+     unsigned	max_off;
      int		mbyte_blen = 1;
      int		mbyte_cells = 1;
      int		u8c = 0;
***************
*** 6203,6208 ****
--- 6217,6225 ----
  	return;
  
      off = LineOffset[row] + col;
+ #ifdef FEAT_MBYTE
+     max_off = LineOffset[row] + screen_Columns;
+ #endif
      while (col < screen_Columns
  	    && (len < 0 || (int)(ptr - text) < len)
  	    && *ptr != NUL)
***************
*** 6326,6344 ****
  	    else if (has_mbyte
  		    && (len < 0 ? ptr[mbyte_blen] == NUL
  					     : ptr + mbyte_blen >= text + len)
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off) == 1
! 			    && (*mb_off2cells)(off + 1) > 1)))
  		clear_next_cell = TRUE;
  
  	    /* Make sure we never leave a second byte of a double-byte behind,
  	     * it confuses mb_off2cells(). */
  	    if (enc_dbcs
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off) == 1
! 			    && (*mb_off2cells)(off + 1) > 1)))
  		ScreenLines[off + mbyte_blen] = 0;
  #endif
  	    ScreenLines[off] = c;
--- 6343,6361 ----
  	    else if (has_mbyte
  		    && (len < 0 ? ptr[mbyte_blen] == NUL
  					     : ptr + mbyte_blen >= text + len)
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off, max_off) == 1
! 			    && (*mb_off2cells)(off + 1, max_off) > 1)))
  		clear_next_cell = TRUE;
  
  	    /* Make sure we never leave a second byte of a double-byte behind,
  	     * it confuses mb_off2cells(). */
  	    if (enc_dbcs
! 		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
  			|| (mbyte_cells == 2
! 			    && (*mb_off2cells)(off, max_off) == 1
! 			    && (*mb_off2cells)(off + 1, max_off) > 1)))
  		ScreenLines[off + mbyte_blen] = 0;
  #endif
  	    ScreenLines[off] = c;
***************
*** 6924,6929 ****
--- 6941,6949 ----
  {
      int		r, c;
      int		off;
+ #ifdef FEAT_MBYTE
+     int		max_off;
+ #endif
  
      /* Can't use ScreenLines unless initialized */
      if (ScreenLines == NULL)
***************
*** 6934,6943 ****
      for (r = row; r < row + height; ++r)
      {
  	off = LineOffset[r];
  	for (c = col; c < col + width; ++c)
  	{
  #ifdef FEAT_MBYTE
! 	    if (enc_dbcs != 0 && dbcs_off2cells(off + c) > 1)
  	    {
  		screen_char_2(off + c, r, c);
  		++c;
--- 6954,6966 ----
      for (r = row; r < row + height; ++r)
      {
  	off = LineOffset[r];
+ #ifdef FEAT_MBYTE
+ 	max_off = off + screen_Columns;
+ #endif
  	for (c = col; c < col + width; ++c)
  	{
  #ifdef FEAT_MBYTE
! 	    if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1)
  	    {
  		screen_char_2(off + c, r, c);
  		++c;
***************
*** 6947,6953 ****
  	    {
  		screen_char(off + c, r, c);
  #ifdef FEAT_MBYTE
! 		if (utf_off2cells(off + c) > 1)
  		    ++c;
  #endif
  	    }
--- 6970,6976 ----
  	    {
  		screen_char(off + c, r, c);
  #ifdef FEAT_MBYTE
! 		if (utf_off2cells(off + c, max_off) > 1)
  		    ++c;
  #endif
  	    }
*** ../vim-7.1.092/src/version.c	Thu Aug 30 12:50:00 2007
--- src/version.c	Thu Aug 30 13:45:25 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     93,
  /**/

-- 
There is a fine line between courage and foolishness.
Unfortunately, it's not a fence.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:03:57 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:03:57 -0400
Subject: devel/vim 7.1.094,NONE,1.1
Message-ID: <200709071403.l87E3vbT026914@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26906

Added Files:
	7.1.094 
Log Message:
- patchlevel 94


--- NEW FILE 7.1.094 ---
To: vim-dev at vim.org
Subject: patch 7.1.094
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.094
Problem:    When checking if syntax highlighting is present, looking in the
	    current buffer instead of the specified one.
Solution:   Use "buf" instead of "curbuf".
Files:	    src/syntax.c


*** ../vim-7.1.093/src/syntax.c	Tue Aug 21 17:29:04 2007
--- src/syntax.c	Wed Aug 29 23:27:52 2007
***************
*** 5987,5994 ****
  {
      return (buf->b_syn_patterns.ga_len != 0
  	    || buf->b_syn_clusters.ga_len != 0
! 	    || curbuf->b_keywtab.ht_used > 0
! 	    || curbuf->b_keywtab_ic.ht_used > 0);
  }
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
--- 5987,5994 ----
  {
      return (buf->b_syn_patterns.ga_len != 0
  	    || buf->b_syn_clusters.ga_len != 0
! 	    || buf->b_keywtab.ht_used > 0
! 	    || buf->b_keywtab_ic.ht_used > 0);
  }
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
*** ../vim-7.1.093/src/version.c	Thu Aug 30 13:51:52 2007
--- src/version.c	Thu Aug 30 19:35:52 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     94,
  /**/

-- 
MAN:     You don't frighten us, English pig-dog!  Go and boil your bottoms,
         son of a silly person.  I blow my nose on you, so-called Arthur-king,
         you and your silly English K...kaniggets.
   He puts hands to his ears and blows a raspberry.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:04 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:04 -0400
Subject: devel/vim 7.1.095,NONE,1.1
Message-ID: <200709071404.l87E444e026937@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26930

Added Files:
	7.1.095 
Log Message:
- patchlevel 95


--- NEW FILE 7.1.095 ---
To: vim-dev at vim.org
Subject: patch 7.1.095
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.095
Problem:    The FocusLost and FocusGained autocommands are triggered
	    asynchronously in the GUI.  This may cause arbitrary problems.
Solution:   Put the focus event in the input buffer and handle it when ready
	    for it.
Files:	    src/eval.c, src/getchar.c, src/gui.c, src/gui_gtk_x11.c,
	    src/keymap.h


*** ../vim-7.1.094/src/eval.c	Thu Aug 30 11:10:38 2007
--- src/eval.c	Mon Sep  3 22:48:09 2007
***************
*** 9912,9929 ****
  
      ++no_mapping;
      ++allow_keys;
!     if (argvars[0].v_type == VAR_UNKNOWN)
! 	/* getchar(): blocking wait. */
! 	n = safe_vgetc();
!     else if (get_tv_number_chk(&argvars[0], &error) == 1)
! 	/* getchar(1): only check if char avail */
! 	n = vpeekc();
!     else if (error || vpeekc() == NUL)
! 	/* illegal argument or getchar(0) and no char avail: return zero */
! 	n = 0;
!     else
! 	/* getchar(0) and char avail: return char */
! 	n = safe_vgetc();
      --no_mapping;
      --allow_keys;
  
--- 9912,9935 ----
  
      ++no_mapping;
      ++allow_keys;
!     for (;;)
!     {
! 	if (argvars[0].v_type == VAR_UNKNOWN)
! 	    /* getchar(): blocking wait. */
! 	    n = safe_vgetc();
! 	else if (get_tv_number_chk(&argvars[0], &error) == 1)
! 	    /* getchar(1): only check if char avail */
! 	    n = vpeekc();
! 	else if (error || vpeekc() == NUL)
! 	    /* illegal argument or getchar(0) and no char avail: return zero */
! 	    n = 0;
! 	else
! 	    /* getchar(0) and char avail: return char */
! 	    n = safe_vgetc();
! 	if (n == K_IGNORE)
! 	    continue;
! 	break;
!     }
      --no_mapping;
      --allow_keys;
  
*** ../vim-7.1.094/src/getchar.c	Thu May 10 18:43:02 2007
--- src/getchar.c	Wed Aug 29 22:38:49 2007
***************
*** 1596,1603 ****
  		continue;
  	    }
  #endif
- 
  #ifdef FEAT_GUI
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
  	     * it being recognized as the start of a special key. */
  	    if (c == K_CSI)
--- 1596,1610 ----
  		continue;
  	    }
  #endif
  #ifdef FEAT_GUI
+ 	    /* The caller doesn't need to know that the focus event is delayed
+ 	     * until getting a character. */
+ 	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
+ 	    {
+ 		ui_focus_change(c == K_FOCUSGAINED);
+ 		continue;
+ 	    }
+ 
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
  	     * it being recognized as the start of a special key. */
  	    if (c == K_CSI)
*** ../vim-7.1.094/src/gui.c	Thu Aug 30 13:51:52 2007
--- src/gui.c	Thu Aug 30 14:10:48 2007
***************
*** 4519,4525 ****
      xim_set_focus(in_focus);
  # endif
  
!     ui_focus_change(in_focus);
  #endif
  }
  
--- 4519,4536 ----
      xim_set_focus(in_focus);
  # endif
  
!     /* Put events in the input queue only when allowed.
!      * ui_focus_change() isn't called directly, because it invokes
!      * autocommands and that must not happen asynchronously. */
!     if (!hold_gui_events)
!     {
! 	char_u  bytes[3];
! 
! 	bytes[0] = CSI;
! 	bytes[1] = KS_EXTRA;
! 	bytes[2] = in_focus ? (int)KE_FOCUSGAINED : (int)KE_FOCUSLOST;
! 	add_to_input_buf(bytes, 3);
!     }
  #endif
  }
  
*** ../vim-7.1.094/src/gui_gtk_x11.c	Tue Jun 19 18:07:52 2007
--- src/gui_gtk_x11.c	Wed Aug 29 22:43:34 2007
***************
*** 813,822 ****
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
  
!     /* make sure keyboard input goes to the draw area (if this is focus for a window) */
      if (widget != gui.drawarea)
  	gtk_widget_grab_focus(gui.drawarea);
  
      return TRUE;
  }
  
--- 813,827 ----
      if (blink_state == BLINK_NONE)
  	gui_mch_start_blink();
  
!     /* make sure keyboard input goes to the draw area (if this is focus for a
!      * window) */
      if (widget != gui.drawarea)
  	gtk_widget_grab_focus(gui.drawarea);
  
+     /* make sure the input buffer is read */
+     if (gtk_main_level() > 0)
+ 	gtk_main_quit();
+ 
      return TRUE;
  }
  
***************
*** 828,833 ****
--- 833,842 ----
  
      if (blink_state != BLINK_NONE)
  	gui_mch_stop_blink();
+ 
+     /* make sure the input buffer is read */
+     if (gtk_main_level() > 0)
+ 	gtk_main_quit();
  
      return TRUE;
  }
*** ../vim-7.1.094/src/keymap.h	Sat May  5 19:34:22 2007
--- src/keymap.h	Wed Aug 29 22:17:51 2007
***************
*** 254,259 ****
--- 254,261 ----
      , KE_DROP		/* DnD data is available */
      , KE_CURSORHOLD	/* CursorHold event */
      , KE_NOP		/* doesn't do something */
+     , KE_FOCUSGAINED	/* focus gained */
+     , KE_FOCUSLOST	/* focus lost */
  };
  
  /*
***************
*** 445,450 ****
--- 447,454 ----
  #define K_CMDWIN	TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)
  
  #define K_DROP		TERMCAP2KEY(KS_EXTRA, KE_DROP)
+ #define K_FOCUSGAINED	TERMCAP2KEY(KS_EXTRA, KE_FOCUSGAINED)
+ #define K_FOCUSLOST	TERMCAP2KEY(KS_EXTRA, KE_FOCUSLOST)
  
  #define K_CURSORHOLD	TERMCAP2KEY(KS_EXTRA, KE_CURSORHOLD)
  
*** ../vim-7.1.094/src/version.c	Thu Aug 30 19:36:52 2007
--- src/version.c	Wed Sep  5 21:42:41 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     95,
  /**/

-- 
ARTHUR:      Who are you?
TALL KNIGHT: We are the Knights Who Say "Ni"!
BEDEVERE:    No!  Not the Knights Who Say "Ni"!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:11 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:11 -0400
Subject: devel/vim 7.1.096,NONE,1.1
Message-ID: <200709071404.l87E4Bfq026960@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26953

Added Files:
	7.1.096 
Log Message:
- patchlevel 96


--- NEW FILE 7.1.096 ---
To: vim-dev at vim.org
Subject: patch 7.1.096
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.096
Problem:    Reading past end of a string when resizing Vim. (Dominique Pelle)
Solution:   Check the string pointer before getting the char it points to.
Files:	    src/message.c


*** ../vim-7.1.095/src/message.c	Tue Aug  7 21:59:26 2007
--- src/message.c	Thu Aug 30 22:53:03 2007
***************
*** 944,949 ****
--- 944,950 ----
  		c = K_IGNORE;
  	    }
  #endif
+ 
  	    /*
  	     * Allow scrolling back in the messages.
  	     * Also accept scroll-down commands when messages fill the screen,
***************
*** 1840,1845 ****
--- 1841,1847 ----
      char_u	*sb_str = str;
      int		sb_col = msg_col;
      int		wrap;
+     int		did_last_char;
  
      did_wait_return = FALSE;
      while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
***************
*** 1909,1915 ****
--- 1911,1920 ----
  		else
  #endif
  		    msg_screen_putchar(*s++, attr);
+ 		did_last_char = TRUE;
  	    }
+ 	    else
+ 		did_last_char = FALSE;
  
  	    if (p_more)
  		/* store text for scrolling back */
***************
*** 1944,1954 ****
  
  	    /* When we displayed a char in last column need to check if there
  	     * is still more. */
! 	    if (*s >= ' '
! #ifdef FEAT_RIGHTLEFT
! 		    && !cmdmsg_rl
! #endif
! 	       )
  		continue;
  	}
  
--- 1949,1955 ----
  
  	    /* When we displayed a char in last column need to check if there
  	     * is still more. */
! 	    if (did_last_char)
  		continue;
  	}
  
*** ../vim-7.1.095/src/version.c	Wed Sep  5 21:45:54 2007
--- src/version.c	Thu Sep  6 12:31:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     96,
  /**/

-- 
Yah, well, we had to carve our electrons out of driftwood we'd
find.  In the winter.  Uphill.  Both ways.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:19 -0400
Subject: devel/vim 7.1.097,NONE,1.1
Message-ID: <200709071404.l87E4J94026983@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976

Added Files:
	7.1.097 
Log Message:
- patchlevel 97


--- NEW FILE 7.1.097 ---
To: vim-dev at vim.org
Subject: patch 7.1.097
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.097
Problem:    ":setlocal stl=%!1+1" does not work.
Solution:   Adjust check for pointer. (Politz)
Files:	    src/option.c


*** ../vim-7.1.096/src/option.c	Sun Aug 12 15:50:26 2007
--- src/option.c	Wed Sep  5 22:34:27 2007
***************
*** 6348,6354 ****
  		errmsg = check_stl_option(p_ruf);
  	}
  	/* check 'statusline' only if it doesn't start with "%!" */
! 	else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
--- 6352,6358 ----
  		errmsg = check_stl_option(p_ruf);
  	}
  	/* check 'statusline' only if it doesn't start with "%!" */
! 	else if (varp == &p_ruf || s[0] != '%' || s[1] != '!')
  	    errmsg = check_stl_option(s);
  	if (varp == &p_ruf && errmsg == NULL)
  	    comp_col();
*** ../vim-7.1.096/src/version.c	Thu Sep  6 12:53:59 2007
--- src/version.c	Thu Sep  6 13:31:37 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     97,
  /**/

-- 
Not too long ago, cut and paste was done with scissors and glue...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:27 -0400
Subject: devel/vim 7.1.098,NONE,1.1
Message-ID: <200709071404.l87E4R6x027021@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002

Added Files:
	7.1.098 
Log Message:
- patchlevel 98


--- NEW FILE 7.1.098 ---
To: vim-dev at vim.org
Subject: patch 7.1.098
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.098
Problem:    ":call s:var()" doesn't work if "s:var" is a Funcref. (Andy Wokula)
Solution:   Before converting "s:" into a script ID, check if it is a Funcref.
Files:	    src/eval.c


*** ../vim-7.1.097/src/eval.c	Wed Sep  5 21:45:54 2007
--- src/eval.c	Thu Sep  6 12:11:19 2007
***************
*** 19367,19372 ****
--- 19367,19394 ----
      if (lv.ll_name == NULL)
      {
  	/* Error found, but continue after the function name. */
+ 	*pp = end;
+ 	goto theend;
+     }
+ 
+     /* Check if the name is a Funcref.  If so, use the value. */
+     if (lv.ll_exp_name != NULL)
+     {
+ 	len = (int)STRLEN(lv.ll_exp_name);
+ 	name = deref_func_name(lv.ll_exp_name, &len);
+ 	if (name == lv.ll_exp_name)
+ 	    name = NULL;
+     }
+     else
+     {
+ 	len = (int)(end - *pp);
+ 	name = deref_func_name(*pp, &len);
+ 	if (name == *pp)
+ 	    name = NULL;
+     }
+     if (name != NULL)
+     {
+ 	name = vim_strsave(name);
  	*pp = end;
  	goto theend;
      }
*** ../vim-7.1.097/src/version.c	Thu Sep  6 13:32:53 2007
--- src/version.c	Thu Sep  6 14:24:10 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     98,
  /**/

-- 
Not too long ago, a program was something you watched on TV...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:04:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:04:34 -0400
Subject: devel/vim 7.1.099,NONE,1.1
Message-ID: <200709071404.l87E4YCf027053@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27039

Added Files:
	7.1.099 
Log Message:
- patchlevel 99


--- NEW FILE 7.1.099 ---
To: vim-dev at vim.org
Subject: patch 7.1.099
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.099
Problem:    When the 'keymap' and 'paste' options have a non-default value,
	    ":mkexrc" and ":mksession" do not correctly set the options.
Solution:   Set the options with side effects before other options.
Files:	    src/option.c

 
*** ../vim-7.1.098/src/option.c	Thu Sep  6 13:32:53 2007
--- src/option.c	Wed Sep  5 22:34:27 2007
***************
*** 427,432 ****
--- 427,434 ----
  #define P_NOGLOB       0x100000L/* do not use local value for global vimrc */
  #define P_NFNAME       0x200000L/* only normal file name chars allowed */
  #define P_INSECURE     0x400000L/* option was set from a modeline */
+ #define P_PRI_MKRC     0x800000L/* priority for :mkvimrc (setting option has
+ 				   side effects) */
  
  #define ISK_LATIN1  (char_u *)"@,48-57,_,192-255"
  
***************
*** 773,778 ****
--- 775,782 ----
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
+ 			    /* P_PRI_MKRC isn't needed here, optval_default()
+ 			     * always returns TRUE for 'compatible' */
      {"compatible",  "cp",   P_BOOL|P_RALL,
  			    (char_u *)&p_cp, PV_NONE,
  			    {(char_u *)TRUE, (char_u *)FALSE}},
***************
*** 1515,1521 ****
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME,
  #ifdef FEAT_KEYMAP
  			    (char_u *)&p_keymap, PV_KMAP,
  			    {(char_u *)"", (char_u *)0L}
--- 1519,1525 ----
  			    {(char_u *)0L, (char_u *)0L}
  #endif
  			    },
!     {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
  #ifdef FEAT_KEYMAP
  			    (char_u *)&p_keymap, PV_KMAP,
  			    {(char_u *)"", (char_u *)0L}
***************
*** 1836,1842 ****
      {"paragraphs",  "para", P_STRING|P_VI_DEF,
  			    (char_u *)&p_para, PV_NONE,
  			    {(char_u *)"IPLPPPQPP LIpplpipbp", (char_u *)0L}},
!     {"paste",	    NULL,   P_BOOL|P_VI_DEF,
  			    (char_u *)&p_paste, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L}},
      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
--- 1840,1846 ----
      {"paragraphs",  "para", P_STRING|P_VI_DEF,
  			    (char_u *)&p_para, PV_NONE,
  			    {(char_u *)"IPLPPPQPP LIpplpipbp", (char_u *)0L}},
!     {"paste",	    NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
  			    (char_u *)&p_paste, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L}},
      {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
***************
*** 8535,8547 ****
      char_u		*varp_local = NULL;	/* fresh value */
      char		*cmd;
      int			round;
  
      /*
       * The options that don't have a default (terminal name, columns, lines)
       * are never written.  Terminal options are also not written.
       */
!     for (p = &options[0]; !istermoption(p); p++)
! 	if (!(p->flags & P_NO_MKRC) && !istermoption(p))
  	{
  	    /* skip global option when only doing locals */
  	    if (p->indir == PV_NONE && !(opt_flags & OPT_GLOBAL))
--- 8539,8558 ----
      char_u		*varp_local = NULL;	/* fresh value */
      char		*cmd;
      int			round;
+     int			pri;
  
      /*
       * The options that don't have a default (terminal name, columns, lines)
       * are never written.  Terminal options are also not written.
+      * Do the loop over "options[]" twice: once for options with the
+      * P_PRI_MKRC flag and once without.
       */
!     for (pri = 1; pri >= 0; --pri)
!     {
!       for (p = &options[0]; !istermoption(p); p++)
! 	if (!(p->flags & P_NO_MKRC)
! 		&& !istermoption(p)
! 		&& ((pri == 1) == ((p->flags & P_PRI_MKRC) != 0)))
  	{
  	    /* skip global option when only doing locals */
  	    if (p->indir == PV_NONE && !(opt_flags & OPT_GLOBAL))
***************
*** 8637,8642 ****
--- 8648,8654 ----
  		}
  	    }
  	}
+     }
      return OK;
  }
  
*** ../vim-7.1.098/src/version.c	Thu Sep  6 14:25:50 2007
--- src/version.c	Thu Sep  6 16:32:31 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     99,
  /**/

-- 
Not too long ago, a keyboard was something to make music with...

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Fri Sep  7 14:05:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 10:05:26 -0400
Subject: rpms/redhat-menus/devel categories.patch, 1.4, 1.5 redhat-menus.spec,
	1.84, 1.85
Message-ID: <200709071405.l87E5QJA027223@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27067

Modified Files:
	categories.patch redhat-menus.spec 
Log Message:
More category finetuning; remove remaining overrides


categories.patch:

Index: categories.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/categories.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- categories.patch	3 Jul 2007 02:48:28 -0000	1.4
+++ categories.patch	7 Sep 2007 14:04:52 -0000	1.5
@@ -1,7 +1,51 @@
+diff -up redhat-menus-8.9.10/menus/server-settings.menu.categories redhat-menus-8.9.10/menus/server-settings.menu
+--- redhat-menus-8.9.10/menus/server-settings.menu.categories	2007-09-07 10:01:24.000000000 -0400
++++ redhat-menus-8.9.10/menus/server-settings.menu	2007-09-07 10:01:34.000000000 -0400
+@@ -21,7 +21,6 @@
+   <Include>
+     <And>
+       <Category>X-Red-Hat-Base</Category>
+-      <Category>Application</Category>
+       <Category>X-Red-Hat-ServerConfig</Category>
+     </And>
+   </Include>
+@@ -34,7 +33,6 @@
+       <And>
+         <Not><Category>X-Red-Hat-Base-Only</Category></Not>
+         <Not><Category>X-Red-Hat-Base</Category></Not>
+-        <Category>Application</Category>
+         <Category>X-Red-Hat-ServerConfig</Category>
+       </And>
+     </Include>
 diff -up redhat-menus-8.9.10/menus/applications.menu.categories redhat-menus-8.9.10/menus/applications.menu
---- redhat-menus-8.9.10/menus/applications.menu.categories	2007-07-02 22:35:48.000000000 -0400
-+++ redhat-menus-8.9.10/menus/applications.menu	2007-07-02 22:36:44.000000000 -0400
-@@ -123,23 +123,15 @@
+--- redhat-menus-8.9.10/menus/applications.menu.categories	2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/applications.menu	2007-09-07 10:01:04.000000000 -0400
+@@ -43,7 +43,6 @@
+       <And>
+         <Category>Development</Category>
+       </And>
+-      <Filename>emacs.desktop</Filename>
+     </Include>
+   </Menu> <!-- End Development Tools -->
+ 
+@@ -77,8 +76,6 @@
+       <And>
+         <Category>Graphics</Category>
+       </And>
+-      <Filename>dia.desktop</Filename>
+-      <Filename>drawing.desktop</Filename>
+     </Include>
+   </Menu> <!-- End Graphics -->
+ 
+@@ -89,6 +86,7 @@
+     <Include>
+       <And>
+         <Category>Network</Category>
++	<Not><Category>Settings</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Internet -->
+@@ -123,38 +121,13 @@
      <Include>
        <And>
          <Category>System</Category>
@@ -18,27 +62,30 @@
 -      <Filename>gdmflexiserver-xnest.desktop</Filename>
 -      <Filename>gnome-file-roller.desktop</Filename>
 -      <Filename>gnome-gfloppy.desktop</Filename>
-       <Filename>redhat-authconfig.desktop</Filename>
-       <Filename>redhat-usermount.desktop</Filename>
+-      <Filename>redhat-authconfig.desktop</Filename>
+-      <Filename>redhat-usermount.desktop</Filename>
 -      <Filename>system-config-date.desktop</Filename>
-       <Filename>system-config-keyboard.desktop</Filename>
+-      <Filename>system-config-keyboard.desktop</Filename>
 -      <Filename>system-config-language.desktop</Filename>
-       <Filename>system-config-mouse.desktop</Filename>
-       <Filename>system-config-nfs.desktop</Filename>
+-      <Filename>system-config-mouse.desktop</Filename>
+-      <Filename>system-config-nfs.desktop</Filename>
        <Filename>pirut.desktop</Filename>
-@@ -147,11 +139,8 @@
-       <Filename>system-config-securitylevel.desktop</Filename>
-       <Filename>system-config-services.desktop</Filename>
-       <Filename>system-config-soundcard.desktop</Filename>
+-      <Filename>system-config-rootpassword.desktop</Filename>
+-      <Filename>system-config-securitylevel.desktop</Filename>
+-      <Filename>system-config-services.desktop</Filename>
+-      <Filename>system-config-soundcard.desktop</Filename>
 -      <Filename>system-config-users.desktop</Filename>
-       <Filename>redhat-neat.desktop</Filename>
-       <Filename>redhat-neat-control.desktop</Filename>
+-      <Filename>redhat-neat.desktop</Filename>
+-      <Filename>redhat-neat-control.desktop</Filename>
 -      <Filename>redhat-printconf-gui.desktop</Filename>
 -      <Filename>redhat-rhn-up2date-config.desktop</Filename>
-       <Filename>redhat-switchdesk.desktop</Filename>
-       <Filename>redhat-switchmail.desktop</Filename>
-       <Filename>redhat-switch-printer.desktop</Filename>
-@@ -167,7 +156,6 @@
+-      <Filename>redhat-switchdesk.desktop</Filename>
+-      <Filename>redhat-switchmail.desktop</Filename>
+-      <Filename>redhat-switch-printer.desktop</Filename>
+     </Exclude>
+   </Menu>   <!-- End System Tools -->
+ 
+@@ -167,7 +140,6 @@
        <And>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
@@ -47,8 +94,8 @@
          <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
          <Not><Category>Screensaver</Category></Not>
 diff -up redhat-menus-8.9.10/menus/preferences.menu.categories redhat-menus-8.9.10/menus/preferences.menu
---- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-07-02 22:35:48.000000000 -0400
-+++ redhat-menus-8.9.10/menus/preferences.menu	2007-07-02 22:35:48.000000000 -0400
+--- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/preferences.menu	2007-09-07 10:01:04.000000000 -0400
 @@ -28,12 +28,12 @@
        <Category>Settings</Category>
        <Not>
@@ -122,7 +169,7 @@
    </Menu> <!-- End System -->
 diff -up redhat-menus-8.9.10/menus/system-settings.menu.categories redhat-menus-8.9.10/menus/system-settings.menu
 --- redhat-menus-8.9.10/menus/system-settings.menu.categories	2007-03-19 13:45:14.000000000 -0400
-+++ redhat-menus-8.9.10/menus/system-settings.menu	2007-07-02 22:36:56.000000000 -0400
++++ redhat-menus-8.9.10/menus/system-settings.menu	2007-09-07 10:01:04.000000000 -0400
 @@ -18,7 +18,9 @@
    <DefaultMergeDirs/>
  
@@ -134,7 +181,7 @@
  
    <!-- Merge in server settings -->
    <Menu>
-@@ -30,10 +32,8 @@
+@@ -30,50 +32,11 @@
  
    <Include>
      <And>
@@ -147,24 +194,23 @@
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
        <Not><Category>Screensaver</Category></Not>
      </And>
-@@ -41,39 +41,13 @@
+   </Include>
  
-   <Include>
-     <Filename>redhat-authconfig.desktop</Filename>
+-  <Include>
+-    <Filename>redhat-authconfig.desktop</Filename>
 -    <Filename>system-config-date.desktop</Filename>
-     <Filename>system-config-keyboard.desktop</Filename>
+-    <Filename>system-config-keyboard.desktop</Filename>
 -    <Filename>system-config-language.desktop</Filename>
-     <Filename>system-config-mouse.desktop</Filename>
-     <Filename>system-config-rootpassword.desktop</Filename>
-     <Filename>system-config-securitylevel.desktop</Filename>
-     <Filename>system-config-soundcard.desktop</Filename>
+-    <Filename>system-config-mouse.desktop</Filename>
+-    <Filename>system-config-rootpassword.desktop</Filename>
+-    <Filename>system-config-securitylevel.desktop</Filename>
+-    <Filename>system-config-soundcard.desktop</Filename>
 -    <Filename>system-config-users.desktop</Filename>
-+    <Filename>system-config-lvm.desktop</Filename>
-     <Filename>redhat-neat.desktop</Filename>
+-    <Filename>redhat-neat.desktop</Filename>
 -    <Filename>redhat-printconf-gui.desktop</Filename>
 -    <Filename>redhat-rhn-up2date-config.desktop</Filename>
-   </Include>
- 
+-  </Include>
+-
 -  <Exclude>
 -    <Filename>system-config-packages.desktop</Filename>
 -  </Exclude>


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- redhat-menus.spec	6 Sep 2007 17:30:54 -0000	1.84
+++ redhat-menus.spec	7 Sep 2007 14:04:52 -0000	1.85
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -85,6 +85,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-10
+- More category finetuning; remove remaining overrides
+
 * Thu Sep  6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
 - create /etx/xdg/menus/settings-merged by default
 



From fedora-extras-commits at redhat.com  Fri Sep  7 14:05:40 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Fri, 7 Sep 2007 10:05:40 -0400
Subject: devel/vim 7.1.100, NONE, 1.1 README.patches, 1.82, 1.83 vim.spec,
	1.174, 1.175
Message-ID: <200709071405.l87E5eBb027244@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27178

Modified Files:
	README.patches vim.spec 
Added Files:
	7.1.100 
Log Message:
- patchlevel 100


--- NEW FILE 7.1.100 ---
To: vim-dev at vim.org
Subject: patch 7.1.100
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.100
Problem:    Win32: Executing cscope doesn't always work properly.
Solution:   Use another way to invoke cscope. (Mike Williams)
Files:	    src/if_cscope.c, src/if_cscope.h, src/main.c,
	    src/proto/if_cscope.pro


*** ../vim-7.1.099/src/if_cscope.c	Tue Aug 21 18:02:58 2007
--- src/if_cscope.c	Sun Sep  2 16:50:50 2007
***************
*** 24,34 ****
      /* not UNIX, must be WIN32 */
  # include "vimio.h"
  # include <fcntl.h>
- # include <process.h>
- # define STDIN_FILENO    0
- # define STDOUT_FILENO   1
- # define STDERR_FILENO   2
- # define pipe(fds) _pipe(fds, 256, O_TEXT|O_NOINHERIT)
  #endif
  #include "if_cscope.h"
  
--- 24,29 ----
***************
*** 65,71 ****
  static char *	    cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
  static char *	    cs_pathcomponents __ARGS((char *path));
  static void	    cs_print_tags_priv __ARGS((char **, char **, int));
! static int	    cs_read_prompt __ARGS((int ));
  static void	    cs_release_csp __ARGS((int, int freefnpp));
  static int	    cs_reset __ARGS((exarg_T *eap));
  static char *	    cs_resolve_file __ARGS((int, char *));
--- 60,66 ----
  static char *	    cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
  static char *	    cs_pathcomponents __ARGS((char *path));
  static void	    cs_print_tags_priv __ARGS((char **, char **, int));
! static int	    cs_read_prompt __ARGS((int));
  static void	    cs_release_csp __ARGS((int, int freefnpp));
  static int	    cs_reset __ARGS((exarg_T *eap));
  static char *	    cs_resolve_file __ARGS((int, char *));
***************
*** 504,510 ****
  #if defined(UNIX)
      else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
  #else
! 	/* substitute define S_ISREG from os_unix.h */
      else if (((statbuf.st_mode) & S_IFMT) == S_IFREG)
  #endif
      {
--- 499,505 ----
  #if defined(UNIX)
      else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
  #else
! 	/* WIN32 - substitute define S_ISREG from os_unix.h */
      else if (((statbuf.st_mode) & S_IFMT) == S_IFREG)
  #endif
      {
***************
*** 717,733 ****
  cs_create_connection(i)
      int i;
  {
!     int to_cs[2], from_cs[2], len;
!     char *prog, *cmd, *ppath = NULL;
! #ifndef UNIX
!     int in_save, out_save, err_save;
!     long_i ph;
! # ifdef FEAT_GUI
!     HWND activewnd = NULL;
!     HWND consolewnd = NULL;
! # endif
  #endif
  
      /*
       * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
       * from_cs[0] and writes to to_cs[1].
--- 712,734 ----
  cs_create_connection(i)
      int i;
  {
! #ifdef UNIX
!     int		to_cs[2], from_cs[2];
! #endif
!     int		len;
!     char	*prog, *cmd, *ppath = NULL;
! #ifdef WIN32
!     int		fd;
!     SECURITY_ATTRIBUTES sa;
!     PROCESS_INFORMATION pi;
!     STARTUPINFO si;
!     BOOL	pipe_stdin = FALSE, pipe_stdout = FALSE;
!     HANDLE	stdin_rd, stdout_rd;
!     HANDLE	stdout_wr, stdin_wr;
!     BOOL	created;
  #endif
  
+ #if defined(UNIX)
      /*
       * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
       * from_cs[0] and writes to to_cs[1].
***************
*** 748,765 ****
  	return CSCOPE_FAILURE;
      }
  
- #if defined(UNIX)
      switch (csinfo[i].pid = fork())
      {
      case -1:
  	(void)EMSG(_("E622: Could not fork for cscope"));
  	goto err_closing;
      case 0:				/* child: run cscope. */
- #else
- 	in_save = dup(STDIN_FILENO);
- 	out_save = dup(STDOUT_FILENO);
- 	err_save = dup(STDERR_FILENO);
- #endif
  	if (dup2(to_cs[0], STDIN_FILENO) == -1)
  	    PERROR("cs_create_connection 1");
  	if (dup2(from_cs[1], STDOUT_FILENO) == -1)
--- 749,760 ----
***************
*** 768,782 ****
  	    PERROR("cs_create_connection 3");
  
  	/* close unused */
- #if defined(UNIX)
  	(void)close(to_cs[1]);
  	(void)close(from_cs[0]);
  #else
! 	/* On win32 we must close opposite ends because we are the parent */
! 	(void)close(to_cs[0]);
! 	to_cs[0] = -1;
! 	(void)close(from_cs[1]);
! 	from_cs[1] = -1;
  #endif
  	/* expand the cscope exec for env var's */
  	if ((prog = (char *)alloc(MAXPATHL + 1)) == NULL)
--- 763,794 ----
  	    PERROR("cs_create_connection 3");
  
  	/* close unused */
  	(void)close(to_cs[1]);
  	(void)close(from_cs[0]);
  #else
! 	/* WIN32 */
! 	/* Create pipes to communicate with cscope */
! 	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
! 	sa.bInheritHandle = TRUE;
! 	sa.lpSecurityDescriptor = NULL;
! 
! 	if (!(pipe_stdin = CreatePipe(&stdin_rd, &stdin_wr, &sa, 0))
! 		|| !(pipe_stdout = CreatePipe(&stdout_rd, &stdout_wr, &sa, 0)))
! 	{
! 	    (void)EMSG(_("E566: Could not create cscope pipes"));
! err_closing:
! 	    if (pipe_stdin)
! 	    {
! 		CloseHandle(stdin_rd);
! 		CloseHandle(stdin_wr);
! 	    }
! 	    if (pipe_stdout)
! 	    {
! 		CloseHandle(stdout_rd);
! 		CloseHandle(stdout_wr);
! 	    }
! 	    return CSCOPE_FAILURE;
! 	}
  #endif
  	/* expand the cscope exec for env var's */
  	if ((prog = (char *)alloc(MAXPATHL + 1)) == NULL)
***************
*** 784,789 ****
--- 796,802 ----
  #ifdef UNIX
  	    return CSCOPE_FAILURE;
  #else
+ 	    /* WIN32 */
  	    goto err_closing;
  #endif
  	}
***************
*** 800,805 ****
--- 813,819 ----
  #ifdef UNIX
  		return CSCOPE_FAILURE;
  #else
+ 		/* WIN32 */
  		goto err_closing;
  #endif
  	    }
***************
*** 818,823 ****
--- 832,838 ----
  #ifdef UNIX
  	    return CSCOPE_FAILURE;
  #else
+ 	    /* WIN32 */
  	    goto err_closing;
  #endif
  	}
***************
*** 826,831 ****
--- 841,847 ----
  #if defined(UNIX)
  	(void)sprintf(cmd, "exec %s -dl -f %s", prog, csinfo[i].fname);
  #else
+ 	/* WIN32 */
  	(void)sprintf(cmd, "%s -dl -f %s", prog, csinfo[i].fname);
  #endif
  	if (csinfo[i].ppath != NULL)
***************
*** 851,910 ****
  	exit(127);
  	/* NOTREACHED */
      default:	/* parent. */
- #else
- # ifdef FEAT_GUI
- 	activewnd = GetForegroundWindow(); /* on win9x cscope steals focus */
- 	/* Dirty hack to hide annoying console window */
- 	if (AllocConsole())
- 	{
- 	    char *title;
- 	    title = (char *)alloc(1024);
- 	    if (title == NULL)
- 		FreeConsole();
- 	    else
- 	    {
- 		GetConsoleTitle(title, 1024); /* save for future restore */
- 		SetConsoleTitle(
- 		    "GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
- 		Sleep(40); /* as stated in MS KB we must wait 40 ms */
- 		consolewnd = FindWindow(NULL,
- 			"GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
- 		if (consolewnd != NULL)
- 		    ShowWindow(consolewnd, SW_HIDE);
- 		SetConsoleTitle(title);
- 		vim_free(title);
- 	    }
- 	}
- # endif
- 	/* May be use &shell, &shellquote etc */
- # ifdef __BORLANDC__
- 	/* BCC 5.5 uses a different function name for spawnlp */
- 	ph = (long_i)spawnlp(P_NOWAIT, prog, cmd, NULL);
- # else
- 	ph = (long_i)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
- # endif
- 	vim_free(prog);
- 	vim_free(cmd);
- # ifdef FEAT_GUI
- 	/* Dirty hack part two */
- 	if (activewnd != NULL)
- 	    /* restoring focus */
- 	    SetForegroundWindow(activewnd);
- 	if (consolewnd != NULL)
- 	    FreeConsole();
- 
- # endif
- 	if (ph == -1)
- 	{
- 	    PERROR(_("cs_create_connection exec failed"));
- 	    (void)EMSG(_("E623: Could not spawn cscope process"));
- 	    goto err_closing;
- 	}
- 	/* else */
- 	csinfo[i].pid = 0;
- 	csinfo[i].hProc = (HANDLE)ph;
- 
- #endif /* !UNIX */
  	/*
  	 * Save the file descriptors for later duplication, and
  	 * reopen as streams.
--- 867,872 ----
***************
*** 914,935 ****
  	if ((csinfo[i].fr_fp = fdopen(from_cs[0], "r")) == NULL)
  	    PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
- #if defined(UNIX)
  	/* close unused */
  	(void)close(to_cs[0]);
  	(void)close(from_cs[1]);
  
  	break;
      }
  #else
! 	/* restore stdhandles */
!     dup2(in_save, STDIN_FILENO);
!     dup2(out_save, STDOUT_FILENO);
!     dup2(err_save, STDERR_FILENO);
!     close(in_save);
!     close(out_save);
!     close(err_save);
! #endif
      return CSCOPE_SUCCESS;
  } /* cs_create_connection */
  
--- 876,927 ----
  	if ((csinfo[i].fr_fp = fdopen(from_cs[0], "r")) == NULL)
  	    PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
  	/* close unused */
  	(void)close(to_cs[0]);
  	(void)close(from_cs[1]);
  
  	break;
      }
+ 
  #else
!     /* WIN32 */
!     /* Create a new process to run cscope and use pipes to talk with it */
!     GetStartupInfo(&si);
!     si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
!     si.wShowWindow = SW_HIDE;  /* Hide child application window */
!     si.hStdOutput = stdout_wr;
!     si.hStdError  = stdout_wr;
!     si.hStdInput  = stdin_rd;
!     created = CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE,
! 							NULL, NULL, &si, &pi);
!     vim_free(prog);
!     vim_free(cmd);
! 
!     if (!created)
!     {
! 	PERROR(_("cs_create_connection exec failed"));
! 	(void)EMSG(_("E623: Could not spawn cscope process"));
! 	goto err_closing;
!     }
!     /* else */
!     csinfo[i].pid = pi.dwProcessId;
!     csinfo[i].hProc = pi.hProcess;
!     CloseHandle(pi.hThread);
! 
!     /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
! 	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
! 	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
! 	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
! 	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
! 
!     /* Close handles for file descriptors inherited by the cscope process */
!     CloseHandle(stdin_rd);
!     CloseHandle(stdout_wr);
! 
! #endif /* !UNIX */
! 
      return CSCOPE_SUCCESS;
  } /* cs_create_connection */
  
***************
*** 2097,2104 ****
  /*
   * PRIVATE: cs_release_csp
   *
!  * does the actual free'ing for the cs ptr with an optional flag of whether
!  * or not to free the filename.  called by cs_kill and cs_reset.
   */
      static void
  cs_release_csp(i, freefnpp)
--- 2089,2096 ----
  /*
   * PRIVATE: cs_release_csp
   *
!  * Does the actual free'ing for the cs ptr with an optional flag of whether
!  * or not to free the filename.  Called by cs_kill and cs_reset.
   */
      static void
  cs_release_csp(i, freefnpp)
***************
*** 2116,2125 ****
  	(void)fputs("q\n", csinfo[i].to_fp);
  	(void)fflush(csinfo[i].to_fp);
      }
!     /* give cscope chance to exit normally */
!     if (csinfo[i].hProc != NULL
! 	    && WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
! 	TerminateProcess(csinfo[i].hProc, 0);
  #endif
  
      if (csinfo[i].fr_fp != NULL)
--- 2108,2120 ----
  	(void)fputs("q\n", csinfo[i].to_fp);
  	(void)fflush(csinfo[i].to_fp);
      }
!     if (csinfo[i].hProc != NULL)
!     {
! 	/* Give cscope a chance to exit normally */
! 	if (WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
! 	    TerminateProcess(csinfo[i].hProc, 0);
! 	CloseHandle(csinfo[i].hProc);
!     }
  #endif
  
      if (csinfo[i].fr_fp != NULL)
***************
*** 2301,2306 ****
--- 2296,2316 ----
      wait_return(TRUE);
      return CSCOPE_SUCCESS;
  } /* cs_show */
+ 
+ 
+ /*
+  * PUBLIC: cs_end
+  *
+  * Only called when VIM exits to quit any cscope sessions.
+  */
+     void
+ cs_end()
+ {
+     int i;
+ 
+     for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+ 	cs_release_csp(i, TRUE);
+ }
  
  #endif	/* FEAT_CSCOPE */
  
*** ../vim-7.1.099/src/if_cscope.h	Thu Jun 30 23:59:58 2005
--- src/if_cscope.h	Sun Sep  2 16:51:08 2007
***************
*** 72,78 ****
      ino_t	    st_ino;	/* inode number of cscope db */
  #else
  # if defined(WIN32)
!     int	    pid;	/* Can't get pid so set it to 0 ;) */
      HANDLE	    hProc;	/* cscope process handle */
      DWORD	    nVolume;	/* Volume serial number, instead of st_dev */
      DWORD	    nIndexHigh;	/* st_ino has no meaning in the Windows */
--- 72,78 ----
      ino_t	    st_ino;	/* inode number of cscope db */
  #else
  # if defined(WIN32)
!     DWORD	    pid;	/* PID of the connected cscope process. */
      HANDLE	    hProc;	/* cscope process handle */
      DWORD	    nVolume;	/* Volume serial number, instead of st_dev */
      DWORD	    nIndexHigh;	/* st_ino has no meaning in the Windows */
*** ../vim-7.1.099/src/main.c	Thu Aug 30 12:24:21 2007
--- src/main.c	Sun Sep  2 16:44:36 2007
***************
*** 1331,1336 ****
--- 1331,1339 ----
  #ifdef FEAT_NETBEANS_INTG
      netbeans_end();
  #endif
+ #ifdef FEAT_CSCOPE
+     cs_end();
+ #endif
  
      mch_exit(exitval);
  }
***************
*** 3671,3677 ****
  	mainerr_arg_missing((char_u *)filev[-1]);
      if (mch_dirname(cwd, MAXPATHL) != OK)
  	return NULL;
!     if ((p = vim_strsave_escaped_ext(cwd, PATH_ESC_CHARS, '\\', TRUE)) == NULL)
  	return NULL;
      ga_init2(&ga, 1, 100);
      ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
--- 3674,3686 ----
  	mainerr_arg_missing((char_u *)filev[-1]);
      if (mch_dirname(cwd, MAXPATHL) != OK)
  	return NULL;
!     if ((p = vim_strsave_escaped_ext(cwd,
! #ifdef BACKSLASH_IN_FILENAME
! 		    "",  /* rem_backslash() will tell what chars to escape */
! #else
! 		    PATH_ESC_CHARS,
! #endif
! 		    '\\', TRUE)) == NULL)
  	return NULL;
      ga_init2(&ga, 1, 100);
      ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
*** ../vim-7.1.099/src/proto/if_cscope.pro	Sat May  5 19:15:39 2007
--- src/proto/if_cscope.pro	Sun Sep  2 16:51:34 2007
***************
*** 6,9 ****
--- 6,10 ----
  void cs_free_tags __ARGS((void));
  void cs_print_tags __ARGS((void));
  int cs_connection __ARGS((int num, char_u *dbpath, char_u *ppath));
+ void cs_end __ARGS((void));
  /* vim: set ft=c : */
*** ../vim-7.1.099/src/version.c	Thu Sep  6 16:33:47 2007
--- src/version.c	Thu Sep  6 17:27:51 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     100,
  /**/

-- 
I have to exercise early in the morning before my brain
figures out what I'm doing.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- README.patches	24 Aug 2007 14:27:34 -0000	1.82
+++ README.patches	7 Sep 2007 14:05:05 -0000	1.83
@@ -111,3 +111,16 @@
   2496  7.1.085  after ":split fold.c" folds in one window disappear
   3561  7.1.086  crash when using specific Python syntax highlighting
   4165  7.1.087  cscope: reading past command end; writing past buffer end
+  2276  7.1.088  (extra) window position wrong when using ":winpos"
+ 13841  7.1.089  when listing variables text of command is not cleared
+  2372  7.1.090  compiler warning on Mac OS X 10.5 for sigaltstack()
+ 10488  7.1.091  (extra) Win32: add --windowid argument
+  2901  7.1.092  (extra, after 7.1.088) wrong args for MoveWindowStructure()
+ 15955  7.1.093  read past end of screen line when checking for double width
+  1901  7.1.094  using wrong buffer to check if syntax HL is present
+  5809  7.1.095  autocmmand for focus events may cause problems
+  2287  7.1.096  reading past end of a string when resizing Vim
+  1620  7.1.097  "setlocal stl=%!expr" doesn't work
+  1780  7.1.098  ":call s:var()" doesn't work if "s:var" is a Funcref
+  4552  7.1.099  ":mkvimrc" doesn't work properly when 'paste' or 'keymap' set
+ 14551  7.1.100  Win32: Executing cscope doesn't always work properly


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- vim.spec	27 Aug 2007 13:28:26 -0000	1.174
+++ vim.spec	7 Sep 2007 14:05:05 -0000	1.175
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 87
+%define patchlevel 100
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -141,6 +141,23 @@
 Patch085: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085
 Patch086: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086
 Patch087: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087
+# Mac:
+#Patch088: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088
+Patch089: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089
+Patch090: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090
+# Win32:
+#Patch091: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091
+# Mac:
+#Patch092: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092
+Patch093: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093
+Patch094: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094
+Patch095: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095
+Patch096: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096
+Patch097: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097
+Patch098: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098
+Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
+# Win32:
+#Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -366,6 +383,23 @@
 %patch085 -p0 
 %patch086 -p0 
 %patch087 -p0 
+# Mac:
+#patch088 -p0 
+%patch089 -p0 
+%patch090 -p0 
+# Win32:
+#patch091 -p0 
+# Mac:
+#patch092 -p0 
+%patch093 -p0 
+%patch094 -p0 
+%patch095 -p0 
+%patch096 -p0 
+%patch097 -p0 
+%patch098 -p0 
+%patch099 -p0 
+# Win32:
+#patch100 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -751,6 +785,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1
+- patchlevel 100
+
 * Fri Aug 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.87-1
 - add build requirement perl-devel
 - fix tarball unpacking



From fedora-extras-commits at redhat.com  Fri Sep  7 14:27:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 10:27:30 -0400
Subject: rpms/gdm/devel .cvsignore, 1.54, 1.55 gdm.spec, 1.279, 1.280 sources,
	1.57, 1.58
Message-ID: <200709071427.l87ERUOh028680@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28552

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.19.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	4 Sep 2007 13:07:40 -0000	1.54
+++ .cvsignore	7 Sep 2007 14:26:58 -0000	1.55
@@ -1 +1 @@
-gdm-2.19.7.tar.bz2
+gdm-2.19.8.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- gdm.spec	4 Sep 2007 13:07:40 -0000	1.279
+++ gdm.spec	7 Sep 2007 14:26:58 -0000	1.280
@@ -15,7 +15,7 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.7
+Version: 2.19.8
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
@@ -203,19 +203,16 @@
  
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
-  --remove-category Application				    \
+  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmsetup.desktop || :
+
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
   $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop || :
 
 desktop-file-install --delete-original       			\
   --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications          	\
-  --remove-category Application				    	\
   $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver.desktop || :
 
-desktop-file-install --delete-original       			\
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications            	\
-  --remove-category Application				    	\
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmflexiserver-xnest.desktop || :
-
 # broken install-data-local in gui/Makefile.am makes this necessary
 (cd $RPM_BUILD_ROOT%{_bindir} && ln -sf gdmXnestchooser gdmXnest)
 
@@ -351,7 +348,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
-* Tue Sep  4 2007 Matthias  Clasen <mclasen at redhat.com> - 1:2.19.7-1
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.8-1
+- Update to 2.19.8
+
+* Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.7-1
 - Update to 2.19.7
 
 * Fri Aug 24 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.6-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	4 Sep 2007 13:07:40 -0000	1.57
+++ sources	7 Sep 2007 14:26:58 -0000	1.58
@@ -1,2 +1,2 @@
-27f04ecfaeabcd238f8df66660d50d7b  gdm-2.19.7.tar.bz2
+65eb454eef0b9fc9d4abf9de3d2c9b45  gdm-2.19.8.tar.bz2
 7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:15 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:15 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709071438.l87EcF2m011724@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on gnupg (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:37 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:37 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709071438.l87EcbeR011739@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgpg-error (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:46 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:46 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709071438.l87EclmH011748@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgcrypt (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 14:38:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 07:38:48 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709071438.l87Ecmox011758@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgcrypt (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 14:43:07 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 7 Sep 2007 10:43:07 -0400
Subject: rpms/rogue/devel rogue.png,1.2,NONE rogue.desktop,1.4,NONE
Message-ID: <200709071443.l87Eh73M029622@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29613

Removed Files:
	rogue.png rogue.desktop 
Log Message:
Drop two files that are now part of upstream's source tarball.




--- rogue.desktop DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:23 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:23 -0700
Subject: [pkgdb] system-config-lvm (Fedora, 7) updated by toshio
Message-ID: <200709071548.l87FmOUp012506@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-lvm (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-lvm (Fedora 7) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:23 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:23 -0700
Subject: [pkgdb] system-config-lvm (Fedora, devel) updated by toshio
Message-ID: <200709071548.l87FmPT3012518@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-lvm (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-lvm (Fedora devel) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:45 -0700
Subject: [pkgdb] system-config-cluster (Fedora, 7) updated by toshio
Message-ID: <200709071548.l87FmkcE012531@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-cluster (Fedora 7) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-cluster (Fedora 7) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-cluster



From fedora-extras-commits at redhat.com  Fri Sep  7 15:48:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Fri, 07 Sep 2007 08:48:45 -0700
Subject: [pkgdb] system-config-cluster (Fedora, devel) updated by toshio
Message-ID: <200709071548.l87FmkoN012543@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved watchcommits on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved commit on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved build on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved approveacls on system-config-cluster (Fedora devel) for mclasen
Toshio Ernie Kuratomi (toshio) approved checkout on system-config-cluster (Fedora devel) for mclasen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-cluster



From fedora-extras-commits at redhat.com  Fri Sep  7 15:53:28 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 07 Sep 2007 08:53:28 -0700
Subject: [pkgdb] telepathy-gabble: mcepl has requested commit
Message-ID: <200709071553.l87FrSxv012583@app3.fedora.phx.redhat.com>

Matej Cepl (mcepl) has requested the commit acl on telepathy-gabble (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-gabble



From fedora-extras-commits at redhat.com  Fri Sep  7 15:55:56 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 11:55:56 -0400
Subject: rpms/libtelepathy/devel Makefile,1.1,1.2
Message-ID: <200709071555.l87FtufD008358@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316

Modified Files:
	Makefile 
Log Message:
just test





From fedora-extras-commits at redhat.com  Fri Sep  7 15:58:01 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 11:58:01 -0400
Subject: rpms/libtelepathy/devel .cvsignore, 1.12, 1.13 libtelepathy.spec,
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <200709071558.l87Fw1jL008499@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8471

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Jun 2007 19:09:45 -0000	1.12
+++ .cvsignore	7 Sep 2007 15:57:29 -0000	1.13
@@ -1 +1 @@
-libtelepathy-0.0.55.tar.gz
+libtelepathy-0.0.57.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libtelepathy.spec	21 Aug 2007 17:08:19 -0000	1.13
+++ libtelepathy.spec	7 Sep 2007 15:57:29 -0000	1.14
@@ -1,17 +1,17 @@
 Name:           libtelepathy
-Version:        0.0.55
-Release:        3%{?dist}
+Version:        0.0.57
+Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:		http://telepathy.freedesktop.org/wiki/    
+URL:            http://telepathy.freedesktop.org/wiki/    
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	dbus-devel  
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libxslt
+BuildRequires:  dbus-devel  
+BuildRequires:  dbus-glib-devel
+BuildRequires:  libxslt
 
 
 %description
@@ -22,9 +22,9 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
-Requires:	pkgconfig
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       pkgconfig
 
 
 %description    devel
@@ -71,17 +71,11 @@
 
 
 %changelog
-* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-3
-- Rebuild.
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.0.57-1
+- New upstream version.
 
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-2
-- Update license tag.
-
-* Wed Jun 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.55-1
-- Update to 0.0.55.
-
-* Sun May 20 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.54-1
-- Update to 0.0.54.
+* Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.0.55-1
+- Update to 0.0.55
 
 * Fri Apr 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.0.53-1
 - Update to 0.0.53.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Jun 2007 19:09:45 -0000	1.12
+++ sources	7 Sep 2007 15:57:29 -0000	1.13
@@ -1 +1 @@
-2cbbbeaf97c154a7fb9b088b95deb70e  libtelepathy-0.0.55.tar.gz
+74d788c17ef2d01c6d4c084d64839dfc  libtelepathy-0.0.57.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:02:04 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:02:04 -0400
Subject: rpms/libtelepathy/F-7 .cvsignore, 1.11, 1.12 libtelepathy.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <200709071602.l87G24xa014813@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/libtelepathy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Jun 2007 20:04:33 -0000	1.11
+++ .cvsignore	7 Sep 2007 16:01:30 -0000	1.12
@@ -1,2 +1 @@
-libtelepathy-0.0.53.tar.gz
-libtelepathy-0.0.55.tar.gz
+libtelepathy-0.0.57.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/libtelepathy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libtelepathy.spec	14 Jun 2007 20:04:33 -0000	1.10
+++ libtelepathy.spec	7 Sep 2007 16:01:30 -0000	1.11
@@ -1,17 +1,17 @@
 Name:           libtelepathy
-Version:        0.0.55
+Version:        0.0.57
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
 Group:          System Environment/Libraries
-License:        LGPL
-URL:		http://telepathy.freedesktop.org/wiki/    
+License:        LGPLv2+
+URL:            http://telepathy.freedesktop.org/wiki/    
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	dbus-devel  
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libxslt
+BuildRequires:  dbus-devel  
+BuildRequires:  dbus-glib-devel
+BuildRequires:  libxslt
 
 
 %description
@@ -22,9 +22,9 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
-Requires:	pkgconfig
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       pkgconfig
 
 
 %description    devel
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.0.57-1
+- New upstream version.
+
 * Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.0.55-1
 - Update to 0.0.55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelepathy/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jun 2007 20:04:33 -0000	1.11
+++ sources	7 Sep 2007 16:01:30 -0000	1.12
@@ -1 +1 @@
-2cbbbeaf97c154a7fb9b088b95deb70e  libtelepathy-0.0.55.tar.gz
+74d788c17ef2d01c6d4c084d64839dfc  libtelepathy-0.0.57.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:06:14 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:06:14 -0400
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 telepathy-gabble.spec, 1.26, 1.27
Message-ID: <200709071606.l87G6EEk015238@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15169

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Aug 2007 22:34:45 -0000	1.21
+++ .cvsignore	7 Sep 2007 16:05:41 -0000	1.22
@@ -1 +1 @@
-telepathy-gabble-0.5.13.tar.gz
+telepathy-gabble-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 Aug 2007 22:34:45 -0000	1.21
+++ sources	7 Sep 2007 16:05:41 -0000	1.22
@@ -1 +1 @@
-286613c8b7d76d18dcb6489e2bdd65c2  telepathy-gabble-0.5.13.tar.gz
+4b5532dec83a9ae097e8dd482eeee4df  telepathy-gabble-0.5.14.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- telepathy-gabble.spec	30 Aug 2007 22:34:45 -0000	1.26
+++ telepathy-gabble.spec	7 Sep 2007 16:05:41 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.5.13
+Version:        0.5.14
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -11,13 +11,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel >= 0.72
-BuildRequires:	loudmouth-devel >= 1.1.1
-BuildRequires:	telepathy-glib-devel >= 0.5.14
-BuildRequires:	libxslt
-BuildRequires:	python
+BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  loudmouth-devel >= 1.1.1
+BuildRequires:  telepathy-glib-devel >= 0.5.14
+BuildRequires:  libxslt
+BuildRequires:  python
 
-Requires:	telepathy-filesystem
+Requires:  telepathy-filesystem
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.5.14-1
+- New upstream version
+
 * Thu Aug 30 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-1
 - Update to 0.5.13.
 - Bump minimum version of telepathy-glib.



From fedora-extras-commits at redhat.com  Fri Sep  7 16:08:40 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:08:40 -0400
Subject: rpms/telepathy-gabble/F-7 .cvsignore,1.20,1.21 sources,1.20,1.21
Message-ID: <200709071608.l87G8e4b015415@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15382

Modified Files:
	.cvsignore sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Jun 2007 00:18:04 -0000	1.20
+++ .cvsignore	7 Sep 2007 16:08:07 -0000	1.21
@@ -1 +1 @@
-telepathy-gabble-0.5.12.tar.gz
+telepathy-gabble-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Jun 2007 00:18:04 -0000	1.20
+++ sources	7 Sep 2007 16:08:07 -0000	1.21
@@ -1 +1 @@
-807cf9c79f8dd17e890a5f769bde7158  telepathy-gabble-0.5.12.tar.gz
+4b5532dec83a9ae097e8dd482eeee4df  telepathy-gabble-0.5.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 16:11:56 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 7 Sep 2007 12:11:56 -0400
Subject: rpms/telepathy-gabble/F-7 telepathy-gabble.spec,1.22,1.23
Message-ID: <200709071611.l87GBurZ015687@cvs-int.fedora.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/telepathy-gabble/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627

Modified Files:
	telepathy-gabble.spec 
Log Message:
new upstream version, forgot SPEC


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-7/telepathy-gabble.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-gabble.spec	5 Aug 2007 23:34:41 -0000	1.22
+++ telepathy-gabble.spec	7 Sep 2007 16:11:22 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.5.12
-Release:        2%{?dist}
+Version:        0.5.14
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -11,12 +11,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel >= 0.72
-BuildRequires:	loudmouth-devel >= 1.1.1
-BuildRequires:	telepathy-glib-devel >= 0.5.13
-BuildRequires:	libxslt
+BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  loudmouth-devel >= 1.1.1
+BuildRequires:  telepathy-glib-devel >= 0.5.14
+BuildRequires:  libxslt
+BuildRequires:  python
 
-Requires:	telepathy-filesystem
+Requires:  telepathy-filesystem
 
 
 %description
@@ -51,9 +52,25 @@
 
 
 %changelog
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-2
+* Fri Sep  7 2007 Matej Cepl <mcepl at redhat.com> - 0.5.14-1
+- New upstream version
+
+* Thu Aug 30 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-1
+- Update to 0.5.13.
+- Bump minimum version of telepathy-glib.
+
+* Tue Aug 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-5
+- Add python as a BR.
+
+* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-4
+- Rebuild.
+
+* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-3
 - Update license tag.
 
+* Tue Jun 19 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-2
+- Correct version check for loudmouth
+
 * Tue Jun 19 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.12-1
 - Update to 0.5.12.
 - Add BR on telepathy-glib-devel



From fedora-extras-commits at redhat.com  Fri Sep  7 16:22:48 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 12:22:48 -0400
Subject: rpms/gdm/devel gdm-2.19.8-selinux.patch, NONE, 1.1 gdm.spec, 1.280, 
	1.281 gdm-2.19.6-selinux.patch, 1.1, NONE
Message-ID: <200709071622.l87GMmKY016596@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16535

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.19.8-selinux.patch 
Removed Files:
	gdm-2.19.6-selinux.patch 
Log Message:
- make things work better for xguest users (bug 254164)


gdm-2.19.8-selinux.patch:

--- NEW FILE gdm-2.19.8-selinux.patch ---
diff -up gdm-2.19.8/configure.ac.selinux gdm-2.19.8/configure.ac
diff -up gdm-2.19.8/daemon/slave.c.selinux gdm-2.19.8/daemon/slave.c
--- gdm-2.19.8/daemon/slave.c.selinux	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/daemon/slave.c	2007-09-07 12:21:37.000000000 -0400
@@ -89,7 +89,6 @@
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
-#include <selinux/get_context_list.h>
 #endif /* HAVE_SELINUX */
 
 #include <glib/gi18n.h>
@@ -172,6 +171,10 @@ static uid_t logged_in_uid             =
 static gid_t logged_in_gid             = -1;
 #endif
 
+#ifdef HAVE_SELINUX
+security_context_t logged_in_context   = NULL;
+#endif 
+
 static int greeter_fd_out              = -1;
 static int greeter_fd_in               = -1;
 
@@ -2036,6 +2039,7 @@ restart_the_greeter (void)
 	gdm_slave_sensitize_config ();
 }
 
+
 static gboolean
 play_login_sound (const char *sound_file)
 {
@@ -3519,48 +3523,6 @@ open_xsession_errors (struct passwd *pwe
 	return logfd;
 }
 
-#ifdef HAVE_SELINUX
-/* This should be run just before we exec the user session */
-static gboolean
-gdm_selinux_setup (const char *login)
-{
-	security_context_t scontext;
-	int ret=-1;
-	char *seuser=NULL;
-	char *level=NULL;
-
-	/* If selinux is not enabled, then we don't do anything */
-	if (is_selinux_enabled () <= 0)
-		return TRUE;
-
-	if (getseuserbyname(login, &seuser, &level) == 0)
-		ret=get_default_context_with_level(seuser, level, 0, &scontext);
-
-	if (ret < 0) {
-		gdm_error ("SELinux gdm login: unable to obtain default security context for %s.", login);
-		/* note that this will be run when the .xsession-errors
-		   is already being logged, so we can use stderr */
-		gdm_fdprintf (2, "SELinux gdm login: unable to obtain default security context for %s.", login);
- 		return (security_getenforce()==0);
-	}
-
-	gdm_assert (scontext != NULL);
-
-	if (setexeccon (scontext) != 0) {
-		gdm_error ("SELinux gdm login: unable to set executable context %s.",
-			   (char *)scontext);
-		gdm_fdprintf (2, "SELinux gdm login: unable to set executable context %s.",
-			      (char *)scontext);
-		freecon (scontext);
-		return (security_getenforce()==0);
-	}
-
-	freecon (scontext);
-
-	return TRUE;
-}
-#endif /* HAVE_SELINUX */
-
 static void
 session_child_run (struct passwd *pwent,
 		   int logfd,
@@ -3801,6 +3763,10 @@ session_child_run (struct passwd *pwent,
                         close (iceauth_fd);
         }
 
+#ifdef HAVE_SELINUX
+        setexeccon (logged_in_context);
+#endif
+
 	NEVER_FAILS_setegid (pwent->pw_gid);
 #ifdef HAVE_LOGINCAP
 	if (setusercontext (NULL, pwent, pwent->pw_uid,
@@ -4046,16 +4012,6 @@ session_child_run (struct passwd *pwent,
 	}
 #endif
 
-#ifdef HAVE_SELINUX
-	if ( ! gdm_selinux_setup (pwent->pw_name)) {
-		/* 66 means no "session crashed" examine .xsession-errors
-		   dialog */
-		gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR,
-			       _("Error! Unable to set executable context."));
-		_exit (66);
-	}
-#endif
-
         g_shell_parse_argv (fullexec->str, NULL, &argv, NULL);
 	VE_IGNORE_EINTR (execv (argv[0], argv));
 	g_strfreev (argv);
@@ -4741,6 +4697,11 @@ gdm_slave_session_start (void)
 
 	NEVER_FAILS_root_set_euid_egid (0, gdm_daemon_config_get_gdmgid ());
 
+#ifdef HAVE_SELINUX
+        getexeccon (&logged_in_context);
+        setexeccon (NULL);
+#endif
+
 	if G_UNLIKELY ( ! authok) {
 		gdm_debug ("gdm_slave_session_start: Auth not OK");
 
@@ -5009,6 +4970,10 @@ gdm_slave_session_stop (gboolean run_pos
 	seteuid (0);
 	setegid (0);
 
+#ifdef HAVE_SELINUX
+        setexeccon (NULL);
+#endif
+
 	gdm_slave_send_num (GDM_SOP_SESSPID, 0);
 
 	/* Now still as root make the system authfile not readable by others,
@@ -5069,6 +5034,12 @@ gdm_slave_session_stop (gboolean run_pos
 	logged_in_uid = -1;
 	logged_in_gid = -1;
 
+#ifdef HAVE_SELINUX
+        setexeccon (logged_in_context);
+	freecon (logged_in_context);
+	logged_in_context = NULL;
+#endif
+
 	/* things are going to be killed, so ignore errors */
 	XSetErrorHandler (ignore_xerror_handler);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- gdm.spec	7 Sep 2007 14:26:58 -0000	1.280
+++ gdm.spec	7 Sep 2007 16:22:15 -0000	1.281
@@ -53,7 +53,7 @@
 Patch35: gdmsetup-path.patch
 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
-Patch37: gdm-2.19.6-selinux.patch
+Patch37: gdm-2.19.8-selinux.patch
 
 Patch100: gdm-2.19.6-change-defaults.patch
 
@@ -348,6 +348,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-2
+- make things work better for xguest users (bug 254164)
+
 * Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.8-1
 - Update to 2.19.8
 


--- gdm-2.19.6-selinux.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 16:23:44 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 12:23:44 -0400
Subject: rpms/gdm/devel gdm.spec,1.281,1.282
Message-ID: <200709071623.l87GNi5q016711@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- gdm.spec	7 Sep 2007 16:22:15 -0000	1.281
+++ gdm.spec	7 Sep 2007 16:23:11 -0000	1.282
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X



From fedora-extras-commits at redhat.com  Fri Sep  7 16:30:22 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 7 Sep 2007 12:30:22 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.1.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.139, 1.140 sources, 1.144, 1.145 system-config-printer.spec,
	1.127, 1.128
Message-ID: <200709071630.l87GUMtY017234@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.1.tar.bz2.sig 
Log Message:
* Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
- 0.7.74.1:
  - Updated Polish translation (bug #263001).
  - Don't select the default printer after changes to another printer have
    been made.
  - Always construct URI from input fields when changing device (bug #281551).
  - Avoid busy-cursor traceback when window is not yet displayed.



--- NEW FILE system-config-printer-0.7.74.1.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- .cvsignore	30 Aug 2007 13:25:16 -0000	1.139
+++ .cvsignore	7 Sep 2007 16:29:48 -0000	1.140
@@ -135,3 +135,4 @@
 system-config-printer-0.7.73.tar.bz2
 pycups-1.9.25.tar.bz2
 system-config-printer-0.7.74.tar.bz2
+system-config-printer-0.7.74.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	30 Aug 2007 13:25:16 -0000	1.144
+++ sources	7 Sep 2007 16:29:48 -0000	1.145
@@ -1,2 +1,2 @@
 eda648fec5d187fa13a676c60c7e6b1e  pycups-1.9.25.tar.bz2
-325264dec8740ac51f62e8e5b3e3b47e  system-config-printer-0.7.74.tar.bz2
+b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- system-config-printer.spec	30 Aug 2007 13:25:16 -0000	1.127
+++ system-config-printer.spec	7 Sep 2007 16:29:48 -0000	1.128
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74
+Version: 0.7.74.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -126,6 +126,14 @@
 fi
 
 %changelog
+* Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
+- 0.7.74.1:
+  - Updated Polish translation (bug #263001).
+  - Don't select the default printer after changes to another printer have
+    been made.
+  - Always construct URI from input fields when changing device (bug #281551).
+  - Avoid busy-cursor traceback when window is not yet displayed.
+
 * Thu Aug 30 2007 Tim Waugh <twaugh at redhat.com> 0.7.74-1
 - Updated pycups to 1.9.25.
 - 0.7.74:



From fedora-extras-commits at redhat.com  Fri Sep  7 16:37:16 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 7 Sep 2007 12:37:16 -0400
Subject: rpms/squid/F-7 squid-2.6.STABLE16-config.patch, NONE, 1.1 .cvsignore,
	1.28, 1.29 sources, 1.30, 1.31 squid.spec, 1.86,
	1.87 squid-2.6.STABLE14-config.patch, 1.1, NONE
Message-ID: <200709071637.l87GbGsk017935@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE16-config.patch 
Removed Files:
	squid-2.6.STABLE14-config.patch 
Log Message:
* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE14


squid-2.6.STABLE16-config.patch:

--- NEW FILE squid-2.6.STABLE16-config.patch ---
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config	2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
 #http_access allow our_networks
 
 # And finally deny all other access to this proxy
+http_access allow localhost
 http_access deny all
 NOCOMMENT_END
 DOC_END
@@ -2250,7 +2251,7 @@ DOC_END
 
 NAME: logfile_rotate
 TYPE: int
-DEFAULT: 10
+DEFAULT: 0
 LOC: Config.Log.rotateNumber
 DOC_START
 	Specifies the number of logfile rotations to make when you
@@ -2266,6 +2267,8 @@ DOC_START
 	purposes, so -k rotate uses another signal.  It is best to get
 	in the habit of using 'squid -k rotate' instead of 'kill -USR1
 	<pid>'.
+	
+logfile_rotate 0
 DOC_END
 
 NAME: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
 
 NAME: cache_mgr
 TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
 LOC: Config.adminEmail
 DOC_START
 	Email-address of local cache manager who will receive
-	mail if the cache dies. The default is "webmaster".
+	mail if the cache dies. The default is "root".
 DOC_END
 
 NAME: mail_from
@@ -3374,21 +3377,22 @@ DOC_END
 
 NAME: cache_effective_user
 TYPE: string
-DEFAULT: nobody
+DEFAULT: squid
 LOC: Config.effectiveUser
 DOC_START
 	If you start Squid as root, it will change its effective/real
 	UID/GID to the user specified below.  The default is to change
-	to UID to nobody.  If you define cache_effective_user, but not
+	to UID to squid.  If you define cache_effective_user, but not
 	cache_effective_group, Squid sets the GID to the effective
 	user's default group ID (taken from the password file) and
 	supplementary group list from the from groups membership of
 	cache_effective_user.
+cache_effective_user squid
 DOC_END
 
 NAME: cache_effective_group
 TYPE: string
-DEFAULT: none
+DEFAULT: squid
 LOC: Config.effectiveGroup
 DOC_START
 	If you want Squid to run with a specific GID regardless of
@@ -3398,6 +3402,7 @@ DOC_START
 	and only this GID is effective. If Squid is not started as
 	root the user starting Squid must be member of the specified
 	group.
+cache_effective_group squid
 DOC_END
 
 NAME: httpd_suppress_version_string
@@ -4018,12 +4023,12 @@ COMMENT_END
 NAME: snmp_port
 TYPE: ushort
 LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
 IFDEF: SQUID_SNMP
 DOC_START
 	Squid can now serve statistics and status information via SNMP.
-	By default it listens to port 3401 on the machine. If you don't
-	wish to use SNMP, set this to "0".
+	A value of "0" disables SNMP support. If you wish to use SNMP,
+	set this to "3401" to use the normal SNMP support.
 DOC_END
 
 NAME: snmp_access
@@ -4402,15 +4407,22 @@ TYPE: string
 LOC: Config.errorDirectory
 DEFAULT: @DEFAULT_ERROR_DIR@
 DOC_START
-	If you wish to create your own versions of the default
-	(English) error files, either to customize them to suit your
-	language or company copy the template English files to another
+	Directory where the error files are read from.
+	/usr/lib/squid/errors contains sets of error files
+	in different languages. The default error directory
+	is /etc/squid/errors, which is a link to one of these
+	error sets.
+
+	If you wish to create your own versions of the error files,
+	either to customize them to suit your language or company,
+	copy the template English files to another
 	directory and point this tag at them.
-
-	The squid developers are interested in making squid available in
-	a wide variety of languages. If you are making translations for a
-	langauge that Squid does not currently provide please consider
-	contributing your translation back to the project.
+	
+    The squid developers are interested in making squid available in
+    a wide variety of languages. If you are making translations for a
+    langauge that Squid does not currently provide please consider
+    contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
 DOC_END
 
 NAME: error_map


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	2 Aug 2007 10:07:22 -0000	1.28
+++ .cvsignore	7 Sep 2007 16:36:44 -0000	1.29
@@ -1 +1 @@
-squid-2.6.STABLE14.tar.bz2
+squid-2.6.STABLE16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Aug 2007 10:07:22 -0000	1.30
+++ sources	7 Sep 2007 16:36:44 -0000	1.31
@@ -1 +1 @@
-eadb138d48320df8b99349121159c6bf  squid-2.6.STABLE14.tar.bz2
+849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/squid.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- squid.spec	2 Aug 2007 10:07:22 -0000	1.86
+++ squid.spec	7 Sep 2007 16:36:44 -0000	1.87
@@ -4,7 +4,7 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE14
+Version:  2.6.STABLE16
 Release:  1%{?dist}
 Epoch:    7
 License:  GPL
@@ -26,7 +26,7 @@
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-2.6.STABLE14-config.patch
+Patch201: squid-2.6.STABLE16-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
@@ -326,6 +326,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
+- upgrade to latest upstream 2.6.STABLE14
+
 * Wed Aug  1 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
 - upgrade to latest upstream 2.6.STABLE14
 


--- squid-2.6.STABLE14-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 16:39:54 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 7 Sep 2007 12:39:54 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.tar.bz2.sig, 1.1, NONE
Message-ID: <200709071639.l87Gds7r018154@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18143

Removed Files:
	system-config-printer-0.7.74.tar.bz2.sig 
Log Message:
No longer need this.


--- system-config-printer-0.7.74.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 17:29:51 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 13:29:51 -0400
Subject: rpms/netpanzer/FC-6 netpanzer-desktop.patch, NONE,
	1.1 netpanzer.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709071729.l87HTpdh026296@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26193

Modified Files:
	netpanzer.spec sources 
Added Files:
	netpanzer-desktop.patch 
Log Message:
Bump to 0.8.2, merge -data in to follow upstream.


netpanzer-desktop.patch:

--- NEW FILE netpanzer-desktop.patch ---
--- netpanzer.desktop	2007-08-29 14:32:49.000000000 -0500
+++ netpanzer.desktop	2007-08-29 14:32:49.000000000 -0500
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=1.0
 Encoding=UTF-8
 Type=Application
 Name=NetPanzer
@@ -9,4 +8,4 @@
 Exec=netpanzer
 Terminal=false
 StartupNotify=false
-Categories=Application;Game;StrategyGame;
+Categories=Game;StrategyGame;


Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/FC-6/netpanzer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netpanzer.spec	16 Aug 2007 17:07:18 -0000	1.5
+++ netpanzer.spec	7 Sep 2007 17:29:18 -0000	1.6
@@ -1,18 +1,19 @@
 Name:           netpanzer
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        An Online Multiplayer Tactical Warfare Game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://netpanzer.berlios.de
 Source0:        http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2
+Patch0:         netpanzer-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen
-BuildRequires:	SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
-#Requires:       SDL >= 1.2.5, SDL_mixer >= 1.2, SDL_image >= 1.2, physfs >= 0.1.9
-Requires:	netpanzer-data >= 0.8
+BuildRequires:  SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
+Obsoletes:      netpanzer-data <= 0.8
+Provides:       netpanzer-data = %{version}-%{release}
 
 %description
 netPanzer is an online multiplayer tactical warfare game designed for FAST
@@ -28,6 +29,9 @@
 # Strip \r from RELNOTES file
 sed -i 's/\r//' RELNOTES
 
+#Correct .desktop file
+%patch0 -p0
+
 %build
 %configure
 jam %{?_smp_mflags}
@@ -73,9 +77,14 @@
 %{_bindir}/netpanzer
 %{_datadir}/applications/fedora-netpanzer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/netpanzer.png
-
+%{_datadir}/netpanzer
 
 %changelog
+* Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.8.2-1
+- Bumped to 0.8.2.
+- Merged in and obsoleted/provided netpanzer-data to follow upstream.
+- Patch to correct upstream .desktop file.
+
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> 0.8.1-2
 - License tag correction.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 12:42:38 -0000	1.3
+++ sources	7 Sep 2007 17:29:18 -0000	1.4
@@ -1 +1 @@
-044afc7559d9783abbea8deaa33d7a73  netpanzer-0.8.1.tar.bz2
+3f446403ac7e72ed0ff9e093517c83d3  netpanzer-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 17:34:23 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 7 Sep 2007 13:34:23 -0400
Subject: rpms/python-virtinst/F-7 virtinst-0.200.0-cdrom-src.patch, NONE,
	1.1 virtinst-0.200.0-kvm-kernel.patch, NONE,
	1.1 python-virtinst.spec, 1.21, 1.22
Message-ID: <200709071734.l87HYN01026586@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26530

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.200.0-cdrom-src.patch 
	virtinst-0.200.0-kvm-kernel.patch 
Log Message:
Fixed post-install CDROm source and KVM kernel config

virtinst-0.200.0-cdrom-src.patch:

--- NEW FILE virtinst-0.200.0-cdrom-src.patch ---
diff -rup virtinst-0.200.0/virtinst/Guest.py virtinst-0.200.0.new/virtinst/Guest.py
--- virtinst-0.200.0/virtinst/Guest.py	2007-07-18 22:04:21.000000000 -0400
+++ virtinst-0.200.0.new/virtinst/Guest.py	2007-09-06 23:11:54.000000000 -0400
@@ -151,9 +151,7 @@ class VirtualDisk:
                 ret += "      <driver name='%(name)s'/>\n" % { "name": self.driver_name }
             else:
                 ret += "      <driver name='%(name)s' type='%(type)s'/>\n" % { "name": self.driver_name, "type": self.driver_type }
-        if self.path is None:
-            ret += "      <source %(typeattr)s=''/>\n" % { "typeattr": typeattr }
-        else:
+        if self.path is not None:
             ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": self.path }
         ret += "      <target dev='%(disknode)s'/>\n" % { "disknode": disknode }
         if self.read_only:

virtinst-0.200.0-kvm-kernel.patch:

--- NEW FILE virtinst-0.200.0-kvm-kernel.patch ---
changeset:   254:b33e850305be
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Aug 21 17:46:58 2007 -0400
summary:     Fixed XML generated for kernel/initrd installs of KVM

diff -r 7220fc5059e4 -r b33e850305be virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Tue Aug 21 17:42:12 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Aug 21 17:46:58 2007 -0400
@@ -692,7 +692,7 @@ class DistroInstaller(Guest.Installer):
             else:
                 osblob += "    <type>%s</type>\n" % type
 
-            if self.install["kernel"]:
+            if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % self.install["kernel"]
                 osblob += "    <initrd>%s</initrd>\n"   % self.install["initrd"]
                 osblob += "    <cmdline>%s</cmdline>\n" % self.install["extraargs"]



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-7/python-virtinst.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-virtinst.spec	26 Jul 2007 15:07:55 -0000	1.21
+++ python-virtinst.spec	7 Sep 2007 17:33:50 -0000	1.22
@@ -11,7 +11,7 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.200.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.et.redhat.com/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -25,6 +25,8 @@
 BuildRequires: python-devel
 Obsoletes: python-xeninst < 0.97.0
 Patch1: %{appname}-%{version}-default-arch.patch
+Patch2: %{appname}-%{version}-cdrom-src.patch
+Patch3: %{appname}-%{version}-kvm-kernel.patch
 
 %description
 virtinst is a module to help in starting installations of Fedora/Red
@@ -39,6 +41,8 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -67,6 +71,10 @@
 %{_bindir}/virt-clone
 
 %changelog
+* Thu Sep  6 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-3.fc7
+- Fixed CDROM source post-install (rhbz #260981)
+- Fixed kernel for post-install config with KVM guests
+
 * Thu Jul 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-2.fc7
 - Fixed default architecture
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:34:28 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 13:34:28 -0400
Subject: rpms/armacycles-ad/FC-6 armacycles-ad.desktop, NONE,
	1.1 armacycles-ad.spec, NONE, 1.1 armacycles-logo.jpg, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709071734.l87HYSIu026594@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26528

Modified Files:
	sources 
Added Files:
	armacycles-ad.desktop armacycles-ad.spec armacycles-logo.jpg 
Log Message:
Initial import.



--- NEW FILE armacycles-ad.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Armacycles Advanced
Exec=armacyclesad
Comment=3d light cycle game
Icon=armagetronad.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE armacycles-ad.spec ---
Name: armacycles-ad
Version: 0.2.8.2.1
Release: 5%{?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
Source1: armacycles-logo.jpg
Source2: armacycles-ad.desktop

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
BuildRequires: libpng-devel, desktop-file-utils
Requires: libxml2 >= 2.6.12, hicolor-icon-theme

%description
In this game you ride a lightcycle; that is a sort of motorbike that
cannot be stopped and leaves a wall behind it. The main goal of the game
is to make your opponents' lightcycles crash into a wall while avoiding
the same fate.
The focus of the game lies on the multiplayer mode, but it provides
challanging AI opponents for a quick training match.


#dedicated server specification
%package dedicated
Summary: Dedicated server for Armacycles Advanced
Group: Amusements/Games
requires: libxml2 >= 2.6.12

%Description dedicated
This is a special lightweight server for Armacycles Advanced; it can
be run on a low-spec machine and await connections from
the internet and/or the LAN.


%prep
%setup -qn armagetronad-0.2.8.2.1
#insert modified logo
cp %{SOURCE1} textures/title.jpg
# remove krawall logo
rm -f armagetronad-0.2.8.2.1/textures/KGN*


%build
configure_flags="--disable-sysinstall --disable-games --disable-uninstall"

export progtitle="Armacycles Advanced"
export progname=armacyclesad

mkdir -p bindist
pushd bindist
# <sigh> %%configure really should support this in an easier way
echo -e '#!/bin/bash\nexec ../configure "$@"\n' > configure
chmod +x configure
%configure $configure_flags
make %{?_smp_mflags}
popd

mkdir -p bindist-dedicated
pushd bindist-dedicated
cp -a ../bindist/configure .
%configure $configure_flags --disable-glout
make %{?_smp_mflags}
popd


%install
rm -rf $RPM_BUILD_ROOT

pushd bindist
# uninstall_location=foobar works around a bug triggered by --disable-uninstall
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad/desktop
popd

pushd bindist-dedicated
make install DESTDIR=$RPM_BUILD_ROOT uninstall_location=foobar
rm -r $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/desktop
popd

# Install icons and desktop file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 desktop/icons/small/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 desktop/icons/large/armagetronad.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}

#remove extraneous scripts
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad/language/update.py

rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/relocate
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_config
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/scripts/rcd_startstop
rm -f $RPM_BUILD_ROOT%{_datadir}/armacyclesad-dedicated/language/update.py

%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad
%config(noreplace) /etc/armacyclesad
%{_bindir}/armacyclesad
%{_datadir}/armacyclesad
%{_datadir}/applications/fedora-armacycles-ad.desktop
%{_datadir}/icons/hicolor/*/apps/armagetronad.png

%files dedicated
%defattr(-,root,root)
%doc %{_datadir}/doc/armacyclesad-dedicated
%config(noreplace) /etc/armacyclesad-dedicated
%{_bindir}/armacyclesad-dedicated
%{_datadir}/armacyclesad-dedicated


%changelog
* Fri Aug 31 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-5
- Dropped extraneous script.
- Removed .desktop version, Application category.

* Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.2.8.2.1-4
- Use %%configure instead of calling Configure ourselves, this fixes the
  configuration files being put in /usr/etc (now in /etc)
- Wrap all lines > 80 chars
- Use URL for Source0
- Install all size icons
- Fix dedicated package Summary (CycleWeasel > Armacycles Ad)
- Don't use strange x.final.y release field, for final versions normal
  release fields should be used
- Add --disable-uninstall to %%configure flags, people should use yum / pirut
  to uninstall packages, not some upstream provided script
- Remove unused /usr/share/armacyclesad-dedicated/desktop dir
- Replace SDL_mixer, SDL_image, libpng BuildRequires by their -devel parts

* Tue Aug 14 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.3
- Multiple review fixes.

* Thu Aug 09 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.2
- Added desktop file and icon, fixed summary.

* Mon Jul 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.2.8.2.1-1.final.1
- Initial package, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Sep 2007 19:00:41 -0000	1.1
+++ sources	7 Sep 2007 17:33:55 -0000	1.2
@@ -0,0 +1 @@
+b09104b3af550fe590ff11bc1fd46e26  armagetronad-0.2.8.2.1.src.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 17:35:07 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 13:35:07 -0400
Subject: rpms/jakarta-commons-codec/devel
	jakarta-commons-codec-addosgimanifest.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 jakarta-commons-codec.spec, 1.17, 1.18
Message-ID: <200709071735.l87HZ7Aw026720@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26580

Modified Files:
	.cvsignore jakarta-commons-codec.spec 
Added Files:
	jakarta-commons-codec-addosgimanifest.patch 
Log Message:
Add OSGi manifest


jakarta-commons-codec-addosgimanifest.patch:

--- NEW FILE jakarta-commons-codec-addosgimanifest.patch ---
--- MANIFEST.MF 2007-09-06 12:18:33.000000000 -0400
+++ MANIFEST.MF 2007-09-06 12:10:37.000000000 -0400
@@ -4,4 +4,15 @@
 Specification-Version: 1.3
 Implementation-Title: org.apache.commons.codec
 Implementation-Vendor: Apache Software Foundation
-Implementation-Version: 1.3
\ No newline at end of file
+Implementation-Version: 1.3
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: org.apache.commons.codec
+Bundle-Version: 1.3.0.qualifier
+Bundle-Localization: plugin
+Export-Package: org.apache.commons.codec;version="1.3.0",
+ org.apache.commons.codec.binary;version="1.3.0",
+ org.apache.commons.codec.digest;version="1.3.0",
+ org.apache.commons.codec.language;version="1.3.0",
+ org.apache.commons.codec.net;version="1.3.0"
+Bundle-Vendor: %bundleProvider



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Apr 2007 00:19:38 -0000	1.4
+++ .cvsignore	7 Sep 2007 17:34:34 -0000	1.5
@@ -1 +1,11 @@
-commons-codec-1.3-src.tar.gz
+.classpath
+.clover
+.project
+CODEC_1_*.xml
+HEAD.xml
+dist
+junit*.properties
+maven.log
+pub
+target
+velocity.log
\ No newline at end of file


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-codec.spec	26 Apr 2007 00:19:38 -0000	1.17
+++ jakarta-commons-codec.spec	7 Sep 2007 17:34:34 -0000	1.18
@@ -38,7 +38,7 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        8jpp.1%{?dist}
+Release:        8jpp.2%{?dist}
 Summary:        Implementations of common encoders and decoders
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -50,6 +50,8 @@
 # tar czvf commons-codec-1.3-src.tar.gz .
 
 Patch0:         jakarta-commons-codec-1.3-buildscript.patch
+# Add OSGi manifest
+Patch1:         %{name}-addosgimanifest.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit
@@ -91,6 +93,11 @@
 # This problem has been communicated upstream Bug 31096
 %patch0 -p1
 
+# Add OSGi manifest
+pushd src/conf
+%patch1 -p0
+popd
+
 #fixes eof encoding
 %{__sed} -i 's/\r//' LICENSE.txt
 %{__sed} -i 's/\r//' RELEASE-NOTES.txt
@@ -171,6 +178,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.3-8jpp.2
+- Add OSGi manifest.
+
 * Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp.1
 - Update to latest jpp version
 - Fix rpmlint issues



From fedora-extras-commits at redhat.com  Fri Sep  7 17:43:00 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:43:00 -0400
Subject: rpms/gdm/devel gdm.spec,1.282,1.283
Message-ID: <200709071743.l87Hh0gd027143@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27111

Modified Files:
	gdm.spec 
Log Message:
- rebuild --with-selinux



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- gdm.spec	7 Sep 2007 16:23:11 -0000	1.282
+++ gdm.spec	7 Sep 2007 17:42:28 -0000	1.283
@@ -154,7 +154,8 @@
 %configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-console-helper \
 	   --disable-scrollkeeper  \
-	   --with-console-kit
+	   --with-console-kit      \
+	   --with-selinux
 make
 
 %install
@@ -348,6 +349,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-3
+- rebuild --with-selinux
+
 * Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-2
 - make things work better for xguest users (bug 254164)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:45:54 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:45:54 -0400
Subject: rpms/gdm/devel gdm.spec,1.283,1.284
Message-ID: <200709071745.l87HjsYu027268@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27213

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- gdm.spec	7 Sep 2007 17:42:28 -0000	1.283
+++ gdm.spec	7 Sep 2007 17:45:21 -0000	1.284
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X



From fedora-extras-commits at redhat.com  Fri Sep  7 17:53:43 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 7 Sep 2007 13:53:43 -0400
Subject: rpms/xmlrpc3/devel xmlrpc3-client-addosgimanifest.patch, NONE,
	1.1 xmlrpc3-common-addosgimanifest.patch, NONE, 1.1 xmlrpc3.spec,
	1.2, 1.3
Message-ID: <200709071753.l87HrhO9027609@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27565

Modified Files:
	xmlrpc3.spec 
Added Files:
	xmlrpc3-client-addosgimanifest.patch 
	xmlrpc3-common-addosgimanifest.patch 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
- Add OSGi manifests.

xmlrpc3-client-addosgimanifest.patch:

--- NEW FILE xmlrpc3-client-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 14:09:29.000000000 -0400
+++ pom.xml	2007-09-06 14:14:25.000000000 -0400
@@ -11,7 +11,29 @@
   <name>Apache XML-RPC Client Library</name>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
-  </build>
+        <plugins>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
+			    <Bundle-Version>3.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.xmlrpc.client, org.apache.xmlrpc.client.util</Export-Package>
+			    <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			    <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+			    <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
   <dependencies>
     <dependency>
       <groupId>org.apache.xmlrpc</groupId>

xmlrpc3-common-addosgimanifest.patch:

--- NEW FILE xmlrpc3-common-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 14:09:36.000000000 -0400
+++ pom.xml	2007-09-06 14:12:43.000000000 -0400
@@ -34,6 +34,26 @@
         </configuration>
       </plugin>
 -->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
+			    <Bundle-Version>3.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common, org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer, org.apache.xmlrpc.util</Export-Package>
+			    <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			    <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+			    <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
     </plugins>
   </build>
   <dependencies>


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlrpc3.spec	24 Aug 2007 14:28:51 -0000	1.2
+++ xmlrpc3.spec	7 Sep 2007 17:53:10 -0000	1.3
@@ -35,7 +35,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    1jpp.2%{?dist}
+Release:    1jpp.3%{?dist}
 Summary:    Java XML-RPC implementation
 License:    Apache Software License
 Group:      Development/Libraries
@@ -46,6 +46,9 @@
 # The tests pom.xml doesn't include necessary dependencies on junit and
 # servletapi
 Patch0:     %{name}-addjunitandservletapitotestpom.patch
+# Add OSGi MANIFEST information
+Patch1:     %{name}-client-addosgimanifest.patch
+Patch2:     %{name}-common-addosgimanifest.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
@@ -152,6 +155,12 @@
 %setup -q -n %{mainname}-%{version}
 %patch0
 cp %{SOURCE1} .
+pushd client
+%patch1
+popd
+pushd common
+%patch2
+popd
 
 %build
 dos2unix LICENSE.txt
@@ -258,6 +267,9 @@
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
+- Add OSGi manifests.
+
 * Fri Aug 24 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 17:54:51 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 13:54:51 -0400
Subject: rpms/gdm/devel gdm.spec,1.284,1.285
Message-ID: <200709071754.l87Hsptk027715@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647

Modified Files:
	gdm.spec 
Log Message:
add buildrequires for libselinux-devel



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- gdm.spec	7 Sep 2007 17:45:21 -0000	1.284
+++ gdm.spec	7 Sep 2007 17:54:19 -0000	1.285
@@ -107,6 +107,8 @@
 %endif
 BuildRequires: nss-devel >= %{nss_version}
 BuildRequires: ConsoleKit
+BuildRequires: libselinux-devel
+
 Requires: audit-libs >= %{libauditver}
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep  7 18:04:49 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 7 Sep 2007 14:04:49 -0400
Subject: rpms/telepathy-glib/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 telepathy-glib.spec, 1.2, 1.3
Message-ID: <200709071804.l87I4n07001703@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1670

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Fri Sep  7 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
- Update to 0.5.14.
- Add BR on python.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jun 2007 04:48:18 -0000	1.2
+++ .cvsignore	7 Sep 2007 18:04:16 -0000	1.3
@@ -1 +1 @@
-telepathy-glib-0.5.13.tar.gz
+telepathy-glib-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jun 2007 04:48:18 -0000	1.2
+++ sources	7 Sep 2007 18:04:16 -0000	1.3
@@ -1 +1 @@
-61b16101b6164ae495c765c2d09a0899  telepathy-glib-0.5.13.tar.gz
+a784f13a377873464d1bf430ed35ad43  telepathy-glib-0.5.14.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-7/telepathy-glib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-glib.spec	5 Aug 2007 23:41:36 -0000	1.2
+++ telepathy-glib.spec	7 Sep 2007 18:04:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           telepathy-glib
-Version:        0.5.13
-Release:        4%{?dist}
+Version:        0.5.14
+Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
 Group:          System Environment/Libraries
@@ -10,9 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk-doc
-BuildRequires:  dbus-devel
-BuildRequires:	dbus-glib-devel
+BuildRequires:  dbus-devel >= 0.61
+BuildRequires:	dbus-glib-devel >= 0.72
 BuildRequires:	libxslt
+BuildRequires:	python
 
 
 %description
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Fri Sep  7 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
+- Update to 0.5.14.
+- Add BR on python.
+
 * Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.5.13-4
 - Update license tag.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 18:05:42 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Fri, 7 Sep 2007 14:05:42 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.153, 1.154 mkinitrd.spec, 1.218, 
	1.219 sources, 1.196, 1.197
Message-ID: <200709071805.l87I5g4t001797@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.15-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- .cvsignore	31 Aug 2007 19:27:29 -0000	1.153
+++ .cvsignore	7 Sep 2007 18:05:09 -0000	1.154
@@ -1 +1 @@
-mkinitrd-6.0.14.tar.bz2
+mkinitrd-6.0.15.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- mkinitrd.spec	31 Aug 2007 19:27:29 -0000	1.218
+++ mkinitrd.spec	7 Sep 2007 18:05:09 -0000	1.219
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.14
+Version: 6.0.15
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Fri Sep  7 2007 Peter Jones <pjones at redhat.com> - 6.0.15-1
+- Fix dmraid on x86_64.
+
 * Fri Aug 31 2007 Peter Jones <pjones at redhat.com> - 6.0.14-1
 - Don't probe loop devices as boot disks or in mkblkdevs
 - Minor performance improvements.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- sources	31 Aug 2007 19:27:29 -0000	1.196
+++ sources	7 Sep 2007 18:05:09 -0000	1.197
@@ -1 +1 @@
-56063c689feea06a55bf2d2f78f9d419  mkinitrd-6.0.14.tar.bz2
+65234e6e2b8ee9bdc436062995379feb  mkinitrd-6.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:06:46 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 7 Sep 2007 14:06:46 -0400
Subject: rpms/xmlrpc3/devel xmlrpc3.spec,1.3,1.4
Message-ID: <200709071806.l87I6kFr001873@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1846

Modified Files:
	xmlrpc3.spec 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.4
- Disable ppc64 (rh#239123).


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlrpc3.spec	7 Sep 2007 17:53:10 -0000	1.3
+++ xmlrpc3.spec	7 Sep 2007 18:06:12 -0000	1.4
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2005, JPackage roject
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    1jpp.3%{?dist}
+Release:    1jpp.4%{?dist}
 Summary:    Java XML-RPC implementation
 License:    Apache Software License
 Group:      Development/Libraries
@@ -50,6 +50,9 @@
 Patch1:     %{name}-client-addosgimanifest.patch
 Patch2:     %{name}-common-addosgimanifest.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+ExcludeArch: ppc64
+
 BuildRequires:  dos2unix
 BuildRequires:  maven2 >= 2.0.4
 BuildRequires:  maven2-plugin-resources
@@ -267,6 +270,9 @@
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.4
+- Disable ppc64 (rh#239123).
+
 * Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 3.0-1jpp.3
 - Add OSGi manifests.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:31 -0700
Subject: [pkgdb] alpine was added for joshuadf
Message-ID: <200709071822.l87IMXGP014220@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package alpine with summary UW Alpine mail user agent
Kevin Fenzi (kevin) has approved Package alpine
Kevin Fenzi (kevin) has added a Fedora devel branch for alpine with an owner of joshuadf
Kevin Fenzi (kevin) has approved alpine in Fedora devel
Kevin Fenzi (kevin) has approved Package alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora EPEL, 4) updated by kevin
Message-ID: <200709071822.l87IMo3S024754@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 4) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 4) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, 7) updated by kevin
Message-ID: <200709071822.l87IMp1a024769@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 7) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 7) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, 6) updated by kevin
Message-ID: <200709071822.l87IMphm024784@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 6) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora 6) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora EPEL, 5) updated by kevin
Message-ID: <200709071822.l87IMqTc024799@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for alpine
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alpine (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 5) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora EPEL 5) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:22:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:22:49 -0700
Subject: [pkgdb] alpine (Fedora, devel) updated by kevin
Message-ID: <200709071822.l87IMqPF024814@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved commit on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved build on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved checkout on alpine (Fedora devel) for jima
Kevin Fenzi (kevin) approved watchbugzilla on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on alpine (Fedora devel) for rdieter
Kevin Fenzi (kevin) Approved cvsextras for commit access on alpine (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alpine



From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:27 -0400
Subject: rpms/alpine - New directory
Message-ID: <200709071823.l87INRUb002797@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine

Log Message:
Directory /cvs/extras/rpms/alpine added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:31 -0400
Subject: rpms/alpine/devel - New directory
Message-ID: <200709071823.l87INVYL002815@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine/devel

Log Message:
Directory /cvs/extras/rpms/alpine/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:34 -0400
Subject: rpms/alpine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071823.l87INYDV002844@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine

Added Files:
	Makefile import.log 
Log Message:
Setup of module alpine


--- NEW FILE Makefile ---
# Top level Makefile for module alpine
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:23:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:23:36 -0400
Subject: rpms/alpine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709071823.l87INaf0002862@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWu2759/rpms/alpine/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alpine


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alpine
# $Id: Makefile,v 1.1 2007/09/07 18:23:34 kevin Exp $
NAME := alpine
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:26:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:00 -0700
Subject: [pkgdb] flashrom was added for peter
Message-ID: <200709071826.l87IQ1gi014255@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package flashrom with summary Simple program for reading/writing BIOS chips content
Kevin Fenzi (kevin) has approved Package flashrom
Kevin Fenzi (kevin) has added a Fedora devel branch for flashrom with an owner of peter
Kevin Fenzi (kevin) has approved flashrom in Fedora devel
Kevin Fenzi (kevin) has approved Package flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flashrom



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, 6) updated by kevin
Message-ID: <200709071826.l87IQAV1014264@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flashrom



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, 7) updated by kevin
Message-ID: <200709071826.l87IQAM0014273@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for flashrom
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flashrom (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flashrom



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:26:10 -0700
Subject: [pkgdb] flashrom (Fedora, devel) updated by kevin
Message-ID: <200709071826.l87IQAXM014283@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on flashrom (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flashrom



From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:26:55 -0400
Subject: rpms/flashrom - New directory
Message-ID: <200709071826.l87IQt7T003408@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom

Log Message:
Directory /cvs/extras/rpms/flashrom added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:26:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:26:59 -0400
Subject: rpms/flashrom/devel - New directory
Message-ID: <200709071826.l87IQxXb003425@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom/devel

Log Message:
Directory /cvs/extras/rpms/flashrom/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:27:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:27:02 -0400
Subject: rpms/flashrom Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071827.l87IR2m3003454@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom

Added Files:
	Makefile import.log 
Log Message:
Setup of module flashrom


--- NEW FILE Makefile ---
# Top level Makefile for module flashrom
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:27:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:27:05 -0400
Subject: rpms/flashrom/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709071827.l87IR5iF003472@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw3368/rpms/flashrom/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flashrom


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: flashrom
# $Id: Makefile,v 1.1 2007/09/07 18:27:02 kevin Exp $
NAME := flashrom
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:29:32 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 7 Sep 2007 14:29:32 -0400
Subject: devel/pirut .cvsignore, 1.67, 1.68 pirut.spec, 1.70, 1.71 sources, 
	1.69, 1.70
Message-ID: <200709071829.l87ITWgP003868@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
- Catch another downloading error (#270201)
- Handle errors a little better in puplet
- Fix repo refreshing after adding/removing repos



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	31 Aug 2007 03:53:18 -0000	1.67
+++ .cvsignore	7 Sep 2007 18:28:59 -0000	1.68
@@ -1 +1 @@
-pirut-1.3.16.tar.gz
+pirut-1.3.17.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- pirut.spec	31 Aug 2007 03:53:18 -0000	1.70
+++ pirut.spec	7 Sep 2007 18:28:59 -0000	1.71
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.16
+Version: 1.3.17
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -77,6 +77,11 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
+- Catch another downloading error (#270201)
+- Handle errors a little better in puplet
+- Fix repo refreshing after adding/removing repos
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.16-1
 - another repo editor fix from Debarshi Ray
 - fix image display


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	31 Aug 2007 03:53:18 -0000	1.69
+++ sources	7 Sep 2007 18:28:59 -0000	1.70
@@ -1 +1 @@
-9ea74be8a047d5528301884739dd88a5  pirut-1.3.16.tar.gz
+350e800d69a92d600ce76d552ebc31b7  pirut-1.3.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:00 -0700
Subject: [pkgdb] libflaim was added for snecker
Message-ID: <200709071832.l87IW1RX014333@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libflaim with summary Flaim Database Engine
Kevin Fenzi (kevin) has approved Package libflaim
Kevin Fenzi (kevin) has added a Fedora devel branch for libflaim with an owner of snecker
Kevin Fenzi (kevin) has approved libflaim in Fedora devel
Kevin Fenzi (kevin) has approved Package libflaim
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libflaim (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libflaim (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libflaim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libflaim



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 7 Sep 2007 14:32:10 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-boot.patch, 1.2,
	1.3 kernel.spec, 1.151, 1.152
Message-ID: <200709071832.l87IWAeK004181@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4154

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-debug-boot.patch 
Log Message:
* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: debug early boot


linux-2.6-x86-debug-boot.patch:

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: linux-2.6-x86-debug-boot.patch
diff -N linux-2.6-x86-debug-boot.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
@@ -0,0 +1,108 @@
+---
+ arch/i386/boot/main.c |   12 ++++++++++++
+ arch/i386/boot/pm.c   |    8 ++++++++
+ 2 files changed, 20 insertions(+)
+
+--- linux-2.6.22.noarch.orig/arch/i386/boot/main.c
++++ linux-2.6.22.noarch/arch/i386/boot/main.c
+@@ -105,6 +105,7 @@ static void set_bios_mode(void)
+ void main(void)
+ {
+ 	/* First, copy the boot header into the "zeropage" */
++	puts("Booting: ");
+ 	copy_boot_params();
+ 
+ 	/* End of heap check */
+@@ -118,6 +119,7 @@ void main(void)
+ 	}
+ 
+ 	/* Make sure we have all the proper CPU support */
++	puts("A");
+ 	if (validate_cpu()) {
+ 		puts("Unable to boot - please use a kernel appropriate "
+ 		     "for your CPU.\n");
+@@ -125,37 +127,47 @@ void main(void)
+ 	}
+ 
+ 	/* Tell the BIOS what CPU mode we intend to run in. */
++	puts("B");
+ 	set_bios_mode();
+ 
+ 	/* Detect memory layout */
++	puts("C");
+ 	detect_memory();
+ 
+ 	/* Set keyboard repeat rate (why?) */
++	puts("D");
+ 	keyboard_set_repeat();
+ 
+ 	/* Set the video mode */
++	puts("E");
+ 	set_video();
+ 
+ 	/* Query MCA information */
++	puts("F");
+ 	query_mca();
+ 
+ 	/* Voyager */
+ #ifdef CONFIG_X86_VOYAGER
++	puts("G");
+ 	query_voyager();
+ #endif
+ 
++	puts("H");
+ 	/* Query Intel SpeedStep (IST) information */
+ 	query_ist();
+ 
+ 	/* Query APM information */
+ #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
++	puts("I");
+ 	query_apm_bios();
+ #endif
+ 
+ 	/* Query EDD information */
+ #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
++	puts("J");
+ 	query_edd();
+ #endif
+ 	/* Do the last things and invoke protected mode */
++	puts("K");
+ 	go_to_protected_mode();
+ }
+--- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
++++ linux-2.6.22.noarch/arch/i386/boot/pm.c
+@@ -145,26 +145,34 @@ static void setup_idt(void)
+ void go_to_protected_mode(void)
+ {
+ 	/* Hook before leaving real mode, also disables interrupts */
++	puts("L");
+ 	realmode_switch_hook();
+ 
+ 	/* Move the kernel/setup to their final resting places */
++	puts("M");
+ 	move_kernel_around();
+ 
+ 	/* Enable the A20 gate */
++	puts("N");
+ 	if (enable_a20()) {
+ 		puts("A20 gate not responding, unable to boot...\n");
+ 		die();
+ 	}
+ 
+ 	/* Reset coprocessor (IGNNE#) */
++	puts("O");
+ 	reset_coprocessor();
+ 
+ 	/* Mask all interrupts in the PIC */
++	puts("P");
+ 	mask_all_interrupts();
+ 
+ 	/* Actual transition to protected mode... */
++	puts("Q");
+ 	setup_idt();
++	puts("R");
+ 	setup_gdt();
++	puts("S\n");
+ 	protected_mode_jump(boot_params.hdr.code32_start,
+ 			    (u32)&boot_params + (ds() << 4));
+ }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kernel.spec	6 Sep 2007 19:47:37 -0000	1.151
+++ kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
@@ -579,6 +579,7 @@
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
+Patch75: linux-2.6-x86-debug-boot.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -1003,6 +1004,8 @@
 ApplyPatch linux-2.6-x86-tune-generic.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
+# debug early boot
+ApplyPatch linux-2.6-x86-debug-boot.patch
 
 #
 # PowerPC
@@ -1194,6 +1197,8 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6-lirc.patch
 
+# ---------- below all scheduled for 2.6.23 -----------------
+
 # Fix Xen bootup
 ApplyPatch linux-2.6-xen-fix-bootup.patch
 
@@ -1798,6 +1803,9 @@
 
 %changelog
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: debug early boot
+
+* Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix imbalance in scheduler on multicore systems
 
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:10 -0700
Subject: [pkgdb] libflaim (Fedora, devel) updated by kevin
Message-ID: <200709071832.l87IWAmh024904@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on libflaim (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libflaim



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:32:10 -0700
Subject: [pkgdb] libflaim (Fedora, 7) updated by kevin
Message-ID: <200709071832.l87IWB1x024913@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libflaim
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libflaim (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on libflaim (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libflaim



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:48 -0400
Subject: rpms/libflaim - New directory
Message-ID: <200709071832.l87IWmD3004268@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim

Log Message:
Directory /cvs/extras/rpms/libflaim added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:54 -0400
Subject: rpms/libflaim/devel - New directory
Message-ID: <200709071832.l87IWsbo004288@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim/devel

Log Message:
Directory /cvs/extras/rpms/libflaim/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:57 -0400
Subject: rpms/libflaim Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071832.l87IWvuW004315@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim

Added Files:
	Makefile import.log 
Log Message:
Setup of module libflaim


--- NEW FILE Makefile ---
# Top level Makefile for module libflaim
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:32:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:32:59 -0400
Subject: rpms/libflaim/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709071832.l87IWxos004333@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsrr4233/rpms/libflaim/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libflaim


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libflaim
# $Id: Makefile,v 1.1 2007/09/07 18:32:57 kevin Exp $
NAME := libflaim
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi (Fedora, 7) updated by kevin
Message-ID: <200709071837.l87IbLgC014402@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for nabi
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nabi (Fedora 7)
Kevin Fenzi (kevin) changed owner of nabi in Fedora 7 to sbehera
Kevin Fenzi (kevin) approved watchbugzilla on nabi (Fedora 7) for petersen
Kevin Fenzi (kevin) approved watchcommits on nabi (Fedora 7) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on nabi (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nabi



From fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi summary updated by kevin
Message-ID: <200709071837.l87IbL3w014393@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package nabi summary to Hangul X Input Method

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nabi



From fedora-extras-commits at redhat.com  Fri Sep  7 18:37:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:37:20 -0700
Subject: [pkgdb] nabi (Fedora, devel) updated by kevin
Message-ID: <200709071837.l87IbLGX014411@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of nabi in Fedora devel to sbehera
Kevin Fenzi (kevin) approved watchbugzilla on nabi (Fedora devel) for petersen
Kevin Fenzi (kevin) approved watchcommits on nabi (Fedora devel) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on nabi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nabi



From fedora-extras-commits at redhat.com  Fri Sep  7 18:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:38:51 -0700
Subject: [pkgdb] xine-lib (Fedora EPEL, 5) updated by kevin
Message-ID: <200709071838.l87IcqDc014460@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for xine-lib
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xine-lib (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of xine-lib in Fedora EPEL 5 to scop
Kevin Fenzi (kevin) approved watchbugzilla on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved watchcommits on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved commit on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved build on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved approveacls on xine-lib (Fedora EPEL 5) for abompard
Kevin Fenzi (kevin) approved checkout on xine-lib (Fedora EPEL 5) for abompard

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib



From fedora-extras-commits at redhat.com  Fri Sep  7 18:40:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 07 Sep 2007 11:40:54 -0700
Subject: [pkgdb] cheese was added for mclasen
Message-ID: <200709071840.l87IesnD024971@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package cheese with summary A webcam application for snapshots and movies
Kevin Fenzi (kevin) has approved Package cheese
Kevin Fenzi (kevin) has added a Fedora devel branch for cheese with an owner of mclasen
Kevin Fenzi (kevin) has approved cheese in Fedora devel
Kevin Fenzi (kevin) has approved Package cheese
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cheese (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cheese (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cheese (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cheese



From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:14 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:41:14 -0400
Subject: rpms/flashrom/devel flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071841.l87IfEei005383@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5320/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:40:42 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:40:42 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:49 -0400
Subject: rpms/cheese - New directory
Message-ID: <200709071841.l87IfnHh005529@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese

Log Message:
Directory /cvs/extras/rpms/cheese added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:53 -0400
Subject: rpms/cheese/devel - New directory
Message-ID: <200709071841.l87Ifrww005547@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese/devel

Log Message:
Directory /cvs/extras/rpms/cheese/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep  7 18:41:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:41:59 -0400
Subject: rpms/cheese Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709071841.l87Ifxil005580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese

Added Files:
	Makefile import.log 
Log Message:
Setup of module cheese


--- NEW FILE Makefile ---
# Top level Makefile for module cheese
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:42:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 7 Sep 2007 14:42:01 -0400
Subject: rpms/cheese/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709071842.l87Ig1fu005598@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscz5492/rpms/cheese/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cheese


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cheese
# $Id: Makefile,v 1.1 2007/09/07 18:41:59 kevin Exp $
NAME := cheese
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 fedora-extras-commits at redhat.com  Fri Sep  7 18:44:41 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:44:41 -0400
Subject: rpms/flashrom/F-7 flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071844.l87IifuG005959@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:44:08 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:44:08 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:46:24 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 14:46:24 -0400
Subject: rpms/flashrom/FC-6 flashrom--Makefile_cleanup.diff, NONE,
	1.1 flashrom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709071846.l87IkOZp006248@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6166/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	flashrom--Makefile_cleanup.diff flashrom.spec 
Log Message:
Initial commit

flashrom--Makefile_cleanup.diff:

--- NEW FILE flashrom--Makefile_cleanup.diff ---
--- Makefile	2007-08-05 15:15:51.000000000 +0400
+++ Makefile	2007-08-05 15:18:46.000000000 +0400
@@ -7,18 +7,10 @@
 PROGRAM = flashrom
 
 CC      = gcc
-STRIP	= strip
 INSTALL = /usr/bin/install
-PREFIX  = /usr/local
-#CFLAGS  = -O2 -g -Wall -Werror
-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
+PREFIX  = /usr/
 OS_ARCH	= $(shell uname)
-ifeq ($(OS_ARCH), SunOS)
 LDFLAGS = -lpci -lz
-else
-LDFLAGS = -lpci -lz -static 
-STRIP_ARGS = -s
-endif
 
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
@@ -30,7 +22,6 @@
 
 $(PROGRAM): $(OBJS)
 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
 	rm -f *.o *~


--- NEW FILE flashrom.spec ---
Summary:	Simple program for reading/writing BIOS chips content
Name:		flashrom
Version:	0
Release:	0.1.20070830svn2753%{?dist}
License:	GPLv2+
Group:		Applications/System
# svn -r 2753 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
# tar -cjvf flashrom-2753.tar.bz2 flashrom
Source0:	flashrom-2753.tar.bz2
Patch0:		flashrom--Makefile_cleanup.diff
URL:		http://linuxbios.org/Flashrom
BuildRequires:	pciutils-devel
BuildRequires:	zlib-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Lacks of <sys/io.h>
ExcludeArch:	ppc ppc64

%description
Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents 
and write new contents on the chips ("flash the chip").

%prep
%setup -q -n %{name}
%patch0

%build
# currently disabling DiscOnChip due to instability
CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install %{name} $RPM_BUILD_ROOT%{_bindir}
install -D -p -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog

* Thu Sep  6 2007 Peter Lemenkov <lemenkov at gmail.com> 0-0.1.20070830svn2753
- svn ver. 2753 (support for W29C040P and W29EE011 chips added)
- New naming scheme

* Wed Aug 22 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2744svn
- svnver. 2744

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.0-1.2742svn
- Initial build for FC-Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:27:02 -0000	1.1
+++ .cvsignore	7 Sep 2007 18:45:51 -0000	1.2
@@ -0,0 +1 @@
+flashrom-2753.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:27:02 -0000	1.1
+++ sources	7 Sep 2007 18:45:51 -0000	1.2
@@ -0,0 +1 @@
+6488571b0e5933ff4cf1c7079b31bb0b  flashrom-2753.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 18:49:01 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Fri, 7 Sep 2007 14:49:01 -0400
Subject: rpms/httpd/devel httpd-2.2.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.18,
	1.19 httpd-2.2.4-oldflush.patch, 1.1, 1.2 httpd.spec, 1.114,
	1.115 sources, 1.15, 1.16 upstream, 1.8,
	1.9 httpd-2.0.54.tar.gz.asc, 1.1, NONE httpd-2.2.4.tar.gz.asc,
	1.1, NONE
Message-ID: <200709071849.l87In1IF006607@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547

Modified Files:
	.cvsignore httpd-2.2.4-oldflush.patch httpd.spec sources 
	upstream 
Added Files:
	httpd-2.2.6.tar.gz.asc 
Removed Files:
	httpd-2.0.54.tar.gz.asc httpd-2.2.4.tar.gz.asc 
Log Message:
* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
- update to 2.2.6 (#250757, #282761)



--- NEW FILE httpd-2.2.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)

iD8DBQBG3buFizpgHwjJdeURAiQhAJ0UzwL/Sg4PZdw1USvc4CWytBg+kgCeKf83
vNBG4bcFy+gEuU0vVE/HCGM=
=dt4x
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Mar 2007 13:29:57 -0000	1.18
+++ .cvsignore	7 Sep 2007 18:48:27 -0000	1.19
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz

httpd-2.2.4-oldflush.patch:

Index: httpd-2.2.4-oldflush.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.4-oldflush.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.4-oldflush.patch	2 Sep 2007 13:57:10 -0000	1.1
+++ httpd-2.2.4-oldflush.patch	7 Sep 2007 18:48:27 -0000	1.2
@@ -1,3 +1,6 @@
+
+http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
+
 --- httpd-2.2.4/server/util_filter.c.oldflush
 +++ httpd-2.2.4/server/util_filter.c
 @@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
+++ httpd.spec	7 Sep 2007 18:48:27 -0000	1.115
@@ -5,8 +5,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.4
-Release: 10
+Version: 2.2.6
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -36,6 +36,7 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -122,6 +123,7 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -474,6 +476,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
+- update to 2.2.6 (#250757, #282761)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
 - rebuild for fixed APR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Mar 2007 13:29:57 -0000	1.15
+++ sources	7 Sep 2007 18:48:27 -0000	1.16
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstream	12 Mar 2007 13:29:57 -0000	1.8
+++ upstream	7 Sep 2007 18:48:27 -0000	1.9
@@ -1 +1 @@
-httpd-2.2.4.tar.gz
+httpd-2.2.6.tar.gz


--- httpd-2.0.54.tar.gz.asc DELETED ---


--- httpd-2.2.4.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 18:51:49 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 7 Sep 2007 14:51:49 -0400
Subject: rpms/eclipse/devel eclipse.desktop, 1.1, 1.2 eclipse.spec, 1.483,
	1.484
Message-ID: <200709071851.l87IpndW006926@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6840

Modified Files:
	eclipse.desktop eclipse.spec 
Log Message:
* Fri Sep 07 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-18
- Build 1.6 plugins when building with IcedTea.



Index: eclipse.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse.desktop	9 Sep 2004 04:27:27 -0000	1.1
+++ eclipse.desktop	7 Sep 2007 18:51:16 -0000	1.2
@@ -5,5 +5,4 @@
 Icon=eclipse.png
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;IDE;Development;Java;X-Red-Hat-Base;
+Categories=IDE;Development;Java;X-Red-Hat-Base;


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- eclipse.spec	7 Sep 2007 05:24:17 -0000	1.483
+++ eclipse.spec	7 Sep 2007 18:51:16 -0000	1.484
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        17%{?dist} 
+Release:        18%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -562,8 +562,14 @@
   sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
   linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
   sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+# If we're build with IcedTea then we don't want to remove the plugins from the
+# feature.xml because we will build these plugins after the main build. This
+# allows us to produce 1.5 bytecode for all of the SDK except for the parts that
+# explicitly use Java 1.6. This enables GCJ to work with Eclipse on all platforms. 
+%if ! %{gcj_support}
   linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
   sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+%endif 
   linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
   sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
   linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
@@ -675,18 +681,34 @@
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
 
-## Build the FileInitializer application
+  
+# build 1.6 when building with IcedTea
 SDK=$(cd eclipse && pwd)
+mkdir -p home
+homedir=$(cd home && pwd)
+LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+
+%if ! %{gcj_support}
+for plugin in jdt.compiler.tool jdt.compiler.apt jdt.apt.pluggable.core; do
+  pushd plugins/org.eclipse.$plugin
+  java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
+       org.eclipse.core.launcher.Main                    \
+       -application org.eclipse.ant.core.antRunner       \
+       build.update.jar                                  \
+       -vmargs -Duser.home=$homedir 
+  popd
+done
+%endif 
+
+## Build the FileInitializer application
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
 pushd equinox-incubator
-mkdir -p build home
-homedir=$(cd home && pwd)
+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
 
-LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
      -Duser.home=$homedir                              \
       org.eclipse.core.launcher.Main \
@@ -729,6 +751,13 @@
 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
 %endif
 
+# Install 1.6 plugins when building with IcedTea
+%if ! %{gcj_support}
+for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
+  cp plugins/org.eclipse.$plugin/org.eclipse.$plugin_*.jar $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins
+done
+%endif
+
 # Add a compatibility symlink to startup.jar
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
@@ -912,22 +941,6 @@
 # freedesktop.org menu entry
 install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Put Fedora Core version into about.mappings of org.eclipse.sdk and
-# org.eclipse.platform to show it in Eclipse about dialog.  
-# (courtesy Debian Eclipse packagers)
-# FIXME use the third id
-SDKPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.sdk_ | sed "s/org.eclipse.sdk_//")
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_$SDKPLUGINVERSION
-OS_VERSION=$(cat /etc/*-release | head -n 1)
-sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp
-mv about.mappings.tmp about.mappings
-popd
-PLATFORMPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//")
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMPLUGINVERSION
-sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp
-mv about.mappings.tmp about.mappings
-popd
-
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
 cp %{SOURCE16} copy-platform
@@ -1502,9 +1515,9 @@
 %{_libdir}/gcj/%{name}/jdimodel.jar.*
 %{_libdir}/gcj/%{name}/jdi.jar.*
 %else
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
-#%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
 %endif
 
 %files pde
@@ -1564,6 +1577,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:03:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 15:03:15 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.49,
	1.50 selinux-policy.spec, 1.516, 1.517
Message-ID: <200709071903.l87J3FhY013815@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13792

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
- Allow wine to run in system role


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- policy-20070703.patch	6 Sep 2007 23:34:02 -0000	1.49
+++ policy-20070703.patch	7 Sep 2007 19:03:11 -0000	1.50
@@ -2401,9 +2401,20 @@
 +	role $2 types wine_t;
 +	allow wine_t $3:chr_file rw_term_perms;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.0.7/policy/modules/apps/wine.te
+--- nsaserefpolicy/policy/modules/apps/wine.te	2007-07-25 10:37:37.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/wine.te	2007-09-07 09:04:03.000000000 -0400
+@@ -9,6 +9,7 @@
+ type wine_t;
+ type wine_exec_t;
+ application_domain(wine_t,wine_exec_t)
++role system_r types wine_t;
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-07 13:47:17.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2437,6 +2448,14 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
+@@ -259,3 +265,7 @@
+ ifdef(`distro_suse',`
+ /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
+ ')
++
++/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
++/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
++/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in	2007-09-06 15:43:06.000000000 -0400
@@ -2486,7 +2505,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-07 15:02:19.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2528,11 +2547,21 @@
  network_port(nessus, tcp,1241,s0)
  network_port(netsupport, tcp,5405,s0, udp,5405,s0)
  network_port(nmbd, udp,137,s0, udp,138,s0)
-@@ -160,13 +166,17 @@
+@@ -146,7 +152,7 @@
+ network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
+ network_port(spamd, tcp,783,s0)
+ network_port(ssh, tcp,22,s0)
+-network_port(soundd, tcp,8000,s0, tcp,9433,s0)
++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
+ network_port(squid, udp,3401,s0, tcp,3401,s0, udp,4827,s0, tcp,4827,s0) # snmp and htcp
+@@ -160,13 +166,18 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
 +network_port(wccp, udp,2048,s0)
++network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
 -network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
 +network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0, tcp,6020,s0)
@@ -5920,7 +5949,7 @@
  		allow $1 self:tcp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.7/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-07 10:31:47.000000000 -0400
 @@ -62,7 +62,7 @@
  # Use capabilities. Surplus capabilities may be allowed.
  allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
@@ -5964,6 +5993,15 @@
  ')
  
  optional_policy(`
+@@ -151,7 +157,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice };
+ dontaudit krb5kdc_t self:capability sys_tty_config;
+-allow krb5kdc_t self:process { setsched getsched signal_perms };
++allow krb5kdc_t self:process { setfscreate setsched getsched signal_perms };
+ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms;
+ allow krb5kdc_t self:tcp_socket create_stream_socket_perms;
+ allow krb5kdc_t self:udp_socket create_socket_perms;
 @@ -223,6 +229,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
@@ -5972,6 +6010,14 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
+@@ -233,6 +240,7 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(krb5kdc_t)
++	seutil_read_file_contexts(krb5kdc_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.0.7/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/ktalk.te	2007-09-06 15:43:06.000000000 -0400
@@ -7732,7 +7778,7 @@
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.7/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-07 10:32:33.000000000 -0400
 @@ -59,10 +59,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -7782,16 +7828,17 @@
  ')
  
  tunable_policy(`nfs_export_all_ro',`
-@@ -143,6 +154,8 @@
+@@ -143,6 +154,9 @@
  manage_files_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t)
  files_tmp_filetrans(gssd_t, gssd_tmp_t, { file dir })
  
 +auth_use_nsswitch(gssd_t)
 +
++kernel_read_system_state(gssd_t)
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
-@@ -158,6 +171,9 @@
+@@ -158,6 +172,9 @@
  
  miscfiles_read_certs(gssd_t)
  
@@ -9287,7 +9334,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 15:02:10.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9323,7 +9370,15 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -246,6 +257,7 @@
+@@ -189,6 +200,7 @@
+ corenet_sendrecv_all_client_packets(xdm_t)
+ # xdm tries to bind to biff_port_t
+ corenet_dontaudit_tcp_bind_all_ports(xdm_t)
++corenet_udp_bind_xdmcp_ports(xdm_t)
+ 
+ dev_read_rand(xdm_t)
+ dev_read_sysfs(xdm_t)
+@@ -246,6 +258,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -9331,7 +9386,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +269,7 @@
+@@ -257,6 +270,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -9339,7 +9394,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -271,6 +284,10 @@
+@@ -271,6 +285,10 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -9350,7 +9405,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +323,8 @@
+@@ -306,6 +324,8 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -9359,7 +9414,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +367,8 @@
+@@ -348,12 +368,8 @@
  ')
  
  optional_policy(`
@@ -9373,7 +9428,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +400,7 @@
+@@ -385,7 +401,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9382,7 +9437,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +440,10 @@
+@@ -425,6 +441,10 @@
  ')
  
  optional_policy(`
@@ -9393,7 +9448,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +453,19 @@
+@@ -434,47 +454,19 @@
  ')
  
  optional_policy(`
@@ -11333,7 +11388,7 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.7/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-09-07 09:00:42.000000000 -0400
 @@ -150,7 +150,9 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -11362,7 +11417,16 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -293,5 +298,15 @@
+@@ -275,6 +280,8 @@
+ seutil_search_default_contexts(lvm_t)
+ seutil_sigchld_newrole(lvm_t)
+ 
++userdom_dontaudit_search_sysadm_home_dirs(lvm_t)
++
+ ifdef(`distro_redhat',`
+ 	# this is from the initrd:
+ 	files_rw_isid_type_dirs(lvm_t)
+@@ -293,5 +300,15 @@
  ')
  
  optional_policy(`
@@ -13971,7 +14035,25 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-07 08:48:47.000000000 -0400
+@@ -95,7 +95,7 @@
+ read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ 
+-allow xend_t xenctl_t:fifo_file manage_file_perms;
++allow xend_t xenctl_t:fifo_file manage_fifo_file_perms;
+ dev_filetrans(xend_t, xenctl_t, fifo_file)
+ 
+ manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t)
+@@ -126,7 +126,7 @@
+ domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
+ allow xenstored_t xend_t:fd use;
+ allow xenstored_t xend_t:process sigchld;
+-allow xenstored_t xend_t:fifo_file write;
++allow xenstored_t xend_t:fifo_file write_fifo_file_perms;
+ 
+ # transition to console
+ domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13980,6 +14062,15 @@
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
+@@ -224,7 +225,7 @@
+ 
+ allow xenconsoled_t self:capability { dac_override fsetid ipc_lock };
+ allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms;
+-allow xenconsoled_t self:fifo_file { read write };
++allow xenconsoled_t self:fifo_file  rw_fifo_file_perms;
+ 
+ allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms;
+ 
 @@ -257,7 +258,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
@@ -13998,7 +14089,14 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -324,6 +325,7 @@
+@@ -318,12 +319,13 @@
+ allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
+ 
+ # internal communication is often done using fifo and unix sockets.
+-allow xm_t self:fifo_file { read write };
++allow xm_t self:fifo_file  rw_fifo_file_perms;
+ allow xm_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow xm_t self:tcp_socket create_stream_socket_perms;
  
  manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
  manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- selinux-policy.spec	6 Sep 2007 23:34:02 -0000	1.516
+++ selinux-policy.spec	7 Sep 2007 19:03:11 -0000	1.517
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
+- Allow wine to run in system role
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-5
 - Fix java labeling 
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 7 Sep 2007 15:36:33 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.31,1.32
Message-ID: <200709071936.l87JaXDg015882@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15729

Modified Files:
	bigboard.spec 
Log Message:
add some brs


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bigboard.spec	6 Sep 2007 21:41:03 -0000	1.31
+++ bigboard.spec	7 Sep 2007 19:36:01 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           bigboard
 Version:        0.5.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -26,6 +26,8 @@
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
 
 %description
@@ -90,6 +92,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
+- some brs
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:50 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:50 -0400
Subject: rpms/sipp/EL-4 sipp.spec,1.6,1.7
Message-ID: <200709071936.l87JaoV7015942@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/EL-4

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/EL-4/sipp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sipp.spec	25 Jul 2007 09:43:48 -0000	1.6
+++ sipp.spec	7 Sep 2007 19:36:17 -0000	1.7
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	3.2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
 BuildRequires:	libpcap
+%else
+BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,10 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
 * Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
 - finally added correct BR for EL-4
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:53 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:53 -0400
Subject: rpms/sipp/EL-5 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87JarLf015949@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/EL-5

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/EL-5/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:55 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:20 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:56 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:56 -0400
Subject: rpms/sipp/F-7 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87Jauc1015957@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/F-7

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/F-7/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:50 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:23 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:36:58 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:36:58 -0400
Subject: rpms/sipp/FC-6 sipp.spec,1.3,1.4
Message-ID: <200709071936.l87JawFd015963@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/FC-6

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/FC-6/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:24:55 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:26 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:37:01 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 7 Sep 2007 15:37:01 -0400
Subject: rpms/sipp/devel sipp.spec,1.3,1.4
Message-ID: <200709071937.l87Jb13e015970@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/sipp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15765/devel

Modified Files:
	sipp.spec 
Log Message:
Fixed BZ #282431


Index: sipp.spec
===================================================================
RCS file: /cvs/extras/rpms/sipp/devel/sipp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipp.spec	10 Jun 2007 06:25:01 -0000	1.3
+++ sipp.spec	7 Sep 2007 19:36:28 -0000	1.4
@@ -1,14 +1,18 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	2.0.1
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 License:	GPL
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
 Patch0:		sipp--Makefile-fix-paths.diff
 BuildRequires:	ncurses-devel
+%if 0%{?el4}
+BuildRequires:	libpcap
+%else
 BuildRequires:	libpcap-devel
+%endif
 BuildRequires:	openssl-devel
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +29,7 @@
 %prep
 %setup -n sipp-2.0.1.src
 %patch0
+rm -rf pcap/.svn 
 
 %build
 DEBUG_FLAGS="%{optflags}" %{__make} %{?_smp_mflags} pcapplay_ossl
@@ -47,6 +52,19 @@
 
 %changelog
 
+* Fri Sep  7 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Removed .svn entries (close BZ #282431)
+- Added macro for builds for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.2
+- finally added correct BR for EL-4
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3.1
+- rebuild
+
+* Wed Jul 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+- Added tcpdump instead of libpcap as BR for EL-4
+
 * Sun Jun 10 2007 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:40:13 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:40:13 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec, 
	1.17, 1.18
Message-ID: <200709071940.l87JeDUU016415@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-launcher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-launcher.spec	9 Feb 2007 19:27:11 -0000	1.17
+++ jakarta-commons-launcher.spec	7 Sep 2007 19:39:40 -0000	1.18
@@ -37,7 +37,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.1
-Release:        1jpp.2%{?dist}
+Release:        1jpp.3%{?dist}
 Epoch:          0
 Summary:        A cross platform Java application launcher
 License:        Apache Software License
@@ -168,6 +168,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-launcher-%{version}.jar.*
 %endif
 
@@ -178,6 +179,9 @@
 
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:1.1-1jpp.3
+- Fix unowned directory
+
 * Fri Feb 09 2007 Matt Wringe <mwringe at redhat.com> - 0:1.1-1jpp.2
 - Fix macro naming for post and postun
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:46:45 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 7 Sep 2007 15:46:45 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.252,1.253
Message-ID: <200709071946.l87JkjW6016945@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	gtk2.spec 
Log Message:
- install dummy binary in libdir/gtk-2.0/immodules directory to
  aid rpm when doing ia64 multilib (bug 253726)



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- gtk2.spec	27 Aug 2007 00:38:43 -0000	1.252
+++ gtk2.spec	7 Sep 2007 19:46:12 -0000	1.253
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -147,7 +147,7 @@
         exit 1
 fi
 
-%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png
+%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png --enable-debug
 
 ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 
 ## past gtk 2.1.2
@@ -155,6 +155,12 @@
 # turn off for now, since floatingtest needs a display
 #make check
 
+# create a dummy binary for /usr/lib/gtk-2.0/immodules to work around
+# problems in our ia64 multilib infrastructure
+# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
+echo 'int main (void) { return 0; }' > relocation-tag.c
+gcc -Os relocation-tag.c -o .relocation-tag
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -238,6 +244,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
 
+# we need to install a binary in the immodules directory to make sure
+# that it gets properly relocated to /emul for ia64 emulation of x86
+# See https://bugzilla.redhat.com/show_bug.cgi?id=253726
+install -m 0644 .relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
+
 #
 # We need the substitution of $host so we use an external
 # file list
@@ -299,6 +310,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-8
+- install dummy binary in libdir/gtk-2.0/immodules directory to
+  aid rpm when doing ia64 multilib (bug 253726)
+
 * Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-7
 - own libdir/gtk-2.0/immodules directory (#255621)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:35:06 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:35:06 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.36, 1.37
Message-ID: <200709071935.l87JZ6PC015627@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15593

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-commons-modeler.spec	26 Apr 2007 00:25:06 -0000	1.36
+++ jakarta-commons-modeler.spec	7 Sep 2007 19:34:33 -0000	1.37
@@ -38,7 +38,7 @@
 Name:       jakarta-%{short_name}
 Epoch:      0
 Version:    2.0
-Release:    3jpp.1%{?dist}
+Release:    3jpp.2%{?dist}
 Summary:    Model MBeans utilty classes
 Group:      Development/Libraries/Java
 License:    Apache Software License
@@ -168,6 +168,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
@@ -177,6 +178,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.2
+- Fix unowned directory
+
 * Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.1
 - Merge with lastest jpp version
 



From fedora-extras-commits at redhat.com  Fri Sep  7 19:24:42 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 7 Sep 2007 15:24:42 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 
	1.36, 1.37
Message-ID: <200709071924.l87JOgI7015033@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14977

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
Fix unowned directory



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-commons-digester.spec	23 Jan 2007 03:17:43 -0000	1.36
+++ jakarta-commons-digester.spec	7 Sep 2007 19:24:09 -0000	1.37
@@ -48,7 +48,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        6jpp.1
+Release:        6jpp.2
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -182,6 +182,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7-rss.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7.jar.*
 %endif
@@ -199,6 +200,9 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Matt Wringe <mwringe at redhat.com> - 0:1.7-6jpp.2
+- Fix unowned dir (/usr/lib/gcj/jakarta-commons-digester)
+
 * Mon Jan 22 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.7-6jpp.1
 - Resynch with JPP release
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:01:28 2007
From: fedora-extras-commits at redhat.com (Joshua Daniel Franklin (joshuadf))
Date: Fri, 7 Sep 2007 16:01:28 -0400
Subject: rpms/alpine/devel alpine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709072001.l87K1S5c023891@cvs-int.fedora.redhat.com>

Author: joshuadf

Update of /cvs/pkgs/rpms/alpine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alpine.spec 
Log Message:



--- NEW FILE alpine.spec ---
# Fedora review: http://bugzilla.redhat.com/249365

Summary: UW Alpine mail user agent
Name: alpine
Version: 0.9999
Release: 2%{?dist}

License: Apache Software License
Group: Applications/Internet
URL: http://www.washington.edu/alpine
#Source0: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.bz2
# removed cc5.sol problem file, see BZ for details
Source0: %{name}-%{version}.tar.bz2

Requires: /usr/sbin/sendmail aspell mailcap
# Using "Conflicts" instead of Obsoletes because while alpine is substantially
# compatible with pine the change to Unicode breaks important user
# functionality such as non-ASCII encoded saved passwords. Additionally, there
# are also many patches to pine floating around that for political/technical
# reasons will not be integrated into alpine. (I'd like to stay out of it...
# just search "Mark Crispin maildir" for the gory details.) Since licensing
# prevents a Fedora pine package, I cannot predict what patches users might
# have and so want to warn them instead of automatically replacing their pine
# install with an alpine that could break their configuration. 
# I understand this to be a special case of the "Optional Functionality"
# description at http://fedoraproject.org/wiki/Packaging/Conflicts
Conflicts: pine
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: /usr/sbin/sendmail
BuildRequires: gettext inews krb5-devel ncurses-devel 
BuildRequires: openldap-devel openssl-devel pam-devel passwd sendmail

%description
Alpine -- an Alternatively Licensed Program for Internet
News & Email -- is a tool for reading, sending, and managing
electronic messages.  Alpine is the successor to Pine and was
developed by Computing & Communications at the University of
Washington.  
  Though originally designed for inexperienced email users,
Alpine supports many advanced features, and an ever-growing number of
configuration and personal-preference options.
Changes and enhancements over pine:
  * Released under the Apache Software License, Version 2.0.
  * Internationalization built around new internal Unicode support.
  * Ground-up reorganization of source code around new "pith/" core 
routine library.
  * Ground-up reorganization of build and install procedure based on 
GNU Build System's autotools.

%prep
%setup -q
chmod -x alpine/arg.c pico/main.c

%build
touch imap/ip6
# --without-tcl disables the TCL-based CGI "Web Alpine"
%configure \
  --without-tcl \
  --with-c-client-target=lfd \
  --with-passfile=.alpine.passfile \
  --with-spellcheck-prog=aspell
make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE doc/tech-notes.txt
%{_bindir}/alpine
%{_bindir}/pico
%{_bindir}/pilot
%{_bindir}/rpload
%{_bindir}/rpdump
%{_mandir}/man1/alpine.1*
%{_mandir}/man1/pico.1*
%{_mandir}/man1/pilot.1*
%{_mandir}/man1/rpload.1*
%{_mandir}/man1/rpdump.1*

%changelog
* Fri Sep 07 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.9999-2
- update to latest 

* Fri Aug 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.999-3
- EXTRACFLAGS=$RPM_OPT_FLAGS
- --with-c-client-target=lfd
- --with-passfile=.alpine.passfile
- Requires: mailcap

* Mon Jul 24 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.2
- remove problem cc5.sol file
- integrate changes from Patrick "Jima" Laughton <jima at beer.tclug.org>

* Mon Jul 24 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.1
- correct spec syntax, explain Conflicts tag

* Mon Jul 23 2007 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 0.999-2.0
- initial alpine spec
- Apache Software License 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:23:34 -0000	1.1
+++ .cvsignore	7 Sep 2007 20:00:54 -0000	1.2
@@ -0,0 +1 @@
+alpine-0.9999.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:23:34 -0000	1.1
+++ sources	7 Sep 2007 20:00:54 -0000	1.2
@@ -0,0 +1 @@
+61ce134e24185727e6a0736738767630  alpine-0.9999.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 20:07:01 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 7 Sep 2007 16:07:01 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.2, 1.3 Makefile, 1.1,
	1.2 java-1.7.0-icedtea-makefile.patch, 1.1,
	1.2 java-1.7.0-icedtea.spec, 1.3, 1.4 sources, 1.2,
	1.3 generate-cacerts.pl, 1.1, NONE
Message-ID: <200709072007.l87K71GR024398@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305

Modified Files:
	.cvsignore Makefile java-1.7.0-icedtea-makefile.patch 
	java-1.7.0-icedtea.spec sources 
Removed Files:
	generate-cacerts.pl 
Log Message:
* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Do not require openssl for build.
- Require openssl.
- Set gcjbootstrap to 0.
- Remove generate-cacerts.pl.
- Update icedtearelease.
- Update icedteasnapshot.
- Update openjdkver.
- Update openjdkdate.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Aug 2007 14:56:44 -0000	1.2
+++ .cvsignore	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
-openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	28 Aug 2007 14:24:02 -0000	1.1
+++ Makefile	7 Sep 2007 20:06:27 -0000	1.2
@@ -3,6 +3,9 @@
 NAME := java-1.7.0-icedtea
 SPECFILE = $(firstword $(wildcard *.spec))
 
+TARGET_ARCH = $(shell rpm --eval "%{_arch}" | sed 's/i.86/i586/')
+MOCKARGS = --arch $(TARGET_ARCH)
+
 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

java-1.7.0-icedtea-makefile.patch:

Index: java-1.7.0-icedtea-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.7.0-icedtea-makefile.patch	28 Aug 2007 14:56:44 -0000	1.1
+++ java-1.7.0-icedtea-makefile.patch	7 Sep 2007 20:06:27 -0000	1.2
@@ -1,9 +1,10 @@
---- Makefile.am.orig	2007-08-27 14:14:11.000000000 -0400
-+++ Makefile.am	2007-08-27 14:14:27.000000000 -0400
-@@ -122,15 +122,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.am ./Makefile.am
+--- ../icedtea-1.4.orig/Makefile.am	2007-09-06 19:09:50.000000000 -0400
++++ ./Makefile.am	2007-09-06 19:12:49.000000000 -0400
+@@ -113,15 +113,6 @@
+ endif
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -13,15 +14,16 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:
---- Makefile.in.orig	2007-08-27 14:14:16.000000000 -0400
-+++ Makefile.in	2007-08-27 14:14:34.000000000 -0400
-@@ -643,15 +643,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.in ./Makefile.in
+--- ../icedtea-1.4.orig/Makefile.in	2007-09-06 19:10:07.000000000 -0400
++++ ./Makefile.in	2007-09-06 19:12:55.000000000 -0400
+@@ -646,15 +646,6 @@
+ 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -31,6 +33,6 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.7.0-icedtea.spec	5 Sep 2007 21:19:51 -0000	1.3
+++ java-1.7.0-icedtea.spec	7 Sep 2007 20:06:27 -0000	1.4
@@ -1,14 +1,13 @@
 # If gcjbootstrap is 1 IcedTea is bootstrapped against
 # java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
-# java-1.7.0-icedtea-devel.  Building against java-1.7.0-icedtea-devel
-# is not supported yet.
-%define gcjbootstrap 1
+# java-1.7.0-icedtea-devel.
+%define gcjbootstrap 0
 
-%define icedteaver 1.3
-%define icedteasnapshot -a9c9ee1b6479a84f2153be67fce85b0dbf371398
+%define icedteaver 1.4
+%define icedteasnapshot -f23640f520cf248e08d731f91fed62ed14e97b2f
 %define icedtearelease snapshot
-%define openjdkver b18
-%define openjdkdate 16_aug_2007
+%define openjdkver b19
+%define openjdkdate 30_aug_2007
 
 %define genurl http://icedtea.classpath.org/hg/fedora/raw-file/32c44002d507/
 
@@ -107,10 +106,9 @@
 # Save icedtea.classpath.org space and bandwidth.
 # NoSource: 1
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
-Source3:  %{genurl}generate-cacerts.pl
-Source4:  %{genurl}generate-fedora-zip.sh
-Source5:  README.src
-Source6:  README.plugin
+Source3:  %{genurl}generate-fedora-zip.sh
+Source4:  README.src
+Source5:  README.plugin
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -140,13 +138,14 @@
 BuildRequires: libbonobo-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
-# Certificate file generation requirements.
-BuildRequires: openssl
 # gcjwebplugin build requirements.
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 
+# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
+# cacerts.
+Requires: openssl
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -262,16 +261,19 @@
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
+cp %{SOURCE4} .
 cp %{SOURCE5} .
-cp %{SOURCE6} .
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
-make patch-ecj.stamp patch.stamp
+%if %{gcjbootstrap}
+make stamps/patch-ecj.stamp
 pushd openjdk-ecj
   patch -p1 < %{PATCH1}
   patch -p1 < %{PATCH2}
 popd
+%endif
+make stamps/patch.stamp
 patch -p0 < %{PATCH1}
 patch -p0 < %{PATCH2}
 make
@@ -368,10 +370,6 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# Generate and install cacerts file.
-%{__perl} %{SOURCE3} %{buildoutputdir}/j2sdk-image/bin/keytool
-install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -716,6 +714,16 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Do not require openssl for build.
+- Require openssl.
+- Set gcjbootstrap to 0.
+- Remove generate-cacerts.pl.
+- Update icedtearelease.
+- Update icedteasnapshot.
+- Update openjdkver.
+- Update openjdkdate.
+
 * Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Rename javadoc master alternative javadocdir.
 - Resolves: rhbz#269901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Aug 2007 14:56:44 -0000	1.2
+++ sources	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-d4fff908a9a9fe1dedfe7e9544132ba3  icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
-6c14ade20274f189be1646223f7e8929  openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


--- generate-cacerts.pl DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 20:10:11 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 16:10:11 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.50,
	1.51 selinux-policy.spec, 1.517, 1.518
Message-ID: <200709072010.l87KABTk024626@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24599

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
- Turn off direct transition


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- policy-20070703.patch	7 Sep 2007 19:03:11 -0000	1.50
+++ policy-20070703.patch	7 Sep 2007 20:10:07 -0000	1.51
@@ -12734,7 +12734,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-07 15:05:57.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13106,7 +13106,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +881,162 @@
+@@ -954,21 +881,163 @@
  ##	</summary>
  ## </param>
  #
@@ -13166,6 +13166,7 @@
 +	dontaudit $1_t self:capability { sys_nice fsetid };
 +
 +	allow $1_t self:process ~{ setcurrent setexec setrlimit execmem execstack execheap };
++	dontaudit $1_t self:process setrlimit;
 +	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
 +
 +	allow $1_t self:context contains;
@@ -13275,7 +13276,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1045,51 @@
+@@ -977,23 +1046,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -13338,7 +13339,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1125,7 @@
+@@ -1029,15 +1126,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -13355,7 +13356,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1142,6 @@
+@@ -1054,17 +1143,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -13373,7 +13374,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1179,8 @@
+@@ -1102,6 +1180,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -13382,7 +13383,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1206,7 @@
+@@ -1127,7 +1207,7 @@
  	# $1_t local policy
  	#
  
@@ -13391,7 +13392,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1218,11 @@
+@@ -1139,7 +1219,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -13404,7 +13405,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1856,17 +1939,53 @@
+@@ -1856,17 +1940,53 @@
  ##	</summary>
  ## </param>
  #
@@ -13462,7 +13463,7 @@
  ##	in a user home subdirectory.
  ## </summary>
  ## <desc>
-@@ -1891,13 +2010,12 @@
+@@ -1891,13 +2011,12 @@
  ##	</summary>
  ## </param>
  #
@@ -13479,7 +13480,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3196,7 @@
+@@ -3078,7 +3197,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -13488,7 +13489,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4733,24 @@
+@@ -4615,6 +4734,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -13513,7 +13514,7 @@
  
  ########################################
  ## <summary>
-@@ -5323,7 +5459,7 @@
+@@ -5323,7 +5460,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -13522,7 +13523,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5695,299 @@
+@@ -5559,3 +5696,299 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- selinux-policy.spec	7 Sep 2007 19:03:11 -0000	1.517
+++ selinux-policy.spec	7 Sep 2007 20:10:07 -0000	1.518
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -194,8 +194,8 @@
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted mcs y y
-%installCmds targeted mcs y y
+%setupCmds targeted mcs n y
+%installCmds targeted mcs n y
 %endif
 
 %if %{BUILD_MLS}
@@ -207,8 +207,8 @@
 %if %{BUILD_OLPC}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds olpc mcs y y
-%installCmds olpc mcs y y
+%setupCmds olpc mcs n y
+%installCmds olpc mcs n y
 %endif
 
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
+- Turn off direct transition
+
 * Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-6
 - Allow wine to run in system role
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:14:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 16:14:42 -0400
Subject: rpms/gtk2/devel workaround.patch,NONE,1.1 gtk2.spec,1.253,1.254
Message-ID: <200709072014.l87KEgkj024834@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24806

Modified Files:
	gtk2.spec 
Added Files:
	workaround.patch 
Log Message:
Add a workaround for the flash backend


workaround.patch:

--- NEW FILE workaround.patch ---
Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
@@ -287,6 +287,7 @@
 gtk_clipboard_get_for_display (GdkDisplay *display, 
 			       GdkAtom     selection)
 {
+  g_return_val_if_fail (display != NULL, NULL);
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   g_return_val_if_fail (!display->closed, NULL);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- gtk2.spec	7 Sep 2007 19:46:12 -0000	1.253
+++ gtk2.spec	7 Sep 2007 20:14:10 -0000	1.254
@@ -37,6 +37,9 @@
 Patch5: systray-tooltips.patch
 # fixed in upstream svn
 Patch6: tooltip-compat.patch
+# a workaround for some brokenness in the flash plugin
+# see http://bugzilla.gnome.org/show_bug.cgi?id=463773
+Patch7: workaround.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -127,6 +130,7 @@
 %patch4 -p1 -b .silence
 %patch5 -p1 -b .tooltips
 %patch6 -p1 -b .tooltip-compat
+%patch7 -p1 -b .workaround
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -310,7 +314,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-8
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-9
+- Add a workaround for the flash plugin
+
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 2.11.6-8
 - install dummy binary in libdir/gtk-2.0/immodules directory to
   aid rpm when doing ia64 multilib (bug 253726)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 20:15:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 16:15:45 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.254,1.255
Message-ID: <200709072015.l87KFj2O024917@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24850

Modified Files:
	gtk2.spec 
Log Message:
bump rev



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- gtk2.spec	7 Sep 2007 20:14:10 -0000	1.254
+++ gtk2.spec	7 Sep 2007 20:15:12 -0000	1.255
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 20:16:44 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:16:44 -0400
Subject: rpms/wcstools/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 wcstools.spec, 1.10, 1.11 wcstools3-codewarn.patch, 1.4,
	1.5 wcstools3-shared.patch, 1.4, 1.5
Message-ID: <200709072016.l87KGiZK025081@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Modified Files:
	.cvsignore sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Mar 2007 17:55:59 -0000	1.6
+++ .cvsignore	7 Sep 2007 20:16:11 -0000	1.7
@@ -1 +1 @@
-wcstools-3.6.8.tar.gz
+wcstools-3.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 17:55:59 -0000	1.6
+++ sources	7 Sep 2007 20:16:11 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wcstools.spec	27 Aug 2007 13:55:31 -0000	1.10
+++ wcstools.spec	7 Sep 2007 20:16:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}.1
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
@@ -84,6 +84,8 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
 - Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-codewarn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-codewarn.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-codewarn.patch	7 Sep 2007 20:16:11 -0000	1.5
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-shared.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-shared.patch	7 Sep 2007 20:16:11 -0000	1.5
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:20:20 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:20:20 -0400
Subject: rpms/wcstools/F-7 sources, 1.6, 1.7 wcstools.spec, 1.8,
	1.9 wcstools3-codewarn.patch, 1.4, 1.5 wcstools3-shared.patch,
	1.4, 1.5
Message-ID: <200709072020.l87KKKuB025412@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25361

Modified Files:
	sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 17:55:59 -0000	1.6
+++ sources	7 Sep 2007 20:19:47 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wcstools.spec	20 Mar 2007 09:44:54 -0000	1.8
+++ wcstools.spec	7 Sep 2007 20:19:47 -0000	1.9
@@ -1,16 +1,16 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
-License: GPL
+License: GPLv2+
 URL: http://tdc-www.harvard.edu/wcstools
 Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Patch2: wcstools3-bug232413.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Wcstools is a set of software utilities, written in C, which create,
@@ -22,7 +22,7 @@
 %package -n libwcs
 Summary: Libwcs shared library 
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,7 +33,7 @@
 %package -n libwcs-devel
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
-License: LGPL
+License: LGPLv2+
 Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
+- Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
 - Fix for bug #232413
 * Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools3-codewarn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-codewarn.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-codewarn.patch	7 Sep 2007 20:19:47 -0000	1.5
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-7/wcstools3-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools3-shared.patch	19 Mar 2007 18:02:48 -0000	1.4
+++ wcstools3-shared.patch	7 Sep 2007 20:19:47 -0000	1.5
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:21:16 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Fri, 7 Sep 2007 16:21:16 -0400
Subject: rpms/e2fsprogs/devel blkid_types-wrapper.h, NONE,
	1.1 ext2_types-wrapper.h, NONE, 1.1 e2fsprogs.spec, 1.78, 1.79
Message-ID: <200709072021.l87KLGgo025559@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25440

Modified Files:
	e2fsprogs.spec 
Added Files:
	blkid_types-wrapper.h ext2_types-wrapper.h 
Log Message:
* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
- wrap a couple headers to fix multilib issues (#270441)



--- NEW FILE blkid_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because blkid_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "blkid_types-i386.h"
#elif defined(__ia64__)
#include "blkid_types-ia64.h"
#elif defined(__powerpc64__)
#include "blkid_types-ppc64.h"
#elif defined(__powerpc__)
#include "blkid_types-ppc.h"
#elif defined(__s390x__)
#include "blkid_types-s390x.h"
#elif defined(__s390__)
#include "blkid_types-s390.h"
#elif defined(__x86_64__)
#include "blkid_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



--- NEW FILE ext2_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because ext2_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "ext2_types-i386.h"
#elif defined(__ia64__)
#include "ext2_types-ia64.h"
#elif defined(__powerpc64__)
#include "ext2_types-ppc64.h"
#elif defined(__powerpc__)
#include "ext2_types-ppc.h"
#elif defined(__s390x__)
#include "ext2_types-s390x.h"
#elif defined(__s390__)
#include "ext2_types-s390.h"
#elif defined(__x86_64__)
#include "ext2_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- e2fsprogs.spec	30 Aug 2007 01:41:58 -0000	1.78
+++ e2fsprogs.spec	7 Sep 2007 20:20:43 -0000	1.79
@@ -4,12 +4,14 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
 Group: System Environment/Base
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1: ext2_types-wrapper.h
+Source2: blkid_types-wrapper.h
 Patch30: e2fsprogs-1.38-resize-inode.patch
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
@@ -110,6 +112,16 @@
 export PATH=/sbin:$PATH
 make install install-libs DESTDIR="%{buildroot}" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+
+# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
+mv -f $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types-%{_arch}.h
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h
+
+mv -f $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types-%{_arch}.h
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+
 %find_lang %{name}
 
 %check
@@ -248,8 +260,11 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
+- wrap a couple headers to fix multilib issues (#270441)
+
 * Wed Aug 29 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-4
-- add gawk to e2fsprogs-devel Requires, compile_et needs it
+- add gawk to e2fsprogs-devel Requires, compile_et needs it (#265961)
 
 * Thu Aug 23 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-3
 - Update license tags



From fedora-extras-commits at redhat.com  Fri Sep  7 20:24:39 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Fri, 7 Sep 2007 16:24:39 -0400
Subject: rpms/wcstools/FC-6 sources, 1.6, 1.7 wcstools.spec, 1.9,
	1.10 wcstools3-codewarn.patch, 1.3, 1.4 wcstools3-shared.patch,
	1.3, 1.4
Message-ID: <200709072024.l87KOdpX025811@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25747

Modified Files:
	sources wcstools.spec wcstools3-codewarn.patch 
	wcstools3-shared.patch 
Log Message:
* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
- New upstream source 3.7.0
* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
- Rebuild for Fedora 8 to get the build-id
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
- Fix for bug #232413
* Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1
- New upstream source 3.6.8
- Added pacthes to remove warnings during the compilation
* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.7-1
- New upstream source 3.6.7
* Wed Nov 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.3-1
- Initial RPM file.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Mar 2007 18:20:36 -0000	1.6
+++ sources	7 Sep 2007 20:24:05 -0000	1.7
@@ -1 +1 @@
-c48a173124360facf6b399da8d1f7422  wcstools-3.6.8.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wcstools.spec	20 Mar 2007 09:25:23 -0000	1.9
+++ wcstools.spec	7 Sep 2007 20:24:05 -0000	1.10
@@ -1,16 +1,16 @@
 Name: wcstools
-Version: 3.6.8
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
-License: GPL
+License: GPLv2+
 URL: http://tdc-www.harvard.edu/wcstools
 Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Patch2: wcstools3-bug232413.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Wcstools is a set of software utilities, written in C, which create,
@@ -22,7 +22,7 @@
 %package -n libwcs
 Summary: Libwcs shared library 
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,7 +33,7 @@
 %package -n libwcs-devel
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
-License: LGPL
+License: LGPLv2+
 Requires: libwcs = %{version}-%{release}
 %description -n libwcs-devel
 This are the files needed to develop an application using libwcs.
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
+- Rebuild for Fedora 8 to get the build-id
 * Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2
 - Fix for bug #232413
 * Mon Mar 19 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-1

wcstools3-codewarn.patch:

Index: wcstools3-codewarn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools3-codewarn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools3-codewarn.patch	19 Mar 2007 18:20:36 -0000	1.3
+++ wcstools3-codewarn.patch	7 Sep 2007 20:24:05 -0000	1.4
@@ -1,41 +1,6 @@
-+++ wcstools-3.6.6/getdate.c	2006-10-10 12:07:22.000000000 +0200
---- wcstools-3.6.6.orig/getdate.c	2006-10-10 12:06:11.000000000 +0200
-@@ -413,7 +413,7 @@
-     char *fitsdate, *newfdate, *stdate;
-     char temp[64];
-     char fyear[16];
--    char ts0[8];
-+    char ts0[9];
-     char *tchar;
-     int its, its1;
-     time_t lts;
-diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c
---- wcstools-3.6.6.orig/libwcs/binread.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/binread.c	2006-10-10 12:11:22.000000000 +0200
-@@ -1358,7 +1358,7 @@
- 	for (i = 0; i < nmag; i++) {
- 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
- 	    if (sc->byteswapped)
--		binswap2 (&st->mag[i], 2);
-+		binswap2 ((char*)&st->mag[i], 2);
- 	    st->xmag[i] = 0.01 * (double) st->mag[i];
- 	    }
- 	}
-diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c
---- wcstools-3.6.6.orig/libwcs/catutil.c	2006-10-10 12:10:47.000000000 +0200
-+++ wcstools-3.6.6/libwcs/catutil.c	2006-10-10 12:12:08.000000000 +0200
-@@ -722,7 +722,7 @@
- 	    lname = 0;
- 	else
- 	    lname = strlen (refcatname);
--	catname = (char *)calloc (lname + 16, 1);
-+	catname = (char *)calloc (lname + 37, sizeof(char));
- 	if (lname > 0)
- 	    sprintf (catname, "%s sources", refcatname);
- 	else
-diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c
---- wcstools-3.6.8/bincat.c	2007-03-13 16:05:40.000000000 +0100
-+++ wcstools-3.6.8.new/bincat.c	2007-03-19 18:14:16.000000000 +0100
+diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c
+--- wcstools-3.7.0/bincat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/bincat.c	2007-09-07 20:58:35.000000000 +0200
 @@ -90,7 +90,7 @@
      char *lastchar;
      char filename[128];
@@ -45,9 +10,21 @@
      char rastr[32], decstr[32];
      double x, y;
      char cs1;
-diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c
---- wcstools-3.6.8/crlf.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/crlf.c	2007-03-19 18:25:29.000000000 +0100
+diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c
+--- wcstools-3.7.0/cphead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/cphead.c	2007-09-07 21:27:59.000000000 +0200
+@@ -357,7 +357,7 @@
+     double dval;
+     int ival, nch;
+     int iraffile;
+-    int ndec, nbheadout, nbheadin, nbheader;
++    int ndec, nbheadout = 0, nbheadin, nbheader;
+     char newname[128];
+     char string[80];
+     char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1;
+diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c
+--- wcstools-3.7.0/crlf.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/crlf.c	2007-09-07 20:59:04.000000000 +0200
 @@ -99,7 +99,7 @@
  		if (buffer[i] == (char) 13)
  		    buffer[i] = (char) 10;
@@ -57,9 +34,30 @@
  	    }
  	}
     return;
-diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c
---- wcstools-3.6.8/delwcs.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/delwcs.c	2007-03-19 18:07:46.000000000 +0100
+diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c
+--- wcstools-3.7.0/delhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delhead.c	2007-09-07 21:51:50.000000000 +0200
+@@ -551,7 +551,7 @@
+ char *header;	/* FITS header */
+ int verbose;	/* If true, print deletion confirmations */
+ {
+-    char *hplace, *hcom, *v, *v1, *v2, *ve;
++    char *hplace, *hcom, *v, *v2, *ve;
+     int i, killcom, nline;
+     int nkill = 0;
+ 
+@@ -585,7 +585,7 @@
+ 
+ 	    /* Fill line with blanks */
+ 	    else {
+-		for (i = 0; i++; i < 80)
++		for (i = 0; i < 80; i++)
+ 		    hcom[i] = ' ';
+ 		hplace = hplace + 80;
+ 		}
+diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c
+--- wcstools-3.7.0/delwcs.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/delwcs.c	2007-09-07 20:59:28.000000000 +0200
 @@ -114,7 +114,7 @@
  
  {
@@ -69,9 +67,9 @@
      int lhead;		/* Maximum number of bytes in FITS header */
      int nbhead;		/* Actual number of bytes in FITS header */
      int iraffile;	/* 1 if IRAF image */
-diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c
---- wcstools-3.6.8/edhead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/edhead.c	2007-03-19 18:23:53.000000000 +0100
+diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c
+--- wcstools-3.7.0/edhead.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/edhead.c	2007-09-07 20:59:48.000000000 +0200
 @@ -210,8 +210,8 @@
  		    break;
  		}
@@ -83,9 +81,21 @@
  	    }
  	fclose (fd);
  	free (header);
-diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c
---- wcstools-3.6.8/getcol.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getcol.c	2007-03-19 18:25:09.000000000 +0100
+diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c
+--- wcstools-3.7.0/filename.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/filename.c	2007-09-07 21:32:59.000000000 +0200
+@@ -39,7 +39,7 @@
+ {
+     char *fn, *fn0;
+     char *str;
+-    char *name;
++    char *name = NULL;
+     char *is[10];
+     char *endroot;
+     int i, n;
+diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c
+--- wcstools-3.7.0/getcol.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getcol.c	2007-09-07 21:00:14.000000000 +0200
 @@ -447,7 +447,7 @@
  		nop++;
  		}
@@ -95,10 +105,10 @@
  	    }
  
  	/* File to read */
-diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c
---- wcstools-3.6.8/getdate.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/getdate.c	2007-03-19 18:13:02.000000000 +0100
-@@ -409,7 +409,7 @@
+diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c
+--- wcstools-3.7.0/getdate.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getdate.c	2007-09-07 21:00:41.000000000 +0200
+@@ -409,10 +409,10 @@
      int year, vyear;
      int lfd, oldfits;
      char outform[16];
@@ -106,10 +116,14 @@
 +    char *fitsdate = NULL, *newfdate, *stdate;
      char temp[64];
      char fyear[16];
-     char ts0[9];
-diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c
---- wcstools-3.6.8/getpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/getpix.c	2007-03-19 18:24:05.000000000 +0100
+-    char ts0[8];
++    char ts0[9];
+     char *tchar;
+     int its, its1;
+     time_t lts;
+diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c
+--- wcstools-3.7.0/getpix.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/getpix.c	2007-09-07 21:01:00.000000000 +0200
 @@ -68,7 +68,7 @@
      char *fn;
      char *rrange;       /* Row range string */
@@ -119,10 +133,10 @@
      char *dstr = NULL;
      char *cstr;
      int systemp;
-diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c
---- wcstools-3.6.8/gettab.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/gettab.c	2007-03-19 18:10:32.000000000 +0100
-@@ -559,7 +559,7 @@
+diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c
+--- wcstools-3.7.0/gettab.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/gettab.c	2007-09-07 21:01:31.000000000 +0200
+@@ -558,7 +558,7 @@
  char	*alias[]; /* Output names of keywords if different from input */
  
  {
@@ -131,9 +145,40 @@
      char *cstr, *cval, cvalue[64];
      int pass = 0;
      int drop;
-diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c
---- wcstools-3.6.8/imfill.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imfill.c	2007-03-19 18:13:20.000000000 +0100
+diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c
+--- wcstools-3.7.0/imcat.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imcat.c	2007-09-07 21:53:32.000000000 +0200
+@@ -109,9 +109,6 @@
+     char **fn;
+     int i, ic;
+     int nx, ny;
+-    char *header;
+-    double cra, cdec, dra, ddec, secpix;
+-    int wp, hp, bitpix;
+     double x, y;
+     char *refcatname[5];	/* reference catalog name */
+     int ncat = 0;
+@@ -123,7 +120,7 @@
+     int scat = 0;
+     char c1, c, *ccom;
+     double drot;
+-    struct WorldCoor *wcs = NULL; /* World coordinate system structure */
++    /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */
+ 
+     nfile = 0;
+     fn = (char **)calloc (maxnfile, sizeof(char *));
+@@ -1777,7 +1774,7 @@
+ 		    sprintf (headline, "%s	%s	%s	%5.1f	%5.1f	%d",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]);
+ 		else if (refcat == SKYBOT)
+-		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f",
++		    sprintf (headline, "%s	%s	%s	%5.2f	%5.2f	%5.2f %5.2f",
+ 		     numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]);
+ 		else if (refcat == UJC)
+ 		    sprintf (headline, "%s	%s	%s	%5.2f	%d",
+diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c
+--- wcstools-3.7.0/imfill.c	2007-08-30 23:47:02.000000000 +0200
++++ wcstools-3.7.0.new/imfill.c	2007-09-07 21:01:55.000000000 +0200
 @@ -313,7 +313,7 @@
      int nfilled;
      int nbadpix;
@@ -143,9 +188,9 @@
      char newname[256];		/* Name for revised image */
      char *ltime;
      char *endchar;
-diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c
---- wcstools-3.6.8/imsmooth.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imsmooth.c	2007-03-19 18:13:39.000000000 +0100
+diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c
+--- wcstools-3.7.0/imsmooth.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imsmooth.c	2007-09-07 21:02:24.000000000 +0200
 @@ -263,7 +263,7 @@
      char *ext = NULL;
      char *newimage = NULL;
@@ -155,10 +200,10 @@
      char *fname;
      char extname[16];
      int lext = 0;
-diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c
---- wcstools-3.6.8/imstack.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/imstack.c	2007-03-19 18:24:43.000000000 +0100
-@@ -194,7 +194,7 @@
+diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c
+--- wcstools-3.7.0/imstack.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/imstack.c	2007-09-07 21:03:02.000000000 +0200
+@@ -199,7 +199,7 @@
  	    blanks = (char *) malloc ((size_t) nbytes);
  	    for (i = 0;  i < nbytes; i++)
  		blanks[i] = 0;
@@ -167,7 +212,7 @@
  	    free (blanks);
  	    }
  	}
-@@ -449,7 +449,7 @@
+@@ -475,7 +475,7 @@
  			    blanks = (char *) malloc ((size_t) nbytes);
  			    for (i = 0;  i < nbytes; i++)
  				blanks[i] = 0;
@@ -176,9 +221,9 @@
  			    free (blanks);
  			    }
  			}
-diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c
---- wcstools-3.6.8/libwcs/binread.c	2007-03-19 18:25:53.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/binread.c	2007-03-19 18:22:34.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c
+--- wcstools-3.7.0/libwcs/binread.c	2007-01-11 23:02:42.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/binread.c	2007-09-07 21:03:38.000000000 +0200
 @@ -505,7 +505,7 @@
      struct Star *star;
      char str[128];
@@ -193,13 +238,34 @@
      int jstar;
      int nstar;
 -    double mag;
-+    double mag = 0.;
++    double mag = 0;
      double num;
      int magsort;
      int istar = 0;
-diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c
---- wcstools-3.6.8/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/fileutil.c	2007-03-19 18:23:34.000000000 +0100
+@@ -1372,7 +1372,7 @@
+ 	for (i = 0; i < nmag; i++) {
+ 	    moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2);
+ 	    if (sc->byteswapped)
+-		binswap2 (&st->mag[i], 2);
++		binswap2 ((char*)&st->mag[i], 2);
+ 	    st->xmag[i] = 0.01 * (double) st->mag[i];
+ 	    }
+ 	}
+diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c
+--- wcstools-3.7.0/libwcs/catutil.c	2007-07-23 23:00:32.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/catutil.c	2007-09-07 20:58:14.000000000 +0200
+@@ -737,7 +737,7 @@
+ 	    lname = 0;
+ 	else
+ 	    lname = strlen (refcatname);
+-	catname = (char *)calloc (lname + 16, 1);
++	catname = (char *)calloc (lname + 37, 1);
+ 	if (lname > 0)
+ 	    sprintf (catname, "%s sources", refcatname);
+ 	else
+diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c
+--- wcstools-3.7.0/libwcs/fileutil.c	2007-01-11 22:57:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/fileutil.c	2007-09-07 21:04:08.000000000 +0200
 @@ -343,7 +343,7 @@
      /* If line can be read, add null at the end of the first token */
      if (fgets (token, ncmax, diskfile) != NULL) {
@@ -209,21 +275,33 @@
  	    }
  
  	/* If only character is a control character, return a NULL */
-diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c
---- wcstools-3.6.8/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/findstar.c	2007-03-19 17:51:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c
+--- wcstools-3.7.0/libwcs/findstar.c	2007-01-10 18:35:23.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/findstar.c	2007-09-07 21:04:43.000000000 +0200
 @@ -747,7 +747,7 @@
      double sd = 0.0;
      int i;
      int npix;
 -    double dnpix;
-+    double dnpix = 0.;
++    double dnpix = 0;
      double sum;
  
      pmin = -1.0e20;
-diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c
---- wcstools-3.6.8/libwcs/gsc2read.c	2007-03-13 18:12:56.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gsc2read.c	2007-03-19 18:21:39.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c
+--- wcstools-3.7.0/libwcs/fitsfile.c	2007-05-01 00:22:51.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/fitsfile.c	2007-09-07 21:44:46.000000000 +0200
+@@ -874,7 +874,7 @@
+     if (!simple) {
+ 	nbytes = getfilesize (filename) - nbhead;
+ 	if ((image = (char *) malloc (nbytes + 1)) == NULL) {
+-	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n");
++	    snprintf (fitserrmsg,79, "FITSRFULL:  %d-byte image buffer cannot be allocated\n", nbytes);
+ 	    (void)close (fd);
+ 	    return (NULL);
+ 	    }
+diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c
+--- wcstools-3.7.0/libwcs/gsc2read.c	2007-07-09 23:36:08.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gsc2read.c	2007-09-07 21:06:03.000000000 +0200
 @@ -191,7 +191,7 @@
  
      /* Dump returned file and stop */
@@ -233,7 +311,7 @@
  	exit (0);
  	}
  
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
      char *databuff;
      char *lastbuff;
      char *oldbuff;
@@ -242,9 +320,18 @@
      int lhead, lbuff, i, j;
      char ctab = (char) 9;
      char ccom = ',';
-diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c
---- wcstools-3.6.8/libwcs/gscread.c	2007-01-10 19:17:17.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/gscread.c	2007-03-19 18:14:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c
+--- wcstools-3.7.0/libwcs/gscread.c	2007-07-05 18:05:03.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/gscread.c	2007-09-07 21:07:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
 @@ -549,7 +549,7 @@
  int	*gtype;		/* Array of object types (returned) */
  int	nlog;		/* 1 for diagnostics */
@@ -263,6 +350,15 @@
      char *url;
  
      itot = 0;
+@@ -756,7 +756,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n",
 @@ -795,7 +795,7 @@
      int rlist[100];	/* List of input FITS tables files */
      char inpath[64];	/* Pathname for input FITS table file */
@@ -285,9 +381,51 @@
      double rra1, rra2, rdec1, rdec2;
      double rdist, ddist;
      char *str;
-diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c
---- wcstools-3.6.8/libwcs/hput.c	2007-01-16 18:18:13.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/hput.c	2007-03-19 18:02:03.000000000 +0100
+@@ -830,11 +830,11 @@
+ 
+     /* Set image parameters */
+     bitpix = 0;
+-    (void)hgeti4 (header, "BITPIX", &bitpix);
++    hgeti4 (header, "BITPIX", &bitpix);
+     w = 0;
+-    (void)hgeti4 (header, "NAXIS1", &w);
++    hgeti4 (header, "NAXIS1", &w);
+     h = 0;
+-    (void)hgeti4 (header, "NAXIS2", &h);
++    hgeti4 (header, "NAXIS2", &h);
+ 
+     if (refcat == GSCACT) {
+ 	if ((str = getenv("GSCACT_NORTH")) == NULL)
+@@ -1080,7 +1080,7 @@
+ 	    }
+ 
+ 	/* Close region input file */
+-	(void) close (ift);
++	close (ift);
+ 	itot = itot + itable;
+ 	if (nlog > 0)
+ 	    fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d  / %5d sources from region %4d    \n",
+@@ -1321,7 +1321,7 @@
+ 	jr2 = 0;
+ 	}
+ 
+-    (void) close (ift);
++    close (ift);
+     return (nrgn);
+ }
+ 
+@@ -1381,7 +1381,7 @@
+ double min;		/* Minutes of declination */
+ 
+     /* Get declination sign from table */
+-    (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3);
++    ftgetc (fitsline, &rkw[sgncol], sgn, 3);
+ 
+     /* Get degrees of declination from table */
+     deg = ftgetr8 (fitsline, &rkw[dcol]);
+diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c
+--- wcstools-3.7.0/libwcs/hput.c	2007-08-22 23:59:56.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/hput.c	2007-09-07 21:47:09.000000000 +0200
 @@ -273,7 +273,7 @@
  const char *cval;	/* character string containing the value for variable
  		   keyword.  trailing and leading blanks are removed.  */
@@ -297,10 +435,31 @@
      int comment = 0;
      const char *v;
      char keyroot[8], newkey[12], value[80];
-diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c
---- wcstools-3.6.8/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imhfile.c	2007-03-19 18:23:06.000000000 +0100
-@@ -910,7 +910,7 @@
+@@ -599,7 +599,7 @@
+     char squot, slash, space;
+     char line[100];
+     int lkeyword, lcom, lhead, i, lblank, ln, nc, lc;
+-    char *vp, *v1, *v2, *c0, *c1, *q1, *q2;
++    char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL;
+ 
+     squot = (char) 39;
+     slash = (char) 47;
+diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c
+--- wcstools-3.7.0/libwcs/imgetwcs.c	2007-07-26 22:08:41.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imgetwcs.c	2007-09-07 21:26:47.000000000 +0200
+@@ -381,7 +381,7 @@
+     double xref, yref, degpix, secpix;
+     struct WorldCoor *wcs;
+     char temp[16];
+-    char *cwcs;
++    char *cwcs = NULL;
+ 
+     /* Set the world coordinate system from the image header */
+     if (strlen (filename) > 0) {
+diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c
+--- wcstools-3.7.0/libwcs/imhfile.c	2007-01-08 18:24:29.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imhfile.c	2007-09-07 21:09:34.000000000 +0200
+@@ -910,10 +910,10 @@
  
      /* Write IRAF header to disk file */
      nbw = write (fd, irafheader, nbhead);
@@ -308,10 +467,25 @@
 +    ftruncate (fd, nbhead);
      close (fd);
      if (nbw < nbhead) {
- 	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
-diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c
---- wcstools-3.6.8/libwcs/imsetwcs.c	2007-01-11 23:01:41.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imsetwcs.c	2007-03-19 17:51:28.000000000 +0100
+-	(void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
++	fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n",
+ 		      hdrname, nbw, nbhead);
+ 	return (-1);
+ 	}
+diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c
+--- wcstools-3.7.0/libwcs/imrotate.c	2007-04-04 20:42:14.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/imrotate.c	2007-09-07 21:42:33.000000000 +0200
+@@ -371,7 +371,6 @@
+ 
+ {
+     static char flds[15][8];
+-    char ctype1[16], ctype2[16];
+     double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2;
+     int i, n, ndec1, ndec2, ndec3, ndec4;
+ 
+diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c
+--- wcstools-3.7.0/libwcs/imsetwcs.c	2007-03-14 22:03:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imsetwcs.c	2007-09-07 21:10:35.000000000 +0200
 @@ -136,22 +136,22 @@
      int nmax;		/* Maximum number of matches possible (nrg or nbs) */
      int lofld = 0;	/* Length of object name field in output */
@@ -335,19 +509,19 @@
      char rstr[32], dstr[32];
      double refeq, refep;
 -    double maxnum;
-+    double maxnum = 0.;
++    double maxnum = 0;
      int nnfld;
      int refsys;
      char refcoor[8];
-diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c
---- wcstools-3.6.8/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/imutil.c	2007-03-19 18:06:49.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c
+--- wcstools-3.7.0/libwcs/imutil.c	2007-01-11 20:51:15.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/imutil.c	2007-09-07 21:49:38.000000000 +0200
 @@ -164,7 +164,7 @@
  {
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	bitpixb;	/* Number of bits per pixel in bad pixel file */
@@ -428,7 +602,7 @@
  char	*buffret;	/* Modified image buffer (returned) */
  int	nx,ny;		/* Number of columns and rows in image */
 -int	ix,iy;		/* Pixel around which to compute mean */
-+int	ix,iy = 0;		/* Pixel around which to compute mean */
++int	ix,iy = 0;	/* Pixel around which to compute mean */
  int	npix;		/* Number of pixels in image */
  int	bitpix;		/* Number of bits per pixel (<0=floating point) */
  int	checkmin = 0;
@@ -546,21 +720,21 @@
  int	npix;	/* Number of pixels in image */
  int	bitpix;	/* Number of bits per pixel (<0=floating point) */
  int	naxes;
-diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c
---- wcstools-3.6.8/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
-+++ wcstools-3.6.8.new/libwcs/proj.c	2007-03-19 18:04:58.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c
+--- wcstools-3.7.0/libwcs/proj.c	2006-06-20 22:08:00.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/proj.c	2007-09-07 21:15:23.000000000 +0200
 @@ -3672,7 +3672,7 @@
  
  {
     int   face;
 -   double cthe, eta, l, m, n, rho, xi;
-+   double cthe, eta = 0., l, m, n, rho, xi = 0.;
++   double cthe, eta = 0, l, m, n, rho, xi = 0;
     const float tol = 1.0e-7;
  
     float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2;
-diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c
---- wcstools-3.6.8/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/sdssread.c	2007-03-19 18:21:55.000000000 +0100
+diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c
+--- wcstools-3.7.0/libwcs/sdssread.c	2007-01-10 19:24:44.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/sdssread.c	2007-09-07 21:15:41.000000000 +0200
 @@ -165,7 +165,7 @@
  
      /* Dump returned file and stop */
@@ -570,19 +744,85 @@
  	exit (0);
  	}
  
-diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c
---- wcstools-3.6.8/libwcs/tabread.c	2007-03-13 18:20:27.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tabread.c	2007-03-19 18:22:23.000000000 +0100
-@@ -778,7 +778,7 @@
+diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c
+--- wcstools-3.7.0/libwcs/skybotread.c	2007-07-27 20:21:27.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/skybotread.c	2007-09-07 21:42:18.000000000 +0200
+@@ -125,12 +125,11 @@
+ int	nlog;		/* 1 for diagnostics */
+ {
+     char srchurl[LINE];
+-    char cmag;
+     char *obs;
+     char *dstr;
+     struct TabTable *tabtable;
+     struct StarCat *starcat; /* Star catalog data structure */
+-    double dtemp, jdout;
++    double jdout;
+     int nstar, nlog0;
+     double ra, dec, mag, dradi, dradx;
+     char rastr[32], decstr[32], temp[256], tstr[80];
+@@ -281,29 +280,22 @@
+ 
+     char *skybuff;	/* Input comma-separated table */
+ {
+-    char *heading;
+     char *colhead;
+     char *colsep;
+     char *tabbuff;	/* Output tab-separated table */
+     char *tbuff;
+-    char *databuff;
+     char *dbuff;
+     char *buffer;
+     char *lastbuff;
+-    char *endhead;
+     char *colend;
+-    char *chead;
+-    char *head;
+     char *tbuffi;
+     char temp[16], format[16];
+     int lbuff, i, lra, icol;
+-    int lhead, ldata;
++    int lhead;
+     int addname;
+     int lobj;
+     char cbuff;
+-    char *buff;
+     char cbar = '|';
+-    char ccom = ',';
+     char cminus = '-';
+     char cspace = ' ';
+     char ctab = (char) 9;
+diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c
+--- wcstools-3.7.0/libwcs/tabread.c	2007-07-23 23:02:01.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/tabread.c	2007-09-07 21:43:33.000000000 +0200
+@@ -147,7 +147,7 @@
+     int lname;
+     int imag;
+     double ra,dec, rapm, decpm;
+-    double mag, parallax, rv;
++    double mag = 0, parallax, rv;
+     double num;
+     int peak, i;
+     int istar, nstars, lstar;
+@@ -596,7 +596,7 @@
+ 		}
+ 
+ 	    /* Check ID number first */
+-	    (void) setoken (&startok, line, "tab");
++	    setoken (&startok, line, "tab");
+ 	    if (!strcmp (sc->isfil,"gsc-server")) {
+    		if (tabgetc (&startok, sc->entid, str, 24))
+ 		    num = 0.0;
+@@ -782,7 +782,7 @@
      int nstar;
      int imag;
      double ra,dec, rapm, decpm;
 -    double mag, parallax, rv;
-+    double mag = 0., parallax, rv;
++    double mag = 0, parallax, rv;
      double num;
      int peak;
      int istar, nstars, lstar;
-@@ -2149,7 +2149,7 @@
+@@ -2163,7 +2163,7 @@
  	tabtable->lline = (nextline - tabtable->tabdata) * 2;
  	tabtable->tabline = (char *) calloc (tabtable->lline, 1);
  	fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
@@ -591,7 +831,16 @@
  	lline = strlen (tabtable->tabline);
  	if (tabtable->tabline[lline-1] < 32)
  	     tabtable->tabline[lline-1] = (char) 0;
-@@ -2231,7 +2231,7 @@
+@@ -2173,7 +2173,7 @@
+     /* Close catalog file if not reading one line at a time */
+     else {
+ 	tabtable->lhead = 0;
+-	(void) fclose (fcat);
++	fclose (fcat);
+ 	tabtable->tcat = NULL;
+ 	}
+ 
+@@ -2245,7 +2245,7 @@
  	    fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET);
  	    tabtable->iline = 0;
  	    for (i = tabtable->iline; i < iline; i++) {
@@ -600,9 +849,26 @@
  		tabtable->iline++;
  		}
  	    lline = strlen (tabtable->tabline);
-diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c
---- wcstools-3.6.8/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/tmcread.c	2007-03-19 17:57:35.000000000 +0100
+@@ -2648,7 +2648,6 @@
+     return (0);
+ }
+ 
+-
+ /* Search table of column headings for first with string (case-independent) */
+ 
+ static int
+diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c
+--- wcstools-3.7.0/libwcs/tmcread.c	2007-01-10 19:09:43.000000000 +0100
++++ wcstools-3.7.0.new/libwcs/tmcread.c	2007-09-07 21:38:33.000000000 +0200
+@@ -105,7 +105,7 @@
+     double eqref=2000.0;	/* Catalog equinox */
+     double epref=2000.0;	/* Catalog epoch */
+     double size = 0.0;		/* Semi-major axis of extended source */
+-    struct StarCat *starcat;
++    struct StarCat *starcat = NULL;
+     struct Star *star;
+     int verbose;
+     int wrap;
 @@ -529,7 +529,7 @@
      int sysref=WCS_J2000;	/* Catalog coordinate system */
      double eqref=2000.0;	/* Catalog equinox */
@@ -612,31 +878,36 @@
      struct Star *star;
      char *str;
  
-diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c
---- wcstools-3.6.8/libwcs/wcsinit.c	2007-03-13 22:46:18.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/wcsinit.c	2007-03-19 17:56:56.000000000 +0100
-@@ -1072,7 +1072,7 @@
- static void
- wcseq (hstring, wcs)
+diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c
+--- wcstools-3.7.0/libwcs/wcs.c	2007-07-25 20:54:55.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcs.c	2007-09-07 21:37:11.000000000 +0200
+@@ -1415,8 +1415,8 @@
+ double	x2,y2;	/* (RA,Dec) or (Long,Lat) in degrees */
  
--char	*hstring;	/* character string containing FITS header information
-+const char	*hstring;	/* character string containing FITS header information
- 		   	in the format <keyword>= <value> [/ <comment>] */
- struct WorldCoor *wcs;	/* World coordinate system data structure */
  {
-@@ -1086,7 +1086,7 @@
+-	double xr1, xr2, yr1, yr2, r, diffi;
+-	double pos1[3], pos2[3], w, diff, cosb;
++	double diffi, r;
++	double pos1[3], pos2[3], w, diff;
+ 	int i;
+ 
+ 	/* Convert two vectors to direction cosines */
+diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c
+--- wcstools-3.7.0/libwcs/wcsinit.c	2007-04-28 01:25:47.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/wcsinit.c	2007-09-07 21:18:43.000000000 +0200
+@@ -1082,7 +1082,7 @@
  static void
- wcseqm (hstring, wcs, mchar)
+ wcseq (hstring, wcs)
  
 -char	*hstring;	/* character string containing FITS header information
 +const char	*hstring;	/* character string containing FITS header information
  		   	in the format <keyword>= <value> [/ <comment>] */
  struct WorldCoor *wcs;	/* World coordinate system data structure */
- char	*mchar;		/* Suffix character for one of multiple WCS */
-diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c
---- wcstools-3.6.8/libwcs/webread.c	2007-03-13 16:53:08.000000000 +0100
-+++ wcstools-3.6.8.new/libwcs/webread.c	2007-03-19 18:21:16.000000000 +0100
-@@ -248,7 +248,7 @@
+ {
+diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c
+--- wcstools-3.7.0/libwcs/webread.c	2007-08-28 17:27:19.000000000 +0200
++++ wcstools-3.7.0.new/libwcs/webread.c	2007-09-07 21:38:10.000000000 +0200
+@@ -252,7 +252,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -645,7 +916,7 @@
  	exit (0);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -378,7 +378,7 @@
  
      /* Dump returned file and stop */
      if (nlog < 0) {
@@ -654,7 +925,7 @@
  	exit (0);
  	}
  
-@@ -572,7 +572,7 @@
+@@ -612,7 +612,7 @@
      fflush(sok);
      free (server);
  
@@ -663,27 +934,45 @@
  
      /* Skip continue lines
      if (status == 100) {
-@@ -606,7 +606,7 @@
- 	lline = 1;
+@@ -647,7 +647,7 @@
  	*lbuff = 0;
+ 	ltbuff = 0;
  	while (lline > 0) {
 -	    (void) fgets (linebuff, LINE, sok);
 +	    fgets (linebuff, LINE, sok);
  	    lline = strlen (linebuff);
  	    if (lline < 1)
  		break;
-@@ -642,7 +642,7 @@
- 		else {
- 		    buff = tabbuff + lcbuff;
- 		    }
--        	(void) fread (buff, 1, lchunk, sok);
-+        	fread (buff, 1, lchunk, sok);
- 		buff[lchunk] = (char) 0;
- 		if (diag)
- 		    fprintf (stderr, "%s\n", buff);
-diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c
---- wcstools-3.6.8/scat.c	2007-03-13 17:47:10.000000000 +0100
-+++ wcstools-3.6.8.new/scat.c	2007-03-19 18:08:13.000000000 +0100
+@@ -689,7 +689,7 @@
+ 	    else {
+ 		buff = tabbuff + lcbuff;
+ 		}
+-            (void) fread (buff, 1, lchunk, sok);
++            fread (buff, 1, lchunk, sok);
+ 	    buff[lchunk] = (char) 0;
+ 	    if (diag)
+ 		fprintf (stderr, "%s\n", buff);
+@@ -730,7 +730,7 @@
+ 		fprintf (stderr, "%s\n", buff);
+ 	    }
+ 	}
+-    (void) fclose (sok);
++    fclose (sok);
+ 
+     return (tabbuff);
+ }
+@@ -864,7 +864,7 @@
+ space2tab (tabbuff)
+     char *tabbuff;	/* Tab table filled with spaces */
+ {
+-    char *newbuff, *line0, *line1, *ic, *icn, *tstart;
++    char *newbuff, *line0, *line1, *ic, *icn;
+     char cspace, ctab, cdash;
+     int lbuff;
+     int alltab = 0;
+diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c
+--- wcstools-3.7.0/scat.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/scat.c	2007-09-07 21:31:23.000000000 +0200
 @@ -1101,7 +1101,7 @@
      double crao, cdeco;	/* Output center long/lat or RA/Dec in degrees */
      double epout = 0.0;
@@ -702,9 +991,18 @@
      int imag, nmagr;
      int sysout = 0;
      char sortletter = (char) 0;
-diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c
---- wcstools-3.6.8/setpix.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/setpix.c	2007-03-19 18:09:13.000000000 +0100
+@@ -2366,7 +2366,7 @@
+ 			    printf ("	%5.2f	%5.2f	%5.2f	%5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			else
+-			    printf (" %5.2f %5.2f %5.2f %5.2f",
++			    printf (" %5.2f %5.2f %5.2f %5.2f %5.2f",
+ 				    gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]);
+ 			}
+ 		    else if (refcat == HIP) {
+diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c
+--- wcstools-3.7.0/setpix.c	2007-08-30 23:47:03.000000000 +0200
++++ wcstools-3.7.0.new/setpix.c	2007-09-07 21:22:50.000000000 +0200
 @@ -258,9 +258,9 @@
      int lhead;			/* Maximum number of bytes in FITS header */
      int nbhead;			/* Actual number of bytes in FITS header */
@@ -717,15 +1015,51 @@
      char *imext, *imext1;
      double bzero;		/* Zero point for pixel scaling */
      double bscale;		/* Scale factor for pixel scaling */
-diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c
---- wcstools-3.6.8/wcshead.c	2007-03-13 16:05:41.000000000 +0100
-+++ wcstools-3.6.8.new/wcshead.c	2007-03-19 18:09:34.000000000 +0100
+diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c
+--- wcstools-3.7.0/wcshead.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/wcshead.c	2007-09-07 21:23:35.000000000 +0200
 @@ -211,7 +211,7 @@
      char *GetFITShead();
      char rastr[32], decstr[32], fform[8];
      struct WorldCoor *wcs, *GetWCSFITS();
 -    double wfrst, dwl, wlast, dxpix, zvel, vel;
-+    double wfrst, dwl, wlast, dxpix, zvel = 0., vel;
++    double wfrst, dwl, wlast, dxpix, zvel = 0, vel;
      int logwav = 0;
  
      if (rootdir){
+diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c
+--- wcstools-3.7.0/xy2sky.c	2007-08-30 23:47:04.000000000 +0200
++++ wcstools-3.7.0.new/xy2sky.c	2007-09-07 21:32:39.000000000 +0200
+@@ -46,9 +46,9 @@
+ static int ncm = 0;
+ static int printhead = 0;
+ static char printonly = 'n';
+-static int centerset = 0;
++/*static int centerset = 0;
+ static int sizeset = 0;
+-static int scaleset = 0;
++static int scaleset = 0;*/
+ static int version = 0;		/* If 1, print only program name and version */
+ 
+ static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink at cfa.harvard.edu)";
+@@ -70,9 +70,9 @@
+     int entmag = 0;
+     int i, ic;
+     double x, y, mag;
+-    double cra, cdec, dra, ddec, secpix, drot;
++    double cra, cdec, dra, ddec, secpix;/*, drot;*/
+     double eqout = 0.0;
+-    double eqin = 0.0;
++    /*double eqin = 0.0;*/
+     int sysout = 0;
+     int wp, hp, nx, ny, lhead;
+     FILE *fd = NULL;
+@@ -82,7 +82,7 @@
+     char *header;
+     char *fn;
+     int bitpix = 0;
+-    struct WorldCoor *wcs;
++    struct WorldCoor *wcs = NULL;
+     char xstr[32], ystr[32], mstr[32];
+     char rastr[32], decstr[32];
+     char keyword[16];

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/FC-6/wcstools3-shared.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools3-shared.patch	19 Mar 2007 18:20:36 -0000	1.3
+++ wcstools3-shared.patch	7 Sep 2007 20:24:05 -0000	1.4
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcs.so
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:26:44 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 7 Sep 2007 16:26:44 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.51,1.52
Message-ID: <200709072026.l87KQiwB025957@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25907

Modified Files:
	policy-20070703.patch 
Log Message:
* Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
- Turn off direct transition


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- policy-20070703.patch	7 Sep 2007 20:10:07 -0000	1.51
+++ policy-20070703.patch	7 Sep 2007 20:26:11 -0000	1.52
@@ -9334,7 +9334,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 15:02:10.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 16:19:01.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9370,14 +9370,14 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -189,6 +200,7 @@
+@@ -185,6 +196,7 @@
+ corenet_udp_sendrecv_all_ports(xdm_t)
+ corenet_tcp_bind_all_nodes(xdm_t)
+ corenet_udp_bind_all_nodes(xdm_t)
++corenet_udp_bind_xdmcp_port(xdm_t)
+ corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
- corenet_dontaudit_tcp_bind_all_ports(xdm_t)
-+corenet_udp_bind_xdmcp_ports(xdm_t)
- 
- dev_read_rand(xdm_t)
- dev_read_sysfs(xdm_t)
 @@ -246,6 +258,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)



From fedora-extras-commits at redhat.com  Fri Sep  7 20:30:53 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 7 Sep 2007 16:30:53 -0400
Subject: rpms/maven2/devel maven2-ant17.patch,NONE,1.1 maven2.spec,1.4,1.5
Message-ID: <200709072030.l87KUrKx026211@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26178

Modified Files:
	maven2.spec 
Added Files:
	maven2-ant17.patch 
Log Message:

- Exclude ppc64 build
- Add patch to build with ant 1.7
- Build with bootstrap (First build on F8/ppc)



maven2-ant17.patch:

--- NEW FILE maven2-ant17.patch ---
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java.sav	2007-08-29 17:02:14.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java	2007-08-29 17:02:20.000000000 -0400
@@ -29,7 +29,7 @@ public class LocalRepository
 {
     private File location;
 
-    public File getLocation()
+    public File getFileLocation()
     {
         return ( (LocalRepository) getInstance() ).location;
     }
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java.sav	2007-08-29 17:02:44.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java	2007-08-29 17:02:59.000000000 -0400
@@ -188,7 +188,7 @@ public class DependenciesTask
         }
 
         FileList fileList = new FileList();
-        fileList.setDir( getLocalRepository().getLocation() );
+        fileList.setDir( getLocalRepository().getFileLocation() );
 
         FileSet fileSet = new FileSet();
         fileSet.setDir( fileList.getDir( getProject() ) );
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java.sav	2007-08-29 17:03:09.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java	2007-08-29 17:03:19.000000000 -0400
@@ -78,7 +78,7 @@ public abstract class AbstractArtifactTa
         ArtifactRepositoryLayout repositoryLayout =
             (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, localRepository.getLayout() );
 
-        return new DefaultArtifactRepository( "local", "file://" + localRepository.getLocation(), repositoryLayout );
+        return new DefaultArtifactRepository( "local", "file://" + localRepository.getFileLocation(), repositoryLayout );
     }
 
     protected ArtifactRepository createRemoteArtifactRepository( RemoteRepository repository )


Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven2.spec	20 Mar 2007 06:58:29 -0000	1.4
+++ maven2.spec	7 Sep 2007 20:30:20 -0000	1.5
@@ -34,6 +34,7 @@
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 %define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
+%define _with_bootstrap 1
 %define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
 %define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
 
@@ -107,6 +108,7 @@
 Patch6:          %{name}-enable-unbuilt-modules.patch
 Patch7:          %{name}-fastjar-manifest-fix.patch
 Patch8:          %{name}-noexternaljavadoclinks.patch 
+Patch9:          %{name}-ant17.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
@@ -273,6 +275,7 @@
 BuildRequires:       java-gcj-compat-devel
 Requires(post):      java-gcj-compat
 Requires(postun):    java-gcj-compat
+ExcludeArch:         ppc64
 %endif
 
 %description
@@ -920,6 +923,7 @@
 %patch6 -b .sav
 %patch7 -b .sav
 %patch8 -b .sav
+%patch9 -b .sav
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
@@ -2291,6 +2295,11 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
+- Exclude ppc64 build
+- Add patch to build with ant 1.7
+- Build with bootstrap (First build on F8/ppc)
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.6
 - Build without bootstrap
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:03:24 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 7 Sep 2007 17:03:24 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.44, 1.45 sources, 1.45,
	1.46 sugar.spec, 1.53, 1.54
Message-ID: <200709072103.l87L3OPM002240@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2218

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Sep 2007 19:55:37 -0000	1.44
+++ .cvsignore	7 Sep 2007 21:02:50 -0000	1.45
@@ -1 +1 @@
-sugar-0.65-gitd9a30c23ff.tar.bz2
+sugar-0.65-gitc8700feccf.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	6 Sep 2007 19:55:37 -0000	1.45
+++ sources	7 Sep 2007 21:02:50 -0000	1.46
@@ -1 +1 @@
-b363c82dcf6fcb7f2c64c71d8d739332  sugar-0.65-gitd9a30c23ff.tar.bz2
+c3ccf0f431a100fa6abe3cb44a81f07f  sugar-0.65-gitc8700feccf.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sugar.spec	6 Sep 2007 19:55:37 -0000	1.53
+++ sugar.spec	7 Sep 2007 21:02:50 -0000	1.54
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070906git
-%define commitid d9a30c23ff
+%define alphatag 20070907git
+%define commitid c8700feccf
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.41.%{alphatag}d9a30c23ff
+Release: 0.42.%{alphatag}c8700feccf
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
+- New snapshot
+
 * Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.41.20070906gitd9a30c23ff
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:33 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Fri, 7 Sep 2007 17:21:33 -0400
Subject: rpms/tesseract/F-7 tesseract-2.01-upstream_patch1.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tesseract.spec, 1.2, 1.3
Message-ID: <200709072121.l87LLXsJ004784@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4495/tesseract/F-7

Modified Files:
	.cvsignore sources tesseract.spec 
Added Files:
	tesseract-2.01-upstream_patch1.patch 
Log Message:
Upgrade to v2.01


tesseract-2.01-upstream_patch1.patch:

--- NEW FILE tesseract-2.01-upstream_patch1.patch ---
+++ training/unicharset_extractor.cpp	2007-08-28 03:59:07.000000000 +0200
--- training/unicharset_extractor.cpp	2007-08-31 00:11:09.000000000 +0200
@@ -72,7 +72,7 @@
       unicharset->set_isalpha(id, 1);
       if (iswlower(wc))
         unicharset->set_islower(id, 1);
-      if (iswlower(wc))
+      if (iswupper(wc))
         unicharset->set_isupper(id, 1);
     }
     if (iswdigit(wc))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Aug 2007 14:34:25 -0000	1.3
+++ .cvsignore	7 Sep 2007 21:21:00 -0000	1.4
@@ -1,2 +1,2 @@
+tesseract-2.01.tar.gz
 tesseract-2.00.eng.tar.gz
-tesseract-2.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Aug 2007 14:34:25 -0000	1.3
+++ sources	7 Sep 2007 21:21:00 -0000	1.4
@@ -1,2 +1,2 @@
+fb0e6e7652b985049c11a4bc8e593885  tesseract-2.01.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz
-6d68d940ed15c61300cb04019c30f46c  tesseract-2.00.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-7/tesseract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tesseract.spec	24 Aug 2007 14:34:25 -0000	1.2
+++ tesseract.spec	7 Sep 2007 21:21:00 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		tesseract
-Version:	2.00
+Version:	2.01
 Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
@@ -7,7 +7,8 @@
 License:	ASL 2.0
 URL:		http://code.google.com/p/tesseract-ocr/
 Source0:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.eng.tar.gz
+Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-2.00.eng.tar.gz
+Patch0:		tesseract-2.01-upstream_patch1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtiff-devel
 
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -a 1
+%patch0
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
@@ -52,7 +54,6 @@
 %{_bindir}/unicharset_extractor
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
-%{_datadir}/%{name}/tessdata/eng*
 
 %doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
 
@@ -61,6 +62,8 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Karol Trzcionka <karlikt at gmail.com> - 2.01-1
+- Upgrade to v2.01
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
 - Upgrade to v2.00
 * Thu Mar 22 2007 Karol Trzcionka <karlikt at gmail.com> - 1.04-1



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:35 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Fri, 7 Sep 2007 17:21:35 -0400
Subject: rpms/tesseract/devel tesseract-2.01-upstream_patch1.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tesseract.spec, 1.2, 1.3
Message-ID: <200709072121.l87LLZRZ004797@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4495/tesseract/devel

Modified Files:
	.cvsignore sources tesseract.spec 
Added Files:
	tesseract-2.01-upstream_patch1.patch 
Log Message:
Upgrade to v2.01


tesseract-2.01-upstream_patch1.patch:

--- NEW FILE tesseract-2.01-upstream_patch1.patch ---
+++ training/unicharset_extractor.cpp	2007-08-28 03:59:07.000000000 +0200
--- training/unicharset_extractor.cpp	2007-08-31 00:11:09.000000000 +0200
@@ -72,7 +72,7 @@
       unicharset->set_isalpha(id, 1);
       if (iswlower(wc))
         unicharset->set_islower(id, 1);
-      if (iswlower(wc))
+      if (iswupper(wc))
         unicharset->set_isupper(id, 1);
     }
     if (iswdigit(wc))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Aug 2007 14:34:28 -0000	1.3
+++ .cvsignore	7 Sep 2007 21:21:03 -0000	1.4
@@ -1,2 +1,2 @@
+tesseract-2.01.tar.gz
 tesseract-2.00.eng.tar.gz
-tesseract-2.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Aug 2007 14:34:28 -0000	1.3
+++ sources	7 Sep 2007 21:21:03 -0000	1.4
@@ -1,2 +1,2 @@
+fb0e6e7652b985049c11a4bc8e593885  tesseract-2.01.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz
-6d68d940ed15c61300cb04019c30f46c  tesseract-2.00.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/tesseract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tesseract.spec	24 Aug 2007 14:34:28 -0000	1.2
+++ tesseract.spec	7 Sep 2007 21:21:03 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		tesseract
-Version:	2.00
+Version:	2.01
 Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
@@ -7,7 +7,8 @@
 License:	ASL 2.0
 URL:		http://code.google.com/p/tesseract-ocr/
 Source0:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.eng.tar.gz
+Source1:	http://tesseract-ocr.googlecode.com/files/%{name}-2.00.eng.tar.gz
+Patch0:		tesseract-2.01-upstream_patch1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtiff-devel
 
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -a 1
+%patch0
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
@@ -52,7 +54,6 @@
 %{_bindir}/unicharset_extractor
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
-%{_datadir}/%{name}/tessdata/eng*
 
 %doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
 
@@ -61,6 +62,8 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Sep 07 2007 Karol Trzcionka <karlikt at gmail.com> - 2.01-1
+- Upgrade to v2.01
 * Tue Aug 21 2007 Karol Trzcionka <karlikt at gmail.com> - 2.00-1
 - Upgrade to v2.00
 * Thu Mar 22 2007 Karol Trzcionka <karlikt at gmail.com> - 1.04-1



From fedora-extras-commits at redhat.com  Fri Sep  7 21:21:52 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 17:21:52 -0400
Subject: rpms/balsa/devel .cvsignore, 1.21, 1.22 balsa.spec, 1.32,
	1.33 sources, 1.21, 1.22
Message-ID: <200709072121.l87LLq3g004845@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4707

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
update to upstream 2.3.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	25 Aug 2007 20:48:39 -0000	1.21
+++ .cvsignore	7 Sep 2007 21:21:20 -0000	1.22
@@ -1 +1 @@
-balsa-2.3.19.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- balsa.spec	25 Aug 2007 20:48:39 -0000	1.32
+++ balsa.spec	7 Sep 2007 21:21:20 -0000	1.33
@@ -1,7 +1,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.19
+Version:        2.3.20
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20.
+
 * Sat Aug 25 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.19-1
 - Update to upstream 2.3.19.
 
@@ -133,68 +136,3 @@
 * Mon Sep 11 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.13-2
 - rebuild for FC6.
 
-* Mon Jun 26 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.13-1
-- update to upstream version 2.3.13.
-
-* Tue Jun  6 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.12-2
-- add gettext as an explicit buildreq (#194245).
-
-* Sat Mar  4 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.12-1
-- update to upstream version 2.3.12.
-
-* Wed Mar  1 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.11-1
-- update to upstream version 2.3.11.
-
-* Sun Jan 29 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.10-1
-- update to upstream 2.3.10
-
-* Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
-- update to 2.3.9.
-
-* Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
-- update to 2.3.8; enable gtkhtml and gtkspell.
-
-* Sun Dec  4 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.7-1
-- update to upstream version 2.3.7. Use gmime-2.1.17
-
-* Wed Oct 23 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.6-1
-- update to upstream version 2.3.6
-
-* Wed Oct 19 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.5
-- update to upstream version 2.3.5
-
-* Tue Jul  5 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.4
-- update to upstream version 2.3.4
-
-* Tue Jun 14 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- directory ownership cleanup (credit to Michael Schwendt).
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- add missing scrollkeeper dependency.
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- libesmtp imported to fedora extras - reenable.
-
-* Sat Jun 11 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- Implement the reviewers's suggestions as on fedora-extras-list
-
-* Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3-1
-- bump version to 2.3.3
-- add libesmtp-devel dependency.
-- do not forget about config_opts.
-
-* Fri May 20 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.2-1
-- adapt to Fedora Extras template.
-
-
-* Sat Jul 26 2003 Misu Moldovan <dumol at go.ro>
-- further split the Red Hat and Mandrake sections
-- fix Mandrake 9.x dependencies
-
-* Mon Sep 16 2002 Pawel Salek <pawsa at theochem.kth.se>
-- adapt to GNOME2 requirements.
-
-* Sun Jun 24 2001 Spider <spider at darkmere.wanfear.com>
-- remove all defined paths to user-specified. 
-- update configures, locales, update esmtp as a requires/buildrequires 
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	25 Aug 2007 20:48:39 -0000	1.21
+++ sources	7 Sep 2007 21:21:20 -0000	1.22
@@ -1 +1 @@
-e6f7d9508dc901aea7470e4d9431e066  balsa-2.3.19.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 21:35:55 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 7 Sep 2007 17:35:55 -0400
Subject: rpms/libupnp/devel open.patch,NONE,1.1 libupnp.spec,1.14,1.15
Message-ID: <200709072135.l87LZtrS009338@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9191

Modified Files:
	libupnp.spec 
Added Files:
	open.patch 
Log Message:


open.patch:

--- NEW FILE open.patch ---
diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c libupnp-1.6.0/upnp/src/genlib/net/http-new/httpreadwrite.c
--- libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c	2007-05-23 15:18:08.000000000 +0200
+++ libupnp-1.6.0/upnp/src/genlib/net/http/httpreadwrite.c	2007-09-01 16:18:33.000000000 +0200
@@ -349,7 +349,7 @@
             filename = ( char * )va_arg( argp, char * );
 
             if( Instr && Instr->IsVirtualFile )
-                Fp = virtualDirCallback.open( filename, UPNP_READ );
+                Fp = (virtualDirCallback.open)( filename, UPNP_READ );
             else
                 Fp = fopen( filename, "rb" );
 
diff -Naur libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c libupnp-1.6.0/upnp/src/genlib/net/http-new/webserver.c
--- libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c	2007-05-23 15:18:08.000000000 +0200
+++ libupnp-1.6.0/upnp/src/genlib/net/http/webserver.c	2007-09-01 16:18:33.000000000 +0200
@@ -1531,7 +1531,7 @@
 
     if( Instr && Instr->IsVirtualFile ) {
 
-        Fp = virtualDirCallback.open( filename, UPNP_WRITE );
+        Fp = (virtualDirCallback.open)( filename, UPNP_WRITE );
         if( Fp == NULL ) {
             return HTTP_INTERNAL_SERVER_ERROR;
         }


Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libupnp.spec	29 Aug 2007 05:57:22 -0000	1.14
+++ libupnp.spec	7 Sep 2007 21:35:23 -0000	1.15
@@ -1,11 +1,12 @@
 Version: 1.6.0
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.libupnp.org/
 Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2
+Patch0: open.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define docdeveldir %{_docdir}/%{name}-devel-%{version}
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-documentation
@@ -78,6 +80,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Sep 07 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.6.0-3
+- Patch to build with new glibc
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.6.0-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep  7 21:44:54 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 17:44:54 -0400
Subject: rpms/balsa/FC-6 .cvsignore, 1.17, 1.18 balsa.spec, 1.24,
	1.25 sources, 1.17, 1.18
Message-ID: <200709072144.l87LisVK010846@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10729

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.20, fix #474366.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Jul 2007 19:34:34 -0000	1.17
+++ .cvsignore	7 Sep 2007 21:44:22 -0000	1.18
@@ -1 +1 @@
-balsa-2.3.17.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/balsa.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- balsa.spec	4 Jul 2007 19:34:34 -0000	1.24
+++ balsa.spec	7 Sep 2007 21:44:22 -0000	1.25
@@ -1,7 +1,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.17
+Version:        2.3.20
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20, fix #474366.
+
 * Wed Jul  4 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.17-1
 - update to upstream 2.3.17.
 
@@ -135,50 +138,3 @@
 * Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
 - update to 2.3.9.
 
-* Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
-- update to 2.3.8; enable gtkhtml and gtkspell.
-
-* Sun Dec  4 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.7-1
-- update to upstream version 2.3.7. Use gmime-2.1.17
-
-* Wed Oct 23 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.6-1
-- update to upstream version 2.3.6
-
-* Wed Oct 19 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.5
-- update to upstream version 2.3.5
-
-* Tue Jul  5 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.4
-- update to upstream version 2.3.4
-
-* Tue Jun 14 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- directory ownership cleanup (credit to Michael Schwendt).
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- add missing scrollkeeper dependency.
-
-* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- libesmtp imported to fedora extras - reenable.
-
-* Sat Jun 11 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
-- Implement the reviewers's suggestions as on fedora-extras-list
-
-* Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3-1
-- bump version to 2.3.3
-- add libesmtp-devel dependency.
-- do not forget about config_opts.
-
-* Fri May 20 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.2-1
-- adapt to Fedora Extras template.
-
-
-* Sat Jul 26 2003 Misu Moldovan <dumol at go.ro>
-- further split the Red Hat and Mandrake sections
-- fix Mandrake 9.x dependencies
-
-* Mon Sep 16 2002 Pawel Salek <pawsa at theochem.kth.se>
-- adapt to GNOME2 requirements.
-
-* Sun Jun 24 2001 Spider <spider at darkmere.wanfear.com>
-- remove all defined paths to user-specified. 
-- update configures, locales, update esmtp as a requires/buildrequires 
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Jul 2007 19:34:34 -0000	1.17
+++ sources	7 Sep 2007 21:44:22 -0000	1.18
@@ -1 +1 @@
-0e29e5be9287bf921b68e624c07b1dd2  balsa-2.3.17.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:33 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:33 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrXcL025941@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:33 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:33 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrYx6025950@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:34 -0700
Subject: [pkgdb] gnupg had acl change status
Message-ID: <200709072153.l87LrYFt016065@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on gnupg (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnupg



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:51 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:51 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87LrpaN025959@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:52 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:52 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87Lrqwd016076@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 21:53:53 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:53:53 -0700
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <200709072153.l87LrsKB025969@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgpg-error (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgpg-error



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:12 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:12 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsCFX016091@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchbugzilla acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:14 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:14 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsEj6025982@app4.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the watchcommits acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 21:54:15 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Fri, 07 Sep 2007 14:54:15 -0700
Subject: [pkgdb] libgcrypt had acl change status
Message-ID: <200709072154.l87LsFbX016103@app3.fedora.phx.redhat.com>

Nalin Somabhai Dahyabhai (nalin) has set the commit acl on libgcrypt (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgcrypt



From fedora-extras-commits at redhat.com  Fri Sep  7 22:12:45 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Fri, 7 Sep 2007 18:12:45 -0400
Subject: rpms/varnish/F-7 varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3,
	1.4
Message-ID: <200709072212.l87MCj6K020671@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618

Modified Files:
	varnish.spec 
Added Files:
	varnish-cs1913.patch 
Log Message:
* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
- Added a patch, changeset 1913 from svn trunk. This makes varnish
  more stable under specific loads. 



varnish-cs1913.patch:

--- NEW FILE varnish-cs1913.patch ---
Index: bin/varnishd/cache_center.c
===================================================================
--- bin/varnishd/cache_center.c	(revision 1912)
+++ bin/varnishd/cache_center.c	(revision 1913)
@@ -524,7 +524,12 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varnish.spec	6 Sep 2007 20:23:42 -0000	1.3
+++ varnish.spec	7 Sep 2007 22:12:12 -0000	1.4
@@ -1,11 +1,12 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Patch0: varnish-cs1913.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
@@ -48,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -165,6 +168,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
+- Added a patch, changeset 1913 from svn trunk. This makes varnish
+  more stable under specific loads. 
+
 * Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
 - Removed autogen call (only diff from relase tarball)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 22:14:21 2007
From: fedora-extras-commits at redhat.com (Ingvar Hagelund (ingvar))
Date: Fri, 7 Sep 2007 18:14:21 -0400
Subject: rpms/varnish/devel varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3,
	1.4
Message-ID: <200709072214.l87MELGU020825@cvs-int.fedora.redhat.com>

Author: ingvar

Update of /cvs/extras/rpms/varnish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20719

Modified Files:
	varnish.spec 
Added Files:
	varnish-cs1913.patch 
Log Message:
* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
- Added a patch, changeset 1913 from svn trunk. This makes varnish
  more stable under specific loads. 



varnish-cs1913.patch:

--- NEW FILE varnish-cs1913.patch ---
Index: bin/varnishd/cache_center.c
===================================================================
--- bin/varnishd/cache_center.c	(revision 1912)
+++ bin/varnishd/cache_center.c	(revision 1913)
@@ -524,7 +524,12 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}


Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varnish.spec	6 Sep 2007 20:28:35 -0000	1.3
+++ varnish.spec	7 Sep 2007 22:13:48 -0000	1.4
@@ -1,11 +1,12 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Patch0: varnish-cs1913.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel 
 Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release}
@@ -48,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -165,6 +168,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
+- Added a patch, changeset 1913 from svn trunk. This makes varnish
+  more stable under specific loads. 
+
 * Tue Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
 - Removed autogen call (only diff from relase tarball)
 



From fedora-extras-commits at redhat.com  Fri Sep  7 22:14:49 2007
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri, 7 Sep 2007 18:14:49 -0400
Subject: rpms/balsa/F-7 .cvsignore, 1.19, 1.20 balsa.spec, 1.28, 1.29 sources,
	1.19, 1.20
Message-ID: <200709072214.l87MEnw7020850@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20782

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.20, fix #474366.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Aug 2007 08:27:28 -0000	1.19
+++ .cvsignore	7 Sep 2007 22:14:17 -0000	1.20
@@ -1 +1 @@
-balsa-2.3.17.tar.bz2
+balsa-2.3.20.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/balsa.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- balsa.spec	4 Aug 2007 08:27:28 -0000	1.28
+++ balsa.spec	7 Sep 2007 22:14:17 -0000	1.29
@@ -1,8 +1,8 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.17
-Release:        2%{?dist}
+Version:        2.3.20
+Release:        1%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20, fix #474366.
+
 * Sat Aug  4 2007 Pawel Salek <pawsa at theochem.kth.se> - 2.3.17-2
 - fix build problem.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	4 Aug 2007 08:27:28 -0000	1.19
+++ sources	7 Sep 2007 22:14:17 -0000	1.20
@@ -1 +1 @@
-0e29e5be9287bf921b68e624c07b1dd2  balsa-2.3.17.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:26 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:26 -0400
Subject: rpms/netpanzer-data/F-7 dead.package,NONE,1.1
Message-ID: <200709072242.l87MgQPG022256@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/F-7

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:29 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:29 -0400
Subject: rpms/netpanzer-data/FC-6 dead.package,NONE,1.1
Message-ID: <200709072242.l87MgTaU022274@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/FC-6

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:42:32 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:42:32 -0400
Subject: rpms/netpanzer-data/devel dead.package,NONE,1.1
Message-ID: <200709072242.l87MgWMG022292@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22227/devel

Added Files:
	dead.package 
Log Message:
EOL netpanzer-data due to upstream merge into netpanzer as of 0.8.2.



--- NEW FILE dead.package ---
Merged into netpanzer as of version 0.8.2, to follow upstream.



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:16 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:16 -0400
Subject: rpms/netpanzer-data/F-7 Makefile, 1.1, NONE branch, 1.1,
	NONE netpanzer-data.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnGRx022696@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/F-7

Removed Files:
	Makefile branch netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- branch DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:19 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:19 -0400
Subject: rpms/netpanzer-data/FC-6 Makefile, 1.1, NONE branch, 1.1,
	NONE netpanzer-data.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnJVf022711@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/FC-6

Removed Files:
	Makefile branch netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- branch DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 22:49:22 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 7 Sep 2007 18:49:22 -0400
Subject: rpms/netpanzer-data/devel Makefile, 1.1, NONE netpanzer-data.spec,
	1.7, NONE sources, 1.2, NONE
Message-ID: <200709072249.l87MnMP9022728@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685/devel

Removed Files:
	Makefile netpanzer-data.spec sources 
Log Message:
Dropping old files.



--- Makefile DELETED ---


--- netpanzer-data.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep  7 23:05:47 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:05:47 -0400
Subject: rpms/libflaim/devel libflaim-permissions.patch, NONE,
	1.1 libflaim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709072305.l87N5lr9029660@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29580/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libflaim-permissions.patch libflaim.spec 
Log Message:


libflaim-permissions.patch:

--- NEW FILE libflaim-permissions.patch ---
--- libflaim-4.9.1046/Makefile	2007-03-29 15:09:57.000000000 +0100
+++ Makefile	2007-09-06 14:57:19.000000000 +0100
@@ -1888,7 +1888,7 @@
 	$(ec)$(gprintf) "Installing ...\n"
 	mkdir -p $(lib_install_dir)/pkgconfig
 	mkdir -p $(include_install_dir)
-	install --mode=644 $(flaim_shared_lib) $(lib_install_dir)
+	install --mode=755 $(flaim_shared_lib) $(lib_install_dir)
 	install --mode=644 $(flaim_static_lib) $(lib_install_dir)
 	install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
 	install --mode=644 src/flaim.h $(include_install_dir)


--- NEW FILE libflaim.spec ---
#
# spec file for package libflaim (Version 4.9.1046)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugzilla.redhat.com/
#

Name:		libflaim
BuildRequires:	libstdc++ 
BuildRequires:	libstdc++-devel
BuildRequires:	ncurses-devel
Summary:	Embeddable cross-platform database engine
URL:		http://forge.novell.com/modules/xfmod/project/?flaim
Version:	4.9.989
Release:	10%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
Patch0:		%{name}-permissions.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust. It is available on a wide variety of 32 bit and 64 bit
platforms.

%package devel
Summary:	Embeddable cross-platform database engine
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust.

%prep
%setup -q
%patch -p1

%build
make CXXFLAGS="$RPM_OPT_FLAGS" lib_dir_name=%{_lib} libs

%install
rm -rf $RPM_BUILD_ROOT
make rpm_build_root=$RPM_BUILD_ROOT lib_dir_name=%{_lib} install

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT VERSION
%exclude %{_libdir}/libflaim.a
%{_libdir}/libflaim.so.*

%files devel
%defattr(-,root,root)
%{_libdir}/libflaim.so
%{_libdir}/pkgconfig/libflaim.pc
%{_includedir}/flaim.h
%{_includedir}/flaimtk.h

%changelog
* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
- downgrade from svn checkout to official release

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn
- patch for install permissions

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10
- update buildroot and other changes for bugzilla review #251020

* Thu Aug 30 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.2
- add pkgconfig requires
- exclude static libs

* Thu Aug  2 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.1
- minor changes for Fedora build
- updated bug url
- added post and postun ldconfig call

* Thu Mar 29 2007 dsanders at novell.com
- Fixed problem of accessing FlmRecord object before it was constructed.

* Thu Mar 29 2007 aj at suse.de
- Add BuildRequires for ncurses-devel.

* Sat Feb 10 2007 aj at suse.de
- Add defattr.

* Thu Feb  8 2007 dsanders at novell.com
- Changes to support Ubuntu packages, including 64-bit.
- Needed to lock the record cache mutex in FlmRecord::Release just before deleting the object to prevent a race condition.
- Changed license to LGPL.
- Updated copyright.
- Added pragmas for windows to remove compiler warnings for VC6 compiler.
- Fixed keyword substitution tokens.
- Added FlmReadFully() and enhanced the base64 decoder.
- Removed commands in makefile that was outputting provides to the spec file.

* Thu Feb  1 2007 ro at suse.de
- remove self-provides from devel package

* Thu Nov 16 2006 dsanders at novell.com
- Removed .exe files from package.
- Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures.
- Getting rid of references to gv_FlmSysData.
- Needed to add a (FLMUINT) cast to a FLMBOOL before it can be cast as a void *.
- Fixed mis-typed member of OPT_INFO structure.
- Fixed Linux compiler warnings.
- Changed several places that needed to access pDbInfo->pProgress instead of just Progress.
- Support for Ubuntu and Debian packages

* Fri Sep 29 2006 aj at suse.de
- Remove explicit self-provides

* Fri Sep  8 2006 dsanders at novell.com
- Added support for 64 bit numbers.
- Modified to use aligned buffers to improve direct I/O efficiency.
- Modified block cache allocator to make more efficient use of memory.
- Added option to allow disabling of direct I/O on Linux and Unix platforms.
- Enhancements to reduce the overhead of growing and shrinking files.
- Modified async I/O to make better reuse of available buffers when writes complete out of order.
- Fixed some memory leaks and other minor defects.
- Added more asserts to debug code.
- Enhancements and improvements to the field ID table inside of FlmRecord object.
- Updated doxygen document to be more accurate.
- Added a gigatest utility for testing bulk loads.
- Added more unit tests.
- Various tweaks for better support of various platforms and compilers.

* Tue Jun 27 2006 dsanders at novell.com
- Needed to make some typedefs public for Solaris 8.
- Also fixed so that flaimtk.h is copied from ftk.h when building srcdist

* Thu Jun 22 2006 ro at suse.de
- removed buggy self-provides from devel package

* Thu Jun 22 2006 dsanders at novell.com
- Modified common toolkit formatter to support colors when logging.
- Modified to use common formatter in toolkit for logging.

* Tue Jun 20 2006 dsanders at novell.com
- Logger client was not being set up properly in common toolkit.
- Fixed a Netware build issue
- Fixed an OS X compiler warning
- Fixed linux compiler warning
- Needed to lock/unlock the random generator mutex when getting a random number.
- f_printf needed to call fflush.
- Base 64 decoder needed to return success instead of eof hit.

* Mon Jun 19 2006 dsanders at novell.com
- Restructured code to use new common toolkit
- Support for Netware, including unit tests
- Fixed various memory leaks and enabled memory tracking for debug builds.
- Made some changes for how async I/O is supported on Solaris.
- Fixed various compiler warnings on various platforms.
- Added more documentation.

* Thu Jun  1 2006 dsanders at novell.com
- Fixed compiler warnings for ia64 platform.

* Tue May 30 2006 dsanders at novell.com
- Added support for Sparc Linux and OpenSuse 10.1
- Various Makefile changes for HP-UX, OS X, and Solaris
- Various code cleanups to support a common toolkit
- Got rid of timeouts for internal transactions.
- Removed some unused methods from the FlmRecord class.
- Fixed defect where partial blocks were being written at the end of database files
- Fixed race condition that was causing memory to be double-freed.
- Added better support for atomic operations on various Unix and Linux platforms.
- Allow application to exceed hardcoded cache limits when setting a hard cache limit.
- Changed RCODE to be an enumerated type - for easier documentation in doxygen.
- Fixed various compiler issues for solaris platform
- Added support for large binary and text fields (up to 4 GB)
- Added async and direct I/O support for Linux and Solaris
- Added new field table for level one fields inside FlmRecords to speed up searches.
- Added support for Netware
- Fixed double mutex lock issue.
- Added support for building Windows binaries with Visual Studio 8.
- Modified slab manager on Solaris to use regular malloc calls instead of mmap.
* Tue Feb 28 2006 dsanders at novell.com
- Added support for Intel MAC and __sparc49 (64 bit) platforms
- Initialized variables to quiet compiler warnings
- Got rid of unneeded internal functions
- Various fixes for Windows - support for vc8 compiler, workaround to compiler issues with inline methods
- Fixedup copyright notice in one source file
* Mon Feb 13 2006 dsanders at novell.com
- Changed naming convention for shared library to conform to standard - should be no need for SONAME fix now.
- Added dbshell utility.
- Started adding support for using autotools.
- Fixed bug on FlmDbReduceSize - needed to quit when encountering a block in a not-yet-deleted b-tree
- Added various new unit tests.
- Fixed various compiler warnings.

* Mon Feb 13 2006 ro at suse.de
- install the SONAME at least as symlink (should be the real file)

* Wed Feb  8 2006 dsanders at novell.com
- Removed make.exe and printf.exe from package.
- Added support for Ubuntu and Debian
- Simplified how unit tests are created.
- Added some new unit tests

* Fri Feb  3 2006 dsanders at novell.com
- Fixed libflaim.pc to specify includedir and Cflags:
- Also changed name: to Name:
- Modified Makefile to use macros for outputting $ and %% characters

* Fri Feb  3 2006 dsanders at novell.com
- Added support for PowerPC architectures
- Changed so that revision number for RPMs will match version number
- in SVN repository.

* Wed Feb  1 2006 dsanders at novell.com
- Initial submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:32:57 -0000	1.1
+++ .cvsignore	7 Sep 2007 23:05:14 -0000	1.2
@@ -0,0 +1 @@
+libflaim-4.9.989.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:32:57 -0000	1.1
+++ sources	7 Sep 2007 23:05:14 -0000	1.2
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:21:24 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:21:24 -0400
Subject: rpms/libflaim/F-7 sources,1.1,1.2
Message-ID: <200709072321.l87NLOgL030595@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30532/libflaim/F-7

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:32:57 -0000	1.1
+++ sources	7 Sep 2007 23:20:51 -0000	1.2
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:36:43 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:36:43 -0400
Subject: rpms/libflaim/F-7 sources,1.2,1.3
Message-ID: <200709072336.l87NahZJ031341@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31294/F-7

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2007 23:20:51 -0000	1.2
+++ sources	7 Sep 2007 23:36:10 -0000	1.3
@@ -1 +0,0 @@
-cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep  7 23:50:38 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:50:38 -0400
Subject: rpms/libflaim/F-7 libflaim-permissions.patch, NONE,
	1.1 libflaim.spec, NONE, 1.1
Message-ID: <200709072350.l87NocW5032329@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32273

Added Files:
	libflaim-permissions.patch libflaim.spec 
Log Message:


libflaim-permissions.patch:

--- NEW FILE libflaim-permissions.patch ---
--- libflaim-4.9.1046/Makefile	2007-03-29 15:09:57.000000000 +0100
+++ Makefile	2007-09-06 14:57:19.000000000 +0100
@@ -1888,7 +1888,7 @@
 	$(ec)$(gprintf) "Installing ...\n"
 	mkdir -p $(lib_install_dir)/pkgconfig
 	mkdir -p $(include_install_dir)
-	install --mode=644 $(flaim_shared_lib) $(lib_install_dir)
+	install --mode=755 $(flaim_shared_lib) $(lib_install_dir)
 	install --mode=644 $(flaim_static_lib) $(lib_install_dir)
 	install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
 	install --mode=644 src/flaim.h $(include_install_dir)


--- NEW FILE libflaim.spec ---
#
# spec file for package libflaim (Version 4.9.1046)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugzilla.redhat.com/
#

Name:		libflaim
BuildRequires:	libstdc++ 
BuildRequires:	libstdc++-devel
BuildRequires:	ncurses-devel
Summary:	Embeddable cross-platform database engine
URL:		http://forge.novell.com/modules/xfmod/project/?flaim
Version:	4.9.989
Release:	10%{?dist}
License:	GPLv2
Group:		System Environment/Libraries
Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
Patch0:		%{name}-permissions.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust. It is available on a wide variety of 32 bit and 64 bit
platforms.

%package devel
Summary:	Embeddable cross-platform database engine
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
FLAIM is an embeddable cross-platform database engine that provides a
rich, powerful, easy-to-use feature set. It is the database engine used
by Novell eDirectory. It has proven to be highly scalable, reliable,
and robust.

%prep
%setup -q
%patch -p1

%build
make CXXFLAGS="$RPM_OPT_FLAGS" lib_dir_name=%{_lib} libs

%install
rm -rf $RPM_BUILD_ROOT
make rpm_build_root=$RPM_BUILD_ROOT lib_dir_name=%{_lib} install

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT VERSION
%exclude %{_libdir}/libflaim.a
%{_libdir}/libflaim.so.*

%files devel
%defattr(-,root,root)
%{_libdir}/libflaim.so
%{_libdir}/pkgconfig/libflaim.pc
%{_includedir}/flaim.h
%{_includedir}/flaimtk.h

%changelog
* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
- downgrade from svn checkout to official release

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn
- patch for install permissions

* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10
- update buildroot and other changes for bugzilla review #251020

* Thu Aug 30 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.2
- add pkgconfig requires
- exclude static libs

* Thu Aug  2 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-9.1
- minor changes for Fedora build
- updated bug url
- added post and postun ldconfig call

* Thu Mar 29 2007 dsanders at novell.com
- Fixed problem of accessing FlmRecord object before it was constructed.

* Thu Mar 29 2007 aj at suse.de
- Add BuildRequires for ncurses-devel.

* Sat Feb 10 2007 aj at suse.de
- Add defattr.

* Thu Feb  8 2007 dsanders at novell.com
- Changes to support Ubuntu packages, including 64-bit.
- Needed to lock the record cache mutex in FlmRecord::Release just before deleting the object to prevent a race condition.
- Changed license to LGPL.
- Updated copyright.
- Added pragmas for windows to remove compiler warnings for VC6 compiler.
- Fixed keyword substitution tokens.
- Added FlmReadFully() and enhanced the base64 decoder.
- Removed commands in makefile that was outputting provides to the spec file.

* Thu Feb  1 2007 ro at suse.de
- remove self-provides from devel package

* Thu Nov 16 2006 dsanders at novell.com
- Removed .exe files from package.
- Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures.
- Getting rid of references to gv_FlmSysData.
- Needed to add a (FLMUINT) cast to a FLMBOOL before it can be cast as a void *.
- Fixed mis-typed member of OPT_INFO structure.
- Fixed Linux compiler warnings.
- Changed several places that needed to access pDbInfo->pProgress instead of just Progress.
- Support for Ubuntu and Debian packages

* Fri Sep 29 2006 aj at suse.de
- Remove explicit self-provides

* Fri Sep  8 2006 dsanders at novell.com
- Added support for 64 bit numbers.
- Modified to use aligned buffers to improve direct I/O efficiency.
- Modified block cache allocator to make more efficient use of memory.
- Added option to allow disabling of direct I/O on Linux and Unix platforms.
- Enhancements to reduce the overhead of growing and shrinking files.
- Modified async I/O to make better reuse of available buffers when writes complete out of order.
- Fixed some memory leaks and other minor defects.
- Added more asserts to debug code.
- Enhancements and improvements to the field ID table inside of FlmRecord object.
- Updated doxygen document to be more accurate.
- Added a gigatest utility for testing bulk loads.
- Added more unit tests.
- Various tweaks for better support of various platforms and compilers.

* Tue Jun 27 2006 dsanders at novell.com
- Needed to make some typedefs public for Solaris 8.
- Also fixed so that flaimtk.h is copied from ftk.h when building srcdist

* Thu Jun 22 2006 ro at suse.de
- removed buggy self-provides from devel package

* Thu Jun 22 2006 dsanders at novell.com
- Modified common toolkit formatter to support colors when logging.
- Modified to use common formatter in toolkit for logging.

* Tue Jun 20 2006 dsanders at novell.com
- Logger client was not being set up properly in common toolkit.
- Fixed a Netware build issue
- Fixed an OS X compiler warning
- Fixed linux compiler warning
- Needed to lock/unlock the random generator mutex when getting a random number.
- f_printf needed to call fflush.
- Base 64 decoder needed to return success instead of eof hit.

* Mon Jun 19 2006 dsanders at novell.com
- Restructured code to use new common toolkit
- Support for Netware, including unit tests
- Fixed various memory leaks and enabled memory tracking for debug builds.
- Made some changes for how async I/O is supported on Solaris.
- Fixed various compiler warnings on various platforms.
- Added more documentation.

* Thu Jun  1 2006 dsanders at novell.com
- Fixed compiler warnings for ia64 platform.

* Tue May 30 2006 dsanders at novell.com
- Added support for Sparc Linux and OpenSuse 10.1
- Various Makefile changes for HP-UX, OS X, and Solaris
- Various code cleanups to support a common toolkit
- Got rid of timeouts for internal transactions.
- Removed some unused methods from the FlmRecord class.
- Fixed defect where partial blocks were being written at the end of database files
- Fixed race condition that was causing memory to be double-freed.
- Added better support for atomic operations on various Unix and Linux platforms.
- Allow application to exceed hardcoded cache limits when setting a hard cache limit.
- Changed RCODE to be an enumerated type - for easier documentation in doxygen.
- Fixed various compiler issues for solaris platform
- Added support for large binary and text fields (up to 4 GB)
- Added async and direct I/O support for Linux and Solaris
- Added new field table for level one fields inside FlmRecords to speed up searches.
- Added support for Netware
- Fixed double mutex lock issue.
- Added support for building Windows binaries with Visual Studio 8.
- Modified slab manager on Solaris to use regular malloc calls instead of mmap.
* Tue Feb 28 2006 dsanders at novell.com
- Added support for Intel MAC and __sparc49 (64 bit) platforms
- Initialized variables to quiet compiler warnings
- Got rid of unneeded internal functions
- Various fixes for Windows - support for vc8 compiler, workaround to compiler issues with inline methods
- Fixedup copyright notice in one source file
* Mon Feb 13 2006 dsanders at novell.com
- Changed naming convention for shared library to conform to standard - should be no need for SONAME fix now.
- Added dbshell utility.
- Started adding support for using autotools.
- Fixed bug on FlmDbReduceSize - needed to quit when encountering a block in a not-yet-deleted b-tree
- Added various new unit tests.
- Fixed various compiler warnings.

* Mon Feb 13 2006 ro at suse.de
- install the SONAME at least as symlink (should be the real file)

* Wed Feb  8 2006 dsanders at novell.com
- Removed make.exe and printf.exe from package.
- Added support for Ubuntu and Debian
- Simplified how unit tests are created.
- Added some new unit tests

* Fri Feb  3 2006 dsanders at novell.com
- Fixed libflaim.pc to specify includedir and Cflags:
- Also changed name: to Name:
- Modified Makefile to use macros for outputting $ and %% characters

* Fri Feb  3 2006 dsanders at novell.com
- Added support for PowerPC architectures
- Changed so that revision number for RPMs will match version number
- in SVN repository.

* Wed Feb  1 2006 dsanders at novell.com
- Initial submission



From fedora-extras-commits at redhat.com  Fri Sep  7 23:56:36 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 19:56:36 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.1,1.2
Message-ID: <200709072356.l87Nua1P002331@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2313

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libflaim.spec	7 Sep 2007 23:50:35 -0000	1.1
+++ libflaim.spec	7 Sep 2007 23:56:04 -0000	1.2
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,7 +73,7 @@
 %{_includedir}/flaimtk.h
 
 %changelog
-* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
+* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-11
 - downgrade from svn checkout to official release
 
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn



From fedora-extras-commits at redhat.com  Sat Sep  8 00:12:38 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 20:12:38 -0400
Subject: rpms/libflaim/devel libflaim.spec,1.1,1.2
Message-ID: <200709080012.l880Cc2u009236@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9192/devel

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/libflaim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libflaim.spec	7 Sep 2007 23:05:14 -0000	1.1
+++ libflaim.spec	8 Sep 2007 00:12:05 -0000	1.2
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	10%{?dist}
+Release:	12%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
+- build system issue
+
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
 - downgrade from svn checkout to official release
 



From fedora-extras-commits at redhat.com  Sat Sep  8 00:24:37 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Fri, 7 Sep 2007 20:24:37 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.2,1.3
Message-ID: <200709080024.l880ObC2010023@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libflaim.spec	7 Sep 2007 23:56:04 -0000	1.2
+++ libflaim.spec	8 Sep 2007 00:24:03 -0000	1.3
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,7 +73,10 @@
 %{_includedir}/flaimtk.h
 
 %changelog
-* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-11
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
+- build system issue
+
+* Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-10
 - downgrade from svn checkout to official release
 
 * Thu Sep  6 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.1046-10.20070906svn



From fedora-extras-commits at redhat.com  Sat Sep  8 00:28:13 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:28:13 -0400
Subject: rpms/mksh/devel .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709080028.l880SD1I010339@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10284

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:30:15 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:27:40 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:30:27 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:27:40 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:30:15 -0000	1.4
+++ sources	8 Sep 2007 00:27:41 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:29:47 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:29:47 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.4,1.5 mksh.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <200709080029.l880TllI010578@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10487

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:31:41 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:29:14 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:31:39 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:29:14 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:31:41 -0000	1.4
+++ sources	8 Sep 2007 00:29:14 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:31:49 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:31:49 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080031.l880VnMw010746@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10690

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:34:32 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:31:16 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:32:43 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:31:16 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:34:32 -0000	1.4
+++ sources	8 Sep 2007 00:31:16 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:33:05 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:33:05 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080033.l880X5Ci010876@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10826

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:36:23 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:32:33 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:35:32 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:32:33 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:36:23 -0000	1.4
+++ sources	8 Sep 2007 00:32:33 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 00:34:26 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 7 Sep 2007 20:34:26 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.4, 1.5 mksh.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <200709080034.l880YQ2s011012@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10966

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 31


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jul 2007 11:35:32 -0000	1.4
+++ .cvsignore	8 Sep 2007 00:33:53 -0000	1.5
@@ -1 +1 @@
-mksh-R30.cpio.gz
+mksh-R31.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mksh.spec	28 Aug 2007 18:33:50 -0000	1.5
+++ mksh.spec	8 Sep 2007 00:33:53 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          30
-Release:          2%{?dist}
+Version:          31
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
+- Upgrade to 31
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 30-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2007 11:35:32 -0000	1.4
+++ sources	8 Sep 2007 00:33:53 -0000	1.5
@@ -1 +1 @@
-184a63aa5b1450581dc463148f3d245e  mksh-R30.cpio.gz
+383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 01:54:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 21:54:51 -0400
Subject: rpms/cheese/devel cheese.spec, NONE, 1.1 stripmenot.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709080154.l881spRQ019986@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/cheese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cheese.spec stripmenot.patch 
Log Message:
initial import



--- NEW FILE cheese.spec ---
Name:           cheese
Version:        0.2.4 
Release:        2%{?dist}
Summary:        A webcam application for snapshots and movies

Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://live.gnome.org/Cheese
# see http://live.gnome.org/Cheese/Releases for the sources
Source0:        %{name}-%{version}.tar.gz
Patch0:         stripmenot.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libglade2-devel >= 2.0.0
BuildRequires: dbus-devel
BuildRequires: gstreamer-devel >= 0.10.12
BuildRequires: gstreamer-plugins-base-devel >= 0.10.12
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnomeui-devel
BuildRequires: evolution-data-server-devel
#BuildRequires: xorg-x11-proto-devel
BuildRequires: libXxf86vm-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext

Requires: gstreamer-plugins-good >= 0.10.6-2

%description
Cheese is a Photobooth-inspired GNOME application for taking pictures and 
videos from a webcam. It also includes fancy graphical effects based on the 
gstreamer-backend.

%prep
%setup -q
%patch0 -p1 -b .stripmenot

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --delete-original --vendor="" 	\
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications 	\
	$RPM_BUILD_ROOT%{_datadir}/applications/cheese.desktop

%find_lang %{name} --with-gnome


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/cheese
%{_datadir}/applications/cheese.desktop
%{_datadir}/cheese
%{_datadir}/icons/hicolor/*/apps/cheese.png
%{_datadir}/icons/hicolor/scalable/apps/cheese.svg

%changelog
* Fri Sep  7 2007  Matthias Clasen  <mclasen at redhat.com> 0.2.4-2
- package review feedback

* Thu Sep  6 2007  Matthias Clasen  <mclasen at redhat.com> 0.2.4-1
- Initial packages

stripmenot.patch:

--- NEW FILE stripmenot.patch ---
diff -up cheese-0.2.4/toc2/make/toc2-install.make.stripmenot cheese-0.2.4/toc2/make/toc2-install.make
--- cheese-0.2.4/toc2/make/toc2-install.make.stripmenot	2007-09-07 00:41:13.000000000 -0400
+++ cheese-0.2.4/toc2/make/toc2-install.make	2007-09-07 00:41:55.000000000 -0400
@@ -147,7 +147,7 @@ toc2.call.install-dll =  $(call toc2.cal
 ##			}
 
 toc2.install.flags.nonbins = -m 0644
-toc2.install.flags.bins = -s -m 0755
+toc2.install.flags.bins = -m 0755
 toc2.install.flags.bin-scripts = -m 0755
 toc2.install.flags.dlls = -m 0755
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:41:59 -0000	1.1
+++ .cvsignore	8 Sep 2007 01:54:19 -0000	1.2
@@ -0,0 +1 @@
+cheese-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cheese/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Sep 2007 18:41:59 -0000	1.1
+++ sources	8 Sep 2007 01:54:19 -0000	1.2
@@ -0,0 +1 @@
+f3a14b9ef07167f5fb6b34ccd67de339  cheese-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 02:03:50 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 7 Sep 2007 22:03:50 -0400
Subject: rpms/yadex/devel yadex.spec,1.7,1.8
Message-ID: <200709080203.l8823og7026213@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26191

Modified Files:
	yadex.spec 
Log Message:
No longer BuildRequires: gawk due to buildroot changes




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- yadex.spec	22 Aug 2007 18:07:29 -0000	1.7
+++ yadex.spec	8 Sep 2007 02:03:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -18,7 +18,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  libX11-devel gawk
+BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Sep 7 2007 Wart <wart at kobold.org> 1.7.0-9
+- No longer BuildRequires: gawk due to buildroot changes
+
 * Tue Aug 21 2007 Wart <wart at kobold.org> 1.7.0-8
 - License tag clarification
 - Add BuildRequires: gawk due to changes in the buildroot



From fedora-extras-commits at redhat.com  Sat Sep  8 02:41:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 7 Sep 2007 22:41:56 -0400
Subject: comps comps-f8.xml.in,1.95,1.96
Message-ID: <200709080241.l882fuOM028081@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28022

Modified Files:
	comps-f8.xml.in 
Log Message:
Add cheese



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- comps-f8.xml.in	6 Sep 2007 19:41:58 -0000	1.95
+++ comps-f8.xml.in	8 Sep 2007 02:41:26 -0000	1.96
@@ -1879,6 +1879,7 @@
       <packagereq type="optional">agave</packagereq>
       <packagereq type="optional">asymptote</packagereq>
       <packagereq type="optional">blender</packagereq>
+      <packagereq type="optional">cheese</packagereq>
       <packagereq type="optional">comix</packagereq>
       <packagereq type="optional">dcraw</packagereq>
       <packagereq type="optional">digikam</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 03:25:19 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 7 Sep 2007 23:25:19 -0400
Subject: rpms/spandsp/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 spandsp.spec, 1.16, 1.17
Message-ID: <200709080325.l883PJYn003551@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3455

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.4pre8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Aug 2007 20:49:02 -0000	1.14
+++ .cvsignore	8 Sep 2007 03:24:46 -0000	1.15
@@ -1 +1 @@
-spandsp-0.0.4pre7.tgz
+spandsp-0.0.4pre8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	25 Aug 2007 20:49:02 -0000	1.14
+++ sources	8 Sep 2007 03:24:46 -0000	1.15
@@ -1 +1 @@
-7931fe0452b37e4ca5032254a7b9e400  spandsp-0.0.4pre7.tgz
+73d7843a7c681c37ea9e1eb205c6fe81  spandsp-0.0.4pre8.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- spandsp.spec	25 Aug 2007 20:49:02 -0000	1.16
+++ spandsp.spec	8 Sep 2007 03:24:46 -0000	1.17
@@ -1,9 +1,9 @@
-%define pre 7
+%define pre 8
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.4
-Release: 0.3%{?pre:.pre%{pre}}%{?dist}
+Release: 0.4%{?pre:.pre%{pre}}%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep  7 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.4.pre8
+- Update to 0.0.4pre8
+
 * Sat Aug 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.2.pre7
 - Update to 0.0.4pre7
 



From fedora-extras-commits at redhat.com  Sat Sep  8 03:26:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Fri, 7 Sep 2007 23:26:56 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.22,1.23
Message-ID: <200709080326.l883QuDF003683@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3642

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Fri Sep 07 2007 Adam Jackson <ajax at redhat.com> 7.2-7
- Add linuxwacom and synaptics to the default set.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drivers.spec	11 May 2007 18:51:29 -0000	1.22
+++ xorg-x11-drivers.spec	8 Sep 2007 03:26:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,8 @@
 # where we really do know that it's arch-specific.  Those go at the end of
 # this list.
 
+Requires: linuxwacom
+Requires: synaptics
 Requires: xorg-x11-drv-acecad
 Requires: xorg-x11-drv-aiptek
 Requires: xorg-x11-drv-apm
@@ -84,7 +86,9 @@
 Requires: xorg-x11-drv-neomagic
 %endif
 
-# Thus far via chips are only on x86 and amd64 motherboards
+# Thus far via chips are only on x86 and amd64 motherboards.  This might be
+# the driver that ends up supporting the S3 Chrome cards, so don't be
+# surprised if this changes.
 %ifarch %{ix86} x86_64
 Requires: xorg-x11-drv-via
 %endif
@@ -117,6 +121,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 07 2007 Adam Jackson <ajax at redhat.com> 7.2-7
+- Add linuxwacom and synaptics to the default set.
+
 * Fri May 11 2007 Adam Jackson <ajax at redhat.com> 7.2-6
 - Add xorg-x11-drv-nouveau.  If this bothers you, uninstall the metapackage.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 03:28:22 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Fri, 7 Sep 2007 23:28:22 -0400
Subject: comps comps-f8.xml.in,1.96,1.97
Message-ID: <200709080328.l883SMNM003803@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3735

Modified Files:
	comps-f8.xml.in 
Log Message:
Remove explicit mention of linuxwacom and synaptics, since xorg-x11-drivers
will pull them in now.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- comps-f8.xml.in	8 Sep 2007 02:41:26 -0000	1.96
+++ comps-f8.xml.in	8 Sep 2007 03:27:52 -0000	1.97
@@ -328,7 +328,6 @@
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
-      <packagereq type="default">linuxwacom</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">pirut</packagereq>
       <packagereq type="default">policycoreutils-gui</packagereq>
@@ -336,7 +335,6 @@
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
-      <packagereq type="default">synaptics</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-display</packagereq>
       <packagereq type="default">system-config-network</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 07:21:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 8 Sep 2007 03:21:15 -0400
Subject: rpms/gperiodic/devel .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709080721.l887LFUN005114@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064

Modified Files:
	.cvsignore gperiodic.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	8 Sep 2007 07:20:43 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	5 May 2007 17:57:28 -0000	1.7
+++ gperiodic.spec	8 Sep 2007 07:20:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 8%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
 * Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	8 Sep 2007 07:20:43 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 05:23:41 -0400
Subject: rpms/lirc-kmod-common/devel dead.package,1.1,1.2
Message-ID: <200709080923.l889NfCW022468@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22448

Modified Files:
	dead.package 
Log Message:
https://bugzilla.redhat.com/192621


Index: dead.package
===================================================================
RCS file: /cvs/pkgs/rpms/lirc-kmod-common/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	27 Aug 2006 11:22:27 -0000	1.1
+++ dead.package	8 Sep 2007 09:23:04 -0000	1.2
@@ -0,0 +1 @@
+https://bugzilla.redhat.com/192621



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:52 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:52 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchcommits
Message-ID: <200709080923.l889NqI1029675@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchcommits acl on lirc-kmod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lirc-kmod



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:53 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchbugzilla
Message-ID: <200709080923.l889Nslc021593@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on lirc-kmod (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lirc-kmod



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:57 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchcommits
Message-ID: <200709080923.l889NvMc029682@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchcommits acl on lirc-kmod (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lirc-kmod



From fedora-extras-commits at redhat.com  Sat Sep  8 09:23:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 02:23:58 -0700
Subject: [pkgdb] lirc-kmod: scop has given up watchbugzilla
Message-ID: <200709080923.l889Nx6l029688@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on lirc-kmod (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lirc-kmod



From fedora-extras-commits at redhat.com  Sat Sep  8 09:44:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 05:44:37 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec,1.41,1.42
Message-ID: <200709080944.l889ib31023275@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23257

Modified Files:
	rpmdevtools.spec 
Log Message:
Sync deps with Fedora's new assumed present in buildroots packages list.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- rpmdevtools.spec	5 Sep 2007 21:41:23 -0000	1.41
+++ rpmdevtools.spec	8 Sep 2007 09:44:35 -0000	1.42
@@ -18,26 +18,38 @@
 BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
-Requires:       fakeroot
 # Minimal RPM build requirements
-Requires:       rpm-build >= 4.4.2.1
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
+Requires:       patch
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build >= 4.4.2.1
+Requires:       sed
 Requires:       tar
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
 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
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -111,6 +123,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- 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.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 10:22:58 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Sat, 8 Sep 2007 06:22:58 -0400
Subject: rpms/pm-utils/devel pm-utils.spec, 1.75, 1.76 sources, 1.32,
	1.33 radeontool-1.5.diff, 1.1,
	NONE radeontool-fix-option-handling.diff, 1.2,
	NONE radeontool-get-rid-of-lspci.diff, 1.1,
	NONE vbetool-0.3-fix-gcc4bug.patch, 1.3, NONE vbetool-libz.patch,
	1.2, NONE
Message-ID: <200709081022.l88AMwEg030795@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30736

Modified Files:
	pm-utils.spec sources 
Removed Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff vbetool-0.3-fix-gcc4bug.patch 
	vbetool-libz.patch 
Log Message:
* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
- Adjust %files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
- remove (C|CXX|F)FLAGS definitions, they are already in %configure
- remove Core in Summary tag
- add URL for pm-utils
- add %{?arm} to ExclusiveArch (#245463)
- remove vbetool and require it (it is a separte package now)
- remove radeontool and require it (it is a separte package now)
- Update License Tag
- cleanup buildrequires



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pm-utils.spec	31 Aug 2007 08:39:48 -0000	1.75
+++ pm-utils.spec	8 Sep 2007 10:22:26 -0000	1.76
@@ -1,12 +1,14 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
-License: GPLv2 and zlib and BSD
+License: GPLv2
 Version: 0.99.3
 Release: 12%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
+Requires: radeontool
+Requires: vbetool
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -20,31 +22,15 @@
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
-%define vbever 0.7
-Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
-# URL: http://fdd.com/software/radeon/
-Source20: http://fdd.com/software/radeon/radeontool-1.5.tar.gz
-%ifarch %{ix86}
-Obsoletes: vbetool
-Provides: vbetool
-Obsoletes: radeontool
-Provides: radeontool
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90, zlib-devel
+BuildRequires: hal-devel pkgconfig
+BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-vbe-redirect.patch
 Patch3: pm-utils-0.99.3-cfg.patch
 
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-libz.patch
-
-Patch20: radeontool-1.5.diff
-Patch21: radeontool-fix-option-handling.diff
-Patch22: radeontool-get-rid-of-lspci.diff
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -58,49 +44,13 @@
 %patch2 -p1 -b .vbe-redirect
 %patch3 -p1 -b .cfg
 
-%patch10 -p0 -b .gcc4
-%patch11 -p0 -b .zlib
-
-cd radeontool-1.5
-%patch20 -p0 -b .volatile
-%patch21 -p0 -b .options
-%patch22 -p0 -b .no-lspci
-cd ..
 
 %build
-cd vbetool-%{vbever}
-%ifarch %{ix86}
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
-
-%ifarch %{ix86} x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
 %configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch %{ix86} x86_64
-cd vbetool-%{vbever}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-cd radeontool-1.5
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}
-cd ..
-%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -157,22 +107,21 @@
 %{_sbindir}/pm-powersave
 %{_sbindir}/pm-suspend
 %{_sbindir}/pm-suspend-hybrid
-%ifarch %{ix86} x86_64
-%{_sbindir}/radeontool
-%{_sbindir}/vbetool
-%endif
 
 %{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Fri Aug 31 2007 Till Maas <opensource till name> - 0.99.3-12
+* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
 - Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
 - remove (C|CXX|F)FLAGS definitions, they are already in %%configure
 - remove Core in Summary tag
 - add URL for pm-utils
-- add full URL source for radeontool
 - add %%{?arm} to ExclusiveArch (#245463)
+- remove vbetool and require it (it is a separte package now)
+- remove radeontool and require it (it is a separte package now)
+- Update License Tag
+- cleanup buildrequires
 
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
 - Install (not just build) vbetool and radeontool on x86_64 too


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2007 14:20:54 -0000	1.32
+++ sources	8 Sep 2007 10:22:26 -0000	1.33
@@ -1,3 +1 @@
-8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
 0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz


--- radeontool-1.5.diff DELETED ---


--- radeontool-fix-option-handling.diff DELETED ---


--- radeontool-get-rid-of-lspci.diff DELETED ---


--- vbetool-0.3-fix-gcc4bug.patch DELETED ---


--- vbetool-libz.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 10:26:55 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Sat, 8 Sep 2007 06:26:55 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.76,1.77
Message-ID: <200709081026.l88AQt44031004@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30958

Modified Files:
	pm-utils.spec 
Log Message:
* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
- Adjust %files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
- remove (C|CXX|F)FLAGS definitions, they are already in %configure
- remove Core in Summary tag
- add URL for pm-utils
- add %{?arm} to ExclusiveArch (#245463)
- remove vbetool and require it (it is a separate package now)
- remove radeontool and require it (it is a separate package now)
- Update License Tag
- cleanup buildrequires
- clear %setup



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- pm-utils.spec	8 Sep 2007 10:22:26 -0000	1.76
+++ pm-utils.spec	8 Sep 2007 10:26:22 -0000	1.77
@@ -37,7 +37,7 @@
 to power management.
 
 %prep
-%setup -q -a 10 -a 20
+%setup -q 
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
@@ -118,10 +118,11 @@
 - remove Core in Summary tag
 - add URL for pm-utils
 - add %%{?arm} to ExclusiveArch (#245463)
-- remove vbetool and require it (it is a separte package now)
-- remove radeontool and require it (it is a separte package now)
+- remove vbetool and require it (it is a separate package now)
+- remove radeontool and require it (it is a separate package now)
 - Update License Tag
 - cleanup buildrequires
+- clear %%setup
 
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
 - Install (not just build) vbetool and radeontool on x86_64 too



From fedora-extras-commits at redhat.com  Sat Sep  8 10:51:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 06:51:58 -0400
Subject: fedora-rpmdevtools rpmdevtools.spec,1.19.2.5,1.19.2.6
Message-ID: <200709081051.l88Apweh008046@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7979

Modified Files:
      Tag: rpmdevtools-5
	rpmdevtools.spec 
Log Message:
Sync deps with Fedora's new assumed present in buildroots packages list.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- rpmdevtools.spec	5 Sep 2007 21:55:24 -0000	1.19.2.5
+++ rpmdevtools.spec	8 Sep 2007 10:51:55 -0000	1.19.2.6
@@ -19,26 +19,37 @@
 Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
 # Minimal RPM build requirements
-Requires:       rpm-build
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
-Requires:       tar
 Requires:       patch
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build
+Requires:       sed
+Requires:       tar
 Requires:       unzip
+Requires:       util-linux
+Requires:       which
+# Additionally required for tool operations
+#Requires:      cpio
+Requires:       file
+Requires:       perl
+Requires:       python
+Requires:       rpm-python
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -136,6 +147,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- 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.
 - Update rpminfo to version 2004-07-07-02.



From fedora-extras-commits at redhat.com  Sat Sep  8 11:27:54 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 07:27:54 -0400
Subject: rpms/libflaim/F-7 .cvsignore,1.1,1.2 sources,1.3,1.4
Message-ID: <200709081127.l88BRs6A028670@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28628/F-7

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Sep 2007 18:32:57 -0000	1.1
+++ .cvsignore	8 Sep 2007 11:27:22 -0000	1.2
@@ -0,0 +1 @@
+libflaim-4.9.989.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2007 23:36:10 -0000	1.3
+++ sources	8 Sep 2007 11:27:22 -0000	1.4
@@ -0,0 +1 @@
+cbd0caf6239cffb7640391eda7551d4a  libflaim-4.9.989.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 11:49:24 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 07:49:24 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.3,1.4
Message-ID: <200709081149.l88BnOhe029766@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libflaim.spec	8 Sep 2007 00:24:03 -0000	1.3
+++ libflaim.spec	8 Sep 2007 11:48:52 -0000	1.4
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-13
+- bumping again for build system after lockout
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
 - build system issue
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:08:44 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 8 Sep 2007 08:08:44 -0400
Subject: rpms/spandsp/F-7 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 spandsp.spec, 1.14, 1.15
Message-ID: <200709081208.l88C8iMS004120@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/spandsp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.4pre8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Aug 2007 03:07:07 -0000	1.14
+++ .cvsignore	8 Sep 2007 12:08:11 -0000	1.15
@@ -1 +1 @@
-spandsp-0.0.4pre7.tgz
+spandsp-0.0.4pre8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Aug 2007 03:07:07 -0000	1.14
+++ sources	8 Sep 2007 12:08:11 -0000	1.15
@@ -1 +1 @@
-7931fe0452b37e4ca5032254a7b9e400  spandsp-0.0.4pre7.tgz
+73d7843a7c681c37ea9e1eb205c6fe81  spandsp-0.0.4pre8.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/F-7/spandsp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- spandsp.spec	26 Aug 2007 03:07:07 -0000	1.14
+++ spandsp.spec	8 Sep 2007 12:08:11 -0000	1.15
@@ -1,9 +1,9 @@
-%define pre 7
+%define pre 8
 
 Summary: A DSP library for telephony
 Name: spandsp
 Version: 0.0.4
-Release: 0.3%{?pre:.pre%{pre}}%{?dist}
+Release: 0.4%{?pre:.pre%{pre}}%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Sep  7 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.4.pre8
+- Update to 0.0.4pre8
+
 * Sat Aug 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.2.pre7
 - Update to 0.0.4pre7
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:10:47 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 08:10:47 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.4,1.5
Message-ID: <200709081210.l88CAlYQ004244@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libflaim.spec	8 Sep 2007 11:48:52 -0000	1.4
+++ libflaim.spec	8 Sep 2007 12:10:14 -0000	1.5
@@ -9,13 +9,14 @@
 #
 
 Name:		libflaim
+BuildRequires:	util-linux-ng
 BuildRequires:	libstdc++ 
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	13%{?dist}
+Release:	14%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +74,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-14
+- util-linux-ng for buildsys
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-13
 - bumping again for build system after lockout
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:11:28 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 08:11:28 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.17,1.18
Message-ID: <200709081211.l88CBS9N004344@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4256

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
- Update for agreement with packaging guidelines - add versioned
  emacs requirement



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emacs-vm.spec	30 Aug 2007 20:53:42 -0000	1.17
+++ emacs-vm.spec	8 Sep 2007 12:10:55 -0000	1.18
@@ -8,15 +8,18 @@
 %define devoversion 495
 
 
-%define pkgdir %{_datadir}/emacs/site-lisp/vm
+%define emacs_version %(pkg-config emacs --modversion)
+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%define emacs_startdir %(pkg-coonfig emacs --variable sitestartdir)
+
+%define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define startd %{_datadir}/emacs/site-lisp/site-start.d/
-%define initfile %{startd}/vm-mode-init.el
+%define initfile %{emacs_startdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -25,7 +28,7 @@
 Source1: u-vm-color.el
 Patch0: vm-8.0.3-fix-Makefile.patch
 
-Requires: emacs
+Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +128,10 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
+- Update for agreement with packaging guidelines - add versioned
+  emacs requirement
+
 * Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
 - Fix problem with vm-autoloads.el RH BZ #262361 
 



From fedora-extras-commits at redhat.com  Sat Sep  8 12:30:56 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 08:30:56 -0400
Subject: rpms/VLGothic-fonts/F-7 .cvsignore, 1.2, 1.3 VLGothic-fonts.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709081230.l88CUuJM005048@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5007

Modified Files:
	.cvsignore VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2006 00:10:23 -0000	1.2
+++ .cvsignore	8 Sep 2007 12:30:24 -0000	1.3
@@ -1 +1 @@
-VLGothic-20061026.tar.bz2
+VLGothic-20070901.tar.bz2


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 08:34:04 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 12:30:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:34:04 -0000	1.5
+++ sources	8 Sep 2007 12:30:24 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 12:40:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:40:39 -0400
Subject: rpms/gkrellm-hddtemp/devel dead.package, NONE, 1.1 .cvsignore, 1.2, 
	NONE Makefile, 1.2, NONE gkrellm-hddtemp.spec, 1.10,
	NONE sources, 1.2, NONE
Message-ID: <200709081240.l88CedlG005619@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5612

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gkrellm-hddtemp.spec sources 
Log Message:
gkrellm can use a server mode hddtemp itself.
https://www.redhat.com/archives/fedora-maintainers/2007-September/msg00075.html



--- NEW FILE dead.package ---
gkrellm can use a server mode hddtemp itself.
https://www.redhat.com/archives/fedora-maintainers/2007-September/msg00075.html


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gkrellm-hddtemp.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 12:44:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:44:11 -0400
Subject: comps comps-f8.xml.in,1.97,1.98
Message-ID: <200709081244.l88CiBf0005773@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5731

Modified Files:
	comps-f8.xml.in 
Log Message:
+tomcat-native


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- comps-f8.xml.in	8 Sep 2007 03:27:52 -0000	1.97
+++ comps-f8.xml.in	8 Sep 2007 12:43:41 -0000	1.98
@@ -3828,6 +3828,7 @@
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">tiquit</packagereq>
+      <packagereq type="optional">tomcat-native</packagereq>
       <packagereq type="optional">tomcat5</packagereq>
       <packagereq type="optional">tomcat5-admin-webapps</packagereq>
       <packagereq type="optional">tomcat5-webapps</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:53:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:53:32 -0400
Subject: comps comps-f8.xml.in,1.98,1.99
Message-ID: <200709081253.l88CrW6e006204@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6167

Modified Files:
	comps-f8.xml.in 
Log Message:
+bash-completion


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- comps-f8.xml.in	8 Sep 2007 12:43:41 -0000	1.98
+++ comps-f8.xml.in	8 Sep 2007 12:53:02 -0000	1.99
@@ -3392,6 +3392,7 @@
       <packagereq type="optional">arpwatch</packagereq>
       <packagereq type="optional">audit</packagereq>
       <packagereq type="optional">avahi-tools</packagereq>
+      <packagereq type="optional">bash-completion</packagereq>
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">catfish</packagereq>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:55:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 08:55:00 -0400
Subject: comps comps-el5.xml.in,1.8,1.9
Message-ID: <200709081255.l88Ct0uh006265@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222

Modified Files:
	comps-el5.xml.in 
Log Message:
+ccache, cvsps, colordiff, hddtemp, bash-completion, gkrellm, tomcat-native


Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-el5.xml.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps-el5.xml.in	24 Jul 2007 17:49:04 -0000	1.8
+++ comps-el5.xml.in	8 Sep 2007 12:54:30 -0000	1.9
@@ -62,8 +62,11 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">ccache</packagereq>
       <packagereq type="optional">cmake</packagereq>
       <packagereq type="optional">cmucl</packagereq>
+      <packagereq type="optional">cvsps</packagereq>
+      <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
       <packagereq type="optional">git</packagereq>
       <packagereq type="optional">lua</packagereq>
@@ -196,6 +199,7 @@
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>
+      <packagereq type="optional">hddtemp</packagereq>
     </packagelist>
   </group>
   <group>
@@ -303,6 +307,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">bash-completion</packagereq>
       <packagereq type="optional">cfengine</packagereq>
       <packagereq type="optional">chrpath</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
@@ -310,6 +315,7 @@
       <packagereq type="optional">environment-modules</packagereq>
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">ghex</packagereq>
+      <packagereq type="optional">gkrellm</packagereq>
       <packagereq type="optional">isic</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">p7zip</packagereq>
@@ -361,6 +367,7 @@
       <packagereq type="optional">moin</packagereq>
       <packagereq type="optional">plone</packagereq>
       <packagereq type="optional">Pound</packagereq>
+      <packagereq type="optional">tomcat-native</packagereq>
       <packagereq type="optional">zope</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:25 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxReI023335@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora devel was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:30 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxUHZ030908@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 7 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:35 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxZOL023342@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 1 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:37 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxb8L030914@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 2 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:39 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxdbg023348@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 3 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:42 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88Cxg8A030920@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 4 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:44 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxjVt023354@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 5 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:45 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxkIH030926@app4.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Fedora 6 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 12:59:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 05:59:48 -0700
Subject: [pkgdb] gkrellm-hddtemp Orphaned
Message-ID: <200709081259.l88CxmuO023360@app3.fedora.phx.redhat.com>

Package gkrellm-hddtemp in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-hddtemp



From fedora-extras-commits at redhat.com  Sat Sep  8 13:05:02 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Sat, 8 Sep 2007 09:05:02 -0400
Subject: rpms/libeXosip2/FC-6 .cvsignore, 1.6, 1.7 libeXosip2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200709081305.l88D527R012606@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libeXosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12561

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Nov 2006 19:17:53 -0000	1.6
+++ .cvsignore	8 Sep 2007 13:04:28 -0000	1.7
@@ -1 +1 @@
-libeXosip2-3.0.1.tar.gz
+libeXosip2-3.0.3.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/libeXosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libeXosip2.spec	15 Nov 2006 19:17:53 -0000	1.10
+++ libeXosip2.spec	8 Sep 2007 13:04:28 -0000	1.11
@@ -1,15 +1,15 @@
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 3.0.1
+Version: 3.0.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
 Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
-BuildRequires: libosip2-devel
+BuildRequires: libosip2-devel >= 3.0.3
 BuildRequires: doxygen
 
 %description
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.0.3-1
+- Update to 3.0.3
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2.3-3
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libeXosip2/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Nov 2006 19:17:53 -0000	1.6
+++ sources	8 Sep 2007 13:04:28 -0000	1.7
@@ -1 +1 @@
-bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz
+84a6e94f1bcfd5d10640cdd4939208a7  libeXosip2-3.0.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:04 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:04 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D94jP031019@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora devel was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:07 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:07 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D98xW023519@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 1 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:09 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9Amf031047@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 2 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:11 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9BDK023525@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 3 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:12 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9DUp031053@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 4 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:14 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:14 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9E1B023532@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Fedora 5 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:16 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9GMq031059@app4.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Red Hat Linux 8 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:17 -0700
Subject: [pkgdb] fedora-rpmdevtools Orphaned
Message-ID: <200709081309.l88D9HlY023538@app3.fedora.phx.redhat.com>

Package fedora-rpmdevtools in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:45 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9joa031066@app4.fedora.phx.redhat.com>

Package cdiff in Fedora devel was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:46 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9lSk023547@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 1 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:48 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9mOs031073@app4.fedora.phx.redhat.com>

Package cdiff in Fedora 2 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:49 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9nwR023554@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 3 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:51 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9p5I031079@app4.fedora.phx.redhat.com>

Package cdiff in Fedora 4 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:54 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9sGq023560@app3.fedora.phx.redhat.com>

Package cdiff in Fedora 5 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:55 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9t9p031085@app4.fedora.phx.redhat.com>

Package cdiff in Red Hat Linux 8 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:09:56 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:09:56 -0700
Subject: [pkgdb] cdiff Orphaned
Message-ID: <200709081309.l88D9uSo023567@app3.fedora.phx.redhat.com>

Package cdiff in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdiff



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:42 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAg8s031093@app4.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora devel was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xemacs-sumo



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:44 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAi5O023582@app3.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora 4 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xemacs-sumo



From fedora-extras-commits at redhat.com  Sat Sep  8 13:10:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 08 Sep 2007 06:10:45 -0700
Subject: [pkgdb] xemacs-sumo Orphaned
Message-ID: <200709081310.l88DAk99031099@app4.fedora.phx.redhat.com>

Package xemacs-sumo in Fedora 5 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xemacs-sumo



From fedora-extras-commits at redhat.com  Sat Sep  8 14:16:21 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:16:21 -0400
Subject: rpms/VLGothic-fonts/devel VLGothic-fonts.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709081416.l88EGLVQ021622@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21580

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 09:08:50 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 14:15:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 09:08:50 -0000	1.5
+++ sources	8 Sep 2007 14:15:48 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:24:51 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:24:51 -0400
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec, 1.7, 1.8 sources, 1.5,
	1.6
Message-ID: <200709081424.l88EOp4e022089@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22018

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VLGothic-fonts.spec	2 Jun 2007 08:28:52 -0000	1.7
+++ VLGothic-fonts.spec	8 Sep 2007 14:24:18 -0000	1.8
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:28:52 -0000	1.5
+++ sources	8 Sep 2007 14:24:18 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:28:24 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 10:28:24 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.18,1.19
Message-ID: <200709081428.l88ESOMP022320@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22287

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
- Update for agreement with packaging guidelines - add versioned
  emacs requirement



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emacs-vm.spec	8 Sep 2007 12:10:55 -0000	1.18
+++ emacs-vm.spec	8 Sep 2007 14:27:52 -0000	1.19
@@ -12,6 +12,8 @@
 %define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %define emacs_startdir %(pkg-coonfig emacs --variable sitestartdir)
 
+%{!?emacs_version %define emacs_version 21.4}
+
 %define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
 %define initfile %{emacs_startdir}/vm-mode-init.el



From fedora-extras-commits at redhat.com  Sat Sep  8 14:32:41 2007
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 8 Sep 2007 10:32:41 -0400
Subject: rpms/VLGothic-fonts/FC-5 VLGothic-fonts.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709081432.l88EWfVe022496@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22462

Modified Files:
	VLGothic-fonts.spec sources 
Log Message:
update to 20070901


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-5/VLGothic-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VLGothic-fonts.spec	2 Jun 2007 08:25:42 -0000	1.6
+++ VLGothic-fonts.spec	8 Sep 2007 14:32:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name: VLGothic-fonts
-Version: 20070507
+Version: 20070901
 Release: 1%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
+- Update to 20070901
+
 * Sat Jun 02 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070507-1
 - Update to 20070507
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jun 2007 08:25:42 -0000	1.5
+++ sources	8 Sep 2007 14:32:08 -0000	1.6
@@ -1 +1 @@
-34ccd4ba978230b11e8724ed80cb12d4  VLGothic-20070507.tar.bz2
+a55c51eb2e8d928c3e7c5c06dbd7c347  VLGothic-20070901.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 14:49:21 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Sat, 8 Sep 2007 10:49:21 -0400
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.6,1.7
Message-ID: <200709081449.l88EnLh9024328@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24202/devel

Modified Files:
	ruby-gnome2.spec 
Log Message:

- Rebuild against new poppler
- Changed license to LGPLv2+



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ruby-gnome2.spec	9 Aug 2007 16:46:53 -0000	1.6
+++ ruby-gnome2.spec	8 Sep 2007 14:48:48 -0000	1.7
@@ -3,12 +3,12 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
-License:        LGPL
+License:        LGPLv2+
 URL:            http://ruby-gnome2.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-script.patch
@@ -621,6 +621,11 @@
 
 
 %changelog
+
+* Sat Sep  8 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-11
+- Rebuild against new poppler
+- Changed license to LGPLv2+
+
 * Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.16.0-10
 - Adjust to GLib 2.14 API + typo fix in glib module
 



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:34 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88ExZFv031616@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:34 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88ExaOW031625@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:37 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:37 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081459.l88Exccs024443@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) 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 fedora-extras-commits at redhat.com  Sat Sep  8 14:59:49 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:49 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88Exnqt024452@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:52 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:52 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88ExqIY031634@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:53 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:53 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081459.l88ExscC031644@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:58 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:58 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081459.l88ExwUc024461@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 14:59:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 07:59:59 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081459.l88Exxkq024471@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:01 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:01 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081500.l88F01Qr031653@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:08 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:08 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709081500.l88F08WG024497@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:09 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:09 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709081500.l88F0AUg024506@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 15:00:11 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sat, 08 Sep 2007 08:00:11 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709081500.l88F0BIG024516@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sat Sep  8 15:31:35 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:31:35 -0400
Subject: rpms/zeroinstall-injector/F-7 zeroinstall-injector.spec,1.8,1.9
Message-ID: <200709081531.l88FVZKQ032473@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/F-7

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Update scriptlet that creates zeroinst user


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-7/zeroinstall-injector.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zeroinstall-injector.spec	6 Sep 2007 00:55:09 -0000	1.8
+++ zeroinstall-injector.spec	8 Sep 2007 15:31:03 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -16,8 +16,8 @@
 
 BuildArch: noarch
 BuildRequires: python-devel gnupg desktop-file-utils
-Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
-Requires: /usr/sbin/useradd
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires(pre): shadow-utils
 
 %description
 The Zero Install Injector makes it easy for users to install software without
@@ -64,8 +64,11 @@
 # Add the "zeroinst" user.
 # This is not used by default, but is required if you want to
 # set up sharing of downloads later.
-/usr/sbin/useradd -c 'Zero Install shared cache' \
-    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +91,9 @@
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
 - Update to 0.30
 - License is now versioned



From fedora-extras-commits at redhat.com  Sat Sep  8 15:31:38 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:31:38 -0400
Subject: rpms/zeroinstall-injector/devel zeroinstall-injector.spec,1.8,1.9
Message-ID: <200709081531.l88FVcdY032478@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32405/devel

Modified Files:
	zeroinstall-injector.spec 
Log Message:
Update scriptlet that creates zeroinst user


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zeroinstall-injector.spec	6 Sep 2007 00:55:11 -0000	1.8
+++ zeroinstall-injector.spec	8 Sep 2007 15:31:06 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -16,8 +16,8 @@
 
 BuildArch: noarch
 BuildRequires: python-devel gnupg desktop-file-utils
-Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
-Requires: /usr/sbin/useradd
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires(pre): shadow-utils
 
 %description
 The Zero Install Injector makes it easy for users to install software without
@@ -64,8 +64,11 @@
 # Add the "zeroinst" user.
 # This is not used by default, but is required if you want to
 # set up sharing of downloads later.
-/usr/sbin/useradd -c 'Zero Install shared cache' \
-    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +91,9 @@
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
 - Update to 0.30
 - License is now versioned



From fedora-extras-commits at redhat.com  Sat Sep  8 15:39:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 8 Sep 2007 11:39:59 -0400
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.33,1.34
Message-ID: <200709081539.l88FdxeL000452@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv405

Modified Files:
	plt-scheme.spec 
Log Message:
restructured spec


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plt-scheme.spec	27 Aug 2007 22:21:26 -0000	1.33
+++ plt-scheme.spec	8 Sep 2007 15:39:27 -0000	1.34
@@ -1,10 +1,10 @@
 Name:           plt-scheme
 Version:        371
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.drscheme.org
 Source:		http://download.plt-scheme.org/bundles/371/plt/plt-371-src-unix.tgz
 Source1:	drscheme.png
@@ -68,40 +68,21 @@
 
 %build
 cd src
-CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS ./configure --enable-gl --enable-xrender --enable-xft
+CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS %configure --enable-gl --enable-xrender --enable-xft
 make # %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
-pushd src
-make install
-popd
-
-cp -fr bin collects doc include lib $RPM_BUILD_ROOT%{_libdir}/plt
-
-# clean up
-find $RPM_BUILD_ROOT%{_libdir}/plt -type d -exec chmod 0755 '{}' ';'
-rm -rf $RPM_BUILD_ROOT%{_libdir}/plt/collects/plot/src
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-pushd $RPM_BUILD_ROOT%{_bindir}
-  for i in ../%{_lib}/plt/bin/*
-  do
-    ln -sf $i .
-  done
-  # binary planet conflicts with other packages
-  rm -f planet
-  ln -sf ../%{_lib}/plt/bin/planet plt-planet
-popd
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cd src
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+
+mv $RPM_BUILD_ROOT%{_bindir}/planet $RPM_BUILD_ROOT%{_bindir}/plt-planet 
 
 cat > drscheme.desktop <<EOF
 [Desktop Entry]
@@ -133,12 +114,18 @@
 %doc readme.txt
 %{_bindir}/*
 %{_libdir}/plt
+%{_libdir}/*.a
 %{_mandir}/man*/*
+%{_datadir}/plt
+%{_includedir}/plt
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 
 %changelog
+* Tue Sep  4 2007 Gerard Milmeister <gemi at bluewin.ch> - 371-2
+- restructuring spec file
+
 * Mon Aug 20 2007 Gerard Milmeister <gemi at bluewin.ch> - 371-1
 - update to new release 371
 



From fedora-extras-commits at redhat.com  Sat Sep  8 15:43:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 8 Sep 2007 11:43:34 -0400
Subject: rpms/glob2/F-7 glob2-desktopfileinstall.patch, NONE,
	1.1 glob2-texts.pl.patch, NONE, 1.1 glob2.desktop, NONE,
	1.1 .cvsignore, 1.2, 1.3 glob2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709081543.l88FhYwF000638@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv605

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-desktopfileinstall.patch glob2-texts.pl.patch 
	glob2.desktop 
Log Message:
update to 0.9.1

glob2-desktopfileinstall.patch:

--- NEW FILE glob2-desktopfileinstall.patch ---
--- data/SConscript.orig	2007-09-02 05:14:54.000000000 +0200
+++ data/SConscript	2007-09-04 18:41:04.000000000 +0200
@@ -10,9 +10,9 @@
             env.Install(env["INSTALLDIR"] + "/glob2/data", file)
         
     
-    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
+#    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
     env.Alias("install", env["INSTALLDIR"]+"/glob2/data")
-    env.Alias("install", env["INSTALLDIR"]+"/applications")
+#    env.Alias("install", env["INSTALLDIR"]+"/applications")
     PackTar(env["TARFILE"], "SConscript")
     
 SConscript("fonts/SConscript")

glob2-texts.pl.patch:

--- NEW FILE glob2-texts.pl.patch ---
--- data/texts.pl.txt.orig	2007-09-02 05:14:55.000000000 +0200
+++ data/texts.pl.txt	2007-09-04 19:32:26.000000000 +0200
@@ -245,7 +245,7 @@
 [Damaged Map]
 
 [dblbuff]
-Podw????jne buforowanie
+Podw??jne buforowanie
 [decrease units working]
 
 [default terrain]
@@ -373,7 +373,7 @@
 [fruit]
 
 [fullscreen]
-Pe????ny ekran
+Pe??ny ekran
 [game full]
 Komplet graczy
 [game shortcuts]
@@ -691,7 +691,7 @@
 [sand]
 Piasek
 [save before quit?]
-Czy chcesz zapisa???? stan gry, przed jej zako????czeniem ?
+Czy chcesz zapisa?? stan gry, przed jej zako??czeniem ?
 [save game]
 Zapisz gr??
 [save map]
@@ -1077,7 +1077,7 @@
 [YESTS_CONNECTION_REFUSED_PROTOCOL_TOO_OLD]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? Twoja wersja Globulation 2 jest zbyt stara, by m??g?? si?? z ni?? komunikowa??.
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odm????wi???? po????????czenia bez dalszego wyja????nienia.
+Metaserwer YOG odm??wi?? po????czenia bez dalszego wyja??nienia.
 [YESTS_CONNECTION_REFUSED_USERNAME_ALLREADY_USED]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? tw??j login jest ju?? zaj??ty przez kogo?? innego.
 [YESTS_CREATED]
@@ -1099,7 +1099,7 @@
 [YOG_HELP_MSG]
 Komenda "/msg <nazwa> <wiadomo????>" pozwala Ci przes??a?? wiadomo???? do jednej osoby. Np. "/msg Daemon42 Twoje t??umaczenie ssie...". W skr??cie "/m"
 [You are no more marked as away]
-Nie jeste???? ju???? oznaczony jako nieaktywny.
+Nie jeste?? ju?? oznaczony jako nieaktywny.
 [You are now marked as away]
 Jeste?? oznaczony jako nieaktywny.
 [you have lost]


--- NEW FILE glob2.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
Icon=glob2.png
Terminal=false
Type=Application
Categories=Game;StrategyGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 May 2007 13:28:20 -0000	1.2
+++ .cvsignore	8 Sep 2007 15:43:01 -0000	1.3
@@ -1 +1 @@
-glob2-0.8.21.tar.gz
+glob2-0.9.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/glob2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glob2.spec	19 Aug 2007 22:18:19 -0000	1.3
+++ glob2.spec	8 Sep 2007 15:43:01 -0000	1.4
@@ -1,21 +1,21 @@
 Name:           glob2
-Version:        0.8.21
-Release:        3%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-0.8.21-texts.pl.patch
-#patch1 fixes CXXFLAGS
-Patch1:         glob2-0.8.21-configure.diff
+Patch0:         glob2-texts.pl.patch
+Patch1:         glob2-desktopfileinstall.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel,SDL-devel
+BuildRequires:  libvorbis-devel,scons
+BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
 %description
@@ -33,45 +33,42 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
-chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}
+chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 
-sed -i 's/MultipleArgs\=false/Encoding\=UTF\-8/' data/%{name}.desktop
-sed -i 's|Icon=glob2-icon-48x48.png|Icon=glob2.png|' data/%{name}.desktop
-touch -c -r aclocal.m4 configure configure.in
-sed -i 's|INSTALL_DATA = @INSTALL_DATA@|INSTALL_DATA = @INSTALL_DATA@ -p|' data/{gfx,gfx/cursor,fonts,gui,icons,zik}/Makefile.in
 
 %build
-%configure --disable-dependency-tracking
-make %{?_smp_mflags}
+scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
+mv $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --delete-original                               \
-        --remove-category Application                   \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        %{SOURCE3}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +84,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
+- update to 0.9.1
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3
 - License tag update
 * Tue May 22 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 13:28:20 -0000	1.2
+++ sources	8 Sep 2007 15:43:01 -0000	1.3
@@ -1 +1 @@
-3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz
+172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 15:51:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 8 Sep 2007 11:51:58 -0400
Subject: rpms/glob2/devel glob2-desktopfileinstall.patch, NONE,
	1.1 glob2-texts.pl.patch, NONE, 1.1 glob2.desktop, NONE,
	1.1 .cvsignore, 1.2, 1.3 glob2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709081551.l88FpwgO001349@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1295

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-desktopfileinstall.patch glob2-texts.pl.patch 
	glob2.desktop 
Log Message:
update to 0.9.1

glob2-desktopfileinstall.patch:

--- NEW FILE glob2-desktopfileinstall.patch ---
--- data/SConscript.orig	2007-09-02 05:14:54.000000000 +0200
+++ data/SConscript	2007-09-04 18:41:04.000000000 +0200
@@ -10,9 +10,9 @@
             env.Install(env["INSTALLDIR"] + "/glob2/data", file)
         
     
-    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
+#    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
     env.Alias("install", env["INSTALLDIR"]+"/glob2/data")
-    env.Alias("install", env["INSTALLDIR"]+"/applications")
+#    env.Alias("install", env["INSTALLDIR"]+"/applications")
     PackTar(env["TARFILE"], "SConscript")
     
 SConscript("fonts/SConscript")

glob2-texts.pl.patch:

--- NEW FILE glob2-texts.pl.patch ---
--- data/texts.pl.txt.orig	2007-09-02 05:14:55.000000000 +0200
+++ data/texts.pl.txt	2007-09-04 19:32:26.000000000 +0200
@@ -245,7 +245,7 @@
 [Damaged Map]
 
 [dblbuff]
-Podw????jne buforowanie
+Podw??jne buforowanie
 [decrease units working]
 
 [default terrain]
@@ -373,7 +373,7 @@
 [fruit]
 
 [fullscreen]
-Pe????ny ekran
+Pe??ny ekran
 [game full]
 Komplet graczy
 [game shortcuts]
@@ -691,7 +691,7 @@
 [sand]
 Piasek
 [save before quit?]
-Czy chcesz zapisa???? stan gry, przed jej zako????czeniem ?
+Czy chcesz zapisa?? stan gry, przed jej zako??czeniem ?
 [save game]
 Zapisz gr??
 [save map]
@@ -1077,7 +1077,7 @@
 [YESTS_CONNECTION_REFUSED_PROTOCOL_TOO_OLD]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? Twoja wersja Globulation 2 jest zbyt stara, by m??g?? si?? z ni?? komunikowa??.
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odm????wi???? po????????czenia bez dalszego wyja????nienia.
+Metaserwer YOG odm??wi?? po????czenia bez dalszego wyja??nienia.
 [YESTS_CONNECTION_REFUSED_USERNAME_ALLREADY_USED]
 Metaserwer YOG odm??wi?? po????czenia, poniewa?? tw??j login jest ju?? zaj??ty przez kogo?? innego.
 [YESTS_CREATED]
@@ -1099,7 +1099,7 @@
 [YOG_HELP_MSG]
 Komenda "/msg <nazwa> <wiadomo????>" pozwala Ci przes??a?? wiadomo???? do jednej osoby. Np. "/msg Daemon42 Twoje t??umaczenie ssie...". W skr??cie "/m"
 [You are no more marked as away]
-Nie jeste???? ju???? oznaczony jako nieaktywny.
+Nie jeste?? ju?? oznaczony jako nieaktywny.
 [You are now marked as away]
 Jeste?? oznaczony jako nieaktywny.
 [you have lost]


--- NEW FILE glob2.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
Icon=glob2.png
Terminal=false
Type=Application
Categories=Game;StrategyGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 May 2007 13:23:01 -0000	1.2
+++ .cvsignore	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-glob2-0.8.21.tar.gz
+glob2-0.9.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glob2.spec	25 Aug 2007 14:42:14 -0000	1.3
+++ glob2.spec	8 Sep 2007 15:51:25 -0000	1.4
@@ -1,21 +1,21 @@
 Name:           glob2
-Version:        0.8.21
-Release:        4%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-0.8.21-texts.pl.patch
-#patch1 fixes CXXFLAGS
-Patch1:         glob2-0.8.21-configure.diff
+Patch0:         glob2-texts.pl.patch
+Patch1:         glob2-desktopfileinstall.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel,SDL-devel
+BuildRequires:  libvorbis-devel,scons
+BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
 %description
@@ -33,45 +33,42 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
-chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}
+chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 
-sed -i 's/MultipleArgs\=false/Encoding\=UTF\-8/' data/%{name}.desktop
-sed -i 's|Icon=glob2-icon-48x48.png|Icon=glob2.png|' data/%{name}.desktop
-touch -c -r aclocal.m4 configure configure.in
-sed -i 's|INSTALL_DATA = @INSTALL_DATA@|INSTALL_DATA = @INSTALL_DATA@ -p|' data/{gfx,gfx/cursor,fonts,gui,icons,zik}/Makefile.in
 
 %build
-%configure --disable-dependency-tracking
-make %{?_smp_mflags}
+scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
+mv $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --delete-original                               \
-        --remove-category Application                   \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        %{SOURCE3}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +84,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
+- update to 0.9.1
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-4
 - BuildID rebuild
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 13:23:01 -0000	1.2
+++ sources	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz
+172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 15:53:35 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 11:53:35 -0400
Subject: rpms/vala/devel vala.spec,1.8,1.9
Message-ID: <200709081553.l88FrZRZ001448@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1427/devel

Modified Files:
	vala.spec 
Log Message:
License updates, and splitting of -vapigen subpackage for functionality and license reasons (it contains GPLv2 files)


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vala.spec	5 Sep 2007 22:03:10 -0000	1.8
+++ vala.spec	8 Sep 2007 15:53:02 -0000	1.9
@@ -1,10 +1,11 @@
 Name:           vala
 Version:        0.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPLv2.1
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2.1+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,18 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2.1+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
@@ -75,14 +88,22 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
-%{_bindir}/*gen
 %{_libdir}/libvala.so
-%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/%gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
 - Licensing and URL updates
 



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:15 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuFvT031987@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:15 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuGHL024965@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchcommits acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:17 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:17 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuIjO031993@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the commit acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Sat Sep  8 15:56:20 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Sat, 08 Sep 2007 08:56:20 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709081556.l88FuKKc031999@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the approveacls acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Sat Sep  8 16:24:35 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:24:35 -0400
Subject: rpms/audio-convert-mod/devel acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081624.l88GOZbV009722@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9602

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help



acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:35:16 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:02 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:24:47 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:24:47 -0400
Subject: rpms/audio-convert-mod/FC-6 acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081624.l88GOlJ2009767@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help



acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:42:03 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:15 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:25:01 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Sat, 8 Sep 2007 12:25:01 -0400
Subject: rpms/audio-convert-mod/F-7 acm-runapp.py-usage.patch, NONE,
	1.1 audio-convert-mod.spec, 1.2, 1.3
Message-ID: <200709081625.l88GP1Vl009820@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help


acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-7/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:38:14 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:28 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871



From fedora-extras-commits at redhat.com  Sat Sep  8 16:26:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat,  8 Sep 2007 12:26:41 -0400
Subject: fedora-accounts passwd-template-cvschroot,1.1,1.2
Message-ID: <200709081626.l88GQfH6009985@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9965

Modified Files:
	passwd-template-cvschroot 
Log Message:
Added transifex users


Index: passwd-template-cvschroot
===================================================================
RCS file: /cvs/fedora/fedora-accounts/passwd-template-cvschroot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- passwd-template-cvschroot	25 Mar 2005 00:38:55 -0000	1.1
+++ passwd-template-cvschroot	8 Sep 2007 16:26:39 -0000	1.2
@@ -3,3 +3,7 @@
 daemon:x:2:2:daemon:/sbin:/sbin/nologin
 nobody:x:99:99:Nobody:/:/sbin/nologin
 sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin
+transifexcvs:x:401:401:Transifex CVS User:/home/transifexcvs:/bin/sh
+transifexgit:x:402:402:Transifex CVS User:/home/transifexgit:/bin/sh
+transifexhg:x:403:403:Transifex CVS User:/home/transifexhg:/bin/sh
+transifexsvn:x:404:404:Transifex CVS User:/home/transifexsvn:/bin/sh



From fedora-extras-commits at redhat.com  Sat Sep  8 17:05:43 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 8 Sep 2007 13:05:43 -0400
Subject: rpms/libflaim/F-7 libflaim.spec,1.5,1.6
Message-ID: <200709081705.l88H5hZY019190@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19135

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/F-7/libflaim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libflaim.spec	8 Sep 2007 12:10:14 -0000	1.5
+++ libflaim.spec	8 Sep 2007 17:05:10 -0000	1.6
@@ -9,14 +9,13 @@
 #
 
 Name:		libflaim
-BuildRequires:	util-linux-ng
 BuildRequires:	libstdc++ 
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -74,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-15
+- change for 64 bit build
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-14
 - util-linux-ng for buildsys
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:13:25 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:13:25 -0400
Subject: rpms/vala/devel vala.spec,1.9,1.10
Message-ID: <200709081713.l88HDPfr019495@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465/devel

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vala.spec	8 Sep 2007 15:53:02 -0000	1.9
+++ vala.spec	8 Sep 2007 17:12:52 -0000	1.10
@@ -5,7 +5,7 @@
 
 Group:          Development/Languages
 # Most files are LGPLv2.1+, curses.vala is 2-clause BSD
-License:        LGPLv2.1+ and BSD
+License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Summary:        Bindings generators for %{name}
 Group:          Development/Languages
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
-License:        LGPLv2.1+ and GPLv2
+License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl-XML-LibXML
 
@@ -93,7 +93,7 @@
 
 %files vapigen
 %defattr(-,root,root,-)
-%{_bindir}/%gen
+%{_bindir}/*gen
 %{_libdir}/vala
 
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:21:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:21:11 -0400
Subject: upgradecheck upgradecheck.py,1.37,1.38 upgradecheckspam.py,1.4,1.5
Message-ID: <200709081721.l88HLBe6019776@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19754

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Whitelist kde*-extras from FE6->F7, https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- upgradecheck.py	6 Sep 2007 21:28:15 -0000	1.37
+++ upgradecheck.py	8 Sep 2007 17:21:09 -0000	1.38
@@ -50,12 +50,11 @@
 # (not really doable as long as we operate on SRPMS): per-package tuples of
 # known good paths
 known_good = {
-#    'koffice': (('FL3-updates', 'FE4'),
-#                ('FL3-updates', 'FE5'),
-#                ('FL3-updates', 'FE6'),
-#                ('FL3-updates', 'FE7'),
-#                ),
-    }
+    # kde*-extras: https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html
+    'kdeartwork-extras':    (('FE6', 'F7'),),
+    'kdegraphics-extras':   (('FE6', 'F7'),),
+    'kdemultimedia-extras': (('FE6', 'F7'),),
+}
 
 # Where to checkout owners/owners.list
 ownersworkdir = '/srv/extras-push/work'


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upgradecheckspam.py	3 Sep 2007 17:56:43 -0000	1.4
+++ upgradecheckspam.py	8 Sep 2007 17:21:09 -0000	1.5
@@ -50,12 +50,11 @@
 # (not really doable as long as we operate on SRPMS): per-package tuples of
 # known good paths
 known_good = {
-#    'koffice': (('FL3-updates', 'FE4'),
-#                ('FL3-updates', 'FE5'),
-#                ('FL3-updates', 'FE6'),
-#                ('FL3-updates', 'FE7'),
-#                ),
-    }
+    # kde*-extras: https://www.redhat.com/archives/fedora-devel-list/2007-September/msg00643.html
+    'kdeartwork-extras':    (('FE6', 'F7'),),
+    'kdegraphics-extras':   (('FE6', 'F7'),),
+    'kdemultimedia-extras': (('FE6', 'F7'),),
+}
 
 # Where to checkout owners/owners.list
 ownersworkdir = '/srv/extras-push/work'



From fedora-extras-commits at redhat.com  Sat Sep  8 17:23:20 2007
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sat, 8 Sep 2007 13:23:20 -0400
Subject: rpms/mach/devel .cvsignore, 1.5, 1.6 mach.spec, 1.13, 1.14 sources, 
	1.6, 1.7
Message-ID: <200709081723.l88HNKSW019937@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19873

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
update to 0.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2007 21:47:36 -0000	1.5
+++ .cvsignore	8 Sep 2007 17:22:47 -0000	1.6
@@ -1 +1 @@
-mach-0.9.1.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mach.spec	16 Aug 2007 09:19:13 -0000	1.13
+++ mach.spec	8 Sep 2007 17:22:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mach
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -102,6 +102,10 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
 * Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
 - License: GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:47:36 -0000	1.6
+++ sources	8 Sep 2007 17:22:47 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 17:23:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:23:44 -0400
Subject: upgradecheck upgradecheck-fedora.conf, NONE,
	1.1 upgradecheck-extras.conf, 1.5, NONE
Message-ID: <200709081723.l88HNiRV019997@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19980

Added Files:
	upgradecheck-fedora.conf 
Removed Files:
	upgradecheck-extras.conf 
Log Message:
core+extras -> fedora, remove separate extras config


--- NEW FILE upgradecheck-fedora.conf ---
[main]
metadata_expire=0
keepcache=0
reposdir=

[FC4]
name=FC4
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/i386/os/

[FC5]
name=FC5
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/source/SRPMS/

[FC6]
name=FC6
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS/

[F7]
name=F7
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/7/Everything/source/SRPMS/

[F8]
name=F8
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/

[FC4-updates]
name=FC4-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/SRPMS/

[FC5-updates]
name=FC5-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/SRPMS/

[FC6-updates]
name=FC6-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS/

[F7-updates]
name=F7-updates
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/7/SRPMS/

[F7-updates-testing]
name=F7-updates-testing
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/7/SRPMS/

[FE4]
name=FE4
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/4/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/4/SRPMS/

[FE5]
name=FE5
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/5/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/5/SRPMS/

[FE6]
name=FE6
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/


--- upgradecheck-extras.conf DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 17:25:47 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:25:47 -0400
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.60,1.61
Message-ID: <200709081725.l88HPlKf020107@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087/pushscript

Modified Files:
	Config_Extras.py 
Log Message:
core+extras -> fedora


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Config_Extras.py	28 Aug 2007 11:37:21 -0000	1.60
+++ Config_Extras.py	8 Sep 2007 17:25:45 -0000	1.61
@@ -149,7 +149,7 @@
 #repoview = '/usr/bin/repoview'
 repoview = '/srv/extras-push/work/repoview -q'
 
-#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
+#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-fedora.conf'),
 #             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py --mail=owners --mail=summary &'
 #             ]
 post_cmds = []



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:23 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:27:23 -0400
Subject: rpms/vala/F-7 vala.spec,1.5,1.6
Message-ID: <200709081727.l88HRNKt020237@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/F-7

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vala.spec	5 Sep 2007 22:03:06 -0000	1.5
+++ vala.spec	8 Sep 2007 17:26:50 -0000	1.6
@@ -1,10 +1,11 @@
 Name:           vala
 Version:        0.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPLv2.1
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,18 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
@@ -75,14 +88,22 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-1.0
-%{_bindir}/*gen
 %{_libdir}/libvala.so
-%{_libdir}/vala
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/*gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
 - Licensing and URL updates
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:26 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 8 Sep 2007 13:27:26 -0400
Subject: rpms/vala/FC-6 vala.spec,1.3,1.4
Message-ID: <200709081727.l88HRQn5020240@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/FC-6

Modified Files:
	vala.spec 
Log Message:
msg


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/FC-6/vala.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vala.spec	25 Mar 2007 16:01:59 -0000	1.3
+++ vala.spec	8 Sep 2007 17:26:53 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           vala
-Version:        0.0.8
-Release:        1%{?dist}
+Version:        0.1.3
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
-License:        LGPL
-URL:            http://vala.paldo.org/
-Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
+# Most files are LGPLv2.1+, curses.vala is 2-clause BSD
+License:        LGPLv2+ and BSD
+URL:            http://live.gnome.org/Vala
+Source0:        http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel flex bison
@@ -38,13 +39,25 @@
 Development files for %{name}. This is not necessary for using the %{name}
 compiler.
 
+%package        vapigen
+Summary:        Bindings generators for %{name}
+Group:          Development/Languages
+# Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
+License:        LGPLv2+ and GPLv2
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl-XML-LibXML
+
+%description    vapigen
+Tools to generate Vala API bindings from existing C libraries, allowing access
+from Vala programs.
+
 
 %prep
 %setup -q
 
 
 %build
-%configure
+%configure --enable-vapigen
 # 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
@@ -70,6 +83,7 @@
 %{_bindir}/valac
 %{_datadir}/vala
 %{_libdir}/libvala.so.*
+%{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -77,9 +91,28 @@
 %{_libdir}/libvala.so
 %{_libdir}/pkgconfig/vala-1.0.pc
 
+%files vapigen
+%defattr(-,root,root,-)
+%{_bindir}/*gen
+%{_libdir}/vala
+
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
+- Split -vapigen subpackage. It is functionally self-contained and the license
+  is more restricted
+- Updated license declarations
+
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-3
+- Licensing and URL updates
+
+* Tue Sep  4 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-2
+- Enable binding generation tools
+
+* Sun Sep  2 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-1
+- Update to 0.1.3
+
 * Sun Mar 25 2007 Michel Salim <michel.salim at gmail.com> - 0.0.8-1
 - Update to 0.0.8
 



From fedora-extras-commits at redhat.com  Sat Sep  8 17:27:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:27:33 -0400
Subject: upgradecheck upgradecheck-core+extras.conf,1.9,NONE
Message-ID: <200709081727.l88HRXrx020266@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20250

Removed Files:
	upgradecheck-core+extras.conf 
Log Message:
Oops, previous commit was supposed to remove this too


--- upgradecheck-core+extras.conf DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 17:39:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:39:17 -0400
Subject: upgradecheck upgradecheck-epel.conf,NONE,1.1
Message-ID: <200709081739.l88HdHgJ020686@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669

Added Files:
	upgradecheck-epel.conf 
Log Message:
Add EPEL config


--- NEW FILE upgradecheck-epel.conf ---
[main]
metadata_expire=0
keepcache=0
reposdir=

[EL4]
name=EL4
baseurl=http://mirror.centos.org/centos/4/os/SRPMS/

[EL5]
name=EL5
baseurl=http://mirror.centos.org/centos/5/os/SRPMS/

[EL4-updates]
name=EL4-updates
baseurl=http://mirror.centos.org/centos/4/updates/SRPMS/

[EL5-updates]
name=EL5-updates
baseurl=http://mirror.centos.org/centos/5/updates/SRPMS/

[EPEL4]
name=EPEL4
#baseurl=http://download.fedora.redhat.com/pub/epel/4/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/4/SRPMS/

[EPEL5]
name=EPEL5
#baseurl=http://download.fedora.redhat.com/pub/epel/5/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/5/SRPMS/

[EPEL4-testing]
name=EPEL4-testing
#baseurl=http://download.fedora.redhat.com/pub/epel/testing/4/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/testing/4/SRPMS/

[EPEL5-testing]
name=EPEL5-testing
#baseurl=http://download.fedora.redhat.com/pub/epel/testing/5/SRPMS/
baseurl=file:///srv/rpmbuild/epel/tree/epel/testing/5/SRPMS/



From fedora-extras-commits at redhat.com  Sat Sep  8 17:40:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  8 Sep 2007 13:40:20 -0400
Subject: extras-buildsys/utils/pushscript Config_EPEL.py,1.9,1.10
Message-ID: <200709081740.l88HeKp2020731@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20713

Modified Files:
	Config_EPEL.py 
Log Message:
Point to EPEL upgradecheck configs (still commented out)


Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Config_EPEL.py	6 Sep 2007 06:41:56 -0000	1.9
+++ Config_EPEL.py	8 Sep 2007 17:40:17 -0000	1.10
@@ -132,7 +132,7 @@
 repoview = '/srv/extras-push/work/repoview -q'
 
 post_cmds = []
-#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
+#post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-epel.conf'),
 #             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py --mail=owners --mail=summary &'
 #             ]
 



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:47 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:47 -0400
Subject: rpms/cksfv/F-7 .cvsignore, 1.6, 1.7 cksfv.spec, 1.16, 1.17 sources, 
	1.6, 1.7
Message-ID: <200709081807.l88I7lcq027850@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/F-7

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:01 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:14 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/cksfv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cksfv.spec	14 Jul 2007 02:26:01 -0000	1.16
+++ cksfv.spec	8 Sep 2007 18:07:14 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           cksfv
-Version:        1.3.11
+Version:        1.3.12
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -43,6 +43,12 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
+- Rebuild for selinux ppc32 issue.
+
 * Fri Jul 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.11-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:02 -0000	1.6
+++ sources	8 Sep 2007 18:07:14 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:50 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:50 -0400
Subject: rpms/cksfv/FC-6 .cvsignore, 1.6, 1.7 cksfv.spec, 1.16, 1.17 sources,
	1.6, 1.7
Message-ID: <200709081807.l88I7ovM027861@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/FC-6

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:04 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:17 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/cksfv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cksfv.spec	14 Jul 2007 02:26:04 -0000	1.16
+++ cksfv.spec	8 Sep 2007 18:07:17 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           cksfv
-Version:        1.3.11
+Version:        1.3.12
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -43,6 +43,12 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
+- Rebuild for selinux ppc32 issue.
+
 * Fri Jul 13 2007 Christopher Stone <chris.stone at gmail.com> 1.3.11-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:04 -0000	1.6
+++ sources	8 Sep 2007 18:07:17 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:07:53 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:07:53 -0400
Subject: rpms/cksfv/devel .cvsignore, 1.6, 1.7 cksfv.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200709081807.l88I7rYg027871@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/cksfv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27785/devel

Modified Files:
	.cvsignore cksfv.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jul 2007 02:26:07 -0000	1.6
+++ .cvsignore	8 Sep 2007 18:07:20 -0000	1.7
@@ -1 +1 @@
-cksfv-1.3.11.tar.gz
+cksfv-1.3.12.tar.gz


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cksfv.spec	28 Aug 2007 17:32:51 -0000	1.17
+++ cksfv.spec	8 Sep 2007 18:07:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           cksfv
-Version:        1.3.11
-Release:        2%{?dist}
+Version:        1.3.12
+Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
 Group:          Applications/File
@@ -43,6 +43,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.12-1
+- Upstream sync
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.3.11-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cksfv/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2007 02:26:07 -0000	1.6
+++ sources	8 Sep 2007 18:07:20 -0000	1.7
@@ -1 +1 @@
-03460f39d973bdf7d06e8f38270703bc  cksfv-1.3.11.tar.gz
+dc22d32db2bf8fdaa37e83e3484a5407  cksfv-1.3.12.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:12:47 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 8 Sep 2007 14:12:47 -0400
Subject: rpms/liferea/devel .cvsignore, 1.61, 1.62 liferea.spec, 1.90,
	1.91 sources, 1.62, 1.63
Message-ID: <200709081812.l88ICl8i028108@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
- Update to 1.2.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	21 Aug 2007 17:12:01 -0000	1.61
+++ .cvsignore	8 Sep 2007 18:12:14 -0000	1.62
@@ -1 +1 @@
-liferea-1.2.22.tar.gz
+liferea-1.2.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- liferea.spec	21 Aug 2007 17:12:01 -0000	1.90
+++ liferea.spec	8 Sep 2007 18:12:14 -0000	1.91
@@ -1,7 +1,7 @@
 %define gecko_ver 1.8.1.6
 
 Name:           liferea
-Version:        1.2.22
+Version:        1.2.23
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
+- Update to 1.2.23.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.22-1
 - Update to 1.2.22.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	21 Aug 2007 17:12:01 -0000	1.62
+++ sources	8 Sep 2007 18:12:14 -0000	1.63
@@ -1 +1 @@
-e76a449651e0b019101207f2f6b0c8be  liferea-1.2.22.tar.gz
+2d910c60f063a7d274d69815ca55d002  liferea-1.2.23.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:43:52 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 8 Sep 2007 14:43:52 -0400
Subject: rpms/liferea/F-7 .cvsignore, 1.55, 1.56 liferea.spec, 1.83,
	1.84 sources, 1.56, 1.57
Message-ID: <200709081843.l88IhqS6002602@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/liferea/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2439

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
- Update to 1.2.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	3 Jul 2007 15:15:43 -0000	1.55
+++ .cvsignore	8 Sep 2007 18:43:20 -0000	1.56
@@ -1 +1 @@
-liferea-1.2.19.tar.gz
+liferea-1.2.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/liferea.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- liferea.spec	5 Aug 2007 21:16:23 -0000	1.83
+++ liferea.spec	8 Sep 2007 18:43:20 -0000	1.84
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.5
 
 Name:           liferea
-Version:        1.2.19
-Release:        4%{?dist}
+Version:        1.2.23
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.23-1
+- Update to 1.2.23.
+
 * Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.19-4
 - Update license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-7/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	3 Jul 2007 15:15:43 -0000	1.56
+++ sources	8 Sep 2007 18:43:20 -0000	1.57
@@ -1 +1 @@
-c1045a6e2c8a6192beb9d72b3e435645  liferea-1.2.19.tar.gz
+2d910c60f063a7d274d69815ca55d002  liferea-1.2.23.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:20 -0400
Subject: rpms/perl-MP3-Info/F-7 .cvsignore, 1.3, 1.4 perl-MP3-Info.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiKIg002753@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/F-7

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:43 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:47 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Jan 2007 02:37:15 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:47 -0000	1.6
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
-Release:        1%{?dist}.1
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,9 +49,11 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
-* Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1.fc7.1
-- Retag release bump
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
 
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:43 -0000	1.3
+++ sources	8 Sep 2007 18:43:47 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:22 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:22 -0400
Subject: rpms/perl-MP3-Info/FC-6 .cvsignore, 1.3, 1.4 perl-MP3-Info.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiMck002769@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/FC-6

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:38 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:50 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MP3-Info.spec	8 Jan 2007 02:09:38 -0000	1.4
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:50 -0000	1.5
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
+Version:        1.22
 Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,7 +49,12 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
+
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:38 -0000	1.3
+++ sources	8 Sep 2007 18:43:50 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:44:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:44:25 -0400
Subject: rpms/perl-MP3-Info/devel .cvsignore, 1.3, 1.4 perl-MP3-Info.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709081844.l88IiPIf002785@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2555/devel

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2007 02:09:43 -0000	1.3
+++ .cvsignore	8 Sep 2007 18:43:53 -0000	1.4
@@ -1 +1 @@
-MP3-Info-1.21.tar.gz
+MP3-Info-1.22.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Jan 2007 02:37:15 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:43:53 -0000	1.6
@@ -1,38 +1,47 @@
 Name:           perl-MP3-Info
-Version:        1.21
-Release:        1%{?dist}.1
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
+
 Group:          Development/Libraries
 License:        Artistic or GPL
-URL:            http://search.cpan.org/dist/MP3-Info/
+URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is used for getting info out of and into MP3 files.
 
+
 %prep
-%setup -q -n MP3-Info-%{version}
+%setup -qn MP3-Info-%{version}
+
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+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} -type d -depth -exec rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+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' -a -size 0 -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
+make test
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -40,9 +49,11 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
-* Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1.fc7.1
-- Retag release bump
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
+- Upstream sync
+- spec file cleanups
 
 * Sun Jan 07 2007 Christopher Stone <chris.stone at gmail.com> 1.21-1
 - Upstream sync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2007 02:09:43 -0000	1.3
+++ sources	8 Sep 2007 18:43:53 -0000	1.4
@@ -1 +1 @@
-c95e7d179b41c255a75060afd0f9c93b  MP3-Info-1.21.tar.gz
+ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:12 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:12 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081857.l88IvCVt005664@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:43:47 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:14 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.5,1.6
Message-ID: <200709081857.l88IvEhZ005679@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MP3-Info.spec	8 Sep 2007 18:43:50 -0000	1.5
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 18:57:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 14:57:17 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081857.l88IvHWY005694@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5418/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
add BR for perl(ExtUtils::MakeMaker)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:43:53 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 18:56:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 
 %description
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
+- Add BuildRequires perl(ExtUtils::MakeMaker)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-1
 - Upstream sync
 - spec file cleanups



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:38 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:38 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.7,1.8
Message-ID: <200709081903.l88J3c4a012814@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 18:56:39 -0000	1.7
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:42 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:42 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.6,1.7
Message-ID: <200709081903.l88J3gxD012831@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MP3-Info.spec	8 Sep 2007 18:56:42 -0000	1.6
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:03:46 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:03:46 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.7,1.8
Message-ID: <200709081903.l88J3kZJ012834@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
Add BR perl(Test::More)


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 18:56:45 -0000	1.7
+++ perl-MP3-Info.spec	8 Sep 2007 19:03:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
 Version:        1.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
 
 
 %description
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
+- Add BuildRequires perl(Test::More)
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-2
 - Add BuildRequires perl(ExtUtils::MakeMaker)
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:04:09 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:04:09 -0400
Subject: rpms/blam/F-7 blam.spec,1.11,1.12
Message-ID: <200709081904.l88J495r012874@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12808

Modified Files:
	blam.spec 
Log Message:
Sync with devel branch: Add gnome-sharp runtime dependency (fixes bug 253200); and update License tag for new guidelines.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-7/blam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blam.spec	18 Jul 2007 09:05:51 -0000	1.11
+++ blam.spec	8 Sep 2007 19:03:36 -0000	1.12
@@ -5,11 +5,11 @@
 
 Name:		blam
 Version:	1.8.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.cmartin.tk/blam.html
 
 Source0:	http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@
 Requires:	dbus-sharp >= %{dbus_sharp_min_version}	
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
+Requires:	gnome-sharp
 
 Requires(pre):	GConf2
 
@@ -124,6 +125,10 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-6
+- Add gnome-sharp runtime dependency; fixes bug 253200.
+- Update License tag in accordance with new guidelines.
+
 * Wed Jul 18 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-5
 - Rebuild for newer Gecko libraries (Firefox 2.0.0.5)
 - Depend on the gecko-libs and gecko-devel virtuals, instead of querying RPM



From fedora-extras-commits at redhat.com  Sat Sep  8 19:11:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:11:53 -0400
Subject: rpms/smart/devel ksmarttray.desktop, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.11, 1.12
Message-ID: <200709081911.l88JBrXx013354@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315

Modified Files:
	.cvsignore sources 
Added Files:
	ksmarttray.desktop 
Log Message:
Move ksmarttray.desktop to CVS instead of lookaside cache for tracking purposes.


--- NEW FILE ksmarttray.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KSmartTray
Comment=Keep up to date with package updates
Exec=ksmarttray
Type=Application
Terminal=false
Categories=System;KDE;Monitor;TrayIcon;Applet;
OnlyShowIn=TrayIcon;Applet;
Icon=ksmarttray


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Feb 2007 00:47:01 -0000	1.8
+++ .cvsignore	8 Sep 2007 19:11:20 -0000	1.9
@@ -1,5 +1,4 @@
 smart-0.50.tar.bz2
 smart-0.50-ccache.patch
 smart-0.42-autofs5fix.patch
-ksmarttray.desktop
 smart-0.50-auto.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Aug 2007 22:46:52 -0000	1.11
+++ sources	8 Sep 2007 19:11:20 -0000	1.12
@@ -2,4 +2,3 @@
 044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
 371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
 258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
-9480428b470ef9af0a92a14445bb191b  ksmarttray.desktop



From fedora-extras-commits at redhat.com  Sat Sep  8 19:26:56 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:26:56 -0400
Subject: rpms/smart/devel ksmarttray.desktop,1.1,1.2 smart.spec,1.23,1.24
Message-ID: <200709081926.l88JQuq4013842@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13758

Modified Files:
	ksmarttray.desktop smart.spec 
Log Message:
* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
- KSmartTray desktop entry fixes.
- License: GPLv2+



Index: ksmarttray.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/ksmarttray.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksmarttray.desktop	8 Sep 2007 19:11:20 -0000	1.1
+++ ksmarttray.desktop	8 Sep 2007 19:26:24 -0000	1.2
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KSmartTray
 Comment=Keep up to date with package updates
 Exec=ksmarttray
 Type=Application
 Terminal=false
 Categories=System;KDE;Monitor;TrayIcon;Applet;
-OnlyShowIn=TrayIcon;Applet;
+OnlyShowIn=GNOME;KDE;XFCE;
 Icon=ksmarttray


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/smart.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- smart.spec	17 Aug 2007 19:46:04 -0000	1.23
+++ smart.spec	8 Sep 2007 19:26:24 -0000	1.24
@@ -7,8 +7,8 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.50
-Release: 47%{?dist}
-License: GPL
+Release: 48%{?dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
 Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
@@ -207,6 +207,10 @@
 %endif
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
+- KSmartTray desktop entry fixes.
+- License: GPLv2+
+
 * Thu Aug  2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
 - Add kernel-tuxonice series support.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:28:40 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:28:40 -0400
Subject: rpms/blam/devel blam.spec,1.15,1.16
Message-ID: <200709081928.l88JSeGg013936@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	blam.spec 
Log Message:
Add mono-web runtime dependency.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/blam.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blam.spec	17 Aug 2007 21:58:27 -0000	1.15
+++ blam.spec	8 Sep 2007 19:28:07 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -40,6 +40,7 @@
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
 Requires:	gnome-sharp
+Requires:	mono-web
 
 Requires(pre):	GConf2
 
@@ -125,6 +126,10 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Sat Sep 08 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-8
+- Add mono-web runtime dependency; fixes bugs 282331 (Blam does not open
+  links with commas correctly) and 277561 (Blam does nothing useful).
+
 * Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-7
 - Add gnome-sharp runtime dependency; fixes bug 253200.
 - Update License tag in accordance with new guidelines.



From fedora-extras-commits at redhat.com  Sat Sep  8 19:30:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 15:30:22 -0400
Subject: rpms/chrpath/devel chrpath.spec,1.2,1.3
Message-ID: <200709081930.l88JUMXn014104@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/chrpath/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14024

Modified Files:
	chrpath.spec 
Log Message:
* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.13-2
- License: GPL+



Index: chrpath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chrpath/devel/chrpath.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chrpath.spec	30 Aug 2006 00:27:33 -0000	1.2
+++ chrpath.spec	8 Sep 2007 19:29:49 -0000	1.3
@@ -1,8 +1,8 @@
 Summary: Modify rpath of compiled programs
 Name: chrpath
 Version: 0.13
-Release: 1.1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPL+
 Group: Development/Tools
 URL: ftp://ftp.hungry.com/pub/hungry/chrpath/
 Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz
@@ -36,6 +36,9 @@
 %{_mandir}/man1/chrpath.1*
 
 %changelog
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.13-2
+- License: GPL+
+
 * Sun Mar 12 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.13-1
 - Initial build.
 



From fedora-extras-commits at redhat.com  Sat Sep  8 19:31:26 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 8 Sep 2007 15:31:26 -0400
Subject: rpms/blam/F-7 blam.spec,1.12,1.13
Message-ID: <200709081931.l88JVQkN014188@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/blam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14137

Modified Files:
	blam.spec 
Log Message:
Add mono-web dependency.


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-7/blam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blam.spec	8 Sep 2007 19:03:36 -0000	1.12
+++ blam.spec	8 Sep 2007 19:30:54 -0000	1.13
@@ -40,6 +40,7 @@
 Requires:	gecko-sharp2
 Requires:	gecko-libs = %{gecko_version}
 Requires:	gnome-sharp
+Requires:	mono-web
 
 Requires(pre):	GConf2
 
@@ -126,7 +127,9 @@
 
 %changelog
 * Fri Aug 17 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-6
-- Add gnome-sharp runtime dependency; fixes bug 253200.
+- Add gnome-sharp and mono-web runtime dependencies; fixes bugs 282331 (Blam
+  does not open links with commas correctly) and 277561 (Blam does nothing
+  useful).
 - Update License tag in accordance with new guidelines.
 
 * Wed Jul 18 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-5



From fedora-extras-commits at redhat.com  Sat Sep  8 19:35:58 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:35:58 -0400
Subject: rpms/php-pecl-radius/F-7 .cvsignore, 1.2, 1.3 php-pecl-radius.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081935.l88JZw3H014464@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/F-7

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:24:47 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:26 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:24:47 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:26 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:24:47 -0000	1.2
+++ sources	8 Sep 2007 19:35:26 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:36:04 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:36:04 -0400
Subject: rpms/php-pecl-radius/devel .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081936.l88Ja4JR014474@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/devel

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:24:47 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:31 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:24:47 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:31 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:24:47 -0000	1.2
+++ sources	8 Sep 2007 19:35:31 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:36:01 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:36:01 -0400
Subject: rpms/php-pecl-radius/FC-6 .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081936.l88Ja1XT014469@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14401/FC-6

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:26:07 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:35:28 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:26:07 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:35:29 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:26:07 -0000	1.2
+++ sources	8 Sep 2007 19:35:29 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:42:52 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:42:52 -0400
Subject: rpms/qgit/devel .cvsignore, 1.13, 1.14 qgit.spec, 1.18, 1.19 sources,
	1.13, 1.14
Message-ID: <200709081942.l88JgqNA014803@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14732

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:36:41 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:42:20 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	21 Aug 2007 15:19:29 -0000	1.18
+++ qgit.spec	8 Sep 2007 19:42:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           qgit
-Version:        1.5.6
-Release:        2%{?dist}
+Version:        1.5.7
+Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
 Group:          Development/Tools
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+
 * Tue Aug 21 2007 Dan Horak <dan[at]danny.cz> 1.5.6-2
 - update license tag
 - rebuild for F8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:36:41 -0000	1.13
+++ sources	8 Sep 2007 19:42:20 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:43:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 15:43:15 -0400
Subject: rpms/php-pecl-radius/EL-5 .cvsignore, 1.2, 1.3 php-pecl-radius.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709081943.l88JhF9I014824@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14775/EL-5

Modified Files:
	.cvsignore php-pecl-radius.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 05:26:07 -0000	1.2
+++ .cvsignore	8 Sep 2007 19:42:42 -0000	1.3
@@ -1 +1 @@
-radius-1.2.4.tgz
+radius-1.2.5.tgz


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/php-pecl-radius.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-radius.spec	13 Mar 2007 05:26:07 -0000	1.1
+++ php-pecl-radius.spec	8 Sep 2007 19:42:42 -0000	1.2
@@ -2,8 +2,8 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-pecl-radius
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
+- Upstream sync
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 1.2.4-2
 - Use new ABI check for FC-6
 - Create directory to untar sources


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 05:26:07 -0000	1.2
+++ sources	8 Sep 2007 19:42:42 -0000	1.3
@@ -1 +1 @@
-3d48ccb9486b9e8839d814d7ff318091  radius-1.2.4.tgz
+25d867dab8def71ab1b3e2410491ff4d  radius-1.2.5.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:48:55 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:48:55 -0400
Subject: rpms/qgit/F-7 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources, 
	1.13, 1.14
Message-ID: <200709081948.l88JmtBx015160@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:54:11 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:48:22 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:50 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:48:22 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:54:11 -0000	1.13
+++ sources	8 Sep 2007 19:48:22 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:52:25 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Sat, 8 Sep 2007 15:52:25 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.72, 1.73 setroubleshoot.init,
	1.9, 1.10 setroubleshoot.spec, 1.87, 1.88 sources, 1.83, 1.84
Message-ID: <200709081952.l88JqPDG015495@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15413/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	12 Jun 2007 21:01:44 -0000	1.72
+++ .cvsignore	8 Sep 2007 19:51:52 -0000	1.73
@@ -1 +1 @@
-setroubleshoot-1.9.7.tar.gz
+setroubleshoot-1.10.3.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setroubleshoot.init	15 Sep 2006 20:52:45 -0000	1.9
+++ setroubleshoot.init	8 Sep 2007 19:51:52 -0000	1.10
@@ -9,22 +9,50 @@
 # config: /etc/setroubleshoot/setroubleshoot.cfg
 # pidfile: /var/run/setroubleshoot.pid
 #
+
+### BEGIN INIT INFO
+# Provides: lsb-setroubleshootd
+# Required-Start: $local_fs $syslog $network $named
+# Required-Stop: $local_fs $syslog $network $named
+# Default-Start:  3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop SELinux Troubleshooting Daemon
+# Description: controls operation of the SELinux Troubleshooting Daemon
+#	(setroubleshootd) which listens for SELinux AVC denial messages
+#	analyzes it and provides a friendly interpretation.
+### END INIT INFO
+
 # Return values according to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - insufficient privilege
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
+# 0	success
+# 1	generic or unspecified error (current practice)
+# 2	invalid or excess argument(s)
+# 3	unimplemented feature (for example, "reload")
+# 4	user had insufficient privilege
+# 5	program is not installed
+# 6	program is not configured
+# 7	program is not running
+
+# Command argument
+# start		start the service
+# stop		stop the service
+# restart	stop and restart the service if the service is already running, otherwise start the service
+# try-restart	restart the service if the service is already running
+# reload	cause the configuration of the service to be reloaded without actually stopping and restarting the service
+# force-reload	cause the configuration to be reloaded if the service supports this, otherwise restart the service if it is running
+# status	print the current status of the service
+
+# start, stop, restart, force-reload, and status actions must be supported
+# reload and the try-restart actions are optional.
+# the init script.
+
+
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
+# /lib/lsb/init-functions
 . /etc/init.d/functions
 
-
 # Silently exit is SELinux is not enabled
 [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
@@ -99,17 +127,17 @@
     restart)
 	restart
 	;;
-    reload)
+    force-reload|reload)
 	reload
 	;;
-    condrestart)
+    try-restart|condrestart)
 	condrestart
 	;;
     cleardb)
 	cleardb
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|cleardb}"
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload|cleardb}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- setroubleshoot.spec	12 Jun 2007 21:01:44 -0000	1.87
+++ setroubleshoot.spec	8 Sep 2007 19:51:52 -0000	1.88
@@ -1,10 +1,10 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.9.7
+Version: 1.10.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
-URL: http://www.redhat.com/ 
+URL: https://hosted.fedoraproject.org/projects/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source1: setroubleshoot.init
 Source2: setroubleshoot.logrotate
@@ -12,25 +12,32 @@
 BuildArch: noarch
 BuildRequires: perl-XML-Parser
 Requires: %{name}-server = %{version}-%{release} 
+Requires: %{name}-plugins
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2, gnome-python2-canvas 
-Requires: usermode, rhpl
 BuildRequires: desktop-file-utils
 Requires: gnome-python2-gtkhtml2
+Requires: dbus
+Requires: dbus-python
+Requires: libxml2-python
 Requires(post):   /usr/bin/update-desktop-database
+Requires(post):   dbus
 Requires(postun): /usr/bin/update-desktop-database
+Requires(postun): dbus
 Requires: notify-python
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define pkgpythondir  %{python_sitelib}/%{name}
 %define pkgdocdir     %{_datadir}/doc/%{name}-%{version}
+%define pkgguidir     %{_datadir}/%{name}/gui
 %define pkgdatadir    %{_datadir}/%{name}
 %define pkglibexecdir %{_prefix}/libexec/%{name}
 %define pkgvardatadir %{_localstatedir}/lib/%{name}
 %define pkgrundir     %{_localstatedir}/run/%{name}
 %define pkgconfigdir  %{_sysconfdir}/%{name}
 %define pkglogdir     %{_localstatedir}/log/%{name}
+%define pkgdatabase   %{pkgvardatadir}/audit_listener_database.xml
 
 %description
 setroubleshoot gui. Application that allows you to view setroubleshoot-server 
@@ -41,19 +48,21 @@
 to user preference. The same tools can be run on existing log files.
 
 %files
+%{pkgguidir}
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/sealert.service
 %{_datadir}/icons/hicolor
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/browser.py*
-%{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/email_dialog.py*
+%{pkgpythondir}/gui_utils.py*
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || :
 
 %postun
 /usr/bin/update-desktop-database %{_datadir}/applications
@@ -72,7 +81,8 @@
 make DESTDIR=%{buildroot} install
 %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-touch %{buildroot}%{pkgvardatadir}/audit_listener_database.xml
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
+touch %{buildroot}%{pkgdatabase}
 touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
 %find_lang %{name}
 
@@ -80,9 +90,16 @@
 Summary: SELinux troubleshoot server
 Group: Applications/System
 
+Requires: %{name}-plugins
 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: audit-libs-python
+Requires: libuser
 
 BuildRequires: intltool gettext python
 
@@ -99,7 +116,10 @@
 to user preference. The same tools can be run on existing log files.
 
 %post server
-[ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml
+if [ -f %{pkgdatabase} ]; then
+    chown root:root %{pkgdatabase} >/dev/null 2>&1 || :
+    chmod 600 %{pkgdatabase} >/dev/null 2>&1 || :
+fi
 /sbin/chkconfig --add %{name}
 /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 
@@ -126,8 +146,8 @@
 %{pkgpythondir}/__init__.py*
 %{pkgpythondir}/access_control.py*
 %{pkgpythondir}/analyze.py*
+%{pkgpythondir}/audit_data.py*
 %{pkgpythondir}/avc_audit.py*
-%{pkgpythondir}/avc_auparse.py*
 %{pkgpythondir}/config.py*
 %{pkgpythondir}/email_alert.py*
 %{pkgpythondir}/errcode.py*
@@ -142,15 +162,93 @@
 %config %{pkgconfigdir}/%{name}.cfg
 %dir %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/dbus-1/system.d/setroubleshootd.conf
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
-%ghost %attr(0644,root,root) %{pkgvardatadir}/audit_listener_database.xml
+%ghost %attr(0600,root,root) %{pkgdatabase}
 %ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients
 %{_mandir}/man8/sealert.8.gz
-
-/etc/rc.d/init.d/%{name}
+%attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- modify avc_audit.py to use new audit_data.py implementation
+
+	- can listen for audit events on either /var/run/audit_events
+	  in bindary protocol mode or /var/run/audisp_events in
+	  text protocol mode
+
+* Thu Sep  6 2007 John Dennis <jdennis at redhat.com> - 1.10.2-1
+	- remove all copied code from test_setroubleshootd, now we import
+	  from setroubleshoot
+	
+	- export ClientConnectionHandler from rpc.py as a base class.
+	  Derive SetroubleshootdClientConnectionHandler and
+	  AuditClientConnectionHandler from ClientConnectionHandler.
+
+	- add audisp_listen as test program
+
+	- create setroubleshoot sym link in top devel directory pointing
+	  to src so import setroubleshoot.foo if PYTHONPATH=topdir
+
+	- add get_option, convert_cfg_type to config.py.in so that one
+	  can pass optional dict to override config file settings
+
+	- rewrite log_init() so it's easier for other programs to use it,
+	  fix the import logic concering log & config
+
+	- remove log code from test_setroubleshoot, now just does import
+	  from setroubleshoot.
+	
+	- test_setroubleshootd can now handle audit records in both text
+	  and binary formats, can be selected by command line arg. It can now
+	  either output to clients connecting on a socket or to stdout. Can
+	  now optionally exit after N socket client connections.
+
+	- remove non audit record lines from test data
+
+	- remove config_init() and log_init() from package __init__.py
+	  It was the wrong place to call them, now call them when the
+	  process initializes before the first setroubleshoot imports
+
+	- add parse_config_setting() and set_config() to config module
+	- setroubleshootd now accepts -c --config command line arg
+	- test_sectroubleshoot: add err defines & program_error exception
+	  add is_valid() tests to assure we read a valid audit record
+	  log the unrecognized line if not valid, clean up socket close()
+
+	- Relates Bug #247056, update initscript to LSB standards
+	  Note: LSB initscripts in Fedora is not yet a resolved issue,
+	  the changes implemented were to add an LSB block and support
+	  the new LSB try-restart and force-reload commands. However
+	  the new /lib/lsb/init-functions are NOT currently used as this
+	  is the unstable part.
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
+	- add BuildRequires perl-XML-Parser
+
+* Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.0-1
+
+	- move all plugins and their translations to independent package
+	- wrap XML generation inside try/except
+	- correct how access list is obtained in avc_auparse.py
+	- add try/except around top level of AnalyzeThread.run so exceptions
+	  in the thread get reported and the analysis thread does not just die.
+	- also add try/except around LogfileThread.process_logfile
+	- add new function assure_file_ownership_permissions()
+	- server now forces it's database file permissions/ownership to be 0600 root:root
+	- rpm now forces the server's database file permissions/ownership to be 0600 root:root
+	- Resolves Bug #251545: Review Request: setroubleshoot-plugins - analysis plugins for setroubleshoot
+	- clean up some other rpmlint warnings in setroubleshoot.spec
+	- fix missing install of setroubleshoot icon and sym link to it
+	- Resolves Bug #251551, setroubleshoot shows up in in wrong desktop menu
+	  also run desktop-file-install in rpm install
+	- add /etc/dbus-1/system.d/setroubleshootd.conf dbus configuration file
+	- Resolves Bug #250979, Bug #250932 Missing dependencies
+	- Restore plugins/Makefile.am which got nuked somehow
+	- remove dus.dbus_bindings.bus_name_has_owner(), deprecated as of F7
+	- wrap rpm transactions in try/except
+
 * Tue Jun 12 2007 John Dennis <jdennis at redhat.com> - 1.9.7-1
 	- Resolves Bug# 241739, this bug is the lead bug for several bug reports,
 	  all consequences of the same problem, setroubleshootd/sealert when run
@@ -709,7 +807,7 @@
 	- fix allow_execmod plugin to report better data.
 
 * Mon Jun 26 2006 John Dennis <jdennis at redhat.com> - 0.3-1
-	- add missing /var/log directory %files section in spec file,
+	- add missing /var/log directory files section in spec file,
 	  and add logrotate script
 
 * Mon Jun 26 2006 John Dennis <jdennis at redhat.com> - 0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	12 Jun 2007 21:01:44 -0000	1.83
+++ sources	8 Sep 2007 19:51:52 -0000	1.84
@@ -1 +1 @@
-cb39cb419aa3f3709811e721ef1bde41  setroubleshoot-1.9.7.tar.gz
+6e5b7395364c637854d069c5cf2a45ba  setroubleshoot-1.10.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 19:52:35 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:52:35 -0400
Subject: rpms/qgit/FC-6 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081952.l88JqZLB015538@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15458

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:57:08 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:52:03 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:52 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:52:03 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:57:08 -0000	1.13
+++ sources	8 Sep 2007 19:52:03 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:57:16 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:57:16 -0400
Subject: rpms/qgit/EL-4 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081957.l88JvGAk015908@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:36:41 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:56:43 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:45 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:56:43 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:36:41 -0000	1.13
+++ sources	8 Sep 2007 19:56:43 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 19:59:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 8 Sep 2007 15:59:28 -0400
Subject: rpms/qgit/EL-5 .cvsignore, 1.13, 1.14 qgit.spec, 1.17, 1.18 sources,
	1.13, 1.14
Message-ID: <200709081959.l88JxSfE016117@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16077

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.7
- fixes #268381



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 May 2007 08:57:08 -0000	1.13
+++ .cvsignore	8 Sep 2007 19:58:55 -0000	1.14
@@ -1 +1 @@
-qgit-1.5.6.tar.bz2
+qgit-1.5.7.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/qgit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qgit.spec	10 Aug 2007 11:15:47 -0000	1.17
+++ qgit.spec	8 Sep 2007 19:58:55 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.6
+Version:        1.5.7
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -49,6 +49,11 @@
 
 
 %changelog
+* Sat Sep  8 2007 Dan Horak <dan[at]danny.cz> 1.5.7-1
+- update to upstream version 1.5.7
+- fixes #268381
+- update license tag
+
 * Fri May 23 2007 Dan Horak <dan[at]danny.cz> 1.5.6-1
 - update to upstream version 1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 May 2007 08:57:08 -0000	1.13
+++ sources	8 Sep 2007 19:58:55 -0000	1.14
@@ -1 +1 @@
-d96f1a1c437d72603b60d34f19084609  qgit-1.5.6.tar.bz2
+2aa52a51e01ec0cde8522281d9ace2aa  qgit-1.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:36 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:36 -0400
Subject: rpms/php-pecl-xdebug/EL-5 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4a6W022292@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/EL-5

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:51 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:02 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:39:59 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:02 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:51 -0000	1.4
+++ sources	8 Sep 2007 20:04:02 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:40 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:40 -0400
Subject: rpms/php-pecl-xdebug/F-7 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec, 
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4e5v022299@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/F-7

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:57 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:06 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:40:02 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:06 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:57 -0000	1.4
+++ sources	8 Sep 2007 20:04:06 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:43 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:43 -0400
Subject: rpms/php-pecl-xdebug/FC-6 .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4hsj022306@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/FC-6

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:51 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:10 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:39:59 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:10 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:51 -0000	1.4
+++ sources	8 Sep 2007 20:04:10 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:04:47 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:04:47 -0400
Subject: rpms/php-pecl-xdebug/devel .cvsignore, 1.4, 1.5 php-pecl-xdebug.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082004.l88K4lGM022317@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206/devel

Modified Files:
	.cvsignore php-pecl-xdebug.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2007 23:46:57 -0000	1.4
+++ .cvsignore	8 Sep 2007 20:04:14 -0000	1.5
@@ -1 +1 @@
-xdebug-2.0.0RC2.tgz
+xdebug-2.0.0.tgz


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-xdebug.spec	11 Mar 2007 23:40:02 -0000	1.5
+++ php-pecl-xdebug.spec	8 Sep 2007 20:04:14 -0000	1.6
@@ -1,16 +1,15 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%define beta RC2
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        0.5.%{?beta}%{?dist}
+Release:        1%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/xdebug
-Source0:        http://pecl.php.net/get/xdebug-%{version}%{?beta}.tgz
+Source0:        http://pecl.php.net/get/xdebug-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel
@@ -31,18 +30,18 @@
 
 
 %prep
-%setup -qcn xdebug-%{version}%{?beta}
+%setup -qcn xdebug-%{version}
 
 
 %build
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 phpize
 %configure --enable-xdebug
 CFLAGS="$RPM_OPT_FLAGS" make
 
 
 %install
-cd xdebug-%{version}%{?beta}
+cd xdebug-%{version}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -64,12 +63,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xdebug-%{version}%{?beta}/docs/*
+%doc xdebug-%{version}/docs/*
 %config(noreplace) %{_sysconfdir}/php.d/xdebug.ini
 %{php_extdir}/xdebug.so
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
+- Upstream sync
+- Remove %%{?beta} tags
+
 * Sun Mar 11 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-0.5.RC2
 - Create directory to untar sources
 - Use new ABI check for FC6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2007 23:46:57 -0000	1.4
+++ sources	8 Sep 2007 20:04:14 -0000	1.5
@@ -1 +1 @@
-2abef81227a5d60af45ad0792e2fd996  xdebug-2.0.0RC2.tgz
+0f9ecb9c5331d0041b04be9566763171  xdebug-2.0.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 20:40:12 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 8 Sep 2007 16:40:12 -0400
Subject: rpms/libbonoboui/devel help-error.patch, NONE, 1.1 libbonoboui.spec,
	1.56, 1.57
Message-ID: <200709082040.l88KeCdW024109@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24083

Modified Files:
	libbonoboui.spec 
Added Files:
	help-error.patch 
Log Message:
show a dialog if help is missing


help-error.patch:

--- NEW FILE help-error.patch ---
diff -up libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error libbonoboui-2.19.6/bonobo/bonobo-ui-util.c
--- libbonoboui-2.19.6/bonobo/bonobo-ui-util.c.help-error	2007-02-27 09:07:59.000000000 -0500
+++ libbonoboui-2.19.6/bonobo/bonobo-ui-util.c	2007-09-08 16:19:23.000000000 -0400
@@ -593,8 +593,20 @@ bonobo_help_display_cb (BonoboUIComponen
 		cl->program, doc_id, doc_id, NULL, &error);
 
 	if (error) {
-		/* FIXME: better error handling ? */
-		g_warning ("Error: '%s'", error->message);
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (NULL, 0, 
+                                                 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_OK,
+						 _("Could not display help for this application"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  error->message);
+		g_signal_connect_swapped (dialog, "response",
+					  G_CALLBACK (gtk_widget_destroy),
+					  dialog);
+
+		gtk_window_present (GTK_WINDOW (dialog));
+
 		g_error_free (error);
 	}
 }


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libbonoboui.spec	23 Aug 2007 18:15:50 -0000	1.56
+++ libbonoboui.spec	8 Sep 2007 20:39:40 -0000	1.57
@@ -14,9 +14,11 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.19.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.19/%{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=125046
+Patch0: help-error.patch
 License: GPLv2+ and LGPLv2+
 # bonobo-browser is GPL, libbonoboui is LGPL
 Group: System Environment/Libraries
@@ -71,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .help-error
 
 %build
 
@@ -119,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-4
+- Display a dialog if help cannot be found
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.6-3
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Sat Sep  8 20:53:59 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:53:59 -0400
Subject: rpms/php-pear-DB-DataObject/EL-5 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082053.l88KrxD8024732@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/EL-5

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:26 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:14 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:26 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:17 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:26 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:14 -0000	1.3
+++ sources	8 Sep 2007 20:53:26 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:01 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:01 -0400
Subject: rpms/php-pear-DB-DataObject/F-7 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks1OJ024740@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/F-7

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:29 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:20 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:29 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:22 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:29 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:20 -0000	1.3
+++ sources	8 Sep 2007 20:53:29 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:04 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:04 -0400
Subject: rpms/php-pear-DB-DataObject/FC-6 PHP-LICENSE-3.01, 1.2,
	1.3 .cvsignore, 
	1.3, 1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks4DL024748@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/FC-6

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Added Files:
	PHP-LICENSE-3.01 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:53:32 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:14 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:32 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:17 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:32 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:14 -0000	1.3
+++ sources	8 Sep 2007 20:53:32 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:54:07 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:54:07 -0400
Subject: rpms/php-pear-DB-DataObject/devel .cvsignore, 1.3,
	1.4 php-pear-DB-DataObject.spec, 1.3, 1.4 sources, 1.3,
	1.4 PHP-LICENSE-2.02, 1.1, NONE
Message-ID: <200709082054.l88Ks7Pd024753@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24634/devel

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Removed Files:
	PHP-LICENSE-2.02 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2006 23:03:20 -0000	1.3
+++ .cvsignore	8 Sep 2007 20:53:34 -0000	1.4
@@ -1 +1 @@
-DB_DataObject-1.8.5.tgz
+DB_DataObject-1.8.7.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/php-pear-DB-DataObject.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-DB-DataObject.spec	14 Jan 2007 18:38:22 -0000	1.3
+++ php-pear-DB-DataObject.spec	8 Sep 2007 20:53:34 -0000	1.4
@@ -2,15 +2,15 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-2.02
+Source1:        PHP-LICENSE-3.01
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -58,7 +58,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Move createTables script to %{bindir}
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 1.8.7-1
+- Upstream sync
+- Update license file
+
 * Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 1.8.5-2
 - Use correct version of license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2006 23:03:20 -0000	1.3
+++ sources	8 Sep 2007 20:53:34 -0000	1.4
@@ -1 +1 @@
-cf20a7ac0df80993b00493e9680975c3  DB_DataObject-1.8.5.tgz
+ae28b4b42ae0c2fb5dbca0eab721bf30  DB_DataObject-1.8.7.tgz


--- PHP-LICENSE-2.02 DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep  8 20:55:52 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 16:55:52 -0400
Subject: rpms/php-pear-DB-DataObject/devel PHP-LICENSE-3.01,1.2,1.3
Message-ID: <200709082055.l88Ktq3h024821@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24795/devel

Added Files:
	PHP-LICENSE-3.01 
Log Message:
forgot this one


Index: PHP-LICENSE-3.01
===================================================================
RCS file: PHP-LICENSE-3.01
diff -N PHP-LICENSE-3.01
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ PHP-LICENSE-3.01	8 Sep 2007 20:55:20 -0000	1.3
@@ -0,0 +1,68 @@
+-------------------------------------------------------------------- 
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is 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. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group at php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group at php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+ 
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+ANY EXPRESSED 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 PHP
+DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group at php.net.
+
+For more information on the PHP Group and the PHP project, 
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.



From fedora-extras-commits at redhat.com  Sat Sep  8 21:11:40 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Sat, 8 Sep 2007 17:11:40 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.73, 1.74 setroubleshoot.init,
	1.10, 1.11 setroubleshoot.spec, 1.88, 1.89 sources, 1.84, 1.85
Message-ID: <200709082111.l88LBeJT031637@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31583/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
fix init script



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	8 Sep 2007 19:51:52 -0000	1.73
+++ .cvsignore	8 Sep 2007 21:11:06 -0000	1.74
@@ -1 +1 @@
-setroubleshoot-1.10.3.tar.gz
+setroubleshoot-1.10.4.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setroubleshoot.init	8 Sep 2007 19:51:52 -0000	1.10
+++ setroubleshoot.init	8 Sep 2007 21:11:06 -0000	1.11
@@ -50,7 +50,6 @@
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
-# /lib/lsb/init-functions
 . /etc/init.d/functions
 
 # Silently exit is SELinux is not enabled


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- setroubleshoot.spec	8 Sep 2007 19:51:52 -0000	1.88
+++ setroubleshoot.spec	8 Sep 2007 21:11:06 -0000	1.89
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.3
+Version: 1.10.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -171,6 +171,9 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
+	- fix init script
+
 * Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
 	- modify avc_audit.py to use new audit_data.py implementation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	8 Sep 2007 19:51:52 -0000	1.84
+++ sources	8 Sep 2007 21:11:06 -0000	1.85
@@ -1 +1 @@
-6e5b7395364c637854d069c5cf2a45ba  setroubleshoot-1.10.3.tar.gz
+68c3d6d05d5273dd042e792f24ef09f2  setroubleshoot-1.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:15 -0400
Subject: rpms/php-pear-Pager/EL-5 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRFwt032287@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/EL-5

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:42 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:42 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:42 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:17 -0400
Subject: rpms/php-pear-Pager/F-7 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRHjE032294@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/F-7

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:45 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:45 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:45 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:20 -0400
Subject: rpms/php-pear-Pager/FC-6 .cvsignore, 1.3, 1.4 php-pear-Pager.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRKYs032301@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/FC-6

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:47 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:47 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:48 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:27:23 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:27:23 -0400
Subject: rpms/php-pear-Pager/devel .cvsignore, 1.3, 1.4 php-pear-Pager.spec, 
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709082127.l88LRNDl032308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189/devel

Modified Files:
	.cvsignore php-pear-Pager.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Dec 2006 16:50:15 -0000	1.3
+++ .cvsignore	8 Sep 2007 21:26:50 -0000	1.4
@@ -1 +1 @@
-Pager-2.4.3.tgz
+Pager-2.4.4.tgz


Index: php-pear-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/php-pear-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Pager.spec	3 Dec 2006 16:50:15 -0000	1.2
+++ php-pear-Pager.spec	8 Sep 2007 21:26:50 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Pager
 
 Name:           php-pear-Pager
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Data paging class
 
@@ -28,7 +28,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
@@ -52,7 +52,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix rpmlint warning
@@ -81,6 +81,9 @@
 %{pear_phpdir}/%{pear_name}*
 
 %changelog
+* Sat Sep  8 2007 Christopher Stone <chris.stone at gmail.com> 2.4.4-1
+- Upstream sync
+
 * Sun Dec 03 2006 Christopher Stone <chris.stone at gmail.com> 2.4.3-1
 - Upstream sync
 - use sed instead of dos2unix


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Dec 2006 16:50:15 -0000	1.3
+++ sources	8 Sep 2007 21:26:50 -0000	1.4
@@ -1 +1 @@
-d3f8f14d8bdc53865dd79623d8f55b32  Pager-2.4.3.tgz
+0fadc2487621862f1c6e589737e360e1  Pager-2.4.4.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 21:49:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 8 Sep 2007 17:49:01 -0400
Subject: rpms/mach/devel mach.spec,1.14,1.15
Message-ID: <200709082149.l88Ln18k004049@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011

Modified Files:
	mach.spec 
Log Message:
* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
- Drop no longer needed (and failing) old ppc config bug workarounds.
- Sync group creation scriptlet with current Fedora packaging guidelines.
- Set default config to the "updates" flavour.



Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/devel/mach.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mach.spec	8 Sep 2007 17:22:47 -0000	1.14
+++ mach.spec	8 Sep 2007 21:48:26 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           mach
 Version:        0.9.2
-Release:        1%{?dist}
-Summary:        make a chroot
+Release:        2%{?dist}
+Summary:        Make a chroot
 
 Group:          Applications/System
 License:        GPLv2+
@@ -44,7 +44,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=updates
 make
 
 %install
@@ -56,19 +56,13 @@
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/tmp/mach
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach
 
-# the ppc dist files were not added to the dist, so install them manually
-for v in 4 5 6 development
-do
-  install -m 644 etc/dist.d/fedora-$v-ppc %{_sysconfdir}/mach/dist.d
-done
-
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -102,6 +96,11 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
 * Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.2-1
 - new release



From fedora-extras-commits at redhat.com  Sat Sep  8 21:55:39 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 17:55:39 -0400
Subject: rpms/php-pear-File/devel .cvsignore, 1.2, 1.3 php-pear-File.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709082155.l88LtdnZ004477@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-File/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/devel

Modified Files:
	.cvsignore php-pear-File.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Dec 2006 06:26:38 -0000	1.2
+++ .cvsignore	8 Sep 2007 21:55:07 -0000	1.3
@@ -1 +1 @@
-File-1.2.2.tgz
+File-1.3.0.tgz


Index: php-pear-File.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/php-pear-File.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-File.spec	14 Dec 2006 06:26:38 -0000	1.1
+++ php-pear-File.spec	8 Sep 2007 21:55:07 -0000	1.2
@@ -2,12 +2,12 @@
 %define pear_name File
 
 Name:           php-pear-File
-Version:        1.2.2
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Common file and directory routines
 
 Group:          Development/Languages
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/File
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -26,7 +26,7 @@
 
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 install -pm 644 -c %{SOURCE1} LICENSE
@@ -47,7 +47,7 @@
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
@@ -75,5 +75,8 @@
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.3.0-1
+- Upstream sync
+
 * Wed Dec 13 2006 Christopher Stone <chris.stone at gmail.com> 1.2.2-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-File/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Dec 2006 06:26:38 -0000	1.2
+++ sources	8 Sep 2007 21:55:07 -0000	1.3
@@ -1 +1 @@
-ba8f020b70fb6a37c6258e0e42033aad  File-1.2.2.tgz
+9d806e98095f2b10373ac521a098d9ed  File-1.3.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep  8 22:02:03 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 18:02:03 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.19,1.20
Message-ID: <200709082202.l88M238J010767@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4788

Modified Files:
	emacs-vm.spec 
Log Message:
Add logic to allow for not having a pkg-config file present for Emacs at package
build time.



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emacs-vm.spec	8 Sep 2007 14:27:52 -0000	1.19
+++ emacs-vm.spec	8 Sep 2007 22:01:29 -0000	1.20
@@ -7,12 +7,17 @@
 %define vmversion 8.0.3
 %define devoversion 495
 
-
+# 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 21.4
+%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-coonfig emacs --variable sitestartdir)
-
-%{!?emacs_version %define emacs_version 21.4}
+%endif
 
 %define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
@@ -34,7 +39,7 @@
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs texinfo texinfo-tex
+BuildRequires: emacs-el texinfo texinfo-tex
 
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
@@ -133,6 +138,7 @@
 * Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
 - Update for agreement with packaging guidelines - add versioned
   emacs requirement
+- If no pkg-config is found, revert to sensible defaults
 
 * Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
 - Fix problem with vm-autoloads.el RH BZ #262361 



From fedora-extras-commits at redhat.com  Sat Sep  8 22:17:41 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 8 Sep 2007 18:17:41 -0400
Subject: rpms/php-pear-PHPUnit/devel .cvsignore, 1.4,
	1.5 php-pear-PHPUnit.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709082217.l88MHfLe011858@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11768/devel

Modified Files:
	.cvsignore php-pear-PHPUnit.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 May 2007 01:47:19 -0000	1.4
+++ .cvsignore	8 Sep 2007 22:17:09 -0000	1.5
@@ -1 +1 @@
-PHPUnit-3.0.6.tgz
+PHPUnit-3.1.8.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/php-pear-PHPUnit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-PHPUnit.spec	7 May 2007 01:47:19 -0000	1.5
+++ php-pear-PHPUnit.spec	8 Sep 2007 22:17:09 -0000	1.6
@@ -3,7 +3,7 @@
 %define channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.0.6
+Version:        3.1.8
 Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
@@ -97,11 +97,13 @@
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}
-%{pear_phpdir}/%{pear_name}2
 %{_bindir}/phpunit
 
 
 %changelog
+* Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 3.1.8-1
+- Upstream sync
+
 * Sun May 06 2007 Christopher Stone <chris.stone at gmail.com> 3.0.6-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 May 2007 01:47:19 -0000	1.4
+++ sources	8 Sep 2007 22:17:09 -0000	1.5
@@ -1 +1 @@
-cf8365f8b8e86412e6c1590d6d4e872f  PHPUnit-3.0.6.tgz
+17cb76d972afc116e780c03c9a1835ec  PHPUnit-3.1.8.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 00:00:14 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Sat, 8 Sep 2007 20:00:14 -0400
Subject: comps/po sr.po,1.3,1.4
Message-ID: <200709090000.l8900Ebm025395@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25374

Modified Files:
	sr.po 
Log Message:
updated sr translation


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sr.po	8 Sep 2007 23:59:43 -0000	1.4
@@ -9,12 +9,14 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-24 11:42-0000\n"
+"PO-Revision-Date: 2007-09-09 00:55-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
-"Language-Team: Serbian (sr) <fedora at prevod.org>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr 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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -396,16 +398,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ???? ?????????? ???????????????? ???????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????????? ?????????????? ???? ?????????????? ????????????."
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -415,17 +415,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ???????????????? ????????????????."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -493,19 +491,17 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr "?????? ?????????? ???? ?????????????? ?????????? ?? ?????????????? ???? ?????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -528,23 +524,20 @@
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -623,9 +616,8 @@
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -652,9 +644,8 @@
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -692,9 +683,8 @@
 "?????? ?????????????? ???? ????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "?????????????? ???? ????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -717,9 +707,8 @@
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -730,14 +719,12 @@
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -764,9 +751,8 @@
 msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -789,9 +775,8 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -826,9 +811,8 @@
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -855,9 +839,8 @@
 msgstr "?????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "?????????????? ???? ??????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -888,9 +871,8 @@
 msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -992,14 +974,12 @@
 msgstr "?????? ?????????? ???????????? ???????????? ???????????? ?????????????? ?????? ???????? ???? Postgresql-????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1018,18 +998,16 @@
 msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "?????????????? ???? ????????"
+msgstr "?????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1057,364 +1035,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???? ???????????????? ?????????????? ????????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "??????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ?????????????? ???? ???????????? ???????????? ???? ???????????? ????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse ?????????????????????? ???????????????? ????????????????."
+msgstr "?????????????????????? ???????????????? ???????????????? ?????????????????? ???? Eclipse-??."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "?????????????????? ??????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ???????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????? ???? ??????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????? ???? ??????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "?????????????? ???? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? ?????????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Mozilla ?????????????? ???? ?????????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "?????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "?????????????? ???? ????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "?????????? ????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ??????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ??????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ??????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ??????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "???????????????????????? ?????? ???????????? ?????? ???????????? ???? ???????????????????????????? ????????????."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ?????????? ????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Mozilla ???????????? ???? x86 ??????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib ???????????? ??????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ???????? ????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????? ?????????????? ???????????? ???? ?????????????????? ??????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "?????????????? ???? ????????????????"
-
-#~ msgid "System"
-#~ msgstr "????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "??????-???? Emacs ???????????????? ????????????."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "?????? ???????????? ?????????????????????? ???????????????????? IMAP ?????? Postfix ?????????????? ??????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "?????? ???????????? ?????????????? ?????????????? ???????????????????????? ???? ???????????????????? ???????????????? Red Hat "
-#~ "Enterprise Linux-??."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????? ???????????????? ????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????????????? ?????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "?????????????? ???? ppc64 ???????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? x86 ?????????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "?????????????? ???? x86 ???????????????????? ??????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????? ??????????????????????"
-
-#~ msgid "English"
-#~ msgstr "????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????"
-
-#~ msgid "Italian"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ??????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ????????????????."
-
-#~ msgid "Japanese"
-#~ msgstr "????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "?????????????????????????????? ??????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ??????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? "
-#~ "???????????????????????????????? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????????????? "
-#~ "????????????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????????????????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "?????????????? ???? ???????????? ???? ppc64 ?????????????????????? ??????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ???????????????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????? ?????????? ???????????? Red Hat Enterprise Linux ?????????????????????????? ???? ?????????????????? "
-#~ "????????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "?????????????????? ????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????? ???? ????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? ?????????????????? ????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???????? ?????????????? ?????????????? ???? GFS ???? ???????????? ????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "?????????????? GFS ???? ???????????? ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ???????????? ?????????????? ?????????????? ???????????????????????? ???? ???????????????????? ????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????? ???????????????? ?? ???????????????? ????????????"
-
-#~ msgid "Misc"
-#~ msgstr "??????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "???????????????? ???? ??????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ???????? ?????????????? ?????????????? ???????????????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????? ??????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "???????????????? ?? ?????????? ???? ?????????? ??????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????? ???? ????????????????????????????"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ???????????? ????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????? ???????? ?????????????? ???????????????????????????? ???? ?????????????????? ??????????????????????."
+msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"



From fedora-extras-commits at redhat.com  Sun Sep  9 00:01:09 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Sat, 8 Sep 2007 20:01:09 -0400
Subject: comps/po sr@Latn.po,1.3,1.4
Message-ID: <200709090001.l89019eu031150@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25404

Modified Files:
	sr at Latn.po 
Log Message:
updated sr at Latn translation


Index: sr at Latn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at Latn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sr at Latn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sr at Latn.po	9 Sep 2007 00:00:38 -0000	1.4
@@ -9,12 +9,14 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-24 11:42-0000\n"
+"PO-Revision-Date: 2007-09-09 00:58-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
-"Language-Team: Serbian (sr) <fedora at prevod.org>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr 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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -396,16 +398,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Ova grupa je skupina alata za razne programe svojstvene hardveru."
+msgstr "Ova grupa je skupina mre??nih servera za posebne namene."
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za arapsko okru??enje."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -415,17 +415,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za hebrejsko okru??enje."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za japansko okru??enje."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -493,19 +491,17 @@
 msgstr "Podr??ka za ??e??ki"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "Ova grupa je skupina alata i resursa za jermensko okru??enje."
+msgstr "Ova grupa je skupina alata i resursa za ??e??ko okru??enje."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Podr??ka za afrikanski"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Podr??ka za kanadski"
+msgstr "Podr??ka za albanski"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -528,23 +524,20 @@
 msgstr "Podr??ka za baskijski"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Podr??ka za bugarski"
+msgstr "Podr??ka za beloruski"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Podr??ka za bengalski"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Podr??ka za kineski"
+msgstr "Podr??ka za butanski"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Podr??ka za estonski"
+msgstr "Podr??ka za bosanski"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -623,9 +616,8 @@
 msgstr "Podr??ka za farski"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Podr??ka za galicijski"
+msgstr "Podr??ka za filipinski"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -652,9 +644,8 @@
 msgstr "Podr??ka za galicijski"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za gruzijski"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -692,9 +683,8 @@
 "kao servera za ??tampanje."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Podr??ka za zulu"
+msgstr "Podr??ka za inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -717,9 +707,8 @@
 msgstr "Podr??ka za kanadu"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za kmerski"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -730,14 +719,12 @@
 msgstr "Jezici"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "Podr??ka za tajlandski"
+msgstr "Podr??ka za lao??ki"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Podr??ka za hrvatski"
+msgstr "Podr??ka za letonski"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -764,9 +751,8 @@
 msgstr "Podr??ka za malajalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "Podr??ka za marati"
+msgstr "Podr??ka za maorski"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -789,9 +775,8 @@
 msgstr "Podr??ka za oriju"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "Podr??ka za srpski"
+msgstr "Podr??ka za persijski"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -826,9 +811,8 @@
 msgstr "Podr??ka za ruski"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za samoanski"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -855,9 +839,8 @@
 msgstr "Najmanja mogu??a instalacija"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "Podr??ka za svati"
+msgstr "Podr??ka za somail"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -888,9 +871,8 @@
 msgstr "Podr??ka za ??vedski"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Podr??ka za tamilski"
+msgstr "Podr??ka za tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -959,7 +941,7 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
-"Ova grupa sadr??i sve Red Hat-ove prilago??ene alate za pode??avanje servera."
+"Ova grupa sadr??i sve Red Hatove prilago??ene alate za pode??avanje servera."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
 msgid ""
@@ -989,17 +971,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "Ova grupa paketa sadr??i pakete korisne pri radu sa Postgresql-om."
+msgstr "Ova grupa paketa sadr??i pakete korisne pri radu sa Postgresqlom."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Podr??ka za nema??ki"
+msgstr "Podr??ka za tibetanski"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "Podr??ka za tsongu"
+msgstr "Podr??ka za tongu"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1018,18 +998,16 @@
 msgstr "Podr??ka za ukrajinski"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "Podr??ka za zulu"
+msgstr "Podr??ka za urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "Podr??ka za vendu"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "Podr??ka za kineski"
+msgstr "Podr??ka za vijetnamski"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1057,364 +1035,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Grupa za izgradnju sistema izgradnje"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "Fontovi"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Paketi fontova za prikaz teksta na radnoj povr??i."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse integrisano razvojno okru??enje."
+msgstr "Integrisano razvojno okru??enje zasnovano na Eclipseu."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Zastareli fontovi"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Podr??ka za tajlandski"
+msgstr "Podr??ka za ni??i saksonski"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "Podr??ka za estonski"
+msgstr "Podr??ka za mongolski"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "Podr??ka za bengalski"
+msgstr "Podr??ka za nepalski"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Podr??ka za brazilski"
-
-#~ msgid "British Support"
-#~ msgstr "Podr??ka za britanski"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na usagla??enoj arhitekturi"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Mozilla podr??ka na usagla??enoj arhitekturi"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Podr??ka za usagla??ene arhitekture"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Podr??ka za ??irilicu"
-
-#~ msgid "Desktops"
-#~ msgstr "Radna okru??enja"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 podr??ka"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 podr??ka"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 podr??ka"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 podr??ka"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Instalirajte ove pakete ako ??elite da prekompilirate jezgro."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE radno okru??enje"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Razvoj jezgra"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Razni paketi"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Mozilla paketi za x86 platformu"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib paketi podr??ke"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL baza podataka"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "Podr??ka razvoju paketa za neosnovnu arhitekturu"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Podr??ka za sirijski"
-
-#~ msgid "System"
-#~ msgstr "Sistem"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU-ov Emacs ure??iva?? teksta."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "Ovi paketi omogu??avaju pode??avanje IMAP ili Postfix servera po??te."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Ovi paketi pru??aju podr??ku usagla??avanja sa prethodnim izdanjima Red Hat "
-#~ "Enterprise Linux-a."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Nepodr??ane razvojne biblioteke"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Uobi??ajena radna stanica"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Podr??ka za ppc64 usagla??ene arhitekture"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na x86 usagla??enoj arhitekturi"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Podr??ka za x86 usagla??ene arhitekture"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "brazilski portugalski"
-
-#~ msgid "English"
-#~ msgstr "engleski"
-
-#~ msgid "French"
-#~ msgstr "francuski"
-
-#~ msgid "German"
-#~ msgstr "nema??ki"
-
-#~ msgid "Italian"
-#~ msgstr "italijanski"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 Dokumentacija"
-
-#~ msgid "Spanish"
-#~ msgstr "??panski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na brazilskom "
-#~ "portugalskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na engleskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na francuskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na nema??kom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na italijanskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na ??panskom."
-
-#~ msgid "Japanese"
-#~ msgstr "japanski"
-
-#~ msgid "Korean"
-#~ msgstr "korejski"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "pojednostavljeni kineski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na japanskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na korejskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na "
-#~ "pojednostavljenom kineskom."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na tradicionalnom "
-#~ "kineskom."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "tradicionalni kineski"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Podr??ka za razvoj na ppc64 usagla??enoj arhitekturi"
-
-#~ msgid "Bengali"
-#~ msgstr "bengalski"
-
-#~ msgid "Gujarati"
-#~ msgstr "gud??aratski"
-
-#~ msgid "Hindi"
-#~ msgstr "hindu"
-
-#~ msgid "Punjabi"
-#~ msgstr "pend??apski"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 4 Dokumentacija"
-
-#~ msgid "Tamil"
-#~ msgstr "tamilski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na bengalskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na gud??aratskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na hindu jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na pend??apskom "
-#~ "jeziku."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Ova grupa sadr??i Red Hat Enterprise Linux dokumentaciju na tamilskom "
-#~ "jeziku."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Skladi??te ??vori??ta"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Podr??ka za u??voravanje"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Paketi koji pru??aju podr??ku za skladi??te ??vori??ta."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Paketi koji pru??aju podr??ku za GFS sa jednim ??vorom."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Podr??ka GFS sa jednim ??vorom"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "Ovi paketi pru??aju podr??ku usagla??avanja sa prethodnim izdanjima."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java izvr??no okru??enje i razvojni pribor"
-
-#~ msgid "Misc"
-#~ msgstr "Razno"
-
-#~ msgid "Misc packages"
-#~ msgstr "Razni paketi"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedija"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Programi za multimediju"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Paketi koji pru??aju dodatnu funkcionalnost za Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Radna stanica"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Programi i alati za radnu stanicu."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Podr??ka za virtualizaciju"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Usagla??ene arhitekture"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Biblioteke za usagla??ene arhitekture"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib paketi biblioteka"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "Paketi koji pru??aju funkcionalnost za uskla??enu arhitekturu."
+msgstr "Stariji paketi batmapiranih i vektorskih fontova"



From fedora-extras-commits at redhat.com  Sun Sep  9 00:18:55 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sat, 8 Sep 2007 20:18:55 -0400
Subject: rpms/geany/devel .cvsignore, 1.3, 1.4 geany.spec, 1.5, 1.6 sources, 
	1.3, 1.4
Message-ID: <200709090018.l890ItZs032076@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32030

Modified Files:
	.cvsignore geany.spec sources 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
- Update to version 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2007 02:46:58 -0000	1.3
+++ .cvsignore	9 Sep 2007 00:18:23 -0000	1.4
@@ -1 +1 @@
-geany-0.10.1.tar.bz2
+geany-0.11.tar.bz2


Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geany.spec	24 Feb 2007 02:46:58 -0000	1.5
+++ geany.spec	9 Sep 2007 00:18:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:      geany
-Version:   0.10.1
+Version:   0.11
 Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
@@ -59,6 +59,9 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
+- Update to version 0.11
+
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1
 - updating to 0.10.1 of geany
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2007 02:46:58 -0000	1.3
+++ sources	9 Sep 2007 00:18:23 -0000	1.4
@@ -1 +1 @@
-48b0ff7eec8e2a2c02180c83a8c883fd  geany-0.10.1.tar.bz2
+1a0a679f4107d8c584d4e173d400f87c  geany-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:51 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:51 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911qg5002448@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:53 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:53 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911rbm002457@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:01:56 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:01:56 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090101.l8911wUc029401@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora devel) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:02 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:02 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89122pX002466@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:05 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:05 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89125xT029410@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:08 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:08 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l89128n7002476@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora EPEL 4) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:12 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:12 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Cpj029419@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:14 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:14 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Fa1002485@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:16 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:16 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Hen029429@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora EPEL 5) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:23 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:23 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912Ole002494@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:25 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:25 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912QsE029438@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 01:02:28 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sat, 08 Sep 2007 18:02:28 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709090102.l8912SHb002504@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora 7) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 02:30:32 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 8 Sep 2007 22:30:32 -0400
Subject: rpms/nagios/devel nagios.spec,1.33,1.34
Message-ID: <200709090230.l892UWLQ016538@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16498

Modified Files:
	nagios.spec 
Log Message:
release bump for rebuild


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nagios.spec	23 Aug 2007 02:12:36 -0000	1.33
+++ nagios.spec	9 Sep 2007 02:30:00 -0000	1.34
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -163,6 +163,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-4
+- rebuild
+
 * Wed Aug 22 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-3
 - Rebuild for ppc32 and license
 



From fedora-extras-commits at redhat.com  Sun Sep  9 02:36:47 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sat, 8 Sep 2007 22:36:47 -0400
Subject: rpms/cacti/devel cacti.spec,1.10,1.11
Message-ID: <200709090236.l892aldJ016877@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16833

Modified Files:
	cacti.spec 
Log Message:
Silly rebuild


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	9 Sep 2007 02:36:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 6%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -103,6 +103,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Sun Sep  9 03:08:29 2007
From: fedora-extras-commits at redhat.com (Igor Pires Soares (igor))
Date: Sat, 8 Sep 2007 23:08:29 -0400
Subject: comps/po pt_BR.po,1.3,1.4
Message-ID: <200709090308.l8938TLV023952@cvs-int.fedora.redhat.com>

Author: igor

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23900

Modified Files:
	pt_BR.po 
Log Message:
Translation update



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pt_BR.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pt_BR.po	9 Sep 2007 03:07:59 -0000	1.4
@@ -16,7 +16,7 @@
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-03-18 16:22-0300\n"
+"PO-Revision-Date: 2007-09-09 00:04-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"
@@ -26,606 +26,827 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
+#: ../comps-fe5.xml.in.h:1
+#: ../comps-fe6.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2
+#: ../comps-fe6.xml.in.h:2
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas Administrativas"
 
-#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3
+#: ../comps-fe6.xml.in.h:3
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica????es"
 
-#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4
+#: ../comps-fe6.xml.in.h:4
+#: ../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-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5
+#: ../comps-fe6.xml.in.h:5
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ?? ??rabe"
 
-#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6
+#: ../comps-fe6.xml.in.h:6
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ?? Arm??nio"
 
-#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7
+#: ../comps-fe6.xml.in.h:7
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e Publica????o"
 
-#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8
+#: ../comps-fe6.xml.in.h:8
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema B??sico"
 
-#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9
+#: ../comps-fe6.xml.in.h:10
+#: ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32
+#: ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Ambientes de Trabalho"
 
-#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10
+#: ../comps-fe6.xml.in.h:11
+#: ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33
+#: ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Ambientes de trabalho"
 
-#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11
+#: ../comps-fe6.xml.in.h:12
+#: ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34
+#: ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12
+#: ../comps-fe6.xml.in.h:13
+#: ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36
+#: ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Ferramentas de Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13
+#: ../comps-fe6.xml.in.h:14
+#: ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14
+#: ../comps-fe6.xml.in.h:15
+#: ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39
+#: ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editores"
 
-#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
-#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
+#: ../comps-fe5.xml.in.h:15
+#: ../comps-fe6.xml.in.h:16
+#: ../comps-f7.xml.in.h:40
+#: ../comps-f8.xml.in.h:40
+#: ../comps-el4.xml.in.h:14
+#: ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Softwares Educacionais"
 
-#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
-#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
+#: ../comps-fe5.xml.in.h:16
+#: ../comps-fe6.xml.in.h:17
+#: ../comps-f7.xml.in.h:41
+#: ../comps-f8.xml.in.h:41
+#: ../comps-el4.xml.in.h:15
+#: ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Softwares educacionais para aprendizado"
 
-#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
-#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
+#: ../comps-fe5.xml.in.h:17
+#: ../comps-fe6.xml.in.h:18
+#: ../comps-f7.xml.in.h:42
+#: ../comps-f8.xml.in.h:42
+#: ../comps-el4.xml.in.h:16
+#: ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Engenharia e Ci??ncia"
[...2486 lines suppressed...]
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4619,7 +4728,6 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>telugu-support</id> <_name>Suporte??????Telugu</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -4640,7 +4748,6 @@
 #~ "x11-server-Xorg\">scim-m17n</packagereq> <packagereq type=\"conditional\" "
 #~ "requires=\"qt\">scim-qtimm</packagereq> </packagelist> </group> <group> "
 #~ "<id>turkish-support</id> <_name>Suporte??????Turco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"optional\">compat-db</packagereq> "
@@ -4671,7 +4778,6 @@
 #~ "<packagereq type=\"optional\">qt4</packagereq> </packagelist> </group> "
 #~ "<group> <id>lithuanian-support</id> <_name>Suporte??????Lituano</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>as</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4698,7 +4804,6 @@
 #~ "<_name>Autoria??e??Publica????o</_name> "
 #~ "<_description>Estas??ferramentas??permitem??criar??documenta????o??no??formato??DocBook??e??convert??-"
 #~ "la??para??HTML,??PDF,??PostScript??e??texto."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bg</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4719,7 +4824,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-"
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> <id>catalan-"
 #~ "support</id> <_name>Suporte??????Catal??o</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4742,7 +4846,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>brazilian-support</id> "
 #~ "<_name>Suporte??????Portugu??s??Brasileiro</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>br</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4755,7 +4858,6 @@
 #~ "requires=\"aspell\">aspell-br</packagereq> </packagelist> </group> "
 #~ "<group> <id>british-support</id> <_name>Suporte??????Ingl??s??Brit??nico</"
 #~ "_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>de</langonly> <packagelist> <packagereq type=\"default"
@@ -4776,7 +4878,6 @@
 #~ "packagelist> </group> <group> <id>graphical-internet</id> "
 #~ "<_name>Internet??em??Modo??Gr??fico</_name> "
 #~ "<_description>Este??grupo??inclui??clientes??gr??ficos??de??email,??Web??e??chat."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>es</langonly> <packagelist> <packagereq type=\"default"
@@ -4795,7 +4896,6 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-es</packagereq> </"
 #~ "packagelist> </group> <group> <id>swedish-support</id> "
 #~ "<_name>Suporte??????Sueco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>et</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4814,7 +4914,6 @@
 #~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
 #~ "\">kde-i18n-Estonian</packagereq> </packagelist> </group> <group> "
 #~ "<id>ethiopic-support</id> <_name>Suporte??????Et??ope</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fi</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4827,7 +4926,6 @@
 #~ "requires=\"kdelibs\">kde-i18n-Finnish</packagereq> </packagelist> </"
 #~ "group> <group> <id>faeroese-support</id> <_name>Suporte??????Faro??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fr</langonly> <packagelist> <packagereq type=\"default"
@@ -4849,7 +4947,6 @@
 #~ "packagelist> </group> <group> <id>gnome-desktop</id> "
 #~ "<_name>Ambiente??de????rea??de??Trabalho??GNOME</_name> <_description>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."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>he</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4862,7 +4959,6 @@
 #~ "\">fonts-hebrew</packagereq> <packagereq type=\"conditional\" requires="
 #~ "\"kdelibs\">kde-i18n-Hebrew</packagereq> </packagelist> </group> <group> "
 #~ "<id>hindi-support</id> <_name>Suporte??????Hindu</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hr</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4881,7 +4977,6 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
 #~ "75dpi</packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>Suporte??????Checo</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hu</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4901,7 +4996,6 @@
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> "
 #~ "<id>icelandic-support</id> <_name>Suporte??????Island??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>it</langonly> <packagelist> <packagereq type=\"default"
@@ -4920,7 +5014,6 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-it</packagereq> </"
 #~ "packagelist> </group> <group> <id>japanese-support</id> "
 #~ "<_name>Suporte??????Japon??s</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ml</langonly> <packagelist> <packagereq type=\"default"
@@ -4943,7 +5036,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>marathi-support</id> "
 #~ "<_name>Suporte??????Marati</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>or</langonly> <packagelist> <packagereq type=\"default"
@@ -4966,7 +5058,6 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>polish-support</id> <_name>Suporte??????Polon??s</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
@@ -4991,7 +5082,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>romanian-support</id> "
 #~ "<_name>Suporte??????Romeno</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
@@ -5020,7 +5110,6 @@
 #~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
 #~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
 #~ "support</id> <_name>Suporte??????S??rvio</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
@@ -5045,7 +5134,6 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
 #~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
 #~ "<_name>Suporte??????Eslovaco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -5070,7 +5158,6 @@
 #~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
 #~ "<id>sound-and-video</id> <_name>Som??e??V??deo</_name> "
 #~ "<_description>De??grava????o??de??CDs??at????a??reprodu????o??de??CDs??de????udio??e??arquivos??multim??dia,??este??grupo??de??pacotes??permite??lidar??com??som??e??v??deo??no??sistema."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
@@ -5095,7 +5182,6 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>telugu-support</id> "
 #~ "<_name>Suporte??????Telugu</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -5114,7 +5200,6 @@
 #~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
 #~ "packagelist> </group> <group> <id>turkish-support</id> "
 #~ "<_name>Suporte??????Turco</_name> <_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
@@ -5159,3 +5244,4 @@
 #~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
 #~ "group> <group> <id>core</id> <_name>Core</_name> "
 #~ "<_description>A??menor??instala????o??poss??vel"
+



From fedora-extras-commits at redhat.com  Sun Sep  9 03:28:10 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 8 Sep 2007 23:28:10 -0400
Subject: rpms/NetworkManager/OLPC-2 .cvsignore, 1.56,
	1.57 NetworkManager.spec, 1.165, 1.166 sources, 1.74, 1.75
Message-ID: <200709090328.l893SAAW024839@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24785

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Sat Sep 08 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2771
- Add more granular mesh device control, including the ability to lock
   device activation to one channel, and to start activation at a different
   step




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	30 Aug 2007 22:36:50 -0000	1.56
+++ .cvsignore	9 Sep 2007 03:27:37 -0000	1.57
@@ -15,3 +15,4 @@
 NetworkManager-0.6.5.svn2657.tar.gz
 NetworkManager-0.6.5.svn2658.tar.gz
 NetworkManager-0.6.5.svn2751.tar.gz
+NetworkManager-0.6.5.svn2771.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/NetworkManager.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- NetworkManager.spec	30 Aug 2007 22:36:50 -0000	1.165
+++ NetworkManager.spec	9 Sep 2007 03:27:37 -0000	1.166
@@ -8,7 +8,7 @@
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
 
-%define svn_revision svn2751
+%define svn_revision svn2771
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -162,6 +162,11 @@
 
 
 %changelog
+* Sat Sep 08 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2771
+- Add more granular mesh device control, including the ability to lock
+   device activation to one channel, and to start activation at a different
+   step
+
 * Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2751
 - Add a getFrequency call to wireless & mesh devices
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	30 Aug 2007 22:36:50 -0000	1.74
+++ sources	9 Sep 2007 03:27:37 -0000	1.75
@@ -1 +1 @@
-4dba7049e4aa0efe4f16e5569b05ac3c  NetworkManager-0.6.5.svn2751.tar.gz
+78707b15fcfbe1b54970a8dce8c94870  NetworkManager-0.6.5.svn2771.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 03:55:30 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 8 Sep 2007 23:55:30 -0400
Subject: rpms/sepostgresql/devel sepostgresql-8.2.4-1.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sepostgresql.init, 1.1,
	1.2 sepostgresql.spec, 1.1, 1.2 sepostgresql.te, 1.1, 1.2
Message-ID: <200709090355.l893tU1j025943@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25771

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sepostgresql.te 
Added Files:
	sepostgresql-8.2.4-1.patch 
Log Message:
- upstreamed SE-PostgreSQL 8.2.4-1.0 released.
  (there is no differences from 8.2.4-0.434.beta actually)
- The minor version of SE-PostgreSQL is ommited from the patch filename,
  because it is updated so frequently and CVS handles it full-replaced.



sepostgresql-8.2.4-1.patch:

--- NEW FILE sepostgresql-8.2.4-1.patch ---
diff -rpNU3 postgresql-8.2.4/configure.in sepostgresql-8.2.4/configure.in
--- postgresql-8.2.4/configure.in	2007-04-20 12:20:42.000000000 +0900
+++ sepostgresql-8.2.4/configure.in	2007-04-29 13:49:53.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.4/doc/postgres.tar.gz and sepostgresql-8.2.4/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.4/src/Makefile.global.in sepostgresql-8.2.4/src/Makefile.global.in
--- postgresql-8.2.4/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.4/src/backend/Makefile sepostgresql-8.2.4/src/backend/Makefile
--- postgresql-8.2.4/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.4/src/backend/access/common/heaptuple.c sepostgresql-8.2.4/src/backend/access/common/heaptuple.c
--- postgresql-8.2.4/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.4/src/backend/access/heap/heapam.c sepostgresql-8.2.4/src/backend/access/heap/heapam.c
--- postgresql-8.2.4/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.4/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
 		TransactionId xid[2];	/* xmax, xmin */
[...8179 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.4/src/include/utils/syscache.h sepostgresql-8.2.4/src/include/utils/syscache.h
--- postgresql-8.2.4/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.4/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2007 13:07:32 -0000	1.2
+++ .cvsignore	9 Sep 2007 03:54:57 -0000	1.3
@@ -1 +1,2 @@
 postgresql-8.2.4.tar.gz
+sepostgresql-8.2.4-0.434.patch


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.init	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.init	9 Sep 2007 03:54:57 -0000	1.2
@@ -9,7 +9,7 @@
 
 PGVERSION="8.2.4"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="0.434"
+SEPGVERSION="1.0"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.spec	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.spec	9 Sep 2007 03:54:57 -0000	1.2
@@ -8,12 +8,12 @@
 %define selinux_variants mls strict targeted
 
 # SE-PostgreSQL status extension
-%{!?sepgextension:%define sepgextension .beta}
+
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.2.4
-Release: 0.434%{?sepgextension}%{?dist}
+Release: 1.0%{?sepgextension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,7 +24,7 @@
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.4-0.434.patch
+Patch0: sepostgresql-8.2.4-1.patch
 Patch1: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
 Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
@@ -208,6 +208,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Mon Sep 1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-1.0
+- mark as SE-PostgreSQL 8.2.4-1.0
+
 * Thu Aug 28 2007 <kaigai at kaigai.gr.jp> - 8.2.4-0.434.beta
 - add Requires: postgresql-server, instead of Conflicts: tag
   (Some sharable files are removed from sepostgresql package)


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql.te	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql.te	9 Sep 2007 03:54:57 -0000	1.2
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 0.434)
+policy_module(sepostgresql, 1.0)
 
 gen_require(`
 	all_userspace_class_perms



From fedora-extras-commits at redhat.com  Sun Sep  9 04:20:55 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:20:55 -0400
Subject: rpms/xorg-x11-drv-amd/F-7
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch, NONE,
	1.1 sources, 1.9, 1.10 xorg-x11-drv-amd.spec, 1.15,
	1.16 lx-downscaling-fix.patch, 1.1, NONE
Message-ID: <200709090420.l894KtuN000348@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv308

Modified Files:
	sources xorg-x11-drv-amd.spec 
Added Files:
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch 
Removed Files:
	lx-downscaling-fix.patch 
Log Message:
update from OLPC-2 branch

fix-potential-CPU-GP-race-in-lx_get_source_color.patch:

--- NEW FILE fix-potential-CPU-GP-race-in-lx_get_source_color.patch ---
>From a3088c6ba17d136131f76993d789305256fde2bf Mon Sep 17 00:00:00 2001
From: Bernardo Innocenti <bernie at codewiz.org>
Date: Wed, 11 Jul 2007 08:55:17 -0400
Subject: [PATCH] Fix potential CPU/GP race in lx_get_source_color()
Organization: One Laptop Per Child

---
 src/amd_lx_exa.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/amd_lx_exa.c b/src/amd_lx_exa.c
index 3f079cd..69c8fa6 100644
--- a/src/amd_lx_exa.c
+++ b/src/amd_lx_exa.c
@@ -262,6 +262,9 @@ static unsigned int lx_get_source_color(PicturePtr pSrc, int x, int y, int dstFo
   
   bits += (y * stride) + (x * (bpp >> 3));
 
+  /* GP may still be working on this surface */
+  gp_wait_until_idle();
+
   /* Read the source value */
 
   switch(bpp) {
-- 
1.5.2.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2007 19:37:39 -0000	1.9
+++ sources	9 Sep 2007 04:20:23 -0000	1.10
@@ -1 +1 @@
-330632bf2bfe0c80094dc288788367ab  xf86-video-amd-0.0-git20070625.tar.bz2
+21dbe589b49f71b189d40f6aa5e0aab9  xf86-video-amd-0.0-git20070807.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/xorg-x11-drv-amd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-amd.spec	25 Jun 2007 19:37:39 -0000	1.15
+++ xorg-x11-drv-amd.spec	9 Sep 2007 04:20:23 -0000	1.16
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070625
+%define gitdate 20070807
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   22.%{gitdate}%{?dist}
+Release:   23.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -37,7 +37,9 @@
 
 Patch0: lx-disable-compression.patch
 Patch1: amd-build-fixes.patch
-Patch2: lx-downscaling-fix.patch
+
+# HACK HACK HACK (always stalls the pipeline or something like that)
+Patch2: fix-potential-CPU-GP-race-in-lx_get_source_color.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -46,7 +48,7 @@
 %setup -q -n %{tarball}-2.7.6.5
 %patch0 -p1 -b .jx
 %patch1 -p1 -b .build-fix
-%patch2 -p1 -b .lx-downscale-fix
+%patch2 -p1 -b .fix-color-race-HACK
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -80,6 +82,25 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Aug  7 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070807
+- Fix GX RGB overlay
+
+* Wed Jul 18 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070718
+- Get current framebuffer size from kernel framebuffer driver
+
+* Thu Jul 12 2007 Dan Williams <dcbw at rehdat.com> 0.0-23.20070711
+- Temporary hack for the font color corruption problem
+
+* Wed Jul 11 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070711
+- Fix display power management and dcon bugs
+
+* Fri Jul  6 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070706
+- Fix GTK drawing with GX acceleration (laptop.org #1869)
+
+* Thu Jul  5 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070705
+- Handle the LX video palette correctly
+- Remove upstreamed LX downscaling fix patch
+
 * Wed Jun 25 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070625
 - Udpate to git snapshot
    - Fix downscaling on the LX


--- lx-downscaling-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 04:24:51 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:24:51 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 sugar-datastore.spec, 1.22, 1.23
Message-ID: <200709090424.l894OpRS000577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv528

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
- New snapshot (async writes and ownership transfer on update/create)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	1 Aug 2007 20:29:02 -0000	1.21
+++ .cvsignore	9 Sep 2007 04:24:19 -0000	1.22
@@ -1,2 +1,3 @@
 sugar-datastore-0.2.2-git356b35a278.tar.bz2
 sugar-datastore-0.2.2-gita111996299.tar.bz2
+sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	1 Aug 2007 20:29:02 -0000	1.21
+++ sources	9 Sep 2007 04:24:19 -0000	1.22
@@ -1 +1 @@
-ed561e8debe2080d8b3e35104d4608a6  sugar-datastore-0.2.2-gita111996299.tar.bz2
+433ff1bdd4017e250e3d895897548f38  sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-datastore.spec	1 Aug 2007 20:29:02 -0000	1.22
+++ sugar-datastore.spec	9 Sep 2007 04:24:19 -0000	1.23
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070801git
-%define commitid a111996299
+%define alphatag 20070909git
+%define commitid 0a7e80f01a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.18.%{alphatag}a111996299
+Release: 0.19.%{alphatag}0a7e80f01a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
+- New snapshot (async writes and ownership transfer on update/create)
+
 * Wed Aug 01 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.18.20070801gita111996299
 - New snapshot (fix #2607)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 04:31:11 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:31:11 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.17, 1.18 sources, 
	1.17, 1.18 sugar-presence-service.spec, 1.17, 1.18
Message-ID: <200709090431.l894VBRQ000890@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv860

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Sep 2007 20:07:50 -0000	1.17
+++ .cvsignore	9 Sep 2007 04:30:38 -0000	1.18
@@ -1 +1,2 @@
 sugar-presence-service-0.65-gita79f7b6488.tar.bz2
+sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Sep 2007 20:07:50 -0000	1.17
+++ sources	9 Sep 2007 04:30:38 -0000	1.18
@@ -1 +1 @@
-5385e5faea01bb8499463accf2edbfd7  sugar-presence-service-0.65-gita79f7b6488.tar.bz2
+6fe20b5dc4e20c40bc24ada12e6ba2ce  sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sugar-presence-service.spec	4 Sep 2007 20:07:50 -0000	1.17
+++ sugar-presence-service.spec	9 Sep 2007 04:30:38 -0000	1.18
@@ -1,9 +1,9 @@
-%define alphatag 20070904git
-%define commitid a79f7b6488
+%define alphatag 20070909git
+%define commitid 3b1f4a0c42
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.12.%{alphatag}a79f7b6488
+Release: 0.13.%{alphatag}3b1f4a0c42
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
+- New snapshot
+
 * Tue Sep  4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.12.20070904gita79f7b6488
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 04:38:13 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 00:38:13 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47 sugar.spec, 1.54, 1.55
Message-ID: <200709090438.l894cDCd001247@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1192

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	7 Sep 2007 21:02:50 -0000	1.45
+++ .cvsignore	9 Sep 2007 04:37:40 -0000	1.46
@@ -1 +1,2 @@
 sugar-0.65-gitc8700feccf.tar.bz2
+sugar-0.65-git6b6470ebcb.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	7 Sep 2007 21:02:50 -0000	1.46
+++ sources	9 Sep 2007 04:37:40 -0000	1.47
@@ -1 +1 @@
-c3ccf0f431a100fa6abe3cb44a81f07f  sugar-0.65-gitc8700feccf.tar.bz2
+1883a0c668d9a5e51ca12e2680610d34  sugar-0.65-git6b6470ebcb.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sugar.spec	7 Sep 2007 21:02:50 -0000	1.54
+++ sugar.spec	9 Sep 2007 04:37:40 -0000	1.55
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070907git
-%define commitid c8700feccf
+%define alphatag 20070909git
+%define commitid 6b6470ebcb
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.42.%{alphatag}c8700feccf
+Release: 0.43.%{alphatag}6b6470ebcb
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
+- New snapshot
+
 * Fri Sep  7 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.42.20070907gitc8700feccf
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 05:00:48 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 01:00:48 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 sugar-artwork.spec, 1.24, 1.25
Message-ID: <200709090500.l8950m8U002296@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2272

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2007 19:58:23 -0000	1.23
+++ .cvsignore	9 Sep 2007 05:00:09 -0000	1.24
@@ -1 +1,2 @@
 sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
+sugar-artwork-0.34-git2e13ad392d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	6 Sep 2007 19:58:23 -0000	1.23
+++ sources	9 Sep 2007 05:00:09 -0000	1.24
@@ -1 +1 @@
-c45cc536ac31f86a95377c1f93bb0a27  sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
+06860f882931ea996fd9e0af1ef0c591  sugar-artwork-0.34-git2e13ad392d.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-artwork.spec	6 Sep 2007 19:58:23 -0000	1.24
+++ sugar-artwork.spec	9 Sep 2007 05:00:09 -0000	1.25
@@ -1,10 +1,10 @@
-%define alphatag 20070906git
-%define commitid f89f6e00cc
+%define alphatag 20070909git
+%define commitid 2e13ad392d
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.24.%{alphatag}f89f6e00cc
+Release: 0.25.%{alphatag}2e13ad392d
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
+- New snapshot
+
 * Thu Sep  6 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.24.20070906gitf89f6e00cc
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 05:25:16 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 9 Sep 2007 01:25:16 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.46, 1.47 sources, 1.47,
	1.48 sugar.spec, 1.55, 1.56
Message-ID: <200709090525.l895PGOY009125@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9081

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	9 Sep 2007 04:37:40 -0000	1.46
+++ .cvsignore	9 Sep 2007 05:24:44 -0000	1.47
@@ -1,2 +1,3 @@
 sugar-0.65-gitc8700feccf.tar.bz2
 sugar-0.65-git6b6470ebcb.tar.bz2
+sugar-0.65-gita1f5cece18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	9 Sep 2007 04:37:40 -0000	1.47
+++ sources	9 Sep 2007 05:24:44 -0000	1.48
@@ -1 +1 @@
-1883a0c668d9a5e51ca12e2680610d34  sugar-0.65-git6b6470ebcb.tar.bz2
+a8c99692c40eb2ee2b991a101c643a9f  sugar-0.65-gita1f5cece18.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sugar.spec	9 Sep 2007 04:37:40 -0000	1.55
+++ sugar.spec	9 Sep 2007 05:24:44 -0000	1.56
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %define alphatag 20070909git
-%define commitid 6b6470ebcb
+%define commitid a1f5cece18
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.43.%{alphatag}6b6470ebcb
+Release: 0.44.%{alphatag}a1f5cece18
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.43.20070909git6b6470ebcb
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep  9 06:34:46 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 02:34:46 -0400
Subject: rpms/kdelibs/devel kdelibs.spec, 1.223.2.14,
	1.223.2.15 kdelibs-3.92.0-conflict-kde3.patch, 1.1.2.1,
	NONE kdelibs-3.92.0-kde4home.diff, 1.1.2.1, NONE
Message-ID: <200709090634.l896YkkZ017584@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17535/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Removed Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.92.0-conflict-kde3.patch 
	kdelibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.14
retrieving revision 1.223.2.15
diff -u -r1.223.2.14 -r1.223.2.15
--- kdelibs.spec	16 Aug 2007 16:05:09 -0000	1.223.2.14
+++ kdelibs.spec	9 Sep 2007 06:34:13 -0000	1.223.2.15
@@ -1,10 +1,10 @@
 
 # TODO:
-# 1. package some noarch bits separately: apidocs, oxygen(icons).
+# 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.92.0
-Release: 4%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -32,11 +32,6 @@
 Requires: shared-mime-info
 #Requires: kde4-settings
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdelibs-%{version}-kde4home.diff
-# purpose of this patch?  -- Rex
-Patch1: kdelibs-3.92.0-conflict-kde3.patch
-
 Source1: kde4.sh
 Source2: kde4.csh
 
@@ -68,7 +63,7 @@
 BuildRequires: pcre-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel
-BuildRequires: strigi-devel >= 0.5.3
+BuildRequires: strigi-devel >= 0.5.5
 BuildRequires: zlib-devel
 
 %description
@@ -105,9 +100,6 @@
 %prep
 %setup -q -n kdelibs-%{version}
 
-#patch0 -p1 -b .kde4home
-%patch1 -p1 -b .conflict-kde3
-
 
 %build
 
@@ -131,23 +123,15 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-## unpackaged files
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
-rm -rf %{buildroot}%{_datadir}/emoticons
-
 
 %post
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
@@ -162,7 +146,6 @@
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/checkXML
 %exclude %{_kde4_bindir}/kconfig_compiler
-%exclude %{_kde4_bindir}/ksvgtopng
 %exclude %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_appsdir}/*
 # kdewidgets
@@ -174,11 +157,10 @@
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
-%{_kde4_iconsdir}/oxygen/
-#{_kde4_sharedir}/emoticons/*
 %{_kde4_sharedir}/locale/all_languages/
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
+%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
@@ -190,7 +172,6 @@
 %doc KDE4PORTING.html
 %{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kconfig_compiler
-%{_kde4_bindir}/ksvgtopng
 %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_bindir}/makekdewidgets
 %{_kde4_bindir}/makekdewidgets
@@ -205,6 +186,15 @@
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop kdeprint soversion conflict patch (fixed upstream)
+- remove icon-related code, pics/ is now in kdebase-runtime
+- BR strigi-devel >= 0.5.5 due to API changes
+- package hicolor presence_* icons which are not in hicolor-icon-theme
+- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - -devel: omit most (hopefully) extraneous Requires:
 - use macros.kde4


--- kdelibs-3.92.0-conflict-kde3.patch DELETED ---


--- kdelibs-3.92.0-kde4home.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:46 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:46 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchbugzilla
Message-ID: <200709090908.l8998m7i000564@app3.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchbugzilla acl on zabbix (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:47 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:47 -0700
Subject: [pkgdb] zabbix: sharkcz has requested commit
Message-ID: <200709090908.l8998niF005121@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the commit acl on zabbix (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 09:08:49 2007
From: fedora-extras-commits at redhat.com (Dan Horak (dan))
Date: Sun, 09 Sep 2007 02:08:49 -0700
Subject: [pkgdb] zabbix: sharkcz has requested watchcommits
Message-ID: <200709090908.l8998nfi005130@app4.fedora.phx.redhat.com>

Dan Horak (sharkcz) has requested the watchcommits acl on zabbix (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Sun Sep  9 10:32:11 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 06:32:11 -0400
Subject: rpms/geany/devel geany.spec,1.6,1.7
Message-ID: <200709091032.l89AWB7k015979@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15932

Modified Files:
	geany.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
- Fix Version entry in .desktop file



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geany.spec	9 Sep 2007 00:18:23 -0000	1.6
+++ geany.spec	9 Sep 2007 10:31:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.11
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -31,6 +31,9 @@
 %prep
 %setup -q
 
+# Fix incorrect version entry in desktop file
+sed -i -e 's/Version=1.1/Version=1.0/' geany.desktop.in
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -59,6 +62,9 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
+- Fix Version entry in .desktop file
+
 * Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
 - Update to version 0.11
 



From fedora-extras-commits at redhat.com  Sun Sep  9 10:48:24 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 9 Sep 2007 06:48:24 -0400
Subject: comps comps-f8.xml.in,1.99,1.100
Message-ID: <200709091048.l89AmOgi016710@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16648

Modified Files:
	comps-f8.xml.in 
Log Message:
added netgen, pharosc, pharosc-alliance, pharosc-magic, pharosc-synopsys and pharosc-xcircuit


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- comps-f8.xml.in	8 Sep 2007 12:53:02 -0000	1.99
+++ comps-f8.xml.in	9 Sep 2007 10:47:54 -0000	1.100
@@ -1210,6 +1210,7 @@
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>
       <packagereq type="optional">netcdf</packagereq>
+      <packagereq type="optional">netgen</packagereq>
       <packagereq type="optional">ngspice</packagereq>
       <packagereq type="optional">numpy</packagereq>
       <packagereq type="optional">octave</packagereq>
@@ -1221,6 +1222,11 @@
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">pcb</packagereq>
       <packagereq type="optional">perl-bioperl</packagereq>
+      <packagereq type="optional">pharosc</packagereq>
+      <packagereq type="optional">pharosc-alliance</packagereq>
+      <packagereq type="optional">pharosc-magic</packagereq>
+      <packagereq type="optional">pharosc-synopsys</packagereq>
+      <packagereq type="optional">pharosc-xcircuit</packagereq>
       <packagereq type="optional">pikdev</packagereq>
       <packagereq type="optional">piklab</packagereq>
       <packagereq type="optional">pikloops</packagereq>



From fedora-extras-commits at redhat.com  Sun Sep  9 11:19:29 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 07:19:29 -0400
Subject: rpms/geany/devel geany.spec,1.7,1.8
Message-ID: <200709091119.l89BJTcq026426@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26382

Modified Files:
	geany.spec 
Log Message:
Fix errors in email address in changelog



Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/devel/geany.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geany.spec	9 Sep 2007 10:31:37 -0000	1.7
+++ geany.spec	9 Sep 2007 11:18:45 -0000	1.8
@@ -62,10 +62,10 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
-* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-2
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
 - Fix Version entry in .desktop file
 
-* Sun Sep  9 2007 Jonathan G. Underwood <j.underwood at gmail.com> - 0.11-1
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
 - Update to version 0.11
 
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1



From fedora-extras-commits at redhat.com  Sun Sep  9 11:21:14 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 07:21:14 -0400
Subject: rpms/geany/F-7 geany.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200709091121.l89BLECl026477@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/geany/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26437

Modified Files:
	geany.spec sources 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
- Fix Version entry in .desktop file

* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
- Update to version 0.11




Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-7/geany.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geany.spec	24 Feb 2007 02:46:58 -0000	1.5
+++ geany.spec	9 Sep 2007 11:20:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.10.1
-Release:   1%{?dist}
+Version:   0.11
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -31,6 +31,9 @@
 %prep
 %setup -q
 
+# Fix incorrect version entry in desktop file
+sed -i -e 's/Version=1.1/Version=1.0/' geany.desktop.in
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -59,6 +62,12 @@
 %{_mandir}/man1/geany.1.gz
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-2
+- Fix Version entry in .desktop file
+
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.11-1
+- Update to version 0.11
+
 * Fri Feb 23 2007 Josef Whiter <josef at toxicpanda.com> 0.10.1-1
 - updating to 0.10.1 of geany
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geany/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2007 02:46:58 -0000	1.3
+++ sources	9 Sep 2007 11:20:36 -0000	1.4
@@ -1 +1 @@
-48b0ff7eec8e2a2c02180c83a8c883fd  geany-0.10.1.tar.bz2
+1a0a679f4107d8c584d4e173d400f87c  geany-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 11:56:30 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 07:56:30 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-parallel-devel.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.15, 1.223.2.16
Message-ID: <200709091156.l89BuURd027729@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27709/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-parallel-devel.diff 
Log Message:
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.15
retrieving revision 1.223.2.16
diff -u -r1.223.2.15 -r1.223.2.16
--- kdelibs.spec	9 Sep 2007 06:34:13 -0000	1.223.2.15
+++ kdelibs.spec	9 Sep 2007 11:55:58 -0000	1.223.2.16
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -35,6 +35,9 @@
 Source1: kde4.sh
 Source2: kde4.csh
 
+# make -devel packages parallel-installable
+Patch0: kdelibs-3.93.0-parallel-devel.diff
+
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
 Requires: qt4 >= %{qt4_ver} 
@@ -76,8 +79,6 @@
 Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" == "kdelibs4"
-# Yes, we still have conflicts, in _bindir, _libdir
-Conflicts: kdelibs-devel
 %else
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
@@ -99,6 +100,7 @@
 
 %prep
 %setup -q -n kdelibs-%{version}
+%patch0 -p1
 
 
 %build
@@ -123,6 +125,31 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# remove files which conflict with KDE 3
+rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
+      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
+rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
+      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
+rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
+rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
+
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
 
 %post
 /sbin/ldconfig ||:
@@ -144,12 +171,10 @@
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
 %{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/checkXML
-%exclude %{_kde4_bindir}/kconfig_compiler
-%exclude %{_kde4_bindir}/kunittestmodrunner
+%exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
 # kdewidgets
-%exclude %{_kde4_bindir}/makekdewidgets
+%exclude %{_kde4_bindir}/makekdewidgets4
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 # ksgmltools2
@@ -157,7 +182,6 @@
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
-%{_kde4_sharedir}/locale/all_languages/
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
 %{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
@@ -165,27 +189,29 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/
+%exclude %{_kde4_libdir}/kde4/devel/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
 %defattr(-,root,root,-)
 %doc KDE4PORTING.html
-%{_kde4_bindir}/checkXML
-%{_kde4_bindir}/kconfig_compiler
-%{_kde4_bindir}/kunittestmodrunner
-%{_kde4_bindir}/makekdewidgets
-%{_kde4_bindir}/makekdewidgets
+%{_kde4_bindir}/kconfig_compiler4
+%{_kde4_bindir}/makekdewidgets4
 %{_kde4_appsdir}/kdewidgets/
 %dir %{_kde4_libdir}/kde4/plugins/designer
 %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %{_kde4_appsdir}/ksgmltools2/
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
-
+%{_kde4_libdir}/kde4/devel/
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- remove files which conflict with KDE 3
+- rename kconfig_compiler and makekdewidgets to *4
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- drop Conflicts: kdelibs-devel
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Sun Sep  9 12:04:06 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 08:04:06 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.20,1.21
Message-ID: <200709091204.l89C464I001499@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1409

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
- Add BuildRequires: emacs since emacs-el doesn't pull this in



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emacs-vm.spec	8 Sep 2007 22:01:29 -0000	1.20
+++ emacs-vm.spec	9 Sep 2007 12:03:33 -0000	1.21
@@ -26,7 +26,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -39,7 +39,7 @@
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs-el texinfo texinfo-tex
+BuildRequires: emacs emacs-el texinfo texinfo-tex
 
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
@@ -135,6 +135,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
+- Add BuildRequires: emacs since emacs-el doesn't pull this in
+
 * Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
 - Update for agreement with packaging guidelines - add versioned
   emacs requirement



From fedora-extras-commits at redhat.com  Sun Sep  9 12:25:27 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Sep 2007 08:25:27 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec, 1.6,
	1.7 kdepimlibs-3.92.0-kde4home.diff, 1.1, NONE
Message-ID: <200709091225.l89CPRie002270@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219/devel

Modified Files:
	kdepimlibs.spec 
Removed Files:
	kdepimlibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- list BR strigi-devel only once
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdepimlibs.spec	16 Aug 2007 20:55:39 -0000	1.6
+++ kdepimlibs.spec	9 Sep 2007 12:24:54 -0000	1.7
@@ -1,8 +1,8 @@
 
 Name: kdepimlibs
 
-Version: 3.92.0
-Release: 3%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,9 +12,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdepimlibs-%{version}-kde4home.diff
-
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -28,7 +25,6 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-BuildRequires: strigi-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: libacl-devel bzip2-devel gamin-devel strigi-devel zlib-devel
@@ -72,6 +68,23 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
 
 %post -p /sbin/ldconfig
 
@@ -94,14 +107,21 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- list BR strigi-devel only once
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: LGPLv2


--- kdepimlibs-3.92.0-kde4home.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 12:25:49 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Sep 2007 08:25:49 -0400
Subject: rpms/emacs-vm/devel emacs-vm.spec,1.21,1.22
Message-ID: <200709091225.l89CPnjt002273@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2250

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-6
- Fix typo with start file creation



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- emacs-vm.spec	9 Sep 2007 12:03:33 -0000	1.21
+++ emacs-vm.spec	9 Sep 2007 12:25:16 -0000	1.22
@@ -12,7 +12,7 @@
 %if %($(pkg-config emacs) ; echo $?)
 %define emacs_version 21.4
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d/
+%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)
@@ -26,7 +26,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -92,7 +92,7 @@
 (cd lisp ; install -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{startd}
+install -d %{buildroot}/%{emacs_startdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -135,6 +135,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-6
+- Fix typo with start file creation
+
 * Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-5
 - Add BuildRequires: emacs since emacs-el doesn't pull this in
 



From fedora-extras-commits at redhat.com  Sun Sep  9 12:38:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sun, 9 Sep 2007 08:38:12 -0400
Subject: comps comps-f8.xml.in,1.100,1.101
Message-ID: <200709091238.l89CcC1W002842@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2799

Modified Files:
	comps-f8.xml.in 
Log Message:
Update the buildsys-build group.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- comps-f8.xml.in	9 Sep 2007 10:47:54 -0000	1.100
+++ comps-f8.xml.in	9 Sep 2007 12:37:41 -0000	1.101
@@ -594,17 +594,21 @@
       <packagereq type="mandatory">cpio</packagereq>
       <packagereq type="mandatory">diffutils</packagereq>
       <packagereq type="mandatory">fedora-release</packagereq>
+      <packagereq type="mandatory">findutils</packagereq>
+      <packagereq type="mandatory">gawk</packagereq>
       <packagereq type="mandatory">gcc</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
+      <packagereq type="mandatory">grep</packagereq>
       <packagereq type="mandatory">gzip</packagereq>
+      <packagereq type="mandatory">info</packagereq>
       <packagereq type="mandatory">make</packagereq>
       <packagereq type="mandatory">patch</packagereq>
-      <packagereq type="mandatory">perl</packagereq>
       <packagereq type="mandatory">redhat-rpm-config</packagereq>
       <packagereq type="mandatory">rpm-build</packagereq>
       <packagereq type="mandatory">sed</packagereq>
       <packagereq type="mandatory">tar</packagereq>
       <packagereq type="mandatory">unzip</packagereq>
+      <packagereq type="mandatory">util-linux-ng</packagereq>
       <packagereq type="mandatory">which</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:29 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:29 -0700
Subject: [pkgdb] geany: jgu has requested watchcommits
Message-ID: <200709091348.l89DmW3S004837@app4.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the watchcommits acl on geany (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:37 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:37 -0700
Subject: [pkgdb] geany: jgu has requested commit
Message-ID: <200709091348.l89DmcVk001584@app3.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) 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 fedora-extras-commits at redhat.com  Sun Sep  9 13:48:47 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:47 -0700
Subject: [pkgdb] geany: jgu has requested watchcommits
Message-ID: <200709091348.l89DmmZw004846@app4.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the watchcommits acl on geany (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Sun Sep  9 13:48:49 2007
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jonathan.underwood))
Date: Sun, 09 Sep 2007 06:48:49 -0700
Subject: [pkgdb] geany: jgu has requested commit
Message-ID: <200709091348.l89DmneT001593@app3.fedora.phx.redhat.com>

Jonathan G. Underwood (jgu) has requested the commit acl on geany (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Sun Sep  9 14:50:35 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 9 Sep 2007 10:50:35 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.23,1.24
Message-ID: <200709091450.l89EoZgJ021173@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21131

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
- remove the dependency from -extras to -arts, and use Obsoletes to
  provide an upgrade path



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xine-lib.spec	1 Sep 2007 09:19:38 -0000	1.23
+++ xine-lib.spec	9 Sep 2007 14:50:02 -0000	1.24
@@ -22,7 +22,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -79,12 +79,13 @@
 Summary:         aRts plugin for xine-lib
 Group:           System Environment/Libraries
 Requires:        %{name} = %{version}-%{release}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:       xine-lib-extras < 1.1.7-3
 
 %package extras
 Summary:         Additional plugins for xine-lib
 Group:           System Environment/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        %{name}-arts = %{version}-%{release}
 
 
 %description
@@ -348,6 +349,10 @@
 
 
 %changelog
+* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+  provide an upgrade path
+
 * Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
 - 1.1.8, "open" patch applied upstream.
 - Build XCB plugins by default for Fedora 8+ only.



From fedora-extras-commits at redhat.com  Sun Sep  9 14:59:35 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 10:59:35 -0400
Subject: rpms/shorewall/devel .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091459.l89ExZic021663@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:00:33 -0000	1.29
+++ .cvsignore	9 Sep 2007 14:59:03 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:00:33 -0000	1.36
+++ shorewall.spec	9 Sep 2007 14:59:03 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:00:33 -0000	1.29
+++ sources	9 Sep 2007 14:59:03 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:08:53 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 11:08:53 -0400
Subject: rpms/shorewall/FC-6 .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091508.l89F8rhL028002@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27958

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:26:24 -0000	1.29
+++ .cvsignore	9 Sep 2007 15:08:19 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:26:24 -0000	1.36
+++ shorewall.spec	9 Sep 2007 15:08:19 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:26:24 -0000	1.29
+++ sources	9 Sep 2007 15:08:19 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:11:59 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 11:11:59 -0400
Subject: rpms/shorewall/F-7 .cvsignore, 1.29, 1.30 shorewall.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <200709091511.l89FBxhn028215@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28162

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 Jul 2007 13:17:21 -0000	1.29
+++ .cvsignore	9 Sep 2007 15:11:25 -0000	1.30
@@ -1 +1 @@
-shorewall-3.4.5.tar.bz2
+shorewall-3.4.6.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/shorewall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shorewall.spec	17 Jul 2007 13:17:22 -0000	1.36
+++ shorewall.spec	9 Sep 2007 15:11:25 -0000	1.37
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.4.5
+Version: 3.4.6
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -87,6 +87,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.6-1
+- Update to upstream 3.4.6
+
 * Tue Jul 17 2007 Robert Marcano <robert at marcanoonline.com> - 3.4.5-1
 - Update to upstream 3.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-7/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	17 Jul 2007 13:17:22 -0000	1.29
+++ sources	9 Sep 2007 15:11:25 -0000	1.30
@@ -1 +1 @@
-cf1f94bb1564fa7fedb4184a18656d11  shorewall-3.4.5.tar.bz2
+5d8cf5e21800289a616aa9aed0576883  shorewall-3.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep  9 15:26:35 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Sun, 9 Sep 2007 11:26:35 -0400
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709091526.l89FQZQX028820@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28695

Modified Files:
	pcmanx-gtk2.spec sources 
Log Message:
- upgrade to svn 355
- clean up packager's name in .spec file



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcmanx-gtk2.spec	16 Apr 2007 18:22:24 -0000	1.1
+++ pcmanx-gtk2.spec	9 Sep 2007 15:26:03 -0000	1.2
@@ -1,11 +1,11 @@
 # Source package is generated using:
 #        1. svn co https://svn.csie.net/pcmanx/trunk pcmanx-gtk2
 #        2. tar czvf pcmanx-gtk2.tar.gz pcmanx-gtk2
-%define    alphatag 336svn
+%define    alphatag 355svn
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
-Version:   0.3.5
-Release:   9.%{alphatag}%{?dist}
+Version:   0.3.6
+Release:   1.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,35 +84,38 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
+* Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
+- svn 355
+
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
 - remove README. Its content is not useful for end users
 
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
 - fix build in rawhide (automake 1.10)
 - use svn revision number instead of checkout date
 
-* Fri Apr  6 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
+* Fri Apr  6 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
 - fix svn build
 - svn 20070406
 
-* Fri Mar 30 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
+* Fri Mar 30 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
 - svn 20070330
 - enable libnotify support
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-5
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-5
 - Remove X-Fedora category in desktop file
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-4
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-4
 - Add gettext to BuildRequires
 - remove deprecated categories in desktop file
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-3
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-3
 - fix debuginfo rpm issues
 - fix desktop file issues
 - remove unnecessary update-desktop-database scriptlets (no Mimetypes entry in desktop file)
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-2
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-2
 - Move desktop-file-utils to BuildRequires
 
-* Wed Jan 10 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-1
+* Wed Jan 10 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 18:22:24 -0000	1.2
+++ sources	9 Sep 2007 15:26:03 -0000	1.3
@@ -1 +1 @@
-4be1a6f2ec82064128ee4c0addf4faed  pcmanx-gtk2.tar.gz
+3e9f23fb8f051a4c099599f27616a687  pcmanx-gtk2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:15:46 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:15:46 -0400
Subject: rpms/gcstar/FC-6 gcstar.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200709091715.l89HFkMb014171@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14093

Modified Files:
	gcstar.spec sources 
Log Message:
New upstream version: 1.2.0



Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcstar.spec	8 Mar 2007 22:41:24 -0000	1.5
+++ gcstar.spec	9 Sep 2007 17:15:14 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gcstar.org/
 Source0:        http://download.gna.org/gcstar/gcstar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 
 BuildRequires:    desktop-file-utils
 Requires:         perl-Gtk2
+Obsoletes:        gcfilms
 
 %define desktop_vendor fedora
 
@@ -100,6 +101,12 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
+* Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
+  - Updated license tag
+* Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3
+  - Added Obsoletes tag
 * Fri Feb 23 2007 Tian <tian at c-sait.net> - 1.1.1-2
   - Execution bit on xdg-open
 * Fri Feb 16 2007 Tian <tian at c-sait.net> - 1.1.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 22:15:23 -0000	1.3
+++ sources	9 Sep 2007 17:15:14 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:17:32 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:17:32 -0400
Subject: rpms/gcstar/F-7 .cvsignore, 1.4, 1.5 gcstar.spec, 1.8, 1.9 sources, 
	1.3, 1.4
Message-ID: <200709091717.l89HHW0F014284@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version: 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 19:48:34 -0000	1.4
+++ .cvsignore	9 Sep 2007 17:16:59 -0000	1.5
@@ -1 +1 @@
-gcstar-1.1.1.tar.gz
+gcstar-1.2.0.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/gcstar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcstar.spec	16 Aug 2007 18:09:47 -0000	1.8
+++ gcstar.spec	9 Sep 2007 17:16:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        4%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
   - Updated license tag
 * Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 19:48:34 -0000	1.3
+++ sources	9 Sep 2007 17:16:59 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:19:34 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Sun, 9 Sep 2007 13:19:34 -0400
Subject: rpms/gcstar/devel .cvsignore,1.4,1.5 sources,1.3,1.4
Message-ID: <200709091719.l89HJYMH014353@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14333

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version: 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 19:48:34 -0000	1.4
+++ .cvsignore	9 Sep 2007 17:19:01 -0000	1.5
@@ -1 +1 @@
-gcstar-1.1.1.tar.gz
+gcstar-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2007 19:48:34 -0000	1.3
+++ sources	9 Sep 2007 17:19:01 -0000	1.4
@@ -1 +1 @@
-0a7067d460ac7fb16cb51ba2dc5a24ac  gcstar-1.1.1.tar.gz
+4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 17:26:18 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:26:18 -0400
Subject: rpms/qucs/devel qucs.desktop,1.2,1.3 qucs.spec,1.16,1.17
Message-ID: <200709091726.l89HQI6v014660@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14614

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:25:46 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qucs.spec	29 Aug 2007 05:58:08 -0000	1.16
+++ qucs.spec	9 Sep 2007 17:25:46 -0000	1.17
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.0.12-3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:28:37 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:28:37 -0400
Subject: rpms/qucs/devel qucs.spec,1.17,1.18
Message-ID: <200709091728.l89HSb23014797@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14756

Modified Files:
	qucs.spec 
Log Message:



Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qucs.spec	9 Sep 2007 17:25:46 -0000	1.17
+++ qucs.spec	9 Sep 2007 17:28:05 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,7 +50,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-4
 - Modifiy qucs.desktop BZ 283941
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.0.12-3



From fedora-extras-commits at redhat.com  Sun Sep  9 17:31:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:31:15 -0400
Subject: rpms/qucs/F-7 qucs.desktop,1.2,1.3 qucs.spec,1.15,1.16
Message-ID: <200709091731.l89HVFTb014967@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14917

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/F-7/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:30:43 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/F-7/qucs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qucs.spec	18 Jun 2007 14:58:34 -0000	1.15
+++ qucs.spec	9 Sep 2007 17:30:43 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:32:39 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:32:39 -0400
Subject: rpms/qucs/FC-6 qucs.desktop,1.2,1.3 qucs.spec,1.14,1.15
Message-ID: <200709091732.l89HWdOr015097@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-6/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:32:06 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-6/qucs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qucs.spec	18 Jun 2007 15:22:59 -0000	1.14
+++ qucs.spec	9 Sep 2007 17:32:06 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:33:45 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:33:45 -0400
Subject: rpms/qucs/EL-4 qucs.desktop,1.2,1.3 qucs.spec,1.11,1.12
Message-ID: <200709091733.l89HXjxY015285@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15243

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-4/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:34:49 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:33:13 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-4/qucs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qucs.spec	18 Jun 2007 15:25:50 -0000	1.11
+++ qucs.spec	9 Sep 2007 17:33:13 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:34:55 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Sep 2007 13:34:55 -0400
Subject: rpms/qucs/EL-5 qucs.desktop,1.2,1.3 qucs.spec,1.14,1.15
Message-ID: <200709091734.l89HYtRx015398@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/qucs/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15351

Modified Files:
	qucs.desktop qucs.spec 
Log Message:



Index: qucs.desktop
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-5/qucs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qucs.desktop	4 Nov 2005 22:33:11 -0000	1.2
+++ qucs.desktop	9 Sep 2007 17:34:23 -0000	1.3
@@ -9,4 +9,4 @@
 Terminal=false
 Type=Application
 Icon=/usr/share/qucs/bitmaps/big.qucs.xpm
-Categories=Application;Education;Utility;
+Categories=Science;Engineering;


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/EL-5/qucs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qucs.spec	18 Jun 2007 15:27:09 -0000	1.14
+++ qucs.spec	9 Sep 2007 17:34:23 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.12
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 URL:		http://qucs.sourceforge.net/
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 09 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-3
+- Modifiy qucs.desktop BZ 283941
+
 * Sun Jun 17 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.12-2
 - Add perl and iverilog as require
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:47:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 9 Sep 2007 13:47:12 -0400
Subject: rpms/gq/FC-6 gq.spec,1.3,1.4
Message-ID: <200709091747.l89HlCkR015955@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888/FC-6

Modified Files:
	gq.spec 
Log Message:

Add default-codeset to configure (FC-6 and devel branch)




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/FC-6/gq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gq.spec	21 Aug 2007 17:03:12 -0000	1.3
+++ gq.spec	9 Sep 2007 17:46:39 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:47:15 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 9 Sep 2007 13:47:15 -0400
Subject: rpms/gq/devel gq.spec,1.5,1.6
Message-ID: <200709091747.l89HlFOg015960@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888/devel

Modified Files:
	gq.spec 
Log Message:

Add default-codeset to configure (FC-6 and devel branch)




Index: gq.spec
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/gq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gq.spec	21 Aug 2007 16:56:15 -0000	1.5
+++ gq.spec	9 Sep 2007 17:46:42 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name: gq
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gq-project.org/
@@ -35,7 +35,7 @@
 %{name}-%{langver}-langpack-1/langpack .
 cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/
 
-%configure --with-included-gettext --disable-update-mimedb
+%configure --with-included-gettext --disable-update-mimedb --with-default-codeset=UTF-8
 # --enable-cache --enable-browser-dnd
 
 make %{?_smp_mflags}
@@ -74,6 +74,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Sep  6 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-7
+- Add default-codeset to configure (fix bz #281431)
+
 * Tue Aug 21 2007 Terje R??sten <terje.rosten at ntnu.no> - 1.2.2-6
 - Tag problem
 



From fedora-extras-commits at redhat.com  Sun Sep  9 17:48:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Sun, 9 Sep 2007 13:48:59 -0400
Subject: rpms/hotwire/devel .cvsignore, 1.7, 1.8 hotwire.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200709091748.l89HmxLl016107@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/hotwire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16063

Modified Files:
	.cvsignore hotwire.spec sources 
Log Message:
0.595


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jul 2007 22:29:44 -0000	1.7
+++ .cvsignore	9 Sep 2007 17:48:27 -0000	1.8
@@ -1,6 +1 @@
-hotwire-0.450.zip
-hotwire-0.554.zip
-hotwire-0.556.zip
-hotwire-0.567.zip
-hotwire-0.575.zip
-hotwire-0.590.zip
+hotwire-0.595.zip


Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/hotwire.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hotwire.spec	11 Jul 2007 22:29:44 -0000	1.10
+++ hotwire.spec	9 Sep 2007 17:48:27 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: Hotwire Shell
 Name: hotwire
-Version: 0.590
+Version: 0.595
 Release: 1%{?dist}
 Source0: http://hotwire-shell.org/download/hotwire-%{version}.zip
 License: GPL
@@ -56,6 +56,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Sun Sep 09 2007 Colin Walters <walters at redhat.com> - 0.595-1
+- new upstream
+
 * Tue Jul 12 2007 Colin Walters <walters at redhat.com> - 0.590-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Jul 2007 22:29:44 -0000	1.7
+++ sources	9 Sep 2007 17:48:27 -0000	1.8
@@ -1,2 +1 @@
-e465e180cd90df1b5c88c5648c996469  hotwire-0.575.zip
-13b9d559b725b3b36104f6f97ae3ede6  hotwire-0.590.zip
+2da79522e51904c78df9bd3dfb5e13ef  hotwire-0.595.zip



From fedora-extras-commits at redhat.com  Sun Sep  9 18:01:01 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Sep 2007 14:01:01 -0400
Subject: rpms/tango-icon-theme/F-7 tango-icon-theme.spec,1.4,1.5
Message-ID: <200709091801.l89I11r6017326@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673/F-7

Modified Files:
	tango-icon-theme.spec 
Log Message:
Fix dates in %changelog.


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/F-7/tango-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tango-icon-theme.spec	1 Sep 2007 22:23:41 -0000	1.4
+++ tango-icon-theme.spec	9 Sep 2007 18:00:27 -0000	1.5
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+* Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
 - Update to new upstream release (0.8.1)
 
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1



From fedora-extras-commits at redhat.com  Sun Sep  9 18:01:05 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Sep 2007 14:01:05 -0400
Subject: rpms/tango-icon-theme/devel tango-icon-theme.spec,1.4,1.5
Message-ID: <200709091801.l89I15ah021791@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/tango-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673/devel

Modified Files:
	tango-icon-theme.spec 
Log Message:
Fix dates in %changelog.


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tango-icon-theme.spec	1 Sep 2007 22:21:33 -0000	1.4
+++ tango-icon-theme.spec	9 Sep 2007 18:00:31 -0000	1.5
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
+* Sun Sep 09 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.1-1
 - Update to new upstream release (0.8.1)
 
 * Sat Feb 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.8.0-1



From fedora-extras-commits at redhat.com  Sun Sep  9 18:10:46 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 9 Sep 2007 14:10:46 -0400
Subject: rpms/jd/devel .cvsignore, 1.143, 1.144 jd.spec, 1.169, 1.170 sources,
	1.144, 1.145
Message-ID: <200709091810.l89IAkZj023020@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22996

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
- svn 1322



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- .cvsignore	6 Sep 2007 16:21:29 -0000	1.143
+++ .cvsignore	9 Sep 2007 18:10:13 -0000	1.144
@@ -1 +1 @@
-jd-1.9.6-svn1314.tgz
+jd-1.9.6-svn1322.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- jd.spec	6 Sep 2007 16:21:29 -0000	1.169
+++ jd.spec	9 Sep 2007 18:10:13 -0000	1.170
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1314
+%define         strtag        svn1322
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -84,6 +86,7 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
+find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -119,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1314
-- svn 1314
+* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
+- svn 1322
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	6 Sep 2007 16:21:29 -0000	1.144
+++ sources	9 Sep 2007 18:10:13 -0000	1.145
@@ -1 +1 @@
-2255ee977583bd11cd408a5d849a9c4e  jd-1.9.6-svn1314.tgz
+c2739df7a9ba803064f93beb6f87ed72  jd-1.9.6-svn1322.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 18:40:11 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Sun, 9 Sep 2007 14:40:11 -0400
Subject: rpms/strigi/devel strigi.spec,1.6,1.7
Message-ID: <200709091840.l89IeBeH025060@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029

Modified Files:
	strigi.spec 
Log Message:
* Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
- Rebuild for BuildID changes



Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- strigi.spec	11 Aug 2007 21:56:08 -0000	1.6
+++ strigi.spec	9 Sep 2007 18:39:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -109,6 +109,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
+- Rebuild for BuildID changes
+
 * Sat Aug 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
 - Update to 0.5.5 release
 



From fedora-extras-commits at redhat.com  Sun Sep  9 19:36:14 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sun, 9 Sep 2007 15:36:14 -0400
Subject: rpms/php-pear/devel .cvsignore, 1.11, 1.12 php-pear.spec, 1.26,
	1.27 sources, 1.11, 1.12 pear-downloaddir.patch, 1.1,
	NONE pear-peclinstall.patch, 1.1, NONE
Message-ID: <200709091936.l89JaEiC000599@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv559

Modified Files:
	.cvsignore php-pear.spec sources 
Removed Files:
	pear-downloaddir.patch pear-peclinstall.patch 
Log Message:
update to 1.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jul 2007 18:31:05 -0000	1.11
+++ .cvsignore	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-PEAR-1.6.1.tgz
+PEAR-1.6.2.tgz
 XML_RPC-1.5.1.tgz
 Archive_Tar-1.3.2.tgz
 Console_Getopt-1.2.3.tgz


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- php-pear.spec	21 Aug 2007 11:34:25 -0000	1.26
+++ php-pear.spec	9 Sep 2007 19:35:42 -0000	1.27
@@ -12,8 +12,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.6.1
-Release: 2
+Version: 1.6.2
+Release: 1%{?dist}
 Epoch: 1
 License: PHP
 Group: Development/Languages
@@ -33,13 +33,6 @@
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 
-# To Avoid warnings when using pecl (un)install command
-# see  http://pear.php.net/bugs/bug.php?id=11420 
-Patch0: pear-peclinstall.patch
-# To avoid error when "system" download_dir is not writable for normal user.
-# see  http://pear.php.net/bugs/bug.php?id=11517
-Patch1: pear-downloaddir.patch
-
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg
@@ -63,6 +56,8 @@
     tar xzf  $archive --strip-components 1
 done
 
+# apply patches on used PEAR during install
+# -- no patch
 
 %build
 # This is an empty build section.
@@ -109,9 +104,9 @@
 install -m 644 -c %{SOURCE13} \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear     
 
+# apply patches on installed PEAR tree
 cd $RPM_BUILD_ROOT%{peardir} 
-patch -p4 <%{PATCH0}
-patch -p4 <%{PATCH1}
+# -- no patch
 
 # Why this file here ?
 rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
@@ -139,6 +134,11 @@
 %doc LICENSE
 
 %changelog
+* Sun Sep  9 2007 Remi Collet <Fedora at FamilleCollet.com> 1:1.6.2-1
+- update to 1.6.2
+- remove patches merged upstream
+- Fix : "pear install" hangs on non default channel (#283401)
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1:1.6.1-2
 - fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jul 2007 18:31:05 -0000	1.11
+++ sources	9 Sep 2007 19:35:42 -0000	1.12
@@ -1,4 +1,4 @@
-1476f0ec3917d68e3d7af1346a9a7b89  PEAR-1.6.1.tgz
+8658f584d0ba2648b795fe8b1d8998c2  PEAR-1.6.2.tgz
 1b516162ad65971b5fd04a7c279627ec  XML_RPC-1.5.1.tgz
 17d49e837b64df4e8f9124f829b22cd1  Archive_Tar-1.3.2.tgz
 d7618327f9302a7191893768982de823  Console_Getopt-1.2.3.tgz


--- pear-downloaddir.patch DELETED ---


--- pear-peclinstall.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 19:42:14 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 15:42:14 -0400
Subject: rpms/gnu-smalltalk/devel gst-2.3.6-pathfix.patch, NONE,
	1.1 gnu-smalltalk.spec, 1.22, 1.23
Message-ID: <200709091942.l89JgEf7000939@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv896

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-2.3.6-pathfix.patch 
Log Message:
Disable ppc64 temporarly

gst-2.3.6-pathfix.patch:

--- NEW FILE gst-2.3.6-pathfix.patch ---
--- orig/kernel/VFS.st
+++ mod/kernel/VFS.st
@@ -231,10 +231,7 @@ update: aspect
      filesystems specified by the subclasses upon image load."
 
     (aspect == #returnFromSnapshot or: [ aspect == #finishedSnapshot ]) ifTrue: [
-	Registry := LookupTable new.
-	self allSubclassesDo: [ :each |
-	    each fileSystems do: [ :fs | self register: fs forClass: each ]
-	]
+	Registry := nil.
     ].
     (aspect == #aboutToQuit or: [ aspect == #aboutToSnapshot ]) ifTrue: [
 	self allSubclassesDo: [ :each | each release ].
@@ -264,6 +261,12 @@ vfsFor: fileName name: fsName subPath: s
     "Create an instance of a subclass of the receiver, implementing the virtual
      file `subPath' inside the `fileName' archive.  fsName is the virtual
      filesystem name and is used to determine the subclass to be instantiated."
+    Registry isNil ifTrue: [
+        Registry := LookupTable new.
+	self allSubclassesDo: [ :each |
+	    each fileSystems do: [ :fs | self register: fs forClass: each ]
+	]
+    ].
     ^(Registry at: fsName) 
 	vfsFor: fileName name: fsName subPath: subPath!
 

Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnu-smalltalk.spec	6 Sep 2007 19:36:36 -0000	1.22
+++ gnu-smalltalk.spec	9 Sep 2007 19:41:41 -0000	1.23
@@ -1,14 +1,17 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 2.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-2.3.6-am.patch
+Patch2: gst-2.3.6-pathfix.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
+ExcludeArch: ppc64
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -61,7 +64,8 @@
 
 %prep
 %setup -q -n smalltalk-%{version}
-%patch1 -p1 -b .automake
+%patch1 -p1
+%patch2 -p1 -b .pfx
 
 %build
 # automake
@@ -142,6 +146,10 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-2
+- Remove build path from gst.im
+- Temporarly disable ppc64
+
 * Thu Sep  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:04:00 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:04:00 -0400
Subject: rpms/crossvc/devel .cvsignore, 1.4, 1.5 crossvc.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200709092004.l89K40Dm007674@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7593

Modified Files:
	.cvsignore crossvc.spec sources 
Log Message:
Add Req to qt-3.3.8-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jul 2007 17:02:05 -0000	1.4
+++ .cvsignore	9 Sep 2007 20:03:27 -0000	1.5
@@ -1 +1 @@
-crossvc-1.5.2pre.tgz
+crossvc-1.5.1-0-generic-src.tgz


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crossvc.spec	8 Aug 2007 17:52:58 -0000	1.6
+++ crossvc.spec	9 Sep 2007 20:03:27 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             crossvc
-Version:          1.5.2
-Release:          0.2%{?dist}
+Version:          1.5.1
+Release:          4%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -21,6 +21,7 @@
 BuildRequires:    qt-devel >= 1:3.3
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
+Requires:	  qt >= 3.3.8-6
 
 Provides:         lincvs = %{version}-%{release}
 Obsoletes:        lincvs < 1.5.0
@@ -88,6 +89,10 @@
 
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
+- Downgrade to last stable release
+- Add Req to qt-3.3.8-6 (#246024)
+
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-0.2
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jul 2007 17:02:05 -0000	1.4
+++ sources	9 Sep 2007 20:03:27 -0000	1.5
@@ -1 +1 @@
-9914bbf275a53dd5da60c8b7e20d81ab  crossvc-1.5.2pre.tgz
+50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Sun Sep  9 20:07:25 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:07:25 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.7,1.8
Message-ID: <200709092007.l89K7Pkx007890@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7811

Modified Files:
	crossvc.spec 
Log Message:
Increase release to avoid EVR issues


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crossvc.spec	9 Sep 2007 20:03:27 -0000	1.7
+++ crossvc.spec	9 Sep 2007 20:06:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -89,7 +89,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:11:34 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:11:34 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.8,1.9
Message-ID: <200709092011.l89KBYXQ008108@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8070

Modified Files:
	crossvc.spec 
Log Message:
Correct wrong Source entry in SPEC file


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- crossvc.spec	9 Sep 2007 20:06:52 -0000	1.8
+++ crossvc.spec	9 Sep 2007 20:11:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -10,8 +10,7 @@
 # This is a prerelease of crossvc-1.5.2 which I have got
 # from upstream via mail. This should contains a workaroud
 # for a bug in qt-3.3.8
-source0:	  crossvc-1.5.2pre.tgz
-#Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
+Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
 Patch1:		  crossvc-1.5.2-nocreate.patch
 
@@ -89,7 +88,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-6
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:15:06 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:15:06 -0400
Subject: rpms/crossvc/F-7 crossvc.spec,1.6,1.7
Message-ID: <200709092015.l89KF6WY008287@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8258

Modified Files:
	crossvc.spec 
Log Message:
Add Req to qt-3.3.8-6


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/crossvc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crossvc.spec	12 Aug 2007 18:34:20 -0000	1.6
+++ crossvc.spec	9 Sep 2007 20:14:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -17,6 +17,7 @@
 BuildRequires:    qt-devel >= 1:3.3
 BuildRequires:    desktop-file-utils
 Requires:         cvs >= 0:1.9.0
+Requires:	  qt >= 3.3.8-6
 
 Provides:         lincvs = %{version}-%{release}
 Obsoletes:        lincvs < 1.5.0
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
+- Add Req to qt-3.3.8-6 (#246024)
+
 * Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-4
 - Changing license tag
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:19:46 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:19:46 -0400
Subject: rpms/crossvc/devel crossvc-1.5.1-nocreate.patch, 1.2,
	1.3 crossvc.spec, 1.9, 1.10 crossvc-1.5.2-nocreate.patch, 1.1, NONE
Message-ID: <200709092019.l89KJk2n008520@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8495

Modified Files:
	crossvc.spec 
Added Files:
	crossvc-1.5.1-nocreate.patch 
Removed Files:
	crossvc-1.5.2-nocreate.patch 
Log Message:
Correct wrong patch in SPEC file

crossvc-1.5.1-nocreate.patch:

Index: crossvc-1.5.1-nocreate.patch
===================================================================
RCS file: crossvc-1.5.1-nocreate.patch
diff -N crossvc-1.5.1-nocreate.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.1-nocreate.patch	9 Sep 2007 20:19:44 -0000	1.3
@@ -0,0 +1,50 @@
+--- CrossVC/src/ImportDialog.ui.nocreate	2007-06-28 19:38:19.000000000 +0200
++++ CrossVC/src/ImportDialog.ui	2007-06-28 19:40:49.000000000 +0200
+@@ -651,14 +651,6 @@ enter the appropriate value or leave thi
+                 <property name="name">
+                     <cstring>unnamed</cstring>
+                 </property>
+-                <widget class="QCheckBox" row="1" column="0">
+-                    <property name="name">
+-                        <cstring>m_CreateDirs</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Create CVS directories while importing</string>
+-                    </property>
+-                </widget>
+                 <widget class="QCheckBox" row="0" column="0">
+                     <property name="name">
+                         <cstring>m_KeepFTime</cstring>
+--- CrossVC/src/Import.cpp.nocreate	2007-06-28 19:42:23.000000000 +0200
++++ CrossVC/src/Import.cpp	2007-06-28 19:43:13.000000000 +0200
+@@ -185,7 +185,6 @@ void Import::acceptCvs() {
+    int rshMode = dlg->rshMode();
+    int sshAccess = dlg->getSshPreset();
+    bool keepFTime = dlg->getKeepFTime();
+-   bool createDirs = dlg->getCreateDirs();
+    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
+    QStringList binaryWildcards = dlg->getBinaryWildcards();
+ 
+@@ -250,8 +249,7 @@ void Import::acceptCvs() {
+    files += " import ";
+    
+    if (keepFTime) files += "-d ";
+-   if (createDirs) files += "-C ";
+-    
++      
+   
+    //ignore files:
+    QString sIgnore = "-I ! ";
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-06-28 19:41:17.000000000 +0200
++++ CrossVC/src/ImportDialogImpl.cpp	2007-06-28 19:42:12.000000000 +0200
+@@ -691,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
+ 	return m_KeepFTime->isChecked();
+ }
+ 
+-bool ImportDialogImpl::getCreateDirs() {
+-	return m_CreateDirs->isChecked();
+-}
+-
+ void ImportDialogImpl::getAndSetModule() {
+    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
+    m_ModuleBrowser = NULL;


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- crossvc.spec	9 Sep 2007 20:11:01 -0000	1.9
+++ crossvc.spec	9 Sep 2007 20:19:44 -0000	1.10
@@ -12,7 +12,7 @@
 # for a bug in qt-3.3.8
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.2-nocreate.patch
+Patch1:		  crossvc-1.5.1-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


--- crossvc-1.5.2-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep  9 20:20:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 9 Sep 2007 16:20:55 -0400
Subject: rpms/crossvc/devel crossvc.spec,1.10,1.11
Message-ID: <200709092020.l89KKttt008581@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8549

Modified Files:
	crossvc.spec 
Log Message:
Increase release


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- crossvc.spec	9 Sep 2007 20:19:44 -0000	1.10
+++ crossvc.spec	9 Sep 2007 20:20:23 -0000	1.11
@@ -1,6 +1,6 @@
 Name:             crossvc
 Version:          1.5.1
-Release:          6%{?dist}
+Release:          7%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -88,7 +88,7 @@
 
 
 %changelog
-* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-6
+* Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-7
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)
 



From fedora-extras-commits at redhat.com  Sun Sep  9 20:23:25 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 16:23:25 -0400
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.7, 1.8
Message-ID: <200709092023.l89KNPvn008770@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739

Modified Files:
	eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec 
Log Message:
Fix MANIFEST.MF patch


eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 15:12:49 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 20:23:22 -0000	1.2
@@ -1,12 +1,13 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
- Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
- Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
-  lib/svnClientAdapter.jar,
-  lib/svnjavahl.jar,
-  lib/svnkit.jar,
+--- MANIFEST.MF.original	2007-09-09 14:40:20.000000000 -0400
++++ MANIFEST.MF	2007-09-09 14:42:09.000000000 -0400
+@@ -14,8 +14,8 @@
+  rg.tigris.subversion.svnclientadapter.commandline.parser,org.tigris.s
+  ubversion.svnclientadapter.javahl,org.tigris.subversion.svnclientadap
+  ter.svnkit,org.tigris.subversion.svnclientadapter.utils
+-Bundle-ClassPath: .,lib/svnClientAdapter.jar,lib/svnjavahl.jar,lib/svn
+- kit.jar,lib/ganymed.jar
++Bundle-ClassPath: lib/subclipse-core.jar,lib/svnClientAdapter.jar,lib/
++ svnjavahl.jar,lib/svnkit.jar,lib/ganymed.jar
+ Bundle-Name: %pluginName
+ Bundle-Localization: plugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-subclipse.spec	29 Aug 2007 05:34:31 -0000	1.7
+++ eclipse-subclipse.spec	9 Sep 2007 20:23:22 -0000	1.8
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -197,7 +197,7 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
+# adding the recently created jar to the plugin manifest
 patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars



From fedora-extras-commits at redhat.com  Sun Sep  9 21:40:39 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 9 Sep 2007 17:40:39 -0400
Subject: rpms/kleansweep/devel kleansweep.spec,1.2,1.3
Message-ID: <200709092140.l89Ledfl017489@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17446/devel

Modified Files:
	kleansweep.spec 
Log Message:



Index: kleansweep.spec
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/kleansweep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kleansweep.spec	24 Aug 2007 00:12:02 -0000	1.2
+++ kleansweep.spec	9 Sep 2007 21:40:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:          kleansweep
 Version:       0.2.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Reclaim disk space by finding unneeded files
 
 License:       GPLv2
@@ -38,8 +38,8 @@
 
 desktop-file-install --vendor fedora             \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "System"                    \
-  --delete-original                          \
+  --remove-category "System"                    \
+  --delete-original                             \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/kleansweep.desktop
 
 %find_lang %{name}
@@ -67,6 +67,9 @@
 
 
 %Changelog
+* Sun Sep 09 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 0.2.9-5
+- fixed duplicate kmenu entries
+
 * Thu Aug 23 2007 Chitlesh Goorah  <chitlesh [AT] fedoraproject DOT org> - 0.2.9-4
 - mass rebuild for fedora 8 - BuildID
 



From fedora-extras-commits at redhat.com  Sun Sep  9 21:40:58 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 17:40:58 -0400
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.2,
	1.3 eclipse-subclipse.spec, 1.8, 1.9
Message-ID: <200709092140.l89LewIN017562@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533

Modified Files:
	eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec 
Log Message:
Change MANIFEST.MF patch to be applied on %prep stage


eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 20:23:22 -0000	1.2
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 21:40:55 -0000	1.3
@@ -1,13 +1,10 @@
---- MANIFEST.MF.original	2007-09-09 14:40:20.000000000 -0400
-+++ MANIFEST.MF	2007-09-09 14:42:09.000000000 -0400
-@@ -14,8 +14,8 @@
-  rg.tigris.subversion.svnclientadapter.commandline.parser,org.tigris.s
-  ubversion.svnclientadapter.javahl,org.tigris.subversion.svnclientadap
-  ter.svnkit,org.tigris.subversion.svnclientadapter.utils
--Bundle-ClassPath: .,lib/svnClientAdapter.jar,lib/svnjavahl.jar,lib/svn
-- kit.jar,lib/ganymed.jar
-+Bundle-ClassPath: lib/subclipse-core.jar,lib/svnClientAdapter.jar,lib/
-+ svnjavahl.jar,lib/svnkit.jar,lib/ganymed.jar
- Bundle-Name: %pluginName
- Bundle-Localization: plugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
+ Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
+ Bundle-Version: 1.2.2
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
+  lib/svnClientAdapter.jar,
+  lib/svnjavahl.jar,
+  lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-subclipse.spec	9 Sep 2007 20:23:22 -0000	1.8
+++ eclipse-subclipse.spec	9 Sep 2007 21:40:55 -0000	1.9
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -29,11 +29,8 @@
 Source10:       subclipse-fetch-1.2.2.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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifest
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on %prep stage
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep  9 21:43:32 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Sun, 9 Sep 2007 17:43:32 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.9,1.10
Message-ID: <200709092143.l89LhWI9017692@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17650

Modified Files:
	eclipse-subclipse.spec 
Log Message:
remove % used in a changelog comment



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-subclipse.spec	9 Sep 2007 21:40:55 -0000	1.9
+++ eclipse-subclipse.spec	9 Sep 2007 21:42:59 -0000	1.10
@@ -239,7 +239,7 @@
 
 %changelog
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
-- Change MANIFEST.MF patch to be applied on %prep stage
+- Change MANIFEST.MF patch to be applied on prep stage
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
 - Rebuild for selinux ppc32 issue.



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:41 -0700
Subject: [pkgdb] flpsed was added for nboyle
Message-ID: <200709092216.l89MGgnr007563@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package flpsed with summary WYSIWYG pseudo PostScript editor
Kevin Fenzi (kevin) has approved Package flpsed
Kevin Fenzi (kevin) has added a Fedora devel branch for flpsed with an owner of nboyle
Kevin Fenzi (kevin) has approved flpsed in Fedora devel
Kevin Fenzi (kevin) has approved Package flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flpsed



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, 7) updated by kevin
Message-ID: <200709092216.l89MGuCg007572@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flpsed



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, devel) updated by kevin
Message-ID: <200709092216.l89MGucn007581@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flpsed



From fedora-extras-commits at redhat.com  Sun Sep  9 22:16:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:16:55 -0700
Subject: [pkgdb] flpsed (Fedora, 6) updated by kevin
Message-ID: <200709092216.l89MGvu6007591@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for flpsed
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on flpsed (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on flpsed (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/flpsed



From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:25 -0400
Subject: rpms/flpsed - New directory
Message-ID: <200709092217.l89MHPAG024740@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed

Log Message:
Directory /cvs/extras/rpms/flpsed added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:27 -0400
Subject: rpms/flpsed/devel - New directory
Message-ID: <200709092217.l89MHRIg024759@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed/devel

Log Message:
Directory /cvs/extras/rpms/flpsed/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:30 -0400
Subject: rpms/flpsed Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092217.l89MHUEW024790@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed

Added Files:
	Makefile import.log 
Log Message:
Setup of module flpsed


--- NEW FILE Makefile ---
# Top level Makefile for module flpsed
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:17:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:17:33 -0400
Subject: rpms/flpsed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092217.l89MHX9d024808@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr24690/rpms/flpsed/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flpsed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: flpsed
# $Id: Makefile,v 1.1 2007/09/09 22:17:31 kevin Exp $
NAME := flpsed
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:22:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:34 -0700
Subject: [pkgdb] radeontool was added for till
Message-ID: <200709092222.l89MMZqR005881@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package radeontool with summary Backlight and video output configuration tool for radeon cards
Kevin Fenzi (kevin) has approved Package radeontool
Kevin Fenzi (kevin) has added a Fedora devel branch for radeontool with an owner of till
Kevin Fenzi (kevin) has approved radeontool in Fedora devel
Kevin Fenzi (kevin) has approved Package radeontool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on radeontool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on radeontool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on radeontool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:22:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:43 -0700
Subject: [pkgdb] radeontool (Fedora, devel) updated by kevin
Message-ID: <200709092222.l89MMiic007628@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved commit on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved build on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved approveacls on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved checkout on radeontool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on radeontool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:22:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:22:43 -0700
Subject: [pkgdb] radeontool (Fedora, 7) updated by kevin
Message-ID: <200709092222.l89MMiXC007640@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for radeontool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on radeontool (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved commit on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved build on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved approveacls on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved checkout on radeontool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on radeontool (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:03 -0400
Subject: rpms/radeontool - New directory
Message-ID: <200709092223.l89MN3KN026056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool

Log Message:
Directory /cvs/extras/rpms/radeontool added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:07 -0400
Subject: rpms/radeontool/devel - New directory
Message-ID: <200709092223.l89MN75A026081@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool/devel

Log Message:
Directory /cvs/extras/rpms/radeontool/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:10 -0400
Subject: rpms/radeontool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092223.l89MNArD026119@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool

Added Files:
	Makefile import.log 
Log Message:
Setup of module radeontool


--- NEW FILE Makefile ---
# Top level Makefile for module radeontool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:23:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:23:13 -0400
Subject: rpms/radeontool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092223.l89MNDF2026145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw25996/rpms/radeontool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module radeontool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: radeontool
# $Id: Makefile,v 1.1 2007/09/09 22:23:11 kevin Exp $
NAME := radeontool
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:27:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:18 -0700
Subject: [pkgdb] vbetool was added for till
Message-ID: <200709092227.l89MRIHR007665@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package vbetool with summary Run real-mode video BIOS code to alter hardware state
Kevin Fenzi (kevin) has approved Package vbetool
Kevin Fenzi (kevin) has added a Fedora devel branch for vbetool with an owner of till
Kevin Fenzi (kevin) has approved vbetool in Fedora devel
Kevin Fenzi (kevin) has approved Package vbetool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on vbetool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on vbetool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on vbetool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:27:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:24 -0700
Subject: [pkgdb] vbetool (Fedora, 7) updated by kevin
Message-ID: <200709092227.l89MROus005920@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for vbetool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on vbetool (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved commit on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved build on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved approveacls on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) approved checkout on vbetool (Fedora 7) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on vbetool (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:27:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:27:24 -0700
Subject: [pkgdb] vbetool (Fedora, devel) updated by kevin
Message-ID: <200709092227.l89MROJ8005932@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved watchcommits on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved commit on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved build on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved approveacls on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) approved checkout on vbetool (Fedora devel) for pknirsch
Kevin Fenzi (kevin) Denied cvsextras for commit access on vbetool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Sun Sep  9 22:30:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:30:49 -0700
Subject: [pkgdb] pm-utils summary updated by kevin
Message-ID: <200709092230.l89MUnML005964@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package pm-utils summary to Power management utilities and scripts for Fedora

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pm-utils



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:32 -0700
Subject: [pkgdb] ksirk was added for jwrdegoede
Message-ID: <200709092233.l89MXXoZ005998@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ksirk with summary Turnbased multiplayer board strategy game (conquer the world!)
Kevin Fenzi (kevin) has approved Package ksirk
Kevin Fenzi (kevin) has added a Fedora devel branch for ksirk with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ksirk in Fedora devel
Kevin Fenzi (kevin) has approved Package ksirk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ksirk (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ksirk (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ksirk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksirk



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:38 -0700
Subject: [pkgdb] ksirk (Fedora, 7) updated by kevin
Message-ID: <200709092233.l89MXdYY006007@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ksirk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ksirk (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on ksirk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksirk



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:33:38 -0700
Subject: [pkgdb] ksirk (Fedora, devel) updated by kevin
Message-ID: <200709092233.l89MXdti006016@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on ksirk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ksirk



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:42 -0400
Subject: rpms/vbetool - New directory
Message-ID: <200709092233.l89MXg3w028514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool

Log Message:
Directory /cvs/extras/rpms/vbetool added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:48 -0400
Subject: rpms/vbetool/devel - New directory
Message-ID: <200709092233.l89MXmnB028544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool/devel

Log Message:
Directory /cvs/extras/rpms/vbetool/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:51 -0400
Subject: rpms/vbetool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092233.l89MXpSu028580@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool

Added Files:
	Makefile import.log 
Log Message:
Setup of module vbetool


--- NEW FILE Makefile ---
# Top level Makefile for module vbetool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:33:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:33:53 -0400
Subject: rpms/vbetool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092233.l89MXrVu028607@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28461/rpms/vbetool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vbetool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vbetool
# $Id: Makefile,v 1.1 2007/09/09 22:33:51 kevin Exp $
NAME := vbetool
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:34:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:22 -0400
Subject: rpms/ksirk - New directory
Message-ID: <200709092234.l89MYMCC028818@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk

Log Message:
Directory /cvs/extras/rpms/ksirk added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:27 -0400
Subject: rpms/ksirk/devel - New directory
Message-ID: <200709092234.l89MYRkm028842@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk/devel

Log Message:
Directory /cvs/extras/rpms/ksirk/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:30 -0400
Subject: rpms/ksirk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092234.l89MYUET028875@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk

Added Files:
	Makefile import.log 
Log Message:
Setup of module ksirk


--- NEW FILE Makefile ---
# Top level Makefile for module ksirk
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:34:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:34:32 -0400
Subject: rpms/ksirk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709092234.l89MYWCT028899@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28763/rpms/ksirk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ksirk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ksirk
# $Id: Makefile,v 1.1 2007/09/09 22:34:30 kevin Exp $
NAME := ksirk
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:37:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:04 -0700
Subject: [pkgdb] isync was added for lkundrak
Message-ID: <200709092237.l89Mb56t007723@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package isync with summary Tool to synchronize IMAP4 and Maildir mailboxes
Kevin Fenzi (kevin) has approved Package isync
Kevin Fenzi (kevin) has added a Fedora devel branch for isync with an owner of lkundrak
Kevin Fenzi (kevin) has approved isync in Fedora devel
Kevin Fenzi (kevin) has approved Package isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, 7) updated by kevin
Message-ID: <200709092237.l89MbFBq006047@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, 6) updated by kevin
Message-ID: <200709092237.l89MbG4X006058@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092237.l89MbGl7006065@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora EPEL, 4) updated by kevin
Message-ID: <200709092237.l89MbGqb006083@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for isync
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on isync (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:37:15 -0700
Subject: [pkgdb] isync (Fedora, devel) updated by kevin
Message-ID: <200709092237.l89MbGIF006074@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:34 -0400
Subject: rpms/isync - New directory
Message-ID: <200709092237.l89MbYHp029710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync

Log Message:
Directory /cvs/extras/rpms/isync added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:40 -0400
Subject: rpms/isync/devel - New directory
Message-ID: <200709092237.l89Mber9029734@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync/devel

Log Message:
Directory /cvs/extras/rpms/isync/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:44 -0400
Subject: rpms/isync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092237.l89Mbi1n029773@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync

Added Files:
	Makefile import.log 
Log Message:
Setup of module isync


--- NEW FILE Makefile ---
# Top level Makefile for module isync
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:37:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:37:46 -0400
Subject: rpms/isync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709092237.l89MbkVe029803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR29650/rpms/isync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module isync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: isync
# $Id: Makefile,v 1.1 2007/09/09 22:37:44 kevin Exp $
NAME := isync
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:39:41 -0700
Subject: [pkgdb] svn2cl (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092239.l89Mdfvb006104@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for svn2cl
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on svn2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on svn2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on svn2cl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/svn2cl



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:29 -0700
Subject: [pkgdb] hedgewars was added for jwrdegoede
Message-ID: <200709092242.l89MgTeb007764@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package hedgewars with summary 2D tankbattle game with the tanks replaced by hedgehogs
Kevin Fenzi (kevin) has approved Package hedgewars
Kevin Fenzi (kevin) has added a Fedora devel branch for hedgewars with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved hedgewars in Fedora devel
Kevin Fenzi (kevin) has approved Package hedgewars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hedgewars (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hedgewars (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hedgewars (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hedgewars



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:35 -0700
Subject: [pkgdb] hedgewars (Fedora, 7) updated by kevin
Message-ID: <200709092242.l89MgZ26006127@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for hedgewars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on hedgewars (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on hedgewars (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hedgewars



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:42:35 -0700
Subject: [pkgdb] hedgewars (Fedora, devel) updated by kevin
Message-ID: <200709092242.l89MgZU4006136@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on hedgewars (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hedgewars



From fedora-extras-commits at redhat.com  Sun Sep  9 22:42:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:42:58 -0400
Subject: rpms/hedgewars - New directory
Message-ID: <200709092242.l89MgwWC031280@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars

Log Message:
Directory /cvs/extras/rpms/hedgewars added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:03 -0400
Subject: rpms/hedgewars/devel - New directory
Message-ID: <200709092243.l89Mh3nC031321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars/devel

Log Message:
Directory /cvs/extras/rpms/hedgewars/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:05 -0400
Subject: rpms/hedgewars Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092243.l89Mh5dm031354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars

Added Files:
	Makefile import.log 
Log Message:
Setup of module hedgewars


--- NEW FILE Makefile ---
# Top level Makefile for module hedgewars
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:43:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:43:08 -0400
Subject: rpms/hedgewars/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092243.l89Mh8bh031379@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV31208/rpms/hedgewars/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hedgewars


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hedgewars
# $Id: Makefile,v 1.1 2007/09/09 22:43:06 kevin Exp $
NAME := hedgewars
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:43:28 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:43:28 -0400
Subject: rpms/flpsed/devel flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092243.l89MhSxX031538@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial import into CVS



--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:42:52 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:42:52 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:45 -0700
Subject: [pkgdb] xsc was added for limb
Message-ID: <200709092244.l89MijOT007777@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package xsc with summary A clone of the old vector graphics video game Star Castle
Kevin Fenzi (kevin) has approved Package xsc
Kevin Fenzi (kevin) has added a Fedora devel branch for xsc with an owner of limb
Kevin Fenzi (kevin) has approved xsc in Fedora devel
Kevin Fenzi (kevin) has approved Package xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xsc



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, 6) updated by kevin
Message-ID: <200709092244.l89MisK7006166@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xsc



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, 7) updated by kevin
Message-ID: <200709092244.l89Mit6i006175@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for xsc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xsc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xsc



From fedora-extras-commits at redhat.com  Sun Sep  9 22:44:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:44:54 -0700
Subject: [pkgdb] xsc (Fedora, devel) updated by kevin
Message-ID: <200709092244.l89MitA5006184@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on xsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xsc



From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:12 -0400
Subject: rpms/xsc - New directory
Message-ID: <200709092245.l89MjC1N031997@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc

Log Message:
Directory /cvs/extras/rpms/xsc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:19 -0400
Subject: rpms/xsc/devel - New directory
Message-ID: <200709092245.l89MjJph032027@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc/devel

Log Message:
Directory /cvs/extras/rpms/xsc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:22 -0400
Subject: rpms/xsc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092245.l89MjMwf032060@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc

Added Files:
	Makefile import.log 
Log Message:
Setup of module xsc


--- NEW FILE Makefile ---
# Top level Makefile for module xsc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:45:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:45:24 -0400
Subject: rpms/xsc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709092245.l89MjO25032086@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE31937/rpms/xsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xsc
# $Id: Makefile,v 1.1 2007/09/09 22:45:22 kevin Exp $
NAME := xsc
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:46:51 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:46:51 -0400
Subject: rpms/flpsed/F-7 flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092246.l89MkplG032597@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32455/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial CVS import


--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:46:19 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:46:19 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:48:12 2007
From: fedora-extras-commits at redhat.com (Nicholas Boyle (nboyle))
Date: Sun, 9 Sep 2007 18:48:12 -0400
Subject: rpms/flpsed/FC-6 flpsed.desktop, NONE, 1.1 flpsed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092248.l89MmC4g000484@cvs-int.fedora.redhat.com>

Author: nboyle

Update of /cvs/pkgs/rpms/flpsed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	flpsed.desktop flpsed.spec 
Log Message:
Initial CVS import


--- NEW FILE flpsed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=flpsed
GenericName=flpsed
Comment=WYSIWYG pseudo PostScript editor
Exec=flpsed
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE flpsed.spec ---
Name:          flpsed        
Version:       0.5.0        
Release:       3%{?dist}
Summary:       WYSIWYG pseudo PostScript editor

Group:         Applications/Editors
License:       GPL+     
URL:           http://www.ecademix.com/JohannesHofmann/flpsed.html
Source0:       http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.gz
Source1:       flpsed.desktop
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
Requires:      ghostscript


%description
Flpsed is a WYSIWYG pseudo PostScript editor. "Pseudo", because you can't
remove or modify existing elements of a document. Flpsed lets you add
arbitrary text lines to existing PostScript 1 documents. Added lines can later
be reedited with flpsed. Using pdftops, which is part of xpdf, one can convert
PDF documents to PostScript and also add text to them. flpsed is useful for
filling in forms, adding notes etc.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/applications/*
%{_mandir}/man1/*


%changelog
* Tue Sep 05 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-3
-Corrected license version to match source
-Added dependency for ghostscript
-Built files are now globbed, rather than specified explicitly by name

* Mon Aug 20 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-2
- Added flpsed.desktop
- Specified GPL license version
- Changed buildroot to be more Fedora compliant
- Removed generic INSTALL from installed docs list

* Sat Aug 11 2007 Nicholas Boyle <nsboyle at gmail.com> - 0.5.0-1
- Initial Fedora packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:17:31 -0000	1.1
+++ .cvsignore	9 Sep 2007 22:47:39 -0000	1.2
@@ -0,0 +1 @@
+flpsed-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flpsed/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:17:31 -0000	1.1
+++ sources	9 Sep 2007 22:47:39 -0000	1.2
@@ -0,0 +1 @@
+88b1dae91c35210ff67b3c8c1c426c27  flpsed-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:32 -0700
Subject: [pkgdb] gnome-web-photo was added for hadess
Message-ID: <200709092249.l89MnWEM007813@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gnome-web-photo with summary HTML pages thumbnailer
Kevin Fenzi (kevin) has approved Package gnome-web-photo
Kevin Fenzi (kevin) has added a Fedora devel branch for gnome-web-photo with an owner of hadess
Kevin Fenzi (kevin) has approved gnome-web-photo in Fedora devel
Kevin Fenzi (kevin) has approved Package gnome-web-photo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gnome-web-photo (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gnome-web-photo (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gnome-web-photo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:46 -0700
Subject: [pkgdb] gnome-web-photo summary updated by kevin
Message-ID: <200709092249.l89MnlH2006234@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package gnome-web-photo summary to HTML pages thumbnailer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:49:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:49:47 -0700
Subject: [pkgdb] gnome-web-photo (Fedora, devel) updated by kevin
Message-ID: <200709092249.l89MnlHS006243@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of gnome-web-photo in Fedora devel to hadess
Kevin Fenzi (kevin) Approved cvsextras for commit access on gnome-web-photo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo



From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:11 -0400
Subject: rpms/gnome-web-photo - New directory
Message-ID: <200709092250.l89MoBrt000937@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo

Log Message:
Directory /cvs/extras/rpms/gnome-web-photo added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:17 -0400
Subject: rpms/gnome-web-photo/devel - New directory
Message-ID: <200709092250.l89MoH5j000964@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo/devel

Log Message:
Directory /cvs/extras/rpms/gnome-web-photo/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:20 -0400
Subject: rpms/gnome-web-photo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709092250.l89MoK6m001002@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-web-photo


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-web-photo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep  9 22:50:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Sep 2007 18:50:22 -0400
Subject: rpms/gnome-web-photo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709092250.l89MoMqZ001026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshYf885/rpms/gnome-web-photo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-web-photo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-web-photo
# $Id: Makefile,v 1.1 2007/09/09 22:50:20 kevin Exp $
NAME := gnome-web-photo
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 fedora-extras-commits at redhat.com  Sun Sep  9 22:55:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:55:29 -0700
Subject: [pkgdb] cvs2cl (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092255.l89MtUWe006296@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cvs2cl
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cvs2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cvs2cl (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cvs2cl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvs2cl



From fedora-extras-commits at redhat.com  Sun Sep  9 22:56:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:56:48 -0700
Subject: [pkgdb] cd-discid (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092256.l89Mun0Z006307@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cd-discid
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cd-discid (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cd-discid (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cd-discid (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cd-discid



From fedora-extras-commits at redhat.com  Sun Sep  9 22:59:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 09 Sep 2007 15:59:29 -0700
Subject: [pkgdb] abcde (Fedora EPEL, 5) updated by kevin
Message-ID: <200709092259.l89MxT6t007862@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for abcde
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abcde (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abcde (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abcde (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abcde



From fedora-extras-commits at redhat.com  Sun Sep  9 23:11:24 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Sun, 9 Sep 2007 19:11:24 -0400
Subject: rpms/xsc/devel xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709092311.l89NBOHF008848@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8805/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:45:22 -0000	1.1
+++ .cvsignore	9 Sep 2007 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+xsc-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	9 Sep 2007 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 03:20:56 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:20:56 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100320.l8A3KvCu009246@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchbugzilla acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Mon Sep 10 03:20:59 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:20:59 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100321.l8A3L0lw008531@app3.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the watchcommits acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Mon Sep 10 03:21:02 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Sun, 09 Sep 2007 20:21:02 -0700
Subject: [pkgdb] zabbix had acl change status
Message-ID: <200709100321.l8A3L3sx009255@app4.fedora.phx.redhat.com>

Jarod Wilson (jwilson) has set the commit acl on zabbix (Fedora 6) to Approved for Dan Horak (sharkcz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zabbix



From fedora-extras-commits at redhat.com  Mon Sep 10 04:22:02 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Mon, 10 Sep 2007 00:22:02 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.5,1.6
Message-ID: <200709100422.l8A4M25b021640@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21603

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
- New upstream release



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fvwm.spec	7 Sep 2007 02:19:24 -0000	1.5
+++ fvwm.spec	10 Sep 2007 04:21:30 -0000	1.6
@@ -20,6 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
+BuildRequires:	gnome-libs-devel librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -69,12 +70,6 @@
 chmod +x %{__perl_requires}
 
 
-# Work around FVWM bug #4208
-find . -name '*.in' -type f -print0 \
- | xargs -0 sed -i -e 's:@datarootdir@:@datadir@:'
-
-
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -116,7 +111,7 @@
 
 
 %changelog
-* Mon Sep  3 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
 - New upstream release
 
 * Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5



From fedora-extras-commits at redhat.com  Mon Sep 10 04:55:07 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Mon, 10 Sep 2007 00:55:07 -0400
Subject: rpms/fvwm/devel fvwm.spec,1.6,1.7
Message-ID: <200709100455.l8A4t7cj022805@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22760

Modified Files:
	fvwm.spec 
Log Message:
* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
- Don't add gnome-libs-devel to BR (not on ppc64?)



Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/devel/fvwm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fvwm.spec	10 Sep 2007 04:21:30 -0000	1.6
+++ fvwm.spec	10 Sep 2007 04:54:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fvwm
 Version:	2.5.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -20,7 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
-BuildRequires:	gnome-libs-devel librsvg2-devel
+BuildRequires:	librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
+- Don't add gnome-libs-devel to BR (not on ppc64?)
+
 * Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:19 -0400
Subject: rpms/perl-Set-IntSpan/devel .cvsignore, 1.6,
	1.7 perl-Set-IntSpan.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xJSU023100@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/devel

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Mar 2007 20:53:29 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:42 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Set-IntSpan.spec	13 Aug 2007 19:59:57 -0000	1.12
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
-Release:        2%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
 * Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
 - License: GPL+ or Artistic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Mar 2007 20:53:29 -0000	1.6
+++ sources	10 Sep 2007 04:58:42 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:23 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:23 -0400
Subject: rpms/perl-Set-IntSpan/F-7 .cvsignore, 1.6, 1.7 perl-Set-IntSpan.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xNZI023106@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/F-7

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Mar 2007 20:53:29 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:50 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/perl-Set-IntSpan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Set-IntSpan.spec	25 Mar 2007 20:53:29 -0000	1.11
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:50 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Set-IntSpan/
 Source0:        http://www.cpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
+- License: GPL+ or Artistic
+
 * Sun Mar 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-1
 - 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Mar 2007 20:53:29 -0000	1.6
+++ sources	10 Sep 2007 04:58:50 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 04:59:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 10 Sep 2007 00:59:26 -0400
Subject: rpms/perl-Set-IntSpan/FC-6 .cvsignore, 1.6,
	1.7 perl-Set-IntSpan.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200709100459.l8A4xQ35023112@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23017/FC-6

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Mar 2007 17:14:41 -0000	1.6
+++ .cvsignore	10 Sep 2007 04:58:53 -0000	1.7
@@ -1 +1 @@
-Set-IntSpan-1.11.tar.gz
+Set-IntSpan-1.12.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/perl-Set-IntSpan.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Set-IntSpan.spec	26 Mar 2007 17:14:41 -0000	1.10
+++ perl-Set-IntSpan.spec	10 Sep 2007 04:58:53 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           perl-Set-IntSpan
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Set-IntSpan/
 Source0:        http://www.cpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ralf Cors??pius <rc040203 at freenet.de>  - 1.12.1
+- Upstream update.
+
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-2
+- License: GPL+ or Artistic
+
 * Sun Mar 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.11-1
 - 1.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-IntSpan/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Mar 2007 17:14:41 -0000	1.6
+++ sources	10 Sep 2007 04:58:53 -0000	1.7
@@ -1 +1 @@
-33c16183c0a7731c80bf64e1530982b7  Set-IntSpan-1.11.tar.gz
+b3568646ac3df244ce646ef92c059b17  Set-IntSpan-1.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 06:00:48 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Sep 2007 02:00:48 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-kde149703.diff, NONE,
	1.1.2.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1.2.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.16, 1.223.2.17
Message-ID: <200709100600.l8A60mte030675@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30649/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
Log Message:
fix kde#149703, kde#149704, kde#149705

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
diff -ur kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp
--- kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp	2007-08-29 23:53:46.000000000 +0200
+++ kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp	2007-09-10 06:09:18.000000000 +0200
@@ -341,6 +341,11 @@
 
     QStringList allFiles = componentData().dirs()->findAllResources("data", filter) + componentData().dirs()->findAllResources("data", _file);
 
+    if (allFiles.isEmpty() || allFiles.first().startsWith("/usr/"))
+    {
+      allFiles.prepend(KStandardDirs::locateLocal("data", filter));
+    }
+
     file = findMostRecentXMLFile( allFiles, doc );
 
     if ( file.isEmpty() )

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.16
retrieving revision 1.223.2.17
diff -u -r1.223.2.16 -r1.223.2.17
--- kdelibs.spec	9 Sep 2007 11:55:58 -0000	1.223.2.16
+++ kdelibs.spec	10 Sep 2007 06:00:08 -0000	1.223.2.17
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -37,6 +37,12 @@
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-3.93.0-parallel-devel.diff
+# fix kde#149703
+Patch1: kdelibs-3.93.0-kde149703.diff
+# fix kde#149704
+Patch2: kdelibs-3.93.0-kde149704.diff
+# fix kde#149705
+Patch3: kdelibs-3.93.0-kde149705.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -101,6 +107,9 @@
 %prep
 %setup -q -n kdelibs-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -206,6 +215,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- fix kde#149703, kde#149704, kde#149705
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - remove files which conflict with KDE 3
 - rename kconfig_compiler and makekdewidgets to *4



From fedora-extras-commits at redhat.com  Mon Sep 10 06:55:19 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Mon, 10 Sep 2007 02:55:19 -0400
Subject: rpms/system-config-language/devel sources,1.23,1.24
Message-ID: <200709100655.l8A6tJPs005802@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5747

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	20 Aug 2007 02:03:50 -0000	1.23
+++ sources	10 Sep 2007 06:54:41 -0000	1.24
@@ -1 +1 @@
-8f3b3e0545e27f32d78814c4c67f52c2  system-config-language-1.2.8.tar.bz2
+8a33fab49fed83a462312a146b3ce11c  system-config-language-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 06:57:05 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Mon, 10 Sep 2007 02:57:05 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.30,
	1.31
Message-ID: <200709100657.l8A6v59B005853@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5810

Modified Files:
	system-config-language.spec 
Log Message:
fix bug275711 and bug284331.



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-language.spec	20 Aug 2007 02:05:19 -0000	1.30
+++ system-config-language.spec	10 Sep 2007 06:56:32 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,7 +73,10 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
-* Mon Aug 13 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.8
+* Mon Sep 10 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.9
+- fix bug275711 and bug284331.
+
+* Mon Aug 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.8
 - re-fix bug251478.
 
 * Mon Aug 13 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.7



From fedora-extras-commits at redhat.com  Mon Sep 10 07:13:22 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 10 Sep 2007 03:13:22 -0400
Subject: rpms/curl/devel curl.spec,1.58,1.59
Message-ID: <200709100713.l8A7DMpA012489@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12449

Modified Files:
	curl.spec 
Log Message:
provide webclient


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- curl.spec	7 Sep 2007 12:50:04 -0000	1.58
+++ curl.spec	10 Sep 2007 07:12:49 -0000	1.59
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.16.4-ftp.patch
 Patch4: curl-7.16.4-nsspem.patch
+Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, pkgconfig, libidn-devel
@@ -102,6 +103,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
+- provide webclient (#225671)
+
 * Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
 - add support for the NSS PKCS#11 pem reader so the command-line is the
   same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)



From fedora-extras-commits at redhat.com  Mon Sep 10 07:18:46 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Sep 2007 03:18:46 -0400
Subject: rpms/uim/devel uim.spec,1.44,1.45 xinput.d-uim,1.2,1.3
Message-ID: <200709100718.l8A7IkI8012824@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12782

Modified Files:
	uim.spec xinput.d-uim 
Log Message:
* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
- Update the xinput script to support the new im-chooser.
  - bring up uim-toolbar-gtk-systray as the auxiliary program
  - support the config button.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- uim.spec	20 Aug 2007 02:08:10 -0000	1.44
+++ uim.spec	10 Sep 2007 07:18:14 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -384,6 +384,11 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
+- Update the xinput script to support the new im-chooser.
+  - bring up uim-toolbar-gtk-systray as the auxiliary program
+  - support the config button.
+
 * Mon Aug 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-6
 - uim-1.4.1-m17n-not-list-nil-im.patch: Fix appearing m17n-nil IME and crashing
   when it's selected. (#235331)


Index: xinput.d-uim
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/xinput.d-uim,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinput.d-uim	18 Apr 2005 12:51:45 -0000	1.2
+++ xinput.d-uim	10 Sep 2007 07:18:14 -0000	1.3
@@ -2,3 +2,6 @@
 XIM_PROGRAM=uim-xim
 GTK_IM_MODULE=uim
 QT_IM_MODULE=uim
+SHORT_DESC=UIM
+PREFERENCE_PROGRAM=/usr/bin/uim-pref-gtk
+AUXILIARY_PROGRAM=/usr/bin/uim-toolbar-gtk-systray



From fedora-extras-commits at redhat.com  Mon Sep 10 07:37:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 03:37:29 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.44, 1.45 sources, 1.45,
	1.46 system-config-samba.spec, 1.49, 1.50
Message-ID: <200709100737.l8A7bTAa013720@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13684

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
update Polish, Serbian translations
$RPM_BUILD_ROOT -> %%{buildroot}
don't add distro specific desktop categories from Fedora 8 on (#277591)
attempt to put the tool into the System -> Administration menu (#249440)
require libuser-python from Fedora 8 on (#251354)
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	31 Aug 2007 15:33:46 -0000	1.44
+++ .cvsignore	10 Sep 2007 07:36:56 -0000	1.45
@@ -1 +1 @@
-system-config-samba-1.2.50.tar.bz2
+system-config-samba-1.2.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	31 Aug 2007 15:33:46 -0000	1.45
+++ sources	10 Sep 2007 07:36:56 -0000	1.46
@@ -1 +1 @@
-f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2
+2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- system-config-samba.spec	31 Aug 2007 15:33:46 -0000	1.49
+++ system-config-samba.spec	10 Sep 2007 07:36:56 -0000	1.50
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.50
+Version: 1.2.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -21,7 +21,11 @@
 Requires: usermode >= 1.36
 Requires: samba
 Requires: samba-common
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+Requires: libuser-python
+%else
 Requires: libuser
+%endif
 Requires: htmlview
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
@@ -37,19 +41,20 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base       \
-  --add-category X-Red-Hat-ServerConfig       \
-  $RPM_BUILD_ROOT%{_datadir}/applications/system-config-samba.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} <= 7 && 0%{?rhel} <= 5
+  --add-category SystemSetup \
+%endif
+  %{buildroot}%{_datadir}/applications/system-config-samba.desktop
 
 %find_lang %name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -76,6 +81,14 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+- update Polish, Serbian translations
+- $RPM_BUILD_ROOT -> %%{buildroot}
+- don't add distro specific desktop categories from Fedora 8 on (#277591)
+- attempt to put the tool into the System -> Administration menu (#249440)
+- require libuser-python from Fedora 8 on (#251354)
+- make use of force tagging (since mercurial 0.9.4)
+
 * Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
 - bundle the GPL
 



From fedora-extras-commits at redhat.com  Mon Sep 10 07:43:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 03:43:36 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.41, 1.42 sources, 1.42, 
	1.43 system-config-samba.spec, 1.46, 1.47
Message-ID: <200709100743.l8A7haqW013956@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
update Polish, Serbian translations
$RPM_BUILD_ROOT -> %%{buildroot}
don't add distro specific desktop categories from Fedora 8 on (#277591)
attempt to put the tool into the System -> Administration menu (#249440)
require libuser-python from Fedora 8 on (#251354)
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	5 Sep 2007 07:25:38 -0000	1.41
+++ .cvsignore	10 Sep 2007 07:43:04 -0000	1.42
@@ -1 +1 @@
-system-config-samba-1.2.50.tar.bz2
+system-config-samba-1.2.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	5 Sep 2007 07:25:38 -0000	1.42
+++ sources	10 Sep 2007 07:43:04 -0000	1.43
@@ -1 +1 @@
-f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2
+2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- system-config-samba.spec	5 Sep 2007 07:25:38 -0000	1.46
+++ system-config-samba.spec	10 Sep 2007 07:43:04 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.50
+Version: 1.2.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -21,7 +21,11 @@
 Requires: usermode >= 1.36
 Requires: samba
 Requires: samba-common
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+Requires: libuser-python
+%else
 Requires: libuser
+%endif
 Requires: htmlview
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
@@ -37,19 +41,20 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base       \
-  --add-category X-Red-Hat-ServerConfig       \
-  $RPM_BUILD_ROOT%{_datadir}/applications/system-config-samba.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} <= 7 && 0%{?rhel} <= 5
+  --add-category SystemSetup \
+%endif
+  %{buildroot}%{_datadir}/applications/system-config-samba.desktop
 
 %find_lang %name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -76,6 +81,14 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+- update Polish, Serbian translations
+- $RPM_BUILD_ROOT -> %%{buildroot}
+- don't add distro specific desktop categories from Fedora 8 on (#277591)
+- attempt to put the tool into the System -> Administration menu (#249440)
+- require libuser-python from Fedora 8 on (#251354)
+- make use of force tagging (since mercurial 0.9.4)
+
 * Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
 - bundle the GPL
 



From fedora-extras-commits at redhat.com  Mon Sep 10 07:46:51 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:46:51 -0400
Subject: rpms/ksirk/devel ksirk-1.7-desktop.patch, NONE, 1.1 ksirk.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100746.l8A7kpg0014167@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14112/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ksirk-1.7-desktop.patch ksirk.spec 
Log Message:
initial ksirk import


ksirk-1.7-desktop.patch:

--- NEW FILE ksirk-1.7-desktop.patch ---
diff -up ksirk-1.7/ksirk/ksirk.desktop~ ksirk-1.7/ksirk/ksirk.desktop
--- ksirk-1.7/ksirk/ksirk.desktop~	2007-08-19 10:20:40.000000000 +0200
+++ ksirk-1.7/ksirk/ksirk.desktop	2007-08-19 10:20:40.000000000 +0200
@@ -1,20 +1,13 @@
 # KDE Config File
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=ksirk -caption "%c" %i %m
 Icon=ksirk.png
-MiniIcon=ksirk.png
 DocPath=ksirk/index.html
-Comment=KsirK is a computerized version of a strategy board game: Risk !
-Comment[fr]=KsirK est une version sur ordinateur du jeu de plateau de strat??gie: Risk !
-Comment[it]=Ksirk ?? la versione computerizzata del gioco da tavolo strategico: Risico! 
+Comment=A strategy board game
+Comment[fr]=Une jeu de plateau de strat??gie
+Comment[it]=Gioco da tavolo strategico
 Terminal=0
 Name=KsirK
-Name[de]=KsirK
-Name[it]=KsirK
-Name[fr]=KsirK
-GenericName=Risk Computerized
-GenericName[de]=
-GenericName[it]=Risico Computerizzato
-GenericName[fr]=Risk sur ordinateur
 Categories=Qt;KDE;Game;StrategyGame;


--- NEW FILE ksirk.spec ---
Name:           ksirk
Version:        1.7
Release:        2%{?dist}
Summary:        Turnbased multiplayer board strategy game (conquer the world!)
Group:          Amusements/Games
License:        GPLv2
URL:            http://home.gna.org/ksirk/index.shtml
Source0:        http://download.gna.org/ksirk/%{name}-%{version}.tar.bz2
Patch0:         ksirk-1.7-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  kdelibs3-devel kdegames-devel python gettext
Requires:       hicolor-icon-theme

%description
KsirK is a computerized version of a well known strategy board game. In the
current version, KsirK is a usable multi-player mono-machine game with a basic
AI. The goal of the game is simply to conquer the World... It is done by
attacking your neighbors with your armies. 


%prep
%setup -q
%patch0 -p1


%build
export CXXFLAGS="$RPM_OPT_FLAGS"
./waf.py configure --prefix=%{_prefix}
./waf.py %{?_smp_mflags} -v


%install
rm -rf $RPM_BUILD_ROOT
./waf.py install --destdir=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.la
%find_lang %{name}
# these are unversioned libs, which are only used by ksirk itself
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mv $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.so \
  $RPM_BUILD_ROOT%{_libdir}/%{name}
# install a wrapper which sets LD_CONFIG_PATH so that ksirk can find its libs
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.bin
cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
#!/bin/bash
export LD_LIBRARY_PATH=%{_libdir}/%{name}
exec %{name}.bin "$@"
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/locolor || :
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
touch --no-create %{_datadir}/icons/locolor || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/apps/%{name}
%{_datadir}/applications/kde/%{name}.desktop
%{_datadir}/icons/locolor
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_docdir}/HTML/%{name}


%changelog
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires

* Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:34:30 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:46:19 -0000	1.2
@@ -0,0 +1 @@
+ksirk-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:34:30 -0000	1.1
+++ sources	10 Sep 2007 07:46:19 -0000	1.2
@@ -0,0 +1 @@
+de0c295a7f7f87a2476fae647704f0f8  ksirk-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:47:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:47:54 -0400
Subject: rpms/hedgewars/devel hedgewars-0.9.0-debuginfo.patch, NONE,
	1.1 hedgewars.desktop, NONE, 1.1 hedgewars.png, NONE,
	1.1 hedgewars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100747.l8A7lsvP014275@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.desktop 
	hedgewars.png hedgewars.spec 
Log Message:
initial hedgewars import


hedgewars-0.9.0-debuginfo.patch:

--- NEW FILE hedgewars-0.9.0-debuginfo.patch ---
diff -up hedgewars-0.9.0/CMakeLists.txt~ hedgewars-0.9.0/CMakeLists.txt
--- hedgewars-0.9.0/CMakeLists.txt~	2007-08-26 15:09:29.000000000 +0200
+++ hedgewars-0.9.0/CMakeLists.txt	2007-08-26 15:09:29.000000000 +0200
@@ -33,7 +33,7 @@ if(WIN32 AND NOT UNIX)
 	set(CPACK_NSIS_CONTACT "unC0Rr at gmail.com")
 	set(CPACK_NSIS_MODIFY_PATH ON)
 else(WIN32 AND NOT UNIX)
-	set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
+	set(CPACK_STRIP_FILES "bin/hwengine")
 endif(WIN32 AND NOT UNIX)
 
 include(CPack)


--- NEW FILE hedgewars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hedgewars
Comment=2D tankbattle game with the tanks replaced by hedgehogs
Exec=hedgewars
Icon=hedgewars
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE hedgewars.spec ---
Name:           hedgewars
Version:        0.9.0
Release:        2%{?dist}
Summary:        2D tankbattle game with the tanks replaced by hedgehogs
Group:          Amusements/Games
License:        GPL+
URL:            http://www.hedgewars.org/
Source0:        http://hedgewars.org/download/hedgewars-src-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         hedgewars-0.9.0-debuginfo.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
Requires:       hicolor-icon-theme

%description
Hedgewars is a turn based strategy game but the real buzz is from watching the
devastation caused by those pesky hedgehogs with those fantastic weapons.

Each player controls a team of several hedgehogs. During the course of the
game, players take turns with one of their hedgehogs. They then use whatever
tools and weapons are available to attack and kill the opponents' hedgehogs,
thereby winning the game. Hedgehogs may move around the terrain in a variety
of ways, normally by walking and jumping but also by using particular tools
such as the "Rope" or "Parachute", to move to otherwise inaccessible areas.


%prep
%setup -q
%patch0 -p1


%build
cmake -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=%{_prefix} \
  -DDATA_INSTALL_DIR=%{_datadir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING Fonts_LICENSE.txt README
%{_bindir}/%{name}
%{_bindir}/hwengine
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup

* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:43:06 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:47:21 -0000	1.2
@@ -0,0 +1 @@
+hedgewars-src-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:43:06 -0000	1.1
+++ sources	10 Sep 2007 07:47:21 -0000	1.2
@@ -0,0 +1 @@
+5e1bd87ac9c7db761ff3427acdae6f89  hedgewars-src-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:49:06 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:49:06 -0400
Subject: rpms/ksirk/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709100749.l8A7n6Wh014413@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14354

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:34:30 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:48:34 -0000	1.2
@@ -0,0 +1 @@
+ksirk-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:34:30 -0000	1.1
+++ sources	10 Sep 2007 07:48:34 -0000	1.2
@@ -0,0 +1 @@
+de0c295a7f7f87a2476fae647704f0f8  ksirk-1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 07:50:27 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:50:27 -0400
Subject: rpms/ksirk/F-7 ksirk-1.7-desktop.patch, NONE, 1.1 ksirk.spec, NONE,
	1.1
Message-ID: <200709100750.l8A7oRlZ014527@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14518

Added Files:
	ksirk-1.7-desktop.patch ksirk.spec 
Log Message:
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires


ksirk-1.7-desktop.patch:

--- NEW FILE ksirk-1.7-desktop.patch ---
diff -up ksirk-1.7/ksirk/ksirk.desktop~ ksirk-1.7/ksirk/ksirk.desktop
--- ksirk-1.7/ksirk/ksirk.desktop~	2007-08-19 10:20:40.000000000 +0200
+++ ksirk-1.7/ksirk/ksirk.desktop	2007-08-19 10:20:40.000000000 +0200
@@ -1,20 +1,13 @@
 # KDE Config File
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Exec=ksirk -caption "%c" %i %m
 Icon=ksirk.png
-MiniIcon=ksirk.png
 DocPath=ksirk/index.html
-Comment=KsirK is a computerized version of a strategy board game: Risk !
-Comment[fr]=KsirK est une version sur ordinateur du jeu de plateau de strat??gie: Risk !
-Comment[it]=Ksirk ?? la versione computerizzata del gioco da tavolo strategico: Risico! 
+Comment=A strategy board game
+Comment[fr]=Une jeu de plateau de strat??gie
+Comment[it]=Gioco da tavolo strategico
 Terminal=0
 Name=KsirK
-Name[de]=KsirK
-Name[it]=KsirK
-Name[fr]=KsirK
-GenericName=Risk Computerized
-GenericName[de]=
-GenericName[it]=Risico Computerizzato
-GenericName[fr]=Risk sur ordinateur
 Categories=Qt;KDE;Game;StrategyGame;


--- NEW FILE ksirk.spec ---
Name:           ksirk
Version:        1.7
Release:        2%{?dist}
Summary:        Turnbased multiplayer board strategy game (conquer the world!)
Group:          Amusements/Games
License:        GPLv2
URL:            http://home.gna.org/ksirk/index.shtml
Source0:        http://download.gna.org/ksirk/%{name}-%{version}.tar.bz2
Patch0:         ksirk-1.7-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  kdelibs3-devel kdegames-devel python gettext
Requires:       hicolor-icon-theme

%description
KsirK is a computerized version of a well known strategy board game. In the
current version, KsirK is a usable multi-player mono-machine game with a basic
AI. The goal of the game is simply to conquer the World... It is done by
attacking your neighbors with your armies. 


%prep
%setup -q
%patch0 -p1


%build
export CXXFLAGS="$RPM_OPT_FLAGS"
./waf.py configure --prefix=%{_prefix}
./waf.py %{?_smp_mflags} -v


%install
rm -rf $RPM_BUILD_ROOT
./waf.py install --destdir=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.la
%find_lang %{name}
# these are unversioned libs, which are only used by ksirk itself
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mv $RPM_BUILD_ROOT%{_prefix}/lib/lib%{name}_*.so \
  $RPM_BUILD_ROOT%{_libdir}/%{name}
# install a wrapper which sets LD_CONFIG_PATH so that ksirk can find its libs
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.bin
cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
#!/bin/bash
export LD_LIBRARY_PATH=%{_libdir}/%{name}
exec %{name}.bin "$@"
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/locolor || :
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
touch --no-create %{_datadir}/icons/locolor || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/apps/%{name}
%{_datadir}/applications/kde/%{name}.desktop
%{_datadir}/icons/locolor
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_docdir}/HTML/%{name}


%changelog
* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
- Add missing gettext BuildRequires

* Sat Aug 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 10 07:50:46 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:50:46 -0400
Subject: comps comps-f7.xml.in,1.249,1.250 comps-f8.xml.in,1.101,1.102
Message-ID: <200709100750.l8A7okfZ014584@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14497

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
add ksirk hedgewars


Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- comps-f7.xml.in	20 Aug 2007 14:52:41 -0000	1.249
+++ comps-f7.xml.in	10 Sep 2007 07:50:16 -0000	1.250
@@ -1330,10 +1330,12 @@
       <packagereq type="optional">gnugo</packagereq>
       <packagereq type="optional">grhino</packagereq>
       <packagereq type="optional">gweled</packagereq>
+      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
+      <packagereq type="optional">ksirk</packagereq>
       <packagereq type="optional">ksudoku</packagereq>
       <packagereq type="optional">lacewing</packagereq>
       <packagereq type="optional">lincity-ng</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- comps-f8.xml.in	9 Sep 2007 12:37:41 -0000	1.101
+++ comps-f8.xml.in	10 Sep 2007 07:50:16 -0000	1.102
@@ -1470,10 +1470,12 @@
       <packagereq type="optional">gnugo</packagereq>
       <packagereq type="optional">grhino</packagereq>
       <packagereq type="optional">gweled</packagereq>
+      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
+      <packagereq type="optional">ksirk</packagereq>
       <packagereq type="optional">ksudoku</packagereq>
       <packagereq type="optional">lacewing</packagereq>
       <packagereq type="optional">lincity-ng</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 10 07:51:20 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 03:51:20 -0400
Subject: rpms/hedgewars/F-7 hedgewars-0.9.0-debuginfo.patch, NONE,
	1.1 hedgewars.desktop, NONE, 1.1 hedgewars.png, NONE,
	1.1 hedgewars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100751.l8A7pKG5014618@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14588

Modified Files:
	.cvsignore sources 
Added Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.desktop 
	hedgewars.png hedgewars.spec 
Log Message:
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup


hedgewars-0.9.0-debuginfo.patch:

--- NEW FILE hedgewars-0.9.0-debuginfo.patch ---
diff -up hedgewars-0.9.0/CMakeLists.txt~ hedgewars-0.9.0/CMakeLists.txt
--- hedgewars-0.9.0/CMakeLists.txt~	2007-08-26 15:09:29.000000000 +0200
+++ hedgewars-0.9.0/CMakeLists.txt	2007-08-26 15:09:29.000000000 +0200
@@ -33,7 +33,7 @@ if(WIN32 AND NOT UNIX)
 	set(CPACK_NSIS_CONTACT "unC0Rr at gmail.com")
 	set(CPACK_NSIS_MODIFY_PATH ON)
 else(WIN32 AND NOT UNIX)
-	set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
+	set(CPACK_STRIP_FILES "bin/hwengine")
 endif(WIN32 AND NOT UNIX)
 
 include(CPack)


--- NEW FILE hedgewars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hedgewars
Comment=2D tankbattle game with the tanks replaced by hedgehogs
Exec=hedgewars
Icon=hedgewars
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE hedgewars.spec ---
Name:           hedgewars
Version:        0.9.0
Release:        2%{?dist}
Summary:        2D tankbattle game with the tanks replaced by hedgehogs
Group:          Amusements/Games
License:        GPL+
URL:            http://www.hedgewars.org/
Source0:        http://hedgewars.org/download/hedgewars-src-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         hedgewars-0.9.0-debuginfo.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
Requires:       hicolor-icon-theme

%description
Hedgewars is a turn based strategy game but the real buzz is from watching the
devastation caused by those pesky hedgehogs with those fantastic weapons.

Each player controls a team of several hedgehogs. During the course of the
game, players take turns with one of their hedgehogs. They then use whatever
tools and weapons are available to attack and kill the opponents' hedgehogs,
thereby winning the game. Hedgehogs may move around the terrain in a variety
of ways, normally by walking and jumping but also by using particular tools
such as the "Rope" or "Parachute", to move to otherwise inaccessible areas.


%prep
%setup -q
%patch0 -p1


%build
cmake -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" -DCMAKE_INSTALL_PREFIX=%{_prefix} \
  -DDATA_INSTALL_DIR=%{_datadir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING Fonts_LICENSE.txt README
%{_bindir}/%{name}
%{_bindir}/hwengine
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
- Install data files into /usr/share/hedgewars instead of into
  /usr/share/hedgewars/hedgewars
- Minor desktop file cleanup

* Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:43:06 -0000	1.1
+++ .cvsignore	10 Sep 2007 07:50:48 -0000	1.2
@@ -0,0 +1 @@
+hedgewars-src-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:43:06 -0000	1.1
+++ sources	10 Sep 2007 07:50:48 -0000	1.2
@@ -0,0 +1 @@
+5e1bd87ac9c7db761ff3427acdae6f89  hedgewars-src-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 08:44:46 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 04:44:46 -0400
Subject: rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-restart.patch, 
	NONE, 1.1 nspluginwrapper-0.9.91.5-rpc-error.patch, NONE,
	1.1 nspluginwrapper-0.9.91.5-rh.patch, 1.1,
	1.2 nspluginwrapper.spec, 1.16, 1.17
Message-ID: <200709100844.l8A8ikax023056@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23025

Modified Files:
	nspluginwrapper-0.9.91.5-rh.patch nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-restart.patch 
	nspluginwrapper-0.9.91.5-rpc-error.patch 
Log Message:
added upstream patches - RPC error handling and plugin restart

nspluginwrapper-0.9.91.5-restart.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-restart.patch ---
Index: src/npw-viewer.c
===================================================================
--- src/npw-viewer.c	(r??vision 466)
+++ src/npw-viewer.c	(r??vision 470)
@@ -2268,6 +2268,8 @@
 {
   D(bug("handle_NPP_New\n"));
 
+  rpc_connection_ref(connection);
+
   uint32_t instance_id;
   NPMIMEType plugin_type;
   int32_t mode;
@@ -2344,7 +2346,10 @@
 
   NPSavedData *save_area;
   NPError ret = g_NPP_Destroy(instance, &save_area);
-  return rpc_method_send_reply(connection, RPC_TYPE_INT32, ret, RPC_TYPE_NP_SAVED_DATA, save_area, RPC_TYPE_INVALID);
+
+  error = rpc_method_send_reply(connection, RPC_TYPE_INT32, ret, RPC_TYPE_NP_SAVED_DATA, save_area, RPC_TYPE_INVALID);
+  rpc_connection_unref(connection);
+  return error;
 }
 
 // NPP_SetWindow
@@ -2654,13 +2659,13 @@
 g_NPP_WriteReady(NPP instance, NPStream *stream)
 {
   if (instance == NULL)
-	return NPERR_INVALID_INSTANCE_ERROR;
+	return 0;
 
   if (plugin_funcs.writeready == NULL)
-	return NPERR_INVALID_FUNCTABLE_ERROR;
+	return 0;
 
   if (stream == NULL)
-	return NPERR_INVALID_PARAM;
+	return 0;
 
   D(bug("NPP_WriteReady instance=%p, stream=%p\n", instance, stream));
   int32 ret = plugin_funcs.writeready(instance, stream);
@@ -3086,7 +3091,7 @@
   if (g_user_agent)
 	free(g_user_agent);
   if (g_rpc_connection)
-	rpc_exit(g_rpc_connection);
+	rpc_connection_unref(g_rpc_connection);
 
   id_kill();
   return 0;
Index: src/npw-wrapper.c
===================================================================
--- src/npw-wrapper.c	(r??vision 466)
+++ src/npw-wrapper.c	(r??vision 470)
@@ -21,6 +21,7 @@
 #define _GNU_SOURCE 1 /* RTLD_DEFAULT */
 #include "sysdeps.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,6 +74,9 @@
 // Netscape exported functions
 static NPNetscapeFuncs mozilla_funcs;
 
+// NPAPI version nspluginwrapper supports
+static int npapi_version = 0;
+
 // Wrapper plugin data
 typedef struct {
   int initialized;
@@ -89,6 +93,7 @@
 typedef struct _PluginInstance {
   NPP instance;
   uint32_t instance_id;
+  rpc_connection_t *connection;
 } PluginInstance;
 
 // Plugin side data for an NPStream instance
@@ -101,7 +106,38 @@
 // Prototypes
 static void plugin_init(int is_NP_Initialize);
 static void plugin_exit(void);
+static NPError plugin_restart_if_needed(void);
 
+/*
+ *  Notes concerning NSPluginWrapper recovery model.
+ *
+ *  NSPluginWrapper will restart the Viewer if it detected to be
+ *  dead. It will not attempt to "replay" the plugin. This means that
+ *  if a plugin crashed, its window will remain grayed: only new
+ *  instances will start a new viewer.
+ *
+ *  Each PlugInstance holds a reference to the RPC connection it was
+ *  created with. g_rpc_connection can be seen as the "master"
+ *  connection (used to initialize and shutdown things). The RPC
+ *  connections are reference counted so that when the master
+ *  connection is set to a new one, previous connections are still
+ *  live. That way, old NPP instances are not passed down with the new
+ *  connection and thus can fail early/gracefully in subsequent calls
+ *  to NPP_*() functions.
+ *
+ *  TODO: make NPRuntime aware of per-plugin connections? This
+ *  shouldn't matter from the Wrapper side because npruntime requests
+ *  come from the Viewer side (see NPN_*() handlers). XXX: even with a
+ *  running script (NPClass handlers)?
+ */
+
+// Minimal time between two plugin restarts in sec
+#define MIN_RESTART_INTERVAL 1
+
+// Consume as many bytes as possible when we are not NPP_WriteReady()
+// XXX: move to a common place to Wrapper and Viewer
+#define NPERR_STREAM_BUFSIZ 65536
+
 // Helpers
 #ifndef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
@@ -110,7 +146,16 @@
 #define max(x, y) ((x) > (y) ? (x) : (y))
 #endif
 
+#define PLUGIN_INSTANCE(INSTANCE) plugin_instance(INSTANCE)
 
+static inline PluginInstance *plugin_instance(NPP instance)
+{
+  PluginInstance *plugin = (PluginInstance *)instance->pdata;
+  assert(plugin->instance == instance);
+  return plugin;
+}
+
+
 /* ====================================================================== */
 /* === RPC communication                                              === */
 /* ====================================================================== */
@@ -1177,13 +1222,13 @@
 
 // Creates a new instance of a plug-in
 static NPError
-invoke_NPP_New(NPMIMEType mime_type, NPP instance,
+invoke_NPP_New(PluginInstance *plugin, NPMIMEType mime_type,
 			   uint16_t mode, int16_t argc, char *argn[], char *argv[],
 			   NPSavedData *saved)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_NEW,
-								RPC_TYPE_UINT32, ((PluginInstance *)instance->pdata)->instance_id,
+								RPC_TYPE_UINT32, plugin->instance_id,
 								RPC_TYPE_STRING, mime_type,
 								RPC_TYPE_INT32, (int32_t)mode,
 								RPC_TYPE_ARRAY, RPC_TYPE_STRING, (uint32_t)argc, argn,
@@ -1197,7 +1242,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1216,17 +1261,25 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
-
+	
+  // Check if we need to restart the plug-in
+  NPError ret = plugin_restart_if_needed();
+  if (ret != NPERR_NO_ERROR)
+  	return ret;
+		
   PluginInstance *plugin = malloc(sizeof(*plugin));
   if (plugin == NULL)
 	return NPERR_OUT_OF_MEMORY_ERROR;
   memset(plugin, 0, sizeof(*plugin));
   plugin->instance = instance;
   plugin->instance_id = id_create(plugin);
+  plugin->connection = g_rpc_connection;
   instance->pdata = plugin;
 
+  rpc_connection_ref(plugin->connection);
+
   D(bug("NPP_New instance=%p\n", instance));
-  NPError ret = invoke_NPP_New(mime_type, instance, mode, argc, argn, argv, saved);
+  ret = invoke_NPP_New(plugin, mime_type, mode, argc, argn, argv, saved);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
   if (saved) {
@@ -1240,11 +1293,11 @@
 
 // Deletes a specific instance of a plug-in
 static NPError
-invoke_NPP_Destroy(NPP instance, NPSavedData **save)
+invoke_NPP_Destroy(PluginInstance *plugin, NPSavedData **save)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_DESTROY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -1254,7 +1307,7 @@
 
   int32_t ret;
   NPSavedData *save_area = NULL;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_NP_SAVED_DATA, &save_area,
 									RPC_TYPE_INVALID);
@@ -1280,28 +1333,29 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_Destroy instance=%p\n", instance));
-  NPError ret = invoke_NPP_Destroy(instance, save);
+  NPError ret = invoke_NPP_Destroy(plugin, save);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
-  PluginInstance *plugin = instance->pdata;
-  if (plugin) {
-	id_remove(plugin->instance_id);
-	free(plugin);
-	instance->pdata = NULL;
-  }
+  rpc_connection_unref(plugin->connection);
 
+  id_remove(plugin->instance_id);
+  free(plugin);
+  instance->pdata = NULL;
   return ret;
 }
 
 // Tells the plug-in when a window is created, moved, sized, or destroyed
 static NPError
-invoke_NPP_SetWindow(NPP instance, NPWindow *window)
+invoke_NPP_SetWindow(PluginInstance *plugin, NPWindow *window)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_SET_WINDOW,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_WINDOW, window,
 								RPC_TYPE_INVALID);
 
@@ -1311,7 +1365,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1328,20 +1382,23 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_SetWindow instance=%p\n", instance));
-  NPError ret = invoke_NPP_SetWindow(instance, window);
+  NPError ret = invoke_NPP_SetWindow(plugin, window);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
 
 // Allows the browser to query the plug-in for information
 static NPError
-invoke_NPP_GetValue(NPP instance, NPPVariable variable, void *value)
+invoke_NPP_GetValue(PluginInstance *plugin, NPPVariable variable, void *value)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_GET_VALUE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_INT32, variable,
 								RPC_TYPE_INVALID);
 
@@ -1355,7 +1412,7 @@
   case RPC_TYPE_STRING:
 	{
 	  char *str = NULL;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1384,7 +1441,7 @@
   case RPC_TYPE_INT32:
 	{
 	  int32_t n = 0;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INT32, &n, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INT32, &n, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1396,7 +1453,7 @@
   case RPC_TYPE_BOOLEAN:
 	{
 	  uint32_t b = 0;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_BOOLEAN, &b, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_BOOLEAN, &b, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1408,7 +1465,7 @@
   case RPC_TYPE_NP_OBJECT:
 	{
 	  NPObject *npobj = NULL;
-	  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_NP_OBJECT, &npobj, RPC_TYPE_INVALID);
+	  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INT32, &ret, RPC_TYPE_NP_OBJECT, &npobj, RPC_TYPE_INVALID);
 	  if (error != RPC_ERROR_NO_ERROR) {
 		npw_perror("NPP_GetValue() wait for reply", error);
 		ret = NPERR_GENERIC_ERROR;
@@ -1427,6 +1484,9 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   switch (rpc_type_of_NPPVariable(variable)) {
   case RPC_TYPE_STRING:
@@ -1440,14 +1500,14 @@
   }
 
   D(bug("NPP_GetValue instance=%p, variable=%d\n", instance, variable));
-  NPError ret = invoke_NPP_GetValue(instance, variable, value);
+  NPError ret = invoke_NPP_GetValue(plugin, variable, value);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
 
 // Sets information about the plug-in
 static NPError
-invoke_NPP_SetValue(NPP instance, NPPVariable variable, void *value)
+invoke_NPP_SetValue(PluginInstance *plugin, NPPVariable variable, void *value)
 {
   UNIMPLEMENTED();
 
@@ -1459,20 +1519,23 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_SetValue instance=%p, variable=%d\n", instance, variable));
-  NPError ret = invoke_NPP_SetValue(instance, variable, value);
+  NPError ret = invoke_NPP_SetValue(plugin, variable, value);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return NPERR_GENERIC_ERROR;
 }
 
 // Notifies the instance of the completion of a URL request
 static void
-invoke_NPP_URLNotify(NPP instance, const char *url, NPReason reason, void *notifyData)
+invoke_NPP_URLNotify(PluginInstance *plugin, const char *url, NPReason reason, void *notifyData)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_URL_NOTIFY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_STRING, url,
 								RPC_TYPE_INT32, reason,
 								RPC_TYPE_NP_NOTIFY_DATA, notifyData,
@@ -1483,7 +1546,7 @@
 	return;
   }
 
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
+  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INVALID);
   
   if (error != RPC_ERROR_NO_ERROR)
 	npw_perror("NPP_URLNotify() wait for reply", error);
@@ -1494,19 +1557,22 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   D(bug("NPP_URLNotify instance=%p, url='%s', reason=%d, notifyData=%p\n", instance, url, reason, notifyData));
-  invoke_NPP_URLNotify(instance, url, reason, notifyData);
+  invoke_NPP_URLNotify(plugin, url, reason, notifyData);
   D(bug(" done\n"));
 }
 
 // Notifies a plug-in instance of a new data stream
 static NPError
-invoke_NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
+invoke_NPP_NewStream(PluginInstance *plugin, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_NEW_STREAM,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_STRING, type,
 								RPC_TYPE_UINT32, ((StreamInstance *)stream->pdata)->stream_id,
 								RPC_TYPE_STRING, stream->url,
@@ -1524,7 +1590,7 @@
 
   int32_t ret;
   uint32_t r_stype;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_UINT32, &r_stype,
 									RPC_TYPE_NP_NOTIFY_DATA, &stream->notifyData,
@@ -1544,6 +1610,9 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   StreamInstance *stream_pdata = malloc(sizeof(*stream_pdata));
   if (stream_pdata == NULL)
@@ -1555,18 +1624,18 @@
   stream->pdata = stream_pdata;
 
   D(bug("NPP_NewStream instance=%p\n", instance));
-  NPError ret = invoke_NPP_NewStream(instance, type, stream, seekable, stype);
+  NPError ret = invoke_NPP_NewStream(plugin, type, stream, seekable, stype);
   D(bug(" return: %d [%s], stype=%s\n", ret, string_of_NPError(ret), string_of_NPStreamType(*stype)));
   return ret;
 }
 
 // Tells the plug-in that a stream is about to be closed or destroyed
 static NPError
-invoke_NPP_DestroyStream(NPP instance, NPStream *stream, NPReason reason)
+invoke_NPP_DestroyStream(PluginInstance *plugin, NPStream *stream, NPReason reason)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_DESTROY_STREAM,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INT32, reason,
 								RPC_TYPE_INVALID);
@@ -1577,7 +1646,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1594,9 +1663,12 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_DestroyStream instance=%p\n", instance));
-  NPError ret = invoke_NPP_DestroyStream(instance, stream, reason);
+  NPError ret = invoke_NPP_DestroyStream(plugin, stream, reason);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
 
   StreamInstance *stream_pdata = stream->pdata;
@@ -1611,11 +1683,11 @@
 
 // Provides a local file name for the data from a stream
 static void
-invoke_NPP_StreamAsFile(NPP instance, NPStream *stream, const char *fname)
+invoke_NPP_StreamAsFile(PluginInstance *plugin, NPStream *stream, const char *fname)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_STREAM_AS_FILE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_STRING, fname,
 								RPC_TYPE_INVALID);
@@ -1625,7 +1697,7 @@
 	return;
   }
 
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
+  error = rpc_method_wait_for_reply(plugin->connection, RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR)
 	npw_perror("NPP_StreamAsFile() wait for reply", error);
@@ -1636,35 +1708,38 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   D(bug("NPP_StreamAsFile instance=%p\n", instance));
-  invoke_NPP_StreamAsFile(instance, stream, fname);
+  invoke_NPP_StreamAsFile(plugin, stream, fname);
   D(bug(" done\n"));
 }
 
 // Determines maximum number of bytes that the plug-in can consume
 static int32
-invoke_NPP_WriteReady(NPP instance, NPStream *stream)
+invoke_NPP_WriteReady(PluginInstance *plugin, NPStream *stream)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_WRITE_READY,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
 	npw_perror("NPP_WriteReady() invoke", error);
-	return 0;
+	return NPERR_STREAM_BUFSIZ;
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
 	npw_perror("NPP_WriteReady() wait for reply", error);
-	return 0;
+	return NPERR_STREAM_BUFSIZ;
   }
 
   return ret;
@@ -1674,10 +1749,13 @@
 g_NPP_WriteReady(NPP instance, NPStream *stream)
 {
   if (instance == NULL)
-	return -1;
+	return 0;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return 0;
 
   D(bug("NPP_WriteReady instance=%p\n", instance));
-  int32 ret = invoke_NPP_WriteReady(instance, stream);
+  int32 ret = invoke_NPP_WriteReady(plugin, stream);
   D(bug(" return: %d\n", ret));
   return ret;
 }
@@ -1685,11 +1763,11 @@
 
 // Delivers data to a plug-in instance
 static int32
-invoke_NPP_Write(NPP instance, NPStream *stream, int32 offset, int32 len, void *buf)
+invoke_NPP_Write(PluginInstance *plugin, NPStream *stream, int32 offset, int32 len, void *buf)
 {
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_WRITE,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_NP_STREAM, stream,
 								RPC_TYPE_INT32, offset,
 								RPC_TYPE_ARRAY, RPC_TYPE_CHAR, len, buf,
@@ -1701,7 +1779,7 @@
   }
 
   int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_INT32, &ret,
 									RPC_TYPE_INVALID);
 
@@ -1718,16 +1796,19 @@
 {
   if (instance == NULL)
 	return -1;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return -1;
 
   D(bug("NPP_Write instance=%p\n", instance));
-  int32 ret = invoke_NPP_Write(instance, stream, offset, len, buf);
+  int32 ret = invoke_NPP_Write(plugin, stream, offset, len, buf);
   D(bug(" return: %d\n", ret));
   return ret;
 }
 
 
 // Requests a platform-specific print operation for an embedded or full-screen plug-in
-static void invoke_NPP_Print(NPP instance, NPPrint *PrintInfo)
+static void invoke_NPP_Print(PluginInstance *plugin, NPPrint *PrintInfo)
 {
   NPPrintCallbackStruct *platformPrint;
   switch (PrintInfo->mode) {
@@ -1746,9 +1827,9 @@
 	platform_print_id = id_create(platformPrint);
   D(bug(" platformPrint=%p\n", platformPrint));
 
-  int error = rpc_method_invoke(g_rpc_connection,
+  int error = rpc_method_invoke(plugin->connection,
 								RPC_METHOD_NPP_PRINT,
-								RPC_TYPE_NPP, instance,
+								RPC_TYPE_NPP, plugin->instance,
 								RPC_TYPE_UINT32, platform_print_id,
 								RPC_TYPE_NP_PRINT, PrintInfo,
 								RPC_TYPE_INVALID);
@@ -1759,7 +1840,7 @@
   }
 
   uint32_t pluginPrinted;
-  error = rpc_method_wait_for_reply(g_rpc_connection,
+  error = rpc_method_wait_for_reply(plugin->connection,
 									RPC_TYPE_BOOLEAN, &pluginPrinted,
 									RPC_TYPE_INVALID);
 
@@ -1780,17 +1861,20 @@
 {
   if (instance == NULL)
 	return;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return;
 
   if (PrintInfo == NULL)
 	return;
 
   D(bug("NPP_Print instance=%p\n", instance));
-  invoke_NPP_Print(instance, PrintInfo);
+  invoke_NPP_Print(plugin, PrintInfo);
   D(bug(" done\n"));
 }
 
 // Delivers a platform-specific window event to the instance
-static int16 invoke_NPP_HandleEvent(NPP instance, void *event)
+static int16 invoke_NPP_HandleEvent(PluginInstance *plugin, void *event)
 {
   UNIMPLEMENTED();
 
@@ -1801,9 +1885,12 @@
 {
   if (instance == NULL)
 	return NPERR_INVALID_INSTANCE_ERROR;
+  PluginInstance *plugin = PLUGIN_INSTANCE(instance);
+  if (plugin == NULL)
+	return NPERR_INVALID_INSTANCE_ERROR;
 
   D(bug("NPP_HandleEvent instance=%p\n", instance));
-  int16 ret = invoke_NPP_HandleEvent(instance, event);
+  int16 ret = invoke_NPP_HandleEvent(plugin, event);
   D(bug(" return: ret\n", ret));
   return ret;
 }
@@ -2206,10 +2293,10 @@
 g_LONG64_NPP_WriteReady(NPP instance, void *stream)
 {
   if (instance == NULL)
-	return -1L;
+	return 0;
 
   if (stream == NULL)
-	return -1L;
+	return 0;
 
   return (int64)(int32)g_NPP_WriteReady(instance, NP_STREAM32(stream));
 }
@@ -2310,6 +2397,30 @@
 }
 
 // Provides global initialization for a plug-in
+static NPError
+invoke_NP_Initialize(uint32_t npapi_version)
+{
+  int error = rpc_method_invoke(g_rpc_connection,
+								RPC_METHOD_NP_INITIALIZE,
+								RPC_TYPE_UINT32, npapi_version,
+								RPC_TYPE_INVALID);
+
+  if (error != RPC_ERROR_NO_ERROR) {
+	npw_perror("NP_Initialize() invoke", error);
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+  }
+
+  int32_t ret;
+  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
+
+  if (error != RPC_ERROR_NO_ERROR) {
+	npw_perror("NP_Initialize() wait for reply", error);
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+  }
+
+  return ret;
+}
+
 NPError
 NP_Initialize(NPNetscapeFuncs *moz_funcs, NPPluginFuncs *plugin_funcs)
 {
@@ -2374,26 +2485,9 @@
 
   // pass down common NPAPI version supported by both the underlying
   // browser and the thunking capabilities of nspluginwrapper
-  uint32_t version = min(moz_funcs->version, plugin_funcs->version);
+  npapi_version = min(moz_funcs->version, plugin_funcs->version);
 
-  int error = rpc_method_invoke(g_rpc_connection,
-								RPC_METHOD_NP_INITIALIZE,
-								RPC_TYPE_UINT32, (uint32_t)version,
-								RPC_TYPE_INVALID);
-
-  if (error != RPC_ERROR_NO_ERROR) {
-	npw_perror("NP_Initialize() invoke", error);
-	return NPERR_MODULE_LOAD_FAILED_ERROR;
-  }
-
-  int32_t ret;
-  error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
-
-  if (error != RPC_ERROR_NO_ERROR) {
-	npw_perror("NP_Initialize() wait for reply", error);
-	return NPERR_MODULE_LOAD_FAILED_ERROR;
-  }
-
+  NPError ret = invoke_NP_Initialize(npapi_version);
   D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
   return ret;
 }
@@ -2657,7 +2751,7 @@
   }
 
   if (g_rpc_connection) {
-	rpc_exit(g_rpc_connection);
+	rpc_connection_unref(g_rpc_connection);
 	g_rpc_connection = NULL;
   }
 
@@ -2708,3 +2802,40 @@
 	g_plugin.description = NULL;
   }
 }
+
+static NPError plugin_restart(void)
+{
+  if (g_plugin.is_wrapper)
+	return NPERR_NO_ERROR;
+
+  // Shut it down    
+  plugin_exit();
+  g_plugin.initialized = 0;
+  g_plugin.viewer_pid = -1;
+  g_plugin.is_wrapper = 0;
+
+  // And start it again
+  plugin_init(1);
+  if (g_plugin.initialized <= 0)
+	return NPERR_MODULE_LOAD_FAILED_ERROR;
+
+  return invoke_NP_Initialize(npapi_version);
+}
+
+static NPError plugin_restart_if_needed(void)
+{
+  if (rpc_status(g_rpc_connection) != RPC_STATUS_ACTIVE) {
+	static time_t last_restart = 0;
+	time_t now = time(NULL);
+	if (now - last_restart < MIN_RESTART_INTERVAL)
+	  return NPERR_GENERIC_ERROR;
+	last_restart = now;
+
+	D(bug("Restart plugins viewer\n"));
+	NPError ret = plugin_restart();
+	D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
+	return ret;
+  }
+
+  return NPERR_NO_ERROR;
+}
Index: src/rpc.c
===================================================================
--- src/rpc.c	(r??vision 466)
+++ src/rpc.c	(r??vision 470)
@@ -289,6 +289,7 @@
 // Client / Server connection
 struct rpc_connection_t {
   int type;
+  int refcnt;
   int status;
   int socket;
   char *socket_path;
@@ -301,6 +302,22 @@
   char send_buffer[BUFSIZ];
 };
 
+// Increment connection reference count
+void rpc_connection_ref(rpc_connection_t *connection)
+{
+  if (connection)
+	++connection->refcnt;
+}
+
+// Decrement connection reference count and destroy it if it reaches zero
+void rpc_connection_unref(rpc_connection_t *connection)
+{
+  if (connection && --connection->refcnt == 0) {
+	D(bug("Close unused connection\n"));
+	rpc_exit(connection);
+  }
+}
+
 // Returns connection status
 static inline int _rpc_status(rpc_connection_t *connection)
 {
@@ -417,6 +434,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_SERVER;
+  connection->refcnt = 1;
   connection->status = RPC_STATUS_CLOSED;
   connection->socket = -1;
   connection->server_thread_active = 0;
@@ -468,6 +486,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_CLIENT;
+  connection->refcnt = 1;
   connection->status = RPC_STATUS_CLOSED;
   connection->server_socket = -1;
   connection->callbacks = NULL;
Index: src/rpc.h
===================================================================
--- src/rpc.h	(r??vision 466)
+++ src/rpc.h	(r??vision 470)
@@ -42,6 +42,9 @@
 
 // Connection Handling
 typedef struct rpc_connection_t rpc_connection_t;
+extern void rpc_connection_ref(rpc_connection_t *connection) attribute_hidden;
+extern void rpc_connection_unref(rpc_connection_t *connection) attribute_hidden;
+
 extern rpc_connection_t *rpc_init_server(const char *ident) attribute_hidden;
 extern rpc_connection_t *rpc_init_client(const char *ident) attribute_hidden;
 extern int rpc_exit(rpc_connection_t *connection) attribute_hidden;
Index: NEWS
===================================================================
--- NEWS	(r??vision 466)
+++ NEWS	(r??vision 470)
@@ -1,6 +1,9 @@
-nspluginwrapper NEWS -- history of user-visible changes.  2007-08-26
+nspluginwrapper NEWS -- history of user-visible changes.  2007-MM-DD
 Copyright (C) 2005-2007 Gwenole Beauchesne
 
+Version 0.9.92 (BETA) - DD.MMM.2007
+* Restart plugins viewer on error (Martin Stransky)
+
 Version 0.9.91.5 (BETA) - 26.Aug.2007
 * Fix a memory leak in NPP_Destroy()
 * Fix DiamondX XEmbed example plugin

nspluginwrapper-0.9.91.5-rpc-error.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-rpc-error.patch ---
Index: src/rpc.c
===================================================================
--- src/rpc.c	(r??vision 460)
+++ src/rpc.c	(r??vision 466)
@@ -29,6 +29,7 @@
 
 #include "sysdeps.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -288,6 +289,7 @@
 // Client / Server connection
 struct rpc_connection_t {
   int type;
+  int status;
   int socket;
   char *socket_path;
   int server_socket;
@@ -299,6 +301,47 @@
   char send_buffer[BUFSIZ];
 };
 
+// Returns connection status
+static inline int _rpc_status(rpc_connection_t *connection)
+{
+  return connection->status;
+}
+
+int rpc_status(rpc_connection_t *connection)
+{
+  if (connection == NULL)
+	return RPC_STATUS_BROKEN;
+  return _rpc_status(connection);
+}
+
+// Set connection status
+static void _rpc_set_status(rpc_connection_t *connection, int error)
+{
+  if (connection->status == RPC_STATUS_ACTIVE) {
+	switch (error) {
+	case RPC_ERROR_NO_ERROR:
+	  connection->status = RPC_STATUS_ACTIVE;
+	  break;
+	case RPC_ERROR_CONNECTION_CLOSED:
+	  connection->status = RPC_STATUS_CLOSED;
+	  break;
+	default:
+	  connection->status = RPC_STATUS_BROKEN;
+	  break;
+	}
+  }
+}
+
+static inline int rpc_error(rpc_connection_t *connection, int error)
+{
+  // XXX: this function must be called only in case of error
+  // (otherwise, it's an internal error)
+  assert(error < 0);
+  assert(connection != NULL);
+  _rpc_set_status(connection, error);
+  return error;
+}
+
 // Returns socket fd or -1 if invalid connection
 int rpc_socket(rpc_connection_t *connection)
 {
@@ -374,6 +417,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_SERVER;
+  connection->status = RPC_STATUS_CLOSED;
   connection->socket = -1;
   connection->server_thread_active = 0;
   connection->callbacks = NULL;
@@ -404,6 +448,7 @@
 	return NULL;
   }
 
+  connection->status = RPC_STATUS_ACTIVE;
   return connection;
 }
 
@@ -423,6 +468,7 @@
   if (connection == NULL)
 	return NULL;
   connection->type = RPC_CONNECTION_CLIENT;
+  connection->status = RPC_STATUS_CLOSED;
   connection->server_socket = -1;
   connection->callbacks = NULL;
   connection->n_callbacks = 0;
@@ -467,6 +513,7 @@
 	return NULL;
   }
 
+  connection->status = RPC_STATUS_ACTIVE;
   return connection;
 }
 
@@ -1334,11 +1381,14 @@
   int32_t msg_tag;
   int error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_START)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
-  return _rpc_dispatch(connection, &message);
+  int method = _rpc_dispatch(connection, &message);
+  if (method < 0)
+	return rpc_error(connection, method);
+  return method;
 }
 
 
@@ -1443,6 +1493,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1459,24 +1511,24 @@
   // send: <invoke> = MESSAGE_START <method-id> MESSAGE_END
   int error = rpc_message_send_int32(&message, RPC_MESSAGE_START);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, method);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // wait: MESSAGE_ACK
   int32_t msg_tag;
   error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
   // send optional arguments
   va_list args;
@@ -1490,19 +1542,19 @@
 	error = rpc_message_send_args(&message, args);
 	va_end(args);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_flush(&message);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 
 	// wait: MESSAGE_ACK
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	if (msg_tag != RPC_MESSAGE_ACK)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
   }
-  
+
   return RPC_ERROR_NO_ERROR;
 }
 
@@ -1513,6 +1565,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1523,15 +1577,15 @@
   int error = rpc_message_recv_args(&message, args);
   va_end(args);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // send: MESSAGE_ACK
   error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   return RPC_ERROR_NO_ERROR;
 }
@@ -1547,6 +1601,8 @@
 
   if (connection == NULL)
 	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_init(&message, connection);
   va_start(args, connection);
@@ -1559,11 +1615,11 @@
   while (!done) {
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	switch (msg_tag) {
 	case RPC_MESSAGE_START:
 	  if ((error = _rpc_dispatch(connection, &message)) < 0)
-		return error;
+		return rpc_error(connection, error);
 	  break;
 	case RPC_MESSAGE_REPLY:
 	case RPC_MESSAGE_ACK:
@@ -1575,11 +1631,12 @@
 		int32_t error_code;
 		error = rpc_message_recv_int32(&message, &error_code);
 		if (error != RPC_ERROR_NO_ERROR)
-		  return error;
-		return error_code;
+		  return rpc_error(connection, error);
+		// return other-side error code
+		return rpc_error(connection, error_code);
 	  }
 	default:
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 	}
   }
 
@@ -1587,35 +1644,35 @@
 
 	// wait: <reply>
 	if (msg_tag != RPC_MESSAGE_REPLY)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 	va_start(args, connection);
 	error = rpc_message_recv_args(&message, args);
 	va_end(args);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	if (msg_tag != RPC_MESSAGE_END)
-	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	  return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
 	// send: MESSAGE_ACK
 	error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 	error = rpc_message_flush(&message);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
 
 	// wait: MESSAGE_ACK (prepare for final ACK)
 	error = rpc_message_recv_int32(&message, &msg_tag);
 	if (error != RPC_ERROR_NO_ERROR)
-	  return error;
+	  return rpc_error(connection, error);
   }
 
   // wait: MESSAGE_ACK
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
   
   return RPC_ERROR_NO_ERROR;
 }
@@ -1626,7 +1683,9 @@
   D(bug("rpc_method_send_reply\n"));
 
   if (connection == NULL)
-	return RPC_ERROR_GENERIC;
+	return RPC_ERROR_CONNECTION_NULL;
+  if (_rpc_status(connection) == RPC_STATUS_CLOSED)
+	return RPC_ERROR_CONNECTION_CLOSED;
 
   rpc_message_t message;
   rpc_message_init(&message, connection);
@@ -1634,27 +1693,27 @@
   // send: <reply> = MESSAGE_REPLY [ <method-args> ] MESSAGE_END
   int error = rpc_message_send_int32(&message, RPC_MESSAGE_REPLY);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   va_list args;
   va_start(args, connection);
   error = rpc_message_send_args(&message, args);
   va_end(args);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   error = rpc_message_flush(&message);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
 
   // wait: MESSAGE_ACK
   int32_t msg_tag;
   error = rpc_message_recv_int32(&message, &msg_tag);
   if (error != RPC_ERROR_NO_ERROR)
-	return error;
+	return rpc_error(connection, error);
   if (msg_tag != RPC_MESSAGE_ACK)
-	return RPC_ERROR_MESSAGE_TYPE_INVALID;
+	return rpc_error(connection, RPC_ERROR_MESSAGE_TYPE_INVALID);
 
   return RPC_ERROR_NO_ERROR;
 }
Index: src/rpc.h
===================================================================
--- src/rpc.h	(r??vision 460)
+++ src/rpc.h	(r??vision 466)
@@ -51,6 +51,13 @@
 extern int rpc_wait_dispatch(rpc_connection_t *connection, int timeout) attribute_hidden;
 extern int rpc_socket(rpc_connection_t *connection) attribute_hidden;
 
+enum {
+  RPC_STATUS_BROKEN						= -1,
+  RPC_STATUS_CLOSED						= 0,
+  RPC_STATUS_ACTIVE						= 1,
+};
+extern int rpc_status(rpc_connection_t *connection) attribute_hidden;
+
 // Message Passing
 enum {
   RPC_TYPE_INVALID						=  0,

nspluginwrapper-0.9.91.5-rh.patch:

Index: nspluginwrapper-0.9.91.5-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.5-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.5-rh.patch	28 Aug 2007 11:12:58 -0000	1.1
+++ nspluginwrapper-0.9.91.5-rh.patch	10 Sep 2007 08:44:43 -0000	1.2
@@ -643,28 +643,6 @@
  #include "utils.h"
  
  #define XP_UNIX 1
-@@ -85,6 +86,8 @@ typedef struct {
- 
- static Plugin g_plugin = { 0, -1, 0, NULL, NULL, NULL };
- 
-+static uint32_t version = 0;
-+
- // Instance state information about the plugin
- typedef struct _PluginInstance {
-   NPP instance;
-@@ -101,6 +104,12 @@ typedef struct _StreamInstance {
- // Prototypes
- static void plugin_init(int is_NP_Initialize);
- static void plugin_exit(void);
-+static NPError plugin_restart(void);
-+static NPError check_restart(void);
-+static time_t  last_restart = 0; 
-+
-+// Minimal time between two plugin restarts in sec
-+#define RESTART_INTERVAL      1
- 
- // Helpers
- #ifndef min
 @@ -211,7 +220,7 @@ g_NPN_GetValue(NPP instance, NPNVariable
    if (mozilla_funcs.getvalue == NULL)
  	return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -682,20 +660,6 @@
    abort();
  }
  
-@@ -1216,7 +1226,12 @@ g_NPP_New(NPMIMEType mime_type, NPP inst
- {
-   if (instance == NULL)
- 	return NPERR_INVALID_INSTANCE_ERROR;
--
-+	
-+  // Check if we need to restart the plug-in
-+  NPError rt = check_restart();
-+  if(rt != NPERR_NO_ERROR)
-+  	return(rt);
-+		
-   PluginInstance *plugin = malloc(sizeof(*plugin));
-   if (plugin == NULL)
- 	return NPERR_OUT_OF_MEMORY_ERROR;
 @@ -1485,8 +1500,9 @@ invoke_NPP_URLNotify(NPP instance, const
  
    error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INVALID);
@@ -707,15 +671,6 @@
  }
  
  static void
-@@ -2374,7 +2390,7 @@ NP_Initialize(NPNetscapeFuncs *moz_funcs
- 
-   // pass down common NPAPI version supported by both the underlying
-   // browser and the thunking capabilities of nspluginwrapper
--  uint32_t version = min(moz_funcs->version, plugin_funcs->version);
-+  version = min(moz_funcs->version, plugin_funcs->version);
- 
-   int error = rpc_method_invoke(g_rpc_connection,
- 								RPC_METHOD_NP_INITIALIZE,
 @@ -2467,9 +2483,9 @@ static void plugin_init(int is_NP_Initia
    static int init_count = 0;
    ++init_count;
@@ -728,71 +683,6 @@
  
    // Cache MIME info and plugin name/description
    if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
-@@ -2708,3 +2724,64 @@ static void __attribute__((destructor)) 
- 	g_plugin.description = NULL;
-   }
- }
-+
-+static NPError plugin_restart(void)
-+{
-+  if(!g_plugin.is_wrapper) {
-+	D(bug("plugin restart\n"));
-+
-+	// Shut it down    
-+	plugin_exit();
-+
-+	g_plugin.initialized = 0;
-+	g_plugin.viewer_pid = -1;
-+	g_plugin.is_wrapper = 0;
-+
-+	// And start it again
-+	plugin_init(1);
-+	if (g_plugin.initialized <= 0)
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+		
-+	int error = rpc_method_invoke(g_rpc_connection,
-+				RPC_METHOD_NP_INITIALIZE,
-+				RPC_TYPE_UINT32, (uint32_t)version,
-+				RPC_TYPE_INVALID);
-+	
-+	if (error != RPC_ERROR_NO_ERROR) {
-+		npw_perror("NP_Initialize() invoke", error);
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+	}
-+	
-+	int32_t ret;
-+	error = rpc_method_wait_for_reply(g_rpc_connection, RPC_TYPE_INT32, &ret, RPC_TYPE_INVALID);
-+	
-+	if (error != RPC_ERROR_NO_ERROR) {
-+		npw_perror("NP_Initialize() wait for reply", error);
-+		return NPERR_MODULE_LOAD_FAILED_ERROR;
-+	}
-+	
-+	D(bug(" return: %d [%s]\n", ret, string_of_NPError(ret)));
-+	return ret;
-+  }
-+  return NPERR_NO_ERROR;
-+}
-+
-+static NPError check_restart(void)
-+{
-+	if(rpc_status_get(g_rpc_connection)) {
-+
-+		time_t atime = time(NULL);
-+		if(atime - last_restart < RESTART_INTERVAL)
-+			return(NPERR_GENERIC_ERROR);
-+		last_restart = atime;
-+
-+		D(bug("Plugin restart\n"));
-+		int ret = plugin_restart();
-+		if(ret == NPERR_NO_ERROR) {			
-+			rpc_error_clear(g_rpc_connection);
-+		}		
-+		D(bug("check_restart return %d [%s]\n", ret, string_of_NPError(ret)));
-+		return(ret);
-+	}	
-+	return(NPERR_NO_ERROR);
-+}
 --- /dev/null	2007-08-28 09:06:54.719628589 +0200
 +++ nspluginwrapper-0.9.91.5/src/npw-dir.c	2007-08-28 11:10:19.000000000 +0200
 @@ -0,0 +1,97 @@
@@ -1405,326 +1295,3 @@
    }
  
    return 0;
---- nspluginwrapper-0.9.91.5/src/rpc.h.rh	2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.5/src/rpc.h	2007-08-28 11:10:19.000000000 +0200
-@@ -103,4 +103,11 @@ extern int rpc_method_wait_for_reply(rpc
- extern int rpc_method_get_args(rpc_connection_t *connection, ...) attribute_hidden;
- extern int rpc_method_send_reply(rpc_connection_t *connection, ...) attribute_hidden;
- 
-+// Error handling
-+void rpc_error_check(rpc_connection_t *connection, int err_code);
-+int  rpc_error_get(rpc_connection_t *connection);
-+void rpc_error_set(rpc_connection_t *connection);
-+void rpc_error_clear(rpc_connection_t *connection);
-+int  rpc_status_get(rpc_connection_t *connection);
-+
- #endif /* RPC_H */
---- nspluginwrapper-0.9.91.5/src/rpc.c.rh	2007-04-02 22:03:07.000000000 +0200
-+++ nspluginwrapper-0.9.91.5/src/rpc.c	2007-08-28 11:10:19.000000000 +0200
-@@ -232,6 +232,7 @@ const char *rpc_strerror(int error)
-   return str;
- }
- 
-+
- // Set non blocking I/O on the specified socket
- static int rpc_set_non_blocking_io(int socket)
- {
-@@ -293,12 +294,41 @@ struct rpc_connection_t {
-   int server_socket;
-   int server_thread_active;
-   pthread_t server_thread;
-+  int last_error;
-   rpc_method_descriptor_t *callbacks;
-   int n_callbacks;
-   int send_offset;
-   char send_buffer[BUFSIZ];
- };
- 
-+#define ERROR_RPC(error)  ((error) > -1100 && (error) <= -1000)
-+
-+void rpc_error_check(rpc_connection_t *connection, int err_code)
-+{
-+  if(ERROR_RPC(err_code))
-+	connection->last_error = err_code;
-+}
-+
-+int  rpc_error_get(rpc_connection_t *connection)
-+{	
-+  return(connection->last_error);
-+}
-+
-+void rpc_error_set(rpc_connection_t *connection)
-+{	
-+  connection->last_error = RPC_ERROR_GENERIC;
-+}
-+
-+void rpc_error_clear(rpc_connection_t *connection)
-+{
-+  connection->last_error = 0;
-+}
-+
-+int  rpc_status_get(rpc_connection_t *connection)
-+{	
-+  return(ERROR_RPC(connection->last_error));
-+}
-+
- // Returns socket fd or -1 if invalid connection
- int rpc_socket(rpc_connection_t *connection)
- {
-@@ -378,6 +408,7 @@ rpc_connection_t *rpc_init_server(const 
-   connection->server_thread_active = 0;
-   connection->callbacks = NULL;
-   connection->n_callbacks = 0;
-+	connection->last_error = 0;
- 
-   if ((connection->server_socket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- 	perror("server socket");
-@@ -426,6 +457,7 @@ rpc_connection_t *rpc_init_client(const 
-   connection->server_socket = -1;
-   connection->callbacks = NULL;
-   connection->n_callbacks = 0;
-+	connection->last_error = 0;
- 
-   if ((connection->socket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- 	perror("client socket");
-@@ -1441,8 +1473,9 @@ int rpc_method_invoke(rpc_connection_t *
- {
-   D(bug("rpc_method_invoke method=%d\n", method));
- 
--  if (connection == NULL)
-+  if (connection == NULL) {
- 	return RPC_ERROR_CONNECTION_NULL;
-+  }
- 
-   rpc_message_t message;
-   rpc_message_init(&message, connection);
-@@ -1452,29 +1485,41 @@ int rpc_method_invoke(rpc_connection_t *
- 	int ret = _rpc_wait_dispatch(connection, 0);
- 	if (ret == 0)
- 	  break;
--	if (ret < 0 || (ret = rpc_dispatch(connection)) < 0)
-+	if (ret < 0 || (ret = rpc_dispatch(connection)) < 0) {
-+          rpc_error_check(connection,ret);
- 	  return ret;
-+  	}
-   }
- 
-   // send: <invoke> = MESSAGE_START <method-id> MESSAGE_END
-   int error = rpc_message_send_int32(&message, RPC_MESSAGE_START);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_send_int32(&message, method);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
- 
-   // wait: MESSAGE_ACK
-   int32_t msg_tag;
-   error = rpc_message_recv_int32(&message, &msg_tag);
--  if (error != RPC_ERROR_NO_ERROR)
--	return error;
-+  if (error != RPC_ERROR_NO_ERROR) {
-+        rpc_error_check(connection,error);
-+        return error;
-+  }
-   if (msg_tag != RPC_MESSAGE_ACK)
- 	return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 
-@@ -1489,16 +1534,22 @@ int rpc_method_invoke(rpc_connection_t *
- 	va_start(args, method);
- 	error = rpc_message_send_args(&message, args);
- 	va_end(args);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+        }
- 	error = rpc_message_flush(&message);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 
- 	// wait: MESSAGE_ACK
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	if (msg_tag != RPC_MESSAGE_ACK)
- 	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
-   }
-@@ -1522,16 +1573,22 @@ int rpc_method_get_args(rpc_connection_t
-   va_start(args, connection);
-   int error = rpc_message_recv_args(&message, args);
-   va_end(args);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   // send: MESSAGE_ACK
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   return RPC_ERROR_NO_ERROR;
- }
-@@ -1545,8 +1602,9 @@ int rpc_method_wait_for_reply(rpc_connec
-   va_list args;
-   rpc_message_t message;
- 
--  if (connection == NULL)
-+  if (connection == NULL) {
- 	return RPC_ERROR_CONNECTION_NULL;
-+  }
- 
-   rpc_message_init(&message, connection);
-   va_start(args, connection);
-@@ -1558,12 +1616,16 @@ int rpc_method_wait_for_reply(rpc_connec
-   bool done = false;
-   while (!done) {
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	switch (msg_tag) {
- 	case RPC_MESSAGE_START:
--	  if ((error = _rpc_dispatch(connection, &message)) < 0)
-+	  if ((error = _rpc_dispatch(connection, &message)) < 0) {
-+		rpc_error_check(connection,error);
- 		return error;
-+	  }
- 	  break;
- 	case RPC_MESSAGE_REPLY:
- 	case RPC_MESSAGE_ACK:
-@@ -1574,8 +1636,10 @@ int rpc_method_wait_for_reply(rpc_connec
- 		// wait: <error-code>
- 		int32_t error_code;
- 		error = rpc_message_recv_int32(&message, &error_code);
--		if (error != RPC_ERROR_NO_ERROR)
-+		if (error != RPC_ERROR_NO_ERROR) {
-+		  rpc_error_check(connection,error);
- 		  return error;
-+		}
- 		return error_code;
- 	  }
- 	default:
-@@ -1591,26 +1655,36 @@ int rpc_method_wait_for_reply(rpc_connec
- 	va_start(args, connection);
- 	error = rpc_message_recv_args(&message, args);
- 	va_end(args);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	if (msg_tag != RPC_MESSAGE_END)
- 	  return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 
- 	// send: MESSAGE_ACK
- 	error = rpc_message_send_int32(&message, RPC_MESSAGE_ACK);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 	error = rpc_message_flush(&message);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
- 
- 	// wait: MESSAGE_ACK (prepare for final ACK)
- 	error = rpc_message_recv_int32(&message, &msg_tag);
--	if (error != RPC_ERROR_NO_ERROR)
-+	if (error != RPC_ERROR_NO_ERROR) {
-+	  rpc_error_check(connection,error);
- 	  return error;
-+	}
-   }
- 
-   // wait: MESSAGE_ACK
-@@ -1633,26 +1707,36 @@ int rpc_method_send_reply(rpc_connection
- 
-   // send: <reply> = MESSAGE_REPLY [ <method-args> ] MESSAGE_END
-   int error = rpc_message_send_int32(&message, RPC_MESSAGE_REPLY);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   va_list args;
-   va_start(args, connection);
-   error = rpc_message_send_args(&message, args);
-   va_end(args);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_send_int32(&message, RPC_MESSAGE_END);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   error = rpc_message_flush(&message);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
- 
-   // wait: MESSAGE_ACK
-   int32_t msg_tag;
-   error = rpc_message_recv_int32(&message, &msg_tag);
--  if (error != RPC_ERROR_NO_ERROR)
-+  if (error != RPC_ERROR_NO_ERROR) {
-+	rpc_error_check(connection,error);
- 	return error;
-+  }
-   if (msg_tag != RPC_MESSAGE_ACK)
- 	return RPC_ERROR_MESSAGE_TYPE_INVALID;
- 


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nspluginwrapper.spec	28 Aug 2007 11:12:58 -0000	1.16
+++ nspluginwrapper.spec	10 Sep 2007 08:44:43 -0000	1.17
@@ -70,13 +70,15 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
 Source3:        %{name}.sh.in
-Patch0:		nspluginwrapper-0.9.91.5-rh.patch
-Patch1:		nspluginwrapper-0.9.91.4-config.patch
+Patch0:		nspluginwrapper-0.9.91.5-rpc-error.patch
+Patch1:		nspluginwrapper-0.9.91.5-restart.patch
+Patch2:		nspluginwrapper-0.9.91.5-rh.patch
+Patch3:		nspluginwrapper-0.9.91.4-config.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -104,8 +106,10 @@
 
 %prep
 %setup  -q -a 1
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .cnf
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1 -b .rh
+%patch3 -p1 -b .cnf
 
 # remove old/incompatibile stuff
 rm -rf npapi
@@ -221,6 +225,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-2
+- added upstream patches - RPC error handling and plugin restart
+
 * Mon Aug 27 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-1
 - update to the latest upstream
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:06:19 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 05:06:19 -0400
Subject: rpms/libcaca/EL-5 .cvsignore, 1.2, 1.3 libcaca.spec, 1.12,
	1.13 sources, 1.2, 1.3 libcaca-0.9-man3.patch, 1.1, NONE
Message-ID: <200709100906.l8A96JB1029936@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29865

Modified Files:
	.cvsignore libcaca.spec sources 
Removed Files:
	libcaca-0.9-man3.patch 
Log Message:
Sync files from devel for initial EPEL build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:42:00 -0000	1.2
+++ .cvsignore	10 Sep 2007 09:05:45 -0000	1.3
@@ -1 +1 @@
-libcaca-0.9.tar.bz2
+libcaca-0.99.beta11.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/libcaca.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libcaca.spec	28 Aug 2006 11:24:21 -0000	1.12
+++ libcaca.spec	10 Sep 2007 09:05:45 -0000	1.13
@@ -1,15 +1,24 @@
+%define beta beta11
+
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
-Version: 0.9
-Release: 11%{?dist}
-License: LGPL
+Version: 0.99
+Release: 0.3.%{beta}%{?dist}
+License: WTFPL
 Group: System Environment/Libraries
-URL: http://sam.zoy.org/projects/libcaca/
-Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
-Patch: libcaca-0.9-man3.patch
+URL: http://libcaca.zoy.org/
+Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: libX11-devel, libXt-devel, ncurses-devel >= 5, slang-devel
-Buildrequires: imlib2-devel, zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: slang-devel
+BuildRequires: ncurses-devel
+BuildRequires: libX11-devel
+BuildRequires: glut-devel
+BuildRequires: imlib2-devel
+BuildRequires: pango-devel
+# For the docs
+Buildrequires: doxygen
+Buildrequires: tetex-latex
+Buildrequires: tetex-dvips
 
 %description
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -20,7 +29,13 @@
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
 Group: Development/Libraries
-Requires: libX11-devel, ncurses-devel >= 5, slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel
+Requires: ncurses-devel
+Requires: libX11-devel
+Requires: glut-devel
+Requires: imlib2-devel
+Requires: pango-devel
 
 %description devel
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -52,60 +67,83 @@
 
 
 %prep
-%setup
-%patch -p1 -b .man3
+%setup -q -n libcaca-%{version}.%{beta}
 
 
 %build
-%configure \
-    --x-includes=%{_includedir} \
-    --x-libraries=%{_libdir} \
-    --enable-slang \
-    --enable-ncurses \
-    --enable-x11 \
-    --enable-imlib2
+%configure --disable-rpath
+# Remove useless 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 %{buildroot}
+%{__rm} -rf %{buildroot} libcucul-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
+%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*.so.*
+
 %files devel
-%defattr(-, root, root, 0755)
-%doc COPYING %{name}-devel-docs/*
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%doc ChangeLog libcucul-dev-docs/*
 %{_bindir}/caca-config
-%{_includedir}/*
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
-#{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-, root, root, 0755)
-%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
-%{_bindir}/cacaball
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacamoir
-%{_bindir}/cacaplas
+%{_bindir}/cacaplay
+%{_bindir}/cacaserver
 %{_bindir}/cacaview
+%{_bindir}/img2irc
 %{_datadir}/libcaca/
-%{_mandir}/man1/cacaball.1*
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
-%{_mandir}/man1/cacamoir.1*
-%{_mandir}/man1/cacaplas.1*
+%{_mandir}/man1/cacaplay.1*
+%{_mandir}/man1/cacaserver.1*
 %{_mandir}/man1/cacaview.1*
+%{_mandir}/man1/img2irc.1*
 
 
 %changelog
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.3.beta11
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.2.beta11
+- Update License field.
+
+* Thu Mar 29 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.1.beta11
+- Update to 0.99beta11.
+- We now have a main libcaca package with just the shared lib (built by default
+  now), so make the devel sub-package require it too. Leave static lib for now.
+- Enable opengl and pango support.
+- Remove useless rpath.
+- Remove no longer needed man3 patch.
+- Remove all configure options, they're autodetected.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9-11
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:42:00 -0000	1.2
+++ sources	10 Sep 2007 09:05:45 -0000	1.3
@@ -1 +1 @@
-c7d5c46206091a9203fcb214abb25e4a  libcaca-0.9.tar.bz2
+94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz


--- libcaca-0.9-man3.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 09:06:24 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 05:06:24 -0400
Subject: rpms/libcaca/EL-4 .cvsignore, 1.2, 1.3 libcaca.spec, 1.3,
	1.4 sources, 1.2, 1.3 libcaca-0.9-man3.patch, 1.1, NONE
Message-ID: <200709100906.l8A96Oqo029946@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29869

Modified Files:
	.cvsignore libcaca.spec sources 
Removed Files:
	libcaca-0.9-man3.patch 
Log Message:
Sync files from devel for initial EPEL build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:42:00 -0000	1.2
+++ .cvsignore	10 Sep 2007 09:05:51 -0000	1.3
@@ -1 +1 @@
-libcaca-0.9.tar.bz2
+libcaca-0.99.beta11.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/libcaca.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libcaca.spec	10 Dec 2004 21:27:33 -0000	1.3
+++ libcaca.spec	10 Sep 2007 09:05:51 -0000	1.4
@@ -1,15 +1,24 @@
+%define beta beta11
+
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
-Version: 0.9
-Release: 5
-License: LGPL
+Version: 0.99
+Release: 0.3.%{beta}%{?dist}
+License: WTFPL
 Group: System Environment/Libraries
-URL: http://sam.zoy.org/projects/libcaca/
-Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
-Patch: libcaca-0.9-man3.patch
+URL: http://libcaca.zoy.org/
+Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: XFree86-devel, ncurses-devel >= 5, slang-devel, imlib2-devel
-Buildrequires: zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: slang-devel
+BuildRequires: ncurses-devel
+BuildRequires: libX11-devel
+BuildRequires: glut-devel
+BuildRequires: imlib2-devel
+BuildRequires: pango-devel
+# For the docs
+Buildrequires: doxygen
+Buildrequires: tetex-latex
+Buildrequires: tetex-dvips
 
 %description
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -20,7 +29,13 @@
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
 Group: Development/Libraries
-Requires: XFree86-devel, ncurses-devel >= 5, slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel
+Requires: ncurses-devel
+Requires: libX11-devel
+Requires: glut-devel
+Requires: imlib2-devel
+Requires: pango-devel
 
 %description devel
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -52,57 +67,103 @@
 
 
 %prep
-%setup
-%patch -p1 -b .man3
+%setup -q -n libcaca-%{version}.%{beta}
 
 
 %build
-%configure \
-    --program-prefix="%{?_program_prefix}" \
-    --enable-slang \
-    --enable-ncurses \
-    --enable-x11 \
-    --enable-imlib2
+%configure --disable-rpath
+# Remove useless 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 %{buildroot}
+%{__rm} -rf %{buildroot} libcucul-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
+%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*.so.*
+
 %files devel
-%defattr(-, root, root, 0755)
-%doc COPYING %{name}-devel-docs/*
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%doc ChangeLog libcucul-dev-docs/*
 %{_bindir}/caca-config
-%{_includedir}/*
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
-#{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-, root, root, 0755)
-%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
-%{_bindir}/cacaball
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacamoir
-%{_bindir}/cacaplas
+%{_bindir}/cacaplay
+%{_bindir}/cacaserver
 %{_bindir}/cacaview
-%{_datadir}/libcaca/*
-%{_mandir}/man1/cacaball.1*
+%{_bindir}/img2irc
+%{_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*
 
 
 %changelog
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.3.beta11
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.2.beta11
+- Update License field.
+
+* Thu Mar 29 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.1.beta11
+- Update to 0.99beta11.
+- We now have a main libcaca package with just the shared lib (built by default
+  now), so make the devel sub-package require it too. Leave static lib for now.
+- Enable opengl and pango support.
+- Remove useless rpath.
+- Remove no longer needed man3 patch.
+- Remove all configure options, they're autodetected.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9-11
+- FC6 rebuild.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.9-10
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.9-9
+- Rebuild for new gcc/glibc.
+
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-8
+- Include unpackaged man page symlinks.
+- Rebuild against new slang.
+
+* Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 0.9-7
+- Change XFree86-devel requirements to libX11-devel.
+- Force --x-includes= and --x-libraries=, otherwise -L gets passed empty.
+
+* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9-6
+- Include libcaca datadir.
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 0.9-5
 - Bump release to provide Extras upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:42:00 -0000	1.2
+++ sources	10 Sep 2007 09:05:51 -0000	1.3
@@ -1 +1 @@
-c7d5c46206091a9203fcb214abb25e4a  libcaca-0.9.tar.bz2
+94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz


--- libcaca-0.9-man3.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 09:08:06 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 10 Sep 2007 05:08:06 -0400
Subject: rpms/hplip/F-7 hplip.spec,1.139,1.140
Message-ID: <200709100908.l8A986SB030095@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30062

Modified Files:
	hplip.spec 
Log Message:
* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
- hp-toolbox requires a graphical scanning program to be available
  (bug #283291).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- hplip.spec	16 Jul 2007 17:23:24 -0000	1.139
+++ hplip.spec	10 Sep 2007 09:07:33 -0000	1.140
@@ -57,6 +57,10 @@
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
+# hp-toolbox requires a graphical scanning program to be available
+# (bug #283291).
+Requires: xsane
+
 %description gui
 HPLIP graphical tools.
 
@@ -292,6 +296,10 @@
 exit 0
 
 %changelog
+* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
+- hp-toolbox requires a graphical scanning program to be available
+  (bug #283291).
+
 * Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
 - Low ink is a warning condition, not an error.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:19:23 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 05:19:23 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.17,1.18
Message-ID: <200709100919.l8A9JNkx030396@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30358

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- claws-mail-plugins.spec	5 Sep 2007 19:38:03 -0000	1.17
+++ claws-mail-plugins.spec	10 Sep 2007 09:18:50 -0000	1.18
@@ -31,7 +31,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
 BuildRequires:  perl
-BuildRequires:  libsynce-devel
+BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 09:47:40 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 05:47:40 -0400
Subject: rpms/isync/devel isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709100947.l8A9le0k031550@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 09:54:22 2007
From: fedora-extras-commits at redhat.com (Rahul Bhalerao (rbhalera))
Date: Mon, 10 Sep 2007 05:54:22 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.29,1.30
Message-ID: <200709100954.l8A9sM3U032177@cvs-int.fedora.redhat.com>

Author: rbhalera

Update of /cvs/pkgs/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32139

Modified Files:
	fonts-indic.spec 
Log Message:
Reverted changes


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fonts-indic.spec	7 Sep 2007 12:26:37 -0000	1.29
+++ fonts-indic.spec	10 Sep 2007 09:53:50 -0000	1.30
@@ -2,9 +2,9 @@
 %define update_cache    /usr/bin/fc-cache 
 %define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
-Name:        lohit-fonts
+Name:        fonts-indic
 Version:     2.1.5
-Release:     3%{?dist}
+Release:     2%{?dist}
 License:     GPL
 Group:       User Interface/X
 BuildArch:   noarch
@@ -19,17 +19,17 @@
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
-%package -n lohit-fonts-%1\
+%package -n fonts-%1\
 Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      User Interface/X \
-Provides:  fonts-%1 = %{version}-%{release}\
-Obsoletes :  fonts-%1 < 2.1.5-3\
+Provides:  ttfonts-%2 <= 1.6-1\
+Obsoletes :  ttfonts-%2 <= 1.6-1\
 Requires:   fontconfig\
 \
-%description -n lohit-fonts-%1\
+%description -n fonts-%1\
 These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
 \
-%files -n lohit-fonts-%1\
+%files -n fonts-%1\
 %defattr(-, root, root)\
 %dir %{xfontdir}\
 %dir %{xfontdir}/%1\
@@ -37,12 +37,12 @@
 %ghost %{xfontdir}/%1/fonts.cache-1\
 %{xfontdir}/%1/*ttf\
 \
-%post -n lohit-fonts-%1 \
+%post -n fonts-%1 \
 if [ -x %{_bindir}/fc-cache ]; then \
   %{_bindir}/fc-cache /usr/share/fonts \
 fi \
 \
-%postun -n lohit-fonts-%1 \
+%postun -n fonts-%1 \
 if [ "$1" = "0" ]; then \
   if [ -x %{_bindir}/fc-cache ]; then \
     %{_bindir}/fc-cache /usr/share/fonts \
@@ -80,6 +80,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
+- Reverting back renaming changes
+
 * Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
 - Renamed the package to reflect the upstream project name #253158
 



From fedora-extras-commits at redhat.com  Mon Sep 10 09:57:43 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 05:57:43 -0400
Subject: rpms/hedgewars/devel hedgewars.spec,1.1,1.2
Message-ID: <200709100957.l8A9vh1t032415@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32378

Modified Files:
	hedgewars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)



Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hedgewars.spec	10 Sep 2007 07:47:21 -0000	1.1
+++ hedgewars.spec	10 Sep 2007 09:57:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -13,6 +13,8 @@
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
 Requires:       hicolor-icon-theme
+# No freepascal on ppc64 :(
+ExcludeArch:    ppc64
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
+- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)
+
 * Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Install data files into /usr/share/hedgewars instead of into
   /usr/share/hedgewars/hedgewars



From fedora-extras-commits at redhat.com  Mon Sep 10 10:06:47 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Sep 2007 06:06:47 -0400
Subject: rpms/hedgewars/F-7 hedgewars.spec,1.1,1.2
Message-ID: <200709101006.l8AA6lC6006463@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6435

Modified Files:
	hedgewars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)



Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/F-7/hedgewars.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hedgewars.spec	10 Sep 2007 07:50:48 -0000	1.1
+++ hedgewars.spec	10 Sep 2007 10:06:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -13,6 +13,8 @@
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
 Requires:       hicolor-icon-theme
+# No freepascal on ppc64 :(
+ExcludeArch:    ppc64
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-3
+- ExcludeArch ppc64, as freepascal (fpc) isn't available on ppc64 (bz 284401)
+
 * Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Install data files into /usr/share/hedgewars instead of into
   /usr/share/hedgewars/hedgewars



From fedora-extras-commits at redhat.com  Mon Sep 10 10:09:00 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 06:09:00 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.18,1.19
Message-ID: <200709101009.l8AA90VS006628@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6575

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- add perl-devel BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail-plugins.spec	10 Sep 2007 09:18:50 -0000	1.18
+++ claws-mail-plugins.spec	10 Sep 2007 10:08:27 -0000	1.19
@@ -30,7 +30,7 @@
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
-BuildRequires:  perl
+BuildRequires:  perl-devel
 BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 10:12:38 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:12:38 -0400
Subject: rpms/isync/FC-6 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101012.l8AACcRr006826@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6750/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:12:05 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:12:05 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:13:19 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:13:19 -0400
Subject: rpms/isync/EL-4 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101013.l8AADJgQ006933@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6881/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:12:45 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:12:45 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:16:49 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:16:49 -0400
Subject: rpms/isync/EL-5 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101016.l8AAGnrR007082@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7040/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:16:15 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:16:15 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:18:40 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 06:18:40 -0400
Subject: rpms/isync/F-7 isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101018.l8AAIegr007233@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/isync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7193/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 10:18:07 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 10:18:07 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 10:27:53 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 06:27:53 -0400
Subject: rpms/claws-mail-plugins/F-7 claws-mail-plugins.spec,1.15,1.16
Message-ID: <200709101027.l8AARr0C007575@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7496

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- port BR fixes from devel



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- claws-mail-plugins.spec	5 Sep 2007 19:38:00 -0000	1.15
+++ claws-mail-plugins.spec	10 Sep 2007 10:27:20 -0000	1.16
@@ -30,8 +30,8 @@
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libetpan-devel
-BuildRequires:  perl
-BuildRequires:  libsynce-devel
+BuildRequires:  perl-devel
+BuildRequires:  libsynce-devel librapi-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel



From fedora-extras-commits at redhat.com  Mon Sep 10 10:31:53 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 10 Sep 2007 06:31:53 -0400
Subject: rpms/hplip/F-7 hplip-cmd_scan.patch, NONE, 1.1 hplip.spec, 1.140,
	1.141
Message-ID: <200709101031.l8AAVrEu007914@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7818

Modified Files:
	hplip.spec 
Added Files:
	hplip-cmd_scan.patch 
Log Message:
* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).


hplip-cmd_scan.patch:

--- NEW FILE hplip-cmd_scan.patch ---
diff -up hplip-1.7.4a/base/utils.py.cmd_scan hplip-1.7.4a/base/utils.py
--- hplip-1.7.4a/base/utils.py.cmd_scan	2007-09-10 10:12:06.000000000 +0100
+++ hplip-1.7.4a/base/utils.py	2007-09-10 10:13:21.000000000 +0100
@@ -542,6 +542,7 @@ class UserSettings(object):
     
     def loadDefaults(self):
         # Print
+        self.cmd_print = ''
         path = which('hp-print')
     
         if len(path) > 0:
@@ -564,6 +565,7 @@ class UserSettings(object):
                         self.cmd_print = 'xpp -P%PRINTER%'
     
         # Scan
+        self.cmd_scan = ''
         path = which('xsane')
     
         if len(path) > 0:


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- hplip.spec	10 Sep 2007 09:07:33 -0000	1.140
+++ hplip.spec	10 Sep 2007 10:31:21 -0000	1.141
@@ -22,6 +22,7 @@
 Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
+Patch10: hplip-cmd_scan.patch
 Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -57,10 +58,6 @@
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
-# hp-toolbox requires a graphical scanning program to be available
-# (bug #283291).
-Requires: xsane
-
 %description gui
 HPLIP graphical tools.
 
@@ -115,6 +112,9 @@
 # Clear the media-empty-error printer state.
 %patch9 -p1 -b .media-empty
 
+# Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
+%patch10 -p1 -b .cmd_scan
+
 # Prevent a traceback when unloading a photo card (bug #238617).
 %patch11 -p1 -b .unload-traceback
 
@@ -297,8 +297,7 @@
 
 %changelog
 * Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
-- hp-toolbox requires a graphical scanning program to be available
-  (bug #283291).
+- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
 
 * Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
 - Low ink is a warning condition, not an error.



From fedora-extras-commits at redhat.com  Mon Sep 10 10:38:40 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:38:40 -0400
Subject: rpms/python-iniparse/devel .cvsignore, 1.3, 1.4 python-iniparse.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709101038.l8AAcemF008145@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077

Modified Files:
	.cvsignore python-iniparse.spec sources 
Log Message:
Release 0.2.1-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2007 11:18:51 -0000	1.3
+++ .cvsignore	10 Sep 2007 10:38:07 -0000	1.4
@@ -1 +1,2 @@
 iniparse-0.2.1.tar.gz
+iniparse-comment.patch


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-iniparse.spec	28 Aug 2007 14:45:28 -0000	1.4
+++ python-iniparse.spec	10 Sep 2007 10:38:07 -0000	1.5
@@ -2,12 +2,13 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
+Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools-devel
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-
+%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -48,6 +49,8 @@
 
 %changelog
 
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
 - Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:18:51 -0000	1.3
+++ sources	10 Sep 2007 10:38:07 -0000	1.4
@@ -1 +1,2 @@
 0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch



From fedora-extras-commits at redhat.com  Mon Sep 10 10:49:09 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:49:09 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec,1.2,1.3
Message-ID: <200709101049.l8AAn9NI008477@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441

Modified Files:
	python-iniparse.spec 
Log Message:
Release 0.2.1-3


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:21:04 -0000	1.2
+++ python-iniparse.spec	10 Sep 2007 10:48:29 -0000	1.3
@@ -2,12 +2,13 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
+Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-
+%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -47,6 +48,9 @@
 
 
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3



From fedora-extras-commits at redhat.com  Mon Sep 10 10:55:19 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 06:55:19 -0400
Subject: rpms/python-iniparse/F-7 sources,1.3,1.4
Message-ID: <200709101055.l8AAtJBe008682@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8639

Modified Files:
	sources 
Log Message:
Release 0.2.1-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:21:04 -0000	1.3
+++ sources	10 Sep 2007 10:54:41 -0000	1.4
@@ -1 +1,2 @@
 0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch



From fedora-extras-commits at redhat.com  Mon Sep 10 11:52:20 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 07:52:20 -0400
Subject: rpms/bzflag/devel bzflag.spec,1.31,1.32
Message-ID: <200709101152.l8ABqKUF016776@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	bzflag.spec 
Log Message:
drop blurb about upstream being ambigous about the license, they really intended LGPL V2.1 and nothing else



Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bzflag.spec	5 Sep 2007 13:02:06 -0000	1.31
+++ bzflag.spec	10 Sep 2007 11:51:47 -0000	1.32
@@ -16,7 +16,7 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
@@ -96,11 +96,8 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-5
-- change license tag from LGPL to LGPLv2, the licensing is a bit ambigious
-  about if it's "V2.1 only" or "V2.1 or later". I've requested upstream to
-  clarify this:
-  http://sf.net/tracker/?func=detail&aid=1788424&group_id=3248&atid=103248
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.8-6
+- change license tag from LGPL to LGPLv2
 
 * Fri Jun 22 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license tag from GPL to LGPL



From fedora-extras-commits at redhat.com  Mon Sep 10 11:57:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 10 Sep 2007 07:57:35 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.31,1.32
Message-ID: <200709101157.l8ABvZCw017298@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17244

Modified Files:
	man-pages-fr.spec 
Log Message:
rhbz#273941 doesn't install linkchecker man page.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- man-pages-fr.spec	22 Aug 2007 13:10:48 -0000	1.31
+++ man-pages-fr.spec	10 Sep 2007 11:57:03 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.40.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -73,6 +73,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
 # latex2rtf
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# linuxchecker
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/linkchecker.1
 # man
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
@@ -104,6 +106,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Mon Sep 10 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-9
+- 273941 doesn't install linkchecker man page
+
 * Wed Aug 22 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-1
 - new version from upstream
 - check license



From fedora-extras-commits at redhat.com  Mon Sep 10 12:17:34 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 08:17:34 -0400
Subject: rpms/yum-utils/devel .cvsignore, 1.13, 1.14 sources, 1.15,
	1.16 yum-utils.spec, 1.23, 1.24
Message-ID: <200709101217.l8ACHY3V024024@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23988

Modified Files:
	.cvsignore sources yum-utils.spec 
Log Message:
Release 1.1.7-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Jul 2007 13:27:47 -0000	1.13
+++ .cvsignore	10 Sep 2007 12:17:02 -0000	1.14
@@ -1 +1 @@
-yum-utils-1.1.6.tar.gz
+yum-utils-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Jul 2007 13:27:47 -0000	1.15
+++ sources	10 Sep 2007 12:17:02 -0000	1.16
@@ -1 +1 @@
-e7ad94116fdb343da0153f8fe556afd6  yum-utils-1.1.6.tar.gz
+6680e58d20b07507f09bd6ab6f9d435c  yum-utils-1.1.7.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- yum-utils.spec	24 Jul 2007 13:27:47 -0000	1.23
+++ yum-utils.spec	10 Sep 2007 12:17:02 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -175,6 +175,17 @@
 and so on).Therefore, the plugin functions well even without
 compiling careful lists of all important packages.
 
+%package -n yum-basearchonly
+Summary: Yum plugin to let Yum install only basearch packages.
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-basearchonly
+this plugin makes Yum only install basearch packages on multiarch systems.
+If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed.
+If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'.
+The plugin only works with 'yum install'.
+
 
 %prep
 %setup -q
@@ -185,7 +196,10 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf security protect-packages"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \
+         downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \
+         security protect-packages basearchonly"
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -309,7 +323,18 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf
 /usr/lib/yum-plugins/protect-packages.*
 
+%files -n yum-basearchonly
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf
+/usr/lib/yum-plugins/basearchonly.*
+
+
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <tla at rasmil.dk>
+- mark as 1.1.7
+* Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
+- Added basearchonly plugin by Adel Gadllah
 * Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark as 1.1.6
 * Tue Jul 17 2007 Tim Lauridsen <tla at rasmil.dk>



From fedora-extras-commits at redhat.com  Mon Sep 10 12:18:42 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Mon, 10 Sep 2007 08:18:42 -0400
Subject: rpms/yum-utils/F-7 sources,1.15,1.16 yum-utils.spec,1.23,1.24
Message-ID: <200709101218.l8ACIga1024134@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yum-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24053

Modified Files:
	sources yum-utils.spec 
Log Message:
Release 1.1.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Jul 2007 13:29:51 -0000	1.15
+++ sources	10 Sep 2007 12:18:09 -0000	1.16
@@ -1 +1 @@
-e7ad94116fdb343da0153f8fe556afd6  yum-utils-1.1.6.tar.gz
+6680e58d20b07507f09bd6ab6f9d435c  yum-utils-1.1.7.tar.gz


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/F-7/yum-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- yum-utils.spec	24 Jul 2007 13:29:51 -0000	1.23
+++ yum-utils.spec	10 Sep 2007 12:18:09 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -175,6 +175,17 @@
 and so on).Therefore, the plugin functions well even without
 compiling careful lists of all important packages.
 
+%package -n yum-basearchonly
+Summary: Yum plugin to let Yum install only basearch packages.
+Group: System Environment/Base
+Requires: yum >= 3.0
+
+%description -n yum-basearchonly
+this plugin makes Yum only install basearch packages on multiarch systems.
+If you type 'yum install foo' on a x68_64 system, only 'foo-x.y.x86_46.rpm' is installed.
+If you want to install the foo-x.y.i386.rpm, you have to type 'yum install foo.i386'.
+The plugin only works with 'yum install'.
+
 
 %prep
 %setup -q
@@ -185,7 +196,10 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # Plugins to install
-plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf security protect-packages"
+plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module \
+         downloadonly allowdowngrade skip-broken priorities refresh-updatesd merge-conf \
+         security protect-packages basearchonly"
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -309,7 +323,18 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protect-packages.conf
 /usr/lib/yum-plugins/protect-packages.*
 
+%files -n yum-basearchonly
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/basearchonly.conf
+/usr/lib/yum-plugins/basearchonly.*
+
+
 %changelog
+
+* Mon Sep 10 2007 Tim Lauridsen <tla at rasmil.dk>
+- mark as 1.1.7
+* Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
+- Added basearchonly plugin by Adel Gadllah
 * Tue Jul 24 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark as 1.1.6
 * Tue Jul 17 2007 Tim Lauridsen <tla at rasmil.dk>



From fedora-extras-commits at redhat.com  Mon Sep 10 12:20:23 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Sep 2007 08:20:23 -0400
Subject: fedora-security/audit fc7,1.94,1.95
Message-ID: <200709101220.l8ACKNRK024303@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230

Modified Files:
	fc7 
Log Message:
lighttpd



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fc7	7 Sep 2007 08:42:54 -0000	1.94
+++ fc7	10 Sep 2007 12:20:21 -0000	1.95
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070907
 # Up to date FC7 as of 20070905
 
+CVE-2007-4727 VULNERABLE (lighttpd) #284511
 CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode



From fedora-extras-commits at redhat.com  Mon Sep 10 12:31:31 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:31:31 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.10,1.11
Message-ID: <200709101231.l8ACVVOR024827@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24794

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Build for all supported arquitectures



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-subclipse.spec	9 Sep 2007 21:42:59 -0000	1.10
+++ eclipse-subclipse.spec	10 Sep 2007 12:30:58 -0000	1.11
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -47,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -238,6 +238,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-7
+- Build for all supported arquitectures
+
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
 - Change MANIFEST.MF patch to be applied on prep stage
 



From fedora-extras-commits at redhat.com  Mon Sep 10 12:36:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Sep 2007 08:36:29 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.10, 1.11 im-chooser.spec, 1.18, 
	1.19 sources, 1.9, 1.10
Message-ID: <200709101236.l8ACaTg4025083@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25043

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 07:32:03 -0000	1.10
+++ .cvsignore	10 Sep 2007 12:35:57 -0000	1.11
@@ -10,3 +10,4 @@
 im-chooser-0.4.0.tar.gz
 im-chooser-0.4.1.tar.gz
 im-chooser-0.5.0.tar.gz
+im-chooser-0.5.1.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- im-chooser.spec	6 Sep 2007 07:32:04 -0000	1.18
+++ im-chooser.spec	10 Sep 2007 12:35:57 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		im-chooser
-Version:	0.5.0
+Version:	0.5.1
 Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
+- New upstream release.
+
 * Thu Sep  6 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.0-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Sep 2007 07:32:04 -0000	1.9
+++ sources	10 Sep 2007 12:35:57 -0000	1.10
@@ -1 +1 @@
-4dfee80e78c97bedcfbb9fcc8e3df977  im-chooser-0.5.0.tar.gz
+4c2b6eba1dd41ff0c5baaca5dc15f2a4  im-chooser-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 12:44:28 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:44:28 -0400
Subject: rpms/ganymed-ssh2/devel ganymed-ssh2.spec,1.6,1.7
Message-ID: <200709101244.l8ACiSZ6025441@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Modified Files:
	ganymed-ssh2.spec 
Log Message:
Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/devel/ganymed-ssh2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ganymed-ssh2.spec	29 Aug 2007 05:35:20 -0000	1.6
+++ ganymed-ssh2.spec	10 Sep 2007 12:43:55 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 12:46:51 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 08:46:51 -0400
Subject: rpms/svnkit/devel svnkit.spec,1.3,1.4
Message-ID: <200709101246.l8ACkprm025579@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25540

Modified Files:
	svnkit.spec 
Log Message:
Build for all supported arquitectures



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svnkit.spec	29 Aug 2007 05:36:52 -0000	1.3
+++ svnkit.spec	10 Sep 2007 12:46:18 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.2-5
+- Build for all supported arquitectures 
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:05:57 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 09:05:57 -0400
Subject: rpms/gimp-help/devel gimp-help.spec,1.13,1.14
Message-ID: <200709101305.l8AD5v9U032310@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp-help/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32279

Modified Files:
	gimp-help.spec 
Log Message:
change licensing tag to GFDL



Index: gimp-help.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-help/devel/gimp-help.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gimp-help.spec	8 Aug 2007 14:36:02 -0000	1.13
+++ gimp-help.spec	10 Sep 2007 13:05:23 -0000	1.14
@@ -4,8 +4,8 @@
 Summary: Help files for the GIMP.
 Name: gimp-help
 Version: %(echo %gimphelpver|cut -d- -f1)
-Release: 0.1.%(echo %gimphelpver|cut -d- -f2)%{?dist}
-License: GNU FDL
+Release: 0.2.%(echo %gimphelpver|cut -d- -f2)%{?dist}
+License: GFDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
 Source: ftp://ftp.gimp.org/pub/gimp/help/gimp-help-%{gimphelpver}.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.2.0.13
+- change licensing tag to GFDL
+
 * Wed Aug 08 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.13
 - version 2-0.13
 - don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing



From fedora-extras-commits at redhat.com  Mon Sep 10 13:07:33 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 10 Sep 2007 09:07:33 -0400
Subject: rpms/seaview/devel .cvsignore, 1.2, 1.3 seaview-chris.patch, 1.1,
	1.2 seaview.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709101307.l8AD7Xrd032396@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/pkgs/rpms/seaview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32356

Modified Files:
	.cvsignore seaview-chris.patch seaview.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jun 2007 22:04:42 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:06:59 -0000	1.3
@@ -1 +1 @@
-seaview.tar
+seaview_2.0.tar.gz

seaview-chris.patch:

Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview-chris.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview-chris.patch	28 Jun 2007 22:04:42 -0000	1.1
+++ seaview-chris.patch	10 Sep 2007 13:06:59 -0000	1.2
@@ -1,6 +1,6 @@
 --- seaview/Makefile.chris	2007-05-07 11:08:57.000000000 +0200
 +++ seaview/Makefile	2007-05-07 11:11:44.000000000 +0200
-@@ -3,25 +3,26 @@
+@@ -3,26 +3,27 @@
  #seaviewps  does not use the PDFLibLite library and outputs postscript 
  
  #customize these next 3 lines
@@ -16,6 +16,7 @@
 +HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
  
  CXX = g++
+ CC = gcc
  
 -OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
 +#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
@@ -35,8 +36,8 @@
 +#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
  
  
- OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
-@@ -37,8 +38,8 @@
+ OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
+@@ -38,8 +39,8 @@
  
  seaviewps : seaview.o $(OBJECTS) postscript.o
  	$(CXX) $(DEBUG)  seaview.o $(OBJECTS) postscript.o \


Index: seaview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/seaview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seaview.spec	16 Aug 2007 22:17:54 -0000	1.2
+++ seaview.spec	10 Sep 2007 13:06:59 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           seaview
-Version:        0
-Release:        0.1.20070616%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Graphical multiple sequence alignment editor
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://pbil.univ-lyon1.fr/software/seaview.html
-Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview.tar
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_2.0.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream version, with a true version number :)
+
 * Thu Aug 16 2007 Christian Iseli <Christian.Iseli at licr.org> 0-0.1.20070616
  - Fix License tag to GPLv2+.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jun 2007 22:04:42 -0000	1.2
+++ sources	10 Sep 2007 13:06:59 -0000	1.3
@@ -1 +1 @@
-df7b54c231a5af24246e8129575717c1  seaview.tar
+72ff14e3511b88d26281accf16597534  seaview_2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 13:10:33 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:10:33 -0400
Subject: rpms/firefox/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 firefox.spec, 1.194, 1.195
Message-ID: <200709101310.l8ADAXfE032542@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32467

Modified Files:
	firefox-1.5-pango-underline.patch firefox.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	9 Jul 2007 10:15:21 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:10:00 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- firefox.spec	6 Sep 2007 14:26:15 -0000	1.194
+++ firefox.spec	10 Sep 2007 13:10:00 -0000	1.195
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -438,6 +438,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
+- added fix for #246248 - firefox crashes when searching for word "do"
+
 * Thu Sep  6 2007 Christopher Aillon <caillon at redhat.com> - 2.0.0.6-6
 - Fix default page for all locales
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:17:40 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Sep 2007 09:17:40 -0400
Subject: rpms/graphviz/EL-4 graphviz.spec,1.10,1.11
Message-ID: <200709101317.l8ADHeex000410@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/graphviz/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv372

Modified Files:
	graphviz.spec 
Log Message:

* Mon Sep 10 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-4
- Bump-n-build to fix libperl.so dependency



Index: graphviz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/graphviz/EL-4/graphviz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- graphviz.spec	19 Jul 2007 21:45:17 -0000	1.10
+++ graphviz.spec	10 Sep 2007 13:17:08 -0000	1.11
@@ -4,7 +4,7 @@
 Name:				graphviz
 
 Version:			2.6
-Release:			3%{?dist}
+Release:			4%{?dist}
 
 Group:				Applications/Multimedia
 License:			CPL
@@ -137,6 +137,9 @@
 %{_bindir}/dot -c
 
 %changelog
+* Mon Sep 10 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-4
+- Bump-n-build to fix libperl.so dependency
+
 * Thu Jul 19 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.6-3
 - Uncommenting %%excludes to exclude erroneously installed ltdl libs
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:22:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:22:45 -0400
Subject: rpms/TeXmacs/F-7 .cvsignore, 1.27, 1.28 TeXmacs.spec, 1.49,
	1.50 sources, 1.28, 1.29 TeXmacs-1.0.6.10-qual.patch, 1.1, NONE
Message-ID: <200709101322.l8ADMjZ0000689@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv653

Modified Files:
	.cvsignore TeXmacs.spec sources 
Removed Files:
	TeXmacs-1.0.6.10-qual.patch 
Log Message:
new release 1.0.6.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 May 2007 13:08:11 -0000	1.27
+++ .cvsignore	10 Sep 2007 13:22:12 -0000	1.28
@@ -1 +1 @@
-TeXmacs-1.0.6.10-src.tar.gz
+TeXmacs-1.0.6.11-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/TeXmacs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- TeXmacs.spec	4 Jul 2007 08:19:18 -0000	1.49
+++ TeXmacs.spec	10 Sep 2007 13:22:12 -0000	1.50
@@ -1,15 +1,14 @@
 Name:		TeXmacs
-Version:	1.0.6.10
-Release:	3%{?dist}
+Version:	1.0.6.11
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.10-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.11-src.tar.gz
 Patch2:		TeXmacs-event.patch
 Patch5:         TeXmacs-1.6.0.7-rdelim.patch
-Patch6:         TeXmacs-1.0.6.10-qual.patch
 Patch7:         TeXmacs-1.0.6.10-psfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex
@@ -57,7 +56,6 @@
 %setup -q -n TeXmacs-%{version}-src
 %patch2 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
@@ -158,6 +156,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.11-1
+- new release 1.0.6.11
+
 * Fri Jun 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.10-3
 - ps generation fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-7/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 May 2007 13:08:11 -0000	1.28
+++ sources	10 Sep 2007 13:22:12 -0000	1.29
@@ -1 +1 @@
-5b5dbd678529bf346e1b67059bda7b57  TeXmacs-1.0.6.10-src.tar.gz
+c05875cf7ae502578d50e07709cab9e1  TeXmacs-1.0.6.11-src.tar.gz


--- TeXmacs-1.0.6.10-qual.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 13:25:31 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:25:31 -0400
Subject: rpms/TeXmacs/devel .cvsignore, 1.27, 1.28 TeXmacs.spec, 1.50,
	1.51 sources, 1.28, 1.29 TeXmacs-1.0.6.10-qual.patch, 1.1, NONE
Message-ID: <200709101325.l8ADPV1w000876@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831

Modified Files:
	.cvsignore TeXmacs.spec sources 
Removed Files:
	TeXmacs-1.0.6.10-qual.patch 
Log Message:
new release 1.0.6.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 May 2007 13:08:11 -0000	1.27
+++ .cvsignore	10 Sep 2007 13:24:58 -0000	1.28
@@ -1 +1 @@
-TeXmacs-1.0.6.10-src.tar.gz
+TeXmacs-1.0.6.11-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- TeXmacs.spec	29 Aug 2007 04:11:18 -0000	1.50
+++ TeXmacs.spec	10 Sep 2007 13:24:58 -0000	1.51
@@ -158,8 +158,8 @@
 
 
 %changelog
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.6.10-4
-- Rebuild for selinux ppc32 issue.
+* Mon Sep 10 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.11-1
+- new release 1.0.6.11
 
 * Fri Jun 29 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.10-3
 - ps generation fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 May 2007 13:08:11 -0000	1.28
+++ sources	10 Sep 2007 13:24:58 -0000	1.29
@@ -1 +1 @@
-5b5dbd678529bf346e1b67059bda7b57  TeXmacs-1.0.6.10-src.tar.gz
+c05875cf7ae502578d50e07709cab9e1  TeXmacs-1.0.6.11-src.tar.gz


--- TeXmacs-1.0.6.10-qual.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 13:27:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 10 Sep 2007 09:27:07 -0400
Subject: rpms/TeXmacs/devel TeXmacs.spec,1.51,1.52
Message-ID: <200709101327.l8ADR7U4000999@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv949

Modified Files:
	TeXmacs.spec 
Log Message:
new release 1.0.6.11


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TeXmacs.spec	10 Sep 2007 13:24:58 -0000	1.51
+++ TeXmacs.spec	10 Sep 2007 13:26:35 -0000	1.52
@@ -1,15 +1,14 @@
 Name:		TeXmacs
-Version:	1.0.6.10
-Release:	4%{?dist}
+Version:	1.0.6.11
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.10-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.11-src.tar.gz
 Patch2:		TeXmacs-event.patch
 Patch5:         TeXmacs-1.6.0.7-rdelim.patch
-Patch6:         TeXmacs-1.0.6.10-qual.patch
 Patch7:         TeXmacs-1.0.6.10-psfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex
@@ -57,7 +56,6 @@
 %setup -q -n TeXmacs-%{version}-src
 %patch2 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:27:53 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 09:27:53 -0400
Subject: rpms/svnkit/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.4, 1.5
Message-ID: <200709101327.l8ADRrWB001143@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
Update to upstream 1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 13:14:17 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:27:20 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 13:14:17 -0000	1.2
+++ sources	10 Sep 2007 13:27:20 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svnkit.spec	10 Sep 2007 12:46:18 -0000	1.4
+++ svnkit.spec	10 Sep 2007 13:27:20 -0000	1.5
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -118,7 +118,8 @@
 
 
 %changelog
-* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.2-5
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
 - Build for all supported arquitectures 
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4



From fedora-extras-commits at redhat.com  Mon Sep 10 13:29:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:29:56 -0400
Subject: rpms/thunderbird/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 thunderbird.spec, 1.102, 1.103
Message-ID: <200709101329.l8ADTusu001291@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Modified Files:
	firefox-1.5-pango-underline.patch thunderbird.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	23 Dec 2006 21:05:09 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:29:23 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- thunderbird.spec	13 Aug 2007 20:28:29 -0000	1.102
+++ thunderbird.spec	10 Sep 2007 13:29:23 -0000	1.103
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -314,6 +314,9 @@
 #===============================================================================
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+- added fix for #246248 - firefox crashes when searching for word "do"
+
 * Mon Aug 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-2
 - Update the license tag
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:31:29 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Sep 2007 09:31:29 -0400
Subject: rpms/seamonkey/devel firefox-1.5-pango-underline.patch, 1.1,
	1.2 seamonkey.spec, 1.26, 1.27
Message-ID: <200709101331.l8ADVTRg001394@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1355

Modified Files:
	firefox-1.5-pango-underline.patch seamonkey.spec 
Log Message:
* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 1.1.3-8
- added fix for #246248 - firefox crashes when searching for word "do"



firefox-1.5-pango-underline.patch:

Index: firefox-1.5-pango-underline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/firefox-1.5-pango-underline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-pango-underline.patch	27 Jul 2007 12:34:15 -0000	1.1
+++ firefox-1.5-pango-underline.patch	10 Sep 2007 13:31:26 -0000	1.2
@@ -12,9 +12,9 @@
 -      PRInt32 i;
 +      PRUint32 startOffset = 0;
 +      PRUint32 textWidth = 0;
-+      PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
-+      PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
-+      PRUint32 i;
++      PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex));
++      PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex));
++      PRInt32 i;
        if ((start < end) && ((aLength - start) > 0))
        {
          //aDetails allready processed to have offsets from frame start not content offsets


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- seamonkey.spec	28 Aug 2007 11:06:25 -0000	1.26
+++ seamonkey.spec	10 Sep 2007 13:31:26 -0000	1.27
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -429,6 +429,8 @@
 
 
 %changelog
+* Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 1.1.3-8
+- added fix for #246248 - firefox crashes when searching for word "do"
 * Tue Aug 28 2007 Kai Engert <kengert at redhat.com> - 1.1.3-7
 - Updated license tag
 * Mon Aug 7 2007 Martin Stransky <stransky at redhat.com> 1.1.3-6



From fedora-extras-commits at redhat.com  Mon Sep 10 13:37:05 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 10 Sep 2007 09:37:05 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.484,1.485
Message-ID: <200709101337.l8ADb5ee001659@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1606

Modified Files:
	eclipse.spec 
Log Message:
* Mon Sep 10 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-19
- Don't require subclipse, cdt, or rpm-editor on ppc64.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- eclipse.spec	7 Sep 2007 18:51:16 -0000	1.484
+++ eclipse.spec	10 Sep 2007 13:36:32 -0000	1.485
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        18%{?dist} 
+Release:        19%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -224,12 +224,14 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-Requires: eclipse-subclipse
-Requires: eclipse-changelog
-Requires: eclipse-rpm-editor
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+# no CDT -> no changelog -> no rpm-editor
+# (upstream does not support ppc64)
 %ifnarch ppc64 alpha
+Requires: eclipse-subclipse
+Requires: eclipse-changelog
+Requires: eclipse-rpm-editor
 Requires: eclipse-mylyn
 Requires: eclipse-mylyn-ide
 Requires: eclipse-mylyn-bugzilla
@@ -1577,6 +1579,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 13:38:19 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 10 Sep 2007 09:38:19 -0400
Subject: rpms/seaview/F-7 .cvsignore, 1.2, 1.3 seaview-chris.patch, 1.1,
	1.2 seaview.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709101338.l8ADcJ3W001793@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/pkgs/rpms/seaview/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1736

Modified Files:
	.cvsignore seaview-chris.patch seaview.spec sources 
Log Message:
New upstream version.  Fix license tag.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2007 06:20:34 -0000	1.2
+++ .cvsignore	10 Sep 2007 13:37:46 -0000	1.3
@@ -1 +1 @@
-seaview.tar
+seaview_2.0.tar.gz

seaview-chris.patch:

Index: seaview-chris.patch
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/seaview-chris.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview-chris.patch	29 Jun 2007 06:20:34 -0000	1.1
+++ seaview-chris.patch	10 Sep 2007 13:37:46 -0000	1.2
@@ -1,6 +1,6 @@
 --- seaview/Makefile.chris	2007-05-07 11:08:57.000000000 +0200
 +++ seaview/Makefile	2007-05-07 11:11:44.000000000 +0200
-@@ -3,25 +3,26 @@
+@@ -3,26 +3,27 @@
  #seaviewps  does not use the PDFLibLite library and outputs postscript 
  
  #customize these next 3 lines
@@ -16,6 +16,7 @@
 +HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
  
  CXX = g++
+ CC = gcc
  
 -OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
 +#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
@@ -35,8 +36,8 @@
 +#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
  
  
- OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
-@@ -37,8 +38,8 @@
+ OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
+@@ -38,8 +39,8 @@
  
  seaviewps : seaview.o $(OBJECTS) postscript.o
  	$(CXX) $(DEBUG)  seaview.o $(OBJECTS) postscript.o \


Index: seaview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/seaview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seaview.spec	29 Jun 2007 06:20:34 -0000	1.1
+++ seaview.spec	10 Sep 2007 13:37:46 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           seaview
-Version:        0
-Release:        0.1.20070615%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Graphical multiple sequence alignment editor
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://pbil.univ-lyon1.fr/software/seaview.html
-Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview.tar
+Source0:        ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/seaview_2.0.tar.gz
 Source1:        seaview.desktop
 Patch0:         seaview-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream version, with a true version number :)
+ - Fix License tag to GPLv2+.
+
 * Thu Jun 28 2007 Christian Iseli <Christian.Iseli at licr.org> 0-0.1.20070615
  - New upstream tarball.
  - Add desktop file and icon.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seaview/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2007 06:20:34 -0000	1.2
+++ sources	10 Sep 2007 13:37:46 -0000	1.3
@@ -1 +1 @@
-df7b54c231a5af24246e8129575717c1  seaview.tar
+72ff14e3511b88d26281accf16597534  seaview_2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 14:19:10 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 10:19:10 -0400
Subject: rpms/gnome-web-photo import.log,1.1,1.2
Message-ID: <200709101419.l8AEJAZO009403@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363

Modified Files:
	import.log 
Log Message:
Upload gnome-web-photo, the HTML page thumbnailer



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2007 22:50:18 -0000	1.1
+++ import.log	10 Sep 2007 14:18:37 -0000	1.2
@@ -0,0 +1 @@
+gnome-web-photo-0_3-4:HEAD:gnome-web-photo-0.3-4.src.rpm:1189433869



From fedora-extras-commits at redhat.com  Mon Sep 10 14:19:12 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 10:19:12 -0400
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709101419.l8AEJCa0009407@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-web-photo.spec 
Log Message:
Upload gnome-web-photo, the HTML page thumbnailer



--- NEW FILE gnome-web-photo.spec ---
Summary: HTML pages thumbnailer
Name: gnome-web-photo
Version: 0.3
Release: 4%{?dist}
License: LGPLv2+
Group: Applications/Internet
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/%{name}-%{version}.tar.bz2

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): GConf2
Requires(preun): GConf2
BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libxml2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: gecko-devel >= 1.8
BuildRequires: libjpeg-devel
BuildRequires: gettext perl(XML::Parser)

%description
gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
including the file manager, to generate screenshots of web pages.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

mv $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/thumbnailer.schemas \
	$RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas

%find_lang %{name}

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/gnome-web-photo.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/gnome-web-photo.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/gnome-web-photo.schemas >& /dev/null
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog AUTHORS README TODO COPYING.README
%{_sysconfdir}/gconf/schemas/gnome-web-photo.schemas
%{_bindir}/*
%{_datadir}/gnome-web-photo

%changelog
* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-4
- Fix license, as mentioned by Kevin Fenzi

* Thu Sep 06 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-3
- Update following Matthias Clasen's comments

* Wed Sep 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-2
- Update following Peter Gordon's comments

* Tue Mar 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
- First post!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:50:20 -0000	1.1
+++ .cvsignore	10 Sep 2007 14:18:40 -0000	1.2
@@ -0,0 +1 @@
+gnome-web-photo-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:50:20 -0000	1.1
+++ sources	10 Sep 2007 14:18:40 -0000	1.2
@@ -0,0 +1 @@
+1c9cdf4ce25b58641e0af16215c413a5  gnome-web-photo-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 14:32:36 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Mon, 10 Sep 2007 10:32:36 -0400
Subject: rpms/koan/devel koan.spec,1.21,1.22
Message-ID: <200709101432.l8AEWaB0010063@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018

Modified Files:
	koan.spec 
Log Message:
Updating to 0.6.1-2 to fix EVR




Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- koan.spec	30 Aug 2007 16:41:20 -0000	1.21
+++ koan.spec	10 Sep 2007 14:32:04 -0000	1.22
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
-Release: 2%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Mon Sep 04 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-1
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 14:44:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 10 Sep 2007 10:44:09 -0400
Subject: rpms/kernel/devel kernel.spec, 1.152,
	1.153 linux-2.6-x86-debug-boot.patch, 1.3, 1.4
Message-ID: <200709101444.l8AEi9Cw010675@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10643

Modified Files:
	kernel.spec linux-2.6-x86-debug-boot.patch 
Log Message:
* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
- x86: fix debug early boot



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kernel.spec	7 Sep 2007 18:32:07 -0000	1.152
+++ kernel.spec	10 Sep 2007 14:43:37 -0000	1.153
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86: fix debug early boot
+
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86: debug early boot
 

linux-2.6-x86-debug-boot.patch:

Index: linux-2.6-x86-debug-boot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-debug-boot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86-debug-boot.patch	7 Sep 2007 18:32:07 -0000	1.3
+++ linux-2.6-x86-debug-boot.patch	10 Sep 2007 14:43:37 -0000	1.4
@@ -17,7 +17,7 @@
  	}
  
  	/* Make sure we have all the proper CPU support */
-+	puts("A");
++	putchar('A');
  	if (validate_cpu()) {
  		puts("Unable to boot - please use a kernel appropriate "
  		     "for your CPU.\n");
@@ -25,84 +25,80 @@
  	}
  
  	/* Tell the BIOS what CPU mode we intend to run in. */
-+	puts("B");
++	putchar('B');
  	set_bios_mode();
  
  	/* Detect memory layout */
-+	puts("C");
++	putchar('C');
  	detect_memory();
  
  	/* Set keyboard repeat rate (why?) */
-+	puts("D");
++	putchar('D');
  	keyboard_set_repeat();
  
  	/* Set the video mode */
-+	puts("E");
++	putchar('E');
  	set_video();
  
  	/* Query MCA information */
-+	puts("F");
++	putchar('F');
  	query_mca();
  
  	/* Voyager */
  #ifdef CONFIG_X86_VOYAGER
-+	puts("G");
++	putchar('G');
  	query_voyager();
  #endif
  
-+	puts("H");
++	putchar('H');
  	/* Query Intel SpeedStep (IST) information */
  	query_ist();
  
  	/* Query APM information */
  #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+	puts("I");
++	putchar('I');
  	query_apm_bios();
  #endif
  
  	/* Query EDD information */
  #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
-+	puts("J");
++	putchar('J');
  	query_edd();
  #endif
  	/* Do the last things and invoke protected mode */
-+	puts("K");
++	putchar('K');
  	go_to_protected_mode();
  }
 --- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c
 +++ linux-2.6.22.noarch/arch/i386/boot/pm.c
-@@ -145,26 +145,34 @@ static void setup_idt(void)
+@@ -145,24 +145,30 @@ static void setup_idt(void)
  void go_to_protected_mode(void)
  {
  	/* Hook before leaving real mode, also disables interrupts */
-+	puts("L");
++	putchar('L');
  	realmode_switch_hook();
  
  	/* Move the kernel/setup to their final resting places */
-+	puts("M");
++	putchar('M');
  	move_kernel_around();
  
  	/* Enable the A20 gate */
-+	puts("N");
++	putchar('N');
  	if (enable_a20()) {
  		puts("A20 gate not responding, unable to boot...\n");
  		die();
  	}
  
  	/* Reset coprocessor (IGNNE#) */
-+	puts("O");
++	putchar('O');
  	reset_coprocessor();
  
  	/* Mask all interrupts in the PIC */
-+	puts("P");
++	putchar('P');
  	mask_all_interrupts();
  
  	/* Actual transition to protected mode... */
-+	puts("Q");
++	puts("Q\n");
  	setup_idt();
-+	puts("R");
  	setup_gdt();
-+	puts("S\n");
  	protected_mode_jump(boot_params.hdr.code32_start,
- 			    (u32)&boot_params + (ds() << 4));
- }



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:31 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 10 Sep 2007 10:57:31 -0400
Subject: rpms/widelands/F-7 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 widelands.flagfix.patch, 1.1, 1.2 widelands.spec, 1.2,
	1.3 widelands.workfix.patch, 1.1, NONE
Message-ID: <200709101457.l8AEvV3b011357@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237/widelands/F-7

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Removed Files:
	widelands.workfix.patch 
Log Message:
Upgrade to build-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 May 2007 09:29:12 -0000	1.2
+++ .cvsignore	10 Sep 2007 14:56:58 -0000	1.3
@@ -1 +1 @@
-widelands-build10-source.tar.bz2
+widelands-build-11-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 May 2007 09:29:12 -0000	1.2
+++ sources	10 Sep 2007 14:56:58 -0000	1.3
@@ -1 +1 @@
-9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2
+ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.flagfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- widelands.flagfix.patch	7 May 2007 09:29:12 -0000	1.1
+++ widelands.flagfix.patch	10 Sep 2007 14:56:58 -0000	1.2
@@ -1,10 +1,12 @@
---- ./build/scons-tools/scons_configure.py.flagfix	2007-03-04 18:25:06.000000000 +0100
-+++ ./build/scons-tools/scons_configure.py	2007-04-30 11:41:58.000000000 +0200
-@@ -319,57 +319,4 @@
+diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
+--- ./build/scons-tools/scons_configure.py.flagfix	2007-06-03 17:17:45.000000000 +0200
++++ ./build/scons-tools/scons_configure.py	2007-09-08 00:03:37.000000000 +0200
+@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en
  			print 'Could not find efence, so doing a debug-efence build is impossible !'
  			env.Exit(1)
  
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
+-	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -	conf.CheckCompilerFlag('-Wall', env)
 -	conf.CheckCompilerFlag('-Wcast-align', env)
@@ -59,3 +61,4 @@
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
+


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widelands.spec	8 May 2007 17:41:50 -0000	1.2
+++ widelands.spec	10 Sep 2007 14:56:58 -0000	1.3
@@ -1,18 +1,17 @@
-%define build_id build10
+%define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.4.%{build_id}%{?dist}
+Release:        0.6.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.widelands.org
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
-Patch0:         widelands.workfix.patch
-Patch1:         widelands.flagfix.patch
+Patch0:         widelands.flagfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
 BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags 
 %ifnarch ppc64
 BuildRequires: optipng
@@ -30,18 +29,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
-sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-sed -i 's#doc#txts##' txts/SConscript
 
 %build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
-scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
+scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
 
@@ -73,11 +68,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -90,6 +89,10 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
+- Upgrade to build-11
+* Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10
+- Patching for compatibility with scons 0.97
 * Tue May 08 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.4.build10
 - Change BRs for ppc64
 * Sun May 06 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.3.build10


--- widelands.workfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:33 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 10 Sep 2007 10:57:33 -0400
Subject: rpms/widelands/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 widelands.flagfix.patch, 1.2, 1.3 widelands.spec, 1.3,
	1.4 widelands.scons.patch, 1.1, NONE widelands.workfix.patch,
	1.1, NONE
Message-ID: <200709101457.l8AEvXQn011368@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237/widelands/devel

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Removed Files:
	widelands.scons.patch widelands.workfix.patch 
Log Message:
Upgrade to build-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 May 2007 09:29:12 -0000	1.2
+++ .cvsignore	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-widelands-build10-source.tar.bz2
+widelands-build-11-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 May 2007 09:29:12 -0000	1.2
+++ sources	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2
+ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.flagfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widelands.flagfix.patch	26 Aug 2007 00:26:10 -0000	1.2
+++ widelands.flagfix.patch	10 Sep 2007 14:57:01 -0000	1.3
@@ -1,10 +1,12 @@
---- ./build/scons-tools/scons_configure.py.flagfix	2007-08-25 13:36:07.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py	2007-08-25 13:47:16.000000000 +0200
-@@ -259,57 +259,4 @@ def do_configure(config_h_file, conf, en
+diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
+--- ./build/scons-tools/scons_configure.py.flagfix	2007-06-03 17:17:45.000000000 +0200
++++ ./build/scons-tools/scons_configure.py	2007-09-08 00:03:37.000000000 +0200
+@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en
  			print 'Could not find efence, so doing a debug-efence build is impossible !'
  			env.Exit(1)
  
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
+-	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -	conf.CheckCompilerFlag('-Wall', env)
 -	conf.CheckCompilerFlag('-Wcast-align', env)
@@ -59,3 +61,4 @@
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
+


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.spec	26 Aug 2007 00:26:10 -0000	1.3
+++ widelands.spec	10 Sep 2007 14:57:01 -0000	1.4
@@ -1,19 +1,17 @@
-%define build_id build10
+%define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.5.%{build_id}%{?dist}
+Release:        0.6.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.widelands.org
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
-Patch0:         widelands.workfix.patch
-Patch1:         widelands.flagfix.patch
-Patch2:         widelands.scons.patch
+Patch0:         widelands.flagfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
 BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags 
 %ifnarch ppc64
 BuildRequires: optipng
@@ -31,19 +29,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-sed -i 's#doc#txts##' txts/SConscript
 
 %build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
-scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
+scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
 
@@ -75,11 +68,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -92,6 +89,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
+- Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10
 - Patching for compatibility with scons 0.97
 * Tue May 08 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.4.build10


--- widelands.scons.patch DELETED ---


--- widelands.workfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 14:57:41 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 10:57:41 -0400
Subject: rpms/pcmanx-gtk2/F-7 pcmanx-gtk2.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709101457.l8AEvffr011376@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11259

Modified Files:
	pcmanx-gtk2.spec sources 
Log Message:
- upgrade to svn 355
- clean up packager's name in .spec file



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/pcmanx-gtk2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcmanx-gtk2.spec	16 Apr 2007 18:22:24 -0000	1.1
+++ pcmanx-gtk2.spec	10 Sep 2007 14:57:09 -0000	1.2
@@ -1,11 +1,11 @@
 # Source package is generated using:
 #        1. svn co https://svn.csie.net/pcmanx/trunk pcmanx-gtk2
 #        2. tar czvf pcmanx-gtk2.tar.gz pcmanx-gtk2
-%define    alphatag 336svn
+%define    alphatag 355svn
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
-Version:   0.3.5
-Release:   9.%{alphatag}%{?dist}
+Version:   0.3.6
+Release:   1.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,35 +84,38 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
+* Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
+- svn 355
+
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-9.336svn
 - remove README. Its content is not useful for end users
 
-* Sat Apr 14 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
+* Sat Apr 14 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-8.336svn
 - fix build in rawhide (automake 1.10)
 - use svn revision number instead of checkout date
 
-* Fri Apr  6 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
+* Fri Apr  6 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-7.20070406svn
 - fix svn build
 - svn 20070406
 
-* Fri Mar 30 2007 Leo, Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
+* Fri Mar 30 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-6.20070330svn
 - svn 20070330
 - enable libnotify support
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-5
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-5
 - Remove X-Fedora category in desktop file
 
-* Sat Jan 13 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-4
+* Sat Jan 13 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-4
 - Add gettext to BuildRequires
 - remove deprecated categories in desktop file
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-3
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-3
 - fix debuginfo rpm issues
 - fix desktop file issues
 - remove unnecessary update-desktop-database scriptlets (no Mimetypes entry in desktop file)
 
-* Fri Jan 12 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-2
+* Fri Jan 12 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-2
 - Move desktop-file-utils to BuildRequires
 
-* Wed Jan 10 2007 Shidai Liu, Leo <sdl.web at gmail.com> 0.3.5-1
+* Wed Jan 10 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.5-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2007 18:22:24 -0000	1.2
+++ sources	10 Sep 2007 14:57:09 -0000	1.3
@@ -1 +1 @@
-4be1a6f2ec82064128ee4c0addf4faed  pcmanx-gtk2.tar.gz
+3e9f23fb8f051a4c099599f27616a687  pcmanx-gtk2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 14:59:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 10:59:39 -0400
Subject: rpms/cvs2cl/EL-5 cvs2cl-2.67-man.patch, NONE, 1.1 cvs2cl.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200709101459.l8AExd9Z011574@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvs2cl/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11528

Modified Files:
	cvs2cl.spec sources 
Added Files:
	cvs2cl-2.67-man.patch 
Log Message:
Sync with devel for first EPEL build

cvs2cl-2.67-man.patch:

--- NEW FILE cvs2cl-2.67-man.patch ---
--- cvs2cl~	2007-08-02 04:50:07.000000000 +0300
+++ cvs2cl	2007-08-13 22:43:54.000000000 +0300
@@ -2945,3 +2945,3 @@
 
-=item, B<--group-within-date>
+=item B<--group-within-date>
 


Index: cvs2cl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2cl/EL-5/cvs2cl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cvs2cl.spec	30 Mar 2007 21:48:02 -0000	1.12
+++ cvs2cl.spec	10 Sep 2007 14:59:07 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           cvs2cl
-Version:        2.60
+Version:        2.67
 Release:        1%{?dist}
 Summary:        Generate ChangeLogs from CVS working copies
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://www.red-bean.com/cvs2cl/
 Source0:        http://www.red-bean.com/cvs2cl/cvs2cl.pl
 Source1:        http://www.red-bean.com/cvs2cl/changelog.dtd
@@ -16,6 +16,7 @@
 Source7:        http://www.red-bean.com/cvs2cl/cl2html_rss-karaguezian.xslt
 Source8:        http://www.red-bean.com/cvs2cl/ChangeLog.xsd
 Patch0:         %{name}-2.60-perldeps.patch
+Patch1:         %{name}-2.67-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,15 +24,16 @@
 Requires:       xml-common
 
 %description
-cvs2cl generates GNU-style ChangeLogs for a CVS working copy using
-the output of the "cvs log" command. The script originaly came from
-the open source CVS book at http://cvsbook.red-bean.com/.
+cvs2cl generates GNU-style ChangeLogs for a CVS working copy using the
+output of the "cvs log" command.  The script originally came from the
+open source CVS book at http://cvsbook.red-bean.com/.
 
 
 %prep
 %setup -c -T
 sed -e 's/cvs2cl\.pl/cvs2cl/' %{SOURCE0} > cvs2cl
 %patch0
+%patch1
 
 
 %build
@@ -71,6 +73,14 @@
 
 
 %changelog
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.67-1
+- 2.67 + man page fix.
+- Fix spelling error in %%description.
+- License: GPLv2+
+
+* Tue Apr 24 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.62-1
+- 2.62.
+
 * Sat Mar 31 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.60-1
 - 2.60.
 - Dependency fixups.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvs2cl/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2007 21:48:02 -0000	1.3
+++ sources	10 Sep 2007 14:59:07 -0000	1.4
@@ -4,6 +4,6 @@
 f5af372c18e9199955d87f9da009b697  cl2html-ciaglia.xslt
 1b6c38d10a73eb1667550d2b56bcf3b9  cl2html_rss-karaguezian.xslt
 de54d6ce72570c845ef5a0dcc8bf9399  cl2html.xslt
-30b45da870831c764473e63e5dfd8fe5  cvs2cl.pl
 f7d7cf88b314c0cb1a16c8c93d1c8e54  cvs2cl_ruether.xslt
 6c521f9e2b2ae5fbcee63b3c2f47d607  filter-cvs2cl.xslt
+cf85f85fdbb8d8d115895e955c46732c  cvs2cl.pl



From fedora-extras-commits at redhat.com  Mon Sep 10 15:06:44 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:06:44 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-ldap-configuration.patch, 1.6,
	1.7 dhcp.spec, 1.169, 1.170
Message-ID: <200709101506.l8AF6ia7017981@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956

Modified Files:
	dhcp-3.0.5-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
- Fix typos in ldap.c and correct LDAP macros (#283391)


dhcp-3.0.5-ldap-configuration.patch:

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-3.0.5-ldap-configuration.patch	1 Apr 2007 20:52:27 -0000	1.6
+++ dhcp-3.0.5-ldap-configuration.patch	10 Sep 2007 15:06:40 -0000	1.7
@@ -143,12 +143,12 @@
  #endif
  
 +#if defined(LDAP_CONFIGURATION)
-+# define SV_LDAP_SERVER  		46
-+# define SV_LDAP_PORT  			47
-+# define SV_LDAP_USERNAME  		48
-+# define SV_LDAP_PASSWORD  		49
-+# define SV_LDAP_BASE_DN 		50
-+# define SV_LDAP_METHOD			51
++# define SV_LDAP_SERVER  		47
++# define SV_LDAP_PORT  			48
++# define SV_LDAP_USERNAME  		49
++# define SV_LDAP_PASSWORD  		50
++# define SV_LDAP_BASE_DN 		51
++# define SV_LDAP_METHOD			52
 +#endif
 +
  #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
@@ -521,7 +521,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -545,7 +545,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -556,7 +556,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpPermitList")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -589,7 +589,7 @@
 +
 +  for (i=0; search[i] != NULL; i++)
 +    {
-+      if ((ldap_method = LDAP_METHOD_DYNAMIC) &&
++      if ((ldap_method == LDAP_METHOD_DYNAMIC) &&
 +          (strcmp (search[i], "dhcpHostDN") == 0))
 +        continue;
 +
@@ -644,7 +644,7 @@
 +    
 +  ignore = 0;
 +  found = 1;
-+  for (i=0; objectClass[i]->bv_val != NULL; i++)
++  for (i=0; objectClass[i] != NULL && objectClass[i]->bv_val != NULL; i++)
 +    {
 +      if (strcmp (objectClass[i]->bv_val, "dhcpSharedNetwork") == 0)
 +        ldap_parse_shared_network (item, cfile);
@@ -693,7 +693,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpOption")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, "option ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
@@ -704,7 +704,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpStatements")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -885,7 +885,7 @@
 +  if (ldap_server == NULL || ldap_username == NULL || ldap_password == NULL ||
 +      ldap_base_dn == NULL)
 +    {
-+      log_info ("Not searching LDAP since ldap-server, ldap-port, ldap-username, ldap-password and ldap-baes-dn were not specified in the config file");
++      log_info ("Not searching LDAP since ldap-server, ldap-username, ldap-password and ldap-base-dn were not specified in the config file");
 +      disable_ldap = 1;
 +      return;
 +    }
@@ -1180,7 +1180,7 @@
 +  *option_buffer = '\0';
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpStatements")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          if (strncasecmp ("lease limit ", temp[i]->bv_val, 12) == 0)
 +            {
@@ -1196,7 +1196,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpOption")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (option_buffer, "option ", sizeof (option_buffer) - strlen (option_buffer) - 1);
 +          strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1);


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- dhcp.spec	4 Sep 2007 15:54:47 -0000	1.169
+++ dhcp.spec	10 Sep 2007 15:06:40 -0000	1.170
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  4%{?dist}
+Release:  5%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
+- Fix typos in ldap.c and correct LDAP macros (#283391)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
 - Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:07:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Mon, 10 Sep 2007 11:07:46 -0400
Subject: comps/po pl.po,1.3,1.4
Message-ID: <200709101507.l8AF7kPV018076@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18041/comps/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pl.po	10 Sep 2007 15:07:16 -0000	1.4
@@ -10,13 +10,12 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-02-23 00:19+0200\n"
+"PO-Revision-Date: 2007-09-10 17:06+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl 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.9.1\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -397,16 +396,14 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "Ta grupa jest zbiorem program??w dla r????nych narz??dzi sprz??towych."
+msgstr "Ta grupa jest zbiorem serwer??w sieciowych do r????nych zastosowa??"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowiskarabskich."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -416,17 +413,15 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk hebrajskich."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk japo??skich."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
@@ -494,19 +489,17 @@
 msgstr "Obs??uga czeskiego"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk ormia??skich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk czeskich."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Obs??uga afrykanerskiego"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "Obs??uga kanadyjskiego"
+msgstr "Obs??uga alba??skiego"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -529,23 +522,20 @@
 msgstr "Obs??uga baskijskiego"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "Obs??uga bu??garskiego"
+msgstr "Obs??uga bia??oruskiego"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "Obs??uga bengalskiego"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "Obs??uga chi??skiego"
+msgstr "Obs??uga buta??skiego"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "Obs??uga esto??skiego"
+msgstr "Obs??uga bo??niackiego"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -624,9 +614,8 @@
 msgstr "Obs??uga farerskiego"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "Obs??uga galisyjskiego"
+msgstr "Obs??uga filipino"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -653,9 +642,8 @@
 msgstr "Obs??uga galisyjskiego"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga gruzi??skiego"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -693,9 +681,8 @@
 "serwer druku."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "Obs??uga zuluskiego"
+msgstr "Obs??uga inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -718,9 +705,8 @@
 msgstr "Obs??uga kannada"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga khmerskiego"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -731,14 +717,12 @@
 msgstr "J??zyki"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "Obs??uga tajskiego"
+msgstr "Obs??uga laota??skiego"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "Obs??uga chorwackiego"
+msgstr "Obs??uga ??otewskiego"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -765,9 +749,8 @@
 msgstr "Obs??uga malajalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "Obs??uga marathi"
+msgstr "Obs??uga maoryskiego"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -790,9 +773,8 @@
 msgstr "Obs??uga oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "Obs??uga serbskiego"
+msgstr "Obs??uga perskiego"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -827,9 +809,8 @@
 msgstr "Obs??uga rosyjskiego"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga samoa??skiego"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -856,9 +837,8 @@
 msgstr "Najmniejsza mo??liwa instalacja"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somail Support"
-msgstr "Obs??uga swati"
+msgstr "Obs??uga somalijskiego"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -889,9 +869,8 @@
 msgstr "Obs??uga szwedzkiego"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "Obs??uga tamilskiego"
+msgstr "Obs??uga tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -997,14 +976,12 @@
 "Ta grupa pakiet??w zawiera przydatne narz??dzia do u??ywania z PostgreSQL."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "Obs??uga niemieckiego"
+msgstr "Obs??uga tybeta??skiego"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "Obs??uga tsonga"
+msgstr "Obs??uga tonga"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1023,18 +1000,16 @@
 msgstr "Obs??uga ukrai??skiego"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "Obs??uga zuluskiego"
+msgstr "Obs??uga urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "Obs??uga venda"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "Obs??uga chi??skiego"
+msgstr "Obs??uga wietnamskiego"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1062,373 +1037,40 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Grupa systemu budowania"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Eclipse Fedory"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "Czcionki"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "Pakiety czcionek do wy??wietlania tekstu w ??rodowisku graficznym."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Zintegrowane ??rodowisko programistyczne Eclipse."
+msgstr "Zintegrowane ??rodowisko programistyczne oparte na Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "Przestarza??e czcionki"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "Obs??uga tajskiego"
+msgstr "Obs??uga dolnosakso??skiego"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "Obs??uga esto??skiego"
+msgstr "Obs??uga mongolskiego"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "Obs??uga bengalskiego"
+msgstr "Obs??uga nepalskiego"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Obs??uga brazylijskiego"
-
-#~ msgid "British Support"
-#~ msgstr "Obs??uga brytyjskiego"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodno??ci"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Obs??uga architektur zgodnych z Mozill??"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Obs??uga architektur zgodno??ci"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Obs??uga cyrylicy"
-
-#~ msgid "Desktops"
-#~ msgstr "??rodowiska graficzne"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "Obs??uga ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "Obs??uga ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "Obs??uga ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "Obs??uga ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Zainstaluj te pakiety, aby ponownie skompilowa?? j??dro."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "??rodowisko graficzne KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Programowanie j??dra"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "R????ne zawarte pakiety"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Pakiety Mozilli dla platformy x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Pakiety obs??ugi Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "Baza danych SQL"
-
-#~ msgid "Server"
-#~ msgstr "Serwer"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "Obs??uga tworzenia pakiet??w dla innych architektur ni?? podstawowa"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Obs??uga syryjskiego"
-
-#~ msgid "System"
-#~ msgstr "System"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "Edytor tekstu GNU Emacs."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "Te pakiety pozwalaj?? na skonfigurowanie serwera pocztowego IMAP lub "
-#~ "Postfix."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Te pakiety dostarczaj?? obs??ug?? zgodno??ci z poprzednimi wydaniami Red Hat "
-#~ "Enterprise Linuksa."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Nieobs??ugiwane biblioteki programistyczne"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Typowa stacja robocza"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Obs??uga architektur zgodnych z PPC64"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodnych z x86"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Obs??uga zgodno??ci z architektur?? x86"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "brazylijski portugalski"
-
-#~ msgid "English"
-#~ msgstr "angielski"
-
-#~ msgid "French"
-#~ msgstr "francuski"
-
-#~ msgid "German"
-#~ msgstr "niemiecki"
-
-#~ msgid "Italian"
-#~ msgstr "w??oski"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Dokumentacja Red Hat Enterprise Linuksa 3"
-
-#~ msgid "Spanish"
-#~ msgstr "hiszpa??ski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "portugalskim brazylijskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "angielskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "francuskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "niemieckim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku w??oskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "hiszpa??skim."
-
-#~ msgid "Japanese"
-#~ msgstr "japo??ski"
-
-#~ msgid "Korean"
-#~ msgstr "korea??ski"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "chi??ski uproszczony"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "japo??skim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "korea??skim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "chi??skim uproszczonym."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "chi??skim tradycyjnym."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "chi??ski tradycyjny"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Obs??uga tworzenia oprogramowania dla architektur zgodnych z PPC64"
-
-#~ msgid "Bengali"
-#~ msgstr "bengalski"
-
-#~ msgid "Gujarati"
-#~ msgstr "gud??arati"
-
-#~ msgid "Hindi"
-#~ msgstr "hindi"
-
-#~ msgid "Punjabi"
-#~ msgstr "pend??abi"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Dokumentacja Red Hat Enterprise Linuksa 4"
-
-#~ msgid "Tamil"
-#~ msgstr "tamilski"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "bengalskim."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "gud??arati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku hindi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacj?? Red Hat Enterprise Linuksa w j??zyku "
-#~ "pend??abi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Ta grupa zawiera dokumentacje Red Hat Enterprise Linuksa w j??zyku "
-#~ "tamilskim."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Klastrowa pami???? masowa"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Obs??uga klastr??w."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pakiety dostarczaj??ce obs??ug?? klastrowej pami??ci masowej."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pakiety dostarczaj??ce obs??ug?? jednow??z??owego GFS."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Obs??uga jednow??z??owego GFS"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "Te pakiety zapewniaj?? obs??ug?? zgodno??ci z poprzednimi wydaniami."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "??rodowiska wykonawcze i zestawy programistyczne"
-
-#~ msgid "Misc"
-#~ msgstr "R????ne"
-
-#~ msgid "Misc packages"
-#~ msgstr "R????ne pakiety"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Aplikacje multimedialne"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pakiety dostarczaj??ce dodatkow?? funkcjonalno???? dla Red Hat Enterprise "
-#~ "Linuksa"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Stacja robocza"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Aplikacje i narz??dzia stacji roboczej."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Obs??uga wirtualizacji."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Architektura zgodno??ci"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Biblioteki architektury zgodno??ci"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Pakiety biblioteki Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "Pakiety dostarczaj??ce funkcjonalno???? architektury zgodno??ci."
+msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"



From fedora-extras-commits at redhat.com  Mon Sep 10 15:08:52 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:08:52 -0400
Subject: rpms/dhcp/F-7 dhcp-3.0.5-ldap-configuration.patch, 1.6,
	1.7 dhcp.spec, 1.165, 1.166
Message-ID: <200709101508.l8AF8qXI018195@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18164

Modified Files:
	dhcp-3.0.5-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-40
- Fix typos in ldap.c and correct LDAP macros (#283391)


dhcp-3.0.5-ldap-configuration.patch:

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcp-3.0.5-ldap-configuration.patch	1 Apr 2007 20:52:27 -0000	1.6
+++ dhcp-3.0.5-ldap-configuration.patch	10 Sep 2007 15:08:48 -0000	1.7
@@ -143,12 +143,12 @@
  #endif
  
 +#if defined(LDAP_CONFIGURATION)
-+# define SV_LDAP_SERVER  		46
-+# define SV_LDAP_PORT  			47
-+# define SV_LDAP_USERNAME  		48
-+# define SV_LDAP_PASSWORD  		49
-+# define SV_LDAP_BASE_DN 		50
-+# define SV_LDAP_METHOD			51
++# define SV_LDAP_SERVER  		47
++# define SV_LDAP_PORT  			48
++# define SV_LDAP_USERNAME  		49
++# define SV_LDAP_PASSWORD  		50
++# define SV_LDAP_BASE_DN 		51
++# define SV_LDAP_METHOD			52
 +#endif
 +
  #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
@@ -521,7 +521,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -545,7 +545,7 @@
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
 +    {
 +      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
@@ -556,7 +556,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpPermitList")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (cfile->inbuf, temp[i]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -589,7 +589,7 @@
 +
 +  for (i=0; search[i] != NULL; i++)
 +    {
-+      if ((ldap_method = LDAP_METHOD_DYNAMIC) &&
++      if ((ldap_method == LDAP_METHOD_DYNAMIC) &&
 +          (strcmp (search[i], "dhcpHostDN") == 0))
 +        continue;
 +
@@ -644,7 +644,7 @@
 +    
 +  ignore = 0;
 +  found = 1;
-+  for (i=0; objectClass[i]->bv_val != NULL; i++)
++  for (i=0; objectClass[i] != NULL && objectClass[i]->bv_val != NULL; i++)
 +    {
 +      if (strcmp (objectClass[i]->bv_val, "dhcpSharedNetwork") == 0)
 +        ldap_parse_shared_network (item, cfile);
@@ -693,7 +693,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpOption")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, "option ", LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
@@ -704,7 +704,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, item->ldent, "dhcpStatements")) != NULL)
 +    {
-+      for (j=0; temp[j]->bv_val != NULL; j++)
++      for (j=0; temp[j] != NULL && temp[j]->bv_val != NULL; j++)
 +        {
 +          strncat (cfile->inbuf, temp[j]->bv_val, LDAP_BUFFER_SIZE);
 +          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
@@ -885,7 +885,7 @@
 +  if (ldap_server == NULL || ldap_username == NULL || ldap_password == NULL ||
 +      ldap_base_dn == NULL)
 +    {
-+      log_info ("Not searching LDAP since ldap-server, ldap-port, ldap-username, ldap-password and ldap-baes-dn were not specified in the config file");
++      log_info ("Not searching LDAP since ldap-server, ldap-username, ldap-password and ldap-base-dn were not specified in the config file");
 +      disable_ldap = 1;
 +      return;
 +    }
@@ -1180,7 +1180,7 @@
 +  *option_buffer = '\0';
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpStatements")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          if (strncasecmp ("lease limit ", temp[i]->bv_val, 12) == 0)
 +            {
@@ -1196,7 +1196,7 @@
 +
 +  if ((temp = ldap_get_values_len (ld, ent, "dhcpOption")) != NULL)
 +    {
-+      for (i=0; temp[i]->bv_val != NULL; i++)
++      for (i=0; temp[i] != NULL && temp[i]->bv_val != NULL; i++)
 +        {
 +          strncat (option_buffer, "option ", sizeof (option_buffer) - strlen (option_buffer) - 1);
 +          strncat (option_buffer, temp[i]->bv_val, sizeof (option_buffer) - strlen (option_buffer) - 1);


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- dhcp.spec	4 Sep 2007 15:53:38 -0000	1.165
+++ dhcp.spec	10 Sep 2007 15:08:48 -0000	1.166
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  39%{?dist}
+Release:  40%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -434,6 +434,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-40
+- Fix typos in ldap.c and correct LDAP macros (#283391)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
 - Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:10:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:10:57 -0400
Subject: rpms/cd-discid/EL-5 cd-discid.spec,1.6,1.7
Message-ID: <200709101510.l8AFAvMT018439@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cd-discid/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366

Modified Files:
	cd-discid.spec 
Log Message:
Sync with devel for first EPEL build


Index: cd-discid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/EL-5/cd-discid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cd-discid.spec	29 Aug 2006 19:24:33 -0000	1.6
+++ cd-discid.spec	10 Sep 2007 15:10:24 -0000	1.7
@@ -1,10 +1,12 @@
 Name:           cd-discid
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Utility to get CDDB discid information
 
 Group:          Applications/Multimedia
-License:        GPL
+# Also "Larry Wall's Artistic" upstream, but that's not accepted in Fedora
+License:        GPLv2+
+URL:            http://freshmeat.net/projects/cddiscid/
 Source0:        http://www.hispalinux.es/~data/files/cd-discid/cd-discid_%{version}.orig.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +42,10 @@
 
 
 %changelog
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-7
+- License: GPLv2+
+- Add URL.
+
 * Tue Aug 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:11:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Mon, 10 Sep 2007 11:11:24 -0400
Subject: comps/po pl.po,1.4,1.5
Message-ID: <200709101511.l8AFBO3Q018503@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18419/comps/po

Modified Files:
	pl.po 
Log Message:
Oops


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pl.po	10 Sep 2007 15:07:16 -0000	1.4
+++ pl.po	10 Sep 2007 15:10:54 -0000	1.5
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-09-10 17:06+0200\n"
+"PO-Revision-Date: 2007-09-10 17:10+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -403,7 +403,7 @@
 #: ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowiskarabskich."
+msgstr "Ta grupa jest zbiorem narz??dzi i zasob??w dla ??rodowisk arabskich."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63



From fedora-extras-commits at redhat.com  Mon Sep 10 15:16:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 10 Sep 2007 11:16:47 -0400
Subject: rpms/telepathy-salut/OLPC-2 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-salut.spec, 1.10, 1.11
Message-ID: <200709101516.l8AFGlmV020189@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20149

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2007 20:14:55 -0000	1.8
+++ .cvsignore	10 Sep 2007 15:16:15 -0000	1.9
@@ -5,3 +5,4 @@
 telepathy-salut-0.1.3.1.20070715darcs.tar.gz
 telepathy-salut-0.1.3.1.20070720darcs.tar.gz
 telepathy-salut-0.1.4.1.20070829darcs.tar.gz
+telepathy-salut-0.1.4.1.20070910darcs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2007 20:14:55 -0000	1.8
+++ sources	10 Sep 2007 15:16:15 -0000	1.9
@@ -1 +1 @@
-6035391907667734d6817f4409771cdf  telepathy-salut-0.1.4.1.20070829darcs.tar.gz
+97805603ffdda441c4894a69197583a1  telepathy-salut-0.1.4.1.20070910darcs.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- telepathy-salut.spec	29 Aug 2007 21:14:45 -0000	1.10
+++ telepathy-salut.spec	10 Sep 2007 15:16:15 -0000	1.11
@@ -1,10 +1,10 @@
-%define darcsdate 20070829darcs
+%define darcsdate 20070910darcs
 
 %define telepathy_glib_version 0.5.14
 
 Name:           telepathy-salut
 Version:        0.1.4.1
-Release:        0.2.%{darcsdate}%{?dist}
+Release:        0.3.%{darcsdate}%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
+- New snapshot
+
 * Wed Aug 29 2007 John (J5) Palmieri <johnp at redhat.com> - 0.1.4.1-0.2.20070829darcs.olpc2
 - Build against telepathy-glib-0.5.14
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:18:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:18:22 -0400
Subject: rpms/xine-lib/EL-5 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xine-lib.spec, 1.9, 1.10
Message-ID: <200709101518.l8AFIMLi020358@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20278

Modified Files:
	.cvsignore sources xine-lib.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Jul 2007 09:13:26 -0000	1.7
+++ .cvsignore	10 Sep 2007 15:17:50 -0000	1.8
@@ -1,2 +1,2 @@
-xine-lib-1.1.7-pruned.tar.bz2
-xine-lib-1.1.7-autotools.patch.bz2
+xine-lib-1.1.8-pruned.tar.bz2
+xine-lib-1.1.8-autotools.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2007 09:13:26 -0000	1.7
+++ sources	10 Sep 2007 15:17:50 -0000	1.8
@@ -1,2 +1,2 @@
-8f0714de28dab403288bbccf1a8c30c2  xine-lib-1.1.7-pruned.tar.bz2
-6b7f1d168b8b367a8c7709db687c60f6  xine-lib-1.1.7-autotools.patch.bz2
+6cbfae9d31fc138c7cb3c3d178e1286d  xine-lib-1.1.8-pruned.tar.bz2
+b4a7c7a9af428b26667402d6dc180107  xine-lib-1.1.8-autotools.patch.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xine-lib.spec	14 Jul 2007 09:13:26 -0000	1.9
+++ xine-lib.spec	10 Sep 2007 15:17:50 -0000	1.10
@@ -1,6 +1,11 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
-# - xcb stuff when it's available
+# - drop the opengl video out plugin?
+#   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
+# - move pulseaudio to main package from -extras?
+#   http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
+#   --> not yet:
+#    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
@@ -8,12 +13,17 @@
 %else
 %define         have_vidix 0
 %endif
+%if 0%{?fedora} >= 8
+%define         with_xcb 1
+%else
+%define         with_xcb 0
+%endif
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.7
-Release:        1%{?dist}
-License:        GPL
+Version:        1.1.8
+Release:        2%{?dist}
+License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
@@ -29,7 +39,11 @@
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
-BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
+BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel
+BuildRequires:  libGLU-devel
+%if %{with_xcb}
+BuildRequires:  libxcb-devel
+%endif
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
@@ -61,6 +75,13 @@
 Requires:        %{name} = %{version}-%{release}
 Requires:        pkgconfig zlib-devel
 
+%package arts
+Summary:         aRts plugin for xine-lib
+Group:           System Environment/Libraries
+Requires:        %{name} = %{version}-%{release}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:       xine-lib-extras < 1.1.7-3
+
 %package extras
 Summary:         Additional plugins for xine-lib
 Group:           System Environment/Libraries
@@ -81,9 +102,11 @@
 %description devel
 This package contains development files for xine-lib.
 
+%description arts
+This package contains the aRts extra plugin for xine-lib.
+
 %description extras
 This package contains extra plugins for xine-lib:
-  - aRts
   - EsounD
   - JACK
   - Pulseaudio
@@ -99,7 +122,9 @@
 %if 0%{!?_without_directfb:1}
   - DirectFB output
 %endif
-
+%if %{with_xcb}
+  - XCB output
+%endif
 
 
 %prep
@@ -121,36 +146,37 @@
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
-%configure --disable-dependency-tracking \
-    --with-xv-path=%{_libdir} \
-    --with-w32-path=%{codecdir} \
-    --with-real-codecs-path=%{codecdir} \
-    --with-external-ffmpeg \
-    --with-external-libmpcdec \
-    --with-libflac \
-    --with-wavpack \
-    --with-arts \
+# Keep list of options in mostly the same order as ./configure --help.
+%configure \
+    --disable-dependency-tracking \
     --enable-ipv6 \
 %if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif
-%if 0%{?_without_imagemagick:1}
-    --without-imagemagick \
-%endif
+%endif # directfb
+    --disable-a52dec \
+    --disable-mad \
+    --disable-dvdnavtest --with-external-dvdnav \
+    --disable-vcd \
+    --disable-asf \
+    --disable-faad \
 %if 0%{?_with_freetype:1}
-    --with-freetype \
-    --with-fontconfig \
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
-%endif
-%endif
-    --disable-libfame \
-    --disable-faad \
-    --disable-mad \
-    --disable-asf \
-    --disable-vcd \
-    --disable-a52dec \
-    --with-external-dvdnav --disable-dvdnavtest
+%endif # antialiasing
+    --with-freetype \
+    --with-fontconfig \
+%endif # freetype
+    --with-external-ffmpeg \
+    --with-xv-path=%{_libdir} \
+    --with-libflac \
+    --with-external-libmpcdec \
+%if 0%{?_without_imagemagick:1}
+    --without-imagemagick \
+%endif # imagemagick
+    --with-arts \
+    --with-wavpack \
+    --with-real-codecs-path=%{codecdir} \
+    --with-w32-path=%{codecdir}
 
 make %{?_smp_mflags}
 
@@ -282,9 +308,12 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
 
-%files extras
+%files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
+
+%files extras
+%defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
@@ -301,6 +330,10 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
 %endif
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif
 
 
 %files devel
@@ -316,9 +349,29 @@
 
 
 %changelog
+* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+  provide an upgrade path
+
+* Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
+- Split the aRts plugin into its own subpackage
+
+* Tue Aug 14 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-2
+- Include XCB output plugins (in -extras at least for now).
+- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
+- Clean up %%configure options.
+- License: GPLv2+
+
 * Thu Jun  7 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.7-1
 - 1.1.7.
 
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
+- respin (for libmpcdec)
+
 * Wed Apr 25 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.6-2
 - Make Real codec search path /usr/lib(64)/codecs again (#237743).
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:18:49 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 11:18:49 -0400
Subject: rpms/eclipse-subclipse/devel subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse.spec, 1.11,
	1.12 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709101518.l8AFInDl020375@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20305

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
update to upstream 1.2.4



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 15:12:49 -0000	1.5
+++ .cvsignore	10 Sep 2007 15:18:16 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-subclipse.spec	10 Sep 2007 12:30:58 -0000	1.11
+++ eclipse-subclipse.spec	10 Sep 2007 15:18:16 -0000	1.12
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        7%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,7 +26,7 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
@@ -238,7 +238,8 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
-* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-7
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
 - Build for all supported arquitectures
 
 * Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 15:12:49 -0000	1.5
+++ sources	10 Sep 2007 15:18:16 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:22:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:22:09 -0400
Subject: rpms/abcde/EL-5 abcde.spec,1.12,1.13
Message-ID: <200709101522.l8AFM9ea020580@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20541

Modified Files:
	abcde.spec 
Log Message:
Sync with devel for first EPEL build


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/EL-5/abcde.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- abcde.spec	29 Aug 2006 21:29:11 -0000	1.12
+++ abcde.spec	10 Sep 2007 15:21:37 -0000	1.13
@@ -1,10 +1,12 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
-License:        GPL or Artistic
+# Also "Larry Wall's Artistic" upstream, but the original Artistic is
+# not accepted in Fedora
+License:        GPLv2+
 URL:            http://www.hispalinux.es/~data/abcde.php
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-2.1.19-inst.patch
@@ -31,6 +33,9 @@
 mv examples/cue2discid .
 
 
+%build
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall \
@@ -55,6 +60,10 @@
 
 
 %changelog
+* Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
+- License: GPLv2+
+- Add (empty) %%build section.
+
 * Tue Aug 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-2
 - Change vorbis-tools and flac dependencies to Requires(hint), drop
   speex dependency.



From fedora-extras-commits at redhat.com  Mon Sep 10 15:23:21 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 10 Sep 2007 11:23:21 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.18, 1.19 sources, 
	1.18, 1.19 sugar-presence-service.spec, 1.18, 1.19
Message-ID: <200709101523.l8AFNL1R020653@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20614

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	9 Sep 2007 04:30:38 -0000	1.18
+++ .cvsignore	10 Sep 2007 15:22:48 -0000	1.19
@@ -1,2 +1,3 @@
 sugar-presence-service-0.65-gita79f7b6488.tar.bz2
 sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
+sugar-presence-service-0.65-git3ed091301b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Sep 2007 04:30:38 -0000	1.18
+++ sources	10 Sep 2007 15:22:48 -0000	1.19
@@ -1 +1 @@
-6fe20b5dc4e20c40bc24ada12e6ba2ce  sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
+58fd9f1225a3d7bbc3d1f4d713d403b9  sugar-presence-service-0.65-git3ed091301b.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sugar-presence-service.spec	9 Sep 2007 04:30:38 -0000	1.18
+++ sugar-presence-service.spec	10 Sep 2007 15:22:48 -0000	1.19
@@ -1,9 +1,9 @@
-%define alphatag 20070909git
-%define commitid 3b1f4a0c42
+%define alphatag 20070910git
+%define commitid 3ed091301b
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.13.%{alphatag}3b1f4a0c42
+Release: 0.14.%{alphatag}3ed091301b
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.13.20070909git3b1f4a0c42
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:26:25 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 11:26:25 -0400
Subject: rpms/xsc/devel xsc.spec,1.1,1.2
Message-ID: <200709101526.l8AFQPEX020869@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20837

Modified Files:
	xsc.spec 
Log Message:
BR fix.



Index: xsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/xsc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsc.spec	9 Sep 2007 23:10:51 -0000	1.1
+++ xsc.spec	10 Sep 2007 15:25:53 -0000	1.2
@@ -10,6 +10,7 @@
 Source1: xsc.desktop
 Source2: xsc.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
+BuildRequires: libXt-devel, desktop-file-utils
 Requires: hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Mon Sep 10 15:36:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 11:36:22 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.10,1.11
Message-ID: <200709101536.l8AFaMhs021510@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	xine-lib.spec 
Log Message:
* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
- Adjust default -extras feature set for EPEL-5.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xine-lib.spec	10 Sep 2007 15:17:50 -0000	1.10
+++ xine-lib.spec	10 Sep 2007 15:35:50 -0000	1.11
@@ -9,20 +9,32 @@
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
-%define         have_vidix 1
+    %define     have_vidix  1
 %else
-%define         have_vidix 0
+    %define     have_vidix  0
 %endif
 %if 0%{?fedora} >= 8
-%define         with_xcb 1
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
-%define         with_xcb 0
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+%if 0%{?fedora}
+    %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
+    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%else
+    %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
+    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
+    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
+    %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%endif
+%define         with_dfb    %{?_without_directfb:0}%{!?_without_directfb:1}
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -43,25 +55,34 @@
 BuildRequires:  libGLU-devel
 %if %{with_xcb}
 BuildRequires:  libxcb-devel
-%endif
+%endif # xcb
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
 BuildRequires:  directfb-devel
-%endif
+%endif # dfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
 %if 0%{?_with_freetype:1}
 BuildRequires:  fontconfig-devel
-%endif
+%endif # freetype
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  wavpack-devel libmpcdec-devel
+%if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires:  jack-audio-connection-kit-devel
+%endif # jack
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -93,11 +114,9 @@
 It can play back various media. It also decodes multimedia files from local
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  Non-default rpmbuild options:
---without imagemagick:  Disable ImageMagick support
---without directfb:     Disable DirectFB support
---with    freetype:     Enable FreeType/Fontconfig support
---with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too.  --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -108,23 +127,31 @@
 %description extras
 This package contains extra plugins for xine-lib:
   - EsounD
+%if %{with_jack}
   - JACK
+%endif # jack
+%if %{with_pa}
   - Pulseaudio
+%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
   - SDL
+%if %{with_aalib}
   - AA-lib
+%endif # aalib
+%if %{with_caca}
   - Libcaca
+%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
-%endif
-%if 0%{!?_without_directfb:1}
+%endif # imagemagick
+%if %{with_dfb}
   - DirectFB output
-%endif
+%endif # dfb
 %if %{with_xcb}
   - XCB output
-%endif
+%endif # xcb
 
 
 %prep
@@ -150,9 +177,9 @@
 %configure \
     --disable-dependency-tracking \
     --enable-ipv6 \
-%if 0%{!?_without_directfb:1}
+%if %{with_dfb}
     --enable-directfb \
-%endif # directfb
+%endif # dfb
     --disable-a52dec \
     --disable-mad \
     --disable-dvdnavtest --with-external-dvdnav \
@@ -241,7 +268,7 @@
 %{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -252,7 +279,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
@@ -262,7 +289,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
@@ -300,7 +327,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
@@ -315,25 +342,33 @@
 %files extras
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%endif # dfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
 %if %{with_xcb}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif
+%endif # xcb
 
 
 %files devel
@@ -349,6 +384,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
+- Adjust default -extras feature set for EPEL-5.
+
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to
   provide an upgrade path



From fedora-extras-commits at redhat.com  Mon Sep 10 15:43:31 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Sep 2007 11:43:31 -0400
Subject: devel/python python-2.5.1-plural-fix.patch, NONE, 1.1 python.spec, 
	1.117, 1.118
Message-ID: <200709101543.l8AFhVtV021879@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21838

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-plural-fix.patch 
Log Message:
* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
- work around problems with multi-line plural specification (#252136)


python-2.5.1-plural-fix.patch:

--- NEW FILE python-2.5.1-plural-fix.patch ---
diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py
--- Python-2.5.1/Lib/gettext.py.plural	2007-09-10 11:38:57.000000000 -0400
+++ Python-2.5.1/Lib/gettext.py	2007-09-10 11:39:00.000000000 -0400
@@ -299,6 +299,8 @@ class GNUTranslations(NullTranslations):
                     item = item.strip()
                     if not item:
                         continue
+                    if item.startswith("#"):
+                        continue
                     if ':' in item:
                         k, v = item.split(':', 1)
                         k = k.strip().lower()


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- python.spec	28 Aug 2007 13:50:29 -0000	1.117
+++ python.spec	10 Sep 2007 15:42:58 -0000	1.118
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -33,6 +33,7 @@
 Patch3: python-2.4.1-canonicalize.patch
 Patch4: python-2.5-cflags.patch
 Patch5: python-2.5.1-ctypes-exec-stack.patch
+Patch6: python-2.5.1-plural-fix.patch
 
 # upstreamed
 
@@ -161,6 +162,7 @@
 %patch3 -p1 -b .canonicalize
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .ctypesexec
+%patch6 -p1 -b .plural
 
 %patch50 -p1 -b .egginfo
 %patch60 -p1 -b .db46
@@ -421,6 +423,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
+- work around problems with multi-line plural specification (#252136)
+
 * Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-9
 - rebuild against new expat
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:06 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:06 -0400
Subject: rpms/lighttpd/EL-4 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 lighttpd.spec, 1.8, 1.9 sources, 1.7,
	1.8 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFk64C022132@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/EL-4

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jul 2007 08:07:51 -0000	1.7
+++ .cvsignore	10 Sep 2007 15:45:33 -0000	1.8
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lighttpd.spec	26 Jul 2007 08:07:51 -0000	1.8
+++ lighttpd.spec	10 Sep 2007 15:45:33 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jul 2007 08:07:51 -0000	1.7
+++ sources	10 Sep 2007 15:45:33 -0000	1.8
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:09 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:09 -0400
Subject: rpms/lighttpd/EL-5 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.34, 1.35 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFk97B022138@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/EL-5

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:07:54 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:36 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lighttpd.spec	26 Jul 2007 08:07:54 -0000	1.34
+++ lighttpd.spec	10 Sep 2007 15:45:36 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:07:54 -0000	1.20
+++ sources	10 Sep 2007 15:45:36 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:12 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:12 -0400
Subject: rpms/lighttpd/F-7 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.34, 1.35 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkCOB022145@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/F-7

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:07:57 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:39 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/lighttpd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lighttpd.spec	26 Jul 2007 08:07:57 -0000	1.34
+++ lighttpd.spec	10 Sep 2007 15:45:39 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-7/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:07:57 -0000	1.20
+++ sources	10 Sep 2007 15:45:39 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:14 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:14 -0400
Subject: rpms/lighttpd/FC-6 lighttpd-1.4.17-defaultconf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 lighttpd.spec, 1.32, 1.33 sources,
	1.20, 1.21 lighttpd-1.4.13-defaultconf.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkEX1022150@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/FC-6

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.17-defaultconf.patch 
Removed Files:
	lighttpd-1.4.13-defaultconf.patch 
Log Message:
Update to 1.4.18 (security update).


lighttpd-1.4.17-defaultconf.patch:

--- NEW FILE lighttpd-1.4.17-defaultconf.patch ---
diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
--- lighttpd-1.4.17.orig/doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
+++ lighttpd-1.4.17/doc/lighttpd.conf	2007-09-05 13:08:33.000000000 +0200
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/srv/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2007 08:08:00 -0000	1.20
+++ .cvsignore	10 Sep 2007 15:45:42 -0000	1.21
@@ -1 +1 @@
-lighttpd-1.4.16.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lighttpd.spec	26 Jul 2007 08:08:00 -0000	1.32
+++ lighttpd.spec	10 Sep 2007 15:45:42 -0000	1.33
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.16
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -15,13 +15,14 @@
 Source12: powered_by_fedora.png
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.13-defaultconf.patch
+Patch0: lighttpd-1.4.17-defaultconf.patch
 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
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -119,6 +120,9 @@
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
+# Install empty run directory to include (for the example fastcgi socket)
+%{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -153,12 +157,14 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
@@ -178,6 +184,24 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
+* Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
+- Update to 1.4.17.
+- Update defaultconf patch to match new example configuration.
+- Include patch to fix log file rotation with max-workers set (trac #902).
+- Add /var/run/lighttpd/ directory where to put fastcgi sockets.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-3
+- Add /usr/bin/awk build requirement, used to get LIGHTTPD_VERSION_ID.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-2
+- Rebuild to fix wrong execmem requirement on ppc32.
+
 * Thu Jul 26 2007 Matthias Saou <http://freshrpms.net/> 1.4.16-1
 - Update to 1.4.16 security fix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2007 08:08:00 -0000	1.20
+++ sources	10 Sep 2007 15:45:42 -0000	1.21
@@ -1 +1 @@
-ea671997591f772417b7e540d325f8cc  lighttpd-1.4.16.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.13-defaultconf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:46:17 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Sep 2007 11:46:17 -0400
Subject: rpms/lighttpd/devel .cvsignore, 1.21, 1.22 lighttpd.spec, 1.37,
	1.38 sources, 1.21, 1.22 lighttpd-1.4.17-sighup.patch, 1.1, NONE
Message-ID: <200709101546.l8AFkHEl022159@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21976/devel

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.4.17-sighup.patch 
Log Message:
Update to 1.4.18 (security update).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Sep 2007 11:25:10 -0000	1.21
+++ .cvsignore	10 Sep 2007 15:45:45 -0000	1.22
@@ -1 +1 @@
-lighttpd-1.4.17.tar.bz2
+lighttpd-1.4.18.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lighttpd.spec	5 Sep 2007 11:25:10 -0000	1.37
+++ lighttpd.spec	10 Sep 2007 15:45:45 -0000	1.38
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.17
+Version: 1.4.18
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -16,7 +16,6 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.4.17-defaultconf.patch
-Patch1: lighttpd-1.4.17-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -73,7 +72,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
-%patch1 -p3 -b .sighup
 
 
 %build
@@ -159,6 +157,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
+%{_sbindir}/lighttpd-angel
 %{_libdir}/lighttpd/
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
@@ -185,6 +184,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
+- Update to 1.4.18.
+- Include newly installed lighttpd-angel ("angel" process meant to always run
+  as root and restart lighttpd when it crashes, spawn processes on SIGHUP), but
+  it's in testing stage and must be run with -D for now.
+
 * Wed Sep  5 2007 Matthias Saou <http://freshrpms.net/> 1.4.17-1
 - Update to 1.4.17.
 - Update defaultconf patch to match new example configuration.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Sep 2007 11:25:10 -0000	1.21
+++ sources	10 Sep 2007 15:45:45 -0000	1.22
@@ -1 +1 @@
-85c99c2d6baf8ad9e38e6267efe7d9aa  lighttpd-1.4.17.tar.bz2
+26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2


--- lighttpd-1.4.17-sighup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 15:48:13 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 11:48:13 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-device-names.patch, NONE,
	1.1 dhcpv6.spec, 1.62, 1.63
Message-ID: <200709101548.l8AFmDQ0022523@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22466

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-device-names.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
- Recognize 802.1Q VLAN network device names (#245115)


dhcpv6-0.10-device-names.patch:

--- NEW FILE dhcpv6-0.10-device-names.patch ---
diff -up dhcp-0.10/server6_token.l.string dhcp-0.10/server6_token.l
--- dhcp-0.10/server6_token.l.string	2007-09-10 11:43:04.000000000 -0400
+++ dhcp-0.10/server6_token.l	2007-09-10 11:43:58.000000000 -0400
@@ -79,7 +79,7 @@ addr_tail       ({hexdigit}{1,4}|({hexdi
 addr_body       ({hexdigit}{1,4}(":"|"::"))*
 ipv6addr        {addr_head}{addr_body}{addr_tail}
 string		[a-zA-Z0-9:\._-][a-zA-Z0-9:\._-]*
-ifname		[a-zA-Z]+[0-9]+
+ifname		({string})+
 
 %s S_IFACE
 %s S_DUID


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- dhcpv6.spec	4 Sep 2007 17:55:48 -0000	1.62
+++ dhcpv6.spec	10 Sep 2007 15:47:41 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 47%{?dist}
+Release: 48%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -17,6 +17,7 @@
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-init_leases.patch
+Patch8:  %{name}-0.10-device-names.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -81,6 +82,7 @@
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .init_leases
+%patch8 -p1 -b .device-names
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -175,6 +177,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
+- Recognize 802.1Q VLAN network device names (#245115)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-47
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 15:59:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 11:59:08 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.28,
	1.29 policycoreutils.spec, 1.444, 1.445
Message-ID: <200709101559.l8AFx8Pt023034@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
- Change Requires /bin/rpm to rpm


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policycoreutils-gui.patch	6 Sep 2007 12:25:31 -0000	1.28
+++ policycoreutils-gui.patch	10 Sep 2007 15:59:05 -0000	1.29
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-05 22:33:12.000000000 -0400
-@@ -0,0 +1,2312 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 11:56:01.000000000 -0400
+@@ -0,0 +1,2364 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,7 +1028,8 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="show_tabs">False</property>
++	  <property name="can_focus">True</property>
++	  <property name="show_tabs">True</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -1772,6 +1773,57 @@
 +	  </child>
 +
 +	  <child>
++	    <widget class="GnomeDruidPageStandard" id="roles_page">
++	      <property name="visible">True</property>
++	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
++
++	      <child internal-child="vbox">
++		<widget class="GtkVBox" id="vbox13">
++		  <property name="border_width">16</property>
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">6</property>
++
++		  <child>
++		    <widget class="GtkScrolledWindow" id="scrolledwindow4">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="shadow_type">GTK_SHADOW_IN</property>
++		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++		      <child>
++			<widget class="GtkTreeView" id="role_treeview">
++			  <property name="visible">True</property>
++			  <property name="tooltip" translatable="yes">Select the domains that you would like this user administer.</property>
++			  <property name="can_focus">True</property>
++			  <property name="headers_visible">False</property>
++			  <property name="rules_hint">False</property>
++			  <property name="reorderable">False</property>
++			  <property name="enable_search">True</property>
++			  <property name="fixed_height_mode">False</property>
++			  <property name="hover_selection">False</property>
++			  <property name="hover_expand">False</property>
++			</widget>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">True</property>
++		      <property name="fill">True</property>
++		    </packing>
++		  </child>
++		</widget>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="tab_expand">False</property>
++	      <property name="tab_fill">True</property>
++	    </packing>
++	  </child>
++
++	  <child>
 +	    <widget class="GtkLabel" id="label30">
 +	      <property name="visible">True</property>
 +	      <property name="label" translatable="yes">label30</property>
@@ -3230,8 +3282,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-05 22:33:06.000000000 -0400
-@@ -0,0 +1,432 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 11:58:05.000000000 -0400
+@@ -0,0 +1,452 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3265,6 +3317,8 @@
 +import sys
 +import polgen
 +import re
++import commands
++
 +
 +##
 +## I18N
@@ -3311,12 +3365,13 @@
 +    APP_PAGE = 2
 +    TRANSITION_PAGE = 3
 +    ADMIN_PAGE = 4
-+    IN_NET_PAGE = 5
-+    OUT_NET_PAGE = 6
-+    COMMON_APPS_PAGE = 7
-+    FILES_PAGE = 8
-+    GEN_POLICY_PAGE = 9
-+    FINISH_PAGE = 10
++    ROLE_PAGE = 5
++    IN_NET_PAGE = 6
++    OUT_NET_PAGE = 7
++    COMMON_APPS_PAGE = 8
++    FILES_PAGE = 9
++    GEN_POLICY_PAGE = 10
++    FINISH_PAGE = 11
 +    
 +    def __init__(self):
 +        self.xml = xml
@@ -3335,7 +3390,7 @@
 +        self.notebook = xml.get_widget ("notebook1")
 +        self.pages={}
 +        for i in polgen.USERS:
-+            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE] 
++            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE] 
 +        self.pages[polgen.RUSER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.GEN_POLICY_PAGE, self.FINISH_PAGE]
 +        for i in polgen.APPLICATIONS:
 +            self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE,self.GEN_POLICY_PAGE, self.FINISH_PAGE ]
@@ -3373,6 +3428,20 @@
 +        for b in self.network_buttons.keys():
 +            b.connect("clicked",self.network_all_clicked)
 +
++        self.role_treeview = self.xml.get_widget("role_treeview")
++        self.role_store = gtk.ListStore(gobject.TYPE_STRING)
++        self.role_treeview.set_model(self.role_store)
++        self.role_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
++        self.role_store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
++        col = gtk.TreeViewColumn(_("Role"), gtk.CellRendererText(), text = 0)
++        self.role_treeview.append_column(col)
++
++        roles = commands.getoutput("/usr/bin/seinfo -r").split()[2:]
++        for i in roles:
++            iter = self.role_store.append()
++            self.role_store.set_value(iter, 0, i[:-2])
++
++        self.types = commands.getoutput("/usr/bin/seinfo -t").split()[2:]
 +        self.transition_treeview = self.xml.get_widget("transition_treeview")
 +        self.transition_store = gtk.ListStore(gobject.TYPE_STRING)
 +        self.transition_treeview.set_model(self.transition_store)
@@ -3381,7 +3450,6 @@
 +        col = gtk.TreeViewColumn(_("Application"), gtk.CellRendererText(), text = 0)
 +        self.transition_treeview.append_column(col)
 +
-+
 +        self.admin_treeview = self.xml.get_widget("admin_treeview")
 +        self.admin_store = gtk.ListStore(gobject.TYPE_STRING)
 +        self.admin_treeview.set_model(self.admin_store)
@@ -3391,11 +3459,11 @@
 +        self.admin_treeview.append_column(col)
 +
 +        for i in polgen.methods:
-+            print i
 +            m = re.findall("(.*)%s" % polgen.USER_TRANSITION_INTERFACE, i) 
 +            if len(m) > 0:
-+                iter = self.transition_store.append()
-+                self.transition_store.set_value(iter, 0, m[0])
++                if "%s_exec_t" % m[0] in self.types and "user_%s_t" % m[0] in self.types:
++                    iter = self.transition_store.append()
++                    self.transition_store.set_value(iter, 0, m[0])
 +                continue
 +
 +            m = re.findall("(.*)%s" % polgen.ADMIN_TRANSITION_INTERFACE, i) 
@@ -3490,7 +3558,7 @@
 +            return polgen.TUSER
 +        if self.root_user_radiobutton.get_active():
 +            return polgen.RUSER
-+        
++
 +    def generate_policy(self, *args):
 +        try:
 +            my_policy=polgen.policy(self.get_name(), self.get_type())
@@ -3504,7 +3572,7 @@
 +                my_policy.set_use_tmp(self.tmp_checkbutton.get_active() == 1)
 +                my_policy.set_use_uid(self.uid_checkbutton.get_active() == 1)
 +                my_policy.set_use_pam(self.pam_checkbutton.get_active() == 1)
-+                my_policy.set_init_script(self.exec_entry.get_text())
++                my_policy.set_init_script(self.script_entry.get_text())
 +            else:
 +                if self.get_type() == polgen.RUSER:
 +                    selected = []
@@ -3515,6 +3583,10 @@
 +                    self.transition_treeview.get_selection().selected_foreach(foreach, selected)
 +                    my_policy.set_transition_domains(selected)
 +                
++                    selected = []
++                    self.role_treeview.get_selection().selected_foreach(foreach, selected)
++                    my_policy.set_admin_roles(selected)
++                
 +            iter= self.store.get_iter_first()
 +            while(iter):
 +                if self.store.get_value(iter, 1) == FILE:
@@ -3666,8 +3738,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-05 22:26:53.000000000 -0400
-@@ -0,0 +1,715 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 11:55:14.000000000 -0400
+@@ -0,0 +1,718 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3729,8 +3801,8 @@
 +    # List of per_role_template interfaces
 +    ifs = interfaces.InterfaceSet()
 +    ifs.from_file(fd)
-+    fd.close()
 +    methods = ifs.interfaces.keys()
++    fd.close()
 +except:
 +    sys.stderr.write("could not open interface info [%s]\n" % fn)
 +    sys.exit(1)
@@ -4136,9 +4208,9 @@
 +	
 +	def generate_if(self):
 +                newif = ""
-+                if self.program:
++                if self.program != "":
 +                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_program_rules)
-+                if self.initscript:
++                if self.initscript != "":
 +                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_initscript_rules)
 +		
 +		for d in self.DEFAULT_DIRS:
@@ -4241,7 +4313,10 @@
 +	def generate_sh(self):
 +		newsh = re.sub("TEMPLATETYPE", self.name, script.compile)
 +		newsh = re.sub("PACKAGEFILENAME", self.file_name, newsh)
-+		newsh += re.sub("FILENAME", self.program, script.restorecon)
++                if self.program != "":
++                    newsh += re.sub("FILENAME", self.program, script.restorecon)
++                if self.initscript != "":
++                    newsh += re.sub("FILENAME", self.initscript, script.restorecon)
 +
 +		for i in self.files.keys():
 +			newsh += re.sub("FILENAME", i, script.restorecon)
@@ -9474,7 +9549,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-05 22:25:03.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-10 11:43:28.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9571,8 +9646,8 @@
 +files_dontaudit_search_all_dirs(TEMPLATETYPE_t)
 +
 +selinux_get_enforce_mode(TEMPLATETYPE_t)
-+seutil_domtrans_restorecon(TEMPLATETYPE_t)
-+seutil_search_default_contexts(mydbadm_t)
++seutil_domtrans_setfiles(TEMPLATETYPE_t)
++seutil_search_default_contexts(TEMPLATETYPE_t)
 +
 +logging_send_syslog_msg(TEMPLATETYPE_t)
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- policycoreutils.spec	6 Sep 2007 12:25:31 -0000	1.444
+++ policycoreutils.spec	10 Sep 2007 15:59:05 -0000	1.445
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -23,7 +23,7 @@
 Patch3:	 policycoreutils-gui.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
-Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed 
+Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
 Requires: libselinux >=  %{libselinuxver} libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -200,7 +200,10 @@
 fi
 
 %changelog
-* Wed Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
+* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
+- Change Requires /bin/rpm to rpm
+
+* Wed Sep 5 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-9
 - Bump libsemanage version for disable dontaudit
 - New gui features for creating admin users
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:04:28 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Sep 2007 12:04:28 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.32, 1.33 hwbrowser.spec, 1.44,
	1.45 sources, 1.38, 1.39
Message-ID: <200709101604.l8AG4SdH029292@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
make use of force tagging (since mercurial 0.9.4)
fix licensing and author blurbs
tag as GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	21 Jul 2007 12:26:16 -0000	1.32
+++ .cvsignore	10 Sep 2007 16:03:54 -0000	1.33
@@ -1 +1 @@
-hwbrowser-0.34.tar.bz2
+hwbrowser-0.35.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hwbrowser.spec	21 Jul 2007 15:08:41 -0000	1.44
+++ hwbrowser.spec	10 Sep 2007 16:03:54 -0000	1.45
@@ -1,9 +1,9 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.34
+Version: 0.35
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
-License: GPL
+License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -52,6 +52,13 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
+- make use of force tagging (since mercurial 0.9.4)
+
+* Fri Aug 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- fix licensing and author blurbs
+- tag as GPLv2+
+
 * Sat Jul 21 2007 Nils Philippsen <nphilipp at redhat.com> - 0.34-1
 - Use Hg for tagging
 - use bzipped tarballs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	21 Jul 2007 15:08:41 -0000	1.38
+++ sources	10 Sep 2007 16:03:54 -0000	1.39
@@ -1 +1 @@
-b02bacb9f05c37c018a294e3c9eb06b2  hwbrowser-0.34.tar.bz2
+476b50bdb95ebf3addc7484199d6e517  hwbrowser-0.35.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 16:06:00 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 12:06:00 -0400
Subject: rpms/freenx/FC-6 freenx.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709101606.l8AG60C5029423@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/freenx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380

Modified Files:
	freenx.spec sources 
Log Message:
Bump to 0.7.0.



Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/FC-6/freenx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freenx.spec	19 May 2007 17:19:49 -0000	1.6
+++ freenx.spec	10 Sep 2007 16:05:26 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
-Version: 0.6.0
-Release: 12%{?dist}
-License: GPL
+Version: 0.7.0
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
-Source0: http://prdownload.berlios.de/freenx/%{name}-%{version}.tar.gz
+Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
@@ -91,6 +91,13 @@
 /var/log/nx
 
 %changelog
+* Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- CM = Christian Mandery mail at chrismandery.de,  BZ 252976
+- Version bump to 0.7.0 upstream release (CM)
+- Fixed download URL (didn't work, Berlios changed layout). (CM)
+- Changed license field from GPL to GPLv2 in RPM. (CM)
+- Fixed release.
+
 * Mon Feb 19 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.0-9
 - Update to 0.6.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 May 2007 17:19:49 -0000	1.5
+++ sources	10 Sep 2007 16:05:26 -0000	1.6
@@ -1 +1 @@
-504aaa2c3c93c36eefab74e2b8a6506e  freenx-0.6.0.tar.gz
+9c21eb45b4193ad7184109f3274c9e33  freenx-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 16:07:31 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 10 Sep 2007 12:07:31 -0400
Subject: rpms/octave/devel octave.spec,1.56,1.57
Message-ID: <200709101607.l8AG7V3P029579@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29513

Modified Files:
	octave.spec 
Log Message:
Remove redundant menu category in desktop file (bug 274431).


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- octave.spec	28 Jul 2007 20:30:27 -0000	1.56
+++ octave.spec	10 Sep 2007 16:06:58 -0000	1.57
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        2.9.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -89,7 +89,7 @@
 
 # Create desktop file
 rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor fedora --add-category X-Fedora \
+desktop-file-install --vendor fedora --add-category X-Fedora --remove-category Development \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
 
 # Create directories for add-on packages
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-3
+- Remove redundant menu category in desktop file (bug 274431).
+
 * Thu Jul 26 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-1
 - New release.
 - Changed ufsparse-devel dependency to suitesparse-devel.



From fedora-extras-commits at redhat.com  Mon Sep 10 16:07:47 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 10 Sep 2007 12:07:47 -0400
Subject: rpms/yum/devel .cvsignore, 1.59, 1.60 sources, 1.62, 1.63 yum.spec, 
	1.176, 1.177
Message-ID: <200709101607.l8AG7l2v029615@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29524

Modified Files:
	.cvsignore sources yum.spec 
Log Message:
3.2.5 - dump out unused patches from specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	28 Aug 2007 22:43:46 -0000	1.59
+++ .cvsignore	10 Sep 2007 16:07:13 -0000	1.60
@@ -1,2 +1,3 @@
 yum-3.2.3.tar.gz
 yum-3.2.4.tar.gz
+yum-3.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	5 Sep 2007 21:03:16 -0000	1.62
+++ sources	10 Sep 2007 16:07:14 -0000	1.63
@@ -1 +1,2 @@
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
+f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- yum.spec	5 Sep 2007 21:03:16 -0000	1.176
+++ yum.spec	10 Sep 2007 16:07:14 -0000	1.177
@@ -2,17 +2,15 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.4
-Release: 4%{?dist}
+Version: 3.2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
-Patch1: version-None-tuple.patch
-Patch2: rpmdb-unresolved.patch
-Patch3: yum-showasdep.patch
+Patch1: yum-showasdep.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -49,9 +47,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
-%patch1 -p1 -b .ver-to-none
-%patch2 -p1 -b .unresolved
-%patch3 -p1 -b .showdep
+%patch1 -p1 -b .showdep
 
 %build
 make
@@ -97,6 +93,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.5-1
+- 3.2.5 - pull out unused patches
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
 - test patch for only packages which are not being otherwise updated to not 
   be shown as being updated for deps



From fedora-extras-commits at redhat.com  Mon Sep 10 16:19:26 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 12:19:26 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch,1.29,1.30
Message-ID: <200709101619.l8AGJQtb031495@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452

Modified Files:
	policycoreutils-gui.patch 
Log Message:
* Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
- Change Requires /bin/rpm to rpm


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policycoreutils-gui.patch	10 Sep 2007 15:59:05 -0000	1.29
+++ policycoreutils-gui.patch	10 Sep 2007 16:19:23 -0000	1.30
@@ -3738,8 +3738,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 11:55:14.000000000 -0400
-@@ -0,0 +1,718 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 12:16:38.000000000 -0400
+@@ -0,0 +1,719 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -4118,11 +4118,12 @@
 +
 +        def generate_admin_rules(self):
 +            newte = ""
-+            newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
++            if self.type == RUSER:
++                newte += re.sub("TEMPLATETYPE", self.name, user.te_admin_rules)
 +            
-+            for app in self.admin_domains:
-+                tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
-+                newte += re.sub("APPLICATION", app, tmp)
++                for app in self.admin_domains:
++                    tmp = re.sub("TEMPLATETYPE", self.name, user.te_admin_domain_rules)
++                    newte += re.sub("APPLICATION", app, tmp)
 +            return newte
 +
 +        def generate_admin_if(self):



From fedora-extras-commits at redhat.com  Mon Sep 10 16:19:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Sep 2007 12:19:28 -0400
Subject: rpms/opensc/devel .cvsignore, 1.19, 1.20 opensc.spec, 1.33,
	1.34 sources, 1.19, 1.20
Message-ID: <200709101619.l8AGJSDu031509@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31318

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-1
- 0.11.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Aug 2007 17:24:51 -0000	1.19
+++ .cvsignore	10 Sep 2007 16:18:55 -0000	1.20
@@ -1 +1 @@
-opensc-0.11.4-rc1.tar.gz
+opensc-0.11.4.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- opensc.spec	20 Aug 2007 17:24:51 -0000	1.33
+++ opensc.spec	10 Sep 2007 16:18:55 -0000	1.34
@@ -2,14 +2,13 @@
 
 Name:           opensc
 Version:        0.11.4
-Release:        0.1.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
-#Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.11.1-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,7 +53,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
 f=doc/ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -145,6 +144,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-1
+- 0.11.4.
+
 * Mon Aug 20 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.4-0.1.rc1
 - 0.11.4-rc1, pkcs11-tool usage message fix applied upstream.
 - License: LGPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Aug 2007 17:24:51 -0000	1.19
+++ sources	10 Sep 2007 16:18:55 -0000	1.20
@@ -1 +1 @@
-63f82c0ce4cfa9cf300ab5773b784890  opensc-0.11.4-rc1.tar.gz
+2031aa617be609d50d014d5d370bb8a2  opensc-0.11.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 16:21:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:21:12 -0400
Subject: rpms/kasablanca/EL-5 kasablanca.spec,1.17,1.18
Message-ID: <200709101621.l8AGLC40031836@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kasablanca/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31796

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.4.0.2-10
- License: GPLv2+
- cosmetics



Index: kasablanca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasablanca/EL-5/kasablanca.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kasablanca.spec	29 Aug 2006 18:07:46 -0000	1.17
+++ kasablanca.spec	10 Sep 2007 16:20:39 -0000	1.18
@@ -2,9 +2,9 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
-License: GPL
+License: GPLv2+
 Url: 	 http://kasablanca.berlios.de/ 
 Source:	 http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz
 Group: 	 Applications/Internet 
@@ -37,7 +37,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# Needed(?) for older/legacy setups, harmless otherwise
+## Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
   export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
@@ -58,9 +58,7 @@
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --vendor="" \
-  --add-category="X-Fedora" \
   --add-category="Network" \
-  --add-category="Application" \
   --add-category="KDE" \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
@@ -91,29 +89,29 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun 
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
-%config %{_datadir}/config*/*
+%{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.4.0.2-10
+- License: GPLv2+
+- cosmetics
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-9
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:22:23 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 10 Sep 2007 12:22:23 -0400
Subject: rpms/yum/F-7 sources,1.61,1.62 yum.spec,1.164,1.165
Message-ID: <200709101622.l8AGMNb1032005@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/yum/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31941

Modified Files:
	sources yum.spec 
Log Message:
3.2.5




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	29 Aug 2007 04:20:25 -0000	1.61
+++ sources	10 Sep 2007 16:21:50 -0000	1.62
@@ -1,2 +1,2 @@
-89cf296107d580655aaf83fb7206edfc  yum-3.2.3.tar.gz
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
+f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/yum.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- yum.spec	29 Aug 2007 16:16:28 -0000	1.164
+++ yum.spec	10 Sep 2007 16:21:50 -0000	1.165
@@ -2,16 +2,14 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.4
-Release: 2%{?dist}
+Version: 3.2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
-Patch1: version-None-tuple.patch
-Patch2: rpmdb-unresolved.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -47,8 +45,6 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
-%patch1 -p1 -b .ver-to-none
-%patch2 -p1 -b .unresolved
 
 
 %build
@@ -114,6 +110,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.5-1
+- 3.2.5
+- prune unnecessary patches
+ 
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.4-2
 - two patches from git-HEAD to test fixes of all sorts
 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:23:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:23:33 -0400
Subject: rpms/gtk-qt-engine/EL-5 .cvsignore, 1.6, 1.7 gtk-qt-engine.spec,
	1.26, 1.27 sources, 1.6, 1.7
Message-ID: <200709101623.l8AGNXq2032104@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32013

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Log Message:
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
- gtk-qt-engine-20070811svn (revision 38)
- License: GPLv2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Dec 2006 20:10:06 -0000	1.6
+++ .cvsignore	10 Sep 2007 16:23:00 -0000	1.7
@@ -1,2 +1,3 @@
 gtk-qt-engine-0.7.tar.bz2
 gtk-qt-engine-20061211svn.tar.bz2
+gtk-qt-engine-20070811svn.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtk-qt-engine.spec	18 Dec 2006 20:10:06 -0000	1.26
+++ gtk-qt-engine.spec	10 Sep 2007 16:23:00 -0000	1.27
@@ -1,20 +1,21 @@
 
 %define real_ver 0.7
-%define svn 20061211svn
+%define svn 20070811svn
 
 Summary: A project allowing GTK to use Qt widget styles.
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.70
-Release: 4.%{svn}%{?dist}
+Release: 5.%{svn}%{?dist}
 
-License: GPL
-URL:     http://www.freedesktop.org/Software/gtk-qt
+License: GPLv2+
+URL: 	 http://gtk-qt.ecs.soton.ac.uk/
+#URL:	 http://www.freedesktop.org/Software/gtk-qt
 %if "%{?svn:1}" == "1"
 Source0: gtk-qt-engine-%{svn}.tar.bz2
 Source1: gtk-qt-engine-svn.sh
 %else
-Source0: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-%{real_ver}.tar.bz2
+Source0: http://gtk-qt.ecs.soton.ac.uk/files/%{real_ver}/gtk-qt-engine-%{real_ver}.tar.bz2 
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -23,8 +24,8 @@
 BuildRequires: gtk2-devel >= 2.2
 BuildRequires: libbonoboui-devel
 BuildRequires: qt-devel 
-BuildRequires: kdelibs-devel 
 BuildRequires: libpng-devel
+BuildRequires: kdelibs3-devel
 
 
 %description
@@ -41,11 +42,7 @@
 %build
 
 %if "%{?svn:1}" == "1"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake . \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DBUILD_SHARED_LIBS:BOOL=ON
+%cmake .
 %else
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 %configure
@@ -80,6 +77,10 @@
 
 
 %changelog 
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
+- gtk-qt-engine-20070811svn (revision 38)
+- License: GPLv2
+
 * Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-4.20061211svn
 - gtk-qt-engine-20061211svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Dec 2006 20:10:06 -0000	1.6
+++ sources	10 Sep 2007 16:23:00 -0000	1.7
@@ -1 +1 @@
-ab25f35e9812e3fd7dba080ad2853645  gtk-qt-engine-20061211svn.tar.bz2
+c06bd40c5892e7abca0470c2f680b32f  gtk-qt-engine-20070811svn.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 16:24:00 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 12:24:00 -0400
Subject: rpms/gtk-qt-engine/EL-5 gtk-qt-engine.spec,1.27,1.28
Message-ID: <200709101624.l8AGO0eW032119@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075

Modified Files:
	gtk-qt-engine.spec 
Log Message:
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
- gtk-qt-engine-20070811svn (revision 38)
- License: GPLv2



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtk-qt-engine.spec	10 Sep 2007 16:23:00 -0000	1.27
+++ gtk-qt-engine.spec	10 Sep 2007 16:23:27 -0000	1.28
@@ -25,7 +25,7 @@
 BuildRequires: libbonoboui-devel
 BuildRequires: qt-devel 
 BuildRequires: libpng-devel
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Mon Sep 10 16:38:49 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 12:38:49 -0400
Subject: rpms/xfsdump/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfsdump.spec, 1.1, 1.2
Message-ID: <200709101638.l8AGcnYF000878@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsdump/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792

Modified Files:
	.cvsignore sources xfsdump.spec 
Log Message:
* Thu May 31 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-1
- Update to xfsdump 2.2.45



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 17:26:34 -0000	1.2
+++ .cvsignore	10 Sep 2007 16:38:16 -0000	1.3
@@ -1 +1 @@
-xfsdump_2.2.42-1.tar.gz
+xfsdump_2.2.45-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 17:26:34 -0000	1.2
+++ sources	10 Sep 2007 16:38:16 -0000	1.3
@@ -1 +1 @@
-4e113a39b07723bbb140d2e5c5389cfe  xfsdump_2.2.42-1.tar.gz
+9f4f6da94d14e638639a542b0fa8a722  xfsdump_2.2.45-1.tar.gz


Index: xfsdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/FC-6/xfsdump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfsdump.spec	1 Sep 2006 17:26:34 -0000	1.1
+++ xfsdump.spec	10 Sep 2007 16:38:16 -0000	1.2
@@ -1,14 +1,14 @@
 Summary: Administrative utilities for the XFS filesystem
 Name: xfsdump
-Version: 2.2.42
-Release: 2%{?dist}
+Version: 2.2.45
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
 Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, libtool, gettext
-BuildRequires: readline-devel, libtermcap-devel, xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
+BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
 Requires: xfsprogs >= 2.6.30, attr >= 2.0.0
 
 
@@ -60,8 +60,11 @@
 /sbin/*
 
 %changelog
+* Thu May 31 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-1
+- Update to xfsdump 2.2.45
+
 * Wed Aug 31 2006 Russell Cattelan <cattelan at thebarn.com> - 2.2.42-2
-Remove Distribution: tag
+- Remove Distribution: tag
 
 * Wed Aug 23 2006 Russell Cattelan <cattelan at thebarn.com> - 2.2.42-1
 - update to version 2.2.42 



From fedora-extras-commits at redhat.com  Mon Sep 10 16:42:28 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 10 Sep 2007 12:42:28 -0400
Subject: rpms/gcstar/devel gcstar.spec,1.6,1.7
Message-ID: <200709101642.l8AGgSvD001500@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1348

Modified Files:
	gcstar.spec 
Log Message:
New upstream version: 1.2.0


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcstar.spec	18 Aug 2007 05:35:46 -0000	1.6
+++ gcstar.spec	10 Sep 2007 16:41:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gcstar
-Version:        1.1.1
-Release:        4%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Personal collections manager
 
 Group:          Applications/Databases
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
+  - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4
   - Updated license tag
 * Sat May 27 2007 Tian <tian at c-sait.net> - 1.1.1-3



From fedora-extras-commits at redhat.com  Mon Sep 10 16:57:27 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 12:57:27 -0400
Subject: rpms/svnkit/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec, 
	1.1, 1.2
Message-ID: <200709101657.l8AGvR0n005807@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5661

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 13:51:26 -0000	1.2
+++ .cvsignore	10 Sep 2007 16:56:47 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 13:51:26 -0000	1.2
+++ sources	10 Sep 2007 16:56:47 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 13:51:26 -0000	1.1
+++ svnkit.spec	10 Sep 2007 16:56:47 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Sep 2007 13:02:04 -0400
Subject: rpms/lyx/EL-5 .cvsignore, 1.16, 1.17 lyx.spec, 1.49, 1.50 sources, 
	1.15, 1.16
Message-ID: <200709101702.l8AH24lA012546@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12418

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
- lyx-1.4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Feb 2007 13:34:49 -0000	1.16
+++ .cvsignore	10 Sep 2007 17:01:29 -0000	1.17
@@ -2,3 +2,4 @@
 beamer.layout
 lyx-1.4.3.tar.bz2
 lyx-1.4.4.tar.bz2
+lyx-1.4.5.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- lyx.spec	16 Feb 2007 13:34:49 -0000	1.49
+++ lyx.spec	10 Sep 2007 17:01:29 -0000	1.50
@@ -1,13 +1,13 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.4.5.1
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.4-xdg_open.patch
@@ -19,8 +19,6 @@
 Source20: lyx.desktop
 Source21: lyx-qt.desktop
 Source22: lyx-xforms.desktop
-# misc
-Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout
 
 # qt frontend
 BuildRequires: qt-devel
@@ -134,7 +132,6 @@
 
 # misc/extras
 install -p -m644 %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
-install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/
 
 # Set up the lyx-specific class files where TeX can see them
 texmf=%{_datadir}/texmf
@@ -220,6 +217,9 @@
 
 
 %changelog
+* Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
+- lyx-1.4.5.1
+
 * Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-2
 - biffed sources, respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Feb 2007 13:34:49 -0000	1.15
+++ sources	10 Sep 2007 17:01:29 -0000	1.16
@@ -1,2 +1 @@
-c906271900a0627d3df2a38ad962a285  beamer.layout
-2e778eba4191c5f9fb2cafa7901c322c  lyx-1.4.4.tar.bz2
+b74d82e80c49c7edb782ec7395b7ca27  lyx-1.4.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:27 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:02:27 -0400
Subject: rpms/gperiodic/F-7 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101702.l8AH2R22012649@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12484

Modified Files:
	.cvsignore gperiodic.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:01:53 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	5 May 2007 17:57:28 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:01:53 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 8%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
 * Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:01:53 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:02:58 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:02:58 -0400
Subject: rpms/ganymed-ssh2/F-7 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709101702.l8AH2whW012776@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12623

Modified Files:
	ganymed-ssh2.spec 
Log Message:
- Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/F-7/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	10 Sep 2007 17:02:24 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:04:11 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:04:11 -0400
Subject: rpms/gperiodic/FC-6 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101704.l8AH4BBM013012@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12899

Modified Files:
	.cvsignore gperiodic.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:03:37 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:03:37 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 7%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
 * Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
 - Correct information for "Bh", Bohrium
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:03:37 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:05:52 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 10 Sep 2007 13:05:52 -0400
Subject: rpms/perl-Cflow/EL-5 perl-Cflow.spec,1.5,1.6
Message-ID: <200709101705.l8AH5q8T013366@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-Cflow/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246

Modified Files:
	perl-Cflow.spec 
Log Message:
* Mon Sep 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 1.053-6
- Update License tag
- Add BR perl(ExtUtils::MakeMaker)



Index: perl-Cflow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Cflow/EL-5/perl-Cflow.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Cflow.spec	7 Sep 2006 16:34:57 -0000	1.5
+++ perl-Cflow.spec	10 Sep 2007 17:05:18 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           perl-Cflow
 Version:        1.053
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Find flows in raw IP flow files
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://net.doit.wisc.edu/~plonka/Cflow/
 Source0:        http://net.doit.wisc.edu/~plonka/Cflow/Cflow-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  flow-tools-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -55,6 +56,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 1.053-6
+- Update License tag
+- Add BR perl(ExtUtils::MakeMaker)
+
 * Thu Sep  7 2006 - Orion Poplawski <orion at cora.nwra.com> - 1.053-5
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:05:56 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:05:56 -0400
Subject: rpms/gperiodic/EL-4 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709101705.l8AH5uow013416@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13232

Modified Files:
	.cvsignore gperiodic.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:05:22 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/gperiodic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gperiodic.spec	30 Oct 2005 21:49:09 -0000	1.1
+++ gperiodic.spec	10 Sep 2007 17:05:22 -0000	1.2
@@ -1,13 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 2%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -16,7 +17,7 @@
 
 %prep
 %setup -q
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -26,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -58,6 +54,27 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-6
+- Rebuild for distag problem
+
+* Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-5
+- Modify URL in package descrpition and source
+
+* Tue Feb 14 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-4
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-3
+- Rebuild for FC5
+
 * Mon Oct 24 2005 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-2
 - Applied patch file : 
 https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=120301


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:05:22 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:07:33 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:07:33 -0400
Subject: rpms/gperiodic/EL-5 .cvsignore, 1.2, 1.3 gperiodic.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <200709101707.l8AH7Xh1013749@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13616

Modified Files:
	.cvsignore gperiodic.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2005 21:49:09 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:07:00 -0000	1.3
@@ -1 +1 @@
-gperiodic-2.0.8.tar.gz
+gperiodic-2.0.10.tar.gz


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/gperiodic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
+++ gperiodic.spec	10 Sep 2007 17:07:00 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
-Version: 2.0.8
-Release: 7%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -28,11 +27,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
 
-sed -i -e "/=$/d;/KDE/d" gperiodic.desktop
-echo "Encoding=UTF-8" >> gperiodic.desktop
-mv gperiodic{,.badencoding}.desktop
-iconv -f ISO-8859-1 -t UTF-8 gperiodic.badencoding.desktop > gperiodic.desktop
-
 %makeinstall
 desktop-file-install \
    --delete-original \
@@ -60,6 +54,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
+- New upstream version
+
+* Sat May 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.8-8
+- Rebuild
+
 * Thu Nov 09 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 2.0.8-7
 - Correct information for "Bh", Bohrium
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2005 21:49:09 -0000	1.2
+++ sources	10 Sep 2007 17:07:00 -0000	1.3
@@ -1 +1 @@
-cfe23eaa21707c2c42bcd6399161ec2e  gperiodic-2.0.8.tar.gz
+9680f8a4850bdafad113fd4af7c57e45  gperiodic-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 17:11:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:11:15 -0400
Subject: rpms/gperiodic/EL-4 gperiodic-bh.patch,NONE,1.1
Message-ID: <200709101711.l8AHBFgM014548@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14505

Added Files:
	gperiodic-bh.patch 
Log Message:


gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>2</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>3</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>4</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>6</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>7</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>9</sup> 7s<sup>1</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:13:15 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:13:15 -0400
Subject: rpms/ganymed-ssh2/FC-6 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709101713.l8AHDFYY014897@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783

Modified Files:
	ganymed-ssh2.spec 
Log Message:
- Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/FC-6/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	10 Sep 2007 17:12:42 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:14:32 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 10 Sep 2007 13:14:32 -0400
Subject: rpms/gperiodic/EL-4 gperiodic.spec,1.2,1.3
Message-ID: <200709101714.l8AHEWWW015101@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15021

Modified Files:
	gperiodic.spec 
Log Message:



Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/EL-4/gperiodic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gperiodic.spec	10 Sep 2007 17:05:22 -0000	1.2
+++ gperiodic.spec	10 Sep 2007 17:13:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -54,6 +54,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-2
+- Rebuild
+
 * Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:23:32 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:23:32 -0400
Subject: rpms/svnkit/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.1, 1.2
Message-ID: <200709101723.l8AHNW27016348@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16191

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 15:16:23 -0000	1.2
+++ .cvsignore	10 Sep 2007 17:22:59 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 15:16:23 -0000	1.2
+++ sources	10 Sep 2007 17:22:59 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 15:16:23 -0000	1.1
+++ svnkit.spec	10 Sep 2007 17:22:59 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Mon Sep 10 17:27:05 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Sep 2007 13:27:05 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.216,
	1.217 preferred-apps.patch, 1.1, 1.2
Message-ID: <200709101727.l8AHR5nH017422@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17292

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
- create ~/.local/share/applications before writing out 
  preferred app launchers



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- gnome-panel.spec	6 Sep 2007 16:58:07 -0000	1.216
+++ gnome-panel.spec	10 Sep 2007 17:26:32 -0000	1.217
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -311,6 +311,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 10 2007 Ray Strode <rstrode at redhat.com> - 2.19.92-3
+- create ~/.local/share/applications before writing out 
+  preferred app launchers
+
 * Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-2
 - Improve the handling of preferred apps in launchers
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- preferred-apps.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ preferred-apps.patch	10 Sep 2007 17:26:32 -0000	1.2
@@ -1,25 +1,18 @@
-diff -up gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps gnome-panel-2.19.6/gnome-panel/main.c
---- gnome-panel-2.19.6/gnome-panel/main.c.preferred-apps	2007-08-28 01:01:57.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/main.c	2007-08-28 01:02:42.000000000 -0400
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
+diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h	2007-09-10 13:22:09.000000000 -0400
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
  
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- 			      GCONF_CLIENT_PRELOAD_NONE,
- 			      NULL);
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
  
-+	panel_preferred_apps_init ();
- 	panel_global_config_load ();
- 	panel_lockdown_init ();
- 	panel_profile_load ();
-diff -up gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.c
---- gnome-panel-2.19.6/gnome-panel/launcher.c.preferred-apps	2007-08-28 00:49:14.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/launcher.c	2007-08-28 01:01:47.000000000 -0400
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.c
+--- gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps	2007-09-10 13:22:09.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-10 13:24:09.000000000 -0400
 @@ -22,6 +22,7 @@
  #include <libgnomeui/gnome-url.h>
  #include <libgnomevfs/gnome-vfs.h>
@@ -36,7 +29,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1264,3 +1266,166 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1284,3 +1286,173 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -176,7 +169,7 @@
 +panel_preferred_apps_init (void)
 +{
 +	GConfClient *client;
-+	gchar *filename, *exec;
++        gchar *dirname, *filename, *exec;
 +	gint i;
 +
 +	const gchar *keys[] = {
@@ -191,21 +184,28 @@
 +	client = panel_gconf_get_client ();
 +
 +	for (i = 0; keys[i]; i++) {
-+		filename = g_build_filename (g_get_user_data_dir (), 
-+					     "applications", files[i], NULL);
++                dirname = g_build_filename (g_get_user_data_dir (), 
++					    "applications", NULL);
++		filename = g_build_filename (dirname, files[i], NULL);
 +		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
++                        
++                        if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
++                            g_mkdir_with_parents (dirname);
++
 +			exec = gconf_client_get_string (client, keys[i], NULL);
 +			update_preferred_app (filename, keys[i], exec);
 +			g_free (exec);
 +		}
++                g_free (dirname);
++
 +		gconf_client_notify_add (client, keys[i],
 +					 (GConfClientNotifyFunc) preferred_app_changed,
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.6/gnome-panel/launcher.h
---- gnome-panel-2.19.6/gnome-panel/launcher.h.preferred-apps	2007-08-28 00:46:47.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/launcher.h	2007-08-28 00:47:10.000000000 -0400
+diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.h
+--- gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps	2007-09-10 13:22:09.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-10 13:22:09.000000000 -0400
 @@ -75,6 +75,7 @@ void            launcher_properties_dest
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
@@ -214,21 +214,28 @@
  
  G_END_DECLS
  
-diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h.preferred-apps	2007-08-28 00:48:11.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.h	2007-08-28 00:48:34.000000000 -0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
+diff -up gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps gnome-panel-2.19.92/gnome-panel/main.c
+--- gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/main.c	2007-09-10 13:22:09.000000000 -0400
+@@ -26,6 +26,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
  
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -81,6 +82,7 @@ main (int argc, char **argv)
+ 			      GCONF_CLIENT_PRELOAD_NONE,
+ 			      NULL);
  
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c.preferred-apps	2007-08-28 00:47:26.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-run-dialog.c	2007-08-28 00:47:51.000000000 -0400
++	panel_preferred_apps_init ();
+ 	panel_global_config_load ();
+ 	panel_lockdown_init ();
+ 	panel_profile_load ();
+diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c	2007-09-10 13:22:09.000000000 -0400
 @@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }



From fedora-extras-commits at redhat.com  Mon Sep 10 17:29:31 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Sep 2007 13:29:31 -0400
Subject: rpms/gnome-panel/devel preferred-apps.patch,1.2,1.3
Message-ID: <200709101729.l8AHTVGc017814@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776

Modified Files:
	preferred-apps.patch 
Log Message:
fix typo in previous patch


preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- preferred-apps.patch	10 Sep 2007 17:26:32 -0000	1.2
+++ preferred-apps.patch	10 Sep 2007 17:29:28 -0000	1.3
@@ -190,7 +190,7 @@
 +		if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
 +                        
 +                        if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
-+                            g_mkdir_with_parents (dirname);
++                            g_mkdir_with_parents (dirname, 0755);
 +
 +			exec = gconf_client_get_string (client, keys[i], NULL);
 +			update_preferred_app (filename, keys[i], exec);



From fedora-extras-commits at redhat.com  Mon Sep 10 17:47:14 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 10 Sep 2007 13:47:14 -0400
Subject: rpms/eclipse-subclipse/FC-6 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709101747.l8AHlEVX019010@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
- Update to upstream 1.2.4
- Build for all supported arquitectures
- Change MANIFEST.MF patch to be applied on prep stage



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 18:25:12 -0000	1.5
+++ .cvsignore	10 Sep 2007 17:46:42 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 18:25:12 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	10 Sep 2007 17:46:42 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 18:25:12 -0000	1.5
+++ eclipse-subclipse.spec	10 Sep 2007 17:46:42 -0000	1.6
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,16 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 18:25:12 -0000	1.5
+++ sources	10 Sep 2007 17:46:42 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 17:55:03 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 10 Sep 2007 13:55:03 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.2.2-setuptools.patch,1.2,1.3
Message-ID: <200709101755.l8AHt3wl019306@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19267

Modified Files:
	TurboGears-1.0.2.2-setuptools.patch 
Log Message:
* Leave cherrypy in and add a maximum for SQLAlchemy.


TurboGears-1.0.2.2-setuptools.patch:

Index: TurboGears-1.0.2.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.2.2-setuptools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.2.2-setuptools.patch	11 May 2007 07:23:36 -0000	1.2
+++ TurboGears-1.0.2.2-setuptools.patch	10 Sep 2007 17:55:00 -0000	1.3
@@ -1,10 +1,10 @@
---- setup.py.orig	2007-05-11 02:49:06.000000000 -0400
-+++ setup.py	2007-05-11 02:49:30.000000000 -0400
-@@ -16,32 +16,21 @@
-         "TurboJson >= 0.9.9",
-         "TurboCheetah >= 0.9.5",
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -18,30 +18,20 @@ install_requires = [
          "TurboKid >= 1.0.1",
--        "CherryPy >= 2.2.1,<3.0.0alpha",
+         "CherryPy >= 2.2.1,<3.0.0alpha",
          "simplejson >= 1.3",
 -        "elementtree >= 1.2.6",
          "PasteScript >= 0.9.7",
@@ -13,8 +13,9 @@
          "RuleDispatch >= 0.5a0.dev-r2303",
          "DecoratorTools >= 1.4",
 -        "ConfigObj >= 4.3.2"]
+-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
 +        ]
- tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
++tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
  standard = ["SQLObject>=0.8,<0.10dev"]
  
  # python 2.5 compatible list
@@ -34,3 +35,12 @@
  
  setup(
      name="TurboGears",
+@@ -122,7 +112,7 @@ the TurboGears subversion repository</a>
+     extras_require = {
+         "exp" : ["TGFastData"],
+         "standard" : standard,
+-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
++        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
+         "testtools" : ["nose >= 0.9.1"],
+         "tgtesttools" : tgtesttools,
+     },



From fedora-extras-commits at redhat.com  Mon Sep 10 18:04:03 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 14:04:03 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-IA_NA-ignore.patch, NONE,
	1.1 dhcpv6-0.10-elapsed-time.patch, NONE,
	1.1 dhcpv6-0.10-lsb.patch, NONE,
	1.1 dhcpv6-0.10-reassign-global.patch, NONE,
	1.1 dhcpv6-0.10-remove-leases.patch, NONE,
	1.1 dhcpv6-0.10-retransmit-confirm.patch, NONE, 1.1 dhcpv6.spec,
	1.63, 1.64
Message-ID: <200709101804.l8AI43nC026107@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25969

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-IA_NA-ignore.patch dhcpv6-0.10-elapsed-time.patch 
	dhcpv6-0.10-lsb.patch dhcpv6-0.10-reassign-global.patch 
	dhcpv6-0.10-remove-leases.patch 
	dhcpv6-0.10-retransmit-confirm.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
- Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
- Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)
- In dhcp6c, do not remove leases no on the updated list (#265761)
- Retransmit confirm message in expected duration in dhcp6c (#251192)
- Store correct value to elapsed time option in solicit msg (#249451)
- Reassign IPv6 global address after confirm/reply msg in dhcp6c (#249466)


dhcpv6-0.10-IA_NA-ignore.patch:

--- NEW FILE dhcpv6-0.10-IA_NA-ignore.patch ---
diff -up dhcp-0.10/client6_addr.c.ia_na_ignore dhcp-0.10/client6_addr.c
--- dhcp-0.10/client6_addr.c.ia_na_ignore	2007-09-10 13:40:07.000000000 -0400
+++ dhcp-0.10/client6_addr.c	2007-09-10 13:41:25.000000000 -0400
@@ -97,8 +97,7 @@ dhcp6_add_iaidaddr(struct dhcp6_optinfo 
 	struct dhcp6_lease *cl_lease;
 	double d;
 	/* ignore IA with T1 > T2 */
-	if (client6_iaidaddr.client6_info.iaidinfo.renewtime >
-	    client6_iaidaddr.client6_info.iaidinfo.rebindtime) {
+	if (optinfo->iaidinfo.renewtime > optinfo->iaidinfo.rebindtime) {
 		dprintf(LOG_INFO, " T1 time is greater than T2 time");
 		return (0);
 	}

dhcpv6-0.10-elapsed-time.patch:

--- NEW FILE dhcpv6-0.10-elapsed-time.patch ---
diff -up dhcp-0.10/dhcp6c.c.time dhcp-0.10/dhcp6c.c
--- dhcp-0.10/dhcp6c.c.time	2007-09-10 13:51:30.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2007-09-10 13:53:14.000000000 -0400
@@ -1040,12 +1040,10 @@ client6_send(ev)
 		unsigned int etime;
 		gettimeofday(&now, NULL);
 		timeval_sub(&now, &(ev->start_time), &duration);
-		optinfo.elapsed_time = 
 		etime = (duration.tv_sec) * 100 + (duration.tv_usec) / 10000;
 		if (etime > DHCP6_ELAPSEDTIME_MAX)
-			optinfo.elapsed_time = DHCP6_ELAPSEDTIME_MAX;
-		else
-			optinfo.elapsed_time = etime;
+			etime = DHCP6_ELAPSEDTIME_MAX;
+		optinfo.elapsed_time = htons((uint16_t)etime);
 	}
 	dh6->dh6_xid &= ~ntohl(DH6_XIDMASK);
 	dh6->dh6_xid |= htonl(ev->xid);

dhcpv6-0.10-lsb.patch:

--- NEW FILE dhcpv6-0.10-lsb.patch ---
diff -up dhcp-0.10/dhcp6r.sh.lsb dhcp-0.10/dhcp6r.sh
--- dhcp-0.10/dhcp6r.sh.lsb	2007-09-10 12:52:07.000000000 -0400
+++ dhcp-0.10/dhcp6r.sh	2007-09-10 13:04:13.000000000 -0400
@@ -1,14 +1,29 @@
-#!/bin/bash
+#!/bin/sh
 #
-# chkconfig: - 66 36
-# description: dhcp6r supports the DHCPv6 relay agent protocol.
+### BEGIN INIT INFO
+# Provides: dhcp6r
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start: $network
+# Required-Start:
+# Required-Stop:
+# Short-Description: Start and stop the DHCPv6 relay agent
+# Description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages
+#              from clients to servers and vice versa.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
+#
+# chkconfig: - 2345 66 36
+# description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages \
+#              from clients to servers and vice versa.
 # processname: dhcp6r
 # config: /etc/sysconfig/dhcp6r
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcp6r
 dhcp6r=/usr/sbin/dhcp6r
 lockfile=/var/lock/subsys/dhcp6r
@@ -39,7 +54,9 @@ stop() {
     killproc $prog -TERM
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && success || failure
+    echo
+    rm -f $lockfile
     return $RETVAL
 }
 
@@ -47,21 +64,22 @@ stop() {
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    reload)
+    try-restart|reload)
         RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
         fi
         ;;
     status)
@@ -69,7 +87,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
         RETVAL=3
         ;;
 esac
diff -up dhcp-0.10/dhcp6s.sh.lsb dhcp-0.10/dhcp6s.sh
--- dhcp-0.10/dhcp6s.sh.lsb	2007-09-10 12:52:07.000000000 -0400
+++ dhcp-0.10/dhcp6s.sh	2007-09-10 13:23:04.000000000 -0400
@@ -1,16 +1,36 @@
-#!/bin/bash
+#!/bin/sh
 #
-# chkconfig: - 66 36
-# description: dhcp6s supports the server side of Dynamic Host Configuration \
-#              Protocol for IPv6.
+### BEGIN INIT INFO
+# Provides: dhcp6s
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start: $network
+# Required-Start:
+# Required-Stop:
+# Short-Description: Start and stop the DHCPv6 server agent
+# Description: dhcp6s provides IPv6 addresses and prefix assignment
+#              administrative policy and configuration information for
+#              DHCPv6 clients.  dhcp6s also manages those addresses and
+#              prefixes, such as IPv6 addresses, prefixes, DNS server
+#              addresses, or ntp server addresses.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
+#
+# chkconfig: - 2345 66 36
+# description: dhcp6s provides IPv6 addresses and prefix assignment \
+#              administrative policy and configuration information for \
+#              DHCPv6 clients.  dhcp6s also manages those addresses and \
+#              prefixes, such as IPv6 addresses, prefixes, DNS server \
+#              addresses, or ntp server addresses.
 # processname: dhcp6s
 # config: /etc/dhcp6s.conf
 # config: /etc/sysconfig/dhcp6s
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcp6s
 dhcp6s=/usr/sbin/dhcp6s
 lockfile=/var/lock/subsys/dhcp6s
@@ -46,7 +66,9 @@ stop() {
     killproc $prog -TERM
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL -eq 0 ] && success || failure
+    echo
+    rm -f $lockfile
     return $RETVAL
 }
 
@@ -54,21 +76,22 @@ stop() {
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    reload)
+    try-restart|reload)
         RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
         fi
         ;;
     status)
@@ -76,7 +99,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
         RETVAL=3
         ;;
 esac

dhcpv6-0.10-reassign-global.patch:

--- NEW FILE dhcpv6-0.10-reassign-global.patch ---
diff -up dhcp-0.10/dhcp6c.c.global dhcp-0.10/dhcp6c.c
--- dhcp-0.10/dhcp6c.c.global	2007-09-10 13:57:04.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2007-09-10 13:58:03.000000000 -0400
@@ -1977,8 +1977,8 @@ static struct dhcp6_timer 
 			 * send confirm for ipv6address or 
 			 * rebind for prefix delegation */
 			dhcp6_remove_timer(client6_iaidaddr.timer);
-			client6_request_flag &= CLIENT6_CONFIRM_ADDR;
-			create_request_list(0);
+			client6_request_flag |= CLIENT6_CONFIRM_ADDR;
+			create_request_list(1);
 			if (client6_iaidaddr.client6_info.type == IAPD)
 				newstate = DHCP6S_REBIND;
 			else

dhcpv6-0.10-remove-leases.patch:

--- NEW FILE dhcpv6-0.10-remove-leases.patch ---
diff -up dhcp-0.10/client6_addr.c.leases dhcp-0.10/client6_addr.c
--- dhcp-0.10/client6_addr.c.leases	2007-09-10 13:44:36.000000000 -0400
+++ dhcp-0.10/client6_addr.c	2007-09-10 13:45:23.000000000 -0400
@@ -386,6 +386,7 @@ dhcp6_update_iaidaddr(struct dhcp6_optin
 		}
 		continue;
 	}
+#if 0
 	/* remove leases that not on the updated list */
 	for (cl = TAILQ_FIRST(&client6_iaidaddr.lease_list); cl; cl = cl_next) { 
 			cl_next = TAILQ_NEXT(cl, link);
@@ -394,7 +395,8 @@ dhcp6_update_iaidaddr(struct dhcp6_optin
 		/* remove leases that not on the updated list */
 		if (lv == NULL)
 			dhcp6_remove_lease(cl);
-	}	
+	}
+#endif
 	/* update server id */
 	if (client6_iaidaddr.state == REBIND) {
 		if (duidcpy(&client6_iaidaddr.client6_info.serverid, &optinfo->serverID)) {

dhcpv6-0.10-retransmit-confirm.patch:

--- NEW FILE dhcpv6-0.10-retransmit-confirm.patch ---
diff -up dhcp-0.10/dhcp6.h.retransmit dhcp-0.10/dhcp6.h
--- dhcp-0.10/dhcp6.h.retransmit	2007-09-10 13:48:28.000000000 -0400
+++ dhcp-0.10/dhcp6.h	2007-09-10 13:49:01.000000000 -0400
@@ -88,7 +88,7 @@
 #define REC_TIMEOUT	2000
 #define REC_MAX_RC	8
 #define CNF_TIMEOUT	1000
-#define CNF_MAX_RD	10000
+#define CNF_MAX_RD	10
 #define CNF_MAX_RT	4000
 
 #define DHCP6_DURATITION_INFINITE 0xffffffff


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- dhcpv6.spec	10 Sep 2007 15:47:41 -0000	1.63
+++ dhcpv6.spec	10 Sep 2007 18:03:29 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 48%{?dist}
+Release: 49%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -18,6 +18,12 @@
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-init_leases.patch
 Patch8:  %{name}-0.10-device-names.patch
+Patch9:  %{name}-0.10-lsb.patch
+Patch10: %{name}-0.10-IA_NA-ignore.patch
+Patch11: %{name}-0.10-remove-leases.patch
+Patch12: %{name}-0.10-retransmit-confirm.patch
+Patch13: %{name}-0.10-elapsed-time.patch
+Patch14: %{name}-0.10-reassign-global.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -58,7 +64,7 @@
 %package -n libdhcp6client-devel
 Summary:  Header files for development with the DHCPv6 client library
 Group:    Development/Libraries
-Requires: pkgconfig, %{name} = %{version}-%{release}
+Requires: pkgconfig, libdhcp6client = %{version}-%{release}
 
 %description -n libdhcp6client-devel
 Header files for development with the DHCPv6 client library.
@@ -83,6 +89,12 @@
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .init_leases
 %patch8 -p1 -b .device-names
+%patch9 -p1 -b .lsb
+%patch10 -p1 -b .ia_na_ignore
+%patch11 -p1 -b .remove_leases
+%patch12 -p1 -b .retransmit
+%patch13 -p1 -b .elapsed
+%patch14 -p1 -b .reassign
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -177,6 +189,14 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
+- Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
+- Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)
+- In dhcp6c, do not remove leases no on the updated list (#265761)
+- Retransmit confirm message in expected duration in dhcp6c (#251192)
+- Store correct value to elapsed time option in solicit msg (#249451)
+- Reassign IPv6 global address after confirm/reply msg in dhcp6c (#249466)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-48
 - Recognize 802.1Q VLAN network device names (#245115)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:04:05 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:04:05 -0400
Subject: rpms/postr/devel .cvsignore, 1.3, 1.4 postr.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <200709101804.l8AI45eb026116@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25920

Modified Files:
	.cvsignore postr.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jun 2007 08:04:56 -0000	1.3
+++ .cvsignore	10 Sep 2007 18:03:30 -0000	1.4
@@ -1 +1 @@
-postr-0.7.tar.gz
+postr-0.8.tar.gz


Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/postr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postr.spec	16 Jun 2007 08:04:56 -0000	1.2
+++ postr.spec	10 Sep 2007 18:03:30 -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:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2007 08:04:56 -0000	1.3
+++ sources	10 Sep 2007 18:03:30 -0000	1.4
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:12:34 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Mon, 10 Sep 2007 14:12:34 -0400
Subject: rpms/libflaim/devel libflaim.spec,1.2,1.3
Message-ID: <200709101812.l8AICYX0026959@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26895

Modified Files:
	libflaim.spec 
Log Message:



Index: libflaim.spec
===================================================================
RCS file: /cvs/extras/rpms/libflaim/devel/libflaim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libflaim.spec	8 Sep 2007 00:12:05 -0000	1.2
+++ libflaim.spec	10 Sep 2007 18:11:59 -0000	1.3
@@ -15,7 +15,7 @@
 Summary:	Embeddable cross-platform database engine
 URL:		http://forge.novell.com/modules/xfmod/project/?flaim
 Version:	4.9.989
-Release:	12%{?dist}
+Release:	15%{?dist}
 License:	GPLv2
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
@@ -73,6 +73,9 @@
 %{_includedir}/flaimtk.h
 
 %changelog
+* Mon Sep 10 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-15
+- bump release for EVR issues
+
 * Sat Sep  8 2007 Christopher Brown <snecklifter at gmail.com> - 4.9.989-12
 - build system issue
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:16:27 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:16:27 -0400
Subject: rpms/postr/devel postr.spec,1.3,1.4
Message-ID: <200709101816.l8AIGR9X027245@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27219

Modified Files:
	postr.spec 
Log Message:
Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/devel/postr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postr.spec	10 Sep 2007 18:03:30 -0000	1.3
+++ postr.spec	10 Sep 2007 18:15:54 -0000	1.4
@@ -6,7 +6,7 @@
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,7 @@
 %changelog
 * Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
 - New upstream
+- Updated license tag.
 
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.



From fedora-extras-commits at redhat.com  Mon Sep 10 18:21:40 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Sep 2007 14:21:40 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-kde149704.diff, 1.1.2.1,
	1.1.2.2 kdelibs.spec, 1.223.2.17, 1.223.2.18
Message-ID: <200709101821.l8AILeSF027473@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27448/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-kde149704.diff kdelibs.spec 
Log Message:
use upstream fix (by David Faure) for kde#149704

kdelibs-3.93.0-kde149704.diff:

Index: kdelibs-3.93.0-kde149704.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kdelibs-3.93.0-kde149704.diff,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- kdelibs-3.93.0-kde149704.diff	10 Sep 2007 06:00:08 -0000	1.1.2.1
+++ kdelibs-3.93.0-kde149704.diff	10 Sep 2007 18:21:37 -0000	1.1.2.2
@@ -1,15 +1,71 @@
-diff -ur kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp
---- kdelibs-3.93.0/kdeui/xmlgui/kxmlguiclient.cpp	2007-08-29 23:53:46.000000000 +0200
-+++ kdelibs-3.93.0-kde149704/kdeui/xmlgui/kxmlguiclient.cpp	2007-09-10 06:09:18.000000000 +0200
-@@ -341,6 +341,11 @@
+Index: xmlgui/kxmlguiclient.cpp
+===================================================================
+--- xmlgui/kxmlguiclient.cpp	(revision 709581)
++++ xmlgui/kxmlguiclient.cpp	(working copy)
+@@ -785,11 +785,11 @@
+     allDocuments.append( d );
+   }
  
-     QStringList allFiles = componentData().dirs()->findAllResources("data", filter) + componentData().dirs()->findAllResources("data", _file);
+-  QList<DocStruct>::Iterator best = allDocuments.end();
++  QList<DocStruct>::const_iterator best = allDocuments.end();
+   uint bestVersion = 0;
  
-+    if (allFiles.isEmpty() || allFiles.first().startsWith("/usr/"))
-+    {
-+      allFiles.prepend(KStandardDirs::locateLocal("data", filter));
-+    }
-+
-     file = findMostRecentXMLFile( allFiles, doc );
+-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
+-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
++  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
++  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
+   for (; docIt != docEnd; ++docIt )
+   {
+     QString versionStr = findVersionNumber( (*docIt).data );
+@@ -814,19 +814,19 @@
+   {
+     if ( best != allDocuments.begin() )
+     {
+-      QList<DocStruct>::Iterator local = allDocuments.begin();
++      QList<DocStruct>::iterator local = allDocuments.begin();
++      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
  
-     if ( file.isEmpty() )
+-      // load the local document and extract the action properties
+-      QDomDocument document;
+-      document.setContent( (*local).data );
++        // load the local document and extract the action properties
++        QDomDocument document;
++        document.setContent( (*local).data );
+ 
+-      ActionPropertiesMap properties = extractActionProperties( document );
++        ActionPropertiesMap properties = extractActionProperties( document );
+ 
+-      // in case the document has a ActionProperties section
+-      // we must not delete it but copy over the global doc
+-      // to the local and insert the ActionProperties section
+-      if ( !properties.isEmpty() )
+-      {
++        // in case the document has a ActionProperties section
++        // we must not delete it but copy over the global doc
++        // to the local and insert the ActionProperties section
++        if ( !properties.isEmpty() ) {
+           // now load the global one with the higher version number
+           // into memory
+           document.setContent( (*best).data );
+@@ -845,14 +845,14 @@
+             f.write( utf8data.constData(), utf8data.length() );
+             f.close();
+           }
++        }
++        else
++        {
++          QString f = (*local).file;
++          QString backup = f + QLatin1String( ".backup" );
++          QFile::rename( f, backup );
++        }
+       }
+-      else
+-      {
+-        QString f = (*local).file;
+-        QString backup = f + QLatin1String( ".backup" );
+-        QDir dir;
+-        dir.rename( f, backup );
+-      }
+     }
+     doc = (*best).data;
+     return (*best).file;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.17
retrieving revision 1.223.2.18
diff -u -r1.223.2.17 -r1.223.2.18
--- kdelibs.spec	10 Sep 2007 06:00:08 -0000	1.223.2.17
+++ kdelibs.spec	10 Sep 2007 18:21:37 -0000	1.223.2.18
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -108,7 +108,9 @@
 %setup -q -n kdelibs-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+pushd kdeui
+%patch2 -p0
+popd
 %patch3 -p1
 
 
@@ -215,6 +217,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
+- use upstream fix (by David Faure) for kde#149704
+
 * Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - fix kde#149703, kde#149704, kde#149705
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:25:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 14:25:14 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.52,
	1.53 selinux-policy.spec, 1.492, 1.493
Message-ID: <200709101825.l8AIPE1H027767@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27741

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- policy-20070501.patch	4 Sep 2007 20:18:57 -0000	1.52
+++ policy-20070501.patch	10 Sep 2007 18:25:11 -0000	1.53
@@ -469,12 +469,12 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-08-30 10:26:28.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te	2007-09-07 17:06:51.000000000 -0400
 @@ -22,6 +22,7 @@
  
  # Allow dmidecode to read /dev/mem
  dev_read_raw_memory(dmidecode_t)
-+dev_search_sysfs(dmidecode_t)
++dev_read_sysfs(dmidecode_t)
  
  mls_file_read_up(dmidecode_t)
  
@@ -2512,8 +2512,33 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.6.4/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-08-07 09:42:35.000000000 -0400
-@@ -333,6 +333,24 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.if	2007-09-10 08:58:54.000000000 -0400
+@@ -108,6 +108,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Set the priority of kernel threads.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_setsched',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:process setsched;
++')
++
++########################################
++## <summary>
+ ##	Send a SIGCHLD signal to kernel threads.
+ ## </summary>
+ ## <param name="domain">
+@@ -333,6 +351,24 @@
  
  ########################################
  ## <summary>
@@ -2538,7 +2563,7 @@
  ##	Allow link to the kernel key ring.
  ## </summary>
  ## <param name="domain">
-@@ -1848,6 +1866,26 @@
+@@ -1848,6 +1884,26 @@
  
  ########################################
  ## <summary>
@@ -2565,7 +2590,7 @@
  ##	Do not audit attempts to list unlabeled directories.
  ## </summary>
  ## <param name="domain">
-@@ -2158,9 +2196,6 @@
+@@ -2158,9 +2214,6 @@
  	')
  
  	allow $1 unlabeled_t:association { sendto recvfrom };
@@ -2887,7 +2912,7 @@
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.6.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-08-30 13:53:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apache.if	2007-09-05 07:17:12.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -2899,6 +2924,22 @@
  	#This type is for webpages
  	type httpd_$1_content_t, httpdcontent; # customizable
  	files_type(httpd_$1_content_t)
+@@ -65,13 +61,13 @@
+ 	dontaudit httpd_$1_script_t httpd_t:unix_stream_socket { read write };
+ 
+ 	# Allow the script process to search the cgi directory, and users directory
+-	allow httpd_$1_script_t httpd_$1_content_t:dir search_dir_perms;
++	allow httpd_$1_script_t httpd_$1_content_t:dir list_dir_perms;
+ 
+ 	append_files_pattern(httpd_$1_script_t,httpd_log_t,httpd_log_t)
+ 	logging_search_logs(httpd_$1_script_t)
+ 
+ 	can_exec(httpd_$1_script_t, httpd_$1_script_exec_t)
+-	allow httpd_$1_script_t httpd_$1_script_exec_t:dir search_dir_perms;
++	allow httpd_$1_script_t httpd_$1_script_exec_t:dir list_dir_perms;
+ 
+ 	allow httpd_$1_script_t httpd_$1_script_ra_t:dir { list_dir_perms add_entry_dir_perms };
+ 	read_files_pattern(httpd_$1_script_t,httpd_$1_script_ra_t,httpd_$1_script_ra_t)
 @@ -120,10 +116,6 @@
  		can_exec(httpd_$1_script_t, httpdcontent)
  	')
@@ -3567,7 +3608,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.6.4/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/apcupsd.te	2007-09-10 10:51:56.000000000 -0400
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -3587,7 +3628,7 @@
  allow apcupsd_t self:fifo_file rw_file_perms;
  allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
  allow apcupsd_t self:tcp_socket create_stream_socket_perms;
-@@ -35,16 +40,23 @@
+@@ -35,16 +40,24 @@
  manage_files_pattern(apcupsd_t,apcupsd_log_t,apcupsd_log_t)
  logging_log_filetrans(apcupsd_t,apcupsd_log_t,{ file dir })
  
@@ -3610,10 +3651,11 @@
 +corenet_tcp_bind_apcupsd_port(apcupsd_t)
 +corenet_sendrecv_apcupsd_server_packets(apcupsd_t)
 +corenet_tcp_connect_apcupsd_port(apcupsd_t)
++allow apcupsd_t self:udp_socket create_socket_perms;
  
  dev_rw_generic_usb_dev(apcupsd_t)
  
-@@ -53,6 +65,15 @@
+@@ -53,6 +66,15 @@
  
  files_read_etc_files(apcupsd_t)
  files_search_locks(apcupsd_t)
@@ -3629,13 +3671,15 @@
  
  libs_use_ld_so(apcupsd_t)
  libs_use_shared_libs(apcupsd_t)
-@@ -61,7 +82,39 @@
+@@ -61,7 +83,41 @@
  
  miscfiles_read_localization(apcupsd_t)
  
 -ifdef(`targeted_policy',`
 -	term_dontaudit_use_unallocated_ttys(apcupsd_t)
 -	term_dontaudit_use_generic_ptys(apcupsd_t)
++sysnet_dns_name_resolve(apcupsd_t)
++
 +userdom_use_unpriv_users_ttys(apcupsd_t)
 +userdom_use_unpriv_users_ptys(apcupsd_t)
 +
@@ -6605,7 +6649,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-2.6.4/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.fc	2007-09-04 17:47:25.000000000 -0400
 @@ -5,6 +5,7 @@
  /usr/libexec/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
  /usr/libexec/postfix/lmtp --	gen_context(system_u:object_r:postfix_smtp_exec_t,s0)
@@ -9011,7 +9055,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.6.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-05 12:06:43.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -9070,7 +9114,7 @@
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t)
  userdom_dontaudit_use_sysadm_terms(system_chkpwd_t)
-@@ -302,6 +311,38 @@
+@@ -302,6 +311,36 @@
  ')
  
  optional_policy(`
@@ -9099,16 +9143,14 @@
 +miscfiles_read_localization(updpwd_t)
 +
 +auth_manage_shadow(updpwd_t)
++auth_use_nsswitch(updpwd_t)
++
 +term_dontaudit_use_console(updpwd_t)
 +term_dontaudit_use_console(updpwd_t)
 +term_dontaudit_use_unallocated_ttys(updpwd_t)
 +files_manage_etc_files(updpwd_t)
 +kernel_read_system_state(updpwd_t)
 +logging_send_syslog_msg(updpwd_t)
-+
-+optional_policy(`
-+	nscd_socket_use(updpwd_t)
-+')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.fc serefpolicy-2.6.4/policy/modules/system/brctl.fc
 --- nsaserefpolicy/policy/modules/system/brctl.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/system/brctl.fc	2007-08-07 09:42:35.000000000 -0400
@@ -9145,8 +9187,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-2.6.4/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2007-08-07 09:42:35.000000000 -0400
-@@ -0,0 +1,50 @@
++++ serefpolicy-2.6.4/policy/modules/system/brctl.te	2007-09-10 08:59:30.000000000 -0400
+@@ -0,0 +1,51 @@
 +policy_module(brctl,1.0.0)
 +
 +########################################
@@ -9169,6 +9211,7 @@
 +allow brctl_t self:tcp_socket create_socket_perms;
 +allow brctl_t self:unix_dgram_socket create_socket_perms;
 +
++dev_write_sysfs_dirs(brctl_t)
 +dev_rw_sysfs(brctl_t)
 +
 +# Init script handling
@@ -10451,7 +10494,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.6.4/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-08-21 09:08:39.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/modutils.te	2007-09-10 08:58:12.000000000 -0400
 @@ -43,7 +43,7 @@
  # insmod local policy
  #
@@ -10461,7 +10504,15 @@
  allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
  
  allow insmod_t self:udp_socket create_socket_perms; 
-@@ -80,6 +80,8 @@
+@@ -64,6 +64,7 @@
+ kernel_read_kernel_sysctls(insmod_t)
+ kernel_rw_kernel_sysctl(insmod_t)
+ kernel_read_hotplug_sysctls(insmod_t)
++kernel_setsched(insmod_t)
+ 
+ files_read_kernel_modules(insmod_t)
+ # for locking: (cjp: ????)
+@@ -80,6 +81,8 @@
  # cjp: why is this needed?  insmod cannot mounton any dir
  # and it also transitions to mount
  dev_mount_usbfs(insmod_t)
@@ -10470,7 +10521,7 @@
  
  fs_getattr_xattr_fs(insmod_t)
  
-@@ -102,6 +104,7 @@
+@@ -102,6 +105,7 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
  init_use_script_ptys(insmod_t)
@@ -10478,7 +10529,7 @@
  
  libs_use_ld_so(insmod_t)
  libs_use_shared_libs(insmod_t)
-@@ -123,6 +126,18 @@
+@@ -123,6 +127,18 @@
  ')
  
  optional_policy(`
@@ -10497,7 +10548,7 @@
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -155,6 +170,7 @@
+@@ -155,6 +171,7 @@
  
  optional_policy(`
  	rpm_rw_pipes(insmod_t)
@@ -10505,7 +10556,7 @@
  ')
  
  optional_policy(`
-@@ -185,6 +201,7 @@
+@@ -185,6 +202,7 @@
  
  files_read_kernel_symbol_table(depmod_t)
  files_read_kernel_modules(depmod_t)
@@ -10714,7 +10765,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.6.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if	2007-09-04 16:32:23.000000000 -0400
 @@ -445,6 +445,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -10749,6 +10800,35 @@
  	manage_files_pattern($1,selinux_config_t,selinux_config_t)
  	read_lnk_files_pattern($1,selinux_config_t,selinux_config_t)
  ')
+@@ -791,6 +795,28 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit Read the file_contexts files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`seutil_dontaudit_read_file_contexts',`
++	gen_require(`
++		type selinux_config_t, default_context_t, file_context_t;
++	')
++
++	files_search_etc($1)
++	dontaudit $1 { selinux_config_t default_context_t }:dir search_dir_perms;
++	dontaudit $1 file_context_t:dir search_dir_perms;
++	dontaudit $1 file_context_t:file r_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Read and write the file_contexts files.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-08-07 09:42:35.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- selinux-policy.spec	4 Sep 2007 20:18:57 -0000	1.492
+++ selinux-policy.spec	10 Sep 2007 18:25:11 -0000	1.493
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 41%{?dist}
+Release: 42%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,10 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
+- Allow modprobe to setsched on kernel
+
+
 * Tue Sep 4 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-41
 - Allow ktalkd to look at terminals
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:26:20 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 10 Sep 2007 14:26:20 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.47, 1.48 sources, 1.48,
	1.49 sugar.spec, 1.56, 1.57
Message-ID: <200709101826.l8AIQK3U027902@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	9 Sep 2007 05:24:44 -0000	1.47
+++ .cvsignore	10 Sep 2007 18:25:47 -0000	1.48
@@ -1,3 +1 @@
-sugar-0.65-gitc8700feccf.tar.bz2
-sugar-0.65-git6b6470ebcb.tar.bz2
-sugar-0.65-gita1f5cece18.tar.bz2
+sugar-0.65-git79237f3114.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	9 Sep 2007 05:24:44 -0000	1.48
+++ sources	10 Sep 2007 18:25:47 -0000	1.49
@@ -1 +1 @@
-a8c99692c40eb2ee2b991a101c643a9f  sugar-0.65-gita1f5cece18.tar.bz2
+3ca3e5e4e8d1d024ae7c01de5ebeafe3  sugar-0.65-git79237f3114.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sugar.spec	9 Sep 2007 05:24:44 -0000	1.56
+++ sugar.spec	10 Sep 2007 18:25:47 -0000	1.57
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070909git
-%define commitid a1f5cece18
+%define alphatag 20070910git
+%define commitid 79237f3114
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.44.%{alphatag}a1f5cece18
+Release: 0.45.%{alphatag}79237f3114
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.44.20070909gita1f5cece18
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:26:42 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:26:42 -0400
Subject: rpms/postr/F-7 postr.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200709101826.l8AIQgN4027946@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27665

Modified Files:
	postr.spec sources 
Log Message:
- New upstream version.
- Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/F-7/postr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postr.spec	16 Jun 2007 07:55:48 -0000	1.3
+++ postr.spec	10 Sep 2007 18:26:10 -0000	1.4
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+- Updated license tag.
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jun 2007 07:55:48 -0000	1.4
+++ sources	10 Sep 2007 18:26:10 -0000	1.5
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:31:22 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 10 Sep 2007 14:31:22 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sugar-datastore.spec, 1.23, 1.24
Message-ID: <200709101831.l8AIVMx2028311@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28234

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	9 Sep 2007 04:24:19 -0000	1.22
+++ .cvsignore	10 Sep 2007 18:30:49 -0000	1.23
@@ -1,3 +1 @@
-sugar-datastore-0.2.2-git356b35a278.tar.bz2
-sugar-datastore-0.2.2-gita111996299.tar.bz2
-sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2
+sugar-datastore-0.2.2-git617bf5d005.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Sep 2007 04:24:19 -0000	1.22
+++ sources	10 Sep 2007 18:30:49 -0000	1.23
@@ -1 +1 @@
-433ff1bdd4017e250e3d895897548f38  sugar-datastore-0.2.2-git0a7e80f01a.tar.bz2
+2a4e5ee382ea17f0d6730957ba96d940  sugar-datastore-0.2.2-git617bf5d005.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sugar-datastore.spec	9 Sep 2007 04:24:19 -0000	1.23
+++ sugar-datastore.spec	10 Sep 2007 18:30:49 -0000	1.24
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070909git
-%define commitid 0a7e80f01a
+%define alphatag 20070910git
+%define commitid 617bf5d005
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.19.%{alphatag}0a7e80f01a
+Release: 0.20.%{alphatag}617bf5d005
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
+- New snapshot
+
 * Sun Sep 09 2007 Dan Williams <dcbw at redhat.com> - 0.2.2-0.19.20070909git0a7e80f01a
 - New snapshot (async writes and ownership transfer on update/create)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 18:31:47 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 14:31:47 -0400
Subject: rpms/xsc/devel xsc.spec,1.2,1.3
Message-ID: <200709101831.l8AIVlkh028368@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28272

Modified Files:
	xsc.spec 
Log Message:
Probable BR, configure fix.



Index: xsc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/devel/xsc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsc.spec	10 Sep 2007 15:25:53 -0000	1.2
+++ xsc.spec	10 Sep 2007 18:31:14 -0000	1.3
@@ -10,7 +10,7 @@
 Source1: xsc.desktop
 Source2: xsc.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: libXt-devel, desktop-file-utils
+BuildRequires: desktop-file-utils, libX11-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -25,7 +25,7 @@
 
 %build
 
-%configure
+%configure --x-includes="" --x-libraries=""
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install



From fedora-extras-commits at redhat.com  Mon Sep 10 18:43:25 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 10 Sep 2007 14:43:25 -0400
Subject: rpms/xsc/F-7 xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709101843.l8AIhPJv028847@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28826

Modified Files:
	sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: desktop-file-utils, libX11-devel
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure --x-includes="" --x-libraries=""
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	10 Sep 2007 18:42:52 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 18:44:44 2007
From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd))
Date: Mon, 10 Sep 2007 14:44:44 -0400
Subject: rpms/postr/FC-6 postr.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200709101844.l8AIiit2028921@cvs-int.fedora.redhat.com>

Author: trondd

Update of /cvs/extras/rpms/postr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28895

Modified Files:
	postr.spec sources 
Log Message:
- New upstream version.
- Updated license tag.



Index: postr.spec
===================================================================
RCS file: /cvs/extras/rpms/postr/FC-6/postr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postr.spec	16 Jun 2007 08:08:38 -0000	1.2
+++ postr.spec	10 Sep 2007 18:44:11 -0000	1.3
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.8-1
+- New upstream
+- Updated license tag.
+
 * Tue Jun 16 2007 Trond Danielsen <trond.danielsen at gmail.com> - 0.7-1
 - New version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postr/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2007 08:08:38 -0000	1.3
+++ sources	10 Sep 2007 18:44:11 -0000	1.4
@@ -1 +1 @@
-1f2851b9cc3eb221b6d13a60b083c98f  postr-0.7.tar.gz
+131f746d00dad31c2634ab14184dc4fb  postr-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 19:33:02 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:33:02 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-file-checks.patch, NONE, 1.1 dhcpv6.spec,
	1.57, 1.58 dhcpv6-0.10-init_leases.patch, 1.1, NONE
Message-ID: <200709101933.l8AJX2WP003807@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3780

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-file-checks.patch 
Removed Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
- Fix more segfaults when dhcp6s starts with empty control files (#253968)


dhcpv6-0.10-file-checks.patch:

--- NEW FILE dhcpv6-0.10-file-checks.patch ---
diff -up dhcp-0.10/dhcp6s.c.file_check dhcp-0.10/dhcp6s.c
--- dhcp-0.10/dhcp6s.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2007-09-10 15:25:12.000000000 -0400
@@ -1096,13 +1096,14 @@ static struct dhcp6_timer
 	struct timeval timo;
 	struct stat buf;
 	FILE *file;
-	stat(PATH_SERVER6_LEASE, &buf);
 	strcpy(server6_lease_temp, PATH_SERVER6_LEASE);
-	strcat(server6_lease_temp, "XXXXXX");	
-	if (buf.st_size > MAX_FILE_SIZE) {
-		file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
-		if (file != NULL)
-			server6_lease_file = file;
+	strcat(server6_lease_temp, "XXXXXX");
+	if (!stat(PATH_SERVER6_LEASE, &buf)) {
+		if (buf.st_size > MAX_FILE_SIZE) {
+			file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
+			if (file != NULL)
+				server6_lease_file = file;
+		}
 	}
 	d = DHCP6_SYNCFILE_TIME;
 	timo.tv_sec = (long)d;
diff -up dhcp-0.10/lease.c.file_check dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-10 15:26:18.000000000 -0400
@@ -180,18 +180,30 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
-	file = fopen(name, "a+");
+	struct stat stbuf;
+	if (name != NULL) {
+		file = fopen(name, "a+");
+	} else {
+		dprintf(LOG_ERR, "%s" "no lease file specified", FNAME);
+		return (NULL);
+	}
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (stat(name, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- dhcpv6.spec	4 Sep 2007 17:59:11 -0000	1.57
+++ dhcpv6.spec	10 Sep 2007 19:32:30 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,7 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
-Patch7:  %{name}-0.10-init_leases.patch
+Patch7:  %{name}-0.10-file-checks.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -69,7 +69,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
-%patch7 -p1 -b .init_leases
+%patch7 -p1 -b .file_check
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -162,6 +162,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
+- Fix more segfaults when dhcp6s starts with empty control files (#253968)
+
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)
 


--- dhcpv6-0.10-init_leases.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:35:52 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:35:52 -0400
Subject: rpms/dhcpv6/F-7 dhcpv6-0.10-device-names.patch, NONE,
	1.1 dhcpv6.spec, 1.58, 1.59
Message-ID: <200709101935.l8AJZqq4003966@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3927

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-device-names.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
- Fix more segfaults when dhcp6s starts with empty control files (#253968)
- Recognize 802.1Q VLAN network device names (#245115)


dhcpv6-0.10-device-names.patch:

--- NEW FILE dhcpv6-0.10-device-names.patch ---
diff -up dhcp-0.10/server6_token.l.string dhcp-0.10/server6_token.l
--- dhcp-0.10/server6_token.l.string	2007-09-10 11:43:04.000000000 -0400
+++ dhcp-0.10/server6_token.l	2007-09-10 11:43:58.000000000 -0400
@@ -79,7 +79,7 @@ addr_tail       ({hexdigit}{1,4}|({hexdi
 addr_body       ({hexdigit}{1,4}(":"|"::"))*
 ipv6addr        {addr_head}{addr_body}{addr_tail}
 string		[a-zA-Z0-9:\._-][a-zA-Z0-9:\._-]*
-ifname		[a-zA-Z]+[0-9]+
+ifname		({string})+
 
 %s S_IFACE
 %s S_DUID


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/F-7/dhcpv6.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- dhcpv6.spec	10 Sep 2007 19:32:30 -0000	1.58
+++ dhcpv6.spec	10 Sep 2007 19:35:19 -0000	1.59
@@ -17,6 +17,7 @@
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
 Patch7:  %{name}-0.10-file-checks.patch
+Patch8:  %{name}-0.10-device-names.patch
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
@@ -70,6 +71,7 @@
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
 %patch7 -p1 -b .file_check
+%patch8 -p1 -b .device-names
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -164,6 +166,7 @@
 %changelog
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-44
 - Fix more segfaults when dhcp6s starts with empty control files (#253968)
+- Recognize 802.1Q VLAN network device names (#245115)
 
 * Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
 - Do not parse an empty /var/lib/dhcpv6/server6.leases file (#253968)



From fedora-extras-commits at redhat.com  Mon Sep 10 19:39:14 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Mon, 10 Sep 2007 15:39:14 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-file-checks.patch, NONE,
	1.1 dhcpv6.spec, 
	1.64, 1.65 dhcpv6-0.10-init_leases.patch, 1.1, NONE
Message-ID: <200709101939.l8AJdECF004203@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-file-checks.patch 
Removed Files:
	dhcpv6-0.10-init_leases.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-50
- Fix more segfaults when dhcp6s starts with empty control files (#253968)


dhcpv6-0.10-file-checks.patch:

--- NEW FILE dhcpv6-0.10-file-checks.patch ---
diff -up dhcp-0.10/dhcp6s.c.file_check dhcp-0.10/dhcp6s.c
--- dhcp-0.10/dhcp6s.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2007-09-10 15:25:12.000000000 -0400
@@ -1096,13 +1096,14 @@ static struct dhcp6_timer
 	struct timeval timo;
 	struct stat buf;
 	FILE *file;
-	stat(PATH_SERVER6_LEASE, &buf);
 	strcpy(server6_lease_temp, PATH_SERVER6_LEASE);
-	strcat(server6_lease_temp, "XXXXXX");	
-	if (buf.st_size > MAX_FILE_SIZE) {
-		file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
-		if (file != NULL)
-			server6_lease_file = file;
+	strcat(server6_lease_temp, "XXXXXX");
+	if (!stat(PATH_SERVER6_LEASE, &buf)) {
+		if (buf.st_size > MAX_FILE_SIZE) {
+			file = sync_leases(server6_lease_file, PATH_SERVER6_LEASE, server6_lease_temp);
+			if (file != NULL)
+				server6_lease_file = file;
+		}
 	}
 	d = DHCP6_SYNCFILE_TIME;
 	timo.tv_sec = (long)d;
diff -up dhcp-0.10/lease.c.file_check dhcp-0.10/lease.c
--- dhcp-0.10/lease.c.file_check	2007-09-10 15:25:12.000000000 -0400
+++ dhcp-0.10/lease.c	2007-09-10 15:26:18.000000000 -0400
@@ -180,18 +180,30 @@ FILE *
 init_leases(const char *name)
 {
 	FILE *file;
-	file = fopen(name, "a+");
+	struct stat stbuf;
+	if (name != NULL) {
+		file = fopen(name, "a+");
+	} else {
+		dprintf(LOG_ERR, "%s" "no lease file specified", FNAME);
+		return (NULL);
+	}
 	if(!file) {
 		dprintf(LOG_ERR, "%s" "could not open lease file", FNAME);
 		return (NULL);
 	}
+	if (stat(name, &stbuf)) {
+		dprintf(LOG_ERR, "%s" "could not stat lease file", FNAME);
+		return (NULL);
+	}
 	if (dhcp6_mode == DHCP6_MODE_SERVER) {
 		if (0 != init_lease_hashes()) {
 			dprintf(LOG_ERR, "%s" "Could not initialize hash arrays", FNAME);
 			return (NULL);
 		}
 	}
-	lease_parse(file);
+	if (stbuf.st_size > 0 ) {
+		lease_parse(file);
+	}
 	return file;
 } 
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- dhcpv6.spec	10 Sep 2007 18:03:29 -0000	1.64
+++ dhcpv6.spec	10 Sep 2007 19:38:42 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -16,7 +16,7 @@
 Patch4:  %{name}-0.10-no-strlcat.patch
 Patch5:  %{name}-0.10-salen.patch
 Patch6:  %{name}-0.10-initscripts.patch
-Patch7:  %{name}-0.10-init_leases.patch
+Patch7:  %{name}-0.10-file-checks.patch
 Patch8:  %{name}-0.10-device-names.patch
 Patch9:  %{name}-0.10-lsb.patch
 Patch10: %{name}-0.10-IA_NA-ignore.patch
@@ -87,7 +87,7 @@
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
 %patch6 -p1 -b .initscripts
-%patch7 -p1 -b .init_leases
+%patch7 -p1 -b .file-checks
 %patch8 -p1 -b .device-names
 %patch9 -p1 -b .lsb
 %patch10 -p1 -b .ia_na_ignore
@@ -189,6 +189,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-50
+- Fix more segfaults when dhcp6s starts with empty control files (#253968)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 0.10-49
 - Make dhcp6r and dhcp6s init scripts conform to Fedora guidelines (#246909)
 - Let dhcp6c ignore reply msgs that contain IA_NA with T1 > T2 (#254194)


--- dhcpv6-0.10-init_leases.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:45:06 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 15:45:06 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.30,
	1.31 policycoreutils.spec, 1.445, 1.446
Message-ID: <200709101945.l8AJj6N5004463@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4436

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
- Lots of fixes for polgengui


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policycoreutils-gui.patch	10 Sep 2007 16:19:23 -0000	1.30
+++ policycoreutils-gui.patch	10 Sep 2007 19:45:03 -0000	1.31
@@ -914,8 +914,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 11:56:01.000000000 -0400
-@@ -0,0 +1,2364 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 15:42:48.000000000 -0400
+@@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -1028,8 +1028,7 @@
 +      <child>
 +	<widget class="GtkNotebook" id="notebook1">
 +	  <property name="visible">True</property>
-+	  <property name="can_focus">True</property>
-+	  <property name="show_tabs">True</property>
++	  <property name="show_tabs">False</property>
 +	  <property name="show_border">True</property>
 +	  <property name="tab_pos">GTK_POS_TOP</property>
 +	  <property name="scrollable">False</property>
@@ -1080,7 +1079,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="select_type_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select application or user type that you want to confine.</property>
++	      <property name="title" translatable="yes">Select application or user role to be confined.</property>
 +	      <signal name="next" handler="on_select_type_page_next" last_modification_time="Sat, 04 Aug 2007 11:39:15 GMT"/>
 +
 +	      <child internal-child="vbox">
@@ -1773,6 +1772,29 @@
 +	  </child>
 +
 +	  <child>
++	    <widget class="GtkLabel" id="label30">
++	      <property name="visible">True</property>
++	      <property name="label" translatable="yes">label30</property>
++	      <property name="use_underline">False</property>
++	      <property name="use_markup">False</property>
++	      <property name="justify">GTK_JUSTIFY_LEFT</property>
++	      <property name="wrap">False</property>
++	      <property name="selectable">False</property>
++	      <property name="xalign">0.5</property>
++	      <property name="yalign">0.5</property>
++	      <property name="xpad">0</property>
++	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
++	    </widget>
++	    <packing>
++	      <property name="type">tab</property>
++	    </packing>
++	  </child>
++
++	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="roles_page">
 +	      <property name="visible">True</property>
 +	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
@@ -1824,9 +1846,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label30">
++	    <widget class="GtkLabel" id="label31">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label30</property>
++	      <property name="label" translatable="yes">label31</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2247,9 +2269,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label31">
++	    <widget class="GtkLabel" id="label32">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label31</property>
++	      <property name="label" translatable="yes">label32</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2563,9 +2585,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label32">
++	    <widget class="GtkLabel" id="label33">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label32</property>
++	      <property name="label" translatable="yes">label33</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2695,9 +2717,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label33">
++	    <widget class="GtkLabel" id="label34">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label33</property>
++	      <property name="label" translatable="yes">label34</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3025,9 +3047,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label34">
++	    <widget class="GtkLabel" id="label35">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label34</property>
++	      <property name="label" translatable="yes">label35</property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3141,9 +3163,9 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label35">
++	    <widget class="GtkLabel" id="label43">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label35</property>
++	      <property name="label" translatable="yes"></property>
 +	      <property name="use_underline">False</property>
 +	      <property name="use_markup">False</property>
 +	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3181,7 +3203,7 @@
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label43">
++	    <widget class="GtkLabel" id="label44">
 +	      <property name="visible">True</property>
 +	      <property name="label" translatable="yes"></property>
 +	      <property name="use_underline">False</property>
@@ -3282,8 +3304,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 11:58:05.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 15:43:11.000000000 -0400
+@@ -0,0 +1,453 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3572,7 +3594,8 @@
 +                my_policy.set_use_tmp(self.tmp_checkbutton.get_active() == 1)
 +                my_policy.set_use_uid(self.uid_checkbutton.get_active() == 1)
 +                my_policy.set_use_pam(self.pam_checkbutton.get_active() == 1)
-+                my_policy.set_init_script(self.script_entry.get_text())
++                if self.get_type() is polgen.DAEMON:
++                    my_policy.set_init_script(self.init_script_entry.get_text())
 +            else:
 +                if self.get_type() == polgen.RUSER:
 +                    selected = []
@@ -3738,8 +3761,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 12:16:38.000000000 -0400
-@@ -0,0 +1,719 @@
++++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
+@@ -0,0 +1,727 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -4207,6 +4230,13 @@
 +		newte += re.sub("TEMPLATETYPE", self.name, executable.te_cgi_rules)
 +		return newte
 +	
++	def generate_user_if(self):
++                newif = ""
++                if self.type == USER:
++                    newif += re.sub("TEMPLATETYPE", self.name, executable.if_user_program_rules)
++
++                return newif
++                
 +	def generate_if(self):
 +                newif = ""
 +                if self.program != "":
@@ -4221,6 +4251,7 @@
 +                                        if os.path.exists(i) and stat.S_ISSOCK(os.stat(i)[stat.ST_MODE]):
 +                                            newif += re.sub("TEMPLATETYPE", self.name, self.DEFAULT_DIRS[d][2].if_stream_rules)
 +                                            break
++                newif += self.generate_user_if()
 +                newif += self.generate_admin_if()
 +                
 +		return newif
@@ -8884,8 +8915,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-05 22:25:10.000000000 -0400
-@@ -0,0 +1,229 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-10 15:43:29.000000000 -0400
+@@ -0,0 +1,277 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8951,6 +8982,8 @@
 +type TEMPLATETYPE_t;
 +type TEMPLATETYPE_exec_t;
 +application_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++role system_r types TEMPLATETYPE_t;
++
 +"""
 +
 +te_cgi_types="""\
@@ -8995,6 +9028,22 @@
 +"""
 +
 +te_userapp_rules="""
++########################################
++#
++# TEMPLATETYPE local policy
++#
++
++## internal communication is often done using fifo and unix sockets.
++allow TEMPLATETYPE_t self:fifo_file rw_file_perms;
++allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(TEMPLATETYPE_t)
++
++libs_use_ld_so(TEMPLATETYPE_t)
++libs_use_shared_libs(TEMPLATETYPE_t)
++
++miscfiles_read_localization(TEMPLATETYPE_t)
++
 +"""
 +
 +te_cgi_rules="""
@@ -9032,11 +9081,41 @@
 +                type TEMPLATETYPE_exec_t;
 +	')
 +
-+	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++')
++
++"""
++
++if_user_program_rules="""
++########################################
++## <summary>
++##	Execute TEMPLATETYPE in the TEMPLATETYPE domain, and
++##	allow the specified role the TEMPLATETYPE domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the TEMPLATETYPE domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the role's terminal.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_run',`
++	gen_require(`
++		type TEMPLATETYPE_t;
++	')
 +
-+	allow TEMPLATETYPE_t $1:fd use;
-+	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
-+	allow TEMPLATETYPE_t $1:process sigchld;
++	TEMPLATETYPE_domtrans($1)
++	role $2 types TEMPLATETYPE_t;
++	dontaudit TEMPLATETYPE_t $3:chr_file rw_term_perms;
 +')
 +
 +"""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- policycoreutils.spec	10 Sep 2007 15:59:05 -0000	1.445
+++ policycoreutils.spec	10 Sep 2007 19:45:03 -0000	1.446
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
+- Lots of fixes for polgengui
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-10
 - Change Requires /bin/rpm to rpm
 



From fedora-extras-commits at redhat.com  Mon Sep 10 19:47:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:47:56 -0700
Subject: [pkgdb] boswars was added for jwrdegoede
Message-ID: <200709101947.l8AJlvEJ018320@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package boswars with summary Bos Wars is a futuristic real-time strategy game
Kevin Fenzi (kevin) has approved Package boswars
Kevin Fenzi (kevin) has added a Fedora devel branch for boswars with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved boswars in Fedora devel
Kevin Fenzi (kevin) has approved Package boswars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on boswars (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on boswars (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on boswars (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boswars



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:48:04 -0700
Subject: [pkgdb] boswars (Fedora, devel) updated by kevin
Message-ID: <200709101948.l8AJm5Og014700@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on boswars (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boswars



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:48:04 -0700
Subject: [pkgdb] boswars (Fedora, 7) updated by kevin
Message-ID: <200709101948.l8AJm5vs014709@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for boswars
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on boswars (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on boswars (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boswars



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:47 -0400
Subject: rpms/boswars - New directory
Message-ID: <200709101948.l8AJmlCR004694@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars

Log Message:
Directory /cvs/extras/rpms/boswars added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:53 -0400
Subject: rpms/boswars/devel - New directory
Message-ID: <200709101948.l8AJmrdh004710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars/devel

Log Message:
Directory /cvs/extras/rpms/boswars/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:56 -0400
Subject: rpms/boswars Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709101948.l8AJmuNe004737@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars

Added Files:
	Makefile import.log 
Log Message:
Setup of module boswars


--- NEW FILE Makefile ---
# Top level Makefile for module boswars
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:48:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:48:58 -0400
Subject: rpms/boswars/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709101948.l8AJmwMv004753@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKf4657/rpms/boswars/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module boswars


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: boswars
# $Id: Makefile,v 1.1 2007/09/10 19:48:56 kevin Exp $
NAME := boswars
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 fedora-extras-commits at redhat.com  Mon Sep 10 19:50:46 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 10 Sep 2007 15:50:46 -0400
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.3,1.4
Message-ID: <200709101950.l8AJok9R004922@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-ant-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4890

Modified Files:
	plexus-ant-factory.spec 
Log Message:

- bUild with maven




Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-ant-factory.spec	31 Aug 2007 21:42:12 -0000	1.3
+++ plexus-ant-factory.spec	10 Sep 2007 19:50:14 -0000	1.4
@@ -33,8 +33,6 @@
   %{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:
   %{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a1.2jpp.3%{?dist}
+Release:        0.1.a1.2jpp.4%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 License:        MIT-Style
@@ -211,6 +209,9 @@
 
 
 %changelog
+* Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.4
+- Build with maven
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.3
 - Build without maven (to build on ppc)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:51:21 -0700
Subject: [pkgdb] filezilla was added for kwizart
Message-ID: <200709101951.l8AJpLXs018349@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package filezilla with summary FileZilla FTP, FTPS and SFTP client
Kevin Fenzi (kevin) has approved Package filezilla
Kevin Fenzi (kevin) has added a Fedora devel branch for filezilla with an owner of kwizart
Kevin Fenzi (kevin) has approved filezilla in Fedora devel
Kevin Fenzi (kevin) has approved Package filezilla
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on filezilla (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on filezilla (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on filezilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/filezilla



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 12:51:22 -0700
Subject: [pkgdb] filezilla (Fedora, devel) updated by kevin
Message-ID: <200709101951.l8AJpM1D014732@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on filezilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/filezilla



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:38 -0400
Subject: rpms/filezilla - New directory
Message-ID: <200709101951.l8AJpcUr004988@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla

Log Message:
Directory /cvs/extras/rpms/filezilla added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:42 -0400
Subject: rpms/filezilla/devel - New directory
Message-ID: <200709101951.l8AJpgj5005004@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla/devel

Log Message:
Directory /cvs/extras/rpms/filezilla/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:44 -0400
Subject: rpms/filezilla Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709101951.l8AJpiuA005029@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla

Added Files:
	Makefile import.log 
Log Message:
Setup of module filezilla


--- NEW FILE Makefile ---
# Top level Makefile for module filezilla
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 10 19:51:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 10 Sep 2007 15:51:47 -0400
Subject: rpms/filezilla/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709101951.l8AJpl9J005051@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsmb4952/rpms/filezilla/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module filezilla


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: filezilla
# $Id: Makefile,v 1.1 2007/09/10 19:51:45 kevin Exp $
NAME := filezilla
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 fedora-extras-commits at redhat.com  Mon Sep 10 19:59:02 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 10 Sep 2007 15:59:02 -0400
Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.3,1.4
Message-ID: <200709101959.l8AJx2kM005364@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-bsh-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5320

Modified Files:
	plexus-bsh-factory.spec 
Log Message:

Build with maven




Index: plexus-bsh-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-bsh-factory.spec	31 Aug 2007 21:38:03 -0000	1.3
+++ plexus-bsh-factory.spec	10 Sep 2007 19:58:30 -0000	1.4
@@ -31,8 +31,6 @@
 %define _with_gcj_support 1
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -41,7 +39,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a7s.2jpp.3%{?dist}
+Release:        0.1.a7s.2jpp.4%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT-Style
@@ -210,6 +208,9 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.4
+- Build with maven
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.3
 - Build without maven (to build on ppc)
 



From fedora-extras-commits at redhat.com  Mon Sep 10 20:11:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:11:35 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.11, 1.12 mugshot.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <200709102011.l8AKBZjn011743@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11703

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Sep 2007 21:51:26 -0000	1.11
+++ .cvsignore	10 Sep 2007 20:11:01 -0000	1.12
@@ -1 +1 @@
-mugshot-1.1.51.tar.gz
+mugshot-1.1.52.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mugshot.spec	6 Sep 2007 21:38:36 -0000	1.18
+++ mugshot.spec	10 Sep 2007 20:11:01 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.51
+Version:        1.1.52
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -54,6 +54,12 @@
 a "live social experience" and interoperation with online services you and 
 your friends use. It's fun and easy.
 
+%package devel
+Summary: Development headers for Online Desktop
+Group: Development/Languages
+
+%description devel
+This package contains libraries for Online Desktop.
 
 %prep
 %setup -q
@@ -70,7 +76,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Don't package a .la file for the component .so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mugshot/firefox/components/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Run desktop-file-install to so we get validation (and to make
 # things fedora-packaging-guidelines compliant)
@@ -204,14 +210,23 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
-%dir %{_includedir}/ddm-1
-%{_includedir}/ddm-1/*
+
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
+%files devel
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so*
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
+- add devel pkg
+- 1.1.52
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
 - 1.1.51
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2007 21:51:26 -0000	1.12
+++ sources	10 Sep 2007 20:11:01 -0000	1.13
@@ -1 +1 @@
-dabad9f5dfd3e76e2c4c63722e9f6ebd  mugshot-1.1.51.tar.gz
+d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:16:52 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:16:52 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.6, 1.7 online-desktop.spec, 
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200709102016.l8AKGq8l012001@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11960

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2007 21:49:53 -0000	1.6
+++ .cvsignore	10 Sep 2007 20:16:20 -0000	1.7
@@ -1 +1 @@
-online-desktop-0.2.10.tar.gz
+online-desktop-0.2.12.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- online-desktop.spec	6 Sep 2007 21:21:01 -0000	1.6
+++ online-desktop.spec	10 Sep 2007 20:16:20 -0000	1.7
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.10
+Version:        0.2.12
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -178,7 +178,13 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+- new upstream
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
+- new upstream
+
 * Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2007 21:49:53 -0000	1.6
+++ sources	10 Sep 2007 20:16:20 -0000	1.7
@@ -1 +1 @@
-67e6eadf468433ab122d2b5acaac5ade  online-desktop-0.2.10.tar.gz
+f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:26:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Mon, 10 Sep 2007 16:26:35 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.23, 1.24 bigboard.spec, 1.32,
	1.33 sources, 1.24, 1.25
Message-ID: <200709102026.l8AKQZB5012385@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12345

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Sep 2007 21:50:19 -0000	1.23
+++ .cvsignore	10 Sep 2007 20:26:02 -0000	1.24
@@ -1 +1 @@
-bigboard-0.5.12.tar.gz
+bigboard-0.5.13.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bigboard.spec	7 Sep 2007 19:36:01 -0000	1.32
+++ bigboard.spec	10 Sep 2007 20:26:02 -0000	1.33
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.12
-Release:        2%{?dist}
+Version:        0.5.13
+Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -29,6 +29,7 @@
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
+BuildRequires:  mugshot-devel >= 1.1.52
 
 %description
 Bigboard is a sidebar and application launcher that works with mugshot.org
@@ -92,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.13-1
+- 0.5.13
+
 * Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
 - some brs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Sep 2007 21:50:19 -0000	1.24
+++ sources	10 Sep 2007 20:26:02 -0000	1.25
@@ -1 +1 @@
-fe6047806ed00354145f471b2c5baef7  bigboard-0.5.12.tar.gz
+f0001794311b90a9b9f0d9ad750a0878  bigboard-0.5.13.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 20:30:43 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 10 Sep 2007 16:30:43 -0400
Subject: rpms/filezilla/devel filezilla.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709102030.l8AKUhKW012826@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel

Modified Files:
	.cvsignore sources 
Added Files:
	filezilla.spec 
Log Message:
Initial import



--- NEW FILE filezilla.spec ---
Name:           filezilla
Version:        3.0.0
Release:        1%{?dist}
Summary:        FileZilla FTP, FTPS and SFTP client

Group:          Applications/Internet
License:        GPLv2+
URL:            http://filezilla.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

## Needed if autogen.sh is invoked
#BuildRequires:  automake, autoconf, libtool
## 
## Needed if test program is build
BuildRequires:  cppunit-devel >= 1.10.2
##
BuildRequires:  gawk
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  gnutls-devel >= 1.5.4
BuildRequires:  libidn-devel
BuildRequires:  wxGTK-devel >= 2.8.4

Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils


%description
FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
- Supports FTP, FTP over SSL/TLS (FTPS) and SSH File Transfer Protocol (SFTP)
- Cross-platform
- Available in many languages
- Supports resume and transfer of large files >4GB
- Easy to use Site Manager and transfer queue
- Drag & drop support
- Speed limits
- Filename filters
- Network configuration wizard 


%prep
%setup -q

# Run autotools if needed
# sh autogen.sh


%build
%configure \
  --disable-static \
  --enable-locales \
  --localedir=%{_datadir}/locale \
  --disable-manualupdatecheck \
  --disable-autoupdatecheck 

## Do not use --enable-buildtype=official 
## that option enables the "check for updates" dialog to download
## new binaries from the official website.

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"

mkdir -p __doc
install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/docs/* __doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/filezilla/docs

desktop-file-install --vendor "fedora" \
  --delete-original \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop


%find_lang %{name}

%check
pushd tests
make test
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :

%postun
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS
%doc __doc/*
%{_bindir}/*
%{_datadir}/filezilla/
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
- Update to 3.0.0 (final)
- Add vendor field for .desktop

* Mon Sep  3 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.3.rc3
- Update to 3.0.0rc3
- Add BR gawk
- Improve description/summary
- Removed dual listed doc file

* Mon Aug 27 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.2.rc2
- Update to 3.0.0-rc2
- Upstream now install their own desktop file and pixmap

* Mon Aug 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.2.rc1
- Update to 3.0.0-rc1
- Enable make check

* Fri Jul 27 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta11
- Update to beta11

* Wed Jun  5 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta10
- Update to beta10

* Sat May 26 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta8
- Update to beta8

* Tue Mar 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta7
- Update to beta7

* Tue Mar 13 2007 kwizart < kwizart at gmail.com > - 3.0.0-0.1.beta6
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:51:45 -0000	1.1
+++ .cvsignore	10 Sep 2007 20:30:10 -0000	1.2
@@ -0,0 +1 @@
+FileZilla_3.0.0_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:51:45 -0000	1.1
+++ sources	10 Sep 2007 20:30:10 -0000	1.2
@@ -0,0 +1 @@
+9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 10 20:35:48 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 10 Sep 2007 16:35:48 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-vdso-fix-clock-masking.patch,
	NONE, 1.1 kernel.spec, 1.153, 1.154
Message-ID: <200709102035.l8AKZmbH013079@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86_64-vdso-fix-clock-masking.patch 
Log Message:
* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
- fix clock warping on x86_64


linux-2.6-x86_64-vdso-fix-clock-masking.patch:

--- NEW FILE linux-2.6-x86_64-vdso-fix-clock-masking.patch ---
Add missing mask operation to vdso

vdso vgetns() didn't mask the time source offset calculation, which could
lead to time problems with 32bit HPET. Add the masking.

Thanks to Chuck Ebbert for tracking down.

Signed-off-by: Andi Kleen <ak at suse.de>

--- linux.orig/arch/x86_64/vdso/vclock_gettime.c
+++ linux/arch/x86_64/vdso/vclock_gettime.c
@@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long c
 
 static inline long vgetns(void)
 {
+	long v;
 	cycles_t (*vread)(void);
 	vread = gtod->clock.vread;
-	return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >>
-		gtod->clock.shift;
+	v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
+	return (v * gtod->clock.mult) >> gtod->clock.shift;
 }
 
 static noinline int do_realtime(struct timespec *ts)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kernel.spec	10 Sep 2007 14:43:37 -0000	1.153
+++ kernel.spec	10 Sep 2007 20:35:15 -0000	1.154
@@ -672,6 +672,7 @@
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
 Patch1535: linux-2.6-sched-cfs-fix-mc.patch
+Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
 
@@ -1211,6 +1212,9 @@
 # fix scheduler on multicore
 ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
 
+# fix x86_64 clock warping
+ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1803,6 +1807,9 @@
 
 %changelog
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix clock warping on x86_64
+
+* Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86: fix debug early boot
 
 * Thu Sep 06 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Mon Sep 10 20:37:38 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 16:37:38 -0400
Subject: rpms/claws-mail-plugins/F-7 claws-mail-plugins.spec,1.16,1.17
Message-ID: <200709102037.l8AKbckW013170@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13091/F-7

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix typo



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- claws-mail-plugins.spec	10 Sep 2007 10:27:20 -0000	1.16
+++ claws-mail-plugins.spec	10 Sep 2007 20:37:06 -0000	1.17
@@ -17,7 +17,7 @@
 %define vcalendar	1.97
 Name:           claws-mail-plugins
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -56,7 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
-Requires:       %{name}-spamreport = %{version}-%{release}
+Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -631,8 +631,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Sep 10 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-2
+- fix typo
+
 * Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 3.0.0
+- 3.0.0-1
 - version upgrade
 
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Mon Sep 10 20:37:42 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 10 Sep 2007 16:37:42 -0400
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.19,1.20
Message-ID: <200709102037.l8AKbgpm013173@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13091/devel

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- fix typo



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- claws-mail-plugins.spec	10 Sep 2007 10:08:27 -0000	1.19
+++ claws-mail-plugins.spec	10 Sep 2007 20:37:09 -0000	1.20
@@ -17,7 +17,7 @@
 %define vcalendar	1.97
 Name:           claws-mail-plugins
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -56,7 +56,7 @@
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-smime = %{version}-%{release}
-Requires:       %{name}-spamreport = %{version}-%{release}
+Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
 # and the ones from main claws-mail-package...
@@ -631,8 +631,12 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Sep 10 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-2
+- fix typo
+
 * Wed Sep 05 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 3.0.0
+- 3.0.0-1
 - version upgrade
 
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Mon Sep 10 21:21:18 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Mon, 10 Sep 2007 17:21:18 -0400
Subject: rpms/pm-utils/devel .cvsignore, 1.26, 1.27 sources, 1.33,
	1.34 pm-utils.spec, 1.77, 1.78
Message-ID: <200709102121.l8ALLIPE020767@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20727

Modified Files:
	.cvsignore sources pm-utils.spec 
Log Message:
- update to .4-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Mar 2007 14:09:36 -0000	1.26
+++ .cvsignore	10 Sep 2007 21:20:45 -0000	1.27
@@ -1,3 +1 @@
-radeontool-1.5.tar.gz
-vbetool_0.7-1.tar.gz
-pm-utils-0.99.3.tar.gz
+pm-utils-0.99.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	8 Sep 2007 10:22:26 -0000	1.33
+++ sources	10 Sep 2007 21:20:45 -0000	1.34
@@ -1 +1 @@
-0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz
+a88503876f63c96b55784be91b6458d2  pm-utils-0.99.4.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- pm-utils.spec	8 Sep 2007 10:26:22 -0000	1.77
+++ pm-utils.spec	10 Sep 2007 21:20:45 -0000	1.78
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
-Version: 0.99.3
-Release: 12%{?dist}
+Version: 0.99.4
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -28,8 +28,7 @@
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
-Patch2: pm-utils-0.99.3-vbe-redirect.patch
-Patch3: pm-utils-0.99.3-cfg.patch
+Patch2: pm-utils-0.99.3-cfg.patch
 
 
 %description
@@ -41,8 +40,7 @@
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
-%patch2 -p1 -b .vbe-redirect
-%patch3 -p1 -b .cfg
+%patch2 -p1 -b .cfg
 
 
 %build
@@ -112,7 +110,12 @@
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
+* Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
+- Merge new upstream
+- remove pm/power.d/laptop-tools
+- add --quirk-reset-brightness (needed for the Fujitsu Lifebook S7110)
+
+* Sat Sep 08 2007 Till Maas <opensource till name> - 0.99.3-12
 - Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
 - remove (C|CXX|F)FLAGS definitions, they are already in %%configure
 - remove Core in Summary tag



From fedora-extras-commits at redhat.com  Mon Sep 10 21:30:42 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 17:30:42 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.4,1.5
Message-ID: <200709102130.l8ALUgD8021143@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21122

Modified Files:
	List.py 
Log Message:
complete Dennis fix for the single plague needsign problem


Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- List.py	6 Sep 2007 07:14:30 -0000	1.4
+++ List.py	10 Sep 2007 21:30:40 -0000	1.5
@@ -26,8 +26,11 @@
         dists = cfg.alldists
     
     for dist in dists:
-        if dist.startswith('testing/'):
-            dist = dist.replace('testing/', '')
+        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+            if dist.startswith('testing/'):
+                dist = dist.replace('testing/', '')
+                if dist in dists:
+                    continue
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
         print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)



From fedora-extras-commits at redhat.com  Mon Sep 10 21:40:34 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 17:40:34 -0400
Subject: extras-buildsys/utils/pushscript List.py,1.5,1.6
Message-ID: <200709102140.l8ALeYCj021428@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410

Modified Files:
	List.py 
Log Message:
print -testing in the needsign repo id even!


Index: List.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/List.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- List.py	10 Sep 2007 21:30:40 -0000	1.5
+++ List.py	10 Sep 2007 21:40:32 -0000	1.6
@@ -26,13 +26,15 @@
         dists = cfg.alldists
     
     for dist in dists:
-        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
-            if dist.startswith('testing/'):
-                dist = dist.replace('testing/', '')
-                if dist in dists:
-                    continue
+        if dist.startswith('testing/'):
+            dist = dist.replace('testing/', '')
+            if dist in dists:
+                continue
         distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
-        print distdir+':'
+        if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+            print distdir+'-testing:'
+        else:
+            print distdir+':'
         needsignroot = os.path.join(cfg.stagesdir, distdir)
         bs = LocalPlague(needsignroot)
         results = bs.GetBuildResults()



From fedora-extras-commits at redhat.com  Mon Sep 10 22:00:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Sep 2007 18:00:19 -0400
Subject: rpms/flac/devel .cvsignore, 1.5, 1.6 flac.spec, 1.29, 1.30 sources, 
	1.6, 1.7 flac-1.1.3-noxmms.patch, 1.1,
	NONE flac-1.1.4-hide-byteswap.patch, 1.1,
	NONE flac-1.1.4-link-ogg.patch, 1.1, NONE
Message-ID: <200709102200.l8AM0Jbv021899@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21823

Modified Files:
	.cvsignore flac.spec sources 
Removed Files:
	flac-1.1.3-noxmms.patch flac-1.1.4-hide-byteswap.patch 
	flac-1.1.4-link-ogg.patch 
Log Message:
* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
- Update for 1.20 and drop obsolete patches (#285161)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2007 11:55:44 -0000	1.5
+++ .cvsignore	10 Sep 2007 21:59:47 -0000	1.6
@@ -1,4 +1 @@
-flac-1.1.0.tar.gz
-flac-1.1.2.tar.gz
-flac-1.1.3.tar.gz
-flac-1.1.4.tar.gz
+flac-1.2.0.tar.gz


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- flac.spec	24 Aug 2007 12:23:56 -0000	1.29
+++ flac.spec	10 Sep 2007 21:59:47 -0000	1.30
@@ -1,18 +1,15 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.1.4
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch2: flac-1.1.4-hide-byteswap.patch
-Patch3: flac-1.1.3-gnu-stack.patch
-Patch4: flac-1.1.3-noxmms.patch
-Patch5: flac-1.1.4-link-ogg.patch
+Patch1: flac-1.1.3-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
-BuildRequires: libtool, gettext-devel
+BuildRequires: gettext-devel
 Obsoletes: flac-libs
 Provides: flac-libs
 
@@ -36,16 +33,11 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .extra-sym
-%patch3 -p1 -b .gnu-stack
-%patch4 -p1 -b .noxmms
-%patch5 -p1 -b .link-ogg
-
-autoreconf -i -f
+%patch1 -p1 -b .gnu-stack
 
 %build
 export XMMS_CONFIG=no # Disable XMMS
-%configure --with-pic
+%configure --with-pic --disable-xmms-plugin
 
 make %{?_smp_mflags}
 
@@ -80,6 +72,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
+- Update for 1.20 and drop obsolete patches (#285161)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1.1.4-5
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Feb 2007 11:55:44 -0000	1.6
+++ sources	10 Sep 2007 21:59:47 -0000	1.7
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+ea176bfb291707b46a537b091c226ae7  flac-1.2.0.tar.gz


--- flac-1.1.3-noxmms.patch DELETED ---


--- flac-1.1.4-hide-byteswap.patch DELETED ---


--- flac-1.1.4-link-ogg.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 10 22:02:40 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Sep 2007 18:02:40 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.66,
	1.67 policy-20070703.patch, 1.52, 1.53 selinux-policy.spec,
	1.518, 1.519
Message-ID: <200709102202.l8AM2eSI027926@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27888

Modified Files:
	modules-targeted.conf policy-20070703.patch 
	selinux-policy.spec 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
- Allow newalias/sendmail dac_override
- Allow bind to bind to all udp ports



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- modules-targeted.conf	6 Sep 2007 23:34:02 -0000	1.66
+++ modules-targeted.conf	10 Sep 2007 22:02:06 -0000	1.67
@@ -1505,3 +1505,12 @@
 # Minimally prived root role for managing apache
 # 
 webadm = module
+
+#
+# Layer: services
+# Module: exim
+#
+# exim mail server 
+# 
+exim = module
+

policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.52 -r 1.53 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- policy-20070703.patch	7 Sep 2007 20:26:11 -0000	1.52
+++ policy-20070703.patch	10 Sep 2007 22:02:06 -0000	1.53
@@ -495,12 +495,12 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-3.0.7/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-09-07 17:05:59.000000000 -0400
 @@ -20,6 +20,7 @@
  
  # Allow dmidecode to read /dev/mem
  dev_read_raw_memory(dmidecode_t)
-+dev_search_sysfs(dmidecode_t)
++dev_read_sysfs(dmidecode_t)
  
  mls_file_read_all_levels(dmidecode_t)
  
@@ -2745,7 +2745,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-10 16:27:16.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2830,7 +2830,32 @@
  ##	List the contents of the root directory.
  ## </summary>
  ## <param name="domain">
-@@ -3323,6 +3359,42 @@
+@@ -3107,6 +3143,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Manage temporary directories in /tmp.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`files_manage_generic_tmp_dirs',`
++	gen_require(`
++		type tmp_t;
++	')
++
++	manage_dirs_pattern($1,tmp_t,tmp_t)
++')
++
++########################################
++## <summary>
+ ##	Manage temporary files and directories in /tmp.
+ ## </summary>
+ ## <param name="domain">
+@@ -3323,6 +3377,42 @@
  
  ########################################
  ## <summary>
@@ -2873,7 +2898,7 @@
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3381,7 +3453,7 @@
+@@ -3381,7 +3471,7 @@
  
  ########################################
  ## <summary>
@@ -2882,7 +2907,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -3389,17 +3461,17 @@
+@@ -3389,17 +3479,17 @@
  ##	</summary>
  ## </param>
  #
@@ -2903,7 +2928,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -3407,12 +3479,12 @@
+@@ -3407,12 +3497,12 @@
  ##	</summary>
  ## </param>
  #
@@ -2918,7 +2943,7 @@
  ')
  
  ########################################
-@@ -4043,7 +4115,7 @@
+@@ -4043,7 +4133,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2927,7 +2952,7 @@
  ')
  
  ########################################
-@@ -4560,6 +4632,8 @@
+@@ -4560,6 +4650,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2936,7 +2961,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4582,6 +4656,11 @@
+@@ -4582,6 +4674,11 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2948,7 +2973,7 @@
  ')
  
  ########################################
-@@ -4619,3 +4698,28 @@
+@@ -4619,3 +4716,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')
@@ -3171,6 +3196,99 @@
  	allow $1 security_t:dir list_dir_perms;
  	allow $1 security_t:file { getattr read };
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.0.7/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-08-22 07:14:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/storage.fc	2007-09-10 15:52:30.000000000 -0400
+@@ -52,7 +52,7 @@
+ 
+ /dev/cciss/[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+-/dev/fuse		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,mls_systemhigh)
+ /dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.0.7/policy/modules/kernel/storage.if
+--- nsaserefpolicy/policy/modules/kernel/storage.if	2007-08-22 07:14:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/storage.if	2007-09-10 15:54:45.000000000 -0400
+@@ -673,3 +673,61 @@
+ 
+ 	typeattribute $1 storage_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Allow the caller to get the attributes
++##	of device nodes of fuse devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`storage_getattr_fuse_dev',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dev_list_all_dev_nodes($1)
++	allow $1 fuse_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	read or write fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	allow $1 fuse_device_t:chr_file rw_file_perms;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read or write
++##	fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
[...1648 lines suppressed...]
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -11637,7 +12686,7 @@
  
  libs_use_ld_so(mount_t)
  libs_use_shared_libs(mount_t)
-@@ -127,10 +138,15 @@
+@@ -127,10 +139,15 @@
  	')
  ')
  
@@ -11654,7 +12703,7 @@
  ')
  
  optional_policy(`
-@@ -159,13 +175,8 @@
+@@ -159,13 +176,8 @@
  
  	fs_search_rpc(mount_t)
  
@@ -11668,7 +12717,7 @@
  ')
  
  optional_policy(`
-@@ -189,10 +200,6 @@
+@@ -189,10 +201,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -11679,7 +12728,7 @@
  ########################################
  #
  # Unconfined mount local policy
-@@ -201,4 +208,29 @@
+@@ -201,4 +209,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -11993,7 +13042,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.7/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-09-10 14:35:10.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(selinuxutil,1.6.2)
@@ -12110,7 +13159,15 @@
  
  dev_read_urand(semanage_t)
  
-@@ -465,6 +479,8 @@
+@@ -452,6 +466,7 @@
+ files_read_etc_runtime_files(semanage_t)
+ files_read_usr_files(semanage_t)
+ files_list_pids(semanage_t)
++fs_list_inotifyfs(semanage_t)
+ 
+ mls_file_write_all_levels(semanage_t)
+ mls_file_read_all_levels(semanage_t)
+@@ -465,6 +480,8 @@
  
  # Running genhomedircon requires this for finding all users
  auth_use_nsswitch(semanage_t)
@@ -12119,7 +13176,7 @@
  
  libs_use_ld_so(semanage_t)
  libs_use_shared_libs(semanage_t)
-@@ -488,6 +504,17 @@
+@@ -488,6 +505,17 @@
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
@@ -12137,7 +13194,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -515,6 +542,8 @@
+@@ -515,6 +543,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -12146,7 +13203,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -531,6 +560,7 @@
+@@ -531,6 +561,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -12154,7 +13211,7 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -586,6 +616,10 @@
+@@ -586,6 +617,10 @@
  
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
@@ -12527,7 +13584,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-10 16:37:23.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -12598,17 +13655,17 @@
  
  optional_policy(`
 -	ada_domtrans(unconfined_t)
--')
--
--optional_policy(`
--	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
--	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
--	# this is disallowed usage:
--	unconfined_domain(httpd_unconfined_script_t)
 +	ada_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
+-	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+-	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
+-	# this is disallowed usage:
+-	unconfined_domain(httpd_unconfined_script_t)
+-')
+-
+-optional_policy(`
 -	bind_run_ndc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
 +	bootloader_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
@@ -12653,7 +13710,7 @@
  ')
  
  optional_policy(`
-@@ -155,22 +153,12 @@
+@@ -155,32 +153,23 @@
  
  optional_policy(`
  	postfix_run_map(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -12678,18 +13735,18 @@
  ')
  
  optional_policy(`
-@@ -180,9 +168,10 @@
+ 	samba_per_role_template(unconfined)
+ 	samba_run_net(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+ 	samba_run_winbind_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
++	samba_run_smbcontrol(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
 -	spamassassin_per_role_template(unconfined,unconfined_t,unconfined_r)
-+	sendmail_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
++	sendmail_run_unconfined(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
-+
  optional_policy(`
- 	sysnet_run_dhcpc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
- 	sysnet_dbus_chat_dhcpc(unconfined_t)
 @@ -205,11 +194,12 @@
  ')
  
@@ -13825,7 +14882,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-10 14:07:37.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -13908,7 +14965,12 @@
  	netutils_run(sysadm_t,sysadm_r,admin_terminal)
  	netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  	netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -447,11 +448,15 @@
+@@ -443,15 +444,20 @@
+ 
+ optional_policy(`
+ 	samba_run_net(sysadm_t,sysadm_r,admin_terminal)
++	samba_run_smbcontrol(sysadm_t,sysadm_r,admin_terminal)
+ 	samba_run_winbind_helper(sysadm_t,sysadm_r,admin_terminal)
  ')
  
  optional_policy(`
@@ -13924,7 +14986,7 @@
  	', `
  		userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  	')
-@@ -494,3 +499,7 @@
+@@ -494,3 +500,7 @@
  optional_policy(`
  	yam_run(sysadm_t,sysadm_r,admin_terminal)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- selinux-policy.spec	7 Sep 2007 20:10:07 -0000	1.518
+++ selinux-policy.spec	10 Sep 2007 22:02:06 -0000	1.519
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
+- Allow newalias/sendmail dac_override
+- Allow bind to bind to all udp ports
+
 * Fri Sep 7 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-7
 - Turn off direct transition
 



From fedora-extras-commits at redhat.com  Mon Sep 10 22:12:53 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 18:12:53 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.83,
	1.84 sources, 1.39, 1.40
Message-ID: <200709102212.l8AMCrGk028481@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
- Resolves #274551, #253331, #254246, #254248
- Rebase Autotools to 0.9.3 
    




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Aug 2007 21:15:55 -0000	1.31
+++ .cvsignore	10 Sep 2007 22:12:19 -0000	1.32
@@ -4,3 +4,4 @@
 eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- eclipse-cdt.spec	23 Aug 2007 19:04:49 -0000	1.83
+++ eclipse-cdt.spec	10 Sep 2007 22:12:19 -0000	1.84
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -62,7 +62,7 @@
 
 Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -347,6 +347,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
+- Resolves #274551, #253331, #254246, #254248
+- Rebase Autotools to 0.9.3 
+
 * Thu Aug 23 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-5
 - Add eclipse-cvs-client dependency
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	17 Aug 2007 18:53:43 -0000	1.39
+++ sources	10 Sep 2007 22:12:19 -0000	1.40
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 089752c5437767e4756b893da17a7574  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-dd644089e39baca4b2007ec9fcbc91e7  eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
+19ec953175bc545859ed0da61c1d3535  eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:27:01 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 18:27:01 -0400
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.7,1.8
Message-ID: <200709102227.l8AMR1bI029023@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29005

Modified Files:
	WhatsNew.py 
Log Message:
inherit stable dist when doing WhatsNew name queries


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WhatsNew.py	10 May 2007 14:18:52 -0000	1.7
+++ WhatsNew.py	10 Sep 2007 22:26:59 -0000	1.8
@@ -102,7 +102,13 @@
 
 def queryname(dist,name):
     """query whether source rpm name is known, returns True or False"""
-    return names.has_key(dist) and names[dist].has_key(name)
+    instable = names.has_key(dist) and names[dist].has_key(name)
+    if dist.startswith('testing/'):
+        dist = dist.replace('testing/', '')
+        intesting = names.has_key(dist) and names[dist].has_key(name)
+        return (instable or intesting)
+    else:
+        return instable
 
 
 def put(dist,srcrpm,ts):



From fedora-extras-commits at redhat.com  Mon Sep 10 22:46:22 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 18:46:22 -0400
Subject: rpms/eclipse-cdt/F-7 .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.81, 
	1.82 sources, 1.37, 1.38
Message-ID: <200709102246.l8AMkM0S029700@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
- Resolves #274551
- Rebase autotools to 0.1.2
- Add check for failure to generate makefile and no makefile exists





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Aug 2007 18:16:32 -0000	1.31
+++ .cvsignore	10 Sep 2007 22:45:45 -0000	1.32
@@ -11,3 +11,4 @@
 eclipse-cdt-autotools-0.0.9.tar.gz
 eclipse-cdt-autotools-3_x-0.1.0.tar.gz
 eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+eclipse-cdt-autotools-3_x-0.1.2.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/eclipse-cdt.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- eclipse-cdt.spec	16 Aug 2007 18:16:32 -0000	1.81
+++ eclipse-cdt.spec	10 Sep 2007 22:45:45 -0000	1.82
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -42,7 +42,7 @@
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.2.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -319,6 +319,11 @@
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
+- Resolves #274551
+- Rebase autotools to 0.1.2
+- Add check for failure to generate makefile and no makefile exists
+
 * Thu Aug 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-7
 - Resolves #251412
 - Rebase autotools to 0.1.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	16 Aug 2007 18:17:58 -0000	1.37
+++ sources	10 Sep 2007 22:45:45 -0000	1.38
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-bf84e6e5af97ab6f3430ea1395c3c003  eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+8aeab614fd9e95aa3b9373f210fcde32  eclipse-cdt-autotools-3_x-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:57:06 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Mon, 10 Sep 2007 18:57:06 -0400
Subject: rpms/vbetool/devel vbetool-0.3-fix-gcc4bug.patch, NONE,
	1.1 vbetool-libz.patch, NONE, 1.1 vbetool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709102257.l8AMv6Sn030194@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30159/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vbetool-0.3-fix-gcc4bug.patch vbetool-libz.patch vbetool.spec 
Log Message:
initial import


vbetool-0.3-fix-gcc4bug.patch:

--- NEW FILE vbetool-0.3-fix-gcc4bug.patch ---
--- vbetool-0.7/vbetool.c.gcc4	2006-07-25 21:27:21.000000000 -0400
+++ vbetool-0.7/vbetool.c	2007-02-20 13:29:22.000000000 -0500
@@ -345,9 +345,10 @@
 {
 	int size;
 	char *buffer = __save_state(&size);
+	ssize_t num_written;
 
 	if (buffer)
-		write(1, buffer, size);	/* FIXME: should retry on short write); */
+		num_written = write(1, buffer, size);	/* FIXME: should retry on short write); */
 }
 
 int do_blank(int state)

vbetool-libz.patch:

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
 SUBDIRS = x86emu
 @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
 @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
+ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_FALSE at x86lib = ""
 man_MANS = vbetool.1
 vbetool_SOURCES = vbetool.c $(x86)


--- NEW FILE vbetool.spec ---
Name:           vbetool
Version:        0.7
Release:        2%{?dist}
Summary:        Run real-mode video BIOS code to alter hardware state

Group:          System Environment/Base
License:        GPLv2
URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
Patch10:        vbetool-0.3-fix-gcc4bug.patch
Patch11:        vbetool-libz.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel pciutils-devel
# does not build on ppc and ppc64
ExcludeArch:    ppc ppc64
# vbetool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch.


%prep
%setup -q
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .zlib


%build
%ifarch x86_64
%configure --with-x86emu
%else
%configure
%endif
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 COPYING
%{_sbindir}/vbetool
%{_mandir}/man1/vbetool.1.gz


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> 0.7-2
- ExcludeArch: ppc and ppc64 (does not build there)
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 0.7-1
- initial release for Fedora with patches from the pm-utils package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:33:51 -0000	1.1
+++ .cvsignore	10 Sep 2007 22:56:27 -0000	1.2
@@ -0,0 +1 @@
+vbetool_0.7-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:33:51 -0000	1.1
+++ sources	10 Sep 2007 22:56:27 -0000	1.2
@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 22:59:22 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Mon, 10 Sep 2007 18:59:22 -0400
Subject: rpms/radeontool/devel radeontool-1.5.diff, NONE,
	1.1 radeontool-fix-option-handling.diff, NONE,
	1.1 radeontool-get-rid-of-lspci.diff, NONE, 1.1 radeontool.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709102259.l8AMxM6T030336@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/radeontool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff radeontool.spec 
Log Message:
initial import


radeontool-1.5.diff:

--- NEW FILE radeontool-1.5.diff ---
--- radeontool.c
+++ radeontool.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <asm/page.h>
 
 #include "radeon_reg.h"
 
@@ -30,7 +29,7 @@
 
 /* *radeon_cntl_mem is mapped to the actual device's memory mapped control area. */
 /* Not the address but what it points to is volatile. */
-unsigned char * volatile radeon_cntl_mem;
+volatile unsigned char * radeon_cntl_mem;
 
 static void fatal(char *why)
 {
@@ -47,7 +46,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    value = *(unsigned long * volatile)(radeon_cntl_mem+offset);  
+    value = *(volatile unsigned long *)(radeon_cntl_mem+offset);  
     if(debug) 
         printf("%08lx\n",value);
     return value;
@@ -60,7 +59,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    *(unsigned long * volatile)(radeon_cntl_mem+offset) = value;  
+    *(volatile unsigned long *)(radeon_cntl_mem+offset) = value;  
 }
 
 static void usage(void)
@@ -83,10 +82,10 @@
 /* with /dev/mem, then I could write this whole program in perl, */
 /* but sadly this is only the size of physical RAM.  If you */
 /* want to be truely bad and poke into device memory you have to mmap() */
-static unsigned char * map_devince_memory(unsigned int base,unsigned int length) 
+static volatile unsigned char * map_device_memory(unsigned int base,unsigned int length) 
 {
     int mem_fd;
-    unsigned char *device_mem;
+    volatile unsigned char *device_mem;
 
     /* open /dev/mem */
     if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
@@ -94,12 +93,12 @@
     }
 
     /* mmap graphics memory */
-    if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
+    if ((device_mem = malloc(length + (getpagesize()-1))) == NULL) {
         fatal("allocation error \n");
     }
-    if ((unsigned long)device_mem % PAGE_SIZE)
-        device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
-    device_mem = (unsigned char *)mmap(
+    if ((unsigned long)device_mem % getpagesize())
+        device_mem += getpagesize() - ((unsigned long)device_mem % getpagesize());
+    device_mem = (volatile unsigned char *)mmap(
         (caddr_t)device_mem, 
         length,
         PROT_READ|PROT_WRITE,
@@ -107,9 +106,9 @@
         mem_fd, 
         base
     );
-    if ((long)device_mem < 0) {
+    if (device_mem == (volatile unsigned char *)-1) {
         if(debug)
-            fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+            fprintf(stderr,"mmap returned %d\n",(int)(long)device_mem);
         fatal("mmap error \n");
     }
     return device_mem;
@@ -316,7 +315,7 @@
     }
     if(debug)
         printf("Radeon found. Base control address is %x.\n",base);
-    radeon_cntl_mem = map_devince_memory(base,0x2000);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
 }
 
 int main(int argc,char *argv[]) 

radeontool-fix-option-handling.diff:

--- NEW FILE radeontool-fix-option-handling.diff ---
--- radeontool.c.options	2007-02-20 14:48:20.000000000 -0500
+++ radeontool.c	2007-02-20 14:53:07.000000000 -0500
@@ -320,18 +320,21 @@
 
 int main(int argc,char *argv[]) 
 {
+    int found_other = 0;
+    while (argc > 1 && !found_other) {
+        if(strcmp(argv[1],"--debug") == 0) {
+            debug=1;
+            argv++; argc--;
+        } else if(strncmp(argv[1],"--skip=",7) == 0) {
+            skip=atoi(argv[1]+7);
+            argv++; argc--;
+        } else {
+            found_other = 1;
+        }
+    }
     if(argc == 1) {
-        map_radeon_cntl_mem();
 	usage();
     }
-    if(strcmp(argv[1],"--debug") == 0) {
-        debug=1;
-        argv++; argc--;
-    };
-    if(strcmp(argv[1],"--skip=") == 0) {
-        skip=atoi(argv[1]+7);
-        argv++; argc--;
-    };
     map_radeon_cntl_mem();
     if(argc == 2) {
         if(strcmp(argv[1],"regs") == 0) {

radeontool-get-rid-of-lspci.diff:

--- NEW FILE radeontool-get-rid-of-lspci.diff ---
--- radeontool.c	2006/02/22 11:07:50	1.3
+++ radeontool.c	2006/03/08 00:37:25
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <pci/pci.h>
 
 #include "radeon_reg.h"
 
@@ -231,7 +232,7 @@ void radeon_cmd_stretch(char *param)
     radeon_set(RADEON_FP_VERT_STRETCH,"RADEON_FP_VERT_STRETCH",fp_vert_stretch);
 }
 
-
+#if 0
 /* Here we fork() and exec() the lspci command to look for the Radeon hardware address. */
 static void map_radeon_cntl_mem(void)
 {
@@ -317,6 +318,62 @@ We need to look through it to find the s
         printf("Radeon found. Base control address is %x.\n",base);
     radeon_cntl_mem = map_device_memory(base,0x2000);
 }
+#else
+static u32
+conf2long(unsigned char *c, unsigned int p)
+{
+    return c[p] | (c[p+1] << 8) | (c[p+2] << 16) | (c[p+3] << 24);
+}
+
+static void map_radeon_cntl_mem(void)
+{
+    struct pci_access *pacc;
+    struct pci_dev *dev;
+    unsigned int class;
+    int i;
+    int base = -1;
+    unsigned char *config;
+
+    config = malloc(64);
+    if (!config)
+        fatal("malloc(64) failed\n");
+    pacc = pci_alloc();
+    pci_init(pacc);
+    pci_scan_bus(pacc);
+    for(dev=pacc->devices; dev; dev=dev->next) {            /* Iterate over all devices */
+        pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);/* Fill in header info we need */
+        class = pci_read_word(dev, PCI_CLASS_DEVICE);       /* Read config register directly */
+        if (dev->vendor_id == 0x1002 && class == 0x300) {   /* ATI && Graphics card */
+            if (debug)
+                printf("Found: %02x:%02x.%d vendor=%04x device=%04x class=%04x\n",
+                       dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id, class);
+            if (skip-- < 1) {
+                pci_read_block(dev, 0, config, 64);
+                for (i=0; i<6; i++){
+                    u32 flag = conf2long(config, PCI_BASE_ADDRESS_0 + 4*i);
+                    if (flag & PCI_BASE_ADDRESS_SPACE_IO)   /* I/O-Ports, not memory */
+                        continue;
+                    /* the original code parsed lspci for "emory" and "K", so it
+                     * has to be at least 1K and less than 1M
+                     */
+                    if (dev->size[i] >=1024 && dev->size[i] < 1024*1024) {
+                        base = dev->base_addr[i];
+                        goto found;
+                    }
+                }
+            }
+        }
+    }
+ found:
+    pci_cleanup(pacc);
+    free(config);
+    if (base == -1)
+        fatal("Radeon not found.\n");
+    if (debug)
+        printf("Radeon found. Base control address is %x.\n",base);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
+}
+#endif
 
 int main(int argc,char *argv[]) 
 {

--- Makefile.no-lspci	2007-02-20 14:56:57.000000000 -0500
+++ Makefile	2007-02-20 14:56:42.000000000 -0500
@@ -1,7 +1,7 @@
 
 
 radeontool: radeontool.c
-	gcc -Wall -O2 radeontool.c -o radeontool
+	gcc -Wall -O2 radeontool.c -o radeontool -lpci
 
 
 



--- NEW FILE radeontool.spec ---
Name:           radeontool
Version:        1.5
Release:        2%{?dist}
Summary:        Backlight and video output configuration tool for radeon cards

Group:          System Environment/Base
License:        zlib
URL:            http://fdd.com/software/radeon/
Source0:        http://fdd.com/software/radeon/radeontool-%{version}.tar.gz
Patch20:        radeontool-1.5.diff
Patch21:        radeontool-fix-option-handling.diff
Patch22:        radeontool-get-rid-of-lspci.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pciutils-devel zlib-devel
# radeontool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
Radeontool may switch the backlight and external video output on and off.  Use
radeontool at your own risk, it may damage your hardware.


%prep
%setup -q
%patch20 -p0 -b .volatile
%patch21 -p0 -b .options
%patch22 -p0 -b .no-lspci


%build
gcc $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT

install -D -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}/radeontool


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES
%{_sbindir}/radeontool


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> - 1.5-2
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 1.5-1
- initial release for Fedora with patches from pm-utils package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:23:11 -0000	1.1
+++ .cvsignore	10 Sep 2007 22:58:50 -0000	1.2
@@ -0,0 +1 @@
+radeontool-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:23:11 -0000	1.1
+++ sources	10 Sep 2007 22:58:50 -0000	1.2
@@ -0,0 +1 @@
+8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 23:01:03 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 19:01:03 -0400
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.8,1.9
Message-ID: <200709102301.l8AN13Vi002151@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30421

Modified Files:
	WhatsNew.py 
Log Message:
inherit from stable dist when doing WhatsNew changelog queries


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WhatsNew.py	10 Sep 2007 22:26:59 -0000	1.8
+++ WhatsNew.py	10 Sep 2007 23:01:01 -0000	1.9
@@ -135,9 +135,18 @@
 
 def getclog(dist,name):
     """get the list of most recent changelog 3-tuples for this package, if any have been stored in the WhatsNew db before"""
-    if not names.has_key(dist):
-        return []
-    return names[dist].get(name,[])
+    def _getclog(dist,name):
+        if not names.has_key(dist):
+            return []
+        return names[dist].get(name,[])
+
+    if dist.startswith('testing/'):
+        testingclog = _getclog(dist,name)
+        if len(testingclog):
+            return testingclog
+        # inherit changelogs from stable repo
+        dist = dist.replace('testing/', '')
+    return _getclog(dist,name)
 
 
 def formatclog(clogtuples):



From fedora-extras-commits at redhat.com  Mon Sep 10 23:07:57 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 10 Sep 2007 19:07:57 -0400
Subject: rpms/eclipse-cdt/EL-5 .cvsignore, 1.31, 1.32 eclipse-cdt.spec, 1.80,
	1.81 sources, 1.36, 1.37
Message-ID: <200709102307.l8AN7vUi004181@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4142

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
- Resolves #274551
- Rebase autotools to 0.1.2
- Add check for failure to generate makefile and no makefile exists





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	21 Aug 2007 21:07:07 -0000	1.31
+++ .cvsignore	10 Sep 2007 23:07:24 -0000	1.32
@@ -11,3 +11,4 @@
 eclipse-cdt-autotools-0.0.9.tar.gz
 eclipse-cdt-autotools-3_x-0.1.0.tar.gz
 eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+eclipse-cdt-autotools-3_x-0.1.2.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/eclipse-cdt.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- eclipse-cdt.spec	21 Aug 2007 21:07:07 -0000	1.80
+++ eclipse-cdt.spec	10 Sep 2007 23:07:24 -0000	1.81
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -42,7 +42,7 @@
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-3_x-0.1.2.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -319,6 +319,11 @@
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-8
+- Resolves #274551
+- Rebase autotools to 0.1.2
+- Add check for failure to generate makefile and no makefile exists
+
 * Thu Aug 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-7
 - Resolves #251412
 - Rebase autotools to 0.1.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/EL-5/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	21 Aug 2007 21:07:07 -0000	1.36
+++ sources	10 Sep 2007 23:07:24 -0000	1.37
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-bf84e6e5af97ab6f3430ea1395c3c003  eclipse-cdt-autotools-3_x-0.1.1.tar.gz
+8aeab614fd9e95aa3b9373f210fcde32  eclipse-cdt-autotools-3_x-0.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 10 23:29:40 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 19:29:40 -0400
Subject: rpms/pcmanx-gtk2/F-7 pcmanx-gtk2.spec,1.2,1.3
Message-ID: <200709102329.l8ANTehT005171@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5091

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
increase release number



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/F-7/pcmanx-gtk2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmanx-gtk2.spec	10 Sep 2007 14:57:09 -0000	1.2
+++ pcmanx-gtk2.spec	10 Sep 2007 23:29:07 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.6
-Release:   1.%{alphatag}%{?dist}
+Release:   2.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Sep 11 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-2.355svn
+- increase release number to work around an error
+
 * Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
 - svn 355
 



From fedora-extras-commits at redhat.com  Mon Sep 10 23:42:38 2007
From: fedora-extras-commits at redhat.com (Shidai Liu (leo))
Date: Mon, 10 Sep 2007 19:42:38 -0400
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.2,1.3
Message-ID: <200709102342.l8ANgc7I005841@cvs-int.fedora.redhat.com>

Author: leo

Update of /cvs/extras/rpms/pcmanx-gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5752

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
bump release number



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmanx-gtk2.spec	9 Sep 2007 15:26:03 -0000	1.2
+++ pcmanx-gtk2.spec	10 Sep 2007 23:42:06 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.6
-Release:   1.%{alphatag}%{?dist}
+Release:   2.%{alphatag}%{?dist}
 License:   GPL
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/pcmanx-gtk2.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Sep 11 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-2.355svn
+- bump release number
+
 * Sun Sep  9 2007 Leo Shidai Liu <sdl.web at gmail.com> 0.3.6-1.355svn
 - svn 355
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:01:50 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 20:01:50 -0400
Subject: extras-buildsys/utils/pushscript Push.py,1.44,1.45
Message-ID: <200709110001.l8B01oLT012582@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128

Modified Files:
	Push.py 
Log Message:
* Make pushing in updates-testing mode require explicit args, e.g.

  epel-push testing/5 testing/4
  epel-push all

so specifying only the normal/stable repo numbers does not trigger
any pushes from plague-results to the testing repos. Specifying
stable dist numbers can still be used to handle external changes
to the stable repos (moved/removed packages etc.)

* No empty build reports anymore. We've had this long ago, but then
wanted to simulate the daily rawhide reports, even in case of zero pkgs.




Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Push.py	23 Aug 2007 12:11:17 -0000	1.44
+++ Push.py	11 Sep 2007 00:01:47 -0000	1.45
@@ -188,28 +188,31 @@
     or None."""
 
     changedrepo = None
+    srcdist = dist  # the plague-results dist number
 
-    srcdist = dist
-    distdir = '%s-%s-%s' % (cfg.distro, dist, cfg.project)
+    # When we're in updates-testing override mode, adjust the "srcdist"
+    # parameter to point to the single plague-results directory, and
+    # reject pushing to non-testing repositories.
+    if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting:
+        if dist.startswith('testing/'):
+            srcdist = dist.replace('testing/','')
+        else:  # no-op
+            return 0, changedrepo
+    
+    distdir = '%s-%s-%s' % (cfg.distro, srcdist, cfg.project)
     needsignroot = os.path.join(cfg.stagesdir, distdir)
-
-    if hasattr(cfg.opts,'pushtotesting') and cfg.opts.pushtotesting and not dist.startswith('testing/') and not dist=='development':
-        dist = 'testing/%s' % dist
-        destroot = os.path.join(cfg.treedir, dist)
-    else:
-        destroot = os.path.join(cfg.treedir, dist)
+    destroot = os.path.join(cfg.treedir, dist)
+    print '='*70
+    print 'Target repository:', destroot
+    print '='*70
     if not os.path.exists(destroot):
         os.makedirs(destroot)
-    
-    if srcdist.startswith('testing/'):
-        return 0, changedrepo
-    
     Utils.make_std_repodirs(cfg,dist,destroot)
     
     repolockname = os.path.join(needsignroot,REPO_LOCKFILE_NAME)
     repolock = LockFile(name=repolockname,blocking=True)
     try:
-        print 'Waiting for repository lock on %s:' % distdir,
+        print 'Waiting for repository lock on %s:' % needsignroot,
         sys.stdout.flush()
         repolock.lock()
         print 'OK'
@@ -334,14 +337,20 @@
         if not dist in distlist:
             continue
         brm = BuildReportManager(cfg.rundir,dist)
-    
-        body += "\nPackages built and released for %s %s: %s\n\n" % (cfg.project_hr, dist, brm.GetCount())
+        count = brm.GetCount()
+        if not count:
+            continue
+        body += "\nPackages built and released for %s %s: %s\n\n" % (cfg.project_hr, dist, count)
         body += brm.GetReport()
         body += '\n\n'
 
     for dist in cfg.alldists:  # we do this for sorting the dists
         if not dist in distlist:
             continue
+        brm = BuildReportManager(cfg.rundir,dist)
+        count = brm.GetCount()
+        if not count:
+            continue
         body += "\nChanges in %s %s: \n\n" % (cfg.project_hr, dist)
         try:
             WhatsNew.load(cfg.rundir)
@@ -349,6 +358,9 @@
         except:
             pass
 
+    if not len(body):
+        print 'Empty build report. Nothing sent.'
+        return
     body += cfg.mail_footer
     
     email.Charset.add_charset('utf-8',email.Charset.SHORTEST,None,None)
@@ -410,7 +422,6 @@
             sys.exit(errno.EINVAL)
         if d not in diststopush:
             diststopush.append(d)
-    Utils.debugprint(diststopush)
     if not len(diststopush):
         usage()
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:10:35 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 10 Sep 2007 20:10:35 -0400
Subject: extras-buildsys/utils/pushscript ToStable.py,1.5,1.6
Message-ID: <200709110010.l8B0AZLG012924@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12906

Modified Files:
	ToStable.py 
Log Message:
unused value


Index: ToStable.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/ToStable.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ToStable.py	23 Aug 2007 21:57:16 -0000	1.5
+++ ToStable.py	11 Sep 2007 00:10:33 -0000	1.6
@@ -23,9 +23,6 @@
 from LockFile import LockFile
 from BuildReport import *
 
-DEBUG = False
-Utils.setdebug(DEBUG)
-
 ts = rpmUtils.transaction.initReadOnlyTransaction()
 
 



From fedora-extras-commits at redhat.com  Tue Sep 11 00:33:02 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:33:02 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.19,1.20
Message-ID: <200709110033.l8B0X2P9013972@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13928

Modified Files:
	linkchecker.spec 
Log Message:
Rebuild for F8.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linkchecker.spec	11 Dec 2006 16:36:39 -0000	1.19
+++ linkchecker.spec	11 Sep 2007 00:32:29 -0000	1.20
@@ -1,30 +1,26 @@
 %{!?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)")}
 
 Summary: Check HTML documents for broken links
 Name: linkchecker
-Version: 3.3
-Release: 11%{?dist}
-License: GPL
+Version: 4.7
+Release: 9%{?dist}
+License: GPLv2
 Group: Development/Tools
-Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: linkchecker-4.7-fedora-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://linkchecker.sourceforge.net/
-BuildRequires: python-devel
+BuildRequires: python-devel gettext
 # Do not have one of these to test on:
-ExcludeArch: x86_64
+# ExcludeArch: x86_64
 
 %description
 Linkchecker is a simple script that checks HTML documents for broken links.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch1 -p1 -b .fedora-build
 
 # Fix character encoding
 iconv -f iso-8859-1 -t utf-8 -o linkchecker-de.1 doc/de/linkchecker.1
@@ -42,32 +38,70 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
-# Collate list of python files
-(
-  echo '%defattr (0644,root,root,0755)'
-  find %{buildroot}%{python_sitelib}/linkchecker -type d |
-    sed 's:%{buildroot}\(.*\):%dir \1:'
-  find %{buildroot}%{python_sitelib} -not -type d |
-    sed 's:%{buildroot}\(.*\):\1:'
-) > pyfiles
+# The upstream installer does not seem to install these right:
+%{__install} -D -m 0644 build/share/locale/de/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/de/LC_MESSAGES/linkchecker.mo
+%{__install} -D -m 0644 build/share/locale/fr/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES/linkchecker.mo
+%{__install} -D -m 0644 build/share/locale/es/LC_MESSAGES/linkchecker.mo %{buildroot}%{_datadir}/locale/es/LC_MESSAGES/linkchecker.mo
+
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f pyfiles
-%{python_sitelib}/*.pyc
-%{python_sitelib}/*.pyo
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %{_bindir}/linkchecker
-%dir %{_datadir}/linkchecker/
-%{_datadir}/linkchecker/*
-%{_mandir}/man1/*
-%doc TODO doc/ cgi/lconline/ test/ README LICENSE
-%dir %{_mandir}/de/man1
+#%ifarch x86_64 ppc64
+%{python_sitearch}/linkcheck/
+%{python_sitearch}/_linkchecker_configdata.*
+#%else
+#%{python_sitelib}/linkcheck/
+#%{python_sitelib}/_linkchecker_configdata.*
+#%endif
+%config(noreplace) %{_sysconfdir}/linkchecker
+%{_mandir}/man1/linkchecker.1*
 %lang(de) %{_mandir}/de/man1/linkchecker.1*
-%dir %{_mandir}/fr/man1
 %lang(fr) %{_mandir}/fr/man1/linkchecker.1*
+%doc TODO doc/en README COPYING
 
 %changelog
+* Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
+   - Rebuild for F7.
+
+* Fri Jul 27 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-8
+   - On 64-bit platforms, everything is in %{python_sitearch}/linkcheck/.
+
+* Wed Jul 25 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-7
+   - Install configuration files in /etc/linkchecker.
+   - Do not install examples.
+
+* Tue Jul 24 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-6
+   - Install logging.conf again.
+   - Use %%find_lang.
+
+* Sat Jul 21 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-5
+   - Simplify %%files.
+   - Don't install logging.conf because it is not documented.
+   - Install linkcheckerrc into /etc/linkchecker.
+
+* Mon Jul 16 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-4
+   - Own %%{python_sitelib}/linkcheck/ and %%{python_sitearch}/linkcheck/.
+   - Include .1.gz-style man pages in %%files.
+   - Include _linkchecker_configdata.* instead of just .py.
+
+* Sat Jul 14 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-3
+   - Use sitearch for .so, sitelib for .py, .pyo and .pyc.
+   - Clean up docs directory.
+
+* Thu Jul 12 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-2
+   - Use sitearch instead of sitelib.
+   - Fix upstream source location.
+   - Simplify %%files.
+
+* Wed Jul 11 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-1
+   - Rebuild for F7.
+   - Update to upstream 4.7.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-11
    - Rebuild for FC6.
 
@@ -84,7 +118,7 @@
    - Install /usr/lib/python2.4/site-packages/_linkchecker_configdata.pyc again.
 
 * Fri Jul 28 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-6
-   - Add %{buildroot} to previous.
+   - Add %%{buildroot} to previous.
 
 * Fri Jul 28 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-5
    - Do not install /usr/lib/python2.4/site-packages/_linkchecker_configdata.pyc



From fedora-extras-commits at redhat.com  Tue Sep 11 00:34:45 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:34:45 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.20,1.21
Message-ID: <200709110034.l8B0YjfL014047@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14004

Modified Files:
	linkchecker.spec 
Log Message:
Rebuild for F8.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linkchecker.spec	11 Sep 2007 00:32:29 -0000	1.20
+++ linkchecker.spec	11 Sep 2007 00:34:12 -0000	1.21
@@ -66,7 +66,7 @@
 
 %changelog
 * Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
-   - Rebuild for F7.
+   - Rebuild for F8.
 
 * Fri Jul 27 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-8
    - On 64-bit platforms, everything is in %{python_sitearch}/linkcheck/.



From fedora-extras-commits at redhat.com  Tue Sep 11 00:39:57 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:39:57 -0400
Subject: rpms/linkchecker/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200709110039.l8B0dvep014283@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247

Modified Files:
	.cvsignore sources 
Log Message:
Forgot to add new sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2006 12:23:54 -0000	1.3
+++ .cvsignore	11 Sep 2007 00:39:25 -0000	1.4
@@ -1 +1,2 @@
-linkchecker-3.3.tar.gz
+linkchecker-4.7.tar.gz
+linkchecker-4.7-fedora-build.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2006 12:23:54 -0000	1.3
+++ sources	11 Sep 2007 00:39:25 -0000	1.4
@@ -1 +1,2 @@
-84b1ac29c8a638f77f9db5c2b27b5a79  linkchecker-3.3.tar.gz
+0bd9860cf8acd546ac57b7b8ff5933e8  linkchecker-4.7.tar.gz
+82b08063ad744537e8cd07ea8a694ded  linkchecker-4.7-fedora-build.patch



From fedora-extras-commits at redhat.com  Tue Sep 11 00:41:30 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 10 Sep 2007 20:41:30 -0400
Subject: rpms/linkchecker/devel linkchecker.spec,1.21,1.22
Message-ID: <200709110041.l8B0fUCi014522@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14342

Modified Files:
	linkchecker.spec 
Log Message:
Bump version to retag.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linkchecker.spec	11 Sep 2007 00:34:12 -0000	1.21
+++ linkchecker.spec	11 Sep 2007 00:40:57 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 4.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -65,6 +65,9 @@
 %doc TODO doc/en README COPYING
 
 %changelog
+* Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-10
+   - Bump version to retag with new sources.
+
 * Mon Sep 10 2007 W. Michael Petullo <mike[at]flyn.org> - 4.7-9
    - Rebuild for F8.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 03:06:09 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 23:06:09 -0400
Subject: rpms/xfsprogs/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 xfsprogs.spec, 1.29, 1.30
Message-ID: <200709110306.l8B369Yv004688@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4666

Modified Files:
	.cvsignore sources xfsprogs.spec 
Log Message:
* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-1
- Update to xfsprogs 2.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2007 22:16:00 -0000	1.11
+++ .cvsignore	11 Sep 2007 03:05:36 -0000	1.12
@@ -1 +1 @@
-xfsprogs_2.9.3-1.tar.gz
+xfsprogs_2.9.4-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2007 22:16:00 -0000	1.12
+++ sources	11 Sep 2007 03:05:36 -0000	1.13
@@ -1 +1 @@
-fd41478ab239c8815961dc13e3d4fa6f  xfsprogs_2.9.3-1.tar.gz
+174683e3b86b587ed59823fdbbb96ea4  xfsprogs_2.9.4-1.tar.gz


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfsprogs.spec	25 Aug 2007 00:09:46 -0000	1.29
+++ xfsprogs.spec	11 Sep 2007 03:05:36 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem
 Name: xfsprogs
-Version: 2.9.3
-Release: 3%{?dist}
+Version: 2.9.4
+Release: 1%{?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
@@ -111,6 +111,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> 2.9.4-1
+- Update to xfsprogs 2.9.4
+
 * Fri Aug 24 2007 Eric Sandeen <sandeen at redhat.com> 2.9.3-3
 - Add gawk to buildrequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 03:19:59 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Mon, 10 Sep 2007 23:19:59 -0400
Subject: rpms/xfsdump/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfsdump.spec, 1.5, 1.6 fix-open-O_CREAT-perms.patch, 1.1, NONE
Message-ID: <200709110319.l8B3JxgR006406@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsdump/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6186

Modified Files:
	.cvsignore sources xfsdump.spec 
Removed Files:
	fix-open-O_CREAT-perms.patch 
Log Message:
* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.46-1
- Update to xfsdump version 2.2.46
- Dropped O_CREAT patch, now upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jun 2007 05:06:32 -0000	1.3
+++ .cvsignore	11 Sep 2007 03:19:26 -0000	1.4
@@ -1 +1 @@
-xfsdump_2.2.45-1.tar.gz
+xfsdump_2.2.46-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jun 2007 05:06:32 -0000	1.3
+++ sources	11 Sep 2007 03:19:26 -0000	1.4
@@ -1 +1 @@
-9f4f6da94d14e638639a542b0fa8a722  xfsdump_2.2.45-1.tar.gz
+c233a3f032d183d5bfa5dce210a08418  xfsdump_2.2.46-1.tar.gz


Index: xfsdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsdump/devel/xfsdump.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfsdump.spec	25 Aug 2007 00:04:28 -0000	1.5
+++ xfsdump.spec	11 Sep 2007 03:19:26 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Administrative utilities for the XFS filesystem
 Name: xfsdump
-Version: 2.2.45
-Release: 3%{?dist}
+Version: 2.2.46
+Release: 1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 License: GPL+
@@ -13,8 +13,6 @@
 BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel
 Requires: xfsprogs >= 2.6.30, attr >= 2.0.0
 
-Patch1: fix-open-O_CREAT-perms.patch
-
 %description
 The xfsdump package contains xfsdump, xfsrestore and a number of
 other utilities for administering XFS filesystems.
@@ -34,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 autoconf
@@ -64,6 +61,10 @@
 /sbin/*
 
 %changelog
+* Mon Sep 10 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.46-1
+- Update to xfsdump version 2.2.46
+- Dropped O_CREAT patch, now upstream
+
 * Fri Aug 24 2007 Eric Sandeen <sandeen at redhat.com> - 2.2.45-3
 - Update license tag
 - Fix up O_CREAT opens with no mode


--- fix-open-O_CREAT-perms.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 05:27:38 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:27:38 -0400
Subject: rpms/zabbix/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zabbix.spec,
	1.8, 1.9
Message-ID: <200709110527.l8B5RcEK027633@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27609

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 15:40:03 -0000	1.7
+++ .cvsignore	11 Sep 2007 05:27:04 -0000	1.8
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 15:40:04 -0000	1.7
+++ sources	11 Sep 2007 05:27:04 -0000	1.8
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zabbix.spec	2 Jul 2007 15:40:04 -0000	1.8
+++ zabbix.spec	11 Sep 2007 05:27:04 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:33:42 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:33:42 -0400
Subject: rpms/zabbix/F-7 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zabbix.spec, 
	1.10, 1.11
Message-ID: <200709110533.l8B5XgA9027921@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27894

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jul 2007 15:01:23 -0000	1.7
+++ .cvsignore	11 Sep 2007 05:33:09 -0000	1.8
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jul 2007 15:01:24 -0000	1.7
+++ sources	11 Sep 2007 05:33:09 -0000	1.8
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	2 Jul 2007 15:01:24 -0000	1.10
+++ zabbix.spec	11 Sep 2007 05:33:09 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:37:47 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:37:47 -0400
Subject: rpms/zabbix/EL-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 zabbix.spec,
	1.8, 1.9
Message-ID: <200709110537.l8B5blCD028138@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28106

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release
- built without WWW monitoring support due old libcurl



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jul 2007 14:36:16 -0000	1.6
+++ .cvsignore	11 Sep 2007 05:37:14 -0000	1.7
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jul 2007 14:36:16 -0000	1.6
+++ sources	11 Sep 2007 05:37:14 -0000	1.7
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zabbix.spec	16 Jul 2007 14:36:16 -0000	1.8
+++ zabbix.spec	11 Sep 2007 05:37:14 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -27,7 +27,7 @@
 
 BuildRequires:  %{database}-devel, net-snmp-devel
 BuildRequires:  openldap-devel, gnutls-devel
-BuildRequires:  iksemel-devel, curl-devel
+BuildRequires:  iksemel-devel
 Requires:       logrotate, fping, net-snmp-libs
 Requires(pre):      /usr/sbin/useradd
 Requires(post):     /sbin/chkconfig
@@ -98,7 +98,7 @@
     --with-%{zdb} \
     --with-net-snmp \
     --with-ldap \
-    --with-libcurl \
+    --without-libcurl \
     --with-jabber
 
 #make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,10 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+- built without WWW monitoring support due old libcurl
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 05:39:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 11 Sep 2007 01:39:28 -0400
Subject: rpms/zabbix/EL-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 zabbix.spec,
	1.9, 1.10
Message-ID: <200709110539.l8B5dS2F028302@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jul 2007 14:34:31 -0000	1.6
+++ .cvsignore	11 Sep 2007 05:38:55 -0000	1.7
@@ -1,6 +1 @@
-zabbix-1.1.4.tar.gz
-zabbix-1.1.5.tar.gz
-zabbix-1.1.6.tar.gz
-zabbix-1.1.7.tar.gz
-zabbix-1.4.tar.gz
-zabbix-1.4.1.tar.gz
+zabbix-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jul 2007 14:34:31 -0000	1.6
+++ sources	11 Sep 2007 05:38:55 -0000	1.7
@@ -1 +1 @@
-c9e9a12eeb3ae784075cb7899f200889  zabbix-1.4.1.tar.gz
+1a89f3b8b0925c6373379b4c5dd3138b  zabbix-1.4.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	16 Jul 2007 14:34:31 -0000	1.9
+++ zabbix.spec	11 Sep 2007 05:38:55 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -204,7 +204,7 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %doc docs/*.pdf upgrades/dbpatches dbinit
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_server
+%{_sbindir}/zabbix_server
 %{_sysconfdir}/init.d/zabbix
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
@@ -215,10 +215,10 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README
 %dir %{_sysconfdir}/%{name}
-%{_bindir}/zabbix_agent
-%{_bindir}/zabbix_agentd
-%{_bindir}/zabbix_sender
-%{_bindir}/zabbix_get
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
 %{_sysconfdir}/init.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
 %config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
@@ -248,6 +248,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
+- New upstream release
+
 * Mon Jul 02 2007 Jarod Wilson <jwilson at redhat.com> 1.4.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 07:13:28 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:13:28 -0400
Subject: comps comps-f7.xml.in,1.250,1.251 comps-f8.xml.in,1.102,1.103
Message-ID: <200709110713.l8B7DSE0010945@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10918

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
add boswars


Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- comps-f7.xml.in	10 Sep 2007 07:50:16 -0000	1.250
+++ comps-f7.xml.in	11 Sep 2007 07:12:57 -0000	1.251
@@ -1285,6 +1285,7 @@
       <packagereq type="optional">blobby</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bombardier</packagereq>
+      <packagereq type="optional">boswars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>
       <packagereq type="optional">bzflag</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- comps-f8.xml.in	10 Sep 2007 07:50:16 -0000	1.102
+++ comps-f8.xml.in	11 Sep 2007 07:12:58 -0000	1.103
@@ -1425,6 +1425,7 @@
       <packagereq type="optional">blobby</packagereq>
       <packagereq type="optional">blobwars</packagereq>
       <packagereq type="optional">bombardier</packagereq>
+      <packagereq type="optional">boswars</packagereq>
       <packagereq type="optional">bsd-games</packagereq>
       <packagereq type="optional">bygfoot</packagereq>
       <packagereq type="optional">bzflag</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 07:23:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:23:02 -0400
Subject: rpms/boswars/devel boswars-2.4.1-SConstruct.patch, NONE,
	1.1 boswars-2.4.1-guichan26.patch, NONE, 1.1 boswars.desktop,
	NONE, 1.1 boswars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709110723.l8B7N23G011222@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/boswars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11166/devel

Modified Files:
	.cvsignore sources 
Added Files:
	boswars-2.4.1-SConstruct.patch boswars-2.4.1-guichan26.patch 
	boswars.desktop boswars.spec 
Log Message:
initial boswars import


boswars-2.4.1-SConstruct.patch:

--- NEW FILE boswars-2.4.1-SConstruct.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -279,7 +278,8 @@ AutoConfigureIfNeeded(env, '')
 
 # define the different build environments (variants)
 release = env.Copy()
-release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer -fexpensive-optimizations -ffast-math'))
+release.Append(CCFLAGS = Split('-ffast-math'))
+release.Append(LIBS = '-ltolua++')
 
 if mingw['extrapath']:
   mingw.Tool('crossmingw', toolpath = ['tools/scons/'])

boswars-2.4.1-guichan26.patch:

--- NEW FILE boswars-2.4.1-guichan26.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -75,7 +75,6 @@ def globSources(sourceDirs, builddir):
 
 def buildSourcesList(builddir):
    sources = globSources("action ai editor game map network pathfinder sound stratagus ui unit video tolua", builddir)
-   sources.append(globSources("guichan guichan/sdl guichan/widgets", builddir))
    return sources
 sourcesEngine = buildSourcesList('build')
 
@@ -274,7 +273,6 @@ AutoConfigureIfNeeded(env, '')
 def addBosWarsPaths(env):
    # Stratagus build specifics
    env.Append(CPPPATH=engineSourceDir+'/include')
-   env.Append(CPPPATH=engineSourceDir+'/guichan/include')
 addBosWarsPaths(env)
 
 # define the different build environments (variants)
diff -up boswars-2.4.1-src/engine/include/widgets.h.hdg boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h.hdg	2007-09-07 19:32:04.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-07 20:35:09.000000000 +0200
@@ -111,9 +111,9 @@ public:
 	virtual void drawBox(gcn::Graphics *graphics);
 	virtual void draw(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -137,9 +137,9 @@ public:
 	virtual void draw(gcn::Graphics *graphics);
 	virtual void drawBox(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -229,7 +229,7 @@ public:
 	Windows(const std::string &text, int width, int height);
 	void add(gcn::Widget *widget, int x, int y);
 private:
-	virtual void mouseMotion(int x, int y);
+	virtual void mouseDragged (gcn::MouseEvent &mouseEvent);
 	virtual void setBackgroundColor(const gcn::Color &color);
 	virtual void setBaseColor(const gcn::Color &color);
 private:
diff -up boswars-2.4.1-src/engine/include/font.h.hdg boswars-2.4.1-src/engine/include/font.h
--- boswars-2.4.1-src/engine/include/font.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/font.h	2007-09-07 19:32:04.000000000 +0200
@@ -58,7 +58,7 @@
 ----------------------------------------------------------------------------*/
 
 #include "video.h"
-#include "guichan/font.h"
+#include "guichan/font.hpp"
 
 /*----------------------------------------------------------------------------
 --  Declarations
diff -up boswars-2.4.1-src/engine/include/video.h.hdg boswars-2.4.1-src/engine/include/video.h
--- boswars-2.4.1-src/engine/include/video.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/video.h	2007-09-07 19:32:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include "SDL.h"
 #include "SDL_opengl.h"
-#include "guichan/image.h"
+#include "guichan/image.hpp"
 
 class CFont;
 
diff -up boswars-2.4.1-src/engine/editor/editloop.cpp.hdg boswars-2.4.1-src/engine/editor/editloop.cpp
--- boswars-2.4.1-src/engine/editor/editloop.cpp.hdg	2007-07-03 23:57:45.000000000 +0200
+++ boswars-2.4.1-src/engine/editor/editloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -56,7 +56,7 @@
 #include "iolib.h"
 #include "iocompat.h"
 #include "commands.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 #include "script.h"
 
@@ -109,7 +109,7 @@ static int CalculateUnitIcons(void);
 class EditorSliderListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int iconsPerStep = CalculateUnitIcons();
 		int steps = (Editor.ShownUnitTypes.size() + iconsPerStep - 1) / iconsPerStep;
 		double value = editorSlider->getValue();
@@ -464,7 +464,7 @@ static void CleanEditResource()
 class CEditResourceOKActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int amount = atoi(editResourceTextField->getText().c_str());
 		for (int i = 0; i < MaxCosts; ++i) {
 			UnitUnderCursor->ResourcesHeld[i] = amount * CYCLES_PER_SECOND;
@@ -477,7 +477,7 @@ static CEditResourceOKActionListener Edi
 class CEditResourceCancelActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		editResourceMenu->stop();
 	}
 };
@@ -514,7 +514,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceTextField, 40, 46);
 
 	editResourceOKButton = new gcn::Button(_("~!OK"));
-	editResourceOKButton->setHotKey("o");
 	editResourceOKButton->setSize(106, 28);
 	editResourceOKButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceOKButton->setBaseColor(gcn::Color(38, 38, 78, 130));
@@ -522,7 +521,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceOKButton, 24, 88);
 
 	editResourceCancelButton = new gcn::Button(_("~!Cancel"));
-	editResourceCancelButton->setHotKey("c");
 	editResourceCancelButton->setSize(106, 28);
 	editResourceCancelButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceCancelButton->setBaseColor(gcn::Color(38, 38, 78, 130));
diff -up boswars-2.4.1-src/engine/ui/widgets.cpp.hdg boswars-2.4.1-src/engine/ui/widgets.cpp
--- boswars-2.4.1-src/engine/ui/widgets.cpp.hdg	2007-09-02 21:44:42.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/widgets.cpp	2007-09-07 22:32:09.000000000 +0200
@@ -361,7 +361,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		img = disabledImage ? disabledImage : normalImage;
 	} else if (isPressed()) {
 		img = pressedImage ? pressedImage : normalImage;
-	} else if (0 && hasMouse()) {
+	} else if (0 && mHasMouse) {
 		// FIXME: add mouse-over image
 		img = NULL;
 	} else {
@@ -396,7 +396,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		graphics->drawText(getCaption(), textX + 2, textY + 2, getAlignment());
 	}
     
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
 	}
 }
@@ -491,7 +491,7 @@ void ImageRadioButton::draw(gcn::Graphic
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -499,9 +499,9 @@ void ImageRadioButton::draw(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageRadioButton::mousePress(int x, int y, int button)
+void ImageRadioButton::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -509,9 +509,9 @@ void ImageRadioButton::mousePress(int x,
 /**
 **  Mouse button released callback
 */
-void ImageRadioButton::mouseRelease(int x, int y, int button)
+void ImageRadioButton::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -519,9 +519,9 @@ void ImageRadioButton::mouseRelease(int 
 /**
 **  Mouse clicked callback
 */
-void ImageRadioButton::mouseClick(int x, int y, int button, int count)
+void ImageRadioButton::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
         setMarked(true);
         generateAction();
 	}
@@ -598,7 +598,7 @@ void ImageCheckBox::draw(gcn::Graphics *
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -635,9 +635,9 @@ void ImageCheckBox::drawBox(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageCheckBox::mousePress(int x, int y, int button)
+void ImageCheckBox::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -645,9 +645,9 @@ void ImageCheckBox::mousePress(int x, in
 /**
 **  Mouse button released callback
 */
-void ImageCheckBox::mouseRelease(int x, int y, int button)
+void ImageCheckBox::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -655,9 +655,9 @@ void ImageCheckBox::mouseRelease(int x, 
 /**
 **  Mouse clicked callback
 */
-void ImageCheckBox::mouseClick(int x, int y, int button, int count)
+void ImageCheckBox::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		toggle();
 	}
 }
@@ -1109,7 +1109,7 @@ Windows::Windows(const std::string &titl
 {
 	container.setDimension(gcn::Rectangle(0, 0, width, height));
 	scroll.setDimension(gcn::Rectangle(0, 0, width, height));
-	this->setContent(&scroll);
+	this->add((gcn::Widget *)&scroll, 0, 0);
 	scroll.setContent(&container);
 	this->resizeToContent();
 }
@@ -1146,9 +1146,9 @@ void Windows::add(gcn::Widget *widget, i
 **    when the container is a "scrollable" ScrollArea with the cursor.
 **    The cursor can go outside the visual area.
 */
-void Windows::mouseMotion(int x, int y)
+void Windows::mouseDragged (gcn::MouseEvent &mouseEvent)
 {
-	gcn::BasicContainer *bcontainer = getParent();
+	gcn::Widget *bcontainer = getParent();
 	int diffx;
 	int diffy;
 	int criticalx;
@@ -1156,18 +1156,18 @@ void Windows::mouseMotion(int x, int y)
 	int absx;
 	int absy;
 
-	if (!mMouseDrag || !isMovable()) {
+	if (!isMovable()) {
 		return;
 	}
 
-	diffx = x - mMouseXOffset;
-	diffy = y - mMouseYOffset;
+	diffx = mouseEvent.getX() - mDragOffsetX;
+	diffy = mouseEvent.getY() - mDragOffsetY;
 	if (blockwholewindow) {
 		criticalx = getX();
 		criticaly = getY();
 	} else {
-		criticalx = getX() + mMouseXOffset;
-		criticaly = getY() + mMouseYOffset;
+		criticalx = getX() + mDragOffsetX;
+		criticaly = getY() + mDragOffsetY;
 	}
 
 
@@ -1190,15 +1190,13 @@ void Windows::mouseMotion(int x, int y)
 	}
 
 	// Place the window.
-	x = getX() + diffx;
-	y = getY() + diffy;
-	setPosition(x, y);
+	setPosition(getX() + diffx, getY() + diffy);
 
 	// Move the cursor.
 	// Usefull only when window reachs the limit.
 	getAbsolutePosition(absx, absy);
-	CursorX = absx + mMouseXOffset;
-	CursorY = absy + mMouseYOffset;
+	CursorX = absx + mDragOffsetX;
+	CursorY = absy + mDragOffsetY;
 }
 
 /**
@@ -1377,7 +1375,7 @@ void DropDownWidget::setList(lua_State *
 void DropDownWidget::setSize(int width, int height)
 {
 	DropDown::setSize(width, height);
-	this->getListBox()->setSize(width, height);
+	this->mListBox->setSize(width, height);
 }
 
 /*----------------------------------------------------------------------------
@@ -1571,7 +1569,7 @@ void MenuScreen::draw(gcn::Graphics *gra
 		Gui->getGraphics()->popClipArea();
 		Gui->draw();
 		Gui->setTop(w);
-		w->_getFocusHandler()->setFocus(f);
+		f->requestFocus();
 		Gui->getGraphics()->pushClipArea(r);
 	}
 	gcn::Container::draw(graphics);
diff -up boswars-2.4.1-src/engine/ui/interface.cpp.hdg boswars-2.4.1-src/engine/ui/interface.cpp
--- boswars-2.4.1-src/engine/ui/interface.cpp.hdg	2007-07-03 23:57:47.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/interface.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -836,8 +836,6 @@ static int InputKey(int key)
 
 		default:
 			if (key >= ' ') {
-				gcn::Key k(key);
-				std::string kstr = k.toString();
 				if (key == '~') {
 					if (InputIndex < (int)sizeof(Input) - 2) {
 						Input[InputIndex++] = key;
@@ -845,10 +843,8 @@ static int InputKey(int key)
 						Input[InputIndex] = '\0';
 						ShowInput();
 					}
-				} else if (InputIndex < (int)(sizeof(Input) - kstr.size())) {
-					for (size_t i = 0; i < kstr.size(); ++i) {
-						Input[InputIndex++] = kstr[i];
-					}
+				} else if (InputIndex < (int)sizeof(Input) - 1) {
+					Input[InputIndex++] = key;
 					Input[InputIndex] = '\0';
 					ShowInput();
 				}
diff -up boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg boswars-2.4.1-src/engine/stratagus/mainloop.cpp
--- boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg	2007-07-03 23:57:48.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/mainloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -68,7 +68,7 @@
 #include "editor.h"
 #include "sound.h"
 
-#include <guichan.h>
+#include <guichan.hpp>
 void DrawGuichanWidgets();
 
 //----------------------------------------------------------------------------
diff -up boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg boswars-2.4.1-src/engine/stratagus/stratagus.cpp
--- boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg	2007-09-02 21:44:43.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/stratagus.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -205,7 +205,7 @@ extern int getopt(int argc, char *const 
 #include "widgets.h"
 #include "iolib.h"
 #include "util.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 extern void CreateUserDirectories(void);
 
diff -up boswars-2.4.1-src/engine/include/widgets.h~ boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h~	2007-09-09 09:44:18.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-09 09:44:18.000000000 +0200
@@ -28,8 +28,8 @@
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
 
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 typedef int lua_Object; // from tolua++.h
 


--- NEW FILE boswars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bos Wars
Comment=Bos Wars is a futuristic real-time strategy game
Exec=boswars -d /usr/share/boswars
Icon=boswars.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE boswars.spec ---
Name:           boswars
Version:        2.4.1
Release:        2%{?dist}
Summary:        Bos Wars is a futuristic real-time strategy game
Group:          Amusements/Games
License:        GPLv2
URL:            http://www.boswars.org/
Source0:        http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz
Source1:        %{name}.desktop
Patch0:         boswars-2.4.1-SConstruct.patch
# incomplete patch to port boswars to the sysytem guichan-0.6 instead of
# using the included guichan-0.4. Incomplete, NOT finished and NOT working!
Patch1:         boswars-2.4.1-guichan26.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel
BuildRequires:  tolua++-devel libpng-devel scons desktop-file-utils

%description
Bos Wars is a futuristic real-time strategy game. It is possible to play
against human opponents over LAN, internet, or against the computer.
Bos Wars aims to create a completly original and fun open source RTS game.


%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \
  engine/include/animation.h engine/guichan/sdl/gsdl.cpp
# we want to use the system version of these
rm engine/tolua/*.h engine/tolua/tolua_*.cpp


%build
scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS"


%install
rm -fr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 languages/*.po languages/*.pot \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
cp -a campaigns graphics maps scripts sounds units video \
  $RPM_BUILD_ROOT%{_datadir}/%{name}


# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 graphics/elites/ui/elites_claw.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boswars/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:48:56 -0000	1.1
+++ .cvsignore	11 Sep 2007 07:22:03 -0000	1.2
@@ -0,0 +1 @@
+boswars-2.4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boswars/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:48:56 -0000	1.1
+++ sources	11 Sep 2007 07:22:03 -0000	1.2
@@ -0,0 +1 @@
+ad4fe087da5697e920c746c75c20b07f  boswars-2.4.1-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 07:25:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:25:54 -0400
Subject: rpms/ksirk/devel ksirk.spec,1.1,1.2
Message-ID: <200709110725.l8B7PsbW011389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11351

Modified Files:
	ksirk.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
- Release increment for rebuild due to koji weirdness



Index: ksirk.spec
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/ksirk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksirk.spec	10 Sep 2007 07:46:19 -0000	1.1
+++ ksirk.spec	11 Sep 2007 07:25:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ksirk
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turnbased multiplayer board strategy game (conquer the world!)
 Group:          Amusements/Games
 License:        GPLv2
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
+- Release increment for rebuild due to koji weirdness
+
 * Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
 - Add missing gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 07:26:30 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 03:26:30 -0400
Subject: rpms/boswars/F-7 boswars-2.4.1-SConstruct.patch, NONE,
	1.1 boswars-2.4.1-guichan26.patch, NONE, 1.1 boswars.desktop,
	NONE, 1.1 boswars.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709110726.l8B7QU1K011473@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/boswars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11396

Modified Files:
	.cvsignore sources 
Added Files:
	boswars-2.4.1-SConstruct.patch boswars-2.4.1-guichan26.patch 
	boswars.desktop boswars.spec 
Log Message:
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel


boswars-2.4.1-SConstruct.patch:

--- NEW FILE boswars-2.4.1-SConstruct.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -279,7 +278,8 @@ AutoConfigureIfNeeded(env, '')
 
 # define the different build environments (variants)
 release = env.Copy()
-release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer -fexpensive-optimizations -ffast-math'))
+release.Append(CCFLAGS = Split('-ffast-math'))
+release.Append(LIBS = '-ltolua++')
 
 if mingw['extrapath']:
   mingw.Tool('crossmingw', toolpath = ['tools/scons/'])

boswars-2.4.1-guichan26.patch:

--- NEW FILE boswars-2.4.1-guichan26.patch ---
diff -up boswars-2.4.1-src/SConstruct.hdg boswars-2.4.1-src/SConstruct
--- boswars-2.4.1-src/SConstruct.hdg	2007-09-02 21:44:44.000000000 +0200
+++ boswars-2.4.1-src/SConstruct	2007-09-07 19:32:04.000000000 +0200
@@ -75,7 +75,6 @@ def globSources(sourceDirs, builddir):
 
 def buildSourcesList(builddir):
    sources = globSources("action ai editor game map network pathfinder sound stratagus ui unit video tolua", builddir)
-   sources.append(globSources("guichan guichan/sdl guichan/widgets", builddir))
    return sources
 sourcesEngine = buildSourcesList('build')
 
@@ -274,7 +273,6 @@ AutoConfigureIfNeeded(env, '')
 def addBosWarsPaths(env):
    # Stratagus build specifics
    env.Append(CPPPATH=engineSourceDir+'/include')
-   env.Append(CPPPATH=engineSourceDir+'/guichan/include')
 addBosWarsPaths(env)
 
 # define the different build environments (variants)
diff -up boswars-2.4.1-src/engine/include/widgets.h.hdg boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h.hdg	2007-09-07 19:32:04.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-07 20:35:09.000000000 +0200
@@ -111,9 +111,9 @@ public:
 	virtual void drawBox(gcn::Graphics *graphics);
 	virtual void draw(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -137,9 +137,9 @@ public:
 	virtual void draw(gcn::Graphics *graphics);
 	virtual void drawBox(gcn::Graphics *graphics);
 
-	virtual void mousePress(int x, int y, int button);
-	virtual void mouseRelease(int x, int y, int button);
-	virtual void mouseClick(int x, int y, int button, int count);
+	virtual void mousePressed(gcn::MouseEvent &mouseEvent);
+	virtual void mouseReleased(gcn::MouseEvent &mouseEvent);
+	virtual void mouseClicked(gcn::MouseEvent &mouseEvent);
 	virtual void adjustSize();
 
 	void setUncheckedNormalImage(gcn::Image *image) { uncheckedNormalImage = image; }
@@ -229,7 +229,7 @@ public:
 	Windows(const std::string &text, int width, int height);
 	void add(gcn::Widget *widget, int x, int y);
 private:
-	virtual void mouseMotion(int x, int y);
+	virtual void mouseDragged (gcn::MouseEvent &mouseEvent);
 	virtual void setBackgroundColor(const gcn::Color &color);
 	virtual void setBaseColor(const gcn::Color &color);
 private:
diff -up boswars-2.4.1-src/engine/include/font.h.hdg boswars-2.4.1-src/engine/include/font.h
--- boswars-2.4.1-src/engine/include/font.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/font.h	2007-09-07 19:32:04.000000000 +0200
@@ -58,7 +58,7 @@
 ----------------------------------------------------------------------------*/
 
 #include "video.h"
-#include "guichan/font.h"
+#include "guichan/font.hpp"
 
 /*----------------------------------------------------------------------------
 --  Declarations
diff -up boswars-2.4.1-src/engine/include/video.h.hdg boswars-2.4.1-src/engine/include/video.h
--- boswars-2.4.1-src/engine/include/video.h.hdg	2007-09-02 21:44:40.000000000 +0200
+++ boswars-2.4.1-src/engine/include/video.h	2007-09-07 19:32:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include "SDL.h"
 #include "SDL_opengl.h"
-#include "guichan/image.h"
+#include "guichan/image.hpp"
 
 class CFont;
 
diff -up boswars-2.4.1-src/engine/editor/editloop.cpp.hdg boswars-2.4.1-src/engine/editor/editloop.cpp
--- boswars-2.4.1-src/engine/editor/editloop.cpp.hdg	2007-07-03 23:57:45.000000000 +0200
+++ boswars-2.4.1-src/engine/editor/editloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -56,7 +56,7 @@
 #include "iolib.h"
 #include "iocompat.h"
 #include "commands.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 #include "script.h"
 
@@ -109,7 +109,7 @@ static int CalculateUnitIcons(void);
 class EditorSliderListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int iconsPerStep = CalculateUnitIcons();
 		int steps = (Editor.ShownUnitTypes.size() + iconsPerStep - 1) / iconsPerStep;
 		double value = editorSlider->getValue();
@@ -464,7 +464,7 @@ static void CleanEditResource()
 class CEditResourceOKActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		int amount = atoi(editResourceTextField->getText().c_str());
 		for (int i = 0; i < MaxCosts; ++i) {
 			UnitUnderCursor->ResourcesHeld[i] = amount * CYCLES_PER_SECOND;
@@ -477,7 +477,7 @@ static CEditResourceOKActionListener Edi
 class CEditResourceCancelActionListener : public gcn::ActionListener
 {
 public:
-	virtual void action(const std::string &eventId) {
+	virtual void action(const gcn::ActionEvent& actionEvent) {
 		editResourceMenu->stop();
 	}
 };
@@ -514,7 +514,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceTextField, 40, 46);
 
 	editResourceOKButton = new gcn::Button(_("~!OK"));
-	editResourceOKButton->setHotKey("o");
 	editResourceOKButton->setSize(106, 28);
 	editResourceOKButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceOKButton->setBaseColor(gcn::Color(38, 38, 78, 130));
@@ -522,7 +521,6 @@ static void EditorEditResource(void)
 	editResourceMenu->add(editResourceOKButton, 24, 88);
 
 	editResourceCancelButton = new gcn::Button(_("~!Cancel"));
-	editResourceCancelButton->setHotKey("c");
 	editResourceCancelButton->setSize(106, 28);
 	editResourceCancelButton->setBackgroundColor(gcn::Color(38, 38, 78, 130));
 	editResourceCancelButton->setBaseColor(gcn::Color(38, 38, 78, 130));
diff -up boswars-2.4.1-src/engine/ui/widgets.cpp.hdg boswars-2.4.1-src/engine/ui/widgets.cpp
--- boswars-2.4.1-src/engine/ui/widgets.cpp.hdg	2007-09-02 21:44:42.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/widgets.cpp	2007-09-07 22:32:09.000000000 +0200
@@ -361,7 +361,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		img = disabledImage ? disabledImage : normalImage;
 	} else if (isPressed()) {
 		img = pressedImage ? pressedImage : normalImage;
-	} else if (0 && hasMouse()) {
+	} else if (0 && mHasMouse) {
 		// FIXME: add mouse-over image
 		img = NULL;
 	} else {
@@ -396,7 +396,7 @@ void ImageButton::draw(gcn::Graphics *gr
 		graphics->drawText(getCaption(), textX + 2, textY + 2, getAlignment());
 	}
     
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
 	}
 }
@@ -491,7 +491,7 @@ void ImageRadioButton::draw(gcn::Graphic
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -499,9 +499,9 @@ void ImageRadioButton::draw(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageRadioButton::mousePress(int x, int y, int button)
+void ImageRadioButton::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -509,9 +509,9 @@ void ImageRadioButton::mousePress(int x,
 /**
 **  Mouse button released callback
 */
-void ImageRadioButton::mouseRelease(int x, int y, int button)
+void ImageRadioButton::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -519,9 +519,9 @@ void ImageRadioButton::mouseRelease(int 
 /**
 **  Mouse clicked callback
 */
-void ImageRadioButton::mouseClick(int x, int y, int button, int count)
+void ImageRadioButton::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
         setMarked(true);
         generateAction();
 	}
@@ -598,7 +598,7 @@ void ImageCheckBox::draw(gcn::Graphics *
 
 	graphics->drawText(getCaption(), width - 2, 0);
 
-	if (hasFocus()) {
+	if (isFocused()) {
 		graphics->drawRectangle(gcn::Rectangle(width - 4, 0, getWidth() - width + 3, getHeight()));
 	}
 }
@@ -635,9 +635,9 @@ void ImageCheckBox::drawBox(gcn::Graphic
 /**
 **  Mouse button pressed callback
 */
-void ImageCheckBox::mousePress(int x, int y, int button)
+void ImageCheckBox::mousePressed(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT && hasMouse()) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = true;
 	}
 }
@@ -645,9 +645,9 @@ void ImageCheckBox::mousePress(int x, in
 /**
 **  Mouse button released callback
 */
-void ImageCheckBox::mouseRelease(int x, int y, int button)
+void ImageCheckBox::mouseReleased(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		mMouseDown = false;
 	}
 }
@@ -655,9 +655,9 @@ void ImageCheckBox::mouseRelease(int x, 
 /**
 **  Mouse clicked callback
 */
-void ImageCheckBox::mouseClick(int x, int y, int button, int count)
+void ImageCheckBox::mouseClicked(gcn::MouseEvent &mouseEvent)
 {
-	if (button == gcn::MouseInput::LEFT) {
+	if (mouseEvent.getButton() == gcn::MouseInput::LEFT) {
 		toggle();
 	}
 }
@@ -1109,7 +1109,7 @@ Windows::Windows(const std::string &titl
 {
 	container.setDimension(gcn::Rectangle(0, 0, width, height));
 	scroll.setDimension(gcn::Rectangle(0, 0, width, height));
-	this->setContent(&scroll);
+	this->add((gcn::Widget *)&scroll, 0, 0);
 	scroll.setContent(&container);
 	this->resizeToContent();
 }
@@ -1146,9 +1146,9 @@ void Windows::add(gcn::Widget *widget, i
 **    when the container is a "scrollable" ScrollArea with the cursor.
 **    The cursor can go outside the visual area.
 */
-void Windows::mouseMotion(int x, int y)
+void Windows::mouseDragged (gcn::MouseEvent &mouseEvent)
 {
-	gcn::BasicContainer *bcontainer = getParent();
+	gcn::Widget *bcontainer = getParent();
 	int diffx;
 	int diffy;
 	int criticalx;
@@ -1156,18 +1156,18 @@ void Windows::mouseMotion(int x, int y)
 	int absx;
 	int absy;
 
-	if (!mMouseDrag || !isMovable()) {
+	if (!isMovable()) {
 		return;
 	}
 
-	diffx = x - mMouseXOffset;
-	diffy = y - mMouseYOffset;
+	diffx = mouseEvent.getX() - mDragOffsetX;
+	diffy = mouseEvent.getY() - mDragOffsetY;
 	if (blockwholewindow) {
 		criticalx = getX();
 		criticaly = getY();
 	} else {
-		criticalx = getX() + mMouseXOffset;
-		criticaly = getY() + mMouseYOffset;
+		criticalx = getX() + mDragOffsetX;
+		criticaly = getY() + mDragOffsetY;
 	}
 
 
@@ -1190,15 +1190,13 @@ void Windows::mouseMotion(int x, int y)
 	}
 
 	// Place the window.
-	x = getX() + diffx;
-	y = getY() + diffy;
-	setPosition(x, y);
+	setPosition(getX() + diffx, getY() + diffy);
 
 	// Move the cursor.
 	// Usefull only when window reachs the limit.
 	getAbsolutePosition(absx, absy);
-	CursorX = absx + mMouseXOffset;
-	CursorY = absy + mMouseYOffset;
+	CursorX = absx + mDragOffsetX;
+	CursorY = absy + mDragOffsetY;
 }
 
 /**
@@ -1377,7 +1375,7 @@ void DropDownWidget::setList(lua_State *
 void DropDownWidget::setSize(int width, int height)
 {
 	DropDown::setSize(width, height);
-	this->getListBox()->setSize(width, height);
+	this->mListBox->setSize(width, height);
 }
 
 /*----------------------------------------------------------------------------
@@ -1571,7 +1569,7 @@ void MenuScreen::draw(gcn::Graphics *gra
 		Gui->getGraphics()->popClipArea();
 		Gui->draw();
 		Gui->setTop(w);
-		w->_getFocusHandler()->setFocus(f);
+		f->requestFocus();
 		Gui->getGraphics()->pushClipArea(r);
 	}
 	gcn::Container::draw(graphics);
diff -up boswars-2.4.1-src/engine/ui/interface.cpp.hdg boswars-2.4.1-src/engine/ui/interface.cpp
--- boswars-2.4.1-src/engine/ui/interface.cpp.hdg	2007-07-03 23:57:47.000000000 +0200
+++ boswars-2.4.1-src/engine/ui/interface.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -836,8 +836,6 @@ static int InputKey(int key)
 
 		default:
 			if (key >= ' ') {
-				gcn::Key k(key);
-				std::string kstr = k.toString();
 				if (key == '~') {
 					if (InputIndex < (int)sizeof(Input) - 2) {
 						Input[InputIndex++] = key;
@@ -845,10 +843,8 @@ static int InputKey(int key)
 						Input[InputIndex] = '\0';
 						ShowInput();
 					}
-				} else if (InputIndex < (int)(sizeof(Input) - kstr.size())) {
-					for (size_t i = 0; i < kstr.size(); ++i) {
-						Input[InputIndex++] = kstr[i];
-					}
+				} else if (InputIndex < (int)sizeof(Input) - 1) {
+					Input[InputIndex++] = key;
 					Input[InputIndex] = '\0';
 					ShowInput();
 				}
diff -up boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg boswars-2.4.1-src/engine/stratagus/mainloop.cpp
--- boswars-2.4.1-src/engine/stratagus/mainloop.cpp.hdg	2007-07-03 23:57:48.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/mainloop.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -68,7 +68,7 @@
 #include "editor.h"
 #include "sound.h"
 
-#include <guichan.h>
+#include <guichan.hpp>
 void DrawGuichanWidgets();
 
 //----------------------------------------------------------------------------
diff -up boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg boswars-2.4.1-src/engine/stratagus/stratagus.cpp
--- boswars-2.4.1-src/engine/stratagus/stratagus.cpp.hdg	2007-09-02 21:44:43.000000000 +0200
+++ boswars-2.4.1-src/engine/stratagus/stratagus.cpp	2007-09-07 19:32:04.000000000 +0200
@@ -205,7 +205,7 @@ extern int getopt(int argc, char *const 
 #include "widgets.h"
 #include "iolib.h"
 #include "util.h"
-#include "guichan.h"
+#include "guichan.hpp"
 
 extern void CreateUserDirectories(void);
 
diff -up boswars-2.4.1-src/engine/include/widgets.h~ boswars-2.4.1-src/engine/include/widgets.h
--- boswars-2.4.1-src/engine/include/widgets.h~	2007-09-09 09:44:18.000000000 +0200
+++ boswars-2.4.1-src/engine/include/widgets.h	2007-09-09 09:44:18.000000000 +0200
@@ -28,8 +28,8 @@
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
 
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 typedef int lua_Object; // from tolua++.h
 


--- NEW FILE boswars.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bos Wars
Comment=Bos Wars is a futuristic real-time strategy game
Exec=boswars -d /usr/share/boswars
Icon=boswars.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE boswars.spec ---
Name:           boswars
Version:        2.4.1
Release:        2%{?dist}
Summary:        Bos Wars is a futuristic real-time strategy game
Group:          Amusements/Games
License:        GPLv2
URL:            http://www.boswars.org/
Source0:        http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz
Source1:        %{name}.desktop
Patch0:         boswars-2.4.1-SConstruct.patch
# incomplete patch to port boswars to the sysytem guichan-0.6 instead of
# using the included guichan-0.4. Incomplete, NOT finished and NOT working!
Patch1:         boswars-2.4.1-guichan26.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel
BuildRequires:  tolua++-devel libpng-devel scons desktop-file-utils

%description
Bos Wars is a futuristic real-time strategy game. It is possible to play
against human opponents over LAN, internet, or against the computer.
Bos Wars aims to create a completly original and fun open source RTS game.


%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \
  engine/include/animation.h engine/guichan/sdl/gsdl.cpp
# we want to use the system version of these
rm engine/tolua/*.h engine/tolua/tolua_*.cpp


%build
scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS"


%install
rm -fr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 languages/*.po languages/*.pot \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
cp -a campaigns graphics maps scripts sounds units video \
  $RPM_BUILD_ROOT%{_datadir}/%{name}


# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 graphics/elites/ui/elites_claw.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
- Add missing BuildRequires libpng-devel

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2007 19:48:56 -0000	1.1
+++ .cvsignore	11 Sep 2007 07:25:58 -0000	1.2
@@ -0,0 +1 @@
+boswars-2.4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2007 19:48:56 -0000	1.1
+++ sources	11 Sep 2007 07:25:58 -0000	1.2
@@ -0,0 +1 @@
+ad4fe087da5697e920c746c75c20b07f  boswars-2.4.1-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 07:27:37 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Tue, 11 Sep 2007 03:27:37 -0400
Subject: rpms/rpm/devel .cvsignore, 1.20, 1.21 rpm.spec, 1.258, 1.259 sources,
	1.126, 1.127 rpm-4.4.2.1-debuginfo-names.patch, 1.3, NONE
Message-ID: <200709110727.l8B7Rb3n011574@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11533

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.4.2.1-debuginfo-names.patch 
Log Message:
- 4.4.2.2-rc2
- resolves #180996, #281611, #259961, #277161, #155079
- drop debugedit-names patch now that it's really upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Aug 2007 10:14:29 -0000	1.20
+++ .cvsignore	11 Sep 2007 07:27:05 -0000	1.21
@@ -1 +1 @@
-rpm-4.4.2.2-rc1.tar.gz
+rpm-4.4.2.2-rc2.tar.gz


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- rpm.spec	5 Sep 2007 11:22:24 -0000	1.258
+++ rpm.spec	11 Sep 2007 07:27:05 -0000	1.259
@@ -6,10 +6,10 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.4.rc1
+Release: 0.5.rc2
 Group: System Environment/Base
 Url: http://www.rpm.org/
-Source: %{name}-%{version}-rc1.tar.gz
+Source: %{name}-%{version}-rc2.tar.gz
 Patch1: rpm-4.4.1-prereq.patch
 Patch2: rpm-4.4.2-ghost-conflicts.patch
 Patch3: rpm-4.4.2-trust.patch
@@ -17,7 +17,6 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
-Patch8: rpm-4.4.2.1-debuginfo-names.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -132,7 +131,7 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 %patch1 -p1 -b .prereq
 %patch2 -p1 -b .ghostconflicts
 %patch3 -p1 -b .trust
@@ -140,7 +139,6 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
-%patch8 -p1 -b .debugedit-names
 
 # force external popt
 rm -rf popt/
@@ -403,6 +401,11 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.5.rc2
+- 4.4.2.2-rc2
+- resolves #180996, #281611, #259961, #277161, #155079
+- drop debugedit-names patch now that it's really upstream
+
 * Wed Sep 05 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.4.rc1
 - remove duplicated libraries from rpm-devel (#278151)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	28 Aug 2007 10:14:29 -0000	1.126
+++ sources	11 Sep 2007 07:27:05 -0000	1.127
@@ -1 +1 @@
-d315aa039298d49274898a45a97a68d7  rpm-4.4.2.2-rc1.tar.gz
+75c0be2051be684e5f0b1517c4269aa3  rpm-4.4.2.2-rc2.tar.gz


--- rpm-4.4.2.1-debuginfo-names.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 08:01:54 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 04:01:54 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.78,1.79
Message-ID: <200709110801.l8B81sqc018694@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12753

Modified Files:
	pm-utils.spec 
Log Message:
Do not require vbetool on ppc anc ppc64



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- pm-utils.spec	10 Sep 2007 21:20:45 -0000	1.78
+++ pm-utils.spec	11 Sep 2007 08:01:08 -0000	1.79
@@ -2,13 +2,15 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
 Requires: radeontool
+%ifnarch ppc ppc64
 Requires: vbetool
+%endif
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -110,6 +112,9 @@
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
+* Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
+- Require vbetool not on ppc and ppc64
+
 * Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
 - Merge new upstream
 - remove pm/power.d/laptop-tools



From fedora-extras-commits at redhat.com  Tue Sep 11 08:23:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:23:27 -0700
Subject: [pkgdb] basesystem: karsten has requested commit
Message-ID: <200709110823.l8B8NSkG018858@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on basesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 08:23:55 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:23:55 -0700
Subject: [pkgdb] filesystem: karsten has requested commit
Message-ID: <200709110823.l8B8NuYm018867@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/filesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:13 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:13 -0700
Subject: [pkgdb] openhpi: karsten has requested commit
Message-ID: <200709110824.l8B8OFdr024947@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on openhpi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openhpi



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:22 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:22 -0700
Subject: [pkgdb] OpenIPMI: karsten has requested commit
Message-ID: <200709110824.l8B8ONj9018881@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on OpenIPMI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/OpenIPMI



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:37 -0700
Subject: [pkgdb] rootfiles: karsten has requested commit
Message-ID: <200709110824.l8B8OcWT024966@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on rootfiles (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rootfiles



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:43 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:43 -0700
Subject: [pkgdb] setup: karsten has requested commit
Message-ID: <200709110824.l8B8OhgZ024976@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on setup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setup



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:47 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:47 -0700
Subject: [pkgdb] sg3_utils: karsten has requested commit
Message-ID: <200709110824.l8B8OmxW018891@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sg3_utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From fedora-extras-commits at redhat.com  Tue Sep 11 08:24:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:24:54 -0700
Subject: [pkgdb] system-config-httpd: karsten has requested commit
Message-ID: <200709110824.l8B8OtwL018900@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on system-config-httpd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-httpd



From fedora-extras-commits at redhat.com  Tue Sep 11 08:25:06 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:25:06 -0700
Subject: [pkgdb] vconfig: karsten has requested commit
Message-ID: <200709110825.l8B8P7Zx018909@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on vconfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vconfig



From fedora-extras-commits at redhat.com  Tue Sep 11 08:27:38 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:27:38 -0700
Subject: [pkgdb] ctags: karsten has requested commit
Message-ID: <200709110827.l8B8Rc9h018934@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on ctags (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:05 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:05 -0700
Subject: [pkgdb] doxygen: karsten has requested commit
Message-ID: <200709110828.l8B8S6jT024997@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on doxygen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/doxygen



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:12 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:12 -0700
Subject: [pkgdb] efax: karsten has requested commit
Message-ID: <200709110828.l8B8SC2v025006@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on efax (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/efax



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:16 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:16 -0700
Subject: [pkgdb] eject: karsten has requested commit
Message-ID: <200709110828.l8B8SHS5018944@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on eject (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eject



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:22 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:22 -0700
Subject: [pkgdb] fonts-KOI8-R: karsten has requested commit
Message-ID: <200709110828.l8B8SM1F018953@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on fonts-KOI8-R (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fonts-KOI8-R



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:27 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:27 -0700
Subject: [pkgdb] isdn4k-utils: karsten has requested commit
Message-ID: <200709110828.l8B8SSI5018968@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on isdn4k-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isdn4k-utils



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:33 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:33 -0700
Subject: [pkgdb] joystick: karsten has requested commit
Message-ID: <200709110828.l8B8SXqR018977@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on joystick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/joystick



From fedora-extras-commits at redhat.com  Tue Sep 11 08:28:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:28:37 -0700
Subject: [pkgdb] kdbg: karsten has requested commit
Message-ID: <200709110828.l8B8ScLA018986@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on kdbg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdbg



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:15 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:15 -0700
Subject: [pkgdb] lrzsz: karsten has requested commit
Message-ID: <200709110829.l8B8TGbT019002@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on lrzsz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lrzsz



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:20 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:20 -0700
Subject: [pkgdb] mktemp: karsten has requested commit
Message-ID: <200709110829.l8B8TKAT019011@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on mktemp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mktemp



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:23 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:23 -0700
Subject: [pkgdb] mktemp: karsten has requested watchbugzilla
Message-ID: <200709110829.l8B8TNxA025022@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on mktemp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mktemp



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:31 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:31 -0700
Subject: [pkgdb] mozplugger: karsten has requested commit
Message-ID: <200709110829.l8B8TVio025032@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on mozplugger (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mozplugger



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:36 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:36 -0700
Subject: [pkgdb] pcre: karsten has requested commit
Message-ID: <200709110829.l8B8TbeU025047@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on pcre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pcre



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:49 -0700
Subject: [pkgdb] rp-pppoe: karsten has requested commit
Message-ID: <200709110829.l8B8TnlR025061@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on rp-pppoe (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rp-pppoe



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:53 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:53 -0700
Subject: [pkgdb] sharutils: karsten has requested commit
Message-ID: <200709110829.l8B8TrfM019020@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sharutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sharutils



From fedora-extras-commits at redhat.com  Tue Sep 11 08:29:59 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:29:59 -0700
Subject: [pkgdb] switchdesk: karsten has requested watchbugzilla
Message-ID: <200709110829.l8B8TxS4025070@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on switchdesk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/switchdesk



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:00 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:00 -0700
Subject: [pkgdb] switchdesk: karsten has requested commit
Message-ID: <200709110830.l8B8U0l4025079@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on switchdesk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/switchdesk



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:07 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:07 -0700
Subject: [pkgdb] sysreport: karsten has requested commit
Message-ID: <200709110830.l8B8U7aa025095@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on sysreport (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sysreport



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:08 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:08 -0700
Subject: [pkgdb] sysreport: karsten has requested watchbugzilla
Message-ID: <200709110830.l8B8U86W025104@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the watchbugzilla acl on sysreport (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sysreport



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:13 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:13 -0700
Subject: [pkgdb] system-switch-mail: karsten has requested commit
Message-ID: <200709110830.l8B8UEUF019032@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on system-switch-mail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-switch-mail



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:18 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:18 -0700
Subject: [pkgdb] transfig: karsten has requested commit
Message-ID: <200709110830.l8B8UIq2019042@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on transfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/transfig



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:24 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:24 -0700
Subject: [pkgdb] tvtime: karsten has requested commit
Message-ID: <200709110830.l8B8UOEc025114@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on tvtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tvtime



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:34 -0700
Subject: [pkgdb] urw-fonts: karsten has requested commit
Message-ID: <200709110830.l8B8UYHX019051@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on urw-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urw-fonts



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:43 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:43 -0700
Subject: [pkgdb] which: karsten has requested commit
Message-ID: <200709110830.l8B8Uhx4019060@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on which (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/which



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:48 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:48 -0700
Subject: [pkgdb] wordtrans: karsten has requested commit
Message-ID: <200709110830.l8B8UmZd019070@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on wordtrans (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordtrans



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:54 -0700
Subject: [pkgdb] Xaw3d: karsten has requested commit
Message-ID: <200709110830.l8B8UsWp019079@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on Xaw3d (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Xaw3d



From fedora-extras-commits at redhat.com  Tue Sep 11 08:30:59 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:30:59 -0700
Subject: [pkgdb] xferstats: karsten has requested commit
Message-ID: <200709110830.l8B8UxpI025124@app3.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on xferstats (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xferstats



From fedora-extras-commits at redhat.com  Tue Sep 11 08:31:02 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 11 Sep 2007 01:31:02 -0700
Subject: [pkgdb] xfig: karsten has requested commit
Message-ID: <200709110831.l8B8V3TL019088@app4.fedora.phx.redhat.com>

Karsten Hopp (karsten) has requested the commit acl on xfig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfig



From fedora-extras-commits at redhat.com  Tue Sep 11 08:48:32 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 11 Sep 2007 04:48:32 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.30,1.31
Message-ID: <200709110848.l8B8mWBp021114@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21032

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.4-45.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sysprof-kmod.spec	21 Aug 2007 07:32:58 -0000	1.30
+++ sysprof-kmod.spec	11 Sep 2007 08:47:59 -0000	1.31
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.2-42.fc6}
+%{!?kversion: %define kversion 2.6.22.4-45.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 08:58:43 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 11 Sep 2007 04:58:43 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.33, 1.34 hwbrowser.spec, 1.45,
	1.46 sources, 1.39, 1.40
Message-ID: <200709110858.l8B8whA7021548@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21509

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
make "hwbrowser" executable (#285171)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	10 Sep 2007 16:03:54 -0000	1.33
+++ .cvsignore	11 Sep 2007 08:58:11 -0000	1.34
@@ -1 +1 @@
-hwbrowser-0.35.tar.bz2
+hwbrowser-0.36.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- hwbrowser.spec	10 Sep 2007 16:03:54 -0000	1.45
+++ hwbrowser.spec	11 Sep 2007 08:58:11 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.35
+Version: 0.36
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -52,6 +52,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
+- make "hwbrowser" executable (#285171)
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 Sep 2007 16:03:54 -0000	1.39
+++ sources	11 Sep 2007 08:58:11 -0000	1.40
@@ -1 +1 @@
-476b50bdb95ebf3addc7484199d6e517  hwbrowser-0.35.tar.bz2
+8a139843dae96f83ee27595ad7fa5d20  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 09:10:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 05:10:38 -0400
Subject: rpms/vixie-cron/F-7 vixie-cron-4.1-pam_crontab.patch, 1.1,
	1.2 vixie-cron.spec, 1.99, 1.100
Message-ID: <200709110910.l8B9AcXW027787@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27750

Modified Files:
	vixie-cron-4.1-pam_crontab.patch vixie-cron.spec 
Log Message:
Change patch - add correct setting of home dir for selinux rhbz#241877.


vixie-cron-4.1-pam_crontab.patch:

Index: vixie-cron-4.1-pam_crontab.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/F-7/vixie-cron-4.1-pam_crontab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-pam_crontab.patch	30 Jul 2007 15:13:24 -0000	1.1
+++ vixie-cron-4.1-pam_crontab.patch	11 Sep 2007 09:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/cron.h.old	2007-07-30 16:34:07.000000000 +0200
-+++ vixie-cron-4.1/cron.h	2007-07-26 15:14:19.000000000 +0200
+--- vixie-cron-4.1/cron.h.pamcrontab	2007-09-11 10:22:20.000000000 +0200
++++ vixie-cron-4.1/cron.h	2007-09-11 10:22:21.000000000 +0200
 @@ -47,3 +47,20 @@
  #include "funcs.h"
  #include "globals.h"
@@ -21,37 +21,8 @@
 +        return(retcode);    }
 +#endif
 +
---- vixie-cron-4.1/do_command.c.old	2007-07-30 16:34:08.000000000 +0200
-+++ vixie-cron-4.1/do_command.c	2007-07-26 16:56:11.000000000 +0200
-@@ -71,7 +71,7 @@
-          */
- 	if ( cron_set_job_security_context( e, u, &jobenv ) != 0 )
- 	{
--	    syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
-+	    //syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
- 	    exit(ERROR_EXIT);
- 	}
- 
-@@ -158,7 +158,7 @@
- 	switch (fork()) {
- 	case -1:
- 		log_it("CRON", getpid(), "error", "can't fork");
--		cron_close_security_session();
-+		cron_close_pam();
- 		exit(ERROR_EXIT);
- 		/*NOTREACHED*/
- 	case 0:
-@@ -523,7 +523,7 @@
- 			Debug(DPROC, (", dumped core"))
- 		Debug(DPROC, ("\n"))
- 	}
--	cron_close_security_session();
-+	cron_close_pam();
- 	env_free(jobenv);
- }
- 
---- vixie-cron-4.1/crontab.c.old	2007-07-30 16:34:09.000000000 +0200
-+++ vixie-cron-4.1/crontab.c	2007-07-30 10:49:09.000000000 +0200
+--- vixie-cron-4.1/crontab.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/crontab.c	2007-09-11 10:22:21.000000000 +0200
 @@ -37,7 +37,6 @@
  #include <selinux/av_permissions.h>
  #endif
@@ -127,8 +98,8 @@
  		if (!glue_strings(q, sizeof q, editor, Filename, ' ')) {
  			fprintf(stderr, "%s: editor command line too long\n",
  			    ProgramName);
---- vixie-cron-4.1/security.c.old	2007-07-30 16:34:09.000000000 +0200
-+++ vixie-cron-4.1/security.c	2007-07-30 16:30:52.000000000 +0200
+--- vixie-cron-4.1/security.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/security.c	2007-09-11 10:30:26.000000000 +0200
 @@ -46,70 +46,55 @@
  int cron_restore_default_security_context() {
  	setexeccon(NULL);
@@ -341,19 +312,18 @@
 -    {
 -	log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
 -	return -1;	
-+    if (chdir(homedir) == -1) {
-+		log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
-+		log_it("CRON", getpid(), homedir, strerror(errno));
-+		return -1;
++    if (initgroups(pw->pw_name, pw->pw_gid) != 0) {
++		log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
++		return -1;	
      }
  
 -    if ( setuid( pw->pw_uid ) != 0 )
 -    {
 -	log_it("CRON", getpid(), "setuid failed:", strerror(errno));
 -	return -1;
-+    if (initgroups(pw->pw_name, pw->pw_gid) != 0) {
-+		log_it("CRON", getpid(), "initgroups failed:", strerror(errno));
-+		return -1;	
++    if (setuid( pw->pw_uid ) != 0) {
++		log_it("CRON", getpid(), "setuid failed:", strerror(errno));
++		return -1;
      }
  
 -	if ( chdir(homedir) == -1 )
@@ -361,12 +331,13 @@
 -    log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
 -    log_it("CRON", getpid(), homedir, strerror(errno));
 -    return -1;
-+    if (setuid( pw->pw_uid ) != 0) {
-+		log_it("CRON", getpid(), "setuid failed:", strerror(errno));
-+		return -1;
++    if (chdir(homedir) == -1) {
++	log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno));
++        log_it("CRON", getpid(), homedir, strerror(errno));
++        return -1;
      }
 -   
-+    
++                                                        
      return 0;
  }
  
@@ -842,3 +813,32 @@
      }
      return jobenv;    
  #else
+--- vixie-cron-4.1/do_command.c.pamcrontab	2007-09-11 10:22:21.000000000 +0200
++++ vixie-cron-4.1/do_command.c	2007-09-11 10:22:21.000000000 +0200
+@@ -71,7 +71,7 @@
+          */
+ 	if ( cron_set_job_security_context( e, u, &jobenv ) != 0 )
+ 	{
+-	    syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
++	    //syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name);
+ 	    exit(ERROR_EXIT);
+ 	}
+ 
+@@ -158,7 +158,7 @@
+ 	switch (fork()) {
+ 	case -1:
+ 		log_it("CRON", getpid(), "error", "can't fork");
+-		cron_close_security_session();
++		cron_close_pam();
+ 		exit(ERROR_EXIT);
+ 		/*NOTREACHED*/
+ 	case 0:
+@@ -523,7 +523,7 @@
+ 			Debug(DPROC, (", dumped core"))
+ 		Debug(DPROC, ("\n"))
+ 	}
+-	cron_close_security_session();
++	cron_close_pam();
+ 	env_free(jobenv);
+ }
+ 


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/F-7/vixie-cron.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vixie-cron.spec	30 Jul 2007 15:13:24 -0000	1.99
+++ vixie-cron.spec	11 Sep 2007 09:10:31 -0000	1.100
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 83%{?dist}
+Release: 84%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -272,6 +272,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-84
+- fix problem with selinux homedir #241877 in patch pam_crontab
+
 * Mon Jul 31 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-83
 - update from devel
 - add pam to crontab, add variable tmpdir, fix man again



From fedora-extras-commits at redhat.com  Tue Sep 11 09:51:23 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:51:23 -0400
Subject: rpms/apr/devel .cvsignore, 1.10, 1.11 apr.spec, 1.71, 1.72 sources, 
	1.10, 1.11 apr-1.2.9-openlfs.patch, 1.1, NONE
Message-ID: <200709110951.l8B9pNJT029066@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29015

Modified Files:
	.cvsignore apr.spec sources 
Removed Files:
	apr-1.2.9-openlfs.patch 
Log Message:
Bump up to 1.2.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Jun 2007 23:42:07 -0000	1.10
+++ .cvsignore	11 Sep 2007 09:50:48 -0000	1.11
@@ -1 +1 @@
-apr-1.2.9.tar.bz2
+apr-1.2.11.tar.bz2


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- apr.spec	2 Sep 2007 14:15:02 -0000	1.71
+++ apr.spec	11 Sep 2007 09:50:48 -0000	1.72
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.9
-Release: 4
+Version: 1.2.11
+Release: 1
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,7 +18,6 @@
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
-Patch7: apr-1.2.9-openlfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, e2fsprogs-devel, python
 
@@ -48,7 +47,6 @@
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
-%patch7 -p1 -b .openlfs
 
 %build
 # regenerate configure script etc.
@@ -124,6 +122,10 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
+- bump up to 1.2.11
+- drop openlfs patch (fixed upstream)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
 - fix API/ABI of 32-bit builds (#254241)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Jun 2007 23:42:07 -0000	1.10
+++ sources	11 Sep 2007 09:50:48 -0000	1.11
@@ -1 +1 @@
-86a5a7d0f8807b97645956a2b4ed6f14  apr-1.2.9.tar.bz2
+22ede19520beb37dc17e62592b06a59c  apr-1.2.11.tar.bz2


--- apr-1.2.9-openlfs.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 09:51:30 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:51:30 -0400
Subject: rpms/apr-util/devel .cvsignore, 1.7, 1.8 apr-util-1.2.8-dbddso.patch,
	1.3, 1.4 apr-util.spec, 1.41, 1.42 apr_dbd_mysql.c, 1.1,
	1.2 sources, 1.9, 1.10 apr-util-1.2.8-autoexpat.patch, 1.1,
	NONE apr-util-1.2.8-dbdopen.patch, 1.1,
	NONE apr-util-1.2.8-xmlns.patch, 1.1, NONE
Message-ID: <200709110951.l8B9pUte029076@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29021

Modified Files:
	.cvsignore apr-util-1.2.8-dbddso.patch apr-util.spec 
	apr_dbd_mysql.c sources 
Removed Files:
	apr-util-1.2.8-autoexpat.patch apr-util-1.2.8-dbdopen.patch 
	apr-util-1.2.8-xmlns.patch 
Log Message:
Bump up to 1.2.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Dec 2006 16:01:27 -0000	1.7
+++ .cvsignore	11 Sep 2007 09:50:55 -0000	1.8
@@ -1 +1 @@
-apr-util-1.2.8.tar.gz
+apr-util-1.2.10.tar.bz2

apr-util-1.2.8-dbddso.patch:

Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-util-1.2.8-dbddso.patch	23 Mar 2007 09:45:59 -0000	1.3
+++ apr-util-1.2.8-dbddso.patch	11 Sep 2007 09:50:55 -0000	1.4
@@ -229,7 +229,7 @@
  #if APU_HAVE_MYSQL
      DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
  #endif
-@@ -94,62 +92,68 @@
+@@ -94,64 +92,70 @@
  #if APU_HAVE_SOME_OTHER_BACKEND
      DRIVER_LOAD("firebird", apr_dbd_other_driver, pool);
  #endif
@@ -285,16 +285,18 @@
 +    pool = apr_hash_pool_get(drivers);
  
  #ifdef WIN32
-     sprintf(path, "apr_dbd_%s.dll", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
+ #elif defined(NETWARE)
+     apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
  #else
--    sprintf(path, "apr_dbd_%s.so", name);
+-    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
 +    apr_snprintf(path, sizeof path, APU_DSO_LIBDIR "/apr_dbd_%s.so", name);
  #endif
      rv = apr_dso_load(&dlhandle, path, pool);
      if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
          goto unlock;
      }
-     sprintf(path, "apr_dbd_%s_driver", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
 -    rv = apr_dso_sym((void*)driver, dlhandle, path);
 +    rv = apr_dso_sym(&symbol, dlhandle, path);
      if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- apr-util.spec	2 Sep 2007 13:46:51 -0000	1.41
+++ apr-util.spec	11 Sep 2007 09:50:55 -0000	1.42
@@ -3,19 +3,16 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.8
-Release: 12
+Version: 1.2.10
+Release: 1
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-Source1: http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+Source1: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.2.x/dbd/apr_dbd_mysql.c
 Patch0: apr-util-1.2.2-exports.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
 Patch3: apr-util-1.2.8-dbddso.patch
-Patch4: apr-util-1.2.8-xmlns.patch
-Patch5: apr-util-1.2.8-autoexpat.patch
-Patch6: apr-util-1.2.8-dbdopen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel, e2fsprogs-devel
@@ -73,9 +70,6 @@
 %patch0 -p1 -b .exports
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .dbddso
-%patch4 -p1 -b .xmlns
-%patch5 -p1 -b .autoexpat
-%patch6 -p1 -b .dbdopen
 
 cp $RPM_SOURCE_DIR/apr_dbd_mysql.c dbd
 
@@ -155,6 +149,13 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.10-1
+- bump up to 1.2.10
+- pick up newly checked in MySQL DBD driver directly from ASF
+- remove dbdopen patch (fixed upstream)
+- remove xmlns patch (fixed upstream)
+- remove autoexpat patch (fixed upstream)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 1.2.8-12
 - rebuild for fixed APR 32-bit ABI
 - remove sqlite driver from main package (#274521)


Index: apr_dbd_mysql.c
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr_dbd_mysql.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_dbd_mysql.c	28 Feb 2007 12:52:44 -0000	1.1
+++ apr_dbd_mysql.c	11 Sep 2007 09:50:55 -0000	1.2
@@ -1,50 +1,19 @@
-/*
-         Copyright (c) 2003-7, WebThing Ltd and other contributors
- 
-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.  Alternatively, where this program
-is aggregated with the Apache APR-UTIL package version 1.2 or later,
-you can distribute and/or modify it under the terms of the Apache
-License 2.0 as published by the Apache Software Foundation.
- 
-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
-applicable 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.
-You may obtain a copy of the Apache License 2.0 at:
-http://www.apache.org/licenses/LICENSE-2.0
- 
-*/
-
-/* LICENSE NOTE
- *
- * The current GPL satisfies MySQL licensing terms without
- * invoking any exceptions.  ASF policy doesn't permit GPL
- * software to be distributed by apache.org, but this should
- * not be a problem for third-parties who wish to distribute
- * it alongside the APR and other Apache software.
- * 
- * It is updated to dual license after discussion with Debian
- * and taking into account MySQL's FOSS exception.
- * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
- * http://www.mysql.com/company/legal/licensing/foss-exception.html
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * MAINTAINERS
- *
- * This code was originally written by Nick Kew for MySQL 4.1.
- * and subsequently updated by others to support MySQL 5.0.
- * The current lead maintainer is Bojan Smojver, with others
- * contributing via the developer list at apr.apache.org.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
 #include "apu.h"
 #define HAVE_MYSQL_MYSQL_H
 
@@ -74,17 +43,9 @@
 
 struct apr_dbd_prepared_t {
     MYSQL_STMT* stmt;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int nargs;
-    int nvals;
-    apr_dbd_type_e *types;
-#endif
 };
 
 struct apr_dbd_transaction_t {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int mode;
-#endif
     int errnum;
     apr_dbd_t *handle;
 };
@@ -100,156 +61,12 @@
     MYSQL_RES *res;
     MYSQL_STMT *statement;
     MYSQL_BIND *bind;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    apr_pool_t *pool;
-#endif
 };
 struct apr_dbd_row_t {
     MYSQL_ROW row;
     apr_dbd_results_t *res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    unsigned long *len;
-#endif
-};
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-/* MySQL specific bucket for BLOB types */
-typedef struct apr_bucket_lob apr_bucket_lob;
-/**
- * A bucket referring to a MySQL BLOB
- */
-struct apr_bucket_lob {
-    /** Number of buckets using this memory */
-    apr_bucket_refcount  refcount;
-    /** The row this bucket refers to */
-    const apr_dbd_row_t *row;
-    /** The column this bucket refers to */
-    int col;
-    /** The pool into which any needed structures should
-     *  be created while reading from this bucket */
-    apr_pool_t *readpool;
 };
 
-static void lob_bucket_destroy(void *data);
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block);
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p);
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list);
-
-static const apr_bucket_type_t apr_bucket_type_lob = {
-    "LOB", 5, APR_BUCKET_DATA,
-    lob_bucket_destroy,
-    lob_bucket_read,
-    apr_bucket_setaside_notimpl,
-    apr_bucket_shared_split,
-    apr_bucket_shared_copy
-};
-
-static void lob_bucket_destroy(void *data)
-{
-    apr_bucket_lob *f = data;
-
-    if (apr_bucket_shared_destroy(f)) {
-        /* no need to destroy database objects here; it will get
-         * done automatically when the pool gets cleaned up */
-        apr_bucket_free(f);
-    }
-}
-
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block)
-{
-    apr_bucket_lob *a = e->data;
-    const apr_dbd_row_t *row = a->row;
-    apr_dbd_results_t *res = row->res;
-    int col = a->col;
-    apr_bucket *b = NULL;
-    int rv;
-    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
-    apr_off_t boffset = e->start;
-    MYSQL_BIND *bind = &res->bind[col];
-
-    *str = NULL;  /* in case we die prematurely */
-
-    /* fetch from offset if not at the beginning */
-    if (boffset > 0) {
-        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
-        if (rv != 0) {
-            return APR_EGENERAL;
-        }
-    }
-    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
-    *len = e->length - blength;
-    *str = bind->buffer;
-
-    /* allocate new buffer, since we used this one for the bucket */
-    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
-
-    /*
-     * Change the current bucket to refer to what we read,
-     * even if we read nothing because we hit EOF.
-     */
-    apr_bucket_pool_make(e, *str, *len, res->pool);
-
-    /* If we have more to read from the field, then create another bucket */
-    if (blength > 0) {
-        /* for efficiency, we can just build a new apr_bucket struct
-         * to wrap around the existing LOB bucket */
-        b = apr_bucket_alloc(sizeof(*b), e->list);
-        b->start  = boffset + *len;
-        b->length = blength;
-        b->data   = a;
-        b->type   = &apr_bucket_type_lob;
-        b->free   = apr_bucket_free;
-        b->list   = e->list;
-        APR_BUCKET_INSERT_AFTER(e, b);
-    }
-    else {
-        lob_bucket_destroy(a);
-    }
-
-    return APR_SUCCESS;
-}
-
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p)
-{
-    apr_bucket_lob *f;
-
-    f = apr_bucket_alloc(sizeof(*f), b->list);
-    f->row = row;
-    f->col = col;
-    f->readpool = p;
-
-    b = apr_bucket_shared_make(b, f, offset, len);
-    b->type = &apr_bucket_type_lob;
-
-    return b;
-}
-
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list)
-{
-    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
-    APR_BUCKET_INIT(b);
-    b->free = apr_bucket_free;
-    b->list = list;
-    return apr_bucket_lob_make(b, row, col, offset, len, p);
-}
-
-#endif
-
 static apr_status_t free_result(void *data)
 {
     mysql_free_result(data);
@@ -273,9 +90,6 @@
             }
             (*results)->random = seek;
             (*results)->statement = NULL;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-            (*results)->pool = pool;
-#endif
             if (seek) {
                 (*results)->res = mysql_store_result(sql->conn);
             }
@@ -289,27 +103,12 @@
         ret = mysql_errno(sql->conn);
     }
     
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
-{
-    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
-        return NULL;
-    }
-
-    return mysql_fetch_fields(res->res)[n].name;
-}
-#endif
-
 static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **row, int rownum)
 {
@@ -352,9 +151,6 @@
         }
         (*row)->row = r;
         (*row)->res = res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        (*row)->len = mysql_fetch_lengths(res->res);
-#endif
     }
     else {
         apr_pool_cleanup_run(pool, res->res, free_result);
@@ -412,160 +208,6 @@
 }
 #endif
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
-                                        apr_dbd_type_e type, void *data)
-{
-    if (row->res->statement) {
-        MYSQL_BIND *bind = &row->res->bind[n];
-        unsigned long len = *bind->length;
-
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return APR_EGENERAL;
-        }
-
-        if (*bind->is_null) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
-            *(char**)data = bind->buffer;
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_lob_create(row, n, 0, len,
-                                      row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    else {
-        if (row->row[n] == NULL) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *(char**)data = row->row[n];
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_pool_create(row->row[n], row->len[n],
-                                       row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    return 0;
-}
-#endif
-
 static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
 {
     return mysql_error(sql->conn);
@@ -582,11 +224,7 @@
         ret = mysql_errno(sql->conn);
     }
     *nrows = mysql_affected_rows(sql->conn);
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
@@ -607,467 +245,6 @@
     return APR_SUCCESS;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             int nargs, int nvals, apr_dbd_type_e *types,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    int ret;
-
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        (*statement)->nargs = nargs;
-        (*statement)->nvals = nvals;
-        (*statement)->types = types;
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
-                           const char **values, MYSQL_BIND *bind)
-{
-    int i, j;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_unsigned = 0;
-        bind[i].is_null = NULL;
-
-        if (values[j] == NULL) {
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-        }
-        else {
-            switch (statement->types[i]) {
-            case APR_DBD_TYPE_BLOB:
-            case APR_DBD_TYPE_CLOB:
-                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = atol(values[++j]);
-
-                /* skip table and column */
-                j += 2;
-                break;
-            default:
-                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = strlen(values[j]);
-                break;
-            }
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                     int *nrows, apr_dbd_prepared_t *statement,
-                                     MYSQL_BIND *bind)
-{
-    int ret;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            const char **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                      apr_dbd_results_t **res,
-                                      apr_dbd_prepared_t *statement,
-                                      int random, MYSQL_BIND *bind)
-{
-    int nfields, i;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            (*res)->pool = pool;
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                    }
-                    else {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    }
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             const char **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
-}
-
-static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
-                            const void **values, MYSQL_BIND *bind)
-{
-    void *arg;
-    int i, j;
-    apr_dbd_type_e type;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        arg = (void *)values[j];
-
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = NULL;
-
-        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UTINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_SHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_USHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_INT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UINT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONG:
-            if (sizeof(int) == sizeof(long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(int));
-                *(int*)bind[i].buffer = *(long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONG:
-            if (sizeof(unsigned int) == sizeof(unsigned long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
-                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            if (sizeof(long long) == sizeof(apr_int64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(long long));
-                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
-                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = strlen((const char *)arg);
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            bind[i].buffer = (void *)arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = *(apr_size_t*)values[++j];
-
-            /* skip table and column */
-            j += 2;
-            break;
-        case APR_DBD_TYPE_NULL:
-        default:
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-            break;
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
-                             int *nrows, apr_dbd_prepared_t *statement,
-                             const void **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                              apr_dbd_prepared_t *statement, va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              const void **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                               apr_dbd_results_t **res,
-                               apr_dbd_prepared_t *statement, int random,
-                               va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
-}
-#else
 static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
                              apr_dbd_prepared_t **statement)
@@ -1368,18 +545,12 @@
     }
     return ret;
 }
-#endif
 
 static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
 {
     int ret = -1;
     if (trans) {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        /* rollback on error or explicit rollback request */
-        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
-#else
         if (trans->errnum) {
-#endif
             trans->errnum = 0;
             ret = mysql_rollback(trans->handle->conn);
         }
@@ -1412,25 +583,6 @@
     return (*trans)->errnum;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode;
-}
-
-static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
-                                          int mode)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode = (mode & TXN_MODE_BITS);
-}
-#endif
-
 static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
 {
     static const char *const delims = " \r\n\t;|,";
@@ -1608,18 +760,6 @@
     dbd_mysql_pvselect,
     dbd_mysql_pquery,
     dbd_mysql_pselect
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    ,
-    dbd_mysql_get_name,
-    dbd_mysql_transaction_mode_get,
-    dbd_mysql_transaction_mode_set,
-    "?",
-    dbd_mysql_pvbquery,
-    dbd_mysql_pvbselect,
-    dbd_mysql_pbquery,
-    dbd_mysql_pbselect,
-    dbd_mysql_datum_get
-#endif
 };
 
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Dec 2006 16:01:27 -0000	1.9
+++ sources	11 Sep 2007 09:50:55 -0000	1.10
@@ -1 +1 @@
-a2e2e54d65e9eae961f7171335cf2550  apr-util-1.2.8.tar.gz
+9277c21fe41065bd359db98c474aa998  apr-util-1.2.10.tar.bz2


--- apr-util-1.2.8-autoexpat.patch DELETED ---


--- apr-util-1.2.8-dbdopen.patch DELETED ---


--- apr-util-1.2.8-xmlns.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 09:52:40 2007
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Tue, 11 Sep 2007 05:52:40 -0400
Subject: rpms/apr-api-docs/devel apr-api-docs.spec,1.3,1.4
Message-ID: <200709110952.l8B9qePk029169@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29129

Modified Files:
	apr-api-docs.spec 
Log Message:
Sync with apr-1.2.11/apr-util-1.2.10.



Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/devel/apr-api-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-api-docs.spec	21 Aug 2007 23:30:44 -0000	1.3
+++ apr-api-docs.spec	11 Sep 2007 09:52:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
-Version:        1.2.9
-Release:        3%{?dist}
+Version:        1.2.11
+Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -58,6 +58,9 @@
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Tue Sep 11 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
+- Align with latest apr/apr-util
+
 * Wed Aug 22 2007 Bojan Smojver <bojan at rexursive.com> 1.2.9-3
 - Fix license
 



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:49 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:49 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7oJr020417@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchbugzilla acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:49 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:49 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7okj020426@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchcommits acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:53 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:53 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7svZ020435@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchcommits acl on basesystem (Fedora devel) to Obsolete for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:55 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:55 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7tO6028471@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on basesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:07:53 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:07:53 -0700
Subject: [pkgdb] basesystem had acl change status
Message-ID: <200709111207.l8BC7svl028462@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the watchbugzilla acl on basesystem (Fedora devel) to Obsolete for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/basesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:25 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:25 -0700
Subject: [pkgdb] filesystem had acl change status
Message-ID: <200709111208.l8BC8P2o028502@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on filesystem (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/filesystem



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:28 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:28 -0700
Subject: [pkgdb] openhpi had acl change status
Message-ID: <200709111208.l8BC8TxI020468@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on openhpi (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openhpi



From fedora-extras-commits at redhat.com  Tue Sep 11 12:08:31 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:08:31 -0700
Subject: [pkgdb] OpenIPMI had acl change status
Message-ID: <200709111208.l8BC8Vpc028512@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on OpenIPMI (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/OpenIPMI



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:09 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:09 -0700
Subject: [pkgdb] rootfiles had acl change status
Message-ID: <200709111209.l8BC99qY028525@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on rootfiles (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rootfiles



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:12 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:12 -0700
Subject: [pkgdb] setup had acl change status
Message-ID: <200709111209.l8BC9C4q020482@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on setup (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/setup



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:15 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:15 -0700
Subject: [pkgdb] sg3_utils had acl change status
Message-ID: <200709111209.l8BC9F7S028534@app3.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on sg3_utils (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From fedora-extras-commits at redhat.com  Tue Sep 11 12:09:18 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Tue, 11 Sep 2007 05:09:18 -0700
Subject: [pkgdb] system-config-httpd had acl change status
Message-ID: <200709111209.l8BC9J9E020491@app4.fedora.phx.redhat.com>

Phil Knirsch (pknirsch) has set the commit acl on system-config-httpd (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-httpd



From fedora-extras-commits at redhat.com  Tue Sep 11 12:27:11 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Tue, 11 Sep 2007 08:27:11 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.46,1.47 sources,1.40,1.41
Message-ID: <200709111227.l8BCRBGf019871@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19831

Modified Files:
	hwbrowser.spec sources 
Log Message:
buildrequire expat to augment xgettext for glade files



Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- hwbrowser.spec	11 Sep 2007 08:58:11 -0000	1.46
+++ hwbrowser.spec	11 Sep 2007 12:26:39 -0000	1.47
@@ -12,6 +12,7 @@
 BuildRequires: automake
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
+BuildRequires: expat
 Requires: gnome-python2
 Requires: gnome-python2-canvas
 Requires: pygtk2
@@ -54,6 +55,7 @@
 %changelog
 * Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
+- buildrequire expat to augment xgettext for glade files
 
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	11 Sep 2007 08:58:11 -0000	1.40
+++ sources	11 Sep 2007 12:26:39 -0000	1.41
@@ -1 +1 @@
-8a139843dae96f83ee27595ad7fa5d20  hwbrowser-0.36.tar.bz2
+2c98067d3f3f4f91ecf4f9f321f1e984  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:48:32 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:48:32 -0400
Subject: rpms/wdaemon/F-7 wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111248.l8BCmWl8020613@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:48:00 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:48:00 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:56:57 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:56:57 -0400
Subject: rpms/wdaemon/FC-6 wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111256.l8BCuvRl020958@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20893

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:56:25 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:56:25 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 12:59:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 08:59:31 -0400
Subject: rpms/gnome-session/devel ice-leaks.patch, NONE,
	1.1 gnome-session.spec, 1.138, 1.139
Message-ID: <200709111259.l8BCxVDk021145@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21090

Modified Files:
	gnome-session.spec 
Added Files:
	ice-leaks.patch 
Log Message:
fix memory leaks


ice-leaks.patch:

--- NEW FILE ice-leaks.patch ---
diff -up gnome-session-2.19.92/gnome-session/ice.c.ice-leaks gnome-session-2.19.92/gnome-session/ice.c
--- gnome-session-2.19.92/gnome-session/ice.c.ice-leaks	2007-09-11 01:56:57.000000000 -0400
+++ gnome-session-2.19.92/gnome-session/ice.c	2007-09-11 01:57:49.000000000 -0400
@@ -455,10 +455,13 @@ clean_ice (void)
   /* During shutdown we don't want to report errors via a dialog.  */
   write_authfile (authfile, entries, FALSE);
 
+  g_slist_foreach (entries, (GFunc)IceFreeAuthFileEntry, NULL);
   g_slist_free (entries);
 
   g_free (input_id);
   IceFreeListenObjs (num_sockets, sockets);
+
+  g_slist_foreach (auth_entries, (GFunc)IceFreeAuthFileEntry, NULL);
   g_slist_free (auth_entries);
   
   ice_depth = ~0;	/* We are very frozen, like totally off */


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-session.spec	5 Sep 2007 17:30:41 -0000	1.138
+++ gnome-session.spec	11 Sep 2007 12:58:58 -0000	1.139
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -57,6 +57,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=475468
+Patch22: ice-leaks.patch
+
 BuildRequires: esound-devel >= %{esound_version}
 BuildRequires: /usr/bin/esd
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -101,6 +104,7 @@
 %patch13 -p1 -b .window-manager
 %patch20 -p1 -b .timeout
 #%patch21 -p0 -b .use-gdm-hints
+%patch22 -p1 -b .ice-leaks
 
 %build
 
@@ -185,6 +189,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-3
+- Plug memory leaks in the ICE code
+
 * Wed Sep  5 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-2
 - Update gnome-session-2.17.5-window-manager.patch to apply (remove
   chunks that are now upstream).



From fedora-extras-commits at redhat.com  Tue Sep 11 12:59:31 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Tue, 11 Sep 2007 08:59:31 -0400
Subject: rpms/wdaemon/devel wdaemon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709111259.l8BCxVhY021144@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21088

Modified Files:
	.cvsignore sources 
Added Files:
	wdaemon.spec 
Log Message:
* first version: 0.11-1




--- NEW FILE wdaemon.spec ---
Name:		wdaemon
Version:	0.11
Release:	1%{?dist}
Summary:	Hotplug helper for Wacom X.org driver

Group:		User Interface/X Hardware Support
License:	GPL
URL:		http://jake.ruivo.org/~aris/wdaemon/
Source0:	http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
BuildRequires:	glibc-devel
Requires:	udev >= 030-21

%description
Helper application which emulates persistent input devices for Wacom tablets
so they can be plugged and unplugged while X.org server is running. This should
go away as soon X.org properly supports hotplugging.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
make

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 = 1 ]; then
	/sbin/chkconfig --add %{name}
fi

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
	/sbin/service %{name} condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE Changelog README simple.conf
%{_bindir}/wdaemon
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules
%{_sysconfdir}/rc.d/init.d/wdaemon
%{_sysconfdir}/udev/scripts/is_uinput.sh

%changelog
* Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
- Updated to version 0.11

* Tue Jul 24 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-3
- More problems found by Jarod Wilson fixed:
- Removing exclusive architectures, it used to be in sync with linuxwacom
  package
- marking udev rules as non-replaceable config files
- using install on makefile

* Mon Jul 23 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-2
- Fixing the problems found by Jarod Wilson:
- Fixing make install target
- Fixing Makefile so it honors the provided CFLAGS
- not using makeinstall macro
- installing is_uinput.sh as 755 instead of changing later with attr

* Fri Jul 20 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.10-1
* upgrading to version 0.10

* Thu Jul 19 2007 Aristeu S. Rozanski F. <arozansk at redhat.com> 0.09-1
- first release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 19:59:40 -0000	1.1
+++ .cvsignore	11 Sep 2007 12:58:58 -0000	1.2
@@ -0,0 +1 @@
+wdaemon-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Aug 2007 19:59:40 -0000	1.1
+++ sources	11 Sep 2007 12:58:58 -0000	1.2
@@ -0,0 +1 @@
+ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 13:02:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 11 Sep 2007 09:02:56 -0400
Subject: rpms/bigloo/F-7 .cvsignore, 1.13, 1.14 bigloo.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <200709111302.l8BD2u2q027296@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27249

Modified Files:
	.cvsignore bigloo.spec sources 
Log Message:
new release 3.0b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Jun 2007 19:35:54 -0000	1.13
+++ .cvsignore	11 Sep 2007 13:02:23 -0000	1.14
@@ -1 +1 @@
-bigloo3.0a.tar.gz
+bigloo3.0b.tar.gz


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/bigloo.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bigloo.spec	1 Jun 2007 22:51:14 -0000	1.25
+++ bigloo.spec	11 Sep 2007 13:02:23 -0000	1.26
@@ -1,12 +1,12 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.0a
-Release:	4%{?dist}
+Version: 	3.0b
+Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2+
 URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
 Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
 Patch0:         bigloo-javassl.patch
@@ -76,7 +76,7 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0b-1
+- new release 3.0b
+
 * Sat Jun  2 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-4
 - exclude ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Jun 2007 19:35:54 -0000	1.13
+++ sources	11 Sep 2007 13:02:23 -0000	1.14
@@ -1 +1 @@
-91b86d1514658e1a254456b4e288e092  bigloo3.0a.tar.gz
+426ad39c4358ca21ce3e49eebbcb12cf  bigloo3.0b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 13:19:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 09:19:25 -0400
Subject: rpms/groff/devel groff.spec,1.51,1.52
Message-ID: <200709111319.l8BDJP8K028035@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27985

Modified Files:
	groff.spec 
Log Message:
Change spec file for review.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- groff.spec	16 Aug 2007 14:11:35 -0000	1.51
+++ groff.spec	11 Sep 2007 13:18:53 -0000	1.52
@@ -3,8 +3,8 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 7%{?dist}
-License: GPL
+Release: 8%{?dist}
+License: GPLv2 and FDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -190,8 +190,12 @@
 ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
 # installed, but not packaged in rpm
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
 mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
@@ -233,6 +237,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-8
+- another change in spec for review
+
 * Thu Aug 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-7
 - rebuild
 - another encoding are print correct with nroff



From fedora-extras-commits at redhat.com  Tue Sep 11 13:33:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 11 Sep 2007 09:33:22 -0400
Subject: rpms/bigloo/devel .cvsignore, 1.13, 1.14 bigloo.spec, 1.22,
	1.23 sources, 1.13, 1.14
Message-ID: <200709111333.l8BDXMMJ028600@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/devel

Modified Files:
	.cvsignore bigloo.spec sources 
Log Message:
new release 3.0b


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Jun 2007 09:38:52 -0000	1.13
+++ .cvsignore	11 Sep 2007 13:32:50 -0000	1.14
@@ -1 +1 @@
-bigloo3.0a.tar.gz
+bigloo3.0b.tar.gz


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bigloo.spec	2 Jun 2007 09:38:52 -0000	1.22
+++ bigloo.spec	11 Sep 2007 13:32:50 -0000	1.23
@@ -1,12 +1,12 @@
 %define _with_java 1
 
 Name:		bigloo
-Version: 	3.0a
-Release:	4%{?dist}
+Version: 	3.0b
+Release:	1%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2+
 URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
 Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
 Patch0:         bigloo-javassl.patch
@@ -76,7 +76,7 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0b-1
+- new release 3.0b
+
 * Sat Jun  2 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-4
 - exclude ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Jun 2007 09:38:52 -0000	1.13
+++ sources	11 Sep 2007 13:32:50 -0000	1.14
@@ -1 +1 @@
-91b86d1514658e1a254456b4e288e092  bigloo3.0a.tar.gz
+426ad39c4358ca21ce3e49eebbcb12cf  bigloo3.0b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 13:48:24 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 11 Sep 2007 09:48:24 -0400
Subject: status-report-scripts bzstat.gp,1.1,1.2 grabBZstats,1.1,1.2
Message-ID: <200709111348.l8BDmOsL029103@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29083

Modified Files:
	bzstat.gp grabBZstats 
Log Message:
Update for new interface.


Index: bzstat.gp
===================================================================
RCS file: /cvs/fedora/status-report-scripts/bzstat.gp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzstat.gp	7 Jul 2006 15:25:37 -0000	1.1
+++ bzstat.gp	11 Sep 2007 13:48:22 -0000	1.2
@@ -2,16 +2,20 @@
 # $Id$
 # Useful to plot grabBZstats script output
 set xlabel "Week #, starting from August 1, 2005"
-set ylabel "Ticket count"
+set ylabel "Ticket count per week"
+set y2label "Open ticket in queue"
+set yrange [0:150]
+set ytics nomirror
+set y2tics nomirror 0,1000
 set key top left
-set style data lp
-set term png small color picsize 1024 768
+set style data line
+set term png small size 1024,768
 set output "bzstat.png"
-plot "bzstat.data" using 1:2 t "opened tickets",\
-  "bzstat.data" using 1:3 t "closed tickets",\
-  "bzstat.data" using 1:4 t "queue size",\
-  "bzstat.data" using 1:5 t "accepted tickets",\
-  "bzstat.data" using 1:6 t "duplicate tickets",\
-  "bzstat.data" using 1:7 t "dropped tickets"
+plot "bzstat.data" using 1:2 t "opened tickets p.w.",\
+  "bzstat.data" using 1:3 t "closed tickets p.w.",\
+  "bzstat.data" using 1:5 t "accepted tickets p.w.",\
+  "bzstat.data" using 1:6 t "duplicate tickets p.w.",\
+  "bzstat.data" using 1:7 t "dropped tickets p.w.",\
+  "bzstat.data" using 1:4 t "open ticket in queue" axis x1y2
 set output
 quit


Index: grabBZstats
===================================================================
RCS file: /cvs/fedora/status-report-scripts/grabBZstats,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grabBZstats	7 Jul 2006 15:25:37 -0000	1.1
+++ grabBZstats	11 Sep 2007 13:48:22 -0000	1.2
@@ -9,20 +9,18 @@
 use strict;
 use Getopt::Long;
 use Date::Manip;
-use File::Temp qw/ tempfile /;
+use XMLRPC::Lite;
 
-# Cookies and BZ URLs to retrieve tickets
-my $BZ_cooky = "# HTTP Cookie File
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917104	COLUMNLIST	opendate%20changeddate%20bug_severity%20assigned_to%20reporter%20bug_status%20resolution%20component%20blockedby%20short_desc
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917173	Bugzilla_logincookie	496436
-bugzilla.redhat.com	FALSE	/bugzilla	FALSE	2145917173	Bugzilla_login	156481";
-my @BZ_URLs;
-# All package reviews
-push @BZ_URLs,
-  "https://bugzilla.redhat.com/bugzilla/buglist.cgi?query_format=advanced&product=Fedora%20Extras&chfieldto=Now&component=Package%20Review&ctype=csv";
+my $rpc = new XMLRPC::Lite (
+  proxy => 'https://bugzilla.redhat.com/xmlrpc.cgi'
+);
+# Not sure of the way to increase the timeout on reading...
+$rpc->transport->timeout(360);
+$main::BZusername = "";
+$main::password = "";
 
 my %opt;
-my @options = ( "help" );
+my @options = ( "help", "bu=s", "p=s" );
 
 my @Ticket;
 my $startDate = ParseDate("1 August 2005");
@@ -30,80 +28,35 @@
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
+$main::BZusername = $opt{"bu"} if defined $opt{"bu"};
+$main::password = $opt{"p"} if defined $opt{"p"};
 
 &usage() if defined $opt{'help'};
 
-my ($tfh, $tfn) = tempfile();
-print $tfh $BZ_cooky;
-close $tfh;
-foreach my $url (@BZ_URLs) {
-  local *IN;
-  open IN, "wget --load-cookies $tfn -nv -O - \"$url\"|"
-    or die "Failed to wget $url : $!";
-  while ( <IN> ) {
-    s/[,\n]+$//;
-    my @F = split /,/;
-    my $i = 0;
-    while ($i <= $#F) {
-      if (substr($F[$i], 0, 1) eq '"') {
-	if (substr($F[$i], -1, 1) ne '"') {
-	  $F[$i] .= "," . $F[$i + 1];
-	  splice @F, $i + 1, 1;
-	  next;
-	}
-      }
-      $i += 1;
-    }
-    if ($F[0] !~ /^\d+$/) {
-      # Check header line
-      if ($F[0] ne "bug_id"
-	  || $F[1] ne "\"opendate\""
-	  || $F[2] ne "\"changeddate\""
-	  || $F[3] ne "\"bug_severity\""
-	  || $F[4] ne "\"assigned_to\""
-	  || $F[5] ne "\"reporter\""
-	  || $F[6] ne "\"bug_status\""
-	  || $F[7] ne "\"resolution\""
-	  || $F[8] ne "\"component\""
-	  || $F[9] ne "\"blockedby\""
-	  || $F[10] ne "\"short_desc\"") {
-	die "Bad header: $_";
-      }
-      next;
-    }
-    next if $F[10] =~ /TESTING-BUGSPAM/;
-    next if $F[10] =~ /^.Tracker:/;
-    warn "assigned_to should be an email address: $F[4]"
-      if index($F[4], "@") < 0;
-    warn "reporter should be an email address: $F[5]"
-      if index($F[5], "@") < 0;
-    $F[9] =~ s/["{}]//g;
-    $F[1] =~ s/["]//g;
-    $F[2] =~ s/["]//g;
-    $F[6] =~ s/["]//g;
-    $F[7] =~ s/["]//g;
-    $F[8] =~ s/["]//g;
-    $F[1] = ParseDate($F[1]);
-    $F[2] = ParseDate($F[2]);
-    push @Ticket, \@F;
-  }
-  close IN;
-}
-unlink $tfn;
-my @SubmitSortedT = sort { Date_Cmp($$a[1], $$b[1]) } @Ticket;
-my @ModifSortedT = sort { Date_Cmp($$a[2], $$b[2]) } @Ticket;
+my $bA = &runQuery($rpc);
+foreach my $bug (@$bA) {
+  # Try to guess package name
+  my $name = $bug->{'short_desc'};
+  $bug->{'opendate'} = ParseDate($bug->{'opendate'});
+  $bug->{'changeddate'} = ParseDate($bug->{'changeddate'});
+  next if $name =~ /TESTING-BUGSPAM/;
+  next if $name =~ /^.Tracker:/;
+  push @Ticket, $bug;
+}
+my @SubmitSortedT = sort { Date_Cmp($a->{'opendate'}, $b->{'opendate'}) } @Ticket;
+my @ModifSortedT = sort { Date_Cmp($a->{'changeddate'}, $b->{'changeddate'}) } @Ticket;
 my $curDate = $startDate;
 my $openCount = 0;
 my @Open;
 foreach my $e (@SubmitSortedT) {
-  if (Date_Cmp($$e[1], $curDate) < 0) {
+  if (Date_Cmp($e->{'opendate'}, $curDate) < 0) {
     $openCount += 1;
     next;
   }
   push @Open, $openCount;
   $openCount = 0;
   $curDate = DateCalc($curDate, "+ 1 week");
-  while (Date_Cmp($$e[1], $curDate) >= 0) {
+  while (Date_Cmp($e->{'opendate'}, $curDate) >= 0) {
     push @Open, $openCount;
     $curDate = DateCalc($curDate, "+ 1 week");
   }
@@ -120,19 +73,20 @@
 my @Close;
 my @K = ("Accepted", "DUPLICATE", "Dropped");
 foreach my $e (@ModifSortedT) {
-  next if $$e[6] ne "CLOSED";
+  next if $e->{'bug_status'} ne "CLOSED";
   my $key;
   $key = "Accepted"
-    if $$e[7] =~ /^(CURRENTRELEASE|NEXTRELEASE|RAWHIDE)$/;
+    if $e->{'resolution'} =~ /^(CURRENTRELEASE|NEXTRELEASE|RAWHIDE|ERRATA)$/;
   $key = "DUPLICATE"
-    if $$e[7] eq "DUPLICATE";
+    if $e->{'resolution'} eq "DUPLICATE";
   $key = "Dropped"
-    if $$e[7] =~ /^(CANTFIX|DEFERRED|NOTABUG|WONTFIX|WORKSFORME)$/;
+    if $e->{'resolution'} =~ /^(CANTFIX|DEFERRED|NOTABUG|WONTFIX|WORKSFORME|INSUFFICIENT_DATA|UPSTREAM)$/;
   unless (defined $key) {
-    print STDERR join("|", @$e), "\n";
+    print STDERR $e->{'bug_id'}, ": ", $e->{'resolution'}, "\n";
     die "Can't classify";
+    #$key = "Dropped";
   }
-  if (Date_Cmp($$e[2], $curDate) < 0) {
+  if (Date_Cmp($e->{'changeddate'}, $curDate) < 0) {
     $closeCount->{"all"} += 1;
     $closeCount->{$key} += 1;
     next;
@@ -140,7 +94,7 @@
   push @Close, $closeCount;
   $closeCount = {};
   $curDate = DateCalc($curDate, "+ 1 week");
-  while (Date_Cmp($$e[2], $curDate) >= 0) {
+  while (Date_Cmp($e->{'changeddate'}, $curDate) >= 0) {
     push @Close, $closeCount;
     $closeCount = {};
     $curDate = DateCalc($curDate, "+ 1 week");
@@ -183,3 +137,59 @@
   -help           this help note\n";
   exit 1;
 }
+
+sub runQuery {
+  my ($rpc) = @_;
+  my $querydata = {
+    'column_list' => ['opendate', 'changeddate', 'bug_severity', 'alias',
+		      'assigned_to', 'reporter', 'bug_status',
+		      'resolution', 'component', 'blockedby', 'short_desc'],
+    'product'     => ['Fedora'],
+    'component'   => ['Package Review'],
+    'bug_status'  => ["NEW", "VERIFIED", "ASSIGNED", "REOPENED",
+		      "NEEDINFO_ENG", "NEEDINFO", "INVESTIGATE", "MODIFIED",
+		      "ON_DEV", "UNCONFIRMED", "QA_READY", "ON_QA",
+		      "FAILS_QA", "NEEDINFO_REPORTER", "RELEASE_PENDING",
+		      "POST"]
+  };
+  my $call;
+  while (1) {
+    print STDERR "Running runQuery(rpc) all open\n";
+    eval {
+      $call = $rpc->call('bugzilla.runQuery', $querydata,
+			 $main::BZusername, $main::password);
+      if ($call->faultstring) {
+	print STDERR $call->faultstring . "\n";
+	exit 1;
+      }
+    };
+    if ($@) {
+      warn $@;
+    } else {
+      last;
+    }
+  }
+  my $result = $call->result;
+  my $res_all = $result->{'bugs'};
+  $querydata->{'bug_status'} = ["CLOSED"];
+  while (1) {
+    print STDERR "Running runQuery(rpc) closed\n";
+    eval {
+      $call = $rpc->call('bugzilla.runQuery', $querydata,
+	  		  $main::BZusername, $main::password);
+      if ($call->faultstring) {
+	print STDERR $call->faultstring . "\n";
+	exit 1;
+      }
+    };
+    if ($@) {
+      warn $@;
+    } else {
+      last;
+    }
+  }
+  $result = $call->result;
+  my $res2 = $result->{'bugs'};
+  push @$res_all, @$res2;
+  return $res_all;
+}



From fedora-extras-commits at redhat.com  Tue Sep 11 14:08:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 10:08:36 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.53,1.54
Message-ID: <200709111408.l8BE8aRh003260@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3239

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- policy-20070501.patch	10 Sep 2007 18:25:11 -0000	1.53
+++ policy-20070501.patch	11 Sep 2007 14:08:33 -0000	1.54
@@ -244,10 +244,76 @@
 +	hal_write_log(alsa_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.6.4/policy/modules/admin/amanda.if
+--- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-07 14:51:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.if	2007-09-11 09:15:10.000000000 -0400
+@@ -71,6 +71,26 @@
+ 
+ ########################################
+ ## <summary>
++##	Search amanda var library directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`amanda_search_var_lib',`
++	gen_require(`
++		type amanda_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	allow $1 amanda_var_lib_t:dir search_dir_perms;
++
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to read /etc/dumpdates.
+ ## </summary>
+ ## <param name="domain">
+@@ -141,3 +161,4 @@
+ 
+ 	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-08-07 09:42:34.000000000 -0400
-@@ -85,7 +85,7 @@
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 09:15:03.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(amanda,1.5.0)
++policy_module(amanda,1.6.1)
+ 
+ #######################################
+ #
+@@ -51,8 +51,7 @@
+ # type for amrecover
+ type amanda_recover_t;
+ type amanda_recover_exec_t;
+-domain_type(amanda_recover_t)
+-domain_entry_file(amanda_recover_t,amanda_recover_exec_t)
++application_domain(amanda_recover_t,amanda_recover_exec_t)
+ role system_r types amanda_recover_t;
+ 
+ # type for recover files ( restored data )
+@@ -70,12 +69,11 @@
+ 
+ allow amanda_t self:capability { chown dac_override setuid kill };
+ allow amanda_t self:process { setpgid signal };
+-allow amanda_t self:fifo_file { getattr read write ioctl lock };
++allow amanda_t self:fifo_file rw_fifo_file_perms;
+ allow amanda_t self:unix_stream_socket create_stream_socket_perms;
+ allow amanda_t self:unix_dgram_socket create_socket_perms;
+ allow amanda_t self:tcp_socket create_stream_socket_perms;
+ allow amanda_t self:udp_socket create_socket_perms;
+-allow amanda_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # access to amanda_amandates_t
+ allow amanda_t amanda_amandates_t:file { getattr lock read write };
+@@ -85,18 +83,22 @@
  
  # access to amandas data structure
  allow amanda_t amanda_data_t:dir { read search write };
@@ -256,7 +322,12 @@
  
  # access to amanda_dumpdates_t
  allow amanda_t amanda_dumpdates_t:file { getattr lock read write };
-@@ -97,6 +97,9 @@
+ 
+ can_exec(amanda_t,amanda_exec_t)
++can_exec(amanda_t,amanda_inetd_exec_t)
+ 
+ # access to amanda_gnutarlists_t (/var/lib/amanda/gnutar-lists)
+ allow amanda_t amanda_gnutarlists_t:dir rw_dir_perms;
  allow amanda_t amanda_gnutarlists_t:file manage_file_perms;
  allow amanda_t amanda_gnutarlists_t:lnk_file manage_file_perms;
  
@@ -266,6 +337,79 @@
  manage_files_pattern(amanda_t,amanda_log_t,amanda_log_t)
  manage_dirs_pattern(amanda_t,amanda_log_t,amanda_log_t)
  logging_log_filetrans(amanda_t,amanda_log_t,{ file dir })
+@@ -105,6 +107,8 @@
+ manage_dirs_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_t, amanda_tmp_t, { file dir })
+ 
++auth_use_nsswitch(amanda_t)
++
+ kernel_read_system_state(amanda_t)
+ kernel_read_kernel_sysctls(amanda_t)
+ kernel_dontaudit_getattr_unlabeled_files(amanda_t)
+@@ -113,7 +117,8 @@
+ # Added for targeted policy
+ term_use_unallocated_ttys(amanda_t)
+ 
+-corenet_non_ipsec_sendrecv(amanda_t)
++corenet_all_recvfrom_unlabeled(amanda_t)
++corenet_all_recvfrom_netlabel(amanda_t)
+ corenet_tcp_sendrecv_all_if(amanda_t)
+ corenet_udp_sendrecv_all_if(amanda_t)
+ corenet_raw_sendrecv_all_if(amanda_t)
+@@ -150,8 +155,6 @@
+ libs_use_ld_so(amanda_t)
+ libs_use_shared_libs(amanda_t)
+ 
+-sysnet_read_config(amanda_t)
+-
+ optional_policy(`
+ 	auth_read_shadow(amanda_t)
+ ')
+@@ -160,14 +163,6 @@
+ 	logging_send_syslog_msg(amanda_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(amanda_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_t)
+-')
+-
+ ########################################
+ #
+ # Amanda recover local policy
+@@ -197,10 +192,13 @@
+ manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
+ 
++auth_use_nsswitch(amanda_recover_t)
++
+ kernel_read_system_state(amanda_recover_t)
+ kernel_read_kernel_sysctls(amanda_recover_t)
+ 
+-corenet_non_ipsec_sendrecv(amanda_recover_t)
++corenet_all_recvfrom_unlabeled(amanda_recover_t)
++corenet_all_recvfrom_netlabel(amanda_recover_t)
+ corenet_tcp_sendrecv_all_if(amanda_recover_t)
+ corenet_udp_sendrecv_all_if(amanda_recover_t)
+ corenet_tcp_sendrecv_all_nodes(amanda_recover_t)
+@@ -232,14 +230,4 @@
+ 
+ miscfiles_read_localization(amanda_recover_t)
+ 
+-sysnet_read_config(amanda_recover_t)
+-
+ userdom_search_sysadm_home_content_dirs(amanda_recover_t)
+-
+-optional_policy(`
+-	nis_use_ypbind(amanda_recover_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_recover_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.4/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc	2007-08-07 09:42:34.000000000 -0400
@@ -1634,7 +1778,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-04 13:41:27.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 08:17:57.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1673,15 +1817,16 @@
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  network_port(mail, tcp,2000,s0)
-@@ -152,6 +158,7 @@
+@@ -152,13 +158,18 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
 +network_port(wccp, udp,2048,s0)
  network_port(xen, tcp,8002,s0)
++network_port(xfs, tcp,7100,s0)
  network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
  network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
-@@ -159,6 +166,9 @@
+ network_port(zope, tcp,8021,s0)
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -4175,7 +4320,7 @@
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.6.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cron.te	2007-09-11 09:16:17.000000000 -0400
 @@ -42,6 +42,9 @@
  type cron_log_t;
  logging_log_file(cron_log_t)
@@ -4268,7 +4413,7 @@
  ifdef(`distro_debian',`
  	optional_policy(`
  		# Debian logcheck has the home dir set to its cache
-@@ -185,34 +209,9 @@
+@@ -185,40 +209,19 @@
  	locallogin_link_keys(crond_t)
  ')
  
@@ -4306,7 +4451,17 @@
  
  tunable_policy(`fcron_crond', `
  	allow crond_t system_cron_spool_t:file manage_file_perms;
-@@ -232,11 +231,7 @@
+ ')
+ 
+ optional_policy(`
++	amanda_search_var_lib(crond_t)
++')
++
++optional_policy(`
+ 	amavis_search_lib(crond_t)
+ ')
+ 
+@@ -232,11 +235,7 @@
  ')
  
  optional_policy(`
@@ -4319,7 +4474,7 @@
  ')
  
  optional_policy(`
-@@ -258,25 +253,39 @@
+@@ -258,25 +257,39 @@
  # System cron process domain
  #
  
@@ -4363,7 +4518,7 @@
  	allow system_crond_t self:capability { dac_override dac_read_search chown setgid setuid fowner net_bind_service fsetid };
  	allow system_crond_t self:process { signal_perms setsched };
  	allow system_crond_t self:fifo_file rw_fifo_file_perms;
-@@ -369,7 +378,7 @@
+@@ -369,7 +382,7 @@
  	init_read_utmp(system_crond_t)
  	init_dontaudit_rw_utmp(system_crond_t)
  	# prelink tells init to restart it self, we either need to allow or dontaudit
@@ -4372,7 +4527,7 @@
  
  	libs_use_ld_so(system_crond_t)
  	libs_use_shared_libs(system_crond_t)
-@@ -428,6 +437,10 @@
+@@ -428,6 +441,10 @@
  	')
  
  	optional_policy(`
@@ -4385,7 +4540,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.6.4/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/cups.fc	2007-09-11 08:58:55.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4403,12 +4558,11 @@
  /usr/lib(64)?/cups/daemon/.*	-- gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
-@@ -52,3 +53,5 @@
+@@ -52,3 +53,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-+/usr/local/Brother/lpd(/.*)?	gen_context(system_u:object_r:cupsd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.6.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/cups.te	2007-08-07 09:42:35.000000000 -0400
@@ -5249,9 +5403,17 @@
  files_search_home(inetd_child_t)
  
  manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-2.6.4/policy/modules/services/kerberos.fc
+--- nsaserefpolicy/policy/modules/services/kerberos.fc	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.fc	2007-09-11 09:03:39.000000000 -0400
+@@ -16,3 +16,4 @@
+ 
+ /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
+ /var/log/kadmin(d)?\.log		gen_context(system_u:object_r:kadmind_log_t,s0)
++/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.6.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.if	2007-09-11 09:02:58.000000000 -0400
 @@ -33,43 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -5298,109 +5460,56 @@
  ')
  
  ########################################
-@@ -94,46 +61,47 @@
+@@ -94,6 +61,27 @@
  
  ########################################
  ## <summary>
--##	Do not audit attempts to write the kerberos
--##	configuration file (/etc/krb5.conf).
 +##	Read the kerberos kdc configuration file (/etc/krb5kdc.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
--##	Domain to not audit.
++## </summary>
++## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
- ##	</summary>
- ## </param>
++##	</summary>
++## </param>
 +## <rolecap/>
- #
--interface(`kerberos_dontaudit_write_config',`
++#
 +interface(`kerberos_read_kdc_config',`
- 	gen_require(`
--		type krb5_conf_t;
++	gen_require(`
 +		type krb5kdc_conf_t;
- 	')
- 
--	dontaudit $1 krb5_conf_t:file write;
++	')
++
 +	files_search_etc($1)
 +	allow $1 krb5kdc_conf_t:file read_file_perms;
 +
- ')
- 
- ########################################
- ## <summary>
--##	Read and write the kerberos configuration file (/etc/krb5.conf).
-+##	Do not audit attempts to write the kerberos
-+##	configuration file (/etc/krb5.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
--##	Domain allowed access.
-+##	Domain to not audit.
- ##	</summary>
- ## </param>
--## <rolecap/>
- #
--interface(`kerberos_rw_config',`
-+interface(`kerberos_dontaudit_write_config',`
- 	gen_require(`
- 		type krb5_conf_t;
- 	')
- 
--	files_search_etc($1)
--	allow $1 krb5_conf_t:file rw_file_perms;
-+	dontaudit $1 krb5_conf_t:file write;
- ')
- 
- ########################################
- ## <summary>
--##	Read the kerberos key table.
-+##	Read and write the kerberos configuration file (/etc/krb5.conf).
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -142,18 +110,18 @@
- ## </param>
- ## <rolecap/>
- #
--interface(`kerberos_read_keytab',`
-+interface(`kerberos_rw_config',`
- 	gen_require(`
--		type krb5_keytab_t;
-+		type krb5_conf_t;
- 	')
- 
- 	files_search_etc($1)
--	allow $1 krb5_keytab_t:file read_file_perms;
-+	allow $1 krb5_conf_t:file rw_file_perms;
- ')
- 
- ########################################
- ## <summary>
--##	Read the kerberos kdc configuration file (/etc/krb5kdc.conf).
-+##	Read the kerberos key table.
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to write the kerberos
+ ##	configuration file (/etc/krb5.conf).
  ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -162,12 +130,11 @@
+@@ -162,12 +150,13 @@
  ## </param>
  ## <rolecap/>
  #
 -interface(`kerberos_read_kdc_config',`
-+interface(`kerberos_read_keytab',`
++interface(`kerberos_manage_host_rcache',`
  	gen_require(`
 -		type krb5kdc_conf_t;
-+		type krb5_keytab_t;
++		type krb5_host_rcache_t;
  	')
  
- 	files_search_etc($1)
+-	files_search_etc($1)
 -	allow $1 krb5kdc_conf_t:file read_file_perms;
 -
-+	allow $1 krb5_keytab_t:file read_file_perms;
++	files_search_tmp($1)
++	allow $1 self:process setfscreate;
++	seutil_read_file_contexts($1)
++	allow $1 krb5_host_rcache_t:file manage_file_perms;
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.6.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-04 11:12:55.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/kerberos.te	2007-09-11 09:02:16.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -5409,7 +5518,17 @@
  
  ## <desc>
  ## <p>
-@@ -62,7 +63,7 @@
+@@ -54,6 +55,9 @@
+ type krb5kdc_var_run_t;
+ files_pid_file(krb5kdc_var_run_t)
+ 
++type krb5_host_rcache_t;
++files_tmp_file(krb5_host_rcache_t)
++
+ ########################################
+ #
+ # kadmind local policy
+@@ -62,7 +66,7 @@
  # Use capabilities. Surplus capabilities may be allowed.
  allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
  dontaudit kadmind_t self:capability sys_tty_config;
@@ -5418,7 +5537,7 @@
  allow kadmind_t self:netlink_route_socket r_netlink_socket_perms;
  allow kadmind_t self:unix_dgram_socket { connect create write };
  allow kadmind_t self:tcp_socket connected_stream_socket_perms;
-@@ -91,6 +92,7 @@
+@@ -91,6 +95,7 @@
  kernel_read_kernel_sysctls(kadmind_t)
  kernel_list_proc(kadmind_t)
  kernel_read_proc_symlinks(kadmind_t)
@@ -5426,7 +5545,7 @@
  
  corenet_non_ipsec_sendrecv(kadmind_t)
  corenet_tcp_sendrecv_all_if(kadmind_t)
-@@ -117,6 +119,9 @@
+@@ -117,6 +122,9 @@
  domain_use_interactive_fds(kadmind_t)
  
  files_read_etc_files(kadmind_t)
@@ -5436,7 +5555,7 @@
  
  libs_use_ld_so(kadmind_t)
  libs_use_shared_libs(kadmind_t)
-@@ -126,6 +131,7 @@
+@@ -126,6 +134,7 @@
  miscfiles_read_localization(kadmind_t)
  
  sysnet_read_config(kadmind_t)
@@ -5444,7 +5563,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(kadmind_t)
  userdom_dontaudit_search_sysadm_home_dirs(kadmind_t)
-@@ -142,6 +148,7 @@
+@@ -142,6 +151,7 @@
  
  optional_policy(`
  	seutil_sigchld_newrole(kadmind_t)
@@ -5452,7 +5571,16 @@
  ')
  
  optional_policy(`
-@@ -227,6 +234,7 @@
+@@ -156,7 +166,7 @@
+ # Use capabilities. Surplus capabilities may be allowed.
+ allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice };
+ dontaudit krb5kdc_t self:capability sys_tty_config;
+-allow krb5kdc_t self:process { setsched getsched signal_perms };
++allow krb5kdc_t self:process { setfscreate setsched getsched signal_perms };
+ allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms;
+ allow krb5kdc_t self:tcp_socket create_stream_socket_perms;
+ allow krb5kdc_t self:udp_socket create_socket_perms;
+@@ -227,6 +237,7 @@
  miscfiles_read_localization(krb5kdc_t)
  
  sysnet_read_config(krb5kdc_t)
@@ -5460,7 +5588,13 @@
  
  userdom_dontaudit_use_unpriv_user_fds(krb5kdc_t)
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
-@@ -248,3 +256,36 @@
+@@ -243,8 +254,42 @@
+ 
+ optional_policy(`
+ 	seutil_sigchld_newrole(krb5kdc_t)
++	seutil_read_file_contexts(krb5kdc_t)
+ ')
+ 
  optional_policy(`
  	udev_read_db(krb5kdc_t)
  ')
@@ -7148,15 +7282,55 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.6.4/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-08-07 09:42:35.000000000 -0400
-@@ -64,6 +64,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/rlogin.te	2007-09-11 09:05:43.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(rlogin,1.3.0)
++policy_module(rlogin,1.4.0)
+ 
+ ########################################
+ #
+@@ -50,7 +50,8 @@
+ kernel_read_system_state(rlogind_t)
+ kernel_read_network_state(rlogind_t)
+ 
+-corenet_non_ipsec_sendrecv(rlogind_t)
++corenet_all_recvfrom_unlabeled(rlogind_t)
++corenet_all_recvfrom_netlabel(rlogind_t)
+ corenet_tcp_sendrecv_all_if(rlogind_t)
+ corenet_udp_sendrecv_all_if(rlogind_t)
+ corenet_tcp_sendrecv_all_nodes(rlogind_t)
+@@ -63,9 +64,10 @@
+ fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
++auth_use_nsswitch(rlogind_t)
  auth_domtrans_chk_passwd(rlogind_t)
 +auth_domtrans_upd_passwd(rlogind_t)
  auth_rw_login_records(rlogind_t)
- auth_use_nsswitch(rlogind_t)
+-auth_use_nsswitch(rlogind_t)
+ 
+ files_read_etc_files(rlogind_t)
+ files_read_etc_runtime_files(rlogind_t)
+@@ -81,7 +83,7 @@
+ 
+ miscfiles_read_localization(rlogind_t)
+ 
+-seutil_dontaudit_search_config(rlogind_t)
++seutil_read_config(rlogind_t)
+ 
+ sysnet_read_config(rlogind_t)
  
+@@ -92,7 +94,9 @@
+ remotelogin_domtrans(rlogind_t)
+ 
+ optional_policy(`
++	kerberos_use(rlogind_t)
+ 	kerberos_read_keytab(rlogind_t)
++	kerberos_manage_host_rcache(rlogind_t)
+ ')
+ 
+ ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-2.6.4/policy/modules/services/rpcbind.fc
 --- nsaserefpolicy/policy/modules/services/rpcbind.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.6.4/policy/modules/services/rpcbind.fc	2007-08-07 09:42:35.000000000 -0400
@@ -7428,15 +7602,105 @@
  tunable_policy(`nfs_export_all_ro',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-2.6.4/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2007-08-07 09:42:35.000000000 -0400
-@@ -44,6 +44,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/rshd.te	2007-09-11 09:10:41.000000000 -0400
+@@ -11,19 +11,22 @@
+ domain_subj_id_change_exemption(rshd_t)
+ domain_role_change_exemption(rshd_t)
+ role system_r types rshd_t;
++domain_interactive_fd(rshd_t)
+ 
+ ########################################
+ #
+ # Local policy
+ #
+-allow rshd_t self:capability { setuid setgid fowner fsetid chown dac_override };
++allow rshd_t self:capability { kill setuid setgid fowner fsetid chown dac_override };
+ allow rshd_t self:process { signal_perms fork setsched setpgid setexec };
+ allow rshd_t self:fifo_file rw_fifo_file_perms;
+ allow rshd_t self:tcp_socket create_stream_socket_perms;
++allow rshd_t self:key {search  write link};
+ 
+ kernel_read_kernel_sysctls(rshd_t)
+ 
+-corenet_non_ipsec_sendrecv(rshd_t)
++corenet_all_recvfrom_unlabeled(rshd_t)
++corenet_all_recvfrom_netlabel(rshd_t)
+ corenet_tcp_sendrecv_generic_if(rshd_t)
+ corenet_udp_sendrecv_generic_if(rshd_t)
+ corenet_tcp_sendrecv_all_nodes(rshd_t)
+@@ -32,6 +35,8 @@
+ corenet_udp_sendrecv_all_ports(rshd_t)
+ corenet_tcp_bind_all_nodes(rshd_t)
+ corenet_tcp_bind_rsh_port(rshd_t)
++corenet_tcp_bind_all_rpc_ports(rshd_t)
++corenet_tcp_connect_all_rpc_ports(rshd_t)
+ corenet_sendrecv_rsh_server_packets(rshd_t)
+ 
+ dev_read_urand(rshd_t)
+@@ -43,31 +48,43 @@
+ selinux_compute_relabel_context(rshd_t)
  selinux_compute_user_contexts(rshd_t)
  
++auth_use_nsswitch(rshd_t)
  auth_domtrans_chk_passwd(rshd_t)
 +auth_domtrans_upd_passwd(rshd_t)
++auth_search_key(rshd_t)
++auth_write_login_records(rshd_t)
  
  corecmd_read_bin_symlinks(rshd_t)
  
+ files_list_home(rshd_t)
+ files_read_etc_files(rshd_t)
+-files_search_tmp(rshd_t)
++files_manage_generic_tmp_dirs(rshd_t)
++
++init_rw_utmp(rshd_t)
+ 
+ libs_use_ld_so(rshd_t)
+ libs_use_shared_libs(rshd_t)
+ 
+ logging_send_syslog_msg(rshd_t)
++logging_search_logs(rshd_t)
+ 
+ miscfiles_read_localization(rshd_t)
+ 
+ seutil_read_config(rshd_t)
+ seutil_read_default_contexts(rshd_t)
+ 
+-sysnet_read_config(rshd_t)
+-
+ userdom_search_all_users_home_content(rshd_t)
+ 
++optional_policy(`
++	kerberos_use(rshd_t)
++	kerberos_read_keytab(rshd_t)
++	kerberos_manage_host_rcache(rshd_t)
++')
++
+ ifdef(`targeted_policy',`
+ 	unconfined_domain(rshd_t)
+ 	unconfined_shell_domtrans(rshd_t)
++	unconfined_signal(rshd_t)
+ ')
+ 
+ tunable_policy(`use_nfs_home_dirs',`
+@@ -80,16 +97,3 @@
+ 	fs_read_cifs_symlinks(rshd_t)
+ ')
+ 
+-optional_policy(`
+-	kerberos_use(rshd_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(rshd_t)
+-')
+-
+-ifdef(`TODO',`
+-optional_policy(`
+-	allow rshd_t rlogind_tmp_t:file rw_file_perms;
+-')
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.6.4/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/rsync.te	2007-08-07 09:42:35.000000000 -0400
@@ -7539,7 +7803,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.6.4/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.fc	2007-09-11 09:23:35.000000000 -0400
 @@ -3,6 +3,7 @@
  # /etc
  #
@@ -7548,7 +7812,15 @@
  /etc/samba/secrets\.tdb		--	gen_context(system_u:object_r:samba_secrets_t,s0)
  /etc/samba/smbpasswd		--	gen_context(system_u:object_r:samba_secrets_t,s0)
  /etc/samba(/.*)?			gen_context(system_u:object_r:samba_etc_t,s0)
-@@ -27,6 +28,9 @@
+@@ -14,6 +15,7 @@
+ /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
+ /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
+ /usr/bin/smbmnt			--	gen_context(system_u:object_r:smbmount_exec_t,s0)
++/usr/bin/smbcontrol		--	gen_context(system_u:object_r:smbcontrol_exec_t,s0)
+ /usr/sbin/swat			--	gen_context(system_u:object_r:swat_exec_t,s0)
+ 
+ /usr/sbin/nmbd			--	gen_context(system_u:object_r:nmbd_exec_t,s0)
+@@ -27,6 +29,9 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
@@ -7560,7 +7832,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-11 09:24:04.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -7653,7 +7925,7 @@
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +443,70 @@
+@@ -377,3 +443,121 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -7724,15 +7996,64 @@
 +
 +	read_files_pattern($1, samba_share_t, samba_share_t)
 +')
++
++########################################
++## <summary>
++##	Execute a domain transition to run smbcontrol.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_smbcontrol',`
++	gen_require(`
++		type smbcontrol_t;
++                type smbcontrol_exec_t;
++	')
++
++	domtrans_pattern($1,smbcontrol_exec_t,smbcontrol_t)
++')
++
++
++########################################
++## <summary>
++##	Execute smbcontrol in the smbcontrol domain, and
++##	allow the specified role the smbcontrol domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the smbcontrol domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the role's terminal.
++##	</summary>
++## </param>
++#
++interface(`samba_run_smbcontrol',`
++	gen_require(`
++		type smbcontrol_t;
++	')
++
++	samba_domtrans_smbcontrol($1)
++	role $2 types smbcontrol_t;
++	dontaudit smbcontrol_t $3:chr_file rw_term_perms;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-08-23 17:07:33.000000000 -0400
-@@ -28,6 +28,35 @@
- ## </desc>
- gen_tunable(samba_share_nfs,false)
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-11 09:56:07.000000000 -0400
+@@ -16,6 +16,14 @@
  
-+## <desc>
-+## <p>
+ ## <desc>
+ ## <p>
 +## Allow samba to run as the domain controller; add machines to passwd file
 +## 
 +## </p>
@@ -7741,17 +8062,24 @@
 +
 +## <desc>
 +## <p>
-+## Allow samba to be exported read/write.
+ ## Allow samba to export user home directories.
+ ## </p>
+ ## </desc>
+@@ -23,6 +31,27 @@
+ 
+ ## <desc>
+ ## <p>
++## Export all files on system read only.
 +## </p>
 +## </desc>
-+gen_tunable(samba_export_all_rw,false)
++gen_tunable(samba_export_all_ro,false)
 +
 +## <desc>
 +## <p>
-+## Allow samba to be exported read only
++## Export all files on system read-write.
 +## </p>
 +## </desc>
-+gen_tunable(samba_export_all_ro,false)
++gen_tunable(samba_export_all_rw,false)
 +
 +## <desc>
 +## <p>
@@ -7760,27 +8088,54 @@
 +## </desc>
 +gen_tunable(samba_run_unconfined,false)
 +
- type nmbd_t;
- type nmbd_exec_t;
- init_daemon_domain(nmbd_t,nmbd_exec_t)
-@@ -117,6 +146,7 @@
- allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
- allow samba_net_t self:udp_socket create_socket_perms;
- allow samba_net_t self:tcp_socket create_socket_perms;
-+allow samba_net_t self:netlink_route_socket r_netlink_socket_perms;
++## <desc>
++## <p>
+ ## Allow samba to export NFS volumes.
+ ## </p>
+ ## </desc>
+@@ -108,6 +137,11 @@
+ type winbind_var_run_t;
+ files_pid_file(winbind_var_run_t)
+ 
++type smbcontrol_t;
++type smbcontrol_exec_t;
++application_domain(smbcontrol_t, smbcontrol_exec_t)
++role system_r types smbcontrol_t;
++
+ ########################################
+ #
+ # Samba net local policy
+@@ -131,6 +165,8 @@
+ manage_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ manage_lnk_files_pattern(samba_net_t,samba_var_t,samba_var_t)
  
- allow samba_net_t samba_etc_t:file read_file_perms;
++auth_use_nsswitch(samba_net_t)
++
+ kernel_read_proc_symlinks(samba_net_t)
  
-@@ -159,6 +189,8 @@
+ corenet_tcp_sendrecv_all_if(samba_net_t)
+@@ -159,8 +195,7 @@
  
  miscfiles_read_localization(samba_net_t) 
  
+-sysnet_read_config(samba_net_t)
+-sysnet_use_ldap(samba_net_t)
 +samba_read_var_files(samba_net_t) 
-+
- sysnet_read_config(samba_net_t)
- sysnet_use_ldap(samba_net_t)
  
-@@ -191,7 +223,7 @@
+ userdom_dontaudit_search_sysadm_home_dirs(samba_net_t)
+ 
+@@ -173,10 +208,6 @@
+ 	kerberos_use(samba_net_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(samba_net_t)
+-')
+-
+ ########################################
+ #
+ # smbd Local policy
+@@ -191,18 +222,16 @@
  allow smbd_t self:msgq create_msgq_perms;
  allow smbd_t self:sem create_sem_perms;
  allow smbd_t self:shm create_shm_perms;
@@ -7789,7 +8144,8 @@
  allow smbd_t self:tcp_socket create_stream_socket_perms;
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -200,9 +232,8 @@
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
  
@@ -7801,7 +8157,7 @@
  allow smbd_t samba_log_t:dir setattr;
  dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -231,7 +262,8 @@
+@@ -231,7 +260,8 @@
  manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
  files_pid_filetrans(smbd_t,smbd_var_run_t,file)
  
@@ -7811,17 +8167,17 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -256,6 +288,9 @@
- corenet_tcp_connect_ipp_port(smbd_t)
- corenet_tcp_connect_smbd_port(smbd_t)
+@@ -241,6 +271,9 @@
+ kernel_read_software_raid_state(smbd_t)
+ kernel_read_system_state(smbd_t)
  
 +corecmd_exec_shell(smbd_t)
 +corecmd_exec_bin(smbd_t)
 +
- dev_read_sysfs(smbd_t)
- dev_read_urand(smbd_t)
- dev_getattr_mtrr_dev(smbd_t)
-@@ -265,11 +300,14 @@
+ corenet_tcp_sendrecv_all_if(smbd_t)
+ corenet_udp_sendrecv_all_if(smbd_t)
+ corenet_raw_sendrecv_all_if(smbd_t)
+@@ -265,11 +298,14 @@
  fs_get_xattr_fs_quotas(smbd_t)
  fs_search_auto_mountpoints(smbd_t)
  fs_getattr_rpc_dirs(smbd_t)
@@ -7836,7 +8192,13 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -296,6 +334,12 @@
+@@ -290,12 +326,16 @@
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
+-sysnet_read_config(smbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
  
@@ -7849,7 +8211,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +363,14 @@
+@@ -319,6 +359,14 @@
  ')
  
  optional_policy(`
@@ -7864,7 +8226,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +391,23 @@
+@@ -339,6 +387,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -7888,7 +8250,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +421,7 @@
+@@ -352,7 +417,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -7897,7 +8259,7 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +431,12 @@
+@@ -362,9 +427,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -7911,7 +8273,16 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -391,6 +463,7 @@
+@@ -373,6 +441,8 @@
+ 
+ allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
+ 
++auth_use_nsswitch(nmbd_t)
++
+ kernel_getattr_core_if(nmbd_t)
+ kernel_getattr_message_if(nmbd_t)
+ kernel_read_kernel_sysctls(nmbd_t)
+@@ -391,6 +461,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -7919,7 +8290,24 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -457,6 +530,7 @@
+@@ -402,6 +473,7 @@
+ 
+ files_read_usr_files(nmbd_t)
+ files_read_etc_files(nmbd_t)
++files_list_var_lib(nmbd_t)
+ 
+ libs_use_ld_so(nmbd_t)
+ libs_use_shared_libs(nmbd_t)
+@@ -411,8 +483,6 @@
+ 
+ miscfiles_read_localization(nmbd_t)
+ 
+-sysnet_read_config(nmbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
+ userdom_use_unpriv_users_fds(nmbd_t)
+@@ -457,6 +527,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -7927,24 +8315,96 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +588,7 @@
+@@ -489,6 +560,8 @@
+ term_list_ptys(smbmount_t)
+ term_use_controlling_term(smbmount_t)
+ 
++auth_use_nsswitch(smbmount_t)
++
+ corecmd_list_bin(smbmount_t)
+ 
+ files_list_mnt(smbmount_t)
+@@ -508,21 +581,11 @@
+ 
+ logging_search_logs(smbmount_t)
+ 
+-sysnet_read_config(smbmount_t)
+-
+ userdom_use_all_users_fds(smbmount_t)
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
 -	cups_read_rw_config(smbd_t)
+-')
+-
+-optional_policy(`
+-	nis_use_ypbind(smbmount_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(smbmount_t)
 +	cups_read_rw_config(smbmount_t)
  ')
  
- optional_policy(`
-@@ -534,7 +608,6 @@
- allow swat_t self:process signal_perms;
+ ########################################
+@@ -530,22 +593,30 @@
+ # SWAT Local policy
+ #
+ 
+-allow swat_t self:capability { setuid setgid };
+-allow swat_t self:process signal_perms;
++allow swat_t self:capability { setuid setgid sys_resource net_bind_service };
++allow swat_t self:process { setrlimit signal_perms };
  allow swat_t self:fifo_file rw_file_perms;
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
 -allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
- allow swat_t self:netlink_route_socket r_netlink_socket_perms;
-@@ -588,6 +661,7 @@
+-allow swat_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+-allow swat_t nmbd_exec_t:file { execute read };
++can_exec(swat_t, nmbd_exec_t)
++allow swat_t nmbd_port_t:udp_socket name_bind;
++allow swat_t nmbd_t:process { signal signull };
++allow swat_t nmbd_var_run_t:file { lock read unlink };
+ 
+ rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
+ 
++init_read_utmp(swat_t)
++init_dontaudit_write_utmp(swat_t)
++
+ append_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-allow swat_t smbd_exec_t:file execute ;
++allow swat_t self:unix_stream_socket connectto;
++can_exec(swat_t, smbd_exec_t)
++allow swat_t smbd_port_t:tcp_socket name_bind;
++allow swat_t smbd_t:process signal;
++allow swat_t smbd_var_run_t:file { lock unlink };
+ 
+ allow swat_t smbd_t:process signull;
+ 
+@@ -558,7 +629,11 @@
+ manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
+ files_pid_filetrans(swat_t,swat_var_run_t,file)
+ 
+-allow swat_t winbind_exec_t:file execute;
++can_exec(swat_t, winbind_exec_t)
++allow swat_t winbind_var_run_t:dir { write add_name remove_name };
++allow swat_t winbind_var_run_t:sock_file { create unlink };
++
++auth_use_nsswitch(swat_t)
+ 
+ kernel_read_kernel_sysctls(swat_t)
+ kernel_read_system_state(swat_t)
+@@ -582,23 +657,24 @@
+ 
+ dev_read_urand(swat_t)
+ 
++files_list_var_lib(swat_t)
+ files_read_etc_files(swat_t)
+ files_search_home(swat_t)
+ files_read_usr_files(swat_t)
  fs_getattr_xattr_fs(swat_t)
  
  auth_domtrans_chk_passwd(swat_t)
@@ -7952,7 +8412,32 @@
  
  libs_use_ld_so(swat_t)
  libs_use_shared_libs(swat_t)
-@@ -625,19 +699,25 @@
+ 
+ logging_send_syslog_msg(swat_t)
++logging_send_audit_msgs(swat_t)
+ logging_search_logs(swat_t)
+ 
+ miscfiles_read_localization(swat_t)
+ 
+-sysnet_read_config(swat_t)
+-
+ optional_policy(`
+ 	cups_read_rw_config(swat_t)
+ 	cups_stream_connect(swat_t)
+@@ -612,32 +688,30 @@
+ 	kerberos_use(swat_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(swat_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(swat_t)
+-')
+-
+ ########################################
+ #
  # Winbind local policy
  #
  
@@ -7979,7 +8464,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +725,8 @@
+@@ -645,6 +719,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -7988,7 +8473,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +764,9 @@
+@@ -682,7 +758,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -7998,7 +8483,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +779,6 @@
+@@ -695,9 +773,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -8008,7 +8493,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +794,6 @@
+@@ -713,10 +788,6 @@
  ')
  
  optional_policy(`
@@ -8019,7 +8504,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +813,7 @@
+@@ -736,6 +807,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -8027,32 +8512,67 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +841,25 @@
+@@ -763,4 +835,60 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
 +	squid_rw_stream_sockets(winbind_helper_t)
-+')
+ ')
 +
 +########################################
 +#
 +# samba_unconfined_script_t local policy
 +#
-+type samba_unconfined_script_t;
-+domain_type(samba_unconfined_script_t)
-+role system_r types samba_unconfined_script_t;
-+
-+# This type is used for executable scripts files
-+type samba_unconfined_script_exec_t;
-+corecmd_shell_entry_type(samba_unconfined_script_t)
-+domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t)
-+allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
-+allow smbd_t samba_unconfined_script_exec_t:file ioctl;
++optional_policy(`
++	type samba_unconfined_script_t;
++	domain_type(samba_unconfined_script_t)
++	role system_r types samba_unconfined_script_t;
 +
-+tunable_policy(`samba_run_unconfined',`
-+	domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
- ')
-+unconfined_domain(samba_unconfined_script_t)
++	# This type is used for executable scripts files
++	type samba_unconfined_script_exec_t;
++	corecmd_shell_entry_type(samba_unconfined_script_t)
++	domain_entry_file(samba_unconfined_script_t,samba_unconfined_script_exec_t)
++	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
++	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
++
++	tunable_policy(`samba_run_unconfined',`
++		domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
++		')
++	unconfined_domain(samba_unconfined_script_t)
++')
++
++########################################
++#
++# smbcontrol local policy
++#
++
++## internal communication is often done using fifo and unix sockets.
++allow smbcontrol_t self:fifo_file rw_file_perms;
++allow smbcontrol_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(smbcontrol_t)
++
++libs_use_ld_so(smbcontrol_t)
++libs_use_shared_libs(smbcontrol_t)
++
++miscfiles_read_localization(smbcontrol_t)
++
++files_search_var_lib(smbcontrol_t)
++samba_read_config(smbcontrol_t)
++samba_rw_var_files(smbcontrol_t)
++samba_search_var(smbcontrol_t)
++samba_read_winbind_pid(smbcontrol_t)
++
++allow smbcontrol_t smbd_t:process signal;
++allow smbd_t smbcontrol_t:process { signal signull };
++
++allow nmbd_t smbcontrol_t:process signal;
++allow smbcontrol_t nmbd_t:process { signal signull };
++
++allow smbcontrol_t winbind_t:process { signal signull };
++allow winbind_t smbcontrol_t:process signal;
++
++allow smbcontrol_t nmbd_var_run_t:file { read lock };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-08-07 09:42:35.000000000 -0400
@@ -8430,8 +8950,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.6.4/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-08-07 09:42:35.000000000 -0400
-@@ -709,3 +709,42 @@
++++ serefpolicy-2.6.4/policy/modules/services/ssh.if	2007-09-11 09:11:48.000000000 -0400
+@@ -521,6 +521,7 @@
+ 
+ 	optional_policy(`
+ 		kerberos_use($1_t)
++		kerberos_manage_host_rcache($1_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -709,3 +710,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -8510,6 +9038,83 @@
  ifdef(`TODO',`
  tunable_policy(`ssh_sysadm_login',`
  	# Relabel and access ptys created by sshd
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-2.6.4/policy/modules/services/telnet.te
+--- nsaserefpolicy/policy/modules/services/telnet.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/telnet.te	2007-09-11 09:05:30.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(telnet,1.4.0)
++policy_module(telnet,1.5.0)
+ 
+ ########################################
+ #
+@@ -32,7 +32,6 @@
+ allow telnetd_t self:udp_socket create_socket_perms;
+ # for identd; cjp: this should probably only be inetd_child rules?
+ allow telnetd_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
+-allow telnetd_t self:netlink_route_socket r_netlink_socket_perms;
+ allow telnetd_t self:capability { setuid setgid };
+ 
+ allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr };
+@@ -49,7 +48,8 @@
+ kernel_read_system_state(telnetd_t)
+ kernel_read_network_state(telnetd_t)
+ 
+-corenet_non_ipsec_sendrecv(telnetd_t)
++corenet_all_recvfrom_unlabeled(telnetd_t)
++corenet_all_recvfrom_netlabel(telnetd_t)
+ corenet_tcp_sendrecv_all_if(telnetd_t)
+ corenet_udp_sendrecv_all_if(telnetd_t)
+ corenet_tcp_sendrecv_all_nodes(telnetd_t)
+@@ -61,10 +61,12 @@
+ 
+ fs_getattr_xattr_fs(telnetd_t)
+ 
++auth_use_nsswitch(telnetd_t)
+ auth_rw_login_records(telnetd_t)
+ 
+ corecmd_search_bin(telnetd_t)
+ 
++files_read_usr_files(telnetd_t)
+ files_read_etc_files(telnetd_t)
+ files_read_etc_runtime_files(telnetd_t)
+ # for identd; cjp: this should probably only be inetd_child rules?
+@@ -79,9 +81,7 @@
+ 
+ miscfiles_read_localization(telnetd_t)
+ 
+-seutil_dontaudit_search_config(telnetd_t)
+-
+-sysnet_read_config(telnetd_t)
++seutil_read_config(telnetd_t)
+ 
+ remotelogin_domtrans(telnetd_t)
+ 
+@@ -89,17 +89,16 @@
+ optional_policy(`
+ 	kerberos_use(telnetd_t)
+ 	kerberos_read_keytab(telnetd_t)
++	kerberos_manage_host_rcache(telnetd_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(telnetd_t)
++tunable_policy(`use_nfs_home_dirs',`
++	fs_manage_nfs_dirs(telnetd_t)
++	fs_manage_nfs_files(telnetd_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(telnetd_t)
++tunable_policy(`use_samba_home_dirs',`
++	fs_manage_cifs_dirs(telnetd_t)
++	fs_manage_cifs_files(telnetd_t)
+ ')
+ 
+-ifdef(`TODO',`
+-# Allow krb5 telnetd to use fork and open /dev/tty for use
+-allow telnetd_t userpty_type:chr_file setattr;
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.6.4/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/tftp.te	2007-08-22 08:28:44.000000000 -0400
@@ -8574,6 +9179,25 @@
 +corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t)
 +
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.6.4/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2007-05-07 14:50:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/xfs.te	2007-09-11 08:17:28.000000000 -0400
+@@ -37,6 +37,15 @@
+ kernel_read_kernel_sysctls(xfs_t)
+ kernel_read_system_state(xfs_t)
+ 
++corenet_all_recvfrom_unlabeled(xfs_t)
++corenet_all_recvfrom_netlabel(xfs_t)
++corenet_tcp_sendrecv_generic_if(xfs_t)
++corenet_tcp_sendrecv_all_nodes(xfs_t)
++corenet_tcp_sendrecv_all_ports(xfs_t)
++corenet_tcp_bind_all_nodes(xfs_t)
++corenet_tcp_bind_xfs_port(xfs_t)
++corenet_sendrecv_xfs_client_packets(xfs_t)
++
+ corecmd_list_bin(xfs_t)
+ 
+ dev_read_sysfs(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.6.4/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/xserver.if	2007-08-07 09:42:35.000000000 -0400
@@ -10831,7 +11455,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te	2007-09-10 14:35:42.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.5.0)
@@ -11028,7 +11652,15 @@
  
  dev_read_urand(semanage_t)
  
-@@ -595,6 +611,8 @@
+@@ -581,6 +597,7 @@
+ files_read_etc_runtime_files(semanage_t)
+ files_read_usr_files(semanage_t)
+ files_list_pids(semanage_t)
++fs_list_inotifyfs(semanage_t)
+ 
+ mls_file_write_down(semanage_t)
+ mls_rangetrans_target(semanage_t)
+@@ -595,6 +612,8 @@
  
  # Running genhomedircon requires this for finding all users
  auth_use_nsswitch(semanage_t)
@@ -11037,7 +11669,7 @@
  
  libs_use_ld_so(semanage_t)
  libs_use_shared_libs(semanage_t)
-@@ -621,6 +639,15 @@
+@@ -621,6 +640,15 @@
  
  userdom_search_sysadm_home_dirs(semanage_t)
  
@@ -11053,7 +11685,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -700,6 +727,8 @@
+@@ -700,6 +728,8 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`



From fedora-extras-commits at redhat.com  Tue Sep 11 14:11:26 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:11:26 -0400
Subject: rpms/krb5/devel krb5-1.6.1-pam.patch,1.4,1.5
Message-ID: <200709111411.l8BEBQok003411@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3380

Modified Files:
	krb5-1.6.1-pam.patch 
Log Message:
- ftpd: also do PAM management for clients who use strong authentication


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krb5-1.6.1-pam.patch	17 Jul 2007 21:02:32 -0000	1.4
+++ krb5-1.6.1-pam.patch	11 Sep 2007 14:11:22 -0000	1.5
@@ -825,7 +825,24 @@
  #include <grp.h> 
  #include <setjmp.h>
  #ifndef POSIX_SETJMP
-@@ -903,6 +906,10 @@ end_login()
+@@ -803,6 +807,16 @@
+ 		}
+ #endif /* KRB5_KRB4_COMPAT */
+ 
++#ifdef USE_PAM
++		if (appl_pam_enabled(kcontext, "ftpd")) {
++			if (appl_pam_acct_mgmt(FTP_PAM_SERVICE, 0,
++					       pw->pw_name, "",
++					       FTP_PAM_SERVICE) != 0) {
++				reply(530, "Login incorrect.");
++				return;
++			}
++		}
++#endif
+ 		if (!authorized && authlevel == AUTHLEVEL_AUTHORIZE) {
+ 			strncat(buf, "; Access denied.",
+ 				sizeof(buf) - strlen(buf) - 1);
+@@ -903,6 +916,10 @@ end_login()
  	(void) krb5_seteuid((uid_t)0);
  	if (logged_in)
  		pty_logwtmp(ttyline, "", "");
@@ -836,7 +853,7 @@
  	if (have_creds) {
  #ifdef GSSAPI
  		krb5_cc_destroy(kcontext, ccache);
-@@ -1073,9 +1080,17 @@ pass(passwd)
+@@ -1073,9 +1090,17 @@ pass(passwd)
  		 *   kpass fails and the user has no local password
  		 *   kpass fails and the provided password doesn't match pw
  		 */
@@ -857,7 +874,7 @@
  			pw = NULL;
  			sleep(5);
  			if (++login_attempts >= 3) {
-@@ -1092,6 +1107,17 @@ pass(passwd)
+@@ -1092,6 +1117,17 @@ pass(passwd)
  	}
  	login_attempts = 0;		/* this time successful */
  
@@ -875,7 +892,7 @@
  	login(passwd, 0);
  	return;
  }
-@@ -1110,6 +1136,18 @@ login(passwd, logincode)
+@@ -1110,6 +1146,18 @@ login(passwd, logincode)
  		chown(tkt_string(), pw->pw_uid, pw->pw_gid);
  #endif
  	}
@@ -894,7 +911,7 @@
  
  	(void) krb5_setegid((gid_t)pw->pw_gid);
  	(void) initgroups(pw->pw_name, pw->pw_gid);
-@@ -2125,6 +2163,10 @@ dologout(status)
+@@ -2125,6 +2173,10 @@ dologout(status)
  		dest_tkt();
  #endif
  	}



From fedora-extras-commits at redhat.com  Tue Sep 11 14:12:06 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:12:06 -0400
Subject: rpms/krb5/devel krb5-1.6.1-selinux-label.patch,1.2,1.3
Message-ID: <200709111412.l8BEC69I003545@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3423

Modified Files:
	krb5-1.6.1-selinux-label.patch 
Log Message:
- also label kadmind log files and files created by the db2 plugin


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- krb5-1.6.1-selinux-label.patch	25 Aug 2007 04:31:34 -0000	1.2
+++ krb5-1.6.1-selinux-label.patch	11 Sep 2007 14:12:03 -0000	1.3
@@ -417,16 +417,16 @@
  #include "krb.h"
  #include "krb4int.h"
  #include <stdio.h>
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-08-24 23:38:39.000000000 -0400
-@@ -58,6 +58,7 @@
- #include <string.h>
- #include <unistd.h>
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2000-07-02 23:43:42.000000000 -0400
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c	2007-09-06 12:36:18.000000000 -0400
+@@ -60,6 +60,7 @@
  
-+#include "k5-label.h"
  #include "db-int.h"
  #include "btree.h"
++#include "k5-label.h"
  
+ #ifdef DEBUG
+ #undef	MINPSIZE
 --- krb5-1.6.1/src/plugins/kdb/db2/libdb2/configure.in	2007-08-25 03:19:00.000000000 -0400
 +++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/configure.in	2007-08-24 23:38:41.000000000 -0400
 @@ -89,6 +89,8 @@
@@ -438,16 +438,16 @@
  KRB5_BUILD_LIBRARY
  KRB5_BUILD_LIBOBJS
  KRB5_BUILD_PROGRAM
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-08-24 23:38:39.000000000 -0400
-@@ -51,6 +51,7 @@
- #include <assert.h>
- #endif
- 
-+#include "k5-label.h"
- #include "db-int.h"
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2006-06-14 22:35:44.000000000 -0400
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/hash/hash.c	2007-09-06 12:37:15.000000000 -0400
+@@ -55,6 +55,7 @@
  #include "hash.h"
  #include "page.h"
+ #include "extern.h"
++#include "k5-label.h"
+ 
+ static int32_t flush_meta __P((HTAB *));
+ static int32_t hash_access __P((HTAB *, ACTION, const DBT *, DBT *));
 --- krb5-1.6.1/src/plugins/kdb/db2/libdb2/include/config.h.in	2007-04-20 19:39:29.000000000 -0400
 +++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/include/config.h.in	2007-08-24 23:44:21.000000000 -0400
 @@ -39,6 +39,9 @@
@@ -484,16 +484,16 @@
  /* Define to empty if `const' does not conform to ANSI C. */
  #undef const
  
---- krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-08-25 03:19:01.000000000 -0400
-+++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-08-24 23:38:39.000000000 -0400
-@@ -51,6 +51,7 @@
- #include <stdio.h>
- #include <unistd.h>
+--- krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	1998-01-21 11:33:31.000000000 -0500
++++ krb5-1.6.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c	2007-09-06 12:36:52.000000000 -0400
+@@ -53,6 +53,7 @@
  
-+#include "k5-label.h"
  #include "db-int.h"
  #include "recno.h"
++#include "k5-label.h"
  
+ DB *
+ __rec_open(fname, flags, mode, openinfo, dflags)
 --- krb5-1.6.1/src/plugins/preauth/cksum_body/config.h.in	2007-04-20 19:39:45.000000000 -0400
 +++ krb5-1.6.1/src/plugins/preauth/cksum_body/config.h.in	2007-08-24 23:46:17.000000000 -0400
 @@ -39,6 +39,9 @@



From fedora-extras-commits at redhat.com  Tue Sep 11 14:12:30 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:12:30 -0400
Subject: rpms/pm-utils/F-7 .cvsignore, 1.26, 1.27 pm-utils.spec, 1.65,
	1.66 sources, 1.32, 1.33 pm-utils-0.99.3-selinux.patch, 1.1,
	NONE radeontool-1.5.diff, 1.1,
	NONE radeontool-fix-option-handling.diff, 1.2,
	NONE radeontool-get-rid-of-lspci.diff, 1.1,
	NONE vbetool-0.3-fix-gcc4bug.patch, 1.3, NONE vbetool-libz.patch,
	1.2, NONE
Message-ID: <200709111412.l8BECUIX003571@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466

Modified Files:
	.cvsignore pm-utils.spec sources 
Removed Files:
	pm-utils-0.99.3-selinux.patch radeontool-1.5.diff 
	radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff vbetool-0.3-fix-gcc4bug.patch 
	vbetool-libz.patch 
Log Message:
sync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Mar 2007 14:09:36 -0000	1.26
+++ .cvsignore	11 Sep 2007 14:11:56 -0000	1.27
@@ -1,3 +1 @@
-radeontool-1.5.tar.gz
-vbetool_0.7-1.tar.gz
-pm-utils-0.99.3.tar.gz
+pm-utils-0.99.4.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pm-utils.spec	3 Jul 2007 22:44:14 -0000	1.65
+++ pm-utils.spec	11 Sep 2007 14:11:56 -0000	1.66
@@ -1,11 +1,16 @@
 Name: pm-utils
-Summary: Power management utilities and scripts for Fedora Core
-License: GPL
-Version: 0.99.3
-Release: 9%{?dist}
+Summary: Power management utilities and scripts for Fedora
+License: GPLv2
+Version: 0.99.4
+Release: 2%{?dist}
 Group: System Environment/Base
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
+URL: http://pm-utils.freedesktop.org
+ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
+Requires: radeontool
+%ifnarch ppc ppc64
+Requires: vbetool
+%endif
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -19,106 +24,33 @@
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
-%define vbever 0.7
-Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
-Source20: radeontool-1.5.tar.gz
-%ifarch i386 x86_64
-Obsoletes: vbetool
-Provides: vbetool
-Obsoletes: radeontool
-Provides: radeontool
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90, zlib-devel
+BuildRequires: hal-devel pkgconfig
+BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
-Patch2: pm-utils-0.99.3-vbe-redirect.patch
-Patch3: pm-utils-0.99.3-cfg.patch
-Patch4: pm-utils-0.99.3-selinux.patch
-
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-libz.patch
-
-Patch20: radeontool-1.5.diff
-Patch21: radeontool-fix-option-handling.diff
-Patch22: radeontool-get-rid-of-lspci.diff
+Patch2: pm-utils-0.99.3-cfg.patch
+
 
 %description
-The pm-utils package contains utilities and scripts for Fedora Core
-useful for power management.
+The pm-utils package contains utilities and scripts useful for tasks related
+to power management.
 
 %prep
-%setup -q -a 10 -a 20
+%setup -q 
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
-%patch2 -p1 -b .vbe-redirect
-%patch3 -p1 -b .cfg
-%patch4 -p1 -b .selinux
-
-%patch10 -p0 -b .gcc4
-%patch11 -p0 -b .zlib
-
-cd radeontool-1.5
-%patch20 -p0 -b .volatile
-%patch21 -p0 -b .options
-%patch22 -p0 -b .no-lspci
-cd ..
+%patch2 -p1 -b .cfg
 
-%build
-cd vbetool-%{vbever}
-%ifarch i386
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
 
-%ifarch i386 x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-./configure --host=%{_host} --build=%{_build} \
-	--target=%{_target_platform} \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_exec_prefix}/lib \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}
+%build
+%configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch i386 x86_64
-cd vbetool-%{vbever}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-cd radeontool-1.5
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}
-cd ..
-%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -161,32 +93,65 @@
 
 %files
 %defattr(-,root,root)
-%{_sysconfdir}/pm/*
+%{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
-%{_exec_prefix}/lib/pm-utils/bin/*
+%dir %{_exec_prefix}/lib/pm-utils/
+%{_exec_prefix}/lib/pm-utils/bin/
 %{_exec_prefix}/lib/pm-utils/defaults
 %{_exec_prefix}/lib/pm-utils/functions
-%{_exec_prefix}/lib/pm-utils/power.d/*
-%{_exec_prefix}/lib/pm-utils/sleep.d/*
+%{_exec_prefix}/lib/pm-utils/power.d/
+%{_exec_prefix}/lib/pm-utils/sleep.d/
 %{_bindir}/*
-%{_sbindir}/*
+%{_sbindir}/pm-hibernate
+%{_sbindir}/pm-powersave
+%{_sbindir}/pm-suspend
+%{_sbindir}/pm-suspend-hybrid
+
 %{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
-* Tue Jul 03 2007 Peter Jones <pjones at redhat.com> - 0.99.3-9
-- Fix a config file bug
-- Rebuild...
+* Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
+- Require vbetool not on ppc and ppc64
+
+* Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
+- Merge new upstream
+- remove pm/power.d/laptop-tools
+- add --quirk-reset-brightness (needed for the Fujitsu Lifebook S7110)
+
+* Sat Sep 08 2007 Till Maas <opensource till name> - 0.99.3-12
+- Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
+- remove (C|CXX|F)FLAGS definitions, they are already in %%configure
+- remove Core in Summary tag
+- add URL for pm-utils
+- add %%{?arm} to ExclusiveArch (#245463)
+- remove vbetool and require it (it is a separate package now)
+- remove radeontool and require it (it is a separate package now)
+- Update License Tag
+- cleanup buildrequires
+- clear %%setup
+
+* Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
+- Install (not just build) vbetool and radeontool on x86_64 too
+- Explicitly list files under %%_sbindir, so they don't drop away again
+- Light spec cleanups
+
+* Thu Aug 16 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-10
+- License verification and update
+
+* Wed Jul 18 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-9
+- Fixed description to be distribution independant (#247366)
 
 * Thu Jun 07 2007 Peter Jones <pjones at redhat.com> - 0.99.3-8
 - Bump release and rebuild for newer buildsystem code
 
-* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6.1
-- Bump release and rebuild due to missing binaries
+* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-7
+- Bump release and rebuild
 
-* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 0.99.3-6
-- Don't remove the logfile before creating it.
+* Tue May 29 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6
+- Fixed missing builds for vbetool and radeontool for some archs (#241469)
+- Fixed typo in functions where wrong variable was used (#241633)
 
 * Wed May 16 2007 Peter Jones <pjones at redhat.com> - 0.99.3-5
 - ... and create the directory the logfile goes in.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2007 14:20:54 -0000	1.32
+++ sources	11 Sep 2007 14:11:56 -0000	1.33
@@ -1,3 +1 @@
-8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
-0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz
+a88503876f63c96b55784be91b6458d2  pm-utils-0.99.4.tar.gz


--- pm-utils-0.99.3-selinux.patch DELETED ---


--- radeontool-1.5.diff DELETED ---


--- radeontool-fix-option-handling.diff DELETED ---


--- radeontool-get-rid-of-lspci.diff DELETED ---


--- vbetool-0.3-fix-gcc4bug.patch DELETED ---


--- vbetool-libz.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 14:13:11 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 10:13:11 -0400
Subject: rpms/krb5/devel krb5.spec,1.134,1.135
Message-ID: <200709111413.l8BEDBm0003618@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3579

Modified Files:
	krb5.spec 
Log Message:
- also perform PAM session and credential management when ftpd accepts a
  client using strong authentication, missed earlier
- also label kadmind log files and files created by the db2 plugin



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- krb5.spec	6 Sep 2007 20:09:14 -0000	1.134
+++ krb5.spec	11 Sep 2007 14:12:38 -0000	1.135
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 6%{?dist}
+Release: 7%{?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
@@ -208,6 +208,11 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-7
+- also perform PAM session and credential management when ftpd accepts a
+  client using strong authentication, missed earlier
+- also label kadmind log files and files created by the db2 plugin
+
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
 - incorporate updated fix for CVE-2007-3999
 - fix incorrect call to "test" in the kadmin init script



From fedora-extras-commits at redhat.com  Tue Sep 11 14:14:18 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 10:14:18 -0400
Subject: rpms/ode/devel .cvsignore,1.4,1.5 ode.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200709111414.l8BEEI1Q003735@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3670

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
- New upstream release 0.8.1-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Feb 2007 16:09:47 -0000	1.4
+++ .cvsignore	11 Sep 2007 14:13:44 -0000	1.5
@@ -1 +1 @@
-ode-src-0.8.zip
+ode-src-0.8.1-rc1.zip


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ode.spec	15 Aug 2007 08:27:51 -0000	1.7
+++ ode.spec	11 Sep 2007 14:13:44 -0000	1.8
@@ -1,11 +1,13 @@
+%define prever rc1
+
 Name:           ode
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        0.1.%{prever}%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
 License:        BSD or LGPLv2+
 URL:            http://www.ode.org
-Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}.zip
+Source0:        http://downloads.sourceforge.net/opende/ode-src-%{version}-%{prever}.zip
 Patch0:         ode-0.6-configure.patch
 Patch1:         ode-0.8-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +33,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{prever}
 %patch0 -p1 -z .configure
 %patch1 -p1 -z .install
 # sigh stop autoxxx from rerunning because of our patches above.
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
+- New upstream release 0.8.1-rc1
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Feb 2007 16:09:47 -0000	1.4
+++ sources	11 Sep 2007 14:13:44 -0000	1.5
@@ -1 +1 @@
-fb7462ba0af2fbc230cb1b3f79e0acbb  ode-src-0.8.zip
+4c8de285f55460ae3a2385fb607270e7  ode-src-0.8.1-rc1.zip



From fedora-extras-commits at redhat.com  Tue Sep 11 14:15:34 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:15:34 -0400
Subject: rpms/vbetool/F-7 vbetool-0.3-fix-gcc4bug.patch, NONE,
	1.1 vbetool-libz.patch, NONE, 1.1 vbetool.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709111415.l8BEFY8U003914@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3862

Modified Files:
	sources 
Added Files:
	vbetool-0.3-fix-gcc4bug.patch vbetool-libz.patch vbetool.spec 
Log Message:
sync with devel


vbetool-0.3-fix-gcc4bug.patch:

--- NEW FILE vbetool-0.3-fix-gcc4bug.patch ---
--- vbetool-0.7/vbetool.c.gcc4	2006-07-25 21:27:21.000000000 -0400
+++ vbetool-0.7/vbetool.c	2007-02-20 13:29:22.000000000 -0500
@@ -345,9 +345,10 @@
 {
 	int size;
 	char *buffer = __save_state(&size);
+	ssize_t num_written;
 
 	if (buffer)
-		write(1, buffer, size);	/* FIXME: should retry on short write); */
+		num_written = write(1, buffer, size);	/* FIXME: should retry on short write); */
 }
 
 int do_blank(int state)

vbetool-libz.patch:

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
 SUBDIRS = x86emu
 @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
 @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
+ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_FALSE at x86lib = ""
 man_MANS = vbetool.1
 vbetool_SOURCES = vbetool.c $(x86)


--- NEW FILE vbetool.spec ---
Name:           vbetool
Version:        0.7
Release:        2%{?dist}
Summary:        Run real-mode video BIOS code to alter hardware state

Group:          System Environment/Base
License:        GPLv2
URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
Patch10:        vbetool-0.3-fix-gcc4bug.patch
Patch11:        vbetool-libz.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel pciutils-devel
# does not build on ppc and ppc64
ExcludeArch:    ppc ppc64
# vbetool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch.


%prep
%setup -q
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .zlib


%build
%ifarch x86_64
%configure --with-x86emu
%else
%configure
%endif
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 COPYING
%{_sbindir}/vbetool
%{_mandir}/man1/vbetool.1.gz


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> 0.7-2
- ExcludeArch: ppc and ppc64 (does not build there)
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 0.7-1
- initial release for Fedora with patches from the pm-utils package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:33:51 -0000	1.1
+++ sources	11 Sep 2007 14:15:00 -0000	1.2
@@ -0,0 +1 @@
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 14:19:39 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 10:19:39 -0400
Subject: rpms/radeontool/F-7 radeontool-1.5.diff, NONE,
	1.1 radeontool-fix-option-handling.diff, NONE,
	1.1 radeontool-get-rid-of-lspci.diff, NONE, 1.1 radeontool.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709111419.l8BEJdmA004163@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/radeontool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4093

Modified Files:
	sources 
Added Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff radeontool.spec 
Log Message:
sync with devel


radeontool-1.5.diff:

--- NEW FILE radeontool-1.5.diff ---
--- radeontool.c
+++ radeontool.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <asm/page.h>
 
 #include "radeon_reg.h"
 
@@ -30,7 +29,7 @@
 
 /* *radeon_cntl_mem is mapped to the actual device's memory mapped control area. */
 /* Not the address but what it points to is volatile. */
-unsigned char * volatile radeon_cntl_mem;
+volatile unsigned char * radeon_cntl_mem;
 
 static void fatal(char *why)
 {
@@ -47,7 +46,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    value = *(unsigned long * volatile)(radeon_cntl_mem+offset);  
+    value = *(volatile unsigned long *)(radeon_cntl_mem+offset);  
     if(debug) 
         printf("%08lx\n",value);
     return value;
@@ -60,7 +59,7 @@
         printf("internal error\n");
 	exit(-2);
     };
-    *(unsigned long * volatile)(radeon_cntl_mem+offset) = value;  
+    *(volatile unsigned long *)(radeon_cntl_mem+offset) = value;  
 }
 
 static void usage(void)
@@ -83,10 +82,10 @@
 /* with /dev/mem, then I could write this whole program in perl, */
 /* but sadly this is only the size of physical RAM.  If you */
 /* want to be truely bad and poke into device memory you have to mmap() */
-static unsigned char * map_devince_memory(unsigned int base,unsigned int length) 
+static volatile unsigned char * map_device_memory(unsigned int base,unsigned int length) 
 {
     int mem_fd;
-    unsigned char *device_mem;
+    volatile unsigned char *device_mem;
 
     /* open /dev/mem */
     if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
@@ -94,12 +93,12 @@
     }
 
     /* mmap graphics memory */
-    if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
+    if ((device_mem = malloc(length + (getpagesize()-1))) == NULL) {
         fatal("allocation error \n");
     }
-    if ((unsigned long)device_mem % PAGE_SIZE)
-        device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
-    device_mem = (unsigned char *)mmap(
+    if ((unsigned long)device_mem % getpagesize())
+        device_mem += getpagesize() - ((unsigned long)device_mem % getpagesize());
+    device_mem = (volatile unsigned char *)mmap(
         (caddr_t)device_mem, 
         length,
         PROT_READ|PROT_WRITE,
@@ -107,9 +106,9 @@
         mem_fd, 
         base
     );
-    if ((long)device_mem < 0) {
+    if (device_mem == (volatile unsigned char *)-1) {
         if(debug)
-            fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+            fprintf(stderr,"mmap returned %d\n",(int)(long)device_mem);
         fatal("mmap error \n");
     }
     return device_mem;
@@ -316,7 +315,7 @@
     }
     if(debug)
         printf("Radeon found. Base control address is %x.\n",base);
-    radeon_cntl_mem = map_devince_memory(base,0x2000);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
 }
 
 int main(int argc,char *argv[]) 

radeontool-fix-option-handling.diff:

--- NEW FILE radeontool-fix-option-handling.diff ---
--- radeontool.c.options	2007-02-20 14:48:20.000000000 -0500
+++ radeontool.c	2007-02-20 14:53:07.000000000 -0500
@@ -320,18 +320,21 @@
 
 int main(int argc,char *argv[]) 
 {
+    int found_other = 0;
+    while (argc > 1 && !found_other) {
+        if(strcmp(argv[1],"--debug") == 0) {
+            debug=1;
+            argv++; argc--;
+        } else if(strncmp(argv[1],"--skip=",7) == 0) {
+            skip=atoi(argv[1]+7);
+            argv++; argc--;
+        } else {
+            found_other = 1;
+        }
+    }
     if(argc == 1) {
-        map_radeon_cntl_mem();
 	usage();
     }
-    if(strcmp(argv[1],"--debug") == 0) {
-        debug=1;
-        argv++; argc--;
-    };
-    if(strcmp(argv[1],"--skip=") == 0) {
-        skip=atoi(argv[1]+7);
-        argv++; argc--;
-    };
     map_radeon_cntl_mem();
     if(argc == 2) {
         if(strcmp(argv[1],"regs") == 0) {

radeontool-get-rid-of-lspci.diff:

--- NEW FILE radeontool-get-rid-of-lspci.diff ---
--- radeontool.c	2006/02/22 11:07:50	1.3
+++ radeontool.c	2006/03/08 00:37:25
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <pci/pci.h>
 
 #include "radeon_reg.h"
 
@@ -231,7 +232,7 @@ void radeon_cmd_stretch(char *param)
     radeon_set(RADEON_FP_VERT_STRETCH,"RADEON_FP_VERT_STRETCH",fp_vert_stretch);
 }
 
-
+#if 0
 /* Here we fork() and exec() the lspci command to look for the Radeon hardware address. */
 static void map_radeon_cntl_mem(void)
 {
@@ -317,6 +318,62 @@ We need to look through it to find the s
         printf("Radeon found. Base control address is %x.\n",base);
     radeon_cntl_mem = map_device_memory(base,0x2000);
 }
+#else
+static u32
+conf2long(unsigned char *c, unsigned int p)
+{
+    return c[p] | (c[p+1] << 8) | (c[p+2] << 16) | (c[p+3] << 24);
+}
+
+static void map_radeon_cntl_mem(void)
+{
+    struct pci_access *pacc;
+    struct pci_dev *dev;
+    unsigned int class;
+    int i;
+    int base = -1;
+    unsigned char *config;
+
+    config = malloc(64);
+    if (!config)
+        fatal("malloc(64) failed\n");
+    pacc = pci_alloc();
+    pci_init(pacc);
+    pci_scan_bus(pacc);
+    for(dev=pacc->devices; dev; dev=dev->next) {            /* Iterate over all devices */
+        pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);/* Fill in header info we need */
+        class = pci_read_word(dev, PCI_CLASS_DEVICE);       /* Read config register directly */
+        if (dev->vendor_id == 0x1002 && class == 0x300) {   /* ATI && Graphics card */
+            if (debug)
+                printf("Found: %02x:%02x.%d vendor=%04x device=%04x class=%04x\n",
+                       dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id, class);
+            if (skip-- < 1) {
+                pci_read_block(dev, 0, config, 64);
+                for (i=0; i<6; i++){
+                    u32 flag = conf2long(config, PCI_BASE_ADDRESS_0 + 4*i);
+                    if (flag & PCI_BASE_ADDRESS_SPACE_IO)   /* I/O-Ports, not memory */
+                        continue;
+                    /* the original code parsed lspci for "emory" and "K", so it
+                     * has to be at least 1K and less than 1M
+                     */
+                    if (dev->size[i] >=1024 && dev->size[i] < 1024*1024) {
+                        base = dev->base_addr[i];
+                        goto found;
+                    }
+                }
+            }
+        }
+    }
+ found:
+    pci_cleanup(pacc);
+    free(config);
+    if (base == -1)
+        fatal("Radeon not found.\n");
+    if (debug)
+        printf("Radeon found. Base control address is %x.\n",base);
+    radeon_cntl_mem = map_device_memory(base,0x2000);
+}
+#endif
 
 int main(int argc,char *argv[]) 
 {

--- Makefile.no-lspci	2007-02-20 14:56:57.000000000 -0500
+++ Makefile	2007-02-20 14:56:42.000000000 -0500
@@ -1,7 +1,7 @@
 
 
 radeontool: radeontool.c
-	gcc -Wall -O2 radeontool.c -o radeontool
+	gcc -Wall -O2 radeontool.c -o radeontool -lpci
 
 
 



--- NEW FILE radeontool.spec ---
Name:           radeontool
Version:        1.5
Release:        2%{?dist}
Summary:        Backlight and video output configuration tool for radeon cards

Group:          System Environment/Base
License:        zlib
URL:            http://fdd.com/software/radeon/
Source0:        http://fdd.com/software/radeon/radeontool-%{version}.tar.gz
Patch20:        radeontool-1.5.diff
Patch21:        radeontool-fix-option-handling.diff
Patch22:        radeontool-get-rid-of-lspci.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pciutils-devel zlib-devel
# radeontool is included in (some of) these pm-utils releases
Conflicts:      pm-utils <= 0.99.3-11


%description
Radeontool may switch the backlight and external video output on and off.  Use
radeontool at your own risk, it may damage your hardware.


%prep
%setup -q
%patch20 -p0 -b .volatile
%patch21 -p0 -b .options
%patch22 -p0 -b .no-lspci


%build
gcc $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT

install -D -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}/radeontool


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES
%{_sbindir}/radeontool


%changelog
* Fri Sep 07 2007 Till Maas <opensource till name> - 1.5-2
- add Conflicts with old pm-utils package

* Fri Aug 31 2007 Till Maas <opensource till name> - 1.5-1
- initial release for Fedora with patches from pm-utils package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/radeontool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:23:11 -0000	1.1
+++ sources	11 Sep 2007 14:19:06 -0000	1.2
@@ -0,0 +1 @@
+8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 14:26:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 11 Sep 2007 10:26:21 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch, NONE, 1.1 flac.spec,
	1.30, 1.31 flac-1.1.3-gnu-stack.patch, 1.1, NONE
Message-ID: <200709111426.l8BEQL5k004525@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453

Modified Files:
	flac.spec 
Added Files:
	flac-1.2.0-gnu-stack.patch 
Removed Files:
	flac-1.1.3-gnu-stack.patch 
Log Message:
* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
- Update GNU stack patch to cover all the NASM sources used


flac-1.2.0-gnu-stack.patch:

--- NEW FILE flac-1.2.0-gnu-stack.patch ---
diff -upr flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
@@ -563,4 +563,6 @@ cident FLAC__bitreader_read_rice_signed_
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+	section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -116,4 +116,6 @@ cident FLAC__cpu_info_extended_amd_asm_i
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -307,4 +307,6 @@ cident FLAC__fixed_compute_best_predicto
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
@@ -1506,4 +1506,6 @@ cident FLAC__lpc_restore_signal_asm_ia32
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+       section .note.GNU-stack noalloc
+%endif
diff -upr flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm
--- flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
+++ flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
@@ -154,4 +154,6 @@ cident precompute_partition_info_sums_32
 
 end
 
-section .note.GNU-stack progbits noalloc noexec nowrite align=1
+%ifdef OBJ_FORMAT_elf
+	section .note.GNU-stack noalloc
+%endif


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- flac.spec	10 Sep 2007 21:59:47 -0000	1.30
+++ flac.spec	11 Sep 2007 14:25:48 -0000	1.31
@@ -1,11 +1,11 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch1: flac-1.1.3-gnu-stack.patch
+Patch1: flac-1.2.0-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
@@ -72,7 +72,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0
+* Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
+- Update GNU stack patch to cover all the NASM sources used
+
+* Mon Sep 10 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-1
 - Update for 1.20 and drop obsolete patches (#285161)
 
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1.1.4-5


--- flac-1.1.3-gnu-stack.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 14:26:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 10:26:40 -0400
Subject: rpms/librsvg2/devel filter-leak.patch, NONE, 1.1 stack-leak.patch, 
	NONE, 1.1 librsvg2.spec, 1.63, 1.64
Message-ID: <200709111426.l8BEQeBH004530@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/librsvg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494

Modified Files:
	librsvg2.spec 
Added Files:
	filter-leak.patch stack-leak.patch 
Log Message:
fix memory leaks


filter-leak.patch:

--- NEW FILE filter-leak.patch ---
diff -up librsvg-2.18.2/rsvg-filter.c.filter-leak librsvg-2.18.2/rsvg-filter.c
--- librsvg-2.18.2/rsvg-filter.c.filter-leak	2007-09-11 10:03:39.000000000 -0400
+++ librsvg-2.18.2/rsvg-filter.c	2007-09-11 10:04:24.000000000 -0400
@@ -703,7 +703,6 @@ rsvg_new_filter (void)
     filter->y = _rsvg_css_parse_length ("-10%");
     filter->width = _rsvg_css_parse_length ("120%");
     filter->height = _rsvg_css_parse_length ("120%");
-    filter->super.children = g_ptr_array_new ();
     filter->super.set_atts = rsvg_filter_set_args;
     return (RsvgNode *) filter;
 }
@@ -1702,7 +1701,6 @@ rsvg_new_filter_primitive_merge (void)
     filter->super.super.free = &rsvg_filter_primitive_merge_free;
 
     filter->super.super.set_atts = rsvg_filter_primitive_merge_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -2201,7 +2199,6 @@ rsvg_new_filter_primitive_component_tran
 
     filter->super.super.set_atts = rsvg_filter_primitive_component_transfer_set_atts;
 
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -4088,7 +4085,6 @@ rsvg_new_filter_primitive_diffuse_lighti
     filter->super.render = &rsvg_filter_primitive_diffuse_lighting_render;
     filter->super.super.free = &rsvg_filter_primitive_diffuse_lighting_free;
     filter->super.super.set_atts = rsvg_filter_primitive_diffuse_lighting_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 
@@ -4267,7 +4263,6 @@ rsvg_new_filter_primitive_specular_light
     filter->super.render = &rsvg_filter_primitive_specular_lighting_render;
     filter->super.super.free = &rsvg_filter_primitive_specular_lighting_free;
     filter->super.super.set_atts = rsvg_filter_primitive_specular_lighting_set_atts;
-    filter->super.super.children = g_ptr_array_new ();
     return (RsvgNode *) filter;
 }
 

stack-leak.patch:

--- NEW FILE stack-leak.patch ---
diff -up librsvg-2.18.2/rsvg-cairo-draw.c.stack-leak librsvg-2.18.2/rsvg-cairo-draw.c
--- librsvg-2.18.2/rsvg-cairo-draw.c.stack-leak	2007-09-11 09:34:39.000000000 -0400
+++ librsvg-2.18.2/rsvg-cairo-draw.c	2007-09-11 09:35:03.000000000 -0400
@@ -981,7 +981,7 @@ rsvg_cairo_pop_render_stack (RsvgDrawing
         GdkPixbuf *pixbuf = render->pixbuf_stack->data;
         GdkPixbuf *bg = rsvg_compile_bg (ctx);
 
-        render->pixbuf_stack = g_list_remove_link (render->pixbuf_stack, render->pixbuf_stack);
+        render->pixbuf_stack = g_list_remove (render->pixbuf_stack, pixbuf);
 
 
         output = rsvg_filter_render (state->filter, pixbuf, bg, ctx, &render->bbox, "2103");


Index: librsvg2.spec
===================================================================
RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- librsvg2.spec	4 Sep 2007 03:38:15 -0000	1.63
+++ librsvg2.spec	11 Sep 2007 14:26:07 -0000	1.64
@@ -12,11 +12,13 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 Source: 	http://download.gnome.org/sources/librsvg/2.18/librsvg-%{version}.tar.bz2
+Patch0:		stack-leak.patch
+Patch1:		filter-leak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	gtk2 >= %{gtk2_version}
 Requires:	libxml2 >= %{libxml2_version}
@@ -63,6 +65,8 @@
 
 %prep
 %setup -q -n librsvg-%{version}
+%patch0 -p1 -b .stack-leak
+%patch1 -p1 -b .filter-leak
 
 %build
 %configure --with-svgz \
@@ -118,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
+- Plug memory leaks
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 



From fedora-extras-commits at redhat.com  Tue Sep 11 14:33:56 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 11 Sep 2007 10:33:56 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch,1.1,1.2
Message-ID: <200709111433.l8BEXuCE004825@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4800

Modified Files:
	flac-1.2.0-gnu-stack.patch 
Log Message:
And the same patch in the right direction...


flac-1.2.0-gnu-stack.patch:

Index: flac-1.2.0-gnu-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac-1.2.0-gnu-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:25:48 -0000	1.1
+++ flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
@@ -1,55 +1,55 @@
-diff -upr flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
-@@ -563,4 +563,6 @@ cident FLAC__bitreader_read_rice_signed_
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 01:54:17.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-11 15:21:48.000000000 +0100
+@@ -563,6 +563,4 @@ cident FLAC__bitreader_read_rice_signed_
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -116,4 +116,6 @@ cident FLAC__cpu_info_extended_amd_asm_i
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm	2007-09-11 15:21:59.000000000 +0100
+@@ -116,6 +116,4 @@ cident FLAC__cpu_info_extended_amd_asm_i
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -307,4 +307,6 @@ cident FLAC__fixed_compute_best_predicto
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm	2007-09-11 15:22:06.000000000 +0100
+@@ -307,6 +307,4 @@ cident FLAC__fixed_compute_best_predicto
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
-@@ -1506,4 +1506,6 @@ cident FLAC__lpc_restore_signal_asm_ia32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm	2007-03-22 03:13:11.000000000 +0000
++++ flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm	2007-09-11 15:22:13.000000000 +0100
+@@ -1506,6 +1506,4 @@ cident FLAC__lpc_restore_signal_asm_ia32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+       section .note.GNU-stack noalloc
-+%endif
-diff -upr flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm
---- flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
-+++ flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
-@@ -154,4 +154,6 @@ cident precompute_partition_info_sums_32
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm
+--- flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-06-20 02:23:49.000000000 +0100
++++ flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm	2007-09-11 15:22:21.000000000 +0100
+@@ -154,6 +154,4 @@ cident precompute_partition_info_sums_32
  
  end
  
--section .note.GNU-stack progbits noalloc noexec nowrite align=1
-+%ifdef OBJ_FORMAT_elf
-+	section .note.GNU-stack noalloc
-+%endif
+-%ifdef OBJ_FORMAT_elf
+-	section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1



From fedora-extras-commits at redhat.com  Tue Sep 11 14:35:23 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 11 Sep 2007 10:35:23 -0400
Subject: rpms/libpng10/devel .cvsignore, 1.5, 1.6 libpng10.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200709111435.l8BEZNt1004940@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4891

Modified Files:
	.cvsignore libpng10.spec sources 
Log Message:
update to 1.0.28


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Aug 2007 13:00:16 -0000	1.5
+++ .cvsignore	11 Sep 2007 14:34:50 -0000	1.6
@@ -1 +1 @@
-libpng-1.0.27.tar.bz2
+libpng-1.0.28.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libpng10.spec	20 Aug 2007 13:00:16 -0000	1.8
+++ libpng10.spec	11 Sep 2007 14:34:50 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.27
+Version:	1.0.28
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Tue Sep 11 2007 Paul Howarth <paul at city-fan.org> 1.0.28-1
+- update to 1.0.28
+
 * Mon Aug 20 2007 Paul Howarth <paul at city-fan.org> 1.0.27-1
 - update to 1.0.27
 - add new file ANNOUNCE, which lists changes since last release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Aug 2007 13:00:16 -0000	1.5
+++ sources	11 Sep 2007 14:34:50 -0000	1.6
@@ -1 +1 @@
-bd00ab16a9a5168b53747eb13d66ad57  libpng-1.0.27.tar.bz2
+ed06dd7c54594b41276df24926e29f04  libpng-1.0.28.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 14:47:35 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 10:47:35 -0400
Subject: rpms/ksirk/F-7 ksirk.spec,1.1,1.2
Message-ID: <200709111447.l8BElZAg005324@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	ksirk.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
- Release increment for rebuild due to koji weirdness



Index: ksirk.spec
===================================================================
RCS file: /cvs/extras/rpms/ksirk/F-7/ksirk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksirk.spec	10 Sep 2007 07:50:24 -0000	1.1
+++ ksirk.spec	11 Sep 2007 14:47:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ksirk
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turnbased multiplayer board strategy game (conquer the world!)
 Group:          Amusements/Games
 License:        GPLv2
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-3
+- Release increment for rebuild due to koji weirdness
+
 * Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-2
 - Add missing gettext BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:01:12 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Tue, 11 Sep 2007 11:01:12 -0400
Subject: rpms/samba/devel .cvsignore, 1.43, 1.44 filter-requires-samba.sh,
	1.5, 1.6 samba.spec, 1.133, 1.134 sources, 1.47,
	1.48 samba-3.0.25-imdap-basedn.patch, 1.1,
	NONE samba3-glibc-open.patch, 1.1,
	NONE samba3_idmap_ldap_memleak.patch, 1.1, NONE
Message-ID: <200709111501.l8BF1C5q011655@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5735

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec sources 
Removed Files:
	samba-3.0.25-imdap-basedn.patch samba3-glibc-open.patch 
	samba3_idmap_ldap_memleak.patch 
Log Message:

Security and Bugfix release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	21 Aug 2007 13:27:26 -0000	1.43
+++ .cvsignore	11 Sep 2007 15:00:39 -0000	1.44
@@ -1 +1 @@
-samba-3.0.25c.tar.gz
+samba-3.0.26a.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/filter-requires-samba.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filter-requires-samba.sh	14 Mar 2007 10:21:24 -0000	1.5
+++ filter-requires-samba.sh	11 Sep 2007 15:00:39 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8|smbldap_tools)'


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- samba.spec	24 Aug 2007 18:02:18 -0000	1.133
+++ samba.spec	11 Sep 2007 15:00:39 -0000	1.134
@@ -1,8 +1,8 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25c
-Release: 4%{?dist}
+Version: 3.0.26a
+Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -41,9 +41,6 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch210: samba-3.0.25-imdap-basedn.patch
-Patch211: samba3_idmap_ldap_memleak.patch
-Patch300: samba3-glibc-open.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -161,9 +158,6 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
-%patch210 -p1 -b .idmap_basedn
-%patch211 -p0 -b .idmap_ldap_memleak
-%patch300 -p0 -b .glibc_open
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -646,6 +640,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
+- upgrade to the latest upstream realease
+- includes security fixes released today in 3.0.26
+
 * Tue Aug 24 2007 Simo Sorce <ssorce at redhat.com> 3.0.25c-4.fc8
 - add fix reported upstream for heavy idmap_ldap memleak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	21 Aug 2007 13:27:26 -0000	1.47
+++ sources	11 Sep 2007 15:00:39 -0000	1.48
@@ -1 +1 @@
-87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz
+6511ff23d9b1d4858744778bba543c5d  samba-3.0.26a.tar.gz


--- samba-3.0.25-imdap-basedn.patch DELETED ---


--- samba3-glibc-open.patch DELETED ---


--- samba3_idmap_ldap_memleak.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 15:19:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 11 Sep 2007 11:19:44 -0400
Subject: rpms/iproute/devel iproute.spec,1.69,1.70
Message-ID: <200709111519.l8BFJi6U012288@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260

Modified Files:
	iproute.spec 
Log Message:
Changes in spec file for package review.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- iproute.spec	31 Aug 2007 10:48:26 -0000	1.69
+++ iproute.spec	11 Sep 2007 15:19:12 -0000	1.70
@@ -17,7 +17,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires(pre): tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 BuildRequires: flex
-Obsoletes: shapecfg
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -46,7 +45,6 @@
 	$RPM_BUILD_ROOT/etc/iproute2 \
 	$RPM_BUILD_ROOT%{_libdir}/tc
 
-iconv -f latin1 -t utf8 < man/man8/* > $RPM_BUILD_ROOT/%{_mandir}/man8/*
 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}
 #install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc
@@ -73,7 +71,6 @@
 AVPKT=3000
 EOF
 
-
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:29:01 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Tue, 11 Sep 2007 11:29:01 -0400
Subject: rpms/netatalk/devel netatalk.spec,1.35,1.36
Message-ID: <200709111529.l8BFT1Dt013212@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164

Modified Files:
	netatalk.spec 
Log Message:
rebuild


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- netatalk.spec	29 Aug 2007 04:52:17 -0000	1.35
+++ netatalk.spec	11 Sep 2007 15:28:28 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -186,6 +186,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13
+- rebuild
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:32:52 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 11 Sep 2007 11:32:52 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.154, 1.155 mkinitrd.spec, 1.219, 
	1.220 sources, 1.197, 1.198
Message-ID: <200709111532.l8BFWqD8013540@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13508

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to .16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- .cvsignore	7 Sep 2007 18:05:09 -0000	1.154
+++ .cvsignore	11 Sep 2007 15:32:19 -0000	1.155
@@ -1 +1 @@
-mkinitrd-6.0.15.tar.bz2
+mkinitrd-6.0.16.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- mkinitrd.spec	7 Sep 2007 18:05:09 -0000	1.219
+++ mkinitrd.spec	11 Sep 2007 15:32:19 -0000	1.220
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.15
+Version: 6.0.16
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Fri Sep 11 2007 Peter Jones <pjones at redhat.com> - 6.0.16-1
+- Fix handling of CCISS one more time (bz#274201)
+
 * Fri Sep  7 2007 Peter Jones <pjones at redhat.com> - 6.0.15-1
 - Fix dmraid on x86_64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- sources	7 Sep 2007 18:05:09 -0000	1.197
+++ sources	11 Sep 2007 15:32:19 -0000	1.198
@@ -1 +1 @@
-65234e6e2b8ee9bdc436062995379feb  mkinitrd-6.0.15.tar.bz2
+55b1ec0cb506085eaca5612c09a5d61b  mkinitrd-6.0.16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 15:41:22 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 11 Sep 2007 08:41:22 -0700
Subject: [pkgdb] htmlview had groupAcl changed
Message-ID: <200709111541.l8BFfM8q021702@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) has set the commit acl on htmlview (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/htmlview



From fedora-extras-commits at redhat.com  Tue Sep 11 15:41:26 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 11 Sep 2007 08:41:26 -0700
Subject: [pkgdb] htmlview had groupAcl changed
Message-ID: <200709111541.l8BFfRvX030933@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has set the commit acl on htmlview (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/htmlview



From fedora-extras-commits at redhat.com  Tue Sep 11 15:49:32 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 11:49:32 -0400
Subject: rpms/devhelp/devel .cvsignore, 1.13, 1.14 devhelp.spec, 1.71,
	1.72 sources, 1.13, 1.14
Message-ID: <200709111549.l8BFnWkr014347@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14140

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 0.16-1.fc8
- Update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Jun 2007 19:38:43 -0000	1.13
+++ .cvsignore	11 Sep 2007 15:49:00 -0000	1.14
@@ -1 +1 @@
-devhelp-0.15.tar.bz2
+devhelp-0.16.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- devhelp.spec	8 Aug 2007 19:54:22 -0000	1.71
+++ devhelp.spec	11 Sep 2007 15:49:00 -0000	1.72
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.15
-Release: 4%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -128,6 +128,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 0.16-1.fc8
+- Update to 0.16
+
 * Wed Aug  8 2007 Christopher Aillon <caillon at redhat.com> - 0.15-4
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Jun 2007 19:38:43 -0000	1.13
+++ sources	11 Sep 2007 15:49:00 -0000	1.14
@@ -1 +1 @@
-e5ec0eebc5313c0d11c2371b2b1a9c16  devhelp-0.15.tar.bz2
+61d2300ab657ab63c65a49311916a6d2  devhelp-0.16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 15:49:45 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 11:49:45 -0400
Subject: rpms/suck/devel README.Fedora, 1.2, 1.3 suck-4.3.2-samples.patch,
	1.1, 1.2 suck.spec, 1.13, 1.14
Message-ID: <200709111549.l8BFnji5014359@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14281

Modified Files:
	README.Fedora suck-4.3.2-samples.patch suck.spec 
Log Message:
Allow use of alternative sites


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.Fedora	15 Aug 2007 15:53:21 -0000	1.2
+++ README.Fedora	11 Sep 2007 15:49:12 -0000	1.3
@@ -64,6 +64,9 @@
 
 NNTP_PASS	Password for NNTP authorization (if required)
 
+NNTP_POST       yes = Posting articles to remote host (Default)
+                no  = Don't post articles to remote host
+
 Creating Newsgroups
 
 Befor you can fetch news from the remote newsserver, you have to create
@@ -125,3 +128,27 @@
 If you have posted any article in a newsgroup, you can run getnews as
 described above to transfer the new articles to the newsserver of your 
 provider.
+
+Use of alternative sites
+
+If you want to use an alternative sites, you can create a configuration
+file for each site on the directory:
+
+/etc/news/suck.d/
+
+You can use a random file name for each configuration file.
+
+The content of this file is similar of the site file in
+
+/etc/sysconfig/suck/site
+
+if you want to exchange news to an alternative site, you can call
+getnews as:
+
+getnews <filename>
+
+in this case /etc/news/suck.d/<filename> will be used instead of
+/etc/sysconfig/suck/site.
+
+If you are using several site, please avoid posting articles received
+from one site to anonther site.
\ No newline at end of file

suck-4.3.2-samples.patch:

Index: suck-4.3.2-samples.patch
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck-4.3.2-samples.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- suck-4.3.2-samples.patch	8 Nov 2004 05:23:08 -0000	1.1
+++ suck-4.3.2-samples.patch	11 Sep 2007 15:49:12 -0000	1.2
@@ -1,30 +1,6 @@
---- suck-4.3.2/sample/get.news.generic.bak	1999-02-20 00:32:57.000000000 +0100
-+++ suck-4.3.2/sample/get.news.generic	2004-03-25 19:15:48.437267328 +0100
-@@ -9,16 +9,18 @@
- REMOTE_HOST=news.pixi.com
- LOCAL_HOST=localhost
- 
--SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
--NEWSDIR=/usr/lib/news			# base directory for news binaries 
--BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
-+NEWSDIR=/var/lib/news			# base directory for news binaries 
-+BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
- 
- SHLOCK=${NEWSDIR}/bin/shlock
- 
- TMPDIR=${BASEDIR}			# location for suck.* files
- MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
- 
--OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
-+SITE=pixie
-+
-+OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
- SCRIPT=${BASEDIR}/put.news		# my filter for rpost
- OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
- LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
---- suck-4.3.2/sample/get.news.inn.bak	1997-09-27 09:29:59.000000000 +0200
-+++ suck-4.3.2/sample/get.news.inn	2004-03-25 19:16:26.430491480 +0100
+diff -up suck-4.3.2/sample/get.news.inn.samp suck-4.3.2/sample/get.news.inn
+--- suck-4.3.2/sample/get.news.inn.samp	1997-09-27 09:29:59.000000000 +0200
++++ suck-4.3.2/sample/get.news.inn	2007-09-10 17:43:34.000000000 +0200
 @@ -5,12 +5,11 @@
  #NOTE: this script probably needs to be run by root.  Most systems will
  # not let a normal user run ctlinnd 
@@ -40,7 +16,7 @@
  
  CTLINND=${NEWSDIR}/bin/ctlinnd		# location of binary
  SHLOCK=${NEWSDIR}/bin/shlock		# location of binary
-@@ -18,12 +17,7 @@
+@@ -18,12 +17,7 @@ SHLOCK=${NEWSDIR}/bin/shlock		# location
  TMPDIR=${BASEDIR}			# location for suck.* files
  MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile messages when getting them
  
@@ -54,16 +30,25 @@
  OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
  LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
  NEWSGROUP=news				# which group owns the file in out.going, typically either news or uucp.
-@@ -32,6 +26,8 @@
+@@ -32,6 +26,17 @@ TESTHOST=testhost
  RPOST=rpost
  SUCK=suck
  
-+CONFIG=/etc/sysconfig/suck/site
++if [ $# -gt 1 ]; then
++  echo "Usage: getnew [<sitename>]"
++  exit
++fi
++
++if [ -n "$1" ]; then
++  CONFIG=/etc/news/suck.d/$1
++else
++  CONFIG=/etc/sysconfig/suck/site
++fi
 +
  # if we are already running, abort 
  
  trap 'rm -f ${LOCKFILE} ; echo "Aborting" ; exit 1' 1 2 3 15
-@@ -41,18 +37,46 @@
+@@ -41,18 +46,55 @@ if [ $? -ne 0 ]; then
  	exit
  fi
  
@@ -86,7 +71,16 @@
 +
 +if [ -n "$NNTP_USER" -a -n "$NNTP_PASS" ]; then
 +    AUTHINFO="-u -Q"
-+fi;
++fi
++
++if [ -z $POST ]; then
++  POST="yes"
++fi
++
++if [ $POST != "yes" -a $POST != "no" ]; then
++  echo "Invalid value for post"
++  exit
++fi
 +
 +export NNTP_USER
 +export NNTP_PASS
@@ -112,16 +106,22 @@
  	SUCK_STATUS=$?
  
  	if [ ${SUCK_STATUS} -eq 0 ]; then
-@@ -70,7 +94,7 @@
+@@ -68,9 +110,12 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 	fi
+ 
  	# now upload messages
- 	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
+-	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
  
 -		${TESTHOST} ${REMOTE_HOST} -s
++	if [ $POST = "yes" ]; then
++
++	    if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
++
 +		${TESTHOST} ${NNTP_HOST} -s
  
  		if [ $? -ne 0 ]; then
  			echo "Remote posting host not responding"
-@@ -93,12 +117,11 @@
+@@ -93,12 +138,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
  			fi
  
  			# outgoing messages to post
@@ -135,8 +135,22 @@
  			elif [ ${ERRLEV} -eq 1 ]; then
  				echo "Error posting a message"
  			elif [ ${ERRLEV} -eq 2 ]; then
---- suck-4.3.2/sample/put.news.sm.bak	2002-06-04 15:20:16.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm	2004-03-25 19:15:48.439267024 +0100
+@@ -115,8 +159,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 				chmod 664 ${OUTGOINGNEW}
+ 			fi
+ 		fi
+-	fi	
+ 	
++	    fi	
++	
++	fi
++
+ 	echo "You can hang up the modem now"
+ 
+ fi
+diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
+--- suck-4.3.2/sample/put.news.sm.samp	2002-06-04 15:20:16.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm	2007-09-10 17:40:27.000000000 +0200
 @@ -10,15 +10,18 @@
  # this to somewhere normal users can read or write.
  
@@ -159,20 +173,36 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
---- suck-4.3.2/sample/put.news.sm.pl.bak	2002-06-04 15:20:43.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm.pl	2004-03-25 19:15:48.439267024 +0100
-@@ -26,7 +26,7 @@
- 	# rpost will then handle the error
- 	# We do this since rpost can't differentiate between
- 	# a missing file or a script file
--	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
-+	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
- #	open IFP, "<${infile}" or die "Can't read ${infile}";
- 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
+--- suck-4.3.2/sample/get.news.generic.samp	1999-02-20 00:32:57.000000000 +0100
++++ suck-4.3.2/sample/get.news.generic	2007-09-10 17:40:27.000000000 +0200
+@@ -9,16 +9,18 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
+ 
+-SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
+-NEWSDIR=/usr/lib/news			# base directory for news binaries 
+-BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
++SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
++NEWSDIR=/var/lib/news			# base directory for news binaries 
++BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
+ 
+ SHLOCK=${NEWSDIR}/bin/shlock
  
---- suck-4.3.2/sample/put.news.bak	1998-10-04 21:32:26.000000000 +0200
-+++ suck-4.3.2/sample/put.news	2004-03-25 19:15:48.440266872 +0100
-@@ -14,14 +14,17 @@
+ TMPDIR=${BASEDIR}			# location for suck.* files
+ MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
+ 
+-OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
++SITE=pixie
++
++OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
+ SCRIPT=${BASEDIR}/put.news		# my filter for rpost
+ OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
+ LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
+diff -up suck-4.3.2/sample/put.news.samp suck-4.3.2/sample/put.news
+--- suck-4.3.2/sample/put.news.samp	1998-10-04 21:32:26.000000000 +0200
++++ suck-4.3.2/sample/put.news	2007-09-10 17:40:27.000000000 +0200
+@@ -14,14 +14,17 @@ if [ $# -ne 2 ]; then
  	exit -1
  fi
  
@@ -192,3 +222,15 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
+diff -up suck-4.3.2/sample/put.news.sm.pl.samp suck-4.3.2/sample/put.news.sm.pl
+--- suck-4.3.2/sample/put.news.sm.pl.samp	2002-06-04 15:20:43.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm.pl	2007-09-10 17:40:27.000000000 +0200
+@@ -26,7 +26,7 @@ sub perl_rpost {
+ 	# rpost will then handle the error
+ 	# We do this since rpost can't differentiate between
+ 	# a missing file or a script file
+-	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
++	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
+ #	open IFP, "<${infile}" or die "Can't read ${infile}";
+ 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+ 


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- suck.spec	15 Aug 2007 17:15:15 -0000	1.13
+++ suck.spec	11 Sep 2007 15:49:12 -0000	1.14
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -30,15 +30,15 @@
 %setup -q
 %patch -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .samp
 %patch3 -p1
 %patch4 -p1
 
 cp %{SOURCE3} .
 
 autoconf
-%configure --with-inn-lib=/usr/lib/news/lib \
-           --with-inn-include=/usr/include/inn
+%configure --with-inn-lib=%{_libdir}/news/lib \
+           --with-inn-include=%{_includedir}/inn
 
 %build
 make %{?_smp_mflags}
@@ -51,6 +51,7 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/news/suck.d
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
 cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
@@ -82,10 +83,14 @@
 %{_mandir}/man1/testhost.1*
 %{_mandir}/man1/lmove.1*
 
-%dir /etc/sysconfig/suck/
+%dir %{_sysconfdir}/sysconfig/suck/
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
+%dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Mon Sep 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-18
+- Allow usage of several sites
+
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 



From fedora-extras-commits at redhat.com  Tue Sep 11 15:56:06 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 11:56:06 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.54,1.55
Message-ID: <200709111556.l8BFu6lN014666@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14645

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- policy-20070501.patch	11 Sep 2007 14:08:33 -0000	1.54
+++ policy-20070501.patch	11 Sep 2007 15:56:03 -0000	1.55
@@ -1713,8 +1713,53 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-08-07 09:42:35.000000000 -0400
-@@ -2061,3 +2061,61 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 11:35:53.000000000 -0400
+@@ -1449,6 +1449,44 @@
+ 
+ ########################################
+ ## <summary>
++##      Connect TCP sockets to rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##      The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`corenet_tcp_connect_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	allow $1 rpc_port_type:tcp_socket name_connect;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to connect TCP sockets
++##	all rpc ports.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`corenet_dontaudit_tcp_connect_all_rpc_ports',`
++	gen_require(`
++		attribute rpc_port_type;
++	')
++
++	dontaudit $1 rpc_port_type:tcp_socket name_connect;
++')
++
++
++########################################
++## <summary>
+ ##	Read and write the TUN/TAP virtual network device.
+ ## </summary>
+ ## <param name="domain">
+@@ -2061,3 +2099,61 @@
  
  	typeattribute $1 corenet_unconfined_type;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 11 16:07:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 12:07:51 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.53,
	1.54 selinux-policy.spec, 1.519, 1.520
Message-ID: <200709111607.l8BG7pxa022277@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22239

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
- Allow xfs to bind to port 7100


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- policy-20070703.patch	10 Sep 2007 22:02:06 -0000	1.53
+++ policy-20070703.patch	11 Sep 2007 16:07:47 -0000	1.54
@@ -370,7 +370,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.7/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-11 08:55:05.000000000 -0400
 @@ -71,6 +71,26 @@
  
  ########################################
@@ -403,6 +403,74 @@
  	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
  ')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.0.7/policy/modules/admin/amanda.te
+--- nsaserefpolicy/policy/modules/admin/amanda.te	2007-07-25 10:37:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.te	2007-09-11 08:54:52.000000000 -0400
+@@ -74,7 +74,6 @@
+ allow amanda_t self:unix_dgram_socket create_socket_perms;
+ allow amanda_t self:tcp_socket create_stream_socket_perms;
+ allow amanda_t self:udp_socket create_socket_perms;
+-allow amanda_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # access to amanda_amandates_t
+ allow amanda_t amanda_amandates_t:file { getattr lock read write };
+@@ -108,6 +107,8 @@
+ manage_dirs_pattern(amanda_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_t, amanda_tmp_t, { file dir })
+ 
++auth_use_nsswitch(amanda_t)
++
+ kernel_read_system_state(amanda_t)
+ kernel_read_kernel_sysctls(amanda_t)
+ kernel_dontaudit_getattr_unlabeled_files(amanda_t)
+@@ -154,8 +155,6 @@
+ libs_use_ld_so(amanda_t)
+ libs_use_shared_libs(amanda_t)
+ 
+-sysnet_read_config(amanda_t)
+-
+ optional_policy(`
+ 	auth_read_shadow(amanda_t)
+ ')
+@@ -164,14 +163,6 @@
+ 	logging_send_syslog_msg(amanda_t)
+ ')
+ 
+-optional_policy(`
+-	nis_use_ypbind(amanda_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_t)
+-')
+-
+ ########################################
+ #
+ # Amanda recover local policy
+@@ -201,6 +192,8 @@
+ manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
+ files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
+ 
++auth_use_nsswitch(amanda_recover_t)
++
+ kernel_read_system_state(amanda_recover_t)
+ kernel_read_kernel_sysctls(amanda_recover_t)
+ 
+@@ -237,14 +230,4 @@
+ 
+ miscfiles_read_localization(amanda_recover_t)
+ 
+-sysnet_read_config(amanda_recover_t)
+-
+ userdom_search_sysadm_home_content_dirs(amanda_recover_t)
+-
+-optional_policy(`
+-	nis_use_ypbind(amanda_recover_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(amanda_recover_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-09-06 15:43:06.000000000 -0400
@@ -2505,7 +2573,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-07 15:02:19.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-11 09:22:25.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2556,7 +2624,7 @@
  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
  network_port(squid, udp,3401,s0, tcp,3401,s0, udp,4827,s0, tcp,4827,s0) # snmp and htcp
-@@ -160,13 +166,18 @@
+@@ -160,13 +166,19 @@
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
@@ -2564,6 +2632,7 @@
 +network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
 -network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
++network_port(xfs, tcp,7100,s0)
 +network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0, tcp,6020,s0)
  network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
  network_port(zope, tcp,8021,s0)
@@ -2745,7 +2814,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-10 16:27:16.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 08:45:38.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -3004,7 +3073,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.7/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-09-11 10:46:12.000000000 -0400
 @@ -55,6 +55,8 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
@@ -3014,9 +3083,17 @@
  
  #
  # etc_runtime_t is the type of various
+@@ -188,6 +190,7 @@
+ fs_associate(file_type)
+ fs_associate_noxattr(file_type)
+ fs_associate_tmpfs(file_type)
++fs_associate_ramfs(file_type)
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.7/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-09-11 10:45:23.000000000 -0400
 @@ -271,45 +271,6 @@
  
  ########################################
@@ -3072,7 +3149,40 @@
  ## </summary>
  ## <param name="domain">
  ##      <summary>
-@@ -2276,7 +2237,7 @@
+@@ -2139,6 +2100,7 @@
+ 	rw_files_pattern($1,nfsd_fs_t,nfsd_fs_t)
+ ')
+ 
++
+ ########################################
+ ## <summary>
+ ##	Mount a RAM filesystem.
+@@ -2214,6 +2176,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow the type to associate to ramfs filesystems.
++## </summary>
++## <param name="type">
++##	<summary>
++##	The type of the object to be associated.
++##	</summary>
++## </param>
++#
++interface(`fs_associate_ramfs',`
++	gen_require(`
++		type ramfs_t;
++	')
++
++	allow $1 ramfs_t:filesystem associate;
++')
++
++########################################
++## <summary>
+ ##	Search directories on a ramfs
+ ## </summary>
+ ## <param name="domain">
+@@ -2276,7 +2256,7 @@
  ##	Domain allowed access.
  ##	</summary>
  ## </param>
@@ -3081,7 +3191,7 @@
  interface(`fs_dontaudit_read_ramfs_files',`
  	gen_require(`
  		type ramfs_t;
-@@ -3533,3 +3494,42 @@
+@@ -3533,3 +3513,42 @@
  	relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs)
  	relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs)
  ')
@@ -4854,7 +4964,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-11 09:00:57.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -5296,7 +5406,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.7/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-09-11 11:08:24.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -6542,7 +6652,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.0.7/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.fc	2007-09-10 14:42:55.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.fc	2007-09-11 09:03:41.000000000 -0400
 @@ -16,3 +16,4 @@
  
  /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
@@ -6550,7 +6660,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.7/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-10 17:37:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-11 09:02:54.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6590,7 +6700,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.7/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-10 14:42:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-11 09:02:44.000000000 -0400
 @@ -54,6 +54,9 @@
  type krb5kdc_var_run_t;
  files_pid_file(krb5kdc_var_run_t)
@@ -7400,7 +7510,7 @@
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.0.7/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-09-11 10:21:10.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -7526,7 +7636,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.0.7/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-11 10:21:22.000000000 -0400
 @@ -25,6 +25,12 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -7566,16 +7676,17 @@
  
  auth_use_nsswitch(ntpd_t)
  
-@@ -107,6 +118,8 @@
+@@ -106,6 +117,9 @@
+ miscfiles_read_localization(ntpd_t)
  
  sysnet_read_config(ntpd_t)
- 
-+term_use_ptmx(ntpd_t)
++sysnet_dontaudit_dhcpc_use_fds(ntpd_t)
 +
++term_use_ptmx(ntpd_t)
+ 
  userdom_dontaudit_use_unpriv_user_fds(ntpd_t)
  userdom_list_sysadm_home_dirs(ntpd_t)
- userdom_dontaudit_list_sysadm_home_dirs(ntpd_t)
-@@ -122,6 +135,10 @@
+@@ -122,6 +136,10 @@
  ')
  
  optional_policy(`
@@ -7586,7 +7697,7 @@
  	logrotate_exec(ntpd_t)
  ')
  
-@@ -132,3 +149,4 @@
+@@ -132,3 +150,4 @@
  optional_policy(`
  	udev_read_db(ntpd_t)
  ')
@@ -8392,7 +8503,7 @@
  # Only permit unprivileged user domains to be entered via rlogin,
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.0.7/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-09-11 11:38:16.000000000 -0400
 @@ -59,6 +59,7 @@
  corenet_sendrecv_all_client_packets(rhgb_t)
  
@@ -8409,6 +8520,14 @@
  
  xserver_read_xdm_xserver_tmp_files(rhgb_t)
  xserver_kill_xdm_xserver(rhgb_t)
+@@ -117,6 +119,7 @@
+ xserver_domtrans_xdm_xserver(rhgb_t)
+ xserver_signal_xdm_xserver(rhgb_t)
+ xserver_read_xdm_tmp_files(rhgb_t)
++xserver_stream_connect_xdm_xserver(rhgb_t)
+ 
+ optional_policy(`
+ 	consoletype_exec(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.7/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/ricci.te	2007-09-06 15:43:06.000000000 -0400
@@ -8441,15 +8560,19 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.7/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-09-10 17:48:31.000000000 -0400
-@@ -65,6 +65,7 @@
++++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-09-11 08:27:48.000000000 -0400
+@@ -64,9 +64,10 @@
+ fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
++auth_use_nsswitch(rlogind_t)
  auth_domtrans_chk_passwd(rlogind_t)
 +auth_domtrans_upd_passwd(rlogind_t)
  auth_rw_login_records(rlogind_t)
- auth_use_nsswitch(rlogind_t)
+-auth_use_nsswitch(rlogind_t)
  
+ files_read_etc_files(rlogind_t)
+ files_read_etc_runtime_files(rlogind_t)
 @@ -82,7 +83,7 @@
  
  miscfiles_read_localization(rlogind_t)
@@ -8585,7 +8708,7 @@
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.0.7/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-09-10 16:54:18.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-09-11 09:10:14.000000000 -0400
 @@ -11,15 +11,17 @@
  domain_subj_id_change_exemption(rshd_t)
  domain_role_change_exemption(rshd_t)
@@ -8614,7 +8737,7 @@
  corenet_sendrecv_rsh_server_packets(rshd_t)
  
  dev_read_urand(rshd_t)
-@@ -44,26 +48,31 @@
+@@ -44,28 +48,44 @@
  selinux_compute_relabel_context(rshd_t)
  selinux_compute_user_contexts(rshd_t)
  
@@ -8648,25 +8771,36 @@
 -
  userdom_search_all_users_home_content(rshd_t)
  
- tunable_policy(`use_nfs_home_dirs',`
-@@ -78,13 +87,12 @@
- 
- optional_policy(`
- 	kerberos_use(rshd_t)
++optional_policy(`
++	kerberos_use(rshd_t)
 +	kerberos_read_keytab(rshd_t)
 +	kerberos_manage_host_rcache(rshd_t)
++')
++
++optional_policy(`
++	unconfined_shell_domtrans(rshd_t)
++	unconfined_signal(rshd_t)
++')
++
+ tunable_policy(`use_nfs_home_dirs',`
+ 	fs_read_nfs_files(rshd_t)
+ 	fs_read_nfs_symlinks(rshd_t)
+@@ -76,15 +96,3 @@
+ 	fs_read_cifs_symlinks(rshd_t)
  ')
  
- optional_policy(`
+-optional_policy(`
+-	kerberos_use(rshd_t)
+-')
+-
+-optional_policy(`
 -	nscd_socket_use(rshd_t)
 -')
 -
 -optional_policy(`
 -	unconfined_domain(rshd_t)
- 	unconfined_shell_domtrans(rshd_t)
-+	unconfined_signal(rshd_t)
- ')
-+
+-	unconfined_shell_domtrans(rshd_t)
+-')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.0.7/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/rsync.te	2007-09-06 15:43:06.000000000 -0400
@@ -8768,7 +8902,7 @@
  corenet_all_recvfrom_unlabeled(rwho_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.0.7/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-09-10 14:04:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-09-11 09:23:37.000000000 -0400
 @@ -15,6 +15,7 @@
  /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
  /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
@@ -8788,7 +8922,7 @@
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.7/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-09-10 14:06:00.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-09-11 09:24:00.000000000 -0400
 @@ -349,6 +349,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
@@ -8902,7 +9036,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.7/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-09-10 14:03:09.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-09-11 10:50:53.000000000 -0400
 @@ -137,6 +137,11 @@
  type winbind_var_run_t;
  files_pid_file(winbind_var_run_t)
@@ -8915,16 +9049,55 @@
  ########################################
  #
  # Samba net local policy
-@@ -190,6 +195,8 @@
+@@ -146,7 +151,6 @@
+ allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
+ allow samba_net_t self:udp_socket create_socket_perms;
+ allow samba_net_t self:tcp_socket create_socket_perms;
+-allow samba_net_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow samba_net_t samba_etc_t:file read_file_perms;
+ 
+@@ -161,6 +165,8 @@
+ manage_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ manage_lnk_files_pattern(samba_net_t,samba_var_t,samba_var_t)
+ 
++auth_use_nsswitch(samba_net_t)
++
+ kernel_read_proc_symlinks(samba_net_t)
+ 
+ corenet_all_recvfrom_unlabeled(samba_net_t)
+@@ -190,8 +196,7 @@
  
  miscfiles_read_localization(samba_net_t) 
  
+-sysnet_read_config(samba_net_t)
+-sysnet_use_ldap(samba_net_t)
 +samba_read_var_files(samba_net_t) 
-+
- sysnet_read_config(samba_net_t)
- sysnet_use_ldap(samba_net_t)
  
-@@ -226,8 +233,8 @@
+ userdom_dontaudit_search_sysadm_home_dirs(samba_net_t)
+ 
+@@ -199,10 +204,6 @@
+ 	kerberos_use(samba_net_t)
+ ')
+ 
+-optional_policy(`
+-	nscd_socket_use(samba_net_t)
+-')
+-
+ ########################################
+ #
+ # smbd Local policy
+@@ -217,17 +218,16 @@
+ allow smbd_t self:msgq create_msgq_perms;
+ allow smbd_t self:sem create_sem_perms;
+ allow smbd_t self:shm create_shm_perms;
+-allow smbd_t self:sock_file read_file_perms;
++allow smbd_t self:sock_file read_sock_file_perms;
+ allow smbd_t self:tcp_socket create_stream_socket_perms;
+ allow smbd_t self:udp_socket create_socket_perms;
+ allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
  
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
  
@@ -8935,7 +9108,16 @@
  allow smbd_t samba_log_t:dir setattr;
  dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -298,6 +305,7 @@
+@@ -256,7 +256,7 @@
+ manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
+ files_pid_filetrans(smbd_t,smbd_var_run_t,file)
+ 
+-allow smbd_t winbind_var_run_t:sock_file { read write getattr };
++allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
+ 
+ kernel_getattr_core_if(smbd_t)
+ kernel_getattr_message_if(smbd_t)
+@@ -298,6 +298,7 @@
  
  auth_use_nsswitch(smbd_t)
  auth_domtrans_chk_passwd(smbd_t)
@@ -8943,7 +9125,16 @@
  
  domain_use_interactive_fds(smbd_t)
  domain_dontaudit_list_all_domains_state(smbd_t)
-@@ -350,6 +358,14 @@
+@@ -321,8 +322,6 @@
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
+-sysnet_read_config(smbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(smbd_t)
+ userdom_use_unpriv_users_fds(smbd_t)
+@@ -350,6 +349,14 @@
  ')
  
  optional_policy(`
@@ -8958,7 +9149,52 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -533,6 +549,7 @@
+@@ -398,7 +405,7 @@
+ allow nmbd_t self:msgq create_msgq_perms;
+ allow nmbd_t self:sem create_sem_perms;
+ allow nmbd_t self:shm create_shm_perms;
+-allow nmbd_t self:sock_file read_file_perms;
++allow nmbd_t self:sock_file read_sock_file_perms;
+ allow nmbd_t self:tcp_socket create_stream_socket_perms;
+ allow nmbd_t self:udp_socket create_socket_perms;
+ allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
+@@ -421,6 +428,8 @@
+ 
+ allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
+ 
++auth_use_nsswitch(nmbd_t)
++
+ kernel_getattr_core_if(nmbd_t)
+ kernel_getattr_message_if(nmbd_t)
+ kernel_read_kernel_sysctls(nmbd_t)
+@@ -462,17 +471,11 @@
+ 
+ miscfiles_read_localization(nmbd_t)
+ 
+-sysnet_read_config(nmbd_t)
+-
+ userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
+ userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
+ userdom_use_unpriv_users_fds(nmbd_t)
+ 
+ optional_policy(`
+-	nis_use_ypbind(nmbd_t)
+-')
+-
+-optional_policy(`
+ 	seutil_sigchld_newrole(nmbd_t)
+ ')
+ 
+@@ -506,6 +509,8 @@
+ manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
+ files_list_var_lib(smbmount_t)
+ 
++auth_use_nsswitch(smbmount_t)
++
+ kernel_read_system_state(smbmount_t)
+ 
+ corenet_all_recvfrom_unlabeled(smbmount_t)
+@@ -533,6 +538,7 @@
  storage_raw_write_fixed_disk(smbmount_t)
  
  term_list_ptys(smbmount_t)
@@ -8966,19 +9202,26 @@
  
  corecmd_list_bin(smbmount_t)
  
-@@ -556,6 +573,11 @@
- sysnet_read_config(smbmount_t)
+@@ -553,16 +559,11 @@
+ 
+ logging_search_logs(smbmount_t)
  
+-sysnet_read_config(smbmount_t)
+-
  userdom_use_all_users_fds(smbmount_t)
 +userdom_use_sysadm_ttys(smbmount_t)
-+
-+optional_policy(`
-+	cups_read_rw_config(smbmount_t)
-+')
  
  optional_policy(`
- 	nis_use_ypbind(smbmount_t)
-@@ -570,15 +592,18 @@
+-	nis_use_ypbind(smbmount_t)
+-')
+-
+-optional_policy(`
+-	nscd_socket_use(smbmount_t)
++	cups_read_rw_config(smbmount_t)
+ ')
+ 
+ ########################################
+@@ -570,24 +571,28 @@
  # SWAT Local policy
  #
  
@@ -8990,9 +9233,15 @@
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
- allow swat_t self:netlink_route_socket r_netlink_socket_perms;
+-allow swat_t self:netlink_route_socket r_netlink_socket_perms;
  
 -allow swat_t nmbd_exec_t:file { execute read };
++allow swat_t self:unix_stream_socket connectto;
++can_exec(swat_t, smbd_exec_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 };
++
 +can_exec(swat_t, nmbd_exec_t)
 +allow swat_t nmbd_port_t:udp_socket name_bind;
 +allow swat_t nmbd_t:process { signal signull };
@@ -9000,7 +9249,16 @@
  
  rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
  
-@@ -597,7 +622,9 @@
+ append_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-allow swat_t smbd_exec_t:file execute ;
+-
+-allow swat_t smbd_t:process signull;
+-
+ allow swat_t smbd_var_run_t:file read;
+ 
+ manage_dirs_pattern(swat_t,swat_tmp_t,swat_tmp_t)
+@@ -597,7 +602,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -9008,10 +9266,12 @@
 +can_exec(swat_t, winbind_exec_t)
 +allow swat_t winbind_var_run_t:dir { write add_name remove_name };
 +allow swat_t winbind_var_run_t:sock_file { create unlink };
++
++auth_use_nsswitch(swat_t)
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -622,17 +649,20 @@
+@@ -622,23 +631,24 @@
  
  dev_read_urand(swat_t)
  
@@ -9032,14 +9292,25 @@
  logging_search_logs(swat_t)
  
  miscfiles_read_localization(swat_t)
-@@ -660,6 +690,24 @@
- 	nscd_socket_use(swat_t)
+ 
+-sysnet_read_config(swat_t)
+-
+ optional_policy(`
+ 	cups_read_rw_config(swat_t)
+ 	cups_stream_connect(swat_t)
+@@ -652,13 +662,16 @@
+ 	kerberos_use(swat_t)
  ')
  
-+	
+-optional_policy(`
+-	nis_use_ypbind(swat_t)
+-')
 +init_read_utmp(swat_t)
 +init_dontaudit_write_utmp(swat_t)
-+
+ 
+-optional_policy(`
+-	nscd_socket_use(swat_t)
+-')
 +manage_dirs_pattern(swat_t,samba_log_t,samba_log_t)
 +create_files_pattern(swat_t,samba_log_t,samba_log_t)
 +
@@ -9047,17 +9318,10 @@
 +
 +manage_files_pattern(swat_t,samba_var_t,samba_var_t)
 +files_list_var_lib(swat_t)
-+
-+allow swat_t self:unix_stream_socket connectto;
-+allow swat_t smbd_exec_t:file { execute_no_trans read };
-+allow swat_t smbd_port_t:tcp_socket name_bind;
-+allow swat_t smbd_t:process signal;
-+allow swat_t smbd_var_run_t:file { lock unlink };
-+
+ 
  ########################################
  #
- # Winbind local policy
-@@ -672,7 +720,6 @@
+@@ -672,7 +685,6 @@
  allow winbind_t self:fifo_file { read write };
  allow winbind_t self:unix_dgram_socket create_socket_perms;
  allow winbind_t self:unix_stream_socket create_stream_socket_perms;
@@ -9065,7 +9329,7 @@
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
-@@ -709,6 +756,8 @@
+@@ -709,6 +721,8 @@
  manage_sock_files_pattern(winbind_t,winbind_var_run_t,winbind_var_run_t)
  files_pid_filetrans(winbind_t,winbind_var_run_t,file)
  
@@ -9074,7 +9338,7 @@
  kernel_read_kernel_sysctls(winbind_t)
  kernel_list_proc(winbind_t)
  kernel_read_proc_symlinks(winbind_t)
-@@ -733,7 +782,9 @@
+@@ -733,7 +747,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -9084,7 +9348,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -746,9 +797,6 @@
+@@ -746,9 +762,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -9094,7 +9358,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -758,10 +806,6 @@
+@@ -758,10 +771,6 @@
  ')
  
  optional_policy(`
@@ -9105,7 +9369,16 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -804,6 +848,7 @@
+@@ -784,6 +793,8 @@
+ allow winbind_helper_t samba_var_t:dir search;
+ files_list_var_lib(winbind_helper_t)
+ 
++auth_use_nsswitch(winbind_helper_t)
++
+ stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
+ 
+ term_list_ptys(winbind_helper_t)
+@@ -804,6 +815,7 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -9113,7 +9386,7 @@
  ')
  
  ########################################
-@@ -828,3 +873,36 @@
+@@ -828,3 +840,36 @@
  		domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
  	')
  ')
@@ -9396,7 +9669,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 11:09:25.000000000 -0400
 @@ -33,7 +33,6 @@
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -9432,13 +9705,15 @@
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
  
-@@ -108,6 +113,3 @@
-         rpm_use_script_fds(setroubleshootd_t)
+@@ -109,5 +114,7 @@
  ')
  
--optional_policy(`
+ optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
--')
++	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
++	dbus_send_system_bus(setroubleshootd_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.7/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-06-19 16:23:35.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/snmp.fc	2007-09-06 15:43:06.000000000 -0400
@@ -9770,7 +10045,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.7/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-09-10 17:53:16.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-09-11 09:12:11.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -9904,7 +10179,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.7/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/telnet.te	2007-09-10 17:54:44.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/telnet.te	2007-09-11 08:25:22.000000000 -0400
 @@ -32,7 +32,6 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
@@ -10013,6 +10288,25 @@
 +corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t)
 +
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-3.0.7/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xfs.te	2007-09-11 08:19:36.000000000 -0400
+@@ -37,6 +37,15 @@
+ kernel_read_kernel_sysctls(xfs_t)
+ kernel_read_system_state(xfs_t)
+ 
++corenet_all_recvfrom_unlabeled(xfs_t)
++corenet_all_recvfrom_netlabel(xfs_t)
++corenet_tcp_sendrecv_generic_if(xfs_t)
++corenet_tcp_sendrecv_all_nodes(xfs_t)
++corenet_tcp_sendrecv_all_ports(xfs_t)
++corenet_tcp_bind_all_nodes(xfs_t)
++corenet_tcp_bind_xfs_port(xfs_t)
++corenet_sendrecv_xfs_client_packets(xfs_t)
++
+ corecmd_list_bin(xfs_t)
+ 
+ dev_read_sysfs(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.0.7/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-08-22 07:14:07.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/xserver.fc	2007-09-06 15:43:06.000000000 -0400
@@ -10041,7 +10335,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.7/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-09-11 11:45:01.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -10374,7 +10668,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-07 16:19:01.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-11 09:22:25.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -11863,7 +12157,7 @@
  # Sulogin local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.0.7/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-09-11 11:58:06.000000000 -0400
 @@ -1,12 +1,15 @@
 -
  /dev/log		-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -11881,16 +12175,18 @@
  /sbin/syslogd		--	gen_context(system_u:object_r:syslogd_exec_t,s0)
  /sbin/syslog-ng		--	gen_context(system_u:object_r:syslogd_exec_t,s0)
  
-@@ -32,6 +35,8 @@
+@@ -32,7 +35,10 @@
  /var/log/audit\.log	--	gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
  ')
  
 +/var/named/chroot/var/log	-d	gen_context(system_u:object_r:var_log_t,s0)
 +
  /var/run/audit_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
++/var/run/audispd_events	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
  /var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
-@@ -43,3 +48,8 @@
+ /var/run/klogd\.pid	--	gen_context(system_u:object_r:klogd_var_run_t,s0)
+@@ -43,3 +49,8 @@
  /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
  
  /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
@@ -13224,7 +13520,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.7/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-09-11 10:23:22.000000000 -0400
 @@ -522,6 +522,8 @@
  
  	files_search_etc($1)
@@ -13234,6 +13530,30 @@
  ')
  
  ########################################
+@@ -556,3 +558,23 @@
+ 	files_search_etc($1)
+ 	allow $1 net_conf_t:file read_file_perms;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to use
++##	the dhcp file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The domain sending the SIGCHLD.
++##	</summary>
++## </param>
++#
++interface(`sysnet_dontaudit_dhcpc_use_fds',`
++	gen_require(`
++		type dhcpc_t;
++	')
++
++	dontaudit $1 dhcpc_t:fd use;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-06 15:43:06.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- selinux-policy.spec	10 Sep 2007 22:02:06 -0000	1.519
+++ selinux-policy.spec	11 Sep 2007 16:07:47 -0000	1.520
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
+- Allow xfs to bind to port 7100
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-8
 - Allow newalias/sendmail dac_override
 - Allow bind to bind to all udp ports



From fedora-extras-commits at redhat.com  Tue Sep 11 16:11:30 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:11:30 -0400
Subject: rpms/wordpress/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 wordpress.spec, 1.14, 1.15
Message-ID: <200709111611.l8BGBUaI022693@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22610

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Aug 2007 14:54:45 -0000	1.10
+++ .cvsignore	11 Sep 2007 16:10:57 -0000	1.11
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Aug 2007 14:54:45 -0000	1.10
+++ sources	11 Sep 2007 16:10:57 -0000	1.11
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wordpress.spec	29 Aug 2007 14:54:45 -0000	1.14
+++ wordpress.spec	11 Sep 2007 16:10:57 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -51,6 +51,7 @@
 %doc readme.html
 %doc README.fedora
 %{_datadir}/wordpress/wp-atom.php
+%{_datadir}/wordpress/wp-app.php
 %{_datadir}/wordpress/wp-blog-header.php
 %{_datadir}/wordpress/wp-comments-post.php
 %{_datadir}/wordpress/wp-commentsrss2.php
@@ -73,6 +74,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
 * Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:05 -0700
Subject: [pkgdb] dbench was added for sundaram
Message-ID: <200709111615.l8BGF51c021960@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package dbench with summary Filesystem load benchmarking tool
Kevin Fenzi (kevin) has approved Package dbench
Kevin Fenzi (kevin) has added a Fedora devel branch for dbench with an owner of sundaram
Kevin Fenzi (kevin) has approved dbench in Fedora devel
Kevin Fenzi (kevin) has approved Package dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:21 -0700
Subject: [pkgdb] dbench (Fedora, 6) updated by kevin
Message-ID: <200709111615.l8BGFNjq031450@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora 6) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora, 7) updated by kevin
Message-ID: <200709111615.l8BGFOVJ031458@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora 7) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora EPEL, 5) updated by kevin
Message-ID: <200709111615.l8BGFOgl031470@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora EPEL 5) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora OLPC, 2) updated by kevin
Message-ID: <200709111615.l8BGFOjQ031486@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora, devel) updated by kevin
Message-ID: <200709111615.l8BGFOaw031494@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora devel) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:15:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:15:22 -0700
Subject: [pkgdb] dbench (Fedora EPEL, 4) updated by kevin
Message-ID: <200709111615.l8BGFPMc031506@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for dbench
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dbench (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved watchcommits on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved commit on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved build on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved approveacls on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) approved checkout on dbench (Fedora EPEL 4) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on dbench (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbench



From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:42 -0400
Subject: rpms/dbench - New directory
Message-ID: <200709111616.l8BGGg10023481@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench

Log Message:
Directory /cvs/extras/rpms/dbench added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:46 -0400
Subject: rpms/dbench/devel - New directory
Message-ID: <200709111616.l8BGGkBg023505@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench/devel

Log Message:
Directory /cvs/extras/rpms/dbench/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:51 -0400
Subject: rpms/dbench Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709111616.l8BGGpu0023544@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench

Added Files:
	Makefile import.log 
Log Message:
Setup of module dbench


--- NEW FILE Makefile ---
# Top level Makefile for module dbench
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 11 16:16:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:16:54 -0400
Subject: rpms/dbench/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709111616.l8BGGsXU023563@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23390/rpms/dbench/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dbench


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dbench
# $Id: Makefile,v 1.1 2007/09/11 16:16:51 kevin Exp $
NAME := dbench
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 fedora-extras-commits at redhat.com  Tue Sep 11 16:19:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:19:31 -0700
Subject: [pkgdb] olpc-logos was added for sundaram
Message-ID: <200709111619.l8BGJVh2031534@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package olpc-logos with summary OLPC-related icons and pictures
Kevin Fenzi (kevin) has approved Package olpc-logos
Kevin Fenzi (kevin) has added a Fedora devel branch for olpc-logos with an owner of sundaram
Kevin Fenzi (kevin) has approved olpc-logos in Fedora devel
Kevin Fenzi (kevin) has approved Package olpc-logos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on olpc-logos (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on olpc-logos (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on olpc-logos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/olpc-logos



From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:19:33 -0700
Subject: [pkgdb] olpc-logos (Fedora OLPC, 2) updated by kevin
Message-ID: <200709111619.l8BGJX9E031546@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for olpc-logos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on olpc-logos (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on olpc-logos (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on olpc-logos (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/olpc-logos



From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:45 -0400
Subject: rpms/olpc-logos - New directory
Message-ID: <200709111619.l8BGJjmY024449@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos

Log Message:
Directory /cvs/extras/rpms/olpc-logos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:50 -0400
Subject: rpms/olpc-logos/devel - New directory
Message-ID: <200709111619.l8BGJoxw024483@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos/devel

Log Message:
Directory /cvs/extras/rpms/olpc-logos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 11 16:19:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:19:58 -0400
Subject: rpms/olpc-logos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709111619.l8BGJwKN024522@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos

Added Files:
	Makefile import.log 
Log Message:
Setup of module olpc-logos


--- NEW FILE Makefile ---
# Top level Makefile for module olpc-logos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 11 16:20:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 12:20:05 -0400
Subject: rpms/olpc-logos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709111620.l8BGK5C4024552@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA24377/rpms/olpc-logos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module olpc-logos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: olpc-logos
# $Id: Makefile,v 1.1 2007/09/11 16:19:58 kevin Exp $
NAME := olpc-logos
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 fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, 6) updated by kevin
Message-ID: <200709111626.l8BGQIHQ031615@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora 6 to sandeen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfsdump



From fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, 7) updated by kevin
Message-ID: <200709111626.l8BGQIHg031624@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora 7 to sandeen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfsdump



From fedora-extras-commits at redhat.com  Tue Sep 11 16:26:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 11 Sep 2007 09:26:18 -0700
Subject: [pkgdb] xfsdump (Fedora, devel) updated by kevin
Message-ID: <200709111626.l8BGQIwM031633@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of xfsdump in Fedora devel to sandeen

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfsdump



From fedora-extras-commits at redhat.com  Tue Sep 11 16:36:09 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:36:09 -0400
Subject: rpms/wordpress/F-7 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wordpress.spec, 1.15, 1.16
Message-ID: <200709111636.l8BGa9JY026906@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26846

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 14:54:39 -0000	1.11
+++ .cvsignore	11 Sep 2007 16:35:36 -0000	1.12
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 14:54:39 -0000	1.11
+++ sources	11 Sep 2007 16:35:36 -0000	1.12
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-7/wordpress.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wordpress.spec	29 Aug 2007 14:54:39 -0000	1.15
+++ wordpress.spec	11 Sep 2007 16:35:36 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -74,6 +74,9 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
 * Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update



From fedora-extras-commits at redhat.com  Tue Sep 11 16:41:53 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:41:53 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111641.l8BGfsas022094@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:41:54 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:41:54 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111641.l8BGfsj0031756@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:14 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:14 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111642.l8BGgFaA022103@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:16 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:16 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111642.l8BGgGpX031769@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:22 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:22 -0700
Subject: [pkgdb] wordpress: adrian has requested watchbugzilla
Message-ID: <200709111642.l8BGgM07031782@app3.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchbugzilla acl on wordpress (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:42:25 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 09:42:25 -0700
Subject: [pkgdb] wordpress: adrian has requested watchcommits
Message-ID: <200709111642.l8BGgPua022113@app4.fedora.phx.redhat.com>

Adrian Reber (adrian) has requested the watchcommits acl on wordpress (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:45:59 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Sep 2007 12:45:59 -0400
Subject: rpms/wordpress/FC-6 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wordpress.spec, 1.17, 1.18
Message-ID: <200709111645.l8BGjxfV028187@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28103

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
- updated to 2.2.3 (security release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 14:54:42 -0000	1.11
+++ .cvsignore	11 Sep 2007 16:45:21 -0000	1.12
@@ -1 +1,2 @@
 wordpress-2.2.2.tar.gz
+wordpress-2.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 14:54:42 -0000	1.11
+++ sources	11 Sep 2007 16:45:21 -0000	1.12
@@ -1 +1,2 @@
 a87666c6fe6cb4db94e2ae0531e5b633  wordpress-2.2.2.tar.gz
+98c1e611f8533d4fe4e8f995b8d83110  wordpress-2.2.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/FC-6/wordpress.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wordpress.spec	29 Aug 2007 14:54:42 -0000	1.17
+++ wordpress.spec	11 Sep 2007 16:45:21 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.2.2
+Version: 2.2.3
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: GPLv2
@@ -74,7 +74,10 @@
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-1
+* Tue Sep 11 2007 Adrian Reber <adrian at lisas.de> - 2.2.3-0
+- updated to 2.2.3 (security release)
+
+* Wed Aug 29 2007 John Berninger <john at ncphotography dot com> - 2.2.2-0
 - update to upstream 2.2.2
 - license tag update
 



From fedora-extras-commits at redhat.com  Tue Sep 11 16:48:10 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 12:48:10 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.5, 1.6 gtksourceview2.spec, 
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200709111648.l8BGmAGa028531@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27727

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
- Update to 1.90.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2007 04:23:39 -0000	1.5
+++ .cvsignore	11 Sep 2007 16:47:32 -0000	1.6
@@ -1 +1 @@
-gtksourceview-1.90.4.tar.bz2
+gtksourceview-1.90.5.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtksourceview2.spec	4 Sep 2007 04:23:39 -0000	1.7
+++ gtksourceview2.spec	11 Sep 2007 16:47:32 -0000	1.8
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.4
+Version: 1.90.5
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
+- Update to 1.90.5
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
 - Update to 1.90.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2007 04:23:39 -0000	1.5
+++ sources	11 Sep 2007 16:47:32 -0000	1.6
@@ -1 +1 @@
-d4a1029c968ca61f8f65d3c22d4de07e  gtksourceview-1.90.4.tar.bz2
+4d439022469b25f8c944751bcf787db3  gtksourceview-1.90.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 16:49:50 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 12:49:50 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.5, 1.6 pygtksourceview.spec,
	1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200709111649.l8BGnok3028853@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28729

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
- Update to 1.90.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2007 04:58:19 -0000	1.5
+++ .cvsignore	11 Sep 2007 16:49:18 -0000	1.6
@@ -1 +1 @@
-pygtksourceview-1.90.4.tar.bz2
+pygtksourceview-1.90.5.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pygtksourceview.spec	4 Sep 2007 05:04:29 -0000	1.9
+++ pygtksourceview.spec	11 Sep 2007 16:49:18 -0000	1.10
@@ -2,10 +2,10 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.4
+%define gtksourceview_version 1.90.5
 
 Name:           pygtksourceview
-Version:        1.90.4
+Version:        1.90.5
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
+- Update to 1.90.5
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.4-1
 - Update to 1.90.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2007 04:58:19 -0000	1.5
+++ sources	11 Sep 2007 16:49:18 -0000	1.6
@@ -1 +1 @@
-dd8fcd11ba555ed6444bfffcd7cffe45  pygtksourceview-1.90.4.tar.bz2
+e26be6d014b5f091af5c4250bb63c2ff  pygtksourceview-1.90.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:00 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:00 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo0eN022155@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchbugzilla acl on wordpress (Fedora devel) to Approved for Adrian Reber (adrian)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:01 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:01 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo1Mw031844@app3.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchcommits acl on wordpress (Fedora devel) to Approved for Adrian Reber (adrian)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:03 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:03 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo4KV022166@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchbugzilla acl on wordpress (Fedora 7) to Approved for Adrian Reber (adrian)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 16:50:05 2007
From: fedora-extras-commits at redhat.com (John Berninger (john))
Date: Tue, 11 Sep 2007 09:50:05 -0700
Subject: [pkgdb] wordpress had acl change status
Message-ID: <200709111650.l8BGo5uA022175@app4.fedora.phx.redhat.com>

John Berninger (jwb) has set the watchcommits acl on wordpress (Fedora 7) to Approved for Adrian Reber (adrian)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wordpress



From fedora-extras-commits at redhat.com  Tue Sep 11 17:21:09 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 13:21:09 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6.bz2.sign, NONE, 1.1 .cvsignore, 
	1.681, 1.682 kernel.spec, 1.154,
	1.155 linux-2.6-utrace-ptrace-compat-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.4,
	1.5 linux-2.6-utrace-tracehook.patch, 1.9, 1.10 sources, 1.643,
	1.644 upstream, 1.565, 1.566 linux-2.6-sched-cfs-fix-mc.patch,
	1.1, NONE linux-2.6-x86-fix-hang-on-C7.patch, 1.1,
	NONE linux-2.6-xen-fix-bootup.patch, 1.1,
	NONE linux-2.6-xfs-quota-hashtable-allocation-fix.patch, 1.1,
	NONE linux-2.6-xfs-sane-filestreams-object-timeout.patch, 1.1,
	NONE patch-2.6.23-rc5-git1.bz2.sign, 1.1,
	NONE patch-2.6.23-rc5.bz2.sign, 1.1, NONE
Message-ID: <200709111721.l8BHL9jR004633@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4577

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-utrace-ptrace-compat-ia64.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc6.bz2.sign 
Removed Files:
	linux-2.6-sched-cfs-fix-mc.patch 
	linux-2.6-x86-fix-hang-on-C7.patch 
	linux-2.6-xen-fix-bootup.patch 
	linux-2.6-xfs-quota-hashtable-allocation-fix.patch 
	linux-2.6-xfs-sane-filestreams-object-timeout.patch 
	patch-2.6.23-rc5-git1.bz2.sign patch-2.6.23-rc5.bz2.sign 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6



--- NEW FILE patch-2.6.23-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG5gdmyGugalF9Dw4RAkNmAJ4v85yBt0vYY0Kv5TB5dPzlcEfibQCcDdaH
6yOAhDbVmL46P/SekJp93e4=
=8jFC
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -r1.681 -r1.682
--- .cvsignore	5 Sep 2007 19:43:23 -0000	1.681
+++ .cvsignore	11 Sep 2007 17:20:35 -0000	1.682
@@ -3,5 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5-git1.bz2
+patch-2.6.23-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kernel.spec	10 Sep 2007 20:35:15 -0000	1.154
+++ kernel.spec	11 Sep 2007 17:20:35 -0000	1.155
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -659,19 +659,14 @@
 Patch1230: linux-2.6-powerpc-spu-vicinity.patch
 Patch1300: linux-2.6-usb-suspend-classes.patch
 Patch1400: linux-2.6-smarter-relatime.patch
-Patch1500: linux-2.6-xfs-sane-filestreams-object-timeout.patch
 Patch1501: linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
-Patch1502: linux-2.6-xfs-quota-hashtable-allocation-fix.patch
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1520: linux-2.6-xen-fix-bootup.patch
 Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
-Patch1530: linux-2.6-x86-fix-hang-on-C7.patch
-Patch1535: linux-2.6-sched-cfs-fix-mc.patch
 Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
@@ -1163,9 +1158,7 @@
 ApplyPatch linux-2.6-smarter-relatime.patch
 
 # xfs bugfixes & stack reduction
-ApplyPatch linux-2.6-xfs-sane-filestreams-object-timeout.patch
 ApplyPatch linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
-ApplyPatch linux-2.6-xfs-quota-hashtable-allocation-fix.patch
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
@@ -1200,18 +1193,9 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# Fix Xen bootup
-ApplyPatch linux-2.6-xen-fix-bootup.patch
-
 # fix oops in with sunrpc
 ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
-# fix hang on C7 CPU
-ApplyPatch linux-2.6-x86-fix-hang-on-C7.patch
-
-# fix scheduler on multicore
-ApplyPatch linux-2.6-sched-cfs-fix-mc.patch
-
 # fix x86_64 clock warping
 ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
@@ -1806,6 +1790,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6
+
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix clock warping on x86_64
 

linux-2.6-utrace-ptrace-compat-ia64.patch:

Index: linux-2.6-utrace-ptrace-compat-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-ptrace-compat-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 17:20:35 -0000	1.4
@@ -145,7 +145,7 @@
  /*
   * Write f32-f127 back to task->thread.fph if it has been modified.
   */
-@@ -792,832 +717,6 @@ access_nat_bits (struct task_struct *chi
+@@ -792,831 +717,6 @@ access_nat_bits (struct task_struct *chi
  	return 0;
  }
  
@@ -950,7 +950,6 @@
 -
 -	      case PTRACE_DETACH:
 -		/* detach a process that was attached. */
--		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -		ret = ptrace_detach(child, data);
 -		goto out_tsk;
 -

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset.patch	21 Aug 2007 19:42:55 -0000	1.4
+++ linux-2.6-utrace-regset.patch	11 Sep 2007 17:20:35 -0000	1.5
@@ -3827,12 +3827,13 @@
  
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -99,12 +99,6 @@ int ptrace_detach(struct task_struct *ch
+@@ -99,13 +99,6 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
 -	/* Architecture-specific hardware disable .. */
 -	ptrace_disable(child);
+-	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -
 -	/* .. re-parent .. */
 -	child->exit_code = data;

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace-tracehook.patch	4 Sep 2007 20:53:27 -0000	1.9
+++ linux-2.6-utrace-tracehook.patch	11 Sep 2007 17:20:35 -0000	1.10
@@ -564,12 +564,11 @@
  	}
  }
  
-@@ -273,9 +274,7 @@ static void clear_singlestep(struct task
+@@ -273,8 +274,7 @@ static void clear_singlestep(struct task
   */
  void ptrace_disable(struct task_struct *child)
  { 
 -	clear_singlestep(child);
--	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 -	clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
 +	tracehook_disable_single_step(child);
  }
@@ -2331,8 +2330,8 @@
  {
  	if (!valid_signal(data))
 @@ -234,13 +102,10 @@ int ptrace_detach(struct task_struct *ch
- 	/* Architecture-specific hardware disable .. */
  	ptrace_disable(child);
+ 	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  
 -	write_lock_irq(&tasklist_lock);
 -	/* protect against de_thread()->release_task() */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -r1.643 -r1.644
--- sources	5 Sep 2007 19:43:23 -0000	1.643
+++ sources	11 Sep 2007 17:20:35 -0000	1.644
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-8253467313749aee6065093cd3c5fd9c  patch-2.6.23-rc5.bz2
-4cfdcb5e00c1db78237b15e6ce955367  patch-2.6.23-rc5-git1.bz2
+8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- upstream	5 Sep 2007 19:43:23 -0000	1.565
+++ upstream	11 Sep 2007 17:20:35 -0000	1.566
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc5.bz2
-patch-2.6.23-rc5-git1.bz2
+patch-2.6.23-rc6.bz2


--- linux-2.6-sched-cfs-fix-mc.patch DELETED ---


--- linux-2.6-x86-fix-hang-on-C7.patch DELETED ---


--- linux-2.6-xen-fix-bootup.patch DELETED ---


--- linux-2.6-xfs-quota-hashtable-allocation-fix.patch DELETED ---


--- linux-2.6-xfs-sane-filestreams-object-timeout.patch DELETED ---


--- patch-2.6.23-rc5-git1.bz2.sign DELETED ---


--- patch-2.6.23-rc5.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 17:24:21 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 11 Sep 2007 13:24:21 -0400
Subject: fedora-security/audit fc6,1.253,1.254 fc7,1.95,1.96
Message-ID: <200709111724.l8BHOLWE004715@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4695/audit

Modified Files:
	fc6 fc7 
Log Message:
Note Fedora updates.
Clean-up some old stuff.
Move few misplaced lines.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- fc6	7 Sep 2007 08:42:54 -0000	1.253
+++ fc6	11 Sep 2007 17:24:18 -0000	1.254
@@ -4,10 +4,10 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070907
-# Up to date FC6 as of 20070905
+# Up to date CVE as of CVE email 20070910
+# Up to date FC6 as of 20070910
 
-CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -42,8 +42,9 @@
 CVE-2007-3820 ** (kdebase) #248537
 CVE-2007-3799 ** (php)
 CVE-2007-3798 version (tcpdump, fixed 3.9.7) #250290 [since FEDORA-2007-654]
-CVE-2007-3782 ** (mysql)
-CVE-2007-3781 ** (mysql)
+CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3780 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- fc7	10 Sep 2007 12:20:21 -0000	1.95
+++ fc7	11 Sep 2007 17:24:18 -0000	1.96
@@ -5,11 +5,11 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070907
-# Up to date FC7 as of 20070905
+# Up to date CVE as of CVE email 20070910
+# Up to date FC7 as of 20070910
 
 CVE-2007-4727 VULNERABLE (lighttpd) #284511
-CVE-2007-4743 VULNERABLE (krb5) incomplete CVE-2007-3999 fix
+CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -20,19 +20,19 @@
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
-CVE-2007-4631 VULNERABLE (qgit) #268381
+CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
-CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-CVE-2007-4534 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4533 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4532 backport (vavoom) #256621 [since CVE-2007-4533]
-CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+CVE-2007-4534 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4533 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4532 backport (vavoom) #256621 [since FEDORA-2007-1977]
+CVE-2007-4510 version (clamav, fixed 0.91.2) #253780 [since FEDORA-2007-2050]
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
 CVE-2007-4400 VULNERABLE (konversation) #253545
@@ -53,6 +53,7 @@
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
+CVE-2007-4138 VULNERABLE (samba, fixed 3.0.26) #286311
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
@@ -77,15 +78,16 @@
 CVE-2007-3820 backport (kdelibs) [since FEDORA-2007-1699]
 CVE-2007-3820 backport (kdebase) #248537 [since FEDORA-2007-1700]
 CVE-2007-3799 ** (php)
-CVE-2007-3781 ** (mysql)
-CVE-2007-3782 ** (mysql)
+CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
+CVE-2007-3780 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3770 backport (terminal/xfce) [since FEDORA-2007-1620]
 CVE-2007-3738 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3737 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3736 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3735 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3728 ignore (libsilc, 1.1.1 only)
-CVE-2007-3725 ** (clamav)
+CVE-2007-3725 version (clamav) [since FEDORA-2007-2050]
 CVE-2007-3713 backport (centericq) #247979 [since FEDORA-2007-1160]
 CVE-2007-3656 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3642 version (kernel, fixed 2.6.22.1) [since FEDORA-2007-1130]
@@ -98,13 +100,13 @@
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 version (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-0033]
 CVE-2007-3507 version (flac123, fixed 0.0.10) #246322 [since FEDORA-2007-1045]
-CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277411
-CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277411
+CVE-2007-3478 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3477 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3476 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3475 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3474 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3473 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
+CVE-2007-3472 version (gd, fixed 2.0.35) #277411 [since FEDORA-2007-2055]
 CVE-2007-3410 backport (HelixPlayer) #245838 [since FEDORA-2007-0756]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245807
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
@@ -130,28 +132,27 @@
 CVE-2007-3240 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3239 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3238 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
-CVE-2007-3140 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3231 version (mecab, fixed 0.96) [since FEDORA-2007-0366]
 CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
-CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
-CVE-2007-3099 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
-CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
 CVE-2007-3165 version (tor, fixed 0.1.2.14) #244502 [since FEDORA-2007-1674]
 CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
 CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
 CVE-2007-3145 VULNERABLE (galeon) **
 CVE-2007-3140 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3126 ignore (gimp) just a crash
-CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3123 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-3122 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3121 version (zvbi, fixed 0.2.25) [since FEDORA-2007-0175]
 *CVE-2007-3113 VULNERABLE (cacti) #243592
 *CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
+CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
+CVE-2007-3099 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]
 CVE-2007-3089 version (mozilla) #248518 [since FEDORA-2007-1138]
 CVE-2007-3025 ignore (clamav, Solaris only)
-CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3024 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-3023 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3007 ignore (php) safe mode isn't safe
 *CVE-2007-2975 (openfire)
 CVE-2007-2958 version (claws-mail) #254121 [since FEDORA-2007-2009]
@@ -182,7 +183,7 @@
 CVE-2007-2754 backport (freetype) [since FEDORA-2007-0033]
 CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
 CVE-2007-2683 backport (mutt)
-*CVE-2007-2654 VULNERABLE (xfsdump) #240396
+CVE-2007-2654 version (xfsdump) #240396
 CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
 CVE-2007-2645 backport (libexif) #240055 [since FEDORA-2007-0414]
 *CVE-2007-2637 patch (moin, fixed 1.5.7-2)
@@ -222,8 +223,8 @@
 *CVE-2007-2165 VULNERABLE (proftpd) #237533
 CVE-2007-2138 version (postgresql, fixed 8.2.4) #237682 [since FEDORA-2007-0174]
 CVE-2007-2057 version (aircrack-ng, fixed 0.8-0.1)
-CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2028 (freeradius)
+CVE-2007-2029 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
+CVE-2007-2028 version (freeradius)
 *CVE-2007-2026 (file)
 CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
 CVE-2007-1997 version (clamav, fixed in 0.90.2)
@@ -297,7 +298,7 @@
 CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
 CVE-2007-1401 ignore (php) unshipped cracklib extension
 CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
-*CVE-2007-1398 ignore (snort, inline mode not shipped) #232109
+CVE-2007-1398 ignore (snort, inline mode not shipped) #232109, new upstream [since FEDORA-2007-2060]
 CVE-2007-1396 ignore (php) feature, not a flaw
 *CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1387 patch (xine-lib, fixed 1.1.4-3)
@@ -622,7 +623,7 @@
 *CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 *CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5276 VULNERABLE (snort) #229265
+CVE-2006-5276 version (snort) #229265 [since FEDORA-2007-2060]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 backport (xorg-x11-xinit) #212167 [since FEDORA-2007-1409]
 *CVE-2006-5215 version (xorg-x11-xdm)



From fedora-extras-commits at redhat.com  Tue Sep 11 17:49:32 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 11 Sep 2007 13:49:32 -0400
Subject: fedora-security/audit fc6,1.254,1.255 fc7,1.96,1.97
Message-ID: <200709111749.l8BHnWWD005401@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5379/audit

Modified Files:
	fc6 fc7 
Log Message:
Add few more issues



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- fc6	11 Sep 2007 17:24:18 -0000	1.254
+++ fc6	11 Sep 2007 17:49:30 -0000	1.255
@@ -7,7 +7,9 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC6 as of 20070910
 
+CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
+CVE-2007-4730 VULNERABLE (xorg-x11) #286061
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fc7	11 Sep 2007 17:24:18 -0000	1.96
+++ fc7	11 Sep 2007 17:49:30 -0000	1.97
@@ -8,8 +8,10 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
-CVE-2007-4727 VULNERABLE (lighttpd) #284511
+CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
+CVE-2007-4730 VULNERABLE (xorg-x11) #286051
+CVE-2007-4727 VULNERABLE (lighttpd) #284511
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -290,7 +292,7 @@
 CVE-2007-1463 version (inkscape, fixed 0.45.1)
 CVE-2007-1460 version (php, fixed 5.2.2)
 CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
-*CVE-2007-1420 VULNERABLE (mysql, fixed 5.0.36) #232604
+CVE-2007-1420 version (mysql, fixed 5.0.36) #232604
 CVE-2007-1413 ignore (php) Windows NT SNMP specific
 CVE-2007-1412 ignore (php) unshipped cpdf extension
 CVE-2007-1411 ignore (php) unshipped mssql extension



From fedora-extras-commits at redhat.com  Tue Sep 11 17:57:30 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 11 Sep 2007 13:57:30 -0400
Subject: rpms/emacs/devel emacs.spec,1.97,1.98
Message-ID: <200709111757.l8BHvUHd005698@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5670

Modified Files:
	emacs.spec 
Log Message:
* Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
- fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
- use macro instead of variable style for buildroot.



Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- emacs.spec	27 Aug 2007 20:50:03 -0000	1.97
+++ emacs.spec	11 Sep 2007 17:56:57 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -46,6 +46,9 @@
 %define paranoid 1
 %define expurgate 0
 
+%define site_lisp %{_datadir}/emacs/site-lisp
+%define pkgconfig %{_datadir}/pkgconfig
+
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
 editor. Emacs contains special code editing features, a scripting
@@ -143,7 +146,7 @@
 
 %__make %{?_smp_mflags} -C lisp updates
 
-# Create pkg-config file
+# Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
 sitestartdir=%{site_lisp}/site-start.d
@@ -154,12 +157,12 @@
 EOF
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall
 
 # let alternatives manage the symlink
-rm $RPM_BUILD_ROOT%{_bindir}/emacs
+rm %{buildroot}%{_bindir}/emacs
 
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
@@ -168,44 +171,42 @@
 %__make %{?_smp_mflags}
 
 # install the emacs without X
-install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox
+install -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
 
 # make sure movemail isn't setgid
-chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail
-
-%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{site_lisp}
-install -m 0644 %SOURCE4 %{site_lisp}/site-start.el
-install -m 0644 %SOURCE18 %{site_lisp}
-
-mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs}
-mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1}
-mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags}
+mkdir -p %{buildroot}%{site_lisp}
+install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
+install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
+
+mv %{buildroot}%{_bindir}/{etags,etags.emacs}
+mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
+mv %{buildroot}%{_bindir}/{ctags,gctags}
 
 # GNOME / KDE files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/gnu-emacs.desktop
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/pixmaps/
 
 # install site-lisp files
-install -m 0644 site-lisp/*.el{,c} %{site_lisp}
+install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
 
-mkdir -p %{site_lisp}/site-start.d
-install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d
+mkdir -p %{buildroot}%{site_lisp}/site-start.d
+install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
 
 # default initialization file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs
+mkdir -p %{buildroot}%{_sysconfdir}/skel
+install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
 
 # install pkgconfig file
-mkdir -p %{buildroot}%{_datadir}/pkg-config
-install -m 0644 emacs.pc %{buildroot}%{_datadir}/pkg-config
+mkdir -p %{buildroot}/%{pkgconfig}
+install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # after everything is installed, remove info dir
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/*
+rm -f %{buildroot}%{_infodir}/dir
+rm %{buildroot}%{_localstatedir}/games/emacs/*
 
 #
 # create file lists
@@ -213,7 +214,7 @@
 rm -f *-filelist {common,el}-*-files
 
 ( TOPDIR=${PWD}
-  cd $RPM_BUILD_ROOT
+  cd %{buildroot}
 
   find .%{_datadir}/emacs/%{version}/lisp \
     .%{_datadir}/emacs/%{version}/leim \
@@ -227,7 +228,7 @@
 cat el-*-files common-lisp-dir-files > el-filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
@@ -295,11 +296,15 @@
 
 %files -f el-filelist el
 %defattr(-,root,root)
-%{_datadir}/pkg-config/emacs.pc
+%{pkgconfig}/emacs.pc
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
+- fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
+- use macro instead of variable style for buildroot.
+
 * Mon Aug 28 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
 - change group from Development to Utility
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:04:30 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 14:04:30 -0400
Subject: rpms/kernel/devel kernel.spec, 1.155,
	1.156 linux-2.6-utrace-ptrace-compat-ia64.patch, 1.4,
	1.5 linux-2.6-utrace-ptrace-compat.patch, 1.5,
	1.6 linux-2.6-utrace-regset-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-regset.patch, 1.5,
	1.6 linux-2.6-utrace-tracehook-ia64.patch, 1.3,
	1.4 linux-2.6-utrace-tracehook.patch, 1.10, 1.11
Message-ID: <200709111804.l8BI4UrW011977@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11872

Modified Files:
	kernel.spec linux-2.6-utrace-ptrace-compat-ia64.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset-ia64.patch 
	linux-2.6-utrace-regset.patch 
	linux-2.6-utrace-tracehook-ia64.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- utrace update



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kernel.spec	11 Sep 2007 17:20:35 -0000	1.155
+++ kernel.spec	11 Sep 2007 18:03:54 -0000	1.156
@@ -1791,6 +1791,9 @@
 
 %changelog
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- utrace update
+
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6
 
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-utrace-ptrace-compat-ia64.patch:

Index: linux-2.6-utrace-ptrace-compat-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat-ia64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 17:20:35 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat-ia64.patch	11 Sep 2007 18:03:54 -0000	1.5
@@ -9,8 +9,8 @@
 ---
 
  arch/ia64/ia32/sys_ia32.c |   40 ++
- arch/ia64/kernel/ptrace.c | 1020 +++++----------------------------------------
- 2 files changed, 159 insertions(+), 901 deletions(-)
+ arch/ia64/kernel/ptrace.c | 1019 +++++----------------------------------------
+ 2 files changed, 159 insertions(+), 900 deletions(-)
 
 --- linux-2.6/arch/ia64/ia32/sys_ia32.c
 +++ linux-2.6/arch/ia64/ia32/sys_ia32.c
@@ -977,7 +977,7 @@
  
  /* "asmlinkage" so the input arguments are preserved... */
  
-@@ -1671,6 +770,9 @@ syscall_trace_leave (long arg0, long arg
+@@ -1670,6 +770,9 @@ syscall_trace_leave (long arg0, long arg
  	}
  }
  
@@ -987,7 +987,7 @@
  /* Utrace implementation starts here */
  
  typedef struct utrace_get {
-@@ -2464,3 +1566,119 @@ const struct utrace_regset_view *utrace_
+@@ -2463,3 +1566,119 @@ const struct utrace_regset_view *utrace_
  #endif
  	return &utrace_ia64_native;
  }

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-ptrace-compat.patch	4 Sep 2007 20:53:27 -0000	1.5
+++ linux-2.6-utrace-ptrace-compat.patch	11 Sep 2007 18:03:54 -0000	1.6
@@ -24,7 +24,7 @@
  arch/powerpc/lib/sstep.c        |    3 
  kernel/fork.c                   |    2 
  kernel/exit.c                   |   13 
- kernel/ptrace.c                 | 2055 +++++++++++++++++++++++++++++++++++++--
+ kernel/ptrace.c                 | 2056 +++++++++++++++++++++++++++++++++++++--
  kernel/sys_ni.c                 |    4 
  kernel/Makefile                 |    3 
  include/linux/sched.h           |    4 
@@ -32,7 +32,7 @@
  include/asm-x86_64/tracehook.h  |    1 
  include/asm-x86_64/ptrace-abi.h |    3 
  init/Kconfig                    |   15 
- 20 files changed, 2642 insertions(+), 780 deletions(-)
+ 20 files changed, 2643 insertions(+), 780 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
 
 --- linux-2.6/fs/proc/base.c
@@ -1331,7 +1331,7 @@
  		tsk = next_thread(tsk);
 --- linux-2.6/kernel/ptrace.c
 +++ linux-2.6/kernel/ptrace.c
-@@ -19,213 +19,2008 @@
+@@ -19,213 +19,2009 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1777,11 +1777,8 @@
 +static int ptrace_detach(struct task_struct *task,
 +			 struct utrace_attached_engine *engine,
 +			 struct ptrace_state *state)
- {
--	if (!valid_signal(data))
--		return -EIO;
- 
--	return -ENOSYS;
++{
++
 +	int error;
 +
 +	NO_LOCKS;
@@ -1839,29 +1836,20 @@
 +		spin_unlock_irq(&current->sighand->siglock);
 +	}
 +	return error;
- }
- 
--int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
++}
++
 +
 +/*
 + * This is called when we are exiting.  We must stop all our ptracing.
 + */
 +void
 +ptrace_exit(struct task_struct *tsk)
- {
--	int copied = 0;
++{
 +	struct list_head *pos, *n;
 +	int restart;
- 
--	while (len > 0) {
--		char buf[128];
--		int this_len, retval;
++
 +	NO_LOCKS;
- 
--		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
--		retval = access_process_vm(tsk, src, buf, this_len, 0);
--		if (!retval) {
--			if (copied)
++
 +	/*
 +	 * Taking the task_lock after PF_EXITING is set ensures that a
 +	 * child in ptrace_traceme will not put itself on our list when
@@ -1874,7 +1862,6 @@
 +	}
 +	task_unlock(tsk);
 +
-+	restart = 0;
 +	do {
 +		struct ptrace_state *state;
 +		int error;
@@ -1883,6 +1870,7 @@
 +
 +		rcu_read_lock();
 +
++		restart = 0;
 +		list_for_each_safe_rcu(pos, n, &tsk->ptracees) {
 +			state = list_entry(pos, struct ptrace_state, entry);
 +			error = utrace_detach(state->task, state->engine);
@@ -1904,7 +1892,7 @@
 +				wait_task_inactive(p);
 +				put_task_struct(p);
 +				restart = 1;
- 				break;
++				goto loop_unlocked;
 +			}
 +			else {
 +				BUG_ON(error != -ESRCH);
@@ -1914,10 +1902,11 @@
 +
 +		rcu_read_unlock();
 +
++	loop_unlocked:
 +		END_CHECK;
 +
 +		cond_resched();
-+	} while (restart > 0);
++	} while (unlikely(restart > 0));
 +
 +	if (likely(restart == 0))
 +		/*
@@ -1976,14 +1965,16 @@
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long offset, unsigned int size,
 +		     void __user *data, int write)
-+{
+ {
+-	if (!valid_signal(data))
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	int ret;
 +
 +	if (unlikely(regset == NULL))
-+		return -EIO;
-+
+ 		return -EIO;
+ 
+-	return -ENOSYS;
 +	if (size == (unsigned int) -1)
 +		size = regset->size * regset->n;
 +
@@ -2003,23 +1994,33 @@
 +	}
 +
 +	return ret;
-+}
-+
+ }
+ 
+-int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
 +int
 +ptrace_onereg_access(struct task_struct *target,
 +		     struct utrace_attached_engine *engine,
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long regno,
 +		     void __user *data, int write)
-+{
+ {
+-	int copied = 0;
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	unsigned int pos;
 +	int ret;
-+
+ 
+-	while (len > 0) {
+-		char buf[128];
+-		int this_len, retval;
 +	if (unlikely(regset == NULL))
 +		return -EIO;
-+
+ 
+-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+-		retval = access_process_vm(tsk, src, buf, this_len, 0);
+-		if (!retval) {
+-			if (copied)
+-				break;
 +	if (regno < regset->bias || regno >= regset->bias + regset->n)
 +		return -EINVAL;
 +
@@ -2191,12 +2192,6 @@
 +				ret = -ESRCH;
 +			if (unlikely(ret))
 +				BUG_ON(ret != -ESRCH);
-+		}
-+
-+		if (ret) {
-+			pr_debug("%d not stopped (%lu)\n",
-+				 child->pid, child->state);
-+			goto out_tsk_rcu;
  		}
 -		if (copy_to_user(dst, buf, retval))
 -			return -EFAULT;
@@ -2205,6 +2200,12 @@
 -		dst += retval;
 -		len -= retval;			
 +
++		if (ret) {
++			pr_debug("%d not stopped (%lu)\n",
++				 child->pid, child->state);
++			goto out_tsk_rcu;
++		}
++
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
  	}
 -	return copied;
@@ -2403,14 +2404,9 @@
 +		if (ret == 0) {
 +			ret = val;
 +			force_successful_syscall_return();
- 		}
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +		goto out_tsk;
- 	}
--	return copied;
++	}
 +
 +	switch (request) {
 +	default:
@@ -2457,9 +2453,14 @@
 +					   (siginfo_t __user *) data,
 +					   sizeof(siginfo_t)))
 +				ret = -EFAULT;
-+		}
+ 		}
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		break;
-+	}
+ 	}
+-	return copied;
 +
 +out_tsk:
 +	NO_LOCKS;
@@ -2556,13 +2557,13 @@
 +	return ret;
  }
 +#endif
-+
  
 -/**
 - * ptrace_traceme  --  helper for PTRACE_TRACEME
 - *
 - * Performs checks and sets PT_PTRACED.
 - * Should be used by all ptrace implementations for PTRACE_TRACEME.
++
 +/*
 + * Detach the zombie being reported for wait.
   */
@@ -2572,13 +2573,13 @@
 +	      struct task_struct *p, struct ptrace_state *state)
  {
 -	int ret = -EPERM;
--
--	ret = security_ptrace(current->parent, current);
--	if (ret)
--		return -EPERM;
 +	int detach_error;
 +	struct utrace_attached_engine *engine;
  
+-	ret = security_ptrace(current->parent, current);
+-	if (ret)
+-		return -EPERM;
+-
 -	return -ENOSYS;
 +restart:
 +	NO_LOCKS;
@@ -2926,7 +2927,7 @@
 -		get_task_struct(child);
 +	if (unlikely(parent->signal == NULL))
 +		goto out;
-+
+ 
 +	sighand = parent->sighand;
 +	spin_lock_irqsave(&sighand->siglock, flags);
 +	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
@@ -2937,7 +2938,7 @@
 +	 */
 +	wake_up_interruptible_sync(&parent->signal->wait_chldexit);
 +	spin_unlock_irqrestore(&sighand->siglock, flags);
- 
++
 +out:
  	read_unlock(&tasklist_lock);
 -	if (!child)
@@ -3179,13 +3180,15 @@
 +	NO_LOCKS;
 +	printk(KERN_ERR "ptrace out of memory, lost child %d of %d",
 +	       child->pid, parent->pid);
-+}
-+
+ }
+ 
+-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
 +static u32
 +ptrace_report_clone(struct utrace_attached_engine *engine,
 +		    struct task_struct *parent,
 +		    unsigned long clone_flags, struct task_struct *child)
-+{
+ {
+-	int copied;
 +	int event, option;
 +	struct ptrace_state *state;
 +
@@ -3216,7 +3219,9 @@
 +	}
 +	else
 +		event = 0;
-+
+ 
+-	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
+-	return (copied == sizeof(data)) ? 0 : -EIO;
 +	if (!(clone_flags & CLONE_UNTRACED)
 +	    && (event || (clone_flags & CLONE_PTRACE))) {
 +		/*
@@ -3276,7 +3281,7 @@
 +	state->have_eventmsg = 0;
 +	state->u.siginfo = info;
 +	return ptrace_report(engine, tsk, state, signo) | UTRACE_SIGNAL_IGN;
-+}
+ }
 +
 +static u32
 +ptrace_report_jctl(struct utrace_attached_engine *engine,
@@ -3367,14 +3372,12 @@
 +			   struct task_struct *tsk, struct pt_regs *regs)
 +{
 +	return ptrace_report_syscall(engine, tsk, regs, 0);
- }
- 
--int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
++}
++
 +static u32
 +ptrace_report_exit(struct utrace_attached_engine *engine,
 +		   struct task_struct *tsk, long orig_code, long *code)
- {
--	int copied;
++{
 +	struct ptrace_state *state = get_ptrace_state(engine, tsk);
 +	if (unlikely(state == NULL))
 +		return UTRACE_ACTION_RESUME;
@@ -3401,11 +3404,9 @@
 +	}
 +
 +	END_CHECK;
- 
--	copied = access_process_vm(tsk, addr, &data, sizeof(data), 1);
--	return (copied == sizeof(data)) ? 0 : -EIO;
++
 +	return unsafe;
- }
++}
 +
 +static struct task_struct *
 +ptrace_tracer_task(struct utrace_attached_engine *engine,

linux-2.6-utrace-regset-ia64.patch:

Index: linux-2.6-utrace-regset-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-regset-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-regset-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
@@ -603,7 +603,7 @@
  asmlinkage long
  sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
  {
-@@ -1602,6 +1617,7 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1601,6 +1616,7 @@ sys_ptrace (long request, pid_t pid, uns
  	unlock_kernel();
  	return ret;
  }
@@ -611,7 +611,7 @@
  
  /* "asmlinkage" so the input arguments are preserved... */
  
-@@ -1654,3 +1670,797 @@ syscall_trace_leave (long arg0, long arg
+@@ -1653,3 +1669,797 @@ syscall_trace_leave (long arg0, long arg
  		tracehook_report_syscall_step(&regs);
  	}
  }

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace-regset.patch	11 Sep 2007 17:20:35 -0000	1.5
+++ linux-2.6-utrace-regset.patch	11 Sep 2007 18:03:55 -0000	1.6
@@ -19,12 +19,12 @@
  arch/powerpc/kernel/Makefile   |    2 
  arch/powerpc/kernel/ptrace32.c |   20 -
  arch/powerpc/kernel/ptrace.c   |  617 ++++++++++++++++++++----------
- kernel/ptrace.c                |    8 
+ kernel/ptrace.c                |    9 
  include/linux/tracehook.h      |  255 ++++++++++++-
  include/asm-i386/i387.h        |   13 -
  include/asm-x86_64/fpu32.h     |    3 
  include/asm-x86_64/tracehook.h |    8 
- 13 files changed, 2203 insertions(+), 1217 deletions(-)
+ 13 files changed, 2203 insertions(+), 1218 deletions(-)
 
 --- linux-2.6/arch/i386/kernel/i387.c
 +++ linux-2.6/arch/i386/kernel/i387.c
@@ -3841,7 +3841,7 @@
  	return -ENOSYS;
  }
  
-@@ -212,12 +206,10 @@ struct task_struct *ptrace_get_task_stru
+@@ -213,12 +206,10 @@ struct task_struct *ptrace_get_task_stru
  	return child;
  }
  

linux-2.6-utrace-tracehook-ia64.patch:

Index: linux-2.6-utrace-tracehook-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-ia64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook-ia64.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-tracehook-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
@@ -93,7 +93,7 @@
  #include <linux/smp_lock.h>
  #include <linux/user.h>
  #include <linux/security.h>
-@@ -1602,28 +1603,6 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1601,28 +1602,6 @@ sys_ptrace (long request, pid_t pid, uns
  	return ret;
  }
  
@@ -122,7 +122,7 @@
  /* "asmlinkage" so the input arguments are preserved... */
  
  asmlinkage void
-@@ -1631,9 +1610,8 @@ syscall_trace_enter (long arg0, long arg
+@@ -1630,9 +1609,8 @@ syscall_trace_enter (long arg0, long arg
  		     long arg4, long arg5, long arg6, long arg7,
  		     struct pt_regs regs)
  {
@@ -134,7 +134,7 @@
  
  	if (unlikely(current->audit_context)) {
  		long syscall;
-@@ -1668,8 +1646,11 @@ syscall_trace_leave (long arg0, long arg
+@@ -1667,8 +1645,11 @@ syscall_trace_leave (long arg0, long arg
  		audit_syscall_exit(success, result);
  	}
  

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-utrace-tracehook.patch	11 Sep 2007 17:20:35 -0000	1.10
+++ linux-2.6-utrace-tracehook.patch	11 Sep 2007 18:03:55 -0000	1.11
@@ -47,7 +47,7 @@
  arch/s390/kernel/process.c          |    3 
  arch/frv/kernel/ptrace.c            |   15 -
  arch/i386/math-emu/fpu_entry.c      |    6 -
- arch/i386/kernel/ptrace.c           |  104 ++-------
+ arch/i386/kernel/ptrace.c           |  103 ++-------
  arch/i386/kernel/signal.c           |   37 +--
  arch/i386/kernel/process.c          |    3 
  arch/i386/kernel/vm86.c             |    7 -
@@ -100,7 +100,7 @@
  include/asm-x86_64/thread_info.h    |    3 
  drivers/connector/cn_proc.c         |    4 
  mm/nommu.c                          |    4 
- 67 files changed, 904 insertions(+), 1140 deletions(-)
+ 67 files changed, 904 insertions(+), 1139 deletions(-)
  create include/linux/tracehook.h
  create include/asm-i386/tracehook.h
  create include/asm-powerpc/tracehook.h
@@ -574,7 +574,7 @@
  }
  
  /*
-@@ -476,18 +475,18 @@ long arch_ptrace(struct task_struct *chi
+@@ -475,18 +475,18 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  		if (request == PTRACE_SYSEMU) {
@@ -597,7 +597,7 @@
  		wake_up_process(child);
  		ret = 0;
  		break;
-@@ -503,7 +502,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -502,7 +502,7 @@ long arch_ptrace(struct task_struct *chi
  			break;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -606,7 +606,7 @@
  		wake_up_process(child);
  		break;
  
-@@ -513,13 +512,8 @@ long arch_ptrace(struct task_struct *chi
+@@ -512,13 +512,8 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  
@@ -621,7 +621,7 @@
  		child->exit_code = data;
  		/* give it a chance to run. */
  		wake_up_process(child);
-@@ -647,78 +641,24 @@ void send_sigtrap(struct task_struct *ts
+@@ -646,78 +641,24 @@ void send_sigtrap(struct task_struct *ts
   * - triggered by current->work.syscall_trace
   */
  __attribute__((regparm(3)))
@@ -2329,7 +2329,7 @@
  int ptrace_detach(struct task_struct *child, unsigned int data)
  {
  	if (!valid_signal(data))
-@@ -234,13 +102,10 @@ int ptrace_detach(struct task_struct *ch
+@@ -235,13 +103,10 @@ int ptrace_detach(struct task_struct *ch
  	ptrace_disable(child);
  	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  
@@ -2346,7 +2346,7 @@
  }
  
  int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
-@@ -293,103 +158,10 @@ int ptrace_writedata(struct task_struct 
+@@ -294,103 +159,10 @@ int ptrace_writedata(struct task_struct 
  	return copied;
  }
  
@@ -2451,7 +2451,7 @@
  }
  
  /**
-@@ -402,20 +174,11 @@ int ptrace_traceme(void)
+@@ -403,20 +175,11 @@ int ptrace_traceme(void)
  {
  	int ret = -EPERM;
  
@@ -2477,7 +2477,7 @@
  }
  
  /**
-@@ -452,42 +215,7 @@ struct task_struct *ptrace_get_task_stru
+@@ -453,42 +216,7 @@ struct task_struct *ptrace_get_task_stru
  #ifndef __ARCH_SYS_PTRACE
  asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
  {



From fedora-extras-commits at redhat.com  Tue Sep 11 18:11:00 2007
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Tue, 11 Sep 2007 14:11:00 -0400
Subject: rpms/samba/F-7 .cvsignore, 1.42, 1.43 filter-requires-samba.sh, 1.5,
	1.6 samba.spec, 1.130, 1.131 sources, 1.46,
	1.47 samba-3.0.25-imdap-basedn.patch, 1.1, NONE
Message-ID: <200709111811.l8BIB028012346@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12293

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec sources 
Removed Files:
	samba-3.0.25-imdap-basedn.patch 
Log Message:
* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
- upgrade to the latest upstream realease
- includes security fixes released today in 3.0.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	21 Aug 2007 13:53:11 -0000	1.42
+++ .cvsignore	11 Sep 2007 18:10:27 -0000	1.43
@@ -1 +1 @@
-samba-3.0.25c.tar.gz
+samba-3.0.26a.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/filter-requires-samba.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filter-requires-samba.sh	14 Mar 2007 10:21:24 -0000	1.5
+++ filter-requires-samba.sh	11 Sep 2007 18:10:27 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8|smbldap_tools)'


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- samba.spec	21 Aug 2007 13:53:11 -0000	1.130
+++ samba.spec	11 Sep 2007 18:10:27 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25c
+Version: 3.0.26a
 Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -41,7 +41,6 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch210: samba-3.0.25-imdap-basedn.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -158,7 +157,6 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
-%patch210 -p1 -b .idmap_basedn
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -641,6 +639,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Sep 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-0.fc8
+- upgrade to the latest upstream realease
+- includes security fixes released today in 3.0.26
+
 * Tue Aug 21 2007 Simo Sorce <ssorce at redhat.com> 3.0.25c-0.fc7
 - update to 3.0.25c
 - add patch to fix samba bugzilla 4772


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	21 Aug 2007 13:53:11 -0000	1.46
+++ sources	11 Sep 2007 18:10:27 -0000	1.47
@@ -1 +1 @@
-87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz
+6511ff23d9b1d4858744778bba543c5d  samba-3.0.26a.tar.gz


--- samba-3.0.25-imdap-basedn.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 18:12:06 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:12:06 -0400
Subject: rpms/mksh/devel .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709111812.l8BIC6Nj012419@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:27:40 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:11:32 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:27:40 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:11:32 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:27:41 -0000	1.5
+++ sources	11 Sep 2007 18:11:32 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:13:15 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:13:15 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.5,1.6 mksh.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200709111813.l8BIDFIp012491@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12450

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:29:14 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:12:41 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:29:14 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:12:41 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:29:14 -0000	1.5
+++ sources	11 Sep 2007 18:12:41 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:14:22 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:14:22 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111814.l8BIEMRq012588@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12516

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:31:16 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:13:49 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:31:16 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:13:49 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:31:16 -0000	1.5
+++ sources	11 Sep 2007 18:13:49 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:15:36 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:15:36 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111815.l8BIFaeV012668@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12629

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:32:33 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:15:03 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:32:33 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:15:03 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:32:33 -0000	1.5
+++ sources	11 Sep 2007 18:15:03 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:16:30 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Tue, 11 Sep 2007 14:16:30 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.5, 1.6 mksh.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200709111816.l8BIGUhf012720@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12688

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31b
- Use script to get %check happy (thanks to Thorsten Glaser)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2007 00:33:53 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:15:57 -0000	1.6
@@ -1 +1 @@
-mksh-R31.cpio.gz
+mksh-R31b.cpio.gz


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mksh.spec	8 Sep 2007 00:33:53 -0000	1.6
+++ mksh.spec	11 Sep 2007 18:15:57 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31
+Version:          31b
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -10,6 +10,7 @@
 Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
 Requires(post):   grep
 Requires(postun): coreutils, grep
+BuildRequires:    util-linux
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -35,7 +36,7 @@
 install -D -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %check
-sh test.sh -v
+script -qc "./test.sh -v"
 
 %post
 if [ ! -f %{_sysconfdir}/shells ]; then
@@ -61,6 +62,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
+- Upgrade to 31b
+- Use script to get %%check happy (thanks to Thorsten Glaser)
+
 * Sat Sep 08 2007 Robert Scheck <robert at fedoraproject.org> 31-1
 - Upgrade to 31
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2007 00:33:53 -0000	1.5
+++ sources	11 Sep 2007 18:15:57 -0000	1.6
@@ -1 +1 @@
-383703d3bd612d48f9081773726545e8  mksh-R31.cpio.gz
+819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 18:22:09 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 11 Sep 2007 14:22:09 -0400
Subject: rpms/gnash/OLPC-2 .cvsignore, 1.5, 1.6 gnash.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200709111822.l8BIM9io013111@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jul 2007 16:09:51 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:21:35 -0000	1.6
@@ -1,3 +1,4 @@
 gnash-0.7.2.tar.bz2
 gnash-0.8.0.tar.bz2
 gnash-0.8.1.20070718cvs.tar.bz2
+gnash-0.8.1.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnash.spec	18 Jul 2007 16:09:51 -0000	1.18
+++ gnash.spec	11 Sep 2007 18:21:35 -0000	1.19
@@ -1,14 +1,12 @@
-%define alphatag 20070718cvs
-
 Name:           gnash
 Version:        0.8.1
-Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.%{alphatag}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -116,6 +114,9 @@
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
 %changelog
+* Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> - 0.8.1-1
+- update to release
+
 * Wed Jul 18 2007 John (J5) Palmieri <johnp at redhat.com> - 0.8.1-0.1.20070718cvs
 - update to CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jul 2007 16:09:51 -0000	1.5
+++ sources	11 Sep 2007 18:21:35 -0000	1.6
@@ -1 +1 @@
-7b4d3dc51ba1902af113e7d001b90b41  gnash-0.8.1.20070718cvs.tar.bz2
+5f80a25cb7a37fb351d28fd2097d8f3e  gnash-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 18:34:15 2007
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 11 Sep 2007 14:34:15 -0400
Subject: rpms/gperiodic/devel gtk.patch,NONE,1.1 gperiodic.spec,1.8,1.9
Message-ID: <200709111834.l8BIYFDX013720@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13689

Modified Files:
	gperiodic.spec 
Added Files:
	gtk.patch 
Log Message:


gtk.patch:

--- NEW FILE gtk.patch ---
--- gperiodic-2.0.10/Makefile	2007-07-11 14:58:05.000000000 +0200
+++ gperiodic-2.0.10/Makefile	2007-09-11 20:11:45.000000000 +0200
@@ -1,5 +1,5 @@
 CC := gcc
-CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
 LIBS :=`pkg-config --libs gtk+-2.0`
 bindir ?= /usr/bin
 datadir ?= /usr/share


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gperiodic.spec	8 Sep 2007 07:20:43 -0000	1.8
+++ gperiodic.spec	11 Sep 2007 18:33:42 -0000	1.9
@@ -1,14 +1,15 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 Patch0: gperiodic-bh.patch
+Patch1: gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel, desktop-file-utils, gettext
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, 
 
 %description
 Gperiodic displays a periodic table of the elements, allowing you to
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
@@ -54,6 +56,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-2
+- Patch to erase DGTK_DISABLE_DEPRECATED flag from the Makefile
+
 * Sat Sep 08 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> 2.0.10-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:41:47 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 14:41:47 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.55,1.56
Message-ID: <200709111841.l8BIflUx013989@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13944

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- policy-20070501.patch	11 Sep 2007 15:56:03 -0000	1.55
+++ policy-20070501.patch	11 Sep 2007 18:41:14 -0000	1.56
@@ -2198,7 +2198,7 @@
  /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-08-27 09:57:21.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/files.if	2007-09-11 14:40:52.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2301,7 +2301,32 @@
  ')
  
  ########################################
-@@ -3310,6 +3346,43 @@
+@@ -3112,6 +3148,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Manage temporary directories in /tmp.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`files_manage_generic_tmp_dirs',`
++	gen_require(`
++		type tmp_t;
++	')
++
++	manage_dirs_pattern($1,tmp_t,tmp_t)
++')
++
++########################################
++## <summary>
+ ##	Manage temporary files and directories in /tmp.
+ ## </summary>
+ ## <param name="domain">
+@@ -3310,6 +3364,43 @@
  
  ########################################
  ## <summary>
@@ -2345,7 +2370,7 @@
  ##	Get the attributes of files in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3386,6 +3459,24 @@
+@@ -3386,6 +3477,24 @@
  
  ########################################
  ## <summary>
@@ -2370,7 +2395,7 @@
  ##	Read symbolic links in /usr.
  ## </summary>
  ## <param name="domain">
-@@ -3432,6 +3523,24 @@
+@@ -3432,6 +3541,24 @@
  
  ########################################
  ## <summary>
@@ -2395,7 +2420,7 @@
  ##	Do not audit attempts to search /usr/src.
  ## </summary>
  ## <param name="domain">
-@@ -3637,7 +3746,7 @@
+@@ -3637,7 +3764,7 @@
  		type var_t;
  	')
  
@@ -2404,7 +2429,7 @@
  ')
  
  ########################################
-@@ -3993,7 +4102,7 @@
+@@ -3993,7 +4120,7 @@
  		type var_lock_t;
  	')
  
@@ -2413,7 +2438,7 @@
  ')
  
  ########################################
-@@ -4012,7 +4121,7 @@
+@@ -4012,7 +4139,7 @@
  		type var_t, var_lock_t;
  	')
  
@@ -2422,7 +2447,7 @@
  ')
  
  ########################################
-@@ -4181,7 +4290,7 @@
+@@ -4181,7 +4308,7 @@
  		type var_run_t;
  	')
  
@@ -2431,7 +2456,7 @@
  ')
  
  ########################################
-@@ -4529,6 +4638,8 @@
+@@ -4529,6 +4656,8 @@
  	# Need to give access to /selinux/member
  	selinux_compute_member($1)
  
@@ -2440,7 +2465,7 @@
  	# Need sys_admin capability for mounting
  	allow $1 self:capability { chown fsetid sys_admin };
  
-@@ -4551,6 +4662,8 @@
+@@ -4551,6 +4680,8 @@
  	# Default type for mountpoints
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
@@ -2449,7 +2474,7 @@
  ')
  
  ########################################
-@@ -4588,3 +4701,28 @@
+@@ -4588,3 +4719,28 @@
  
  	allow $1 { file_type -security_file_type }:dir manage_dir_perms;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 11 18:46:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 11 Sep 2007 14:46:59 -0400
Subject: rpms/mach/F-7 .cvsignore, 1.5, 1.6 mach.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <200709111846.l8BIkxeE014189@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14155/F-7

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2007 21:47:36 -0000	1.5
+++ .cvsignore	11 Sep 2007 18:46:26 -0000	1.6
@@ -1 +1 @@
-mach-0.9.1.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/mach.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mach.spec	24 Jan 2007 10:44:09 -0000	1.12
+++ mach.spec	11 Sep 2007 18:46:26 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           mach
-Version:        0.9.1
+Version:        0.9.2
 Release:        2%{?dist}
-Summary:        make a chroot
+Summary:        Make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -44,7 +44,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=updates
 make
 
 %install
@@ -56,19 +56,13 @@
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/tmp/mach
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach
 
-# the ppc dist files were not added to the dist, so install them manually
-for v in 4 5 6 development
-do
-  install -m 644 etc/dist.d/fedora-$v-ppc %{_sysconfdir}/mach/dist.d
-done
-
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -102,6 +96,18 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
+- License: GPLv2+
+
 * Wed Jan 24 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2
 - add ppc files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mach/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:47:36 -0000	1.6
+++ sources	11 Sep 2007 18:46:26 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 18:56:02 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Sep 2007 14:56:02 -0400
Subject: rpms/firefox/devel firefox-2.0-indicator-crash.patch, NONE,
	1.1 firefox.spec, 1.195, 1.196
Message-ID: <200709111856.l8BIu2OH014597@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14563

Modified Files:
	firefox.spec 
Added Files:
	firefox-2.0-indicator-crash.patch 
Log Message:
* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
- Fix crashes when using GTK+ themes containing a gtkrc which specify 
  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing


firefox-2.0-indicator-crash.patch:

--- NEW FILE firefox-2.0-indicator-crash.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=389801

--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
+++ mozilla/gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
     else
         *indicator_spacing = default_indicator_spacing;
 
-    g_free(tmp_indicator_size);
-    g_free(tmp_indicator_spacing);
+    gtk_requisition_free(tmp_indicator_size);
+    gtk_border_free(tmp_indicator_spacing);
  
     return MOZ_GTK_SUCCESS;
 }


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- firefox.spec	10 Sep 2007 13:10:00 -0000	1.195
+++ firefox.spec	11 Sep 2007 18:55:30 -0000	1.196
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -71,6 +71,7 @@
 Patch102:       firefox-1.5-theme-change.patch
 Patch104:       firefox-1.5-ppc64.patch
 Patch105:       firefox-2.0-dnd.patch
+Patch106:       firefox-2.0-indicator-crash.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -172,6 +173,7 @@
 %patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 %patch105 -p0 -b .dnd
+%patch106 -p1 -b .indicator-crash
 
 # For branding specific patches.
 
@@ -438,6 +440,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
+- Fix crashes when using GTK+ themes containing a gtkrc which specify 
+  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-7
 - added fix for #246248 - firefox crashes when searching for word "do"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 18:59:03 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Sep 2007 14:59:03 -0400
Subject: rpms/thunderbird/devel firefox-2.0-indicator-crash.patch, NONE,
	1.1 thunderbird.spec, 1.103, 1.104
Message-ID: <200709111859.l8BIx3CD014734@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14713

Modified Files:
	thunderbird.spec 
Added Files:
	firefox-2.0-indicator-crash.patch 
Log Message:
* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
- Fix crashes when using GTK+ themes containing a gtkrc which specify 
  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing


firefox-2.0-indicator-crash.patch:

--- NEW FILE firefox-2.0-indicator-crash.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=389801

--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
+++ mozilla/gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
     else
         *indicator_spacing = default_indicator_spacing;
 
-    g_free(tmp_indicator_size);
-    g_free(tmp_indicator_spacing);
+    gtk_requisition_free(tmp_indicator_size);
+    gtk_border_free(tmp_indicator_spacing);
  
     return MOZ_GTK_SUCCESS;
 }


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- thunderbird.spec	10 Sep 2007 13:29:23 -0000	1.103
+++ thunderbird.spec	11 Sep 2007 18:58:30 -0000	1.104
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -62,6 +62,7 @@
 Patch102:       firefox-1.5-theme-change.patch
 Patch103:       thunderbird-1.5-profile-migrator.patch
 Patch104:       firefox-1.5-dnd-nograb.patch
+Patch106:       firefox-2.0-indicator-crash.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -143,6 +144,7 @@
 %patch102 -p0 -b .theme-change
 %patch103 -p1 -b .profile-migrator
 #%patch104 -p1 -b .dnd-nograb
+%patch106 -p1 -b .indicator-crash
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -314,6 +316,10 @@
 #===============================================================================
 
 %changelog
+* Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
+- Fix crashes when using GTK+ themes containing a gtkrc which specify 
+  GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
 - added fix for #246248 - firefox crashes when searching for word "do"
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:03:48 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 15:03:48 -0400
Subject: rpms/krb5/devel kadmind.init,1.11,1.12
Message-ID: <200709111903.l8BJ3mdc020889@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20836

Modified Files:
	kadmind.init 
Log Message:
- don't exit if we have a kldap db



Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadmind.init	6 Sep 2007 20:07:18 -0000	1.11
+++ kadmind.init	11 Sep 2007 19:03:15 -0000	1.12
@@ -34,8 +34,8 @@
 	    # then we don't know for sure that this is an error.
   	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
+	        exit 0
 	    fi
-	    exit 0
 	fi
   	if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
 	    echo $"Error. This appears to be a slave server, found kpropd.acl"



From fedora-extras-commits at redhat.com  Tue Sep 11 19:04:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 15:04:35 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.31,
	1.32 policycoreutils.spec, 1.446, 1.447
Message-ID: <200709111904.l8BJ4Z4d021031@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
- Remove bogus import libxml2 


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policycoreutils-gui.patch	10 Sep 2007 19:45:03 -0000	1.31
+++ policycoreutils-gui.patch	11 Sep 2007 19:04:32 -0000	1.32
@@ -1,7 +1,7 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,227 @@
++++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
+@@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
 +#
@@ -27,7 +27,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -231,8 +230,8 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,210 @@
++++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
+@@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -254,7 +253,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import seobject
 +import commands
@@ -445,8 +443,8 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,180 @@
++++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
+@@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -469,7 +467,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands
@@ -667,8 +664,8 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,57 @@
++++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
+@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -691,7 +688,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -728,8 +724,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,182 @@
++++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
+@@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -753,7 +749,6 @@
 +import gtk.glade
 +import os
 +import commands
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -3304,8 +3299,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-10 15:43:11.000000000 -0400
-@@ -0,0 +1,453 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
+@@ -0,0 +1,452 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3333,7 +3328,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import gnome
 +import sys
@@ -4492,8 +4486,8 @@
 +	
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,248 @@
++++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
+@@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -4516,7 +4510,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -5044,8 +5037,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,137 @@
++++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
+@@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -5068,7 +5061,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -5185,8 +5177,8 @@
 +    
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,220 @@
++++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
+@@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -5209,7 +5201,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -8739,8 +8730,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,172 @@
++++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
+@@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -8768,7 +8759,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import gnome
 +import sys
@@ -10312,8 +10302,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,119 @@
++++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
+@@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -10336,7 +10326,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -10435,8 +10424,8 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-08-28 09:22:17.000000000 -0400
-@@ -0,0 +1,173 @@
++++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
+@@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -10459,7 +10448,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- policycoreutils.spec	10 Sep 2007 19:45:03 -0000	1.446
+++ policycoreutils.spec	11 Sep 2007 19:04:32 -0000	1.447
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
+- Remove bogus import libxml2 
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-11
 - Lots of fixes for polgengui
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:10:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 15:10:30 -0400
Subject: rpms/GConf2/devel dir-leak.patch, NONE, 1.1 sync-leak.patch, NONE, 
	1.1 GConf2.spec, 1.62, 1.63
Message-ID: <200709111910.l8BJAUbj021215@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21187

Modified Files:
	GConf2.spec 
Added Files:
	dir-leak.patch sync-leak.patch 
Log Message:
fix some memory leaks


dir-leak.patch:

--- NEW FILE dir-leak.patch ---
diff -up GConf-2.19.1/backends/markup-tree.c.dir-leak GConf-2.19.1/backends/markup-tree.c
--- GConf-2.19.1/backends/markup-tree.c.dir-leak	2007-09-11 14:51:12.000000000 -0400
+++ GConf-2.19.1/backends/markup-tree.c	2007-09-11 14:52:30.000000000 -0400
@@ -263,6 +263,7 @@ markup_dir_free (MarkupDir *dir)
 
       tmp = tmp->next;
     }
+  g_slist_free (dir->entries);
 
   tmp = dir->subdirs;
   while (tmp)
@@ -273,6 +274,7 @@ markup_dir_free (MarkupDir *dir)
 
       tmp = tmp->next;
     }
+  g_slist_free (dir->subdirs);
 
   g_free (dir->name);
 

sync-leak.patch:

--- NEW FILE sync-leak.patch ---
diff -up GConf-2.19.1/backends/xml-cache.c.leaks GConf-2.19.1/backends/xml-cache.c
--- GConf-2.19.1/backends/xml-cache.c.leaks	2007-09-11 10:54:43.000000000 -0400
+++ GConf-2.19.1/backends/xml-cache.c	2007-09-11 10:54:58.000000000 -0400
@@ -272,6 +272,7 @@ cache_sync (Cache    *cache,
 
   /* sync it all */
   g_slist_foreach (list, (GFunc) cache_sync_foreach, &sd);
+  g_slist_free (list);
 
   /* If we deleted some subdirs, we may now be able to delete
    * more parent dirs. So go ahead and do the sync again.


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- GConf2.spec	23 Aug 2007 18:12:43 -0000	1.62
+++ GConf2.spec	11 Sep 2007 19:09:57 -0000	1.63
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.19.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
@@ -27,6 +27,9 @@
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
 Patch1: GConf2-2.14.0-timeout.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=475970
+Patch2: sync-leak.patch 
+Patch3: dir-leak.patch 
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -63,6 +66,8 @@
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .timers  
+%patch2 -p1 -b .sync-leak
+%patch3 -p1 -b .dir-leak
 
 %build
 rm -f libtool
@@ -124,6 +129,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-4
+- Fix memory leaks
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.1-3
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:14:49 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 15:14:49 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.56,1.57
Message-ID: <200709111914.l8BJEnP8021722@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21668

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- policy-20070501.patch	11 Sep 2007 18:41:14 -0000	1.56
+++ policy-20070501.patch	11 Sep 2007 19:14:45 -0000	1.57
@@ -281,7 +281,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2007-05-07 14:51:05.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 09:15:03.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te	2007-09-11 15:13:25.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(amanda,1.5.0)
@@ -346,17 +346,16 @@
  kernel_read_system_state(amanda_t)
  kernel_read_kernel_sysctls(amanda_t)
  kernel_dontaudit_getattr_unlabeled_files(amanda_t)
-@@ -113,7 +117,8 @@
+@@ -113,7 +117,7 @@
  # Added for targeted policy
  term_use_unallocated_ttys(amanda_t)
  
 -corenet_non_ipsec_sendrecv(amanda_t)
 +corenet_all_recvfrom_unlabeled(amanda_t)
-+corenet_all_recvfrom_netlabel(amanda_t)
  corenet_tcp_sendrecv_all_if(amanda_t)
  corenet_udp_sendrecv_all_if(amanda_t)
  corenet_raw_sendrecv_all_if(amanda_t)
-@@ -150,8 +155,6 @@
+@@ -150,8 +154,6 @@
  libs_use_ld_so(amanda_t)
  libs_use_shared_libs(amanda_t)
  
@@ -365,7 +364,7 @@
  optional_policy(`
  	auth_read_shadow(amanda_t)
  ')
-@@ -160,14 +163,6 @@
+@@ -160,14 +162,6 @@
  	logging_send_syslog_msg(amanda_t)
  ')
  
@@ -380,7 +379,7 @@
  ########################################
  #
  # Amanda recover local policy
-@@ -197,10 +192,13 @@
+@@ -197,10 +191,12 @@
  manage_sock_files_pattern(amanda_recover_t,amanda_tmp_t,amanda_tmp_t)
  files_tmp_filetrans(amanda_recover_t,amanda_tmp_t,{ dir file lnk_file sock_file fifo_file })
  
@@ -391,11 +390,10 @@
  
 -corenet_non_ipsec_sendrecv(amanda_recover_t)
 +corenet_all_recvfrom_unlabeled(amanda_recover_t)
-+corenet_all_recvfrom_netlabel(amanda_recover_t)
  corenet_tcp_sendrecv_all_if(amanda_recover_t)
  corenet_udp_sendrecv_all_if(amanda_recover_t)
  corenet_tcp_sendrecv_all_nodes(amanda_recover_t)
-@@ -232,14 +230,4 @@
+@@ -232,14 +228,4 @@
  
  miscfiles_read_localization(amanda_recover_t)
  
@@ -5256,8 +5254,8 @@
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.6.4/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-08-07 09:42:35.000000000 -0400
-@@ -2,15 +2,20 @@
++++ serefpolicy-2.6.4/policy/modules/services/hal.fc	2007-09-11 15:14:23.000000000 -0400
+@@ -2,15 +2,22 @@
  /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
  /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
  
@@ -5283,6 +5281,8 @@
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 +
++/var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/log/pm(/.*)?				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.6.4/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/hal.if	2007-08-07 09:42:35.000000000 -0400



From fedora-extras-commits at redhat.com  Tue Sep 11 19:22:10 2007
From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp))
Date: Tue, 11 Sep 2007 15:22:10 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch, 1.1, 1.2
Message-ID: <200709111922.l8BJMAo2022246@cvs-int.fedora.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22225

Modified Files:
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch 
Log Message:
Add note to bg-none patch about when it can be dropped

xorg-x11-server-1.1.0-dont-backfill-bg-none.patch:

Index: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-dont-backfill-bg-none.patch	12 Jul 2006 23:29:00 -0000	1.1
+++ xorg-x11-server-1.1.0-dont-backfill-bg-none.patch	11 Sep 2007 19:22:07 -0000	1.2
@@ -1,6 +1,14 @@
 Disable backfilling of windows created with bg=none, which otherwise
 would force a framebuffer readback.
 
+Note that this patch can only be dropped if you verify that 
+
+   https://bugzilla.redhat.com/show_bug.cgi?id=285991
+
+is fixed (which it is in upstream git as of 
+
+f98dfec79dadb70fa7bba84e7335f92b3a73dc02
+
 --- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
 +++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
 @@ -478,6 +478,7 @@



From fedora-extras-commits at redhat.com  Tue Sep 11 19:22:58 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 11 Sep 2007 15:22:58 -0400
Subject: rpms/rpmlint/EL-5 rpmlint-0.81-fedoralicensing.patch, NONE,
	1.1 rpmlint-CHANGES.package.old, NONE, 1.1 .cvsignore, 1.16,
	1.17 rpmlint.config, 1.5, 1.6 rpmlint.spec, 1.29, 1.30 sources,
	1.16, 1.17
Message-ID: <200709111922.l8BJMwoN022310@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22257

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.81-fedoralicensing.patch rpmlint-CHANGES.package.old 
Log Message:
Sync with devel + Wiki license list rev 90

rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


--- NEW FILE rpmlint-CHANGES.package.old ---
* Sun Nov 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-2
- Take file based dependencies into account in dangling symlink checks
  (completes the fix for #165839).
- Skip some checks for binaries not understood by objdump (#165173).
- Improve long descriptions of some script warnings.
- Fix command output parsing in non-English locales.
- Import Enrico's latest DocFilesCheck (with some local tweaks).
- Use rm instead of %%exclude.

* Wed Nov 16 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Add DocFilesCheck from Enrico Scholz.

* Sat Sep  3 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Improve accuracy of doc, info and games path regexps.
- Improve error message when invoked on non-rpm files.
- Filter more Mandriva specific warnings.

* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi>
- Add dangling symlink exceptions tuned for Fedora to default config
  (partially fixes #165839).

* Wed Aug 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-1
- 0.71, confmsg patch and bits from initvars patch applied upstream.
- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
- Patch to not warn about non-empty *.bs (in Perl packages).
- Patch to clarify PreReq explanation, make it a warning instead of an error.
- Patch to warn about use of BuildPreReq.

* Thu Jul  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-4
- Fix false "positives" from libtool archives confused as scripts,
  non-executable scripts installed in docs, FE disttags, unsuccessfully
  expanded shell variables and quotation in init scripts.

* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-3
- 0.70, use sed instead of perl during build.
- Default configuration improvements: allow Development/Debug group (for
  debuginfo packages), filter out errors/warnings about non-indexed jars,
  invalid LC_MESSAGES and man page dirs, and library packages containing
  something else in addition to libraries.
- Make info about non-config files in /etc more accurate.
- Patch to warn about services that default to enabled after "chkconfig add",
  not the other way around.

* Thu May 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-3
- Filter out more not-that-useful messages in the default config.

* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-2
- 0.69.
- Simplify bash-completion snippet installation, remove triggers.
- Default configuration improvements: filter messages about missing packager,
  Mandriva specific package naming conventions, %%ghost files without
  %%post scriptlets, and 0664 source permissions.
- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
- Convert docs to UTF-8.
- Improve summary.

* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
- 0.68, siteperl patch applied upstream.
- Fix "no-dependency-on" filtering in default config.
- Add LaTeX Project Public License to default config.
- Remove upstream-only %%changelog entries.

* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
- 0.67.
- Patch to catch more site_perl directories.
- Default config improvements: filter Distribution and Vendor warnings,
  use empty string instead of None for release extension (fixes -i).

* Sat Jan 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.65-1
- Update to 0.65.

* Sat Jan  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.64-1
- Update to 0.64.
- Default config tweaks: don't mandate Epochs nor "fdr" in Release.

* Tue Oct 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
- Requires cpio (bug 2169).

* Sun Oct  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
- Update to 0.61.

* Mon Aug 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
- Update to 0.60.

* Mon May  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
- Update to 0.59.

* Sun Feb 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
- Update to 0.57.1.

* Wed Feb 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
- Update to 0.56.

* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).

* Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
- Add back %%ghost handling of not-installed compiled versions of *.py.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
- Update to 0.55.
- Spec cleanups.

* Tue Dec 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
- Update to 0.53.

* Thu Oct  2 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
- Add list of valid shells for post'n'friends scriptlets into default config.

* Sat Sep 13 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
- Update to 0.52.

* Thu Sep  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
- Filter more Mdk-specific warnings in default config.

* Wed Sep  3 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
- Upstream tarball reappeared, use it.

* Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
- Filter Mdk-specific python-related stuff in the default config.

* Fri Aug 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
- Update to 0.51.1.
- Own %%ghost'ed *.py{c,o}, and ditto for the config file.
- Add list of valid licenses to default config.
- Set "Fedora Linux" as suggested distribution in default config.
- Clean up %%doc list.

* Fri May  9 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
- Update to 0.50, all patches now applied upstream.

* Mon May  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Filter out mdk-specific "no-dependancy perl-base" messages in config.

* Thu May  1 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
- Update to 0.49.

* Sun Apr 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
- Add one more strict Epoch checking patch.
- Slightly enhanced default config.

* Fri Apr 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
- Patch to work with installed packages (including -a) and rpm 4.2.
- Remove spurious rpm-devel BuildRequirement.

* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
- Patch to work with packages signed with an unknown key.
- Save .spec in UTF-8.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
- First Fedora release, based on upstream spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 May 2007 18:59:06 -0000	1.16
+++ .cvsignore	11 Sep 2007 19:22:25 -0000	1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmlint.config	3 Mar 2007 16:56:27 -0000	1.5
+++ rpmlint.config	11 Sep 2007 19:22:26 -0000	1.6
@@ -19,10 +19,152 @@
     "/usr/bin/perl",
     "/usr/bin/python",
 ))
+
 setOption("DanglingSymlinkExceptions", (
     ['consolehelper$', 'usermode'],
     ['consolehelper-gtk$', 'usermode-gtk'],
 ))
+
+setOption("ValidLicenses", (
+    # These are the short names for all of the Fedora approved licenses.
+    # The master list is kept here: http://fedoraproject.org/wiki/Licensing
+    # Last synced with Wiki revision 90 of that page.
+    'Adobe',
+    'Affero GPL',
+    'AFL',
+    'ARL',
+    'ASL 1.0',
+    'ASL 1.0+',
+    'ASL 1.1',
+    'ASL 1.1+',
+    'ASL 2.0',
+    'ASL 2.0+',
+    'APSL 2.0',
+    'APSL 2.0+',
+    'Artistic 2.0',
+    'Artistic clarified',
+    'BitTorrent',
+    'Boost',
+    'BSD',
+    'BSD with advertising',
+    'CeCILL',
+    'CDDL',
+    'CPL',
+    'Condor',
+    'Copyright only',
+    'Cryptix',
+    'Crystal Stacker',
+    'EPL',
+    'eCos',
+    'EFL 2.0',
+    'EFL 2.0+',
+    'EU Datagrid',
+    'FTL',
+    'Giftware',
+    'Glide',
+    'gnuplot',
+    'GPL+',
+    'GPL+ or Artistic',
+    'GPLv2',
+    'GPLv2 with exceptions',
+    'GPLv2+',
+    'GPLv2+ with exceptions',
+    'GPLv3',
+    'GPLv3 with exceptions',
+    'GPLv3+',
+    'GPLv3+ with exceptions',
+    'IBM',
+    'IJG',
+    'ImageMagick',
+    'iMatix',
+    'Imlib2',
+    'Intel ACPI',
+    'Interbase',
+    'ISC',
+    'Jabber',
+    'JasPer',
+    'LGPLv2',
+    'LGPLv2 with exceptions',
+    'LGPLv2+',
+    'LGPLv3',
+    'LGPLv3+',
+    'libtiff',
+    'LPL',
+    'LPPL',
+    'mecab-ipadic',
+    'MIT',
+    'MPLv1.0',
+    'MPLv1.0+',
+    'MPLv1.1',
+    'MPLv1.1+',
+    'NCSA',
+    'NGPL',
+    'NOSL',
+    'Netscape',
+    'Nokia',
+    'OpenLDAP',
+    'OpenPBS',
+    'OSL 1.0',
+    'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
+    'OSL 2.0',
+    'OSL 2.0+',
+    'OSL 3.0',
+    'OSL 3.0+',
+    'OpenSSL',
+    'Phorum',
+    'PHP',
+    'Public Domain',
+    'Python',
+    'QPL',
+    'RPSL',
+    'Ruby',
+    'Sleepycat',
+    'SISSL',
+    'SLIB',
+    'SPL',
+    'TCL',
+    'UCD',
+    'Vim',
+    'VNLSL',
+    'VSL',
+    'W3C',
+    'WTFPL',
+    'wxWindows',
+    'xinetd',
+    'Zend',
+    'ZPLv1.0',
+    'ZPLv1.0+',
+    'ZPLv2.0',
+    'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
+    'zlib',
+    # Documentation licenses
+    'CDL',
+    'FBSDDL',
+    'GFDL',
+    'IEEE',
+    'OFSFDL',
+    'Open Publication',
+    # Content licenses
+    'CC-BY',
+    'CC-BY-SA',
+    'DSL',
+    'Free Art',
+    # Font licenses
+    'Arphic',
+    'Bitstream Vera',
+    'mplus',
+    'OFL',
+    'Utopia',
+    'XANO',
+    # Others
+    'Redistributable, no modification permitted',
+    'Freely redistributable without restriction',
+))
+
 # Standard users & groups from the setup package:
 setOption("StandardUsers",
           ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
@@ -52,7 +194,9 @@
 addFilter("jar-not-indexed")
 addFilter("invalid-(lc-messages|locale-man)-dir")
 addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
 addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
+addFilter(" doc-file-dependency .* /bin/sh$")
+addFilter("hardcoded-library-path .*/lib/udev(/|$)")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rpmlint.spec	13 May 2007 18:59:06 -0000	1.29
+++ rpmlint.spec	11 Sep 2007 19:22:26 -0000	1.30
@@ -1,15 +1,17 @@
 Name:           rpmlint
-Version:        0.80
-Release:        1%{?dist}
+Version:        0.81
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2
 URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
+Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
+Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,7 +34,9 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 sed -i -e /MenuCheck/d Config.py
+install -pm 644 %{SOURCE2} CHANGES.package.old
 
 
 %build
@@ -55,7 +59,7 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog CHANGES.package.old README
 %config(noreplace) %{_sysconfdir}/rpmlint/
 %{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
@@ -66,6 +70,27 @@
 
 
 %changelog
+* Tue Sep 11 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-2
+- Sync Fedora license list with Wiki rev 90.
+
+* Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-3
+- Sync Fedora license list with Wiki rev 68.
+- Move pre-2006 changelog entries to CHANGES.package.old.
+
+* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
+- new fedora licensing scheme
+
+* Thu May 31 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Filter hardcoded-library-path errors for /lib/udev.
+
 * Thu Apr 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.80-1
 - 0.80, fixes #227389, #228645, #233795.
 - Accept "Redistributable, no modification permitted" as a valid license.
@@ -119,156 +144,3 @@
 - Sync with upstream CVS as of 2006-01-15, includes improved versions of
   most of the earlier patches.
 - Add dependency on binutils.
-
-* Sun Nov 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-2
-- Take file based dependencies into account in dangling symlink checks
-  (completes the fix for #165839).
-- Skip some checks for binaries not understood by objdump (#165173).
-- Improve long descriptions of some script warnings.
-- Fix command output parsing in non-English locales.
-- Import Enrico's latest DocFilesCheck (with some local tweaks).
-- Use rm instead of %%exclude.
-
-* Wed Nov 16 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Add DocFilesCheck from Enrico Scholz.
-
-* Sat Sep  3 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Improve accuracy of doc, info and games path regexps.
-- Improve error message when invoked on non-rpm files.
-- Filter more Mandriva specific warnings.
-
-* Sat Aug 13 2005 Ville Skytt?? <ville.skytta at iki.fi>
-- Add dangling symlink exceptions tuned for Fedora to default config
-  (partially fixes #165839).
-
-* Wed Aug 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.71-1
-- 0.71, confmsg patch and bits from initvars patch applied upstream.
-- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
-- Patch to not warn about non-empty *.bs (in Perl packages).
-- Patch to clarify PreReq explanation, make it a warning instead of an error.
-- Patch to warn about use of BuildPreReq.
-
-* Thu Jul  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-4
-- Fix false "positives" from libtool archives confused as scripts,
-  non-executable scripts installed in docs, FE disttags, unsuccessfully
-  expanded shell variables and quotation in init scripts.
-
-* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.70-3
-- 0.70, use sed instead of perl during build.
-- Default configuration improvements: allow Development/Debug group (for
-  debuginfo packages), filter out errors/warnings about non-indexed jars,
-  invalid LC_MESSAGES and man page dirs, and library packages containing
-  something else in addition to libraries.
-- Make info about non-config files in /etc more accurate.
-- Patch to warn about services that default to enabled after "chkconfig add",
-  not the other way around.
-
-* Thu May 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-3
-- Filter out more not-that-useful messages in the default config.
-
-* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.69-2
-- 0.69.
-- Simplify bash-completion snippet installation, remove triggers.
-- Default configuration improvements: filter messages about missing packager,
-  Mandriva specific package naming conventions, %%ghost files without
-  %%post scriptlets, and 0664 source permissions.
-- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
-- Convert docs to UTF-8.
-- Improve summary.
-
-* Sun Mar 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.68-2
-- 0.68, siteperl patch applied upstream.
-- Fix "no-dependency-on" filtering in default config.
-- Add LaTeX Project Public License to default config.
-- Remove upstream-only %%changelog entries.
-
-* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.67-1
-- 0.67.
-- Patch to catch more site_perl directories.
-- Default config improvements: filter Distribution and Vendor warnings,
-  use empty string instead of None for release extension (fixes -i).
-
-* Sat Jan 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.65-1
-- Update to 0.65.
-
-* Sat Jan  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.64-1
-- Update to 0.64.
-- Default config tweaks: don't mandate Epochs nor "fdr" in Release.
-
-* Tue Oct 19 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
-- Requires cpio (bug 2169).
-
-* Sun Oct  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
-- Update to 0.61.
-
-* Mon Aug 16 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
-- Update to 0.60.
-
-* Mon May  3 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
-- Update to 0.59.
-
-* Sun Feb 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
-- Update to 0.57.1.
-
-* Wed Feb 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
-- Update to 0.56.
-
-* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
-- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).
-
-* Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
-- Add back %%ghost handling of not-installed compiled versions of *.py.
-
-* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
-- Update to 0.55.
-- Spec cleanups.
-
-* Tue Dec 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
-- Update to 0.53.
-
-* Thu Oct  2 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
-- Add list of valid shells for post'n'friends scriptlets into default config.
-
-* Sat Sep 13 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
-- Update to 0.52.
-
-* Thu Sep  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
-- Filter more Mdk-specific warnings in default config.
-
-* Wed Sep  3 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
-- Upstream tarball reappeared, use it.
-
-* Sun Aug 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
-- Filter Mdk-specific python-related stuff in the default config.
-
-* Fri Aug 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
-- Update to 0.51.1.
-- Own %%ghost'ed *.py{c,o}, and ditto for the config file.
-- Add list of valid licenses to default config.
-- Set "Fedora Linux" as suggested distribution in default config.
-- Clean up %%doc list.
-
-* Fri May  9 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
-- Update to 0.50, all patches now applied upstream.
-
-* Mon May  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
-- %%{buildroot} -> $RPM_BUILD_ROOT.
-- Filter out mdk-specific "no-dependancy perl-base" messages in config.
-
-* Thu May  1 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
-- Update to 0.49.
-
-* Sun Apr 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
-- Add one more strict Epoch checking patch.
-- Slightly enhanced default config.
-
-* Fri Apr 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
-- Patch to work with installed packages (including -a) and rpm 4.2.
-- Remove spurious rpm-devel BuildRequirement.
-
-* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
-- Patch to work with packages signed with an unknown key.
-- Save .spec in UTF-8.
-
-* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
-- First Fedora release, based on upstream spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 May 2007 18:59:06 -0000	1.16
+++ sources	11 Sep 2007 19:22:26 -0000	1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f  rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8  rpmlint-0.81.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 19:30:21 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 15:30:21 -0400
Subject: rpms/highlight/devel highlight-2.6.3-rpmopts.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 highlight.spec, 1.21, 1.22 sources,
	1.10, 1.11 highlight-2.6.2-rpmopts.patch, 1.1, NONE
Message-ID: <200709111930.l8BJULW6022790@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22758

Modified Files:
	.cvsignore highlight.spec sources 
Added Files:
	highlight-2.6.3-rpmopts.patch 
Removed Files:
	highlight-2.6.2-rpmopts.patch 
Log Message:
New upstream release

highlight-2.6.3-rpmopts.patch:

--- NEW FILE highlight-2.6.3-rpmopts.patch ---
diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
--- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
+++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
@@ -15,7 +15,7 @@
 
 CXX=c++
 
-CFLAGS := -O2
+CFLAGS := ${RPM_OPT_FLAGS}
 
 # Do not strip by default (Mac OS X lazy pointer issues)
 # Add -static to avoid linking with shared libs (can cause trouble when highlight


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Aug 2007 15:20:43 -0000	1.9
+++ .cvsignore	11 Sep 2007 19:29:48 -0000	1.10
@@ -1 +1 @@
-highlight-2.6.2.tar.gz
+highlight-2.6.3.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- highlight.spec	9 Aug 2007 15:20:43 -0000	1.21
+++ highlight.spec	11 Sep 2007 19:29:48 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.2-rpmopts.patch
+Patch2:		highlight-2.6.3-rpmopts.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Aug 2007 15:20:43 -0000	1.10
+++ sources	11 Sep 2007 19:29:48 -0000	1.11
@@ -1 +1 @@
-9f024bb8898b1ba2f92f6966ab6978c8  highlight-2.6.2.tar.gz
+0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz


--- highlight-2.6.2-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 19:31:53 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 15:31:53 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.24, 1.25 bigboard.spec, 1.33,
	1.34 sources, 1.25, 1.26
Message-ID: <200709111931.l8BJVrWr023026@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22884

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Sep 2007 20:26:02 -0000	1.24
+++ .cvsignore	11 Sep 2007 19:31:21 -0000	1.25
@@ -1 +1 @@
-bigboard-0.5.13.tar.gz
+bigboard-0.5.15.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bigboard.spec	10 Sep 2007 20:26:02 -0000	1.33
+++ bigboard.spec	11 Sep 2007 19:31:21 -0000	1.34
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.13
+Version:        0.5.15
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,8 +93,8 @@
 killall -HUP gconfd-2 || :
 
 %changelog
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.13-1
-- 0.5.13
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
+- new upstream
 
 * Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
 - some brs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	10 Sep 2007 20:26:02 -0000	1.25
+++ sources	11 Sep 2007 19:31:21 -0000	1.26
@@ -1 +1 @@
-f0001794311b90a9b9f0d9ad750a0878  bigboard-0.5.13.tar.gz
+bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 19:44:34 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 15:44:34 -0400
Subject: rpms/metacity/F-7 metacity-2.18.5-dont-deref-null-pointer.patch,
	NONE, 1.1 metacity.spec, 1.115, 1.116
Message-ID: <200709111944.l8BJiYe0023595@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23511

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- don't dereference a NULL pointer (crash on logout, leading
  to weird problems on next login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c
--- metacity-2.18.5/src/session.c.dont-deref-null-pointer	2007-09-11 15:41:23.000000000 -0400
+++ metacity-2.18.5/src/session.c	2007-09-11 15:41:34.000000000 -0400
@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter
 
       display_iter = display_iter->next;
     }
-  /* don't need to free displays */
-  displays = NULL;
 
   if (lame == NULL)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-7/metacity.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- metacity.spec	18 Jun 2007 14:01:27 -0000	1.115
+++ metacity.spec	11 Sep 2007 19:44:01 -0000	1.116
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.18/%{metacity_filename}.tar.bz2
 License: GPL
@@ -35,6 +35,8 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
+Patch0: metacity-2.18.5-dont-deref-null-pointer.patch
+
 %description
 
 Metacity is a simple window manager that integrates nicely with 
@@ -56,7 +58,7 @@
 
 %prep
 %setup -q -n %{metacity_filename}
-
+%patch0 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +143,10 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.18.5-2
+- don't dereference a NULL pointer (crash on logout, leading
+  to weird problems on next login, bug 243761)
+
 * Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
 - Update to 2.18.5, fixing a problem with window activation
   and workspace switching of KDE applications



From fedora-extras-commits at redhat.com  Tue Sep 11 19:44:41 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 11 Sep 2007 15:44:41 -0400
Subject: rpms/highlight/F-7 highlight-2.6.3-rpmopts.patch, NONE,
	1.1 highlight.spec, 1.20, 1.21 sources, 1.10,
	1.11 highlight-2.6.2-rpmopts.patch, 1.1, NONE
Message-ID: <200709111944.l8BJifWw023609@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23539

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.3-rpmopts.patch 
Removed Files:
	highlight-2.6.2-rpmopts.patch 
Log Message:
New upstream release

highlight-2.6.3-rpmopts.patch:

--- NEW FILE highlight-2.6.3-rpmopts.patch ---
diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
--- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
+++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
@@ -15,7 +15,7 @@
 
 CXX=c++
 
-CFLAGS := -O2
+CFLAGS := ${RPM_OPT_FLAGS}
 
 # Do not strip by default (Mac OS X lazy pointer issues)
 # Add -static to avoid linking with shared libs (can cause trouble when highlight


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/highlight.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- highlight.spec	9 Aug 2007 16:41:56 -0000	1.20
+++ highlight.spec	11 Sep 2007 19:44:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.2-rpmopts.patch
+Patch2:		highlight-2.6.3-rpmopts.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Aug 2007 16:41:56 -0000	1.10
+++ sources	11 Sep 2007 19:44:09 -0000	1.11
@@ -1 +1 @@
-9f024bb8898b1ba2f92f6966ab6978c8  highlight-2.6.2.tar.gz
+0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz


--- highlight-2.6.2-rpmopts.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 19:48:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 15:48:59 -0400
Subject: rpms/metacity/devel metacity-2.18.5-dont-deref-null-pointer.patch, 
	NONE, 1.1 metacity.spec, 1.129, 1.130
Message-ID: <200709111948.l8BJmxUO023741@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23716

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- fix crash on logout (and on the subsequent login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c
--- metacity-2.18.5/src/session.c.dont-deref-null-pointer	2007-09-11 15:41:23.000000000 -0400
+++ metacity-2.18.5/src/session.c	2007-09-11 15:41:34.000000000 -0400
@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter
 
       display_iter = display_iter->next;
     }
-  /* don't need to free displays */
-  displays = NULL;
 
   if (lame == NULL)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- metacity.spec	21 Aug 2007 21:19:09 -0000	1.129
+++ metacity.spec	11 Sep 2007 19:48:23 -0000	1.130
@@ -7,10 +7,11 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
+Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +65,7 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
+%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +152,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.19.55-4
+- fix crash on logout (and on the subsequent login, bug 243761)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.19.55-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:53:30 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 15:53:30 -0400
Subject: rpms/tracker/devel trackerd-getenv.patch, NONE, 1.1 tracker.spec,
	1.20, 1.21
Message-ID: <200709111953.l8BJrUe0023939@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23895

Modified Files:
	tracker.spec 
Added Files:
	trackerd-getenv.patch 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)


trackerd-getenv.patch:

--- NEW FILE trackerd-getenv.patch ---
diff -up tracker-0.6.2/src/trackerd/tracker-apps.c.getenv tracker-0.6.2/src/trackerd/tracker-apps.c
--- tracker-0.6.2/src/trackerd/tracker-apps.c.getenv	2007-08-18 20:31:41.000000000 -0400
+++ tracker-0.6.2/src/trackerd/tracker-apps.c	2007-09-11 12:47:38.000000000 -0400
@@ -18,7 +18,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include<string.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "tracker-apps.h"
 #include "tracker-db.h"
@@ -51,6 +52,7 @@ tracker_applications_add_service_directo
 		value = getenv ("XDG_DATA_DIRS");
 		if (value != NULL) {
 			gchar **dir_array;
+			tracker_log ("XDG_DATA_DIRS is at %p",value);
 			dir_array = g_strsplit (value, ":", 0);
 
 			gint i;


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tracker.spec	6 Sep 2007 00:31:22 -0000	1.20
+++ tracker.spec	11 Sep 2007 19:52:50 -0000	1.21
@@ -1,11 +1,12 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
 Version:	0.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
 Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
+Patch0:		trackerd-getenv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .getenv
 %define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
 
 %build
@@ -126,6 +128,9 @@
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
+- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
+
 * Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
 - Version 0.6.2
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:54:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 15:54:46 -0400
Subject: rpms/GConf2/devel dead-leak.patch,NONE,1.1 GConf2.spec,1.63,1.64
Message-ID: <200709111954.l8BJskFU024028@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23956

Modified Files:
	GConf2.spec 
Added Files:
	dead-leak.patch 
Log Message:
one more leak fix


dead-leak.patch:

--- NEW FILE dead-leak.patch ---
diff -up GConf-2.19.1/gconf/gconf-database.c.dead-leak GConf-2.19.1/gconf/gconf-database.c
--- GConf-2.19.1/gconf/gconf-database.c.dead-leak	2007-09-11 15:33:11.000000000 -0400
+++ GConf-2.19.1/gconf/gconf-database.c	2007-09-11 15:32:42.000000000 -0400
@@ -1259,6 +1259,8 @@ gconf_database_notify_listeners (GConfDa
       tmp = g_slist_next(tmp);
     }
 
+  g_slist_free (closure.dead);
+
   if (notify_others)
     {
       g_return_if_fail (modified_sources != NULL);


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- GConf2.spec	11 Sep 2007 19:09:57 -0000	1.63
+++ GConf2.spec	11 Sep 2007 19:54:13 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.19.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=475970
 Patch2: sync-leak.patch 
 Patch3: dir-leak.patch 
+Patch4: dead-leak.patch 
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -68,6 +69,7 @@
 %patch1 -p1 -b .timers  
 %patch2 -p1 -b .sync-leak
 %patch3 -p1 -b .dir-leak
+%patch4 -p1 -b .dead-leak
 
 %build
 rm -f libtool
@@ -129,6 +131,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-5
+- Some more leak fixes
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-4
 - Fix memory leaks
 



From fedora-extras-commits at redhat.com  Tue Sep 11 19:58:07 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Tue, 11 Sep 2007 15:58:07 -0400
Subject: rpms/pdns/devel pdns.spec,1.6,1.7
Message-ID: <200709111958.l8BJw76h024236@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/pdns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	pdns.spec 
Log Message:
* Tue Sep 11 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-2
- Fix license tag
- Add README for geo backend to docs
* Tue Apr 24 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-1
- Upstream released 2.9.21
- Enabled new SQLite backend
* Thu Apr 10 2007 <ruben at rubenkerkhof.com> 2.9.20-9
- Add Requires for chkconfig, service and useradd (#235582)
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-8
- Add the pdns user and group to the config file
- Don't restart pdns on an upgrade
- Minor cleanups in scriptlets
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-7
- Fixed typo in scriptlet
* Mon Jan 1 2007 <ruben at rubenkerkhof.com> 2.9.20-6
- Check if user pdns exists before adding it
* Sat Dec 30 2006 <ruben at rubenkerkhof.com> 2.9.20-5
- Strip rpath from the backends as well
* Fri Dec 29 2006 <ruben at rubenkerkhof.com> 2.9.20-4
- Disable rpath
* Thu Dec 28 2006 <ruben at rubenkerkhof.com> 2.9.20-3
- More fixes as per review #219973
* Wed Dec 27 2006 <ruben at rubenkerkhof.com> 2.9.20-2
- A few changes for FE review (bz #219973):
- Renamed package to pdns, since that's how upstream calls it
- Removed calls to ldconfig
- Subpackages now require %{version}-%{release}
* Sat Dec 16 2006 <ruben at rubenkerkhof.com> 2.9.20-1
- Initial import



Index: pdns.spec
===================================================================
RCS file: /cvs/extras/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdns.spec	24 Apr 2007 07:38:10 -0000	1.6
+++ pdns.spec	11 Sep 2007 19:57:34 -0000	1.7
@@ -1,10 +1,10 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
-License:	GPL
+License:	GPLv2
 URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
@@ -166,7 +166,7 @@
 
 %files backend-geo
 %defattr(-,root,root,-)
-%doc pdns/COPYING
+%doc pdns/COPYING modules/geobackend/README
 %{_libdir}/%{name}/libgeobackend.so
 
 %files backend-ldap
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Tue Sep 11 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-2
+- Fix license tag
+- Add README for geo backend to docs
 * Tue Apr 24 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21-1
 - Upstream released 2.9.21
 - Enabled new SQLite backend



From fedora-extras-commits at redhat.com  Tue Sep 11 19:59:12 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 15:59:12 -0400
Subject: rpms/mugshot/devel mugshot.spec,1.19,1.20
Message-ID: <200709111959.l8BJxCEA024300@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24265

Modified Files:
	mugshot.spec 
Log Message:
* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
- shuffle .sos around (b.r.c 286371)
- make devel package require dbus-devel



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mugshot.spec	10 Sep 2007 20:11:01 -0000	1.19
+++ mugshot.spec	11 Sep 2007 19:58:39 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.52
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -57,6 +57,7 @@
 %package devel
 Summary: Development headers for Online Desktop
 Group: Development/Languages
+Requires: dbus-devel
 
 %description devel
 This package contains libraries for Online Desktop.
@@ -210,7 +211,7 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
-
+%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
@@ -220,9 +221,13 @@
 %dir %{_includedir}/ddm-1
 %{_includedir}/ddm-1/*
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so*
+%{_libdir}/*.so
 
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
+- shuffle .sos around (b.r.c 286371)
+- make devel package require dbus-devel
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
 - add devel pkg
 - 1.1.52



From fedora-extras-commits at redhat.com  Tue Sep 11 20:02:22 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 16:02:22 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.18,1.19 sources,1.13,1.14
Message-ID: <200709112002.l8BK2MRD030453@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30408

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mugshot.spec	4 Sep 2007 15:46:37 -0000	1.18
+++ mugshot.spec	11 Sep 2007 20:01:49 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.50
+Version:        1.1.52
 Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -54,6 +54,13 @@
 a "live social experience" and interoperation with online services you and 
 your friends use. It's fun and easy.
 
+%package devel
+Summary: Development headers for Online Desktop
+Group: Development/Languages
+Requires: dbus-devel
+
+%description devel
+This package contains libraries for Online Desktop.
 
 %prep
 %setup -q
@@ -70,7 +77,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Don't package a .la file for the component .so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mugshot/firefox/components/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Run desktop-file-install to so we get validation (and to make
 # things fedora-packaging-guidelines compliant)
@@ -204,12 +211,30 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
+%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
+%files devel
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
+- shuffle .sos around (b.r.c 286371)
+- make devel package require dbus-devel
+
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
+- add devel pkg
+- 1.1.52
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
+- 1.1.51
+
 * Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
 - Don't put two autostart files in the autostart directory
   (https://bugzilla.redhat.com/show_bug.cgi?id=274921)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Aug 2007 20:32:18 -0000	1.13
+++ sources	11 Sep 2007 20:01:49 -0000	1.14
@@ -1 +1 @@
-d3c656d2d77da635fc73908c46fa960b  mugshot-1.1.50.tar.gz
+d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 20:04:29 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 16:04:29 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.5, 1.6 sources, 1.5,
	1.6
Message-ID: <200709112004.l8BK4TdO030668@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30579

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- online-desktop.spec	27 Aug 2007 19:03:27 -0000	1.5
+++ online-desktop.spec	11 Sep 2007 20:03:55 -0000	1.6
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.9
+Version:        0.2.12
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://developer.mugshot.org/
-#X-SCM:         scm:svn:http://svn.mugshot.org/svn/online-desktop/trunk
+#X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -91,10 +91,13 @@
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
+%{_datadir}/gnome/*.session
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
+%dir %{python_sitelib}/ddm
+%{python_sitelib}/ddm/*
 %doc COPYING README
 
 %files flickr
@@ -175,7 +178,16 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+- new upstream
+
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
+- new upstream
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.2.10-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.2.9-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 19:03:27 -0000	1.5
+++ sources	11 Sep 2007 20:03:55 -0000	1.6
@@ -1 +1 @@
-b75bd28551b0ec5282d67b450124ea1c  online-desktop-0.2.9.tar.gz
+f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 20:04:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 16:04:58 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.57,1.58
Message-ID: <200709112004.l8BK4wcj030755@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30725

Modified Files:
	policy-20070501.patch 
Log Message:
* Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
- Allow modprobe to setsched on kernel


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- policy-20070501.patch	11 Sep 2007 19:14:45 -0000	1.57
+++ policy-20070501.patch	11 Sep 2007 20:04:54 -0000	1.58
@@ -1711,7 +1711,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 11:35:53.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:53:08.000000000 -0400
 @@ -1449,6 +1449,44 @@
  
  ########################################
@@ -1813,15 +1813,15 @@
 +#
 +interface(`corenet_all_recvfrom_netlabel',`
 +	gen_require(`
-+		type netlabel_peer_t;
++		type unlabeled_t;
 +	')
 +
-+	allow $1 netlabel_peer_t:{ tcp_socket udp_socket rawip_socket } recvfrom;
++	allow $1 unlabeled_t:{ tcp_socket udp_socket rawip_socket } recvfrom;
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 08:17:57.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.te.in	2007-09-11 15:52:36.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2815,7 +2815,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.6.4/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/kernel.te	2007-09-11 15:52:39.000000000 -0400
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)



From fedora-extras-commits at redhat.com  Tue Sep 11 20:05:42 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 11 Sep 2007 16:05:42 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.54,
	1.55 selinux-policy.spec, 1.520, 1.521
Message-ID: <200709112005.l8BK5g37030858@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30810

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
- Allow NetworkManager to dbus chat with yum-updated


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- policy-20070703.patch	11 Sep 2007 16:07:47 -0000	1.54
+++ policy-20070703.patch	11 Sep 2007 20:05:08 -0000	1.55
@@ -2814,7 +2814,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 08:45:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-11 14:40:00.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -3289,7 +3289,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.7/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-09-11 13:01:12.000000000 -0400
 @@ -138,6 +138,7 @@
  		type security_t;
  	')
@@ -6285,7 +6285,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.7/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-09-10 14:54:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-09-11 14:32:19.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -6327,20 +6327,21 @@
  ')
  
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
-@@ -252,7 +264,9 @@
+@@ -252,7 +264,10 @@
  ')
  
  optional_policy(`
 +	kerberos_use(ftpd_t)
  	kerberos_read_keytab(ftpd_t)
 +	kerberos_manage_host_rcache(ftpd_t)
++	selinux_validate_context(ftpd_t)
  ')
  
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.7/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-09-06 15:43:06.000000000 -0400
-@@ -8,9 +8,15 @@
++++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-09-11 15:14:05.000000000 -0400
+@@ -8,9 +8,17 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
  /usr/sbin/hald		--			gen_context(system_u:object_r:hald_exec_t,s0)
@@ -6356,6 +6357,8 @@
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 +
++/var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/log/pm(/.*)?				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.0.7/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-29 14:10:57.000000000 -0400
 +++ serefpolicy-3.0.7/policy/modules/services/hal.if	2007-09-06 15:43:06.000000000 -0400
@@ -7386,7 +7389,7 @@
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.7/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-09-11 14:21:48.000000000 -0400
 @@ -20,7 +20,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -7405,7 +7408,17 @@
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
  corenet_tcp_sendrecv_all_if(NetworkManager_t)
-@@ -152,6 +154,11 @@
+@@ -136,6 +138,9 @@
+ 	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
+ 	dbus_connect_system_bus(NetworkManager_t)
+ 	dbus_send_system_bus(NetworkManager_t)
++	optional_policy(`
++		rpm_dbus_chat(NetworkManager_t)
++	')
+ ')
+ 
+ optional_policy(`
+@@ -152,6 +157,11 @@
  ')
  
  optional_policy(`
@@ -7417,7 +7430,7 @@
  	ppp_domtrans(NetworkManager_t)
  	ppp_read_pid_files(NetworkManager_t)
  	ppp_signal(NetworkManager_t)
-@@ -166,8 +173,10 @@
+@@ -166,8 +176,10 @@
  ')
  
  optional_policy(`
@@ -9669,7 +9682,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 11:09:25.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-11 15:24:02.000000000 -0400
 @@ -33,7 +33,6 @@
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -9705,13 +9718,14 @@
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
  
-@@ -109,5 +114,7 @@
+@@ -109,5 +114,8 @@
  ')
  
  optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
 +	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
 +	dbus_send_system_bus(setroubleshootd_t)
++	dbus_connect_system_bus(setroubleshootd_t)
  ')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.7/policy/modules/services/snmp.fc
@@ -11302,8 +11316,8 @@
 +/usr/sbin/brctl		--	gen_context(system_u:object_r:brctl_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.if serefpolicy-3.0.7/policy/modules/system/brctl.if
 --- nsaserefpolicy/policy/modules/system/brctl.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-09-06 15:43:06.000000000 -0400
-@@ -0,0 +1,25 @@
++++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-09-11 14:23:37.000000000 -0400
+@@ -0,0 +1,43 @@
 +
 +## <summary>Utilities for configuring the linux ethernet bridge</summary>
 +
@@ -11329,6 +11343,24 @@
 +	allow brctl_t $1:fifo_file rw_file_perms;
 +	allow brctl_t $1:process sigchld;
 +')
++
++########################################
++## <summary>
++##	Get attributes brctl executable.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`brctl_getattr',`
++	gen_require(`
++		type brctl_exec_t;
++	')
++
++	allow $1 brctl_exec_t:file getattr;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-3.0.7/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.0.7/policy/modules/system/brctl.te	2007-09-10 08:59:32.000000000 -0400
@@ -15418,7 +15450,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-07 08:48:47.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-11 14:25:59.000000000 -0400
 @@ -95,7 +95,7 @@
  read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
  rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
@@ -15428,7 +15460,13 @@
  dev_filetrans(xend_t, xenctl_t, fifo_file)
  
  manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t)
-@@ -126,7 +126,7 @@
+@@ -122,11 +122,13 @@
+ manage_fifo_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
+ files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir })
+ 
++init_stream_connect_script(xend_t)
++
+ # transition to store
  domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
  allow xenstored_t xend_t:fd use;
  allow xenstored_t xend_t:process sigchld;
@@ -15437,7 +15475,7 @@
  
  # transition to console
  domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
-@@ -176,6 +176,7 @@
+@@ -176,6 +178,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -15445,7 +15483,18 @@
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
-@@ -224,7 +225,7 @@
+@@ -214,6 +217,10 @@
+ netutils_domtrans(xend_t)
+ 
+ optional_policy(`
++	brctl_getattr(xend_t)
++')
++
++optional_policy(`
+ 	consoletype_exec(xend_t)
+ ')
+ 
+@@ -224,7 +231,7 @@
  
  allow xenconsoled_t self:capability { dac_override fsetid ipc_lock };
  allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms;
@@ -15454,7 +15503,7 @@
  
  allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms;
  
-@@ -257,7 +258,7 @@
+@@ -257,7 +264,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
  
@@ -15463,7 +15512,7 @@
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -265,7 +266,7 @@
+@@ -265,7 +272,7 @@
  # Xen store local policy
  #
  
@@ -15472,7 +15521,7 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -318,12 +319,13 @@
+@@ -318,12 +325,13 @@
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
  
  # internal communication is often done using fifo and unix sockets.
@@ -15487,7 +15536,7 @@
  files_search_var_lib(xm_t)
  
  allow xm_t xen_image_t:dir rw_dir_perms;
-@@ -336,6 +338,7 @@
+@@ -336,6 +344,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -15495,7 +15544,15 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -366,3 +369,14 @@
+@@ -353,6 +362,7 @@
+ 
+ term_use_all_terms(xm_t)
+ 
++init_stream_connect_script(xm_t)
+ init_rw_script_stream_sockets(xm_t)
+ init_use_fds(xm_t)
+ 
+@@ -366,3 +376,14 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- selinux-policy.spec	11 Sep 2007 16:07:47 -0000	1.520
+++ selinux-policy.spec	11 Sep 2007 20:05:08 -0000	1.521
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
+- Allow NetworkManager to dbus chat with yum-updated
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-9
 - Allow xfs to bind to port 7100
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:06:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 16:06:59 -0400
Subject: rpms/metacity/F-7 metacity.spec,1.116,1.117
Message-ID: <200709112006.l8BK6xh7031004@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30957

Modified Files:
	metacity.spec 
Log Message:
add upstream bug reference



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-7/metacity.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- metacity.spec	11 Sep 2007 19:44:01 -0000	1.116
+++ metacity.spec	11 Sep 2007 20:06:26 -0000	1.117
@@ -35,6 +35,7 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=433253
 Patch0: metacity-2.18.5-dont-deref-null-pointer.patch
 
 %description



From fedora-extras-commits at redhat.com  Tue Sep 11 20:07:32 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 11 Sep 2007 16:07:32 -0400
Subject: rpms/metacity/devel metacity.spec,1.130,1.131
Message-ID: <200709112007.l8BK7WqT031021@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996

Modified Files:
	metacity.spec 
Log Message:
add upstream bug reference



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- metacity.spec	11 Sep 2007 19:48:23 -0000	1.130
+++ metacity.spec	11 Sep 2007 20:06:58 -0000	1.131
@@ -11,6 +11,7 @@
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=433253
 Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops



From fedora-extras-commits at redhat.com  Tue Sep 11 20:09:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 11 Sep 2007 16:09:26 -0400
Subject: rpms/gnome-user-share/devel str-leak.patch, NONE,
	1.1 gnome-user-share.spec, 1.26, 1.27
Message-ID: <200709112009.l8BK9QPr031415@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-user-share/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31195

Modified Files:
	gnome-user-share.spec 
Added Files:
	str-leak.patch 
Log Message:
fix a small memory leak`


str-leak.patch:

--- NEW FILE str-leak.patch ---
diff -up gnome-user-share-0.11/user_share.c.str-leak gnome-user-share-0.11/user_share.c
--- gnome-user-share-0.11/user_share.c.str-leak	2007-09-11 16:00:18.000000000 -0400
+++ gnome-user-share-0.11/user_share.c	2007-09-11 16:00:40.000000000 -0400
@@ -594,6 +594,7 @@ spawn_httpd (int port, pid_t *pid_out)
 		argv[i++] = "RequirePasswordAlways";
     }
     
+    g_free (str);
     g_object_unref (client);
     
     argv[i] = NULL;


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-user-share.spec	28 Aug 2007 21:38:30 -0000	1.26
+++ gnome-user-share.spec	11 Sep 2007 20:08:52 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.11
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -12,6 +12,8 @@
 Patch1: gnome-user-share-0.11-export-session-id.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=456390
 Patch2: password-edit.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=475994
+Patch3: str-leak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
@@ -45,6 +47,7 @@
 %patch0 -p1 -b .invisible-char
 %patch1 -p1 -b .export-session-id
 %patch2 -p1 -b .password-edit
+%patch3 -p1 -b .str-leak
 
 %build
 autoheader ; autoconf # for patch1
@@ -95,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 0.11-9
+- Fix a memory leak
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.11-8
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:15:55 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:15:55 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 sugar-datastore.spec, 1.24, 1.25
Message-ID: <200709112015.l8BKFtqp032700@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32658

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 Sep 2007 18:30:49 -0000	1.23
+++ .cvsignore	11 Sep 2007 20:15:20 -0000	1.24
@@ -1 +1 @@
-sugar-datastore-0.2.2-git617bf5d005.tar.bz2
+sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Sep 2007 18:30:49 -0000	1.23
+++ sources	11 Sep 2007 20:15:20 -0000	1.24
@@ -1 +1 @@
-2a4e5ee382ea17f0d6730957ba96d940  sugar-datastore-0.2.2-git617bf5d005.tar.bz2
+b039a6ca3736f49a9c2ca305aea6446e  sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar-datastore.spec	10 Sep 2007 18:30:49 -0000	1.24
+++ sugar-datastore.spec	11 Sep 2007 20:15:20 -0000	1.25
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070910git
-%define commitid 617bf5d005
+%define alphatag 20070911git
+%define commitid b0b4c4115a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.20.%{alphatag}617bf5d005
+Release: 0.21.%{alphatag}b0b4c4115a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
+- New snapshot
+
 * Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.20.20070910git617bf5d005
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:27:01 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:27:01 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.19, 1.20 sources, 
	1.19, 1.20 sugar-presence-service.spec, 1.19, 1.20
Message-ID: <200709112027.l8BKR1nt001070@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	10 Sep 2007 15:22:48 -0000	1.19
+++ .cvsignore	11 Sep 2007 20:26:28 -0000	1.20
@@ -1,3 +1 @@
-sugar-presence-service-0.65-gita79f7b6488.tar.bz2
-sugar-presence-service-0.65-git3b1f4a0c42.tar.bz2
-sugar-presence-service-0.65-git3ed091301b.tar.bz2
+sugar-presence-service-0.65-gitbff163d57b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	10 Sep 2007 15:22:48 -0000	1.19
+++ sources	11 Sep 2007 20:26:28 -0000	1.20
@@ -1 +1 @@
-58fd9f1225a3d7bbc3d1f4d713d403b9  sugar-presence-service-0.65-git3ed091301b.tar.bz2
+18de89aa92cbe6c8171113524488bb7f  sugar-presence-service-0.65-gitbff163d57b.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sugar-presence-service.spec	10 Sep 2007 15:22:48 -0000	1.19
+++ sugar-presence-service.spec	11 Sep 2007 20:26:28 -0000	1.20
@@ -1,9 +1,9 @@
-%define alphatag 20070910git
-%define commitid 3ed091301b
+%define alphatag 20070911git
+%define commitid bff163d57b
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.14.%{alphatag}3ed091301b
+Release: 0.15.%{alphatag}bff163d57b
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
+- New snapshot
+
 * Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.14.20070910git3ed091301b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:41:05 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 11 Sep 2007 16:41:05 -0400
Subject: rpms/nsd/devel .cvsignore, 1.8, 1.9 nsd.spec, 1.20, 1.21 sources,
	1.8, 1.9 nsd-2.3.3-checking.patch, 1.1, NONE
Message-ID: <200709112041.l8BKf5Xb001621@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1585

Modified Files:
	.cvsignore nsd.spec sources 
Removed Files:
	nsd-2.3.3-checking.patch 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Mar 2007 04:27:39 -0000	1.8
+++ .cvsignore	11 Sep 2007 20:40:27 -0000	1.9
@@ -4,3 +4,4 @@
 nsd-3.0.2.tar.gz
 nsd-3.0.3.tar.gz
 nsd-3.0.5.tar.gz
+nsd-3.0.6.tar.gz


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	13 Jul 2007 18:47:18 -0000	1.20
+++ nsd.spec	11 Sep 2007 20:40:27 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -30,7 +30,7 @@
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d -m 0755 %{buildroot}%{_initrddir}
-install -d -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
 # change .sample to normal config files
@@ -74,6 +74,10 @@
 fi
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2007 04:27:39 -0000	1.8
+++ sources	11 Sep 2007 20:40:27 -0000	1.9
@@ -4,3 +4,4 @@
 a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
 73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
 ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz
+db964272bb653f3691cdae6932953432  nsd-3.0.6.tar.gz


--- nsd-2.3.3-checking.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 11 20:44:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 11 Sep 2007 16:44:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.48, 1.49 sources, 1.49,
	1.50 sugar.spec, 1.57, 1.58
Message-ID: <200709112044.l8BKiHVe001802@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1767

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	10 Sep 2007 18:25:47 -0000	1.48
+++ .cvsignore	11 Sep 2007 20:43:40 -0000	1.49
@@ -1 +1 @@
-sugar-0.65-git79237f3114.tar.bz2
+sugar-0.65-git8b784a6223.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	10 Sep 2007 18:25:47 -0000	1.49
+++ sources	11 Sep 2007 20:43:40 -0000	1.50
@@ -1 +1 @@
-3ca3e5e4e8d1d024ae7c01de5ebeafe3  sugar-0.65-git79237f3114.tar.bz2
+db824af53d51c851dc8ca1d75484a317  sugar-0.65-git8b784a6223.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sugar.spec	10 Sep 2007 18:25:47 -0000	1.57
+++ sugar.spec	11 Sep 2007 20:43:40 -0000	1.58
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070910git
-%define commitid 79237f3114
+%define alphatag 20070911git
+%define commitid 8b784a6223
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.45.%{alphatag}79237f3114
+Release: 0.46.%{alphatag}8b784a6223
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
+- New snapshot
+
 * Mon Sep 10 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.45.20070910git79237f3114
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:51:09 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 16:51:09 -0400
Subject: rpms/exaile/devel exaile.spec,1.12,1.13
Message-ID: <200709112051.l8BKp9YP002170@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/exaile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2124

Modified Files:
	exaile.spec 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-3
- Require pygtk2-libglade (BZ #278471)



Index: exaile.spec
===================================================================
RCS file: /cvs/extras/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- exaile.spec	22 Aug 2007 11:56:33 -0000	1.12
+++ exaile.spec	11 Sep 2007 20:50:30 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	A music player
 Name:		exaile
 Version:	0.2.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Applications/Multimedia
 # It actually says GPL 1 or later version; a couple of files includes the Artistic license 
 License:	GPLv+ and Artistic
@@ -20,7 +20,7 @@
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	python-sqlite2
-Requires:	pygtk2
+Requires:	pygtk2-libglade
 Requires:	gnome-python2-gtkhtml2
 Requires:	gnome-python2-gtkmozembed
 Requires:	python-CDDB
@@ -98,6 +98,9 @@
 %{_mandir}/man1/exaile*.*
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-3
+- Require pygtk2-libglade (BZ #278471)
+
 * Wed Aug 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 11 20:52:50 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Sep 2007 16:52:50 -0400
Subject: rpms/krb5/devel krb5.spec,1.135,1.136
Message-ID: <200709112052.l8BKqoJQ002333@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	krb5.spec 
Log Message:
- move the db2 kdb plugin from -server to -libs, because a multilib libkdb
  might need it



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- krb5.spec	11 Sep 2007 14:12:38 -0000	1.135
+++ krb5.spec	11 Sep 2007 20:52:15 -0000	1.136
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.2
-Release: 7%{?dist}
+Release: 8%{?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
@@ -208,6 +208,10 @@
 %endif
 
 %changelog
+* Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-8
+- move the db2 kdb plugin from -server to -libs, because a multilib libkdb
+  might need it
+
 * Tue Sep 11 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-7
 - also perform PAM session and credential management when ftpd accepts a
   client using strong authentication, missed earlier
@@ -1653,8 +1657,6 @@
 %dir %{krb5prefix}/man/man8
 %dir %{krb5prefix}/sbin
 
-%{_libdir}/krb5/plugins/kdb/db2.so
-
 # Problem-reporting tool.
 %{krb5prefix}/sbin/krb5-send-pr
 %{krb5prefix}/man/man1/krb5-send-pr.1*
@@ -1729,6 +1731,8 @@
 %dir %{_libdir}/krb5
 %dir %{_libdir}/krb5/plugins
 %dir %{_libdir}/krb5/plugins/*
+%dir %{_libdir}/krb5/plugins/*
+%{_libdir}/krb5/plugins/kdb/db2.so
 %{krb5prefix}/share
 
 %files devel



From fedora-extras-commits at redhat.com  Tue Sep 11 20:53:18 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 11 Sep 2007 16:53:18 -0400
Subject: rpms/exaile/F-7 exaile.spec,1.9,1.10
Message-ID: <200709112053.l8BKrI2A002366@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/exaile/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2307

Modified Files:
	exaile.spec 
Log Message:
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
- Require pygtk2-libglade (BZ #278471)



Index: exaile.spec
===================================================================
RCS file: /cvs/extras/rpms/exaile/F-7/exaile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- exaile.spec	30 Jun 2007 10:45:27 -0000	1.9
+++ exaile.spec	11 Sep 2007 20:52:46 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	A music player
 Name:		exaile
 Version:	0.2.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.exaile.org
@@ -19,7 +19,7 @@
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	python-sqlite2
-Requires:	pygtk2
+Requires:	pygtk2-libglade
 Requires:	gnome-python2-gtkhtml2
 Requires:	gnome-python2-gtkmozembed
 Requires:	python-CDDB
@@ -97,6 +97,9 @@
 %{_mandir}/man1/exaile*.*
 
 %changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-2
+- Require pygtk2-libglade (BZ #278471)
+
 * Sat Jun 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-1
 - New release
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:10:15 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 17:10:15 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.18,1.19 sources,1.14,1.15
Message-ID: <200709112110.l8BLAF9V009274@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9237

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bigboard.spec	27 Aug 2007 19:03:14 -0000	1.18
+++ bigboard.spec	11 Sep 2007 21:09:42 -0000	1.19
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.11
+Version:        0.5.15
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -26,7 +26,10 @@
 BuildRequires:	intltool
 BuildRequires:	gtk2-devel
 BuildRequires:	pygtk2-devel
+BuildRequires:  dbus-devel
+BuildRequires:  gnome-panel-devel
 BuildRequires:	gnome-keyring-devel
+BuildRequires:  mugshot-devel >= 1.1.52
 
 %description
 Bigboard is a sidebar and application launcher that works with mugshot.org
@@ -53,10 +56,6 @@
 %doc COPYING
 %dir %{_libexecdir}/bigboard
 %attr(0755,root,root) %{_libexecdir}/bigboard/*
-%dir %{python_sitearch}/mugshot
-%{python_sitearch}/mugshot/*.py
-%{python_sitearch}/mugshot/*.pyc
-%{python_sitearch}/mugshot/*.pyo
 %dir %{python_sitearch}/bigboard
 %{python_sitearch}/bigboard/*.so
 %{python_sitearch}/bigboard/*.py
@@ -79,12 +78,11 @@
 %{python_sitearch}/bigboard_externals/*
 %dir %{_datadir}/bigboard
 %{_datadir}/bigboard/*
-%{_datadir}/bigboard/*.png
-%{_datadir}/gnome/autostart/*.desktop
-%{_bindir}/bigboard
-%{_bindir}/gconf-online-sync
-%{_libdir}/bonobo/servers/BigBoard_Applet.server
-%{_libexecdir}/bigboard-applet
+%{_datadir}/gnome/*
+%{_datadir}/gnome-2.0/*
+%{_bindir}/*
+%{_libdir}/bonobo/servers/*
+%{_libexecdir}/bigboard-applets
 # no desktop file included because the bigboard is launched as part of online
 # desktop mode
 
@@ -95,6 +93,15 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
+- new upstream
+
+* Fri Sep 07 2007 Colin Walters <walters at redhat.com> - 0.5.12-2
+- some brs
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 0.5.12-1
+- new upstream
+
 * Mon Aug 27 2007 Colin Walters <walters at redhat.com> - 0.5.11-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Aug 2007 19:03:14 -0000	1.14
+++ sources	11 Sep 2007 21:09:42 -0000	1.15
@@ -1 +1 @@
-651d5d896702a1bb8a3ecbcaedd668b3  bigboard-0.5.11.tar.gz
+bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 21:21:18 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 17:21:18 -0400
Subject: rpms/evolution/devel evolution.spec,1.287,1.288
Message-ID: <200709112121.l8BLLIZO009611@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9534

Modified Files:
	evolution.spec 
Log Message:

* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
- Split off an evolution-help package



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- evolution.spec	5 Sep 2007 14:49:49 -0000	1.287
+++ evolution.spec	11 Sep 2007 21:20:45 -0000	1.288
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -231,6 +231,14 @@
 %description devel
 Development files needed for building things which link against evolution.
 
+%package help
+Group: Applications/Productivity
+Summary: Help files for Evolution
+Requires: %{name} = %{version}-%{release}
+
+%description help
+This package contains the help for Evolution. 
+
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
@@ -399,6 +407,9 @@
 done
 %find_lang evolution-%{evo_major} --all-name --with-gnome
 
+grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
+grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -423,7 +434,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f evolution-%{evo_major}.lang
+%files -f translations.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 
@@ -446,9 +457,6 @@
 %{_datadir}/applications/redhat-evolution-contacts.desktop
 %{_datadir}/applications/redhat-evolution-tasks.desktop
 
-# Online help:
-%{_datadir}/omf/evolution
-
 # Icons:
 %{_datadir}/icons/hicolor/16x16/apps/evolution.png
 %{_datadir}/icons/hicolor/22x22/apps/evolution.png
@@ -694,10 +702,16 @@
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
+%files help -f help.lang
+%dir %{_datadir}/omf/evolution
+
 # Look into re-enabling the inline-audio plugin once 2.12 ships.
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
+- Split off an evolution-help package
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:26:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 11 Sep 2007 17:26:23 -0400
Subject: rpms/kernel/devel linux-2.6-libata-pata-dma-disable-option.patch,
	NONE, 
	1.1 linux-2.6-scsi-mpt-vmware-fix.patch, NONE, 1.1 kernel.spec,
	1.156, 1.157
Message-ID: <200709112126.l8BLQN42009945@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9903

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata-dma-disable-option.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
Log Message:
* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
- fix emulated vmware SCSI disks
- add option to disable libata PATA DMA


linux-2.6-libata-pata-dma-disable-option.patch:

--- NEW FILE linux-2.6-libata-pata-dma-disable-option.patch ---
This is useful when debugging, handling problem systems, or for
distributions just to get the system installed so it can be sorted
out later.

This is a bit smarter than the old IDE one and lets you do

libata.pata_dma=0		Disable all PATA DMA like old IDE
libata.pata_dma=1		Disk DMA only
libata.pata_dma=2		ATAPI DMA only
libata.pata_dma=4		CF DMA only

(or combinations thereof - 0,1,3 being the useful ones I suspect)

(I've split CF as it seems to be a seperate case of pain and suffering
different to the others and caused by assorted PIO wired adapters etc)

SATA is not affected - for one its not clear it makes sense to disable
DMA for SATA if even always possible, for two we've seen no failure 
evidence to justify needing to support this kind of hammer on SATA.

Signed-off-by: Alan Cox <alan at redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/include/linux/libata.h linux-2.6.23rc3-mm1/include/linux/libata.h
--- linux.vanilla-2.6.23rc3-mm1/include/linux/libata.h	2007-08-22 17:23:14.000000000 +0100
+++ linux-2.6.23rc3-mm1/include/linux/libata.h	2007-08-22 17:50:32.000000000 +0100
@@ -315,6 +315,12 @@
 	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */
 	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */
 	ATA_HORKAGE_BROKEN_HPA	= (1 << 4),	/* Broken HPA */
+ 
+	/* DMA mask for user DMA control: User visible values do not 
+	   renumber */
+	ATA_DMA_MASK_ATA	= (1 << 0),	/* DMA on ATA Disk */
+	ATA_DMA_MASK_ATAPI	= (1 << 1),	/* DMA on ATAPI */
+	ATA_DMA_MASK_CFA	= (1 << 2),	/* DMA on CF Card */
 };
 
 enum hsm_task_states {
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/drivers/ata/libata-core.c linux-2.6.23rc3-mm1/drivers/ata/libata-core.c
--- linux.vanilla-2.6.23rc3-mm1/drivers/ata/libata-core.c	2007-08-22 17:23:00.000000000 +0100
+++ linux-2.6.23rc3-mm1/drivers/ata/libata-core.c	2007-08-22 18:17:31.321738376 +0100
@@ -99,6 +99,10 @@
 module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
 MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
 
+static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
+module_param_named(pata_dma, ata_pata_dma, int, 0644);
+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -2839,16 +2854,29 @@
 	/* step 1: calculate xfer_mask */
	for (i = 0; i < ATA_MAX_DEVICES; i++) {
 		unsigned int pio_mask, dma_mask;
+		unsigned int mode_mask;
 
 		dev = &ap->device[i];
 
 		if (!ata_dev_enabled(dev))
 			continue;
 
+		mode_mask = ATA_DMA_MASK_ATA;
+		if (dev->class == ATA_DEV_ATAPI)
+			mode_mask = ATA_DMA_MASK_ATAPI;
+		else if (ata_id_is_cfa(dev->id))
+			mode_mask = ATA_DMA_MASK_CFA;
+
 		ata_dev_xfermask(dev);
 
 		pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
 		dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+
+		if ((ata_pata_dma & mode_mask) || ap->cbl == ATA_CBL_SATA)
+			dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		else
+			dma_mask = 0;
+
 		dev->pio_mode = ata_xfer_mask2mode(pio_mask);
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
--- linux-2.6.22.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.22.noarch/Documentation/kernel-parameters.txt
@@ -870,6 +870,12 @@ and is between 256 and 4096 characters. 
 	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
 			Format: addr:<io>,irq:<irq>
 
+	libata.pata_dma= [LIBATA]
+		libata.pata_dma=0	Disable all PATA DMA like old IDE
+		libata.pata_dma=1	Disk DMA only
+		libata.pata_dma=2	ATAPI DMA only
+		libata.pata_dma=4	CF DMA only
+
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
 			See Documentation/ramdisk.txt.
 

linux-2.6-scsi-mpt-vmware-fix.patch:

--- NEW FILE linux-2.6-scsi-mpt-vmware-fix.patch ---
The attached patch is a workaround for a bug in VMWare's emulated LSI
Fusion SCSI HBA.  The emulated firmware returns zero for the maximum
number of attached devices; the real firmware returns a positive
number.  Therefore, the kernel that boots and works fine on bare metal
will fail on VMWare because this firmware value is handed to the SCSI
midlayer, which then skips the entire bus scan.

F7 bz 241935

The patch below was submitted by Eric Moore of LSI to the linux-scsi
mailing list:

http://marc.info/?l=linux-scsi&m=117432237404247

then immediately rejected by Christoph Hellwig, who prefers that
VMWare fix their emulation instead.

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index eddb933..21fadf2 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -2571,8 +2571,19 @@ GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
 	pfacts->MaxPersistentIDs = le16_to_cpu(pfacts->MaxPersistentIDs);
 	pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets);
 
-	max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID :
-	    pfacts->MaxDevices;
+	switch (ioc->bus_type) {
+	case SAS:
+		max_id = pfacts->PortSCSIID;
+		break;
+	case FC:
+		max_id = pfacts->MaxDevices;
+		break;
+	case SPI:
+	default:
+		max_id = MPT_MAX_SCSI_DEVICES;
+		break;
+	}
+
 	ioc->devices_per_bus = (max_id > 255) ? 256 : max_id;
 	ioc->number_of_buses = (ioc->devices_per_bus < 256) ? 1 : max_id/256;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kernel.spec	11 Sep 2007 18:03:54 -0000	1.156
+++ kernel.spec	11 Sep 2007 21:25:51 -0000	1.157
@@ -608,6 +608,7 @@
 Patch370: linux-2.6-crash-driver.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-scsi-async-double-add.patch
+Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
 Patch423: linux-2.6-gfs-locking-exports.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
@@ -624,6 +625,7 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch661: linux-2.6-libata-acpi-enable.patch
+Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 #Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1072,6 +1074,8 @@
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 # Fix async scanning double-add problems
 ApplyPatch linux-2.6-scsi-async-double-add.patch
+# fix vmware emulated scsi controller
+ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1119,6 +1123,8 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # Enable ACPI ATA objects
 ApplyPatch linux-2.6-libata-acpi-enable.patch
+# add option to disable PATA DMA
+ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
 #ApplyPatch linux-2.6-wireless.patch
@@ -1791,6 +1797,10 @@
 
 %changelog
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix emulated vmware SCSI disks
+- add option to disable libata PATA DMA
+
+* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - utrace update
 
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep 11 21:27:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 17:27:38 -0400
Subject: rpms/childsplay_plugins/devel
	childsplay_plugins-0.80.7-alphabet-sounds.patch, 1.2,
	1.3 childsplay_plugins.spec, 1.8, 1.9
Message-ID: <200709112127.l8BLRcbe010016@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay_plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976

Modified Files:
	childsplay_plugins-0.80.7-alphabet-sounds.patch 
	childsplay_plugins.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-2
- Adapt gcompris alphabet sounds using patch for new gcompris alphabet sounds
  location


childsplay_plugins-0.80.7-alphabet-sounds.patch:

Index: childsplay_plugins-0.80.7-alphabet-sounds.patch
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins-0.80.7-alphabet-sounds.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- childsplay_plugins-0.80.7-alphabet-sounds.patch	31 Oct 2006 10:54:28 -0000	1.2
+++ childsplay_plugins-0.80.7-alphabet-sounds.patch	11 Sep 2007 21:27:05 -0000	1.3
@@ -6,11 +6,11 @@
          #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2])
 -        if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
 -        self.sounddir = os.path.join(DATADIR,'AlphabetSounds',self.cpg.language)
-+        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
-+        self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',self.cpg.language,'alphabet')
++        if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/voices',self.cpg.language,'alphabet')
++        self.sounddir = os.path.join('/usr/share/gcompris/boards/voices',self.cpg.language,'alphabet')
          if not os.path.exists(self.sounddir):
 -            self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en')
-+            self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet'
++            self.sounddir = '/usr/share/gcompris/boards/voices/en/alphabet'
          img = load_image(os.path.join\
                          (self.libdir,'Findsound2Data','Data','soundbut.png'),1)
          
@@ -33,7 +33,7 @@
          # Look for alphabet sounds for this locale.
          # If all fails we fall back to the "old" wahoo sound.
 -        alphabetdir = os.path.join(DATADIR,'AlphabetSounds',wordsloc)
-+        alphabetdir = os.path.join('/usr/share/gcompris/boards/sounds',wordsloc,'alphabet')
++        alphabetdir = os.path.join('/usr/share/gcompris/boards/voices',wordsloc,'alphabet')
          if not os.path.exists(alphabetdir):
              print >> sys.stderr, "Can't find",alphabetdir
              alphabetdir = None


Index: childsplay_plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- childsplay_plugins.spec	26 Aug 2007 07:24:46 -0000	1.8
+++ childsplay_plugins.spec	11 Sep 2007 21:27:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           childsplay_plugins
 Version:        0.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for childsplay (educational games for young children)
 Group:          Amusements/Games
 License:        GPLv3
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-2
+- Adapt gcompris alphabet sounds using patch for new gcompris alphabet sounds
+  location
+
 * Sun Aug 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-1
 - New upstream version 0.90, license changed to GPL version 3,
   no other changes.



From fedora-extras-commits at redhat.com  Tue Sep 11 21:33:55 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Tue, 11 Sep 2007 17:33:55 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.7,1.8
Message-ID: <200709112133.l8BLXtRn010279@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10257

Modified Files:
	online-desktop.spec 
Log Message:
require devilspie


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- online-desktop.spec	10 Sep 2007 20:16:20 -0000	1.7
+++ online-desktop.spec	11 Sep 2007 21:33:22 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           online-desktop
 Version:        0.2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
+Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -178,10 +179,10 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
-- new upstream
-
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
+- require devilspie
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Tue Sep 11 21:55:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 17:55:01 -0400
Subject: rpms/gcompris/devel gcompris-8.4-configure-bugfix.patch, NONE,
	1.1 gcompris-8.4-fullscreen.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 gcompris.spec, 1.27, 1.28 sources, 1.10, 1.11
Message-ID: <200709112155.l8BLt1WG011866@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11759

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4-configure-bugfix.patch 
	gcompris-8.4-fullscreen.patch 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
- New upstream release 8.4
- Drop -flags sub-package, the idea was that by putting the flags in a
  subpackage they could be used by other packages, but this never happened.
- License changed to GPL version 3 (or higher)


gcompris-8.4-configure-bugfix.patch:

--- NEW FILE gcompris-8.4-configure-bugfix.patch ---
diff -up gcompris-8.4/configure~ gcompris-8.4/configure
--- gcompris-8.4/configure~	2007-09-11 21:13:09.000000000 +0200
+++ gcompris-8.4/configure	2007-09-11 21:13:09.000000000 +0200
@@ -24027,8 +24027,6 @@ _ACEOF
 
 
 
-CFLAGS=$cflags_previous
-LIBS=$libs_previous
 
 # Check whether --enable-glibtest was given.
 if test "${enable_glibtest+set}" = set; then

gcompris-8.4-fullscreen.patch:

--- NEW FILE gcompris-8.4-fullscreen.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c.fullscreen gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c.fullscreen	2007-09-11 22:44:33.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c	2007-09-11 22:44:58.000000000 +0200
@@ -970,14 +970,27 @@ void gc_fullscreen_set(gboolean state)
     {
       gdk_window_set_decorations (window->window, 0);
       gdk_window_set_functions (window->window, 0);
+      gtk_widget_set_uposition (window, 0, 0);
 #ifdef XF86_VIDMODE
-      if(properties->noxf86vm)
+      if(!properties->noxf86vm)
+      {
+        gdk_window_set_override_redirect (window->window, 1);
+        gdk_window_set_keep_above (window->window, 1);
+        gdk_window_raise (window->window);
+      }
+      else
 #endif
 	gtk_window_fullscreen (GTK_WINDOW(window));
-      gtk_widget_set_uposition (window, 0, 0);
     }
   else
     {
+#ifdef XF86_VIDMODE
+      if(!properties->noxf86vm)
+      {
+        gdk_window_set_keep_above (window->window, 0);
+        gdk_window_set_override_redirect (window->window, 0);
+      }
+#endif
       /* The hide must be done at least for KDE */
       gtk_widget_hide (window);
       gdk_window_set_decorations (window->window, GDK_DECOR_ALL);
@@ -987,7 +1000,6 @@ void gc_fullscreen_set(gboolean state)
       if(properties->noxf86vm)
 #endif
 	gtk_window_unfullscreen (GTK_WINDOW(window));
-      gtk_widget_set_uposition (window, 0, 0);
 
       /* Mandatory or on windows we get iconified */
       gtk_window_deiconify (GTK_WINDOW(window));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Aug 2007 05:02:48 -0000	1.10
+++ .cvsignore	11 Sep 2007 21:54:28 -0000	1.11
@@ -1 +1 @@
-gcompris-8.3.3.tar.gz
+gcompris-8.4.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcompris.spec	17 Aug 2007 05:02:48 -0000	1.27
+++ gcompris.spec	11 Sep 2007 21:54:28 -0000	1.28
@@ -1,25 +1,30 @@
 Name:           gcompris
-Version:        8.3.3
+Version:        8.4
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-8.1-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
+Patch2:         gcompris-8.4-configure-bugfix.patch
+Patch3:         gcompris-8.4-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
 Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
 Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # note we do not provide these, they no longer exist
 Obsoletes:      %{name}-libs < %{version}-%{release}
 Obsoletes:      %{name}-devel < %{version}-%{release}
+# the flags are no longer in a separate sub-package
+Obsoletes:      %{name}-flags < %{version}-%{release}
+Provides:       %{name}-flags = %{version}-%{release}
 
 %description
 GCompris / I Got IT is an educationnal game for children starting at 2.
@@ -252,11 +257,14 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
-mv tmp docs/C/gcompris.info
+%patch2 -p1
+%patch3 -p1
+iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
+mv tmp docs/C/%{name}.info
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags pangoft2`"
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
 %configure --enable-py-build-only --enable-gnet
@@ -267,17 +275,17 @@
 sed -i \
   -e 's/Name=Educational suite GCompris/Name=GCompris Educational suite/' \
   -e 's/Categories=Game;KidsGame;/Categories=Education;/' \
-  gcompris.desktop
+  %{name}.desktop
 sed -i \
   -e 's/Comment=Administration for gcompris/Comment=Specify which activities may be used by whom/' \
   -e 's/Categories=Education;Teaching;/Categories=Education;/' \
-  gcompris-edit.desktop
+  %{name}-edit.desktop
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT/usr/lib/menu
 %find_lang %{name}
@@ -324,42 +332,8 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/DOCUMENTATIONS
-%{_datadir}/gcompris/boards/README
-%{_datadir}/gcompris/boards/a*
-%{_datadir}/gcompris/boards/b*
-%{_datadir}/gcompris/boards/c*
-%{_datadir}/gcompris/boards/d*
-%{_datadir}/gcompris/boards/e*
-%{_datadir}/gcompris/boards/f*.xml
-%{_datadir}/gcompris/boards/fishes
-%{_datadir}/gcompris/boards/g*
-%{_datadir}/gcompris/boards/h*
-%{_datadir}/gcompris/boards/i*
-%{_datadir}/gcompris/boards/k*
-%{_datadir}/gcompris/boards/l*
-%{_datadir}/gcompris/boards/m*
-%{_datadir}/gcompris/boards/n*
-%{_datadir}/gcompris/boards/o*
-%{_datadir}/gcompris/boards/p*
-%{_datadir}/gcompris/boards/r*
-%{_datadir}/gcompris/boards/s*.xml
-%{_datadir}/gcompris/boards/scales
-%{_datadir}/gcompris/boards/skins
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/*.wav
-%{_datadir}/gcompris/boards/sounds/melody
-%{_datadir}/gcompris/boards/sounds/memory
-%{_datadir}/gcompris/boards/sounds/chronos
-%{_datadir}/gcompris/boards/sounds/LuneRouge
-%{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
-%{_datadir}/gcompris/boards/sounds/README
-%{_datadir}/gcompris/boards/submarine
-%{_datadir}/gcompris/boards/t*
-%{_datadir}/gcompris/boards/w*
-%{_datadir}/gcompris/python
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/boards/voices
 %{_datadir}/gnome
 %{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
 %{_datadir}/applications/fedora-%{name}*.desktop
@@ -368,174 +342,174 @@
 
 %files sound-ar
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ar
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ar
 
 %files sound-cs
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/cs
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/cs
 
 %files sound-da
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/da
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/da
 
 %files sound-de
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/de
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/de
 
 %files sound-el
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/el
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/el
 
 %files sound-en
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/en
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/en
 
 %files sound-es
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/es
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/es
 
 %files sound-eu
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/eu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/eu
 
 %files sound-fi
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fi
 
 %files sound-fr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/fr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/fr
 
 %files sound-hi
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hi
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hi
 
 %files sound-hu
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/hu
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/hu
 
 %files sound-id
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/id
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/id
 
 %files sound-it
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/it
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/it
 
 %files sound-mr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/mr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/mr
 
 %files sound-nb
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nb
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nb
 
 %files sound-nl
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/nl
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/nl
 
 %files sound-pt
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/pt
-%{_datadir}/gcompris/boards/sounds/pt_BR
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/pt
+%{_datadir}/%{name}/boards/voices/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/ru
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/ru
 
 %files sound-so
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/so
 
 %files sound-sr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sr
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sr
 
 %files sound-sv
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/sv
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/sv
 
 %files sound-tr
 %defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%dir %{_datadir}/gcompris/boards/sounds
-%{_datadir}/gcompris/boards/sounds/tr
-
-%files flags
-%defattr(-,root,root,-)
-%dir %{_datadir}/gcompris
-%dir %{_datadir}/gcompris/boards
-%{_datadir}/gcompris/boards/flags
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/boards
+%dir %{_datadir}/%{name}/boards/voices
+%{_datadir}/%{name}/boards/voices/tr
 
 
 %changelog
+* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
+- New upstream release 8.4
+- Drop -flags sub-package, the idea was that by putting the flags in a
+  subpackage they could be used by other packages, but this never happened.
+- License changed to GPL version 3 (or higher)
+
 * Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.3-1
 - New upstream release 8.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Aug 2007 05:02:48 -0000	1.10
+++ sources	11 Sep 2007 21:54:28 -0000	1.11
@@ -1 +1 @@
-4b551a5ac3c53749927b081c8553d392  gcompris-8.3.3.tar.gz
+33e5882945f43232953478c93eacf0e6  gcompris-8.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 21:58:31 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Tue, 11 Sep 2007 17:58:31 -0400
Subject: rpms/rubygems/devel .cvsignore, 1.4, 1.5 rubygems.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709112158.l8BLwVwL012537@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12374

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
Version 0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:45:49 -0000	1.4
+++ .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:45:49 -0000	1.3
+++ rubygems.spec	11 Sep 2007 21:57:59 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:45:49 -0000	1.4
+++ sources	11 Sep 2007 21:57:59 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:10:50 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Sep 2007 18:10:50 -0400
Subject: rpms/gcompris/devel gcompris.spec,1.28,1.29
Message-ID: <200709112210.l8BMAoFU020351@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20244

Modified Files:
	gcompris.spec 
Log Message:
* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
- New upstream release 8.4
- Drop -flags sub-package, the idea was that by putting the flags in a
  subpackage they could be used by other packages, but this never happened.
- License changed to GPL version 3 (or higher)



Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcompris.spec	11 Sep 2007 21:54:28 -0000	1.28
+++ gcompris.spec	11 Sep 2007 22:10:16 -0000	1.29
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
-Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
+Buildrequires:  gnome-python2 xorg-x11-proto-devel gstreamer-devel
+Buildrequires:  python-sqlite2 texi2html texinfo
+Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
 Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
 Requires:       pygtk2 python-sqlite2
 Requires(post): /sbin/install-info



From fedora-extras-commits at redhat.com  Tue Sep 11 22:16:01 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:16:01 -0400
Subject: rpms/dbench/devel dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709112216.l8BMG1I3021186@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial import


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:15:28 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	11 Sep 2007 22:15:28 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:19:51 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:19:51 -0400
Subject: rpms/dbench/OLPC-2 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709112219.l8BMJpAN021758@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial import


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:19:18 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	11 Sep 2007 22:19:18 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 11 22:31:56 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:31:56 -0400
Subject: rpms/vbetool/devel vbetool.spec,1.1,1.2
Message-ID: <200709112231.l8BMVugE023675@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23540

Modified Files:
	vbetool.spec 
Log Message:
add bug number of ppc(64) ExcludeArch bugs



Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbetool.spec	10 Sep 2007 22:56:27 -0000	1.1
+++ vbetool.spec	11 Sep 2007 22:31:24 -0000	1.2
@@ -12,7 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel pciutils-devel
-# does not build on ppc and ppc64
+# does not build on ppc and ppc64, see #285361 (RedHat Bugzilla)
+# on ppc sys/io.h is missing, on ppc64 there are more complaints
+# build.logs are attached in the bug report
 ExcludeArch:    ppc ppc64
 # vbetool is included in (some of) these pm-utils releases
 Conflicts:      pm-utils <= 0.99.3-11



From fedora-extras-commits at redhat.com  Tue Sep 11 22:35:53 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 11 Sep 2007 18:35:53 -0400
Subject: rpms/initscripts/OLPC-2 olpc-login, NONE,
	1.1 initscripts-8.54.1-olpc.patch, 1.5, 1.6 initscripts.spec,
	1.148, 1.149
Message-ID: <200709112235.l8BMZrl0024235@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24194

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Added Files:
	olpc-login 
Log Message:
- clean up olpc-dm
- make sure olpc-dm sources /etc/sysconfig/i18n
- add an olpc-login pam control file to avoid unneeded checks



--- NEW FILE olpc-login ---
#%PAM-1.0
auth       required    pam_env.so
auth       required    pam_permit.so
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- initscripts-8.54.1-olpc.patch	30 Aug 2007 22:37:18 -0000	1.5
+++ initscripts-8.54.1-olpc.patch	11 Sep 2007 22:35:50 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-08-30 18:34:28.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-11 18:23:52.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-08-30 18:33:15.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-11 18:23:52.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,9 +43,9 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-08-29 13:13:59.090486248 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-08-30 18:33:15.000000000 -0400
-@@ -0,0 +1,595 @@
+--- /dev/null	2007-09-11 11:59:20.755757520 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-11 18:29:19.000000000 -0400
+@@ -0,0 +1,568 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -173,6 +173,69 @@
 +  return 0;
 +}
 +
++/* strip comments and leading white space*/
++char *
++strip(char *src)
++{
++  int tpos=0;
++  int len;
++  int i;
++  int first_char_found=0;
++  char *result;
++ 
++  len = strlen(src);
++  result = (char *)malloc(len);
++  
++  for (i=0; i < len; i++)
++    {
++      if (!first_char_found && !isblank((int)src[i]))
++        first_char_found = 1;
++
++      if (first_char_found)
++        {
++          if (src[i] == (int)'#')
++            break;
++
++          result[tpos] = src[i];
++          tpos++;
++        }
++    }
++
++  if (tpos == 0)
++    {
++      /* blank line */
++      free(result);
++      result = NULL;
++    }
++  else
++    result[tpos]='\0';
++
++  return result;
++}
++
++void 
++source_i18n(void)
++{
++  FILE *f;
++  char *line;
++
++  f = fopen("/etc/sysconfig/i18n", "r");
++  while(fscanf(f, "%as", &line)==1)
++    {
++      char *sline;
++ 
++      sline = strip(line);
++      if (sline == NULL)
++        continue;
++
++      putenv(sline);
++
++      free(line);
++    }
++ 
++  fclose(f);
++}
++
 +void
 +olpc_login(void)
 +{
@@ -212,74 +275,25 @@
 +   *     seteuid olpc -> start clients
 +   */ 
 +  ttyn = "/dev/tty2";
-+
-+  if (strncmp(ttyn, "/dev/", 5) == 0)
-+    tty_name = ttyn+5;
-+  else
-+    tty_name = ttyn;
-+
-+  if (strncmp(ttyn, "/dev/tty", 8) == 0)
-+    tty_number = ttyn+8;
-+  else 
-+    {
-+      char *p = ttyn;
-+      while (*p && !isdigit(*p)) p++;
-+      tty_number = p;
-+    }
-+
-+  printf("TTY: %s\n", tty_name);
-+
-+  /* find names of Virtual Console devices, for later mode change */
-+  snprintf(vcsn, sizeof(vcsn), "/dev/vcs%s", tty_number);
-+  snprintf(vcsan, sizeof(vcsan), "/dev/vcsa%s", tty_number);
++  tty_number = "2";
 +
 +  /* set pgid to pid */
 +  setpgrp();
 +  /* this means that setsid() will fail */
 +  
-+  {
-+    struct termios tt, ttt;
-+	
-+    tcgetattr(0, &tt);
-+    ttt = tt;
-+    ttt.c_cflag &= ~HUPCL;
-+
-+    /* These can fail, e.g. with ttyn on a read-only filesystem */
-+    chown(ttyn, 0, 0);
-+    chmod(ttyn, TTY_MODE);
-+
-+    /* Kill processes left on this tty */
-+    tcsetattr(0,TCSAFLUSH,&ttt);
-+    signal(SIGHUP, SIG_IGN); /* so vhangup() wont kill us */
-+    vhangup();
-+    signal(SIGHUP, SIG_DFL);
-+
-+    /* open stdin,stdout,stderr to the tty */
-+    opentty(ttyn);
-+	
-+    /* restore tty modes */
-+    tcsetattr(0,TCSAFLUSH,&tt);
-+  }
++  openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);
 +
-+  openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
-+
-+  retcode = pam_start("login", OLPC_USER, &conv, &pamh);
++  retcode = pam_start("olpc-login", OLPC_USER, &conv, &pamh);
 +  if(retcode != PAM_SUCCESS) 
 +    {
-+      fprintf(stderr, "login: PAM Failure, aborting: %s\n",
++      fprintf(stderr, "olpc-login: PAM Failure, aborting: %s\n",
 +              pam_strerror(pamh, retcode));
 +      syslog(LOG_ERR, "Couldn't initialize PAM: %s",
 +             pam_strerror(pamh, retcode));
 +      exit(99);
 +    }
-+  /* hostname & tty are either set to NULL or their correct values,
-+     depending on how much we know */
-+  retcode = pam_set_item(pamh, PAM_RHOST, hostname);
-+  PAM_FAIL_CHECK;
 +  retcode = pam_set_item(pamh, PAM_TTY, tty_name);
 +  PAM_FAIL_CHECK;
-+  retcode = pam_set_item(pamh, PAM_USER_PROMPT, "You shouldn't see this login prompt");
-+  PAM_FAIL_CHECK;
 +
 +  /*
 +   * Authentication may be skipped (for example, during krlogin, rlogin, etc...), 
@@ -333,7 +347,7 @@
 +  if (!pwd->pw_name || !pwd->pw_passwd || !pwd->pw_gecos ||
 +	!pwd->pw_dir || !pwd->pw_shell) 
 +    {
-+      fprintf(stderr, "login: Out of memory\n");
++      fprintf(stderr, "olpc-login: Out of memory\n");
 +      syslog(LOG_ERR, "Out of memory");
 +      pam_end(pamh, PAM_SYSTEM_ERR);
 +      exit(1);
@@ -460,53 +474,18 @@
 +    updwtmp(_PATH_WTMP, &ut);
 +  }
 +
-+  chown(ttyn, pwd->pw_uid,
-+	(gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
-+  chmod(ttyn, TTY_MODE);
-+
-+  /* if tty is one of the VC's then change owner and mode of the 
-+     special /dev/vcs devices as well */
-+  if (consoletty(0)) 
-+    {
-+      chown(vcsn, pwd->pw_uid, (gr ? gr->gr_gid : pwd->pw_gid));
-+      chown(vcsan, pwd->pw_uid, (gr ? gr->gr_gid : pwd->pw_gid));
-+      chmod(vcsn, TTY_MODE);
-+      chmod(vcsan, TTY_MODE);
-+    }
-+
-+
 +  setgid(pwd->pw_gid);
 +  
-+  if (*pwd->pw_shell == '\0')
-+    pwd->pw_shell = _PATH_BSHELL;
-+
-+  {
-+    char *ep;
-+	
-+    if(!((ep = getenv("TERM")) && (termenv = strdup(ep))))
-+      termenv = "dumb";
-+  }
-+ 
-+ 
 +  environ = (char**)malloc(sizeof(char*));
 +  memset(environ, 0, sizeof(char*));
-+  
++ 
++  source_i18n();
++ 
 +  setenv("HOME", pwd->pw_dir, 0);    /* legal to override */
 +  setenv("PATH", _PATH_DEFPATH, 1);
 +  
 +  setenv("SHELL", pwd->pw_shell, 1);
-+  setenv("TERM", termenv, 1);
-+  
-+  /* mailx will give a funny error msg if you forget this one */
-+  {
-+    char tmp[MAXPATHLEN];
-+    /* avoid snprintf */
-+    if (sizeof(_PATH_MAILDIR) + strlen(pwd->pw_name) + 1 < MAXPATHLEN) 
-+      {
-+        sprintf(tmp, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-+        setenv("MAIL",tmp,0);
-+      }
-+  }
++  /*setenv("TERM", termenv, 1);*/
 +  
 +  /* LOGNAME is not documented in login(1) but
 +     HP-UX 6.5 does it. We'll not allow modifying it.
@@ -524,9 +503,6 @@
 +      }
 +  }
 +
-+  if (!strncmp(tty_name, "ttyS", 4))
-+    syslog(LOG_INFO, "DIALUP AT %s BY %s", tty_name, pwd->pw_name);
-+  
 +  /* allow tracking of good logins.
 +     -steve philp (sphilp at mail.alliance.net) */
 +  
@@ -562,7 +538,7 @@
 +    {
 +      int errsv = errno;
 +      /* error in fork() */
-+      fprintf(stderr, "login: failure forking: %s", strerror(errsv));
++      fprintf(stderr, "olpc-login: failure forking: %s", strerror(errsv));
 +      PAM_END;
 +      exit(0);
 +    }
@@ -574,7 +550,7 @@
 +      sigaction(SIGQUIT, &sa, NULL);
 +      sigaction(SIGINT, &sa, NULL);
 +      while(wait(NULL) == -1 && errno == EINTR) /**/ ;
-+      openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
++      openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);
 +      PAM_END;
 +      exit(0);
 +    }
@@ -594,7 +570,7 @@
 +  setsid();
 +
 +  /* make sure we have a controlling tty */
-+  openlog("login", LOG_ODELAY, LOG_AUTHPRIV);	/* reopen */
++  openlog("olpc-login", LOG_ODELAY, LOG_AUTHPRIV);	/* reopen */
 +
 +  /*
 +   * TIOCSCTTY: steal tty from other process group.
@@ -636,14 +612,11 @@
 +  /* Use PAM to login as user*/
 +  olpc_login (); 
 +
-+  /* fork and exec startx. wait on child to cleanup */ 
-+  execl("/usr/bin/startx", "startx", "--", "-fp", "built-ins", "-wr", NULL);
-+
 +  return 0;
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-08-30 18:33:15.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-11 18:23:52.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- initscripts.spec	30 Aug 2007 22:37:18 -0000	1.148
+++ initscripts.spec	11 Sep 2007 22:35:50 -0000	1.149
@@ -3,8 +3,9 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 5 
+Release: 6%{?dist} 
 Source: initscripts-%{version}.tar.bz2
+Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
@@ -45,6 +46,9 @@
 rm -rf $RPM_BUILD_ROOT
 make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install
 
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d/
+cp -f %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/
+
 %find_lang %{name}
 
 %ifnarch s390 s390x
@@ -200,8 +204,14 @@
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 /sbin/olpc-dm
+%{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-6
+- clean up olpc-dm
+- make sure olpc-dm sources /etc/sysconfig/i18n
+- add an olpc-login pam control file to avoid unneeded checks
+
 * Thu Aug 30 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-5
 - remove /etc/mtab and /etc/fstab from /etc/rwtab
 



From fedora-extras-commits at redhat.com  Tue Sep 11 22:37:06 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:37:06 -0400
Subject: comps comps-f8.xml.in,1.103,1.104
Message-ID: <200709112237.l8BMb68R024472@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24342

Modified Files:
	comps-f8.xml.in 
Log Message:
add vbetool and radeontool



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- comps-f8.xml.in	11 Sep 2007 07:12:58 -0000	1.103
+++ comps-f8.xml.in	11 Sep 2007 22:36:35 -0000	1.104
@@ -3498,6 +3498,7 @@
       <packagereq type="optional">pwgen</packagereq>
       <packagereq type="optional">qdbm</packagereq>
       <packagereq type="optional">qstat</packagereq>
+      <packagereq type="optional">radeontool</packagereq>
       <packagereq type="optional">rdesktop</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
@@ -3525,6 +3526,7 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">uucp</packagereq>
+      <packagereq type="optional">vbetool</packagereq>
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 22:40:26 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:40:26 -0400
Subject: rpms/olpc-logos/devel olpc-logos.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709112240.l8BMeQYA025031@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/olpc-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/devel

Modified Files:
	.cvsignore sources 
Added Files:
	olpc-logos.spec 
Log Message:
Initial import



--- NEW FILE olpc-logos.spec ---
# This is a Red Hat maintained package which is specific to
# OLPC.  Thus the source is only available from
# within this srpm.

# OLPC is x86 compatible arch and the package is only meant for OLPC


# This package replaces fedora-logos on OLPC  and contains the
# only trademarked image file needed for OLPC (the grub splash).
# It is not meant to be used on Fedora 



Name: olpc-logos
Summary: OLPC-related icons and pictures
Version: 0.1 
Release: 5%{?dist}
Group: System Environment/Base
Source0: olpc-logos-%{version}.tar.bz2
License: Copyright 2006 Red Hat, Inc.  All rights reserved.
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Obsoletes: redhat-logos < 1.2.0
Provides: redhat-logos = 1.2.0
Provides: system-logos = %{version}-%{release}

%description
The olpc-logos package (the "Packages") contain image files which
incorporate the OLPC trademarks and logos (the "Marks").

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

# should be ifarch i386
mkdir -p %{buildroot}/boot/grub
install -p -m 644 bootloader/grub-splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
# end i386 bits

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root)
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits


%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-5
- Drop a few redundant BR and conflicts
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-4
- Fixed timestamp. Add a couple of comments. Removed the fedora-logos provides
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-3
- Marked this package as upstream for source and fixed build root as per review.  Added provides for fedora-logos
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-2
- Submit for review in Fedora
* Tue Nov 07 2006 John (J5) Palmieri  <johnp at redhat.com> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:19:58 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:39:53 -0000	1.2
@@ -0,0 +1 @@
+olpc-logos-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:19:58 -0000	1.1
+++ sources	11 Sep 2007 22:39:53 -0000	1.2
@@ -0,0 +1 @@
+a4c3cdcecb3d948d21c2bf0ed1ffa972  olpc-logos-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 22:42:36 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Tue, 11 Sep 2007 18:42:36 -0400
Subject: comps comps-f7.xml.in,1.251,1.252
Message-ID: <200709112242.l8BMga9A025437@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25298

Modified Files:
	comps-f7.xml.in 
Log Message:
add radeontool and vbetool



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- comps-f7.xml.in	11 Sep 2007 07:12:57 -0000	1.251
+++ comps-f7.xml.in	11 Sep 2007 22:42:06 -0000	1.252
@@ -3278,6 +3278,7 @@
       <packagereq type="optional">pwgen</packagereq>
       <packagereq type="optional">qdbm</packagereq>
       <packagereq type="optional">qstat</packagereq>
+      <packagereq type="optional">radeontool</packagereq>
       <packagereq type="optional">rdesktop</packagereq>
       <packagereq type="optional">rdiff-backup</packagereq>
       <packagereq type="optional">rootsh</packagereq>
@@ -3305,6 +3306,7 @@
       <packagereq type="optional">unison</packagereq>
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">uucp</packagereq>
+      <packagereq type="optional">vbetool</packagereq>
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 11 22:42:40 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Tue, 11 Sep 2007 18:42:40 -0400
Subject: rpms/olpc-logos/OLPC-2 olpc-logos.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709112242.l8BMgeiV025455@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/olpc-logos/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	olpc-logos.spec 
Log Message:
Initial import



--- NEW FILE olpc-logos.spec ---
# This is a Red Hat maintained package which is specific to
# OLPC.  Thus the source is only available from
# within this srpm.

# OLPC is x86 compatible arch and the package is only meant for OLPC


# This package replaces fedora-logos on OLPC  and contains the
# only trademarked image file needed for OLPC (the grub splash).
# It is not meant to be used on Fedora 



Name: olpc-logos
Summary: OLPC-related icons and pictures
Version: 0.1 
Release: 5%{?dist}
Group: System Environment/Base
Source0: olpc-logos-%{version}.tar.bz2
License: Copyright 2006 Red Hat, Inc.  All rights reserved.
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Obsoletes: redhat-logos < 1.2.0
Provides: redhat-logos = 1.2.0
Provides: system-logos = %{version}-%{release}

%description
The olpc-logos package (the "Packages") contain image files which
incorporate the OLPC trademarks and logos (the "Marks").

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

# should be ifarch i386
mkdir -p %{buildroot}/boot/grub
install -p -m 644 bootloader/grub-splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
# end i386 bits

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root)
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits


%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-5
- Drop a few redundant BR and conflicts
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 0.1-4
- Fixed timestamp. Add a couple of comments. Removed the fedora-logos provides
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-3
- Marked this package as upstream for source and fixed build root as per review.  Added provides for fedora-logos
* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com> - 0.1-2
- Submit for review in Fedora
* Tue Nov 07 2006 John (J5) Palmieri  <johnp at redhat.com> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:19:58 -0000	1.1
+++ .cvsignore	11 Sep 2007 22:42:07 -0000	1.2
@@ -0,0 +1 @@
+olpc-logos-0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-logos/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:19:58 -0000	1.1
+++ sources	11 Sep 2007 22:42:07 -0000	1.2
@@ -0,0 +1 @@
+a4c3cdcecb3d948d21c2bf0ed1ffa972  olpc-logos-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 11 23:05:02 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Tue, 11 Sep 2007 19:05:02 -0400
Subject: rpms/msv/devel msv.spec,1.1,1.2
Message-ID: <200709112305.l8BN52gv002331@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/msv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165

Modified Files:
	msv.spec 
Log Message:
- Fix unowned directories
- Change copyright files to utf-8 format
- Change license field to BSD (from BSD-Style)



Index: msv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msv/devel/msv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msv.spec	12 Mar 2007 14:54:43 -0000	1.1
+++ msv.spec	11 Sep 2007 23:04:28 -0000	1.2
@@ -37,9 +37,9 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.1%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
 Epoch:          1
-License:        BSD-Style
+License:        BSD
 URL:            http://msv.dev.java.net
 Group:          Development/Libraries
 # cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -r msv-20050722 msv ; mv msv msv-20050722 tar zcf msv-20050722.tar.gz msv-*
@@ -238,6 +238,20 @@
 done
 rm tempf
 
+#change encoding of non utf-8 files
+iconv msv/doc/copyright.txt -f iso-8859-1 -t utf-8 -o msv/doc/copyright.txt.utf8
+mv msv/doc/copyright.txt.utf8 msv/doc/copyright.txt
+iconv relames/doc/copyright.txt -f iso-8859-1 -t utf-8 -o relames/doc/copyright.txt.utf8
+mv relames/doc/copyright.txt.utf8 relames/doc/copyright.txt
+iconv rngconverter/doc/copyright.txt -f iso-8859-1 -t utf-8 -o rngconverter/doc/copyright.txt.utf8
+mv rngconverter/doc/copyright.txt.utf8 rngconverter/doc/copyright.txt
+iconv generator/doc/copyright.txt -f iso-8859-1 -t utf-8 -o generator/doc/copyright.txt.utf8
+mv generator/doc/copyright.txt.utf8 generator/doc/copyright.txt
+iconv xsdlib/doc/copyright.txt -f iso-8859-1 -t utf-8 -o xsdlib/doc/copyright.txt.utf8
+mv xsdlib/doc/copyright.txt.utf8 xsdlib/doc/copyright.txt
+
+
+
 %patch0 -b .sav
 %patch1 -b .sav2
 %patch2
@@ -358,6 +372,8 @@
 %{_javadir}/%{name}-msv-%{version}.jar
 %{_javadir}/%{name}-msv.jar
 %{_javadir}/msv-strict.jar
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/license.txt
 %doc %{_docdir}/%{name}/msv/copyright.txt
 %if %{gcj_support}
@@ -367,10 +383,12 @@
 
 %files msv-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/msv
 
 %files demo
 %defattr(0644,root,root,0755)
+%dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/msv
 %{_datadir}/%{name}-%{version}/xsdlib
 
@@ -378,7 +396,8 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-relames-%{version}.jar
 %{_javadir}/%{name}-relames.jar
-#%{_docdir}/%{name}/relames/license.txt
+##%{_docdir}/%{name}/relames/license.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/copyright.txt
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-relames*
@@ -386,12 +405,14 @@
 
 %files relames-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/relames
 
 %files rngconv
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-rngconv-%{version}.jar
 %{_javadir}/%{name}-rngconv.jar
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/license.txt
 %doc %{_docdir}/%{name}/rngconv/copyright.txt
 %if %{gcj_support}
@@ -402,6 +423,7 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-xmlgen-%{version}.jar
 %{_javadir}/%{name}-xmlgen.jar
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/license.txt
 %doc %{_docdir}/%{name}/xmlgen/copyright.txt
 %if %{gcj_support}
@@ -410,6 +432,7 @@
 
 %files xmlgen-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xmlgen
 
 %files xsdlib
@@ -417,6 +440,7 @@
 %{_javadir}/%{name}-xsdlib-%{version}.jar
 %{_javadir}/%{name}-xsdlib.jar
 %{_javadir}/xsdlib.jar
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/license.txt
 %doc %{_docdir}/%{name}/xsdlib/copyright.txt
 %if %{gcj_support}
@@ -425,23 +449,35 @@
 
 %files xsdlib-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xsdlib
 
 %files manual
 %defattr(0644,root,root,0755)
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/ChangeLog.txt
 %doc %{_docdir}/%{name}/msv/*.html
 %doc %{_docdir}/%{name}/msv/*.gif
 %doc %{_docdir}/%{name}/msv/README.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/README.txt
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/README.txt
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/*.html
 %doc %{_docdir}/%{name}/xmlgen/README.txt
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/*.html
 %doc %{_docdir}/%{name}/xsdlib/README.txt
 
 
 %changelog
+* Tue Sep 11 2007 Matt Wringe <mwringe at redhat.com> 0:1.2-0.1.20050722.3jpp.2
+- Fix unowned directories
+- Change copyright files to utf-8 format
+- Change license field to BSD (from BSD-Style)
+
 * Fri Feb 16 2007 Andrew Overholt <overholt at redhat.com> 0:1.2-0.1.20050722.3jpp.1
 - Remove postun Requires on jpackage-utils
 - Set gcj_support to 1



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:26 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:26 -0400
Subject: rpms/liberation-fonts/F-7 liberation-fonts.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200709120016.l8C0GQvj018226@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/F-7

Modified Files:
	liberation-fonts.spec sources 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/F-7/liberation-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liberation-fonts.spec	21 Aug 2007 02:52:22 -0000	1.5
+++ liberation-fonts.spec	12 Sep 2007 00:15:51 -0000	1.6
@@ -6,7 +6,7 @@
 Name:         liberation-fonts
 Version:      0.2
 Release:      1%{?dist}
-License:      GPL + font exception
+License:      GPLv2 with exceptions
 Group:        User Interface/X
 URL:          https://www.redhat.com/promo/fonts/
 Source0:      https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 02:48:17 -0000	1.3
+++ sources	12 Sep 2007 00:15:51 -0000	1.4
@@ -1,2 +1 @@
-360dee2d73159522db3be6af8ec23294  liberation-fonts-ttf-2.tar.gz
 77728078a17e39f7c242b42c3bf6feb8  liberation-fonts-ttf-3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:30 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:30 -0400
Subject: rpms/liberation-fonts/FC-6 liberation-fonts.spec,1.3,1.4
Message-ID: <200709120016.l8C0GU88018252@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/FC-6

Modified Files:
	liberation-fonts.spec 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/FC-6/liberation-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liberation-fonts.spec	15 May 2007 17:28:36 -0000	1.3
+++ liberation-fonts.spec	12 Sep 2007 00:15:56 -0000	1.4
@@ -2,7 +2,7 @@
 Name: liberation-fonts
 Version: 0.1
 Release: 9%{?dist}
-License: GPL + font exception
+License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
 Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-2.tar.gz 



From fedora-extras-commits at redhat.com  Wed Sep 12 00:16:35 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 11 Sep 2007 20:16:35 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.5,1.6
Message-ID: <200709120016.l8C0GZhT018265@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014/devel

Modified Files:
	liberation-fonts.spec 
Log Message:
update GPL license annotation to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liberation-fonts.spec	14 Jun 2007 06:51:09 -0000	1.5
+++ liberation-fonts.spec	12 Sep 2007 00:16:00 -0000	1.6
@@ -5,7 +5,7 @@
 License: GPL + font exception
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
-Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 
+Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz
 Source1: 59-liberation-fonts.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Sep 12 00:17:00 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Sep 2007 20:17:00 -0400
Subject: rpms/kernel/devel kernel.spec, 1.157,
	1.158 linux-2.6-utrace-core.patch, 1.6, 1.7
Message-ID: <200709120017.l8C0H0M5018333@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
Log Message:
utrace update (#248532, #267161, #284311)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kernel.spec	11 Sep 2007 21:25:51 -0000	1.157
+++ kernel.spec	12 Sep 2007 00:16:26 -0000	1.158
@@ -1796,14 +1796,14 @@
 
 
 %changelog
+* Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#248532, #267161, #284311)
+
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix emulated vmware SCSI disks
 - add option to disable libata PATA DMA
 
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
-- utrace update
-
-* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6
 
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-core.patch	4 Sep 2007 20:53:27 -0000	1.6
+++ linux-2.6-utrace-core.patch	12 Sep 2007 00:16:26 -0000	1.7
@@ -20,7 +20,7 @@
 ---
 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2344 +++++++++++++++++++++++++++++++++++++
+ kernel/utrace.c                   | 2359 +++++++++++++++++++++++++++++++++++++
  Documentation/utrace.txt          |  579 +++++++++
  Documentation/DocBook/Makefile    |    2 
  Documentation/DocBook/utrace.tmpl |   23 
@@ -28,7 +28,7 @@
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
  init/Kconfig                      |   20 
- 9 files changed, 3585 insertions(+), 18 deletions(-)
+ 9 files changed, 3600 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -46,7 +46,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/kernel/utrace.c
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,2344 @@
+@@ -0,0 +1,2359 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2004,13 +2004,28 @@
 +	 */
 +	if (signal.signr != 0) {
 +		if (signal.return_ka == NULL) {
-+			ka = &tsk->sighand->action[signal.signr - 1];
++			/*
++			 * utrace_inject_signal recorded this to have us
++			 * use the injected signal's normal sigaction.  We
++			 * have to perform the SA_ONESHOT work now because
++			 * our caller will never touch the real sigaction.
++			 */
++			ka = &tsk->sighand->action[info->si_signo - 1];
++			*return_ka = *ka;
 +			if (ka->sa.sa_flags & SA_ONESHOT)
 +				ka->sa.sa_handler = SIG_DFL;
-+			*return_ka = *ka;
 +		}
 +		else
 +			BUG_ON(signal.return_ka != return_ka);
++
++		/*
++		 * We already processed the SA_ONESHOT work ahead of time.
++		 * Once we return nonzero, our caller will only refer to
++		 * return_ka.  So we must clear the flag to be sure it
++		 * doesn't clear return_ka->sa.sa_handler.
++		 */
++		return_ka->sa.sa_flags &= ~SA_ONESHOT;
++
 +		return signal.signr;
 +	}
 +



From fedora-extras-commits at redhat.com  Wed Sep 12 00:18:17 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Sep 2007 20:18:17 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec, 1.3338,
	1.3339 linux-2.6-utrace-core.patch, 1.4,
	1.5 linux-2.6-utrace-ptrace-compat.patch, 1.4, 1.5
Message-ID: <200709120018.l8C0IHTk018545@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18429

Modified Files:
	kernel-2.6.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
Log Message:
utrace update (#248532, #267161, #284311)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3338
retrieving revision 1.3339
diff -u -r1.3338 -r1.3339
--- kernel-2.6.spec	5 Sep 2007 16:18:54 -0000	1.3338
+++ kernel-2.6.spec	12 Sep 2007 00:17:42 -0000	1.3339
@@ -478,7 +478,7 @@
 Patch00: patch-2.6.%{base_sublevel}.%{stable_update}.bz2
 
 # non-released_kernel case
-# These are automagically defined by the rcrev and gitrev values set up 
+# These are automagically defined by the rcrev and gitrev values set up
 # near the top of this spec file.
 %else
 %if 0%{?rcrev}
@@ -2306,8 +2306,8 @@
 %endif
 
 %changelog
-* Wed Sep 05 2007 Chuck Ebbert <cebbert at redhat.com>
-- Update utrace
+* Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#248532, #267161, #284311)
 
 * Thu Aug 30 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-core.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-core.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-core.patch	12 Sep 2007 00:17:42 -0000	1.5
@@ -27,8 +27,8 @@
  include/linux/utrace.h            |  544 ++++++++
  init/Kconfig                      |   18 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2344 ++++++++++++++++++++++++++++++++++++++
- 9 files changed, 3583 insertions(+), 18 deletions(-)
+ kernel/utrace.c                   | 2359 ++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 3598 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -50,7 +50,7 @@
 ===================================================================
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2344 @@
+@@ -0,0 +1,2359 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2008,13 +2008,28 @@
 +	 */
 +	if (signal.signr != 0) {
 +		if (signal.return_ka == NULL) {
-+			ka = &tsk->sighand->action[signal.signr - 1];
++			/*
++			 * utrace_inject_signal recorded this to have us
++			 * use the injected signal's normal sigaction.  We
++			 * have to perform the SA_ONESHOT work now because
++			 * our caller will never touch the real sigaction.
++			 */
++			ka = &tsk->sighand->action[info->si_signo - 1];
++			*return_ka = *ka;
 +			if (ka->sa.sa_flags & SA_ONESHOT)
 +				ka->sa.sa_handler = SIG_DFL;
-+			*return_ka = *ka;
 +		}
 +		else
 +			BUG_ON(signal.return_ka != return_ka);
++
++		/*
++		 * We already processed the SA_ONESHOT work ahead of time.
++		 * Once we return nonzero, our caller will only refer to
++		 * return_ka.  So we must clear the flag to be sure it
++		 * doesn't clear return_ka->sa.sa_handler.
++		 */
++		return_ka->sa.sa_flags &= ~SA_ONESHOT;
++
 +		return signal.signr;
 +	}
 +

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat.patch	12 Sep 2007 00:17:42 -0000	1.5
@@ -28,9 +28,9 @@
  kernel/Makefile                 |    3 
  kernel/exit.c                   |   13 
  kernel/fork.c                   |    2 
- kernel/ptrace.c                 | 2052 +++++++++++++++++++++++++++++++++++++---
+ kernel/ptrace.c                 | 2053 +++++++++++++++++++++++++++++++++++++---
  kernel/sys_ni.c                 |    4 
- 18 files changed, 2633 insertions(+), 174 deletions(-)
+ 18 files changed, 2634 insertions(+), 174 deletions(-)
 
 Index: b/fs/proc/base.c
 ===================================================================
@@ -683,7 +683,7 @@
 ===================================================================
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
-@@ -19,194 +19,2008 @@
+@@ -19,194 +19,2009 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/syscalls.h>
@@ -1131,9 +1131,7 @@
 +			 struct ptrace_state *state)
  {
 -	if (!valid_signal(data))
--		return -EIO;
- 
--	return -ENOSYS;
++
 +	int error;
 +
 +	NO_LOCKS;
@@ -1191,29 +1189,20 @@
 +		spin_unlock_irq(&current->sighand->siglock);
 +	}
 +	return error;
- }
- 
--int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
++}
++
 +
 +/*
 + * This is called when we are exiting.  We must stop all our ptracing.
 + */
 +void
 +ptrace_exit(struct task_struct *tsk)
- {
--	int copied = 0;
++{
 +	struct list_head *pos, *n;
 +	int restart;
- 
--	while (len > 0) {
--		char buf[128];
--		int this_len, retval;
++
 +	NO_LOCKS;
- 
--		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
--		retval = access_process_vm(tsk, src, buf, this_len, 0);
--		if (!retval) {
--			if (copied)
++
 +	/*
 +	 * Taking the task_lock after PF_EXITING is set ensures that a
 +	 * child in ptrace_traceme will not put itself on our list when
@@ -1226,7 +1215,6 @@
 +	}
 +	task_unlock(tsk);
 +
-+	restart = 0;
 +	do {
 +		struct ptrace_state *state;
 +		int error;
@@ -1235,6 +1223,7 @@
 +
 +		rcu_read_lock();
 +
++		restart = 0;
 +		list_for_each_safe_rcu(pos, n, &tsk->ptracees) {
 +			state = list_entry(pos, struct ptrace_state, entry);
 +			error = utrace_detach(state->task, state->engine);
@@ -1256,7 +1245,7 @@
 +				wait_task_inactive(p);
 +				put_task_struct(p);
 +				restart = 1;
- 				break;
++				goto loop_unlocked;
 +			}
 +			else {
 +				BUG_ON(error != -ESRCH);
@@ -1266,10 +1255,11 @@
 +
 +		rcu_read_unlock();
 +
++	loop_unlocked:
 +		END_CHECK;
 +
 +		cond_resched();
-+	} while (restart > 0);
++	} while (unlikely(restart > 0));
 +
 +	if (likely(restart == 0))
 +		/*
@@ -1291,8 +1281,9 @@
 +		return 0;
 +
 +	if (!valid_signal(signr))
-+		return -EIO;
-+
+ 		return -EIO;
+ 
+-	return -ENOSYS;
 +	if (state->syscall) {
 +		/*
 +		 * This is the traditional ptrace behavior when given
@@ -1320,22 +1311,32 @@
 +	}
 +
 +	return 0;
-+}
-+
+ }
+ 
+-int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)
 +int
 +ptrace_regset_access(struct task_struct *target,
 +		     struct utrace_attached_engine *engine,
 +		     const struct utrace_regset_view *view,
 +		     int setno, unsigned long offset, unsigned int size,
 +		     void __user *data, int write)
-+{
+ {
+-	int copied = 0;
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, setno);
 +	int ret;
-+
+ 
+-	while (len > 0) {
+-		char buf[128];
+-		int this_len, retval;
 +	if (unlikely(regset == NULL))
 +		return -EIO;
-+
+ 
+-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+-		retval = access_process_vm(tsk, src, buf, this_len, 0);
+-		if (!retval) {
+-			if (copied)
+-				break;
 +	if (size == (unsigned int) -1)
 +		size = regset->size * regset->n;
 +
@@ -1460,13 +1461,7 @@
 +			else
 +				ret = (*regset->get)(target, regset,
 +						     pos, n, kdata, udata);
- 		}
--		if (copy_to_user(dst, buf, retval))
--			return -EFAULT;
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
++		}
 +
 +		if (kdata)
 +			kdata += n;
@@ -1514,8 +1509,7 @@
 +	if (request == PTRACE_ATTACH) {
 +		ret = ptrace_attach(child);
 +		goto out_tsk;
- 	}
--	return copied;
++	}
 +
 +	rcu_read_lock();
 +	engine = utrace_attach(child, UTRACE_ATTACH_MATCH_OPS,
@@ -1542,7 +1536,13 @@
 +			if (child->state == TASK_STOPPED)
 +				ret = 0;
 +			unlock_task_sighand(child, &flags);
-+		}
+ 		}
+-		if (copy_to_user(dst, buf, retval))
+-			return -EFAULT;
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +		if (ret == 0) {
 +			ret = ptrace_update(child, state,
 +					    UTRACE_ACTION_QUIESCE, 0);
@@ -1559,7 +1559,8 @@
 +		}
 +
 +		ret = -ESRCH;  /* Return value for exit_state bail-out.  */
-+	}
+ 	}
+-	return copied;
 +
 +	rcu_read_unlock();
 +



From fedora-extras-commits at redhat.com  Wed Sep 12 01:15:11 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 11 Sep 2007 21:15:11 -0400
Subject: rpms/evolution/devel evolution-2.11.92-mail-attachment.patch, NONE, 
	1.1 evolution.spec, 1.288, 1.289
Message-ID: <200709120115.l8C1FBP1032540@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32292

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.11.92-mail-attachment.patch 
Log Message:

* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
- Add patch for GNOME bug #476040 (fix attachment icon).


evolution-2.11.92-mail-attachment.patch:

--- NEW FILE evolution-2.11.92-mail-attachment.patch ---
diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-11 18:58:15.000000000 -0400
@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items
 	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
-	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},
+	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
 	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
 /* 	{ NULL, 0, NULL }, */
diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c
--- evolution-2.11.92/mail/message-list.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/message-list.c	2007-09-11 18:58:15.000000000 -0400
@@ -223,7 +223,7 @@ static struct {
 	{ "stock_mail-unread-multiple",        NULL },
 	{ "stock_mail-open-multiple",          NULL },
 	{ NULL,                                NULL },
-	{ "stock_attach",                      NULL },
+	{ "mail-attachment",                   NULL },
 	{ "emblem-important",                  NULL },
 	{ "stock_score-lowest",                NULL },
 	{ "stock_score-lower",                 NULL },
diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c
--- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment	2007-09-02 14:57:07.000000000 -0400
+++ evolution-2.11.92/widgets/misc/e-attachment-bar.c	2007-09-11 18:58:15.000000000 -0400
@@ -281,8 +281,7 @@ update (EAttachmentBar *bar)
 		attachment = priv->attachments->pdata[i];
 		
 		if (!attachment->is_available_local || !attachment->body) {
-			/* stock_attach would be better, but its fugly scaled up */
-			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
+			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
 				g_object_unref (pixbuf);
 			}
@@ -373,8 +372,7 @@ update (EAttachmentBar *bar)
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			if (pixbuf == NULL) {
 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				/* stock_attach would be better, but its fugly scaled up */
-				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
 			}
 			g_free (mime_type);
 		}
diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c
--- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment	2007-09-02 14:56:48.000000000 -0400
+++ evolution-2.11.92/composer/e-msg-composer.c	2007-09-11 18:58:15.000000000 -0400
@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixcache [] = {
-	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 	
-/*	E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
+/*	E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
 	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
@@ -3989,7 +3989,7 @@ create_composer (int visible_mask)
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
+	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
 
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-11 18:58:16.000000000 -0400
@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget)
 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
 	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 }
 
diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
--- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment	2007-09-02 14:57:08.000000000 -0400
+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c	2007-09-11 18:58:15.000000000 -0400
@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixmaps[] = {
-	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
 
 	E_PIXMAP_END
 };
@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor)
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment	2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-11 18:58:16.000000000 -0400
@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- evolution.spec	11 Sep 2007 21:20:45 -0000	1.288
+++ evolution.spec	12 Sep 2007 01:14:37 -0000	1.289
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -121,6 +121,9 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
+# GNOME bug #476040
+Patch35: evolution-2.11.92-mail-attachment.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -260,6 +263,7 @@
 %patch31 -p1 -b .meeting-list-view
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
+%patch35 -p1 -b .mail-attachment
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -709,6 +713,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
+- Add patch for GNOME bug #476040 (fix attachment icon).
+
 * Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.92-2.fc8
 - Split off an evolution-help package
 



From fedora-extras-commits at redhat.com  Wed Sep 12 01:32:17 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 11 Sep 2007 21:32:17 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.300.0-fedora8-distro.patch, NONE,
	1.1 python-virtinst.spec, 1.23,
	1.24 virtinst-0.200.0-default-arch.patch, 1.1, NONE
Message-ID: <200709120132.l8C1WHK3002339@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2239

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.300.0-fedora8-distro.patch 
Removed Files:
	virtinst-0.200.0-default-arch.patch 
Log Message:
Fixed detection of F8 distro layout (rhbz #273781)

python-virtinst-0.300.0-fedora8-distro.patch:

--- NEW FILE python-virtinst-0.300.0-fedora8-distro.patch ---
changeset:   268:6b4684756fcf
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:02 2007 -0400
files:       virtinst/DistroManager.py
description:
Fix detection of Fedora distros for latest F8 style trees


diff -r a6d47ed6c97c -r 6b4684756fcf virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Wed Aug 29 18:25:09 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Sep 11 21:20:02 2007 -0400
@@ -210,6 +210,9 @@ class RedHatImageStore(ImageStore):
 # Fedora distro check
 class FedoraImageStore(RedHatImageStore):
     def isValidStore(self, fetcher, progresscb):
+        if fetcher.hasFile("fedora.css", progresscb):
+            logging.debug("Detected a Fedora distro")
+            return True
         if fetcher.hasFile("Fedora", progresscb):
             logging.debug("Detected a Fedora distro")
             return True

changeset:   269:39d2c56e9895
tag:         tip
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:30 2007 -0400
files:       virtinst/FullVirtGuest.py
description:
Fix typo in Fedora 8 distro name


diff -r 6b4684756fcf -r 39d2c56e9895 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:02 2007 -0400
+++ b/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:30 2007 -0400
@@ -34,7 +34,7 @@ class FullVirtGuest(Guest.XenGuest):
                                           "fedora5": { "label": "Fedora Core 5", "distro": "fedora" }, \
                                           "fedora6": { "label": "Fedora Core 6", "distro": "fedora" }, \
                                           "fedora7": { "label": "Fedora 7", "distro": "fedora" }, \
-                                          "fedora8": { "label": "Fedora 7", "distro": "fedora" }, \
+                                          "fedora8": { "label": "Fedora 8", "distro": "fedora" }, \
                                           "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, \
                                           "generic24": { "label": "Generic 2.4.x kernel" }, \
                                           "generic26": { "label": "Generic 2.6.x kernel" }, \



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-virtinst.spec	29 Aug 2007 22:38:15 -0000	1.23
+++ python-virtinst.spec	12 Sep 2007 01:31:44 -0000	1.24
@@ -11,8 +11,9 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+Patch1: %{name}-%{version}-fedora8-distro.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -64,7 +66,10 @@
 %{_bindir}/virt-image
 
 %changelog
-* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1
+* Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-2.fc8
+- Fixed detection of Fedora 8 distro trees (rhbz #273781)
+
+* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1.fc8
 - Updated to 0.300.0
 - Added virt-image tool
 - Switched to calling virsh console and virt-viewer


--- virtinst-0.200.0-default-arch.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 02:54:52 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Tue, 11 Sep 2007 22:54:52 -0400
Subject: rpms/kdebase/devel kdebase.spec, 1.263.2.17, 1.263.2.18 kde4-opt.sh,
	1.1.2.1, NONE kde4-xdg_menu_prefix.sh, 1.1.2.2,
	NONE kdebase-3.91.0-consolekit-kdm.patch, 1.1.2.1,
	NONE kdebase-3.92.0-kde4home.diff, 1.1.2.2,
	NONE kdebase-3.92.0-redhat-startkde.patch, 1.1.2.2, NONE
Message-ID: <200709120254.l8C2sq0l020015@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Removed Files:
      Tag: kdebase-kde4-branch
	kde4-opt.sh kde4-xdg_menu_prefix.sh 
	kdebase-3.91.0-consolekit-kdm.patch 
	kdebase-3.92.0-kde4home.diff 
	kdebase-3.92.0-redhat-startkde.patch 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.17
retrieving revision 1.263.2.18
diff -u -r1.263.2.17 -r1.263.2.18
--- kdebase.spec	17 Aug 2007 10:22:04 -0000	1.263.2.17
+++ kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.92.0
-Release:       4%{?dist}
+Version:       3.93.0
+Release:       1%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -20,20 +20,6 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# /usr/bin/plasma (#250180)
-Conflicts:  rss-glx < 0.8.1.p-8
-
-# FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
-# don't rely on env (same goes for kde3) -- Rex
-Source1: kde4-opt.sh
-Source2: kde4-xdg_menu_prefix.sh
-
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdebase-%{version}-kde4home.diff
-Patch1: kdebase-%{version}-redhat-startkde.patch
-# see http://bugzilla.redhat.com/228111 , http://bugs.kde.org/147790
-Patch2: kdebase-3.91.0-consolekit-kdm.patch
-
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
@@ -44,47 +30,28 @@
 Requires: eject
 %endif
 
-Obsoletes: %{name}-kdm < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-kdm = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# FIXME/TODO
-#BuildRequires: libcaptury-devel
-
-BuildRequires: automake libtool
-BuildRequires: bluez-libs-devel
 BuildRequires: bzip2-devel
+# needed?
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
-BuildRequires: dbus-devel
 BuildRequires: doxygen
-BuildRequires: imake
 BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
 BuildRequires: gettext
-BuildRequires: glib2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+# needed?
 BuildRequires: libart_lgpl-devel
+# needed?
 BuildRequires: libfontenc-devel
-BuildRequires: libpng-devel
-%ifnarch s390 s390x
-BuildRequires: libraw1394-devel
-%endif
 BuildRequires: libusb-devel
-BuildRequires: libXcomposite-devel libXcursor-devel libXdamage-devel 
-BuildRequires: libXext-devel libXfixes-devel libXinerama-devel
-BuildRequires: libXrandr-devel libXrender-devel libXres-devel
-BuildRequires: libXScrnSaver-devel libXtst-devel libXxf86misc-devel
-BuildRequires: libxklavier-devel
-BuildRequires: lm_sensors-devel
-BuildRequires: NetworkManager-devel
 BuildRequires: OpenEXR-devel
+# needed?
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
-BuildRequires: pam-devel
 BuildRequires: pkgconfig
+BuildRequires: qimageblitz-devel
 # samba support
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
@@ -93,7 +60,14 @@
 %endif
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
-BuildRequires: xorg-x11-font-utils xorg-x11-proto-devel
+BuildRequires: xine-lib-devel
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+%if 0%{?fedora} >= 8
+BuildRequires:  libxcb-devel
+%endif
+# needed?
+BuildRequires: xorg-x11-font-utils
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 # extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
@@ -112,15 +86,6 @@
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
-## FIXME/TODO: trim these down -- Rex
-#Requires: libXcomposite-devel libXdamage-devel
-#Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
-#Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-#Requires: libXScrnSaver-devel libXtst-devel
-#Requires: libXinerama-devel libfontenc-devel
-#Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-#Requires: hal-devel bluez-libs-devel
-#Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
 %description devel
 Header files for developing applications using %{name}.
 WARNING: This is a beta version. It probably has many bugs left.
@@ -130,9 +95,6 @@
 %prep
 %setup -q -n kdebase-%{version}
 
-%patch1 -p1 -b .redhat-startkde
-%patch2 -p1 -b .consolekit_kdm
-
 
 %build
 
@@ -146,44 +108,17 @@
 
 %install
 rm -rf %{buildroot}
+mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -d %{buildroot}%{_sysconfdir}/kde/{env,shutdown}
-install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/
-install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
-
-# setup %{_kde4_appsdir}/kdm/faces
-mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
-pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
-popd
-
-# nuke default kdm setup in favor of our own (not yet, FIXME: update kde-settings)
-#rm -rf  %{buildroot}%{_datadir}/config/kdm/
-# FIXME/TODO: kdmrc default values reference %%buildroot
-sed -i -e "s|%{buildroot}||g" %{buildroot}%{_datadir}/config/kdm/* ||:
-
-sed -i \
-  -e "s|@@PREFIX@@|%{_kde4_prefix}|" \
-  -e "s|@@BINDIR@@|%{_kde4_bindir}|" \
-  -e "s|@@LIBDIR@@|%{_kde4_libdir}|" \
-  -e "s|@@SYSCONFDIR@@|%_kde4_sysconfdir}|" \
-  %{buildroot}%{_kde4_sysconfdir}/kde/env/*.sh
-
-mkdir -p %{buildroot}/usr/share/xsessions
-## kde->kde4 xsession
-%if "%{name}" != "kdebase"
-mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde.desktop \
-   %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
-ln -s %{_kde4_appsdir}/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
-%else
-ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
-%endif
-
-## Unpackaged files
-# Conflicts with kdelibs (ick)
-rm -f %{buildroot}%{_datadir}/icons/oxygen/*/*/{acroread,wine}.*
+## unpackaged files
+# these conflict with KDE 3 too -- Kevin
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+# omit gigantic oxygen scalable/svg icons, for now -- Rex
+#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
+# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
+rm -rf %{buildroot}%{_datadir}/emoticons
 
 
 %clean
@@ -193,23 +128,18 @@
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files
 %defattr(-,root,root,-)
-/usr/share/xsessions/*.desktop
-%{_kde4_sysconfdir}/kde/env/*
-#{_kde4_sysconfdir}/kde/shutdown/*
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
@@ -220,20 +150,15 @@
 %{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/desktop-directories/*
 %{_kde4_iconsdir}/crystalsvg/
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_datadir}/wallpapers/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/kde4/*
-%{_libdir}/strigi/*
-%config %{_kde4_sysconfdir}/*rc
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
@@ -244,6 +169,23 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
+- remove kdebase-kdm Obsoletes/Provides (for the same reason)
+- remove KDM (and KDM session) setup code (for the same reason)
+- remove rss-glx conflict (Plasma is now in kdebase-workspace)
+- remove redhat-startkde patch (startkde is now in kdebase-workspace)
+- remove kde4-opt.sh (all the code in it is commented out)
+- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
+- remove bogus BRs on automake and libtool
+- remove workspace-only BRs
+- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
+- remove workspace files and directories
+- handle icons (moved from kdelibs4)
+- add mkdir %%{buildroot} in %%install
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - use macros.kde4
 - License: GPLv2


--- kde4-opt.sh DELETED ---


--- kde4-xdg_menu_prefix.sh DELETED ---


--- kdebase-3.91.0-consolekit-kdm.patch DELETED ---


--- kdebase-3.92.0-kde4home.diff DELETED ---


--- kdebase-3.92.0-redhat-startkde.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 03:47:51 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 11 Sep 2007 23:47:51 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.200.0-default-arch.patch, 
	NONE, 1.1 python-virtinst.spec, 1.24, 1.25
Message-ID: <200709120347.l8C3lpMY000789@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv694

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.200.0-default-arch.patch 
Log Message:
Fixed default  arch again

python-virtinst-0.200.0-default-arch.patch:

--- NEW FILE python-virtinst-0.200.0-default-arch.patch ---
diff -rup virtinst-0.200.0.orig/virtinst/util.py virtinst-0.200.0.new/virtinst/util.py
--- virtinst-0.200.0.orig/virtinst/util.py	2007-07-18 22:04:21.000000000 -0400
+++ virtinst-0.200.0.new/virtinst/util.py	2007-07-26 10:25:15.000000000 -0400
@@ -124,7 +124,7 @@ def get_default_arch():
     arch = os.uname()[4]
     if arch == "x86_64":
         return "x86_64"
-    return "i386"
+    return "i686"
 
 # this function is directly from xend/server/netif.py and is thus
 # available under the LGPL,


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-virtinst.spec	12 Sep 2007 01:31:44 -0000	1.24
+++ python-virtinst.spec	12 Sep 2007 03:47:19 -0000	1.25
@@ -11,9 +11,10 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{name}-%{version}-fedora8-distro.patch
+Patch2: %{name}-0.200.0-default-arch.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +38,7 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -66,6 +68,9 @@
 %{_bindir}/virt-image
 
 %changelog
+* Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-3.fc8
+- Fixed default architecture. Again.
+
 * Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-2.fc8
 - Fixed detection of Fedora 8 distro trees (rhbz #273781)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 06:18:47 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:18:47 -0400
Subject: rpms/dbench/F-7 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709120618.l8C6Ilkg006995@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6838

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	12 Sep 2007 06:18:09 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	12 Sep 2007 06:18:09 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 06:21:35 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:21:35 -0400
Subject: rpms/dbench/F-7 dbench.spec,NONE,1.1
Message-ID: <200709120621.l8C6LZws007485@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7437

Added Files:
	dbench.spec 
Log Message:
Initial build



--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5



From fedora-extras-commits at redhat.com  Wed Sep 12 06:43:55 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 02:43:55 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.6,1.7
Message-ID: <200709120643.l8C6htOs010516@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10428

Modified Files:
	liberation-fonts.spec 
Log Message:
update license field to GPLv2



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- liberation-fonts.spec	12 Sep 2007 00:16:00 -0000	1.6
+++ liberation-fonts.spec	12 Sep 2007 06:43:17 -0000	1.7
@@ -1,8 +1,8 @@
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
 Version: 0.2
-Release: 1%{?dist}
-License: GPL + font exception
+Release: 2%{?dist}
+License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
 Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz
@@ -53,6 +53,9 @@
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-2.fc8
+- update license field to GPLv2
+
 * Thu Jun 14 2007 Caius Chance <cchance at redhat.com> 0.2-1.fc8
 - Updated new source tarball from upstream: '-3' (version 0.2).
 



From fedora-extras-commits at redhat.com  Wed Sep 12 06:53:00 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 02:53:00 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.18,1.263.2.19
Message-ID: <200709120653.l8C6r0qP011350@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11288/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.18
retrieving revision 1.263.2.19
diff -u -r1.263.2.18 -r1.263.2.19
--- kdebase.spec	12 Sep 2007 02:54:14 -0000	1.263.2.18
+++ kdebase.spec	12 Sep 2007 06:52:23 -0000	1.263.2.19
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.93.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -30,6 +30,9 @@
 Requires: eject
 %endif
 
+# should not conflict with d3lphin, but does with old Dolphin
+Conflicts:     dolphin <= 0.8.2
+
 BuildRequires: bzip2-devel
 # needed?
 BuildRequires: cdparanoia-devel cdparanoia
@@ -111,14 +114,97 @@
 mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-## unpackaged files
-# these conflict with KDE 3 too -- Kevin
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
-#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
+
+# remove files which conflict with KDE 3
+rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
 rm -rf %{buildroot}%{_datadir}/emoticons
+rm -rf %{buildroot}%{_kde4_datadir}/locale
+rm -rf %{buildroot}%{_kde4_datadir}/autostart
+rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
+rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
+rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
+rm -rf %{buildroot}%{_kde4_datadir}/config
+rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
+rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
+# binaries: conflict with kdebase
+rm -f %{buildroot}%{_kde4_bindir}/drkonqi
+rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
+rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
+rm -f %{buildroot}%{_kde4_bindir}/kdeeject
+rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
+rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
+rm -f %{buildroot}%{_kde4_bindir}/kdesu
+rm -f %{buildroot}%{_kde4_bindir}/kdesud
+rm -f %{buildroot}%{_kde4_bindir}/kdialog
+rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
+rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
+rm -f %{buildroot}%{_kde4_bindir}/kfind
+rm -f %{buildroot}%{_kde4_bindir}/kfmclient
+rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
+rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
+rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
+rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
+rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
+rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
+rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
+rm -f %{buildroot}%{_kde4_bindir}/knetattach
+rm -f %{buildroot}%{_kde4_bindir}/konqueror
+rm -f %{buildroot}%{_kde4_bindir}/konsole
+rm -f %{buildroot}%{_kde4_bindir}/kprinter
+rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
+rm -f %{buildroot}%{_kde4_bindir}/kstart
+rm -f %{buildroot}%{_kde4_bindir}/ktrash
+rm -f %{buildroot}%{_kde4_bindir}/kwrite
+rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
+rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
+rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
+# binaries: conflict with kdelibs
+rm -f %{buildroot}%{_kde4_bindir}/kcmshell
+rm -f %{buildroot}%{_kde4_bindir}/kfile
+rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
+rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
+rm -f %{buildroot}%{_kde4_bindir}/kioexec
+rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
+# binaries: conflict with kdebase-extras
+rm -f %{buildroot}%{_kde4_bindir}/kappfinder
+# do not strictly conflict, but we removed the corresponding binaries:
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
+# we also removed the binaries for these:
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
+rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
+
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
 
 
 %clean
@@ -127,13 +213,11 @@
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
@@ -143,32 +227,31 @@
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
-%{_kde4_datadir}/autostart/*
-%{_kde4_datadir}/config/
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
-%{_kde4_datadir}/desktop-directories/*
-%{_kde4_iconsdir}/crystalsvg/
 %{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/locale/*
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/*
-%{_kde4_sysconfdir}/xdg/menus/*.menu
+%exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/devel/lib*.so
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- remove files which conflict with KDE 3
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- Conflicts with KDE 3 versions of dolphin pre d3lphin rename
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Wed Sep 12 06:55:41 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Wed, 12 Sep 2007 02:55:41 -0400
Subject: rpms/dbench/EL-5 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709120655.l8C6tfDI011568@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11477

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:28:25 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 04:28:25 -0400
Subject: rpms/python-memcached/F-7 sources,1.2,1.3
Message-ID: <200709120828.l8C8SPbq030495@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	sources 
Log Message:
Updating the sources to 1.39 release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2007 02:46:01 -0000	1.2
+++ sources	12 Sep 2007 08:27:53 -0000	1.3
@@ -1 +1 @@
-b5154b816e2dfd54dcd3264e16b3fa77  python-memcached-1.36.tar.gz
+403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:30:02 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 04:30:02 -0400
Subject: rpms/python-memcached/F-7 python-memcached.spec,1.1,1.2
Message-ID: <200709120830.l8C8U2sH030555@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30520

Modified Files:
	python-memcached.spec 
Log Message:
Oops, forgot to update spec file as well, for 1.39 release in F-7.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-memcached.spec	27 Jun 2007 02:46:01 -0000	1.1
+++ python-memcached.spec	12 Sep 2007 08:29:29 -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()")}
 
 Name:           python-memcached
-Version:        1.36
-Release:        3%{?dist}
+Version:        1.39
+Release:        1%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -40,6 +40,12 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
+- Update to 1.39 upstream release.
+
+* Sat Aug 11 2007 Sean Reifschneider <jafo at tummy.com> 1.38-1
+- Update to 1.38 upstream release.
+
 * Sun Jun 10 2007 Sean Reifschneider <jafo at tummy.com> 1.36-3
 - Changes based on feedback from Ruben Kerkhof:
 - Fixing license.



From fedora-extras-commits at redhat.com  Wed Sep 12 08:42:17 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 04:42:17 -0400
Subject: rpms/bluez-libs/devel .cvsignore, 1.25, 1.26 bluez-libs.spec, 1.40, 
	1.41 sources, 1.25, 1.26
Message-ID: <200709120842.l8C8gHtE031041@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31002

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 17:08:05 -0000	1.25
+++ .cvsignore	12 Sep 2007 08:41:45 -0000	1.26
@@ -1 +1 @@
-bluez-libs-3.17.tar.gz
+bluez-libs-3.18.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bluez-libs.spec	30 Aug 2007 17:08:05 -0000	1.40
+++ bluez-libs.spec	12 Sep 2007 08:41:45 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.17
+Version: 3.18
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> - 3.18-1
+- Update to bluez-libs 3.18
+
 * Thu Aug 30 2007 David Woodhouse <dwmw2 at infradead.org> - 3.17-1
 - Update to bluez-libs 3.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Aug 2007 17:08:05 -0000	1.25
+++ sources	12 Sep 2007 08:41:45 -0000	1.26
@@ -1 +1 @@
-0b7869b980efabe23ff1d86cf4faca25  bluez-libs-3.17.tar.gz
+9e091f2ce00b906c4c456fff24e69e55  bluez-libs-3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 08:54:27 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 04:54:27 -0400
Subject: rpms/bluez-utils/devel .cvsignore, 1.23, 1.24 bluez-utils.spec, 1.75,
	1.76 sources, 1.23, 1.24
Message-ID: <200709120854.l8C8sRP1031543@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31511

Modified Files:
	.cvsignore bluez-utils.spec sources 
Log Message:
3.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Aug 2007 17:38:07 -0000	1.23
+++ .cvsignore	12 Sep 2007 08:53:54 -0000	1.24
@@ -1 +1 @@
-bluez-utils-3.17.tar.gz
+bluez-utils-3.18.tar.gz


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- bluez-utils.spec	30 Aug 2007 17:38:07 -0000	1.75
+++ bluez-utils.spec	12 Sep 2007 08:53:54 -0000	1.76
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.17
+Version: 3.18
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -153,6 +153,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> 3.18-1
+- Update to bluez-utils 3.18
+
 * Thu Aug 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.17-1
 - Update to bluez-utils 3.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Aug 2007 17:38:07 -0000	1.23
+++ sources	12 Sep 2007 08:53:54 -0000	1.24
@@ -1 +1 @@
-8c7c45c672280db11c4e2a2a445be47e  bluez-utils-3.17.tar.gz
+2b6b4d519b8f75ef3990122934e660ba  bluez-utils-3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 09:02:16 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Wed, 12 Sep 2007 05:02:16 -0400
Subject: rpms/bluez-utils/devel bluez-utils-3.11-cups-discovery.patch, 1.1, 
	NONE bluez-utils-3.12-pand-man-page.patch, 1.1, NONE
Message-ID: <200709120902.l8C92G8v005287@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5277

Removed Files:
	bluez-utils-3.11-cups-discovery.patch 
	bluez-utils-3.12-pand-man-page.patch 
Log Message:
remove old patches


--- bluez-utils-3.11-cups-discovery.patch DELETED ---


--- bluez-utils-3.12-pand-man-page.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 09:11:36 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 05:11:36 -0400
Subject: rpms/ktechlab/devel ktechlab-bugfix.diff, NONE, 1.1 ktechlab.spec, 
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <200709120911.l8C9BaAu005703@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5664/devel

Modified Files:
	ktechlab.spec sources 
Added Files:
	ktechlab-bugfix.diff 
Log Message:


ktechlab-bugfix.diff:

--- NEW FILE ktechlab-bugfix.diff ---
Index: src/picitem.h
===================================================================
--- src/picitem.h	(Revision 18)
+++ src/picitem.h	(Arbeitskopie)
@@ -76,6 +76,8 @@
 	
 		static QString typeString() { return "microitem"; }
 		virtual void updateZ( int baseZ );
+
+		bool mousePressEvent( const EventInfo &info );
 	
 	protected slots:
 		void slotMicroSettingsDlgAccepted();
Index: src/picitem.cpp
===================================================================
--- src/picitem.cpp	(Revision 18)
+++ src/picitem.cpp	(Arbeitskopie)
@@ -15,6 +15,7 @@
 #include "microsettingsdlg.h"
 #include "micropackage.h"
 #include "picitem.h"
+#include "eventinfo.h"
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -386,6 +387,26 @@
 	
 	p_icnDocument->requestStateSave();
 }
+
+bool PicItem::mousePressEvent( const EventInfo &info )
+{
+	QMouseEvent *e = info.mouseReleaseEvent( 0, 0 );
+
+	const PinItemList::iterator end = m_pinItemList.end();
+	for ( PinItemList::iterator it = m_pinItemList.begin(); it != end; ++it )
+		if ( (*it)->boundingRect().contains(info.pos) ) 
+		{
+			if (e->isAccepted())
+			{
+				(*it)->switchState();
+				delete e;
+				return true;
+			}
+		}
+	delete e;
+
+	return CNItem::mousePressEvent( info );
+}
 //END class PicItem
 
 #include "picitem.moc"


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktechlab.spec	18 Aug 2007 20:34:42 -0000	1.13
+++ ktechlab.spec	12 Sep 2007 09:11:02 -0000	1.14
@@ -1,7 +1,8 @@
 Name:             ktechlab
 Version:          0.3.69
-Release:          4.20070626svn%{?dist}
-# revision checkout 18
+Release:          5%{?dist}
+# revision checkout 18 with chitlesh's enhancements that upstream
+# haven't added since 2 months
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPLv2
@@ -11,6 +12,7 @@
 Source:           http://downloads.sourceforge.net/ktechlab/%{name}-%{version}.tar.bz2
 
 Patch0:           ktechlab-0.3.6-multilib.patch
+Patch1:           ktechlab-bugfix.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +44,7 @@
 %{__rm} -rf autom4te.cache
 
 %patch0 -p0 -b .multilib
+%patch1 -p0 -b .bugfix
 
 %build
 %configure --disable-rpath
@@ -52,12 +55,13 @@
 %{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora            \
-    --add-category Engineering                  \
+    --remove-category Education                 \
     --delete-original                           \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applnk/Development/%{name}.desktop
 
-#setting default path for sdcc
+
+#fedora-specific : setting default path for sdcc
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/profile.d
 cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh << EOF
 # setting default path for sdcc - fedora
@@ -68,7 +72,10 @@
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
 
-# No translation
+#fixing missing icon
+%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/
+
+
 %find_lang %{name}
 
 %clean
@@ -76,6 +83,7 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+source %{_sysconfdir}/profile.d/%{name}.sh
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
 
@@ -100,7 +108,12 @@
 
 
 %Changelog
-* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.6-6
+* Sat Sep 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-5
+- updated desktop file
+- fixed missing icon of bar graph display
+- disable rough oscilloscope
+
+* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-4.20070626svn
 - fixed conflict with alliance and changed license
 
 * Mon Aug 13 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-3.20070626svn


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2007 12:14:30 -0000	1.4
+++ sources	12 Sep 2007 09:11:02 -0000	1.5
@@ -1 +1 @@
-92bc145289d18bd89118754d66e7a6a2  ktechlab-0.3.69.tar.bz2
+9404e62c621df5d34b2bc455a8d0ae42  ktechlab-0.3.69.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 09:15:50 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 05:15:50 -0400
Subject: rpms/transmission/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 transmission.spec, 1.7, 1.8
Message-ID: <200709120915.l8C9FoaN005908@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5878

Modified Files:
	.cvsignore sources transmission.spec 
Log Message:
Update to upstream 0.82, many bug fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Aug 2007 18:01:15 -0000	1.6
+++ .cvsignore	12 Sep 2007 09:15:18 -0000	1.7
@@ -1 +1 @@
-Transmission-0.81.tar.gz
+transmission-0.82.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Aug 2007 18:01:15 -0000	1.6
+++ sources	12 Sep 2007 09:15:18 -0000	1.7
@@ -1 +1 @@
-30ba36c3c88b34e3a9bbfde726c6ebe7  Transmission-0.81.tar.gz
+ddc7842b4c8f7882d90dcf874019ccdc  transmission-0.82.tar.gz


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- transmission.spec	25 Aug 2007 18:34:25 -0000	1.7
+++ transmission.spec	12 Sep 2007 09:15:18 -0000	1.8
@@ -1,13 +1,13 @@
 
 Name:           transmission
-Version:        0.81
+Version:        0.82
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
 License:        MIT
 URL:            http://transmission.m0k.org/
-Source0:        http://download.m0k.org/transmission/files/Transmission-%{version}.tar.gz
+Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.gz
 Patch0:         transmission-0.71-manpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 0.82-1
+- Update to upstream 0.82, many bug fixes
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.81-1
 - Update to upstream 0.81
 - Add work-around for busted tarball without a sub-directory



From fedora-extras-commits at redhat.com  Wed Sep 12 09:43:07 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 12 Sep 2007 05:43:07 -0400
Subject: rpms/system-config-firewall/devel sources, 1.4,
	1.5 system-config-firewall.spec, 1.6,
	1.7 system-config-firewall-1.0.5-lokkit.patch, 1.1,
	NONE system-config-firewall-1.0.5-modules.patch, 1.1,
	NONE system-config-firewall-1.0.5-sysconfig.patch, 1.1, NONE
Message-ID: <200709120943.l8C9h7Ns006555@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523

Modified Files:
	sources system-config-firewall.spec 
Removed Files:
	system-config-firewall-1.0.5-lokkit.patch 
	system-config-firewall-1.0.5-modules.patch 
	system-config-firewall-1.0.5-sysconfig.patch 
Log Message:
- dropped --stop option from fw_gui::genArgs
- new translations
- sysctl support for masquerading (net.ipv4.ip_forward will be set)
- glade file: fixed spacings, dropped not needed containers




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Aug 2007 15:43:19 -0000	1.4
+++ sources	12 Sep 2007 09:42:35 -0000	1.5
@@ -1 +1 @@
-f8591ac55121995deeeda29985ae0026  system-config-firewall-1.0.5.tar.bz2
+cc6ea00488c648fc3478d260670f0d28  system-config-firewall-1.0.6.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-config-firewall.spec	5 Sep 2007 16:42:34 -0000	1.6
+++ system-config-firewall.spec	12 Sep 2007 09:42:35 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
 ExclusiveOS: Linux
@@ -9,9 +9,6 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
-Patch0: system-config-firewall-1.0.5-lokkit.patch
-Patch1: system-config-firewall-1.0.5-modules.patch
-Patch2: system-config-firewall-1.0.5-sysconfig.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -48,9 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .lokkit
-%patch1 -p1 -b .modules
-%patch2 -p1 -b .sysconfig
 
 %install
 rm -rf %{buildroot}
@@ -119,11 +113,18 @@
 %{_datadir}/system-config-firewall/fw_selinux.*
 %{_datadir}/system-config-firewall/fw_services.*
 %{_datadir}/system-config-firewall/fw_sysconfig.*
+%{_datadir}/system-config-firewall/fw_sysctl.*
 %{_datadir}/system-config-firewall/fw_tui.*
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Wed Sep 12 2007 Thomas Woerner <twoerner at redhat.com> 1.0.6-1
+- dropped --stop option from fw_gui::genArgs
+- new translations
+- sysctl support for masquerading (net.ipv4.ip_forward will be set)
+- glade file: fixed spacings, dropped not needed containers
+
 * Wed Sep  5 2007 Thomas Woerner <twoerner at redhat.com> 1.0.5-4
 - fixed problem if /etc/sysconfig/system-config-securtylevel and 
   /etc/sysconfig/system-config-firewall are not readable


--- system-config-firewall-1.0.5-lokkit.patch DELETED ---


--- system-config-firewall-1.0.5-modules.patch DELETED ---


--- system-config-firewall-1.0.5-sysconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 09:49:09 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 12 Sep 2007 05:49:09 -0400
Subject: rpms/python-iniparse/devel python-iniparse.spec,1.5,1.6
Message-ID: <200709120949.l8C9n9R4006759@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701

Modified Files:
	python-iniparse.spec 
Log Message:
Make the same spec work on F8 and earlier


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-iniparse.spec	10 Sep 2007 10:38:07 -0000	1.5
+++ python-iniparse.spec	12 Sep 2007 09:48:37 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
@@ -11,7 +11,11 @@
 Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -49,6 +53,10 @@
 
 %changelog
 
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
 * Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
 - Added patch from upstream svn to fix problems with out commented lines.
 * Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2



From fedora-extras-commits at redhat.com  Wed Sep 12 09:51:07 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 12 Sep 2007 05:51:07 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec,1.3,1.4
Message-ID: <200709120951.l8C9p70g006900@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6786

Modified Files:
	python-iniparse.spec 
Log Message:
Make the same spec work on F8 and earlier


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-iniparse.spec	10 Sep 2007 10:48:29 -0000	1.3
+++ python-iniparse.spec	12 Sep 2007 09:50:34 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-iniparse
 Version:        0.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
@@ -11,7 +11,11 @@
 Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -49,8 +53,14 @@
 
 %changelog
 
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
 * Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
 - Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3



From fedora-extras-commits at redhat.com  Wed Sep 12 09:52:02 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 05:52:02 -0400
Subject: rpms/kdelibs/devel kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1.2.1 kdelibs.spec, 1.223.2.18, 1.223.2.19
Message-ID: <200709120952.l8C9q2oY006989@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6911/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-colorscheme-hack.diff 
Log Message:
fix strange coloring due to incomplete changes to KColorScheme: KColorScheme was in a state of transition when Beta 2 was released, so disabled text isn't handled properly. This hack restores the August 27 behavior (while keeping the August 29 API).

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.18
retrieving revision 1.223.2.19
diff -u -r1.223.2.18 -r1.223.2.19
--- kdelibs.spec	10 Sep 2007 18:21:37 -0000	1.223.2.18
+++ kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -43,6 +43,10 @@
 Patch2: kdelibs-3.93.0-kde149704.diff
 # fix kde#149705
 Patch3: kdelibs-3.93.0-kde149705.diff
+# KColorScheme was in a state of transition when Beta 2 was released, so
+# disabled text isn't handled properly. This hack restores the August 27
+# behavior (while keeping the August 29 API).
+Patch4: kdelibs-3.93.0-colorscheme-hack.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -112,6 +116,7 @@
 %patch2 -p0
 popd
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -217,6 +222,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
+- fix strange coloring due to incomplete changes to KColorScheme
+
 * Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - use upstream fix (by David Faure) for kde#149704
 



From fedora-extras-commits at redhat.com  Wed Sep 12 10:17:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 06:17:01 -0400
Subject: rpms/groff/devel groff.spec,1.52,1.53
Message-ID: <200709121017.l8CAH1JZ013424@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13390

Modified Files:
	groff.spec 
Log Message:
Add smp flag into the spec file.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- groff.spec	11 Sep 2007 13:18:53 -0000	1.52
+++ groff.spec	12 Sep 2007 10:16:28 -0000	1.53
@@ -114,7 +114,7 @@
 (cd doc && makeinfo groff.texinfo)
 %if %{with_x}
 cd src/xditview
-xmkmf && make
+xmkmf && make %{?_smp_mflags}
 %endif
 
 %install



From fedora-extras-commits at redhat.com  Wed Sep 12 10:31:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 06:31:41 -0400
Subject: rpms/iproute/devel iproute.spec,1.70,1.71
Message-ID: <200709121031.l8CAVfeN013879@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13844

Modified Files:
	iproute.spec 
Log Message:
Add smp flag into spec file. Change some macros.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- iproute.spec	11 Sep 2007 15:19:12 -0000	1.70
+++ iproute.spec	12 Sep 2007 10:31:09 -0000	1.71
@@ -15,7 +15,7 @@
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires(pre): tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
+BuildRequires: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 BuildRequires: flex
 
 %description
@@ -33,7 +33,7 @@
 %build
 export LIBDIR=%{_libdir}
 
-make
+make %{?_smp_mflags}
 make -C doc
 
 %install
@@ -42,7 +42,7 @@
 mkdir -p $RPM_BUILD_ROOT/sbin \
 	$RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT%{_mandir}/man8 \
-	$RPM_BUILD_ROOT/etc/iproute2 \
+	$RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \
 	$RPM_BUILD_ROOT%{_libdir}/tc
 
 install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
@@ -53,13 +53,13 @@
 rm -r $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
 iconv -f latin1 -t utf8 < man/man8/ss.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
 install -m 755 examples/cbq.init-%{cbq_version} $RPM_BUILD_ROOT/sbin/cbq
-install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig/cbq
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq
 
-cp -f etc/iproute2/* $RPM_BUILD_ROOT/etc/iproute2
+cp -f etc/iproute2/* $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 
 #create example avpkt file
-cat <<EOF > $RPM_BUILD_ROOT/etc/sysconfig/cbq/cbq-0000.example
+cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/cbq-0000.example
 DEVICE=eth0,10Mbit,1Mbit
 RATE=128Kbit
 WEIGHT=10Kbit
@@ -67,7 +67,7 @@
 RULE=192.168.1.0/24
 EOF
 
-cat <<EOF > $RPM_BUILD_ROOT/etc/sysconfig/cbq/avpkt
+cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/avpkt
 AVPKT=3000
 EOF
 
@@ -76,18 +76,18 @@
 
 %files
 %defattr(-,root,root,-)
-%dir /etc/iproute2
+%dir %{_sysconfdir}/iproute2
 %doc README.decnet README.iproute2+tc RELNOTES examples/README.cbq
 %doc doc/*.ps examples
 /sbin/*
 %{_mandir}/man8/*
-%attr(644,root,root) %config(noreplace) /etc/iproute2/*
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 %{_sbindir}/*
 %dir %{_libdir}/tc
 %{_libdir}/tc/*
 /sbin/cbq
-%dir /etc/sysconfig/cbq
-%config(noreplace) /etc/sysconfig/cbq/*
+%dir %{_sysconfdir}/sysconfig/cbq
+%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
 * Fri Aug 30 2007 Marcela Maslanova <mmaslano at redhat.com> - 2.6.22-3



From fedora-extras-commits at redhat.com  Wed Sep 12 10:32:45 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 06:32:45 -0400
Subject: rpms/evolution-webcal/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200709121032.l8CAWjG7013918@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-webcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13896

Modified Files:
	.cvsignore sources 
Log Message:
Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Aug 2007 21:31:20 -0000	1.18
+++ .cvsignore	12 Sep 2007 10:32:13 -0000	1.19
@@ -0,0 +1 @@
+evolution-webcal-2.11.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Aug 2007 21:31:20 -0000	1.18
+++ sources	12 Sep 2007 10:32:13 -0000	1.19
@@ -0,0 +1 @@
+c5b38d451808e48bfb6b072893441ac5  evolution-webcal-2.11.91.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 10:46:31 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 06:46:31 -0400
Subject: rpms/transmission/devel transmission-0.81-downloaddir.patch, NONE, 
	1.1 transmission.spec, 1.8, 1.9
Message-ID: <200709121046.l8CAkVk9014189@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14163

Modified Files:
	transmission.spec 
Added Files:
	transmission-0.81-downloaddir.patch 
Log Message:
Added patch to support default user download directory (Bastien Nocera)

transmission-0.81-downloaddir.patch:

--- NEW FILE transmission-0.81-downloaddir.patch ---
Index: gtk/util.c
===================================================================
--- gtk/util.c	(revision 2629)
+++ gtk/util.c	(working copy)
@@ -319,7 +319,12 @@
 {
     static char * wd = NULL;
     const char * dir = tr_prefs_get( PREF_ID_DIR );
+
     if (NULL == dir) {
+#if GLIB_CHECK_VERSION(2, 13, 7)
+      dir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
+      return dir;
+#endif
       if (NULL == wd)
         wd = g_get_current_dir();
       dir = wd;


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- transmission.spec	12 Sep 2007 09:15:18 -0000	1.8
+++ transmission.spec	12 Sep 2007 10:45:52 -0000	1.9
@@ -9,6 +9,7 @@
 URL:            http://transmission.m0k.org/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.gz
 Patch0:         transmission-0.71-manpath.patch
+Patch1:         transmission-0.81-downloaddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,6 +28,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -b .manpath
+%patch1 -p0 -b .dwnldir
 
 
 %build
@@ -70,6 +72,7 @@
 %changelog
 * Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 0.82-1
 - Update to upstream 0.82, many bug fixes
+- Added patch to support default user download directory (Bastien Nocera)
 
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 0.81-1
 - Update to upstream 0.81



From fedora-extras-commits at redhat.com  Wed Sep 12 10:58:19 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 06:58:19 -0400
Subject: rpms/python-vorbis/F-7 python-vorbis-1.5a-python2.5.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 python-vorbis.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200709121058.l8CAwJb8014634@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-vorbis/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573/F-7

Modified Files:
	.cvsignore python-vorbis.spec sources 
Added Files:
	python-vorbis-1.5a-python2.5.patch 
Log Message:
Update to 1.5a and fix python 2.5 crash (#285341).


python-vorbis-1.5a-python2.5.patch:

--- NEW FILE python-vorbis-1.5a-python2.5.patch ---
diff -Nur pyvorbis-1.5a/src/pyvorbiscodec.c pyvorbis-1.5apatched/src/pyvorbiscodec.c
--- pyvorbis-1.5a/src/pyvorbiscodec.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbiscodec.c	2007-09-11 00:17:48.000000000 +0200
@@ -118,7 +118,7 @@
 {
   vorbis_dsp_clear(PY_DSP(self));
   Py_XDECREF(((py_dsp *)self)->parent);
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject*
diff -Nur pyvorbis-1.5a/src/pyvorbisfile.c pyvorbis-1.5apatched/src/pyvorbisfile.c
--- pyvorbis-1.5a/src/pyvorbisfile.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisfile.c	2007-09-11 00:21:22.000000000 +0200
@@ -171,7 +171,7 @@
 
   ret = py_ov_open(newobj, args);
   if (ret == NULL) {
-    PyMem_DEL(newobj);
+    PyObject_Del(newobj);
     return NULL;
   }
 
@@ -196,7 +196,7 @@
 
   free(py_self->ovf);
 
-  PyObject_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *
diff -Nur pyvorbis-1.5a/src/pyvorbisinfo.c pyvorbis-1.5apatched/src/pyvorbisinfo.c
--- pyvorbis-1.5a/src/pyvorbisinfo.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisinfo.c	2007-09-11 00:16:42.000000000 +0200
@@ -134,7 +134,7 @@
 static void
 py_ov_info_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 #define CMP_RET(x) \
@@ -418,7 +418,7 @@
     free(ovc_self->vc);
   }
 
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 
@@ -999,6 +999,7 @@
 #if PY_UNICODE
       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
       if (!item) {
+        PyErr_Clear();
         /* To deal with non-UTF8 comments (against the standard) */
         item = PyString_FromStringAndSize(val, vallen); 
       } 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 18:30:31 -0000	1.3
+++ .cvsignore	12 Sep 2007 10:57:42 -0000	1.4
@@ -1 +1 @@
-pyvorbis-1.4.tar.gz
+pyvorbis-1.5a.tar.gz


Index: python-vorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/python-vorbis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vorbis.spec	2 Mar 2007 18:30:31 -0000	1.4
+++ python-vorbis.spec	12 Sep 2007 10:57:42 -0000	1.5
@@ -2,12 +2,13 @@
 
 Summary: Python wrapper for the Ogg Vorbis audio libraries
 Name: python-vorbis
-Version: 1.4
-Release: 1%{?dist}
-License: LGPL
+Version: 1.5
+Release: 0.1.a
+License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
-Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}.tar.gz
+Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}a.tar.gz
+Patch0: python-vorbis-1.5a-python2.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-ogg
 BuildRequires: python-devel, python-ogg-devel, libvorbis-devel
@@ -19,7 +20,8 @@
 
 
 %prep
-%setup -q -n pyvorbis-%{version}
+%setup -q -n pyvorbis-%{version}a
+%patch0 -p1 -b .python2.5
 
 
 %build
@@ -43,6 +45,17 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.5-0.1.a
+- Update to 1.5a pre-release.
+- Include patch to fix crash with python 2.5 (#285341).
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4-3
+- Rebuild for new BuildID feature.
+
+* Fri Aug  3 2007 Matthias Saou <http://freshrpms.net/> 1.4-2
+- Update License field.
+- Remove dist tag, since the package will seldom change.
+
 * Fri Mar  2 2007 Matthias Saou <http://freshrpms.net/> 1.4-1
 - Update to 1.4.
 - Use new URL and source location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 18:30:31 -0000	1.3
+++ sources	12 Sep 2007 10:57:42 -0000	1.4
@@ -1 +1 @@
-b4921e792c0a74f75b9d3057df10ee7c  pyvorbis-1.4.tar.gz
+7c7bce3ca3fc4f075ce9220c8c0c2200  pyvorbis-1.5a.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 10:58:22 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 06:58:22 -0400
Subject: rpms/python-vorbis/devel python-vorbis-1.5a-python2.5.patch, NONE, 
	1.1 .cvsignore, 1.3, 1.4 python-vorbis.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200709121058.l8CAwM12014641@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-vorbis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573/devel

Modified Files:
	.cvsignore python-vorbis.spec sources 
Added Files:
	python-vorbis-1.5a-python2.5.patch 
Log Message:
Update to 1.5a and fix python 2.5 crash (#285341).


python-vorbis-1.5a-python2.5.patch:

--- NEW FILE python-vorbis-1.5a-python2.5.patch ---
diff -Nur pyvorbis-1.5a/src/pyvorbiscodec.c pyvorbis-1.5apatched/src/pyvorbiscodec.c
--- pyvorbis-1.5a/src/pyvorbiscodec.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbiscodec.c	2007-09-11 00:17:48.000000000 +0200
@@ -118,7 +118,7 @@
 {
   vorbis_dsp_clear(PY_DSP(self));
   Py_XDECREF(((py_dsp *)self)->parent);
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject*
diff -Nur pyvorbis-1.5a/src/pyvorbisfile.c pyvorbis-1.5apatched/src/pyvorbisfile.c
--- pyvorbis-1.5a/src/pyvorbisfile.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisfile.c	2007-09-11 00:21:22.000000000 +0200
@@ -171,7 +171,7 @@
 
   ret = py_ov_open(newobj, args);
   if (ret == NULL) {
-    PyMem_DEL(newobj);
+    PyObject_Del(newobj);
     return NULL;
   }
 
@@ -196,7 +196,7 @@
 
   free(py_self->ovf);
 
-  PyObject_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *
diff -Nur pyvorbis-1.5a/src/pyvorbisinfo.c pyvorbis-1.5apatched/src/pyvorbisinfo.c
--- pyvorbis-1.5a/src/pyvorbisinfo.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisinfo.c	2007-09-11 00:16:42.000000000 +0200
@@ -134,7 +134,7 @@
 static void
 py_ov_info_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 #define CMP_RET(x) \
@@ -418,7 +418,7 @@
     free(ovc_self->vc);
   }
 
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 
@@ -999,6 +999,7 @@
 #if PY_UNICODE
       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
       if (!item) {
+        PyErr_Clear();
         /* To deal with non-UTF8 comments (against the standard) */
         item = PyString_FromStringAndSize(val, vallen); 
       } 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 18:30:31 -0000	1.3
+++ .cvsignore	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-pyvorbis-1.4.tar.gz
+pyvorbis-1.5a.tar.gz


Index: python-vorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/python-vorbis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-vorbis.spec	23 Aug 2007 07:47:44 -0000	1.6
+++ python-vorbis.spec	12 Sep 2007 10:57:49 -0000	1.7
@@ -2,12 +2,13 @@
 
 Summary: Python wrapper for the Ogg Vorbis audio libraries
 Name: python-vorbis
-Version: 1.4
-Release: 3
+Version: 1.5
+Release: 0.2.a
 License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
-Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}.tar.gz
+Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}a.tar.gz
+Patch0: python-vorbis-1.5a-python2.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-ogg
 BuildRequires: python-devel, python-ogg-devel, libvorbis-devel
@@ -19,7 +20,8 @@
 
 
 %prep
-%setup -q -n pyvorbis-%{version}
+%setup -q -n pyvorbis-%{version}a
+%patch0 -p1 -b .python2.5
 
 
 %build
@@ -43,6 +45,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.5-0.2.a
+- Update to 1.5a pre-release.
+- Include patch to fix crash with python 2.5 (#285341).
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4-3
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 18:30:31 -0000	1.3
+++ sources	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-b4921e792c0a74f75b9d3057df10ee7c  pyvorbis-1.4.tar.gz
+7c7bce3ca3fc4f075ce9220c8c0c2200  pyvorbis-1.5a.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 11:01:56 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 07:01:56 -0400
Subject: rpms/gkrellm-freq/EL-5 gkrellm-freq.spec,1.5,1.6
Message-ID: <200709121101.l8CB1um3020785@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691/EL-5

Modified Files:
	gkrellm-freq.spec 
Log Message:
Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.



Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/EL-5/gkrellm-freq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm-freq.spec	28 Aug 2006 10:03:00 -0000	1.5
+++ gkrellm-freq.spec	12 Sep 2007 11:01:23 -0000	1.6
@@ -3,8 +3,8 @@
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
 Version: 1.0
-Release: 3%{?dist}
-License: GPL
+Release: 7%{?dist}
+License: GPL+
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
 Source: http://www.peakunix.net/downloads/gkrellm-gkfreq-%{version}.tar.gz
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -n gkrellm-gkfreq-%{version}
+%setup -q -n gkrellm-gkfreq-%{version}
 %patch -p1 -b .noasm
 
 
@@ -40,12 +40,24 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc CHANGES COPYING README
 %{gkplugindir}/gkfreq.so
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.0-7
+- Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-6
+- Rebuild for new BuildID feature.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 1.0-5
+- Update License field... GPLv2 only, will be a problem with GPLv3 gkrellm.
+
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-4
+- Remove dist, as it might be a while before the next rebuild.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.0-3
 - FC6 rebuild.
 



From fedora-extras-commits at redhat.com  Wed Sep 12 11:02:01 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 12 Sep 2007 07:02:01 -0400
Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec,1.8,1.9
Message-ID: <200709121102.l8CB21PP020791@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691/devel

Modified Files:
	gkrellm-freq.spec 
Log Message:
Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.



Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gkrellm-freq.spec	22 Aug 2007 16:16:52 -0000	1.8
+++ gkrellm-freq.spec	12 Sep 2007 11:01:27 -0000	1.9
@@ -3,8 +3,8 @@
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
 Version: 1.0
-Release: 6
-License: GPLv2
+Release: 7%{?dist}
+License: GPL+
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
 Source: http://www.peakunix.net/downloads/gkrellm-gkfreq-%{version}.tar.gz
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.0-7
+- Fix License field, it's actually GPL+ which is okay for GPLv3 gkrellm.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.0-6
 - Rebuild for new BuildID feature.
 



From fedora-extras-commits at redhat.com  Wed Sep 12 11:07:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 07:07:39 -0400
Subject: rpms/iproute/devel iproute2-2.4.7-initvar.patch, 1.1,
	NONE iproute2-2.6.9-owl-nstat-bound.patch, 1.1,
	NONE iproute2-2.6.9-ss.patch, 1.1,
	NONE iproute2-ss050901-host_len.patch, 1.1,
	NONE iproute2-ss050901-opt_flags.patch, 1.1, NONE
Message-ID: <200709121107.l8CB7dLP020961@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20954

Removed Files:
	iproute2-2.4.7-initvar.patch 
	iproute2-2.6.9-owl-nstat-bound.patch iproute2-2.6.9-ss.patch 
	iproute2-ss050901-host_len.patch 
	iproute2-ss050901-opt_flags.patch 
Log Message:
Remove unused patches.



--- iproute2-2.4.7-initvar.patch DELETED ---


--- iproute2-2.6.9-owl-nstat-bound.patch DELETED ---


--- iproute2-2.6.9-ss.patch DELETED ---


--- iproute2-ss050901-host_len.patch DELETED ---


--- iproute2-ss050901-opt_flags.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 11:09:33 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Wed, 12 Sep 2007 07:09:33 -0400
Subject: rpms/netatalk/devel netatalk-2.0.3-build_open.patch, NONE,
	1.1 netatalk.spec, 1.36, 1.37
Message-ID: <200709121109.l8CB9XLl021030@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21007

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-build_open.patch 
Log Message:
Build fix

netatalk-2.0.3-build_open.patch:

--- NEW FILE netatalk-2.0.3-build_open.patch ---
--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old	2004-03-22 05:38:51.000000000 +0100
+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c	2007-09-11 17:59:59.000000000 +0200
@@ -131,9 +131,9 @@
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags, mode);
+    return (p->open)(p, NULL, f, d, t, flags, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -275,7 +275,7 @@
     }
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
 	LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc));
 	/* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */
         if (rc == DB_RUNRECOVERY) {
@@ -288,10 +288,10 @@
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- netatalk.spec	11 Sep 2007 15:28:28 -0000	1.36
+++ netatalk.spec	12 Sep 2007 11:09:00 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -16,6 +16,7 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
+Patch5:  netatalk-2.0.3-build_open.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -48,6 +49,7 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
+%patch5  -p1 -b .build_open
 
 ln -s ./NEWS ChangeLog
 
@@ -186,6 +188,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-14
+- patch to build on FC, bad open call 
+
 * Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 12 12:01:47 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Sep 2007 08:01:47 -0400
Subject: rpms/strigi/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 strigi.spec, 
	1.3, 1.4
Message-ID: <200709121201.l8CC1l4K028497@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/strigi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28446

Modified Files:
	.cvsignore sources strigi.spec 
Log Message:
* Wed Sep 12 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
- Update to 0.5.5 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 May 2007 16:21:53 -0000	1.2
+++ .cvsignore	12 Sep 2007 12:01:13 -0000	1.3
@@ -1 +1 @@
-strigi-0.5.1.tar.bz2
+strigi-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 May 2007 16:21:53 -0000	1.2
+++ sources	12 Sep 2007 12:01:13 -0000	1.3
@@ -1 +1 @@
-b976b4f3cf451fc53cd773c338d78994  strigi-0.5.1.tar.bz2
+bf61ec453f5e0063ea70ace783df3a14  strigi-0.5.5.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/strigi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- strigi.spec	17 May 2007 01:54:05 -0000	1.3
+++ strigi.spec	12 Sep 2007 12:01:13 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		strigi
-Version:	0.5.1
-Release:	5%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
-License:	LGPL
+License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
 Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
@@ -93,6 +93,7 @@
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
 %{_datadir}/applications/*strigiclient.desktop
+%{_datadir}/dbus-1/services/*.service
 %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 %{_datadir}/strigi/
 
@@ -108,6 +109,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Wed Sep 12 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
+- Update to 0.5.5 release
+
 * Wed May 16 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.1-5
 - Split out a strigi-libs subpackage as suggested in BZ#223586
 _ Include a strigidaemon autostart desktop file



From fedora-extras-commits at redhat.com  Wed Sep 12 12:11:09 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 08:11:09 -0400
Subject: rpms/libgdamm/devel .cvsignore, 1.3, 1.4 libgdamm.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709121211.l8CCB9fo028853@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28815

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to 2.9.8, a bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jul 2007 13:27:06 -0000	1.3
+++ .cvsignore	12 Sep 2007 12:10:36 -0000	1.4
@@ -1,2 +1 @@
-libgdamm-1.3.7.tar.bz2
-libgdamm-2.9.7.tar.bz2
+libgdamm-2.9.8.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/libgdamm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgdamm.spec	23 Aug 2007 22:18:18 -0000	1.5
+++ libgdamm.spec	12 Sep 2007 12:10:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libgdamm
-Version:	2.9.7
-Release:	2%{?dist}
+Version:	2.9.8
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 2.9.8-1
+- Update to 2.9.8, a bugfix release
+
 * Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.7-2
 - rebuild for license tag, ppc32
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2007 13:27:06 -0000	1.3
+++ sources	12 Sep 2007 12:10:36 -0000	1.4
@@ -1 +1 @@
-dd1ae0a7c241b510a46a66f9978ca123  libgdamm-2.9.7.tar.bz2
+4169ab88368ce5342efcdbdbd3345674  libgdamm-2.9.8.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 12:23:25 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 08:23:25 -0400
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.7,1.8
Message-ID: <200709121223.l8CCNPY7029802@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29705

Modified Files:
	liberation-fonts.spec 
Log Message:
- add fontdir macro
- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)                                                                            
- add catalogue symlink




Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liberation-fonts.spec	12 Sep 2007 06:43:17 -0000	1.7
+++ liberation-fonts.spec	12 Sep 2007 12:22:53 -0000	1.8
@@ -1,7 +1,10 @@
+%define fontdir %{_datadir}/fonts/liberation
+%define catalogue %{_sysconfdir}/X11/fontpath.d
+
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
 Version: 0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
@@ -9,8 +12,7 @@
 Source1: 59-liberation-fonts.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-# for /etc/fonts/conf.d 
-Requires: fontconfig
+Buildrequires: xorg-x11-font-utils
 
 %description
 The Liberation Fonts are intended to be replacements for the three
@@ -28,12 +30,19 @@
 %install
 rm -rf %{buildroot}
 # fonts
-install -m 0755 -d %{buildroot}%{_datadir}/fonts/liberation
-install -m 0644 *.ttf %{buildroot}%{_datadir}/fonts/liberation
+install -m 0755 -d %{buildroot}%{fontdir}
+install -m 0644 *.ttf %{buildroot}%{fontdir}
 # configuration
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d
 
+install -d $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+
+# generate fonts.dir and fonts.scale
+mkfontdir %{buildroot}%{fontdir}
+mkfontscale %{buildroot}%{fontdir}
+
 %post
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/fonts
@@ -49,10 +58,19 @@
 %files
 %defattr(-,root,root)
 %doc License.txt COPYING
-%{_datadir}/fonts/liberation
+%dir %{fontdir}
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
+%{fontdir}/*.ttf
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%{catalogue}/%{name}
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-3.fc8
+- add fontdir macro
+- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)
+- add catalogue symlink
+
 * Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-2.fc8
 - update license field to GPLv2
 



From fedora-extras-commits at redhat.com  Wed Sep 12 12:24:07 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 12 Sep 2007 08:24:07 -0400
Subject: rpms/glom/devel .cvsignore, 1.12, 1.13 glom.spec, 1.16, 1.17 sources,
	1.12, 1.13
Message-ID: <200709121224.l8CCO7ZM029840@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29816

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.6.0, updated BRs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jul 2007 10:23:00 -0000	1.12
+++ .cvsignore	12 Sep 2007 12:23:35 -0000	1.13
@@ -1 +1 @@
-glom-1.5.2.tar.bz2
+glom-1.6.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glom.spec	23 Aug 2007 15:20:17 -0000	1.16
+++ glom.spec	12 Sep 2007 12:23:35 -0000	1.17
@@ -1,9 +1,9 @@
-%define major_version  1.5
-%define minor_version  2
+%define major_version  1.6
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -14,8 +14,8 @@
 
 BuildRequires:  bakery-devel >= 2.4
 BuildRequires:  desktop-file-utils gettext-devel intltool
-BuildRequires:  libgdamm-devel >= 2.9.7
-BuildRequires:  libxml++-devel >= 2.18.0
+BuildRequires:  libgdamm-devel >= 2.9.8
+BuildRequires:  libxml++-devel >= 2.18.1
 BuildRequires:  python-devel
 BuildRequires:  gnome-python2-gda-devel
 BuildRequires:  libgnome-devel >= 2.6.0
@@ -25,7 +25,7 @@
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  libgtksourceviewmm-devel
-BuildRequires:  libgda-devel >= 3.0
+BuildRequires:  libgda-devel >= 3.0.1
 BuildRequires:  postgresql-server
 BuildRequires:	libgda-postgres-devel
 BuildRequires:  avahi-glib-devel
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Denis Leroy <denis at poolshark.org> - 1.6.0-1
+- Update to 1.6.0, updated BRs
+
 * Thu Aug 23 2007 Denis Leroy <denis at poolshark.org> - 1.5.2-2
 - License tag update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jul 2007 10:23:00 -0000	1.12
+++ sources	12 Sep 2007 12:23:35 -0000	1.13
@@ -1 +1 @@
-4ae984143deb4f19ef9740d128edf8bb  glom-1.5.2.tar.bz2
+f279ff74c8014b23191f74bc4aa576ff  glom-1.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 12:50:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 12 Sep 2007 08:50:27 -0400
Subject: rpms/gettext/devel gettext-xglade-include-expat-285701.patch, NONE, 
	1.1 gettext.spec, 1.76, 1.77
Message-ID: <200709121250.l8CCoRMs031103@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
- buildrequire expat-devel
- add gettext-xglade-include-expat-285701.patch to include expat.h
  to get xgettext to dl the right libexpat (Nils Philippsen, #285701)


gettext-xglade-include-expat-285701.patch:

--- NEW FILE gettext-xglade-include-expat-285701.patch ---
diff -up gettext-0.16.1/gettext-tools/src/x-glade.c~ gettext-0.16.1/gettext-tools/src/x-glade.c
--- gettext-0.16.1/gettext-tools/src/x-glade.c~	2006-11-28 03:02:08.000000000 +1000
+++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-12 22:40:26.000000000 +1000
@@ -28,10 +28,9 @@
 #include <string.h>
 #if DYNLOAD_LIBEXPAT
 # include <dlfcn.h>
-#else
-# if HAVE_LIBEXPAT
-#  include <expat.h>
-# endif
+#endif
+#if HAVE_LIBEXPAT
+# include <expat.h>
 #endif
 
 #include "message.h"


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gettext.spec	16 Aug 2007 04:10:48 -0000	1.76
+++ gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
+# need expat for xgettext on glade
+Buildrequires: expat-devel
 %if %{buildjar}
 BuildRequires: %{_bindir}/fastjar
 # require zip and unzip for brp-java-repack-jars
@@ -26,6 +28,7 @@
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
 Patch3: gettext-php-prinf-output-237241.patch
+Patch4: gettext-xglade-include-expat-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -62,6 +65,7 @@
 %patch1 -p1 -b .1-fails~
 %patch2 -p0 -b .2-header~
 %patch3 -p1 -b .3-printf~
+%patch4 -p1 -b .4-expat~
 
 
 %build
@@ -227,6 +231,11 @@
 
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-10
+- buildrequire expat-devel
+- add gettext-xglade-include-expat-285701.patch to include expat.h
+  to get xgettext to dl the right libexpat (Nils Philippsen, #285701)
+
 * Thu Aug 16 2007 Jens Petersen <petersen at redhat.com>
 - specify license is GPL and LGPL version 2 or later
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:10:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 12 Sep 2007 09:10:57 -0400
Subject: rpms/man-pages-fr/F-7 man-pages-fr.spec,1.30,1.31
Message-ID: <200709121310.l8CDAvfg005394@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5355

Modified Files:
	man-pages-fr.spec 
Log Message:
Fix conflict in 273941  	 



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/F-7/man-pages-fr.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- man-pages-fr.spec	6 Mar 2007 07:42:37 -0000	1.30
+++ man-pages-fr.spec	12 Sep 2007 13:10:23 -0000	1.31
@@ -1,8 +1,8 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.39
-Release:	8%{?dist}
-License:	Distributable
+Release:	9%{?dist}
+License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
 Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
@@ -17,9 +17,6 @@
 
 %prep
 %setup -q -D -a 1 -n man-pages-fr-2.39.0
-##%setup -q -D -a 2
-##%patch1 -p1 -b .aumix_missTH
-# pick up the supplemental pages, which overwrite a few files too
 cp -a pagesdeman/usr/share/man/fr/* .
 mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr
 rm -rf pagesdeman/
@@ -53,8 +50,6 @@
 		fi
 done
 
-##make install-install DESTDIR=$RPM_BUILD_ROOT
-
 # Remove files already included in other packages
 # alsa-utils
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/alsaconf.8
@@ -73,6 +68,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
 # latex2rtf
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# linuxchecker
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/linkchecker.1
 # man
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
@@ -104,6 +101,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Wed Sep 12 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-9
+- rhbz#273941
+
 * Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-8
 - merge review
 - rhbz#230061



From fedora-extras-commits at redhat.com  Wed Sep 12 13:14:04 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 12 Sep 2007 09:14:04 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.26.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.140, 1.141 sources, 1.145,
	1.146 system-config-printer.spec, 1.128,
	1.129 pycups-1.9.25.tar.bz2.sig, 1.1, NONE
Message-ID: <200709121314.l8CDE4Tk005542@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5509

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.26.tar.bz2.sig 
Removed Files:
	pycups-1.9.25.tar.bz2.sig 
Log Message:
* Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.26.
- Build requires epydoc.  Ship HTML documentation.



--- NEW FILE pycups-1.9.26.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore	7 Sep 2007 16:29:48 -0000	1.140
+++ .cvsignore	12 Sep 2007 13:13:31 -0000	1.141
@@ -136,3 +136,4 @@
 pycups-1.9.25.tar.bz2
 system-config-printer-0.7.74.tar.bz2
 system-config-printer-0.7.74.1.tar.bz2
+pycups-1.9.26.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	7 Sep 2007 16:29:48 -0000	1.145
+++ sources	12 Sep 2007 13:13:31 -0000	1.146
@@ -1,2 +1,2 @@
-eda648fec5d187fa13a676c60c7e6b1e  pycups-1.9.25.tar.bz2
 b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
+7819b0749172f01162c11e9a9f01dea2  pycups-1.9.26.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- system-config-printer.spec	7 Sep 2007 16:29:48 -0000	1.128
+++ system-config-printer.spec	12 Sep 2007 13:13:31 -0000	1.129
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.25
+%define pycups_version 1.9.26
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -18,6 +18,7 @@
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: xmlto
+BuildRequires: epydoc
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -56,6 +57,7 @@
 
 pushd pycups-%{pycups_version}
 make
+make doc
 popd
 
 %install
@@ -80,7 +82,7 @@
 
 %files libs -f system-config-printer.lang
 %defattr(-,root,root)
-%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples}
+%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples,html}
 %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
 %{_libdir}/python*/*/*.so
 %dir %{_datadir}/%{name}
@@ -126,6 +128,10 @@
 fi
 
 %changelog
+* Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.26.
+- Build requires epydoc.  Ship HTML documentation.
+
 * Fri Sep  7 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.1-1
 - 0.7.74.1:
   - Updated Polish translation (bug #263001).


--- pycups-1.9.25.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 13:16:30 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 12 Sep 2007 09:16:30 -0400
Subject: rpms/procps/devel procps.spec,1.66,1.67
Message-ID: <200709121316.l8CDGUcc005623@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5595

Modified Files:
	procps.spec 
Log Message:
* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-17
- fix #185994 - top "Cpu0" line never updates when using
  "Single Cpu = Off" option on single processor machine



Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/devel/procps.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- procps.spec	27 Aug 2007 07:01:29 -0000	1.66
+++ procps.spec	12 Sep 2007 13:15:56 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 16.1%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -62,6 +62,8 @@
 Patch29: procps-3.2.7-psman.patch
 #255441 - ldopen libselinux.so.1 instead of libselinux.so
 Patch30: procps-3.2.7-ps-libselinux.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch31: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -117,6 +119,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 cp %SOURCE1 .
 
@@ -154,6 +157,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-17
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Aug 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16.1
 - bump release
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:21:28 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 12 Sep 2007 09:21:28 -0400
Subject: rpms/procps/devel procps-3.2.7-top-cpu0.patch,NONE,1.1
Message-ID: <200709121321.l8CDLSNa005762@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753

Added Files:
	procps-3.2.7-top-cpu0.patch 
Log Message:
added patch

procps-3.2.7-top-cpu0.patch:

--- NEW FILE procps-3.2.7-top-cpu0.patch ---
--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
+++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
@@ -959,8 +959,15 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
 
    // now value each separate cpu's tics



From fedora-extras-commits at redhat.com  Wed Sep 12 13:27:47 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 12 Sep 2007 09:27:47 -0400
Subject: rpms/libdv/devel libdv.spec,1.21,1.22
Message-ID: <200709121327.l8CDRlt2006121@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libdv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6080

Modified Files:
	libdv.spec 
Log Message:
* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
- Update License field (Matthias Saou)
- Remove useless zero epoch (Matthias Saou)
- Add pkgconfig devel sub-package req (Matthias Saou)
- Minor spec formatting changes and clean-ups



Index: libdv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libdv.spec	19 Jan 2007 21:15:19 -0000	1.21
+++ libdv.spec	12 Sep 2007 13:27:14 -0000	1.22
@@ -1,31 +1,20 @@
-Summary:	Software decoder for DV format video
-Name:		libdv
-Version:	1.0.0
-Release:	1%{?dist}
-Epoch:		0
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://libdv.sourceforge.net/
-Source:		http://dl.sf.net/libdv/libdv-%{version}.tar.gz
-Patch1:		libdv-0.104-no-exec-stack.patch
-Patch2:		libdv-1.0.0-pic.patch
-Patch3:		libdv-1.0.0-gtk2.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	gtk2-devel
-BuildRequires:	libXt-devel, libXv-devel
+Summary:        Software decoder for DV format video
+Name:           libdv
+Version:        1.0.0
+Release:        2%{?dist}
+License:        LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://libdv.sourceforge.net/
+Source:         http://downloads.sourceforge.net/libdv/libdv-%{version}.tar.gz
+Patch1:         libdv-0.104-no-exec-stack.patch
+Patch2:         libdv-1.0.0-pic.patch
+Patch3:         libdv-1.0.0-gtk2.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel, libXv-devel
 # Required for the gtk2 patch
-BuildRequires:	autoconf, automake, libtool, SDL-devel
-ExcludeArch:	s390 s390x
-
-%package	devel
-Summary:	Development package for libdv
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%package	tools
-Summary:	Basic tools to manipulate Digital Video streams
-Group:		Applications/Multimedia
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+BuildRequires:  autoconf, automake, libtool, SDL-devel
+ExcludeArch:    s390 s390x
 
 %description
 The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -34,6 +23,11 @@
 developed according to the official standards for DV video: IEC 61834
 and SMPTE 314M.
 
+%package tools
+Summary:        Basic tools to manipulate Digital Video streams
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}
+
 %description tools
 This package contains some basic programs to display and encode
 digital video streams. This programs uses the Quasar DV codec (libdv),
@@ -41,6 +35,12 @@
 digital camcorders, typically those that support the IEEE 1394
 (a.k.a. FireWire or i.Link) interface.
 
+%package devel
+Summary:        Development package for libdv
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
 %description devel
 This package contains development files for libdv.
 
@@ -93,11 +93,17 @@
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
+- Update License field (Matthias Saou)
+- Remove useless zero epoch (Matthias Saou)
+- Add pkgconfig devel sub-package req (Matthias Saou)
+- Minor spec formatting changes and clean-ups
+
 * Fri Jan 19 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-1
 - New upstream release
 - PIC patch from Mike Frysinger <vapier at gentoo.org> (#146596)
 - Re-enable asm on i386
-  
+
 * Thu Sep 21 2006 Jarod Wilson <jwilson at redhat.com> 0.104-5
 - Disable asm on i386 for now to prevent text relocations in DSO
 
@@ -145,7 +151,7 @@
 - upgrade to 0.103
 
 * Sun Jun 20 2004 Jeremy Katz <katzj at redhat.com> - 0:0.102-4
-- gtk+ doesn't need to be in the .pc file (committed upstream, reported 
+- gtk+ doesn't need to be in the .pc file (committed upstream, reported
 - don't require gtk+-devel for -devel package (unneeded)
   to fedora-devel-list by John Thacker)
 
@@ -170,7 +176,7 @@
 * Sun Apr 27 2003 Dams <anvil[AT]livna.org> 0:0.99-0.fdr.2
 - Added post/postun scriptlets
 
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 
+* Fri Apr 25 2003 Dams <anvil[AT]livna.org>
 - Initial build.
 
 



From fedora-extras-commits at redhat.com  Wed Sep 12 13:56:22 2007
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Wed, 12 Sep 2007 09:56:22 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1304,1.1305
Message-ID: <200709121356.l8CDuMYh010322@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10289

Modified Files:
	openoffice.org.spec 
Log Message:
try simple build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1304
retrieving revision 1.1305
diff -u -r1.1304 -r1.1305
--- openoffice.org.spec	6 Sep 2007 19:26:41 -0000	1.1304
+++ openoffice.org.spec	12 Sep 2007 13:55:49 -0000	1.1305
@@ -1133,6 +1133,8 @@
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
 if [ "$SMP_MFLAGS" == "-P0" ]; then SMP_MFLAGS=-P2; fi
+#grr, having problems
+export SMP_MFLAGS=-P1
 #just in case you have a >16 proc box
 export MAXPROCESSLIMIT=65535
 #get core dumps



From fedora-extras-commits at redhat.com  Wed Sep 12 14:20:44 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 12 Sep 2007 10:20:44 -0400
Subject: rpms/libdv/devel libdv.spec,1.22,1.23
Message-ID: <200709121420.l8CEKimj017090@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libdv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17072

Modified Files:
	libdv.spec 
Log Message:
* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-3
- A few more fixes from Matthias Saou:
 - List man pages in %files consistently w/o gz extension
 - Add BR: popt-devel for f8+, its now split fromm rpm-devel



Index: libdv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libdv.spec	12 Sep 2007 13:27:14 -0000	1.22
+++ libdv.spec	12 Sep 2007 14:20:12 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:        Software decoder for DV format video
 Name:           libdv
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://libdv.sourceforge.net/
@@ -14,6 +14,9 @@
 BuildRequires:  libXt-devel, libXv-devel
 # Required for the gtk2 patch
 BuildRequires:  autoconf, automake, libtool, SDL-devel
+%if "%{?fedora}" >= "8"
+BuildRequires: popt-devel
+%endif
 ExcludeArch:    s390 s390x
 
 %description
@@ -81,8 +84,8 @@
 %{_bindir}/dvconnect
 %{_bindir}/encodedv
 %{_bindir}/playdv
-%{_mandir}/man1/dubdv.1.gz
-%{_mandir}/man1/dvconnect.1.gz
+%{_mandir}/man1/dubdv.1*
+%{_mandir}/man1/dvconnect.1*
 %{_mandir}/man1/encodedv.1*
 %{_mandir}/man1/playdv.1*
 
@@ -93,6 +96,11 @@
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-3
+- A few more fixes from Matthias Saou:
+ - List man pages in %%files consistently w/o gz extension
+ - Add BR: popt-devel for f8+, its now split fromm rpm-devel
+
 * Wed Sep 12 2007 Jarod Wilson <jwilson at redhat.com> 1.0.0-2
 - Update License field (Matthias Saou)
 - Remove useless zero epoch (Matthias Saou)



From fedora-extras-commits at redhat.com  Wed Sep 12 14:42:42 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 10:42:42 -0400
Subject: comps comps-f8.xml.in,1.104,1.105
Message-ID: <200709121442.l8CEggXp017940@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17900

Modified Files:
	comps-f8.xml.in 
Log Message:
Add evolution-help to comps-f8.xml.in.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- comps-f8.xml.in	11 Sep 2007 22:36:35 -0000	1.104
+++ comps-f8.xml.in	12 Sep 2007 14:42:12 -0000	1.105
@@ -1804,6 +1804,7 @@
       <packagereq type="default">bittorrent-gui</packagereq>
       <packagereq type="default">ekiga</packagereq>
       <packagereq type="default">evolution</packagereq>
+      <packagereq type="default">evolution-help</packagereq>
       <packagereq type="default">evolution-webcal</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">pidgin</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 12 14:48:43 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Wed, 12 Sep 2007 10:48:43 -0400
Subject: rpms/hotwire/F-7 hotwire.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <200709121448.l8CEmh4j018188@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/hotwire/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130

Modified Files:
	hotwire.spec sources 
Log Message:
new upstream


Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/F-7/hotwire.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hotwire.spec	11 Jul 2007 22:48:09 -0000	1.5
+++ hotwire.spec	12 Sep 2007 14:48:11 -0000	1.6
@@ -3,7 +3,7 @@
 
 Summary: Hotwire Shell
 Name: hotwire
-Version: 0.590
+Version: 0.595
 Release: 1%{?dist}
 Source0: http://hotwire-shell.org/download/hotwire-%{version}.zip
 License: GPL
@@ -56,6 +56,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Sun Sep 09 2007 Colin Walters <walters at redhat.com> - 0.595-1
+- new upstream
+
 * Tue Jul 12 2007 Colin Walters <walters at redhat.com> - 0.590-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jul 2007 22:48:09 -0000	1.5
+++ sources	12 Sep 2007 14:48:11 -0000	1.6
@@ -1,2 +1 @@
-e465e180cd90df1b5c88c5648c996469  hotwire-0.575.zip
-13b9d559b725b3b36104f6f97ae3ede6  hotwire-0.590.zip
+2da79522e51904c78df9bd3dfb5e13ef  hotwire-0.595.zip



From fedora-extras-commits at redhat.com  Wed Sep 12 14:48:56 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 10:48:56 -0400
Subject: rpms/kmenu-gnome/F-7 remove-system-administration.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 kmenu-gnome.spec, 1.12, 1.13 sources,
	1.11, 1.12
Message-ID: <200709121448.l8CEmucV018237@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17991/F-7

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Added Files:
	remove-system-administration.patch 
Log Message:


remove-system-administration.patch:

--- NEW FILE remove-system-administration.patch ---
--- kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu.orig	2007-09-09 23:30:50.000000000 +0200
+++ kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu	2007-09-10 07:25:07.000000000 +0200
@@ -1285,50 +1285,6 @@
 			<Filename>synaptic-kde.desktop</Filename>
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>Settings</Category>
-				<Not><Or>
-				<Filename>gdmsetup.desktop</Filename>
-				<Filename>gnome-nettool.desktop</Filename>
-				<Filename>gnome-system-monitor.desktop</Filename>
-				<Filename>gslapt.desktop</Filename>
-				<Filename>qt-language-selector.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>boot.desktop</Filename>
-				<Filename>dropline-installer.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>gnome-app-install.desktop</Filename>
-				<Filename>gnome-app-install-xfce.desktop</Filename>
-				<Filename>gnome-apt.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>update-manager.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-				<!-- Include rPath Administration Tools -->
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>net-internet-druid.desktop</Filename>
-				<Filename>net-neat.desktop</Filename>
-				<Filename>net-swat.desktop</Filename>
-				<Filename>net-system-config-date.desktop</Filename>
-				<Filename>net-system-config-display.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>net-system-config-securitylevel.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>
 				<And>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:19:09 -0000	1.11
+++ .cvsignore	12 Sep 2007 14:48:23 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.8.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/kmenu-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmenu-gnome.spec	20 Aug 2007 20:19:09 -0000	1.12
+++ kmenu-gnome.spec	12 Sep 2007 14:48:23 -0000	1.13
@@ -1,15 +1,17 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.8
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: pharagraphe 3 of LGPL permits changing the license to GPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
 
 Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+Patch:      remove-system-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +21,11 @@
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -78,6 +81,14 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Sep 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.8-2
+- new upstream release
+
+* Wed Sep 12 2007 Ariszlo <ariszlo at gmail.com> - 0.6.8-1
+- release 0.6.8
+- Added include categories to fc5-hide-bug196275.menu
+- Added remove-system-administration.patch
+
 * Mon Aug 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.7-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:19:09 -0000	1.11
+++ sources	12 Sep 2007 14:48:23 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+003e5d317881a78005434267a3631035  31025-kmenu-gnome-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 14:51:41 2007
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 12 Sep 2007 10:51:41 -0400
Subject: rpms/kmenu-gnome/devel remove-system-administration.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 kmenu-gnome.spec, 1.12, 1.13 sources,
	1.11, 1.12
Message-ID: <200709121451.l8CEpfVG018439@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Added Files:
	remove-system-administration.patch 
Log Message:


remove-system-administration.patch:

--- NEW FILE remove-system-administration.patch ---
--- kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu.orig	2007-09-09 23:30:50.000000000 +0200
+++ kmenu-gnome-0.6.8/xdg/kmenu-gnome.menu	2007-09-10 07:25:07.000000000 +0200
@@ -1285,50 +1285,6 @@
 			<Filename>synaptic-kde.desktop</Filename>
 		</Include>
 		<Menu>
-			<Name>Administration</Name>
-			<Directory>kmenu-administration.directory</Directory>
-			<Include>
-				<And>
-				<Category>System</Category>
-				<Category>Settings</Category>
-				<Not><Or>
-				<Filename>gdmsetup.desktop</Filename>
-				<Filename>gnome-nettool.desktop</Filename>
-				<Filename>gnome-system-monitor.desktop</Filename>
-				<Filename>gslapt.desktop</Filename>
-				<Filename>qt-language-selector.desktop</Filename>
-				</Or></Not>
-				</And>
-				<Filename>boot.desktop</Filename>
-				<Filename>dropline-installer.desktop</Filename>
-				<Filename>envy.desktop</Filename>
-				<Filename>gnome-app-install.desktop</Filename>
-				<Filename>gnome-app-install-xfce.desktop</Filename>
-				<Filename>gnome-apt.desktop</Filename>
-				<Filename>gparted.desktop</Filename>
-				<Filename>network.desktop</Filename>
-				<Filename>ntfs-config.desktop</Filename>
-				<Filename>printers.desktop</Filename>
-				<Filename>sabayon.desktop</Filename>
-				<Filename>time.desktop</Filename>
-				<Filename>update-manager.desktop</Filename>
-				<Filename>users.desktop</Filename>
-				<Filename>vleasytables.desktop</Filename>
-				<!-- Include rPath Administration Tools -->
-				<Filename>authconfig-gtk.desktop</Filename>
-				<Filename>hwbrowser.desktop</Filename>
-				<Filename>net-internet-druid.desktop</Filename>
-				<Filename>net-neat.desktop</Filename>
-				<Filename>net-swat.desktop</Filename>
-				<Filename>net-system-config-date.desktop</Filename>
-				<Filename>net-system-config-display.desktop</Filename>
-				<Filename>net-system-config-keyboard.desktop</Filename>
-				<Filename>net-system-config-language.desktop</Filename>
-				<Filename>net-system-config-rootpassword.desktop</Filename>
-				<Filename>net-system-config-securitylevel.desktop</Filename>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>More</Name>
 			<Include>
 				<And>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Aug 2007 20:23:51 -0000	1.11
+++ .cvsignore	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-31025-kmenu-gnome-0.6.7.tar.gz
+31025-kmenu-gnome-0.6.8.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmenu-gnome.spec	20 Aug 2007 20:23:51 -0000	1.12
+++ kmenu-gnome.spec	12 Sep 2007 14:51:08 -0000	1.13
@@ -1,15 +1,17 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.7
+Version:    0.6.8
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
-License:    LGPLv2
+License:    GPLv2
+# GPL/LGPL: pharagraphe 3 of LGPL permits changing the license to GPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
 
 Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
+Patch:      remove-system-administration.patch
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +21,11 @@
 K Menu with Gnome folder and extra icons.
 
 %prep
-
 %setup -q
-
+# Remove superfluous System/Administration subdirectory:
+%patch -p1
 %build
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
@@ -78,6 +81,14 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Sep 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.8-2
+- new upstream release
+
+* Wed Sep 12 2007 Ariszlo <ariszlo at gmail.com> - 0.6.8-1
+- release 0.6.8
+- Added include categories to fc5-hide-bug196275.menu
+- Added remove-system-administration.patch
+
 * Mon Aug 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org>- 0.6.7-2
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Aug 2007 20:23:51 -0000	1.11
+++ sources	12 Sep 2007 14:51:08 -0000	1.12
@@ -1 +1 @@
-081826b3c8df92c57c7463264b885f35  31025-kmenu-gnome-0.6.7.tar.gz
+003e5d317881a78005434267a3631035  31025-kmenu-gnome-0.6.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 14:55:38 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 10:55:38 -0400
Subject: devel/yum yum-trans-display-object.patch, NONE, 1.1 yum.spec, 1.177,
	1.178 cli-ouput-fix.patch, 1.1, NONE depsolve-fixes.patch, 1.1,
	NONE rpmdb-unresolved.patch, 1.1, NONE version-None-tuple.patch,
	1.1, NONE
Message-ID: <200709121455.l8CEtc4F018710@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18669

Modified Files:
	yum.spec 
Added Files:
	yum-trans-display-object.patch 
Removed Files:
	cli-ouput-fix.patch depsolve-fixes.patch 
	rpmdb-unresolved.patch version-None-tuple.patch 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
- add upstream patch to improve RPMTransaction display


yum-trans-display-object.patch:

--- NEW FILE yum-trans-display-object.patch ---
commit ae1618ec6ab66beef49c3d27ac0083c4115bd8cb
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Sep 12 10:40:12 2007 -0400

    allow passing in an already created display object

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index ecddce1..f77400e 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -115,7 +115,10 @@ class SimpleCliCallBack(RPMBaseCallback):
 
 class RPMTransaction:
     def __init__(self, base, test=False, display=NoOutputCallBack):
-        self.display = display() # display callback
+        if not callable(display):
+            self.display = display
+        else:
+            self.display = display() # display callback
         self.base = base # base yum object b/c we need so much
         self.test = test # are we a test?
         


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- yum.spec	10 Sep 2007 16:07:14 -0000	1.177
+++ yum.spec	12 Sep 2007 14:55:06 -0000	1.178
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
+Patch2: yum-trans-display-object.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -48,6 +49,7 @@
 %setup -q
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .showdep
+%patch2 -p1 -b .transdisp
 
 %build
 make
@@ -93,6 +95,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
+- add upstream patch to improve RPMTransaction display
+
 * Mon Sep 10 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.5-1
 - 3.2.5 - pull out unused patches
 


--- cli-ouput-fix.patch DELETED ---


--- depsolve-fixes.patch DELETED ---


--- rpmdb-unresolved.patch DELETED ---


--- version-None-tuple.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:01:46 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 12 Sep 2007 11:01:46 -0400
Subject: rpms/byacc/devel byacc.spec,1.2,1.3
Message-ID: <200709121501.l8CF1kiV024920@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/byacc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18940

Modified Files:
	byacc.spec 
Log Message:
* Fri Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.9.20050813-2
- Update summary.
- Remove useless doc copying in install section.
- Add NOTES and NO_WARRANTY docs.



Index: byacc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/byacc/devel/byacc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- byacc.spec	1 Mar 2007 18:19:49 -0000	1.2
+++ byacc.spec	12 Sep 2007 15:01:11 -0000	1.3
@@ -1,9 +1,9 @@
 %define byaccdate 20050813
 
-Summary: A public domain Yacc parser generator
+Summary: Berkeley Yacc, a parser generator
 Name: byacc
 Version: 1.9.%{byaccdate}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: Development/Tools
 URL: http://dickey.his.com/byacc/byacc.html
@@ -29,8 +29,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s yacc $RPM_BUILD_ROOT/%{_bindir}/byacc
 ln -s yacc.1 $RPM_BUILD_ROOT/%{_mandir}/man1/byacc.1
-install -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
-install -m 644 ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
 
 %check
 echo ====================TESTING=========================
@@ -41,14 +39,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ACKNOWLEDGEMENTS CHANGES README NEW_FEATURES
-%defattr(-,root,root)
+%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
+%defattr(-,root,root,-)
 %{_bindir}/yacc
 %{_bindir}/byacc
 %{_mandir}/man1/yacc.1*
 %{_mandir}/man1/byacc.1*
 
 %changelog
+* Fri Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.9.20050813-2
+- Update summary.
+- Remove useless doc copying in install section.
+- Add NOTES and NO_WARRANTY docs.
+
 * Thu Feb  2 2007 Petr Machata <pmachata at redhat.com> - 1.9.20050813-1
 - Thomas Dickey's 20050813 version of byacc:
   - own build system (linux patch reverted)



From fedora-extras-commits at redhat.com  Wed Sep 12 15:18:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:18:51 -0400
Subject: rpms/kdesdk/devel kdesdk-3.5.7-subversion.patch, NONE,
	1.1 kdesdk.spec, 1.71, 1.72 kdesdk-3.4.0-db4.patch, 1.1, NONE
Message-ID: <200709121518.l8CFIpWk025809@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25776

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.5.7-subversion.patch 
Removed Files:
	kdesdk-3.4.0-db4.patch 
Log Message:
* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
- update %description to mention included apps
- move manpages to main pkg.
- Provides: cervisia umbrello
- kbugbuster kuiviewer: drop --add-only-show-in KDE
- kioslave/svn: --with-subversion, patch


kdesdk-3.5.7-subversion.patch:

--- NEW FILE kdesdk-3.5.7-subversion.patch ---
diff -up kdesdk-3.5.7/kioslave/svn/configure.in.in.svn kdesdk-3.5.7/kioslave/svn/configure.in.in
--- kdesdk-3.5.7/kioslave/svn/configure.in.in.svn	2005-10-10 09:58:25.000000000 -0500
+++ kdesdk-3.5.7/kioslave/svn/configure.in.in	2007-09-12 09:39:42.000000000 -0500
@@ -86,7 +86,7 @@ fi
 AC_SUBST(SVNCONFIG)
 if test -x "$SVNCONFIG"; then
 	SVNLD="`$SVNCONFIG --ldflags`"
-	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1 -lsvn_subr-1"
 	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
 	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
 	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
@@ -141,7 +141,7 @@ dnl		AC_MSG_ERROR([Subversion headers ar
 		SVN_SUBDIR=
 	fi
 fi
-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
 SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
 SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdesdk.spec	29 Aug 2007 12:07:57 -0000	1.71
+++ kdesdk.spec	12 Sep 2007 15:18:18 -0000	1.72
@@ -1,24 +1,20 @@
 
-%define debug 0
-%define final 0
+%define _with_subversion --with-subversion --with-apr-config=apr-1-config --with-apu-config=apu-1-config
 
-%define arts 1
-
-%define make_cvs 1
-
-%define appdir %{_datadir}/applications/kde
+%define make_cvs 1 
 
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 9%{?dist}.1
+Release: 10%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdesdk-3.4.0-db4.patch
+
+Patch1: kdesdk-3.5.7-subversion.patch
 Patch2: kdesdk-3.5.4-multilib.patch
 
 Provides: kdesdk3 = %{version}-%{release}
@@ -42,29 +38,42 @@
 BuildRequires: binutils-devel
 %endif
 BuildRequires: perl
-BuildRequires: subversion-devel >= 1.0, neon-devel
+%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+
+# Obsoletes/Provides
+%define cervisia_ver 2.4.7
+Provides: cervisia = %{cervisia_ver}-%{release}
+
+%define umbrello_ver 1.5.7
+Obsoletes: umbrello < %{umbrello_ver}-%{release}
+Provides:  umbrello = %{umbrello_ver}-%{release}
+
 
 %description
-A collection of applications and tools used by KDE developers.
-Among other things, kdesdk provides tools for working on the KDE CVS
-repository.
+A collection of applications and tools used by developers, including:
+* cervisia: a CVS frontend
+* kbabel: PO file management
+* kbugbuster: a tool to manage the KDE bug report system
+* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* kompare: diff tool
+* kuiviewer: displays designer's UI files
+* umbrello: UML modeller and UML diagram tool
+
 
 %package devel
-Summary: Development files for kdesdk
+Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdesdk3-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs3-devel
-
 %description devel
-Development files for kdesdk. Install kdesdk-devel if you wish
-to develop or compile KDE sdk applications.
+%{summary}.
 
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .db4
+%patch1 -p1 -b .subversion
 %patch2 -p1 -b .multilib
 
 %if %{make_cvs}
@@ -76,20 +85,12 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-%if %{arts} == 0
-   --without-arts \
-%endif
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --includedir=%{_includedir}/kde
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
+  %{?_with_subversion}
 
 make %{?_smp_mflags}
 
@@ -99,11 +100,9 @@
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor "" --delete-original \
-  --dir %{buildroot}%{appdir} \
-  --add-only-show-in KDE \
-  %{buildroot}%{appdir}/kbugbuster.desktop \
-  %{buildroot}%{appdir}/kuiviewer.desktop
+desktop-file-install --vendor "" \
+  --dir %{buildroot}%{_datadir}/applications/kde \
+  %{buildroot}%{_datadir}/applications/kde/*.desktop \
 
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
@@ -149,12 +148,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/*.la
+%{_docdir}/HTML/en/*
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -164,17 +159,28 @@
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/applications/kde/*
 %{_datadir}/config.kcfg/*
+%{_libdir}/kde3/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_libdir}/libkdeinit_*.so
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/*.a
-%{_mandir}/man1/*
+%{_libdir}/libktrace_s.a
 
 
 %changelog
+* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
+- update %%description to mention included apps
+- move manpages to main pkg.
+- Provides: cervisia umbrello
+- kbugbuster kuiviewer: drop --add-only-show-in KDE
+- kioslave/svn: --with-subversion, patch
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-9
 - License: GPLv2
 - (Build)Requires: kdelibs3(-devel) kdepim3-devel


--- kdesdk-3.4.0-db4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:37:17 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 11:37:17 -0400
Subject: rpms/xsc/FC-6 xsc.desktop, NONE, 1.1 xsc.png, NONE, 1.1 xsc.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709121537.l8CFbHDr026678@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xsc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26635

Modified Files:
	sources 
Added Files:
	xsc.desktop xsc.png xsc.spec 
Log Message:
Initial import.



--- NEW FILE xsc.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xsc
Exec=xsc
Comment=Vector graphic shootemup
Icon=xsc.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE xsc.spec ---
Name: xsc
Version:  1.5
Release:  2%{?dist}
Summary: A clone of the old vector graphics video game Star Castle

Group: Amusements/Games 
License: GPLv2        
URL: http://www.panix.com/~mbh/projects.html
Source0: http://www.panix.com/~mbh/xsc/xsc-%{version}.tar.gz
Source1: xsc.desktop
Source2: xsc.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildRequires: desktop-file-utils, libX11-devel
Requires: hicolor-icon-theme

%description
The object is to blast a hole in the rings and destroy the enemy ship.
The only problem is that it tracks your every move and as soon as you 
knock a hole in all three rings, and they all line up, it lets loose  
with the big nasty green fireballs.  Avoid them.  Avoid the little green
buzzers, too.  Shoot 'em if you want.

%prep
%setup -q

%build

%configure --x-includes="" --x-libraries=""
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
mkdir -p  %{buildroot}%{_bindir}
install -m 755 xsc %{buildroot}%{_bindir}/xsc

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xsc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_datadir}/applications/fedora-xsc.desktop
%{_datadir}/icons/hicolor/32x32/apps/xsc.png

%changelog
* Sat Sep 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Added h-i-theme requires, xparentfied icon.

* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsc/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:45:22 -0000	1.1
+++ sources	12 Sep 2007 15:36:44 -0000	1.2
@@ -0,0 +1 @@
+74b8c69c143e76e74a2f176712e44789  xsc-1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 15:48:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:48:29 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.130,1.131
Message-ID: <200709121548.l8CFmTKo027064@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27028

Modified Files:
	kdepim.spec 
Log Message:
* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
- drop OnlyShowIn=KDE munging
- update %description
- tidy up



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdepim.spec	30 Aug 2007 01:57:27 -0000	1.130
+++ kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
@@ -1,18 +1,18 @@
+
 %define debug 0
+# --enable-final requires > 1GB VM, sometimes kills our builders 
 %define final 0
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
 %define make_cvs 1
 
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
 Name:    kdepim
-Summary: PIM (Personal Information Manager) for KDE
+Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -70,7 +70,9 @@
 BuildRequires: automake libtool
 %endif
 
-Obsoletes: akregator < 0:1.0
+%define akregator_ver 1.2.7
+Obsoletes: akregator < 0:%{akregator_ver}-%{release}
+#Provides: akregator = 0:%{akregator_ver}-%{release} 
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -84,7 +86,14 @@
 %endif
 
 %description
-A PIM (Personal Information Manager) for KDE.
+%{summary}, including:
+* akregator: feed aggregator 
+* kmail: email client
+* knode: newsreader
+* knotes: sticky notes for the desktop
+* kontact: integrated PIM management
+* korganizer: journal, appointments, events, todos
+%{?_with_pilot_link:* kpilot: HotSync?? software for Palm OS?? devices}
 
 %package devel
 Summary: Development files for %{name} 
@@ -113,7 +122,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -145,24 +154,30 @@
 %install
 rm -rf %{buildroot} 
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
-# Make symlinks relative
-mkdir -p %{buildroot}%{prefix}/share/doc/HTML/en/common
-pushd %{buildroot}%{prefix}/share/doc/HTML/en
+# make symlinks relative
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
-   [ -d $i -a -L $i/common ] && (cd $i && ln -nfs ../common . && cd ..)
+   if [ -d $i -a -L $i/common ]; then
+      rm -f $i/common
+      ln -nfs ../common $i
+   fi
 done
 popd
 
+
 ## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
 ## some of these gems.  -- Rex
+%if 0
 for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
    KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
    if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
       echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
    fi
 done
+%endif
 
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
@@ -232,6 +247,11 @@
 
 
 %changelog
+* Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- drop OnlyShowIn=KDE munging
+- update %%description
+- tidy up
+
 * Mon Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
 - templates for forwarding do not work with inline mails (kde#140549)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:29 -0700
Subject: [pkgdb] guile-gnome-platform was added for laxathom
Message-ID: <200709121551.l8CFpU1e022812@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package guile-gnome-platform with summary Guile wrapper collection for the GNOME library stack
Kevin Fenzi (kevin) has approved Package guile-gnome-platform
Kevin Fenzi (kevin) has added a Fedora devel branch for guile-gnome-platform with an owner of laxathom
Kevin Fenzi (kevin) has approved guile-gnome-platform in Fedora devel
Kevin Fenzi (kevin) has approved Package guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, 6) updated by kevin
Message-ID: <200709121551.l8CFpkXl032265@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121551.l8CFplHZ032274@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, 7) updated by kevin
Message-ID: <200709121551.l8CFploe032283@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora, devel) updated by kevin
Message-ID: <200709121551.l8CFpmav032292@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:51:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:51:46 -0700
Subject: [pkgdb] guile-gnome-platform (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121551.l8CFpmik032301@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for guile-gnome-platform
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on guile-gnome-platform (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on guile-gnome-platform (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/guile-gnome-platform



From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:23 -0400
Subject: rpms/guile-gnome-platform - New directory
Message-ID: <200709121552.l8CFqNjt027375@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform

Log Message:
Directory /cvs/extras/rpms/guile-gnome-platform added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:27 -0400
Subject: rpms/guile-gnome-platform/devel - New directory
Message-ID: <200709121552.l8CFqRuC027394@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform/devel

Log Message:
Directory /cvs/extras/rpms/guile-gnome-platform/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:29 -0400
Subject: rpms/guile-gnome-platform Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121552.l8CFqT7W027420@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform

Added Files:
	Makefile import.log 
Log Message:
Setup of module guile-gnome-platform


--- NEW FILE Makefile ---
# Top level Makefile for module guile-gnome-platform
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:52:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:52:33 -0400
Subject: rpms/guile-gnome-platform/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709121552.l8CFqXY9027436@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/guile-gnome-platform/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA27334/rpms/guile-gnome-platform/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module guile-gnome-platform


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: guile-gnome-platform
# $Id: Makefile,v 1.1 2007/09/12 15:52:30 kevin Exp $
NAME := guile-gnome-platform
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 fedora-extras-commits at redhat.com  Wed Sep 12 15:53:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:53:55 -0700
Subject: [pkgdb] slingshot was added for limb
Message-ID: <200709121553.l8CFrtBI032361@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package slingshot with summary A Newtonian strategy game
Kevin Fenzi (kevin) has approved Package slingshot
Kevin Fenzi (kevin) has added a Fedora devel branch for slingshot with an owner of limb
Kevin Fenzi (kevin) has approved slingshot in Fedora devel
Kevin Fenzi (kevin) has approved Package slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/slingshot



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, 7) updated by kevin
Message-ID: <200709121554.l8CFs9r3032375@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/slingshot



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, devel) updated by kevin
Message-ID: <200709121554.l8CFsA8n032384@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/slingshot



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:54:09 -0700
Subject: [pkgdb] slingshot (Fedora, 6) updated by kevin
Message-ID: <200709121554.l8CFsAh4032394@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for slingshot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on slingshot (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on slingshot (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/slingshot



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:22 -0400
Subject: rpms/slingshot - New directory
Message-ID: <200709121554.l8CFsMgj027902@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot

Log Message:
Directory /cvs/extras/rpms/slingshot added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:26 -0400
Subject: rpms/slingshot/devel - New directory
Message-ID: <200709121554.l8CFsQMe027919@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot/devel

Log Message:
Directory /cvs/extras/rpms/slingshot/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:29 -0400
Subject: rpms/slingshot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121554.l8CFsTXe027946@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot

Added Files:
	Makefile import.log 
Log Message:
Setup of module slingshot


--- NEW FILE Makefile ---
# Top level Makefile for module slingshot
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 15:54:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 11:54:33 -0400
Subject: rpms/slingshot/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709121554.l8CFsX93027962@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO27866/rpms/slingshot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module slingshot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: slingshot
# $Id: Makefile,v 1.1 2007/09/12 15:54:31 kevin Exp $
NAME := slingshot
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 fedora-extras-commits at redhat.com  Wed Sep 12 15:55:46 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Sep 2007 11:55:46 -0400
Subject: rpms/lyx/EL-5 lyx.spec,1.50,1.51
Message-ID: <200709121555.l8CFtk1I028192@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164

Modified Files:
	lyx.spec 
Log Message:
* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
- License: GPLv2+
- EPEL: drop aiksaurus support (until aiksaurus is available)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lyx.spec	10 Sep 2007 17:01:29 -0000	1.50
+++ lyx.spec	12 Sep 2007 15:55:13 -0000	1.51
@@ -1,10 +1,14 @@
 
+%if 0%{?fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
@@ -25,14 +29,13 @@
 # xforms frontend
 BuildRequires: xforms-devel
 
+%{?_with_aiksaurus:BuildRequires: aiksaurus-devel}
+BuildRequires: aspell-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: python
-BuildRequires: aiksaurus-devel
-BuildRequires: aspell-devel
+BuildRequires: tetex-fonts tetex-latex
 BuildRequires: zlib-devel
-BuildRequires: tetex-latex
-BuildRequires: tetex-fonts
 
 # For texhash
 Requires(post): tetex-fonts
@@ -43,8 +46,6 @@
 Requires: tetex-dvips
 Requires: mathml-fonts
 Requires: ghostscript
-# Short-hand for Requires+Requires(post,postun)
-Prereq: xdg-utils
 ## Soft dependencies
 %if 0%{?fedora} > 3
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -53,6 +54,7 @@
 %endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
+Requires(hint): xdg-utils
 
 %description
 LyX is a modern approach to writing documents which breaks with the
@@ -112,7 +114,7 @@
   --enable-compression-support \
   --with-frontend="qt xforms" \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
+  %{?_with_aiksaurus} %{!?_with_aiksaurus:--without-aiksaurus} \
   --with-aspell \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
@@ -162,15 +164,18 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure.py  > /dev/null 2>&1 ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
+fi
 
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing, 
@@ -217,6 +222,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
+- License: GPLv2+
+- EPEL: drop aiksaurus support (until aiksaurus is available)
+
 * Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
 - lyx-1.4.5.1
 



From fedora-extras-commits at redhat.com  Wed Sep 12 15:58:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 08:58:58 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect was added for remi
Message-ID: <200709121558.l8CFwxjR032446@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-pear-HTML-QuickForm-advmultiselect with summary Element for HTML_QuickForm that emulate a multi-select
Kevin Fenzi (kevin) has approved Package php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has added a Fedora devel branch for php-pear-HTML-QuickForm-advmultiselect with an owner of remi
Kevin Fenzi (kevin) has approved php-pear-HTML-QuickForm-advmultiselect in Fedora devel
Kevin Fenzi (kevin) has approved Package php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	6) updated by kevin
Message-ID: <200709121605.l8CG5MMf032551@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora 6 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect summary updated by
	kevin
Message-ID: <200709121605.l8CG5MJE032542@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package php-pear-HTML-QuickForm-advmultiselect summary to Element for HTML_QuickForm that emulate a multi-select

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	devel) updated by kevin
Message-ID: <200709121605.l8CG5NDL032560@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora devel to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora,
	7) updated by kevin
Message-ID: <200709121605.l8CG5NaB032569@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora 7 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:05:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:05:22 -0700
Subject: [pkgdb] php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL,
	5) updated by kevin
Message-ID: <200709121605.l8CG5N6n032578@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for php-pear-HTML-QuickForm-advmultiselect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of php-pear-HTML-QuickForm-advmultiselect in Fedora EPEL 5 to remi
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-pear-HTML-QuickForm-advmultiselect (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML-QuickForm-advmultiselect



From fedora-extras-commits at redhat.com  Wed Sep 12 16:17:09 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 12 Sep 2007 12:17:09 -0400
Subject: fedora-security/audit fc7,1.97,1.98
Message-ID: <200709121617.l8CGHACP002359@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2338/audit

Modified Files:
	fc7 
Log Message:
mediawiki XSS



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- fc7	11 Sep 2007 17:49:30 -0000	1.97
+++ fc7	12 Sep 2007 16:17:07 -0000	1.98
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
+GENERIC-MAP-NOMATCH VULNERABLE (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:38 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect - New directory
Message-ID: <200709121624.l8CGOcUj002812@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:42 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel - New directory
Message-ID: <200709121624.l8CGOgus002825@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:47 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200709121624.l8CGOl4R002857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-QuickForm-advmultiselect


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-QuickForm-advmultiselect
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:24:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:24:50 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel .cvsignore, NONE, 
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709121624.l8CGOoPZ002873@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWb2780/rpms/php-pear-HTML-QuickForm-advmultiselect/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-QuickForm-advmultiselect


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-HTML-QuickForm-advmultiselect
# $Id: Makefile,v 1.1 2007/09/12 16:24:48 kevin Exp $
NAME := php-pear-HTML-QuickForm-advmultiselect
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:30:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:00 -0700
Subject: [pkgdb] pguiman was added for odvorace
Message-ID: <200709121630.l8CGU03x032719@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package pguiman with summary The PostgreSQL database server managing tool
Kevin Fenzi (kevin) has approved Package pguiman
Kevin Fenzi (kevin) has added a Fedora devel branch for pguiman with an owner of odvorace
Kevin Fenzi (kevin) has approved pguiman in Fedora devel
Kevin Fenzi (kevin) has approved Package pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pguiman



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, 6) updated by kevin
Message-ID: <200709121630.l8CGU9N4023801@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pguiman



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, devel) updated by kevin
Message-ID: <200709121630.l8CGUALT023819@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pguiman



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:30:09 -0700
Subject: [pkgdb] pguiman (Fedora, 7) updated by kevin
Message-ID: <200709121630.l8CGUAIB023810@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for pguiman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pguiman (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on pguiman (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pguiman



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:36 -0400
Subject: rpms/pguiman - New directory
Message-ID: <200709121630.l8CGUam8003421@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman

Log Message:
Directory /cvs/extras/rpms/pguiman added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:39 -0400
Subject: rpms/pguiman/devel - New directory
Message-ID: <200709121630.l8CGUd8a003435@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman/devel

Log Message:
Directory /cvs/extras/rpms/pguiman/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:42 -0400
Subject: rpms/pguiman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121630.l8CGUgOr003462@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman

Added Files:
	Makefile import.log 
Log Message:
Setup of module pguiman


--- NEW FILE Makefile ---
# Top level Makefile for module pguiman
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:30:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:30:45 -0400
Subject: rpms/pguiman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709121630.l8CGUjNi003478@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspJ3390/rpms/pguiman/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pguiman


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pguiman
# $Id: Makefile,v 1.1 2007/09/12 16:30:43 kevin Exp $
NAME := pguiman
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:35:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:22 -0700
Subject: [pkgdb] tack was added for mlichvar
Message-ID: <200709121635.l8CGZNdB023963@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package tack with summary Terminfo action checker
Kevin Fenzi (kevin) has approved Package tack
Kevin Fenzi (kevin) has added a Fedora devel branch for tack with an owner of mlichvar
Kevin Fenzi (kevin) has approved tack in Fedora devel
Kevin Fenzi (kevin) has approved Package tack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tack (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on tack (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tack



From fedora-extras-commits at redhat.com  Wed Sep 12 16:35:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:32 -0700
Subject: [pkgdb] tack (Fedora, devel) updated by kevin
Message-ID: <200709121635.l8CGZWv2000342@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on tack (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tack



From fedora-extras-commits at redhat.com  Wed Sep 12 16:35:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:35:32 -0700
Subject: [pkgdb] tack (Fedora, 7) updated by kevin
Message-ID: <200709121635.l8CGZXph000351@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for tack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on tack (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on tack (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tack



From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:33 -0400
Subject: rpms/tack - New directory
Message-ID: <200709121639.l8CGdXuC003993@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack

Log Message:
Directory /cvs/extras/rpms/tack added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:38 -0400
Subject: rpms/tack/devel - New directory
Message-ID: <200709121639.l8CGdcoa004009@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack/devel

Log Message:
Directory /cvs/extras/rpms/tack/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:41 -0400
Subject: rpms/tack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709121639.l8CGdfgZ004036@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack

Added Files:
	Makefile import.log 
Log Message:
Setup of module tack


--- NEW FILE Makefile ---
# Top level Makefile for module tack
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 12 16:39:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 12:39:44 -0400
Subject: rpms/tack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709121639.l8CGdiqw004053@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVW3960/rpms/tack/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tack


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tack
# $Id: Makefile,v 1.1 2007/09/12 16:39:41 kevin Exp $
NAME := tack
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 fedora-extras-commits at redhat.com  Wed Sep 12 16:55:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:55:58 -0700
Subject: [pkgdb] Django (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121655.l8CGtwGF024173@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for Django
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Django (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Django (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Django (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From fedora-extras-commits at redhat.com  Wed Sep 12 16:55:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 09:55:58 -0700
Subject: [pkgdb] Django (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121655.l8CGtw1G024182@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for Django
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Django (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Django (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Django (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Django



From fedora-extras-commits at redhat.com  Wed Sep 12 17:17:07 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 13:17:07 -0400
Subject: rpms/curl/OLPC-2 curl-7.16.4-ftp.patch, NONE,
	1.1 curl-7.16.4-nsspem.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 curl.spec, 1.49, 1.50 sources, 1.25,
	1.26 curl-7.14.1-nousr.patch, 1.1,
	NONE curl-7.15.0-curl_config-version.patch, 1.1, NONE
Message-ID: <200709121717.l8CHH70Q011701@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/curl/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572/OLPC-2

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.16.4-ftp.patch curl-7.16.4-nsspem.patch 
Removed Files:
	curl-7.14.1-nousr.patch curl-7.15.0-curl_config-version.patch 
Log Message:
Import f8 srpm, branch was accidentally made from F-7.


curl-7.16.4-ftp.patch:

--- NEW FILE curl-7.16.4-ftp.patch ---
--- curl-7.16.4/lib/ftp.c.ftp	2007-07-02 00:01:19.000000000 +0200
+++ curl-7.16.4/lib/ftp.c	2007-08-10 13:24:34.000000000 +0200
@@ -2372,7 +2372,7 @@ static CURLcode ftp_state_user_resp(stru
   (void)instate; /* no use for this yet */
 
   /* some need password anyway, and others just return 2xx ignored */
-  if((ftpcode == 331 || ftpcode/100 == 2) && (ftpc->state == FTP_USER)) {
+  if((ftpcode == 331) && (ftpc->state == FTP_USER)) {
     /* 331 Password required for ...
        (the server requires to send the user's password too) */
     NBFTPSENDF(conn, "PASS %s", ftp->passwd?ftp->passwd:"");

curl-7.16.4-nsspem.patch:

--- NEW FILE curl-7.16.4-nsspem.patch ---
diff -up curl-7.16.4/configure.nsspem curl-7.16.4/configure
--- curl-7.16.4/configure.nsspem	2007-06-25 11:18:41.000000000 +0200
+++ curl-7.16.4/configure	2007-09-06 08:35:31.000000000 +0200
@@ -26760,7 +26760,7 @@ echo "$as_me: WARNING: Use --with-ssl, -
 fi
 
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   { echo "$as_me:$LINENO: checking CA cert bundle install path" >&5
 echo $ECHO_N "checking CA cert bundle install path... $ECHO_C" >&6; }
diff -up curl-7.16.4/configure.ac.nsspem curl-7.16.4/configure.ac
--- curl-7.16.4/configure.ac.nsspem	2007-06-12 23:39:21.000000000 +0200
+++ curl-7.16.4/configure.ac	2007-09-06 08:35:31.000000000 +0200
@@ -1468,7 +1468,7 @@ dnl ************************************
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
 
   AC_MSG_CHECKING([CA cert bundle install path])
 
diff -up curl-7.16.4/lib/nss.c.nsspem curl-7.16.4/lib/nss.c
--- curl-7.16.4/lib/nss.c.nsspem	2007-05-25 23:56:27.000000000 +0200
+++ curl-7.16.4/lib/nss.c	2007-09-06 09:26:39.000000000 +0200
@@ -55,6 +55,7 @@
 #include <ssl.h>
 #include <sslerr.h>
 #include <secerr.h>
+#include <secmod.h>
 #include <sslproto.h>
 #include <prtypes.h>
 #include <pk11pub.h>
@@ -69,10 +70,19 @@
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif
 
+#define SSL_DIR "/etc/pki/nssdb"
+
+/* enough to fit the string "PEM Token #[0|1]" */
+#define SLOTSIZE 13
+
 PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 
 static int initialized = 0;
-static int noverify = 0;
+static int verify_done = 0;
+char * select_nickname = NULL;
+
+/* Global so our callbacks can update as appropriate */
+static int curlerr;
 
 #define HANDSHAKE_TIMEOUT 30
 
@@ -87,15 +97,25 @@ typedef struct {
   PRInt32 version; /* protocol version valid for this cipher */
 } cipher_s;
 
-/* the table itself is defined in nss_engine_init.c */
 #ifdef NSS_ENABLE_ECC
 #define ciphernum 48
 #else
 #define ciphernum 23
 #endif
 
+#define PK11_SETATTRS(x,id,v,l) \
+	do { \
+		(x)->type = (id); \
+		(x)->pValue=(v); \
+		(x)->ulValueLen = (l); \
+	} while (0)
+
+#define CERT_NewTempCertificate __CERT_NewTempCertificate
+
 enum sslversion { SSL2 = 1, SSL3 = 2, TLS = 4 };
 
+pphrase_arg_t *parg = NULL;
+
 cipher_s cipherlist[ciphernum] = {
   /* SSL2 cipher suites */
   {"rc4", SSL_EN_RC4_128_WITH_MD5, SSL2},
@@ -154,6 +174,9 @@ cipher_s cipherlist[ciphernum] = {
 #endif
 };
 
+const char* pem_library = "libnsspem.so";
+static SECMODModule* mod = NULL;
+
 static SECStatus set_ciphers(struct SessionHandle *data, PRFileDesc * model,
                              char *cipher_list)
 {
@@ -197,9 +220,7 @@ static SECStatus set_ciphers(struct Sess
     }
 
     if(found == PR_FALSE) {
-      char buf[1024];
-      snprintf(buf, 1024, "Unknown cipher in list: %s", cipher);
-      failf(data, buf);
+      failf(data, "Unknown cipher in list: %s", cipher);
       return SECFailure;
     }
 
@@ -220,27 +241,240 @@ static SECStatus set_ciphers(struct Sess
   return SECSuccess;
 }
 
+/*
+ * Determine whether the nickname passed in is a filename that needs to
+ * be loaded as a PEM or a regular NSS nickname. 
+ *
+ * returns 1 for a file
+ * returns 0 for not a file (NSS nickname)
+ */
+static int is_file(const char *filename) {
+    struct stat st;
+
+    if (filename == NULL)
+      return 0;
+
+    if (stat(filename, &st) == 0) {
+      if (S_ISREG(st.st_mode))
+        return 1;
+    }
+    return 0;
+}
+
+static int
+nss_load_cert(struct SessionHandle *data, const char *filename, PRBool cacert)
+{
+  CERTCertificate *cert;
+  void *proto_win = NULL;
+  CK_SLOT_ID slotID;
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_BBOOL ckfalse = CK_FALSE;
+  CK_OBJECT_CLASS objClass = CKO_CERTIFICATE;
+  char *nickname = NULL;
+  char *slotname = NULL;
+  char *n;
+
+  /* If there is no slash in the filename it is assumed to be a regular
+   * NSS nickname.
+   */
+  if (is_file(filename)) {
+    n = strrchr(filename, '/');
+    if (n)
+      n++;
+  } else {
+    /* A nickname from the NSS internal database */
+    nickname = strdup(filename);
+    goto done;
+  }
+
+  attrs = theTemplate;
+
+  /* All CA and trust objects go into slot 0. Other slots are used
+   * for storing certificates. With each new user certificate we increment
+   * the slot count. We only support 1 user certificate right now.
+   */
+  if (cacert) {
+    slotID = 0;
+  } else {
+    slotID = 1;
+  } 
+  
+  slotname = (char *)malloc(SLOTSIZE);
+  nickname = (char *)malloc(PATH_MAX);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+  snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", slotID, n);
+
+  slot = PK11_FindSlotByName(slotname);
+  
+  if (!slot) {
+    free(slotname);
+    free(nickname);
+    return 0;
+  }
+  
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)filename, strlen(filename)+1); attrs++;
+  if (cacert) {
+    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  } else {
+    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) ); attrs++;
+  }
+
+  /* This load the certificate in our PEM module into the appropriate
+   * slot.
+   */
+  rv = PK11_CreateGenericObject(slot, theTemplate, 4, PR_FALSE /* isPerm */);
+
+  PK11_FreeSlot(slot);
+
+  free(slotname);
+  if (rv == NULL) {
+      free(nickname);
+      return 0;
+  }
+
+done:
+  /* Double-check that the certificate or nickname requested exists in
+   * either the token or the NSS certificate database.
+   */
+  if (!cacert) {
+    cert = PK11_FindCertFromNickname((char *)nickname, proto_win);
+
+    /* An invalid nickname was passed in */
+    if (cert == NULL) {
+      PR_SetError(SEC_ERROR_UNKNOWN_CERT, 0);
+      return 0;
+    }
+
+    CERT_DestroyCertificate(cert);
+  }
+  free(nickname);
+
+  return 1;
+}
+
+static int nss_load_key(char *key_file)
+{
+  PK11SlotInfo * slot = NULL;
+  PK11GenericObject *rv;
+  CK_ATTRIBUTE *attrs;
+  CK_ATTRIBUTE theTemplate[20];
+  CK_BBOOL cktrue = CK_TRUE;
+  CK_OBJECT_CLASS objClass = CKO_PRIVATE_KEY;
+  CK_SLOT_ID slotID;
+  char *slotname = NULL;
+
+  attrs = theTemplate;
+
+  /* FIXME: grok the various file types */
+
+  /* FIXME: shouldn't be hardcoded */
+  slotID = 1;
+
+  slotname = (char *)malloc(SLOTSIZE);
+  snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+
+  slot = PK11_FindSlotByName(slotname);
+  free(slotname);
+
+  if (!slot) {
+    return 0;
+  }
+
+  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;
+  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)key_file, 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) {
+    PR_SetError(SEC_ERROR_BAD_KEY, 0);
+    return 0;
+  }
+
+  /* This will force the token to be seen as re-inserted */
+  PK11_IsPresent(slot);
+
+  parg->retryCount = 0;
+  /* parg is initialized in nss_Init_Tokens() */
+  if (PK11_Authenticate(slot, PR_TRUE, parg) != SECSuccess) {
+    return 0;
+  }
+
+  return 1;
+}
+
+static int display_error(struct connectdata *conn, PRInt32 err, const char *filename) {
+  switch(err) {
+    case SEC_ERROR_BAD_PASSWORD:
+      failf(conn->data, "Unable to load client key: Incorrect password\n");
+      return 1;
+    case SEC_ERROR_UNKNOWN_CERT:
+      failf(conn->data, "Unable to load certificate %s\n", filename);
+      return 1;
+  }
+  return 0; /* The caller will print a generic error */
+}
+
+static int cert_stuff(struct connectdata *conn, char *cert_file, char *key_file)
+{
+  struct SessionHandle *data = conn->data;
+  int rv = 0;
+
+  if (cert_file)
+    rv = nss_load_cert(data, cert_file, PR_FALSE);  
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), cert_file))
+        failf(data, "Unable to load client cert %d.", PR_GetError());
+      return 0;
+    }
+  if (key_file || (is_file(cert_file) )) {
+    if (key_file)
+      rv = nss_load_key(key_file);
+    else
+      rv = nss_load_key(cert_file);
+    if (!rv) {
+      if (!display_error(conn, PR_GetError(), key_file))
+        failf(data, "Unable to load client key %d.", PR_GetError());
+
+      return 0;
+    }
+  }
+  return 1;
+}
+
 static char * nss_get_password(PK11SlotInfo * slot, PRBool retry, void *arg)
 {
   pphrase_arg_t *parg = (pphrase_arg_t *) arg;
-  (void)slot; /* unused */
-  (void)retry; /* unused */
+  parg->retryCount++;
+  if (parg->retryCount > 2)
+    return NULL;
   if(parg->data->set.key_passwd)
     return (char *)PORT_Strdup((char *)parg->data->set.key_passwd);
   else
     return NULL;
 }
 
-static SECStatus nss_Init_Tokens(struct connectdata * conn)
+static char * nss_no_password(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+   return NULL;
+}
+
+static SECStatus nss_Init_Tokens(struct SessionHandle *data)
 {
   PK11SlotList *slotList;
   PK11SlotListElement *listEntry;
   SECStatus ret, status = SECSuccess;
-  pphrase_arg_t *parg;
 
-  parg = (pphrase_arg_t *) malloc(sizeof(*parg));
+  if (!parg)
+      parg = (pphrase_arg_t *) malloc(sizeof(*parg));
   parg->retryCount = 0;
-  parg->data = conn->data;
+  parg->data = data;
 
   PK11_SetPasswordFunc(nss_get_password);
 
@@ -253,10 +487,10 @@ static SECStatus nss_Init_Tokens(struct 
 
     if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {
       if(slot == PK11_GetInternalKeySlot()) {
-        failf(conn->data, "The NSS database has not been initialized.\n");
+        failf(data, "The NSS database has not been initialized.\n");
       }
       else {
-        failf(conn->data, "The token %s has not been initialized.",
+        failf(data, "The token %s has not been initialized.",
               PK11_GetTokenName(slot));
       }
       PK11_FreeSlot(slot);
@@ -265,6 +499,8 @@ static SECStatus nss_Init_Tokens(struct 
 
     ret = PK11_Authenticate(slot, PR_TRUE, parg);
     if(SECSuccess != ret) {
+      if (PR_GetError() == SEC_ERROR_BAD_PASSWORD)
+        infof(data, "The password for token '%s' is incorrect\n", PK11_GetTokenName(slot));
       status = SECFailure;
       break;
     }
@@ -272,15 +508,59 @@ static SECStatus nss_Init_Tokens(struct 
     PK11_FreeSlot(slot);
   }
 
-  free(parg);
   return status;
 }
 
 static SECStatus BadCertHandler(void *arg, PRFileDesc * socket)
 {
   SECStatus success = SECSuccess;
-  (void)arg;
-  (void)socket;
+  struct connectdata *conn = (struct connectdata *)arg;
+  PRErrorCode err = PR_GetError();
+  CERTCertificate *cert = NULL;
+  char *subject, *issuer;
+
+  if (verify_done)
+      return success;
+
+  verify_done = 1;
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  CERT_DestroyCertificate(cert);
+
+  switch(err) {
+  case SEC_ERROR_CA_CERT_INVALID:
+    infof(conn->data, "Issuer certificate is invalid: '%s'\n", issuer);
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    break;
+  case SEC_ERROR_UNTRUSTED_ISSUER:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Certificate is signed by an untrusted issuer: '%s'\n", issuer);
+    break;
+  case SSL_ERROR_BAD_CERT_DOMAIN:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "common name: %s (does not match '%s')\n",
+          subject, conn->host.dispname);
+    break;
+  case SEC_ERROR_EXPIRED_CERTIFICATE:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Remote Certificate has expired.\n");
+    break;
+  default:
+    if (conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Bad certificate received. Subject = '%s', Issuer = '%s'\n", subject, issuer);
+    break;
+  }
+  if (success == SECSuccess)
+    infof(conn->data, "SSL certificate verify ok.\n");
+  PR_Free(subject);
+  PR_Free(issuer);
+  curlerr = CURLE_SSL_CACERT;
 
   return success;
 }
@@ -295,6 +575,52 @@ static SECStatus HandshakeCallback(PRFil
   return SECSuccess;
 }
 
+static void display_conn_info(struct connectdata *conn, PRFileDesc * socket)
+{
+  SSLChannelInfo channel;
+  SSLCipherSuiteInfo suite;
+  CERTCertificate *cert;
+  char *subject, *issuer, *common_name;
+  PRExplodedTime printableTime;
+  char timeString[256];
+  PRTime notBefore, notAfter;
+
+  if (SSL_GetChannelInfo(socket, &channel, sizeof channel) ==
+    SECSuccess && channel.length == sizeof channel &&
+    channel.cipherSuite) {
+    if (SSL_GetCipherSuiteInfo(channel.cipherSuite,
+      &suite, sizeof suite) == SECSuccess) {
+      infof(conn->data, "SSL connection using %s\n", suite.cipherSuiteName);
+    }
+  }
+
+  infof(conn->data, "Server certificate:\n");
+
+  cert = SSL_PeerCertificate(socket);
+  subject = CERT_NameToAscii(&cert->subject);
+  issuer = CERT_NameToAscii(&cert->issuer);
+  common_name = CERT_GetCommonName(&cert->subject);
+  infof(conn->data, "\tsubject: %s\n", subject);
+
+  CERT_GetCertTimes(cert, &notBefore, &notAfter);
+  PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\tstart date: %s\n", timeString);
+  PR_ExplodeTime(notAfter, PR_GMTParameters, &printableTime);
+  PR_FormatTime(timeString, 256, "%b %d %H:%M:%S %Y GMT", &printableTime);
+  infof(conn->data, "\texpire date: %s\n", timeString);
+  infof(conn->data, "\tcommon name: %s\n", common_name);
+  infof(conn->data, "\tissuer: %s\n", issuer);
+
+  PR_Free(subject);
+  PR_Free(issuer);
+  PR_Free(common_name);
+
+  CERT_DestroyCertificate(cert);
+
+  return;
+}
+
 /**
  *
  * Callback to pick the SSL client certificate.
@@ -309,24 +635,42 @@ static SECStatus SelectClientCert(void *
   char *nickname = (char *)arg;
   void *proto_win = NULL;
   SECStatus secStatus = SECFailure;
+  PK11SlotInfo *slot;
   (void)caNames;
 
   proto_win = SSL_RevealPinArg(socket);
 
+  if (!nickname)
+    return secStatus;
+
   cert = PK11_FindCertFromNickname(nickname, proto_win);
   if(cert) {
-    privKey = PK11_FindKeyByAnyCert(cert, proto_win);
-    if(privKey) {
-      secStatus = SECSuccess;
-    }
-    else {
-      CERT_DestroyCertificate(cert);
+
+    if (!strncmp(nickname, "PEM Token", 9)) {
+      CK_SLOT_ID slotID = 1; /* hardcoded for now */
+      char * slotname = (char *)malloc(SLOTSIZE);
+      snprintf(slotname, SLOTSIZE, "PEM Token #%ld", slotID);
+      slot = PK11_FindSlotByName(slotname);
+      privKey = PK11_FindPrivateKeyFromCert(slot, cert, NULL);
+      PK11_FreeSlot(slot);
+      free(slotname);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
+    } else {
+      privKey = PK11_FindKeyByAnyCert(cert, proto_win);
+      if(privKey) {
+        secStatus = SECSuccess;
+      }
     }
   }
 
   if(secStatus == SECSuccess) {
     *pRetCert = cert;
     *pRetKey = privKey;
+  } else {
+    if (cert)
+      CERT_DestroyCertificate(cert);
   }
 
   return secStatus;
@@ -397,6 +741,8 @@ void Curl_nss_close(struct connectdata *
     }
     connssl->use = FALSE; /* get back to ordinary socket usage */
   }
+  if (select_nickname)
+    free(select_nickname);
 }
 
 /*
@@ -418,31 +764,52 @@ CURLcode Curl_nss_connect(struct connect
   curl_socket_t sockfd = conn->sock[sockindex];
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   SECStatus rv;
-  int curlerr = CURLE_SSL_CONNECT_ERROR;
+  char *configstring = NULL;
+  char *certDir = NULL;
+
+  curlerr = CURLE_SSL_CONNECT_ERROR;
+  certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
+
+  if (!certDir) {
+    struct stat st;
+
+    if (stat(SSL_DIR, &st) == 0)
+      if (S_ISDIR(st.st_mode)) {
+        certDir = "/etc/pki/nssdb";
+      }
+  }
 
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   if(!initialized) {
-    if(!data->set.ssl.CAfile) {
-      if(data->set.ssl.verifypeer) {
-        failf(data, "No NSS cacert database specified.");
-        return CURLE_SSL_CACERT_BADFILE;
-      }
-      else {
-        rv = NSS_NoDB_Init(NULL);
-        noverify = 1;
-      }
+    if(!certDir) {
+      rv = NSS_NoDB_Init(NULL);
     }
     else {
-      rv = NSS_Initialize(data->set.ssl.CAfile, NULL, NULL, "secmod.db",
+      rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
                           NSS_INIT_READONLY);
     }
     if(rv != SECSuccess) {
       curlerr = CURLE_SSL_CACERT_BADFILE;
       goto error;
     }
-  }
+    configstring = (char *)malloc(4096);
+
+    NSS_SetDomesticPolicy();
 
-  NSS_SetDomesticPolicy();
+    PR_snprintf(configstring, 4096, "library=%s name=PEM", pem_library);
+//    PR_snprintf(configstring, 4096, "library=%s name=PEM parameters=\"NSS=\"trustorder=75\"\"", pem_library);
+//     PR_snprintf(configstring, 4096, "library=/usr/lib/libnsspem.so name=PEM parameters=\"/etc/pki/tls/certs/ca-bundle.crt\" NSS=\"trustorder=75\"");
+
+    mod = SECMOD_LoadUserModule(configstring, NULL, PR_FALSE);
+    if (!mod || !mod->loaded) {
+      if (mod) {
+        SECMOD_DestroyModule(mod);
+        mod = NULL;
+      }
+      infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL PEM certificates will not work.\n", pem_library);
+    }
+    free(configstring);
+  }
 
   model = PR_NewTCPSocket();
   if(!model)
@@ -482,26 +849,92 @@ CURLcode Curl_nss_connect(struct connect
     goto error;
 
   if(data->set.ssl.cipher_list) {
-    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess)
+    if(set_ciphers(data, model, data->set.ssl.cipher_list) != SECSuccess) {
+      curlerr = CURLE_SSL_CIPHER;
       goto error;
+    }
   }
 
-  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, NULL)
-     != SECSuccess)
+  if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
+     != SECSuccess) {
     goto error;
+  }
   if(SSL_HandshakeCallback(model, (SSLHandshakeCallback) HandshakeCallback,
                            NULL) != SECSuccess)
     goto error;
 
+  if (mod && data->set.ssl.CAfile) {
+    rv = nss_load_cert(data, data->set.ssl.CAfile, PR_TRUE);
+  } else if (data->set.ssl.CApath) {
+    struct stat st;
+    PRDir      *dir;
+    PRDirEntry *entry;
+
+    if (stat(data->set.ssl.CApath, &st) == -1)
+      curlerr = CURLE_SSL_CACERT_BADFILE;
+      goto error;
+
+    if (S_ISDIR(st.st_mode)) {
+      dir = PR_OpenDir(data->set.ssl.CApath);
+      int rv;
+      do {
+        entry = PR_ReadDir(dir, PR_SKIP_BOTH | PR_SKIP_HIDDEN);
+
+        if (entry) {
+          char fullpath[PATH_MAX];
+
+          snprintf(fullpath, sizeof(fullpath), "%s/%s", data->set.ssl.CApath, entry->name);
+          rv = nss_load_cert(data, fullpath, PR_TRUE);
+        }
+      /* This is purposefully tolerant of errors so non-PEM files
+       * can be in the same directory */
+      } while (entry != NULL);
+      PR_CloseDir(dir);
+    }
+  }
+  infof(data,
+        "  CAfile: %s\n"
+        "  CApath: %s\n",
+        data->set.ssl.CAfile ? data->set.ssl.CAfile : "none",
+        data->set.ssl.CApath ? data->set.ssl.CApath : "none");
+
   if(data->set.cert) {
+    char * n;
+    char * nickname;
+
+    nickname = (char *)malloc(PATH_MAX);
+    if (is_file(data->set.cert)) {
+      n = strrchr(data->set.cert, '/');
+      if (n) {
+          n++; /* skip last slash */
+          snprintf(nickname, PATH_MAX, "PEM Token #%ld:%s", 1, n);
+      }
+    } else {
+        strncpy(nickname, data->set.cert, PATH_MAX);
+    }
+    if(nss_Init_Tokens(conn->data) != SECSuccess) {
+      free(nickname);
+      goto error;
+    }
+    if (!cert_stuff(conn, data->set.cert, data->set.key)) {
+      /* failf() is already done in cert_stuff() */
+      free(nickname);
+      return CURLE_SSL_CERTPROBLEM;
+    }
+
+    select_nickname = strdup(nickname);
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)data->set.cert) != SECSuccess) {
+                                 (void *)select_nickname) != SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }
-    if(nss_Init_Tokens(conn) != SECSuccess)
-      goto error;
+
+    free(nickname);
+    free(parg);
+
+    /* No longer return the password, lets us free parg */
+    PK11_SetPasswordFunc(nss_no_password);
   }
 
   /* Import our model socket  onto the existing file descriptor */
@@ -509,6 +942,7 @@ CURLcode Curl_nss_connect(struct connect
   connssl->handle = SSL_ImportFD(model, connssl->handle);
   if(!connssl->handle)
     goto error;
+  PR_Close(model); /* We don't need this any more */
 
   /* Force handshake on next I/O */
   SSL_ResetHandshake(connssl->handle, /* asServer */ PR_FALSE);
@@ -518,14 +952,17 @@ CURLcode Curl_nss_connect(struct connect
   /* Force the handshake now */
   if (SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
-      != SECSuccess)
+      != SECSuccess) {
     goto error;
+  }
+
+  display_conn_info(conn, connssl->handle);
 
   return CURLE_OK;
 
 error:
   err = PR_GetError();
-  failf(data, "NSS error %d", err);
+  infof(data, "NSS error %d\n", err);
   if(model)
     PR_Close(model);
   return curlerr;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Apr 2007 18:20:54 -0000	1.24
+++ .cvsignore	12 Sep 2007 17:16:35 -0000	1.25
@@ -1,5 +1 @@
-curl-7.15.4.tar.bz2
-curl-7.15.5.tar.bz2
-curl-7.16.0.tar.bz2
-curl-7.16.1.tar.bz2
-curl-7.16.2.tar.bz2
+curl-7.16.4.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/curl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- curl.spec	11 May 2007 12:07:53 -0000	1.49
+++ curl.spec	12 Sep 2007 17:16:35 -0000	1.50
@@ -1,19 +1,22 @@
-%define ldap_version 2.3
+# get the current ldap library version to link against automatically
+%define ldap_version %(readlink %{_libdir}/libldap.so | sed 's,.*libldap-\\([0-9.]*\\)\\.so\\..*,\\1,')
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.2
-Release: 3%{?dist}
+Version: 7.16.4
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-Patch0: curl-7.14.1-nousr.patch
-Patch1: curl-7.15.0-curl_config-version.patch
-Patch2: curl-7.15.3-multilib.patch
-Patch3: curl-7.16.0-privlibs.patch
+Patch1: curl-7.15.3-multilib.patch
+Patch2: curl-7.16.0-privlibs.patch
+Patch3: curl-7.16.4-ftp.patch
+Patch4: curl-7.16.4-nsspem.patch
+Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: nss-devel >= 3.11.7-7
 
 %description
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -25,7 +28,7 @@
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: openssl-devel, libidn-devel, pkgconfig, automake
+Requires: libidn-devel, pkgconfig, automake
 Summary: Files needed for building applications with libcurl
 
 %description devel
@@ -36,31 +39,31 @@
 
 %prep
 %setup -q 
-%patch0 -p1 -b .nousr
-%patch1 -p1 -b .ver
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .privlibs
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .privlibs
+%patch3 -p1 -b .ftp
+%patch4 -p1 -b .nsspem
 
 %build
-aclocal
-libtoolize --force
-./reconf
-
-if pkg-config openssl ; then
-	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
-	LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
+if pkg-config nss ; then
+	CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
+	LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
 fi
-%configure --with-ssl=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
 	--with-lber-lib=liblber-%{ldap_version}.so.0 \
 	--disable-static
+sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
+	Makefile libcurl.pc
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
+
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
@@ -90,6 +93,7 @@
 %files devel
 %defattr(-,root,root)
 %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
+%doc docs/CONTRIBUTE
 %{_bindir}/curl-config*
 %{_includedir}/curl
 %{_libdir}/*.so
@@ -99,6 +103,45 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
+- provide webclient (#225671)
+
+* Thu Sep  6 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-5
+- add support for the NSS PKCS#11 pem reader so the command-line is the
+  same for both OpenSSL and NSS by Rob Crittenden (rcritten at redhat.com)
+- switch to NSS again
+
+* Mon Sep  3 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-4
+- revert back to use OpenSSL (#266021)
+
+* Mon Aug 27 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-3
+- don't use openssl, use nss instead
+
+* Fri Aug 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-2
+- fix anonymous ftp login (#251570), thanks to David Cantrell
+
+* Wed Jul 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-1
+- update to 7.16.4
+
+* Mon Jun 25 2007 Jindrich Novy <jnovy at redhat.com> 7.16.3-1
+- update to 7.16.3
+- drop .print patch, applied upstream
+- next series of merge review fixes by Paul Howarth
+- remove aclocal stuff, no more needed
+- simplify makefile arguments
+- don't reference standard library paths in libcurl.pc
+- include docs/CONTRIBUTE
+
+* Mon Jun 18 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-5
+- don't print like crazy (#236981), backported from upstream CVS
+
+* Fri Jun 15 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-4
+- another series of review fixes (#225671),
+  thanks to Paul Howarth
+- check version of ldap library automatically
+- don't use %%makeinstall and preserve timestamps
+- drop useless patches
+
 * Fri May 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-3
 - add automake BR to curl-devel to fix aclocal dir. ownership,
   thanks to Patrice Dumas


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/curl/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Apr 2007 18:20:54 -0000	1.25
+++ sources	12 Sep 2007 17:16:35 -0000	1.26
@@ -1,2 +1 @@
-acdab0b0467c55e10ed02d2afed80575  curl-7.16.1.tar.bz2
-37a1de15c4300ca9413d39d2bcea9b36  curl-7.16.2.tar.bz2
+ffa6d1f4e28ca493a43f9dc17882c4d8  curl-7.16.4.tar.bz2


--- curl-7.14.1-nousr.patch DELETED ---


--- curl-7.15.0-curl_config-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 17:17:27 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 12 Sep 2007 13:17:27 -0400
Subject: rpms/gdm/devel gdm-2.19.8-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.285, 1.286 gdm-2.19.6-change-defaults.patch, 1.3, NONE
Message-ID: <200709121717.l8CHHRkf011760@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11636

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.19.8-change-defaults.patch 
Removed Files:
	gdm-2.19.6-change-defaults.patch 
Log Message:
- Change default password character back to circle instead of
  asterisk (bug 287951)


gdm-2.19.8-change-defaults.patch:

--- NEW FILE gdm-2.19.8-change-defaults.patch ---
diff -up gdm-2.19.8/config/gdm.conf.in.change-defaults gdm-2.19.8/config/gdm.conf.in
--- gdm-2.19.8/config/gdm.conf.in.change-defaults	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/config/gdm.conf.in	2007-09-12 13:14:39.000000000 -0400
@@ -66,9 +66,9 @@ TimedLoginDelay=30
 # should leave this alone.
 #Chooser=@libexecdir@/gdmchooser
 
-# The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
-# to get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+# The greeter for attached (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@libexecdir@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,23 +78,23 @@ TimedLoginDelay=30
 # This is useful for enabling additional feature support e.g. GNOME
 # accessibility framework. Only "trusted" modules should be allowed to minimize
 # security holes
-#AddGtkModules=false
+AddGtkModules=true
 # By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
 # Default path for root.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # If you are having trouble with using a single server for a long time and want
 # GDM to kill/restart the server, turn this on.  On Solaris, this value is
 # always true and this configuration setting is ignored.
-#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@
+AlwaysRestartServer=true
 
 # User and group used for running GDM GUI applications.  By default this is set
 # to user "gdm" and group "gdm".  This user/group should have very limited
@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
 #
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-RebootCommand=@REBOOT_COMMAND@
-HaltCommand=@HALT_COMMAND@
-SuspendCommand=@SUSPEND_COMMAND@
+#
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
 
 # The following options specify how GDM system commands are supported.
 #
@@ -158,14 +158,14 @@ ServAuthDir=@authdir@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@gdmconfdir@/Xsession
+BaseXsession=/etc/X11/xinit/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
 # like /tmp if you don't want the authorizations to be in home directories.
@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession
 # is the home directory the UserAuthFBDir will still be used in case the home
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
 # behavior.
-UserAuthDir=
+UserAuthDir=/tmp
 # Fallback directory for writing authorization file if user's home directory
 # is not writable.
 UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
+#UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
-StandardXServer=@X_SERVER@
+StandardXServer=@X_SERVER@ -br
 # The maximum number of flexible X servers to run.
 #FlexibleXServers=5
 # And after how many minutes should we reap the flexible server if there is no
@@ -209,7 +209,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_
 #DoubleLoginWarning=true
 # Should a second login always resume the current session and switch VT's on
 # Linux and FreeBSD systems for console logins
-#AlwaysLoginCurrentSession=true
+AlwaysLoginCurrentSession=true
 
 # If true then the last login information is printed to the user before being
 # prompted for password.  While this gives away some info on what users are on
@@ -246,7 +246,7 @@ SecurityTokensDriver=
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
-AllowRoot=true
+AllowRoot=false
 # Allow login as root via XDMCP.  This value will be overridden and set to
 # false if the /etc/default/login file exists and contains
 # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
@@ -356,7 +356,7 @@ Enable=false
 #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
-#GtkTheme=Default
+GtkTheme=Clearlooks
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
 # this only affects the standard greeter as the graphical greeter does not yet
 # have this ability.
@@ -377,7 +377,7 @@ Enable=false
 # themed login (gdmgreeter).
 #
 # The standard login has a title bar that the user can move.
-#TitleBar=true
+TitleBar=false
 # Don't allow user to move the standard login window.  Only makes sense if
 # TitleBar is on.
 #LockPosition=false
@@ -395,13 +395,13 @@ Enable=false
 # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
 # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
 # greeter.
-Browser=false
+Browser=true
 # The default picture in the browser.
 #DefaultFace=@pixmapdir@/nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=500
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
 # by commas.
@@ -418,7 +418,7 @@ Browser=false
 # large numbers of users and this feature should not be used in such
 # environments.  The setting of IncludeAll does nothing if Include is set to a
 # non-empty value.
-#IncludeAll=false
+IncludeAll=true
 # If user or user.png exists in this dir it will be used as his picture.
 #GlobalFaceDir=@datadir@/pixmaps/faces/
 
@@ -427,7 +427,7 @@ Browser=false
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -474,8 +474,9 @@ DefaultRemoteWelcome=true
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
 # as the background color.
-BackgroundColor=#76848F
-GraphicalThemedColor=#76848F
+BackgroundColor=#20305a
+GraphicalThemedColor=#000000
+
 # XDMCP session should only get a color, this is the sanest setting since you
 # don't want to take up too much bandwidth
 #BackgroundRemoteOnlyColor=true
@@ -496,8 +497,8 @@ GraphicalThemedColor=#76848F
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
 # use this rather then just running an xterm from a script.
-#ShowGnomeFailsafeSession=true
-#ShowXtermFailsafeSession=true
+ShowGnomeFailsafeSession=false
+ShowXtermFailsafeSession=false
 # Normally there is a session type called 'Last' that is shown which refers to
 # the last session the user used.  If off, we will be in 'switchdesk' mode
 # where the session saving stuff is disabled in GDM
@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
 #Use24Clock=auto
 # Use circles in the password field.  Looks kind of cool actually, but only
 # works with certain fonts.
-#UseCirclesInEntry=false
+UseCirclesInEntry=true
 # Do not show any visible feedback in the password field. This is standard for
 # instance in console, xdm and ssh.
 #UseInvisibleInEntry=false
@@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
 # list then provide a list that is delimited by /: to the GraphicalThemes
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
+GraphicalTheme=FedoraFlyingHigh
 #GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
@@ -633,7 +634,7 @@ Gestures=false
 
 [server-Standard]
 name=Standard server
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
 flexible=true
 # Indicates that the X server should be started at a different process
 # priority.  Values can be any integer value accepted by the setpriority C


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- gdm.spec	7 Sep 2007 17:54:19 -0000	1.285
+++ gdm.spec	12 Sep 2007 17:16:53 -0000	1.286
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -55,7 +55,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.8-selinux.patch
 
-Patch100: gdm-2.19.6-change-defaults.patch
+Patch100: gdm-2.19.8-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -351,6 +351,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-4
+- Change default password character back to circle instead of
+  asterisk (bug 287951)
+
 * Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-3
 - rebuild --with-selinux
 


--- gdm-2.19.6-change-defaults.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 17:18:59 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 13:18:59 -0400
Subject: rpms/slingshot/devel slingshot, NONE, 1.1 slingshot-font-path.patch,
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709121718.l8CHIx6D011873@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/devel

Modified Files:
	.cvsignore sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 15:54:31 -0000	1.1
+++ .cvsignore	12 Sep 2007 17:18:26 -0000	1.2
@@ -0,0 +1 @@
+slingshot-0.8.1p.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	12 Sep 2007 17:18:26 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 17:22:36 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:22:36 -0700
Subject: [pkgdb] curl had groupAcl changed
Message-ID: <200709121722.l8CHMbqn024671@app3.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has set the commit acl on curl (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From fedora-extras-commits at redhat.com  Wed Sep 12 17:24:30 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 10:24:30 -0700
Subject: [pkgdb] curl (Fedora OLPC, 2) updated by jkeating
Message-ID: <200709121724.l8CHOUqu024716@app3.fedora.phx.redhat.com>

Jesse Keating (jkeating) added a Fedora OLPC 2 branch for curl
Jesse Keating (jkeating) has set commit to Approved for cvsextras on curl (Fedora OLPC 2)
Jesse Keating (jkeating) has set build to Approved for cvsextras on curl (Fedora OLPC 2)
Jesse Keating (jkeating) has set checkout to Approved for cvsextras on curl (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From fedora-extras-commits at redhat.com  Wed Sep 12 17:27:16 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 13:27:16 -0400
Subject: rpms/slingshot/F-7 slingshot, NONE, 1.1 slingshot-font-path.patch, 
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709121727.l8CHRGqM012275@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12229

Modified Files:
	sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	12 Sep 2007 17:26:44 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:21 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:28:21 -0700
Subject: [pkgdb] curl Orphaned
Message-ID: <200709121728.l8CHSLki024777@app3.fedora.phx.redhat.com>

Package curl in Fedora OLPC 2 was orphaned by Jindrich Novy (jnovy)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:37 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 10:28:37 -0700
Subject: [pkgdb] curl (Fedora OLPC, 2) updated by jkeating
Message-ID: <200709121728.l8CHSbYl000813@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of curl in Fedora OLPC 2 to johnp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From fedora-extras-commits at redhat.com  Wed Sep 12 17:28:49 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 12 Sep 2007 10:28:49 -0700
Subject: [pkgdb] curl had groupAcl changed
Message-ID: <200709121728.l8CHSnWa000819@app4.fedora.phx.redhat.com>

Jindrich Novy (jnovy) has set the commit acl on curl (Fedora devel) to Denied for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curl



From fedora-extras-commits at redhat.com  Wed Sep 12 17:48:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:48:15 -0700
Subject: [pkgdb] rlwrap (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121748.l8CHmGNE000982@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for rlwrap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rlwrap (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rlwrap (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rlwrap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rlwrap



From fedora-extras-commits at redhat.com  Wed Sep 12 17:48:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:48:15 -0700
Subject: [pkgdb] rlwrap (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121748.l8CHmGSL000991@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for rlwrap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rlwrap (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rlwrap (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rlwrap (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rlwrap



From fedora-extras-commits at redhat.com  Wed Sep 12 17:49:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:49:01 -0700
Subject: [pkgdb] gcin (Fedora EPEL, 4) updated by kevin
Message-ID: <200709121749.l8CHn1dk025152@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for gcin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gcin (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gcin (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gcin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gcin



From fedora-extras-commits at redhat.com  Wed Sep 12 17:49:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:49:01 -0700
Subject: [pkgdb] gcin (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121749.l8CHn1b2025161@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for gcin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gcin (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gcin (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gcin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gcin



From fedora-extras-commits at redhat.com  Wed Sep 12 17:50:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 10:50:07 -0700
Subject: [pkgdb] mach (Fedora EPEL, 5) updated by kevin
Message-ID: <200709121750.l8CHo7Id001016@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for mach
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mach (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of mach in Fedora EPEL 5 to scop
Kevin Fenzi (kevin) approved watchbugzilla on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved watchcommits on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved commit on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved build on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved approveacls on mach (Fedora EPEL 5) for thomasvs
Kevin Fenzi (kevin) approved checkout on mach (Fedora EPEL 5) for thomasvs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mach



From fedora-extras-commits at redhat.com  Wed Sep 12 17:53:19 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 12 Sep 2007 13:53:19 -0400
Subject: rpms/ltrace/devel .cvsignore, 1.8, 1.9 ltrace.spec, 1.60,
	1.61 sources, 1.8, 1.9
Message-ID: <200709121753.l8CHrJ1A014122@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/ltrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14073

Modified Files:
	.cvsignore ltrace.spec sources 
Log Message:
* Wed Sep 12 2007 Petr Machata <pmachata at redhat.com> - 0.5-9.45svn
- cleanup spec
- resolves: #226109



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jul 2006 12:02:36 -0000	1.8
+++ .cvsignore	12 Sep 2007 17:52:47 -0000	1.9
@@ -1 +1 @@
-ltrace-0.5.tar.gz
+ltrace-0.5-svn45.tar.gz


Index: ltrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ltrace.spec	16 Aug 2007 11:27:37 -0000	1.60
+++ ltrace.spec	12 Sep 2007 17:52:47 -0000	1.61
@@ -1,9 +1,19 @@
 Summary: Tracks runtime library calls from dynamically linked executables
 Name: ltrace
 Version: 0.5
-Release: 8.45svn%{?dist}
-URL: http://alioth.debian.org/projects/ltrace/
-Source: ltrace-0.5.tar.gz
+Release: 9.45svn%{?dist}
+URL: http://ltrace.alioth.debian.org/
+License: GPLv2+
+Group: Development/Debuggers
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: elfutils-libelf-devel dejagnu
+
+# Tarball generated from svn checkout.  To regenerate:
+# svn co svn://svn.debian.org/ltrace -r 45
+# cd ltrace/ltrace/trunk && ./autogen.sh && ./configure && make dist
+Source: ltrace-0.5-svn45.tar.gz
+
 Patch0: ltrace-0.4-exec.patch
 Patch1: ltrace-0.4-fork.patch
 Patch2: ltrace-0.5-opd.patch
@@ -18,11 +28,6 @@
 Patch11: ltrace-0.5-exec-tests.patch
 Patch12: ltrace-0.5-man.patch
 Patch13: ltrace-0.5-ia64-sigill.patch
-License: GPLv2+
-Group: Development/Debuggers
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: elfutils-libelf-devel dejagnu
 
 %description
 Ltrace is a debugging program which runs a specified command until the
@@ -53,13 +58,15 @@
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
+# This ugly hack is necessary to build and link files for correct
+# architecture.  It makes a difference on ppc.
 export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`"
-%configure CC="$CC" LDFLAGS="$LDFLAGS -Wl,-z,relro"
-make
+%configure CC="$CC"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{version}/ install
+make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} docdir=%{_docdir}/ltrace-%{version}/ install
 
 #%check
 #echo ====================TESTING=========================
@@ -72,11 +79,15 @@
 %files
 %defattr(-,root,root)
 %doc COPYING README TODO BUGS ChangeLog
-%{_prefix}/bin/ltrace
+%{_bindir}/ltrace
 %{_mandir}/man1/ltrace.1*
-%config(noreplace) /etc/ltrace.conf
+%config(noreplace) %{_sysconfdir}/ltrace.conf
 
 %changelog
+* Wed Sep 12 2007 Petr Machata <pmachata at redhat.com> - 0.5-9.45svn
+- cleanup spec
+- resolves: #226109
+
 * Thu Aug 16 2007 Petr Machata <pmachata at redhat.com> - 0.5-8.45svn
 - Fix licensing tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltrace/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2006 12:02:37 -0000	1.8
+++ sources	12 Sep 2007 17:52:47 -0000	1.9
@@ -1 +1 @@
-9b96a0056e9ba88a54e938973bf83025  ltrace-0.5.tar.gz
+9b96a0056e9ba88a54e938973bf83025  ltrace-0.5-svn45.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:04:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:04:20 -0400
Subject: rpms/mediawiki/devel .cvsignore, 1.12, 1.13 mediawiki.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200709121804.l8CI4Ks8020444@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20417

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.10.2-36
- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Aug 2007 12:33:16 -0000	1.12
+++ .cvsignore	12 Sep 2007 18:03:47 -0000	1.13
@@ -1,2 +1,2 @@
-mediawiki-1.10.0.tar.gz
 mediawiki-1.9.1-commoncode.patch
+mediawiki-1.10.2.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mediawiki.spec	6 Aug 2007 13:22:13 -0000	1.17
+++ mediawiki.spec	12 Sep 2007 18:03:47 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.10.0
-Release: 35.0.1%{?dist}
+Version: 1.10.2
+Release: 36%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.mediawiki.org/
@@ -88,8 +88,11 @@
 /var/www/wiki/config/*
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.10.2-36
+- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Wed May  9 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.0-35
-- Update to 1.0.
+- Update to 1.10.0.
 
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34
 - Update to 1.9.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Aug 2007 12:33:16 -0000	1.12
+++ sources	12 Sep 2007 18:03:47 -0000	1.13
@@ -1,2 +1,2 @@
-78733fece881e7d3c2c1e6859493ed06  mediawiki-1.10.0.tar.gz
 d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
+f1a5659624444c7101f258c7d43b03a0  mediawiki-1.10.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:09:45 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Wed, 12 Sep 2007 11:09:45 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by toshio
Message-ID: <200709121809.l8CI9joG001254@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved watchcommits on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved commit on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved build on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved approveacls on xulrunner (Fedora devel) for stransky
Toshio Ernie Kuratomi (toshio) approved checkout on xulrunner (Fedora devel) for stransky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xulrunner



From fedora-extras-commits at redhat.com  Wed Sep 12 18:11:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:11:25 -0400
Subject: rpms/mediawiki/F-7 .cvsignore, 1.11, 1.12 mediawiki.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200709121811.l8CIBPsY021372@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.9.4-35
- Update to 1.9.4 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Feb 2007 17:38:18 -0000	1.11
+++ .cvsignore	12 Sep 2007 18:10:52 -0000	1.12
@@ -1,2 +1,2 @@
-mediawiki-1.9.3.tar.gz
 mediawiki-1.9.1-commoncode.patch
+mediawiki-1.9.4.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/mediawiki.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mediawiki.spec	6 Aug 2007 13:22:11 -0000	1.17
+++ mediawiki.spec	12 Sep 2007 18:10:52 -0000	1.18
@@ -1,11 +1,11 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.9.3
-Release: 34.0.2%{?dist}
+Version: 1.9.4
+Release: 35%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://wikipedia.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/wikipedia/%{name}-%{version}.tar.gz
+Source0: http://download.wikimedia.org/mediawiki/1.9/%{name}-%{version}.tar.gz
 Patch0: mediawiki-1.9.1-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ocaml >= 3.06
@@ -88,11 +88,14 @@
 /var/www/wiki/config/*
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.9.4-35
+- Update to 1.9.4 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Mon Aug  6 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34.0.1
 - Bump release to please koji/CVS.
 
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.3-34
-- Update to 1.9.4.
+- Update to 1.9.3.
 
 * Mon Feb  5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.9.2-33
 - Update to 1.9.2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Feb 2007 17:38:18 -0000	1.11
+++ sources	12 Sep 2007 18:10:52 -0000	1.12
@@ -1,2 +1,2 @@
-3b522510b3a80212ba8dcdc51c938128  mediawiki-1.9.3.tar.gz
 d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
+e97a74e17fe2f067b7c3fc040e1eddee  mediawiki-1.9.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:12:51 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Wed, 12 Sep 2007 11:12:51 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by toshio
Message-ID: <200709121812.l8CICp8x001287@app4.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of xulrunner in Fedora devel to caillon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xulrunner



From fedora-extras-commits at redhat.com  Wed Sep 12 18:21:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:21:51 -0400
Subject: rpms/mediawiki/FC-6 .cvsignore, 1.8, 1.9 mediawiki.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200709121821.l8CILpOn023244@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23092

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.8.5-9
- Update to 1.8.5 (security; http://secunia.com/advisories/26772/, #287881)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Feb 2007 12:24:32 -0000	1.8
+++ .cvsignore	12 Sep 2007 18:21:18 -0000	1.9
@@ -1 +1 @@
-mediawiki-1.8.4.tar.gz
+mediawiki-1.8.5.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mediawiki.spec	22 Feb 2007 12:24:32 -0000	1.13
+++ mediawiki.spec	12 Sep 2007 18:21:18 -0000	1.14
@@ -1,14 +1,14 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name: mediawiki
-Version: 1.8.4
-Release: 8%{?dist}
+Version: 1.8.5
+Release: 9%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
 License: GPL
 URL: http://www.mediawiki.org/
-Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz
+Source0: http://download.wikimedia.org/mediawiki/1.8/mediawiki-%{version}.tar.gz
 Source1: mediawiki-httpd.conf
 Source2: mediawiki-install.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.8.5-9
+- Update to 1.8.5 (security; http://secunia.com/advisories/26772/, #287881)
+
 * Thu Feb 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8.4-8
 - Update to 1.8.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediawiki/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Feb 2007 12:24:32 -0000	1.9
+++ sources	12 Sep 2007 18:21:18 -0000	1.10
@@ -1 +1 @@
-deda96c093bc0f16df5ded6228e6275a  mediawiki-1.8.4.tar.gz
+8521cad53aa4dbda59bfd7ef1cba2553  mediawiki-1.8.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 18:24:11 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 12 Sep 2007 14:24:11 -0400
Subject: fedora-security/audit fc7,1.98,1.99
Message-ID: <200709121824.l8CIOBi2023876@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23837/audit

Modified Files:
	fc7 
Log Message:
mediawiki cve name



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc7	12 Sep 2007 16:17:07 -0000	1.98
+++ fc7	12 Sep 2007 18:24:08 -0000	1.99
@@ -8,7 +8,7 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
-GENERIC-MAP-NOMATCH VULNERABLE (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Wed Sep 12 18:36:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 14:36:23 -0400
Subject: rpms/kernel/devel linux-2.6-acpi-git-ec-init-fixes.patch, NONE,
	1.1 linux-2.6-drivers-ssb-debug-revision.patch, NONE,
	1.1 kernel.spec, 1.158, 1.159
Message-ID: <200709121836.l8CIaNVV025565@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25503

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-git-ec-init-fixes.patch 
	linux-2.6-drivers-ssb-debug-revision.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- better debug message for SSB driver
- acpi: fix EC initialization (from linux-acpi.git)


linux-2.6-acpi-git-ec-init-fixes.patch:

--- NEW FILE linux-2.6-acpi-git-ec-init-fixes.patch ---
From: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Wed, 5 Sep 2007 23:56:38 +0000 (-0400)
Subject: ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one.
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=4c611060660f0de3e9b8f02df207312bc6f5c331

ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one.

ASUS notebooks have numerous problems with EC initialization
This patch tries to work around three known issues reported
in bugzilla 8598, 8709 and 8909/8919.

Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3f7935a..9cd7997 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -121,6 +121,7 @@ static struct acpi_ec {
 	atomic_t event_count;
 	wait_queue_head_t wait;
 	struct list_head list;
+	u8 handlers_installed;
 } *boot_ec, *first_ec;
 
 /* --------------------------------------------------------------------------
@@ -680,32 +681,50 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 	status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
 	if (ACPI_FAILURE(status))
 		return status;
-
 	/* Find and register all query methods */
 	acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
 			    acpi_ec_register_query_methods, ec, NULL);
-
 	/* Use the global lock for all EC transactions? */
 	acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
-
 	ec->handle = handle;
-
-	printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
-			  ec->gpe, ec->command_addr, ec->data_addr);
-
 	return AE_CTRL_TERMINATE;
 }
 
+static void ec_remove_handlers(struct acpi_ec *ec)
+{
+	if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
+				ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
+		printk(KERN_ERR PREFIX "failed to remove space handler\n");
+	if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
+				&acpi_ec_gpe_handler)))
+		printk(KERN_ERR PREFIX "failed to remove gpe handler\n");
+	ec->handlers_installed = 0;
+}
+
 static int acpi_ec_add(struct acpi_device *device)
 {
 	struct acpi_ec *ec = NULL;
 
 	if (!device)
 		return -EINVAL;
-
 	strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
+	/* Check for boot EC */
+	if (boot_ec) {
+		if (boot_ec->handle == device->handle) {
+			/* Pre-loaded EC from DSDT, just move pointer */
+			ec = boot_ec;
+			boot_ec = NULL;
+			goto end;
+		} else if (boot_ec->handle == ACPI_ROOT_OBJECT) {
+			/* ECDT-based EC, time to shut it down */
+			ec_remove_handlers(boot_ec);
+			kfree(boot_ec);
+			first_ec = boot_ec = NULL;
+		}
+	}
+
 	ec = make_acpi_ec();
 	if (!ec)
 		return -ENOMEM;
@@ -715,25 +734,14 @@ static int acpi_ec_add(struct acpi_device *device)
 		kfree(ec);
 		return -EINVAL;
 	}
-
-	/* Check if we found the boot EC */
-	if (boot_ec) {
-		if (boot_ec->gpe == ec->gpe) {
-			/* We might have incorrect info for GL at boot time */
-			mutex_lock(&boot_ec->lock);
-			boot_ec->global_lock = ec->global_lock;
-			/* Copy handlers from new ec into boot ec */
-			list_splice(&ec->list, &boot_ec->list);
-			mutex_unlock(&boot_ec->lock);
-			kfree(ec);
-			ec = boot_ec;
-		}
-	} else
-		first_ec = ec;
 	ec->handle = device->handle;
+      end:
+	if (!first_ec)
+		first_ec = ec;
 	acpi_driver_data(device) = ec;
-
 	acpi_ec_add_fs(device);
+	printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
+			  ec->gpe, ec->command_addr, ec->data_addr);
 	return 0;
 }
 
@@ -756,10 +764,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
 	acpi_driver_data(device) = NULL;
 	if (ec == first_ec)
 		first_ec = NULL;
-
-	/* Don't touch boot EC */
-	if (boot_ec != ec)
-		kfree(ec);
+	kfree(ec);
 	return 0;
 }
 
@@ -789,6 +794,8 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
 static int ec_install_handlers(struct acpi_ec *ec)
 {
 	acpi_status status;
+	if (ec->handlers_installed)
+		return 0;
 	status = acpi_install_gpe_handler(NULL, ec->gpe,
 					  ACPI_GPE_EDGE_TRIGGERED,
 					  &acpi_ec_gpe_handler, ec);
@@ -807,6 +814,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
 		return -ENODEV;
 	}
 
+	ec->handlers_installed = 1;
 	return 0;
 }
 
@@ -823,41 +831,22 @@ static int acpi_ec_start(struct acpi_device *device)
 	if (!ec)
 		return -EINVAL;
 
-	/* Boot EC is already working */
-	if (ec != boot_ec)
-		ret = ec_install_handlers(ec);
+	ret = ec_install_handlers(ec);
 
 	/* EC is fully operational, allow queries */
 	atomic_set(&ec->query_pending, 0);
-
 	return ret;
 }
 
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
-	acpi_status status;
 	struct acpi_ec *ec;
-
 	if (!device)
 		return -EINVAL;
-
 	ec = acpi_driver_data(device);
 	if (!ec)
 		return -EINVAL;
-
-	/* Don't touch boot EC */
-	if (ec == boot_ec)
-		return 0;
-
-	status = acpi_remove_address_space_handler(ec->handle,
-						   ACPI_ADR_SPACE_EC,
-						   &acpi_ec_space_handler);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
-
-	status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
+	ec_remove_handlers(ec);
 
 	return 0;
 }
@@ -877,7 +866,7 @@ int __init acpi_ec_ecdt_probe(void)
 	status = acpi_get_table(ACPI_SIG_ECDT, 1,
 				(struct acpi_table_header **)&ecdt_ptr);
 	if (ACPI_SUCCESS(status)) {
-		printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n\n");
+		printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
 		boot_ec->command_addr = ecdt_ptr->control.address;
 		boot_ec->data_addr = ecdt_ptr->data.address;
 		boot_ec->gpe = ecdt_ptr->gpe;
@@ -899,7 +888,6 @@ int __init acpi_ec_ecdt_probe(void)
       error:
 	kfree(boot_ec);
 	boot_ec = NULL;
-
 	return -ENODEV;
 }
 

linux-2.6-drivers-ssb-debug-revision.patch:

--- NEW FILE linux-2.6-drivers-ssb-debug-revision.patch ---
---
 drivers/ssb/main.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ssb/main.c
+++ linux-2.6.22.noarch/drivers/ssb/main.c
@@ -884,6 +884,8 @@ static u32 ssb_tmslow_reject_bitmask(str
 	case SSB_IDLOW_SSBREV_23:
 		return SSB_TMSLOW_REJECT_23;
 	default:
+		printk(KERN_ERR "ssb: rev %x\n", 
+		       ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV);
 		WARN_ON(1);
 	}
 	return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kernel.spec	12 Sep 2007 00:16:26 -0000	1.158
+++ kernel.spec	12 Sep 2007 18:35:50 -0000	1.159
@@ -632,6 +632,7 @@
 Patch690: git-wireless-dev.patch
 Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
+Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
 Patch711: linux-2.6-netdev-e1000e-02.patch
 Patch712: linux-2.6-netdev-e1000e-03.patch
@@ -643,6 +644,7 @@
 Patch718: linux-2.6-netdev-e1000e-09.patch
 Patch719: linux-2.6-netdev-e1000e-10.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
+Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
@@ -1138,6 +1140,9 @@
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 
+# debug the SSB driver
+ApplyPatch linux-2.6-drivers-ssb-debug-revision.patch
+
 # latest Intel driver for ich9
 ApplyPatch linux-2.6-netdev-e1000e-01.patch
 ApplyPatch linux-2.6-netdev-e1000e-02.patch
@@ -1151,6 +1156,8 @@
 ApplyPatch linux-2.6-netdev-e1000e-10.patch
 
 # ACPI patches
+# fix EC init
+ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -1796,6 +1803,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- better debug message for SSB driver
+- acpi: fix EC initialization (from linux-acpi.git)
+
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#248532, #267161, #284311)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:49 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:49 -0400
Subject: rpms/mksh/EL-4 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbnQf025776@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/EL-4

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:15:57 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:16 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:15:57 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:16 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:15:57 -0000	1.6
+++ sources	12 Sep 2007 18:37:16 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:52 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:52 -0400
Subject: rpms/mksh/EL-5 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbq4w025783@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/EL-5

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:15:03 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:19 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:15:03 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:19 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:15:03 -0000	1.6
+++ sources	12 Sep 2007 18:37:19 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:54 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:54 -0400
Subject: rpms/mksh/F-7 .cvsignore,1.6,1.7 mksh.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <200709121837.l8CIbsnn025792@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/F-7

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:12:41 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:22 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:12:41 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:22 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:12:41 -0000	1.6
+++ sources	12 Sep 2007 18:37:22 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:37:57 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:37:57 -0400
Subject: rpms/mksh/FC-6 .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources, 1.6,
	1.7
Message-ID: <200709121837.l8CIbv2k025799@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/FC-6

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:13:49 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:25 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:13:49 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:25 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:13:49 -0000	1.6
+++ sources	12 Sep 2007 18:37:25 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:38:00 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 12 Sep 2007 14:38:00 -0400
Subject: rpms/mksh/devel .cvsignore, 1.6, 1.7 mksh.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200709121838.l8CIc0jO025806@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/devel

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
- Upgrade to 31c
- Added a buildrequirement to ed, added arc4random.c file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 18:11:32 -0000	1.6
+++ .cvsignore	12 Sep 2007 18:37:27 -0000	1.7
@@ -1 +1,2 @@
-mksh-R31b.cpio.gz
+mksh-R31c.cpio.gz
+arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mksh.spec	11 Sep 2007 18:11:32 -0000	1.7
+++ mksh.spec	12 Sep 2007 18:37:27 -0000	1.8
@@ -2,15 +2,16 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          31b
+Version:          31c
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
-Source:           http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz
+Source1:          http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
 Requires(post):   grep
 Requires(postun): coreutils, grep
-BuildRequires:    util-linux
+BuildRequires:    util-linux, ed
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,6 +27,7 @@
 # RPM 4.4.2 has no support for *.cpio.gz
 gzip -dc %{SOURCE0} | cpio -imd
 mv %{name}/* . && rm -rf %{name}
+cp -f %{SOURCE1} .
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" sh Build.sh -r -Q
@@ -62,6 +64,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Sep 12 2007 Robert Scheck <robert at fedoraproject.org> 31c-1
+- Upgrade to 31c
+- Added a buildrequirement to ed, added arc4random.c file
+
 * Tue Sep 11 2007 Robert Scheck <robert at fedoraproject.org> 31b-1
 - Upgrade to 31b
 - Use script to get %%check happy (thanks to Thorsten Glaser)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 18:11:32 -0000	1.6
+++ sources	12 Sep 2007 18:37:27 -0000	1.7
@@ -1 +1,2 @@
-819feed2336274f939c67547c5a3ddbd  mksh-R31b.cpio.gz
+08b6354ad94b9c5d5bfc301e3314e412  mksh-R31c.cpio.gz
+4c61767ff91253869cff5f7b366d54af  arc4random.c



From fedora-extras-commits at redhat.com  Wed Sep 12 18:43:48 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:43:48 -0400
Subject: rpms/mach/devel mach.spec,1.15,1.16
Message-ID: <200709121843.l8CIhmrr026580@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26458

Modified Files:
	mach.spec 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
- Set default flavour to "epel" for EPEL builds.



Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/devel/mach.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mach.spec	8 Sep 2007 21:48:26 -0000	1.15
+++ mach.spec	12 Sep 2007 18:43:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mach
 Version:        0.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Make a chroot
 
 Group:          Applications/System
@@ -22,6 +22,13 @@
 BuildRequires:	gcc-c++
 BuildRequires:	libselinux-devel
 
+%if 0%{!?flavor:1}
+%if 0%{?rhel}
+%define flavor epel
+%else
+%define flavor updates
+%endif
+%endif
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
@@ -44,7 +51,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=updates
+	--with-flavor=%{flavor}
 make
 
 %install
@@ -96,6 +103,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
+- Set default flavour to "epel" for EPEL builds.
+
 * Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
 - Drop no longer needed (and failing) old ppc config bug workarounds.
 - Sync group creation scriptlet with current Fedora packaging guidelines.



From fedora-extras-commits at redhat.com  Wed Sep 12 18:45:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 14:45:35 -0400
Subject: rpms/mach/EL-5 .cvsignore, 1.4, 1.5 mach.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <200709121845.l8CIjZIg026811@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26712

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
Sync with devel for first EPEL build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2006 14:08:26 -0000	1.4
+++ .cvsignore	12 Sep 2007 18:45:03 -0000	1.5
@@ -1 +1 @@
-mach-0.9.0.tar.bz2
+mach-0.9.2.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/mach.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mach.spec	7 Jan 2007 21:52:52 -0000	1.11
+++ mach.spec	12 Sep 2007 18:45:03 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           mach
-Version:        0.9.1
-Release:        1%{?dist}
-Summary:        make a chroot
+Version:        0.9.2
+Release:        3%{?dist}
+Summary:        Make a chroot
 
 Group:          Applications/System
-License:	GPL
+License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,6 +22,13 @@
 BuildRequires:	gcc-c++
 BuildRequires:	libselinux-devel
 
+%if 0%{!?flavor:1}
+%if 0%{?rhel}
+%define flavor epel
+%else
+%define flavor updates
+%endif
+%endif
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
@@ -44,7 +51,7 @@
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=extras
+	--with-flavor=%{flavor}
 make
 
 %install
@@ -62,7 +69,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mach >/dev/null 2>&1 || :
+getent group mach >/dev/null || groupadd -r mach || :
 
 %preun
 if [ "$1" == 0 ];
@@ -96,6 +103,25 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
+- Set default flavour to "epel" for EPEL builds.
+
+* Sun Sep  9 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-2
+- Drop no longer needed (and failing) old ppc config bug workarounds.
+- Sync group creation scriptlet with current Fedora packaging guidelines.
+- Set default config to the "updates" flavour.
+
+* Sat Sep 08 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new release
+
+* Thu Aug 16 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.1-3
+- License: GPLv2+
+
+* Wed Jan 24 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.1-2
+- add ppc files
+
 * Sun Jan 07 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-1
 - new release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 21:52:52 -0000	1.6
+++ sources	12 Sep 2007 18:45:03 -0000	1.7
@@ -1 +1 @@
-9e9a01f35ee343ac4b8327d9c3b213e8  mach-0.9.1.tar.bz2
+4e8aa40b2c44e7565b4fd665741fb95e  mach-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 12 18:46:15 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 12 Sep 2007 14:46:15 -0400
Subject: rpms/rarian/devel .cvsignore, 1.3, 1.4 rarian.spec, 1.8, 1.9 sources,
	1.3, 1.4 rarian-0.5.8-omfdir.patch, 1.1, NONE
Message-ID: <200709121846.l8CIkFma026945@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26817

Modified Files:
	.cvsignore rarian.spec sources 
Removed Files:
	rarian-0.5.8-omfdir.patch 
Log Message:

* Wed Sep 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-1
- Update to 0.6.0
- Remove patch for RH bug #254301 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Aug 2007 01:09:43 -0000	1.3
+++ .cvsignore	12 Sep 2007 18:45:42 -0000	1.4
@@ -1 +1 @@
-rarian-0.5.8.tar.bz2
+rarian-0.6.0.tar.bz2


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/rarian.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rarian.spec	30 Aug 2007 16:05:10 -0000	1.8
+++ rarian.spec	12 Sep 2007 18:45:42 -0000	1.9
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: rarian
-Version: 0.5.8
-Release: 3%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -10,11 +10,6 @@
 Source: http://ftp.gnome.org/pub/gnome/sources/rarian/0.5/rarian-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-### Patches ###
-
-# RH bug #254301
-Patch0: rarian-0.5.8-omfdir.patch
-
 ### Dependencies ###
 
 Requires: libxslt
@@ -57,7 +52,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .omfdir
 
 %build
 
@@ -101,6 +95,10 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Wed Sep 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-1
+- Update to 0.6.0
+- Remove patch for RH bug #254301 (fixed upstream).
+
 * Thu Aug 30 2007 Matthew Barnes <mbarnes at redhat.com> - 0.5.8-3
 - Add patch for RH bug #254301 (rarian-sk-config --omfdir).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Aug 2007 01:09:43 -0000	1.3
+++ sources	12 Sep 2007 18:45:42 -0000	1.4
@@ -1 +1 @@
-9afee4d25a10bd5310ee21e23a09d659  rarian-0.5.8.tar.bz2
+23772a3b0f882d13c86dd9fa67bb21bf  rarian-0.6.0.tar.bz2


--- rarian-0.5.8-omfdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 18:51:16 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 14:51:16 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.682, 1.683 kernel.spec, 1.159, 1.160 sources, 1.644,
	1.645 upstream, 1.566,
	1.567 linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 1.1, NONE
Message-ID: <200709121851.l8CIpG6A027661@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27546

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git1.bz2.sign 
Removed Files:
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git1



--- NEW FILE patch-2.6.23-rc6-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG549lyGugalF9Dw4RAmgyAJ9B4rsD4wngExP3q83SNgtpgVyQKwCfVI43
LUpC7rrh2Aya/8OACgxyaMA=
=sl7J
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- .cvsignore	11 Sep 2007 17:20:35 -0000	1.682
+++ .cvsignore	12 Sep 2007 18:50:43 -0000	1.683
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
+patch-2.6.23-rc6-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kernel.spec	12 Sep 2007 18:35:50 -0000	1.159
+++ kernel.spec	12 Sep 2007 18:50:43 -0000	1.160
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -670,7 +670,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1525: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
@@ -1206,9 +1205,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# fix oops in with sunrpc
-ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
-
 # fix x86_64 clock warping
 ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
@@ -1804,6 +1800,9 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git1
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - better debug message for SSB driver
 - acpi: fix EC initialization (from linux-acpi.git)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -r1.644 -r1.645
--- sources	11 Sep 2007 17:20:35 -0000	1.644
+++ sources	12 Sep 2007 18:50:43 -0000	1.645
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
+e989205bedc5a83a1d45c25f79adcb01  patch-2.6.23-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- upstream	11 Sep 2007 17:20:35 -0000	1.566
+++ upstream	12 Sep 2007 18:50:43 -0000	1.567
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
+patch-2.6.23-rc6-git1.bz2


--- linux-2.6-skb_copy_and_csum_datagram_iovec.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 19:09:36 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 15:09:36 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.19,1.20
Message-ID: <200709121909.l8CJ9ad0002709@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2615

Modified Files:
	gnash.spec 
Log Message:
- only enable gtk gui and disable opengl



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnash.spec	11 Sep 2007 18:21:35 -0000	1.19
+++ gnash.spec	12 Sep 2007 19:09:02 -0000	1.20
@@ -50,7 +50,7 @@
   --enable-sound=GST --enable-renderer=agg \
   --disable-dependency-tracking --disable-rpath \
   --with-extentions=gtk2 --disable-klash \
-  --enable-media=GST
+  --enable-media=GST --enable-gui="gtk"  --disable-glext
 
 make 
 



From fedora-extras-commits at redhat.com  Wed Sep 12 19:19:15 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Wed, 12 Sep 2007 15:19:15 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.8,1.9
Message-ID: <200709121919.l8CJJFj0003297@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3263

Modified Files:
	online-desktop.spec 
Log Message:
new upstream


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- online-desktop.spec	11 Sep 2007 21:33:22 -0000	1.8
+++ online-desktop.spec	12 Sep 2007 19:18:42 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.12
-Release:        2%{?dist}
+Version:        0.2.13
+Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
@@ -180,6 +180,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
 - require devilspie
 



From fedora-extras-commits at redhat.com  Wed Sep 12 19:19:48 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 12 Sep 2007 15:19:48 -0400
Subject: rpms/ufsparse/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE sources, 1.9, NONE ufsparse.spec, 1.16, NONE
Message-ID: <200709121919.l8CJJmGg003360@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3349

Added Files:
	dead.package 
Removed Files:
	Makefile sources ufsparse.spec 
Log Message:
Making this a dead package.



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- sources DELETED ---


--- ufsparse.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 19:20:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Sep 2007 15:20:45 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.41,1.42
Message-ID: <200709121920.l8CJKjpL003410@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3385

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.5-76.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- em8300-kmod.spec	24 Aug 2007 06:20:35 -0000	1.41
+++ em8300-kmod.spec	12 Sep 2007 19:20:13 -0000	1.42
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-65.fc7}
+%{!?kversion: %define kversion 2.6.22.5-76.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.5-76.fc7.
+
 * Fri Aug 24 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-2
 - 0.16.3.
 - Build for kernel 2.6.22.4-65.fc7.



From fedora-extras-commits at redhat.com  Wed Sep 12 19:30:00 2007
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 12 Sep 2007 15:30:00 -0400
Subject: rpms/enigma/devel .cvsignore, 1.6, 1.7 enigma.spec, 1.18,
	1.19 sources, 1.6, 1.7
Message-ID: <200709121930.l8CJU0gB003642@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3620

Modified Files:
	.cvsignore enigma.spec sources 
Log Message:
* Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
- use the newly 64bit-clean upstream tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 May 2007 11:12:13 -0000	1.6
+++ .cvsignore	12 Sep 2007 19:29:27 -0000	1.7
@@ -1 +1 @@
-enigma-1.01.tar.gz
+enigma-1.01-64bit.tar.gz


Index: enigma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- enigma.spec	21 Aug 2007 16:13:42 -0000	1.18
+++ enigma.spec	12 Sep 2007 19:29:27 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           enigma
 Version:        1.01
-Release:        2.1
+Release:        3.1
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.nongnu.org/enigma/
-Source0:        http://download.berlios.de/enigma-game/enigma-1.01.tar.gz
+Source0:        http://download.berlios.de/enigma-game/enigma-1.01-64bit.tar.gz
 Patch0:         enigma-1.01-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +76,9 @@
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
+- use the newly 64bit-clean upstream tarball
+
 * Tue Aug 21 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-2.1
 - Remove version key from desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 May 2007 11:12:13 -0000	1.6
+++ sources	12 Sep 2007 19:29:27 -0000	1.7
@@ -1 +1 @@
-d3804534ac03425051ebfd383ed1b4ee  enigma-1.01.tar.gz
+d58af8a7201601dabc45dcedae5e2e91  enigma-1.01-64bit.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 19:50:57 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 15:50:57 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.20,1.21
Message-ID: <200709121950.l8CJovRZ004188@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4159

Modified Files:
	gnash.spec 
Log Message:
- rm -f the la files so we don';t get an error if they don't exist



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnash.spec	12 Sep 2007 19:09:02 -0000	1.20
+++ gnash.spec	12 Sep 2007 19:50:24 -0000	1.21
@@ -58,7 +58,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f \
  $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
  $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \



From fedora-extras-commits at redhat.com  Wed Sep 12 19:53:16 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 15:53:16 -0400
Subject: devel/pirut .cvsignore, 1.68, 1.69 pirut.spec, 1.71, 1.72 sources, 
	1.70, 1.71
Message-ID: <200709121953.l8CJrG7K004379@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
- Add multiple selection in package view (#266141)
- Make things like rpmnew/rpmsave more obvious to the user rather 
  than hidden (#229671)
- Use yum's transaction callback mechanism
- Show details on package list (#227362)
- Follow icon naming standard (#208698)
- Improve display of what's being downloaded with progress bar (#284301)
- Fix applying updates from puplet (#268141)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	7 Sep 2007 18:28:59 -0000	1.68
+++ .cvsignore	12 Sep 2007 19:52:44 -0000	1.69
@@ -1 +1 @@
-pirut-1.3.17.tar.gz
+pirut-1.3.18.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- pirut.spec	7 Sep 2007 18:28:59 -0000	1.71
+++ pirut.spec	12 Sep 2007 19:52:44 -0000	1.72
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.17
+Version: 1.3.18
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pygtk2 >= 2.9.2
 Requires: pygtk2-libglade, comps-extras, rhpl
-Requires: yum >= 3.2.4
+Requires: yum >= 3.2.5-2
 Requires: python-iniparse
 Requires: gnome-python2-gconf, notify-python
 Requires: usermode
@@ -68,7 +68,6 @@
 %{_datadir}/pirut/ui/*.glade
 %dir %{_datadir}/pirut/pixmaps
 %{_datadir}/pirut/pixmaps/*.png
-%{_datadir}/pixmaps/*png
 
 %{_mandir}/man8/pirut.8*
 %{_mandir}/man8/pup.8*
@@ -77,6 +76,16 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
+- Add multiple selection in package view (#266141)
+- Make things like rpmnew/rpmsave more obvious to the user rather 
+  than hidden (#229671)
+- Use yum's transaction callback mechanism
+- Show details on package list (#227362)
+- Follow icon naming standard (#208698)
+- Improve display of what's being downloaded with progress bar (#284301)
+- Fix applying updates from puplet (#268141)
+
 * Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
 - Catch another downloading error (#270201)
 - Handle errors a little better in puplet


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	7 Sep 2007 18:28:59 -0000	1.70
+++ sources	12 Sep 2007 19:52:44 -0000	1.71
@@ -1 +1 @@
-350e800d69a92d600ce76d552ebc31b7  pirut-1.3.17.tar.gz
+55618b3def8243c3d7aed4efd25a674b  pirut-1.3.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 19:55:56 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 15:55:56 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 sugar-datastore.spec, 1.25, 1.26
Message-ID: <200709121955.l8CJtuBs004488@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4460

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Sep 2007 20:15:20 -0000	1.24
+++ .cvsignore	12 Sep 2007 19:55:23 -0000	1.25
@@ -1 +1 @@
-sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2
+sugar-datastore-0.2.2-git7655f4d99a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Sep 2007 20:15:20 -0000	1.24
+++ sources	12 Sep 2007 19:55:23 -0000	1.25
@@ -1 +1 @@
-b039a6ca3736f49a9c2ca305aea6446e  sugar-datastore-0.2.2-gitb0b4c4115a.tar.bz2
+f60a6cbcdccdbd84e18a39718fc3d57f  sugar-datastore-0.2.2-git7655f4d99a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-datastore.spec	11 Sep 2007 20:15:20 -0000	1.25
+++ sugar-datastore.spec	12 Sep 2007 19:55:23 -0000	1.26
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070911git
-%define commitid b0b4c4115a
+%define alphatag 20070912git
+%define commitid 7655f4d99a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.21.%{alphatag}b0b4c4115a
+Release: 0.22.%{alphatag}7655f4d99a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.21.20070911gitb0b4c4115a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:00:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:00:17 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.49, 1.50 sources, 1.50,
	1.51 sugar.spec, 1.58, 1.59
Message-ID: <200709122000.l8CK0H0U004610@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	11 Sep 2007 20:43:40 -0000	1.49
+++ .cvsignore	12 Sep 2007 19:59:44 -0000	1.50
@@ -1 +1 @@
-sugar-0.65-git8b784a6223.tar.bz2
+sugar-0.65-git47f473189e.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	11 Sep 2007 20:43:40 -0000	1.50
+++ sources	12 Sep 2007 19:59:44 -0000	1.51
@@ -1 +1 @@
-db824af53d51c851dc8ca1d75484a317  sugar-0.65-git8b784a6223.tar.bz2
+235e143ab290c973169df6a7c195ee24  sugar-0.65-git47f473189e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sugar.spec	11 Sep 2007 20:43:40 -0000	1.58
+++ sugar.spec	12 Sep 2007 19:59:44 -0000	1.59
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070911git
-%define commitid 8b784a6223
+%define alphatag 20070912git
+%define commitid 47f473189e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.46.%{alphatag}8b784a6223
+Release: 0.47.%{alphatag}47f473189e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.46.20070911git8b784a6223
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:03:08 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:03:08 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.20, 1.21 sources, 
	1.20, 1.21 sugar-presence-service.spec, 1.20, 1.21
Message-ID: <200709122003.l8CK38qX010706@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 Sep 2007 20:26:28 -0000	1.20
+++ .cvsignore	12 Sep 2007 20:02:34 -0000	1.21
@@ -1 +1 @@
-sugar-presence-service-0.65-gitbff163d57b.tar.bz2
+sugar-presence-service-0.65-gitb8d04713ac.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	11 Sep 2007 20:26:28 -0000	1.20
+++ sources	12 Sep 2007 20:02:34 -0000	1.21
@@ -1 +1 @@
-18de89aa92cbe6c8171113524488bb7f  sugar-presence-service-0.65-gitbff163d57b.tar.bz2
+ab6018517e2e67ab9435125ecbc1db38  sugar-presence-service-0.65-gitb8d04713ac.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sugar-presence-service.spec	11 Sep 2007 20:26:28 -0000	1.20
+++ sugar-presence-service.spec	12 Sep 2007 20:02:35 -0000	1.21
@@ -1,9 +1,9 @@
-%define alphatag 20070911git
-%define commitid bff163d57b
+%define alphatag 20070912git
+%define commitid b8d04713ac
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.15.%{alphatag}bff163d57b
+Release: 0.16.%{alphatag}b8d04713ac
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
+- New snapshot
+
 * Tue Sep 11 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.15.20070911gitbff163d57b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:08:28 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 12 Sep 2007 16:08:28 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 sugar-artwork.spec, 1.25, 1.26
Message-ID: <200709122008.l8CK8Sa7010880@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	9 Sep 2007 05:00:09 -0000	1.24
+++ .cvsignore	12 Sep 2007 20:07:55 -0000	1.25
@@ -1,2 +1 @@
-sugar-artwork-0.34-gitf89f6e00cc.tar.bz2
-sugar-artwork-0.34-git2e13ad392d.tar.bz2
+sugar-artwork-0.34-gite4fd20770c.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	9 Sep 2007 05:00:09 -0000	1.24
+++ sources	12 Sep 2007 20:07:55 -0000	1.25
@@ -1 +1 @@
-06860f882931ea996fd9e0af1ef0c591  sugar-artwork-0.34-git2e13ad392d.tar.bz2
+6a11672f84c158abf05c0ab4c99feb40  sugar-artwork-0.34-gite4fd20770c.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sugar-artwork.spec	9 Sep 2007 05:00:09 -0000	1.25
+++ sugar-artwork.spec	12 Sep 2007 20:07:55 -0000	1.26
@@ -1,10 +1,10 @@
-%define alphatag 20070909git
-%define commitid 2e13ad392d
+%define alphatag 20070912git
+%define commitid e4fd20770c
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.25.%{alphatag}2e13ad392d
+Release: 0.26.%{alphatag}e4fd20770c
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
+- New snapshot
+
 * Sun Sep  9 2007 Dan Williams <dcbw at redhat.com> - 0.34-0.25.20070909git2e13ad392d
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:20:07 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 16:20:07 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.683, 1.684 kernel.spec, 1.160, 1.161 sources, 1.645,
	1.646 upstream, 1.567,
	1.568 linux-2.6-x86_64-vdso-fix-clock-masking.patch, 1.1,
	NONE patch-2.6.23-rc6-git1.bz2.sign, 1.1, NONE
Message-ID: <200709122020.l8CKK7JM012174@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11808

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git2.bz2.sign 
Removed Files:
	linux-2.6-x86_64-vdso-fix-clock-masking.patch 
	patch-2.6.23-rc6-git1.bz2.sign 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git2



--- NEW FILE patch-2.6.23-rc6-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6DhgyGugalF9Dw4RAmofAJkBhOfxZYxOnDTlwN+o4zvDdZS1lwCgh9nS
1+KI5dG97VSzSAk1AWHd76M=
=5wdd
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- .cvsignore	12 Sep 2007 18:50:43 -0000	1.683
+++ .cvsignore	12 Sep 2007 20:19:34 -0000	1.684
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git1.bz2
+patch-2.6.23-rc6-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kernel.spec	12 Sep 2007 18:50:43 -0000	1.160
+++ kernel.spec	12 Sep 2007 20:19:34 -0000	1.161
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -670,7 +670,6 @@
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
-Patch1540: linux-2.6-x86_64-vdso-fix-clock-masking.patch
 
 %endif
 
@@ -1205,9 +1204,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# fix x86_64 clock warping
-ApplyPatch linux-2.6-x86_64-vdso-fix-clock-masking.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1800,6 +1796,9 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git2
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git1
 
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -r1.645 -r1.646
--- sources	12 Sep 2007 18:50:43 -0000	1.645
+++ sources	12 Sep 2007 20:19:34 -0000	1.646
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-e989205bedc5a83a1d45c25f79adcb01  patch-2.6.23-rc6-git1.bz2
+6ecec0906f1becf844497493b14288df  patch-2.6.23-rc6-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- upstream	12 Sep 2007 18:50:43 -0000	1.567
+++ upstream	12 Sep 2007 20:19:34 -0000	1.568
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git1.bz2
+patch-2.6.23-rc6-git2.bz2


--- linux-2.6-x86_64-vdso-fix-clock-masking.patch DELETED ---


--- patch-2.6.23-rc6-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 12 20:21:38 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 12 Sep 2007 16:21:38 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.2,
	1.3 kernel-xen.spec, 1.52, 1.53
Message-ID: <200709122021.l8CKLcN6012697@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12115

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-xen.spec 
Log Message:
Disable CONFIG_HIGHPTE

Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
under Xen.




Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel-2.6.21-i686-xen.config	24 Jul 2007 14:13:44 -0000	1.2
+++ kernel-2.6.21-i686-xen.config	12 Sep 2007 20:21:05 -0000	1.3
@@ -212,7 +212,7 @@
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
-CONFIG_HIGHPTE=y
+# CONFIG_HIGHPTE is not set
 CONFIG_MTRR=y
 # CONFIG_SECCOMP is not set
 # CONFIG_HZ_100 is not set


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kernel-xen.spec	6 Sep 2007 19:22:17 -0000	1.52
+++ kernel-xen.spec	12 Sep 2007 20:21:05 -0000	1.53
@@ -2363,6 +2363,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
+  under Xen.
+
 * Thu Sep 06 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Include modules.block and modules.networking on the package (bug #280731)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:23:42 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 16:23:42 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.21,1.22
Message-ID: <200709122023.l8CKNghU012820@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11187

Modified Files:
	gnash.spec 
Log Message:
- fix more rm -f issues



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnash.spec	12 Sep 2007 19:50:24 -0000	1.21
+++ gnash.spec	12 Sep 2007 20:23:09 -0000	1.22
@@ -72,14 +72,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # don't package libltdl related files!
-rm \
+rm -f \
  $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
  $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
 # omf is broken
 rm -rf \
  $RPM_BUILD_ROOT/%{_datadir}/omf
 # cygnal just segfaults
-rm \
+rm -f \
  $RPM_BUILD_ROOT/%{_bindir}/cygnal
 
 %find_lang %{name}



From fedora-extras-commits at redhat.com  Wed Sep 12 20:26:38 2007
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 12 Sep 2007 16:26:38 -0400
Subject: fedora-security/audit fc7,1.99,1.100
Message-ID: <200709122026.l8CKQcKn012928@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12905

Modified Files:
	fc7 
Log Message:
Add some CVE ids



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc7	12 Sep 2007 18:24:08 -0000	1.99
+++ fc7	12 Sep 2007 20:26:35 -0000	1.100
@@ -8,6 +8,8 @@
 # Up to date CVE as of CVE email 20070910
 # Up to date FC7 as of 20070910
 
+CVE-2007-4841 ignore (mozilla suite) Windows only
+CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]



From fedora-extras-commits at redhat.com  Wed Sep 12 20:26:54 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 12 Sep 2007 16:26:54 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200709122026.l8CKQs9l012940@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12876

Modified Files:
	python-memcached.spec sources 
Log Message:
Updating for 1.39 release build.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-memcached.spec	27 Jun 2007 02:45:56 -0000	1.1
+++ python-memcached.spec	12 Sep 2007 20:26:22 -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()")}
 
 Name:           python-memcached
-Version:        1.36
-Release:        3%{?dist}
+Version:        1.39
+Release:        1%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -40,6 +40,12 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
+- Update to 1.39 upstream release.
+
+* Sat Aug 11 2007 Sean Reifschneider <jafo at tummy.com> 1.38-1
+- Update to 1.38 upstream release.
+
 * Sun Jun 10 2007 Sean Reifschneider <jafo at tummy.com> 1.36-3
 - Changes based on feedback from Ruben Kerkhof:
 - Fixing license.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2007 02:45:56 -0000	1.2
+++ sources	12 Sep 2007 20:26:22 -0000	1.3
@@ -1 +1 @@
-b5154b816e2dfd54dcd3264e16b3fa77  python-memcached-1.36.tar.gz
+403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 20:39:33 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 12 Sep 2007 16:39:33 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.3,
	1.4 kernel-xen.spec, 1.45, 1.46
Message-ID: <200709122039.l8CKdXIx014966@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14558

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-xen.spec 
Log Message:
Disable CONFIG_HIGHPTE

It is not reliable and causes performance loss under Xen.



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel-2.6.20-i686-xen.config	24 May 2007 16:16:28 -0000	1.3
+++ kernel-2.6.20-i686-xen.config	12 Sep 2007 20:39:00 -0000	1.4
@@ -3078,7 +3078,7 @@
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
 CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
+# CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_X86_PM_TIMER=y


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kernel-xen.spec	30 Aug 2007 22:30:57 -0000	1.45
+++ kernel-xen.spec	12 Sep 2007 20:39:00 -0000	1.46
@@ -2058,6 +2058,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable CONFIG_HIGHPTE. It is not reliable and causes performance loss
+  under Xen
+
 * Thu Aug 30 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Provides: xen-hypervisor-abi = 3.1 (bug #269581)
 



From fedora-extras-commits at redhat.com  Wed Sep 12 20:49:17 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 12 Sep 2007 16:49:17 -0400
Subject: devel/yum-updatesd yum-updatesd.spec,1.3,1.4
Message-ID: <200709122049.l8CKnHeN016955@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum-updatesd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16935

Modified Files:
	yum-updatesd.spec 
Log Message:
* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-2
- require the yum-refresh-updatesd plugin so that we get kicked after 
  installs



Index: yum-updatesd.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum-updatesd/yum-updatesd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-updatesd.spec	6 Sep 2007 14:33:56 -0000	1.3
+++ yum-updatesd.spec	12 Sep 2007 20:48:44 -0000	1.4
@@ -2,7 +2,7 @@
 Name: yum-updatesd
 Epoch: 1
 Version: 0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 BuildRequires: python
 Requires: python >= 2.4
 Requires: yum >= 3.2.0
+Requires: yum-refresh-updatesd
 Requires: dbus-python
 Requires: pygobject2
 Requires: gamin-python
@@ -61,6 +62,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-2
+- require the yum-refresh-updatesd plugin so that we get kicked after 
+  installs
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 1:0.5-1
 - add option for configurable SMTP server
 - fix email sending (Rich Fearn, #251196)



From fedora-extras-commits at redhat.com  Wed Sep 12 21:05:20 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 12 Sep 2007 17:05:20 -0400
Subject: rpms/flac/devel flac-1.2.0-gnu-stack.patch, 1.2, 1.3 flac.spec, 1.31,
	1.32
Message-ID: <200709122105.l8CL5KdM026754@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719

Modified Files:
	flac-1.2.0-gnu-stack.patch flac.spec 
Log Message:
* Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
- Make a few functions hidden, to try and avoid textrels
- Disable optimisations on x86 for the same reason
  (#285961)


flac-1.2.0-gnu-stack.patch:

Index: flac-1.2.0-gnu-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac-1.2.0-gnu-stack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flac-1.2.0-gnu-stack.patch	11 Sep 2007 14:33:53 -0000	1.2
+++ flac-1.2.0-gnu-stack.patch	12 Sep 2007 21:05:16 -0000	1.3
@@ -53,3 +53,38 @@
 -	section .note.GNU-stack noalloc
 -%endif
 +section .note.GNU-stack progbits noalloc noexec nowrite align=1
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-07-23 17:14:35.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 18:15:30.000000000 +0100
+@@ -203,6 +203,7 @@ static FLaC__INLINE void crc16_update_wo
+ }
+ 
+ /* would be static except it needs to be called by asm routines */
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
+ {
+ 	unsigned start, end;
+diff -upr flac-1.2.0/src/libFLAC/crc.c flac-1.2.0.new/src/libFLAC/crc.c
+--- flac-1.2.0/src/libFLAC/crc.c	2007-02-02 06:58:22.000000000 +0000
++++ flac-1.2.0.new/src/libFLAC/crc.c	2007-09-12 18:13:44.000000000 +0100
+@@ -73,7 +73,7 @@ FLAC__byte const FLAC__crc8_table[256] =
+ };
+ 
+ /* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
+-
++__attribute__((__visibility__("hidden")))
+ unsigned FLAC__crc16_table[256] = {
+ 	0x0000,  0x8005,  0x800f,  0x000a,  0x801b,  0x001e,  0x0014,  0x8011,
+ 	0x8033,  0x0036,  0x003c,  0x8039,  0x0028,  0x802d,  0x8027,  0x0022,
+diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
+--- flac-1.2.0/src/libFLAC/bitreader.c	2007-09-12 18:17:56.000000000 +0100
++++ flac-1.2.0.new/src/libFLAC/bitreader.c	2007-09-12 19:09:00.000000000 +0100
+@@ -774,6 +774,7 @@ FLaC__INLINE FLAC__bool FLAC__bitreader_
+ }
+ #endif
+ 
++ __attribute__((__visibility__("hidden")))
+ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter)
+ {
+ 	FLAC__uint32 lsbs = 0, msbs = 0;
+


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- flac.spec	11 Sep 2007 14:25:48 -0000	1.31
+++ flac.spec	12 Sep 2007 21:05:16 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -36,8 +36,11 @@
 %patch1 -p1 -b .gnu-stack
 
 %build
-export XMMS_CONFIG=no # Disable XMMS
+%ifarch %{ix86}
+%configure --with-pic --disable-xmms-plugin --disable-asm-optimizations
+%else
 %configure --with-pic --disable-xmms-plugin
+%endif
 
 make %{?_smp_mflags}
 
@@ -72,6 +75,11 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
+- Make a few functions hidden, to try and avoid textrels
+- Disable optimisations on x86 for the same reason
+  (#285961)
+
 * Tue Sep 11 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-2
 - Update GNU stack patch to cover all the NASM sources used
 



From fedora-extras-commits at redhat.com  Wed Sep 12 21:41:10 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 17:41:10 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25, 
	1.26 telepathy-gabble.spec, 1.34, 1.35
Message-ID: <200709122141.l8CLfAxv027479@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27419

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	6 Sep 2007 19:10:58 -0000	1.25
+++ .cvsignore	12 Sep 2007 21:40:37 -0000	1.26
@@ -5,3 +5,4 @@
 telepathy-gabble-0.5.12.1.20070829darcs_olpcrollup.tar.gz
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
+telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	6 Sep 2007 19:10:58 -0000	1.25
+++ sources	12 Sep 2007 21:40:37 -0000	1.26
@@ -1 +1 @@
-6bf82d42255c15f819639c78765c27af  telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
+08c37009f68fe7a34f8c218a8c4ac3ca  telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- telepathy-gabble.spec	6 Sep 2007 19:10:58 -0000	1.34
+++ telepathy-gabble.spec	12 Sep 2007 21:40:37 -0000	1.35
@@ -1,19 +1,19 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag 20070906darcs_olpctrial3a
+%define alphatag olpc_trial3a_20070912 
 
-%define telepathy_glibi_version 0.5.14
+%define telepathy_glib_version 0.5.14
 
 Name:           telepathy-gabble
 Version:        0.5.14.1
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.2.%{alphatag}%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc_trial3a_20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070912
+- New snapshot
+
 * Thu Sep 06 2007 Dan Williams <dcbw at redhat.com> - 0.5.14.1-0.1.20070906darcs_olpctrial3a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:51 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:51 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLoppr002729@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/empathy



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:52 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLoq7O002735@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/empathy



From fedora-extras-commits at redhat.com  Wed Sep 12 21:50:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Wed, 12 Sep 2007 14:50:55 -0700
Subject: [pkgdb] empathy had groupAcl changed
Message-ID: <200709122150.l8CLouWe002741@app4.fedora.phx.redhat.com>

Peter Gordon (pgordon) has set the commit acl on empathy (Fedora 6) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/empathy



From fedora-extras-commits at redhat.com  Wed Sep 12 21:54:10 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Wed, 12 Sep 2007 17:54:10 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.66, 1.67 pykickstart.spec, 1.73,
	1.74 sources, 1.73, 1.74
Message-ID: <200709122154.l8CLsAWZ027881@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27854

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	4 Sep 2007 16:23:25 -0000	1.66
+++ .cvsignore	12 Sep 2007 21:53:38 -0000	1.67
@@ -1,2 +1,3 @@
 pykickstart-1.11.tar.gz
 pykickstart-1.12.tar.gz
+pykickstart-1.13.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pykickstart.spec	4 Sep 2007 16:23:25 -0000	1.73
+++ pykickstart.spec	12 Sep 2007 21:53:38 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.12
+Version: 1.13
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -38,10 +38,17 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING docs/programmers-guide
+%doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
 
 %changelog
+* Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
+- Add a function to convert URL method strings into repo objects
+  (jkeating).
+- Writer formatting fixes.
+- Add kickstart documentation from the Fedora Wiki.
+
 * Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
 - Fix lots of problems in processing the bootloader, device, network, and
   raid commands.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	4 Sep 2007 16:23:25 -0000	1.73
+++ sources	12 Sep 2007 21:53:38 -0000	1.74
@@ -1 +1 @@
-b623f52865d338ad158e3e03aac426bc  pykickstart-1.12.tar.gz
+5079ebf032b4c7f63f6fe7e3d70c81f5  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 22:07:10 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Wed, 12 Sep 2007 18:07:10 -0400
Subject: rpms/pykickstart/devel sources,1.74,1.75
Message-ID: <200709122207.l8CM7ALQ001831@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1793

Modified Files:
	sources 
Log Message:
Fix build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	12 Sep 2007 21:53:38 -0000	1.74
+++ sources	12 Sep 2007 22:06:37 -0000	1.75
@@ -1 +1 @@
-5079ebf032b4c7f63f6fe7e3d70c81f5  pykickstart-1.13.tar.gz
+806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 22:21:54 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Wed, 12 Sep 2007 18:21:54 -0400
Subject: rpms/msv/devel msv.spec,1.2,1.3
Message-ID: <200709122221.l8CMLs6g002231@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/msv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182

Modified Files:
	msv.spec 
Log Message:
Make package build with the latest gcj on ppc/ppc64



Index: msv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msv/devel/msv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- msv.spec	11 Sep 2007 23:04:28 -0000	1.2
+++ msv.spec	12 Sep 2007 22:21:21 -0000	1.3
@@ -37,7 +37,7 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.3%{?dist}
 Epoch:          1
 License:        BSD
 URL:            http://msv.dev.java.net
@@ -277,6 +277,16 @@
 
 ant release
 
+pushd msv/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
+pushd xsdlib/dist/examples
+# remove all prebuild classes
+find . -name "*.class" -exec rm -f {} \;
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -345,7 +355,7 @@
 
 %if %{gcj_support}
 #export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm --exclude usr/share/%{name}-%{version}/%{name}
+%{_bindir}/aot-compile-rpm 
 %endif
 
 %clean
@@ -473,6 +483,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matt Wringe <mwringe at redhat.com> 0:1,2-0.1.20050722.3jpp.3
+- Make package build with new gcj. Remove .class files from demo package and
+  remove demo exclude from aot-compile-rpm 
+
 * Tue Sep 11 2007 Matt Wringe <mwringe at redhat.com> 0:1.2-0.1.20050722.3jpp.2
 - Fix unowned directories
 - Change copyright files to utf-8 format



From fedora-extras-commits at redhat.com  Wed Sep 12 22:23:42 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 18:23:42 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.35,1.36
Message-ID: <200709122223.l8CMNgRV002387@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365

Modified Files:
	telepathy-gabble.spec 
Log Message:
- fix typo in tarball name



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- telepathy-gabble.spec	12 Sep 2007 21:40:37 -0000	1.35
+++ telepathy-gabble.spec	12 Sep 2007 22:23:09 -0000	1.36
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc_trial3a_20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc-trial3a-20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 22:35:04 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Wed, 12 Sep 2007 18:35:04 -0400
Subject: rpms/telepathy-gabble/OLPC-2 telepathy-gabble.spec,1.36,1.37
Message-ID: <200709122235.l8CMZ4Eg002706@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2641

Modified Files:
	telepathy-gabble.spec 
Log Message:
- fix another typo



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- telepathy-gabble.spec	12 Sep 2007 22:23:09 -0000	1.36
+++ telepathy-gabble.spec	12 Sep 2007 22:34:31 -0000	1.37
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1.olpc-trial3a-20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070912.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 22:36:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 12 Sep 2007 18:36:20 -0400
Subject: rpms/kernel/F-7 linux-2.6-sched-cfs-updates.patch, NONE,
	1.1 kernel-2.6.spec, 1.3339,
	1.3340 linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch, 1.2, 1.3
Message-ID: <200709122236.l8CMaKC3002792@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760

Modified Files:
	kernel-2.6.spec linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch 
Added Files:
	linux-2.6-sched-cfs-updates.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- update CFS scheduler


linux-2.6-sched-cfs-updates.patch:

--- NEW FILE linux-2.6-sched-cfs-updates.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Commit:     a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Parent:     7fd0d2dde929ead79901e389e70dbfb3c6c06986
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: fix niced_granularity() shift
    
    fix niced_granularity(). This resulted in under-scheduling for
    CPU-bound negative nice level tasks (and this in turn caused
    higher than necessary latencies in nice-0 tasks).
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index ce39282..810b52d 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -291,7 +291,7 @@ niced_granularity(struct sched_entity *curr, unsigned long granularity)
 	/*
 	 * It will always fit into 'long':
 	 */
-	return (long) (tmp >> WMULT_SHIFT);
+	return (long) (tmp >> (WMULT_SHIFT-NICE_0_SHIFT));
 }
 
 static inline void
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7fd0d2dde929ead79901e389e70dbfb3c6c06986
Commit:     7fd0d2dde929ead79901e389e70dbfb3c6c06986
Parent:     b21010ed6498391c0f359f2a89c907533fe07fec
Author:     Suresh Siddha <suresh.b.siddha at intel.com>
AuthorDate: Wed Sep 5 14:32:48 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:48 2007 +0200

    sched: fix MC/HT scheduler optimization, without breaking the FUZZ logic.
    
    First fix the check
    	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
    with this
    	if (*imbalance < busiest_load_per_task)
    
    As the current check is always false for nice 0 tasks (as
    SCHED_LOAD_SCALE_FUZZ is same as busiest_load_per_task for nice 0
    tasks).
    
    With the above change, imbalance was getting reset to 0 in the corner
    case condition, making the FUZZ logic fail. Fix it by not corrupting the
    imbalance and change the imbalance, only when it finds that the HT/MC
    optimization is needed.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index b533d6d..c8759ec 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2512,7 +2512,7 @@ group_next:
 	 * a think about bumping its value to force at least one task to be
 	 * moved
 	 */
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
+	if (*imbalance < busiest_load_per_task) {
 		unsigned long tmp, pwr_now, pwr_move;
 		unsigned int imbn;
 
@@ -2564,10 +2564,8 @@ small_imbalance:
 		pwr_move /= SCHED_LOAD_SCALE;
 
 		/* Move if we gain throughput */
-		if (pwr_move <= pwr_now)
-			goto out_balanced;
-
-		*imbalance = busiest_load_per_task;
+		if (pwr_move > pwr_now)
+			*imbalance = busiest_load_per_task;
 	}
 
 	return busiest;
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a206c07213cf6372289f189c3774c4c3255a7ae1
Commit:     a206c07213cf6372289f189c3774c4c3255a7ae1
Parent:     a0dc72601d48b171b4870dfdd0824901a2b2b1a9
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: debug: fix cfs_rq->wait_runtime accounting
    
    the cfs_rq->wait_runtime debug/statistics counter was not maintained
    properly - fix this.
    
    this also removes some code:
    
       text    data     bss     dec     hex filename
      13420     228    1204   14852    3a04 sched.o.before
      13404     228    1204   14836    39f4 sched.o.after
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
---
 kernel/sched.c      |    1 -
 kernel/sched_fair.c |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index c8759ec..97986f1 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -858,7 +858,6 @@ static void dec_nr_running(struct task_struct *p, struct rq *rq)
 
 static void set_load_weight(struct task_struct *p)
 {
-	task_rq(p)->cfs.wait_runtime -= p->se.wait_runtime;
 	p->se.wait_runtime = 0;
 
 	if (task_has_rt_policy(p)) {
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 810b52d..bac2aff 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -194,6 +194,8 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_load_add(&cfs_rq->load, se->load.weight);
 	cfs_rq->nr_running++;
 	se->on_rq = 1;
+
+	schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 }
 
 static inline void
@@ -205,6 +207,8 @@ __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_load_sub(&cfs_rq->load, se->load.weight);
 	cfs_rq->nr_running--;
 	se->on_rq = 0;
+
+	schedstat_add(cfs_rq, wait_runtime, -se->wait_runtime);
 }
 
 static inline struct rb_node *first_fair(struct cfs_rq *cfs_rq)
@@ -574,7 +578,6 @@ static void __enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
 
 	prev_runtime = se->wait_runtime;
 	__add_wait_runtime(cfs_rq, se, delta_fair);
-	schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 	delta_fair = se->wait_runtime - prev_runtime;
 
 	/*
@@ -662,7 +665,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 			if (tsk->state & TASK_UNINTERRUPTIBLE)
 				se->block_start = rq_of(cfs_rq)->clock;
 		}
-		cfs_rq->wait_runtime -= se->wait_runtime;
 #endif
 	}
 	__dequeue_entity(cfs_rq, se);
@@ -1121,10 +1123,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	 * The statistical average of wait_runtime is about
 	 * -granularity/2, so initialize the task with that:
 	 */
-	if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) {
+	if (sysctl_sched_features & SCHED_FEAT_START_DEBIT)
 		se->wait_runtime = -(sched_granularity(cfs_rq) / 2);
-		schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
-	}
 
 	__enqueue_entity(cfs_rq, se);
 }
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2491b2b89d4646e02ab51c90ab7012d124924ddc
Commit:     2491b2b89d4646e02ab51c90ab7012d124924ddc
Parent:     a206c07213cf6372289f189c3774c4c3255a7ae1
Author:     Ingo Molnar <mingo at elte.hu>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: debug: fix sum_exec_runtime clearing
    
    when cleaning sched-stats also clear prev_sum_exec_runtime.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_debug.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index ab18f45..c3ee38b 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -283,4 +283,5 @@ void proc_sched_set_task(struct task_struct *p)
 	p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0;
 #endif
 	p->se.sum_exec_runtime = 0;
+	p->se.prev_sum_exec_runtime	= 0;
 }
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Commit:     7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Parent:     cf2ab4696ee42f895eed88c2b6e432fe03dda0db
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: simplify __check_preempt_curr_fair()
    
    Preparatory patch for fix-ideal-runtime:
    
    simplify __check_preempt_curr_fair(): get rid of the integer return.
    
       text    data     bss     dec     hex filename
      13404     228    1204   14836    39f4 sched.o.before
      13393     228    1204   14825    39e9 sched.o.after
    
    functionality is unchanged.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index bac2aff..f0dd4be 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -673,7 +673,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 /*
  * Preempt the current task with a newly woken task if needed:
  */
-static int
+static void
 __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 			  struct sched_entity *curr, unsigned long granularity)
 {
@@ -686,9 +686,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 	 */
 	if (__delta > niced_granularity(curr, granularity)) {
 		resched_task(rq_of(cfs_rq)->curr);
-		return 1;
+		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
 	}
-	return 0;
 }
 
 static inline void
@@ -764,8 +763,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	if (delta_exec > ideal_runtime)
 		gran = 0;
 
-	if (__check_preempt_curr_fair(cfs_rq, next, curr, gran))
-		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
+	__check_preempt_curr_fair(cfs_rq, next, curr, gran);
 }
 
 /**************************************************
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Commit:     4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Parent:     7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: improve prev_sum_exec_runtime setting
    
    Second preparatory patch for fix-ideal runtime:
    
    Mark prev_sum_exec_runtime at the beginning of our run, the same spot
    that adds our wait period to wait_runtime. This seems a more natural
    location to do this, and it also reduces the code a bit:
    
       text    data     bss     dec     hex filename
      13397     228    1204   14829    39ed sched.o.before
      13391     228    1204   14823    39e7 sched.o.after
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index f0dd4be..2d01bbc 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -684,10 +684,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 	 * preempt the current task unless the best task has
 	 * a larger than sched_granularity fairness advantage:
 	 */
-	if (__delta > niced_granularity(curr, granularity)) {
+	if (__delta > niced_granularity(curr, granularity))
 		resched_task(rq_of(cfs_rq)->curr);
-		curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
-	}
 }
 
 static inline void
@@ -703,6 +701,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	update_stats_wait_end(cfs_rq, se);
 	update_stats_curr_start(cfs_rq, se);
 	set_cfs_rq_curr(cfs_rq, se);
+	se->prev_sum_exec_runtime = se->sum_exec_runtime;
 }
 
 static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq)
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1169783085adb9ac969d21103a6885e8435f7ed3
Commit:     1169783085adb9ac969d21103a6885e8435f7ed3
Parent:     4a55b45036a677fac43fe81ddf7fdcd007aaaee7
Author:     Peter Zijlstra <a.p.zijlstra at chello.nl>
AuthorDate: Wed Sep 5 14:32:49 2007 +0200
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Wed Sep 5 14:32:49 2007 +0200

    sched: fix ideal_runtime calculations for reniced tasks
    
    fix ideal_runtime:
    
      - do not scale it using niced_granularity()
        it is against sum_exec_delta, so its wall-time, not fair-time.
    
      - move the whole check into __check_preempt_curr_fair()
        so that wakeup preemption can also benefit from the new logic.
    
    this also results in code size reduction:
    
       text    data     bss     dec     hex filename
      13391     228    1204   14823    39e7 sched.o.before
      13369     228    1204   14801    39d1 sched.o.after
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/sched_fair.c |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 2d01bbc..892616b 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -678,11 +678,31 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
 			  struct sched_entity *curr, unsigned long granularity)
 {
 	s64 __delta = curr->fair_key - se->fair_key;
+	unsigned long ideal_runtime, delta_exec;
+
+	/*
+	 * ideal_runtime is compared against sum_exec_runtime, which is
+	 * walltime, hence do not scale.
+	 */
+	ideal_runtime = max(sysctl_sched_latency / cfs_rq->nr_running,
+			(unsigned long)sysctl_sched_min_granularity);
+
+	/*
+	 * If we executed more than what the latency constraint suggests,
+	 * reduce the rescheduling granularity. This way the total latency
+	 * of how much a task is not scheduled converges to
+	 * sysctl_sched_latency:
+	 */
+	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
+	if (delta_exec > ideal_runtime)
+		granularity = 0;
 
 	/*
 	 * Take scheduling granularity into account - do not
 	 * preempt the current task unless the best task has
 	 * a larger than sched_granularity fairness advantage:
+	 *
+	 * scale granularity as key space is in fair_clock.
 	 */
 	if (__delta > niced_granularity(curr, granularity))
 		resched_task(rq_of(cfs_rq)->curr);
@@ -731,7 +751,6 @@ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev)
 
 static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 {
-	unsigned long gran, ideal_runtime, delta_exec;
 	struct sched_entity *next;
 
 	/*
@@ -748,21 +767,8 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	if (next == curr)
 		return;
 
-	gran = sched_granularity(cfs_rq);
-	ideal_runtime = niced_granularity(curr,
-		max(sysctl_sched_latency / cfs_rq->nr_running,
-		    (unsigned long)sysctl_sched_min_granularity));
-	/*
-	 * If we executed more than what the latency constraint suggests,
-	 * reduce the rescheduling granularity. This way the total latency
-	 * of how much a task is not scheduled converges to
-	 * sysctl_sched_latency:
-	 */
-	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
-	if (delta_exec > ideal_runtime)
-		gran = 0;
-
-	__check_preempt_curr_fair(cfs_rq, next, curr, gran);
+	__check_preempt_curr_fair(cfs_rq, next, curr,
+			sched_granularity(cfs_rq));
 }
 
 /**************************************************


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3339
retrieving revision 1.3340
diff -u -r1.3339 -r1.3340
--- kernel-2.6.spec	12 Sep 2007 00:17:42 -0000	1.3339
+++ kernel-2.6.spec	12 Sep 2007 22:35:48 -0000	1.3340
@@ -618,7 +618,8 @@
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
-Patch901: linux-2.6-timekeeping-fixes.patch
+Patch901: linux-2.6-sched-cfs-updates.patch
+Patch902: linux-2.6-timekeeping-fixes.patch
 Patch1000: linux-2.6-dmi-based-module-autoloading.patch
 Patch1020: linux-2.6-usb-autosuspend-default-disable.patch
 Patch1030: linux-2.6-nfs-nosharecache.patch
@@ -1088,6 +1089,8 @@
 
 # Ingo's new scheduler.
 ApplyPatch linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
+# updates from 2.6.23
+ApplyPatch linux-2.6-sched-cfs-updates.patch
 # apply timekeeping updates that were in the Fedora CFS patch
 ApplyPatch linux-2.6-timekeeping-fixes.patch
 
@@ -2306,6 +2309,9 @@
 %endif
 
 %changelog
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- update CFS scheduler
+
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
 - utrace update (#248532, #267161, #284311)
 

linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch:

Index: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch	29 Aug 2007 23:42:57 -0000	1.2
+++ linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch	12 Sep 2007 22:35:48 -0000	1.3
@@ -8910,48 +8910,3 @@
  config SCHEDSTATS
  	bool "Collect scheduler statistics"
  	depends on DEBUG_KERNEL && PROC_FS
-Try to fix MC/HT scheduler optimization breakage again, with out breaking
-the FUZZ logic.
-
-First fix the check
-	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task)
-with this
-	if (*imbalance < busiest_load_per_task)
-
-As the current check is always false for nice 0 tasks (as SCHED_LOAD_SCALE_FUZZ
-is same as busiest_load_per_task for nice 0 tasks).
-
-With the above change, imbalance was getting reset to 0 in the corner case
-condition, making the FUZZ logic fail. Fix it by not corrupting the
-imbalance and change the imbalance, only when it finds that the
-HT/MC optimization is needed.
-
-Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
----
-
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 9fe473a..03e5e8d 100644
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -2511,7 +2511,7 @@ group_next:
- 	 * a think about bumping its value to force at least one task to be
- 	 * moved
- 	 */
--	if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task) {
-+	if (*imbalance < busiest_load_per_task) {
- 		unsigned long tmp, pwr_now, pwr_move;
- 		unsigned int imbn;
- 
-@@ -2563,10 +2563,8 @@ small_imbalance:
- 		pwr_move /= SCHED_LOAD_SCALE;
- 
- 		/* Move if we gain throughput */
--		if (pwr_move <= pwr_now)
--			goto out_balanced;
--
--		*imbalance = busiest_load_per_task;
-+		if (pwr_move > pwr_now)
-+			*imbalance = busiest_load_per_task;
- 	}
- 
- 	return busiest;



From fedora-extras-commits at redhat.com  Wed Sep 12 22:48:51 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 12 Sep 2007 18:48:51 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.31,1.32
Message-ID: <200709122248.l8CMmpH7003216@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.5-49.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sysprof-kmod.spec	11 Sep 2007 08:47:59 -0000	1.31
+++ sysprof-kmod.spec	12 Sep 2007 22:48:11 -0000	1.32
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-45.fc6}
+%{!?kversion: %define kversion 2.6.22.5-49.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:50:41 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 12 Sep 2007 18:50:41 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.83,1.84
Message-ID: <200709122250.l8CMofj9003320@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3296

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.5-76.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sysprof-kmod.spec	21 Aug 2007 07:19:46 -0000	1.83
+++ sysprof-kmod.spec	12 Sep 2007 22:50:08 -0000	1.84
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.1-41.fc7}
+%{!?kversion: %define kversion 2.6.22.5-76.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:56:54 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Wed, 12 Sep 2007 18:56:54 -0400
Subject: rpms/kernel/devel config-x86-generic, 1.10,
	1.11 config-x86_64-generic, 1.8, 1.9 kernel.spec, 1.161, 1.162
Message-ID: <200709122256.l8CMusBt003551@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3523

Modified Files:
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Wed Sep 12 2007 Dave Jones <davej at redhat.com>
- Change ACPI dock drivers to be built-in.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-x86-generic	31 Aug 2007 19:31:27 -0000	1.10
+++ config-x86-generic	12 Sep 2007 22:56:16 -0000	1.11
@@ -131,7 +131,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_NUMA=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-x86_64-generic	31 Aug 2007 19:31:27 -0000	1.8
+++ config-x86_64-generic	12 Sep 2007 22:56:16 -0000	1.9
@@ -67,7 +67,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kernel.spec	12 Sep 2007 20:19:34 -0000	1.161
+++ kernel.spec	12 Sep 2007 22:56:16 -0000	1.162
@@ -1795,6 +1795,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Dave Jones <davej at redhat.com>
+- Change ACPI dock drivers to be built-in.
+
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git2
 



From fedora-extras-commits at redhat.com  Wed Sep 12 22:59:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 18:59:52 -0400
Subject: rpms/deluge/devel .cvsignore, 1.12, 1.13 deluge.spec, 1.26,
	1.27 sources, 1.12, 1.13
Message-ID: <200709122259.l8CMxq2G003615@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3591

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Sep 2007 17:46:55 -0000	1.12
+++ .cvsignore	12 Sep 2007 22:59:09 -0000	1.13
@@ -1 +1 @@
-deluge-0.5.4.1.95.tar.gz
+deluge-0.5.5.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- deluge.spec	3 Sep 2007 17:46:55 -0000	1.26
+++ deluge.spec	12 Sep 2007 22:59:09 -0000	1.27
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1.95
+Version:	0.5.5
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+- Update to new upstream release (0.5.5)
+
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
 - Update to new upstream release candidate (0.5.5 RC1)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Sep 2007 17:46:55 -0000	1.12
+++ sources	12 Sep 2007 22:59:09 -0000	1.13
@@ -1 +1 @@
-4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz
+76c1f8110aef4131d2bc83a7da957c6a  deluge-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 23:13:42 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:13:42 -0400
Subject: rpms/deluge/F-7 .cvsignore, 1.11, 1.12 deluge.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <200709122313.l8CNDgH3010031@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 0.5.5 final (no changes from 0.5.5 RC1).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Sep 2007 03:44:20 -0000	1.11
+++ .cvsignore	12 Sep 2007 23:13:07 -0000	1.12
@@ -1,2 +1 @@
-deluge-0.5.4.1.tar.gz
-deluge-0.5.4.1.95.tar.gz
+deluge-0.5.5.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deluge.spec	5 Sep 2007 03:44:20 -0000	1.21
+++ deluge.spec	12 Sep 2007 23:13:07 -0000	1.22
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.5.4.1.95
+Version:	0.5.5
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+- Update to new upstream release (0.5.5)
+
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1
 - Update to new upstream release candidate (0.5.5 RC1)
 - Update License tag for new License version guidelines.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Sep 2007 03:44:20 -0000	1.11
+++ sources	12 Sep 2007 23:13:07 -0000	1.12
@@ -1,2 +1 @@
-36debac83b41f1697da6805e8cc79435  deluge-0.5.4.1.tar.gz
-4a14123dbf98ec3accca4f074a351785  deluge-0.5.4.1.95.tar.gz
+76c1f8110aef4131d2bc83a7da957c6a  deluge-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:43 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:43 -0400
Subject: rpms/scribes-templates/F-7 scribes-templates.spec,1.2,1.3
Message-ID: <200709122342.l8CNghgw010987@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/F-7

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/F-7/scribes-templates.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scribes-templates.spec	18 Dec 2006 05:28:31 -0000	1.2
+++ scribes-templates.spec	12 Sep 2007 23:42:10 -0000	1.3
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:46 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:46 -0400
Subject: rpms/scribes-templates/FC-6 scribes-templates.spec,1.2,1.3
Message-ID: <200709122342.l8CNgkuY010992@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/FC-6

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/FC-6/scribes-templates.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scribes-templates.spec	18 Dec 2006 05:33:07 -0000	1.2
+++ scribes-templates.spec	12 Sep 2007 23:42:13 -0000	1.3
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:49 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:49 -0400
Subject: rpms/scribes-templates/devel scribes-templates.spec,1.3,1.4
Message-ID: <200709122342.l8CNgn6s010995@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes-templates/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/scribes-templates/devel

Modified Files:
	scribes-templates.spec 
Log Message:
Update Source URLs.


Index: scribes-templates.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes-templates/devel/scribes-templates.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scribes-templates.spec	5 Jun 2007 02:54:30 -0000	1.3
+++ scribes-templates.spec	12 Sep 2007 23:42:16 -0000	1.4
@@ -14,7 +14,7 @@
 # The tarball is not versioned, so I update the mirrored tarball on my
 # webspace with the new stuff every release and rename it to include a proper
 # version (datestamp). Hopefully, this will be fixed in a future release. 
-Source0:	http://mirror.thecodergeek.com/templates-%{version}.tar.bz2
+Source0:	http://mirror.thecodergeek.com/src/templates-%{version}.tar.bz2
 Source1:	COPYING.Fedora
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:52 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:52 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/F-7
	gnome-theme-clearlooks-bigpack.spec, 1.8, 1.9
Message-ID: <200709122342.l8CNgqVH010998@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/F-7

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/F-7/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-theme-clearlooks-bigpack.spec	11 Apr 2007 05:38:25 -0000	1.8
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:19 -0000	1.9
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:55 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6
	gnome-theme-clearlooks-bigpack.spec, 1.9, 1.10
Message-ID: <200709122342.l8CNgtJe011001@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/FC-6

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-theme-clearlooks-bigpack.spec	15 Apr 2007 21:37:40 -0000	1.9
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:23 -0000	1.10
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:42:58 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 12 Sep 2007 19:42:58 -0400
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.8, 1.9
Message-ID: <200709122342.l8CNgwbt011004@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/gnome-theme-clearlooks-bigpack/devel

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Update Source URLs.


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-theme-clearlooks-bigpack.spec	11 Apr 2007 05:38:25 -0000	1.8
+++ gnome-theme-clearlooks-bigpack.spec	12 Sep 2007 23:42:26 -0000	1.9
@@ -10,7 +10,7 @@
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 ## Using my own hosting so that the tarball will be versioned; have sent an
 ## inquiry about this to upstream.
-Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
+Source1:	http://mirror.thecodergeek.com/src/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 Patch0:		%{name}-fix-Cairo_Curve-ComboBox-text-contrast.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Sep 12 23:47:59 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 12 Sep 2007 19:47:59 -0400
Subject: extras-buildsys/utils/pushscript MultiLib.py,1.14,1.15
Message-ID: <200709122347.l8CNlxno011141@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123

Modified Files:
	MultiLib.py 
Log Message:
warn only about non-debuginfo pkgs


Index: MultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/MultiLib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MultiLib.py	6 Sep 2007 13:23:21 -0000	1.14
+++ MultiLib.py	12 Sep 2007 23:47:57 -0000	1.15
@@ -301,7 +301,9 @@
         srcfile = os.path.join(src,f)
         destfile = os.path.join(dest,f)
         if not os.path.exists(srcfile):
-            print 'WARNING: missing', srcfile
+            if srcfile.find('-debuginfo-')<0:
+            # Don't warn about missing debuginfo pkgs.
+                print 'WARNING: missing', srcfile
             return False
         if not os.path.exists(destfile):  # silent extra-check
             print 'Adding:', destfile



From fedora-extras-commits at redhat.com  Thu Sep 13 00:33:48 2007
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Wed, 12 Sep 2007 20:33:48 -0400
Subject: rpms/pan/devel .cvsignore, 1.24, 1.25 pan.spec, 1.35, 1.36 sources, 
	1.24, 1.25
Message-ID: <200709130033.l8D0Xmbx018319@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18271

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
Add patch for BZ #283241 (upstream #467446)





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	25 Aug 2007 15:14:25 -0000	1.24
+++ .cvsignore	13 Sep 2007 00:33:16 -0000	1.25
@@ -1 +1 @@
-pan-0.132.tar.bz2
+body-pane.cc.diff


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pan.spec	25 Aug 2007 15:14:25 -0000	1.35
+++ pan.spec	13 Sep 2007 00:33:16 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
 Version:	0.132
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -59,6 +59,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Thu Sep 13 2007 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.132-2
+- Add patch for BZ #283241 (upstream #467446)
+
 * Sat Aug 25 2007 Alexander Dalloz <alex {%} dalloz {*} de> - 1:0.132-1
 - Update to 0.132
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Aug 2007 15:14:25 -0000	1.24
+++ sources	13 Sep 2007 00:33:16 -0000	1.25
@@ -1 +1 @@
-2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
+dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff



From fedora-extras-commits at redhat.com  Thu Sep 13 00:50:42 2007
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Wed, 12 Sep 2007 20:50:42 -0400
Subject: rpms/pan/devel .cvsignore, 1.25, 1.26 pan.spec, 1.36, 1.37 sources, 
	1.25, 1.26
Message-ID: <200709130050.l8D0ogAv018796@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
use wrong command to add the patch, so previous build missed the pan source




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Sep 2007 00:33:16 -0000	1.25
+++ .cvsignore	13 Sep 2007 00:50:09 -0000	1.26
@@ -1 +1,2 @@
+pan-0.132.tar.bz2
 body-pane.cc.diff


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pan.spec	13 Sep 2007 00:33:16 -0000	1.36
+++ pan.spec	13 Sep 2007 00:50:09 -0000	1.37
@@ -6,6 +6,7 @@
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2
+Patch0:		body-pane.cc.diff
 URL:		http://pan.rebelbase.com/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -b .pixbuf
 
 sed -i -e 's|StartupNotify=false|StartupNotify=true|' %{name}.desktop.in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	13 Sep 2007 00:33:16 -0000	1.25
+++ sources	13 Sep 2007 00:50:09 -0000	1.26
@@ -1 +1,2 @@
+2c337dbd5105b7772a4326d549a45638  pan-0.132.tar.bz2
 dc39d58b91409753512f1dc3bd00c077  body-pane.cc.diff



From fedora-extras-commits at redhat.com  Thu Sep 13 01:42:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 12 Sep 2007 21:42:18 -0400
Subject: rpms/libbonobo/devel list-leak.patch, NONE, 1.1 libbonobo.spec, 1.61,
	1.62
Message-ID: <200709130142.l8D1gIHq026361@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26324

Modified Files:
	libbonobo.spec 
Added Files:
	list-leak.patch 
Log Message:
plug a memory leak


list-leak.patch:

--- NEW FILE list-leak.patch ---
diff -up libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak libbonobo-2.19.6/activation-server/object-directory-load.c
--- libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak	2007-09-12 18:41:20.000000000 -0400
+++ libbonobo-2.19.6/activation-server/object-directory-load.c	2007-09-12 21:33:20.000000000 -0400
@@ -483,7 +483,8 @@ od_end_element (GMarkupParseContext *con
                         info->cur_prop->v._u.value_stringv._buffer =
                                 CORBA_sequence_CORBA_string_allocbuf (len);
                         
-                        for (i = 0, p = g_list_reverse (info->cur_items); p; p = p->next, i++)
+			info->cur_items = g_list_reverse (info->cur_items);
+                        for (i = 0, p = info->cur_items; p; p = p->next, i++)
                                 info->cur_prop->v._u.
                                         value_stringv._buffer[i] = p->data;
                         g_list_free (info->cur_items);
@@ -509,7 +510,8 @@ od_end_element (GMarkupParseContext *con
                         info->cur_server->props._buffer =
                                 CORBA_sequence_Bonobo_ActivationProperty_allocbuf (len);
 
-                        for (i = 0, p = g_list_reverse (info->cur_props); p; p = p->next, i++) {
+			info->cur_props = g_list_reverse (info->cur_props);
+                        for (i = 0, p = info->cur_props; p; p = p->next, i++) {
                                 Bonobo_ActivationProperty_copy (&info->cur_server->props._buffer[i],
                                                                 (Bonobo_ActivationProperty *) p->data);
                                 CORBA_free (p->data);


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- libbonobo.spec	29 Aug 2007 04:22:53 -0000	1.61
+++ libbonobo.spec	13 Sep 2007 01:41:45 -0000	1.62
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.19.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -26,6 +26,8 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=476398
+Patch1: list-leak.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -58,6 +60,8 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .list-leak
+
 %build
 intltoolize -f
 aclocal
@@ -122,6 +126,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-5
+- Plug a memory leak in bonobo-activation-server
+
 * Tue Aug 28 2007 Jesse Keating <jkeating at redhat.com> - 2.19.6-4
 - Require popt-devel in -devel.
 - And BuildRequire popt-devel.



From fedora-extras-commits at redhat.com  Thu Sep 13 02:13:50 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 22:13:50 -0400
Subject: comps comps-f7.xml.in,1.252,1.253 comps-fe6.xml.in,1.373,1.374
Message-ID: <200709130213.l8D2DoEq000720@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv699

Modified Files:
	comps-f7.xml.in comps-fe6.xml.in 
Log Message:
comps 6,7 for xsc



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- comps-f7.xml.in	11 Sep 2007 22:42:06 -0000	1.252
+++ comps-f7.xml.in	13 Sep 2007 02:13:20 -0000	1.253
@@ -1428,6 +1428,7 @@
       <packagereq type="optional">xpilot-ng</packagereq>
       <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
+      <packagereq type="optional">xsc</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xu4</packagereq>
       <packagereq type="optional">zasx</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- comps-fe6.xml.in	14 Aug 2007 00:11:34 -0000	1.373
+++ comps-fe6.xml.in	13 Sep 2007 02:13:20 -0000	1.374
@@ -566,6 +566,7 @@
       <packagereq type="optional">xpilot-ng</packagereq>
       <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
+      <packagereq type="optional">xsc</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xu4</packagereq>
       <packagereq type="optional">zasx</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 13 02:15:39 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 12 Sep 2007 22:15:39 -0400
Subject: comps comps-f8.xml.in,1.105,1.106
Message-ID: <200709130215.l8D2FdvJ000767@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv740

Modified Files:
	comps-f8.xml.in 
Log Message:
comps slingshot devel



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- comps-f8.xml.in	12 Sep 2007 14:42:12 -0000	1.105
+++ comps-f8.xml.in	13 Sep 2007 02:15:08 -0000	1.106
@@ -1534,6 +1534,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 13 03:11:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 12 Sep 2007 23:11:48 -0400
Subject: rpms/gnome-vfs2/devel glob-leak.patch, NONE, 1.1 gnome-vfs2.spec,
	1.164, 1.165
Message-ID: <200709130311.l8D3Bm1x008387@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8362

Modified Files:
	gnome-vfs2.spec 
Added Files:
	glob-leak.patch 
Log Message:
fix a memory leak


glob-leak.patch:

--- NEW FILE glob-leak.patch ---
diff -up gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c.glob-leak gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c
--- gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c.glob-leak	2007-09-12 23:07:28.000000000 -0400
+++ gnome-vfs-2.19.91/libgnomevfs/xdgmimeglob.c	2007-09-12 23:07:34.000000000 -0400
@@ -263,7 +263,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
 		{
 		  child = _xdg_glob_hash_node_new ();
 		  child->character = '\000';
-		  child->mime_type = mime_type;
+		  child->mime_type = strdup (mime_type);
 		  child->child = NULL;
 		  child->next = node->child;
 		  node->child = child;
@@ -272,7 +272,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
 	}
       else
 	{
-	  node->mime_type = mime_type;
+	  node->mime_type = strdup (mime_type);
 	}
     }
   else
@@ -477,7 +477,7 @@ _xdg_glob_hash_append_glob (XdgGlobHash 
       glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type));
       break;
     case XDG_GLOB_SIMPLE:
-      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, strdup (mime_type));
+      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, mime_type);
       break;
     case XDG_GLOB_FULL:
       glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type));


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-vfs2.spec	3 Sep 2007 04:26:21 -0000	1.164
+++ gnome-vfs2.spec	13 Sep 2007 03:11:15 -0000	1.165
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.19.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
@@ -72,6 +72,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=356772
 Patch8: gnome-vfs-2.16.0-no-dbus.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=427958
+Patch9: glob-leak.patch
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -124,6 +126,7 @@
 %patch201 -p0 -b .console
 
 %patch8 -p1 -b .no-dbus
+%patch9 -p1 -b .glob-leak
 
 %build
 
@@ -226,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-2
+- Fix a small memory leak
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Re-add gnome-mount dependency
 - Update to 2.19.91



From fedora-extras-commits at redhat.com  Thu Sep 13 03:36:53 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 12 Sep 2007 23:36:53 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.7,1.8
Message-ID: <200709130336.l8D3arpo008944@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8913/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
delete KMail/KNode transport migration scripts which break KDE 3


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdepimlibs.spec	9 Sep 2007 12:24:54 -0000	1.7
+++ kdepimlibs.spec	13 Sep 2007 03:36:20 -0000	1.8
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -68,6 +68,10 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# delete KMail/KNode transport migration scripts which break KDE 3
+# (we should only ship these once we start to migrate to KDE 4 kdepim)
+rm -rf %{buildroot}%{_kde4_appsdir}/kconf_update
+
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
@@ -99,7 +103,6 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_appsdir}/kabc/
-%{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/libical/
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -116,6 +119,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
+- delete KMail/KNode transport migration scripts which break KDE 3
+
 * Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
 - update to 3.93.0
 - drop kde4home patch (no longer applied)



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:25 -0700
Subject: [pkgdb] animorph was added for kwizart
Message-ID: <200709130341.l8D3fQjw002058@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package animorph with summary 3D Animation and Morph Library
Kevin Fenzi (kevin) has approved Package animorph
Kevin Fenzi (kevin) has added a Fedora devel branch for animorph with an owner of kwizart
Kevin Fenzi (kevin) has approved animorph in Fedora devel
Kevin Fenzi (kevin) has approved Package animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, 6) updated by kevin
Message-ID: <200709130341.l8D3fgAR005281@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, 7) updated by kevin
Message-ID: <200709130341.l8D3fhJY005290@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora, devel) updated by kevin
Message-ID: <200709130341.l8D3fhXl005301@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130341.l8D3fi0v005317@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:41:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:41:42 -0700
Subject: [pkgdb] animorph (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130341.l8D3fhOn005308@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for animorph
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on animorph (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on animorph (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/animorph



From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:16 -0400
Subject: rpms/animorph - New directory
Message-ID: <200709130342.l8D3gGCn009175@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph

Log Message:
Directory /cvs/extras/rpms/animorph added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:18 -0400
Subject: rpms/animorph/devel - New directory
Message-ID: <200709130342.l8D3gI2L009189@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph/devel

Log Message:
Directory /cvs/extras/rpms/animorph/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:21 -0400
Subject: rpms/animorph Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709130342.l8D3gLOu009214@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph

Added Files:
	Makefile import.log 
Log Message:
Setup of module animorph


--- NEW FILE Makefile ---
# Top level Makefile for module animorph
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 03:42:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:42:23 -0400
Subject: rpms/animorph/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709130342.l8D3gNkg009230@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPN9146/rpms/animorph/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module animorph


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: animorph
# $Id: Makefile,v 1.1 2007/09/13 03:42:21 kevin Exp $
NAME := animorph
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 fedora-extras-commits at redhat.com  Thu Sep 13 03:44:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:20 -0700
Subject: [pkgdb] perl-Geo-IP was added for mfleming
Message-ID: <200709130344.l8D3iNx8005412@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Geo-IP with summary Efficient Perl bindings for the GeoIP location database
Kevin Fenzi (kevin) has approved Package perl-Geo-IP
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Geo-IP with an owner of mfleming
Kevin Fenzi (kevin) has approved perl-Geo-IP in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, 7) updated by kevin
Message-ID: <200709130344.l8D3iX49002102@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, 6) updated by kevin
Message-ID: <200709130344.l8D3iXBU002111@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130344.l8D3iYxx002129@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130344.l8D3iYof002120@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Geo-IP
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Geo-IP (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:44:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:44:33 -0700
Subject: [pkgdb] perl-Geo-IP (Fedora, devel) updated by kevin
Message-ID: <200709130344.l8D3iYaI002138@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Geo-IP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Geo-IP



From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:33 -0400
Subject: rpms/perl-Geo-IP - New directory
Message-ID: <200709130345.l8D3jXqY009627@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP

Log Message:
Directory /cvs/extras/rpms/perl-Geo-IP added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:36 -0400
Subject: rpms/perl-Geo-IP/devel - New directory
Message-ID: <200709130345.l8D3jax1009641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP/devel

Log Message:
Directory /cvs/extras/rpms/perl-Geo-IP/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:39 -0400
Subject: rpms/perl-Geo-IP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709130345.l8D3jd3O009666@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Geo-IP


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Geo-IP
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 03:45:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 23:45:42 -0400
Subject: rpms/perl-Geo-IP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709130345.l8D3jgG7009684@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszJ9595/rpms/perl-Geo-IP/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Geo-IP


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Geo-IP
# $Id: Makefile,v 1.1 2007/09/13 03:45:39 kevin Exp $
NAME := perl-Geo-IP
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 fedora-extras-commits at redhat.com  Thu Sep 13 03:48:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:48:46 -0700
Subject: [pkgdb] keychain (Fedora EPEL, 5) updated by kevin
Message-ID: <200709130348.l8D3mlxS005449@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for keychain
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on keychain (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on keychain (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on keychain (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/keychain



From fedora-extras-commits at redhat.com  Thu Sep 13 03:48:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 12 Sep 2007 20:48:46 -0700
Subject: [pkgdb] keychain (Fedora EPEL, 4) updated by kevin
Message-ID: <200709130348.l8D3mliJ005458@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for keychain
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on keychain (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on keychain (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on keychain (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/keychain



From fedora-extras-commits at redhat.com  Thu Sep 13 04:51:15 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 00:51:15 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.2, 1.1.2.3 kde4.sh, 1.1.2.2,
	1.1.2.3 kdelibs.spec, 1.223.2.19, 1.223.2.20
Message-ID: <200709130451.l8D4pFeB018554@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18369/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
set QT_PLUGIN_PATH in kde4.sh and kde4.csh


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.csh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
 
+if ( ! $?QT_PLUGIN_PATH ) then
+  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
+  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.sh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
 
+if [ -z "$QT_PLUGIN_PATH" ]; then
+  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
+  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.19
retrieving revision 1.223.2.20
diff -u -r1.223.2.19 -r1.223.2.20
--- kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
+++ kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -222,6 +222,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
+- set QT_PLUGIN_PATH in kde4.sh and kde4.csh
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
 - fix strange coloring due to incomplete changes to KColorScheme
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:05:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Sep 2007 02:05:45 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.33,1.34
Message-ID: <200709130605.l8D65jQA005330@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	em8300-kmod.spec 
Log Message:
* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.5-49.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- em8300-kmod.spec	5 Sep 2007 06:17:33 -0000	1.33
+++ em8300-kmod.spec	13 Sep 2007 06:05:09 -0000	1.34
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.4-45.fc6}
+%{!?kversion: %define kversion 2.6.22.5-49.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.5-49.fc6.
+
 * Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.4-45.fc6.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:08:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 13 Sep 2007 02:08:56 -0400
Subject: rpms/libbonobo/devel notify-leak.patch, NONE, 1.1 libbonobo.spec,
	1.62, 1.63
Message-ID: <200709130608.l8D68uIi005549@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5479

Modified Files:
	libbonobo.spec 
Added Files:
	notify-leak.patch 
Log Message:
fix another leak


notify-leak.patch:

--- NEW FILE notify-leak.patch ---
diff -up libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak libbonobo-2.19.6/activation-server/activation-context-corba.c
--- libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak	2007-09-13 01:28:07.000000000 -0400
+++ libbonobo-2.19.6/activation-server/activation-context-corba.c	2007-09-13 01:27:08.000000000 -0400
@@ -324,6 +324,8 @@ activation_clients_cache_notify (void)
                 CORBA_Object_release (l2->data, &ev);
                 CORBA_exception_free (&ev);
         }
+
+	g_slist_free (notify);
 }
 
 gboolean


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libbonobo.spec	13 Sep 2007 01:41:45 -0000	1.62
+++ libbonobo.spec	13 Sep 2007 06:08:23 -0000	1.63
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.19.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -28,6 +28,8 @@
 Patch0: libbonobo-2.13.1-multishlib.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=476398
 Patch1: list-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=476448
+Patch2: notify-leak.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -61,6 +63,7 @@
 %endif
 
 %patch1 -p1 -b .list-leak
+%patch2 -p1 -b .notify-leak
 
 %build
 intltoolize -f
@@ -126,6 +129,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-6
+- Plug a memory leak in bonobo-activation-server
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-5
 - Plug a memory leak in bonobo-activation-server
 



From fedora-extras-commits at redhat.com  Thu Sep 13 06:30:31 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:30:31 -0400
Subject: rpms/perl-Geo-IP/devel Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130630.l8D6UVrO006481@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial import.


Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:29:54 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:29:54 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:32:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Thu, 13 Sep 2007 02:32:52 -0400
Subject: rpms/cadaver/devel cadaver.spec, 1.29,
	1.30 cadaver-0.22.5.tar.gz.asc, 1.1, NONE
Message-ID: <200709130632.l8D6Wq9V006713@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/cadaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6647

Modified Files:
	cadaver.spec 
Removed Files:
	cadaver-0.22.5.tar.gz.asc 
Log Message:
* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 0.23.0-2
- spec file cleanup (#225634)



Index: cadaver.spec
===================================================================
RCS file: /cvs/extras/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cadaver.spec	23 Aug 2007 07:49:12 -0000	1.29
+++ cadaver.spec	13 Sep 2007 06:32:19 -0000	1.30
@@ -1,13 +1,13 @@
 Name: cadaver
 Version: 0.23.0
-Release: 1
+Release: 2
 Summary: Command-line WebDAV client
 License: GPLv2+
 Group: Applications/Internet
 Source: http://www.webdav.org/cadaver/%{name}-%{version}.tar.gz
 URL: http://www.webdav.org/cadaver/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: neon-devel >= 0:0.27.0-1, readline-devel, ncurses-devel
+BuildRequires: neon-devel >= 0.27.0, readline-devel, ncurses-devel
 
 %description
 cadaver is a command-line WebDAV client, with support for file upload, 
@@ -25,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -33,12 +33,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%{_bindir}/*
+%defattr(-,root,root,-)
 %doc NEWS FAQ THANKS TODO COPYING README ChangeLog
+%{_bindir}/*
 %{_mandir}/*/*
 
 %changelog
+* Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 0.23.0-2
+- spec file cleanup (#225634)
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 0.23.0-1
 - update to 0.23.0
 


--- cadaver-0.22.5.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 06:35:03 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:35:03 -0400
Subject: rpms/perl-Geo-IP/F-7 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130635.l8D6Z3f7006974@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial F7 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:34:30 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:34:30 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:36:36 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:36:36 -0400
Subject: rpms/perl-Geo-IP/FC-6 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130636.l8D6aaQ1007117@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial FC6 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:36:04 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:36:04 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:40:21 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:40:21 -0400
Subject: rpms/perl-Geo-IP/EL-4 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130640.l8D6eLRO007360@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7314

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial EPEL-4 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:39:46 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:39:46 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 06:42:01 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 02:42:01 -0400
Subject: rpms/perl-Geo-IP/EL-5 Geo-IP-1.28-example.diff, NONE,
	1.1 Geo-IP-1.28-yahoo-namelookuptest.diff, NONE,
	1.1 perl-Geo-IP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709130642.l8D6g1Te007455@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/perl-Geo-IP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418

Modified Files:
	.cvsignore sources 
Added Files:
	Geo-IP-1.28-example.diff Geo-IP-1.28-yahoo-namelookuptest.diff 
	perl-Geo-IP.spec 
Log Message:
Initial EPEL-5 branch

Geo-IP-1.28-example.diff:

--- NEW FILE Geo-IP-1.28-example.diff ---
--- example/netspeed.pl.orig	2007-08-26 10:16:09.000000000 +1000
+++ example/netspeed.pl	2007-08-26 10:16:24.000000000 +1000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use Geo::IP;
 

Geo-IP-1.28-yahoo-namelookuptest.diff:

--- NEW FILE Geo-IP-1.28-yahoo-namelookuptest.diff ---
--- t/2_namelookup.t.orig	2007-08-26 10:01:11.000000000 +1000
+++ t/2_namelookup.t	2007-08-26 10:01:30.000000000 +1000
@@ -5,7 +5,7 @@
 
 $^W = 1;
 
-BEGIN { plan tests => 11 }
+BEGIN { plan tests => 10 }
 
 use Geo::IP;
 
@@ -29,4 +29,3 @@
 194.244.83.2	IT
 203.15.106.23	AU
 196.31.1.1	ZA
-yahoo.com	US


--- NEW FILE perl-Geo-IP.spec ---
Name:  perl-Geo-IP
Version: 1.28
Release: 3%{?dist}
Summary: Efficient Perl bindings for the GeoIP location database       

Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Geo-IP/            
Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Geo-IP-%{version}.tar.gz   
Patch0: Geo-IP-1.28-yahoo-namelookuptest.diff
Patch1:	Geo-IP-1.28-example.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GeoIP-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package contains Perl bindings for the GeoIP IP/hostname to
country/location/organization database.

This package requires Maxmind's GeoIP libraries but is often faster than other,
similar modules.  

%prep
%setup -q -n Geo-IP-%{version}

%patch0 -p0 -b .namelookup
%patch1 -p0

%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
# Avoid uneeded dependencies in the docs.
find example/ -type f | xargs chmod -x

%check
make test

%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} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes INSTALL example
%{perl_vendorarch}/Geo
%{perl_vendorarch}/auto/Geo
%{_mandir}/man3/Geo::IP*.3*
%{_mandir}/man3/Geo::Mirror.3*

%changelog
* Mon Sep 3 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-4
- Fix %%patch invocation to help avoid a bogus interpreter issue
- First build for Extras

* Sun Aug 26 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-3
- Actually apply the patch :-)
- Apply consistency in macro usage
- Remove explicit GeoIP dependency as it should be pulled in automagically
- Patch to example/netspeed to avoid bogus interpreter
- Update License to match current Fedora guidelines.

* Fri Jul 20 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-2
- Patch out mysterious and ephemeral test failure

* Sun Jul 8 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.28-1
- Update to 1.28

* Sun Jun 17 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-4.mf
- New URLs
- Fix MakeMaker build requirement
- Include test suite check
- Add examples directory in documentation

* Sat Nov 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-3.mf
- Fix version tag to go with my conventions
- Bump for FC6

* Sun Feb 19 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.27-2
- Spin a version for Extras, removing the braindamage from my previous
  releases.

* Fri Sep 9 2005 mfleming at enlartenment.com - 1.27-1.fc4.mf
- 1.27

* Wed Aug 3 2005 mfleming at enlartenment.com - 1.26-2.fc4.mf
- Rebuilt against new geoip version

* Sun Jun 12 2005 mfleming at enlartenment.com - 1.26-1.fc4.mf
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:45:39 -0000	1.1
+++ .cvsignore	13 Sep 2007 06:41:28 -0000	1.2
@@ -0,0 +1 @@
+Geo-IP-1.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Geo-IP/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:45:39 -0000	1.1
+++ sources	13 Sep 2007 06:41:28 -0000	1.2
@@ -0,0 +1 @@
+6a7e6ff4d238f807f30577bd23702002  Geo-IP-1.28.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:06:27 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:06:27 -0400
Subject: rpms/mod_security/devel modsecurity_localrules.conf, NONE,
	1.1 mod_security.spec, 1.21, 1.22
Message-ID: <200709130706.l8D76RZF015167@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15110

Modified Files:
	mod_security.spec 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep  13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- Update to 2.1.3
- Update License tag per guidelines.



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_security.spec	3 Sep 2007 08:32:11 -0000	1.21
+++ mod_security.spec	13 Sep 2007 07:05:54 -0000	1.22
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
-Release: 3%{?dist}
-License: GPL
+Version: 2.1.3
+Release: 1%{?dist}
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep  13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- Update to 2.1.3
+- Update License tag per guidelines.
+
 * Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1.1-3
 - rebuild for fixed 32-bit APR (#254241)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 07:09:48 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:09:48 -0400
Subject: rpms/mod_security/devel .cvsignore,1.8,1.9 sources,1.10,1.11
Message-ID: <200709130709.l8D79mdL015533@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15457

Modified Files:
	.cvsignore sources 
Log Message:
new sources uploaded


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 10:25:54 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:09:15 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 10:25:54 -0000	1.10
+++ sources	13 Sep 2007 07:09:15 -0000	1.11
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:20:51 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:20:51 -0400
Subject: rpms/python-GeoIP/devel GeoIP-Python-1.2.1-ccodes.patch,NONE,1.1
Message-ID: <200709130720.l8D7Kp9S015935@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15924

Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);



From fedora-extras-commits at redhat.com  Thu Sep 13 07:25:37 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:25:37 -0400
Subject: rpms/python-GeoIP/devel python-GeoIP.spec,1.5,1.6
Message-ID: <200709130725.l8D7PbYk016191@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16168

Modified Files:
	python-GeoIP.spec 
Log Message:
Bump and update license tag


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-GeoIP.spec	6 Sep 2007 00:35:51 -0000	1.5
+++ python-GeoIP.spec	13 Sep 2007 07:25:04 -0000	1.6
@@ -2,11 +2,11 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
 Patch0:		GeoIP-Python-1.2.1-ccodes.patch
@@ -44,9 +44,10 @@
 
 
 %changelog
-* Wed Sep 5 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
+- Update License tag per new guidelines
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 07:36:46 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:36:46 -0400
Subject: rpms/mod_security/F-7 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.19, 1.20 sources,
	1.10, 1.11
Message-ID: <200709130736.l8D7ak7b016744@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16701

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 10:23:37 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:36:14 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/mod_security.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_security.spec	19 Jun 2007 10:23:37 -0000	1.19
+++ mod_security.spec	13 Sep 2007 07:36:14 -0000	1.20
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 10:23:37 -0000	1.10
+++ sources	13 Sep 2007 07:36:14 -0000	1.11
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:46:21 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:46:21 -0400
Subject: rpms/mod_security/FC-6 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.17, 1.18 sources,
	1.9, 1.10
Message-ID: <200709130746.l8D7kLsp017139@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17103

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 09:53:32 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:45:49 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/mod_security.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_security.spec	19 Jun 2007 09:53:32 -0000	1.17
+++ mod_security.spec	13 Sep 2007 07:45:49 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jun 2007 09:53:32 -0000	1.9
+++ sources	13 Sep 2007 07:45:49 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:50:09 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:50:09 -0400
Subject: rpms/mod_security/EL-5 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.17, 1.18 sources,
	1.9, 1.10
Message-ID: <200709130750.l8D7o9ho017395@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17356

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 09:59:15 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:49:36 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_security.spec	19 Jun 2007 09:59:15 -0000	1.17
+++ mod_security.spec	13 Sep 2007 07:49:36 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jun 2007 09:59:15 -0000	1.9
+++ sources	13 Sep 2007 07:49:36 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 07:53:46 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 03:53:46 -0400
Subject: rpms/mod_security/EL-4 modsecurity_localrules.conf, NONE,
	1.1 .cvsignore, 1.8, 1.9 mod_security.spec, 1.14, 1.15 sources,
	1.9, 1.10
Message-ID: <200709130753.l8D7rkIk017611@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17580

Modified Files:
	.cvsignore mod_security.spec sources 
Added Files:
	modsecurity_localrules.conf 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines



--- NEW FILE modsecurity_localrules.conf ---
# Drop your local rules in here.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Aug 2007 00:19:09 -0000	1.8
+++ .cvsignore	13 Sep 2007 07:53:14 -0000	1.9
@@ -1,3 +1 @@
-modsecurity-apache_2.1.1.tar.gz
-mod_security.conf
-modsecurity_localrules.conf
+modsecurity-apache_2.1.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_security.spec	4 Aug 2007 00:19:09 -0000	1.14
+++ mod_security.spec	13 Sep 2007 07:53:14 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.1
+Version: 2.1.3
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
+- New upstream release
+- Update License tag per guidelines
+
 * Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
 - New upstream release
 - Drop ASCIIZ rule (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Aug 2007 00:19:09 -0000	1.9
+++ sources	13 Sep 2007 07:53:14 -0000	1.10
@@ -1,3 +1 @@
-ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
-f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
-80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf
+b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 08:05:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 04:05:20 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.3, 1.1.2.4 kde4.sh, 1.1.2.3,
	1.1.2.4 kdelibs.spec, 1.223.2.20, 1.223.2.21
Message-ID: <200709130805.l8D85KZI024391@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24327/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3 (workaround for #244065 no longer needed, fixed in 3.93.0)


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 ## if not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+  fi
+fi
 
 ## if not using IP6, speeds DNS operations
 # [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.20
retrieving revision 1.223.2.21
diff -u -r1.223.2.20 -r1.223.2.21
--- kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
+++ kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -166,6 +166,9 @@
 done
 popd
 
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+
 
 %post
 /sbin/ldconfig ||:
@@ -186,6 +189,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
+%config(noreplace) %{_sysconfdir}/profile.d/*
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
@@ -222,6 +226,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
+- actually install kde4.sh and kde4.csh
+- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
+  (workaround for #244065 no longer needed, fixed in 3.93.0)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
 - set QT_PLUGIN_PATH in kde4.sh and kde4.csh
 



From fedora-extras-commits at redhat.com  Thu Sep 13 09:58:50 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 13 Sep 2007 05:58:50 -0400
Subject: rpms/scim/devel scim-1.4.7-ja-sinhala-236715.patch, NONE,
	1.1 scim.spec, 1.95, 1.96 xinput-scim, 1.12, 1.13
Message-ID: <200709130958.l8D9woA6006482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6443

Modified Files:
	scim.spec xinput-scim 
Added Files:
	scim-1.4.7-ja-sinhala-236715.patch 
Log Message:
- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
  Sinhala (#236715)
- gtk2 now owns %{_libdir}/gtk-2.0/immodules
- add Nepali meta package
- specify full paths in xinput script and use SHORT_DESC



scim-1.4.7-ja-sinhala-236715.patch:

--- NEW FILE scim-1.4.7-ja-sinhala-236715.patch ---
--- scim-1.4.7/po/ja.po~	2007-06-27 00:31:56.000000000 +1000
+++ scim-1.4.7/po/ja.po	2007-09-13 17:37:32.000000000 +1000
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-22 11:40-0700\n"
-"PO-Revision-Date: 2005-12-11 11:00+0900\n"
+"PO-Revision-Date: 2007-09-13 17:37+1000\n"
 "Last-Translator: Yukiko Bando <ybando at k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -314,7 +314,7 @@ msgstr "????????????"
 
 #: ../src/scim_utility.cpp:768
 msgid "Sinhala"
-msgstr ""
+msgstr "???????????????"
 
 #: ../src/scim_utility.cpp:769 ../src/scim_keyboard_layout_data.h:4618
 msgid "Slovak"


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- scim.spec	17 Aug 2007 02:44:09 -0000	1.95
+++ scim.spec	13 Sep 2007 09:58:17 -0000	1.96
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -38,6 +38,7 @@
 Patch12:   scim-fix-unload-segfault.patch
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch17:   scim-1.4.5-no-rpath-libdir.patch
+Patch18:   scim-1.4.7-ja-sinhala-236715.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -69,6 +70,8 @@
 %package gtk
 Summary:    Smart Common Input Method Gtk IM module
 Group:      System Environment/Libraries
+# for %{_libdir}/gtk-2.0/immodules
+Requires: gtk2 >= 2.11.6-7.fc8
 # for update-gtk-immodules
 Requires(post): gtk2 >= 2.9.1-2
 Requires(postun): gtk2 >= 2.9.1-2
@@ -121,6 +124,7 @@
 %lang_meta_pkg latin scim-m17n, m17n-db-latin
 %lang_meta_pkg malayalam scim-m17n, m17n-db-malayalam m17n-contrib-malayalam
 %lang_meta_pkg marathi scim-m17n, m17n-contrib-marathi
+%lang_meta_pkg nepali scim-m17n m17n-contrib-nepali
 %lang_meta_pkg oriya scim-m17n, m17n-db-oriya m17n-contrib-oriya
 %lang_meta_pkg punjabi scim-m17n, m17n-db-punjabi m17n-contrib-punjabi
 %lang_meta_pkg sinhalese scim-sinhala scim-m17n m17n-db-sinhala m17n-contrib-sinhala
@@ -147,6 +151,7 @@
 %patch12 -p1 -b .12-unloadsegfault~
 %patch15 -p1 -b .15-key-snooper~
 %patch17 -p1 -b .17-rpath~
+%patch18 -p1 -b .18-sinhala~
 
 %if %{snapshot}
 ./bootstrap
@@ -269,7 +274,7 @@
 
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/gtk-2.0/immodules
+%{_libdir}/gtk-2.0/immodules/im-scim.so
 
 
 %files libs
@@ -285,6 +290,13 @@
 
 
 %changelog
+* Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
+- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
+  Sinhala (#236715)
+- gtk2 now owns %{_libdir}/gtk-2.0/immodules
+- add Nepali meta package
+- specify full paths in xinput script and use SHORT_DESC
+
 * Fri Aug 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-2
 - update License field
 - modify xinput.d script to not startup scim if no IMEs are installed


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xinput-scim	17 Aug 2007 02:44:09 -0000	1.12
+++ xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
@@ -21,8 +21,10 @@
 if [ "$IMENGINE_NO" -ge 1 ]; then
 
   XIM=SCIM
-  XIM_PROGRAM=scim
+  XIM_PROGRAM=/usr/bin/scim
   XIM_ARGS="-d"
+  PREFERENCE_PROGRAM=/usr/bin/scim-setup
+  SHORT_DESC="SCIM"
 
   gtkimm_exists () {
 	# for multilib check both immodules installed



From fedora-extras-commits at redhat.com  Thu Sep 13 10:04:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 13 Sep 2007 06:04:22 -0400
Subject: comps comps-f8.xml.in,1.106,1.107
Message-ID: <200709131004.l8DA4MdN012667@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589

Modified Files:
	comps-f8.xml.in 
Log Message:
- make scim-tables-* (except chinese) optional
- add fonts-hindi and new scim-lang-nepali to Nepali Support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- comps-f8.xml.in	13 Sep 2007 02:15:08 -0000	1.106
+++ comps-f8.xml.in	13 Sep 2007 10:03:52 -0000	1.107
@@ -72,10 +72,10 @@
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-arabic</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
+      <packagereq type="optional">scim-tables-arabic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1292,8 +1292,8 @@
     <langonly>am</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ethiopic</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-amharic</packagereq>
       <packagereq type="optional">m17n-db-amharic</packagereq>
+      <packagereq type="optional">scim-tables-amharic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2703,6 +2703,21 @@
     </packagelist>
   </group>
   <group>
+    <id>nepali-support</id>
+    <_name>Nepali Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ne</langonly>
+    <packagelist>
+      <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
+      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-nepali</packagereq>
+      <packagereq type="optional">scim-tables-nepali</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>network-server</id>
     <_name>Network Servers</_name>
     <_description>These packages include network-based servers such as DHCP, Kerberos and NIS.</_description>
@@ -2753,19 +2768,6 @@
     </packagelist>
   </group>
   <group>
-    <id>nepali-support</id>
-    <_name>Nepali Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <langonly>ne</langonly>
-    <packagelist>
-      <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
-      <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-nepali</packagereq>
-    </packagelist>
-  </group>
-  <group>
     <id>news-server</id>
     <_name>News Server</_name>
     <_description>This group allows you to configure the system as a news server.</_description>
@@ -3030,10 +3032,10 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
       <packagereq type="conditional" requires="stardict">stardict-dic-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-russian</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
+      <packagereq type="optional">scim-tables-russian</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3642,7 +3644,7 @@
       <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="xorg-x11-server-Xorg">scim-lang-thai</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-thai</packagereq>
+      <packagereq type="optional">scim-tables-thai</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3762,7 +3764,7 @@
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
       <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-vietnamese</packagereq>
+      <packagereq type="optional">scim-tables-vietnamese</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Thu Sep 13 10:32:05 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 06:32:05 -0400
Subject: rpms/animorph/devel animorph-0.2-pkgconfig.patch, NONE,
	1.1 animorph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131032.l8DAW5Yh013831@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13793/devel

Modified Files:
	.cvsignore sources 
Added Files:
	animorph-0.2-pkgconfig.patch animorph.spec 
Log Message:
Initial import


animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/animorph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 03:42:21 -0000	1.1
+++ .cvsignore	13 Sep 2007 10:31:33 -0000	1.2
@@ -0,0 +1 @@
+animorph-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	13 Sep 2007 10:31:33 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 10:39:03 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:39:03 -0400
Subject: rpms/bacula/F-7 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.2,1.3
Message-ID: <200709131039.l8DAd3uD014125@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14078

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-7/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:25 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:38:30 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:39:34 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 06:39:34 -0400
Subject: rpms/animorph/F-7 animorph.spec, NONE,
	1.1 animorph-0.2-pkgconfig.patch, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709131039.l8DAdYaS014152@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14117

Modified Files:
	sources 
Added Files:
	animorph.spec animorph-0.2-pkgconfig.patch 
Log Message:
Import for F-7



--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 

animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	13 Sep 2007 10:39:01 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 10:43:01 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:43:01 -0400
Subject: rpms/bacula/FC-6 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.2,1.3
Message-ID: <200709131043.l8DAh1tw014293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/FC-6/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:28 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:42:27 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:47:27 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:47:27 -0400
Subject: rpms/bacula/EL-5 2.0.3-restore.patch,NONE,1.1
Message-ID: <200709131047.l8DAlRK6014488@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14477

Added Files:
	2.0.3-restore.patch 
Log Message:
* Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
- Corrected the %post alternatives calls. Fixing #249560.


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:48:43 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:48:43 -0400
Subject: rpms/bacula/EL-5 bacula.spec,1.2,1.3
Message-ID: <200709131048.l8DAmhL1014694@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14624

Modified Files:
	bacula.spec 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.spec	25 Jul 2007 15:28:23 -0000	1.2
+++ bacula.spec	13 Sep 2007 10:48:09 -0000	1.3
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -33,6 +33,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -330,6 +331,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -919,6 +921,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:51:42 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:51:42 -0400
Subject: rpms/bacula/EL-4 2.0.3-restore.patch,NONE,1.1 bacula.spec,1.3,1.4
Message-ID: <200709131051.l8DApgh3014891@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14802

Modified Files:
	bacula.spec 
Added Files:
	2.0.3-restore.patch 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981


2.0.3-restore.patch:

--- NEW FILE 2.0.3-restore.patch ---
diff -up bacula-2.0.3/src/stored/dev.h.restore bacula-2.0.3/src/stored/dev.h
--- bacula-2.0.3/src/stored/dev.h.restore	2007-09-13 12:32:46.000000000 +0200
+++ bacula-2.0.3/src/stored/dev.h	2007-09-13 12:34:56.000000000 +0200
@@ -438,6 +438,7 @@ public:
    uint32_t StartFile;                /* Start write file */
    uint32_t StartBlock;               /* Start write block */
    uint32_t EndBlock;                 /* Ending block written */
+   int64_t  VolMediaId;               /* MediaId */
    int64_t job_spool_size;            /* Current job spool size */
    int64_t max_job_spool_size;        /* Max job spool size */
    char VolumeName[MAX_NAME_LENGTH];  /* Volume name */
diff -up bacula-2.0.3/src/stored/askdir.c.restore bacula-2.0.3/src/stored/askdir.c
--- bacula-2.0.3/src/stored/askdir.c.restore	2007-09-13 12:32:54.000000000 +0200
+++ bacula-2.0.3/src/stored/askdir.c	2007-09-13 12:34:56.000000000 +0200
@@ -391,7 +391,7 @@ bool dir_create_jobmedia_record(DCR *dcr
       dcr->StartFile, dcr->EndFile,
       dcr->StartBlock, dcr->EndBlock, 
       dcr->Copy, dcr->Stripe, 
-      edit_uint64(dcr->dev->VolCatInfo.VolMediaId, ed1));
+      edit_uint64(dcr->VolMediaId, ed1));
     Dmsg1(100, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "create_jobmedia error bnet_recv\n");
diff -up bacula-2.0.3/src/stored/bscan.c.restore bacula-2.0.3/src/stored/bscan.c
--- bacula-2.0.3/src/stored/bscan.c.restore	2007-09-13 12:32:36.000000000 +0200
+++ bacula-2.0.3/src/stored/bscan.c	2007-09-13 12:34:56.000000000 +0200
@@ -328,6 +328,7 @@ static bool bscan_mount_next_read_volume
 //       mdcr->EndBlock = (uint32_t)dcr->file_addr;
 //       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mdcr->VolMediaId = dcr->VolMediaId;
       mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
@@ -472,6 +473,7 @@ static bool record_cb(DCR *dcr, DEV_RECO
             dcr->VolFirstIndex = dcr->FileIndex = 0;
             dcr->StartBlock = dcr->EndBlock = 0;
             dcr->StartFile = dcr->EndFile = 0;
+            dcr->VolMediaId = 0;
          }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
@@ -1174,6 +1176,7 @@ static int create_jobmedia_record(B_DB *
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
 #endif
    } 
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
diff -up bacula-2.0.3/src/stored/block.c.restore bacula-2.0.3/src/stored/block.c
--- bacula-2.0.3/src/stored/block.c.restore	2007-09-13 12:32:42.000000000 +0200
+++ bacula-2.0.3/src/stored/block.c	2007-09-13 12:34:56.000000000 +0200
@@ -612,6 +612,7 @@ bool write_block_to_dev(DCR *dcr)
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    if (dcr->VolFirstIndex == 0 && block->FirstIndex > 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -1107,6 +1108,7 @@ reread:
       dev->block_num = dcr->EndBlock;
       dev->file = dcr->EndFile;
    }
+   dcr->VolMediaId = dev->VolCatInfo.VolMediaId;
    dev->file_addr += block->read_len;
    dev->file_size += block->read_len;
 


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula.spec	30 Jul 2007 21:43:37 -0000	1.3
+++ bacula.spec	13 Sep 2007 10:51:09 -0000	1.4
@@ -36,6 +36,7 @@
 Patch7: 2.0.3-scheduler-next-hour.patch
 Patch8: 2.0.3-verify.patch
 Patch9: 2.0.3-tls-disconnect.patch
+Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -333,6 +334,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p0
+%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -923,6 +925,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
+- Applied restore fix to sd. #288981
+
 * Wed Jul 25 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-9
 - Corrected the %%post alternatives calls. Fixing #249560.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 10:52:51 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Sep 2007 06:52:51 -0400
Subject: rpms/bacula/EL-4 bacula.spec,1.4,1.5
Message-ID: <200709131052.l8DAqpIL014944@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14911

Modified Files:
	bacula.spec 
Log Message:
* Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
- Applied restore fix to sd. #288981



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bacula.spec	13 Sep 2007 10:51:09 -0000	1.4
+++ bacula.spec	13 Sep 2007 10:52:18 -0000	1.5
@@ -11,7 +11,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:08:57 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 13 Sep 2007 08:08:57 -0400
Subject: rpms/re2c/devel .cvsignore, 1.3, 1.4 re2c.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709131208.l8DC8v9B029558@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/re2c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29518

Modified Files:
	.cvsignore re2c.spec sources 
Log Message:
Update to 0.12.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2007 07:51:27 -0000	1.3
+++ .cvsignore	13 Sep 2007 12:08:24 -0000	1.4
@@ -1 +1 @@
-re2c-0.12.2.tar.gz
+re2c-0.12.3.tar.gz


Index: re2c.spec
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/re2c.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- re2c.spec	23 Aug 2007 07:51:27 -0000	1.2
+++ re2c.spec	13 Sep 2007 12:08:24 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Tool for generating C-based recognizers from regular expressions
 Name: re2c
-Version: 0.12.2
+Version: 0.12.3
 Release: 1%{?dist}
 License: Public Domain
 Group: Development/Tools
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 0.12.3-1
+- Update to 0.12.3.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 0.12.2-1
 - Update to 0.12.2.
 - Update URL location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/re2c/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Aug 2007 07:51:27 -0000	1.3
+++ sources	13 Sep 2007 12:08:24 -0000	1.4
@@ -1 +1 @@
-6e010ea443c89284e125df0898052d84  re2c-0.12.2.tar.gz
+8b8d6317c2a5ccc68ee54de19cf9893b  re2c-0.12.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:01 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:15:01 -0400
Subject: rpms/python-GeoIP/F-7 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.4, 1.5
Message-ID: <200709131215.l8DCF1L8029785@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29738

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/F-7/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	13 Sep 2007 12:14:27 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -21,6 +22,7 @@
 %prep
 %setup -q -n GeoIP-Python-%{version}
 
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +45,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:28 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:28 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFStq010870@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the approveacls acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:40 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:40 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFe1C010887@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the commit acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:42 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:42 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFgXm010896@app3.fedora.phx.redhat.com>

Anthony Green (green) has set the watchcommits acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:15:45 2007
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 13 Sep 2007 05:15:45 -0700
Subject: [pkgdb] ws-commons-util had acl change status
Message-ID: <200709131215.l8DCFjNe009178@app4.fedora.phx.redhat.com>

Anthony Green (green) has set the watchbugzilla acl on ws-commons-util (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ws-commons-util



From fedora-extras-commits at redhat.com  Thu Sep 13 12:20:14 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:20:14 -0400
Subject: rpms/python-GeoIP/FC-6 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.3, 1.4
Message-ID: <200709131220.l8DCKECQ030035@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29998

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/FC-6/python-GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-GeoIP.spec	4 Sep 2006 10:14:12 -0000	1.3
+++ python-GeoIP.spec	13 Sep 2007 12:19:41 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Mon Sep 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-5
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:23:11 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:23:11 -0400
Subject: rpms/python-GeoIP/EL-4 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.4, 1.5
Message-ID: <200709131223.l8DCNBoX030273@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30175

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-4/python-GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-GeoIP.spec	9 Dec 2006 05:09:32 -0000	1.4
+++ python-GeoIP.spec	13 Sep 2007 12:22:39 -0000	1.5
@@ -2,13 +2,14 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
@@ -20,7 +21,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +44,12 @@
 
 
 %changelog
+
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:29:40 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:29:40 -0400
Subject: rpms/python-GeoIP/EL-5 GeoIP-Python-1.2.1-ccodes.patch, NONE,
	1.1 python-GeoIP.spec, 1.3, 1.4
Message-ID: <200709131229.l8DCTenJ030609@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30574

Modified Files:
	python-GeoIP.spec 
Added Files:
	GeoIP-Python-1.2.1-ccodes.patch 
Log Message:
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
  (bz #243696)
- Update License tag per guidelines.


GeoIP-Python-1.2.1-ccodes.patch:

--- NEW FILE GeoIP-Python-1.2.1-ccodes.patch ---
diff -up GeoIP-Python-1.2.1/py_GeoIP.c.ccodes GeoIP-Python-1.2.1/py_GeoIP.c
--- GeoIP-Python-1.2.1/py_GeoIP.c.ccodes	2005-06-28 09:28:37.000000000 -0400
+++ GeoIP-Python-1.2.1/py_GeoIP.c	2007-09-04 19:00:51.000000000 -0400
@@ -306,6 +306,28 @@ initGeoIP(void) 
   m = Py_InitModule("GeoIP", GeoIP_Class_methods);
   d = PyModule_GetDict(m);
 
+  int total_ccodes = 251;
+
+  PyObject *ccode = PyTuple_New(total_ccodes);
+  PyObject *cname = PyDict_New();
+  PyObject *ccont = PyDict_New();
+  PyObject *s;
+
+  int i = 0;
+  for (; i<total_ccodes; i++)
+  {
+    s = PyString_FromString(GeoIP_country_code[i]);
+    PyTuple_SET_ITEM(ccode, i, s);
+    Py_INCREF(s);
+    PyDict_SetItem(cname, s, PyString_FromString(GeoIP_country_name[i]));
+    Py_INCREF(s);
+    PyDict_SetItem(ccont, s, PyString_FromString(GeoIP_country_continent[i]));
+  };
+
+  PyDict_SetItemString(d, "country_codes", ccode);
+  PyDict_SetItemString(d, "country_names", cname);
+  PyDict_SetItemString(d, "country_continents", ccont);
+
   tmp = PyInt_FromLong(0);
   PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
   Py_DECREF(tmp);


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/EL-5/python-GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-GeoIP.spec	4 Sep 2006 10:14:12 -0000	1.3
+++ python-GeoIP.spec	13 Sep 2007 12:29:08 -0000	1.4
@@ -2,17 +2,17 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.maxmind.com/download/geoip/api/python/
 Source0:        http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-%{version}.tar.gz
+Patch0:		GeoIP-Python-1.2.1-ccodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q -n GeoIP-Python-%{version}
-
+%patch0 -p1 -b .ccodes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -43,6 +43,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
+- Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
+  (bz #243696)
+- Update License tag per guidelines.
+
 * Mon Sep 4 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-5
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 13 12:30:11 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:30:11 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.148, 1.149 libselinux.spec,
	1.283, 1.284 sources, 1.150, 1.151
Message-ID: <200709131230.l8DCUBam030697@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30601

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	23 Aug 2007 20:56:16 -0000	1.148
+++ .cvsignore	13 Sep 2007 12:29:38 -0000	1.149
@@ -127,3 +127,4 @@
 libselinux-2.0.29.tgz
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
+libselinux-2.0.33.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- libselinux.spec	6 Sep 2007 12:37:00 -0000	1.283
+++ libselinux.spec	13 Sep 2007 12:29:38 -0000	1.284
@@ -1,12 +1,11 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.31
-Release: 4%{?dist}
+Version: 2.0.33
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -49,7 +48,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -124,6 +122,12 @@
 
 %changelog
 
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
+- Upgrade to latest from NSA
+	* Re-map a getxattr return value of 0 to a getfilecon return value of -1 with errno EOPNOTSUPP from Stephen Smalley.
+	* Fall back to the compat code for security_class_to_string and security_av_perm_to_string from Stephen Smalley.
+	* Fix swig binding for rpm_execcon from James Athey.
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.31-4
 - Apply James Athway patch to fix rpm_execcon python binding
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	23 Aug 2007 20:56:16 -0000	1.150
+++ sources	13 Sep 2007 12:29:38 -0000	1.151
@@ -1 +1 @@
-5cc13dcc33d5a9c88a625b4a49626e9b  libselinux-2.0.31.tgz
+0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:30:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:30:15 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.78, 1.79 libsemanage.spec,
	1.132, 1.133 sources, 1.80, 1.81
Message-ID: <200709131230.l8DCUFuu030738@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30627

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
- Upgrade to latest from NSA
	* Change to use getpw* function calls to the _r versions from Todd Miller.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	5 Sep 2007 18:51:36 -0000	1.78
+++ .cvsignore	13 Sep 2007 12:29:42 -0000	1.79
@@ -84,3 +84,4 @@
 libsemanage-2.0.3.tgz
 libsemanage-2.0.4.tgz
 libsemanage-2.0.5.tgz
+libsemanage-2.0.6.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- libsemanage.spec	6 Sep 2007 02:48:04 -0000	1.132
+++ libsemanage.spec	13 Sep 2007 12:29:42 -0000	1.133
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.5
+Version: 2.0.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -78,6 +78,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
+- Upgrade to latest from NSA
+	* Change to use getpw* function calls to the _r versions from Todd Miller.
+
 * Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
 - Upgrade to latest from NSA
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	5 Sep 2007 18:51:36 -0000	1.80
+++ sources	13 Sep 2007 12:29:42 -0000	1.81
@@ -1 +1 @@
-9d34a0b2f3033ee90489dbb516653b49  libsemanage-2.0.5.tgz
+ee1ccbd5cb4f0a08f85dd92a861283f8  libsemanage-2.0.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:32:29 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:32:29 -0400
Subject: rpms/python-GeoIP/F-7 python-GeoIP.spec,1.5,1.6
Message-ID: <200709131232.l8DCWThf031030@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30924

Modified Files:
	python-GeoIP.spec 
Log Message:
Fix requires


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/F-7/python-GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-GeoIP.spec	13 Sep 2007 12:14:27 -0000	1.5
+++ python-GeoIP.spec	13 Sep 2007 12:31:57 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
@@ -13,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -45,10 +44,11 @@
 
 
 %changelog
-* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-7
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
 - Update License tag per guidelines.
+- Remove redundant Requires per the python packaging guidelines
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 12:32:48 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 08:32:48 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.159,
	1.160 policycoreutils.spec, 1.447, 1.448 sources, 1.164, 1.165
Message-ID: <200709131232.l8DCWmCC031036@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31004

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
- Upgrade version of sepolgen from NSA
	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.
	* Suppress generation of rules for non-denials from Karl MacMillan (take 3).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	25 Aug 2007 10:55:38 -0000	1.159
+++ .cvsignore	13 Sep 2007 12:32:16 -0000	1.160
@@ -157,3 +157,4 @@
 policycoreutils-2.0.23.tgz
 policycoreutils-2.0.25.tgz
 sepolgen-1.0.9.tgz
+sepolgen-1.0.10.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- policycoreutils.spec	11 Sep 2007 19:04:32 -0000	1.447
+++ policycoreutils.spec	13 Sep 2007 12:32:16 -0000	1.448
@@ -2,11 +2,11 @@
 %define	libsepolver	2.0.9-1
 %define	libsemanagever	2.0.5-1
 %define	libselinuxver	2.0.23-3
-%define	sepolgenver	1.0.9
+%define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,11 @@
 fi
 
 %changelog
+* Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
+- Upgrade version of sepolgen from NSA
+	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.
+	* Suppress generation of rules for non-denials from Karl MacMillan (take 3).
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-12
 - Remove bogus import libxml2 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- sources	25 Aug 2007 10:55:38 -0000	1.164
+++ sources	13 Sep 2007 12:32:16 -0000	1.165
@@ -1,2 +1,2 @@
 43c5df63e94b6e35d1f830b5b7ee6cfc  policycoreutils-2.0.25.tgz
-75f280f7000200c4b53b1c5006f57029  sepolgen-1.0.9.tgz
+eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 12:46:28 2007
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 13 Sep 2007 08:46:28 -0400
Subject: rpms/python-GeoIP/devel python-GeoIP.spec,1.6,1.7
Message-ID: <200709131246.l8DCkSdR031617@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/python-GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31587

Modified Files:
	python-GeoIP.spec 
Log Message:
Fix requires


Index: python-GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/python-GeoIP/devel/python-GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-GeoIP.spec	13 Sep 2007 07:25:04 -0000	1.6
+++ python-GeoIP.spec	13 Sep 2007 12:45:55 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-GeoIP
 Version:        1.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Python bindings for the GeoIP geographical lookup libraries
 
 Group:          Development/Languages
@@ -13,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel GeoIP-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 This package contains the Python bindings for the GeoIP API, allowing IP to
@@ -44,10 +43,11 @@
 
 
 %changelog
-* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-8
+* Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-9
 - Add patch to expose country codes courtesy of Ignacio Vazquez-Adams
   (bz #243696)
 - Update License tag per new guidelines
+- Fix requires per python packaging guidelines.
 
 * Sat Dec 9 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.1-6
 - Rebuild for python 2.5



From fedora-extras-commits at redhat.com  Thu Sep 13 13:08:00 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 09:08:00 -0400
Subject: rpms/kdewebdev/devel .cvsignore, 1.14, 1.15 kdewebdev.spec, 1.37,
	1.38 sources, 1.16, 1.17
Message-ID: <200709131308.l8DD80cd006086@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdewebdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6050

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
- License: GPLv2
- update %description
- Provides: kdewebdev3 kommander 
- BR: kdelibs3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Aug 2006 16:21:11 -0000	1.14
+++ .cvsignore	13 Sep 2007 13:07:26 -0000	1.15
@@ -1,19 +1,5 @@
 css.tar.bz2
 html.tar.bz2
 javascript.tar.bz2
-kdewebdev-3.3.0.tar.bz2
 php_manual_en_20030401.tar.bz2
-kdewebdev-3.3.1.tar.bz2
-kdewebdev-3.3.2.tar.bz2
-tidy_src_041026.tgz
-kdewebdev-3.4.0-rc1.tar.bz2
-kdewebdev-3.4.0.tar.bz2
-kdewebdev-3.4.1.tar.bz2
-tidy_src_050803.tgz
-kdewebdev-3.4.2.tar.bz2
-kdewebdev-3.4.91.tar.bz2
-kdewebdev-3.4.92.tar.bz2
-kdewebdev-3.5.0.tar.bz2
-kdewebdev-3.5.1.tar.bz2
-kdewebdev-3.5.3.tar.bz2
-kdewebdev-3.5.4.tar.bz2
+kdewebdev-3.5.7.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdewebdev.spec	8 Feb 2007 10:00:19 -0000	1.37
+++ kdewebdev.spec	13 Sep 2007 13:07:26 -0000	1.38
@@ -1,20 +1,15 @@
-%define debug 0
-%define final 0
+
 %define make_cvs 1
 
-%define qt_version 3.3.7
-%define kde_version 3.5.6
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
-Version: 3.5.6
-Release: 1%{?dist}
-Summary: WEB Development package for the K Desktop Environment.
-Name: kdewebdev
-Url: http://quanta.sourceforge.net/
-Epoch: 6
-Group: Applications/Editors
-License: GPL
+Name:    kdewebdev
+Summary: Web development applications 
+Epoch:   6
+Version: 3.5.7
+Release: 2%{?dist}
+
+License: GPLv2
+Url:     http://kdewebdev.org/ 
+Group:   Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -27,37 +22,49 @@
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdesdk-devel >= %{kde_version}
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdesdk3-devel >= %{version}
+BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: perl
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
 
-Obsoletes: WebMaker
-Obsoletes: quanta
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: kdelibs3 >= %{version}
+# optional
+Requires(hint): gnupg
+Requires(hint): tidy
+
+Provides: kdewebdev3 = %{version}-%{release}
+
+Obsoletes: quanta < %{epoch}:%{version}-%{release}
+Provides:  quanta = %{epoch}:%{version}-%{release}
+
+%define kommander_ver 1.2.1
+#Obsoletes: kommander < %{kommander_ver}-%{release}
+Provides:  kommander = %{kommander_ver}-%{release}
 
 %description
-The kdewebdev package contains Quanta Plus and other applications, which are useful
-for web development. They are runtime dependencies of Quanta Plus, and it is
-highly recommended that you install them.
+%{summary}, including:
+* kfilereplace: batch search and replace tool
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* kxsldbg: xslt Debugger
+* quanta+: web development
 
 %package devel
 Group: Development/Libraries
-Summary: Header files and documentation for compiling kdewebdev applications.
-Requires: kdelibs-devel >= 1:%{qt_version}
+Summary: Header files and documentation for %{name} 
+Provides: kdewebdev3-devel = %{version}-%{release}
+Requires: kdelibs3-devel
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: quanta-devel
-
+Obsoletes: quanta-devel < %{epoch}:%{version}-%{release}
 %description devel
-This package includes the header files you will need to compile
-applications for kdewebdev.
+%{summary}.
 
 
 %prep
@@ -65,36 +72,32 @@
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
 
-%build
-QTDIR="" && . /etc/profile.d/qt.sh
-
-cp %{SOURCE5} kxsldbg/
+install -m644 -p %{SOURCE5} kxsldbg/
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
+
+%build
+unset QTDIR && . /etc/profile.d/qt.sh
+
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-gcc-hidden-visibility \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --with-qt-libraries=$QTDIR/lib
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
+## package separately?  Why doesn't upstream include this? -- Rex
 # install docs
 for i in css html javascript ; do
    pushd $i
@@ -104,19 +107,28 @@
    popd
    rm -rf $i
 done
+cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
 
-cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
-
-# fix dangling symlinks
+# make symlinks relative
 pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
-      ln -s ../common $i
+      ln -nfs ../common $i
    fi
 done
 popd
 
+
+# rpmdocs
+for dir in k* quanta; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
+
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
@@ -133,32 +145,50 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc rpmdocs/*
 %{_bindir}/*
-%{_libdir}/*.so.*
-%{_libdir}/*.la
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
 %{_libdir}/kde3/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
 %{_datadir}/apps/*
+%doc %{_datadir}/apps/quanta/doc
 %{_datadir}/config.kcfg/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
+%{_docdir}/HTML/en/*
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/*.so
-%{_includedir}/*
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/kde/*
+
 
 %changelog
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
+- License: GPLv2
+- update %%description
+- Provides: kdewebdev3 kommander 
+- BR: kdelibs3
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-1
+- 3.5.7
+- +Requires(hint): gnupg tidy
+- use Versioned Obsoletes/Provides: quanta
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Feb 2007 10:00:19 -0000	1.16
+++ sources	13 Sep 2007 13:07:26 -0000	1.17
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-fa1fc2d7c81465c7e1762014a892ced3  kdewebdev-3.5.6.tar.bz2
+1329e0aea45947a14faa3d936f9edb5d  kdewebdev-3.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 13:19:37 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 09:19:37 -0400
Subject: rpms/libselinux/F-7 libselinux-filecon.patch, NONE,
	1.1 libselinux-swig.patch, NONE, 1.1 libselinux.spec, 1.269, 1.270
Message-ID: <200709131319.l8DDJbtL006743@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6702

Modified Files:
	libselinux.spec 
Added Files:
	libselinux-filecon.patch libselinux-swig.patch 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
- Update swig bindings
- Fix getfilecon return codes


libselinux-filecon.patch:

--- NEW FILE libselinux-filecon.patch ---
--- libselinux-2.0.14/src/fgetfilecon.c	2007-04-24 10:36:20.000000000 -0400
+++ libselinux-2.0.14.new/src/fgetfilecon.c	2007-09-13 09:06:28.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = fgetxattr(fd, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	security_context_t rcontext;
 	int ret;
 
+	*context = NULL;
+
 	ret = fgetfilecon_raw(fd, &rcontext);
 
 	if (ret > 0) {
--- libselinux-2.0.14/src/getfilecon.c	2007-04-24 10:36:21.000000000 -0400
+++ libselinux-2.0.14.new/src/getfilecon.c	2007-09-13 09:06:13.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = getxattr(path, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	int ret;
 	security_context_t rcontext;
 
+	*context = NULL;
+
 	ret = getfilecon_raw(path, &rcontext);
 
 	if (ret > 0) {
--- libselinux-2.0.14/src/lgetfilecon.c	2007-04-24 10:36:20.000000000 -0400
+++ libselinux-2.0.14.new/src/lgetfilecon.c	2007-09-13 09:06:23.000000000 -0400
@@ -37,6 +37,11 @@
 		ret = lgetxattr(path, XATTR_NAME_SELINUX, buf, size - 1);
 	}
       out:
+	if (ret == 0) {
+		/* Re-map empty attribute values to errors. */
+		errno = EOPNOTSUPP;
+		ret = -1;
+	}
 	if (ret < 0)
 		free(buf);
 	else
@@ -51,6 +56,8 @@
 	int ret;
 	security_context_t rcontext;
 
+	*context = NULL;
+
 	ret = lgetfilecon_raw(path, &rcontext);
 
 	if (ret > 0) {

libselinux-swig.patch:

--- NEW FILE libselinux-swig.patch ---
--- libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:13:49.000000000 -0400
+++ libselinux-2.0.14.new/src/selinuxswig.i	2007-09-13 09:07:20.000000000 -0400
@@ -1,7 +1,9 @@
-/* Author: Dan Walsh
+/* Authors: Dan Walsh
+ *          James Athey
  *
  * Copyright (C) 2004-2005 Red Hat
- * 
+ * Copyright (C) 2007 Tresys Technology, LLC
+ *
  *  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
@@ -17,207 +19,47 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 %module selinux
 %{
 	#include "selinux/selinux.h"
-	#include "selinux/get_context_list.h"
 %}
-%apply int *OUTPUT { int * };
+%apply int *OUTPUT { int *enforce };
 %apply int *OUTPUT { size_t * };
 
-%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) {
-	$1 = &temp;
-}
-%typemap(argout) security_context_t * (char *temp=NULL) {
-	if (*$1)
-		temp = *$1;
-	else
-		temp = "";
-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(temp));
-}
-
-%typemap(in) security_context_t {
-	$1 = (security_context_t)PyString_AsString($input);
-}
-
 %typedef unsigned mode_t;
 
-%include "../include/selinux/get_context_list.h"
-
-extern int is_selinux_enabled(void);
-extern int is_selinux_mls_enabled(void);
-extern void freecon(security_context_t con);
-extern void freeconary(security_context_t * con);
-extern int getcon(security_context_t *con);
-extern int setcon(security_context_t con);
-extern int getpidcon(int pid, security_context_t *con);
-extern int getprevcon(security_context_t *con);
-extern int getexeccon(security_context_t *con);
-extern int setexeccon(security_context_t con);
-extern int getfscreatecon(security_context_t *con);
-extern int setfscreatecon(security_context_t context);
-extern int getkeycreatecon(security_context_t *con);
-extern int setkeycreatecon(security_context_t context);
-extern int getsockcreatecon(security_context_t *con);
-extern int setsockcreatecon(security_context_t context);
-extern int getfilecon(const char *path, security_context_t *con);
-extern int lgetfilecon(const char *path, security_context_t *con);
-extern int fgetfilecon(int fd, security_context_t *con);
-extern int setfilecon(const char *path, security_context_t con);
-extern int lsetfilecon(const char *path, security_context_t con);
-extern int fsetfilecon(int fd, security_context_t con);
-extern int getpeercon(int fd, security_context_t *con);
-extern int selinux_mkload_policy(int preservebools);
-extern int selinux_init_load_policy(int *enforce);
-extern int security_set_boolean_list(size_t boolcnt, 
-				     SELboolean *boollist, 
-				     int permanent);
-extern int security_load_booleans(char *path);
-extern int security_check_context(security_context_t con);
-extern int security_canonicalize_context(security_context_t con,
-					 security_context_t *canoncon);
-extern int security_getenforce(void);
-extern int security_setenforce(int value);
-extern int security_policyvers(void);
-extern int security_get_boolean_names(char ***names, int *len);
-extern int security_get_boolean_pending(const char *name);
-extern int security_get_boolean_active(const char *name);
-extern int security_set_boolean(const char *name, int value);
-extern int security_commit_booleans(void);
-
-/* Set flags controlling operation of matchpathcon_init or matchpathcon. */
-#define MATCHPATHCON_BASEONLY 1 /* Only process the base file_contexts file. */
-#define MATCHPATHCON_NOTRANS  2 /* Do not perform any context translation. */
-extern void set_matchpathcon_flags(unsigned int flags);
-extern int matchpathcon_init(const char *path);
-extern int matchpathcon(const char *path,
-			mode_t mode,
-			security_context_t *con);
-
-extern int matchpathcon_init_prefix(const char *path,
-				    const char *prefix);
-extern void matchpathcon_fini(void);
-
-
-extern int matchmediacon(const char *media,
-		 security_context_t *con);
-
-extern int selinux_getenforcemode(int *enforce);
-extern const char *selinux_policy_root(void);
-extern const char *selinux_binary_policy_path(void);
-extern const char *selinux_failsafe_context_path(void);
-extern const char *selinux_removable_context_path(void);
-extern const char *selinux_default_context_path(void);
-extern const char *selinux_user_contexts_path(void);
-extern const char *selinux_file_context_path(void);
-extern const char *selinux_file_context_homedir_path(void);
-extern const char *selinux_file_context_local_path(void);
-extern const char *selinux_homedir_context_path(void);
-extern const char *selinux_media_context_path(void);
-extern const char *selinux_contexts_path(void);
-extern const char *selinux_securetty_types_path(void);
-extern const char *selinux_booleans_path(void);
-extern const char *selinux_customizable_types_path(void);
-extern const char *selinux_users_path(void);
-extern const char *selinux_usersconf_path(void);
-extern const char *selinux_translations_path(void);
-extern const char *selinux_netfilter_context_path(void);
-extern const char *selinux_path(void);
-#extern int selinux_check_passwd_access(access_vector_t requested);
-#extern int checkPasswdAccess(access_vector_t requested);
-
-extern int selinux_check_securetty_context(security_context_t tty_context);
-void set_selinuxmnt(char *mnt);
-
-#ifdef SWIGpython
-// This tells SWIG to treat char ** as a special case
-%typemap(in) char ** {
-  /* Check if is a list */
-  if (PyList_Check($input)) {
-    int size = PyList_Size($input);
-    int i = 0;
-    $1 = (char **) malloc((size+1)*sizeof(char *));
-    if ($1 == NULL) {
-	PyErr_SetString(PyExc_MemoryError,"Out of memory");
-	return NULL;
-    }
-    for (i = 0; i < size; i++) {
-      PyObject *o = PyList_GetItem($input,i);
-      if (PyString_Check(o))
-	$1[i] = PyString_AsString(PyList_GetItem($input,i));
-      else {
-	PyErr_SetString(PyExc_TypeError,"list must contain strings");
-	free($1);
-	return NULL;
-      }
-    }
-    $1[i] = 0;
-  } else {
-    PyErr_SetString(PyExc_TypeError,"not a list");
-    return NULL;
-  }
+%typemap(in, numinputs=0) (char ***names, int *len) (char **temp1, int temp2) {
+	$1 = &temp1;
+	$2 = &temp2;
 }
-#endif
 
-%typemap(in) char * const [] {
-	int i, size;
-	PyObject * s;
-
-	if (!PySequence_Check($input)) {
-		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
-		return NULL;
-	}
-
-	size = PySequence_Size($input);
-	
-	$1 = (char**) malloc(size + 1);
-
-	for(i = 0; i < size; i++) {
-		if (!PyString_Check(PySequence_GetItem($input, i))) {
-			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
-			return NULL;
+%typemap(freearg) (char ***names, int *len) {
+	int i;
+	if (*$1) {
+		for (i = 0; i < *$2; i++) {
+			free((*$1)[i]);
 		}
+		free(*$1);
 	}
-		
-	for(i = 0; i < size; i++) {
-		s = PySequence_GetItem($input, i);
-		$1[i] = (char*) malloc(PyString_Size(s) + 1);
-		strcpy($1[i], PyString_AsString(s));
-	}
-	$1[size] = NULL;
-}
-
-%typemap(freearg,match="in") char * const [] {
-	int i = 0;
-	while($1[i]) {
-		free($1[i]);
-		i++;
-	}
-	free($1);
 }
 
-extern int rpm_execcon(unsigned int verified,
-		       const char *filename,
-		       char *const argv[], char *const envp[]);
-
-extern int is_context_customizable (security_context_t scontext);
-
-extern int selinux_trans_to_raw_context(char *trans, 
-					security_context_t *rawp);
-extern int selinux_raw_to_trans_context(char *raw, 
-					security_context_t *transp);
-
-%typemap(in, numinputs=0) char **(char *temp=NULL) {
+%typemap(in, numinputs=0) (security_context_t **) (security_context_t *temp) {
 	$1 = &temp;
 }
 
-%typemap(argout) char ** {
-	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+%typemap(freearg) (security_context_t **) {
+	if (*$1) freeconary(*$1);
 }
-extern int selinux_getpolicytype(char **enforce);
-extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
 
-int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
-int selinux_file_context_verify(const char *path, mode_t mode);
-int selinux_lsetfilecon_default(const char *path);
+/* Ignore functions that don't make sense when wrapped */
+%ignore freecon;
+%ignore freeconary;
+
+/* Ignore functions that take a function pointer as an argument */
+%ignore set_matchpathcon_printf;
+%ignore set_matchpathcon_invalidcon;
+%ignore set_matchpathcon_canoncon;
+
+%include "../include/selinux/selinux.h"
+%include "../include/selinux/get_default_type.h"
+%include "../include/selinux/get_context_list.h"
--- libselinux-2.0.14/src/selinuxswig_python.i	1969-12-31 19:00:00.000000000 -0500
+++ libselinux-2.0.14.new/src/selinuxswig_python.i	2007-09-13 09:07:28.000000000 -0400
@@ -0,0 +1,138 @@
+/* Author: James Athey
+ *
+ * Copyright (C) 2007 Tresys Technology, LLC
+ *
+ *  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
+ */
+
+%module selinux
+%{
+	#include "selinux/selinux.h"
+%}
+
+/* security_get_boolean_names() typemap */
+%typemap(argout) (char ***names, int *len) {
+	PyObject* list = PyList_New(*$2);
+	int i;
+	for (i = 0; i < *$2; i++) {
+		PyList_SetItem(list, i, PyString_FromString((*$1)[i]));
+	}
+	$result = SWIG_Python_AppendOutput($result, list);
+}
+
+/* Makes security_compute_user() return a Python list of contexts */
+%typemap(argout) (security_context_t **con) {
+	PyObject* plist;
+	int i, len = 0;
+	
+	if (*$1) {
+		while((*$1)[len])
+			len++;
+		plist = PyList_New(len);
+		for (i = 0; i < len; i++) {
+			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));
+		}
+	} else {
+		plist = PyList_New(0);
+	}
+
+	$result = SWIG_Python_AppendOutput($result, plist);
+}
+
+/* Makes functions in get_context_list.h return a Python list of contexts */
+%typemap(argout) (security_context_t **list) {
+	PyObject* plist;
+	int i;
+	
+	if (*$1) {
+		plist = PyList_New(result);
+		for (i = 0; i < result; i++) {
+			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));
+		}
+	} else {
+		plist = PyList_New(0);
+	}
+	/* Only return the Python list, don't need to return the length anymore */
+	$result = plist;
+}
+
+%typemap(in,noblock=1,numinputs=0) security_context_t * (security_context_t temp = 0) {
+	$1 = &temp;
+}
+%typemap(freearg,match="in") security_context_t * "";
+%typemap(argout,noblock=1) security_context_t * {
+	if (*$1) {
+		%append_output(SWIG_FromCharPtr(*$1));
+		freecon(*$1);
+	}
+	else {
+		Py_INCREF(Py_None);
+		%append_output(Py_None);
+	}
+}
+
+%typemap(in,noblock=1,numinputs=0) char ** (char * temp = 0) {
+	$1 = &temp;
+}
+%typemap(freearg,match="in") char ** "";
+%typemap(argout,noblock=1) char ** {
+	if (*$1) {
+		%append_output(SWIG_FromCharPtr(*$1));
+		free(*$1);
+	}
+	else {
+		Py_INCREF(Py_None);
+		%append_output(Py_None);
+	}
+}
+
+%typemap(in) char * const [] {
+	int i, size;
+	PyObject * s;
+
+	if (!PySequence_Check($input)) {
+		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
+		return NULL;
+	}
+
+	size = PySequence_Size($input);
+	
+	$1 = (char**) malloc(size + 1);
+
+	for(i = 0; i < size; i++) {
+		if (!PyString_Check(PySequence_GetItem($input, i))) {
+			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
+			return NULL;
+		}
+	}
+		
+	for(i = 0; i < size; i++) {
+		s = PySequence_GetItem($input, i);
+		$1[i] = (char*) malloc(PyString_Size(s) + 1);
+		strcpy($1[i], PyString_AsString(s));
+	}
+	$1[size] = NULL;
+}
+
+%typemap(freearg,match="in") char * const [] {
+	int i = 0;
+	while($1[i]) {
+		free($1[i]);
+		i++;
+	}
+	free($1);
+}
+
+%include "selinuxswig.i"
--- libselinux-2.0.14/Makefile	2007-09-13 09:13:49.000000000 -0400
+++ libselinux-2.0.14.new/Makefile	2007-09-13 09:08:20.000000000 -0400
@@ -2,7 +2,7 @@
 	$(MAKE) -C src 
 	$(MAKE) -C utils
 
-swigify: 
+swigify: all
 	$(MAKE) -C src swigify
 
 pywrap: 


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- libselinux.spec	7 Sep 2007 13:26:25 -0000	1.269
+++ libselinux.spec	13 Sep 2007 13:19:04 -0000	1.270
@@ -2,11 +2,13 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
 Patch: libselinux-rhat.patch
+Patch1: libselinux-swig.patch
+Patch2: libselinux-filecon.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -50,6 +52,8 @@
 %prep
 %setup -q
 %patch -p1 -b .rhat
+%patch1 -p1 -b .swig
+%patch2 -p1 -b .filecon
 
 %build
 make clean
@@ -122,6 +126,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
+- Update swig bindings
+- Fix getfilecon return codes
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-6
 - fix swig binding for rpm_execcon
 



From fedora-extras-commits at redhat.com  Thu Sep 13 13:43:18 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Thu, 13 Sep 2007 09:43:18 -0400
Subject: rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-newpoppler.patch, 1.1,
	1.2 ruby-gnome2.spec, 1.7, 1.8
Message-ID: <200709131343.l8DDhI9O010234@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/devel

Modified Files:
	ruby-gnome2-all-0.16.0-newpoppler.patch ruby-gnome2.spec 
Log Message:

- Newpoppler.patch updated for poppler 0.6


ruby-gnome2-all-0.16.0-newpoppler.patch:

Index: ruby-gnome2-all-0.16.0-newpoppler.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2-all-0.16.0-newpoppler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-gnome2-all-0.16.0-newpoppler.patch	3 Aug 2007 18:51:45 -0000	1.1
+++ ruby-gnome2-all-0.16.0-newpoppler.patch	13 Sep 2007 13:43:15 -0000	1.2
@@ -1,6 +1,282 @@
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2006-12-29 22:17:28.000000000 +0900
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2007-08-04 02:33:31.000000000 +0900
-@@ -136,7 +136,7 @@
+diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2007-09-13 09:19:35.000000000 -0300
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2007-09-13 09:21:32.000000000 -0300
+@@ -38,16 +38,27 @@ extern GType poppler_dest_get_type (void
+ #define REGION2RVAL(obj) (BOXED2RVAL(obj, GDK_TYPE_REGION))
+ #define RVAL2DEST(obj) ((PopplerDest *)RVAL2BOXED(obj, POPPLER_TYPE_DEST))
+ #define DEST2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_DEST))
++#define TRANS2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION))
++#define RVAL2TRANS(obj) ((PopplerPageTransition *)RVAL2BOXED(obj, POPPLER_TYPE_PAGE_TRANSITION))
++
+ #define DESTTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_DEST_TYPE))
+ #define ACTIONTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_ACTION_TYPE))
+ #define RVAL2ACTIONTYPE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_ACTION_TYPE))
++#define SELSTYLE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_SELECTION_STYLE))
++#define RVAL2SELSTYLE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_SELECTION_STYLE))
+ #define RVAL2COLOR(obj) ((GdkColor *)RVAL2BOXED(obj, GDK_TYPE_COLOR))
+ 
+ #define ACTION2RVAL(obj) (rb_poppler_ruby_object_from_action(obj))
+ #define RVAL2ACTION(obj) (rb_poppler_action_from_ruby_object(obj))
++#define FF2RVAL(obj) (rb_poppler_ruby_object_from_form_field(obj))
+ 
+ extern VALUE rb_poppler_ruby_object_from_action(PopplerAction *action);
+ extern PopplerAction *rb_poppler_action_from_ruby_object(VALUE action);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++extern VALUE rb_poppler_ruby_object_from_form_field(PopplerFormField *field);
++#endif
++
++#define RVAL2GDK_PIXBUF(pixbuf) (GDK_PIXBUF(RVAL2GOBJ(pixbuf)))
+ 
+ 
+ extern void Init_poppler_document(VALUE mPoppler);
+diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2007-09-13 09:19:47.000000000 -0300
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2007-09-13 09:21:06.000000000 -0300
+@@ -4,7 +4,7 @@
+   rbpoppler-page.c -
+ 
+   $Author$
+-  $Date$
++  $Date$
+ 
+   Copyright (C) 2006 Ruby-GNOME2 Project Team
+ 
+@@ -12,16 +12,39 @@
+ 
+ #include "rbpoppler.h"
+ 
++#define SELF(self) (POPPLER_PAGE(RVAL2GOBJ(self)))
+ #define RVAL2LM(obj) ((PopplerLinkMapping *)RVAL2BOXED(obj, POPPLER_TYPE_LINK_MAPPING))
++#define RVAL2IM(obj) ((PopplerImageMapping *)RVAL2BOXED(obj, POPPLER_TYPE_IMAGE_MAPPING))
++#define RVAL2FFM(obj) ((PopplerFormFieldMapping *)RVAL2BOXED(obj, POPPLER_TYPE_FORM_FIELD_MAPPING))
++#define RVAL2FF(obj) (POPPLER_FORM_FIELD(RVAL2GOBJ(obj)))
++#define RVAL2TF(obj) RVAL2FF(obj)
++#define RVAL2BF(obj) RVAL2FF(obj)
++#define RVAL2CF(obj) RVAL2FF(obj)
++
++#define TT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE))
++#define RVAL2TT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE))
++#define TA2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT))
++#define RVAL2TA(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT))
++#define TD2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION))
++#define RVAL2TD(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION))
++#define FFT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_FIELD_TYPE))
++#define RVAL2FFT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_FORM_FIELD_TYPE))
++#define FBT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_BUTTON_TYPE))
++#define FTT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_TEXT_TYPE))
++#define FCT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_CHOICE_TYPE))
+ 
+-static VALUE cPSFile;
++static VALUE cPSFile, cRectangle;
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++VALUE cUnknownField, cTextField, cButtonField, cChoiceField, cSignatureField;
++#endif
+ 
+ static VALUE
+ page_render_to_pixbuf(VALUE self, VALUE src_x, VALUE src_y, VALUE src_width,
+                       VALUE src_height, VALUE scale, VALUE rotation,
+                       VALUE pixbuf)
+ {
+-    poppler_page_render_to_pixbuf(RVAL2GOBJ(self), NUM2INT(src_x),
++    poppler_page_render_to_pixbuf(SELF(self), NUM2INT(src_x),
+                                   NUM2INT(src_y), NUM2INT(src_width),
+                                   NUM2INT(src_height), NUM2DBL(scale),
+                                   NUM2INT(rotation), RVAL2GOBJ(pixbuf));
+@@ -32,7 +55,7 @@ page_render_to_pixbuf(VALUE self, VALUE 
+ static VALUE
+ page_render(VALUE self, VALUE cairo)
+ {
+-    poppler_page_render(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo));
++    poppler_page_render(SELF(self), RVAL2CRCONTEXT(cairo));
+     return Qnil;
+ }
+ #endif
+@@ -40,7 +63,7 @@ page_render(VALUE self, VALUE cairo)
+ static VALUE
+ page_render_to_ps(VALUE self, VALUE ps_file)
+ {
+-    poppler_page_render_to_ps(RVAL2GOBJ(self), RVAL2GOBJ(ps_file));
++    poppler_page_render_to_ps(SELF(self), RVAL2GOBJ(ps_file));
+     return Qnil;
+ }
+ 
+@@ -48,7 +71,7 @@ static VALUE
+ page_render_generic(int argc, VALUE *argv, VALUE self)
+ {
+     if (argc == 1) {
+-        if (RTEST(rb_obj_is_kind_of(argv[0], cPSFile))) {
++        if (RVAL2CBOOL(rb_obj_is_kind_of(argv[0], cPSFile))) {
+             return page_render_to_ps(self, argv[0]);
+         } else {
+ #ifdef RB_POPPLER_CAIRO_AVAILABLE
+@@ -70,20 +93,34 @@ static VALUE
+ page_get_size(VALUE self)
+ {
+     double width, height;
+-    poppler_page_get_size(RVAL2GOBJ(self), &width, &height);
++    poppler_page_get_size(SELF(self), &width, &height);
+     return rb_ary_new3(2, rb_float_new(width), rb_float_new(height));
+ }
+ 
+ static VALUE
+ page_get_index(VALUE self)
+ {
+-    return INT2NUM(poppler_page_get_index(RVAL2GOBJ(self)));
++    return INT2NUM(poppler_page_get_index(SELF(self)));
++}
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_duration(VALUE self)
++{
++    return rb_float_new(poppler_page_get_duration(SELF(self)));
+ }
+ 
+ static VALUE
++page_get_transition(VALUE self)
++{
++    return TRANS2RVAL(poppler_page_get_transition(SELF(self)));
++}
++#endif
++
++static VALUE
+ page_get_thumbnail(VALUE self)
+ {
+-    return GOBJ2RVAL(poppler_page_get_thumbnail(RVAL2GOBJ(self)));
++    return GOBJ2RVAL(poppler_page_get_thumbnail(SELF(self)));
+ }
+ 
+ static VALUE
+@@ -91,7 +128,7 @@ page_get_thumbnail_size(VALUE self)
+ {
+     int width, height;
+ 
+-    if (poppler_page_get_thumbnail_size(RVAL2GOBJ(self), &width, &height))
++    if (poppler_page_get_thumbnail_size(SELF(self), &width, &height))
+         return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
+     else
+         return Qnil;
+@@ -100,17 +137,60 @@ page_get_thumbnail_size(VALUE self)
+ static VALUE
+ page_find_text(VALUE self, VALUE text)
+ {
+-    return GLIST2ARY2F(poppler_page_find_text(RVAL2GOBJ(self), RVAL2CSTR(text)),
++    return GLIST2ARY2F(poppler_page_find_text(SELF(self), RVAL2CSTR(text)),
+                        POPPLER_TYPE_RECTANGLE);
+ }
+ 
+ static VALUE
+-page_get_text(VALUE self, VALUE rect)
++page_get_text(int argc, VALUE *argv, VALUE self)
+ {
+     gchar *text;
+-    VALUE rb_text;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH;
++#endif
++    VALUE rb_text, arg1, arg2, rb_rect;
++    PopplerPage *page;
++
++    rb_scan_args(argc, argv, "02", &arg1, &arg2);
++
++    page = SELF(self);
++    if (NIL_P(arg1)) {
++        rb_rect = arg2;
++    } else {
++        if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) {
++            rb_rect = arg2;
++        } else {
++            rb_rect = Qnil;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++            if (!NIL_P(arg2)) {
++                style = RVAL2SELSTYLE(arg2);
++            }
++#endif
++        }
++    }
++
++    if (NIL_P(rb_rect)) {
++        PopplerRectangle rect;
++        double width, height;
++
++        rect.x1 = 0;
++        rect.y1 = 0;
++        poppler_page_get_size(page, &width, &height);
++        rect.x2 = width;
++        rect.y2 = height;
++        text = poppler_page_get_text(page,
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                     style,
++#endif
++                                     &rect);
++    } else {
++        text = poppler_page_get_text(page,
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                     style,
++#endif
++                                     RVAL2RECT(rb_rect));
++    }
+ 
+-    text = poppler_page_get_text(RVAL2GOBJ(self), RVAL2RECT(rect));
+     rb_text = CSTR2RVAL(text);
+     g_free(text);
+     return rb_text;
+@@ -119,15 +199,50 @@ page_get_text(VALUE self, VALUE rect)
+ static VALUE
+ page_get_link_mapping(VALUE self)
+ {
+-    return GLIST2ARY2F(poppler_page_get_link_mapping(RVAL2GOBJ(self)),
++    return GLIST2ARY2F(poppler_page_get_link_mapping(SELF(self)),
+                        POPPLER_TYPE_LINK_MAPPING);
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_image_mapping(VALUE self)
++{
++    return GLIST2ARY2F(poppler_page_get_image_mapping(SELF(self)),
++                       POPPLER_TYPE_IMAGE_MAPPING);
++}
++
++static VALUE
++page_get_form_field_mapping(VALUE self)
++{
++    return GLIST2ARY2F(poppler_page_get_form_field_mapping(SELF(self)),
++                       POPPLER_TYPE_FORM_FIELD_MAPPING);
++}
++#endif
++
+ static VALUE
+-page_get_selection_region(VALUE self, VALUE scale, VALUE selection)
++page_get_selection_region(int argc, VALUE *argv, VALUE self)
+ {
+-    return REGION2RVAL(poppler_page_get_selection_region(RVAL2GOBJ(self),
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH;
++#endif
++    VALUE arg2, arg3, scale, selection;
++
++    rb_scan_args(argc, argv, "21", &scale, &arg2, &arg3);
++
++    if (NIL_P(arg3)) {
++        selection = arg2;
++    } else {
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++        style = RVAL2SELSTYLE(arg2);
++#endif
++        selection = arg3;
++    }
++
++    return REGION2RVAL(poppler_page_get_selection_region(SELF(self),
+                                                          NUM2DBL(scale),
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++                                                         style,
++#endif
+                                                          RVAL2RECT(selection)));
+ }
+ 
+@@ -136,15 +251,16 @@ page_get_selection_region(VALUE self, VA
  static VALUE
  page_render_selection(VALUE self, VALUE cairo,
                        VALUE selection, VALUE rb_old_selection,
@@ -9,15 +285,17 @@
  {
      PopplerRectangle *old_selection = NULL;
  
-@@ -145,6 +145,7 @@
-     poppler_page_render_selection(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo),
+     if (!NIL_P(rb_old_selection))
+         old_selection = RVAL2RECT(rb_old_selection);
+-    poppler_page_render_selection(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo),
++    poppler_page_render_selection(SELF(self), RVAL2CRCONTEXT(cairo),
                                    RVAL2RECT(selection),
                                    old_selection,
 +                                  RVAL2SELSTYLE(style),
                                    RVAL2COLOR(glyph_color),
                                    RVAL2COLOR(background_color));
      return Qnil;
-@@ -159,17 +160,23 @@
+@@ -159,17 +275,24 @@ static VALUE
  page_render_selection_to_pixbuf(VALUE self, VALUE scale, VALUE rotation,
                                  VALUE pixbuf, VALUE selection,
                                  VALUE rb_old_selection,
@@ -31,7 +309,8 @@
      if (!NIL_P(rb_old_selection))
          old_selection = RVAL2RECT(rb_old_selection);
 -    poppler_page_render_selection_to_pixbuf(RVAL2GOBJ(self), NUM2DBL(scale),
-+    poppler_page_render_selection_to_pixbuf(SELF(self), NUM2DBL(scale),
++    poppler_page_render_selection_to_pixbuf(SELF(self),
++                                            NUM2DBL(scale),
                                              NUM2INT(rotation),
                                              RVAL2GOBJ(pixbuf),
                                              RVAL2RECT(selection),
@@ -42,7 +321,7 @@
                                              RVAL2COLOR(glyph_color),
                                              RVAL2COLOR(background_color));
      return Qnil;
-@@ -178,21 +185,34 @@
+@@ -178,24 +301,86 @@ page_render_selection_to_pixbuf(VALUE se
  static VALUE
  page_render_selection_generic(int argc, VALUE *argv, VALUE self)
  {
@@ -76,25 +355,525 @@
 +#else
 +                 7
 +#endif
-+        );
++                );
      }
  }
  
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2006-12-29 22:17:28.000000000 +0900
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2007-08-04 02:29:57.000000000 +0900
-@@ -33,6 +33,7 @@
- #  include <rb_cairo.h>
- #endif
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++static VALUE
++page_get_crop_box(VALUE self)
++{
++    PopplerRectangle rect;
++
++    poppler_page_get_crop_box(SELF(self), &rect);
++    return RECT2RVAL(&rect);
++}
++#endif
++
++
++#define DEF_READER(prefix, name, member, self_to_c, member_to_rb)       \
++static VALUE                                                            \
++prefix ## _get_ ## name(VALUE self)                                     \
++{                                                                       \
++    return member_to_rb((self_to_c(self))->member);                     \
++}
++
++#define DEF_WRITER(prefix, name, member, self_to_c, value_to_c) \
++static VALUE                                                    \
++prefix ## _set_ ## name(VALUE self, VALUE value)                \
++{                                                               \
++    (self_to_c(self))->member = value_to_c(value);              \
++    return Qnil;                                                \
++}
++
++#define DEF_WRITER_WITH_SETTER(prefix, name, member,    \
++                               self_to_c, value_setter) \
++static VALUE                                            \
++prefix ## _set_ ## name(VALUE self, VALUE value)        \
++{                                                       \
++    value_setter((self_to_c(self))->member, value);     \
++    return Qnil;                                        \
++}
++
++#define DEF_ACCESSOR(prefix, member, self_to_c, member_to_rb, value_to_c) \
++    DEF_READER(prefix, member, member, self_to_c, member_to_rb)         \
++    DEF_WRITER(prefix, member, member, self_to_c, value_to_c)           \
++
++#define DEF_ACCESSOR_WITH_SETTER(prefix, member, self_to_c,             \
++                                 member_to_rb, value_setter)            \
++    DEF_READER(prefix, member, member, self_to_c, member_to_rb)         \
++    DEF_WRITER_WITH_SETTER(prefix, member, member, self_to_c, value_setter)
++
++#define DEF_ACCESSOR_WITH_NAME(prefix, name, member, self_to_c, \
++                               member_to_rb, value_to_c)        \
++    DEF_READER(prefix, name, member, self_to_c, member_to_rb)   \
++    DEF_WRITER(prefix, name, member, self_to_c, value_to_c)
  
-+#define SELF(self) (POPPLER_PAGE(RVAL2GOBJ(self)))
- #define RECT2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_RECTANGLE))
- #define RVAL2RECT(obj) ((PopplerRectangle *)RVAL2BOXED(obj, POPPLER_TYPE_RECTANGLE))
- #define REGION2RVAL(obj) (BOXED2RVAL(obj, GDK_TYPE_REGION))
-@@ -41,6 +42,7 @@
- #define DESTTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_DEST_TYPE))
- #define ACTIONTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_ACTION_TYPE))
- #define RVAL2ACTIONTYPE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_ACTION_TYPE))
-+#define RVAL2SELSTYLE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_SELECTION_STYLE))
- #define RVAL2COLOR(obj) ((GdkColor *)RVAL2BOXED(obj, GDK_TYPE_COLOR))
+ 
+ /* A rectangle on a page, with coordinates in PDF points. */
+@@ -213,107 +398,320 @@ rectangle_initialize(VALUE self, VALUE x
+     return Qnil;
+ }
  
- #define ACTION2RVAL(obj) (rb_poppler_ruby_object_from_action(obj))
++DEF_ACCESSOR(rectangle, x1, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, y1, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, x2, RVAL2RECT, rb_float_new, NUM2DBL)
++DEF_ACCESSOR(rectangle, y2, RVAL2RECT, rb_float_new, NUM2DBL)
++
+ static VALUE
+-rectangle_get_x1(VALUE self)
++rectangle_to_a(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->x1);
++    PopplerRectangle *rectangle = RVAL2RECT(self);
++    return rb_ary_new3(4,
++                       rb_float_new(rectangle->x1),
++                       rb_float_new(rectangle->y1),
++                       rb_float_new(rectangle->x2),
++                       rb_float_new(rectangle->y2));
+ }
+ 
+-static VALUE
+-rectangle_get_y1(VALUE self)
++
++/* Mapping between areas on the current page and PopplerActions */
++#define RECT_ENTITY2RVAL(rect) RECT2RVAL(&(rect))
++#define RECT_ENTITY_SET(rect, rb_rect) rectangle_set(&(rect), rb_rect)
++static void
++rectangle_set(PopplerRectangle *rect, VALUE rb_rect)
+ {
+-    return rb_float_new(RVAL2RECT(self)->y1);
++    *rect = *(RVAL2RECT(rb_rect));
+ }
+ 
+-static VALUE
+-rectangle_get_x2(VALUE self)
++DEF_ACCESSOR_WITH_SETTER(link_mapping, area,
++                         RVAL2LM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(link_mapping, action, RVAL2LM, ACTION2RVAL, RVAL2ACTION)
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++
++/* Page Transition */
++DEF_ACCESSOR(page_trans, type, RVAL2TRANS, RVAL2TT, TT2RVAL)
++DEF_ACCESSOR(page_trans, alignment, RVAL2TRANS, RVAL2TA, TA2RVAL)
++DEF_ACCESSOR(page_trans, direction, RVAL2TRANS, RVAL2TD, TD2RVAL)
++DEF_ACCESSOR(page_trans, duration, RVAL2TRANS, NUM2INT, INT2NUM)
++DEF_ACCESSOR(page_trans, angle, RVAL2TRANS, NUM2INT, INT2NUM)
++DEF_ACCESSOR(page_trans, scale, RVAL2TRANS, NUM2DBL, rb_float_new)
++DEF_ACCESSOR(page_trans, rectangular, RVAL2TRANS, RVAL2CBOOL, CBOOL2RVAL)
++
++
++/* Mapping between areas on the current page and images */
++DEF_ACCESSOR_WITH_SETTER(image_mapping, area,
++                         RVAL2IM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(image_mapping, image, RVAL2IM, GOBJ2RVAL, RVAL2GDK_PIXBUF)
++
++
++/* Mapping between areas on the current page and form fields */
++VALUE
++rb_poppler_ruby_object_from_form_field(PopplerFormField *field)
++{
++    VALUE obj;
++
++    obj = rbgobj_ruby_object_from_instance2(field, FALSE);
++    if (NIL_P(obj)) {
++      switch (poppler_form_field_get_field_type(field)) {
++        case POPPLER_FORM_FIELD_UNKNOWN:
++          obj = rbgobj_create_object(cUnknownField);
++          break;
++        case POPPLER_FORM_FIELD_BUTTON:
++          obj = rbgobj_create_object(cButtonField);
++          break;
++        case POPPLER_FORM_FIELD_TEXT:
++          obj = rbgobj_create_object(cTextField);
++          break;
++        case POPPLER_FORM_FIELD_CHOICE:
++          obj = rbgobj_create_object(cChoiceField);
++          break;
++        case POPPLER_FORM_FIELD_SIGNATURE:
++          obj = rbgobj_create_object(cSignatureField);
++          break;
++      }
++      g_object_ref(field);
++      G_INITIALIZE(obj, (gpointer)field);
++    }
++
++    return obj;
++}
++
++DEF_ACCESSOR_WITH_SETTER(form_field_mapping, area,
++                         RVAL2FFM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++DEF_ACCESSOR(form_field_mapping, field, RVAL2FFM, FF2RVAL, RVAL2FF)
++
++/* FormField */
++VALUE
++form_field_get_id(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->x2);
++    return INT2NUM(poppler_form_field_get_id(RVAL2FF(self)));
+ }
+ 
+-static VALUE
+-rectangle_get_y2(VALUE self)
++VALUE
++form_field_get_font_size(VALUE self)
++{
++    return rb_float_new(poppler_form_field_get_font_size(RVAL2FF(self)));
++}
++
++VALUE
++form_field_is_read_only(VALUE self)
+ {
+-    return rb_float_new(RVAL2RECT(self)->y2);
++    return CBOOL2RVAL(poppler_form_field_is_read_only(RVAL2FF(self)));
+ }
+ 
++/* Button Field */
++VALUE
++button_field_get_button_type(VALUE self)
++{
++    return FBT2RVAL(poppler_form_field_button_get_button_type(RVAL2FF(self)));
++}
+ 
+-static VALUE
+-rectangle_set_x1(VALUE self, VALUE x1)
++VALUE
++button_field_get_state(VALUE self)
+ {
+-    RVAL2RECT(self)->x1 = NUM2DBL(x1);
++    return CBOOL2RVAL(poppler_form_field_button_get_state(RVAL2BF(self)));
++}
++
++VALUE
++button_field_set_state(VALUE self, VALUE state)
++{
++    poppler_form_field_button_set_state(RVAL2BF(self), RVAL2CBOOL(state));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_y1(VALUE self, VALUE y1)
++/* Text Field */
++VALUE
++text_field_get_text_type(VALUE self)
+ {
+-    RVAL2RECT(self)->y1 = NUM2DBL(y1);
++    return FTT2RVAL(poppler_form_field_text_get_text_type(RVAL2TF(self)));
++}
++
++VALUE
++text_field_get_text(VALUE self)
++{
++    return CSTR2RVAL(poppler_form_field_text_get_text(RVAL2TF(self)));
++}
++
++VALUE
++text_field_set_text(VALUE self, VALUE text)
++{
++    poppler_form_field_text_set_text(RVAL2TF(self), RVAL2CSTR2(text));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_x2(VALUE self, VALUE x2)
++VALUE
++text_field_get_max_length(VALUE self)
++{
++    return INT2NUM(poppler_form_field_text_get_max_len(RVAL2TF(self)));
++}
++
++VALUE
++text_field_do_spell_check(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_do_spell_check(RVAL2TF(self)));
++}
++
++VALUE
++text_field_do_scroll(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_do_scroll(RVAL2TF(self)));
++}
++
++VALUE
++text_field_is_rich_text(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_is_rich_text(RVAL2TF(self)));
++}
++
++VALUE
++text_field_is_password(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_text_is_password(RVAL2TF(self)));
++}
++
++
++/* Choice Field */
++VALUE
++choice_field_get_choice_type(VALUE self)
++{
++    return FCT2RVAL(poppler_form_field_choice_get_choice_type(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_is_editable(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_is_editable(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_can_select_multiple(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_can_select_multiple(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_do_spell_check(VALUE self)
+ {
+-    RVAL2RECT(self)->x2 = NUM2DBL(x2);
++    return CBOOL2RVAL(poppler_form_field_choice_do_spell_check(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_commit_on_change(VALUE self)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_commit_on_change(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_get_n_items(VALUE self)
++{
++    return INT2NUM(poppler_form_field_choice_get_n_items(RVAL2CF(self)));
++}
++
++VALUE
++choice_field_get_item(VALUE self, VALUE index)
++{
++    return CSTR2RVAL(poppler_form_field_choice_get_item(RVAL2CF(self),
++                                                        NUM2INT(index)));
++}
++
++VALUE
++choice_field_is_item_selected(VALUE self, VALUE index)
++{
++    return CBOOL2RVAL(poppler_form_field_choice_is_item_selected(RVAL2CF(self),
++                                                                 NUM2INT(index)));
++}
++
++VALUE
++choice_field_select_item(VALUE self, VALUE index)
++{
++    poppler_form_field_choice_select_item(RVAL2CF(self), NUM2INT(index));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_set_y2(VALUE self, VALUE y2)
++VALUE
++choice_field_unselect_all(VALUE self)
+ {
+-    RVAL2RECT(self)->y2 = NUM2DBL(y2);
++    poppler_form_field_choice_unselect_all(RVAL2CF(self));
+     return Qnil;
+ }
+ 
+-static VALUE
+-rectangle_to_a(VALUE self)
++VALUE
++choice_field_toggle_item(VALUE self, VALUE index)
+ {
+-    PopplerRectangle *rectangle = RVAL2RECT(self);
+-    return rb_ary_new3(4,
+-                       rb_float_new(rectangle->x1),
+-                       rb_float_new(rectangle->y1),
+-                       rb_float_new(rectangle->x2),
+-                       rb_float_new(rectangle->y2));
++    poppler_form_field_choice_toggle_item(RVAL2CF(self), NUM2INT(index));
++    return Qnil;
+ }
+ 
+-
+-/* Mapping between areas on the current page and PopplerActions */
+-static VALUE
+-link_mapping_get_area(VALUE self)
++VALUE
++choice_field_set_text(VALUE self, VALUE text)
+ {
+-    return RECT2RVAL(&(RVAL2LM(self)->area));
++    poppler_form_field_choice_set_text(RVAL2CF(self), RVAL2CSTR2(text));
++    return Qnil;
+ }
+ 
+-static VALUE
+-link_mapping_get_action(VALUE self)
++VALUE
++choice_field_get_text(VALUE self)
+ {
+-    return ACTION2RVAL(RVAL2LM(self)->action);
++    return CSTR2RVAL(poppler_form_field_choice_get_text(RVAL2CF(self)));
+ }
++#endif
+ 
+ void
+ Init_poppler_page(VALUE mPoppler)
+ {
+-    VALUE cPage, cRectangle, cLinkMapping;
++    VALUE cPage, cLinkMapping;
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    VALUE cPageTransition, cImageMapping, cFormFieldMapping, cFormField;
++#endif
+ 
+     cPage = G_DEF_CLASS(POPPLER_TYPE_PAGE, "Page", mPoppler);
+     cRectangle = G_DEF_CLASS(POPPLER_TYPE_RECTANGLE, "Rectangle", mPoppler);
+     cLinkMapping = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping",
+                                mPoppler);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    cPageTransition = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION,
++                                  "PageTransition", mPoppler);
++    cImageMapping = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING,
++                                "ImageMapping", mPoppler);
++    cFormFieldMapping = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING,
++                                    "FormFieldMapping", mPoppler);
++
++    cFormField = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD, "FormField", mPoppler);
++    cUnknownField = rb_define_class_under(mPoppler, "UnknownField", cFormField);
++    cTextField = rb_define_class_under(mPoppler, "TextField", cFormField);
++    cButtonField = rb_define_class_under(mPoppler, "ButtonField", cFormField);
++    cChoiceField = rb_define_class_under(mPoppler, "ChoiceField", cFormField);
++    cSignatureField = rb_define_class_under(mPoppler, "SignatureField",
++                                            cFormField);
++#endif
+     cPSFile = rb_const_get(mPoppler, rb_intern("PSFile"));
+ 
+     rb_define_method(cPage, "render", page_render_generic, -1);
+     rb_define_method(cPage, "size", page_get_size, 0);
+     rb_define_method(cPage, "index", page_get_index, 0);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "duration", page_get_duration, 0);
++    rb_define_method(cPage, "transition", page_get_transition, 0);
++#endif
+     rb_define_method(cPage, "thumbnail", page_get_thumbnail, 0);
+     rb_define_method(cPage, "thumbnail_size", page_get_thumbnail_size, 0);
+     rb_define_method(cPage, "find_text", page_find_text, 1);
+-    rb_define_method(cPage, "get_text", page_get_text, 1);
++    rb_define_method(cPage, "get_text", page_get_text, -1);
+     rb_define_method(cPage, "link_mapping", page_get_link_mapping, 0);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "image_mapping", page_get_image_mapping, 0);
++    rb_define_method(cPage, "form_field_mapping",
++                     page_get_form_field_mapping, 0);
++#endif
+     rb_define_method(cPage, "get_selection_region",
+-                     page_get_selection_region, 2);
++                     page_get_selection_region, -1);
+     rb_define_method(cPage, "render_selection",
+                      page_render_selection_generic, -1);
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++    rb_define_method(cPage, "crop_box", page_get_crop_box, 0);
++#endif
+ 
+     G_DEF_SETTERS(cPage);
+ 
+@@ -335,5 +733,102 @@ Init_poppler_page(VALUE mPoppler)
+     rb_define_method(cLinkMapping, "area", link_mapping_get_area, 0);
+     rb_define_method(cLinkMapping, "action", link_mapping_get_action, 0);
+ 
++    rb_define_method(cLinkMapping, "set_area", link_mapping_set_area, 1);
++    rb_define_method(cLinkMapping, "set_action", link_mapping_set_action, 1);
++
+     G_DEF_SETTERS(cLinkMapping);
++
++#if POPPLER_CHECK_VERSION(0, 5, 9)
++/* Page Transition */
++    rb_define_method(cPageTransition, "type", page_trans_get_type, 0);
++    rb_define_method(cPageTransition, "alignment", page_trans_get_alignment, 0);
++    rb_define_method(cPageTransition, "direction", page_trans_get_direction, 0);
++    rb_define_method(cPageTransition, "duration", page_trans_get_duration, 0);
++    rb_define_method(cPageTransition, "angle", page_trans_get_angle, 0);
++    rb_define_method(cPageTransition, "scale", page_trans_get_scale, 0);
++    rb_define_method(cPageTransition, "rectangular",
++                     page_trans_get_rectangular, 0);
++
++    rb_define_method(cPageTransition, "set_type", page_trans_set_type, 1);
++    rb_define_method(cPageTransition, "set_alignment",
++                     page_trans_set_alignment, 1);
++    rb_define_method(cPageTransition, "set_direction",
++                     page_trans_set_direction, 1);
++    rb_define_method(cPageTransition, "set_duration",
++                     page_trans_set_duration, 1);
++    rb_define_method(cPageTransition, "set_angle", page_trans_set_angle, 1);
++    rb_define_method(cPageTransition, "set_scale", page_trans_set_scale, 1);
++    rb_define_method(cPageTransition, "set_rectangular",
++                     page_trans_set_rectangular, 1);
++
++    G_DEF_SETTERS(cPageTransition);
++
++
++/* Mapping between areas on the current page and images */
++    rb_define_method(cImageMapping, "area", image_mapping_get_area, 0);
++    rb_define_method(cImageMapping, "image", image_mapping_get_image, 0);
++
++    rb_define_method(cImageMapping, "set_area", image_mapping_set_area, 1);
++    rb_define_method(cImageMapping, "set_image", image_mapping_set_image, 1);
++
++    G_DEF_SETTERS(cImageMapping);
++
++
++/* Mapping between areas on the current page and form fields */
++    rb_define_method(cFormFieldMapping, "area", form_field_mapping_get_area, 0);
++    rb_define_method(cFormFieldMapping, "field", form_field_mapping_get_field,
++                     0);
++
++    rb_define_method(cFormFieldMapping, "set_area",
++                     form_field_mapping_set_area, 1);
++    rb_define_method(cFormFieldMapping, "set_field",
++                     form_field_mapping_set_field, 1);
++
++    G_DEF_SETTERS(cFormFieldMapping);
++
++/* FormField */
++    rb_define_method(cFormField, "id", form_field_get_id, 0);
++    rb_define_method(cFormField, "font_size", form_field_get_font_size, 0);
++    rb_define_method(cFormField, "read_only?", form_field_is_read_only, 0);
++
++    G_DEF_SETTERS(cFormField);
++
++
++    rb_define_method(cButtonField, "active?", button_field_get_state, 0);
++    rb_define_method(cButtonField, "set_active", button_field_set_state, 1);
++
++    G_DEF_SETTERS(cButtonField);
++
++
++    rb_define_method(cTextField, "type", text_field_get_text_type, 0);
++    rb_define_method(cTextField, "text", text_field_get_text, 0);
++    rb_define_method(cTextField, "set_text", text_field_set_text, 1);
++    rb_define_method(cTextField, "max_length", text_field_get_max_length, 0);
++    rb_define_method(cTextField, "spell_check?", text_field_do_spell_check, 0);
++    rb_define_method(cTextField, "scroll?", text_field_do_scroll, 0);
++    rb_define_method(cTextField, "rich_text?", text_field_is_rich_text, 0);
++    rb_define_method(cTextField, "password?", text_field_is_password, 0);
++
++    G_DEF_SETTERS(cTextField);
++
++
++    rb_define_method(cChoiceField, "type", choice_field_get_choice_type, 0);
++    rb_define_method(cChoiceField, "editable?", choice_field_is_editable, 0);
++    rb_define_method(cChoiceField, "select_multiple?",
++                     choice_field_can_select_multiple, 0);
++    rb_define_method(cChoiceField, "spell_check?",
++                     choice_field_do_spell_check, 0);
++    rb_define_method(cChoiceField, "commit_on_change?",
++                     choice_field_commit_on_change, 0);
++    rb_define_method(cChoiceField, "n_items", choice_field_get_n_items, 0);
++    rb_define_method(cChoiceField, "[]", choice_field_get_item, 1);
++    rb_define_method(cChoiceField, "selected?",
++                     choice_field_is_item_selected, 1);
++    rb_define_method(cChoiceField, "select", choice_field_select_item, 1);
++    rb_define_method(cChoiceField, "unselect_all", choice_field_unselect_all, 0);
++    rb_define_method(cChoiceField, "text", choice_field_get_text, 0);
++    rb_define_method(cChoiceField, "set_text", choice_field_set_text, 1);
++
++    G_DEF_SETTERS(cChoiceField);
++#endif
+ }


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-gnome2.spec	8 Sep 2007 14:48:48 -0000	1.7
+++ ruby-gnome2.spec	13 Sep 2007 13:43:15 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -622,6 +622,9 @@
 
 %changelog
 
+* Thu Sep 13 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-12
+- Newpoppler.patch updated for poppler 0.6
+
 * Sat Sep  8 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-11
 - Rebuild against new poppler
 - Changed license to LGPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 13 13:49:11 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 09:49:11 -0400
Subject: rpms/ginac/devel .cvsignore, 1.7, 1.8 ginac.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200709131349.l8DDnBcv010578@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10541

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release, changes to file lists.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Aug 2007 20:33:19 -0000	1.7
+++ .cvsignore	13 Sep 2007 13:48:38 -0000	1.8
@@ -1 +1 @@
-ginac-1.3.7.tar.bz2
+ginac-1.4.0.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ginac.spec	21 Aug 2007 20:33:19 -0000	1.11
+++ ginac.spec	13 Sep 2007 13:48:38 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.3.7
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -88,22 +88,21 @@
 %files devel
 %defattr(-,root,root)
 %{_infodir}/*.info*
-%{_mandir}/man?/ginac-config.1*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/ginac.pc
 %{_includedir}/ginac
-%{_bindir}/ginac-config
-%{_datadir}/aclocal/ginac.m4
 %exclude %{_libdir}/*.la
 
 %files utils
 %defattr(-,root,root)
-%{_bindir}/ginsh
-%{_bindir}/viewgar
-%{_mandir}/man?/ginsh.1*
-%{_mandir}/man?/viewgar.1*
+%{_bindir}/*
+%{_mandir}/man?/*
 
 %changelog
+* Wed Sep 12 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-1
+- New release. Changes file lists to reflect the removal of some files
+  previously in the devel package.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sf.net> 1.3.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Aug 2007 20:33:19 -0000	1.7
+++ sources	13 Sep 2007 13:48:38 -0000	1.8
@@ -1 +1 @@
-27e4a8182a4c50e4030412d091bdbc6c  ginac-1.3.7.tar.bz2
+e8eee1be68d32d5f5961afa2667928c3  ginac-1.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 14:32:05 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 10:32:05 -0400
Subject: rpms/cln/devel cln.spec,1.22,1.23
Message-ID: <200709131432.l8DEW5CK018377@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18336

Modified Files:
	cln.spec 
Log Message:
Add pkgconfig as a dependency of -devel.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cln.spec	21 Aug 2007 20:21:41 -0000	1.22
+++ cln.spec	13 Sep 2007 14:31:32 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -21,7 +21,7 @@
 %package devel
 Summary:        Development files for programs using the CLN library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release} gmp-devel
+Requires:       %{name} = %{version}-%{release} gmp-devel pkgconfig
 
 %description devel
 A collection of C++ math classes and functions, which are designed for
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Thu Sep 13 2007 Quentin Spencer <qspencer at users.sf.net> 1.1.13-4
+- Add pkgconfig as a dependency of -devel.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sf.net> 1.1.13-3
 - Rebuild for F8.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 14:36:38 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 13 Sep 2007 10:36:38 -0400
Subject: rpms/ginac/devel ginac.spec,1.12,1.13
Message-ID: <200709131436.l8DEacbO018556@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18526

Modified Files:
	ginac.spec 
Log Message:
Add pkgconfig as a dependency of -devel.


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ginac.spec	13 Sep 2007 13:48:38 -0000	1.12
+++ ginac.spec	13 Sep 2007 14:36:05 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ginac
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
@@ -24,7 +24,7 @@
 %package devel
 Summary: GiNaC development libraries and header files
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} cln-devel
+Requires: %{name} = %{version}-%{release} cln-devel pkgconfig
 Obsoletes: GiNaC-devel < 1.3.2
 Provides:  GiNaC-devel = %{version}-%{release}
 
@@ -99,6 +99,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Thu Sep 13 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-2
+- Add pkgconfig as a dependency of -devel.
+
 * Wed Sep 12 2007 Quentin Spencer <qspencer at users.sf.net> 1.4.0-1
 - New release. Changes file lists to reflect the removal of some files
   previously in the devel package.



From fedora-extras-commits at redhat.com  Thu Sep 13 14:49:49 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Thu, 13 Sep 2007 10:49:49 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.443, 1.444 anaconda.spec, 1.579, 
	1.580 sources, 1.571, 1.572
Message-ID: <200709131449.l8DEnnQT018998@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18972

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- .cvsignore	5 Sep 2007 15:35:55 -0000	1.443
+++ .cvsignore	13 Sep 2007 14:49:17 -0000	1.444
@@ -1 +1,2 @@
 anaconda-11.3.0.28.tar.bz2
+anaconda-11.3.0.29.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- anaconda.spec	5 Sep 2007 15:35:55 -0000	1.579
+++ anaconda.spec	13 Sep 2007 14:49:17 -0000	1.580
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.28
+Version: 11.3.0.29
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,29 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 13 2007 Chris Lumens <clumens at redhat.com> 11.3.0.29-1
+- On the graphical netconfig screen, only check the gateway address if
+  provided (dcantrell).
+- Don't show wireless adapters unless explicitly requested (katzj).
+- Add user and services commands and scripts to anaconda-ks.cfg
+- Fix handling of groups from the kickstart user command.
+- Support loading updates from partitioned devices.
+- Rework netlink code to support > 10 devices and not get caught in
+  an infinite loop (pjones, dcantrell).
+- Fix args passed to iscsiadm (k.georgiou AT imperial DOT ac DOT uk,
+  #283791).
+- Set flags.selinux (katzj, #244691).
+- Be more accepting when waiting for an sshd response
+  (alanm AT redhat DOT com, #286031).
+- Probe USB to make USB network installs work (H.J. Lu, #285491).
+- Rework driver package installation to be more generic.
+- Turn off swaps we didn't turn on so livecds don't blow up (katzj).
+- Add new Chinese and Japanese font packages (katzj, #279931).
+- Fix another upgrade GUI traceback (#281031).
+- Correctly identify when the VNC server doesn't start.
+- Display the correct signal name when loader exits (pjones).
+- Change method for determining maximum LV size (msivak, #242508).
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.28-1
 - Make sure we find out about all nics (dcantrell)
 - Hard drive install fixing (clumens, #287241)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- sources	5 Sep 2007 15:35:55 -0000	1.571
+++ sources	13 Sep 2007 14:49:17 -0000	1.572
@@ -1 +1 @@
-9e00bb0aebbbe4e388a77e3dcec5866d  anaconda-11.3.0.28.tar.bz2
+29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 15:14:50 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 13 Sep 2007 11:14:50 -0400
Subject: rpms/qt4/devel qtdemo-qt4.png,NONE,1.1 qt4.spec,1.62,1.63
Message-ID: <200709131514.l8DFEoLf025487@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459

Modified Files:
	qt4.spec 
Added Files:
	qtdemo-qt4.png 
Log Message:
fixed bz241452, add qtdemo/qtconfig icons



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qt4.spec	23 Aug 2007 11:57:32 -0000	1.62
+++ qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -43,6 +43,8 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
+Source30: qtdemo-qt4.png
+
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
@@ -415,6 +417,11 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
+# qtdemo/qtconfig icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
+install -p -m644 -D tools/qtconfig/images/appicon.png \
+                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
 prefix=%{_qt4_prefix}
@@ -510,6 +517,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -572,6 +580,7 @@
 %{_qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -599,6 +608,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
+- fixed bz241452, add qtdemo/qtconfig icons
+
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:15:21 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:15:21 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util-addosgimanifest.patch,
	NONE, 1.1
Message-ID: <200709131515.l8DFFLjJ025532@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25522

Added Files:
	ws-commons-util-addosgimanifest.patch 
Log Message:
* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
- maven-ify.
- Add OSGi MANIFEST information.

ws-commons-util-addosgimanifest.patch:

--- NEW FILE ws-commons-util-addosgimanifest.patch ---
--- pom.xml.orig	2007-09-06 13:42:28.000000000 -0400
+++ pom.xml	2007-09-06 13:48:26.000000000 -0400
@@ -100,6 +100,24 @@
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<configuration>
+		    <archive>
+			<manifestEntries>
+			    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+			    <Bundle-Name>%Bundle-Name</Bundle-Name>
+			    <Bundle-Localization>plugin</Bundle-Localization>
+			    <Bundle-SymbolicName>org.apache.ws.commons.util</Bundle-SymbolicName>
+			    <Bundle-Version>1.0.0.qualifier</Bundle-Version>
+			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.0", org.apache.ws.commons.util;version="1.0.0"</Export-Package>
+			    <Import-Package>javax.xml, javax.xml.namespace, org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</Import-Package>
+			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+			</manifestEntries>
+		    </archive>
+		</configuration>
+	    </plugin>
         </plugins>
     </build>
     <dependencies>



From fedora-extras-commits at redhat.com  Thu Sep 13 15:15:51 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:15:51 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.1,1.2
Message-ID: <200709131515.l8DFFpXM025616@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25481

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
- maven-ify.
- Add OSGi MANIFEST information.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws-commons-util.spec	20 Mar 2007 01:49:46 -0000	1.1
+++ ws-commons-util.spec	13 Sep 2007 15:14:47 -0000	1.2
@@ -1,15 +1,24 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://apache.osuosl.org/ws/commons/util/
 Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
+Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jpackage-utils >= 1.5
+BuildRequires:  maven2
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-source
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  junit
+BuildRequires:  java-javadoc
 
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -28,25 +37,24 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
-
-cd src/main/java
-find ./ -name \*.java | xargs javac
-find ./ -name \*.class| xargs jar cvf %{name}-%{version}.jar
-mkdir html
-find ./ -name \*.java | xargs javadoc -d html
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp \
+  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  install javadoc:javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd src/main/java
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pR html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 aot-compile-rpm
@@ -70,5 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
+- maven-ify.
+- Add OSGi MANIFEST information.
+
 * Fri Mar 16 2007 Anthony Green <green at redhat.com> - 1.0.1-1
 - Created.



From fedora-extras-commits at redhat.com  Thu Sep 13 15:19:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:19:34 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.2,1.3
Message-ID: <200709131519.l8DFJYug025781@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25733

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
- Bump release.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ws-commons-util.spec	13 Sep 2007 15:14:47 -0000	1.2
+++ ws-commons-util.spec	13 Sep 2007 15:19:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
+- Bump release.
+
 * Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
 - maven-ify.
 - Add OSGi MANIFEST information.



From fedora-extras-commits at redhat.com  Thu Sep 13 15:23:46 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 13 Sep 2007 11:23:46 -0400
Subject: rpms/qt4/devel qt-x11-opensource-src-4.3.1-64bit.patch, NONE,
	1.1 qt4.spec, 1.63, 1.64 qt-x11-opensource-src-4.3.1-ppc64.patch,
	1.1, NONE
Message-ID: <200709131523.l8DFNkUS025979@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.1-64bit.patch 
Removed Files:
	qt-x11-opensource-src-4.3.1-ppc64.patch 
Log Message:
fixed bz249242, designer4 - segmentation fault on s390x



qt-x11-opensource-src-4.3.1-64bit.patch:

--- NEW FILE qt-x11-opensource-src-4.3.1-64bit.patch ---
diff -up qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64 qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h
--- qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h.ppc64	2007-08-07 08:08:39.000000000 -0500
+++ qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h	2007-08-23 06:54:36.000000000 -0500
@@ -44,7 +44,7 @@
 QT_BEGIN_HEADER
 
 #if defined(Q_CC_GNU)
-#ifdef __64BIT__
+#if defined(__64BIT__) || defined(__powerpc64__) || defined(__s390x__)
 #  define LPARX "ldarx"
 #  define CMPP  "cmpd"
 #  define STPCX "stdcx."


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qt4.spec	13 Sep 2007 15:14:17 -0000	1.63
+++ qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
@@ -29,8 +29,8 @@
 Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# ppc64 segfaults, http://bugzilla.redhat.com/246324
-Patch3: qt-x11-opensource-src-4.3.1-ppc64.patch
+# ppc64/s390x segfaults, http://bugzilla.redhat.com/246324,249242
+Patch3: qt-x11-opensource-src-4.3.1-64bit.patch
 ## qt-copy patches
 
 Source10: qt4-wrapper.sh
@@ -610,6 +610,7 @@
 %changelog
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
+- fixed bz249242, designer4 - segmentation fault on s390x
 
 * Wed Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-3
 - ppc64 patch (#246324)


--- qt-x11-opensource-src-4.3.1-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:49 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:28:49 -0400
Subject: rpms/ws-commons-util Makefile,1.1,1.2
Message-ID: <200709131528.l8DFSnog026141@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26077

Modified Files:
	Makefile 
Log Message:
Fix name once and for all.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Mar 2007 23:35:49 -0000	1.1
+++ Makefile	13 Sep 2007 15:28:16 -0000	1.2
@@ -1,4 +1,4 @@
-# Top level Makefile for module ws-common-utils
+# Top level Makefile for module ws-commons-util
 all : CVS/Root common-update
 	@cvs update
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:52 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:28:52 -0400
Subject: rpms/ws-commons-util/devel Makefile,1.1,1.2
Message-ID: <200709131528.l8DFSqXA026145@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26077/devel

Modified Files:
	Makefile 
Log Message:
Fix name once and for all.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Mar 2007 23:35:56 -0000	1.1
+++ Makefile	13 Sep 2007 15:28:19 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: ws-common-utils
+# Makefile for source rpm: ws-commons-util
 # $Id$
-NAME := ws-common-utils
+NAME := ws-commons-util
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Thu Sep 13 15:28:51 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 13 Sep 2007 11:28:51 -0400
Subject: rpms/smolt/EL-4 smolt.spec,1.24,1.25
Message-ID: <200709131528.l8DFSpxH026144@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26088

Modified Files:
	smolt.spec 
Log Message:
added proper EL-4 release for the client


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- smolt.spec	22 Jun 2007 15:35:09 -0000	1.24
+++ smolt.spec	13 Sep 2007 15:28:18 -0000	1.25
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 0.9.8.3
-Release: 1%{?dist}
+Version: 0.9.8.4
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -15,7 +15,6 @@
 BuildArch: noarch
 Requires: dbus-python
 BuildRequires: gettext
-BuildRequires: /usr/bin/msgfmt.py
 BuildRequires: desktop-file-utils
 
 Requires(post): /sbin/chkconfig
@@ -31,29 +30,6 @@
 
 This package contains the client
 
-%package server
-Summary: Fedora hardware profiler server
-Group: Applications/Internet
-Requires: smolt = %{version}-%{release}
-Requires: TurboGears
-
-%description server
-The Fedora hardware profiler is a server-client system that does a hardware
-scan against a machine and sends the results to a public Fedora Project
-turbogears server.  The sends are anonymous and should not contain any private
-information other than the physical hardware information and basic OS info.
-
-This package contains the server portion
-
-%package firstboot
-Summary: Fedora hardware profile firstboot
-Group: Applications/Internet
-Requires: smolt = %{version}-%{release}
-
-%description firstboot
-This provides firstboot integration for smolt.  It has been broken into a
-separate package so firstboot isn't a requisite to use smolt.
-
 %package gui
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
@@ -72,56 +48,59 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
-%{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
+cd client
+DESTDIR=%{buildroot} make install
+cd ..
+%{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
-%{__mkdir} -p %{buildroot}/%{_bindir}
-%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
+#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
+#%{__mkdir} -p %{buildroot}/%{_bindir}
 %{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_datadir}/locale/
-%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
+#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
-%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt
-%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/
+#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt
+#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/
 
-find %{buildroot} -name \*.po\* -delete
+#find %{buildroot} -name \*.po\* -delete
 
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
 
-%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/
-%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/
-%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/
+#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/
+#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/
+#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/
 
 # Icons
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
-%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
 %{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
 %{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
 %{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
 %{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
 %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
-%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/pixmaps/smolt.png
 
-%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
-%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
+#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
+#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
+
+#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py
+#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
+#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt
 
+%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
 ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
-%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py
-%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
-%{__chmod} +x %{buildroot}/%{_initrddir}/smolt
+ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
 desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
-
 %find_lang %{name}
 
+# Cleanup from the Makefile (will be cleaned up when it is finalized)
+%{__rm} -f %{buildroot}/etc/init.d/smolt
+%{__rm} -f %{buildroot}/etc/smolt/hw-uuid
+
 %clean
 rm -rf %{buildroot}
 
@@ -148,19 +127,11 @@
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
+%{_sysconfdir}/%{name}/config.*
 %{_sysconfdir}/cron.d/%{name}
 %{_initrddir}/%{name}
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid
 
-%files server
-%defattr(-,root,root,-)
-%{_datadir}/%{name}/smoon
-
-%files firstboot
-%defattr(-,root,root,-)
-%{_datadir}/firstboot/modules/smolt.py*
-%{_datadir}/firstboot/pixmaps/smolt.png
-
 %files gui
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-smolt.desktop
@@ -168,6 +139,18 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+- Removed firstboot and server portions for EL-4
+
+* Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4
+- Rebuild to clean up 'config.py' compilations
+
+* Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-1
+- Upstream released new version (major changes)
+- New config file
+- New Makefile
+- Added deps
+
 * Fri Jun 22 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:32:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 13 Sep 2007 11:32:46 -0400
Subject: rpms/smolt/EL-4 smolt.spec,1.25,1.26 sources,1.15,1.16
Message-ID: <200709131532.l8DFWks5026357@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288

Modified Files:
	smolt.spec sources 
Log Message:
updated sources file and release bump


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- smolt.spec	13 Sep 2007 15:28:18 -0000	1.25
+++ smolt.spec	13 Sep 2007 15:32:13 -0000	1.26
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -139,7 +139,7 @@
 %{_bindir}/smoltGui
 
 %changelog
-* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
 - Removed firstboot and server portions for EL-4
 
 * Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2007 15:35:09 -0000	1.15
+++ sources	13 Sep 2007 15:32:13 -0000	1.16
@@ -1,2 +1 @@
-cd9a9b1b3424423b8695442b0e264a7c  smolt-0.9.8.1.tar.gz
-69d08a3cf15b5e42aeba2af8f376cb21  smolt-0.9.8.3.tar.gz
+2b79adbf0271160d55f4540008d0859f  smolt-0.9.8.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:35:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 11:35:23 -0400
Subject: rpms/mcstrans/devel mcstrans.spec,1.29,1.30 sources,1.19,1.20
Message-ID: <200709131535.l8DFZNwt026449@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26419

Modified Files:
	mcstrans.spec sources 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
- Check for max_categories and error out



Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mcstrans.spec	1 Mar 2007 21:09:58 -0000	1.29
+++ mcstrans.spec	13 Sep 2007 15:34:50 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.2.5
+Version: 0.2.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
@@ -70,6 +70,9 @@
 %{_sysconfdir}/rc.d/init.d/mcstrans
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
+- Check for max_categories and error out
+
 * Thu Mar 1 2007 Dan Walsh <dwalsh at redhat.com> 0.2.5-1
 - Fix case where s0=""
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Mar 2007 21:09:58 -0000	1.19
+++ sources	13 Sep 2007 15:34:50 -0000	1.20
@@ -1 +1 @@
-64d7b1938b25d3eaae211e15777b1794  mcstrans-0.2.5.tgz
+85e22ebd19c93b1120003050691889fe  mcstrans-0.2.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:44:51 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 13 Sep 2007 11:44:51 -0400
Subject: rpms/mcstrans/devel .cvsignore,1.16,1.17
Message-ID: <200709131544.l8DFipqL026657@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26624

Modified Files:
	.cvsignore 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 0.2.6-1
- Check for max_categories and error out



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Mar 2007 21:09:58 -0000	1.16
+++ .cvsignore	13 Sep 2007 15:44:18 -0000	1.17
@@ -13,3 +13,4 @@
 mcstrans-0.2.3.tgz
 mcstrans-0.2.4.tgz
 mcstrans-0.2.5.tgz
+mcstrans-0.2.6.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:46:02 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:46:02 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.3,1.4
Message-ID: <200709131546.l8DFk2tS026743@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26715

Modified Files:
	ws-commons-util.spec 
Log Message:
Bump again.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ws-commons-util.spec	13 Sep 2007 15:19:01 -0000	1.3
+++ ws-commons-util.spec	13 Sep 2007 15:45:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-4
+- Bump again.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-3
 - Bump release.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 15:49:51 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:49:51 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchcommits
Message-ID: <200709131549.l8DFnpa6010659@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libmusicbrainz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:49:55 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:49:55 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchbugzilla
Message-ID: <200709131549.l8DFnu8k010668@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libmusicbrainz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:26 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested commit
Message-ID: <200709131550.l8DFoQ55010680@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libmusicbrainz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:33 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchbugzilla
Message-ID: <200709131550.l8DFoXAV010689@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on libmusicbrainz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:35 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested watchcommits
Message-ID: <200709131550.l8DFoZDY014954@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on libmusicbrainz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:50:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 08:50:37 -0700
Subject: [pkgdb] libmusicbrainz: rdieter has requested commit
Message-ID: <200709131550.l8DFobiI010699@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on libmusicbrainz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 15:51:37 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 11:51:37 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.4,1.5
Message-ID: <200709131551.l8DFpbWD027469@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27271

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
- ExcludeArch ppc64 until maven is built on ppc64.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ws-commons-util.spec	13 Sep 2007 15:45:29 -0000	1.4
+++ ws-commons-util.spec	13 Sep 2007 15:51:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -10,6 +10,9 @@
 Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
+ExcludeArch:    ppc64
+
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
@@ -78,6 +81,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
+- ExcludeArch ppc64 until maven is built on ppc64.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-4
 - Bump again.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:08:08 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 12:08:08 -0400
Subject: rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.26, 1.27 sources, 1.26, 
	1.27 telepathy-gabble.spec, 1.37, 1.38
Message-ID: <200709131608.l8DG88BH001372@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1329

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
- new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Sep 2007 21:40:37 -0000	1.26
+++ .cvsignore	13 Sep 2007 16:07:35 -0000	1.27
@@ -6,3 +6,4 @@
 telepathy-gabble-0.5.13.20070904darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1.20070906darcs_olpctrial3a.tar.gz
 telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz
+telepathy-gabble-0.5.14.1-olpc-trial3a-20070913.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	12 Sep 2007 21:40:37 -0000	1.26
+++ sources	13 Sep 2007 16:07:35 -0000	1.27
@@ -1 +1,2 @@
 08c37009f68fe7a34f8c218a8c4ac3ca  telepathy-gabble-0.5.14.1-olpc-trial3a-20070912.tar.gz
+b0495cd024967171495f29ad4b01cde7  telepathy-gabble-0.5.14.1-olpc-trial3a-20070913.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- telepathy-gabble.spec	12 Sep 2007 22:34:31 -0000	1.37
+++ telepathy-gabble.spec	13 Sep 2007 16:07:35 -0000	1.38
@@ -1,7 +1,7 @@
 # This is a snapshot release of the olpcrollup branch of telepathy-gabble
 # Code can be found for this branch at 
 # http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc-rollup/ 
-%define alphatag olpc_trial3a_20070912 
+%define alphatag olpc_trial3a_20070913.1
 
 %define telepathy_glib_version 0.5.14
 
@@ -13,7 +13,7 @@
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070912.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-0.5.14.1-olpc-trial3a-20070913.1.tar.gz
 Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070913.1
+- New snapshot
+
 * Wed Sep 12 2007 John (J5) Palmieri <johnp at redhat.com> - 0.5.14.1-0.2.olpc-trial3a-20070912
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:11:12 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Thu, 13 Sep 2007 12:11:12 -0400
Subject: rpms/gtkhtml3/devel gtkhtml-3.15.92-cursor-position.patch, NONE,
	1.1 gtkhtml3.spec, 1.100, 1.101
Message-ID: <200709131611.l8DGBCmn001519@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1485

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.15.92-cursor-position.patch 
Log Message:

* Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
- Add patch for GNOME bug #443850 (fix cursor position after typing halant).


gtkhtml-3.15.92-cursor-position.patch:

--- NEW FILE gtkhtml-3.15.92-cursor-position.patch ---
diff -up gtkhtml-3.15.92/src/gtkhtml.c.cursor-position gtkhtml-3.15.92/src/gtkhtml.c
--- gtkhtml-3.15.92/src/gtkhtml.c.cursor-position	2007-09-13 11:01:15.000000000 -0400
+++ gtkhtml-3.15.92/src/gtkhtml.c	2007-09-13 11:02:08.000000000 -0400
@@ -3221,9 +3221,9 @@ gtk_html_im_commit_cb (GtkIMContext *con
                 D_IM (printf ("IM delete last preedit %d + %d\n", html->priv->im_pre_pos, html->priv->im_pre_len);)
                                                                                 
                 html_undo_freeze (html->engine->undo);
-                html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
+                html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
                 html_engine_set_mark (html->engine);
-                html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
+                html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
                 html_engine_delete (html->engine);
                 html->priv->im_pre_len = 0;
                 html_undo_thaw (html->engine->undo);
@@ -3283,9 +3283,9 @@ gtk_html_im_preedit_changed_cb (GtkIMCon
 	if (html->priv->im_pre_len > 0) {
 		D_IM (printf ("IM delete last preedit %d + %d\n", html->priv->im_pre_pos, html->priv->im_pre_len);)
 		
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
 		html_engine_set_mark (html->engine);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
 		html_engine_delete (html->engine);
 		deleted = html->priv->im_pre_len;
 	} else
@@ -3300,7 +3300,7 @@ gtk_html_im_preedit_changed_cb (GtkIMCon
 		cursor_pos = CLAMP (cursor_pos, 0, html->priv->im_pre_len);
 		html->priv->im_pre_pos = html->engine->cursor->position;
 		html_engine_paste_text_with_extra_attributes (html->engine, preedit_string, html->priv->im_pre_len, attrs);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + cursor_pos);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + cursor_pos);
 	} else
 		html_engine_set_font_style (html->engine, 0, html->priv->im_orig_style);
 	g_free (preedit_string);
@@ -3407,12 +3407,12 @@ gtk_html_im_delete_surrounding_cb (GtkIM
 	if (html_engine_get_editable (html->engine) && !html_engine_is_selection_active (html->engine)) {
 		gint orig_position = html->engine->cursor->position;
 
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset);
 		html_engine_set_mark (html->engine);
-		html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset + n_chars);
+		html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position + offset + n_chars);
 		html_engine_delete (html->engine);
 		if (offset >= 0)
-			html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position);
+			html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, orig_position);
 	}
 	return TRUE;
 }
diff -up gtkhtml-3.15.92/src/htmlcursor.c.cursor-position gtkhtml-3.15.92/src/htmlcursor.c
--- gtkhtml-3.15.92/src/htmlcursor.c.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlcursor.c	2007-09-13 11:02:08.000000000 -0400
@@ -204,12 +204,20 @@ html_cursor_home (HTMLCursor *cursor,
 
 
 static gboolean
-forward (HTMLCursor *cursor, HTMLEngine *engine)
+forward (HTMLCursor *cursor,
+	 HTMLEngine *engine,
+	 gboolean    exact_position)
 {
 	gboolean retval;
+	gboolean (*forward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 
 	retval = TRUE;
-	if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
+	if (exact_position)
+		forward_func = html_object_cursor_forward_one;
+	else
+		forward_func = html_object_cursor_forward;
+
+	if (!forward_func (cursor->object, cursor, engine)) {
 		HTMLObject *next;
 
 		next = html_object_next_cursor (cursor->object, (gint *) &cursor->offset);
@@ -224,8 +232,10 @@ forward (HTMLCursor *cursor, HTMLEngine 
 	return retval;
 }
 
-gboolean
-html_cursor_forward (HTMLCursor *cursor, HTMLEngine *engine)
+static gboolean
+html_cursor_real_forward (HTMLCursor *cursor,
+			  HTMLEngine *engine,
+			  gboolean    exact_position)
 {
 	gboolean retval;
 
@@ -238,20 +248,41 @@ html_cursor_forward (HTMLCursor *cursor,
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
 	cursor->have_target_x = FALSE;
-	retval = forward (cursor, engine);
+	retval = forward (cursor, engine, exact_position);
 
 	debug_location (cursor);
 
 	return retval;
 }
 
+gboolean
+html_cursor_forward (HTMLCursor *cursor,
+		     HTMLEngine *engine)
+{
+	return html_cursor_real_forward (cursor, engine, FALSE);
+}
+
+gboolean
+html_cursor_forward_one (HTMLCursor *cursor,
+			 HTMLEngine *engine)
+{
+	return html_cursor_real_forward (cursor, engine, TRUE);
+}
+
 static gboolean
-backward (HTMLCursor *cursor, HTMLEngine *engine)
+backward (HTMLCursor *cursor,
+	  HTMLEngine *engine,
+	  gboolean    exact_position)
 {
 	gboolean retval;
+	gboolean (*backward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 
 	retval = TRUE;
-	if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
+	if (exact_position)
+		backward_func = html_object_cursor_backward_one;
+	else
+		backward_func = html_object_cursor_backward;
+	if (!backward_func (cursor->object, cursor, engine)) {
 		HTMLObject *prev;
 
 		prev = html_object_prev_cursor (cursor->object, (gint *) &cursor->offset);
@@ -266,9 +297,10 @@ backward (HTMLCursor *cursor, HTMLEngine
 	return retval;
 }
 
-gboolean
-html_cursor_backward (HTMLCursor *cursor,
-		      HTMLEngine *engine)
+static gboolean
+html_cursor_real_backward (HTMLCursor *cursor,
+			   HTMLEngine *engine,
+			   gboolean    exact_position)
 {
 	gboolean retval;
 
@@ -281,13 +313,27 @@ html_cursor_backward (HTMLCursor *cursor
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
 	cursor->have_target_x = FALSE;
-	retval = backward (cursor, engine);
+	retval = backward (cursor, engine, exact_position);
 
 	debug_location (cursor);
 
 	return retval;
 }
 
+gboolean
+html_cursor_backward (HTMLCursor *cursor,
+		      HTMLEngine *engine)
+{
+	return html_cursor_real_backward (cursor, engine, FALSE);
+}
+
+gboolean
+html_cursor_backward_one (HTMLCursor *cursor,
+			  HTMLEngine *engine)
+{
+	return html_cursor_real_backward (cursor, engine, TRUE);
+}
+
 
 gboolean
 html_cursor_up (HTMLCursor *cursor,
@@ -338,7 +384,7 @@ html_cursor_up (HTMLCursor *cursor,
 		prev_x = x;
 		prev_y = y;
 
-		if (! backward (cursor, engine))
+		if (! backward (cursor, engine, FALSE))
 			return FALSE;
 
 		html_object_get_cursor_base (cursor->object,
@@ -523,21 +569,12 @@ html_cursor_down (HTMLCursor *cursor,
 }
 
 
-/**
- * html_cursor_jump_to:
- * @cursor: 
- * @object: 
- * @offset: 
- * 
- * Move the cursor to the specified @offset in the specified @object.
- * 
- * Return value: %TRUE if successfull, %FALSE if failed.
- **/
-gboolean
-html_cursor_jump_to (HTMLCursor *cursor,
-		     HTMLEngine *engine,
-		     HTMLObject *object,
-		     guint offset)
+static gboolean
+html_cursor_real_jump_to (HTMLCursor *cursor,
+			  HTMLEngine *engine,
+			  HTMLObject *object,
+			  guint       offset,
+			  gboolean    exact_position)
 {
 	HTMLCursor original;
 
@@ -557,14 +594,14 @@ html_cursor_jump_to (HTMLCursor *cursor,
 
 	html_cursor_copy (&original, cursor);
 
-	while (forward (cursor, engine)) {
+	while (forward (cursor, engine, exact_position)) {
 		if (cursor->object == object && cursor->offset == offset)
 			return TRUE;
 	}
 
 	html_cursor_copy (cursor, &original);
 
-	while (backward (cursor, engine)) {
+	while (backward (cursor, engine, exact_position)) {
 		if (cursor->object == object && cursor->offset == offset)
 			return TRUE;
 	}
@@ -572,6 +609,46 @@ html_cursor_jump_to (HTMLCursor *cursor,
 	return FALSE;
 }
 
+/**
+ * html_cursor_jump_to:
+ * @cursor: 
+ * @object: 
+ * @offset: 
+ * 
+ * Move the cursor to the specified @offset in the specified @object.
+ * Where exactly move to, depends on the is_cursor_position in PangoLogAttr say.
+ * This is useful for such as Indic languages that relies on that feature.
+ * 
+ * Return value: %TRUE if successfull, %FALSE if failed.
+ **/
+gboolean
+html_cursor_jump_to (HTMLCursor *cursor,
+		     HTMLEngine *engine,
+		     HTMLObject *object,
+		     guint       offset)
+{
+	return html_cursor_real_jump_to (cursor, engine, object, offset, FALSE);
+}
+
+/**
+ * html_cursor_exactly_jump_to:
+ * @cursor:
+ * @object:
+ * @offset:
+ *
+ * Move the cursor to near the specified @offset in the specified @object.
+ *
+ * Return value: %TRUE if successful, %FALSE if failed.
+ **/
+gboolean
+html_cursor_exactly_jump_to (HTMLCursor *cursor,
+			     HTMLEngine *engine,
+			     HTMLObject *object,
+			     guint       offset)
+{
+	return html_cursor_real_jump_to (cursor, engine, object, offset, TRUE);
+}
+
 
 /* Complex cursor movement commands.  */
 
@@ -588,7 +665,7 @@ html_cursor_beginning_of_document (HTMLC
 	if (engine->need_spell_check)
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
-	while (backward (cursor, engine))
+	while (backward (cursor, engine, FALSE))
 		;
 }
 
@@ -605,7 +682,7 @@ html_cursor_end_of_document (HTMLCursor 
 	if (engine->need_spell_check)
 		html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
 
-	while (forward (cursor, engine))
+	while (forward (cursor, engine, FALSE))
 		;
 }
 
@@ -617,19 +694,11 @@ html_cursor_get_position (HTMLCursor *cu
 	return cursor->position;
 }
 
-void
-html_cursor_jump_to_position_no_spell (HTMLCursor *cursor, HTMLEngine *engine, gint position)
-{
-	gboolean need_spell_check;
-
-	need_spell_check = engine->need_spell_check;
-	engine->need_spell_check = FALSE;
-	html_cursor_jump_to_position (cursor, engine, position);
-	engine->need_spell_check = need_spell_check;
-}
-
-void
-html_cursor_jump_to_position (HTMLCursor *cursor, HTMLEngine *engine, gint position)
+static void
+html_cursor_real_jump_to_position (HTMLCursor *cursor,
+				   HTMLEngine *engine,
+				   gint        position,
+				   gboolean    exact_position)
 {
 	g_return_if_fail (cursor != NULL);
 	g_return_if_fail (position >= 0);
@@ -641,17 +710,63 @@ html_cursor_jump_to_position (HTMLCursor
 
 	if (cursor->position < position) {
 		while (cursor->position < position) {
-			if (! forward (cursor, engine))
+			if (! forward (cursor, engine, exact_position))
 				break;
 		}
 	} else if (cursor->position > position) {
 		while (cursor->position > position) {
-			if (! backward (cursor, engine))
+			if (! backward (cursor, engine, exact_position))
 				break;
 		}
 	}
 }
 
+void
+html_cursor_jump_to_position (HTMLCursor *cursor,
+			      HTMLEngine *engine,
+			      gint        position)
+{
+	html_cursor_real_jump_to_position (cursor, engine, position, FALSE);
+}
+
+void
+html_cursor_exactly_jump_to_position (HTMLCursor *cursor,
+				      HTMLEngine *engine,
+				      gint        position)
+{
+	html_cursor_real_jump_to_position (cursor, engine, position, TRUE);
+}
+
+static void
+html_cursor_real_jump_to_position_no_spell (HTMLCursor *cursor,
+					    HTMLEngine *engine,
+					    gint        position,
+					    gboolean    exact_position)
+{
+	gboolean need_spell_check;
+
+	need_spell_check = engine->need_spell_check;
+	engine->need_spell_check = FALSE;
+	html_cursor_real_jump_to_position (cursor, engine, position, exact_position);
+	engine->need_spell_check = need_spell_check;
+}
+
+void
+html_cursor_jump_to_position_no_spell (HTMLCursor *cursor,
+				       HTMLEngine *engine,
+				       gint        position)
+{
+	html_cursor_real_jump_to_position_no_spell (cursor, engine, position, FALSE);
+}
+
+void
+html_cursor_exactly_jump_to_position_no_spell (HTMLCursor *cursor,
+					       HTMLEngine *engine,
+					       gint        position)
+{
+	html_cursor_real_jump_to_position_no_spell (cursor, engine, position, TRUE);
+}
+
 
 /* Comparison.  */
 
@@ -750,7 +865,7 @@ html_cursor_beginning_of_paragraph (HTML
 	while (1) {
 		if (!cursor->offset) {
 			html_cursor_copy (&copy, cursor);
-			if (backward (cursor, engine)) {
+			if (backward (cursor, engine, FALSE)) {
 				new_level = html_object_get_parent_level (cursor->object);
 				if (new_level < level
 				    || (new_level == level && flow != cursor->object->parent)) {
@@ -761,7 +876,7 @@ html_cursor_beginning_of_paragraph (HTML
 				break;
 		}
 			else
-				if (!backward (cursor, engine))
+				if (!backward (cursor, engine, FALSE))
 					break;
 		rv = TRUE;
 	}
@@ -788,7 +903,7 @@ html_cursor_end_of_paragraph (HTMLCursor
 	while (1) {
 		if (cursor->offset == html_object_get_length (cursor->object)) {
 			html_cursor_copy (&copy, cursor);
-			if (forward (cursor, engine)) {
+			if (forward (cursor, engine, FALSE)) {
 				new_level = html_object_get_parent_level (cursor->object);
 				if (new_level < level
 				    || (new_level == level && flow != cursor->object->parent)) {
@@ -799,7 +914,7 @@ html_cursor_end_of_paragraph (HTMLCursor
 				break;
 		}
 			else
-				if (!forward (cursor, engine))
+				if (!forward (cursor, engine, FALSE))
 					break;
 		rv = TRUE;
 	}
diff -up gtkhtml-3.15.92/src/htmlobject.c.cursor-position gtkhtml-3.15.92/src/htmlobject.c
--- gtkhtml-3.15.92/src/htmlobject.c.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlobject.c	2007-09-13 11:02:08.000000000 -0400
@@ -820,7 +820,9 @@ html_object_class_init (HTMLObjectClass 
 	klass->get_clear = get_clear;
 	klass->get_direction = html_object_real_get_direction;
 	klass->cursor_forward = html_object_real_cursor_forward;
+	klass->cursor_forward_one = html_object_real_cursor_forward;
 	klass->cursor_backward = html_object_real_cursor_backward;
+	klass->cursor_backward_one = html_object_real_cursor_backward;
 	klass->cursor_left = html_object_real_cursor_left;
 	klass->cursor_right = html_object_real_cursor_right;
 	klass->backspace = html_object_real_backspace;
@@ -1567,12 +1569,24 @@ html_object_cursor_forward (HTMLObject *
 }
 
 gboolean
+html_object_cursor_forward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+{
+	return (* HO_CLASS (self)->cursor_forward_one) (self, cursor, engine);
+}
+
+gboolean
 html_object_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
 {
 	return (* HO_CLASS (self)->cursor_backward) (self, cursor, engine);
 }
 
 gboolean
+html_object_cursor_backward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+{
+	return (* HO_CLASS (self)->cursor_backward_one) (self, cursor, engine);
+}
+
+gboolean
 html_object_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
 {
 	return (* HO_CLASS (self)->cursor_right) (self, painter, cursor);
diff -up gtkhtml-3.15.92/src/htmlobject.h.cursor-position gtkhtml-3.15.92/src/htmlobject.h
--- gtkhtml-3.15.92/src/htmlobject.h.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlobject.h	2007-09-13 11:02:08.000000000 -0400
@@ -263,7 +263,9 @@ struct _HTMLObjectClass {
 	HTMLDirection (*get_direction)   (HTMLObject *self);
 
 	gboolean (*cursor_forward)       (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
-	gboolean (*cursor_backward)       (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_forward_one)   (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_backward)      (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
+	gboolean (*cursor_backward_one)  (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
 	gboolean (*cursor_right)         (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor);
 	gboolean (*cursor_left)          (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor);
 
@@ -465,9 +467,15 @@ HTMLObject     *html_object_check_point 
 gboolean        html_object_cursor_forward        (HTMLObject            *self,
 						   HTMLCursor            *cursor,
 						   HTMLEngine            *engine);
+gboolean        html_object_cursor_forward_one    (HTMLObject            *self,
+						   HTMLCursor            *cursor,
+						   HTMLEngine            *engine);
 gboolean        html_object_cursor_backward       (HTMLObject            *self,
 						   HTMLCursor            *cursor,
 						   HTMLEngine            *engine);
+gboolean        html_object_cursor_backward_one   (HTMLObject            *self,
+						   HTMLCursor            *cursor,
+						   HTMLEngine            *engine);
 gboolean        html_object_cursor_left           (HTMLObject            *self,
 						   HTMLPainter           *painter,
 						   HTMLCursor            *cursor);
diff -up gtkhtml-3.15.92/src/htmlcursor.h.cursor-position gtkhtml-3.15.92/src/htmlcursor.h
--- gtkhtml-3.15.92/src/htmlcursor.h.cursor-position	2007-09-02 14:55:42.000000000 -0400
+++ gtkhtml-3.15.92/src/htmlcursor.h	2007-09-13 11:02:08.000000000 -0400
@@ -90,6 +90,10 @@ gboolean    html_cursor_jump_to         
 						 HTMLEngine *engine,
 						 HTMLObject *obj,
 						 guint       offset);
+gboolean    html_cursor_exactly_jump_to         (HTMLCursor *cursor,
+						 HTMLEngine *engine,
+						 HTMLObject *obj,
+						 guint       offset);
 HTMLObject *html_cursor_child_of                (HTMLCursor *cursor,
 						 HTMLObject *parent);
 
@@ -97,13 +101,19 @@ HTMLObject *html_cursor_child_of        
 void  html_cursor_normalize     (HTMLCursor *cursor);
 
 /* Position handling.  */
-gint  html_cursor_get_position               (HTMLCursor *cursor);
-void  html_cursor_jump_to_position           (HTMLCursor *cursor,
-					      HTMLEngine *engine,
-					      gint        position);
-void  html_cursor_jump_to_position_no_spell  (HTMLCursor *cursor,
-					      HTMLEngine *engine,
-					      gint        position);
+gint html_cursor_get_position                       (HTMLCursor *cursor);
+void html_cursor_jump_to_position                   (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_exactly_jump_to_position           (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_jump_to_position_no_spell          (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
+void html_cursor_exactly_jump_to_position_no_spell  (HTMLCursor *cursor,
+						     HTMLEngine *engine,
+						     gint        position);
 
 /* Retrieving the character under/before the cursor.  */
 gunichar  html_cursor_get_current_char  (const HTMLCursor *cursor);


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gtkhtml3.spec	4 Sep 2007 02:45:19 -0000	1.100
+++ gtkhtml3.spec	13 Sep 2007 16:10:39 -0000	1.101
@@ -9,7 +9,7 @@
 
 Name: gtkhtml3
 Version: 3.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -29,6 +29,9 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch4: gtkhtml-3.13.1-no-gnome-common.patch
 
+# GNOME bug #443850
+Patch5: gtkhtml-3.15.92-cursor-position.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -63,6 +66,7 @@
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .im-too-late
 %patch4 -p1 -b .no-gnome-common
+%patch5 -p1 -b .cursor-position
 
 %build
 
@@ -130,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
+- Add patch for GNOME bug #443850 (fix cursor position after typing halant).
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-1.fc8
 - Update to 3.15.92
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:12:24 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Thu, 13 Sep 2007 12:12:24 -0400
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.44,1.45
Message-ID: <200709131612.l8DGCOuW001604@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1565

Modified Files:
	linuxwacom.spec 
Log Message:
* adding ppc64 to the list of supported architectures




Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- linuxwacom.spec	21 Aug 2007 15:37:18 -0000	1.44
+++ linuxwacom.spec	13 Sep 2007 16:11:51 -0000	1.45
@@ -6,7 +6,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.7.8.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -20,7 +20,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	xorg-x11-server-Xorg, libX11-devel, libXi-devel, xorg-x11-server-sdk >= 1.0.99.901, ncurses-devel
 Requires:	xorg-x11-server-Xorg >= 1.0.99.901, udev >= 030-21
-ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc sparc sparc64
+ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc ppc64 sparc sparc64
 
 %description 
 The Linux Wacom Project manages the drivers, libraries, and
@@ -96,6 +96,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Sep 13 2007 Aristeu Rozanski <arozansk at redhat.com> 0.7.8.3-3.fc8
+- Adding ppc64 to list of architectures
+
 * Tue Aug 21 2007 Aristeu Rozanski <arozansk at redhat.com> 0.7.8.3-2.fc8
 - Disabling stack protector
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:14:16 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 12:14:16 -0400
Subject: rpms/telepathy-salut/OLPC-2 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 telepathy-salut.spec, 1.11, 1.12
Message-ID: <200709131614.l8DGEGIN001699@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1666

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
- update to snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Sep 2007 15:16:15 -0000	1.9
+++ .cvsignore	13 Sep 2007 16:13:44 -0000	1.10
@@ -6,3 +6,4 @@
 telepathy-salut-0.1.3.1.20070720darcs.tar.gz
 telepathy-salut-0.1.4.1.20070829darcs.tar.gz
 telepathy-salut-0.1.4.1.20070910darcs.tar.gz
+telepathy-salut-0.1.4.1-olpc-trial3-20070912.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Sep 2007 15:16:15 -0000	1.9
+++ sources	13 Sep 2007 16:13:44 -0000	1.10
@@ -1 +1 @@
-97805603ffdda441c4894a69197583a1  telepathy-salut-0.1.4.1.20070910darcs.tar.gz
+5c0563d64387d4cfe6f1d58beb0de114  telepathy-salut-0.1.4.1-olpc-trial3-20070912.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-salut.spec	10 Sep 2007 15:16:15 -0000	1.11
+++ telepathy-salut.spec	13 Sep 2007 16:13:44 -0000	1.12
@@ -1,16 +1,16 @@
-%define darcsdate 20070910darcs
+%define alpha olpc_trial3_20070912
 
 %define telepathy_glib_version 0.5.14
 
 Name:           telepathy-salut
 Version:        0.1.4.1
-Release:        0.3.%{darcsdate}%{?dist}
+Release:        0.4.%{alpha}%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
 License:        LGPL
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
-Source0:        %{name}-%{version}.%{darcsdate}.tar.gz
+Source0:        %{name}-%{version}-olpc-trial3-20070912.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 0.61
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 John (J5) Palmieri <johnp at redhat.com> - 0.1.4.1-0.4.olpc_trial3_20070912
+- update to snapshot
+
 * Mon Sep 10 2007 Dan Williams <dcbw at redhat.com> - 0.1.4.1-0.3.20070910darcs.olpc2
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:24:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Sep 2007 12:24:46 -0400
Subject: rpms/mach/EL-5 mach-0.9.2-centos4rhel.patch, NONE, 1.1 mach.spec,
	1.12, 1.13
Message-ID: <200709131624.l8DGOk3X002027@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mach/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2004

Modified Files:
	mach.spec 
Added Files:
	mach-0.9.2-centos4rhel.patch 
Log Message:
* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3.1
- Patch to default to CentOS configs also when built on RHEL.


mach-0.9.2-centos4rhel.patch:

--- NEW FILE mach-0.9.2-centos4rhel.patch ---
diff -up mach-0.9.2/configure.in~ mach-0.9.2/configure.in
--- mach-0.9.2/configure.in~	2007-09-08 17:46:55.000000000 +0300
+++ mach-0.9.2/configure.in	2007-09-13 19:10:23.000000000 +0300
@@ -110,8 +110,11 @@ CHECK_RELEASE(redhat,    "(Psyche)",    
 CHECK_RELEASE(redhat,    "(Shrike)",     defaultroot="redhat-9-$arch")
 
 CHECK_RELEASE(redhat, "CentOS release 3",defaultroot="centos-3-$arch")
+CHECK_RELEASE(redhat,    "(Taroon)",     defaultroot="centos-3-$arch")
 CHECK_RELEASE(redhat, "CentOS release 4",defaultroot="centos-4-$arch")
+CHECK_RELEASE(redhat,    "(Nahant)",     defaultroot="centos-4-$arch")
 CHECK_RELEASE(redhat, "CentOS release 5",defaultroot="centos-5-$arch")
+CHECK_RELEASE(redhat,    "(Tikanga)",    defaultroot="centos-5-$arch")
 
 CHECK_RELEASE(yellowdog, "(Sirius)",     defaultroot="yellowdog-30-ppc")
 
diff -up mach-0.9.2/configure~ mach-0.9.2/configure
--- mach-0.9.2/configure~	2007-09-08 17:47:07.000000000 +0300
+++ mach-0.9.2/configure	2007-09-13 19:10:23.000000000 +0300
@@ -19944,6 +19944,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Taroon)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-3-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 4"
 
   if test -f /etc/$DIST-release
@@ -19963,6 +19982,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Nahant)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-4-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 5"
 
   if test -f /etc/$DIST-release
@@ -19981,6 +20019,25 @@ echo "${ECHO_T}not found" >&6; }
   fi
 
 
+  DIST=redhat
+  NAME="(Tikanga)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-5-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
 
   DIST=yellowdog
   NAME="(Sirius)"


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/mach.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mach.spec	12 Sep 2007 18:45:03 -0000	1.12
+++ mach.spec	13 Sep 2007 16:24:13 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           mach
 Version:        0.9.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Make a chroot
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.9.2-centos4rhel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires:	python
@@ -46,6 +47,9 @@
 
 %prep
 %setup -q
+touch -r configure.in configure.in.stamp
+%patch0 -p1
+touch -r configure.in.stamp configure.in
 
 %build
 %configure \
@@ -103,6 +107,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3.1
+- Patch to default to CentOS configs also when built on RHEL.
+
 * Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.2-3
 - Set default flavour to "epel" for EPEL builds.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:26:47 2007
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Thu, 13 Sep 2007 12:26:47 -0400
Subject: rpms/keyjnote/devel .cvsignore, 1.2, 1.3 keyjnote.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709131626.l8DGQl2F002175@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/keyjnote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/devel

Modified Files:
	.cvsignore keyjnote.spec sources 
Log Message:

- Update to 0.10.1
- Update license to GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2007 01:14:44 -0000	1.2
+++ .cvsignore	13 Sep 2007 16:26:15 -0000	1.3
@@ -1 +1 @@
-KeyJnote-0.10.0.tar.gz
+KeyJnote-0.10.1.tar.gz


Index: keyjnote.spec
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/keyjnote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keyjnote.spec	6 Jun 2007 01:14:44 -0000	1.1
+++ keyjnote.spec	13 Sep 2007 16:26:15 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           keyjnote
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        A program that displays presentation slides
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2+
 URL:            http://keyjnote.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/KeyJnote-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +41,10 @@
 
 %changelog
 
+* Thu Sep 13 2007 Allisson Azevedo <allisson at gmail.com> 0.10.1-1
+- Update to 0.10.1
+- Update license to GPLv2+
+
 * Tue Jun 5 2007 Allisson Azevedo <allisson at gmail.com> 0.10.0-2
 - Add build section
 - Remove buildrequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keyjnote/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 01:14:44 -0000	1.2
+++ sources	13 Sep 2007 16:26:15 -0000	1.3
@@ -1 +1 @@
-924a474081d0dc0f7975612e518b7883  KeyJnote-0.10.0.tar.gz
+6530ac31c87fb0300e15fcf481ba22b3  KeyJnote-0.10.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:30:00 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 12:30:00 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.684, 1.685 config-x86-generic, 1.11, 1.12 kernel.spec, 1.162,
	1.163 sources, 1.646, 1.647 upstream, 1.568,
	1.569 patch-2.6.23-rc6-git2.bz2.sign, 1.1, NONE
Message-ID: <200709131630.l8DGU0ru002276@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2249

Modified Files:
	.cvsignore config-x86-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git2.bz2.sign 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git3
- disable stack overflow debugging on i386



--- NEW FILE patch-2.6.23-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6ODkyGugalF9Dw4RAuD/AJ0U+uPWckQkQyVJ8TePrhStMoERBwCfZ3Yo
QyPIKRQEY/I8fQ/NWmU2m88=
=ynZO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- .cvsignore	12 Sep 2007 20:19:34 -0000	1.684
+++ .cvsignore	13 Sep 2007 16:29:27 -0000	1.685
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git2.bz2
+patch-2.6.23-rc6-git3.bz2


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-x86-generic	12 Sep 2007 22:56:16 -0000	1.11
+++ config-x86-generic	13 Sep 2007 16:29:27 -0000	1.12
@@ -209,7 +209,7 @@
 CONFIG_PM_STD_PARTITION=""
 
 CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_4KSTACKS=y
 CONFIG_DEBUG_NMI_TIMEOUT=5
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kernel.spec	12 Sep 2007 22:56:16 -0000	1.162
+++ kernel.spec	13 Sep 2007 16:29:27 -0000	1.163
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1795,6 +1795,10 @@
 
 
 %changelog
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git3
+- disable stack overflow debugging on i386
+
 * Wed Sep 12 2007 Dave Jones <davej at redhat.com>
 - Change ACPI dock drivers to be built-in.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- sources	12 Sep 2007 20:19:34 -0000	1.646
+++ sources	13 Sep 2007 16:29:27 -0000	1.647
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-6ecec0906f1becf844497493b14288df  patch-2.6.23-rc6-git2.bz2
+436b893d0005eb90d1329a533bbf5b59  patch-2.6.23-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- upstream	12 Sep 2007 20:19:34 -0000	1.568
+++ upstream	13 Sep 2007 16:29:27 -0000	1.569
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git2.bz2
+patch-2.6.23-rc6-git3.bz2


--- patch-2.6.23-rc6-git2.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 16:46:49 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:46:49 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/devel
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131646.l8DGknIl002775@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:24:48 -0000	1.1
+++ .cvsignore	13 Sep 2007 16:46:12 -0000	1.2
@@ -0,0 +1 @@
+HTML_QuickForm_advmultiselect-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:46:12 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:52:27 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:52:27 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131652.l8DGqRBn002958@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2934

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:51:48 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:54:00 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 12:54:00 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/F-7
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131654.l8DGs0mM003040@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3012

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 16:53:26 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 16:54:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:54:47 -0700
Subject: [pkgdb] mhgui was added for kwizart
Message-ID: <200709131654.l8DGsmKV016074@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package mhgui with summary A simple GUI library for MakeHuman
Kevin Fenzi (kevin) has approved Package mhgui
Kevin Fenzi (kevin) has added a Fedora devel branch for mhgui with an owner of kwizart
Kevin Fenzi (kevin) has approved mhgui in Fedora devel
Kevin Fenzi (kevin) has approved Package mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:07 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 12:55:07 -0400
Subject: rpms/ws-commons-util/devel ws-commons-util.spec,1.5,1.6
Message-ID: <200709131655.l8DGt7og003144@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3117

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-6
- Add BR on maven surefire resources, eclipse, and install plugins.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ws-commons-util.spec	13 Sep 2007 15:51:05 -0000	1.5
+++ ws-commons-util.spec	13 Sep 2007 16:54:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
@@ -17,9 +17,13 @@
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven2-plugin-eclipse
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
@@ -81,6 +85,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-6
+- Add BR on maven surefire resources, eclipse, and install plugins.
+
 * Thu Sep 13 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-5
 - ExcludeArch ppc64 until maven is built on ppc64.
 



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora EPEL, 4) updated by kevin
Message-ID: <200709131655.l8DGt58t011195@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, 6) updated by kevin
Message-ID: <200709131655.l8DGt5ht011204@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, 7) updated by kevin
Message-ID: <200709131655.l8DGt6xQ011222@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora EPEL, 5) updated by kevin
Message-ID: <200709131655.l8DGt5TF011213@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for mhgui
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mhgui (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 09:55:04 -0700
Subject: [pkgdb] mhgui (Fedora, devel) updated by kevin
Message-ID: <200709131655.l8DGt6rY011231@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on mhgui (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mhgui



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:25 -0400
Subject: rpms/mhgui - New directory
Message-ID: <200709131655.l8DGtPE4003226@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui

Log Message:
Directory /cvs/extras/rpms/mhgui added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:30 -0400
Subject: rpms/mhgui/devel - New directory
Message-ID: <200709131655.l8DGtUtB003240@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui/devel

Log Message:
Directory /cvs/extras/rpms/mhgui/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:35 -0400
Subject: rpms/mhgui Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709131655.l8DGtZZo003265@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui

Added Files:
	Makefile import.log 
Log Message:
Setup of module mhgui


--- NEW FILE Makefile ---
# Top level Makefile for module mhgui
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 16:55:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 12:55:37 -0400
Subject: rpms/mhgui/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709131655.l8DGtb5c003281@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTq3193/rpms/mhgui/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mhgui


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mhgui
# $Id: Makefile,v 1.1 2007/09/13 16:55:35 kevin Exp $
NAME := mhgui
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 fedora-extras-commits at redhat.com  Thu Sep 13 17:00:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:26 -0700
Subject: [pkgdb] Io-language was added for jwrdegoede
Message-ID: <200709131700.l8DH0RcU016163@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package Io-language with summary Io is a small, prototype-based programming language
Kevin Fenzi (kevin) has approved Package Io-language
Kevin Fenzi (kevin) has added a Fedora devel branch for Io-language with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved Io-language in Fedora devel
Kevin Fenzi (kevin) has approved Package Io-language
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Io-language (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Io-language (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From fedora-extras-commits at redhat.com  Thu Sep 13 17:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:35 -0700
Subject: [pkgdb] Io-language (Fedora, devel) updated by kevin
Message-ID: <200709131700.l8DH0ZQn011276@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on Io-language (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From fedora-extras-commits at redhat.com  Thu Sep 13 17:00:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 10:00:35 -0700
Subject: [pkgdb] Io-language (Fedora, 7) updated by kevin
Message-ID: <200709131700.l8DH0aSF011285@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for Io-language
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on Io-language (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on Io-language (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Io-language



From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:26 -0400
Subject: rpms/Io-language - New directory
Message-ID: <200709131701.l8DH1Q8J009641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language

Log Message:
Directory /cvs/extras/rpms/Io-language added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:33 -0400
Subject: rpms/Io-language/devel - New directory
Message-ID: <200709131701.l8DH1XM6009658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language/devel

Log Message:
Directory /cvs/extras/rpms/Io-language/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:38 -0400
Subject: rpms/Io-language Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709131701.l8DH1cBA009738@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language

Added Files:
	Makefile import.log 
Log Message:
Setup of module Io-language


--- NEW FILE Makefile ---
# Top level Makefile for module Io-language
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 13 17:01:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 13:01:43 -0400
Subject: rpms/Io-language/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709131701.l8DH1hav009767@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnR9601/rpms/Io-language/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Io-language


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: Io-language
# $Id: Makefile,v 1.1 2007/09/13 17:01:38 kevin Exp $
NAME := Io-language
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 fedora-extras-commits at redhat.com  Thu Sep 13 17:02:08 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 13 Sep 2007 13:02:08 -0400
Subject: rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5
	php-pear-HTML-QuickForm-advmultiselect.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <200709131702.l8DH28s3009880@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9677

Modified Files:
	sources 
Added Files:
	php-pear-HTML-QuickForm-advmultiselect.spec 
Log Message:
new package


--- NEW FILE php-pear-HTML-QuickForm-advmultiselect.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm_advmultiselect

Name:           php-pear-HTML-QuickForm-advmultiselect
Version:        1.4.0
Release:        1%{?dist}
Summary:        Element for HTML_QuickForm that emulate a multi-select

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_QuickForm_advmultiselect
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR) >= 1.4.3, php-pear(HTML_QuickForm) > 3.2.4
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm_advmultiselect package adds an element to the
HTML_QuickForm package that is two select boxes next to each other
emulating a multi-select.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
# Empty build section


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_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}

# 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}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc docdir/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/HTML/QuickForm/advmultiselect.php


%changelog
* Tue Aug 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1
- Take ownership for this, update to 1.4.0
- Change licence from PHP to BSD

* Thu Mar 29 2007 Sebastien Prud'homme <sebastien.prudhomme at gmail.com> 1.3.1-1
- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm-advmultiselect/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:24:48 -0000	1.1
+++ sources	13 Sep 2007 17:01:34 -0000	1.2
@@ -0,0 +1 @@
+0a240714c786f4916e5e6f481ab8052e  HTML_QuickForm_advmultiselect-1.4.0.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:28 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:28 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5S5h011337@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:27 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:27 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5T80016341@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:33 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5XGE011350@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on libmusicbrainz (Fedora devel) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:44 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:44 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5ikP011362@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:46 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:46 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5kRH011372@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:05:48 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 13 Sep 2007 10:05:48 -0700
Subject: [pkgdb] libmusicbrainz had acl change status
Message-ID: <200709131705.l8DH5m96011381@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on libmusicbrainz (Fedora 7) to Approved for Rex Dieter (rdieter)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libmusicbrainz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:21:05 2007
From: fedora-extras-commits at redhat.com (Rahul Sundaram (sundaram))
Date: Thu, 13 Sep 2007 13:21:05 -0400
Subject: rpms/dbench/FC-6 dbench-3.04-datadir.patch, NONE,
	1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench-3.04.tar.gz,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131721.l8DHL56E010276@cvs-int.fedora.redhat.com>

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10247

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench-3.04.tar.gz 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench-3.04.tar.gz ---
?
j[????Ue????u?????O???x??*/?????????~z}R???_B??o`'?.?^`???7o??,???????E?X??~V???????????l???mi??W????4???Qb7?
??-??}??3?Yj????m????????????????o????O??z??-?]?z????????O??y?z?????dp????k?????P??|4?M?\????s?/??R)}]lwe?ZW??????????1zZ,???4????$??AOG?????????????z?dz?:??Y?=}??//_????@???)w(I???r?V?ItU?H?q??$?P??????9?????X?????x3K&?F'??? `?4???:?Wi??iE??E??,+?M?W	???4?
??????d??(??????{?/1?\??
AR???N???TK?*)6???y=?g?\???j????-??p+????3?P?q??s???4?L??Q?:.c?m?(??????4???l?N[c???#h-3
??F?k???$R???iOZ??")X:???:0]KQ??|o	??M??t?wJ?-?Uo??????j]?R???R?V????????NYe??E
s???;??}??????????L?????\?z???N1,zG????OV?imr??nM????R????Q??k?????{d?H?8???q?????:?+?
???D??u?#.s@?>s?S?????	G?tI[?????{?Q?ea?'??.?u??,????U?????????Yj??:?O???PI??:7?B???;1"????xn?M
??????e??
z?2?J\???e??&?eiHR?"+?C?4Q0V
O$L????Cd'"?L?~?Gi?$?-?AY?W3y?s
\?fq??/LY?`+?x???,?R?hg??:??P?=???S$????Eq??k??fX?V????????!??!?S??J?c?zi?????W???XG?e??q?????H???????=s?+;v?^cj?y??
,?`
v
????7d?A????????|???}???3tZ???E?]?s^?T??:?R??<?????L????N!T?????Y??9?Y??.??B
c?9
?????Af!!???Ic>o+?+9?go??N?????5.?T??FN?????v|$s?I6PD?<?1L|?q?o?b2+?`??G?'??r???r??@??76 ????*I?8??a??????\ZI?28??va??
BsF?'-{)?????m]q?s??????????H???H?8??dY!?0?.9n?qEyvG??#?S?&|~B??????9Pf?s?"?&si??OiRQ??s ?C<????m.??8??m?i?
?<?BmV?$???,v?JF???u?Qr???A?
(????D?M?z?|^?E?/??@???)?,
???z?{????<o???njc???I???	?A????	?}?.B|?p??">?2-???Z'6g?????(?L??#??!?????Xr???P? ?Yc*?o???Dv?
??`	???@???&?NG5?: ?{?+??"<?!?!?r???$
(`7??r?8?
?5??4g? ?
??}????%? p?N?k?g,??Tw"?T~?|<?&?)???[???5"??0
hWp[??j?$??W?cj?;???]?3?rMN??s??'[a??????W_?{????????xG??<n0>b???$?aE?yq#???=?K?NC????]??GR??1w??yA????i
!?8?h`??PDI6??KK)?Ga?2=~=??Ab?;???T&??%E.A]JA?$?
;(??p.?n?/??Q(
???wu?e?(?=?3??K<s0?]?J{`?????(EJ?m??F??G?7??X?????m
????<?lZ=
?
_;??]??ng?h??"=???????`?ftz&?_`?&hb)??;rT)E???
???Lx??S???9???9J9?;?FsWzH????N+?
???j?????K?s?E??????a?????[?@V$? i????&????t??K%?5_??????z??B???`?Ul+????`q????S??{%?A?+?kJ?Kf?ERRd???Y??C/`??|)?W?Y?0?5;??2?GhAO????i???4????????X?	@=H]????$?di?????Q?/??j?Lr[??`6?????f?q?l?	?????J|i?v?r]K!??b?T???????7?UY??t?t?V????????????>H.?M?wr1?????k?????&??4w??q?X????nG?X?????3??\?	?
?jO?{%?u??/?(U?1?|???U8???@???D???C?????L??w{??????????ls?2??P???"3????.???3p?j?????n?M\]
w??=???
???v???1%T
?1"A??n#????4?7??o?????\??/S???'??????????????~???????M7u75rY$?!+?+????k?`Z?@??~^s??@???a??=w?8?{?6?3E?	??Q];?	?x? p?
j?i?m??#???4S??????'???F?Lu??g????z?W'?????? ??lY??{?:v
qP?o??$
1?*????l????????J??)?H???x???-??I`Z??M???H?Z?\?Z??;?)???
??;H??; ?$?[;?.W??4???E.
o????ZA?,?K?\??6??<D?cR????'??R??v?6C`??{?Y????k??#R?O?y	]&?@?.R???=?	??G??P:???<?????9?`??
??0[IV??Ax?"?/}??????M??E???t}??C?0*)h???l???????
?t??-9?%???????qXpD??D?dP??????o?;,C/?kr?$7??d43???v? ???A???j!????
b1@~
?+?
= ~??
Fw?8/??)/??y??(:I?O_??)??[Q9
5??1?r??1?.?P,?~??)????C???Rp?v??<???L???!_? 
?;it
/$&?q???#>????k"?@2?v?????J?FR!t\?i??~E^o??l?C}m???%W?{k
		??@???/(x??V?wx?k?8N?~F?m?
?.??Cb???U?~j?s?Wp;?G?????
????awL{?d?f???8??B??qj?}'CF?.?<???;+???,???p
???????j?4?#&3????=????v????}d?~G?{????w??bc????|?4m3????AI???=xL>ii???Ug???{??7;???L?)??6
?#?
???fd?bS45;}?Gf?F?WVO?]?U??XL&???3??????????P?>??d?~2????O?????p??????`?~??u?!????`?????f??L?'??l???>???6\?
????9??z?0??>GjL??@?t6????4?f??=oH????????0??NxZ?G??/???d
?
t|?n?L?LA??)?}?????????k4???a?
{???_a???0]?=?? ?v?g?8??1???????????o4\Ew?????h6?<_<???`?q?0??C"?&?$??U??	???A???=??kV??"?]?y?HY|????????fx;??E?^??1??????t??????5?L>??p?1?&9???aA?4#=??.?????}R?d??l?qtG?N??>??#?@{???H????????????W??U?g??X?>?`?gg ????Z???????dpz"&??@HE7???????#???0yOO????az???H^??#i?M?
z?L?l?????_??hr?????o??????p?"?-???x#????tt????8????~????!?
n>Fy?_?FN&c???#6??)???G?i???????/???<????k??6? 
?_?~E?wf????H??L{???R???Me??w=??l??N???%Ow?9?????$H?
H +S??V?-@ 
+??;????_~???K)??w?????~?V^????Y^??Ld?);???X????^??{{$5c,???????W??JqP&m??A)F?1???&z???#???}????z&?????e??wq?a??????
HmHo#?c???V??^|???F?~?S?????I????l???w(&rP?	??????J??w??fC?u ?B?q????)Z?k|?Z???
>?R???xu???????'??q=?7??v?D?C!?????o?:????????Zj ?????	)z??@??????>????%~?@??Z??7???M;??z??????	?>3Q?o?C>?^???????F????}La??7??[????a?R???}2N??;?V?~P?=ok*7???Tr1?6!#R?i.xu5?????0jw?6??????N)l+?]-?????/5????
t?B????:????T?K?????r??	????)??Gc??Eh?"R?n???!?E?_? ?_????G:?Q???????????
????z?Z
??i???????????????H??~3?:?^?Ki???????????~?w????~??????M??~{???????EW?0???S???Q?????7???????????b??Z6???C?u???K??k????7??N?Rj???O????U?????|l?,?2mQ?<vZ?v?X??n????Oo$?O??#??6d??????`/???ujk????W??????_?????x???y)??7??}??to????z??G????/GwJe???6^?v?\V??1?>????Lid?W??VO????Gud?7??????QS????}??o??????~??hu?}???#d?w??F???\"??;|?{??1?r7??'?w?ud?
|???5?????Fs???7y??>??hBG?co?%??;??????H???W???#J at 1
?w??7]_H?-??!??UjO??i(?????fu^??IZ??/????r???F???a?SI?F??&\??T????????D
:???c??~???????9????6?????[?bf$???xv??1??????g????O?/?>w~????o)?Y?????(???????????Wy??1???Jy?|???2r???!-o????????N??7?}???o~???????????^?-?st????Z??=??????5??dM2???{? ?^???k?????</??`?|???Q?Q?E?-W?]{]?????oR???z????O??t?4????.??bs?}|u??b????_????????????zu???g???????W??y??e??>??Z??|?????GJFW?m?????_??????G????8?????~t??t????W??^??z?????????k?????y|r??Y3??>??????W?e?<{|???d????f???????%????W????E????9????_f???'??~?V??D???Z???????m????o???\HA??????A???????H?$?Ks,???K'??Ss????}X????????k??~????>????????	<?7??7??7?O?]3???m??????B?D\?V??H??ms?t?z???~czrT???R=d'??e??s?????5?O????????
7?w??N>??/??????????;6???o??{????{??lVg??}??J??????????.????????q??N?????????3???&?/?J?&,H??/^?B.??Jq_??{????@??D???]???~?c???????<{??2????O_???????????????#cy??1???Ye?h
??m???G/_???_??????S??r/)????zW{+????????C?.???A(??
l?y??????????Zk?u*?????Ye??h????|????HL*OJ?U?M?_??????
?j??1W%9?6f_?[???Qe??_??4????k??+???Js?	??w???o_??????`?7???/??:?E?V???k??????l?????NG%/;??$???]?????I???u[ej?z?????*`?^??H??B+?P~?Ri!t??j???Bm??n?0?$E?)+
?(???L?
??f?~?;???_???H?[??+}/?HAW?}R?W-gg??b?f?QT?????+?????1>??i?'??.??F?9?D???g3?;??Oeuu?0o5?|?	?>cVTy|u????+=???ms?????~???T{U}?_???{5???"5??~?0?~??:;96??&'m=??????_>??N?z??????????5????S?i}???~????!
??J{?Y?z??1?,???(??l"???u????*??A??^k=?'@?6???????>????????{?f-?^f????????xy??ND^???$?1 ????Q??^?_??6s?I??Z?:[???????_?????????????>h?N.?K)?4?z??p
?M}L4Op???Q=S?U????????&??7:???&5???CH????cr@??d???>Fo???&??k?&?&??QC5?6 ??u/?#-Uu??T?}??7o?}s??6??_????y????/?v7??8?V?d7?????????n??zW??
1_??2???V?TiyT??~l?;j???G?????
??5?~*?M??&???4.??J?V???{IaT?r????????P??2?8???5??????}iG??>o:???+M???'~V~??
??TTw??Z~????v+i??^6??????+?#D????Q??4gZ-?)???.uT????&9S}??O???m?A?F2?6wo?x????=Vo????)7???s???k??u3J?nhI??1????Z????:FF?UV??\????T(?]???????j????t??
n?'??T?C-o=VcS?\=}Gr?,?*??? G?8>.?#???UG?b?!T???cV??j???
?uQ?Dc?3??V???BLEG?:/???????`?
H?0????G??)O?+???f?q?:?????Xd?j,?_???????f$?U7:??bB???R?H??E8?1??d?zn5???????f?G??Z?T?0????????+
????Gw/?m?[%GQbe?4T?I?z?]k????3??????f6?????5y??}[??P
S????????M	?_???^i,????h??Y?Lxz?????ro^????$?;jb???oD??^?:3oU?=???o{??Z??;?"???*????T??e?????}y?????H[???6f??Q@?\;r5?????6?4?~???Q??K)????????[#????w:?j3Z?@?/?7Z8???S{?5_??L???	?? 9??85F?????k?-Y??????:2??V?*????%??O?S?oa?F???TT????R:?6??{?G?,Sk?M????I??L???54w?k?S#u*?????]?D?
?j&o??{???d?????R?z?????o??????:6?0TK?![5??RZ??L4|?????!???w????:j1?y???U???$?3???.\-?k]?H?&5??????;?I?T%?Eq??]?I?????UI??j?R?K?
?I[?V???d?y?U??T?;??z?[?L?Xoj??_???B?????v4Vx?g?E.???T???9???6??i]{????o???????8i?,y?HIT">?,??GMo??+9????/?
???<Z'????LB??z?It?h$g??6=*[?s??N,O??w/_????7T?????OuN???yX??]???_tZ???v??>|~yu~????w??P?#?????????{????Bo~Q???l??v????_>?7??0??[??????? ?/?????d?x?E???[??c#???P?????3?V????(?
??Z??k?Y-t??[?M9??Y??]?j??~?3??9??;??W????:?????u6e8V[??????C?r4????_c]?\0????2???H???e|????=????^??QnS?Re?4nm????/?M at S???u???zV???X|k??S?g????-UI*?IJ?|??y5???#???&I?????????I????e;?}W????o?<tR?3??B???I??hG??yqdP?????/???fJ??Q?????S5???:3-???C^?*#?O/?????3??E?%n???????H???/m6V?_??r??P??????%?N?????c'"?w???Uu?^?8??9R??????_U?f}.4(????,??X<?E?:??IuR??Ry????=??_+???)Y??+E)??]|???N??yv??????<U}??j???V?~???X?>o?G??????_*=??/_?????U?|??????]???y??????_;?????????#U??????V????)????????u?WG???o???;?Ow????o?????$?????YN?R?????????????X???o??z????;v??=&UU}B??P?GQ??C?6F
L
`?3?P,OC?8EP?z?Q?P,?B1?	?>=:??@/?6????w???f??M?7u^??N????0???k??vu???	|3?4.?IZ??>Qv?#]8?D??
iOp7vB?2%??:??U6?>nlG]?6?????????3????>???}??????}??????_>9???8??H/????P??is??????????FMj-Pv?Ka????????j???A????6???s???Z?????????r????w?I?"?O????????7*???/U4????I???P??Y??N&o_??????LO????????????E?
?????????G??W?>???H?????,??C??P?Y~?o:????L???;??????????x???????Uk????????>?N"??PaR????7????????w}t,i?;?K??q|?|?R^??<?>4?S+|??g???????}?Z??w?G???????w5??i??E?QM????T~'?U??r+<???k3?z>DMGMP?h???$??~
?????g???S??_}???q?G??Iu????6????/r??????x??
?????c=??fvn?????(/%I?"3??????#??_???e?_?^????? 9??^???k???????_??+??'b??b??^?!?N	?????R:???k#'yy?\%`|?}.{&r???gj?{??????bRH????[????~??2?^t=;???v??+a???????G?o??#????>k????Z?z??]?O_??{K#???????s??>?H>??????Nt??????]????wV??>?\??u?g4???????????ZOU?????_??/?????
?j0?2?4?Q???|s??7??@?xI???j]????q??????k%Ft????f?t??^????=|k?????I??Q@??3P??.??`??/?????????3???/u?R??????p=?>,eM??????`??
?-?}?}????vs???]?I>x|y&;???v{T?A?3???qr<<i??0O?~?;????7p??(?O?wL?????K??70?)????B?2w????n^???Y??~??????????z?C???_D????|?so3???????????O^?7???w??w?????6?D???T?S??N????~ ?%??K?j???*A?H????????n4S???????????
???l?%Eal??????,k????_;???"???????????.w??#-?Y(?????d#?=&<?????<??????d???^Uy????m???/W???WR??zryv4.I??????????????X? 3?IJW?????|pLyvLr???????*+???3nF?PR??#???}X%|????~-)5j?G1&??>????????
&J?????1Q	???nF??????s+/r???+??[EJ?!?V?<+<sk7???I#V?0??MV?6Y??d~?U
??
?dU?&?6Y????MVl?*`?U
??
?dU?&?6Y??*?&?fl2??dE???d??O?M?zD????(z?)X?&S??n2	??d
??$,z?IX?&S??M?,rn?M?`??L??7??Eo2??d?Am???? qQ6o2??d??~???MF6	?d$`???MF6	?d$`???MF6	?d$`???MF?????dE?Qh4|?Q?&??M?'?(~???MF6
?d4`???MF6
?d4`???MF6
?d4`?Q?&??MfL._=??9??]?@??B??????d'gW??^.???{???????+1
???E???B4??.??t??\????$f??X8????Gb?'1 1??8??%????v;?/8"N_??/?????????????U%n?{?`?u????????????????| ??-????[?,???[Xx?_?
O?
??q??????r??\??8????? ??Z??2?V?pZ-?k?,@?e??.E?D?g???^\?	i4,\?a>???4??hX?F?(???l????WW?["?x?'r
+'r?#r?#r?'r@?O?pY?&????????dy.?3?,?p?<???,@?gxY??H
?+6<@??x?????????UFH?6<\??>???T?Wmx?j????K4???^?Rkx?Z?}j
??5???
??5.Eh|??>9???JH?)???????8????5e?^S???"
D??<???d??%?????M?SlJ?bS??2@?)???K?)??{?@<?Sq??-nH?/???'??8A???e? _?y?"8?n??\??i??_????O?/qb|???
??>??9(?A!??p)2????s-H?????)7???r#??Wn\?????.?!G??8?????#?:??q^?q)2????
?.v\?????:????#t??uB?????PW??B?\??x??pY?????*??G?H??Z??i}??	??'?>???\?????#??D	W??O?8?O??>??	????}
R??p????|N???*_??Ux???H8??9?#*H???5????U8???k|U??W?5>?"?4???1??U?
_?S?*??W??*@???
?K?p?bE?{U??W???
??Uxu?
P?*???Rd?Xq?E????W?k{?O??p?^????
W?*??W??=')?(??xe??????z??v??????{4???????????#?W ??u????T8???8U??S?u?""o7?^??P???
?W?????%?;KGTZ???????3?@?gZ????<?~??50.?R=???Juf?!??r?9{??bdU?u
??*?6`Zq???l???3??s?e?2??tW50.??
F&?2???W50.?UgM?D&???qY?02??
F????Q??F6
v??nnF????hZ?? ?-?VBH?U?q??U\??`?G?<+xy?y?i?5*
R???dY)<2???<?8y.?2?8?,?????T??)?B?D???R?F????6'?7??8:ie=?=?N[Y??qt?Jp??SWv?;??{???
Yha/&??????uD?z?p?t?????XJ???
xDQi`??b?4=O?dA?p??s
G???1????
?T???F@?l)???
v??o??4?
R????jY??R?K?8??????=P?z?X?????D?1???CwV??Z.?????2?sw??v-???K??A?p???
H<*????J)?c??F0??u??@r6????;??@B'????S???????dS???2?+????6?5u;?^?;HipimeC?
)?9??Qf???I?s??eb:Z?b???????^?t?17'?????t<>??????6?(??6!???*???8??A??z.???}??F?r?X??g=
??|?]?9t???????B?e9?1+?Wt??B?	??'??n?/t5?
i??(??k&??u? ??.	?r?H8??D???\$8"???)?HQ?>GJLe?n??JD>????B?q??0??`????C???c?????o?????kB?P??G???4???m?%?%)??????2??LR?LvPe?A
G???L9?????T?\???B?/??v?g$<?8??3?\???{?Z???c????????=v???E?`???????p??p???a\??Qx??e7??r??
in?(???LZU?2m0??????3??i?H??v?`?E3*???y?
??(M
^????????+???????|`????9a??f????J@??z????????#??U'???6??hWp?d|?bw^{?8??+?/?[??L?|??0?+N?|???X????l??}1?%J(??y??:C??5z??t??????cV_?vK??
??
A?_lF????P??ChA??	??d??e;?\t.I?
??#????p4???D?F???-??u?[??
x???'h!?n??~?q?
(?lZBO?f???????
V8???n??
??A????tvr????,??_?nQ`p^?
K???k<?f????V?l?????;??]?????
???xO?Y}Y?-	?h?|q/??????_?n?F???Kv?d???t????\'????
=!?S`?%T?>?+8????0?&????Xd?7???
??n????{?edZ+0?38??C"L??z>?????????im?g7k?t?L??5?5?5k???i?1c
RT??fT??#?$$??G?,%2?]$?&(??D@?d?
?\=????L???a ??+N)act[h??I?rG??????*????y?????_g?$P??G?g?D???A????*(c?[{]?^?????1fj??????g??;t?????4m	R?p?Tc?? ??1O???'!r?3<?+g?D??)??H7
'F?O????
?NU???=????/?'A?H&7??B????%J??z?"?=#?? ?PwkU?wk??C?  ?V(???j??X?-e?>???<k?B$??t?|l??L?I
=?e at hW??%?q??T:W??X?
C??,83?dGz??x?
()??K?S?`?w????n??????{??????
??Y??l?$'Q???|H@?4????????#??|????-
???@????
~/+????????rsI??!5?,??Vk??^?
??Q-A?F??G??%}<???H??Cx(?! y??t?????5?q??>g????????(?I??>?`?U?H???{?????t?R???{???pN at 5mBu????yT?D???/?c???)a??-???????2?XR? ???N?OB?(H??*????d????{?<P?$???>@??j?kO?W?M?s?,?I
?4?+Ef:?z?
??u????
8?j??A??a?8?Ml?!t??3n[<=???????F???"m??kSw?t? ?M???I?(H????S?????
h9?v?.??Pe,????n?lI`/{?]4?9?tW??n?<;u???r?3t????N?????]?F-????Gj?H????DQ?"e?Q?Ac??>???gR?L???;cm?2?????9M ????k?~wX??4B???iZ?t#??A?p?HV??Mg?3.??t.W
?yl???{??!?W????
??+?n?vs???U?n????
??z7W
??B??*`7W??\??
?????\?ws??+?n?????Z????*i&*?j??????$W?~PXEQ??2r????\???E?Z???,C?VU?j????yV W?dE???W?
U??W????R?R?pH?%c???j???5#? ?t????\5?ysNQ?f.????<?p????2???6????0v?X&/?????)v???T???n</?.B?U?	2????8????????Vr?#???Z??gI??D??????=4c$?\?????}??zr?M??????tni?D]??]?? gkt??"???
K?;??~??H0?b??,+???H?ba?[??/C?_1??;????[?l?`???6}G??o????=\f??? '???~n???{??3??C#5?5?N?}?/>LL???l??7?*xB_???C1?sj?]??1b?|OS_???Z\??]LB??A????F?d???O???????e~r6;?*?????E?YxE???M7??? ?wv?7
?wsssu?~??????G?Gori???4???Ln?b?)?0??p??Z?K????7?#???<?????"S????|{X?D2???????????,??W??cMVb?~Q? (?b??B???k?I?s&?????g????????????S??FyH?x????????-??v,@?S?`?CZ]{?/?????`IA?H??d??~N????d?
????-[AO?]???r?.?ra?Kz{??ls?,????????f?l??E-O????4??=?,u??c?Uc'"??v??a???5"?????A????+T;o????[?????????????8?m?a?U?l?qb???/?=??T???!?\?\???2T#??j?w?n?a!??[??gY???\U??????A????+??????c??[???";?????wZo??.v<
e?nM?X>?
??$W(?*-????Ts??U?_i???[???)??!?S????.0?c:T?w????>??D??E???#?#???nN?X??5I????f5???S;??]?x??u??E?f]?KI?P?/EB???l?f?'?5??M]?BS@?
3A??DI????

r??o?????????H???f??e$0??c?=(t#?
S???L??.?O77v??:(?gTv??J{?w???P??A????>???l	U#??:?j?V#??D?!?f?4AR?z?N???|???\a???e?<$??}hp"M?[?(??G#?8n:,'?t9^??T??Q
I#U(T;??j??T?n??s?x7RE??z?/????[B???2`???2O0B]??v?4`???M?'
?PA?'
?PE?G>?\?J^Os???w???U???????$???\???:H2??y?'
?P??m??}(a??>?
?Q???m
????Y?<g=pM??9?\??'1?}Xw?#1P??r!??wX?M??#???????+????l?Q?????????F?B;???q?gHh????"?????4~Y?w9?M?j;????+n?U?sd?`^???RG???+neY?s?6?0??bq.Pu38??#?qlf(?#??_ 2?????%??a??O??????rn??h1C.??$W(??
}??T
?R?+?h??[(D??Bx-c?p??"??B??P?;?=????c?o????????Qk??]I???????k??)G?????Xqk?????-A???]?9?,;???d????-????????Bi/?^??
E*?(??p`g?????{??]?????S??1?MuHw?!?.??dl?<d=3???N?I?G???v?d??~N??v?c?$P,??b??/\??m???]??m?tb7L??? TP??A??m??????(????
?<?PF???$ ????X??K?$????M??9??A\?2??y?'? ??????U[??3
?YO`??"?&??2??y?'????zhex??:??(w?1(?#U?????
4R?
l?uI?Q at F?}5&?J???W,???J?	(px`??W(P??5??
P??{2??r?Wv?@????6
???:V-B?\??mp??G?uO??	?nc????-?W????K8?-?BF?&??f(?]???8CEy??EyPQ?<vQ?AT?'?]?g?
??c?Dp at Ey?HEy??.O?.??#??<y??<?~????q??"8??<y??<??,O?,?
U??}UybDp??]?????=???uQ??.o??5u? ?tC???D?+i?i"??'?b???.8?E?2?xt???c???B??Gc?k"+?+??O`/^??`;~?@gk?????0H??C?!??1?EX???b????????z
?{??d?????l???????S(??#??%?CD?	| ?
/S?;???J?I??bK???!?GM>???1???;?hf?|*????j????0$??E<?g~,;M??9??$@Tu`?????P???q??
?z?Z?k?m??1x???
*";0r?	:_??:???/2?'??
$)?){?$'YI????X?H??????5?<?
?Fz?*?Uk???i?r?b EE(jF+8C????"O??x?
??*???I^?
SN??#????v~y?S??`?D?<???m???.[??-?g???W??%??[?o?pu~???????q?9??x????w???0yy?|?d?HI?x??X=\?r_??'???K??
>??m??????Q?O???G??{?q?
?????j?G_?vs;?4???QG?l??h?.?*y&P????<}?+??!?(x?????P?\p?dT+j2?"??CM??!r)?Ry?w???,????5??y0w??f??<fhnm????2??u???
???\??	??=P$m?C?)e?
]?s??????fg?:???f4???eP&?B?d?
???_??5(?i?&? H?uO?$b????????q?e?????_B}?
w??>??2+?P??????)??Ov?T?????D?u???}?:T?.??RB????n???v??^L/?	?;!u	]
?j???@%?@U?Q at x*?????
VxT?J????'O???E????8t[??H???t??3Bj?n???b??????(NB?(>?Q??0:?Q??(??
?
??V?0??I?;?;???4????,?*g?????V?>?*?O?+?!?P?C??A??=
?.??)???????R??E???N)}P???T??)}????q???????e?4??>??=*}P??????????????h)y?:G?
^?C???e??????q?M/i???^???7?D?H??P?`?^?U>?l??Ex?Z??v????T??DE}W??
?-
qQ?
?]?
j2??o???????o?????V?"?
?x??L??5??5??????d?? ?@*??f??TBe??l??j6$?|\? I??g
f???5w?]??
Z]???
8???#`)0,?X ??j?????,P{p?n6I?A??wBV~?|??1?N?g?W???JF????
bPl?a?0Dd??QD@3??'??Y?uC|??U+????j?_??p
Y:a????-??X???P?????
??>?:??^???e????e/??D?H4?&??OQC?s???????`??i?C?U??*??d +?p??
?W???v,?,??
Z?{?P??j@?n??q4$z7?n
?y*?l??z7???,??Y?f???"`7?n
?Y?w?????E??QXK"?Z%?D?\?R?|?#o y?#WK????jH&wr?*???qY??ZU)?i???TNw?j???R?
???KH??:?Aw??[2??????yv$?
?A?U#y??t<??????????[^r???VH???
*/?
?n,??n?XV?"H?\ B??<C9v?x^ BWjP?bW?x?
r?AKx?]???)|?.???<K*??!r?eM??MfFHc?|zusv}s????r?h{r??z????^??$??V???G???Ss???R????9??k?eh?J??r,?n
D???:?????????~??2Tu??fh?<????????5evaT??c?TFu3P)??U&?[+1`?`0Fr/L?0Q??@2??!5	BjD?(8y??u?{?'??Wio2~ED	X??S?M?C???<E?	D!????tP???)`??F?mp.?)w@???t???s?D?]}???^????>???Nj?a???z?T9:I?JV??Y?~d;??uCev?4=?/?
????
???????6L??v?B?T??Ps
?H?H?
?8??R8????L?t?????q?1R??(??|p?S???4gQgQgu??sH??0H?)Q?LD#????p??<~ecT?nOo?S?PD???f?[(?I???@?????`OAo&6i???9??9NJ*?
XC

V ?<W\????
5?+??JN2??J??@M%?h?Z?"?K?d??????????????????)w???KU5V?7?W???o???g??BYJx??:???aO
??,0???L=?V??|??_??e??0Nr??zl~aZr??X?bW???? ?q???y????J.S<`??X???????????v?H0??P1?????</?(??K?QE|?R??R|&/?
??JX???*??D.??L???=??t=?L???\?rT????j??$^ I?R??????R?UW7??|?????T?W????L;=v_??L?T??V[??$T??y?^? ???????C1?<?T0?q%u????????gM?I?P? ?R'????O?????y?????{l??t?P	7???Y&qF&????>9???%Y?>??0u?H?-?x??O?)??w?	??4????? ?l?K??ZQ?P???T????j`l?R=l?R?NS???iJ?*L?Y?
7A?8`+?3?6????I?e????|??n?l??*?!?n???{!?+?Z?W?p??V?0?V??/?	?,?d+0???O?" 
?F?l
8?$0?dS??dc%?????z??y.?,v?Fen??Z????0??/k??JY???}A????????\'Y??8??9??????|???a???g??'?;?????-y???????a?-???[h?DZ??????,?s?=wTk?o???Q?Po????OS?P??6?7????C?
D?
?fS??j????j?p??j?p??j?p??j??Pk?&???$^?	??cO9????$^nC???;W?vI?'??3?n???>5SF???h_???e:??0!??q????l??}w?5?N??n?;Q'?K?P}qo
5?v????????w??j?$?Ag??X???3????4K?????$w<-'?
?~????.??}"????9?!??m8?s)?E|?a;?P?a*?l;?$~?>??:??[????mHC?xxe????J^??c?oh??4??+??^????????L??2W???n??23????I?`??D??^ ??(??
?0??????T?????T??T?/??B?x?P?t8?[??
{?th?0?x?h*z"?]?5???Y?4|?FJ?/?0,B	"????i?
=?ZI??q?/p???<??@?1?3D>+?k??+??????qDz.?-n????Nu?H??!?[???I??????L?\a??A?lSp?????8?PDA=??4R??+%?*?9??Z?oQp??D?IX?<??8?pT??n9ncPD
????B?q?[1?;K?5@)n%8n??8??y?a?5*.??8??X?	{???N????b??S
??I??b??9?;"w?Z	D?Y56s8	
}/V???????N?A?????nq?)??.p? ???D(7???4C?b????p?\??J?[?
????'????k??S???!?a?!|??	????HU??6#?????RJ??}*???7:?T??z??Q??Rp?A?y
?z??????{????6???>?????F??Vu7qFk?v?/??.??h.w!S?H?s<??X??jd)?3??R??(??R?<E?J?>?Z??eS??
?cx??
?y????!??
V?P????#uu??Nv H?ZUL??z?????7??Un?~\:X??7Z?s??j?'?>?g?)??????Z??0?~??N?S?x?a?3,?H??O???rC?3?Ft??
??Ez+??
(?F6?j(?`???V?'?????$????2??6???T????N?m????C??!99?tN??U@??Q6 ?(G?Q?^?[[SB"?e*H\
L	??k)!??*;K?#y)??<?????.j
??]?`??(`t~???.?7?j??lG????@?O?t???j??/??o??iv?Lc5+?????vs??I???????tfj?QL?3?o:1??sF?????????6,?????r??!F1b?????d?pt?/??=??#?gd??J?BIt?g?
????;??Uc??E?{?????G???[????_??????{d?l!?&5?<??"nh??7nl
???W ?????T`?e??l?X??? <?ac/?T???f?^??[?
??T?5n$??<????N?,R????mH??????6??`N??C?f=s??y|????
}?f#0??H?~????2#??B??T???v??#??W???4{??:????,)t}?
Qh6s???{??9??
??2??Q-E???;G}????!??]_xDF???t?
:?t?JQ\??#jy?#???Y,?????m???????5??K?=??????Q
Y?c~A0T??4????
Y?????????Y?`??i?:???_?0H??;??\????.{?_???E???e/??@/{??2??@??'VT?????0Xq?j??Sa??C?????
?`?t?????p{@??t<z?	?XN????
?!??~73?nf
???w3????Y?nf???v3C?f??z7????????f???,`73?nf?nFa-	?)x4$?D?\?R?|:i???E?\-Q?b:'??drw!W?"y1?E?@?V???Z?j???yV WKY????5?P)?px?TC?s????8??[26????T68??]`??LW???3???b/????<?p???\_??-$t?[?????????t????)v???OT???n</??5?(2????8????????Vr?#???Z??gI??D?2y???????qx}u?9_?? ???>?????????sm?#?{6L???!??"!??|??m
B
1?c??w7n?'?$."9??????n??ec?d?<???h????o,rQ??|4t5?0x?z|~z????????}D???-
d????$???SZ?????n??OO?d???m??U?;?m??\N???D??+"w?KN?Y=?\?v?t'2?z?pc?w/(?QxH??#H?)???sj??|V?.?*2`JQ??T?L?
^N?(0??E?
??>?V?.$??
S?????,^D?????;?c5"??b?O<*V??vT?????Dg?????Iu?????5r????nn???	X?]{Uh,?
^n?L4??????*$??
????U#8O
?Zx<?1v??????@(?IQ ?'??<??501h??B?????ay?h?D?L?:iz?4p?Fk\???9? ????h??I??
????
??w????P-1??F??????6???`?(????v??Rm?t/J?"??ai?d?7q??1"u?{????3UM?????$??????
??5?`?Oe???WI???Xs?U??`?pt????????tH?+I???,0??-0ef??X?Pv
?M????08:?G????<?[???E????dH^b
??Bx??????+3k?,V??????J?-Vv}?????"???????p:"?@?M?!???>=??{]?H???)yd@??3?G[Hf"??K????A?R??I????3H??RB??6?d????b=kc?{"F??????5??m?KM???|?1#??yC?
?a??X?9o;??N{zD<:?"?8Td`?0w???+??j?$??v!=????????d?????i???^???X?b??dyt?.?t???.?????????M\???:N??
????C??M"???
gE??1vb??pf
??????9
3?}????Z?G?e??0.?B?V??c?~rqk????i??<??!h??
 ??!icuTK?U!???'??xW????)8l\??E?Ui`l\????????????Ig?(??	P?*{u??&8cnI)?U??"?'???A<?n?'??s??/??H?1h????$???mX???A5???v?8vl@@?j??bU@?Te{S?USg???????-??Er???k?
??YA??
?x{4D???/}???qjB?
JMp?@??? ????;?+2???}??e?????????9??????p???Q???8dLp??{?9?;??\<{%u??)G???????#????????X?qn??U	I`n???U?[?v'?s?????&x?-????4fx+I??DKv?\X?????f/
]n???I?_?w?`??s??T,6???s???R=?Zh?q???????ct??S??2f?p?lF??lOY?f???
#A???u?r??????w?
!?O?ww???4G?N ??3?m?=?m8hn??4???_???F2?D?Bb?+??7
?
??.?0??0.??
???
?4`?WAY)?(l??????6_??Ac?L5??????????$??W??????;OJhn??n??6??{/&N?&??_/R?c	/??????? l/~?W?"\3@??)1??/??H6???3X?Nu?k???P?G?~?v???w?z?G?????"??"^6J ?j?>?g?
??V
????U???4C)??v??#1?????y??????7??j???huyv???,X???8?`???`9????^;?x?8????????"U??????????z???????
?????? Y??=????XX?z5?hh4??i?	???L8?2?<????s??u?V???;??????h?qV??????h?=??k???KM????????????
?D"???o??#?Xf?{??N???Y?(???D]??S1E
?U`??hY?88???wU?O?F?*??U??o???hp??3[??u?Ax?hC<QT?????????h?.??DZ??"??-y?]?sg???5#F??B???=??D?}i?O??F	???z?KVO?????<???????le?|?#8?3$y????n?'_??gjM,z}?~??|?L??????mh??????????u???2?u??:V??f??yB?_~??b???a???$?4{8gN??#?T?W????s?#?9?.?Y{@?>??
????'<%{?p?R1Y?X?|???Y!PS??.??
/Q??5zQ?\p?dT+n]X6]MY?? ??tuh
X?j2?j?P'??
Nf??K???npW??F?[?nb?`W??W#??#?);527?F??a7???v???hQ???w?>)??4?ao]?Q?`AcE?N?xF???ge@?h?? et!&??3???????jF????
#?Xz?;c?@=??????X??g=?????.???R??r??(?	.???????????W"~	???'???@?Z???,C??A????#)?_GO????g?jA?q????:,?7????2@???=%???P??A?\?N?cO?2T?~@k??????JD????D??\.?LE??
7/_???eP7A?ss?BHu+?w?*R?'!Up??*?vRrV????F?-t{	??????HCn???G????a????3?\6??r?@Nk??e?]6?l"<????[??!4????????C-?????O?^9?=3??[??_???rdH?#G?:??C??
???????S#?QA?+??~??g???O
????'????_??v]	???C????S??0?????=?KR?	???oW_?????4??]???DF???Z?%?	?/?V?????~!?%?;????/>?D???aZ_?B5??????{?????{????[$?L-??H4?e9rZ?G_`?0.@?P
??a?/p/?\?Qn?w#? ????j????????	)nY??e??
???X
??c
?	???`@?
???`????u?j at L0?Dj at L0?Dj at L0??*?9????|r??:?pK7??);????r?,??R5??A?K?Q???,??,	$N?
iRl???p??ro????
?N??R-?????T@?T ?L???
xn??	8????x?:C??o5*??x?r??1?/K?%Ni?v?WZ5?X?u?cv?0OZ??c?	F????zb at nb?v at 4<FK}?c~?0?-?e?????%????t?v???\???s?`??L8?k
DRI????+?5h?{l?Au#F?/?K
nj????R?x???Rp????0??????(t?QL<?????>???d4?/K???*?E)8?"?b?10?~????w??7??|?!???&?w?O???w??}O?n???c???y|vu??,?$????}?n??4~??4J??A>???#LD??
?c??p(????9??9?6??"\IP1?)?0?:??@Z"?p??1 H?f?D??/J?P??
9?AsH?u?
m??=lC`]??	??u?????T:h????9?1eK?*????E??A%\?F???xI????W at wx???;?????f??
??wt????nI?3@;?;s??B],1?????]v??~!??????r???????m/V??'????5???3*??Wp?Ig{U????A??bg}?9{??b8m?dn????dE?V	$?<?38,???e8R?l??=X????X???L,_???????AA?
?F?F?Fdb???9?"?KA??P??
VpD(??d4?(???D??3?K$???$/??)?r???:h
;????6v?%?L??r???K?\\??n7??c??????H*yO???z ???bos????????d?????r??A?_???`???????F??59jr?E???1????pB?_?a????????Nu?+A??????@i???IW=?????v_UE?%W?]k;??Oo?2?O??F??>????:tx?'?M?*?????\ !G?HH?k??
6???7?L??7??>??8~?
?C?x?\?????p|?1?Gp????W???9
?>?????y?{???&??H|
~??GOW???j?h?G??>?aZ??@???$ ?????@86????
i??0?=~?5??&zS?<?Z??SK??Z???a?%X????a???qwH	?,??Ca?}?f???i??|?X?\*???
,g?ia?r???5n?4??A??a}'?@??%???W0??;xz|9?????n?^?4??^(?O?],????n?$'Q?5?|HH5pB4???XKH>-1?i??O?p(
C?y5p???
~/+?????X??8G8R*?e)?jy???Z/?%??Wz?E]????sG????Ca???Z?#L??n??i,?u{@???]???????D?E????/!?P?{???g?;?r??R??2?X??*???a?p????1????0?t?????_?"P?K??!3&3?;?$D??t?f?]?v???C??fa??)<?w???%|?p????9{?8??????h?6?+Efz?z???*????????R??8?!?J$hX?]AC???l?_?????Xx??M?'?
>?e
??v?(g??3L?"?>
<??JH?????#;??b??W?]6?>,=???m!?N?pa?h?????????h?m?n?hT^???sa,???Nr
?s?????k@???4]C?/?QXQ??
?yr???{??!???????s<Tn?6?3?-;2?@???C??.;	Xvl??]vl?
?^vlVi?????2(h????+.???4?
??X?r{??P?n???L????f???4`7S?n?
???w3
????i?n???Lv3E?f??)z7???L???6???$raQ?UR???
?O??2?????%?RL?;??L?.?jU$/2?jU?dr??RT???4????Z$+
D
?T?*r8?D*?wJ???i()??????/?kFh?(??`D W????l?R??[^???ny?)??[!????? *[/????[7??9???Q????3?c?????E(????]7^U'y?2??v?J?r??!?@K?,?????Y&?=S????# 
??fuv???????m??XN/'g?3?c?zR???A?O??&8~?q)bw????????9?r?????>?
?cp?/???t???c uH?+??t'?~?x??m?????????m?~PU???????????^????=f???Fjxk??=t_U?"??)???[??YO???y??n???vsj??]i???d?AH?{?
rV????????
?f??F?d???O?????NHe~r6;?*?????E?R?N'??
8?
;3?????????'?t?]V??0?y?'??3?n??x?=??Rxiy??Y{??H????w?6????r??h?R?m
~
Q??;??????O?j???9znG??/6?s"?cLah?!	??bg"??'?
???3qz?<W,???3g?g?u????=?I-,N?o??????????8!????????V?jV?Z}??62??3??gY???\,??U????/T?????w??n?6?????/???M?6??;N??????h+?[9)???E???
%Zi-wd
K?9?f?G???N?L????tb?2?????.0???:T?w/?????????;???(h7?G?X???x at S??w?+??B?^v?}???????.???W(????????????ou????vF??I?@a?	H???c??_????re?7y???sw??K??c?Q?0???xo?h?????i?5??{!???)?D?pFj?@x??J!???'?c???v??a`??=??c?R??!T???;=???Es,?MN???o
????N???	B?X????	?9?P?3???????c??'??t??Vs?????`?
??>0?[??9?
????
??23?o?F
_yC?:?F???0C??$d???????W????@x_V?C?@??#???TM??"???.?a=????$??7&??9?d???|??????nl??#H?+d/?"G???`?|?4????U??v??6m?[4???2?D??!$?!]??.??????????v??
??\?????d_???CqYC??2MFh??9	???*{?a?X1??????=?m?????|?R2??d[
?
B5?W?m
?!??$??
Q?v???????W$?q?_7?4???~????B2 ??nHi^?????!?yEv
)azZ?TA?w?8?v
?{??d?^?4?????^?D+tL1h?w?9?h>????u?8~?@'7??*I???c=?4??9?D????x8???~???8??xd?&haH?L2 ??nH?Y??(??M?<??rH?i?4?ENI?9wzq??B?^v?-;??N??N.???W(?1??t$?Ov????S????????;??4????bK????t6C?R?U?'?!?????	M?	VE?E^e???;???)??e????n??f?"^Jx?m?(?6?"?fQxm?f??E ?E??f
n??X{&,???~?:?7u?8???~??\f??/???C8B??p???[???^v?h???:???Ew??_???;????4?_(??n
I??R?!i?Pk at 7$*???._?M??p??(?v?<???J?z?5?$c??8f?P???B(??G~????z????\q?#q?????\q{??`??O??????O???:?!?{$7???9??????.T_n??OVK?:-?><Y-!?c?????j	\e??z??&???F>???}n?x?q?cK	/???SK??
*w??`3??~v{uu?=yp??Y?^Ry?u?,rP???nY?s?t?|?]8?`?r?Of?@????R1\??!????#?Rj*?e????62???D? ?????1??#????????pj7?w??.?R?+?t?7???z?A?N?>???E?S???AH?y?pjxK???!?G08?V????=]?%?!6?M4TH_+S?'?v??????^M????S?+???]?l??c???vob@?W
l?uI5N at F?Fe\q???%?
??`??k???F(D(R5???
??T?:n?p??Z
}.?h???6@?????v}??8mDD?Yf????"
M??????='<``??]?e?Fw_i?.??^e^?{??7?z4Cy?R5??tv??T3?]
	c?b5?!a?P?F7$?] P??V??@?Z5$R? v?@?j??TM????<?{???q?!???Z~wy??????@??:^?&?_I?N??j?????O????(??
?S??:4??	~?????r??uv?
_dvO,?a?5h??Dv??#HL??????????fs???bu~~"???3P?5??IQL?Y ??*?c??.???y??u?F`?????=~r12m??.??&??AV??+?????R=?II??$S????\?2 ?+?3?|??W77#k?dr?(z?(z???u!s???HQ)?G@??5#F3?8??%?K4???$/??)?r???9-???/?rJ?,?(?g???????
`
?[6???????K7????????????O?s)???O???}?[????????,???z}?z?N????!???Q????\??????y?????:?w????????/?j?????X:??#L6]_?XN?q??-

?l??X#RH@?K?d?????&?ZQ?)X??&$`Ej2,??H?y
N&*?u??|????]v0???f??<f,lm???N-??r???
???:??J?<??l??Sz?(??F?)>(?C???u&???ho??`??&?"??)??'S?????W4x??
?f???T?.1?>8????
l?I?ozJ?*??+?i???? "@??=m??;s????x????
7/_???%?????7??Q?	?GM|??@L???A?AB??k0;=Mr
Z??k??a?1?z
?????|?j
????n??#?!??I?????Z???'?=?p???C?JX|??F?????%0>?P
???*?????9???E??tu?B??x{??<???R?w?B?$5>D?>4
?????vJ?z??}8???w????d?S??xp ??c??gc`???u?|?(A?
8???q??T???]y~?=???vnW??"?zH	???6??%mx?K??????
bw?B?????f??Y??|?n?E???VXPQ?
e-
qQ?
e?
K&3?@???pZrNQ???x???&;Mb??x{Z_xx28>??2Ex?-??p()3??Ko??h????/? ??%?Qc????w1?6uY??/d?????l
K??a??Y????|hgV?=8O7?$????;+?????jx??S?5?s???r%#?_`K@??\?Kq?????H??O?.??{?+4h??f??{;???K?AU"r?+?w?f?$V???????G?????!T?k??h??????D?g?LDb?[??^d!7N?MK_
???l?$?J???????1^??z??(w3???
c"6? ???
?ap"??
???Aa??|??&L??NA??D??TrK?!
?g???]`?E??(N??+H??+X??kH?????
???APC?x3V\?AY?a?"3jH?9?????Y(o%?`??????	?$_!??&XR=??9S@lAp??????Av3:?? 
?y*k??	z7???L????f???$`7?n&
???w3	????I??QXK"?Z%?D?\?R?????????%?R \?
????\????C?!K?!W?*E?pl????\-?&`??
??????#h?B?xK???J9??gw???c????\5?g?#B:?K
?nyI	?o at 9e?u+$4"?B????uc??p???2??uc\`??4?<C9v?x^`?WDG?]7^U??Zfy??=J?r??!?@K?,?????Y&?=?f~??pP9????????W?????????kG??z?`?3??Lx99?|??#&8????GS?[????~	S??8?0yu,?R??A?5+???l??(F]CyO???`?cqyE
???1X?M(_?*????l*????L??$+1`?`0Fr/?4??)0Q??@2??!5	BjD?(8y?1?^l?i?J???#)IH????V????L???????6D"????@?T?????rn?)o@???tw??s?D?]}???^t?????p7E7??A??l!Aj???(?+?d?d?o?????`?????|????8
?9???d???Z???????[_??*L??q?~?\??????n$}?A??|??guU?!?b???????????U??K??
???9?P??????]
GY5t?????YW???Q?? ?bH???yf??3f???0??<???R~?*?? y?@Da~`0
LPev(?Q%??????myU???)H(?3??z?-?y??@ .?L!??\?Ll??G?9e9N^?*?

X?L#0?`?
e)??L?,???*???f?y?*Ps?????e.Y???$W??7???%???????P?8??c??uH?-??2
FBk?Rr,?Yf~@?2??q????FH0??R??2?RZ??????

EV?G??x$K?"??r?T?MW??*~?C?|????-????\<S{E;?}?x??)G?X)?Q??^ ??2??JYVM\?B?}e??r?R?~????S?<v???J?<S0??????
???o?*??{?M????
??{???O?/!bOU???T??y????	2,:A??&??s?&?T???? S??Da?pg?6??9S?^?;?\?w`?snG;nd?
?Z
??????v??????%????
`
???X?	?BN8??p?d?????)?0x???CiV??/????w??JY???}?????cI?wi?KO??????o?f?ou?p??U?jp??@??R???P??t?y?%??????@? =L???
2????;????/???(?/??@?ona??????7?0`xs
Q????7?Y#?t?P?o?p???
?????
?????
?ln:?Y???f?&???$^??f?cO?;??????
WnC???;W?vI?'??3?n?????u)
?Iu5i????Z3u~? `?;?????.R??9?`UJ??nC???DU??????RI
????){????!?N%?C??%??%?eZ?N?;~(??iy?m?w)
?l?}?H"q?7w??!E?!j?A????L????v???T~?v at I?}??5????B2????z??.>?{?????????S???IJ?????s???e+?G?7?N?3
??n??h,q???*P?8n??8?I	???Y0?s?I?????,n?H?y,?;?@?Q?$?!+V??????M???+1??U?
??N?B??r?"?P\?'??oY??vl?8?Hn8A??qW"??m??O?!?G?G
R?f8N?pj%??E??c????nY??H??)R???
????
?@??Ic?cP??Jr???AjX)???>n?H?C?ef?????@K)??? ?
?<R=BnH??????vk??iR???,??#?u???6?!`<??$???$?????GSFQo/?????? w??????]?????????l?
????
?????i???CehUKXN>R??/??$???Um
?7?L?:y??_?&?????????{?????}??a?@^?A?a??/`????a???1???Sff8??^
?)???:h?>K?;??=????9?5:?
??"????;lXux*`OeYZ at n??x???T^Oo	A+IN8uR9??.??J???l at N?!+'jHT5D??p?!2EG???I?QL??XV/?B??Tr?8z?8z?8?
???U????j?
W
RA??:v??#y???%??E-
???&????????'|??}?????Ucua*?aH?p?????1???A_L?P<(?H~?y????Nn.R?5^?2????7?$???9?6v`???
1(46???e??qwDb???t?"h????{U?*???X?]?<?W???4???:???A?)??#?!
?f????go?Q*????-?
^8:?J???o??p??p??Q?+???$???????#V???j4.????
!Aa???pk??????6(???4??C?
??-{?]???%z???e/??^,{?^?2`?Kl8??4AK(???1YG7a?"??4?	??`????!My,V?JD????u?p{???n?+?0?C?n7?n??,??Y?f???"`7?n
?Y?w?????E?n??,v?@?f??z7???,??Y4???$\ ?(H??
?Z??9"????E?\-Q???@A2????U??@????%???U??B?Q?"?
?j??(
??
*TB&^"U<D?
Z?=
%??A?
?T.7??]??P?j??????Mi/????<?p???\?Oqx	]???($??????"2L?2??uc\`?5iPy?r?????6?(2????8????????Vr?#???Z??gI??D???????df?Ps???fs?????>?y:??v??pu?d=wL)R???ZSlT)???)3?(qE?RBv{su?=Y?x8?????.SB???eJ?1??n??????z?YRx.?nW7??????'?????s???\?dA?p?#??^??????5?a???;K???6???nn?@??<??????W?Y??:;??[?y?????fu?????9?8s?????Pzb?hBF???!$??<?'?M@?l
?AO?v?????d?r?wUeI??}??r?W??pw4K????f??r(?Uy\????#R????A??*?0
??9?B??\???????"?R44??+6?"?>]?9??x?????f?? ?
p???M????tOGv?E?x?L!>|?}?g4?~?S?K?X?
??j?f??	?C?0)?) ??^??,?
?k???? 0c??????

??S{??)?c??RD?R??"?UgEy??XL1??=b?A
+??!?=???#G0??n??1`1R??E?????
??`4+T=X??
mq??p??nM????>S?0?7??,GGN!?
E&?P??L
S	E???
(@?	?a??+H?}
?zw? qo?$?
?-?dVb?
0-??C?????5?tD|??nC?M???QS???6@??{????????????K?m?N?????y?????i??j??????	??(f???%?h?
3???s6??A??=z?I????P???????K???6bXT>w???vf?[????????1?@
?c??3T??(_??"Yv(??m?????e?w??I	?km?)=??d???m?d????ED
?;?~,?R?/??:2????_,]?b??????
Sm?rUo???Q??1??$1??P9+??hCk??????g
zoq??r????S?
U??qW\???(?(n{?A??x??Cd?4z?B?h7,?(:??.????e#?7?Q?en?\.[j??L?s?!
s9n??_,3??-W??`QM????Je2h?????>??2?.3??q???L`k?T?i,???"???6,%?&?
y??1F?x?@R?gb?pdK?U!?g?'??wg??EEU
?wUH?]5}??#?(?y?0?????~????^]+?GPY,??$B{?,??t??2K?
??
?
???
[...8394 lines suppressed...]
?#????:z????????'.9???t?[?,p?!_??q1|5z???>???S??r4?9e}???}???gL??8gL?Q??? ?>?????kQ?m8?=UI??(?qE????qXo??[????w~u|?????????#??=?4z????+?8???z?-??"sg????*d8)#
??'P?~b???C}b{??6A??l^????y?P?????8???!Vr'??nne?
:<?`?a+:?F?P?????dJ?0???^?)?w?p
j>???[?;??????M???H?????????5	?
YZ??yv?f????{0?>=????o?7??????x?d?\???7??9?{??]_\????5?
@QSv???{e;'???????5,b?m??!??Y??	????c???????_?????	??X?8=b??7o?+??\^\?a????ka????4/Vv?xm????????e?}??????????/??????o>fP??????d?c??????????#??'\W]????W?_?
??u?cPl????
??o??p\???YW??z?(w$*??	L??%???g@?

??Ox??A???o?#?5?????v?/?Nl???@~/!C}O?O?/???/;?'??F
???3Ov:???;???????3"8??j???I@??i?+0??+???Ii?dNV?%?<?c?~d?@2~5:?????j???{rL?Wm???k????????z3G?>????e^??V^P<??!<E5B'S??g?RM??A3??8??????-???S????lt??7Es????p?;?F????????l?8>????}L??*z??e#??G????~???~8f?I??9'???6N?xq?V?vz????~????9={{$fA"g??/????5}2?T?LC???c??h2M??mo??l?@?^1???????????????e?l{?h?`???x??>?<??,????
???Y-???u9????:??,??X???,?o?l???\??^39x??q?-?R?q? q?GW0n0xW???S??oc/?=f??*?t???s&???e??1S?y?K???1?w?v?k?Gb??>2?F4nM???????w??????????kW?)????_??????????+??????~?????%???????_?a?8????JX???????i\??|w?;W???????\???????ww???e?????`??????q;C??!_w?>??F7|/*???o/?Zv???V'?Mfu0??????^?
@V????
i???6?k???k%q?x?kiEa&??/??X_?J??????:??????~r$XM??
? N/??*J??T8
?|?50?A1???9??Q6?????pGw(J??[T|Gl??F?8?bZ?\l??FY+Y????x0O?????????????-8???v?~?M??9??{~?zF"?????Tz{z?????e?????8??????????????S?!?{????-n??P<???S?(???????s????f??c?uK
i"?Z??b?s???&v??ClSKf?????`)?)????q??X6s?Q???Pn0?????3???oF?Z?k5?@=
????~?????G?3Za>???)?????|Di6
?????????e???fM
??|1?53kv??????G???_g????z????C?s(~?_?n??&????u?L?y???8K(???^.??????M??|?K????e???I?/?U?@R??z?+?(???Q*-}S?h?dQ?)?j???=[?
^??e?k/??}????????oG?[??????!?>D?;??????????????}?py?Y???y?b?R0???c???UFq{'????K???o?k@??C6>????|???5c??"?-?k??????]~,>???Q*?Qv!?????h??_f????g?1??Ra???F????O???????bu_E[??~Q>??????j?3???O?Ff`???????@??|???
??$??e??~-}S?+?????J??
??????Z?????
??_?b??B???????U?/??)?o???o??M??????j?-53?p?Nq?????????-~??????j??Y~,>?Vjvu?2?-??,>????O?????|?]???U??|??O?????????k??kZ?/n???????>1e??u?0????j??_??????'?p.$???N?`
?k????]?R?T??~Q>?????}??4?l??w????????????_??e$???C?W?)?d???3?v???N??V?I???WL?^?Z???S
???S?!???W???c?????_??L???_???_???c?)??w
f??)??#??iY??5?????_?t
fu?,N?
??V???T???^C~?_???????K~?@?_??B;?.?G??? V
??7?l~}????J?x
?
?V???Y??Vg????}s:?P?S?!?+??????7?c?)? ??+???r?T?,?????2^???J?Iu??/?g??Wo$PN?+??Is???5?$kR~?????V0?_???c?I}5??????????5???Q???{????C
?2H???E?\FR?\?O?X????|??%?Ne?J?????Z.+???????jm?T????}??E?,????^"??????|-}S????????S?!???T???V?4??Z???}/U9???+????SA3Ys?n?????,>????O??%W,A
?S??????X|???}P????g?????????c?I??}???!
?
j????|??l??????r?????()(?W
Gs?????????!???\Q?`N?$???~Y?s9nRZZ*???$'?o-?
???|??ad8,??rT??W?????Y?WU0???q?}-}S???Wy????e?*?3?*k?$%?????UY^~U?~'@?g?1????eU???p???????*???_???c?)??NV?SNz???W?E??D/?[??M??|?%1e??d??b7???????????\J|???????F???????zva?r??.??
??j?]??AA?
???[*G????P??#??+??gu?$),??u???c[????Ceib0r]:b+?X?????~s????5?E?uy|?+?Zb/???j?<v?I;?z?C?"sf?`g????????P???i??
????&U??8??????{J??
efZ????/k?]_\??UkRH?d?Ce@????Z?F????????{????,b????????

?
)\b?d?
?Z)|??(c?G
???N???l?????}?6?S???|??k|??5o?1????E????????O?/?1????K?MH??\?7???2????w????o?G???H????qI????? y,???	?s?5??X
JJ?????F.C?,??R
?*h-F?Qu???S??%?cI??US???#?
n2??M&??????&m?,*??????W??r-?<?SQ^/?T0 at Yv?;{??V????^??*??(4?*????y???k?9L??????4:X
??\b????TFY??R???????#????'|?????Zi?)??y?g??pG	??????&}?4?K??V?<?H~?T??i???c?? A
y??T?<?"?+gd????2??~?@9??"/Q,?j?7??=^?
'?^?W|?R?
?????????U??v,?3eO?$c|????/?kv??????	?Z????'?????~?+?{x?gs?}??????k*?7KE?3=e??A?????????*/?g???!?????G}~??v8?_q??})??l?^?8?p|y??6?????AEJ?zh?xq?`Z?_A???9q??.?M??j+??bZ?C|a??,b@<`$P?N??Mw????!?X????????#?
??/+??A9{WQc+^,{?g?j/???????9?U
+??-???Z????q?G???]?7?k-?.???Y??*B?u?C?'??Q:
?J[??U^^?	????!?Q??q2?M?HKc
?^rIyU
;t1?`J???[!EO>\??Z?????6RU[P?.??v??X?BK??"???+
Xm3??}??EA????=@???
?r?EL??dY??^r?Ohw?	???'n???[??eG;??e$N.2tG<\*?\???'"H???????G	?#c?fP?T?~?vn?????????
?????#??d?y????j??
?*~5??ll<????|KN??loF???O?i??2@??G?Xt?
??
aJ????
Z>??L*???3??{????K*q?f?C?1d?0?y#?fn???Ku?r??`T???zaH????5?B???A]?i???r?#?*????R&??k???U?g????Y??Z?Z?k?????=??s??/0O?????#?V"#??O<]?(?Av????c?r??G??ld1?9:?*???!?,U??&?????s$g0?=?(S-??_??2?(?Tq??U?Ri????/??(u??\?j?VuS?	?Q?`???~K)L)>?)R??By?
	??S???}???????tV??|?N????D
:?????7<??
W<?n$???M??&?:A?p?ys??%E?p?5O?????{???S?&'??zu?>2???5wx?>^???,?*??7????9???v}"A???q?w?T????[?f/x?n5mm??v?)I??zZ[?????x?.?{V?????}???9????????K??K?;W?;W?w~V??????<?????O????
hTXaR?X?_??????`)*??\PT?S?WmV?
???O*>??m=>????}?~??F?_???l?yC??y????0?6??eEN?~Wg???g*>??F??? ??5????V??
L?o??????*
?gt??????<????????_??????????_??????????????????????????????	??F????Kwm??????F5?|?n???zV???/{J?t??A?*(?s??n?y??????w
@??m????07L?zs??K?0A??}???????9??j?JHbx 1z??????????Z)????%_?Y?~???O?%]?j?Nl?c?
IqgJ??T,@?????
??
?????1?'?
???/???6d0?B?>?mwjx????
aS?#?????o??q?cn???6d ??L?~(O?S?V?!????ZZ???f~	@?e??h??5V?R?w
??<??W???G??.o>?vl?l???????????kD????-w??????	???6???V`??2?[?~??I??w??]?_?+
?g1???A????g??X????*Yc?????!5@?VU??????????????Q?????????1???<9??????2??)
*?l??S???*EJFB?*?#??6??$rT	???Fa?{;w???L????Md???????~???;
???G?Qq??.??E??.??
$?
??-??&??VJ?#Y??Vh??#W?k??RR?????3???????E??????8:??????hoV62???5??????z?s??'????9\?B??
)???_?N>}??x5?n?#?\?????x|m???????!??q?xl()i3?????9?????]GTW[nBP????????4pw??_?H?
O?AN??~??-??'?e?t??e?????p??w]??????]???????j~>dp???{?_??/fr?TXG?l?!??w+{??5? }&.Q?7??qs}
??I?`:+??	?J?yN????;u?G???_
??	???6"??'w???6x'??????;???x?????AZ??
TS??oUH??,1??J??l)?r?K??~U-?M)???4.;?)#???,wI/E?
M&????G?=Z?[??j???*h???2????=??1?????????????[??????~??2???????3rq???,T??r??wHs??-&???????9y??C?U|?;??PA??N???d??lO-/_b???=ro????T~??=??t??e??Nx?8%??q
!`????pU?????????????????qk
?`?N??w?9?z??
	???
???JJ?
${?????8??U?N?????oh?'"
???;???K1???J????	??????K????V	Y[??WV7???UF??mjd?4a?-????Qf4????jP?|?g?*L8vNC???r*Rt??d$??R??-?=>?S??6??%|b?V1d??U?7??6F<?,?<2???????<>aCy|???\lI??S??r?(??x???y)?On8-?L??!?{//>?f?????arv?&d?????&t~?\???|????=8??U^0b?|y???
???7????T???z???k?>???\W(n$???W??e????Qv?[B???t??
?=??.
(
4?*??fv?]? <??{J???y???_?j??3??
J??7???uCS????L??r??QgP?[.?>?Y??GA??*q~?=??Wp???.E^^?`?\?N??\????''w??TL`~9<??????UTk????????Q?oa????w?5d??]???????w?4?wj
?????pVQ???C?~??j???r_????^a??)?y2)?/??<?e#i3??)K???p??????1<??C?.????%?6??? "$ ???#qW??n?u??q[??[??;?.++	o?6????,??? L*???????cZ?q???c?IIx?????????1c?8?5H??_=?F?=??2^q!?H?d?8??h*???:?s???????e??OqI???k??5?????07?t9?u?]-?7??B??w??`?)
/s????jA??iQ?????{~sX?^_??~?????????)?=PT?????N?]+?{?+?h?P?W?H
?$?l"?Y:?i?8???m%k,?????????<F??HY???q~
N0?O|?K?+?1z-?r?a??N??????????j???a??&???~?3??????75 K?[?Q/??dw?5???>sj??'??1?*s[??}??(??5h5?:???;?[?J????w4????;??)"????N???r??I?)w??w?;E???M??= y?^???;:?????v??????jRq`)??<?_?j6??(?S/*7T?XA??bAq???V????_?}<f???{k?
q'?`?%Z?v?
??x?-(?7???Z???bTQ?Y??+??$??(
?r?B?rdpQ?I????f???????a???~+"X??????????qX?oNy$??@=?G??aB'?????Z\??E?QQ????T~/F????e ?G@??9K???????h?GX?)3J??v?
???-??'~9ac?
cp?~
????0&?}}?q??H?H?(fg?W??..?????'?`oB???????
??T????O????o??o???? ??'/?Mqm???{??x~?>:/?8}5??:d?y?g?|???X?l??!????)??N??????]?_?:>???TL?B???
=Um?Uhjv?zv?N?????F?ywU?o?n???e?U2????#?J	)~?s??
??~?d????^?Y?*??^T3?6???|?_??"?

???2.??+???????k?N???tU?Qs???^?*?E	
k??qGO??M?BH?|(9b?j)O??#????`'?????H@?]??F$M??V?
?Oo`?I?L*?^)?}?}Y?07?;b??????,?4???x1???J.:E????S?'?$d??Z`????.K
??[??RI??E?43?2?e?t??g3EI?|WJ'?h.??SJwo???/bCw|??/??'???
?l?-?b<??0??????`\O??W????????g?n?@m??jeC???	
??8?^????)?[??i?M?XK?"??X?g?,???(?b??\??M?r??n?,-O??K???ICLf1B?r?|Ky?T
??uB???0?G?J???v[?J??????}$?SX:N?iJ?D?6?cudf?r??t????[[??A?????)"B??w?t??f????0y
E/???f?k?t?]???w??	Di1-N???Fx?N???@R??2??N?`??o??Z??1,J?u}??}$?M
1?5?)Qn?!!?\7?{??u?NiN???Qv;_???!?@5?l??1??*??ch?3>-?=??y~,?*??W#7?NF???P?K4j??\L$
lY???C#0???VS<(??"???r [??I''???^?%???????X??q'?G?? ?V????7l?B?B=?o^????+?#? ?r??H?????:???{??{?<?'??
??A??
????m&???	?T??-??*?1??tE(?R?J?l???@?.sd&g??7??P?pC??4????N???h??7WEV?
?]4????u&?}?Vs?6?&????'?;>Z|?1Zi1?:??sm???=??8?0?
??w?X?????FU???%<?> ,????Kl?G?a?	^??~?[C
??a?b.?,jb]?j?????]???0A??KZ?:j?~???
??)??????gY?s`????h?PQ??E??3?R?~M??jyR???zF????zL???+?
;?	@?lL?.?H????e?w??'???C??$J???????Zx???P???????0???z?R?\?????|??r??\u?=?!??p?5????????V
?????l*?C???U?d`?:????#?GKG
?'???3?V???????7????????|??/???c????;t?b??Q'2?	?U>T]
?/)c?wH9a?"q??C????????5??g?}????Q?H?s?p??L??????0(?????4?|?>/?n'??W??[??re?)]?bN?6????9f?<8??sc?????+2????qP=D=s?n ?/??#g???0v?
<?
'J???Q
?N?|?8? #|??????TXzw??
y???i?\8?!qJ??:???#RxY'|b?ft~u????8????O???[?N?Do?g|???L?dh????^8"?? p?x????n7[?[?6?????R]E???|??=w???v???C?Xj??r?}?*?I*?-?j ?R?????9=?\??b???iE?????*??Y(?l?j:?|`??F??c??????????????:i0??Xt?6???IO?R?-q\U{,T??bG?)?,?&d?[???6?????s?7?!?I??O???S?s?2???dl;"+?FR`????I\?O??3?`??:??_??l5q?0????t
????5??"????_e+;??%?=??Y??# ??f?
??4???3??+_??N?hd?pU?K??}??EL:(?	Rg'/?o??1.
Qx
Fg?b??r??Q?????~?6??2?mE
`?????	X&???7???E??Q_M?c?b???s???,
??Mc?v9?9?^Q???????T??al?S?2(S?2?J?@?
??@?.?T???????D5???@?;?J?t???:}????]?">#???{??L.)???U??`??G???
w??7?x?2"?gr??????(AQ?|*Yfogl.?Y``DY5?"???o????N??E?
??_?U? ??<U??J????????|!????*'k????z/_??V'?9.?????k?EcwW??+?
?[??
:coD????0??
C??y?.&???????x??#??zx????????U????aG-????|??7TI?m2?o?+/:?=?y-??71-?4?N?e*?8?:gj8????I?????????:???7?|t??????
*???(?
?E
dg8?M?Hd?@??????U??H??D??h????x????Yu?u
???Kng?????U?m???	?I????=?`a??O???\^????&????A?	?
8???A9#??q|#?]Q?????[?l???#???2??????M6?B
?y???????rx???a?????T?Z#+?m???????F{??????n?i}?
?A??K?}h7
??k?Z?B????j9???AWw9????;????s?J?d????????]????Wr?R0r;^??3}?')LL??Y[??UHm4z??4?????@????&??H(K2*???????b??????<???J?[o?V?C??(j.??]\=d,?? q?GA????Z???C????6Em????=j?>#?V
+?8??
q(????aO??tDO??????????~???????;??Ko???5??B
?)N?N?????sg\:w??d????i?????P5d?I?a ??Nx?M???????????|bi??? ?>?2	e?[?;?HQN????fk3R?R?4???p??J???????t?'/????e8?????"]?FI?S?B?M?R?(?^?#?
??Dm?K?h??*????}????@%??"1
???u?c???m??J?b??F???F?,&<?
e??e?"?4Z??7??????
6t?}(J}L??a??<?????wi??r?V????????0??rH?xF???(r??????^?Z,p?q??-??b??IA%l?a@&?J?W~<?J??T?kgH?vV?
?;:}?l????jS?t?Y??
????
?:^??$??tt04?Hvb 
b\???Jt?E??=?????????y?)&?e?T?X??`t ??h??F??I+???n??/7	N??Z4?T>????u??A??'1?91??%?/c??	????	d
,?????k?r?o|>?a?g?4?1?k?
L???????V???????????;??	????|??g?e?(Qt????"?r$?????8l??&???|?=(?/
???j?R?M?U????	Qv???r?n $????q??QI(Z??	????d??Jy?Zb2???|?.??u"????$d?E\FP??I???(?|????2q??'?? ???u?????C?G??=h?????X<l??!<???P?I??e<?KX?????H*W?m??^?$J0?Awe?_'m?1???s??j?@'????\???X?_)hl??????A??/;<?~??o?~7!??????v??M?(??7?K??7??s	f??6,?YN?u???$??=?????#V6?M?g!^?a?s??=???yV??????4???>?ad????`?????6?v????Z????#????hW?A?7???_??/??T?_?<q??????7??gv??/M?5???i!`?p?V>g?$?'?"??'?5?t?:0?5?t??b?Q?/??B???A^??g???M?!??jw?????I?#u]?C?W???pS?????*
?*??aX?-??????S?&{3?_m-?????????????M???-F<yN!???:;n7&??o??
H	:	??y?/U?????L<?s?p?
?3 at x?\??R?i???g?M<?Uk?j?T???5S?f??L???Z3Uk?j?T???5S?f??L???Z3Uk?j?T???5??Z3Q?9?(??n2?M???T7??&S?d??Lu??n2?M???T7??&S?d??Lu??n2?M???T7?
M.?r?????u??	????<wbZI
??,}?c.?
?]?+|?Q??????3??V?8(????X??
1???!Cy)?[6?#[?1???5????m=4Z?k?mr??????3??`?v%z???%?n]?y?3????NRL7"???_Pp??j???	w?.dq?n?S?6?!??u?d?o??????
???tt???!1J?e?Mdc??I?;x
P?{??t???	????????Gg?+6?>?;[:?,OY??ifG?+????C?Zy??C??p??3
?j????????`??)?ND??3p?"?\P#L<`?8?????.?B??,?????='????M?y%?UC?????3????J???????????`???!>??f?c?s?CyN?/U?=??A??'???P??????yN?I4?????Q7????S?Y?X??	???/K????=?Q?8s?]d*xuh6!?9?Ht?Z?vN??#???3T??3????Fj*??F>??;?????;???????3'^:fHC???>%?)??o#?i?t1?c?0?H?:3n??t}?t?[-9]?e+t???????
?g??%??q????????_??y"???!e?)?NYu?t???e?????q?t_???????????;2??+?????3wc*??{1????I????0????Axr??ydf
??p*
??p*
??p*
??p*
????INpJ?b/b$?????f??????TjN??TjN??TjN??TjN??TjN????<G2????e??-?R?8??S?8??S?8??S?8??S?8???I?q?NF??)??f???u?n??{????x??T?N??T?N??T?N??T?N??T?N???=[Ta??????1!??S	9??S	9??S	9??S	9??S	??GBF?[D?w[F??THN??THN??THN??THN??THN???!9?????9H?????J????J????J????J????????<?
Gc??=q???@%??T.N??T.N??T.N??T.N??T.N???\?Zs?KP??:?
??Y?jQ????Xv?c??QgSFv7????Xw????v???`????"????????k?o?o^(???;??a??U?m???~??0??` ??ZB?.?0(?????Q???V??n?????4?m?F???h2?@f?
x?????_?P??[??vv??6????s??c)Tx+V?\??^???7?D??^?0?F)7J?Q"7j_~??
9R?F<??(Wj9_j's&dNB?p?
$???|z?J/??.>e-?N???W?H???B????????3?F!4)		???2@?'?4?BG"?	??I3?<?????O\???
wN???u?\!+?u:????\????G???'???e
%C???????O??
????3Wo???d?????{!??Fc?
J????{?'?6pqX8'????a?????R;;4???G:#?@	??^??x0?M???+F
s
????#?u%??;?i(?>????|v{??S?u?b+M>1`????:c~Y?_?????6
??9????av?^O,?+??????u?+?	P?Vf?b?.?d??m????!?E??G??e/5?,uR????Q"??.$?Vh????B?HIK?m????d??????C?Q???__???????s??v??UmN??????{4???t;?kY??#??????~??C????f??<>
?????????V????r>w????-??O????_Do?$x?QNE
?-g
P??
??wT?jYlv	-??????m?<
????fG?2?"w?F??????)?vZ?K??Uq?jgO????eUX4?~?f????2M???A=h?n?????F?? Abo?	|?i?A??K???X?vv7????G??bw????}?h6?qw?l???n???V??z??n??v??lm?`??V?ec?yt?x	??????%=?????yo?%
?;z?8??????????j?6^???/;/hJ(??????j?wJ?G?????.S??+[?$??%l
???hy?=T[X(??????
????l?? .d_W?v?*??z?j??"??????-?????r?????e? ??*?	qi?vL??(???T?-??Tee9'????M?V?^?+??$????n????j?4????7?$?T??}S????????p'???O?	w_?1+??_??
h?>~??i7?????C?9n%??eA??x?Jp?e
??r??$}YR?~?[V?;g??F??????leT
??U??{?U??0%???????????\(?I?e????[??5|(G%H??????>??+H?8?j????' ???\GX:)?H?(?rE?jBz8? ?
?s???d??????pY????w n??|????cao???W??w?
eT?	*[?!?h?
	
??:?D
??A???C?pW??S?Q???$S?.8?y ?H?9T??c<?$(???y???PA?u?$bM72p???@'6|4?0O?2Y??)sA?	Dn/G?N???kW?0??t??>@w???????fs%h?d???S :
v?]Z.ME	??w?Fq???3??>~??$??(??36/????u???b???C?%-?u??
6:?i?6'??R6?r?
??"??????????(W"?C`?ci?????????N^d88??#?d Q??w@
??Zq?x?]????Bf?|eqb??R,
A?e3?
??????????[????yW??y
?????|I??0?;9;'??????7>j?X??@?????????LT@?y??;t+???$2A???????rH?I<?)??I
?x??u?K?d? ???.YE?;}???! %?rJ?G?x?ID?????k[?6???%??????P?????lfq?Glt??>P?f???yg$J???S?????J???p?aT0?CkB#F?^g?(N??=
????uQ??v??6?.?K(b?x? ?-Z??!?Re????,)??.???h???q?c????N9?[0s???W?6??g$Fuug%?6?sU???w???J???s??qK?M?9?Y?5???F??DS.???@?? ?????"??R a?u??|%?????<?#????#+??)?:????-#?rJ&C,?!
??r?N???+ ?x?)-??1?}M???u?0 ?I????????DY>~????[!a?r????FS?a?LG????T???????m?AfSP?-?xK?J?0?8E)????KX??']dN?dK?8g??xZ9?????????Y?q?"n???G?K?/G'|???????p2?? ?!<h????????V???????]:"???????fN?cC????j??Oh?7<?;t
QE2?R?O?">k?gt???sD???E???=?????Fd#???S?????C????X?aV-?k??x????????Ek????!?mV5?s?&?:??k???3?~nd?3??x????bzZ??=
?#)???O0???9$]B???Y??U?.cE??"N< ?r?Nr5?$ct?????T?,J],A??z????A????-)8?1???o????????L*\?????c?%????f??xy??o3K?z2s?
?@3
?r?1?s?H/#)?5UE??Y?Wm<?\b&?L?d?m??0????#	?/??I??>)g?3j??s???g"d*??2?T?b>???,?7<>?ZD\??YI at sA?
???;^~[A??????;H?a]?!??o
??V??gc?M?^????i???x:efeQb+?,???l ???f??h??nR???;xZ?B
T??(k????l???Z?g3l.?!-?2;{0????e?t???
h?3?,<?k?B?ed5???si???T?\?????)?':H????????c
???kJ=6??]?7(?@???>KA?A?9?{????O??Q?S?S?K???JT*?UQ????9?FA.??}p??H)???????<?'? ??=??M????k>??|?Mp?Dhr??z??? ??+?}??r????H??+Q???te???????>[???3
+?J?9??????N?9???B?Fo?z????Y???h25????l?&?+?????8?;?A???2??Z=??D??lD?W?K!????????????????>?4@?%n????&?w>j?G=??????<??!????z??????#?-sE??#-?q???d?r????P????_?$?}??x-????a?Z?L?!??<`b??#??
{?????&[????D?i??&q?W??k??0???|D(???|f??I?L^%a\?|?!??Tc???>g?.XznCkJ9??????L?N??k??.??0?r??w=1??=??%????9[?????g5@?
??? ???????Q?om??????m??t?????n?????ak
????7V????.o?q~???%??G
????]E&w??????]0`b?????????:x$-??W8?e?rfY
>I?
k$r?????,??0??0???W??L9Q?e?LN??????x?g5? %taGgShX?n?`??.?8?{Q}?[2x??Ga
??,_Y?&??_6j?bY????e?E0????'?*40??K???{??/?S?x???x??K+2F?T"????H?B?L??C??&?.`G?4???Bf????*+???v?'Q?IJTY]??#v???O????C??G??6????Dv2?)?}G?$?^?
	?????_S???-?uO??-????R????/??*??S???x????~?R??-j?YAX?(?????I"h??xr?hP???r???4%A??~)?A05j???	V??_7?7?b
??bq?tz???/}??????uB???'?* ?V????a???y"	?~v`&[??n?n??.]?7?????n$K?????z?_???>??i??m????m?t<M????????a??<xm?????????=??Mo?t???;O6??i[w???z???s??)??>?'S??@????J?a??P???????Jz???O?????????)R??>8?~????R?r6?wZVFN???????r??i7.zl6??????????????"_??)?????Q??M???\?2????	???????s;n??????`??U??V????"?!X?6???`??|V???E??
??s??dl???S1?7vN7jP??EW5??eY???L?????I^????t7R#???2|&O?U?`?NB6u???3????g}??G????Q?}?-J?$?h;???Zq?????z???3+?\??y??b?????nV?l?#????f??6:lk_?M?#?p??????r2??Q??]?392y?5?B?'#i4K??:h?e?qA??/9i?T?oB?Tw2?/?l?
?,???:0x?^???c?J??
??$???wU?<?
^Gmc??7N?????k?U??OoW~??:??-|????x??????0peZb???F*yq???,?5???P????hY?<?[?????~'m?M???39qe/3?D\??$??'??;???}?~???QWa&2????mm?"??u???B?F?CL?++?3???Yb?7? oX????????^??7?l?eo?5w?L?P33??.?]?{N???m????72?Y
??Z^?[???JeE_A?]?????????,sA?9?M?????Q?)??]u?V????;??-f?qI??5?B?lQ????#l?i?m]J}?{O??1,???M%???$?o????L
?M??
??Qdb(?qI^?Z?"1i*?<
?Q0???????0???$???d?2c.B??
[???P
?!Hv?{?????<	R?????7?t?=uh.]6_x?A_|w??_d[
???	?B?vJ??HW??e???b???03O??<1??K1N??!??9?lN?4????!ZZ?(K?@?g??E?4u&???b?D??f?L?kbbv???\???fm????s^?3???J?O?=2Yj??0zp.]m??)??????p{IZ????6ra????mD2p7:?x???????? o?O????ms??!??Ev??3??c&????#K?U?\Rf?&RB??t??#?V????Y?"?"lP?.K?v
?8?nn??O?Y?-??>?9??t#??????q???*?n?~z???
???9??>+?c?t?S???????O??I??vNf???@???n??*? ??s?n?D5v???4L?V??????0?T??a?XRHqP??^Qz??G3?k?x?09?????T????_A????k?A?1l?L 7%?01??`?Q6}v?>bAh?@6?l?Zd]
???D?0???%????{7H)
5??	????*m7?
}?c?????(#????M?>?@Mr????$??T?C+?gR9?M/?'?5j??=?l??5!}FB????Z?D
??j?gn	#??E at Sr?q"Di:?;??;7??u???&btKi?4I??jLLVn?v+????3?+??c-?????gS?????#y???FlFy?Vd??x<kQL?&*I :??F??/Z??w_????Um????]A?b?o????K?????U{?Y?R????e??e,?]????y??:
?TdK(o?????<??G?E?BtQ??
(8=??
'C?O???7f?????bR@?T?6?????6
O??-[???PR?I?o???m^M$?\??};
]|M:??Q~??n?t?=?H?]???7?Y?l?SV?rG??=~????w????

?Q???n?+q?a?t^]$????Es?K?\??3?3
???s~????0?,'?????x?S?@?~?]k???i?"?S5n??#44???????? ,bH?????????
[?????Z??j??????p??????G???G??V!??????????Y?	??X??	?^????????_w???A?L??c???+?????_?-?d6??;{;?|
?????_-?X-??????????V#?F?w&?)????)b??W??a????{j??^?KQU???[[???@?K{8??.?7??{G???m???b??V????{?%???~x5r?
)??om??
???3F???E?/?!???:???!
{Ay? J?????,_??????_<Z?????^?J??????{??js???????2??w? ?Yl at O??w????*????>!%?oh??$M???N(?Bcf|?\?????^?????h"????W??ho????'??j?)?m y???????aX???<?z?F/y?UjFQ???o???y?????3
?t??]????#q?2??u?n??{]OArK??
S
Ty????^m?0
Q??m?` {?{???>
???1z^?L?????????j8?o??+??s8]??}?R\F?w????7?LJ'0?K?Ud7
??^?Y@???????X?"_O??+G???)0;eF?????ax?&mz??r?{|??????Ci?4Sn? ???@??K?8??B?????????=??"o0?????
??x2$(?????;?L????f??;??????u?Z7d???1?.#?u?b????y<????`?????z?q?p?Y??????k?5??9?/????<
???n4t?????{?9C^T????K???rtm????7+?Q?&?C???@(`
B??t????u?0CW?p??d8????~`????r_?#u?&
??b%t?AO?????????/`o?=9???a?v??
????W?v?
???>????v??.?bW?????????F?????38qp??+???*R>?X;d?&??6~O?
?8?
?tf??F?s?W?Q?Ib??e??P?I??@?+??2?66?b2???8?Lf?u??)?!?<Fa9q???G?}??uY??c???o?Z9????A??cy??A^"E Ss
>n????@?????????O?A\?	?g at .Ao?????F.G'?

3?R?qP?F^g????{??V?????-u[F?'?p?+y???????
??'?????XRE	"P?\F(2?%pe?#????????
[??IWN7???Pj??Z??0?0?C???K??????]e?A??4++jz8???-??"3?~?vV?????s[??@???=eQ82??QF6?wx]???~F!?5%??h:?g\\?>IPdp?AG]8s?gf<?????H?0?^0??2Z~eb2?a??T?,E?C?B UR?
?)PPO?l_??E!???7?r
???	
<?r???T'M=+?|??D??
2??R?B??q\O\o????P????`=-????2?I0??cl?#?????:??P?????>?_???,X?h(HG?J+"?@?<?@M???	?????>?V????9??NP~4??r?c??"!?CFA??H???sR?QT??;?????#yF??s?tk?j
????95x0nt?????'?A
%U?r'n??1?W^???L?7]8?dY?}?DK6?M/0g?Uy????A? ?=?????<<|?-???????w^H?Ie???('??&??????6???6??;?5???G?????????ps{k??????????I?????Z/????88?n?m?=z??L?[?%?
h(^??;???D[??aw?^??O

?aHc??? ?????Pd????N?w???vZ{?fS<????`????u??y(???
F?J???X???M??w?Z)??&	?N?????~??Cq??f??d?.5? ?k?????????E???@[?dn??tn
????MQ]????jn?3+?LVOk{??f?>????{=R
4??
????	??????{?<_???
5E%t??Su????2??????1H????;+x:0???{??e?=???Y?????TH?&
????
??????l"V??????
T?????A?@??=????[?"???d????,?D???r????J??????"k??&;[R???+<G{?q8??;??q4z"vN??:m?*n@?o?n/?`???X??j?????????Y??KK+=??????????*sQd?a?P???????Bfii??U??	A>??????$?J?r?q?w'???;??0[??!????y?w?
U???1?]ld:gJJ???,???F???w??h???;?s?????r??>L}$???)q???'W?-%["??T?cR=?w??)?????????*????&K?????O?Ev?????????=?t?????W??%????6xo??X?Nk??z[??a?t?
h,??dw??%>??yTb5c"d??_??&?????????j!>?25??+??*?jO????,j?????lYd??
???a	C?:~???2?.R?C?8????}??b???????j:???6>2=DLf
?U?l??H??G??M{0?????K:?????????G???x???!?I???GOP? R1H???E{VT??2?r?-=+?]  ??\??????.???q?t?>?=J??B???????
H??
q??w:t?????????EC???????????@?D5??V????)???5????A*,Q?9A}?0O??=V.?p:@???+?M?7|??_?+?a!??????@???AQ???EP???,????Pg??	RU:7?Qy
?B????=$0{9?[??3?&??+??oO???????.?????}+'??g???arf????J?3?X???o??*?tn{???:????Y'?? ???I?%??z	??c9?T=?v?+?
?)sL???>x?.??S?????????3?r?????,y\ll?????i??q?1 ?s2???(hkN?L?:m??i?(?x9/?.?I+??!??;??6?$3F>\
?H?;?(??<WG???yg=h??????u???????l???K????????m?? (Z??Xs????*?ZR???O????8_T=5??Pf??TN?{y.QH*??El&??9g??h<?%?H?=a)?z????;j??Jd$??t??????z??H???n???D????????
?D
?BI?"{4|????<??]?N'GR???j??)
X*?H????????H????'???b?}k)??tfiEKy4?V?{??j? B?4l?h~K?V?+?V :>?Z?T??^?Z????4XRf???F??????Q?x	??J??????&???a???E??M	?JRC?`?$?????*?A?h1Tc??$?;]??H?]j3i+8???`2???$??u???S???u????x?????W???P???/+?"J?X?9???;??@o?x8#????9??????e-???l6??h????*??Q?5???yr?u~	??g_??k???X[????j??z?????????'??c?zu?D??b?G??????9+??L?~*?#xM"	?4?mD?&C??n?,;U???;	y?s)*?/L?"??NEIB^?X?
????Y??"???L<????"?|I*?T?E?ti????r?h?5O?????	?:?N??`????N?6?P#?????V?a?J???????j?q??:l???Zm?Xs???d:???c*7f?yz?jL???d??6^?+?Bf=???*6?K?!???????{??J?K?WL)???&E????g`???/?W??_??
???u?[???)???????T??Y|??"b%m?<???(??
0???:??c??~?@????b?\?????(u????v????O?XO*_?Y?G????dXJ4?1[Hu?n?Fw+?`??x[?k????x?f?????????n???ll7??dxT??m66[
?{?r?w????d???:???k3>`?Vs???-????g???;??{??%????\?;c?????;j??v6w??{??[cM?????3?U?Q????????????Z?el?<?jo????????A???????B?t?_???-????Ee?3??M7ti+????~c?/d?????????????P
i??tDf;??v????]B%?)??????$z?=??n??z?\??9w?i??
j?????!fA??{o?\O?% !???*
s?N? ?????2'?????5?Y??????'(???Y&??g???a????~?c????????L^?G?"??????????vx????t?\C,1B????*$j}\8W????}
O??????????Q9??^?????ch3?c?Q?t?g???r?B?????{zt}7??	?[?B)t9Oh%???g?F%C??;@?Ury??`??V8?NF??N???:3C?,+*O???3??3 at g?Y???4n??z?a?.j?Qe?2???mXCg??;?tPCG??Q??mb?2i????/?7?????3?H??}o?????k)[0?Ug??mVu??O?$????????9??Q?'??n??
?a5af?3????\`??0e?O:
h@????|?}??#?y???E|?)????I????[?7?3wK?
?X?Is??????{
,?????D???L?G?????Xb'?4??R[??f	?????q?e?,
>???yp7m??dB??v?V?e?*?????Gg+5|????{??^
???G?w???!EZ?#??&5M[???? (P?`R?g'pq?%?????D???H????z&Zw?V1????E??Dz6?T,??5?;
"-
Y???E[?Z?__S9/z?f???;
@FEO,??)??????qA?%g????oH?MY!"P?Z?q%???U.???)gM]T?????U?K??G?E?En|????3?\???*???'?m?.?_\??!L[;R&?E??5G??z???H??dF"QQ_H?@?h????W??if2w???? 
}DH?5Q9?????:M?????d????`?X>~?M?"??;??+??ux???W?lr?&??08??P????^???c????G???C??F?/??Zx????j?'????2??[Y
??rm?w?7_?7	??#???j?m?Q???T?q?r$???o??-5?dbC)?????u
????F?&???/>W??)???5?hw?H?????02Le?g?(?m?%S???t????/?V={$'"AA)Q??6?;M?D??r?Q?U???]ZOW?p???t??????>?R???????09m~?C=?????UM!?o6+??{?^3K??B??~'?u?????Ky{?PQ6?pV55:??????Z_Mc?3I??U=?%Jm??D?=H?_6??????!??|??????????Tc?Q????I??\Y#2c?Ws???????	TE??0?E???r?o???b???Y$
?U???3? ??H????)[ro??T???b?1?H??G(?X??}Tz??S????s?/G??*v??&A????kj???6?h?????r?NI?!a?h?T????|?P???y/???y?g?5?7/i?V??n?(
c??
?{???[?~J??O7P??z?o@"????F?-$??2V?O4????kf)?????????????????|???X?,?cR??>w??";%?z?/.?k????????0?=l????z
????6?8
?l?^?>???"??AK? ?C??9?W?x?O??>R?>#H???x???????5}??/rc[v#?G Xy??SO???<?\? ?>;a?Acxht????????8?s????"?1<????^?^?v????n?t?1?c????K?)>??3]?7??T]?OY??????????4??
??A5? ?[ri?Z??U??	p????3????q?y??28?z:#??u@????????x????0?>?C?y???????tl??x~(!c2|????:?????????%} ??gt??????8\??==????????3>?????0x4dO9IwZT=x {I?d??35T>?\?-J=h?y??`???? ???X5&?[?7???a[????X?Te???f?J??0M?)????y?P?)?Y??K??Pu
w??=(???X^??g&??1[?Hr3 ?D
??F??
A}???e?p??Y??Rip?????i?(0?D.?@?J%??H'H'??,
???????????N??e2	???Q????/
1??z??=zf?BF?2?B\???J?6???S{????\l????(u?2|49??2?n*S\??????:?
%lw??u?'?,?,AlUFY?3? v???mb???*???
?D?=
?w?t2?W?w?"~???yEt?????}????H?#`?	?
r??#8?	??Yy??????g>*??????K???m?=??l	7'????E?Q GK
??P??wb46??J2???t_????d????T????M?+??r9?.{??S??????3Qx??;??i ?Mw??'(R?+?eC?@?w 
??x?|??V?d?????o???]Y.?A???X.??@[??(5	???#?#k??i?A\?-/M?p???
?????%:Q?\?@?]'??\T???+	9??=????????_Ns???;??,????
b(?n?r??/???+??? N??sAI??i?C
 ,1???&G?d?"??J??????y?Wr??,??9TW??e[??}??w?fYP?@?ZYN}??u?w?????<d?aq`?z=%$?Q_iJ???_?h??????r<?eTPy??a1;?F?M?X?x?7?(?f?ek?m?EcaS&?oY?$C?????)
A?|	wE??w?Y
?}
EW?q???n#??]??i?r???'?g0????Y
B<??A?uL_??e?!03?
I?*??????	?q?EWU????H??n??%,???1?,!?????????6_)???W?(??E?????.(?7l	/$?Q??J?'? r???bc/??>>?bTQDQ??`Q?8?
P:B??x`?"?shb4?l1n3??vA????!??9*Z?*U
??>Y??t??-LX
? ??*?P??FE??l3??AI???I,WK??'3??V#?T?LF6"C]5??~?_D??
|???????5x~?h???G????GS???7??C0??z????????S??8????w?t@
2sb?M{?`?Gv :???)???	?koK??i?7pA?]_]??@????.u%?'^??Y]?~???5?p/G??6E??wb?1?>??Y?1???-rsU/-I3omj?????(m<?,?=7i??m"??}q???73eIc?rU=k:??|
??#??|?}???!2{N??$???_??%??=?6;jB?f?v????xkCp?|??x??S7D?P??=?
Vm?/{????!"??G???n?9????5????KK=	??K]??/?h?um%?pc?/Wqx?"_??3?VH7!?B?e??8?k???
?n??????_????R9??2"z-???kIth?b#7 ??s1_?L?r??????v???????2ER?v??b?W&2?t[?&3??'lz????l?>o?????,???|????????????koj?nr??????4}aTLIL????f
Jj?F????_????????6.?l?1F???h??-!?~?
?x?g?Z???n?n9?(S????/b??H??|u??e??t?U???K3???$.lI?Y??????d?=???1???
(M?p???-????g??????c??gu??????Z??????Z-??}???[?I0&????L
K??A???a??3?I
??&}R?y![R?~?p?~??] 
???H?X?????[???\???????C???S?Jg9?tr-~?O?:c0"????c:?9??aY?'??
U???,`??:???????o???NK?T$?H?{?Zm??????????dRA??ve?H?????9?
?aGB??Jk????????????O7w???om??????&:\8??{?Q?Ag??^l~??k5?7???4[??|???^?X^9.T|?*
:>?LX??x?"?*,??9????Q?r'8x?-?\Id????x?O????M??+?Yd?8M?U?X?b???4XnA?+?????K#????XM?B????#?????c~9??O?:??'?*|?%?"#qC???A?????h2d??G??\aEI?????c?!??ZA%/???????^O?\???fQ??{?{??K
?$?Q??a1H?????
?@??G??@?????f[=????8?????zm?\???+?+?????s????
?M?>???~??????-~A8??????j??u?v^"????????6~???{???b???Lz???c08iO:?j;4?*???Q?!9V0z??ibV?.lb??s?#A?\'?3??'IT?\???9???Z??0??x???rY????1l?,?;?j??jN?z	-6???i?.$cd?T??E??:?(X!?????e?{U??MFT-???#0F*???????~??-??(_??k??W?>??????????O??Z?G?&%s#??{?????u?\@?>?A?hg?#?.??DE]EN?`???U??h)8?j?"?8????f?+???Ew???{b???NV?k?s??????7?U?z??????Q??9#?EO????#O?&?c???d????????O??w?OQ?Z???1.?lUT_???~SK??MO??7<???>??9??9??/tV_????????3?!cS?'?yR?'?yR?'?yR?g?????U!???A????D<??*?,???????? ?d?.H?dV?Zj?D?S%hr???)W?2???%?#{??>??B??j<,????&?????a???
????j?8????p?2?M#NO>????????????$???zF?ZP_??3
L?Ux%<??w5!s?(?WqR??w??????_?g???!?|?[???????????Q?~????U???>H?????A?V?Kz????^?????? ??uI??w??????3??+?9#z??!??e G???W?????xn4?|?|G?????n
????5?
??
u:!??&?+62???}K?c??e?/?aE?08?Ia_b?lM\?9?ZMTZ_???jMl???m?p2?~O_???????_t?Ew??e,???(??
???oH?????\????^???.????(???|???6U9??~k?E?^???%#??\??????VHS?w?1h?_???????n?=?:_z#2??4??????t?????]?????t??7v??9?j{`\?#mn?+=
`q???u"p??zn?0??x????@??M?xJ1?b???	"?/=??-?????R{P??!?L?PT?k??(u-?'??+tq@?pA??0U^???2???6
???	4???%{?????????v????????+??= ?`_l?Ag at E???????i?????????	?h?}g}X-?r??7?/?P??S=C?Z?ZY]?????=*??????????? ?`???#???[??
?35?P8Zf?
???oL(x2@?0
2`?'.6??t?????V}?.g at O??9?i?????*?????@S???*?y
,l?p???;t????]\?D$?n/d??
?$_?9]??.??????
4??;8??k=C?a??#o?R ?R?'C???w???,???0??@{`7??????????u??j???????"h??'?ABs??@?0\?D8??P?K??v5i?
?d?#?f??	???_M?c??

b?t`?j at he?&
??m???????ppc??GW???co????<o?????N??	P&2w??Z
?3?8?0?qEwA~?mC/?
?|?????D<>
????OV
??z?2yg??HU?????o???kD??sj?Y?*???t}QUc????sjV???*_?J?9Tew?nV/?n?u??G	
???d???Cc?k\?J e3?z??K???D???v???x?y??B?g'???|??>???/w?H?]?
?oQ??X?????K?????d`??a??8??&??{??<J?????y?K??x?XT????M}??>66???j????K?K??}????????xt L???{???{?m??a?:????g??h/???????mY??!H??{??,???;?r??o??
??J"W?4??i?]??G??1?~,??BA?,?m?^?*5??1d????;?<?-?^?*P:? W?zr.???1?|???R?l!?n?}PB?-????k?:????q{HW8?
nm??c?`?
?;??dO???@V????9c@\????-^W?8$?;`"???A?_(?!??O?f??&???????n.-)?V??j7????`?\)G_M?lC)????T=?"	?^"?(???0??,?v" P???&?@2??6z}z?aH?????4????????y?W??Z?YT??x??+?p?&S4?3[my????????T??

?[?%?O?B????b??T6|O( ??U?L?????B<?
???
U????|????6T]?b1????8?^+??
??d?2???
???ne?u.?p>?*[?n????V1??j5?b??5;Z??H??N??r?)^3CJ?V_?_??c?????j??8?	?}m???
??x?
-??a
/??M7?
??r<G%+???y?OR???(?'?T???rjIh(???????????'????V????qXy?
???C????W|???n?
??
y????I?T??'???U???+??tTI?f!dt????Y??????)"????L\?l???x#,q?1w?VtU??qAQ?<gG????=*?QR???G?????#?Q?m_84?"???Tr?+??:?N~
??"?????????h??;g???}8?4@??#??:???<9?4???
?????"[???_{????~?|??5?n%9'??Yj?9pw?>3( ~
?Xd?5/?*?|?DM??L?`?{,V??? ?????i???"?????=,?C*q~???/(?i?P?$??,?,jb]?H ??????s`?So<fct4p?$?????(?Os???[
??Ax%???????uq??-?'2??\?
??tb????;a?[f?o3(S5?|????m?<)?????(Q??5?4b?6E???????????J_?#U?????'}????S?????P?B?????N?Nt&?,+?9=??kz at 2??????Z?9	?0?y????<M??]?a??&9??R2?BJ????P????Z???????kuK??\??y?>I2?qb?=?^?9??m'???Bk0?4u?mM)w-????2?????????I??4]???JH1??!???ck{?????r{?F????	Q6W????>
?,???WUW?W?????U??+?(G?j??f?g?>_V?{'?\????U?&?F_???????/C?????}2a?,?
&??%Nm?L??Os?*???Q???
?\4c"kj
lwEl??FkP??&?(???Iu??W?%?.???H?W?eF>$?2??z?Y+3???m????d?:It1???M	???=C??0[?N?????d?_?ZB?e??@?
Gj???#?M@!??	!????1j??iTh?????????_?????0?8?4?|?????.c?N??1??7<???y
csrE?
uw)3????.I?+????V4Y??E?????
wzPX!.E??b%$?-PQ??//V?</+
??_w???C??$??$b??h??<J?X??????#{?{???????A?#?I??V"SI?j(??I?*?????>,?D?F:?P)??.R?*??.f?j&?>.?????KQ%?R\L??????rl?<?????}??@z??o?????;?Dz?u??x"1OV?E?U?k????v?????J?RD??8}R???9y?p<v;,e??M-P?????$?MR?'???\?^t??3????E`??????DM?W?rF?*?????$?S?1????^#&?#?)\???
???}>I? ;????tR1?t?[???E???o)n??H??c?[?&-m???????????L????????????r?>?M????%??{???w??
K??)?Ox???-?????????+4y??|?4???!?[g????????0?S>n?/??t????
B??1???X?]Z???h	x?????8p?g .H=n?????'	?8
??pD_k6A?8~??em??XY?q???(?@
y??;#???OPc?k?F&??E
???b?d?Im????V??L???	"]#?t?/???f%???????j?t????????g???s?????v??zH5?lj
?0???
??L?$t$?h?A?oo?????ktXU?)6rXc?Y???/???C0,???Ru?q???1	n-2rL-?$??????L?
?d&?;?r?G???wJ???l???/??_????_????\???s?V??????}S????z,W???[?=,??N09K=7j'???"????=X?im??;????E??Zy0?'x??
=???d??j:VD?7?_??????;&?8???????P
4??H7

?]?>{?Q9????@v?r?I??\??Eq?4?????l?W?qqK??>cl?Ox????9E??tX?)?D????m%?\[?oE]\?s?p?3??\????v??Q??54??&?
n???4Pj?.?T??+?_
s
(?3f]?_?\wl?\??????????qT?
&???hT?)L?q?3m6
;?P'qpf??????Z????.4???X??Wg?Oey?]P??
q?@.?0n?
sA??a~u-F?m?>(aj??P?u6Nh?wC?0??6????\1??_?_?v??N??	??Ji=p+?v???Y3?EdY???].?v<?/???J-?NT?71c?:r????????^?z?S]??? ?%??UPQ?>?/?x???????E?????g?)?S?#?&-??g6?6?pd\`?h-)O?`?y?h????g.j?.?????t+???????E?7?E???>_????>X{???p-???]~xXk??@{?Z?4?<?U?r?Y?????????3 at e???^x??]`???l|??????V?v+lR????J???6?1z$ewt????s?3?@??f???C?>???h?	????
M?`d
_]????U?!
????a?qE?D??Q ?}'4E???o?I?~???b????????{?~???????i???j?????????????uR?I??
???9"tl??+h?Bx?8?z
E6?????~G?????^??????8?<l?l?n??????f???.+F??1f?7?!??????aj?????c??z?l??Z???C ????[?d??C}@c
?
O7??C?~??L ??2
???j?U???igu??F ????????}????="?~s?YK???:?_??/??;??X`?UK?
?R+?j5??_\?O???r???U??????O???????S???????0dl??A?"??I???$?v+????$?;]Xh
P???
???N?k6??`z2?f6???q?S?cH?]??h?0O?:p??????.?8??
_I??e?:?i\?"??x??k?x}4??|???k??o??r@??!?	?????%?????
e??]??{?.(??(?rY?KG	???`9??A?^????n?o?
?5?????fcs{????
??(?
T?ps??0??F????
?G<2???
v?;?G???^???????????m??{X????H1>*/z{9??I????H??/?u?<?7??
?a?q0j`c#???l??n?A?v?lT???=?k??}???c?F=?x?<O?H'?????Lz]??hv??$????@J????dgt???z?????E???Y?A?}?*?9?J=P+uq?"???p?vx9M#vA??Fm|/??'V?Ai?????Y>???Zr??
?1????<?;??C_M?	??ZmA??????nv?Z?w??92?}?Yy??-?0?`??????[
?a?lY}?w]ab?(?\l???Hu?}Nu*??TMm??l?[??????,???Hu?}~?nX?&c?*??R???-?s?
?X??Ln3_??
k??(???s"?L?????f?M???k?^?1xw??:
??bV??l?@??R?&??6?E?n%)w5?????+@e?*?3???:	}2???f?g?<V???
'j
??$/tUN?{?????19????kOh1???-CE?hm??'Z2'???)ll??'???Y}??\J?bjG!=G1EJXu
d??F??"?M?'?=WIn?Z??aU?#l?NimZ
???i??0t.[/?p?W??+{?1??3p???-????+J??3?b???????d?cI??????5??.3?}f,??p? ,???U?,?HE?(??)???4?????ZT???0?!?>M?????J??k????uU`?v>#??????????
#??;?G?R?B?S?>i?????????W?0?&?:\?A7??W???#??T?????????N???ZK??????????
??
&c?SO??^???????	J*kzX?????j???LV??~q?x???:NF????2.'?tw
/?+????h?=rgS??$??*(?Y?????????V??????,??%L?\{??p?[?????v? ?aq??
?,q??dyDa??? ?????Cwo?e??????7[??b]L:j6??????k?r??u??/??b?A}?q]???Y?y@'???F?92???K?TA{p?"E?]?y 8?8V?-?T??~Q??{?g\?????PG?:??o?????
???vQ?????k??D
?]? ???????&_G?a????]??*b???]=?:h???=*??pa<?^?????sV???vmt??|??x??Z?????+$???FhuM?^?[???VC??eM*?0????"?3
?a
-?h8n)'?5w:?Hl??5?J??
Q??2m??VN???x??v? @R?v?????1W??\cf???|??G??K`V????B?<eE?????<???QO
???7?PB?????x?d??o?`	??n??P?FdWU??F??Ck2?{?!?????<?~mtY??9^
?.??
W?^?d'??nj>-???@2?wP?]e	??
?/?)?.????m?(clP"??g<?9?j????j(?#O?G?|????%??r?{2???N???/:??P?????9????`yO??jq???y?Q
???4?C????|??i????vm?*?[??}ex?OtM?bZ?}???d??]'p9??7?p??!???s?k?De?H
?"s??
???????l?$????Ly`U?Y????H?I^???*?Q?(?G???6??83ES???9P?xh???
?h??g??I??(?3????R???p?7?i??a???AQ??@??????W??'t?E?Y+2*????????k??[T}?>`?F????>?????Rd?2~]???????]R??????b?t???!%
?8;	d@??? F??3????8?!???+???~?mgww?y?????5?+
???gs<Q????`?O7??hV????
????Xyl??
\<????(?"J???!G??T??????g??.????WHG?????U?nx???
&??p??j&??????P???????p! ???S??J??*V?l????5p%<??|???t???????
?????V?W?T?I$3?Z???n??7??jB?k?x?!q????g???u??]??O???????????_?K?/???????_?K?/???????_?K?/???????_?K?/????????????#??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	13 Sep 2007 17:20:30 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	13 Sep 2007 17:20:30 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:28:27 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 13 Sep 2007 13:28:27 -0400
Subject: rpms/mhgui/devel mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131728.l8DHSR8Y010606@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Initial import


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhgui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 16:55:35 -0000	1.1
+++ .cvsignore	13 Sep 2007 17:27:54 -0000	1.2
@@ -0,0 +1 @@
+mhgui-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	13 Sep 2007 17:27:54 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:30:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 13:30:30 -0400
Subject: rpms/qt4/devel .cvsignore, 1.19, 1.20 linguist.desktop, 1.3,
	1.4 qt4.spec, 1.64, 1.65 qtconfig.desktop, 1.4,
	1.5 qtdemo.desktop, 1.3, 1.4 sources, 1.15, 1.16 qtdemo-qt4.png,
	1.1, NONE
Message-ID: <200709131730.l8DHUU9G010770@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735

Modified Files:
	.cvsignore linguist.desktop qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Removed Files:
	qtdemo-qt4.png 
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
- linquist.desktop: use new linguist4 icons
- -devel,-x11: %post/%postun scriptlets (icons, mimetypes)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Aug 2007 11:32:45 -0000	1.19
+++ .cvsignore	13 Sep 2007 17:29:57 -0000	1.20
@@ -1,3 +1,4 @@
 clog
-qt-x11-opensource-src-4.3.0.tar.gz
+hi128-app-qt4-logo.png
+hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.3.1.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linguist.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ linguist.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist
+Icon=linguist4
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qt4.spec	13 Sep 2007 15:23:13 -0000	1.64
+++ qt4.spec	13 Sep 2007 17:29:57 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -22,7 +22,7 @@
 Source1: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390 s390x sparc64 sparc
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
@@ -43,7 +43,9 @@
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
 
-Source30: qtdemo-qt4.png
+# upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
+Source30: hi128-app-qt4-logo.png
+Source31: hi48-app-qt4-logo.png
 
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
@@ -144,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-#Requires: glib2-devel
 Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
@@ -417,10 +418,17 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
-# qtdemo/qtconfig icons
-install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
-install -p -m644 -D tools/qtconfig/images/appicon.png \
-                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+# qt4-logo (generic) icons
+install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
+install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+# linguist icons
+for icon in tools/linguist/images/icons/linguist-*-32.png ; do
+  size=$(echo $(basename ${icon}) | cut -d- -f2)
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+done
+# qtconfig icon (it's 50x50 actually, it's pretty generic as-is anyway, use qt4-logo instead -- Rex )
+#install -p -m644 -D tools/qtconfig/images/appicon.png \
+#                    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qtconfig4.png
 
 # Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
@@ -469,6 +477,24 @@
 
 %postun -p /sbin/ldconfig
 
+%post devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun devel
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%post x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun x11
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
@@ -517,7 +543,7 @@
 %{_qt4_bindir}/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/qtconfig-qt4.png
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -564,6 +590,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
+%{_datadir}/icons/hicolor/*/apps/linquist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -580,7 +607,6 @@
 %{_qt4_bindir}/qt*demo*
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/qtdemo-qt4.png
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -608,6 +634,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
+- include qt4-logo icon, used by qtdemo/qtconfig (#241452)
+- linquist.desktop: use new linguist4 icons
+- -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)
+
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4
 - fixed bz241452, add qtdemo/qtconfig icons
 - fixed bz249242, designer4 - segmentation fault on s390x


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtconfig.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtconfig.desktop	14 Jun 2007 20:41:02 -0000	1.4
+++ qtconfig.desktop	13 Sep 2007 17:29:57 -0000	1.5
@@ -2,6 +2,7 @@
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
 Exec=qtconfig-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qtdemo.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtdemo.desktop	14 Jun 2007 20:41:02 -0000	1.3
+++ qtdemo.desktop	13 Sep 2007 17:29:57 -0000	1.4
@@ -2,6 +2,7 @@
 Name=Qt4 Demo 
 Comment=Show Qt4 demos and programming examples
 Exec=qtdemo-qt4
+Icon=qt4-logo
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Aug 2007 11:32:45 -0000	1.15
+++ sources	13 Sep 2007 17:29:57 -0000	1.16
@@ -1 +1,3 @@
+d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 ec255dcc2b30f5efe0ded85ae8a75e13  qt-x11-opensource-src-4.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 17:39:31 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 13:39:31 -0400
Subject: rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.6,
	1.7 initscripts.spec, 1.149, 1.150
Message-ID: <200709131739.l8DHdVd0011051@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11022

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- fix crasher bug in olpc-dm


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- initscripts-8.54.1-olpc.patch	11 Sep 2007 22:35:50 -0000	1.6
+++ initscripts-8.54.1-olpc.patch	13 Sep 2007 17:38:58 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-11 18:33:31.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-11 18:33:31.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,8 +43,8 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-09-11 11:59:20.755757520 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-09-11 18:29:19.000000000 -0400
+--- /dev/null	2007-09-13 09:21:47.113128415 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-13 13:29:21.000000000 -0400
 @@ -0,0 +1,568 @@
 +#include <unistd.h>
 +#include <stdio.h>
@@ -274,7 +274,7 @@
 +   *     seteuid 0, setuid olpc -> start X -> start pam session -> fork ->
 +   *     seteuid olpc -> start clients
 +   */ 
-+  ttyn = "/dev/tty2";
++  tty_name = "tty2";
 +  tty_number = "2";
 +
 +  /* set pgid to pid */
@@ -616,7 +616,7 @@
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-09-11 18:23:52.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-11 18:33:31.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- initscripts.spec	11 Sep 2007 22:35:50 -0000	1.149
+++ initscripts.spec	13 Sep 2007 17:38:58 -0000	1.150
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 Source: initscripts-%{version}.tar.bz2
 Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
@@ -207,6 +207,9 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Thu Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-7
+- fix crasher bug in olpc-dm
+
 * Tue Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-6
 - clean up olpc-dm
 - make sure olpc-dm sources /etc/sysconfig/i18n



From fedora-extras-commits at redhat.com  Thu Sep 13 17:42:20 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 13 Sep 2007 13:42:20 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn-unpackwebcore.patch, NONE,
	1.1 eclipse-mylyn-webcorejar.patch, NONE, 1.1 eclipse-mylyn.spec,
	1.4, 1.5
Message-ID: <200709131742.l8DHgKiF011193@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11164

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-unpackwebcore.patch 
	eclipse-mylyn-webcorejar.patch 
Log Message:
* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
- Make web.core its own jar.
- Unpack web.core so we can symlink to dependencies.
- Symlink to dependencies of web.core.
- Remove rome jar and exports from web.core.
- BR/R all the versions of dependencies that have OSGi manifests.

eclipse-mylyn-unpackwebcore.patch:

--- NEW FILE eclipse-mylyn-unpackwebcore.patch ---
diff -ur org.eclipse.mylyn-feature/feature.xml org.eclipse.mylyn-feature/feature.xml
--- org.eclipse.mylyn-feature/feature.xml	2007-09-05 17:37:56.000000000 -0400
+++ org.eclipse.mylyn-feature/feature.xml	2007-09-05 17:38:05.000000000 -0400
@@ -299,7 +299,7 @@
          download-size="0"
          install-size="0"
          version="2.0.0.v20070627-1400"
-         unpack="false"/>
+         unpack="true"/>
 
 
 </feature>

eclipse-mylyn-webcorejar.patch:

--- NEW FILE eclipse-mylyn-webcorejar.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.web.core
Index: .classpath
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/.classpath,v
retrieving revision 1.2
diff -u -r1.2 .classpath
--- .classpath	9 Jun 2007 02:10:30 -0000	1.2
+++ .classpath	7 Sep 2007 16:07:52 -0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="mylyn-webcore.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-httpclient-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-codec-1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-logging-1.0.4.jar"/>
@@ -8,7 +9,6 @@
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-client-3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-common-3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/ws-commons-util-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib-rome/rome-0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib-rome/jdom-1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Index: build.properties
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/build.properties,v
retrieving revision 1.3
diff -u -r1.3 build.properties
--- build.properties	26 Jun 2007 01:16:25 -0000	1.3
+++ build.properties	7 Sep 2007 16:07:52 -0000
@@ -5,10 +5,10 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
-source.. = src/
-output.. = bin/
+source.mylyn-webcore.jar = src/
+output.mylyn-webcore.jar = bin/
 bin.includes = META-INF/,\
-               .,\
+               mylyn-webcore.jar,\
                lib-xmlrpc/,\
                lib-rome/,\
                lib-httpclient/,\
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/META-INF/MANIFEST.MF,v
retrieving revision 1.18
diff -u -r1.18 MANIFEST.MF
--- META-INF/MANIFEST.MF	28 Jun 2007 18:19:07 -0000	1.18
+++ META-INF/MANIFEST.MF	7 Sep 2007 16:07:53 -0000
@@ -8,7 +8,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.net
-Bundle-ClassPath: .,
+Bundle-ClassPath: mylyn-webcore.jar,
  lib-httpclient/commons-httpclient-3.0.1.jar,
  lib-httpclient/commons-codec-1.3.jar,
  lib-httpclient/commons-logging-1.0.4.jar,
@@ -16,21 +16,8 @@
  lib-xmlrpc/xmlrpc-client-3.0.jar,
  lib-xmlrpc/xmlrpc-common-3.0.jar,
  lib-xmlrpc/ws-commons-util-1.0.1.jar,
- lib-rome/rome-0.8.jar,
  lib-rome/jdom-1.0.jar
 Export-Package: .,
- com.sun.syndication,
- com.sun.syndication.feed,
- com.sun.syndication.feed.atom,
- com.sun.syndication.feed.impl,
- com.sun.syndication.feed.module,
- com.sun.syndication.feed.module.impl,
- com.sun.syndication.feed.rss,
- com.sun.syndication.feed.sse,
- com.sun.syndication.feed.synd,
- com.sun.syndication.feed.synd.impl,
- com.sun.syndication.io,
- com.sun.syndication.io.impl,
  org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.commons.codec.digest,



Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-mylyn.spec	24 Aug 2007 16:06:46 -0000	1.4
+++ eclipse-mylyn.spec	13 Sep 2007 17:41:47 -0000	1.5
@@ -1,10 +1,10 @@
-%define gcj_support         1
+%define gcj_support         0
 %define eclipse_base        %{_datadir}/eclipse
 
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -21,6 +21,9 @@
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
 Patch3: eclipse-mylar-createSocketworkaround.patch
+# So we can symlink to dependencies
+Patch4: %{name}-unpackwebcore.patch
+Patch5: %{name}-webcorejar.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,20 +42,20 @@
 
 BuildRequires: eclipse-pde >= 3.2.1
 BuildRequires: eclipse-cvs-client >= 3.2.1
-BuildRequires: jakarta-commons-codec
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-codec >= 1.3-8jpp.2
+BuildRequires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 BuildRequires: jakarta-commons-logging
-BuildRequires: ws-commons-util
-BuildRequires: xmlrpc3-client
-BuildRequires: xmlrpc3-common
+BuildRequires: ws-commons-util >= 1.0.1-5
+BuildRequires: xmlrpc3-client >= 3.0-1jpp.3
+BuildRequires: xmlrpc3-common >= 3.0-1jpp.3
 Requires: eclipse-platform >= 3.2.1
 Requires: eclipse-cvs-client >= 3.2.1
-Requires: jakarta-commons-codec
-Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-codec >= 1.3-8jpp.2
+Requires: jakarta-commons-httpclient >= 1:3.0.1-1jpp.2
 Requires: jakarta-commons-logging
-Requires: ws-commons-util
-Requires: xmlrpc3-client
-Requires: xmlrpc3-common
+Requires: ws-commons-util >= 1.0.1-2
+Requires: xmlrpc3-client >= 3.0-1jpp.3
+Requires: xmlrpc3-common >= 3.0-1jpp.3
 Provides: eclipse-mylar = 2.0.0-1.fc7
 Obsoletes: eclipse-mylar < 2.0.0
 
@@ -128,8 +131,12 @@
 # GCJ issue
 pushd org.eclipse.mylyn.web.core
 %patch3 -p0
+%patch5
 popd
 
+# So we can symlink to dependencies
+%patch4
+
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 mkdir home
 
@@ -138,8 +145,8 @@
 rm commons-*.jar
 ln -s %{_javadir}/commons-codec-1.3.jar
 ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.0.1.jar
-ln -s %{_javadir}/commons-logging-api.jar
-ln -s %{_javadir}/commons-logging.jar
+ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
+ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
 popd
 pushd org.eclipse.mylyn.web.core/lib-xmlrpc
 rm ws-commons-*.jar
@@ -148,6 +155,10 @@
 ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar
 popd
+pushd org.eclipse.mylyn.web.core/lib-rome
+rm *.jar
+ln -s %{_javadir}/jdom-1.0.jar
+popd
 
 #sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
@@ -297,6 +308,26 @@
 unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
  build/rpmBuild/org.eclipse.mylyn.pde_feature.zip
 
+# symlink
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-httpclient
+rm commons-*.jar
+ln -s %{_javadir}/commons-codec-1.3.jar
+ln -s %{_javadir}/commons-httpclient.jar commons-httpclient-3.0.1.jar
+ln -s %{_javadir}/commons-logging-api.jar commons-logging-api-1.0.4.jar
+ln -s %{_javadir}/commons-logging.jar commons-logging-1.0.4.jar
+popd
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-xmlrpc
+rm ws-commons-*.jar
+rm xmlrpc*.jar
+ln -s %{_javadir}/xmlrpc3-client-3.0.jar xmlrpc-client-3.0.jar
+ln -s %{_javadir}/xmlrpc3-common-3.0.jar xmlrpc-common-3.0.jar
+ln -s %{_javadir}/ws-commons-util-1.0.1.jar
+popd
+pushd $RPM_BUILD_ROOT%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*/lib-rome
+rm *.jar
+ln -s %{_javadir}/jdom-1.0.jar
+popd
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -385,7 +416,7 @@
 %files
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.mylyn.help.ui_*.jar
-%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*.jar
+%{eclipse_base}/plugins/org.eclipse.mylyn.web.core_*
 %{eclipse_base}/plugins/org.eclipse.mylyn.context.core_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.tasks.ui_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.tasks.core_*.jar
@@ -416,6 +447,13 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
+- Make web.core its own jar.
+- Unpack web.core so we can symlink to dependencies.
+- Symlink to dependencies of web.core.
+- Remove rome jar and exports from web.core.
+- BR/R all the versions of dependencies that have OSGi manifests.
+
 * Fri Aug 24 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-4
 - ExcludeArch ppc64 (no xmlrpc3 on ppc64 due to rh#239123).
 



From fedora-extras-commits at redhat.com  Thu Sep 13 17:42:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 13 Sep 2007 13:42:27 -0400
Subject: rpms/gnome-panel/devel desktop-file-monitoring.patch, 1.1,
	1.2 gnome-panel.spec, 1.217, 1.218 launcher-desktop-files.patch,
	1.1, 1.2 redhat-panel-default-setup.entries, 1.14, 1.15
Message-ID: <200709131742.l8DHgRqD011259@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11191

Modified Files:
	desktop-file-monitoring.patch gnome-panel.spec 
	launcher-desktop-files.patch 
	redhat-panel-default-setup.entries 
Log Message:
fix a mem leak
update default configuration


desktop-file-monitoring.patch:

Index: desktop-file-monitoring.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/desktop-file-monitoring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop-file-monitoring.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ desktop-file-monitoring.patch	13 Sep 2007 17:42:24 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.h
 --- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-05 23:24:37.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-13 12:23:44.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include "applet.h"
@@ -20,7 +20,7 @@
  void panel_launcher_create           (PanelToplevel *toplevel,
 diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h
 --- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-05 23:24:37.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-13 12:23:44.000000000 -0400
 @@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
  				 const char       *uri);
  
@@ -32,8 +32,8 @@
  					 PanelDitemSaveUri  save_uri,
 diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.c
 --- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-06 00:33:52.000000000 -0400
-@@ -285,6 +287,8 @@ static void
++++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-13 12:23:44.000000000 -0400
+@@ -285,6 +285,8 @@ static void
  destroy_launcher (GtkWidget *widget,
  		  Launcher  *launcher)
  {
@@ -42,7 +42,7 @@
  	launcher_properties_destroy (launcher);
  	launcher_widget_destroy_open_dialogs (launcher);
  }
-@@ -458,6 +462,37 @@ drag_data_get_cb (GtkWidget        *widg
+@@ -458,6 +460,37 @@ drag_data_get_cb (GtkWidget        *widg
  
  }
  
@@ -80,7 +80,7 @@
  static Launcher *
  create_launcher (const char *location)
  {
-@@ -534,6 +569,25 @@ create_launcher (const char *location)
+@@ -534,6 +567,25 @@ create_launcher (const char *location)
  	launcher->key_file = key_file;
  	launcher->prop_dialog = NULL;
  	launcher->destroy_handler = 0;
@@ -106,7 +106,7 @@
  
  	/* Icon will be setup later */
  	launcher->button = button_widget_new (NULL /* icon */,
-@@ -662,6 +716,15 @@ static void
+@@ -662,6 +714,15 @@ static void
  launcher_changed (PanelDItemEditor *dialog,
  		  Launcher         *launcher)
  {
@@ -122,7 +122,7 @@
  	/* Setup the button look */
  	setup_button (launcher);
  }
-@@ -733,6 +796,43 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -733,6 +794,43 @@ launcher_save_uri (PanelDItemEditor *dia
  	return NULL;
  }
  
@@ -166,7 +166,7 @@
  static void
  launcher_saved (GtkWidget *dialog,
  		Launcher  *launcher)
-@@ -740,11 +840,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -740,11 +838,15 @@ launcher_saved (GtkWidget *dialog,
  	const char  *uri;
  	GConfClient *client;
  	const char  *key;
@@ -182,7 +182,7 @@
  	if (uri && launcher->location && strcmp (uri, launcher->location)) {
  		client = panel_gconf_get_client ();
  
-@@ -757,6 +861,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -757,6 +859,9 @@ launcher_saved (GtkWidget *dialog,
  		if (launcher->location)
  			g_free (launcher->location);
  		launcher->location = g_strdup (uri);
@@ -192,7 +192,7 @@
  	}
  }
  
-@@ -923,6 +1030,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -923,6 +1028,7 @@ launcher_new_saved (GtkWidget *dialog,
  	PanelWidget *panel;
  	int          pos;
  	const char  *uri;
@@ -200,7 +200,7 @@
  
  	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
  	panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -930,6 +1038,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -930,6 +1036,10 @@ launcher_new_saved (GtkWidget *dialog,
  	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
  	if (panel_launcher_get_filename (uri) != NULL)
  		uri = panel_launcher_get_filename (uri);
@@ -212,8 +212,8 @@
  }
  
 diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-05 23:24:37.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-05 23:24:37.000000000 -0400
+--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-13 12:23:44.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-13 12:31:03.000000000 -0400
 @@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
  
  	/* the directory of the theme for the icon, see bug #119208 */
@@ -248,21 +248,29 @@
  	dialog->priv->dirty = TRUE;
  	g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
  }
-@@ -1003,6 +1016,13 @@ update_editor_from_desktop_file (PanelDI
+@@ -1005,6 +1018,13 @@ update_editor_from_desktop_file (PanelDI
  		 */ 
  		setup_icon_entry (dialog, icon);
  
-+		/* We set the orig_desktop_file field to let the
-+		 * launcher know that the editor contents are coming
-+		 * directly from a desktop file.
-+		 */ 
-+		g_free (dialog->priv->orig_desktop_file);
-+		dialog->priv->orig_desktop_file = g_strdup (uri);
-+
- 		return TRUE;    
++                /* We set the orig_desktop_file field to let the
++                 * launcher know that the editor contents are coming
++                 * directly from a desktop file.
++                 */ 
++                g_free (dialog->priv->orig_desktop_file);
++                dialog->priv->orig_desktop_file = g_strdup (uri);
++
+ 		g_free (name);
+ 		g_free (comment);
+ 		g_free (icon);
+@@ -1079,6 +1099,7 @@ update_chooser_for_type (PanelDItemEdito
+ 		g_assert_not_reached ();
  	}
  
-@@ -1826,3 +1846,12 @@ panel_ditem_register_save_uri_func (Pane
++
+ 	chooser = dialog->priv->command_browse_filechooser;
+ 
+ 	gtk_window_set_title (GTK_WINDOW (chooser),
+@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane
  	dialog->priv->save_uri = save_uri;
  	dialog->priv->save_uri_data = data;
  }


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- gnome-panel.spec	10 Sep 2007 17:26:32 -0000	1.217
+++ gnome-panel.spec	13 Sep 2007 17:42:24 -0000	1.218
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -311,6 +311,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-4
+- Fix some memleaks
+- Remove OpenOffice launchers from the default configuration
+- Add Tomboy to the default configuration
+
 * Mon Sep 10 2007 Ray Strode <rstrode at redhat.com> - 2.19.92-3
 - create ~/.local/share/applications before writing out 
   preferred app launchers

launcher-desktop-files.patch:

Index: launcher-desktop-files.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/launcher-desktop-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- launcher-desktop-files.patch	6 Sep 2007 16:59:35 -0000	1.1
+++ launcher-desktop-files.patch	13 Sep 2007 17:42:24 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c.launcher-desktop-file	2007-08-28 00:20:51.000000000 -0400
-+++ gnome-panel-2.19.6/gnome-panel/panel-ditem-editor.c	2007-08-28 00:20:57.000000000 -0400
-@@ -973,6 +973,42 @@ panel_ditem_editor_icon_changed (PanelDI
+diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
+--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files	2007-09-04 13:34:26.000000000 -0400
++++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-13 12:13:36.000000000 -0400
+@@ -973,6 +973,51 @@ panel_ditem_editor_icon_changed (PanelDI
  	g_free (file);
  }
  
@@ -14,6 +14,7 @@
 +	char *comment;
 +	char *exec;
 +	char *icon;
++	gboolean retval = FALSE;
 +
 +	key_file = g_key_file_new ();
 +	if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
@@ -27,24 +28,32 @@
 +		icon = panel_util_key_file_get_locale_string (key_file, "Icon");
 +		exec = panel_util_key_file_get_string (key_file, "Exec");
 +
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");            
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");           
-+		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");         
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");
++		gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");
++
 +		/* Note: we need to set the icon last, since the editor
 +		 * tries to guess the icon when the command is modified
 +		 */ 
 +		setup_icon_entry (dialog, icon);
 +
-+		return TRUE;    
++		g_free (name);
++		g_free (comment);
++		g_free (icon);
++		g_free (exec);
++
++		retval = TRUE;    
 +	}
 +
-+	return FALSE;
++	g_key_file_free (key_file);
++
++	return retval;
 +}
 +
  static void
  command_browse_chooser_response (GtkFileChooser   *chooser,
  				 gint              response_id,
-@@ -986,7 +1022,11 @@ command_browse_chooser_response (GtkFile
+@@ -986,7 +1031,11 @@ command_browse_chooser_response (GtkFile
  		case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
  		case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
  			text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
@@ -57,7 +66,7 @@
  			g_free (text);
  			break;
  		case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -996,8 +1036,9 @@ command_browse_chooser_response (GtkFile
+@@ -996,8 +1045,9 @@ command_browse_chooser_response (GtkFile
  			g_assert_not_reached ();
  		}
  


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- redhat-panel-default-setup.entries	6 Sep 2007 16:58:07 -0000	1.14
+++ redhat-panel-default-setup.entries	13 Sep 2007 17:42:24 -0000	1.15
@@ -35,15 +35,6 @@
           <value>
             <string>email_launcher</string>
           </value>
-          <value>
-            <string>wordprocessor_launcher</string>
-          </value>
-          <value>
-            <string>presentation_launcher</string>
-          </value>
-          <value>
-            <string>spreadsheet_launcher</string>
-          </value>
         </list>
       </value>
     </entry>
@@ -56,6 +47,9 @@
       <value>
         <list type="string">
           <value>
+            <string>tomboy</string>
+          </value>
+          <value>
             <string>mixer</string>
           </value>
           <value>
@@ -343,167 +337,59 @@
     <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Wordprocessor Launcher -->
+  <!-- Tomboy -->
 
     <entry>
-      <key>objects/wordprocessor_launcher/object_type</key>
+      <key>applets/tomboy/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
-        <string>launcher-object</string>
+        <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/toplevel_id</key>
+      <key>applets/tomboy/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/position</key>
+      <key>applets/tomboy/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>3</int>
       </value>
     </entry>
     <entry>
-      <key>objects/wordprocessor_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/wordprocessor_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/wordprocessor_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>/usr/share/applications/openoffice.org-1.9-writer.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/wordprocessor_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/wordprocessor_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/wordprocessor_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Presentation Launcher -->
-
-    <entry>
-      <key>objects/presentation_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>4</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/panel_right_stick</key>
+      <key>applets/tomboy/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/presentation_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>/usr/share/applications/openoffice.org-1.9-impress.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/presentation_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/presentation_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/presentation_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/presentation_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/presentation_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/presentation_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/presentation_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/presentation_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Spreadsheet Launcher -->
-
-    <entry>
-      <key>objects/spreadsheet_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>5</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/spreadsheet_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>objects/spreadsheet_launcher/locked</key>
+      <key>applets/tomboy/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>objects/spreadsheet_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+      <key>applets/tomboy/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>/usr/share/applications/openoffice.org-1.9-calc.desktop</string>
+        <string>OAFIID:TomboyApplet</string>
       </value>
     </entry>
 
-    <entry><key>objects/spreadsheet_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/spreadsheet_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/spreadsheet_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/tomboy/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/tomboy/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/tomboy/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/tomboy/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/tomboy/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/tomboy/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/tomboy/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/tomboy/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Mixer Applet -->
 



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:04 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:04 -0700
Subject: [pkgdb] createrepo: skvidal has requested watchbugzilla
Message-ID: <200709131754.l8DHs47W011685@app4.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the watchbugzilla acl on createrepo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:06 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:06 -0700
Subject: [pkgdb] createrepo: skvidal has requested watchcommits
Message-ID: <200709131754.l8DHs6Rr011694@app4.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the watchcommits acl on createrepo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:11 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:11 -0700
Subject: [pkgdb] createrepo: skvidal has requested commit
Message-ID: <200709131754.l8DHsBDS017068@app3.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the commit acl on createrepo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 17:54:13 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 13 Sep 2007 10:54:13 -0700
Subject: [pkgdb] createrepo: skvidal has requested approveacls
Message-ID: <200709131754.l8DHsD4Z017077@app3.fedora.phx.redhat.com>

Seth Vidal (skvidal) has requested the approveacls acl on createrepo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 18:05:38 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 13 Sep 2007 14:05:38 -0400
Subject: rpms/suck/F-7 README.Fedora, 1.2, 1.3 suck-4.3.2-samples.patch, 1.1,
	1.2 suck.spec, 1.12, 1.13
Message-ID: <200709131805.l8DI5c3N017858@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17763

Modified Files:
	README.Fedora suck-4.3.2-samples.patch suck.spec 
Log Message:
Allow usage of alternative sites


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.Fedora	2 Sep 2007 19:30:36 -0000	1.2
+++ README.Fedora	13 Sep 2007 18:05:03 -0000	1.3
@@ -64,6 +64,9 @@
 
 NNTP_PASS	Password for NNTP authorization (if required)
 
+NNTP_POST       yes = Posting articles to remote host (Default)
+                no  = Don't post articles to remote host
+
 Creating Newsgroups
 
 Befor you can fetch news from the remote newsserver, you have to create
@@ -125,3 +128,27 @@
 If you have posted any article in a newsgroup, you can run getnews as
 described above to transfer the new articles to the newsserver of your 
 provider.
+
+Use of alternative sites
+
+If you want to use an alternative sites, you can create a configuration
+file for each site on the directory:
+
+/etc/news/suck.d/
+
+You can use a random file name for each configuration file.
+
+The content of this file is similar of the site file in
+
+/etc/sysconfig/suck/site
+
+if you want to exchange news to an alternative site, you can call
+getnews as:
+
+getnews <filename>
+
+in this case /etc/news/suck.d/<filename> will be used instead of
+/etc/sysconfig/suck/site.
+
+If you are using several site, please avoid posting articles received
+from one site to anonther site.
\ No newline at end of file

suck-4.3.2-samples.patch:

Index: suck-4.3.2-samples.patch
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck-4.3.2-samples.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- suck-4.3.2-samples.patch	8 Nov 2004 05:23:08 -0000	1.1
+++ suck-4.3.2-samples.patch	13 Sep 2007 18:05:03 -0000	1.2
@@ -1,30 +1,6 @@
---- suck-4.3.2/sample/get.news.generic.bak	1999-02-20 00:32:57.000000000 +0100
-+++ suck-4.3.2/sample/get.news.generic	2004-03-25 19:15:48.437267328 +0100
-@@ -9,16 +9,18 @@
- REMOTE_HOST=news.pixi.com
- LOCAL_HOST=localhost
- 
--SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
--NEWSDIR=/usr/lib/news			# base directory for news binaries 
--BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
-+NEWSDIR=/var/lib/news			# base directory for news binaries 
-+BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
- 
- SHLOCK=${NEWSDIR}/bin/shlock
- 
- TMPDIR=${BASEDIR}			# location for suck.* files
- MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
- 
--OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
-+SITE=pixie
-+
-+OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
- SCRIPT=${BASEDIR}/put.news		# my filter for rpost
- OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
- LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
---- suck-4.3.2/sample/get.news.inn.bak	1997-09-27 09:29:59.000000000 +0200
-+++ suck-4.3.2/sample/get.news.inn	2004-03-25 19:16:26.430491480 +0100
+diff -up suck-4.3.2/sample/get.news.inn.samp suck-4.3.2/sample/get.news.inn
+--- suck-4.3.2/sample/get.news.inn.samp	1997-09-27 09:29:59.000000000 +0200
++++ suck-4.3.2/sample/get.news.inn	2007-09-10 17:43:34.000000000 +0200
 @@ -5,12 +5,11 @@
  #NOTE: this script probably needs to be run by root.  Most systems will
  # not let a normal user run ctlinnd 
@@ -40,7 +16,7 @@
  
  CTLINND=${NEWSDIR}/bin/ctlinnd		# location of binary
  SHLOCK=${NEWSDIR}/bin/shlock		# location of binary
-@@ -18,12 +17,7 @@
+@@ -18,12 +17,7 @@ SHLOCK=${NEWSDIR}/bin/shlock		# location
  TMPDIR=${BASEDIR}			# location for suck.* files
  MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile messages when getting them
  
@@ -54,16 +30,25 @@
  OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
  LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
  NEWSGROUP=news				# which group owns the file in out.going, typically either news or uucp.
-@@ -32,6 +26,8 @@
+@@ -32,6 +26,17 @@ TESTHOST=testhost
  RPOST=rpost
  SUCK=suck
  
-+CONFIG=/etc/sysconfig/suck/site
++if [ $# -gt 1 ]; then
++  echo "Usage: getnew [<sitename>]"
++  exit
++fi
++
++if [ -n "$1" ]; then
++  CONFIG=/etc/news/suck.d/$1
++else
++  CONFIG=/etc/sysconfig/suck/site
++fi
 +
  # if we are already running, abort 
  
  trap 'rm -f ${LOCKFILE} ; echo "Aborting" ; exit 1' 1 2 3 15
-@@ -41,18 +37,46 @@
+@@ -41,18 +46,55 @@ if [ $? -ne 0 ]; then
  	exit
  fi
  
@@ -86,7 +71,16 @@
 +
 +if [ -n "$NNTP_USER" -a -n "$NNTP_PASS" ]; then
 +    AUTHINFO="-u -Q"
-+fi;
++fi
++
++if [ -z $POST ]; then
++  POST="yes"
++fi
++
++if [ $POST != "yes" -a $POST != "no" ]; then
++  echo "Invalid value for post"
++  exit
++fi
 +
 +export NNTP_USER
 +export NNTP_PASS
@@ -112,16 +106,22 @@
  	SUCK_STATUS=$?
  
  	if [ ${SUCK_STATUS} -eq 0 ]; then
-@@ -70,7 +94,7 @@
+@@ -68,9 +110,12 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 	fi
+ 
  	# now upload messages
- 	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
+-	if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
  
 -		${TESTHOST} ${REMOTE_HOST} -s
++	if [ $POST = "yes" ]; then
++
++	    if [ -s ${OUTGOING}  -o -s ${OUTGOINGNEW} ]; then
++
 +		${TESTHOST} ${NNTP_HOST} -s
  
  		if [ $? -ne 0 ]; then
  			echo "Remote posting host not responding"
-@@ -93,12 +117,11 @@
+@@ -93,12 +138,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
  			fi
  
  			# outgoing messages to post
@@ -135,8 +135,22 @@
  			elif [ ${ERRLEV} -eq 1 ]; then
  				echo "Error posting a message"
  			elif [ ${ERRLEV} -eq 2 ]; then
---- suck-4.3.2/sample/put.news.sm.bak	2002-06-04 15:20:16.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm	2004-03-25 19:15:48.439267024 +0100
+@@ -115,8 +159,11 @@ if [ ${REMOTE_RESULT} -eq 0 -a ${LOCAL_R
+ 				chmod 664 ${OUTGOINGNEW}
+ 			fi
+ 		fi
+-	fi	
+ 	
++	    fi	
++	
++	fi
++
+ 	echo "You can hang up the modem now"
+ 
+ fi
+diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
+--- suck-4.3.2/sample/put.news.sm.samp	2002-06-04 15:20:16.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm	2007-09-10 17:40:27.000000000 +0200
 @@ -10,15 +10,18 @@
  # this to somewhere normal users can read or write.
  
@@ -159,20 +173,36 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
---- suck-4.3.2/sample/put.news.sm.pl.bak	2002-06-04 15:20:43.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm.pl	2004-03-25 19:15:48.439267024 +0100
-@@ -26,7 +26,7 @@
- 	# rpost will then handle the error
- 	# We do this since rpost can't differentiate between
- 	# a missing file or a script file
--	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
-+	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
- #	open IFP, "<${infile}" or die "Can't read ${infile}";
- 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
+--- suck-4.3.2/sample/get.news.generic.samp	1999-02-20 00:32:57.000000000 +0100
++++ suck-4.3.2/sample/get.news.generic	2007-09-10 17:40:27.000000000 +0200
+@@ -9,16 +9,18 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
+ 
+-SPOOLDIR=/usr/spool/news		# base directory for articles to be rposted
+-NEWSDIR=/usr/lib/news			# base directory for news binaries 
+-BASEDIR=/home/boby/doNews		# base directory for suck rpost and scripts
++SPOOLDIR=/var/spool/news		# base directory for articles to be rposted
++NEWSDIR=/var/lib/news			# base directory for news binaries 
++BASEDIR=/var/lib/news/suck		# base directory for suck rpost and scripts
+ 
+ SHLOCK=${NEWSDIR}/bin/shlock
  
---- suck-4.3.2/sample/put.news.bak	1998-10-04 21:32:26.000000000 +0200
-+++ suck-4.3.2/sample/put.news	2004-03-25 19:15:48.440266872 +0100
-@@ -14,14 +14,17 @@
+ TMPDIR=${BASEDIR}			# location for suck.* files
+ MSGDIR=${BASEDIR}/Msgs			# where to put MultiFile articles when getting them
+ 
+-OUTGOING=${SPOOLDIR}/out.going/pixi	# location of the list of articles to upload
++SITE=pixie
++
++OUTGOING=${SPOOLDIR}/outgoing/${SITE}	# location of the list of articles to upload
+ SCRIPT=${BASEDIR}/put.news		# my filter for rpost
+ OUTFILE=/tmp/tmp$$			# used by rpost as article after it is filtered
+ LOCKFILE=${BASEDIR}/getnews.lock	# lock file to prevent multiple instances of script
+diff -up suck-4.3.2/sample/put.news.samp suck-4.3.2/sample/put.news
+--- suck-4.3.2/sample/put.news.samp	1998-10-04 21:32:26.000000000 +0200
++++ suck-4.3.2/sample/put.news	2007-09-10 17:40:27.000000000 +0200
+@@ -14,14 +14,17 @@ if [ $# -ne 2 ]; then
  	exit -1
  fi
  
@@ -192,3 +222,15 @@
  		
  	if [ $? -ne 0 ]; then
  		echo "Error"
+diff -up suck-4.3.2/sample/put.news.sm.pl.samp suck-4.3.2/sample/put.news.sm.pl
+--- suck-4.3.2/sample/put.news.sm.pl.samp	2002-06-04 15:20:43.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm.pl	2007-09-10 17:40:27.000000000 +0200
+@@ -26,7 +26,7 @@ sub perl_rpost {
+ 	# rpost will then handle the error
+ 	# We do this since rpost can't differentiate between
+ 	# a missing file or a script file
+-	open IFP, "/usr/news/bin/sm $infile |" or return $infile;
++	open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
+ #	open IFP, "<${infile}" or die "Can't read ${infile}";
+ 	open OFP, ">${outfile}" or die "Can't create ${outfile}";
+ 


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/F-7/suck.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- suck.spec	2 Sep 2007 19:34:05 -0000	1.12
+++ suck.spec	13 Sep 2007 18:05:03 -0000	1.13
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 17%{?dist}.1
+Release: 18%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -30,15 +30,15 @@
 %setup -q
 %patch -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .samp
 %patch3 -p1
 %patch4 -p1
 
 cp %{SOURCE3} .
 
 autoconf
-%configure --with-inn-lib=/usr/lib/news/lib \
-           --with-inn-include=/usr/include/inn
+%configure --with-inn-lib=%{_libdir}/news/lib \
+           --with-inn-include=%{_includedir}/inn
 
 %build
 make %{?_smp_mflags}
@@ -51,6 +51,7 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/news/suck.d
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
 
 cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
@@ -82,11 +83,15 @@
 %{_mandir}/man1/testhost.1*
 %{_mandir}/man1/lmove.1*
 
-%dir /etc/sysconfig/suck/
+%dir %{_sysconfdir}/sysconfig/suck/
 %config(noreplace) %{_sysconfdir}/sysconfig/suck/site
+%dir %{_sysconfdir}/news/suck.d/
 
 %changelog
-* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17.1
+* Mon Sep 10 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-18
+- Allow usage of several sites
+
+* Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-17
 - Rework for 64-bit systems (use /usr/lib instead of /usr/lib64)
 
 * Wed Aug 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-16



From fedora-extras-commits at redhat.com  Thu Sep 13 18:15:05 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 13 Sep 2007 14:15:05 -0400
Subject: rpms/Io-language/devel AddonBuilder_io_libdir.patch, NONE,
	1.1 Io-language.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131815.l8DIF50k018274@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Io-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AddonBuilder_io_libdir.patch Io-language.spec 
Log Message:
initial Io-language import


AddonBuilder_io_libdir.patch:

--- NEW FILE AddonBuilder_io_libdir.patch ---
--- Io-2007-04-30/build/AddonBuilder.io.orig	2007-04-28 15:09:52.000000000 +0200
+++ Io-2007-04-30/build/AddonBuilder.io	2007-05-29 23:01:38.000000000 +0200
@@ -58,6 +58,9 @@
 	libSearchPaths := List clone
 	appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v)))
 	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib/mysql"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64/mysql"))
 
 	debs    := Map clone
 	ebuilds := Map clone


--- NEW FILE Io-language.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

%define _version 2007-07-10
 
Name:           Io-language
Version:        20070710
Release:        2%{?dist}
Summary:        Io is a small, prototype-based programming language
Group:          System Environment/Libraries
License:        BSD
URL:            http://www.iolanguage.com/
# TnL uses a more recent snapshot then upstream has made available in snapshot
# form. TnL's version also includes some fixes which stop TnL from crashing.
Source0:        http://tnlgame.net/downloads/tnl/070827/Io-%{_version}.tar.gz
Patch0:         AddonBuilder_io_libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
BuildRequires:  libsamplerate-devel libsndfile-devel libtiff-devel
BuildRequires:  libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
BuildRequires:  portaudio-devel postgresql-devel python-devel  soundtouch-devel
BuildRequires:  sqlite-devel taglib-devel

%description
Io is a small, prototype-based programming language. The ideas in
Io are mostly inspired by Smalltalk (all values are objects), Self
(prototype-based), NewtonScript (differential inheritance), Act1
(actors and futures for concurrency), LISP (code is a runtime
inspectable/modifiable tree) and Lua (small, embeddable).


%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}.


%package graphics-and-sound
Summary:        Io graphics and sound support
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description graphics-and-sound
Io graphics and sound support, this package includes IO bindings needed to
write Io programs which want to display graphics and / or produce sound
(OpenGL, Image loading, PortAudio, etc.).


%package extras
Summary:        Io extra addons
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description extras
This package includes addons for Io which require additional libraries to be
installed. This includes the Python and Socket addons.


%package postgresql
Summary:        Io postgresql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description postgresql
Io postgresql bindings.


%package mysql
Summary:        Io mysql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description mysql
Io mysql bindings


%prep
%setup -q -n Io-%{_version}
%patch0 -p1
sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
# libstdc++.so is searched and not found ...
sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
# for %doc
rm docs/guide_files/.htmle
mv addons/OpenGL/docs OpenGL
iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
sed -i 's/\r//g' license.txt `find OpenGL -type f`


%build
make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.0"'


%install
rm -rf $RPM_BUILD_ROOT
# upstreams make install installs lots of unwanted parts of the addons, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons
mkdir -p $RPM_BUILD_ROOT%{_includedir}
install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
install -m 755 _build/dll/libiovmall.so \
  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.0
ln -s libiovmall.so.0 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
# install the addons
for i in addons/*; do
  # skip unbuild addons
  if [ -d $i/_build ]; then
    ADDON=`basename $i`
    mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -m 755 $i/_build/dll/libIo$ADDON.so \
      $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -p -m 644 $i/depends $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON
    # Io doesn't find the addon if this file isn't present
    touch $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/build.io
  fi
done


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/io
%{_libdir}/libiovmall.so.0
%dir %{_libdir}/io
%dir %{_libdir}/io/addons
%{_libdir}/io/addons/AsyncRequest
%{_libdir}/io/addons/BigNum
%{_libdir}/io/addons/Blowfish
%{_libdir}/io/addons/Box
%{_libdir}/io/addons/CGI
%{_libdir}/io/addons/ContinuedFraction
%{_libdir}/io/addons/Curses
%{_libdir}/io/addons/Flux
%{_libdir}/io/addons/Fnmatch
%{_libdir}/io/addons/LZO
%{_libdir}/io/addons/Libxml2
%{_libdir}/io/addons/Loki
%{_libdir}/io/addons/MD5
%{_libdir}/io/addons/NotificationCenter
%{_libdir}/io/addons/Random
%{_libdir}/io/addons/Range
%{_libdir}/io/addons/Rational
%{_libdir}/io/addons/Regex
%{_libdir}/io/addons/SHA1
%{_libdir}/io/addons/SQLite3
%{_libdir}/io/addons/SqlDatabase
%{_libdir}/io/addons/Syslog
%{_libdir}/io/addons/SystemCall
%{_libdir}/io/addons/Thread
%{_libdir}/io/addons/UUID
%{_libdir}/io/addons/User
%{_libdir}/io/addons/Zlib

%files devel
%defattr(-,root,root,-)
%doc docs/guide.html docs/guide.pdf docs/guide_files
%{_libdir}/libiovmall.so
%{_includedir}/io

%files graphics-and-sound
%defattr(-,root,root,-)
%doc OpenGL
%{_libdir}/io/addons/Font
%{_libdir}/io/addons/Image
%{_libdir}/io/addons/LibSndFile
%{_libdir}/io/addons/OpenGL
%{_libdir}/io/addons/PortAudio
%{_libdir}/io/addons/TagLib

%files extras
%defattr(-,root,root,-)
%{_libdir}/io/addons/Python
%{_libdir}/io/addons/SampleRateConverter
%{_libdir}/io/addons/Socket
%{_libdir}/io/addons/SoundTouch

%files postgresql
%defattr(-,root,root,-)
%{_libdir}/io/addons/Postgre*

%files mysql
%defattr(-,root,root,-)
%{_libdir}/io/addons/MySQL


%changelog
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-1
- Adapted Packman spec file for Fedora

* Sat Sep 08 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.2
- openSUSE-10.3 build, using libode(-devel)

* Sun Jun 03 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.1
- update to 20070528
- added patches for 64bit (thx Detlef)
- switched to portaudio

* Sun May 27 2007 Toni Graffy <toni at links2linux.de> 20070430-0.pm.1
- initial package 20070430


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Io-language/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 17:01:38 -0000	1.1
+++ .cvsignore	13 Sep 2007 18:14:31 -0000	1.2
@@ -0,0 +1 @@
+Io-2007-07-10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Io-language/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 17:01:38 -0000	1.1
+++ sources	13 Sep 2007 18:14:31 -0000	1.2
@@ -0,0 +1 @@
+8101f2fd8963cefedf43e188452d6249  Io-2007-07-10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 18:16:54 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 14:16:54 -0400
Subject: rpms/qt4/devel qt4.spec,1.65,1.66
Message-ID: <200709131816.l8DIGsXB018370@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320

Modified Files:
	qt4.spec 
Log Message:
fix typo, respin



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- qt4.spec	13 Sep 2007 17:29:57 -0000	1.65
+++ qt4.spec	13 Sep 2007 18:16:21 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -422,7 +422,7 @@
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
 # linguist icons
-for icon in tools/linguist/images/icons/linguist-*-32.png ; do
+for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
   install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
 done



From fedora-extras-commits at redhat.com  Thu Sep 13 18:17:46 2007
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 13 Sep 2007 14:17:46 -0400
Subject: rpms/kernel/devel linux-2.6-lirc.patch,1.2,1.3
Message-ID: <200709131817.l8DIHkwb018435@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18414

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
Updated and massively cleaned up lirc patch, eliminates 99% of checkpatch.pl's complaints about the code (most of which is soon to be committed in upstream lirc as well)

linux-2.6-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6-lirc.patch
Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-lirc.patch	27 Aug 2007 22:19:13 -0000	1.2
+++ linux-2.6-lirc.patch	13 Sep 2007 18:17:42 -0000	1.3
@@ -1,22 +1,3 @@
-This patch adds the lirc drivers for assorted infrared and RF receivers
-and transmitters, which when coupled with the lirc daemon and appropriate
-config files, lets you control your linux box via a remote control. Very
-useful stuff for media center boxes...
-
-Upstream
---------
-http://www.lirc.org/
-
-Work-in-progress for upstream
------------------------------
-http://git.wilsonet.com/linux-2.6-lirc.git/
-
-
--- 
-Jarod Wilson
-jwilson at redhat.com
-
-
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 2d87357..61fd0ca 100644
 --- a/drivers/input/Kconfig
@@ -204,10 +185,10 @@
 +obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
 diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c
 new file mode 100644
-index 0000000..8af8da6
+index 0000000..32f46aa
 --- /dev/null
 +++ b/drivers/input/lirc/commandir.c
-@@ -0,0 +1,986 @@
+@@ -0,0 +1,999 @@
 +
 +/*
 + *
@@ -233,7 +214,7 @@
 +#include "commandir.h"
 +
 +#include <linux/kref.h>
-+#include <asm/uaccess.h>
++#include <linux/uaccess.h>
 +
 +#define DRIVER_VERSION "v1.1.2"
 +#define DRIVER_AUTHOR "Evelyn Yeung, InnovationOne"
@@ -244,65 +225,69 @@
 +#define USB_CMDIR_MINOR_BASE	192
 +
 +/* table of devices that work with this driver */
-+static struct usb_device_id cmdir_table [] = 
++static struct usb_device_id cmdir_table [] =
 +{
 +	{ USB_DEVICE(USB_CMDIR_VENDOR_ID, USB_CMDIR_PRODUCT_ID) },
 +	{ }			/* Terminating entry */
 +};
-+MODULE_DEVICE_TABLE (usb, cmdir_table);
++MODULE_DEVICE_TABLE(usb, cmdir_table);
 +
-+static int cmdir_open (struct inode *inode, struct file *file);
-+static int cmdir_probe(struct usb_interface *interface, const struct usb_device_id *id);
++static int cmdir_open(struct inode *inode, struct file *file);
++static int cmdir_probe(struct usb_interface *interface,
++		       const struct usb_device_id *id);
 +static void cmdir_disconnect(struct usb_interface *interface);
-+static int cmdir_release (struct inode *inode, struct file *file);
-+static int cmdir_check (int device_num);
-+static void init_cmdir_var (int device_num);
-+static void reset_cmdir (int device_num);
-+static void update_cmdir_string (int device_num);
-+static void print_cmdir (int device_num);
-+static ssize_t cmdir_file_read (struct file *file, char *buffer, size_t count, loff_t *ppos);
-+ssize_t cmdir_read (unsigned char *buffer, int count);
-+static ssize_t cmdir_file_write (struct file *file, const char *buffer, size_t count, loff_t *ppos);
++static int cmdir_release(struct inode *inode, struct file *file);
++static int cmdir_check(int device_num);
++static void init_cmdir_var(int device_num);
++static void reset_cmdir(int device_num);
++static void update_cmdir_string(int device_num);
++static void print_cmdir(int device_num);
++static ssize_t cmdir_file_read(struct file *file, char *buffer,
++			       size_t count, loff_t *ppos);
++ssize_t cmdir_read(unsigned char *buffer, size_t count);
++static ssize_t cmdir_file_write(struct file *file, const char *buffer,
++				size_t count, loff_t *ppos);
 +int cmdir_write(unsigned char *buffer, int count, void *callback_fct, int u);
-+int write_core(unsigned char *buffer, int count, void *callback_fct, int device_num);
-+static void cmdir_write_bulk_callback(struct urb *urb);
-+int set_tx_channels (unsigned int next_tx);
++int write_core(unsigned char *buffer, int count,
++	       void *callback_fct, int device_num);
++static void cmdir_write_bulk_callback(struct urb *urb, struct pt_regs *regs);
++int set_tx_channels(unsigned int next_tx);
 +
-+int add_cmdir_queue(unsigned char *buffer, int count, void *callback_vct, int usecdelay);
++int add_cmdir_queue(unsigned char *buffer, int count,
++		    void *callback_vct, int usecdelay);
 +int cmdir_write_queue(unsigned char *buffer, int count, void *callback_vct);
 +int send_queue(void);
 +int wait_to_tx(int usecs);
 +
-+// circular packet queue
++/* circular packet queue */
 +unsigned char ourbuffers[QUEUELENGTH][64];
 +int waitusecs[QUEUELENGTH];
 +int ourbufferlengths[QUEUELENGTH];
-+int nexttosend = 0;
-+int nexttofill = 0;
++int nexttosend;
++int nexttofill;
 +int send_status = SEND_IDLE;
-+int last_tx_sec = 0;
-+int last_tx_usec = 0; 
++int last_tx_sec;
++int last_tx_usec;
 +
-+static int curTXFill = 0;
-+struct timeval tp; 
++static int curTXFill;
++struct timeval tp;
 +
-+int debug_commandir=0;
++int debug_commandir;
 +
 +/* Structure to hold all of our device specific stuff */
-+struct usb_skel 
++struct usb_skel
 +{
-+	struct usb_device *	udev;			/* the usb device for this device */
-+	struct usb_interface *	interface;		/* the interface for this device */
-+	unsigned char *		bulk_in_buffer;		/* the buffer to receive data */
-+	int			bulk_in_size;		/* the size of the receive buffer */
-+	__u8			bulk_in_endpointAddr;	/* the address of the bulk in endpoint */
-+	__u8			bulk_out_endpointAddr;	/* the address of the bulk out endpoint */
-+	struct kref		kref;
++	struct usb_device *udev; /* the usb device for this device */
++	struct usb_interface *interface; /* the interface for this device */
++	unsigned char *bulk_in_buffer; /* the buffer to receive data */
++	size_t bulk_in_size; /* the size of the receive buffer */
++	__u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
++	__u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */
++	struct kref kref;
 +};
 +#define to_skel_dev(d) container_of(d, struct usb_skel, kref)
 +
-+static struct file_operations cmdir_fops = 
-+{
++static struct file_operations cmdir_fops = {
 +	.read =		cmdir_file_read,
 +	.write =	cmdir_file_write,
 +	.open =		cmdir_open,
@@ -311,42 +296,42 @@
 +
 +/* usb class driver info in order to get a minor number from the usb core,
 + * and to have the device registered with devfs and the driver core */
-+static struct usb_class_driver cmdir_class = 
-+{
++static struct usb_class_driver cmdir_class = {
 +	.name =		"usb/commandir%d",
 +	.fops =		&cmdir_fops,
-+	//.mode =		S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH,
++	/* .mode =	S_IFCHR | S_IRUSR | S_IWUSR |
++	 *		S_IRGRP | S_IWGRP | S_IROTH, */
 +	.minor_base =	USB_CMDIR_MINOR_BASE,
 +};
 +
-+static struct usb_driver cmdir_driver = 
-+{
++static struct usb_driver cmdir_driver = {
 +	.name =		"commandir",
 +	.probe =	cmdir_probe,
 +	.disconnect =	cmdir_disconnect,
 +	.id_table =	cmdir_table,
 +};
 +
-+static int lcd_device=0;
-+static int rx_device=0;
-+static int def_device=0;
++
++static int lcd_device;
++static int rx_device;
++static int def_device;
 +
 +#define DEFAULT_TRANSMITTERS 0x0F
-+static unsigned int transmitters=DEFAULT_TRANSMITTERS;
-+static unsigned int next_transmitters=DEFAULT_TRANSMITTERS;
++static unsigned int transmitters = DEFAULT_TRANSMITTERS;
++static unsigned int next_transmitters = DEFAULT_TRANSMITTERS;
 +
 +#define CMDIR_VAR_LEN 68
-+static char cmdir_var[] = 
-+"COMMANDIRx:\n TX Enabled: 1, 2, 3, 4\n RX: commandirx\n LCD: commandirx"; 
++static char cmdir_var[] =
[...15104 lines suppressed...]
 +	/*
 +	 * unregister from the LIRC sub-system
 +	 */
 +
-+        if (( errnum = lirc_unregister_plugin( sz->plugin.minor )) != 0) {
-+
-+                dprintk("error in lirc_unregister: (returned %d)",
-+			sz->plugin.minor, errnum );
-+        }
++	errnum = lirc_unregister_plugin(sz->plugin.minor);
++	if (errnum != 0)
++		dprintk("error in lirc_unregister: (returned %d)",
++			sz->plugin.minor, errnum);
 +
 +	lirc_buffer_free(&sz->delay_buf);
 +	lirc_buffer_free(&sz->lirc_buf);
@@ -17680,31 +17621,29 @@
 +	 * unregister from the USB sub-system
 +	 */
 +
-+	usb_free_urb( sz->urb_in );
++	usb_free_urb(sz->urb_in);
 +
-+        usb_buffer_free( sz->udev , sz->buf_in_len, sz->buf_in, sz->dma_in );
++	usb_buffer_free(sz->udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
 +
 +	minor = sz->plugin.minor;
-+	kfree( sz );
++	kfree(sz);
 +
-+        printk(KERN_INFO DRIVER_NAME "[%d]: disconnected\n", minor);
++	printk(KERN_INFO DRIVER_NAME "[%d]: disconnected\n", minor);
 +}
 +
 +static int streamzap_suspend(struct usb_interface *intf, pm_message_t message)
 +{
 +	struct usb_streamzap *sz = usb_get_intfdata(intf);
-+	
++
 +	printk(DRIVER_NAME "[%d]: suspend\n", sz->plugin.minor);
-+	if(sz->in_use)
-+	{
-+		if(sz->flush)
-+		{
++	if (sz->in_use) {
++		if (sz->flush) {
 +			sz->flush = 0;
 +			del_timer_sync(&sz->flush_timer);
 +		}
-+		
++
 +		stop_timer(sz);
-+		
++
 +		usb_kill_urb(sz->urb_in);
 +	}
 +	return 0;
@@ -17713,21 +17652,19 @@
 +static int streamzap_resume(struct usb_interface *intf)
 +{
 +	struct usb_streamzap *sz = usb_get_intfdata(intf);
-+	
-+	while(!lirc_buffer_empty(&sz->lirc_buf))
++
++	while (!lirc_buffer_empty(&sz->lirc_buf))
 +		lirc_buffer_remove_1(&sz->lirc_buf);
-+	while(!lirc_buffer_empty(&sz->delay_buf))
++	while (!lirc_buffer_empty(&sz->delay_buf))
 +		lirc_buffer_remove_1(&sz->delay_buf);
-+		
-+	if(sz->in_use)
-+	{
++
++	if (sz->in_use) {
 +		sz->flush_timer.expires = jiffies + HZ;
 +		sz->flush = 1;
 +		add_timer(&sz->flush_timer);
 +
 +		sz->urb_in->dev = sz->udev;
-+		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
-+		{
++		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC)) {
 +			dprintk("open result = -EIO error submitting urb",
 +				sz->plugin.minor);
 +			MOD_DEC_USE_COUNT;
@@ -17748,7 +17685,7 @@
 +
 +	/* register this driver with the USB subsystem */
 +
-+	result = usb_register( &streamzap_driver );
++	result = usb_register(&streamzap_driver);
 +
 +	if (result) {
 +		err("usb_register failed. Error number %d",
@@ -17770,8 +17707,8 @@
 +}
 +
 +
-+module_init (usb_streamzap_init);
-+module_exit (usb_streamzap_exit);
++module_init(usb_streamzap_init);
++module_exit(usb_streamzap_exit);
 +
 +MODULE_AUTHOR("Christoph Bartelmus, Greg Wickham, Adrian Dewhurst");
 +MODULE_DESCRIPTION(DRIVER_DESC);
@@ -17785,10 +17722,10 @@
 +#endif /* MODULE */
 diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
 new file mode 100644
-index 0000000..b4fbde3
+index 0000000..b80dbf8
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ttusbir.c
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,361 @@
 +/****************************************************************************
 + ** lirc_ttusbir.c ***********************************************************
 + ****************************************************************************
@@ -17812,6 +17749,7 @@
 + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + *
 + */
++#include <linux/version.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/module.h>
@@ -17830,7 +17768,7 @@
 +/* @TODO Is it enough to have only two, I guess yes */
 +#define NUM_URBS 4 /* Number of URBs used in the queue */
 +
-+#undef DEBUG
++/* #define DEBUG */
 +#ifdef DEBUG
 +#define DPRINTK printk
 +#else
@@ -17917,22 +17855,38 @@
 + */
 +const unsigned char map_table[] =
 +{
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-+	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
++	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 +};
 +
 +static void urb_complete(struct urb *urb)
@@ -17986,7 +17940,8 @@
 +
 +	DPRINTK("Module ttusbir probe\n");
 +
-+	ttusbir = (struct ttusbir_device *)kzalloc(sizeof(struct ttusbir_device), GFP_KERNEL);
++	ttusbir = (struct ttusbir_device *)
++		  kzalloc(sizeof(struct ttusbir_device), GFP_KERNEL);
 +	if (!ttusbir)
 +		return -ENOMEM;
 +	ttusbir->driver = &driver;



From fedora-extras-commits at redhat.com  Thu Sep 13 18:18:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 14:18:01 -0400
Subject: rpms/qt4/devel qt4.spec,1.66,1.67
Message-ID: <200709131818.l8DII1V8018449@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18378

Modified Files:
	qt4.spec 
Log Message:
Release++ (keep rawhide clean)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- qt4.spec	13 Sep 2007 18:16:21 -0000	1.66
+++ qt4.spec	13 Sep 2007 18:17:29 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -634,7 +634,7 @@
 
 
 %changelog
-* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-5
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-6
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
 - linquist.desktop: use new linguist4 icons
 - -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)



From fedora-extras-commits at redhat.com  Thu Sep 13 18:26:25 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 13 Sep 2007 14:26:25 -0400
Subject: rpms/Io-language/F-7 AddonBuilder_io_libdir.patch, NONE,
	1.1 Io-language.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709131826.l8DIQPaD018836@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Io-language/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18810

Modified Files:
	.cvsignore sources 
Added Files:
	AddonBuilder_io_libdir.patch Io-language.spec 
Log Message:
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)


AddonBuilder_io_libdir.patch:

--- NEW FILE AddonBuilder_io_libdir.patch ---
--- Io-2007-04-30/build/AddonBuilder.io.orig	2007-04-28 15:09:52.000000000 +0200
+++ Io-2007-04-30/build/AddonBuilder.io	2007-05-29 23:01:38.000000000 +0200
@@ -58,6 +58,9 @@
 	libSearchPaths := List clone
 	appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v)))
 	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib/mysql"))
+	searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib64/mysql"))
 
 	debs    := Map clone
 	ebuilds := Map clone


--- NEW FILE Io-language.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

%define _version 2007-07-10
 
Name:           Io-language
Version:        20070710
Release:        2%{?dist}
Summary:        Io is a small, prototype-based programming language
Group:          System Environment/Libraries
License:        BSD
URL:            http://www.iolanguage.com/
# TnL uses a more recent snapshot then upstream has made available in snapshot
# form. TnL's version also includes some fixes which stop TnL from crashing.
Source0:        http://tnlgame.net/downloads/tnl/070827/Io-%{_version}.tar.gz
Patch0:         AddonBuilder_io_libdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
BuildRequires:  libsamplerate-devel libsndfile-devel libtiff-devel
BuildRequires:  libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
BuildRequires:  portaudio-devel postgresql-devel python-devel  soundtouch-devel
BuildRequires:  sqlite-devel taglib-devel

%description
Io is a small, prototype-based programming language. The ideas in
Io are mostly inspired by Smalltalk (all values are objects), Self
(prototype-based), NewtonScript (differential inheritance), Act1
(actors and futures for concurrency), LISP (code is a runtime
inspectable/modifiable tree) and Lua (small, embeddable).


%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}.


%package graphics-and-sound
Summary:        Io graphics and sound support
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description graphics-and-sound
Io graphics and sound support, this package includes IO bindings needed to
write Io programs which want to display graphics and / or produce sound
(OpenGL, Image loading, PortAudio, etc.).


%package extras
Summary:        Io extra addons
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description extras
This package includes addons for Io which require additional libraries to be
installed. This includes the Python and Socket addons.


%package postgresql
Summary:        Io postgresql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description postgresql
Io postgresql bindings.


%package mysql
Summary:        Io mysql bindings
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description mysql
Io mysql bindings


%prep
%setup -q -n Io-%{_version}
%patch0 -p1
sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
# libstdc++.so is searched and not found ...
sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
# for %doc
rm docs/guide_files/.htmle
mv addons/OpenGL/docs OpenGL
iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
sed -i 's/\r//g' license.txt `find OpenGL -type f`


%build
make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.0"'


%install
rm -rf $RPM_BUILD_ROOT
# upstreams make install installs lots of unwanted parts of the addons, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons
mkdir -p $RPM_BUILD_ROOT%{_includedir}
install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
install -m 755 _build/dll/libiovmall.so \
  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.0
ln -s libiovmall.so.0 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
# install the addons
for i in addons/*; do
  # skip unbuild addons
  if [ -d $i/_build ]; then
    ADDON=`basename $i`
    mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -m 755 $i/_build/dll/libIo$ADDON.so \
      $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/_build/dll
    install -p -m 644 $i/depends $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON
    # Io doesn't find the addon if this file isn't present
    touch $RPM_BUILD_ROOT%{_libdir}/io/addons/$ADDON/build.io
  fi
done


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/io
%{_libdir}/libiovmall.so.0
%dir %{_libdir}/io
%dir %{_libdir}/io/addons
%{_libdir}/io/addons/AsyncRequest
%{_libdir}/io/addons/BigNum
%{_libdir}/io/addons/Blowfish
%{_libdir}/io/addons/Box
%{_libdir}/io/addons/CGI
%{_libdir}/io/addons/ContinuedFraction
%{_libdir}/io/addons/Curses
%{_libdir}/io/addons/Flux
%{_libdir}/io/addons/Fnmatch
%{_libdir}/io/addons/LZO
%{_libdir}/io/addons/Libxml2
%{_libdir}/io/addons/Loki
%{_libdir}/io/addons/MD5
%{_libdir}/io/addons/NotificationCenter
%{_libdir}/io/addons/Random
%{_libdir}/io/addons/Range
%{_libdir}/io/addons/Rational
%{_libdir}/io/addons/Regex
%{_libdir}/io/addons/SHA1
%{_libdir}/io/addons/SQLite3
%{_libdir}/io/addons/SqlDatabase
%{_libdir}/io/addons/Syslog
%{_libdir}/io/addons/SystemCall
%{_libdir}/io/addons/Thread
%{_libdir}/io/addons/UUID
%{_libdir}/io/addons/User
%{_libdir}/io/addons/Zlib

%files devel
%defattr(-,root,root,-)
%doc docs/guide.html docs/guide.pdf docs/guide_files
%{_libdir}/libiovmall.so
%{_includedir}/io

%files graphics-and-sound
%defattr(-,root,root,-)
%doc OpenGL
%{_libdir}/io/addons/Font
%{_libdir}/io/addons/Image
%{_libdir}/io/addons/LibSndFile
%{_libdir}/io/addons/OpenGL
%{_libdir}/io/addons/PortAudio
%{_libdir}/io/addons/TagLib

%files extras
%defattr(-,root,root,-)
%{_libdir}/io/addons/Python
%{_libdir}/io/addons/SampleRateConverter
%{_libdir}/io/addons/Socket
%{_libdir}/io/addons/SoundTouch

%files postgresql
%defattr(-,root,root,-)
%{_libdir}/io/addons/Postgre*

%files mysql
%defattr(-,root,root,-)
%{_libdir}/io/addons/MySQL


%changelog
* Wed Sep 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-2
- Reshuffle which docs to include and in which subpackages to include them
  (bz 284151)

* Sun Sep  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 20070710-1
- Adapted Packman spec file for Fedora

* Sat Sep 08 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.2
- openSUSE-10.3 build, using libode(-devel)

* Sun Jun 03 2007 Toni Graffy <toni at links2linux.de> 20070528-0.pm.1
- update to 20070528
- added patches for 64bit (thx Detlef)
- switched to portaudio

* Sun May 27 2007 Toni Graffy <toni at links2linux.de> 20070430-0.pm.1
- initial package 20070430


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Io-language/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Sep 2007 17:01:38 -0000	1.1
+++ .cvsignore	13 Sep 2007 18:25:52 -0000	1.2
@@ -0,0 +1 @@
+Io-2007-07-10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Io-language/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 17:01:38 -0000	1.1
+++ sources	13 Sep 2007 18:25:52 -0000	1.2
@@ -0,0 +1 @@
+8101f2fd8963cefedf43e188452d6249  Io-2007-07-10.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:36 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:36 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgaQ2012135@app4.fedora.phx.redhat.com>

James Antill (james) has set the commit acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:37 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:37 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgbW2012144@app4.fedora.phx.redhat.com>

James Antill (james) has set the watchcommits acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:38 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:38 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgckl012153@app4.fedora.phx.redhat.com>

James Antill (james) has set the watchbugzilla acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 18:42:40 2007
From: fedora-extras-commits at redhat.com (James Antill (james.antill))
Date: Thu, 13 Sep 2007 11:42:40 -0700
Subject: [pkgdb] createrepo had acl change status
Message-ID: <200709131842.l8DIgegn017856@app3.fedora.phx.redhat.com>

James Antill (james) has set the approveacls acl on createrepo (Fedora devel) to Approved for Seth Vidal (skvidal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/createrepo



From fedora-extras-commits at redhat.com  Thu Sep 13 19:01:26 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 15:01:26 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.19,1.263.2.20
Message-ID: <200709131901.l8DJ1Q8l025729@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19792/devel

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
add missing BR alsa-lib-devel


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.19
retrieving revision 1.263.2.20
diff -u -r1.263.2.19 -r1.263.2.20
--- kdebase.spec	12 Sep 2007 06:52:23 -0000	1.263.2.19
+++ kdebase.spec	13 Sep 2007 19:00:52 -0000	1.263.2.20
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.93.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -33,6 +33,7 @@
 # should not conflict with d3lphin, but does with old Dolphin
 Conflicts:     dolphin <= 0.8.2
 
+BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 # needed?
 BuildRequires: cdparanoia-devel cdparanoia
@@ -247,6 +248,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- add missing BR alsa-lib-devel
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - remove files which conflict with KDE 3
 - move devel symlinks to %%{_kde4_libdir}/kde4/devel/



From fedora-extras-commits at redhat.com  Thu Sep 13 19:19:52 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Sep 2007 15:19:52 -0400
Subject: rpms/qt4/devel qt4.spec,1.67,1.68
Message-ID: <200709131919.l8DJJqD1026428@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26404

Modified Files:
	qt4.spec 
Log Message:
another typo: s/linquist/linguist/
Release++



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- qt4.spec	13 Sep 2007 18:17:29 -0000	1.67
+++ qt4.spec	13 Sep 2007 19:19:19 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -590,7 +590,7 @@
 %{_qt4_bindir}/linguist*
 %{_bindir}/linguist*
 %{_datadir}/applications/*linguist*.desktop
-%{_datadir}/icons/hicolor/*/apps/linquist4.*
+%{_datadir}/icons/hicolor/*/apps/linguist4.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -634,9 +634,9 @@
 
 
 %changelog
-* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-6
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
-- linquist.desktop: use new linguist4 icons
+- linguist.desktop: use new linguist4 icons
 - -devel,-x11: %%post/%%postun scriptlets (icons, mimetypes)
 
 * Thu Sep 13 2007 Than Ngo <than at redhat.com> -  4.3.1-4



From fedora-extras-commits at redhat.com  Thu Sep 13 19:21:02 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:21:02 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.53,
	1.54 xen-compile-fix.patch, 1.2, 1.3 xen-version-strings.patch,
	1.3, 1.4
Message-ID: <200709131921.l8DJL2QS026523@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26426

Modified Files:
	kernel-xen.spec xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Make hypervisor patches relative to the xen HG tree

Make hypervisor patches relative to the xen HG tree, not only the
'xen' subdirectory. This makes easier to import patches from
upstream.



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kernel-xen.spec	12 Sep 2007 20:21:05 -0000	1.53
+++ kernel-xen.spec	13 Sep 2007 19:20:29 -0000	1.54
@@ -1438,11 +1438,12 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen
+cd xen-%{xen_hv_version}-%{xen_hv_cset}/
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
 
+cd xen/
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
 sed -i -e 's/\(^export XEN_BUILDVERSION.*$\)/\1'-%{PACKAGE_RELEASE}'/' Makefile
@@ -2363,6 +2364,11 @@
 #  - tux.
 
 %changelog
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Make hypervisor patches relative to the xen HG tree, not only the
+  hypervisor subdirectory. This makes easier to import patches from
+  upstream.
+
 * Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
   under Xen.

xen-compile-fix.patch:

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-compile-fix.patch	30 Apr 2007 22:09:41 -0000	1.2
+++ xen-compile-fix.patch	13 Sep 2007 19:20:29 -0000	1.3
@@ -1,7 +1,7 @@
-Index: xen/include/asm-x86/hvm/hvm.h
+Index: xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
 ===================================================================
---- xen.orig/include/asm-x86/hvm/hvm.h
-+++ xen/include/asm-x86/hvm/hvm.h
+--- xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
++++ xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
 @@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v)
      return hvm_funcs.long_mode_enabled(v);
  }

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-version-strings.patch	7 May 2007 18:47:08 -0000	1.3
+++ xen-version-strings.patch	13 Sep 2007 19:20:29 -0000	1.4
@@ -1,7 +1,7 @@
-Index: xen/Makefile
+Index: xen-3.1.0/xen/Makefile
 ===================================================================
---- xen.orig/Makefile
-+++ xen/Makefile
+--- xen-3.1.0/xen/Makefile
++++ xen-3.1.0/xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3



From fedora-extras-commits at redhat.com  Thu Sep 13 19:34:53 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:34:53 -0400
Subject: rpms/kernel-xen-2.6/devel xen-vpic-irqbase-mode.patch, NONE,
	1.1 kernel-xen.spec, 1.54, 1.55
Message-ID: <200709131934.l8DJYreq027021@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26992

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vpic-irqbase-mode.patch 
Log Message:
Fix for bug #248398: HVM domain hangs during (F-7) install.

Backport of fix from xen-unstable: 15239:656b8175f4f2.


xen-vpic-irqbase-mode.patch:

--- NEW FILE xen-vpic-irqbase-mode.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Node ID 656b8175f4f24b5bb3a761e62c496075510914ed
# Parent  345ae2e61ba0130cf4913fee13b378c4e21d24e7
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
xen-unstable changeset: 15239:656b8175f4f24b5bb3a761e62c496075510914ed
xen-unstable date: Fri Jun 08 11:19:55 2007 +0100

Index: xen-3.1-testing-32/xen/arch/x86/hvm/vmx/vmx.c
===================================================================
--- xen-3.1-testing-32.orig/xen/arch/x86/hvm/vmx/vmx.c
+++ xen-3.1-testing-32/xen/arch/x86/hvm/vmx/vmx.c
@@ -1878,8 +1878,8 @@ enum { VMX_ASSIST_INVOKE = 0, VMX_ASSIST
 static int vmx_assist(struct vcpu *v, int mode)
 {
     struct vmx_assist_context c;
-    u32 magic;
-    u32 cp;
+    struct hvm_hw_vpic *vpic = v->domain->arch.hvm_domain.vpic;
+    u32 magic, cp;
 
     /* make sure vmxassist exists (this is not an error) */
     if (hvm_copy_from_guest_phys(&magic, VMXASSIST_MAGIC_OFFSET,
@@ -1913,6 +1913,10 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            v->arch.hvm_vmx.pm_irqbase[0] = vpic[0].irq_base;
+            v->arch.hvm_vmx.pm_irqbase[1] = vpic[1].irq_base;
+            vpic[0].irq_base = NR_EXCEPTION_HANDLER;
+            vpic[1].irq_base = NR_EXCEPTION_HANDLER + 8;
             v->arch.hvm_vmx.vmxassist_enabled = 1;
             return 1;
         }
@@ -1931,6 +1935,13 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            if ( v->arch.hvm_vmx.irqbase_mode ) {
+                vpic[0].irq_base = c.rm_irqbase[0] & 0xf8;
+                vpic[1].irq_base = c.rm_irqbase[1] & 0xf8;
+            } else {
+                vpic[0].irq_base = v->arch.hvm_vmx.pm_irqbase[0];
+                vpic[1].irq_base = v->arch.hvm_vmx.pm_irqbase[1];
+            }
             v->arch.hvm_vmx.vmxassist_enabled = 0;
             return 1;
         }
Index: xen-3.1-testing-32/xen/arch/x86/hvm/vpic.c
===================================================================
--- xen-3.1-testing-32.orig/xen/arch/x86/hvm/vpic.c
+++ xen-3.1-testing-32/xen/arch/x86/hvm/vpic.c
@@ -174,7 +174,8 @@ static int vpic_intack(struct hvm_hw_vpi
     return irq;
 }
 
-static void vpic_ioport_write(struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
+static void vpic_ioport_write(
+    struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
 {
     int priority, cmd, irq;
     uint8_t mask;
@@ -265,6 +266,11 @@ static void vpic_ioport_write(struct hvm
             vpic->imr = val;
             break;
         case 1:
+#if 1 /* Delete me when vmxassist is retired. */
+            /* Which mode is irqbase programmed in? */
+            current->arch.hvm_vmx.irqbase_mode =
+                current->arch.hvm_vmx.vmxassist_enabled;
+#endif
             /* ICW2 */
             vpic->irq_base = val & 0xf8;
             vpic->init_state++;
Index: xen-3.1-testing-32/xen/include/asm-x86/hvm/vmx/vmcs.h
===================================================================
--- xen-3.1-testing-32.orig/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ xen-3.1-testing-32/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -77,7 +77,11 @@ struct arch_vmx_struct {
     unsigned long        cpu_cr2; /* save CR2 */
     unsigned long        cpu_cr3;
     struct vmx_msr_state msr_state;
+
+    /* Following fields are all specific to vmxassist. */
     unsigned long        vmxassist_enabled:1;
+    unsigned long        irqbase_mode:1;
+    unsigned char        pm_irqbase[2];
 };
 
 struct vmcs_struct *vmx_alloc_host_vmcs(void);
Index: xen-3.1-testing-32/xen/include/public/hvm/vmx_assist.h
===================================================================
--- xen-3.1-testing-32.orig/xen/include/public/hvm/vmx_assist.h
+++ xen-3.1-testing-32/xen/include/public/hvm/vmx_assist.h
@@ -35,6 +35,10 @@
 
 #ifndef __ASSEMBLY__
 
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
+
 union vmcs_arbytes {
     struct arbyte_fields {
         unsigned int seg_type : 4,
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kernel-xen.spec	13 Sep 2007 19:20:29 -0000	1.54
+++ kernel-xen.spec	13 Sep 2007 19:34:21 -0000	1.55
@@ -633,6 +633,9 @@
 Patch20000: xen-compile-fix.patch
 Patch20001: xen-version-strings.patch
 
+# Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
+Patch20002: xen-vpic-irqbase-mode.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1442,6 +1445,7 @@
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
+%patch20002 -p1
 
 cd xen/
 # Update the Makefile version strings
@@ -2365,6 +2369,10 @@
 
 %changelog
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix for bug #248398: HVM domain hangs during (F-7) install.
+  Backported fix from xen-unstable: 15239:656b8175f4f2
+
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Make hypervisor patches relative to the xen HG tree, not only the
   hypervisor subdirectory. This makes easier to import patches from
   upstream.



From fedora-extras-commits at redhat.com  Thu Sep 13 19:37:27 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 13 Sep 2007 15:37:27 -0400
Subject: rpms/csound/OLPC-2 csound-5.07.0-version-libcsnd.patch, NONE,
	1.1 csound.spec, 1.15, 1.16
Message-ID: <200709131937.l8DJbRUQ027412@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27376

Modified Files:
	csound.spec 
Added Files:
	csound-5.07.0-version-libcsnd.patch 
Log Message:
* Thu Sep 13 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.4.cvs20070830
- Put libcsnd.so in the right place, and version it



csound-5.07.0-version-libcsnd.patch:

--- NEW FILE csound-5.07.0-version-libcsnd.patch ---
diff -up csound5/install.py.version-libcsnd csound5/install.py
--- csound5/install.py.version-libcsnd	2007-09-13 14:50:54.000000000 -0400
+++ csound5/install.py	2007-09-13 14:51:40.000000000 -0400
@@ -256,6 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
 libList += findFiles('.', 'libcsound64\\.a')
 libList += findFiles('.', 'libcsound\\.so\\..+')
 libList += findFiles('.', 'libcsound64\\.so\\..+')
+libList += findFiles('.', 'libcsnd\\.so\\..+')
 libList += findFiles('.', '_csnd\\.so')
 libList += findFiles('.', 'lib_jcsound\\.so')
 libList += findFiles('.', 'lib_CsoundVST\\.so')
@@ -269,6 +270,8 @@ for i in libList:
     if err == 0:
         if i[:13] == 'libcsound.so.':
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
+        elif i[:11] == 'libcsnd.so.':
+            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
         elif i[:15] == 'libcsound64.so.':
             err = installLink(i, concatPath([libDir, 'libcsound64.so']))
         elif i == 'lib_CsoundVST.so':
diff -up csound5/SConstruct.version-libcsnd csound5/SConstruct
--- csound5/SConstruct.version-libcsnd	2007-09-13 13:58:28.000000000 -0400
+++ csound5/SConstruct	2007-09-13 13:58:28.000000000 -0400
@@ -1097,6 +1097,8 @@ else:
         os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so'])
         # os.symlink('lib_csnd.so', '_csnd.so')
         csoundInterfacesEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+    # Copy here to avoid poluting SHLINKFLAGS for python
+    csndPythonEnvironment = csoundInterfacesEnvironment.Copy()
     if getPlatform() == 'darwin':
         ilibName = "lib_csnd.dylib"
         ilibVersion = csoundLibraryVersion
@@ -1112,22 +1114,35 @@ else:
         csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary(
          '_csnd', csoundInterfacesSources)
     else:
-        csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary('csnd', csoundInterfacesSources)
+        if getPlatform() == 'linux':
+            # save interfaces environment before adding -soname
+            libName = 'libcsnd.so'
+            libName2 = libName + '.' + csoundLibraryVersion
+            os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', libName])
+            os.symlink(libName2, libName)
+            tmp = csoundInterfacesEnvironment['SHLINKFLAGS']
+            tmp += ['-Wl,-soname=%s' % libName2]
+            csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary(
+                libName2, csoundInterfacesSources,
+                SHLINKFLAGS = tmp, SHLIBPREFIX = '', SHLIBSUFFIX = '')
+        else:
+            csoundInterfaces = csoundInterfacesEnvironment.SharedLibrary('csnd', csoundInterfacesSources)
+
     Depends(csoundInterfaces, csoundLibrary)
     libs.append(csoundInterfaces)
     if pythonFound:
-        csoundInterfacesEnvironment.Append(LINKFLAGS = pythonLinkFlags)
-        csoundInterfacesEnvironment.Prepend(LIBPATH = pythonLibraryPath)
-        csoundInterfacesEnvironment.Prepend(LIBS = pythonLibs)
-        csoundInterfacesEnvironment.Append(CPPPATH = pythonIncludePath)
-        csndPythonEnvironment = csoundInterfacesEnvironment.Copy()
+        csndPythonEnvironment.Append(LINKFLAGS = pythonLinkFlags)
+        csndPythonEnvironment.Prepend(LIBPATH = pythonLibraryPath)
+        csndPythonEnvironment.Prepend(LIBS = pythonLibs)
+        csndPythonEnvironment.Append(CPPPATH = pythonIncludePath)
         if getPlatform() == 'darwin':
          csndPythonEnvironment.Append(LIBS = ['_csnd'])
         else:
          csndPythonEnvironment.Append(LIBS = ['csnd'])
         csoundPythonInterface = csndPythonEnvironment.SharedObject(
             'interfaces/python_interface.i',
-            SWIGFLAGS = [swigflags, '-python', '-outdir', '.'])
+            SWIGFLAGS = [swigflags, '-python', '-outdir', '.'],
+            SHLINKFLAGS = '')
         if getPlatform() == 'win32' and pythonLibs[0] < 'python24' and not withMSVC():
             Depends(csoundPythonInterface, pythonImportLibrary)
         csndModule = makePythonModule(csndPythonEnvironment, 'csnd', [csoundPythonInterface])


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- csound.spec	31 Aug 2007 16:05:11 -0000	1.15
+++ csound.spec	13 Sep 2007 19:36:54 -0000	1.16
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.07.0
-Release:       0.3.cvs20070830%{?dist}
+Release:       0.4.cvs20070830%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -45,6 +45,7 @@
 Patch5: csound-5.03.0-rtalsa-fix.patch
 Patch6: csound-5.07-log-segfault-fix.patch
 Patch7: csound-5.03.0-add-oggplay.patch
+Patch8: csound-5.07.0-version-libcsnd.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -191,6 +192,7 @@
 %patch5 -p1 -b .rtalsa-fix
 %patch6 -p1 -b .logfile-segfault-fix
 %patch7 -p1 -b .add-oggplay
+%patch8 -p1 -b .version-libcsnd
 
 tar xf %{SOURCE1}
 
@@ -250,6 +252,8 @@
 # This file is zero-lenth for some reason
 %{__rm} -f manual/examples/ifthen.csd
 
+%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/libcsnd.so
+
 install -dm 755 %{buildroot}%{_javadir}
 (cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
 
@@ -304,6 +308,7 @@
 %{_bindir}/pv_export
 %{_bindir}/pv_import
 %{_libdir}/lib%{name}.so.5.1
+%{_libdir}/libcsnd.so.5.1
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/xmg/*.xmg
 %dir %{_libdir}/%{name}/plugins
@@ -312,7 +317,6 @@
 %{_libdir}/%{name}/plugins/libbarmodel.so
 %{_libdir}/%{name}/plugins/libcompress.so
 %{_libdir}/%{name}/plugins/libcontrol.so
-%{_libdir}/%{name}/plugins/libcsnd.so
 %{_libdir}/%{name}/plugins/libdate.so
 %{_libdir}/%{name}/plugins/libeqfil.so
 %{_libdir}/%{name}/plugins/libftest.so
@@ -353,6 +357,7 @@
 %defattr(-,root,root,0755)
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
+%{_libdir}/libcsnd.so
 
 %files python
 %defattr(-,root,root,0755)
@@ -420,6 +425,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Thu Sep 13 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.4.cvs20070830
+- Put libcsnd.so in the right place, and version it
+
 * Fri Aug 31 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.3.cvs20070830
 - Add oggplay patch
 



From fedora-extras-commits at redhat.com  Thu Sep 13 19:58:32 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 15:58:32 -0400
Subject: rpms/kernel-xen-2.6/F-7 xen-vpic-irqbase-mode.patch, NONE,
	1.1 kernel-xen.spec, 1.46, 1.47 xen-vpic-set-vector.patch, 1.2, NONE
Message-ID: <200709131958.l8DJwWjq027788@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27758

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vpic-irqbase-mode.patch 
Removed Files:
	xen-vpic-set-vector.patch 
Log Message:
HV-side of fix for bug #248398: HVM domain hangs during (F-7) install

Backport of fix from xen-unstable: 15239:656b8175f4f2.

This replaces xen-vpic-set-vector.patch, that didn't go upstream and
didn't have its user-space part added to the xen package.


xen-vpic-irqbase-mode.patch:

--- NEW FILE xen-vpic-irqbase-mode.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Node ID 656b8175f4f24b5bb3a761e62c496075510914ed
# Parent  345ae2e61ba0130cf4913fee13b378c4e21d24e7
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
xen-unstable changeset: 15239:656b8175f4f24b5bb3a761e62c496075510914ed
xen-unstable date: Fri Jun 08 11:19:55 2007 +0100

Index: xen/arch/x86/hvm/vmx/vmx.c
===================================================================
--- xen/arch/x86/hvm/vmx/vmx.c
+++ xen/arch/x86/hvm/vmx/vmx.c
@@ -1878,8 +1878,8 @@ enum { VMX_ASSIST_INVOKE = 0, VMX_ASSIST
 static int vmx_assist(struct vcpu *v, int mode)
 {
     struct vmx_assist_context c;
-    u32 magic;
-    u32 cp;
+    struct hvm_hw_vpic *vpic = v->domain->arch.hvm_domain.vpic;
+    u32 magic, cp;
 
     /* make sure vmxassist exists (this is not an error) */
     if (hvm_copy_from_guest_phys(&magic, VMXASSIST_MAGIC_OFFSET,
@@ -1913,6 +1913,10 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            v->arch.hvm_vmx.pm_irqbase[0] = vpic[0].irq_base;
+            v->arch.hvm_vmx.pm_irqbase[1] = vpic[1].irq_base;
+            vpic[0].irq_base = NR_EXCEPTION_HANDLER;
+            vpic[1].irq_base = NR_EXCEPTION_HANDLER + 8;
             v->arch.hvm_vmx.vmxassist_enabled = 1;
             return 1;
         }
@@ -1931,6 +1935,13 @@ static int vmx_assist(struct vcpu *v, in
                 goto error;
             if ( vmx_world_restore(v, &c) != 0 )
                 goto error;
+            if ( v->arch.hvm_vmx.irqbase_mode ) {
+                vpic[0].irq_base = c.rm_irqbase[0] & 0xf8;
+                vpic[1].irq_base = c.rm_irqbase[1] & 0xf8;
+            } else {
+                vpic[0].irq_base = v->arch.hvm_vmx.pm_irqbase[0];
+                vpic[1].irq_base = v->arch.hvm_vmx.pm_irqbase[1];
+            }
             v->arch.hvm_vmx.vmxassist_enabled = 0;
             return 1;
         }
Index: xen/arch/x86/hvm/vpic.c
===================================================================
--- xen/arch/x86/hvm/vpic.c
+++ xen/arch/x86/hvm/vpic.c
@@ -174,7 +174,8 @@ static int vpic_intack(struct hvm_hw_vpi
     return irq;
 }
 
-static void vpic_ioport_write(struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
+static void vpic_ioport_write(
+    struct hvm_hw_vpic *vpic, uint32_t addr, uint32_t val)
 {
     int priority, cmd, irq;
     uint8_t mask;
@@ -265,6 +266,11 @@ static void vpic_ioport_write(struct hvm
             vpic->imr = val;
             break;
         case 1:
+#if 1 /* Delete me when vmxassist is retired. */
+            /* Which mode is irqbase programmed in? */
+            current->arch.hvm_vmx.irqbase_mode =
+                current->arch.hvm_vmx.vmxassist_enabled;
+#endif
             /* ICW2 */
             vpic->irq_base = val & 0xf8;
             vpic->init_state++;
Index: xen/include/asm-x86/hvm/vmx/vmcs.h
===================================================================
--- xen/include/asm-x86/hvm/vmx/vmcs.h
+++ xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -77,7 +77,11 @@ struct arch_vmx_struct {
     unsigned long        cpu_cr2; /* save CR2 */
     unsigned long        cpu_cr3;
     struct vmx_msr_state msr_state;
+
+    /* Following fields are all specific to vmxassist. */
     unsigned long        vmxassist_enabled:1;
+    unsigned long        irqbase_mode:1;
+    unsigned char        pm_irqbase[2];
 };
 
 struct vmcs_struct *vmx_alloc_host_vmcs(void);
Index: xen/include/public/hvm/vmx_assist.h
===================================================================
--- xen/include/public/hvm/vmx_assist.h
+++ xen/include/public/hvm/vmx_assist.h
@@ -35,6 +35,10 @@
 
 #ifndef __ASSEMBLY__
 
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
+
 union vmcs_arbytes {
     struct arbyte_fields {
         unsigned int seg_type : 4,
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kernel-xen.spec	12 Sep 2007 20:39:00 -0000	1.46
+++ kernel-xen.spec	13 Sep 2007 19:57:59 -0000	1.47
@@ -519,8 +519,8 @@
 Patch20000: xen-compile-fix.patch
 Patch20001: xen-version-strings.patch
 
-# HV part for rawhide FV booting on rawhide Xen
-Patch20002: xen-vpic-set-vector.patch
+# Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
+Patch20002: xen-vpic-irqbase-mode.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2058,6 +2058,12 @@
 #  - tux.
 
 %changelog
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Hypervisor-side of fix for bug #248398: HVM domain hangs during (F-7)
+  install. Backport of fix from xen-unstable: 15239:656b8175f4f2.
+  This replaces xen-vpic-set-vector.patch, that didn't go upstream and
+  didn't have its user-space part added to the xen package.
+
 * Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable CONFIG_HIGHPTE. It is not reliable and causes performance loss
   under Xen


--- xen-vpic-set-vector.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 20:09:21 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Thu, 13 Sep 2007 16:09:21 -0400
Subject: rpms/gnash/OLPC-2 gnash.spec,1.22,1.23
Message-ID: <200709132009.l8DK9LCx001594@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/gnash/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548

Modified Files:
	gnash.spec 
Log Message:
- fixed remaining bugs in the spec file by refrencing the devel branch



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/OLPC-2/gnash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnash.spec	12 Sep 2007 20:23:09 -0000	1.22
+++ gnash.spec	13 Sep 2007 20:08:46 -0000	1.23
@@ -4,7 +4,7 @@
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,29 +58,32 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
- $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnash/*.la
+#rm -f \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+# $RPM_BUILD_ROOT/%{_libdir}/libgnashplayer.so
 
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # don't package libltdl related files!
 rm -f \
- $RPM_BUILD_ROOT/%{_libdir}/libltdl* \
+ $RPM_BUILD_ROOT/%{_libdir}/gnash/libltdl* \
  $RPM_BUILD_ROOT/%{_includedir}/ltdl.h
+# asspec info isn't generated rightly
+rm -f \
+ $RPM_BUILD_ROOT%{_infodir}/asspec.info
 # omf is broken
 rm -rf \
  $RPM_BUILD_ROOT/%{_datadir}/omf
 # cygnal just segfaults
-rm -f \
- $RPM_BUILD_ROOT/%{_bindir}/cygnal
+#rm -f \
+# $RPM_BUILD_ROOT/%{_bindir}/cygnal
 
 %find_lang %{name}
 
@@ -101,14 +104,14 @@
 %doc README AUTHORS COPYING NEWS 
 %doc doc/C/gnash.html 
 %doc doc/C/images
+%{_bindir}/gtk-gnash
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*-*.so
+%{_libdir}/gnash/
 %{_mandir}/man1/gnash*
 %{_datadir}/gnash/
 
-
 %files plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/libgnashplugin.so



From fedora-extras-commits at redhat.com  Thu Sep 13 20:10:04 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:10:04 -0400
Subject: rpms/nodoka-theme-gnome/devel .cvsignore, 1.3,
	1.4 nodoka-theme-gnome.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200709132010.l8DKA4Bb001660@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1593

Modified Files:
	.cvsignore nodoka-theme-gnome.spec sources 
Log Message:


New version.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Aug 2007 11:39:01 -0000	1.3
+++ .cvsignore	13 Sep 2007 20:09:30 -0000	1.4
@@ -1 +1 @@
-nodoka-theme-gnome-0.3.1.2.tar.gz
+nodoka-theme-gnome-0.3.2.tar.gz


Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nodoka-theme-gnome.spec	11 Aug 2007 11:39:01 -0000	1.3
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:09:30 -0000	1.4
@@ -1,13 +1,13 @@
 %define nodoka_dir %{_datadir}/themes/Nodoka
 
 Name:           nodoka-theme-gnome
-Version:        0.3.1.2
+Version:        0.3.2
 Release:        1%{?dist}
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://fedoraproject.org/wiki/Artwork/NodokaTheme
+URL:            http://hosted.fedoraproject.org/projects/nodoka
 
 # can get on a wiki, see URL
 Source0:        %{name}-%{version}.tar.gz 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1
+- new version, reworked gradients in metacity theme
+
 * Sat Aug 11 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.1.2-1
 - new version, change used icon set to fedora (in redhat-artwork pkg)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:39:01 -0000	1.3
+++ sources	13 Sep 2007 20:09:30 -0000	1.4
@@ -1 +1 @@
-2f848c5bce7d6fd72da0ec9b08643412  nodoka-theme-gnome-0.3.1.2.tar.gz
+6bd4a54194d9c981c4894fc77b254943  nodoka-theme-gnome-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 20:20:51 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:20:51 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.4,1.5
Message-ID: <200709132020.l8DKKpJ7002022@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1989

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Fix source dir name...






Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nodoka-theme-gnome.spec	13 Sep 2007 20:09:30 -0000	1.4
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:20:19 -0000	1.5
@@ -42,7 +42,7 @@
 Echoey look and feel.
 
 %prep
-%setup -q
+%setup -q -n nodoka-theme-gnome
 
 
 %build



From fedora-extras-commits at redhat.com  Thu Sep 13 20:30:40 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:30:40 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.5,1.6
Message-ID: <200709132030.l8DKUewE002215@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2194

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Bump for new build.





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nodoka-theme-gnome.spec	13 Sep 2007 20:20:19 -0000	1.5
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:30:07 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           nodoka-theme-gnome
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.1
+- fix dir name
+
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1
 - new version, reworked gradients in metacity theme
 



From fedora-extras-commits at redhat.com  Thu Sep 13 20:33:35 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:33:35 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.6,1.7
Message-ID: <200709132033.l8DKXZkq002335@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2317

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


And better changelog entry...





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nodoka-theme-gnome.spec	13 Sep 2007 20:30:07 -0000	1.6
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:33:03 -0000	1.7
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.1
+* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1



From fedora-extras-commits at redhat.com  Thu Sep 13 20:35:04 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 13 Sep 2007 16:35:04 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.7,1.8
Message-ID: <200709132035.l8DKZ4Ur002387@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2350

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Fix typo in changelog date.




Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nodoka-theme-gnome.spec	13 Sep 2007 20:33:03 -0000	1.7
+++ nodoka-theme-gnome.spec	13 Sep 2007 20:34:31 -0000	1.8
@@ -73,7 +73,7 @@
 
 
 %changelog
-* Thu Spe 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
+* Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1



From fedora-extras-commits at redhat.com  Thu Sep 13 20:37:02 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 13 Sep 2007 16:37:02 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 TurboGears.spec, 1.19, 1.20 sources,
	1.7, 1.8 TurboGears-1.0.2.2-etree.patch, 1.2,
	NONE TurboGears-1.0.2.2-setuptools.patch, 1.3, NONE
Message-ID: <200709132037.l8DKb24S002521@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2468

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.3.2-setuptools.patch 
Removed Files:
	TurboGears-1.0.2.2-etree.patch 
	TurboGears-1.0.2.2-setuptools.patch 
Log Message:
* Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
- 1.0.3.2
- Remove etree patch



TurboGears-1.0.3.2-setuptools.patch:

--- NEW FILE TurboGears-1.0.3.2-setuptools.patch ---
--- setup.py.orig	2007-09-13 16:14:36.000000000 -0400
+++ setup.py	2007-09-13 16:20:51.000000000 -0400
@@ -18,32 +18,22 @@
             "TurboKid >= 1.0.2",
             "CherryPy >= 2.2.1,<3.0.0alpha",
             "simplejson >= 1.3",
-            "elementtree >= 1.2.6",
             "PasteScript >= 0.9.7",
-            "FormEncode >= 0.7.1",
             "setuptools >= 0.6c2",
             "RuleDispatch >= 0.5a0.dev-r2303",
             "DecoratorTools >= 1.4",
-            "ConfigObj >= 4.3.2"]
+]
 
-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
+tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
 
 standard = ["SQLObject>=0.8,<0.10dev"]
 
 # python 2.5 compatible list
 if sys.version_info < (2, 5):
-    install_requires.extend([
-        "cElementTree >= 1.0.5",
-        ])
     tgtesttools.extend([
         "pysqlite"
         ])
     standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
-else:
-    install_requires.extend([
-        "Cheetah >= 2.0rc7",
-        ])
-
 
 setup(
     name="TurboGears",
@@ -127,7 +117,7 @@
     extras_require = {
         "exp" : ["TGFastData"],
         "standard" : standard,
-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
+        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
         "testtools" : ["nose >= 0.9.1"],
         "tgtesttools" : tgtesttools,
     },


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 May 2007 07:52:55 -0000	1.7
+++ .cvsignore	13 Sep 2007 20:36:29 -0000	1.8
@@ -1 +1 @@
-TurboGears-1.0.2.2.tar.gz
+TurboGears-1.0.3.2.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurboGears.spec	2 Sep 2007 04:51:56 -0000	1.19
+++ TurboGears.spec	13 Sep 2007 20:36:29 -0000	1.20
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.2.2
-Release:        3%{?dist}
+Version:        1.0.3.2
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -11,7 +11,6 @@
 URL:            http://www.turbogears.org
 Source0:        http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-setuptools.patch
-Patch1:         %{name}-%{version}-etree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -64,12 +63,10 @@
 %prep
 %setup -q
 %patch0 -b .setuptools
-%patch1 -b .etree
 
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
@@ -87,7 +84,11 @@
 %{python_sitelib}/turbogears/
 
 %changelog
-* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+* Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
+- 1.0.3.2
+- Remove etree patch
+
+* Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
 - Update for python-setuptools changes in rawhide
 
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 May 2007 07:52:55 -0000	1.7
+++ sources	13 Sep 2007 20:36:29 -0000	1.8
@@ -1 +1 @@
-a8d79645b4ce67409026838ca360addc  TurboGears-1.0.2.2.tar.gz
+75471c1767af970479ca2d4788a30323  TurboGears-1.0.3.2.tar.gz


--- TurboGears-1.0.2.2-etree.patch DELETED ---


--- TurboGears-1.0.2.2-setuptools.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 20:38:38 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 13 Sep 2007 16:38:38 -0400
Subject: rpms/TurboGears/devel TurboGears.spec,1.20,1.21
Message-ID: <200709132038.l8DKcc1g002645@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2596

Modified Files:
	TurboGears.spec 
Log Message:
changelog fix


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurboGears.spec	13 Sep 2007 20:36:29 -0000	1.20
+++ TurboGears.spec	13 Sep 2007 20:38:06 -0000	1.21
@@ -88,7 +88,7 @@
 - 1.0.3.2
 - Remove etree patch
 
-* Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-3
 - Update for python-setuptools changes in rawhide
 
 * Thu May 11 2007 Luke Macken <lmacken at redhat.com> 1.0.2.2-2



From fedora-extras-commits at redhat.com  Thu Sep 13 20:52:57 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 13 Sep 2007 16:52:57 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.57, 1.58 fedora-logos.spec,
	1.80, 1.81 sources, 1.61, 1.62
Message-ID: <200709132052.l8DKqvej003088@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 7.92.1





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	29 Aug 2007 03:17:34 -0000	1.57
+++ .cvsignore	13 Sep 2007 20:52:24 -0000	1.58
@@ -1 +1 @@
-fedora-logos-7.92.0.tar.bz2
+fedora-logos-7.92.1.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fedora-logos.spec	5 Sep 2007 14:23:21 -0000	1.80
+++ fedora-logos.spec	13 Sep 2007 20:52:24 -0000	1.81
@@ -1,10 +1,9 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.0
-Release: 4%{?dist}
+Version: 7.92.1
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
-Source1: infinity-grub.xpm.gz
 
 # The trademarks contained in this file are the property of Red Hat, Inc.  No
 # license to these trademarks is provided or is necessary if you merely
@@ -55,8 +54,6 @@
 mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
-# FIXME: fix bad tarball
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
 for i in firstboot/* ; do
@@ -206,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
+- add the powered-by logo (#250676)
+
 * Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 7.92.0-4
 - merge back changes that got lost
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	29 Aug 2007 03:17:34 -0000	1.61
+++ sources	13 Sep 2007 20:52:24 -0000	1.62
@@ -1 +1 @@
-e3c5d256b26dd0f0c31253bcf4c9adef  fedora-logos-7.92.0.tar.bz2
+7799320bef9d9adb66eb01cf7adc21c4  fedora-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 13 21:00:24 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 17:00:24 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.685, 1.686 kernel.spec, 1.163, 1.164 sources, 1.647,
	1.648 upstream, 1.569, 1.570 patch-2.6.23-rc6-git3.bz2.sign, 1.1, NONE
Message-ID: <200709132100.l8DL0Ori003287@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3253

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc6-git4.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git3.bz2.sign 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git4



--- NEW FILE patch-2.6.23-rc6-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG6YodyGugalF9Dw4RAu0mAKCMndFJ6CWEBcqtpv01qzblUEiNyQCeOQVc
vyEaSq54z5I6ffgW+MeL3z0=
=bRDp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -r1.685 -r1.686
--- .cvsignore	13 Sep 2007 16:29:27 -0000	1.685
+++ .cvsignore	13 Sep 2007 20:59:51 -0000	1.686
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git3.bz2
+patch-2.6.23-rc6-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kernel.spec	13 Sep 2007 16:29:27 -0000	1.163
+++ kernel.spec	13 Sep 2007 20:59:51 -0000	1.164
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1796,6 +1796,9 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git4
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git3
 - disable stack overflow debugging on i386
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- sources	13 Sep 2007 16:29:27 -0000	1.647
+++ sources	13 Sep 2007 20:59:51 -0000	1.648
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-436b893d0005eb90d1329a533bbf5b59  patch-2.6.23-rc6-git3.bz2
+cb3be21465bfff5bc14e38f5189b503a  patch-2.6.23-rc6-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- upstream	13 Sep 2007 16:29:27 -0000	1.569
+++ upstream	13 Sep 2007 20:59:51 -0000	1.570
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git3.bz2
+patch-2.6.23-rc6-git4.bz2


--- patch-2.6.23-rc6-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 21:05:04 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Thu, 13 Sep 2007 17:05:04 -0400
Subject: rpms/bouml/devel .cvsignore, 1.4, 1.5 bouml.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <200709132105.l8DL54pD009335@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9290

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.2-1 in devel.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Sep 2007 20:34:56 -0000	1.4
+++ .cvsignore	13 Sep 2007 21:04:31 -0000	1.5
@@ -1 +1 @@
-bouml_2.31.1.tar.gz
+bouml_2.31.2.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/bouml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouml.spec	5 Sep 2007 20:34:56 -0000	1.5
+++ bouml.spec	13 Sep 2007 21:04:31 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.31.1
+Version: 2.31.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -73,6 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc historic.html licence.txt
 %{_bindir}/%{name}
 %{_bindir}/projectControl
 %{_bindir}/projectSynchro
@@ -96,6 +97,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
+- Version bump to 2.31.2.
+
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
 - Version bump to 2.31.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2007 20:34:56 -0000	1.6
+++ sources	13 Sep 2007 21:04:31 -0000	1.7
@@ -1 +1 @@
-51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz
+84928cceed3a7a0c78327eea002b5418  bouml_2.31.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 21:06:57 2007
From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi))
Date: Thu, 13 Sep 2007 17:06:57 -0400
Subject: rpms/bouml/F-7 .cvsignore, 1.6, 1.7 bouml.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200709132106.l8DL6vAK009435@cvs-int.fedora.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9403

Modified Files:
	.cvsignore bouml.spec sources 
Log Message:
Updated to 2.31.2-1 in F-7.

 Modified Files:
 	.cvsignore bouml.spec sources 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Sep 2007 20:36:49 -0000	1.6
+++ .cvsignore	13 Sep 2007 21:06:24 -0000	1.7
@@ -1 +1 @@
-bouml_2.31.1.tar.gz
+bouml_2.31.2.tar.gz


Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/bouml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bouml.spec	5 Sep 2007 20:36:49 -0000	1.5
+++ bouml.spec	13 Sep 2007 21:06:24 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: UML2 tool box to specify and generate code in C++, Java and IDL
 Name: bouml
-Version: 2.31.1
+Version: 2.31.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -73,6 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc historic.html licence.txt
 %{_bindir}/%{name}
 %{_bindir}/projectControl
 %{_bindir}/projectSynchro
@@ -96,6 +97,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Fri Sep 14 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.2-1
+- Version bump to 2.31.2.
+
 * Thu Sep 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.31.1-1
 - Version bump to 2.31.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Sep 2007 20:36:49 -0000	1.6
+++ sources	13 Sep 2007 21:06:24 -0000	1.7
@@ -1 +1 @@
-51c4366c4d2e80ac53fe66c3fa0e0a32  bouml_2.31.1.tar.gz
+84928cceed3a7a0c78327eea002b5418  bouml_2.31.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 21:43:59 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Thu, 13 Sep 2007 17:43:59 -0400
Subject: rpms/remind/devel .cvsignore, 1.4, 1.5 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709132143.l8DLhx8Y010221@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10192

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Updated to version 03.01.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2007 15:48:46 -0000	1.4
+++ .cvsignore	13 Sep 2007 21:43:25 -0000	1.5
@@ -1 +1 @@
-remind-03.01.01.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:28:26 -0000	1.1
+++ remind-nostrip.patch	13 Sep 2007 21:43:25 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- remind.spec	23 Aug 2007 15:48:46 -0000	1.3
+++ remind.spec	13 Sep 2007 21:43:25 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           remind
-Version:        03.01.01
+Version:        03.01.02
 Release:        1%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
@@ -77,9 +77,11 @@
 %{_bindir}/cm2rem.tcl
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -90,6 +92,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
 * Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
 - Updated to version 03.01.01
 - Updated license tag to GPLv2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 15:48:46 -0000	1.4
+++ sources	13 Sep 2007 21:43:25 -0000	1.5
@@ -1 +1 @@
-b73f93014b5cdae402f1641dd95f477f  remind-03.01.01.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 22:05:18 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Thu, 13 Sep 2007 18:05:18 -0400
Subject: rpms/remind/F-7 .cvsignore, 1.4, 1.5 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709132205.l8DM5IfI016608@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16524

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Updated to v03.01.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2007 20:31:59 -0000	1.4
+++ .cvsignore	13 Sep 2007 22:04:44 -0000	1.5
@@ -1 +1 @@
-remind-03.01.01.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:40:09 -0000	1.1
+++ remind-nostrip.patch	13 Sep 2007 22:04:44 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- remind.spec	23 Aug 2007 20:31:59 -0000	1.3
+++ remind.spec	13 Sep 2007 22:04:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           remind
-Version:        03.01.01
+Version:        03.01.02
 Release:        1%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
@@ -77,9 +77,11 @@
 %{_bindir}/cm2rem.tcl
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -90,6 +92,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
 * Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
 - Updated to version 03.01.01
 - Updated license tag to GPLv2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 20:31:59 -0000	1.4
+++ sources	13 Sep 2007 22:04:44 -0000	1.5
@@ -1 +1 @@
-b73f93014b5cdae402f1641dd95f477f  remind-03.01.01.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 13 22:12:25 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 13 Sep 2007 18:12:25 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.223.2.21,1.223.2.22
Message-ID: <200709132212.l8DMCPw3016743@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16724/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
rename js to kjs because of file conflict (kde#149840)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.21
retrieving revision 1.223.2.22
diff -u -r1.223.2.21 -r1.223.2.22
--- kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
+++ kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -141,6 +141,9 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# fix file conflict with js (kde#149840)
+mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
+
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -226,6 +229,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
+- rename js to kjs because of file conflict (kde#149840)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
 - actually install kde4.sh and kde4.csh
 - sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3



From fedora-extras-commits at redhat.com  Thu Sep 13 22:53:06 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 13 Sep 2007 18:53:06 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.84,1.85
Message-ID: <200709132253.l8DMr6o6017996@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17834

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
- Resolves #288711
- Ensure that all features are unpacked.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- eclipse-cdt.spec	10 Sep 2007 22:12:19 -0000	1.84
+++ eclipse-cdt.spec	13 Sep 2007 22:52:28 -0000	1.85
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -262,6 +262,14 @@
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.master*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.debug.gdbjtag*
 
+# Unpack all existing feature jars
+for x in ${RPM_BUILD_ROOT}/%{eclipse_base}/features/*.jar; do
+  dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'`
+  mkdir -p $dirname
+  unzip $x -d $dirname
+  rm $x
+done 
+
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.testing*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.gdbjtag*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.ant*
@@ -347,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
+- Resolves #288711
+- Ensure that all features are unpacked.
+
 * Mon Sep 10 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-6
 - Resolves #274551, #253331, #254246, #254248
 - Rebase Autotools to 0.9.3 



From fedora-extras-commits at redhat.com  Thu Sep 13 22:56:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 18:56:03 -0400
Subject: rpms/kernel/F-7 linux-2.6-libata-pata-dma-disable-option.patch, 1.1,
	1.2
Message-ID: <200709132256.l8DMu33D018098@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074

Modified Files:
	linux-2.6-libata-pata-dma-disable-option.patch 
Log Message:
fix libata DMA patch


linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pata-dma-disable-option.patch	13 Sep 2007 22:21:49 -0000	1.1
+++ linux-2.6-libata-pata-dma-disable-option.patch	13 Sep 2007 22:55:57 -0000	1.2
@@ -20,11 +20,22 @@
 
 Signed-off-by: Alan Cox <alan at redhat.com>
 
----
- Documentation/kernel-parameters.txt |    6 ++++++
- drivers/ata/libata-core.c           |   17 +++++++++++++++++
- 2 files changed, 23 insertions(+)
 
+--- linux-2.6.22.noarch.orig/include/linux/libata.h
++++ linux-2.6.22.noarch/include/linux/libata.h
+@@ -298,6 +298,12 @@ enum {
+ 	ATA_HORKAGE_NODMA	= (1 << 1),	/* DMA problems */
+ 	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */
+ 	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */
++
++	/* DMA mask for user DMA control: User visible values do not
++	   renumber */
++	ATA_DMA_MASK_ATA	= (1 << 0),	/* DMA on ATA Disk */
++	ATA_DMA_MASK_ATAPI	= (1 << 1),	/* DMA on ATAPI */
++	ATA_DMA_MASK_CFA	= (1 << 2),	/* DMA on CF Card */
+ };
+ 
+ enum hsm_task_states {
 --- linux-2.6.22.noarch.orig/drivers/ata/libata-core.c
 +++ linux-2.6.22.noarch/drivers/ata/libata-core.c
 @@ -93,6 +93,10 @@ static int ata_ignore_hpa = 0;



From fedora-extras-commits at redhat.com  Thu Sep 13 23:14:40 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 13 Sep 2007 19:14:40 -0400
Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.7, 1.8 kernel-xen.spec, 1.55,
	1.56 sources, 1.7, 1.8 linux-2.6.21.6-xen-3.1.0.patch, 1.2, NONE
Message-ID: <200709132314.l8DNEe1J024331@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24286

Modified Files:
	.cvsignore kernel-xen.spec sources 
Removed Files:
	linux-2.6.21.6-xen-3.1.0.patch 
Log Message:
Rebase to Linux 2.6.21.7

Use 'make upload' and compress the Xen patch because it is too big
(2.7 MB uncompressed).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jul 2007 14:13:44 -0000	1.7
+++ .cvsignore	13 Sep 2007 23:14:06 -0000	1.8
@@ -1,3 +1,4 @@
 xen-3.1.0-rc7-7041b52471c3.tar.bz2
-patch-2.6.21.6.bz2
 linux-2.6.21.tar.bz2
+patch-2.6.21.7.bz2
+linux-2.6.21.7-xen-3.1.0.patch.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kernel-xen.spec	13 Sep 2007 19:34:21 -0000	1.55
+++ kernel-xen.spec	13 Sep 2007 23:14:06 -0000	1.56
@@ -325,7 +325,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21.6.bz2
+Patch1: patch-2.6.21.7.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -462,10 +462,10 @@
 Patch910: linux-2.6-tux.patch
 
 # 950 - 999 Xen
-# linux-2.6.21.6-xen-3.1.0.patch patch generated by
-# 'hg diff -r4edbf98e9507 -r3990a07432f0' from
+# linux-2.6.21.7-xen-3.1.0.patch patch generated by
+# 'hg diff -rd91e11100fb0 -rd610071e6045 -X .hgtags' on
 # http://hg.et.redhat.com/kernel-dev/ehabkost/linux-2.6.21.y-xen-3.1.0
-Patch950: linux-2.6.21.6-xen-3.1.0.patch
+Patch950: linux-2.6.21.7-xen-3.1.0.patch.bz2
 Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch960: linux-2.6-xen-blkfront-wait-add.patch
 Patch961: linux-2.6-xen-backwards-time.patch
@@ -2369,6 +2369,9 @@
 
 %changelog
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Rebase to 2.6.21.7
+
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Fix for bug #248398: HVM domain hangs during (F-7) install.
   Backported fix from xen-unstable: 15239:656b8175f4f2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jul 2007 14:13:45 -0000	1.7
+++ sources	13 Sep 2007 23:14:06 -0000	1.8
@@ -1,3 +1,4 @@
 b73a966a55f3907020a1a29b4e2df64d  xen-3.1.0-rc7-7041b52471c3.tar.bz2
-f6941d0ddc39726042626e027fd3ed08  patch-2.6.21.6.bz2
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
+b9c8734471a454806c77f040fcf9869b  patch-2.6.21.7.bz2
+0b7a1468bcd3353b77494cbf0e97d2e4  linux-2.6.21.7-xen-3.1.0.patch.bz2


--- linux-2.6.21.6-xen-3.1.0.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 22:22:21 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 13 Sep 2007 18:22:21 -0400
Subject: rpms/kernel/F-7 linux-2.6-futex-fix-traversal.patch, NONE,
	1.1 linux-2.6-libata-pata-dma-disable-option.patch, NONE,
	1.1 linux-2.6-libata-pata_it821x-dma.patch, NONE,
	1.1 linux-2.6-libata-pata_via-cable-detect.patch, NONE,
	1.1 linux-2.6-lvm-snapshot-deadlock-fix.patch, NONE,
	1.1 linux-2.6-scsi-mpt-vmware-fix.patch, NONE,
	1.1 linux-2.6-skb_copy_and_csum_datagram_iovec.patch, NONE,
	1.1 linux-2.6-usb-allow-1-byte-replies.patch, NONE,
	1.1 linux-2.6-usb-fixup-interval-lengths.patch, NONE,
	1.1 linux-2.6-usb-linked-list-insertion.patch, NONE,
	1.1 linux-2.6-usb-storage-initialize-huawei-e220-properly.patch,
	NONE, 1.1 patch-2.6.22.6.bz2.sign, NONE, 1.1 .cvsignore, 1.631,
	1.632 kernel-2.6.spec, 1.3340, 1.3341 sources, 1.594,
	1.595 upstream, 1.518, 1.519 patch-2.6.22.5.bz2.sign, 1.1,
	NONE patch-2.6.22.6-rc1.patch, 1.1, NONE
Message-ID: <200709132222.l8DMML2W017159@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-futex-fix-traversal.patch 
	linux-2.6-libata-pata-dma-disable-option.patch 
	linux-2.6-libata-pata_it821x-dma.patch 
	linux-2.6-libata-pata_via-cable-detect.patch 
	linux-2.6-lvm-snapshot-deadlock-fix.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-usb-allow-1-byte-replies.patch 
	linux-2.6-usb-fixup-interval-lengths.patch 
	linux-2.6-usb-linked-list-insertion.patch 
	linux-2.6-usb-storage-initialize-huawei-e220-properly.patch 
	patch-2.6.22.6.bz2.sign 
Removed Files:
	patch-2.6.22.5.bz2.sign patch-2.6.22.6-rc1.patch 
Log Message:
* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.6 (official)
- libata: add option to disable DMA on PATA devices
- libata: fix DMA on ATAPI devices with it821x (#242229)
- libata: fix cable detection on pata_via
- fix vmware's broken SCSI device emulation (#241935)
- fix init of huawei 220 modem (#253096)
- LVM: fix hang and lockups during snapshot (#269541)
- net: fix oops with zero-length packet (#253290)
- USB: three trivial fixes
- futex: fix compat list traversal


linux-2.6-futex-fix-traversal.patch:

--- NEW FILE linux-2.6-futex-fix-traversal.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=179c85ea53bef807621f335767e41e23f86f01df
Commit:     179c85ea53bef807621f335767e41e23f86f01df
Parent:     a570ab6f10462b062c28188b64377b8034235761
Author:     Arnd Bergmann <arnd at arndb.de>
AuthorDate: Tue Sep 11 15:23:49 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Tue Sep 11 17:21:20 2007 -0700

    futex_compat: fix list traversal bugs
    
    The futex list traversal on the compat side appears to have
    a bug.
    
    It's loop termination condition compares:
    
            while (compat_ptr(uentry) != &head->list)
    
    But that can't be right because "uentry" has the special
    "pi" indicator bit still potentially set at bit 0.  This
    is cleared by fetch_robust_entry() into the "entry"
    return value.
    
    What this seems to mean is that the list won't terminate
    when list iteration gets back to the the head.  And we'll
    also process the list head like a normal entry, which could
    cause all kinds of problems.
    
    So we should check for equality with "entry".  That pointer
    is of the non-compat type so we have to do a little casting
    to keep the compiler and sparse happy.
    
    The same problem can in theory occur with the 'pending'
    variable, although that has not been reported from users
    so far.
    
    Based on the original patch from David Miller.
    
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: David Miller <davem at davemloft.net>
    Signed-off-by: Arnd Bergmann <arnd at arndb.de>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 kernel/futex_compat.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index f792136..7e52eb0 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
 	if (fetch_robust_entry(&upending, &pending,
 			       &head->list_op_pending, &pip))
 		return;
-	if (upending)
+	if (pending)
 		handle_futex_death((void __user *)pending + futex_offset, curr, pip);
 
-	while (compat_ptr(uentry) != &head->list) {
+	while (entry != (struct robust_list __user *) &head->list) {
 		/*
 		 * A pending lock might already be on the list, so
 		 * dont process it twice:

linux-2.6-libata-pata-dma-disable-option.patch:

--- NEW FILE linux-2.6-libata-pata-dma-disable-option.patch ---
This is useful when debugging, handling problem systems, or for
distributions just to get the system installed so it can be sorted
out later.

This is a bit smarter than the old IDE one and lets you do

libata.pata_dma=0		Disable all PATA DMA like old IDE
libata.pata_dma=1		Disk DMA only
libata.pata_dma=2		ATAPI DMA only
libata.pata_dma=4		CF DMA only

(or combinations thereof - 0,1,3 being the useful ones I suspect)

(I've split CF as it seems to be a seperate case of pain and suffering
different to the others and caused by assorted PIO wired adapters etc)

SATA is not affected - for one its not clear it makes sense to disable
DMA for SATA if even always possible, for two we've seen no failure 
evidence to justify needing to support this kind of hammer on SATA.

Signed-off-by: Alan Cox <alan at redhat.com>

---
 Documentation/kernel-parameters.txt |    6 ++++++
 drivers/ata/libata-core.c           |   17 +++++++++++++++++
 2 files changed, 23 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ata/libata-core.c
+++ linux-2.6.22.noarch/drivers/ata/libata-core.c
@@ -93,6 +93,10 @@ static int ata_ignore_hpa = 0;
 module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
 MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
 
+static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
+module_param_named(pata_dma, ata_pata_dma, int, 0644);
+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -2821,16 +2825,29 @@ int ata_do_set_mode(struct ata_port *ap,
 	/* step 1: calculate xfer_mask */
 	for (i = 0; i < ATA_MAX_DEVICES; i++) {
 		unsigned int pio_mask, dma_mask;
+		unsigned int mode_mask;
 
 		dev = &ap->device[i];
 
 		if (!ata_dev_enabled(dev))
 			continue;
 
+		mode_mask = ATA_DMA_MASK_ATA;
+		if (dev->class == ATA_DEV_ATAPI)
+			mode_mask = ATA_DMA_MASK_ATAPI;
+		else if (ata_id_is_cfa(dev->id))
+			mode_mask = ATA_DMA_MASK_CFA;
+
 		ata_dev_xfermask(dev);
 
 		pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
 		dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+
+		if ((ata_pata_dma & mode_mask) || ap->cbl == ATA_CBL_SATA)
+			dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
+		else
+			dma_mask = 0;
+
 		dev->pio_mode = ata_xfer_mask2mode(pio_mask);
 		dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
--- linux-2.6.22.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.22.noarch/Documentation/kernel-parameters.txt
@@ -853,6 +853,12 @@ and is between 256 and 4096 characters. 
 	llsc*=		[IA64] See function print_params() in
 			arch/ia64/sn/kernel/llsc4.c.
 
+	libata.pata_dma= [LIBATA]
+		libata.pata_dma=0	Disable all PATA DMA like old IDE
+		libata.pata_dma=1	Disk DMA only
+		libata.pata_dma=2	ATAPI DMA only
+		libata.pata_dma=4	CF DMA only
+
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
 			See Documentation/ramdisk.txt.
 

linux-2.6-libata-pata_it821x-dma.patch:

--- NEW FILE linux-2.6-libata-pata_it821x-dma.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bce7d5e0e1fc0c1f1251b7f21a19cb48207408b6
Commit:     bce7d5e0e1fc0c1f1251b7f21a19cb48207408b6
Parent:     08ebd43d6b9b63de681b8f255c0fabae8033527c
Author:     Jeff Norden <jnorden at math.tntech.edu>
AuthorDate: Tue Sep 4 11:07:20 2007 -0500
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Mon Sep 10 21:53:00 2007 -0400

bz 242229

    pata_it821x: fix lost interrupt with atapi devices
    
    Fix "lost" interrupt problem when using dma with CD/DVD drives in some
    configurations.  This problem can make installing linux from media
    impossible for distro's that have switched to libata-only configurations.
    
    The simple fix is to eliminate the use of dma for reading drive status, etc,
    by checking the number of bytes to transferred.
    
    This change will only affect the behavior of atapi devices, not disks.
    There is more info at http://bugzilla.redhat.com/show_bug.cgi?id=242229
    This patch is for 2.6.22.1
    
    Signed-off-by: Jeff Norden <jnorden at math.tntech.edu>
    Reviewed-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/pata_it821x.c |    4 ++++
 1 file changed, 4 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/ata/pata_it821x.c
+++ linux-2.6.22.noarch/drivers/ata/pata_it821x.c
@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct
 	struct ata_port *ap = qc->ap;
 	struct it821x_dev *itdev = ap->private_data;
 
+	/* Only use dma for transfers to/from the media. */
+	if (qc->nbytes < 2048)
+		return -EOPNOTSUPP;
+
 	/* No ATAPI DMA in smart mode */
 	if (itdev->smart)
 		return -EOPNOTSUPP;

linux-2.6-libata-pata_via-cable-detect.patch:

--- NEW FILE linux-2.6-libata-pata_via-cable-detect.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=08ebd43d6b9b63de681b8f255c0fabae8033527c
Commit:     08ebd43d6b9b63de681b8f255c0fabae8033527c
Parent:     897ee77bfba12b83752027427a41009961458ee6
Author:     Laurent Riffard <laurent.riffard at free.fr>
AuthorDate: Sun Sep 2 21:01:32 2007 +0200
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Mon Sep 10 21:50:24 2007 -0400

    Fix broken pata_via cable detection
    
    via_do_set_mode overwrites 80-wire cable detection bits. Let's
    preserve them.
    
    Signed-off-by: Laurent Riffard <laurent.riffard at free.fr>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/pata_via.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/ata/pata_via.c
+++ linux-2.6.22.noarch/drivers/ata/pata_via.c
@@ -240,7 +240,6 @@ static void via_do_set_mode(struct ata_p
 	int ut;
 	int offset = 3 - (2*ap->port_no) - adev->devno;
 
-
 	/* Calculate the timing values we require */
 	ata_timing_compute(adev, mode, &t, T, UT);
 
@@ -287,9 +286,17 @@ static void via_do_set_mode(struct ata_p
 			ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
 			break;
 	}
+
 	/* Set UDMA unless device is not UDMA capable */
-	if (udma_type)
-		pci_write_config_byte(pdev, 0x50 + offset, ut);
+	if (udma_type) {
+		u8 cable80_status;
+
+		/* Get 80-wire cable detection bit */
+		pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
+		cable80_status &= 0x10;
+
+		pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
+	}
 }
 
 static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)

linux-2.6-lvm-snapshot-deadlock-fix.patch:

--- NEW FILE linux-2.6-lvm-snapshot-deadlock-fix.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fcac03abd325e4f7a4cc8fe05fea2793b1c8eb75
Commit:     fcac03abd325e4f7a4cc8fe05fea2793b1c8eb75
Parent:     596f138eede0c113aa655937c8be85fc15ccd61c
Author:     Milan Broz <mbroz at redhat.com>
AuthorDate: Thu Jul 12 17:28:00 2007 +0100
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Thu Jul 12 15:01:08 2007 -0700

bz 269541

    dm snapshot: fix invalidation deadlock
    
    Process persistent exception store metadata IOs in a separate thread.
    
    A snapshot may become invalid while inside generic_make_request().
    A synchronous write is then needed to update the metadata while still
    inside that function.  Since the introduction of
    md-dm-reduce-stack-usage-with-stacked-block-devices.patch this has to
    be performed by a separate thread to avoid deadlock.
    
    Signed-off-by: Milan Broz <mbroz at redhat.com>
    Signed-off-by: Alasdair G Kergon <agk at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/md/dm-exception-store.c |   48 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/md/dm-exception-store.c
+++ linux-2.6.22.noarch/drivers/md/dm-exception-store.c
@@ -125,6 +125,8 @@ struct pstore {
 	uint32_t callback_count;
 	struct commit_callback *callbacks;
 	struct dm_io_client *io_client;
+
+	struct workqueue_struct *metadata_wq;
 };
 
 static inline unsigned int sectors_to_pages(unsigned int sectors)
@@ -156,10 +158,24 @@ static void free_area(struct pstore *ps)
 	ps->area = NULL;
 }
 
+struct mdata_req {
+	struct io_region *where;
+	struct dm_io_request *io_req;
+	struct work_struct work;
+	int result;
+};
+
+static void do_metadata(struct work_struct *work)
+{
+	struct mdata_req *req = container_of(work, struct mdata_req, work);
+
+	req->result = dm_io(req->io_req, 1, req->where, NULL);
+}
+
 /*
  * Read or write a chunk aligned and sized block of data from a device.
  */
-static int chunk_io(struct pstore *ps, uint32_t chunk, int rw)
+static int chunk_io(struct pstore *ps, uint32_t chunk, int rw, int metadata)
 {
 	struct io_region where = {
 		.bdev = ps->snap->cow->bdev,
@@ -173,8 +189,23 @@ static int chunk_io(struct pstore *ps, u
 		.client = ps->io_client,
 		.notify.fn = NULL,
 	};
+	struct mdata_req req;
+
+	if (!metadata)
+		return dm_io(&io_req, 1, &where, NULL);
 
-	return dm_io(&io_req, 1, &where, NULL);
+	req.where = &where;
+	req.io_req = &io_req;
+
+	/*
+	 * Issue the synchronous I/O from a different thread
+	 * to avoid generic_make_request recursion.
+	 */
+	INIT_WORK(&req.work, do_metadata);
+	queue_work(ps->metadata_wq, &req.work);
+	flush_workqueue(ps->metadata_wq);
+
+	return req.result;
 }
 
 /*
@@ -189,7 +220,7 @@ static int area_io(struct pstore *ps, ui
 	/* convert a metadata area index to a chunk index */
 	chunk = 1 + ((ps->exceptions_per_area + 1) * area);
 
-	r = chunk_io(ps, chunk, rw);
+	r = chunk_io(ps, chunk, rw, 0);
 	if (r)
 		return r;
 
@@ -230,7 +261,7 @@ static int read_header(struct pstore *ps
 	if (r)
 		return r;
 
-	r = chunk_io(ps, 0, READ);
+	r = chunk_io(ps, 0, READ, 1);
 	if (r)
 		goto bad;
 
@@ -292,7 +323,7 @@ static int write_header(struct pstore *p
 	dh->version = cpu_to_le32(ps->version);
 	dh->chunk_size = cpu_to_le32(ps->snap->chunk_size);
 
-	return chunk_io(ps, 0, WRITE);
+	return chunk_io(ps, 0, WRITE, 1);
 }
 
 /*
@@ -409,6 +440,7 @@ static void persistent_destroy(struct ex
 {
 	struct pstore *ps = get_info(store);
 
+	destroy_workqueue(ps->metadata_wq);
 	dm_io_client_destroy(ps->io_client);
 	vfree(ps->callbacks);
 	free_area(ps);
@@ -589,6 +621,12 @@ int dm_create_persistent(struct exceptio
 	atomic_set(&ps->pending_count, 0);
 	ps->callbacks = NULL;
 
+	ps->metadata_wq = create_singlethread_workqueue("ksnaphd");
+	if (!ps->metadata_wq) {
+		DMERR("couldn't start header metadata update thread");
+		return -ENOMEM;
+	}
+
 	store->destroy = persistent_destroy;
 	store->read_metadata = persistent_read_metadata;
 	store->prepare_exception = persistent_prepare;

linux-2.6-scsi-mpt-vmware-fix.patch:

--- NEW FILE linux-2.6-scsi-mpt-vmware-fix.patch ---
The attached patch is a workaround for a bug in VMWare's emulated LSI
Fusion SCSI HBA.  The emulated firmware returns zero for the maximum
number of attached devices; the real firmware returns a positive
number.  Therefore, the kernel that boots and works fine on bare metal
will fail on VMWare because this firmware value is handed to the SCSI
midlayer, which then skips the entire bus scan.

F7 bz 241935

The patch below was submitted by Eric Moore of LSI to the linux-scsi
mailing list:

http://marc.info/?l=linux-scsi&m=117432237404247

then immediately rejected by Christoph Hellwig, who prefers that
VMWare fix their emulation instead.

---
 drivers/message/fusion/mptbase.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/message/fusion/mptbase.c
+++ linux-2.6.22.noarch/drivers/message/fusion/mptbase.c
@@ -2573,8 +2573,19 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
 	pfacts->MaxPersistentIDs = le16_to_cpu(pfacts->MaxPersistentIDs);
 	pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets);
 
-	max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID :
-	    pfacts->MaxDevices;
+	switch (ioc->bus_type) {
+	case SAS:
+		max_id = pfacts->PortSCSIID;
+		break;
+	case FC:
+		max_id = pfacts->MaxDevices;
+		break;
+	case SPI:
+	default:
+		max_id = MPT_MAX_SCSI_DEVICES;
+		break;
+	}
+
 	ioc->devices_per_bus = (max_id > 255) ? 256 : max_id;
 	ioc->number_of_buses = (ioc->devices_per_bus < 256) ? 1 : max_id/256;
 

linux-2.6-skb_copy_and_csum_datagram_iovec.patch:

--- NEW FILE linux-2.6-skb_copy_and_csum_datagram_iovec.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ef8aef55ce61fd0e2af798695f7386ac756ae1e7
Commit:     ef8aef55ce61fd0e2af798695f7386ac756ae1e7
Parent:     2fbe43f6f631dd7ce19fb1499d6164a5bdb34568
Author:     Herbert Xu <herbert at gondor.apana.org.au>
AuthorDate: Thu Sep 6 14:06:35 2007 +0100
Committer:  David S. Miller <davem at kimchee.(none)>
CommitDate: Tue Sep 11 10:29:07 2007 +0200

    [NET]: Do not dereference iov if length is zero
    
    When msg_iovlen is zero we shouldn't try to dereference
    msg_iov.  Right now the only thing that tries to do so
    is skb_copy_and_csum_datagram_iovec.  Since the total
    length should also be zero if msg_iovlen is zero, it's
    sufficient to check the total length there and simply
    return if it's zero.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/core/datagram.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/core/datagram.c b/net/core/datagram.c
index cb056f4..029b93e 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
 	__wsum csum;
 	int chunk = skb->len - hlen;
 
+	if (!chunk)
+		return 0;
+
 	/* Skip filled elements.
 	 * Pretty silly, look at memcpy_toiovec, though 8)
 	 */

linux-2.6-usb-allow-1-byte-replies.patch:

--- NEW FILE linux-2.6-usb-allow-1-byte-replies.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=46dede4690bbb23a2c9d60561e2e4fdc3e6bee61
Commit:     46dede4690bbb23a2c9d60561e2e4fdc3e6bee61
Parent:     f095137e799ddb6a7c2bf0e4c73cda193ab9df41
Author:     Alan Stern <stern at rowland.harvard.edu>
AuthorDate: Tue Aug 14 10:56:10 2007 -0400
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Wed Aug 22 14:27:49 2007 -0700

    USB: accept 1-byte Device Status replies, fixing some b0rken devices
    
    Some devices have a bug which causes them to send a 1-byte reply to
    Get-Device-Status requests instead of 2 bytes as required by the
    spec.  This doesn't play well with autosuspend, since we look for a
    valid status reply to make sure the device is still present when it
    resumes.  Without both bytes, we assume the device has been
    disconnected.
    
    Lack of the second byte shouldn't matter much, since the spec requires
    it always to be equal to 0.  Hence this patch (as959) causes
    finish_port_resume() to accept a 1-byte reply as valid.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Acked-by: David Brownell <david-b at pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

    [<cebbert at redhat.com>: reworked for 2.6.22]
    [<cebbert at redhat.com>: made test more careful]
---
 drivers/usb/core/hub.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.22.noarch.orig/drivers/usb/core/hub.c
+++ linux-2.6.22.noarch/drivers/usb/core/hub.c
@@ -1719,7 +1719,7 @@ int usb_port_suspend(struct usb_device *
 static int finish_port_resume(struct usb_device *udev)
 {
 	int	status;
-	u16	devstatus;
+	u16	devstatus = 0;
 
 	/* caller owns the udev device lock */
 	dev_dbg(&udev->dev, "finish resume\n");
@@ -1739,7 +1739,7 @@ static int finish_port_resume(struct usb
 	 */
 	status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
 	if (status >= 0)
-		status = (status == 2 ? 0 : -ENODEV);
+		status = (status == 2 || status == 1) ? 0 : -ENODEV;
 
 	if (status)
 		dev_dbg(&udev->dev,

linux-2.6-usb-fixup-interval-lengths.patch:

--- NEW FILE linux-2.6-usb-fixup-interval-lengths.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=300871cd963e24a68aaa9b762f4a10403697d9be
Commit:     300871cd963e24a68aaa9b762f4a10403697d9be
Parent:     87d093e25d73249ae92b28ae88db92eaea7df70f
Author:     Laurent Pinchart <laurent.pinchart at skynet.be>
AuthorDate: Tue Jun 12 21:47:17 2007 +0200
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Thu Jul 12 16:34:37 2007 -0700

    USB: Fix up full-speed bInterval values in high-speed interrupt descriptor
    
    Many device manufacturers are using full-speed bInterval values in high-speed
    interrupt endpoint descriptors. If the bInterval value is greater than 16,
    assume the device uses full-speed descriptors and fix the value accordingly.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart at skynet.be>
    Acked-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/usb/core/config.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 9152e12..5e113db 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -85,15 +85,21 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum,
 	memcpy(&endpoint->desc, d, n);
 	INIT_LIST_HEAD(&endpoint->urb_list);
 
-	/* If the bInterval value is outside the legal range,
-	 * set it to a default value: 32 ms */
+	/* Fix up bInterval values outside the legal range. Use 32 ms if no
+	 * proper value can be guessed. */
 	i = 0;		/* i = min, j = max, n = default */
 	j = 255;
 	if (usb_endpoint_xfer_int(d)) {
 		i = 1;
 		switch (to_usb_device(ddev)->speed) {
 		case USB_SPEED_HIGH:
-			n = 9;		/* 32 ms = 2^(9-1) uframes */
+			/* Many device manufacturers are using full-speed
+			 * bInterval values in high-speed interrupt endpoint
+			 * descriptors. Try to fix those and fall back to a
+			 * 32 ms default value otherwise. */
+			n = fls(d->bInterval*8);
+			if (n == 0)
+				n = 9;	/* 32 ms = 2^(9-1) uframes */
 			j = 16;
 			break;
 		default:		/* USB_SPEED_FULL or _LOW */

linux-2.6-usb-linked-list-insertion.patch:

--- NEW FILE linux-2.6-usb-linked-list-insertion.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e5dd01154c1e9ca2400f4682602d1a4fa54c25dd
Commit:     e5dd01154c1e9ca2400f4682602d1a4fa54c25dd
Parent:     ce05916f6bf9906fba88853078715f9a4d300237
Author:     Nathael Pajani <nathael.pajani at cpe.fr>
AuthorDate: Tue Sep 4 11:46:23 2007 +0200
Committer:  Greg Kroah-Hartman <gregkh at suse.de>
CommitDate: Tue Sep 11 07:48:15 2007 -0700

    USB: fix linked list insertion bugfix for usb core
    
    This patch fixes the order of list_add_tail() arguments in
    usb_store_new_id() so the list can have more than one single element.
    
    Signed-off-by: Nathael Pajani <nathael.pajani at cpe.fr>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/usb/core/driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index a1ad11d..63b1243 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -60,7 +60,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
 	dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
 
 	spin_lock(&dynids->lock);
-	list_add_tail(&dynids->list, &dynid->node);
+	list_add_tail(&dynid->node, &dynids->list);
 	spin_unlock(&dynids->lock);
 
 	if (get_driver(driver)) {

linux-2.6-usb-storage-initialize-huawei-e220-properly.patch:

--- NEW FILE linux-2.6-usb-storage-initialize-huawei-e220-properly.patch ---
>From johann.wilhelm at student.tugraz.at  Sun Sep  9 08:19:38 2007
From: Johann Wilhelm <johann.wilhelm at student.tugraz.at>
Date: Wed, 05 Sep 2007 13:49:29 +0200
Subject: USB: usb-storage: Initialize Huawei E220 properly
To: linux-usb-devel at lists.sourceforge.net
Cc: greg at kroah.com, drussell at redhat.com
Message-ID: <20070905134929.5fv51ji2v40gkw0c at webmail.tugraz.at>
Content-Disposition: inline

bz 253096

From: Johann Wilhelm <johann.wilhelm at student.tugraz.at>

This is a reworked version of this patch:
http://www.mail-archive.com/linux-usb-devel%40lists.sourceforge.net/msg55094/activate_huawei_dev.patch

That properly initializes the HUAWEI E220 devices into multi-port mode.

Signed-off-by: Johann Wilhelm <johann.wilhelm at student.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/usb/storage/initializers.c |   14 ++++++++++++++
 drivers/usb/storage/initializers.h |    3 +++
 drivers/usb/storage/unusual_devs.h |   11 +++++++++++
 3 files changed, 28 insertions(+)

--- linux-2.6.22.noarch.orig/drivers/usb/storage/initializers.c
+++ linux-2.6.22.noarch/drivers/usb/storage/initializers.c
@@ -90,3 +90,17 @@ int usb_stor_ucr61s2b_init(struct us_dat
 
 	return (res ? -1 : 0);
 }
+
+/* This places the HUAWEI E220 devices in multi-port mode */
+int usb_stor_huawei_e220_init(struct us_data *us)
+{
+	int result;
+
+	us->iobuf[0] = 0x1;
+	result = usb_stor_control_msg(us, us->send_ctrl_pipe,
+				      USB_REQ_SET_FEATURE,
+				      USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+				      0x01, 0x0, us->iobuf, 0x1, 1000);
+	US_DEBUGP("usb_control_msg performing result is %d\n", result);
+	return (result ? 0 : -1);
+}
--- linux-2.6.22.noarch.orig/drivers/usb/storage/initializers.h
+++ linux-2.6.22.noarch/drivers/usb/storage/initializers.h
@@ -47,3 +47,6 @@ int usb_stor_euscsi_init(struct us_data 
 /* This function is required to activate all four slots on the UCR-61S2B
  * flash reader */
 int usb_stor_ucr61s2b_init(struct us_data *us);
+
+/* This places the HUAWEI E220 devices in multi-port mode */
+int usb_stor_huawei_e220_init(struct us_data *us);
--- linux-2.6.22.noarch.orig/drivers/usb/storage/unusual_devs.h
+++ linux-2.6.22.noarch/drivers/usb/storage/unusual_devs.h
@@ -1394,6 +1394,17 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_IGNORE_RESIDUE ),
 
+/* Reported by fangxiaozhi <fangxiaozhi60675 at huawei.com>
+ * and by linlei <linlei83 at huawei.com>
+ * Patch reworked by Johann Wilhelm <johann.wilhelm at student.tugraz.at>
+ * This brings the HUAWEI E220 devices into multi-port mode
+ */
+UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000,
+		"HUAWEI MOBILE",
+		"Mass Storage",
+		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
+		0),
+
 /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
 UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,
 		"Minolta",


--- NEW FILE patch-2.6.22.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG17R8yGugalF9Dw4RAnFOAJ9oLLhlBcFaSr/lBib0QoQJ+2mhlwCeLrUk
j84LtxB51tt2Mxnvkl8kzUU=
=/XAz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- .cvsignore	23 Aug 2007 18:20:55 -0000	1.631
+++ .cvsignore	13 Sep 2007 22:21:49 -0000	1.632
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.5.bz2
+patch-2.6.22.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3340
retrieving revision 1.3341
diff -u -r1.3340 -r1.3341
--- kernel-2.6.spec	12 Sep 2007 22:35:48 -0000	1.3340
+++ kernel-2.6.spec	13 Sep 2007 22:21:49 -0000	1.3341
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 5
+%define stable_update 6
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -498,7 +498,8 @@
 
 %if !%{nopatches}
 
-Patch02: patch-2.6.22.6-rc1.patch
+# -stable RC
+# Patch02: patch-2.6.22.6-rc1.patch
 
 # Revert -stable pieces we get from elsewhere
 Patch05: linux-2.6-softmac-fix-essid-problem_R.patch
@@ -564,14 +565,20 @@
 Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
 Patch390: linux-2.6-dev-get-driver-properly.patch
+
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-aacraid-ioctl-security.patch
 Patch402: linux-2.6-scsi-async-scanning.patch
 Patch403: linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
+Patch404: linux-2.6-scsi-mpt-vmware-fix.patch
+
 Patch420: linux-2.6-squashfs.patch
 Patch422: linux-2.6-gfs2-update.patch
 Patch423: linux-2.6-gfs-locking-exports.patch
+
 Patch430: linux-2.6-net-silence-noisy-printks.patch
+Patch435: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
+
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -586,14 +593,21 @@
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch620: linux-2.6-defaults-unicode-vt.patch
 Patch630: linux-2.6-defaults-nonmi.patch
+
+Patch650: linux-2.6-lvm-snapshot-deadlock-fix.patch
+
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch662: linux-2.6-ata-update-noncq.patch
 Patch663: linux-2.6-ata-quirk.patch
 Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
 Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 Patch671: linux-2.6-libata-pata_ali-fix-hp-detect.patch
-Patch673: linux-2.6-libata-simplify-init.patch
-Patch674: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch672: linux-2.6-libata-pata-dma-disable-option.patch
+Patch673: linux-2.6-libata-pata_it821x-dma.patch
+Patch674: linux-2.6-libata-pata_via-cable-detect.patch
+Patch675: linux-2.6-libata-simplify-init.patch
+Patch676: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+
 Patch680: linux-2.6-rtl8187.patch
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
@@ -614,7 +628,13 @@
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
 Patch760: linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
-#Patch780: linux-2.6-clockevents-fix-resume-logic.patch
+Patch771: linux-2.6-futex-fix-traversal.patch
+
+Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
+Patch781: linux-2.6-usb-allow-1-byte-replies.patch
+Patch782: linux-2.6-usb-fixup-interval-lengths.patch
+Patch783: linux-2.6-usb-linked-list-insertion.patch
+
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
@@ -1079,8 +1099,8 @@
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
-# stable RC patch
-ApplyPatch patch-2.6.22.6-rc1.patch
+# -stable RC
+# ApplyPatch patch-2.6.22.6-rc1.patch
 
 %if !%{nopatches}
 
@@ -1237,6 +1257,8 @@
 ApplyPatch linux-2.6-scsi-async-scanning.patch
 # fix 3ware 9000 DMA fallback
 ApplyPatch linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
+# fix vmware's broken emulation of SCSI controller
+ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1249,6 +1271,8 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
+# fix oops when skb has zero length
+ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1286,6 +1310,9 @@
 # Disable NMI watchdog by default.
 ApplyPatch linux-2.6-defaults-nonmi.patch
 
+# fix LVM deadlock
+ApplyPatch linux-2.6-lvm-snapshot-deadlock-fix.patch
+
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
@@ -1299,6 +1326,12 @@
 ApplyPatch linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 # fix wrong DMI detect logic for HP notebook
 ApplyPatch linux-2.6-libata-pata_ali-fix-hp-detect.patch
+# add libata.pata_dma kernel option
+ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
+# fix DMA on ATAPI devices with it821x
+ApplyPatch linux-2.6-libata-pata_it821x-dma.patch
+# fix cable detection on pata_via
+ApplyPatch linux-2.6-libata-pata_via-cable-detect.patch
 # fix Pegasos libata glitches
 ApplyPatch linux-2.6-libata-simplify-init.patch
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
@@ -1351,9 +1384,18 @@
 ApplyPatch linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
+# futex: fix compat list traveral
+ApplyPatch linux-2.6-futex-fix-traversal.patch
 
 # USB
 #
+# fix init of huawei device
+ApplyPatch linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
+# trivial USB fixes
+ApplyPatch linux-2.6-usb-allow-1-byte-replies.patch
+ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
+ApplyPatch linux-2.6-usb-linked-list-insertion.patch
+
 
 # ACPI patches
 
@@ -2310,6 +2352,18 @@
 
 %changelog
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.6 (official)
+- libata: add option to disable DMA on PATA devices
+- libata: fix DMA on ATAPI devices with it821x (#242229)
+- libata: fix cable detection on pata_via
+- fix vmware's broken SCSI device emulation (#241935)
+- fix init of huawei 220 modem (#253096)
+- LVM: fix hang and lockups during snapshot (#269541)
+- net: fix oops with zero-length packet (#253290)
+- USB: three trivial fixes
+- futex: fix compat list traversal
+
+* Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - update CFS scheduler
 
 * Tue Sep 11 2007 Roland McGrath <roland at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- sources	23 Aug 2007 18:20:55 -0000	1.594
+++ sources	13 Sep 2007 22:21:49 -0000	1.595
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-27544a58763bbd4ce497a77658af744a  patch-2.6.22.5.bz2
+f2948e364ab3e4736b9e34f02173472f  patch-2.6.22.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- upstream	23 Aug 2007 18:20:55 -0000	1.518
+++ upstream	13 Sep 2007 22:21:49 -0000	1.519
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.5.bz2
+patch-2.6.22.6.bz2


--- patch-2.6.22.5.bz2.sign DELETED ---


--- patch-2.6.22.6-rc1.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 13 23:34:20 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:34:20 -0400
Subject: rpms/mlton/devel mlton.spec,1.12,1.13
Message-ID: <200709132334.l8DNYKYP024583@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24565

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
- Bootstrap x86_64



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlton.spec	28 Aug 2007 00:06:24 -0000	1.12
+++ mlton.spec	13 Sep 2007 23:33:47 -0000	1.13
@@ -1,18 +1,20 @@
 %define mlton_bootstrap 0
+%ifarch x86_64
+%define mlton_bootstrap 1
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	MIT
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
 %if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1:	mlton-bootstrap.i386.tar.bz2
-Source2:	mlton-bootstrap.ppc.tar.bz2
+Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 %endif
 
 Patch0:		mlton-20070826-debuginfo.patch
@@ -27,11 +29,8 @@
 
 Requires:	gmp-devel gcc
 
-# not yet available for 64-bit arch (#198764)
-ExcludeArch:	x86_64 ppc64
-
-# triggers GCC ICE on ppc (investigating...)
-ExcludeArch:	ppc
+# triggers GCC ICE on ppc (#268281)
+ExcludeArch:	ppc ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -50,14 +49,9 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%ifarch i386
 %setup -T -D -q -a 1
-%endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
-	bootstrap/usr/bin/mlton
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
+	usr/bin/mlton
 %endif
 
 # Filter unwanted Requires:
@@ -73,8 +67,8 @@
 
 %build
 %if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
 %endif
 
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
 * Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
 - Exclude ppc for now (GCC internal compiler error!)
 



From fedora-extras-commits at redhat.com  Thu Sep 13 23:36:19 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:36:19 -0400
Subject: rpms/mlton/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709132336.l8DNaJQa024632@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24612

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
- Bootstrap x86_64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 12:29:30 -0000	1.4
+++ .cvsignore	13 Sep 2007 23:35:47 -0000	1.5
@@ -1 +1,2 @@
+mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 12:29:30 -0000	1.4
+++ sources	13 Sep 2007 23:35:47 -0000	1.5
@@ -1 +1,2 @@
+a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Thu Sep 13 23:47:56 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 19:47:56 -0400
Subject: rpms/mlton/devel mlton.spec,1.13,1.14
Message-ID: <200709132347.l8DNluE3024889@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24868

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
- Do not condition bootstrap source tag



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlton.spec	13 Sep 2007 23:33:47 -0000	1.13
+++ mlton.spec	13 Sep 2007 23:47:23 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -13,9 +13,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-%if %{mlton_bootstrap}
 Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
-%endif
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -103,6 +101,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
+- Do not condition bootstrap source tag
+
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
 - Bootstrap x86_64
 



From fedora-extras-commits at redhat.com  Fri Sep 14 00:23:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 20:23:21 -0400
Subject: fedora-security/audit epel5,1.2,1.3
Message-ID: <200709140023.l8E0NLRN031469@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31447

Modified Files:
	epel5 
Log Message:
Process a bunch more epel5 packages



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epel5	5 Sep 2007 04:53:03 -0000	1.2
+++ epel5	14 Sep 2007 00:23:19 -0000	1.3
@@ -3,112 +3,115 @@
 # *CVE are items that need verification for EPEL-5
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070829
-# Up to date EPEL5 as of 
+# Up to date CVE as of CVE email 20070910
+# Up to date EPEL5 as of 20070910
 #
-*CVE-2007-4631 VULNERABLE (qgit) #268381
-*CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-*CVE-2007-4560 VULNERABLE (clamav) #260583
-*CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
-*CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
-*CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
-*CVE-2007-4400 VULNERABLE (konversation) #253545
-*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
-*CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
-*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3725 ** (clamav)
-*CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
-*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
-*CVE-2007-3528 version (dar, fixed 2.3.4) #246760 [since FEDORA-2007-0904]
+*CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
+CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4631 version (qgit, fixed 1.5.7) #268381
+CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
+CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
+CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021
+CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+*CVE-2007-4462 version (po4a) #253541
+CVE-2007-4400 VULNERABLE (konversation) #253545
+CVE-2007-4323 backport (denyhosts) #252291
+*CVE-2007-4321 backport (fail2ban) #252290
+CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3725 ** (clamav)
+CVE-2007-3628 version (php-pear-Structures-DataGrid-DataSource-MDB2, fixed 0.1.10)
+CVE-2007-3555 version (moodle) #247528 
+CVE-2007-3528 version (dar, fixed 2.3.4) #246760
 *CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
-*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
-*CVE-2007-3025 ignore (clamav, Solaris only)
-*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
-*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
-*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
-*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
-*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
+CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
+CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3113 VULNERABLE (cacti) #243592
+CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3025 ignore (clamav, Solaris only)
+CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489
+CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
+CVE-2007-2650 VULNERABLE (clamav, fixed 0.90.3) #240395
+CVE-2007-2637 patch (moin, fixed 1.5.7-2)
+CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
 *CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
-*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
-*CVE-2007-2165 VULNERABLE (proftpd) #237533
-*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
-*CVE-2007-1997 version (clamav, fixed in 0.90.2)
-*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
-*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
-*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
+CVE-2007-2245 version (phpMyAdmin, fixed 2.10.1) #237882
+CVE-2007-2165 VULNERABLE (proftpd) #237533
+CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
+CVE-2007-1997 VULNERABLE (clamav, fixed in 0.90.2)
+CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1745 VULNERABLE (clamav, fixed in 0.90.2) #236703
+CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
+CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
 *CVE-2007-1515 version (imp, fixed 4.1.4)
 *CVE-2007-1474 version (horde, fixed 3.1.4)
 *CVE-2007-1474 ignore (imp, < 4.x only)
 *CVE-2007-1473 version (horde, fixed 3.1.4)
-*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
-*CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
-*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
-*CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
-*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
+CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
+CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
+CVE-2007-1399 version (php-pecl-zip, fixed 1.8.5)
+CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
+CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1263 version (gpgme, fixed 1.1.4)
 *CVE-2007-1055 version (mediawiki, fixed 1.8.3)
 *CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
-*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0898 version (clamav, fixed 0.90) #229202
-*CVE-2007-0897 version (clamav, fixed 0.90) #229202
+CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
+CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
+CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229202
+CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229202
 *CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
-*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
-*CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
+CVE-2007-0857 version (moin, fixed 1.5.7) #228139
+CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
 *CVE-2007-0469 version (rubygems, fixed 0.9.1)
-*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
-*CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
+CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
+CVE-2007-0242 VULNERABLE (qt4, fixed 4.2.3-7)
+CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
 *CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
-*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
-*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
-*CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
-*CVE-2006-6481 version (clamav, fixed 0.88.7)
-*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
+CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
+CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
+CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
+CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
+CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
+CVE-2006-6481 VULNERABLE (clamav, fixed 0.88.7)
+CVE-2006-6406 VULNERABLE (clamav, fixed 0.88.7) #219095
 *CVE-2006-6374 ** (phpMyAdmin) #218853
-*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
-*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
+CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
+CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
 *CVE-2006-6235 patch (gnupg2, fixed 2.0.1-2) #218821
-*CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
-*CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 *CVE-2006-6169 version (gnupg2, fixed 2.0.1) #217950
 *CVE-2006-6085 version (kile, fixed 1.9.3) #217238
-*CVE-2006-5874 version (clamav, fixed 0.88.1)
-*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
-*CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-*CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
+CVE-2006-5874 version (clamav, fixed 0.88.1)
+CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 version (xsupplicant, fixed 1.2.8) #212700
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355



From fedora-extras-commits at redhat.com  Fri Sep 14 00:37:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 17:37:19 -0700
Subject: [pkgdb] pyzor (Fedora EPEL, 5) updated by kevin
Message-ID: <200709140037.l8E0bMqU015004@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for pyzor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyzor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyzor (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyzor (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From fedora-extras-commits at redhat.com  Fri Sep 14 00:37:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 13 Sep 2007 17:37:19 -0700
Subject: [pkgdb] pyzor (Fedora EPEL, 4) updated by kevin
Message-ID: <200709140037.l8E0bNsb015013@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for pyzor
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on pyzor (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on pyzor (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on pyzor (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyzor



From fedora-extras-commits at redhat.com  Fri Sep 14 00:54:18 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 20:54:18 -0400
Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.14,
	1.15 python-sqlalchemy.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <200709140054.l8E0sIYw032373@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32347

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:
- Update to 0.4beta5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Aug 2007 21:52:02 -0000	1.14
+++ .cvsignore	14 Sep 2007 00:53:48 -0000	1.15
@@ -1 +1 @@
-SQLAlchemy-0.4.0beta4.tar.gz
+SQLAlchemy-0.4.0beta5.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-sqlalchemy.spec	1 Sep 2007 04:55:09 -0000	1.21
+++ python-sqlalchemy.spec	14 Sep 2007 00:53:48 -0000	1.22
@@ -3,11 +3,11 @@
 
 
 %define srcname SQLAlchemy
-%define betaver beta4
+%define betaver beta5
 
 Name:           python-sqlalchemy
 Version:        0.4.0
-Release:        0.3.%{betaver}%{?dist}
+Release:        0.4.%{betaver}%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -44,10 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} --always-unzip dist/*.egg
-cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-mv sqlalchemy ..
-ln -s ../sqlalchemy .
+python setup.py install --root $RPM_BUILD_ROOT
+#PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} easy_install --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg 'SQLAlchemy==%{version}%{betaver}'
+#cd $RPM_BUILD_ROOT%{python_sitelib}
+#rm site.py*
+#mv easy-install.pth sqlalchemy.pth
+
+#cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
+#mv sqlalchemy ..
+#ln -s ../sqlalchemy .
 
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
@@ -59,10 +64,15 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE PKG-INFO CHANGES doc examples
-%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-%{python_sitelib}/sqlalchemy/
+%{python_sitelib}/*
 
 %changelog
+* Tue Sep 11 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta5
+- Update to 0.4beta5.
+
+* Fri Sep 06 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta4
+- setuptools has been fixed.
+
 * Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
 - setuptools seems to be broken WRT having an active and inactive version
   of an egg.  Have to make both versions inactive and manually setup a copy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Aug 2007 21:52:02 -0000	1.14
+++ sources	14 Sep 2007 00:53:48 -0000	1.15
@@ -1 +1 @@
-97b00cfba5bcb7cc947320a66c2ce085  SQLAlchemy-0.4.0beta4.tar.gz
+b00125102578a603497bfb0dcc72473c  SQLAlchemy-0.4.0beta5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 01:00:20 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 21:00:20 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.22,1.23
Message-ID: <200709140100.l8E10KQQ032564@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32526

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Remove commented egg experimenting code.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-sqlalchemy.spec	14 Sep 2007 00:53:48 -0000	1.22
+++ python-sqlalchemy.spec	14 Sep 2007 00:59:47 -0000	1.23
@@ -45,14 +45,6 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
 python setup.py install --root $RPM_BUILD_ROOT
-#PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} easy_install --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg 'SQLAlchemy==%{version}%{betaver}'
-#cd $RPM_BUILD_ROOT%{python_sitelib}
-#rm site.py*
-#mv easy-install.pth sqlalchemy.pth
-
-#cd $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}-%{version}%{betaver}-py%{pyver}.egg
-#mv sqlalchemy ..
-#ln -s ../sqlalchemy .
 
 # remove unnecessary scripts for building documentation
 rm -rf doc/build



From fedora-extras-commits at redhat.com  Fri Sep 14 01:15:36 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 13 Sep 2007 21:15:36 -0400
Subject: rpms/xchat-gnome/devel xchat-gnome-0.18-reconnect.patch, NONE,
	1.1 xchat-gnome.spec, 1.44, 1.45
Message-ID: <200709140115.l8E1FaRj006279@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6245

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.18-reconnect.patch 
Log Message:
* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-5
- Add patch to fix reconnect bug. (#225408)


xchat-gnome-0.18-reconnect.patch:

--- NEW FILE xchat-gnome-0.18-reconnect.patch ---
--- trunk/plugins/net-monitor/net-monitor.c	2007/09/12 22:18:13	2568
+++ trunk/plugins/net-monitor/net-monitor.c	2007/09/13 01:25:13	2569
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include "xchat-plugin.h"
 
 #define NET_MONITOR_VERSION     "0.1"
@@ -166,6 +169,13 @@
 
 		g_hash_table_foreach (networks, (GHFunc) disconnect_from_network, NULL);
 	} else {
+		/*
+		 * We need to tell the nameserver resolver to reread
+		 * /etc/resolve.conf, since the nameservers might have changed
+		 * when moving between networks.
+		 */
+		res_init();
+
 		g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL);
 	}
 }


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xchat-gnome.spec	21 Aug 2007 17:50:37 -0000	1.44
+++ xchat-gnome.spec	14 Sep 2007 01:15:03 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-config.patch
+Patch1:		%{name}-%{version}-reconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .reconnect
 
 
 %build
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-5
+- Add patch to fix reconnect bug. (#225408)
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 01:24:06 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 13 Sep 2007 21:24:06 -0400
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.23,1.24
Message-ID: <200709140124.l8E1O62B006531@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6482

Modified Files:
	python-sqlalchemy.spec 
Log Message:
* Testing new getnotifylist.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-sqlalchemy.spec	14 Sep 2007 00:59:47 -0000	1.23
+++ python-sqlalchemy.spec	14 Sep 2007 01:23:34 -0000	1.24
@@ -126,11 +126,3 @@
 
 * Wed May 31 2006 Shahms E. King <shahms at shahms.com> 0.2.1-1
 - Update to new upstream version
-
-* Tue May 16 2006 Shahms E. King <shahms at shahms.com> 0.1.7-1
-- Update to new upstream version
-- Point URL to direct link, not sourceforge redirect
-- Remove unnecessary document build scripts
-
-* Fri Apr 14 2006 Shahms E. King <shahms at shahms.com> 0.1.6-1
-- Initial package



From fedora-extras-commits at redhat.com  Fri Sep 14 01:35:36 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 21:35:36 -0400
Subject: rpms/mlton/devel .cvsignore, 1.5, 1.6 mlton.spec, 1.14, 1.15 sources,
	1.5, 1.6
Message-ID: <200709140135.l8E1ZaEd006803@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6776

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
unbootstrap


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Sep 2007 23:35:47 -0000	1.5
+++ .cvsignore	14 Sep 2007 01:35:04 -0000	1.6
@@ -1,2 +1 @@
-mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlton.spec	13 Sep 2007 23:47:23 -0000	1.14
+++ mlton.spec	14 Sep 2007 01:35:04 -0000	1.15
@@ -1,11 +1,11 @@
 %define mlton_bootstrap 0
-%ifarch x86_64
-%define mlton_bootstrap 1
-%endif
+#%ifarch x86_64
+#%define mlton_bootstrap 1
+#%endif
 
 Name:		mlton
 Version:	20070826
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -13,7 +13,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
+#Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Sep 2007 23:35:47 -0000	1.5
+++ sources	14 Sep 2007 01:35:04 -0000	1.6
@@ -1,2 +1 @@
-a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 01:40:30 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 13 Sep 2007 21:40:30 -0400
Subject: rpms/fvwm/F-7 .cvsignore,1.2,1.3 fvwm.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <200709140140.l8E1eUEZ006990@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/fvwm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963

Modified Files:
	.cvsignore fvwm.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Mar 2007 02:33:14 -0000	1.2
+++ .cvsignore	14 Sep 2007 01:39:58 -0000	1.3
@@ -1 +1 @@
-fvwm-2.5.21.tar.bz2
+fvwm-2.5.23.tar.bz2


Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/fvwm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fvwm.spec	5 Aug 2007 14:57:09 -0000	1.5
+++ fvwm.spec	14 Sep 2007 01:39:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fvwm
-Version:	2.5.21
-Release:	5%{?dist}
+Version:	2.5.23
+Release:	2%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -20,6 +20,7 @@
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
+BuildRequires:	librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
@@ -69,12 +70,6 @@
 chmod +x %{__perl_requires}
 
 
-# Work around FVWM bug #4208
-find . -name '*.in' -type f -print0 \
- | xargs -0 sed -i -e 's:@datarootdir@:@datadir@:'
-
-
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -116,8 +111,15 @@
 
 
 %changelog
-* Fri May 25 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-4.1
-- Fix build on ppc64
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-2
+- Don't add gnome-libs-devel to BR (not on ppc64?)
+
+* Mon Sep 10 2007 Adam Goode <adam at spicenitz.org> - 2.5.23-1
+- New upstream release
+
+* Tue Aug 21 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-5
+- Update license tag
+- Rebuild for buildid
 
 * Thu Mar 15 2007 Adam Goode <adam at spicenitz.org> - 2.5.21-4
 - Don't patch configure, just patch a few files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fvwm/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2007 02:33:14 -0000	1.2
+++ sources	14 Sep 2007 01:39:58 -0000	1.3
@@ -1 +1 @@
-c11efef91420e686d54f772e7162e879  fvwm-2.5.21.tar.bz2
+c301f9aad1203c26818a6651e3d1afc8  fvwm-2.5.23.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 04:31:29 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 14 Sep 2007 00:31:29 -0400
Subject: rpms/gtk-vnc/devel .cvsignore, 1.2, 1.3 gtk-vnc.spec, 1.3,
	1.4 sources, 1.2, 1.3 gtk-vnc-0.1.0-clear-area.patch, 1.1,
	NONE gtk-vnc-0.1.0-colour-depth.patch, 1.1,
	NONE gtk-vnc-0.1.0-endian-bgr.patch, 1.1,
	NONE gtk-vnc-0.1.0-python-demo.patch, 1.1, NONE
Message-ID: <200709140431.l8E4VTUF028763@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Removed Files:
	gtk-vnc-0.1.0-clear-area.patch 
	gtk-vnc-0.1.0-colour-depth.patch 
	gtk-vnc-0.1.0-endian-bgr.patch gtk-vnc-0.1.0-python-demo.patch 
Log Message:
Update to 0.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2007 19:19:12 -0000	1.2
+++ .cvsignore	14 Sep 2007 04:30:57 -0000	1.3
@@ -1,3 +1,3 @@
-gtk-vnc-0.1.0.tar.gz
 *.src.rpm
 .*.log
+gtk-vnc-0.2.0.tar.gz


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-vnc.spec	29 Aug 2007 16:33:24 -0000	1.3
+++ gtk-vnc.spec	14 Sep 2007 04:30:57 -0000	1.4
@@ -2,15 +2,11 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.1.0
-Release: 5%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-clear-area.patch
-Patch2: %{name}-%{version}-endian-bgr.patch
-Patch3: %{name}-%{version}-python-demo.patch
-Patch4: %{name}-%{version}-colour-depth.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel
@@ -45,10 +41,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %configure
@@ -88,6 +80,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc8
+- Update to 0.2.0 release
+
 * Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5.fc8
 - Fixed handling of mis-matched client/server colour depths
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2007 19:19:12 -0000	1.2
+++ sources	14 Sep 2007 04:30:57 -0000	1.3
@@ -1 +1 @@
-f0781695819bd00d5ba160205723a3b4  gtk-vnc-0.1.0.tar.gz
+b1321a9e88e5309f09c4f727f5a367e6  gtk-vnc-0.2.0.tar.gz


--- gtk-vnc-0.1.0-clear-area.patch DELETED ---


--- gtk-vnc-0.1.0-colour-depth.patch DELETED ---


--- gtk-vnc-0.1.0-endian-bgr.patch DELETED ---


--- gtk-vnc-0.1.0-python-demo.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 04:35:09 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Fri, 14 Sep 2007 00:35:09 -0400
Subject: rpms/gtk-vnc/F-7 .cvsignore, 1.2, 1.3 gtk-vnc.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709140435.l8E4Z9aZ028987@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
Update to 0.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2007 20:39:57 -0000	1.2
+++ .cvsignore	14 Sep 2007 04:34:36 -0000	1.3
@@ -1 +1 @@
-gtk-vnc-0.1.0.tar.gz
+gtk-vnc-0.2.0.tar.gz


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/gtk-vnc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-vnc.spec	17 Aug 2007 20:39:57 -0000	1.1
+++ gtk-vnc.spec	14 Sep 2007 04:34:36 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.1.0
-Release: 3%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -80,6 +80,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc7
+- Update to 0.2.0 release
+
 * Thu Aug 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-3.fc7
 - Tweaked post scripts
 - Removed docs from sub-packages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2007 20:39:57 -0000	1.2
+++ sources	14 Sep 2007 04:34:36 -0000	1.3
@@ -1 +1 @@
-f0781695819bd00d5ba160205723a3b4  gtk-vnc-0.1.0.tar.gz
+b1321a9e88e5309f09c4f727f5a367e6  gtk-vnc-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 05:13:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 14 Sep 2007 01:13:42 -0400
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff,1.3,1.4
Message-ID: <200709140513.l8E5Dg81003239@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3214

Modified Files:
	OpenSceneGraph-2.0.diff 
Log Message:
Rename openthreads-2.pc into openthreads.pc.

OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSceneGraph-2.0.diff	22 Aug 2007 05:04:57 -0000	1.3
+++ OpenSceneGraph-2.0.diff	14 Sep 2007 05:13:08 -0000	1.4
@@ -1,6 +1,6 @@
 diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-14 06:49:27.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
  
 diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 --- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
-+++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-14 06:49:27.000000000 +0200
 @@ -30,7 +30,7 @@
  # If a relative path is entered, it will be relative to the location 
  # where doxygen was started. If left blank the current directory will be used.
@@ -33,7 +33,7 @@
  # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
 --- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-08-22 06:45:47.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-14 06:49:27.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -45,7 +45,7 @@
      ADD_SUBDIRECTORY(osgtexture2D)
 diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc OpenSceneGraph/pkgconfig/openscenegraph-2.pc
 --- OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-08-22 06:46:46.000000000 +0200
++++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-09-14 06:49:27.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -57,13 +57,13 @@
 +Name: openscenegraph-2
 +Description: 3D scenegraph
 +Version: 2.0
-+Requires: openthreads-2
++Requires: openthreads
 +Conflicts:
 +Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
 +Cflags: -I${includedir}
-diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads-2.pc OpenSceneGraph/pkgconfig/openthreads-2.pc
---- OpenSceneGraph.orig/pkgconfig/openthreads-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openthreads-2.pc	2007-08-22 06:47:10.000000000 +0200
+diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-09-14 06:49:27.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -72,7 +72,7 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openthreads-2
++Name: openthreads
 +Description: Object-Oriented (OO) thread interface for C++ programmers
 +Version: 2.0
 +Requires:



From fedora-extras-commits at redhat.com  Fri Sep 14 05:17:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:17:10 -0400
Subject: rpms/gtk2/devel novalidate.patch, NONE, 1.1 .cvsignore, 1.73,
	1.74 gtk2.spec, 1.255, 1.256 sources, 1.81, 1.82
Message-ID: <200709140517.l8E5HAvm003382@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3322

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	novalidate.patch 
Log Message:
2.12.0


novalidate.patch:

--- NEW FILE novalidate.patch ---
diff -up gtk+-2.12.0/gtk/gtkiconcache.c.novalidate gtk+-2.12.0/gtk/gtkiconcache.c
--- gtk+-2.12.0/gtk/gtkiconcache.c.novalidate	2007-09-14 01:13:49.000000000 -0400
+++ gtk+-2.12.0/gtk/gtkiconcache.c	2007-09-14 01:13:59.000000000 -0400
@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha
   info.n_directories = 0;
   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
 
-  if (!_gtk_icon_cache_validate (&info))
+#ifdef G_ENABLE_DEBUG
+  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
     {
-      g_mapped_file_free (map);
-      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+      if (!_gtk_icon_cache_validate (&info))
+        {
+          g_mapped_file_free (map);
+          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
 
-      goto done;
+          goto done;
+        }
     }
-  
+#endif 
+
   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
 
   cache = g_new0 (GtkIconCache, 1);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Jul 2007 18:35:27 -0000	1.73
+++ .cvsignore	14 Sep 2007 05:16:37 -0000	1.74
@@ -1 +1 @@
-gtk+-2.11.6.tar.bz2
+gtk+-2.12.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- gtk2.spec	7 Sep 2007 20:15:12 -0000	1.255
+++ gtk2.spec	14 Sep 2007 05:16:37 -0000	1.256
@@ -2,7 +2,7 @@
 
 %define glib2_base_version 2.13.7
 %define glib2_version %{glib2_base_version}-1
-%define pango_base_version 1.15.3
+%define pango_base_version 1.17.3
 %define pango_version %{pango_base_version}-1
 %define atk_base_version 1.9.0
 %define atk_version %{atk_base_version}-1
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.11.6
+%define base_version 2.12.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 9%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -27,19 +27,11 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
-# use fam for recent-files
-#Patch2: gtk+-2.10.3-fam.patch
-# fixed in upstream svn
-Patch3: cups-authstring.patch
-# fixed in upstream svn
-Patch4: silence-icon-cache-validator.patch
-# fixed in upstream svn
-Patch5: systray-tooltips.patch
-# fixed in upstream svn
-Patch6: tooltip-compat.patch
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
-Patch7: workaround.patch
+Patch2: workaround.patch
+# fixed in upstream svn
+Patch3: novalidate.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -125,12 +117,8 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
-#%patch2 -p1 -b .fam
-%patch3 -p0 -b .authstring
-%patch4 -p1 -b .silence
-%patch5 -p1 -b .tooltips
-%patch6 -p1 -b .tooltip-compat
-%patch7 -p1 -b .workaround
+%patch2 -p1 -b .workaround
+%patch3 -p1 -b .novalidate
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -139,8 +127,7 @@
 %build
 libtoolize --force
 
-# Patch2 modifies gdk/Makefile.am
-# Patch3 modifies gdk-pixbuf/Makefile.am
+# Patch0 modifies gdk-pixbuf/Makefile.am
 aclocal-1.7
 automake-1.7
 autoconf
@@ -314,6 +301,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
+- Update to 2.12.0
+
 * Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-9
 - Add a workaround for the flash plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	23 Jul 2007 18:35:27 -0000	1.81
+++ sources	14 Sep 2007 05:16:37 -0000	1.82
@@ -1 +1 @@
-2b35ce357e138af23c52e4bceb1a63a0  gtk+-2.11.6.tar.bz2
+e9c280afec29b11772af5a7c807abf41  gtk+-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:31:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:31:35 -0400
Subject: rpms/gok/devel .cvsignore, 1.25, 1.26 gok.spec, 1.53, 1.54 sources, 
	1.25, 1.26
Message-ID: <200709140531.l8E5VZZR003745@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3702

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Sep 2007 04:30:23 -0000	1.25
+++ .cvsignore	14 Sep 2007 05:31:01 -0000	1.26
@@ -1 +1 @@
-gok-1.3.2.tar.bz2
+gok-1.3.3.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gok.spec	4 Sep 2007 04:30:23 -0000	1.53
+++ gok.spec	14 Sep 2007 05:31:01 -0000	1.54
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.2
+Version: 1.3.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -121,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.3-1
+- Update to 1.3.3
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.2-1
 - Update to 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Sep 2007 04:30:23 -0000	1.25
+++ sources	14 Sep 2007 05:31:01 -0000	1.26
@@ -1 +1 @@
-643a6ef0e1752b41d4a3d2415c9cb174  gok-1.3.2.tar.bz2
+be080327247c8f6a0b49118d1bfeb2a5  gok-1.3.3.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:39:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:39:34 -0400
Subject: rpms/libgsf/devel .cvsignore, 1.19, 1.20 libgsf.spec, 1.49,
	1.50 sources, 1.19, 1.20
Message-ID: <200709140539.l8E5dYQD003929@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3904

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
1.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Sep 2007 16:35:52 -0000	1.19
+++ .cvsignore	14 Sep 2007 05:39:01 -0000	1.20
@@ -1 +1 @@
-libgsf-1.14.6.tar.bz2
+libgsf-1.14.7.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgsf.spec	5 Sep 2007 16:59:04 -0000	1.49
+++ libgsf.spec	14 Sep 2007 05:39:01 -0000	1.50
@@ -3,7 +3,7 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.6
+Version: 1.14.7
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
@@ -141,6 +141,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 1.14.7-1
+- Update to 1.14.7
+
 * Wed Sep 05 2007 Caolan McNamara <caolanm at redhat.com> 1.14.6-1
 - next version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgsf/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Sep 2007 16:35:52 -0000	1.19
+++ sources	14 Sep 2007 05:39:01 -0000	1.20
@@ -1 +1 @@
-5939265125356730fc1d90c8ee3af7eb  libgsf-1.14.6.tar.bz2
+6612f1e57d3974d609bedd2fd8ff6317  libgsf-1.14.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:45:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:45:19 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 tomboy.spec, 1.56, 1.57
Message-ID: <200709140545.l8E5jJ8B004069@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.7.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Sep 2007 14:18:32 -0000	1.18
+++ .cvsignore	14 Sep 2007 05:44:46 -0000	1.19
@@ -1 +1 @@
-tomboy-0.7.6.tar.bz2
+tomboy-0.7.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Sep 2007 14:18:32 -0000	1.18
+++ sources	14 Sep 2007 05:44:46 -0000	1.19
@@ -1 +1 @@
-f7a7959bbfe1b67c1f5de32eb118a65a  tomboy-0.7.6.tar.bz2
+a5d87649e153d4e7a4a01846c700e66c  tomboy-0.7.8.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- tomboy.spec	4 Sep 2007 15:11:13 -0000	1.56
+++ tomboy.spec	14 Sep 2007 05:44:46 -0000	1.57
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.7.6
+Version:        0.7.8
 Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
@@ -75,6 +75,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/tomboy.schemas > /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 
 %preun
@@ -84,6 +88,14 @@
       %{_sysconfdir}/gconf/schemas/tomboy.schemas >/dev/null;
 fi
 
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
@@ -106,6 +118,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.8-1
+- Update to 0.7.8
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.6-1
 - Update to 0.7.6
 



From fedora-extras-commits at redhat.com  Fri Sep 14 05:49:45 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:49:45 -0400
Subject: rpms/gnome-keyring-manager/devel .cvsignore, 1.10,
	1.11 gnome-keyring-manager.spec, 1.32, 1.33 sources, 1.10, 1.11
Message-ID: <200709140549.l8E5njeA004377@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298

Modified Files:
	.cvsignore gnome-keyring-manager.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2007 04:32:51 -0000	1.10
+++ .cvsignore	14 Sep 2007 05:49:10 -0000	1.11
@@ -1 +1 @@
-gnome-keyring-manager-2.18.0.tar.bz2
+gnome-keyring-manager-2.19.92.tar.bz2


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-keyring-manager.spec	28 Aug 2007 21:36:08 -0000	1.32
+++ gnome-keyring-manager.spec	14 Sep 2007 05:49:10 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
-Version: 2.18.0
-Release: 5%{?dist}
+Version: 2.19.92
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 2.19.92-1
+- Update to 2.19.92
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.18.0-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2007 04:32:51 -0000	1.10
+++ sources	14 Sep 2007 05:49:10 -0000	1.11
@@ -1 +1 @@
-05183cdea9d933cb1e9a8f4202c6ffc0  gnome-keyring-manager-2.18.0.tar.bz2
+162105ae1e4021eab4c613a4ca7e6bb9  gnome-keyring-manager-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 05:57:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 01:57:51 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.23, 1.24 gconf-editor.spec,
	1.46, 1.47 sources, 1.23, 1.24
Message-ID: <200709140557.l8E5vpif004644@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	4 Sep 2007 04:01:29 -0000	1.23
+++ .cvsignore	14 Sep 2007 05:57:15 -0000	1.24
@@ -1 +1 @@
-gconf-editor-2.18.2.tar.bz2
+gconf-editor-2.19.92.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gconf-editor.spec	4 Sep 2007 04:01:29 -0000	1.46
+++ gconf-editor.spec	14 Sep 2007 05:57:15 -0000	1.47
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.18.2
+Version: 2.19.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -41,7 +41,7 @@
 
 %build
 %configure --disable-scrollkeeper
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,11 +99,14 @@
 %{_datadir}/icons/hicolor/*/apps/gconf-editor.png
 %{_datadir}/pixmaps/gconf-editor
 %{_datadir}/applications/*.desktop
-%{_datadir}/man/man*/*
+%{_mandir}/man*/*
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/omf/gconf-editor
+%dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Sep 2007 04:01:29 -0000	1.23
+++ sources	14 Sep 2007 05:57:15 -0000	1.24
@@ -1 +1 @@
-e40f51b3cb2809b882c29d45b71657bd  gconf-editor-2.18.2.tar.bz2
+a248ef087ada180d53ce1317b25ed35c  gconf-editor-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:07:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 02:07:50 -0400
Subject: rpms/gedit/devel .cvsignore, 1.65, 1.66 gedit.spec, 1.138,
	1.139 sources, 1.67, 1.68
Message-ID: <200709140607.l8E67o4p010838@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10814

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.19.92



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	4 Sep 2007 13:12:46 -0000	1.65
+++ .cvsignore	14 Sep 2007 06:07:17 -0000	1.66
@@ -1 +1 @@
-gedit-2.19.91.tar.bz2
+gedit-2.19.92.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gedit.spec	4 Sep 2007 13:12:46 -0000	1.138
+++ gedit.spec	14 Sep 2007 06:07:17 -0000	1.139
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.91
+Version: 	2.19.92
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
+- Update to 2.19.92
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	4 Sep 2007 13:12:46 -0000	1.67
+++ sources	14 Sep 2007 06:07:17 -0000	1.68
@@ -1 +1 @@
-eb5fbd8c0f986665235cfc7fa3137e67  gedit-2.19.91.tar.bz2
+780644ec80be0938b6860de1d220d684  gedit-2.19.92.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:09:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 02:09:59 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.27, 1.28 gnome-mag.spec, 1.50,
	1.51 sources, 1.28, 1.29
Message-ID: <200709140609.l8E69xwS010976@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10915

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Sep 2007 05:17:36 -0000	1.27
+++ .cvsignore	14 Sep 2007 06:09:24 -0000	1.28
@@ -1 +1 @@
-gnome-mag-0.14.8.tar.bz2
+gnome-mag-0.14.9.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-mag.spec	4 Sep 2007 05:23:51 -0000	1.50
+++ gnome-mag.spec	14 Sep 2007 06:09:24 -0000	1.51
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.8
+Version: 0.14.9
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.9-1
+- Update to 0.14.9
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.8-1
 - Update to 0.14.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	4 Sep 2007 05:17:36 -0000	1.28
+++ sources	14 Sep 2007 06:09:24 -0000	1.29
@@ -1 +1 @@
-b0d784200b99a96ecc0304095e31dd55  gnome-mag-0.14.8.tar.bz2
+36a4bb5b06ca8bfb0d7d728c3045bebe  gnome-mag-0.14.9.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 06:19:33 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 02:19:33 -0400
Subject: rpms/squid/devel squid-2.6.STABLE16-config.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 sources, 1.29, 1.30 squid.spec, 1.87,
	1.88 squid-2.6.STABLE14-config.patch, 1.1, NONE
Message-ID: <200709140619.l8E6JXba011193@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE16-config.patch 
Removed Files:
	squid-2.6.STABLE14-config.patch 
Log Message:
* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE16


squid-2.6.STABLE16-config.patch:

--- NEW FILE squid-2.6.STABLE16-config.patch ---
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config	2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
 #http_access allow our_networks
 
 # And finally deny all other access to this proxy
+http_access allow localhost
 http_access deny all
 NOCOMMENT_END
 DOC_END
@@ -2250,7 +2251,7 @@ DOC_END
 
 NAME: logfile_rotate
 TYPE: int
-DEFAULT: 10
+DEFAULT: 0
 LOC: Config.Log.rotateNumber
 DOC_START
 	Specifies the number of logfile rotations to make when you
@@ -2266,6 +2267,8 @@ DOC_START
 	purposes, so -k rotate uses another signal.  It is best to get
 	in the habit of using 'squid -k rotate' instead of 'kill -USR1
 	<pid>'.
+	
+logfile_rotate 0
 DOC_END
 
 NAME: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
 
 NAME: cache_mgr
 TYPE: string
-DEFAULT: webmaster
+DEFAULT: root
 LOC: Config.adminEmail
 DOC_START
 	Email-address of local cache manager who will receive
-	mail if the cache dies. The default is "webmaster".
+	mail if the cache dies. The default is "root".
 DOC_END
 
 NAME: mail_from
@@ -3374,21 +3377,22 @@ DOC_END
 
 NAME: cache_effective_user
 TYPE: string
-DEFAULT: nobody
+DEFAULT: squid
 LOC: Config.effectiveUser
 DOC_START
 	If you start Squid as root, it will change its effective/real
 	UID/GID to the user specified below.  The default is to change
-	to UID to nobody.  If you define cache_effective_user, but not
+	to UID to squid.  If you define cache_effective_user, but not
 	cache_effective_group, Squid sets the GID to the effective
 	user's default group ID (taken from the password file) and
 	supplementary group list from the from groups membership of
 	cache_effective_user.
+cache_effective_user squid
 DOC_END
 
 NAME: cache_effective_group
 TYPE: string
-DEFAULT: none
+DEFAULT: squid
 LOC: Config.effectiveGroup
 DOC_START
 	If you want Squid to run with a specific GID regardless of
@@ -3398,6 +3402,7 @@ DOC_START
 	and only this GID is effective. If Squid is not started as
 	root the user starting Squid must be member of the specified
 	group.
+cache_effective_group squid
 DOC_END
 
 NAME: httpd_suppress_version_string
@@ -4018,12 +4023,12 @@ COMMENT_END
 NAME: snmp_port
 TYPE: ushort
 LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
 IFDEF: SQUID_SNMP
 DOC_START
 	Squid can now serve statistics and status information via SNMP.
-	By default it listens to port 3401 on the machine. If you don't
-	wish to use SNMP, set this to "0".
+	A value of "0" disables SNMP support. If you wish to use SNMP,
+	set this to "3401" to use the normal SNMP support.
 DOC_END
 
 NAME: snmp_access
@@ -4402,15 +4407,22 @@ TYPE: string
 LOC: Config.errorDirectory
 DEFAULT: @DEFAULT_ERROR_DIR@
 DOC_START
-	If you wish to create your own versions of the default
-	(English) error files, either to customize them to suit your
-	language or company copy the template English files to another
+	Directory where the error files are read from.
+	/usr/lib/squid/errors contains sets of error files
+	in different languages. The default error directory
+	is /etc/squid/errors, which is a link to one of these
+	error sets.
+
+	If you wish to create your own versions of the error files,
+	either to customize them to suit your language or company,
+	copy the template English files to another
 	directory and point this tag at them.
-
-	The squid developers are interested in making squid available in
-	a wide variety of languages. If you are making translations for a
-	langauge that Squid does not currently provide please consider
-	contributing your translation back to the project.
+	
+    The squid developers are interested in making squid available in
+    a wide variety of languages. If you are making translations for a
+    langauge that Squid does not currently provide please consider
+    contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
 DOC_END
 
 NAME: error_map


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	19 Jul 2007 20:42:07 -0000	1.27
+++ .cvsignore	14 Sep 2007 06:18:59 -0000	1.28
@@ -1 +1 @@
-squid-2.6.STABLE14.tar.bz2
+squid-2.6.STABLE16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Jul 2007 20:42:07 -0000	1.29
+++ sources	14 Sep 2007 06:18:59 -0000	1.30
@@ -1 +1 @@
-eadb138d48320df8b99349121159c6bf  squid-2.6.STABLE14.tar.bz2
+849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- squid.spec	29 Aug 2007 04:51:28 -0000	1.87
+++ squid.spec	14 Sep 2007 06:18:59 -0000	1.88
@@ -4,8 +4,8 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE14
-Release:  2%{?dist}
+Version:  2.6.STABLE16
+Release:  1%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
@@ -26,7 +26,7 @@
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-2.6.STABLE14-config.patch
+Patch201: squid-2.6.STABLE16-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
@@ -326,6 +326,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
+- upgrade to latest upstream 2.6.STABLE16
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:2.6.STABLE14-2
 - Rebuild for selinux ppc32 issue.
 


--- squid-2.6.STABLE14-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 06:43:54 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 02:43:54 -0400
Subject: rpms/jd/devel .cvsignore, 1.144, 1.145 jd.spec, 1.170, 1.171 sources,
	1.145, 1.146
Message-ID: <200709140643.l8E6hsAT011874@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11840

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
- svn 1331



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- .cvsignore	9 Sep 2007 18:10:13 -0000	1.144
+++ .cvsignore	14 Sep 2007 06:43:21 -0000	1.145
@@ -1 +1 @@
-jd-1.9.6-svn1322.tgz
+jd-1.9.6-svn1331.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- jd.spec	9 Sep 2007 18:10:13 -0000	1.170
+++ jd.spec	14 Sep 2007 06:43:21 -0000	1.171
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1322
+%define         strtag        svn1331
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -86,7 +86,7 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Sep 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1322
-- svn 1322
+* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
+- svn 1331
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	9 Sep 2007 18:10:13 -0000	1.145
+++ sources	14 Sep 2007 06:43:21 -0000	1.146
@@ -1 +1 @@
-c2739df7a9ba803064f93beb6f87ed72  jd-1.9.6-svn1322.tgz
+d0cf5022f84597bfeb830aa6a6597ac0  jd-1.9.6-svn1331.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 06:46:12 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 02:46:12 -0400
Subject: rpms/pyzor/EL-4 patch-pyzor-debian-mbox, NONE,
	1.1 patch-pyzor-handle_unknown_encodings, NONE,
	1.1 patch-pyzor-unknowntype, NONE, 1.1 pyzor.spec, 1.8,
	1.9 pyzor-0.4.0.tar.bz2.asc, 1.1, NONE
Message-ID: <200709140646.l8E6kCQ5011975@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11944

Modified Files:
	pyzor.spec 
Added Files:
	patch-pyzor-debian-mbox patch-pyzor-handle_unknown_encodings 
	patch-pyzor-unknowntype 
Removed Files:
	pyzor-0.4.0.tar.bz2.asc 
Log Message:
* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
- Rebuild with Python 2.5.



--- NEW FILE patch-pyzor-debian-mbox ---
--- lib/pyzor/client.py	Sun Sep  8 22:37:15 2002
+++ lib/pyzor/client.py	Wed Apr 13 17:08:42 2005
@@ -8,6 +8,7 @@
 import getopt
 import tempfile
 import mimetools
+import multifile
 import sha
 
 import pyzor
@@ -58,11 +57,6 @@
         self.send(msg, address)
         return self.read_response(msg.get_thread())
 
-    def shutdown(self, address):
-        msg = ShutdownRequest()
-        self.send(msg, address)
-        return self.read_response(msg.get_thread())
-
     def build_socket(self):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
@@ -132,39 +126,50 @@
 
     def run(self):
         debug = 0
-        (options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir='])
-        if len(args) < 1:
-           self.usage()
-
         specified_homedir = None
+        options = None
+        log = None
+        
+        try:
+            (options, args) = getopt.getopt(sys.argv[1:], 'd', ['homedir=', 'log'])
+        except getopt.GetoptError:
+            self.usage()    
+
+        if len(args) < 1:
+            self.usage()
 
         for (o, v) in options:
             if o == '-d':
                 debug = 1
-            elif o == '-h':
-               self.usage()
             elif o == '--homedir':
                 specified_homedir = v
+            elif o == '--log':
+                log = 1
         
         self.output = Output(debug=debug)
-
         homedir = pyzor.get_homedir(specified_homedir)
-
+        
+        if log:
+            sys.stderr = open(homedir + "/pyzor.log", 'a')
+            sys.stderr.write("\npyzor[" + repr (os.getpid()) + "]:\n")
+        
         config = pyzor.Config(homedir)
         config.add_section('client')
 
-        defaults = {'ServersFile': 'servers',
+        defaults = {'ServersFile':        'servers',
                     'DiscoverServersURL': ServerList.inform_url,
-                    'AccountsFile' : 'accounts',
+                    'AccountsFile':       'accounts',
+                    'Timeout':            str(Client.timeout),
                     }
 
         for k, v in defaults.items():
             config.set('client', k, v)
-            
+        
         config.read(os.path.join(homedir, 'config'))
         
         servers_fn = config.get_filename('client', 'ServersFile')
-    
+        Client.timeout = config.getint('client', 'Timeout')
+        
         if not os.path.exists(homedir):
             os.mkdir(homedir)
 
@@ -197,10 +202,13 @@
     def usage(self, s=None):
         if s is not None:
             sys.stderr.write("%s\n" % s)
-        sys.stderr.write("""usage: %s [-d] [--homedir dir] command [cmd_opts]
+        sys.stderr.write("""
+usage: %s [-d] [--homedir dir] command [cmd_opts]
 command is one of: check, report, discover, ping, digest, predigest,
-                   genkey, shutdown
+                   genkey
+                   
 Data is read on standard input (stdin).
+
 """
                          % sys.argv[0])
         sys.exit(2)
@@ -208,9 +216,9 @@
 
 
     def ping(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         runner = ClientRunner(self.client.ping)
@@ -221,30 +229,23 @@
         return runner.all_ok
         
 
-    def shutdown(self, args):
-        (opts, args2) = getopt.getopt(args[1:], '')
-
-        if len(args2) > 1:
+    def info(self, args):
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-        runner = ClientRunner(self.client.shutdown)
+        do_mbox = 'msg'
 
-        for arg in args2:
-            server = Address.from_str(arg)
-            runner.run(server, (server,))
-                    
-        return runner.all_ok
-
-
-    def info(self, args):
-        getopt.getopt(args[1:], '')
-        
-        if len(args) > 1:
-            self.usage("%s does not take any non-option arguments" % args[0])
+        for (o, v) in options:
+            if o == '--mbox':
+                do_mbox = 'mbox'
 
         runner = InfoClientRunner(self.client.info)
 
-        for digest in FileDigester(sys.stdin, self.digest_spec):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             for server in self.servers:
                 response = runner.run(server, (digest, server))
 
@@ -252,34 +253,45 @@
 
 
     def check(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
+        do_mbox = 'msg'
+
+        for (o, v) in options:
+            if o == '--mbox':
+                do_mbox = 'mbox'
+
         runner = CheckClientRunner(self.client.check)
 
-        for digest in FileDigester(sys.stdin, self.digest_spec):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             for server in self.servers:
-                response = runner.run(server, (digest, server))
+                runner.run(server, (digest, server))
                 
         return (runner.found_hit and not runner.whitelisted)
 
 
     def report(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-        do_mbox = False
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
+        do_mbox = 'msg'
+
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
         all_ok = True
 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             if not self.send_digest(digest, self.digest_spec,
                                     self.client.report):
                 all_ok = False
@@ -302,20 +314,22 @@
 
 
     def whitelist(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-        do_mbox = False
+        do_mbox = 'msg'
 
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
         all_ok = True
 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             if not self.send_digest(digest, self.digest_spec,
                                     self.client.whitelist):
                 all_ok = False
@@ -324,28 +338,29 @@
 
 
     def digest(self, args):
-        (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
-
-        if len(args2) > 1:
+        try:
+            (options, args2) = getopt.getopt(args[1:], '', ['mbox'])
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
-
-        do_mbox = False
+        do_mbox = 'msg'
 
         for (o, v) in options:
             if o == '--mbox':
-                do_mbox = True
+                do_mbox = 'mbox'
                 
-        for digest in FileDigester(sys.stdin, self.digest_spec, do_mbox):
+        for digest in get_input_handler(sys.stdin, self.digest_spec, do_mbox):
+            if digest is None:
+                continue
             sys.stdout.write("%s\n" % digest)
 
         return True
 
 
     def print_digested(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         def loop():
@@ -358,9 +373,9 @@
         return True
 
     def genkey(self, args):
-        getopt.getopt(args[1:], '')
-
-        if len(args) > 1:
+        try:
+            getopt.getopt(args[1:], '')
+        except getopt.GetoptError:
             self.usage("%s does not take any non-option arguments" % args[0])
 
         import getpass
@@ -414,7 +429,6 @@
                   'report':    report,
                   'ping' :     ping,
                   'genkey':    genkey,
-                  'shutdown':  shutdown,
                   'info':      info,
                   'whitelist': whitelist,
                   'digest':    digest,
@@ -608,31 +622,37 @@
 
 
 
-class FileDigester(BasicIterator):
-    __slots__ = ['digester']
-
-    def __init__(self, fp, spec, mbox=False):
-        self.digester = iter(get_file_digester(fp, spec, mbox))
-        self.output = pyzor.Output()
-
-    def next(self):
-        digest = self.digester.next()
-        self.output.debug("calculated digest: %s" % digest)
-        return digest
-
-
-
-def get_file_digester(fp, spec, mbox, seekable=False):
+def get_input_handler(fp, spec, style='msg', seekable=False):
     """Return an object that can be iterated over
     to get all the digests from fp according to spec.
     mbox is a boolean"""
-    if mbox:
+    if style == 'msg':
+        return filter(lambda x: x is not None,
+                      (DataDigester(rfc822BodyCleaner(fp),
+                                    spec, seekable).get_digest(),)
+                      )
+
+    elif style =='mbox':
         return MailboxDigester(fp, spec)
 
-    return (DataDigester(rfc822BodyCleaner(fp),
-                         spec, seekable).get_digest(),)
+    elif style == 'digests':
+        return JustDigestsIterator(fp)
+
+    raise ValueError, "unknown input style"
 
 
+class JustDigestsIterator(BasicIterator):
+    __slots__ = ['fp']
+    
+    def __init__(self, fp):
+        self.fp = fp
+
+    def next(self):
+        l = fp.readline()
+        if not l:
+            raise StopIteration
+        return l.rstrip()
+
 
 class MailboxDigester(BasicIterator):
     __slots__ = ['mbox', 'digest_spec', 'seekable']
@@ -645,7 +665,12 @@
         self.seekable    = seekable
 
     def next(self):
-        next_msg = self.mbox.next()
+        try:
+            next_msg = self.mbox.next()
+        except IOError:
+            print "Error: Please feed mailbox files in on stdin, i.e."
+            print "    pyzor digest --mbox < my_mbox_file"
+            next_msg = None
         if next_msg is None:
             raise StopIteration
         return DataDigester(next_msg, self.digest_spec,


--- NEW FILE patch-pyzor-handle_unknown_encodings ---
--- lib/pyzor/client.py	Sun Sep  8 22:37:15 2002
+++ lib/pyzor/client.py	Wed Aug  3 10:58:03 2005
@@ -466,7 +470,7 @@
 
         (fp, offsets) = self.get_line_offsets(fp)
         
-        # did we get an empty file?
+	# did we get an empty (parsed output)file?
         if len(offsets) == 0:
             return
 
@@ -662,39 +666,66 @@
         self.multifile = None
         self.curfile   = None
 
+	# Check if we got a mail or not. Set type to binary if there is no 'From:' header and
+	# type text/plain with encoding 7bit. 7bit is passed trough anyway so nobody cares.
+	if (not msg.has_key("From") and self.type == 'text' and msg.subtype == 'plain' and msg.getencoding() == '7bit'):
+		self.type = 'binary';
+
         if self.type == 'text':
             encoding = msg.getencoding()
-            if encoding == '7bit':
-                self.curfile = msg.fp
-            else:
-                self.curfile = tempfile.TemporaryFile()
-                mimetools.decode(msg.fp, self.curfile, encoding)
-                self.curfile.seek(0)
-                
+            self.curfile = msg.fp
+            if encoding != '7bit':
+                # fix bad encoding name
+                if encoding == '8bits':
+                    encoding = '8bit'
+                try:
+                    newcurfile = tempfile.TemporaryFile()
+                    mimetools.decode(msg.fp, newcurfile, encoding)
+                    newcurfile.seek(0)
+                    self.curfile = newcurfile
+                except:
+                    # ignore encoding on errors, pass msg as is
+                    pass
+
         elif self.type == 'multipart':
             import multifile
             self.multifile = multifile.MultiFile(msg.fp, seekable=False)
             self.multifile.push(msg.getparam('boundary'))
-            self.multifile.next()
-            self.curfile = self.__class__(self.multifile)
-
+	    try:
+		self.multifile.next()
+		self.curfile = self.__class__(self.multifile)
+	    except:
+	    	#
+	    	# Catch multipart decoding errors
+	    	#
+		fp.seek(0)
+		self.curfile = fp
+		self.type = 'binary'
 
         if self.type == 'text' or self.type == 'multipart':
             assert self.curfile is not None
+        elif self.type == 'binary':
+	    try:
+	 	fp.seek(0)
+	    except:
+	    	pass
+	    self.curfile = fp
         else:
             assert self.curfile is None
 
         
     def readline(self):
         l = ''
-        if self.type in ('text', 'multipart'):
-            l = self.curfile.readline()
-
-        if self.type == 'multipart' and not l and self.multifile.next():
-            self.curfile = self.__class__(self.multifile)
-            # recursion.  Could get messy if
-            # we get a bunch of empty multifile parts
-            l = self.readline()
+	try:
+		if self.type in ('text', 'multipart', 'binary'):
+		    l = self.curfile.readline()
+		if self.type == 'multipart' and not l and self.multifile.next():
+		    self.curfile = self.__class__(self.multifile)
+		    # recursion.  Could get messy if
+		    # we get a bunch of empty multifile parts
+		    l = self.readline()
+	except (TypeError, multifile.Error):
+		pass
         return l
 
 


--- NEW FILE patch-pyzor-unknowntype ---
--- lib/pyzor/client.py	Tue Aug 23 14:53:09 2005
+++ lib/pyzor/client.py	Tue Aug 23 14:51:36 2005
@@ -693,6 +692,9 @@
 	# type text/plain with encoding 7bit. 7bit is passed trough anyway so nobody cares.
 	if (not msg.has_key("From") and self.type == 'text' and msg.subtype == 'plain' and msg.getencoding() == '7bit'):
 		self.type = 'binary';
+	
+	if self.type is '':
+	    self.type = 'text';
 
         if self.type == 'text':
             encoding = msg.getencoding()


Index: pyzor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyzor/EL-4/pyzor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pyzor.spec	10 Feb 2005 03:09:32 -0000	1.8
+++ pyzor.spec	14 Sep 2007 06:45:38 -0000	1.9
@@ -1,10 +1,10 @@
-%define pyver %(python -c 'import sys ; print sys.version[: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)")}
+%define pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:          pyzor
 Version:       0.4.0
-Release:       8
+Release:       11%{?dist}
 Summary:       Pyzor collaborative spam filtering system
 
 Group:         Applications/Internet
@@ -12,59 +12,72 @@
 URL:           http://pyzor.sourceforge.net/
 Source0:       http://easynews.dl.sourceforge.net/sourceforge/pyzor/pyzor-0.4.0.tar.bz2
 Source1:       http://easynews.dl.sourceforge.net/sourceforge/pyzor/pyzor-0.4.0.tar.bz2.asc
+Patch0:        http://antispam.imp.ch/patches/patch-pyzor-debian-mbox
+Patch1:        http://antispam.imp.ch/patches/patch-pyzor-handle_unknown_encodings
+Patch2:        http://antispam.imp.ch/patches/patch-pyzor-unknowntype
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: python >= 2.2.1
 Requires:      python-abi = %{pyver}
 
 %description
-Pyzor is a collaborative, networked system to detect 
-and block spam using identifying digests of messages. 
-Pyzor is similar to Vipul's Razor except implemented 
+Pyzor is a collaborative, networked system to detect
+and block spam using identifying digests of messages.
+Pyzor is similar to Vipul's Razor except implemented
 in python, and using fully open source servers.
 
-Pyzor can be used either standalone, or to augment the 
-spam filtering ability of spamassassin.  spamassassin 
+Pyzor can be used either standalone, or to augment the
+spam filtering ability of spamassassin.  spamassassin
 is highly recommended.
 
 %prep
-%setup -q 
+%setup -q
+# Add mbox handling support
+%patch0 -p0
+# Handle unknown encodings
+%patch1 -p0
+# Treat empty messages as text
+%patch2 -p0
+
 
 %build
 %__python setup.py build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m755 -d $RPM_BUILD_ROOT%{python_sitelib}/pyzor
-install -p -m644 build/lib/pyzor/* $RPM_BUILD_ROOT%{python_sitelib}/pyzor
-install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 build/scripts-%{pyver}/* $RPM_BUILD_ROOT%{_bindir}
-%__python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-%__python -O -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/%{python_sitelib}",10,"%{python_sitelib}")'
-chmod -R a+rX $RPM_BUILD_ROOT/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor* 
+rm -rf %{buildroot}
+install -m755 -d %{buildroot}%{python_sitelib}/pyzor
+install -p -m644 build/lib/pyzor/* %{buildroot}%{python_sitelib}/pyzor
+install -m755 -d %{buildroot}%{_bindir}
+install -p -m755 build/scripts-%{pyver}/* %{buildroot}%{_bindir}
+%__python -c 'from compileall import *; compile_dir("'%{buildroot}'/%{python_sitelib}",10,"%{python_sitelib}")'
+%__python -O -c 'from compileall import *; compile_dir("'%{buildroot}'/%{python_sitelib}",10,"%{python_sitelib}")'
+chmod -R a+rX %{buildroot}/%{python_sitelib}/pyzor $RPM_BUILD_ROOT%{_bindir}/pyzor*
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/pyzor
 %doc docs/usage.html COPYING ChangeLog NEWS README THANKS UPGRADING PKG-INFO
-%attr(0644,root,root)
-%{python_sitelib}/pyzor/client.py
-%{python_sitelib}/pyzor/client.pyc
-%ghost %{python_sitelib}/pyzor/client.pyo
-%{python_sitelib}/pyzor/server.py
-%{python_sitelib}/pyzor/server.pyc
-%ghost %{python_sitelib}/pyzor/server.pyo
-%{python_sitelib}/pyzor/__init__.py
-%{python_sitelib}/pyzor/__init__.pyc
-%ghost %{python_sitelib}/pyzor/__init__.pyo
-%attr(0755,root,root)
-%{_bindir}/pyzor
-%{_bindir}/pyzord
+%attr(0644,root,root) %{python_sitelib}/pyzor/client.py*
+%attr(0644,root,root) %{python_sitelib}/pyzor/server.py*
+%attr(0644,root,root) %{python_sitelib}/pyzor/__init__.py*
+%attr(0755,root,root) %{_bindir}/pyzor
+%attr(0755,root,root) %{_bindir}/pyzord
+
 
 %changelog
+* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
+- Rebuild with Python 2.5.
+
+* Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 0.9.8-10
+- FE6 Rebuild
+- Feature enhancements by including certain patches from swinog.
+
 * Mon Feb 07 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-8
 - %%ghost *.pyo files.
 


--- pyzor-0.4.0.tar.bz2.asc DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 06:54:25 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 02:54:25 -0400
Subject: rpms/pyzor/EL-4 pyzor-0.4.0.tar.bz2.asc,1.2,1.3
Message-ID: <200709140654.l8E6sPof012275@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12198

Added Files:
	pyzor-0.4.0.tar.bz2.asc 
Log Message:
readding file



Index: pyzor-0.4.0.tar.bz2.asc
===================================================================
RCS file: pyzor-0.4.0.tar.bz2.asc
diff -N pyzor-0.4.0.tar.bz2.asc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pyzor-0.4.0.tar.bz2.asc	14 Sep 2007 06:53:52 -0000	1.3
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+iEYEABECAAYFAj17tZoACgkQVv/RCiYMT6OxlQCeNk0es0dwCBE7AqC7dkmMYwg4
+0JUAn0Fug6aQOtBgixq5OcHdtTVv7U/L
+=caa7
+-----END PGP SIGNATURE-----



From fedora-extras-commits at redhat.com  Fri Sep 14 07:10:19 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 14 Sep 2007 03:10:19 -0400
Subject: rpms/pyzor/EL-5 pyzor.spec,1.11,1.12
Message-ID: <200709140710.l8E7AJXZ018594@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/pyzor/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18571

Modified Files:
	pyzor.spec 
Log Message:
* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
- Rebuild with Python 2.5.



Index: pyzor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyzor/EL-5/pyzor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pyzor.spec	8 Sep 2006 15:44:21 -0000	1.11
+++ pyzor.spec	14 Sep 2007 07:09:46 -0000	1.12
@@ -1,11 +1,10 @@
-# 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)")}
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:          pyzor
 Version:       0.4.0
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Pyzor collaborative spam filtering system
 
 Group:         Applications/Internet
@@ -72,6 +71,9 @@
 
 
 %changelog
+* Sat Dec 23 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.4.0-11
+- Rebuild with Python 2.5.
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 0.9.8-10
 - FE6 Rebuild
 - Feature enhancements by including certain patches from swinog.



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:10 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:10 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qAWN018295@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pilot-link



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:16 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:16 -0700
Subject: [pkgdb] pilot-link: alexlan has given up watchbugzilla
Message-ID: <200709140752.l8E7qGao027186@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has given up the watchbugzilla acl on pilot-link (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pilot-link



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:18 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:18 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qIbS018304@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pilot-link



From fedora-extras-commits at redhat.com  Fri Sep 14 07:52:29 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Fri, 14 Sep 2007 00:52:29 -0700
Subject: [pkgdb] pilot-link: alexlan has requested watchbugzilla
Message-ID: <200709140752.l8E7qTCG018313@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on pilot-link (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pilot-link



From fedora-extras-commits at redhat.com  Fri Sep 14 08:22:00 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan))
Date: Fri, 14 Sep 2007 04:22:00 -0400
Subject: comps comps-f7.xml.in, 1.253, 1.254 comps-f8.xml.in, 1.107,
	1.108 comps-fe5.xml.in, 1.276, 1.277 comps-fe6.xml.in, 1.374, 1.375
Message-ID: <200709140822.l8E8M0FI026907@cvs-int.fedora.redhat.com>

Author: alexlan

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26874

Modified Files:
	comps-f7.xml.in comps-f8.xml.in comps-fe5.xml.in 
	comps-fe6.xml.in 
Log Message:
Added "hugin" to Graphics, it's absence from graphical installer was noted
on dailypackage:
http://dailypackage.fedorabook.com/index.php?/archives/144-Artsy-Tuesday-Hugin-Photo-stitcher.html



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- comps-f7.xml.in	13 Sep 2007 02:13:20 -0000	1.253
+++ comps-f7.xml.in	14 Sep 2007 08:21:29 -0000	1.254
@@ -1761,6 +1761,7 @@
       <packagereq type="optional">gutenprint-plugin</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- comps-f8.xml.in	13 Sep 2007 10:03:52 -0000	1.107
+++ comps-f8.xml.in	14 Sep 2007 08:21:29 -0000	1.108
@@ -1911,6 +1911,7 @@
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe5.xml.in,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- comps-fe5.xml.in	23 Jun 2007 15:10:35 -0000	1.276
+++ comps-fe5.xml.in	14 Sep 2007 08:21:29 -0000	1.277
@@ -618,6 +618,7 @@
       <packagereq type="optional">graphviz</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">k3d</packagereq>
       <packagereq type="optional">kipi-plugins</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- comps-fe6.xml.in	13 Sep 2007 02:13:20 -0000	1.374
+++ comps-fe6.xml.in	14 Sep 2007 08:21:29 -0000	1.375
@@ -751,6 +751,7 @@
       <packagereq type="optional">gutenprint</packagereq>
       <packagereq type="optional">gv</packagereq>
       <packagereq type="optional">gwenview</packagereq>
+      <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 14 09:27:30 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 05:27:30 -0400
Subject: rpms/iputils/devel iputils.spec,1.50,1.51
Message-ID: <200709140927.l8E9RUMD002395@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/iputils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	iputils.spec 
Log Message:
* Fri Aug  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-4
- resolves: #236725: ping does not work for subsecond intervals for ordinary user
- resolves: #243197: RFE: Please sync ifenslave with current kernel
- resolves: #246954: Initscript Review
- resolves: #251124: can't build rdisc - OPEN_MAX undeclared



Index: iputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- iputils.spec	7 Aug 2007 10:09:32 -0000	1.50
+++ iputils.spec	14 Sep 2007 09:26:57 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20070202
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -147,6 +147,9 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-5
+- rebuild
+
 * Fri Aug  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-4
 - resolves: #236725: ping does not work for subsecond intervals for ordinary user
 - resolves: #243197: RFE: Please sync ifenslave with current kernel



From fedora-extras-commits at redhat.com  Fri Sep 14 09:42:13 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Fri, 14 Sep 2007 05:42:13 -0400
Subject: rpms/quagga/devel quagga.spec,1.37,1.38
Message-ID: <200709140942.l8E9gDBi002840@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2818

Modified Files:
	quagga.spec 
Log Message:
* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
- rebuild



Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- quagga.spec	1 Aug 2007 09:54:03 -0000	1.37
+++ quagga.spec	14 Sep 2007 09:41:41 -0000	1.38
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.8
-Release:    1%{?dist}
+Release:    1.1%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
+- rebuild
+
 * Mon Jul 30 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1
 - upgrade to new upstream version 0.99.8
 - resolves: #249423: scripts in /etc/rc.d/init.d/* are marked as config files in specfile



From fedora-extras-commits at redhat.com  Fri Sep 14 10:44:59 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 06:44:59 -0400
Subject: rpms/keepalived/devel keepalived-1.1.14-genhashman.patch, NONE,
	1.1 keepalived-1.1.14-installmodes.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 keepalived.spec, 1.3, 1.4 sources, 1.2,
	1.3 keepalived.init, 1.1, NONE keepalived.sysconfig, 1.1, NONE
Message-ID: <200709141044.l8EAixgP010334@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299

Modified Files:
	.cvsignore keepalived.spec sources 
Added Files:
	keepalived-1.1.14-genhashman.patch 
	keepalived-1.1.14-installmodes.patch 
Removed Files:
	keepalived.init keepalived.sysconfig 
Log Message:
Update to 1.1.14.


keepalived-1.1.14-genhashman.patch:

--- NEW FILE keepalived-1.1.14-genhashman.patch ---
diff -Naupr keepalived-1.1.14.orig/genhash/Makefile.in keepalived-1.1.14/genhash/Makefile.in
--- keepalived-1.1.14.orig/genhash/Makefile.in	2007-09-13 16:47:12.000000000 +0200
+++ keepalived-1.1.14/genhash/Makefile.in	2007-09-13 18:48:23.000000000 +0200
@@ -39,13 +39,13 @@ distclean: clean
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-	rm -f $(DESTDIR)$(mandir)/man/man1/genhash.1
+	rm -f $(DESTDIR)$(mandir)/man1/genhash.1
 
 install:
 	install -d $(DESTDIR)$(bindir)
 	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/
-	install -d $(DESTDIR)$(mandir)/man/man1
-	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man/man1
+	install -d $(DESTDIR)$(mandir)/man1
+	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man1
 
 mrproper: clean distclean
 	rm -f config.*

keepalived-1.1.14-installmodes.patch:

--- NEW FILE keepalived-1.1.14-installmodes.patch ---
diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in
--- keepalived-1.1.14.orig/keepalived/Makefile.in	2007-09-13 15:44:39.000000000 +0200
+++ keepalived-1.1.14/keepalived/Makefile.in	2007-09-14 12:38:43.000000000 +0200
@@ -99,13 +99,13 @@ uninstall:
 
 install:
 	install -d $(DESTDIR)$(sbindir)
-	install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
+	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
 	install -d $(DESTDIR)$(init_dir)
 	install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
 	install -d $(DESTDIR)$(sysconf_dir)
-	install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+	install -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
 	install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
-	install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
+	install -m 640 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
 	install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
 	install -d $(DESTDIR)$(mandir)/man5
 	install -d $(DESTDIR)$(mandir)/man8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 17:32:27 -0000	1.2
+++ .cvsignore	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-keepalived-1.1.13.tar.gz
+keepalived-1.1.14.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keepalived.spec	22 Aug 2007 17:35:37 -0000	1.3
+++ keepalived.spec	14 Sep 2007 10:44:23 -0000	1.4
@@ -3,18 +3,18 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.13
-Release: 8%{?dist}
+Version: 1.1.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
-Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Source1: keepalived.init
-Source2: keepalived.sysconfig
-Patch0: keepalived-1.1.13-makefile.patch
-Patch1: keepalived-1.1.13-iflabel.patch
-Patch2: keepalived-1.1.13-types.patch
+Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
+Patch0: keepalived-1.1.14-genhashman.patch
+Patch1: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 BuildRequires: openssl-devel
 # We need both of these for proper LVS support
 BuildRequires: kernel, kernel-devel
@@ -34,11 +34,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .makefile
-%patch1 -p0 -b .iflabel
-%patch2 -p1 -b .types
+%patch0 -p1 -b .genhashman
+%patch1 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
+# Included as doc, so disable its dependencies
+%{__chmod} -x goodies/arpreset.pl
 
 
 %build
@@ -51,12 +52,6 @@
 %{__make} install DESTDIR=%{buildroot}
 # Remove "samples", as we include them in %%doc
 %{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
-# Init script (based on the included one, but enhanced)
-%{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/keepalived
-# Sysconfig file (used by the init script)
-%{__install} -D -p -m 0640 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/sysconfig/keepalived
 
 
 %check
@@ -90,10 +85,10 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO
-%doc doc/keepalived.conf.SYNOPSIS doc/samples/
+%doc doc/keepalived.conf.SYNOPSIS doc/samples/ goodies/arpreset.pl
 %dir %{_sysconfdir}/keepalived/
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/keepalived
+%config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/keepalived
 %{_sysconfdir}/rc.d/init.d/keepalived
 %{_bindir}/genhash
 %{_sbindir}/keepalived
@@ -103,6 +98,14 @@
 
 
 %changelog
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
+- Update to 1.1.14.
+- Remove all upstreamed patches.
+- Remove our init script and sysconfig files, use the same now provided by the
+  upstream package (will need to patch for LSB stuff soonish).
+- Include new goodies/arpreset.pl in %%doc.
+- Add missing scriplet requirements.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-8
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2007 17:32:27 -0000	1.2
+++ sources	14 Sep 2007 10:44:23 -0000	1.3
@@ -1 +1 @@
-578bdb8e3ff4cca50fc877893bad658c  keepalived-1.1.13.tar.gz
+5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz


--- keepalived.init DELETED ---


--- keepalived.sysconfig DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 10:52:44 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 06:52:44 -0400
Subject: rpms/keepalived/devel keepalived.spec,1.4,1.5
Message-ID: <200709141052.l8EAqivU010593@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556

Modified Files:
	keepalived.spec 
Log Message:
Add popt-devel for F8+.



Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- keepalived.spec	14 Sep 2007 10:44:23 -0000	1.4
+++ keepalived.spec	14 Sep 2007 10:52:08 -0000	1.5
@@ -18,6 +18,10 @@
 BuildRequires: openssl-devel
 # We need both of these for proper LVS support
 BuildRequires: kernel, kernel-devel
+# We need popt, popt-devel is split out of rpm in Fedora 8+
+%if 0%{?fedora} >= 8
+BuildRequires: popt-devel
+%endif
 
 %description
 The main goal of the keepalived project is to add a strong & robust keepalive



From fedora-extras-commits at redhat.com  Fri Sep 14 11:09:15 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 04:09:15 -0700
Subject: [pkgdb] gettext: nphilipp has requested commit
Message-ID: <200709141109.l8EB9GNj029761@app3.fedora.phx.redhat.com>

Nils Philippsen (nphilipp) has requested the commit acl on gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gettext



From fedora-extras-commits at redhat.com  Fri Sep 14 11:09:18 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 04:09:18 -0700
Subject: [pkgdb] gettext: nphilipp has requested commit
Message-ID: <200709141109.l8EB9JP6019818@app4.fedora.phx.redhat.com>

Nils Philippsen (nphilipp) has requested the commit acl on gettext (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gettext



From fedora-extras-commits at redhat.com  Fri Sep 14 11:17:00 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 07:17:00 -0400
Subject: rpms/compat-wxGTK26/devel wxGTK-2.6.3-strconv.patch, NONE,
	1.1 compat-wxGTK26.spec, 1.8, 1.9
Message-ID: <200709141117.l8EBH0wm017328@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-strconv.patch 
Log Message:
* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
- Patch some dangerous pointer dereferences in src/common/strconv.cpp.


wxGTK-2.6.3-strconv.patch:

--- NEW FILE wxGTK-2.6.3-strconv.patch ---
diff -Nur wxGTK-2.6.3-orig/src/common/strconv.cpp wxGTK-2.6.3/src/common/strconv.cpp
--- wxGTK-2.6.3-orig/src/common/strconv.cpp	2006-03-22 00:42:11.000000000 +0100
+++ wxGTK-2.6.3/src/common/strconv.cpp	2007-09-14 12:08:01.000000000 +0200
@@ -194,7 +194,7 @@
         }
     }
 
-    wxWCharBuffer buf((wchar_t *)NULL);
+    wxWCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -215,7 +215,7 @@
         }
     }
 
-    wxCharBuffer buf((char *)NULL);
+    wxCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -773,7 +773,7 @@
             len++;
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                    && cc == L'\\' && psz[0] == L'\\' )
+                    && cc == L'\\' && *psz && psz[0] == L'\\' )
         {
             if (buf)
                 *buf++ = (char)cc;
@@ -782,6 +782,7 @@
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
                     cc == L'\\' &&
+                  *psz && *(psz+1) && *(psz+2) &&
                         isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
         {
             if (buf)


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compat-wxGTK26.spec	28 Aug 2007 09:58:52 -0000	1.8
+++ compat-wxGTK26.spec	14 Sep 2007 11:16:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        7
+Release:        8
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,6 +15,7 @@
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
 #Patch4:         wxGTK-2.6.3-tooltips.patch
 Patch5:         wxGTK-2.6.3-expat2.patch
+Patch6:         wxGTK-2.6.3-strconv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -54,6 +55,7 @@
 %patch3 -p1 -b .g_thread_init
 #patch4 -p1 -b .tooltips
 %patch5 -p1 -b .expat2
+%patch6 -p1 -b .strconv
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
+- Patch some dangerous pointer dereferences in src/common/strconv.cpp.
+
 * Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-7
 - rebuilt for new expat (#195888)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:17:28 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 14 Sep 2007 07:17:28 -0400
Subject: rpms/im-chooser/devel im-chooser.spec,1.19,1.20
Message-ID: <200709141117.l8EBHSKZ017370@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17310

Modified Files:
	im-chooser.spec 
Log Message:
* Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
- Add README into the package.


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- im-chooser.spec	10 Sep 2007 12:35:57 -0000	1.19
+++ im-chooser.spec	14 Sep 2007 11:16:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,7 +57,7 @@
 
 %files -f %{name}.lang
 %defattr (-, root, root)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
+- Add README into the package.
+
 * Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:19:13 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 14 Sep 2007 04:19:13 -0700
Subject: [pkgdb] gettext had acl change status
Message-ID: <200709141119.l8EBJEvj019863@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has set the commit acl on gettext (Fedora devel) to Approved for Nils Philippsen (nphilipp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gettext



From fedora-extras-commits at redhat.com  Fri Sep 14 11:28:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 14 Sep 2007 07:28:04 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork-7.0.0-kwin-bluecurve.patch,
	NONE, 1.1 redhat-artwork.spec, 1.194, 1.195
Message-ID: <200709141128.l8EBS4nm017663@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/redhat-artwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17642

Modified Files:
	redhat-artwork.spec 
Added Files:
	redhat-artwork-7.0.0-kwin-bluecurve.patch 
Log Message:
fix bz276731, KWin theme shows pixel noise for "sticky" icon


redhat-artwork-7.0.0-kwin-bluecurve.patch:

--- NEW FILE redhat-artwork-7.0.0-kwin-bluecurve.patch ---
--- redhat-artwork-7.0.0/art/kde/kwin/Bluecurve/bluecurveclient.cpp.orig	2007-09-14 13:23:49.000000000 +0200
+++ redhat-artwork-7.0.0/art/kde/kwin/Bluecurve/bluecurveclient.cpp	2007-09-14 13:24:43.000000000 +0200
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 
-#define BASE_BUTTON_SIZE  17
+#define BASE_BUTTON_SIZE  16
 #define BORDER_WIDTH      6
 #define CORNER_RADIUS     12
 


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- redhat-artwork.spec	12 Aug 2007 04:20:46 -0000	1.194
+++ redhat-artwork.spec	14 Sep 2007 11:27:32 -0000	1.195
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 7.0.0
-Release: 11%{?dist} 
+Release: 11%{?dist}.1 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -18,6 +18,7 @@
 Patch0: redhat-artwork-7.0.0-kdm-userlist.patch
 Patch1: redhat-artwork-7.0.0-timed-login.patch
 Patch2: default-theme.patch
+Patch3: redhat-artwork-7.0.0-kwin-bluecurve.patch
 Group: User Interface/Desktops
 License: GPL+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +76,7 @@
 %patch0 -p1 -b .kdm-userlist
 %patch1 -p1 -b .timed-login
 %patch2 -p1 -b .default-theme
+%patch3 -p1 -b .kwin-bluecurve
 
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
@@ -452,6 +454,9 @@
 %{_datadir}/apps/kwin/bluecurve.desktop
 
 %changelog
+* Fri Sep 14 2007 Than Ngo <than at redhat.com> - 7.0.0-11.1
+- fix bz276731, KWin theme shows pixel noise for "sticky" icon
+
 * Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 7.0.0-11
 - Switch default theme to use Nodoka
 



From fedora-extras-commits at redhat.com  Fri Sep 14 11:58:49 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 14 Sep 2007 07:58:49 -0400
Subject: rpms/xchat-gnome/F-7 xchat-gnome-0.18-reconnect.patch, NONE,
	1.1 xchat-gnome.spec, 1.39, 1.40
Message-ID: <200709141158.l8EBwnPM018312@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.18-reconnect.patch 
Log Message:
* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-3
- Add patch to fix reconnect bug. (#225408)


xchat-gnome-0.18-reconnect.patch:

--- NEW FILE xchat-gnome-0.18-reconnect.patch ---
--- trunk/plugins/net-monitor/net-monitor.c	2007/09/12 22:18:13	2568
+++ trunk/plugins/net-monitor/net-monitor.c	2007/09/13 01:25:13	2569
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include "xchat-plugin.h"
 
 #define NET_MONITOR_VERSION     "0.1"
@@ -166,6 +169,13 @@
 
 		g_hash_table_foreach (networks, (GHFunc) disconnect_from_network, NULL);
 	} else {
+		/*
+		 * We need to tell the nameserver resolver to reread
+		 * /etc/resolve.conf, since the nameservers might have changed
+		 * when moving between networks.
+		 */
+		res_init();
+
 		g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL);
 	}
 }


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-7/xchat-gnome.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xchat-gnome.spec	3 Aug 2007 01:46:19 -0000	1.39
+++ xchat-gnome.spec	14 Sep 2007 11:58:17 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-config.patch
+Patch1:		%{name}-%{version}-reconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .reconnect
 
 
 %build
@@ -126,6 +128,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-3
+- Add patch to fix reconnect bug. (#225408)
+
 * Thu Aug  2 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.18-2
 - Update license tag.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:35 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:35 -0700
Subject: [pkgdb] festival: mattdm has requested watchbugzilla
Message-ID: <200709141216.l8ECGZ1G020384@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on festival (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:45 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:45 -0700
Subject: [pkgdb] festival: mattdm has requested commit
Message-ID: <200709141216.l8ECGjaE030778@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on festival (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:44 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:44 -0700
Subject: [pkgdb] festival: mattdm has requested watchcommits
Message-ID: <200709141216.l8ECGjal030769@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on festival (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:57 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:57 -0700
Subject: [pkgdb] festival: mattdm has requested watchbugzilla
Message-ID: <200709141216.l8ECGvU5020393@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on festival (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:58 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:58 -0700
Subject: [pkgdb] festival: mattdm has requested watchcommits
Message-ID: <200709141216.l8ECGwPh020403@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on festival (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:16:59 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Sep 2007 05:16:59 -0700
Subject: [pkgdb] festival: mattdm has requested commit
Message-ID: <200709141216.l8ECGxCg030787@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on festival (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/festival



From fedora-extras-commits at redhat.com  Fri Sep 14 12:18:08 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 08:18:08 -0400
Subject: rpms/libsigc++20/devel .cvsignore, 1.5, 1.6 libsigc++.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200709141218.l8ECI84R024681@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24652

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 2.0.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2006 21:19:42 -0000	1.5
+++ .cvsignore	14 Sep 2007 12:17:36 -0000	1.6
@@ -1 +1 @@
-libsigc++-2.0.17.tar.bz2
+libsigc++-2.0.18.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsigc++.spec	10 Aug 2007 08:24:18 -0000	1.12
+++ libsigc++.spec	14 Sep 2007 12:17:36 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           libsigc++20
-Version:        2.0.17
-Release:        3
+Version:        2.0.18
+Release:        1
 
 Summary:        Typesafe signal framework for C++
 
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 2.0.18-1
+- Update to 2.0.18
+
 * Fri Aug 10 2007 Denis Leroy <denis at poolshark.org> - 2.0.17-3
 - Updated License tag as per new guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Feb 2006 21:19:42 -0000	1.6
+++ sources	14 Sep 2007 12:17:36 -0000	1.7
@@ -1 +1 @@
-fde0ee69e3125e982746d9fe005763e1  libsigc++-2.0.17.tar.bz2
+ddebf5aafc8525d10366a8724abc9f28  libsigc++-2.0.18.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 12:20:06 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:20:06 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, NONE,
	1.1 gettext.spec, 1.77,
	1.78 gettext-xglade-include-expat-285701.patch, 1.1, NONE
Message-ID: <200709141220.l8ECK6tQ024812@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24788

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Removed Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
remove gettext-xglade-include-expat-285701.patch, add gettext-xglade-define-xml-major-version-285701.patch to determine XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)


gettext-xglade-define-xml-major-version-285701.patch:

--- NEW FILE gettext-xglade-define-xml-major-version-285701.patch ---
diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
--- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 13:55:28.000000000 +0200
@@ -238,6 +238,22 @@ case "$host_os" in
     LTLIBEXPAT="-ldl"
     AC_SUBST(LIBEXPAT)
     AC_SUBST(LTLIBEXPAT)
+    AC_CHECK_HEADER([expat.h],[
+        cat > xml_major_version.c << EOF
+#include <stdio.h>
+#include <expat.h>
+int main (void) { printf ("%d\n", XML_MAJOR_VERSION); }
+EOF
+        AC_MSG_CHECKING([for libexpat XML_MAJOR_VERSION])
+        $CC -o xml_major_version xml_major_version.c
+        XML_MAJOR_VERSION=$(./xml_major_version)
+        rm -f ./xml_major_version ./xml_major_version.c
+        AC_MSG_RESULT([$XML_MAJOR_VERSION])
+        AC_SUBST(XML_MAJOR_VERSION)
+        AC_DEFINE([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
+    ],[
+        AC_ERROR([cannot determine version of expat library, expat.h is missing])
+    ])
     ;;
   *)
     AC_LIB_HAVE_LINKFLAGS([expat], [],


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
+++ gettext.spec	14 Sep 2007 12:19:34 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -14,8 +14,9 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %ifarch x86_64 ppc64 s390x
-BuildRequires: automake >= 1.8, autoconf >= 2.5
+BuildRequires: automake >= 1.8
 %endif
+BuildRequires: autoconf >= 2.5
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
 # need expat for xgettext on glade
 Buildrequires: expat-devel
@@ -28,7 +29,7 @@
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
 Patch3: gettext-php-prinf-output-237241.patch
-Patch4: gettext-xglade-include-expat-285701.patch
+Patch4: gettext-xglade-define-xml-major-version-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -69,6 +70,11 @@
 
 
 %build
+pushd gettext-tools
+autoconf
+autoheader
+popd
+
 [ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
 
 export JAVAC=gcj
@@ -231,6 +237,11 @@
 
 
 %changelog
+* Fri Sep 14 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-11
+- remove gettext-xglade-include-expat-285701.patch, add
+  gettext-xglade-define-xml-major-version-285701.patch to determine
+  XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)
+
 * Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-10
 - buildrequire expat-devel
 - add gettext-xglade-include-expat-285701.patch to include expat.h


--- gettext-xglade-include-expat-285701.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 12:26:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 08:26:56 -0400
Subject: rpms/maxima/devel maxima.spec,1.82,1.83 xmaxima.desktop,1.5,1.6
Message-ID: <200709141226.l8ECQuV6025222@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25196

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
- xmaxima.desktop: Categories =- Education



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- maxima.spec	30 Aug 2007 18:29:47 -0000	1.82
+++ maxima.spec	14 Sep 2007 12:26:24 -0000	1.83
@@ -2,7 +2,7 @@
 Name: 	 maxima
 Version: 5.13.0
 
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -419,8 +419,12 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
+- xmaxima.desktop: Categories =- Education
+
 * Thu Aug 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-4
-- (re)--enable-gcl (#256281)
+- (re)--enable-gcl, f8+ (#256281)
+- fix inadvertant Obsoletes: maxima-runtime-gcl (f7)
 
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-3
 - until it is unborked, disable gcl support, f8+ (#256281)


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmaxima.desktop	26 Oct 2006 20:31:22 -0000	1.5
+++ xmaxima.desktop	14 Sep 2007 12:26:24 -0000	1.6
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Science;Education;Math;
+Categories=Science;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Fri Sep 14 12:30:56 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:30:56 -0400
Subject: rpms/gettext/devel gettext.spec,1.78,1.79
Message-ID: <200709141230.l8ECUuvU025368@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25343

Modified Files:
	gettext.spec 
Log Message:
fix changelog, take the blame for 0.16.1-11



Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gettext.spec	14 Sep 2007 12:19:34 -0000	1.78
+++ gettext.spec	14 Sep 2007 12:30:24 -0000	1.79
@@ -237,7 +237,7 @@
 
 
 %changelog
-* Fri Sep 14 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-11
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.16.1-11
 - remove gettext-xglade-include-expat-285701.patch, add
   gettext-xglade-define-xml-major-version-285701.patch to determine
   XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)



From fedora-extras-commits at redhat.com  Fri Sep 14 12:47:01 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 08:47:01 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.47,1.48 sources,1.41,1.42
Message-ID: <200709141247.l8ECl1ML025878@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25839

Modified Files:
	hwbrowser.spec sources 
Log Message:
don't buildrequire expat



Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- hwbrowser.spec	11 Sep 2007 12:26:39 -0000	1.47
+++ hwbrowser.spec	14 Sep 2007 12:46:29 -0000	1.48
@@ -12,7 +12,6 @@
 BuildRequires: automake
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
-BuildRequires: expat
 Requires: gnome-python2
 Requires: gnome-python2-canvas
 Requires: pygtk2
@@ -53,9 +52,8 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
-* Tue Sep 11 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
-- buildrequire expat to augment xgettext for glade files
 
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 0.35-1
 - make use of force tagging (since mercurial 0.9.4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	11 Sep 2007 12:26:39 -0000	1.41
+++ sources	14 Sep 2007 12:46:29 -0000	1.42
@@ -1 +1 @@
-2c98067d3f3f4f91ecf4f9f321f1e984  hwbrowser-0.36.tar.bz2
+a51bf81470d82846a0cf6f185f44bc3a  hwbrowser-0.36.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 12:55:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 08:55:35 -0400
Subject: rpms/maxima/devel maxima.spec,1.83,1.84 xmaxima.desktop,1.6,1.7
Message-ID: <200709141255.l8ECtZOn026244@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-6
- xmaxima.desktop: Categories=Development,Math



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- maxima.spec	14 Sep 2007 12:26:24 -0000	1.83
+++ maxima.spec	14 Sep 2007 12:55:02 -0000	1.84
@@ -2,7 +2,7 @@
 Name: 	 maxima
 Version: 5.13.0
 
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -21,14 +21,13 @@
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp sbcl
 %if 0%{?fedora} > 2
-%define default_lisp sbcl 
 %define _enable_clisp --enable-clisp 
-# disable until unborked, http://bugzilla.redhat.com/256281
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl
 %else
-%define default_lisp sbcl 
+# epel/rhel
 %define _enable_sbcl --enable-sbcl 
 %endif
 %endif
@@ -419,8 +418,8 @@
 
 
 %changelog
-* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-5
-- xmaxima.desktop: Categories =- Education
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-6
+- xmaxima.desktop: Categories=Development,Math
 
 * Thu Aug 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 5.13.0-4
 - (re)--enable-gcl, f8+ (#256281)


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmaxima.desktop	14 Sep 2007 12:26:24 -0000	1.6
+++ xmaxima.desktop	14 Sep 2007 12:55:02 -0000	1.7
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Science;Math;
+Categories=Development;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Fri Sep 14 13:06:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 09:06:12 -0400
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.14,1.15
Message-ID: <200709141306.l8ED6C9T032587@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32556

Modified Files:
	wxMaxima.spec 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4
- wxmaxima.desktop: Categories=Development,Math



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wxMaxima.spec	25 Aug 2007 13:55:20 -0000	1.14
+++ wxMaxima.spec	14 Sep 2007 13:05:39 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -62,10 +62,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor="" \
-  --add-category="Education" \
+  --add-category="Development" \
   --add-category="Math" \
   --remove-category="Utility" \
   wxmaxima.desktop 
@@ -105,6 +104,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4
+- wxmaxima.desktop: Categories=Development,Math
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-3
 - License: GPLv2+
 - revert to classic icon scriptlets



From fedora-extras-commits at redhat.com  Fri Sep 14 13:06:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 09:06:40 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, 1.1, 1.2
Message-ID: <200709141306.l8ED6eYN032698@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32586

Modified Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Log Message:
AC_DEFINE([XML_MAJOR_VERSION], ...) -> AC_DEFINE_UNQUOTED(...)


gettext-xglade-define-xml-major-version-285701.patch:

Index: gettext-xglade-define-xml-major-version-285701.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext-xglade-define-xml-major-version-285701.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 12:19:34 -0000	1.1
+++ gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 13:06:38 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
 --- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
-+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 13:55:28.000000000 +0200
++++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 15:03:43.000000000 +0200
 @@ -238,6 +238,22 @@ case "$host_os" in
      LTLIBEXPAT="-ldl"
      AC_SUBST(LIBEXPAT)
@@ -17,7 +17,7 @@
 +        rm -f ./xml_major_version ./xml_major_version.c
 +        AC_MSG_RESULT([$XML_MAJOR_VERSION])
 +        AC_SUBST(XML_MAJOR_VERSION)
-+        AC_DEFINE([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
++        AC_DEFINE_UNQUOTED([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
 +    ],[
 +        AC_ERROR([cannot determine version of expat library, expat.h is missing])
 +    ])



From fedora-extras-commits at redhat.com  Fri Sep 14 13:12:12 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 14 Sep 2007 09:12:12 -0400
Subject: rpms/dbus/devel dbus-1.1.2-audit-user.patch, NONE, 1.1 dbus.spec,
	1.127, 1.128
Message-ID: <200709141312.l8EDCCZo001061@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv974

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1.2-audit-user.patch 
Log Message:
* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
- Reverse we_were_root check to setpcap if we were root.  Also only init
audit if we were root.  So error dbus message will not show up when policy 
reload happens.  dbus -session will no longer try to send audit message, 
only system will.


dbus-1.1.2-audit-user.patch:

--- NEW FILE dbus-1.1.2-audit-user.patch ---
diff -up dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c.audit-user dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c
--- dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c.audit-user	2007-07-24 11:39:09.000000000 -0400
+++ dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c	2007-09-14 09:00:24.000000000 -0400
@@ -300,7 +300,7 @@ _dbus_change_to_daemon_user  (const char
    * run as ... doesn't really help. But keeps people happy.
    */
     
-  if (!we_were_root)
+  if (we_were_root)
     {
       cap_value_t new_cap_list[] = { CAP_AUDIT_WRITE };
       cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, CAP_SETGID };
@@ -376,7 +376,7 @@ _dbus_change_to_daemon_user  (const char
     }
   
 #ifdef HAVE_LIBAUDIT
-  if (!we_were_root)
+  if (we_were_root)
     {
       if (cap_set_proc (new_caps))
         {
@@ -395,6 +395,7 @@ _dbus_change_to_daemon_user  (const char
                           _dbus_strerror (errno));
           return FALSE;
         }
+      audit_init();
     }
 #endif
 
diff -up dbus-1.1.2/bus/selinux.c.audit-user dbus-1.1.2/bus/selinux.c
--- dbus-1.1.2/bus/selinux.c.audit-user	2007-07-24 11:39:08.000000000 -0400
+++ dbus-1.1.2/bus/selinux.c	2007-09-14 08:31:14.000000000 -0400
@@ -113,7 +113,7 @@ static const struct avc_lock_callback lo
 static int audit_fd = -1;
 #endif
 
-static void
+void
 audit_init(void)
 {
 #ifdef HAVE_LIBAUDIT  
@@ -350,12 +350,8 @@ bus_selinux_full_init (void)
 
   freecon (bus_context);
   
-  audit_init ();
-
-  return TRUE;
-#else
-  return TRUE;
 #endif /* HAVE_SELINUX */
+  return TRUE;
 }
 
 /**


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- dbus.spec	28 Aug 2007 21:57:03 -0000	1.127
+++ dbus.spec	14 Sep 2007 13:11:38 -0000	1.128
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -37,6 +37,7 @@
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
+Patch3: dbus-1.1.2-audit-user.patch
 
 %description
 
@@ -79,6 +80,7 @@
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .lsb
+%patch3 -p1 -b .audit-user
 
 autoreconf -f -i
 
@@ -198,6 +200,12 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
+- Reverse we_were_root check to setpcap if we were root.  Also only init
+audit if we were root.  So error dbus message will not show up when policy 
+reload happens.  dbus -session will no longer try to send audit message, 
+only system will.
+
 * Tue Aug 28 2007 David Zeuthen <davidz at redhat.com> - 1.1.2-4%{?dist}
 - Make dbus require dbus-libs (#261721)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 13:23:46 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Sep 2007 09:23:46 -0400
Subject: rpms/glpk/devel .cvsignore, 1.9, 1.10 glpk.spec, 1.14, 1.15 sources,
	1.9, 1.10
Message-ID: <200709141323.l8EDNkAr003325@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/glpk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3176

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
New release. Update license tag to GPLv3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Jul 2007 04:13:57 -0000	1.9
+++ .cvsignore	14 Sep 2007 13:23:14 -0000	1.10
@@ -1 +1 @@
-glpk-4.20.tar.gz
+glpk-4.21.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glpk.spec	23 Aug 2007 18:42:40 -0000	1.14
+++ glpk.spec	14 Sep 2007 13:23:14 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           glpk
-Version:        4.20
-Release:        3%{?dist}
+Version:        4.21
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv3
 URL:            http://www.gnu.org/software/glpk/glpk.html
 Source0:        ftp://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Quentin Spencer <qspencer at users.sf.net> 4.21-1
+- New release. Update license tag to GPLv3.
+
 * Thu Aug 23 2007 Quentin Spencer <qspencer at users.sf.net> 4.20-3
 - Rebuild for F8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2007 04:13:57 -0000	1.9
+++ sources	14 Sep 2007 13:23:14 -0000	1.10
@@ -1 +1 @@
-6dd68d9eef35c524489f3e935a0dae34  glpk-4.20.tar.gz
+a41df71415c97fc5c541d19547ced10a  glpk-4.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 14:18:28 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 14 Sep 2007 10:18:28 -0400
Subject: rpms/keepalived/devel keepalived-1.1.14-include.patch, NONE,
	1.1 keepalived.spec, 1.5, 1.6
Message-ID: <200709141418.l8EEISLI016504@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16418

Modified Files:
	keepalived.spec 
Added Files:
	keepalived-1.1.14-include.patch 
Log Message:
Include patch from Shinji Tanaka to fix conf include.


keepalived-1.1.14-include.patch:

--- NEW FILE keepalived-1.1.14-include.patch ---
diff -Naupr keepalived-1.1.14.orig/lib/parser.c keepalived-1.1.14/lib/parser.c
--- keepalived-1.1.14.orig/lib/parser.c	2007-09-13 17:14:16.000000000 +0200
+++ keepalived-1.1.14/lib/parser.c	2007-09-14 16:14:26.000000000 +0200
@@ -33,6 +33,7 @@
 
 /* global vars */
 vector keywords;
+vector current_keywords;
 FILE *current_stream;
 char *current_conf_file;
 int reload = 0;
@@ -213,7 +214,7 @@ void read_conf_file(char *conf_file)
 		char *confpath = strdup(globbuf.gl_pathv[i]);
 		dirname(confpath);
 		chdir(confpath);
-		process_stream(keywords);
+		process_stream(current_keywords);
 		fclose(stream);
 
 		chdir(prev_path);
@@ -388,6 +389,8 @@ process_stream(vector keywords_vec)
 	char *str;
 	char *buf;
 	vector strvec;
+	vector prev_keywords = current_keywords;
+	current_keywords = keywords_vec;
 
 	buf = zalloc(MAXBUF);
 	while (read_line(buf, MAXBUF)) {
@@ -423,6 +426,7 @@ process_stream(vector keywords_vec)
 		free_strvec(strvec);
 	}
 
+	current_keywords = prev_keywords;
 	free(buf);
 	return;
 }
@@ -442,6 +446,7 @@ init_data(char *conf_file, vector (*init
 #endif
 
 	/* Stream handling */
+	current_keywords = keywords;
 	read_conf_file((conf_file) ? conf_file : CONF);
 	free_keywords(keywords);
 }


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- keepalived.spec	14 Sep 2007 10:52:08 -0000	1.5
+++ keepalived.spec	14 Sep 2007 14:17:56 -0000	1.6
@@ -4,13 +4,14 @@
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Patch0: keepalived-1.1.14-genhashman.patch
 Patch1: keepalived-1.1.14-installmodes.patch
+Patch2: keepalived-1.1.14-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .genhashman
 %patch1 -p1 -b .installmodes
+%patch2 -p1 -b .include
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -102,6 +104,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
+- Include patch from Shinji Tanaka to fix conf include from inside some
+  directives like vrrp_instance.
+
 * Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
 - Update to 1.1.14.
 - Remove all upstreamed patches.



From fedora-extras-commits at redhat.com  Fri Sep 14 14:24:08 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 10:24:08 -0400
Subject: rpms/gettext/devel
	gettext-xglade-define-xml-major-version-285701.patch, 1.2, 1.3
Message-ID: <200709141424.l8EEO8Vh017216@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Log Message:
add missing typedefs to gettext-xglade-define-xml-major-version-285701.patch


gettext-xglade-define-xml-major-version-285701.patch:

Index: gettext-xglade-define-xml-major-version-285701.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext-xglade-define-xml-major-version-285701.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 13:06:38 -0000	1.2
+++ gettext-xglade-define-xml-major-version-285701.patch	14 Sep 2007 14:24:06 -0000	1.3
@@ -24,3 +24,14 @@
      ;;
    *)
      AC_LIB_HAVE_LINKFLAGS([expat], [],
+diff -up gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~ gettext-0.16.1/gettext-tools/src/x-glade.c
+--- gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~	2006-11-27 18:02:08.000000000 +0100
++++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-14 15:46:23.000000000 +0200
+@@ -114,6 +114,7 @@ init_keywords ()
+ typedef void *XML_Parser;
+ typedef char XML_Char;
+ typedef char XML_LChar;
++typedef unsigned long XML_Size;
+ enum XML_Error { XML_ERROR_NONE };
+ typedef void (*XML_StartElementHandler) (void *userData, const XML_Char *name, const XML_Char **atts);
+ typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);



From fedora-extras-commits at redhat.com  Fri Sep 14 14:30:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 10:30:49 -0400
Subject: rpms/geomview/devel x-oogl.desktop, NONE, 1.1 x-oogl.xml, NONE,
	1.1 geomview.desktop, 1.5, 1.6 geomview.spec, 1.39, 1.40
Message-ID: <200709141430.l8EEUnfq018086@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18010

Modified Files:
	geomview.desktop geomview.spec 
Added Files:
	x-oogl.desktop x-oogl.xml 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
- use model/vrml,object/x-oogl(register) mimetypes



--- NEW FILE x-oogl.desktop ---
[Desktop Entry]
Type=MimeType
MimeType=object/x-oogl
Icon=geomview
Patterns=*.oogl;*.off;*.list;*.tlist;*;grp;*.quad;*.mesh;*.inst;*.bez;*.vect;
Comment=OOGL file
Encoding=UTF-8


--- NEW FILE x-oogl.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">

  <mime-type type="object/x-oogl">
    <comment>OOGL file</comment>
    <glob pattern="*.oogl" />
    <glob pattern="*.off" />
    <glob pattern="*.list" />
    <glob pattern="*.tlist" />
    <glob pattern="*.grp" />
    <glob pattern="*.quad" />
    <glob pattern="*.mesh" />
    <glob pattern="*.inst" />
    <glob pattern="*.bez" />
    <glob pattern="*.vect" />
    <alias type="application/x-geomview"/>
  </mime-type>

</mime-info>



Index: geomview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.desktop	16 Jul 2007 16:56:45 -0000	1.5
+++ geomview.desktop	14 Sep 2007 14:30:16 -0000	1.6
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview;
+MimeType=application/x-geomview;model/vrml;object/x-oogl;
 Type=Application
 Encoding=UTF-8
 Categories=Graphics;Math;Science;


Index: geomview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- geomview.spec	28 Aug 2007 02:51:40 -0000	1.39
+++ geomview.spec	14 Sep 2007 14:30:16 -0000	1.40
@@ -2,7 +2,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -15,6 +15,8 @@
 
 Source1: geomview.desktop
 Source2: geomview.png
+Source3: x-oogl.xml
+Source4: x-oogl.desktop
 
 BuildRequires: desktop-file-utils
 BuildRequires: byacc flex
@@ -44,6 +46,8 @@
 BuildRequires: tetex
 %endif
 
+# for %_datadir/mimelnk
+Requires: kde-filesystem
 Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -79,25 +83,31 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # .desktop entry
 desktop-file-install --vendor="fedora" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
   %{SOURCE1}
 
 # app icon
-install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+
+# mime
+install -p -m644 -D %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
+
+# mimelnk (kde3)
+install -p -m644 -D %{SOURCE4} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -105,7 +115,8 @@
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+update-desktop-database -q > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -116,21 +127,24 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+update-desktop-database -a > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%{_bindir}/*
 %{_docdir}/geomview/
 %{_datadir}/applications/*.desktop
+%{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
-%{_bindir}/*
+%{_datadir}/mimelnk/*
+%{_datadir}/mime/packages/*.xml
 %{_infodir}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
-%{_datadir}/geomview/
 %{_libdir}/libgeomview-%{version}.so
 %{_libexecdir}/geomview/
 
@@ -141,6 +155,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
+- use model/vrml,object/x-oogl(register) mimetypes
+
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-2
 - BR: gawk
 



From fedora-extras-commits at redhat.com  Fri Sep 14 14:39:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 10:39:40 -0400
Subject: comps comps-f8.xml.in,1.108,1.109
Message-ID: <200709141439.l8EEder7021289@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067

Modified Files:
	comps-f8.xml.in 
Log Message:
I should learn to type.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- comps-f8.xml.in	14 Sep 2007 08:21:29 -0000	1.108
+++ comps-f8.xml.in	14 Sep 2007 14:39:09 -0000	1.109
@@ -3158,7 +3158,7 @@
   </group>
   <group>
     <id>somali-support</id>
-    <_name>Somail Support</_name>
+    <_name>Somali Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From fedora-extras-commits at redhat.com  Fri Sep 14 14:39:41 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 10:39:41 -0400
Subject: comps/po af.po, 1.3, 1.4 am.po, 1.3, 1.4 ar.po, 1.3, 1.4 as.po, 1.3,
	1.4 be.po, 1.3, 1.4 bg.po, 1.3, 1.4 bn.po, 1.3, 1.4 bn_IN.po,
	1.3, 1.4 bs.po, 1.3, 1.4 ca.po, 1.3, 1.4 comps.pot, 1.7,
	1.8 cs.po, 1.3, 1.4 cy.po, 1.3, 1.4 da.po, 1.3, 1.4 de.po, 1.3,
	1.4 el.po, 1.4, 1.5 en_GB.po, 1.3, 1.4 es.po, 1.3, 1.4 et.po,
	1.3, 1.4 fa.po, 1.3, 1.4 fi.po, 1.3, 1.4 fr.po, 1.3, 1.4 gl.po,
	1.3, 1.4 gu.po, 1.3, 1.4 he.po, 1.3, 1.4 hi.po, 1.3, 1.4 hr.po,
	1.3, 1.4 hu.po, 1.3, 1.4 hy.po, 1.3, 1.4 id.po, 1.3, 1.4 ilo.po,
	1.3, 1.4 is.po, 1.3, 1.4 it.po, 1.3, 1.4 ja.po, 1.3, 1.4 ka.po,
	1.3, 1.4 kn.po, 1.3, 1.4 ko.po, 1.3, 1.4 ku.po, 1.3, 1.4 lo.po,
	1.3, 1.4 lv.po, 1.3, 1.4 mk.po, 1.3, 1.4 ml.po, 1.3, 1.4 mr.po,
	1.3, 1.4 ms.po, 1.3, 1.4 my.po, 1.3, 1.4 nb.po, 1.3, 1.4 nl.po,
	1.3, 1.4 no.po, 1.3, 1.4 nso.po, 1.3, 1.4 or.po, 1.3, 1.4 pa.po,
	1.3, 1.4 pl.po, 1.5, 1.6 pt.po, 1.3, 1.4 pt_BR.po, 1.4,
	1.5 ro.po, 1.3, 1.4 ru.po, 1.3, 1.4 si.po, 1.3, 1.4 sk.po, 1.3,
	1.4 sl.po, 1.3, 1.4 sq.po, 1.3, 1.4 sr.po, 1.4, 1.5 sr@Latn.po,
	1.4, 1.5 sv.po, 1.3, 1.4 ta.po, 1.3, 1.4 te.po, 1.3, 1.4 th.po,
	1.3, 1.4 tl.po, 1.3, 1.4 tr.po, 1.3, 1.4 uk.po, 1.3, 1.4 ur.po,
	1.3, 1.4 vi.po, 1.3, 1.4 zh_CN.po, 1.3, 1.4 zh_TW.po, 1.3,
	1.4 zu.po, 1.3, 1.4
Message-ID: <200709141439.l8EEdfGp021367@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067/po

Modified Files:
	af.po am.po ar.po as.po be.po bg.po bn.po bn_IN.po bs.po ca.po 
	comps.pot cs.po cy.po da.po de.po el.po en_GB.po es.po et.po 
	fa.po fi.po fr.po gl.po gu.po he.po hi.po hr.po hu.po hy.po 
	id.po ilo.po is.po it.po ja.po ka.po kn.po ko.po ku.po lo.po 
	lv.po mk.po ml.po mr.po ms.po my.po nb.po nl.po no.po nso.po 
	or.po pa.po pl.po pt.po pt_BR.po ro.po ru.po si.po sk.po sl.po 
	sq.po sr.po sr at Latn.po sv.po ta.po te.po th.po tl.po tr.po 
	uk.po ur.po vi.po zh_CN.po zh_TW.po zu.po 
Log Message:
I should learn to type.



Index: af.po
===================================================================
RCS file: /cvs/extras/comps/po/af.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- af.po	5 Sep 2007 06:20:05 -0000	1.3
+++ af.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -902,7 +902,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Tamil taalsteun"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: am.po
===================================================================
RCS file: /cvs/extras/comps/po/am.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- am.po	5 Sep 2007 06:20:05 -0000	1.3
+++ am.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "????????? ?????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ar.po
===================================================================
RCS file: /cvs/extras/comps/po/ar.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ar.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ar.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -883,7 +883,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: as.po
===================================================================
RCS file: /cvs/extras/comps/po/as.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- as.po	5 Sep 2007 06:20:05 -0000	1.3
+++ as.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: be.po
===================================================================
RCS file: /cvs/extras/comps/po/be.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- be.po	5 Sep 2007 06:20:05 -0000	1.3
+++ be.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -881,7 +881,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????????? ????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bg.po
===================================================================
RCS file: /cvs/extras/comps/po/bg.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bg.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bg.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -865,7 +865,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bn.po
===================================================================
RCS file: /cvs/extras/comps/po/bn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bn.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -883,7 +883,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "????????? ??????????????????????????? ???????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bn_IN.po
===================================================================
RCS file: /cvs/extras/comps/po/bn_IN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bn_IN.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bn_IN.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -927,7 +927,7 @@
 # modified for RHEL
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: bs.po
===================================================================
RCS file: /cvs/extras/comps/po/bs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bs.po	5 Sep 2007 06:20:05 -0000	1.3
+++ bs.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -862,7 +862,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podr??ka za swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ca.po
===================================================================
RCS file: /cvs/extras/comps/po/ca.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ca.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ca.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suport per al swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: comps.pot
===================================================================
RCS file: /cvs/extras/comps/po/comps.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comps.pot	5 Sep 2007 06:20:05 -0000	1.7
+++ comps.pot	14 Sep 2007 14:39:10 -0000	1.8
@@ -803,7 +803,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: cs.po
===================================================================
RCS file: /cvs/extras/comps/po/cs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cs.po	5 Sep 2007 06:20:05 -0000	1.3
+++ cs.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -881,7 +881,7 @@
 # FIXME
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati (P??kist??n)"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: cy.po
===================================================================
RCS file: /cvs/extras/comps/po/cy.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cy.po	5 Sep 2007 06:20:05 -0000	1.3
+++ cy.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -865,7 +865,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Cynhaliaeth Thai"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: da.po
===================================================================
RCS file: /cvs/extras/comps/po/da.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- da.po	5 Sep 2007 06:20:05 -0000	1.3
+++ da.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -877,7 +877,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Underst??ttelse for swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: de.po
===================================================================
RCS file: /cvs/extras/comps/po/de.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.po	5 Sep 2007 06:20:05 -0000	1.3
+++ de.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -903,7 +903,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Unterst??tzung f??r Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: el.po
===================================================================
RCS file: /cvs/extras/comps/po/el.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- el.po	5 Sep 2007 06:20:05 -0000	1.4
+++ el.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -891,7 +891,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????? Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: en_GB.po
===================================================================
RCS file: /cvs/extras/comps/po/en_GB.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- en_GB.po	5 Sep 2007 06:20:05 -0000	1.3
+++ en_GB.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -860,7 +860,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Thai Support"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: es.po
===================================================================
RCS file: /cvs/extras/comps/po/es.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- es.po	5 Sep 2007 06:20:05 -0000	1.3
+++ es.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Soporte para Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: et.po
===================================================================
RCS file: /cvs/extras/comps/po/et.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- et.po	5 Sep 2007 06:20:05 -0000	1.3
+++ et.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -875,7 +875,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "tai keele toetus"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fa.po
===================================================================
RCS file: /cvs/extras/comps/po/fa.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fa.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fa.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -890,7 +890,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fi.po
===================================================================
RCS file: /cvs/extras/comps/po/fi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -871,7 +871,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Siswatin kielituki"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: fr.po
===================================================================
RCS file: /cvs/extras/comps/po/fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ fr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -898,7 +898,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Support Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: gl.po
===================================================================
RCS file: /cvs/extras/comps/po/gl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ gl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -875,7 +875,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Soporte para o tai"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: gu.po
===================================================================
RCS file: /cvs/extras/comps/po/gu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ gu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -861,7 +861,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: he.po
===================================================================
RCS file: /cvs/extras/comps/po/he.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- he.po	5 Sep 2007 06:20:05 -0000	1.3
+++ he.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -803,7 +803,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hi.po
===================================================================
RCS file: /cvs/extras/comps/po/hi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hr.po
===================================================================
RCS file: /cvs/extras/comps/po/hr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podr??ka za swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hu.po
===================================================================
RCS file: /cvs/extras/comps/po/hu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -884,7 +884,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati nyelvi t??mogat??s"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: hy.po
===================================================================
RCS file: /cvs/extras/comps/po/hy.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hy.po	5 Sep 2007 06:20:05 -0000	1.3
+++ hy.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -839,7 +839,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: id.po
===================================================================
RCS file: /cvs/extras/comps/po/id.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- id.po	5 Sep 2007 06:20:05 -0000	1.3
+++ id.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -860,7 +860,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Dukungan Tamil"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ilo.po
===================================================================
RCS file: /cvs/extras/comps/po/ilo.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ilo.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ilo.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -817,7 +817,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Panagsayangkat ti Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: is.po
===================================================================
RCS file: /cvs/extras/comps/po/is.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- is.po	5 Sep 2007 06:20:05 -0000	1.3
+++ is.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -845,7 +845,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: it.po
===================================================================
RCS file: /cvs/extras/comps/po/it.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- it.po	5 Sep 2007 06:20:05 -0000	1.3
+++ it.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -894,7 +894,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Supporto per lo Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ja.po
===================================================================
RCS file: /cvs/extras/comps/po/ja.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ja.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ja.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -873,7 +873,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ka.po
===================================================================
RCS file: /cvs/extras/comps/po/ka.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ka.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ka.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -823,7 +823,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????????????????? ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: kn.po
===================================================================
RCS file: /cvs/extras/comps/po/kn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kn.po	5 Sep 2007 06:20:05 -0000	1.3
+++ kn.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -858,7 +858,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ko.po
===================================================================
RCS file: /cvs/extras/comps/po/ko.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ko.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ko.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????? ??????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ku.po
===================================================================
RCS file: /cvs/extras/comps/po/ku.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ku.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ku.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: lo.po
===================================================================
RCS file: /cvs/extras/comps/po/lo.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lo.po	5 Sep 2007 06:20:05 -0000	1.3
+++ lo.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: lv.po
===================================================================
RCS file: /cvs/extras/comps/po/lv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lv.po	5 Sep 2007 06:20:05 -0000	1.3
+++ lv.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati atbalsts"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: mk.po
===================================================================
RCS file: /cvs/extras/comps/po/mk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ mk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -874,7 +874,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "???????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ml.po
===================================================================
RCS file: /cvs/extras/comps/po/ml.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ml.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ml.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: mr.po
===================================================================
RCS file: /cvs/extras/comps/po/mr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ mr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ms.po
===================================================================
RCS file: /cvs/extras/comps/po/ms.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ms.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ms.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -872,7 +872,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Sokongan Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: my.po
===================================================================
RCS file: /cvs/extras/comps/po/my.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- my.po	5 Sep 2007 06:20:05 -0000	1.3
+++ my.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nb.po
===================================================================
RCS file: /cvs/extras/comps/po/nb.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nb.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nb.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??tte for Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nl.po
===================================================================
RCS file: /cvs/extras/comps/po/nl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -888,7 +888,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati ondersteuning"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: no.po
===================================================================
RCS file: /cvs/extras/comps/po/no.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- no.po	5 Sep 2007 06:20:05 -0000	1.3
+++ no.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -864,7 +864,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??tte for siamesisk"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: nso.po
===================================================================
RCS file: /cvs/extras/comps/po/nso.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nso.po	5 Sep 2007 06:20:05 -0000	1.3
+++ nso.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -908,7 +908,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Thekgo ya se-Tamil"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: or.po
===================================================================
RCS file: /cvs/extras/comps/po/or.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- or.po	5 Sep 2007 06:20:05 -0000	1.3
+++ or.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -873,7 +873,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pa.po
===================================================================
RCS file: /cvs/extras/comps/po/pa.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pa.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pa.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -858,7 +858,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pl.po
===================================================================
RCS file: /cvs/extras/comps/po/pl.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pl.po	10 Sep 2007 15:10:54 -0000	1.5
+++ pl.po	14 Sep 2007 14:39:10 -0000	1.6
@@ -837,7 +837,7 @@
 msgstr "Najmniejsza mo??liwa instalacja"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Obs??uga somalijskiego"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pt.po
===================================================================
RCS file: /cvs/extras/comps/po/pt.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pt.po	5 Sep 2007 06:20:05 -0000	1.3
+++ pt.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -906,7 +906,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suporte a Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pt_BR.po	9 Sep 2007 03:07:59 -0000	1.4
+++ pt_BR.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -1141,8 +1141,8 @@
 
 #: ../comps-f7.xml.in.h:126
 #: ../comps-f8.xml.in.h:135
-msgid "Somail Support"
-msgstr "Suporte ?? Somail"
+msgid "Somali Support"
+msgstr "Suporte ?? Somali"
 
 #: ../comps-f7.xml.in.h:127
 #: ../comps-f8.xml.in.h:136


Index: ro.po
===================================================================
RCS file: /cvs/extras/comps/po/ro.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ro.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ro.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -872,7 +872,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suport pentru Swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ru.po
===================================================================
RCS file: /cvs/extras/comps/po/ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ru.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ru.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -878,7 +878,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ?????????? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: si.po
===================================================================
RCS file: /cvs/extras/comps/po/si.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- si.po	5 Sep 2007 06:20:05 -0000	1.3
+++ si.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -849,7 +849,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sk.po
===================================================================
RCS file: /cvs/extras/comps/po/sk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -871,7 +871,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podpora swati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sl.po
===================================================================
RCS file: /cvs/extras/comps/po/sl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -859,7 +859,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Podpora Svat????ini"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sq.po
===================================================================
RCS file: /cvs/extras/comps/po/sq.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sq.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sq.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -802,7 +802,7 @@
 msgstr ""
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr ""
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sr.po
===================================================================
RCS file: /cvs/extras/comps/po/sr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sr.po	8 Sep 2007 23:59:43 -0000	1.4
+++ sr.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -839,7 +839,7 @@
 msgstr "?????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: sr at Latn.po
===================================================================
RCS file: /cvs/extras/comps/po/sr at Latn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sr at Latn.po	9 Sep 2007 00:00:38 -0000	1.4
+++ sr at Latn.po	14 Sep 2007 14:39:10 -0000	1.5
@@ -839,8 +839,8 @@
 msgstr "Najmanja mogu??a instalacija"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-msgid "Somail Support"
-msgstr "Podr??ka za somail"
+msgid "Somali Support"
+msgstr "Podr??ka za somali"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""


Index: sv.po
===================================================================
RCS file: /cvs/extras/comps/po/sv.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sv.po	5 Sep 2007 06:20:05 -0000	1.3
+++ sv.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -874,7 +874,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "St??d f??r siswati"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ta.po
===================================================================
RCS file: /cvs/extras/comps/po/ta.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ta.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ta.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -863,7 +863,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: te.po
===================================================================
RCS file: /cvs/extras/comps/po/te.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- te.po	5 Sep 2007 06:20:05 -0000	1.3
+++ te.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -857,7 +857,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: th.po
===================================================================
RCS file: /cvs/extras/comps/po/th.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- th.po	5 Sep 2007 06:20:05 -0000	1.3
+++ th.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -851,7 +851,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: tl.po
===================================================================
RCS file: /cvs/extras/comps/po/tl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tl.po	5 Sep 2007 06:20:05 -0000	1.3
+++ tl.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -823,7 +823,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Suporte para sa Wikang Gales"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: tr.po
===================================================================
RCS file: /cvs/extras/comps/po/tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tr.po	5 Sep 2007 06:20:05 -0000	1.3
+++ tr.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -853,7 +853,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati Dil Deste??i"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: uk.po
===================================================================
RCS file: /cvs/extras/comps/po/uk.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uk.po	5 Sep 2007 06:20:05 -0000	1.3
+++ uk.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -856,7 +856,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????????????? ???????? ??????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: ur.po
===================================================================
RCS file: /cvs/extras/comps/po/ur.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ur.po	5 Sep 2007 06:20:05 -0000	1.3
+++ ur.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -866,7 +866,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "?????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: vi.po
===================================================================
RCS file: /cvs/extras/comps/po/vi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vi.po	5 Sep 2007 06:20:05 -0000	1.3
+++ vi.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -886,7 +886,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "H??? tr??? ??? R???p"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zh_CN.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_CN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh_CN.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zh_CN.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -862,7 +862,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Swati ?????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zh_TW.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_TW.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh_TW.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zh_TW.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -847,7 +847,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136


Index: zu.po
===================================================================
RCS file: /cvs/extras/comps/po/zu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zu.po	5 Sep 2007 06:20:05 -0000	1.3
+++ zu.po	14 Sep 2007 14:39:10 -0000	1.4
@@ -977,7 +977,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 #, fuzzy
-msgid "Somail Support"
+msgid "Somali Support"
 msgstr "Ukuxhasa Kwesi-Arabhu"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136



From fedora-extras-commits at redhat.com  Fri Sep 14 14:41:53 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 14 Sep 2007 10:41:53 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.32,
	1.33 policycoreutils.spec, 1.448, 1.449
Message-ID: <200709141441.l8EEfr3c021597@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
- Fix calls to _admin interfaces


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- policycoreutils-gui.patch	11 Sep 2007 19:04:32 -0000	1.32
+++ policycoreutils-gui.patch	14 Sep 2007 14:41:51 -0000	1.33
@@ -8905,8 +8905,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-10 15:43:29.000000000 -0400
-@@ -0,0 +1,277 @@
++++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9135,6 +9135,12 @@
 +## <summary>
 +##	All of the rules required to administrate an TEMPLATETYPE environment
 +## </summary>
++## <param name="prefix">
++##	<summary>
++##	Prefix of the domain. Example, user would be
++##	the prefix for the uder_t domain.
++##	</summary>
++## </param>
 +## <param name="domain">
 +##	<summary>
 +##	Domain allowed access.
@@ -9145,11 +9151,6 @@
 +##	The role to be allowed to manage the TEMPLATETYPE domain.
 +##	</summary>
 +## </param>
-+## <param name="terminal">
-+##	<summary>
-+##	The type of the terminal allow the dmidecode domain to use.
-+##	</summary>
-+## </param>
 +## <rolecap/>
 +#
 +interface(`TEMPLATETYPE_admin',`
@@ -9157,17 +9158,17 @@
 +		type TEMPLATETYPE_t;
 +	')
 +
-+	allow $1 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
-+	read_files_pattern($1, TEMPLATETYPE_t, TEMPLATETYPE_t)
++	allow $2 TEMPLATETYPE_t:process { ptrace signal_perms getattr };
++	read_files_pattern($2, TEMPLATETYPE_t, TEMPLATETYPE_t)
 +	        
 +"""
 +
 +if_initscript_admin="""
 +	# Allow $1 to restart the apache service
-+	TEMPLATETYPE_script_domtrans($1)
-+	domain_system_change_exemption($1)
-+	role_transition $2 TEMPLATETYPE_script_exec_t system_r;
-+	allow $2 system_r;
++	TEMPLATETYPE_script_domtrans($2)
++	domain_system_change_exemption($2)
++	role_transition $3 TEMPLATETYPE_script_exec_t system_r;
++	allow $3 system_r;
 +"""
 +
 +if_end_admin="""
@@ -9186,7 +9187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9208,7 +9209,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9292,7 +9293,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9411,7 +9412,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_rw($1)
++	TEMPLATETYPE_manage_rw($2)
 +"""
 +
 +########################### File Context ##################################
@@ -9424,7 +9425,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-05 22:25:46.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,45 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9473,7 +9474,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9518,7 +9519,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9614,12 +9615,12 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_tmp($1)
++	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-10 11:43:28.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9747,7 +9748,7 @@
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r, { TEMPLATETYPE_tty_device_t TEMPLATETYPE_devpts_t })
++	APPLICATION_admin(TEMPLATETYPE,TEMPLATETYPE_t,TEMPLATETYPE_r)
 +')
 +"""
 +
@@ -9762,7 +9763,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9911,7 +9912,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_var_lib($1)
++	TEMPLATETYPE_manage_var_lib($2)
 +"""
 +
 +########################### File Context ##################################
@@ -9928,7 +9929,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10031,7 +10032,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_log($1)
++	TEMPLATETYPE_manage_log($2)
 +"""
 +
 +########################### File Context ##################################
@@ -10044,7 +10045,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10150,7 +10151,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_var_run($1)
++	TEMPLATETYPE_manage_var_run($2)
 +"""
 +
 +fc_file="""\
@@ -10167,7 +10168,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-08-31 15:07:36.000000000 -0400
++++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10289,7 +10290,7 @@
 +"""
 +
 +if_admin_rules="""
-+	TEMPLATETYPE_manage_spool($1)
++	TEMPLATETYPE_manage_spool($2)
 +"""
 +
 +########################### File Context ##################################


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- policycoreutils.spec	13 Sep 2007 12:32:16 -0000	1.448
+++ policycoreutils.spec	14 Sep 2007 14:41:51 -0000	1.449
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
+- Fix calls to _admin interfaces
+
 * Tue Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-13
 - Upgrade version of sepolgen from NSA
 	* Expand the sepolgen parser to parse all current refpolicy modules from Karl MacMillan.



From fedora-extras-commits at redhat.com  Fri Sep 14 14:44:46 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 14 Sep 2007 10:44:46 -0400
Subject: devel/python python-2.5.1-sqlite-encoding.patch, NONE,
	1.1 python.spec, 1.118, 1.119
Message-ID: <200709141444.l8EEikCk021913@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21838

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-sqlite-encoding.patch 
Log Message:
* Fri Sep 14 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-11
- fix encoding of sqlite .py files to work around weird encoding problem 
  in Turkish (#283331)


python-2.5.1-sqlite-encoding.patch:

--- NEW FILE python-2.5.1-sqlite-encoding.patch ---
diff -up Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding Python-2.5.1/Lib/sqlite3/dbapi2.py
--- Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding	2007-09-14 10:41:50.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/dbapi2.py	2007-09-14 10:42:00.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
 # pysqlite2/dbapi2.py: the DB-API 2.0 interface
 #
-# Copyright (C) 2004-2005 Gerhard H?ring <gh at ghaering.de>
+# Copyright (C) 2004-2005 Gerhard Haering <gh at ghaering.de>
 #
 # This file is part of pysqlite.
 #
diff -up Python-2.5.1/Lib/sqlite3/__init__.py.encoding Python-2.5.1/Lib/sqlite3/__init__.py
--- Python-2.5.1/Lib/sqlite3/__init__.py.encoding	2007-09-14 10:41:47.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/__init__.py	2007-09-14 10:42:06.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
 # pysqlite2/__init__.py: the pysqlite2 package.
 #
-# Copyright (C) 2005 Gerhard H?ring <gh at ghaering.de>
+# Copyright (C) 2005 Gerhard Haering <gh at ghaering.de>
 #
 # This file is part of pysqlite.
 #


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- python.spec	10 Sep 2007 15:42:58 -0000	1.118
+++ python.spec	14 Sep 2007 14:44:14 -0000	1.119
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -34,6 +34,7 @@
 Patch4: python-2.5-cflags.patch
 Patch5: python-2.5.1-ctypes-exec-stack.patch
 Patch6: python-2.5.1-plural-fix.patch
+Patch7: python-2.5.1-sqlite-encoding.patch
 
 # upstreamed
 
@@ -163,6 +164,7 @@
 %patch4 -p1 -b .cflags
 %patch5 -p1 -b .ctypesexec
 %patch6 -p1 -b .plural
+%patch7 -p1
 
 %patch50 -p1 -b .egginfo
 %patch60 -p1 -b .db46
@@ -423,6 +425,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Fri Sep 14 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-11
+- fix encoding of sqlite .py files to work around weird encoding problem 
+  in Turkish (#283331)
+
 * Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
 - work around problems with multi-line plural specification (#252136)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:00:19 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 14 Sep 2007 11:00:19 -0400
Subject: rpms/gamin/devel gamin-0.1.9-poll-less.patch, NONE, 1.1 gamin.spec, 
	1.62, 1.63
Message-ID: <200709141500.l8EF0JAE023635@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23552

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.9-poll-less.patch 
Log Message:
- don't poll for non-existant watched files (bug 240385)


gamin-0.1.9-poll-less.patch:

--- NEW FILE gamin-0.1.9-poll-less.patch ---
--- gamin-0.1.9/server/inotify-path.c
+++ gamin-0.1.9/server/inotify-path.c
@@ -40,6 +40,7 @@
 #include <linux/inotify.h>
 #endif
 #endif
+#include <errno.h>
 #include <string.h>
 #include <glib.h>
 #include "inotify-kernel.h"
@@ -136,6 +137,38 @@ ip_map_wd_dir (gint32 wd, ip_watched_dir_t *dir)
 	g_hash_table_replace(wd_dir_hash, GINT_TO_POINTER(dir->wd), dir_list);
 }
 
+static gint32
+ip_watch_parent (const char *path, guint mask, int *err, char **parent_path)
+{
+	gint32 wd;
+	gchar *path_copy;
+	gchar *p;
+
+	path_copy = g_strdup (path);
+
+        wd = -1;
+        do
+        {
+                p = g_strrstr (path_copy, G_DIR_SEPARATOR_S);
+
+                if (p == NULL)
+                        return -1;
+
+                if (p != &path_copy[0])
+                        *p = '\0';
+
+                wd = ik_watch (path_copy, mask, err);
+        } 
+        while (wd < 0 && errno == ENOENT);
+
+        if (parent_path != NULL && wd >= 0)
+                *parent_path = path_copy;
+        else
+                g_free (path_copy);
+
+	return wd;
+}
+
 gboolean ip_start_watching (ih_sub_t *sub)
 {
 	gint32 wd;
@@ -156,8 +189,35 @@ gboolean ip_start_watching (ih_sub_t *sub)
 	
 	IP_W("Trying to add inotify watch ");
 	wd = ik_watch (sub->dirname, IP_INOTIFY_MASK|IN_ONLYDIR|sub->extra_flags, &err);
-	if (wd < 0) 
-	{
+
+        if (wd < 0 && errno == ENOENT)
+        {
+                char *parent_path;
+
+		IP_W("Directory '%s' does not yet exist, finding and watching existing parent\n",
+                     sub->dirname);
+
+                parent_path = NULL;
+		wd = ip_watch_parent (sub->dirname,
+                                      IP_INOTIFY_MASK|IN_ONLYDIR|sub->extra_flags,
+                                      &err, &parent_path);
+
+		if (wd < 0)
+		{
+                        g_assert (parent_path == NULL);
+			IP_W("Failed\n");
+			return FALSE;
+		}
+
+		IP_W("Found parent '%s', will watch it for now until '%s' becomes available\n",
+                     parent_path, sub->dirname);
+
+                dir = ip_watched_dir_new (parent_path, wd);
+                g_free (parent_path);
+
+		ip_map_wd_dir (wd, dir);
+		ip_map_path_dir (parent_path, dir);
+        } else if (wd < 0) {
 		IP_W("Failed\n");
 		return FALSE;
 	} else {
@@ -294,18 +354,25 @@ static void ip_wd_delete (gpointer data, gpointer user_data)
 static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t *event)
 {
 	GList *dirl;
+        GList *subl, *resubscription_list;
 
 	if (!event)
 		return;
 
 	/* TODO:
 	 *
 	 * Figure out how we will deliver move events
 	 */
+
+        resubscription_list = NULL;
 	for (dirl = dir_list; dirl; dirl = dirl->next)
 	{
-		GList *subl;
 		ip_watched_dir_t *dir = dirl->data;
+                char *event_path;
+
+                event_path = g_build_filename (dir->path, event->name, NULL);
+
+
 
 		for (subl = dir->subs; subl; subl = subl->next)
 		{
@@ -315,23 +382,61 @@ static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t
 			 * they need to match before the event could be delivered.
 			 */
 			if (event->name && sub->filename) {
-				if (strcmp (event->name, sub->filename))
+
+                               if (strcmp (event->name, sub->filename))
+                                {
 					continue;
+                                }
+
 			/* If the event doesn't have a filename, but the subscription does
 			 * we shouldn't deliever the event */
 			} else if (sub->filename)
 				continue;
 
+                        if (g_str_has_prefix (sub->dirname, event_path)) {
+
+                            IP_W("Adding directory %s to resubscription list (because of event %s)", 
+                                 sub->dirname, event_path);
+
+                            resubscription_list = g_list_prepend (resubscription_list, sub);
+
+                            if (strcmp (sub->dirname, event_path) == 0) {
+                                        char *subscription_dir;
+
+                                        IP_W("directory '%s' is now available!", 
+                                             sub->dirname);
+
+                                        /* Normally, the subscription directory name,
+                                         * matches the directory getting watched.  This 
+                                         * isn't necessarily true, though, if we're watching
+                                         * a parent since the directory we're actually interested 
+                                         * in doesn't exist anymore.  When the directory we *are*
+                                         * interested in shows up, we find out relative to the
+                                         * directory we're watching.  We need to fudge our subscription
+                                         * temporarily to account for that.
+                                         *
+                                         * FIXME: This is a hack, we should send the dirname that the 
+                                         * event came from, along with the subscription, or store a 
+                                         * full path in the event structure
+                                         */
+                                        subscription_dir = sub->dirname;
+                                        sub->dirname = dir->path;
+                                        event_callback (event, sub);
+                                        sub->dirname = subscription_dir;
+                            }
+
+                            continue;
+                        }
+
 			event_callback (event, sub);
 		}
+
+                g_free (event_path);
 	}
 
-	if (!event->pair)
-		return;
-
+	if (event->pair)
 	for (dirl = pair_dir_list; dirl; dirl = dirl->next)
 	{
-		GList *subl;
 		ip_watched_dir_t *dir = dirl->data;
 
 		for (subl = dir->subs; subl; subl = subl->next)
@@ -352,6 +457,13 @@ static void ip_event_dispatch (GList *dir_list, GList *pair_dir_list, ik_event_t
 			event_callback (event->pair, sub);
 		}
 	}
+
+        for (subl = resubscription_list; subl; subl = subl->next)
+        {
+            ip_stop_watching (subl->data);
+            ip_start_watching (subl->data);
+        }
+        g_list_free (resubscription_list);
 }
 
 static void
@@ -371,8 +483,10 @@ ip_event_callback (ik_event_t *event)
 	if (event->pair)
 		pair_dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER(event->pair->wd));
 
-	if (event->mask & IP_INOTIFY_MASK)
+	if (event->mask & IP_INOTIFY_MASK) {
 		ip_event_dispatch (dir_list, pair_dir_list, event);
+	        dir_list = g_hash_table_lookup (wd_dir_hash, GINT_TO_POINTER(event->wd));
+        }
 
 	/* We have to manage the missing list when we get a DELETE event. */
 	if (event->mask & IN_DELETE_SELF || event->mask & IN_MOVE_SELF)


Index: gamin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gamin.spec	28 Aug 2007 20:59:34 -0000	1.62
+++ gamin.spec	14 Sep 2007 14:59:46 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -12,6 +12,8 @@
 BuildRequires: glib2-devel python python-devel
 BuildRequires: automake, libtool
 
+Patch0: gamin-0.1.9-poll-less.patch
+
 %description
 This C library provides an API and ABI compatible file alteration
 monitor mechanism compatible with FAM but not dependent on a system wide
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .poll-less
 
 %build
 autoreconf --force --install
@@ -89,6 +92,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Sep 14 2007 Ray Strode <rstrode at redhat.com> - 0.1.9-3
+- don't poll for non-existant watched files (bug 240385)
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.1.9-2
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:17:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 11:17:54 -0400
Subject: rpms/gamin/devel gamin-0.1.9-filesystem-leak.patch, NONE,
	1.1 gamin.spec, 1.63, 1.64
Message-ID: <200709141517.l8EFHsvv030766@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30738

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.9-filesystem-leak.patch 
Log Message:
fix a memory leak


gamin-0.1.9-filesystem-leak.patch:

--- NEW FILE gamin-0.1.9-filesystem-leak.patch ---
diff -up gamin-0.1.9/server/gam_fs.c.filesystem-leak gamin-0.1.9/server/gam_fs.c
--- gamin-0.1.9/server/gam_fs.c.filesystem-leak	2007-09-13 00:21:18.000000000 -0400
+++ gamin-0.1.9/server/gam_fs.c	2007-09-13 00:21:25.000000000 -0400
@@ -40,13 +40,13 @@ gam_fs_free_filesystems (void)
 	{
 		fs = iterator->data;
 
+		iterator = g_list_next (iterator);
+
 		filesystems = g_list_remove (filesystems, fs);
 
 		g_free (fs->path);
 		g_free (fs->fsname);
 		g_free (fs);
-
-		iterator = g_list_next (filesystems);
 	}
 }
 


Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gamin.spec	14 Sep 2007 14:59:46 -0000	1.63
+++ gamin.spec	14 Sep 2007 15:17:21 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -13,6 +13,8 @@
 BuildRequires: automake, libtool
 
 Patch0: gamin-0.1.9-poll-less.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=403158
+Patch1: gamin-0.1.9-filesystem-leak.patch
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -44,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .poll-less
+%patch1 -p1 -b .filesystem-leak
 
 %build
 autoreconf --force --install
@@ -92,6 +95,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.1.9-4
+- Fix a memory leak
+
 * Fri Sep 14 2007 Ray Strode <rstrode at redhat.com> - 0.1.9-3
 - don't poll for non-existant watched files (bug 240385)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 15:19:18 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 14 Sep 2007 11:19:18 -0400
Subject: rpms/gamin/devel gamin.spec,1.64,1.65
Message-ID: <200709141519.l8EFJIld030916@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30864

Modified Files:
	gamin.spec 
Log Message:
add bug reference



Index: gamin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gamin.spec	14 Sep 2007 15:17:21 -0000	1.64
+++ gamin.spec	14 Sep 2007 15:18:45 -0000	1.65
@@ -12,6 +12,7 @@
 BuildRequires: glib2-devel python python-devel
 BuildRequires: automake, libtool
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=476938
 Patch0: gamin-0.1.9-poll-less.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=403158
 Patch1: gamin-0.1.9-filesystem-leak.patch



From fedora-extras-commits at redhat.com  Fri Sep 14 15:26:58 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 11:26:58 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.21, 1.22 hal-cups-utils.spec,
	1.61, 1.62 sources, 1.21, 1.22
Message-ID: <200709141526.l8EFQw1O031304@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31278

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-1
- 0.6.13:
  - Enable/disable fix.
  - Speed improvements.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	3 Aug 2007 16:12:46 -0000	1.21
+++ .cvsignore	14 Sep 2007 15:26:26 -0000	1.22
@@ -9,3 +9,4 @@
 hal-cups-utils-0.6.10.tar.gz
 hal-cups-utils-0.6.11.tar.gz
 hal-cups-utils-0.6.12.tar.gz
+hal-cups-utils-0.6.13.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- hal-cups-utils.spec	29 Aug 2007 15:24:13 -0000	1.61
+++ hal-cups-utils.spec	14 Sep 2007 15:26:26 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.12
-Release: 3%{?dist}
+Version: 0.6.13
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -60,6 +60,11 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-1
+- 0.6.13:
+  - Enable/disable fix.
+  - Speed improvements.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.6.12-3
 - More specific license tag.
 - Better buildroot tag.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	3 Aug 2007 16:12:46 -0000	1.21
+++ sources	14 Sep 2007 15:26:26 -0000	1.22
@@ -1 +1 @@
-9430f5f9101d6c19875c82ceed9208e5  hal-cups-utils-0.6.12.tar.gz
+1fda4618efbde9a2101101853af3d7ee  hal-cups-utils-0.6.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 15:33:25 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 11:33:25 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec, 1.62,
	1.63 hal-cups-utils-description.patch, 1.1, NONE
Message-ID: <200709141533.l8EFXPeO031576@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31558

Modified Files:
	hal-cups-utils.spec 
Removed Files:
	hal-cups-utils-description.patch 
Log Message:
No longer need this patch.


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- hal-cups-utils.spec	14 Sep 2007 15:26:26 -0000	1.62
+++ hal-cups-utils.spec	14 Sep 2007 15:32:53 -0000	1.63
@@ -6,7 +6,6 @@
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
-Patch0: hal-cups-utils-description.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -28,7 +27,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch0 -p1 -b .description
 
 %build
 


--- hal-cups-utils-description.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 16:24:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 12:24:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-edd.patch, NONE,
	1.1 linux-2.6-x86-edd-maxdrive.patch, NONE, 1.1 kernel.spec,
	1.164, 1.165 linux-2.6-libata-pata-dma-disable-option.patch, 1.1, 1.2
Message-ID: <200709141624.l8EGOKaR006356@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246

Modified Files:
	kernel.spec linux-2.6-libata-pata-dma-disable-option.patch 
Added Files:
	linux-2.6-x86-debug-edd.patch linux-2.6-x86-edd-maxdrive.patch 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- x86 setup: limit number of EDD devices scanned
- x86 setup: print number of EDD device during scan
- libata: change boot option name to "libata.dma"
  (still only affects PATA drives)


linux-2.6-x86-debug-edd.patch:

--- NEW FILE linux-2.6-x86-debug-edd.patch ---
---
 arch/i386/boot/edd.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.22.noarch.orig/arch/i386/boot/edd.c
+++ linux-2.6.22.noarch/arch/i386/boot/edd.c
@@ -151,6 +151,7 @@ void query_edd(void)
 		 * Scan the BIOS-supported hard disks and query EDD
 		 * information...
 		 */
+		putchar('0' + (devno - 0x80) % 10);
 		get_edd_info(devno, &ei);
 
 		if (boot_params.eddbuf_entries < EDDMAXNR) {

linux-2.6-x86-edd-maxdrive.patch:

--- NEW FILE linux-2.6-x86-edd-maxdrive.patch ---
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index bd138e4..fad5f6b 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -129,7 +129,7 @@ void query_edd(void)
 	char eddarg[8];
 	int do_mbr = 1;
 	int do_edd = 1;
-	int devno;
+	int devno, maxdrive;
 	struct edd_info ei, *edp;
 	u32 *mbrptr;
 
@@ -145,8 +145,22 @@ void query_edd(void)
 
 	if (!do_edd)
 		return;
-
-	for (devno = 0x80; devno < 0x80+EDD_MBR_SIG_MAX; devno++) {
+	
+	/* Query the number of drives.  This prevents the probe
+	   from wandering into CD-ROMs and nonexistent devices;
+	   some machines have been known to hang if nonexistent
+	   devices are probed.
+
+	   Ralf Brown (inter61) seems to imply that BIOS location
+	   40:75 is more reliable than the return value from INT 13h,
+	   AH=08h, so go with that. */
+
+	set_fs(0);
+	maxdrive = rdfs8(0x475)|0x80;
+	if (maxdrive > 0x80+EDD_MBR_SIG_MAX)
+		maxdrive = 0x80+EDD_MBR_SIG_MAX;
+
+	for (devno = 0x80; devno < maxdrive; devno++) {
 		/*
 		 * Scan the BIOS-supported hard disks and query EDD
 		 * information...


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kernel.spec	13 Sep 2007 20:59:51 -0000	1.164
+++ kernel.spec	14 Sep 2007 16:23:47 -0000	1.165
@@ -580,6 +580,7 @@
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
+Patch76: linux-2.6-x86-debug-edd.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -671,6 +672,8 @@
 Patch1508: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
+Patch1600: linux-2.6-x86-edd-maxdrive.patch 
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1004,6 +1007,7 @@
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # debug early boot
 ApplyPatch linux-2.6-x86-debug-boot.patch
+ApplyPatch linux-2.6-x86-debug-edd.patch
 
 #
 # PowerPC
@@ -1204,6 +1208,9 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
+# EDD fix
+ApplyPatch linux-2.6-x86-edd-maxdrive.patch 
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1796,6 +1803,12 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86 setup: limit number of EDD devices scanned
+- x86 setup: print number of EDD device during scan
+- libata: change boot option name to "libata.dma"
+  (still only affects PATA drives)
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git4
 
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pata-dma-disable-option.patch	11 Sep 2007 21:25:51 -0000	1.1
+++ linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 16:23:47 -0000	1.2
@@ -44,8 +44,8 @@
  MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
  
 +static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
-+module_param_named(pata_dma, ata_pata_dma, int, 0644);
-+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
++module_param_named(dma, ata_pata_dma, int, 0644);
++MODULE_PARM_DESC(dma, "Use DMA on PATA devices");
 +
  static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
  module_param(ata_probe_timeout, int, 0444);



From fedora-extras-commits at redhat.com  Fri Sep 14 16:24:42 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 14 Sep 2007 12:24:42 -0400
Subject: rpms/international-time/devel international-time-current-time.patch,
	NONE, 1.1 international-time.spec, 1.4, 1.5
Message-ID: <200709141624.l8EGOgEU006369@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/international-time/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6286

Modified Files:
	international-time.spec 
Added Files:
	international-time-current-time.patch 
Log Message:
* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.0.2-4
- Use the current time (bug #291151).


international-time-current-time.patch:

--- NEW FILE international-time-current-time.patch ---
diff -up international-time-0.0.2/international-time.py~ international-time-0.0.2/international-time.py
--- international-time-0.0.2/international-time.py~	2006-10-18 16:05:06.000000000 +0100
+++ international-time-0.0.2/international-time.py	2007-09-14 17:21:46.000000000 +0100
@@ -22,6 +22,9 @@ class MainWin:
         self.hourspinbutton = xml.get_widget ('hourspinbutton')
         self.minspinbutton = xml.get_widget ('minspinbutton')
         self.on_changed (None)
+        (_, _, _, h, m, _, _, _, _) = time.localtime ()
+        self.hourspinbutton.set_value (h)
+        self.minspinbutton.set_value ((5 * ((m + 4) / 5)) % 60)
         gtk.main ()
 
     def on_changed(self, obj):


Index: international-time.spec
===================================================================
RCS file: /cvs/pkgs/rpms/international-time/devel/international-time.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- international-time.spec	6 Dec 2006 11:53:28 -0000	1.4
+++ international-time.spec	14 Sep 2007 16:24:09 -0000	1.5
@@ -1,10 +1,11 @@
 Summary: 	A tool for arranging times in advance with overseas colleagues
 Name: 		international-time
 Version: 	0.0.2
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source0: 	http://cyberelk.net/tim/data/international-time/international-time-%{version}.tar.bz2
+Patch0:		international-time-current-time.patch
 Url:            http://cyberelk.net/tim/data/international-time/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .current-time
 
 %build
 
@@ -66,6 +68,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.0.2-4
+- Use the current time (bug #291151).
+
 * Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 0.0.2-3
 - Built for devel.
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:00:09 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 13:00:09 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.50, 1.51 sources, 1.51,
	1.52 sugar.spec, 1.59, 1.60
Message-ID: <200709141700.l8EH09k5007087@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	12 Sep 2007 19:59:44 -0000	1.50
+++ .cvsignore	14 Sep 2007 16:59:33 -0000	1.51
@@ -1 +1 @@
-sugar-0.65-git47f473189e.tar.bz2
+sugar-0.65-git0a666e23cf.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	12 Sep 2007 19:59:44 -0000	1.51
+++ sources	14 Sep 2007 16:59:33 -0000	1.52
@@ -1 +1 @@
-235e143ab290c973169df6a7c195ee24  sugar-0.65-git47f473189e.tar.bz2
+24f98c6505d6f626e1806dc0c8311ef8  sugar-0.65-git0a666e23cf.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sugar.spec	12 Sep 2007 19:59:44 -0000	1.59
+++ sugar.spec	14 Sep 2007 16:59:33 -0000	1.60
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070912git
-%define commitid 47f473189e
+%define alphatag 20070914git
+%define commitid 0a666e23cf
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.47.%{alphatag}47f473189e
+Release: 0.48.%{alphatag}0a666e23cf
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.47.20070912git47f473189e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:06:42 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 13:06:42 -0400
Subject: rpms/sugar-artwork/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 sugar-artwork.spec, 1.26, 1.27
Message-ID: <200709141706.l8EH6gGg013162@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-artwork/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13133

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.28.20070914git2aac89b4fe
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Sep 2007 20:07:55 -0000	1.25
+++ .cvsignore	14 Sep 2007 17:06:10 -0000	1.26
@@ -1 +1 @@
-sugar-artwork-0.34-gite4fd20770c.tar.bz2
+sugar-artwork-0.34-git2aac89b4fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Sep 2007 20:07:55 -0000	1.25
+++ sources	14 Sep 2007 17:06:10 -0000	1.26
@@ -1 +1 @@
-6a11672f84c158abf05c0ab4c99feb40  sugar-artwork-0.34-gite4fd20770c.tar.bz2
+32a32bdfd37210ca483f0f349b68d504  sugar-artwork-0.34-git2aac89b4fe.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-artwork/OLPC-2/sugar-artwork.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar-artwork.spec	12 Sep 2007 20:07:55 -0000	1.26
+++ sugar-artwork.spec	14 Sep 2007 17:06:10 -0000	1.27
@@ -1,10 +1,10 @@
-%define alphatag 20070912git
-%define commitid e4fd20770c
+%define alphatag 20070914git
+%define commitid 2aac89b4fe
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.34
-Release: 0.26.%{alphatag}e4fd20770c
+Release: 0.28.%{alphatag}2aac89b4fe
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/artwork
 # cd artwork
@@ -57,6 +57,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.28.20070914git2aac89b4fe
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.34-0.26.20070912gite4fd20770c
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 17:27:56 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 14 Sep 2007 13:27:56 -0400
Subject: fedora-release fedora-development.repo, 1.13,
	1.14 fedora-release.spec, 1.52,
	1.53 fedora-updates-testing.repo, 1.8, 1.9 fedora-updates.repo,
	1.13, 1.14 fedora.repo, 1.11, 1.12
Message-ID: <200709141727.l8EHRu7Z013649@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13624

Modified Files:
	fedora-development.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo fedora.repo 
Log Message:
Use failovermethod=priority in yum configs.



Index: fedora-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-development.repo	30 May 2007 14:14:30 -0000	1.13
+++ fedora-development.repo	14 Sep 2007 17:27:54 -0000	1.14
@@ -21,6 +21,7 @@
 
 [development]
 name=Fedora - Development
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 enabled=1
@@ -28,6 +29,7 @@
 
 [development-debuginfo]
 name=Fedora - Development - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
 enabled=0
@@ -35,6 +37,7 @@
 
 [development-source]
 name=Fedora - Development - Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 enabled=0


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- fedora-release.spec	30 Aug 2007 10:22:26 -0000	1.52
+++ fedora-release.spec	14 Sep 2007 17:27:54 -0000	1.53
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	7.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -77,6 +77,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
+- Use failovermethod=priority in yum configs (243698)
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 7.91-1
 - Provide system-release, useful for spinoffs.
 - Also link system-release to fedora-release for file level checks


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-updates-testing.repo	21 May 2007 20:26:28 -0000	1.8
+++ fedora-updates-testing.repo	14 Sep 2007 17:27:54 -0000	1.9
@@ -1,5 +1,6 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-updates.repo	30 May 2007 14:14:30 -0000	1.13
+++ fedora-updates.repo	14 Sep 2007 17:27:54 -0000	1.14
@@ -1,5 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [updates-source]
 name=Fedora $releasever - Updates Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora.repo	30 May 2007 14:14:30 -0000	1.11
+++ fedora.repo	14 Sep 2007 17:27:54 -0000	1.12
@@ -1,5 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 enabled=0
@@ -8,6 +9,7 @@
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
@@ -16,6 +18,7 @@
 
 [fedora-source]
 name=Fedora $releasever - Source
+failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 enabled=0



From fedora-extras-commits at redhat.com  Fri Sep 14 17:29:44 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 14 Sep 2007 13:29:44 -0400
Subject: rpms/fedora-release/devel fedora-release.spec, 1.59, 1.60 sources, 
	1.47, 1.48
Message-ID: <200709141729.l8EHTiKB013717@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13697

Modified Files:
	fedora-release.spec sources 
Log Message:
* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
- Use failovermethod=priority in yum configs (243698)



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fedora-release.spec	30 Aug 2007 10:27:31 -0000	1.59
+++ fedora-release.spec	14 Sep 2007 17:29:12 -0000	1.60
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	7.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -77,6 +77,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
+- Use failovermethod=priority in yum configs (243698)
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 7.91-1
 - Provide system-release, useful for spinoffs.
 - Also link system-release to fedora-release for file level checks


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	30 Aug 2007 10:27:31 -0000	1.47
+++ sources	14 Sep 2007 17:29:12 -0000	1.48
@@ -1 +1 @@
-e1369de67fa8d66da8764e01d7128cbd  fedora-release-7.91.tar.gz
+1692ee19be5132c951ca19297b22e227  fedora-release-7.91.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 17:44:58 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 13:44:58 -0400
Subject: rpms/glibmm24/devel .cvsignore, 1.19, 1.20 glibmm.spec, 1.27,
	1.28 sources, 1.20, 1.21
Message-ID: <200709141744.l8EHiwhd014062@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14032

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to new stable tree 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	31 Jul 2007 22:25:12 -0000	1.19
+++ .cvsignore	14 Sep 2007 17:44:25 -0000	1.20
@@ -1 +1 @@
-glibmm-2.13.9.tar.bz2
+glibmm-2.14.0.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- glibmm.spec	6 Sep 2007 09:05:52 -0000	1.27
+++ glibmm.spec	14 Sep 2007 17:44:25 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.13.9
-Release:        3%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 2.14.0-1
+- Update to new stable tree 2.14.0
+
 * Thu Sep  6 2007 Denis Leroy <denis at poolshark.org> - 2.13.9-3
 - Removed Perl code autogeneration tools (#278191)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	31 Jul 2007 22:25:12 -0000	1.20
+++ sources	14 Sep 2007 17:44:25 -0000	1.21
@@ -1 +1 @@
-1fa5cf54cbecadc68e8be5b25f5b11ea  glibmm-2.13.9.tar.bz2
+e4ae55323d50bb77db0099ae93eddcd3  glibmm-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 17:50:56 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 13:50:56 -0400
Subject: rpms/compiz/devel compiz.spec,1.99,1.100
Message-ID: <200709141750.l8EHouEI014319@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14296

Modified Files:
	compiz.spec 
Log Message:
compiz-gnome: install core schema so it actually works



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- compiz.spec	28 Aug 2007 16:51:04 -0000	1.99
+++ compiz.spec	14 Sep 2007 17:50:23 -0000	1.100
@@ -1,7 +1,7 @@
 %define		snapshot	0ec3ec
 %define		dialogversion	0.7.7
 
-%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
+%define		core_plugins	blur clone core cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
 
 %define		gnome_plugins	annotate gconf glib svg
 
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        9.%{snapshot}%{?dist}
+Release:        10.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-10
+- compiz-gnome: install core schema so it actually works
+
 * Tue Aug 28 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-9
 - Make compiz-gnome Obsolete the older compiz package so yum/anaconda
   will pull it in (thans to Adel Gadllah).



From fedora-extras-commits at redhat.com  Fri Sep 14 17:55:49 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 13:55:49 -0400
Subject: rpms/kernel/devel kernel.spec, 1.165,
	1.166 linux-2.6-libata-pata-dma-disable-option.patch, 1.2, 1.3
Message-ID: <200709141755.l8EHtnGd014573@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548

Modified Files:
	kernel.spec linux-2.6-libata-pata-dma-disable-option.patch 
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- leave boot option as "libata.pata_dma" for now



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kernel.spec	14 Sep 2007 16:23:47 -0000	1.165
+++ kernel.spec	14 Sep 2007 17:55:15 -0000	1.166
@@ -1803,6 +1803,9 @@
 
 %changelog
 * Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- leave boot option as "libata.pata_dma" for now
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 setup: limit number of EDD devices scanned
 - x86 setup: print number of EDD device during scan
 - libata: change boot option name to "libata.dma"

linux-2.6-libata-pata-dma-disable-option.patch:

Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 16:23:47 -0000	1.2
+++ linux-2.6-libata-pata-dma-disable-option.patch	14 Sep 2007 17:55:15 -0000	1.3
@@ -44,8 +44,8 @@
  MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
  
 +static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
-+module_param_named(dma, ata_pata_dma, int, 0644);
-+MODULE_PARM_DESC(dma, "Use DMA on PATA devices");
++module_param_named(pata_dma, ata_pata_dma, int, 0644);
++MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
 +
  static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
  module_param(ata_probe_timeout, int, 0444);



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:07 -0700
Subject: [pkgdb] libzzub was added for akahl
Message-ID: <200709141756.l8EHu8Z9023740@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libzzub with summary Powerful music sequencing library
Kevin Fenzi (kevin) has approved Package libzzub
Kevin Fenzi (kevin) has added a Fedora devel branch for libzzub with an owner of akahl
Kevin Fenzi (kevin) has approved libzzub in Fedora devel
Kevin Fenzi (kevin) has approved Package libzzub
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libzzub (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libzzub (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libzzub (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:16 -0700
Subject: [pkgdb] libzzub (Fedora, devel) updated by kevin
Message-ID: <200709141756.l8EHuHnb003133@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on libzzub (Fedora devel) for mtasaka
Kevin Fenzi (kevin) approved watchcommits on libzzub (Fedora devel) for mtasaka
Kevin Fenzi (kevin) Approved cvsextras for commit access on libzzub (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 10:56:16 -0700
Subject: [pkgdb] libzzub (Fedora, 7) updated by kevin
Message-ID: <200709141756.l8EHuIlR003143@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libzzub
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libzzub (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on libzzub (Fedora 7) for mtasaka
Kevin Fenzi (kevin) approved watchcommits on libzzub (Fedora 7) for mtasaka
Kevin Fenzi (kevin) Approved cvsextras for commit access on libzzub (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libzzub



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:42 -0400
Subject: rpms/libzzub - New directory
Message-ID: <200709141756.l8EHug0r014615@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub

Log Message:
Directory /cvs/extras/rpms/libzzub added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:47 -0400
Subject: rpms/libzzub/devel - New directory
Message-ID: <200709141756.l8EHul1r014630@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub/devel

Log Message:
Directory /cvs/extras/rpms/libzzub/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:49 -0400
Subject: rpms/libzzub Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709141756.l8EHun64014655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub

Added Files:
	Makefile import.log 
Log Message:
Setup of module libzzub


--- NEW FILE Makefile ---
# Top level Makefile for module libzzub
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 17:56:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 13:56:51 -0400
Subject: rpms/libzzub/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709141756.l8EHupGV014676@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf14586/rpms/libzzub/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libzzub


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libzzub
# $Id: Makefile,v 1.1 2007/09/14 17:56:49 kevin Exp $
NAME := libzzub
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 fedora-extras-commits at redhat.com  Fri Sep 14 17:57:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Sep 2007 13:57:56 -0400
Subject: rpms/qt4/devel qt4.spec,1.68,1.69
Message-ID: <200709141757.l8EHvuQc014833@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14810

Modified Files:
	qt4.spec 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- qt4.spec	13 Sep 2007 19:19:19 -0000	1.68
+++ qt4.spec	14 Sep 2007 17:57:23 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2
@@ -146,7 +146,6 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %if "%{name}" != "qt4"
@@ -213,6 +212,7 @@
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: redhat-rpm-config rpm
 
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
@@ -529,6 +529,7 @@
 
 %files x11 
 %defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.*
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
 %{_qt4_libdir}/libQtDesigner.so.*
@@ -548,7 +549,6 @@
 %files devel
 %defattr(-,root,root,-)
 #config /etc/profile.d/*
-%{_sysconfdir}/rpm/macros.*
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
@@ -634,6 +634,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-8
+- -x11: Req: redhat-rpm-config rpm, app-wrapper/multilib fun (#277581)
+
 * Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-7
 - include qt4-logo icon, used by qtdemo/qtconfig (#241452)
 - linguist.desktop: use new linguist4 icons



From fedora-extras-commits at redhat.com  Fri Sep 14 18:11:12 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 14 Sep 2007 14:11:12 -0400
Subject: rpms/gstreamer-python/devel gstreamer-python-0.10.8-exit.patch, NONE,
	1.1 gstreamer-python.spec, 1.18, 1.19
Message-ID: <200709141811.l8EIBC7v021072@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21049

Modified Files:
	gstreamer-python.spec 
Added Files:
	gstreamer-python-0.10.8-exit.patch 
Log Message:
Added patch to avoid crash on exit

gstreamer-python-0.10.8-exit.patch:

--- NEW FILE gstreamer-python-0.10.8-exit.patch ---
--- gst-python-0.10.8/gst/gstmodule.c	2007/07/28 14:26:54	1.46
+++ gst-python-0.10.8/gst/gstmodule.c	2007/09/11 11:49:50	1.47
@@ -266,8 +266,6 @@
 
      g_timeout_add_full (0, 100, python_do_pending_calls, NULL, NULL);
 
-     atexit(gst_deinit);
-     
      if (PyErr_Occurred ()) {
 	  Py_FatalError ("can't initialize module gst");
      }


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gstreamer-python.spec	20 Aug 2007 13:19:38 -0000	1.18
+++ gstreamer-python.spec	14 Sep 2007 18:10:39 -0000	1.19
@@ -2,13 +2,14 @@
 
 Name:           gstreamer-python
 Version:        0.10.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
+Patch0:         gstreamer-python-0.10.8-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2.3
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q -n gst-python-%{version}
+%patch0 -p1 -b .exit
 %{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
 
 
@@ -71,6 +73,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Denis Leroy <denis at poolshark.org> - 0.10.8-2
+- Added patch to avoid crash on exit
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 0.10.8-1
 - Update to upstream 0.10.8
 - License tag update



From fedora-extras-commits at redhat.com  Fri Sep 14 18:14:26 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 14:14:26 -0400
Subject: rpms/nfs-utils/F-7 nfs-utils-1.1.0-smnotify-path.patch, NONE,
	1.1 nfs-utils.spec, 1.160, 1.161
Message-ID: <200709141814.l8EIEQF2021230@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21186

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
 Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)


nfs-utils-1.1.0-smnotify-path.patch:

--- NEW FILE nfs-utils-1.1.0-smnotify-path.patch ---
diff -up nfs-utils-1.1.0/utils/statd/sm-notify.c.orig nfs-utils-1.1.0/utils/statd/sm-notify.c
--- nfs-utils-1.1.0/utils/statd/sm-notify.c.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.c	2007-09-14 13:54:28.000000000 -0400
@@ -24,11 +24,13 @@
 #include <errno.h>
 #include <grp.h>
 
+#define STATD_PATH_XTN "statd/"
+
 #ifndef BASEDIR
 # ifdef NFS_STATEDIR
-#  define BASEDIR		NFS_STATEDIR
+#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
 # else
-#  define BASEDIR		"/var/lib/nfs"
+#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
 # endif
 #endif
 
diff -up nfs-utils-1.1.0/utils/statd/sm-notify.man.orig nfs-utils-1.1.0/utils/statd/sm-notify.man
--- nfs-utils-1.1.0/utils/statd/sm-notify.man.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.man	2007-09-14 14:01:36.000000000 -0400
@@ -33,7 +33,7 @@ but this is configurable.
 For each NFS client or server machine to be monitored,
 .B rpc.statd
 creates a file in
-.BR /var/lib/nfs/sm ", "
+.BR /var/lib/nfs/statd/sm ", "
 and removes the file if monitoring is no longer required.
 .PP
 When the machine is rebooted,
@@ -47,7 +47,7 @@ Each machine has an
 which is basically an integer counter that is incremented
 each time the machine reboots. This counter is stored
 in
-.BR /var/lib/nfs/state ,
+.BR /var/lib/nfs/statd/state ,
 and updated by
 .BR sm-notify .
 .SS Security
@@ -149,13 +149,13 @@ By default,
 .B sm-notify
 forks and puts itself in the background after obtaining the
 list of hosts from
-.BR /var/lib/nfs/sm .
+.BR /var/lib/nfs/statd/sm .
 .SH FILES
-.BR /var/lib/nfs/state
+.BR /var/lib/nfs/statd/state
 .br
-.BR /var/lib/nfs/sm/*
+.BR /var/lib/nfs/statd/sm/*
 .br
-.BR /var/lib/nfs/sm.bak/*
+.BR /var/lib/nfs/statd/sm.bak/*
 .br
 .BR /var/run/sm-notify.pid
 .SH SEE ALSO
diff -up nfs-utils-1.1.0/utils/exportfs/exportfs.man.orig nfs-utils-1.1.0/utils/exportfs/exportfs.man


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- nfs-utils.spec	13 Aug 2007 15:21:04 -0000	1.160
+++ nfs-utils.spec	14 Sep 2007 18:13:54 -0000	1.161
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,7 @@
 Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
+Patch10: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -94,6 +95,7 @@
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -264,6 +266,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
+- Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)
+
 * Mon Aug 13 2007 Steve Dickson <steved at redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables
   rw/ro mounts to the same server (bz 243913).



From fedora-extras-commits at redhat.com  Fri Sep 14 18:14:50 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:14:50 -0400
Subject: rpms/nsd/devel nsd.init,1.5,1.6
Message-ID: <200709141814.l8EIEofX021239@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190

Modified Files:
	nsd.init 
Log Message:
Fix pid file location. Remove NOTIFY state on stop.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	14 Sep 2007 18:14:17 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	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



From fedora-extras-commits at redhat.com  Fri Sep 14 18:16:52 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:16:52 -0400
Subject: rpms/nsd/devel sources,1.9,1.10
Message-ID: <200709141816.l8EIGqWN021274@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21247

Modified Files:
	sources 
Log Message:
update sources.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Sep 2007 20:40:27 -0000	1.9
+++ sources	14 Sep 2007 18:16:20 -0000	1.10
@@ -1,6 +1,6 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-e64633bb4e6eb46e8e16049e87333cb9  nsd.init
+02fd7cfe4c455f180a2178da78b6cd21  nsd.init
 a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
 73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
 ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 18:17:53 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 14:17:53 -0400
Subject: rpms/nsd/devel nsd.spec,1.21,1.22
Message-ID: <200709141817.l8EIHrFt021316@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21292

Modified Files:
	nsd.spec 
Log Message:
* 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.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nsd.spec	11 Sep 2007 20:40:27 -0000	1.21
+++ nsd.spec	14 Sep 2007 18:17:20 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -20,8 +20,10 @@
 %setup -q 
 
 %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}
@@ -32,6 +34,7 @@
 install -d -m 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
 mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
@@ -51,6 +54,7 @@
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -74,6 +78,14 @@
 fi
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Fri Sep 14 18:20:03 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 14:20:03 -0400
Subject: rpms/jd/devel .cvsignore, 1.145, 1.146 jd.spec, 1.171, 1.172 sources,
	1.146, 1.147
Message-ID: <200709141820.l8EIK33e021408@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21380

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
- svn 1335



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	14 Sep 2007 06:43:21 -0000	1.145
+++ .cvsignore	14 Sep 2007 18:19:31 -0000	1.146
@@ -1 +1 @@
-jd-1.9.6-svn1331.tgz
+jd-1.9.6-svn1335.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- jd.spec	14 Sep 2007 06:43:21 -0000	1.171
+++ jd.spec	14 Sep 2007 18:19:31 -0000	1.172
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1331
+%define         strtag        svn1335
 %define         repoid        26577
 # Define this if this is pre-version
 %define         pre_release   1
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Sep 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1331
-- svn 1331
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
+- svn 1335
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	14 Sep 2007 06:43:21 -0000	1.146
+++ sources	14 Sep 2007 18:19:31 -0000	1.147
@@ -1 +1 @@
-d0cf5022f84597bfeb830aa6a6597ac0  jd-1.9.6-svn1331.tgz
+f43bf179bb382e60ed4fd07f5a43a965  jd-1.9.6-svn1335.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 18:34:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 14 Sep 2007 14:34:02 -0400
Subject: rpms/libtheora/devel libtheora-1.0alpha8-textreloc.patch, NONE,
	1.1 libtheora.spec, 1.18, 1.19
Message-ID: <200709141834.l8EIY22r022482@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444

Modified Files:
	libtheora.spec 
Added Files:
	libtheora-1.0alpha8-textreloc.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)


libtheora-1.0alpha8-textreloc.patch:

--- NEW FILE libtheora-1.0alpha8-textreloc.patch ---
diff -up libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c
--- libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~	2007-09-14 19:27:07.000000000 +0200
+++ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c	2007-09-14 19:27:07.000000000 +0200
@@ -21,6 +21,9 @@
 
 #if defined(USE_ASM)
 
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
+
 static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
 static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
 
@@ -173,12 +176,17 @@ static void FilterVert__mmx(unsigned cha
     );
 }
 
+#endif
+
 /* install our implementation in the function table */
 void dsp_mmx_dct_decode_init(DspFunctions *funcs)
 {
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
   TH_DEBUG("enabling accelerated x86_32 mmx dct decode functions.\n");
   funcs->FilterVert = FilterVert__mmx;
   funcs->FilterHoriz = FilterHoriz__mmx;
+#endif
 }
 
 #endif /* USE_ASM */


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtheora.spec	22 Aug 2007 09:39:29 -0000	1.18
+++ libtheora.spec	14 Sep 2007 18:33:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha8
-Release: 0.2.svn13393%{?dist}
+Release: 0.3.svn13393%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 # svn snapshot (svn revision 13393) no url
 Source0: %{name}-%{version}.tar.gz
 Patch0: libtheora-1.0alpha8-version-info.patch
+Patch1: libtheora-1.0alpha8-textreloc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -53,6 +54,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 aclocal -I m4
 libtoolize --automake
 autoheader
@@ -101,6 +103,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
+- Fix textrelocations on i386 (bz 253591)
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.2.svn13393
 - Fix Source0 URL
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:36:48 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Fri, 14 Sep 2007 14:36:48 -0400
Subject: rpms/flow-tools/devel flow-capture.init, NONE,
	1.1 flow-capture.sysconfig, NONE, 1.1 flow-tools.spec, 1.18, 1.19
Message-ID: <200709141836.l8EIamnF022763@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22692

Modified Files:
	flow-tools.spec 
Added Files:
	flow-capture.init flow-capture.sysconfig 
Log Message:
Add user and init scripts



--- NEW FILE flow-capture.init ---
#!/bin/sh
#
# flow-capture Capture traffic flow data
#
# chkconfig: - 90 10
# description: Capture traffic flow data

### BEGIN INIT INFO
# Provides: flow-capture
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Capture traffic flow data
# Description: Capture traffic flow data
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

prog="flow-capture"
exec="/usr/bin/$prog"
config="/etc/sysconfig/$prog"
lockfile=/var/lock/subsys/$prog

[ -e $config ] && . $config

# Define the flow-tools username
FLOWTOOLS_USER="${FLOWTOOLS_USER:-flow-tools}"

# Add pidfile
OPTIONS="-p /var/run/flow-capture.pid $OPTIONS"

# Check that networking is up.
if [ "$NETWORKING" = "no" ]
then
        exit 0
fi

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon --user=$FLOWTOOLS_USER $exec $OPTIONS
    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() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

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|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE flow-capture.sysconfig ---
# Change the source IP and port to what is used on your network
OPTIONS="-n 287 -N 0 -w /var/flow-tools -S 5 0/0/8818"


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- flow-tools.spec	5 Aug 2007 10:20:27 -0000	1.18
+++ flow-tools.spec	14 Sep 2007 18:36:16 -0000	1.19
@@ -1,15 +1,32 @@
+%bcond_without  fedora
+
+%global uid 40
+%global username flow-tools
+%global homedir %{_localstatedir}/%{name}
+%global gecos "Network flow monitoring"
+
 Version: 0.68.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
 Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source1: flow-capture.init
+Source2: flow-capture.sysconfig
 Requires: rrdtool-python
 BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel 
 BuildRequires: bison flex tcp_wrappers
+BuildRequires: fedora-usermgmt-devel
+%{?FE_USERADD_REQ}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires(post): initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): initscripts
+Provides: group(%username) = %uid
+Provides: user(%username) = %uid
+
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -56,13 +73,37 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+install -d $RPM_BUILD_ROOT%{_initrddir}
+install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/flow-capture
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%pre
+%__fe_groupadd %uid -r %username &>/dev/null || :
+%__fe_useradd  %uid -r -s /sbin/nologin -d %homedir -M          \
+                    -c '%gecos' -g %username %username &>/dev/null || :
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add flow-capture
+
+%preun
+if [ $1 = 0 ]; then
+        /sbin/service flow-capture stop >/dev/null 2>&1
+        /sbin/chkconfig --del flow-capture
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+        /sbin/service flow-capture condrestart >/dev/null 2>&1 || :
+fi
 
-%postun -p /sbin/ldconfig
+%__fe_userdel  %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
 
 %files 
 %defattr(-,root,root)
@@ -76,7 +117,9 @@
 %dir %{_sysconfdir}/%{name}/sym/
 %config(noreplace) %{_sysconfdir}/%{name}/cfg/*
 %config(noreplace) %{_sysconfdir}/%{name}/sym/*
-%{_localstatedir}/%{name}/
+%config(noreplace) %{_sysconfdir}/sysconfig/flow-capture
+%{_initrddir}/flow-capture
+%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 
@@ -86,6 +129,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Sep 13 2007 Orion Poplawski <orion at cora.nwra.com> - 0.68.1-2
+- Add user and init scripts
+
 * Sun Aug  5 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.1-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:38:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 14 Sep 2007 14:38:11 -0400
Subject: rpms/libtheora/F-7 libtheora-1.0alpha8-textreloc.patch, NONE,
	1.1 libtheora.spec, 1.17, 1.18
Message-ID: <200709141838.l8EIcBiL022817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22794

Modified Files:
	libtheora.spec 
Added Files:
	libtheora-1.0alpha8-textreloc.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
- Fix textrelocations on i386 (bz 253591)


libtheora-1.0alpha8-textreloc.patch:

--- NEW FILE libtheora-1.0alpha8-textreloc.patch ---
diff -up libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c
--- libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c~	2007-09-14 19:27:07.000000000 +0200
+++ libtheora-1.0alpha8/lib/enc/x86_32/dct_decode_mmx.c	2007-09-14 19:27:07.000000000 +0200
@@ -21,6 +21,9 @@
 
 #if defined(USE_ASM)
 
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
+
 static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
 static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
 
@@ -173,12 +176,17 @@ static void FilterVert__mmx(unsigned cha
     );
 }
 
+#endif
+
 /* install our implementation in the function table */
 void dsp_mmx_dct_decode_init(DspFunctions *funcs)
 {
+/* Disabled as this asm results in text relocations, which is BAD */
+#if 0
   TH_DEBUG("enabling accelerated x86_32 mmx dct decode functions.\n");
   funcs->FilterVert = FilterVert__mmx;
   funcs->FilterHoriz = FilterHoriz__mmx;
+#endif
 }
 
 #endif /* USE_ASM */


Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/F-7/libtheora.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libtheora.spec	16 Aug 2007 19:45:15 -0000	1.17
+++ libtheora.spec	14 Sep 2007 18:37:38 -0000	1.18
@@ -1,13 +1,15 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha8
-Release: 0.1.svn13393%{?dist}
+Release: 0.3.svn13393%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.theora.org
-Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.gz
+# svn snapshot (svn revision 13393) no url
+Source0: %{name}-%{version}.tar.gz
 Patch0: libtheora-1.0alpha8-version-info.patch
+Patch1: libtheora-1.0alpha8-textreloc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -52,6 +54,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 aclocal -I m4
 libtoolize --automake
 autoheader
@@ -100,6 +103,12 @@
 %{_bindir}/*
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.3.svn13393
+- Fix textrelocations on i386 (bz 253591)
+
+* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.2.svn13393
+- Fix Source0 URL
+
 * Sun Jul 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0alpha8-0.1.svn13393
 - Update to 1.0alpha8 svn (revision 13393) snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 18:45:29 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 14:45:29 -0400
Subject: rpms/compiz/devel compiz.spec,1.100,1.101
Message-ID: <200709141845.l8EIjTUN022971@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22935

Modified Files:
	compiz.spec 
Log Message:
- compiz-gnome: install core schema so it actually works
  REALLY, THIS TIME!
- remove unnecessary gconf stuff from %%install




Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- compiz.spec	14 Sep 2007 17:50:23 -0000	1.100
+++ compiz.spec	14 Sep 2007 18:44:56 -0000	1.101
@@ -1,7 +1,7 @@
 %define		snapshot	0ec3ec
 %define		dialogversion	0.7.7
 
-%define		core_plugins	blur clone core cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
+%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
 
 %define		gnome_plugins	annotate gconf glib svg
 
@@ -161,10 +161,6 @@
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-for f in %{core_plugins} %{gnome_plugins}; do
-  gconftool-2 --makefile-uninstall-rule $f >& /dev/null || :
-done
-
 %find_lang compiz
 %find_lang desktop-effects
 
@@ -189,7 +185,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-for f in %{core_plugins} %{gnome_plugins}; do
+for f in %{core_plugins} %{gnome_plugins} core; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
 done
 
@@ -202,7 +198,7 @@
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins}; do
+  for f in %{core_plugins} %{gnome_plugins} core; do
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
   done
 fi
@@ -211,7 +207,7 @@
 %preun gnome
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins}; do
+  for f in %{core_plugins} %{gnome_plugins} core; do
     gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
   done
 fi
@@ -277,8 +273,9 @@
 
 
 %changelog
-* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-10
+* Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-11
 - compiz-gnome: install core schema so it actually works
+- remove unnecessary gconf stuff from %%install
 
 * Tue Aug 28 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-9
 - Make compiz-gnome Obsolete the older compiz package so yum/anaconda



From fedora-extras-commits at redhat.com  Fri Sep 14 18:48:31 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 14 Sep 2007 14:48:31 -0400
Subject: rpms/compiz/devel compiz.spec,1.101,1.102
Message-ID: <200709141848.l8EImVZ8023071@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045

Modified Files:
	compiz.spec 
Log Message:
bump



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- compiz.spec	14 Sep 2007 18:44:56 -0000	1.101
+++ compiz.spec	14 Sep 2007 18:47:59 -0000	1.102
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        10.%{snapshot}%{?dist}
+Release:        11.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Fri Sep 14 19:09:36 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:09:36 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-smnotify-path.patch, NONE,
	1.1 nfs-utils.spec, 1.154, 1.155
Message-ID: <200709141909.l8EJ9amr029455@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
- Changed the default paths in sm-notify to 
  /var/lib/nfs/statd (bz 258461)


nfs-utils-1.1.0-smnotify-path.patch:

--- NEW FILE nfs-utils-1.1.0-smnotify-path.patch ---
commit 02968aa55972b680fa00273188da281d7612ca3e
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 14:19:50 2007 -0400

    Changed the default paths in sm-notify to
    /var/lib/nfs/statd which is where the locking
    state is kept in Red Hat distros.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 98c03f9..862889f 100644
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -24,11 +24,13 @@
 #include <errno.h>
 #include <grp.h>
 
+#define STATD_PATH_XTN "statd/"
+
 #ifndef BASEDIR
 # ifdef NFS_STATEDIR
-#  define BASEDIR		NFS_STATEDIR
+#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
 # else
-#  define BASEDIR		"/var/lib/nfs"
+#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
 # endif
 #endif
 
diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man
index dd03b8d..69b7059 100644
--- a/utils/statd/sm-notify.man
+++ b/utils/statd/sm-notify.man
@@ -33,7 +33,7 @@ but this is configurable.
 For each NFS client or server machine to be monitored,
 .B rpc.statd
 creates a file in
-.BR /var/lib/nfs/sm ", "
+.BR /var/lib/nfs/statd/sm ", "
 and removes the file if monitoring is no longer required.
 .PP
 When the machine is rebooted,
@@ -47,7 +47,7 @@ Each machine has an
 which is basically an integer counter that is incremented
 each time the machine reboots. This counter is stored
 in
-.BR /var/lib/nfs/state ,
+.BR /var/lib/nfs/statd/state ,
 and updated by
 .BR sm-notify .
 .SS Security
@@ -149,13 +149,13 @@ By default,
 .B sm-notify
 forks and puts itself in the background after obtaining the
 list of hosts from
-.BR /var/lib/nfs/sm .
+.BR /var/lib/nfs/statd/sm .
 .SH FILES
-.BR /var/lib/nfs/state
+.BR /var/lib/nfs/statd/state
 .br
-.BR /var/lib/nfs/sm/*
+.BR /var/lib/nfs/statd/sm/*
 .br
-.BR /var/lib/nfs/sm.bak/*
+.BR /var/lib/nfs/statd/sm.bak/*
 .br
 .BR /var/run/sm-notify.pid
 .SH SEE ALSO


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- nfs-utils.spec	16 Aug 2007 02:50:26 -0000	1.154
+++ nfs-utils.spec	14 Sep 2007 19:09:03 -0000	1.155
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -33,6 +33,7 @@
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-exportfs-open.patch
+Patch11: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -65,7 +66,7 @@
 BuildRequires: libgssapi-devel >= 0.11 libevent-devel >= 1.3b
 BuildRequires: nfs-utils-lib-devel >= 1.1.0
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool
+BuildRequires: automake, libtool, glibc-headers
 BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
@@ -96,6 +97,7 @@
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -266,6 +268,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-5
+- Changed the default paths in sm-notify to 
+  /var/lib/nfs/statd (bz 258461)
+
 * Wed Aug 15 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses
   mode bits when creating the etab file (bz 252440).



From fedora-extras-commits at redhat.com  Fri Sep 14 19:21:15 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:21:15 -0400
Subject: rpms/rpcbind/F-7 rpcbind.init,1.4,1.5 rpcbind.spec,1.16,1.17
Message-ID: <200709141921.l8EJLFnl029619@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Changed init script to start service in runlevel 2 (bz 251568)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcbind.init	25 May 2007 08:59:28 -0000	1.4
+++ rpcbind.init	14 Sep 2007 19:20:43 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # rpcbind       Start/Stop RPCbind
 #
-# chkconfig: 345 13 87
+# chkconfig: 2345 13 87
 # description: The rpcbind utility is a server that converts RPC program \
 #              numbers into universal addresses. It must be running on the \
 #              host to be able to make RPC calls on a server on that machine.


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpcbind.spec	25 May 2007 09:01:14 -0000	1.16
+++ rpcbind.spec	14 Sep 2007 19:20:43 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -121,6 +121,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-2
+- Changed init script to start service in runlevel 2 (bz 251568)
+
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:23:03 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Fri, 14 Sep 2007 15:23:03 -0400
Subject: rpms/rpcbind/devel rpcbind.init,1.4,1.5 rpcbind.spec,1.15,1.16
Message-ID: <200709141923.l8EJN3sA029763@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29666

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Changed init script to start service in runlevel 2 (bz 251568)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcbind.init	25 May 2007 09:02:12 -0000	1.4
+++ rpcbind.init	14 Sep 2007 19:22:31 -0000	1.5
@@ -2,7 +2,7 @@
 #
 # rpcbind       Start/Stop RPCbind
 #
-# chkconfig: 345 13 87
+# chkconfig: 2345 13 87
 # description: The rpcbind utility is a server that converts RPC program \
 #              numbers into universal addresses. It must be running on the \
 #              host to be able to make RPC calls on a server on that machine.


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpcbind.spec	25 May 2007 09:02:12 -0000	1.15
+++ rpcbind.spec	14 Sep 2007 19:22:31 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release: 		7%{?dist}
+Release: 		8%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -121,6 +121,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Changed init script to start service in runlevel 2 (bz 251568)
+
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:09 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 15:27:09 -0400
Subject: rpms/verbiste/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 verbiste.spec, 1.17, 1.18
Message-ID: <200709141927.l8EJR99Z029947@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/verbiste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29870

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Upstream release, plus update license to GPLv2+.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Apr 2007 22:18:14 -0000	1.11
+++ .cvsignore	14 Sep 2007 19:26:37 -0000	1.12
@@ -1 +1 @@
-verbiste-0.1.20.tar.gz
+verbiste-0.1.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Apr 2007 22:18:14 -0000	1.11
+++ sources	14 Sep 2007 19:26:37 -0000	1.12
@@ -1 +1 @@
-f3d46647505d8d02bf513691a2d7cc29  verbiste-0.1.20.tar.gz
+a9905f429304962137f8fcd710159513  verbiste-0.1.21.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- verbiste.spec	1 Apr 2007 22:18:14 -0000	1.17
+++ verbiste.spec	14 Sep 2007 19:26:37 -0000	1.18
@@ -1,10 +1,10 @@
 Name:           verbiste
-Version:        0.1.20
+Version:        0.1.21
 Release:        1%{?dist}
 Summary:        French conjugation system
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://sarrazip.com/dev/verbiste.html
 Source:         http://www3.sympatico.ca/sarrazip/dev/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -42,6 +42,11 @@
 
 %prep
 %setup -q
+# convert doc files to unicode
+for DOCFILE in README NEWS HACKING LISEZMOI; do
+    iconv -f ISO8859-15 -t UTF8 < $DOCFILE > $DOCFILE.tmp
+    mv -f $DOCFILE.tmp $DOCFILE
+done
 
 
 %build
@@ -86,7 +91,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ABOUT-NLS AUTHORS HACKING NEWS README THANKS
+%doc COPYING ABOUT-NLS AUTHORS HACKING NEWS README THANKS LISEZMOI
 %{_libdir}/*so.*
 %{_mandir}/man*/*
 %{_mandir}/*/man*/*
@@ -111,6 +116,11 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.21-1
+- Upstream 0.1.21
+- Adjust license to match expected standard
+- Make sure docs are utf-8
+
 * Sun Apr 01 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.1.20-1
 - Upstream 0.1.20
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:29 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 15:27:29 -0400
Subject: extras-buildsys/utils/pushscript epel4-createrepo, NONE,
	1.1 Config_EPEL.py, 1.10, 1.11
Message-ID: <200709141927.l8EJRTeg030030@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29939

Modified Files:
	Config_EPEL.py 
Added Files:
	epel4-createrepo 
Log Message:
For EPEL4 add a script that calls createrepo + yum-arch.



--- NEW FILE epel4-createrepo ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

import errno, sys
import Utils

createrepo = '/usr/bin/createrepo'
yumarch = '/usr/bin/yum-arch'

args = sys.argv[1:]

cmd = createrepo+' '+' '.join(args)
Utils.run_and_check(cmd)

# Delete some args when executing yum-arch.
newargs = []
c = 0
while c<len(args):
    a = args[c]
    if a=='-g' or a=='-c':
        c += 2
    else:
        newargs.append(a)
        c += 1
cmd = yumarch+' '+' '.join(newargs)
Utils.run_and_check(cmd)

sys.exit(0)


Index: Config_EPEL.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_EPEL.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Config_EPEL.py	8 Sep 2007 17:40:17 -0000	1.10
+++ Config_EPEL.py	14 Sep 2007 19:27:27 -0000	1.11
@@ -126,6 +126,10 @@
 
 createrepo = '/usr/bin/createrepo -q'
 
+createrepo_dict = { '4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q',
+                    'testing/4' : '/srv/extras-push/work/buildsys-utils/pushscript/epel4-createrepo -q',
+                    }
+
 cr_cachedir = '/tmp/repomd-cache-epel'  # createrepo cachedir
 
 #repoview = '/usr/bin/repoview'



From fedora-extras-commits at redhat.com  Fri Sep 14 19:27:48 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:27:48 -0400
Subject: rpms/rubygems/F-7 .cvsignore, 1.4, 1.5 rubygems.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709141927.l8EJRmTd030040@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29953

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
Version 0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:45:49 -0000	1.4
+++ .cvsignore	14 Sep 2007 19:27:15 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:45:49 -0000	1.3
+++ rubygems.spec	14 Sep 2007 19:27:15 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:45:49 -0000	1.4
+++ sources	14 Sep 2007 19:27:15 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:31:38 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:31:38 -0400
Subject: rpms/rubygems/F-7 no-rdoc.patch,NONE,1.1
Message-ID: <200709141931.l8EJVcL7030182@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30169

Added Files:
	no-rdoc.patch 
Log Message:
Forgot to add patches

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:35:11 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 15:35:11 -0400
Subject: rpms/dbus/devel dbus-1.1.2-no-abort.patch, NONE, 1.1 dbus.spec,
	1.128, 1.129
Message-ID: <200709141935.l8EJZBke030274@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30252

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1.2-no-abort.patch 
Log Message:
don't abort on selinux messages. (#283231)


dbus-1.1.2-no-abort.patch:

--- NEW FILE dbus-1.1.2-no-abort.patch ---
diff -up dbus-1.1.2/bus/bus.c.foo dbus-1.1.2/bus/bus.c
--- dbus-1.1.2/bus/bus.c.foo	2007-09-14 15:26:08.000000000 -0400
+++ dbus-1.1.2/bus/bus.c	2007-09-14 15:26:08.000000000 -0400
@@ -1206,7 +1206,7 @@ bus_context_check_security_policy (BusCo
 				    dest ? dest : DBUS_SERVICE_DBUS, error))
         {
 
-	  if (dbus_error_is_set (error) &&
+	  if (error != NULL && dbus_error_is_set (error) &&
 	      dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
 	    {
 	      return FALSE;


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- dbus.spec	14 Sep 2007 13:11:38 -0000	1.128
+++ dbus.spec	14 Sep 2007 19:34:38 -0000	1.129
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -38,6 +38,7 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
 Patch3: dbus-1.1.2-audit-user.patch
+Patch4: dbus-1.1.2-no-abort.patch
 
 %description
 
@@ -81,6 +82,7 @@
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .lsb
 %patch3 -p1 -b .audit-user
+%patch4 -p1 -b .abort
 
 autoreconf -f -i
 
@@ -200,6 +202,9 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 1.1.2-6%{?dist}
+- fix daemon abort when SELinux denies passing on a message (#283231)
+
 * Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
 - Reverse we_were_root check to setpcap if we were root.  Also only init
 audit if we were root.  So error dbus message will not show up when policy 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:40:22 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:40:22 -0400
Subject: rpms/rubygems/devel no-rdoc.patch,NONE,1.1
Message-ID: <200709141940.l8EJeMAx030476@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30465

Added Files:
	no-rdoc.patch 
Log Message:
Forgot to add patches

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:42:29 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Fri, 14 Sep 2007 15:42:29 -0400
Subject: rpms/rubygems/EL-5 no-rdoc.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 rubygems.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200709141942.l8EJgTDS030605@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/rubygems/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30554

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	no-rdoc.patch 
Log Message:
Version 0.9.4

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:58:24 -0000	1.4
+++ .cvsignore	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:58:24 -0000	1.3
+++ rubygems.spec	14 Sep 2007 19:41:57 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:58:24 -0000	1.4
+++ sources	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:43:00 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 15:43:00 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 sugar-datastore.spec, 1.26, 1.27
Message-ID: <200709141943.l8EJh0R8030626@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30597

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Sep 2007 19:55:23 -0000	1.25
+++ .cvsignore	14 Sep 2007 19:42:28 -0000	1.26
@@ -1 +1 @@
-sugar-datastore-0.2.2-git7655f4d99a.tar.bz2
+sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Sep 2007 19:55:23 -0000	1.25
+++ sources	14 Sep 2007 19:42:28 -0000	1.26
@@ -1 +1 @@
-f60a6cbcdccdbd84e18a39718fc3d57f  sugar-datastore-0.2.2-git7655f4d99a.tar.bz2
+d2eb27bb21ceea2ac55b718547160803  sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sugar-datastore.spec	12 Sep 2007 19:55:23 -0000	1.26
+++ sugar-datastore.spec	14 Sep 2007 19:42:28 -0000	1.27
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070912git
-%define commitid 7655f4d99a
+%define alphatag 20070914git
+%define commitid ea13f75d6a
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.22.%{alphatag}7655f4d99a
+Release: 0.23.%{alphatag}ea13f75d6a
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.22.20070912git7655f4d99a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 14 19:48:56 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 15:48:56 -0400
Subject: rpms/python-setuptools/devel .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200709141948.l8EJmuaZ030933@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30902

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Attempt to further resolve #251645.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:58 -0000	1.10
+++ .cvsignore	14 Sep 2007 19:48:23 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-setuptools.spec	27 Aug 2007 23:26:53 -0000	1.13
+++ python-setuptools.spec	14 Sep 2007 19:48:23 -0000	1.14
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
-Release:        2%{?dist}
+Version:        0.6c7
+Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Applications/System
@@ -74,17 +74,24 @@
 %files
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt pkg_resources.txt
-%{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/*
+%exclude %{python_sitelib}/easy_install*
+%exclude %{python_sitelib}/setuptools/command
 
 %files devel
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
-%{python_sitelib}/*
-%exclude %{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/easy_install*
+%{python_sitelib}/setuptools/command
 %{_bindir}/*
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Move some things from devel into runtime, in order to not break other
+  projects.
+
 * Sat Aug 18 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-2
 - Make license tag conform to the new Licensing Guidelines
 - Move everything except pkg_resources.py into a separate -devel package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:58 -0000	1.10
+++ sources	14 Sep 2007 19:48:23 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 19:59:02 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 14 Sep 2007 15:59:02 -0400
Subject: rpms/nsd/devel nsd.spec,1.22,1.23
Message-ID: <200709141959.l8EJx2kB031217@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	nsd.spec 
Log Message:
* 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.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nsd.spec	14 Sep 2007 18:17:20 -0000	1.22
+++ nsd.spec	14 Sep 2007 19:58:30 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -21,7 +21,7 @@
 
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
-	--with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
+           --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
 
@@ -37,10 +37,9 @@
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.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 "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -78,6 +77,10 @@
 fi
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:16 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:16 -0400
Subject: rpms/python-setuptools/EL-4 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBGHr005132@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/EL-4

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:35 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:44 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/python-setuptools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-setuptools.spec	10 Jun 2007 22:25:35 -0000	1.12
+++ python-setuptools.spec	14 Sep 2007 20:10:44 -0000	1.13
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:35 -0000	1.10
+++ sources	14 Sep 2007 20:10:44 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:19 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:19 -0400
Subject: rpms/python-setuptools/EL-5 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBJaW005139@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/EL-5

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:41 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:47 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/python-setuptools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-setuptools.spec	10 Jun 2007 22:25:41 -0000	1.11
+++ python-setuptools.spec	14 Sep 2007 20:10:47 -0000	1.12
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:41 -0000	1.10
+++ sources	14 Sep 2007 20:10:47 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:22 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:22 -0400
Subject: rpms/python-setuptools/F-7 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBMeS005145@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/F-7

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:46 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:50 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/python-setuptools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-setuptools.spec	10 Jun 2007 22:25:46 -0000	1.12
+++ python-setuptools.spec	14 Sep 2007 20:10:50 -0000	1.13
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:46 -0000	1.10
+++ sources	14 Sep 2007 20:10:50 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:11:25 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 14 Sep 2007 16:11:25 -0400
Subject: rpms/python-setuptools/FC-6 .cvsignore, 1.10,
	1.11 python-setuptools.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <200709142011.l8EKBPoQ005175@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5049/FC-6

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream 0.6c7
Provide python-setuptools-devel to make packagers' lives easier.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jun 2007 22:25:52 -0000	1.10
+++ .cvsignore	14 Sep 2007 20:10:52 -0000	1.11
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/python-setuptools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-setuptools.spec	10 Jun 2007 22:25:52 -0000	1.11
+++ python-setuptools.spec	14 Sep 2007 20:10:52 -0000	1.12
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
+Version:        0.6c7
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages
-License:        PSFL/ZPL
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -18,6 +18,8 @@
 
 Requires:       python-devel
 
+Provides:       python-setuptools-devel
+
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Provide python-setuptools-devel to make packagers' lives easier
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jun 2007 22:25:52 -0000	1.10
+++ sources	14 Sep 2007 20:10:52 -0000	1.11
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 20:13:55 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 14 Sep 2007 16:13:55 -0400
Subject: extras-buildsys/utils/pushscript epel4-createrepo,1.1,1.2
Message-ID: <200709142013.l8EKDtFZ005369@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5317

Modified Files:
	epel4-createrepo 
Log Message:
wildcard protection needed here, too


Index: epel4-createrepo
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/epel4-createrepo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel4-createrepo	14 Sep 2007 19:27:27 -0000	1.1
+++ epel4-createrepo	14 Sep 2007 20:13:53 -0000	1.2
@@ -7,7 +7,10 @@
 createrepo = '/usr/bin/createrepo'
 yumarch = '/usr/bin/yum-arch'
 
-args = sys.argv[1:]
+# Protect wildcards from expansion.
+def f(a):
+    return a.replace('*','\*')
+args = map(lambda a: f(a),sys.argv[1:])
 
 cmd = createrepo+' '+' '.join(args)
 Utils.run_and_check(cmd)



From fedora-extras-commits at redhat.com  Fri Sep 14 20:18:07 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 14 Sep 2007 16:18:07 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.81, 1.82 sources, 1.62,
	1.63
Message-ID: <200709142018.l8EKI7IE005537@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5510

Modified Files:
	fedora-logos.spec sources 
Log Message:
regen tarball



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fedora-logos.spec	13 Sep 2007 20:52:24 -0000	1.81
+++ fedora-logos.spec	14 Sep 2007 20:17:34 -0000	1.82
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 7.92.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 
@@ -203,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-2-
+- regen tarball
+
 * Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
 - add the powered-by logo (#250676)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	13 Sep 2007 20:52:24 -0000	1.62
+++ sources	14 Sep 2007 20:17:34 -0000	1.63
@@ -1 +1 @@
-7799320bef9d9adb66eb01cf7adc21c4  fedora-logos-7.92.1.tar.bz2
+e598b9fd821a022d4e7185c1ff8653c9  fedora-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 14 20:47:07 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 14 Sep 2007 16:47:07 -0400
Subject: rpms/gcc/devel gcc41-builtin-va-arg-pack-len.patch, NONE,
	1.1 gcc41-pr27954.patch, NONE, 1.1 gcc41.spec, 1.172, 1.173
Message-ID: <200709142047.l8EKl7Vg006119@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6078

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-va-arg-pack-len.patch gcc41-pr27954.patch 
Log Message:
4.1.2-24

gcc41-builtin-va-arg-pack-len.patch:

--- NEW FILE gcc41-builtin-va-arg-pack-len.patch ---
2007-09-11  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK_LEN): New builtin.
	* builtins.c (expand_builtin) <case BUILT_IN_VA_ARG_PACK_LEN>: Issue
	error if __builtin_va_arg_pack_len () wasn't optimized out during
	inlining.
	* tree-inline.c (copy_bb): Replace __builtin_va_arg_pack_len ()
	with the number of inline's anonymous arguments.
	* doc/extend.texi: Document __builtin_va_arg_pack_len ().

	* gcc.dg/va-arg-pack-len-1.c: New test.
	* g++.dg/va-arg-pack-len-1.C: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:24.000000000 +0200
+++ gcc/builtins.def	2007-09-14 21:07:41.000000000 +0200
@@ -666,6 +666,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK_LEN, "va_arg_pack_len", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/builtins.c.jj	2007-09-06 11:04:56.000000000 +0200
+++ gcc/builtins.c	2007-09-14 21:07:41.000000000 +0200
@@ -5985,6 +5985,12 @@ expand_builtin (tree exp, rtx target, rt
       error ("invalid use of %<__builtin_va_arg_pack ()%>");
       return const0_rtx;
 
+    case BUILT_IN_VA_ARG_PACK_LEN:
+      /* All valid uses of __builtin_va_arg_pack_len () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
--- gcc/tree-inline.c.jj	2007-09-06 12:35:57.000000000 +0200
+++ gcc/tree-inline.c	2007-09-14 21:22:48.000000000 +0200
@@ -741,6 +741,37 @@ copy_bb (copy_body_data *id, basic_block
 	      *a = copy_list (arglist);
 	      CALL_EXPR_VA_ARG_PACK (call) = 0;
 	    }
+	  else if (call
+		   && id->call_expr
+		   && (decl = get_callee_fndecl (call))
+		   && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL
+		   && DECL_FUNCTION_CODE (decl)
+		      == BUILT_IN_VA_ARG_PACK_LEN)
+	    {
+	      /* __builtin_va_arg_pack_len () should be replaced by
+		 the number of anonymous arguments.  */
+	      int nargs;
+	      tree count, *call_ptr, p, a;
+
+	      a = TREE_OPERAND (id->call_expr, 1);
+	      for (p = DECL_ARGUMENTS (id->src_fn); p; p = TREE_CHAIN (p))
+		a = TREE_CHAIN (a);
+
+              for (nargs = 0; a; a = TREE_CHAIN (a))
+		nargs++;
+
+	      count = build_int_cst (integer_type_node, nargs);
+	      call_ptr = &stmt;
+	      if (TREE_CODE (*call_ptr) == MODIFY_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 1);
+	      if (TREE_CODE (*call_ptr) == WITH_SIZE_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 0);
+	      gcc_assert (*call_ptr == call && call_ptr != &stmt);
+	      *call_ptr = count;
+	      update_stmt (stmt);
+	      call = NULL_TREE;
+	    }
+
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
--- gcc/doc/extend.texi.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-14 21:07:41.000000000 +0200
@@ -578,6 +578,41 @@ myprintf (FILE *f, const char *format, .
 @end smallexample
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack_len ()
+This built-in function returns the number of anonymous arguments of
+an inline function.  It can be used only in inline functions which
+will be always inlined, never compiled as a separate function, such
+as those using @code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+For example following will do link or runtime checking of open
+arguments for optimized code:
+ at smallexample
+#ifdef __OPTIMIZE__
+extern inline __attribute__((__gnu_inline__)) int
+myopen (const char *path, int oflag, ...)
+@{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    @{
+      if ((oflag & O_CREAT) != 0 && __builtin_va_arg_pack_len () < 1)
+        @{
+          warn_open_missing_mode ();
+          return __open_2 (path, oflag);
+        @}
+      return open (path, oflag, __builtin_va_arg_pack ());
+    @}
+    
+  if (__builtin_va_arg_pack_len () < 1)
+    return __open_2 (path, oflag);
+
+  return open (path, oflag, __builtin_va_arg_pack ());
+@}
+#endif
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int warn_open_missing_mode (void);
+extern int warn_open_too_many_arguments (void);
+extern void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      /* In real __open_2 this would terminate the program:
+	 open with O_CREAT without third argument.  */
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  /* Invalid use of myopen, but only detectable at runtime.  */
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+// { dg-do run }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern "C" int warn_open_missing_mode (void);
+extern "C" int warn_open_too_many_arguments (void);
+extern "C" void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      // In real __open_2 this would terminate the program:
+      // open with O_CREAT without third argument.
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  // Invalid use of myopen, but only detectable at runtime.
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}

gcc41-pr27954.patch:

--- NEW FILE gcc41-pr27954.patch ---
2006-10-27  Jerry DeLisle  <jvdelisle at gcc.gnu.org>

	PR fortran/27954
	* decl.c (gfc_free_data_all): New function to free all data structures
	after errors in DATA statements and declarations.
	(top_var_list): Use new function.(top_val_list): Use new function.
	(gfc_match_data_decl): Use new function.

	PR libgfortran/27954
	* gfortran.dg/error_recovery_2.f90: New test.

--- gcc/fortran/decl.c	(revision 118083)
+++ gcc/fortran/decl.c	(revision 118086)
@@ -128,6 +128,21 @@ gfc_free_data (gfc_data * p)
 }
 
 
+/* Free all data in a namespace.  */
+static void
+gfc_free_data_all (gfc_namespace * ns)
+{
+  gfc_data *d;
+
+  for (;ns->data;)
+    {
+      d = ns->data->next;
+      gfc_free (ns->data);
+      ns->data = d;
+    }
+}
+
+
 static match var_element (gfc_data_variable *);
 
 /* Match a list of variables terminated by an iterator and a right
@@ -262,6 +277,7 @@ top_var_list (gfc_data * d)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -374,6 +390,7 @@ top_val_list (gfc_data * data)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -2368,6 +2385,8 @@ ok:
   gfc_error ("Syntax error in data declaration at %C");
   m = MATCH_ERROR;
 
+  gfc_free_data_all (gfc_current_ns);
+
 cleanup:
   gfc_free_array_spec (current_as);
   current_as = NULL;
--- gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 118086)
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! PR27954 Internal compiler error on bad statements
+! Derived from test case submitted in PR.
+subroutine bad1
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+end subroutine bad1
+
+subroutine bad2
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case."
+end subroutine bad2
+
+subroutine bad3
+  implicit none
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case that segfaults without patch."
+end subroutine bad3
+


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- gcc41.spec	7 Sep 2007 07:12:55 -0000	1.172
+++ gcc41.spec	14 Sep 2007 20:46:35 -0000	1.173
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 23
+%define gcc_release 24
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -150,6 +150,8 @@
 Patch34: gcc41-builtin-chk-anticipated.patch
 Patch35: gcc41-builtin-throw.patch
 Patch36: gcc41-builtin-va-arg-pack.patch
+Patch37: gcc41-builtin-va-arg-pack-len.patch
+Patch38: gcc41-pr27954.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -469,6 +471,8 @@
 %patch34 -p0 -b .builtin-chk-anticipated~
 %patch35 -p0 -b .builtin-throw~
 %patch36 -p0 -b .builtin-va-arg-pack~
+%patch37 -p0 -b .builtin-va-arg-pack-len~
+%patch38 -p0 -b .pr27954~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1623,6 +1627,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24
+- backport __builtin_va_arg_pack_len () support
+- fix Fortran error recovery with DATA (Jerry DeLisle, #281331,
+  PR fortran/27954)
+
 * Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23
 - fix __builtin_va_arg_pack () support for C++
 



From fedora-extras-commits at redhat.com  Fri Sep 14 20:56:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 14 Sep 2007 16:56:20 -0400
Subject: rpms/kernel/devel kernel.spec,1.166,1.167
Message-ID: <200709142056.l8EKuKig006367@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6347

Modified Files:
	kernel.spec 
Log Message:
Fix dates in changelog



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kernel.spec	14 Sep 2007 17:55:15 -0000	1.166
+++ kernel.spec	14 Sep 2007 20:55:47 -0000	1.167
@@ -1802,10 +1802,10 @@
 
 
 %changelog
-* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+* Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - leave boot option as "libata.pata_dma" for now
 
-* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+* Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 setup: limit number of EDD devices scanned
 - x86 setup: print number of EDD device during scan
 - libata: change boot option name to "libata.dma"



From fedora-extras-commits at redhat.com  Fri Sep 14 21:09:35 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 14 Sep 2007 17:09:35 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.25, 1.26 bigboard.spec, 1.34,
	1.35 sources, 1.26, 1.27
Message-ID: <200709142109.l8EL9Z72012630@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12570

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Sep 2007 19:31:21 -0000	1.25
+++ .cvsignore	14 Sep 2007 21:09:03 -0000	1.26
@@ -1 +1 @@
-bigboard-0.5.15.tar.gz
+bigboard-0.5.16.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bigboard.spec	11 Sep 2007 19:31:21 -0000	1.34
+++ bigboard.spec	14 Sep 2007 21:09:03 -0000	1.35
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.15
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
+- new upstream
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	11 Sep 2007 19:31:21 -0000	1.26
+++ sources	14 Sep 2007 21:09:03 -0000	1.27
@@ -1 +1 @@
-bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz
+43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:10:04 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 14 Sep 2007 17:10:04 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.19,1.20 sources,1.15,1.16
Message-ID: <200709142110.l8ELA46I012683@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12609

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bigboard.spec	11 Sep 2007 21:09:42 -0000	1.19
+++ bigboard.spec	14 Sep 2007 21:09:31 -0000	1.20
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.15
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
+- new upstream
+
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.5.15-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Sep 2007 21:09:42 -0000	1.15
+++ sources	14 Sep 2007 21:09:31 -0000	1.16
@@ -1 +1 @@
-bb34981d4e32aa8bea9176d1c167ece5  bigboard-0.5.15.tar.gz
+43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:03 -0700
Subject: [pkgdb] python-GnuPGInterface was added for robert
Message-ID: <200709142122.l8ELM4EG010324@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package python-GnuPGInterface with summary A Python module to interface with GnuPG
Kevin Fenzi (kevin) has approved Package python-GnuPGInterface
Kevin Fenzi (kevin) has added a Fedora devel branch for python-GnuPGInterface with an owner of robert
Kevin Fenzi (kevin) has approved python-GnuPGInterface in Fedora devel
Kevin Fenzi (kevin) has approved Package python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora EPEL, 5) updated by kevin
Message-ID: <200709142122.l8ELMRgE010451@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, 6) updated by kevin
Message-ID: <200709142122.l8ELMS15010463@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, devel) updated by kevin
Message-ID: <200709142122.l8ELMSec010476@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora, 7) updated by kevin
Message-ID: <200709142122.l8ELMTcN010488@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:22:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:22:27 -0700
Subject: [pkgdb] python-GnuPGInterface (Fedora EPEL, 4) updated by kevin
Message-ID: <200709142122.l8ELMTPV010501@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for python-GnuPGInterface
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-GnuPGInterface (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on python-GnuPGInterface (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-GnuPGInterface



From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:07 -0400
Subject: rpms/python-GnuPGInterface - New directory
Message-ID: <200709142123.l8ELN79G013154@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface

Log Message:
Directory /cvs/extras/rpms/python-GnuPGInterface added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:10 -0400
Subject: rpms/python-GnuPGInterface/devel - New directory
Message-ID: <200709142123.l8ELNAR7013170@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface/devel

Log Message:
Directory /cvs/extras/rpms/python-GnuPGInterface/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:14 -0400
Subject: rpms/python-GnuPGInterface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709142123.l8ELNEoh013196@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-GnuPGInterface


--- NEW FILE Makefile ---
# Top level Makefile for module python-GnuPGInterface
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 21:23:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:23:16 -0400
Subject: rpms/python-GnuPGInterface/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709142123.l8ELNGL3013218@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM13119/rpms/python-GnuPGInterface/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-GnuPGInterface


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-GnuPGInterface
# $Id: Makefile,v 1.1 2007/09/14 21:23:14 kevin Exp $
NAME := python-GnuPGInterface
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 fedora-extras-commits at redhat.com  Fri Sep 14 21:25:09 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:09 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPAlc032024@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora devel was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:13 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:13 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPDRI011241@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 7 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:16 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:16 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPGdc032051@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 5 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:18 2007
From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl))
Date: Fri, 14 Sep 2007 14:25:18 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Orphaned
Message-ID: <200709142125.l8ELPISj011270@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 6 was orphaned by Matej Cepl (mcepl)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:53 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:53 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPrLJ011417@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora devel is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:56 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPuIF011431@app4.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 7 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:57 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:57 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPvu8032201@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 5 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:25:58 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lpoetter))
Date: Fri, 14 Sep 2007 14:25:58 -0700
Subject: [pkgdb] gstreamer-plugins-pulse Owned
Message-ID: <200709142125.l8ELPwQH032215@app3.fedora.phx.redhat.com>

Package gstreamer-plugins-pulse in Fedora 6 is now owned by Lennart Poettering (lennart)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gstreamer-plugins-pulse



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:35 -0400
Subject: rpms/cacti/EL-4 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQZB7013816@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/EL-4

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:37 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:37 -0400
Subject: rpms/cacti/EL-5 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQbZd013823@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/EL-5

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:40 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:40 -0400
Subject: rpms/cacti/F-7 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQeXF013830@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/F-7

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:41 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:43 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:43 -0400
Subject: rpms/cacti/FC-6 cacti.spec,1.10,1.11
Message-ID: <200709142126.l8ELQh1p013835@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/FC-6

Modified Files:
	cacti.spec 
Log Message:
Patches for bug#243592


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cacti.spec	5 May 2007 20:46:37 -0000	1.10
+++ cacti.spec	14 Sep 2007 21:26:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 1%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,12 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
+* Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
+- rebuild
+
 * Sat May 05 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-5
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:41 -0700
Subject: [pkgdb] eclipse-egit was added for bkonrath
Message-ID: <200709142126.l8ELQfvf032408@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-egit with summary Eclipse Git plugin
Kevin Fenzi (kevin) has approved Package eclipse-egit
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-egit with an owner of bkonrath
Kevin Fenzi (kevin) has approved eclipse-egit in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-egit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-egit (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-egit (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-egit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:26:46 -0400
Subject: rpms/cacti/devel CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142126.l8ELQkSu013840@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/devel

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Patches for bug#243592

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	9 Sep 2007 02:36:14 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:26:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
+Patch2: CVE-2007-3112.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p3
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -103,6 +105,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+- Fix for CVE-2007-3112 bz#243592
+
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:46 -0700
Subject: [pkgdb] eclipse-egit (Fedora, 7) updated by kevin
Message-ID: <200709142126.l8ELQkeV032438@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for eclipse-egit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-egit (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-egit (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit



From fedora-extras-commits at redhat.com  Fri Sep 14 21:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 14:26:46 -0700
Subject: [pkgdb] eclipse-egit (Fedora, devel) updated by kevin
Message-ID: <200709142126.l8ELQleG032448@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-egit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-egit



From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:01 -0400
Subject: rpms/eclipse-egit - New directory
Message-ID: <200709142127.l8ELR1fF013917@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit

Log Message:
Directory /cvs/extras/rpms/eclipse-egit added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:04 -0400
Subject: rpms/eclipse-egit/devel - New directory
Message-ID: <200709142127.l8ELR4NL013933@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-egit/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:07 -0400
Subject: rpms/eclipse-egit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709142127.l8ELR70k013955@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-egit


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-egit
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 14 21:27:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 14 Sep 2007 17:27:11 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709142127.l8ELRBI6013981@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU13878/rpms/eclipse-egit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-egit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-egit
# $Id: Makefile,v 1.1 2007/09/14 21:27:08 kevin Exp $
NAME := eclipse-egit
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 fedora-extras-commits at redhat.com  Fri Sep 14 21:27:23 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 17:27:23 -0400
Subject: rpms/dcraw/devel dcraw.spec,1.16,1.17 sources,1.7,1.8
Message-ID: <200709142127.l8ELRNDF014117@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/dcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13834

Modified Files:
	dcraw.spec sources 
Log Message:
rebuild with pristine source tarball



Index: dcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dcraw.spec	6 Aug 2007 07:53:44 -0000	1.16
+++ dcraw.spec	14 Sep 2007 21:26:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Tool for decoding raw image data from digital cameras
 Name: dcraw
 Version: 8.77
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://cybercom.net/~dcoffin/dcraw
@@ -62,6 +62,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Feb 05 2007 Nils Philippsen <nphilipp at redhat.com> - 8.77-2
+- rebuild with pristine source tarball
+
 * Mon Feb 05 2007 Nils Philippsen <nphilipp at redhat.com> - 8.77-1
 - version 8.77
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Aug 2007 07:53:44 -0000	1.7
+++ sources	14 Sep 2007 21:26:50 -0000	1.8
@@ -1 +1 @@
-001e0754cdf8bc2d514f67567be872ba  dcraw-8.77.tar.gz
+bcf6b477f46b99059f383a93f9f75e05  dcraw-8.77.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:43 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:43 -0400
Subject: rpms/cacti/EL-4 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUhbS014585@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/EL-4

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:02 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:46 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:46 -0400
Subject: rpms/cacti/EL-5 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUkiV014592@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/EL-5

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:05 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:49 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:49 -0400
Subject: rpms/cacti/F-7 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUnp3014599@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/F-7

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:07 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:52 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:52 -0400
Subject: rpms/cacti/FC-6 CVE-2007-3112.patch,NONE,1.1 cacti.spec,1.11,1.12
Message-ID: <200709142130.l8ELUqua014602@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/FC-6

Modified Files:
	cacti.spec 
Added Files:
	CVE-2007-3112.patch 
Log Message:
Release bump because Its friday and I'm stupid

CVE-2007-3112.patch:

--- NEW FILE CVE-2007-3112.patch ---
--- branches/BRANCH_0_8_6/cacti/graph_image.php	2007/03/04 20:17:57	3898
+++ branches/BRANCH_0_8_6/cacti/graph_image.php	2007/06/04 06:41:13	3956
@@ -49,22 +49,22 @@
 $graph_data_array = array();
 
 /* override: graph start time (unix time) */
-if (!empty($_GET["graph_start"])) {
+if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
 	$graph_data_array["graph_start"] = $_GET["graph_start"];
 }
 
 /* override: graph end time (unix time) */
-if (!empty($_GET["graph_end"])) {
+if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
 	$graph_data_array["graph_end"] = $_GET["graph_end"];
 }
 
 /* override: graph height (in pixels) */
-if (!empty($_GET["graph_height"])) {
+if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
 	$graph_data_array["graph_height"] = $_GET["graph_height"];
 }
 
 /* override: graph width (in pixels) */
-if (!empty($_GET["graph_width"])) {
+if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
 	$graph_data_array["graph_width"] = $_GET["graph_width"];
 }
 


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cacti.spec	14 Sep 2007 21:26:10 -0000	1.11
+++ cacti.spec	14 Sep 2007 21:30:20 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:30:55 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 14 Sep 2007 17:30:55 -0400
Subject: rpms/cacti/devel cacti.spec,1.12,1.13
Message-ID: <200709142130.l8ELUtWE014613@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459/devel

Modified Files:
	cacti.spec 
Log Message:
Release bump because Its friday and I'm stupid


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:26:13 -0000	1.12
+++ cacti.spec	14 Sep 2007 21:30:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,7 +105,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-7
+* Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-6



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:10 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:10 -0400
Subject: rpms/python-GnuPGInterface/EL-4 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgACC015717@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:38 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:38 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:14 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:14 -0400
Subject: rpms/python-GnuPGInterface/F-7 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgEq3015727@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:42 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:42 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:12 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:12 -0400
Subject: rpms/python-GnuPGInterface/EL-5 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgC7Z015721@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:40 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:40 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:17 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:17 -0400
Subject: rpms/python-GnuPGInterface/FC-6 python-GnuPGInterface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgHgZ015731@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:45 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:45 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 21:42:19 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 17:42:19 -0400
Subject: rpms/python-GnuPGInterface/devel python-GnuPGInterface.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709142142.l8ELgJCN015735@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-GnuPGInterface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-GnuPGInterface.spec 
Log Message:
Initial import of python-GnuPGInterface


--- NEW FILE python-GnuPGInterface.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname GnuPGInterface

Summary:	A Python module to interface with GnuPG
Name:		python-GnuPGInterface
Version:	0.3.2
Release:	2%{?dist}
License:	LGPLv2+
Group:		Development/Languages
URL:		http://py-gnupg.sourceforge.net/
Source:		http://downloads.sourceforge.net/py-gnupg/%{pkgname}-%{version}.tar.gz
BuildRequires:	python-devel
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GnuPGInterface is a Python module to interface with GnuPG. It
concentrates on interacting with GnuPG via filehandles, providing
access to control GnuPG via versatile and extensible means.

%prep
%setup -q -n %{pkgname}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

# Correct some permissions
chmod 644 ChangeLog COPYING NEWS THANKS

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc ChangeLog COPYING NEWS THANKS
%{python_sitelib}/%{pkgname}.py*

%changelog
* Mon Sep 03 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-2
- Updated source URL to match with the guidelines (#265381)
- Use get_python_lib() macro according to the policy (#265381)

* Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 0.3.2-1
- Upgrade to 0.3.2
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:23:14 -0000	1.1
+++ .cvsignore	14 Sep 2007 21:41:47 -0000	1.2
@@ -0,0 +1 @@
+GnuPGInterface-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-GnuPGInterface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:23:14 -0000	1.1
+++ sources	14 Sep 2007 21:41:47 -0000	1.2
@@ -0,0 +1 @@
+d4627d83446f96bd8c22f8d15db3f7c2  GnuPGInterface-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 14 22:06:07 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:06:07 -0400
Subject: rpms/duplicity/devel .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142206.l8EM67u5025448@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25400

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:05:34 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:27:20 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:05:34 -0000	1.15
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:05:34 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:08:03 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:08:03 -0400
Subject: rpms/duplicity/F-7 .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142208.l8EM83d6025681@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25582

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:07:30 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:27:20 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:07:30 -0000	1.15
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:07:30 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:09:04 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 14 Sep 2007 18:09:04 -0400
Subject: rpms/dbus/devel dbus.spec,1.129,1.130
Message-ID: <200709142209.l8EM942Q025793@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25738

Modified Files:
	dbus.spec 
Log Message:
add bug refs



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- dbus.spec	14 Sep 2007 19:34:38 -0000	1.129
+++ dbus.spec	14 Sep 2007 22:08:30 -0000	1.130
@@ -37,7 +37,9 @@
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=12429
 Patch3: dbus-1.1.2-audit-user.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=12430
 Patch4: dbus-1.1.2-no-abort.patch
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep 14 22:09:45 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:09:45 -0400
Subject: rpms/duplicity/FC-6 .cvsignore, 1.4, 1.5 duplicity.spec, 1.13,
	1.14 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142209.l8EM9jx2025855@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25804

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:09:12 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/duplicity.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- duplicity.spec	7 May 2007 18:29:24 -0000	1.13
+++ duplicity.spec	14 Sep 2007 22:09:12 -0000	1.14
@@ -2,37 +2,32 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-%endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +51,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:09:12 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:12:19 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:12:19 -0400
Subject: rpms/duplicity/EL-5 .cvsignore, 1.4, 1.5 duplicity.spec, 1.14,
	1.15 sources, 1.4, 1.5 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142212.l8EMCJZn026054@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26015

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2006 20:38:00 -0000	1.4
+++ .cvsignore	14 Sep 2007 22:11:46 -0000	1.5
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- duplicity.spec	7 May 2007 18:33:39 -0000	1.14
+++ duplicity.spec	14 Sep 2007 22:11:46 -0000	1.15
@@ -2,37 +2,35 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+%if 0%{?rhel} <= 4
+Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +54,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2006 20:38:00 -0000	1.4
+++ sources	14 Sep 2007 22:11:46 -0000	1.5
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:14:23 2007
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 14 Sep 2007 18:14:23 -0400
Subject: rpms/duplicity/EL-4 .cvsignore, 1.3, 1.4 duplicity.spec, 1.10,
	1.11 sources, 1.3, 1.4 duplicity-0.4.1-timeout.patch, 1.1,
	NONE duplicity-0.4.2-sftp.patch, 1.1, NONE
Message-ID: <200709142214.l8EMENeB026206@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152

Modified Files:
	.cvsignore duplicity.spec sources 
Removed Files:
	duplicity-0.4.1-timeout.patch duplicity-0.4.2-sftp.patch 
Log Message:
- Upgrade to 0.4.3 (#265701)
- Updated the license tag according to the guidelines




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Dec 2006 13:34:43 -0000	1.3
+++ .cvsignore	14 Sep 2007 22:13:50 -0000	1.4
@@ -1 +1 @@
-duplicity-0.4.2.tar.gz
+duplicity-0.4.3.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- duplicity.spec	7 May 2007 18:32:13 -0000	1.10
+++ duplicity.spec	14 Sep 2007 22:13:50 -0000	1.11
@@ -2,37 +2,35 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.4.2
-Release:        7%{?dist}
-License:        GPL
+Version:        0.4.3
+Release:        1%{?dist}
+License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-sftp.patch
-Requires:       gnupg >= 1.0.6
-%if "%{?rhel}" <= "4"
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b
+%if 0%{?rhel} <= 4
+Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6
+BuildRequires:  python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
 tar-format volumes with GnuPG and uploading them to a remote (or
-local) file server. In theory many remote backends are possible;
-right now local, ssh/scp, ftp, and rsync backends are written.
+local) file server. In theory many protocols for connecting to a
+file server could be supported; so far ssh/scp, local file access,
+rsync, ftp, HSI, WebDAV and Amazon S3 have been written.
 
 Because duplicity uses librsync, the incremental archives are space
 efficient and only record the parts of files that have changed since
 the last backup. Currently duplicity supports deleted files, full
-unix permissions, directories, symbolic links, fifos, etc., but not
-hard links.
+unix permissions, directories, symbolic links, fifos, device files,
+but not hard links.
 
 %prep
 %setup -q
-%patch0 -p1 -b .timeout
-%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +54,10 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Sat Sep 15 2007 Robert Scheck <robert at fedoraproject.org> 0.4.3-1
+- Upgrade to 0.4.3 (#265701)
+- Updated the license tag according to the guidelines
+
 * Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 0.4.2-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Dec 2006 13:34:43 -0000	1.3
+++ sources	14 Sep 2007 22:13:50 -0000	1.4
@@ -1 +1 @@
-a9fd4094f23bb36c82cc1dc2816a5b7d  duplicity-0.4.2.tar.gz
+fc615a1bf173fb55c36c502d252583f8  duplicity-0.4.3.tar.gz


--- duplicity-0.4.1-timeout.patch DELETED ---


--- duplicity-0.4.2-sftp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 14 22:45:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 14 Sep 2007 18:45:40 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.13,1.14
Message-ID: <200709142245.l8EMje7s028969@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937

Modified Files:
	rss-glx.spec 
Log Message:
replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7, RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
license is GPLv2
run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rss-glx.spec	3 Sep 2007 14:35:48 -0000	1.13
+++ rss-glx.spec	14 Sep 2007 22:45:06 -0000	1.14
@@ -36,11 +36,14 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9.1%{?dist}
-License: GPL
+Release: 10%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# We ship a tarball with one questionable hack patched out.
+# The original URL is the following without %%patchext:
+# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.8.1-0.8.1.p.diff
@@ -80,10 +83,10 @@
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if %modular_xss
-Requires(post): xscreensaver-base >= 1:5.03-2
-Requires(preun): xscreensaver-base >= 1:5.03-2
+Requires(post): xscreensaver-base >= 1:5.03-3
+Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
-Requires: xscreensaver-base < 1:5.03-2
+Requires: xscreensaver-base < 1:5.03-3
 %endif
 
 %description xscreensaver
@@ -112,7 +115,11 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
-Requires: %{_bindir}/kxsconfig
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -237,13 +244,13 @@
 rm -rf %buildroot
 
 %post xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks
 fi
 
-%preun xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks || :
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -276,6 +283,14 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+  RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
+- license is GPLv2
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+  xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
 * Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
 - implement revamped modular xscreensaver configuration (#200881)
 - require post/preun xscreensaver-base min/max EVR
@@ -289,7 +304,7 @@
 
 * Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
 - build xscreensaver hack description files (#200881)
-- require %{bindir}/kxsconfig (#219106)
+- require %{_bindir}/kxsconfig (#219106)
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sat Sep 15 01:21:51 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 14 Sep 2007 21:21:51 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.51, 1.52 sources, 1.52,
	1.53 sugar.spec, 1.60, 1.61
Message-ID: <200709150121.l8F1Lpag027911@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Sep 2007 16:59:33 -0000	1.51
+++ .cvsignore	15 Sep 2007 01:21:18 -0000	1.52
@@ -1 +1 @@
-sugar-0.65-git0a666e23cf.tar.bz2
+sugar-0.65-git8ef6c57f8b.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	14 Sep 2007 16:59:33 -0000	1.52
+++ sources	15 Sep 2007 01:21:18 -0000	1.53
@@ -1 +1 @@
-24f98c6505d6f626e1806dc0c8311ef8  sugar-0.65-git0a666e23cf.tar.bz2
+51e6b25d6ff96e63533b2a10b0ffdb58  sugar-0.65-git8ef6c57f8b.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sugar.spec	14 Sep 2007 16:59:33 -0000	1.60
+++ sugar.spec	15 Sep 2007 01:21:18 -0000	1.61
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070914git
-%define commitid 0a666e23cf
+%define alphatag 20070915git
+%define commitid 8ef6c57f8b
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.48.%{alphatag}0a666e23cf
+Release: 0.49.%{alphatag}8ef6c57f8b
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
+- New snapshot
+
 * Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.48.20070914git0a666e23cf
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep 15 01:42:44 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:42:44 -0400
Subject: rpms/xscreensaver/F-7 xscreensaver.spec,1.40,1.41
Message-ID: <200709150142.l8F1girD028276@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28241/F-7

Modified Files:
	xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
- Add some comments on update script.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xscreensaver.spec	28 Aug 2007 19:18:45 -0000	1.40
+++ xscreensaver.spec	15 Sep 2007 01:42:12 -0000	1.41
@@ -2,7 +2,13 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%if 0%{?fedora} <= 6
+%define modular_conf  0
+%define fedora_rel    1.1
+%else
+%define modular_conf  1
+%define fedora_rel    4
+%endif
 
 %define extrarel      %{nil}
 
@@ -28,6 +34,7 @@
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+Source10:        update-xscreensaver-hacks
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
@@ -272,6 +279,29 @@
 
 make %{?_smp_mflags}
 
+%if %{modular_conf}
+# Make XScreenSavar.ad modular
+CONFD=xscreensaver
+rm -rf $CONFD
+mkdir $CONFD
+
+# preserve the original adfile
+cp -p driver/XScreenSaver.ad $CONFD
+
+# First split XScreenSaver.ad into 3 parts
+cat driver/XScreenSaver.ad | \
+   sed -n -e '1,/\*programs/p' > $CONFD/XScreenSaver.ad.header
+cat driver/XScreenSaver.ad | sed -e '1,/\*programs/d' | \
+   sed -n -e '1,/\\n$/p' > $CONFD/XScreenSaver.ad.hacks
+cat driver/XScreenSaver.ad | sed -e '1,/\\n$/d' > $CONFD/XScreenSaver.ad.tail
+
+# Seperate XScreenSaver.ad.hacks into each hacks
+cd $CONFD
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
+
+%endif
+
 %install
 archdir=`./config.guess`
 cd $archdir
@@ -323,6 +353,47 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+%if %{modular_conf}
+# install update script
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
+echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
+
+# make hack conf modular
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
+cp -p xscreensaver/XScreenSaver.ad* \
+   $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
+   $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
+
+for adfile in xscreensaver/XScreenSaver.ad.* ; do
+   filen=`basename $adfile`
+   echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
+done
+echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
+echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+   $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+   >> $dd/base.files
+
+# check symlink
+rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+pushd ../../../..
+if [ ! $(pwd) == $RPM_BUILD_ROOT ] ; then
+   echo "Possibly symlink broken"
+   exit 1
+fi
+popd
+popd
+
+ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
+   $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+%endif
+
 # add documents
 pushd $dd &> /dev/null
 for f in README* ; do
@@ -332,7 +403,7 @@
 
 # add directory
 pushd $RPM_BUILD_ROOT
-for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+for dir in `find . -type d | grep xscreensaver` ; do
    echo "%%dir ${dir#.}" >> $dd/base.files
 done
 popd
@@ -414,6 +485,12 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%if %{modular_conf}
+%post base
+%{_sbindir}/update-xscreensaver-hacks
+exit 0
+%endif
+
 %files
 %defattr(-,root,root,-)
 
@@ -433,6 +510,18 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+- Add some comments on update script.
+
+* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
+- Don't split hack part of XScreenSaver.ad into each hack piece
+  and make update script allow multiple hacks in one config file
+  (along with rss-glx, bug 200881)
+- move hack update scripts to %%_sbindir
+
+* Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
+- Try to make XScreenSaver.ad modular (bug 200881)
+
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
 
@@ -441,7 +530,7 @@
   - Don't use include-directory patch anymore
   - Make all xscreensaver related directories owned by -base subpackage
     because now -extras and -gl-extras subpackage require it.
-  - Mark man files as %%doc explicitly, because %_mandir is expanded
+  - Mark man files as %%doc explicitly, because %%_mandir is expanded
     in files list
 - Fix write_long() (actually no_malloc_number_to_string())
 



From fedora-extras-commits at redhat.com  Sat Sep 15 01:42:47 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:42:47 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.2,
	1.3 xscreensaver.spec, 1.46, 1.47
Message-ID: <200709150142.l8F1glHL028280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28241/devel

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
- Add some comments on update script.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update-xscreensaver-hacks	3 Sep 2007 15:24:07 -0000	1.2
+++ update-xscreensaver-hacks	15 Sep 2007 01:42:15 -0000	1.3
@@ -60,7 +60,12 @@
 done
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
-cat $ADDIR/XScreenSaver.ad.header > $tmpfile
+
+echo "! Don't edit this file by yourself!!" > $tmpfile
+echo "! This file will be updated automatically." >> $tmpfile
+echo >> $tmpfile
+
+cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
 
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xscreensaver.spec	3 Sep 2007 15:34:39 -0000	1.46
+++ xscreensaver.spec	15 Sep 2007 01:42:15 -0000	1.47
@@ -2,7 +2,13 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%if 0%{?fedora} <= 6
+%define modular_conf  0
+%define fedora_rel    1.1
+%else
+%define modular_conf  1
+%define fedora_rel    4
+%endif
 
 %define extrarel      %{nil}
 
@@ -16,7 +22,6 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
-%define modular_conf  1
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -505,6 +510,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+- Add some comments on update script.
+
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
 - Don't split hack part of XScreenSaver.ad into each hack piece
   and make update script allow multiple hacks in one config file



From fedora-extras-commits at redhat.com  Sat Sep 15 01:53:36 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:53:36 -0400
Subject: rpms/xscreensaver/F-7 xscreensaver.spec,1.41,1.42
Message-ID: <200709150153.l8F1rajp028514@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28475/F-7

Modified Files:
	xscreensaver.spec 
Log Message:
More comments


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xscreensaver.spec	15 Sep 2007 01:42:12 -0000	1.41
+++ xscreensaver.spec	15 Sep 2007 01:53:04 -0000	1.42
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 %endif
 
 %define extrarel      %{nil}
@@ -510,7 +510,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3



From fedora-extras-commits at redhat.com  Sat Sep 15 01:53:39 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 21:53:39 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.3,
	1.4 xscreensaver.spec, 1.47, 1.48
Message-ID: <200709150153.l8F1rdJc028518@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28475/devel

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
More comments


Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- update-xscreensaver-hacks	15 Sep 2007 01:42:15 -0000	1.3
+++ update-xscreensaver-hacks	15 Sep 2007 01:53:07 -0000	1.4
@@ -61,8 +61,12 @@
 
 tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
 
-echo "! Don't edit this file by yourself!!" > $tmpfile
+echo "! Don't edit this file directly by yourself!!" > $tmpfile
 echo "! This file will be updated automatically." >> $tmpfile
+echo "!" >> $tmpfile
+echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
+echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
+echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
 echo >> $tmpfile
 
 cat $ADDIR/XScreenSaver.ad.header >> $tmpfile


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xscreensaver.spec	15 Sep 2007 01:42:15 -0000	1.47
+++ xscreensaver.spec	15 Sep 2007 01:53:07 -0000	1.48
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 %endif
 
 %define extrarel      %{nil}
@@ -510,7 +510,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 
 * Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3



From fedora-extras-commits at redhat.com  Sat Sep 15 02:08:32 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 14 Sep 2007 22:08:32 -0400
Subject: rpms/xscreensaver/F-7 update-xscreensaver-hacks, NONE,
	1.1 xscreensaver.spec, 1.42, 1.43
Message-ID: <200709150208.l8F28WUo002290@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	xscreensaver.spec 
Added Files:
	update-xscreensaver-hacks 
Log Message:
Again I forgot to add sources. orz


--- NEW FILE update-xscreensaver-hacks ---
#!/bin/bash

_SYSCONFDIR=${sysconfdir:-/etc}
_PREFIX=${prefix:-/usr}
_DATADIR=${datadir:-${_PREFIX}/share}

ADDIR=${ADDIR:-${install_prefix}${_SYSCONFDIR}/xscreensaver}
CONFDIR=${CONFDIR:-${install_prefix}${_DATADIR}/xscreensaver/hacks.conf.d}
ADFILE=${ADFILE:-$ADDIR/XScreenSaver.ad}

fix_hackconf ()
{
	if [ ! -s $1 ] ; then
		echo "$1 is empty" >&2
		echo ""
		return 1
	fi

	tmpconf=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_1=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_2=`mktemp /tmp/hackconf.XXXXXXXX`
	tmpconf_3=`mktemp /tmp/hackconf.XXXXXXXX`
	sed -n -e '$p' $1 > $tmpconf_1
	sed -e '$d' $1 > $tmpconf_2
	for file in $tmpconf_1 $tmpconf_2 ; do
		if ( [ -s $file ] && grep -q '\\n\(\|\\\)[^\\].*$' $file ) ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
	done
	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
	fi
	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
	while [ -s $tmpconf_2 ] ; do
		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
		sed -i -e '1d' $tmpconf_2
		if ! grep -q '\([ \t]\\$\|\\n\\$\)' $tmpconf_3 ; then
			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
			echo ""
			echo "ignoring $1" >&2
			return 1
		fi
		cat $tmpconf_3 >> $tmpconf
	done
	cat $tmpconf_1 >> $tmpconf
	rm -f $tmpconf_1 $tmpconf_2 $tmpconf_3
	echo $tmpconf
	return 0
	
}

for suffix in header tail ; do
	if [ ! -r $ADDIR/XScreenSaver.ad.$suffix ] ; then
		echo "$ADDIR/XScreenSaver.ad.$suffix missing"
		exit 1
	fi
done

tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`

echo "! Don't edit this file directly by yourself!!" > $tmpfile
echo "! This file will be updated automatically." >> $tmpfile
echo "!" >> $tmpfile
echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
echo >> $tmpfile

cat $ADDIR/XScreenSaver.ad.header >> $tmpfile

for hackconf in $CONFDIR/*.conf ; do
	hackconf_fixed=`fix_hackconf $hackconf`
	if [ -n "$hackconf_fixed" ] ; then
		cat $hackconf >> $tmpfile
		rm -f $hackconf_fixed
	fi
done
sed -i -e '$s|\\n\\$|\\n|' $tmpfile

cat $ADDIR/XScreenSaver.ad.tail >> $tmpfile
install -c -p -m 644 $tmpfile $ADFILE
rm -f $tmpfile




Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xscreensaver.spec	15 Sep 2007 01:53:04 -0000	1.42
+++ xscreensaver.spec	15 Sep 2007 02:08:00 -0000	1.43
@@ -28,7 +28,7 @@
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{version}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}
+Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics



From fedora-extras-commits at redhat.com  Sat Sep 15 02:31:26 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Fri, 14 Sep 2007 22:31:26 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, NONE,
	1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709150231.l8F2VQIv002737@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2706

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


eclipse-egit-add-feature.patch:

--- NEW FILE eclipse-egit-add-feature.patch ---
diff -ruN egit.orig/org.spearce.egit/build.properties egit/org.spearce.egit/build.properties
--- egit.orig/org.spearce.egit/build.properties	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/build.properties	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff -ruN egit.orig/org.spearce.egit/feature.xml egit/org.spearce.egit/feature.xml
--- egit.orig/org.spearce.egit/feature.xml	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/feature.xml	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.spearce.egit"
+      label="Eclipse Git Feature"
+      version="0.2.2"
+      provider-name="spearce.org">
+
+   <description>
+      The Eclipse Git plugin allows developers to interact with Git
+      repositories from within Eclipse.
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      GPLv2 EPL
+   </license>
+
+   <plugin
+         id="org.spearce.egit.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.jgit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -ruN egit.orig/org.spearce.egit/.project egit/org.spearce.egit/.project
--- egit.orig/org.spearce.egit/.project	1969-12-31 19:00:00.000000000 -0500
+++ egit/org.spearce.egit/.project	2007-08-30 12:33:14.000000000 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>


--- NEW FILE eclipse-egit.spec ---

%define gcj_support     1

Summary:          Eclipse Git plug-in
Name:             eclipse-egit
Version:          0.2.2
Release:          0.git20070826%{?dist}
License:          EPL GPLv2
URL:              http://repo.or.cz/w/egit.git
Group:            Development/Tools

# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=522c3046b3b7e4af1a13ca17912e0bfe8b0983e4;sf=tgz
Source0:          egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
Patch0:           %{name}-add-feature.patch

Requires:         eclipse-platform > 1:3.3.0
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.1.2
BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
Requires(post):   java-1.5.0-gcj >= 1.5.0
Requires(postun): java-1.5.0-gcj >= 1.5.0
%else
BuildRequires:    java-devel >= 1.6.0
%endif

BuildRequires:    eclipse-pde
BuildRequires:    jpackage-utils >= 0:1.5

%if %{gcj_support}
%else
BuildArch:        noarch
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The eclipse-egit package contains Eclipse plugins for
interacting with Git repositories.

%prep
%setup -q -c 
%patch0 -p0

%build
# Copy the SDK for build
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

# build the main egit feature
java -cp $SDK/startup.jar                              \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=feature                                    \
     -Did=org.spearce.egit                             \
     -DbaseLocation=$SDK                               \
     -DjavacSource=1.5  -DjavacTarget=1.5              \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse

# egit main feature
unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
            build/rpmBuild/org.spearce.egit.zip

%if %{gcj_support}
aot-compile-rpm
%endif

%clean 
rm -rf $RPM_BUILD_ROOT

%if %{gcj_support}
%post -p /usr/bin/rebuild-gcj-db
%postun -p /usr/bin/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_datadir}/eclipse/features/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit.core*
%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
%{_datadir}/eclipse/plugins/org.spearce.jgit*
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif

%changelog
* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:27:08 -0000	1.1
+++ .cvsignore	15 Sep 2007 02:30:53 -0000	1.2
@@ -0,0 +1 @@
+egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:27:08 -0000	1.1
+++ sources	15 Sep 2007 02:30:53 -0000	1.2
@@ -0,0 +1 @@
+fbbbb7b7366d5a9f397f521837fe3e19  egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 07:13:59 2007
From: fedora-extras-commits at redhat.com (Navid Sheikhol-Eslami (navid))
Date: Sat, 15 Sep 2007 03:13:59 -0400
Subject: rpms/sos/devel sos.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709150713.l8F7Dxdk004291@cvs-int.fedora.redhat.com>

Author: navid

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4262/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sos.spec 
Log Message:
initial cvs import of sos project



--- NEW FILE sos.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define name sos
%define version 1.6
%define release 5
%define topdir build/rpm-%{name}-%{version}

Summary: A set of tools to gather troubleshooting information from a system
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
# The source for this package was pulled from upstream's svn.  Use the
# following commands to generate the tarball:
#  svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-6 sos-1.6
#  tar -czvf sos-1.6.tar.gz sos-1.6
Source0: %{name}-%{version}.tar.gz
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://sos.108.redhat.com/
BuildRequires: python-devel

%description
Sos is a set of tools that gathers information about system
hardware and configuration. The information can then be used for
diagnostic purposes and debugging. Sos is commonly used to help
support technicians and developers.

%prep
%setup -q

%build
python setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%{_sbindir}/sosreport
%{python_sitelib}/sos/
%{_mandir}/man1/sosreport.1*
%doc README TODO LICENSE ChangeLog

%changelog
* Mon Jul  5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-5
- Yet more fixes to make package Fedora compliant.

* Mon Jul  5 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-4
- More fixes to make package Fedora compliant.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-3
- Other fixes to make package Fedora compliant.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-2
- Minor fixes.

* Mon Jul  2 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.6-1
- Beautified output of --list-plugins.
- GPL licence is now included in the package.
- added python-devel requirement for building package
- fixed incompatibility with python from RHEL4

* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.5-1
- Bumped version

* Fri May 25 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-2
- Fixed a backtrace on nonexistent file in kernel plugin (thanks, David Robinson)

* Mon Apr 30 2007 Steve Conklin <sconklin at redhat dot com> - 1.4-1
- Fixed an error in option handling
- Forced the file generated by traceroute to not end in .com
- Fixed a problem with manpage
- Added optional traceroute collection to networking plugin
- Added clalance's patch to gather iptables info.
- Fixes to the device-mapper plugin
- Fixed a problem with installation of man page

* Mon Apr 16 2007 Steve Conklin <sconklin at redhat dot com> - 1.3-3
- including patches to fix the following:
- Resolves: bz219745 sosreport needs a man page
- Resolves: bz219667 sosreport does not terminate cleanly on ^C
- Resolves: bz233375 Make SOS flag the situation when running on a fully virtu...
- Resolves: bz234873 rhel5 sos needs to include rpm-va by default
- Resolves: bz219669 sosreport multi-threaded option sometimes fails
- Resolves: bz219671 RFE for sosreport - allow specification of plugins to be run
- Resolves: bz219672 RFE - show progress while sosreport is running
- Resolves: bz219673 Add xen information gathering to sosreport
- Resolves: bz219675 Collect information related to the new driver update model
- Resolves: bz219877 'Cancel' button during option selection only cancels sele...

* Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 1.3-2
- Add man page

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.3-1
- really fixed bz_219654

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.2-1
- fixed a build problem

* Fri Dec 15 2006 Steve Conklin <sconklin at redhat dot com> - 1.1-1
- Tighten permissions of tmp directory so only readable by creator bz_219657
- Don't print message 'Problem at path ...'  bz_219654
- Removed useless message bz_219670
- Preserve file modification times bz_219674
- Removed unneeded message about files on copyProhibitedList bz_219712

* Wed Aug 30 2006 Steve Conklin <sconklin at redhat dot com> - 1.0-1
- Seperated upstream and RPM versioning

* Mon Aug 21 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-11
- Code cleanup, fixed a regression in threading

* Mon Aug 14 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-10
- minor bugfixes, added miltithreading option, setup now quiet

* Mon Jul 17 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-9
- migrated to svn on 108.redhat.com, fixed a problem with command output linking in report

* Mon Jun 19 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-6
- Added LICENSE file containing GPL

* Wed May 31 2006 Steve Conklin <sconklin at redhat dot com> - 0.1-5
- Added fixes to network plugin and prepped for Fedora submission

* Wed May 31 2006 John Berninger <jwb at redhat dot com> - 0.1-4
- Reconsolidated subpackages into one package per discussion with sconklin

* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-3
- Added ftp, ldap, mail, named, samba, squid SOS plugins
- Fixed various errors in kernel and hardware plugins

* Mon May 22 2006 John Benringer <jwb at redhat dot com> - 0.1-2
- split off cluster plugin into subpackage
- correct file payload lists

* Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-1
- initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Jul 2007 16:43:41 -0000	1.1
+++ .cvsignore	15 Sep 2007 07:13:26 -0000	1.2
@@ -0,0 +1 @@
+sos-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Jul 2007 16:43:41 -0000	1.1
+++ sources	15 Sep 2007 07:13:26 -0000	1.2
@@ -0,0 +1 @@
+fb195dd86f020159eb1da86cf48bb3f2  sos-1.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 08:08:47 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 15 Sep 2007 04:08:47 -0400
Subject: rpms/gcc/F-7 gcc41-builtin-va-arg-pack-len.patch, NONE,
	1.1 gcc41-pr27954.patch, NONE, 1.1 gcc41.spec, 1.164, 1.165
Message-ID: <200709150808.l8F88lW3011542@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11514

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-builtin-va-arg-pack-len.patch gcc41-pr27954.patch 
Log Message:
4.1.2-23.fc7

gcc41-builtin-va-arg-pack-len.patch:

--- NEW FILE gcc41-builtin-va-arg-pack-len.patch ---
2007-09-11  Jakub Jelinek  <jakub at redhat.com>

	* builtins.def (BUILT_IN_VA_ARG_PACK_LEN): New builtin.
	* builtins.c (expand_builtin) <case BUILT_IN_VA_ARG_PACK_LEN>: Issue
	error if __builtin_va_arg_pack_len () wasn't optimized out during
	inlining.
	* tree-inline.c (copy_bb): Replace __builtin_va_arg_pack_len ()
	with the number of inline's anonymous arguments.
	* doc/extend.texi: Document __builtin_va_arg_pack_len ().

	* gcc.dg/va-arg-pack-len-1.c: New test.
	* g++.dg/va-arg-pack-len-1.C: New test.

--- gcc/builtins.def.jj	2007-09-06 10:19:24.000000000 +0200
+++ gcc/builtins.def	2007-09-14 21:07:41.000000000 +0200
@@ -666,6 +666,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY
 DEF_GCC_BUILTIN        (BUILT_IN_VA_END, "va_end", BT_FN_VOID_VALIST_REF, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_START, "va_start", BT_FN_VOID_VALIST_REF_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK, "va_arg_pack", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_VA_ARG_PACK_LEN, "va_arg_pack_len", BT_FN_INT, ATTR_PURE_NOTHROW_LIST)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
--- gcc/builtins.c.jj	2007-09-06 11:04:56.000000000 +0200
+++ gcc/builtins.c	2007-09-14 21:07:41.000000000 +0200
@@ -5985,6 +5985,12 @@ expand_builtin (tree exp, rtx target, rt
       error ("invalid use of %<__builtin_va_arg_pack ()%>");
       return const0_rtx;
 
+    case BUILT_IN_VA_ARG_PACK_LEN:
+      /* All valid uses of __builtin_va_arg_pack_len () are removed during
+	 inlining.  */
+      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      return const0_rtx;
+
       /* Return the address of the first anonymous stack arg.  */
     case BUILT_IN_NEXT_ARG:
       if (fold_builtin_next_arg (arglist))
--- gcc/tree-inline.c.jj	2007-09-06 12:35:57.000000000 +0200
+++ gcc/tree-inline.c	2007-09-14 21:22:48.000000000 +0200
@@ -741,6 +741,37 @@ copy_bb (copy_body_data *id, basic_block
 	      *a = copy_list (arglist);
 	      CALL_EXPR_VA_ARG_PACK (call) = 0;
 	    }
+	  else if (call
+		   && id->call_expr
+		   && (decl = get_callee_fndecl (call))
+		   && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL
+		   && DECL_FUNCTION_CODE (decl)
+		      == BUILT_IN_VA_ARG_PACK_LEN)
+	    {
+	      /* __builtin_va_arg_pack_len () should be replaced by
+		 the number of anonymous arguments.  */
+	      int nargs;
+	      tree count, *call_ptr, p, a;
+
+	      a = TREE_OPERAND (id->call_expr, 1);
+	      for (p = DECL_ARGUMENTS (id->src_fn); p; p = TREE_CHAIN (p))
+		a = TREE_CHAIN (a);
+
+              for (nargs = 0; a; a = TREE_CHAIN (a))
+		nargs++;
+
+	      count = build_int_cst (integer_type_node, nargs);
+	      call_ptr = &stmt;
+	      if (TREE_CODE (*call_ptr) == MODIFY_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 1);
+	      if (TREE_CODE (*call_ptr) == WITH_SIZE_EXPR)
+		call_ptr = &TREE_OPERAND (*call_ptr, 0);
+	      gcc_assert (*call_ptr == call && call_ptr != &stmt);
+	      *call_ptr = count;
+	      update_stmt (stmt);
+	      call = NULL_TREE;
+	    }
+
 	  /* We're duplicating a CALL_EXPR.  Find any corresponding
 	     callgraph edges and update or duplicate them.  */
 	  if (call && (decl = get_callee_fndecl (call)))
--- gcc/doc/extend.texi.jj	2007-09-06 10:19:25.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-14 21:07:41.000000000 +0200
@@ -578,6 +578,41 @@ myprintf (FILE *f, const char *format, .
 @end smallexample
 @end deftypefn
 
+ at deftypefn {Built-in Function} __builtin_va_arg_pack_len ()
+This built-in function returns the number of anonymous arguments of
+an inline function.  It can be used only in inline functions which
+will be always inlined, never compiled as a separate function, such
+as those using @code{__attribute__ ((__always_inline__))} or
+ at code{__attribute__ ((__gnu_inline__))} extern inline functions.
+For example following will do link or runtime checking of open
+arguments for optimized code:
+ at smallexample
+#ifdef __OPTIMIZE__
+extern inline __attribute__((__gnu_inline__)) int
+myopen (const char *path, int oflag, ...)
+@{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    @{
+      if ((oflag & O_CREAT) != 0 && __builtin_va_arg_pack_len () < 1)
+        @{
+          warn_open_missing_mode ();
+          return __open_2 (path, oflag);
+        @}
+      return open (path, oflag, __builtin_va_arg_pack ());
+    @}
+    
+  if (__builtin_va_arg_pack_len () < 1)
+    return __open_2 (path, oflag);
+
+  return open (path, oflag, __builtin_va_arg_pack ());
+@}
+#endif
+ at end smallexample
+ at end deftypefn
+
 @node Typeof
 @section Referring to a Type with @code{typeof}
 @findex typeof
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int warn_open_missing_mode (void);
+extern int warn_open_too_many_arguments (void);
+extern void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      /* In real __open_2 this would terminate the program:
+	 open with O_CREAT without third argument.  */
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  /* Invalid use of myopen, but only detectable at runtime.  */
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-14 21:07:41.000000000 +0200
@@ -0,0 +1,120 @@
+// { dg-do run }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern "C" int warn_open_missing_mode (void);
+extern "C" int warn_open_too_many_arguments (void);
+extern "C" void abort (void);
+
+char expected_char;
+
+__attribute__((noinline)) int
+myopen2 (const char *path, int oflag)
+{
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'f':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'g':
+      if (oflag != 0x43)
+	abort ();
+      // In real __open_2 this would terminate the program:
+      // open with O_CREAT without third argument.
+      return -6;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+__attribute__((noinline)) int
+myopenva (const char *path, int oflag, ...)
+{
+  int mode = 0;
+  va_list ap;
+  if ((oflag & 0x40) != 0)
+    {
+      va_start (ap, oflag);
+      mode = va_arg (ap, int);
+      va_end (ap);
+    }
+  if (expected_char++ != path[0] || path[1] != '\0')
+    abort ();
+  switch (path[0])
+    {
+    case 'a':
+      if (oflag != 0x43 || mode != 0644)
+	abort ();
+      break;
+    case 'b':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    case 'c':
+      if (oflag != 0x2)
+	abort ();
+      break;
+    case 'd':
+      if (oflag != 0x43 || mode != 0600)
+	abort ();
+      break;
+    case 'e':
+      if (oflag != 0x3)
+	abort ();
+      break;
+    default:
+      abort ();
+    }
+  return 0;
+}
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  warn_open_missing_mode ();
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+volatile int l0;
+
+int
+main (void)
+{
+  expected_char = 'a';
+  if (myopen ("a", 0x43, 0644))
+    abort ();
+  if (myopen ("b", 0x3, 0755))
+    abort ();
+  if (myopen ("c", 0x2))
+    abort ();
+  if (myopen ("d", l0 + 0x43, 0600))
+    abort ();
+  if (myopen ("e", l0 + 0x3, 0700))
+    abort ();
+  if (myopen ("f", l0 + 0x2))
+    abort ();
+  // Invalid use of myopen, but only detectable at runtime.
+  if (myopen ("g", l0 + 0x43) != -6)
+    abort ();
+  return 0;
+}

gcc41-pr27954.patch:

--- NEW FILE gcc41-pr27954.patch ---
2006-10-27  Jerry DeLisle  <jvdelisle at gcc.gnu.org>

	PR fortran/27954
	* decl.c (gfc_free_data_all): New function to free all data structures
	after errors in DATA statements and declarations.
	(top_var_list): Use new function.(top_val_list): Use new function.
	(gfc_match_data_decl): Use new function.

	PR libgfortran/27954
	* gfortran.dg/error_recovery_2.f90: New test.

--- gcc/fortran/decl.c	(revision 118083)
+++ gcc/fortran/decl.c	(revision 118086)
@@ -128,6 +128,21 @@ gfc_free_data (gfc_data * p)
 }
 
 
+/* Free all data in a namespace.  */
+static void
+gfc_free_data_all (gfc_namespace * ns)
+{
+  gfc_data *d;
+
+  for (;ns->data;)
+    {
+      d = ns->data->next;
+      gfc_free (ns->data);
+      ns->data = d;
+    }
+}
+
+
 static match var_element (gfc_data_variable *);
 
 /* Match a list of variables terminated by an iterator and a right
@@ -262,6 +277,7 @@ top_var_list (gfc_data * d)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -374,6 +390,7 @@ top_val_list (gfc_data * data)
 
 syntax:
   gfc_syntax_error (ST_DATA);
+  gfc_free_data_all (gfc_current_ns);
   return MATCH_ERROR;
 }
 
@@ -2368,6 +2385,8 @@ ok:
   gfc_error ("Syntax error in data declaration at %C");
   m = MATCH_ERROR;
 
+  gfc_free_data_all (gfc_current_ns);
+
 cleanup:
   gfc_free_array_spec (current_as);
   current_as = NULL;
--- gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/error_recovery_2.f90	(revision 118086)
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! PR27954 Internal compiler error on bad statements
+! Derived from test case submitted in PR.
+subroutine bad1
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+end subroutine bad1
+
+subroutine bad2
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case."
+end subroutine bad2
+
+subroutine bad3
+  implicit none
+  character*20 :: y, x 00  ! { dg-error "Syntax error" }
+  data  y /'abcdef'/, x /'jbnhjk'/ pp  ! { dg-error "Syntax error" }
+  print *, "basket case that segfaults without patch."
+end subroutine bad3
+


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gcc41.spec	7 Sep 2007 07:13:59 -0000	1.164
+++ gcc41.spec	15 Sep 2007 08:08:15 -0000	1.165
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 22
+%define gcc_release 23
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -148,6 +148,8 @@
 Patch34: gcc41-builtin-chk-anticipated.patch
 Patch35: gcc41-builtin-throw.patch
 Patch36: gcc41-builtin-va-arg-pack.patch
+Patch37: gcc41-builtin-va-arg-pack-len.patch
+Patch38: gcc41-pr27954.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -467,6 +469,8 @@
 %patch34 -p0 -b .builtin-chk-anticipated~
 %patch35 -p0 -b .builtin-throw~
 %patch36 -p0 -b .builtin-va-arg-pack~
+%patch37 -p0 -b .builtin-va-arg-pack-len~
+%patch38 -p0 -b .pr27954~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1621,6 +1625,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23.fc7
+- backport __builtin_va_arg_pack_len () support
+- fix Fortran error recovery with DATA (Jerry DeLisle, #281331,
+  PR fortran/27954)
+
 * Fri Sep  7 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-22.fc7
 - fix __builtin_va_arg_pack () support for C++
 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:13 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:13 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MD1o025080@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 1 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:17 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MH5s013735@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 3 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:16 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MH41013728@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 2 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:21 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MMiG025109@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 4 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:23 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MNrE025123@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 5 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:26 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MQYQ013769@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 6 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:22:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:22:29 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150822.l8F8MTTr013784@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Red Hat Linux 9 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:24:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:24:35 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150824.l8F8OZwU025590@app4.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora devel was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:24:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 15 Sep 2007 01:24:37 -0700
Subject: [pkgdb] gkrellm-themes Orphaned
Message-ID: <200709150824.l8F8Obso014245@app3.fedora.phx.redhat.com>

Package gkrellm-themes in Fedora 7 was orphaned by Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gkrellm-themes



From fedora-extras-commits at redhat.com  Sat Sep 15 08:25:40 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:25:40 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.14,1.15
Message-ID: <200709150825.l8F8Pebo011961@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11940

Modified Files:
	rss-glx.spec 
Log Message:
enable modular xscreensaver support for Fedora 7 and later (#200881)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rss-glx.spec	14 Sep 2007 22:45:06 -0000	1.14
+++ rss-glx.spec	15 Sep 2007 08:25:08 -0000	1.15
@@ -17,7 +17,7 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
-%if "%{fedora}" >= "8"
+%if "%{fedora}" >= "7"
 %define modular_xss 0%{?!_without_modular_xss:1}
 %else
 %define modular_xss 0%{?_with_modular_xss:1}
@@ -36,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -283,6 +283,9 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
+- enable modular xscreensaver support for Fedora 7 and later (#200881)
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
   RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:32:03 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:32:03 -0400
Subject: rpms/rss-glx/F-7 rss-glx.spec,1.8,1.9
Message-ID: <200709150832.l8F8W3pC012139@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052

Modified Files:
	rss-glx.spec 
Log Message:
enable modular xscreensaver support for Fedora 7 and later (#200881)
replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7, RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
license is GPLv2
run %{_sbindir}/update-xscreensaver-hacks in %post, %postun, require xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail
Buildrequire gawk.
build xscreensaver hack description files (#200881)
require %{_bindir}/kxsconfig (#219106)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss-glx.spec	28 Aug 2006 13:54:50 -0000	1.8
+++ rss-glx.spec	15 Sep 2007 08:31:31 -0000	1.9
@@ -1,4 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %define xssbindir %{_libexecdir}/xscreensaver
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
@@ -16,9 +17,15 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
+%if "%{fedora}" >= "7"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
+%define modular_xss 0%{?!_without_modular_xss:1}
 %define gss 0%{?!_without_gss:1}
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
@@ -29,11 +36,14 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 6%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# We ship a tarball with one questionable hack patched out.
+# The original URL is the following without %%patchext:
+# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.8.1-0.8.1.p.diff
@@ -42,11 +52,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
 %if %with_matrixview
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
+%if %modular_x
+BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -58,6 +68,7 @@
 BuildRequires: freealut-devel
 BuildRequires: autoconf
 BuildRequires: libtool
+BuildRequires: gawk
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -71,7 +82,12 @@
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %modular_xss
+Requires(post): xscreensaver-base >= 1:5.03-3
+Requires(postun): xscreensaver-base >= 1:5.03-3
+%else
+Requires: xscreensaver-base < 1:5.03-3
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -99,6 +115,11 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -175,7 +196,11 @@
         awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop"
         rm -f "${trycmd}.desktop.orig"
         popd >& /dev/null
-        # symlinks for XScreenSaver
+        # external hacks description and symlinks for XScreenSaver
+        cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+GL:     "${name}" \\
+        ${cmd} -r \\n\\
+EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
 }
@@ -188,6 +213,7 @@
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
 mkdir -p %{buildroot}%{xssbindir}
+mkdir -p %{buildroot}%{xssexthacksconfdir}
 %endif
 cat << EOF | generate_fix_desktop_files_links
 BioF??biof??This is an attempt to recreate some of the work of William Latham.
@@ -217,6 +243,16 @@
 %clean
 rm -rf %buildroot
 
+%post xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks
+fi
+
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks || :
+fi
+
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL README README.xscreensaver
@@ -226,6 +262,8 @@
 
 %files xscreensaver
 %defattr(-, root, root)
+# xscreensaver-base provides %{xssexthacksconfdir}
+%config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
 %{xssbindir}/*
@@ -245,6 +283,32 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
+- enable modular xscreensaver support for Fedora 7 and later (#200881)
+
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+  RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
+- license is GPLv2
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+  xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
+- Buildrequire gawk.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-8
+- Rebuild for selinux ppc32 issue.
+
+* Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
+- build xscreensaver hack description files (#200881)
+- require %{_bindir}/kxsconfig (#219106)
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sat Sep 15 08:35:41 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:35:41 -0400
Subject: rpms/rss-glx/devel rss-glx.spec,1.15,1.16
Message-ID: <200709150835.l8F8Zfok012217@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12167

Modified Files:
	rss-glx.spec 
Log Message:
include %post/%postun scripts only with modular xscreensaver support



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rss-glx.spec	15 Sep 2007 08:25:08 -0000	1.15
+++ rss-glx.spec	15 Sep 2007 08:35:08 -0000	1.16
@@ -147,6 +147,11 @@
 %else
 - without matrixview hack
 %endif
+%if %modular_xss
+- with modular xscreensaver support
+%else
+- without modular xscreensaver support
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -243,6 +248,7 @@
 %clean
 rm -rf %buildroot
 
+%if %modular_xss
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks
@@ -252,6 +258,7 @@
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks || :
 fi
+%endif
 
 %files
 %defattr(-, root, root)
@@ -285,6 +292,7 @@
 %changelog
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
 - enable modular xscreensaver support for Fedora 7 and later (#200881)
+- include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,



From fedora-extras-commits at redhat.com  Sat Sep 15 08:36:07 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 04:36:07 -0400
Subject: rpms/rss-glx/F-7 rss-glx.spec,1.9,1.10
Message-ID: <200709150836.l8F8a7cn012294@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12199

Modified Files:
	rss-glx.spec 
Log Message:
include %post/%postun scripts only with modular xscreensaver support



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rss-glx.spec	15 Sep 2007 08:31:31 -0000	1.9
+++ rss-glx.spec	15 Sep 2007 08:35:35 -0000	1.10
@@ -147,6 +147,11 @@
 %else
 - without matrixview hack
 %endif
+%if %modular_xss
+- with modular xscreensaver support
+%else
+- without modular xscreensaver support
+%endif
 
 EOF
 %setup -q -n rss-glx_%{version}
@@ -243,6 +248,7 @@
 %clean
 rm -rf %buildroot
 
+%if %modular_xss
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks
@@ -252,6 +258,7 @@
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
     %{_sbindir}/update-xscreensaver-hacks || :
 fi
+%endif
 
 %files
 %defattr(-, root, root)
@@ -285,6 +292,7 @@
 %changelog
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
 - enable modular xscreensaver support for Fedora 7 and later (#200881)
+- include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
 - replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,



From fedora-extras-commits at redhat.com  Sat Sep 15 10:43:13 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:43:13 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.67, 1.68 sources, 1.71, 
	1.72 system-config-date.spec, 1.77, 1.78
Message-ID: <200709151043.l8FAhDR7026846@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26801

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
pick up updated translations
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	27 Aug 2007 14:37:20 -0000	1.67
+++ .cvsignore	15 Sep 2007 10:42:40 -0000	1.68
@@ -1 +1 @@
-system-config-date-1.9.7.tar.bz2
+system-config-date-1.9.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	27 Aug 2007 14:37:20 -0000	1.71
+++ sources	15 Sep 2007 10:42:40 -0000	1.72
@@ -1 +1 @@
-8e77157a0581f0387e417d33d4b0abbf  system-config-date-1.9.7.tar.bz2
+4d58698983ec95318faa6a5e9f1b75da  system-config-date-1.9.8.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- system-config-date.spec	27 Aug 2007 14:37:20 -0000	1.77
+++ system-config-date.spec	15 Sep 2007 10:42:40 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.7
+Version: 1.9.8
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPLv2+
@@ -100,6 +100,12 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.8
+- pick up updated translations
+
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
+- make use of force tagging (since mercurial 0.9.4)
+
 * Mon Aug 27 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.7
 - replace "timezone" by "time zone" where visible (#253428)
 - updated translations (#253829)



From fedora-extras-commits at redhat.com  Sat Sep 15 10:43:22 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:43:22 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47 system-config-samba.spec, 1.50, 1.51
Message-ID: <200709151043.l8FAhMEs026889@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	10 Sep 2007 07:36:56 -0000	1.45
+++ .cvsignore	15 Sep 2007 10:42:50 -0000	1.46
@@ -1 +1 @@
-system-config-samba-1.2.51.tar.bz2
+system-config-samba-1.2.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	10 Sep 2007 07:36:56 -0000	1.46
+++ sources	15 Sep 2007 10:42:50 -0000	1.47
@@ -1 +1 @@
-2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2
+f8f645cc3f41eb82df750d0d52023b43  system-config-samba-1.2.52.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-samba.spec	10 Sep 2007 07:36:56 -0000	1.50
+++ system-config-samba.spec	15 Sep 2007 10:42:50 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.51
+Version: 1.2.52
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52
+- pick up updated translations
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
 - update Polish, Serbian translations
 - $RPM_BUILD_ROOT -> %%{buildroot}



From fedora-extras-commits at redhat.com  Sat Sep 15 10:46:58 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 03:46:58 -0700
Subject: [pkgdb] rusers: steved has requested commit
Message-ID: <200709151046.l8FAkwU0013866@app3.fedora.phx.redhat.com>

Steve Dickson (steved) has requested the commit acl on rusers (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rusers



From fedora-extras-commits at redhat.com  Sat Sep 15 10:47:12 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 03:47:12 -0700
Subject: [pkgdb] rusers: steved has requested commit
Message-ID: <200709151047.l8FAlCQa025097@app4.fedora.phx.redhat.com>

Steve Dickson (steved) has requested the commit acl on rusers (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rusers



From fedora-extras-commits at redhat.com  Sat Sep 15 10:49:00 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 06:49:00 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.53, 1.54 sources, 1.57,
	1.58 system-config-users.spec, 1.62, 1.63
Message-ID: <200709151049.l8FAn03C027052@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27013

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
pick up updated translations
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	18 Aug 2007 09:08:02 -0000	1.53
+++ .cvsignore	15 Sep 2007 10:48:27 -0000	1.54
@@ -1 +1 @@
-system-config-users-1.2.65.tar.bz2
+system-config-users-1.2.66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	18 Aug 2007 09:08:02 -0000	1.57
+++ sources	15 Sep 2007 10:48:27 -0000	1.58
@@ -1 +1 @@
-2da93ec6158cda312371c15697ae9588  system-config-users-1.2.65.tar.bz2
+04bfb7a789afbf244f0e379f7e982d1c  system-config-users-1.2.66.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- system-config-users.spec	18 Aug 2007 09:08:02 -0000	1.62
+++ system-config-users.spec	15 Sep 2007 10:48:27 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.65
+Version: 1.2.66
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,12 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.66
+- pick up updated translations
+
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
+- make use of force tagging (since mercurial 0.9.4)
+
 * Sat Aug 18 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.65
 - avoid more duplicate shortcuts (#253319)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 10:51:22 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Sep 2007 06:51:22 -0400
Subject: rpms/ogre/devel .cvsignore, 1.6, 1.7 ogre.spec, 1.13, 1.14 sources, 
	1.6, 1.7 ogre-1.2.5-ppc64.patch, 1.1, NONE
Message-ID: <200709151051.l8FApMDB027140@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118

Modified Files:
	.cvsignore ogre.spec sources 
Removed Files:
	ogre-1.2.5-ppc64.patch 
Log Message:
* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.4-1
- New upstream release 1.4.4 (bz 291481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jul 2007 20:26:43 -0000	1.6
+++ .cvsignore	15 Sep 2007 10:50:49 -0000	1.7
@@ -1 +1 @@
-ogre-linux-osx-v1-4-2.tar.bz2
+ogre-linux_osx-v1-4-4.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ogre.spec	15 Aug 2007 08:37:54 -0000	1.13
+++ ogre.spec	15 Sep 2007 10:50:49 -0000	1.14
@@ -1,14 +1,13 @@
 Name:           ogre
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://downloads.sourceforge.net/ogre/ogre-linux-osx-v%(echo %{version} | tr . -).tar.bz2
+Source0:        http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.2.5-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -60,14 +59,16 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .ppc64
-# Don't try to build SSE optimised code on ppc64
-sed -i 's/\tpowerpc)$/\tpowerpc|powerpc64)/g' configure
+# building ogre while ogre-devel is installed results in binaries getting
+# linked against the installed version, instead of the just build one <sigh>
+if [ -f /usr/include/OGRE/Ogre.h ]; then
+  echo "Error building ogre while ogre-devel is installed does not work!"
+  exit 1
+fi
 # stop some CVS stuff from getting installed
-rm -r `find Docs Samples/Media -name CVS` 'Docs/manual/.#manual_16.html.1.47' \
-  Docs/manual/manual_16.html.rej
+rm -r `find Docs Samples/Media -name CVS`
 # fix line-endings of Docs
-sed -i 's/\r//g' Docs/manual/*.html
+sed -i 's/\r//g' Docs/ChangeLog.html Docs/manual/*.html
 # 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
@@ -80,6 +81,17 @@
   Samples/Media/gui/TaharezLook.looknfeel \
   Samples/Media/gui/Falagard.xsd \
   Samples/Media/materials/scripts/Example-DynTex.material
+# create a clean version of the api docs for %%doc
+mkdir api
+cp Docs/api/html/*.html Docs/api/html/*.gif Docs/api/html/*.png \
+  Docs/api/html/*.css api
+for i in api/OgreParticleEmitter_8h-source.html \
+         api/classOgre_1_1ParticleSystem.html \
+         api/classOgre_1_1DynLib.html \
+         api/classOgre_1_1ParticleEmitter.html; do
+  iconv -f ISO_8859-2 -t UTF8 $i > api/tmp
+  mv api/tmp $i
+done
 
 
 %build
@@ -144,7 +156,7 @@
 
 %files devel-doc
 %defattr(-,root,root,-)
-%doc LINUX.DEV Docs/api Docs/manual Docs/vbo-update Docs/style.css
+%doc LINUX.DEV api Docs/manual Docs/vbo-update Docs/style.css
 
 %files samples
 %defattr(-,root,root)
@@ -154,6 +166,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.4-1
+- New upstream release 1.4.4 (bz 291481)
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.2-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jul 2007 20:26:43 -0000	1.6
+++ sources	15 Sep 2007 10:50:49 -0000	1.7
@@ -1 +1 @@
-52eea0cf5fc659d9ca63491348e0e0ec  ogre-linux-osx-v1-4-2.tar.bz2
+456b75d21bc09d9cee937e3ccf9fbced  ogre-linux_osx-v1-4-4.tar.bz2


--- ogre-1.2.5-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 10:53:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Sep 2007 06:53:59 -0400
Subject: rpms/chess/devel chess.spec,1.10,1.11
Message-ID: <200709151053.l8FArxHU027302@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27279

Modified Files:
	chess.spec 
Log Message:
* Sat Sep 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-9
- Rebuild for new ogre



Index: chess.spec
===================================================================
RCS file: /cvs/extras/rpms/chess/devel/chess.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- chess.spec	21 Aug 2007 20:48:23 -0000	1.10
+++ chess.spec	15 Sep 2007 10:53:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           chess
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        3D chess game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-9
+- Rebuild for new ogre
+
 * Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-8
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Sat Sep 15 11:46:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 15 Sep 2007 07:46:59 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.9,1.10
Message-ID: <200709151146.l8FBkx1Q001621@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1589

Modified Files:
	zabbix.spec 
Log Message:
* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Add a patch required for finding net-snmp libs on x86_64



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	11 Sep 2007 05:37:14 -0000	1.9
+++ zabbix.spec	15 Sep 2007 11:46:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-netsnmp-x86_64.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +78,9 @@
 
 %prep
 %setup -q
+%ifarch x86_64
+%patch0
+%endif
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,9 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Add a patch required for finding net-snmp libs on x86_64
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 - built without WWW monitoring support due old libcurl



From fedora-extras-commits at redhat.com  Sat Sep 15 11:47:44 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 15 Sep 2007 07:47:44 -0400
Subject: rpms/zabbix/EL-4 zabbix-1.4.2-netsnmp-x86_64.patch,NONE,1.1
Message-ID: <200709151147.l8FBliKJ001644@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1632

Added Files:
	zabbix-1.4.2-netsnmp-x86_64.patch 
Log Message:
* Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Add a patch required for finding net-snmp libs on x86_64


zabbix-1.4.2-netsnmp-x86_64.patch:

--- NEW FILE zabbix-1.4.2-netsnmp-x86_64.patch ---
--- configure.orig	2007-08-20 21:22:56.000000000 +0200
+++ configure	2007-09-15 13:29:13.000000000 +0200
@@ -10419,6 +10419,7 @@
 			;;
 			esac
 		done
+		SNMP_LDFLAGS="${SNMP_LDFLAGS} -lcrypto"
 
 		if test "x$enable_static" = "xyes"; then
 			for i in $_full_libnetsnmp_libs; do



From fedora-extras-commits at redhat.com  Sat Sep 15 14:48:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 15 Sep 2007 10:48:01 -0400
Subject: rpms/xscreensaver/devel update-xscreensaver-hacks, 1.4,
	1.5 xscreensaver.spec, 1.48, 1.49
Message-ID: <200709151448.l8FEm1qk024354@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24296

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
  correctly.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- update-xscreensaver-hacks	15 Sep 2007 01:53:07 -0000	1.4
+++ update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
@@ -30,8 +30,8 @@
 			return 1
 		fi
 	done
-	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
-		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
+	if ! grep -q '\\n[\\]*$' $tmpconf_1 ; then
+		sed -i -e 's|\(^.*$\)|\1 \\n\\|' $tmpconf_1
 	fi
 	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
 	while [ -s $tmpconf_2 ] ; do
@@ -74,7 +74,7 @@
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`
 	if [ -n "$hackconf_fixed" ] ; then
-		cat $hackconf >> $tmpfile
+		cat $hackconf_fixed >> $tmpfile
 		rm -f $hackconf_fixed
 	fi
 done


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xscreensaver.spec	15 Sep 2007 01:53:07 -0000	1.48
+++ xscreensaver.spec	15 Sep 2007 14:47:28 -0000	1.49
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 %endif
 
 %define extrarel      %{nil}
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
+- Fix update script to treat the ending character of conf file
+  correctly.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 



From fedora-extras-commits at redhat.com  Sat Sep 15 14:48:30 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 15 Sep 2007 10:48:30 -0400
Subject: rpms/xscreensaver/F-7 update-xscreensaver-hacks, 1.1,
	1.2 xscreensaver.spec, 1.43, 1.44
Message-ID: <200709151448.l8FEmUZC024399@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24331

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
  correctly.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/update-xscreensaver-hacks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-xscreensaver-hacks	15 Sep 2007 02:08:00 -0000	1.1
+++ update-xscreensaver-hacks	15 Sep 2007 14:47:58 -0000	1.2
@@ -30,8 +30,8 @@
 			return 1
 		fi
 	done
-	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
-		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
+	if ! grep -q '\\n[\\]*$' $tmpconf_1 ; then
+		sed -i -e 's|\(^.*$\)|\1 \\n\\|' $tmpconf_1
 	fi
 	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
 	while [ -s $tmpconf_2 ] ; do
@@ -74,7 +74,7 @@
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`
 	if [ -n "$hackconf_fixed" ] ; then
-		cat $hackconf >> $tmpfile
+		cat $hackconf_fixed >> $tmpfile
 		rm -f $hackconf_fixed
 	fi
 done


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xscreensaver.spec	15 Sep 2007 02:08:00 -0000	1.43
+++ xscreensaver.spec	15 Sep 2007 14:47:58 -0000	1.44
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 %endif
 
 %define extrarel      %{nil}
@@ -28,7 +28,7 @@
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{version}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
+- Fix update script to treat the ending character of conf file
+  correctly.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.
 



From fedora-extras-commits at redhat.com  Sat Sep 15 15:40:25 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:40:25 -0400
Subject: rpms/rpcbind/F-7 rpcbind-0.1.4-libwrap.patch, NONE, 1.1 rpcbind.spec,
	1.17, 1.18
Message-ID: <200709151540.l8FFePFi031855@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31448

Modified Files:
	rpcbind.spec 
Added Files:
	rpcbind-0.1.4-libwrap.patch 
Log Message:
- Added autoconf rules to turn on secure host checking 
  via libwrap. Also turned on host check by default (bz 248284)


rpcbind-0.1.4-libwrap.patch:

--- NEW FILE rpcbind-0.1.4-libwrap.patch ---
commit 29827c82fbb78725478eaf53b140e14a77fad42f
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Sep 15 11:32:57 2007 -0400

    Added autoconf rules to turn on secure host checking via libwrap.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/configure.in b/configure.in
index dfe5907..2bdf830 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,14 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
 
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([tirpc], [clnt_create])
+AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking], 
+	[case "${enableval}" in
+		yes) libwarp=true 
+			AC_CHECK_LIB([wrap],  [hosts_access]) ;;
+		no)  libwarp=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
+	esac],[libwarp=false])
+AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
 
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT()
diff --git a/src/Makefile.am b/src/Makefile.am
index fd80847..d66b43f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,10 @@ if WARMSTART
 INCLUDES +=	-DWARMSTART
 endif
 
+if LIBWRAP
+INCLUDES +=	-DLIBWRAP
+endif
+
 
 bin_PROGRAMS = rpcbind rpcinfo
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpcbind.spec	14 Sep 2007 19:20:43 -0000	1.17
+++ rpcbind.spec	15 Sep 2007 15:39:53 -0000	1.18
@@ -28,6 +28,7 @@
 Patch3: rpcbind-0.1.4-warmstarts.patch
 Patch4: rpcbind-0.1.4-rpcuser.patch
 Patch5: rpcbind-0.1.4-iff_up.patch
+Patch6: rpcbind-0.1.4-libwrap.patch
 
 %description
 The rpcbind utility is a server that converts RPC program numbers into
@@ -43,6 +44,8 @@
 %patch4 -p1
 # 240873: rpcbind segfaults on startup - ipv6 related
 %patch5 -p1
+# 248284: rpcbind ignores libwrap files
+%patch6 -p1
 
 %build
 %ifarch s390 s390x
@@ -61,6 +64,7 @@
     --enable-warmstarts \
     --with-statedir="$RPCBDIR" \
     --with-rpcuser="$RPCBUSR" \
+    --enable-libwrap \
     --enable-debug
 
 make all
@@ -121,7 +125,11 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-2
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-9
+- Added autoconf rules to turn on secure host checking
+  via libwrap. Also turned on host check by default (bz 248284)
+
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:48:27 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:48:27 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.18,1.19
Message-ID: <200709151548.l8FFmRd0000654@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv552

Modified Files:
	rpcbind.spec 
Log Message:
Fixed typo in spec file.



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpcbind.spec	15 Sep 2007 15:39:53 -0000	1.18
+++ rpcbind.spec	15 Sep 2007 15:47:55 -0000	1.19
@@ -125,11 +125,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-9
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
-
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:53:08 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:53:08 -0400
Subject: rpms/rpcbind/devel rpcbind-0.1.4-libwrap.patch, NONE,
	1.1 rpcbind.spec, 1.16, 1.17
Message-ID: <200709151553.l8FFr8p1001558@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1435

Modified Files:
	rpcbind.spec 
Added Files:
	rpcbind-0.1.4-libwrap.patch 
Log Message:
Added autoconf rules to turn on secure host checking
via libwrap. Also turned on host check by default (bz 248284)


rpcbind-0.1.4-libwrap.patch:

--- NEW FILE rpcbind-0.1.4-libwrap.patch ---
commit 29827c82fbb78725478eaf53b140e14a77fad42f
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Sep 15 11:32:57 2007 -0400

    Added autoconf rules to turn on secure host checking via libwrap.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/configure.in b/configure.in
index dfe5907..2bdf830 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,14 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
 
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([tirpc], [clnt_create])
+AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking], 
+	[case "${enableval}" in
+		yes) libwarp=true 
+			AC_CHECK_LIB([wrap],  [hosts_access]) ;;
+		no)  libwarp=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
+	esac],[libwarp=false])
+AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
 
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT()
diff --git a/src/Makefile.am b/src/Makefile.am
index fd80847..d66b43f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,10 @@ if WARMSTART
 INCLUDES +=	-DWARMSTART
 endif
 
+if LIBWRAP
+INCLUDES +=	-DLIBWRAP
+endif
+
 
 bin_PROGRAMS = rpcbind rpcinfo
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpcbind.spec	14 Sep 2007 19:22:31 -0000	1.16
+++ rpcbind.spec	15 Sep 2007 15:52:37 -0000	1.17
@@ -28,6 +28,7 @@
 Patch3: rpcbind-0.1.4-warmstarts.patch
 Patch4: rpcbind-0.1.4-rpcuser.patch
 Patch5: rpcbind-0.1.4-iff_up.patch
+Patch6: rpcbind-0.1.4-libwrap.patch
 
 %description
 The rpcbind utility is a server that converts RPC program numbers into
@@ -43,6 +44,8 @@
 %patch4 -p1
 # 240873: rpcbind segfaults on startup - ipv6 related
 %patch5 -p1
+# 248284: rpcbind ignores libwrap files
+%patch6 -p1
 
 %build
 %ifarch s390 s390x
@@ -61,6 +64,7 @@
     --enable-warmstarts \
     --with-statedir="$RPCBDIR" \
     --with-rpcuser="$RPCBUSR" \
+    --enable-libwrap \
     --enable-debug
 
 make all
@@ -121,7 +125,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
-* Fri Sep 14 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Added autoconf rules to turn on secure host checking
+  via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7



From fedora-extras-commits at redhat.com  Sat Sep 15 15:58:44 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:58:44 -0400
Subject: rpms/rpcbind/F-7 rpcbind.init,1.5,1.6 rpcbind.spec,1.19,1.20
Message-ID: <200709151558.l8FFwiAb002476@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2335

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Fixed typo in init script (bz 248285)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpcbind.init	14 Sep 2007 19:20:43 -0000	1.5
+++ rpcbind.init	15 Sep 2007 15:58:12 -0000	1.6
@@ -9,7 +9,7 @@
 #
 # processname: rpcbind
 # probe: true
-# config: /etc/sysconfig/nfs
+# config: /etc/sysconfig/rpcbind
 
 
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpcbind.spec	15 Sep 2007 15:47:55 -0000	1.19
+++ rpcbind.spec	15 Sep 2007 15:58:13 -0000	1.20
@@ -126,6 +126,7 @@
 
 %changelog
 * Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Fixed typo in init script (bz 248285)
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)



From fedora-extras-commits at redhat.com  Sat Sep 15 15:58:54 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 11:58:54 -0400
Subject: rpms/rpcbind/devel rpcbind.init,1.5,1.6 rpcbind.spec,1.17,1.18
Message-ID: <200709151558.l8FFwsNc002510@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323

Modified Files:
	rpcbind.init rpcbind.spec 
Log Message:
Fixed typo in init script (bz 248285)



Index: rpcbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpcbind.init	14 Sep 2007 19:22:31 -0000	1.5
+++ rpcbind.init	15 Sep 2007 15:58:21 -0000	1.6
@@ -9,7 +9,7 @@
 #
 # processname: rpcbind
 # probe: true
-# config: /etc/sysconfig/nfs
+# config: /etc/sysconfig/rpcbind
 
 
 


Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpcbind.spec	15 Sep 2007 15:52:37 -0000	1.17
+++ rpcbind.spec	15 Sep 2007 15:58:21 -0000	1.18
@@ -126,6 +126,7 @@
 
 %changelog
 * Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 0.1.4-8
+- Fixed typo in init script (bz 248285)
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)



From fedora-extras-commits at redhat.com  Sat Sep 15 16:02:02 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 15 Sep 2007 12:02:02 -0400
Subject: rpms/mod_fcgid/devel .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200709151602.l8FG22BO009071@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8921

Modified Files:
	.cvsignore mod_fcgid.spec sources 
Log Message:
Update to version 2.2
Make sure docs are encoded as UTF-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 14:20:03 -0000	1.4
+++ .cvsignore	15 Sep 2007 16:01:29 -0000	1.5
@@ -1 +1 @@
-mod_fcgid.2.1.tar.gz
+mod_fcgid.2.2.tar.gz


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_fcgid.spec	3 Sep 2007 08:30:33 -0000	1.7
+++ mod_fcgid.spec	15 Sep 2007 16:01:29 -0000	1.8
@@ -10,8 +10,8 @@
 %endif
 
 Name:		mod_fcgid
-Version:	2.1
-Release:	6%{?dist}
+Version:	2.2
+Release:	1%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -75,6 +75,8 @@
 %{__cp} -p %{SOURCE7} README.SELinux
 %patch0 -p1
 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm
+/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
+%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
@@ -155,6 +157,10 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Paul Howarth <paul at city-fan.org> 2.2-1
+- Update to version 2.2
+- Make sure docs are encoded as UTF-8
+
 * Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
 - rebuild for fixed 32-bit APR (#254241)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2007 09:32:38 -0000	1.5
+++ sources	15 Sep 2007 16:01:29 -0000	1.6
@@ -1 +1 @@
-0bc036276e378463c80617ff57e853dc  mod_fcgid.2.1.tar.gz
+ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 16:05:58 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 15 Sep 2007 12:05:58 -0400
Subject: rpms/mod_fcgid/F-7 .cvsignore, 1.4, 1.5 mod_fcgid.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709151605.l8FG5wWa009346@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314

Modified Files:
	.cvsignore mod_fcgid.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2007 14:20:03 -0000	1.4
+++ .cvsignore	15 Sep 2007 16:05:24 -0000	1.5
@@ -1 +1 @@
-mod_fcgid.2.1.tar.gz
+mod_fcgid.2.2.tar.gz


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/mod_fcgid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_fcgid.spec	15 Jun 2007 17:14:10 -0000	1.5
+++ mod_fcgid.spec	15 Sep 2007 16:05:24 -0000	1.6
@@ -9,26 +9,26 @@
 %define selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink
 %endif
 
-Name:           mod_fcgid
-Version:        2.1
-Release:        3%{?dist}
-Summary:        Apache2 module for high-performance server-side scripting 
-Group:          System Environment/Daemons
-License:        GPL
-URL:            http://fastcgi.coremail.cn/
-Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
-Source1:        fcgid.conf
-Source2:        fastcgi.te
-Source3:        fastcgi.fc
-Source4:        mod_fcgid-2.1-README.RPM
-Source5:        http://fastcgi.coremail.cn/doc.htm
-Source6:        http://fastcgi.coremail.cn/configuration.htm
-Source7:        mod_fcgid-2.1-README.SELinux
-Source8:        fastcgi-2.5.te
-Patch0:         mod_fcgid.2.1-docurls.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  httpd-devel >= 2.0
-Requires:       httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
+Name:		mod_fcgid
+Version:	2.2
+Release:	1%{?dist}
+Summary:	Apache2 module for high-performance server-side scripting 
+Group:		System Environment/Daemons
+License:	GPL+
+URL:		http://fastcgi.coremail.cn/
+Source0:	http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
+Source1:	fcgid.conf
+Source2:	fastcgi.te
+Source3:	fastcgi.fc
+Source4:	mod_fcgid-2.1-README.RPM
+Source5:	http://fastcgi.coremail.cn/doc.htm
+Source6:	http://fastcgi.coremail.cn/configuration.htm
+Source7:	mod_fcgid-2.1-README.SELinux
+Source8:	fastcgi-2.5.te
+Patch0:		mod_fcgid.2.1-docurls.patch
+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)
 
 %description
 mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@@ -40,9 +40,9 @@
 %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 }')
 %package selinux
-Summary:          SELinux policy module supporting FastCGI applications with mod_fcgid
-Group:            System Environment/Base
-BuildRequires:    %{selinux_buildreqs}
+Summary:	  SELinux policy module supporting FastCGI applications with mod_fcgid
+Group:		  System Environment/Base
+BuildRequires:	  %{selinux_buildreqs}
 # selinux-policy is required for directory ownership of %{_datadir}/selinux/*
 # Modules built against one version of a policy may not work with older policy
 # versions, as noted on fedora-selinux-list:
@@ -50,10 +50,10 @@
 # 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}
+Requires:	  selinux-policy >= %{selinux_policyver}
 %endif
-Requires:         %{name} = %{version}-%{release}
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon
+Requires:	  %{name} = %{version}-%{release}
+Requires(post):	  /usr/sbin/semodule, /sbin/restorecon
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon
 
 %description selinux
@@ -75,6 +75,8 @@
 %{__cp} -p %{SOURCE7} README.SELinux
 %patch0 -p1
 %{__sed} -i -e 's/\r$//' directives.htm configuration.htm
+/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
+%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
@@ -82,9 +84,9 @@
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-  %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-  %{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
-  %{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+	%{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
+	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
 done
 %endif
 
@@ -92,10 +94,10 @@
 %{__rm} -rf %{buildroot}
 topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
 %{__make} \
-  top_dir=${topdir} \
-  DESTDIR=%{buildroot} \
-  MKINSTALLDIRS="%{__mkdir_p}" \
-  install
+	top_dir=${topdir} \
+	DESTDIR=%{buildroot} \
+	MKINSTALLDIRS="%{__mkdir_p}" \
+	install
 %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
 %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
 
@@ -103,9 +105,9 @@
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-  %{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-  %{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
-    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
+	%{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+	%{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
+		%{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
 done
 # Hardlink identical policy module packages together
 /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
@@ -119,8 +121,8 @@
 # Install SELinux policy modules
 for selinuxvariant in %{selinux_variants}
 do
-  /usr/sbin/semodule -s ${selinuxvariant} -i \
-    %{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
+	/usr/sbin/semodule -s ${selinuxvariant} -i \
+		%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp &> /dev/null || :
 done
 # Fix up non-standard directory context
 /sbin/restorecon %{_localstatedir}/run/mod_fcgid || :
@@ -128,15 +130,15 @@
 %postun selinux
 # Clean up after package removal
 if [ $1 -eq 0 ]; then
-  # Remove SELinux policy modules
-  for selinuxvariant in %{selinux_variants}
-  do
-    /usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
-  done
-  # Clean up any remaining file contexts (shouldn't be any really)
-  [ -d %{_localstatedir}/run/mod_fcgid ] && \
-    /sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
+	# Remove SELinux policy modules
+	for selinuxvariant in %{selinux_variants}; do
+		/usr/sbin/semodule -s ${selinuxvariant} -r fastcgi &> /dev/null || :
+	done
+	# Clean up any remaining file contexts (shouldn't be any really)
+	[ -d %{_localstatedir}/run/mod_fcgid ] && \
+		/sbin/restorecon -R %{_localstatedir}/run/mod_fcgid &> /dev/null || :
 fi
+exit 0
 %endif
 
 %files
@@ -155,6 +157,26 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Paul Howarth <paul at city-fan.org> 2.2-1
+- Update to version 2.2
+- Make sure docs are encoded as UTF-8
+
+* Mon Sep  3 2007 Joe Orton <jorton at redhat.com> 2.1-6
+- rebuild for fixed 32-bit APR (#254241)
+
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 2.1-5
+- Update source URL to point to downloads.sf.net rather than dl.sf.net
+- Upstream released new tarball without changing version number, though the
+  only change was in arch/win32/fcgid_pm_win.c, which is not used to build the
+  RPM package
+- Clarify license as GPL (unspecified/any version)
+- Unexpand tabs in spec
+- Add buildreq of gawk
+
+* Fri Aug  3 2007 Paul Howarth <paul at city-fan.org> 2.1-4
+- Add buildreq of pkgconfig, a missing dependency of both apr-devel and
+  apr-util-devel on FC5
+
 * Fri Jun 15 2007 Paul Howarth <paul at city-fan.org> 2.1-3
 - Major update of SELinux policy, supporting accessing data on NFS/CIFS shares
   and a new boolean, httpd_fastcgi_can_sendmail, to allow connections to SMTP
@@ -208,9 +230,9 @@
 * Tue Jul  4 2006 Paul Howarth <paul at city-fan.org> 1.09-10
 - SELinux policy update:
   * allow httpd to read httpd_fastcgi_content_t without having the
-    httpd_builtin_scripting boolean set
+  | httpd_builtin_scripting boolean set
   * allow httpd_fastcgi_script_t to read /etc/resolv.conf without
-    having the httpd_can_network_connect boolean set
+  | having the httpd_can_network_connect boolean set
 
 * Sun Jun 18 2006 Paul Howarth <paul at city-fan.org> 1.09-9
 - Discard output of semodule in %%postun


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Feb 2007 14:20:03 -0000	1.4
+++ sources	15 Sep 2007 16:05:24 -0000	1.5
@@ -1 +1 @@
-68a6479e398a20577334f16a8b06c418  mod_fcgid.2.1.tar.gz
+ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 16:07:35 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Sat, 15 Sep 2007 12:07:35 -0400
Subject: rpms/pv/devel .cvsignore,1.3,1.4 pv.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200709151607.l8FG7Z91009487@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9419

Modified Files:
	.cvsignore pv.spec sources 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
- Bump to the latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2007 13:13:55 -0000	1.3
+++ .cvsignore	15 Sep 2007 16:07:02 -0000	1.4
@@ -1 +1 @@
-pv-1.0.1.tar.gz
+pv-1.1.0.tar.gz


Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/pv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pv.spec	13 Aug 2007 12:32:41 -0000	1.2
+++ pv.spec	15 Sep 2007 16:07:02 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: Artistic (modified)
 Group: Development/Tools
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
+- Bump to the latest upstream
+
 * Mon Aug 13 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.0.1-1
 - Bump to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2007 13:13:55 -0000	1.3
+++ sources	15 Sep 2007 16:07:02 -0000	1.4
@@ -1 +1 @@
-f4ca9b3e3f476b8934fc70a97e637361  pv-1.0.1.tar.gz
+1b76116d4cc70b0f12553a94d834d9bb  pv-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 17:28:30 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:28:30 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.20,1.21
Message-ID: <200709151728.l8FHSUZD017133@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17079

Modified Files:
	rpcbind.spec 
Log Message:
Added a couple missing Requires(pre) (bz 247134)



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpcbind.spec	15 Sep 2007 15:58:13 -0000	1.20
+++ rpcbind.spec	15 Sep 2007 17:27:56 -0000	1.21
@@ -17,6 +17,8 @@
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
 BuildRequires: libtirpc-devel quota
+Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel 
+Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel 
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 
@@ -130,6 +132,7 @@
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
+- Added a couple missing Requires(pre) (bz 247134)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)



From fedora-extras-commits at redhat.com  Sat Sep 15 17:28:52 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:28:52 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.18,1.19
Message-ID: <200709151728.l8FHSqE7017136@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17111

Modified Files:
	rpcbind.spec 
Log Message:
Added a couple missing Requires(pre) (bz 247134)



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpcbind.spec	15 Sep 2007 15:58:21 -0000	1.18
+++ rpcbind.spec	15 Sep 2007 17:28:20 -0000	1.19
@@ -17,6 +17,8 @@
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
 BuildRequires: libtirpc-devel quota
+Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
+Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 
@@ -130,6 +132,7 @@
 - Added autoconf rules to turn on secure host checking
   via libwrap. Also turned on host check by default (bz 248284)
 - Changed init script to start service in runlevel 2 (bz 251568)
+- Added a couple missing Requires(pre) (bz 247134)
 
 * Fri May 25 2007 Steve Dickson <steved at redhat.com> 0.1.4-7
 - Fixed condrestarts (bz 241332)



From fedora-extras-commits at redhat.com  Sat Sep 15 17:37:26 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:37:26 -0400
Subject: rpms/ypserv/devel ypserv-yppasswdd.init, 1.4, 1.5 ypserv-ypserv.init,
	1.6, 1.7 ypserv-ypxfrd.init, 1.3, 1.4 ypserv.spec, 1.36, 1.37
Message-ID: <200709151737.l8FHbQaT017345@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypserv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17240

Modified Files:
	ypserv-yppasswdd.init ypserv-ypserv.init ypserv-ypxfrd.init 
	ypserv.spec 
Log Message:
Fixed init scripts to return correct exit code on
'service status' (bz 248097)



Index: ypserv-yppasswdd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-yppasswdd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ypserv-yppasswdd.init	9 Sep 2004 15:15:29 -0000	1.4
+++ ypserv-yppasswdd.init	15 Sep 2007 17:36:54 -0000	1.5
@@ -64,6 +64,7 @@
 	;;
   status)
 	status rpc.yppasswdd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypserv.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-ypserv.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ypserv-ypserv.init	9 Sep 2004 15:15:29 -0000	1.6
+++ ypserv-ypserv.init	15 Sep 2007 17:36:54 -0000	1.7
@@ -59,6 +59,7 @@
 	;;
   status)
 	status ypserv
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypxfrd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv-ypxfrd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-ypxfrd.init	25 Jul 2006 20:28:41 -0000	1.3
+++ ypserv-ypxfrd.init	15 Sep 2007 17:36:54 -0000	1.4
@@ -46,6 +46,7 @@
 	;;
   status)
 	status rpc.ypxfrd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ypserv.spec	31 Jul 2007 13:14:11 -0000	1.36
+++ ypserv.spec	15 Sep 2007 17:36:54 -0000	1.37
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,10 @@
 %{_includedir}/*/*
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 2.19-6
+- Fixed init scripts to return correct exit code on
+ 'service status' (bz 248097)
+
 * Tue Jul 31 2007 Steve Dickson <steved at redhat.com> 2.19-5
 - Changed install process to create an useful debuginfo package (bz 249961)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 17:37:44 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Sat, 15 Sep 2007 13:37:44 -0400
Subject: rpms/ypserv/F-7 ypserv-yppasswdd.init, 1.4, 1.5 ypserv-ypserv.init, 
	1.6, 1.7 ypserv-ypxfrd.init, 1.3, 1.4 ypserv.spec, 1.36, 1.37
Message-ID: <200709151737.l8FHbiMY017358@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypserv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	ypserv-yppasswdd.init ypserv-ypserv.init ypserv-ypxfrd.init 
	ypserv.spec 
Log Message:
Fixed init scripts to return correct exit code on
'service status' (bz 248097)



Index: ypserv-yppasswdd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-yppasswdd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ypserv-yppasswdd.init	9 Sep 2004 15:15:29 -0000	1.4
+++ ypserv-yppasswdd.init	15 Sep 2007 17:37:13 -0000	1.5
@@ -64,6 +64,7 @@
 	;;
   status)
 	status rpc.yppasswdd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypserv.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-ypserv.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ypserv-ypserv.init	9 Sep 2004 15:15:29 -0000	1.6
+++ ypserv-ypserv.init	15 Sep 2007 17:37:13 -0000	1.7
@@ -59,6 +59,7 @@
 	;;
   status)
 	status ypserv
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv-ypxfrd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv-ypxfrd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-ypxfrd.init	25 Jul 2006 20:28:41 -0000	1.3
+++ ypserv-ypxfrd.init	15 Sep 2007 17:37:13 -0000	1.4
@@ -46,6 +46,7 @@
 	;;
   status)
 	status rpc.ypxfrd
+	RETVAL=$?
 	;;
   restart|reload)
 	stop


Index: ypserv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypserv/F-7/ypserv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ypserv.spec	31 Jul 2007 13:20:37 -0000	1.36
+++ ypserv.spec	15 Sep 2007 17:37:13 -0000	1.37
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,10 @@
 %{_includedir}/*/*
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redhat.com> 2.19-6
+- Fixed init scripts to return correct exit code on
+ 'service status' (bz 248097)
+
 * Tue Jul 31 2007 Steve Dickson <steved at redhat.com> 2.19-5
 - Changed install process to create an useful debuginfo package (bz 249961)
 



From fedora-extras-commits at redhat.com  Sat Sep 15 18:16:35 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Sat, 15 Sep 2007 14:16:35 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.2,
	1.3 eclipse-egit-add-feature.patch, 1.1, 1.2 eclipse-egit.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709151816.l8FIGZBT024275@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24245

Modified Files:
	.cvsignore eclipse-egit-add-feature.patch eclipse-egit.spec 
	sources 
Log Message:
* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
- Update to git20070911.
- Update feature and accosicated branding plugin.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2007 02:30:53 -0000	1.2
+++ .cvsignore	15 Sep 2007 18:16:03 -0000	1.3
@@ -1 +1,2 @@
-egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+egit.png
+egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz

eclipse-egit-add-feature.patch:

Index: eclipse-egit-add-feature.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit-add-feature.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit-add-feature.patch	15 Sep 2007 02:30:53 -0000	1.1
+++ eclipse-egit-add-feature.patch	15 Sep 2007 18:16:03 -0000	1.2
@@ -1,31 +1,60 @@
-diff -ruN egit.orig/org.spearce.egit/build.properties egit/org.spearce.egit/build.properties
---- egit.orig/org.spearce.egit/build.properties	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/build.properties	2007-08-30 12:33:14.000000000 -0400
+diff --git a/org.spearce.egit-feature/.project b/org.spearce.egit-feature/.project
+new file mode 100644
+index 0000000..dac8f65
+--- /dev/null
++++ egit/org.spearce.egit-feature/.project
+@@ -0,0 +1,17 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<projectDescription>
++	<name>org.spearce.egit-feature</name>
++	<comment></comment>
++	<projects>
++	</projects>
++	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.pde.FeatureBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++	</buildSpec>
++	<natures>
++		<nature>org.eclipse.pde.FeatureNature</nature>
++	</natures>
++</projectDescription>
+diff --git a/org.spearce.egit-feature/build.properties b/org.spearce.egit-feature/build.properties
+new file mode 100644
+index 0000000..64f93a9
+--- /dev/null
++++ egit/org.spearce.egit-feature/build.properties
 @@ -0,0 +1 @@
 +bin.includes = feature.xml
-diff -ruN egit.orig/org.spearce.egit/feature.xml egit/org.spearce.egit/feature.xml
---- egit.orig/org.spearce.egit/feature.xml	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/feature.xml	2007-08-30 12:33:14.000000000 -0400
-@@ -0,0 +1,42 @@
+diff --git a/org.spearce.egit-feature/feature.xml b/org.spearce.egit-feature/feature.xml
+new file mode 100644
+index 0000000..01c53cd
+--- /dev/null
++++ egit/org.spearce.egit-feature/feature.xml
+@@ -0,0 +1,44 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<feature
 +      id="org.spearce.egit"
 +      label="Eclipse Git Feature"
 +      version="0.2.2"
-+      provider-name="spearce.org">
++      provider-name="spearce.org"
++      plugin="org.spearce.egit">
 +
-+   <description>
-+      The Eclipse Git plugin allows developers to interact with Git
-+      repositories from within Eclipse.
-+   </description>
-+
-+   <copyright url="http://www.example.com/copyright">
-+      [Enter Copyright Description here.]
-+   </copyright>
-+
-+   <license url="http://www.example.com/license">
-+      GPLv2 EPL
-+   </license>
++   <requires>
++      <import plugin="org.eclipse.core.runtime"/>
++      <import plugin="org.eclipse.team.core"/>
++      <import plugin="org.eclipse.core.resources"/>
++      <import plugin="org.eclipse.core.filesystem"/>
++      <import plugin="org.eclipse.ui"/>
++      <import plugin="org.eclipse.team.ui"/>
++      <import plugin="org.eclipse.jface.text"/>
++      <import plugin="org.eclipse.ui.ide"/>
++      <import plugin="org.eclipse.ui.workbench.texteditor"/>
++      <import plugin="org.eclipse.compare"/>
++      <import plugin="org.junit"/>
++   </requires>
 +
 +   <plugin
 +         id="org.spearce.egit.core"
@@ -49,10 +78,24 @@
 +         unpack="false"/>
 +
 +</feature>
-diff -ruN egit.orig/org.spearce.egit/.project egit/org.spearce.egit/.project
---- egit.orig/org.spearce.egit/.project	1969-12-31 19:00:00.000000000 -0500
-+++ egit/org.spearce.egit/.project	2007-08-30 12:33:14.000000000 -0400
-@@ -0,0 +1,17 @@
+diff --git a/org.spearce.egit/.classpath b/org.spearce.egit/.classpath
+new file mode 100644
+index 0000000..acad1c2
+--- /dev/null
++++ egit/org.spearce.egit/.classpath
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<classpath>
++	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
++	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
++	<classpathentry kind="output" path="bin"/>
++</classpath>
+diff --git a/org.spearce.egit/.project b/org.spearce.egit/.project
+new file mode 100644
+index 0000000..bbdc4e3
+--- /dev/null
++++ egit/org.spearce.egit/.project
+@@ -0,0 +1,28 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<projectDescription>
 +	<name>org.spearce.egit</name>
@@ -61,12 +104,81 @@
 +	</projects>
 +	<buildSpec>
 +		<buildCommand>
-+			<name>org.eclipse.pde.FeatureBuilder</name>
++			<name>org.eclipse.jdt.core.javabuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.eclipse.pde.ManifestBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.eclipse.pde.SchemaBuilder</name>
 +			<arguments>
 +			</arguments>
 +		</buildCommand>
 +	</buildSpec>
 +	<natures>
-+		<nature>org.eclipse.pde.FeatureNature</nature>
++		<nature>org.eclipse.pde.PluginNature</nature>
++		<nature>org.eclipse.jdt.core.javanature</nature>
 +	</natures>
 +</projectDescription>
+diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.spearce.egit/META-INF/MANIFEST.MF
+new file mode 100644
+index 0000000..40da4e0
+--- /dev/null
++++ egit/org.spearce.egit/META-INF/MANIFEST.MF
+@@ -0,0 +1,7 @@
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Java Git / Eclipse Git
++Bundle-SymbolicName: org.spearce.egit
++Bundle-Version: 0.2.2
++Bundle-Vendor: spearce.org
++Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff --git a/org.spearce.egit/about.ini b/org.spearce.egit/about.ini
+new file mode 100644
+index 0000000..dcab31a
+--- /dev/null
++++ egit/org.spearce.egit/about.ini
+@@ -0,0 +1,28 @@
++# about.ini
++# contains information about a feature
++# java.io.Properties file (ISO 8859-1 with "\" escapes)
++# "%key" are externalized strings defined in about.properties
++# This file does not need to be translated.
++
++# Property "aboutText" contains blurb for "About" dialog (translated)
++aboutText=Java Git / Eclipse Git (by Shawn Pearce) is a Java Git library and plugin for the Eclipse IDE.
++
++# Property "windowImage" contains path to window icon (16x16)
++# needed for primary features only
++
++# Property "featureImage" contains path to feature image (32x32)
++featureImage=egit.png
++
++# Property "aboutImage" contains path to product image (500x330 or 115x164)
++# needed for primary features only
++
++# Property "appName" contains name of the application (not translated)
++# needed for primary features only
++
++# Property "welcomePerspective" contains the id of the perspective in which the
++# welcome page is to be opened.
++# optional
++
++# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
++# optional
++# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
+\ No newline at end of file
+diff --git a/org.spearce.egit/build.properties b/org.spearce.egit/build.properties
+new file mode 100644
+index 0000000..34d2e4d
+--- /dev/null
++++ egit/org.spearce.egit/build.properties
+@@ -0,0 +1,4 @@
++source.. = src/
++output.. = bin/
++bin.includes = META-INF/,\
++               .


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit.spec	15 Sep 2007 02:30:53 -0000	1.1
+++ eclipse-egit.spec	15 Sep 2007 18:16:03 -0000	1.2
@@ -4,13 +4,14 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          0.git20070826%{?dist}
+Release:          0.git20070911%{?dist}
 License:          EPL GPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=522c3046b3b7e4af1a13ca17912e0bfe8b0983e4;sf=tgz
-Source0:          egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
+Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+Source1:          egit.png
 Patch0:           %{name}-add-feature.patch
 
 Requires:         eclipse-platform > 1:3.3.0
@@ -39,6 +40,7 @@
 %prep
 %setup -q -c 
 %patch0 -p0
+cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -95,5 +97,9 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
+- Update to git20070911.
+- Update feature and accosicated branding plugin.
+
 * Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
 - Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2007 02:30:53 -0000	1.2
+++ sources	15 Sep 2007 18:16:03 -0000	1.3
@@ -1 +1,2 @@
-fbbbb7b7366d5a9f397f521837fe3e19  egit-522c3046b3b7e4af1a13ca17912e0bfe8b0983e4.tar.gz
+5d1082d9db40f01c5de094ac8769514b  egit.png
+d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 18:58:59 2007
From: fedora-extras-commits at redhat.com (Mads Villadsen (maxx))
Date: Sat, 15 Sep 2007 14:58:59 -0400
Subject: rpms/pdfcube/devel pdfcube.spec,1.2,1.3
Message-ID: <200709151858.l8FIwxXp025109@cvs-int.fedora.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/pdfcube/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071

Modified Files:
	pdfcube.spec 
Log Message:
Rebuild because of new poppler library


Index: pdfcube.spec
===================================================================
RCS file: /cvs/extras/rpms/pdfcube/devel/pdfcube.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdfcube.spec	5 Aug 2007 18:35:27 -0000	1.2
+++ pdfcube.spec	15 Sep 2007 18:58:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pdfcube
 Version:        0.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PDF presentation viewer with a spinning cube
 
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-5
+- Rebuild because of new poppler library
+
 * Thu Aug 2 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-4
 - Updated License field per new Licensing Guidelines
 



From fedora-extras-commits at redhat.com  Sat Sep 15 19:02:08 2007
From: fedora-extras-commits at redhat.com (Mads Villadsen (maxx))
Date: Sat, 15 Sep 2007 15:02:08 -0400
Subject: rpms/pdfcube/devel pdfcube.spec,1.3,1.4
Message-ID: <200709151902.l8FJ28sk031137@cvs-int.fedora.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/pdfcube/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31103

Modified Files:
	pdfcube.spec 
Log Message:
Messed up tagging - trying again


Index: pdfcube.spec
===================================================================
RCS file: /cvs/extras/rpms/pdfcube/devel/pdfcube.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdfcube.spec	15 Sep 2007 18:58:27 -0000	1.3
+++ pdfcube.spec	15 Sep 2007 19:01:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pdfcube
 Version:        0.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PDF presentation viewer with a spinning cube
 
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-6
+- Messed up tagging - trying again.
+
 * Sat Sep 15 2007 Mads Villadsen <maxx at krakoa.dk> - 0.0.2-5
 - Rebuild because of new poppler library
 



From fedora-extras-commits at redhat.com  Sat Sep 15 19:40:12 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Sat, 15 Sep 2007 15:40:12 -0400
Subject: rpms/librtas/devel librtas-1.3.2-mode.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 librtas.spec, 1.11, 1.12 sources, 1.5,
	1.6 librtas-1.2.4-no_syscall1.patch, 1.1, NONE
Message-ID: <200709151940.l8FJeCH7032078@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/librtas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32047

Modified Files:
	.cvsignore librtas.spec sources 
Added Files:
	librtas-1.3.2-mode.patch 
Removed Files:
	librtas-1.2.4-no_syscall1.patch 
Log Message:
* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 1.3.2-1
- Upgraded to librtas-1.3.2
- Cleaned up spec file to conform to Fedora packaging guidelines


librtas-1.3.2-mode.patch:

--- NEW FILE librtas-1.3.2-mode.patch ---
diff -up librtas-1.3.2/librtas_src/syscall_rmo.c.mode librtas-1.3.2/librtas_src/syscall_rmo.c
--- librtas-1.3.2/librtas_src/syscall_rmo.c.mode	2007-08-06 12:02:34.000000000 -0400
+++ librtas-1.3.2/librtas_src/syscall_rmo.c	2007-09-05 17:03:10.000000000 -0400
@@ -117,7 +117,7 @@ static int acquire_file_lock(off_t start
 
 	/* Lazily open lock file */
 	if (wa_config.lockfile_fd < 0) {
-		wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR);
+		wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR, 0600);
 		if (wa_config.lockfile_fd < 0) {
 			dbg1("could not open lockfile %s\n", lockfile_path);
 			return RTAS_IO_ASSERT;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2007 02:53:39 -0000	1.4
+++ .cvsignore	15 Sep 2007 19:39:40 -0000	1.5
@@ -1 +1 @@
-librtas-1.2.4.tar.gz
+librtas-1.3.2.tar.gz


Index: librtas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librtas.spec	21 Aug 2007 15:56:30 -0000	1.11
+++ librtas.spec	15 Sep 2007 19:39:40 -0000	1.12
@@ -1,14 +1,16 @@
-Summary: Libraries to provide access to RTAS calls and RTAS events.
-Name: librtas
-Version: 1.2.4
-Release: 4%{?dist}
-URL: http://librtas.ozlabs.org
-License: IBM Common Public License (CPL) v1.0
-Group: System Environment/Libraries
-Source: http://librtas.ozlabs.org/releases/librtas-%{version}.tar.gz
-Patch0: librtas-1.2.4-no_syscall1.patch
+Summary: Libraries to provide access to RTAS calls and RTAS events
+Name:    librtas
+Version: 1.3.2
+Release: 1%{?dist}
+URL:     http://librtas.ozlabs.org
+License: IBM
+Group:   System Environment/Libraries
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source: http://librtas.ozlabs.org/releases/%{name}-%{version}.tar.gz
+
+Patch0: %{name}-1.3.2-mode.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 
 %description
@@ -22,48 +24,52 @@
 the contents of RTAS events.
 
 %package devel
-Summary: Static libraries and header files for librtas development.
-Group: Development/Libraries
-Requires: librtas = %{version}
+Summary:  C header files for development with librtas
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-
-The librtas-devel packages contains the header files and static libraries
-necessary for developing programs using libdaemon.
+The librtas-devel packages contains the header files necessary for
+developing programs using libdaemon.
 
 %prep
-%setup 
-%patch0 -p1 -b .no_syscall
+%setup
+%patch0 -p1 -b .mode
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
-
+%{__make} CFLAGS="%{optflags} -fPIC -DPIC" %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} install
-rm -rf $RPM_BUILD_ROOT/usr/share/doc
+%{__make} install DESTDIR=%{buildroot} LIB_DIR=%{_libdir}
+%{__rm} -rf %{buildroot}%{_datadir}/doc
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc COPYRIGHT README
+%doc COPYRIGHT README Changelog
 %{_libdir}/librtas.so.%{version}
 %{_libdir}/librtasevent.so.%{version}
 
 %files devel
 %defattr(-, root, root, -)
-%doc COPYRIGHT README
-%{_libdir}/*.so
-%{_libdir}/*.a
-/usr/include/*
+%{_libdir}/librtas.so
+%{_libdir}/librtasevent.so
+%{_includedir}/librtas.h
+%{_includedir}/librtasevent.h
+%{_includedir}/librtasevent_v4.h
+%{_includedir}/librtasevent_v6.h
 
 %changelog
+* Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 1.3.2-1
+- Upgraded to librtas-1.3.2
+- Cleaned up spec file to conform to Fedora packaging guidelines
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 1.2.4-4
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/librtas/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 02:58:02 -0000	1.5
+++ sources	15 Sep 2007 19:39:40 -0000	1.6
@@ -1 +1 @@
-2e2a2b10ee65deb9b99f88f1502656ce  librtas-1.2.4.tar.gz
+0a3705d4983fbb18a1b98cbe15032318  librtas-1.3.2.tar.gz


--- librtas-1.2.4-no_syscall1.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 21:14:02 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Sat, 15 Sep 2007 17:14:02 -0400
Subject: rpms/ppc64-utils/devel .cvsignore, 1.6, 1.7 ppc64-utils.spec, 1.27, 
	1.28 sources, 1.13, 1.14
Message-ID: <200709152114.l8FLE2Y3016033@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/ppc64-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16011

Modified Files:
	.cvsignore ppc64-utils.spec sources 
Log Message:
* Sat Sep 15 2007 David Cantrell <dcantrell at redhat.com> - 0.12-1
- Upgraded to powerpc-utils-1.0.6 and powerpc-utils-papr-1.0.4
- Updated license tag to reflect licenses of all included components



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Apr 2007 04:37:24 -0000	1.6
+++ .cvsignore	15 Sep 2007 21:13:30 -0000	1.7
@@ -1,10 +1,8 @@
 pmac-utils-2.1.tar.gz
 ppc64-utils-0.4.tar.gz
 zImage-boot.tar.gz
-powerpc-utils-1.0.2.tar.gz
-powerpc-utils-papr-1.0.2.tar.gz
-powerpc-utils-1.0.3.tar.gz
-powerpc-utils-papr-1.0.3.tar.gz
 ps3pf_utils-1.0.9.tar.bz2
 zImage-wrapper.tar.gz
 ps3.dtb
+powerpc-utils-1.0.6.tar.gz
+powerpc-utils-papr-1.0.4.tar.gz


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ppc64-utils.spec	27 Aug 2007 17:45:21 -0000	1.27
+++ ppc64-utils.spec	15 Sep 2007 21:13:30 -0000	1.28
@@ -1,12 +1,20 @@
 %define pmacutilsver 2.1
-%define powerpcutilsver 1.0.3
+%define powerpcutilsver 1.0.6
+%define powerpcutilspaprver 1.0.4
 %define ps3pfutilsver 1.0.9
 
 Summary: Linux/PPC64 specific utilities
 Name:    ppc64-utils
-Version: 0.11
-Release: 5%{?dist}
-License: GPL and OSL
+Version: 0.12
+Release: 1%{?dist}
+
+# The things that do not have URLs in the source entry are Red Hat creations,
+# except pmac-utils, which just isn't available upstream anymore.
+# The licensing of these things are all different.  The Red Hat
+# creations are either GPLv2 or GPLv2+, pmac-utils is GPLv2, and
+# powerpc-utils and powerpc-utils-papr are IBM
+License: GPLv2 and GPLv2+ and IBM
+
 Group:   System Environment/Base
 
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
@@ -15,7 +23,7 @@
 Source3: mkzimage
 Source5: pmac-utils-%{pmacutilsver}.tar.gz
 Source6: zImage-boot.tar.gz
-Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilsver}.tar.gz
+Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilspaprver}.tar.gz
 Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
 Source9: zImage-wrapper.tar.gz
 Source10: ps3.dts
@@ -24,7 +32,7 @@
 Patch1: ppc64-utils-1.1-64k.patch
 Patch2: ps3pf_utils-1.0.9-types.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 Requires: binutils yaboot
 BuildRequires: linuxdoc-tools librtas-devel kernel-devel dtc
@@ -52,7 +60,7 @@
 
 %{__make} -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
 
-CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilsver}
+CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilspaprver}
 
 %{__make} %{?_smp_mflags} -C zImage-boot zImage.stub
 
@@ -79,7 +87,7 @@
 %{__install} -m 755 nvsetenv %{buildroot}/sbin
 %{__install} -m 755 nvsetenv.8 %{buildroot}/%{_mandir}/man8
 popd
-pushd powerpc-utils-papr-%{powerpcutilsver}
+pushd powerpc-utils-papr-%{powerpcutilspaprver}
 %{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}/etc/init.d
 %{__install} -m 0644 scripts/ibmvscsis.sh %{buildroot}%{_datadir}/%{name}
@@ -102,6 +110,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sat Sep 15 2007 David Cantrell <dcantrell at redhat.com> - 0.12-1
+- Upgraded to powerpc-utils-1.0.6 and powerpc-utils-papr-1.0.4
+- Updated license tag to reflect licenses of all included components
+
 * Mon Aug 27 2007 David Cantrell <dcantrell at redhat.com> - 0.11-5
 - Spec file style cleanup
 - BR dtc now for ps3.dtb since Core/Extras merge is complete


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Apr 2007 08:52:45 -0000	1.13
+++ sources	15 Sep 2007 21:13:30 -0000	1.14
@@ -1,7 +1,7 @@
 afbdcb97cd036f0c55204e05bac5f38e  pmac-utils-2.1.tar.gz
 1e3f958ea6d0b7313a3aee174e472138  zImage-boot.tar.gz
-ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
-19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
 787839c782f8ab9812903cfb501455c8  ps3.dtb
 cbef15544b5335e8a646d497456f3313  zImage-wrapper.tar.gz
+33de4697b9dc36be070ae67d545fd4fe  powerpc-utils-1.0.6.tar.gz
+1472a4b2c6929a5bfe0d29ff30e8b559  powerpc-utils-papr-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 21:32:45 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:32:45 -0400
Subject: rpms/zope/FC-6 zope-2.10.4-config.patch, NONE, 1.1 .cvsignore, 1.18,
	1.19 sources, 1.18, 1.19 zope.spec, 1.34,
	1.35 zope-2.7.3-config.patch, 1.2, NONE
Message-ID: <200709152132.l8FLWj8I018644@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18617/FC-6

Modified Files:
	.cvsignore sources zope.spec 
Added Files:
	zope-2.10.4-config.patch 
Removed Files:
	zope-2.7.3-config.patch 
Log Message:
Update Zope to 2.10.4 for use with Plone 3


zope-2.10.4-config.patch:

--- NEW FILE zope-2.10.4-config.patch ---
--- skel/etc/zope.conf.in.orig	2007-08-14 00:14:05.000000000 -0600
+++ skel/etc/zope.conf.in	2007-08-14 00:14:49.000000000 -0600
@@ -148,6 +148,7 @@
 #
 #    effective-user chrism
 
+effective-user zope
 
 # Directive: enable-product-installation
 #
@@ -288,6 +289,7 @@
 #
 #     mime-types  $INSTANCE/etc/mime.types
 
+mime-types  /etc/mime.types
 
 # Directive: structured-text-header-level
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Aug 2007 16:27:18 -0000	1.18
+++ .cvsignore	15 Sep 2007 21:32:12 -0000	1.19
@@ -1 +1 @@
-Zope-2.9.8-final.tgz
+Zope-2.10.4-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Aug 2007 16:27:18 -0000	1.18
+++ sources	15 Sep 2007 21:32:12 -0000	1.19
@@ -1 +1 @@
-ad7acd2378568264cc301657ee79d361  Zope-2.9.8-final.tgz
+07dde81bdfe42ca00f73912b3d73e0ec  Zope-2.10.4-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zope.spec	6 Aug 2007 16:27:18 -0000	1.34
+++ zope.spec	15 Sep 2007 21:32:12 -0000	1.35
@@ -1,4 +1,4 @@
-%define python_minver 2.4.2
+%define python_minver 2.4.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -14,12 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.8
-Release: 1%{?dist}
+Version: 2.10.4
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz
+Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,13 +28,10 @@
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz
-Patch0:  zope-2.7.3-config.patch
-#Patch1:  zope.configure-2.9.5.patch
-
-BuildRequires: python-devel >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
-Requires:      python >= %{python_minver}
+Patch0: zope-2.10.4-config.patch
+
+BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} 
+Requires:      python >= %{python_minver}, libxml2-python, python-elementtree
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -50,10 +47,7 @@
 
 %prep
 %setup -q -n Zope-%{version}-final
-%patch0 -p2 -b .config
-#%patch1 -p1
-# remove the backup, or we'll install it too...
-rm -f skel/etc/zope.conf.in.config
+%patch0 -p0
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -107,10 +101,14 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
-#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+chmod 750 $RPM_BUILD_ROOT%{instance_home}
+
+# Set needed permissions
+# We might go as far as to only allow zope r/w to the .pyc files
+for dir in %{instance_home}/{Products,log,lib,var}; do
+    chmod 775 $RPM_BUILD_ROOT$dir
+done
 
-chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # included in %%doc
@@ -156,7 +154,7 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc doc/* README.Fedora
+%doc doc/* README.Fedora ZopePublicLicense.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
@@ -174,187 +172,17 @@
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
-%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
-%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
+%attr(-, root, %{zope_group}) %{instance_home}/*
 %{python_sitearch}/zope.pth
 
 
 %changelog
-* Mon Aug 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.8-1
-- Updated to 2.9.8
+* Mon Sep 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-3
+- Updated Requires for libxml2-python and python-elementtree
 
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-2
-- Added zope.pth to fix misc. zope scripts including some zeo stuff
+* Tue Aug 14 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-2
+- Added config patch
 
-* Mon Apr 2 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-1
-- Removed hotfix 20070320
-- Updated to 2.9.7
-- Removed no longer needed patch for acceptable python version
-
-* Wed Mar 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-2
-- Added hotfix 20070320 (#233378)
-
-* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
-- Updated to 2.9.6 added Five back into Zope (#221252)
-
-* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
-- Updated to 2.9.5 and removed not needed patches
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
-- Removed Five from zope package (plone 2.5.1 now provides the needed
-  version.)
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-2
-- fix path on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-1
-- update to 2.9.4
-
-* Wed Aug  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.9.3-4
-- Security: fix world-writable permissions on logrotate config files
-  and README.Fedora (#200794).
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-3
-- try to fix build on x86_64 (take 2)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-2
-- try to fix build on x86_64 (take 1)
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-1
-- version 2.9.3
-- add Hotfix_20060705
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
-- version 2.9.2
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
-- version 2.8.5
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
-- rebuild
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
-- add warning about zope 2.8 & python 2.4 (bug 171681)
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
-- version 2.8.3
-
-* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
-- version 2.8.2
-
-* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
-- version 2.8.1
-
-* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
-- rebuild
-
-* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
-- version 2.8.0
-
-* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-2
-- don't remove the zope user un postun (to keep the Data.fs to the
-  correct owner after removal)
-
-* Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1%{?dist}
-- version 2.7.6
-- use disttag
-
-* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
-- add hotfix
-
-* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1.fc4
-- version 2.7.5
-- drop Epoch
-- change release tag for FC4
-- convert some tabs into spaces
-
-* Wed Jan 26 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.4-1
-- version 2.7.4
-- flag the documentation as %%doc
-- make %%zope_home go+rx to allow users to create instances and to allow
-  access to docs
-- add a logrotate cron job
-- flag config files as %%config even in %%zope_home and %%instance_home
-
-* Fri Dec 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.6
-- activate "security-policy-implementation python" in zope.conf
-
-* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.5
-- revert to zope's default directory tree to allow multiple instances
-- make the zopectl script multiple-instaces-aware.
-- add README.Fedora
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.4
-- compile scripts in %zope_home/bin too
-- keep skel dir in %zope_home to fix mkzopeinstance
-- BuildRequire python, since python-devel doesn't require it.
-
-* Fri Nov 12 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.3
-- compile .pyc instead of just touch-ing them
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
-- deal with leftover .pyc files
-- minor spec cleanups
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.1
-- fix scriptlets requirements
-- use standard buildroot
-- replace %%buildroot by RPM_BUILD_ROOT
-- update to 2.7.3
-- drop Hotfix
-- drop patch 1, fixed upstream
-
-* Tue Aug 10 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.3
-- add hotfix from Zope.org: 
-  http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.2
-- add patch to warn the user that the initial user cannot be added while
-  Zope is running (from Chris McDonough)
-
-* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.2-0.fdr.1
-- version 2.7.2
-- remove leftover byte-compilation in %%post
-- Zope 2.7.x really requires python >= 2.3.3
-
-* Wed Jul 14 2004 Rex Dieter <rexdieter at sf.net> 2.7.1-0.fdr.1
-- 2.7.1
-- move files created in %%post back into rpm.  Unowned files are bad.
-- make (theoretically) buildable for all rh73-rh90,fc1/2,el3
-  NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) 
-  docs claim 2.3.3 is required.  (??) 
-- don't use Requires(preun,postun)
-- use %%_smp_mflags
-
-* Tue Apr 28 2004 Chris McDonough <chrism at plope.com> 2.7.0-0.fdr.1
-- Prep for submission to Fedora.us by revising work done by Matthias
-- Refer to source files by URL instead of by name
-- Write version.txt into software home in post
-- Don't ship byte-compiled files, instead compile them in post
-- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup)
-- Add patch for objectmanager bug that could effect sites that depend
-  on userid/username separation
-- Improved init script (OK and FAILED now are printed at the appropriate
-  times)
-- Remove runzope workaround by adding a <zoperunner> stanza to the
-  config file.
-- Start in runlevels 345.
-- Known issues:
-  - zopectl is started and runs as the root user at boot time,
-    (although Zope itself runs as the zope user)
-  - no distro-specific docs telling people which port the software
-    runs on or how to add a user via zopectl adduser.
-
-* Wed Feb 18 2004 Matthias Saou <http://freshrpms.net/> 2.7.0-0.6.fr
-- Initial RPM release.
-- The startup/stop needs to be modified further.
-- Currently "zopectl" returns an error although Zope does start...
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-1
+- Initial Package
 


--- zope-2.7.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 15 21:38:47 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sat, 15 Sep 2007 17:38:47 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, NONE,
	1.1 evolution.spec, 1.289, 1.290
Message-ID: <200709152138.l8FLclUk018758@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18733

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.11.92-icon-names.patch 
Log Message:

* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
- Add patch for GNOME bug #477045 (use standard icon names).


evolution-2.11.92-icon-names.patch:

--- NEW FILE evolution-2.11.92-icon-names.patch ---
diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-15 16:53:46.000000000 -0400
@@ -206,7 +206,7 @@ enum {
 /* Options for View */
 static EMFBSearchBarItem emfb_view_items[] = {
 	{{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL},
-	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"},
+	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"},
 	{{ NULL, 0, 0 }, NULL},
 	{{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL},
 	{{ NULL, -1, 0 }, NULL}
@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items
 /* TODO: Following options should be  customizable */
 static EMFBSearchBarItem temp_view_items[] = {
 	{{ NULL, 0, 0 }, NULL},
-	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
+	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"},
 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
 	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
-	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
+	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"},
 /* 	{ NULL, 0, NULL }, */
 /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
 	{{ NULL, -1, 0 }, NULL}
diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
--- evolution-2.11.92/mail/em-folder-tree.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-tree.c	2007-09-15 16:53:46.000000000 -0400
@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
 	guint32 flags;
 	
 	if (!initialised) {
-		folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
-		folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
-		folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU);
+		folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
 		folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU);
@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[]
 	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
 	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
 	{ E_POPUP_BAR, "10.emc" },
-	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 },
+	{ E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
 };
 
 static void
@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = {
 	
 	{ E_POPUP_BAR, "20.emc" },
 	/* FIXME: need to disable for nochildren folders */
-	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS },
+	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
 	/* FIXME: need to disable for undeletable folders */
-	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
 	{ E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
-	{ E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
-	{ E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
+	{ E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
+	{ E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
 
 	
 	{ E_POPUP_BAR, "80.emc" },
diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
--- evolution-2.11.92/mail/mail.error.xml.icon-names	2007-07-28 17:08:12.000000000 -0400
+++ evolution-2.11.92/mail/mail.error.xml	2007-09-15 16:53:46.000000000 -0400
@@ -16,14 +16,14 @@
     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
 {0}
 Send anyway?</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
     <_primary>Are you sure you want to send a message without a subject?</_primary>
     <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
@@ -32,14 +32,14 @@ Send anyway?</_secondary>
     <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
 
 Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
     <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
     <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
   </error>
 
@@ -51,36 +51,36 @@ Many email systems add an Apparently-To 
   <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
     <_primary>Use default drafts folder?</_primary>
     <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
     <_primary>Are you sure you want to open {0} messages at once?</_primary>
     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
     <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
     <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="application-exit" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="async-error" type="error">
@@ -99,8 +99,8 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="session-message-warning" type="warning">
@@ -109,8 +109,8 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="session-message-error" type="info">
@@ -119,15 +119,15 @@ Many email systems add an Apparently-To 
 
   <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
     <_primary>Enter password.</_primary>
     <secondary>{0}</secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="filter-load-error" type="error">
@@ -179,15 +179,15 @@ Many email systems add an Apparently-To 
     <_title>Delete &quot;{0}&quot;?</_title>
     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
[...2080 lines suppressed...]
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	
 	E_PIXMAP_END
 };
diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
--- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-table.c	2007-09-15 16:53:46.000000000 -0400
@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
 	{ E_POPUP_BAR, "70.bar" },
 
 	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE },
 	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
 	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
 	{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
@@ -1494,7 +1494,7 @@ e_day_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
--- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-calendar-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
 }
 
 static EPopupItem ecv_main_items [] = {
-	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
+	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 },
 	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
 	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
 	{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
@@ -1691,9 +1691,9 @@ static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 	{ E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
 	{ E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
-	{ E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
 
 	{ E_POPUP_BAR, "50." },
 
diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
--- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/tasks-component.c	2007-09-15 16:53:46.000000000 -0400
@@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
 static EPopupItem etc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
--- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/calendar-commands.c	2007-09-15 16:53:46.000000000 -0400
@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
-static EPixmap pixmaps [] =
-{
-	E_PIXMAP ("/Toolbar/DayView",	      "stock_calendar-view-day",       E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WorkWeekView",    "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/WeekView",	      "stock_calendar-view-week",      E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MonthView",	      "stock_calendar-view-month",     E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/ListView",	      "stock_calendar-view-list",      E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/Prev",             "stock_previous",                   E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/Next",             "stock_next",                   E_ICON_SIZE_LARGE_TOOLBAR),
+static EPixmap pixmaps [] = {
+	E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU),
+        E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/MonthView",	"stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
 
 	E_PIXMAP_END
 };
diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
--- evolution-2.11.92/calendar/gui/memos-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/memos-control.c	2007-09-15 16:53:46.000000000 -0400
@@ -39,6 +39,7 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-print.h>
+#include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
 
 #include "calendar-config.h"
@@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
+static EPixmap pixmaps [] = {
+	E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+
+	E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+
+	E_PIXMAP_END
+};
+
 void
 memos_control_activate (BonoboControl *control, EMemos *memos)
 {
@@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *c
 			       NULL);
 	g_free (xmlfile);
 
+	e_pixmaps_update (uic, pixmaps);
+
 	e_memos_setup_view_menus (memos, uic);
 
 	/* Signals from the memos widget; also sensitize the menu items as appropriate */
diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
--- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names	2007-09-02 14:57:10.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-cal-popup.c	2007-09-15 16:53:46.000000000 -0400
@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
 static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
 
 static ECalPopupItem ecalp_attachment_object_popups[] = {
-	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
+	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
 	{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE },
-	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
+	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
 	{ E_POPUP_BAR, "05.attach", },
 };
 
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-15 16:53:46.000000000 -0400
@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
 
 	/* Create the pixmaps. */
 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
-	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- evolution.spec	12 Sep 2007 01:14:37 -0000	1.289
+++ evolution.spec	15 Sep 2007 21:38:15 -0000	1.290
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.11.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -124,6 +124,9 @@
 # GNOME bug #476040
 Patch35: evolution-2.11.92-mail-attachment.patch
 
+# GNOME bug #477045
+Patch36: evolution-2.11.92-icon-names.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -264,6 +267,7 @@
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
 %patch35 -p1 -b .mail-attachment
+%patch36 -p1 -b .icon-names
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -713,6 +717,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
+- Add patch for GNOME bug #477045 (use standard icon names).
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-3.fc8
 - Add patch for GNOME bug #476040 (fix attachment icon).
 



From fedora-extras-commits at redhat.com  Sat Sep 15 21:39:56 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:39:56 -0400
Subject: rpms/plone/FC-6 .cvsignore, 1.15, 1.16 plone.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <200709152139.l8FLduou018812@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18787/FC-6

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 May 2007 22:07:25 -0000	1.15
+++ .cvsignore	15 Sep 2007 21:39:24 -0000	1.16
@@ -1 +1 @@
-Plone-2.5.3-final.tar.gz
+Plone-3.0.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plone.spec	23 May 2007 22:29:19 -0000	1.28
+++ plone.spec	15 Sep 2007 21:39:24 -0000	1.29
@@ -1,17 +1,18 @@
-%define python_minver 2.4.2
-%define zope_minver 2.9.4
+%define python_minver 2.4.3
+%define zope_minver 2.10.4
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
+%define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        2.5.3
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
-Source0:        http://plone.googlecode.com/files/Plone-%{version}-final.tar.gz
+Source0:        http://plone.googlecode.com/files/Plone-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,12 +21,12 @@
 
 %description
 Plone is a user friendly and powerful content management system based on Zope.
-It is easy to use, translated into over 30 languages and carefully follows
+It is easy to use, translated into over 35 languages and carefully follows
 standards. It's under active development and easily extensible with add-on
 products.
 
 %prep
-%setup -q -n Plone-%{version}-final
+%setup -q -n Plone-%{version}
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -37,15 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{software_home}/Products
-cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
-
-# Remove Five because Zope provides the correct verison of Five
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
-
-# Avoid conflicts, put those in %%doc
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
-rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
-
+install -d $RPM_BUILD_ROOT%{software_home}/lib/python
+cp -pr Products/* $RPM_BUILD_ROOT%{software_home}/Products
+cp -pr lib/python/* $RPM_BUILD_ROOT%{software_home}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,88 +53,19 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt CONTENTS.txt
-%{software_home}/Products/*
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyc
-%exclude %{software_home}/Products/CacheFu/squid/templates/timing.pyo
-
+%doc README.txt RELEASENOTES.txt INSTALL.txt
+%{software_home}/*
 
 %changelog
-* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.3-1
-- Fixed CacheFu squid scripts (removed pyc and pyo)
-- Updated to 2.5.3
-
-* Sun Jan 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.2-1
-- Updated to 2.5.2
-- Removed Plone Hotfix 20061031
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-6
-- Retag
-
-* Sat Jan 6 2007 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-5
-- Updated so zope now provides Five
-
-* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-4
-- Updated so plone now provides the correct version of the Five product
-
-* Sat Nov 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-3
-- add Plone Hotfix 20061031 (bug 213983)
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- rebuild
-
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-1
-- version 2.5.1
-
-* Thu Oct 05 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-4
-- Update PasswordResetTool to fix CVE-2006-4247
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-3
-- Zope 2.9.4 went back to zope/lib/python on x86_64
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-2
-- fix path on x86_64
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-1
-- Version 2.5
-- Drop Hotfix, included
-- condrestart Zope on %%post
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
-- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
-- restart Zope on upgrade (will migrate it to %%postun for the
-  next release, but we need to make sure zope is restarted for
-  this one (security)
-
-* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
-- version 2.1.2
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
-- version 2.1.1
-
-* Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
-- version 2.1 final
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr>
-- rebuild
-
-* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.3.rc2
-- update to rc2
-- drop buildarch: noarch since _libdir depends on arch (on x86_64)
-- put readmes in %%doc
-
-* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.2.rc1
-- update to rc1
-
-* Wed Jun 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-0.1.alpha2
-- update to 2.1 alpha2 to work with python >= 2.4 and zope >= 2.8
+* Fri Sep 14 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0.1-1
+- Update to Plone 3.0.1
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
+- Moved plone install back to software_home
+- Updated to Plone 3.0 final release
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.5-2
-- apply Matthias' suggestions: cleanup %%description, drop Epoch, and
-  use a better Group.
+* Wed Aug 2 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.2rc2
+- Moved plone install from software_home to instance_home (workaround)
 
-* Fri Feb 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.5-1
-- initial Fedora Extras RPM
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-0.1rc2
+- Initial Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 May 2007 22:07:25 -0000	1.15
+++ sources	15 Sep 2007 21:39:24 -0000	1.16
@@ -1 +1 @@
-36117b0757982d66d445b6c6b9df0e25  Plone-2.5.3-final.tar.gz
+cf54c017ae383688112f2a4e45a150df  Plone-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 21:49:14 2007
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Sat, 15 Sep 2007 17:49:14 -0400
Subject: rpms/plone/EL-5 .cvsignore, 1.16, 1.17 plone.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <200709152149.l8FLnEOp023304@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282/EL-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
Update to Plone 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Sep 2007 22:16:42 -0000	1.16
+++ .cvsignore	15 Sep 2007 21:48:41 -0000	1.17
@@ -1 +1 @@
-Plone-3.0.tar.gz
+Plone-3.0.1.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/plone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plone.spec	6 Sep 2007 22:16:43 -0000	1.29
+++ plone.spec	15 Sep 2007 21:48:41 -0000	1.30
@@ -6,7 +6,7 @@
 %define instance_home  %{_localstatedir}/lib/zope
 
 Name:           plone
-Version:        3.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
@@ -57,6 +57,9 @@
 %{software_home}/*
 
 %changelog
+* Fri Sep 14 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0.1-1
+- Update to Plone 3.0.1
+
 * Thu Aug 23 2007 Jonathan Steffan <jon a fedoraunity.org> 3.0-1
 - Moved plone install back to software_home
 - Updated to Plone 3.0 final release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2007 22:16:43 -0000	1.16
+++ sources	15 Sep 2007 21:48:41 -0000	1.17
@@ -1 +1 @@
-84a4513fdabd191c85e364e159979590  Plone-3.0.tar.gz
+cf54c017ae383688112f2a4e45a150df  Plone-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 15 22:12:29 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 18:12:29 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.68, 1.69 sources, 1.72, 
	1.73 system-config-date.spec, 1.78, 1.79
Message-ID: <200709152212.l8FMCTmF029984@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29962

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	15 Sep 2007 10:42:40 -0000	1.68
+++ .cvsignore	15 Sep 2007 22:11:57 -0000	1.69
@@ -1 +1 @@
-system-config-date-1.9.8.tar.bz2
+system-config-date-1.9.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	15 Sep 2007 10:42:40 -0000	1.72
+++ sources	15 Sep 2007 22:11:57 -0000	1.73
@@ -1 +1 @@
-4d58698983ec95318faa6a5e9f1b75da  system-config-date-1.9.8.tar.bz2
+58c7c971e7dd0790a3832bcf3f0da88f  system-config-date-1.9.9.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- system-config-date.spec	15 Sep 2007 10:42:40 -0000	1.78
+++ system-config-date.spec	15 Sep 2007 22:11:57 -0000	1.79
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.8
+Version: 1.9.9
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPLv2+
@@ -100,6 +100,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.9
+- pick up updated translations
+
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.8
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Sat Sep 15 22:15:38 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Sat, 15 Sep 2007 18:15:38 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.54, 1.55 sources, 1.58,
	1.59 system-config-users.spec, 1.63, 1.64
Message-ID: <200709152215.l8FMFcA0030090@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30066

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	15 Sep 2007 10:48:27 -0000	1.54
+++ .cvsignore	15 Sep 2007 22:15:06 -0000	1.55
@@ -1 +1 @@
-system-config-users-1.2.66.tar.bz2
+system-config-users-1.2.67.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	15 Sep 2007 10:48:27 -0000	1.58
+++ sources	15 Sep 2007 22:15:06 -0000	1.59
@@ -1 +1 @@
-04bfb7a789afbf244f0e379f7e982d1c  system-config-users-1.2.66.tar.bz2
+abf42a04901188e1cf2dc36378b0e035  system-config-users-1.2.67.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- system-config-users.spec	15 Sep 2007 10:48:27 -0000	1.63
+++ system-config-users.spec	15 Sep 2007 22:15:06 -0000	1.64
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.66
+Version: 1.2.67
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,9 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.67
+- pick up updated translations
+
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.66
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Sun Sep 16 00:52:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 15 Sep 2007 20:52:53 -0400
Subject: rpms/dbus-glib/devel dbus-glib.spec,1.15,1.16
Message-ID: <200709160052.l8G0qrY2012096@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/dbus-glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12076

Modified Files:
	dbus-glib.spec 
Log Message:
rebuild



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbus-glib.spec	2 Aug 2007 02:25:16 -0000	1.15
+++ dbus-glib.spec	16 Sep 2007 00:52:20 -0000	1.16
@@ -8,7 +8,7 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
@@ -114,6 +114,9 @@
 %endif
 
 %changelog
+* Sat Sep 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-3
+- Rebuild against new expat
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-2
 - Fix a bug in introspection support (#248150)
 



From fedora-extras-commits at redhat.com  Sun Sep 16 00:54:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 15 Sep 2007 20:54:41 -0400
Subject: rpms/glob2/F-7 glob2.spec,1.4,1.5
Message-ID: <200709160054.l8G0sfXB012176@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12156

Modified Files:
	glob2.spec 
Log Message:
new install method


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/glob2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glob2.spec	8 Sep 2007 15:43:01 -0000	1.4
+++ glob2.spec	16 Sep 2007 00:54:09 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -36,6 +36,9 @@
 %patch1 -p0
 
 chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
+%if "%{?fedora}" > "7"
+sed -i 's|boost_thread|boost_thread-mt|' SConstruct
+%endif
 
 
 %build
@@ -44,8 +47,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
+#scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/glob2/{data/fonts,data/gfx/cursor,data/gui,data/icons,data/zik,maps,scripts,campaigns}
+cp -rp {data,campaigns,scripts,maps} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp src/glob2 $RPM_BUILD_ROOT%{_bindir}/
+
+find $RPM_BUILD_ROOT -name SConscript -exec rm -f {} \;
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
@@ -84,6 +94,8 @@
 
 
 %changelog
+* Sun Sep 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-2
+- new install method
 * Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
 - update to 0.9.1
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-3



From fedora-extras-commits at redhat.com  Sun Sep 16 00:59:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Sat, 15 Sep 2007 20:59:54 -0400
Subject: rpms/glob2/devel glob2.spec,1.4,1.5
Message-ID: <200709160059.l8G0xsNT012303@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12259

Modified Files:
	glob2.spec 
Log Message:
new install method



Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glob2.spec	8 Sep 2007 15:51:25 -0000	1.4
+++ glob2.spec	16 Sep 2007 00:59:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -36,6 +36,9 @@
 %patch1 -p0
 
 chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
+%if "%{?fedora}" > "7"
+sed -i 's|boost_thread|boost_thread-mt|' SConstruct
+%endif
 
 
 %build
@@ -44,8 +47,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
+#scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/glob2/{data/fonts,data/gfx/cursor,data/gui,data/icons,data/zik,maps,scripts,campaigns}
+cp -rp {data,campaigns,scripts,maps} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp src/glob2 $RPM_BUILD_ROOT%{_bindir}/
+
+find $RPM_BUILD_ROOT -name SConscript -exec rm -f {} \;
 
 for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
@@ -84,6 +94,8 @@
 
 
 %changelog
+* Sun Sep 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-2
+- new install method
 * Tue Sep 04 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.9.1-1
 - update to 0.9.1
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.8.21-4



From fedora-extras-commits at redhat.com  Sun Sep 16 07:34:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 03:34:37 -0400
Subject: comps comps-f8.xml.in,1.109,1.110
Message-ID: <200709160734.l8G7YbtA029636@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29616

Modified Files:
	comps-f8.xml.in 
Log Message:
strumbahnfahrer got renamed to stormbaancoureur


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- comps-f8.xml.in	14 Sep 2007 14:39:09 -0000	1.109
+++ comps-f8.xml.in	16 Sep 2007 07:34:06 -0000	1.110
@@ -1538,7 +1538,7 @@
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
-      <packagereq type="optional">sturmbahnfahrer</packagereq>
+      <packagereq type="optional">stormbaancoureur</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
       <packagereq type="optional">taxipilot</packagereq>



From fedora-extras-commits at redhat.com  Sun Sep 16 07:45:31 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Sep 2007 03:45:31 -0400
Subject: rpms/wine/F-7 .cvsignore, 1.40, 1.41 sources, 1.41, 1.42 wine.spec, 
	1.59, 1.60
Message-ID: <200709160745.l8G7jVnU029791@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29727/F-7

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Aug 2007 08:27:58 -0000	1.40
+++ .cvsignore	16 Sep 2007 07:44:58 -0000	1.41
@@ -1 +1 @@
-wine-0.9.44-fe.tar.bz2
+wine-0.9.45-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Aug 2007 08:27:58 -0000	1.41
+++ sources	16 Sep 2007 07:44:58 -0000	1.42
@@ -1 +1 @@
-3dd2dbd3f82126d4dffe8749a8a01296  wine-0.9.44-fe.tar.bz2
+4ec2ac353fa955365de58c7b0db344de  wine-0.9.45-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/wine.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- wine.spec	25 Aug 2007 08:27:58 -0000	1.59
+++ wine.spec	16 Sep 2007 07:44:58 -0000	1.60
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.44
+Version:	0.9.45
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -18,7 +18,7 @@
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.44-fe.tar.bz2
+Source0:        wine-0.9.45-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -559,6 +559,7 @@
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
@@ -757,6 +758,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Sep 16 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.45-1
+- version upgrade
+
 * Sat Aug 25 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.44-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Sep 16 07:45:35 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Sep 2007 03:45:35 -0400
Subject: rpms/wine/devel .cvsignore, 1.40, 1.41 sources, 1.41, 1.42 wine.spec,
	1.60, 1.61
Message-ID: <200709160745.l8G7jZqR029798@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29727/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Aug 2007 08:28:03 -0000	1.40
+++ .cvsignore	16 Sep 2007 07:45:02 -0000	1.41
@@ -1 +1 @@
-wine-0.9.44-fe.tar.bz2
+wine-0.9.45-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Aug 2007 08:28:03 -0000	1.41
+++ sources	16 Sep 2007 07:45:02 -0000	1.42
@@ -1 +1 @@
-3dd2dbd3f82126d4dffe8749a8a01296  wine-0.9.44-fe.tar.bz2
+4ec2ac353fa955365de58c7b0db344de  wine-0.9.45-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- wine.spec	25 Aug 2007 08:28:03 -0000	1.60
+++ wine.spec	16 Sep 2007 07:45:02 -0000	1.61
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.44
+Version:	0.9.45
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -18,7 +18,7 @@
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.44-fe.tar.bz2
+Source0:        wine-0.9.45-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -559,6 +559,7 @@
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
@@ -757,6 +758,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Sep 16 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.45-1
+- version upgrade
+
 * Sat Aug 25 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.44-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Sep 16 08:31:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 16 Sep 2007 04:31:21 -0400
Subject: upgradecheck upgradecheck.py,1.38,1.39 upgradecheckspam.py,1.5,1.6
Message-ID: <200709160831.l8G8VLv4001309@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1289

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Add option -T for disabling "testing" repos


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- upgradecheck.py	8 Sep 2007 17:21:09 -0000	1.38
+++ upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upgradecheckspam.py	8 Sep 2007 17:21:09 -0000	1.5
+++ upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
@@ -75,6 +75,8 @@
                       help="do not send mail, just output the results")
     parser.add_option("-w", "--noowners", default=False, action="store_true",
                       help="do not do owners.list processing")
+    parser.add_option("-T", "--notesting", default=False, action="store_true",
+                      help="do not process repos with \"testing\" in their id")
     parser.add_option("-x", "--nextonly", default=False, action="store_true",
                       help="check next dist version only for each package, "
                       "not all newer ones")
@@ -121,7 +123,8 @@
     for dist in dists:
         solver = MySolver(config = opts.config)
         for repo in solver.repos.repos.values():
-            if re.sub('\D+', '', repo.id) != dist:
+            if re.sub('\D+', '', repo.id) != dist or \
+               (opts.notesting and repo.id.find("testing") != -1):
                 repo.disable()
             else:
                 repo.enable()



From fedora-extras-commits at redhat.com  Sun Sep 16 08:50:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 16 Sep 2007 04:50:21 -0400
Subject: upgradecheck upgradecheck.py,1.39,1.40 upgradecheckspam.py,1.6,1.7
Message-ID: <200709160850.l8G8oLmL002537@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2504

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Include list of enabled repoids in report


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- upgradecheck.py	16 Sep 2007 08:31:18 -0000	1.39
+++ upgradecheck.py	16 Sep 2007 08:50:19 -0000	1.40
@@ -32,6 +32,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_to = "fedora-devel-list at redhat.com"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -240,7 +256,7 @@
         report.append('')
     report += oldreport
 
-    report = "\n".join(report)
+    report = report_header + "\n\n" + "\n".join(report)
     if report:
         if mail_to and not opts.nomail:
             msg = MIMEText(report)


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgradecheckspam.py	16 Sep 2007 08:31:18 -0000	1.6
+++ upgradecheckspam.py	16 Sep 2007 08:50:19 -0000	1.7
@@ -33,6 +33,8 @@
     sys.stderr.write("%s: Sorry, Python >= 2.3 required.\n" % sys.argv[0])
     sys.exit(1)
 
+from textwrap import fill # python >= 2.3 only
+
 mail_from = "buildsys at fedoraproject.org"
 mail_subject = "Package EVR problems in Fedora %s" % datetime.date.today()
 smtp_server = None
@@ -99,6 +101,13 @@
         for repo in self.repos.listEnabled():
             self.repos.populateSack(which=[repo.id])
 
+    def enabledRepoIds(self):
+        repoids = []
+        for repo in self.repos.listEnabled():
+            repoids.append(repo.id)
+        repoids.sort()
+        return repoids
+
     def log(self, value, msg):
         pass
 
@@ -159,6 +168,13 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    repoids = []
+    for dist in enabled_dists:
+        repoids.extend(solvers[dist].enabledRepoIds())
+    report_header = "Broken upgrade path report for repositories "
+    report_header = report_header + ", ".join(repoids)
+    report_header = fill(report_header, 72)
+
     allnames = {} # Python < 2.4 compat, otherwise we'd use sorted(set(...))
     for dist in enabled_dists:
         # Would use returnNewestByName() but it's broken in yum 3.0.1 (#220841)
@@ -227,7 +243,7 @@
             s.connect()
 
     for owner,report in reports.iteritems():
-        mailbody = "\n".join(report)
+        mailbody = report_header + "\n\n" + "\n".join(report)
 
         if not opts.nomail:
             msg = MIMEText(mailbody)



From fedora-extras-commits at redhat.com  Sun Sep 16 09:57:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 05:57:15 -0400
Subject: rpms/blobwars/devel blobwars-1.07-es.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 blobwars.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709160957.l8G9vFZV012384@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobwars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12321

Modified Files:
	.cvsignore blobwars.spec sources 
Added Files:
	blobwars-1.07-es.patch 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
- New upstream version 1.07 (bz 292391)


blobwars-1.07-es.patch:

--- NEW FILE blobwars-1.07-es.patch ---
--- locale/es.po.old	2007-06-03 16:27:27.000000000 +0200
+++ locale/es.po	2007-06-04 09:33:51.000000000 +0200
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: blobwars 1.06\n"
-"PO-Revision-Date: 2007-04-13 12:47+0100\n"
+"PO-Revision-Date: 2007-06-04 09:33+0100\n"
 "Last-Translator: Pacho Ramos <pacho at condmat1.ciencias.uniovi.es>\n"
 "Language-Team: Catalan Localization <debian-l10n-catalan at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@
 msgstr "Activar 4 Puntos de Seguridad"
 
 msgid "Battle Galdov"
-msgstr "Combate contra Galdov"
+msgstr "Lucha contra Galdov"
 
 msgid "Collect 10 Cherry Plants"
 msgstr "Recolectar 10 Plantas de Cerezas"
@@ -187,28 +187,28 @@
 msgstr "Desactivar Sistemas de Seguridad"
 
 msgid "Defeat 10 Hard Hide Blobs"
-msgstr "Derrotar 10 Blobs de Piel Dura"
+msgstr "Derrotar a 10 Blobs de Piel Dura"
 
 msgid "Defeat 15 Machine Gun Droids"
-msgstr "Derrotar 15 Androides con Ametralladora"
+msgstr "Derrotar a 15 Androides con Ametralladora"
 
 msgid "Defeat 25 Machine Gun Droids"
-msgstr "Derrotar 25 Androides con Ametralladora"
+msgstr "Derrotar a 25 Androides con Ametralladora"
 
 msgid "Defeat 30 enemies"
-msgstr "Derrotar 30 enemigos"
+msgstr "Derrotar a 30 enemigos"
 
 msgid "Defeat 50 Enemies"
-msgstr "Derrotar 50 Enemigos"
+msgstr "Derrotar a 50 Enemigos"
 
 msgid "Defeat 100 Enemies"
-msgstr "Derrotar 100 Enemigos"
+msgstr "Derrotar a 100 Enemigos"
 
 msgid "Defeat 200 Enemies"
-msgstr "Derrotar 200 Enemigos"
+msgstr "Derrotar a 200 Enemigos"
 
 msgid "Defeat BioMech Jetpack Blob"
-msgstr "Derrotar Blob BioMec con la Mochila a Propulsi??n"
+msgstr "Derrotar a Blob BioMec con la Mochila a Propulsi??n"
 
 msgid "Defeat Galdov"
 msgstr "Derrotar a Galdov"
@@ -247,7 +247,7 @@
 msgstr "Inhabilitar el Ca????n Autom??tico"
 
 msgid "Enter Ancient Tomb"
-msgstr "Entrar a la Tumba Antigua"
+msgstr "Entrar en la Tumba Antigua"
 
 msgid "Exit the Ice Caves"
 msgstr "Salir de las Cuevas de Hielo"
@@ -268,7 +268,7 @@
 msgstr "Encontrar 2 cartuchos de dinamita"
 
 msgid "Find 2nd Cypher Piece"
-msgstr "encontrar la segunda Pieza Clave"
+msgstr "Encontrar la segunda Pieza Clave"
 
 msgid "Find 3 Ancient Cogs"
 msgstr "Encontrar 3 Antiguas Ruedas Dentadas"
@@ -314,25 +314,25 @@
 msgstr "Encontrar Fragmentos de la Esfera del Agua"
 
 msgid "Get the Ancient Fire Crystal"
-msgstr "Toma el Antiguo Cristal de Fuego"
+msgstr "Consigue el Antiguo Cristal de Fuego"
 
 msgid "Get the Ancient Reality Crystal"
-msgstr "Toma el Antiguo Cristal de la Realidad"
+msgstr "Consigue el Antiguo Cristal de la Realidad"
 
 msgid "Get the Ancient Space Crystal"
-msgstr "Toma el Antiguo Cristal del Espacio"
+msgstr "Consigue el Antiguo Cristal del Espacio"
 
 msgid "Get the Ancient Time Crystal"
-msgstr "Toma el Antiguo Cristal del Tiempo"
+msgstr "Consigue el Antiguo Cristal del Tiempo"
 
 msgid "Get the Aqua Lung"
-msgstr "Toma el Pulm??n Acu??tico"
+msgstr "Consigue el Pulm??n Acu??tico"
 
 msgid "Get the Jetpack"
-msgstr "Toma la Mochila a Propulsi??n"
+msgstr "Consigue la Mochila a Propulsi??n"
 
 msgid "Get the Reality Crystal"
-msgstr "Toma el Cristal de la Realidad"
+msgstr "Consigue el Cristal de la Realidad"
 
 msgid "Get to the Exit"
 msgstr "Llega a la Salida"
@@ -375,16 +375,16 @@
 
 # Picked up...
 msgid "Picked up an Ancient Cog"
-msgstr "Has tomado una Rueda Dentada"
+msgstr "Has adquirido una Rueda Dentada"
 
 msgid "Picked up an Ancient Key"
-msgstr "Has tomado una Llave Antigua"
+msgstr "Has adquirido una Llave Antigua"
 
 msgid "Picked up a Blue Keycard"
-msgstr "Has tomado una Tarjeta Azul"
+msgstr "Has adquirido una Tarjeta Azul"
 
 msgid "Picked up a Bronze Key"
-msgstr "Has tomado una Llave de Bronce"
+msgstr "Has adquirido una Llave de Bronce"
 
 msgid "Picked up a bunch of Cherries"
 msgstr "Has tomado un racimo de Cerezas"
@@ -393,28 +393,28 @@
 msgstr "Has tomado una Cereza"
 
 msgid "Picked up a Crystal Shard"
-msgstr "Has tomado un Fragmento de Cristal"
+msgstr "Has adquirido un Fragmento de Cristal"
 
 msgid "Picked up a Cyan Keycard"
-msgstr "Has tomado una Tarjeta Cian"
+msgstr "Has adquirido una Tarjeta Cian"
 
 msgid "Picked up a Gold Key"
-msgstr "Has tomado una Llave de Oro"
+msgstr "Has adquirido una Llave de Oro"
 
 msgid "Picked up a Green Keycard"
-msgstr "Has tomado una Tarjeta Verde"
+msgstr "Has adquirido una Tarjeta Verde"
 
 msgid "Picked up a Grenades"
 msgstr "Has conseguido Granadas"
 
 msgid "Picked up a Keycard"
-msgstr "Has tomado una Tarjeta"
+msgstr "Has adquirido una Tarjeta"
 
 msgid "Picked up a Laser Gun"
 msgstr "Has conseguido un Ca????n L??ser"
 
 msgid "Picked up a Machine Gun"
-msgstr "Has aconseguido una Ametralladora"
+msgstr "Has conseguido una Ametralladora"
 
 msgid "Picked up a pair of Cherries"
 msgstr "Has tomado un par de Cerezas"
@@ -423,16 +423,16 @@
 msgstr "Has conseguido una Pistola"
 
 msgid "Picked up a Purple Keycard"
-msgstr "Has tomado una Tarjeta Morada"
+msgstr "Has adquirido una Tarjeta Morada"
 
 msgid "Picked up a Red Keycard"
-msgstr "Has tomado una Tarjeta Roja"
+msgstr "Has adquirido una Tarjeta Roja"
 
 msgid "Picked up a set of Grenades"
 msgstr "Has conseguido un juego de Granadas"
 
 msgid "Picked up a Silver Key"
-msgstr "Has tomado una Llave de Plata"
+msgstr "Has adquirido una Llave de Plata"
 
 msgid "Picked up a Three Way Spread"
 msgstr "Has conseguido un Rifle a Tres Bandas"
@@ -506,7 +506,7 @@
 msgstr "????qu?? era eso?!"
 
 msgid "Galdov: And this is the best the Blob Army can offer?"
-msgstr "Galdov: Y esto es lo mejor que la Armada Blob puede ofrecer?"
+msgstr "Galdov: ??Y esto es lo mejor que la Armada Blob puede ofrecer?"
 
 msgid "Galdov: Stupid creature!! Give up and join us!"
 msgstr "Galdov: ????Criatura est??pida!! ????Abandona y ??nete a nosotros!!"
@@ -531,7 +531,7 @@
 msgstr "Precisi??n"
 
 msgid "All Required Objectives Met - Mission Complete"
-msgstr "Todos los Objeticos requeridos alcanzados - Misi??n Completada"
+msgstr "Todos los Objetivos requeridos alcanzados - Misi??n Completada"
 
 msgid "Ammo Used"
 msgstr "Munici??n Usada"
@@ -564,7 +564,7 @@
 msgstr "Tanque BioMec V2.6"
 
 msgid "Blob Wars : Episode I"
-msgstr "Blob Wars : Episodio II"
+msgstr "Blob Wars : Episodio I"
 
 msgid "Bonuses Picked Up:"
 msgstr "Bonificaciones Obtenidas:"
@@ -670,7 +670,7 @@
 msgstr "El Cuarto Piso ya es accesible"
 
 msgid "Galdov has dropped the crystal! Quick! Get it!!"
-msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??A cogerlo!"
+msgstr "????Galdov ha perdido el cristal!! ??R??pido! ??Hay que conseguirlo!"
 
 msgid "Got the Aqua Lung! You can now swim forever!"
 msgstr "??Ya tienes el Pulm??n Acu??tico! ??Podr??s nadar para siempre??"
@@ -703,13 +703,13 @@
 msgstr "++ Inventario ++"
 
 msgid "Items"
-msgstr "Objectos"
+msgstr "Objetos"
 
 msgid "Items Collected"
-msgstr "Objectos Recolectados"
+msgstr "Objetos Recolectados"
 
 msgid "Items Collected:"
-msgstr "Objectos Recolectados:"
+msgstr "Objetos Recolectados:"
 
 msgid "Jetpack"
 msgstr "Mochila a Propulsi??n"
@@ -763,7 +763,7 @@
 msgstr "Metal Blob Solid : Estad??sticas"
 
 msgid "MIA Statistics"
-msgstr "Estad??sicadas de Perdidos En Acci??n"
+msgstr "Estad??sticas de Perdidos En Acci??n"
 
 msgid "MIAs"
 msgstr "PEAs"
@@ -820,7 +820,7 @@
 msgstr "%s - Objectivo Completado - ??Punto de Control Alcanzado!"
 
 msgid "Objectives Completed:"
-msgstr "Objectivos Completados:"
+msgstr "Objetivos Completados:"
 
 msgid "Obstacles Reset"
 msgstr "Obst??culos Reiniciados"
@@ -850,7 +850,7 @@
 msgstr "Presenta"
 
 msgid "Press Button to Continue..."
-msgstr "Presiona Bot??n para Continuar..."
+msgstr "Presiona Tabulador para Continuar..."
 
 msgid "Press Fire to Continue"
 msgstr "Presiona Fuego para Continuar"
@@ -862,16 +862,16 @@
 msgstr "Rescatar %d PEAs - Objectivo Completado - ??Punto de Control Alcanzado!"
 
 msgid "Rescued %s!"
-msgstr "??Has rescatado %s!"
+msgstr "??Has rescatado a %s!"
 
 msgid "Rescued %s - Checkpoint Reached!"
-msgstr "??Has rescatado %s - Punto de Control Alcanzado!"
+msgstr "??Has rescatado a %s - Punto de Control Alcanzado!"
 
 msgid "Save Complete"
 msgstr "Salvado Completado"
 
 msgid "Saving Game to Save Slot #%d. Please Wait..."
-msgstr "Salvando el Juego a la Ranura #%d. Un Momento..."
+msgstr "Salvando el Juego en la Ranura #%d. Un Momento..."
 
 msgid "Score:"
 msgstr "Puntuaci??n:"
@@ -991,7 +991,7 @@
 msgstr "??Ya tienes la Mochila a Propulsi??n!"
 
 msgid "You'll need to 'Kill Two Birds with One Stone' here..."
-msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Pedrada\"..."
+msgstr "Aqu?? necesitar??s \"Matar Dos P??jaros de Una Tiro\"..."
 
 # Keys
 msgid "backspace"
--- data/es/introText.old	2007-06-02 11:27:48.000000000 +0200
+++ data/es/introText	2007-06-03 16:54:22.000000000 +0200
@@ -8,7 +8,9 @@
 
 0 0 10
 @none@
-Los Blobs eran una raza feliz y amigable. No necesitaban nada m??s. Pasaban sus d??as criando los hijos, recogiendo Cerezas y estudiando astrof??sica y f??sica cu??ntica.
+Los Blobs eran una raza feliz y amigable. No necesitaban nada m??s. 
+Pasaban sus d??as criando a sus hijos, recogiendo Cerezas y 
+estudiando astrof??sica y f??sica cu??ntica.
 
 600 0 1
 @none@
@@ -18,7 +20,9 @@
 
 0 0 10
 @none@
-Las guerras y conflictos eran leyendas para los Blobs. Muchos de ellos nunca hab??an visto un arma y algunos incluso dudaban de su existencia. Eran vidas felices, m??s todav??a por su mundo limpio, climas excelentes y lugares de vacaciones.
+Las guerras y conflictos eran leyendas para los Blobs. Muchos de ellos nunca 
+hab??an visto un arma y algunos incluso dudaban de su existencia. Eran vidas 
+felices, a??n m??s por su mundo limpio, climas excelentes y lugares de vacaciones.
 
 -600 0 1
 @none@
@@ -40,7 +44,8 @@
 
 300 0 0
 @none@
-Las bombas de los invasores alien??genas llovieron sobre su mundo, los peores temores de los Blobs se hicieron realidad... 
+Las bombas de los invasores alien??genas llovieron sobre su mundo, 
+los peores temores de los Blobs se hicieron realidad... 
 @none@
 
 200 0 0
--- data/es/titleWidgets.old	2007-06-03 17:39:49.000000000 +0200
+++ data/es/titleWidgets	2007-06-03 17:40:02.000000000 +0200
@@ -5,8 +5,8 @@
 BUTTON help mainMenu "Ayuda" "*" -1 360 0 0
 BUTTON quit mainMenu "Salir" "*" -1 390 0 0
 
-LABEL label help "Para las instrucciones del juego, mira el manual de" "*" -1 260 0 0
-LABEL label help "instalado en la siguiente localizaci??n," "*" -1 290 0 0
+LABEL label help "Para las instrucciones del juego, mira el manual del" "*" -1 260 0 0
+LABEL label help "juego instalado en la siguiente localizaci??n," "*" -1 290 0 0
 LABEL labelManual help "/usr/share/doc/blobwars/manual.html" "*" -1 320 0 0
 LABEL labelManual help "(actualmente s??lo en ingl??s)" "*" -1 350 0 0
 
--- data/es/optionWidgets.old	2007-06-03 17:03:59.000000000 +0200
+++ data/es/optionWidgets	2007-06-03 17:09:07.000000000 +0200
@@ -1,11 +1,11 @@
 RADIO fullscreen options "Pantalla Completa" "No|S??" 100 65 0 1
 SMOOTH_SLIDER soundvol options "Volumen de Sonido" "*" 100 100 0 128
 SMOOTH_SLIDER musicvol options "Volumen de M??sica" "*" 100 135 0 128
-RADIO output options "Tipus de Sortida" "Mudo|Mono|Est??reo" 100 170 0 2
+RADIO output options "Tipo de Sonido" "Mudo|Mono|Est??reo" 100 170 0 2
 SLIDER gamma options "Brillo" "*" 100 205 1 20
 RADIO gore options "Derramamiento de Sangre" "No|S??" 100 240 0 1
-BUTTON keys options "Configura Teclas..." "*" 100 275 0 100
-BUTTON joysticks options "Configura JoyStick..." "*" 100 310 0 100
+BUTTON keys options "Configura las Teclas..." "*" 100 275 0 100
+BUTTON joysticks options "Configura el JoyStick..." "*" 100 310 0 100
 
 BUTTON cheats options "Trucos..." "*" 100 345 0 100
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2007 20:19:00 -0000	1.3
+++ .cvsignore	16 Sep 2007 09:56:43 -0000	1.4
@@ -1 +1 @@
-blobwars-1.06-2.tar.gz
+blobwars-1.07-1.tar.gz


Index: blobwars.spec
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blobwars.spec	5 Aug 2007 18:42:09 -0000	1.4
+++ blobwars.spec	16 Sep 2007 09:56:43 -0000	1.5
@@ -1,14 +1,15 @@
 Name:           blobwars
-Version:        1.06
-Release:        2%{?dist}
+Version:        1.07
+Release:        1%{?dist}
 Summary:        Mission and Objective based 2D Platform Game
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.parallelrealities.co.uk/blobWars.php
 # no full URL as it gets downloaded through a php script, GRRR
-Source0:        %{name}-%{version}-2.tar.gz
+Source0:        %{name}-%{version}-1.tar.gz
 Patch0:         blobwars-1.05-debian.patch
 Patch1:         blobwars-1.05-desktop.patch
+Patch2:         blobwars-1.07-es.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@
 %setup -q
 %patch0 -p1 -z .debian
 %patch1 -p1 -z .dsktop
+%patch2 -p0
 
 
 %build
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
+- New upstream version 1.07 (bz 292391)
+
 * Sun Aug  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.06-2
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2007 20:19:00 -0000	1.3
+++ sources	16 Sep 2007 09:56:43 -0000	1.4
@@ -1 +1 @@
-f50002a3a2d5daae090c882d2ccf41d1  blobwars-1.06-2.tar.gz
+877d8075ce3f01557be35e7b1da11eec  blobwars-1.07-1.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 10:14:33 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Sun, 16 Sep 2007 06:14:33 -0400
Subject: rpms/php/devel php-5.2.4-easter.patch, NONE,
	1.1 php-5.2.4-embed.patch, NONE, 1.1 php-5.2.4-gnusrc.patch, NONE,
	1.1 php-5.2.4-norpath.patch, NONE, 1.1 php-5.2.4-odbc.patch,
	NONE, 1.1 php-5.2.4-tests-dashn.patch, NONE, 1.1 .cvsignore,
	1.31, 1.32 php.spec, 1.147, 1.148 sources, 1.33,
	1.34 php-4.3.1-odbc.patch, 1.1, NONE php-5.0.0-easter.patch, 1.4,
	NONE php-5.0.4-norpath.patch, 1.1,
	NONE php-5.0.4-tests-dashn.patch, 1.6,
	NONE php-5.1.4-gnusrc.patch, 1.3, NONE php-5.2.3-brigade.patch,
	1.1, NONE php-5.2.3-embed.patch, 1.1, NONE
Message-ID: <200709161014.l8GAEXuh018776@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.4-easter.patch php-5.2.4-embed.patch 
	php-5.2.4-gnusrc.patch php-5.2.4-norpath.patch 
	php-5.2.4-odbc.patch php-5.2.4-tests-dashn.patch 
Removed Files:
	php-4.3.1-odbc.patch php-5.0.0-easter.patch 
	php-5.0.4-norpath.patch php-5.0.4-tests-dashn.patch 
	php-5.1.4-gnusrc.patch php-5.2.3-brigade.patch 
	php-5.2.3-embed.patch 
Log Message:
* Sun Sep 16 2007 Joe Orton <jorton at redhat.com> 5.2.4-2
- update to 5.2.4


php-5.2.4-easter.patch:

--- NEW FILE php-5.2.4-easter.patch ---
--- php-5.2.4/main/logos.h.easter
+++ php-5.2.4/main/logos.h
@@ -491,386 +491,3 @@ static const unsigned char php_logo[] = 
 	102,  63, 251, 220, 139,  16,  65,  26,  16, 112, 
 	 21, 116, 187, 251, 221, 240, 142, 119, 188,   3, 
 	  1,   0,  59,   0 };
-
-static const unsigned char php_egg_logo[] = {
-	 71,  73,  70,  56,  57,  97, 120,   0,  67,   0, 
-	247,   0,   0,   0, 255,   0, 107, 114, 178,   0, 
-	  0,   0,  31,  31,  31, 255, 255, 255, 106, 113, 
-	176,  63,  63,  63, 127, 127, 127, 106, 112, 174, 
-	191, 191, 191, 105, 111, 171, 223, 223, 223, 239, 
-	239, 239, 144, 149, 197, 106, 111, 173, 245, 246, 
-	250, 105, 110, 170, 218, 219, 235,  47,  47,  47, 
-	162, 166, 206,  35,  36,  40, 153, 158, 202,  95, 
-	 95,  95, 175, 175, 175,  88,  93, 141, 159, 159, 
-	159, 116, 122, 182, 125, 131, 187, 143, 143, 143, 
-	 38,  38,  41, 104, 108, 167, 171, 175, 211, 105, 
-	109, 168, 102, 102, 153, 104, 108, 165,  45,  46, 
-	 58, 181, 184, 216, 111, 111, 111, 134, 140, 192, 
-	102, 108, 168,  79,  79,  79, 199, 202, 226,  40, 
-	 41,  49,  92,  98, 150,  53,  53,  63, 236, 237, 
-	245, 130, 130, 171, 122, 122, 160, 104, 107, 163, 
-	 50,  51,  67,  45,  45,  52, 207, 207, 207,  69, 
-	 72, 104,  15,  15,  15,  61,  61,  74, 227, 228, 
-	240,  59,  62,  86, 103, 106, 162, 107, 107, 139, 
-	 73,  77, 113, 102, 103, 156,  54,  56,  76,  97, 
-	103, 159, 137, 137, 182,  35,  35,  38, 190, 193, 
-	221, 145, 145, 193, 103, 105, 159,  78,  82, 122, 
-	 76,  76,  95, 147, 148, 200,  92,  92, 117, 105, 
-	105, 156, 103, 105, 160, 150, 150, 202,  64,  67, 
-	 95, 114, 114, 149, 108, 108, 159, 143, 143, 194, 
-	 84,  84, 106, 140, 140, 191, 102, 104, 157,  48, 
-	 48,  61,  27,  29,  42, 114, 114, 165,  83,  88, 
-	132, 153, 153, 204, 121, 126, 186, 127, 127, 178, 
-	208, 210, 230, 149, 149, 200, 146, 146, 197, 141, 
-	143, 197,  55,  55,  67, 144, 145, 199, 133, 133, 
-	184, 124, 124, 175, 110, 115, 171, 130, 133, 191, 
-	 88,  91, 137,  86,  92, 144, 154, 156, 172,  87, 
-	 92, 139,  85,  86, 125, 118, 123, 184, 121, 122, 
-	172, 124, 128, 187,  82,  86, 130,  39,  39,  46, 
-	 99,  99, 128,  69,  69,  85,  97, 101, 153,  75, 
-	 75, 107, 115, 121, 182, 135, 138, 194, 101, 107, 
-	165,  82,  84, 101, 102, 102, 140,  53,  57,  89, 
-	 69,  71, 101, 137, 137, 188, 109, 116, 179, 130, 
-	130, 182,  57,  57,  76,  93,  99, 155, 117, 117, 
-	168,  62,  63,  86,  84,  84, 122,  79,  79, 114, 
-	112, 117, 177,  58,  58,  71, 127, 131, 189, 106, 
-	106, 150,  76,  76, 101, 134, 135, 187,  20,  20, 
-	 31,  66,  71, 111, 125, 129, 182, 172, 173, 180, 
-	 86,  88, 131, 229, 230, 234, 108, 112, 171, 100, 
-	105, 161, 161, 165, 203,  53,  53,  70,  95,  97, 
-	146,  58,  60,  81, 217, 219, 234, 195, 196, 208, 
-	 82,  85, 125, 112, 118, 181,  82,  82, 106, 114, 
-	117, 175, 154, 157, 195, 134, 134, 179, 111, 111, 
-	162,   6,   7,  11, 110, 111, 146,  93,  93, 138, 
-	 77,  79, 116, 115, 119, 179, 103, 108, 161,  60, 
-	 64, 100,  98,  98, 145,  40,  40,  47,  51,  51, 
-	 63,  69,  69,  95,  73,  78, 122, 197, 198, 202, 
-	 54,  54,  58,  13,  14,  22, 108, 114, 174, 149, 
-	152, 184, 101, 108, 167,  88,  88, 130, 106, 108, 
-	162,  86,  91, 141,  84,  84, 116,  86,  86,  90, 
-	129, 131, 186, 132, 135, 181, 160, 163, 183, 211, 
-	212, 224,  91,  91, 123, 109, 109, 117, 104, 104, 
-	135,  86,  86, 115,  90,  92, 108,  81,  83, 122, 
-	103, 106, 130,  70,  70,  99, 121, 126, 170, 139, 
-	139, 186,  73,  74,  94, 109, 109, 148, 139, 140, 
-	189, 135, 138, 162, 176, 179, 199, 115, 115, 115, 
-	106, 106, 144,  59,  63,  98,  67,  69,  96, 241, 
-	241, 241, 102, 105, 149, 120, 120, 162,  68,  68, 
-	 90,  89,  89, 115,  51,  52,  79, 113, 113, 152, 
-	 33,  35,  55, 189, 190, 215,  79,  79, 104, 213, 
-	214, 218,  94,  95, 142, 163, 164, 176,  86,  89, 
-	133, 112, 112, 156,  80,  81, 118,  63,  65,  90, 
-	102, 103, 124, 126, 129, 157,  72,  72,  98, 150, 
-	150, 154,  72,  74, 100, 112, 112, 151, 138, 139, 
-	192, 122, 125, 180,  49,  50,  64,  78,  78, 110, 
-	119, 119, 157, 125, 126, 174,  77,  81, 119, 125, 
-	126, 180,  56,  56,  72, 118, 120, 173,  46,  49, 
-	 77,  92,  96, 132, 188, 189, 197,  65,  65,  81, 
-	165, 168, 200,  49,  51,  66, 143, 147, 194,  80, 
-	 82, 111, 192, 195, 215, 235, 235, 242, 105, 111, 
-	170,  74,  77, 107, 183, 186, 210, 109, 111, 165, 
-	117, 120, 152,  65,  66,  90, 182, 182, 186, 104, 
-	104, 137, 123, 127, 163, 170, 171, 187, 110, 113, 
-	163,  33, 249,   4,   1,   0,   0,   0,   0,  44, 
-	  0,   0,   0,   0, 120,   0,  67,   0,   0,   8, 
-	255,   0,   1,   8,  28,  72, 176, 160, 193, 131, 
-	  8,  19,  42,  92, 200, 176, 161, 195, 135,  16, 
-	 35,  74, 156,  72, 177, 162, 197, 139,  24,  51, 
-	106, 220, 200, 209, 162, 145,  43, 104, 188, 116, 
-	 28,  73, 210, 160,  23, 145,   8, 141,  24,  84, 
-	 50,  40, 128,  75,  17, 122, 228, 112,  65, 200, 
-	 69, 140, 146, 146,  56,  83, 170,   9, 144,   6, 
-	192,  11,  38,  69, 190, 209,  88,  82, 196, 134, 
-	141,   1,  44,   6,  40,  29,  64,  65,  30,  19, 
-	 29,  71, 138, 250, 137, 129, 163, 202, 157, 107, 
-	 99,  48,  96, 128, 246,  67, 200, 139,  23,  66, 
-	 62, 186, 212, 224,  36, 103, 206,  31,  58,  92, 
-	 56,  75, 214,  35, 198, 210, 183, 112, 153, 142, 
-	 88,  58, 231, 207,  11,  67, 113,  86, 172,  56, 
-	 65,  68,  91, 219, 185,  61, 226, 142, 160,  65, 
-	163, 199, 167,  81, 102,  71,   2,  69,  26, 119, 
-	169,  10,  28,  59, 180, 210, 216,  17, 137, 138, 
-	152,  60,   1, 180, 250,  72, 194,   3, 148,  75, 
-	151,   5,  16, 124, 254, 188,  98,   7, 156, 127, 
-	 24, 118, 196,  24, 209,  67, 138,  10,  32,  54, 
-	 92,   0, 224, 162,  50, 241,  68, 175,  79,  58, 
-	188, 165,  16,  99, 201, 142,  49, 145,  68, 143, 
-	254,  12,   1, 134, 112, 151,  30, 120, 136,  24, 
-	206, 252, 115,   1,  15,  10,  70,  43, 200,  17, 
-	125, 133, 190,  14,  29, 112,  84, 194,  99, 251, 
-	161, 144,  35,  50,  88, 232, 255,  30,  32, 136, 
-	 70,  21,  31, 159,  65,  68, 111,  94,  64, 196, 
-	122, 151,   8, 134, 228,  56, 222, 124, 180,   3, 
-	  8, 163, 219, 131,  24,  45,  26,   3, 133,   1, 
-	108,   0, 211,  29,  67,  58, 188, 213, 193,  17, 
-	226,  96, 246,  25,   2, 248, 213, 167,  64, 131, 
-	 38, 144,  16, 128,   7,  73,  68, 247, 203,  61, 
-	100, 212,   7, 154,   2,   5,  72, 231,  65, 135, 
-	205,  33, 176, 199,   0,  50,  44,  51, 224,  65, 
-	 46,  28,  17, 204,  82,  29,  20,   1, 134,  37, 
-	195,  21,   0,  34, 115,   5,  56,   0,  98,   5, 
-	  4,  16, 176, 205,  51, 235,  76,  33,  64,   2, 
-	 11, 112, 163, 161, 141, 252, 121,  64, 223, 112, 
-	 34, 240, 160, 128,  15,  49, 168, 224, 206,  15, 
-	 39,  10, 132, 214, 120,  20, 220,  81, 135,  17, 
-	104, 104, 200, 222, 140,   1,  68, 144, 163,   4, 
-	 40,  24,  80,   2,   7,  12,  92,  96,  71, 125, 
-	 92,   6, 160, 128,   3,  67,  14, 225, 193, 104, 
-	107,  12, 208, 129,  14,  39, 230, 166,  20,   5, 
-	 75, 180, 194,  67,  35,  90, 246, 233, 146,   3, 
-	  4, 160,  34,  64,   6,  18,  28,  48,  64,  13, 
-	  7,  28, 128, 136, 159,   8, 176, 137,  38,  12, 
-	 57, 164, 169, 192,  24,  50,  12,  96, 195,  11, 
-	 98,  92, 129, 210,  72,  66,  60, 241,  22,  14, 
-	 39,  40,  32,  66, 154, 126,  50,   7,  65,  38, 
-	  4,  36,  32, 192, 170, 172,  94,  96,  64, 134, 
-	 26, 202, 255,  72, 234, 103, 211,  57, 202, 220, 
-	 42, 216,  28, 161, 212,   8,  24,   4, 242, 197, 
-	108,  55, 105, 228,  66,  82, 187,  98, 160, 230, 
-	145, 165,  14, 135,  64, 116,  94,  30, 192,  42, 
-	171,  51, 164, 146,  44, 123,  48,  52,  88, 159, 
-	  8,  81, 160, 225, 131, 106,  20,   0,  81, 138, 
-	 61,  43,  88, 178,   5,  70,  46, 216,  57,   0, 
-	 17, 206, 185,  52,  65,   5,  13,  76, 240, 129, 
-	 75,  13, 108,  80, 170, 140,   1, 108, 240, 229, 
-	179, 171,  18,  48, 197, 180,  46, 201,  27,  64, 
-	 60,  31, 126, 166, 193,   6, 241, 194, 151, 196, 
-	126,  11, 230,  64,  68,  96,   3, 224,  64, 142, 
-	 38,  22, 233,  48,  94, 195,  39,  12,  23,  68, 
-	142,  24,  63, 144, 241,   3,  17, 100,  65, 194, 
-	186, 239,  54, 215,  64, 170, 248,  10,  32, 193, 
-	 12, 103,  38, 107, 130, 151,  26,  19, 112,  67, 
-	203,  45, 231, 248,  64,  11, 244,  68, 160, 193, 
-	103,  30,  32,  28, 128,  15, 107, 248,  81,  41, 
-	 11, 109,  12, 163,   6,  26, 181,  49,  36,  68, 
-	 17,  75,  45,  81,  49, 115,  24,  99,  60, 131, 
-	 53, 138,  36, 144, 128, 151,  77,  19, 208, 194, 
-	  4,  19, 220, 252, 153, 151,  18, 148,  92, 194, 
-	 12, 167,  36, 187,  65, 204,  78,  75, 157, 192, 
-	 62, 101, 164, 173,   8,   3,  26, 183, 240,  64, 
-	 10, 180, 164,  25,   5,  18, 122, 180, 161,  27, 
-	  5,  59,   4,  16,  70,  89,  11,  13, 255, 187, 
-	 20, 186, 245, 229,  24, 230,   0,  37,  11, 112, 
-	200,  20, 116, 224, 114,   0, 153,  24, 167, 208, 
-	 64,   0,  56, 102,  80, 248,   0,  12,  80,  18, 
-	  1,  49, 249, 188,  67,  66,  10,  17, 180, 144, 
-	227,  13,  89,  76,   0,  57,   1,  12,  36, 144, 
-	193,   1,   6, 212,  80, 248, 179,   6,  44, 128, 
-	113,  11, 143, 127,  38,   2,  22,  86, 200,  81, 
-	 15,  13,  74, 173,  17,  69,  31, 125, 143, 183, 
-	  3, 224,  34,  19, 176, 192, 234, 171, 215, 144, 
-	193,   2, 174,  63,  80, 193,   4,   4, 200, 178, 
-	186,   1,  82,  51,  48,  67, 244,  57,  74, 125, 
-	 64,   2,  86, 147,  64, 128, 179, 196, 175, 110, 
-	193,   1,  12,  48, 208, 130, 115,  81, 224,  19, 
-	199, 103,  59,  12, 160, 130,  35, 220,  37,  36, 
-	 68, 165,  20,  24, 171,  37, 243, 220, 119,  63, 
-	 57,  10,   4,   4, 113, 177,   5, 246, 219, 127, 
-	 64, 142,  11,  80,  93, 255, 188,  71,   0, 151, 
-	 64,  32,  10,  58, 251,  12,  96,  54, 161,  16, 
-	 55, 168, 111, 105,  90, 202, 130, 170,   6, 184, 
-	186,  11,  20, 227,   3,   4,  48,   0,   5, 137, 
-	231,  58,  13, 110, 176, 100,  23,  56,   0,  44, 
-	146,  48, 170, 230, 156,  64,   5,   3,   0,  68, 
-	 66, 152, 160, 148, 188, 245, 201,  94, 245, 251, 
-	224, 170,  36,  80,   2,   1, 148, 129,   0, 116, 
-	144,  33, 190, 106, 224,  58,  29, 226, 235,   0, 
-	 22,  56,   4, 178, 255, 136, 195,  11,  10, 140, 
-	 32,  33, 149, 194,  65, 169,  82, 176, 189, 146, 
-	 89,  32,  71,  28, 176,  31,  13,  19,  69, 128, 
-	 93, 248, 144,  85,   6, 200, 209, 234,  74, 144, 
-	168,  68,  89,  64,   2, 252,  43, 220,  12,   4, 
-	176,  40, 230,  32,   0,  58,  39,   8, 204,  49, 
-	 14, 210, 137,   7, 150, 170,   2,  15, 136, 161, 
-	  0,   6, 208, 180,   4, 132, 201,   2,   9, 224, 
-	 64,   6,   8, 199,  42, 227,  93,   0, 135, 221, 
-	 59,  64,   6, 164,  70, 168, 194, 145, 169, 112, 
-	 25, 168,  26, 198,  22, 144,   0,  62, 178, 202, 
-	  2,   6,  80, 133, 169, 172, 181, 130,   1,  72, 
-	161,  32,  74,  80, 131,  91,  98,   0, 154,  62, 
-	153,  32, 142,  37,  91,  64,   4, 194,  64,  53, 
-	140, 205, 131,  17,  12, 112, 164,   0, 178, 168, 
-	175, 213, 161, 192, 117, 110, 187,   1,   1,  46, 
-	 80,  50, 202, 209,  50, 148,   4, 200,  68,   5, 
-	150,  87, 129,  15,  76, 128,  21,  11, 136, 226, 
-	179,   6, 160,  42,  62,  56, 135,  67, 206, 201, 
-	193,   0, 186,  64,  16,  35, 196, 161,  10,  74, 
-	 89, 129,   3, 134,  56,  28,  38, 170,  50,  95, 
-	 65,   8, 128,   6,  76, 128, 181, 130, 137, 130, 
-	  3, 194, 100,  85,  15,  87, 103, 181,  10, 184, 
-	  4,  71,  97, 124,  22,   7,   8, 208, 181,  80, 
-	222, 160,  57, 124,  64, 193,  45, 159, 149,   1, 
-	  3, 172, 225,  79, 244,  81,  64,   8,  66, 208, 
-	255, 133,   1,  64,  73,  32,  87,   8,  64,  96, 
-	128,   0, 130,  89,  13,   7,  71,  99, 220,  33, 
-	  1,  98, 215,  28,  78,  44,  64, 149, 210,  91, 
-	157,   4,   8,  16, 178,   0,  92, 236, 154,   2, 
-	 32,  29,  57, 179, 201,  28, 100, 160,  32, 156, 
-	172, 170, 167,  29, 232,  21, 163,  38,  64, 193, 
-	  5,   3, 160, 147,  64,  90, 178, 201, 100, 121, 
-	169, 134, 248, 202, 162,   9, 234, 195, 135,  31, 
-	 61,  11, 127, 146,  43,  92,   9,  22, 250, 153, 
-	 27,  48, 160, 112,  36, 171,  37,   1, 180, 198, 
-	 31,  81, 212,  96, 158, 226, 148,   0, 172, 154, 
-	 19, 130,  45, 164, 161,  20,  69,  32, 136,  58, 
-	148, 178,   4, 246,  12, 199,  94, 236,  44,  89, 
-	 13, 120, 122, 213,   6, 244, 194,   0,  72, 237, 
-	 96,   5,   9,  48,  83, 151,   4, 149, 117, 194, 
-	 43,  92,  22, 253,  37, 176,  10, 212, 194,   2, 
-	 72,  21, 128,   5, 102,  16, 141, 250, 196, 103, 
-	  8, 129,  56, 129, 250, 248,   6,   0,  77,  40, 
-	165,  10, 195, 153,  38, 115,  48,  56, 188, 146, 
-	101,  81,  66,   7, 157, 101,   9,  60,  40,   0, 
-	252,  77, 176, 112,  12,  40, 224, 103,  64,  25, 
-	 83,  45, 150, 108, 162,  12,  29, 139, 240,  12, 
-	208, 206,  86, 149,  96, 169, 163, 241,   0,   2, 
-	 93, 162, 215,   1,  80,  97,  32,  47,  80, 138, 
-	 25,  62, 115, 159,  52, 117,  72, 150,  32, 197, 
-	 34,   1, 204,  57, 154,  13, 255, 120,  41, 174, 
-	255, 235, 172,  66,  37, 235, 146,   7, 164,  83, 
-	182,   4,  80, 235, 108, 135,  35, 203, 194, 226, 
-	139,   1, 251,  82,  22,   9, 103,  84,   0, 165, 
-	212,   1, 181,  74, 169, 134, 140, 220, 147,  31, 
-	 71, 105, 224,  94, 134, 165, 104,  53,   9, 224, 
-	141, 146,  97, 143, 120,  89, 140, 192, 104,  50, 
-	232,  53, 203,  86, 150, 182, 218, 212,  94,  59, 
-	 10, 247,  63, 118,  12, 199,   3, 243,  25,  13, 
-	  4,  66, 160,  20,  38,  64, 119,   0,  80, 248, 
-	  2,  12, 152, 171, 128, 227, 140, 236, 167, 133, 
-	123,  98,  10,  76, 240,   1,  13,  84,  64, 150, 
-	182, 224,   4, 190, 240,  23, 220,  45,  18,  64, 
-	188, 240, 106,  48, 190, 254, 104, 220, 103, 253, 
-	239,   3,  38, 104,  64,   3,  60, 247,   0,  31, 
-	225, 139, 114, 148, 200,  15, 117, 237,  51, 132, 
-	 38, 116, 129,   5,   4,  73, 237,   0, 172,  32, 
-	  6, 249,  38,  48,   0, 218, 203, 169, 119, 101, 
-	214,  52,  70, 232, 118,  85, 137, 148, 240, 140, 
-	 57,  26, 128, 145,   1, 117, 150, 144, 205, 145, 
-	231, 114, 196,   0, 198, 222, 148,   1, 161, 160, 
-	149, 181,  98, 244,   5,  22, 216, 128,  32, 186, 
-	 90, 113,  64, 213, 100,  28, 230, 104,  79, 142, 
-	143,  44,  93,   6,  46, 144,  72,   6, 220, 120, 
-	 85, 216, 211,  49, 190, 114,  84,  81,  31,  87, 
-	182, 137, 184,   4,  18,   7,  92, 247,  91, 122, 
-	166,   0, 255,  52,  68, 178, 171,  47,   6, 240, 
-	  4,  40,  15, 192,  13,  86,  80,  66,  24,  96, 
-	240, 166, 230, 104, 175, 205, 196, 147, 128,   0, 
-	241, 181, 211,  28,  97, 116, 149,  57,  42, 107, 
-	  0, 152,  87, 178, 117, 146, 183, 150,  95,  22, 
-	174, 232,  72, 234,  32,  30, 176,  97,   0,  71, 
-	 32,  72,  27, 148, 226,   2,  43, 204, 194, 160, 
-	 48, 126, 244,  21,  89,  41,  56, 246,  90, 109, 
-	 52, 102, 126, 150, 235, 196, 172,  67, 215,  17, 
-	245,  81,  33, 128, 131,  82,  84,  42,  16,  21, 
-	243,  99, 202,  26, 194, 145, 145, 101,  72, 185, 
-	252, 229,   8, 203,  63,  34,   0,  98,  63,  35, 
-	102,  58, 158, 213, 135,  59, 125, 179, 150,  20, 
-	192, 131,  16, 128,  33,  23,  36,  42, 200,  15, 
-	148,   2,  60,  13, 141, 108, 215,   3,  52, 192, 
-	245,   8, 240, 128, 172, 253, 250, 199, 108,  53, 
-	235, 153, 129,  77, 193, 137,  62,  32, 220, 102, 
-	228,   1,  18,  78,  90,  41,  55,  96,  82,  41, 
-	 52, 232, 100, 125, 236, 133, 109,  11, 112, 160, 
-	139, 248,  30, 228, 235,  10, 108,  86,   2,   0, 
-	 58, 139, 239,  28, 141,   9,  26,  60,   0,  49, 
-	133,  25,   5,  37,  67, 193,   1,  34, 221, 199, 
-	255, 221, 224, 213,  14, 130, 130,  21, 142,  50, 
-	  0, 217,  16,  36,  20,  74, 193,   1,   2, 168, 
-	169, 174, 172, 170,  83, 145,  85, 123, 155, 162, 
-	251, 205, 129, 107, 174, 179, 162,  17, 255,   6, 
-	185, 199,  89,  85, 104, 225, 113,  96, 112, 171, 
-	 50, 128,   5,  50,  16,  89, 101, 251,   9,   2, 
-	 77, 120, 129, 110,  80,  92, 144,  60,  40, 133, 
-	 20, 160, 118, 137, 151,  74, 150, 163, 126, 132, 
-	 97, 166,  19, 120,  68,  34, 208,  61, 156, 166, 
-	205, 224, 229,   6, 104,  29, 111,  71,  67, 130, 
-	  8, 164, 128,   4,  13, 208, 192, 134,   1, 252, 
-	172, 200, 222, 192,  31, 212,  80,  57, 183, 179, 
-	 86,  42,  16, 132, 160,   9,  72,  43, 130,  16, 
-	 12, 194,   5,  72,  68, 179,  79,  17, 120, 236, 
-	170, 182, 202,  85,   6,   5, 221,  37,   4, 214, 
-	192,   7, 200,  38, 236, 100,  61,  64, 238, 249, 
-	226, 170, 134, 179,  16, 129,  32, 124, 128,   4, 
-	 31, 168,   0, 196,  53,   4, 131,  16, 108,   2, 
-	 28,  74, 249, 167,  65, 152, 145, 241, 252,  28, 
-	105,  18, 128, 103, 165,   9,  10, 160,  30, 126, 
-	225, 253,   6,  17,  32,  48, 122, 251,  52,  50, 
-	152,  62,  43,  71, 139, 247, 188,  75, 134, 224, 
-	108,  38,  36, 229, 201,   9, 241, 212, 185,   2, 
-	 80,  35,  46,  41,   0,   6, 152, 175, 108,  11, 
-	 64, 208, 103, 213, 251,  62,   0, 214,  36, 122, 
-	 22, 126, 207,  28,  71, 196, 130,  88,  44,  88, 
-	123,  66,  92,  80, 169,   1, 220,  97,  14, 252, 
-	201,   1, 126, 254,  94,  89, 105, 216, 138, 248, 
-	252, 178, 151, 140,  79, 111, 115, 236, 175,  96, 
-	 46,  74, 177, 129, 255, 242,  21, 242, 131, 241, 
-	196,  96,   7,  39,  40,   0,  12, 246, 171,  77, 
-	 32, 163,  85, 116,  67, 194, 126, 125, 152, 136, 
-	237, 140,  14, 219, 247,  39, 160,   1,   5, 254, 
-	 35, 167,  54,  60, 228,  12, 252, 199,  20, 158, 
-	176,  28,  17, 102, 122,  49,  71,   0,  76, 247, 
-	 39, 215,  39, 127, 163,  17,   1,  92, 119,  83, 
-	  4,   0, 127, 190, 167, 127,  75, 193,   2,  76, 
-	 32, 121,  12, 225,   5,  59,   3, 126,  74, 161, 
-	  2,  61,  96,  44,  21, 144,  74, 171,  50,   0, 
-	112,  21,  89,  35,   7,  31,  16, 192,  37, 148, 
-	 38, 127, 204, 179,   0,  23, 176,   0, 211, 115, 
-	 58, 216, 147, 128, 125, 178,   2,  40, 180,  20, 
-	 50,  64, 107,  16, 161,   6,  10, 240,   6, 128, 
-	 32,   5, 112, 161,   2,  15,  48,   3, 139,  51, 
-	  3, 220,  22,   1, 133,  23,  35, 157, 231,  28, 
-	113,  22,  34, 170, 215,  46, 136,  87,   1, 143, 
-	192,  57,  17,  32, 129, 201,  98, 131,  75,   1, 
-	  4, 133, 208,   9,  22,  65,   5,  72, 128,   5, 
-	 90, 240,   2, 196, 162,  20, 198, 160,  12,   4, 
-	 16,  58,  52, 232,   1, 189, 231,  18, 107, 162, 
-	 33, 141, 130, 125,  10, 240,  30, 158, 151, 127, 
-	 55,   8,   4, 166,  96,  14,  35, 225,   2, 151, 
-	 64,  10, 111,  49,  24,  85,  96,   6,  24, 176, 
-	  2, 180,  82, 101,  74, 230, 134, 200, 244, 123, 
-	  8,  32,   2,  11,  56,  45,  62,   0, 126,  64, 
-	255,   0,   8,  96, 160,   5,  56, 145,   6, 127, 
-	 80,   8,  19,   3,  23,  49, 240,   9, 139, 160, 
-	 21, 198, 114,  70, 139,   8,  26,  75, 104,  87, 
-	 28, 215,  30, 107,  56,  47,  13, 178,   2, 252, 
-	183,   7, 132,  48,  46, 182, 225,   2,  20, 215, 
-	 24, 187, 225,   7, 130, 216,  28, 188, 167,  37, 
-	111, 168,  33,  32, 144,   4, 159, 168,  37,  32, 
-	192,   3,  67, 112,   2,  56, 192, 127, 205,   0, 
-	  5,  81,   2,   0, 104,  81,   4,  93,  32,   5, 
-	 50, 176,   7, 240,   0, 139,  31,  40,  29,  57, 
-	176, 139, 180, 215, 134,  14,  50,   4,   4,  56, 
-	 45,  10, 192, 122, 174,   0,   9, 252, 151,  14, 
-	194,  80, 140,   5, 177,   5,  84, 208,   7,  80, 
-	 32,   7,   1, 240,   6, 103, 144,  13,  56, 192, 
-	129,   3,  48,   2,  68,  48,   7, 124, 166,  37, 
-	 16, 240,  98, 249, 145,   3,  81, 112, 125,  43, 
-	 48,   6,  39, 128,  30,  39,  96,   6, 128,  40, 
-	 63,   5, 144,   3, 163,   0,   7, 151, 166,  20, 
-	 82,  64,   8, 146,   8, 142,   9, 129,   5,  33, 
-	128,   4, 232,  64,  90,  68, 192, 129,  64,  32, 
-	  9,  26, 114, 123,  28,  39,   2,  33, 144,   4, 
-	 46,  65,   4,  85,  16, 140,  76, 225,  22, 176, 
-	 40,   3,  64, 240,  22, 130, 112,   9, 124, 165, 
-	144,   9, 193, 138, 225, 160,  51, 139,  80, 144, 
-	187, 178,   4, 242, 227,   3,   8,  80,  45, 204, 
-	 33,  63,  16, 208, 108, 103, 190,  48,  14,  20, 
-	160,   2,  32,   9, 139,  62, 249,   4,  24, 136, 
-	146,  14,  97,   8, 129,   0,   1,  67, 192,   3, 
-	  5, 128,  59,  65, 200,  20,  75, 176,   4,  52, 
-	192, 142, 112,   1,   4, 205,  23, 132,  43,  80, 
-	  9, 158,  16,   2, 124, 114, 142, 103, 240,   7, 
-	221, 160,   3,  58, 192,   4,  47,  32, 148,  21, 
-	225,   4,  72, 128,   4, 152, 224,  18,  62,  32, 
-	  9,   1, 232, 147,  62, 217,   1,  70,  49,  13, 
-	186,  80,  14, 137, 160,   0,  73, 112, 118,  95, 
-	160,   4, 152, 144,   3,  13, 137,   5,  98, 201, 
-	 17,  70,   0,  10,  55,  25,   2,   8, 224,   3, 
-	231,  32,   5,  82, 208,   5,  50, 208,   1, 196, 
-	  2,   4, 130,  96,   3,  71, 224,   6, 183,  80, 
-	  7,  47,  96, 113,   7,   1,   6,  84,   0, 134, 
-	  2, 225,   4, 125, 144,   6,   9, 217, 151,  27, 
-	225,   4,  77, 208,   4, 119, 249,  10,  13, 169, 
-	  7,   4, 129,   5,  84, 208,  62, 158, 185, 154, 
-	  8, 177,   5,  80, 208, 153, 172,  25, 155, 178, 
-	 57, 155, 180,  41, 148,   1,   1,   0,  59,   0 };
--- php-5.2.4/main/php_logos.c.easter
+++ php-5.2.4/main/php_logos.c
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
 		return FAILURE;
 
 	php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
-	php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
 	php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
 
 	return SUCCESS;
--- php-5.2.4/ext/standard/info.c.easter
+++ php-5.2.4/ext/standard/info.c
@@ -1058,21 +1058,7 @@ PHP_FUNCTION(phpcredits)
  */
 PHPAPI char *php_logo_guid(void)
 {
-	char *logo_guid;
-
-	time_t the_time;
-	struct tm *ta, tmbuf;
-
-	the_time = time(NULL);
-	ta = php_localtime_r(&the_time, &tmbuf);
-
-	if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
-		logo_guid = PHP_EGG_LOGO_GUID;
-	} else {
-		logo_guid = PHP_LOGO_GUID;
-	}
-
-	return estrdup(logo_guid);
+	return estrdup(PHP_LOGO_GUID);
 
 }
 /* }}} */
@@ -1103,18 +1089,6 @@ PHP_FUNCTION(php_real_logo_guid)
 }
 /* }}} */
 
-/* {{{ proto string php_egg_logo_guid(void)
-   Return the special ID used to request the PHP logo in phpinfo screens*/
-PHP_FUNCTION(php_egg_logo_guid)
-{
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
-	}
-
-	RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
-}
-/* }}} */
-
 /* {{{ proto string zend_logo_guid(void)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
--- php-5.2.4/ext/standard/info.h.easter
+++ php-5.2.4/ext/standard/info.h
@@ -51,7 +51,6 @@
 #endif /* HAVE_CREDITS_DEFS */
 
 #define PHP_LOGO_GUID		  "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
-#define PHP_EGG_LOGO_GUID	"PHPE9568F36-D428-11d2-A769-00AA001ACF42"
 #define ZEND_LOGO_GUID		"PHPE9568F35-D428-11d2-A769-00AA001ACF42"
 #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
 
@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
 PHP_FUNCTION(php_logo_guid);
 PHP_FUNCTION(php_real_logo_guid);
 PHP_FUNCTION(zend_logo_guid);
-PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
--- php-5.2.4/ext/standard/basic_functions.c.easter
+++ php-5.2.4/ext/standard/basic_functions.c
@@ -1753,10 +1753,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_real_log
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
-ZEND_END_ARG_INFO()
-
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
@@ -3135,7 +3131,6 @@ zend_function_entry basic_functions[] = 
 	PHP_FE(phpcredits,														arginfo_phpcredits)
 	PHP_FE(php_logo_guid,													arginfo_php_logo_guid)
 	PHP_FE(php_real_logo_guid,												arginfo_php_real_logo_guid)
-	PHP_FE(php_egg_logo_guid,												arginfo_php_egg_logo_guid)
 	PHP_FE(zend_logo_guid,													arginfo_zend_logo_guid)
 	PHP_FE(php_sapi_name,													arginfo_php_sapi_name)
 	PHP_FE(php_uname,														arginfo_php_uname)

php-5.2.4-embed.patch:

--- NEW FILE php-5.2.4-embed.patch ---
--- php-5.2.4/sapi/embed/config.m4.embed
+++ php-5.2.4/sapi/embed/config.m4
@@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
     yes|shared)
       PHP_EMBED_TYPE=shared
-      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
+      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(INSTALL) -m 0755 libs/libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir); \$(LN_S) libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir)/libphp$(PHP_MAJOR_VERSION).$SHLIB_DL_SUFFIX_NAME"
       ;;
     static)
       PHP_EMBED_TYPE=static
--- php-5.2.4/Makefile.global.embed
+++ php-5.2.4/Makefile.global
@@ -14,7 +14,7 @@ all: $(all_targets) 
 build-modules: $(PHP_MODULES)
 
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -release $(PHP_VERSION) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 
 libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -25,13 +25,9 @@ install: $(all_targets) $(install_target
 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
-		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
-				break; \
-			fi; \
-		done; \
+	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME) -a \
+		-r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+		$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
 	fi
 	@$(INSTALL_IT)
 

php-5.2.4-gnusrc.patch:

--- NEW FILE php-5.2.4-gnusrc.patch ---
--- php-5.2.4/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.4/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
--- php-5.2.4/main/streams/streams.c.gnusrc
+++ php-5.2.4/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/cast.c.gnusrc
+++ php-5.2.4/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/memory.c.gnusrc
+++ php-5.2.4/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.4/main/php.h.gnusrc
+++ php-5.2.4/main/php.h
@@ -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"
--- php-5.2.4/ext/standard/file.c.gnusrc
+++ php-5.2.4/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- php-5.2.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- php-5.2.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.4 2007/05/08 12:08:17 dmitry Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.h"
--- php-5.2.4/ext/interbase/interbase.c.gnusrc
+++ php-5.2.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- php-5.2.4/configure.in.gnusrc
+++ php-5.2.4/configure.in
@@ -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 -------------------------------------------------------------------------
 

php-5.2.4-norpath.patch:

--- NEW FILE php-5.2.4-norpath.patch ---
--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/acinclude.m4
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
 dnl internal, don't use
 AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
   PHP_RUN_ONCE(LIBPATH, $1, [
+    test "x$PHP_RPATH" != "xno" &&
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
     LDFLAGS="$LDFLAGS -L$1"
     PHP_RPATHS="$PHP_RPATHS $1"
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
     ],[
       if test "$ext_shared" = "yes"; then
         $2="-L$ai_p [$]$2"
+        test "x$PHP_RPATH" != "xno" && \
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
       else
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])

php-5.2.4-odbc.patch:

--- NEW FILE php-5.2.4-odbc.patch ---
--- php-5.2.4/ext/odbc/config.m4.odbc
+++ php-5.2.4/ext/odbc/config.m4
@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,,
     PHP_ODBC_CHECK_HEADER(sqlext.h)
     AC_DEFINE(HAVE_UNIXODBC,1,[ ])
     AC_MSG_RESULT([$ext_output])
+    ODBC_SHARED_LIBADD="-lodbc -lodbcpsql"
+    PHP_SUBST(ODBC_SHARED_LIBADD)
   fi
 fi
 

php-5.2.4-tests-dashn.patch:

--- NEW FILE php-5.2.4-tests-dashn.patch ---
--- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
 $out = array();
 $status = -1;
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
 } else {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
 }
 print_r($out);
 ?>
--- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
 	die("no php executable defined");
 } 
 $proc = proc_open(
-	$php,
+	$php . " -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
 	$pipes
 );
--- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($php . ' -r \'' 
+	exec($php . ' -n -r \'' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
 	     . '  print "\n";'
 	     . '}\'', $out, $status);
 } else {
-	exec($php . ' -r "' 
+	exec($php . ' -n -r "' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
--- php-5.2.4/Makefile.global.tests-dashn
+++ php-5.2.4/Makefile.global
@@ -63,7 +63,7 @@ install-headers:
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	8 Jun 2007 15:15:07 -0000	1.31
+++ .cvsignore	16 Sep 2007 10:14:01 -0000	1.32
@@ -1,2 +1,3 @@
 php-5.2.3
 clog
+php-5.2.4.tar.gz


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- php.spec	2 Sep 2007 14:05:18 -0000	1.147
+++ php.spec	16 Sep 2007 10:14:01 -0000	1.148
@@ -5,8 +5,8 @@
 
 Summary: The PHP HTML-embedded scripting language
 Name: php
-Version: 5.2.3
-Release: 9
+Version: 5.2.4
+Release: 2
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -16,25 +16,25 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.1.4-gnusrc.patch
+Patch1: php-5.2.4-gnusrc.patch
 Patch2: php-4.3.3-install.patch
-Patch3: php-5.0.4-norpath.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.3-embed.patch
+Patch9: php-5.2.4-embed.patch
 
 # Fixes for extension modules
-Patch21: php-4.3.1-odbc.patch
+Patch21: php-5.2.4-odbc.patch
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.2.2-pdosym.patch
 Patch24: php-5.2.3-macropen.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.0.0-easter.patch
+Patch31: php-5.2.4-easter.patch
 
 # Fixes for tests
-Patch50: php-5.0.4-tests-dashn.patch
+Patch50: php-5.2.4-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -716,6 +716,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Sun Sep 16 2007 Joe Orton <jorton at redhat.com> 5.2.4-2
+- update to 5.2.4
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-9
 - rebuild for fixed APR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	8 Jun 2007 15:15:07 -0000	1.33
+++ sources	16 Sep 2007 10:14:01 -0000	1.34
@@ -1 +1 @@
-df79b04d63fc4c1ccb6d8ea58a9cf3ac  php-5.2.3.tar.gz
+0826e231c3148b29fd039d7a8c893ad3  php-5.2.4.tar.gz


--- php-4.3.1-odbc.patch DELETED ---


--- php-5.0.0-easter.patch DELETED ---


--- php-5.0.4-norpath.patch DELETED ---


--- php-5.0.4-tests-dashn.patch DELETED ---


--- php-5.1.4-gnusrc.patch DELETED ---


--- php-5.2.3-brigade.patch DELETED ---


--- php-5.2.3-embed.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 10:38:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 06:38:23 -0400
Subject: rpms/blobwars/devel blobwars.spec,1.5,1.6
Message-ID: <200709161038.l8GAcNp6019232@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobwars/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19214

Modified Files:
	blobwars.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.07-1
- New upstream version 1.07 (bz 292391)



Index: blobwars.spec
===================================================================
RCS file: /cvs/extras/rpms/blobwars/devel/blobwars.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blobwars.spec	16 Sep 2007 09:56:43 -0000	1.5
+++ blobwars.spec	16 Sep 2007 10:37:48 -0000	1.6
@@ -12,7 +12,7 @@
 Patch2:         blobwars-1.07-es.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_ttf-devel zlib-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  gettext desktop-file-utils
 Requires:       hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Sun Sep 16 10:40:28 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 16 Sep 2007 06:40:28 -0400
Subject: rpms/bochs/devel .cvsignore, 1.9, 1.10 bochs-config.patch, 1.2,
	1.3 bochs.spec, 1.26, 1.27 sources, 1.9,
	1.10 bochs-CVE-2007-2893.patch, 1.1,
	NONE bochs-CVE-2007-2894.patch, 1.1, NONE
Message-ID: <200709161040.l8GAeS8x019325@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19285

Modified Files:
	.cvsignore bochs-config.patch bochs.spec sources 
Removed Files:
	bochs-CVE-2007-2893.patch bochs-CVE-2007-2894.patch 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
- New upstream release 2.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2006 11:33:41 -0000	1.9
+++ .cvsignore	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-bochs-2.3.tar.gz
+bochs-2.3.5.tar.gz
 dlxlinux4.tar.gz

bochs-config.patch:

Index: bochs-config.patch
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bochs-config.patch	28 May 2005 15:36:35 -0000	1.2
+++ bochs-config.patch	16 Sep 2007 10:39:55 -0000	1.3
@@ -1,5 +1,14 @@
 --- dlxlinux/bochsrc.txt~	2005-03-27 16:29:54.000000000 +0300
 +++ dlxlinux/bochsrc.txt	2005-05-28 17:51:14.000000000 +0300
+@@ -6,7 +6,7 @@
+ megs: 32
+ 
+ # filename of ROM images
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
++romimage: file=$BXSHARE/BIOS-bochs-legacy, address=0xf0000
+ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
+ 
+ # what disk images will be used 
 @@ -27,3 +27,4 @@
  #display_library: x
 -# other choices: win32 sdl wx carbon amigaos beos macintosh nogui rfb term svga


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bochs.spec	22 Aug 2007 07:48:53 -0000	1.26
+++ bochs.spec	16 Sep 2007 10:39:55 -0000	1.27
@@ -1,30 +1,26 @@
 Name:           bochs
-Version:        2.3
-Release:        7%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-wx28.patch
-Patch3:         %{name}-CVE-2007-2893.patch
-Patch4:         %{name}-CVE-2007-2894.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  SDL-devel
+BuildRequires:  readline-devel
 #BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
-%if %{with debugger}
-BuildRequires:  readline-devel
-%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -68,8 +64,6 @@
 %setup -q
 %patch0 -p0 -z .nonet
 %patch2 -p1 -z .wx28
-%patch3 -p1 -z .cve-2007-2893
-%patch4 -p1 -z .cve-2007-2894
 cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
@@ -78,6 +72,9 @@
   doc/man/*.*
 # remove executable bits from sources to make rpmlint happy with the debuginfo
 chmod -x `find -name '*.cc' -o -name '*.h' -o -name '*.inc'`
+# Fix CHANGES encoding
+iconv -f ISO_8859-2 -t UTF8 CHANGES > CHANGES.tmp
+mv CHANGES.tmp CHANGES
 
 
 %build
@@ -168,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
+- New upstream release 2.3.5
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-7
 - Fix CVE-2007-2894 (really fix bz 241799)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2006 11:33:41 -0000	1.9
+++ sources	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-100c02fbcd402c2b4862d0251be539fd  bochs-2.3.tar.gz
+2d9b2c1e17b4eba2d46b208be09df4a9  bochs-2.3.5.tar.gz
 379269841ae5aef95e4ec56d6d186532  dlxlinux4.tar.gz


--- bochs-CVE-2007-2893.patch DELETED ---


--- bochs-CVE-2007-2894.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 13:58:52 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 16 Sep 2007 09:58:52 -0400
Subject: rpms/ekg2/devel filter-provides.sh,NONE,1.1 ekg2.spec,1.2,1.3
Message-ID: <200709161358.l8GDwqaU007286@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7259

Modified Files:
	ekg2.spec 
Added Files:
	filter-provides.sh 
Log Message:
- filter bad Provides: (fixes bug 278181)



--- NEW FILE filter-provides.sh ---
#!/bin/sh

if [ -x /usr/lib/rpm/redhat/find-provides ]; then
   FINDPROV=/usr/lib/rpm/redhat/find-provides
else
   FINDPROV=/usr/lib/rpm/find-provides
fi

$FINDPROV $* | sed -e '/(python|perl|ncurses|gsm|gpg|xosd)(\(\)\(64bit\))?/d'


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ekg2.spec	28 Aug 2007 21:39:51 -0000	1.2
+++ ekg2.spec	16 Sep 2007 13:58:20 -0000	1.3
@@ -5,10 +5,13 @@
 Summary(pl):	Wieloprotoko??owy komunikator internetowy
 Name:		ekg2
 Version:	0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}.tar.gz
+Source99:	filter-provides.sh
+%define		_use_internal_dependency_generator 0
+%define		__find_provides %{SOURCE99}
 Patch1:		%{name}-rpm.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
@@ -346,6 +349,9 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
 
 %changelog
+* Sun Sep 16 2007 Dominik Mierzejewski <rpm at greysector.net> 0.1-2
+- filter bad Provides: (fixes bug 278181)
+
 * Tue Aug 28 2007 Dominik Mierzejewski <rpm at greysector.net> 0.1-1
 - switch to released version
 - update license tag



From fedora-extras-commits at redhat.com  Sun Sep 16 15:14:21 2007
From: fedora-extras-commits at redhat.com (Igor Pires Soares (igor))
Date: Sun, 16 Sep 2007 11:14:21 -0400
Subject: comps/po pt_BR.po,1.5,1.6
Message-ID: <200709161514.l8GFELJA020747@cvs-int.fedora.redhat.com>

Author: igor

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726

Modified Files:
	pt_BR.po 
Log Message:
Revision



Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pt_BR.po	14 Sep 2007 14:39:10 -0000	1.5
+++ pt_BR.po	16 Sep 2007 15:13:51 -0000	1.6
@@ -16,7 +16,7 @@
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-05 02:14-0400\n"
-"PO-Revision-Date: 2007-09-09 00:04-0300\n"
+"PO-Revision-Date: 2007-09-16 12:11-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"
@@ -324,7 +324,7 @@
 #: ../comps-el4.xml.in.h:32
 #: ../comps-el5.xml.in.h:32
 msgid "KDE (K Desktop Environment)"
-msgstr "KDE (Ambiente de Trabalho K)"
+msgstr "Ambiente de Trabalho KDE"
 
 #: ../comps-fe5.xml.in.h:36
 #: ../comps-fe6.xml.in.h:35
@@ -419,7 +419,7 @@
 #: ../comps-el4.xml.in.h:43
 #: ../comps-el5.xml.in.h:43
 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 Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
 #: ../comps-fe5.xml.in.h:47
 #: ../comps-fe6.xml.in.h:46
@@ -546,7 +546,7 @@
 #: ../comps-el4.xml.in.h:58
 #: ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "Este grupo inclui clientes gr??ficos de email, Web e chat."
+msgstr "Este grupo inclui clientes gr??ficos de e-mail, Web e chat."
 
 #: ../comps-fe5.xml.in.h:62
 #: ../comps-fe6.xml.in.h:59
@@ -573,7 +573,7 @@
 #: ../comps-el4.xml.in.h:61
 #: ../comps-el5.xml.in.h:59
 msgid "This group includes text-based email, Web, and chat clients. These applications do not require the X Window System."
-msgstr "Este grupo inclui clientes de email em modo texto, de Web e de chat. Estas aplica????es n??o necessitam do X Window System."
+msgstr "Este grupo inclui clientes de e-mail em modo texto, de Web e de chat. Estas aplica????es n??o necessitam do X Window System."
 
 #: ../comps-fe5.xml.in.h:65
 #: ../comps-fe6.xml.in.h:62
@@ -813,7 +813,7 @@
 #: ../comps-f7.xml.in.h:25
 #: ../comps-f8.xml.in.h:26
 msgid "Clustering Support"
-msgstr "Suporte a Clusters."
+msgstr "Suporte a Clusters"
 
 #: ../comps-f7.xml.in.h:26
 #: ../comps-f8.xml.in.h:27
@@ -1206,7 +1206,7 @@
 #: ../comps-f7.xml.in.h:146
 #: ../comps-f8.xml.in.h:154
 msgid "These packages allow you to develop applications for the X Window System."
-msgstr "Este pacotes permitem desenvolver aplica????es para o X Window System."
+msgstr "Estes pacotes permitem desenvolver aplica????es para o X Window System."
 
 #: ../comps-f7.xml.in.h:148
 #: ../comps-f8.xml.in.h:156
@@ -1246,7 +1246,7 @@
 #: ../comps-f7.xml.in.h:159
 #: ../comps-f8.xml.in.h:167
 msgid "This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example."
-msgstr "Este grupo inclui um conjunto m??nimo de pacotes. ??til, por exemplo, para a cria????o de pequenas caixas de roteador/firewall."
+msgstr "Este grupo inclui um conjunto m??nimo de pacotes. ??til, por exemplo, para a cria????o de pequenas caixas de roteadores/firewalls."
 
 #: ../comps-f7.xml.in.h:168
 #: ../comps-f8.xml.in.h:176



From fedora-extras-commits at redhat.com  Sun Sep 16 16:01:09 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Sun, 16 Sep 2007 12:01:09 -0400
Subject: rpms/pv/F-7 pv.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200709161601.l8GG19Bk027116@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21398

Modified Files:
	pv.spec sources 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
- Bump to the latest upstream



Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/F-7/pv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pv.spec	17 Aug 2007 12:28:41 -0000	1.3
+++ pv.spec	16 Sep 2007 16:00:36 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: Artistic (modified)
 Group: Development/Tools
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
+- Bump to the latest upstream
+
 * Mon Aug 13 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.0.1-1
 - Bump to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pv/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2007 12:28:41 -0000	1.3
+++ sources	16 Sep 2007 16:00:36 -0000	1.4
@@ -1 +1 @@
-f4ca9b3e3f476b8934fc70a97e637361  pv-1.0.1.tar.gz
+1b76116d4cc70b0f12553a94d834d9bb  pv-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 16:45:57 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:45:57 -0400
Subject: rpms/lesstif/devel lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.16, 1.17
Message-ID: <200709161645.l8GGjvqn030361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30338

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:46:05 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:45:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lesstif.spec	2 Sep 2007 20:46:05 -0000	1.16
+++ lesstif.spec	16 Sep 2007 16:45:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 16:47:53 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:47:53 -0400
Subject: rpms/lesstif/FC-6 lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.10, 1.11
Message-ID: <200709161647.l8GGlrmI030487@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444/FC-6

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:56:37 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:47:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/FC-6/lesstif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lesstif.spec	2 Sep 2007 20:56:37 -0000	1.10
+++ lesstif.spec	16 Sep 2007 16:47:50 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 16:48:21 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 16 Sep 2007 12:48:21 -0400
Subject: rpms/lesstif/F-7 lesstif-0.95.0-XxxxProperty-64bit.patch, 1.1,
	1.2 lesstif.spec, 1.12, 1.13
Message-ID: <200709161648.l8GGmLDZ030491@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/lesstif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444/F-7

Modified Files:
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec 
Log Message:
* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)


lesstif-0.95.0-XxxxProperty-64bit.patch:

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lesstif-0.95.0-XxxxProperty-64bit.patch	2 Sep 2007 20:49:12 -0000	1.1
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:47:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64 lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.cutpaste64	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-08-31 00:19:09.000000000 +0200
+diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
++++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
 @@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
  				     XmClipboard * clip);
  static void _XmClipboardDeleteFormat(Display *display, int id);
@@ -10,7 +10,7 @@
  static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
  static void _XmClipboardDeleteItem(Display *display, Window window,
  				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
  
  
  static int
@@ -38,7 +38,7 @@
  	alloc_size += alloc_incr;
  
  	switch (actual_format)
-@@ -1001,8 +1013,9 @@ _XmClipboardReplaceItem(Display *display
+@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
  {
      Window root;
      Atom item;
@@ -49,16 +49,18 @@
  
      root = DefaultRootWindow(display);
      item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1027,12 @@ _XmClipboardReplaceItem(Display *display
+@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
      case 32:
  	len >>= 2;
  	nunits = transferlen;
 +	/* XChangeProperty expects a buffer of longs when receiving 32 bits
 +	   data, MEUHH */
 +	if (sizeof(long) != 4)
++	{
 +	    convert_buf = XtMalloc(len * sizeof(long));
-+        for (i = 0; i < len; i++)
-+            convert_buf[i] = data[i];
++	    for (i = 0; i < len; i++)
++                convert_buf[i] = data[i];
++	}
  	break;
  
      case 16:
@@ -73,7 +75,7 @@
  
  	len -= tlen;
  	mode = PropModeAppend;
-@@ -1178,7 +1178,7 @@
+@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
      }
      else
      {
@@ -82,10 +84,10 @@
  	ret = True;
      }
  
-diff -ur lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/props.c	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-01 15:54:50.000000000 +0200
-@@ -92,15 +92,28 @@
+diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
+--- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
+@@ -92,15 +92,28 @@ PROP_Initialize(void)
  void
  PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
  {
@@ -119,7 +121,7 @@
  
      XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
  		    32, PropModeReplace,
-@@ -129,7 +142,18 @@
+@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
      int actual_format, ret;
      Atom actual_type;
      unsigned long nitems, bytesafter;
@@ -139,7 +141,7 @@
  
      if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
  			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@
+@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
  			   (unsigned char **)&info) == Success)
      {
  	if (nitems > 0 && info)
@@ -148,7 +150,7 @@
  	else
  	    ret = 0;
  	XFree((char *)info);
-@@ -284,7 +308,21 @@
+@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
      {
  
  	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/F-7/lesstif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lesstif.spec	2 Sep 2007 20:51:12 -0000	1.12
+++ lesstif.spec	16 Sep 2007 16:47:46 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -147,7 +147,7 @@
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p1 -b .XxxxProperty-64bit
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
+- Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
+
 * Sat Sep  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.95.0-19
 - Fix more 64 bit XChange/GetWindowProperty issues (inspired by the
   cut and paste 64 bit fix which was an XChange/GetWindowProperty issue too)



From fedora-extras-commits at redhat.com  Sun Sep 16 17:16:23 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 16 Sep 2007 13:16:23 -0400
Subject: rpms/xfce4-places-plugin/devel xfce4-places-plugin.spec,1.4,1.5
Message-ID: <200709161716.l8GHGNY0004589@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4561

Modified Files:
	xfce4-places-plugin.spec 
Log Message:
* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
- Update to 0.9.992



Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/xfce4-places-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-places-plugin.spec	24 Aug 2007 22:24:06 -0000	1.4
+++ xfce4-places-plugin.spec	16 Sep 2007 17:15:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		xfce4-places-plugin
-Version:	0.9.991
+Version:	0.9.992
 Release:	1%{?dist}
 Summary:	Places menu for the Xfce panel
 
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
+- Update to 0.9.992
+
 * Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.991-1
 - Update to 0.9.991
 - Update license tag



From fedora-extras-commits at redhat.com  Sun Sep 16 17:21:04 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 16 Sep 2007 13:21:04 -0400
Subject: rpms/xfce4-places-plugin/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709161721.l8GHL4Vw004736@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4708

Modified Files:
	.cvsignore sources 
Log Message:
upload new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2007 22:24:06 -0000	1.4
+++ .cvsignore	16 Sep 2007 17:20:31 -0000	1.5
@@ -1 +1 @@
-xfce4-places-plugin-0.9.991.tar.bz2
+xfce4-places-plugin-0.9.992.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Aug 2007 22:24:06 -0000	1.4
+++ sources	16 Sep 2007 17:20:31 -0000	1.5
@@ -1 +1 @@
-e6b4ffb260cc81a8388a32f4302091f4  xfce4-places-plugin-0.9.991.tar.bz2
+83728df00963920310ba21a76359d7cb  xfce4-places-plugin-0.9.992.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 18:25:42 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 16 Sep 2007 14:25:42 -0400
Subject: rpms/farsight/devel .cvsignore, 1.10, 1.11 farsight.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200709161825.l8GIPgHb011820@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11790

Modified Files:
	.cvsignore farsight.spec sources 
Log Message:
* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.25-1
- Update to 0.1.25.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2007 20:06:00 -0000	1.10
+++ .cvsignore	16 Sep 2007 18:25:10 -0000	1.11
@@ -1 +1 @@
-farsight-0.1.24.tar.gz
+farsight-0.1.25.tar.gz


Index: farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- farsight.spec	22 Aug 2007 20:06:00 -0000	1.17
+++ farsight.spec	16 Sep 2007 18:25:10 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		farsight
-Version:	0.1.24
+Version:	0.1.25
 Release:	1%{?dist}
 Summary:	A audio/video conferencing framework
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.25-1
+- Update to 0.1.25.
+
 * Wed Aug 22 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.1.24-1
 - Update to 0.1.24.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2007 20:06:00 -0000	1.10
+++ sources	16 Sep 2007 18:25:10 -0000	1.11
@@ -1 +1 @@
-95304bf22e9967c68c1c14db5b8914a4  farsight-0.1.24.tar.gz
+3023e5013e612c7debc5763e14c78123  farsight-0.1.25.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:12:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:12:55 -0400
Subject: rpms/crossvc/devel crossvc-1.5.2-nocreate.patch, 1.2, 1.3 .cvsignore,
	1.5, 1.6 crossvc.spec, 1.11, 1.12 sources, 1.5,
	1.6 crossvc-1.5.1-nocreate.patch, 1.3, NONE
Message-ID: <200709161912.l8GJCtQB025157@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25114

Modified Files:
	.cvsignore crossvc.spec sources 
Added Files:
	crossvc-1.5.2-nocreate.patch 
Removed Files:
	crossvc-1.5.1-nocreate.patch 
Log Message:
New upstream release

crossvc-1.5.2-nocreate.patch:

Index: crossvc-1.5.2-nocreate.patch
===================================================================
RCS file: crossvc-1.5.2-nocreate.patch
diff -N crossvc-1.5.2-nocreate.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ crossvc-1.5.2-nocreate.patch	16 Sep 2007 19:12:53 -0000	1.3
@@ -0,0 +1,137 @@
+diff -up CrossVC/src/ImportDialog.ui.nocreate CrossVC/src/ImportDialog.ui
+--- CrossVC/src/ImportDialog.ui.nocreate	2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialog.ui	2007-09-16 20:59:55.000000000 +0200
+@@ -657,17 +657,6 @@ enter the appropriate value or leave thi
+                 <property name="spacing">
+                     <number>2</number>
+                 </property>
+-                <widget class="QCheckBox" row="1" column="0">
+-                    <property name="name">
+-                        <cstring>m_CreateDirs</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Create CVS directories while importing (needs CVSNT)</string>
+-                    </property>
+-                    <property name="whatsThis" stdset="0">
+-                        <string>Activate this option if you want to convert your import folder into a working copy while importing.&lt;br&gt;Please note that this option is only available if &lt;b&gt;CVSNT&lt;/b&gt; is used on both client and server!</string>
+-                    </property>
+-                </widget>
+                 <widget class="QCheckBox" row="0" column="0">
+                     <property name="name">
+                         <cstring>m_KeepFTime</cstring>
+diff -up CrossVC/src/ImportDialogImpl.h.nocreate CrossVC/src/ImportDialogImpl.h
+--- CrossVC/src/ImportDialogImpl.h.nocreate	2006-11-05 11:40:30.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.h	2007-09-16 20:59:55.000000000 +0200
+@@ -129,8 +129,6 @@ class ImportDialogImpl : public ImportDi
+    int mode();
+    int rshMode();
+    bool getKeepFTime();
+-   bool getCreateDirs();
+-
+ 
+  public slots:
+ 
+diff -up CrossVC/src/Import.cpp.nocreate CrossVC/src/Import.cpp
+--- CrossVC/src/Import.cpp.nocreate	2007-09-16 21:06:04.000000000 +0200
++++ CrossVC/src/Import.cpp	2007-09-16 21:08:33.000000000 +0200
+@@ -171,7 +171,6 @@ void Import::acceptCvs() {
+    int rshMode = dlg->rshMode();
+    m_sshAccess = dlg->getSshPreset();
+    bool keepFTime = dlg->getKeepFTime();
+-   m_bCreateCvsDirs = dlg->getCreateDirs();
+    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
+    QStringList binaryWildcards = dlg->getBinaryWildcards();
+ 
+@@ -236,8 +235,6 @@ void Import::acceptCvs() {
+    files += " import ";
+    
+    if (keepFTime) files += "-d ";
+-   if (m_bCreateCvsDirs) files += "-C ";
+-    
+   
+    //ignore files:
+    QString sIgnore = "-I ! ";
+@@ -307,57 +304,6 @@ void Import::afterCall(int cmd, CvsBuffe
+             return;
+          }
+ 
+-         if (m_bCreateCvsDirs) {
+-            //cvs dir is already in workbench?
+-            QString topProjectDir = "";
+-            QString subProjectDir = "";
+-            bool found = false;
+-            DirBase * myChild = NULL;
+-               
+-            QString importDir = m_localDir;
+-            int pos = importDir.length();
+-            do {
+-                  
+-               pos = importDir.findRev("/");
+-               importDir.truncate(pos);
+-                  
+-               if ( (myChild = m_workBench->find(importDir)) ) {
+-                     
+-                  if (myChild->isAnalyzed()) {
+-                        
+-                     QString dirToAdd = m_localDir;
+-                     dirToAdd = dirToAdd.left(dirToAdd.find("/",myChild->fullName().length()+1));
+-                     DirBase * unanalyzedDir = myChild->addDir(dirToAdd);
+-                     if (unanalyzedDir && myChild->isOpen()) {//will not be analyzed on open() because it is already open
+-                        myChild->setOpen(TRUE);
+-                     }
+-                     if (myChild->isSelected()) {
+-                        myChild->activateItem(TRUE);//reread files
+-                     } else {
+-                        m_workBench->setSelected(myChild,TRUE);//reread files
+-                     }
+-                  }
+-                     
+-                  emit showInfo( tr("Import Info"), tr("This project subdir has been added.") );
+-                  topProjectDir = myChild->topDir()->shortName();
+-                  DirBase * tmp = m_workBench->find(m_localDir);
+-                  if (tmp) {
+-                     subProjectDir = tmp->topControlledDir()->relativeName();
+-                     projectSettings->set(subProjectDir, SSHACCESS, m_sshAccess);
+-                  }
+-                  found = true;
+-               }
+-                  
+-            } while ( !found && (pos > -1));
+-               
+-            if ( !found) {
+-               QString path = m_localDir.left(m_localDir.findRev("/"));
+-               QString name = m_localDir.mid(m_localDir.findRev("/") + 1);
+-               emit addCheckedOutProject(path, name, m_sshAccess);
+-            }
+-         
+-         }
+-         
+          break;
+       }
+       default: {
+diff -up CrossVC/src/ImportDialogImpl.cpp.nocreate CrossVC/src/ImportDialogImpl.cpp
+--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-01-11 19:50:40.000000000 +0100
++++ CrossVC/src/ImportDialogImpl.cpp	2007-09-16 20:59:55.000000000 +0200
+@@ -231,11 +231,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
+    if (m_ignoreString.find("!") > -1) m_ignoreString = m_ignoreString.mid(m_ignoreString.findRev("!", -1) + 1);
+ 
+    m_binaryList = BINARYFILESPECLIST;
+-
+-   if (CVSVERSION != "cvsnt") {
+-      m_CreateDirs->setEnabled(false);
+-      m_CreateDirs->setChecked(false);
+-   }
+    
+    if (!m_defaultProfile->isEmpty()) {
+       setDefaultProfile(*m_defaultProfile);
+@@ -696,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
+ 	return m_KeepFTime->isChecked();
+ }
+ 
+-bool ImportDialogImpl::getCreateDirs() {
+-	return m_CreateDirs->isChecked();
+-}
+-
+ void ImportDialogImpl::getAndSetModule() {
+    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
+    m_ModuleBrowser = NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 20:03:27 -0000	1.5
+++ .cvsignore	16 Sep 2007 19:12:53 -0000	1.6
@@ -1 +1 @@
-crossvc-1.5.1-0-generic-src.tgz
+crossvc-1.5.2-0-generic-src.tgz


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- crossvc.spec	9 Sep 2007 20:20:23 -0000	1.11
+++ crossvc.spec	16 Sep 2007 19:12:53 -0000	1.12
@@ -1,18 +1,15 @@
 Name:             crossvc
-Version:          1.5.1
-Release:          7%{?dist}
+Version:          1.5.2
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 
 Group:            Development/Tools
 License:          GPLv2
 URL:              http://www.lincvs.org
-# This is a prerelease of crossvc-1.5.2 which I have got
-# from upstream via mail. This should contains a workaroud
-# for a bug in qt-3.3.8
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.1-nocreate.patch
+Patch1:		  crossvc-1.5.2-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -88,6 +85,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.2-1
+- New upstream release
+
 * Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-7
 - Downgrade to last stable release
 - Add Req to qt-3.3.8-6 (#246024)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2007 20:03:27 -0000	1.5
+++ sources	16 Sep 2007 19:12:53 -0000	1.6
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz
+4fb196e4e5fb5b6c5d901601869308b2  crossvc-1.5.2-0-generic-src.tgz


--- crossvc-1.5.1-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 19:17:55 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:17:55 -0400
Subject: rpms/highlight/devel .cvsignore, 1.10, 1.11 highlight.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200709161917.l8GJHtHp031076@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29897

Modified Files:
	.cvsignore highlight.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Sep 2007 19:29:48 -0000	1.10
+++ .cvsignore	16 Sep 2007 19:17:22 -0000	1.11
@@ -1 +1 @@
-highlight-2.6.3.tar.gz
+highlight-2.6.4.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- highlight.spec	11 Sep 2007 19:29:48 -0000	1.22
+++ highlight.spec	16 Sep 2007 19:17:22 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.3
+Version:	2.6.4
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
 * Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Sep 2007 19:29:48 -0000	1.11
+++ sources	16 Sep 2007 19:17:22 -0000	1.12
@@ -1 +1 @@
-0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz
+3f06b113b2b82319b936040ca9b2e597  highlight-2.6.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:40:03 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:40:03 -0400
Subject: rpms/crossvc/F-7 crossvc-1.5.2-nocreate.patch, NONE,
	1.1 crossvc.spec, 
	1.7, 1.8 sources, 1.3, 1.4 crossvc-1.5.1-nocreate.patch, 1.1, NONE
Message-ID: <200709161940.l8GJe30X001011@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/crossvc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv956

Modified Files:
	crossvc.spec sources 
Added Files:
	crossvc-1.5.2-nocreate.patch 
Removed Files:
	crossvc-1.5.1-nocreate.patch 
Log Message:
New upstream release

crossvc-1.5.2-nocreate.patch:

--- NEW FILE crossvc-1.5.2-nocreate.patch ---
diff -up CrossVC/src/ImportDialog.ui.nocreate CrossVC/src/ImportDialog.ui
--- CrossVC/src/ImportDialog.ui.nocreate	2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialog.ui	2007-09-16 20:59:55.000000000 +0200
@@ -657,17 +657,6 @@ enter the appropriate value or leave thi
                 <property name="spacing">
                     <number>2</number>
                 </property>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>m_CreateDirs</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Create CVS directories while importing (needs CVSNT)</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Activate this option if you want to convert your import folder into a working copy while importing.&lt;br&gt;Please note that this option is only available if &lt;b&gt;CVSNT&lt;/b&gt; is used on both client and server!</string>
-                    </property>
-                </widget>
                 <widget class="QCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>m_KeepFTime</cstring>
diff -up CrossVC/src/ImportDialogImpl.h.nocreate CrossVC/src/ImportDialogImpl.h
--- CrossVC/src/ImportDialogImpl.h.nocreate	2006-11-05 11:40:30.000000000 +0100
+++ CrossVC/src/ImportDialogImpl.h	2007-09-16 20:59:55.000000000 +0200
@@ -129,8 +129,6 @@ class ImportDialogImpl : public ImportDi
    int mode();
    int rshMode();
    bool getKeepFTime();
-   bool getCreateDirs();
-
 
  public slots:
 
diff -up CrossVC/src/Import.cpp.nocreate CrossVC/src/Import.cpp
--- CrossVC/src/Import.cpp.nocreate	2007-09-16 21:06:04.000000000 +0200
+++ CrossVC/src/Import.cpp	2007-09-16 21:08:33.000000000 +0200
@@ -171,7 +171,6 @@ void Import::acceptCvs() {
    int rshMode = dlg->rshMode();
    m_sshAccess = dlg->getSshPreset();
    bool keepFTime = dlg->getKeepFTime();
-   m_bCreateCvsDirs = dlg->getCreateDirs();
    QStringList ignoreWildcards = dlg->getIgnoreWildcards();
    QStringList binaryWildcards = dlg->getBinaryWildcards();
 
@@ -236,8 +235,6 @@ void Import::acceptCvs() {
    files += " import ";
    
    if (keepFTime) files += "-d ";
-   if (m_bCreateCvsDirs) files += "-C ";
-    
   
    //ignore files:
    QString sIgnore = "-I ! ";
@@ -307,57 +304,6 @@ void Import::afterCall(int cmd, CvsBuffe
             return;
          }
 
-         if (m_bCreateCvsDirs) {
-            //cvs dir is already in workbench?
-            QString topProjectDir = "";
-            QString subProjectDir = "";
-            bool found = false;
-            DirBase * myChild = NULL;
-               
-            QString importDir = m_localDir;
-            int pos = importDir.length();
-            do {
-                  
-               pos = importDir.findRev("/");
-               importDir.truncate(pos);
-                  
-               if ( (myChild = m_workBench->find(importDir)) ) {
-                     
-                  if (myChild->isAnalyzed()) {
-                        
-                     QString dirToAdd = m_localDir;
-                     dirToAdd = dirToAdd.left(dirToAdd.find("/",myChild->fullName().length()+1));
-                     DirBase * unanalyzedDir = myChild->addDir(dirToAdd);
-                     if (unanalyzedDir && myChild->isOpen()) {//will not be analyzed on open() because it is already open
-                        myChild->setOpen(TRUE);
-                     }
-                     if (myChild->isSelected()) {
-                        myChild->activateItem(TRUE);//reread files
-                     } else {
-                        m_workBench->setSelected(myChild,TRUE);//reread files
-                     }
-                  }
-                     
-                  emit showInfo( tr("Import Info"), tr("This project subdir has been added.") );
-                  topProjectDir = myChild->topDir()->shortName();
-                  DirBase * tmp = m_workBench->find(m_localDir);
-                  if (tmp) {
-                     subProjectDir = tmp->topControlledDir()->relativeName();
-                     projectSettings->set(subProjectDir, SSHACCESS, m_sshAccess);
-                  }
-                  found = true;
-               }
-                  
-            } while ( !found && (pos > -1));
-               
-            if ( !found) {
-               QString path = m_localDir.left(m_localDir.findRev("/"));
-               QString name = m_localDir.mid(m_localDir.findRev("/") + 1);
-               emit addCheckedOutProject(path, name, m_sshAccess);
-            }
-         
-         }
-         
          break;
       }
       default: {
diff -up CrossVC/src/ImportDialogImpl.cpp.nocreate CrossVC/src/ImportDialogImpl.cpp
--- CrossVC/src/ImportDialogImpl.cpp.nocreate	2007-01-11 19:50:40.000000000 +0100
+++ CrossVC/src/ImportDialogImpl.cpp	2007-09-16 20:59:55.000000000 +0200
@@ -231,11 +231,6 @@ ImportDialogImpl::ImportDialogImpl( QStr
    if (m_ignoreString.find("!") > -1) m_ignoreString = m_ignoreString.mid(m_ignoreString.findRev("!", -1) + 1);
 
    m_binaryList = BINARYFILESPECLIST;
-
-   if (CVSVERSION != "cvsnt") {
-      m_CreateDirs->setEnabled(false);
-      m_CreateDirs->setChecked(false);
-   }
    
    if (!m_defaultProfile->isEmpty()) {
       setDefaultProfile(*m_defaultProfile);
@@ -696,10 +691,6 @@ bool ImportDialogImpl::getKeepFTime() {
 	return m_KeepFTime->isChecked();
 }
 
-bool ImportDialogImpl::getCreateDirs() {
-	return m_CreateDirs->isChecked();
-}
-
 void ImportDialogImpl::getAndSetModule() {
    m_BrowseModules->setCurrentText(m_ModuleBrowser->getModule());
    m_ModuleBrowser = NULL;


Index: crossvc.spec
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/crossvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crossvc.spec	9 Sep 2007 20:14:33 -0000	1.7
+++ crossvc.spec	16 Sep 2007 19:39:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:             crossvc
-Version:          1.5.1
-Release:          5%{?dist}
+Version:          1.5.2
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 
@@ -9,7 +9,7 @@
 URL:              http://www.lincvs.org
 Source0:          http://lincvs.com/download/crossvc-%{version}-0-generic-src.tgz
 Source1:          crossvc.desktop
-Patch1:		  crossvc-1.5.1-nocreate.patch
+Patch1:		  crossvc-1.5.2-nocreate.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> - 1.5.2-1
+- New upstream release
+
 * Sun Sep  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-5
 - Add Req to qt-3.3.8-6 (#246024)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crossvc/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2007 20:20:02 -0000	1.3
+++ sources	16 Sep 2007 19:39:31 -0000	1.4
@@ -1 +1 @@
-50eedbee52e5aa1283d452200e0b07b4  crossvc-1.5.1-0-generic-src.tgz
+4fb196e4e5fb5b6c5d901601869308b2  crossvc-1.5.2-0-generic-src.tgz


--- crossvc-1.5.1-nocreate.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 16 19:40:06 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 16 Sep 2007 15:40:06 -0400
Subject: rpms/freeciv/devel freeciv-2.0.9-open.patch, NONE, 1.1 freeciv.spec,
	1.27, 1.28
Message-ID: <200709161940.l8GJe6MS001016@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv981

Modified Files:
	freeciv.spec 
Added Files:
	freeciv-2.0.9-open.patch 
Log Message:
* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-4
- Add patch to fix open function build bug.


freeciv-2.0.9-open.patch:

--- NEW FILE freeciv-2.0.9-open.patch ---
diff -ur freeciv-2.0.9.OLD/client/connectdlg_common.c freeciv-2.0.9/client/connectdlg_common.c
--- freeciv-2.0.9.OLD/client/connectdlg_common.c	2007-02-09 21:08:04.000000000 -0500
+++ freeciv-2.0.9/client/connectdlg_common.c	2007-09-16 15:15:44.000000000 -0400
@@ -266,7 +266,7 @@
 
     /* include the port to avoid duplication */
     if (logfile) {
-      fd = open(logfile, O_WRONLY | O_CREAT);
+      fd = open(logfile, O_WRONLY | O_CREAT,0644);
 
       if (fd != 1) {
         dup2(fd, 1);


Index: freeciv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freeciv.spec	21 Aug 2007 21:50:36 -0000	1.27
+++ freeciv.spec	16 Sep 2007 19:39:34 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           freeciv
 Version:        2.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -12,6 +12,7 @@
 Source3:	%{name}.xpm
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-aifill.patch
+Patch3:		%{name}-%{version}-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -37,6 +38,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .desktop
 %patch2 -p0 -b .aifill
+%patch3 -p1 -b .open
 
 
 %build
@@ -95,6 +97,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-4
+- Add patch to fix open function build bug.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 2.0.9-3
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sun Sep 16 19:42:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 16 Sep 2007 15:42:07 -0400
Subject: rpms/highlight/F-7 highlight.spec,1.21,1.22 sources,1.11,1.12
Message-ID: <200709161942.l8GJg70h001138@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1110

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/highlight.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- highlight.spec	11 Sep 2007 19:44:09 -0000	1.21
+++ highlight.spec	16 Sep 2007 19:41:35 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.3
+Version:	2.6.4
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
+- New upstream release
+
 * Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Sep 2007 19:44:09 -0000	1.11
+++ sources	16 Sep 2007 19:41:35 -0000	1.12
@@ -1 +1 @@
-0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz
+3f06b113b2b82319b936040ca9b2e597  highlight-2.6.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 19:46:48 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 16 Sep 2007 15:46:48 -0400
Subject: rpms/source-highlight/devel .cvsignore, 1.9,
	1.10 source-highlight.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200709161946.l8GJkmdG001287@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1265

Modified Files:
	.cvsignore source-highlight.spec sources 
Log Message:
* Sun Sep 16 2007 Adrian Reber <adrian at lisas.de> - 2.7-1
- updated to 2.7
- updated files section
- updated license



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Sep 2006 21:45:46 -0000	1.9
+++ .cvsignore	16 Sep 2007 19:46:15 -0000	1.10
@@ -1,2 +1,2 @@
-source-highlight-2.4.tar.gz
-source-highlight-2.4.tar.gz.sig
+source-highlight-2.7.tar.gz.sig
+source-highlight-2.7.tar.gz


Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- source-highlight.spec	20 Aug 2007 10:14:02 -0000	1.15
+++ source-highlight.spec	16 Sep 2007 19:46:15 -0000	1.16
@@ -1,11 +1,11 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 2.4
-Release: 2%{?dist}
+Version: 2.7
+Release: 1%{?dist}
 Group: Development/Tools
-License: GPL
-Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.4.tar.gz
-Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.4.tar.gz.sig
+License: GPLv2+
+Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.7.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.7.tar.gz.sig
 URL: http://www.gnu.org/software/src-highlite/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison, flex, boost-devel
@@ -54,12 +54,18 @@
 %{_bindir}/cpp2html
 %{_bindir}/java2html
 %{_bindir}/source-highlight
+%{_bindir}/check-regexp
 %{_bindir}/src-hilite-lesspipe.sh
 %{_datadir}/%{name}
 %{_mandir}/man1/*
 %{_infodir}/source-highlight.info*
 
 %changelog
+* Sun Sep 16 2007 Adrian Reber <adrian at lisas.de> - 2.7-1
+- updated to 2.7
+- updated files section
+- updated license
+
 * Mon Aug 20 2007 Caolan McNamara <caolanm at redhat.com> - 2.4-2
 - rebuild for boost rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Sep 2006 21:45:46 -0000	1.9
+++ sources	16 Sep 2007 19:46:15 -0000	1.10
@@ -1,2 +1,2 @@
-bb8f38d9447c8b1f1ad4357290d4fcd1  source-highlight-2.4.tar.gz.sig
-6140791b4696b14890bf60c16edaf501  source-highlight-2.4.tar.gz
+ed75f25037aff81819ce4f092483af86  source-highlight-2.7.tar.gz.sig
+654df5a7c3d9a20063d6220979c04550  source-highlight-2.7.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 20:08:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 16:08:34 -0400
Subject: rpms/glib2/devel .cvsignore, 1.74, 1.75 glib2.spec, 1.138,
	1.139 sources, 1.74, 1.75
Message-ID: <200709162008.l8GK8YHI007903@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/glib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7851

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	4 Aug 2007 04:14:32 -0000	1.74
+++ .cvsignore	16 Sep 2007 20:08:01 -0000	1.75
@@ -1 +1 @@
-glib-2.14.0.tar.bz2
+glib-2.14.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- glib2.spec	4 Aug 2007 04:29:36 -0000	1.138
+++ glib2.spec	16 Sep 2007 20:08:01 -0000	1.139
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.14.0
+Version: 2.14.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Sat Aug  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	4 Aug 2007 04:14:32 -0000	1.74
+++ sources	16 Sep 2007 20:08:01 -0000	1.75
@@ -1 +1 @@
-6fabf21f68631043bc6924e01398e3af  glib-2.14.0.tar.bz2
+196d7944a8ddc1f7c3d1e9c7146dd560  glib-2.14.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 20:41:40 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 16 Sep 2007 16:41:40 -0400
Subject: rpms/freedroidrpg/devel .cvsignore, 1.8, 1.9 freedroidrpg.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709162041.l8GKfeMf008371@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/freedroidrpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8345

Modified Files:
	.cvsignore freedroidrpg.spec sources 
Log Message:
Update to 0.10.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Aug 2007 20:48:31 -0000	1.8
+++ .cvsignore	16 Sep 2007 20:41:08 -0000	1.9
@@ -1 +1 @@
-freedroidrpg-0.10.2.tar.bz2
+freedroidrpg-0.10.3.tar.bz2


Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freedroidrpg.spec	28 Aug 2007 18:59:16 -0000	1.18
+++ freedroidrpg.spec	16 Sep 2007 20:41:08 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           freedroidrpg
-Version:        0.10.2
+Version:        0.10.3
 Release:        1%{?dist}
 Summary:        Role playing game with Freedroid theme and Tux as the hero
 
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Wart <wart at kobold.org> - 0.10.3-1
+- Update to 0.10.3
+
 * Tue Aug 28 2007 Wart <wart at kobold.org> - 0.10.2-2
 - License tag clarification
 - Use correct .desktop file version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2007 20:48:31 -0000	1.8
+++ sources	16 Sep 2007 20:41:08 -0000	1.9
@@ -1 +1 @@
-553a6dfe947895f75cdf43ffed1c1872  freedroidrpg-0.10.2.tar.bz2
+4455c82ff65f8ff7d58853d8aff76d5b  freedroidrpg-0.10.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 20:46:52 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sun, 16 Sep 2007 16:46:52 -0400
Subject: rpms/bluez-libs/devel .cvsignore, 1.26, 1.27 bluez-libs.spec, 1.41, 
	1.42 sources, 1.26, 1.27
Message-ID: <200709162046.l8GKkqLV008512@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8479

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Sep 2007 08:41:45 -0000	1.26
+++ .cvsignore	16 Sep 2007 20:46:20 -0000	1.27
@@ -1 +1 @@
-bluez-libs-3.18.tar.gz
+bluez-libs-3.19.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- bluez-libs.spec	12 Sep 2007 08:41:45 -0000	1.41
+++ bluez-libs.spec	16 Sep 2007 20:46:20 -0000	1.42
@@ -1,6 +1,6 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 3.18
+Version: 3.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
+* Sun Sep 16 2007 David Woodhouse <dwmw2 at infradead.org> - 3.19-1
+- Update to bluez-libs 3.19
+
 * Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> - 3.18-1
 - Update to bluez-libs 3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	12 Sep 2007 08:41:45 -0000	1.26
+++ sources	16 Sep 2007 20:46:20 -0000	1.27
@@ -1 +1 @@
-9e091f2ce00b906c4c456fff24e69e55  bluez-libs-3.18.tar.gz
+40106bf5263e75c47d5033ae5085b6e2  bluez-libs-3.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 21:01:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:01:02 -0400
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.26,1.27
Message-ID: <200709162101.l8GL129F009611@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-lvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8734

Modified Files:
	system-config-lvm.spec 
Log Message:
fix desktop file categories



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- system-config-lvm.spec	1 May 2007 16:05:49 -0000	1.26
+++ system-config-lvm.spec	16 Sep 2007 21:00:29 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
 Version: 1.1.1
-Release: 1.0%{?dist}
+Release: 2.0%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -31,6 +31,15 @@
 rm -rf %{buildroot}
 %makeinstall
 
+desktop-file-install --vendor system --delete-original		\
+  --dir %{buildroot}%{_datadir}/applications			\
+  --remove-category Application					\
+  --remove-category SystemSetup					\
+  --remove-category X-Red-Hat-Base				\
+  --add-category Settings					\
+  --add-category System						\
+  %{buildroot}%{_datadir}/applications/system-config-lvm.desktop
+
 #Uncomment this when translations are done
 %find_lang %name
 
@@ -53,6 +62,10 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 1.1.1-2.0
+- Use desktop-file-install to install the desktop file
+- Move the application to the right spot in the menus
+
 * Tue May 01 2007 Stanko Kupcevic <kupcevic at redhat.com> 1.1.1-1.0
   - Update pam file
   - Update translation files



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:12 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:12 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchbugzilla
Message-ID: <200709162104.l8GL4DEU018943@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchbugzilla acl on vorbis-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:15 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:15 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchcommits
Message-ID: <200709162104.l8GL4Fhr018961@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchcommits acl on vorbis-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:20 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:20 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested commit
Message-ID: <200709162104.l8GL4Lxt012675@app3.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the commit acl on vorbis-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:30 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:30 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchbugzilla
Message-ID: <200709162104.l8GL4UeZ019021@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchbugzilla acl on vorbis-tools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:31 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:31 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested watchcommits
Message-ID: <200709162104.l8GL4VPP012714@app3.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the watchcommits acl on vorbis-tools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:04:32 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecklifter))
Date: Sun, 16 Sep 2007 14:04:32 -0700
Subject: [pkgdb] vorbis-tools: snecker has requested commit
Message-ID: <200709162104.l8GL4Wkc019034@app4.fedora.phx.redhat.com>

Christopher Brown (snecker) has requested the commit acl on vorbis-tools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools



From fedora-extras-commits at redhat.com  Sun Sep 16 21:06:37 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:06:37 -0400
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.27,1.28
Message-ID: <200709162106.l8GL6bZf014909@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-lvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887

Modified Files:
	system-config-lvm.spec 
Log Message:
fix BRs



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- system-config-lvm.spec	16 Sep 2007 21:00:29 -0000	1.27
+++ system-config-lvm.spec	16 Sep 2007 21:06:04 -0000	1.28
@@ -16,6 +16,7 @@
 Requires: rhpl >= 0.148.2
 Requires: python >= 2.3
 BuildRequires: perl(XML::Parser) gettext
+BuildRequires: desktop-file-utils
 
 %description
 system-config-lvm is a utility for graphically configuring Logical Volumes.



From fedora-extras-commits at redhat.com  Sun Sep 16 21:11:11 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Sun, 16 Sep 2007 17:11:11 -0400
Subject: rpms/bluez-utils/devel .cvsignore, 1.24, 1.25 bluez-utils.spec, 1.76,
	1.77 sources, 1.24, 1.25
Message-ID: <200709162111.l8GLBB0w015080@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049

Modified Files:
	.cvsignore bluez-utils.spec sources 
Log Message:
3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Sep 2007 08:53:54 -0000	1.24
+++ .cvsignore	16 Sep 2007 21:10:39 -0000	1.25
@@ -1 +1 @@
-bluez-utils-3.18.tar.gz
+bluez-utils-3.19.tar.gz


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- bluez-utils.spec	12 Sep 2007 08:53:54 -0000	1.76
+++ bluez-utils.spec	16 Sep 2007 21:10:39 -0000	1.77
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.18
+Version: 3.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -153,6 +153,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sun Sep 16 2007 David Woodhouse <dwmw2 at infradead.org> 3.19-1
+- Update to bluez-utils 3.19
+
 * Wed Sep 12 2007 David Woodhouse <dwmw2 at infradead.org> 3.18-1
 - Update to bluez-utils 3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Sep 2007 08:53:54 -0000	1.24
+++ sources	16 Sep 2007 21:10:39 -0000	1.25
@@ -1 +1 @@
-2b6b4d519b8f75ef3990122934e660ba  bluez-utils-3.18.tar.gz
+3b4fd0b255a0f83f692557c3b7a1a506  bluez-utils-3.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 16 21:14:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 17:14:51 -0400
Subject: rpms/metacity/devel .cvsignore, 1.59, 1.60 metacity.spec, 1.131,
	1.132 sources, 1.59, 1.60
Message-ID: <200709162114.l8GLEpCV015190@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15168

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	8 Aug 2007 00:38:01 -0000	1.59
+++ .cvsignore	16 Sep 2007 21:14:18 -0000	1.60
@@ -1 +1 @@
-metacity-2.19.55.tar.bz2
+metacity-2.20.0.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- metacity.spec	11 Sep 2007 20:06:58 -0000	1.131
+++ metacity.spec	16 Sep 2007 21:14:18 -0000	1.132
@@ -1,18 +1,16 @@
 %define gettext_package metacity
 
-%define metacity_version 2.19.55
+%define metacity_version 2.20.0
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=433253
-Patch1: metacity-2.18.5-dont-deref-null-pointer.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +64,6 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
-%patch1 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -153,6 +150,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.19.55-4
 - fix crash on logout (and on the subsequent login, bug 243761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	8 Aug 2007 00:38:01 -0000	1.59
+++ sources	16 Sep 2007 21:14:18 -0000	1.60
@@ -1 +1 @@
-1d9b30f8c7aff29777f28196957a1b46  metacity-2.19.55.tar.bz2
+e9c6317c85db019ac2d832dd9f45f536  metacity-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 21:16:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:16:35 -0700
Subject: [pkgdb] homebank was added for trasher
Message-ID: <200709162116.l8GLGatW015214@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package homebank with summary Free easy personal accounting for all
Kevin Fenzi (kevin) has approved Package homebank
Kevin Fenzi (kevin) has added a Fedora devel branch for homebank with an owner of trasher
Kevin Fenzi (kevin) has approved homebank in Fedora devel
Kevin Fenzi (kevin) has approved Package homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/homebank



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank summary updated by kevin
Message-ID: <200709162117.l8GLHJPP021693@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package homebank summary to Free easy personal accounting for all

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/homebank



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, 6) updated by kevin
Message-ID: <200709162117.l8GLHKkj021704@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora 6)
Kevin Fenzi (kevin) changed owner of homebank in Fedora 6 to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/homebank



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, 7) updated by kevin
Message-ID: <200709162117.l8GLHKTQ021714@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for homebank
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on homebank (Fedora 7)
Kevin Fenzi (kevin) changed owner of homebank in Fedora 7 to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/homebank



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 14:17:19 -0700
Subject: [pkgdb] homebank (Fedora, devel) updated by kevin
Message-ID: <200709162117.l8GLHLxY021723@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of homebank in Fedora devel to trasher
Kevin Fenzi (kevin) Approved cvsextras for commit access on homebank (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/homebank



From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:53 -0400
Subject: rpms/homebank - New directory
Message-ID: <200709162117.l8GLHrD5015291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank

Log Message:
Directory /cvs/extras/rpms/homebank added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:57 -0400
Subject: rpms/homebank/devel - New directory
Message-ID: <200709162117.l8GLHvs9015305@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank/devel

Log Message:
Directory /cvs/extras/rpms/homebank/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 16 21:17:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:17:59 -0400
Subject: rpms/homebank Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709162117.l8GLHxni015330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank

Added Files:
	Makefile import.log 
Log Message:
Setup of module homebank


--- NEW FILE Makefile ---
# Top level Makefile for module homebank
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 16 21:18:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 16 Sep 2007 17:18:01 -0400
Subject: rpms/homebank/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709162118.l8GLI1xT015346@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq15254/rpms/homebank/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module homebank


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: homebank
# $Id: Makefile,v 1.1 2007/09/16 21:17:59 kevin Exp $
NAME := homebank
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 fedora-extras-commits at redhat.com  Sun Sep 16 22:06:33 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 18:06:33 -0400
Subject: rpms/pygobject2/devel .cvsignore, 1.11, 1.12 pygobject2.spec, 1.29, 
	1.30 sources, 1.11, 1.12
Message-ID: <200709162206.l8GM6XLq026615@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26277

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc8
- Update to 2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Jul 2007 02:04:33 -0000	1.11
+++ .cvsignore	16 Sep 2007 22:06:00 -0000	1.12
@@ -1 +1 @@
-pygobject-2.13.2.tar.bz2
+pygobject-2.14.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pygobject2.spec	29 Aug 2007 04:55:29 -0000	1.29
+++ pygobject2.spec	16 Sep 2007 22:06:00 -0000	1.30
@@ -8,8 +8,8 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.13.2
-Release: 3%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -97,6 +97,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc8
+- Update to 2.14.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.13.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Jul 2007 02:04:33 -0000	1.11
+++ sources	16 Sep 2007 22:06:00 -0000	1.12
@@ -1 +1 @@
-98122d47749ecf1d52bde3b9fa306bd4  pygobject-2.13.2.tar.bz2
+de781a21f483c941a73009a9f68f150e  pygobject-2.14.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 22:26:38 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 16 Sep 2007 18:26:38 -0400
Subject: rpms/totem/devel .cvsignore, 1.44, 1.45 sources, 1.44,
	1.45 totem.spec, 1.119, 1.120
Message-ID: <200709162226.l8GMQcBk028999@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28975

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Sun Sep 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
- Update for 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	17 Aug 2007 17:53:59 -0000	1.44
+++ .cvsignore	16 Sep 2007 22:26:05 -0000	1.45
@@ -1 +1 @@
-totem-2.19.90.tar.bz2
+totem-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	17 Aug 2007 17:53:59 -0000	1.44
+++ sources	16 Sep 2007 22:26:05 -0000	1.45
@@ -1 +1 @@
-0855cb16f426550619f3549854888063  totem-2.19.90.tar.bz2
+e7f289179b8ac304738d599d4a5c14a9  totem-2.20.0.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- totem.spec	17 Aug 2007 17:53:59 -0000	1.119
+++ totem.spec	16 Sep 2007 22:26:05 -0000	1.120
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 2.19.90
+Version: 2.20.0
 Release: 1%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
@@ -74,6 +74,7 @@
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Totem
 Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description lirc
 A plugin to add LIRC (Infrared remote) support to Totem.
@@ -81,6 +82,7 @@
 %package galago
 Summary: Galago (Instant Messenger status) plugin for Totem
 Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description galago
 A plugin to allow Totem to set Instant Messenger statuses when
@@ -118,8 +120,6 @@
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
 %configure 			\
 	--enable-gstreamer 	\
-	--disable-lirc 		\
-	--disable-vanity 	\
 	--enable-mozilla 	\
 	--enable-nautilus	\
 	--disable-scrollkeeper  \
@@ -233,6 +233,9 @@
 %{_libdir}/*so
 
 %changelog
+* Sun Sep 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
+- Update for 2.20.0
+
 * Fri Aug 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.90-1
 - Update for 2.19.90
 



From fedora-extras-commits at redhat.com  Sun Sep 16 22:32:50 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 18:32:50 -0400
Subject: rpms/pygtk2/devel .cvsignore, 1.36, 1.37 pygtk2.spec, 1.7,
	1.8 sources, 1.36, 1.37
Message-ID: <200709162232.l8GMWo3e029124@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29097

Modified Files:
	.cvsignore pygtk2.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	27 Aug 2007 18:01:03 -0000	1.36
+++ .cvsignore	16 Sep 2007 22:32:18 -0000	1.37
@@ -1 +1 @@
-pygtk-2.11.0.tar.bz2
+pygtk-2.12.0.tar.bz2


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pygtk2.spec	27 Aug 2007 18:01:03 -0000	1.7
+++ pygtk2.spec	16 Sep 2007 22:32:18 -0000	1.8
@@ -5,7 +5,7 @@
 ### Abstract ###
 
 Name: pygtk2
-Version: 2.11.0
+Version: 2.12.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
@@ -144,6 +144,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Mon Aug 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.0-1.fc8
 - Update to 2.11.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	27 Aug 2007 18:01:03 -0000	1.36
+++ sources	16 Sep 2007 22:32:18 -0000	1.37
@@ -1 +1 @@
-99443c6224b6b07ebb19c8fd03157e6e  pygtk-2.11.0.tar.bz2
+3c1a42b774600c353342cfa3782a7d77  pygtk-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 16 22:34:38 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sun, 16 Sep 2007 18:34:38 -0400
Subject: rpms/gdb/devel gdb-6.6-bz233852-attach-signalled.patch, 1.1,
	1.2 gdb.spec, 1.243, 1.244
Message-ID: <200709162234.l8GMYcDO029217@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29194

Modified Files:
	gdb-6.6-bz233852-attach-signalled.patch gdb.spec 
Log Message:
* Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
- Fix attaching to stopped processes and/or pending signals.


gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.6-bz233852-attach-signalled.patch	20 Jun 2007 14:25:46 -0000	1.1
+++ gdb-6.6-bz233852-attach-signalled.patch	16 Sep 2007 22:34:35 -0000	1.2
@@ -1,94 +1,151 @@
-diff -u -rup gdb-6.6-orig/gdb/inf-ptrace.c gdb-6.6/gdb/inf-ptrace.c
---- gdb-6.6-orig/gdb/inf-ptrace.c	2006-01-24 23:34:34.000000000 +0100
-+++ gdb-6.6/gdb/inf-ptrace.c	2007-06-06 13:33:11.000000000 +0200
-@@ -38,6 +38,9 @@
- 
- /* HACK: Save the ptrace ops returned by inf_ptrace_target.  */
- static struct target_ops *ptrace_ops_hack;
-+
-+/* Stored PID of the process being stopped during attach.  */
-+static pid_t stopped_pid;
- 
- 
- #ifdef PT_GET_PROCESS_STATE
-@@ -69,14 +72,20 @@ inf_ptrace_follow_fork (struct target_op
+2007-07-01  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* linux-nat.h (struct lwp_info): New field WAS_STOPPED.
+	* linux-nat.c (STRINGIFY, STRINGIFY_ARG): New macros.
+	(kill_lwp): New declaration.
+	(linux_ptrace_post_attach, pid_is_stopped): New function.
+	(linux_child_follow_fork): New comment about WAS_STOPPED.
+	(lin_lwp_attach_lwp): Variable PID removed.  Part replaced by a call to
+	LINUX_PTRACE_POST_ATTACH.
+	(linux_nat_attach): Likewise.
+	(linux_nat_detach): Optionally stop the detached process.
+	(linux_nat_resume): Clear WAS_STOPPED if appropriate.
+	* NEWS: Document the new behaviour.
+
+2007-06-30  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.threads/attach-into-signal.c, gdb.threads/attach-into-signal.exp,
+	gdb.threads/attach-stopped.c, gdb.threads/attach-stopped.exp: New files.
+
+2007-06-30  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.texinfo (Attach): Document the ATTACH and DETACH commands for
+	stopped processes.  Document the messages on the seen pending signals.
+
+[ Backport for GDB-6.6. ]
+
+--- ./gdb/NEWS	21 Jun 2007 15:18:50 -0000	1.232
++++ ./gdb/NEWS	30 Jun 2007 16:27:37 -0000
+@@ -44,6 +44,9 @@ segment base addresses (rather than offs
+ * The /i format now outputs any trailing branch delay slot instructions 
+ immediately following the last instruction within the count specified.
+ 
++* On GNU/Linux, stopped processes may get attached to now.  Signals being
++delivered at the time of the attach command no longer get lost.
++
+ * New commands
+ 
+ set remoteflow
+--- gdb-6.6/gdb/linux-nat.c-orig-orig	2007-09-16 20:57:13.000000000 +0200
++++ gdb-6.6/gdb/linux-nat.c	2007-09-16 21:02:28.000000000 +0200
+@@ -87,6 +87,12 @@
+ #define __WALL          0x40000000 /* Wait for any child.  */
+ #endif
  
-   if (follow_child)
-     {
-+      unsigned long sig = 0;
++#define STRINGIFY_ARG(x) #x
++#define STRINGIFY(x) STRINGIFY_ARG (x)
 +
-       inferior_ptid = pid_to_ptid (fpid);
-       detach_breakpoints (pid);
++static int linux_ptrace_post_attach (struct lwp_info *lp);
++static int kill_lwp (int lwpid, int signo);
++
+ /* The single-threaded native GNU/Linux target_ops.  We save a pointer for
+    the use of the multi-threaded target.  */
+ static struct target_ops *linux_ops;
+@@ -533,6 +539,11 @@ child_follow_fork (struct target_ops *op
+ 	}
+       else
+ 	{
++	  /* We should check LP->WAS_STOPPED and detach it stopped accordingly.
++	     In this point of code it cannot be 1 as we would not get FORK
++	     executed without CONTINUE first which resets LP->WAS_STOPPED.
++	     We would have to first TARGET_STOP and WAITPID it as with running
++	     inferior PTRACE_DETACH, SIGSTOP will ignore the signal.  */
+ 	  target_detach (NULL, 0);
+ 	}
+ 
+@@ -992,7 +1003,6 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+      to happen.  */
+   if (GET_LWP (ptid) != GET_PID (ptid) && lp == NULL)
+     {
+-      pid_t pid;
+       int status;
  
-       /* Reset breakpoints in the child as appropriate.  */
-       follow_inferior_reset_breakpoints ();
+       if (ptrace (PTRACE_ATTACH, GET_LWP (ptid), 0, 0) < 0)
+@@ -1002,45 +1012,23 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+ 	     creation is interrupted; as of Linux 2.6.19, a kernel
+ 	     bug may place threads in the thread list and then fail
+ 	     to create them.  */
+-	  warning (_("Can't attach %s: %s"), target_pid_to_str (ptid),
+-		   safe_strerror (errno));
+-	  return -1;
++	  error (_("Can't attach %s: %s"), target_pid_to_str (ptid),
++		 safe_strerror (errno));
+ 	}
  
--      if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
--	perror_with_name (("ptrace"));
-+      /* Stop the process again if it was stopped during the attachment.  */
-+      if (pid == stopped_pid)
-+	sig = target_signal_to_host (TARGET_SIGNAL_STOP));
-+
-+      if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, (void *) sig) == -1)
-+	perror_with_name (("ptrace PT_DETACH"));
+       if (lp == NULL)
+ 	lp = add_lwp (ptid);
+ 
+-      if (debug_linux_nat)
+-	fprintf_unfiltered (gdb_stdlog,
+-			    "LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
+-			    target_pid_to_str (ptid));
+-
+-      pid = my_waitpid (GET_LWP (ptid), &status, 0);
+-      if (pid == -1 && errno == ECHILD)
+-	{
+-	  /* Try again with __WCLONE to check cloned processes.  */
+-	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
+-	  if (pid == -1 && errno == ECHILD)
+-	    error (_("Can't attach %s (%s) - possible SELinux denial,"
+-		     " check your /var/log/messages for `avc: denied'"),
+-		   target_pid_to_str (ptid), safe_strerror (errno));
+-	  lp->cloned = 1;
++      status = linux_ptrace_post_attach (lp);
++      if (status != 0)
++        {
++	  error (_("Thread %s exited: %s"), target_pid_to_str (ptid),
++		 status_to_str (status));
+ 	}
+ 
+-      gdb_assert (pid == GET_LWP (ptid)
+-		  && WIFSTOPPED (status) && WSTOPSIG (status));
+-
+-      target_post_attach (pid);
++      target_post_attach (GET_LWP (ptid));
+ 
+       lp->stopped = 1;
+-
+-      if (debug_linux_nat)
+-	{
+-	  fprintf_unfiltered (gdb_stdlog,
+-			      "LLAL: waitpid %s received %s\n",
+-			      target_pid_to_str (ptid),
+-			      status_to_str (status));
+-	}
      }
    else
      {
-@@ -173,6 +182,21 @@ inf_ptrace_mourn_inferior (void)
-   generic_mourn_inferior ();
+@@ -1061,11 +1049,172 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
+   return 0;
  }
  
-+/* Wrapper function for waitpid which handles EINTR.  */
++/* Detect `T (stopped)' in `/proc/PID/status'.
++   Other states including `T (tracing stop)' are reported as false.  */
 +
 +static int
-+my_waitpid (int pid, int *status, int flags)
++pid_is_stopped (pid_t pid)
 +{
-+  int ret;
-+  do
-+    {
-+      ret = waitpid (pid, status, flags);
-+    }
-+  while (ret == -1 && errno == EINTR);
-+
-+  return ret;
-+}
-+
- /* Attach to the process specified by ARGS.  If FROM_TTY is non-zero,
-    be chatty about it.  */
- 
-@@ -180,8 +204,14 @@ static void
- inf_ptrace_attach (char *args, int from_tty)
- {
-   char *exec_file;
--  pid_t pid;
-+  pid_t pid, got_pid;
-   char *dummy;
-+  int status;
-+  unsigned long sig;
 +  FILE *status_file;
-+  char name[40];
 +  char buf[100]; 
-+  int sigstop = target_signal_to_host (TARGET_SIGNAL_STOP);
- 
-   if (!args)
-     error_no_arg (_("process-id to attach"));
-@@ -210,11 +240,64 @@ inf_ptrace_attach (char *args, int from_
-     }
- 
- #ifdef PT_ATTACH
-+  stopped_pid = 0;
-+  /* There is a small moment after PTRACE_ATTACH where PTRACE_CONT will
-+     succeed only for originally stopped processes.  Unfortunately in a moment
-+     PTRACE_ATTACH will deliver its SIGSTOP and PTRACE_CONT shows no difference
-+     since that moment.
-+     "/proc/%d/status" is also a race but it is safe for unstopped cases.  */
-+  sprintf (name, "/proc/%d/status", (int) pid);
-+  status_file = fopen (name, "r");
++  int retval = 0;
++
++  snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid);
++  status_file = fopen (buf, "r");
 +  if (status_file != NULL)
 +    {
 +      int have_state = 0;
 +
-+      while (fgets (buf, 100, status_file))
++      while (fgets (buf, sizeof (buf), status_file))
 +	{
 +	  if (strncmp (buf, "State:", 6) == 0)
 +	    {
@@ -96,199 +153,153 @@
 +	      break;
 +	    }
 +	} 
-+      if (have_state != 0 && strstr (buf, "T (stopped)") != NULL)
-+	stopped_pid = pid;
++      if (have_state && strstr (buf, "T (stopped)") != NULL)
++	retval = 1;
 +      fclose (status_file);
 +    }
++  return retval;
++}
++
++/* Handle the processing after PTRACE_ATTACH, the first WAITPID -> SIGSTOP.
++   Returns STATUS if the thread has exited, 0 otherwise.
++   Sets LP->WAS_STOPPED if the process was originally stopped.
++   Sets LP->CLONED if the given LWP is not the thread leader.
++
++   Scenario for a standard unstopped inferior:
++    * `S (sleeping)' or `R (running)' or similiar states.
++    * PTRACE_ATTACH is called.
++    * `S (sleeping)' (or similiar) for some while.
++    * `T (tracing stop)'.
++    * WAITPID succeeds here returning SIGSTOP (signalled by PTRACE_ATTACH).
++
++   Scenario for a formerly stopped inferior:
++    * `T (stopped)'.
++    * PTRACE_ATTACH is called.
++    * `T (stopped)' would stay indefinitely
++      Note since this moment the `TracerPid' field gets filled
++      (by PTRACE_ATTACH), it is no longer just the common `T (stopped)' state.
++       * If no one did WAITPID since sending SIGSTOP our WAITPID would return
++         SIGSTOP.  The state still would not turn to `T (tracing stop)'.
++       * Usually its original parent (before PTRACE_ATTACH was applied) already
++         did WAITPID.  The original parent already received our SIGSTOP
++         sinalled by our PTRACE_ATTACH.
++         In this case our own WAITPID would hang.  Therefore...
++    * ... we do artificial: tkill (SIGCONT);
++      `PTRACE_CONT, SIGSTOP' does not work in 100% cases as sometimes SIGSTOP
++      gets remembered by kernel during the first PTRACE_CONT later and we get
++      spurious SIGSTOP event.  Expecting the signal may get delivered to
++      a different task of the thread group.
++      `kill_lwp (SIGSTOP)' has no effect in this moment (it is already stopped).
++    * WAITPID returns the artifical SIGCONT.
++      (The possibly pending SIGSTOP gets vanished by specifically SIGCONT.)
++    * State turns `T (tracing stop)'.
++   In this moment everything is almost fine but we need a workaround as final
++   `PTRACE_DETACH, SIGSTOP' would leave the process unstopped otherwise:
++    * tkill (SIGSTOP);
++    * `PTRACE_CONT, 0'
++    * WAITPID returns the artifical SIGSTOP.
++
++   With the pending (unwaited for) SIGSTOP the artifical signal effects are:
++   kill (SIGSTOP)
++   PTRACE_ATTACH
++    /-tkill (SIGCONT), WAITPID: SIGCONT, WAITPID: hang !
++   //-tkill (SIGCONT), WAITPID: SIGCONT, PTRACE_CONT (SIG_0), WAITPID: wait (OK)
++   \\-tkill (SIGALRM), WAITPID: SIGSTOP, WAITPID: hang !
++    \-tkill (SIGALRM), WAITPID: SIGSTOP, PTRACE_CONT (SIG_0), WAITPID: SIGALRM !
++   Therefore we signal artifical SIGCONT and stop waiting after its reception.
++
++   For the detection whether the process was formerly stopped we need to
++   read `/proc/PID/status'.  `PTRACE_CONT, SIGSTOP' returns ESRCH
++   for `S (sleeping)' and succeeds for `T (stopped)' but it unfortunately
++   succeeds even for `T (tracing stop)'.  Depending on PTRACE_CONT, SIGSTOP
++   success value for formerly stopped processes would mean a race condition
++   as we would get false stopped processes detection if we get too slow.
++
++   `waitid (..., WSTOPPED)' hangs the same way as WAITPID.
++
++   Signals get queued for WAITPID.  PTRACE_ATTACH (or TKILL) enqueues SIGSTOP
++   there but WAITPID may return an already pending signal.
++   Redeliver it by PTRACE_CONT, SIGxxx as otherwise it would get lost.
++   Similiar processing is being done in this file by WAIT_LWP.  */
++
++static int
++linux_ptrace_post_attach (struct lwp_info *lp)
++{
++  ptid_t ptid = lp->ptid;
++  unsigned long sig;
++
++  if (debug_linux_nat)
++    fprintf_unfiltered (gdb_stdlog,
++			"LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
++			target_pid_to_str (ptid));
++
++  lp->was_stopped = pid_is_stopped (GET_LWP (ptid));
++  if (lp->was_stopped)
++    {
++      if (kill_lwp (GET_LWP (ptid), SIGCONT) != 0)
++	perror_with_name (("kill_lwp (SIGCONT)"));
++    }
 +
-   errno = 0;
-   ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
-   if (errno != 0)
-     perror_with_name (("ptrace"));
-   attach_flag = 1;
-+
-+  /* Deliver one SIGSTOP just for sure.
-+     If the process was already stopped AND some other process (like shell)
-+     has already waited for it we would get stuck in waitpid ().  */
-+  sig = sigstop;
-+  do
++  for (;;)
 +    {
-+      if (sig != sigstop)
-+	printf_unfiltered (_("Redelivering pending %s.\n"),
-+		       target_signal_to_string (target_signal_from_host (sig)));
-+      errno = 0;
-+      ptrace (PT_CONTINUE, pid, (PTRACE_TYPE_ARG3)1, (void *) sig);
-+      /* For unstopped processes the preventive signal may ESRCH.  */
-+      if (errno != 0 && sig != sigstop)
-+	perror_with_name ("ptrace PT_CONTINUE");
++      pid_t pid;
++      int status;
++
++      pid = my_waitpid (GET_LWP (ptid), &status, 0);
++      if (pid == -1 && errno == ECHILD)
++	{
++	  /* Try again with __WCLONE to check cloned processes.  */
++	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
++	  lp->cloned = 1;
++	}
++      gdb_assert (pid == GET_LWP (ptid));
 +
-+      got_pid = my_waitpid (pid, &status, 0);
-+      gdb_assert (got_pid == pid);
++      if (debug_linux_nat)
++	{
++	  fprintf_unfiltered (gdb_stdlog,
++			      "LLAL: waitpid %s received %s\n",
++			      target_pid_to_str (ptid),
++			      status_to_str (status));
++	}
 +
 +      /* Check if the thread has exited.  */
 +      if (WIFEXITED (status) || WIFSIGNALED (status))
-+	error (_("Program %s exited.\n"),
-+	       target_pid_to_str (pid_to_ptid (pid)));
++        return status;
 +      gdb_assert (WIFSTOPPED (status));
 +      sig = WSTOPSIG (status);
 +      gdb_assert (sig != 0);
-+    }
-+  while (sig != sigstop);
- #else
-   error (_("This system does not support attaching to a process"));
- #endif
-@@ -240,14 +323,16 @@ inf_ptrace_post_attach (int pid)
- 
- #endif
- 
--/* Detach from the inferior, optionally passing it the signal
--   specified by ARGS.  If FROM_TTY is non-zero, be chatty about it.  */
-+/* Detach from the inferior.  If FROM_TTY is non-zero, be chatty about it.  */
- 
- static void
- inf_ptrace_detach (char *args, int from_tty)
- {
-   pid_t pid = ptid_get_pid (inferior_ptid);
--  int sig = 0;
-+  unsigned long sig = 0;
++      if (sig == SIGSTOP)
++        break;
 +
-+  if (args)
-+    error (_("Too many arguments"));
- 
-   if (from_tty)
-     {
-@@ -258,18 +343,19 @@ inf_ptrace_detach (char *args, int from_
- 			 target_pid_to_str (pid_to_ptid (pid)));
-       gdb_flush (gdb_stdout);
-     }
--  if (args)
--    sig = atoi (args);
- 
- #ifdef PT_DETACH
-   /* We'd better not have left any breakpoints in the program or it'll
-      die when it hits one.  Also note that this may only work if we
-      previously attached to the inferior.  It *might* work if we
-      started the process ourselves.  */
-+  /* Stop the process again if it was stopped during the attachment.  */
-+  if (pid == stopped_pid)
-+    sig = target_signal_to_host (TARGET_SIGNAL_STOP);
-   errno = 0;
--  ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
-+  ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, (void *) sig);
-   if (errno != 0)
--    perror_with_name (("ptrace"));
-+    perror_with_name (("ptrace PT_DETACH"));
-   attach_flag = 0;
- #else
-   error (_("This system does not support detaching from a process"));
-@@ -324,6 +410,12 @@ inf_ptrace_resume (ptid_t ptid, int step
-        single-threaded processes, so simply resume the inferior.  */
-     pid = ptid_get_pid (inferior_ptid);
- 
-+  /* At this point, we are going to resume the inferior and if we
-+     have attached to a stopped process, we no longer should leave
-+     it as stopped if the user detaches.  */
-+  if (!step && pid == stopped_pid)
-+    stopped_pid = 0;
-+
-   if (step)
-     {
-       /* If this system does not support PT_STEP, a higher level
-diff -u -rup gdb-6.6-orig/gdb/linux-nat.c gdb-6.6/gdb/linux-nat.c
---- gdb-6.6-orig/gdb/linux-nat.c	2007-06-06 13:30:52.000000000 +0200
-+++ gdb-6.6/gdb/linux-nat.c	2007-06-06 13:57:18.000000000 +0200
-@@ -994,6 +994,7 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
-     {
-       pid_t pid;
-       int status;
-+      unsigned long sig;
- 
-       if (ptrace (PTRACE_ATTACH, GET_LWP (ptid), 0, 0) < 0)
- 	{
-@@ -1015,32 +1016,54 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
- 			    "LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n",
- 			    target_pid_to_str (ptid));
- 
--      pid = my_waitpid (GET_LWP (ptid), &status, 0);
--      if (pid == -1 && errno == ECHILD)
-+      sig = SIGSTOP;
-+      do
- 	{
--	  /* Try again with __WCLONE to check cloned processes.  */
--	  pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
-+	  if (sig != SIGSTOP)
-+	    printf_unfiltered (_("Redelivering pending %s.\n"),
-+		       target_signal_to_string (target_signal_from_host (sig)));
-+	  /* For unstopped processes the preventive signal may ESRCH.  */
-+	  if (ptrace (PTRACE_CONT, GET_LWP (ptid), (PTRACE_TYPE_ARG3)1,
-+		      (void *) sig) != 0 && sig != SIGSTOP)
-+	    perror_with_name ("ptrace");
++      /* As the second signal for stopped processes we send SIGSTOP.  */
++      if (lp->was_stopped && sig == SIGCONT)
++	sig = SIGSTOP;
++
++      printf_unfiltered (_("Redelivering pending %s.\n"),
++		 target_signal_to_string (target_signal_from_host (sig)));
++      if (sig == SIGSTOP)
++	{
++	  if (kill_lwp (GET_LWP (ptid), sig) != 0)
++	    perror_with_name (("kill_lwp"));
++	  /* We now must resume the inferior to get SIGSTOP delivered.  */
++	  sig = 0;
++	}
++      if (ptrace (PTRACE_CONT, GET_LWP (ptid), NULL, (void *) sig) != 0)
++	perror_with_name (("ptrace"));
++    }
 +
-+	  pid = my_waitpid (GET_LWP (ptid), &status, 0);
- 	  if (pid == -1 && errno == ECHILD)
--	    error (_("Can't attach %s (%s) - possible SELinux denial,"
--		     " check your /var/log/messages for `avc: denied'"),
--		   target_pid_to_str (ptid), safe_strerror (errno));
--	  lp->cloned = 1;
--	}
-+	    {
-+	      /* Try again with __WCLONE to check cloned processes.  */
-+	      pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE);
-+	      if (pid == -1 && errno == ECHILD)
-+		error (_("Can't attach %s (%s) - possible SELinux denial,"
-+			 " check your /var/log/messages for `avc: denied'"),
-+		       target_pid_to_str (ptid), safe_strerror (errno));
-+	      lp->cloned = 1;
-+	    }
-+	  gdb_assert (pid == GET_LWP (ptid));
- 
--      gdb_assert (pid == GET_LWP (ptid)
--		  && WIFSTOPPED (status) && WSTOPSIG (status));
-+	  if (debug_linux_nat)
-+	    {
-+	      fprintf_unfiltered (gdb_stdlog,
-+				  "LLAL: waitpid %s received %s\n",
-+				  target_pid_to_str (ptid),
-+				  status_to_str (status));
-+	    }
++  return 0;
++}
 +
-+	  /* Check if the thread has exited.  */
-+	  if (WIFEXITED (status) || WIFSIGNALED (status))
-+	    {
-+	      warning (_("Thread %s exited: %s"), target_pid_to_str (ptid),
-+		       status_to_str (status));
-+	      return -1;
-+	    }
-+	  gdb_assert (WIFSTOPPED (status));
-+	  sig = WSTOPSIG (status);
-+	  gdb_assert (sig != 0);
-+	}
-+      while (sig != SIGSTOP);
- 
-       target_post_attach (pid);
- 
-       lp->stopped = 1;
--
--      if (debug_linux_nat)
--	{
--	  fprintf_unfiltered (gdb_stdlog,
--			      "LLAL: waitpid %s received %s\n",
--			      target_pid_to_str (ptid),
--			      status_to_str (status));
--	}
-     }
-   else
-     {
-@@ -1065,8 +1088,6 @@ static void
+ static void
  linux_nat_attach (char *args, int from_tty)
  {
    struct lwp_info *lp;
 -  pid_t pid;
--  int status;
+   int status;
  
    /* FIXME: We should probably accept a list of process id's, and
-      attach all of them.  */
-@@ -1076,22 +1097,6 @@ linux_nat_attach (char *args, int from_t
+@@ -1076,21 +1225,12 @@ linux_nat_attach (char *args, int from_t
    inferior_ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid));
    lp = add_lwp (inferior_ptid);
  
@@ -307,11 +318,16 @@
 -
 -  gdb_assert (pid == GET_PID (inferior_ptid)
 -	      && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP);
--
++  status = linux_ptrace_post_attach (lp);
++  if (status != 0)
++    error (_("Program %s exited: %s\n"), target_pid_to_str (inferior_ptid),
++	   status_to_str (status));
++  if (lp->cloned)
++    warning (_("%s is a cloned process"), target_pid_to_str (inferior_ptid));
+ 
    lp->stopped = 1;
  
-   /* Fake the SIGSTOP that core GDB expects.  */
-@@ -1099,8 +1104,8 @@ linux_nat_attach (char *args, int from_t
+@@ -1099,8 +1239,8 @@ linux_nat_attach (char *args, int from_t
    lp->resumed = 1;
    if (debug_linux_nat)
      {
@@ -322,26 +338,44 @@
      }
  }
  
-diff -u -rup gdb-6.6-orig/gdb/target.h gdb-6.6/gdb/target.h
---- gdb-6.6-orig/gdb/target.h	2007-06-06 13:30:52.000000000 +0200
-+++ gdb-6.6/gdb/target.h	2007-06-06 13:33:11.000000000 +0200
-@@ -529,9 +529,9 @@ void target_close (struct target_ops *ta
-    to the `attach' command by the user.  This routine can be called
-    when the target is not on the target-stack, if the target_can_run
-    routine returns 1; in that case, it must push itself onto the stack.
--   Upon exit, the target should be ready for normal operations, and
--   should be ready to deliver the status of the process immediately
--   (without waiting) to an upcoming target_wait call.  */
-+   Upon exit, the target should be ready for normal operations.
-+   The status of the inferior is already processed and possibly pending
-+   signals redelivered.  */
- 
- #define	target_attach(args, from_tty)	\
-      (*current_target.to_attach) (args, from_tty)
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.c gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.c
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.c	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.c	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,65 @@
+@@ -1173,6 +1313,9 @@ linux_nat_detach (char *args, int from_t
+ 
+   trap_ptid = null_ptid;
+ 
++  if (lwp_list->was_stopped)
++    args = STRINGIFY (SIGSTOP);
++
+   /* Destroy LWP info; it's no longer valid.  */
+   init_lwp_list ();
+ 
+@@ -1310,6 +1453,12 @@ linux_nat_resume (ptid_t ptid, int step_
+       lp->stopped = 0;
+     }
+ 
++  /* At this point, we are going to resume the inferior and if we
++     have attached to a stopped process, we no longer should leave
++     it as stopped if the user detaches.  */
++  if (!step && lp != NULL)
++    lp->was_stopped = 0;
++
+   if (resume_all)
+     iterate_over_lwps (resume_callback, NULL);
+ 
+--- ./gdb/linux-nat.h	10 May 2007 21:36:00 -0000	1.18
++++ ./gdb/linux-nat.h	29 Jun 2007 22:06:05 -0000
+@@ -42,6 +42,9 @@ struct lwp_info
+   /* Non-zero if this LWP is stopped.  */
+   int stopped;
+ 
++  /* Non-zero if this LWP was stopped by SIGSTOP before attaching.  */
++  int was_stopped;
++
+   /* Non-zero if this LWP will be/has been resumed.  Note that an LWP
+      can be marked both as stopped and resumed at the same time.  This
+      happens if we try to resume an LWP that has a wait status
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-into-signal.c	29 Jun 2007 22:06:05 -0000
+@@ -0,0 +1,70 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2007 Free Software Foundation, Inc.
@@ -385,6 +419,11 @@
 +
 +  raise (SIGALRM);
 +
++  /* It is an upstream kernel bug (2.6.22-rc4-git7.x86_64, PREEMPT, SMP).
++     We never get here without ptrace(2) but we get while under ptrace(2).  */
++  for (;;)
++    pause ();
++
 +  abort ();
 +  /* NOTREACHED */
 +  return NULL;
@@ -407,10 +446,9 @@
 +
 +  return 0;
 +}
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.exp gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.exp
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-into-signal.exp	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-into-signal.exp	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,153 @@
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-into-signal.exp	29 Jun 2007 22:06:06 -0000
+@@ -0,0 +1,176 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -472,12 +510,33 @@
 +
 +    # linux-2.6.20.4.x86_64 had maximal attempt # 20 in 4 test runs.
 +    set attempts 100
-+    set attempt 0
++    set attempt 1
 +    set passes 1
-+    while { $passes < 3 && $attempt < $attempts } {
++    while { $passes < 3 && $attempt <= $attempts } {
 +
 +	# Start with clean gdb
 +	gdb_exit
++
++	set stoppedtry 0
++	while { $stoppedtry < 10 } {
++	    set fileid [open /proc/${testpid}/status r];
++	    gets $fileid line1;
++	    gets $fileid line2;
++	    close $fileid;
++
++	    if {![string match "*(stopped)*" $line2]} {
++		# No PASS message as we may be looping in multiple attempts.
++		break
++	    }
++	    sleep 1
++	    set stoppedtry [expr $stoppedtry + 1]
++	}
++	if { $stoppedtry >= 10 } {
++	    verbose -log $line2
++	    set test "$threadtype: process is still running on the attempt # $attempt of $attempts"
++	    break
++	}
++
 +	gdb_start
 +	gdb_reinitialize_dir $srcdir/$subdir
 +	gdb_load ${binfile}
@@ -528,7 +587,11 @@
 +	}
 +    }
 +    if {$passes < 3} {
-+	fail $test
++	if {$attempt > $attempts} {
++	    unresolved $test
++	} else {
++	    fail $test
++	}
 +    }
 +
 +    # Exit and detach the process.
@@ -555,18 +618,15 @@
 +
 +corefunc nonthreaded
 +
-+# build the test case first without threads
++# build the test case also with threads
 +#
 +if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DUSE_THREADS}] != "" } {
 +    gdb_suppress_entire_file "Testcase threaded compile failed, so all tests in this file will automatically fail."
 +}
 +
 +corefunc threaded
-+
-+return 0
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.c gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.c
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.c	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.c	2007-06-06 13:33:11.000000000 +0200
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-stopped.c	29 Jun 2007 22:06:06 -0000
 @@ -0,0 +1,51 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -619,10 +679,9 @@
 +
 +  return 0;
 +}
-diff -u -rup gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.exp gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.exp
---- gdb-6.6-orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2007-06-06 16:36:34.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.threads/attach-stopped.exp	2007-06-06 13:33:11.000000000 +0200
-@@ -0,0 +1,208 @@
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ ./gdb/testsuite/gdb.threads/attach-stopped.exp	29 Jun 2007 22:06:06 -0000
+@@ -0,0 +1,213 @@
 +# Copyright 2005-2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -682,8 +741,10 @@
 +    # that it can be attached to.
 +
 +    set testpid [eval exec $binfile &]
-+    exec sleep 2
-+       
++
++    # Avoid some race:
++    sleep 2
++
 +    # Stop the program 
 +    remote_exec build "kill -s STOP ${testpid}"
 +
@@ -725,6 +786,9 @@
 +       
 +    gdb_exit
 +
++    # Avoid some race:
++    sleep 2
++
 +    set fileid [open /proc/${testpid}/status r];
 +    gets $fileid line1;
 +    gets $fileid line2;
@@ -790,7 +854,7 @@
 +    gdb_exit
 +
 +    # Avoid some race:
-+    exec sleep 2
++    sleep 2
 +
 +    # At this point, the process should be sleeping
 +
@@ -831,3 +895,41 @@
 +corefunc threaded
 +
 +return 0
+--- ./gdb/doc/gdb.texinfo	1 Jul 2007 09:13:05 -0000	1.418
++++ ./gdb/doc/gdb.texinfo	1 Jul 2007 09:55:14 -0000
+@@ -2167,16 +2167,29 @@ can step and continue; you can modify st
+ process continue running, you may use the @code{continue} command after
+ attaching @value{GDBN} to the process.
+ 
++For a process already being stopped before the @code{attach} command executed
++you get the informational message below.  Other signals may be occasionally
++shown if they were being delivered right the time the @code{attach} command
++executed.  Such process is left still stopped after the @code{detach} command
++as long as you have not used the @code{continue} command (or similiar one)
++during your debugging session.
++
++ at smallexample
++Attaching to program: /bin/sleep, process 16289
++Redelivering pending Stopped (signal).
++ at end smallexample
++
+ @table @code
+ @kindex detach
+ @item detach
+ When you have finished debugging the attached process, you can use the
+- at code{detach} command to release it from @value{GDBN} control.  Detaching
+-the process continues its execution.  After the @code{detach} command,
+-that process and @value{GDBN} become completely independent once more, and you
+-are ready to @code{attach} another process or start one with @code{run}.
+- at code{detach} does not repeat if you press @key{RET} again after
+-executing the command.
++ at code{detach} command to release it from @value{GDBN} control.  Detaching the
++process continues its execution unless it was already stopped before the
++attachment and a @code{continue} type command has not been executed.  After the
++ at code{detach} command, that process and @value{GDBN} become completely
++independent once more, and you are ready to @code{attach} another process or
++start one with @code{run}.  @code{detach} does not repeat if you press
++ at key{RET} again after executing the command.
+ @end table
+ 
+ If you exit @value{GDBN} while you have an attached process, you detach


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gdb.spec	28 Aug 2007 14:46:38 -0000	1.243
+++ gdb.spec	16 Sep 2007 22:34:35 -0000	1.244
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 26%{?dist}
+Release: 27%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -345,7 +345,7 @@
 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 Patch254: gdb-6.6-testsuite-timeouts.patch
 
-# Fix attaching a stopped nonthreaded/threaded process (BZ 219118, 233852).
+# Fix attaching to stopped processes (BZ 219118, 233852).
 # Fix attaching during a pending signal being delivered.
 Patch256: gdb-6.6-bz233852-attach-signalled.patch
 
@@ -683,6 +683,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
+- Fix attaching to stopped processes and/or pending signals.
+
 * Tue Aug 28 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-26
 - New fast verification whether the .debug file matches its peer (build-id).
 - New locating of the matching binaries from the pure core file (build-id).



From fedora-extras-commits at redhat.com  Mon Sep 17 00:15:17 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 20:15:17 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.29, 1.30 gnome-python2.spec, 
	1.10, 1.11 sources, 1.29, 1.30
Message-ID: <200709170015.l8H0FHs5010803@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10779

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	31 Jul 2007 03:30:59 -0000	1.29
+++ .cvsignore	17 Sep 2007 00:14:44 -0000	1.30
@@ -1 +1 @@
-gnome-python-2.19.2.tar.bz2
+gnome-python-2.20.0.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python2.spec	29 Aug 2007 04:54:41 -0000	1.10
+++ gnome-python2.spec	17 Sep 2007 00:14:44 -0000	1.11
@@ -20,8 +20,8 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.19.2
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
@@ -187,6 +187,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
+- Update to 2.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	31 Jul 2007 03:30:59 -0000	1.29
+++ sources	17 Sep 2007 00:14:44 -0000	1.30
@@ -1 +1 @@
-5efaa0de2ef14ce56c0a702ee655fc07  gnome-python-2.19.2.tar.bz2
+b5f17b65333f1cf6a8c0de914eb06191  gnome-python-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 00:30:58 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Sun, 16 Sep 2007 20:30:58 -0400
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.15,
	1.16 gnome-python2-desktop.spec, 1.19, 1.20 sources, 1.15, 1.16
Message-ID: <200709170030.l8H0UwvE011234@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11208

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Jul 2007 03:57:23 -0000	1.15
+++ .cvsignore	17 Sep 2007 00:30:25 -0000	1.16
@@ -1 +1 @@
-gnome-python-desktop-2.19.2.tar.bz2
+gnome-python-desktop-2.20.0.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-python2-desktop.spec	29 Aug 2007 04:53:52 -0000	1.19
+++ gnome-python2-desktop.spec	17 Sep 2007 00:30:25 -0000	1.20
@@ -23,8 +23,8 @@
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.19.2
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -281,6 +281,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1.fc8
+- Update to 2.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.19.2-4
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Jul 2007 03:57:23 -0000	1.15
+++ sources	17 Sep 2007 00:30:25 -0000	1.16
@@ -1 +1 @@
-721c44d315bd76f003c0325323d89913  gnome-python-desktop-2.19.2.tar.bz2
+02b177f488091d27bf0648ec4660d8f7  gnome-python-desktop-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 00:40:16 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 16 Sep 2007 20:40:16 -0400
Subject: rpms/flac/devel .cvsignore, 1.6, 1.7 flac.spec, 1.32, 1.33 sources, 
	1.7, 1.8
Message-ID: <200709170040.l8H0eGWo011446@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371

Modified Files:
	.cvsignore flac.spec sources 
Log Message:
* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
- Update to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Sep 2007 21:59:47 -0000	1.6
+++ .cvsignore	17 Sep 2007 00:39:41 -0000	1.7
@@ -1 +1 @@
-flac-1.2.0.tar.gz
+flac-1.2.1.tar.gz


Index: flac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/flac.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- flac.spec	12 Sep 2007 21:05:16 -0000	1.32
+++ flac.spec	17 Sep 2007 00:39:41 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.1-1
+- Update to 1.2.1
+
 * Wed Sep 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.0-3
 - Make a few functions hidden, to try and avoid textrels
 - Disable optimisations on x86 for the same reason


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Sep 2007 21:59:47 -0000	1.7
+++ sources	17 Sep 2007 00:39:41 -0000	1.8
@@ -1 +1 @@
-ea176bfb291707b46a537b091c226ae7  flac-1.2.0.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 01:14:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:14:26 -0400
Subject: rpms/intltool/devel .cvsignore, 1.20, 1.21 intltool.spec, 1.37,
	1.38 sources, 1.20, 1.21
Message-ID: <200709170114.l8H1EQlg018004@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/intltool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982

Modified Files:
	.cvsignore intltool.spec sources 
Log Message:
0.36.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Aug 2007 22:27:22 -0000	1.20
+++ .cvsignore	17 Sep 2007 01:13:51 -0000	1.21
@@ -1 +1 @@
-intltool-0.36.1.tar.bz2
+intltool-0.36.2.tar.bz2


Index: intltool.spec
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- intltool.spec	13 Aug 2007 22:27:22 -0000	1.37
+++ intltool.spec	17 Sep 2007 01:13:51 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
-Version: 0.36.1
+Version: 0.36.2
 Release: 1%{?dist}
 License: GPLv2 with exception
 Group: Development/Tools
@@ -30,7 +30,7 @@
 %build
 %configure
 
-make
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +49,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 0.36.2-1
+- Update to 0.36.2
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 0.36.1-1
 - Update to 0.36.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/intltool/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Aug 2007 22:27:22 -0000	1.20
+++ sources	17 Sep 2007 01:13:51 -0000	1.21
@@ -1 +1 @@
-1822943ce6745596b2510d2b425cb90d  intltool-0.36.1.tar.bz2
+e41b8d791775fbd683784408f0e336a4  intltool-0.36.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 01:34:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:34:59 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.53, 1.54 gnome-applets.spec, 
	1.239, 1.240 sources, 1.56, 1.57
Message-ID: <200709170134.l8H1Yx5j018286@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18260

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	4 Sep 2007 05:30:53 -0000	1.53
+++ .cvsignore	17 Sep 2007 01:34:23 -0000	1.54
@@ -1 +1 @@
-gnome-applets-2.19.91.tar.bz2
+gnome-applets-2.20.0.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- gnome-applets.spec	4 Sep 2007 05:30:53 -0000	1.239
+++ gnome-applets.spec	17 Sep 2007 01:34:23 -0000	1.240
@@ -33,7 +33,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.19.91
+Version:	2.20.0
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
@@ -334,6 +334,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	4 Sep 2007 05:30:53 -0000	1.56
+++ sources	17 Sep 2007 01:34:23 -0000	1.57
@@ -1 +1 @@
-76f4e9cafe36de383de6ce7da9586d02  gnome-applets-2.19.91.tar.bz2
+985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 01:42:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:42:09 -0400
Subject: rpms/libgtop2/devel .cvsignore, 1.37, 1.38 libgtop2.spec, 1.56,
	1.57 sources, 1.37, 1.38 libgtop-2.0.2-prog_as.patch, 1.1, NONE
Message-ID: <200709170142.l8H1g9kU018427@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgtop2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405

Modified Files:
	.cvsignore libgtop2.spec sources 
Removed Files:
	libgtop-2.0.2-prog_as.patch 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	4 Sep 2007 03:32:24 -0000	1.37
+++ .cvsignore	17 Sep 2007 01:41:33 -0000	1.38
@@ -1 +1 @@
-libgtop-2.19.92.tar.bz2
+libgtop-2.20.0.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libgtop2.spec	4 Sep 2007 03:32:24 -0000	1.56
+++ libgtop2.spec	17 Sep 2007 01:41:33 -0000	1.57
@@ -6,12 +6,12 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.19.92
+Version: 	2.20.0
 Release: 	1%{?dist}
 License: 	GPLv2+
-URL:            http://download.gnome.org/sources/libgtop/2.19
+URL:            http://download.gnome.org/sources/libgtop/2.20
 Group:          System Environment/Libraries
-Source: 	http://download.gnome.org/sources/libgtop/2.19/libgtop-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/libgtop/2.20/libgtop-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	glib2 >= %{glib2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
@@ -21,8 +21,6 @@
 BuildRequires:  automake 
 BuildRequires:  gtk-doc
 
-Patch: libgtop-2.0.2-prog_as.patch
-
 %description
 libgtop is a library for portably obtaining information about processes, 
 such as their PID, memory usage, etc.
@@ -33,6 +31,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= %{glib2_version}
 Requires: 	pkgconfig
+Requires:	gtk-doc
 
 %description devel
 This package provides the necessary development libraries and include
@@ -40,16 +39,8 @@
 
 %prep
 %setup -q -n libgtop-%{version}
-%patch -p1 -b .prog_as
 
 %build
-# prog_as patches configure.in
-libtoolize --force
-aclocal
-automake --add-missing
-autoconf
-autoheader
-
 %configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -84,6 +75,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	4 Sep 2007 03:32:24 -0000	1.37
+++ sources	17 Sep 2007 01:41:33 -0000	1.38
@@ -1 +1 @@
-12edde75a0b7cf92ac89206f89f9e275  libgtop-2.19.92.tar.bz2
+ddc05ffe9499294801cbd5fdac949045  libgtop-2.20.0.tar.bz2


--- libgtop-2.0.2-prog_as.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 01:51:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 16 Sep 2007 21:51:24 -0400
Subject: rpms/orca/devel .cvsignore, 1.19, 1.20 orca.spec, 1.31, 1.32 sources,
	1.20, 1.21
Message-ID: <200709170151.l8H1pOmk018700@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/orca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18676

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Sep 2007 14:02:48 -0000	1.19
+++ .cvsignore	17 Sep 2007 01:50:47 -0000	1.20
@@ -1 +1 @@
-orca-2.19.92.tar.bz2
+orca-2.20.0.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- orca.spec	4 Sep 2007 14:02:48 -0000	1.31
+++ orca.spec	17 Sep 2007 01:50:47 -0000	1.32
@@ -15,14 +15,14 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.19.92
+Version:	2.20.0
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
 Group:		User Interface/Desktops
 License:	LGPLv2+
 URL:		http://www.gnome.org/projects/orca/
-Source0:	http://download.gnome.org/sources/orca/2.19/orca-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/orca/2.20/orca-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel >= %{python_version}
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	4 Sep 2007 14:02:48 -0000	1.20
+++ sources	17 Sep 2007 01:50:47 -0000	1.21
@@ -1 +1 @@
-d41a3d88509537f7674285d8a564f6b6  orca-2.19.92.tar.bz2
+00b47210528c6e00ff681c4ddbe2ec74  orca-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 04:41:58 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:41:58 -0400
Subject: rpms/homebank/devel homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170441.l8H4fwk9003351@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3330/devel

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:41:25 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:41:25 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 04:44:09 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:44:09 -0400
Subject: rpms/homebank/F-7 homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170444.l8H4i956003446@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3417/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:43:36 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:43:36 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 04:45:36 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Mon, 17 Sep 2007 00:45:36 -0400
Subject: rpms/homebank/FC-6 homebank.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709170445.l8H4jaP1003543@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/homebank/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	homebank.spec 
Log Message:
Initial package commit



--- NEW FILE homebank.spec ---
Name:           homebank
Version:        3.5
Release:        5%{?dist}
Summary:        Free easy personal accounting for all  

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://homebank.free.fr
Source0:        http://homebank.free.fr/public/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl(XML::Parser)
BuildRequires:  gettext
BuildRequires:  libofx-devel

%description
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to use.
It brings you many features that allows you to analyze your finances in a
detailed way instantly and dynamically with powerful report tools based on
filtering and graphical charts.

%package doc
Summary: Documentation files for homebank
Group: Applications/Productivity
Requires: %{name} = %{version}-%{release}
%description doc
Documentation files for homebank


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install                                    \
        --delete-original                               \
        --vendor="fedora"                               \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --mode 0644                                     \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}


%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 -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/images
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime-info/%{name}.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/application-registry/%{name}.applications

%files doc
%defattr(-,root,root,-)
%doc doc/TODO
%{_datadir}/%{name}/help

%changelog
* Sun Sep 16 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.5-5
- Removed pango from BR
- Added libofx-devel to BR
- Using macros everywhere
- Added update-desktop-databas to post
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-4
- Added release to doc subpackage requires
* Tue Sep 11 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-3
- Removed duplicate desktop file and logo file
- Corrected timestamps at install
- Removing pango from Requires
- Splitted doc into subpackage
* Mon Sep 10 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-2
- Fixed tag licence
- Fixed .desktop errors
- Keep timestamps at install
- Own installation directory
- Use of icon cache and mime cache scriptlets
* Mon Sep 03 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.5-1
- Upgrade to latest version
- praparing for submit to fedora's repository
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.4_unstable-0.1
- Packaging unstable version
* Mon Jul 02 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3-0.1
- 3.3 stable has been released
* Sat Apr 21 2007 Johan Cwiklinski <johan at x-tnd.be> - 3.3_unstable-0.1
- Building unstable version
- Using name marco in source0
- using initial SPEC from drpixel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/homebank/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Sep 2007 21:17:59 -0000	1.1
+++ .cvsignore	17 Sep 2007 04:45:04 -0000	1.2
@@ -0,0 +1 @@
+homebank-3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/homebank/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Sep 2007 21:17:59 -0000	1.1
+++ sources	17 Sep 2007 04:45:04 -0000	1.2
@@ -0,0 +1 @@
+4120d19081f3f67f3723cca8f847278b  homebank-3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 05:59:03 2007
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 17 Sep 2007 01:59:03 -0400
Subject: rpms/orpie/devel orpie.spec,1.4,1.5
Message-ID: <200709170559.l8H5x3vS010752@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/orpie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726

Modified Files:
	orpie.spec 
Log Message:
New spec for the new version of orpie.  Unfortunately, whereas before it didn't
compile because fedora 7 was too new, it won't compile now because it needs gsl
version 1.9 or greater (f-7 only has 1.8).



Index: orpie.spec
===================================================================
RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orpie.spec	8 Sep 2006 21:01:03 -0000	1.4
+++ orpie.spec	17 Sep 2007 05:58:29 -0000	1.5
@@ -3,8 +3,8 @@
 #
 
 Name:           orpie
-Version:        1.4.3
-Release:        5%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        A fullscreen console-based RPN calculator
 
 Group:          Applications/Engineering
@@ -20,11 +20,11 @@
 ################################################################################
 
 BuildRequires:  camlp4
-BuildRequires:  gsl-devel
+BuildRequires:  gsl-devel >= 1.9
 BuildRequires:  ncurses-devel
 
 Requires:       ocaml >= 3.07
-Requires:       gsl   >= 1.4
+Requires:       gsl   >= 1.9
 Requires:       camlp4
 
 ################################################################################
@@ -81,6 +81,9 @@
 
 %changelog
 
+* Sun Sep 16 2007   Chris Petersen <rpm at forevermore.net>                 1.5.1-1
+- Update to version 1.5.1
+
 * Fri Sep  8 2006   Chris Petersen <rpm at forevermore.net>                 1.4.3-5
 - Rebuild for FC6 glibc update
 



From fedora-extras-commits at redhat.com  Mon Sep 17 06:00:45 2007
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Mon, 17 Sep 2007 02:00:45 -0400
Subject: rpms/orpie/devel sources,1.2,1.3
Message-ID: <200709170600.l8H60jFc010826@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/orpie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10779

Modified Files:
	sources 
Log Message:
Upload the tarball for orpie 1.5.1 on the off chance that fedora 7 or 8 will update to gsl 1.9



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orpie/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 00:07:38 -0000	1.2
+++ sources	17 Sep 2007 06:00:12 -0000	1.3
@@ -1 +1 @@
-1c9d87cf3f8d982a9a3662d48e13de55  orpie-1.4.3.tar.gz
+4511626ed853354af1b4b5dbbf143a1f  orpie-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 06:20:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 02:20:50 -0400
Subject: rpms/fast-user-switch-applet/devel error-dialog.patch, NONE,
	1.1 many-users.patch, NONE, 1.1 throttle.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.15, 1.16
Message-ID: <200709170620.l8H6KoXc017311@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17254

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	error-dialog.patch many-users.patch throttle.patch 
Log Message:
Some bug fixes


error-dialog.patch:

--- NEW FILE error-dialog.patch ---
diff -up fast-user-switch-applet-2.18.0/src/applet.c.error-dialog fast-user-switch-applet-2.18.0/src/applet.c
--- fast-user-switch-applet-2.18.0/src/applet.c.error-dialog	2007-09-16 23:51:41.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/applet.c	2007-09-16 23:51:41.000000000 -0400
@@ -2147,6 +2147,7 @@ show_error_dialog (FusaAppletData *adata
 
       dialog = glade_xml_get_widget (xml, "error_dialog");
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
 
       if (is_fatal)
 	bonobo_main_quit ();
diff -up fast-user-switch-applet-2.18.0/data/ui.glade.error-dialog fast-user-switch-applet-2.18.0/data/ui.glade
--- fast-user-switch-applet-2.18.0/data/ui.glade.error-dialog	2007-09-16 23:57:08.000000000 -0400
+++ fast-user-switch-applet-2.18.0/data/ui.glade	2007-04-09 12:01:04.000000000 -0400
@@ -726,7 +726,7 @@
 		<widget class="GtkExpander" id="details_expander">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="expanded">True</property>
+		  <property name="expanded">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>

many-users.patch:

--- NEW FILE many-users.patch ---
diff -up fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users fast-user-switch-applet-2.18.0/src/fusa-manager.c
--- fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users	2007-09-17 01:56:45.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-manager.c	2007-09-17 02:08:59.000000000 -0400
@@ -129,11 +129,13 @@ struct _FusaManager
 
   GHashTable *shells;
   GHashTable *exclusions;
+  GHashTable *inclusions;
   gchar *global_face_dir;
   uid_t minimal_uid;
   gsize user_max_file;
   gint max_icon_size;
 
+  guint8 include_all : 1;
   guint8 allow_root  : 1;
   guint8 relax_group : 1;
   guint8 relax_other : 1;
@@ -341,6 +343,8 @@ fusa_manager_init (FusaManager *manager)
   /* GDM config file */
   manager->exclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       g_free, NULL);
+  manager->inclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
   reload_gdm_config (manager, FALSE);
   error = NULL;
   uri = g_filename_to_uri (GDMCONFIGFILE, NULL, &error);
@@ -645,6 +649,38 @@ merge_gdm_exclusions (FusaManager  *mana
   return TRUE;
 }
 
+/* Returns TRUE if changed */
+static gboolean
+merge_gdm_inclusions (FusaManager  *manager,
+		      gchar       **includev,
+		      const gchar  *include_default[])
+{
+  gint i;
+
+  if (strv_equals_string_table (includev, manager->inclusions))
+    return FALSE;
+
+  g_hash_table_foreach_remove (manager->inclusions,
+			       clear_hash_table_hrfunc, NULL);
+
+  if (include_default)
+    {
+      for (i = 0; include_default[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (include_default[i]),
+			     GUINT_TO_POINTER (TRUE));
+    }
+
+  if (includev)
+    {
+      for (i = 0; includev[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (includev[i]), GUINT_TO_POINTER (TRUE));
+    }
+
+  return TRUE;
+}
+
 static void resolve_dirty_flags(GdmResultState dummy1, const gchar *dummy2, gpointer data)
 {
   FusaManager *manager = data;
@@ -687,6 +723,27 @@ static void handler_Exclude(GdmResultSta
     manager->users_dirty = TRUE;
 }
 
+static void handler_Include(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gchar** includev = g_strsplit (value, ",", G_MAXINT);
+  
+  if (merge_gdm_inclusions (manager, includev, NULL))
+    manager->users_dirty = TRUE;
+}
+
+static void handler_IncludeAll(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gboolean tmp_include_all = strcasecmp(value, "false") != 0;
+  
+  if (tmp_include_all != manager->include_all)
+    {
+      manager->include_all = tmp_include_all;
+      manager->users_dirty = TRUE;
+    }
+}
+
 static void handler_GlobalFaceDir(GdmResultState is_ok, const gchar *value, gpointer data)
 {
   FusaManager *manager = data;
@@ -744,6 +801,8 @@ struct SettingsHandler {
 } settings_handlers[] = {
   { "greeter/MinimalUID", handler_MinimalUID },
   { "greeter/Exclude", handler_Exclude },
+  { "greeter/Include", handler_Include },
+  { "greeter/IncludeAll", handler_IncludeAll },
   { "greeter/GlobalFaceDir", handler_GlobalFaceDir },
   { "security/UserMaxFile", handler_UserMaxFile },
   { "security/AllowRoot", handler_AllowRoot },
@@ -798,27 +857,76 @@ reload_shells (FusaManager *manager)
   endusershell ();
 }
 
-static void
-reload_passwd (FusaManager *manager)
+#define OLD_FLAG 1
+#define NEW_FLAG 2
+
+static void set_flag (GObject *obj, int flag)
 {
-  struct passwd *pwent;
-  GSList *old_users, *new_users, *list;
-  
-  old_users = NULL;
-  new_users = NULL;
+  int flags;
+
+  flags = GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+  flags |= flag;
+  g_object_set_data (obj, "fusa-user-flags", GINT_TO_POINTER (flags));  
+}
+
+static int get_flags (GObject *obj)
+{
+  return GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+}
+
+static void clear_flags (GObject *obj)
+{
+  g_object_set_data (obj, "fusa-user-flags", NULL);
+}
 
-  g_hash_table_foreach (manager->users, listify_hash_values_hfunc, &old_users);
-  g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+static void mark_as_old (gpointer key, gpointer value, gpointer data)
+{
+  GObject *user = value;
 
+  set_flag (user, OLD_FLAG);  
   /* Make sure we keep users who are logged in no matter what. */
-  for (list = old_users; list; list = list->next)
+  if (fusa_user_get_n_displays (FUSA_USER (user)))
     {
-      if (fusa_user_get_n_displays (list->data))
-	{
-	  g_object_freeze_notify (G_OBJECT (list->data));
-	  new_users = g_slist_prepend (new_users, g_object_ref (list->data));
-	}
+      set_flag (user, NEW_FLAG);
+      g_object_freeze_notify (user);
+    }
+}
+
+static gboolean emit_add_or_remove (gpointer key, gpointer value, gpointer data)
+{
+  FusaManager *manager = data;
+  int flags;
+
+  flags = get_flags (value);
+  clear_flags (value);
+
+  if (flags == NEW_FLAG) 
+    { 
+      g_signal_emit (manager, signals[USER_ADDED], 0, value);
+      return FALSE;
+    }
+  else if (flags == OLD_FLAG)
+    {
+      g_signal_emit (manager, signals[USER_REMOVED], 0, value);
+      g_hash_table_remove (manager->users_by_uid,
+			   GINT_TO_POINTER (fusa_user_get_uid (value)));
+      return TRUE;
     }
+  else
+    return FALSE;
+}
+
+static void thaw (gpointer key, gpointer value, gpointer data)
+{
+  g_object_thaw_notify (value);
+}
+
+static void
+reload_passwd (FusaManager *manager)
+{
+  struct passwd *pwent;
+  
+  g_hash_table_foreach (manager->users, mark_as_old, NULL);
 
   setpwent ();
 
@@ -841,65 +949,36 @@ reload_passwd (FusaManager *manager)
       if (g_hash_table_lookup (manager->exclusions, pwent->pw_name))
 	continue;
 
+      if (g_hash_table_size (manager->inclusions) > 0)
+        {
+          if (!g_hash_table_lookup (manager->inclusions, pwent->pw_name))
+            continue;
+        }
+      else if (!manager->include_all)
+        continue;
+      
       user = g_hash_table_lookup (manager->users, pwent->pw_name);
 
-      /* Update users already in the *new* list */
-      if (g_slist_find (new_users, user))
-	{
-	  _fusa_user_update (user, pwent);
-	  continue;
-	}
-
-      if (!user)
-	user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
-      else
-	g_object_ref (user);
+      if (!user) 
+        {
+	  user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
+          g_hash_table_insert (manager->users,
+	  		       g_strdup (pwent->pw_name),
+			       user);
+          g_hash_table_insert (manager->users_by_uid,
+			       GINT_TO_POINTER (pwent->pw_uid),
+			       g_object_ref (user));
+        }
 
-      /* Freeze & update users not already in the new list */
       g_object_freeze_notify (G_OBJECT (user));
       _fusa_user_update (user, pwent);
-
-      new_users = g_slist_prepend (new_users, user);
+      set_flag (G_OBJECT (user), NEW_FLAG);
     }
   
   endpwent ();
 
-  /* Go through and handle added users */
-  for (list = new_users; list; list = list->next)
-    {
-      if (!g_slist_find (old_users, list->data))
-	{
-	  g_hash_table_insert (manager->users,
-			       g_strdup (fusa_user_get_user_name (list->data)),
-			       g_object_ref (list->data));
-	  g_hash_table_insert (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)),
-			       list->data);
-	  g_signal_emit (manager, signals[USER_ADDED], 0, list->data);
-	}
-    }
-
-  /* Go through and handle removed users */
-  for (list = old_users; list; list = list->next)
-    {
-      if (!g_slist_find (new_users, list->data))
-	{
-	  g_signal_emit (manager, signals[USER_REMOVED], 0, list->data);
-	  g_hash_table_remove (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)));
-	  g_hash_table_remove (manager->users,
-			       fusa_user_get_user_name (list->data));
-          /* FIXME: signals[USER_REMOVED]??? Why not? */
-	}
-    }
-
-  /* Cleanup */
-  g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
-  g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (new_users);
-
-  g_slist_foreach (old_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (old_users);
+  g_hash_table_foreach_remove (manager->users, emit_add_or_remove, manager);
+  g_hash_table_foreach (manager->users, thaw, NULL);
 }
 
 
diff -up fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users fast-user-switch-applet-2.18.0/src/fusa-user.c
--- fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users	2007-04-09 12:01:02.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-user.c	2007-09-17 01:56:45.000000000 -0400
@@ -81,6 +81,7 @@ struct _FusaUser
   gchar *display_name;
   gchar *home_dir;
   gchar *shell;
+  gchar *key;
 
   GSList *displays;
 };
@@ -444,6 +445,9 @@ _fusa_user_update (FusaUser            *
       g_object_notify (G_OBJECT (user), "shell");
     }
 
+  g_free (user->key);
+  user->key = NULL;
+
   g_object_thaw_notify (G_OBJECT (user));
 }
 
@@ -684,12 +688,28 @@ fusa_user_render_icon (FusaUser  *user,
   return _fusa_manager_render_icon (user->manager, user, widget, icon_size);
 }
 
+static gchar *
+get_collate_key (FusaUser *user)
+{
+  if (!user->key)
+    {
+      gchar *str;
+
+      if (user->display_name)
+        str = user->display_name;
+      else
+        str = user->username;
+
+      user->key = g_utf8_collate_key (str, -1);
+    }
+
+  return user->key;
+}
+
 gint
 fusa_user_collate (FusaUser *user1,
 		   FusaUser *user2)
 {
-  const gchar *str1, *str2;
-
   g_return_val_if_fail (user1 == NULL || FUSA_IS_USER (user1), 0);
   g_return_val_if_fail (user2 == NULL || FUSA_IS_USER (user2), 0);
 
@@ -702,24 +722,5 @@ fusa_user_collate (FusaUser *user1,
   if (!user1 && !user2)
     return 0;
 
-  if (user1->display_name)
-    str1 = user1->display_name;
-  else
-    str1 = user1->username;
-
-  if (user2->display_name)
-    str2 = user2->display_name;
-  else
-    str2 = user2->username;
-
-  if (!str1 && str2)
-    return -1;
-
-  if (str1 && !str2)
-    return 1;
-
-  if (!str1 && !str2)
-    return 0;
-
-  return g_utf8_collate (str1, str2);
+  return strcmp (get_collate_key (user1), get_collate_key (user2));
 }

throttle.patch:

--- NEW FILE throttle.patch ---
diff -up fast-user-switch-applet-2.18.0/src/applet.c.throttle fast-user-switch-applet-2.18.0/src/applet.c
--- fast-user-switch-applet-2.18.0/src/applet.c.throttle	2007-09-16 23:28:17.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/applet.c	2007-09-16 23:29:07.000000000 -0400
@@ -2347,18 +2347,16 @@ maybe_lock_screen (FusaAppletData *adata
 	  g_error_free (err);
 	}
 
-      if (use_gscreensaver)
-	args[1] = "--throttle";
-      else
-	args[1] = "-throttle";
+      args[1] = "-throttle";
 
-      if (!gdk_spawn_on_screen (screen, g_get_home_dir (), args, NULL,
+      if (use_gscreensaver ||
+          !gdk_spawn_on_screen (screen, g_get_home_dir (), args, NULL,
 				(G_SPAWN_STDERR_TO_DEV_NULL |
 				 G_SPAWN_STDOUT_TO_DEV_NULL),
 				NULL, NULL, NULL, &err))
 	{
 	  g_warning (_("Can't temporarily set screensaver to blank screen: %s"),
-		     err->message);
+		     err ? err->message : "");
 	  g_error_free (err);
 	}
 


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fast-user-switch-applet.spec	6 Aug 2007 06:00:13 -0000	1.15
+++ fast-user-switch-applet.spec	17 Sep 2007 06:20:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
 Version:        2.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -16,6 +16,12 @@
 Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477639
+Patch6:		throttle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477656
+Patch7:		error-dialog.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477666
+Patch8:		many-users.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +61,9 @@
 %patch3 -p1 -b .no-session
 %patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
+%patch6 -p1 -b .throttle
+%patch7 -p1 -b .error-dialog
+%patch8 -p1 -b .many-users
 
 %build
 %configure --disable-scrollkeeper \
@@ -97,7 +106,7 @@
 fi
  
 %postun
-scrollkeeper-update -q || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -109,6 +118,11 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3
+- Don't try to throttle gnome-screensaver (#246188)
+- Make the close button on the error dialog work
+- Make the handling of large numbers of users more efficient (#353831)
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-2
 - Use %%find_lang for help files, too
 



From fedora-extras-commits at redhat.com  Mon Sep 17 07:08:39 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 03:08:39 -0400
Subject: rpms/procps/F-7 procps-3.2.7-top-cpu0.patch, NONE, 1.1 procps.spec, 
	1.63, 1.64
Message-ID: <200709170708.l8H78dUx024067@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24042

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-top-cpu0.patch 
Log Message:
* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16
- fix #185994 - top "Cpu0" line never updates when using
  "Single Cpu = Off" option on single processor machine


procps-3.2.7-top-cpu0.patch:

--- NEW FILE procps-3.2.7-top-cpu0.patch ---
--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
+++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
@@ -959,8 +959,15 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
 
    // now value each separate cpu's tics


Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/F-7/procps.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- procps.spec	20 Aug 2007 13:03:01 -0000	1.63
+++ procps.spec	17 Sep 2007 07:08:04 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -60,6 +60,8 @@
 Patch28: procps-3.2.7-ps-eip64.patch
 #244960 - ps manpage formatted incorrectly
 Patch29: procps-3.2.7-psman.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch30: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -114,6 +116,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 cp %SOURCE1 .
 
@@ -151,6 +154,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-15
 - fix #244960 - ps manpage formatted incorrectly
 - update license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 07:31:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 03:31:44 -0400
Subject: rpms/openoffice.org/devel .cvsignore, 1.134,
	1.135 openoffice.org.spec, 1.1305, 1.1306 sources, 1.249, 1.250
Message-ID: <200709170731.l8H7Via9024573@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24537

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
release candidate OOG680_m5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- .cvsignore	6 Sep 2007 08:06:15 -0000	1.134
+++ .cvsignore	17 Sep 2007 07:31:11 -0000	1.135
@@ -4,4 +4,3 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
-OOG680_m4.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -r1.1305 -r1.1306
--- openoffice.org.spec	12 Sep 2007 13:55:49 -0000	1.1305
+++ openoffice.org.spec	17 Sep 2007 07:31:11 -0000	1.1306
@@ -1,5 +1,5 @@
 %define oootag OOG680
-%define ooomilestone 4
+%define ooomilestone 5
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2779,6 +2779,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.0-5.1
+- release candidate
+
 * Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
 - next version
 - ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p to


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- sources	6 Sep 2007 08:06:15 -0000	1.249
+++ sources	17 Sep 2007 07:31:11 -0000	1.250
@@ -4,4 +4,3 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-913fa35cd89e620a2b6ac9315c632721  OOG680_m4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 07:38:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 03:38:24 -0400
Subject: rpms/tk/devel tk-gifoverflow.patch,NONE,1.1 tk.spec,1.43,1.44
Message-ID: <200709170738.l8H7cOTg024900@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24864

Modified Files:
	tk.spec 
Added Files:
	tk-gifoverflow.patch 
Log Message:
CVE-2007-4851 Tk GIF processing buffer overflow


tk-gifoverflow.patch:

--- NEW FILE tk-gifoverflow.patch ---
--- tk8.4.15/generic/tkImgGIF.c.old	2006-03-27 14:13:56.000000000 +0200
+++ tk8.4.15/generic/tkImgGIF.c	2007-09-17 09:28:42.000000000 +0200
@@ -995,7 +995,7 @@
 	 */
 	if (interlace) {
 	    ypos += interlaceStep[pass];
-	    while (ypos >= height) {
+	    while (ypos >= rows) {
 		pass++;
 		if (pass > 3) {
 		    return TCL_OK;


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- tk.spec	31 Aug 2007 17:59:06 -0000	1.43
+++ tk.spec	17 Sep 2007 07:37:51 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -18,6 +18,7 @@
 # panedwindow.n from itcl conflicts
 Conflicts: itcl <= 3.2
 Patch1: tk-confi.patch
+Patch2: tk-gifoverflow.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -39,7 +40,8 @@
 %prep
 %setup -n %{name}%{version} -q
 
-%patch1  -p1 -b .confi
+%patch1 -p1 -b .confi
+%patch2 -p1 -b .buffer
 
 %build
 cd unix
@@ -107,6 +109,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 17 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-5
+- CVE-2007-4851 Tk GIF processing buffer overflow
+- Resolves: rhbz#290991
+
 * Fri Aug 31 2007 Jeremy Katz <katzj at redhat.com> - 1:8.4.15-4
 - BR gawk to unbreak things
 



From fedora-extras-commits at redhat.com  Mon Sep 17 07:42:23 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 03:42:23 -0400
Subject: rpms/libzzub/devel libzzub-buildfix.patch, NONE,
	1.1 libzzub-internalflacfix.patch, NONE,
	1.1 libzzub-sonamefix.patch, NONE, 1.1 libzzub.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709170742.l8H7gNkA025124@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libzzub-buildfix.patch libzzub-internalflacfix.patch 
	libzzub-sonamefix.patch libzzub.spec 
Log Message:
initial import


libzzub-buildfix.patch:

--- NEW FILE libzzub-buildfix.patch ---
diff -up libzzub-0.2.3/SConstruct.buildfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.buildfix	2007-09-11 21:51:01.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-11 21:51:30.000000000 +0200
@@ -70,6 +70,7 @@ opts.Add("LUNARTARGET", 'Target for Luna
 opts.Add("SSE", "Support SSE instructions", False, None, bool_converter)
 opts.Add("SSE2", "Support SSE2 instructions", False, None, bool_converter)
 opts.Add("MP3", "Support loading of MP3 samples", linux, None, bool_converter)
+opts.Add("JOBS", "Number of threads to compile with", '2')
 
 env = Environment(ENV = os.environ, options=opts)
 
@@ -105,9 +106,12 @@ env['ROOTPATH'] = os.getcwd()
 env.Append(CCFLAGS=['-D__SCONS__'])
 env.Append(LIBPATH=['${ROOTPATH}/lib'])
 
+SetOption('num_jobs', env['JOBS'].replace('-j', ''))
+
 if posix:
 	env.Append(CCFLAGS=[
 		'-DPOSIX',
+		'-fPIC',
 	])
 	env.Append(LINKFLAGS=[
 		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
@@ -139,12 +143,8 @@ cl = env['CC'] == 'cl'
 if gcc:
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=[
-			'-O3',
-			'-fomit-frame-pointer',
-			'-funroll-loops',
-			'-DNDEBUG',
-		])
+		env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS'))
+		env.Append(CCFLAGS=['-DNDEBUG'])
 	else:
 		env.Append(CCFLAGS=[
 			'-g',
@@ -152,19 +152,11 @@ if gcc:
 			'-D_DEBUG',
 		])
 	if env['SSE2'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse2',
 		])
 	elif env['SSE'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse',

libzzub-internalflacfix.patch:

--- NEW FILE libzzub-internalflacfix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.internalflacfix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-11 23:40:04.000000000 +0200
@@ -54,16 +54,8 @@ files = [
 	'input.cpp',
 ]
 
-# we build from our private flac,
-# since some are using 1.1.3, and that
-# one breaks a few things.
-localenv.Append(CPPPATH=[
-	"${ROOTPATH}/src/flac/include"
-])
-localenv.Append(CCFLAGS=[
-	'-DFLAC__NO_DLL',
-])
-env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript")
+# use internal flac support
+localenv.ParseConfig('pkg-config --libs flac')
 
 # minizip, zlib and flac dependencies
 files += [
@@ -82,8 +74,8 @@ if win32:
 	])
 	
 localenv.Append(LIBS=[
-	'FLAC',
 	'z',
+	'c',
 ])
 
 localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB'])
diff -up libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix libzzub-0.2.3/src/libzzub/ccm.cpp
--- libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/ccm.cpp	2007-09-11 23:40:38.000000000 +0200
@@ -1089,7 +1089,7 @@ bool CcmWriter::save(std::string fileNam
 }
 
 
-static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) {
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) {
     StreamWriter* writer=(StreamWriter*)client_data;
 
     writer->writeBytes(buffer, sizeof(FLAC__byte)*bytes);
@@ -1126,7 +1126,7 @@ struct DecoderInfo {
 // buffer can hold. The callback may choose to supply less data and modify the byte count
 // but must be careful not to overflow the buffer. The callback then returns a status code
 // chosen from FLAC__StreamDecoderReadStatus.
-static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) {
     DecoderInfo* info=(DecoderInfo*)client_data;
     StreamReader* reader=info->reader;
 
@@ -1180,19 +1180,21 @@ void flac_stream_decoder_error_callback(
 void decodeFLAC(StreamReader* reader, wave_info_ex& info, int level) {
 
     FLAC__StreamDecoder* stream=FLAC__stream_decoder_new();
-    FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback);
-    FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback);
-    FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback);
-    FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback);
 
     DecoderInfo decoder_info;
     decoder_info.reader=reader;
-    FLAC__stream_decoder_set_client_data(stream, &decoder_info);
+    //FLAC__stream_decoder_set_client_data(stream, &decoder_info);
 
     // we're not intersted in meitadeita
     FLAC__stream_decoder_set_metadata_ignore_all(stream);
 
-    FLAC__stream_decoder_init(stream);
+    FLAC__stream_decoder_init_stream(stream,
+				     flac_stream_decoder_read_callback,
+				     NULL, NULL, NULL, NULL,
+				     flac_stream_decoder_write_callback,
+				     flac_stream_decoder_metadata_callback,
+				     flac_stream_decoder_error_callback,
+				     &decoder_info);
 //    FLAC__stream_decoder_process_single(stream);
     FLAC__stream_decoder_process_until_end_of_stream(stream);
     
@@ -1255,11 +1257,16 @@ bool encodeFLAC(StreamWriter* writer, wa
 	FLAC__stream_encoder_set_bits_per_sample(stream, bps);
 	FLAC__stream_encoder_set_sample_rate(stream, sample_rate);
 	FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples);
-	FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
-	FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
-	FLAC__stream_encoder_set_client_data(stream, writer);
+	// FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
+	// FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
+	// FLAC__stream_encoder_set_client_data(stream, writer);
+
+	int result = FLAC__stream_encoder_init_stream(stream,
+						      flac_stream_encoder_write_callback,
+						      NULL,
+						      NULL,
+						      flac_stream_encoder_metadata_callback, writer);
 
-	int result = FLAC__stream_encoder_init(stream);
 	// if this fails, we want it to crash hard - or else will cause dataloss
 	assert(result == FLAC__STREAM_ENCODER_OK);
 

libzzub-sonamefix.patch:

--- NEW FILE libzzub-sonamefix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.sonamefix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.sonamefix	2007-02-01 04:11:33.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-03 16:15:02.000000000 +0200
@@ -153,6 +153,10 @@ if posix:
 			'-DNEWBUFFER'
 		])
 
+	localenv.Append(LINKFLAGS=[
+		'-Wl,-soname,libzzub.so.0.2.3'
+	])
+
 elif win32:
 	localenv.Append(LIBS=[
 		'portmidi',			


--- NEW FILE libzzub.spec ---
Name:		libzzub
Version:	0.2.3
Release:	5%{?dist}
Summary:	Powerful music sequencing library

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/zzub/
Source0:	%{name}-%{version}-fe.tar.bz2
# The original source code is from:
# http://downloads.sourceforge.net/aldrin/%{name}-%{version}.tar.bz2
#
# To comply with Fedora's Free Software Principles, MP3 support parts had to be
# removed:
# - src/libmad: completely removed
# - src/libzzub/libzzub.cpp: removed MP3 support part

Patch0:		libzzub-buildfix.patch
Patch1:		libzzub-sonamefix.patch
Patch2:		libzzub-internalflacfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64
BuildRequires:	scons >= 0.96.94
BuildRequires:	zlib-devel
BuildRequires:	libsndfile-devel >= 1.0.17
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	alsa-lib-devel
BuildRequires:	dos2unix
BuildRequires:	flac-devel >= 1.1.4
Requires:	libsndfile >= 1.0.17

%description
If you are searching for a foundation for your next Soundtracker, libzzub is
what you want. libzzub provides an extensible DSP plugin system, a
wavetable, instruments, a multitrack sequencer and support for major soundcard
APIs.


%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
mac2unix SConstruct
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .sonamefix
mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
%patch2 -p1 -b .internalflacfix


%build
find \
	-regextype posix-egrep \
	-regex '.*\.(h|html|c|cpp)' \
	-exec mac2unix '{}' \; \
	-exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS.txt > CREDITS
%{__rm} CREDITS.txt

scons configure \
	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
	LIBDIR=/%{_lib} \
	DEBUG=false \
	JOBS=%{?_smp_mflags} \
	MP3=false

scons CCFLAGS="%{optflags}"


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install CCFLAGS="%{optflags}"

cd $RPM_BUILD_ROOT%{_docdir}
%{__mv} zzub %{name}-%{version}

%{__mkdir_p} %{name}-devel-%{version}/examples
cd %{name}-devel-%{version}/examples
%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
%{__rm} -f */*.so
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS LICENCE REVISION
%{_bindir}/ccmplayer
%{_libdir}/liblunarstd.so
%{_libdir}/*.so.*
%{_libdir}/zzub
%{_libdir}/lunar

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libzzub.so
%{_defaultdocdir}/%{name}-devel-%{version}

%changelog
* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 17:56:49 -0000	1.1
+++ .cvsignore	17 Sep 2007 07:41:51 -0000	1.2
@@ -0,0 +1 @@
+libzzub-0.2.3-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 17:56:49 -0000	1.1
+++ sources	17 Sep 2007 07:41:51 -0000	1.2
@@ -0,0 +1 @@
+e524a3cf16500849c988a702918fe33e  libzzub-0.2.3-fe.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 07:43:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Mon, 17 Sep 2007 00:43:29 -0700
Subject: [pkgdb] rusers had acl change status
Message-ID: <200709170743.l8H7hUsS029394@app4.fedora.phx.redhat.com>

Ji?? Moskov??k (jmoskovc) has set the commit acl on rusers (Fedora 7) to Approved for Steve Dickson (steved)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rusers



From fedora-extras-commits at redhat.com  Mon Sep 17 07:43:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Mon, 17 Sep 2007 00:43:28 -0700
Subject: [pkgdb] rusers had acl change status
Message-ID: <200709170743.l8H7hTZQ029383@app4.fedora.phx.redhat.com>

Ji?? Moskov??k (jmoskovc) has set the commit acl on rusers (Fedora devel) to Approved for Steve Dickson (steved)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rusers



From fedora-extras-commits at redhat.com  Mon Sep 17 07:53:34 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 03:53:34 -0400
Subject: fedora-security/audit fc6,1.255,1.256 fc7,1.100,1.101
Message-ID: <200709170753.l8H7rYr4025487@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25374/audit

Modified Files:
	fc6 fc7 
Log Message:
Add ekiga, wordpress
Track updates release to FC6 & F7



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- fc6	11 Sep 2007 17:49:30 -0000	1.255
+++ fc6	17 Sep 2007 07:53:32 -0000	1.256
@@ -4,9 +4,10 @@
 # *CVE are items that need verification for Fedora Core 6
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070910
-# Up to date FC6 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date FC6 as of 20070916
 
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc7	12 Sep 2007 20:26:35 -0000	1.100
+++ fc7	17 Sep 2007 07:53:32 -0000	1.101
@@ -5,16 +5,19 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
-# Up to date CVE as of CVE email 20070910
-# Up to date FC7 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date FC7 as of 20070916
 
+CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
+CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
+CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051
-CVE-2007-4727 VULNERABLE (lighttpd) #284511
+CVE-2007-4727 version (lighttpd) #284511 [since FEDORA-2007-2132]
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
@@ -58,7 +61,7 @@
 CVE-2007-4153 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
-CVE-2007-4138 VULNERABLE (samba, fixed 3.0.26) #286311
+CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]



From fedora-extras-commits at redhat.com  Mon Sep 17 07:53:59 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 03:53:59 -0400
Subject: rpms/libzzub/F-7 libzzub-buildfix.patch, NONE,
	1.1 libzzub-internalflacfix.patch, NONE,
	1.1 libzzub-sonamefix.patch, NONE, 1.1 libzzub.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709170753.l8H7rxfB025491@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25390/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	libzzub-buildfix.patch libzzub-internalflacfix.patch 
	libzzub-sonamefix.patch libzzub.spec 
Log Message:
initial import


libzzub-buildfix.patch:

--- NEW FILE libzzub-buildfix.patch ---
diff -up libzzub-0.2.3/SConstruct.buildfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.buildfix	2007-09-11 21:51:01.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-11 21:51:30.000000000 +0200
@@ -70,6 +70,7 @@ opts.Add("LUNARTARGET", 'Target for Luna
 opts.Add("SSE", "Support SSE instructions", False, None, bool_converter)
 opts.Add("SSE2", "Support SSE2 instructions", False, None, bool_converter)
 opts.Add("MP3", "Support loading of MP3 samples", linux, None, bool_converter)
+opts.Add("JOBS", "Number of threads to compile with", '2')
 
 env = Environment(ENV = os.environ, options=opts)
 
@@ -105,9 +106,12 @@ env['ROOTPATH'] = os.getcwd()
 env.Append(CCFLAGS=['-D__SCONS__'])
 env.Append(LIBPATH=['${ROOTPATH}/lib'])
 
+SetOption('num_jobs', env['JOBS'].replace('-j', ''))
+
 if posix:
 	env.Append(CCFLAGS=[
 		'-DPOSIX',
+		'-fPIC',
 	])
 	env.Append(LINKFLAGS=[
 		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
@@ -139,12 +143,8 @@ cl = env['CC'] == 'cl'
 if gcc:
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=[
-			'-O3',
-			'-fomit-frame-pointer',
-			'-funroll-loops',
-			'-DNDEBUG',
-		])
+		env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS'))
+		env.Append(CCFLAGS=['-DNDEBUG'])
 	else:
 		env.Append(CCFLAGS=[
 			'-g',
@@ -152,19 +152,11 @@ if gcc:
 			'-D_DEBUG',
 		])
 	if env['SSE2'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse2',
 		])
 	elif env['SSE'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
 		env.Append(CCFLAGS=[
 			'-mfpmath=sse',
 			'-msse',

libzzub-internalflacfix.patch:

--- NEW FILE libzzub-internalflacfix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.internalflacfix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-11 23:40:04.000000000 +0200
@@ -54,16 +54,8 @@ files = [
 	'input.cpp',
 ]
 
-# we build from our private flac,
-# since some are using 1.1.3, and that
-# one breaks a few things.
-localenv.Append(CPPPATH=[
-	"${ROOTPATH}/src/flac/include"
-])
-localenv.Append(CCFLAGS=[
-	'-DFLAC__NO_DLL',
-])
-env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript")
+# use internal flac support
+localenv.ParseConfig('pkg-config --libs flac')
 
 # minizip, zlib and flac dependencies
 files += [
@@ -82,8 +74,8 @@ if win32:
 	])
 	
 localenv.Append(LIBS=[
-	'FLAC',
 	'z',
+	'c',
 ])
 
 localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB'])
diff -up libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix libzzub-0.2.3/src/libzzub/ccm.cpp
--- libzzub-0.2.3/src/libzzub/ccm.cpp.internalflacfix	2007-09-11 23:40:04.000000000 +0200
+++ libzzub-0.2.3/src/libzzub/ccm.cpp	2007-09-11 23:40:38.000000000 +0200
@@ -1089,7 +1089,7 @@ bool CcmWriter::save(std::string fileNam
 }
 
 
-static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) {
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) {
     StreamWriter* writer=(StreamWriter*)client_data;
 
     writer->writeBytes(buffer, sizeof(FLAC__byte)*bytes);
@@ -1126,7 +1126,7 @@ struct DecoderInfo {
 // buffer can hold. The callback may choose to supply less data and modify the byte count
 // but must be careful not to overflow the buffer. The callback then returns a status code
 // chosen from FLAC__StreamDecoderReadStatus.
-static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) {
     DecoderInfo* info=(DecoderInfo*)client_data;
     StreamReader* reader=info->reader;
 
@@ -1180,19 +1180,21 @@ void flac_stream_decoder_error_callback(
 void decodeFLAC(StreamReader* reader, wave_info_ex& info, int level) {
 
     FLAC__StreamDecoder* stream=FLAC__stream_decoder_new();
-    FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback);
-    FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback);
-    FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback);
-    FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback);
 
     DecoderInfo decoder_info;
     decoder_info.reader=reader;
-    FLAC__stream_decoder_set_client_data(stream, &decoder_info);
+    //FLAC__stream_decoder_set_client_data(stream, &decoder_info);
 
     // we're not intersted in meitadeita
     FLAC__stream_decoder_set_metadata_ignore_all(stream);
 
-    FLAC__stream_decoder_init(stream);
+    FLAC__stream_decoder_init_stream(stream,
+				     flac_stream_decoder_read_callback,
+				     NULL, NULL, NULL, NULL,
+				     flac_stream_decoder_write_callback,
+				     flac_stream_decoder_metadata_callback,
+				     flac_stream_decoder_error_callback,
+				     &decoder_info);
 //    FLAC__stream_decoder_process_single(stream);
     FLAC__stream_decoder_process_until_end_of_stream(stream);
     
@@ -1255,11 +1257,16 @@ bool encodeFLAC(StreamWriter* writer, wa
 	FLAC__stream_encoder_set_bits_per_sample(stream, bps);
 	FLAC__stream_encoder_set_sample_rate(stream, sample_rate);
 	FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples);
-	FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
-	FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
-	FLAC__stream_encoder_set_client_data(stream, writer);
+	// FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
+	// FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
+	// FLAC__stream_encoder_set_client_data(stream, writer);
+
+	int result = FLAC__stream_encoder_init_stream(stream,
+						      flac_stream_encoder_write_callback,
+						      NULL,
+						      NULL,
+						      flac_stream_encoder_metadata_callback, writer);
 
-	int result = FLAC__stream_encoder_init(stream);
 	// if this fails, we want it to crash hard - or else will cause dataloss
 	assert(result == FLAC__STREAM_ENCODER_OK);
 

libzzub-sonamefix.patch:

--- NEW FILE libzzub-sonamefix.patch ---
diff -up libzzub-0.2.3/src/libzzub/SConscript.sonamefix libzzub-0.2.3/src/libzzub/SConscript
--- libzzub-0.2.3/src/libzzub/SConscript.sonamefix	2007-02-01 04:11:33.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/SConscript	2007-09-03 16:15:02.000000000 +0200
@@ -153,6 +153,10 @@ if posix:
 			'-DNEWBUFFER'
 		])
 
+	localenv.Append(LINKFLAGS=[
+		'-Wl,-soname,libzzub.so.0.2.3'
+	])
+
 elif win32:
 	localenv.Append(LIBS=[
 		'portmidi',			


--- NEW FILE libzzub.spec ---
Name:		libzzub
Version:	0.2.3
Release:	5%{?dist}
Summary:	Powerful music sequencing library

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/zzub/
Source0:	%{name}-%{version}-fe.tar.bz2
# The original source code is from:
# http://downloads.sourceforge.net/aldrin/%{name}-%{version}.tar.bz2
#
# To comply with Fedora's Free Software Principles, MP3 support parts had to be
# removed:
# - src/libmad: completely removed
# - src/libzzub/libzzub.cpp: removed MP3 support part

Patch0:		libzzub-buildfix.patch
Patch1:		libzzub-sonamefix.patch
Patch2:		libzzub-internalflacfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExcludeArch:	ppc64
BuildRequires:	scons >= 0.96.94
BuildRequires:	zlib-devel
BuildRequires:	libsndfile-devel >= 1.0.17
BuildRequires:	jack-audio-connection-kit-devel
BuildRequires:	alsa-lib-devel
BuildRequires:	dos2unix
BuildRequires:	flac-devel >= 1.1.4
Requires:	libsndfile >= 1.0.17

%description
If you are searching for a foundation for your next Soundtracker, libzzub is
what you want. libzzub provides an extensible DSP plugin system, a
wavetable, instruments, a multitrack sequencer and support for major soundcard
APIs.


%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
mac2unix SConstruct
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .sonamefix
mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
%patch2 -p1 -b .internalflacfix


%build
find \
	-regextype posix-egrep \
	-regex '.*\.(h|html|c|cpp)' \
	-exec mac2unix '{}' \; \
	-exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS.txt > CREDITS
%{__rm} CREDITS.txt

scons configure \
	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
	LIBDIR=/%{_lib} \
	DEBUG=false \
	JOBS=%{?_smp_mflags} \
	MP3=false

scons CCFLAGS="%{optflags}"


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install CCFLAGS="%{optflags}"

cd $RPM_BUILD_ROOT%{_docdir}
%{__mv} zzub %{name}-%{version}

%{__mkdir_p} %{name}-devel-%{version}/examples
cd %{name}-devel-%{version}/examples
%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
%{__rm} -f */*.so
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog CREDITS LICENCE REVISION
%{_bindir}/ccmplayer
%{_libdir}/liblunarstd.so
%{_libdir}/*.so.*
%{_libdir}/zzub
%{_libdir}/lunar

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libzzub.so
%{_defaultdocdir}/%{name}-devel-%{version}

%changelog
* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 17:56:49 -0000	1.1
+++ .cvsignore	17 Sep 2007 07:53:27 -0000	1.2
@@ -0,0 +1 @@
+libzzub-0.2.3-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 17:56:49 -0000	1.1
+++ sources	17 Sep 2007 07:53:27 -0000	1.2
@@ -0,0 +1 @@
+e524a3cf16500849c988a702918fe33e  libzzub-0.2.3-fe.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:01:48 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 04:01:48 -0400
Subject: rpms/groff/devel groff.spec,1.53,1.54
Message-ID: <200709170801.l8H81m4H031658@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25652

Modified Files:
	groff.spec 
Log Message:
Fix license tag.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- groff.spec	12 Sep 2007 10:16:28 -0000	1.53
+++ groff.spec	17 Sep 2007 08:01:15 -0000	1.54
@@ -3,8 +3,8 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 8%{?dist}
-License: GPLv2 and FDL
+Release: 9%{?dist}
+License: GPLv2 and GFDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -237,6 +237,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-9
+- fix license
+
 * Tue Sep 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-8
 - another change in spec for review
 



From fedora-extras-commits at redhat.com  Mon Sep 17 08:12:16 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 04:12:16 -0400
Subject: rpms/aspell-no/devel .cvsignore, 1.6, 1.7 aspell-no.spec, 1.23,
	1.24 sources, 1.6, 1.7
Message-ID: <200709170812.l8H8CGLh032612@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-no/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32576

Modified Files:
	.cvsignore aspell-no.spec sources 
Log Message:
- remove useles souce file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2004 07:46:37 -0000	1.6
+++ .cvsignore	17 Sep 2007 08:11:39 -0000	1.7
@@ -1,2 +1 @@
-aspell-no-0.50-2.tar.bz2
 aspell-nb-0.50.1-0.tar.bz2


Index: aspell-no.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/aspell-no.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- aspell-no.spec	24 Aug 2007 11:52:51 -0000	1.23
+++ aspell-no.spec	17 Sep 2007 08:11:39 -0000	1.24
@@ -4,7 +4,7 @@
 Name: aspell-no
 Epoch: 50
 Version: 0.50.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
@@ -41,6 +41,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50.1-12
+- remove useles souce file
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50.1-11
 - add documentation
 - use configure script to create Makefile


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-no/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2004 07:46:37 -0000	1.6
+++ sources	17 Sep 2007 08:11:39 -0000	1.7
@@ -1,2 +1 @@
-b24b20ad02ce2a569f71f949b48823cc  aspell-no-0.50-2.tar.bz2
 d1173a5ce04f39e9c93183da691e7ce8  aspell-nb-0.50.1-0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:19:47 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 04:19:47 -0400
Subject: rpms/lftp/devel .cvsignore, 1.30, 1.31 lftp.spec, 1.60, 1.61 sources,
	1.30, 1.31
Message-ID: <200709170819.l8H8JlRj000464@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
- rebase



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	4 Apr 2007 13:52:30 -0000	1.30
+++ .cvsignore	17 Sep 2007 08:19:16 -0000	1.31
@@ -1 +1 @@
-lftp-3.5.10.tar.gz
+lftp-3.5.14.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- lftp.spec	6 Sep 2007 09:03:42 -0000	1.60
+++ lftp.spec	17 Sep 2007 08:19:16 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.5.10
-Release: 	4%{?dist}
+Version: 	3.5.14
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
+- rebase
+
 * Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	4 Apr 2007 13:52:30 -0000	1.30
+++ sources	17 Sep 2007 08:19:16 -0000	1.31
@@ -1 +1 @@
-8ba21d5264224136eb3ab562a3150a3e  lftp-3.5.10.tar.gz
+dfb019355ad7f7ed347e64b39e4d1d3c  lftp-3.5.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 08:33:16 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 04:33:16 -0400
Subject: rpms/gnomebaker/devel .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.13,
	1.14 sources, 1.4, 1.5 gnomebaker-0.6.1-gthreads.patch, 1.1,
	NONE gnomebaker-0.6.1-wodim.patch, 1.2, NONE
Message-ID: <200709170833.l8H8XGPP000899@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv872

Modified Files:
	.cvsignore gnomebaker.spec sources 
Removed Files:
	gnomebaker-0.6.1-gthreads.patch gnomebaker-0.6.1-wodim.patch 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:30:39 -0000	1.4
+++ .cvsignore	17 Sep 2007 08:32:44 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomebaker.spec	31 Aug 2007 13:12:28 -0000	1.13
+++ gnomebaker.spec	17 Sep 2007 08:32:44 -0000	1.14
@@ -1,14 +1,12 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gnomebaker-0.6.1-gthreads.patch
-Patch1:         gnomebaker-0.6.1-wodim.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -36,8 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gthreads
-%patch1 -p1 -b .wodim
 chmod 644 AUTHORS TODO
 
 
@@ -88,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
 - fix blanking CDRWs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:30:39 -0000	1.4
+++ sources	17 Sep 2007 08:32:44 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz


--- gnomebaker-0.6.1-gthreads.patch DELETED ---


--- gnomebaker-0.6.1-wodim.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 08:36:10 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:36:10 -0400
Subject: rpms/openoffice.org/devel sources,1.250,1.251
Message-ID: <200709170836.l8H8aA9Y000995@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv960

Modified Files:
	sources 
Log Message:
next version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- sources	17 Sep 2007 07:31:11 -0000	1.250
+++ sources	17 Sep 2007 08:35:37 -0000	1.251
@@ -4,3 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
+6dc9f4734c1ef5794b5e240e5e5270f8  OOG680_m5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:38:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:38:52 -0400
Subject: rpms/openoffice.org/devel .cvsignore,1.135,1.136
Message-ID: <200709170838.l8H8cqSM001135@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1107

Modified Files:
	.cvsignore 
Log Message:
next version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- .cvsignore	17 Sep 2007 07:31:11 -0000	1.135
+++ .cvsignore	17 Sep 2007 08:38:19 -0000	1.136
@@ -4,3 +4,4 @@
 Tigert-templates.tar.gz
 ooo64726.sdf
 unowinreg.dll
+OOG680_m5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 08:43:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:43:24 -0400
Subject: rpms/openoffice.org/F-7 openoffice.org.spec,1.1189,1.1190
Message-ID: <200709170843.l8H8hOJB001304@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -u -r1.1189 -r1.1190
--- openoffice.org.spec	26 Jul 2007 20:16:50 -0000	1.1189
+++ openoffice.org.spec	17 Sep 2007 08:42:51 -0000	1.1190
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 18
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -143,6 +143,7 @@
 Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
 Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
 Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch88: workspace.tipatch8.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1082,6 +1083,7 @@
 %patch85 -p1 -b .ooo79481.sw.rowordcount.patch
 %patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
 %patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
+%patch88 -p1 -b .workspace.tipatch8.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2678,6 +2680,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.2.1-18.2
+- Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch
+
 * Thu Jul 26 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
 - Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
 - Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch



From fedora-extras-commits at redhat.com  Mon Sep 17 08:44:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jan_Navr=C3=A1til?= (jnavrati))
Date: Mon, 17 Sep 2007 04:44:24 -0400
Subject: rpms/openoffice.org/F-7 workspace.tipatch8.patch,NONE,1.1
Message-ID: <200709170844.l8H8iOue001347@cvs-int.fedora.redhat.com>

Author: jnavrati

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1333

Added Files:
	workspace.tipatch8.patch 
Log Message:
Resolves: rhbz#251975 CVE-2007-2834 workspace.tipatch8.patch


workspace.tipatch8.patch:

--- NEW FILE workspace.tipatch8.patch ---
Index: source/filter.vcl/itiff/itiff.cxx
===================================================================
RCS file: /cvs/graphics/goodies/source/filter.vcl/itiff/itiff.cxx,v
retrieving revision 1.13
retrieving revision 1.13.72.1
diff -u -r1.13 -r1.13.72.1
--- openoffice.org.orig/goodies/source/filter.vcl/itiff/itiff.cxx	14 Nov 2006 16:17:15 -0000	1.13
+++ openoffice.org/goodies/source/filter.vcl/itiff/itiff.cxx	20 Jun 2007 14:21:15 -0000	1.13.72.1
@@ -132,7 +132,7 @@
 	double	ReadDoubleData();
 
 	void	ReadHeader();
-	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
+	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
 
 	BOOL	ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
 		// Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
@@ -290,7 +290,7 @@
 
 // ---------------------------------------------------------------------------------
 
-void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
+void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
 {
 	if ( bStatus == FALSE )
 		return;
@@ -353,16 +353,25 @@
 		case 0x0111: { // Strip Offset(s)
 			ULONG nOldNumSO, i, * pOldSO;
 			pOldSO = pStripOffsets;
-			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
+			if ( pOldSO == NULL )
+				nNumStripOffsets = 0;
 			nOldNumSO = nNumStripOffsets;
-			nNumStripOffsets += nDataLen;
-			pStripOffsets = new ULONG[ nNumStripOffsets ];
-			for ( i = 0; i < nOldNumSO; i++ )
-				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
-			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
-				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
-			if ( pOldSO != NULL )
+			nDataLen += nOldNumSO;
+			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
+			{
+				nNumStripOffsets = nDataLen;
+				pStripOffsets = new ULONG[ nNumStripOffsets ];
+				if ( !pStripOffsets )
+					nNumStripOffsets = 0;
+				else
+				{
+					for ( i = 0; i < nOldNumSO; i++ )
+						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
+					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
+						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
+				}
 				delete[] pOldSO;
+			}
 			OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
 			break;
 		}
@@ -384,16 +393,25 @@
 		case 0x0117: { // Strip Byte Counts
 			ULONG nOldNumSBC, i, * pOldSBC;
 			pOldSBC = pStripByteCounts;
-			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
+			if ( pOldSBC == NULL )
+				nNumStripByteCounts = 0; // Sicherheitshalber
 			nOldNumSBC = nNumStripByteCounts;
-			nNumStripByteCounts += nDataLen;
-			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
-			for ( i = 0; i < nOldNumSBC; i++ )
-				pStripByteCounts[ i ] = pOldSBC[ i ];
-			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
-				pStripByteCounts[ i ] = ReadIntData();
-			if ( pOldSBC != NULL )
+			nDataLen += nOldNumSBC;
+			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
+			{		
+				nNumStripByteCounts = nDataLen;
+				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
+				if ( !nNumStripByteCounts )
+					nNumStripByteCounts = 0;
+				else
+				{
+					for ( i = 0; i < nOldNumSBC; i++ )
+						pStripByteCounts[ i ] = pOldSBC[ i ];
+					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
+						pStripByteCounts[ i ] = ReadIntData();
+				}
 				delete[] pOldSBC;
+			}
 			OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
 			break;
 		}



From fedora-extras-commits at redhat.com  Mon Sep 17 08:51:16 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 04:51:16 -0400
Subject: rpms/tack/devel tack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709170851.l8H8pGLt001564@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tack.spec 
Log Message:
- initial release



--- NEW FILE tack.spec ---
Name:           tack
Version:        1.06
Release:        1%{?dist}
Summary:        Terminfo action checker

Group:          Development/Tools
License:        GPLv2+
URL:            http://invisible-island.net/ncurses/ncurses.html
Source0:        ftp://invisible-island.net/ncurses/tack-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
# tack was packaged in ncurses before 5.6-3.20070203.fc7
Requires:       ncurses >= 5.6-3.20070203

%description
The tack program has three purposes: to help you build a new terminfo
entry describing an unknown terminal, to test the correctness of an
existing entry, and to develop the correct pad timings needed to ensure
that screen updates don't fall behind the incoming data stream.

%prep
%setup -q

%build
%configure --with-ncurses
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 CHANGES COPYING HISTORY README
%{_bindir}/tack
%{_mandir}/man1/tack.1*

%changelog
* Tue Sep 11 2007 Miroslav Lichvar <mlichvar at redhat.com> 1.06-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	17 Sep 2007 08:50:44 -0000	1.2
@@ -0,0 +1 @@
+tack-1.06.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:39:41 -0000	1.1
+++ sources	17 Sep 2007 08:50:44 -0000	1.2
@@ -0,0 +1 @@
+8c1e0aa72c189781499cbe96b66bb4f5  tack-1.06.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 08:52:17 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 04:52:17 -0400
Subject: rpms/gnomebaker/F-7 .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.11,
	1.12 sources, 1.4, 1.5 gnomebaker-0.6.1-gthreads.patch, 1.1,
	NONE gnomebaker-0.6.1-wodim.patch, 1.2, NONE
Message-ID: <200709170852.l8H8qHC4001731@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655

Modified Files:
	.cvsignore gnomebaker.spec sources 
Removed Files:
	gnomebaker-0.6.1-gthreads.patch gnomebaker-0.6.1-wodim.patch 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:39:13 -0000	1.4
+++ .cvsignore	17 Sep 2007 08:51:45 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnomebaker.spec	31 Aug 2007 13:15:43 -0000	1.11
+++ gnomebaker.spec	17 Sep 2007 08:51:45 -0000	1.12
@@ -1,14 +1,12 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gnomebaker-0.6.1-gthreads.patch
-Patch1:         gnomebaker-0.6.1-wodim.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -36,8 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gthreads
-%patch1 -p1 -b .wodim
 chmod 644 AUTHORS TODO
 
 
@@ -88,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Fri Aug 31 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-4
 - fix CDRW blanking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:39:13 -0000	1.4
+++ sources	17 Sep 2007 08:51:45 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz


--- gnomebaker-0.6.1-gthreads.patch DELETED ---


--- gnomebaker-0.6.1-wodim.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:11:38 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 17 Sep 2007 05:11:38 -0400
Subject: rpms/gnomebaker/FC-6 .cvsignore, 1.4, 1.5 gnomebaker.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200709170911.l8H9BcGv008082@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8056

Modified Files:
	.cvsignore gnomebaker.spec sources 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 14:45:35 -0000	1.4
+++ .cvsignore	17 Sep 2007 09:11:06 -0000	1.5
@@ -1 +1 @@
-gnomebaker-0.6.1.tar.gz
+gnomebaker-0.6.2.tar.gz


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/gnomebaker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnomebaker.spec	28 Aug 2007 08:15:13 -0000	1.9
+++ gnomebaker.spec	17 Sep 2007 09:11:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnomebaker
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
@@ -21,8 +21,8 @@
 Requires:	cdrecord
 Requires:	mkisofs
 Requires:	cdda2wav
-Requires:	gstreamer-plugins-base
-Requires:	gstreamer-plugins-good
+Requires:	gstreamer-plugins-base >= 0.10
+Requires:	gstreamer-plugins-good >= 0.10
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -38,7 +38,6 @@
 
 
 %build
-export LDFLAGS="-export-dynamic"
 %configure --enable-libnotify=no
 make %{?_smp_mflags}
 
@@ -84,6 +83,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
+- new upstream version
+
 * Tue Aug 28 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.1-2
 - rebuild with -export-dynamic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 14:45:35 -0000	1.4
+++ sources	17 Sep 2007 09:11:06 -0000	1.5
@@ -1 +1 @@
-5ddffd4ae02417a3fd91b08951e7f434  gnomebaker-0.6.1.tar.gz
+0f9bcc1ff2640b0705c4999dc98dc501  gnomebaker-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 09:22:22 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 05:22:22 -0400
Subject: rpms/aspell-fo/devel .cvsignore, 1.2, 1.3 aspell-fo.spec, 1.11,
	1.12 sources, 1.2, 1.3 aspell-fo-0.51-0.utf-filename.patch, 1.1, NONE
Message-ID: <200709170922.l8H9MMbS008343@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-fo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316

Modified Files:
	.cvsignore aspell-fo.spec sources 
Removed Files:
	aspell-fo-0.51-0.utf-filename.patch 
Log Message:
- update to 0.2.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 03:08:57 -0000	1.2
+++ .cvsignore	17 Sep 2007 09:21:50 -0000	1.3
@@ -1 +1 @@
-aspell-fo-0.51-0.tar.bz2
+aspell5-fo-0.2.16-1.tar.bz2


Index: aspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-fo.spec	23 Aug 2007 13:52:02 -0000	1.11
+++ aspell-fo.spec	17 Sep 2007 09:21:50 -0000	1.12
@@ -1,15 +1,15 @@
 %define lang fo
-%define langrelease 0
+%define langrelease 1
+%define aspellversion 5
 Summary: Faeroese dictionaries for Aspell
 Name: aspell-%{lang}
 Epoch: 50
-Version: 0.51
+Version: 0.2.16
 Release: 6%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2
-Patch: aspell-fo-0.51-0.utf-filename.patch
+Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,9 +20,7 @@
 Provides the word list/dictionaries for the following: Faeroese
 
 %prep
-%setup -q -n aspell-%{lang}-%{version}-%{langrelease}
-%patch -p1 -b .utf-filename
-mv $(echo -e 'f\0370royskt.alias') $(echo -e 'f\0303\0270royskt.alias')
+%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}
 
 %build
 ./configure
@@ -41,6 +39,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-1
+- update to 0.2.16
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.51-6
 - add documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 03:08:57 -0000	1.2
+++ sources	17 Sep 2007 09:21:50 -0000	1.3
@@ -1 +1 @@
-5cc9168ad88ceb1b5531a5452527728b  aspell-fo-0.51-0.tar.bz2
+a57e8870c272931da41cd1fc5a291f3d  aspell5-fo-0.2.16-1.tar.bz2


--- aspell-fo-0.51-0.utf-filename.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:31:34 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 17 Sep 2007 05:31:34 -0400
Subject: rpms/keepalived/devel .cvsignore, 1.3, 1.4 keepalived.spec, 1.6,
	1.7 sources, 1.3, 1.4 keepalived-1.1.14-genhashman.patch, 1.1,
	NONE keepalived-1.1.14-include.patch, 1.1, NONE
Message-ID: <200709170931.l8H9VYHT008690@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8657

Modified Files:
	.cvsignore keepalived.spec sources 
Removed Files:
	keepalived-1.1.14-genhashman.patch 
	keepalived-1.1.14-include.patch 
Log Message:
Update to 1.1.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Sep 2007 10:44:23 -0000	1.3
+++ .cvsignore	17 Sep 2007 09:31:01 -0000	1.4
@@ -1 +1 @@
-keepalived-1.1.14.tar.gz
+keepalived-1.1.15.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- keepalived.spec	14 Sep 2007 14:17:56 -0000	1.6
+++ keepalived.spec	17 Sep 2007 09:31:01 -0000	1.7
@@ -3,15 +3,13 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.14
-Release: 2%{?dist}
+Version: 1.1.15
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Patch0: keepalived-1.1.14-genhashman.patch
-Patch1: keepalived-1.1.14-installmodes.patch
-Patch2: keepalived-1.1.14-include.patch
+Patch0: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,9 +37,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .genhashman
-%patch1 -p1 -b .installmodes
-%patch2 -p1 -b .include
+%patch0 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -104,6 +100,10 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-1
+- Update to 1.1.15.
+- Remove merged genhashman and include patches.
+
 * Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
 - Include patch from Shinji Tanaka to fix conf include from inside some
   directives like vrrp_instance.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Sep 2007 10:44:23 -0000	1.3
+++ sources	17 Sep 2007 09:31:01 -0000	1.4
@@ -1 +1 @@
-5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz
+b47f94bfcf5d77976c3068608a8680a5  keepalived-1.1.15.tar.gz


--- keepalived-1.1.14-genhashman.patch DELETED ---


--- keepalived-1.1.14-include.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 09:37:02 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 17 Sep 2007 05:37:02 -0400
Subject: rpms/system-config-samba/F-7 .cvsignore, 1.42, 1.43 sources, 1.43, 
	1.44 system-config-samba.spec, 1.47, 1.48
Message-ID: <200709170937.l8H9b2SU008814@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8777

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	10 Sep 2007 07:43:04 -0000	1.42
+++ .cvsignore	17 Sep 2007 09:36:30 -0000	1.43
@@ -1 +1 @@
-system-config-samba-1.2.51.tar.bz2
+system-config-samba-1.2.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	10 Sep 2007 07:43:04 -0000	1.43
+++ sources	17 Sep 2007 09:36:30 -0000	1.44
@@ -1 +1 @@
-2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2
+f8f645cc3f41eb82df750d0d52023b43  system-config-samba-1.2.52.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- system-config-samba.spec	10 Sep 2007 07:43:04 -0000	1.47
+++ system-config-samba.spec	17 Sep 2007 09:36:30 -0000	1.48
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.51
+Version: 1.2.52
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52
+- pick up updated translations
+
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
 - update Polish, Serbian translations
 - $RPM_BUILD_ROOT -> %%{buildroot}



From fedora-extras-commits at redhat.com  Mon Sep 17 09:39:12 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 17 Sep 2007 05:39:12 -0400
Subject: rpms/gnutls/F-7 gnutls-1.6.3-incompat-pointers.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 gnutls.spec, 1.27, 1.28 sources, 1.11, 1.12
Message-ID: <200709170939.l8H9dC1X008908@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8874

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-1.6.3-incompat-pointers.patch 
Log Message:
- update to gnutls-1.6.3

gnutls-1.6.3-incompat-pointers.patch:

--- NEW FILE gnutls-1.6.3-incompat-pointers.patch ---
--- gnutls-1.6.3/doc/examples/ex-pkcs12.c.incompat	2006-06-16 17:35:46.000000000 +0200
+++ gnutls-1.6.3/doc/examples/ex-pkcs12.c	2007-06-06 22:14:04.000000000 +0200
@@ -23,7 +23,7 @@
   int ret, bag_index;
   gnutls_pkcs12_bag_t bag, key_bag;
   char pkcs12_struct[10 * 1024];
-  int pkcs12_struct_size;
+  size_t pkcs12_struct_size;
   FILE *fd;
 
   /* A good idea might be to use gnutls_x509_privkey_get_key_id()
--- gnutls-1.6.3/doc/examples/ex-crq.c.incompat	2006-06-16 17:35:46.000000000 +0200
+++ gnutls-1.6.3/doc/examples/ex-crq.c	2007-06-06 22:14:46.000000000 +0200
@@ -19,7 +19,7 @@
   gnutls_x509_crq_t crq;
   gnutls_x509_privkey_t key;
   unsigned char buffer[10 * 1024];
-  int buffer_size = sizeof (buffer);
+  size_t buffer_size = sizeof (buffer);
 
   gnutls_global_init ();
 
--- gnutls-1.6.3/lib/gnutls_x509.c.incompat	2007-05-25 14:26:19.000000000 +0200
+++ gnutls-1.6.3/lib/gnutls_x509.c	2007-06-06 21:42:57.000000000 +0200
@@ -1884,6 +1884,7 @@
   gnutls_x509_crt_t cert = NULL;
   gnutls_x509_crl_t crl = NULL;
   int ret;
+  size_t size;
 
   ret = gnutls_pkcs12_init (&p12);
   if (ret < 0)
@@ -1892,7 +1893,8 @@
       return ret;
     }
 
-  p12blob.data = read_binary_file (pkcs12file, &p12blob.size);
+  p12blob.data = read_binary_file (pkcs12file, &size);
+  p12blob.size = (unsigned int)size;
   if (p12blob.data == NULL)
     {
       gnutls_assert ();
--- gnutls-1.6.3/lib/gnutls_psk.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/lib/gnutls_psk.c	2007-06-06 21:51:05.000000000 +0200
@@ -117,8 +117,9 @@
     }
   else
     {				/* HEX key */
-      res->key.size = key->size / 2;
-      res->key.data = gnutls_malloc (res->key.size);
+      size_t size;
+      size = res->key.size = key->size / 2;
+      res->key.data = gnutls_malloc (size);
       if (res->key.data == NULL)
 	{
 	  gnutls_assert ();
@@ -126,7 +127,8 @@
 	  goto error;
 	}
 
-      ret = gnutls_hex_decode (key, (char *) res->key.data, &res->key.size);
+      ret = gnutls_hex_decode (key, (char *) res->key.data, &size);
+      res->key.size = (unsigned int)size;
       if (ret < 0)
 	{
 	  gnutls_assert ();
--- gnutls-1.6.3/lib/auth_psk_passwd.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/lib/auth_psk_passwd.c	2007-06-06 21:47:10.000000000 +0200
@@ -48,6 +48,7 @@
 {
   char *p;
   int len, ret;
+  size_t size;
 
   p = strchr (str, ':');
   if (p == NULL)
@@ -68,15 +69,16 @@
   if (p[len - 1] == '\n' || p[len - 1] == ' ')
     len--;
 
-  psk->size = len / 2;
-  psk->data = gnutls_malloc (psk->size);
+  size = psk->size = len / 2;
+  psk->data = gnutls_malloc (size);
   if (psk->data == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_MEMORY_ERROR;
     }
 
-  ret = _gnutls_hex2bin ((opaque *) p, len, psk->data, &psk->size);
+  ret = _gnutls_hex2bin ((opaque *) p, len, psk->data, &size);
+  psk->size = (unsigned int)size;
   if (ret < 0)
     {
       gnutls_assert ();
--- gnutls-1.6.3/libextra/gnutls_openpgp.c.incompat	2006-09-26 10:17:11.000000000 +0200
+++ gnutls-1.6.3/libextra/gnutls_openpgp.c	2007-06-06 22:03:31.000000000 +0200
@@ -728,6 +728,7 @@
   struct stat statbuf;
   int rc = 0;
   gnutls_datum_t key, cert;
+  size_t size;
 
   if (!res || !keyfile || !certfile)
     {
@@ -741,14 +742,16 @@
       return GNUTLS_E_FILE_ERROR;
     }
 
-  cert.data = read_binary_file (certfile, &cert.size);
+  cert.data = read_binary_file (certfile, &size);
+  cert.size = (unsigned int)size;
   if (cert.data == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_FILE_ERROR;
     }
 
-  key.data = read_binary_file (keyfile, &key.size);
+  key.data = read_binary_file (keyfile, &size);
+  key.size = (unsigned int)size;
   if (key.data == NULL)
     {
       gnutls_assert ();
--- gnutls-1.6.3/libextra/openssl_compat.c.incompat	2006-03-08 11:44:59.000000000 +0100
+++ gnutls-1.6.3/libextra/openssl_compat.c	2007-06-06 22:05:55.000000000 +0200
@@ -537,6 +537,7 @@
 {
   gnutls_x509_crt_t xcert;
   int result;
+  size_t size;
 
   result = gnutls_x509_crt_init (&xcert);
   if (result < 0)
@@ -549,10 +550,11 @@
       return result;
     }
 
+  size = sizeof_buf;
   if (!issuer)
-    result = gnutls_x509_crt_get_dn (xcert, buf, &sizeof_buf);
+    result = gnutls_x509_crt_get_dn (xcert, buf, &size);
   else
-    result = gnutls_x509_crt_get_issuer_dn (xcert, buf, &sizeof_buf);
+    result = gnutls_x509_crt_get_issuer_dn (xcert, buf, &size);
 
   gnutls_x509_crt_deinit (xcert);
 
--- gnutls-1.6.3/libextra/opencdk/read-packet.c.incompat	2006-10-26 16:17:23.000000000 +0200
+++ gnutls-1.6.3/libextra/opencdk/read-packet.c	2007-06-06 21:55:22.000000000 +0200
@@ -876,7 +876,7 @@
 
 static void
 read_new_length( cdk_stream_t inp,
-                 size_t *r_len, size_t *r_size, size_t *r_partial )
+                 size_t *r_len, size_t *r_size, int *r_partial )
 {
     int c, c1;
   
--- gnutls-1.6.3/libextra/opencdk/seskey.c.incompat	2006-10-26 16:17:23.000000000 +0200
+++ gnutls-1.6.3/libextra/opencdk/seskey.c	2007-06-06 22:01:57.000000000 +0200
@@ -95,7 +95,8 @@
     byte * p, * frame;
     size_t n = 0;
     u16 chksum = 0;
-    int i = 0, nframe = 0;
+    int i = 0;
+    size_t nframe = 0;
     int rc = 0;
 
     if( !r_esk || !dek )
--- gnutls-1.6.3/src/tests.c.incompat	2006-09-21 13:27:59.000000000 +0200
+++ gnutls-1.6.3/src/tests.c	2007-06-06 22:10:43.000000000 +0200
@@ -50,7 +50,7 @@
 /* keep session info */
 static char *session_data = NULL;
 static char session_id[32];
-static int session_data_size = 0, session_id_size = 0;
+static size_t session_data_size = 0, session_id_size = 0;
 static int sfree = 0;
 static int handshake_output = 0;
 
--- gnutls-1.6.3/src/common.c.incompat	2006-07-05 23:32:53.000000000 +0200
+++ gnutls-1.6.3/src/common.c	2007-06-06 22:09:10.000000000 +0200
@@ -88,7 +88,7 @@
 {
   gnutls_x509_crt crt;
   const gnutls_datum *cert_list;
-  size_t cert_list_size = 0;
+  int cert_list_size = 0;
   int ret;
   char digest[20];
   char serial[40];


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Feb 2007 18:56:37 -0000	1.11
+++ .cvsignore	17 Sep 2007 09:38:39 -0000	1.12
@@ -1 +1 @@
-gnutls-1.4.5-nosrp.tar.bz2
+gnutls-1.6.3-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/gnutls.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnutls.spec	21 Aug 2007 19:39:30 -0000	1.27
+++ gnutls.spec	17 Sep 2007 09:38:39 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 1.4.5
+Version: 1.6.3
 Release: 2%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv2+
 License: GPLv2+ and LGPLv2+
@@ -17,6 +17,8 @@
 Source1: libgnutls-config
 Patch0: gnutls-1.4.0-nosrp.patch
 Patch1: gnutls-1.4.1-enable-psk.patch
+Patch2: gnutls-1.6.3-incompat-pointers.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
 
@@ -58,6 +60,7 @@
 %setup -q
 %patch0 -p1 -b .nosrp
 %patch1 -p1 -b .enable-psk
+%patch2 -p1 -b .incompat
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -124,6 +127,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 21 2007 Tomas Mraz <tmraz at redhat.com> 1.6.3-2
+- license tag fix
+
+* Wed Jun  6 2007 Tomas Mraz <tmraz at redhat.com> 1.6.3-1
+- upgrade to latest upstream (#232445)
+
 * Tue Apr 10 2007 Tomas Mraz <tmraz at redhat.com> 1.4.5-2
 - properly require install-info (patch by Ville Skytt??)
 - standard buildroot and use dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Feb 2007 18:56:37 -0000	1.11
+++ sources	17 Sep 2007 09:38:39 -0000	1.12
@@ -1 +1 @@
-12ca4ef81d34fe350b1cdfe50851cdb4  gnutls-1.4.5-nosrp.tar.bz2
+2c4372bd1e282f9697f0a3a6b0ea7977  gnutls-1.6.3-nosrp.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 09:52:19 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 05:52:19 -0400
Subject: rpms/tack/F-7 tack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709170952.l8H9qJ4I009288@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9207

Modified Files:
	.cvsignore sources 
Added Files:
	tack.spec 
Log Message:
- initial release



--- NEW FILE tack.spec ---
Name:           tack
Version:        1.06
Release:        1%{?dist}
Summary:        Terminfo action checker

Group:          Development/Tools
License:        GPLv2+
URL:            http://invisible-island.net/ncurses/ncurses.html
Source0:        ftp://invisible-island.net/ncurses/tack-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
# tack was packaged in ncurses before 5.6-3.20070203.fc7
Requires:       ncurses >= 5.6-3.20070203

%description
The tack program has three purposes: to help you build a new terminfo
entry describing an unknown terminal, to test the correctness of an
existing entry, and to develop the correct pad timings needed to ensure
that screen updates don't fall behind the incoming data stream.

%prep
%setup -q

%build
%configure --with-ncurses
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 CHANGES COPYING HISTORY README
%{_bindir}/tack
%{_mandir}/man1/tack.1*

%changelog
* Tue Sep 11 2007 Miroslav Lichvar <mlichvar at redhat.com> 1.06-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tack/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	17 Sep 2007 09:51:46 -0000	1.2
@@ -0,0 +1 @@
+tack-1.06.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tack/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:39:41 -0000	1.1
+++ sources	17 Sep 2007 09:51:46 -0000	1.2
@@ -0,0 +1 @@
+8c1e0aa72c189781499cbe96b66bb4f5  tack-1.06.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 09:52:57 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 05:52:57 -0400
Subject: fedora-security/audit fc6,1.256,1.257 fc7,1.101,1.102
Message-ID: <200709170952.l8H9qvd5009322@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9302

Modified Files:
	fc6 fc7 
Log Message:
QT is not embargoed anymore, track for fedora



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- fc6	17 Sep 2007 07:53:32 -0000	1.256
+++ fc6	17 Sep 2007 09:52:54 -0000	1.257
@@ -27,6 +27,7 @@
 CVE-2007-4225 ignore (kdebase) caused by fix to CVE-2007-3820 which we never shipped
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
+CVE-2007-4137 VULNERABLE (qt) #292951
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
 CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc7	17 Sep 2007 07:53:32 -0000	1.101
+++ fc7	17 Sep 2007 09:52:54 -0000	1.102
@@ -62,6 +62,7 @@
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
+CVE-2007-4137 VULNERABLE (qt) #292941
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]



From fedora-extras-commits at redhat.com  Mon Sep 17 10:09:37 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 06:09:37 -0400
Subject: fedora-security/audit fc6,1.257,1.258 fc7,1.102,1.103
Message-ID: <200709171009.l8HA9bRj015545@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15525

Modified Files:
	fc6 fc7 
Log Message:
wpa_supplicant



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- fc6	17 Sep 2007 09:52:54 -0000	1.257
+++ fc6	17 Sep 2007 10:09:34 -0000	1.258
@@ -7,6 +7,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc7	17 Sep 2007 09:52:54 -0000	1.102
+++ fc7	17 Sep 2007 10:09:34 -0000	1.103
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Mon Sep 17 10:41:14 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 06:41:14 -0400
Subject: fedora-security/audit fc7,1.103,1.104
Message-ID: <200709171041.l8HAfEBj020673@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20654

Modified Files:
	fc7 
Log Message:
nx



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc7	17 Sep 2007 10:09:34 -0000	1.103
+++ fc7	17 Sep 2007 10:41:12 -0000	1.104
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Mon Sep 17 11:01:41 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 07:01:41 -0400
Subject: fedora-security/audit fc7,1.104,1.105
Message-ID: <200709171101.l8HB1f7c029062@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28843

Modified Files:
	fc7 
Log Message:
Our libextractor is too new (libextractor-0.5.17a-1.fc7), xpdf code
not used since 0.5.12



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc7	17 Sep 2007 10:41:12 -0000	1.104
+++ fc7	17 Sep 2007 11:01:38 -0000	1.105
@@ -132,7 +132,7 @@
 CVE-2007-3387 backport (kdegraphics) #251509 [since FEDORA-2007-1594]
 CVE-2007-3387 backport (koffice) #251522 [since FEDORA-2007-1614]
 CVE-2007-3387 backport (cups) #251518 [since FEDORA-2007-1541]
-CVE-2007-3387 ** (libextractor)
+CVE-2007-3387 ignore (libextractor) http://bugs.gentoo.org/show_bug.cgi?id=188169
 CVE-2007-3384 ignore (tomcat) only affects 3.3.x and just affects an example
 CVE-2007-3381 version (gdm, fixed 2.18.4) #250277 [since FEDORA-2007-1362]
 CVE-2007-3378 ignore (php) safe mode escape



From fedora-extras-commits at redhat.com  Mon Sep 17 11:10:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 17 Sep 2007 07:10:32 -0400
Subject: rpms/groff/devel groff.spec,1.54,1.55
Message-ID: <200709171110.l8HBAWWV029269@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29167

Modified Files:
	groff.spec 
Log Message:
Change license tag and libdir macro change on prefix/lib again.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- groff.spec	17 Sep 2007 08:01:15 -0000	1.54
+++ groff.spec	17 Sep 2007 11:09:57 -0000	1.55
@@ -195,7 +195,7 @@
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
 mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
 rm -rf $RPM_BUILD_ROOT%{_libdir}/groff



From fedora-extras-commits at redhat.com  Mon Sep 17 11:10:50 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 07:10:50 -0400
Subject: devel/automake16 automake16.spec,1.16,1.17
Message-ID: <200709171110.l8HBAolv029274@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake16
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29238

Modified Files:
	automake16.spec 
Log Message:
- update licenses
- clarify BR autoconf for 'make check' only




Index: automake16.spec
===================================================================
RCS file: /cvs/extras/devel/automake16/automake16.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- automake16.spec	28 Aug 2007 10:08:12 -0000	1.16
+++ automake16.spec	17 Sep 2007 11:10:18 -0000	1.17
@@ -3,15 +3,17 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake16
 Version:    %{api_version}.3
-Release:    13
-License:    GPLv2+ and MIT
+Release:    14
+License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source10:   filter-provides-automake.sh
 Source11:   filter-requires-automake.sh
 URL:        http://sources.redhat.com/automake
 Obsoletes:  automake = 1.6.3
-Buildrequires:  autoconf >= 2.52 bison flex texinfo
+# Required for tests:
+Buildrequires:  autoconf >= 2.52
+Buildrequires:  bison flex texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildArch:  noarch
@@ -89,6 +91,10 @@
 %{_infodir}/*
 
 %changelog
+* Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-14
+- update licenses
+- clarify BR autoconf for 'make check' only
+
 * Tue Aug 28 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-13
 - fix license tag
 - add missing patch (#225300)



From fedora-extras-commits at redhat.com  Mon Sep 17 11:24:01 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 17 Sep 2007 07:24:01 -0400
Subject: rpms/aspell-ga/devel .cvsignore, 1.2, 1.3 aspell-ga.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <200709171124.l8HBO1EG029695@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-ga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576

Modified Files:
	.cvsignore aspell-ga.spec sources 
Log Message:
- update to 4.1-1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 03:09:24 -0000	1.2
+++ .cvsignore	17 Sep 2007 11:23:27 -0000	1.3
@@ -1 +1 @@
-aspell-ga-0.50-4.tar.bz2
+aspell5-ga-4.1-0.tar.bz2


Index: aspell-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/aspell-ga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-ga.spec	24 Aug 2007 09:06:58 -0000	1.11
+++ aspell-ga.spec	17 Sep 2007 11:23:27 -0000	1.12
@@ -1,14 +1,15 @@
 %define lang ga
-%define langrelease 4
+%define langrelease 0
+%define aspellversion 5
 Summary: Irish dictionaries for Aspell
 Name: aspell-%{lang}
 Epoch: 50
-Version: 0.50
-Release: 6%{?dist}
+Version: 4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://aspell.net/
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +20,7 @@
 Provides the word list/dictionaries for the following: Irish
 
 %prep
-%setup -q -n aspell-%{lang}-%{version}-%{langrelease}
+%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}
 
 %build
 ./configure
@@ -38,6 +39,9 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:4.1-1
+- update to 4.1-1
+
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.50-6
 - add documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-ga/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 03:09:24 -0000	1.2
+++ sources	17 Sep 2007 11:23:27 -0000	1.3
@@ -1 +1 @@
-6bc9da57557f6d63ecd1dd65b8a184a4  aspell-ga-0.50-4.tar.bz2
+e5f4e3a1925f7cdc7f2f65a8ab990c94  aspell5-ga-4.1-0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 11:40:17 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 07:40:17 -0400
Subject: rpms/cowsay/devel cowsay-3.03-help.patch, NONE, 1.1 cowsay.spec, 1.1,
	1.2
Message-ID: <200709171140.l8HBeHJX029994@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/cowsay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29965

Modified Files:
	cowsay.spec 
Added Files:
	cowsay-3.03-help.patch 
Log Message:
Bugzilla Bug 293061: Cowsay doesn't let Getopt::Std support --help correctly.


cowsay-3.03-help.patch:

--- NEW FILE cowsay-3.03-help.patch ---
diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay
--- cowsay-3.03.orig/cowsay	2007-09-17 13:27:32.000000000 +0200
+++ cowsay-3.03/cowsay	2007-09-17 13:28:04.000000000 +0200
@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey
           [-l] [-n] [-T tongue] [-W wrapcolumn] [message]
 EOF
 }
+
+sub main::HELP_MESSAGE {
+	display_usage;
+}


Index: cowsay.spec
===================================================================
RCS file: /cvs/extras/rpms/cowsay/devel/cowsay.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cowsay.spec	2 Jan 2007 19:05:28 -0000	1.1
+++ cowsay.spec	17 Sep 2007 11:39:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           cowsay
 Version:        3.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Configurable speaking/thinking cow
 Group:          Amusements/Games
 License:        Artistic or GPL
@@ -8,6 +8,7 @@
 Source0:        http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz
 Source1:        cowsay.bashcomp
 Source2:        animalsay
+Patch0:         cowsay-3.03-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .help
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
          -e 's#%BANGPERL%#!%{__perl}#' -i %{name}
 %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \
@@ -57,6 +59,9 @@
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Mon Sep 17 2007 Lubomir Kundrak <lkundrak at redhat.com> - 3.03-3
+- Make --help be a bit more sane (#293061)
+
 * Tue Jan 02 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 3.03-2
 - Use cp -p to keep timestamps
 - Fix paths in manpage



From fedora-extras-commits at redhat.com  Mon Sep 17 11:47:20 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 17 Sep 2007 07:47:20 -0400
Subject: rpms/gtkmm24/devel .cvsignore, 1.18, 1.19 gtkmm.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <200709171147.l8HBlKVI030144@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30108

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to new stable branch 2.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Aug 2007 21:47:01 -0000	1.18
+++ .cvsignore	17 Sep 2007 11:46:47 -0000	1.19
@@ -1 +1 @@
-gtkmm-2.11.7.tar.bz2
+gtkmm-2.12.0.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gtkmm.spec	28 Aug 2007 21:47:01 -0000	1.30
+++ gtkmm.spec	17 Sep 2007 11:46:47 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.11.7
+Version:        2.12.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -10,10 +10,10 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.13.1
+BuildRequires:  glibmm24-devel >= 2.14.0
 BuildRequires:  atk-devel >= 1.9.0
 BuildRequires:  pango-devel >= 1.5.2
-BuildRequires:  gtk2-devel >= 2.11.1
+BuildRequires:  gtk2-devel >= 2.12.0
 BuildRequires:  glib2-devel >= 2.8.0
 BuildRequires:  cairomm-devel >= 1.1.12
 
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.12.0-1
+- Update to new stable branch 2.12.0
+
 * Tue Aug 28 2007 Denis Leroy <denis at poolshark.org> - 2.11.7-1
 - Update to 2.11.7
 - License tag update


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	28 Aug 2007 21:47:01 -0000	1.20
+++ sources	17 Sep 2007 11:46:47 -0000	1.21
@@ -1 +1 @@
-c8943bab5801280681834adea821c6b0  gtkmm-2.11.7.tar.bz2
+b7a6adb1c9c7e1b6464b4240a4b7ba19  gtkmm-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 12:01:25 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 08:01:25 -0400
Subject: devel/automake17 automake-1.7.9-info.patch, NONE,
	1.1 automake17.spec, 1.11, 1.12
Message-ID: <200709171201.l8HC1Pmi004115@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	automake17.spec 
Added Files:
	automake-1.7.9-info.patch 
Log Message:
- fix licenses
- add README AUTHORS THANKS  to %%doc
- add comment about using ./configure
- fix automake17 info page and install it


automake-1.7.9-info.patch:

--- NEW FILE automake-1.7.9-info.patch ---
diff -urN automake-1.7.9/automake.texi automake-1.7.9_new/automake.texi
--- automake-1.7.9/automake.texi	2003-11-09 19:57:13.000000000 +0100
+++ automake-1.7.9_new/automake.texi	2007-09-17 13:37:58.000000000 +0200
@@ -1,7 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
- at setfilename automake.info
- at settitle automake
+ at setfilename automake17.info
+ at settitle automake17
 @setchapternewpage off
 @c %**end of header
 
@@ -9,12 +9,12 @@
 
 @dircategory Software development
 @direntry
-* automake: (automake).		Making Makefile.in's.
+* automake17: (automake17).		Making Makefile.in's.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* aclocal-1.7: (automake17)Invoking aclocal.          Generating aclocal.m4.
 @end direntry
 
 @ifinfo
@@ -5303,7 +5303,7 @@
 
 @example
 ETAGS_ARGS = automake.in --lang=none \
- --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake.texi
+ --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake17.texi
 @end example
 
 If you add filenames to @samp{ETAGS_ARGS}, you will probably also
diff -urN automake-1.7.9/Makefile.am automake-1.7.9_new/Makefile.am
--- automake-1.7.9/Makefile.am	2003-07-29 22:27:41.000000000 +0200
+++ automake-1.7.9_new/Makefile.am	2007-09-17 13:28:58.000000000 +0200
@@ -25,7 +25,7 @@
 SUBDIRS = . m4 lib tests
 
 bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
 
 CLEANFILES = $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
@@ -34,8 +34,8 @@
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
+TAGS_DEPENDENCIES = automake17.texi
 
 EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
   $(AUTOMAKESOURCES)
diff -urN automake-1.7.9/Makefile.in automake-1.7.9_new/Makefile.in
--- automake-1.7.9/Makefile.in	2003-11-09 20:29:57.000000000 +0100
+++ automake-1.7.9_new/Makefile.in	2007-09-17 13:32:46.000000000 +0200
@@ -97,7 +97,7 @@
 SUBDIRS = . m4 lib tests
 
 bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake17.texi
 
 CLEANFILES = $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
@@ -106,9 +106,9 @@
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi
 
-TAGS_DEPENDENCIES = automake.texi
+TAGS_DEPENDENCIES = automake17.texi
 
 EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
   $(AUTOMAKESOURCES)
@@ -143,11 +143,11 @@
 DIST_SOURCES =
 TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
-INFO_DEPS = automake.info
-DVIS = automake.dvi
-PDFS = automake.pdf
-PSS = automake.ps
-TEXINFOS = automake.texi
+INFO_DEPS = automake17.info
+DVIS = automake17.dvi
+PDFS = automake17.pdf
+PSS = automake17.ps
+TEXINFOS = automake17.texi
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
@@ -213,13 +213,13 @@
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-automake.info: automake.texi version.texi
-automake.dvi: automake.texi version.texi
-automake.pdf: automake.texi version.texi
+automake17.info: automake17.texi version.texi
+automake17.dvi: automake17.texi version.texi
+automake17.pdf: automake17.texi version.texi
 version.texi:  stamp-vti
-stamp-vti: automake.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
+stamp-vti: automake17.texi $(top_srcdir)/configure
+	@(dir=.; test -f ./automake17.texi || dir=$(srcdir); \
+	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake17.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -276,11 +276,11 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \
-	  automake.fn automake.ky automake.kys automake.log automake.op \
-	  automake.ov automake.pg automake.pgs automake.tmp \
-	  automake.toc automake.tp automake.tps automake.tr automake.vr \
-	  automake.vrs automake.dvi automake.pdf automake.ps
+	-rm -f automake17.aux automake17.cm automake17.cp automake17.cps automake17.cv \
+	  automake17.fn automake17.ky automake17.kys automake17.log automake17.op \
+	  automake17.ov automake17.pg automake17.pgs automake17.tmp \
+	  automake17.toc automake17.tp automake17.tps automake17.tr automake17.vr \
+	  automake17.vrs automake17.dvi automake17.pdf automake17.ps
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake17.spec	20 Feb 2007 17:07:14 -0000	1.11
+++ automake17.spec	17 Sep 2007 12:00:53 -0000	1.12
@@ -3,20 +3,25 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    8
-License:    GPL
+Release:    9
+License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
 Source10:   filter-provides-automake.sh
 Source11:   filter-requires-automake.sh
 #Patch0:     automake-1.7.9-dvi.patch
 Patch1:     automake-1.7.9-check.patch
+Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.8
+Conflicts:  Obsoletes = 1.7.8
 Requires:   autoconf >= 2.54
-Buildrequires:  autoconf >= 2.54, texinfo, texinfo-tex
+Buildrequires:  autoconf >= 2.54, texinfo
+# Required for 'make check':
+Buildrequires:  texinfo-tex
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %define _use_internal_dependency_generator 0
 %define __find_provides %{SOURCE10}
@@ -38,8 +43,13 @@
 %setup -q -n automake-%{version}
 #patch0 -p1
 %patch1 -p1
+%patch2 -p1
+rm -f automake.info*
+mv automake.texi automake17.texi
 
 %build
+# don't use %%configure here as we'd use config.{sub,guess} from the rpm package
+# instead of our own
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir}
 
@@ -52,7 +62,7 @@
 
 # create this dir empty so we can own it
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
 # KH: FIXME  This needs to be looked at, exdir2 gettext gettext2 subcond fail
 # gettext probably because the gettext.m4 isn't compatible with automake <1.9
@@ -60,20 +70,36 @@
 # make check  # VERBOSE=x
 #endif
 
+%post
+/sbin/install-info %{_infodir}/automake17.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/automake17.info %{_infodir}/dir || :
+fi
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING README AUTHORS THANKS 
 %{_bindir}/*-%{api_version}
 %exclude %{_bindir}/automake
 %exclude %{_bindir}/aclocal
 %{_datadir}/automake-%{api_version}
 %{_datadir}/aclocal-%{api_version}
+%{_infodir}/*
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-9
+- fix licenses
+- add README AUTHORS THANKS  to %%doc
+- add comment about using ./configure
+- fix automake17 info page and install it
+
+
 * Mon Feb 19 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-8
 - misc. cleanups for review
 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:02:11 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 17 Sep 2007 08:02:11 -0400
Subject: fedora-security/audit fc7,1.105,1.106
Message-ID: <200709171202.l8HC2B4e004254@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4197

Modified Files:
	fc7 
Log Message:
Duplicity



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc7	17 Sep 2007 11:01:38 -0000	1.105
+++ fc7	17 Sep 2007 12:02:09 -0000	1.106
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:04:18 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 17 Sep 2007 08:04:18 -0400
Subject: devel/automake17 automake17.spec,1.12,1.13
Message-ID: <200709171204.l8HC4IHF004458@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391

Modified Files:
	automake17.spec 
Log Message:
fix typo


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake17.spec	17 Sep 2007 12:00:53 -0000	1.12
+++ automake17.spec	17 Sep 2007 12:03:45 -0000	1.13
@@ -13,7 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  Obsoletes = 1.7.8
+Conflicts:  automake = 1.7.8
+Obsoletes:  automake = 1.7.8
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':



From fedora-extras-commits at redhat.com  Mon Sep 17 12:18:16 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 08:18:16 -0400
Subject: rpms/curl/F-7 curl.spec,1.49,1.50 sources,1.25,1.26
Message-ID: <200709171218.l8HCIG5R006175@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6116

Modified Files:
	curl.spec sources 
Log Message:
update to 7.16.4 (fixes rhbz#288971 and other issues)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-7/curl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- curl.spec	11 May 2007 12:07:53 -0000	1.49
+++ curl.spec	17 Sep 2007 12:17:44 -0000	1.50
@@ -2,8 +2,8 @@
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.2
-Release: 3%{?dist}
+Version: 7.16.4
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-1
+- update to 7.16.4 (fixes rhbz#288971 and other issues)
+
 * Fri May 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-3
 - add automake BR to curl-devel to fix aclocal dir. ownership,
   thanks to Patrice Dumas


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-7/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Apr 2007 18:20:54 -0000	1.25
+++ sources	17 Sep 2007 12:17:44 -0000	1.26
@@ -1,2 +1 @@
-acdab0b0467c55e10ed02d2afed80575  curl-7.16.1.tar.bz2
-37a1de15c4300ca9413d39d2bcea9b36  curl-7.16.2.tar.bz2
+ffa6d1f4e28ca493a43f9dc17882c4d8  curl-7.16.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 12:20:54 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 08:20:54 -0400
Subject: rpms/mutt/devel mutt-1.5.16-md5.patch,1.1,1.2 mutt.spec,1.48,1.49
Message-ID: <200709171220.l8HCKswt006449@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416

Modified Files:
	mutt-1.5.16-md5.patch mutt.spec 
Log Message:
- fix md5 on big-endian systems


mutt-1.5.16-md5.patch:

Index: mutt-1.5.16-md5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt-1.5.16-md5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mutt-1.5.16-md5.patch	28 Aug 2007 14:24:52 -0000	1.1
+++ mutt-1.5.16-md5.patch	17 Sep 2007 12:20:52 -0000	1.2
@@ -1144,3 +1144,21 @@
 +  md5_process_bytes (response, MD5_DIGEST_LEN, &ctx);
 +  md5_finish_ctx (&ctx, response);
  }
+# HG changeset patch
+# User Emanuele Giaquinta
+# Date 1189794927 25200
+# Node ID c699e5847630f6c9a2207d87d7f933a06b9d9e87
+# Parent  154417d57b9da5e488108887b3061a5322de8dbd
+The new MD5 code needs AC_C_BIGENDIAN on big-endian systems
+
+diff -r 154417d57b9d -r c699e5847630 configure.ac
+--- a/configure.ac	Thu Sep 13 09:39:47 2007 -0700
++++ b/configure.ac	Fri Sep 14 11:35:27 2007 -0700
+@@ -39,6 +39,7 @@ AC_CHECK_TOOL(AR, ar, ar)
+ 
+ AC_C_INLINE
+ AC_C_CONST
++AC_C_BIGENDIAN
+ 
+ AC_SYS_LARGEFILE
+ AC_FUNC_FSEEKO


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mutt.spec	28 Aug 2007 14:24:52 -0000	1.48
+++ mutt.spec	17 Sep 2007 12:20:52 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.16
-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
@@ -101,6 +101,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.16-4
+- fix md5 on big-endian systems
+
 * Tue Aug 28 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.16-3
 - replace md5 implementation
 - update license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 12:24:59 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:24:59 -0400
Subject: rpms/rusers/F-7 netkit-rusers-0.17-rusersd-droppriv.patch, NONE,
	1.1 rusers.spec, 1.23, 1.24 rusersd.init, 1.2, 1.3
Message-ID: <200709171224.l8HCOxX8006947@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6871

Modified Files:
	rusers.spec rusersd.init 
Added Files:
	netkit-rusers-0.17-rusersd-droppriv.patch 
Log Message:
- Removed portmap dependency and re-worked when the user
  privilege are drop; allowing port registration with
  rpcbind. (#247985)


netkit-rusers-0.17-rusersd-droppriv.patch:

--- NEW FILE netkit-rusers-0.17-rusersd-droppriv.patch ---
diff -up netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig netkit-rusers-0.17/rpc.rusersd/rusersd.c
--- netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig	2000-07-23 00:09:28.000000000 -0400
+++ netkit-rusers-0.17/rpc.rusersd/rusersd.c	2007-09-15 06:30:12.000000000 -0400
@@ -74,23 +74,6 @@ main(void)
  
 	/* Open syslog */
 	openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
- 
-	/* Drop privilege */
-	if (getuid() == 0) {
-		struct passwd	*pw;
- 
-		if ((pw = getpwnam("nobody")) == NULL) {
-			syslog(LOG_WARNING, "Unable to find user nobody: %m");
-			exit(1);
-		}
-		if (setgroups(1, &pw->pw_gid) < 0
-		 || setgid(pw->pw_gid) < 0
-		 || setuid(pw->pw_uid) < 0) {
-			syslog(LOG_WARNING, "Failed to drop privilege: %m");
-			exit(1);
-		}
-	}
- 
 	
 	/*
 	 * See if inetd started us
@@ -128,6 +111,23 @@ main(void)
 		syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_IDLE, %s).", proto?"udp":"(inetd)");
 		exit(1);
 	}
+ 
+	/* Drop privilege */
+	if (getuid() == 0) {
+		struct passwd	*pw;
+ 
+		if ((pw = getpwnam("nobody")) == NULL) {
+			syslog(LOG_WARNING, "Unable to find user nobody: %m");
+			exit(1);
+		}
+		if (setgroups(1, &pw->pw_gid) < 0
+		 || setgid(pw->pw_gid) < 0
+		 || setuid(pw->pw_uid) < 0) {
+			syslog(LOG_WARNING, "Failed to drop privilege: %m");
+			exit(1);
+		}
+	}
+ 
 
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");


Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusers.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rusers.spec	9 Aug 2006 12:39:57 -0000	1.23
+++ rusers.spec	17 Sep 2007 12:24:27 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 47
+Release: 48
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
 Patch14: netkit-rusers-0.17-procdiskstats.patch
+Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -72,6 +73,7 @@
 %patch12 -p1 -b .bigendian
 %patch13 -p1 -b .return
 %patch14 -p1 -b .procdiskstats
+%patch15 -p1 -b .dropprivs
 
 %build
 cat > MCONFIG <<EOF
@@ -144,6 +146,11 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17.48
+- Removed portmap dependency and re-worked when the user
+  privilege are drop; allowing port registration with
+  rpcbind. (#247985)
+
 * Wed Aug 09 2006 Phil Knirsch <pknirsch at redhat.com> 0.17-47
 - Modified the RHEL3 procpartitions patch to work on recent 2.6 kernels (#201839)
 


Index: rusersd.init
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusersd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rusersd.init	9 Sep 2004 11:56:00 -0000	1.2
+++ rusersd.init	17 Sep 2007 12:24:27 -0000	1.3
@@ -20,9 +20,6 @@
 RETVAL=0
 
 start() {
-	status portmap > /dev/null
-	RETVAL=$?
-	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/portmap start
 	echo -n $"Starting rusers services: "
 	daemon rpc.rusersd
 	RETVAL=$?



From fedora-extras-commits at redhat.com  Mon Sep 17 12:26:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Mon, 17 Sep 2007 08:26:33 -0400
Subject: rpms/openldap/devel ldap.sysconfig, NONE, 1.1 ldap.init, 1.24,
	1.25 openldap.spec, 1.92, 1.93
Message-ID: <200709171226.l8HCQX5e007113@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7056

Modified Files:
	ldap.init openldap.spec 
Added Files:
	ldap.sysconfig 
Log Message:
skeleton /etc/sysconfig/ldap added
new SLAPD_LDAP option to turn off listening on ldap:///
fixed checking of SSL
Resolves: #292591, #273581


--- NEW FILE ldap.sysconfig ---
# options of slapd (see man slapd)
#SLAPD_OPTIONS=

# options of slurpd (see man slurpd)
#   
#SLURPD_OPTIONS=

# run slapd with -h "... ldap:/// ..."
#   yes/no, default: yes
#SLAPD_LDAP=yes

# run slapd with -h "... ldapi:/// ..."
#   yes/no, default: no
#SLAPD_LDAPI=no

# run slapd with -h "... ldaps:/// ..."
#   yes/no, default: no
#SLAPD_LDAPS=no


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ldap.init	25 Jun 2007 09:18:53 -0000	1.24
+++ ldap.init	17 Sep 2007 12:26:02 -0000	1.25
@@ -19,9 +19,13 @@
 	[ ${NETWORKING} = "no" ] && exit 1
 fi
 
-# Source an auxiliary options file if we have one, and pick up OPTIONS,
-# SLAPD_OPTIONS, SLURPD_OPTIONS, SLAPD_LDAPS, SLAPD_LDAPI, and maybe
-# KRB5_KTNAME.
+# Define default values of options allowed in /etc/sysconfig/ldap
+SLAPD_LDAP="yes"
+SLAPD_LDAPI="no"
+SLAPD_LDAPS="no"
+# OPTIONS, SLAPD_OPTIONS, SLURPD_OPTIONS and KTB5_KTNAME are not defined
+
+# Source an auxiliary options file if we have one
 if [ -r /etc/sysconfig/ldap ] ; then
 	. /etc/sysconfig/ldap
 fi
@@ -149,8 +153,11 @@
 	# Define a couple of local variables which we'll need. Maybe.
 	user=ldap
 	prog=`basename ${slapd}`
-	harg="ldap:///"
-	if grep -q ^TLS /etc/openldap/slapd.conf || test x$SLAPD_LDAPS = xyes ; then
+	harg=""
+	if test x$LDAPD_LDAP = xyes ; then
+	    harg="ldap:///"
+	fi
+	if test x$SLAPD_LDAPS = xyes ; then
 	    harg="$harg ldaps:///"
 	fi
 	if test x$SLAPD_LDAPI = xyes ; then
@@ -170,7 +177,7 @@
 		    if [ "$replogfile" != "replogfile" ]
 		    then
 			echo -n $"Starting $prog: "
-			daemon ${slurpd} -r $replogfile -n $i
+			daemon ${slurpd} -r $replogfile -n $i $SLURPD_OPTIONS
 			# make the return value nozero if any of the slurpd failed
 			RET=$?
 			if [ $RET -ne 0 ] ; then


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- openldap.spec	6 Sep 2007 10:19:28 -0000	1.92
+++ openldap.spec	17 Sep 2007 12:26:02 -0000	1.93
@@ -25,6 +25,7 @@
 Source7: README.upgrading
 Source8: http://www.OpenLDAP.org/doc/admin/guide.html
 Source9: README.evolution
+Source10: ldap.sysconfig
 
 # Patches that are still valid for 2.3
 Patch0: openldap-2.3.34-config.patch
@@ -455,6 +456,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 755 $RPM_SOURCE_DIR/ldap.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap
 
+# Install syconfig/ldap
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 644 $RPM_SOURCE_DIR/ldap.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldap
+
 # Add some more schema for the sake of migration scripts.
 install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
 install -m644 \
@@ -616,7 +621,9 @@
 %doc openldap-%{version_23}/doc/guide/admin/*.gif
 %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
 %attr(0640,root,ldap) %{_sysconfdir}/openldap/DB_CONFIG.example
 %attr(0755,root,root) %dir %{_sysconfdir}/openldap/schema
 %attr(0644,root,root) %dir %{_sysconfdir}/openldap/schema/README*
@@ -669,6 +676,11 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Sep 17 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-2%{?dist}
+- skeleton /etc/sysconfig/ldap added
+- new SLAPD_LDAP option to turn off listening on ldap:/// (#292591)
+- fixed checking of SSL (#292611)
+
 * Thu Sep  6 2007 Jan Safranek <jsafranek at redhat.com> 2.3.38-1%{?dist}
 - new upstream version
 - added images to the guide.html (#273581)



From fedora-extras-commits at redhat.com  Mon Sep 17 12:30:14 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:30:14 -0400
Subject: rpms/rusers/F-7 rusers.spec,1.24,1.25
Message-ID: <200709171230.l8HCUEi5007540@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463

Modified Files:
	rusers.spec 
Log Message:
Added dist tag to get around tagging problem



Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/F-7/rusers.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rusers.spec	17 Sep 2007 12:24:27 -0000	1.24
+++ rusers.spec	17 Sep 2007 12:29:42 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 48
+Release: 48%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,7 +146,7 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
-* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17.48
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-48
 - Removed portmap dependency and re-worked when the user
   privilege are drop; allowing port registration with
   rpcbind. (#247985)



From fedora-extras-commits at redhat.com  Mon Sep 17 12:31:46 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Mon, 17 Sep 2007 08:31:46 -0400
Subject: rpms/quagga/devel .cvsignore, 1.17, 1.18 quagga.spec, 1.38,
	1.39 sources, 1.17, 1.18
Message-ID: <200709171231.l8HCVku9007722@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7663

Modified Files:
	.cvsignore quagga.spec sources 
Log Message:
* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
- upgrade to new upstream 0.99.9
- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Aug 2007 09:54:02 -0000	1.17
+++ .cvsignore	17 Sep 2007 12:31:13 -0000	1.18
@@ -1 +1 @@
-quagga-0.99.8.tar.gz
+quagga-0.99.9.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- quagga.spec	14 Sep 2007 09:41:41 -0000	1.38
+++ quagga.spec	17 Sep 2007 12:31:13 -0000	1.39
@@ -31,8 +31,8 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.8
-Release:    1.1%{?dist}
+Version:	0.99.9
+Release:    1%{?dist}
 Epoch:      0
 License:	GPL
 Group:      System Environment/Daemons
@@ -347,6 +347,10 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
+- upgrade to new upstream 0.99.9
+- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS
+
 * Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.8-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Aug 2007 09:54:03 -0000	1.17
+++ sources	17 Sep 2007 12:31:13 -0000	1.18
@@ -1 +1 @@
-0a53fb579033fa57ca0e5c3ff0b52105  quagga-0.99.8.tar.gz
+4dbdaf91bf6609803819d97d5fccc4c9  quagga-0.99.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 12:40:10 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 08:40:10 -0400
Subject: rpms/rusers/devel netkit-rusers-0.17-rusersd-droppriv.patch, NONE, 
	1.1 rusers.spec, 1.26, 1.27
Message-ID: <200709171240.l8HCeAr9008401@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rusers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8329

Modified Files:
	rusers.spec 
Added Files:
	netkit-rusers-0.17-rusersd-droppriv.patch 
Log Message:
Removed portmap dependency and re-worked when the user
privilege are drop; allowing port registration with
rpcbind. (#247985)


netkit-rusers-0.17-rusersd-droppriv.patch:

--- NEW FILE netkit-rusers-0.17-rusersd-droppriv.patch ---
diff -up netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig netkit-rusers-0.17/rpc.rusersd/rusersd.c
--- netkit-rusers-0.17/rpc.rusersd/rusersd.c.orig	2000-07-23 00:09:28.000000000 -0400
+++ netkit-rusers-0.17/rpc.rusersd/rusersd.c	2007-09-15 06:30:12.000000000 -0400
@@ -74,23 +74,6 @@ main(void)
  
 	/* Open syslog */
 	openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
- 
-	/* Drop privilege */
-	if (getuid() == 0) {
-		struct passwd	*pw;
- 
-		if ((pw = getpwnam("nobody")) == NULL) {
-			syslog(LOG_WARNING, "Unable to find user nobody: %m");
-			exit(1);
-		}
-		if (setgroups(1, &pw->pw_gid) < 0
-		 || setgid(pw->pw_gid) < 0
-		 || setuid(pw->pw_uid) < 0) {
-			syslog(LOG_WARNING, "Failed to drop privilege: %m");
-			exit(1);
-		}
-	}
- 
 	
 	/*
 	 * See if inetd started us
@@ -128,6 +111,23 @@ main(void)
 		syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_IDLE, %s).", proto?"udp":"(inetd)");
 		exit(1);
 	}
+ 
+	/* Drop privilege */
+	if (getuid() == 0) {
+		struct passwd	*pw;
+ 
+		if ((pw = getpwnam("nobody")) == NULL) {
+			syslog(LOG_WARNING, "Unable to find user nobody: %m");
+			exit(1);
+		}
+		if (setgroups(1, &pw->pw_gid) < 0
+		 || setgid(pw->pw_gid) < 0
+		 || setuid(pw->pw_uid) < 0) {
+			syslog(LOG_WARNING, "Failed to drop privilege: %m");
+			exit(1);
+		}
+	}
+ 
 
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");


Index: rusers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rusers.spec	29 Aug 2007 04:33:59 -0000	1.26
+++ rusers.spec	17 Sep 2007 12:39:38 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 50%{?dist}
+Release: 51%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
 Patch14: netkit-rusers-0.17-procdiskstats.patch
+Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -72,6 +73,7 @@
 %patch12 -p1 -b .bigendian
 %patch13 -p1 -b .return
 %patch14 -p1 -b .procdiskstats
+%patch15 -p1 -b .dropprivs
 
 %build
 cat > MCONFIG <<EOF
@@ -144,6 +146,11 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-51
+- Removed portmap dependency and re-worked when the user
+  privilege are drop; allowing port registration with
+  rpcbind. (#247985)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.17-50
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 12:58:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 08:58:41 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.218,1.219
Message-ID: <200709171258.l8HCwfUV009833@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9731

Modified Files:
	gnome-panel.spec 
Log Message:
drop hard fast-user-switch-applet dependency



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- gnome-panel.spec	13 Sep 2007 17:42:24 -0000	1.218
+++ gnome-panel.spec	17 Sep 2007 12:58:08 -0000	1.219
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,7 +39,6 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
-Requires: fast-user-switch-applet
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -311,6 +310,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-5
+- Drop the requires for fast-user-switch-applet (#253831)
+
 * Thu Sep 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-4
 - Fix some memleaks
 - Remove OpenOffice launchers from the default configuration



From fedora-extras-commits at redhat.com  Mon Sep 17 13:02:40 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 09:02:40 -0400
Subject: rpms/lftp/devel lftp.spec,1.61,1.62
Message-ID: <200709171302.l8HD2eUk016120@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16054

Modified Files:
	lftp.spec 
Log Message:
* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-2
- rebase
- deleted symlinks liblftp-jobs.so & liblftp-tasks.so



Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- lftp.spec	17 Sep 2007 08:19:16 -0000	1.61
+++ lftp.spec	17 Sep 2007 13:02:08 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.14
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
@@ -44,6 +44,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-*.so
 %find_lang %{name}
 %if %{DEBUG}
 %{_libdir}/rpm/brp-compress
@@ -85,8 +86,9 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
-* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-1
+* Mon Sep 17 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.14-2
 - rebase
+- deleted symlinks liblftp-jobs.so & liblftp-tasks.so
 
 * Thu Sep 06 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-4
 - rebuild



From fedora-extras-commits at redhat.com  Mon Sep 17 13:04:11 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 09:04:11 -0400
Subject: rpms/ypbind/devel ypbind.init,1.17,1.18 ypbind.spec,1.43,1.44
Message-ID: <200709171304.l8HD4Bin016324@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/ypbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16257

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Fixed a couple of typos in initscript (bz 281951)



Index: ypbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ypbind.init	17 Apr 2007 19:50:58 -0000	1.17
+++ ypbind.init	17 Sep 2007 13:03:39 -0000	1.18
@@ -51,7 +51,7 @@
 start() {
 	DOMAINNAME=`domainname`
 	if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
-		echo -n $"Setting  NIS domain: "
+		echo -n $"Setting NIS domain: "
 		if [ -n "$NISDOMAIN" ]; then
 			action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN
 		else # See if the domain is set in config file
@@ -77,7 +77,7 @@
 	    logger -t ypbind "failed to start!"
 	    return $RETVAL
 	fi
-	echo -n $"Binding  NIS service: "
+	echo -n $"Binding NIS service: "
 	# the following fixes problems with the init scripts continuing
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
@@ -145,6 +145,7 @@
 	;;
   status)
 	status ypbind
+	RETVAL=$?
 	;;
   restart|reload)
 	restart


Index: ypbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ypbind.spec	18 May 2007 20:17:41 -0000	1.43
+++ ypbind.spec	17 Sep 2007 13:03:39 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.20.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -91,6 +91,9 @@
 %doc README NEWS
 
 %changelog
+* Mon Sep 17 2007 Steve Dickson <steved at redhat.com> - 3:1.20.4-2
+- Fixed a couple of typos in initscript (bz 281951)
+
 * Wed May  3 2007 Steve Dickson <steved at redhat.com> - 3:1.20.4-1
 - updated to latest upstream version ypbind-mt-1.20.4
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:12:00 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Mon, 17 Sep 2007 09:12:00 -0400
Subject: rpms/quagga/F-7 .cvsignore, 1.16, 1.17 quagga.spec, 1.36,
	1.37 sources, 1.16, 1.17
Message-ID: <200709171312.l8HDC0fr017103@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/quagga/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17025

Modified Files:
	.cvsignore quagga.spec sources 
Log Message:
* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
- upgrade to new upstream 0.99.9
- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Jul 2007 13:30:12 -0000	1.16
+++ .cvsignore	17 Sep 2007 13:11:28 -0000	1.17
@@ -1 +1 @@
-quagga-0.99.7.tar.gz
+quagga-0.99.9.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/quagga.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- quagga.spec	3 Jul 2007 13:30:12 -0000	1.36
+++ quagga.spec	17 Sep 2007 13:11:28 -0000	1.37
@@ -31,7 +31,7 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.7
+Version:	0.99.9
 Release:    1%{?dist}
 Epoch:      0
 License:	GPL
@@ -340,6 +340,10 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.9-1
+- upgrade to new upstream 0.99.9
+- Resolves: #292841: CVE-2007-4826 quagga bgpd DoS
+
 * Tue Jul  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.99.7-1
 - upgrade to new upstream 0.99.7
 - resolves: #240488: CVE-2007-1995 Quagga bgpd DoS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quagga/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Jul 2007 13:30:12 -0000	1.16
+++ sources	17 Sep 2007 13:11:28 -0000	1.17
@@ -1 +1 @@
-f448281c50007408ce92c5d8e2107abc  quagga-0.99.7.tar.gz
+4dbdaf91bf6609803819d97d5fccc4c9  quagga-0.99.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 13:13:25 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 09:13:25 -0400
Subject: rpms/pcre/devel .cvsignore, 1.9, 1.10 pcre.spec, 1.22, 1.23 sources,
	1.10, 1.11
Message-ID: <200709171313.l8HDDPFd017273@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17163

Modified Files:
	.cvsignore pcre.spec sources 
Log Message:
bz292501, update to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2006 19:43:55 -0000	1.9
+++ .cvsignore	17 Sep 2007 13:12:53 -0000	1.10
@@ -3,3 +3,4 @@
 pcre-6.3.tar.bz2
 pcre-6.6.tar.bz2
 pcre-6.7.tar.bz2
+pcre-7.3.tar.bz2


Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pcre.spec	22 Jan 2007 10:59:48 -0000	1.22
+++ pcre.spec	17 Sep 2007 13:12:53 -0000	1.23
@@ -1,13 +1,12 @@
 Name: pcre
-Version: 7.0
-Release: 2
+Version: 7.3
+Release: 1
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
 Patch1: pcre-6.6-multilib.patch
 License: BSD
 Group: System Environment/Libraries
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Prereq: /sbin/ldconfig
 BuildPrereq: sed
@@ -82,6 +81,9 @@
 %{_bindir}/pcre-config
 
 %changelog
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 7.3-1
+- bz292501, update to 7.3
+
 * Mon Jan 22 2007 Than Ngo <than at redhat.com> - 7.0-1
 - 7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Jan 2007 10:15:40 -0000	1.10
+++ sources	17 Sep 2007 13:12:53 -0000	1.11
@@ -1 +1 @@
-b97e3bb84bd665e0fbb7a90344d65a43  pcre-7.0.tar.bz2
+08b48bf97ff84a9dea07d6be518f0046  pcre-7.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 13:29:47 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 09:29:47 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.2,1.3
Message-ID: <200709171329.l8HDTl6R018765@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18694

Modified Files:
	eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
- Require eclipse-platform >= 3.2.1 



Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-egit.spec	15 Sep 2007 18:16:03 -0000	1.2
+++ eclipse-egit.spec	17 Sep 2007 13:29:15 -0000	1.3
@@ -4,8 +4,8 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          0.git20070911%{?dist}
-License:          EPL GPLv2
+Release:          1.git20070911%{?dist}
+License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
@@ -14,7 +14,7 @@
 Source1:          egit.png
 Patch0:           %{name}-add-feature.patch
 
-Requires:         eclipse-platform > 1:3.3.0
+Requires:         eclipse-platform >= 1:3.2.1
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
@@ -97,6 +97,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
+- Require eclipse-platform >= 3.2.1 
+
 * Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
 - Update to git20070911.
 - Update feature and accosicated branding plugin.



From fedora-extras-commits at redhat.com  Mon Sep 17 13:30:25 2007
From: fedora-extras-commits at redhat.com (Maros Barabas (mbarabas))
Date: Mon, 17 Sep 2007 09:30:25 -0400
Subject: rpms/netatalk/devel netatalk-2.0.3-open_call.patch, NONE,
	1.1 netatalk.spec, 1.37, 1.38 netatalk-2.0.3-build_open.patch,
	1.1, NONE
Message-ID: <200709171330.l8HDUPmo018891@cvs-int.fedora.redhat.com>

Author: mbarabas

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-open_call.patch 
Removed Files:
	netatalk-2.0.3-build_open.patch 
Log Message:
* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-15
- patch to build on FC, bad open call 


netatalk-2.0.3-open_call.patch:

--- NEW FILE netatalk-2.0.3-open_call.patch ---
diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c
--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call	2007-09-17 15:21:26.000000000 +0200
+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c	2007-09-17 15:21:43.000000000 +0200
@@ -131,9 +131,9 @@ static int  my_associate (DB *p, DB *s,
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags, mode);
+    return (p->open)(p, NULL, f, d, t, flags, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha
     }
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
 	LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc));
 	/* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */
         if (rc == DB_RUNRECOVERY) {
@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }
diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c
--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call	2007-09-17 15:14:36.000000000 +0200
+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c	2007-09-17 15:15:06.000000000 +0200
@@ -133,9 +133,9 @@ static int my_yield(void)
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
 {
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode);
+    return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha
 #endif /* DB_VERSION_MINOR > 1 */
 
     /* Open the database environment. */
-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
         if (rc == DB_RUNRECOVERY) {
             /* This is the mother of all errors.  We _must_ fail here. */
             LOG(log_error, logtype_default,
@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha
         /* We can't get a full transactional environment, so multi-access
          * is out of the question.  Let's assume a read-only environment,
          * and try to at least get a shared memory pool. */
-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
              * open the environment with no flags. */
-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
                 goto fail_lock;
             }
diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c
--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call	2007-09-17 15:14:49.000000000 +0200
+++ netatalk-2.0.3/bin/cnid/cnid_index.c	2007-09-17 15:15:35.000000000 +0200
@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char *
     int ret;
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); 
 #else
-    ret = db->open(db,       file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db,       file, name, type, DB_CREATE, mode); 
 #endif
 
     if (ret) {
@@ -353,7 +353,7 @@ static int dbif_env_init(void)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
     db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
@@ -379,7 +379,7 @@ static int dbif_env_init(void)
     }
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
         db_env->close(db_env, 0);
diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c
--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call	2007-09-17 15:14:59.000000000 +0200
+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c	2007-09-17 15:16:54.000000000 +0200
@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char *
     int ret;
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); 
 #else
-    ret = db->open(db,       file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db,       file, name, type, DB_CREATE, mode); 
 #endif
 
     if (ret) {
@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
     db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp)
     
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
         db_env->close(db_env, 0);


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- netatalk.spec	12 Sep 2007 11:09:00 -0000	1.37
+++ netatalk.spec	17 Sep 2007 13:29:53 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -16,7 +16,7 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
-Patch5:  netatalk-2.0.3-build_open.patch
+Patch5:  netatalk-2.0.3-open_call.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -49,7 +49,7 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
-%patch5  -p1 -b .build_open
+%patch5  -p1 -b .open_call
 
 ln -s ./NEWS ChangeLog
 
@@ -188,7 +188,7 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
-* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-14
+* Wed Sep 12 2007 Maros Barabas <mbarabas at redhat.com> -4:2.0.3-15
 - patch to build on FC, bad open call 
 
 * Tue Sep 11 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-13


--- netatalk-2.0.3-build_open.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 13:38:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 09:38:27 -0400
Subject: rpms/pcre/devel pcre.spec, 1.23, 1.24 pcre-6.6-multilib.patch, 1.1, 
	NONE pcre-6.6-stack.patch, 1.1, NONE
Message-ID: <200709171338.l8HDcREO019699@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19640

Modified Files:
	pcre.spec 
Removed Files:
	pcre-6.6-multilib.patch pcre-6.6-stack.patch 
Log Message:
bz292501, update to 7.3



Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pcre.spec	17 Sep 2007 13:12:53 -0000	1.23
+++ pcre.spec	17 Sep 2007 13:37:55 -0000	1.24
@@ -4,7 +4,6 @@
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
-Patch1: pcre-6.6-multilib.patch
 License: BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root


--- pcre-6.6-multilib.patch DELETED ---


--- pcre-6.6-stack.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 13:43:04 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 17 Sep 2007 09:43:04 -0400
Subject: rpms/libglademm24/devel libglademm.spec,1.12,1.13
Message-ID: <200709171343.l8HDh4QV020105@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libglademm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20047

Modified Files:
	libglademm.spec 
Log Message:
Update to 2.6.4, license tag update, long needed rebuild


Index: libglademm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglademm24/devel/libglademm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libglademm.spec	28 Aug 2007 22:27:39 -0000	1.12
+++ libglademm.spec	17 Sep 2007 13:42:31 -0000	1.13
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.6.4-1
+- Update to 2.6.4
+- License tag update
+
 * Tue Oct 10 2006 Denis Leroy <denis at poolshark.org> - 2.6.3-2
 - Added dist tag
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:48:45 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 09:48:45 -0400
Subject: rpms/curl/devel curl.spec,1.59,1.60
Message-ID: <200709171348.l8HDmjre020726@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20656

Modified Files:
	curl.spec 
Log Message:
add zlib-devel BR to enable gzip compressed transfers in curl (#292211)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- curl.spec	10 Sep 2007 07:12:49 -0000	1.59
+++ curl.spec	17 Sep 2007 13:48:13 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -15,7 +15,7 @@
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel
+BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
 BuildRequires: nss-devel >= 3.11.7-7
 
 %description
@@ -103,6 +103,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-7
+- add zlib-devel BR to enable gzip compressed transfers in curl (#292211)
+
 * Mon Sep 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-6
 - provide webclient (#225671)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:51:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 09:51:08 -0400
Subject: rpms/libX11/devel libX11-1.1.2-GetMotionEvents.patch, NONE,
	1.1 libX11.spec, 1.37, 1.38
Message-ID: <200709171351.l8HDp8NI021052@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20941

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
  to match the argument order in the headers. (#274671)


libX11-1.1.2-GetMotionEvents.patch:

--- NEW FILE libX11-1.1.2-GetMotionEvents.patch ---
diff -up libX11-1.1.2/src/GetMoEv.c.jx libX11-1.1.2/src/GetMoEv.c
--- libX11-1.1.2/src/GetMoEv.c.jx	2007-06-02 13:46:55.000000000 -0400
+++ libX11-1.1.2/src/GetMoEv.c	2007-09-17 09:30:24.000000000 -0400
@@ -33,9 +33,9 @@ in this Software without prior written a
 
 XTimeCoord *XGetMotionEvents(
     register Display *dpy,
+    Window w,
     Time start, 
     Time stop,
-    Window w,
     int *nEvents)  /* RETURN */
 {       
     xGetMotionEventsReply rep;


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libX11.spec	21 Aug 2007 20:07:04 -0000	1.37
+++ libX11.spec	17 Sep 2007 13:50:36 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,6 +15,7 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
+Patch4: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -56,6 +57,7 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
+%patch4 -p1 -b .getmoev
 
 %build
 %configure \
@@ -245,6 +247,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
+- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
+  to match the argument order in the headers. (#274671)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.2-2
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 13:54:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 09:54:10 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.219,1.220
Message-ID: <200709171354.l8HDsAjX022529@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21925

Modified Files:
	gnome-panel.spec 
Log Message:
add requires for applets in the default config again



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- gnome-panel.spec	17 Sep 2007 12:58:08 -0000	1.219
+++ gnome-panel.spec	17 Sep 2007 13:53:37 -0000	1.220
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,6 +39,8 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
+Requires: fast-user-switch-applet
+Requires: tomboy
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -310,6 +312,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-6
+- Turns out we need requires for applets in the default config (#293261)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-5
 - Drop the requires for fast-user-switch-applet (#253831)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 14:05:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 10:05:27 -0400
Subject: rpms/pcre/devel pcre-7.3-multilib.patch, NONE, 1.1 pcre.spec, 1.24,
	1.25
Message-ID: <200709171405.l8HE5RdW030432@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30305

Modified Files:
	pcre.spec 
Added Files:
	pcre-7.3-multilib.patch 
Log Message:
update to 7.3


pcre-7.3-multilib.patch:

--- NEW FILE pcre-7.3-multilib.patch ---
--- pcre-7.3/pcre-config.in.orig	2007-09-17 15:58:11.000000000 +0200
+++ pcre-7.3/pcre-config.in	2007-09-17 16:02:50.000000000 +0200
@@ -12,16 +12,6 @@
       exit 1
 fi
 
-libR=
-case `uname -s` in
-  *SunOS*)
-  libR=" -R at libdir@"
-  ;;
-  *BSD*)
-  libR=" -Wl,-R at libdir@"
-  ;;
-esac
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -55,10 +45,10 @@
       echo $includes
       ;;
     --libs-posix)
-      echo -L at libdir@$libR -lpcreposix -lpcre
+      echo -lpcreposix -lpcre
       ;;
     --libs)
-      echo -L at libdir@$libR -lpcre
+      echo -lpcre
       ;;
     *)
       echo "${usage}" 1>&2


Index: pcre.spec
===================================================================
RCS file: /cvs/extras/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pcre.spec	17 Sep 2007 13:37:55 -0000	1.24
+++ pcre.spec	17 Sep 2007 14:04:55 -0000	1.25
@@ -4,6 +4,7 @@
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
+Patch: pcre-7.3-multilib.patch
 License: BSD
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,7 +29,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .multilib
+%patch -p1 -b .multilib
 
 %build
 %configure --enable-utf8 --enable-unicode-properties
@@ -68,7 +69,8 @@
 %{_mandir}/man1/*
 %{_bindir}/pcregrep
 %{_bindir}/pcretest
-%doc LICENCE AUTHORS
+%doc %{_docdir}/pcre/LICENCE
+%doc %{_docdir}/pcre/AUTHORS
 
 %files devel
 %defattr(-,root,root)
@@ -78,6 +80,10 @@
 %{_includedir}/*.h
 %{_mandir}/man3/*
 %{_bindir}/pcre-config
+%doc %{_docdir}/pcre
+%exclude %{_docdir}/pcre/LICENCE
+%exclude %{_docdir}/pcre/AUTHORS
+
 
 %changelog
 * Mon Sep 17 2007 Than Ngo <than at redhat.com> - 7.3-1



From fedora-extras-commits at redhat.com  Mon Sep 17 14:17:22 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 17 Sep 2007 10:17:22 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.686, 1.687 kernel.spec, 1.167,
	1.168 linux-2.6-smarter-relatime.patch, 1.1, 1.2 sources, 1.648,
	1.649 upstream, 1.570, 1.571 patch-2.6.23-rc6-git4.bz2.sign, 1.1, NONE
Message-ID: <200709171417.l8HEHMWx031482@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31398

Modified Files:
	.cvsignore kernel.spec linux-2.6-smarter-relatime.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc6-git7.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git4.bz2.sign 
Log Message:
* Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git7



--- NEW FILE patch-2.6.23-rc6-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG7iaqyGugalF9Dw4RAnTUAJ4tkdDJ1MNQmBRLqubr6Vmcwk1pWgCfW2Tj
SDF2GZ5gdMf4aQMJT/g+vzo=
=SS8p
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -r1.686 -r1.687
--- .cvsignore	13 Sep 2007 20:59:51 -0000	1.686
+++ .cvsignore	17 Sep 2007 14:16:49 -0000	1.687
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git4.bz2
+patch-2.6.23-rc6-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kernel.spec	14 Sep 2007 20:55:47 -0000	1.167
+++ kernel.spec	17 Sep 2007 14:16:49 -0000	1.168
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 4
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git7
+
 * Fri Sep 14 2007 Chuck Ebbert <cebbert at redhat.com>
 - leave boot option as "libata.pata_dma" for now
 

linux-2.6-smarter-relatime.patch:

Index: linux-2.6-smarter-relatime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-smarter-relatime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-smarter-relatime.patch	12 Aug 2007 04:19:44 -0000	1.1
+++ linux-2.6-smarter-relatime.patch	17 Sep 2007 14:16:49 -0000	1.2
@@ -52,7 +52,7 @@
  			Set system-wide default UTF-8 mode for all tty's.
 @@ -1468,6 +1472,10 @@ and is between 256 and 4096 characters. 
  			Format: <reboot_mode>[,<reboot_mode2>[,...]]
- 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c			
+ 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c
  
 +	relatime_interval=
 +			[FS] relative atime update frequency, in seconds.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- sources	13 Sep 2007 20:59:51 -0000	1.648
+++ sources	17 Sep 2007 14:16:49 -0000	1.649
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-cb3be21465bfff5bc14e38f5189b503a  patch-2.6.23-rc6-git4.bz2
+4f3845c3e912bc93c09b0dec08719232  patch-2.6.23-rc6-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- upstream	13 Sep 2007 20:59:51 -0000	1.570
+++ upstream	17 Sep 2007 14:16:49 -0000	1.571
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git4.bz2
+patch-2.6.23-rc6-git7.bz2


--- patch-2.6.23-rc6-git4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:18 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:18 -0700
Subject: [pkgdb] radeontool: ajax has requested watchcommits
Message-ID: <200709171432.l8HEWJ8w021158@app4.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on radeontool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:18 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:18 -0700
Subject: [pkgdb] radeontool: ajax has requested commit
Message-ID: <200709171432.l8HEWJ8D018652@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on radeontool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:34 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:34 -0700
Subject: [pkgdb] vbetool: ajax has requested watchcommits
Message-ID: <200709171432.l8HEWZ1M018734@app3.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the watchcommits acl on vbetool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:32:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajackson))
Date: Mon, 17 Sep 2007 07:32:36 -0700
Subject: [pkgdb] vbetool: ajax has requested commit
Message-ID: <200709171432.l8HEWau6021246@app4.fedora.phx.redhat.com>

Adam Jackson (ajax) has requested the commit acl on vbetool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:51:55 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 10:51:55 -0400
Subject: rpms/eclipse-egit/F-7 eclipse-egit-add-feature.patch, NONE,
	1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709171451.l8HEptbu001105@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
- Pull in build from rawhide.


eclipse-egit-add-feature.patch:

--- NEW FILE eclipse-egit-add-feature.patch ---
diff --git a/org.spearce.egit-feature/.project b/org.spearce.egit-feature/.project
new file mode 100644
index 0000000..dac8f65
--- /dev/null
+++ egit/org.spearce.egit-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.spearce.egit-feature/build.properties b/org.spearce.egit-feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ egit/org.spearce.egit-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.spearce.egit-feature/feature.xml b/org.spearce.egit-feature/feature.xml
new file mode 100644
index 0000000..01c53cd
--- /dev/null
+++ egit/org.spearce.egit-feature/feature.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.spearce.egit"
+      label="Eclipse Git Feature"
+      version="0.2.2"
+      provider-name="spearce.org"
+      plugin="org.spearce.egit">
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.team.ui"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.junit"/>
+   </requires>
+
+   <plugin
+         id="org.spearce.egit.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.egit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.spearce.jgit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.spearce.egit/.classpath b/org.spearce.egit/.classpath
new file mode 100644
index 0000000..acad1c2
--- /dev/null
+++ egit/org.spearce.egit/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.spearce.egit/.project b/org.spearce.egit/.project
new file mode 100644
index 0000000..bbdc4e3
--- /dev/null
+++ egit/org.spearce.egit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.spearce.egit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.spearce.egit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..40da4e0
--- /dev/null
+++ egit/org.spearce.egit/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Java Git / Eclipse Git
+Bundle-SymbolicName: org.spearce.egit
+Bundle-Version: 0.2.2
+Bundle-Vendor: spearce.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.spearce.egit/about.ini b/org.spearce.egit/about.ini
new file mode 100644
index 0000000..dcab31a
--- /dev/null
+++ egit/org.spearce.egit/about.ini
@@ -0,0 +1,28 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=Java Git / Eclipse Git (by Shawn Pearce) is a Java Git library and plugin for the Eclipse IDE.
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=egit.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html
\ No newline at end of file
diff --git a/org.spearce.egit/build.properties b/org.spearce.egit/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ egit/org.spearce.egit/build.properties
@@ -0,0 +1,3 @@
+bin.includes = META-INF/,\
+               egit.png,\
+               about.ini


--- NEW FILE eclipse-egit.spec ---

%define gcj_support     1

Summary:          Eclipse Git plug-in
Name:             eclipse-egit
Version:          0.2.2
Release:          1.git20070911%{?dist}
License:          EPL GPLv2 LGPLv2
URL:              http://repo.or.cz/w/egit.git
Group:            Development/Tools

# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
Source1:          egit.png
Patch0:           %{name}-add-feature.patch

Requires:         eclipse-platform >= 1:3.2.1
%if %{gcj_support}
BuildRequires:    gcc-java >= 4.1.2
BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
Requires(post):   java-1.5.0-gcj >= 1.5.0
Requires(postun): java-1.5.0-gcj >= 1.5.0
%else
BuildRequires:    java-devel >= 1.6.0
%endif

BuildRequires:    eclipse-pde
BuildRequires:    jpackage-utils >= 0:1.5

%if %{gcj_support}
%else
BuildArch:        noarch
%endif
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The eclipse-egit package contains Eclipse plugins for
interacting with Git repositories.

%prep
%setup -q -c 
%patch0 -p0
cp %{SOURCE1} egit/org.spearce.egit

%build
# Copy the SDK for build
/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
mkdir home
homedir=$(cd home > /dev/null && pwd)

# build the main egit feature
java -cp $SDK/startup.jar                              \
     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
     org.eclipse.core.launcher.Main                    \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=feature                                    \
     -Did=org.spearce.egit                             \
     -DbaseLocation=$SDK                               \
     -DjavacSource=1.5  -DjavacTarget=1.5              \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf $RPM_BUILD_ROOT
install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse

# egit main feature
unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
            build/rpmBuild/org.spearce.egit.zip

%if %{gcj_support}
aot-compile-rpm
%endif

%clean 
rm -rf $RPM_BUILD_ROOT

%if %{gcj_support}
%post -p /usr/bin/rebuild-gcj-db
%postun -p /usr/bin/rebuild-gcj-db
%endif

%files
%defattr(-,root,root,-)
%{_datadir}/eclipse/features/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit*
%{_datadir}/eclipse/plugins/org.spearce.egit.core*
%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
%{_datadir}/eclipse/plugins/org.spearce.jgit*
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif

%changelog
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
- Pull in build from rawhide.
- Require eclipse-platform >= 3.2.1. 

* Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
- Update to git20070911.
- Update feature and accosicated branding plugin.

* Wed Aug 29 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070826.fc8
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Sep 2007 21:27:08 -0000	1.1
+++ .cvsignore	17 Sep 2007 14:51:23 -0000	1.2
@@ -0,0 +1,2 @@
+egit.png
+egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Sep 2007 21:27:08 -0000	1.1
+++ sources	17 Sep 2007 14:51:23 -0000	1.2
@@ -0,0 +1,2 @@
+5d1082d9db40f01c5de094ac8769514b  egit.png
+d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 14:51:59 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:51:59 -0700
Subject: [pkgdb] vbetool had acl change status
Message-ID: <200709171451.l8HEpxwb024088@app3.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on vbetool (Fedora devel) to Approved for Adam Jackson (ajax)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:04 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:04 -0700
Subject: [pkgdb] vbetool had acl change status
Message-ID: <200709171452.l8HEq4Vi026528@app4.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on vbetool (Fedora devel) to Approved for Adam Jackson (ajax)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:12 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 10:52:12 -0400
Subject: devel/yum yum-3.2.5-close.patch,NONE,1.1 yum.spec,1.178,1.179
Message-ID: <200709171452.l8HEqCAm001119@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1037

Modified Files:
	yum.spec 
Added Files:
	yum-3.2.5-close.patch 
Log Message:
* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
- fix traceback with closing repos 


yum-3.2.5-close.patch:

--- NEW FILE yum-3.2.5-close.patch ---
commit 217b37b73a1767ea696e2589b4c99afda07f2df3
Author: Jeremy Katz <katzj at redhat.com>
Date:   Mon Sep 17 10:50:11 2007 -0400

    don't delete objects multiple times

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 88b63f7..c6877bd 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -222,16 +222,16 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                        self.filelistsdb.values() + \
                        self.otherdb.values():
             dataobj.close()
-            self.primarydb = {}
-            self.filelistsdb = {}
-            self.otherdb = {}
-            self.excludes = {}
-            self._search_cache = {
-                'provides' : { },
-                'requires' : { },
-                }
-            del self.pkgobjlist
-            del self.pkglist
+        self.primarydb = {}
+        self.filelistsdb = {}
+        self.otherdb = {}
+        self.excludes = {}
+        self._search_cache = {
+            'provides' : { },
+            'requires' : { },
+            }
+        del self.pkgobjlist
+        del self.pkglist
 
         yumRepo.YumPackageSack.close(self)
 


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- yum.spec	12 Sep 2007 14:55:06 -0000	1.178
+++ yum.spec	17 Sep 2007 14:51:39 -0000	1.179
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
 Patch2: yum-trans-display-object.patch
+Patch3: yum-3.2.5-close.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -50,6 +51,7 @@
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .showdep
 %patch2 -p1 -b .transdisp
+%patch3 -p1 -b .close
 
 %build
 make
@@ -95,6 +97,9 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
+- fix traceback with closing repos 
+
 * Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-2
 - add upstream patch to improve RPMTransaction display
 



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:17 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:17 -0700
Subject: [pkgdb] radeontool had acl change status
Message-ID: <200709171452.l8HEqHbU026600@app4.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on radeontool (Fedora devel) to Approved for Adam Jackson (ajax)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:52:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (opensource))
Date: Mon, 17 Sep 2007 07:52:18 -0700
Subject: [pkgdb] radeontool had acl change status
Message-ID: <200709171452.l8HEqIXT024196@app3.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on radeontool (Fedora devel) to Approved for Adam Jackson (ajax)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radeontool



From fedora-extras-commits at redhat.com  Mon Sep 17 14:54:13 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 10:54:13 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, 1.2,
	1.3 eclipse-egit.spec, 1.3, 1.4
Message-ID: <200709171454.l8HEsDsg001299@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1275

Modified Files:
	eclipse-egit-add-feature.patch eclipse-egit.spec 
Log Message:
* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
- Update add feature and plugin patch.


eclipse-egit-add-feature.patch:

Index: eclipse-egit-add-feature.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit-add-feature.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-egit-add-feature.patch	15 Sep 2007 18:16:03 -0000	1.2
+++ eclipse-egit-add-feature.patch	17 Sep 2007 14:54:11 -0000	1.3
@@ -33,7 +33,7 @@
 index 0000000..01c53cd
 --- /dev/null
 +++ egit/org.spearce.egit-feature/feature.xml
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,51 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<feature
 +      id="org.spearce.egit"
@@ -71,6 +71,13 @@
 +         unpack="false"/>
 +
 +   <plugin
++         id="org.spearce.egit"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
 +         id="org.spearce.jgit"
 +         download-size="0"
 +         install-size="0"
@@ -177,8 +184,7 @@
 index 0000000..34d2e4d
 --- /dev/null
 +++ egit/org.spearce.egit/build.properties
-@@ -0,0 +1,4 @@
-+source.. = src/
-+output.. = bin/
+@@ -0,0 +1,3 @@
 +bin.includes = META-INF/,\
-+               .
++               egit.png,\
++               about.ini


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-egit.spec	17 Sep 2007 13:29:15 -0000	1.3
+++ eclipse-egit.spec	17 Sep 2007 14:54:11 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.2.2
-Release:          1.git20070911%{?dist}
+Release:          2.git20070911%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
@@ -97,6 +97,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
+- Update add feature and plugin patch.
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc8
 - Require eclipse-platform >= 3.2.1 
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:03:18 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 11:03:18 -0400
Subject: fedora-security/audit fc6,1.258,1.259 fc7,1.106,1.107
Message-ID: <200709171503.l8HF3IkC007590@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7566/audit

Modified Files:
	fc6 fc7 
Log Message:
Add quagga bgpd DoS



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- fc6	17 Sep 2007 10:09:34 -0000	1.258
+++ fc6	17 Sep 2007 15:03:16 -0000	1.259
@@ -9,6 +9,7 @@
 
 GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
+CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc7	17 Sep 2007 12:02:09 -0000	1.106
+++ fc7	17 Sep 2007 15:03:16 -0000	1.107
@@ -17,6 +17,7 @@
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051



From fedora-extras-commits at redhat.com  Mon Sep 17 15:04:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Mon, 17 Sep 2007 11:04:22 -0400
Subject: rpms/cvs/devel cvs-1.11.22-diff-rm.patch, 1.1, 1.2 cvs.spec, 1.57,
	1.58
Message-ID: <200709171504.l8HF4MUW007639@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7546

Modified Files:
	cvs-1.11.22-diff-rm.patch cvs.spec 
Log Message:
Fixed problem with cvs diff when diffing removed files.


cvs-1.11.22-diff-rm.patch:

Index: cvs-1.11.22-diff-rm.patch
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs-1.11.22-diff-rm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvs-1.11.22-diff-rm.patch	22 Aug 2007 13:33:21 -0000	1.1
+++ cvs-1.11.22-diff-rm.patch	17 Sep 2007 15:04:20 -0000	1.2
@@ -1,12 +1,18 @@
-diff -urp cvs-1.11.22/src/diff.c cvs-1.11.22mzk/src/diff.c
---- cvs-1.11.22/src/diff.c	2007-07-30 10:35:13.000000000 +0200
-+++ cvs-1.11.22mzk/src/diff.c	2007-07-30 10:27:34.000000000 +0200
-@@ -503,7 +503,7 @@ diff_fileproc (callerdat, finfo)
+--- cvs-1.11.22/src/diff.c	2007-09-17 16:55:18.000000000 +0200
++++ cvs-1.11.22/src/diff.c.usercheck	2007-09-17 16:55:28.000000000 +0200
+@@ -502,13 +502,8 @@ diff_fileproc (callerdat, finfo)
+ 
      user_file_rev = 0;
      vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
- 
+-
 -    if (diff_rev2 != NULL || diff_date2 != NULL)
-+    if ((diff_rev2 != NULL || diff_date2 != NULL) && strcmp(diff_rev1,TAG_BASE)!=0 && strcmp(diff_rev2,TAG_BASE)!=0)
+-    {
+-	/* Skip all the following checks regarding the user file; we're
+-	   not using it.  */
+-    }
+-    else if (vers->vn_user == NULL)
++    
++    if (vers->vn_user == NULL)
      {
- 	/* Skip all the following checks regarding the user file; we're
- 	   not using it.  */
+ 	/* The file does not exist in the working directory.  */
+ 	if ((diff_rev1 != NULL || diff_date1 != NULL)


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cvs.spec	22 Aug 2007 13:33:21 -0000	1.57
+++ cvs.spec	17 Sep 2007 15:04:20 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -161,6 +161,10 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Sep 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-12
+- rewriten previous patch when trying to diff  removed files
+- Resolves: #277501, #242049
+
 * Mon Jul 30 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-11
 - fix diff on removed file when "-r BASE" tag is used
 - Resolves: #242049



From fedora-extras-commits at redhat.com  Mon Sep 17 15:09:32 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:09:32 -0400
Subject: rpms/qt/devel qt-3.3.6-bz#292941-CVE-2007-4137.patch, NONE,
	1.1 qt.spec, 1.140, 1.141
Message-ID: <200709171509.l8HF9Wg0007925@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7885

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-bz#292941-CVE-2007-4137.patch 
Log Message:
CVE-2007-4137


qt-3.3.6-bz#292941-CVE-2007-4137.patch:

--- NEW FILE qt-3.3.6-bz#292941-CVE-2007-4137.patch ---
--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -165,7 +165,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	result.setLength( len ); // worst case
+	result.setLength( len + 1 ); // worst case
 	QChar *qch = (QChar *)result.unicode();
 	uchar ch;
         int error = -1;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- qt.spec	29 Aug 2007 17:21:39 -0000	1.140
+++ qt.spec	17 Sep 2007 15:08:59 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 7%{?dist}.1
+Release: 8%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -57,7 +57,6 @@
 Patch104: qt-font-default-subst.diff
 patch105: 0073-xinerama-aware-qpopup.patch
 Patch106: 0076-fix-qprocess.diff
-Patch107: 0077-utf8-decoder-fixes.diff
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
@@ -66,6 +65,7 @@
 # security patces
 Patch300: qt3-CVE-2007-3388.patch
 Patch301: utf8-bug-qt3-CVE-2007-0242.diff
+Patch302: qt-3.3.6-bz#292941-CVE-2007-4137.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -299,7 +299,6 @@
 %patch104 -p0 -b .qt-font-default-subst
 %patch105 -p0 -b .0073-xinerama-aware-qpopup
 %patch106 -p0 -b .0076-fix-qprocess
-%patch107 -p0 -b .0077-utf8-decoder-fixes
 
 %patch200 -p1 -b .fullscreen
 %patch201 -p1 -b .bz#243722-mysql
@@ -307,6 +306,7 @@
 # security patches
 %patch300 -p1 -b .CVE-2007-3388
 %patch301 -p0 -b .CVE-2007-0242
+%patch302 -p0 -b .CVE-2007-4137
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -577,6 +577,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 3.3.8-8
+- CVE-2007-4137
+
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7.fc7.1
 - CVE-2007-0242
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:09:42 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:09:42 -0400
Subject: rpms/freeradius/F-7 freeradius-1.1.7-lsb.patch, 1.1,
	1.2 freeradius.spec, 1.44, 1.45
Message-ID: <200709171509.l8HF9gV4007968@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7935

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- fixed initscript problem (rhbz#292521)



freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeradius-1.1.7-lsb.patch	28 Aug 2007 15:19:00 -0000	1.1
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:09:39 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-08-28 15:21:59.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -40,7 +40,7 @@
  	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
  	;;
    stop)
-+	[ $running -ne 0 ] || exit 0
++	[ $running -eq 0 ] || exit 0
  	echo -n $"Stopping RADIUS server: "
  	killproc $RADIUSD
  	RETVAL=$?
@@ -48,7 +48,7 @@
  	RETVAL=$?
          ;;
    reload)
-+	[ $running -ne 0 ] && exit 7
++	[ $running -eq 0 ] || exit 7
  	echo -n $"Reloading RADIUS server: "
  	killproc $RADIUSD -HUP
  	RETVAL=$?
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ ! -f $LOCKF ] && exit 7
++	[ $running -eq 0 ] || exit 7
 +	$0 stop
 +	sleep 3
 +	$0 start


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- freeradius.spec	28 Aug 2007 15:19:00 -0000	1.44
+++ freeradius.spec	17 Sep 2007 15:09:39 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
+- fixed initscript problem (rhbz#292521)
+
 * Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-2
 - fixed initscript for LSB (rhbz#243671, rhbz#243928)
 - fixed license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 15:10:49 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:10:49 -0400
Subject: rpms/freeradius/devel freeradius-1.1.7-lsb.patch, 1.1,
	1.2 freeradius.spec, 1.46, 1.47
Message-ID: <200709171510.l8HFAnQ6008109@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- fixed initscript problem (rhbz#292521)



freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeradius-1.1.7-lsb.patch	28 Aug 2007 14:18:45 -0000	1.1
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:10:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-08-28 15:21:59.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -40,7 +40,7 @@
  	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
  	;;
    stop)
-+	[ $running -ne 0 ] || exit 0
++	[ $running -eq 0 ] || exit 0
  	echo -n $"Stopping RADIUS server: "
  	killproc $RADIUSD
  	RETVAL=$?
@@ -48,7 +48,7 @@
  	RETVAL=$?
          ;;
    reload)
-+	[ $running -ne 0 ] && exit 7
++	[ $running -eq 0 ] || exit 7
  	echo -n $"Reloading RADIUS server: "
  	killproc $RADIUSD -HUP
  	RETVAL=$?
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ ! -f $LOCKF ] && exit 7
++	[ $running -eq 0 ] || exit 7
 +	$0 stop
 +	sleep 3
 +	$0 start


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- freeradius.spec	28 Aug 2007 14:19:19 -0000	1.46
+++ freeradius.spec	17 Sep 2007 15:10:47 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
+- fixed initscript problem (rhbz#292521)
+
 * Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-2
 - fixed initscript for LSB (rhbz#243671, rhbz#243928)
 - fixed license tag



From fedora-extras-commits at redhat.com  Mon Sep 17 15:13:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:13:04 -0400
Subject: rpms/qt/F-7 qt-3.3.6-bz#292941-CVE-2007-4137.patch, NONE,
	1.1 qt.spec, 1.141, 1.142
Message-ID: <200709171513.l8HFD4Q1008319@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8272

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-bz#292941-CVE-2007-4137.patch 
Log Message:
CVE-2007-4137


qt-3.3.6-bz#292941-CVE-2007-4137.patch:

--- NEW FILE qt-3.3.6-bz#292941-CVE-2007-4137.patch ---
--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -165,7 +165,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	result.setLength( len ); // worst case
+	result.setLength( len + 1 ); // worst case
 	QChar *qch = (QChar *)result.unicode();
 	uchar ch;
         int error = -1;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-7/qt.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- qt.spec	29 Aug 2007 17:39:02 -0000	1.141
+++ qt.spec	17 Sep 2007 15:12:32 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 6%{?dist}.1
+Release: 7%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -65,6 +65,7 @@
 # security patces
 Patch300: qt3-CVE-2007-3388.patch
 Patch301: utf8-bug-qt3-CVE-2007-0242.diff
+Patch302: qt-3.3.6-bz#292941-CVE-2007-4137.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -305,6 +306,7 @@
 # security patches
 %patch300 -p1 -b .CVE-2007-3388
 %patch301 -p0 -b .CVE-2007-0242
+%patch302 -p0 -b .CVE-2007-4137
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -576,6 +578,9 @@
 
 
 %changelog
+* Mo Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
+- CVE-2007-4137
+
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-6.fc7.1
 - cleanup security patch
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:14:26 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 17 Sep 2007 11:14:26 -0400
Subject: rpms/qt/F-7 qt.spec,1.142,1.143
Message-ID: <200709171514.l8HFEQ3v008434@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8408

Modified Files:
	qt.spec 
Log Message:
bz292941, CVE-2007-4137



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-7/qt.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- qt.spec	17 Sep 2007 15:12:32 -0000	1.142
+++ qt.spec	17 Sep 2007 15:13:54 -0000	1.143
@@ -578,8 +578,8 @@
 
 
 %changelog
-* Mo Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
-- CVE-2007-4137
+* Mon Sep 17 2007 Than Ngo <than at redhat.com> - 1:3.3.8-7
+- bz292941, CVE-2007-4137
 
 * Wed Aug 29 2007 Than Ngo <than at redhat.com> - 1:3.3.8-6.fc7.1
 - cleanup security patch



From fedora-extras-commits at redhat.com  Mon Sep 17 15:27:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:27:14 -0400
Subject: rpms/atk/devel .cvsignore, 1.32, 1.33 atk.spec, 1.52, 1.53 sources, 
	1.32, 1.33
Message-ID: <200709171527.l8HFREhB008864@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/atk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8777

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jul 2007 18:19:28 -0000	1.32
+++ .cvsignore	17 Sep 2007 15:26:41 -0000	1.33
@@ -1 +1 @@
-atk-1.19.6.tar.bz2
+atk-1.20.0.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/atk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- atk.spec	15 Aug 2007 23:20:52 -0000	1.52
+++ atk.spec	17 Sep 2007 15:26:41 -0000	1.53
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.19.6
-Release: 3%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.19/atk-%{version}.tar.bz2 
+Source: http://download.gnome.org/sources/atk/1.20/atk-%{version}.tar.bz2 
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +72,9 @@
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 1.19.6-3
 - Small fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 18:19:28 -0000	1.32
+++ sources	17 Sep 2007 15:26:41 -0000	1.33
@@ -1 +1 @@
-198c96bbe5fc2d66832f4e25d3f6a678  atk-1.19.6.tar.bz2
+b1a9e28d9f54ea306bd85a4c84b25fb8  atk-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:28:28 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:28:28 -0400
Subject: rpms/freeradius/F-7 freeradius-1.1.7-lsb.patch, 1.2,
	1.3 freeradius.spec, 1.45, 1.46
Message-ID: <200709171528.l8HFSSa4008971@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8942

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- made init script fully lsb conform


freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeradius-1.1.7-lsb.patch	17 Sep 2007 15:09:39 -0000	1.2
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:28:25 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:20:07.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ $running -eq 0 ] || exit 7
++	[ $running -eq 0 ] || exit 0
 +	$0 stop
 +	sleep 3
 +	$0 start
@@ -78,7 +78,7 @@
    *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 -	exit 1
-+	RETVAL=3
++	RETVAL=2
  esac
  
  exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/F-7/freeradius.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- freeradius.spec	17 Sep 2007 15:09:39 -0000	1.45
+++ freeradius.spec	17 Sep 2007 15:28:25 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3.1
+- made init script fully lsb conform
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
 - fixed initscript problem (rhbz#292521)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:29:09 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:29:09 -0400
Subject: rpms/freeradius/devel freeradius-1.1.7-lsb.patch, 1.2,
	1.3 freeradius.spec, 1.47, 1.48
Message-ID: <200709171529.l8HFT9AS009057@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9034

Modified Files:
	freeradius-1.1.7-lsb.patch freeradius.spec 
Log Message:
- made init script fully lsb conform


freeradius-1.1.7-lsb.patch:

Index: freeradius-1.1.7-lsb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius-1.1.7-lsb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeradius-1.1.7-lsb.patch	17 Sep 2007 15:10:47 -0000	1.2
+++ freeradius-1.1.7-lsb.patch	17 Sep 2007 15:29:06 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
-+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:02:58.000000000 +0200
++++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:20:07.000000000 +0200
 @@ -20,6 +20,14 @@
  #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
  #
@@ -69,7 +69,7 @@
 -		RETVAL=$?
 -	fi
 +  condrestart|try-restart)
-+	[ $running -eq 0 ] || exit 7
++	[ $running -eq 0 ] || exit 0
 +	$0 stop
 +	sleep 3
 +	$0 start
@@ -78,7 +78,7 @@
    *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 -	exit 1
-+	RETVAL=3
++	RETVAL=2
  esac
  
  exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- freeradius.spec	17 Sep 2007 15:10:47 -0000	1.47
+++ freeradius.spec	17 Sep 2007 15:29:06 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 1.1.7
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3.1
+- made init script fully lsb conform
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-3
 - fixed initscript problem (rhbz#292521)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:30:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:30:25 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.40, 1.41 at-spi.spec, 1.75,
	1.76 sources, 1.40, 1.41
Message-ID: <200709171530.l8HFUPXe009142@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9103

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	10 Jul 2007 15:33:55 -0000	1.40
+++ .cvsignore	17 Sep 2007 15:29:52 -0000	1.41
@@ -1 +1 @@
-at-spi-1.19.5.tar.bz2
+at-spi-1.20.0.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- at-spi.spec	6 Aug 2007 04:23:34 -0000	1.75
+++ at-spi.spec	17 Sep 2007 15:29:52 -0000	1.76
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.20/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> - 1.19.5-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	10 Jul 2007 15:33:55 -0000	1.40
+++ sources	17 Sep 2007 15:29:52 -0000	1.41
@@ -1 +1 @@
-d54afafc22c5e40508c85978e824d366  at-spi-1.19.5.tar.bz2
+fd1f916463f379b435399e2b2075742f  at-spi-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:34:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:34:05 -0400
Subject: rpms/gail/devel .cvsignore, 1.32, 1.33 gail.spec, 1.64, 1.65 sources,
	1.32, 1.33
Message-ID: <200709171534.l8HFY5GD009217@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jul 2007 18:22:38 -0000	1.32
+++ .cvsignore	17 Sep 2007 15:33:32 -0000	1.33
@@ -1 +1 @@
-gail-1.19.6.tar.bz2
+gail-1.20.0.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/gail.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gail.spec	29 Aug 2007 04:57:06 -0000	1.64
+++ gail.spec	17 Sep 2007 15:33:32 -0000	1.65
@@ -4,10 +4,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.19.6
-Release: 3%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
-Source0: http://download.gnome.org/sources/gail/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gail/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.19.6-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 18:22:38 -0000	1.32
+++ sources	17 Sep 2007 15:33:32 -0000	1.33
@@ -1 +1 @@
-5ba765ceb192c0903742043c48677483  gail-1.19.6.tar.bz2
+697f83db831816946bb8944b8d34ec17  gail-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:38:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:38:56 -0400
Subject: rpms/libgail-gnome/devel .cvsignore, 1.8, 1.9 libgail-gnome.spec,
	1.26, 1.27 sources, 1.8, 1.9
Message-ID: <200709171538.l8HFcu6S009400@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgail-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9378

Modified Files:
	.cvsignore libgail-gnome.spec sources 
Log Message:
1.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jul 2007 15:39:11 -0000	1.8
+++ .cvsignore	17 Sep 2007 15:38:23 -0000	1.9
@@ -1 +1 @@
-libgail-gnome-1.19.5.tar.bz2
+libgail-gnome-1.20.0.tar.bz2


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libgail-gnome.spec	29 Aug 2007 04:58:39 -0000	1.26
+++ libgail-gnome.spec	17 Sep 2007 15:38:23 -0000	1.27
@@ -6,10 +6,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.20.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
-Source0: http://download.gnome.org/source/libgail-gnome/1.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/source/libgail-gnome/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.19.5-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgail-gnome/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jul 2007 15:39:11 -0000	1.8
+++ sources	17 Sep 2007 15:38:23 -0000	1.9
@@ -1 +1 @@
-30cdcc9b9c43cc9d5e22caffae045e41  libgail-gnome-1.19.5.tar.bz2
+5a7662e3d637c86baa95a50adb225e56  libgail-gnome-1.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:42:30 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 17 Sep 2007 11:42:30 -0400
Subject: fedora-security/audit fc6,1.259,1.260 fc7,1.107,1.108
Message-ID: <200709171542.l8HFgUvp009592@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9548/audit

Modified Files:
	fc6 fc7 
Log Message:
OOo tiff heap overflow is public now



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- fc6	17 Sep 2007 15:03:16 -0000	1.259
+++ fc6	17 Sep 2007 15:42:28 -0000	1.260
@@ -91,6 +91,7 @@
 CVE-2007-2869 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2868 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2867 version (mozilla) #241840 [since FEDORA-2007-549]
+CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293371
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-538]
 CVE-2007-2797 version (xterm)
 CVE-2007-2453 version (kernel) [since FEDORA-2007-600]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc7	17 Sep 2007 15:03:16 -0000	1.107
+++ fc7	17 Sep 2007 15:42:28 -0000	1.108
@@ -187,6 +187,7 @@
 CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
 CVE-2007-2844 ignore (php) #241641
 CVE-2007-2843 ignore (konqueror) safari specific
+CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293361
 CVE-2007-2821 version (wordpress, fixed 2.2) #245211 [since FEDORA-2007-0894]
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-0836]
 CVE-2007-2798 version (krb5, 1.6.1) [since FEDORA-2007-0740]



From fedora-extras-commits at redhat.com  Mon Sep 17 15:42:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:42:32 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.62, 1.63 gnome-utils.spec,
	1.154, 1.155 sources, 1.66, 1.67
Message-ID: <200709171542.l8HFgWYg009597@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9546

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	6 Sep 2007 18:55:24 -0000	1.62
+++ .cvsignore	17 Sep 2007 15:41:59 -0000	1.63
@@ -1 +1 @@
-gnome-utils-2.19.92.tar.bz2
+gnome-utils-2.20.0.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-utils.spec	6 Sep 2007 19:24:00 -0000	1.154
+++ gnome-utils.spec	17 Sep 2007 15:41:59 -0000	1.155
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.19.92
+Version:        2.20.0
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -17,7 +17,7 @@
 Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-utils/2.18/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.20/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: 	logview-close-crash.patch
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Sep  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	6 Sep 2007 18:55:24 -0000	1.66
+++ sources	17 Sep 2007 15:41:59 -0000	1.67
@@ -1 +1 @@
-87d0ebb61b53f5a5011cb4b380e1cf86  gnome-utils-2.19.92.tar.bz2
+f58f05a1eac5b04d2ebd66fcc2606251  gnome-utils-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:44:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:44:54 -0400
Subject: rpms/gtksourceview2/devel .cvsignore, 1.6, 1.7 gtksourceview2.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200709171544.l8HFisfw009710@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtksourceview2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9675

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 16:47:32 -0000	1.6
+++ .cvsignore	17 Sep 2007 15:44:22 -0000	1.7
@@ -1 +1 @@
-gtksourceview-1.90.5.tar.bz2
+gtksourceview-2.0.0.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtksourceview2.spec	11 Sep 2007 16:47:32 -0000	1.8
+++ gtksourceview2.spec	17 Sep 2007 15:44:22 -0000	1.9
@@ -5,13 +5,13 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 1.90.5
+Version: 2.0.0
 Release: 1%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
-Source0: http://download.gnome.org/sources/gtksourceview/1.90/gtksourceview-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtksourceview/2.0/gtksourceview-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
@@ -81,6 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
 - Update to 1.90.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 16:47:32 -0000	1.6
+++ sources	17 Sep 2007 15:44:22 -0000	1.7
@@ -1 +1 @@
-4d439022469b25f8c944751bcf787db3  gtksourceview-1.90.5.tar.bz2
+f1d0cce82401801feb477bf30daab07e  gtksourceview-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:46:37 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:46:37 -0400
Subject: rpms/iptables/devel iptables.init, 1.13, 1.14 iptables.spec, 1.50,
	1.51
Message-ID: <200709171546.l8HFkbVc009846@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9775

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not use lock file for condrestart test



Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iptables.init	23 Aug 2007 14:54:50 -0000	1.13
+++ iptables.init	17 Sep 2007 15:46:05 -0000	1.14
@@ -316,7 +316,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- iptables.spec	23 Aug 2007 15:33:24 -0000	1.50
+++ iptables.spec	17 Sep 2007 15:46:05 -0000	1.51
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
+- do not use lock file for condrestart test
+
 * Thu Aug 23 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2
 - fixed initscript for LSB conformance (rhbz#246953, rhbz#242459)
 - provide iptc interface again, but unsupported (rhbz#216733)



From fedora-extras-commits at redhat.com  Mon Sep 17 15:48:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:48:06 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.35, 1.36 sound-juicer.spec,
	1.80, 1.81 sources, 1.37, 1.38
Message-ID: <200709171548.l8HFm6qW010003@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9920

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Aug 2007 19:00:26 -0000	1.35
+++ .cvsignore	17 Sep 2007 15:47:33 -0000	1.36
@@ -1 +1 @@
-sound-juicer-2.19.3.tar.bz2
+sound-juicer-2.20.0.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sound-juicer.spec	25 Aug 2007 13:42:23 -0000	1.80
+++ sound-juicer.spec	17 Sep 2007 15:47:33 -0000	1.81
@@ -12,11 +12,11 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.19.3
-Release:	3%{?dist}
+Version:	2.20.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.19/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	cdparanoia
@@ -117,6 +117,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Sat Aug 25 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.3-3
 - Remove work-around for gst-inspect crashing
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	13 Aug 2007 19:00:26 -0000	1.37
+++ sources	17 Sep 2007 15:47:33 -0000	1.38
@@ -1 +1 @@
-fc710ae4a4989755a23a75a10612b421  sound-juicer-2.19.3.tar.bz2
+906079dba98770f5185fd43359c9459d  sound-juicer-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:49:37 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:49:37 -0400
Subject: rpms/sendmail/devel sendmail.init, 1.17, 1.18 sendmail.spec, 1.87,
	1.88
Message-ID: <200709171549.l8HFnbUo010098@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10065

Modified Files:
	sendmail.init sendmail.spec 
Log Message:
- made init script fully lsb conform




Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sendmail.init	29 Aug 2007 14:54:57 -0000	1.17
+++ sendmail.init	17 Sep 2007 15:49:05 -0000	1.18
@@ -137,12 +137,12 @@
 	RETVAL=$?
 	;;
     stop)
-	[ $running -ne 0 ] || exit 0
+	[ $running -eq 0 ] || exit 0
 	stop
 	RETVAL=$?
 	;;
     reload)
-	[ $running -ne 0 ] && exit 7
+	[ $running -eq 0 ] || exit 7
 	reload
 	RETVAL=$?
 	;;
@@ -152,7 +152,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -f /var/lock/subsys/sendmail ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	stop
 	start
 	RETVAL=$?
@@ -165,7 +165,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	RETVAL=3
+	RETVAL=2
 esac
 
 exit $RETVAL


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sendmail.spec	29 Aug 2007 14:54:57 -0000	1.87
+++ sendmail.spec	17 Sep 2007 15:49:05 -0000	1.88
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -539,6 +539,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.2
+- made init script fully lsb conform
+
 * Wed Aug 29 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.1
 - fixed condrestart in init script to use exit instead of return
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:50:38 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:50:38 -0400
Subject: rpms/libgnomekbd/devel .cvsignore, 1.9, 1.10 libgnomekbd.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <200709171550.l8HFocLH010184@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Sep 2007 03:21:08 -0000	1.9
+++ .cvsignore	17 Sep 2007 15:50:04 -0000	1.10
@@ -1 +1 @@
-libgnomekbd-2.19.91.tar.bz2
+libgnomekbd-2.20.0.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libgnomekbd.spec	4 Sep 2007 03:21:08 -0000	1.25
+++ libgnomekbd.spec	17 Sep 2007 15:50:04 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           libgnomekbd
-Version:       	2.19.91
+Version:       	2.20.0
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
-Source0:        http://download.gnome.org/sources/libgnomekbd/2.18/libgnomekbd-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgnomekbd/2.20/libgnomekbd-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=365590
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2007 03:21:08 -0000	1.9
+++ sources	17 Sep 2007 15:50:04 -0000	1.10
@@ -1 +1 @@
-9ca7372fba612b99d1e085e648e6c232  libgnomekbd-2.19.91.tar.bz2
+0b495d355e25c3531419cb3996be7e28  libgnomekbd-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 15:52:17 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 17 Sep 2007 11:52:17 -0400
Subject: rpms/sendmail/F-7 sendmail.init,1.16,1.17 sendmail.spec,1.82,1.83
Message-ID: <200709171552.l8HFqHtf010315@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/sendmail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226

Modified Files:
	sendmail.init sendmail.spec 
Log Message:
- made init script fully lsb conform




Index: sendmail.init
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-7/sendmail.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sendmail.init	29 Aug 2007 16:13:04 -0000	1.16
+++ sendmail.init	17 Sep 2007 15:51:45 -0000	1.17
@@ -137,12 +137,12 @@
 	RETVAL=$?
 	;;
     stop)
-	[ $running -ne 0 ] || exit 0
+	[ $running -eq 0 ] || exit 0
 	stop
 	RETVAL=$?
 	;;
     reload)
-	[ $running -ne 0 ] && exit 7
+	[ $running -eq 0 ] || exit 7
 	reload
 	RETVAL=$?
 	;;
@@ -152,7 +152,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -f /var/lock/subsys/sendmail ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	stop
 	start
 	RETVAL=$?
@@ -165,7 +165,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	RETVAL=3
+	RETVAL=2
 esac
 
 exit $RETVAL


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/F-7/sendmail.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sendmail.spec	29 Aug 2007 16:13:04 -0000	1.82
+++ sendmail.spec	17 Sep 2007 15:51:45 -0000	1.83
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 4.1%{?dist}
+Release: 4.2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -537,6 +537,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.2
+- made init script fully lsb conform
+
 * Wed Aug 29 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-4.1
 - fixed condrestart in init script to use exit instead of return
 - dropped glibc-2.6.90+ patch for F-7



From fedora-extras-commits at redhat.com  Mon Sep 17 15:52:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:52:31 -0400
Subject: rpms/vino/devel .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 vino.spec,
	1.56, 1.57
Message-ID: <200709171552.l8HFqVWM010366@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10293

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	4 Sep 2007 14:13:05 -0000	1.25
+++ .cvsignore	17 Sep 2007 15:51:58 -0000	1.26
@@ -1 +1 @@
-vino-2.19.92.tar.bz2
+vino-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Sep 2007 14:13:05 -0000	1.25
+++ sources	17 Sep 2007 15:51:58 -0000	1.26
@@ -1 +1 @@
-6589eb5b2f9e5e3f2dfd516ff48158a8  vino-2.19.92.tar.bz2
+e9560ff2e135a5eec645593fc6c22150  vino-2.20.0.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vino.spec	4 Sep 2007 14:13:05 -0000	1.56
+++ vino.spec	17 Sep 2007 15:51:58 -0000	1.57
@@ -8,10 +8,10 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/vino/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/vino/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 



From fedora-extras-commits at redhat.com  Mon Sep 17 15:55:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 11:55:29 -0400
Subject: rpms/pygtksourceview/devel .cvsignore, 1.6, 1.7 pygtksourceview.spec,
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200709171555.l8HFtTXY010614@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10588

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Sep 2007 16:49:18 -0000	1.6
+++ .cvsignore	17 Sep 2007 15:54:57 -0000	1.7
@@ -1 +1 @@
-pygtksourceview-1.90.5.tar.bz2
+pygtksourceview-2.0.0.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygtksourceview.spec	11 Sep 2007 16:49:18 -0000	1.10
+++ pygtksourceview.spec	17 Sep 2007 15:54:57 -0000	1.11
@@ -5,14 +5,14 @@
 %define gtksourceview_version 1.90.5
 
 Name:           pygtksourceview
-Version:        1.90.5
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
 Group:          Development/Languages
 License:        LGPL 
 URL:            http://download.gnome.org/sources/pygtksourceview/
-Source0:        http://download.gnome.org/sources/pygtksourceview/1.90/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.0/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/pygtksourceview-2.0.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+
 * Tue Sep 11 2007 Matthew Barnes <mbarnes at redhat.com> - 1.90.5-1
 - Update to 1.90.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 16:49:18 -0000	1.6
+++ sources	17 Sep 2007 15:54:57 -0000	1.7
@@ -1 +1 @@
-e26be6d014b5f091af5c4250bb63c2ff  pygtksourceview-1.90.5.tar.bz2
+a4947108e7a669b67ff0ff157a132728  pygtksourceview-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:02:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:02:23 -0400
Subject: rpms/libIDL/devel .cvsignore, 1.10, 1.11 libIDL.spec, 1.28,
	1.29 sources, 1.10, 1.11
Message-ID: <200709171602.l8HG2N0j016728@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libIDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16687

Modified Files:
	.cvsignore libIDL.spec sources 
Log Message:
0.8.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Feb 2007 23:00:09 -0000	1.10
+++ .cvsignore	17 Sep 2007 16:01:50 -0000	1.11
@@ -1 +1 @@
-libIDL-0.8.8.tar.bz2
+libIDL-0.8.9.tar.bz2


Index: libIDL.spec
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libIDL.spec	8 Aug 2007 04:37:27 -0000	1.28
+++ libIDL.spec	17 Sep 2007 16:01:50 -0000	1.29
@@ -1,8 +1,8 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
-Version: 0.8.8
-Release: 2%{?dist}
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
+Version: 0.8.9
+Release: 1%{?dist}
+Source: ftp://download.gnome.org/sources/libIDL/0.8/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -75,6 +75,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.9-1
+- Update to 0.8.9
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.8-2
 - Update the license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libIDL/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2007 23:00:09 -0000	1.10
+++ sources	17 Sep 2007 16:01:50 -0000	1.11
@@ -1 +1 @@
-187c17f42533d76da435e90afb7b48cf  libIDL-0.8.8.tar.bz2
+a4f84903e289bb874ae2fbe92d80e656  libIDL-0.8.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:04:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:04:20 -0400
Subject: rpms/ORBit2/devel .cvsignore, 1.23, 1.24 ORBit2.spec, 1.58,
	1.59 sources, 1.23, 1.24
Message-ID: <200709171604.l8HG4Kwa016838@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ORBit2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16779

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.14.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Feb 2007 17:09:24 -0000	1.23
+++ .cvsignore	17 Sep 2007 16:03:47 -0000	1.24
@@ -1 +1 @@
-ORBit2-2.14.7.tar.bz2
+ORBit2-2.14.9.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ORBit2.spec	29 Aug 2007 05:00:13 -0000	1.58
+++ ORBit2.spec	17 Sep 2007 16:03:47 -0000	1.59
@@ -3,8 +3,8 @@
 
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
-Version: 2.14.7
-Release: 6%{?dist}
+Version: 2.14.9
+Release: 1%{?dist}
 Source: http://download.gnome.org/sources/ORBit/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPLv2 and GPLv2
@@ -137,6 +137,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.9-1
+- Update to 2.14.9
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.14.7-6
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ORBit2/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Feb 2007 17:09:24 -0000	1.23
+++ sources	17 Sep 2007 16:03:47 -0000	1.24
@@ -1 +1 @@
-3440c44aaef14dd96e4ccd7ce22a7e6e  ORBit2-2.14.7.tar.bz2
+c7e7080ef27aca22f26ac21fcb5613a5  ORBit2-2.14.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:10:59 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Mon, 17 Sep 2007 12:10:59 -0400
Subject: rpms/cups/devel cups-lspp.patch, 1.25, 1.26 cups.spec, 1.355,
	1.356 sources, 1.36, 1.37
Message-ID: <200709171610.l8HGAx5x017129@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087

Modified Files:
	cups-lspp.patch cups.spec sources 
Log Message:
* Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
- 1.3.1.


cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cups-lspp.patch	31 Jul 2007 12:28:40 -0000	1.25
+++ cups-lspp.patch	17 Sep 2007 16:10:57 -0000	1.26
@@ -1,5 +1,177 @@
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/config-scripts/cups-lspp.m4	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/filter/common.c.lspp cups-1.3.1/filter/common.c
+--- cups-1.3.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.1/filter/common.c	2007-09-17 16:48:23.000000000 +0100
+@@ -30,6 +30,12 @@
+  * Include necessary headers...
+  */
+ 
++#include "config.h"
++#ifdef WITH_LSPP
++#define _GNU_SOURCE
++#include <string.h>
++#endif /* WITH_LSPP */
++
+ #include "common.h"
+ #include <locale.h>
+ 
+@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label,	/* I
+ {
+   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 */
+ 
+ 
+  /*
+@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label,	/* I
+     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...
+   */
+@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label,	/* I
+   printf("  %.0f moveto ESPpl show\n", top - 14.0);
+   puts("pop");
+   puts("}bind put");
++  }
++#ifdef WITH_LSPP
+ }
++#endif /* WITH_LSPP */
+ 
+ 
+ /*
+diff -up /dev/null cups-1.3.1/config-scripts/cups-lspp.m4
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/config-scripts/cups-lspp.m4	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -37,33 +209,9 @@
 +            ;;
 +    esac
 +fi
---- cups-1.3rc2/cups/cups.h.lspp	2007-07-13 02:13:26.000000000 +0100
-+++ cups-1.3rc2/cups/cups.h	2007-07-31 12:28:32.000000000 +0100
-@@ -15,6 +15,9 @@
-  *   This file is subject to the Apple OS-Developed Software exception.
-  */
- 
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
- #ifndef _CUPS_CUPS_H_
- #  define _CUPS_CUPS_H_
- 
-@@ -66,6 +69,12 @@
- #  define CUPS_DATE_ANY		-1
- 
- 
-+# ifdef WITH_LSPP
-+# define MLS_CONFIG "mls"
-+# define TE_CONFIG "te"
-+# define SELINUX_CONFIG "SELinux"
-+# define UNKNOWN_SL "UNKNOWN SL"
-+# endif /* WITH_LSPP */
- /*
-  * Types and structures...
-  */
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/mls	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/mls
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/mls	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -326,8 +474,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/selinux	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/selinux
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/selinux	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -590,9 +739,10 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- cups-1.3rc2/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/data/Makefile	2007-07-31 12:28:32.000000000 +0100
-@@ -25,7 +25,10 @@
+diff -up cups-1.3.1/data/Makefile.lspp cups-1.3.1/data/Makefile
+--- cups-1.3.1/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.1/data/Makefile	2007-09-17 16:48:23.000000000 +0100
+@@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
  		topsecret \
@@ -604,8 +754,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
---- /dev/null	2007-07-31 09:03:12.827706703 +0100
-+++ cups-1.3rc2/data/te	2007-07-31 12:28:32.000000000 +0100
+diff -up /dev/null cups-1.3.1/data/te
+--- /dev/null	2007-09-17 08:47:57.586358512 +0100
++++ cups-1.3.1/data/te	2007-09-17 16:48:23.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -868,178 +1019,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
---- cups-1.3rc2/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/filter/common.c	2007-07-31 12:28:32.000000000 +0100
-@@ -30,6 +30,12 @@
-  * Include necessary headers...
-  */
- 
-+#include "config.h"
-+#ifdef WITH_LSPP
-+#define _GNU_SOURCE
-+#include <string.h>
-+#endif /* WITH_LSPP */
-+
- #include "common.h"
- #include <locale.h>
- 
-@@ -312,6 +318,18 @@
- {
-   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 */
- 
- 
-  /*
-@@ -334,6 +352,124 @@
-     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...
-   */
-@@ -414,7 +550,10 @@
-   printf("  %.0f moveto ESPpl show\n", top - 14.0);
-   puts("pop");
-   puts("}bind put");
-+  }
-+#ifdef WITH_LSPP
- }
-+#endif /* WITH_LSPP */
- 
- 
- /*
---- cups-1.3rc2/scheduler/client.h.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3rc2/scheduler/client.h	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/client.h.lspp cups-1.3.1/scheduler/client.h
+--- cups-1.3.1/scheduler/client.h.lspp	2007-09-12 22:09:49.000000000 +0100
++++ cups-1.3.1/scheduler/client.h	2007-09-17 16:48:23.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1054,7 +1036,7 @@
  /*
   * HTTP client structure...
   */
-@@ -62,6 +69,10 @@
+@@ -61,6 +68,10 @@ struct cupsd_client_s
  #ifdef HAVE_AUTHORIZATION_H
    AuthorizationRef	authref;	/* Authorization ref */
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1065,7 +1047,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -127,6 +138,9 @@
+@@ -128,6 +139,9 @@ extern void	cupsdStartListening(void);
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1075,8 +1057,9 @@
  
  
  /*
---- cups-1.3rc2/scheduler/conf.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/conf.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/conf.c.lspp cups-1.3.1/scheduler/conf.c
+--- cups-1.3.1/scheduler/conf.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/conf.c	2007-09-17 16:50:08.000000000 +0100
 @@ -26,6 +26,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1095,9 +1078,9 @@
  
  /*
   * Configuration variable structure...
-@@ -158,6 +162,10 @@
+@@ -160,6 +164,10 @@ static cupsd_var_t	variables[] =
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
-   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
+   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 +#ifdef WITH_LSPP
 +  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
@@ -1105,18 +1088,18 @@
 +#endif /* WITH_LSPP */
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
-   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_STRING },
-@@ -348,6 +356,9 @@
- 		*old_requestroot;	/* Old RequestRoot */
+   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
+@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
+   cupsd_policy_t *p;			/* Policy */
 +#ifdef WITH_LSPP
 +  char		*audit_message;		/* Audit message string */
 +#endif /* WITH_LSPP */
  
  
   /*
-@@ -609,6 +620,25 @@
+@@ -616,6 +627,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1142,7 +1125,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -883,11 +913,23 @@
+@@ -890,11 +920,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1167,7 +1150,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3343,6 +3385,18 @@
+@@ -3393,6 +3435,18 @@ read_policy(cups_file_t *fp,		/* I - Con
    return (0);
  }
  
@@ -1186,8 +1169,9 @@
  
  /*
   * End of "$Id$".
---- cups-1.3rc2/scheduler/client.c.lspp	2007-07-26 20:08:40.000000000 +0100
-+++ cups-1.3rc2/scheduler/client.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/client.c.lspp cups-1.3.1/scheduler/client.c
+--- cups-1.3.1/scheduler/client.c.lspp	2007-08-15 19:36:14.000000000 +0100
++++ cups-1.3.1/scheduler/client.c	2007-09-17 16:48:23.000000000 +0100
 @@ -39,12 +39,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1203,7 +1187,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@
+@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1216,7 +1200,7 @@
  
  /*
   * Local functions...
-@@ -335,6 +343,57 @@
+@@ -339,6 +347,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
      }
    }
  
@@ -1274,7 +1258,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -717,6 +776,13 @@
+@@ -721,6 +780,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 */
@@ -1288,7 +1272,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -1989,6 +2055,67 @@
+@@ -1993,6 +2059,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);
@@ -1356,7 +1340,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4157,6 +4284,50 @@
+@@ -4197,6 +4324,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1407,8 +1391,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
---- cups-1.3rc2/scheduler/main.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/main.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/main.c.lspp cups-1.3.1/scheduler/main.c
+--- cups-1.3.1/scheduler/main.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/main.c	2007-09-17 16:48:23.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -1428,7 +1413,7 @@
  
  /*
   * Local functions...
-@@ -150,6 +155,9 @@
+@@ -150,6 +155,9 @@ main(int  argc,				/* I - Number of comm
    int			launchd_idle_exit;
  					/* Idle exit on select timeout? */
  #endif	/* HAVE_LAUNCHD */
@@ -1437,8 +1422,8 @@
 +#endif /* WITH_LSPP */
  
  
-  /*
-@@ -368,6 +376,25 @@
+ #ifdef HAVE_GETEUID
+@@ -385,6 +393,25 @@ main(int  argc,				/* I - Number of comm
  #endif /* DEBUG */
    }
  
@@ -1464,7 +1449,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1019,6 +1046,11 @@
+@@ -1094,6 +1121,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -1476,9 +1461,10 @@
    return (!stop_scheduler);
  }
  
---- cups-1.3rc2/scheduler/conf.h.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/conf.h	2007-07-31 12:28:32.000000000 +0100
-@@ -190,6 +190,12 @@
+diff -up cups-1.3.1/scheduler/conf.h.lspp cups-1.3.1/scheduler/conf.h
+--- cups-1.3.1/scheduler/conf.h.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/conf.h	2007-09-17 16:48:23.000000000 +0100
+@@ -190,6 +190,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1491,7 +1477,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -208,6 +214,9 @@
+@@ -208,6 +214,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1501,8 +1487,9 @@
  
  /*
   * Prototypes...
---- cups-1.3rc2/scheduler/ipp.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/ipp.c	2007-07-31 12:29:34.000000000 +0100
+diff -up cups-1.3.1/scheduler/ipp.c.lspp cups-1.3.1/scheduler/ipp.c
+--- cups-1.3.1/scheduler/ipp.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/ipp.c	2007-09-17 16:48:23.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1511,7 +1498,7 @@
   *   check_quotas()              - Check quotas for a printer and user.
   *   copy_attribute()            - Copy a single attribute.
   *   copy_attrs()                - Copy attributes from one request to another.
-@@ -93,6 +94,9 @@
+@@ -94,6 +95,9 @@
   *   validate_user()             - Validate the user for the request.
   */
  
@@ -1521,7 +1508,7 @@
  /*
   * Include necessary headers...
   */
-@@ -120,6 +124,14 @@
+@@ -117,6 +121,14 @@ extern int mbr_check_membership_by_id(uu
  #  endif /* HAVE_MEMBERSHIPPRIV_H */
  #endif /* __APPLE__ */
  
@@ -1536,7 +1523,7 @@
  
  /*
   * Local functions...
-@@ -144,6 +156,9 @@
+@@ -141,6 +153,9 @@ static void	authenticate_job(cupsd_clien
  static void	cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_subscription(cupsd_client_t *con, int id);
@@ -1546,7 +1533,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);
-@@ -1235,6 +1250,21 @@
+@@ -1237,6 +1252,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1568,7 +1555,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1421,6 +1451,104 @@
+@@ -1423,6 +1453,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1673,7 +1660,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1429,6 +1557,32 @@
+@@ -1431,6 +1559,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
      return (NULL);
    }
  
@@ -1706,7 +1693,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1645,6 +1799,29 @@
+@@ -1647,6 +1801,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]);
      }
@@ -1736,7 +1723,7 @@
  
      job->job_sheets = attr;
  
-@@ -1675,6 +1852,9 @@
+@@ -1677,6 +1854,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1746,7 +1733,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1693,6 +1873,9 @@
+@@ -1695,6 +1875,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);
@@ -1756,7 +1743,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1713,6 +1896,9 @@
+@@ -1715,6 +1898,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);
@@ -1766,7 +1753,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1753,9 +1939,52 @@
+@@ -1755,9 +1941,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1819,7 +1806,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3317,6 +3546,103 @@
+@@ -3333,6 +3562,103 @@ cancel_subscription(
  }
  
  
@@ -1923,7 +1910,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -3845,6 +4171,15 @@
+@@ -3861,6 +4187,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -1939,7 +1926,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
-@@ -3879,6 +4214,81 @@
+@@ -3895,6 +4230,81 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2021,7 +2008,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -3973,6 +4383,24 @@
+@@ -3989,6 +4399,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2046,7 +2033,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5694,6 +6122,22 @@
+@@ -5858,6 +6286,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2069,7 +2056,7 @@
   /*
    * Copy attributes...
    */
-@@ -5893,6 +6337,11 @@
+@@ -6057,6 +6501,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2081,7 +2068,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -9881,6 +10330,11 @@
+@@ -10080,6 +10529,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2093,8 +2080,9 @@
   /*
    * Check the username against the owner...
    */
---- cups-1.3rc2/scheduler/job.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/job.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/job.c.lspp cups-1.3.1/scheduler/job.c
+--- cups-1.3.1/scheduler/job.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/job.c	2007-09-17 16:48:23.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2120,7 +2108,7 @@
  
  /*
   * Local globals...
-@@ -1063,6 +1074,23 @@
+@@ -1077,6 +1088,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
      return;
    }
  
@@ -2144,7 +2132,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1416,6 +1444,13 @@
+@@ -1430,6 +1458,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2158,7 +2146,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1434,6 +1469,76 @@
+@@ -1448,6 +1483,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2235,7 +2223,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2446,6 +2551,21 @@
+@@ -2456,6 +2561,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 */
@@ -2257,7 +2245,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2697,6 +2817,106 @@
+@@ -2707,6 +2827,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2364,7 +2352,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2837,6 +3057,18 @@
+@@ -2851,6 +3071,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2383,7 +2371,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3053,6 +3285,67 @@
+@@ -3067,6 +3299,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      envp[envc ++] = final_content_type;
    }
  
@@ -2451,8 +2439,9 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
---- cups-1.3rc2/scheduler/printers.c.lspp	2007-07-31 12:28:32.000000000 +0100
-+++ cups-1.3rc2/scheduler/printers.c	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/printers.c.lspp cups-1.3.1/scheduler/printers.c
+--- cups-1.3.1/scheduler/printers.c.lspp	2007-09-17 16:48:23.000000000 +0100
++++ cups-1.3.1/scheduler/printers.c	2007-09-17 16:48:23.000000000 +0100
 @@ -50,6 +50,8 @@
   *                                 printing desktop tools.
   */
@@ -2462,7 +2451,7 @@
  /*
   * Include necessary headers...
   */
-@@ -73,6 +75,10 @@
+@@ -73,6 +75,10 @@ static void	write_irix_config(cupsd_prin
  static void	write_irix_state(cupsd_printer_t *p);
  #endif /* __sgi */
  
@@ -2473,7 +2462,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1700,6 +1706,13 @@
+@@ -1709,6 +1715,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
  		{			/* No authentication */
  		  "none"
  		};
@@ -2487,7 +2476,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1843,6 +1856,44 @@
+@@ -1852,6 +1865,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2532,8 +2521,9 @@
    }
  
    p->raw    = 0;
---- cups-1.3rc2/scheduler/job.h.lspp	2007-07-12 23:58:17.000000000 +0100
-+++ cups-1.3rc2/scheduler/job.h	2007-07-31 12:28:32.000000000 +0100
+diff -up cups-1.3.1/scheduler/job.h.lspp cups-1.3.1/scheduler/job.h
+--- cups-1.3.1/scheduler/job.h.lspp	2007-08-01 20:02:47.000000000 +0100
++++ cups-1.3.1/scheduler/job.h	2007-09-17 16:48:23.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2548,8 +2538,8 @@
  /*
   * Job request structure...
   */
-@@ -59,6 +66,10 @@
- #ifdef HAVE_GSSAPI
+@@ -60,6 +67,10 @@ typedef struct cupsd_job_s
+   krb5_ccache		ccache;		/* Kerberos credential cache */
    char			*ccname;	/* KRB5CCNAME environment variable */
  #endif /* HAVE_GSSAPI */
 +#ifdef WITH_LSPP
@@ -2559,9 +2549,36 @@
  } cupsd_job_t;
  
  
---- cups-1.3rc2/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
-+++ cups-1.3rc2/Makedefs.in	2007-07-31 12:28:32.000000000 +0100
-@@ -134,7 +134,7 @@
+diff -up cups-1.3.1/cups/cups.h.lspp cups-1.3.1/cups/cups.h
+--- cups-1.3.1/cups/cups.h.lspp	2007-08-27 22:13:35.000000000 +0100
++++ cups-1.3.1/cups/cups.h	2007-09-17 16:48:23.000000000 +0100
+@@ -15,6 +15,9 @@
+  *   This file is subject to the Apple OS-Developed Software exception.
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
+ #ifndef _CUPS_CUPS_H_
+ #  define _CUPS_CUPS_H_
+ 
+@@ -66,6 +69,12 @@ extern "C" {
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
++# ifdef WITH_LSPP
++# define MLS_CONFIG "mls"
++# define TE_CONFIG "te"
++# define SELINUX_CONFIG "SELinux"
++# define UNKNOWN_SL "UNKNOWN SL"
++# endif /* WITH_LSPP */
+ /*
+  * Types and structures...
+  */
+diff -up cups-1.3.1/Makedefs.in.lspp cups-1.3.1/Makedefs.in
+--- cups-1.3.1/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
++++ cups-1.3.1/Makedefs.in	2007-09-17 16:48:23.000000000 +0100
+@@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
@@ -2570,9 +2587,10 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
---- cups-1.3rc2/config.h.in.lspp	2007-07-25 01:40:03.000000000 +0100
-+++ cups-1.3rc2/config.h.in	2007-07-31 12:28:32.000000000 +0100
-@@ -537,6 +537,13 @@
+diff -up cups-1.3.1/config.h.in.lspp cups-1.3.1/config.h.in
+--- cups-1.3.1/config.h.in.lspp	2007-09-08 01:28:06.000000000 +0100
++++ cups-1.3.1/config.h.in	2007-09-17 16:48:23.000000000 +0100
+@@ -552,6 +552,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -2586,9 +2604,10 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
---- cups-1.3rc2/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3rc2/configure.in	2007-07-31 12:28:32.000000000 +0100
-@@ -42,6 +42,8 @@
+diff -up cups-1.3.1/configure.in.lspp cups-1.3.1/configure.in
+--- cups-1.3.1/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.1/configure.in	2007-09-17 16:48:23.000000000 +0100
+@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- cups.spec	29 Aug 2007 15:30:15 -0000	1.355
+++ cups.spec	17 Sep 2007 16:10:57 -0000	1.356
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.0
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -172,7 +172,8 @@
 %if %lspp
 	--enable-lspp \
 %endif
-	--with-log-file-perm=0600 --enable-pie --enable-relro
+	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -362,7 +363,7 @@
 /etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %dir %{_docdir}/cups-%{version}
-%{_docdir}/cups-%{version}/favicon.ico
+%{_docdir}/cups-%{version}/favicon.*
 %{_docdir}/cups-%{version}/images
 %{_docdir}/cups-%{version}/de
 %{_docdir}/cups-%{version}/es
@@ -438,6 +439,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
+- 1.3.1.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.0-2
 - More specific license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Aug 2007 22:31:26 -0000	1.36
+++ sources	17 Sep 2007 16:10:57 -0000	1.37
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-ae2855d5d1ab5b5fcbb8a2613cefec14  cups-1.3.0-source.tar.bz2
+89ec473d48598cde9b2030743b15448b  cups-1.3.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:11:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:11:27 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.220,1.221
Message-ID: <200709171611.l8HGBRmW017186@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085

Modified Files:
	gnome-panel.spec 
Log Message:
fix requires



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- gnome-panel.spec	17 Sep 2007 13:53:37 -0000	1.220
+++ gnome-panel.spec	17 Sep 2007 16:10:55 -0000	1.221
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.19.92
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -40,7 +40,11 @@
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
 Requires: fast-user-switch-applet
+
+# Mono isn't available for s390 or ppc64 apparently
+%ifnarch s390 s390x ppc64
 Requires: tomboy
+%endif
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -312,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-7
+- Can't require tomboy where there's no mono
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-6
 - Turns out we need requires for applets in the default config (#293261)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:15:31 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 17 Sep 2007 12:15:31 -0400
Subject: rpms/widelands/F-7 widelands.spec,1.3,1.4
Message-ID: <200709171615.l8HGFVJk017327@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17280/widelands/F-7

Modified Files:
	widelands.spec 
Log Message:
Fix update problems


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-7/widelands.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.spec	10 Sep 2007 14:56:58 -0000	1.3
+++ widelands.spec	17 Sep 2007 16:14:59 -0000	1.4
@@ -1,7 +1,7 @@
 %define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.6.build11%{?dist}
+Release:        0.7.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -66,6 +66,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# preparing system before update
+cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
+Checkmate
+Dry Riverbed
+Elven Forests
+Enemy in sight
+Finlakes
+Firegames
+Four Castles
+Glacier Lake
+Golden Peninsula
+Lake of tranquility
+Plateau
+Riverlands
+The Oasis Triangle
+The big lake
+The long way
+Two frontiers
+War of the Valleys
+EOF
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -89,6 +111,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 17 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.7.build11
+- Fix update problems
 * Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
 - Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10



From fedora-extras-commits at redhat.com  Mon Sep 17 16:15:34 2007
From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik))
Date: Mon, 17 Sep 2007 12:15:34 -0400
Subject: rpms/widelands/devel widelands.spec,1.4,1.5
Message-ID: <200709171615.l8HGFY4F017330@cvs-int.fedora.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17280/widelands/devel

Modified Files:
	widelands.spec 
Log Message:
Fix update problems


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- widelands.spec	10 Sep 2007 14:57:01 -0000	1.4
+++ widelands.spec	17 Sep 2007 16:15:01 -0000	1.5
@@ -1,7 +1,7 @@
 %define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.6.build11%{?dist}
+Release:        0.7.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -66,6 +66,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# preparing system before update
+cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
+Checkmate
+Dry Riverbed
+Elven Forests
+Enemy in sight
+Finlakes
+Firegames
+Four Castles
+Glacier Lake
+Golden Peninsula
+Lake of tranquility
+Plateau
+Riverlands
+The Oasis Triangle
+The big lake
+The long way
+Two frontiers
+War of the Valleys
+EOF
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -89,6 +111,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 17 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.7.build11
+- Fix update problems
 * Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
 - Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10



From fedora-extras-commits at redhat.com  Mon Sep 17 16:17:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:17:32 -0400
Subject: rpms/libbonobo/devel .cvsignore, 1.26, 1.27 libbonobo.spec, 1.63,
	1.64 sources, 1.26, 1.27
Message-ID: <200709171617.l8HGHWsN017424@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17355

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	30 Jul 2007 21:49:31 -0000	1.26
+++ .cvsignore	17 Sep 2007 16:16:58 -0000	1.27
@@ -1 +1 @@
-libbonobo-2.19.6.tar.bz2
+libbonobo-2.20.0.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libbonobo.spec	13 Sep 2007 06:08:23 -0000	1.63
+++ libbonobo.spec	17 Sep 2007 16:16:58 -0000	1.64
@@ -5,10 +5,10 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.19.6
-Release: 6%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://ftp.gnome.org
-Source0: http://download.gnome.org/sources/libbonobo/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonobo/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 # bonobo-activation-server, bonobo-activation-sysconf and bonobo-slay are GPL 
 # libbonobo and libbonobo-activation are LGPLv2+
@@ -129,6 +129,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-6
 - Plug a memory leak in bonobo-activation-server
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	30 Jul 2007 21:49:31 -0000	1.26
+++ sources	17 Sep 2007 16:16:58 -0000	1.27
@@ -1 +1 @@
-78ebc03b60ebf2a2c4b3ebcefdf9f730  libbonobo-2.19.6.tar.bz2
+5656fc628f2b327cfdcab493a8f95f7f  libbonobo-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:19:38 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 12:19:38 -0400
Subject: rpms/libzzub/devel libzzub.spec,1.1,1.2
Message-ID: <200709171619.l8HGJcGA017597@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17562/devel

Modified Files:
	libzzub.spec 
Log Message:
update to revision 7



Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub.spec	17 Sep 2007 07:41:51 -0000	1.1
+++ libzzub.spec	17 Sep 2007 16:19:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -47,6 +47,19 @@
 developing applications that use %{name}.
 
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n	pyzzub
+Summary:	Python Bindings For libzzub
+Group:		Development/Libraries
+
+BuildRequires:	python-devel
+Requires:	%{name} = %{version}-%{release}
+
+%description -n	pyzzub
+These are the Python bindings For libzzub, allowing you to use it from within
+Python scripts.
+
+
 %prep
 %setup -q
 mac2unix SConstruct
@@ -75,11 +88,17 @@
 
 scons CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 scons install CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 cd $RPM_BUILD_ROOT%{_docdir}
 %{__mv} zzub %{name}-%{version}
 
@@ -114,7 +133,18 @@
 %{_libdir}/libzzub.so
 %{_defaultdocdir}/%{name}-devel-%{version}
 
+%files -n pyzzub
+%defattr(-,root,root,-)
+%{python_sitelib}/zzub
+
 %changelog
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
+- re-added pyzzub python-devel build requirement
+- explicitly nailed the name of pyzzub
+
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
+- added pyzzub as an internal extra package
+
 * Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
 - removed redundant explicit flac requirement
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:22:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 12:22:16 -0400
Subject: rpms/xulrunner/OLPC-2 sources,1.7,1.8 xulrunner.spec,1.24,1.25
Message-ID: <200709171622.l8HGMGMG017771@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713

Modified Files:
	sources xulrunner.spec 
Log Message:
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.
+- Downgrade the source to pre6, add a patch for XdndDirectSave support




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Aug 2007 20:32:13 -0000	1.7
+++ sources	17 Sep 2007 16:21:44 -0000	1.8
@@ -1 +1,2 @@
 fbe32af32bb5bd160a36b467bcf98784  xulrunner-1.9.20070820cvs.tar.bz2
+00dbfb4d548309951f12f352ba0f26ea  xulrunner-1.9a6.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xulrunner.spec	23 Aug 2007 08:30:49 -0000	1.24
+++ xulrunner.spec	17 Sep 2007 16:21:44 -0000	1.25
@@ -1,22 +1,22 @@
 %define nss_version 3.10
 %define cairo_version 1.3.12
-%define alpha 20070820cvs 
-%define prerelease a8pre
+%define prerelease a6pre
 
 Summary:        XUL Runner
 Name:           xulrunner
 Version:        1.9
-Release:        0.8.%{alpha}%{?dist}
+Release:        0.9.%{?dist}
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}.%{alpha}.tar.bz2
+Source0:        xulrunner-%{version}.tar.bz2
 Source10:       xulrunner-mozconfig
 Source12:       xulrunner-olpc-default-prefs.js
 
 Patch1:         xulrunner-1.9a6-no-native-theme.patch
 Patch2:         xulrunner-1.9a3pre-dpi.patch
 Patch3:         xulrunner-1.9a5pre-build.patch
+Patch4:         xulrunner-1.9a6-xds.patch
 
 # ---------------------------------------------------
 
@@ -59,11 +59,12 @@
 XUL Runner devel is...
 
 %prep
-%setup -q -n xulrunner-%{version}.%{alpha}
+%setup -q -n xulrunner-%{version}
 
 %patch1 -p0 -b .no-native-theme
 %patch2 -p0 -b .dpi
 %patch3 -p0 -b .build
+%patch4 -p0 -b .xds
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -121,6 +122,9 @@
 %{_includedir}/xulrunner-%{version}%{prerelease}
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.
+- Downgrade the source to pre6, add a patch for XdndDirectSave support
+
 * Thu Aug 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.8.20070820cvs
 - Own mozilla plugin dir
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:22:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:22:42 -0400
Subject: rpms/libbonoboui/devel .cvsignore, 1.31, 1.32 libbonoboui.spec, 1.57,
	1.58 sources, 1.32, 1.33
Message-ID: <200709171622.l8HGMgYs017785@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17745

Modified Files:
	.cvsignore libbonoboui.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Jul 2007 22:19:34 -0000	1.31
+++ .cvsignore	17 Sep 2007 16:22:09 -0000	1.32
@@ -1 +1 @@
-libbonoboui-2.19.6.tar.bz2
+libbonoboui-2.20.0.tar.bz2


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libbonoboui.spec	8 Sep 2007 20:39:40 -0000	1.57
+++ libbonoboui.spec	17 Sep 2007 16:22:09 -0000	1.58
@@ -13,10 +13,10 @@
 
 Summary: Bonobo user interface components
 Name: libbonoboui
-Version: 2.19.6
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libbonoboui/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libbonoboui/2.20/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=125046
 Patch0: help-error.patch
 License: GPLv2+ and LGPLv2+
@@ -122,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Sat Sep  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-4
 - Display a dialog if help cannot be found
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jul 2007 22:19:34 -0000	1.32
+++ sources	17 Sep 2007 16:22:09 -0000	1.33
@@ -1 +1 @@
-7442b2b32515b405d35691f785a13e2f  libbonoboui-2.19.6.tar.bz2
+14427a459f6ca355de5f5e47ce95c1c4  libbonoboui-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:23:26 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Mon, 17 Sep 2007 12:23:26 -0400
Subject: rpms/libzzub/F-7 libzzub.spec,1.1,1.2
Message-ID: <200709171623.l8HGNQLQ017889@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17782/F-7

Modified Files:
	libzzub.spec 
Log Message:
update to revision 7



Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub.spec	17 Sep 2007 07:53:27 -0000	1.1
+++ libzzub.spec	17 Sep 2007 16:22:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -47,6 +47,19 @@
 developing applications that use %{name}.
 
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%package -n	pyzzub
+Summary:	Python Bindings For libzzub
+Group:		Development/Libraries
+
+BuildRequires:	python-devel
+Requires:	%{name} = %{version}-%{release}
+
+%description -n	pyzzub
+These are the Python bindings For libzzub, allowing you to use it from within
+Python scripts.
+
+
 %prep
 %setup -q
 mac2unix SConstruct
@@ -75,11 +88,17 @@
 
 scons CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 scons install CCFLAGS="%{optflags}"
 
+cd src/pyzzub
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 cd $RPM_BUILD_ROOT%{_docdir}
 %{__mv} zzub %{name}-%{version}
 
@@ -114,7 +133,18 @@
 %{_libdir}/libzzub.so
 %{_defaultdocdir}/%{name}-devel-%{version}
 
+%files -n pyzzub
+%defattr(-,root,root,-)
+%{python_sitelib}/zzub
+
 %changelog
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
+- re-added pyzzub python-devel build requirement
+- explicitly nailed the name of pyzzub
+
+* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
+- added pyzzub as an internal extra package
+
 * Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
 - removed redundant explicit flac requirement
 



From fedora-extras-commits at redhat.com  Mon Sep 17 16:29:49 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:29:49 -0400
Subject: rpms/libgnome/devel .cvsignore, 1.37, 1.38 libgnome.spec, 1.98,
	1.99 sources, 1.37, 1.38
Message-ID: <200709171629.l8HGTnYE018244@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18222

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	30 Jul 2007 21:59:49 -0000	1.37
+++ .cvsignore	17 Sep 2007 16:29:16 -0000	1.38
@@ -1 +1 @@
-libgnome-2.19.1.tar.bz2
+libgnome-2.20.0.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- libgnome.spec	29 Aug 2007 01:28:33 -0000	1.98
+++ libgnome.spec	17 Sep 2007 16:29:16 -0000	1.99
@@ -12,10 +12,10 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.19.1
-Release: 9%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnome/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnome/2.20/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -184,6 +184,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Aug 28 2007 M??ir??n Duffy <duffy at redhat.com> - 2.19.1-9
 - Change default background to Infinity
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	30 Jul 2007 21:59:49 -0000	1.37
+++ sources	17 Sep 2007 16:29:16 -0000	1.38
@@ -1 +1 @@
-01524cf242063759f4abd0800bf776f2  libgnome-2.19.1.tar.bz2
+a52049befc0e8d91ff6c735d45552d78  libgnome-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 16:43:51 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 17 Sep 2007 12:43:51 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.38, 1.39 gnome-media.spec,
	1.106, 1.107 sources, 1.37, 1.38
Message-ID: <200709171643.l8HGhpxX018709@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18670

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	7 Sep 2007 10:56:48 -0000	1.38
+++ .cvsignore	17 Sep 2007 16:43:17 -0000	1.39
@@ -1 +1 @@
-gnome-media-2.19.92.tar.gz
+gnome-media-2.20.0.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-media.spec	7 Sep 2007 12:43:46 -0000	1.106
+++ gnome-media.spec	17 Sep 2007 16:43:17 -0000	1.107
@@ -11,7 +11,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.19.92
+Version:        2.20.0
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
@@ -187,6 +187,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 - Remove upstreamed/obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Sep 2007 10:56:48 -0000	1.37
+++ sources	17 Sep 2007 16:43:17 -0000	1.38
@@ -1 +1 @@
-f095fceca0175e04afb966e0366a9bc4  gnome-media-2.19.92.tar.gz
+4c98d9e745d98cb1ff314027b198a511  gnome-media-2.20.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:36 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGoatk025618@app3.fedora.phx.redhat.com>

Package micq in Fedora devel was orphaned by J?n ONDREJ (ondrejj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:43 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGoiWA025662@app3.fedora.phx.redhat.com>

Package micq in Fedora 6 was orphaned by J?n ONDREJ (ondrejj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Mon Sep 17 16:50:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 09:50:46 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709171650.l8HGolTb026388@app4.fedora.phx.redhat.com>

Package micq in Fedora 7 was orphaned by J?n ONDREJ (ondrejj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Mon Sep 17 16:51:53 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 12:51:53 -0400
Subject: rpms/nfs-utils/F-7 nfs-utils-1.1.0-exportfs-man-update.patch, NONE, 
	1.1 nfs-utils.spec, 1.161, 1.162
Message-ID: <200709171651.l8HGprRs018919@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18847

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-exportfs-man-update.patch 
Log Message:
Updated exportfs manpage (bz 262861)


nfs-utils-1.1.0-exportfs-man-update.patch:

--- NEW FILE nfs-utils-1.1.0-exportfs-man-update.patch ---
commit 0647ed30739b9867a4657bd69467925c868640b3
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 13:21:08 2007 -0400

    Updated exportfs man to talk about /var/lib/nfs/etab
    instead of /var/lib/nfs/xtab
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/exportfs/exportfs.man b/utils/exportfs/exportfs.man
index 2bd8e31..9cfe7b8 100644
--- a/utils/exportfs/exportfs.man
+++ b/utils/exportfs/exportfs.man
@@ -22,14 +22,14 @@ The
 .B exportfs
 command is used to maintain the current table of exported file systems for
 NFS. This list is kept in a separate file named
-.BR /var/lib/nfs/xtab
+.BR /var/lib/nfs/etab
 which is read by
 .B mountd
 when a remote host requests access to mount a file tree, and parts of
 the list which are active are kept in the kernel's export table.
 .P
 Normally this 
-.B xtab
+.B etab
 file is initialized with the list of all file systems named in
 .B /etc/exports 
 by invoking
@@ -59,7 +59,7 @@ In the new mode,
 does not give any information to the kernel but only provides it to
 .B mountd
 through the
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 file.
 .B mountd
 will listen to requests from the kernel and will provide information
@@ -69,7 +69,7 @@ In the legacy mode,
 any export requests which identify a specific host (rather than a
 subnet or netgroup etc) are entered directly into the kernel's export
 table as well as being written to
-.BR /var/lib/nfs/xtab .
+.BR /var/lib/nfs/etab .
 Further, any mount points listed in
 .B /var/lib/nfs/rmtab
 which match a non host-specific export request will cause an
@@ -93,8 +93,8 @@ file, so that only default options and options given on the command
 line are used.
 .TP
 .B -r
-Reexport all directories. It synchronizes /var/lib/nfs/xtab
-with /etc/exports. It removes entries in /var/lib/nfs/xtab
+Reexport all directories. It synchronizes /var/lib/nfs/etab
+with /etc/exports. It removes entries in /var/lib/nfs/etab
 which are deleted from /etc/exports, and remove any entries from the
 kernel export table which are no longer valid.
 .TP
@@ -120,7 +120,7 @@ entries to the export table.  When using
 all directories in
 .B exports(5)
 are added to
-.B xtab
+.B etab
 and the resulting list is pushed into the kernel.
 .P
 The
@@ -152,7 +152,7 @@ directory.
 Modifications of the kernel export table used by
 .B nfsd(8)
 take place immediately after parsing the command line and updating the
-.B xtab
+.B etab
 file.
 .P
 The default export options are
@@ -163,14 +163,14 @@ The third synopsis shows how to unexported a currently exported directory.
 When using
 .BR "exportfs -ua" ,
 all entries listed in
-.B xtab
+.B etab
 are removed from the kernel export tables, and the file is cleared. This
 effectively shuts down all NFS activity.
 .P
 To remove individual export entries, one can specify a
 .I host:/path
 pair. This deletes the specified entry from
-.B xtab
+.B etab
 and removes the corresponding kernel entry (if any).
 .P
 .\" -------------------- Dumping the Export Table -----------------
@@ -186,7 +186,7 @@ option, the list of flags pertaining to each export are shown in addition.
 The following adds all directories listed in
 .B /etc/exports
 to
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 and pushes the resulting export entries into the kernel:
 .P
 .nf


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- nfs-utils.spec	14 Sep 2007 18:13:54 -0000	1.161
+++ nfs-utils.spec	17 Sep 2007 16:51:19 -0000	1.162
@@ -33,6 +33,7 @@
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-smnotify-path.patch
+Patch11: nfs-utils-1.1.0-exportfs-man-update.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -96,6 +97,7 @@
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -268,6 +270,7 @@
 %changelog
 * Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)
+- Updated exportfs manpage (bz 262861)
 
 * Mon Aug 13 2007 Steve Dickson <steved at redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 12:54:18 -0400
Subject: rpms/pygtksourceview/devel pygtksourceview.spec,1.11,1.12
Message-ID: <200709171654.l8HGsIle019070@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19041

Modified Files:
	pygtksourceview.spec 
Log Message:
fix requires



Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pygtksourceview.spec	17 Sep 2007 15:54:57 -0000	1.11
+++ pygtksourceview.spec	17 Sep 2007 16:53:43 -0000	1.12
@@ -2,7 +2,7 @@
 
 %define pygtk_version 2.8.0
 %define pygobject_version 2.8.0
-%define gtksourceview_version 1.90.5
+%define gtksourceview_version 2.0.0
 
 Name:           pygtksourceview
 Version:        2.0.0



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Mon, 17 Sep 2007 09:54:20 -0700
Subject: [pkgdb] kde-filesystem: kkofler has requested commit
Message-ID: <200709171654.l8HGsNeS026658@app3.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kde-filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:22 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Mon, 17 Sep 2007 09:54:22 -0700
Subject: [pkgdb] kde-filesystem: kkofler has requested commit
Message-ID: <200709171654.l8HGsNBp027389@app4.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kde-filesystem (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From fedora-extras-commits at redhat.com  Mon Sep 17 16:54:48 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 17 Sep 2007 12:54:48 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.4,1.5
Message-ID: <200709171654.l8HGsmKl019106@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19062

Modified Files:
	eclipse-egit.spec 
Log Message:
fix files listing


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-egit.spec	17 Sep 2007 14:54:11 -0000	1.4
+++ eclipse-egit.spec	17 Sep 2007 16:54:16 -0000	1.5
@@ -89,6 +89,7 @@
 %files
 %defattr(-,root,root,-)
 %{_datadir}/eclipse/features/org.spearce.egit*
+%{_datadir}/eclipse/plugins/org.spearce.egit*
 %{_datadir}/eclipse/plugins/org.spearce.egit.core*
 %{_datadir}/eclipse/plugins/org.spearce.egit.ui*
 %{_datadir}/eclipse/plugins/org.spearce.jgit*



From fedora-extras-commits at redhat.com  Mon Sep 17 16:55:35 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 12:55:35 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.1.0-exportfs-man-update.patch, NONE,
	1.1 nfs-utils.spec, 1.155, 1.156
Message-ID: <200709171655.l8HGtZjx019175@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-exportfs-man-update.patch 
Log Message:
Updated exportfs manpage (bz 262861)


nfs-utils-1.1.0-exportfs-man-update.patch:

--- NEW FILE nfs-utils-1.1.0-exportfs-man-update.patch ---
commit 0647ed30739b9867a4657bd69467925c868640b3
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Sep 14 13:21:08 2007 -0400

    Updated exportfs man to talk about /var/lib/nfs/etab
    instead of /var/lib/nfs/xtab
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/exportfs/exportfs.man b/utils/exportfs/exportfs.man
index 2bd8e31..9cfe7b8 100644
--- a/utils/exportfs/exportfs.man
+++ b/utils/exportfs/exportfs.man
@@ -22,14 +22,14 @@ The
 .B exportfs
 command is used to maintain the current table of exported file systems for
 NFS. This list is kept in a separate file named
-.BR /var/lib/nfs/xtab
+.BR /var/lib/nfs/etab
 which is read by
 .B mountd
 when a remote host requests access to mount a file tree, and parts of
 the list which are active are kept in the kernel's export table.
 .P
 Normally this 
-.B xtab
+.B etab
 file is initialized with the list of all file systems named in
 .B /etc/exports 
 by invoking
@@ -59,7 +59,7 @@ In the new mode,
 does not give any information to the kernel but only provides it to
 .B mountd
 through the
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 file.
 .B mountd
 will listen to requests from the kernel and will provide information
@@ -69,7 +69,7 @@ In the legacy mode,
 any export requests which identify a specific host (rather than a
 subnet or netgroup etc) are entered directly into the kernel's export
 table as well as being written to
-.BR /var/lib/nfs/xtab .
+.BR /var/lib/nfs/etab .
 Further, any mount points listed in
 .B /var/lib/nfs/rmtab
 which match a non host-specific export request will cause an
@@ -93,8 +93,8 @@ file, so that only default options and options given on the command
 line are used.
 .TP
 .B -r
-Reexport all directories. It synchronizes /var/lib/nfs/xtab
-with /etc/exports. It removes entries in /var/lib/nfs/xtab
+Reexport all directories. It synchronizes /var/lib/nfs/etab
+with /etc/exports. It removes entries in /var/lib/nfs/etab
 which are deleted from /etc/exports, and remove any entries from the
 kernel export table which are no longer valid.
 .TP
@@ -120,7 +120,7 @@ entries to the export table.  When using
 all directories in
 .B exports(5)
 are added to
-.B xtab
+.B etab
 and the resulting list is pushed into the kernel.
 .P
 The
@@ -152,7 +152,7 @@ directory.
 Modifications of the kernel export table used by
 .B nfsd(8)
 take place immediately after parsing the command line and updating the
-.B xtab
+.B etab
 file.
 .P
 The default export options are
@@ -163,14 +163,14 @@ The third synopsis shows how to unexported a currently exported directory.
 When using
 .BR "exportfs -ua" ,
 all entries listed in
-.B xtab
+.B etab
 are removed from the kernel export tables, and the file is cleared. This
 effectively shuts down all NFS activity.
 .P
 To remove individual export entries, one can specify a
 .I host:/path
 pair. This deletes the specified entry from
-.B xtab
+.B etab
 and removes the corresponding kernel entry (if any).
 .P
 .\" -------------------- Dumping the Export Table -----------------
@@ -186,7 +186,7 @@ option, the list of flags pertaining to each export are shown in addition.
 The following adds all directories listed in
 .B /etc/exports
 to
-.B /var/lib/nfs/xtab
+.B /var/lib/nfs/etab
 and pushes the resulting export entries into the kernel:
 .P
 .nf


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- nfs-utils.spec	14 Sep 2007 19:09:03 -0000	1.155
+++ nfs-utils.spec	17 Sep 2007 16:55:03 -0000	1.156
@@ -34,6 +34,7 @@
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-exportfs-open.patch
 Patch11: nfs-utils-1.1.0-smnotify-path.patch
+Patch12: nfs-utils-1.1.0-exportfs-man-update.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -98,6 +99,7 @@
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -271,6 +273,7 @@
 * Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-5
 - Changed the default paths in sm-notify to 
   /var/lib/nfs/statd (bz 258461)
+- Updated exportfs manpage (bz 262861)
 
 * Wed Aug 15 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses



From fedora-extras-commits at redhat.com  Mon Sep 17 17:01:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 13:01:03 -0400
Subject: rpms/tomboy/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 tomboy.spec, 1.57, 1.58
Message-ID: <200709171701.l8HH13sX023597@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19433

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	14 Sep 2007 05:44:46 -0000	1.19
+++ .cvsignore	17 Sep 2007 17:00:29 -0000	1.20
@@ -1 +1 @@
-tomboy-0.7.8.tar.bz2
+tomboy-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Sep 2007 05:44:46 -0000	1.19
+++ sources	17 Sep 2007 17:00:29 -0000	1.20
@@ -1 +1 @@
-a5d87649e153d4e7a4a01846c700e66c  tomboy-0.7.8.tar.bz2
+b95c8ce7da7571583f33e80d25ac87e6  tomboy-0.8.0.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tomboy.spec	14 Sep 2007 05:44:46 -0000	1.57
+++ tomboy.spec	17 Sep 2007 17:00:29 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.7.8
+Version:        0.8.0
 Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1
+- Update to 0.8.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.7.8-1
 - Update to 0.7.8
 



From fedora-extras-commits at redhat.com  Mon Sep 17 17:09:08 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:09:08 -0400
Subject: rpms/goffice04/devel .cvsignore, 1.3, 1.4 goffice04.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709171709.l8HH97Gn025738@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice04/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703

Modified Files:
	.cvsignore goffice04.spec sources 
Log Message:
* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
- Updated to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2007 15:31:51 -0000	1.3
+++ .cvsignore	17 Sep 2007 17:08:34 -0000	1.4
@@ -1 +1 @@
-goffice-0.4.2.tar.bz2
+goffice-0.4.3.tar.bz2


Index: goffice04.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/goffice04.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goffice04.spec	26 Aug 2007 07:46:30 -0000	1.4
+++ goffice04.spec	17 Sep 2007 17:08:34 -0000	1.5
@@ -1,8 +1,8 @@
 %define         upstreamname goffice
 
 Name:           goffice04         
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.4.3
+Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
+- Updated to 0.4.3
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-2
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2007 15:31:51 -0000	1.3
+++ sources	17 Sep 2007 17:08:34 -0000	1.4
@@ -1 +1 @@
-eb72fe8caf7cb4e526671323f6bd4819  goffice-0.4.2.tar.bz2
+f299e3a469e11609910d72d007420aa7  goffice-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:11:20 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:11:20 -0400
Subject: rpms/goffice04/F-7 .cvsignore, 1.3, 1.4 goffice04.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709171711.l8HHBKj7025826@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice04/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25800

Modified Files:
	.cvsignore goffice04.spec sources 
Log Message:
* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
- Updated to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2007 15:33:46 -0000	1.3
+++ .cvsignore	17 Sep 2007 17:10:48 -0000	1.4
@@ -1 +1 @@
-goffice-0.4.2.tar.bz2
+goffice-0.4.3.tar.bz2


Index: goffice04.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/goffice04.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goffice04.spec	5 Aug 2007 15:33:46 -0000	1.3
+++ goffice04.spec	17 Sep 2007 17:10:48 -0000	1.4
@@ -1,11 +1,11 @@
 %define         upstreamname goffice
 
 Name:           goffice04         
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
-License:        GPL  
+License:        GPLv2
 URL:            http://freshmeat.net/projects/goffice/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.4/%{upstreamname}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,12 @@
 
 
 %changelog
+* Sat Sep 15 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.3-1
+- Updated to 0.4.3
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-2
+- Adjusted License tag as per latest guidelines
+
 * Sun Aug  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.4.2-1
 - Updated to 0.4.2
 - Added libgsf-gnome-devel to BuildRequires (RH #245604)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice04/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2007 15:33:46 -0000	1.3
+++ sources	17 Sep 2007 17:10:48 -0000	1.4
@@ -1 +1 @@
-eb72fe8caf7cb4e526671323f6bd4819  goffice-0.4.2.tar.bz2
+f299e3a469e11609910d72d007420aa7  goffice-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:13:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 10:13:32 -0700
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <200709171713.l8HHDWQ4031742@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kde-filesystem (Fedora devel) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From fedora-extras-commits at redhat.com  Mon Sep 17 17:13:35 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 10:13:35 -0700
Subject: [pkgdb] kde-filesystem had acl change status
Message-ID: <200709171713.l8HHDaig000634@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kde-filesystem (Fedora 7) to Approved for Kevin Kofler (kkofler)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kde-filesystem



From fedora-extras-commits at redhat.com  Mon Sep 17 17:15:30 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:15:30 -0400
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.5,
	1.6 gnome-chemistry-utils.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200709171715.l8HHFUMp025914@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25887

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Aug 2007 14:31:03 -0000	1.5
+++ .cvsignore	17 Sep 2007 17:14:58 -0000	1.6
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.2.tar.bz2
+gnome-chemistry-utils-0.8.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-chemistry-utils.spec	26 Aug 2007 07:42:19 -0000	1.10
+++ gnome-chemistry-utils.spec	17 Sep 2007 17:14:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.2
-Release:        4%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-4
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Aug 2007 14:31:03 -0000	1.5
+++ sources	17 Sep 2007 17:14:58 -0000	1.6
@@ -1 +1 @@
-804946c5a6f9587e9707918f7f1b4d06  gnome-chemistry-utils-0.8.2.tar.bz2
+621f28050385acbde80ddd88cd11b0b2  gnome-chemistry-utils-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:17:48 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Mon, 17 Sep 2007 13:17:48 -0400
Subject: rpms/gnome-chemistry-utils/F-7 .cvsignore, 1.5,
	1.6 gnome-chemistry-utils.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200709171717.l8HHHmif026012@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25973

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Aug 2007 14:35:35 -0000	1.5
+++ .cvsignore	17 Sep 2007 17:17:15 -0000	1.6
@@ -1 +1 @@
-gnome-chemistry-utils-0.8.2.tar.bz2
+gnome-chemistry-utils-0.8.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/gnome-chemistry-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-chemistry-utils.spec	6 Aug 2007 13:40:42 -0000	1.9
+++ gnome-chemistry-utils.spec	17 Sep 2007 17:17:15 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           gnome-chemistry-utils
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -204,6 +204,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-4
+- Adjusted License tag as per latest guidelines
+
 * Mon Aug  6 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
 - Added goffice04-devel to -devel subpackage Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Aug 2007 14:35:35 -0000	1.5
+++ sources	17 Sep 2007 17:17:15 -0000	1.6
@@ -1 +1 @@
-804946c5a6f9587e9707918f7f1b4d06  gnome-chemistry-utils-0.8.2.tar.bz2
+621f28050385acbde80ddd88cd11b0b2  gnome-chemistry-utils-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 17:27:35 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 17 Sep 2007 13:27:35 -0400
Subject: rpms/slang/devel slang-2.1.2-makefile.patch, NONE, 1.1 slang.spec, 
	1.46, 1.47 slang-2.1.0-makefile.patch, 1.3, NONE
Message-ID: <200709171727.l8HHRZIT026229@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26206

Modified Files:
	slang.spec 
Added Files:
	slang-2.1.2-makefile.patch 
Removed Files:
	slang-2.1.0-makefile.patch 
Log Message:
- update to 2.1.2


slang-2.1.2-makefile.patch:

--- NEW FILE slang-2.1.2-makefile.patch ---
diff -up slang-2.1.2/modules/Makefile.in.makefile slang-2.1.2/modules/Makefile.in
--- slang-2.1.2/modules/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/modules/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
 MODULE_INSTALL_DIR = @libdir@/slang/v at slang_major_version@/modules
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_MODULE	= @INSTALL_MODULE@
+INSTALL_MODULE	= @INSTALL@
 MKINSDIR	= ../autoconf/mkinsdir.sh
 SLSH_DIR	= $(prefix)/share/slsh
 CMAPS_DIR	= $(SLSH_DIR)/cmaps
@@ -67,7 +67,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
 DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
 #---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
 
 LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
 #LIBS = $(RPATH) $(DL_LIB) -lm
diff -up slang-2.1.2/slsh/Makefile.in.makefile slang-2.1.2/slsh/Makefile.in
--- slang-2.1.2/slsh/Makefile.in.makefile	2007-09-09 03:39:18.000000000 +0200
+++ slang-2.1.2/slsh/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I at SRCDIR@
 SLANG_SRCLIB	= -L at ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
-RPATH		= @RPATH@
+RPATH		= 
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
 #----------------------------------------------------------------------------
 @SET_MAKE@
 SHELL = /bin/sh
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
 DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
diff -up slang-2.1.2/src/Makefile.in.makefile slang-2.1.2/src/Makefile.in
--- slang-2.1.2/src/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/src/Makefile.in	2007-09-17 18:07:25.000000000 +0200
@@ -137,17 +137,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
 # Rules
 #---------------------------------------------------------------------------
 all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -158,10 +162,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
 	@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
 	-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+	touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
 	-$(MKDIR) $(ELFDIR)
+	touch $(ELFDIR)/stamp
 $(CONFIG_H) : sysconf.h
 	-$(CP) sysconf.h $(CONFIG_H)
 
@@ -192,9 +198,9 @@ install-elf-and-links:
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.
diff -up slang-2.1.2/autoconf/Makefile.in.makefile slang-2.1.2/autoconf/Makefile.in
--- slang-2.1.2/autoconf/Makefile.in.makefile	2007-08-30 05:14:55.000000000 +0200
+++ slang-2.1.2/autoconf/Makefile.in	2007-09-17 17:56:45.000000000 +0200
@@ -18,8 +18,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: Makefile
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: Makefile
+elf: Makefile static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- slang.spec	23 Aug 2007 10:36:48 -0000	1.46
+++ slang.spec	17 Sep 2007 17:27:03 -0000	1.47
@@ -1,11 +1,11 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
-Patch1: slang-2.1.0-makefile.patch
+Patch1: slang-2.1.2-makefile.patch
 Patch2: slang-nointerlibc2.patch
 Patch3: slang-LANG.patch
 URL: http://www.jedsoft.org/slang/
@@ -68,8 +68,8 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install-all INSTALL="install -p" \
-	DESTDIR=$RPM_BUILD_ROOT install_doc_dir=%{_docdir}/%{name}-%{version}
+make install-all INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/{slang,slsh}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -85,6 +85,7 @@
 
 %files slsh
 %defattr(-,root,root)
+%doc slsh/doc/html/slsh*.html
 %config(noreplace) %{_sysconfdir}/slsh.rc
 %{_bindir}/slsh
 %{_libdir}/slang
@@ -93,7 +94,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc doc/*/cslang*.txt
+%doc doc/*/cslang*.txt doc/*/cref.txt
 %{_libdir}/libslang*.so
 %{_includedir}/slang
 
@@ -102,6 +103,9 @@
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-1
+- update to 2.1.2
+
 * Thu Aug 23 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.1-2
 - update license tag
 - buildrequire gawk


--- slang-2.1.0-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 17:33:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkrDoW4gT05EUkVKIiA8b25kcmVqakBzYWxzdGFyLnNrPg==?=))
Date: Mon, 17 Sep 2007 10:33:30 -0700
Subject: [pkgdb] aspell-sk Orphaned
Message-ID: <200709171733.l8HHXUAI004224@app3.fedora.phx.redhat.com>

Package aspell-sk in Fedora EPEL 4 was orphaned by J?n ONDREJ (ondrejj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aspell-sk



From fedora-extras-commits at redhat.com  Mon Sep 17 17:49:11 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 13:49:11 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.60, 1.61 gtkhtml3.spec, 1.101,
	1.102 sources, 1.60, 1.61
Message-ID: <200709171749.l8HHnBw5028990@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28960

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 3.16.0-1.fc8
- Update to 3.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	4 Sep 2007 02:45:19 -0000	1.60
+++ .cvsignore	17 Sep 2007 17:48:38 -0000	1.61
@@ -1 +1 @@
-gtkhtml-3.15.92.tar.bz2
+gtkhtml-3.16.0.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gtkhtml3.spec	13 Sep 2007 16:10:39 -0000	1.101
+++ gtkhtml3.spec	17 Sep 2007 17:48:38 -0000	1.102
@@ -8,8 +8,8 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.15.92
-Release: 2%{?dist}
+Version: 3.16.0
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -134,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 3.16.0-1.fc8
+- Update to 3.16.0
+
 * Thu Sep 13 2007 Matthew Barnes <mbarnes at redhat.com> - 3.15.92-2.fc8
 - Add patch for GNOME bug #443850 (fix cursor position after typing halant).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	4 Sep 2007 02:45:19 -0000	1.60
+++ sources	17 Sep 2007 17:48:38 -0000	1.61
@@ -1 +1 @@
-a37457a6de11ae2fa6661ecf2ae33958  gtkhtml-3.15.92.tar.bz2
+0b3b2d27671671ec0680984fe5d8ab9b  gtkhtml-3.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:06:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:06:41 -0400
Subject: rpms/libgnome/devel default-background.patch, NONE,
	1.1 libgnome.spec, 1.99, 1.100
Message-ID: <200709171806.l8HI6fUe003487@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	libgnome.spec 
Added Files:
	default-background.patch 
Log Message:
update patch


default-background.patch:

--- NEW FILE default-background.patch ---
diff -up libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
--- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background	2007-09-17 08:25:50.000000000 -0400
+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in	2007-09-17 14:04:41.000000000 -0400
@@ -16,7 +16,7 @@
         <applyto>/desktop/gnome/background/picture_options</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>zoom</default>
+        <default>stretched</default>
         <locale name="C">
         <short>Picture Options</short>
         <long>Determines how the image set by wallpaper_filename is
@@ -29,7 +29,7 @@
         <applyto>/desktop/gnome/background/picture_filename</applyto>
         <owner>gnome</owner>
         <type>string</type>
-	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
+	<default>/usr/share/backgrounds/infinity/infinity.xml</default>
         <locale name="C">
         <short>Picture Filename</short>
         <long>File to use for the background image</long>
@@ -51,7 +51,7 @@
         <applyto>/desktop/gnome/background/primary_color</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>#66ba00</default>
+        <default>#224B68</default>
         <locale name="C">
         <short>Primary Color</short>
         <long>Left or Top color when drawing gradients, or the solid color.</long>
@@ -62,7 +62,7 @@
         <applyto>/desktop/gnome/background/secondary_color</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>#66ba00</default>
+        <default>#142C3D</default>
         <locale name="C">
         <short>Secondary Color</short>
         <long>Right or Bottom color when drawing gradients, not used for solid color.</long>
@@ -73,7 +73,7 @@
         <applyto>/desktop/gnome/background/color_shading_type</applyto>
         <owner>gnome</owner>
         <type>string</type>
-        <default>solid</default>
+        <default>vertical-gradient</default>
         <locale name="C">
         <short>Color Shading Type</short>
         <long>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid"</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libgnome.spec	17 Sep 2007 16:29:16 -0000	1.99
+++ libgnome.spec	17 Sep 2007 18:06:08 -0000	1.100
@@ -52,7 +52,7 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  popt-devel
 
-Patch1: libgnome-2.16.0-default-background.patch
+Patch1: default-background.patch
 Patch2: libgnome-2.11.1-scoreloc.patch
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch



From fedora-extras-commits at redhat.com  Mon Sep 17 18:15:47 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 14:15:47 -0400
Subject: comps comps-f8.xml.in,1.110,1.111
Message-ID: <200709171815.l8HIFlOU003782@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3739

Modified Files:
	comps-f8.xml.in 
Log Message:
make f-spot default per the desktop SIG meeting last week



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- comps-f8.xml.in	16 Sep 2007 07:34:06 -0000	1.110
+++ comps-f8.xml.in	17 Sep 2007 18:15:17 -0000	1.111
@@ -1885,6 +1885,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">f-spot</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gimp-help</packagereq>
       <packagereq type="default">xsane</packagereq>
@@ -1897,7 +1898,6 @@
       <packagereq type="optional">dcraw</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">digikam-doc</packagereq>
-      <packagereq type="optional">f-spot</packagereq>
       <packagereq type="optional">fontforge</packagereq>
       <packagereq type="optional">fonttools</packagereq>
       <packagereq type="optional">fyre</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 17 18:16:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:16:26 -0400
Subject: rpms/jasper/devel jasper.spec,1.25,1.26
Message-ID: <200709171816.l8HIGQxQ003822@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3788

Modified Files:
	jasper.spec 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
- (main) drop Requires: %name-libs
- -devel: Provides: libjasper-devel
- drop (unused) geojasper bits



Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jasper.spec	22 Aug 2007 15:39:20 -0000	1.25
+++ jasper.spec	17 Sep 2007 18:15:53 -0000	1.26
@@ -4,25 +4,15 @@
 # kdelibs
 # netpbm
 
-# define to use GeoJasper
-#define geo 1
-
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: JasPer
-%if "%{?geo:1}" == "1"
-%define  geojasper_ver 1.2.9
-URL:	 http://www.dimin.net/software/utils.html
-Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
@@ -37,8 +27,6 @@
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
-Requires: %{name}-libs = %{version}-%{release}
-
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
@@ -47,6 +35,7 @@
 %package devel
 Summary: JasPer header files, libraries and developer documentation.
 Group:   Development/Libraries
+Provides: libjasper-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
 %description devel
@@ -69,22 +58,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
-
 
 %build
 
@@ -120,7 +98,6 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
 %{_bindir}/imginfo
 %{_bindir}/jasper
@@ -135,6 +112,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
 %{_libdir}/lib*.so.*
 
 %files utils
@@ -145,6 +123,11 @@
 
 
 %changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
+- (main) drop Requires: %%name-libs
+- -devel: Provides: libjasper-devel
+- drop (unused) geojasper bits
+
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
 - -libs subpkg to be multilib friendlier
 - -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)



From fedora-extras-commits at redhat.com  Mon Sep 17 18:17:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:17:29 -0400
Subject: rpms/libgnomeprint22/devel .cvsignore, 1.21,
	1.22 libgnomeprint22.spec, 1.54, 1.55 sources, 1.21, 1.22
Message-ID: <200709171817.l8HIHTUN003899@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomeprint22/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872

Modified Files:
	.cvsignore libgnomeprint22.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	9 Aug 2007 05:26:52 -0000	1.21
+++ .cvsignore	17 Sep 2007 18:16:56 -0000	1.22
@@ -1 +1 @@
-libgnomeprint-2.18.1.tar.bz2
+libgnomeprint-2.18.2.tar.bz2


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libgnomeprint22.spec	23 Aug 2007 17:23:39 -0000	1.54
+++ libgnomeprint22.spec	17 Sep 2007 18:16:56 -0000	1.55
@@ -12,8 +12,8 @@
 
 Summary: Printing library for GNOME
 Name:		libgnomeprint22
-Version: 	2.18.1
-Release:	2%{?dist}
+Version: 	2.18.2
+Release:	1%{?dist}
 License:	LGPL+ and BSD
 # BSD applies to ttsubset code that was taken from STSF
 Group:          System Environment/Base
@@ -122,6 +122,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.1-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeprint22/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	9 Aug 2007 05:26:52 -0000	1.21
+++ sources	17 Sep 2007 18:16:56 -0000	1.22
@@ -1 +1 @@
-be87a17490c4976a85488537f22bcfde  libgnomeprint-2.18.1.tar.bz2
+b1f6c95a8dbb8ce17ab00fc2eea2aa91  libgnomeprint-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:18:04 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 14:18:04 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.71,
	1.72 evolution-data-server.spec, 1.186, 1.187 sources, 1.71, 1.72
Message-ID: <200709171818.l8HII4Re003972@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3896

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.12.0-1.fc8
- Update to 1.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	4 Sep 2007 03:16:15 -0000	1.71
+++ .cvsignore	17 Sep 2007 18:17:31 -0000	1.72
@@ -1 +1 @@
-evolution-data-server-1.11.92.tar.bz2
+evolution-data-server-1.12.0.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- evolution-data-server.spec	4 Sep 2007 03:16:15 -0000	1.186
+++ evolution-data-server.spec	17 Sep 2007 18:17:31 -0000	1.187
@@ -26,7 +26,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.11.92
+Version: 1.12.0
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -381,6 +381,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.12.0-1.fc8
+- Update to 1.12.0
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.92-1.fc8
 - Update to 1.11.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	4 Sep 2007 03:16:15 -0000	1.71
+++ sources	17 Sep 2007 18:17:31 -0000	1.72
@@ -1 +1 @@
-51fc0b011c240eaefeadbdbcc9517af7  evolution-data-server-1.11.92.tar.bz2
+787cfe9d652f46395a9adce056bdb286  evolution-data-server-1.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:20:31 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:20:31 -0400
Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.21,
	1.22 libgnomeprintui22.spec, 1.45, 1.46 sources, 1.21, 1.22
Message-ID: <200709171820.l8HIKVTH004105@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeprintui22/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4051

Modified Files:
	.cvsignore libgnomeprintui22.spec sources 
Log Message:
2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Mar 2007 17:33:39 -0000	1.21
+++ .cvsignore	17 Sep 2007 18:19:58 -0000	1.22
@@ -1 +1 @@
-libgnomeprintui-2.18.0.tar.bz2
+libgnomeprintui-2.18.1.tar.bz2


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libgnomeprintui22.spec	23 Aug 2007 17:24:45 -0000	1.45
+++ libgnomeprintui22.spec	17 Sep 2007 18:19:58 -0000	1.46
@@ -5,8 +5,8 @@
 
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/2.18/libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -84,6 +84,9 @@
 %{_datadir}/gtk-doc/html/libgnomeprintui
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.18.0-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeprintui22/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Mar 2007 17:33:39 -0000	1.21
+++ sources	17 Sep 2007 18:19:58 -0000	1.22
@@ -1 +1 @@
-bea9871059cabee9d108bab32d58d2af  libgnomeprintui-2.18.0.tar.bz2
+4f9a09372a5fa2cd5c35be30dff3fcd6  libgnomeprintui-2.18.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:20:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:20:57 -0400
Subject: rpms/jasper/devel jasper.spec,1.26,1.27
Message-ID: <200709171820.l8HIKvb1004128@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4080

Modified Files:
	jasper.spec 
Log Message:
ok, try again...
make -libs not Requires: %%name



Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jasper.spec	17 Sep 2007 18:15:53 -0000	1.26
+++ jasper.spec	17 Sep 2007 18:20:25 -0000	1.27
@@ -8,7 +8,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -27,6 +27,8 @@
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
@@ -44,7 +46,6 @@
 %package libs 
 Summary: JasPer runtime libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
 %description libs 
 %{summary}.
 
@@ -123,9 +124,9 @@
 
 
 %changelog
-* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
-- (main) drop Requires: %%name-libs
-- -devel: Provides: libjasper-devel
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-6
+- -libs: -Requires: %%name
+- -devel: +Provides: libjasper-devel
 - drop (unused) geojasper bits
 
 * Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4



From fedora-extras-commits at redhat.com  Mon Sep 17 18:23:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:23:32 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.26, 1.27 gcalctool.spec, 1.48,
	1.49 sources, 1.27, 1.28
Message-ID: <200709171823.l8HINWVk004473@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gcalctool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Sep 2007 04:26:59 -0000	1.26
+++ .cvsignore	17 Sep 2007 18:22:59 -0000	1.27
@@ -1 +1 @@
-gcalctool-5.19.92.tar.bz2
+gcalctool-5.20.0.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gcalctool.spec	4 Sep 2007 15:56:25 -0000	1.48
+++ gcalctool.spec	17 Sep 2007 18:22:59 -0000	1.49
@@ -1,12 +1,12 @@
 Name:           gcalctool
-Version:        5.19.92
+Version:        5.20.0
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://directory.fsf.org/gcalctool.html
-Source0:        http://download.gnome.org/sources/gcalctool/5.19/gcalctool-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gcalctool/5.20/gcalctool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: atk-devel >= 1.5
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 5.20.0-1
+- Update to 5.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 5.19.92-1
 - Update to 5.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Sep 2007 04:26:59 -0000	1.27
+++ sources	17 Sep 2007 18:22:59 -0000	1.28
@@ -1 +1 @@
-1b2a327311134d830a4b3628b51468f0  gcalctool-5.19.92.tar.bz2
+fefe44a52465eae39c5bf9a9669a0aa6  gcalctool-5.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:23:39 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 14:23:39 -0400
Subject: rpms/OpenEXR/devel OpenEXR.spec,1.14,1.15
Message-ID: <200709171823.l8HINda1004478@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/OpenEXR/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4356

Modified Files:
	OpenEXR.spec 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-6
- libs: -Requires: %name



Index: OpenEXR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OpenEXR.spec	22 Aug 2007 23:33:30 -0000	1.14
+++ OpenEXR.spec	17 Sep 2007 18:23:07 -0000	1.15
@@ -4,7 +4,7 @@
 
 Name:	 OpenEXR
 Version: %{ver}%{?beta} 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
@@ -45,7 +45,6 @@
 %package libs
 Summary: %{name} runtime libraries
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -104,7 +103,6 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
 %exclude %{_bindir}/exrdisplay
 
@@ -118,6 +116,7 @@
 
 %files libs
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog LICENSE NEWS README
 %{_libdir}/lib*.so.*
 
 %files utils
@@ -126,7 +125,10 @@
 
 
 %changelog
-* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject> 1.4.0a-5
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-6
+- libs: -Requires: %%name
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.0a-5
 - -libs: new subpkg to be multilib friendly
 - -utils: package exrdisplay separately (separate fltk dep)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 18:25:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:25:42 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.28, 1.29 gnome-mag.spec, 1.51,
	1.52 sources, 1.29, 1.30
Message-ID: <200709171825.l8HIPgAK005634@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-mag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5148

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.14.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	14 Sep 2007 06:09:24 -0000	1.28
+++ .cvsignore	17 Sep 2007 18:25:09 -0000	1.29
@@ -1 +1 @@
-gnome-mag-0.14.9.tar.bz2
+gnome-mag-0.14.10.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-mag.spec	14 Sep 2007 06:09:24 -0000	1.51
+++ gnome-mag.spec	17 Sep 2007 18:25:09 -0000	1.52
@@ -2,7 +2,7 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.14.9
+Version: 0.14.10
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -74,6 +74,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.10-1
+- Update to 0.14.10
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.9-1
 - Update to 0.14.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-mag/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	14 Sep 2007 06:09:24 -0000	1.29
+++ sources	17 Sep 2007 18:25:09 -0000	1.30
@@ -1 +1 @@
-36a4bb5b06ca8bfb0d7d728c3045bebe  gnome-mag-0.14.9.tar.bz2
+e3e498c7df873ecc7acabd52a7b4ddc7  gnome-mag-0.14.10.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:31:58 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 14:31:58 -0400
Subject: rpms/gcstar/devel .cvsignore, 1.5, 1.6 gcstar.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200709171831.l8HIVw82007072@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7040

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 17:19:01 -0000	1.5
+++ .cvsignore	17 Sep 2007 18:31:25 -0000	1.6
@@ -1 +1 @@
-gcstar-1.2.0.tar.gz
+gcstar-1.2.2.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/gcstar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcstar.spec	10 Sep 2007 16:41:54 -0000	1.7
+++ gcstar.spec	17 Sep 2007 18:31:25 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:19:01 -0000	1.4
+++ sources	17 Sep 2007 18:31:25 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:32:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:32:49 -0400
Subject: rpms/ctapi-cyberjack/devel .cvsignore, 1.13,
	1.14 ctapi-cyberjack.spec, 1.33, 1.34 sources, 1.13, 1.14
Message-ID: <200709171832.l8HIWnex007135@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7076

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Jul 2007 06:54:50 -0000	1.13
+++ .cvsignore	17 Sep 2007 18:32:17 -0000	1.14
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ctapi-cyberjack.spec	6 Aug 2007 17:48:26 -0000	1.33
+++ ctapi-cyberjack.spec	17 Sep 2007 18:32:17 -0000	1.34
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Jul 2007 06:54:50 -0000	1.13
+++ sources	17 Sep 2007 18:32:17 -0000	1.14
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:34:40 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:34:40 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.51, 1.52 gnome-vfs2.spec, 1.165,
	1.166 sources, 1.53, 1.54
Message-ID: <200709171834.l8HIYefg007230@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7188

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	3 Sep 2007 04:26:21 -0000	1.51
+++ .cvsignore	17 Sep 2007 18:34:07 -0000	1.52
@@ -1 +1 @@
-gnome-vfs-2.19.91.tar.bz2
+gnome-vfs-2.20.0.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-vfs2.spec	13 Sep 2007 03:11:15 -0000	1.165
+++ gnome-vfs2.spec	17 Sep 2007 18:34:07 -0000	1.166
@@ -13,13 +13,13 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.19.91
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2 and LGPL+ and GPL+
 # the daemon and the library are LGPLv2
 # the modules are LGPL+ and GPL+ 
 Group: System Environment/Libraries
-Source0: http://download.gnome.org/source/gnome-vfs/2.19/gnome-vfs-%{version}.tar.bz2
+Source0: http://download.gnome.org/source/gnome-vfs/2.20/gnome-vfs-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
@@ -229,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-2
 - Fix a small memory leak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	3 Sep 2007 04:26:21 -0000	1.53
+++ sources	17 Sep 2007 18:34:07 -0000	1.54
@@ -1 +1 @@
-6a08abf1f6f0188d7f4ae1e21a9b9551  gnome-vfs-2.19.91.tar.bz2
+b9fe0a066d0e693e74a000e55338235b  gnome-vfs-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:37:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:37:26 -0400
Subject: rpms/ctapi-cyberjack/FC-6 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709171837.l8HIbQji007346@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7309

Modified Files:
	.cvsignore sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jul 2007 06:59:35 -0000	1.10
+++ .cvsignore	17 Sep 2007 18:36:53 -0000	1.11
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Jul 2007 06:59:35 -0000	1.10
+++ sources	17 Sep 2007 18:36:53 -0000	1.11
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:38:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 14:38:16 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.25,1.26
Message-ID: <200709171838.l8HIcGRK007396@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7359

Modified Files:
	xulrunner.spec 
Log Message:
Fix some paths


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xulrunner.spec	17 Sep 2007 16:21:44 -0000	1.25
+++ xulrunner.spec	17 Sep 2007 18:37:44 -0000	1.26
@@ -1,11 +1,11 @@
 %define nss_version 3.10
 %define cairo_version 1.3.12
-%define prerelease a6pre
+%define prerelease a6
 
 Summary:        XUL Runner
 Name:           xulrunner
 Version:        1.9
-Release:        0.9.%{?dist}
+Release:        0.9.%{prerelease}%{?dist}
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -59,7 +59,7 @@
 XUL Runner devel is...
 
 %prep
-%setup -q -n xulrunner-%{version}
+%setup -q -n xulrunner-%{version}%{prerelease}
 
 %patch1 -p0 -b .no-native-theme
 %patch2 -p0 -b .dpi



From fedora-extras-commits at redhat.com  Mon Sep 17 18:38:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:38:51 -0400
Subject: rpms/ctapi-cyberjack/FC-6 ctapi-cyberjack.spec,1.29,1.30
Message-ID: <200709171838.l8HIcp2m007474@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393

Modified Files:
	ctapi-cyberjack.spec 
Log Message:
add the right spec file:)



Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/ctapi-cyberjack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ctapi-cyberjack.spec	6 Aug 2007 17:50:30 -0000	1.29
+++ ctapi-cyberjack.spec	17 Sep 2007 18:38:18 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 



From fedora-extras-commits at redhat.com  Mon Sep 17 18:39:15 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 14:39:15 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.19,1.20
Message-ID: <200709171839.l8HIdFf5007523@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7422

Modified Files:
	rpcbind.spec 
Log Message:
Added tcp_wrappers-devel to BuildReq.



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpcbind.spec	15 Sep 2007 17:28:20 -0000	1.19
+++ rpcbind.spec	17 Sep 2007 18:38:43 -0000	1.20
@@ -16,7 +16,7 @@
 Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
-BuildRequires: libtirpc-devel quota
+BuildRequires: libtirpc-devel, quota, tcp_wrappers-devel
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(post): /sbin/chkconfig



From fedora-extras-commits at redhat.com  Mon Sep 17 18:39:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:39:50 -0400
Subject: rpms/gnome-keyring/devel .cvsignore, 1.31, 1.32 gnome-keyring.spec, 
	1.54, 1.55 sources, 1.31, 1.32
Message-ID: <200709171839.l8HIdosp007588@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7521

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Sep 2007 05:07:06 -0000	1.31
+++ .cvsignore	17 Sep 2007 18:39:17 -0000	1.32
@@ -1 +1 @@
-gnome-keyring-2.19.91.tar.bz2
+gnome-keyring-2.20.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-keyring.spec	4 Sep 2007 05:07:06 -0000	1.54
+++ gnome-keyring.spec	17 Sep 2007 18:39:17 -0000	1.55
@@ -2,11 +2,11 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Sep 2007 05:07:06 -0000	1.31
+++ sources	17 Sep 2007 18:39:17 -0000	1.32
@@ -1 +1 @@
-31859dc08b8034fe95a32d461904ce52  gnome-keyring-2.19.91.tar.bz2
+f37c71974323cc79f59e274d97110047  gnome-keyring-2.20.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:40:40 2007
From: fedora-extras-commits at redhat.com (Steve Dickson (steved))
Date: Mon, 17 Sep 2007 14:40:40 -0400
Subject: rpms/rpcbind/F-7 rpcbind.spec,1.21,1.22
Message-ID: <200709171840.l8HIeeQb007659@cvs-int.fedora.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/rpcbind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7594

Modified Files:
	rpcbind.spec 
Log Message:
Added tcp_wrappers-devel to BuildReq



Index: rpcbind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpcbind/F-7/rpcbind.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rpcbind.spec	15 Sep 2007 17:27:56 -0000	1.21
+++ rpcbind.spec	17 Sep 2007 18:40:08 -0000	1.22
@@ -16,7 +16,7 @@
 Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
-BuildRequires: libtirpc-devel quota
+BuildRequires: libtirpc-devel, quota, tcp_wrappers-devel
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel 
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel 
 Requires(post): /sbin/chkconfig



From fedora-extras-commits at redhat.com  Mon Sep 17 18:42:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:42:07 -0400
Subject: rpms/ctapi-cyberjack/F-7 .cvsignore, 1.11, 1.12 ctapi-cyberjack.spec,
	1.30, 1.31 sources, 1.11, 1.12
Message-ID: <200709171842.l8HIg7bB007754@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7722

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Jul 2007 07:01:51 -0000	1.11
+++ .cvsignore	17 Sep 2007 18:41:34 -0000	1.12
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/ctapi-cyberjack.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ctapi-cyberjack.spec	6 Aug 2007 17:52:24 -0000	1.30
+++ ctapi-cyberjack.spec	17 Sep 2007 18:41:34 -0000	1.31
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jul 2007 07:01:51 -0000	1.11
+++ sources	17 Sep 2007 18:41:34 -0000	1.12
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:44:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 14:44:48 -0400
Subject: rpms/evince/devel .cvsignore, 1.37, 1.38 evince.spec, 1.92,
	1.93 sources, 1.36, 1.37
Message-ID: <200709171844.l8HIimAp007884@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7829

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	4 Sep 2007 16:41:10 -0000	1.37
+++ .cvsignore	17 Sep 2007 18:44:15 -0000	1.38
@@ -1 +1 @@
-evince-2.19.92.tar.bz2
+evince-2.20.0.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- evince.spec	4 Sep 2007 16:41:10 -0000	1.92
+++ evince.spec	17 Sep 2007 18:44:15 -0000	1.93
@@ -4,14 +4,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.19.92
+Version:	2.20.0
 Release:	1%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
 Group:		Applications/Publishing
 URL:		http://www.gnome.org/projects/evince/
-Source0: 	http://download.gnome.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2
+Source0: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 Patch0:		evince-0.6.0-print-error.patch
 #Patch1:		evince-0.9.0-comics-compile-fixes.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Kristian H??gsberg <krh at redhat.com> - 2.19.92-1
 - Update to 2.19.92.  Evince now follows GNOME version numbers.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 16:41:10 -0000	1.36
+++ sources	17 Sep 2007 18:44:15 -0000	1.37
@@ -1 +1 @@
-274db35fee7c46b7d081e1ae86f495c2  evince-2.19.92.tar.bz2
+f9414b4dbfdff9a8f7f2f146a351e05a  evince-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 18:44:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:44:59 -0400
Subject: rpms/ctapi-cyberjack/EL-5 .cvsignore, 1.10,
	1.11 ctapi-cyberjack.spec, 1.28, 1.29 sources, 1.10, 1.11
Message-ID: <200709171844.l8HIixOo007889@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7836

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jul 2007 07:04:13 -0000	1.10
+++ .cvsignore	17 Sep 2007 18:44:27 -0000	1.11
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/ctapi-cyberjack.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ctapi-cyberjack.spec	6 Aug 2007 17:54:17 -0000	1.28
+++ ctapi-cyberjack.spec	17 Sep 2007 18:44:27 -0000	1.29
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Jul 2007 07:04:13 -0000	1.10
+++ sources	17 Sep 2007 18:44:27 -0000	1.11
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:47:14 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Mon, 17 Sep 2007 14:47:14 -0400
Subject: rpms/ctapi-cyberjack/EL-4 .cvsignore, 1.11,
	1.12 ctapi-cyberjack.spec, 1.29, 1.30 sources, 1.11, 1.12
Message-ID: <200709171847.l8HIlEDI009378@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8388

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Jul 2007 07:06:19 -0000	1.11
+++ .cvsignore	17 Sep 2007 18:46:41 -0000	1.12
@@ -1 +1 @@
-ctapi-cyberjack-3.0.3.tar.gz
+ctapi-cyberjack-3.0.4.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/ctapi-cyberjack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ctapi-cyberjack.spec	6 Aug 2007 17:56:45 -0000	1.29
+++ ctapi-cyberjack.spec	17 Sep 2007 18:46:41 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.3
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	1%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Sep 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.4-1
+ - update to 3.0.4
+
 *Mon Aug 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.3-3
  - apply fix only for F7 an newer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jul 2007 07:06:19 -0000	1.11
+++ sources	17 Sep 2007 18:46:41 -0000	1.12
@@ -1 +1 @@
-a8339cdef79af6eb92e830de2f7de965  ctapi-cyberjack-3.0.3.tar.gz
+60fb13dce3ac07f8994c5b72a044765b  ctapi-cyberjack-3.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 18:51:14 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 14:51:14 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.26,1.27
Message-ID: <200709171851.l8HIpEsk010964@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330

Modified Files:
	xulrunner.spec 
Log Message:
fix source


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xulrunner.spec	17 Sep 2007 18:37:44 -0000	1.26
+++ xulrunner.spec	17 Sep 2007 18:50:41 -0000	1.27
@@ -9,7 +9,7 @@
 URL:            http://dev.laptop.org/pub/sugar/xulrunner
 License:        MPL/LGPL
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}.tar.bz2
+Source0:        xulrunner-%{version}%{prerelease}.tar.bz2
 Source10:       xulrunner-mozconfig
 Source12:       xulrunner-olpc-default-prefs.js
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:01:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:01:54 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.100,1.101
Message-ID: <200709171901.l8HJ1sro018770@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913

Modified Files:
	libgnome.spec 
Log Message:
don't ship backgrounds in libgnome



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- libgnome.spec	17 Sep 2007 18:06:08 -0000	1.100
+++ libgnome.spec	17 Sep 2007 19:01:15 -0000	1.101
@@ -137,6 +137,10 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.gnome2
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=477846
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 %find_lang %{po_package}
 
 %clean



From fedora-extras-commits at redhat.com  Mon Sep 17 19:03:07 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 17 Sep 2007 15:03:07 -0400
Subject: rpms/httpd/devel httpd-2.2.6-ssllibver.patch, NONE, 1.1 httpd.conf, 
	1.24, 1.25 httpd.spec, 1.115, 1.116 index.html, 1.24,
	1.25 powered_by_fedora.png, 1.2, NONE
Message-ID: <200709171903.l8HJ37mf018868@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18804

Modified Files:
	httpd.conf httpd.spec index.html 
Added Files:
	httpd-2.2.6-ssllibver.patch 
Removed Files:
	powered_by_fedora.png 
Log Message:
* Mon Sep 17 2007 Joe Orton <jorton at redhat.com> 2.2.6-3
- add fix for SSL library string regression (PR 43334)
- use powered-by logo from system-logos (#250676)
- preserve timestamps for installed config files


httpd-2.2.6-ssllibver.patch:

--- NEW FILE httpd-2.2.6-ssllibver.patch ---
--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_private.h
@@ -648,7 +648,7 @@ void         ssl_die(void);
 void         ssl_log_ssl_error(const char *, int, int, server_rec *);
 
 /**  Variables  */
-void         ssl_var_register(void);
+void         ssl_var_register(apr_pool_t *p);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
 
--- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
+++ httpd-2.2.6/modules/ssl/mod_ssl.c
@@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
     ap_hook_insert_filter (ssl_hook_Insert_Filter, NULL,NULL, APR_HOOK_MIDDLE);
 /*    ap_hook_handler       (ssl_hook_Upgrade,       NULL,NULL, APR_HOOK_MIDDLE); */
 
-    ssl_var_register();
+    ssl_var_register(p);
 
     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
--- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
@@ -58,12 +58,30 @@ static int ssl_is_https(conn_rec *c)
     return sslconn && sslconn->ssl;
 }
 
-void ssl_var_register(void)
+static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
+static char var_library_interface[] = SSL_LIBRARY_TEXT;
+static char *var_library = NULL;
+
+void ssl_var_register(apr_pool_t *p)
 {
     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
     APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
-    return;
+
+    /* Perform once-per-process library version determination: */
+    var_library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
+    
+    if ((cp = strchr(var_library, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+                *cp2 = NUL;
+    }
+
+    if ((cp = strchr(var_library_interface, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+            *cp2 = NUL;
+    }
 }
 
 /* This function must remain safe to use for a non-SSL connection. */
@@ -635,34 +653,14 @@ static void ssl_var_lookup_ssl_cipher_bi
 
 static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
 {
-    static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
-    static char library_interface[] = SSL_LIBRARY_TEXT;
-    static char *library = NULL;
-    char *result;
-  
-    if (!library) {
-        char *cp, *cp2;
-        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-        if ((cp = strchr(library, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-        if ((cp = strchr(library_interface, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-    }
-
     if (strEQ(var, "INTERFACE")) {
-        result = apr_pstrdup(p, interface);
+        result = apr_pstrdup(p, var_interface);
     }
     else if (strEQ(var, "LIBRARY_INTERFACE")) {
-        result = apr_pstrdup(p, library_interface);
+        result = apr_pstrdup(p, var_library_interface);
     }
     else if (strEQ(var, "LIBRARY")) {
-        result = apr_pstrdup(p, library);
+        result = apr_pstrdup(p, var_library);
     }
     else {
         result = NULL;


Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- httpd.conf	3 Feb 2006 10:06:08 -0000	1.24
+++ httpd.conf	17 Sep 2007 19:02:35 -0000	1.25
@@ -538,7 +538,7 @@
 Alias /icons/ "/var/www/icons/"
 
 <Directory "/var/www/icons">
-    Options Indexes MultiViews
+    Options Indexes MultiViews FollowSymLinks
     AllowOverride None
     Order allow,deny
     Allow from all


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- httpd.spec	7 Sep 2007 18:48:27 -0000	1.115
+++ httpd.spec	17 Sep 2007 19:02:35 -0000	1.116
@@ -6,14 +6,13 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.6
-Release: 2
+Release: 3
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
 Source3: httpd.logrotate
 Source4: httpd.init
 Source5: httpd.sysconf
-Source7: powered_by_fedora.png
 Source10: httpd.conf
 Source11: ssl.conf
 Source12: welcome.conf
@@ -37,13 +36,14 @@
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
 Patch55: httpd-2.2.4-oldflush.patch
+Patch56: httpd-2.2.6-ssllibver.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, pkgconfig, findutils, ed
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36, /etc/mime.types
+Requires: initscripts >= 8.36, /etc/mime.types, system-logos >= 7.92.1-1
 Obsoletes: httpd-suexec
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
@@ -124,6 +124,7 @@
 
 %patch54 -p1 -b .authnoprov
 %patch55 -p1 -b .oldflush
+%patch56 -p1 -b .ssllibver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -226,15 +227,16 @@
 install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
 for f in ssl.conf welcome.conf manual.conf proxy_ajp.conf; do
-  install -m 644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
+  install -m 644 -p $RPM_SOURCE_DIR/$f \
+        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
 done
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
-install -m 644 $RPM_SOURCE_DIR/httpd.conf \
+install -m -p 644 $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 $RPM_SOURCE_DIR/httpd.sysconf \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.sysconf \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/httpd
 
 # for holding mod_dav lock database
@@ -256,8 +258,7 @@
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
-install -m 644 $RPM_SOURCE_DIR/index.html \
-	$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
+install -m 644 noindex.html $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 
 # remove manual sources
 find $RPM_BUILD_ROOT%{contentdir}/manual \( \
@@ -274,8 +275,9 @@
 done
 set -x
 
-install -m 644 $RPM_SOURCE_DIR/powered_by_fedora.png \
-	$RPM_BUILD_ROOT%{contentdir}/icons
+# Symlink for the powered-by-$DISTRO image:
+ln -s ../../..%{_datadir}/pixmaps/poweredby.png \
+        $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
 
 # logs
 rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
@@ -293,7 +295,7 @@
 
 # install log rotation stuff
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m644 $RPM_SOURCE_DIR/httpd.logrotate \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
 	$RPM_BUILD_ROOT/etc/logrotate.d/httpd
 
 # fix man page paths
@@ -476,6 +478,11 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Sep 17 2007 Joe Orton <jorton at redhat.com> 2.2.6-3
+- add fix for SSL library string regression (PR 43334)
+- use powered-by logo from system-logos (#250676)
+- preserve timestamps for installed config files
+
 * Fri Sep  7 2007 Joe Orton <jorton at redhat.com> 2.2.6-2
 - update to 2.2.6 (#250757, #282761)
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/index.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- index.html	9 May 2007 10:18:59 -0000	1.24
+++ index.html	17 Sep 2007 19:02:35 -0000	1.25
@@ -115,7 +115,7 @@
 					<div class="logos">
 						<p>You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!</p>
 
-						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
+						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/poweredby.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
 					</div>
 				</div>
 			</div>



From fedora-extras-commits at redhat.com  Mon Sep 17 19:10:19 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 17 Sep 2007 15:10:19 -0400
Subject: rpms/kernel/devel linux-2.6-x86-debug-edd.patch,1.1,1.2
Message-ID: <200709171910.l8HJAJ1A019088@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19067

Modified Files:
	linux-2.6-x86-debug-edd.patch 
Log Message:
Better EDD debugging


linux-2.6-x86-debug-edd.patch:

Index: linux-2.6-x86-debug-edd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-debug-edd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-debug-edd.patch	14 Sep 2007 16:23:47 -0000	1.1
+++ linux-2.6-x86-debug-edd.patch	17 Sep 2007 19:10:14 -0000	1.2
@@ -1,14 +1,62 @@
----
- arch/i386/boot/edd.c |    1 +
- 1 file changed, 1 insertion(+)
-
 --- linux-2.6.22.noarch.orig/arch/i386/boot/edd.c
 +++ linux-2.6.22.noarch/arch/i386/boot/edd.c
-@@ -151,6 +151,7 @@ void query_edd(void)
- 		 * Scan the BIOS-supported hard disks and query EDD
- 		 * information...
- 		 */
-+		putchar('0' + (devno - 0x80) % 10);
- 		get_edd_info(devno, &ei);
+@@ -26,6 +26,7 @@ static int read_mbr(u8 devno, void *buf)
+ {
+ 	u16 ax, bx, cx, dx;
  
- 		if (boot_params.eddbuf_entries < EDDMAXNR) {
++	printf("Calling Int 13 Fn 0x0201 with buffer @%x ...\n", buf);
+ 	ax = 0x0201;		/* Legacy Read, one sector */
+ 	cx = 0x0001;		/* Sector 0-0-1 */
+ 	dx = devno;
+@@ -33,6 +34,7 @@ static int read_mbr(u8 devno, void *buf)
+ 	asm volatile("pushfl; stc; int $0x13; setc %%al; popfl"
+ 		     : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
+ 		     : : "esi", "edi", "memory");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x\n", ax, bx, cx, dx);
+ 
+ 	return -(u8)ax;		/* 0 or -1 */
+ }
+@@ -75,12 +77,14 @@ static int get_edd_info(u8 devno, struct
+ 
+ 	/* Check Extensions Present */
+ 
++	printf("\nDevice %x: calling Int 13 Fn 0x4100 ...\n", dx);
+ 	ax = 0x4100;
+ 	bx = EDDMAGIC1;
+ 	dx = devno;
+ 	asm("pushfl; stc; int $0x13; setc %%al; popfl"
+ 	    : "+a" (ax), "+b" (bx), "=c" (cx), "+d" (dx)
+ 	    : : "esi", "edi");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x\n", ax, bx, cx, dx);
+ 
+ 	if ((u8)ax)
+ 		return -1;	/* No extended information */
+@@ -94,6 +98,7 @@ static int get_edd_info(u8 devno, struct
+ 
+ 	/* Extended Get Device Parameters */
+ 
++	printf("Calling Int 13 Fn 0x4800 with buffer @%x ...\n", &ei->params);
+ 	ei->params.length = sizeof(ei->params);
+ 	ax = 0x4800;
+ 	dx = devno;
+@@ -101,10 +106,12 @@ static int get_edd_info(u8 devno, struct
+ 	    : "+a" (ax), "+d" (dx), "=m" (ei->params)
+ 	    : "S" (&ei->params)
+ 	    : "ebx", "ecx", "edi");
++	printf(" result: ax=%x dx=%x\n", ax, dx);
+ 
+ 	/* Get legacy CHS parameters */
+ 
+ 	/* Ralf Brown recommends setting ES:DI to 0:0 */
++	printf("Calling Int 13 Fn 0x0800 ...\n");
+ 	ax = 0x0800;
+ 	dx = devno;
+ 	di = 0;
+@@ -114,6 +121,7 @@ static int get_edd_info(u8 devno, struct
+ 	    "popw %%es"
+ 	    : "+a" (ax), "=b" (bx), "=c" (cx), "+d" (dx), "+D" (di)
+ 	    : : "esi");
++	printf(" result: ax=%x bx=%x cx=%x dx=%x di=%x\n", ax, bx, cx, dx, di);
+ 
+ 	if ((u8)ax == 0) {
+ 		ei->legacy_max_cylinder = (cx >> 8) + ((cx & 0xc0) << 2);



From fedora-extras-commits at redhat.com  Mon Sep 17 19:10:52 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:10:52 -0400
Subject: comps/po ne.po,NONE,1.1 pt_BR.po,1.6,1.7
Message-ID: <200709171910.l8HJAqOD019110@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19020

Modified Files:
	pt_BR.po 
Added Files:
	ne.po 
Log Message:
add ne.po, refresh-po



--- NEW FILE ne.po ---
# translation of ne.po to Nepali
# Nabin Gautam <nabin at mpp.org.np>, 2007.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
msgid ""
msgstr ""
"Project-Id-Version: ne\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-05 02:14-0400\n"
"PO-Revision-Date: 2007-08-16 16:07+0545\n"
"Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
"Language-Team: Nepali <info at mpp.org.np>\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"
"\n"
"\n"
"\n"
"X-Generator: KBabel 1.11.4\n"

#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
#: ../comps-f8.xml.in.h:1
msgid "A lightweight desktop environment that works well on low end machines."
msgstr "??????????????? ?????????????????? ???????????? ????????????????????? ??????????????????????????? ??????????????? ??????????????? ??????????????? ????????????????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
msgid "Administration Tools"
msgstr "????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
msgid "Applications"
msgstr "???????????????????????????"

#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
#: ../comps-el5.xml.in.h:3
msgid "Applications for a variety of tasks"
msgstr "????????????????????? ??????????????????????????? ???????????? ???????????????????????????"

#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
msgid "Arabic Support"
msgstr "???????????? ??????????????????"

#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
msgid "Armenian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
msgid "Authoring and Publishing"
msgstr "???????????? ????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
msgid "Base System"
msgstr "???????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
msgid "Desktop Environments"
msgstr "????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
msgid "Desktop environments"
msgstr "????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
msgid "Development"
msgstr "???????????????"

#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
msgid "Development Tools"
msgstr "??????????????? ???????????????"

#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
#: ../comps-el5.xml.in.h:13
msgid "Dialup Networking Support"
msgstr "?????????????????? ?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
msgid "Editors"
msgstr "?????????????????????"

#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
msgid "Educational Software"
msgstr "????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
msgid "Educational software for learning"
msgstr "???????????????????????? ???????????? ????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
msgid "Engineering and Scientific"
msgstr "????????????????????????????????? ??? ???????????????????????????"

#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
msgid "FTP Server"
msgstr "FTP ???????????????"

#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51
#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19
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 ""
"???????????? ???????????????????????? ???????????? ??????????????? ???????????? ??? ????????????????????????????????? ???????????? ???????????? ????????????, ?????? ????????????????????? ?????????????????? ??????????????????????????? "
"???????????????????????? ??????????????? ??? ??????????????????????????? ??????????????? ???????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
msgid "GNOME Desktop Environment"
msgstr "??????????????? ????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53
#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21
msgid "GNOME Software Development"
msgstr "??????????????? ???????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21
#: ../comps-el5.xml.in.h:22
msgid ""
"GNOME is a powerful, graphical user interface which includes a panel, "
"desktop, system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57
#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23
msgid "Games and Entertainment"
msgstr "????????? ??? ????????????????????????"

#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60
#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
msgid "Graphical Internet"
msgstr "???????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61
#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
msgid "Graphics"
msgstr "???????????????????????????"

#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64
#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
msgid "Hardware Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
#: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
msgid "Hebrew Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70
#: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
msgid ""
"Install these packages in order to develop GTK+ and GNOME graphical "
"applications."
msgstr "GTK+ ??? ??????????????? ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
#: ../comps-f8.xml.in.h:74
msgid ""
"Install these packages in order to develop GTK+ and XFCE graphical "
"applications."
msgstr "GTK+ ??? XFCE ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
#: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
msgid "Install these packages to develop QT and KDE graphical applications."
msgstr "?????????????????? ??? ??????????????? ???????????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
#: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
msgid ""
"Install this group of packages to use the base graphical (X) user interface."
msgstr ""
"???????????? ???????????????????????? (X) ????????????????????????????????? ???????????????????????? ?????????????????? ???????????? ?????? ??????????????????????????? ???????????? ????????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
#: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
msgid "Japanese Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83
#: ../comps-el4.xml.in.h:30
msgid "Java"
msgstr "????????????"

#: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84
#: ../comps-el4.xml.in.h:31
msgid "Java Development"
msgstr "???????????? ???????????????"

#: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
#: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
msgid "KDE (K Desktop Environment)"
msgstr "??????????????? (??????????????? ????????????????????? ??????????????????)"

#: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
#: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
msgid "KDE Software Development"
msgstr "??????????????? ???????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34
#: ../comps-el5.xml.in.h:34
msgid ""
"KDE is a powerful, graphical user interface which includes a panel, desktop, "
"system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94
#: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
msgid "Mail Server"
msgstr "???????????? ???????????????"

#: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100
#: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
msgid "Network Servers"
msgstr "?????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101
#: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
msgid "News Server"
msgstr "?????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104
#: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
msgid "Office/Productivity"
msgstr "????????????????????????/??????????????????????????????"

#: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106
#: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
msgid ""
"Packages which provide functionality for developing and building "
"applications."
msgstr "??????????????????????????? ??????????????? ???????????? ??? ????????????????????? ???????????? ???????????????????????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:43 ../comps-fe6.xml.in.h:42 ../comps-f7.xml.in.h:119
#: ../comps-f8.xml.in.h:128 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
msgid "Servers"
msgstr "???????????????"

#: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
#: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
msgid ""
"Simple window managers that aren't part of a larger desktop environment."
msgstr "???????????? ????????????????????? ???????????????????????? ????????? ??????????????? ????????????????????? ???????????????????????? ???????????????????????? ???"

#: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
#: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
msgid "Software used for running network servers"
msgstr "?????????????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:46 ../comps-fe6.xml.in.h:45 ../comps-el4.xml.in.h:43
#: ../comps-el5.xml.in.h:43
msgid ""
"Sometimes called text editors, these are programs that allow you to create "
"and edit files. These include Emacs and Vi."
msgstr ""
"?????????????????????????????? ?????? ?????????????????? ????????? ?????????????????????, ???????????????????????? ???????????? ????????????????????? ???????????? ??? ????????????????????? ???????????? ?????????????????? "
"???????????? ??????????????????????????? ???????????? ??? ??????????????????????????? ?????????????????? ??? Vi ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128
#: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
msgid "Sound and Video"
msgstr "??????????????? ??? ??????????????????"

#: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
#: ../comps-el4.xml.in.h:45
msgid "Support for developing programs in the Java programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ???????????? ?????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
#: ../comps-el4.xml.in.h:46
msgid "Support for running programs written in the Java programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ????????????????????? ??????????????????????????? ????????????????????? ???????????? ?????????????????? ??????????????????????????? ???"

#: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136
#: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45
msgid "System Tools"
msgstr "????????????????????? ???????????????"

#: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140
#: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
msgid "Text-based Internet"
msgstr "?????????-?????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49
#: ../comps-el5.xml.in.h:47
msgid "The XEmacs text editor."
msgstr "???????????? ?????????????????? ????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143
#: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
msgid "The applications include office suites, PDF viewers, and more."
msgstr "?????? ????????????????????????????????? ???????????? ?????????, PDF ??????????????? ??? ????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
#: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
msgid "These packages allow you to configure an IMAP or SMTP mail server."
msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? SMTP ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
#: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
msgid ""
"These packages are helpful when developing web applications or web pages."
msgstr "?????? ????????????????????? ????????? ??????????????????????????? ?????? ????????? ??????????????? ??????????????? ??????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
#: ../comps-el5.xml.in.h:51
msgid ""
"These tools allow you to create documentation in the DocBook format and "
"convert them to HTML, PDF, Postscript, and text."
msgstr ""
"?????? ????????????????????? ???????????????????????? DocBook ????????????????????? ??????????????????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ??? "
"?????????????????????????????? ????????????????????????, ??????????????????, ??????????????????????????????????????????, ??? ??????????????? ??????????????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
#: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
msgid "These tools allow you to run a Web server on the system."
msgstr "?????? ????????????????????? ???????????????????????? ??????????????????????????? ????????? ??????????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
#: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
msgid "These tools allow you to run an FTP server on the system."
msgstr "?????? ????????????????????? ???????????????????????? ??????????????????????????? FTP ??????????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
#: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
msgid ""
"These tools include core development tools such as automake, gcc, perl, "
"python, and debuggers."
msgstr ""
"?????? ????????????????????? ??????????????????, gcc, ????????????, ??????????????????, ??? ?????????????????????????????? ??????????????? ??????????????? ??????????????? ??????????????? ?????????????????? "
"????????????????????? ???"

#: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
#: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
msgid "This group allows you to configure the system as a news server."
msgstr "?????? ?????????????????? ???????????????????????? ????????????????????? ???????????? ????????????????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
#: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
msgid "This group includes graphical email, Web, and chat clients."
msgstr "?????? ?????????????????? ???????????????????????? ????????????, ?????????, ??? ??????????????? ???????????????????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
#: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
msgid ""
"This group includes packages for performing mathematical and scientific "
"computations and plotting, as well as unit conversion."
msgstr ""
"?????? ?????????????????? ?????????????????? ??? ??????????????????????????? ???????????? ??? ??????????????????, ????????????????????? ???????????? ????????????????????????????????? ???????????? ????????????????????? ?????????????????? "
"??????????????? ???"

#: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
#: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
msgid "This group includes packages to help you manipulate and scan images."
msgstr "?????? ?????????????????? ???????????????????????? ????????? ????????????????????????????????? ??? ????????????????????? ???????????? ??????????????? ??????????????? ????????????????????? ?????????????????? ??????????????? ???"

#: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
#: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
msgid ""
"This group includes text-based email, Web, and chat clients. These "
"applications do not require the X Window System."
msgstr ""
"?????? ?????????????????? ??????????????? ?????????????????? ????????????, ????????? ??? ??????????????? ???????????????????????? ?????????????????? ??????????????? ??? ?????? ???????????????????????????????????? X "
"???????????????????????? ????????????????????? ?????????????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
#: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
msgid ""
"This group is a collection of graphical administration tools for the system, "
"such as for managing user accounts and configuring system hardware."
msgstr ""
"?????? ????????????, ????????????????????????????????? ???????????? ????????????????????? ??????????????? ??? ????????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????????????? ??????????????????????????? "
"???????????? ???????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
#: ../comps-el5.xml.in.h:61
#, fuzzy
msgid "This group is a collection of network servers for specific purposes"
msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
#: ../comps-el5.xml.in.h:62
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Arabic environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
#: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
msgid ""
"This group is a collection of tools and resources of Armenian environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
#: ../comps-el5.xml.in.h:65
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Hebrew environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
#: ../comps-el5.xml.in.h:66
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Japanese environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
#: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
msgid ""
"This group is a collection of tools for various hardware specific utilities."
msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
#: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
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 ""
"?????? ????????????, ????????????????????????????????? SMB ?????????????????????????????? ???????????? ??????????????? ??? ?????????????????? ????????????????????? ?????????????????? ??????????????? ??????????????? ??????????????? "
"??????????????????????????? ???????????? ????????????????????? ????????????????????? ?????????????????? ?????? ???"

#: ../comps-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179
#: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
msgid "Various core pieces of the system."
msgstr "??????????????????????????? ????????????????????? ????????? ?????????????????? ???"

#: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
#: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
msgid "Various ways to relax and spend your free time."
msgstr "??????????????? ??????????????? ??? ????????????????????? ?????????????????? ????????? ????????????????????? ????????????????????? ???????????????????????? ???"

#: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
#: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
msgid "Web Development"
msgstr "????????? ???????????????"

#: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
#: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
msgid "Web Server"
msgstr "????????? ???????????????"

#: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187
#: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
msgid "Window Managers"
msgstr "???????????????????????? ????????????????????????"

#: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
#: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
msgid "X Window System"
msgstr "X ???????????????????????? ?????????????????????"

#: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75
#: ../comps-el5.xml.in.h:75
msgid "XEmacs"
msgstr "X ??????????????????"

#: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
#: ../comps-f8.xml.in.h:199
msgid "XFCE"
msgstr "XFCE"

#: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192
#: ../comps-f8.xml.in.h:200
msgid "XFCE Software Development"
msgstr "XFCE ???????????????????????? ???????????????"

#: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29
#: ../comps-el5.xml.in.h:8
msgid "Czech Support"
msgstr "????????? ??????????????????"

#: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
#, fuzzy
msgid ""
"This group is a collection of tools and resources of Czech environments."
msgstr "?????? ???????????? ????????????????????????????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
msgid "Afrikaans Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
#, fuzzy
msgid "Albanian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
msgid "Applications to perform a variety of tasks"
msgstr "????????????????????? ????????????????????? ????????????????????? ??????????????? ???????????????????????????"

#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9
msgid "Assamese Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11
msgid "Base"
msgstr "????????????"

#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13
msgid "Basic support for the Ruby programming language."
msgstr "???????????? ????????????????????????????????? ?????????????????? ???????????? ????????????????????? ?????????????????? ???"

#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14
msgid "Basque Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
#, fuzzy
msgid "Belarusian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
msgid "Bengali Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
#, fuzzy
msgid "Bhutanese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
#, fuzzy
msgid "Bosnian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
msgid "Brazilian Portuguese Support"
msgstr "?????????????????????????????? ?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
msgid "Breton Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22
msgid "Bulgarian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23
msgid "Catalan Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24
msgid "Chinese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25
msgid "Clustering"
msgstr "?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26
msgid "Clustering Support"
msgstr "?????????????????? ?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27
msgid "Core"
msgstr "?????????"

#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28
msgid "Croatian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
msgid "DNS Name Server"
msgstr "DNS ????????? ???????????????"

#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
msgid "Danish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35
msgid "Development Libraries"
msgstr "??????????????? ???????????????????????????"

#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37
msgid "Dial-up Networking Support"
msgstr "????????????-?????? ??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38
msgid "Dutch Support"
msgstr "?????? ??????????????????"

#: ../comps-f7.xml.in.h:38
msgid "Eclipse"
msgstr "????????????????????????"

#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43
msgid "English (UK) Support"
msgstr "??????????????????????????? (?????????????????????) ??????????????????"

#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44
msgid "Estonian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45
msgid "Ethiopic Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47
msgid "Faeroese Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
#, fuzzy
msgid "Filipino Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
msgid "Finnish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53
msgid "French Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57
msgid ""
"GNOME is a powerful graphical user interface which includes a panel, "
"desktop, system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????? "
"??????????????????????????? ???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58
msgid "Gaelic Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59
msgid "Galician Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
#, fuzzy
msgid "Georgian Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
msgid "German Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65
msgid "Greek Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66
msgid "Gujarati Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69
msgid "Hindi Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70
msgid "Hungarian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71
msgid "Icelandic Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72
msgid "Indonesian Support"
msgstr "??????????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
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:79
#, fuzzy
msgid "Inuktitut Support"
msgstr "???????????? ??????????????????"

#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
msgid "Irish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81
msgid "Italian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87
msgid ""
"KDE is a powerful graphical user interface which includes a panel, desktop, "
"system icons, and a graphical file manager."
msgstr ""
"??????????????? ??????????????????, ?????????????????????, ????????????????????? ?????????????????????, ??? ???????????????????????? ???????????? ???????????????????????? ???????????????????????? ??????????????? ??????????????????????????? "
"???????????????????????? ????????????????????????????????? ???????????????????????? ?????? ???"

#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88
msgid "Kannada Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
#, fuzzy
msgid "Khmer Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
msgid "Korean Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91
msgid "Languages"
msgstr "????????????"

#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
#, fuzzy
msgid "Lao Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
#, fuzzy
msgid "Latvian Support"
msgstr "????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
msgid "Legacy Network Server"
msgstr "?????????????????? ?????????????????? ???????????????"

#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96
msgid "Legacy Software Development"
msgstr "?????????????????? ???????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97
msgid "Legacy Software Support"
msgstr "?????????????????? ???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98
msgid "Lithuanian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101
msgid "Malay Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102
msgid "Malayalam Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
#, fuzzy
msgid "Maori Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
msgid "Marathi Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106
msgid "MySQL Database"
msgstr "MySQL ?????????????????????"

#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110
msgid "Northern Sotho Support"
msgstr "?????????????????? ???????????? ??????????????????"

#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111
msgid "Norwegian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114
msgid "Oriya Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
#, fuzzy
msgid "Persian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
msgid "Polish Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118
msgid "Portuguese Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119
msgid "PostgreSQL Database"
msgstr "??????????????????????????? SQL ?????????????????????"

#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120
msgid "Printing Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121
msgid "Punjabi Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122
msgid "Romanian Support"
msgstr "?????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123
msgid "Ruby"
msgstr "????????????"

#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124
msgid "Russian Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
#, fuzzy
msgid "Samoan Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
msgid "Serbian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127
msgid "Server Configuration Tools"
msgstr "??????????????? ?????????????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130
msgid "Sinhala Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131
msgid "Slovak Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132
msgid "Slovenian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133
msgid "Smallest possible installation"
msgstr "???????????????????????? ???????????????????????? ???????????? ?????????????????????"

#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
#, fuzzy
msgid "Somali Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
msgid ""
"Sometimes called text editors, these are programs that allow you to create "
"and edit text files. This includes Emacs and Vi."
msgstr ""
"?????? ??????????????????????????? ???????????????????????? ????????? ???????????? ????????????????????? ???????????? ??? ????????????????????? ???????????? ?????????????????? ????????????, ??????????????????????????? ?????? "
"??????????????? ????????? ????????????????????? ???????????? ??? ???????????? ?????????????????? ??? Vi ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138
msgid "Southern Ndebele Support"
msgstr "????????????????????? ?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139
msgid "Southern Sotho Support"
msgstr "????????????????????? ???????????? ??????????????????"

#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140
msgid "Spanish Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143
msgid "Swati Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144
msgid "Swedish Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
#, fuzzy
msgid "Tagalog Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
msgid "Tamil Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148
msgid "Telugu Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150
msgid "Thai Support"
msgstr "????????? ??????????????????"

#: ../comps-f7.xml.in.h:142
msgid "The Eclipse Integrated Development Environment."
msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
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
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
msgid ""
"These packages include network-based servers such as DHCP, Kerberos and NIS."
msgstr "?????? ???????????????????????????????????? ?????????????????? ?????????????????? DHCP, ??????????????????????????? ??? NIS ??????????????? ??????????????? ???????????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
msgid ""
"These packages include servers for old network protocols such as rsh and "
"telnet."
msgstr ""
"?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
msgid "These packages provide a virtualization environment."
msgstr "?????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
msgid "These packages provide compatibility with previous releases."
msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
msgid ""
"These packages provide support for various locales including fonts and input "
"methods."
msgstr ""
"?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
msgid ""
"These tools allow you to create documents in the DocBook format and convert "
"them into HTML, PDF, Postscript, and text."
msgstr ""
"?????? ????????????????????? ???????????????????????? DocBook ????????????????????? ?????????????????? ????????????????????? ???????????? ?????????????????? ????????????????????? ??? ?????????????????????????????? "
"????????????????????????, ??????????????????, ??????????????????????????????????????????, ??? ??????????????? ??????????????????????????? ????????????????????? ???"

#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
msgid "This group contains all of Red Hat's custom server configuration tools."
msgstr "?????? ?????????????????? ????????? ????????? ????????????????????? ?????????????????? ??????????????? ?????????????????????????????? ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
msgid ""
"This group includes a minimal set of packages. Useful for creating small "
"router/firewall boxes, for example."
msgstr ""
"?????? ?????????????????? ??????????????????????????? ????????????????????? ????????? ???????????????????????? ??????????????? ??? ???????????????????????? ????????????, ???????????? ???????????????/????????????????????? "
"???????????? ????????????????????? ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
msgid ""
"This package group allows you to run a DNS name server (BIND) on the system."
msgstr "?????? ????????????????????? ?????????????????? ???????????????????????? ??????????????????????????? DNS ????????? ??????????????? (BIND) ??????????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
msgid ""
"This package group allows you to share files between Linux and MS Windows"
"(tm) systems."
msgstr ""
"?????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ??? ????????????????????????????????? ?????????????????????(tm) ????????????????????? ??????????????? ???????????? ???????????????????????? "
"???????????? ?????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178
msgid "This package group contains packages useful for use with MySQL."
msgstr "?????? ????????????????????? ?????????????????? MySQL ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
msgid "This package group includes packages useful for use with Postgresql."
msgstr ""
"?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"

#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
msgid "Tibetan Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
#, fuzzy
msgid "Tonga Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
msgid "Tsonga Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183
msgid "Tswana Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184
msgid "Turkish Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185
msgid "Ukrainian Support"
msgstr "???????????????????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
msgid "Urdu Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
msgid "Venda Support"
msgstr "?????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
#, fuzzy
msgid "Vietnamese Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
msgid "Virtualization"
msgstr "???????????????????????????????????????"

#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194
msgid "Welsh Support"
msgstr "??????????????? ??????????????????"

#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196
msgid "Windows File Server"
msgstr "????????????????????? ???????????? ???????????????"

#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197
msgid "X Software Development"
msgstr "X ???????????????????????? ???????????????"

#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201
msgid "Xhosa Support"
msgstr "???????????? ??????????????????"

#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202
msgid "Zulu Support"
msgstr "???????????? ??????????????????"

#: ../comps-f8.xml.in.h:21
msgid "Buildsystem building group"
msgstr ""

#: ../comps-f8.xml.in.h:48
#, fuzzy
msgid "Fedora Eclipse"
msgstr "????????????????????????"

#: ../comps-f8.xml.in.h:51
msgid "Fonts"
msgstr ""

#: ../comps-f8.xml.in.h:52
msgid "Fonts packages for rendering text on the desktop."
msgstr ""

#: ../comps-f8.xml.in.h:78
#, fuzzy
msgid "Integrated Development Environments based on Eclipse."
msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"

#: ../comps-f8.xml.in.h:94
msgid "Legacy Fonts"
msgstr ""

#: ../comps-f8.xml.in.h:99
#, fuzzy
msgid "Low Saxon Support"
msgstr "???????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:105
#, fuzzy
msgid "Mongolian Support"
msgstr "??????????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:107
#, fuzzy
msgid "Nepali Support"
msgstr "????????????????????? ??????????????????"

#: ../comps-f8.xml.in.h:113
msgid "Older bitmap and vector fonts packages"
msgstr ""

#~ msgid "JBoss Enterprise Application Platform"
#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"

#~ msgid "Packages which comprise the JBoss Enterprise Application Platform"
#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ??????????????? ?????????????????????"

#~ msgid "Brazilian Support"
#~ msgstr "?????????????????????????????? ??????????????????"

#~ msgid "British Support"
#~ msgstr "????????????????????? ??????????????????"

#~ msgid "Compatibility Arch Development Support"
#~ msgstr "??????????????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "Compatibility Arch Mozilla Support"
#~ msgstr "??????????????????????????? ???????????? ?????????????????? ??????????????????"

#~ msgid "Compatibility Arch Support"
#~ msgstr "??????????????????????????? ???????????? ??????????????????"

#~ msgid "Cyrillic Support"
#~ msgstr "????????????????????? ??????????????????"

#~ msgid "Desktops"
#~ msgstr "?????????????????????"

#~ msgid "Emacs"
#~ msgstr "????????????????????????"

#~ msgid "GNOME"
#~ msgstr "???????????????"

#~ msgid "ISO8859-14 Support"
#~ msgstr "ISO8859-14 ??????????????????"

#~ msgid "ISO8859-15 Support"
#~ msgstr "ISO8859-15 ??????????????????"

#~ msgid "ISO8859-2 Support"
#~ msgstr "ISO8859-2 ??????????????????"

#~ msgid "ISO8859-9 Support"
#~ msgstr "ISO8859-9 ??????????????????"

#~ msgid "Install these packages to recompile the kernel."
#~ msgstr "?????????????????? ???????????? ????????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"

#~ msgid "KDE"
#~ msgstr "???????????????"

#~ msgid "KDE Desktop Environment"
#~ msgstr "??????????????? ????????????????????? ??????????????????"

#~ msgid "Kernel Development"
#~ msgstr "?????????????????? ???????????????"

#~ msgid "Miscellaneous Included Packages"
#~ msgstr "??????????????? ???????????????????????? ?????????????????????"

#~ msgid "Mozilla packages for the x86 platform"
#~ msgstr "x86 ????????????????????????????????? ???????????? ?????????????????? ?????????????????????"

#~ msgid "Multilib support packages"
#~ msgstr "???????????????????????? ?????????????????? ?????????????????????"

#~ msgid "SQL Database"
#~ msgstr "SQL ?????????????????????"

#~ msgid "Server"
#~ msgstr "???????????????"

#~ msgid "Support for developing packages for the non-primary architecture"
#~ msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ???????????? ??????????????????"

#~ msgid "Syriac Support"
#~ msgstr "???????????????????????? ??????????????????"

#~ msgid "System"
#~ msgstr "?????????????????????"

#~ msgid "The GNU Emacs text editor."
#~ msgstr "GNU ?????????????????? ????????? ????????????????????? ???"

#~ msgid ""
#~ "These packages allow you to configure an IMAP or Postfix mail server."
#~ msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? Postfix ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "These packages provide compatibility support for previous releases of Red "
#~ "Hat Enterprise Linux."
#~ msgstr ""
#~ "?????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? "
#~ "?????????????????? ????????????????????? ???"

#~ msgid "Unsupported Development Libraries"
#~ msgstr "???????????????????????? ??????????????? ???????????????????????????"

#~ msgid "Workstation Common"
#~ msgstr "???????????? ??????????????????????????????"

#~ msgid "ppc64 Compatibility Arch Support"
#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????????"

#~ msgid "x86 Compatibility Arch Development Support"
#~ msgstr "x86 ?????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "x86 Compatibility Arch Support"
#~ msgstr "x86 ?????????????????? ???????????? ??????????????????"

#~ msgid "Brazilian Portuguese"
#~ msgstr "?????????????????????????????? ??????????????????????????????"

#~ msgid "English"
#~ msgstr "???????????????????????????"

#~ msgid "French"
#~ msgstr "??????????????????????????????"

#~ msgid "German"
#~ msgstr "??????????????????"

#~ msgid "Italian"
#~ msgstr "?????????????????????"

#~ msgid "Red Hat Enterprise Linux 3 Documentation"
#~ msgstr "????????? ???????????? ??????????????????????????????????????? ?????????????????? 3 ???????????????????????????"

#~ msgid "Spanish"
#~ msgstr "??????????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Brazilian Portuguese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? "
#~ "??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "English language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "French language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "German language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Italian language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Spanish language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid "Japanese"
#~ msgstr "??????????????????"

#~ msgid "Korean"
#~ msgstr "????????????????????????"

#~ msgid "Simplified Chinese"
#~ msgstr "????????????????????? ?????????????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Japanese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Korean language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Simplified Chinese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? "
#~ "???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Traditional Chinese language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? "
#~ "??????????????? ???"

#~ msgid "Traditional Chinese"
#~ msgstr "??????????????????????????? ?????????????????????"

#~ msgid "ppc64 Compatibility Arch Development Support"
#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????? ??????????????????"

#~ msgid "Bengali"
#~ msgstr "?????????????????????"

#~ msgid "Gujarati"
#~ msgstr "?????????????????????"

#~ msgid "Hindi"
#~ msgstr "??????????????????"

#~ msgid "Punjabi"
#~ msgstr "?????????????????????"

#~ msgid "Red Hat Enterprise Linux 4 Documentation"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? 4 ???????????????????????????"

#~ msgid "Tamil"
#~ msgstr "???????????????"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Bengali language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Gujarati language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Hindi language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Punjabi language."
#~ msgstr ""
#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid ""
#~ "This group contains the Red Hat Enterprise Linux documentation in the "
#~ "Tamil language."
#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ?????????????????? ??????????????? ???"

#~ msgid "Cluster Storage"
#~ msgstr "???????????? ?????????????????????"

#~ msgid "Clustering Support."
#~ msgstr "?????????????????? ?????????????????? ???"

#~ msgid "Packages which provide support for cluster storage."
#~ msgstr "???????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#~ msgid "Packages which provide support for single-node GFS."
#~ msgstr "????????? ????????? GFS ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"

#~ msgid "Single Node GFS Support"
#~ msgstr "????????? ????????? GFS ??????????????????"

#~ msgid "These packages provide compatibility support with previous releases."
#~ msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"

#~ msgid "Java Runtime Environments and Development Kits"
#~ msgstr "???????????? ?????????????????? ?????????????????? ??? ??????????????? ?????????"

#~ msgid "Misc"
#~ msgstr "???????????????"

#~ msgid "Misc packages"
#~ msgstr "??????????????? ?????????????????????"

#~ msgid "Multimedia"
#~ msgstr "?????????????????????????????????"

#~ msgid "Multimedia applications"
#~ msgstr "????????????????????????????????? ???????????????????????????"

#~ msgid ""
#~ "Packages which provide additional functionality for Red Hat Enterprise "
#~ "Linux"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ???????????????????????? ???????????? ?????? ???????????????????????????????????? ?????????????????? ??????????????? ?????????????????????"

#~ msgid "Red Hat Enterprise Linux Extras"
#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? ???????????????????????????"

#~ msgid "Workstation"
#~ msgstr "??????????????????????????????"

#~ msgid "Workstation applications and utilities."
#~ msgstr "?????????????????????????????? ??????????????????????????? ??? ???????????????????????? ???"

#~ msgid "Virtualization Support."
#~ msgstr "??????????????????????????????????????? ?????????????????? ???"


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 pt_BR.po
Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pt_BR.po	16 Sep 2007 15:13:51 -0000	1.6
+++ pt_BR.po	17 Sep 2007 19:10:21 -0000	1.7
@@ -26,827 +26,594 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-fe5.xml.in.h:1
-#: ../comps-fe6.xml.in.h:1
-#: ../comps-f7.xml.in.h:1
+#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2
-#: ../comps-fe6.xml.in.h:2
-#: ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2
-#: ../comps-el4.xml.in.h:1
-#: ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas Administrativas"
 
-#: ../comps-fe5.xml.in.h:3
-#: ../comps-fe6.xml.in.h:3
-#: ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5
-#: ../comps-el4.xml.in.h:2
-#: ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica????es"
 
-#: ../comps-fe5.xml.in.h:4
-#: ../comps-fe6.xml.in.h:4
-#: ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../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-fe5.xml.in.h:5
-#: ../comps-fe6.xml.in.h:5
-#: ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7
-#: ../comps-el4.xml.in.h:4
-#: ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ?? ??rabe"
 
-#: ../comps-fe5.xml.in.h:6
-#: ../comps-fe6.xml.in.h:6
-#: ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8
-#: ../comps-el4.xml.in.h:5
-#: ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ?? Arm??nio"
 
-#: ../comps-fe5.xml.in.h:7
-#: ../comps-fe6.xml.in.h:7
-#: ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10
-#: ../comps-el4.xml.in.h:6
-#: ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e Publica????o"
 
-#: ../comps-fe5.xml.in.h:8
-#: ../comps-fe6.xml.in.h:8
-#: ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12
-#: ../comps-el4.xml.in.h:7
-#: ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema B??sico"
 
-#: ../comps-fe5.xml.in.h:9
-#: ../comps-fe6.xml.in.h:10
-#: ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32
-#: ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Ambientes de Trabalho"
 
-#: ../comps-fe5.xml.in.h:10
-#: ../comps-fe6.xml.in.h:11
-#: ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33
-#: ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Ambientes de trabalho"
 
-#: ../comps-fe5.xml.in.h:11
-#: ../comps-fe6.xml.in.h:12
-#: ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34
-#: ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:12
-#: ../comps-fe6.xml.in.h:13
-#: ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36
-#: ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Ferramentas de Desenvolvimento"
 
-#: ../comps-fe5.xml.in.h:13
-#: ../comps-fe6.xml.in.h:14
-#: ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Suporte ?? Rede Dialup"
 
-#: ../comps-fe5.xml.in.h:14
-#: ../comps-fe6.xml.in.h:15
-#: ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39
-#: ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editores"
 
-#: ../comps-fe5.xml.in.h:15
-#: ../comps-fe6.xml.in.h:16
-#: ../comps-f7.xml.in.h:40
-#: ../comps-f8.xml.in.h:40
-#: ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:15
+#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
+#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
 msgstr "Softwares Educacionais"
 
-#: ../comps-fe5.xml.in.h:16
-#: ../comps-fe6.xml.in.h:17
-#: ../comps-f7.xml.in.h:41
-#: ../comps-f8.xml.in.h:41
-#: ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:16
+#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
+#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
 msgstr "Softwares educacionais para aprendizado"
 
-#: ../comps-fe5.xml.in.h:17
-#: ../comps-fe6.xml.in.h:18
-#: ../comps-f7.xml.in.h:42
-#: ../comps-f8.xml.in.h:42
-#: ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:17
+#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
+#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
 msgstr "Engenharia e Ci??ncia"
 
-#: ../comps-fe5.xml.in.h:18
-#: ../comps-fe6.xml.in.h:19
-#: ../comps-f7.xml.in.h:46
-#: ../comps-f8.xml.in.h:46
-#: ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:18
+#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
+#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
[...2376 lines suppressed...]
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4728,6 +4587,7 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>telugu-support</id> <_name>Suporte??????Telugu</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -4748,6 +4608,7 @@
 #~ "x11-server-Xorg\">scim-m17n</packagereq> <packagereq type=\"conditional\" "
 #~ "requires=\"qt\">scim-qtimm</packagereq> </packagelist> </group> <group> "
 #~ "<id>turkish-support</id> <_name>Suporte??????Turco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"optional\">compat-db</packagereq> "
@@ -4778,6 +4639,7 @@
 #~ "<packagereq type=\"optional\">qt4</packagereq> </packagelist> </group> "
 #~ "<group> <id>lithuanian-support</id> <_name>Suporte??????Lituano</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>as</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4804,6 +4666,7 @@
 #~ "<_name>Autoria??e??Publica????o</_name> "
 #~ "<_description>Estas??ferramentas??permitem??criar??documenta????o??no??formato??DocBook??e??convert??-"
 #~ "la??para??HTML,??PDF,??PostScript??e??texto."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bg</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4824,6 +4687,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-"
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> <id>catalan-"
 #~ "support</id> <_name>Suporte??????Catal??o</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>bn</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4846,6 +4710,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>brazilian-support</id> "
 #~ "<_name>Suporte??????Portugu??s??Brasileiro</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>br</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4858,6 +4723,7 @@
 #~ "requires=\"aspell\">aspell-br</packagereq> </packagelist> </group> "
 #~ "<group> <id>british-support</id> <_name>Suporte??????Ingl??s??Brit??nico</"
 #~ "_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>de</langonly> <packagelist> <packagereq type=\"default"
@@ -4878,6 +4744,7 @@
 #~ "packagelist> </group> <group> <id>graphical-internet</id> "
 #~ "<_name>Internet??em??Modo??Gr??fico</_name> "
 #~ "<_description>Este??grupo??inclui??clientes??gr??ficos??de??email,??Web??e??chat."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>es</langonly> <packagelist> <packagereq type=\"default"
@@ -4896,6 +4763,7 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-es</packagereq> </"
 #~ "packagelist> </group> <group> <id>swedish-support</id> "
 #~ "<_name>Suporte??????Sueco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>et</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4914,6 +4782,7 @@
 #~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
 #~ "\">kde-i18n-Estonian</packagereq> </packagelist> </group> <group> "
 #~ "<id>ethiopic-support</id> <_name>Suporte??????Et??ope</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fi</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4926,6 +4795,7 @@
 #~ "requires=\"kdelibs\">kde-i18n-Finnish</packagereq> </packagelist> </"
 #~ "group> <group> <id>faeroese-support</id> <_name>Suporte??????Faro??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>fr</langonly> <packagelist> <packagereq type=\"default"
@@ -4947,6 +4817,7 @@
 #~ "packagelist> </group> <group> <id>gnome-desktop</id> "
 #~ "<_name>Ambiente??de????rea??de??Trabalho??GNOME</_name> <_description>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."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>he</langonly> <packagelist> <packagereq type=\"mandatory"
@@ -4959,6 +4830,7 @@
 #~ "\">fonts-hebrew</packagereq> <packagereq type=\"conditional\" requires="
 #~ "\"kdelibs\">kde-i18n-Hebrew</packagereq> </packagelist> </group> <group> "
 #~ "<id>hindi-support</id> <_name>Suporte??????Hindu</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hr</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4977,6 +4849,7 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
 #~ "75dpi</packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>Suporte??????Checo</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>hu</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -4996,6 +4869,7 @@
 #~ "ISO8859-2-75dpi</packagereq> </packagelist> </group> <group> "
 #~ "<id>icelandic-support</id> <_name>Suporte??????Island??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>it</langonly> <packagelist> <packagereq type=\"default"
@@ -5014,6 +4888,7 @@
 #~ "\"conditional\" requires=\"man-pages\">man-pages-it</packagereq> </"
 #~ "packagelist> </group> <group> <id>japanese-support</id> "
 #~ "<_name>Suporte??????Japon??s</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ml</langonly> <packagelist> <packagereq type=\"default"
@@ -5036,6 +4911,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>marathi-support</id> "
 #~ "<_name>Suporte??????Marati</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>or</langonly> <packagelist> <packagereq type=\"default"
@@ -5058,6 +4934,7 @@
 #~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
 #~ "group> <group> <id>polish-support</id> <_name>Suporte??????Polon??s</_name> "
 #~ "<_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
@@ -5082,6 +4959,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>romanian-support</id> "
 #~ "<_name>Suporte??????Romeno</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
@@ -5110,6 +4988,7 @@
 #~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
 #~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
 #~ "support</id> <_name>Suporte??????S??rvio</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
@@ -5134,6 +5013,7 @@
 #~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
 #~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
 #~ "<_name>Suporte??????Eslovaco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
@@ -5158,6 +5038,7 @@
 #~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
 #~ "<id>sound-and-video</id> <_name>Som??e??V??deo</_name> "
 #~ "<_description>De??grava????o??de??CDs??at????a??reprodu????o??de??CDs??de????udio??e??arquivos??multim??dia,??este??grupo??de??pacotes??permite??lidar??com??som??e??v??deo??no??sistema."
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
@@ -5182,6 +5063,7 @@
 #~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
 #~ "</packagelist> </group> <group> <id>telugu-support</id> "
 #~ "<_name>Suporte??????Telugu</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
@@ -5200,6 +5082,7 @@
 #~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
 #~ "packagelist> </group> <group> <id>turkish-support</id> "
 #~ "<_name>Suporte??????Turco</_name> <_description>"
+
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
@@ -5244,4 +5127,3 @@
 #~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
 #~ "group> <group> <id>core</id> <_name>Core</_name> "
 #~ "<_description>A??menor??instala????o??poss??vel"
-



From fedora-extras-commits at redhat.com  Mon Sep 17 19:15:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:15:24 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.29, 1.30 gnome-menus.spec, 1.66,
	1.67 sources, 1.29, 1.30
Message-ID: <200709171915.l8HJFO8T019237@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19209

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Sep 2007 18:48:02 -0000	1.29
+++ .cvsignore	17 Sep 2007 19:14:51 -0000	1.30
@@ -1 +1 @@
-gnome-menus-2.19.92.tar.bz2
+gnome-menus-2.20.0.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-menus.spec	4 Sep 2007 18:48:02 -0000	1.66
+++ gnome-menus.spec	17 Sep 2007 19:14:51 -0000	1.67
@@ -5,12 +5,13 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-menus/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-menus/2.20/%{name}-%{version}.tar.bz2
+Patch0: debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .debug
 
 %build
 %configure \
@@ -98,6 +100,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	4 Sep 2007 18:48:02 -0000	1.29
+++ sources	17 Sep 2007 19:14:51 -0000	1.30
@@ -1 +1 @@
-ba03799545df6d7258e9b7b6c5b78aff  gnome-menus-2.19.92.tar.bz2
+7c3580c7c59f36a49f6624932a743d31  gnome-menus-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:18:58 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:18:58 -0400
Subject: comps comps-f7.xml.in,1.254,1.255
Message-ID: <200709171918.l8HJIwD8019399@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19260

Modified Files:
	comps-f7.xml.in 
Log Message:
fix typo



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- comps-f7.xml.in	14 Sep 2007 08:21:29 -0000	1.254
+++ comps-f7.xml.in	17 Sep 2007 19:18:28 -0000	1.255
@@ -2949,7 +2949,7 @@
   </group>
   <group>
     <id>somali-support</id>
-    <_name>Somail Support</_name>
+    <_name>Somali Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From fedora-extras-commits at redhat.com  Mon Sep 17 19:21:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:21:25 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.43, 1.44 gnome-session.spec, 
	1.139, 1.140 sources, 1.43, 1.44
Message-ID: <200709171921.l8HJLPp7019564@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19533

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	4 Sep 2007 19:27:48 -0000	1.43
+++ .cvsignore	17 Sep 2007 19:20:51 -0000	1.44
@@ -1 +1 @@
-gnome-session-2.19.92.tar.bz2
+gnome-session-2.20.0.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-session.spec	11 Sep 2007 12:58:58 -0000	1.139
+++ gnome-session.spec	17 Sep 2007 19:20:51 -0000	1.140
@@ -11,10 +11,10 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.19.92
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
 Source2: gnome.desktop
 License: GPLv2+
@@ -189,6 +189,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-3
 - Plug memory leaks in the ICE code
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	4 Sep 2007 19:27:48 -0000	1.43
+++ sources	17 Sep 2007 19:20:51 -0000	1.44
@@ -1 +1 @@
-52e05bcb16fbd904e01a5aebb2ce75d1  gnome-session-2.19.92.tar.bz2
+3ef5601a46ee6c382bf6288ced8b06a5  gnome-session-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:22:43 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 15:22:43 -0400
Subject: comps/po af.po, 1.4, 1.5 am.po, 1.4, 1.5 ar.po, 1.4, 1.5 as.po, 1.4,
	1.5 be.po, 1.4, 1.5 bg.po, 1.4, 1.5 bn.po, 1.4, 1.5 bn_IN.po,
	1.4, 1.5 bs.po, 1.4, 1.5 ca.po, 1.4, 1.5 comps.pot, 1.8,
	1.9 cs.po, 1.4, 1.5 cy.po, 1.4, 1.5 da.po, 1.4, 1.5 de.po, 1.4,
	1.5 el.po, 1.5, 1.6 en_GB.po, 1.4, 1.5 es.po, 1.4, 1.5 et.po,
	1.4, 1.5 fa.po, 1.4, 1.5 fi.po, 1.4, 1.5 fr.po, 1.4, 1.5 gl.po,
	1.4, 1.5 gu.po, 1.4, 1.5 he.po, 1.4, 1.5 hi.po, 1.4, 1.5 hr.po,
	1.4, 1.5 hu.po, 1.4, 1.5 hy.po, 1.4, 1.5 id.po, 1.4, 1.5 ilo.po,
	1.4, 1.5 is.po, 1.4, 1.5 it.po, 1.4, 1.5 ja.po, 1.4, 1.5 ka.po,
	1.4, 1.5 kn.po, 1.4, 1.5 ko.po, 1.4, 1.5 ku.po, 1.4, 1.5 lo.po,
	1.4, 1.5 lv.po, 1.4, 1.5 mk.po, 1.4, 1.5 ml.po, 1.4, 1.5 mr.po,
	1.4, 1.5 ms.po, 1.4, 1.5 my.po, 1.4, 1.5 nb.po, 1.4, 1.5 ne.po,
	1.1, 1.2 nl.po, 1.4, 1.5 no.po, 1.4, 1.5 nso.po, 1.4, 1.5 or.po,
	1.4, 1.5 pa.po, 1.4, 1.5 pl.po, 1.6, 1.7 pt.po, 1.4,
	1.5 pt_BR.po, 1.7, 1.8 ro.po, 1.4, 1.5 ru.po, 1.4, 1.5 si.po,
	1.4, 1.5 sk.po, 1.4, 1.5 sl.po, 1.4, 1.5 sq.po, 1.4, 1.5 sr.po,
	1.5, 1.6 sr@Latn.po, 1.5, 1.6 sv.po, 1.4, 1.5 ta.po, 1.4,
	1.5 te.po, 1.4, 1.5 th.po, 1.4, 1.5 tl.po, 1.4, 1.5 tr.po, 1.4,
	1.5 uk.po, 1.4, 1.5 ur.po, 1.4, 1.5 vi.po, 1.4, 1.5 zh_CN.po,
	1.4, 1.5 zh_TW.po, 1.4, 1.5 zu.po, 1.4, 1.5
Message-ID: <200709171922.l8HJMhCq019783@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	af.po am.po ar.po as.po be.po bg.po bn.po bn_IN.po bs.po ca.po 
	comps.pot cs.po cy.po da.po de.po el.po en_GB.po es.po et.po 
	fa.po fi.po fr.po gl.po gu.po he.po hi.po hr.po hu.po hy.po 
	id.po ilo.po is.po it.po ja.po ka.po kn.po ko.po ku.po lo.po 
	lv.po mk.po ml.po mr.po ms.po my.po nb.po ne.po nl.po no.po 
	nso.po or.po pa.po pl.po pt.po pt_BR.po ro.po ru.po si.po 
	sk.po sl.po sq.po sr.po sr at Latn.po sv.po ta.po te.po th.po 
	tl.po tr.po uk.po ur.po vi.po zh_CN.po zh_TW.po zu.po 
Log Message:
refresh after fixed typo



Index: af.po
===================================================================
RCS file: /cvs/extras/comps/po/af.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- af.po	14 Sep 2007 14:39:10 -0000	1.4
+++ af.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-02-15 13:30+0200\n"
 "Last-Translator: Translate.org.za <info at translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af at lists.sourceforge.net>\n"
@@ -1174,6 +1174,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Tamil taalsteun"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: am.po
===================================================================
RCS file: /cvs/extras/comps/po/am.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- am.po	14 Sep 2007 14:39:10 -0000	1.4
+++ am.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-05-12 07:02+EST\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales at geez.org>\n"
 "Language-Team: Amharic <am-translate at geez.org>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "????????? ?????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????"
 


Index: ar.po
===================================================================
RCS file: /cvs/extras/comps/po/ar.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ar.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ar.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-12 08:54+0200\n"
 "Last-Translator: Ali Ghareb <ali.gareb at gmail.com>\n"
 "Language-Team: Arabic <en at li.org>\n"
@@ -1136,6 +1136,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????? ????????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????"
 


Index: as.po
===================================================================
RCS file: /cvs/extras/comps/po/as.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- as.po	14 Sep 2007 14:39:10 -0000	1.4
+++ as.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-22 19:32+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
 "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
@@ -1102,6 +1102,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????? ??????????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: be.po
===================================================================
RCS file: /cvs/extras/comps/po/be.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- be.po	14 Sep 2007 14:39:10 -0000	1.4
+++ be.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-09-25 13:19+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
 "Language-Team: Belorussian\n"
@@ -1135,6 +1135,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????????? ????????"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: bg.po
===================================================================
RCS file: /cvs/extras/comps/po/bg.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bg.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bg.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-29 11:11+0300\n"
 "Last-Translator: Miroslav Ivanov <satyr at globalnet.bg>\n"
 "Language-Team: Bulgarian <bg at li.org>\n"
@@ -1109,6 +1109,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???? ??????????"
+
 #~ msgid "Emacs"
 #~ msgstr "??????????"
 


Index: bn.po
===================================================================
RCS file: /cvs/extras/comps/po/bn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bn.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bn.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-09-23 00:21+0600\n"
 "Last-Translator: Mahay Alam Khan (???????????? ?????????) <makl10n at yahoo.com>\n"
 "Language-Team: Bangla <redhat-translation at bengalinux.org>\n"
@@ -1145,6 +1145,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "????????? ??????????????????????????? ???????????????"
+
 #~ msgid "Emacs"
 #~ msgstr "????????????????????????"
 


Index: bn_IN.po
===================================================================
RCS file: /cvs/extras/comps/po/bn_IN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bn_IN.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bn_IN.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 11:43+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
 "Language-Team: Bengali India\n"
@@ -1190,6 +1190,11 @@
 msgstr ""
 
 # modified for RHEL
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????? ??????????????????????????? ??????????????????"
+
+# modified for RHEL
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: bs.po
===================================================================
RCS file: /cvs/extras/comps/po/bs.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bs.po	14 Sep 2007 14:39:10 -0000	1.4
+++ bs.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-23 13:24+0100\n"
 "Last-Translator: Adnan Hodzic <AbsintheSyringe at gmail.com>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -1104,6 +1104,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: ca.po
===================================================================
RCS file: /cvs/extras/comps/po/ca.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ca.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ca.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-18 11:11+0100\n"
 "Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
@@ -1133,6 +1133,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suport per al swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: comps.pot
===================================================================
RCS file: /cvs/extras/comps/po/comps.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps.pot	14 Sep 2007 14:39:10 -0000	1.8
+++ comps.pot	17 Sep 2007 19:22:12 -0000	1.9
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"


Index: cs.po
===================================================================
RCS file: /cvs/extras/comps/po/cs.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cs.po	14 Sep 2007 14:39:10 -0000	1.4
+++ cs.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 01:38+0100\n"
 "Last-Translator: Milan Kerslager <kerslage at linux.cz>\n"
 "Language-Team: Czech\n"
@@ -1140,6 +1140,11 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+# FIXME
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati (P??kist??n)"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: cy.po
===================================================================
RCS file: /cvs/extras/comps/po/cy.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cy.po	14 Sep 2007 14:39:10 -0000	1.4
+++ cy.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-15 18:00+0100\n"
 "Last-Translator: Rhys Jones <rhys at sucs.org>\n"
 "Language-Team: Cymraeg <Cy at li.org>\n"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Cynhaliaeth Thai"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: da.po
===================================================================
RCS file: /cvs/extras/comps/po/da.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- da.po	14 Sep 2007 14:39:10 -0000	1.4
+++ da.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\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"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Underst??ttelse for swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: de.po
===================================================================
RCS file: /cvs/extras/comps/po/de.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- de.po	14 Sep 2007 14:39:10 -0000	1.4
+++ de.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -23,7 +23,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-26 08:19+1000\n"
 "Last-Translator: PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
@@ -1155,6 +1155,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Unterst??tzung f??r Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: el.po
===================================================================
RCS file: /cvs/extras/comps/po/el.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- el.po	14 Sep 2007 14:39:10 -0000	1.5
+++ el.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-16 19:25+0300\n"
 "Last-Translator: Nikos Charonitakis <nikosx at gmail.com>\n"
 "Language-Team: Greek <fedora-trans-el at redhat.com>\n"
@@ -1144,6 +1144,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????? Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: en_GB.po
===================================================================
RCS file: /cvs/extras/comps/po/en_GB.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- en_GB.po	14 Sep 2007 14:39:10 -0000	1.4
+++ en_GB.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-01-04 12:50+0000\n"
 "Last-Translator: Alan Cox <alan at redhat.com>\n"
 "Language-Team: en_GB\n"
@@ -1115,6 +1115,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Thai Support"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: es.po
===================================================================
RCS file: /cvs/extras/comps/po/es.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- es.po	14 Sep 2007 14:39:10 -0000	1.4
+++ es.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 11:35-0300\n"
 "Last-Translator: Domingo Becker <beckerde at hotmail.com>\n"
 "Language-Team: Spanish <en at li.org>\n"
@@ -1134,6 +1134,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Soporte para Swati"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: et.po
===================================================================
RCS file: /cvs/extras/comps/po/et.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- et.po	14 Sep 2007 14:39:10 -0000	1.4
+++ et.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-07-27 13:42+0200\n"
 "Last-Translator: Allan Sims <allan.sims at eau.ee>\n"
 "Language-Team: Estonian <Eesti>\n"
@@ -1130,6 +1130,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "tai keele toetus"
+
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 


Index: fa.po
===================================================================
RCS file: /cvs/extras/comps/po/fa.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fa.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fa.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-14 14:31+0430\n"
 "Last-Translator: Meelad Zakaria <meelad at farsiweb.info>\n"
 "Language-Team: Persian <farsi at lists.sharif.edu>\n"
@@ -1151,6 +1151,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????? ????????????"
 


Index: fi.po
===================================================================
RCS file: /cvs/extras/comps/po/fi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-07 21:43+0200\n"
 "Last-Translator: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -1121,6 +1121,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Siswatin kielituki"
+
 # Mik?? kieli t??m?? t??llainen on? ...
 #~ msgid "Brazilian Support"
 #~ msgstr "Brasilianportugalin kielituki"


Index: fr.po
===================================================================
RCS file: /cvs/extras/comps/po/fr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ fr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-27 21:23+0100\n"
 "Last-Translator: Thomas Canniot <thomas.canniot at laposte.net>\n"
 "Language-Team: Francais <fedora-trans-fr at redhat.com>\n"
@@ -1153,6 +1153,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Support Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Support br??silien"
 


Index: gl.po
===================================================================
RCS file: /cvs/extras/comps/po/gl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ gl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-07-19 22:34+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <gl at li.org>\n"
@@ -1118,6 +1118,10 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Soporte para o tai"
+
+#, fuzzy
 #~ msgid "Brazilian Support"
 #~ msgstr "Soporte Brasileiro"
 


Index: gu.po
===================================================================
RCS file: /cvs/extras/comps/po/gu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ gu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-26 11:10+0530\n"
 "Last-Translator: Ankit Patel <ankit at redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
@@ -1096,6 +1096,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????? ????????????"
 


Index: he.po
===================================================================
RCS file: /cvs/extras/comps/po/he.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- he.po	14 Sep 2007 14:39:10 -0000	1.4
+++ he.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: hi.po
===================================================================
RCS file: /cvs/extras/comps/po/hi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-16 16:46+0530\n"
 "Last-Translator: hi <rranjan at redhat.com>\n"
 "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????????????? ??????????????????"
 


Index: hr.po
===================================================================
RCS file: /cvs/extras/comps/po/hr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: comps 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-18 13:06+0100\n"
 "Last-Translator: Renato Pavicic <renato at translator-shop.org>\n"
 "Language-Team: Renato Pavicic <renato at translator-shop.org>\n"
@@ -1105,6 +1105,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Podr??ka za brazilski"
 


Index: hu.po
===================================================================
RCS file: /cvs/extras/comps/po/hu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-18 19:56+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad at yahoo.com>\n"
 "Language-Team: \n"
@@ -1139,6 +1139,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati nyelvi t??mogat??s"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazil lokaliz??ci??s t??mogat??s"
 


Index: hy.po
===================================================================
RCS file: /cvs/extras/comps/po/hy.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hy.po	14 Sep 2007 14:39:10 -0000	1.4
+++ hy.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: hy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-08 19:07+0400\n"
 "Last-Translator: Suren Karapetyan <surenkarapetyan at gmail.com>\n"
 "Language-Team: Armenian\n"
@@ -1072,6 +1072,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????? ????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????? ????????????????????"
 


Index: id.po
===================================================================
RCS file: /cvs/extras/comps/po/id.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- id.po	14 Sep 2007 14:39:10 -0000	1.4
+++ id.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-24 14:17+0700\n"
 "Last-Translator: Teguh DC <dheche at bradjamoesti.or.id>\n"
 "Language-Team: Bahasa Indonesia <viribus at traderweb.net>\n"
@@ -1116,6 +1116,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Dukungan Tamil"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Dukungan Brasil"
 


Index: ilo.po
===================================================================
RCS file: /cvs/extras/comps/po/ilo.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ilo.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ilo.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Iloko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-12 14:10+0800\n"
 "Last-Translator: rva <rvaragon at gmail.com>\n"
 "Language-Team: \n"
@@ -1044,6 +1044,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Panagsayangkat ti Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Panagsayangkat ti Portuges a Brasilenio"
 


Index: is.po
===================================================================
RCS file: /cvs/extras/comps/po/is.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- is.po	14 Sep 2007 14:39:10 -0000	1.4
+++ is.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-07 12:00+0000\n"
 "Last-Translator: Richard Allen <ra at ra.is>\n"
 "Language-Team: is <kde-isl at molar.is>\n"
@@ -1088,6 +1088,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Bras??l??ska"
 


Index: it.po
===================================================================
RCS file: /cvs/extras/comps/po/it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- it.po	14 Sep 2007 14:39:10 -0000	1.4
+++ it.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 00:33+0100\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
 "Language-Team: italiano <fedora-trans-it at redhat.com>\n"
@@ -1146,6 +1146,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Supporto per lo Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Supporto per il brasiliano"
 


Index: ja.po
===================================================================
RCS file: /cvs/extras/comps/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ja.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ja.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-01 14:53+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -1127,6 +1127,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????????"
 


Index: ka.po
===================================================================
RCS file: /cvs/extras/comps/po/ka.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ka.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ka.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ka\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-05 20:36+0400\n"
 "Last-Translator: George Machitidze <giomac at gmail.com>\n"
 "Language-Team: Georgian <guiasher at mes.gov.ge>\n"
@@ -1051,6 +1051,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????????????????? ??????????????????????????????"
+
 #~ msgid "British Support"
 #~ msgstr "?????????????????????????????? ???????????????????????????"
 


Index: kn.po
===================================================================
RCS file: /cvs/extras/comps/po/kn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kn.po	14 Sep 2007 14:39:10 -0000	1.4
+++ kn.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-17 18:53+0530\n"
 "Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
 "Language-Team: Kannada <en at li.org>\n"
@@ -1103,6 +1103,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ?????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ?????????????????????"
 


Index: ko.po
===================================================================
RCS file: /cvs/extras/comps/po/ko.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ko.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ko.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ko\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-08 10:51+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -1102,6 +1102,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????? ??????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????? ??????"
 


Index: ku.po
===================================================================
RCS file: /cvs/extras/comps/po/ku.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ku.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ku.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: lo.po
===================================================================
RCS file: /cvs/extras/comps/po/lo.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lo.po	14 Sep 2007 14:39:10 -0000	1.4
+++ lo.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2004-04-15 22:16-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: lv.po
===================================================================
RCS file: /cvs/extras/comps/po/lv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lv.po	14 Sep 2007 14:39:10 -0000	1.4
+++ lv.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-21 06:57+0200\n"
 "Last-Translator: Gatis Kalnins <gatis.kalnins at metatrons.lv>\n"
 "Language-Team: Latvian <locale at laka.lv>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati atbalsts"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braz????u valodas atbalsts"
 


Index: mk.po
===================================================================
RCS file: /cvs/extras/comps/po/mk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ mk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-05-02 11:44+0200\n"
 "Last-Translator: Tomislav Markovski <herrera at users.sourceforge.net>\n"
 "Language-Team: Macedonian <ossm-members at hedona.on.net.mk>\n"
@@ -1126,6 +1126,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "???????????????? ???? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????? ???? ??????????????????"
 


Index: ml.po
===================================================================
RCS file: /cvs/extras/comps/po/ml.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ml.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ml.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-02 11:47+0530\n"
 "Last-Translator: Ani Peter <apeter at redhat.com>\n"
 "Language-Team: Malayalam <en at li.org>\n"
@@ -1103,6 +1103,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ????????????????????????????????????"
 


Index: mr.po
===================================================================
RCS file: /cvs/extras/comps/po/mr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ mr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-08 14:48+0530\n"
 "Last-Translator: Rahul Bhalerao <b.rahul.pm at gmail.com>\n"
 "Language-Team: Marathi\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????????????????? ??????????????????"
 


Index: ms.po
===================================================================
RCS file: /cvs/extras/comps/po/ms.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ms.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ms.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-08 18:53+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms at lists.sourceforge.net>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Sokongan Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Sokongan Brazil"
 


Index: my.po
===================================================================
RCS file: /cvs/extras/comps/po/my.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- my.po	14 Sep 2007 14:39:10 -0000	1.4
+++ my.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-04-30 13:38-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: nb.po
===================================================================
RCS file: /cvs/extras/comps/po/nb.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nb.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nb.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-14 13:30+0100\n"
 "Last-Translator: Espen Stefansen <espenas at gmail.com>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
@@ -1108,6 +1108,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??tte for Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??tte for brasiliensk"
 


Index: ne.po
===================================================================
RCS file: /cvs/extras/comps/po/ne.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ne.po	17 Sep 2007 19:10:21 -0000	1.1
+++ ne.po	17 Sep 2007 19:22:12 -0000	1.2
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-08-16 16:07+0545\n"
 "Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -1090,6 +1090,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "JBoss Enterprise Application Platform"
 #~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"
 


Index: nl.po
===================================================================
RCS file: /cvs/extras/comps/po/nl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-05 23:20+0100\n"
 "Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -1136,6 +1136,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati ondersteuning"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braziliaanse ondersteuning"
 


Index: no.po
===================================================================
RCS file: /cvs/extras/comps/po/no.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- no.po	14 Sep 2007 14:39:10 -0000	1.4
+++ no.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-01-18 14:23+0100\n"
 "Last-Translator: guru <215487 at gmail.com>\n"
 "Language-Team: Norwegian\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??tte for siamesisk"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??tte for portugisisk(Brasil)"
 


Index: nso.po
===================================================================
RCS file: /cvs/extras/comps/po/nso.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nso.po	14 Sep 2007 14:39:10 -0000	1.4
+++ nso.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2005-01-24 13:30+0200\n"
 "Last-Translator: Translate.org.za <info at translate.org.za>\n"
 "Language-Team: Northern Sotho <translate-discuss-nso at lists.sourceforge.net>\n"
@@ -1181,6 +1181,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Thekgo ya se-Tamil"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Thekgo ya se-Brazil"
 


Index: or.po
===================================================================
RCS file: /cvs/extras/comps/po/or.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- or.po	14 Sep 2007 14:39:10 -0000	1.4
+++ or.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-03-02 12:17+0530\n"
 "Last-Translator: Subhransu Behera <sbehera at redhat.com>\n"
 "Language-Team: Oriya <oriya-group at lists.sarovar.org>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "??????????????????????????? ??????????????????"
 


Index: pa.po
===================================================================
RCS file: /cvs/extras/comps/po/pa.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pa.po	14 Sep 2007 14:39:10 -0000	1.4
+++ pa.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-06 13:44+0530\n"
 "Last-Translator: A S Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
@@ -1097,6 +1097,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????? ??????????????????"
 


Index: pl.po
===================================================================
RCS file: /cvs/extras/comps/po/pl.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pl.po	14 Sep 2007 14:39:10 -0000	1.6
+++ pl.po	17 Sep 2007 19:22:12 -0000	1.7
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-10 17:10+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -1074,3 +1074,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Obs??uga somalijskiego"


Index: pt.po
===================================================================
RCS file: /cvs/extras/comps/po/pt.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pt.po	14 Sep 2007 14:39:10 -0000	1.4
+++ pt.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 10:47+0000\n"
 "Last-Translator: Pedro Morais <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -1155,6 +1155,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte a Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suporte a Portugu??s do Brasil"
 


Index: pt_BR.po
===================================================================
RCS file: /cvs/extras/comps/po/pt_BR.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pt_BR.po	17 Sep 2007 19:10:21 -0000	1.7
+++ pt_BR.po	17 Sep 2007 19:22:12 -0000	1.8
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-16 12:11-0300\n"
 "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
@@ -1100,6 +1100,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr "Pacotes de fontes vetoriais e bitmaps antigos"
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte ?? Somali"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suporte ?? Portugu??s Brasileiro"
 


Index: ro.po
===================================================================
RCS file: /cvs/extras/comps/po/ro.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ro.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ro.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comps cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 23:49+0200\n"
 "Last-Translator: Alexandru Szasz <alexxed at gmail.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suport pentru Swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Suport pentru brazilian??"
 


Index: ru.po
===================================================================
RCS file: /cvs/extras/comps/po/ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ru.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ru.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-23 20:17+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1121,6 +1121,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ?????????? ??????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????? ???????????????????????? ??????????"
 


Index: si.po
===================================================================
RCS file: /cvs/extras/comps/po/si.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- si.po	14 Sep 2007 14:39:10 -0000	1.4
+++ si.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-10-18 23:50+0530\n"
 "Last-Translator: Tyronne Wickramarathne <tywickra at redhat.com>\n"
 "Language-Team: Sinhala <en at li.org>\n"
@@ -1091,6 +1091,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????????????????????????? ???????????? ??????????????????"
 


Index: sk.po
===================================================================
RCS file: /cvs/extras/comps/po/sk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: comp-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-10 09:21+0200\n"
 "Last-Translator: J??n Ondrej <ondrejj at salstar.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -1120,6 +1120,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podpora swati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Braz??lska podpora"
 


Index: sl.po
===================================================================
RCS file: /cvs/extras/comps/po/sl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-09 19:22+0200\n"
 "Last-Translator: Rok Papez <rok.papez at lugos.si>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -1105,6 +1105,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podpora Svat????ini"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilska podpora"
 


Index: sq.po
===================================================================
RCS file: /cvs/extras/comps/po/sq.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sq.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sq.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-14 20:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


Index: sr.po
===================================================================
RCS file: /cvs/extras/comps/po/sr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sr.po	14 Sep 2007 14:39:10 -0000	1.5
+++ sr.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-09 00:55-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -1072,3 +1072,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????? ???? ????????????"


Index: sr at Latn.po
===================================================================
RCS file: /cvs/extras/comps/po/sr at Latn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sr at Latn.po	14 Sep 2007 14:39:10 -0000	1.5
+++ sr at Latn.po	17 Sep 2007 19:22:12 -0000	1.6
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-09-09 00:58-0000\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
@@ -1072,3 +1072,7 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Stariji paketi batmapiranih i vektorskih fontova"
+
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Podr??ka za somali"


Index: sv.po
===================================================================
RCS file: /cvs/extras/comps/po/sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sv.po	14 Sep 2007 14:39:10 -0000	1.4
+++ sv.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-09 10:21-0500\n"
 "Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
 "Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
@@ -1124,6 +1124,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "St??d f??r siswati"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "St??d f??r brasiliansk portugisiska"
 


Index: ta.po
===================================================================
RCS file: /cvs/extras/comps/po/ta.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ta.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ta.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-04-17 16:29+0530\n"
 "Last-Translator: I felix <ifelix at redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
@@ -1109,6 +1109,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????????????? ????????????"
 


Index: te.po
===================================================================
RCS file: /cvs/extras/comps/po/te.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- te.po	14 Sep 2007 14:39:10 -0000	1.4
+++ te.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-07 17:17+0530\n"
 "Last-Translator: Sree Ganesh <sthottem at redhat.com>\n"
 "Language-Team: Telugu <en at li.org>\n"
@@ -1094,6 +1094,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilian ??????????????????"
 


Index: th.po
===================================================================
RCS file: /cvs/extras/comps/po/th.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- th.po	14 Sep 2007 14:39:10 -0000	1.4
+++ th.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: th\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\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"
@@ -1096,6 +1096,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????????????????????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brazilian Support"
 


Index: tl.po
===================================================================
RCS file: /cvs/extras/comps/po/tl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tl.po	14 Sep 2007 14:39:10 -0000	1.4
+++ tl.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Tagalog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-11-23 04:15-0800\n"
 "Last-Translator: Joseph S. Maza <joemaza at comcast.net>\n"
 "Language-Team: \n"
@@ -1054,6 +1054,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Suporte para sa Wikang Gales"
+
 #~ msgid "ISO8859-14 Support"
 #~ msgstr "Pagsasang-ayong ISO8859-14 "
 


Index: tr.po
===================================================================
RCS file: /cvs/extras/comps/po/tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tr.po	14 Sep 2007 14:39:10 -0000	1.4
+++ tr.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-02-16 12:22+0200\n"
 "Last-Translator: Egemen Metin Turan <mturan at aegee-ankara.org>\n"
 "Language-Team: Turkish <fedora-trans-tr at redhat.com>\n"
@@ -1097,6 +1097,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati Dil Deste??i"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Brezilya Dili Dsete??i"
 


Index: uk.po
===================================================================
RCS file: /cvs/extras/comps/po/uk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uk.po	14 Sep 2007 14:39:10 -0000	1.4
+++ uk.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2007-01-23 10:05+0200\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko at gmail.com>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -1098,6 +1098,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????????????? ???????? ??????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "?????????????????? ???????????????????????? ????????"
 


Index: ur.po
===================================================================
RCS file: /cvs/extras/comps/po/ur.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ur.po	14 Sep 2007 14:39:10 -0000	1.4
+++ ur.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-03-11 21:36+0500\n"
 "Last-Translator: Usman Siraj Sheikh <usman.siraj at gmail.com>\n"
 "Language-Team: SCS GIFT UNIVERSITY (http://cs.gift.edu.pk) <urdu.scs."
@@ -1120,6 +1120,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "?????????? ???? ????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr " ?????????????? ????????"
 


Index: vi.po
===================================================================
RCS file: /cvs/extras/comps/po/vi.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vi.po	14 Sep 2007 14:39:10 -0000	1.4
+++ vi.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-18 20:38+0700\n"
 "Last-Translator: pclouds <pclouds at gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list at lists.sourceforge.net>\n"
@@ -1144,6 +1144,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "H??? tr??? ??? R???p"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "H??? tr??? Brazil"
 


Index: zh_CN.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zh_CN.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zh_CN.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-07 09:08+1000\n"
 "Last-Translator: Tony Fu <tfu at redhat.com>\n"
 "Language-Team:  <zh at li.org>\n"
@@ -1099,6 +1099,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Swati ?????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "????????????????????????"
 


Index: zh_TW.po
===================================================================
RCS file: /cvs/extras/comps/po/zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zh_TW.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zh_TW.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2006-12-11 10:14+1000\n"
 "Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
 "Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
@@ -1080,6 +1080,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "??????????????????"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "???????????????????????????"
 


Index: zu.po
===================================================================
RCS file: /cvs/extras/comps/po/zu.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zu.po	14 Sep 2007 14:39:10 -0000	1.4
+++ zu.po	17 Sep 2007 19:22:12 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-05 02:14-0400\n"
+"POT-Creation-Date: 2007-09-17 15:18-0400\n"
 "PO-Revision-Date: 2003-10-21 12:12+0200\n"
 "Last-Translator: Thobile Mhlongo <thobile at translate.org.za>\n"
 "Language-Team: Zulu <zulu at translate.org.za>\n"
@@ -1247,6 +1247,10 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Somail Support"
+#~ msgstr "Ukuxhasa Kwesi-Arabhu"
+
 #~ msgid "Brazilian Support"
 #~ msgstr "Ukuxhasa Kwase-Brazil"
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:27:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:27:17 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.55,
	1.56 gnome-system-monitor.spec, 1.95, 1.96 sources, 1.55, 1.56
Message-ID: <200709171927.l8HJRHbQ019972@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19949

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	4 Sep 2007 13:23:58 -0000	1.55
+++ .cvsignore	17 Sep 2007 19:26:45 -0000	1.56
@@ -1 +1 @@
-gnome-system-monitor-2.19.91.1.tar.bz2
+gnome-system-monitor-2.20.0.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-system-monitor.spec	4 Sep 2007 13:23:58 -0000	1.95
+++ gnome-system-monitor.spec	17 Sep 2007 19:26:45 -0000	1.96
@@ -10,12 +10,12 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.19.91.1
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-system-monitor/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-system-monitor/2.20/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: GConf2-devel
 BuildRequires: gnome-vfs2-devel
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/gnome-system-monitor/
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	4 Sep 2007 13:23:58 -0000	1.55
+++ sources	17 Sep 2007 19:26:45 -0000	1.56
@@ -1 +1 @@
-2f63214c75995014046d3c401e64fd4d  gnome-system-monitor-2.19.91.1.tar.bz2
+52d02162cecd0174536148197024126d  gnome-system-monitor-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:28:38 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 15:28:38 -0400
Subject: rpms/hulahop/OLPC-2 .cvsignore, 1.6, 1.7 hulahop.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200709171928.l8HJScVQ020080@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/hulahop/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20051

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.6.20070917git61d001479c
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2007 20:02:45 -0000	1.6
+++ .cvsignore	17 Sep 2007 19:28:06 -0000	1.7
@@ -1 +1 @@
-hulahop-0.2-git57693bd828.tar.bz2
+hulahop-0.2-git61d001479c.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/hulahop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hulahop.spec	22 Aug 2007 20:02:45 -0000	1.6
+++ hulahop.spec	17 Sep 2007 19:28:06 -0000	1.7
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070822git
-%define commitid 57693bd828
+%define alphatag 20070917git
+%define commitid 61d001479c
 
 Name: hulahop
 Version: 0.2
-Release: 0.5.%{alphatag}57693bd828
+Release: 0.6.%{alphatag}61d001479c
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -52,6 +52,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.6.20070917git61d001479c
+- New snapshot
+
 * Wed Aug 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2-0.5.20070822git57693bd828
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2007 20:02:45 -0000	1.6
+++ sources	17 Sep 2007 19:28:06 -0000	1.7
@@ -1 +1 @@
-4065bb46938f2786eea3ebf3ca4b026d  hulahop-0.2-git57693bd828.tar.bz2
+078093f51bc20dd9eecd2fb2082d0915  hulahop-0.2-git61d001479c.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:31:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:31:53 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.36,
	1.37 gnome-power-manager.spec, 1.96, 1.97 sources, 1.36, 1.37
Message-ID: <200709171931.l8HJVrlO020181@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Sep 2007 20:00:05 -0000	1.36
+++ .cvsignore	17 Sep 2007 19:31:20 -0000	1.37
@@ -1 +1 @@
-gnome-power-manager-2.19.92.tar.bz2
+gnome-power-manager-2.20.0.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-power-manager.spec	4 Sep 2007 20:00:05 -0000	1.96
+++ gnome-power-manager.spec	17 Sep 2007 19:31:20 -0000	1.97
@@ -4,11 +4,11 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.19/gnome-power-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-power-manager/2.20/gnome-power-manager-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -118,6 +118,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog 
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 20:00:05 -0000	1.36
+++ sources	17 Sep 2007 19:31:20 -0000	1.37
@@ -1 +1 @@
-4fa8c70075ac56a22824b2d751df2302  gnome-power-manager-2.19.92.tar.bz2
+881f012dcbdff38a85603393cb9d39bb  gnome-power-manager-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:39:17 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 15:39:17 -0400
Subject: rpms/gcstar/F-7 .cvsignore, 1.5, 1.6 gcstar.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200709171939.l8HJdHle020419@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20338

Modified Files:
	.cvsignore gcstar.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2007 17:16:59 -0000	1.5
+++ .cvsignore	17 Sep 2007 19:38:45 -0000	1.6
@@ -1 +1 @@
-gcstar-1.2.0.tar.gz
+gcstar-1.2.2.tar.gz


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/gcstar.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcstar.spec	9 Sep 2007 17:16:59 -0000	1.9
+++ gcstar.spec	17 Sep 2007 19:38:45 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:16:59 -0000	1.4
+++ sources	17 Sep 2007 19:38:45 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 19:40:15 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 17 Sep 2007 15:40:15 -0400
Subject: rpms/python-TurboMail/FC-6 .cvsignore, 1.2,
	1.3 python-TurboMail.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709171940.l8HJeFcx020531@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-TurboMail/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20438

Modified Files:
	.cvsignore python-TurboMail.spec sources 
Log Message:
2.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2006 02:56:11 -0000	1.2
+++ .cvsignore	17 Sep 2007 19:39:42 -0000	1.3
@@ -1 +1 @@
-TurboMail-2.0.3.tar.gz
+TurboMail-2.0.4.tar.gz


Index: python-TurboMail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/python-TurboMail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-TurboMail.spec	19 Jan 2007 06:58:16 -0000	1.2
+++ python-TurboMail.spec	17 Sep 2007 19:39:42 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-TurboMail
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Multi-threaded mail queue manager for TurboGears applications
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  TurboGears
+BuildRequires:  TurboGears python-devel
 Requires:       TurboGears
 
 
@@ -50,6 +50,9 @@
 %{python_sitelib}/turbomail/*.py*
 
 %changelog
+* Mon Sep 17 2007 Luke Macken <lmacken at redhat.com> 2.0.4-1
+- Latest upstream release
+
 * Fri Jan 19 2007 Luke Macken <lmacken at redhat.com> 2.0.3-3
 - Remove superfluous build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-TurboMail/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2006 02:56:11 -0000	1.2
+++ sources	17 Sep 2007 19:39:42 -0000	1.3
@@ -1 +1 @@
-a4474e3767c83d9a1c14134673fe1a57  TurboMail-2.0.3.tar.gz
+7f82ae5f72f7d98dfab23efd956ede24  TurboMail-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 19:41:03 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 17 Sep 2007 15:41:03 -0400
Subject: rpms/dev86/devel dev86.spec,1.23,1.24
Message-ID: <200709171941.l8HJf3OQ020631@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/dev86/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20584

Modified Files:
	dev86.spec 
Log Message:
don't ifarch patch definition


Index: dev86.spec
===================================================================
RCS file: /cvs/extras/rpms/dev86/devel/dev86.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dev86.spec	27 Aug 2007 08:25:38 -0000	1.23
+++ dev86.spec	17 Sep 2007 19:40:31 -0000	1.24
@@ -1,15 +1,13 @@
 Summary: A real mode 80x86 assembler and linker
 Name: dev86
 Version: 0.16.17
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://homepage.ntlworld.com/robert.debath/
 Source: http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-%{version}.tar.gz
 Patch0: dev86-noelks.patch
-%ifarch x86_64
 Patch1: dev86-x86_64.patch
-%endif
 Patch2: dev86-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: bin86
@@ -81,6 +79,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep 17 2007 Jindrich Novy <jnovy at redhat.com> - 0.16.17-7
+- don't ifarch patch definition
+
 * Thu Aug 27 2007 Jindrich Novy <jnovy at redhat.com> - 0.16.17-6
 - add missing BR on gawk
 - rebuild (#249952)



From fedora-extras-commits at redhat.com  Mon Sep 17 19:41:15 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 15:41:15 -0400
Subject: rpms/control-center/devel .cvsignore, 1.62, 1.63 control-center.spec,
	1.301, 1.302 sources, 1.65, 1.66
Message-ID: <200709171941.l8HJfFRn020668@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20605

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	4 Sep 2007 16:29:59 -0000	1.62
+++ .cvsignore	17 Sep 2007 19:40:42 -0000	1.63
@@ -1 +1 @@
-gnome-control-center-2.19.92.tar.bz2
+gnome-control-center-2.20.0.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- control-center.spec	4 Sep 2007 16:29:59 -0000	1.301
+++ control-center.spec	17 Sep 2007 19:40:42 -0000	1.302
@@ -21,12 +21,12 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/gnome-control-center/2.19/gnome-control-center-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-control-center/2.20/gnome-control-center-%{version}.tar.bz2
 
 # Remove "Apply" button and just have "Close" instead
 # FIXME: figure out how this applies to the new appearance capplet
@@ -386,6 +386,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	4 Sep 2007 16:29:59 -0000	1.65
+++ sources	17 Sep 2007 19:40:42 -0000	1.66
@@ -1 +1 @@
-c7019c6351c46a413a90256762c33e57  gnome-control-center-2.19.92.tar.bz2
+a3d5f41cd9e30e8f777c5ae43070557b  gnome-control-center-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 17 19:42:01 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 15:42:01 -0400
Subject: rpms/lapack/EL-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE Makefile.blas, 1.5, NONE Makefile.lapack, 1.4,
	NONE blas-bz143340.patch, 1.3, NONE blasqr.ps, 1.1, NONE branch,
	1.1, NONE lapack-20010525.patch, 1.1,
	NONE lapack-3.1.0-make.inc.patch, 1.1,
	NONE lapack-3.1.0-no-external-etime.patch, 1.1,
	NONE lapack-3.1.1-make.inc.patch, 1.1,
	NONE lapack-fixlwork.patch, 1.1, NONE lapack.spec, 1.17,
	NONE lapackqref.ps, 1.1, NONE sources, 1.5, NONE
Message-ID: <200709171942.l8HJg1Ma020742@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733

Added Files:
	dead.package 
Removed Files:
	Makefile Makefile.blas Makefile.lapack blas-bz143340.patch 
	blasqr.ps branch lapack-20010525.patch 
	lapack-3.1.0-make.inc.patch 
	lapack-3.1.0-no-external-etime.patch 
	lapack-3.1.1-make.inc.patch lapack-fixlwork.patch lapack.spec 
	lapackqref.ps sources 
Log Message:

Dead package lapack in EL-5.



--- NEW FILE dead.package ---
lapack is already in RHEL 5. My mistake.


--- Makefile DELETED ---


--- Makefile.blas DELETED ---


--- Makefile.lapack DELETED ---


--- blas-bz143340.patch DELETED ---


--- blasqr.ps DELETED ---


--- branch DELETED ---


--- lapack-20010525.patch DELETED ---


--- lapack-3.1.0-make.inc.patch DELETED ---


--- lapack-3.1.0-no-external-etime.patch DELETED ---


--- lapack-3.1.1-make.inc.patch DELETED ---


--- lapack-fixlwork.patch DELETED ---


--- lapack.spec DELETED ---


--- lapackqref.ps DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 19:50:29 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 15:50:29 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner-1.9a6-xds.patch,NONE,1.1
Message-ID: <200709171950.l8HJoTZi020991@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20982

Added Files:
	xulrunner-1.9a6-xds.patch 
Log Message:
Actually add xds patch

xulrunner-1.9a6-xds.patch:

--- NEW FILE xulrunner-1.9a6-xds.patch ---
Index: content/base/src/nsContentAreaDragDrop.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/base/src/nsContentAreaDragDrop.cpp,v
retrieving revision 1.69
diff -u -r1.69 nsContentAreaDragDrop.cpp
--- content/base/src/nsContentAreaDragDrop.cpp	8 Jul 2007 07:08:07 -0000	1.69
+++ content/base/src/nsContentAreaDragDrop.cpp	16 Sep 2007 20:11:36 -0000
@@ -855,9 +855,6 @@
     return NS_ERROR_NO_INTERFACE;
   }
 
-  rv = inDestFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // we rely on the fact that the WPB is refcounted by the channel etc,
   // so we don't keep a ref to it. It will die when finished.
   nsCOMPtr<nsIWebBrowserPersist> persist =
@@ -921,21 +918,32 @@
     if (targetFilename.IsEmpty())
       return NS_ERROR_FAILURE;
 
-    // get the target directory from the kFilePromiseDirectoryMime
-    // flavor
-    nsCOMPtr<nsISupports> dirPrimitive;
+    nsCOMPtr<nsIFile> file;
+
+    nsCOMPtr<nsISupports> fullpathPrimitive;
     dataSize = 0;
-    aTransferable->GetTransferData(kFilePromiseDirectoryMime,
-                                   getter_AddRefs(dirPrimitive), &dataSize);
-    nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
-    if (!destDirectory)
-      return NS_ERROR_FAILURE;
+    aTransferable->GetTransferData(kFilePromiseFullpathMime,
+                                   getter_AddRefs(fullpathPrimitive), &dataSize);
+    file = do_QueryInterface(fullpathPrimitive);
+    if (!file) {
+      // get the target directory from the kFilePromiseDirectoryMime
+      // flavor
+      nsCOMPtr<nsISupports> dirPrimitive;
+      dataSize = 0;
+      aTransferable->GetTransferData(kFilePromiseDirectoryMime,
+                                     getter_AddRefs(dirPrimitive), &dataSize);
+      nsCOMPtr<nsILocalFile> destDirectory = do_QueryInterface(dirPrimitive);
+      if (!destDirectory)
+        return NS_ERROR_FAILURE;
 
-    nsCOMPtr<nsIFile> file;
-    rv = destDirectory->Clone(getter_AddRefs(file));
-    NS_ENSURE_SUCCESS(rv, rv);
+      rv = destDirectory->Clone(getter_AddRefs(file));
+      NS_ENSURE_SUCCESS(rv, rv);
 
-    file->Append(targetFilename);
+      file->Append(targetFilename);
+
+      rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
 
     // now save the file
     rv = SaveURIToFile(sourceURLString, file);
Index: widget/public/nsITransferable.idl
===================================================================
RCS file: /cvsroot/mozilla/widget/public/nsITransferable.idl,v
retrieving revision 1.12
diff -u -r1.12 nsITransferable.idl
--- widget/public/nsITransferable.idl	12 Jun 2006 17:30:22 -0000	1.12
+++ widget/public/nsITransferable.idl	16 Sep 2007 20:12:24 -0000
@@ -70,6 +70,7 @@
 #define kFilePromiseMime            "application/x-moz-file-promise"
 // a synthetic flavor, put into the transferable once we know the destination directory of a file drag
 #define kFilePromiseDirectoryMime   "application/x-moz-file-promise-dir"
+#define kFilePromiseFullpathMime    "application/x-moz-file-promise-fullpath"
 
 %}
 
Index: widget/src/gtk2/nsDragService.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
retrieving revision 1.19
diff -u -r1.19 nsDragService.cpp
--- widget/src/gtk2/nsDragService.cpp	7 Aug 2007 15:18:38 -0000	1.19
+++ widget/src/gtk2/nsDragService.cpp	16 Sep 2007 20:12:26 -0000
@@ -60,11 +60,16 @@
 #include "gfxASurface.h"
 #include "nsImageToPixbuf.h"
 
+#define XDS_ATOM   gdk_atom_intern("XdndDirectSave0", FALSE)
+#define TEXT_ATOM  gdk_atom_intern("text/plain", FALSE)
+#define MAX_XDS_ATOM_VAL_LEN 4096
+
 static PRLogModuleInfo *sDragLm = NULL;
 
 static const char gMimeListType[] = "application/x-moz-internal-item-list";
 static const char gMozUrlType[] = "_NETSCAPE_URL";
 static const char gTextUriListType[] = "text/uri-list";
+static const char gDirectSaveType[] = "XdndDirectSave0";
 
 static void
 invisibleSourceDragEnd(GtkWidget        *aWidget,
@@ -79,6 +84,11 @@
                            guint32           aTime,
                            gpointer          aData);
 
+void
+invisibleSourceDragBegin(GtkWidget        *aWidget,
+                         GdkDragContext   *aContext,
+                         gpointer          aData);
+
 nsDragService::nsDragService()
 {
     // We have to destroy the hidden widget before the event loop stops
@@ -96,6 +106,8 @@
     // from our drag source
     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_data_get",
                        GTK_SIGNAL_FUNC(invisibleSourceDragDataGet), this);
+    gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_begin",
+                       GTK_SIGNAL_FUNC(invisibleSourceDragBegin), this);
     gtk_signal_connect(GTK_OBJECT(mHiddenWidget), "drag_end",
                        GTK_SIGNAL_FUNC(invisibleSourceDragEnd), this);
 
@@ -989,6 +1001,21 @@
                                    id %ld\n", urlTarget->target, urlAtom));
                             targetArray.AppendElement(urlTarget);
                         }
+                        // XdndDirectSave
+                        if (strcmp(flavorStr, kFilePromiseMime) == 0) {
+                            // get the atom for the unicode string
+                            GdkAtom directsaveAtom =
+                              gdk_atom_intern(gDirectSaveType, FALSE);
+                            GtkTargetEntry *directsaveTarget =
+                             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                            directsaveTarget->target = g_strdup(gDirectSaveType);
+                            directsaveTarget->flags = 0;
+                            directsaveTarget->info = GPOINTER_TO_UINT(directsaveAtom);
+                            PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                   ("automatically adding target %s with \
+                                   id %ld\n", directsaveTarget->target, directsaveAtom));
+                            targetArray.AppendElement(directsaveTarget);
+                        }
                     }
                 } // foreach flavor in item
             } // if valid flavor list
@@ -1024,6 +1051,52 @@
 }
 
 void
+nsDragService::SourceBeginDrag(GdkDragContext *context)
+{
+    nsCOMPtr<nsISupports> genericItem;
+    mSourceDataItems->GetElementAt(0, getter_AddRefs(genericItem));
+    nsCOMPtr<nsITransferable> transferable(do_QueryInterface(genericItem));
+
+    nsresult rv;
+    nsCOMPtr<nsISupportsArray> flavorList;
+    rv = transferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
+    NS_ENSURE_SUCCESS(rv,);
+
+    PRUint32 cnt;
+    flavorList->Count(&cnt);
+
+    for (PRUint32 i = 0; i < cnt; ++i) {
+        nsCOMPtr<nsISupports> genericWrapper;
+        flavorList->GetElementAt(i, getter_AddRefs(genericWrapper));
+        nsCOMPtr<nsISupportsCString> currentFlavor(do_QueryInterface(genericWrapper, &rv));
+        NS_ENSURE_SUCCESS(rv,);
+
+        nsXPIDLCString flavorStr;
+        currentFlavor->ToString(getter_Copies(flavorStr));
+        if (strcmp(flavorStr, kFilePromiseDestFilename) == 0) {
+            PRUint32 dataSize = 0;
+            nsCOMPtr<nsISupports> tmp;
+            transferable->GetTransferData(kFilePromiseDestFilename,
+                                          getter_AddRefs(tmp), &dataSize);
+            nsCOMPtr<nsISupportsString> fileName = do_QueryInterface(tmp, &rv);
+            NS_ENSURE_SUCCESS(rv,);
+
+            nsAutoString filenameStr;
+            fileName->GetData(filenameStr);
+
+            nsCString filenameCStr;
+            CopyUTF16toUTF8(filenameStr, filenameCStr);
+
+            gdk_property_change(context->source_window,
+                                XDS_ATOM, TEXT_ATOM,
+                                8, GDK_PROP_MODE_REPLACE,
+                                (guchar *)filenameCStr.get(),
+                                filenameCStr.Length());
+        }
+    }
+}
+
+void
 nsDragService::SourceEndDrag(void)
 {
     // this just releases the list of data items that we provide
@@ -1106,6 +1179,8 @@
                              guint32           aTime)
 {
     PR_LOG(sDragLm, PR_LOG_DEBUG, ("nsDragService::SourceDataGet"));
+    nsresult rv;
+
     GdkAtom atom = (GdkAtom)aInfo;
     nsXPIDLCString mimeFlavor;
     gchar *typeName = 0;
@@ -1134,6 +1209,7 @@
         // we can convert it.
         PRBool needToDoConversionToPlainText = PR_FALSE;
         const char* actualFlavor = mimeFlavor;
+printf("%s\n", actualFlavor);
         if (strcmp(mimeFlavor,kTextMime) == 0) {
             actualFlavor = kUnicodeMime;
             needToDoConversionToPlainText = PR_TRUE;
@@ -1150,16 +1226,60 @@
             actualFlavor = gTextUriListType;
             needToDoConversionToPlainText = PR_TRUE;
         }
+        else if (strcmp(mimeFlavor, gTextUriListType) == 0) {
+            actualFlavor = gTextUriListType;
+            needToDoConversionToPlainText = PR_TRUE;
+        }
+        else if (strcmp(mimeFlavor, gDirectSaveType) == 0) {
+            guchar *propText;
+            gint propLen;
+
+            if (!gdk_property_get(aContext->source_window,
+                                 XDS_ATOM, TEXT_ATOM,
+                                 0, MAX_XDS_ATOM_VAL_LEN,
+                                 FALSE, NULL, NULL, &propLen,
+                                 (unsigned char **)&propText))
+                return;
+
+            /* Zero-terminate the string */
+            propText = (guchar *)g_realloc(propText, propLen + 1);
+            propText[propLen] = '\0';
+
+            char *fullpath;
+            fullpath = g_filename_from_uri((gchar *)propText, NULL, NULL);
+            if (!fullpath)
+                return;
+
+            nsCOMPtr<nsILocalFile> file;
+            rv = NS_NewNativeLocalFile(nsDependentCString(fullpath),
+                                       PR_FALSE, getter_AddRefs(file));
+            NS_ENSURE_SUCCESS(rv,);
+
+            item->SetTransferData(kFilePromiseFullpathMime, file,
+                                  sizeof(nsILocalFile*));
+
+            actualFlavor = kFilePromiseMime;
+
+            g_free(fullpath);
+        }
         else
             actualFlavor = mimeFlavor;
 
         PRUint32 tmpDataLen = 0;
         void    *tmpData = NULL;
-        nsresult rv;
         nsCOMPtr<nsISupports> data;
         rv = item->GetTransferData(actualFlavor,
                                    getter_AddRefs(data),
                                    &tmpDataLen);
+
+        if (strcmp(actualFlavor, kFilePromiseMime) == 0) {
+            const char *result = NS_SUCCEEDED(rv) ? "S" : "F";
+            gtk_selection_data_set(aSelectionData,
+                                   aSelectionData->target,
+                                   8, (guchar *)result, 1);
+            return;
+        }
+
         if (NS_SUCCEEDED(rv)) {
             nsPrimitiveHelpers::CreateDataFromPrimitive (actualFlavor, data,
                                                          &tmpData, tmpDataLen);
@@ -1224,6 +1344,18 @@
 
 /* static */
 void
+invisibleSourceDragBegin(GtkWidget        *aWidget,
+                         GdkDragContext   *aContext,
+                         gpointer          aData)
+{
+    PR_LOG(sDragLm, PR_LOG_DEBUG, ("invisibleDragBegin"));
+    nsDragService *dragService = (nsDragService *)aData;
+    // The drag has ended.  Release the hostages!
+    dragService->SourceBeginDrag(aContext);
+}
+
+/* static */
+void
 invisibleSourceDragEnd(GtkWidget        *aWidget,
                        GdkDragContext   *aContext,
                        gpointer          aData)
Index: widget/src/gtk2/nsDragService.h
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.h,v
retrieving revision 1.4
diff -u -r1.4 nsDragService.h
--- widget/src/gtk2/nsDragService.h	12 Apr 2007 04:37:40 -0000	1.4
+++ widget/src/gtk2/nsDragService.h	16 Sep 2007 20:12:26 -0000
@@ -101,6 +101,7 @@
     // This is called when the drag started with the invisible widget
     // finishes.  It's called from within the drag service code but from
     // a callback - it needs to be public.
+    void           SourceBeginDrag(GdkDragContext *context);
     void           SourceEndDrag(void);
     void           SourceDataGet(GtkWidget        *widget,
                                  GdkDragContext   *context,



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:53 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:53 -0400
Subject: rpms/ipe/F-7 ipe-6.0pre28-patch1.patch,NONE,1.1 ipe.spec,1.13,1.14
Message-ID: <200709171955.l8HJtrms021347@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/F-7

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/F-7/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:37 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:20 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:56 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:56 -0400
Subject: rpms/ipe/FC-6 ipe-6.0pre28-patch1.patch, NONE, 1.1 ipe.spec, 1.13,
	1.14
Message-ID: <200709171955.l8HJtu6f021350@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/FC-6

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/FC-6/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:40 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:24 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 19:55:59 2007
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Mon, 17 Sep 2007 15:55:59 -0400
Subject: rpms/ipe/devel ipe-6.0pre28-patch1.patch, NONE, 1.1 ipe.spec, 1.13,
	1.14
Message-ID: <200709171955.l8HJtxLj021353@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21275/devel

Modified Files:
	ipe.spec 
Added Files:
	ipe-6.0pre28-patch1.patch 
Log Message:
* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
- New upstream patch.


ipe-6.0pre28-patch1.patch:

--- NEW FILE ipe-6.0pre28-patch1.patch ---
diff -r -u ipe-6.0pre28/src/include/ipegeo.h ipe-6.0pre28-patch1/src/include/ipegeo.h
--- ipe-6.0pre28/src/include/ipegeo.h	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/include/ipegeo.h	2007-09-17 17:06:45.000000000 +0200
@@ -251,7 +251,8 @@
   static void ClosedSpline(int n,  const IpeVector *v,
 			   std::vector<IpeBezier> &result);
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &l, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
 public:
   IpeVector iV[4];
 };
@@ -312,7 +313,16 @@
 		  IpeVector &pos, IpeAngle &angle);
   IpeRect BBox() const;
   bool Intersects(const IpeLine &l, IpeVector &pt) const;
-  bool Intersects(const IpeSegment &l, IpeVector &pt) const;
+  bool Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeArc &a, std::vector<IpeVector> &result) const;
+  bool Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const;
+
+private:
+  void Subdivide(IpeArc &l, IpeArc &r) const;
+  bool Straight(const double precision) const;
+  void GetCPs(IpeVector &start, IpeVector &end) const;
+  void AsSegment(IpeSegment &seg) const;
+
 public:
   IpeMatrix iM;
   IpeAngle iAlpha;
diff -r -u ipe-6.0pre28/src/ipelib/ipegeo.cpp ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp
--- ipe-6.0pre28/src/ipelib/ipegeo.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipegeo.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -691,18 +691,108 @@
 		 box.Max() + IpeVector(0.5, 0.5));
 }
 
+
+
+/* Determines intersection point(s) of two cubic Bezier-Splines.
+ * The found intersection points are stored in the vector intersections.
+ */
+void IntersectBeziers(std::vector<IpeVector> &intersections,
+                      IpeBezier &a,
+                      IpeBezier &b) {
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Beziers overlap, both are subdivided, 
+   * each one into two partial Beziers.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Beziers overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved:
+   * Then the Beziers are converted to Segments and checked for intersection.
+   *
+   * Intersection points that lie near the first or last control point
+   * of a bezier (have a distance of less than MIN_DIST to a cp) are ignored;
+   * this is to avoid connection points of two beziers accidentaly being
+   * misinterpreted as intersections.
+   */
+
+  double PRECISION = 1.0;
+  double MIN_DIST = 0.05;
+
+  a = a; b = b; intersections = intersections;
+
+  IpeRect bboxA = a.BBox();
+  IpeRect bboxB = b.BBox();
+
+  if (!bboxA.Intersects(bboxB)) {
+    return;
+  }
+
+  if (a.Straight(PRECISION) && b.Straight(PRECISION)) {
+    // Recursion anchor!
+
+    IpeSegment aLine = IpeSegment(a.iV[0], a.iV[3]);
+    IpeSegment bLine = IpeSegment(b.iV[0], b.iV[3]);
+
+    IpeVector p;
+
+    if (aLine.Intersects(bLine, p)) {
+      /* We found an intersection point.
+       * If this point is too close to one of the outer control 
+       * points, it is ignorated.
+       */
+
+      if ((p-a.iV[0]).Len() < MIN_DIST ||
+          (p-a.iV[3]).Len() < MIN_DIST ||
+          (p-b.iV[0]).Len() < MIN_DIST ||
+          (p-b.iV[3]).Len() < MIN_DIST) {
+        //Ignoring intersection too close to control point.
+      } else {
+        //Found intersection (p.iX, p.iY)
+        intersections.push_back(p);
+      }
+    }
+
+    return;
+  }
+
+  IpeBezier leftA, rightA, leftB, rightB;
+  a.Subdivide(leftA, rightA);
+  b.Subdivide(leftB, rightB);
+
+  IntersectBeziers(intersections, leftA, leftB);
+  IntersectBeziers(intersections, rightA, leftB);
+  IntersectBeziers(intersections, leftA, rightB);
+  IntersectBeziers(intersections, rightA, rightB);
+}  
+
+
+
 bool IpeBezier::Intersects(const IpeLine &, IpeVector &) const
 {
   // XXX
   return false;
 }
 
-bool IpeBezier::Intersects(const IpeSegment &, IpeVector &) const
+/* Returns intersection point(s) of Bezier with Segment
+ */
+bool IpeBezier::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+ //convert Segment to Bezier and use Bezier-Bezier-intersection check
+  IpeBezier b2(s.iQ, s.iQ, s.iP, s.iP);
+  IpeBezier b1 = (*this);  
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);
 }
 
+/* Returns intersection point(s) of Bezier with Bezier
+ */
+bool IpeBezier::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  IpeBezier b2 = b; 
+  IpeBezier b1 = (*this);
+  IntersectBeziers(result, b1, b2);
+  return (result.size()>=1);  
+}
+
+
 // --------------------------------------------------------------------
 
 /*! \class IpeArc
@@ -813,10 +903,198 @@
   return false;
 }
 
-bool IpeArc::Intersects(const IpeSegment &, IpeVector &) const
+// --------------------------------------------------------------------
+
+/* Returns intersection point(s) of Arc with Segment
+ */
+bool IpeArc::Intersects(const IpeSegment &s, std::vector<IpeVector> &result) const
 {
-  // XXX
-  return false;
+  //First convert the Segment to a Bezier, then check Arc-Bezier-intersection
+  IpeBezier b(s.iQ, s.iQ, s.iP, s.iP);
+  return Intersects(b, result);
+}
+
+/* Returns intersection point(s) of Arc with Arc
+ */
+bool IpeArc::Intersects(const IpeArc &a, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of two Arcs overlap, both are subdivided, 
+   * each one into two partial Arcs.
+   * In the next recursion steps, it is checked if the bounding boxes 
+   * of the partial Arcs overlap. If they do, they are subdivided 
+   * again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(a.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && a.Straight(PRECISION)) {
+    IpeSegment segThis, segA;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    a.AsSegment(segA);
+
+    if (segThis.Intersects(segA, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeArc bl, br;
+  a.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Returns intersection point(s) of Arc with Bezier
+ */
+bool IpeArc::Intersects(const IpeBezier &b, std::vector<IpeVector> &result) const
+{
+  /* Recursive approximation procedure to find intersections:
+   * If the bounding boxes of the Bezier and the Arc overlap, both are 
+   * subdivided, the Bezier into two Beziers and the Arc into two Arcs.
+   * In the next recursion steps, it is checked if a bounding box 
+   * of a partial Bezier overlap one of a partial Arc. If they overlap, 
+   * they are subdivided again and so on, until a special precision is achieved.
+   */
+
+  const double PRECISION = 0.05; //0.05 is about ~2.8647 degrees
+
+  if (!BBox().Intersects(b.BBox())) {
+    return false;
+  }
+
+  if (Straight(PRECISION) && b.Straight(PRECISION)) {
+    IpeSegment segThis, segB;
+    IpeVector pt;
+
+    AsSegment(segThis);
+    segB = IpeSegment(b.iV[0], b.iV[3]);
+
+    if (segThis.Intersects(segB, pt)) {
+      result.push_back(pt);
+      return true;
+    } else 
+      return false;
+  }
+
+  IpeArc al, ar;
+  Subdivide(al, ar);
+  IpeBezier bl, br;
+  b.Subdivide(bl, br);
+
+  al.Intersects(bl, result);
+  al.Intersects(br, result);
+  ar.Intersects(bl, result);
+  ar.Intersects(br, result);
+
+  return result.size() > 0;
+}
+
+/* Subdivide this arc into two.
+ */
+void IpeArc::Subdivide(IpeArc &l, IpeArc &r) const
+{
+  double gamma;
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta;
+
+  /* This works as following:
+   * alpha is the start- and beta the endangle of the arc.
+   * We ensure that both are positive and that
+   * alpha < beta. Then the angle gamma that lies exactly
+   * between alpha and beta is calculated.
+   * Two new arcs are created: One from alpha to gamma
+   * and one from gamma to beta.
+   *
+   * XXX This might result in orientation information not
+   * being passed to the subdivided arcs!
+   */
+
+  if (alpha == 0.0 && beta == 0.0) {
+    alpha = -M_PI;
+    beta = M_PI;
+  }
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  if (alpha > beta)
+    beta += 2*M_PI;
+
+  gamma = alpha + (beta - alpha) / 2.0;
+
+  if (gamma >= 2*M_PI)
+    gamma -= 2*M_PI;
+
+  if (gamma > M_PI)
+    gamma -= 2*M_PI;
+
+  l = IpeArc(iM, iAlpha, IpeAngle(gamma));
+  r = IpeArc(iM, IpeAngle(gamma), iBeta);
+}
+
+/* Returns true if the difference between start- and
+ * endangle is less than precision.
+ */
+bool IpeArc::Straight(const double precision) const
+{
+  double alpha = (double) iAlpha,
+         beta = (double) iBeta,
+         diff;
+
+  if (alpha == 0.0 && beta == 0.0)
+    return false;
+
+  if (alpha < 0.0)
+    alpha += 2*M_PI;
+  
+  if (beta < 0.0)
+    beta += 2*M_PI;
+
+  diff = beta - alpha;
+  diff = diff < .0 ? -diff : diff;
+
+  return diff < precision;
 }
 
+/* Return the start- and endpoint of the arc.
+ */
+void IpeArc::GetCPs(IpeVector &start, IpeVector &end) const {
+  double alpha, beta;
+
+  alpha = (double) iAlpha;
+  beta = (double) iBeta;
+
+  start = (iM * IpeVector(cos(alpha), sin(alpha)));
+  end = (iM * IpeVector(cos(beta), sin(beta)));
+}
+
+/* Approximate the arc as a straight segment.
+ */
+void IpeArc::AsSegment(IpeSegment &seg) const {
+  IpeVector start, end;
+
+  GetCPs(start, end);
+
+  seg = IpeSegment(start, end);
+}
+
+
 // --------------------------------------------------------------------
diff -r -u ipe-6.0pre28/src/ipelib/ipesnap.cpp ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp
--- ipe-6.0pre28/src/ipelib/ipesnap.cpp	2006-12-23 16:05:08.000000000 +0100
+++ ipe-6.0pre28-patch1/src/ipelib/ipesnap.cpp	2007-09-17 17:06:45.000000000 +0200
@@ -194,7 +194,8 @@
   IpeVector pos1 = pos;
   IpeVector v;
   double d1;
-
+ 
+ //1. Perform seg-seg-intersection snapping
   for (uint i = 0; i < segs.iSegs.size(); i++) {
     for (uint j = i+1; j < segs.iSegs.size(); j++) {
       if (segs.iSegs[i].Intersects(segs.iSegs[j], v) &&
@@ -204,6 +205,81 @@
       }
     }
   }
+
+ //2. Perform bezier-bezier-intersection snapping
+  std::vector<IpeVector> vv;
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = i+1; j < segs.iBeziers.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+ //3. Perform arc-arc-intersection snapping  
+ //and arc-bezier-intersection snapping
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = i+1; j < segs.iArcs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iArcs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+    vv.clear();
+    
+    for (uint j=0;j<segs.iBeziers.size();j++) {
+      if (segs.iArcs[i].Intersects(segs.iBeziers[j], vv)) {
+        for (uint k=0;k<vv.size();k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+      vv.clear();
+    }
+  }
+
+ //4. Perform bezier-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iBeziers.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iBeziers[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
+
+ //5. Perform arc-seg-intersection snapping
+  vv.clear();
+  for (uint i = 0; i < segs.iArcs.size(); i++) {
+    for (uint j = 0; j < segs.iSegs.size(); j++) {
+      if (segs.iArcs[i].Intersects(segs.iSegs[j], vv)) {
+        for (uint k = 0; k < vv.size(); k++) {
+          if ((d1 = (pos - (vv[k])).Len()) < d) {
+            d = d1;
+            pos1 = vv[k];
+          }
+        }
+      }
+    }
+  }
+
   if (d < snapDist) {
     pos = pos1;
     return true;


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ipe.spec	27 Aug 2007 19:55:44 -0000	1.13
+++ ipe.spec	17 Sep 2007 19:55:27 -0000	1.14
@@ -2,14 +2,15 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.20.pre%{preversion}%{?dist}
+Release:        0.21.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre28-no-freetype-version-check.patch
+Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -23,7 +24,7 @@
 Requires:       urw-fonts
 Requires:       htmlview
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = 5.99.%{preversion}.1pre
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -50,7 +51,8 @@
 
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
-%patch0 -p1 -b .no-freetype-check
+%patch10 -p1 -b .no-freetype-check
+%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -148,6 +150,7 @@
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
+%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -157,6 +160,9 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Mon Sep 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.21.pre28%{?dist}
+- New upstream patch.
+
 * Mon Aug 27 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.20.pre28%{?dist}
 - Change the URL, in Source0.
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, devel) updated by katzj
Message-ID: <200709172000.l8HK0OCN013511@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora devel to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora devel) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora devel) for davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, 7) updated by katzj
Message-ID: <200709172000.l8HK0PQi013522@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora 7 to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora 7) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora 7) for davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From fedora-extras-commits at redhat.com  Mon Sep 17 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Sep 2007 13:00:23 -0700
Subject: [pkgdb] livecd-tools (Fedora, 6) updated by katzj
Message-ID: <200709172000.l8HK0PLK013534@app3.fedora.phx.redhat.com>

Jeremy Katz (katzj) changed owner of livecd-tools in Fedora 6 to katzj
Jeremy Katz (katzj) approved watchbugzilla on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved watchcommits on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved commit on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved build on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved approveacls on livecd-tools (Fedora 6) for davidz
Jeremy Katz (katzj) approved checkout on livecd-tools (Fedora 6) for davidz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/livecd-tools



From fedora-extras-commits at redhat.com  Mon Sep 17 20:02:40 2007
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Mon, 17 Sep 2007 16:02:40 -0400
Subject: rpms/gcstar/FC-6 gcstar.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <200709172002.l8HK2eHF027509@cvs-int.fedora.redhat.com>

Author: tian

Update of /cvs/extras/rpms/gcstar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481

Modified Files:
	gcstar.spec sources 
Log Message:
New upstream version


Index: gcstar.spec
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/gcstar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcstar.spec	9 Sep 2007 17:15:14 -0000	1.6
+++ gcstar.spec	17 Sep 2007 20:02:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           gcstar
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Personal collections manager
 
@@ -101,6 +101,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Sep 17 2007 Tian <tian at c-sait.net> - 1.2.2-1
+  - New upstream version
 * Sat Sep 09 2007 Tian <tian at c-sait.net> - 1.2.0-1
   - New upstream version
 * Thu Aug 16 2007 Tian <tian at c-sait.net> - 1.1.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcstar/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2007 17:15:14 -0000	1.4
+++ sources	17 Sep 2007 20:02:07 -0000	1.5
@@ -1 +1 @@
-4fa37275b0a104ec5c921871cda73966  gcstar-1.2.0.tar.gz
+c3a20cf6e34522ba901f152ed53d891a  gcstar-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:05:54 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 16:05:54 -0400
Subject: rpms/evolution/devel .cvsignore, 1.77,
	1.78 evolution-2.10.0-e-source-combo-box.patch, 1.5,
	1.6 evolution.spec, 1.290, 1.291 sources, 1.77,
	1.78 evolution-2.9.1-first-ascii.patch, 1.1, NONE
Message-ID: <200709172005.l8HK5s74027654@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27582

Modified Files:
	.cvsignore evolution-2.10.0-e-source-combo-box.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.9.1-first-ascii.patch 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0
- Remove patch for RH bug #182247 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	4 Sep 2007 03:23:24 -0000	1.77
+++ .cvsignore	17 Sep 2007 20:05:20 -0000	1.78
@@ -1 +1 @@
-evolution-2.11.92.tar.bz2
+evolution-2.12.0.tar.bz2

evolution-2.10.0-e-source-combo-box.patch:

Index: evolution-2.10.0-e-source-combo-box.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.0-e-source-combo-box.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.10.0-e-source-combo-box.patch	21 Aug 2007 02:45:51 -0000	1.5
+++ evolution-2.10.0-e-source-combo-box.patch	17 Sep 2007 20:05:20 -0000	1.6
@@ -1,5 +1,6 @@
---- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-07-05 02:11:06.000000000 -0400
-+++ evolution-2.11.90/widgets/misc/e-pilot-settings.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.12.0/widgets/misc/e-pilot-settings.c
+--- evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box	2007-09-16 15:33:23.000000000 -0400
++++ evolution-2.12.0/widgets/misc/e-pilot-settings.c	2007-09-17 14:31:05.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtk.h>
@@ -40,8 +41,9 @@
  }
  
  gboolean
---- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-08-09 02:46:59.000000000 -0400
-+++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-formatter.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box	2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-formatter.c	2007-09-17 14:31:05.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <camel/camel-store.h>
  #include <libecal/e-cal.h>
@@ -51,8 +53,9 @@
  #include <libedataserverui/e-source-selector.h>
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <mail/em-format-hook.h>
---- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-07-28 15:37:56.000000000 -0400
-+++ evolution-2.11.90/plugins/itip-formatter/itip-view.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-view.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box	2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-view.c	2007-09-17 14:31:05.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-mime-message.h>
  #include <libedataserver/e-time-utils.h>
@@ -177,8 +180,9 @@
  }
  
  void
---- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/gaimbuddies.c
+--- evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box	2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/gaimbuddies.c	2007-09-17 14:31:05.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <string.h>
  
@@ -188,8 +192,9 @@
  
  #include <sys/time.h>
  #include <sys/stat.h>
---- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box	2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/bbdb.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/bbdb.c
+--- evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box	2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/bbdb.c	2007-09-17 14:31:05.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <string.h>
  
@@ -408,8 +413,9 @@
  	gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
  	gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0);
  	stuff->gaim_option_menu = gaim_option;
---- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-07-05 02:06:54.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box	2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -158,9 +158,9 @@
  		  </child>
  
@@ -422,8 +428,9 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
---- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-07-05 02:06:54.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box	2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-09-17 14:31:05.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -539,8 +546,9 @@
  		gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
  		gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
  	}
---- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-07-08 22:46:43.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -356,9 +356,9 @@
  		      </child>
  
@@ -553,8 +561,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
---- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-08-09 02:46:47.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c	2007-09-17 14:31:05.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <text/e-entry.h>
  
@@ -667,8 +676,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-07-28 15:38:05.000000000 -0400
-+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-09-17 14:31:05.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <libgnomeui/gnome-app.h>
  #include <libebook/e-book.h>
@@ -717,8 +727,9 @@
  	
  	g_object_unref (source_list);	
  
---- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -194,7 +194,7 @@
  		  <child>
  		    <widget class="Custom" id="source">
@@ -728,8 +739,9 @@
  		      <property name="int1">0</property>
  		      <property name="int2">0</property>
  		      <property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -827,7 +827,7 @@
  		      <child>
  			<widget class="Custom" id="source">
@@ -739,8 +751,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.glade	2007-09-17 14:31:05.000000000 -0400
 @@ -671,7 +671,7 @@
  			<widget class="Custom" id="source">
  			  <property name="height_request">24</property>
@@ -750,8 +763,9 @@
  			  <property name="int1">0</property>
  			  <property name="int2">0</property>
  			  <property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
---- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.c	2007-09-17 14:31:44.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -761,16 +775,16 @@
  #include <libedataserverui/e-name-selector.h>
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
-@@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage *
- 	ECalComponentDateTime d;
+@@ -352,7 +352,6 @@ memo_page_fill_widgets (CompEditorPage *
  	GSList *l;
  	const char *categories;
+ 	gchar *backend_addr = NULL;
 -	ESource *source;
  
  	mpage = MEMO_PAGE (page);
  	priv = mpage->priv;
-@@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage *
- 	}
+@@ -451,8 +450,9 @@ memo_page_fill_widgets (CompEditorPage *
+ 		g_free (backend_addr);
  
  	/* Source */
 -	source = e_cal_get_source (page->client);
@@ -781,7 +795,7 @@
  
  	priv->updating = FALSE;
  
-@@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -893,13 +893,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -799,7 +813,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -911,8 +910,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -811,7 +825,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage)
+@@ -1055,7 +1055,7 @@ init_widgets (MemoPage *mpage)
  			    G_CALLBACK (categories_clicked_cb), mpage);
  
  	/* Source selector */
@@ -820,7 +834,7 @@
  			 G_CALLBACK (source_changed_cb), mpage);
  	
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void)
+@@ -1271,22 +1271,23 @@ memo_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -851,8 +865,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/event-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.c	2007-09-17 14:31:05.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <glib/gi18n.h>
@@ -862,7 +877,7 @@
  #include "common/authentication.h"
  #include "e-util/e-categories-config.h"
  #include "e-util/e-dialog-widgets.h"
-@@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage 
+@@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage 
  	const char *location, *uid = NULL;
  	const char *categories;
  	gchar *backend_addr = NULL;
@@ -870,7 +885,7 @@
  	GSList *l;
  	gboolean validated = TRUE;
  	
-@@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage 
+@@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage 
  	e_dialog_editable_set (priv->categories, categories);
  	
  	/* Source */
@@ -882,7 +897,7 @@
  
  	e_cal_component_get_uid (comp, &uid);
  	if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) 
-@@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event
+@@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (Event
  
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
@@ -892,7 +907,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
  		priv->sod->data->initialized = TRUE;
  	}	
-@@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -910,7 +925,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -922,7 +937,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage)
+@@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage)
  			    G_CALLBACK (categories_clicked_cb), epage);
  	
  	/* Source selector */
@@ -931,7 +946,7 @@
  			    G_CALLBACK (source_changed_cb), epage);
  	/* Alarms */
  	priv->alarm_list_store = e_alarm_list_new ();
-@@ -3315,24 +3316,25 @@ make_timezone_entry (void)
+@@ -3306,24 +3307,25 @@ make_timezone_entry (void)
  	return w;
  }
  
@@ -964,8 +979,9 @@
  }
  
  GtkWidget *make_status_icons (void);
---- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-08-13 06:41:54.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/dialogs/task-page.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.c	2007-09-17 14:31:58.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <glib/gi18n.h>
@@ -975,15 +991,15 @@
  #include <misc/e-dateedit.h>
  #include <e-util/e-dialog-utils.h>
  #include "common/authentication.h"
-@@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage *
- 	icalcomponent *icalcomp;
+@@ -533,7 +533,6 @@ task_page_fill_widgets (CompEditorPage *
  	const char *categories, *uid;
  	icaltimezone *zone, *default_zone;
+ 	gchar *backend_addr = NULL;
 -	ESource *source;
  
  	tpage = TASK_PAGE (page);
  	priv = tpage->priv;
-@@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage *
+@@ -677,8 +676,9 @@ task_page_fill_widgets (CompEditorPage *
  	e_dialog_editable_set (priv->categories, categories);
  
  	/* Source */
@@ -993,9 +1009,9 @@
 +		E_SOURCE_COMBO_BOX (priv->source_selector),
 +		e_cal_get_source (page->client));
  
- 	if (priv->is_assignment) {
- 		ECalComponentOrganizer organizer;	
-@@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo
+ 	e_cal_get_cal_address (COMP_EDITOR_PAGE (tpage)->client, &backend_addr, NULL);
+ 	set_subscriber_info_string (tpage, backend_addr);
+@@ -1688,13 +1688,12 @@ field_changed_cb (GtkWidget *widget, gpo
  }
  
  static void
@@ -1013,7 +1029,7 @@
  
  	if (!priv->updating) {
  		ECal *client;
-@@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1713,8 +1712,9 @@ source_changed_cb (GtkWidget *widget, ES
  			if (client)
  				g_object_unref (client);
  
@@ -1025,7 +1041,7 @@
  
  			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
  							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1726,7 +1726,7 @@ source_changed_cb (GtkWidget *widget, ES
  			comp_editor_notify_client_changed (
  				COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
  				client);
@@ -1034,7 +1050,7 @@
  			if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
  				task_page_show_options (tpage);
  			else
-@@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa
+@@ -1778,7 +1778,8 @@ task_page_sendoptions_clicked_cb (TaskPa
  	if (!priv->sod) {
  		priv->sod = e_sendoptions_dialog_new ();
  		priv->sod->data->initialized = TRUE;
@@ -1044,7 +1060,7 @@
  		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
  	}
  	
-@@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage)
+@@ -1836,7 +1837,7 @@ init_widgets (TaskPage *tpage)
  			    G_CALLBACK (categories_clicked_cb), tpage);
  	
  	/* Source selector */
@@ -1053,7 +1069,7 @@
  			 G_CALLBACK (source_changed_cb), tpage);
  
  	/* Connect the default signal handler to use to make sure the "changed"
-@@ -2093,22 +2094,23 @@ task_page_create_date_edit (void)
+@@ -2081,22 +2082,23 @@ task_page_create_date_edit (void)
  	return dedit;
  }
  
@@ -1084,8 +1100,9 @@
 +	gtk_widget_show (combo_box);
 +	return combo_box;
  }
---- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box	2007-07-05 02:11:20.000000000 -0400
-+++ evolution-2.11.90/calendar/gui/e-itip-control.c	2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.12.0/calendar/gui/e-itip-control.c
+--- evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-itip-control.c	2007-09-17 14:31:05.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- evolution.spec	15 Sep 2007 21:38:15 -0000	1.290
+++ evolution.spec	17 Sep 2007 20:05:20 -0000	1.291
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.92
-Release: 4%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -103,9 +103,6 @@
 # RH bug #176400
 Patch27: evolution-2.9.1-im-context-reset.patch
 
-# RH bug #182247
-Patch28: evolution-2.9.1-first-ascii.patch
-
 # RH bug #216537 / GNOME bug #383047
 #Patch29: evolution-2.9.3-view-attachment-uri.patch
 
@@ -260,7 +257,6 @@
 %patch25 -p1 -b .kill-ethread
 %patch26 -p1 -b .kill-ememory
 %patch27 -p1 -b .im-context-reset
-%patch28 -p1 -b .first-ascii
 #%patch29 -p1 -b .view-attachment-uri
 %patch30 -p1 -b .source-path-entry
 %patch31 -p1 -b .meeting-list-view
@@ -674,7 +670,6 @@
 %{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 %{evo_plugin_dir}/org-gnome-publish-calendar.xml
-%{evo_plugin_dir}/publish-calendar.glade
 
 %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
@@ -717,6 +712,10 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+- Remove patch for RH bug #182247 (fixed upstream).
+
 * Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
 - Add patch for GNOME bug #477045 (use standard icon names).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	4 Sep 2007 03:23:24 -0000	1.77
+++ sources	17 Sep 2007 20:05:20 -0000	1.78
@@ -1 +1 @@
-4149faf2ee5f0b0ed10114b076fb0ade  evolution-2.11.92.tar.bz2
+aaa378a63477b56de214ea9eaa7f8560  evolution-2.12.0.tar.bz2


--- evolution-2.9.1-first-ascii.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:06:10 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 16:06:10 -0400
Subject: rpms/qt4/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.14,
	NONE 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE Trolltech.conf,
	1.1, NONE assistant.desktop, 1.3, NONE designer.desktop, 1.2,
	NONE linguist.desktop, 1.2, NONE qconfig-multilib.h, 1.2,
	NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2,
	NONE qt-x11-opensource-src-4.2.2-multilib.patch, 1.1,
	NONE qt4-wrapper.sh, 1.3, NONE qt4.csh, 1.1, NONE qt4.macros,
	1.1, NONE qt4.sh, 1.1, NONE qt4.spec, 1.31,
	NONE qtconfig.desktop, 1.3, NONE qtdemo.desktop, 1.2,
	NONE sources, 1.12, NONE
Message-ID: <200709172006.l8HK6AR9027679@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670

Added Files:
	dead.package 
Removed Files:
	.cvsignore 0154-qdbuscpp2xml-moc_path.diff Trolltech.conf 
	assistant.desktop designer.desktop linguist.desktop 
	qconfig-multilib.h 
	qt-x11-opensource-src-4.1.2-assistant4.patch 
	qt-x11-opensource-src-4.2.2-multilib.patch qt4-wrapper.sh 
	qt4.csh qt4.macros qt4.sh qt4.spec qtconfig.desktop 
	qtdemo.desktop sources 
Log Message:
qt4 included in rhel5



--- NEW FILE dead.package ---
qt4 included in rhel5


--- .cvsignore DELETED ---


--- 0154-qdbuscpp2xml-moc_path.diff DELETED ---


--- Trolltech.conf DELETED ---


--- assistant.desktop DELETED ---


--- designer.desktop DELETED ---


--- linguist.desktop DELETED ---


--- qconfig-multilib.h DELETED ---


--- qt-x11-opensource-src-4.1.2-assistant4.patch DELETED ---


--- qt-x11-opensource-src-4.2.2-multilib.patch DELETED ---


--- qt4-wrapper.sh DELETED ---


--- qt4.csh DELETED ---


--- qt4.macros DELETED ---


--- qt4.sh DELETED ---


--- qt4.spec DELETED ---


--- qtconfig.desktop DELETED ---


--- qtdemo.desktop DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:42 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:42 -0400
Subject: rpms/ntfs-3g/F-7 ntfs-3g.spec,1.17,1.18 sources,1.13,1.14
Message-ID: <200709172007.l8HK7g0x027784@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/F-7

Modified Files:
	ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/ntfs-3g.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ntfs-3g.spec	26 Aug 2007 14:45:53 -0000	1.17
+++ ntfs-3g.spec	17 Sep 2007 20:07:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Aug 2007 14:45:53 -0000	1.13
+++ sources	17 Sep 2007 20:07:09 -0000	1.14
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:45 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:45 -0400
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.18,1.19 sources,1.14,1.15
Message-ID: <200709172007.l8HK7jIZ027788@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/FC-6

Modified Files:
	ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	26 Aug 2007 14:45:56 -0000	1.18
+++ ntfs-3g.spec	17 Sep 2007 20:07:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Aug 2007 14:45:56 -0000	1.14
+++ sources	17 Sep 2007 20:07:12 -0000	1.15
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:07:51 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 17 Sep 2007 16:07:51 -0400
Subject: rpms/ntfs-3g/devel .cvsignore, 1.12, 1.13 ntfs-3g.spec, 1.17,
	1.18 sources, 1.13, 1.14
Message-ID: <200709172007.l8HK7pNc027798@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712/devel

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:

Bump to 1.913 for big performance improvement



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Aug 2007 14:45:58 -0000	1.12
+++ .cvsignore	17 Sep 2007 20:07:17 -0000	1.13
@@ -3,3 +3,4 @@
 ntfs-3g-1.710.tgz
 ntfs-3g-1.810.tgz
 ntfs-3g-1.826.tgz
+ntfs-3g-1.913.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ntfs-3g.spec	26 Aug 2007 14:45:58 -0000	1.17
+++ ntfs-3g.spec	17 Sep 2007 20:07:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.826
+Version:	1.913
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
+- bump to 1.913
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.826-1
 - bump to 1.826
 - glibc27 patch is upstreamed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Aug 2007 14:45:58 -0000	1.13
+++ sources	17 Sep 2007 20:07:17 -0000	1.14
@@ -1 +1 @@
-b8bf23a3844ec00d758f04a6b88549ae  ntfs-3g-1.826.tgz
+d8093ce011683b39a683a948f94ce33a  ntfs-3g-1.913.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:10:53 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:10:53 -0700
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <200709172010.l8HKAsJw017344@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From fedora-extras-commits at redhat.com  Mon Sep 17 20:10:59 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:10:59 -0700
Subject: [pkgdb] device-mapper had acl change status
Message-ID: <200709172011.l8HKB0Bo017392@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:02 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:02 -0700
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <200709172012.l8HKC3pl017705@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on lvm2 (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:07 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:07 -0700
Subject: [pkgdb] lvm2 had acl change status
Message-ID: <200709172012.l8HKC8s2018818@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on lvm2 (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lvm2



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:33 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:33 -0700
Subject: [pkgdb] dmraid had acl change status
Message-ID: <200709172012.l8HKCXPM017869@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on dmraid (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From fedora-extras-commits at redhat.com  Mon Sep 17 20:12:36 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:12:36 -0700
Subject: [pkgdb] dmraid had acl change status
Message-ID: <200709172012.l8HKCaj4018961@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on dmraid (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dmraid



From fedora-extras-commits at redhat.com  Mon Sep 17 20:14:23 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:14:23 -0700
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <200709172014.l8HKENYW018375@app3.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper-multipath (Fedora devel) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From fedora-extras-commits at redhat.com  Mon Sep 17 20:14:26 2007
From: fedora-extras-commits at redhat.com (Alasdair Kergon (agk))
Date: Mon, 17 Sep 2007 13:14:26 -0700
Subject: [pkgdb] device-mapper-multipath had acl change status
Message-ID: <200709172014.l8HKER0k019467@app4.fedora.phx.redhat.com>

Alasdair Kergon (agk) has set the commit acl on device-mapper-multipath (Fedora 7) to Approved for Dave Wysochanski (dwysocha)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From fedora-extras-commits at redhat.com  Mon Sep 17 20:17:36 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 17 Sep 2007 16:17:36 -0400
Subject: rpms/mash/devel .cvsignore, 1.15, 1.16 mash.spec, 1.13, 1.14 sources,
	1.16, 1.17
Message-ID: <200709172017.l8HKHaQk028035@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28000

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Sep 2007 14:27:19 -0000	1.15
+++ .cvsignore	17 Sep 2007 20:17:03 -0000	1.16
@@ -1 +1 @@
-mash-0.2.3.tar.gz
+mash-0.2.4.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mash.spec	6 Sep 2007 14:27:19 -0000	1.13
+++ mash.spec	17 Sep 2007 20:17:03 -0000	1.14
@@ -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.2.3
+Version:        0.2.4
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Mon Sep 17 2007 Bill Nottingham <notting at redhat.com> 0.2.4-1
+- repoview support (<jkeating at redhat.com>)
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.2.3-1
 - blacklist java-1.7.0-icedtea-devel (#271761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2007 14:27:19 -0000	1.16
+++ sources	17 Sep 2007 20:17:03 -0000	1.17
@@ -1 +1 @@
-e3da610758f7d1c7ce5568dc44746541  mash-0.2.3.tar.gz
+03ab739b45298a4db6e5d56eb549b6bc  mash-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 20:31:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:31:06 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.21, 1.22 sources, 
	1.21, 1.22 sugar-presence-service.spec, 1.21, 1.22
Message-ID: <200709172031.l8HKV6xv028542@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28501

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Sep 2007 20:02:34 -0000	1.21
+++ .cvsignore	17 Sep 2007 20:30:33 -0000	1.22
@@ -1 +1 @@
-sugar-presence-service-0.65-gitb8d04713ac.tar.bz2
+sugar-presence-service-0.65-git46898a3e00.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Sep 2007 20:02:34 -0000	1.21
+++ sources	17 Sep 2007 20:30:33 -0000	1.22
@@ -1 +1 @@
-ab6018517e2e67ab9435125ecbc1db38  sugar-presence-service-0.65-gitb8d04713ac.tar.bz2
+0af58d6647aef1a3c606c447db4164ec  sugar-presence-service-0.65-git46898a3e00.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sugar-presence-service.spec	12 Sep 2007 20:02:35 -0000	1.21
+++ sugar-presence-service.spec	17 Sep 2007 20:30:33 -0000	1.22
@@ -1,9 +1,9 @@
-%define alphatag 20070912git
-%define commitid b8d04713ac
+%define alphatag 20070917git
+%define commitid 46898a3e00
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.16.%{alphatag}b8d04713ac
+Release: 0.17.%{alphatag}46898a3e00
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
+- New snapshot
+
 * Wed Sep 12 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.16.20070912gitb8d04713ac
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:39:44 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:39:44 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.52, 1.53 sources, 1.53,
	1.54 sugar.spec, 1.61, 1.62
Message-ID: <200709172039.l8HKdieQ030667@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30645

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	15 Sep 2007 01:21:18 -0000	1.52
+++ .cvsignore	17 Sep 2007 20:39:12 -0000	1.53
@@ -1 +1 @@
-sugar-0.65-git8ef6c57f8b.tar.bz2
+sugar-0.65-gited22733941.tar.bz2







From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:37 -0700
Subject: [pkgdb] climm was added for ondrejj
Message-ID: <200709172041.l8HKfe96026476@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package climm with summary Text/line based ICQ client with many features
Kevin Fenzi (kevin) has approved Package climm
Kevin Fenzi (kevin) has added a Fedora devel branch for climm with an owner of ondrejj
Kevin Fenzi (kevin) has approved climm in Fedora devel
Kevin Fenzi (kevin) has approved Package climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/climm



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, 7) updated by kevin
Message-ID: <200709172041.l8HKfnAl025735@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/climm



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, devel) updated by kevin
Message-ID: <200709172041.l8HKfnf4025755@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/climm



From fedora-extras-commits at redhat.com  Mon Sep 17 20:41:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:41:48 -0700
Subject: [pkgdb] climm (Fedora, 6) updated by kevin
Message-ID: <200709172041.l8HKfnY7025746@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for climm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on climm (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on climm (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/climm



From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:11 -0400
Subject: rpms/climm - New directory
Message-ID: <200709172042.l8HKgBq0030902@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm

Log Message:
Directory /cvs/extras/rpms/climm added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:15 -0400
Subject: rpms/climm/devel - New directory
Message-ID: <200709172042.l8HKgFMM030915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm/devel

Log Message:
Directory /cvs/extras/rpms/climm/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:17 -0400
Subject: rpms/climm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709172042.l8HKgH95030940@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm

Added Files:
	Makefile import.log 
Log Message:
Setup of module climm


--- NEW FILE Makefile ---
# Top level Makefile for module climm
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:42:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:42:19 -0400
Subject: rpms/climm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709172042.l8HKgJHB030956@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf30824/rpms/climm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module climm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: climm
# $Id: Makefile,v 1.1 2007/09/17 20:42:17 kevin Exp $
NAME := climm
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 fedora-extras-commits at redhat.com  Mon Sep 17 20:42:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:42:34 -0400
Subject: rpms/krb5/F-7 kadmind.init,1.11,1.12 krb5.spec,1.115,1.116
Message-ID: <200709172042.l8HKgYtN031103@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30836

Modified Files:
	kadmind.init krb5.spec 
Log Message:
- fix incorrect call to "test" in the kadmin init script (#287291)


Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/kadmind.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadmind.init	6 Sep 2007 20:06:44 -0000	1.11
+++ kadmind.init	17 Sep 2007 20:42:00 -0000	1.12
@@ -34,8 +34,8 @@
 	    # then we don't know for sure that this is an error.
   	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
 	        echo $"Error. Default principal database does not exist."
+	        exit 0
 	    fi
-	    exit 0
 	fi
   	if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
 	    echo $"Error. This appears to be a slave server, found kpropd.acl"


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- krb5.spec	6 Sep 2007 20:07:45 -0000	1.115
+++ krb5.spec	17 Sep 2007 20:42:00 -0000	1.116
@@ -11,7 +11,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -198,9 +198,11 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-5
+- fix incorrect call to "test" in the kadmin init script (#287291)
+
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
 - incorporate updated fix for CVE-2007-3999
-- fix incorrect call to "test" in the kadmin init script
 
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-3
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)



From fedora-extras-commits at redhat.com  Mon Sep 17 20:43:04 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 16:43:04 -0400
Subject: rpms/sugar/OLPC-2 sugar.spec,1.62,1.63
Message-ID: <200709172043.l8HKh40j031191@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31096

Modified Files:
	sugar.spec 
Log Message:
Add changelog


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sugar.spec	17 Sep 2007 20:39:12 -0000	1.62
+++ sugar.spec	17 Sep 2007 20:42:31 -0000	1.63
@@ -79,6 +79,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.50.20070917gited22733941
+- New snapshot
+
 * Sat Sep 15 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.49.20070915git8ef6c57f8b
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 17 20:43:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:43:33 -0700
Subject: [pkgdb] filezilla (Fedora, 7) updated by kevin
Message-ID: <200709172043.l8HKhYrT026950@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for filezilla
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on filezilla (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on filezilla (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on filezilla (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/filezilla



From fedora-extras-commits at redhat.com  Mon Sep 17 20:46:24 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:46:24 -0400
Subject: rpms/krb5/devel krb5-1.6.1-selinux-label.patch,1.3,1.4
Message-ID: <200709172046.l8HKkOvU031500@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31420/devel

Modified Files:
	krb5-1.6.1-selinux-label.patch 
Log Message:
- undef functions that we override before redefining them; ultimately this
  will have to be completely reworked to not use preprocessor magic because
  it's gotten way uglier than originally planned


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krb5-1.6.1-selinux-label.patch	11 Sep 2007 14:12:03 -0000	1.3
+++ krb5-1.6.1-selinux-label.patch	17 Sep 2007 20:46:21 -0000	1.4
@@ -291,7 +291,7 @@
  
 --- krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:19:00.000000000 -0400
 +++ krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:00:02.000000000 -0400
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,39 @@
 +#ifndef _KRB5_LABEL_H
 +#define _KRB5_LABEL_H
 +/* Wrapper functions which help us create files and directories with the right
@@ -308,10 +308,25 @@
 +int krb5int_labeled_mkdir(const char *path, mode_t mode);
 +int krb5int_labeled_mknod(const char *path, mode_t mode, dev_t device);
 +#ifndef USE_SELINUX_UNWRAPPED
++#ifdef fopen
++#undef fopen
++#endif
 +#define fopen krb5int_labeled_fopen
++#ifdef open
++#undef open
++#endif
 +#define open krb5int_labeled_open
++#ifdef creat
++#undef creat
++#endif
 +#define creat krb5int_labeled_creat
++#ifdef mkdir
++#undef mkdir
++#endif
 +#define mkdir krb5int_labeled_mkdir
++#ifdef mknod
++#undef mknod
++#endif
 +#define mknod krb5int_labeled_mknod
 +#endif
 +#endif



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:31 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:47:31 -0400
Subject: rpms/krb5/F-7 krb5.spec,1.116,1.117
Message-ID: <200709172047.l8HKlVkl031625@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31506/F-7

Modified Files:
	krb5.spec 
Log Message:
- add the bug ID to the kadmind fixes, note Fran's patch was identical to
  the one I thought we were already using in the F-7 branch



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- krb5.spec	17 Sep 2007 20:42:00 -0000	1.116
+++ krb5.spec	17 Sep 2007 20:46:59 -0000	1.117
@@ -199,7 +199,7 @@
 
 %changelog
 * Mon Sep 17 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-5
-- fix incorrect call to "test" in the kadmin init script (#287291)
+- fix incorrect call to "test" in the kadmin init script (Fran Taylor, #287291)
 
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-4
 - incorporate updated fix for CVE-2007-3999



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:34 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Mon, 17 Sep 2007 16:47:34 -0400
Subject: rpms/krb5/devel krb5.spec,1.136,1.137
Message-ID: <200709172047.l8HKlYWG031628@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31506/devel

Modified Files:
	krb5.spec 
Log Message:
- add the bug ID to the kadmind fixes, note Fran's patch was identical to
  the one I thought we were already using in the F-7 branch



Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- krb5.spec	11 Sep 2007 20:52:15 -0000	1.136
+++ krb5.spec	17 Sep 2007 20:47:02 -0000	1.137
@@ -219,7 +219,7 @@
 
 * Thu Sep  6 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-6
 - incorporate updated fix for CVE-2007-3999
-- fix incorrect call to "test" in the kadmin init script
+- fix incorrect call to "test" in the kadmin init script (#287291)
 
 * Tue Sep  4 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.2-5
 - incorporate fixes for MITKRB5-SA-2007-006 (CVE-2007-3999, CVE-2007-4000)



From fedora-extras-commits at redhat.com  Mon Sep 17 20:47:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:47:56 -0700
Subject: [pkgdb] ladspa-amb-plugins was added for jwrdegoede
Message-ID: <200709172047.l8HKlv3H028193@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-amb-plugins with summary Ambisonics LADSPA plugins
Kevin Fenzi (kevin) has approved Package ladspa-amb-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-amb-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-amb-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-amb-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-amb-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:48:02 -0700
Subject: [pkgdb] ladspa-amb-plugins (Fedora, 7) updated by kevin
Message-ID: <200709172048.l8HKm3KN027320@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-amb-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-amb-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-amb-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-amb-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 13:48:02 -0700
Subject: [pkgdb] ladspa-amb-plugins (Fedora, devel) updated by kevin
Message-ID: <200709172048.l8HKm30r027334@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-amb-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-amb-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-amb-plugins



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:39 -0400
Subject: rpms/ladspa-amb-plugins - New directory
Message-ID: <200709172048.l8HKmdgr031683@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-amb-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:43 -0400
Subject: rpms/ladspa-amb-plugins/devel - New directory
Message-ID: <200709172048.l8HKmh3d031697@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-amb-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:47 -0400
Subject: rpms/ladspa-amb-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709172048.l8HKmlG3031722@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-amb-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-amb-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 17 20:48:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:48:50 -0400
Subject: rpms/ladspa-amb-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709172048.l8HKmof2031738@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ31651/rpms/ladspa-amb-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-amb-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-amb-plugins
# $Id: Makefile,v 1.1 2007/09/17 20:48:47 kevin Exp $
NAME := ladspa-amb-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 fedora-extras-commits at redhat.com  Mon Sep 17 20:56:38 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Mon, 17 Sep 2007 16:56:38 -0400
Subject: rpms/devilspie/devel devilspie-0.20.2-manpage.patch, NONE,
	1.1 devilspie.spec, 1.7, 1.8
Message-ID: <200709172056.l8HKucKj032268@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32184

Modified Files:
	devilspie.spec 
Added Files:
	devilspie-0.20.2-manpage.patch 
Log Message:
Fix some minor issue in manpage (#293731)

devilspie-0.20.2-manpage.patch:

--- NEW FILE devilspie-0.20.2-manpage.patch ---
diff -Naur devilspie-0.20.2.orig/devilspie.1 devilspie-0.20.2/devilspie.1
--- devilspie-0.20.2.orig/devilspie.1	2007-09-17 22:25:19.000000000 +0200
+++ devilspie-0.20.2/devilspie.1	2007-09-17 22:27:27.000000000 +0200
@@ -12,8 +12,7 @@
 is a program which can detect windows as they are created, and perform
 actions on them if they match as set of criteria.
 
-The configuration files are a set of s-expressions.  For documentation and
-examples, see /usr/share/doc/devilspie/.
+The configuration files are a set of s-expressions. 
 
 Command-lines options:
 .TP


Index: devilspie.spec
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/devilspie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- devilspie.spec	28 Aug 2007 20:55:46 -0000	1.7
+++ devilspie.spec	17 Sep 2007 20:56:06 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           devilspie
 Version:        0.20.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A window-matching utility
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/devilspie
 Source0:        http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch1:         devilspie-0.20.2-manpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libwnck-devel
 BuildRequires:  libpng-devel
@@ -24,6 +25,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .manpage
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -44,6 +47,9 @@
 %{_mandir}/man1/devilspie.1.gz
 
 %changelog
+* Mon Sep 17 2007 Sebastian Vahl <fedora at deadbabylon.de> 0.20.2-5
+- Fix some minor issue in manpage (#293731)
+
 * Tue Aug 28 2007 Sebastian Vahl <fedora at deadbabylon.de> 0.20.2-4
 - Change License to GPLv2+
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:04:25 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Mon, 17 Sep 2007 17:04:25 -0400
Subject: rpms/gcc/devel gcc41-pr33423.patch, NONE,
	1.1 gcc41-scanf-fmt-check.patch, NONE, 1.1 gcc41.spec, 1.173, 1.174
Message-ID: <200709172104.l8HL4PCe006037@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5978

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33423.patch gcc41-scanf-fmt-check.patch 
Log Message:
4.1.2-25

gcc41-pr33423.patch:

--- NEW FILE gcc41-pr33423.patch ---
2007-09-15  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/33423
	* builtins.c (expand_builtin_memory_chk): Handle COMPOUND_EXPRs
	returned by build_call_expr.

	* gcc.c-torture/compile/20070915-1.c: New test.

--- gcc/builtins.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/builtins.c	2007-09-16 22:31:40.000000000 +0200
@@ -10383,6 +10383,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	return 0;
 
       fn = build_function_call_expr (fn, arglist);
+      STRIP_TYPE_NOPS (fn);
+      while (TREE_CODE (fn) == COMPOUND_EXPR)
+	{
+	  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+		       EXPAND_NORMAL);
+	  fn = TREE_OPERAND (fn, 1);
+	}
       if (TREE_CODE (fn) == CALL_EXPR)
 	CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
       return expand_expr (fn, target, mode, EXPAND_NORMAL);
@@ -10432,6 +10439,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	      if (!fn)
 		return 0;
 	      fn = build_function_call_expr (fn, arglist);
+	      STRIP_TYPE_NOPS (fn);
+	      while (TREE_CODE (fn) == COMPOUND_EXPR)
+		{
+		  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+			       EXPAND_NORMAL);
+		  fn = TREE_OPERAND (fn, 1);
+		}
 	      if (TREE_CODE (fn) == CALL_EXPR)
 		CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
 	      return expand_expr (fn, target, mode, EXPAND_NORMAL);
--- gcc/testsuite/gcc.c-torture/compile/20070915-1.c.jj	2007-09-16 22:29:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070915-1.c	2007-09-16 22:29:37.000000000 +0200
@@ -0,0 +1,20 @@
+/* PR middle-end/33423 */
+
+static struct
+{
+  char buf[15];
+} u2;
+
+void
+test6 (void)
+{
+  int len;
+  char *p;
+
+  for (len = 0; len < 2; len++)
+    {
+      p = __builtin___memset_chk (u2.buf, '\0', len, 15);
+      if (p != u2.buf)
+	return;
+    }
+}

gcc41-scanf-fmt-check.patch:

--- NEW FILE gcc41-scanf-fmt-check.patch ---
2007-09-17  Jakub Jelinek  <jakub at redhat.com>

	* c-format.h (format_kind_info): Add alloc_char field.
	* c-format.c (scanf_flag_specs): Add 'm'.
	(scanf_flag_pairs): Add 'a', 'm' pair.
	(scan_char_table): Allow 'm' modifier for c, s, [, C and S.
	(format_types_orig): Add alloc_char fields.
	(check_format_info_main): Rename aflag to alloc_flag.
	Handle fki->alloc_char. modifier after width and before length
	modifiers.  Move FMT_FLAG_SCANF_A_KLUDGE handling before
	length modifiers as well.
	* config/sol2-c.c (solaris_format_types): Add alloc_char field.

	* gcc.dg/format/c90-scanf-5.c: New test.
	* gcc.dg/format/c99-scanf-4.c: New test.
	* gcc.dg/format/ext-7.c: New test.
	* gcc.dg/format/ext-8.c: New test.

--- gcc/c-format.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.h	2007-09-17 22:44:17.000000000 +0200
@@ -234,6 +234,8 @@ typedef struct
      specifiers, but is used to check for bad combinations such as length
      modifier with assignment suppression in scanf.  */
   int length_code_char;
+  /* Assignment-allocation flag character ('m' in scanf), otherwise 0.  */
+  int alloc_char;
   /* Pointer to type of argument expected if '*' is used for a width,
      or NULL if '*' not used for widths.  */
   tree *width_type;
--- gcc/c-format.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.c	2007-09-17 22:51:08.000000000 +0200
@@ -423,6 +423,7 @@ static const format_flag_spec scanf_flag
 {
   { '*',  0, 0, N_("assignment suppression"), N_("the assignment suppression scanf feature"), STD_C89 },
   { 'a',  0, 0, N_("'a' flag"),               N_("the 'a' scanf flag"),                       STD_EXT },
+  { 'm',  0, 0, N_("'m' flag"),               N_("the 'm' scanf flag"),                       STD_EXT },
   { 'w',  0, 0, N_("field width"),            N_("field width in scanf format"),              STD_C89 },
   { 'L',  0, 0, N_("length modifier"),        N_("length modifier in scanf format"),          STD_C89 },
   { '\'', 0, 0, N_("''' flag"),               N_("the ''' scanf flag"),                       STD_EXT },
@@ -434,6 +435,7 @@ static const format_flag_spec scanf_flag
 static const format_flag_pair scanf_flag_pairs[] =
 {
   { '*', 'L', 0, 0 },
+  { 'a', 'm', 0, 0 },
   { 0, 0, 0, 0 }
 };
 
@@ -648,16 +650,16 @@ static const format_char_info scan_char_
   { "u",     1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w'I", "W",   NULL },
   { "oxX",   1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w",   "W",   NULL },
   { "efgEG", 1, STD_C89, { T89_F,   BADLEN,  BADLEN,  T89_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
-  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "cW",  NULL },
-  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW",  NULL },
-  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW[", NULL },
+  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "cW",  NULL },
+  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW",  NULL },
+  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW[", NULL },
   { "p",     2, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
   { "n",     1, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  BADLEN,  T99_SST, T99_PD,  T99_IM  }, "",     "W",   NULL },
   /* C99 conversion specifiers.  */
   { "FaA",   1, STD_C99, { T99_F,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
   /* X/Open conversion specifiers.  */
-  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
-  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "W",   NULL },
+  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "W",   NULL },
+  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "W",   NULL },
   { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
 };
 
@@ -700,59 +702,59 @@ static const format_kind_info format_typ
   { "printf",   printf_length_specs,  print_char_table, " +#0-'I", NULL, 
     printf_flag_specs, printf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     &integer_type_node, &integer_type_node
   },
   { "asm_fprintf",   asm_fprintf_length_specs,  asm_fprintf_char_table, " +#0-", NULL, 
     asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     NULL, NULL
   },
   { "gcc_diag",   gcc_diag_length_specs,  gcc_diag_char_table, "q+", NULL, 
     gcc_diag_flag_specs, gcc_diag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_tdiag",   gcc_tdiag_length_specs,  gcc_tdiag_char_table, "q+", NULL, 
     gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cdiag",   gcc_cdiag_length_specs,  gcc_cdiag_char_table, "q+", NULL, 
     gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cxxdiag",   gcc_cxxdiag_length_specs,  gcc_cxxdiag_char_table, "q+#", NULL, 
     gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_gfc", NULL, gcc_gfc_char_table, "", NULL, 
     NULL, gcc_gfc_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "scanf",    scanf_length_specs,   scan_char_table,  "*'I", NULL, 
     scanf_flag_specs, scanf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
-    'w', 0, 0, '*', 'L',
+    'w', 0, 0, '*', 'L', 'm',
     NULL, NULL
   },
   { "strftime", NULL,                 time_char_table,  "_-0^#", "EO",
     strftime_flag_specs, strftime_flag_pairs,
-    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
+    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "strfmon",  strfmon_length_specs, monetary_char_table, "=^+(!-", NULL, 
     strfmon_flag_specs, strfmon_flag_pairs,
-    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
+    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
     NULL, NULL
   }
 };
@@ -1462,7 +1464,7 @@ check_format_info_main (format_check_res
       const format_length_info *fli = NULL;
       const format_char_info *fci = NULL;
       char flag_chars[256];
-      int aflag = 0;
+      int alloc_flag = 0;
       const char *format_start = format_chars;
       if (*format_chars == 0)
 	{
@@ -1721,6 +1723,31 @@ check_format_info_main (format_check_res
 	    }
 	}
 
+      if (fki->alloc_char && fki->alloc_char == *format_chars)
+	{
+	  i = strlen (flag_chars);
+	  flag_chars[i++] = fki->alloc_char;
+	  flag_chars[i] = 0;
+	  format_chars++;
+	}
+
+      /* Handle the scanf allocation kludge.  */
+      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
+	{
+	  if (*format_chars == 'a' && !flag_isoc99)
+	    {
+	      if (format_chars[1] == 's' || format_chars[1] == 'S'
+		  || format_chars[1] == '[')
+		{
+		  /* 'a' is used as a flag.  */
+		  i = strlen (flag_chars);
+		  flag_chars[i++] = 'a';
+		  flag_chars[i] = 0;
+		  format_chars++;
+		}
+	    }
+	}
+
       /* Read any length modifier, if this kind of format has them.  */
       fli = fki->length_char_specs;
       length_chars = NULL;
@@ -1783,23 +1810,6 @@ check_format_info_main (format_check_res
 	    }
 	}
 
-      /* Handle the scanf allocation kludge.  */
-      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
-	{
-	  if (*format_chars == 'a' && !flag_isoc99)
-	    {
-	      if (format_chars[1] == 's' || format_chars[1] == 'S'
-		  || format_chars[1] == '[')
-		{
-		  /* 'a' is used as a flag.  */
-		  i = strlen (flag_chars);
-		  flag_chars[i++] = 'a';
-		  flag_chars[i] = 0;
-		  format_chars++;
-		}
-	    }
-	}
-
       format_char = *format_chars;
       if (format_char == 0
 	  || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
@@ -1872,7 +1882,9 @@ check_format_info_main (format_check_res
 
       if ((fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
 	  && strchr (flag_chars, 'a') != 0)
-	aflag = 1;
+	alloc_flag = 1;
+      if (fki->alloc_char && strchr (flag_chars, fki->alloc_char) != 0)
+	alloc_flag = 1;
 
       if (fki->suppression_char
 	  && strchr (flag_chars, fki->suppression_char) != 0)
@@ -2044,13 +2056,13 @@ check_format_info_main (format_check_res
 
 	      wanted_type_ptr->wanted_type = wanted_type;
 	      wanted_type_ptr->wanted_type_name = wanted_type_name;
-	      wanted_type_ptr->pointer_count = fci->pointer_count + aflag;
+	      wanted_type_ptr->pointer_count = fci->pointer_count + alloc_flag;
 	      wanted_type_ptr->char_lenient_flag = 0;
 	      if (strchr (fci->flags2, 'c') != 0)
 		wanted_type_ptr->char_lenient_flag = 1;
 	      wanted_type_ptr->writing_in_flag = 0;
 	      wanted_type_ptr->reading_from_flag = 0;
-	      if (aflag)
+	      if (alloc_flag)
 		wanted_type_ptr->writing_in_flag = 1;
 	      else
 		{
--- gcc/config/sol2-c.c.jj	2007-02-20 22:39:11.000000000 +0100
+++ gcc/config/sol2-c.c	2007-09-17 22:44:17.000000000 +0200
@@ -74,7 +74,7 @@ const format_kind_info solaris_format_ty
   { "cmn_err",  cmn_err_length_specs,  cmn_err_char_table, "", NULL,
     cmn_err_flag_specs, cmn_err_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 0, 0, 'L',
+    'w', 0, 0, 0, 'L', 0,
     &integer_type_node, &integer_type_node
   }
 };
--- gcc/testsuite/gcc.dg/format/c90-scanf-5.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c90-scanf-5.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/c99-scanf-4.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c99-scanf-4.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-7.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-7.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,85 @@
+/* Test for scanf formats.  %a and %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu89 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp, double *dp)
+{
+  /* %a formats for allocation, only recognized in C90 mode, are a
+     GNU extension.  Followed by other characters, %a is not treated
+     specially.
+  */
+  scanf ("%as", sp);
+  scanf ("%aS", lsp);
+  scanf ("%las", dp);
+  scanf ("%la", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%las", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%a[bcd]", sp);
+  scanf ("%la[bcd]", dp);
+  scanf ("%*as");
+  scanf ("%*aS");
+  scanf ("%*las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*a[bcd]");
+  scanf ("%*la[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%10as", sp);
+  scanf ("%5aS", lsp);
+  scanf ("%9las", dp);
+  scanf ("%25a[bcd]", sp);
+  scanf ("%48la[bcd]", dp);
+  scanf ("%*10as");
+  scanf ("%*5aS");
+  scanf ("%*9las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25a[bcd]");
+  scanf ("%*48la[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+
+  scanf ("%mas", sp);	/* { dg-warning "flag together" } */
+  scanf ("%maS", lsp);	/* { dg-warning "flag together" } */
+  scanf ("%ma[bcd]", sp);	/* { dg-warning "flag together" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-8.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-8.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,56 @@
+/* Test for scanf formats.  %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%ma", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mA", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gcc41.spec	14 Sep 2007 20:46:35 -0000	1.173
+++ gcc41.spec	17 Sep 2007 21:03:53 -0000	1.174
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 24
+%define gcc_release 25
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -152,6 +152,8 @@
 Patch36: gcc41-builtin-va-arg-pack.patch
 Patch37: gcc41-builtin-va-arg-pack-len.patch
 Patch38: gcc41-pr27954.patch
+Patch39: gcc41-pr33423.patch
+Patch40: gcc41-scanf-fmt-check.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -473,6 +475,8 @@
 %patch36 -p0 -b .builtin-va-arg-pack~
 %patch37 -p0 -b .builtin-va-arg-pack-len~
 %patch38 -p0 -b .pr27954~
+%patch39 -p0 -b .pr33423~
+%patch40 -p0 -b .scanf-fmt-check~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1627,6 +1631,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
+- fix ICE on __builtin_mem*_chk if it couldn't be folded until
+  expand time and at that point it can avoid a call (PR middle-end/33423)
+- handle the upcoming POSIX 'm' *scanf allocation modifier in
+  GCC format checking, fix up some details about %as/%aS/%a[
+
 * Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24
 - backport __builtin_va_arg_pack_len () support
 - fix Fortran error recovery with DATA (Jerry DeLisle, #281331,



From fedora-extras-commits at redhat.com  Mon Sep 17 21:26:51 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:26:51 -0400
Subject: rpms/gai/devel gai.spec,1.24,1.25
Message-ID: <200709172126.l8HLQp0c006719@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gai/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6693

Modified Files:
	gai.spec 
Log Message:
Update license field


Index: gai.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gai/devel/gai.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gai.spec	21 Jan 2007 23:37:46 -0000	1.24
+++ gai.spec	17 Sep 2007 21:26:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name:		gai
 Version:	0.5.10
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
-License:	LGPL
+License:	LGPLv2+
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-%{version}.tar.bz2
 Patch0:		gai-0.5.9-pkgconfig.patch
@@ -70,6 +70,9 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.5.10-11
+- License field updated
+
 * Sun Jan 21 2007 Michel Salim <michel.salim at gmail.com>
 - Remove unnecessary BR on mesa-libGLU-devel (added to gtkglext-devel)
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:33:34 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 17 Sep 2007 17:33:34 -0400
Subject: rpms/openssh/devel openssh-4.7p1-revert-wsize.patch, NONE,
	1.1 openssh.spec, 1.113, 1.114
Message-ID: <200709172133.l8HLXYmI006914@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6878

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.7p1-revert-wsize.patch 
Log Message:
* Mon Sep 17 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-2
- revert default window size adjustments (#286181)


openssh-4.7p1-revert-wsize.patch:

--- NEW FILE openssh-4.7p1-revert-wsize.patch ---
Written-by: Jan Kratochvil <jkratoch at redhat.com>
Reviewed-by: Tomas Mraz <tmraz at redhat.com>

diff -up openssh-4.7p1/channels.h.revert-wsize openssh-4.7p1/channels.h
--- openssh-4.7p1/channels.h.revert-wsize	2007-06-12 15:38:54.000000000 +0200
+++ openssh-4.7p1/channels.h	2007-09-17 23:21:32.000000000 +0200
@@ -122,9 +122,9 @@ struct Channel {
 
 /* default window/packet sizes for tcp/x11-fwd-channel */
 #define CHAN_SES_PACKET_DEFAULT	(32*1024)
-#define CHAN_SES_WINDOW_DEFAULT	(64*CHAN_SES_PACKET_DEFAULT)
+#define CHAN_SES_WINDOW_DEFAULT	(4*CHAN_SES_PACKET_DEFAULT)
 #define CHAN_TCP_PACKET_DEFAULT	(32*1024)
-#define CHAN_TCP_WINDOW_DEFAULT	(64*CHAN_TCP_PACKET_DEFAULT)
+#define CHAN_TCP_WINDOW_DEFAULT	(4*CHAN_TCP_PACKET_DEFAULT)
 #define CHAN_X11_PACKET_DEFAULT	(16*1024)
 #define CHAN_X11_WINDOW_DEFAULT	(4*CHAN_X11_PACKET_DEFAULT)
 


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openssh.spec	6 Sep 2007 19:49:16 -0000	1.113
+++ openssh.spec	17 Sep 2007 21:33:02 -0000	1.114
@@ -63,7 +63,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.7p1
-Release: 1%{?dist}%{?rescue_rel}
+Release: 2%{?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
@@ -95,6 +95,7 @@
 Patch49: openssh-4.3p2-gssapi-canohost.patch
 Patch51: openssh-4.7p1-nss-keys.patch
 Patch52: openssh-4.7p1-sftp-drain-acks.patch
+Patch53: openssh-4.7p1-revert-wsize.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -228,6 +229,7 @@
 %patch49 -p1 -b .canohost
 %patch51 -p1 -b .nss-keys
 %patch52 -p1 -b .drain-acks
+%patch53 -p1 -b .revert-wsize
 
 autoreconf
 
@@ -480,6 +482,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-2
+- revert default window size adjustments (#286181)
+
 * Thu Sep  6 2007 Tomas Mraz <tmraz at redhat.com> - 4.7p1-1
 - upgrade to latest upstream
 - use libedit in sftp (#203009)



From fedora-extras-commits at redhat.com  Mon Sep 17 21:37:59 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:37:59 -0400
Subject: rpms/vala/F-7 vala.spec,1.6,1.7
Message-ID: <200709172137.l8HLbxHx007153@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072/F-7

Modified Files:
	vala.spec 
Log Message:
Add missing Require: on perl-XML-Twig for vala-vapigen



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-7/vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vala.spec	8 Sep 2007 17:26:50 -0000	1.6
+++ vala.spec	17 Sep 2007 21:37:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -45,7 +45,7 @@
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
 License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl-XML-LibXML
+Requires:       perl-XML-Twig
 
 %description    vapigen
 Tools to generate Vala API bindings from existing C libraries, allowing access
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-5
+- vapigen subpackage: add missing Require: on perl-XML-Twig
+
 * Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
 - Split -vapigen subpackage. It is functionally self-contained and the license
   is more restricted



From fedora-extras-commits at redhat.com  Mon Sep 17 21:38:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 17 Sep 2007 17:38:02 -0400
Subject: rpms/vala/devel vala.spec,1.10,1.11
Message-ID: <200709172138.l8HLc2T8007156@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072/devel

Modified Files:
	vala.spec 
Log Message:
Add missing Require: on perl-XML-Twig for vala-vapigen



Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vala.spec	8 Sep 2007 17:12:52 -0000	1.10
+++ vala.spec	17 Sep 2007 21:37:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           vala
 Version:        0.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -45,7 +45,7 @@
 # Most files are LGPLv2.1+, but gapi*.pl files are GPLv2
 License:        LGPLv2+ and GPLv2
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl-XML-LibXML
+Requires:       perl-XML-Twig
 
 %description    vapigen
 Tools to generate Vala API bindings from existing C libraries, allowing access
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-5
+- vapigen subpackage: add missing Require: on perl-XML-Twig
+
 * Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> - 0.1.3-4
 - Split -vapigen subpackage. It is functionally self-contained and the license
   is more restricted



From fedora-extras-commits at redhat.com  Mon Sep 17 21:38:10 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 17 Sep 2007 17:38:10 -0400
Subject: rpms/pungi/devel .cvsignore, 1.24, 1.25 pungi.spec, 1.26,
	1.27 sources, 1.25, 1.26
Message-ID: <200709172138.l8HLcA29007163@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7100/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New release to fix up some bugs and make things better



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	30 Aug 2007 21:02:31 -0000	1.24
+++ .cvsignore	17 Sep 2007 21:37:38 -0000	1.25
@@ -1 +1 @@
-pungi-1.0.2.tar.gz
+pungi-1.1.0.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pungi.spec	30 Aug 2007 21:02:31 -0000	1.26
+++ pungi.spec	17 Sep 2007 21:37:38 -0000	1.27
@@ -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:        1.0.2
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -10,7 +10,7 @@
 URL:            http://hosted.fedoraproject.org/projects/pungi
 Source0:        http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       anaconda-runtime, yum => 3.0.3
+Requires:       anaconda-runtime, yum => 3.0.3, repoview
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -31,6 +31,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 %{__install} -d $RPM_BUILD_ROOT/var/cache/pungi
+%{__install} -d $RPM_BUILD_ROOT/%{_mandir}/man8
+%{__install} doc/pungi.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 
  
 %clean
@@ -39,15 +41,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Authors Changelog COPYING GPL README ToDo
+%doc Authors Changelog COPYING GPL ToDo doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
 %{_bindir}/pungi
 %{_datadir}/pungi
+%{_mandir}/man8/pungi.8.gz
 /var/cache/pungi
 
 
 %changelog
+* Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 1.1.0-1
+- Create repoview content in the tree
+- Move the .composeinfo file into the directory we actually publish
+- Remove python2.5 needs (Mark McLoughlin)
+- Consolidate the download code for easier maint. (Mark McLoughlin)
+- Create a config class that can make using pungi modules easier. (Mark 
+McLoughlin)
+- Use url line in kickstart files as a repo
+- Fix a bug with default dest dir (notting)
+- Include a man page (dcantrell)
+- Fix a bug with file:// based repos
+
 * Thu Aug 30 2007 Jesse Keating <jkeating at redhat.com> - 1.0.2-1
 - Fix some bugs with source iso creation
 - Add source repo to kickstart file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Aug 2007 21:02:31 -0000	1.25
+++ sources	17 Sep 2007 21:37:38 -0000	1.26
@@ -1 +1 @@
-ae788d7cf010263064cc66f02cff1b2b  pungi-1.0.2.tar.gz
+b3b7fc5296b9d4c7d9a18c81142baff1  pungi-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 21:48:07 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:48:07 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.249,
	1.250 xserver-1.3.0-edid-quirk-backports.patch, 1.1, 1.2
Message-ID: <200709172148.l8HLm7VG007363@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7333

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-edid-quirk-backports.patch 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
- xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
  to match current git.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- xorg-x11-server.spec	6 Sep 2007 21:25:33 -0000	1.249
+++ xorg-x11-server.spec	17 Sep 2007 21:47:33 -0000	1.250
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   23%{?dist}
+Release:   24%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -608,6 +608,10 @@
 
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
+- xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
+  to match current git.
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-23
 - xserver-1.3.0-xrandr-timestamp-buglet.patch: Make sure xrandr doesn't
   stop working after several hours. (Marius Gedminas, #273801)

xserver-1.3.0-edid-quirk-backports.patch:

Index: xserver-1.3.0-edid-quirk-backports.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-edid-quirk-backports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-edid-quirk-backports.patch	12 Jul 2007 14:08:32 -0000	1.1
+++ xserver-1.3.0-edid-quirk-backports.patch	17 Sep 2007 21:47:33 -0000	1.2
@@ -1,18 +1,42 @@
-diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx	2007-04-18 00:33:14.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-07-12 09:45:38.000000000 -0400
-@@ -71,6 +71,10 @@ static Bool quirk_dt_sync_hm_vp (int scr
-     if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
- 	DDC->vendor.prod_id == 58653)
- 	return TRUE;
-+    /* Samsung SyncMaster 205BW */
-+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-+	DDC->vendor.prod_id == 541)
-+	return TRUE;
+diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.edid-quirks xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
+--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.edid-quirks	2007-04-18 00:33:14.000000000 -0400
++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-09-17 14:37:36.000000000 -0400
+@@ -49,32 +49,12 @@
  
-     return FALSE;
- }
-@@ -87,9 +91,10 @@ static Bool quirk_prefer_large_60 (int s
+ typedef enum {
+     DDC_QUIRK_NONE = 0,
+-    /* Force detailed sync polarity to -h +v */
+-    DDC_QUIRK_DT_SYNC_HM_VP = 1 << 0,
+     /* First detailed mode is bogus, prefer largest mode at 60hz */
+-    DDC_QUIRK_PREFER_LARGE_60 = 1 << 1,
++    DDC_QUIRK_PREFER_LARGE_60 = 1 << 0,
+     /* 135MHz clock is too high, drop a bit */
+-    DDC_QUIRK_135_CLOCK_TOO_HIGH = 1 << 2
++    DDC_QUIRK_135_CLOCK_TOO_HIGH = 1 << 1
+ } ddc_quirk_t;
+ 
+-static Bool quirk_dt_sync_hm_vp (int scrnIndex, xf86MonPtr DDC)
+-{
+-    /* Belinea 1924S1W */
+-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
+-	DDC->vendor.prod_id == 1932)
+-	return TRUE;
+-    /* Belinea 10 20 30W */
+-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
+-	DDC->vendor.prod_id == 2007)
+-	return TRUE;
+-    /* ViewSonic VX2025wm (bug #9941) */
+-    if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
+-	DDC->vendor.prod_id == 58653)
+-	return TRUE;
+-
+-    return FALSE;
+-}
+-
+ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
+ {
+     /* Belinea 10 15 55 */
+@@ -87,9 +67,10 @@ static Bool quirk_prefer_large_60 (int s
  	DDC->vendor.prod_id == 44358)
  	return TRUE;
  
@@ -25,3 +49,42 @@
  	return TRUE;
      
      return FALSE;
+@@ -112,10 +93,6 @@ typedef struct {
+ } ddc_quirk_map_t;
+ 
+ static const ddc_quirk_map_t ddc_quirks[] = {
+-    { 
+-	quirk_dt_sync_hm_vp,	DDC_QUIRK_DT_SYNC_HM_VP,
+-	"Set detailed timing sync polarity to -h +v"
+-    },
+     {
+ 	quirk_prefer_large_60,   DDC_QUIRK_PREFER_LARGE_60,
+ 	"Detailed timing is not preferred, use largest mode at 60Hz"
+@@ -251,20 +228,15 @@ DDCModeFromDetailedTiming(int scrnIndex,
+     if (timing->interlaced)
+         Mode->Flags |= V_INTERLACE;
+ 
+-    if (quirks & DDC_QUIRK_DT_SYNC_HM_VP)
+-	Mode->Flags |= V_NHSYNC | V_PVSYNC;
++    if (timing->misc & 0x02)
++	Mode->Flags |= V_PVSYNC;
+     else
+-    {
+-	if (timing->misc & 0x02)
+-	    Mode->Flags |= V_PHSYNC;
+-	else
+-	    Mode->Flags |= V_NHSYNC;
++	Mode->Flags |= V_NVSYNC;
+     
+-	if (timing->misc & 0x01)
+-	    Mode->Flags |= V_PVSYNC;
+-	else
+-	    Mode->Flags |= V_NVSYNC;
+-    }
++    if (timing->misc & 0x01)
++	Mode->Flags |= V_PHSYNC;
++    else
++	Mode->Flags |= V_NHSYNC;
+ 
+     return Mode;
+ }



From fedora-extras-commits at redhat.com  Mon Sep 17 21:51:12 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:51:12 -0400
Subject: rpms/libFS/devel libFS.spec,1.27,1.28
Message-ID: <200709172151.l8HLpCha007527@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libFS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7468

Modified Files:
	libFS.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
- Rebuild for abstract socket support.



Index: libFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libFS.spec	21 Aug 2007 19:50:51 -0000	1.27
+++ libFS.spec	17 Sep 2007 21:50:40 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.0-4
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:51:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:51:56 -0400
Subject: rpms/libICE/devel libICE.spec,1.19,1.20
Message-ID: <200709172151.l8HLpuLG007629@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561

Modified Files:
	libICE.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- Rebuild for abstract socket support.



Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libICE.spec	21 Aug 2007 20:00:13 -0000	1.19
+++ libICE.spec	17 Sep 2007 21:51:23 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.3-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:52:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:52:36 -0400
Subject: rpms/libSM/devel libSM.spec,1.19,1.20
Message-ID: <200709172152.l8HLqaxp007685@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libSM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7663

Modified Files:
	libSM.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
- Rebuild for abstract socket support.



Index: libSM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libSM.spec	21 Aug 2007 20:01:18 -0000	1.19
+++ libSM.spec	17 Sep 2007 21:52:03 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libICE-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
+- Rebuild for abstract socket support.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-2
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Mon Sep 17 21:53:16 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 17 Sep 2007 17:53:16 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.35,1.36
Message-ID: <200709172153.l8HLrGkK007756@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7719

Modified Files:
	libXfont.spec 
Log Message:
* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
- Rebuild for abstract socket support.



Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libXfont.spec	22 Aug 2007 19:02:09 -0000	1.35
+++ libXfont.spec	17 Sep 2007 21:52:44 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,7 +14,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -93,6 +93,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
+- Rebuild for abstract socket support.
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.2.9-3
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 17 22:08:12 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Mon, 17 Sep 2007 18:08:12 -0400
Subject: rpms/openswan/devel .cvsignore, 1.12, 1.13 openswan.spec, 1.39,
	1.40 sources, 1.12, 1.13 openswan-2.4.5.tar.gz.asc, 1.1,
	NONE openswan-typofix.patch, 1.1, NONE upstream, 1.2,
	NONE upstream-key.gpg, 1.1, NONE
Message-ID: <200709172208.l8HM8CS2014152@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14081

Modified Files:
	.cvsignore openswan.spec sources 
Removed Files:
	openswan-2.4.5.tar.gz.asc openswan-typofix.patch upstream 
	upstream-key.gpg 
Log Message:
Latest upstream brought in, and cleaned up some unused files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jan 2007 10:08:50 -0000	1.12
+++ .cvsignore	17 Sep 2007 22:07:40 -0000	1.13
@@ -1 +1,2 @@
 openswan-2.4.7.tar.gz
+openswan-2.4.9.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openswan.spec	20 Mar 2007 22:08:09 -0000	1.39
+++ openswan.spec	17 Sep 2007 22:07:40 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.4.7
+Version: 2.4.9
 #%define srcpkgver	%(echo %{version} | tr -s '_' '-')
 %define srcpkgver %{version}
 
@@ -24,7 +24,7 @@
 
 
 %define debug_package %{nil}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Jan 2007 10:08:50 -0000	1.12
+++ sources	17 Sep 2007 22:07:40 -0000	1.13
@@ -1 +1 @@
-70f22e8adc39e07a165f75eccb7cd079  openswan-2.4.7.tar.gz
+845f12d80d443cfa1a52f2b53b987bee  openswan-2.4.9.tar.gz


--- openswan-2.4.5.tar.gz.asc DELETED ---


--- openswan-typofix.patch DELETED ---


--- upstream DELETED ---


--- upstream-key.gpg DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 17 22:10:50 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Mon, 17 Sep 2007 18:10:50 -0400
Subject: rpms/gcc/F-7 gcc41-pr33423.patch, NONE,
	1.1 gcc41-scanf-fmt-check.patch, NONE, 1.1 gcc41.spec, 1.165, 1.166
Message-ID: <200709172210.l8HMAoEw014312@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14282

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33423.patch gcc41-scanf-fmt-check.patch 
Log Message:
4.1.2-24.fc7

gcc41-pr33423.patch:

--- NEW FILE gcc41-pr33423.patch ---
2007-09-15  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/33423
	* builtins.c (expand_builtin_memory_chk): Handle COMPOUND_EXPRs
	returned by build_call_expr.

	* gcc.c-torture/compile/20070915-1.c: New test.

--- gcc/builtins.c.jj	2007-09-14 21:07:41.000000000 +0200
+++ gcc/builtins.c	2007-09-16 22:31:40.000000000 +0200
@@ -10383,6 +10383,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	return 0;
 
       fn = build_function_call_expr (fn, arglist);
+      STRIP_TYPE_NOPS (fn);
+      while (TREE_CODE (fn) == COMPOUND_EXPR)
+	{
+	  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+		       EXPAND_NORMAL);
+	  fn = TREE_OPERAND (fn, 1);
+	}
       if (TREE_CODE (fn) == CALL_EXPR)
 	CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
       return expand_expr (fn, target, mode, EXPAND_NORMAL);
@@ -10432,6 +10439,13 @@ expand_builtin_memory_chk (tree exp, rtx
 	      if (!fn)
 		return 0;
 	      fn = build_function_call_expr (fn, arglist);
+	      STRIP_TYPE_NOPS (fn);
+	      while (TREE_CODE (fn) == COMPOUND_EXPR)
+		{
+		  expand_expr (TREE_OPERAND (fn, 0), const0_rtx, VOIDmode,
+			       EXPAND_NORMAL);
+		  fn = TREE_OPERAND (fn, 1);
+		}
 	      if (TREE_CODE (fn) == CALL_EXPR)
 		CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp);
 	      return expand_expr (fn, target, mode, EXPAND_NORMAL);
--- gcc/testsuite/gcc.c-torture/compile/20070915-1.c.jj	2007-09-16 22:29:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070915-1.c	2007-09-16 22:29:37.000000000 +0200
@@ -0,0 +1,20 @@
+/* PR middle-end/33423 */
+
+static struct
+{
+  char buf[15];
+} u2;
+
+void
+test6 (void)
+{
+  int len;
+  char *p;
+
+  for (len = 0; len < 2; len++)
+    {
+      p = __builtin___memset_chk (u2.buf, '\0', len, 15);
+      if (p != u2.buf)
+	return;
+    }
+}

gcc41-scanf-fmt-check.patch:

--- NEW FILE gcc41-scanf-fmt-check.patch ---
2007-09-17  Jakub Jelinek  <jakub at redhat.com>

	* c-format.h (format_kind_info): Add alloc_char field.
	* c-format.c (scanf_flag_specs): Add 'm'.
	(scanf_flag_pairs): Add 'a', 'm' pair.
	(scan_char_table): Allow 'm' modifier for c, s, [, C and S.
	(format_types_orig): Add alloc_char fields.
	(check_format_info_main): Rename aflag to alloc_flag.
	Handle fki->alloc_char. modifier after width and before length
	modifiers.  Move FMT_FLAG_SCANF_A_KLUDGE handling before
	length modifiers as well.
	* config/sol2-c.c (solaris_format_types): Add alloc_char field.

	* gcc.dg/format/c90-scanf-5.c: New test.
	* gcc.dg/format/c99-scanf-4.c: New test.
	* gcc.dg/format/ext-7.c: New test.
	* gcc.dg/format/ext-8.c: New test.

--- gcc/c-format.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.h	2007-09-17 22:44:17.000000000 +0200
@@ -234,6 +234,8 @@ typedef struct
      specifiers, but is used to check for bad combinations such as length
      modifier with assignment suppression in scanf.  */
   int length_code_char;
+  /* Assignment-allocation flag character ('m' in scanf), otherwise 0.  */
+  int alloc_char;
   /* Pointer to type of argument expected if '*' is used for a width,
      or NULL if '*' not used for widths.  */
   tree *width_type;
--- gcc/c-format.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/c-format.c	2007-09-17 22:51:08.000000000 +0200
@@ -423,6 +423,7 @@ static const format_flag_spec scanf_flag
 {
   { '*',  0, 0, N_("assignment suppression"), N_("the assignment suppression scanf feature"), STD_C89 },
   { 'a',  0, 0, N_("'a' flag"),               N_("the 'a' scanf flag"),                       STD_EXT },
+  { 'm',  0, 0, N_("'m' flag"),               N_("the 'm' scanf flag"),                       STD_EXT },
   { 'w',  0, 0, N_("field width"),            N_("field width in scanf format"),              STD_C89 },
   { 'L',  0, 0, N_("length modifier"),        N_("length modifier in scanf format"),          STD_C89 },
   { '\'', 0, 0, N_("''' flag"),               N_("the ''' scanf flag"),                       STD_EXT },
@@ -434,6 +435,7 @@ static const format_flag_spec scanf_flag
 static const format_flag_pair scanf_flag_pairs[] =
 {
   { '*', 'L', 0, 0 },
+  { 'a', 'm', 0, 0 },
   { 0, 0, 0, 0 }
 };
 
@@ -648,16 +650,16 @@ static const format_char_info scan_char_
   { "u",     1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w'I", "W",   NULL },
   { "oxX",   1, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "*w",   "W",   NULL },
   { "efgEG", 1, STD_C89, { T89_F,   BADLEN,  BADLEN,  T89_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
-  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "cW",  NULL },
-  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW",  NULL },
-  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "cW[", NULL },
+  { "c",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "cW",  NULL },
+  { "s",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW",  NULL },
+  { "[",     1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "cW[", NULL },
   { "p",     2, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
   { "n",     1, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  BADLEN,  T99_SST, T99_PD,  T99_IM  }, "",     "W",   NULL },
   /* C99 conversion specifiers.  */
   { "FaA",   1, STD_C99, { T99_F,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "*w'",  "W",   NULL },
   /* X/Open conversion specifiers.  */
-  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*w",   "W",   NULL },
-  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*aw",  "W",   NULL },
+  { "C",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*mw",  "W",   NULL },
+  { "S",     1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "*amw", "W",   NULL },
   { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
 };
 
@@ -700,59 +702,59 @@ static const format_kind_info format_typ
   { "printf",   printf_length_specs,  print_char_table, " +#0-'I", NULL, 
     printf_flag_specs, printf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     &integer_type_node, &integer_type_node
   },
   { "asm_fprintf",   asm_fprintf_length_specs,  asm_fprintf_char_table, " +#0-", NULL, 
     asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 'p', 0, 'L',
+    'w', 0, 'p', 0, 'L', 0,
     NULL, NULL
   },
   { "gcc_diag",   gcc_diag_length_specs,  gcc_diag_char_table, "q+", NULL, 
     gcc_diag_flag_specs, gcc_diag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_tdiag",   gcc_tdiag_length_specs,  gcc_tdiag_char_table, "q+", NULL, 
     gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cdiag",   gcc_cdiag_length_specs,  gcc_cdiag_char_table, "q+", NULL, 
     gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_cxxdiag",   gcc_cxxdiag_length_specs,  gcc_cxxdiag_char_table, "q+#", NULL, 
     gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 'p', 0, 'L',
+    0, 0, 'p', 0, 'L', 0,
     NULL, &integer_type_node
   },
   { "gcc_gfc", NULL, gcc_gfc_char_table, "", NULL, 
     NULL, gcc_gfc_flag_pairs,
     FMT_FLAG_ARG_CONVERT,
-    0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "scanf",    scanf_length_specs,   scan_char_table,  "*'I", NULL, 
     scanf_flag_specs, scanf_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
-    'w', 0, 0, '*', 'L',
+    'w', 0, 0, '*', 'L', 'm',
     NULL, NULL
   },
   { "strftime", NULL,                 time_char_table,  "_-0^#", "EO",
     strftime_flag_specs, strftime_flag_pairs,
-    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
+    FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0, 0,
     NULL, NULL
   },
   { "strfmon",  strfmon_length_specs, monetary_char_table, "=^+(!-", NULL, 
     strfmon_flag_specs, strfmon_flag_pairs,
-    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
+    FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
     NULL, NULL
   }
 };
@@ -1462,7 +1464,7 @@ check_format_info_main (format_check_res
       const format_length_info *fli = NULL;
       const format_char_info *fci = NULL;
       char flag_chars[256];
-      int aflag = 0;
+      int alloc_flag = 0;
       const char *format_start = format_chars;
       if (*format_chars == 0)
 	{
@@ -1721,6 +1723,31 @@ check_format_info_main (format_check_res
 	    }
 	}
 
+      if (fki->alloc_char && fki->alloc_char == *format_chars)
+	{
+	  i = strlen (flag_chars);
+	  flag_chars[i++] = fki->alloc_char;
+	  flag_chars[i] = 0;
+	  format_chars++;
+	}
+
+      /* Handle the scanf allocation kludge.  */
+      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
+	{
+	  if (*format_chars == 'a' && !flag_isoc99)
+	    {
+	      if (format_chars[1] == 's' || format_chars[1] == 'S'
+		  || format_chars[1] == '[')
+		{
+		  /* 'a' is used as a flag.  */
+		  i = strlen (flag_chars);
+		  flag_chars[i++] = 'a';
+		  flag_chars[i] = 0;
+		  format_chars++;
+		}
+	    }
+	}
+
       /* Read any length modifier, if this kind of format has them.  */
       fli = fki->length_char_specs;
       length_chars = NULL;
@@ -1783,23 +1810,6 @@ check_format_info_main (format_check_res
 	    }
 	}
 
-      /* Handle the scanf allocation kludge.  */
-      if (fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
-	{
-	  if (*format_chars == 'a' && !flag_isoc99)
-	    {
-	      if (format_chars[1] == 's' || format_chars[1] == 'S'
-		  || format_chars[1] == '[')
-		{
-		  /* 'a' is used as a flag.  */
-		  i = strlen (flag_chars);
-		  flag_chars[i++] = 'a';
-		  flag_chars[i] = 0;
-		  format_chars++;
-		}
-	    }
-	}
-
       format_char = *format_chars;
       if (format_char == 0
 	  || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
@@ -1872,7 +1882,9 @@ check_format_info_main (format_check_res
 
       if ((fki->flags & (int) FMT_FLAG_SCANF_A_KLUDGE)
 	  && strchr (flag_chars, 'a') != 0)
-	aflag = 1;
+	alloc_flag = 1;
+      if (fki->alloc_char && strchr (flag_chars, fki->alloc_char) != 0)
+	alloc_flag = 1;
 
       if (fki->suppression_char
 	  && strchr (flag_chars, fki->suppression_char) != 0)
@@ -2044,13 +2056,13 @@ check_format_info_main (format_check_res
 
 	      wanted_type_ptr->wanted_type = wanted_type;
 	      wanted_type_ptr->wanted_type_name = wanted_type_name;
-	      wanted_type_ptr->pointer_count = fci->pointer_count + aflag;
+	      wanted_type_ptr->pointer_count = fci->pointer_count + alloc_flag;
 	      wanted_type_ptr->char_lenient_flag = 0;
 	      if (strchr (fci->flags2, 'c') != 0)
 		wanted_type_ptr->char_lenient_flag = 1;
 	      wanted_type_ptr->writing_in_flag = 0;
 	      wanted_type_ptr->reading_from_flag = 0;
-	      if (aflag)
+	      if (alloc_flag)
 		wanted_type_ptr->writing_in_flag = 1;
 	      else
 		{
--- gcc/config/sol2-c.c.jj	2007-02-20 22:39:11.000000000 +0100
+++ gcc/config/sol2-c.c	2007-09-17 22:44:17.000000000 +0200
@@ -74,7 +74,7 @@ const format_kind_info solaris_format_ty
   { "cmn_err",  cmn_err_length_specs,  cmn_err_char_table, "", NULL,
     cmn_err_flag_specs, cmn_err_flag_pairs,
     FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
-    'w', 0, 0, 0, 'L',
+    'w', 0, 0, 0, 'L', 0,
     &integer_type_node, &integer_type_node
   }
 };
--- gcc/testsuite/gcc.dg/format/c90-scanf-5.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c90-scanf-5.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1990 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/c99-scanf-4.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/c99-scanf-4.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,19 @@
+/* Test for scanf formats.  Formats using extensions to the standard
+   should be rejected in strict pedantic mode.
+*/
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp); /* { dg-warning "C" "%ms" } */
+  scanf ("%mS", lsp); /* { dg-warning "C" "%mS" } */
+  scanf ("%mls", lsp); /* { dg-warning "C" "%mls" } */
+  scanf ("%m[bcd]", sp); /* { dg-warning "C" "%m[]" } */
+  scanf ("%ml[bcd]", lsp); /* { dg-warning "C" "%ml[]" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-7.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-7.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,85 @@
+/* Test for scanf formats.  %a and %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu89 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp, double *dp)
+{
+  /* %a formats for allocation, only recognized in C90 mode, are a
+     GNU extension.  Followed by other characters, %a is not treated
+     specially.
+  */
+  scanf ("%as", sp);
+  scanf ("%aS", lsp);
+  scanf ("%las", dp);
+  scanf ("%la", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%las", lsp);	/* { dg-warning "but argument 2 has type" } */
+  scanf ("%a[bcd]", sp);
+  scanf ("%la[bcd]", dp);
+  scanf ("%*as");
+  scanf ("%*aS");
+  scanf ("%*las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*a[bcd]");
+  scanf ("%*la[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%10as", sp);
+  scanf ("%5aS", lsp);
+  scanf ("%9las", dp);
+  scanf ("%25a[bcd]", sp);
+  scanf ("%48la[bcd]", dp);
+  scanf ("%*10as");
+  scanf ("%*5aS");
+  scanf ("%*9las");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25a[bcd]");
+  scanf ("%*48la[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+
+  scanf ("%mas", sp);	/* { dg-warning "flag together" } */
+  scanf ("%maS", lsp);	/* { dg-warning "flag together" } */
+  scanf ("%ma[bcd]", sp);	/* { dg-warning "flag together" } */
+}
--- gcc/testsuite/gcc.dg/format/ext-8.c.jj	2007-09-17 22:44:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/format/ext-8.c	2007-09-17 22:44:17.000000000 +0200
@@ -0,0 +1,56 @@
+/* Test for scanf formats.  %m extensions.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char **sp, wchar_t **lsp, int *ip, float *fp, void **pp)
+{
+  /* m assignment-allocation modifier, recognized in both C90
+     and C99 modes, is a POSIX and ISO/IEC WDTR 24731-2 extension.  */
+  scanf ("%ms", sp);
+  scanf ("%mS", lsp);
+  scanf ("%mls", lsp);
+  scanf ("%m[bcd]", sp);
+  scanf ("%ml[bcd]", lsp);
+  scanf ("%mc", sp);
+  scanf ("%mlc", lsp);
+  scanf ("%mC", lsp);
+  scanf ("%*ms");
+  scanf ("%*mS");
+  scanf ("%*mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*m[bcd]");
+  scanf ("%*ml[bcd]");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mc");
+  scanf ("%*mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*mC");
+  scanf ("%10ms", sp);
+  scanf ("%5mS", lsp);
+  scanf ("%9mls", lsp);
+  scanf ("%25m[bcd]", sp);
+  scanf ("%41ml[bcd]", lsp);
+  scanf ("%131mc", sp);
+  scanf ("%27mlc", lsp);
+  scanf ("%2mC", lsp);
+  scanf ("%*10ms");
+  scanf ("%*5mS");
+  scanf ("%*9mls");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*25m[bcd]");
+  scanf ("%*41ml[bcd]"); /* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*131mc");
+  scanf ("%*27mlc");	/* { dg-warning "assignment suppression and length modifier" } */
+  scanf ("%*2mC");
+
+  scanf ("%md", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mi", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mo", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mu", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%mx", ip);	/* { dg-warning "flag used with" } */
+  scanf ("%ma", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mA", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%me", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mf", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mg", fp);	/* { dg-warning "flag used with" } */
+  scanf ("%mp", pp);	/* { dg-warning "flag used with" } */
+}


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gcc41.spec	15 Sep 2007 08:08:15 -0000	1.165
+++ gcc41.spec	17 Sep 2007 22:10:17 -0000	1.166
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 23
+%define gcc_release 24
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -150,6 +150,8 @@
 Patch36: gcc41-builtin-va-arg-pack.patch
 Patch37: gcc41-builtin-va-arg-pack-len.patch
 Patch38: gcc41-pr27954.patch
+Patch39: gcc41-pr33423.patch
+Patch40: gcc41-scanf-fmt-check.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -471,6 +473,8 @@
 %patch36 -p0 -b .builtin-va-arg-pack~
 %patch37 -p0 -b .builtin-va-arg-pack-len~
 %patch38 -p0 -b .pr27954~
+%patch39 -p0 -b .pr33423~
+%patch40 -p0 -b .scanf-fmt-check~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1625,6 +1629,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24.fc7
+- fix ICE on __builtin_mem*_chk if it couldn't be folded until
+  expand time and at that point it can avoid a call (PR middle-end/33423)
+- handle the upcoming POSIX 'm' *scanf allocation modifier in
+  GCC format checking, fix up some details about %as/%aS/%a[
+
 * Fri Sep 14 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-23.fc7
 - backport __builtin_va_arg_pack_len () support
 - fix Fortran error recovery with DATA (Jerry DeLisle, #281331,



From fedora-extras-commits at redhat.com  Mon Sep 17 22:20:18 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 18:20:18 -0400
Subject: rpms/xulrunner/OLPC-2 xulrunner.spec,1.27,1.28
Message-ID: <200709172220.l8HMKIJj014629@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	xulrunner.spec 
Log Message:
Fix files



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xulrunner.spec	17 Sep 2007 18:50:41 -0000	1.27
+++ xulrunner.spec	17 Sep 2007 22:19:45 -0000	1.28
@@ -1,3 +1,5 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 %define nss_version 3.10
 %define cairo_version 1.3.12
 %define prerelease a6
@@ -95,6 +97,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f %{buildroot}%{_libdir}/xulrunner-%{version}%{prerelease}/sdk/*.so
 
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
@@ -110,16 +113,36 @@
 %defattr(-,root,root,-)
 %doc LICENSE LEGAL
 %{_bindir}/xulrunner
-%{_sysconfdir}/gre.d/*.system.conf
 %{_libdir}/mozilla
-%{_libdir}/xulrunner-%{version}%{prerelease}
+%{_libdir}/xulrunner-%{version}%{prerelease}/chrome
+%{_libdir}/xulrunner-%{version}%{prerelease}/components
+%{_libdir}/xulrunner-%{version}%{prerelease}/defaults
+%{_libdir}/xulrunner-%{version}%{prerelease}/dictionaries
+%{_libdir}/xulrunner-%{version}%{prerelease}/greprefs
+%{_libdir}/xulrunner-%{version}%{prerelease}/icons
+%{_libdir}/xulrunner-%{version}%{prerelease}/modules
+%{_libdir}/xulrunner-%{version}%{prerelease}/plugins
+%{_libdir}/xulrunner-%{version}%{prerelease}/res
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.so
+%{_libdir}/xulrunner-%{version}%{prerelease}/mozilla-xremote-client
+%{_libdir}/xulrunner-%{version}%{prerelease}/regxpcom
+%{_libdir}/xulrunner-%{version}%{prerelease}/run-mozilla.sh
+%{_libdir}/xulrunner-%{version}%{prerelease}/updater
+%{_libdir}/xulrunner-%{version}%{prerelease}/xp*
+%{_libdir}/xulrunner-%{version}%{prerelease}/xulrunner*
+%{_libdir}/xulrunner-%{version}%{prerelease}/crashreporter
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.chk
+
+%{python_sitearch}/xpcom
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/idl/xulrunner-%{version}%{prerelease}
-%{_libdir}/xulrunner-devel-%{version}%{prerelease}
+%{_bindir}/xulrunner-config
+%{_libdir}/xulrunner-%{version}%{prerelease}/*.a
+%{_libdir}/pkgconfig/*
 %{_includedir}/xulrunner-%{version}%{prerelease}
+%{_datadir}/idl/xulrunner-%{version}%{prerelease}
+%{_datadir}/aclocal/nspr.m4
 
 %changelog
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.9.



From fedora-extras-commits at redhat.com  Mon Sep 17 22:26:06 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 17 Sep 2007 18:26:06 -0400
Subject: rpms/perl-Imager/devel .cvsignore, 1.10, 1.11 perl-Imager.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200709172226.l8HMQ6bi016986@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Imager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16956

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Jun 2007 23:54:44 -0000	1.10
+++ .cvsignore	17 Sep 2007 22:25:34 -0000	1.11
@@ -1 +1 @@
-Imager-0.59.tar.gz
+Imager-0.60.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Imager.spec	29 Aug 2007 05:52:37 -0000	1.12
+++ perl-Imager.spec	17 Sep 2007 22:25:34 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Imager
-Version:        0.59
-Release:        2%{?dist}
+Version:        0.60
+Release:        1%{?dist}
 Summary:        Perl extension for Generating 24 bit Images
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 0.60-1
+- Update to 0.60.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.59-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Imager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Jun 2007 23:54:44 -0000	1.10
+++ sources	17 Sep 2007 22:25:34 -0000	1.11
@@ -1 +1 @@
-1604d6317ff6401fd3495a9fd1ce4db1  Imager-0.59.tar.gz
+938eae83ea3ed8d6349692c98d079534  Imager-0.60.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 22:32:55 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 17 Sep 2007 18:32:55 -0400
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.7, 1.8 perl-HTML-Mason.spec,
	1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200709172232.l8HMWtUN017183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17161

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.37.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Jun 2007 21:15:54 -0000	1.7
+++ .cvsignore	17 Sep 2007 22:32:23 -0000	1.8
@@ -1 +1 @@
-HTML-Mason-1.36.tar.gz
+HTML-Mason-1.37.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-HTML-Mason.spec	27 Jun 2007 21:15:54 -0000	1.11
+++ perl-HTML-Mason.spec	17 Sep 2007 22:32:23 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Mason
-Version:        1.36
+Version:        1.37
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
@@ -96,6 +96,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 1:1.37-1
+- Update to 1.37.
+
 * Tue Jun 26 2007 Steven Pritchard <steve at kspei.com> 1:1.36-1
 - Update to 1.36.
 - BR Test::Pod.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Jun 2007 21:15:54 -0000	1.7
+++ sources	17 Sep 2007 22:32:23 -0000	1.8
@@ -1 +1 @@
-8b46e7250df88eee9b05378ec1e93dd3  HTML-Mason-1.36.tar.gz
+5df5ca4e11890b7d9143c4869703ceb0  HTML-Mason-1.37.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 17 22:43:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 18:43:42 -0400
Subject: rpms/linux-libertine-fonts/devel linux-libertine-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
Message-ID: <200709172243.l8HMhgFW017483@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/linux-libertine-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17460

Modified Files:
	linux-libertine-fonts.spec sources .cvsignore 
Log Message:
Updated to 2.6.9
Update License tag



Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/linux-libertine-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-libertine-fonts.spec	17 Mar 2007 07:22:24 -0000	1.6
+++ linux-libertine-fonts.spec	17 Sep 2007 22:43:08 -0000	1.7
@@ -2,13 +2,13 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.4.9
+Version:       2.6.9
 Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       OFL/GPL
+License:       GPL+ with exceptions or OFL
 URL:           http://linuxlibertine.sf.net
-Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
+Source:        http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: fontforge
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Sun Sep 16 2007 Kevin Fenzi <kevin at tummy.com> - 2.6.9-1
+- Updated to 2.6.9
+- Update License tag
+
 * Sat Mar 17 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 2.4.9-1
 - Updated to 2.4.9
 - Reenabled generation of PDF files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2007 07:22:24 -0000	1.6
+++ sources	17 Sep 2007 22:43:08 -0000	1.7
@@ -1 +1 @@
-aa55aa7c3c6925f3fb7b07ba0e89d6ad  LinLibertineSRC-2.4.9.tgz
+449c862d3e46b1c187d2bbbce5d79b77  LinLibertineSRC-2.6.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2007 07:22:24 -0000	1.6
+++ .cvsignore	17 Sep 2007 22:43:08 -0000	1.7
@@ -1 +1 @@
-LinLibertineSRC-2.4.9.tgz
+LinLibertineSRC-2.6.tgz



From fedora-extras-commits at redhat.com  Mon Sep 17 23:06:15 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:06:15 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.53, 1.54 sources, 1.54,
	1.55 sugar.spec, 1.63, 1.64
Message-ID: <200709172306.l8HN6F6q023925@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	17 Sep 2007 20:39:12 -0000	1.53
+++ .cvsignore	17 Sep 2007 23:05:41 -0000	1.54
@@ -1 +1 @@
-sugar-0.65-gited22733941.tar.bz2
+sugar-0.65-gitb8ce5083b7.tar.bz2







From fedora-extras-commits at redhat.com  Mon Sep 17 23:11:08 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:11:08 -0400
Subject: rpms/sugar/OLPC-2 sugar-0.65-jabberserver.patch, NONE,
	1.1 sugar.spec, 1.64, 1.65
Message-ID: <200709172311.l8HNB8l7024046@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24017

Modified Files:
	sugar.spec 
Added Files:
	sugar-0.65-jabberserver.patch 
Log Message:
Add a patch to set jabber server


sugar-0.65-jabberserver.patch:

--- NEW FILE sugar-0.65-jabberserver.patch ---
--- sugar-0.65/sugar/profile.py.bak	2007-09-18 01:05:53.000000000 +0200
+++ sugar-0.65/sugar/profile.py	2007-09-18 01:06:06.000000000 +0200
@@ -24,7 +24,7 @@
 from sugar import util
 from sugar.graphics.xocolor import XoColor
 
-DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
+DEFAULT_JABBER_SERVER = 'jabber.laptop.org'
 
 _profile = None
 


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sugar.spec	17 Sep 2007 23:05:41 -0000	1.64
+++ sugar.spec	17 Sep 2007 23:10:35 -0000	1.65
@@ -16,6 +16,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: sugar-0.65-jabberserver.patch
+
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: perl-XML-Parser
@@ -49,6 +51,8 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .jabberserver
+
 %build
 %configure
 make
@@ -81,6 +85,7 @@
 %changelog
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
 - New snapshot
+- Add a patch to set the jabber server to jabber.laptop.org
 
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.50.20070917gited22733941
 - New snapshot



From fedora-extras-commits at redhat.com  Mon Sep 17 23:14:46 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 17 Sep 2007 19:14:46 -0400
Subject: rpms/sugar/OLPC-2 sugar.spec,1.65,1.66
Message-ID: <200709172314.l8HNEkcT024150@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24120

Modified Files:
	sugar.spec 
Log Message:
Fix patch level


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sugar.spec	17 Sep 2007 23:10:35 -0000	1.65
+++ sugar.spec	17 Sep 2007 23:14:14 -0000	1.66
@@ -51,7 +51,7 @@
 %prep
 %setup -q
 
-%patch1 -p0 -b .jabberserver
+%patch1 -p1 -b .jabberserver
 
 %build
 %configure



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora EPEL, 4) updated by kevin
Message-ID: <200709172316.l8HNGcac029718@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-nltk



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora, 7) updated by kevin
Message-ID: <200709172316.l8HNGc2U029729@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-nltk



From fedora-extras-commits at redhat.com  Mon Sep 17 23:16:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 16:16:37 -0700
Subject: [pkgdb] python-nltk (Fedora EPEL, 5) updated by kevin
Message-ID: <200709172316.l8HNGdX4029739@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-nltk
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-nltk (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-nltk (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-nltk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-nltk



From fedora-extras-commits at redhat.com  Mon Sep 17 23:17:18 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 17 Sep 2007 19:17:18 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, NONE,
	1.1 kdenetwork.spec, 1.101, 1.102
Message-ID: <200709172317.l8HNHIh2024465@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.7-ppp.patch 
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
- +Requires: jasper (kopete yahoo support)


kdenetwork-3.5.7-ppp.patch:

--- NEW FILE kdenetwork-3.5.7-ppp.patch ---
diff -up kdenetwork-3.5.7/kppp/pppstats.cpp.ppp kdenetwork-3.5.7/kppp/pppstats.cpp
--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 05:12:34.000000000 -0500
+++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-08-29 09:15:50.000000000 -0400
@@ -69,6 +69,7 @@
  #ifndef HAVE_NET_IF_PPP_H
   #ifdef HAVE_LINUX_IF_PPP_H
    #include <linux/if.h>
+   #include <linux/ppp_defs.h>
    #include <linux/if_ppp.h>
   #endif
  #else
diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
--- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/configure.in.in	2007-08-29 09:13:21.000000000 -0400
@@ -26,6 +26,8 @@ AC_TRY_LINK([
   #ifndef STREAMS 
 
     #if defined(linux)
+      #include <linux/if.h>
+      #include <linux/ppp_defs.h>
       #include <linux/if_ppp.h>
     #else
       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
diff -up kdenetwork-3.5.7/kppp/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 04:20:37.000000000 -0400
+++ kdenetwork-3.5.7/kppp/opener.cpp	2007-08-29 09:14:29.000000000 -0400
@@ -69,6 +69,8 @@ extern "C" int _Precvmsg(int, void*, int
 
 #ifndef HAVE_NET_IF_PPP_H
 #  ifdef HAVE_LINUX_IF_PPP_H
+#    include <linux/if.h>
+#    include <linux/ppp_defs.h>
 #    include <linux/if_ppp.h>
 #  endif
 #else


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdenetwork.spec	29 Aug 2007 11:51:42 -0000	1.101
+++ kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -39,6 +39,8 @@
 Patch2: kdenetwork-3.1-buildroot.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
+# include more/proper ppp headers
+Patch5: kdenetwork-3.5.7-ppp.patch
 
 Requires(preun):  chkconfig
 Requires(post):   /sbin/ldconfig chkconfig
@@ -77,6 +79,8 @@
 # sametime
 %{?_enable_sametime_plugin:BuildRequires: meanwhile-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
+# yahoo
+Requires(hint): jasper
 
 
 %description
@@ -129,6 +133,7 @@
 %patch3 -p1 -b .kppp
 %endif
 %patch4 -p1 -b .resolv
+%patch5 -p1 -b .ppp
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -421,6 +426,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
+- +Requires: jasper (kopete yahoo support)
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-4
+- ppp patch (to enable kppp build again)
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-3
 - License: GPLv2
 - Provides: kdenetwork3(-devel)



From fedora-extras-commits at redhat.com  Mon Sep 17 23:20:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 17 Sep 2007 19:20:01 -0400
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.17,1.18
Message-ID: <200709172320.l8HNK1wS024672@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24620

Modified Files:
	bluez-gnome.spec 
Log Message:
* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
- Split out the analyzer so it's not installed by default
- Don't prefix the properties .desktop with fedora for no reason



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bluez-gnome.spec	31 Aug 2007 17:30:36 -0000	1.17
+++ bluez-gnome.spec	17 Sep 2007 23:19:26 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -27,6 +27,17 @@
 The bluez-gnome package contains Bluetooth helper applets and tools for
 the GNOME desktop environment.
 
+%package analyzer
+Summary: Bluetooth protocol analyzer
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
+%description analyzer
+The bluez-gnome package contains Bluetooth helper applets and tools for
+the GNOME desktop environment.
+
+This package contains the Bluetooth protocol analyzer.
+
 %prep
 %setup -q
 sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop.in
@@ -41,7 +52,7 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor=fedora				\
+desktop-file-install --vendor=""				\
 	--add-category=X-GNOME-NetworkSettings			\
 	--delete-original					\
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
@@ -91,16 +102,26 @@
 
 %files -f bluetooth-manager.lang
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/bluetooth-applet
+%{_bindir}/bluetooth-properties
 %config %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
-%{_datadir}/man/man1/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/man/man1/bluetooth-applet.1.gz
+%{_datadir}/man/man1/bluetooth-properties.1.gz
+%{_datadir}/applications/bluetooth-properties.desktop
 %{_datadir}/mime/packages/bluetooth-manager.xml
 %doc README COPYING AUTHORS ChangeLog
 
+%files analyzer
+%{_datadir}/applications/bluetooth-analyzer.desktop
+%{_bindir}/bluetooth-analyzer
+%{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
+- Split out the analyzer so it's not installed by default
+- Don't prefix the properties .desktop with fedora for no reason
+
 * Fri Aug 31 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-2
 - Remove the obex BR, we're not using it yet
 - Build with HAL support



From fedora-extras-commits at redhat.com  Mon Sep 17 23:27:32 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 17 Sep 2007 19:27:32 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.55,
	1.56 selinux-policy.spec, 1.521, 1.522
Message-ID: <200709172327.l8HNRWdb025034@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24952

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.55 -r 1.56 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- policy-20070703.patch	11 Sep 2007 20:05:08 -0000	1.55
+++ policy-20070703.patch	17 Sep 2007 23:26:58 -0000	1.56
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.8/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -26,32 +26,32 @@
 +system_r:sysadm_su_t:s0		system_r:unconfined_t:s0
 +system_r:unconfined_t:s0	system_r:unconfined_t:s0
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.8/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/default_type	2007-09-17 16:20:18.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
  staff_r:staff_t
 -unconfined_r:unconfined_t
  user_r:user_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.8/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/failsafe_context	2007-09-17 16:20:18.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/guest_u_default_contexts	2007-09-17 16:20:18.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/root_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -71,17 +71,17 @@
 -#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 user_r:user_t:s0
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.8/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/seusers	2007-09-17 16:20:18.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +__default__:system_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -92,15 +92,15 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.8/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/userhelper_context	2007-09-17 16:20:18.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.8/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/user_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -109,18 +109,18 @@
 +system_r:xdm_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_su_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mcs/xguest_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,5 @@
 +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_crond_t:s0
 +system_r:xdm_t		xguest_r:xguest_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.8/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_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
@@ -148,29 +148,17 @@
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +staff_r:staff_sudo_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
---- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-09-06 15:43:06.000000000 -0400
-@@ -1,6 +1,5 @@
--auditadm_r:auditadm_t
--secadm_r:secadm_t
- sysadm_r:sysadm_t
-+secadm_r:secadm_t
- staff_r:staff_t
--unconfined_r:unconfined_t
- user_r:user_t
-+auditadm_r:auditadm_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.8/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.0.7/config/appconfig-mls/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/guest_u_default_contexts	2007-09-17 16:20:18.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_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.8/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/root_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_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
@@ -189,9 +177,9 @@
  #
 -#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 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +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
@@ -202,9 +190,9 @@
 +staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 +sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.8/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-mls/user_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -213,17 +201,17 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 +user_r:user_su_t:s0		user_r:user_t:s0
 +user_r:user_sudo_t:s0		user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.8/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-standard/guest_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.8/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/config/appconfig-standard/staff_u_default_contexts	2007-09-17 16:20:18.000000000 -0400
[...7168 lines suppressed...]
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -265,7 +272,7 @@
+@@ -265,7 +265,7 @@
  # Xen store local policy
  #
  
@@ -15521,7 +14334,7 @@
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -318,12 +325,13 @@
+@@ -318,12 +318,13 @@
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
  
  # internal communication is often done using fifo and unix sockets.
@@ -15536,7 +14349,7 @@
  files_search_var_lib(xm_t)
  
  allow xm_t xen_image_t:dir rw_dir_perms;
-@@ -336,6 +344,7 @@
+@@ -336,6 +337,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -15544,7 +14357,7 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -353,6 +362,7 @@
+@@ -353,6 +355,7 @@
  
  term_use_all_terms(xm_t)
  
@@ -15552,7 +14365,7 @@
  init_rw_script_stream_sockets(xm_t)
  init_use_fds(xm_t)
  
-@@ -366,3 +376,14 @@
+@@ -366,3 +369,14 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)
@@ -15567,19 +14380,19 @@
 +	fs_manage_nfs_files(xend_t)
 +	fs_read_nfs_symlinks(xend_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.8/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.8/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.8/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/guest.te	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -15590,20 +14403,20 @@
 +optional_policy(`
 +	hal_dbus_chat(xguest_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.8/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/logadm.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.8/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/logadm.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.8/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-09-06 15:43:06.000000000 -0400
-@@ -0,0 +1,33 @@
++++ serefpolicy-3.0.8/policy/modules/users/logadm.te	2007-09-17 16:20:18.000000000 -0400
+@@ -0,0 +1,12 @@
 +policy_module(logadm,1.0.0)
 +
 +########################################
@@ -15614,47 +14427,26 @@
 +
 +allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
 +
-+logging_etc_filetrans_syslog_conf(logadm_t)
-+logging_manage_syslog_config(logadm_t)
-+logging_manage_all_logs(logadm_t)
-+
-+seutil_run_runinit(logadm_t, logadm_r, { logadm_tty_device_t logadm_devpts_t })
-+
-+domain_kill_all_domains(logadm_t)
-+seutil_read_bin_policy(logadm_t)
-+corecmd_exec_shell(logadm_t)
-+logging_send_syslog_msg(logadm_t)
-+logging_read_generic_logs(logadm_t)
-+logging_manage_audit_log(logadm_t)
-+logging_manage_audit_config(logadm_t)
-+logging_run_auditctl(logadm_t,logadm_r,{ logadm_tty_device_t logadm_devpts_t })
-+logging_run_auditd(logadm_t, logadm_r, { logadm_tty_device_t logadm_devpts_t })
-+userdom_dontaudit_read_sysadm_home_content_files(logadm_t)
-+consoletype_exec(logadm_t)
-+
-+kernel_read_ring_buffer(logadm_t)
-+dmesg_exec(logadm_t)
-+
-+files_dontaudit_search_all_dirs(logadm_t)
-+files_dontaudit_getattr_all_files(logadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
++logging_syslog_admin(logadm, logadm_t, logadm_r)
++logging_audit_admin(logadm, logadm_t, logadm_r)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.8/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/metadata.xml	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.8/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.fc	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.8/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.if	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.8/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/users/webadm.te	2007-09-17 16:20:18.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -15691,16 +14483,16 @@
 +userdom_dontaudit_search_sysadm_home_dirs(webadm_t)
 +userdom_dontaudit_search_generic_user_home_dirs(webadm_t)
 +
-+apache_admin(webadm_t, webadm_r, { webadm_tty_device_t webadm_devpts_t })
++apache_admin(webadm, webadm_t, webadm_r)
 +
 +gen_require(`
 +	type gadmin_t;
 +')
 +allow gadmin_t webadm_t:process transition;
 +allow webadm_t gadmin_t:dir getattr;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.8/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/support/obj_perm_sets.spt	2007-09-17 16:20:18.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -15724,9 +14516,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.8/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/users	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/users	2007-09-17 16:20:18.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -15761,9 +14553,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, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.8/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/Rules.modular	2007-09-06 15:43:06.000000000 -0400
++++ serefpolicy-3.0.8/Rules.modular	2007-09-17 16:20:18.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- selinux-policy.spec	11 Sep 2007 20:05:08 -0000	1.521
+++ selinux-policy.spec	17 Sep 2007 23:26:58 -0000	1.522
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.0.7
-Release: 10%{?dist}
+Version: 3.0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
+- Allow cron to search nfs and samba homedirs
+
 * Tue Sep 11 2007 Dan Walsh <dwalsh at redhat.com> 3.0.7-10
 - Allow NetworkManager to dbus chat with yum-updated
 



From fedora-extras-commits at redhat.com  Mon Sep 17 23:30:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 17 Sep 2007 19:30:47 -0400
Subject: rpms/linux-libertine-fonts/F-7 linux-libertine-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
Message-ID: <200709172330.l8HNUlbs025277@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/linux-libertine-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25251

Modified Files:
	linux-libertine-fonts.spec sources .cvsignore 
Log Message:
Updated to 2.6.9
Update License tag



Index: linux-libertine-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/linux-libertine-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-libertine-fonts.spec	17 Mar 2007 07:22:24 -0000	1.6
+++ linux-libertine-fonts.spec	17 Sep 2007 23:30:13 -0000	1.7
@@ -2,13 +2,13 @@
 %define fontdir         %{_datadir}/fonts/linux-libertine
 
 Name:          linux-libertine-fonts
-Version:       2.4.9
+Version:       2.6.9
 Release:       1%{?dist}
 Summary:       Linux Libertine Open Fonts
 Group:         User Interface/X
-License:       OFL/GPL
+License:       GPL+ with exceptions or OFL
 URL:           http://linuxlibertine.sf.net
-Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
+Source:        http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: fontforge
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Sun Sep 16 2007 Kevin Fenzi <kevin at tummy.com> - 2.6.9-1
+- Updated to 2.6.9
+- Update License tag
+
 * Sat Mar 17 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 2.4.9-1
 - Updated to 2.4.9
 - Reenabled generation of PDF files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2007 07:22:24 -0000	1.6
+++ sources	17 Sep 2007 23:30:13 -0000	1.7
@@ -1 +1 @@
-aa55aa7c3c6925f3fb7b07ba0e89d6ad  LinLibertineSRC-2.4.9.tgz
+449c862d3e46b1c187d2bbbce5d79b77  LinLibertineSRC-2.6.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux-libertine-fonts/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2007 07:22:24 -0000	1.6
+++ .cvsignore	17 Sep 2007 23:30:13 -0000	1.7
@@ -1 +1 @@
-LinLibertineSRC-2.4.9.tgz
+LinLibertineSRC-2.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 00:50:57 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 17 Sep 2007 20:50:57 -0400
Subject: rpms/deskbar-applet/devel .cvsignore, 1.26, 1.27 deskbar-applet.spec,
	1.53, 1.54 sources, 1.26, 1.27
Message-ID: <200709180050.l8I0ovrb000385@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv361

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	21 Aug 2007 21:08:38 -0000	1.26
+++ .cvsignore	18 Sep 2007 00:50:23 -0000	1.27
@@ -1 +1 @@
-deskbar-applet-2.19.90.1.tar.bz2
+deskbar-applet-2.20.0.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- deskbar-applet.spec	21 Aug 2007 21:08:38 -0000	1.53
+++ deskbar-applet.spec	18 Sep 2007 00:50:23 -0000	1.54
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.19.90.1
+Version:        2.20.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.17/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.20/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,10 +44,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
-adir="${adir#*=}"
-install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
-install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
+#adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+#adir="${adir#*=}"
+mdir="$(grep "^modulesdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+mdir="${mdir#*=}"
+install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT$mdir
+install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/art
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
 
@@ -100,6 +102,12 @@
 
 
 %changelog
+* Mon Sep 17 2007 Luke Macken <lmacken at redhat.com> - 2.20.0-1
+- 2.20.0
+
+* Sun Sep  9 2007 Luke Macken <lmacken at redhat.com> - 2.19.92-1
+- 2.19.92
+
 * Sat Aug 21 2007 Luke Macken <lmacken at redhat.com> - 2.19.90.1-1
 - 2.19.90.1
 - Remove all patches, as they are all upstream now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	21 Aug 2007 21:08:38 -0000	1.26
+++ sources	18 Sep 2007 00:50:23 -0000	1.27
@@ -1 +1 @@
-796449483182bb9929a97c9596fa8a2b  deskbar-applet-2.19.90.1.tar.bz2
+3b7ae77476f7b11e53e50c8751e4ca1f  deskbar-applet-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 00:52:11 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Mon, 17 Sep 2007 20:52:11 -0400
Subject: rpms/openswan/devel openswan.spec,1.40,1.41
Message-ID: <200709180052.l8I0qBdr000520@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv437

Modified Files:
	openswan.spec 
Log Message:
Forgot changelog entry



Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openswan.spec	17 Sep 2007 22:07:40 -0000	1.40
+++ openswan.spec	18 Sep 2007 00:51:38 -0000	1.41
@@ -24,7 +24,7 @@
 
 
 %define debug_package %{nil}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -234,6 +234,12 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Sep 17 2007 Steve Conklin <sconklin at redhat.com> - 2.4.9-2
+- Forgot changelog on last entry
+
+* Mon Sep 17 2007 Steve Conklin <sconklin at redhat.com> - 2.4.9-1
+- sync to upstream latest
+
 * Tue Mar 20 2007 Florian La Roche <laroche at redhat.com> - 2.4.7-3
 - do not use epoch macro, it is unset
 



From fedora-extras-commits at redhat.com  Tue Sep 18 01:23:10 2007
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 17 Sep 2007 21:23:10 -0400
Subject: rpms/seahorse/devel seahorse.spec,1.30,1.31
Message-ID: <200709180123.l8I1NA0B007772@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746

Modified Files:
	seahorse.spec 
Log Message:

correct url



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- seahorse.spec	22 Aug 2007 23:55:21 -0000	1.30
+++ seahorse.spec	18 Sep 2007 01:22:38 -0000	1.31
@@ -7,7 +7,7 @@
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://seahorse.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
+Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/1.0/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils



From fedora-extras-commits at redhat.com  Tue Sep 18 01:38:58 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 17 Sep 2007 21:38:58 -0400
Subject: rpms/kde-filesystem/devel macros.kde4, 1.1, 1.2 kde-filesystem.spec,
	1.8, 1.9
Message-ID: <200709180138.l8I1cwEL008220@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8198/devel

Modified Files:
	kde-filesystem.spec 
Added Files:
	macros.kde4 
Log Message:
Merge changes from kde-filesystem-kde4-branch.

kde-filesystem now contains the required directories and RPM macros for both KDE 3 and 4, which allows adding parallel-installable KDE 4 development platform packages. (No dependency on KDE 4 is introduced, so there should be no noticeable changes for KDE 3 only users.)


Index: macros.kde4
===================================================================
RCS file: macros.kde4
diff -N macros.kde4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros.kde4	18 Sep 2007 01:38:25 -0000	1.2
@@ -0,0 +1,19 @@
+
+# api = 1
+# initial try, including only items that vary from defaults
+
+%cmake_kde4 \
+  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 ; \
+  %{__cmake} \\\
+  %if "%{_lib}" == "lib64" \
+    -DLIB_SUFFIX=64 \\\
+  %endif \
+  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
+  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
+  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
+  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
+  -DDATA_INSTALL_DIR=%{_kde4_appsdir}


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde-filesystem.spec	27 Aug 2007 15:51:59 -0000	1.8
+++ kde-filesystem.spec	18 Sep 2007 01:38:25 -0000	1.9
@@ -1,23 +1,41 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/kde4/apps
+%define _kde4_docdir %_kde4_prefix/share/doc
+%define _kde4_bindir %_kde4_prefix/bin
+%define _kde4_sbindir %_kde4_prefix/sbin
+%define _kde4_includedir %_kde4_prefix/include
+%define _kde4_debug RelWithDebInfo
+%define _kde4_macros_api 1
 
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 13%{?dist}
+Name: kde-filesystem
+Version: 3.92
+Release: 9%{?dist}
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Consider -- Rex
-#Provides: kde3-filesystem = %{version}-%{release}
-
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
 
+Source2: macros.kde4
+# increment whenever dirs change in an incompatible way
+# kde4 apps built using macros.kde4 should
+# Requires: kde4-macros(api) = %{_kde4_macros_api}
+Provides: kde4-macros(api) = %{_kde4_macros_api} 
+
 BuildRequires: gawk
 
 Requires:  filesystem
+Requires:  rpm
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -33,6 +51,7 @@
 rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
+## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
@@ -46,13 +65,72 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+## KDE4
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
+      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
+
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+# rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/kde4/apps
+%%_kde4_docdir %_kde4_prefix/share/doc
+%%_kde4_bindir %%_kde4_prefix/bin
+%%_kde4_sbindir %%_kde4_prefix/sbin
+%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_debug RelWithDebInfo
+%%_kde4_macros_api 1
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+
+# KDE3
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -71,22 +149,59 @@
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
+# KDE4
+%config /etc/rpm/macros.kde4
+%{_kde4_sysconfdir}/kde4/
+%{_kde4_libdir}
+%{_kde4_datadir}/applications/kde4/
+%{_kde4_appsdir}/
+%{_kde4_configdir}/
+%{_kde4_sharedir}/config.kcfg/
+%{_kde4_sharedir}/desktop-directories/
+%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/icons/locolor
+%{_kde4_sharedir}/services/
+%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/templates/
+%{_kde4_datadir}/wallpapers/
+%{_kde4_datadir}/sounds/
+%dir %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
+
 
 %changelog
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-13
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
-
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-12
 - - %%_prefix/{env,shutdown} (non-FHS)
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-11
-- fix templates.source typo
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
+- kde4-macros(api), %%_kde4_macros_api
+
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
+- use macros
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-4
+- fix kde4 macro
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-3
+- cleanup macros.kde4 (mostly use _kde4_ prefix)
+- Requires: rpm
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 3.92-2
+- add missing macros.kde4
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-10
-- +disttag
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
 
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
-- +%%_datadir/{sounds,templates,source,wallpapers}
+- +%%_datadir/{sounds,templates/.source,wallpapers}
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-8
 - +%%_datadir/{autostart,emoticons,mimelnk/*}



From fedora-extras-commits at redhat.com  Tue Sep 18 01:45:02 2007
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 17 Sep 2007 21:45:02 -0400
Subject: rpms/nsd/F-7 nsd.init,1.5,1.6 nsd.spec,1.20,1.21 sources,1.8,1.9
Message-ID: <200709180145.l8I1j2uW008362@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8320

Modified Files:
	nsd.init nsd.spec sources 
Log Message:

Pulled in from devel branch after testing.

* 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




Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	18 Sep 2007 01:44:30 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	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


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/nsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsd.spec	13 Jul 2007 18:47:21 -0000	1.20
+++ nsd.spec	18 Sep 2007 01:44:30 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -20,8 +20,10 @@
 %setup -q 
 
 %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}
@@ -30,14 +32,14 @@
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d -m 0755 %{buildroot}%{_initrddir}
-install -d -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
+install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.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 "# include: \"/some/path/file\"" >> %{buildroot}%{_sysconfdir}/nsd/nsd.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,6 +53,7 @@
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -74,6 +77,22 @@
 fi
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Mar 2007 04:27:39 -0000	1.8
+++ sources	18 Sep 2007 01:44:30 -0000	1.9
@@ -1,6 +1,2 @@
-e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
-72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
-e64633bb4e6eb46e8e16049e87333cb9  nsd.init
-a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz
-73f59bebd0af6ed2d2f0dad2b7727229  nsd-3.0.3.tar.gz
-ab72e227d600889319d28c4387a95cef  nsd-3.0.5.tar.gz
+02fd7cfe4c455f180a2178da78b6cd21  nsd.init
+db964272bb653f3691cdae6932953432  nsd-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 01:50:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 21:50:01 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.6, 1.7 ConsoleKit.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200709180150.l8I1o1dY008552@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8530

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Apr 2007 16:34:29 -0000	1.6
+++ .cvsignore	18 Sep 2007 01:49:28 -0000	1.7
@@ -1,5 +1 @@
-console-kit-0.1.0.tar.gz
-ConsoleKit-0.1.3.git20070301.tar.gz
-ConsoleKit-0.2.0.tar.gz
-ConsoleKit-0.2.1.git20070204.tar.gz
-ConsoleKit-0.2.1.tar.gz
+ConsoleKit-0.2.2.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ConsoleKit.spec	6 Aug 2007 04:51:09 -0000	1.12
+++ ConsoleKit.spec	18 Sep 2007 01:49:28 -0000	1.13
@@ -4,8 +4,8 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.1
-Release: 4%{?dist}
+Version: 0.2.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
@@ -141,6 +141,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.2-1
+- Update to 0.2.2
+
 * Mon Aug  6 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.1-4
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Apr 2007 16:34:29 -0000	1.6
+++ sources	18 Sep 2007 01:49:28 -0000	1.7
@@ -1 +1 @@
-8bf5e83931a8a3c2abcd541781e1554c  ConsoleKit-0.2.1.tar.gz
+700128f32c2e3c087684f4c28a312764  ConsoleKit-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 02:18:15 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 22:18:15 -0400
Subject: rpms/yelp/devel yelp.spec,1.110,1.111
Message-ID: <200709180218.l8I2IFgL015441@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15402

Modified Files:
	yelp.spec 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- yelp.spec	28 Aug 2007 19:00:15 -0000	1.110
+++ yelp.spec	18 Sep 2007 02:17:40 -0000	1.111
@@ -19,8 +19,8 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.19.90
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.19/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -148,6 +148,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.90-3
 - Remove --add-only-show-in from desktop-file-install (RH bug #258821).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 02:24:27 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:24:27 -0400
Subject: rpms/gedit/devel .cvsignore, 1.66, 1.67 gedit.spec, 1.139,
	1.140 sources, 1.68, 1.69
Message-ID: <200709180224.l8I2OR8j015765@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15728

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	14 Sep 2007 06:07:17 -0000	1.66
+++ .cvsignore	18 Sep 2007 02:23:42 -0000	1.67
@@ -1 +1 @@
-gedit-2.19.92.tar.bz2
+gedit-2.20.0.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gedit.spec	14 Sep 2007 06:07:17 -0000	1.139
+++ gedit.spec	18 Sep 2007 02:23:42 -0000	1.140
@@ -6,10 +6,10 @@
 %define libgnomeprintui_version 2.12.1
 %define desktop_file_utils_version 0.9
 %define gail_version 1.2.0
-%define gtksourceview_version 1.90.3
+%define gtksourceview_version 2.0.0
 %define pygtk_version 2.9.7
 %define pygobject_version 2.11.5
-%define pygtksourceview_version 1.90.3
+%define pygtksourceview_version 2.0.0
 %define gnome_python_desktop_version 2.15.90
 %define gnome_doc_utils_version 0.3.2
 %define gconf_version 2.14
@@ -18,12 +18,12 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.19.92
+Version: 	2.20.0
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
 Group:		Applications/Editors
-Source0:	http://download.gnome.org/sources/gedit/2.19/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.20/gedit-%{version}.tar.bz2
 
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	14 Sep 2007 06:07:17 -0000	1.68
+++ sources	18 Sep 2007 02:23:42 -0000	1.69
@@ -1 +1 @@
-780644ec80be0938b6860de1d220d684  gedit-2.19.92.tar.bz2
+6c14d4f3583c921bdd551df6cd822289  gedit-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:26:40 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 22:26:40 -0400
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.12.0-warnings.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 evolution-exchange.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <200709180226.l8I2Qe5W015897@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Added Files:
	evolution-exchange-2.12.0-warnings.patch 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0


evolution-exchange-2.12.0-warnings.patch:

--- NEW FILE evolution-exchange-2.12.0-warnings.patch ---
diff -up evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c.warnings evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c
--- evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c.warnings	2007-09-17 22:01:29.000000000 -0400
+++ evolution-exchange-2.12.0/addressbook/e-book-backend-gal.c	2007-09-17 22:02:11.000000000 -0400
@@ -1687,7 +1687,7 @@ start_book_view (EBookBackend  *backend,
 	GNOME_Evolution_Addressbook_CallStatus status;
 	GList *contacts;
 	char *ldap_query;
-	int ldap_err;
+	int ldap_err = LDAP_SUCCESS;
 	int search_msgid;
 	int view_limit;
 	GList *l;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Sep 2007 03:54:17 -0000	1.8
+++ .cvsignore	18 Sep 2007 02:26:08 -0000	1.9
@@ -1 +1 @@
-evolution-exchange-2.11.92.tar.bz2
+evolution-exchange-2.12.0.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- evolution-exchange.spec	4 Sep 2007 04:49:10 -0000	1.11
+++ evolution-exchange.spec	18 Sep 2007 02:26:08 -0000	1.12
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.11.92
+Version: 2.12.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -52,6 +52,7 @@
 
 # The usual compilation breakage...
 Patch16: evolution-exchange-2.11.92-compilation-breakage.patch
+Patch17: evolution-exchange-2.12.0-warnings.patch
 
 ### Dependencies ###
 
@@ -93,6 +94,7 @@
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
 %patch16 -p1 -b .compilation-breakage
+%patch17 -p1 -b .warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -166,6 +168,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Mon Sep 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-1.fc8
 - Update to 2.11.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2007 03:54:17 -0000	1.8
+++ sources	18 Sep 2007 02:26:08 -0000	1.9
@@ -1 +1 @@
-34383a2be637b3baeb058072ef584ca7  evolution-exchange-2.11.92.tar.bz2
+3b0cf703a034255a123823f318a89d26  evolution-exchange-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:32:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:32:10 -0400
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.13,1.14
Message-ID: <200709180232.l8I2WAHp016017@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15994

Modified Files:
	ConsoleKit.spec 
Log Message:
fix file lists



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConsoleKit.spec	18 Sep 2007 01:49:28 -0000	1.13
+++ ConsoleKit.spec	18 Sep 2007 02:31:37 -0000	1.14
@@ -115,6 +115,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
 %{_sysconfdir}/rc.d/init.d/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit/seats.d
+%config %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
 %{_sbindir}/console-kit-daemon
 %{_bindir}/ck-list-sessions
 



From fedora-extras-commits at redhat.com  Tue Sep 18 02:33:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:33:22 -0400
Subject: rpms/gok/devel .cvsignore, 1.26, 1.27 gok.spec, 1.54, 1.55 sources, 
	1.26, 1.27
Message-ID: <200709180233.l8I2XMRw016092@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 05:31:01 -0000	1.26
+++ .cvsignore	18 Sep 2007 02:32:50 -0000	1.27
@@ -1 +1 @@
-gok-1.3.3.tar.bz2
+gok-1.3.4.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/gok.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gok.spec	14 Sep 2007 05:31:01 -0000	1.54
+++ gok.spec	18 Sep 2007 02:32:50 -0000	1.55
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.3.3
+Version: 1.3.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -121,6 +121,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.4-1
+- Update to 1.3.4
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.3.3-1
 - Update to 1.3.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gok/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Sep 2007 05:31:01 -0000	1.26
+++ sources	18 Sep 2007 02:32:50 -0000	1.27
@@ -1 +1 @@
-be080327247c8f6a0b49118d1bfeb2a5  gok-1.3.3.tar.bz2
+b304eb500800c0b359d2e3c361be5282  gok-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:44:54 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:44:54 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.61, 1.62 epiphany.spec, 1.160,
	1.161 sources, 1.62, 1.63
Message-ID: <200709180244.l8I2isUn016395@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	4 Sep 2007 13:51:44 -0000	1.61
+++ .cvsignore	18 Sep 2007 02:44:21 -0000	1.62
@@ -1 +1 @@
-epiphany-2.19.91.tar.bz2
+epiphany-2.20.0.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- epiphany.spec	4 Sep 2007 13:51:44 -0000	1.160
+++ epiphany.spec	18 Sep 2007 02:44:21 -0000	1.161
@@ -7,12 +7,12 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://download.gnome.org/sources/epiphany/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires(post): scrollkeeper
@@ -190,6 +190,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Sep 2007 13:51:44 -0000	1.62
+++ sources	18 Sep 2007 02:44:21 -0000	1.63
@@ -1 +1 @@
-9bd85a26913b90b8c81ec6b300f9ecf8  epiphany-2.19.91.tar.bz2
+651beab72c7a3c0b42b45f5087d4e9b0  epiphany-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:53:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:53:25 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.52, 1.53 libwnck.spec, 1.83,
	1.84 sources, 1.52, 1.53
Message-ID: <200709180253.l8I2rPYt017253@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17138

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	4 Sep 2007 19:16:14 -0000	1.52
+++ .cvsignore	18 Sep 2007 02:52:52 -0000	1.53
@@ -1 +1 @@
-libwnck-2.19.92.tar.bz2
+libwnck-2.20.0.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libwnck.spec	4 Sep 2007 19:16:14 -0000	1.83
+++ libwnck.spec	18 Sep 2007 02:52:52 -0000	1.84
@@ -5,10 +5,10 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
-Source0: http://download.gnome.org/sources/libwnck/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libwnck/2.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92 (translations)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	4 Sep 2007 19:16:14 -0000	1.52
+++ sources	18 Sep 2007 02:52:52 -0000	1.53
@@ -1 +1 @@
-bab1a1f8b635d9c76aa13f388138a600  libwnck-2.19.92.tar.bz2
+9b8aa03b6706c38f91c4120567f78d78  libwnck-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:57:00 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:57:00 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.52, 1.53 gnome-desktop.spec, 
	1.98, 1.99 sources, 1.52, 1.53
Message-ID: <200709180257.l8I2v0nF017846@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17739

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	4 Sep 2007 19:09:30 -0000	1.52
+++ .cvsignore	18 Sep 2007 02:56:28 -0000	1.53
@@ -1 +1 @@
-gnome-desktop-2.19.92.tar.bz2
+gnome-desktop-2.20.0.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-desktop.spec	4 Sep 2007 19:09:30 -0000	1.98
+++ gnome-desktop.spec	18 Sep 2007 02:56:28 -0000	1.99
@@ -11,10 +11,10 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -125,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92 (translation updates)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	4 Sep 2007 19:09:30 -0000	1.52
+++ sources	18 Sep 2007 02:56:28 -0000	1.53
@@ -1 +1 @@
-b56187d2724b6715fbc9b2da7279d2bf  gnome-desktop-2.19.92.tar.bz2
+530244e27a4a2426f833561c4b573a42  gnome-desktop-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 02:59:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 22:59:10 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.39, 1.40 gtk2-engines.spec,
	1.77, 1.78 sources, 1.40, 1.41
Message-ID: <200709180259.l8I2xAJv018223@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18117

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	4 Sep 2007 03:29:19 -0000	1.39
+++ .cvsignore	18 Sep 2007 02:58:37 -0000	1.40
@@ -1 +1 @@
-gtk-engines-2.11.7.tar.bz2
+gtk-engines-2.12.0.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gtk2-engines.spec	4 Sep 2007 03:25:55 -0000	1.77
+++ gtk2-engines.spec	18 Sep 2007 02:58:37 -0000	1.78
@@ -1,11 +1,11 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.11.7
+Version:        2.12.0
 Release:	1%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
-Source:         http://download.gnome.org/sources/gtk-engines/2.11/gtk-engines-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtk-engines/2.12/gtk-engines-%{version}.tar.bz2
 Patch0:		gtk-engines-2.10.2-keep-default-tooltip-color.patch
 
 Conflicts:  	gnome-themes < 2.9.0
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
+- Update to 2.12.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.7-1
 - Update to 2.11.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	4 Sep 2007 03:29:19 -0000	1.40
+++ sources	18 Sep 2007 02:58:37 -0000	1.41
@@ -1 +1 @@
-fa962bb9be3d50d2d5006696637f4e9a  gtk-engines-2.11.7.tar.bz2
+8f17f5ab09f9f8e17db3101c0133b811  gtk-engines-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:06:36 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:06:36 -0400
Subject: rpms/gedit/devel gedit.spec,1.140,1.141
Message-ID: <200709180306.l8I36aXA025320@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25207

Modified Files:
	gedit.spec 
Log Message:
fix file lists



Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gedit.spec	18 Sep 2007 02:23:42 -0000	1.140
+++ gedit.spec	18 Sep 2007 03:06:03 -0000	1.141
@@ -189,8 +189,8 @@
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gedit-2.16
-%{_libdir}/pkgconfig/gedit-2.16.pc
+%{_includedir}/gedit-2.20
+%{_libdir}/pkgconfig/gedit-2.20.pc
 %{_datadir}/gtk-doc/html/gedit/
 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 03:07:45 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 17 Sep 2007 23:07:45 -0400
Subject: rpms/yelp/devel .cvsignore,1.37,1.38 sources,1.39,1.40
Message-ID: <200709180307.l8I37ja4025577@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25438

Modified Files:
	.cvsignore sources 
Log Message:

* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.20.0-1
- Update to 2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	14 Aug 2007 01:27:09 -0000	1.37
+++ .cvsignore	18 Sep 2007 03:07:12 -0000	1.38
@@ -1 +1 @@
-yelp-2.19.90.tar.bz2
+yelp-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	14 Aug 2007 01:27:09 -0000	1.39
+++ sources	18 Sep 2007 03:07:12 -0000	1.40
@@ -1 +1 @@
-6a60a0c07d8c391de7c806747fcaaedf  yelp-2.19.90.tar.bz2
+8902618c343093b1c64ee6d647ec41ed  yelp-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:08:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:08:03 -0400
Subject: rpms/eog/devel .cvsignore, 1.50, 1.51 eog.spec, 1.96, 1.97 sources, 
	1.50, 1.51
Message-ID: <200709180308.l8I383Mt025691@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	4 Sep 2007 03:54:28 -0000	1.50
+++ .cvsignore	18 Sep 2007 03:07:30 -0000	1.51
@@ -1 +1 @@
-eog-2.19.92.tar.bz2
+eog-2.20.0.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- eog.spec	4 Sep 2007 04:04:28 -0000	1.96
+++ eog.spec	18 Sep 2007 03:07:30 -0000	1.97
@@ -13,10 +13,10 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/eog/2.20/%{name}-%{version}.tar.bz2
 Patch0: eog-2.19.4-svgz.patch
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
@@ -151,6 +151,9 @@
 %{_libdir}/pkgconfig/eog.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	4 Sep 2007 03:54:28 -0000	1.50
+++ sources	18 Sep 2007 03:07:30 -0000	1.51
@@ -1 +1 @@
-773960d53b71b4e3c539c139db3bd277  eog-2.19.92.tar.bz2
+c60bae13a84bca33d303c63d31e63e54  eog-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:11:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:11:35 -0400
Subject: rpms/zenity/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 zenity.spec, 1.33, 1.34
Message-ID: <200709180311.l8I3BZ5R026278@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26160

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Aug 2007 22:49:51 -0000	1.19
+++ .cvsignore	18 Sep 2007 03:11:01 -0000	1.20
@@ -1 +1 @@
-zenity-2.19.2.tar.bz2
+zenity-2.20.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Aug 2007 22:49:51 -0000	1.19
+++ sources	18 Sep 2007 03:11:01 -0000	1.20
@@ -1 +1 @@
-e72dc92169ecdb5b32bf0839b91055b9  zenity-2.19.2.tar.bz2
+64992cdbb38c9f8ea8cd9ea07c1dfc38  zenity-2.20.0.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- zenity.spec	16 Aug 2007 04:44:39 -0000	1.33
+++ zenity.spec	18 Sep 2007 03:11:01 -0000	1.34
@@ -1,11 +1,11 @@
 Name:		zenity
-Version:	2.19.2
-Release:	2%{?dist}
+Version:	2.20.0
+Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
-Source:		http://download.gnome.org/sources/zenity/2.19/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.20/zenity-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-2
 - Drop gdialog and the perl dependency
 



From fedora-extras-commits at redhat.com  Tue Sep 18 03:13:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:13:58 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.59, 1.60 file-roller.spec,
	1.101, 1.102 sources, 1.60, 1.61
Message-ID: <200709180313.l8I3DwPr026692@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26554

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	4 Sep 2007 03:05:36 -0000	1.59
+++ .cvsignore	18 Sep 2007 03:13:26 -0000	1.60
@@ -1 +1 @@
-file-roller-2.19.92.tar.bz2
+file-roller-2.20.0.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- file-roller.spec	4 Sep 2007 03:05:36 -0000	1.101
+++ file-roller.spec	18 Sep 2007 03:13:26 -0000	1.102
@@ -10,12 +10,12 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.19.92
+Version:	2.20.0
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
-Source:		http://download.gnome.org/sources/file-roller/2.19/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.20/file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	4 Sep 2007 03:05:36 -0000	1.60
+++ sources	18 Sep 2007 03:13:26 -0000	1.61
@@ -1 +1 @@
-f19d29d7406e5773202da1782d7d1d0b  file-roller-2.19.92.tar.bz2
+f8b6490114da7d39ee0b239cf0216d0c  file-roller-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:22:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:22:08 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.50,
	1.51 nautilus-cd-burner.spec, 1.92, 1.93 sources, 1.50, 1.51
Message-ID: <200709180322.l8I3M8tC028092@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27973

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	31 Jul 2007 02:01:24 -0000	1.50
+++ .cvsignore	18 Sep 2007 03:21:36 -0000	1.51
@@ -1 +1 @@
-nautilus-cd-burner-2.19.6.tar.bz2
+nautilus-cd-burner-2.20.0.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nautilus-cd-burner.spec	28 Aug 2007 21:40:49 -0000	1.92
+++ nautilus-cd-burner.spec	18 Sep 2007 03:21:36 -0000	1.93
@@ -12,9 +12,9 @@
 
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.19.6
-Release: 2%{?dist}
-Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.19/%{name}-%{version}.tar.bz2
+Version: 2.20.0
+Release: 1%{?dist}
+Source0: http://download.gnome.org/sources/nautilus-cd-burner/20/%{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	31 Jul 2007 02:01:24 -0000	1.50
+++ sources	18 Sep 2007 03:21:36 -0000	1.51
@@ -1 +1 @@
-b783f16ac6cba60c07b889f2a007e318  nautilus-cd-burner-2.19.6.tar.bz2
+a7ddb02c33be107f6c9c1874b7703e9e  nautilus-cd-burner-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:23:03 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:23:03 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.59, 1.60 gnome-panel.spec,
	1.221, 1.222 sources, 1.59, 1.60
Message-ID: <200709180323.l8I3N3g0028251@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28136

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	4 Sep 2007 19:35:44 -0000	1.59
+++ .cvsignore	18 Sep 2007 03:22:30 -0000	1.60
@@ -1 +1 @@
-gnome-panel-2.19.92.tar.bz2
+gnome-panel-2.20.0.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- gnome-panel.spec	17 Sep 2007 16:10:55 -0000	1.221
+++ gnome-panel.spec	18 Sep 2007 03:22:30 -0000	1.222
@@ -21,10 +21,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.19.92
-Release: 7%{?dist} 
+Version: 2.20.0
+Release: 1%{?dist} 
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
 Source2: gnome-compiler-flags.m4
 Source3: redhat-panel-backwards-compat-config.schemas
@@ -316,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-7
 - Can't require tomboy where there's no mono
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	4 Sep 2007 19:35:44 -0000	1.59
+++ sources	18 Sep 2007 03:22:30 -0000	1.60
@@ -1 +1 @@
-698ff684d9c6ca02191e302b12ac94e1  gnome-panel-2.19.92.tar.bz2
+d48c13d4c9935278b29a557d89b33a45  gnome-panel-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:30:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:30:35 -0400
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.20,
	1.21 gnome-user-docs.spec, 1.31, 1.32 sources, 1.20, 1.21
Message-ID: <200709180330.l8I3UZ1k029627@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-user-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Jul 2007 20:15:19 -0000	1.20
+++ .cvsignore	18 Sep 2007 03:30:02 -0000	1.21
@@ -1 +1 @@
-gnome-user-docs-2.18.2.tar.bz2
+gnome-user-docs-2.20.0.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-user-docs.spec	7 Aug 2007 17:52:39 -0000	1.31
+++ gnome-user-docs.spec	18 Sep 2007 03:30:02 -0000	1.32
@@ -1,9 +1,9 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.18.2
-Release:	2%{?dist}
+Version:        2.20.0
+Release:	1%{?dist}
 License:        GFDL+
-Source:         http://download.gnome.org/sources/gnome-user-docs/2.18/gnome-user-docs-%{version}.tar.bz2 
+Source:         http://download.gnome.org/sources/gnome-user-docs/2.20/gnome-user-docs-%{version}.tar.bz2 
 Group:          Documentation
 
 BuildArch:      noarch
@@ -48,11 +48,14 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root,-)
-%{_datadir}/omf/user-guide
-%{_datadir}/omf/system-admin-guide
-%{_datadir}/omf/gnome-access-guide
+%dir %{_datadir}/omf/user-guide
+%dir %{_datadir}/omf/system-admin-guide
+%dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
 - Update the license field
 - Use %%find_lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Jul 2007 20:15:19 -0000	1.20
+++ sources	18 Sep 2007 03:30:02 -0000	1.21
@@ -1 +1 @@
-4d3b5c8bd3cc8008f2a44d98efaa2502  gnome-user-docs-2.18.2.tar.bz2
+60a2b6267f1f6ef7b7f1a6c706d7b938  gnome-user-docs-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:34:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:34:55 -0400
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.8,
	1.9 gnome-backgrounds.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200709180334.l8I3YtDn030349@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Aug 2007 05:55:59 -0000	1.8
+++ .cvsignore	18 Sep 2007 03:34:22 -0000	1.9
@@ -1 +1 @@
-gnome-backgrounds-2.18.3.tar.bz2
+gnome-backgrounds-2.20.0.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-backgrounds.spec	15 Aug 2007 23:44:09 -0000	1.12
+++ gnome-backgrounds.spec	18 Sep 2007 03:34:22 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.18.3
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.20/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -52,6 +52,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.3-2
 - Small fixes from package review
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Aug 2007 05:56:00 -0000	1.8
+++ sources	18 Sep 2007 03:34:22 -0000	1.9
@@ -1 +1 @@
-d91b925d358d2cbc705b4a033e7d5c2e  gnome-backgrounds-2.18.3.tar.bz2
+391c0c64407c5bd2a52207b0298beac4  gnome-backgrounds-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:39:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:39:07 -0400
Subject: rpms/libgnomecanvas/devel .cvsignore, 1.24, 1.25 libgnomecanvas.spec,
	1.41, 1.42 sources, 1.24, 1.25
Message-ID: <200709180339.l8I3d73h031090@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomecanvas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30973

Modified Files:
	.cvsignore libgnomecanvas.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	15 Aug 2007 02:53:45 -0000	1.24
+++ .cvsignore	18 Sep 2007 03:38:34 -0000	1.25
@@ -1 +1 @@
-libgnomecanvas-2.19.2.tar.bz2
+libgnomecanvas-2.20.0.tar.bz2


Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgnomecanvas.spec	25 Aug 2007 17:07:50 -0000	1.41
+++ libgnomecanvas.spec	18 Sep 2007 03:38:34 -0000	1.42
@@ -7,10 +7,10 @@
 
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
-Version: 2.19.2
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/libgnomecanvas/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnomecanvas/2.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -91,6 +91,9 @@
 %{_datadir}/gtk-doc/html/libgnomecanvas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
 * Sat Aug 25 2007 Ray Strode <rstrode at redhat.com> - 2.19.2-2
 - Apply patch from Federico Mena Quintero to avoid
   tearing during scrolls and such


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomecanvas/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	15 Aug 2007 02:53:45 -0000	1.24
+++ sources	18 Sep 2007 03:38:34 -0000	1.25
@@ -1 +1 @@
-fd14cd97dbd9d626cf2a7c0b7e7ac2ee  libgnomecanvas-2.19.2.tar.bz2
+109b71b02e0c976d65b46129d0ad69d1  libgnomecanvas-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:41:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:41:42 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.26,
	1.27 gnome-doc-utils.spec, 1.42, 1.43 sources, 1.26, 1.27
Message-ID: <200709180341.l8I3fgEj031555@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31437

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Sep 2007 03:15:41 -0000	1.26
+++ .cvsignore	18 Sep 2007 03:41:09 -0000	1.27
@@ -1 +1 @@
-gnome-doc-utils-0.11.2.tar.bz2
+gnome-doc-utils-0.12.0.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-doc-utils.spec	4 Sep 2007 03:15:41 -0000	1.42
+++ gnome-doc-utils.spec	18 Sep 2007 03:41:09 -0000	1.43
@@ -1,14 +1,14 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.11.2
+Version: 0.12.0
 Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: http://download.gnome.org/sources/gnome-doc-utils/0.11/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-doc-utils/0.12/%{name}-%{version}.tar.bz2
 
 BuildArch: noarch
 
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.12.0-1
+- Update to 0.12.0
+
 * Mon Sep  3 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11.2-1
 - Update to 0.11.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Sep 2007 03:15:41 -0000	1.26
+++ sources	18 Sep 2007 03:41:09 -0000	1.27
@@ -1 +1 @@
-6999661ccbca9b0f409f6a735821e447  gnome-doc-utils-0.11.2.tar.bz2
+5934c08d12407d8233416343cd73df24  gnome-doc-utils-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:46:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:46:41 -0400
Subject: rpms/dasher/devel .cvsignore, 1.29, 1.30 dasher.spec, 1.68,
	1.69 sources, 1.29, 1.30
Message-ID: <200709180346.l8I3kfaf032418@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/dasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32312

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
0.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	9 Jul 2007 21:59:24 -0000	1.29
+++ .cvsignore	18 Sep 2007 03:46:08 -0000	1.30
@@ -1 +1 @@
-dasher-4.5.2.tar.bz2
+dasher-4.6.0.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- dasher.spec	6 Aug 2007 04:57:12 -0000	1.68
+++ dasher.spec	18 Sep 2007 03:46:08 -0000	1.69
@@ -1,11 +1,11 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.5.2
-Release: 2%{?dist} 
+Version: 4.6.0
+Release: 1%{?dist} 
 License: GPLv2
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/dasher/4.5/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/dasher/4.6/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-speech-devel
@@ -100,13 +100,16 @@
 %{_datadir}/dasher/
 %{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/omf/dasher/*
+%dir %{_datadir}/omf/dasher
 %{_datadir}/applications/gnome-dasher.desktop
 %{_bindir}/dasher
 %{_mandir}/*/dasher.1.gz
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 4.6.0-1
+- Update to 4.6.0
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> - 4.5.2-2
 - Update license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	9 Jul 2007 21:59:24 -0000	1.29
+++ sources	18 Sep 2007 03:46:08 -0000	1.30
@@ -1 +1 @@
-59317850c12064ced3eb76c753be7c71  dasher-4.5.2.tar.bz2
+ab9fce024bb2b1ea3cb479e82819d57d  dasher-4.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:49:01 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:49:01 -0400
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.42,
	1.43 gnome-screensaver.spec, 1.163, 1.164 sources, 1.45, 1.46
Message-ID: <200709180349.l8I3n1HN000370@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32733

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	4 Sep 2007 05:21:47 -0000	1.42
+++ .cvsignore	18 Sep 2007 03:48:28 -0000	1.43
@@ -1 +1 @@
-gnome-screensaver-2.19.7.tar.bz2
+gnome-screensaver-2.20.0.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gnome-screensaver.spec	4 Sep 2007 05:21:47 -0000	1.163
+++ gnome-screensaver.spec	18 Sep 2007 03:48:28 -0000	1.164
@@ -12,11 +12,11 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.19.7
+Version: 2.20.0
 Release: 1%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
-Source0: http://download.gnome.org/sources/gnome-screensaver/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
 - Update to 2.19.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	4 Sep 2007 05:21:47 -0000	1.45
+++ sources	18 Sep 2007 03:48:28 -0000	1.46
@@ -1 +1 @@
-d70d424b3406b8cde5300cea8cff75af  gnome-screensaver-2.19.7.tar.bz2
+d166a3ebf69289331b2ebcf5c0187fd9  gnome-screensaver-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 03:53:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:53:29 -0400
Subject: rpms/icon-naming-utils/devel .cvsignore, 1.2,
	1.3 icon-naming-utils.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709180353.l8I3rT3B001183@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/icon-naming-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1060

Modified Files:
	.cvsignore icon-naming-utils.spec sources 
Log Message:
0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2007 05:02:15 -0000	1.2
+++ .cvsignore	18 Sep 2007 03:52:55 -0000	1.3
@@ -1 +1 @@
-icon-naming-utils-0.8.3.tar.gz
+icon-naming-utils-0.8.6.tar.gz


Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icon-naming-utils.spec	14 Aug 2007 05:09:18 -0000	1.13
+++ icon-naming-utils.spec	18 Sep 2007 03:52:55 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.8.3
+Version:        0.8.6
 Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -53,6 +53,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.6-1
+- Update to 0.8.6
+
 * Tue Aug 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.3-1
 - Update to 0.8.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Aug 2007 05:02:15 -0000	1.9
+++ sources	18 Sep 2007 03:52:55 -0000	1.10
@@ -1 +1 @@
-7469293f4fa690f1f9f92a0d0bc00cdb  icon-naming-utils-0.8.3.tar.gz
+22bd13295d42ff886f6ea355d00e036b  icon-naming-utils-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 03:56:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 17 Sep 2007 23:56:46 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.48,
	1.49 gnome-icon-theme.spec, 1.74, 1.75 sources, 1.51, 1.52
Message-ID: <200709180356.l8I3ukiO001754@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1645

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	4 Sep 2007 03:43:08 -0000	1.48
+++ .cvsignore	18 Sep 2007 03:56:13 -0000	1.49
@@ -1 +1 @@
-gnome-icon-theme-2.19.91.tar.bz2
+gnome-icon-theme-2.20.0.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-icon-theme.spec	4 Sep 2007 03:43:08 -0000	1.74
+++ gnome-icon-theme.spec	18 Sep 2007 03:56:13 -0000	1.75
@@ -1,8 +1,8 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.19.91
+Version: 2.20.0
 Release: 1%{?dist}
-Source0: http://download.gnome.org/sources/gnome-icon-theme/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-icon-theme/2.20/%{name}-%{version}.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	4 Sep 2007 03:43:08 -0000	1.51
+++ sources	18 Sep 2007 03:56:13 -0000	1.52
@@ -1 +1 @@
-8885d86e508185f1fd807e99f0d1f4fe  gnome-icon-theme-2.19.91.tar.bz2
+56857a6d5f26c236b48fcf6760549d1b  gnome-icon-theme-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:02:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:02:33 -0400
Subject: rpms/pango/devel .cvsignore, 1.63, 1.64 pango.spec, 1.124,
	1.125 sources, 1.63, 1.64
Message-ID: <200709180402.l8I42Xxk008825@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/pango/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	4 Sep 2007 04:16:52 -0000	1.63
+++ .cvsignore	18 Sep 2007 04:02:00 -0000	1.64
@@ -1 +1 @@
-pango-1.18.1.tar.bz2
+pango-1.18.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- pango.spec	4 Sep 2007 04:16:52 -0000	1.124
+++ pango.spec	18 Sep 2007 04:02:00 -0000	1.125
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.18.1
+Version: 1.18.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.2-1
+- Update to 1.18.2
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
 - Update to 1.18.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	4 Sep 2007 04:16:52 -0000	1.63
+++ sources	18 Sep 2007 04:02:00 -0000	1.64
@@ -1 +1 @@
-282dcff56292359f6a5c75be0b4fe3df  pango-1.18.1.tar.bz2
+81efeac639977ed3f56c82f16ee0be74  pango-1.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:07:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:07:52 -0400
Subject: rpms/bug-buddy/devel .cvsignore, 1.36, 1.37 bug-buddy.spec, 1.82,
	1.83 sources, 1.36, 1.37
Message-ID: <200709180407.l8I47qjh009954@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9838

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	4 Sep 2007 18:08:03 -0000	1.36
+++ .cvsignore	18 Sep 2007 04:07:17 -0000	1.37
@@ -1 +1 @@
-bug-buddy-2.19.91.svn20070904.tar.bz2
+bug-buddy-2.20.0.tar.bz2


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- bug-buddy.spec	4 Sep 2007 19:01:33 -0000	1.82
+++ bug-buddy.spec	18 Sep 2007 04:07:17 -0000	1.83
@@ -4,17 +4,15 @@
 %define gnome_doc_utils_version 0.2.0
 %define gconf_version 2.14
 
-%define alphatag svn20070904
-
 Name: bug-buddy
-Version: 2.19.91
-Release: 1%{?dist}.%{alphatag}
+Version: 2.20.0
+Release: 1%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
 License: GPLv2 and BSD
 Group: Applications/System
 URL: http://www.gnome.org
-Source: http://download.gnome.org/sources/bug-buddy/2.19/%{name}-%{version}.%{alphatag}.tar.bz2
+Source: http://download.gnome.org/sources/bug-buddy/2.20/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,7 +58,7 @@
 supports the GNOME, KDE, Debian, and Ximian bug tracking systems.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q 
 
 %build
 %configure --disable-scrollkeeper
@@ -135,6 +133,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.91.fc8.svn20070904-1
 - Update to a post-2.19.91 snapshot 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	4 Sep 2007 18:08:03 -0000	1.36
+++ sources	18 Sep 2007 04:07:17 -0000	1.37
@@ -1 +1 @@
-0f08f484de7870771b4e4fc494a99c4c  bug-buddy-2.19.91.svn20070904.tar.bz2
+bce8b08a14d123ecfeefb3902031d773  bug-buddy-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:10:23 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:10:23 -0400
Subject: rpms/gconf-editor/devel .cvsignore, 1.24, 1.25 gconf-editor.spec,
	1.47, 1.48 sources, 1.24, 1.25
Message-ID: <200709180410.l8I4ANF9010328@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gconf-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Sep 2007 05:57:15 -0000	1.24
+++ .cvsignore	18 Sep 2007 04:09:50 -0000	1.25
@@ -1 +1 @@
-gconf-editor-2.19.92.tar.bz2
+gconf-editor-2.20.0.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gconf-editor.spec	14 Sep 2007 05:57:15 -0000	1.47
+++ gconf-editor.spec	18 Sep 2007 04:09:50 -0000	1.48
@@ -7,10 +7,10 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -104,6 +104,9 @@
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Sep 2007 05:57:15 -0000	1.24
+++ sources	18 Sep 2007 04:09:50 -0000	1.25
@@ -1 +1 @@
-a248ef087ada180d53ce1317b25ed35c  gconf-editor-2.19.92.tar.bz2
+b686677878b5754ffa8d0a2cc1129988  gconf-editor-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:12:24 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:12:24 -0400
Subject: rpms/gnome-keyring-manager/devel .cvsignore, 1.11,
	1.12 gnome-keyring-manager.spec, 1.33, 1.34 sources, 1.11, 1.12
Message-ID: <200709180412.l8I4COEi010414@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	.cvsignore gnome-keyring-manager.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Sep 2007 05:49:10 -0000	1.11
+++ .cvsignore	18 Sep 2007 04:11:51 -0000	1.12
@@ -1 +1 @@
-gnome-keyring-manager-2.19.92.tar.bz2
+gnome-keyring-manager-2.20.0.tar.bz2


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-keyring-manager.spec	14 Sep 2007 05:49:10 -0000	1.33
+++ gnome-keyring-manager.spec	18 Sep 2007 04:11:51 -0000	1.34
@@ -1,11 +1,11 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-keyring-manager/2.18/gnome-keyring-manager-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring-manager/2.20/gnome-keyring-manager-%{version}.tar.bz2
 Patch0: gnome-keyring-manager-2.18.0-categories.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring-manager/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Sep 2007 05:49:10 -0000	1.11
+++ sources	18 Sep 2007 04:11:51 -0000	1.12
@@ -1 +1 @@
-162105ae1e4021eab4c613a4ca7e6bb9  gnome-keyring-manager-2.19.92.tar.bz2
+61d701888f00c02490c0cd551bf3fcb1  gnome-keyring-manager-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:15:26 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 18 Sep 2007 00:15:26 -0400
Subject: rpms/scim/devel scim.spec,1.96,1.97 xinput-scim,1.13,1.14
Message-ID: <200709180415.l8I4FQcX010649@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	scim.spec xinput-scim 
Log Message:
source none.conf in xinput script when skipping scim startup



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- scim.spec	13 Sep 2007 09:58:17 -0000	1.96
+++ scim.spec	18 Sep 2007 04:14:54 -0000	1.97
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -290,6 +290,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
+- source none.conf in xinput script when skipping scim startup
+
 * Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
 - add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
   Sinhala (#236715)


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
+++ xinput-scim	18 Sep 2007 04:14:54 -0000	1.14
@@ -59,5 +59,6 @@
   fi
 
 else
-  echo No SCIM IMEs found: SCIM startup was skipped.
+  echo "No SCIM IMEs found: SCIM startup was skipped."
+  . /etc/X11/xinit/xinput.d/none.conf
 fi



From fedora-extras-commits at redhat.com  Tue Sep 18 04:16:41 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:16:41 -0400
Subject: rpms/vte/devel .cvsignore, 1.61, 1.62 sources, 1.61, 1.62 vte.spec, 
	1.119, 1.120
Message-ID: <200709180416.l8I4GfUe010835@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/vte/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10664

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.16.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	30 Jul 2007 22:24:37 -0000	1.61
+++ .cvsignore	18 Sep 2007 04:16:08 -0000	1.62
@@ -1 +1 @@
-vte-0.16.8.tar.bz2
+vte-0.16.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	30 Jul 2007 22:24:37 -0000	1.61
+++ sources	18 Sep 2007 04:16:08 -0000	1.62
@@ -1 +1 @@
-65344de3023c41c8dda2b35a415bf969  vte-0.16.8.tar.bz2
+a42c893a01e3d9818789be373e529422  vte-0.16.9.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/extras/rpms/vte/devel/vte.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vte.spec	23 Aug 2007 17:07:19 -0000	1.119
+++ vte.spec	18 Sep 2007 04:16:08 -0000	1.120
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.16.8
-Release: 3%{?dist}
+Version: 0.16.9
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.16.9-1
+- Update to 0.16.9
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 0.16.8-3
 - Rebuild for PPC toolchain bug
 - Fix %%doc listing



From fedora-extras-commits at redhat.com  Tue Sep 18 04:19:19 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 18 Sep 2007 00:19:19 -0400
Subject: rpms/evolution-webcal/devel .cvsignore, 1.19,
	1.20 evolution-webcal.spec, 1.35, 1.36 sources, 1.19, 1.20
Message-ID: <200709180419.l8I4JJgU010932@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-webcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910

Modified Files:
	.cvsignore evolution-webcal.spec sources 
Log Message:

* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Sep 2007 10:32:13 -0000	1.19
+++ .cvsignore	18 Sep 2007 04:18:46 -0000	1.20
@@ -1 +1 @@
-evolution-webcal-2.11.91.tar.bz2
+evolution-webcal-2.12.0.tar.bz2


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- evolution-webcal.spec	31 Aug 2007 21:31:20 -0000	1.35
+++ evolution-webcal.spec	18 Sep 2007 04:18:46 -0000	1.36
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: evolution-webcal
-Version: 2.11.91
+Version: 2.12.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+
 * Fri Aug 31 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.91-1.fc8
 - Update to 2.11.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Sep 2007 10:32:13 -0000	1.19
+++ sources	18 Sep 2007 04:18:46 -0000	1.20
@@ -1 +1 @@
-c5b38d451808e48bfb6b072893441ac5  evolution-webcal-2.11.91.tar.bz2
+21e77fa081decb87ce641f3a77245864  evolution-webcal-2.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:21:12 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:21:12 -0400
Subject: rpms/gucharmap/devel .cvsignore, 1.5, 1.6 gucharmap.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200709180421.l8I4LCHk011030@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gucharmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10997

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
1.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Mar 2007 05:35:12 -0000	1.5
+++ .cvsignore	18 Sep 2007 04:20:39 -0000	1.6
@@ -1 +1 @@
-gucharmap-1.10.0.tar.bz2
+gucharmap-1.10.1.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gucharmap.spec	7 Aug 2007 20:59:13 -0000	1.11
+++ gucharmap.spec	18 Sep 2007 04:20:39 -0000	1.12
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        1.10.0
+Version:        1.10.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.1-1
+- Update to 1.10.1
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.0-2
 - Update license field
 - Use %%find_lang for help files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Mar 2007 05:35:12 -0000	1.5
+++ sources	18 Sep 2007 04:20:39 -0000	1.6
@@ -1 +1 @@
-a0e01bcff2bc5e35ec88f60a383051d3  gucharmap-1.10.0.tar.bz2
+2b65ae7bef1b11048e77b287a2051020  gucharmap-1.10.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:25:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:25:16 -0400
Subject: rpms/gnome-terminal/devel .cvsignore, 1.36, 1.37 gnome-terminal.spec,
	1.82, 1.83 sources, 1.37, 1.38
Message-ID: <200709180425.l8I4PGUH011198@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11165

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	19 Jun 2007 00:07:41 -0000	1.36
+++ .cvsignore	18 Sep 2007 04:24:43 -0000	1.37
@@ -1 +1 @@
-gnome-terminal-2.18.1.tar.bz2
+gnome-terminal-2.18.2.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-terminal.spec	23 Aug 2007 16:16:44 -0000	1.82
+++ gnome-terminal.spec	18 Sep 2007 04:24:43 -0000	1.83
@@ -9,8 +9,8 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.18.1
-Release: 3%{?dist}
+Version: 2.18.2
+Release: 1%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-terminal/2.18/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
@@ -117,6 +117,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 2.18.1-3
 - Rebuild for PPC toolchain bug
 - Fix build for rarian


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Jun 2007 00:07:41 -0000	1.37
+++ sources	18 Sep 2007 04:24:43 -0000	1.38
@@ -1 +1 @@
-c1902cf4727f4cd976d6cc0beb1c03fe  gnome-terminal-2.18.1.tar.bz2
+a54b010cdeb1e908cad6085bf9de87c4  gnome-terminal-2.18.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:29:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:29:16 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.65, 1.66 gnome-games.spec,
	1.146, 1.147 sources, 1.69, 1.70
Message-ID: <200709180429.l8I4TGoq011300@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11276

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	4 Sep 2007 05:36:14 -0000	1.65
+++ .cvsignore	18 Sep 2007 04:28:43 -0000	1.66
@@ -1 +1 @@
-gnome-games-2.19.92.tar.bz2
+gnome-games-2.20.0.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-games.spec	4 Sep 2007 05:36:14 -0000	1.146
+++ gnome-games.spec	18 Sep 2007 04:28:43 -0000	1.147
@@ -43,12 +43,12 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games/2.19/gnome-games-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games/2.20/gnome-games-%{version}.tar.bz2
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.92-1
 - 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	4 Sep 2007 05:36:14 -0000	1.69
+++ sources	18 Sep 2007 04:28:43 -0000	1.70
@@ -1 +1 @@
-ae47893206f44c97333eb8f6b56716aa  gnome-games-2.19.92.tar.bz2
+a34eda66c6e09dc8f3a0fb720788f9bd  gnome-games-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:32:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:32:19 -0400
Subject: rpms/gnome-games-extra-data/devel .cvsignore, 1.5,
	1.6 gnome-games-extra-data.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709180432.l8I4WJQC011450@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games-extra-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11388

Modified Files:
	.cvsignore gnome-games-extra-data.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Jul 2007 20:58:21 -0000	1.5
+++ .cvsignore	18 Sep 2007 04:31:47 -0000	1.6
@@ -1 +1 @@
-gnome-games-extra-data-2.19.2.tar.bz2
+gnome-games-extra-data-2.20.0.tar.bz2


Index: gnome-games-extra-data.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/gnome-games-extra-data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-games-extra-data.spec	31 Jul 2007 20:58:21 -0000	1.6
+++ gnome-games-extra-data.spec	18 Sep 2007 04:31:47 -0000	1.7
@@ -4,11 +4,11 @@
 
 Summary: GNOME games extra data
 Name: gnome-games-extra-data
-Version: 2.19.2
+Version: 2.20.0
 Release: 1
 License: GPL
 Group: Amusements/Games
-Source: http://download.gnome.org/sources/gnome-games-extra-data/2.19/gnome-games-extra-data-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-games-extra-data/2.20/gnome-games-extra-data-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArch: noarch
@@ -44,7 +44,7 @@
 
 
 %files
-%doc AUTHORS COPYING MAINTAINERS README NEWS ChangeLog
+%doc AUTHORS COPYING MAINTAINERS README NEWS 
 %{_datadir}/pixmaps/glines/*
 %{_datadir}/pixmaps/gnobots2/*
 %{_datadir}/pixmaps/iagno/*
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Jul 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games-extra-data/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Jul 2007 20:58:21 -0000	1.5
+++ sources	18 Sep 2007 04:31:47 -0000	1.6
@@ -1 +1 @@
-55a844b73004cfc07b62a2fc7871a338  gnome-games-extra-data-2.19.2.tar.bz2
+adecbe76d2f45f6471b8bf0f6943f6ca  gnome-games-extra-data-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 04:37:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:37:45 -0400
Subject: rpms/climm/devel climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180437.l8I4bjJd011818@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
Initial import of climm.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:37:13 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:37:13 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:39:46 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:39:46 -0400
Subject: rpms/climm/FC-6 climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180439.l8I4dkpA013091@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
Initial climm for FC-6 branch.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:39:14 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:39:14 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:41:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj))
Date: Tue, 18 Sep 2007 00:41:39 -0400
Subject: rpms/climm/F-7 climm-glibc-open.patch, NONE, 1.1 climm.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180441.l8I4fd5f014226@cvs-int.fedora.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/climm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14157/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	climm-glibc-open.patch climm.spec 
Log Message:
climm for F-7 branch.


climm-glibc-open.patch:

--- NEW FILE climm-glibc-open.patch ---
diff -ur climm-0.6/src/climm.c climm-0.6.open/src/climm.c
--- climm-0.6/src/climm.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/climm.c	2007-09-17 09:49:42.000000000 +0200
@@ -467,7 +467,7 @@
     }
 
     for (i = 0; (conn = ConnectionNr (i)); i++)
-        if (conn->open && conn->flags & CONN_AUTOLOGIN)
+        if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             if (conn->type & TYPEF_ANY_SERVER)
                 conn->status = conn->pref_status;
 
@@ -505,7 +505,7 @@
                     conn->status = arg_ss;
                 if (arg_p)
                     s_repl (&conn->passwd, arg_p);
-                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+                if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
                     QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                      OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                      &CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
     
     if (!uingiven)
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
                 if (conn->type & TYPEF_ANY_SERVER)
                     if (!conn->passwd || !*conn->passwd)
                     {
@@ -554,17 +554,17 @@
     if (!uingiven)
     {
         for (i = 0; (conn = ConnectionNr (i)); i++)
-            if (conn->open && conn->flags & CONN_AUTOLOGIN)
+            if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
             {
                 if (conn->type & TYPEF_ANY_SERVER)
                 {
-                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+                    if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
                          QueueEnqueueDep (conn, QUEUE_CLIMM_COMMAND, 0, loginevent, NULL, conn->cont,
                                           OptSetVals (NULL, CO_CLIMMCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
                                           &CmdUserCallbackTodo);
                 }
                 else
-                    conn->open (conn);
+                    (conn->open) (conn);
             }
     }
     s_done (&arg_C);
diff -ur climm-0.6/src/cmd_user.c climm-0.6.open/src/cmd_user.c
--- climm-0.6/src/cmd_user.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/cmd_user.c	2007-09-17 09:47:12.000000000 +0200
@@ -4008,7 +4008,7 @@
                     rl_printf (i18n (2081, "    at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
 #endif
                     rl_printf (i18n (2454, "    open %p reconn %p close %p err %p dispatch %p\n"),
-                              connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+                              (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
                     free (t1);
                     free (t2);
                     free (t3);
@@ -4052,13 +4052,13 @@
                 s_repl (&connl->passwd, targs);
             if (connl->connect & CONNECT_OK)
                 rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
-            else if (!connl->open)
+            else if (!(connl->open))
                 rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
                     ConnectionType (connl), connl->screen);
             else if (!connl->passwd || !*connl->passwd)
                 rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
             else
-                connl->open (connl);
+                (connl->open) (connl);
             break;
 
         case 3:
diff -ur climm-0.6/src/file_util.c climm-0.6.open/src/file_util.c
--- climm-0.6/src/file_util.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/file_util.c	2007-09-17 09:48:49.000000000 +0200
@@ -66,7 +66,7 @@
     if (servertype == TYPE_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitServer;
+        (conn->open) = &ConnectionInitServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
         const char *serverpart = strchr (user, '@') + 1;
     
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitXMPPServer;
+        (conn->open) = &ConnectionInitXMPPServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
     else if (servertype == TYPE_MSN_SERVER)
     {
         conn = ConnectionC (servertype);
-        conn->open = &ConnectionInitMSNServer;
+        (conn->open) = &ConnectionInitMSNServer;
         
         conn->flags |= CONN_AUTOLOGIN;
         conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -1231,35 +1231,35 @@
         switch (conn->type)
         {
             case TYPE_SERVER:
-                conn->open = &ConnectionInitServer;
+                (conn->open) = &ConnectionInitServer;
                 break;
             case TYPE_SERVER_OLD:
-                conn->open = &ConnectionInitServerV5;
+                (conn->open) = &ConnectionInitServerV5;
                 break;
 #ifdef ENABLE_MSN
             case TYPE_MSN_SERVER:
-                conn->open = &ConnectionInitMSNServer;
+                (conn->open) = &ConnectionInitMSNServer;
                 break;
 #endif
 #ifdef ENABLE_XMPP
             case TYPE_XMPP_SERVER:
-                conn->open = &ConnectionInitXMPPServer;
+                (conn->open) = &ConnectionInitXMPPServer;
                 break;
 #endif
 #ifdef ENABLE_PEER2PEER
             case TYPE_MSGLISTEN:
-                conn->open = &ConnectionInitPeer;
+                (conn->open) = &ConnectionInitPeer;
                 break;
 #endif
 #ifdef ENABLE_REMOTECONTROL
             case TYPE_REMOTE:
-                conn->open = &RemoteOpen;
+                (conn->open) = &RemoteOpen;
                 connr = conn;
                 break;
 #endif
             default:
                 conn->type = 0;
-                conn->open = NULL;
+                (conn->open) = NULL;
                 break;
         }
         if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
     if (!connr)
     {
         connr = ConnectionC (TYPE_REMOTE);
-        connr->open = &RemoteOpen;
+        (connr->open) = &RemoteOpen;
         connr->pref_server = strdup ("scripting");
         connr->parent = NULL;
         connr->server = strdup (connr->pref_server);
diff -ur climm-0.6/src/msn_base.cpp climm-0.6.open/src/msn_base.cpp
--- climm-0.6/src/msn_base.cpp	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/msn_base.cpp	2007-09-17 09:50:03.000000000 +0200
@@ -101,7 +101,7 @@
     
     cb->serv = serv;
     MyCallbackSetClimm (serv, cb);
-    serv->open = &ConnectionInitMSNServer;
+    (serv->open) = &ConnectionInitMSNServer;
     serv->reconnect = &MsnCallbackReconn;
     serv->error = &MsnCallbackError;
     serv->close = &MsnCallbackClose;
diff -ur climm-0.6/src/oscar_register.c climm-0.6.open/src/oscar_register.c
--- climm-0.6/src/oscar_register.c	2007-09-10 22:14:16.000000000 +0200
+++ climm-0.6.open/src/oscar_register.c	2007-09-17 09:51:01.000000000 +0200
@@ -154,10 +154,10 @@
     serv->flags |= CONN_CONFIGURED;
     if (serv->flags & CONN_WIZARD)
     {
-        assert (serv->open);
+        assert ((serv->open));
 #ifdef ENABLE_PEER2PEER
         assert (serv->assoc);
-        assert (serv->assoc->open);
+        assert ((serv->assoc->open));
         serv->assoc->flags |= CONN_AUTOLOGIN;
 #endif
         serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
         if (Save_RC () == -1)
             rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
 #ifdef ENABLE_PEER2PEER
-        serv->assoc->open (serv->assoc);
+        (serv->assoc->open) (serv->assoc);
 #endif
-        serv->open (serv);
+        (serv->open) (serv);
     }
     else
         rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));


--- NEW FILE climm.spec ---
Summary:        Text/line based ICQ client with many features
Name:           climm
Version:        0.6
Release:        2%{?dist}
Source:         http://www.climm.org/source/%{name}-%{version}.tgz
Patch1:         climm-glibc-open.patch
URL:            http://www.climm.org/
Group:          Applications/Internet
License:        GPLv2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

Provides:      micq = %{version}-%{release}
Obsoletes:     micq < 0.6-1
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca

%description
climm is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it
a very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It now also supports the OTR encrypted messages.

It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.

A lot of other ICQ clients are based in spirit on climm, nevertheless
climm is still _the_ console based ICQ client.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1

%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
  iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
  mv -f $i.tmp $i
done

%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,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-climm-event-script
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*


%changelog
* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-2
- updated description before gloox will be a part of Fedora

* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6-1
- package renamed to climm
- glibc-open patch updated for new name
- added obsolete for micq

* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps

* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries

* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups

* Wed Apr 18 2007 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3

* Mon Nov 06 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2

* Sun Jan 16 2006 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1

* Sun Jun 05 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4

* Sun Apr 27 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3

* Sun Apr 24 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2

* Sun Feb 17 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1

* Fri Feb 12 2005 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5

* Sun Dec  5 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9

* Sat Jan 17 2004 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11

* Mon Oct  6 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5

* Mon Sep 22 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS

* Mon May 13 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3

* Tue Feb 27 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2

* Tue Jan 24 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1

* Tue Jan 07 2003 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10

* Tue Oct 03 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4

* Tue Aug 26 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3

* Tue Aug 08 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release

* Tue Jun 11 2002 R??diger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/climm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:42:17 -0000	1.1
+++ .cvsignore	18 Sep 2007 04:41:07 -0000	1.2
@@ -0,0 +1 @@
+climm-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/climm/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:42:17 -0000	1.1
+++ sources	18 Sep 2007 04:41:07 -0000	1.2
@@ -0,0 +1 @@
+290a2724182a46170737f1fe46e9b4a3  climm-0.6.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 04:55:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 00:55:06 -0400
Subject: rpms/gnome-nettool/devel .cvsignore, 1.11, 1.12 gnome-nettool.spec, 
	1.26, 1.27 sources, 1.12, 1.13
Message-ID: <200709180455.l8I4t6st016612@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-nettool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16590

Modified Files:
	.cvsignore gnome-nettool.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Aug 2007 03:58:49 -0000	1.11
+++ .cvsignore	18 Sep 2007 04:54:31 -0000	1.12
@@ -1 +1 @@
-gnome-nettool-2.19.90.tar.bz2
+gnome-nettool-2.20.0.tar.bz2


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-nettool.spec	24 Aug 2007 14:52:29 -0000	1.26
+++ gnome-nettool.spec	18 Sep 2007 04:54:31 -0000	1.27
@@ -5,10 +5,10 @@
 
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
-Version: 2.19.90
-Release: 2%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-nettool/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-nettool/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -88,6 +88,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 2.19.90-2
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-nettool/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Aug 2007 04:11:03 -0000	1.12
+++ sources	18 Sep 2007 04:54:31 -0000	1.13
@@ -1 +1 @@
-5f3a1c3f2ad639494dc4c98cfa1f1b1c  gnome-nettool-2.19.90.tar.bz2
+8f16e4207655ccf1e7af679fc0f58bbd  gnome-nettool-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:06:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:06:26 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.55,1.56
Message-ID: <200709180506.l8I56QRd022873@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22846

Modified Files:
	gnome-keyring.spec 
Log Message:
fix version



Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-keyring.spec	17 Sep 2007 18:39:17 -0000	1.55
+++ gnome-keyring.spec	18 Sep 2007 05:05:52 -0000	1.56
@@ -2,7 +2,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.20.0
+Version: 2.20
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -102,8 +102,8 @@
 
 
 %changelog
-* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
-- Update to 2.20.0
+* Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20-1
+- Update to 2.20
 
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91



From fedora-extras-commits at redhat.com  Tue Sep 18 05:07:57 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:07:57 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.67,1.68
Message-ID: <200709180507.l8I57v3T022956@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927

Modified Files:
	gnome-menus.spec 
Log Message:
remove debug stuff



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-menus.spec	17 Sep 2007 19:14:51 -0000	1.67
+++ gnome-menus.spec	18 Sep 2007 05:07:23 -0000	1.68
@@ -11,7 +11,6 @@
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-menus/2.20/%{name}-%{version}.tar.bz2
-Patch0: debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: gamin-devel
@@ -44,7 +43,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .debug
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Tue Sep 18 05:09:28 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:09:28 -0400
Subject: rpms/gdm/devel .cvsignore, 1.55, 1.56 gdm.spec, 1.286, 1.287 sources,
	1.58, 1.59
Message-ID: <200709180509.l8I59Se2023052@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22964

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Sep 2007 14:26:58 -0000	1.55
+++ .cvsignore	18 Sep 2007 05:08:54 -0000	1.56
@@ -1 +1 @@
-gdm-2.19.8.tar.bz2
+gdm-2.20.0.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- gdm.spec	12 Sep 2007 17:16:53 -0000	1.286
+++ gdm.spec	18 Sep 2007 05:08:54 -0000	1.287
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.19.8
-Release: 4%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
-Source: http://download.gnome.org/sources/gdm/2.19/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.20/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdmsetup-pam
@@ -351,6 +351,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
 * Wed Sep 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.8-4
 - Change default password character back to circle instead of
   asterisk (bug 287951)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	7 Sep 2007 14:26:58 -0000	1.58
+++ sources	18 Sep 2007 05:08:54 -0000	1.59
@@ -1,2 +1 @@
-65eb454eef0b9fc9d4abf9de3d2c9b45  gdm-2.19.8.tar.bz2
-7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2
+cf374113a1f837b0df916572625b5078  gdm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:14:59 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:14:59 -0400
Subject: rpms/gdm/devel sources,1.59,1.60
Message-ID: <200709180514.l8I5ExbY023258@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23201

Modified Files:
	sources 
Log Message:
re-add faces to sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	18 Sep 2007 05:08:54 -0000	1.59
+++ sources	18 Sep 2007 05:14:26 -0000	1.60
@@ -1 +1,2 @@
 cf374113a1f837b0df916572625b5078  gdm-2.20.0.tar.bz2
+7387935ad09f746889b58bd69bf815e1  fedora-faces-20070319.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 05:24:13 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:24:13 -0400
Subject: rpms/eog/devel eog.spec,1.97,1.98
Message-ID: <200709180524.l8I5ODbA023470@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435

Modified Files:
	eog.spec 
Log Message:
drop the svgz patch for now



Index: eog.spec
===================================================================
RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- eog.spec	18 Sep 2007 03:07:30 -0000	1.97
+++ eog.spec	18 Sep 2007 05:23:39 -0000	1.98
@@ -17,7 +17,8 @@
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.20/%{name}-%{version}.tar.bz2
-Patch0: eog-2.19.4-svgz.patch
+# needs to be redone
+#Patch0: eog-2.19.4-svgz.patch
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -70,8 +71,7 @@
 
 %prep
 %setup -q
-
-%patch0 -p1 -b .svgz
+#%patch0 -p1 -b .svgz
 
 echo "NoDisplay=true" >> data/eog.desktop.in
 # just in case



From fedora-extras-commits at redhat.com  Tue Sep 18 05:52:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 01:52:17 -0400
Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.75,1.76
Message-ID: <200709180552.l8I5qH6f024170@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24103

Modified Files:
	gnome-icon-theme.spec 
Log Message:
Rebuild



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gnome-icon-theme.spec	18 Sep 2007 03:56:13 -0000	1.75
+++ gnome-icon-theme.spec	18 Sep 2007 05:51:44 -0000	1.76
@@ -1,13 +1,13 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.20/%{name}-%{version}.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: icon-naming-utils >= 0.8.1
+BuildRequires: icon-naming-utils >= 0.8.6
 BuildRequires: perl(XML::Parser)
 BuildRequires: pkgconfig
 BuildRequires: gettext
@@ -84,6 +84,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Rebuild with newer icon-naming-utils
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 07:49:34 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:49:34 -0400
Subject: rpms/httpd/devel httpd-2.2.6-ssllibver.patch, 1.1, 1.2 httpd.spec, 
	1.116, 1.117
Message-ID: <200709180749.l8I7nYM3013710@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671

Modified Files:
	httpd-2.2.6-ssllibver.patch httpd.spec 
Log Message:
- fixes for previous commit


httpd-2.2.6-ssllibver.patch:

Index: httpd-2.2.6-ssllibver.patch
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd-2.2.6-ssllibver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.6-ssllibver.patch	17 Sep 2007 19:02:35 -0000	1.1
+++ httpd-2.2.6-ssllibver.patch	18 Sep 2007 07:48:57 -0000	1.2
@@ -1,14 +1,3 @@
---- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
-+++ httpd-2.2.6/modules/ssl/ssl_private.h
-@@ -648,7 +648,7 @@ void         ssl_die(void);
- void         ssl_log_ssl_error(const char *, int, int, server_rec *);
- 
- /**  Variables  */
--void         ssl_var_register(void);
-+void         ssl_var_register(apr_pool_t *p);
- char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
- const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
- 
 --- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/mod_ssl.c
 @@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
@@ -22,7 +11,7 @@
      APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 --- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
 +++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
-@@ -58,12 +58,30 @@ static int ssl_is_https(conn_rec *c)
+@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
      return sslconn && sslconn->ssl;
  }
  
@@ -33,6 +22,8 @@
 +
 +void ssl_var_register(apr_pool_t *p)
  {
++    char *cp, *cp2;
++
      APR_REGISTER_OPTIONAL_FN(ssl_is_https);
      APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
      APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
@@ -55,7 +46,7 @@
  }
  
  /* This function must remain safe to use for a non-SSL connection. */
-@@ -635,34 +653,14 @@ static void ssl_var_lookup_ssl_cipher_bi
+@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
  
  static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
  {
@@ -81,15 +72,33 @@
 -
      if (strEQ(var, "INTERFACE")) {
 -        result = apr_pstrdup(p, interface);
-+        result = apr_pstrdup(p, var_interface);
++        return apr_pstrdup(p, var_interface);
      }
      else if (strEQ(var, "LIBRARY_INTERFACE")) {
 -        result = apr_pstrdup(p, library_interface);
-+        result = apr_pstrdup(p, var_library_interface);
++        return apr_pstrdup(p, var_library_interface);
      }
      else if (strEQ(var, "LIBRARY")) {
 -        result = apr_pstrdup(p, library);
-+        result = apr_pstrdup(p, var_library);
+-    }
+-    else {
+-        result = NULL;
++        return apr_pstrdup(p, var_library);
      }
-     else {
-         result = NULL;
+-    return result;
++
++    return NULL;
+ }
+   
+ 
+--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
++++ httpd-2.2.6/modules/ssl/ssl_private.h
+@@ -648,7 +648,7 @@ void         ssl_die(void);
+ void         ssl_log_ssl_error(const char *, int, int, server_rec *);
+ 
+ /**  Variables  */
+-void         ssl_var_register(void);
++void         ssl_var_register(apr_pool_t *p);
+ char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
+ const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
+ 


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- httpd.spec	17 Sep 2007 19:02:35 -0000	1.116
+++ httpd.spec	18 Sep 2007 07:48:57 -0000	1.117
@@ -232,7 +232,7 @@
 done
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
-install -m -p 644 $RPM_SOURCE_DIR/httpd.conf \
+install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -258,7 +258,8 @@
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
-install -m 644 noindex.html $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
+install -m 644 -p $RPM_SOURCE_DIR/index.html \
+        $RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 
 # remove manual sources
 find $RPM_BUILD_ROOT%{contentdir}/manual \( \



From fedora-extras-commits at redhat.com  Tue Sep 18 08:02:16 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 18 Sep 2007 04:02:16 -0400
Subject: rpms/ladspa-amb-plugins/devel ladspa-amb-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180802.l8I82G8m020108@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-amb-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19950/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-amb-plugins.spec 
Log Message:
initial ladspa-amb-plugins import



--- NEW FILE ladspa-amb-plugins.spec ---
Name:           ladspa-amb-plugins
Version:        0.3.0
Release:        1%{?dist}
Summary:        Ambisonics LADSPA plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/AMB-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      amb-plugins <= 0.0.2
Provides:       amb-plugins = %{version}-%{release}

%description
A set of first order Ambisonics plugins to use with Ardour. Included
are: mono and stereo input panner, horizontal rotation, and square and
hexagon horizontal decoders. See the README for more.


%prep
%setup -q -n AMB-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# use the system version of ladspa.h
%{__rm} ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="-I. -fPIC -D_REENTRANT $RPM_OPT_FLAGS"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-amb-plugins
- updated to 0.1.0

* Sat May 13 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- update to 0.0.2

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:48:47 -0000	1.1
+++ .cvsignore	18 Sep 2007 08:01:43 -0000	1.2
@@ -0,0 +1 @@
+AMB-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:48:47 -0000	1.1
+++ sources	18 Sep 2007 08:01:43 -0000	1.2
@@ -0,0 +1 @@
+39a38b23a5f3a3e3009da37976660081  AMB-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:07:32 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Tue, 18 Sep 2007 04:07:32 -0400
Subject: rpms/bc/devel bc.spec,1.31,1.32
Message-ID: <200709180807.l8I87WGa020636@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20456

Modified Files:
	bc.spec 
Log Message:
update of source URI



Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bc.spec	22 Aug 2007 06:50:27 -0000	1.31
+++ bc.spec	18 Sep 2007 08:06:56 -0000	1.32
@@ -1,11 +1,11 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator)
 Name: bc
 Version: 1.06
-Release: 28
+Release: 29
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
-Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
 Patch1: bc-1.06-readline42.patch
 Patch2: bc-1.06-s390.patch
 Patch3: bc-1.06-info_exp_bessel.patch
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Sep 18 2007 Zdenek Prikryl <zprikryl at redhat.com> 1.06-29
+- update of source URI
+
 * Wed Aug 22 2007 Zdenek Prikryl <zprikryl at redhat.com> 1.06-28
 - fixed incorrect processing of decimal separator
 - Resolves: #253729



From fedora-extras-commits at redhat.com  Tue Sep 18 08:07:48 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 18 Sep 2007 04:07:48 -0400
Subject: rpms/gd/devel gd-2.0.35-AALineThick.patch, NONE,
	1.1 gd-2.0.35-overflow.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gd.spec, 1.44, 1.45 sources, 1.11,
	1.12 gd-2.0.33-AALineThick.patch, 1.1,
	NONE gd-2.0.33-overflow.patch, 1.1, NONE
Message-ID: <200709180807.l8I87m2o020644@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20582

Modified Files:
	.cvsignore gd.spec sources 
Added Files:
	gd-2.0.35-AALineThick.patch gd-2.0.35-overflow.patch 
Removed Files:
	gd-2.0.33-AALineThick.patch gd-2.0.33-overflow.patch 
Log Message:
- update to 2.0.35


gd-2.0.35-AALineThick.patch:

--- NEW FILE gd-2.0.35-AALineThick.patch ---
--- gd-2.0.35/gd.c.pom	2007-06-19 22:25:51.000000000 +0200
+++ gd-2.0.35/gd.c	2007-09-05 11:25:16.000000000 +0200
@@ -3474,6 +3474,8 @@ static void gdImageAALine (gdImagePtr im
 	/* keep them as 32bits */
 	long x, y, inc;
 	long dx, dy,tmp;
+	int w, wid, wstart; 
+	int thick = im->thick; 
 
 	if (!im->trueColor) {
 		/* TBB: don't crash when the image is of the wrong type */
@@ -3502,6 +3504,25 @@ static void gdImageAALine (gdImagePtr im
 		gdImageSetAAPixelColor(im, x1, y1, col, 0xFF);
 		return;
 	}
+	else { 
+	    double ag; 
+	    if (dy < dx)  
+		ag  = cos (atan2 (dy, dx)); 
+	    else  
+		ag = sin (atan2 (dy, dx)); 
+	    if (ag != 0)
+	    {
+		wid = thick / ag; 
+	    }
+	    else
+	    {
+		wid = 1;
+	    } 
+	    if (wid == 0)
+	    {
+		wid = 1;
+	    } 
+	} 
 	if (abs(dx) > abs(dy)) {
 		if (dx < 0) {
 			tmp = x1;
@@ -3518,8 +3539,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dy * 65536) / dx;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((x >> 16) <= x2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (y >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, x >> 16, (y >> 16) + 1,col, (~y >> 8) & 0xFF);
+			wstart = (y >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) {    
+			    gdImageSetAAPixelColor(im, (x >> 16) , w , col , (y >> 8) & 0xFF); 
+			    gdImageSetAAPixelColor(im, (x >> 16) , w + 1 , col, (~y >> 8) & 0xFF); 
+			} 
 			x += (1 << 16);
 			y += inc;
 		}
@@ -3539,8 +3563,11 @@ static void gdImageAALine (gdImagePtr im
 		inc = (dx * 65536) / dy;
 		/* TBB: set the last pixel for consistency (<=) */
 		while ((y>>16) <= y2) {
-			gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (x >> 8) & 0xFF);
-			gdImageSetAAPixelColor(im, (x >> 16) + 1, (y >> 16),col, (~x >> 8) & 0xFF);
+			wstart = (x >> 16) - wid / 2;
+			for (w = wstart; w < wstart + wid; w++) { 
+			    gdImageSetAAPixelColor(im, w , y >> 16  , col, (x >> 8) & 0xFF);                    
+			    gdImageSetAAPixelColor(im, w + 1, y >> 16, col, (~x >> 8) & 0xFF);   
+			}
 			x += inc;
 			y += (1<<16);
 		}

gd-2.0.35-overflow.patch:

--- NEW FILE gd-2.0.35-overflow.patch ---
--- gd-2.0.35/gd_gd.c.pom	2006-04-05 17:52:22.000000000 +0200
+++ gd-2.0.35/gd_gd.c	2007-09-05 11:31:39.000000000 +0200
@@ -149,6 +149,10 @@ _gdCreateFromFile (gdIOCtx * in, int *sx
     {
       im = gdImageCreate (*sx, *sy);
     }
+  if (!im) 
+    { 
+      goto fail1; 
+    } 
   if (!_gdGetColors (in, im, gd2xFlag))
     {
       goto fail2;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2007 13:09:04 -0000	1.12
+++ .cvsignore	18 Sep 2007 08:07:15 -0000	1.13
@@ -1 +1 @@
-gd-2.0.34.tar.bz2
+gd-2.0.35.tar.bz2


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gd.spec	4 Sep 2007 14:08:31 -0000	1.44
+++ gd.spec	18 Sep 2007 08:07:15 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.0.34
-Release:       3%{?dist}
+Version:       2.0.35
+Release:       1%{?dist}
 Group:         System Environment/Libraries
 License:       MIT and GPL
 URL:           http://www.libgd.org/Main_Page
@@ -10,8 +10,8 @@
 Patch3:        gd-2.0.34-multilib.patch
 Patch4:        gd-loop.patch
 Patch5:        gd-2.0.34-sparc64.patch
-Patch6:        gd-2.0.33-overflow.patch
-Patch7:        gd-2.0.33-AALineThick.patch
+Patch6:        gd-2.0.35-overflow.patch
+Patch7:        gd-2.0.35-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
 Patch9:	       gd-2.0.34-fonts.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Ivana Varekova <varekova at redhat.com> 2.0.35-1
+- update to 2.0.35
+
 * Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-3
 - fix font paths (#225786#5)
 - fix pkgconfig Libs flag (#225786#4)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2007 13:09:04 -0000	1.11
+++ sources	18 Sep 2007 08:07:15 -0000	1.12
@@ -1 +1 @@
-8c25c322f12030b1c24488efd577fec0  gd-2.0.34.tar.bz2
+6c6c3dbb7bf079e0bb5fbbfd3bb8a71c  gd-2.0.35.tar.bz2


--- gd-2.0.33-AALineThick.patch DELETED ---


--- gd-2.0.33-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 08:12:22 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Tue, 18 Sep 2007 04:12:22 -0400
Subject: rpms/bc/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709180812.l8I8CMlj020855@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799

Modified Files:
	.cvsignore sources 
Log Message:
update of source URI



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 03:26:56 -0000	1.4
+++ .cvsignore	18 Sep 2007 08:11:50 -0000	1.5
@@ -1 +1 @@
-bc-1.06.tar.bz2
+bc-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 03:26:56 -0000	1.4
+++ sources	18 Sep 2007 08:11:50 -0000	1.5
@@ -1 +1 @@
-8cf9bd2fb29340a34582f15a6c8b13b3  bc-1.06.tar.bz2
+d44b5dddebd8a7a7309aea6c36fda117  bc-1.06.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 08:12:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 18 Sep 2007 04:12:31 -0400
Subject: rpms/ladspa-amb-plugins/F-7 ladspa-amb-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709180812.l8I8CVA2020861@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-amb-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20829

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-amb-plugins.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-amb-plugins.spec ---
Name:           ladspa-amb-plugins
Version:        0.3.0
Release:        1%{?dist}
Summary:        Ambisonics LADSPA plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/AMB-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      amb-plugins <= 0.0.2
Provides:       amb-plugins = %{version}-%{release}

%description
A set of first order Ambisonics plugins to use with Ardour. Included
are: mono and stereo input panner, horizontal rotation, and square and
hexagon horizontal decoders. See the README for more.


%prep
%setup -q -n AMB-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# use the system version of ladspa.h
%{__rm} ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="-I. -fPIC -D_REENTRANT $RPM_OPT_FLAGS"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-1
- Various specfile improvements to match the Fedora Packaging Guidelines
- Update to latest upstream release 0.3.0
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-amb-plugins
- updated to 0.1.0

* Sat May 13 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- update to 0.0.2

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Sep 2007 20:48:47 -0000	1.1
+++ .cvsignore	18 Sep 2007 08:11:58 -0000	1.2
@@ -0,0 +1 @@
+AMB-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-amb-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2007 20:48:47 -0000	1.1
+++ sources	18 Sep 2007 08:11:58 -0000	1.2
@@ -0,0 +1 @@
+39a38b23a5f3a3e3009da37976660081  AMB-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:18:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:18:38 -0400
Subject: rpms/hexedit/devel .cvsignore, 1.6, 1.7 hexedit.spec, 1.23,
	1.24 sources, 1.6, 1.7
Message-ID: <200709180818.l8I8IccW021070@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/hexedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21020

Modified Files:
	.cvsignore hexedit.spec sources 
Log Message:
changed source tarbal to new upstream version with some minor fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2005 09:31:34 -0000	1.6
+++ .cvsignore	18 Sep 2007 08:18:06 -0000	1.7
@@ -1,2 +1 @@
-hexedit-1.2.10.src.tgz
 hexedit-1.2.12.src.tgz


Index: hexedit.spec
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hexedit.spec	6 Apr 2007 14:40:24 -0000	1.23
+++ hexedit.spec	18 Sep 2007 08:18:06 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A hexadecimal file viewer and editor
 Name: hexedit
 Version: 1.2.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://merd.sourceforge.net/pixel/hexedit.html
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovc at redhat.com> 1.2.12-6
+- changed to new upstream source tarbal with some minor fixes
+
 * Fri Apr 06 2007 Jindrich Novy <jnovy at redhat.com> 1.2.12-5
 - spec fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hexedit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2005 09:31:34 -0000	1.6
+++ sources	18 Sep 2007 08:18:06 -0000	1.7
@@ -1 +1 @@
-dd31ed490baed49ae50e13e0984c8848  hexedit-1.2.12.src.tgz
+0d2f48610006278cd93359fea9a06d5c  hexedit-1.2.12.src.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 08:19:17 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 18 Sep 2007 04:19:17 -0400
Subject: rpms/slang/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <200709180819.l8I8JHNA021090@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21063

Modified Files:
	.cvsignore sources 
Log Message:
- update to 2.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Jul 2007 14:04:45 -0000	1.11
+++ .cvsignore	18 Sep 2007 08:18:38 -0000	1.12
@@ -1 +1 @@
-slang-2.1.1.tar.bz2
+slang-2.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Jul 2007 14:04:45 -0000	1.11
+++ sources	18 Sep 2007 08:18:38 -0000	1.12
@@ -1 +1 @@
-4465440c158a32aaebed6ef07e7408ac  slang-2.1.1.tar.bz2
+99534ae667ed1a50c863ce9a08912ccc  slang-2.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 08:33:15 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 04:33:15 -0400
Subject: rpms/cups/devel cups-str2512.patch,NONE,1.1 cups.spec,1.356,1.357
Message-ID: <200709180833.l8I8XFiX021576@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553

Modified Files:
	cups.spec 
Added Files:
	cups-str2512.patch 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
- Avoid write printcap unnecessarily (bug #290831).


cups-str2512.patch:

--- NEW FILE cups-str2512.patch ---
diff -up cups-1.3.1/scheduler/dirsvc.c.str2512 cups-1.3.1/scheduler/dirsvc.c
--- cups-1.3.1/scheduler/dirsvc.c.str2512	2007-09-08 01:28:06.000000000 +0100
+++ cups-1.3.1/scheduler/dirsvc.c	2007-09-18 09:31:23.000000000 +0100
@@ -91,7 +91,7 @@ static void	process_browse_data(const ch
 				    ipp_pstate_t state, const char *location,
 				    const char *info, const char *make_model,
 				    int num_attrs, cups_option_t *attrs);
-static void	process_implicit_classes(void);
+static void	process_implicit_classes(int *write_printcap);
 static void	send_cups_browse(cupsd_printer_t *p);
 #ifdef HAVE_LDAP
 static void	send_ldap_browse(cupsd_printer_t *p);
@@ -609,7 +609,7 @@ cupsdLoadRemoteCache(void)
   * Do auto-classing if needed...
   */
 
-  process_implicit_classes();
+  process_implicit_classes(NULL);
 }
 
 
@@ -1685,7 +1685,8 @@ process_browse_data(
     cups_option_t *attrs)		/* I - Attributes */
 {
   int		i;			/* Looping var */
-  int		update;			/* Update printer attributes? */
+  int		update,			/* Update printer attributes? */
+		write_printcap;		/* Write the printcap file? */
   char		finaluri[HTTP_MAX_URI],	/* Final URI for printer */
 		name[IPP_MAX_NAME],	/* Name of printer */
 		newname[IPP_MAX_NAME],	/* New name of printer */
@@ -1772,11 +1773,12 @@ process_browse_data(
   * See if we already have it listed in the Printers list, and add it if not...
   */
 
-  type   |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
-  type   &= ~CUPS_PRINTER_IMPLICIT;
-  update = 0;
-  hptr   = strchr(host, '.');
-  sptr   = strchr(ServerName, '.');
+  type           |= CUPS_PRINTER_REMOTE | CUPS_PRINTER_DISCOVERED;
+  type           &= ~CUPS_PRINTER_IMPLICIT;
+  update         = 0;
+  write_printcap = 0;
+  hptr           = strchr(host, '.');
+  sptr           = strchr(ServerName, '.');
 
   if (!ServerNameIsIP && sptr != NULL && hptr != NULL)
   {
@@ -1899,7 +1901,8 @@ process_browse_data(
       cupsdSetString(&p->device_uri, uri);
       cupsdSetString(&p->hostname, host);
 
-      update = 1;
+      update         = 1;
+      write_printcap = 1;
     }
   }
   else
@@ -2005,7 +2008,8 @@ process_browse_data(
       cupsdSetString(&p->uri, uri);
       cupsdSetString(&p->device_uri, uri);
 
-      update = 1;
+      write_printcap = 1;
+      update         = 1;
     }
   }
 
@@ -2064,7 +2068,8 @@ process_browse_data(
   if (info && (!p->info || strcmp(p->info, info)))
   {
     cupsdSetString(&p->info, info);
-    update = 1;
+    update         = 1;
+    write_printcap = 1;
   }
 
   if (!make_model || !make_model[0])
@@ -2153,6 +2158,7 @@ process_browse_data(
       if (p->type & CUPS_PRINTER_DEFAULT)
       {
         DefaultPrinter = p;
+	write_printcap = 1;
 	break;
       }
   }
@@ -2161,13 +2167,14 @@ process_browse_data(
   * Do auto-classing if needed...
   */
 
-  process_implicit_classes();
+  process_implicit_classes(&write_printcap);
 
  /*
   * Update the printcap file...
   */
 
-  cupsdWritePrintcap();
+  if (write_printcap)
+    cupsdWritePrintcap();
 }
 
 
@@ -2657,7 +2664,8 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
  */
 
 static void
-process_implicit_classes(void)
+process_implicit_classes(
+    int *write_printcap)		/* O - Write printcap file? */
 {
   int		i;			/* Looping var */
   int		update;			/* Update printer attributes? */
@@ -2738,6 +2746,9 @@ process_implicit_classes(void)
 
         update = 1;
 
+	if (write_printcap)
+	  *write_printcap = 1;
+
         cupsdLogMessage(CUPSD_LOG_DEBUG, "Added implicit class \"%s\"...",
 	                name);
 	cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, p, NULL,
diff -up cups-1.3.1/scheduler/printers.c.str2512 cups-1.3.1/scheduler/printers.c
--- cups-1.3.1/scheduler/printers.c.str2512	2007-09-17 17:06:26.000000000 +0100
+++ cups-1.3.1/scheduler/printers.c	2007-09-18 09:31:23.000000000 +0100
@@ -3045,7 +3045,8 @@ cupsdWritePrintcap(void)
   * data has come from...
   */
 
-  cupsFilePuts(fp, "# This file was automatically generated by cupsd(8) from the\n");
+  cupsFilePuts(fp,
+               "# This file was automatically generated by cupsd(8) from the\n");
   cupsFilePrintf(fp, "# %s/printers.conf file.  All changes to this file\n",
                  ServerRoot);
   cupsFilePuts(fp, "# will be lost.\n");
@@ -3071,14 +3072,15 @@ cupsdWritePrintcap(void)
 
           if (DefaultPrinter)
 	    cupsFilePrintf(fp, "%s|%s:rm=%s:rp=%s:\n", DefaultPrinter->name,
-	            DefaultPrinter->info, ServerName, DefaultPrinter->name);
+	                   DefaultPrinter->info, ServerName,
+			   DefaultPrinter->name);
 
 	  for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
 	       p;
 	       p = (cupsd_printer_t *)cupsArrayNext(Printers))
 	    if (p != DefaultPrinter)
 	      cupsFilePrintf(fp, "%s|%s:rm=%s:rp=%s:\n", p->name, p->info,
-	              ServerName, p->name);
+	                     ServerName, p->name);
           break;
 
       case PRINTCAP_SOLARIS:
@@ -3116,9 +3118,10 @@ cupsdWritePrintcap(void)
 	       p;
 	       p = (cupsd_printer_t *)cupsArrayNext(Printers))
 	    cupsFilePrintf(fp, "%s:\\\n"
-	        	"\t:bsdaddr=%s,%s:\\\n"
-			"\t:description=%s:\n",
-		    p->name, ServerName, p->name, p->info ? p->info : "");
+	        	       "\t:bsdaddr=%s,%s:\\\n"
+			       "\t:description=%s:\n",
+		           p->name, ServerName, p->name,
+			   p->info ? p->info : "");
           break;
     }
   }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- cups.spec	17 Sep 2007 16:10:57 -0000	1.356
+++ cups.spec	18 Sep 2007 08:32:42 -0000	1.357
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -37,6 +37,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
+Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
@@ -146,6 +147,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
+%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
@@ -439,6 +441,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
+- Avoid write printcap unnecessarily (bug #290831).
+
 * Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
 - 1.3.1.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 08:42:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:42:41 -0400
Subject: rpms/openobex/devel openobex.spec,1.24,1.25
Message-ID: <200709180842.l8I8gfI0021892@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21801

Modified Files:
	openobex.spec 
Log Message:
Updated sources URL to point to the right location



Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openobex.spec	28 Aug 2007 14:43:46 -0000	1.24
+++ openobex.spec	18 Sep 2007 08:42:09 -0000	1.25
@@ -5,7 +5,7 @@
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
-Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz
+Source: http://mesh.dl.sourceforge.net/sourceforge/openobex/openobex-%{version}.tar.gz
 Patch: openobex-apps-flush.patch
 Patch1: openobex-1.3-push.patch
 Patch2: openobex-1.3-ipv6.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 08:47:23 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 04:47:23 -0400
Subject: rpms/openobex/devel openobex.spec,1.25,1.26
Message-ID: <200709180847.l8I8lNB6021975@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/openobex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21943

Modified Files:
	openobex.spec 
Log Message:
Changed sources URL in spec file to point to the right location



Index: openobex.spec
===================================================================
RCS file: /cvs/extras/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openobex.spec	18 Sep 2007 08:42:09 -0000	1.25
+++ openobex.spec	18 Sep 2007 08:46:50 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovcak at redhat.com> 1.3-8
+- Changed sources in specfile URL to point to the right location
+
 * Fri Aug 24 2007 Jiri Moskovcak <jmoskovc at redhat.com> 1.3-7
 - Added ipv6 support
 - Resolves: #198396



From fedora-extras-commits at redhat.com  Tue Sep 18 08:48:02 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 04:48:02 -0400
Subject: rpms/hulahop/OLPC-2 hulahop.spec,1.7,1.8
Message-ID: <200709180848.l8I8m2tN021996@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/hulahop/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21974

Modified Files:
	hulahop.spec 
Log Message:
Bump version



Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/OLPC-2/hulahop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hulahop.spec	17 Sep 2007 19:28:06 -0000	1.7
+++ hulahop.spec	18 Sep 2007 08:47:30 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name: hulahop
 Version: 0.2
-Release: 0.6.%{alphatag}61d001479c
+Release: 0.7.%{alphatag}61d001479c
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Sep 18 09:11:56 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:11:56 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested watchbugzilla
Message-ID: <200709180911.l8I9BwxI017182@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on e2fsprogs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 09:11:56 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:11:56 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested commit
Message-ID: <200709180911.l8I9BwCd017244@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on e2fsprogs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 09:12:02 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:12:02 -0700
Subject: [pkgdb] e2fsprogs: oliver has requested watchcommits
Message-ID: <200709180912.l8I9C2CM017210@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on e2fsprogs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 09:18:22 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 05:18:22 -0400
Subject: extras-buildsys/utils certhelper.py,1.4,1.5
Message-ID: <200709180918.l8I9IMH4028667@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28648

Modified Files:
	certhelper.py 
Log Message:
fix typo in certhelper examples


Index: certhelper.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/certhelper.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- certhelper.py	4 Oct 2005 17:10:09 -0000	1.4
+++ certhelper.py	18 Sep 2007 09:18:20 -0000	1.5
@@ -33,7 +33,7 @@
     print "Examples:\n"
     print "    %s ca --outdir=/etc/plague/ca --name=my_ca" % prog
     print "    %s normal --outdir=/etc/plague/server/certs --name=server --cadir=/etc/plague/ca --caname=my_ca" % prog
-    print "    %s normal --outdir=/etc/plague/builder/certs --name=builder1 --cadir=/etc/plage/ca --caname=my_ca" % prog
+    print "    %s normal --outdir=/etc/plague/builder/certs --name=builder1 --cadir=/etc/plague/ca --caname=my_ca" % prog
     print "\n"
 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 09:19:11 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 05:19:11 -0400
Subject: extras-buildsys README,1.11,1.12
Message-ID: <200709180919.l8I9JBIc028721@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28703

Modified Files:
	README 
Log Message:
fix typo in 1st line


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- README	8 Aug 2005 19:11:24 -0000	1.11
+++ README	18 Sep 2007 09:19:09 -0000	1.12
@@ -1,4 +1,4 @@
-fFedora Extras Build System
+Fedora Extras Build System
 
 System Requirements:
     - Python 2.3 or 2.4



From fedora-extras-commits at redhat.com  Tue Sep 18 09:19:12 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 18 Sep 2007 05:19:12 -0400
Subject: rpms/man-pages/devel .cvsignore, 1.40, 1.41 man-pages.spec, 1.86,
	1.87 sources, 1.39, 1.40
Message-ID: <200709180919.l8I9JCHv028726@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28649

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
 update to 2.65



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	14 Aug 2007 10:53:44 -0000	1.40
+++ .cvsignore	18 Sep 2007 09:18:40 -0000	1.41
@@ -2,4 +2,4 @@
 man2.tar.gz
 man2_sys2.1.tar.gz
 man-suid-bins.tar.bz2
-man-pages-2.64.tar.bz2
+man-pages-2.65.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- man-pages.spec	28 Aug 2007 09:23:13 -0000	1.86
+++ man-pages.spec	18 Sep 2007 09:18:40 -0000	1.87
@@ -1,6 +1,6 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 2.64
+Version: 2.65
 Release: 1%{?dist}
 License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE
 Group: Documentation
@@ -177,6 +177,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Tue Sep 18 2007 Ivana Varekova <varekova at redhat.com> - 2.65-1
+- update to 2.65
+
 * Tue Aug 14 2007 Ivana Varekova <varekova at redhat.com> - 2.64-1
 - update to 2.64
 - remove obsolete patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	14 Aug 2007 10:53:44 -0000	1.39
+++ sources	18 Sep 2007 09:18:40 -0000	1.40
@@ -2,4 +2,4 @@
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 fbc03fdbc665e24961d30dad3ed8596d  man2_sys2.1.tar.gz
 a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
-80683dd76cd4eb5aed36ac4401aef4d6  man-pages-2.64.tar.bz2
+8b31a273186c8cae42fdf66a77d6679f  man-pages-2.65.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:44 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:44 -0700
Subject: [pkgdb] apr: oliver has requested watchbugzilla
Message-ID: <200709180923.l8I9Nj6L020880@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on apr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:47 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:47 -0700
Subject: [pkgdb] apr: oliver has requested watchcommits
Message-ID: <200709180923.l8I9NnFu020905@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on apr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 09:23:50 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:23:50 -0700
Subject: [pkgdb] apr: oliver has requested commit
Message-ID: <200709180923.l8I9NoVf020914@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on apr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 09:41:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Tue, 18 Sep 2007 05:41:42 -0400
Subject: rpms/rusers/devel rusers.spec,1.27,1.28 rusersd.init,1.3,1.4
Message-ID: <200709180941.l8I9fgpY031359@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/rusers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31336

Modified Files:
	rusers.spec rusersd.init 
Log Message:
Fixed init script to work propery with rpcbind



Index: rusers.spec
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rusers.spec	17 Sep 2007 12:39:38 -0000	1.27
+++ rusers.spec	18 Sep 2007 09:41:09 -0000	1.28
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 51%{?dist}
+Release: 52%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -146,6 +146,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Tue Sep 18 2007 Jiri Moskovcak <jmoskovc at redhat.com> 0.17-52
+- Fixed init script to work properly with rpcbind
+
 * Sat Sep 15 2007 Steve Dickson <steved at redaht.com> 0.17-51
 - Removed portmap dependency and re-worked when the user
   privilege are drop; allowing port registration with


Index: rusersd.init
===================================================================
RCS file: /cvs/extras/rpms/rusers/devel/rusersd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rusersd.init	24 Jul 2007 11:39:34 -0000	1.3
+++ rusersd.init	18 Sep 2007 09:41:09 -0000	1.4
@@ -34,9 +34,9 @@
     then
 	  exit 0
     fi
-	status portmap > /dev/null
+	status rpcbind > /dev/null
 	RETVAL=$?
-	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/portmap start
+	[ $RETVAL -ne 0 ] && /etc/rc.d/init.d/rpcbind start
 	echo -n $"Starting rusers services: "
 	daemon rpc.rusersd
 	RETVAL=$?



From fedora-extras-commits at redhat.com  Tue Sep 18 09:56:15 2007
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 18 Sep 2007 05:56:15 -0400
Subject: rpms/awstats/EL-5 .cvsignore, 1.6, 1.7 awstats.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200709180956.l8I9uFp6002042@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1914

Modified Files:
	.cvsignore awstats.spec sources 
Log Message:
Bring up to latest version (sync'd with Fedora devel) before initial build for EL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 May 2006 08:17:10 -0000	1.6
+++ .cvsignore	18 Sep 2007 09:55:42 -0000	1.7
@@ -1 +1,2 @@
 awstats-6.6.tar.gz
+awstats-6.7-xmlhistory.patch


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- awstats.spec	7 Jan 2007 21:24:41 -0000	1.18
+++ awstats.spec	18 Sep 2007 09:55:42 -0000	1.19
@@ -1,19 +1,25 @@
 Name:       awstats
-Version:    6.6
+Version:    6.7
 Release:    1%{?dist}
 Summary:    Advanced Web Statistics
-License:    GPL
+License:    GPLv2
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-Source0:    http://dl.sf.net/awstats/awstats-6.6.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-%{version}.tar.gz
 #Source0:    http://awstats.sourceforge.net/files/awstats-6.6.tar.gz
 Source1:    awstats.README.SELinux
+
+# Fix pb in xml output for history files
+# http://awstats.cvs.sourceforge.net/awstats/awstats/wwwroot/cgi-bin/awstats.pl?r1=1.892&r2=1.894&view=patch
+Patch0:     awstats-6.7-xmlhistory.patch
+
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: checkpolicy, selinux-policy-devel
 Requires:   httpd
 Requires:   perl
-Requires(post): perl, policycoreutils
-Requires(postun): /sbin/service, policycoreutils
+Requires(post): perl
+Requires(postun): /sbin/service
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -31,9 +37,23 @@
 With the default configuration, the statistics are available:
 http://localhost/awstats/awstats.pl
 
+%package    selinux
+Summary:    SELinux support for Awstats
+Group:      Applications/Internet
+Requires:   %{name} = %{version}
+Requires(post): policycoreutils
+Requires(preun): policycoreutils
+Requires(postun): policycoreutils
+
+%description selinux
+This package adds SELinux enforcement to AWstats.
+
 
 %prep
 %setup -q
+# No backup or it will be installed
+#%%patch0 -p0 -b .xmlhistory
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -43,6 +63,7 @@
 perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
+mkdir selinux
 
 
 %install
@@ -111,6 +132,15 @@
 # Cron job
 install -m 0755 awstats.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
 
+# SELinux support
+cd selinux
+echo 'policy_module(%{name}, 1.0)' > %{name}.te
+echo '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)? system_u:object_r:httpd_sys_script_exec_t:s0' > %{name}.fc
+echo '%{_localstatedir}/lib/awstats(/.*)? system_u:object_r:httpd_sys_script_rw_t:s0' >> %{name}.fc
+touch %{name}.if
+make -f %{_datadir}/selinux/devel/Makefile
+install -p -m 644 -D %{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,27 +155,29 @@
                       ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || :
   fi
 fi
-### SELinux support ###
-# Set SELinux file_context
-semanage fcontext -a -t httpd_sys_script_exec_t \
-    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
-# Actually change the context
-chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || :
-chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || :
-
 
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
-# SELinux support
-if [ $1 -eq 0 ]; then
-  semanage fcontext -d -t httpd_sys_script_exec_t \
-    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-  semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
+
+%post selinux
+if [ "$1" -le "1" ]; then # Fist install
+    semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || :
+    fixfiles -R %{name} restore
+fi
+
+%preun selinux
+if [ "$1" -lt "1" ]; then # Final removal
+    semodule -r %{name} 2>/dev/null || :
+    fixfiles -R %{name} restore
 fi
 
+%postun selinux
+if [ "$1" -ge "1" ]; then # Upgrade
+    # Replaces the module if it is already loaded
+    semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || :
+fi
 
 
 %files
@@ -161,7 +193,7 @@
 %{_datadir}/%{name}/wwwroot/cgi-bin
 # Different defattr to fix lots of files which should not be +x.
 %defattr(644,root,root,755)
-%doc README.TXT docs/* README.SELinux
+%doc README.TXT docs/*
 %{_datadir}/%{name}/lang
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/plugins
@@ -171,111 +203,12 @@
 %{_datadir}/%{name}/wwwroot/js
 
 
+%files selinux
+%defattr(644, root, root, 755)
+%doc README.SELinux
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
 
-%changelog
-* Sun Jan 07 2007 Aurelien Bompard <abompard at fedoraproject.org> 6.6-1
-- version 6.6 final
-
-* Fri Nov 03 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.4.beta
-- fix typo in the cron job (bug 213803)
 
-* Mon Oct 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.3.beta
-- fix DOS encoding on logresolvemerge.pl
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 6.6-0.2.beta
-- rebuild
-
-* Sun May 07 2006 Aurelien Bompard <gauret[AT]free.fr> 6.6-0.1.beta
-- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923)
-
-* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-3
-- SELinux support: use semanage to label the cgi and the database files
-- Only allow access from localhost by default (this app has a security history)
-
-* Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
-- rebuild for FC5
-
-* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
-- version 6.5 final
-
-* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
-- version 6.5 (beta), fixes CAN-2005-1527
-
-* Mon Mar 21 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-1
-- version 6.4 final
-- change release tag (following Owen's scheme)
-- convert tabs into spaces
-
-* Tue Feb 15 2005 Aurelien Bompard <gauret[AT]free.fr> 6.4-0.1.pre
-- update to 6.4pre to fix a vulnerability
-
-* Thu Feb 10 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-1
-- version 6.3 final
-
-* Thu Jan 27 2005 Aurelien Bompard <gauret[AT]free.fr> 6.3-0.1.20050122
-- update to 6.3pre to fix vulnerability
-
-* Sun Nov 28 2004 Aurelien Bompard <gauret[AT]free.fr> 6.2-0.fdr.1
-- version 6.2
-
-* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.6
-- remove redundant substitution
-
-* Thu May 20 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.5
-- be closer to upstream default configuration
-- use the included apache conf file
-- merge changes from Michael Schwendt (bug 1608)
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.4
-- fix cron job for relocated tools
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.3
-- keep the tools in the tools subdirectory
-
-* Wed May 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.2
-- fix scripts in /usr/bin
-- rename configure.pl to awstats_configure.pl
-
-* Sun May 16 2004 Aurelien Bompard <gauret[AT]free.fr> 6.1-0.fdr.1
-- version 6.1
-
-* Wed Mar 03 2004 Aurelien Bompard <gauret[AT]free.fr> 6.0.0.fdr.2
-- requires perl without version to fix build on rh9
-
-* Tue Feb 19 2004 Aurelien Bompard <gauret[AT]free.fr> 6.0-0.fdr.1
-- version 6.0
-
-* Mon Dec 22 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.5
-- solve stupid bug in %%install
-- only create the preconfigured config file on install, not on upgrade
-
-* Mon Dec 22 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.4
-- post scriptlet doesn't overwrite user configuration now
-  be careful if you upgrade from 5.9-0.fdr.3
-- replace _DATADIR in apache configuration in the install stage
-  (was in the post scriptlet before)
-- remove 'noreplace' tag from the apache config file
-- various cleanups in the %%install stage
-- Thanks to Mickael Schwendt.
-
-* Sun Dec 07 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.3
-- %%post et %%postun now use condrestart instead of restart
-- only restart apache if we are upgrading
-- install and cp use the "-p" switch
-- use %%_datadir in /etc/httpd/conf.d/awstats.conf
-- improve cron job 
-- don't brutally recode HTML pages
-- the scan is now done hourly instead of daily
-- *.pm files are not executable any more
-- tools are in %%bindir
-- various other improvements
-- many thanks to Michael Schwendt and Dag Wieers.
-
-* Sat Nov 29 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.2
-- Set the hostname in %%post (thanks to Michael Koziarski)
-- Improved customization in %%post
-
-* Sun Nov 16 2003 Aurelien Bompard <gauret[AT]free.fr> 5.9-0.fdr.1
-- fix /etc/cron.daily/awstats permissions
-- fix log name in conf file
-- port to fedora (from Mandrake)
+%changelog
+* Tue Sep 18 2007 Tim Jackson <rpm at timj.co.uk> 6.7-1
+- initial import to EPEL-5, from Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Jan 2007 21:24:41 -0000	1.10
+++ sources	18 Sep 2007 09:55:42 -0000	1.11
@@ -1 +1,2 @@
-38e393edb530d409fdf7f79127a7548e  awstats-6.6.tar.gz
+512cd146247eb178ef023c924f7bb766  awstats-6.7.tar.gz
+cbf319b3472a022cd2452d612ac28117  awstats-6.7-xmlhistory.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:08 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:08 -0700
Subject: [pkgdb] fish: oliver has requested watchbugzilla
Message-ID: <200709180957.l8I9v9fF030693@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on fish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:09 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:09 -0700
Subject: [pkgdb] fish: oliver has requested watchcommits
Message-ID: <200709180957.l8I9v9ZA030360@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on fish (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:09 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:09 -0700
Subject: [pkgdb] fish: oliver has requested watchbugzilla
Message-ID: <200709180957.l8I9v9Bv030705@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchbugzilla acl on fish (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:10 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:10 -0700
Subject: [pkgdb] fish: oliver has requested watchcommits
Message-ID: <200709180957.l8I9vAes030717@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the watchcommits acl on fish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:11 -0700
Subject: [pkgdb] fish: oliver has requested commit
Message-ID: <200709180957.l8I9vBQx030378@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on fish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:11 -0700
Subject: [pkgdb] fish: oliver has requested commit
Message-ID: <200709180957.l8I9vCAc030389@app4.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the commit acl on fish (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:13 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:13 -0700
Subject: [pkgdb] fish: oliver has requested approveacls
Message-ID: <200709180957.l8I9vDaa030737@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the approveacls acl on fish (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 09:57:14 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 02:57:14 -0700
Subject: [pkgdb] fish: oliver has requested approveacls
Message-ID: <200709180957.l8I9vErc030753@app3.fedora.phx.redhat.com>

Oliver Falk (oliver) has requested the approveacls acl on fish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fish



From fedora-extras-commits at redhat.com  Tue Sep 18 10:15:57 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:15:57 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181015.l8IAFwDI004032@app3.fedora.phx.redhat.com>

Joe Orton (jorton) has set the commit acl on apr (Fedora devel) to Denied for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 10:16:00 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:16:00 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181016.l8IAG2iw004056@app4.fedora.phx.redhat.com>

Joe Orton (jorton) has set the watchcommits acl on apr (Fedora devel) to Approved for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 10:16:02 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 03:16:02 -0700
Subject: [pkgdb] apr had acl change status
Message-ID: <200709181016.l8IAG3SV004074@app4.fedora.phx.redhat.com>

Joe Orton (jorton) has set the watchbugzilla acl on apr (Fedora devel) to Approved for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apr



From fedora-extras-commits at redhat.com  Tue Sep 18 10:20:26 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 18 Sep 2007 06:20:26 -0400
Subject: rpms/kbd/devel .cvsignore, 1.6, 1.7 kbd.spec, 1.43, 1.44 sources,
	1.8, 1.9
Message-ID: <200709181020.l8IAKQSD008459@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8428

Modified Files:
	.cvsignore kbd.spec sources 
Log Message:
add new romanian keymap, resolves: #253892


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Jul 2007 08:43:38 -0000	1.6
+++ .cvsignore	18 Sep 2007 10:19:55 -0000	1.7
@@ -2,3 +2,4 @@
 kbd-latsun-fonts.tar.bz2
 sun12x22-fixed.psfu
 kbd-sun12x22-fixed.tar.bz2
+ro.map


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kbd.spec	27 Aug 2007 12:43:13 -0000	1.43
+++ kbd.spec	18 Sep 2007 10:19:55 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 24%{?dist}
+Release: 25%{?dist}
 # Except possibly for the restrictions mentioned in the directory consolefonts
 License: GPL+
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source3: kbdrate.pam
 Source4: kbd-latsun-fonts.tar.bz2
 Source5: kbd-sun12x22-fixed.tar.bz2
+Source6: ro.map
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
@@ -68,6 +69,9 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
+# add new romanian keymap
+cp ../ro.map data/keymaps/i386/qwerty
+
 # Default to latarcyrheb-sun16 font for unicode
 perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
 
@@ -140,6 +144,10 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep 18 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-25
+- Add new romanian keymap
+  Resolves: #253892
+
 * Mon Aug 27 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-24
 - Fix license
 - Symlink sr-cy layout to sr-latin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jul 2007 08:43:38 -0000	1.8
+++ sources	18 Sep 2007 10:19:55 -0000	1.9
@@ -1,3 +1,4 @@
 069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
 e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
+b7ea916f350df2dfedfd306ff54a6f65  ro.map



From fedora-extras-commits at redhat.com  Tue Sep 18 10:30:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 18 Sep 2007 06:30:22 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec, 1.32, 1.33 sources, 1.11,
	1.12
Message-ID: <200709181030.l8IAUMSL008743@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8715

Modified Files:
	man-pages-fr.spec sources 
Log Message:
Add correct files from upstream.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- man-pages-fr.spec	10 Sep 2007 11:57:03 -0000	1.32
+++ man-pages-fr.spec	18 Sep 2007 10:29:50 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.40.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -106,6 +106,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Tue Sep 18 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-10
+- rebuild with correct sources
+
 * Mon Sep 10 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-9
 - 273941 doesn't install linkchecker man page
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Aug 2007 13:10:48 -0000	1.11
+++ sources	18 Sep 2007 10:29:50 -0000	1.12
@@ -1,2 +1,2 @@
-57109f5fec7005b0fd49dc84529244c1  mansupfr.tar.bz2
 7e5a09c07ceae5c547b8d62fe58d9c43  man-pages-fr-2.40.0.tar.bz2
+c320c19a827c7003da5eb7bf99742c56  mansupfr.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:39:05 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 06:39:05 -0400
Subject: rpms/libieee1284/devel .cvsignore, 1.3, 1.4 libieee1284.spec, 1.13, 
	1.14 sources, 1.4, 1.5
Message-ID: <200709181039.l8IAd5L3008987@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/libieee1284/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8948

Modified Files:
	.cvsignore libieee1284.spec sources 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
- 0.2.11 (bug #246406).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jan 2005 14:51:27 -0000	1.3
+++ .cvsignore	18 Sep 2007 10:38:33 -0000	1.4
@@ -1,2 +1,3 @@
 libieee1284-0.2.8.tar.bz2
 libieee1284-0.2.9.tar.bz2
+libieee1284-0.2.11.tar.bz2


Index: libieee1284.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/libieee1284.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libieee1284.spec	29 Aug 2007 14:33:14 -0000	1.13
+++ libieee1284.spec	18 Sep 2007 10:38:33 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A library for interfacing IEEE 1284-compatible devices
 Name: libieee1284
-Version: 0.2.9
-Release: 5%{?dist}
+Version: 0.2.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
@@ -72,6 +72,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
+- 0.2.11 (bug #246406).
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.2.9-5
 - Added dist tag.
 - Fixed summary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 16:50:18 -0000	1.4
+++ sources	18 Sep 2007 10:38:33 -0000	1.5
@@ -1 +1 @@
-83ea1d5463a8f47ba5121cf38973b4a4  libieee1284-0.2.9.tar.bz2
+b8fff9f3d121531bc17430e3f4ea6ed0  libieee1284-0.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:40:09 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Tue, 18 Sep 2007 06:40:09 -0400
Subject: rpms/kbd/devel .cvsignore, 1.7, 1.8 kbd.spec, 1.44, 1.45 sources,
	1.9, 1.10
Message-ID: <200709181040.l8IAe9Zm009091@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9040

Modified Files:
	.cvsignore kbd.spec sources 
Log Message:
better solution:)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2007 10:19:55 -0000	1.7
+++ .cvsignore	18 Sep 2007 10:39:36 -0000	1.8
@@ -3,3 +3,4 @@
 sun12x22-fixed.psfu
 kbd-sun12x22-fixed.tar.bz2
 ro.map
+ro.tar.bz2


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kbd.spec	18 Sep 2007 10:19:55 -0000	1.44
+++ kbd.spec	18 Sep 2007 10:39:36 -0000	1.45
@@ -11,7 +11,7 @@
 Source3: kbdrate.pam
 Source4: kbd-latsun-fonts.tar.bz2
 Source5: kbd-sun12x22-fixed.tar.bz2
-Source6: ro.map
+Source6: ro.tar.bz2
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,7 +41,7 @@
 
 %prep
 
-%setup -q -a 4 -a 5
+%setup -q -a 4 -a 5 -a 6
 %patch0 -p1 -b .sparc
 %patch1 -p1
 %patch2 -p1 -b .terminal
@@ -69,9 +69,6 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
-# add new romanian keymap
-cp ../ro.map data/keymaps/i386/qwerty
-
 # Default to latarcyrheb-sun16 font for unicode
 perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Sep 2007 10:19:55 -0000	1.9
+++ sources	18 Sep 2007 10:39:36 -0000	1.10
@@ -1,4 +1,4 @@
 069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
 e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
-b7ea916f350df2dfedfd306ff54a6f65  ro.map
+cc29253d2189758705547d0ea9574abe  ro.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:41:39 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 06:41:39 -0400
Subject: rpms/openldap/devel ldap.init, 1.25, 1.26 ldap.sysconfig, 1.1,
	1.2 openldap.spec, 1.93, 1.94
Message-ID: <200709181041.l8IAfdjD009271@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223

Modified Files:
	ldap.init ldap.sysconfig openldap.spec 
Log Message:
fixed upgrade with empty database
fixed /etc/sysconfig/ldap handling


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ldap.init	17 Sep 2007 12:26:02 -0000	1.25
+++ ldap.init	18 Sep 2007 10:41:07 -0000	1.26
@@ -154,7 +154,7 @@
 	user=ldap
 	prog=`basename ${slapd}`
 	harg=""
-	if test x$LDAPD_LDAP = xyes ; then
+	if test x$SLAPD_LDAP = xyes ; then
 	    harg="ldap:///"
 	fi
 	if test x$SLAPD_LDAPS = xyes ; then







From fedora-extras-commits at redhat.com  Tue Sep 18 10:42:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 06:42:19 -0400
Subject: rpms/openldap/devel openldap.spec,1.94,1.95
Message-ID: <200709181042.l8IAgJrY009324@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9280

Modified Files:
	openldap.spec 
Log Message:
version++


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- openldap.spec	18 Sep 2007 10:41:07 -0000	1.94
+++ openldap.spec	18 Sep 2007 10:41:47 -0000	1.95
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 10:43:31 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 06:43:31 -0400
Subject: rpms/libieee1284/F-7 .cvsignore, 1.3, 1.4 libieee1284.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200709181043.l8IAhVep009471@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/libieee1284/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9402

Modified Files:
	.cvsignore libieee1284.spec sources 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
- 0.2.11 (bug #246406).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jan 2005 14:51:27 -0000	1.3
+++ .cvsignore	18 Sep 2007 10:42:58 -0000	1.4
@@ -1,2 +1,3 @@
 libieee1284-0.2.8.tar.bz2
 libieee1284-0.2.9.tar.bz2
+libieee1284-0.2.11.tar.bz2


Index: libieee1284.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/libieee1284.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libieee1284.spec	7 Dec 2006 15:43:48 -0000	1.12
+++ libieee1284.spec	18 Sep 2007 10:42:58 -0000	1.13
@@ -1,13 +1,13 @@
-Summary: A library for interfacing IEEE 1284-compatible devices.
+Summary: A library for interfacing IEEE 1284-compatible devices
 Name: libieee1284
-Version: 0.2.9
-Release: 4
-License: GPL
+Version: 0.2.11
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
 Source0: ftp://cyberelk.net/tim/data/%{name}/devel/%{name}-%{version}.tar.bz2
 Prereq: /sbin/ldconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xmlto, python-devel
 
 %description
@@ -72,6 +72,15 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 0.2.11-1
+- 0.2.11 (bug #246406).
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 0.2.9-5
+- Added dist tag.
+- Fixed summary.
+- Better buildroot tag.
+- More specific license tag.
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 0.2.9-4
 - rebuild against python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libieee1284/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Mar 2005 16:50:18 -0000	1.4
+++ sources	18 Sep 2007 10:42:58 -0000	1.5
@@ -1 +1 @@
-83ea1d5463a8f47ba5121cf38973b4a4  libieee1284-0.2.9.tar.bz2
+b8fff9f3d121531bc17430e3f4ea6ed0  libieee1284-0.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 10:46:54 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:46:54 -0400
Subject: rpms/totem/devel totem.spec,1.120,1.121
Message-ID: <200709181046.l8IAksjM009654@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9620

Modified Files:
	totem.spec 
Log Message:
Fix URL



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- totem.spec	16 Sep 2007 22:26:05 -0000	1.120
+++ totem.spec	18 Sep 2007 10:46:18 -0000	1.121
@@ -9,7 +9,7 @@
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.18/totem-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.20/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14



From fedora-extras-commits at redhat.com  Tue Sep 18 10:48:46 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:48:46 -0400
Subject: rpms/gnome-audio/devel gnome-audio.spec,1.12,1.13
Message-ID: <200709181048.l8IAmkhS009736@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-audio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9694

Modified Files:
	gnome-audio.spec 
Log Message:
Fix URL



Index: gnome-audio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-audio/devel/gnome-audio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-audio.spec	5 Feb 2007 13:20:48 -0000	1.12
+++ gnome-audio.spec	18 Sep 2007 10:48:13 -0000	1.13
@@ -4,7 +4,7 @@
 Release: 4
 License: LGPL
 Group: Applications/Multimedia
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-audio-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-audio/2.0/gnome-audio-%{version}.tar.bz2
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildArchitectures: noarch



From fedora-extras-commits at redhat.com  Tue Sep 18 10:49:20 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:49:20 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.107,1.108
Message-ID: <200709181049.l8IAnKGF009869@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9726

Modified Files:
	gnome-media.spec 
Log Message:
Fix URL



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-media.spec	17 Sep 2007 16:43:17 -0000	1.107
+++ gnome-media.spec	18 Sep 2007 10:48:46 -0000	1.108
@@ -15,7 +15,7 @@
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.gz
+Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 



From fedora-extras-commits at redhat.com  Tue Sep 18 10:49:52 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:49:52 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.130,1.131
Message-ID: <200709181049.l8IAnqru009908@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9863

Modified Files:
	rhythmbox.spec 
Log Message:
Fix URL



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- rhythmbox.spec	24 Aug 2007 17:17:36 -0000	1.130
+++ rhythmbox.spec	18 Sep 2007 10:49:18 -0000	1.131
@@ -7,7 +7,7 @@
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
-Source: ftp://download.gnome.org/sources/rhythmbox/0.10/%{name}-%{version}.tar.bz2
+Source: ftp://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
 Source1: rhythmbox-iradio-initial.pls
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0



From fedora-extras-commits at redhat.com  Tue Sep 18 10:55:26 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 06:55:26 -0400
Subject: rpms/speex/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 speex.spec, 
	1.18, 1.19
Message-ID: <200709181055.l8IAtQ77010265@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/speex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10219

Modified Files:
	.cvsignore sources speex.spec 
Log Message:
* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2-0.3.beta2
- Update to Beta 2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Oct 2006 16:25:13 -0000	1.5
+++ .cvsignore	18 Sep 2007 10:54:46 -0000	1.6
@@ -1 +1 @@
-speex-1.2beta1.tar.gz
+speex-1.2beta2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2006 16:25:13 -0000	1.5
+++ sources	18 Sep 2007 10:54:46 -0000	1.6
@@ -1 +1 @@
-aac2e4ba42122b885c787ea280acb3d9  speex-1.2beta1.tar.gz
+5480fa53a7451603ecb57ff815c87ac0  speex-1.2beta2.tar.gz


Index: speex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speex/devel/speex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- speex.spec	24 Oct 2006 19:06:18 -0000	1.18
+++ speex.spec	18 Sep 2007 10:54:46 -0000	1.19
@@ -1,11 +1,11 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
 Version: 	1.2
-Release:	0.2.beta1 
+Release:	0.3.beta2
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
-Source0: 	http://www.speex.org/download/%{name}-1.2beta1.tar.gz
+Source0:	http://downloads.us.xiph.org/releases/speex/%{name}-1.2beta2.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libogg-devel
 
@@ -31,7 +31,7 @@
 speech. This package contains development files for %{name}
 
 %prep
-%setup -q -n speex-1.2beta1
+%setup -q -n speex-1.2beta2
 %patch0 -p1 -b .test-progs
 
 %build
@@ -69,6 +69,9 @@
 %{_libdir}/libspeex.a
 
 %changelog
+* Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2-0.3.beta2
+- Update to Beta 2
+
 * Tue Oct 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.2-0.2.beta1
 - Rebuild 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 10:57:47 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 06:57:47 -0400
Subject: rpms/anthy/devel .cvsignore, 1.28,
	1.29 anthy-enable-dict-gtankan.patch, 1.1, 1.2 anthy.spec, 1.43,
	1.44 sources, 1.29, 1.30
Message-ID: <200709181057.l8IAvllW010439@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10394

Modified Files:
	.cvsignore anthy-enable-dict-gtankan.patch anthy.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	8 Aug 2007 09:46:26 -0000	1.28
+++ .cvsignore	18 Sep 2007 10:57:14 -0000	1.29
@@ -32,3 +32,4 @@
 anthy-9011.tar.gz
 anthy-9100.tar.gz
 alt-cannadic-070805.tar.bz2
+anthy-9100b.tar.gz

anthy-enable-dict-gtankan.patch:

Index: anthy-enable-dict-gtankan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy-enable-dict-gtankan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anthy-enable-dict-gtankan.patch	8 Aug 2007 10:00:22 -0000	1.1
+++ anthy-enable-dict-gtankan.patch	18 Sep 2007 10:57:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ruN anthy-9100.orig/mkworddic/dict.args.in anthy-9100/mkworddic/dict.args.in
---- anthy-9100.orig/mkworddic/dict.args.in	2007-04-04 20:00:03.000000000 +0900
-+++ anthy-9100/mkworddic/dict.args.in	2007-08-08 18:14:41.000000000 +0900
+diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in
+--- anthy-9100b.orig/mkworddic/dict.args.in	2007-09-16 21:38:40.000000000 +0900
++++ anthy-9100b/mkworddic/dict.args.in	2007-09-18 19:53:52.000000000 +0900
 @@ -10,9 +10,9 @@
  read @top_srcdir@/alt-cannadic/gcanna.ctd
  #
@@ -8,8 +8,8 @@
 -#read @top_srcdir@/alt-cannadic/gtankan.ctd
 +read @top_srcdir@/alt-cannadic/gtankan.ctd
  #
--read @top_srcdir@/mkworddic/tankanji.t
-+#read @top_srcdir@/mkworddic/tankanji.t
+-read @top_srcdir@/mkworddic/gtankan.ctd
++#read @top_srcdir@/mkworddic/gtankan.ctd
  read @top_srcdir@/mkworddic/adjust.t
  read @top_srcdir@/mkworddic/name.t
  read @top_srcdir@/mkworddic/compound.t


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- anthy.spec	23 Aug 2007 07:29:03 -0000	1.43
+++ anthy.spec	18 Sep 2007 10:57:14 -0000	1.44
@@ -1,8 +1,8 @@
 %define		altcannadicver	070805
 
 Name:		anthy
-Version:	9100
-Release:	3%{?dist}
+Version:	9100b
+Release:	1%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -117,6 +117,9 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
+- New upstream release.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 9100-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Aug 2007 09:46:26 -0000	1.29
+++ sources	18 Sep 2007 10:57:14 -0000	1.30
@@ -1,2 +1,2 @@
-00c2b8d7b722650b0088944e833077ad  anthy-9100.tar.gz
 17f849584baa5ae025542035b429f1b4  alt-cannadic-070805.tar.bz2
+0ad3873646255a2ca1c8576350fabb27  anthy-9100b.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 11:00:51 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 07:00:51 -0400
Subject: rpms/apr/devel apr.spec,1.72,1.73
Message-ID: <200709181100.l8IB0poN010691@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629

Modified Files:
	apr.spec 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
- fix %check for non-multilib 64-bit platforms



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- apr.spec	11 Sep 2007 09:50:48 -0000	1.72
+++ apr.spec	18 Sep 2007 11:00:19 -0000	1.73
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.11
-Release: 1
+Release: 2
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -85,15 +85,14 @@
       $RPM_BUILD_ROOT%{_libdir}/libapr-*.a
 
 %check
-%if "%{_lib}" == "lib"
-# Fail if LFS support isn't preent in a 32-bit build, since this
+# Fail if LFS support isn't present in a 32-bit build, since this
 # breaks ABI and the soname doesn't change: see #254241
-if ! grep off64_t include/apr.h; then
+if grep 'define SIZEOF_VOIDP 4' include/apr.h \
+   && ! grep off64_t include/apr.h; then
   cat config.log
   : LFS support not present in 32-bit build
   exit 1
 fi
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,6 +121,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
+- fix %%check for non-multilib 64-bit platforms
+
 * Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
 - bump up to 1.2.11
 - drop openlfs patch (fixed upstream)



From fedora-extras-commits at redhat.com  Tue Sep 18 11:04:30 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:04:30 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.11, 1.12 im-chooser.spec, 1.20, 
	1.21 sources, 1.10, 1.11
Message-ID: <200709181104.l8IB4Ul2016867@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16829

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
- New upstream release.
  - Fix to allow users disabling IM.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Sep 2007 12:35:57 -0000	1.11
+++ .cvsignore	18 Sep 2007 11:03:58 -0000	1.12
@@ -11,3 +11,4 @@
 im-chooser-0.4.1.tar.gz
 im-chooser-0.5.0.tar.gz
 im-chooser-0.5.1.tar.gz
+im-chooser-0.5.2.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- im-chooser.spec	14 Sep 2007 11:16:56 -0000	1.20
+++ im-chooser.spec	18 Sep 2007 11:03:58 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		im-chooser
-Version:	0.5.1
-Release:	2%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,10 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
+- New upstream release.
+  - Fix to allow users disabling IM.
+
 * Fri Sep 14 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.1-2
 - Add README into the package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Sep 2007 12:35:57 -0000	1.10
+++ sources	18 Sep 2007 11:03:58 -0000	1.11
@@ -1 +1 @@
-4c2b6eba1dd41ff0c5baaca5dc15f2a4  im-chooser-0.5.1.tar.gz
+84bd1b15b6c1ea4deda39cf94f3a3523  im-chooser-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 11:12:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane))
Date: Tue, 18 Sep 2007 07:12:52 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.49,1.50
Message-ID: <200709181112.l8IBCqfO017144@cvs-int.fedora.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/xinetd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17121

Modified Files:
	xinetd.spec 
Log Message:
version++


Index: xinetd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xinetd.spec	6 Sep 2007 09:05:59 -0000	1.49
+++ xinetd.spec	18 Sep 2007 11:12:18 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2



From fedora-extras-commits at redhat.com  Tue Sep 18 11:18:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:18:29 -0400
Subject: rpms/anthy/F-7 .cvsignore, 1.26, 1.27 anthy.spec, 1.40, 1.41 sources,
	1.27, 1.28
Message-ID: <200709181118.l8IBITOc017289@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17266

Modified Files:
	.cvsignore anthy.spec sources 
Log Message:
* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	3 Jul 2007 12:20:08 -0000	1.26
+++ .cvsignore	18 Sep 2007 11:17:56 -0000	1.27
@@ -29,3 +29,5 @@
 anthy-8622.tar.gz
 anthy-8706.tar.gz
 anthy-9100.tar.gz
+anthy-9100b.tar.gz
+alt-cannadic-070805.tar.bz2


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/anthy.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- anthy.spec	3 Jul 2007 12:20:08 -0000	1.40
+++ anthy.spec	18 Sep 2007 11:17:56 -0000	1.41
@@ -1,9 +1,10 @@
-%define	gcanna_ver	20051002
+%define		altcannadicver	070805
 
 Name:		anthy
-Version:	9100
+Version:	9100b
 Release:	1%{?dist}
-License:	GPL
+# The entire source code is LGPLv2+ and dictionaries is GPLv2.
+License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	automake autoconf
@@ -12,6 +13,8 @@
 
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
+Source2:	http://prdownloads.sourceforge.jp/alt-cannadic/26595/alt-cannadic-%{altcannadicver}.tar.bz2
+Patch0:		anthy-enable-dict-gtankan.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -50,7 +53,9 @@
 character set on XEmacs.
 
 %prep
-%setup -q
+%setup -q -a 2
+%patch0 -p1 -b .gtankan
+cp alt-cannadic-%{altcannadicver}/* alt-cannadic/
 
 %build
 %configure --disable-static
@@ -112,6 +117,17 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 9100b-1
+- New upstream release.
+
+* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 9100-3
+- Rebuild
+
+* Wed Aug  8 2007 Akira TAGOH <tagoh at redhat.com> - 9100-2
+- Update alt-cannadic to 070805.
+- Use gtankan.ctd instead of tankanji.t.
+- Update License tag.
+
 * Tue Jul  3 2007 Akira TAGOH <tagoh at redhat.com> - 9100-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-7/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	3 Jul 2007 12:20:08 -0000	1.27
+++ sources	18 Sep 2007 11:17:56 -0000	1.28
@@ -1 +1,2 @@
-00c2b8d7b722650b0088944e833077ad  anthy-9100.tar.gz
+0ad3873646255a2ca1c8576350fabb27  anthy-9100b.tar.gz
+17f849584baa5ae025542035b429f1b4  alt-cannadic-070805.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 11:21:43 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 18 Sep 2007 07:21:43 -0400
Subject: rpms/anthy/F-7 anthy-enable-dict-gtankan.patch,NONE,1.1
Message-ID: <200709181121.l8IBLhQh017366@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17357

Added Files:
	anthy-enable-dict-gtankan.patch 
Log Message:


anthy-enable-dict-gtankan.patch:

--- NEW FILE anthy-enable-dict-gtankan.patch ---
diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in
--- anthy-9100b.orig/mkworddic/dict.args.in	2007-09-16 21:38:40.000000000 +0900
+++ anthy-9100b/mkworddic/dict.args.in	2007-09-18 19:53:52.000000000 +0900
@@ -10,9 +10,9 @@
 read @top_srcdir@/alt-cannadic/gcanna.ctd
 #
 read @top_srcdir@/alt-cannadic/gcannaf.ctd
-#read @top_srcdir@/alt-cannadic/gtankan.ctd
+read @top_srcdir@/alt-cannadic/gtankan.ctd
 #
-read @top_srcdir@/mkworddic/gtankan.ctd
+#read @top_srcdir@/mkworddic/gtankan.ctd
 read @top_srcdir@/mkworddic/adjust.t
 read @top_srcdir@/mkworddic/name.t
 read @top_srcdir@/mkworddic/compound.t



From fedora-extras-commits at redhat.com  Tue Sep 18 11:26:01 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 18 Sep 2007 07:26:01 -0400
Subject: rpms/traceroute/devel .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 traceroute.spec, 1.33, 1.34
Message-ID: <200709181126.l8IBQ15L017554@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/traceroute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17510

Modified Files:
	.cvsignore sources traceroute.spec 
Log Message:
* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 3:2.0.8-1
- upgrade to new upstream traceroute-2.0.8
- fixed traceroute.8 install source path and traceroute6.8 link source
- fixed typo in Source0 URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Aug 2007 14:56:47 -0000	1.10
+++ .cvsignore	18 Sep 2007 11:25:28 -0000	1.11
@@ -1 +1 @@
-traceroute-2.0.7.tar.gz
+traceroute-2.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Aug 2007 14:56:47 -0000	1.11
+++ sources	18 Sep 2007 11:25:28 -0000	1.12
@@ -1 +1 @@
-40011b06c5b83116dcf140878def8810  traceroute-2.0.7.tar.gz
+d3dedd19c4d72d3251384ff9d53476ad  traceroute-2.0.8.tar.gz


Index: traceroute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- traceroute.spec	28 Aug 2007 12:24:35 -0000	1.33
+++ traceroute.spec	18 Sep 2007 11:25:28 -0000	1.34
@@ -1,12 +1,12 @@
 Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
-Version: 2.0.7
+Version: 2.0.8
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL:  http://traceroute.sourceforge.net
-Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tag.gz
+Source0: http://dl.sourceforge.net/traceroute/traceroute-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -41,8 +41,10 @@
 popd
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m644 traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8
+install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
+pushd $RPM_BUILD_ROOT%{_mandir}/man8
+ln -s traceroute.8 traceroute6.8
+popd
 
 
 %clean
@@ -57,6 +59,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 3:2.0.8-1
+- upgrade to new upstream traceroute-2.0.8
+- fixed traceroute.8 install source path and traceroute6.8 link source
+- fixed typo in Source0 URL
+
 * Tue Aug 28 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
 - Change URL and Source0 (upstream is at SourceForge now)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 11:26:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 18 Sep 2007 07:26:30 -0400
Subject: rpms/iptraf/devel iptraf.spec,1.26,1.27
Message-ID: <200709181126.l8IBQUcO017594@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iptraf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17531

Modified Files:
	iptraf.spec 
Log Message:
Remove / in the url.



Index: iptraf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- iptraf.spec	24 Aug 2007 07:59:28 -0000	1.26
+++ iptraf.spec	18 Sep 2007 11:25:58 -0000	1.27
@@ -4,7 +4,7 @@
 Release: 7%{?dist}
 Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 Source1: iptraf 
-URL: http://iptraf.seul.org/
+URL: http://iptraf.seul.org
 Patch0: iptraf-2.4.0-Makefile.patch
 Patch1: iptraf-2.7.0-install.patch
 Patch2: iptraf-2.7.0-doc.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 12:31:22 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 08:31:22 -0400
Subject: rpms/plague/devel plague.spec,1.30,1.31
Message-ID: <200709181231.l8ICVMmS024762@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24690

Modified Files:
	plague.spec 
Log Message:
* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
- Add dirs /etc/plague and /usr/share/plague to plague-common
  since "plague-builder" and "plague" use them (#233904).



Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plague.spec	17 Dec 2006 18:18:25 -0000	1.30
+++ plague.spec	18 Sep 2007 12:30:49 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -125,6 +125,8 @@
 %files common
 %defattr(-, root, root)
 %doc README ChangeLog
+%dir %{_sysconfdir}/%{name}
+%dir %{_datadir}/%{name}
 %dir /usr/lib/python?.?/site-packages/%{name}
 /usr/lib/python?.?/site-packages/%{name}/*.py*
 
@@ -150,6 +152,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Michael Schwendt <mschwendt at users.sf.net> - 0.4.4.1-5
+- Add dirs /etc/plague and /usr/share/plague to plague-common
+  since "plague-builder" and "plague" use them (#233904).
+
 * Fri Dec 15 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.4.1-4
 - Small fix for a change in python 2.5's xmlrpc library.  The patch has been
   upstreamed.



From fedora-extras-commits at redhat.com  Tue Sep 18 12:37:29 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 08:37:29 -0400
Subject: rpms/pwlib/devel .cvsignore, 1.19, 1.20 pwlib.spec, 1.47,
	1.48 sources, 1.19, 1.20
Message-ID: <200709181237.l8ICbT4k024971@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24924

Modified Files:
	.cvsignore pwlib.spec sources 
Log Message:
- Update to 1.10.10
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	15 Apr 2007 20:38:04 -0000	1.19
+++ .cvsignore	18 Sep 2007 12:36:57 -0000	1.20
@@ -4,3 +4,4 @@
 pwlib-1.10.5.tar.gz
 pwlib-1.10.6.tar.gz
 pwlib-1.10.7.tar.gz
+pwlib-1.10.10.tar.gz


Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pwlib.spec	15 Apr 2007 20:38:04 -0000	1.47
+++ pwlib.spec	18 Sep 2007 12:36:57 -0000	1.48
@@ -1,6 +1,6 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.7
+Version:	1.10.10
 Release:        1%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
+- Update to 1.10.10
+
 * Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 1.10.7-1
 - Update to 1.10.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Apr 2007 20:38:04 -0000	1.19
+++ sources	18 Sep 2007 12:36:57 -0000	1.20
@@ -1 +1 @@
-29c061328e93bda77423edb8bdabbddd  pwlib-1.10.7.tar.gz
+abebf45332e70772ffa876d31975d4b9  pwlib-1.10.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 12:38:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 08:38:52 -0400
Subject: rpms/php/F-7 php-5.2.4-easter.patch, NONE,
	1.1 php-5.2.4-gnusrc.patch, 
	NONE, 1.1 php-5.2.4-norpath.patch, NONE,
	1.1 php-5.2.4-odbc.patch, NONE, 1.1 php-5.2.4-tests-dashn.patch,
	NONE, 1.1 .cvsignore, 1.30, 1.31 php.spec, 1.140, 1.141 sources,
	1.33, 1.34 php-4.3.1-odbc.patch, 1.1,
	NONE php-5.0.0-easter.patch, 1.4, NONE php-5.0.4-norpath.patch,
	1.1, NONE php-5.0.4-tests-dashn.patch, 1.6,
	NONE php-5.1.4-gnusrc.patch, 1.3, NONE
Message-ID: <200709181238.l8ICcqjw025114@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25031

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.4-easter.patch php-5.2.4-gnusrc.patch 
	php-5.2.4-norpath.patch php-5.2.4-odbc.patch 
	php-5.2.4-tests-dashn.patch 
Removed Files:
	php-4.3.1-odbc.patch php-5.0.0-easter.patch 
	php-5.0.4-norpath.patch php-5.0.4-tests-dashn.patch 
	php-5.1.4-gnusrc.patch 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
- update to 5.2.4


php-5.2.4-easter.patch:

--- NEW FILE php-5.2.4-easter.patch ---
--- php-5.2.4/main/logos.h.easter
+++ php-5.2.4/main/logos.h
@@ -491,386 +491,3 @@ static const unsigned char php_logo[] = 
 	102,  63, 251, 220, 139,  16,  65,  26,  16, 112, 
 	 21, 116, 187, 251, 221, 240, 142, 119, 188,   3, 
 	  1,   0,  59,   0 };
-
-static const unsigned char php_egg_logo[] = {
-	 71,  73,  70,  56,  57,  97, 120,   0,  67,   0, 
-	247,   0,   0,   0, 255,   0, 107, 114, 178,   0, 
-	  0,   0,  31,  31,  31, 255, 255, 255, 106, 113, 
-	176,  63,  63,  63, 127, 127, 127, 106, 112, 174, 
-	191, 191, 191, 105, 111, 171, 223, 223, 223, 239, 
-	239, 239, 144, 149, 197, 106, 111, 173, 245, 246, 
-	250, 105, 110, 170, 218, 219, 235,  47,  47,  47, 
-	162, 166, 206,  35,  36,  40, 153, 158, 202,  95, 
-	 95,  95, 175, 175, 175,  88,  93, 141, 159, 159, 
-	159, 116, 122, 182, 125, 131, 187, 143, 143, 143, 
-	 38,  38,  41, 104, 108, 167, 171, 175, 211, 105, 
-	109, 168, 102, 102, 153, 104, 108, 165,  45,  46, 
-	 58, 181, 184, 216, 111, 111, 111, 134, 140, 192, 
-	102, 108, 168,  79,  79,  79, 199, 202, 226,  40, 
-	 41,  49,  92,  98, 150,  53,  53,  63, 236, 237, 
-	245, 130, 130, 171, 122, 122, 160, 104, 107, 163, 
-	 50,  51,  67,  45,  45,  52, 207, 207, 207,  69, 
-	 72, 104,  15,  15,  15,  61,  61,  74, 227, 228, 
-	240,  59,  62,  86, 103, 106, 162, 107, 107, 139, 
-	 73,  77, 113, 102, 103, 156,  54,  56,  76,  97, 
-	103, 159, 137, 137, 182,  35,  35,  38, 190, 193, 
-	221, 145, 145, 193, 103, 105, 159,  78,  82, 122, 
-	 76,  76,  95, 147, 148, 200,  92,  92, 117, 105, 
-	105, 156, 103, 105, 160, 150, 150, 202,  64,  67, 
-	 95, 114, 114, 149, 108, 108, 159, 143, 143, 194, 
-	 84,  84, 106, 140, 140, 191, 102, 104, 157,  48, 
-	 48,  61,  27,  29,  42, 114, 114, 165,  83,  88, 
-	132, 153, 153, 204, 121, 126, 186, 127, 127, 178, 
-	208, 210, 230, 149, 149, 200, 146, 146, 197, 141, 
-	143, 197,  55,  55,  67, 144, 145, 199, 133, 133, 
-	184, 124, 124, 175, 110, 115, 171, 130, 133, 191, 
-	 88,  91, 137,  86,  92, 144, 154, 156, 172,  87, 
-	 92, 139,  85,  86, 125, 118, 123, 184, 121, 122, 
-	172, 124, 128, 187,  82,  86, 130,  39,  39,  46, 
-	 99,  99, 128,  69,  69,  85,  97, 101, 153,  75, 
-	 75, 107, 115, 121, 182, 135, 138, 194, 101, 107, 
-	165,  82,  84, 101, 102, 102, 140,  53,  57,  89, 
-	 69,  71, 101, 137, 137, 188, 109, 116, 179, 130, 
-	130, 182,  57,  57,  76,  93,  99, 155, 117, 117, 
-	168,  62,  63,  86,  84,  84, 122,  79,  79, 114, 
-	112, 117, 177,  58,  58,  71, 127, 131, 189, 106, 
-	106, 150,  76,  76, 101, 134, 135, 187,  20,  20, 
-	 31,  66,  71, 111, 125, 129, 182, 172, 173, 180, 
-	 86,  88, 131, 229, 230, 234, 108, 112, 171, 100, 
-	105, 161, 161, 165, 203,  53,  53,  70,  95,  97, 
-	146,  58,  60,  81, 217, 219, 234, 195, 196, 208, 
-	 82,  85, 125, 112, 118, 181,  82,  82, 106, 114, 
-	117, 175, 154, 157, 195, 134, 134, 179, 111, 111, 
-	162,   6,   7,  11, 110, 111, 146,  93,  93, 138, 
-	 77,  79, 116, 115, 119, 179, 103, 108, 161,  60, 
-	 64, 100,  98,  98, 145,  40,  40,  47,  51,  51, 
-	 63,  69,  69,  95,  73,  78, 122, 197, 198, 202, 
-	 54,  54,  58,  13,  14,  22, 108, 114, 174, 149, 
-	152, 184, 101, 108, 167,  88,  88, 130, 106, 108, 
-	162,  86,  91, 141,  84,  84, 116,  86,  86,  90, 
-	129, 131, 186, 132, 135, 181, 160, 163, 183, 211, 
-	212, 224,  91,  91, 123, 109, 109, 117, 104, 104, 
-	135,  86,  86, 115,  90,  92, 108,  81,  83, 122, 
-	103, 106, 130,  70,  70,  99, 121, 126, 170, 139, 
-	139, 186,  73,  74,  94, 109, 109, 148, 139, 140, 
-	189, 135, 138, 162, 176, 179, 199, 115, 115, 115, 
-	106, 106, 144,  59,  63,  98,  67,  69,  96, 241, 
-	241, 241, 102, 105, 149, 120, 120, 162,  68,  68, 
-	 90,  89,  89, 115,  51,  52,  79, 113, 113, 152, 
-	 33,  35,  55, 189, 190, 215,  79,  79, 104, 213, 
-	214, 218,  94,  95, 142, 163, 164, 176,  86,  89, 
-	133, 112, 112, 156,  80,  81, 118,  63,  65,  90, 
-	102, 103, 124, 126, 129, 157,  72,  72,  98, 150, 
-	150, 154,  72,  74, 100, 112, 112, 151, 138, 139, 
-	192, 122, 125, 180,  49,  50,  64,  78,  78, 110, 
-	119, 119, 157, 125, 126, 174,  77,  81, 119, 125, 
-	126, 180,  56,  56,  72, 118, 120, 173,  46,  49, 
-	 77,  92,  96, 132, 188, 189, 197,  65,  65,  81, 
-	165, 168, 200,  49,  51,  66, 143, 147, 194,  80, 
-	 82, 111, 192, 195, 215, 235, 235, 242, 105, 111, 
-	170,  74,  77, 107, 183, 186, 210, 109, 111, 165, 
-	117, 120, 152,  65,  66,  90, 182, 182, 186, 104, 
-	104, 137, 123, 127, 163, 170, 171, 187, 110, 113, 
-	163,  33, 249,   4,   1,   0,   0,   0,   0,  44, 
-	  0,   0,   0,   0, 120,   0,  67,   0,   0,   8, 
-	255,   0,   1,   8,  28,  72, 176, 160, 193, 131, 
-	  8,  19,  42,  92, 200, 176, 161, 195, 135,  16, 
-	 35,  74, 156,  72, 177, 162, 197, 139,  24,  51, 
-	106, 220, 200, 209, 162, 145,  43, 104, 188, 116, 
-	 28,  73, 210, 160,  23, 145,   8, 141,  24,  84, 
-	 50,  40, 128,  75,  17, 122, 228, 112,  65, 200, 
-	 69, 140, 146, 146,  56,  83, 170,   9, 144,   6, 
-	192,  11,  38,  69, 190, 209,  88,  82, 196, 134, 
-	141,   1,  44,   6,  40,  29,  64,  65,  30,  19, 
-	 29,  71, 138, 250, 137, 129, 163, 202, 157, 107, 
-	 99,  48,  96, 128, 246,  67, 200, 139,  23,  66, 
-	 62, 186, 212, 224,  36, 103, 206,  31,  58,  92, 
-	 56,  75, 214,  35, 198, 210, 183, 112, 153, 142, 
-	 88,  58, 231, 207,  11,  67, 113,  86, 172,  56, 
-	 65,  68,  91, 219, 185,  61, 226, 142, 160,  65, 
-	163, 199, 167,  81, 102,  71,   2,  69,  26, 119, 
-	169,  10,  28,  59, 180, 210, 216,  17, 137, 138, 
-	152,  60,   1, 180, 250,  72, 194,   3, 148,  75, 
-	151,   5,  16, 124, 254, 188,  98,   7, 156, 127, 
-	 24, 118, 196,  24, 209,  67, 138,  10,  32,  54, 
-	 92,   0, 224, 162,  50, 241,  68, 175,  79,  58, 
-	188, 165,  16,  99, 201, 142,  49, 145,  68, 143, 
-	254,  12,   1, 134, 112, 151,  30, 120, 136,  24, 
-	206, 252, 115,   1,  15,  10,  70,  43, 200,  17, 
-	125, 133, 190,  14,  29, 112,  84, 194,  99, 251, 
-	161, 144,  35,  50,  88, 232, 255,  30,  32, 136, 
-	 70,  21,  31, 159,  65,  68, 111,  94,  64, 196, 
-	122, 151,   8, 134, 228,  56, 222, 124, 180,   3, 
-	  8, 163, 219, 131,  24,  45,  26,   3, 133,   1, 
-	108,   0, 211,  29,  67,  58, 188, 213, 193,  17, 
-	226,  96, 246,  25,   2, 248, 213, 167,  64, 131, 
-	 38, 144,  16, 128,   7,  73,  68, 247, 203,  61, 
-	100, 212,   7, 154,   2,   5,  72, 231,  65, 135, 
-	205,  33, 176, 199,   0,  50,  44,  51, 224,  65, 
-	 46,  28,  17, 204,  82,  29,  20,   1, 134,  37, 
-	195,  21,   0,  34, 115,   5,  56,   0,  98,   5, 
-	  4,  16, 176, 205,  51, 235,  76,  33,  64,   2, 
-	 11, 112, 163, 161, 141, 252, 121,  64, 223, 112, 
-	 34, 240, 160, 128,  15,  49, 168, 224, 206,  15, 
-	 39,  10, 132, 214, 120,  20, 220,  81, 135,  17, 
-	104, 104, 200, 222, 140,   1,  68, 144, 163,   4, 
-	 40,  24,  80,   2,   7,  12,  92,  96,  71, 125, 
-	 92,   6, 160, 128,   3,  67,  14, 225, 193, 104, 
-	107,  12, 208, 129,  14,  39, 230, 166,  20,   5, 
-	 75, 180, 194,  67,  35,  90, 246, 233, 146,   3, 
-	  4, 160,  34,  64,   6,  18,  28,  48,  64,  13, 
-	  7,  28, 128, 136, 159,   8, 176, 137,  38,  12, 
-	 57, 164, 169, 192,  24,  50,  12,  96, 195,  11, 
-	 98,  92, 129, 210,  72,  66,  60, 241,  22,  14, 
-	 39,  40,  32,  66, 154, 126,  50,   7,  65,  38, 
-	  4,  36,  32, 192, 170, 172,  94,  96,  64, 134, 
-	 26, 202, 255,  72, 234, 103, 211,  57, 202, 220, 
-	 42, 216,  28, 161, 212,   8,  24,   4, 242, 197, 
-	108,  55, 105, 228,  66,  82, 187,  98, 160, 230, 
-	145, 165,  14, 135,  64, 116,  94,  30, 192,  42, 
-	171,  51, 164, 146,  44, 123,  48,  52,  88, 159, 
-	  8,  81, 160, 225, 131, 106,  20,   0,  81, 138, 
-	 61,  43,  88, 178,   5,  70,  46, 216,  57,   0, 
-	 17, 206, 185,  52,  65,   5,  13,  76, 240, 129, 
-	 75,  13, 108,  80, 170, 140,   1, 108, 240, 229, 
-	179, 171,  18,  48, 197, 180,  46, 201,  27,  64, 
-	 60,  31, 126, 166, 193,   6, 241, 194, 151, 196, 
-	126,  11, 230,  64,  68,  96,   3, 224,  64, 142, 
-	 38,  22, 233,  48,  94, 195,  39,  12,  23,  68, 
-	142,  24,  63, 144, 241,   3,  17, 100,  65, 194, 
-	186, 239,  54, 215,  64, 170, 248,  10,  32, 193, 
-	 12, 103,  38, 107, 130, 151,  26,  19, 112,  67, 
-	203,  45, 231, 248,  64,  11, 244,  68, 160, 193, 
-	103,  30,  32,  28, 128,  15, 107, 248,  81,  41, 
-	 11, 109,  12, 163,   6,  26, 181,  49,  36,  68, 
-	 17,  75,  45,  81,  49, 115,  24,  99,  60, 131, 
-	 53, 138,  36, 144, 128, 151,  77,  19, 208, 194, 
-	  4,  19, 220, 252, 153, 151,  18, 148,  92, 194, 
-	 12, 167,  36, 187,  65, 204,  78,  75, 157, 192, 
-	 62, 101, 164, 173,   8,   3,  26, 183, 240,  64, 
-	 10, 180, 164,  25,   5,  18, 122, 180, 161,  27, 
-	  5,  59,   4,  16,  70,  89,  11,  13, 255, 187, 
-	 20, 186, 245, 229,  24, 230,   0,  37,  11, 112, 
-	200,  20, 116, 224, 114,   0, 153,  24, 167, 208, 
-	 64,   0,  56, 102,  80, 248,   0,  12,  80,  18, 
-	  1,  49, 249, 188,  67,  66,  10,  17, 180, 144, 
-	227,  13,  89,  76,   0,  57,   1,  12,  36, 144, 
-	193,   1,   6, 212,  80, 248, 179,   6,  44, 128, 
-	113,  11, 143, 127,  38,   2,  22,  86, 200,  81, 
-	 15,  13,  74, 173,  17,  69,  31, 125, 143, 183, 
-	  3, 224,  34,  19, 176, 192, 234, 171, 215, 144, 
-	193,   2, 174,  63,  80, 193,   4,   4, 200, 178, 
-	186,   1,  82,  51,  48,  67, 244,  57,  74, 125, 
-	 64,   2,  86, 147,  64, 128, 179, 196, 175, 110, 
-	193,   1,  12,  48, 208, 130, 115,  81, 224,  19, 
-	199, 103,  59,  12, 160, 130,  35, 220,  37,  36, 
-	 68, 165,  20,  24, 171,  37, 243, 220, 119,  63, 
-	 57,  10,   4,   4, 113, 177,   5, 246, 219, 127, 
-	 64, 142,  11,  80,  93, 255, 188,  71,   0, 151, 
-	 64,  32,  10,  58, 251,  12,  96,  54, 161,  16, 
-	 55, 168, 111, 105,  90, 202, 130, 170,   6, 184, 
-	186,  11,  20, 227,   3,   4,  48,   0,   5, 137, 
-	231,  58,  13, 110, 176, 100,  23,  56,   0,  44, 
-	146,  48, 170, 230, 156,  64,   5,   3,   0,  68, 
-	 66, 152, 160, 148, 188, 245, 201,  94, 245, 251, 
-	224, 170,  36,  80,   2,   1, 148, 129,   0, 116, 
-	144,  33, 190, 106, 224,  58,  29, 226, 235,   0, 
-	 22,  56,   4, 178, 255, 136, 195,  11,  10, 140, 
-	 32,  33, 149, 194,  65, 169,  82, 176, 189, 146, 
-	 89,  32,  71,  28, 176,  31,  13,  19,  69, 128, 
-	 93, 248, 144,  85,   6, 200, 209, 234,  74, 144, 
-	168,  68,  89,  64,   2, 252,  43, 220,  12,   4, 
-	176,  40, 230,  32,   0,  58,  39,   8, 204,  49, 
-	 14, 210, 137,   7, 150, 170,   2,  15, 136, 161, 
-	  0,   6, 208, 180,   4, 132, 201,   2,   9, 224, 
-	 64,   6,   8, 199,  42, 227,  93,   0, 135, 221, 
-	 59,  64,   6, 164,  70, 168, 194, 145, 169, 112, 
-	 25, 168,  26, 198,  22, 144,   0,  62, 178, 202, 
-	  2,   6,  80, 133, 169, 172, 181, 130,   1,  72, 
-	161,  32,  74,  80, 131,  91,  98,   0, 154,  62, 
-	153,  32, 142,  37,  91,  64,   4, 194,  64,  53, 
-	140, 205, 131,  17,  12, 112, 164,   0, 178, 168, 
-	175, 213, 161, 192, 117, 110, 187,   1,   1,  46, 
-	 80,  50, 202, 209,  50, 148,   4, 200,  68,   5, 
-	150,  87, 129,  15,  76, 128,  21,  11, 136, 226, 
-	179,   6, 160,  42,  62,  56, 135,  67, 206, 201, 
-	193,   0, 186,  64,  16,  35, 196, 161,  10,  74, 
-	 89, 129,   3, 134,  56,  28,  38, 170,  50,  95, 
-	 65,   8, 128,   6,  76, 128, 181, 130, 137, 130, 
-	  3, 194, 100,  85,  15,  87, 103, 181,  10, 184, 
-	  4,  71,  97, 124,  22,   7,   8, 208, 181,  80, 
-	222, 160,  57, 124,  64, 193,  45, 159, 149,   1, 
-	  3, 172, 225,  79, 244,  81,  64,   8,  66, 208, 
-	255, 133,   1,  64,  73,  32,  87,   8,  64,  96, 
-	128,   0, 130,  89,  13,   7,  71,  99, 220,  33, 
-	  1,  98, 215,  28,  78,  44,  64, 149, 210,  91, 
-	157,   4,   8,  16, 178,   0,  92, 236, 154,   2, 
-	 32,  29,  57, 179, 201,  28, 100, 160,  32, 156, 
-	172, 170, 167,  29, 232,  21, 163,  38,  64, 193, 
-	  5,   3, 160, 147,  64,  90, 178, 201, 100, 121, 
-	169, 134, 248, 202, 162,   9, 234, 195, 135,  31, 
-	 61,  11, 127, 146,  43,  92,   9,  22, 250, 153, 
-	 27,  48, 160, 112,  36, 171,  37,   1, 180, 198, 
-	 31,  81, 212,  96, 158, 226, 148,   0, 172, 154, 
-	 19, 130,  45, 164, 161,  20,  69,  32, 136,  58, 
-	148, 178,   4, 246,  12, 199,  94, 236,  44,  89, 
-	 13, 120, 122, 213,   6, 244, 194,   0,  72, 237, 
-	 96,   5,   9,  48,  83, 151,   4, 149, 117, 194, 
-	 43,  92,  22, 253,  37, 176,  10, 212, 194,   2, 
-	 72,  21, 128,   5, 102,  16, 141, 250, 196, 103, 
-	  8, 129,  56, 129, 250, 248,   6,   0,  77,  40, 
-	165,  10, 195, 153,  38, 115,  48,  56, 188, 146, 
-	101,  81,  66,   7, 157, 101,   9,  60,  40,   0, 
-	252,  77, 176, 112,  12,  40, 224, 103,  64,  25, 
-	 83,  45, 150, 108, 162,  12,  29, 139, 240,  12, 
-	208, 206,  86, 149,  96, 169, 163, 241,   0,   2, 
-	 93, 162, 215,   1,  80,  97,  32,  47,  80, 138, 
-	 25,  62, 115, 159,  52, 117,  72, 150,  32, 197, 
-	 34,   1, 204,  57, 154,  13, 255, 120,  41, 174, 
-	255, 235, 172,  66,  37, 235, 146,   7, 164,  83, 
-	182,   4,  80, 235, 108, 135,  35, 203, 194, 226, 
-	139,   1, 251,  82,  22,   9, 103,  84,   0, 165, 
-	212,   1, 181,  74, 169, 134, 140, 220, 147,  31, 
-	 71, 105, 224,  94, 134, 165, 104,  53,   9, 224, 
-	141, 146,  97, 143, 120,  89, 140, 192, 104,  50, 
-	232,  53, 203,  86, 150, 182, 218, 212,  94,  59, 
-	 10, 247,  63, 118,  12, 199,   3, 243,  25,  13, 
-	  4,  66, 160,  20,  38,  64, 119,   0,  80, 248, 
-	  2,  12, 152, 171, 128, 227, 140, 236, 167, 133, 
-	123,  98,  10,  76, 240,   1,  13,  84,  64, 150, 
-	182, 224,   4, 190, 240,  23, 220,  45,  18,  64, 
-	188, 240, 106,  48, 190, 254, 104, 220, 103, 253, 
-	239,   3,  38, 104,  64,   3,  60, 247,   0,  31, 
-	225, 139, 114, 148, 200,  15, 117, 237,  51, 132, 
-	 38, 116, 129,   5,   4,  73, 237,   0, 172,  32, 
-	  6, 249,  38,  48,   0, 218, 203, 169, 119, 101, 
-	214,  52,  70, 232, 118,  85, 137, 148, 240, 140, 
-	 57,  26, 128, 145,   1, 117, 150, 144, 205, 145, 
-	231, 114, 196,   0, 198, 222, 148,   1, 161, 160, 
-	149, 181,  98, 244,   5,  22, 216, 128,  32, 186, 
-	 90, 113,  64, 213, 100,  28, 230, 104,  79, 142, 
-	143,  44,  93,   6,  46, 144,  72,   6, 220, 120, 
-	 85, 216, 211,  49, 190, 114,  84,  81,  31,  87, 
-	182, 137, 184,   4,  18,   7,  92, 247,  91, 122, 
-	166,   0, 255,  52,  68, 178, 171,  47,   6, 240, 
-	  4,  40,  15, 192,  13,  86,  80,  66,  24,  96, 
-	240, 166, 230, 104, 175, 205, 196, 147, 128,   0, 
-	241, 181, 211,  28,  97, 116, 149,  57,  42, 107, 
-	  0, 152,  87, 178, 117, 146, 183, 150,  95,  22, 
-	174, 232,  72, 234,  32,  30, 176,  97,   0,  71, 
-	 32,  72,  27, 148, 226,   2,  43, 204, 194, 160, 
-	 48, 126, 244,  21,  89,  41,  56, 246,  90, 109, 
-	 52, 102, 126, 150, 235, 196, 172,  67, 215,  17, 
-	245,  81,  33, 128, 131,  82,  84,  42,  16,  21, 
-	243,  99, 202,  26, 194, 145, 145, 101,  72, 185, 
-	252, 229,   8, 203,  63,  34,   0,  98,  63,  35, 
-	102,  58, 158, 213, 135,  59, 125, 179, 150,  20, 
-	192, 131,  16, 128,  33,  23,  36,  42, 200,  15, 
-	148,   2,  60,  13, 141, 108, 215,   3,  52, 192, 
-	245,   8, 240, 128, 172, 253, 250, 199, 108,  53, 
-	235, 153, 129,  77, 193, 137,  62,  32, 220, 102, 
-	228,   1,  18,  78,  90,  41,  55,  96,  82,  41, 
-	 52, 232, 100, 125, 236, 133, 109,  11, 112, 160, 
-	139, 248,  30, 228, 235,  10, 108,  86,   2,   0, 
-	 58, 139, 239,  28, 141,   9,  26,  60,   0,  49, 
-	133,  25,   5,  37,  67, 193,   1,  34, 221, 199, 
-	255, 221, 224, 213,  14, 130, 130,  21, 142,  50, 
-	  0, 217,  16,  36,  20,  74, 193,   1,   2, 168, 
-	169, 174, 172, 170,  83, 145,  85, 123, 155, 162, 
-	251, 205, 129, 107, 174, 179, 162,  17, 255,   6, 
-	185, 199,  89,  85, 104, 225, 113,  96, 112, 171, 
-	 50, 128,   5,  50,  16,  89, 101, 251,   9,   2, 
-	 77, 120, 129, 110,  80,  92, 144,  60,  40, 133, 
-	 20, 160, 118, 137, 151,  74, 150, 163, 126, 132, 
-	 97, 166,  19, 120,  68,  34, 208,  61, 156, 166, 
-	205, 224, 229,   6, 104,  29, 111,  71,  67, 130, 
-	  8, 164, 128,   4,  13, 208, 192, 134,   1, 252, 
-	172, 200, 222, 192,  31, 212,  80,  57, 183, 179, 
-	 86,  42,  16, 132, 160,   9,  72,  43, 130,  16, 
-	 12, 194,   5,  72,  68, 179,  79,  17, 120, 236, 
-	170, 182, 202,  85,   6,   5, 221,  37,   4, 214, 
-	192,   7, 200,  38, 236, 100,  61,  64, 238, 249, 
-	226, 170, 134, 179,  16, 129,  32, 124, 128,   4, 
-	 31, 168,   0, 196,  53,   4, 131,  16, 108,   2, 
-	 28,  74, 249, 167,  65, 152, 145, 241, 252,  28, 
-	105,  18, 128, 103, 165,   9,  10, 160,  30, 126, 
-	225, 253,   6,  17,  32,  48, 122, 251,  52,  50, 
-	152,  62,  43,  71, 139, 247, 188,  75, 134, 224, 
-	108,  38,  36, 229, 201,   9, 241, 212, 185,   2, 
-	 80,  35,  46,  41,   0,   6, 152, 175, 108,  11, 
-	 64, 208, 103, 213, 251,  62,   0, 214,  36, 122, 
-	 22, 126, 207,  28,  71, 196, 130,  88,  44,  88, 
-	123,  66,  92,  80, 169,   1, 220,  97,  14, 252, 
-	201,   1, 126, 254,  94,  89, 105, 216, 138, 248, 
-	252, 178, 151, 140,  79, 111, 115, 236, 175,  96, 
-	 46,  74, 177, 129, 255, 242,  21, 242, 131, 241, 
-	196,  96,   7,  39,  40,   0,  12, 246, 171,  77, 
-	 32, 163,  85, 116,  67, 194, 126, 125, 152, 136, 
-	237, 140,  14, 219, 247,  39, 160,   1,   5, 254, 
-	 35, 167,  54,  60, 228,  12, 252, 199,  20, 158, 
-	176,  28,  17, 102, 122,  49,  71,   0,  76, 247, 
-	 39, 215,  39, 127, 163,  17,   1,  92, 119,  83, 
-	  4,   0, 127, 190, 167, 127,  75, 193,   2,  76, 
-	 32, 121,  12, 225,   5,  59,   3, 126,  74, 161, 
-	  2,  61,  96,  44,  21, 144,  74, 171,  50,   0, 
-	112,  21,  89,  35,   7,  31,  16, 192,  37, 148, 
-	 38, 127, 204, 179,   0,  23, 176,   0, 211, 115, 
-	 58, 216, 147, 128, 125, 178,   2,  40, 180,  20, 
-	 50,  64, 107,  16, 161,   6,  10, 240,   6, 128, 
-	 32,   5, 112, 161,   2,  15,  48,   3, 139,  51, 
-	  3, 220,  22,   1, 133,  23,  35, 157, 231,  28, 
-	113,  22,  34, 170, 215,  46, 136,  87,   1, 143, 
-	192,  57,  17,  32, 129, 201,  98, 131,  75,   1, 
-	  4, 133, 208,   9,  22,  65,   5,  72, 128,   5, 
-	 90, 240,   2, 196, 162,  20, 198, 160,  12,   4, 
-	 16,  58,  52, 232,   1, 189, 231,  18, 107, 162, 
-	 33, 141, 130, 125,  10, 240,  30, 158, 151, 127, 
-	 55,   8,   4, 166,  96,  14,  35, 225,   2, 151, 
-	 64,  10, 111,  49,  24,  85,  96,   6,  24, 176, 
-	  2, 180,  82, 101,  74, 230, 134, 200, 244, 123, 
-	  8,  32,   2,  11,  56,  45,  62,   0, 126,  64, 
-	255,   0,   8,  96, 160,   5,  56, 145,   6, 127, 
-	 80,   8,  19,   3,  23,  49, 240,   9, 139, 160, 
-	 21, 198, 114,  70, 139,   8,  26,  75, 104,  87, 
-	 28, 215,  30, 107,  56,  47,  13, 178,   2, 252, 
-	183,   7, 132,  48,  46, 182, 225,   2,  20, 215, 
-	 24, 187, 225,   7, 130, 216,  28, 188, 167,  37, 
-	111, 168,  33,  32, 144,   4, 159, 168,  37,  32, 
-	192,   3,  67, 112,   2,  56, 192, 127, 205,   0, 
-	  5,  81,   2,   0, 104,  81,   4,  93,  32,   5, 
-	 50, 176,   7, 240,   0, 139,  31,  40,  29,  57, 
-	176, 139, 180, 215, 134,  14,  50,   4,   4,  56, 
-	 45,  10, 192, 122, 174,   0,   9, 252, 151,  14, 
-	194,  80, 140,   5, 177,   5,  84, 208,   7,  80, 
-	 32,   7,   1, 240,   6, 103, 144,  13,  56, 192, 
-	129,   3,  48,   2,  68,  48,   7, 124, 166,  37, 
-	 16, 240,  98, 249, 145,   3,  81, 112, 125,  43, 
-	 48,   6,  39, 128,  30,  39,  96,   6, 128,  40, 
-	 63,   5, 144,   3, 163,   0,   7, 151, 166,  20, 
-	 82,  64,   8, 146,   8, 142,   9, 129,   5,  33, 
-	128,   4, 232,  64,  90,  68, 192, 129,  64,  32, 
-	  9,  26, 114, 123,  28,  39,   2,  33, 144,   4, 
-	 46,  65,   4,  85,  16, 140,  76, 225,  22, 176, 
-	 40,   3,  64, 240,  22, 130, 112,   9, 124, 165, 
-	144,   9, 193, 138, 225, 160,  51, 139,  80, 144, 
-	187, 178,   4, 242, 227,   3,   8,  80,  45, 204, 
-	 33,  63,  16, 208, 108, 103, 190,  48,  14,  20, 
-	160,   2,  32,   9, 139,  62, 249,   4,  24, 136, 
-	146,  14,  97,   8, 129,   0,   1,  67, 192,   3, 
-	  5, 128,  59,  65, 200,  20,  75, 176,   4,  52, 
-	192, 142, 112,   1,   4, 205,  23, 132,  43,  80, 
-	  9, 158,  16,   2, 124, 114, 142, 103, 240,   7, 
-	221, 160,   3,  58, 192,   4,  47,  32, 148,  21, 
-	225,   4,  72, 128,   4, 152, 224,  18,  62,  32, 
-	  9,   1, 232, 147,  62, 217,   1,  70,  49,  13, 
-	186,  80,  14, 137, 160,   0,  73, 112, 118,  95, 
-	160,   4, 152, 144,   3,  13, 137,   5,  98, 201, 
-	 17,  70,   0,  10,  55,  25,   2,   8, 224,   3, 
-	231,  32,   5,  82, 208,   5,  50, 208,   1, 196, 
-	  2,   4, 130,  96,   3,  71, 224,   6, 183,  80, 
-	  7,  47,  96, 113,   7,   1,   6,  84,   0, 134, 
-	  2, 225,   4, 125, 144,   6,   9, 217, 151,  27, 
-	225,   4,  77, 208,   4, 119, 249,  10,  13, 169, 
-	  7,   4, 129,   5,  84, 208,  62, 158, 185, 154, 
-	  8, 177,   5,  80, 208, 153, 172,  25, 155, 178, 
-	 57, 155, 180,  41, 148,   1,   1,   0,  59,   0 };
--- php-5.2.4/main/php_logos.c.easter
+++ php-5.2.4/main/php_logos.c
@@ -56,7 +56,6 @@ int php_init_info_logos(void)
 		return FAILURE;
 
 	php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
-	php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
 	php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
 
 	return SUCCESS;
--- php-5.2.4/ext/standard/info.c.easter
+++ php-5.2.4/ext/standard/info.c
@@ -1058,21 +1058,7 @@ PHP_FUNCTION(phpcredits)
  */
 PHPAPI char *php_logo_guid(void)
 {
-	char *logo_guid;
-
-	time_t the_time;
-	struct tm *ta, tmbuf;
-
-	the_time = time(NULL);
-	ta = php_localtime_r(&the_time, &tmbuf);
-
-	if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
-		logo_guid = PHP_EGG_LOGO_GUID;
-	} else {
-		logo_guid = PHP_LOGO_GUID;
-	}
-
-	return estrdup(logo_guid);
+	return estrdup(PHP_LOGO_GUID);
 
 }
 /* }}} */
@@ -1103,18 +1089,6 @@ PHP_FUNCTION(php_real_logo_guid)
 }
 /* }}} */
 
-/* {{{ proto string php_egg_logo_guid(void)
-   Return the special ID used to request the PHP logo in phpinfo screens*/
-PHP_FUNCTION(php_egg_logo_guid)
-{
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
-	}
-
-	RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
-}
-/* }}} */
-
 /* {{{ proto string zend_logo_guid(void)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
--- php-5.2.4/ext/standard/info.h.easter
+++ php-5.2.4/ext/standard/info.h
@@ -51,7 +51,6 @@
 #endif /* HAVE_CREDITS_DEFS */
 
 #define PHP_LOGO_GUID		  "PHPE9568F34-D428-11d2-A769-00AA001ACF42"
-#define PHP_EGG_LOGO_GUID	"PHPE9568F36-D428-11d2-A769-00AA001ACF42"
 #define ZEND_LOGO_GUID		"PHPE9568F35-D428-11d2-A769-00AA001ACF42"
 #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
 
@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits);
 PHP_FUNCTION(php_logo_guid);
 PHP_FUNCTION(php_real_logo_guid);
 PHP_FUNCTION(zend_logo_guid);
-PHP_FUNCTION(php_egg_logo_guid);
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
--- php-5.2.4/ext/standard/basic_functions.c.easter
+++ php-5.2.4/ext/standard/basic_functions.c
@@ -1753,10 +1753,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_real_log
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
-ZEND_END_ARG_INFO()
-
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
@@ -3135,7 +3131,6 @@ zend_function_entry basic_functions[] = 
 	PHP_FE(phpcredits,														arginfo_phpcredits)
 	PHP_FE(php_logo_guid,													arginfo_php_logo_guid)
 	PHP_FE(php_real_logo_guid,												arginfo_php_real_logo_guid)
-	PHP_FE(php_egg_logo_guid,												arginfo_php_egg_logo_guid)
 	PHP_FE(zend_logo_guid,													arginfo_zend_logo_guid)
 	PHP_FE(php_sapi_name,													arginfo_php_sapi_name)
 	PHP_FE(php_uname,														arginfo_php_uname)

php-5.2.4-gnusrc.patch:

--- NEW FILE php-5.2.4-gnusrc.patch ---
--- php-5.2.4/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.4/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
--- php-5.2.4/main/streams/streams.c.gnusrc
+++ php-5.2.4/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/cast.c.gnusrc
+++ php-5.2.4/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.4/main/streams/memory.c.gnusrc
+++ php-5.2.4/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.4/main/php.h.gnusrc
+++ php-5.2.4/main/php.h
@@ -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"
--- php-5.2.4/ext/standard/file.c.gnusrc
+++ php-5.2.4/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- php-5.2.4/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.4/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- php-5.2.4/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.4/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.4 2007/05/08 12:08:17 dmitry Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.h"
--- php-5.2.4/ext/interbase/interbase.c.gnusrc
+++ php-5.2.4/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- php-5.2.4/configure.in.gnusrc
+++ php-5.2.4/configure.in
@@ -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 -------------------------------------------------------------------------
 

php-5.2.4-norpath.patch:

--- NEW FILE php-5.2.4-norpath.patch ---
--- php-5.2.4/acinclude.m4.norpath
+++ php-5.2.4/acinclude.m4
@@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
 dnl internal, don't use
 AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
   PHP_RUN_ONCE(LIBPATH, $1, [
+    test "x$PHP_RPATH" != "xno" &&
     test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
     LDFLAGS="$LDFLAGS -L$1"
     PHP_RPATHS="$PHP_RPATHS $1"
@@ -451,6 +452,7 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
     ],[
       if test "$ext_shared" = "yes"; then
         $2="-L$ai_p [$]$2"
+        test "x$PHP_RPATH" != "xno" && \
         test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
       else
         _PHP_ADD_LIBPATH_GLOBAL([$ai_p])

php-5.2.4-odbc.patch:

--- NEW FILE php-5.2.4-odbc.patch ---
--- php-5.2.4/ext/odbc/config.m4.odbc
+++ php-5.2.4/ext/odbc/config.m4
@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,,
     PHP_ODBC_CHECK_HEADER(sqlext.h)
     AC_DEFINE(HAVE_UNIXODBC,1,[ ])
     AC_MSG_RESULT([$ext_output])
+    ODBC_SHARED_LIBADD="-lodbc -lodbcpsql"
+    PHP_SUBST(ODBC_SHARED_LIBADD)
   fi
 fi
 

php-5.2.4-tests-dashn.patch:

--- NEW FILE php-5.2.4-tests-dashn.patch ---
--- php-5.2.4/ext/standard/tests/file/bug26615.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
 $out = array();
 $status = -1;
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
 } else {
-	exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+	exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
 }
 print_r($out);
 ?>
--- php-5.2.4/ext/standard/tests/file/proc_open01.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
 	die("no php executable defined");
 } 
 $proc = proc_open(
-	$php,
+	$php . " -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
 	$pipes
 );
--- php-5.2.4/ext/standard/tests/file/bug26938.phpt.tests-dashn
+++ php-5.2.4/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($php . ' -r \'' 
+	exec($php . ' -n -r \'' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
 	     . '  print "\n";'
 	     . '}\'', $out, $status);
 } else {
-	exec($php . ' -r "' 
+	exec($php . ' -n -r "' 
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
--- php-5.2.4/Makefile.global.tests-dashn
+++ php-5.2.4/Makefile.global
@@ -63,7 +63,7 @@ install-headers:
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	8 May 2007 12:06:37 -0000	1.30
+++ .cvsignore	18 Sep 2007 12:38:19 -0000	1.31
@@ -5,5 +5,5 @@
 XML_RPC-1.4.4.tgz
 XML_Parser-1.2.7.tgz
 Mail-1.1.9.tgz
-php-5.2.2
-php-5.2.2.tar.gz
+php-5.2.4
+php-5.2.4.tar.gz


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- php.spec	10 Jul 2007 16:31:27 -0000	1.140
+++ php.spec	18 Sep 2007 12:38:19 -0000	1.141
@@ -5,7 +5,7 @@
 
 Summary: The PHP HTML-embedded scripting language
 Name: php
-Version: 5.2.3
+Version: 5.2.4
 Release: 1%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
@@ -16,23 +16,23 @@
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.1.4-gnusrc.patch
+Patch1: php-5.2.4-gnusrc.patch
 Patch2: php-4.3.3-install.patch
-Patch3: php-5.0.4-norpath.patch
+Patch3: php-5.2.4-norpath.patch
 Patch5: php-5.0.2-phpize64.patch
 Patch8: php-5.2.0-includedir.patch
 
 # Fixes for extension modules
-Patch21: php-4.3.1-odbc.patch
+Patch21: php-5.2.4-odbc.patch
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.2.2-pdosym.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
-Patch31: php-5.0.0-easter.patch
+Patch31: php-5.2.4-easter.patch
 
 # Fixes for tests
-Patch50: php-5.0.4-tests-dashn.patch
+Patch50: php-5.2.4-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -678,6 +678,9 @@
 %files mssql -f files.mssql
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
+- update to 5.2.4
+
 * Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7
 - obsolete php-dbase
 - add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	10 Jul 2007 16:31:27 -0000	1.33
+++ sources	18 Sep 2007 12:38:19 -0000	1.34
@@ -1 +1 @@
-df79b04d63fc4c1ccb6d8ea58a9cf3ac  php-5.2.3.tar.gz
+0826e231c3148b29fd039d7a8c893ad3  php-5.2.4.tar.gz


--- php-4.3.1-odbc.patch DELETED ---


--- php-5.0.0-easter.patch DELETED ---


--- php-5.0.4-norpath.patch DELETED ---


--- php-5.0.4-tests-dashn.patch DELETED ---


--- php-5.1.4-gnusrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:15 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 08:39:15 -0400
Subject: rpms/php/F-7 php.spec,1.141,1.142
Message-ID: <200709181239.l8ICdFLI025154@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25089

Modified Files:
	php.spec 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4-1.fc7
- update to 5.2.4



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-7/php.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- php.spec	18 Sep 2007 12:38:19 -0000	1.141
+++ php.spec	18 Sep 2007 12:38:43 -0000	1.142
@@ -678,7 +678,7 @@
 %files mssql -f files.mssql
 
 %changelog
-* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 5.2.4-1.fc7
 - update to 5.2.4
 
 * Mon Jul  2 2007 Joe Orton <jorton at redhat.com> 5.2.3-1.fc7



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:37 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Tue, 18 Sep 2007 08:39:37 -0400
Subject: rpms/ocaml-pcre/devel .cvsignore, 1.2, 1.3 ocaml-pcre.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200709181239.l8ICdbRh025216@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25120/devel

Modified Files:
	.cvsignore ocaml-pcre.spec sources 
Log Message:
* Tue Sep 18 2007 Richard W.M. Jones <rjones at redhat.com> - 5.12.2-1
- New upstream version 5.12.2.
- Clarified license is LGPLv2.
- Strip .so file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Aug 2007 17:40:11 -0000	1.2
+++ .cvsignore	18 Sep 2007 12:39:04 -0000	1.3
@@ -1 +1 @@
-pcre-ocaml-5.11.4.tar.gz
+pcre-ocaml-5.12.2.tar.gz


Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-pcre.spec	6 Sep 2007 15:33:11 -0000	1.4
+++ ocaml-pcre.spec	18 Sep 2007 12:39:04 -0000	1.5
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-pcre
-Version:        5.11.4
-Release:        9%{?dist}
+Version:        5.12.2
+Release:        1%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://www.ocaml.info/home/ocaml_sources.html
-Source0:        http://www.ocaml.info/ocaml_sources/pcre-ocaml-5.11.4.tar.gz
+Source0:        http://www.ocaml.info/ocaml_sources/pcre-ocaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
@@ -46,6 +46,7 @@
 %else
 make -C lib byte-code-library
 %endif
+strip lib/dll*.so
 
 
 %install
@@ -88,6 +89,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Richard W.M. Jones <rjones at redhat.com> - 5.12.2-1
+- New upstream version 5.12.2.
+- Clarified license is LGPLv2.
+- Strip .so file.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 5.11.4-9
 - Force rebuild because of updated requires/provides scripts in OCaml.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Aug 2007 17:40:11 -0000	1.2
+++ sources	18 Sep 2007 12:39:04 -0000	1.3
@@ -1 +1 @@
-6d5b1f4073b8a8b08cb323112df542d2  pcre-ocaml-5.11.4.tar.gz
+18a257c0b4ec00510f93b6bf4951d545  pcre-ocaml-5.12.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 12:39:46 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 18 Sep 2007 08:39:46 -0400
Subject: rpms/psutils/devel psutils.spec,1.16,1.17
Message-ID: <200709181239.l8ICdkCE025260@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/psutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148

Modified Files:
	psutils.spec 
Log Message:
* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.17-27
- fixed Source url pointing to non-existing site



Index: psutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- psutils.spec	12 Jul 2006 07:53:57 -0000	1.16
+++ psutils.spec	18 Sep 2007 12:39:14 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 26.1
+Release: 27%{dist}
 License: distributable
 Group: Applications/Publishing
-Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz
+Source: psutils-p17.tar.gz
 Patch0: psutils-p17-Makefile.patch
 Patch1: psutils-p17-misc.patch
 Patch2: psutils-p17-paper.patch
@@ -48,6 +48,9 @@
 /usr/lib/psutils
 
 %changelog
+* Tue Sep 18 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.17-27
+- fixed Source url pointing to non-existing site
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.17-26.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 12:49:55 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 08:49:55 -0400
Subject: rpms/opal/devel .cvsignore, 1.9, 1.10 opal.spec, 1.20, 1.21 sources,
	1.10, 1.11 ekiga-429076-42.patch, 1.1,
	NONE ekiga-429076-50.patch, 1.1, NONE
Message-ID: <200709181249.l8ICntdA025712@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25680

Modified Files:
	.cvsignore opal.spec sources 
Removed Files:
	ekiga-429076-42.patch ekiga-429076-50.patch 
Log Message:
- upstream release of 2.2.10
- includes the 2 cisco patches
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Apr 2007 20:41:57 -0000	1.9
+++ .cvsignore	18 Sep 2007 12:49:23 -0000	1.10
@@ -4,3 +4,4 @@
 opal-2.2.6.tar.gz
 opal-2.2.7.tar.gz
 opal-2.2.8.tar.gz
+opal-2.2.10.tar.gz


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- opal.spec	22 Aug 2007 10:00:15 -0000	1.20
+++ opal.spec	18 Sep 2007 12:49:23 -0000	1.21
@@ -1,22 +1,18 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.8
-Release: 5%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.7
-BuildRequires: pwlib-devel >= 1.10.7
+Requires: pwlib >= 1.10.10
+BuildRequires: pwlib-devel >= 1.10.10
 BuildRequires: openldap-devel
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
 
-# workaround problems with CISCO server
-Patch0: ekiga-429076-42.patch
-Patch1: ekiga-429076-50.patch
-
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
 teleconferencing protocol, and successor of the openh323 library.
@@ -25,15 +21,13 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.7
+Requires: pwlib-devel >= 1.10.10
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p0
 
 %build
 %configure --enable-localspeex
@@ -65,6 +59,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.10-1
+- upstream release of 2.2.10
+- includes the 2 cisco patches
+
 * Wed Aug 22 2007 Daniel Veillard <veillard at redhat.com> - 2.2.8-5.fc8
 - added 2 patches needed when using a CISCO server
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Apr 2007 20:41:57 -0000	1.10
+++ sources	18 Sep 2007 12:49:23 -0000	1.11
@@ -1 +1 @@
-700b0c3a7606afc0dc6c9d3c12fcb23b  opal-2.2.8.tar.gz
+ef8b858c666afc375830f6cd216a0601  opal-2.2.10.tar.gz


--- ekiga-429076-42.patch DELETED ---


--- ekiga-429076-50.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:01 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:01 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq16j016870@app3.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the watchbugzilla acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:01 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:01 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq2q0016880@app3.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the watchcommits acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 12:52:05 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (esandeen))
Date: Tue, 18 Sep 2007 05:52:05 -0700
Subject: [pkgdb] e2fsprogs had acl change status
Message-ID: <200709181252.l8ICq71Z016654@app4.fedora.phx.redhat.com>

Eric Sandeen (sandeen) has set the commit acl on e2fsprogs (Fedora devel) to Approved for Oliver Falk (oliver)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/e2fsprogs



From fedora-extras-commits at redhat.com  Tue Sep 18 13:07:30 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Tue, 18 Sep 2007 09:07:30 -0400
Subject: rpms/bind/F-7 bind.spec,1.192,1.193
Message-ID: <200709181307.l8ID7UG3032207@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32175

Modified Files:
	bind.spec 
Log Message:
- moved caching-nameserver chroot files to bind-chroot (#287321)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-7/bind.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- bind.spec	6 Sep 2007 12:04:26 -0000	1.192
+++ bind.spec	18 Sep 2007 13:06:58 -0000	1.193
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.2
-Release: 	0.3.%{RELEASEVER}%{?dist}
+Release: 	0.3.1.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -706,19 +706,13 @@
 %files -n caching-nameserver
 %defattr(0640,root,named,0750)
 %config %verify(not link) /etc/named.caching-nameserver.conf
-%ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
 %config %verify(not link) /etc/named.rfc1912.zones
-%ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
 %config %verify(not link) /var/named/named.ca
-%ghost  %config %{chroot_prefix}/var/named/named.ca
 %config %verify(not link) /var/named/named.localhost
-%ghost  %config %{chroot_prefix}/var/named/named.localhost
 %config %verify(not link) /var/named/named.loopback
-%ghost  %config %{chroot_prefix}/var/named/named.loopback
 %config %verify(not link) /var/named/named.empty
-%ghost  %config %{chroot_prefix}/var/named/named.empty
 %defattr(0644,root,root,0755)
 %doc Copyright
 %doc rfc1912.txt
@@ -734,6 +728,12 @@
 %ghost %config(noreplace) %prefix/etc/named.conf
 %ghost %config(noreplace) %prefix/etc/named.caching-nameserver.conf
 %ghost %config(noreplace) %prefix/etc/rndc.key
+%ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
+%ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
+%ghost %config %{chroot_prefix}/var/named/named.ca
+%ghost %config %{chroot_prefix}/var/named/named.localhost
+%ghost %config %{chroot_prefix}/var/named/named.loopback
+%ghost %config %{chroot_prefix}/var/named/named.empty
 %defattr(0660,named,named,0770)
 %dir %prefix/var/named/slaves
 %dir %prefix/var/named/data
@@ -783,6 +783,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.1.b1
+- moved caching-nameserver chroot files to bind-chroot (#287321)
+
 * Thu Sep 06 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.b1
 - patches bind-9.4-2119_revert.patch and
   libbind-9.3.1rc1-fix_h_errno.patch are obsoleted by



From fedora-extras-commits at redhat.com  Tue Sep 18 13:10:06 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 18 Sep 2007 09:10:06 -0400
Subject: devel/e2fsprogs blkid_types-wrapper.h, 1.1, 1.2 e2fsprogs.spec, 1.79,
	1.80 ext2_types-wrapper.h, 1.1, 1.2
Message-ID: <200709181310.l8IDA6LO032275@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/devel/e2fsprogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32245

Modified Files:
	blkid_types-wrapper.h e2fsprogs.spec ext2_types-wrapper.h 
Log Message:

* Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
- Add alpha to the header wrappers  



Index: blkid_types-wrapper.h
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/blkid_types-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blkid_types-wrapper.h	7 Sep 2007 20:20:43 -0000	1.1
+++ blkid_types-wrapper.h	18 Sep 2007 13:09:34 -0000	1.2
@@ -17,6 +17,8 @@
 #include "blkid_types-s390.h"
 #elif defined(__x86_64__)
 #include "blkid_types-x86_64.h"
+#elif defined(__alpha__)
+#include "blkid_types-alpha.h"
 #else
 #error "This e2fsprogs-devel package does not work your architecture?"
 #endif


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/e2fsprogs.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- e2fsprogs.spec	7 Sep 2007 20:20:43 -0000	1.79
+++ e2fsprogs.spec	18 Sep 2007 13:09:34 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -260,6 +260,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
+- Add alpha to the header wrappers 
+
 * Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
 - wrap a couple headers to fix multilib issues (#270441)
 


Index: ext2_types-wrapper.h
===================================================================
RCS file: /cvs/pkgs/devel/e2fsprogs/ext2_types-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ext2_types-wrapper.h	7 Sep 2007 20:20:43 -0000	1.1
+++ ext2_types-wrapper.h	18 Sep 2007 13:09:34 -0000	1.2
@@ -17,6 +17,8 @@
 #include "ext2_types-s390.h"
 #elif defined(__x86_64__)
 #include "ext2_types-x86_64.h"
+#elif defined(__alpha__)
+#include "ext2_types-alpha.h"
 #else
 #error "This e2fsprogs-devel package does not work your architecture?"
 #endif



From fedora-extras-commits at redhat.com  Tue Sep 18 13:16:40 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 18 Sep 2007 09:16:40 -0400
Subject: devel/automake17 automake17.spec,1.13,1.14
Message-ID: <200709181316.l8IDGeMk032452@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32428

Modified Files:
	automake17.spec 
Log Message:
- fix obsoletes
- mv check into %%check




Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- automake17.spec	17 Sep 2007 12:03:45 -0000	1.13
+++ automake17.spec	18 Sep 2007 13:16:08 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    9
+Release:    10
 License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -13,8 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.8
-Obsoletes:  automake = 1.7.8
+Conflicts:  automake = 1.7.9
+Obsoletes:  automake = 1.7.9
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':
@@ -65,9 +65,10 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
 
+%check
 # KH: FIXME  This needs to be looked at, exdir2 gettext gettext2 subcond fail
 # gettext probably because the gettext.m4 isn't compatible with automake <1.9
-##if ! %{_without_check}
+#if ! %{_without_check}
 # make check  # VERBOSE=x
 #endif
 
@@ -94,6 +95,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-10
+- fix obsoletes
+- mv check into %%check
+
 * Mon Sep 17 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-9
 - fix licenses
 - add README AUTHORS THANKS  to %%doc



From fedora-extras-commits at redhat.com  Tue Sep 18 13:34:47 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 09:34:47 -0400
Subject: rpms/httpd/F-7 httpd-2.2.4-oldflush.patch, NONE,
	1.1 httpd-2.2.6-ssllibver.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 httpd.spec, 1.109, 1.110 sources, 1.15,
	1.16 httpd-2.2.3-CVE-2006-5752.patch, 1.1,
	NONE httpd-2.2.3-CVE-2007-1863.patch, 1.1,
	NONE httpd-2.2.3-CVE-2007-3304.patch, 1.1,
	NONE httpd-2.2.4-CVE-2007-1862.patch, 1.1, NONE
Message-ID: <200709181334.l8IDYl2U001139@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792

Modified Files:
	.cvsignore httpd.spec sources 
Added Files:
	httpd-2.2.4-oldflush.patch httpd-2.2.6-ssllibver.patch 
Removed Files:
	httpd-2.2.3-CVE-2006-5752.patch 
	httpd-2.2.3-CVE-2007-1863.patch 
	httpd-2.2.3-CVE-2007-3304.patch 
	httpd-2.2.4-CVE-2007-1862.patch 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 2.2.6-1.fc7
- update to 2.2.6
- require /etc/mime.types (#249223)


httpd-2.2.4-oldflush.patch:

--- NEW FILE httpd-2.2.4-oldflush.patch ---

http://issues.apache.org/bugzilla/show_bug.cgi?id=36780

--- httpd-2.2.4/server/util_filter.c.oldflush
+++ httpd-2.2.4/server/util_filter.c
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
                                                 void *ctx)
 {
     ap_filter_t *f = ctx;
+    apr_status_t rv;
 
-    return ap_pass_brigade(f, bb);
+    rv = ap_pass_brigade(f, bb);
+
+    /* apr_brigade_write* require that the flush function ensures that
+     * the brigade is empty upon return; otherwise the brigade may be
+     * left with a transient bucket whose contents have fallen out of
+     * scope.  Call cleanup here unconditionally to avoid the issue in
+     * all cases. */
+    apr_brigade_cleanup(bb);
+
+    return rv;
 }
 
 AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)

httpd-2.2.6-ssllibver.patch:

--- NEW FILE httpd-2.2.6-ssllibver.patch ---
--- httpd-2.2.6/modules/ssl/mod_ssl.c.ssllibver
+++ httpd-2.2.6/modules/ssl/mod_ssl.c
@@ -500,7 +500,7 @@ static void ssl_register_hooks(apr_pool_
     ap_hook_insert_filter (ssl_hook_Insert_Filter, NULL,NULL, APR_HOOK_MIDDLE);
 /*    ap_hook_handler       (ssl_hook_Upgrade,       NULL,NULL, APR_HOOK_MIDDLE); */
 
-    ssl_var_register();
+    ssl_var_register(p);
 
     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
--- httpd-2.2.6/modules/ssl/ssl_engine_vars.c.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_engine_vars.c
@@ -58,12 +58,32 @@ static int ssl_is_https(conn_rec *c)
     return sslconn && sslconn->ssl;
 }
 
-void ssl_var_register(void)
+static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
+static char var_library_interface[] = SSL_LIBRARY_TEXT;
+static char *var_library = NULL;
+
+void ssl_var_register(apr_pool_t *p)
 {
+    char *cp, *cp2;
+
     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
     APR_REGISTER_OPTIONAL_FN(ssl_ext_lookup);
-    return;
+
+    /* Perform once-per-process library version determination: */
+    var_library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
+    
+    if ((cp = strchr(var_library, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+                *cp2 = NUL;
+    }
+
+    if ((cp = strchr(var_library_interface, ' ')) != NULL) {
+        *cp = '/';
+        if ((cp2 = strchr(cp, ' ')) != NULL)
+            *cp2 = NUL;
+    }
 }
 
 /* This function must remain safe to use for a non-SSL connection. */
@@ -635,39 +655,17 @@ static void ssl_var_lookup_ssl_cipher_bi
 
 static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
 {
-    static char interface[] = "mod_ssl/" MOD_SSL_VERSION;
-    static char library_interface[] = SSL_LIBRARY_TEXT;
-    static char *library = NULL;
-    char *result;
-  
-    if (!library) {
-        char *cp, *cp2;
-        library = apr_pstrdup(p, SSL_LIBRARY_DYNTEXT);
-        if ((cp = strchr(library, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-        if ((cp = strchr(library_interface, ' ')) != NULL) {
-            *cp = '/';
-            if ((cp2 = strchr(cp, ' ')) != NULL)
-                *cp2 = NUL;
-        }
-    }
-
     if (strEQ(var, "INTERFACE")) {
-        result = apr_pstrdup(p, interface);
+        return apr_pstrdup(p, var_interface);
     }
     else if (strEQ(var, "LIBRARY_INTERFACE")) {
-        result = apr_pstrdup(p, library_interface);
+        return apr_pstrdup(p, var_library_interface);
     }
     else if (strEQ(var, "LIBRARY")) {
-        result = apr_pstrdup(p, library);
-    }
-    else {
-        result = NULL;
+        return apr_pstrdup(p, var_library);
     }
-    return result;
+
+    return NULL;
 }
   
 
--- httpd-2.2.6/modules/ssl/ssl_private.h.ssllibver
+++ httpd-2.2.6/modules/ssl/ssl_private.h
@@ -648,7 +648,7 @@ void         ssl_die(void);
 void         ssl_log_ssl_error(const char *, int, int, server_rec *);
 
 /**  Variables  */
-void         ssl_var_register(void);
+void         ssl_var_register(apr_pool_t *p);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Jun 2007 13:48:30 -0000	1.19
+++ .cvsignore	18 Sep 2007 13:34:14 -0000	1.20
@@ -1,2 +1,4 @@
 httpd-2.2.4.tar.gz
 httpd-2.2.4
+httpd-2.2.6
+clog


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/httpd.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- httpd.spec	26 Jun 2007 13:48:30 -0000	1.109
+++ httpd.spec	18 Sep 2007 13:34:14 -0000	1.110
@@ -5,8 +5,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.4
-Release: 4.1%{?dist}
+Version: 2.2.6
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -36,18 +36,15 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-# Security fixes
-Patch70: httpd-2.2.3-CVE-2006-5752.patch
-Patch71: httpd-2.2.3-CVE-2007-1863.patch
-Patch72: httpd-2.2.3-CVE-2007-3304.patch
-Patch73: httpd-2.2.4-CVE-2007-1862.patch
+Patch55: httpd-2.2.4-oldflush.patch
+Patch56: httpd-2.2.6-ssllibver.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, pkgconfig, findutils, ed
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36
+Requires: initscripts >= 8.36, /etc/mime.types
 Obsoletes: httpd-suexec
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
@@ -117,11 +114,8 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
-
-%patch70 -p1 -b .cve5752
-%patch71 -p1 -b .cve1863
-%patch72 -p1 -b .cve3304
-%patch73 -p1 -b .cve1862
+%patch55 -p1 -b .oldflush
+%patch56 -p1 -b .ssllibver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -471,6 +465,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 2.2.6-1.fc7
+- update to 2.2.6
+- require /etc/mime.types (#249223)
+
 * Tue Jun 26 2007 Joe Orton <jorton at redhat.com> 2.2.4-4.1.fc7
 - add security fixes for CVE-2007-1863, CVE-2007-3304,
   and CVE-2006-5752 (#244665)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	12 Mar 2007 13:29:57 -0000	1.15
+++ sources	18 Sep 2007 13:34:14 -0000	1.16
@@ -1 +1 @@
-3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
+d050a49bd7532ec21c6bb593b3473a5d  httpd-2.2.6.tar.gz


--- httpd-2.2.3-CVE-2006-5752.patch DELETED ---


--- httpd-2.2.3-CVE-2007-1863.patch DELETED ---


--- httpd-2.2.3-CVE-2007-3304.patch DELETED ---


--- httpd-2.2.4-CVE-2007-1862.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 13:37:39 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 09:37:39 -0400
Subject: comps/po ne.po,1.2,1.3
Message-ID: <200709181337.l8IDbdYn001283@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1250

Modified Files:
	ne.po 
Log Message:
update



Index: ne.po
===================================================================
RCS file: /cvs/extras/comps/po/ne.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ne.po	17 Sep 2007 19:22:12 -0000	1.2
+++ ne.po	18 Sep 2007 13:37:09 -0000	1.3
@@ -7,13 +7,13 @@
 "Project-Id-Version: ne\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-08-16 16:07+0545\n"
+"PO-Revision-Date: 2007-09-18 13:31+0545\n"
 "Last-Translator: Nabin Gautam <nabin at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\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\n"
 "\n"
 "\n"
 "\n"
@@ -183,10 +183,8 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
@@ -256,8 +254,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
@@ -316,8 +313,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -392,41 +388,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????????????????????????????? ???????????? ????????????????????? ?????????????????? ?????? ???"
+msgstr "?????? ???????????? ????????????????????? ?????????????????????????????? ?????????????????? ????????????????????? ?????????????????? ??????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
@@ -489,19 +476,16 @@
 msgstr "????????? ??????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "?????? ???????????? ????????? ???????????????????????? ??????????????? ??? ???????????????????????? ?????????????????? ?????? ???"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -524,23 +508,20 @@
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "???????????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -619,9 +600,8 @@
 msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -648,9 +628,8 @@
 msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -681,15 +660,12 @@
 msgstr "??????????????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"?????????????????? ????????????????????? ??????????????? ???????????????????????? ?????????????????? ?????? ??????????????? ???????????? ??????????????? ??????????????? ?????? ??????????????? ????????????????????? ??????????????????????????? ???"
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????? ??????????????????"
+msgstr "?????????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -712,9 +688,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "???????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -725,14 +700,12 @@
 msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????? ??????????????????"
+msgstr "????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "????????????????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -759,9 +732,8 @@
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "??????????????? ??????????????????"
+msgstr "??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -784,9 +756,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -821,9 +792,8 @@
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -850,9 +820,8 @@
 msgstr "???????????????????????? ???????????????????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -883,9 +852,8 @@
 msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "??????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -904,27 +872,22 @@
 msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????? ???????????????????????????????????? ???????????????????????? X ???????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ??????????????? ???????????? ?????????????????? ????????????????????? ???"
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????? ???????????????????????????????????? ?????????????????? ?????????????????? DHCP, ??????????????????????????? ??? NIS ??????????????? ??????????????? ???????????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
-msgstr ""
-"?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"
+msgstr "?????? ???????????????????????????????????? rsh ??? ?????????????????? ??????????????? ?????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
 msgid "These packages provide a virtualization environment."
@@ -938,8 +901,7 @@
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
-msgstr ""
-"?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"
+msgstr "?????? ??????????????????????????? ????????????????????? ???????????? ??? ????????? ???????????? ???????????????????????? ????????????????????? ???????????? ?????????????????? ?????????????????? ????????????????????? ???"
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
 msgid ""
@@ -962,8 +924,7 @@
 "???????????? ????????????????????? ??????????????? ?????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????? ????????????????????? ?????????????????? ???????????????????????? ??????????????????????????? DNS ????????? ??????????????? (BIND) ??????????????? ?????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
@@ -980,17 +941,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr ""
-"?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"
+msgstr "?????? ????????????????????? ?????????????????? Postgresql ????????? ?????????????????? ?????????????????? ???????????? ?????????????????? ????????????????????? ???????????????????????? ??????????????? ???"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
 msgid "Tibetan Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1017,9 +976,8 @@
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1047,352 +1005,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "????????????????????? ????????????????????? ????????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "????????????????????????"
+msgstr "?????????????????? ????????????????????????"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "??????????????????????????? ????????? ?????????????????????????????? ???????????? ???????????? ????????????????????? ???"
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???????????????????????? ?????????????????? ??????????????? ??????????????????"
+msgstr "?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ?????????????????? ???"
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "???????????????????????? ??????????????????"
+msgstr "?????? ????????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "??????????????????????????? ??????????????????"
+msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "????????????????????? ??????????????????"
+msgstr "?????????????????? ??????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ??????????????????"
-
-#~ msgid "JBoss Enterprise Application Platform"
-#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ???????????????????????????"
-
-#~ msgid "Packages which comprise the JBoss Enterprise Application Platform"
-#~ msgstr "??????????????? ????????????????????????????????? ??????????????????????????? ??????????????????????????? ???????????????????????? ??????????????? ?????????????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????????????????????? ??????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "??????????????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "??????????????????????????? ???????????? ?????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????? ???????????? ??????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "????????????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "???????????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ??????????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ??????????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ??????????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ??????????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "?????????????????? ???????????? ????????????????????? ???????????? ?????? ????????????????????? ????????????????????? ??????????????????????????? ???"
-
-#~ msgid "KDE"
-#~ msgstr "???????????????"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "??????????????? ????????????????????? ??????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "?????????????????? ???????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "??????????????? ???????????????????????? ?????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ????????????????????????????????? ???????????? ?????????????????? ?????????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????????????????? ?????????????????? ?????????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ?????????????????????"
-
-#~ msgid "Server"
-#~ msgstr "???????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????????????????????? ????????????????????? ???????????????????????? ??????????????? ??????????????????????????? ???????????? ??????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????????? ??????????????????"
-
-#~ msgid "System"
-#~ msgstr "?????????????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU ?????????????????? ????????? ????????????????????? ???"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "?????? ??????????????????????????? ???????????????????????? IMAP ?????? Postfix ????????? ??????????????? ????????????????????? ???????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "?????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? "
-#~ "?????????????????? ????????????????????? ???"
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????? ??????????????? ???????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????? ??????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ?????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ?????????????????? ???????????? ??????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????????????? ??????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????????"
-
-#~ msgid "Italian"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "????????? ???????????? ??????????????????????????????????????? ?????????????????? 3 ???????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? "
-#~ "??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "????????????????????? ?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ???????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? "
-#~ "???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? "
-#~ "??????????????? ???"
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "??????????????????????????? ?????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ?????????????????? ???????????? ??????????????? ??????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????????????"
-
-#~ msgid "Punjabi"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? 4 ???????????????????????????"
-
-#~ msgid "Tamil"
-#~ msgstr "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ????????????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr "?????? ?????????????????? ????????? ??????????????? ????????????????????????????????? ?????????????????? ??????????????????????????? ??????????????? ?????????????????? ?????????????????? ??????????????? ???"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????? ?????????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????? ?????????????????? ???"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ??????????????????????????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????????? ????????? GFS ?????? ???????????? ?????????????????? ?????????????????? ??????????????? ????????????????????? ???"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????? ????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "?????? ??????????????????????????? ????????????????????? ?????????????????????????????? ??????????????????????????? ?????????????????? ?????????????????? ????????????????????? ???"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "???????????? ?????????????????? ?????????????????? ??? ??????????????? ?????????"
-
-#~ msgid "Misc"
-#~ msgstr "???????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "??????????????? ?????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ???????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ???????????????????????? ???????????? ?????? ???????????????????????????????????? ?????????????????? ??????????????? ?????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "????????? ??????????????? ????????????????????????????????? ?????????????????? ???????????????????????????"
-
-#~ msgid "Workstation"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????????????????? ??????????????????????????? ??? ???????????????????????? ???"
+msgstr "?????????????????? ???????????????????????? ??? ?????????????????? ???????????? ?????????????????????"
 
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????????????????????????? ?????????????????? ???"



From fedora-extras-commits at redhat.com  Tue Sep 18 13:41:54 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 18 Sep 2007 09:41:54 -0400
Subject: comps comps-f8.xml.in,1.111,1.112
Message-ID: <200709181341.l8IDfs6e001468@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1444

Modified Files:
	comps-f8.xml.in 
Log Message:
Switch default bittorrent client to transmission, move bittorrent-gui to
optional



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- comps-f8.xml.in	17 Sep 2007 18:15:17 -0000	1.111
+++ comps-f8.xml.in	18 Sep 2007 13:41:24 -0000	1.112
@@ -1802,17 +1802,18 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">bittorrent-gui</packagereq>
       <packagereq type="default">ekiga</packagereq>
       <packagereq type="default">evolution</packagereq>
       <packagereq type="default">evolution-help</packagereq>
       <packagereq type="default">evolution-webcal</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">pidgin</packagereq>
+      <packagereq type="default">transmission</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">azureus</packagereq>
       <packagereq type="optional">balsa</packagereq>
+      <packagereq type="optional">bittorrent-gui</packagereq>
       <packagereq type="optional">blam</packagereq>
       <packagereq type="optional">blogtk</packagereq>
       <packagereq type="optional">bluefish</packagereq>
@@ -1868,7 +1869,6 @@
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">sylpheed-claws</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
-      <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>
       <packagereq type="optional">valknut</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 18 13:44:41 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 18 Sep 2007 09:44:41 -0400
Subject: rpms/c2070/devel c2070.spec,1.2,1.3
Message-ID: <200709181344.l8IDifDo001565@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/extras/rpms/c2070/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532

Modified Files:
	c2070.spec 
Log Message:
Download mirror is no longer available



Index: c2070.spec
===================================================================
RCS file: /cvs/extras/rpms/c2070/devel/c2070.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- c2070.spec	3 Aug 2007 12:03:54 -0000	1.2
+++ c2070.spec	18 Sep 2007 13:44:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           c2070
 Version:        0.99
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Converts bitcmyk data to Lexmark 2070 printer language
 
 Group:          System Environment/Libraries
@@ -10,8 +10,7 @@
 # ...and as the original upstream author did not respond to e-mails,
 # here is at least some reference:
 URL:            http://www.linuxprinting.org/show_driver.cgi?driver=%{name}
-# Again, the source URL is not original
-Source0:        ftp://mirror.linuxsoft.cz/pool/5865/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,6 +39,9 @@
 %doc README
 
 %changelog
+* Tue Sep 18 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.99-3
+- The source for the package had died away
+
 * Fri Aug 3 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.99-2
 - Modify the License tag in accordance with the new guidelines
 



From fedora-extras-commits at redhat.com  Tue Sep 18 13:46:56 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:46:56 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.126, 1.127 jd.spec, 1.145, 1.146 sources, 
	1.127, 1.128
Message-ID: <200709181346.l8IDkudg001706@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	3 Sep 2007 16:45:33 -0000	1.126
+++ .cvsignore	18 Sep 2007 13:46:23 -0000	1.127
@@ -1 +1 @@
-jd-1.9.6-svn1311.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- jd.spec	3 Sep 2007 16:45:33 -0000	1.145
+++ jd.spec	18 Sep 2007 13:46:23 -0000	1.146
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1311
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+#BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -119,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Sep  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1311
-- svn 1311
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	3 Sep 2007 16:45:33 -0000	1.127
+++ sources	18 Sep 2007 13:46:23 -0000	1.128
@@ -1 +1 @@
-ed09d261123e90bce00c2703d76adefc  jd-1.9.6-svn1311.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:46:58 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:46:58 -0400
Subject: rpms/jd/FC-6 .cvsignore, 1.29, 1.30 jd.spec, 1.35, 1.36 sources,
	1.30, 1.31
Message-ID: <200709181346.l8IDkwWG001711@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Aug 2007 14:11:15 -0000	1.29
+++ .cvsignore	18 Sep 2007 13:46:26 -0000	1.30
@@ -1 +1 @@
-jd-1.9.6-beta070804.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jd.spec	5 Aug 2007 09:31:26 -0000	1.35
+++ jd.spec	18 Sep 2007 13:46:26 -0000	1.36
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070804
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+#BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -90,15 +93,14 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 %{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
-
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   %{name}.desktop
+   --delete-original \
+   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -116,9 +118,13 @@
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{vendorname}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
+
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Aug 2007 09:31:26 -0000	1.30
+++ sources	18 Sep 2007 13:46:26 -0000	1.31
@@ -1 +1 @@
-e9b12a4fea009de825f6cc424a6dbd1c  jd-1.9.6-beta070804.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:47:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 09:47:01 -0400
Subject: rpms/jd/devel .cvsignore, 1.146, 1.147 jd.spec, 1.172, 1.173 sources,
	1.147, 1.148
Message-ID: <200709181347.l8IDl1LH001716@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	14 Sep 2007 18:19:31 -0000	1.146
+++ .cvsignore	18 Sep 2007 13:46:29 -0000	1.147
@@ -1 +1 @@
-jd-1.9.6-svn1335.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- jd.spec	14 Sep 2007 18:19:31 -0000	1.172
+++ jd.spec	18 Sep 2007 13:46:29 -0000	1.173
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1335
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -73,6 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -86,7 +87,6 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-#find . -name .svn | sort -r | xargs %{__rm} -rf
 %{__make} %{?_smp_mflags}
 
 %install
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.4.svn1335
-- svn 1335
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
 
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	14 Sep 2007 18:19:31 -0000	1.147
+++ sources	18 Sep 2007 13:46:29 -0000	1.148
@@ -1 +1 @@
-f43bf179bb382e60ed4fd07f5a43a965  jd-1.9.6-svn1335.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 13:51:18 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 18 Sep 2007 09:51:18 -0400
Subject: rpms/lilypond/devel lilypond.spec,1.19,1.20
Message-ID: <200709181351.l8IDpIjN002152@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	lilypond.spec 
Log Message:
License and URL update.


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lilypond.spec	21 Aug 2007 14:59:10 -0000	1.19
+++ lilypond.spec	18 Sep 2007 13:50:46 -0000	1.20
@@ -1,12 +1,12 @@
 Name:		lilypond
 Version:	2.10.29
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
-License:	GPL
+License:	GPLv2
 URL:		http://www.lilypond.org
-Source0:	http://download.linuxaudio.org/download/sources/v2.10/%{name}-%{version}.tar.gz
+Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-2
+- Fix source URL. Change licence from GPL to GPLv2.
+
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1
 - New release. Remove old patch.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 13:54:37 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 18 Sep 2007 09:54:37 -0400
Subject: rpms/eclipse-subclipse/F-7 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709181354.l8IDsbot002299@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2242

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
Update to upstream version 1.2.4



--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 16:02:39 -0000	1.5
+++ .cvsignore	18 Sep 2007 13:54:04 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 16:02:39 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	18 Sep 2007 13:54:04 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 16:02:39 -0000	1.5
+++ eclipse-subclipse.spec	18 Sep 2007 13:54:04 -0000	1.6
@@ -15,8 +15,8 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,16 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 16:02:39 -0000	1.5
+++ sources	18 Sep 2007 13:54:04 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:01:43 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Tue, 18 Sep 2007 10:01:43 -0400
Subject: rpms/kernel/devel linux-2.6-wireless.patch, 1.6,
	1.7 git-wireless-dev.patch, 1.35, 1.36 kernel.spec, 1.168,
	1.169 linux-2.6-wireless-pending.patch, 1.3,
	1.4 linux-2.6-iwlwifi-fw-name-compat.patch, 1.1, NONE
Message-ID: <200709181401.l8IE1hPo008575@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577

Modified Files:
	git-wireless-dev.patch kernel.spec 
	linux-2.6-wireless-pending.patch 
Added Files:
	linux-2.6-wireless.patch 
Removed Files:
	linux-2.6-iwlwifi-fw-name-compat.patch 
Log Message:
wireless update

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: linux-2.6-wireless.patch
diff -N linux-2.6-wireless.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-wireless.patch	18 Sep 2007 14:01:35 -0000	1.7
@@ -0,0 +1,66 @@
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 09:35:22.000000000 -0400
+@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void)
+ }
+ 
+ 
+-module_init(ieee80211_init);
++subsys_initcall(ieee80211_init);
+ module_exit(ieee80211_exit);
+ 
+ MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
+--- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 09:35:22.000000000 -0400
+@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
+ 		skb_queue_head_init(&q->requeued[i]);
+ 		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+ 						 qd->handle);
+-		if (q->queues[i] == 0) {
++		if (!q->queues[i]) {
+ 			q->queues[i] = &noop_qdisc;
+ 			printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+ 		}
+diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
+--- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 09:35:22.000000000 -0400
+@@ -431,7 +431,7 @@ static void __exit rate_control_simple_e
+ }
+ 
+ 
+-module_init(rate_control_simple_init);
++subsys_initcall(rate_control_simple_init);
+ module_exit(rate_control_simple_exit);
+ 
+ MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
+--- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 09:35:22.000000000 -0400
+@@ -213,7 +213,7 @@ out_fail_notifier:
+ out_fail_sysfs:
+ 	return err;
+ }
+-module_init(cfg80211_init);
++subsys_initcall(cfg80211_init);
+ 
+ static void cfg80211_exit(void)
+ {
+diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
+--- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 09:35:22.000000000 -0400
+@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
+ 	cfg80211_dev_free(rdev);
+ }
+ 
++#ifdef CONFIG_HOTPLUG
+ static int wiphy_uevent(struct device *dev, char **envp,
+ 			int num_envp, char *buf, int size)
+ {
+ 	/* TODO, we probably need stuff here */
+ 	return 0;
+ }
++#endif
+ 
+ struct class ieee80211_class = {
+ 	.name = "ieee80211",

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.35 -r 1.36 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- git-wireless-dev.patch	1 Sep 2007 00:32:49 -0000	1.35
+++ git-wireless-dev.patch	18 Sep 2007 14:01:35 -0000	1.36
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-08-30 16:13:50.000000000 -0400
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-18 09:42:44.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-18 09:44:18.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -66,8 +67,9 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
 --- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +329,9 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig linux-2.6.22.noarch/include/linux/mod_devicetable.h
+--- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-09-18 09:44:19.000000000 -0400
 @@ -340,4 +340,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID	0xffff
  #define PA_SVERSION_ANY_ID	0xffffffff
@@ -349,8 +352,9 @@
 +#define SSB_ANY_REV		0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-18 09:42:53.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -649,8 +653,9 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,396 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1048,8 +1053,9 @@
 +#endif /* CONFIG_SSB_SERIAL */
 +
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1255,8 +1261,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_EXTIF */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,46 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1304,8 +1311,9 @@
 +#endif /* CONFIG_SSB_DRIVER_MIPS */
 +
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,292 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1599,8 +1607,9 @@
 +
 +
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,106 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1708,8 +1717,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,424 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2135,8 +2145,9 @@
 +
 +
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 09:44:19.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2279,11 +2290,12 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 16:13:31.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 16:13:51.000000000 -0400
-@@ -539,6 +539,9 @@ struct ieee80211_hw {
- 	 * per-packet RC4 key with each TX frame when doing hwcrypto */
- #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 09:42:58.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 09:44:19.000000000 -0400
+@@ -563,6 +563,9 @@ struct ieee80211_hw {
+ 	 * specified in the device's EEPROM */
+ #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
  
 +	/* The device capable of supporting 11n */
 +#define IEEE80211_HW_SUPPORT_HT_MODE (1<<15)
@@ -2291,7 +2303,7 @@
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -691,8 +694,7 @@ struct ieee80211_ops {
+@@ -708,8 +711,7 @@ struct ieee80211_ops {
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -2301,7 +2313,7 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -752,8 +754,9 @@ struct ieee80211_ops {
+@@ -769,8 +771,9 @@ struct ieee80211_ops {
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -2313,7 +2325,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -769,6 +772,22 @@ struct ieee80211_ops {
+@@ -786,6 +789,22 @@ struct ieee80211_ops {
  	 * TSF synchronization. */
  	void (*reset_tsf)(struct ieee80211_hw *hw);
  
@@ -2336,8 +2348,9 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
+diff -up linux-2.6.22.noarch/include/net/iw_handler.h.orig linux-2.6.22.noarch/include/net/iw_handler.h
 --- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-09-18 09:44:19.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2353,9 +2366,10 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-08-30 16:13:50.000000000 -0400
-@@ -283,6 +283,14 @@ M:	corentin.labbe at geomatys.fr
+diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
[...111839 lines suppressed...]
++static void rs_clear(void *priv)
++{
++	return;
 +}
 +
++
 +static void *rs_alloc_sta(void *priv, gfp_t gfp)
 +{
 +	struct iwl_rate_scale_priv *rs_priv;
@@ -123243,11 +131884,6 @@
 +	IWL_DEBUG_RATE("leave\n");
 +}
 +
-+static void rs_clear(void *priv)
-+{
-+	IWL_DEBUG_RATE("NOP\n");
-+}
-+
 +/**
 + * rs_tx_status - Update rate control values based on Tx results
 + *
@@ -123742,8 +132378,7 @@
 +
 +	if (!local->rate_ctrl->ops->name ||
 +	    strcmp(local->rate_ctrl->ops->name, RS_NAME)) {
-+		IWL_WARNING("iwl-3945-rs not selected as rate control "
-+			    "aglo!\n");
++		IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");
 +		IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");
 +		return;
 +	}
@@ -123797,19 +132432,20 @@
 +		       iwl_rates[rs_priv->start_rate].plcp);
 +}
 +
-+void iwl_rate_control_register(void)
++void iwl_rate_control_register(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_register(&rs_ops);
 +}
 +
-+void iwl_rate_control_unregister(void)
++void iwl_rate_control_unregister(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,46 @@
 +/*
 + * Broadcom 43xx PCI-SSB bridge module
@@ -123857,8 +132493,9 @@
 +{
 +	ssb_pcihost_unregister(&b43_pci_bridge_driver);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Makefile
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,18 @@
 +# core
 +ssb-y					+= main.o scan.o
@@ -123878,8 +132515,9 @@
 +ssb-$(CONFIG_SSB_PCIHOST)		+= b43_pci_bridge.o
 +
 +obj-$(CONFIG_SSB)			+= ssb.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcmcia.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,271 @@
 +/*
 + * Sonics Silicon Backplane
@@ -124152,8 +132790,9 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/main.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,1162 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125317,8 +133956,9 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125424,8 +134064,9 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,223 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125650,8 +134291,9 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/ssb_private.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,136 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -125789,8 +134431,9 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pci.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,740 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -126532,8 +135175,9 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,446 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126981,8 +135625,9 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Kconfig
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,117 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -127101,8 +135746,9 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/scan.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
@@ -127517,8 +136163,9 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_extif.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,129 @@
 +/*
 + * Sonics Silicon Backplane
@@ -127649,8 +136296,9 @@
 +				   mask, value);
 +}
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-09-18 09:44:19.000000000 -0400
 @@ -0,0 +1,576 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kernel.spec	17 Sep 2007 14:16:49 -0000	1.168
+++ kernel.spec	18 Sep 2007 14:01:35 -0000	1.169
@@ -628,10 +628,9 @@
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
-#Patch680: linux-2.6-wireless.patch
+Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch690: git-wireless-dev.patch
-Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1131,13 +1130,11 @@
 ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
-#ApplyPatch linux-2.6-wireless.patch
+ApplyPatch linux-2.6-wireless.patch
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
 # Add the wireless stack updates and drivers from wireless-dev
 ApplyPatch git-wireless-dev.patch
-# temp compat patch for iwlwifi firmware filenames
-ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
 
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1802,6 +1799,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
 * Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git7
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch	30 Aug 2007 20:27:32 -0000	1.3
+++ linux-2.6-wireless-pending.patch	18 Sep 2007 14:01:35 -0000	1.4
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 15:51:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 09:36:24.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 09:38:01.000000000 -0400
 @@ -1,7 +1,9 @@
  /*
 - * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -11,10 +12,49 @@
   *
   * 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
-@@ -192,13 +194,19 @@ struct ieee80211_tx_control {
+@@ -71,14 +73,13 @@ struct ieee80211_channel {
+ #define IEEE80211_RATE_SUPPORTED 0x00000010
+ #define IEEE80211_RATE_OFDM 0x00000020
+ #define IEEE80211_RATE_CCK 0x00000040
+-#define IEEE80211_RATE_TURBO 0x00000080
+ #define IEEE80211_RATE_MANDATORY 0x00000100
+ 
+ #define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+ #define IEEE80211_RATE_MODULATION(f) \
+ 	(f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+ 
+-/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
++/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
+  * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+  * configuration. */
+ struct ieee80211_rate {
+@@ -99,12 +100,10 @@ struct ieee80211_rate {
+ 
+ /* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+  * actually be both in 11b and 11g modes at the same time. */
+-enum {
++enum ieee80211_phymode {
+ 	MODE_IEEE80211A, /* IEEE 802.11a */
+ 	MODE_IEEE80211B, /* IEEE 802.11b only */
+-	MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+ 	MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+-	MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+ 
+ 	/* keep last */
+ 	NUM_IEEE80211_MODES
+@@ -165,7 +164,6 @@ struct ieee80211_low_level_stats {
+ /* Transmit control fields. This data structure is passed to low-level driver
+  * with each TX frame. The low-level driver is responsible for configuring
+  * the hardware to use given values (depending on what is supported). */
+-#define HW_KEY_IDX_INVALID -1
+ 
+ struct ieee80211_tx_control {
+ 	int tx_rate; /* Transmit rate, given as the hw specific value for the
+@@ -191,17 +189,21 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_REQUEUE		(1<<7)
  #define IEEE80211_TXCTL_FIRST_FRAGMENT	(1<<8) /* this is a first fragment of
  						* the frame */
- #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
 +#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
 +						  * using the through
 +						  * set_retry_limit configured
@@ -22,6 +62,8 @@
  	u32 flags;			       /* tx control flags defined
  						* above */
 -	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, .. */
++	u8 key_idx;		/* keyidx from hw->set_key(), undefined if
++				 * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
 +	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, ..
 +				 * This could be used when set_retry_limit
 +				 * is not implemented by the driver */
@@ -29,12 +71,78 @@
  	u8 antenna_sel_tx; 	/* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
 -	s8 key_idx;		/* -1 = do not encrypt, >= 0 keyidx from
 -				 * hw->set_key() */
-+	s8 key_idx;		/* HW_KEY_IDX_INVALID = do not encrypt,
-+				 * other values: keyidx from hw->set_key() */
  	u8 icv_len;		/* length of the ICV/MIC field in octets */
  	u8 iv_len;		/* length of the IV field in octets */
- 	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
-@@ -288,28 +296,10 @@ struct ieee80211_conf {
+-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+ 	u8 queue;		/* hardware queue to use for this frame;
+ 				 * 0 = highest, hw->queues-1 = lowest */
+ 	u8 sw_retry_attempt;	/* number of times hw has tried to
+@@ -219,22 +221,56 @@ struct ieee80211_tx_control {
+ 	int ifindex;	/* internal */
+ };
+ 
+-/* Receive status. The low-level driver should provide this information
+- * (the subset supported by hardware) to the 802.11 code with each received
+- * frame. */
++
++/**
++ * enum mac80211_rx_flags - receive flags
++ *
++ * These flags are used with the @flag member of &struct ieee80211_rx_status.
++ * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
++ *	Use together with %RX_FLAG_MMIC_STRIPPED.
++ * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
++ * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
++ * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
++ *	verification has been done by the hardware.
++ * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
++ *	If this flag is set, the stack cannot do any replay detection
++ *	hence the driver or hardware will have to do that.
++ */
++enum mac80211_rx_flags {
++	RX_FLAG_MMIC_ERROR	= 1<<0,
++	RX_FLAG_DECRYPTED	= 1<<1,
++	RX_FLAG_RADIOTAP	= 1<<2,
++	RX_FLAG_MMIC_STRIPPED	= 1<<3,
++	RX_FLAG_IV_STRIPPED	= 1<<4,
++};
++
++/**
++ * struct ieee80211_rx_status - receive status
++ *
++ * The low-level driver should provide this information (the subset
++ * supported by hardware) to the 802.11 code with each received
++ * frame.
++ * @mactime: MAC timestamp as defined by 802.11
++ * @freq: frequency the radio was tuned to when receiving this frame, in MHz
++ * @channel: channel the radio was tuned to
++ * @phymode: active PHY mode
++ * @ssi: signal strength when receiving this frame
++ * @signal: used as 'qual' in statistics reporting
++ * @noise: PHY noise when receiving this frame
++ * @antenna: antenna used
++ * @rate: data rate
++ * @flag: %RX_FLAG_*
++ */
+ struct ieee80211_rx_status {
+ 	u64 mactime;
+-	int freq; /* receive frequency in Mhz */
++	int freq;
+ 	int channel;
+ 	int phymode;
+ 	int ssi;
+-	int signal; /* used as qual in statistics reporting */
++	int signal;
+ 	int noise;
+ 	int antenna;
+ 	int rate;
+-#define RX_FLAG_MMIC_ERROR	(1<<0)
+-#define RX_FLAG_DECRYPTED	(1<<1)
+-#define RX_FLAG_RADIOTAP	(1<<2)
+ 	int flag;
+ };
+ 
+@@ -288,28 +324,10 @@ struct ieee80211_conf {
  	u8 power_level;			/* transmit power limit for current
  					 * regulatory domain; in dBm */
  	u8 antenna_max;			/* maximum antenna gain */
@@ -63,39 +171,69 @@
  };
  
  /**
-@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+@@ -402,40 +420,86 @@ struct ieee80211_if_conf {
  	struct ieee80211_tx_control *beacon_control;
  };
  
 -typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
 -ieee80211_key_alg;
-+typedef enum {
++/**
++ * enum ieee80211_key_alg - key algorithm
++ * @ALG_NONE: Unset key algorithm, will never be passed to the driver
++ * @ALG_WEP: WEP40 or WEP104
++ * @ALG_TKIP: TKIP
++ * @ALG_CCMP: CCMP (AES)
++ */
++typedef enum ieee80211_key_alg {
 +	ALG_NONE,
 +	ALG_WEP,
 +	ALG_TKIP,
 +	ALG_CCMP,
 +} ieee80211_key_alg;
  
-+/*
-+ * This flag indiciates that the station this key is being
-+ * configured for may use QoS. If your hardware cannot handle
-+ * that situation it should reject that key.
-+ */
-+#define IEEE80211_KEY_FLAG_WMM_STA	(1<<0)
  
- struct ieee80211_key_conf {
-+	/*
-+	 * To be set by the driver to the key index it would like to
-+	 * get in the ieee80211_tx_control.key_idx which defaults
-+	 * to HW_KEY_IDX_INVALID so that shouldn't be used.
-+	 */
[...4086 lines suppressed...]
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-09-18 09:37:00.000000000 -0400
 @@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
   */
  static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -24651,8 +25194,9 @@
  	}
  }
  EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-08-30 16:06:06.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -0,0 +1,961 @@
 +/*
 +
@@ -25615,8 +26159,9 @@
 +
 +module_init(if_cs_init);
 +module_exit(if_cs_exit);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-08-30 16:07:03.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-09-18 09:37:00.000000000 -0400
 @@ -1,52 +0,0 @@
 -#ifndef	__WLAN_THREAD_H_
 -#define	__WLAN_THREAD_H_
@@ -25670,8 +26215,9 @@
 -}
 -
 -#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-09-18 09:37:00.000000000 -0400
 @@ -38,7 +38,7 @@ struct bootcmdrespStr
  
  /* read callback private data */
@@ -25706,8 +26252,9 @@
 -int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
 -
  #endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-09-18 09:37:00.000000000 -0400
 @@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(s
  
  //      mutex_lock(&priv->mutex);
@@ -25741,8 +26288,9 @@
  
  	if (ret) {
  		ret = 0;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-09-18 09:37:00.000000000 -0400
 @@ -15,14 +15,9 @@ struct wlan_private;
  struct sk_buff;
  struct net_device;
@@ -25799,8 +26347,9 @@
 +int libertas_reset_device(wlan_private *priv);
  
  #endif				/* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-09-18 09:37:00.000000000 -0400
 @@ -67,6 +67,7 @@ struct rtl8187_priv {
  	struct rtl818x_csr *map;
  	void (*rf_init)(struct ieee80211_hw *);
@@ -25809,8 +26358,9 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 09:37:00.000000000 -0400
 @@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
  	int rvalue;
  	enum oid_num_t n = dwrq->flags;
@@ -25838,8 +26388,9 @@
  }
  
  void
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-09-18 09:37:00.000000000 -0400
 @@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
  	/* Alloc the cache */
  	for (i = 0; i < OID_NUM_LAST; i++) {
@@ -25855,8 +26406,9 @@
  		} else
  			priv->mib[i] = NULL;
  	}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-18 09:37:00.000000000 -0400
 @@ -63,11 +63,6 @@ config WAVELAN
  	  a Radio LAN (wireless Ethernet-like Local Area Network) using the
  	  radio frequencies 900 MHz and 2.4 GHz.
@@ -25991,8 +26543,9 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
  
  static void wl3501_online(struct net_device *dev)
@@ -26297,8 +26850,30 @@
  	if (link->open) {
  		wl3501_reset(dev);
  		netif_device_attach(dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-09-18 09:36:26.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 09:40:20.000000000 -0400
+@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm4
+ 		goto err_gpio_cleanup;
+ 	bcm43xx_radio_turn_on(bcm);
+ 	bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+-	dprintk(KERN_INFO PFX "Radio %s by hardware\n",
++	printk(KERN_INFO PFX "Radio %s by hardware\n",
+ 		(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
+ 
+ 	bcm43xx_write16(bcm, 0x03E6, 0x0000);
+@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(s
+ 	radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+ 	if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+ 		bcm->radio_hw_enable = radio_hw_enable;
+-		dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
++		printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ 		       (radio_hw_enable == 0) ? "disabled" : "enabled");
+ 		bcm43xx_leds_update(bcm, 0);
+ 	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c
 --- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-09-18 09:37:00.000000000 -0400
 @@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
  		goto final;
  	}
@@ -26362,8 +26937,9 @@
  		arlan_command(arlan_device[devnum], ARLAN_COMMAND_CLEAN_AND_RESET);
  
  	} else
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-09-18 09:37:00.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/wireless.h>
@@ -26381,8 +26957,9 @@
  	u16 infofid; /* MAC buffer id for info frame */
  	/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
  	 * txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 09:37:00.000000000 -0400
 @@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
  {
  	int res, ret = 0;
@@ -26392,8 +26969,9 @@
  	local_info_t *local = iface->local;
  	tuple_t tuple;
  	cisparse_t *parse = NULL;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-09-18 09:37:00.000000000 -0400
 @@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
  	    local->hw_downloading)
  		return -ENODEV;
@@ -26463,8 +27041,9 @@
  	local = iface->local;
  
  	/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 09:37:00.000000000 -0400
 @@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
  static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
  				     size_t len)


--- linux-2.6-iwlwifi-fw-name-compat.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:03:48 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:03:48 -0400
Subject: rpms/perl-DateTime/devel .cvsignore, 1.16, 1.17 perl-DateTime.spec, 
	1.20, 1.21 sources, 1.16, 1.17
Message-ID: <200709181403.l8IE3mcE008704@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8660

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Log Message:
Update to DateTime 0.41.
Update to DateTime::Locale 0.35.
Update to DateTime::TimeZone 0.67.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	22 Jul 2007 19:38:54 -0000	1.16
+++ .cvsignore	18 Sep 2007 14:02:57 -0000	1.17
@@ -1,3 +1,3 @@
-DateTime-0.39.tar.gz
-DateTime-Locale-0.34.tar.gz
-DateTime-TimeZone-0.6603.tar.gz
+DateTime-0.41.tar.gz
+DateTime-Locale-0.35.tar.gz
+DateTime-TimeZone-0.67.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-DateTime.spec	29 Aug 2007 05:51:03 -0000	1.20
+++ perl-DateTime.spec	18 Sep 2007 14:02:57 -0000	1.21
@@ -1,9 +1,9 @@
-%define DTTimeZone_version 0.6603
-%define DTLocale_version 0.34
+%define DTTimeZone_version 0.67
+%define DTLocale_version 0.35
 
 Name:           perl-DateTime
-Version:        0.39
-Release:        2%{?dist}
+Version:        0.41
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL or Artistic
@@ -143,11 +143,16 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 1:0.41-1
+- Update to DateTime 0.41.
+- Update to DateTime::Locale 0.35.
+- Update to DateTime::TimeZone 0.67.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1:0.39-2
 - Rebuild for selinux ppc32 issue.
 
 * Sun Jul 22 2007 Steven Pritchard <steve at kspei.com> 1:0.39-1
-- Update to DateTIme 0.39.
+- Update to DateTime 0.39.
 - Update to DateTime::TimeZone 0.6603.
 
 * Thu Jul 05 2007 Steven Pritchard <steve at kspei.com> 1:0.38-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	22 Jul 2007 19:38:54 -0000	1.16
+++ sources	18 Sep 2007 14:02:57 -0000	1.17
@@ -1,3 +1,3 @@
-89af4113ddc943e9deaef4cfb11c19dd  DateTime-0.39.tar.gz
-18753fcc10e72f0a63f926f8790e7fc3  DateTime-Locale-0.34.tar.gz
-178b126286a00ad9871908c2e6efcff0  DateTime-TimeZone-0.6603.tar.gz
+cbd27b0d9a3eee5ffa6afb9211b19a9e  DateTime-0.41.tar.gz
+857b23381a1a8e7dc2e7d0caa285827d  DateTime-Locale-0.35.tar.gz
+4684adbdf78d863a3526d5d9a52b4d79  DateTime-TimeZone-0.67.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:08:46 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 18 Sep 2007 10:08:46 -0400
Subject: devel/automake17 automake17.spec,1.14,1.15
Message-ID: <200709181408.l8IE8kL6009382@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/automake17
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9353

Modified Files:
	automake17.spec 
Log Message:
- next attempt of getting the conflicts/obsoletes right (Stepan Kasal)


Index: automake17.spec
===================================================================
RCS file: /cvs/extras/devel/automake17/automake17.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- automake17.spec	18 Sep 2007 13:16:08 -0000	1.14
+++ automake17.spec	18 Sep 2007 14:08:13 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake17
 Version:    %{api_version}.9
-Release:    10
+Release:    11
 License:    GPLv2+ and MIT and OFSFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -13,8 +13,8 @@
 Patch1:     automake-1.7.9-check.patch
 Patch2:     automake-1.7.9-info.patch
 URL:        http://sources.redhat.com/automake
-Conflicts:  automake = 1.7.9
-Obsoletes:  automake = 1.7.9
+Conflicts:  automake < 1.8
+Obsoletes:  automake < 1.8
 Requires:   autoconf >= 2.54
 Buildrequires:  autoconf >= 2.54, texinfo
 # Required for 'make check':
@@ -95,6 +95,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-11
+- next attempt of getting the conflicts/obsoletes right (Stepan Kasal)
+
 * Tue Sep 18 2007 Karsten Hopp <karsten at redhat.com> 1.7.9-10
 - fix obsoletes
 - mv check into %%check



From fedora-extras-commits at redhat.com  Tue Sep 18 14:17:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:17:51 -0700
Subject: [pkgdb] ncompress (Fedora, devel) updated by jkeating
Message-ID: <200709181417.l8IEHqHI010486@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of ncompress in Fedora devel to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncompress



From fedora-extras-commits at redhat.com  Tue Sep 18 14:17:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:17:51 -0700
Subject: [pkgdb] ncompress (Fedora, 7) updated by jkeating
Message-ID: <200709181417.l8IEHqIV010498@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of ncompress in Fedora 7 to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncompress



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:01 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:01 -0700
Subject: [pkgdb] uucp (Fedora, devel) updated by jkeating
Message-ID: <200709181418.l8IEI2oe010538@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of uucp in Fedora devel to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uucp



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:01 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:01 -0700
Subject: [pkgdb] uucp (Fedora, 7) updated by jkeating
Message-ID: <200709181418.l8IEI3Uu010553@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of uucp in Fedora 7 to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uucp



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:12 -0700
Subject: [pkgdb] system-config-netboot (Fedora, devel) updated by jkeating
Message-ID: <200709181418.l8IEICTP010602@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of system-config-netboot in Fedora devel to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From fedora-extras-commits at redhat.com  Tue Sep 18 14:18:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 07:18:12 -0700
Subject: [pkgdb] system-config-netboot (Fedora, 7) updated by jkeating
Message-ID: <200709181418.l8IEIDW0010614@app4.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of system-config-netboot in Fedora 7 to rbrich

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From fedora-extras-commits at redhat.com  Tue Sep 18 14:23:47 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 10:23:47 -0400
Subject: rpms/xulrunner/devel add-gecko-provides.in, NONE,
	1.1 xulrunner-mozconfig, 1.1, 1.2 xulrunner.spec, 1.13, 1.14
Message-ID: <200709181423.l8IENlLv009962@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9863

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Added Files:
	add-gecko-provides.in 
Log Message:
* Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
- build fixes




--- NEW FILE add-gecko-provides.in ---
#!/bin/sh
#
# Use the internal provides generator"
#
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
provides=`echo $filelist | /usr/lib/rpm/find-provides`
echo $provides

#
# Now output the stuff we want to add
#
core_files=`echo $filelist | grep "libxpcom\.so" | wc -l`
devel_files=`echo $filelist | grep "firefox\-xpcom\.pc" | wc -l`
debug_files=`echo $filelist | grep "libxpcom\.so\.debug" | wc -l`
if [ $debug_files -eq 0 ]; then
  if [ $devel_files -gt 0 ]; then
    echo "gecko-devel = @GECKO_VERSION@"
  elif [ $core_files -gt 0 ]; then
    echo "gecko-libs = @GECKO_VERSION@"
  fi
fi


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-mozconfig	31 Aug 2007 04:34:18 -0000	1.1
+++ xulrunner-mozconfig	18 Sep 2007 14:23:14 -0000	1.2
@@ -1,5 +1,7 @@
 . $topsrcdir/xulrunner/config/mozconfig
 
+ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -22,7 +24,7 @@
 ac_add_options --disable-gnomeui
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-extensions=default,cookie
-ac_add_options --prefix=/usr
+
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xulrunner.spec	6 Sep 2007 04:07:04 -0000	1.13
+++ xulrunner.spec	18 Sep 2007 14:23:14 -0000	1.14
@@ -1,5 +1,3 @@
-%define indexhtml file:///usr/share/doc/HTML/index.html
-%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define desktop_file_utils_version 0.9
 %define nspr_version 4.6
 %define nss_version 3.11.1
@@ -14,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.1%{?dist}
+Release:        0.alpha7.2%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -28,14 +26,14 @@
 Source12:       %{name}-redhat-default-prefs.js
 #Source20:       %{name}.desktop
 #Source21:       %{name}.sh.in
-#Source22:       firefox.png
 Source23:       %{name}.1
-#Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
+Source101:      add-gecko-provides.in
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         camellia256.patch
+Patch3:         xulrunner-compile.patch
 
 # customization patches
 Patch21:        firefox-0.7.3-psfonts.patch
@@ -123,23 +121,8 @@
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
 %patch2   -R -p1 -b .camellia256
-#%patch3  -p1
-#%patch4  -p1
-#%patch5  -p1 -b .visibility
-
-#%patch20 -p0
-#%patch21 -p1 -b .psfonts
-#%patch22 -p0 -b .default-applications
-#%patch40 -p1 -b .bullet-bill
-#%patch41 -p1 -b .undo-uriloader
-#%patch42 -p0 -b .uriloader
-#%patch81 -p1 -b .nopangoxft
-#%patch82 -p1 -b .pango-mathml
-#%patch83 -p1 -b .pango-cursor-position
-#%patch84 -p0 -b .pango-printing
+%patch3   -p1
 
-#%patch100 -p1 -b .thread-cleanup
-#%patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 
 # For branding specific patches.
@@ -160,10 +143,6 @@
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
-# set up our default bookmarks
-cp %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
-
-
 #---------------------------------------------------------------------
 
 %build
@@ -197,7 +176,8 @@
 INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
 MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
 
-#DESTDIR=$RPM_BUILD_ROOT make install
+DESTDIR=$RPM_BUILD_ROOT make install
+
 %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
              $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_NAME} \
              $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_NAME}
@@ -208,34 +188,17 @@
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-#%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
 #desktop-file-install --vendor mozilla \
 #  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
 #  --add-category WebBrowser \
 #  --add-category Network \
 #  %{SOURCE20} 
 
-%if 0
-# set up the xulrunner start script
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \
-  $RPM_BUILD_ROOT%{_bindir}/xulrunner
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/xulrunner
-%endif
-
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,RPM_VERREL,%{version}-%{release},g' > rh-default-prefs
 %{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
-# set up our default bookmarks
-%{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/defaults/profile/bookmarks.html
-ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT${MOZ_APP_DIR}/defaults/profile/bookmarks.html
-
-%{__cat} %{SOURCE50} | %{__sed} -e "s,FFDIR,${MOZ_APP_DIR},g" -e 's,LIBDIR,%{_libdir},g' > \
-  $RPM_BUILD_ROOT${MOZ_APP_DIR}/firefox-xremote-client
-
-%{__chmod} 755 $RPM_BUILD_ROOT${MOZ_APP_DIR}/firefox-xremote-client
 %{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
 %{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config
@@ -286,10 +249,16 @@
 GRE_PATH=${MOZ_APP_DIR}
 EOF
 
+GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
+%{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
+                        %{_builddir}/add-gecko-provides
+chmod 700 %{_builddir}/add-gecko-provides
+                        
 # Copy over the LICENSE
 install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
 
 # ghost files
+%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/components
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
 
@@ -316,7 +285,6 @@
 %defattr(-,root,root,-)
 %{_bindir}/xulrunner
 %exclude %{_bindir}/xulrunner-config
-%{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/*
 %{_libdir}/mozilla
 %dir /etc/gre.d
@@ -332,7 +300,6 @@
 %{_libdir}/%{name}-*/components/*.so
 %{_libdir}/%{name}-*/components/*.xpt
 %{_libdir}/%{name}-*/components/*.js
-%{_libdir}/%{name}-*/crashreporter
 %{_libdir}/%{name}-*/defaults
 %{_libdir}/%{name}-*/greprefs
 %{_libdir}/%{name}-*/icons
@@ -340,12 +307,12 @@
 %{_libdir}/%{name}-*/plugins
 %{_libdir}/%{name}-*/res
 %{_libdir}/%{name}-*/*.so
-%{_libdir}/%{name}-*/firefox-xremote-client
 %{_libdir}/%{name}-*/mozilla-xremote-client
 %{_libdir}/%{name}-*/run-mozilla.sh
 %{_libdir}/%{name}-*/regxpcom
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
+%{_libdir}/%{name}-*/platform.ini
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*
@@ -360,6 +327,7 @@
 %{_libdir}/%{name}-*/xpidl
 %{_libdir}/%{name}-*/xpt_dump
 %{_libdir}/%{name}-*/xpt_link
+%{_libdir}/%{name}-*/*.a
 %{_libdir}/pkgconfig/%{name}-xpcom.pc
 %{_libdir}/pkgconfig/%{name}-plugin.pc
 %{_libdir}/pkgconfig/%{name}-js.pc
@@ -370,6 +338,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
+- build fixes
+
 * Wed Sep  5 2007 Christopher Aillon <caillon at redhat.com> 1.9-0.alpha7.1
 - Initial cut at XULRunner 1.9 Alpha 7
 - Temporarily revert camellia 256 support since our nss doesn't support it yet



From fedora-extras-commits at redhat.com  Tue Sep 18 14:25:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhZGVrIFZva8OhbCIgPHJ2b2thbEByZWRoYXQuY29tPg==?=))
Date: Tue, 18 Sep 2007 07:25:34 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181425.l8IEPY8Y012846@app4.fedora.phx.redhat.com>

Package micq in Fedora devel is now owned by Radek Vok?l (rvokal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Tue Sep 18 14:25:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhZGVrIFZva8OhbCIgPHJ2b2thbEByZWRoYXQuY29tPg==?=))
Date: Tue, 18 Sep 2007 07:25:58 -0700
Subject: [pkgdb] micq Orphaned
Message-ID: <200709181425.l8IEPwMm013623@app3.fedora.phx.redhat.com>

Package micq in Fedora devel was orphaned by Radek Vok?l (rvokal)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:54 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQt3k013208@app4.fedora.phx.redhat.com>

Package micq in Fedora devel is now owned by Ji?? Moskov??k (jmoskovc)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:57 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:57 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQvkB013895@app3.fedora.phx.redhat.com>

Package micq in Fedora 6 is now owned by Ji?? Moskov??k (jmoskovc)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Tue Sep 18 14:26:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkppxZnDrSBNb3Nrb3bEjcOhayIgPGptb3Nrb3ZjQHJlZGhhdC5jb20+?=))
Date: Tue, 18 Sep 2007 07:26:58 -0700
Subject: [pkgdb] micq Owned
Message-ID: <200709181426.l8IEQwlW013907@app3.fedora.phx.redhat.com>

Package micq in Fedora 7 is now owned by Ji?? Moskov??k (jmoskovc)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/micq



From fedora-extras-commits at redhat.com  Tue Sep 18 14:27:18 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 10:27:18 -0400
Subject: rpms/xulrunner/devel xulrunner-compile.patch,NONE,1.1
Message-ID: <200709181427.l8IERIv7010073@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10061

Added Files:
	xulrunner-compile.patch 
Log Message:
added a compile patch

xulrunner-compile.patch:

--- NEW FILE xulrunner-compile.patch ---
diff -up mozilla/toolkit/xre/Makefile.in.old mozilla/toolkit/xre/Makefile.in
--- mozilla/toolkit/xre/Makefile.in.old	2007-09-17 17:13:01.000000000 +0200
+++ mozilla/toolkit/xre/Makefile.in	2007-09-17 17:12:33.000000000 +0200
@@ -263,5 +263,5 @@ platform.ini: FORCE
 libs:: platform.ini
 	$(INSTALL) $^ $(DIST)/bin
 
-install::
-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
+install:: platform.ini
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)



From fedora-extras-commits at redhat.com  Tue Sep 18 14:28:35 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Sep 2007 10:28:35 -0400
Subject: rpms/libkdcraw/devel .cvsignore, 1.3, 1.4 libkdcraw.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709181428.l8IESZLf010159@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/libkdcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10107

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
- Update to 0.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jun 2007 20:57:25 -0000	1.3
+++ .cvsignore	18 Sep 2007 14:28:02 -0000	1.4
@@ -1 +1 @@
-libkdcraw-0.1.1.tar.bz2
+libkdcraw-0.1.2.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/libkdcraw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libkdcraw.spec	31 Aug 2007 09:17:32 -0000	1.4
+++ libkdcraw.spec	18 Sep 2007 14:28:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libkdcraw
-Version:	0.1.1
-Release:	3%{?dist}
+Version:	0.1.2
+Release:	1%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -46,8 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# hack, 0.1.1 is missing translations -- Rex
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
 
@@ -74,7 +73,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw1/
+%{_libdir}/libkdcraw2/
 %{_datadir}/icons/hicolor/*/apps/kdcraw.png
 
 %files devel
@@ -84,6 +83,9 @@
 %{_libdir}/libkdcraw.so
 
 %changelog
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
+- Update to 0.1.2
+
 * Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-3
 - Fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jun 2007 20:57:25 -0000	1.3
+++ sources	18 Sep 2007 14:28:02 -0000	1.4
@@ -1 +1 @@
-46108744a7d8b0b9b0eaa9737c5e1fba  libkdcraw-0.1.1.tar.bz2
+38ed88e8b7387526113f150c349c8eb4  libkdcraw-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 14:34:12 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 10:34:12 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.48,1.49
Message-ID: <200709181434.l8IEYCr1010508@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10467

Modified Files:
	pwlib.spec 
Log Message:
- rebuild for chain-build
Daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pwlib.spec	18 Sep 2007 12:36:57 -0000	1.48
+++ pwlib.spec	18 Sep 2007 14:33:39 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 License: MPL
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-2
+- rebuild for chain-build
+
 * Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
 - Update to 1.10.10
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:35:31 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 18 Sep 2007 10:35:31 -0400
Subject: rpms/tcpdump/devel tcpdump-3.9.7-ikev2.patch, NONE, 1.1 tcpdump.spec,
	1.64, 1.65
Message-ID: <200709181435.l8IEZVht010547@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10524

Modified Files:
	tcpdump.spec 
Added Files:
	tcpdump-3.9.7-ikev2.patch 
Log Message:
- support decoding IKEv2 packets


tcpdump-3.9.7-ikev2.patch:

--- NEW FILE tcpdump-3.9.7-ikev2.patch ---
Index: tcpdump/interface.h
===================================================================
RCS file: /tcpdump/master/tcpdump/interface.h,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- tcpdump/interface.h	8 Aug 2007 17:20:58 -0000	1.278
+++ tcpdump/interface.h	29 Aug 2007 12:31:00 -0000	1.279
@@ -356,6 +356,7 @@
 
 /* forward compatibility */
 
+#ifndef NETDISSECT_REWORKED
 extern netdissect_options *gndo;
 
 #define eflag gndo->ndo_eflag 
@@ -389,3 +390,4 @@
 #define snaplen     gndo->ndo_snaplen
 #define snapend     gndo->ndo_snapend
 
+#endif
Index: tcpdump/isakmp.h
===================================================================
RCS file: /tcpdump/master/tcpdump/isakmp.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tcpdump/isakmp.h	11 Dec 2002 07:13:54 -0000	1.10
+++ tcpdump/isakmp.h	29 Aug 2007 02:38:14 -0000	1.11
@@ -81,7 +81,7 @@
 #define ISAKMP_TIMER_DEFAULT     10 /* seconds */
 #define ISAKMP_TRY_DEFAULT        3 /* times */
 
-/* 3.1 ISAKMP Header Format
+/* 3.1 ISAKMP Header Format (IKEv1 and IKEv2)
          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
         !                          Initiator                            !
@@ -128,8 +128,11 @@
 #define ISAKMP_NPTYPE_D     12 /* Delete */
 #define ISAKMP_NPTYPE_VID   13 /* Vendor ID */
 
-#define ISAKMP_MAJOR_VERSION  1
-#define ISAKMP_MINOR_VERSION  0
+#define IKEv1_MAJOR_VERSION  1
+#define IKEv1_MINOR_VERSION  0
+
+#define IKEv2_MAJOR_VERSION  2
+#define IKEv2_MINOR_VERSION  0
 
 /* Exchange Type */
 #define ISAKMP_ETYPE_NONE   0 /* NONE */
@@ -142,6 +145,13 @@
 /* Flags */
 #define ISAKMP_FLAG_E 0x01 /* Encryption Bit */
 #define ISAKMP_FLAG_C 0x02 /* Commit Bit */
+#define ISAKMP_FLAG_extra 0x04
+
+/* IKEv2 */
+#define ISAKMP_FLAG_I (1 << 3)  /* (I)nitiator */
+#define ISAKMP_FLAG_V (1 << 4)  /* (V)ersion   */
+#define ISAKMP_FLAG_R (1 << 5)  /* (R)esponse  */
+
 
 /* 3.2 Payload Generic Header
          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -151,7 +161,7 @@
 */
 struct isakmp_gen {
 	u_int8_t  np;       /* Next Payload */
-	u_int8_t  reserved; /* RESERVED, unused, must set to 0 */
+	u_int8_t  critical; /* bit 7 - critical, rest is RESERVED */
 	u_int16_t len;      /* Payload Length */
 };
 
@@ -188,7 +198,7 @@
 	message of a Base Exchange (see Section 4.4) and the value "0" in the
 	first message of an Identity Protect Exchange (see Section 4.5).
 	*/
-struct isakmp_pl_sa {
+struct ikev1_pl_sa {
 	struct isakmp_gen h;
 	u_int32_t doi; /* Domain of Interpretation */
 	u_int32_t sit; /* Situation */
@@ -202,7 +212,7 @@
 	last within the security association proposal, then this field will
 	be 0.
 	*/
-struct isakmp_pl_p {
+struct ikev1_pl_p {
 	struct isakmp_gen h;
 	u_int8_t p_no;      /* Proposal # */
 	u_int8_t prot_id;   /* Protocol */
@@ -218,7 +228,7 @@
 	then this field will be 3.  If the current Transform payload is the
 	last within the proposal, then this field will be 0.
 	*/
-struct isakmp_pl_t {
+struct ikev1_pl_t {
 	struct isakmp_gen h;
 	u_int8_t  t_no;     /* Transform # */
 	u_int8_t  t_id;     /* Transform-Id */
@@ -227,14 +237,14 @@
 };
 
 /* 3.7 Key Exchange Payload */
-struct isakmp_pl_ke {
+struct ikev1_pl_ke {
 	struct isakmp_gen h;
 	/* Key Exchange Data */
 };
 
 /* 3.8 Identification Payload */
 	/* MUST NOT to be used, because of being defined in ipsec-doi. */
-struct isakmp_pl_id {
+struct ikev1_pl_id {
 	struct isakmp_gen h;
 	union {
 		u_int8_t  id_type;   /* ID Type */
@@ -244,7 +254,7 @@
 };
 
 /* 3.9 Certificate Payload */
-struct isakmp_pl_cert {
+struct ikev1_pl_cert {
 	struct isakmp_gen h;
 	u_int8_t encode; /* Cert Encoding */
 	char   cert;   /* Certificate Data */
@@ -268,7 +278,7 @@
 #define ISAKMP_CERT_SPKI   9
 
 /* 3.10 Certificate Request Payload */
-struct isakmp_pl_cr {
+struct ikev1_pl_cr {
 	struct isakmp_gen h;
 	u_int8_t num_cert; /* # Cert. Types */
 	/*
@@ -283,27 +293,27 @@
 
 /* 3.11 Hash Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_hash {
+struct ikev1_pl_hash {
 	struct isakmp_gen h;
 	/* Hash Data */
 };
 
 /* 3.12 Signature Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_sig {
+struct ikev1_pl_sig {
 	struct isakmp_gen h;
 	/* Signature Data */
 };
 
 /* 3.13 Nonce Payload */
 	/* may not be used, because of having only data. */
-struct isakmp_pl_nonce {
+struct ikev1_pl_nonce {
 	struct isakmp_gen h;
 	/* Nonce Data */
 };
 
 /* 3.14 Notification Payload */
-struct isakmp_pl_n {
+struct ikev1_pl_n {
 	struct isakmp_gen h;
 	u_int32_t doi;      /* Domain of Interpretation */
 	u_int8_t  prot_id;  /* Protocol-ID */
@@ -347,7 +357,7 @@
 #define ISAKMP_LOG_RETRY_LIMIT_REACHED           65530
 
 /* 3.15 Delete Payload */
-struct isakmp_pl_d {
+struct ikev1_pl_d {
 	struct isakmp_gen h;
 	u_int32_t doi;      /* Domain of Interpretation */
 	u_int8_t  prot_id;  /* Protocol-Id */
@@ -357,15 +367,15 @@
 };
 
 
-struct isakmp_ph1tab {
-	struct isakmp_ph1 *head;
-	struct isakmp_ph1 *tail;
+struct ikev1_ph1tab {
+	struct ikev1_ph1 *head;
+	struct ikev1_ph1 *tail;
 	int len;
 };
 
 struct isakmp_ph2tab {
-	struct isakmp_ph2 *head;
-	struct isakmp_ph2 *tail;
+	struct ikev1_ph2 *head;
+	struct ikev1_ph2 *tail;
 	int len;
 };
 
[...2245 lines suppressed...]
+		ND_PRINT((ndo,"%s", NPSTR(np)));
+		cp += item_len;
+	}
+
+	return cp;
+trunc:
+	ND_PRINT((ndo," [|isakmp]"));
+	return NULL;
+}
+
+static const u_char *
+ikev2_sub_print(netdissect_options *ndo,
+		u_char np, const struct isakmp_gen *ext, const u_char *ep,
+		u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+{
+	const u_char *cp;
+	int i;
+	int pcount;
+	struct isakmp_gen e;
+
+	cp = (const u_char *)ext;
+	pcount = 0;						
+	while (np) {
+		pcount++;
+		ND_TCHECK(*ext);
+		
+		safememcpy(&e, ext, sizeof(e));
+
+		ND_TCHECK2(*ext, ntohs(e.len));
+
+		depth++;
+		ND_PRINT((ndo,"\n"));
+		for (i = 0; i < depth; i++)
+			ND_PRINT((ndo,"    "));
+		ND_PRINT((ndo,"("));
+		cp = ikev2_sub0_print(ndo, np, pcount,
+				      ext, ep, phase, doi, proto, depth);
+		ND_PRINT((ndo,")"));
+		depth--;
+
+		if (cp == NULL) {
+			/* Zero-length subitem */
+			return NULL;
 		}
 
-		printf(":");
+		np = e.np;
+		ext = (struct isakmp_gen *)cp;
+	}
+	return cp;
+trunc:
+	ND_PRINT((ndo," [|%s]", NPSTR(np)));
+	return NULL;
+}
+
+static void
+ikev2_print(netdissect_options *ndo,
+	    const u_char *bp,  u_int length,
+	    const u_char *bp2 _U_, struct isakmp *base)
+{
+	const struct isakmp *p;
+	const u_char *ep;
+	u_char np;
+	int phase;
+
+	p = (const struct isakmp *)bp;
+	ep = ndo->ndo_snapend;
+
+	phase = (*(u_int32_t *)base->msgid == 0) ? 1 : 2;
+	if (phase == 1)
+		ND_PRINT((ndo, " parent_sa"));
+	else
+		ND_PRINT((ndo, " child_sa "));
+
+	ND_PRINT((ndo, " %s", ETYPESTR(base->etype)));
+	if (base->flags) {
+		ND_PRINT((ndo, "[%s%s]",
+			  base->flags & ISAKMP_FLAG_I ? "I" : "",
+			  base->flags & ISAKMP_FLAG_V ? "V" : "",
+			  base->flags & ISAKMP_FLAG_R ? "R" : ""));
+	}
+
+	if (ndo->ndo_vflag) {
+		const struct isakmp_gen *ext;
+		int nparen;
+
+		ND_PRINT((ndo, ":"));
 
 		/* regardless of phase... */
-		if (base.flags & ISAKMP_FLAG_E) {
+		if (base->flags & ISAKMP_FLAG_E) {
 			/*
 			 * encrypted, nothing we can do right now.
 			 * we hope to decrypt the packet in the future...
 			 */
-			printf(" [encrypted %s]", NPSTR(base.np));
+			ND_PRINT((ndo, " [encrypted %s]", NPSTR(base->np)));
 			goto done;
 		}
 
 		nparen = 0;
-		CHECKLEN(p + 1, base.np)
+		CHECKLEN(p + 1, base->np)
 
-		np = base.np;
+		np = base->np;
 		ext = (struct isakmp_gen *)(p + 1);
-		isakmp_sub_print(np, ext, ep, phase, 0, 0, 0);
+		ikev2_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);
 	}
 
 done:
-	if (vflag) {
-		if (ntohl(base.len) != length) {
-			printf(" (len mismatch: isakmp %u/ip %u)",
-				(u_int32_t)ntohl(base.len), length);
+	if (ndo->ndo_vflag) {
+		if (ntohl(base->len) != length) {
+			ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",
+				  (u_int32_t)ntohl(base->len), length));
 		}
 	}
 }
 
 void
+isakmp_print(netdissect_options *ndo,
+	     const u_char *bp, u_int length,
+	     const u_char *bp2)
+{
+	const struct isakmp *p;
+	struct isakmp base;
+	const u_char *ep;
+	int major, minor;
+
+	p = (const struct isakmp *)bp;
+	ep = ndo->ndo_snapend;
+
+	if ((struct isakmp *)ep < p + 1) {
+		ND_PRINT((ndo,"[|isakmp]"));
+		return;
+	}
+
+	safememcpy(&base, p, sizeof(base));
+
+	ND_PRINT((ndo,"isakmp"));
+	major = (base.vers & ISAKMP_VERS_MAJOR)
+		>> ISAKMP_VERS_MAJOR_SHIFT;
+	minor = (base.vers & ISAKMP_VERS_MINOR)
+		>> ISAKMP_VERS_MINOR_SHIFT;
+
+	if (ndo->ndo_vflag) {
+		ND_PRINT((ndo," %d.%d", major, minor));
+	}
+
+	if (ndo->ndo_vflag) {
+		ND_PRINT((ndo," msgid "));
+		rawprint(ndo, (caddr_t)&base.msgid, sizeof(base.msgid));
+	}
+
+	if (1 < ndo->ndo_vflag) {
+		ND_PRINT((ndo," cookie "));
+		rawprint(ndo, (caddr_t)&base.i_ck, sizeof(base.i_ck));
+		ND_PRINT((ndo,"->"));
+		rawprint(ndo, (caddr_t)&base.r_ck, sizeof(base.r_ck));
+	}
+	ND_PRINT((ndo,":"));
+
+	switch(major) {
+	case IKEv1_MAJOR_VERSION:
+		ikev1_print(ndo, bp, length, bp2, &base);
+		break;
+
+	case IKEv2_MAJOR_VERSION:
+		ikev2_print(ndo, bp, length, bp2, &base);
+		break;
+	}
+}
+
+void
 isakmp_rfc3948_print(netdissect_options *ndo,
 		     const u_char *bp, u_int length,
 		     const u_char *bp2)
@@ -1429,7 +2355,7 @@
 	if(length < 4) {
 		goto trunc;
 	}
-
+	
 	/*
 	 * see if this is an IKE packet
 	 */
@@ -1459,7 +2385,7 @@
 	}
 
 trunc:
-	printf("[|isakmp]");
+	ND_PRINT((ndo,"[|isakmp]"));
 	return;
 }
 


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- tcpdump.spec	22 Aug 2007 12:24:32 -0000	1.64
+++ tcpdump.spec	18 Sep 2007 14:34:58 -0000	1.65
@@ -2,7 +2,7 @@
 Name: tcpdump
 Epoch: 14
 Version: 3.9.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -15,6 +15,7 @@
 Patch1: tcpdump-3.9.7-droproot.patch
 Patch2: tcpdump-3.6.1-portnumbers.patch
 Patch3: tcpdump-3.9.7-crypto.patch
+Patch4: tcpdump-3.9.7-ikev2.patch
 Patch5: tcpslice-1.2a3-time.patch
 Patch6: tcpslice-CVS.20010207-bpf.patch
 
@@ -34,6 +35,7 @@
 %patch1 -p1 -b .droproot
 %patch2 -p1 -b .portnumbers
 %patch3 -p1 -b .crypto
+%patch4 -p1 -b .ikev2
 
 pushd %{tcpslice_dir}
 %patch5 -p1 -b .time
@@ -89,6 +91,9 @@
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Tue Sep 18 2007 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.7-5
+- support decoding IKEv2 packets
+
 * Wed Aug 22 2007 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.7-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:39:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 10:39:04 -0400
Subject: rpms/exiv2/devel exiv2.spec,1.12,1.13
Message-ID: <200709181439.l8IEd4Nj010720@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10647

Modified Files:
	exiv2.spec 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-4
- -libs: -Requires: %name



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- exiv2.spec	22 Aug 2007 15:09:56 -0000	1.12
+++ exiv2.spec	18 Sep 2007 14:38:31 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.15
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -44,7 +44,8 @@
 Summary: Exif and Iptc metadata manipulation library
 Group: System Environment/Libraries
 # not *strictly* required, but runtime may expect presence of exiv2 binary
-Requires: %{name} = %{version}-%{release}
+# we'll try removing it, and see... -- Rex
+#Requires: %{name} = %{version}-%{release}
 %description libs
 A C++ library to access image metadata, supporting full read and write access
 to the Exif and Iptc metadata, Exif MakerNote support, extract and delete 
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-4
+- -libs: -Requires: %%name
+
 * Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-3
 - -libs subpkg to be multilib-friendlier
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:39:19 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 10:39:19 -0400
Subject: rpms/opal/devel .cvsignore, 1.10, 1.11 opal.spec, 1.21, 1.22 sources,
	1.11, 1.12
Message-ID: <200709181439.l8IEdJRI010763@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10643

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- upstream release of 2.2.11
Daniel




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Sep 2007 12:49:23 -0000	1.10
+++ .cvsignore	18 Sep 2007 14:38:47 -0000	1.11
@@ -5,3 +5,4 @@
 opal-2.2.7.tar.gz
 opal-2.2.8.tar.gz
 opal-2.2.10.tar.gz
+opal-2.2.11.tar.gz


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- opal.spec	18 Sep 2007 12:49:23 -0000	1.21
+++ opal.spec	18 Sep 2007 14:38:47 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.10
+Version: 2.2.11
 Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.11-1
+- upstream release of 2.2.11
+
 * Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.10-1
 - upstream release of 2.2.10
 - includes the 2 cisco patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Sep 2007 12:49:23 -0000	1.11
+++ sources	18 Sep 2007 14:38:47 -0000	1.12
@@ -1 +1 @@
-ef8b858c666afc375830f6cd216a0601  opal-2.2.10.tar.gz
+eb4a9c0c9ea93ec95c876aaeadf83936  opal-2.2.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:19 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfJAk018195@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:21 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfLui017512@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:22 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:22 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfMnw018215@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:24 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfOE8018228@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:26 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfQwi017546@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:28 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfSwI017557@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:29 -0700
Subject: [pkgdb] nc had acl change status
Message-ID: <200709181441.l8IEfT3c018258@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:45 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 10:41:45 -0400
Subject: rpms/libkexiv2/devel .cvsignore, 1.5, 1.6 libkexiv2.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200709181441.l8IEfjIN011897@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libkexiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10814

Modified Files:
	.cvsignore libkexiv2.spec sources 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.6-1
- libkexiv2-0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2007 13:49:57 -0000	1.5
+++ .cvsignore	18 Sep 2007 14:41:13 -0000	1.6
@@ -1,3 +1,2 @@
 clog
-libkexiv2-0.1.4.tar.bz2
-libkexiv2-0.1.5.tar.bz2
+libkexiv2-0.1.6.tar.bz2


Index: libkexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/libkexiv2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libkexiv2.spec	12 Aug 2007 02:34:14 -0000	1.6
+++ libkexiv2.spec	18 Sep 2007 14:41:13 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary: A library to manipulate EXIF/IPTC information 
 Name:	 libkexiv2
-Version: 0.1.5
-Release: 2%{?dist}
+Version: 0.1.6
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -14,7 +14,7 @@
 
 BuildRequires: gettext
 BuildRequires: exiv2-devel >= 0.14
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs-devel
 
 %description
 A wrapper for Exiv2 library to manipulate picture metadata, used by 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.6-1
+- libkexiv2-0.1.6
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.5-2
 - License: GPLv2+
 - BR: kdelibs3-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkexiv2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 May 2007 13:49:57 -0000	1.5
+++ sources	18 Sep 2007 14:41:13 -0000	1.6
@@ -1 +1 @@
-4171b8e929b11ffd82e31bf00f359a19  libkexiv2-0.1.5.tar.bz2
+8a256ac6a3895720a88b29eaf932917c  libkexiv2-0.1.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:50 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:50 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfpQ6018374@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:49 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfoxr017663@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:51 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:51 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfq33017686@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:52 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfr5a018390@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc6 (Fedora devel) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:56 -0700
Subject: [pkgdb] nc6: jsafrane has given up watchcommits
Message-ID: <200709181441.l8IEfuMa018415@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has given up the watchcommits acl on nc6 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:55 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:55 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfu56017709@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchbugzilla acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:58 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:58 -0700
Subject: [pkgdb] nc6: jsafrane has requested watchcommits
Message-ID: <200709181441.l8IEfwA2017727@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has requested the watchcommits acl on nc6 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:41:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:41:59 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181441.l8IEfxHT018435@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the watchcommits acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:42:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:42:00 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181442.l8IEg0CF017750@app4.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the commit acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:42:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IkphbiDFoGFmcsOhbmVrIiA8anNhZnJhbmVAcmVkaGF0LmNvbT4=?=))
Date: Tue, 18 Sep 2007 07:42:01 -0700
Subject: [pkgdb] nc6 had acl change status
Message-ID: <200709181442.l8IEg1xS018453@app3.fedora.phx.redhat.com>

Jan ?afr?nek (jsafrane) has set the approveacls acl on nc6 (Fedora 7) to Approved for Jan ?afr?nek (jsafrane)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nc6



From fedora-extras-commits at redhat.com  Tue Sep 18 14:43:27 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:43:27 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.56,1.57
Message-ID: <200709181443.l8IEhRB7013081@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13047

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- policy-20070703.patch	17 Sep 2007 23:26:58 -0000	1.56
+++ policy-20070703.patch	18 Sep 2007 14:42:55 -0000	1.57
@@ -4736,7 +4736,7 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 10:39:32.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4754,7 +4754,15 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -52,3 +51,4 @@
+@@ -26,6 +25,7 @@
+ /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
+ /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
+ /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
+ /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
+@@ -52,3 +52,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)



From fedora-extras-commits at redhat.com  Tue Sep 18 14:44:56 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 18 Sep 2007 10:44:56 -0400
Subject: rpms/emacs/devel emacs.spec, 1.98, 1.99 python-mode-init.el, 1.1,
	NONE python-mode.el, 1.3, NONE
Message-ID: <200709181444.l8IEiuHN013168@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13140

Modified Files:
	emacs.spec 
Removed Files:
	python-mode-init.el python-mode.el 
Log Message:
* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-5
- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
- drop broken python mode (Resolves: bz262801)




Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- emacs.spec	11 Sep 2007 17:56:57 -0000	1.98
+++ emacs.spec	18 Sep 2007 14:44:24 -0000	1.99
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -12,12 +12,10 @@
 Source2: emacs.png
 Source3: dotemacs.el
 Source4: site-start.el
-Source5: http://www.python.org/emacs/python-mode/python-mode.el
 Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
 Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz
 Source8: php-mode-init.el
 Source9: ssl.el
-Source10: python-mode-init.el
 Source11: rpm-spec-mode-init.el
 Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch
 Source13: focus-init.el
@@ -34,7 +32,7 @@
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
 Requires: emacs-common = %{version}-%{release}
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
@@ -105,7 +103,7 @@
 
 # install rest of site-lisp files
 ( cd site-lisp
-  cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
+  cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
   tar xfz %SOURCE7  # php-mode
   # xemacs compat patch for rpm-spec-mode
   patch < %SOURCE12
@@ -301,6 +299,10 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-5
+- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
+- drop broken python mode (Resolves: bz262801)
+
 * Mon Sep 10 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
 - fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood)
 - use macro instead of variable style for buildroot.


--- python-mode-init.el DELETED ---


--- python-mode.el DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 14:45:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:45:36 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.57,1.58
Message-ID: <200709181445.l8IEja4u013206@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- policy-20070703.patch	18 Sep 2007 14:42:55 -0000	1.57
+++ policy-20070703.patch	18 Sep 2007 14:45:04 -0000	1.58
@@ -4769,7 +4769,7 @@
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 10:43:40.000000000 -0400
 @@ -81,12 +81,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
@@ -4847,7 +4847,15 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -221,17 +228,37 @@
+@@ -202,6 +209,7 @@
+ files_dontaudit_getattr_all_tmp_files(cupsd_t)
+ 
+ selinux_compute_access_vector(cupsd_t)
++selinux_validate_context(cupsd_t)
+ 
+ init_exec_script_files(cupsd_t)
+ 
+@@ -221,17 +229,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -4885,7 +4893,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +290,16 @@
+@@ -263,16 +291,16 @@
  ')
  
  optional_policy(`
@@ -4906,7 +4914,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +404,14 @@
+@@ -377,6 +405,14 @@
  ')
  
  optional_policy(`
@@ -4921,7 +4929,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -560,7 +595,7 @@
+@@ -560,7 +596,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -4930,7 +4938,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +622,6 @@
+@@ -587,8 +623,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  



From fedora-extras-commits at redhat.com  Tue Sep 18 14:46:31 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Tue, 18 Sep 2007 10:46:31 -0400
Subject: rpms/libX11/F-7 libX11-1.1.2-GetMotionEvents.patch, NONE,
	1.1 libX11.spec, 1.35, 1.36
Message-ID: <200709181446.l8IEkVss013325@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13244

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 1.0.3-10
- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
  to match the argument order in the headers. (#274671)


libX11-1.1.2-GetMotionEvents.patch:

--- NEW FILE libX11-1.1.2-GetMotionEvents.patch ---
diff -up libX11-1.1.2/src/GetMoEv.c.jx libX11-1.1.2/src/GetMoEv.c
--- libX11-1.1.2/src/GetMoEv.c.jx	2007-06-02 13:46:55.000000000 -0400
+++ libX11-1.1.2/src/GetMoEv.c	2007-09-17 09:30:24.000000000 -0400
@@ -33,9 +33,9 @@ in this Software without prior written a
 
 XTimeCoord *XGetMotionEvents(
     register Display *dpy,
+    Window w,
     Time start, 
     Time stop,
-    Window w,
     int *nEvents)  /* RETURN */
 {       
     xGetMotionEventsReply rep;


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-7/libX11.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libX11.spec	22 Apr 2007 01:56:53 -0000	1.35
+++ libX11.spec	18 Sep 2007 14:45:58 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,6 +18,7 @@
 Patch3: bug-201284.patch
 Patch4: libX11-fd-leak.patch
 Patch5: libX11-cve-2007-1667.patch
+Patch6: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -61,6 +62,7 @@
 %patch3 -p1 -b .3-bug201284
 %patch4 -p1 -b .xim-fd-leak
 %patch5 -p1 -b .cve-2007-1667
+%patch6 -p1 -b .getmoev
 
 %build
 %configure \
@@ -245,6 +247,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 1.0.3-10
+- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
+  to match the argument order in the headers. (#274671)
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-9
 - Don't install INSTALL
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:47:19 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:47:19 -0400
Subject: rpms/perl-Module-Load-Conditional/devel .cvsignore, 1.6,
	1.7 perl-Module-Load-Conditional.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200709181447.l8IElJjO013403@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367

Modified Files:
	.cvsignore perl-Module-Load-Conditional.spec sources 
Log Message:
Update to 0.18.
BR Test::More.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Jan 2007 21:07:33 -0000	1.6
+++ .cvsignore	18 Sep 2007 14:46:46 -0000	1.7
@@ -1 +1 @@
-Module-Load-Conditional-0.16.tar.gz
+Module-Load-Conditional-0.18.tar.gz


Index: perl-Module-Load-Conditional.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/perl-Module-Load-Conditional.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Module-Load-Conditional.spec	18 Apr 2007 16:53:59 -0000	1.7
+++ perl-Module-Load-Conditional.spec	18 Sep 2007 14:46:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Module-Load-Conditional
-Version:        0.16
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Looking up module information / loading at runtime
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load)
 BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(version) >= 0.69
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.18-1
+- Update to 0.18.
+- BR Test::More.
+
 * Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.16-2
 - BR ExtUtils::MakeMaker.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Jan 2007 21:07:33 -0000	1.6
+++ sources	18 Sep 2007 14:46:46 -0000	1.7
@@ -1 +1 @@
-fae73541e0b1d87d0bbe6e1676e5e738  Module-Load-Conditional-0.16.tar.gz
+8c5c2b0ae465cbbcca433bd8a2040ec3  Module-Load-Conditional-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:47:54 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 10:47:54 -0400
Subject: rpms/Maelstrom/devel sources,1.2,1.3
Message-ID: <200709181447.l8IElsTi013481@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/Maelstrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13397

Modified Files:
	sources 
Log Message:
update new upstream tarball with license tweak



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2005 20:45:11 -0000	1.2
+++ sources	18 Sep 2007 14:47:22 -0000	1.3
@@ -1 +1 @@
-8aab0e75ca52808fd6777535ebb1f1c4  Maelstrom-3.0.6.tar.gz
+4fbeb6070eebdf161bd156b083b8804e  Maelstrom-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:49:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 10:49:31 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.123, 1.124 sources, 1.134,
	1.135
Message-ID: <200709181449.l8IEnV9M013546@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13522

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	27 Aug 2007 21:43:05 -0000	1.123
+++ .cvsignore	18 Sep 2007 14:48:59 -0000	1.124
@@ -125,3 +125,4 @@
 serefpolicy-3.0.5.tgz
 serefpolicy-3.0.6.tgz
 serefpolicy-3.0.7.tgz
+serefpolicy-3.0.8.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	27 Aug 2007 21:43:05 -0000	1.134
+++ sources	18 Sep 2007 14:48:59 -0000	1.135
@@ -1 +1 @@
-cf3ad58b7f285398e7b19a9f2d097f8e  serefpolicy-3.0.7.tgz
+df2a00dede379f39b537889ace0b85cb  serefpolicy-3.0.8.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:50:47 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 10:50:47 -0400
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.4,1.5
Message-ID: <200709181450.l8IEol0M013750@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13704

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
fix download url


Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Finance-Quote.spec	3 Aug 2007 18:13:05 -0000	1.4
+++ perl-Finance-Quote.spec	18 Sep 2007 14:50:13 -0000	1.5
@@ -5,7 +5,7 @@
 Group:          Development/Libraries
 License:        GPLv2+
 URL:		http://finance-quote.sourceforge.net/
-Source0:	http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/Finance-Quote-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/finance-quote/Finance-Quote-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -43,8 +43,10 @@
 %{perl_vendorlib}/Finance/
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com>
+- fix source download URL
+
 * Fri Aug  3 2007 Bill Nottingham <notting at redhat.com>
 - tweak license tag
 



From fedora-extras-commits at redhat.com  Tue Sep 18 14:52:18 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:52:18 -0400
Subject: rpms/perl-Test-Deep/devel .cvsignore, 1.5, 1.6 perl-Test-Deep.spec, 
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200709181452.l8IEqIO8013936@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.098.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2007 18:30:04 -0000	1.5
+++ .cvsignore	18 Sep 2007 14:51:45 -0000	1.6
@@ -1 +1 @@
-Test-Deep-0.097.tar.gz
+Test-Deep-0.098.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Test-Deep.spec	12 Aug 2007 18:30:04 -0000	1.6
+++ perl-Test-Deep.spec	18 Sep 2007 14:51:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.097
+Version:        0.098
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.098-1
+- Update to 0.098.
+
 * Fri Aug 10 2007 Steven Pritchard <steve at kspei.com> 0.097-1
 - Update to 0.097.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2007 18:30:04 -0000	1.5
+++ sources	18 Sep 2007 14:51:45 -0000	1.6
@@ -1 +1 @@
-87a1f6c05009baaa5513f14c328ce367  Test-Deep-0.097.tar.gz
+61cb7357d39b173d1a29080079f471df  Test-Deep-0.098.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:53:44 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 10:53:44 -0400
Subject: rpms/perl-YAML-Syck/devel .cvsignore, 1.6, 1.7 perl-YAML-Syck.spec, 
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200709181453.l8IEriTH014057@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-YAML-Syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14002

Modified Files:
	.cvsignore perl-YAML-Syck.spec sources 
Log Message:
Update to 0.97.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Aug 2007 18:35:38 -0000	1.6
+++ .cvsignore	18 Sep 2007 14:53:11 -0000	1.7
@@ -1 +1 @@
-YAML-Syck-0.96.tar.gz
+YAML-Syck-0.97.tar.gz


Index: perl-YAML-Syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-YAML-Syck.spec	12 Aug 2007 18:35:38 -0000	1.7
+++ perl-YAML-Syck.spec	18 Sep 2007 14:53:11 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-YAML-Syck
-Version:        0.96
+Version:        0.97
 Release:        1%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
 License:        MIT
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.97-1
+- Update to 0.97.
+
 * Sun Aug 12 2007 Steven Pritchard <steve at kspei.com> 0.96-1
 - Update to 0.96.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Aug 2007 18:35:38 -0000	1.6
+++ sources	18 Sep 2007 14:53:11 -0000	1.7
@@ -1 +1 @@
-69d7526a845c014d92059f9e368c34d0  YAML-Syck-0.96.tar.gz
+14c5459f8a09e98f8d11e0367e489787  YAML-Syck-0.97.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 14:54:33 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 18 Sep 2007 10:54:33 -0400
Subject: rpms/koan/devel koan.spec,1.22,1.23
Message-ID: <200709181454.l8IEsXIJ014138@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14100

Modified Files:
	koan.spec 
Log Message:
Update specfile to fix EVR (thought I already did this?)




Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	10 Sep 2007 14:32:04 -0000	1.22
+++ koan.spec	18 Sep 2007 14:54:01 -0000	1.23
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.2
-Release: 1%{?dist}
+Version: 0.6.1
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -49,9 +49,6 @@
 
 %changelog
 
-* Mon Sep 04 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-1
-- Upstream changes (see CHANGELOG)
-
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:01:59 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 11:01:59 -0400
Subject: rpms/apr-util/F-7 apr-util-1.2.8-dbddso.patch, 1.3,
	1.4 apr-util.spec, 
	1.36, 1.37 apr_dbd_mysql.c, 1.1, 1.2 sources, 1.9, 1.10
Message-ID: <200709181501.l8IF1xhf020256@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224

Modified Files:
	apr-util-1.2.8-dbddso.patch apr-util.spec apr_dbd_mysql.c 
	sources 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
- update to 1.2.10


apr-util-1.2.8-dbddso.patch:

Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-util-1.2.8-dbddso.patch	23 Mar 2007 09:45:59 -0000	1.3
+++ apr-util-1.2.8-dbddso.patch	18 Sep 2007 15:01:55 -0000	1.4
@@ -229,7 +229,7 @@
  #if APU_HAVE_MYSQL
      DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
  #endif
-@@ -94,62 +92,68 @@
+@@ -94,64 +92,70 @@
  #if APU_HAVE_SOME_OTHER_BACKEND
      DRIVER_LOAD("firebird", apr_dbd_other_driver, pool);
  #endif
@@ -285,16 +285,18 @@
 +    pool = apr_hash_pool_get(drivers);
  
  #ifdef WIN32
-     sprintf(path, "apr_dbd_%s.dll", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
+ #elif defined(NETWARE)
+     apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
  #else
--    sprintf(path, "apr_dbd_%s.so", name);
+-    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
 +    apr_snprintf(path, sizeof path, APU_DSO_LIBDIR "/apr_dbd_%s.so", name);
  #endif
      rv = apr_dso_load(&dlhandle, path, pool);
      if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
          goto unlock;
      }
-     sprintf(path, "apr_dbd_%s_driver", name);
+     apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
 -    rv = apr_dso_sym((void*)driver, dlhandle, path);
 +    rv = apr_dso_sym(&symbol, dlhandle, path);
      if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */


Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- apr-util.spec	5 Apr 2007 16:10:00 -0000	1.36
+++ apr-util.spec	18 Sep 2007 15:01:55 -0000	1.37
@@ -3,12 +3,12 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.8
-Release: 7
+Version: 1.2.10
+Release: 1%{?dist}
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Source1: http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c
 Patch0: apr-util-1.2.2-exports.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
+- update to 1.2.10
+
 * Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
 - remove old Conflicts, doxygen BR (#225254)
 


Index: apr_dbd_mysql.c
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr_dbd_mysql.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_dbd_mysql.c	28 Feb 2007 12:52:44 -0000	1.1
+++ apr_dbd_mysql.c	18 Sep 2007 15:01:55 -0000	1.2
@@ -1,50 +1,19 @@
-/*
-         Copyright (c) 2003-7, WebThing Ltd and other contributors
- 
-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.  Alternatively, where this program
-is aggregated with the Apache APR-UTIL package version 1.2 or later,
-you can distribute and/or modify it under the terms of the Apache
-License 2.0 as published by the Apache Software Foundation.
- 
-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
-applicable 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.
-You may obtain a copy of the Apache License 2.0 at:
-http://www.apache.org/licenses/LICENSE-2.0
- 
-*/
-
-/* LICENSE NOTE
- *
- * The current GPL satisfies MySQL licensing terms without
- * invoking any exceptions.  ASF policy doesn't permit GPL
- * software to be distributed by apache.org, but this should
- * not be a problem for third-parties who wish to distribute
- * it alongside the APR and other Apache software.
- * 
- * It is updated to dual license after discussion with Debian
- * and taking into account MySQL's FOSS exception.
- * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
- * http://www.mysql.com/company/legal/licensing/foss-exception.html
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * MAINTAINERS
- *
- * This code was originally written by Nick Kew for MySQL 4.1.
- * and subsequently updated by others to support MySQL 5.0.
- * The current lead maintainer is Bojan Smojver, with others
- * contributing via the developer list at apr.apache.org.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
 #include "apu.h"
 #define HAVE_MYSQL_MYSQL_H
 
@@ -74,17 +43,9 @@
 
 struct apr_dbd_prepared_t {
     MYSQL_STMT* stmt;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int nargs;
-    int nvals;
-    apr_dbd_type_e *types;
-#endif
 };
 
 struct apr_dbd_transaction_t {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    int mode;
-#endif
     int errnum;
     apr_dbd_t *handle;
 };
@@ -100,156 +61,12 @@
     MYSQL_RES *res;
     MYSQL_STMT *statement;
     MYSQL_BIND *bind;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    apr_pool_t *pool;
-#endif
 };
 struct apr_dbd_row_t {
     MYSQL_ROW row;
     apr_dbd_results_t *res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    unsigned long *len;
-#endif
-};
-
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-/* MySQL specific bucket for BLOB types */
-typedef struct apr_bucket_lob apr_bucket_lob;
-/**
- * A bucket referring to a MySQL BLOB
- */
-struct apr_bucket_lob {
-    /** Number of buckets using this memory */
-    apr_bucket_refcount  refcount;
-    /** The row this bucket refers to */
-    const apr_dbd_row_t *row;
-    /** The column this bucket refers to */
-    int col;
-    /** The pool into which any needed structures should
-     *  be created while reading from this bucket */
-    apr_pool_t *readpool;
 };
 
-static void lob_bucket_destroy(void *data);
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block);
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p);
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list);
-
-static const apr_bucket_type_t apr_bucket_type_lob = {
-    "LOB", 5, APR_BUCKET_DATA,
-    lob_bucket_destroy,
-    lob_bucket_read,
-    apr_bucket_setaside_notimpl,
-    apr_bucket_shared_split,
-    apr_bucket_shared_copy
-};
-
-static void lob_bucket_destroy(void *data)
-{
-    apr_bucket_lob *f = data;
-
-    if (apr_bucket_shared_destroy(f)) {
-        /* no need to destroy database objects here; it will get
-         * done automatically when the pool gets cleaned up */
-        apr_bucket_free(f);
-    }
-}
-
-static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
-                                    apr_size_t *len, apr_read_type_e block)
-{
-    apr_bucket_lob *a = e->data;
-    const apr_dbd_row_t *row = a->row;
-    apr_dbd_results_t *res = row->res;
-    int col = a->col;
-    apr_bucket *b = NULL;
-    int rv;
-    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
-    apr_off_t boffset = e->start;
-    MYSQL_BIND *bind = &res->bind[col];
-
-    *str = NULL;  /* in case we die prematurely */
-
-    /* fetch from offset if not at the beginning */
-    if (boffset > 0) {
-        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
-        if (rv != 0) {
-            return APR_EGENERAL;
-        }
-    }
-    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
-    *len = e->length - blength;
-    *str = bind->buffer;
-
-    /* allocate new buffer, since we used this one for the bucket */
-    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
-
-    /*
-     * Change the current bucket to refer to what we read,
-     * even if we read nothing because we hit EOF.
-     */
-    apr_bucket_pool_make(e, *str, *len, res->pool);
-
-    /* If we have more to read from the field, then create another bucket */
-    if (blength > 0) {
-        /* for efficiency, we can just build a new apr_bucket struct
-         * to wrap around the existing LOB bucket */
-        b = apr_bucket_alloc(sizeof(*b), e->list);
-        b->start  = boffset + *len;
-        b->length = blength;
-        b->data   = a;
-        b->type   = &apr_bucket_type_lob;
-        b->free   = apr_bucket_free;
-        b->list   = e->list;
-        APR_BUCKET_INSERT_AFTER(e, b);
-    }
-    else {
-        lob_bucket_destroy(a);
-    }
-
-    return APR_SUCCESS;
-}
-
-static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
-                                       const apr_dbd_row_t *row, int col,
-                                       apr_off_t offset, apr_size_t len,
-                                       apr_pool_t *p)
-{
-    apr_bucket_lob *f;
-
-    f = apr_bucket_alloc(sizeof(*f), b->list);
-    f->row = row;
-    f->col = col;
-    f->readpool = p;
-
-    b = apr_bucket_shared_make(b, f, offset, len);
-    b->type = &apr_bucket_type_lob;
-
-    return b;
-}
-
-static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
-                                         apr_off_t offset,
-                                         apr_size_t len, apr_pool_t *p,
-                                         apr_bucket_alloc_t *list)
-{
-    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
-    APR_BUCKET_INIT(b);
-    b->free = apr_bucket_free;
-    b->list = list;
-    return apr_bucket_lob_make(b, row, col, offset, len, p);
-}
-
-#endif
-
 static apr_status_t free_result(void *data)
 {
     mysql_free_result(data);
@@ -273,9 +90,6 @@
             }
             (*results)->random = seek;
             (*results)->statement = NULL;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-            (*results)->pool = pool;
-#endif
             if (seek) {
                 (*results)->res = mysql_store_result(sql->conn);
             }
@@ -289,27 +103,12 @@
         ret = mysql_errno(sql->conn);
     }
     
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
-{
-    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
-        return NULL;
-    }
-
-    return mysql_fetch_fields(res->res)[n].name;
-}
-#endif
-
 static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **row, int rownum)
 {
@@ -352,9 +151,6 @@
         }
         (*row)->row = r;
         (*row)->res = res;
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        (*row)->len = mysql_fetch_lengths(res->res);
-#endif
     }
     else {
         apr_pool_cleanup_run(pool, res->res, free_result);
@@ -412,160 +208,6 @@
 }
 #endif
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
-                                        apr_dbd_type_e type, void *data)
-{
-    if (row->res->statement) {
-        MYSQL_BIND *bind = &row->res->bind[n];
-        unsigned long len = *bind->length;
-
-        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
-            return APR_EGENERAL;
-        }
-
-        if (*bind->is_null) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(bind->buffer);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(bind->buffer);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
-            *(char**)data = bind->buffer;
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_lob_create(row, n, 0, len,
-                                      row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    else {
-        if (row->row[n] == NULL) {
-            return APR_ENOENT;
-        }
-
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            *(char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UTINY:
-            *(unsigned char*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_SHORT:
-            *(short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_USHORT:
-            *(unsigned short*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_INT:
-            *(int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_UINT:
-            *(unsigned int*)data = atoi(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONG:
-            *(long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONG:
-            *(unsigned long*)data = atol(row->row[n]);
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            *(float*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            *(double*)data = atof(row->row[n]);
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            *(char**)data = row->row[n];
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            {
-            apr_bucket *e;
-            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
-
-            e = apr_bucket_pool_create(row->row[n], row->len[n],
-                                       row->res->pool, b->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(b, e);
-            }
-            break;
-        case APR_DBD_TYPE_NULL:
-            *(void**)data = NULL;
-            break;
-        default:
-            return APR_EGENERAL;
-        }
-    }
-    return 0;
-}
-#endif
-
 static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
 {
     return mysql_error(sql->conn);
@@ -582,11 +224,7 @@
         ret = mysql_errno(sql->conn);
     }
     *nrows = mysql_affected_rows(sql->conn);
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-#else
     if (sql->trans) {
-#endif
         sql->trans->errnum = ret;
     }
     return ret;
@@ -607,467 +245,6 @@
     return APR_SUCCESS;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
-                             const char *query, const char *label,
-                             int nargs, int nvals, apr_dbd_type_e *types,
-                             apr_dbd_prepared_t **statement)
-{
-    /* Translate from apr_dbd to native query format */
-    int ret;
-
-    if (!*statement) {
-        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
-    }
-    (*statement)->stmt = mysql_stmt_init(sql->conn);
-
-    if ((*statement)->stmt) {
-        apr_pool_cleanup_register(pool, (*statement)->stmt,
-                                  stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
-
-        if (ret != 0) {
-            ret = mysql_stmt_errno((*statement)->stmt);
-        }
-
-        (*statement)->nargs = nargs;
-        (*statement)->nvals = nvals;
-        (*statement)->types = types;
-
-        return ret;
-    }
-
-    return CR_OUT_OF_MEMORY;
-}
-
-static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
-                           const char **values, MYSQL_BIND *bind)
-{
-    int i, j;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_unsigned = 0;
-        bind[i].is_null = NULL;
-
-        if (values[j] == NULL) {
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-        }
-        else {
-            switch (statement->types[i]) {
-            case APR_DBD_TYPE_BLOB:
-            case APR_DBD_TYPE_CLOB:
-                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = atol(values[++j]);
-
-                /* skip table and column */
-                j += 2;
-                break;
-            default:
-                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                bind[i].buffer = (void*)values[j];
-                bind[i].buffer_length = strlen(values[j]);
-                break;
-            }
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                     int *nrows, apr_dbd_prepared_t *statement,
-                                     MYSQL_BIND *bind)
-{
-    int ret;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            const char **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
-                                      apr_dbd_results_t **res,
-                                      apr_dbd_prepared_t *statement,
-                                      int random, MYSQL_BIND *bind)
-{
-    int nfields, i;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-            }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            (*res)->pool = pool;
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-                    }
-                    else {
-                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    }
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
-            }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
-            }
-        }
-    }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-
-    return ret;
-}
-
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             const char **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bind(statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              va_list args)
-{
-    const char **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const char*);
-    }
-
-    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
-}
-
-static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
-                            const void **values, MYSQL_BIND *bind)
-{
-    void *arg;
-    int i, j;
-    apr_dbd_type_e type;
-
-    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
-        arg = (void *)values[j];
-
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = NULL;
-
-        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
-        switch (type) {
-        case APR_DBD_TYPE_TINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UTINY:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_TINY;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_SHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_USHORT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_SHORT;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_INT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_UINT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONG:
-            if (sizeof(int) == sizeof(long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(int));
-                *(int*)bind[i].buffer = *(long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONG:
-            if (sizeof(unsigned int) == sizeof(unsigned long)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
-                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_LONGLONG:
-            if (sizeof(long long) == sizeof(apr_int64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(long long));
-                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_ULONGLONG:
-            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
-                bind[i].buffer = arg;
-            }
-            else {
-                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
-                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
-            }
-            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-            bind[i].is_unsigned = 1;
-            break;
-        case APR_DBD_TYPE_FLOAT:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_DOUBLE:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-            bind[i].is_unsigned = 0;
-            break;
-        case APR_DBD_TYPE_STRING:
-        case APR_DBD_TYPE_TEXT:
-        case APR_DBD_TYPE_TIME:
-        case APR_DBD_TYPE_DATE:
-        case APR_DBD_TYPE_DATETIME:
-        case APR_DBD_TYPE_TIMESTAMP:
-        case APR_DBD_TYPE_ZTIMESTAMP:
-            bind[i].buffer = arg;
-            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = strlen((const char *)arg);
-            break;
-        case APR_DBD_TYPE_BLOB:
-        case APR_DBD_TYPE_CLOB:
-            bind[i].buffer = (void *)arg;
-            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
-            bind[i].is_unsigned = 0;
-            bind[i].buffer_length = *(apr_size_t*)values[++j];
-
-            /* skip table and column */
-            j += 2;
-            break;
-        case APR_DBD_TYPE_NULL:
-        default:
-            bind[i].buffer_type = MYSQL_TYPE_NULL;
-            break;
-        }
-    }
-
-    return;
-}
-
-static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
-                             int *nrows, apr_dbd_prepared_t *statement,
-                             const void **values)
-{
-    MYSQL_BIND *bind;
-    int ret;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, values, bind);
-
-    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                              apr_dbd_prepared_t *statement, va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
-}
-
-static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                              apr_dbd_results_t **res,
-                              apr_dbd_prepared_t *statement, int random,
-                              const void **args)
-{
-    int ret;
-    MYSQL_BIND *bind;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
-
-    dbd_mysql_bbind(pool, statement, args, bind);
-
-    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
-
-    if (TXN_NOTICE_ERRORS(sql->trans)) {
-        sql->trans->errnum = ret;
-    }
-    return ret;
-}
-
-static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
-                               apr_dbd_results_t **res,
-                               apr_dbd_prepared_t *statement, int random,
-                               va_list args)
-{
-    const void **values;
-    int i;
-
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
-    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
-
-    for (i = 0; i < statement->nvals; i++) {
-        values[i] = va_arg(args, const void*);
-    }
-
-    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
-}
-#else
 static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
                              apr_dbd_prepared_t **statement)
@@ -1368,18 +545,12 @@
     }
     return ret;
 }
-#endif
 
 static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
 {
     int ret = -1;
     if (trans) {
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-        /* rollback on error or explicit rollback request */
-        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
-#else
         if (trans->errnum) {
-#endif
             trans->errnum = 0;
             ret = mysql_rollback(trans->handle->conn);
         }
@@ -1412,25 +583,6 @@
     return (*trans)->errnum;
 }
 
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode;
-}
-
-static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
-                                          int mode)
-{
-    if (!trans)
-        return APR_DBD_TRANSACTION_COMMIT;
-
-    return trans->mode = (mode & TXN_MODE_BITS);
-}
-#endif
-
 static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
 {
     static const char *const delims = " \r\n\t;|,";
@@ -1608,18 +760,6 @@
     dbd_mysql_pvselect,
     dbd_mysql_pquery,
     dbd_mysql_pselect
-#if APU_MAJOR_VERSION >= 2 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-    ,
-    dbd_mysql_get_name,
-    dbd_mysql_transaction_mode_get,
-    dbd_mysql_transaction_mode_set,
-    "?",
-    dbd_mysql_pvbquery,
-    dbd_mysql_pvbselect,
-    dbd_mysql_pbquery,
-    dbd_mysql_pbselect,
-    dbd_mysql_datum_get
-#endif
 };
 
 #endif


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Dec 2006 16:01:27 -0000	1.9
+++ sources	18 Sep 2007 15:01:55 -0000	1.10
@@ -1 +1 @@
-a2e2e54d65e9eae961f7171335cf2550  apr-util-1.2.8.tar.gz
+9277c21fe41065bd359db98c474aa998  apr-util-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:05:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 11:05:52 -0400
Subject: rpms/apr-util/F-7 apr-util.spec,1.37,1.38
Message-ID: <200709181505.l8IF5qKH020430@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20396

Modified Files:
	apr-util.spec 
Log Message:
- credit Bojan since this is a C&P



Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/F-7/apr-util.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- apr-util.spec	18 Sep 2007 15:01:55 -0000	1.37
+++ apr-util.spec	18 Sep 2007 15:05:19 -0000	1.38
@@ -137,7 +137,7 @@
 
 %changelog
 * Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.10-1.fc7
-- update to 1.2.10
+- update to 1.2.10 (Bojan Smojver)
 
 * Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
 - remove old Conflicts, doxygen BR (#225254)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:08:23 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:08:23 -0400
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.23,1.24
Message-ID: <200709181508.l8IF8N7p020529@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20501

Modified Files:
	docbook-utils.spec 
Log Message:
fixed wrong source URL


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- docbook-utils.spec	24 May 2007 11:02:58 -0000	1.23
+++ docbook-utils.spec	18 Sep 2007 15:07:49 -0000	1.24
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -18,7 +18,7 @@
 BuildRequires: perl-SGMLSpm, openjade, docbook-style-dsssl
 
 BuildArch: noarch
-Source0: ftp://sources.redhat.com/pub/docbook-tols/new-trials/SOURCES/%{name}-%{version}.tar.gz
+Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
 
@@ -119,7 +119,10 @@
 %{_mandir}/*/docbook2dvi.*
 %{_mandir}/*/docbook2ps.*
 
-%changelog
+%changelog 
+* Tue Sep 18 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-9
+- fixed typo in Source URL
+
 * Mon May 21 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-8
 - Added more fixes for handling spaces in directory name
 - SGML_FILE variable is factored out of SGML_ARGUMENTS



From fedora-extras-commits at redhat.com  Tue Sep 18 15:08:32 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Tue, 18 Sep 2007 11:08:32 -0400
Subject: rpms/kernel/F-7 git-wireless-dev.patch, 1.24, 1.25 kernel-2.6.spec, 
	1.3341, 1.3342 linux-2.6-wireless-pending.patch, 1.2,
	1.3 linux-2.6-wireless.patch, 1.9,
	1.10 linux-2.6-iwlwifi-fw-name-compat.patch, 1.1, NONE
Message-ID: <200709181508.l8IF8WJc020602@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20526

Modified Files:
	git-wireless-dev.patch kernel-2.6.spec 
	linux-2.6-wireless-pending.patch linux-2.6-wireless.patch 
Removed Files:
	linux-2.6-iwlwifi-fw-name-compat.patch 
Log Message:
wireless updates

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/git-wireless-dev.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- git-wireless-dev.patch	30 Aug 2007 21:54:14 -0000	1.24
+++ git-wireless-dev.patch	18 Sep 2007 15:08:24 -0000	1.25
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-18 10:53:37.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -66,8 +67,9 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +329,9 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig linux-2.6.22.noarch/include/linux/mod_devicetable.h
+--- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/mod_devicetable.h	2007-09-18 10:53:37.000000000 -0400
 @@ -333,4 +333,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID	0xffff
  #define PA_SVERSION_ANY_ID	0xffffffff
@@ -349,8 +352,9 @@
 +#define SSB_ANY_REV		0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -649,8 +653,9 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,396 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1048,8 +1053,9 @@
 +#endif /* CONFIG_SSB_SERIAL */
 +
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1255,8 +1261,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_EXTIF */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,46 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1304,8 +1311,9 @@
 +#endif /* CONFIG_SSB_DRIVER_MIPS */
 +
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,292 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1599,8 +1607,9 @@
 +
 +
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,106 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1708,8 +1717,9 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-09-18 10:53:37.000000000 -0400
 @@ -0,0 +1,424 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2135,8 +2145,9 @@
 +
 +
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:53:37.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2279,11 +2290,12 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:37:10.000000000 -0400
-@@ -539,6 +539,9 @@ struct ieee80211_hw {
- 	 * per-packet RC4 key with each TX frame when doing hwcrypto */
- #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:53:37.000000000 -0400
+@@ -563,6 +563,9 @@ struct ieee80211_hw {
+ 	 * specified in the device's EEPROM */
+ #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
  
 +	/* The device capable of supporting 11n */
 +#define IEEE80211_HW_SUPPORT_HT_MODE (1<<15)
@@ -2291,7 +2303,7 @@
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -691,8 +694,7 @@ struct ieee80211_ops {
+@@ -708,8 +711,7 @@ struct ieee80211_ops {
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -2301,7 +2313,7 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -752,8 +754,9 @@ struct ieee80211_ops {
+@@ -769,8 +771,9 @@ struct ieee80211_ops {
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -2313,7 +2325,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -769,6 +772,22 @@ struct ieee80211_ops {
+@@ -786,6 +789,22 @@ struct ieee80211_ops {
  	 * TSF synchronization. */
  	void (*reset_tsf)(struct ieee80211_hw *hw);
  
@@ -2336,8 +2348,9 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
---- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-08-30 17:37:10.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/iw_handler.h.orig linux-2.6.22.noarch/include/net/iw_handler.h
+--- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-09-18 10:53:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-09-18 10:53:37.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2353,8 +2366,9 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-08-30 17:36:08.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-08-30 17:37:10.000000000 -0400
[...90097 lines suppressed...]
++static void rs_clear(void *priv)
++{
++	return;
 +}
 +
++
 +static void *rs_alloc_sta(void *priv, gfp_t gfp)
 +{
 +	struct iwl_rate_scale_priv *rs_priv;
@@ -121750,11 +130388,6 @@
 +	IWL_DEBUG_RATE("leave\n");
 +}
 +
-+static void rs_clear(void *priv)
-+{
-+	IWL_DEBUG_RATE("NOP\n");
-+}
-+
 +/**
 + * rs_tx_status - Update rate control values based on Tx results
 + *
@@ -122249,8 +130882,7 @@
 +
 +	if (!local->rate_ctrl->ops->name ||
 +	    strcmp(local->rate_ctrl->ops->name, RS_NAME)) {
-+		IWL_WARNING("iwl-3945-rs not selected as rate control "
-+			    "aglo!\n");
++		IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");
 +		IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");
 +		return;
 +	}
@@ -122304,19 +130936,20 @@
 +		       iwl_rates[rs_priv->start_rate].plcp);
 +}
 +
-+void iwl_rate_control_register(void)
++void iwl_rate_control_register(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_register(&rs_ops);
 +}
 +
-+void iwl_rate_control_unregister(void)
++void iwl_rate_control_unregister(struct ieee80211_hw *hw)
 +{
 +	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,46 @@
 +/*
 + * Broadcom 43xx PCI-SSB bridge module
@@ -122364,8 +130997,9 @@
 +{
 +	ssb_pcihost_unregister(&b43_pci_bridge_driver);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Makefile
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,18 @@
 +# core
 +ssb-y					+= main.o scan.o
@@ -122385,8 +131019,9 @@
 +ssb-$(CONFIG_SSB_PCIHOST)		+= b43_pci_bridge.o
 +
 +obj-$(CONFIG_SSB)			+= ssb.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcmcia.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,271 @@
 +/*
 + * Sonics Silicon Backplane
@@ -122659,8 +131294,9 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/main.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,1162 @@
 +/*
 + * Sonics Silicon Backplane
@@ -123824,8 +132460,9 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -123931,8 +132568,9 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,223 @@
 +/*
 + * Sonics Silicon Backplane
@@ -124157,8 +132795,9 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/ssb_private.h
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,136 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -124296,8 +132935,9 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pci.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,740 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -125039,8 +133679,9 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,446 @@
 +/*
 + * Sonics Silicon Backplane
@@ -125488,8 +134129,9 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Kconfig
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,117 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -125608,8 +134250,9 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/scan.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126024,8 +134667,9 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_extif.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,129 @@
 +/*
 + * Sonics Silicon Backplane
@@ -126156,8 +134800,9 @@
 +				   mask, value);
 +}
 +
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-08-30 17:37:10.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-09-18 10:53:38.000000000 -0400
 @@ -0,0 +1,576 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3341
retrieving revision 1.3342
diff -u -r1.3341 -r1.3342
--- kernel-2.6.spec	13 Sep 2007 22:21:49 -0000	1.3341
+++ kernel-2.6.spec	18 Sep 2007 15:08:25 -0000	1.3342
@@ -613,9 +613,8 @@
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
 Patch690: git-wireless-dev.patch
-Patch700: linux-2.6-iwlwifi-fw-name-compat.patch
-Patch701: linux-2.6-b43-module-alias.patch
-Patch702: linux-2.6-b43-use-old-fw.patch
+Patch700: linux-2.6-b43-module-alias.patch
+Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
 Patch711: linux-2.6-netdev-forcedeth-realtek-oui.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
@@ -1345,8 +1344,6 @@
 
 # Add wireless stack and driver updates from wireless-dev
 ApplyPatch git-wireless-dev.patch
-# temp compat patch for iwlwifi firmware filenames
-ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -2351,6 +2348,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
 * Wed Sep 12 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.6 (official)
 - libata: add option to disable DMA on PATA devices

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-wireless-pending.patch	30 Aug 2007 21:54:14 -0000	1.2
+++ linux-2.6-wireless-pending.patch	18 Sep 2007 15:08:25 -0000	1.3
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:29:55.000000000 -0400
 @@ -1,7 +1,9 @@
  /*
 - * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -11,10 +12,49 @@
   *
   * 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
-@@ -192,13 +194,19 @@ struct ieee80211_tx_control {
+@@ -71,14 +73,13 @@ struct ieee80211_channel {
+ #define IEEE80211_RATE_SUPPORTED 0x00000010
+ #define IEEE80211_RATE_OFDM 0x00000020
+ #define IEEE80211_RATE_CCK 0x00000040
+-#define IEEE80211_RATE_TURBO 0x00000080
+ #define IEEE80211_RATE_MANDATORY 0x00000100
+ 
+ #define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+ #define IEEE80211_RATE_MODULATION(f) \
+ 	(f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+ 
+-/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
++/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
+  * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+  * configuration. */
+ struct ieee80211_rate {
+@@ -99,12 +100,10 @@ struct ieee80211_rate {
+ 
+ /* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+  * actually be both in 11b and 11g modes at the same time. */
+-enum {
++enum ieee80211_phymode {
+ 	MODE_IEEE80211A, /* IEEE 802.11a */
+ 	MODE_IEEE80211B, /* IEEE 802.11b only */
+-	MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+ 	MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+-	MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+ 
+ 	/* keep last */
+ 	NUM_IEEE80211_MODES
+@@ -165,7 +164,6 @@ struct ieee80211_low_level_stats {
+ /* Transmit control fields. This data structure is passed to low-level driver
+  * with each TX frame. The low-level driver is responsible for configuring
+  * the hardware to use given values (depending on what is supported). */
+-#define HW_KEY_IDX_INVALID -1
+ 
+ struct ieee80211_tx_control {
+ 	int tx_rate; /* Transmit rate, given as the hw specific value for the
+@@ -191,17 +189,21 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_REQUEUE		(1<<7)
  #define IEEE80211_TXCTL_FIRST_FRAGMENT	(1<<8) /* this is a first fragment of
  						* the frame */
- #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
 +#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
 +						  * using the through
 +						  * set_retry_limit configured
@@ -22,6 +62,8 @@
  	u32 flags;			       /* tx control flags defined
  						* above */
 -	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, .. */
++	u8 key_idx;		/* keyidx from hw->set_key(), undefined if
++				 * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
 +	u8 retry_limit;		/* 1 = only first attempt, 2 = one retry, ..
 +				 * This could be used when set_retry_limit
 +				 * is not implemented by the driver */
@@ -29,12 +71,78 @@
  	u8 antenna_sel_tx; 	/* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
 -	s8 key_idx;		/* -1 = do not encrypt, >= 0 keyidx from
 -				 * hw->set_key() */
-+	s8 key_idx;		/* HW_KEY_IDX_INVALID = do not encrypt,
-+				 * other values: keyidx from hw->set_key() */
  	u8 icv_len;		/* length of the ICV/MIC field in octets */
  	u8 iv_len;		/* length of the IV field in octets */
- 	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
-@@ -288,28 +296,10 @@ struct ieee80211_conf {
+-	u8 tkip_key[16];	/* generated phase2/phase1 key for hw TKIP */
+ 	u8 queue;		/* hardware queue to use for this frame;
+ 				 * 0 = highest, hw->queues-1 = lowest */
+ 	u8 sw_retry_attempt;	/* number of times hw has tried to
+@@ -219,22 +221,56 @@ struct ieee80211_tx_control {
+ 	int ifindex;	/* internal */
+ };
+ 
+-/* Receive status. The low-level driver should provide this information
+- * (the subset supported by hardware) to the 802.11 code with each received
+- * frame. */
++
++/**
++ * enum mac80211_rx_flags - receive flags
++ *
++ * These flags are used with the @flag member of &struct ieee80211_rx_status.
++ * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
++ *	Use together with %RX_FLAG_MMIC_STRIPPED.
++ * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
++ * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
++ * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
++ *	verification has been done by the hardware.
++ * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
++ *	If this flag is set, the stack cannot do any replay detection
++ *	hence the driver or hardware will have to do that.
++ */
++enum mac80211_rx_flags {
++	RX_FLAG_MMIC_ERROR	= 1<<0,
++	RX_FLAG_DECRYPTED	= 1<<1,
++	RX_FLAG_RADIOTAP	= 1<<2,
++	RX_FLAG_MMIC_STRIPPED	= 1<<3,
++	RX_FLAG_IV_STRIPPED	= 1<<4,
++};
++
++/**
++ * struct ieee80211_rx_status - receive status
++ *
++ * The low-level driver should provide this information (the subset
++ * supported by hardware) to the 802.11 code with each received
++ * frame.
++ * @mactime: MAC timestamp as defined by 802.11
++ * @freq: frequency the radio was tuned to when receiving this frame, in MHz
++ * @channel: channel the radio was tuned to
++ * @phymode: active PHY mode
++ * @ssi: signal strength when receiving this frame
++ * @signal: used as 'qual' in statistics reporting
++ * @noise: PHY noise when receiving this frame
++ * @antenna: antenna used
++ * @rate: data rate
++ * @flag: %RX_FLAG_*
++ */
+ struct ieee80211_rx_status {
+ 	u64 mactime;
+-	int freq; /* receive frequency in Mhz */
++	int freq;
+ 	int channel;
+ 	int phymode;
+ 	int ssi;
+-	int signal; /* used as qual in statistics reporting */
++	int signal;
+ 	int noise;
+ 	int antenna;
+ 	int rate;
+-#define RX_FLAG_MMIC_ERROR	(1<<0)
+-#define RX_FLAG_DECRYPTED	(1<<1)
+-#define RX_FLAG_RADIOTAP	(1<<2)
+ 	int flag;
+ };
+ 
+@@ -288,28 +324,10 @@ struct ieee80211_conf {
  	u8 power_level;			/* transmit power limit for current
  					 * regulatory domain; in dBm */
  	u8 antenna_max;			/* maximum antenna gain */
@@ -63,39 +171,69 @@
  };
  
  /**
-@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+@@ -402,40 +420,86 @@ struct ieee80211_if_conf {
  	struct ieee80211_tx_control *beacon_control;
  };
  
 -typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
 -ieee80211_key_alg;
-+typedef enum {
++/**
++ * enum ieee80211_key_alg - key algorithm
++ * @ALG_NONE: Unset key algorithm, will never be passed to the driver
++ * @ALG_WEP: WEP40 or WEP104
++ * @ALG_TKIP: TKIP
++ * @ALG_CCMP: CCMP (AES)
++ */
++typedef enum ieee80211_key_alg {
 +	ALG_NONE,
 +	ALG_WEP,
 +	ALG_TKIP,
 +	ALG_CCMP,
 +} ieee80211_key_alg;
  
-+/*
-+ * This flag indiciates that the station this key is being
-+ * configured for may use QoS. If your hardware cannot handle
-+ * that situation it should reject that key.
-+ */
-+#define IEEE80211_KEY_FLAG_WMM_STA	(1<<0)
  
- struct ieee80211_key_conf {
-+	/*
-+	 * To be set by the driver to the key index it would like to
-+	 * get in the ieee80211_tx_control.key_idx which defaults
-+	 * to HW_KEY_IDX_INVALID so that shouldn't be used.
-+	 */
[...4085 lines suppressed...]
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c	2007-09-18 10:29:46.000000000 -0400
 @@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
   */
  static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -24651,8 +25194,9 @@
  	}
  }
  EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -0,0 +1,961 @@
 +/*
 +
@@ -25615,8 +26159,9 @@
 +
 +module_init(if_cs_init);
 +module_exit(if_cs_exit);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h	2007-09-18 10:29:46.000000000 -0400
 @@ -1,52 +0,0 @@
 -#ifndef	__WLAN_THREAD_H_
 -#define	__WLAN_THREAD_H_
@@ -25670,8 +26215,9 @@
 -}
 -
 -#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h	2007-09-18 10:29:46.000000000 -0400
 @@ -38,7 +38,7 @@ struct bootcmdrespStr
  
  /* read callback private data */
@@ -25706,8 +26252,9 @@
 -int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
 -
  #endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c	2007-09-18 10:29:46.000000000 -0400
 @@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(s
  
  //      mutex_lock(&priv->mutex);
@@ -25741,8 +26288,9 @@
  
  	if (ret) {
  		ret = 0;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h	2007-09-18 10:29:46.000000000 -0400
 @@ -15,14 +15,9 @@ struct wlan_private;
  struct sk_buff;
  struct net_device;
@@ -25799,8 +26347,9 @@
 +int libertas_reset_device(wlan_private *priv);
  
  #endif				/* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-09-18 10:29:46.000000000 -0400
 @@ -67,6 +67,7 @@ struct rtl8187_priv {
  	struct rtl818x_csr *map;
  	void (*rf_init)(struct ieee80211_hw *);
@@ -25809,8 +26358,9 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:29:46.000000000 -0400
 @@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
  	int rvalue;
  	enum oid_num_t n = dwrq->flags;
@@ -25838,8 +26388,9 @@
  }
  
  void
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c	2007-09-18 10:29:46.000000000 -0400
 @@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
  	/* Alloc the cache */
  	for (i = 0; i < OID_NUM_LAST; i++) {
@@ -25855,8 +26406,9 @@
  		} else
  			priv->mib[i] = NULL;
  	}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-18 10:29:46.000000000 -0400
 @@ -63,11 +63,6 @@ config WAVELAN
  	  a Radio LAN (wireless Ethernet-like Local Area Network) using the
  	  radio frequencies 900 MHz and 2.4 GHz.
@@ -25991,8 +26543,9 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
  
  static void wl3501_online(struct net_device *dev)
@@ -26297,8 +26850,30 @@
  	if (link->open) {
  		wl3501_reset(dev);
  		netif_device_attach(dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:30:24.000000000 -0400
+@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm4
+ 		goto err_gpio_cleanup;
+ 	bcm43xx_radio_turn_on(bcm);
+ 	bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+-	dprintk(KERN_INFO PFX "Radio %s by hardware\n",
++	printk(KERN_INFO PFX "Radio %s by hardware\n",
+ 		(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
+ 
+ 	bcm43xx_write16(bcm, 0x03E6, 0x0000);
+@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(s
+ 	radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+ 	if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+ 		bcm->radio_hw_enable = radio_hw_enable;
+-		dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
++		printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ 		       (radio_hw_enable == 0) ? "disabled" : "enabled");
+ 		bcm43xx_leds_update(bcm, 0);
+ 	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c
 --- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c	2007-09-18 10:29:46.000000000 -0400
 @@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
  		goto final;
  	}
@@ -26362,8 +26937,9 @@
  		arlan_command(arlan_device[devnum], ARLAN_COMMAND_CLEAN_AND_RESET);
  
  	} else
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2007-09-18 10:29:46.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/wireless.h>
@@ -26381,8 +26957,9 @@
  	u16 infofid; /* MAC buffer id for info frame */
  	/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
  	 * txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:29:46.000000000 -0400
 @@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
  {
  	int res, ret = 0;
@@ -26392,8 +26969,9 @@
  	local_info_t *local = iface->local;
  	tuple_t tuple;
  	cisparse_t *parse = NULL;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-08-30 17:32:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c	2007-09-18 10:29:46.000000000 -0400
 @@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
  	    local->hw_downloading)
  		return -ENODEV;
@@ -26463,8 +27041,9 @@
  	local = iface->local;
  
  	/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-08-30 17:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 17:32:02.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-09-18 10:28:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:29:46.000000000 -0400
 @@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
  static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
  				     size_t len)

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-wireless.patch	30 Aug 2007 21:54:14 -0000	1.9
+++ linux-2.6-wireless.patch	18 Sep 2007 15:08:25 -0000	1.10
@@ -1,5 +1,6 @@
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
 --- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -227,6 +227,17 @@ struct ieee80211_cts {
  #define WLAN_CAPABILITY_SHORT_SLOT_TIME	(1<<10)
  #define WLAN_CAPABILITY_DSSS_OFDM	(1<<13)
@@ -18,8 +19,9 @@
  /* Status codes */
  enum ieee80211_statuscode {
  	WLAN_STATUS_SUCCESS = 0,
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
 --- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-08-30 17:22:48.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -11,6 +11,44 @@
   * Copyright 2006 Johannes Berg <johannes at sipsolutions.net>
   */
@@ -65,8 +67,9 @@
  /* from net/wireless.h */
  struct wiphy;
  
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
 --- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:10:25.000000000 -0400
 @@ -347,9 +347,16 @@ enum ieee80211_if_types {
   * @mac_addr: pointer to MAC address of the interface. This pointer is valid
   *	until the interface is removed (i.e. it cannot be used after
@@ -113,8 +116,9 @@
  /* Given an sk_buff with a raw 802.11 header at the data pointer this function
   * returns the 802.11 header length in bytes (not including encryption
   * headers). If the data in the sk_buff is too short to contain a valid 802.11
+diff -up linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c
 --- linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(st
  	}
  
@@ -132,8 +136,9 @@
  	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
  
  	/* Add encryption capability */
---- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-08-30 17:18:45.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-08-30 17:19:20.000000000 -0400
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-18 10:09:24.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-18 10:10:25.000000000 -0400
 @@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_
  			 */
  			dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
@@ -147,8 +152,9 @@
  			goto out;
  		} else {
  			mac->associnfo.associating = 0;
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c
 --- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-18 10:10:25.000000000 -0400
 @@ -456,18 +456,13 @@ void
  ieee80211softmac_add_network_locked(struct ieee80211softmac_device *mac,
  	struct ieee80211softmac_network *add_net)
@@ -208,8 +214,9 @@
  		if (softmac_net->essid.len == essid->len &&
  			!memcmp(softmac_net->essid.data, essid->data, essid->len))
  			return softmac_net;
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-18 10:10:25.000000000 -0400
 @@ -157,6 +157,8 @@ void ieee80211_if_set_type(struct net_de
  	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
  	int oldtype = sdata->type;
@@ -227,8 +234,9 @@
  		break;
  	default:
  		printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -27,20 +27,6 @@
  #include "aes_ccm.h"
  #include "debugfs_key.h"
@@ -739,8 +747,9 @@
  	(iw_handler) ieee80211_ioctl_siwrts,		/* SIOCSIWRTS */
  	(iw_handler) ieee80211_ioctl_giwrts,		/* SIOCGIWRTS */
  	(iw_handler) ieee80211_ioctl_siwfrag,		/* SIOCSIWFRAG */
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-18 10:10:25.000000000 -0400
 @@ -24,11 +24,10 @@ int ieee80211_rate_control_register(stru
  {
  	struct rate_control_alg *alg;
@@ -754,8 +763,9 @@
  	alg->ops = ops;
  
  	mutex_lock(&rate_ctrl_mutex);
+diff -up linux-2.6.22.noarch/net/mac80211/Makefile.orig linux-2.6.22.noarch/net/mac80211/Makefile
 --- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -13,6 +13,7 @@ mac80211-objs := \
  	ieee80211_iface.o \
  	ieee80211_rate.o \
@@ -764,8 +774,9 @@
  	tkip.o \
  	aes_ccm.o \
  	wme.o \
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-08-30 17:19:20.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/net/mac80211/regdomain.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,158 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -925,8 +936,9 @@
 +		channel_range = ieee80211_mkk_channels;
 +}
 +
+diff -up linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h
 --- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-18 10:10:25.000000000 -0400
 @@ -26,24 +26,16 @@
   * mess shall be deleted completely. */
  enum {
@@ -952,8 +964,9 @@
  	PRISM2_PARAM_TX_POWER_REDUCTION = 1022,
  	PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,
  	PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_common.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-18 10:10:25.000000000 -0400
 @@ -47,21 +47,16 @@ enum ieee80211_msg_type {
  	ieee80211_msg_normal = 0,
  	ieee80211_msg_tx_callback_ack = 1,
@@ -978,8 +991,9 @@
  struct ieee80211_msg_key_notification {
  	int tx_rx_count;
  	char ifname[IFNAMSIZ];
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-08-30 17:26:39.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 10:11:06.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <linux/compiler.h>
  #include <linux/bitmap.h>
@@ -1663,8 +1677,30 @@
  
  	return 0;
  }
+@@ -4981,7 +5259,7 @@ static void __exit ieee80211_exit(void)
+ }
+ 
+ 
+-module_init(ieee80211_init);
++subsys_initcall(ieee80211_init);
+ module_exit(ieee80211_exit);
+ 
+ MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
+--- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 10:11:06.000000000 -0400
+@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
+ 		skb_queue_head_init(&q->requeued[i]);
+ 		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+ 						 qd->handle);
+-		if (q->queues[i] == 0) {
++		if (!q->queues[i]) {
+ 			q->queues[i] = &noop_qdisc;
+ 			printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+ 		}
+diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
 --- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 10:11:06.000000000 -0400
 @@ -187,9 +187,13 @@ static void rate_control_simple_tx_statu
  		}
  #endif
@@ -1703,8 +1739,18 @@
  	}
  }
  
+@@ -425,7 +431,7 @@ static void __exit rate_control_simple_e
+ }
+ 
+ 
+-module_init(rate_control_simple_init);
++subsys_initcall(rate_control_simple_init);
+ module_exit(rate_control_simple_exit);
+ 
+ MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_i.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-18 10:10:25.000000000 -0400
 @@ -99,6 +99,12 @@ struct ieee80211_sta_bss {
  	int probe_resp;
  	unsigned long last_update;
@@ -1787,8 +1833,9 @@
  /* for wiphy privid */
  extern void *mac80211_wiphy_privid;
  
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-08-30 17:26:39.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-18 10:10:25.000000000 -0400
 @@ -25,7 +25,6 @@
  #include <linux/wireless.h>
  #include <linux/random.h>
@@ -2026,8 +2073,9 @@
  	return -1;
  }
  
+diff -up linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c
 --- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-18 10:10:25.000000000 -0400
 @@ -118,7 +118,7 @@ static ssize_t ieee80211_if_fmt_flags(
  			 sdata->u.sta.authenticated ? "AUTH\n" : "",
  			 sdata->u.sta.associated ? "ASSOC\n" : "",
@@ -2076,16 +2124,18 @@
  
  	return 0;
  }
+diff -up linux-2.6.22.noarch/net/wireless/Makefile.orig linux-2.6.22.noarch/net/wireless/Makefile
 --- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile	2007-08-30 17:21:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -1,4 +1,4 @@
  obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
  
 -cfg80211-y += core.o sysfs.o
 +cfg80211-y += core.o sysfs.o radiotap.o
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-08-30 17:21:49.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/net/wireless/radiotap.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,257 @@
 +/*
 + * Radiotap parser
@@ -2344,8 +2394,39 @@
 +	return -ENOENT;
 +}
 +EXPORT_SYMBOL(ieee80211_radiotap_iterator_next);
+diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
+--- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 10:11:06.000000000 -0400
+@@ -213,7 +213,7 @@ out_fail_notifier:
+ out_fail_sysfs:
+ 	return err;
+ }
+-module_init(cfg80211_init);
++subsys_initcall(cfg80211_init);
+ 
+ static void cfg80211_exit(void)
+ {
+diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
+--- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 10:11:06.000000000 -0400
+@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
+ 	cfg80211_dev_free(rdev);
+ }
+ 
++#ifdef CONFIG_HOTPLUG
+ static int wiphy_uevent(struct device *dev, char **envp,
+ 			int num_envp, char *buf, int size)
+ {
+ 	/* TODO, we probably need stuff here */
+ 	return 0;
+ }
++#endif
+ 
+ struct class ieee80211_class = {
+ 	.name = "ieee80211",
+diff -up linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig linux-2.6.22.noarch/drivers/net/wireless/airo.c
 --- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-18 10:10:25.000000000 -0400
 @@ -52,6 +52,8 @@
  
  #include "airo.h"
@@ -2961,8 +3042,9 @@
  			return -EIO;
  		return 0;
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-18 10:10:25.000000000 -0400
 @@ -49,8 +49,9 @@ void zd_chip_clear(struct zd_chip *chip)
  	ZD_MEMCLEAR(chip, sizeof(*chip));
  }
@@ -3143,8 +3225,9 @@
  		return 0;
  
  	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-18 10:10:25.000000000 -0400
 @@ -3,7 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o
  zd1211rw-objs := zd_chip.o zd_ieee80211.o \
  		zd_mac.o zd_netdev.o \
@@ -3154,8 +3237,9 @@
  		zd_rf.o zd_usb.o zd_util.o
  
  ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-18 10:10:25.000000000 -0400
 @@ -26,7 +26,7 @@
  #define AL2210_RF			0x7
  #define MAXIM_NEW_RF			0x8
@@ -3217,8 +3301,9 @@
 +int zd_rf_init_uw2453(struct zd_rf *rf);
  
  #endif /* _ZD_RF_H */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-18 10:10:25.000000000 -0400
 @@ -608,6 +608,9 @@ enum {
  #define CR_ZD1211B_TXOP			CTL_REG(0x0b20)
  #define CR_ZD1211B_RETRY_MAX		CTL_REG(0x0b28)
@@ -3272,8 +3357,9 @@
  int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr);
  int zd_chip_switch_radio_on(struct zd_chip *chip);
  int zd_chip_switch_radio_off(struct zd_chip *chip);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-18 10:10:25.000000000 -0400
 @@ -21,6 +21,8 @@
  #include "zd_usb.h"
  #include "zd_chip.h"
@@ -3335,8 +3421,9 @@
 +	rf->patch_cck_gain = 1;
  	return 0;
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-18 10:10:25.000000000 -0400
 @@ -265,7 +265,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -3346,8 +3433,9 @@
  		dev_err(zd_chip_dev(chip),
  		       "RF2959 is currently not supported for ZD1211B"
  		       " devices\n");
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-18 10:10:25.000000000 -0400
 @@ -188,6 +188,7 @@ struct zd_usb {
  	struct zd_usb_rx rx;
  	struct zd_usb_tx tx;
@@ -3365,8 +3453,9 @@
  extern struct workqueue_struct *zd_workqueue;
  
  #endif /* _ZD_USB_H */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-18 10:10:25.000000000 -0400
 @@ -34,7 +34,7 @@ static const char * const rfs[] = {
  	[AL2210_RF]	= "AL2210_RF",
  	[MAXIM_NEW_RF]	= "MAXIM_NEW_RF",
@@ -3433,8 +3522,9 @@
  	rf->type = type;
  
  	r = zd_chip_lock_phy_regs(chip);
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-08-30 17:19:20.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -3970,8 +4060,9 @@
 +	return 0;
 +}
 +
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-18 10:10:25.000000000 -0400
 @@ -189,7 +189,8 @@ int zd_mac_init(struct zd_mac *mac,
  		struct usb_interface *intf);
  void zd_mac_clear(struct zd_mac *mac);
@@ -3982,8 +4073,9 @@
  
  int zd_mac_open(struct net_device *netdev);
  int zd_mac_stop(struct net_device *netdev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-18 10:10:25.000000000 -0400
 @@ -473,7 +473,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -4001,8 +4093,9 @@
  	}
  
  	rf->switch_radio_off = al7230b_switch_radio_off;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-18 10:10:25.000000000 -0400
 @@ -15,7 +15,6 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
@@ -4214,8 +4307,9 @@
  	if (r) {
  		dev_dbg_f(&intf->dev,
  		         "couldn't initialize mac. Error number %d\n", r);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-18 10:10:25.000000000 -0400
 @@ -86,38 +86,46 @@ out:
  	return r;
  }
@@ -4337,8 +4431,9 @@
  			packet_length - frag_len : packet_length);
  
  	/*
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1719,9 +1719,6 @@ static int wlan_set_encodeext(struct net
  			pkey->type = KEY_TYPE_ID_TKIP;
  		} else if (alg == IW_ENCODE_ALG_CCMP) {
@@ -4349,8 +4444,9 @@
  		}
  
  		/* If WPA isn't enabled yet, do that now */
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wl
  	ret = 0;
  
@@ -4359,8 +4455,9 @@
  	lbs_deb_leave_args(LBS_DEB_RX, "ret %d", ret);
  	return ret;
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-18 10:10:25.000000000 -0400
 @@ -613,6 +613,7 @@ static int wlan_service_main_thread(void
  
  	init_waitqueue_entry(&wait, current);
@@ -4369,8 +4466,9 @@
  	for (;;) {
  		lbs_deb_thread( "main-thread 111: intcounter=%d "
  		       "currenttxskb=%p dnld_sent=%d\n",
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-18 10:10:25.000000000 -0400
 @@ -240,7 +240,7 @@ static int wlan_cmd_802_11_enable_rsn(wl
  		if (*enable)
  			penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
@@ -4380,8 +4478,9 @@
  	}
  
  	lbs_deb_leave(LBS_DEB_CMD);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1768,7 +1768,8 @@ static int ipw2100_up(struct ipw2100_pri
  
  		if (priv->stop_rf_kill) {
@@ -4443,8 +4542,9 @@
  			break;
  		default:
  			timeout = timeout_duration[level - 1] / 1000;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-18 10:10:25.000000000 -0400
 @@ -87,7 +87,6 @@ static struct pci_driver prism54_driver 
  	.remove = prism54_remove,
  	.suspend = prism54_suspend,
@@ -4453,8 +4553,9 @@
  };
  
  /******************************************************************************
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev,
  	islpci_private *priv = netdev_priv(ndev);
  	struct islpci_acl *acl = &priv->acl;
@@ -4528,8 +4629,9 @@
  		kfree(bss);
  	}
  }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-18 10:10:25.000000000 -0400
 @@ -70,7 +70,7 @@
  #define VQ
  #endif
@@ -4611,8 +4713,9 @@
  		goto none;
  	}
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:10:25.000000000 -0400
 @@ -1011,7 +1011,7 @@ static inline void wl3501_md_ind_interru
  	} else {
  		skb->dev = dev;
@@ -4622,8 +4725,111 @@
  		wl3501_receive(this, skb->data, pkt_len);
  		skb_put(skb, pkt_len);
  		skb->protocol	= eth_type_trans(skb, dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:25:25.000000000 -0400
+@@ -3183,6 +3183,9 @@ static void bcm43xx_periodic_work_handle
+ 	unsigned long orig_trans_start = 0;
+ 
+ 	mutex_lock(&bcm->mutex);
++	/* keep from doing and rearming periodic work if shutting down */
++	if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
++		goto unlock_mutex;
+ 	if (unlikely(bcm->periodic_state % 60 == 0)) {
+ 		/* Periodic work will take a long time, so we want it to
+ 		 * be preemtible.
+@@ -3228,14 +3231,10 @@ static void bcm43xx_periodic_work_handle
+ 	mmiowb();
+ 	bcm->periodic_state++;
+ 	spin_unlock_irqrestore(&bcm->irq_lock, flags);
++unlock_mutex:
+ 	mutex_unlock(&bcm->mutex);
+ }
+ 
+-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
+-{
+-	cancel_rearming_delayed_work(&bcm->periodic_work);
+-}
+-
+ void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
+ {
+ 	struct delayed_work *work = &bcm->periodic_work;
+@@ -3285,6 +3284,14 @@ static int bcm43xx_rng_init(struct bcm43
+ 	return err;
+ }
+ 
++void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
++{
++	/* The system must be unlocked when this routine is entered.
++	 * If not, the next 2 steps may deadlock */
++	cancel_work_sync(&bcm->restart_work);
++	cancel_rearming_delayed_work(&bcm->periodic_work);
++}
++
+ static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
+ {
+ 	int ret = 0;
+@@ -3321,7 +3328,12 @@ static void bcm43xx_free_board(struct bc
+ {
+ 	bcm43xx_rng_exit(bcm);
+ 	bcm43xx_sysfs_unregister(bcm);
+-	bcm43xx_periodic_tasks_delete(bcm);
++
++	mutex_lock(&(bcm)->mutex);
++	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
++	mutex_unlock(&(bcm)->mutex);
++
++	bcm43xx_cancel_work(bcm);
+ 
+ 	mutex_lock(&(bcm)->mutex);
+ 	bcm43xx_shutdown_all_wireless_cores(bcm);
+@@ -4018,7 +4030,7 @@ static int bcm43xx_net_stop(struct net_d
+ 	err = bcm43xx_disable_interrupts_sync(bcm);
+ 	assert(!err);
+ 	bcm43xx_free_board(bcm);
+-	flush_scheduled_work();
++	bcm43xx_cancel_work(bcm);
+ 
+ 	return 0;
+ }
+@@ -4150,9 +4162,9 @@ static void bcm43xx_chip_reset(struct wo
+ 	struct bcm43xx_phyinfo *phy;
+ 	int err = -ENODEV;
+ 
++	bcm43xx_cancel_work(bcm);
+ 	mutex_lock(&(bcm)->mutex);
+ 	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
+-		bcm43xx_periodic_tasks_delete(bcm);
+ 		phy = bcm43xx_current_phy(bcm);
+ 		err = bcm43xx_select_wireless_core(bcm, phy->type);
+ 		if (!err)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c	2007-09-18 10:11:13.000000000 -0400
+@@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_stor
+ 		goto out;
+ 	}
+ 
+-	bcm43xx_periodic_tasks_delete(bcm);
++	bcm43xx_cancel_work(bcm);
+ 	mutex_lock(&(bcm)->mutex);
+ 	err = bcm43xx_select_wireless_core(bcm, phytype);
+ 	if (!err)
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h	2007-09-18 10:11:13.000000000 -0400
+@@ -122,7 +122,7 @@ void bcm43xx_wireless_core_reset(struct 
+ void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
+ void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
+ 
+-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm);
++void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
+ void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
+ 
+ void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400
 @@ -326,7 +326,6 @@ static int ap_control_proc_read(char *pa
  	char *p = page;
  	struct ap_data *ap = (struct ap_data *) data;
@@ -4748,8 +4954,9 @@
  		if (sta->ap)
  			hostap_wds_link_oper(local, sta->addr, WDS_ADD);
  	}
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-18 10:10:25.000000000 -0400
 @@ -1,8 +1,6 @@
  #ifndef HOSTAP_CONFIG_H
  #define HOSTAP_CONFIG_H
@@ -4759,8 +4966,9 @@
  /* In the previous versions of Host AP driver, support for user space version
   * of IEEE 802.11 management (hostapd) used to be disabled in the default
   * configuration. From now on, support for hostapd is always included and it is
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-18 10:10:25.000000000 -0400
 @@ -20,7 +20,6 @@
  #include "hostap_wlan.h"
  
@@ -4801,8 +5009,9 @@
  }
  
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:10:25.000000000 -0400
 @@ -22,7 +22,6 @@
  #include "hostap_wlan.h"
  
@@ -4834,8 +5043,9 @@
  }
  
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-18 10:10:25.000000000 -0400
 @@ -37,7 +37,6 @@
  MODULE_AUTHOR("Jouni Malinen");
  MODULE_DESCRIPTION("Host AP common routines");
@@ -4844,8 +5054,9 @@
  
  #define TX_TIMEOUT (2 * HZ)
  
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:10:25.000000000 -0400
 @@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct ne
  	local = iface->local;
  
@@ -4855,8 +5066,9 @@
  	snprintf(info->fw_version, sizeof(info->fw_version) - 1,
  		 "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
  		 (local->sta_fw_ver >> 8) & 0xff,
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-08-30 17:19:20.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-18 10:10:25.000000000 -0400
 @@ -23,7 +23,6 @@
  #include "hostap_wlan.h"
  
@@ -4898,8 +5110,57 @@
  }
  
  
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-08-30 17:21:26.000000000 -0400
+diff -up linux-2.6.22.noarch/fs/compat_ioctl.c.orig linux-2.6.22.noarch/fs/compat_ioctl.c
+--- linux-2.6.22.noarch/fs/compat_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-18 10:11:13.000000000 -0400
+@@ -2306,8 +2306,10 @@ static int do_wireless_ioctl(unsigned in
+ 	struct iwreq __user *iwr_u;
+ 	struct iw_point __user *iwp;
+ 	struct compat_iw_point __user *iwp_u;
+-	compat_caddr_t pointer;
++	compat_caddr_t pointer_u;
++	void __user *pointer;
+ 	__u16 length, flags;
++	int ret;
+ 
+ 	iwr_u = compat_ptr(arg);
+ 	iwp_u = (struct compat_iw_point __user *) &iwr_u->u.data;
+@@ -2325,17 +2327,29 @@ static int do_wireless_ioctl(unsigned in
+ 			   sizeof(iwr->ifr_ifrn.ifrn_name)))
+ 		return -EFAULT;
+ 
+-	if (__get_user(pointer, &iwp_u->pointer) ||
++	if (__get_user(pointer_u, &iwp_u->pointer) ||
+ 	    __get_user(length, &iwp_u->length) ||
+ 	    __get_user(flags, &iwp_u->flags))
+ 		return -EFAULT;
+ 
+-	if (__put_user(compat_ptr(pointer), &iwp->pointer) ||
++	if (__put_user(compat_ptr(pointer_u), &iwp->pointer) ||
+ 	    __put_user(length, &iwp->length) ||
+ 	    __put_user(flags, &iwp->flags))
+ 		return -EFAULT;
+ 
+-	return sys_ioctl(fd, cmd, (unsigned long) iwr);
++	ret = sys_ioctl(fd, cmd, (unsigned long) iwr);
++
++	if (__get_user(pointer, &iwp->pointer) ||
++	    __get_user(length, &iwp->length) ||
++	    __get_user(flags, &iwp->flags))
++		return -EFAULT;
++
++	if (__put_user(ptr_to_compat(pointer), &iwp_u->pointer) ||
++	    __put_user(length, &iwp_u->length) ||
++	    __put_user(flags, &iwp_u->flags))
++		return -EFAULT;
++
++	return ret;
+ }
+ 
+ /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
+diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,59 @@
 +How to use packet injection with mac80211
 +=========================================
@@ -4960,8 +5221,9 @@
 +http://penumbra.warmcat.com/_twk/tiki-index.php?page=packetspammer
 +
 +Andy Green <andy at warmcat.com>
---- /dev/null	2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-08-30 17:21:26.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt
+--- /dev/null	2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-18 10:10:25.000000000 -0400
 @@ -0,0 +1,152 @@
 +How to use radiotap headers
 +===========================


--- linux-2.6-iwlwifi-fw-name-compat.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 15:09:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 11:09:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.58,1.59
Message-ID: <200709181509.l8IF9E4t020690@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667

Modified Files:
	policy-20070703.patch 
Log Message:
* Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
- Allow cron to search nfs and samba homedirs


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- policy-20070703.patch	18 Sep 2007 14:45:04 -0000	1.58
+++ policy-20070703.patch	18 Sep 2007 15:09:11 -0000	1.59
@@ -10634,7 +10634,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-17 16:37:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-18 11:07:20.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -10694,7 +10694,7 @@
  	userdom_shell_domtrans_sysadm(init_t)
 +',`
 +	optional_policy(`
-+		unconfined_shell_domtrans_sysadm(init_t)
++		unconfined_shell_domtrans(init_t)
 +	')
  ')
  
@@ -10827,7 +10827,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
 @@ -65,11 +65,12 @@
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -10860,7 +10860,7 @@
  /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # vmware 
-@@ -284,3 +289,9 @@
+@@ -284,3 +289,8 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -10868,7 +10868,6 @@
 +/usr/lib64/mozilla/plugins/libvlcplugin.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/var/cache/ldconfig(/.*)?		    	gen_context(system_u:object_r:ldconfig_cache_t,s0)
-+/usr/lib/libtheora\.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)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400



From fedora-extras-commits at redhat.com  Tue Sep 18 15:12:58 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:12:58 -0400
Subject: rpms/pidgin/F-7 .cvsignore, 1.8, 1.9 pidgin.spec, 1.22, 1.23 sources,
	1.8, 1.9
Message-ID: <200709181512.l8IFCw2Z020950@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20917

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Aug 2007 20:22:31 -0000	1.8
+++ .cvsignore	18 Sep 2007 15:12:26 -0000	1.9
@@ -1 +1 @@
-pidgin-2.1.1.tar.bz2
+pidgin-2.2.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pidgin.spec	20 Aug 2007 20:22:31 -0000	1.22
+++ pidgin.spec	18 Sep 2007 15:12:26 -0000	1.23
@@ -28,9 +28,9 @@
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.1.1
+Version:	2.2.0
 Release:	1%{?dist}
-License:	GPL
+License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -442,6 +442,7 @@
 %{_libdir}/libpurple.so.*
 %{_datadir}/pixmaps/purple/
 %{_datadir}/sounds/purple/
+%{_datadir}/purple/ca-certs/
 %{_sysconfdir}/purple/
 %if %{dbus_integration}
 %{_bindir}/purple-client-example
@@ -495,6 +496,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-0
+- 2.2.0
+
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1
 - 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Aug 2007 20:22:31 -0000	1.8
+++ sources	18 Sep 2007 15:12:26 -0000	1.9
@@ -1 +1 @@
-eb29fecb2f3a6d4790f47ce8e658c07c  pidgin-2.1.1.tar.bz2
+d71cd4de6ef1459ba9b504d0c06d8d04  pidgin-2.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:14:23 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:14:23 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.48,1.49
Message-ID: <200709181514.l8IFENQG021042@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/gnome-bluetooth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21004

Modified Files:
	gnome-bluetooth.spec 
Log Message:
fixed wrong Source URL


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-bluetooth.spec	23 Aug 2007 12:29:06 -0000	1.48
+++ gnome-bluetooth.spec	18 Sep 2007 15:13:50 -0000	1.49
@@ -1,12 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
 #Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
-Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.7/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.9/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
@@ -131,6 +131,9 @@
 %{_libdir}/libgnomebt.so
 
 %changelog
+* Tue Sep 18 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.1-3
+- fixed wrong source URL
+
 * Thu Aug 23 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.1-2
 - rebuilt for F8
 - changed license tag to GPLv2 and LGPLv2+



From fedora-extras-commits at redhat.com  Tue Sep 18 15:15:58 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 11:15:58 -0400
Subject: rpms/dnsmasq/devel .cvsignore, 1.12, 1.13 dnsmasq.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <200709181515.l8IFFwOV021114@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041

Modified Files:
	.cvsignore dnsmasq.spec sources 
Log Message:

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-1
- Finalized upstream release
- Removing URLs from patch lines (CVS is the authoritative source)
- Added more magic to make spinning rc/test packages more seamless

(thanks to Kevin Fenzi for inspiring the latter two ;-)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Aug 2007 21:40:07 -0000	1.12
+++ .cvsignore	18 Sep 2007 15:15:26 -0000	1.13
@@ -1 +1 @@
-dnsmasq-2.40rc2.tar.gz
+dnsmasq-2.40.tar.gz


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dnsmasq.spec	27 Aug 2007 21:40:07 -0000	1.21
+++ dnsmasq.spec	18 Sep 2007 15:15:26 -0000	1.22
@@ -1,17 +1,20 @@
-%define extraversion rc2
+#%define extrapath release-candidates/
+#%define extrapath test-releases/
+#%define extraversion rc2
+#%define extraversion test2
 
 Name:           dnsmasq
 Version:        2.40
-Release:        0.1.%{extraversion}%{?dist}
+Release:        1%{extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://www.thekelleys.org.uk/dnsmasq/
-Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}%{?extraversion}.tar.gz
-Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
-Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
-Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
+Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
+Patch0:         %{name}-2.33-initscript.patch
+Patch1:         %{name}-2.33-enable-dbus.patch
+Patch2:         %{name}-2.35-conf-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -94,6 +97,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-1
+- Finalized upstream release
+- Removing URLs from patch lines (CVS is the authoritative source)
+- Added more magic to make spinning rc/test packages more seamless
+
 * Sun Aug 26 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 2.40-0.1.rc2
 - New upstream release candidate (feature-frozen), thanks Simon!
 - License clarification


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Aug 2007 21:40:07 -0000	1.12
+++ sources	18 Sep 2007 15:15:26 -0000	1.13
@@ -1 +1 @@
-45b3ca53556e99b1edaef2142fb0e306  dnsmasq-2.40rc2.tar.gz
+91b6063ae81146b9d70b4381b2f3e44f  dnsmasq-2.40.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:18:48 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Tue, 18 Sep 2007 11:18:48 -0400
Subject: rpms/libbtctl/devel libbtctl.spec,1.48,1.49
Message-ID: <200709181518.l8IFImN9021186@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/libbtctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21135

Modified Files:
	libbtctl.spec 
Log Message:
Fixed wrong Source URL


Index: libbtctl.spec
===================================================================
RCS file: /cvs/extras/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libbtctl.spec	23 Aug 2007 08:13:18 -0000	1.48
+++ libbtctl.spec	18 Sep 2007 15:18:16 -0000	1.49
@@ -8,11 +8,11 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
-Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.8/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.9/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 0:2.57, bluez-libs-devel, glib2-devel, gtk-doc
@@ -102,6 +102,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.0-3
+- fixed wrong Source URL 
+
 * Thu Aug 23 2007 - Ondrej Vasik <ovasik at redhat.com> - 0.9.0-2
 - rebuilt for F8
 - changed License tag to GPL+



From fedora-extras-commits at redhat.com  Tue Sep 18 15:27:49 2007
From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot))
Date: Tue, 18 Sep 2007 11:27:49 -0400
Subject: rpms/pidgin/devel pidgin-2.2.0-fix-proxy-settings.patch, NONE,
	1.1 pidgin-2.2.0-fix-status-scores.patch, NONE,
	1.1 pidgin-2.2.0-plug-more-memleaks.patch, NONE,
	1.1 pidgin-2.2.0-plug_memleaks.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 pidgin.spec, 1.32, 1.33 sources, 1.8, 1.9
Message-ID: <200709181527.l8IFRnTS022994@cvs-int.fedora.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22911

Modified Files:
	.cvsignore pidgin.spec sources 
Added Files:
	pidgin-2.2.0-fix-proxy-settings.patch 
	pidgin-2.2.0-fix-status-scores.patch 
	pidgin-2.2.0-plug-more-memleaks.patch 
	pidgin-2.2.0-plug_memleaks.patch 
Log Message:
-2.2.0
- License clarification
- Backport patches to fix memory leaks
- Backport patches to fix proxy settings & status scores



pidgin-2.2.0-fix-proxy-settings.patch:

--- NEW FILE pidgin-2.2.0-fix-proxy-settings.patch ---
-----------------------------------------------------------------
Revision: 6be36979d022284283217c2a32f2b812740cbbf3
Ancestor: 81e26f1e56d65a68394405ff0727feba9206ff6f
Author: datallah at pidgin.im
Date: 2007-09-14T17:55:05
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c pidgin/gtkprefs.c

ChangeLog: 

Fix proxy settings to be loaded correctly when libpurple is initialized.  This was broken because it relied on the prefs being loaded after proxy initialization so that the pref callbacks would be triggered and I changed the prefs loading to happen right at the beginning to fix other issues. Fixes #3092.

============================================================
--- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
+++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
@@ -400,7 +400,7 @@ socket_ready_cb(gpointer data, gint sour
  	 */
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
-	
+
 	purple_debug_info("proxy", "Connected to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
 		proxy_pref_cb, NULL);
+
+	/* Load the initial proxy settings */
+	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
+	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
+	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
+	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
+	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
 }
 
 void
============================================================
--- pidgin/gtkprefs.c	fee039ede95c6ae3460bcf222f60305eb0bd2671
+++ pidgin/gtkprefs.c	5a7f1837f163b8d345b590d1509604d30e3c6c1c
@@ -1093,7 +1093,7 @@ proxy_changed_cb(const char *name, Purpl
 	const char *proxy = value;
 
 	if (strcmp(proxy, "none") && strcmp(proxy, "envvar"))
-	        gtk_widget_show_all(frame);
+		gtk_widget_show_all(frame);
 	else
 		gtk_widget_hide(frame);
 }

pidgin-2.2.0-fix-status-scores.patch:

--- NEW FILE pidgin-2.2.0-fix-status-scores.patch ---
-----------------------------------------------------------------
Revision: 240d37f3b465527200f862ff3c0da77618ae32ae
Ancestor: 6be36979d022284283217c2a32f2b812740cbbf3
Author: datallah at pidgin.im
Date: 2007-09-14T18:26:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c libpurple/status.c

ChangeLog: 

Apply a similar fix to the proxy prefs loading fix to the status scores.

============================================================
--- libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
+++ libpurple/proxy.c	dcb73f3b56ee37fd1b03d306be342bce5167037f
@@ -1994,11 +1994,11 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 
 	/* Load the initial proxy settings */
-	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
-	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
-	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
-	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
-	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
+	purple_prefs_trigger_callback("/purple/proxy/type");
+	purple_prefs_trigger_callback("/purple/proxy/host");
+	purple_prefs_trigger_callback("/purple/proxy/port");
+	purple_prefs_trigger_callback("/purple/proxy/username");
+	purple_prefs_trigger_callback("/purple/proxy/password");
 }
 
 void
============================================================
--- libpurple/status.c	1eb4a9526f9b26fa096f6ff8c8205f092b126b1e
+++ libpurple/status.c	a0e82882e37ae83691ee52bc46682db953f7cf96
@@ -1668,6 +1668,14 @@ purple_status_init(void)
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
+
+	purple_prefs_trigger_callback("/purple/status/scores/offline");
+	purple_prefs_trigger_callback("/purple/status/scores/available");
+	purple_prefs_trigger_callback("/purple/status/scores/invisible");
+	purple_prefs_trigger_callback("/purple/status/scores/away");
+	purple_prefs_trigger_callback("/purple/status/scores/extended_away");
+	purple_prefs_trigger_callback("/purple/status/scores/idle");
+	purple_prefs_trigger_callback("/purple/status/scores/offline_msg");
 }
 
 void

pidgin-2.2.0-plug-more-memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug-more-memleaks.patch ---
-----------------------------------------------------------------
Revision: 41389df89a4a6a007d41cec33e33043cd41ea159
Ancestor: 326d6e6c8c6a955cdba84f1f802fc21ec3e6b662
Author: datallah at pidgin.im
Date: 2007-09-17T16:24:24
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

more leak fixes.

============================================================
--- libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
+++ libpurple/protocols/jabber/message.c	3bc876da8fe16d41770af8d980dce8457b3ac61a
@@ -41,7 +41,10 @@ void jabber_message_free(JabberMessage *
 	g_free(jm->body);
 	g_free(jm->xhtml);
 	g_free(jm->password);
+	g_free(jm->error);
+	g_free(jm->thread_id);
 	g_list_free(jm->etc);
+	g_list_free(jm->eventitems);
 
 	g_free(jm);
 }

pidgin-2.2.0-plug_memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug_memleaks.patch ---
-----------------------------------------------------------------
Revision: db4583bc475b46b7cb9baa38229f12473d331870
Ancestor: 73d2587302ffbbe62f6b7f3e745508c0687813ba
Author: sadrul at pidgin.im
Date: 2007-09-15T18:27:01
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c

ChangeLog: 

Plug some memory leaks.

============================================================
--- libpurple/protocols/jabber/adhoccommands.c	d0b52a470cdc4c95503037ba92f51f87e61bdd10
+++ libpurple/protocols/jabber/adhoccommands.c	1f8c9a282612f146d5e43e994629da3817e88f48
@@ -151,8 +151,11 @@ static void jabber_adhoc_parse(JabberStr
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 		
-		if(note)
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL);
+		if(note) {
+			char *data = xmlnode_get_data(note);
+			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			g_free(data);
+		}
 		
 		if(xdata)
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
============================================================
--- libpurple/protocols/jabber/buddy.c	6fee8dda0f8e37a98fab4a18606447fa29792fd5
+++ libpurple/protocols/jabber/buddy.c	490b348e2662e107a450a4e9b08db1437c260d03
@@ -1455,10 +1455,13 @@ static void do_buddy_avatar_update_data(
 		return;
 	
 	img = purple_base64_decode(b64data, &size);
-	if(!img)
+	if(!img) {
+		g_free(b64data);
 		return;
+	}
 	
 	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
 }
 
 void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
============================================================
--- libpurple/protocols/jabber/jabber.c	8211a80fdca963e6b51e9a4a9d5b096225a57711
+++ libpurple/protocols/jabber/jabber.c	121e708c2e28ec3ff0da92cbf9e82a89f8d1a3b1
@@ -813,7 +813,7 @@ jabber_register_cancel_cb(JabberRegister
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 		jabber_connection_schedule_close(cbdata->js);
-}
+	}
 	g_free(cbdata->who);
 	g_free(cbdata);
 }
@@ -882,12 +882,12 @@ void jabber_register_parse(JabberStream 
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
-				if(js->registration) {
-					js->gc->wants_to_die = TRUE;
-					if(account->registration_cb) /* succeeded, but we have no login info */
-						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
-					jabber_connection_schedule_close(js);
-				}
+					if(js->registration) {
+						js->gc->wants_to_die = TRUE;
+						if(account->registration_cb) /* succeeded, but we have no login info */
+							(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+						jabber_connection_schedule_close(js);
+					}
 					return;
 				}
 			}
@@ -987,14 +987,14 @@ void jabber_register_parse(JabberStream 
 		purple_request_field_group_add_field(group, field);
 	}
 
-		if((y = xmlnode_get_child(query, "instructions")))
-			instructions = xmlnode_get_data(y);
+	if((y = xmlnode_get_child(query, "instructions")))
+		instructions = xmlnode_get_data(y);
 	else if(registered)
 		instructions = g_strdup(_("Please fill out the information below "
 					"to change your account registration."));
-		else
-			instructions = g_strdup(_("Please fill out the information below "
-						"to register your new account."));
+	else
+		instructions = g_strdup(_("Please fill out the information below "
+					"to register your new account."));
 
 	cbdata = g_new0(JabberRegisterCBData, 1);
 	cbdata->js = js;
@@ -1019,8 +1019,8 @@ void jabber_register_parse(JabberStream 
 		g_free(title);
 	}
 
-		g_free(instructions);
-	}
+	g_free(instructions);
+}
 
 void jabber_register_start(JabberStream *js)
 {
============================================================
--- libpurple/protocols/jabber/message.c	309b575a8bd728be0fb2b41edf1362c2911b8367
+++ libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
@@ -324,7 +324,7 @@ void jabber_message_parse(JabberStream *
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-	else if(!strcmp(type, "chat"))
+		else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
============================================================
--- libpurple/protocols/jabber/presence.c	64aa78ce207c12bf4c35e137cfa344ba6b0e9926
+++ libpurple/protocols/jabber/presence.c	2b25212d8c6b6df2aeef8dd484660bff573c3511
@@ -192,16 +192,11 @@ void jabber_presence_send(PurpleAccount 
 		jabber_tune_set(js->gc, &tuneinfo);
 		
 		/* update old values */
-		if(js->old_artist)
-			g_free(js->old_artist);
-		if(js->old_title)
-			g_free(js->old_title);
-		if(js->old_source)
-			g_free(js->old_source);
-		if(js->old_uri)
-			g_free(js->old_uri);
-		if(js->old_track)
-			g_free(js->old_track);
+		g_free(js->old_artist);
+		g_free(js->old_title);
+		g_free(js->old_source);
+		g_free(js->old_uri);
+		g_free(js->old_track);
 		js->old_artist = g_strdup(artist);
 		js->old_title = g_strdup(title);
 		js->old_source = g_strdup(source);
============================================================
--- libpurple/protocols/jabber/usernick.c	5817ece1551b32a06a815751ec2d0c6e73fce836
+++ libpurple/protocols/jabber/usernick.c	e0e09357277521664d7f14ecf84033d6e84aa564
@@ -33,7 +33,7 @@ static void jabber_nick_cb(JabberStream 
 	xmlnode *item = xmlnode_get_child(items, "item");
 	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	xmlnode *nick;
-	const char *nickname = NULL;
+	char *nickname = NULL;
 	
 	/* ignore the tune of people not on our buddy list */
 	if (!buddy || !item)
@@ -43,8 +43,8 @@ static void jabber_nick_cb(JabberStream 
 	if (!nick)
 		return;
 	nickname = xmlnode_get_data(nick);
-
 	serv_got_alias(js->gc, from, nickname);
+	g_free(nickname);
 }
 
 static void do_nick_set(JabberStream *js, const char *nick) {
@@ -64,7 +64,7 @@ static void do_nick_got_own_nick_cb(Jabb
 }
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
-	const char *oldnickname = NULL;
+	char *oldnickname = NULL;
 	xmlnode *item = xmlnode_get_child(items,"item");
 	
 	if(item) {
@@ -77,6 +77,7 @@ static void do_nick_got_own_nick_cb(Jabb
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
 		purple_connection_get_account(js->gc), NULL, NULL, js);
+	g_free(oldnickname);
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
============================================================
--- libpurple/protocols/jabber/usertune.c	cdfd425e9ed68eae4aee8d95addd93c093833093
+++ libpurple/protocols/jabber/usertune.c	a20360876437c9c69c30dd9bf3b78c192d47cc79
@@ -41,48 +41,61 @@ static void jabber_tune_cb(JabberStream 
 	if (!buddy || !item)
 		return;
 	
-	tuneinfodata.artist = "";
-	tuneinfodata.title = "";
-	tuneinfodata.album = "";
-	tuneinfodata.track = "";
+	tuneinfodata.artist = NULL;
+	tuneinfodata.title = NULL;
+	tuneinfodata.album = NULL;
+	tuneinfodata.track = NULL;
 	tuneinfodata.time = -1;
-	tuneinfodata.url = "";
-	
+	tuneinfodata.url = NULL;
+
 	tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune");
 	if (!tune)
 		return;
+	resource = jabber_buddy_find_resource(buddy, NULL);
+	if(!resource)
+		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
 			if (!strcmp(tuneinfo->name, "artist")) {
-				if (tuneinfodata.artist[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
 						tuneinfodata.time = strtol(length, NULL, 10);
+					g_free(length);
 				}
 			} else if (!strcmp(tuneinfo->name, "source")) {
-				if (tuneinfodata.album[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "title")) {
-				if (tuneinfodata.title[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "track")) {
-				if (tuneinfodata.track[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "uri")) {
-				if (tuneinfodata.url[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 			}
 		}
 	}
-	resource = jabber_buddy_find_resource(buddy, NULL);
-	if(!resource)
-		return; /* huh? */
 	status_id = jabber_buddy_state_get_status_id(resource->state);
 
-	purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+	purple_prpl_got_user_status(js->gc->account, from, status_id,
+			PURPLE_TUNE_ARTIST, tuneinfodata.artist,
+			PURPLE_TUNE_TITLE, tuneinfodata.title,
+			PURPLE_TUNE_ALBUM, tuneinfodata.album,
+			PURPLE_TUNE_TRACK, tuneinfodata.track,
+			PURPLE_TUNE_TIME, tuneinfodata.time,
+			PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+
+	g_free(tuneinfodata.artist);
+	g_free(tuneinfodata.title);
+	g_free(tuneinfodata.album);
+	g_free(tuneinfodata.track);
+	g_free(tuneinfodata.url);
 }
 
 void jabber_tune_init(void) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Aug 2007 20:06:30 -0000	1.8
+++ .cvsignore	18 Sep 2007 15:27:17 -0000	1.9
@@ -1 +1 @@
-pidgin-2.1.1.tar.bz2
+pidgin-2.2.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pidgin.spec	21 Aug 2007 15:08:32 -0000	1.32
+++ pidgin.spec	18 Sep 2007 15:27:17 -0000	1.33
@@ -28,9 +28,12 @@
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.1.1
-Release:	1%{?dist}
-License:	GPLv2+
+Version:	2.2.0
+Release:	2%{?dist}
+License:        GPLv2+ and GPLv2 and MIT
+# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
+# GPLv2 - silc & novell prpls
+# MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -55,6 +58,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:         pidgin-2.2.0-plug_memleaks.patch 
+Patch101:         pidgin-2.2.0-fix-proxy-settings.patch
+Patch102:         pidgin-2.2.0-fix-status-scores.patch
+Patch103:         pidgin-2.2.0-plug-more-memleaks.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -283,6 +290,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -442,6 +453,7 @@
 %{_libdir}/libpurple.so.*
 %{_datadir}/pixmaps/purple/
 %{_datadir}/sounds/purple/
+%{_datadir}/purple/ca-certs/
 %{_sysconfdir}/purple/
 %if %{dbus_integration}
 %{_bindir}/purple-client-example
@@ -495,6 +507,14 @@
 
 
 %changelog
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
+- License clarification
+- Backport patches to fix memory leaks
+- Backport patches to fix proxy settings & status scores
+
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-1
+- 2.2.0
+
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1
 - 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Aug 2007 20:06:31 -0000	1.8
+++ sources	18 Sep 2007 15:27:17 -0000	1.9
@@ -1 +1 @@
-eb29fecb2f3a6d4790f47ce8e658c07c  pidgin-2.1.1.tar.bz2
+d71cd4de6ef1459ba9b504d0c06d8d04  pidgin-2.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:28:17 2007
From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot))
Date: Tue, 18 Sep 2007 11:28:17 -0400
Subject: rpms/pidgin/F-7 pidgin-2.2.0-fix-proxy-settings.patch, NONE,
	1.1 pidgin-2.2.0-fix-status-scores.patch, NONE,
	1.1 pidgin-2.2.0-plug-more-memleaks.patch, NONE,
	1.1 pidgin-2.2.0-plug_memleaks.patch, NONE, 1.1 pidgin.spec,
	1.23, 1.24
Message-ID: <200709181528.l8IFSHbP023070@cvs-int.fedora.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22961

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.2.0-fix-proxy-settings.patch 
	pidgin-2.2.0-fix-status-scores.patch 
	pidgin-2.2.0-plug-more-memleaks.patch 
	pidgin-2.2.0-plug_memleaks.patch 
Log Message:
- License clarification
- Backport patches to fix memory leaks
- Backport patches to fix proxy settings & status scores



pidgin-2.2.0-fix-proxy-settings.patch:

--- NEW FILE pidgin-2.2.0-fix-proxy-settings.patch ---
-----------------------------------------------------------------
Revision: 6be36979d022284283217c2a32f2b812740cbbf3
Ancestor: 81e26f1e56d65a68394405ff0727feba9206ff6f
Author: datallah at pidgin.im
Date: 2007-09-14T17:55:05
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c pidgin/gtkprefs.c

ChangeLog: 

Fix proxy settings to be loaded correctly when libpurple is initialized.  This was broken because it relied on the prefs being loaded after proxy initialization so that the pref callbacks would be triggered and I changed the prefs loading to happen right at the beginning to fix other issues. Fixes #3092.

============================================================
--- libpurple/proxy.c	fa08e3c184837ae16e5f4bb65aaec0ab56096c93
+++ libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
@@ -400,7 +400,7 @@ socket_ready_cb(gpointer data, gint sour
  	 */
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
-	
+
 	purple_debug_info("proxy", "Connected to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
@@ -1992,6 +1992,13 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, "/purple/proxy/password",
 		proxy_pref_cb, NULL);
+
+	/* Load the initial proxy settings */
+	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
+	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
+	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
+	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
+	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
 }
 
 void
============================================================
--- pidgin/gtkprefs.c	fee039ede95c6ae3460bcf222f60305eb0bd2671
+++ pidgin/gtkprefs.c	5a7f1837f163b8d345b590d1509604d30e3c6c1c
@@ -1093,7 +1093,7 @@ proxy_changed_cb(const char *name, Purpl
 	const char *proxy = value;
 
 	if (strcmp(proxy, "none") && strcmp(proxy, "envvar"))
-	        gtk_widget_show_all(frame);
+		gtk_widget_show_all(frame);
 	else
 		gtk_widget_hide(frame);
 }

pidgin-2.2.0-fix-status-scores.patch:

--- NEW FILE pidgin-2.2.0-fix-status-scores.patch ---
-----------------------------------------------------------------
Revision: 240d37f3b465527200f862ff3c0da77618ae32ae
Ancestor: 6be36979d022284283217c2a32f2b812740cbbf3
Author: datallah at pidgin.im
Date: 2007-09-14T18:26:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c libpurple/status.c

ChangeLog: 

Apply a similar fix to the proxy prefs loading fix to the status scores.

============================================================
--- libpurple/proxy.c	395c4f16647a81960a1ac1430df4ae9fe64d05df
+++ libpurple/proxy.c	dcb73f3b56ee37fd1b03d306be342bce5167037f
@@ -1994,11 +1994,11 @@ purple_proxy_init(void)
 		proxy_pref_cb, NULL);
 
 	/* Load the initial proxy settings */
-	proxy_pref_cb("/purple/proxy/type", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/type"), NULL);
-	proxy_pref_cb("/purple/proxy/host", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/host"), NULL);
-	proxy_pref_cb("/purple/proxy/port", PURPLE_PREF_STRING, GINT_TO_POINTER(purple_prefs_get_int("/purple/proxy/port")), NULL);
-	proxy_pref_cb("/purple/proxy/username", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/username"), NULL);
-	proxy_pref_cb("/purple/proxy/password", PURPLE_PREF_STRING, purple_prefs_get_string("/purple/proxy/password"), NULL);
+	purple_prefs_trigger_callback("/purple/proxy/type");
+	purple_prefs_trigger_callback("/purple/proxy/host");
+	purple_prefs_trigger_callback("/purple/proxy/port");
+	purple_prefs_trigger_callback("/purple/proxy/username");
+	purple_prefs_trigger_callback("/purple/proxy/password");
 }
 
 void
============================================================
--- libpurple/status.c	1eb4a9526f9b26fa096f6ff8c8205f092b126b1e
+++ libpurple/status.c	a0e82882e37ae83691ee52bc46682db953f7cf96
@@ -1668,6 +1668,14 @@ purple_status_init(void)
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
+
+	purple_prefs_trigger_callback("/purple/status/scores/offline");
+	purple_prefs_trigger_callback("/purple/status/scores/available");
+	purple_prefs_trigger_callback("/purple/status/scores/invisible");
+	purple_prefs_trigger_callback("/purple/status/scores/away");
+	purple_prefs_trigger_callback("/purple/status/scores/extended_away");
+	purple_prefs_trigger_callback("/purple/status/scores/idle");
+	purple_prefs_trigger_callback("/purple/status/scores/offline_msg");
 }
 
 void

pidgin-2.2.0-plug-more-memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug-more-memleaks.patch ---
-----------------------------------------------------------------
Revision: 41389df89a4a6a007d41cec33e33043cd41ea159
Ancestor: 326d6e6c8c6a955cdba84f1f802fc21ec3e6b662
Author: datallah at pidgin.im
Date: 2007-09-17T16:24:24
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/message.c

ChangeLog: 

more leak fixes.

============================================================
--- libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
+++ libpurple/protocols/jabber/message.c	3bc876da8fe16d41770af8d980dce8457b3ac61a
@@ -41,7 +41,10 @@ void jabber_message_free(JabberMessage *
 	g_free(jm->body);
 	g_free(jm->xhtml);
 	g_free(jm->password);
+	g_free(jm->error);
+	g_free(jm->thread_id);
 	g_list_free(jm->etc);
+	g_list_free(jm->eventitems);
 
 	g_free(jm);
 }

pidgin-2.2.0-plug_memleaks.patch:

--- NEW FILE pidgin-2.2.0-plug_memleaks.patch ---
-----------------------------------------------------------------
Revision: db4583bc475b46b7cb9baa38229f12473d331870
Ancestor: 73d2587302ffbbe62f6b7f3e745508c0687813ba
Author: sadrul at pidgin.im
Date: 2007-09-15T18:27:01
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c

ChangeLog: 

Plug some memory leaks.

============================================================
--- libpurple/protocols/jabber/adhoccommands.c	d0b52a470cdc4c95503037ba92f51f87e61bdd10
+++ libpurple/protocols/jabber/adhoccommands.c	1f8c9a282612f146d5e43e994629da3817e88f48
@@ -151,8 +151,11 @@ static void jabber_adhoc_parse(JabberStr
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 		
-		if(note)
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL);
+		if(note) {
+			char *data = xmlnode_get_data(note);
+			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			g_free(data);
+		}
 		
 		if(xdata)
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
============================================================
--- libpurple/protocols/jabber/buddy.c	6fee8dda0f8e37a98fab4a18606447fa29792fd5
+++ libpurple/protocols/jabber/buddy.c	490b348e2662e107a450a4e9b08db1437c260d03
@@ -1455,10 +1455,13 @@ static void do_buddy_avatar_update_data(
 		return;
 	
 	img = purple_base64_decode(b64data, &size);
-	if(!img)
+	if(!img) {
+		g_free(b64data);
 		return;
+	}
 	
 	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
 }
 
 void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
============================================================
--- libpurple/protocols/jabber/jabber.c	8211a80fdca963e6b51e9a4a9d5b096225a57711
+++ libpurple/protocols/jabber/jabber.c	121e708c2e28ec3ff0da92cbf9e82a89f8d1a3b1
@@ -813,7 +813,7 @@ jabber_register_cancel_cb(JabberRegister
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 		jabber_connection_schedule_close(cbdata->js);
-}
+	}
 	g_free(cbdata->who);
 	g_free(cbdata);
 }
@@ -882,12 +882,12 @@ void jabber_register_parse(JabberStream 
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
-				if(js->registration) {
-					js->gc->wants_to_die = TRUE;
-					if(account->registration_cb) /* succeeded, but we have no login info */
-						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
-					jabber_connection_schedule_close(js);
-				}
+					if(js->registration) {
+						js->gc->wants_to_die = TRUE;
+						if(account->registration_cb) /* succeeded, but we have no login info */
+							(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+						jabber_connection_schedule_close(js);
+					}
 					return;
 				}
 			}
@@ -987,14 +987,14 @@ void jabber_register_parse(JabberStream 
 		purple_request_field_group_add_field(group, field);
 	}
 
-		if((y = xmlnode_get_child(query, "instructions")))
-			instructions = xmlnode_get_data(y);
+	if((y = xmlnode_get_child(query, "instructions")))
+		instructions = xmlnode_get_data(y);
 	else if(registered)
 		instructions = g_strdup(_("Please fill out the information below "
 					"to change your account registration."));
-		else
-			instructions = g_strdup(_("Please fill out the information below "
-						"to register your new account."));
+	else
+		instructions = g_strdup(_("Please fill out the information below "
+					"to register your new account."));
 
 	cbdata = g_new0(JabberRegisterCBData, 1);
 	cbdata->js = js;
@@ -1019,8 +1019,8 @@ void jabber_register_parse(JabberStream 
 		g_free(title);
 	}
 
-		g_free(instructions);
-	}
+	g_free(instructions);
+}
 
 void jabber_register_start(JabberStream *js)
 {
============================================================
--- libpurple/protocols/jabber/message.c	309b575a8bd728be0fb2b41edf1362c2911b8367
+++ libpurple/protocols/jabber/message.c	2484754364477f8cacff4778fa87396b81924175
@@ -324,7 +324,7 @@ void jabber_message_parse(JabberStream *
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-	else if(!strcmp(type, "chat"))
+		else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
============================================================
--- libpurple/protocols/jabber/presence.c	64aa78ce207c12bf4c35e137cfa344ba6b0e9926
+++ libpurple/protocols/jabber/presence.c	2b25212d8c6b6df2aeef8dd484660bff573c3511
@@ -192,16 +192,11 @@ void jabber_presence_send(PurpleAccount 
 		jabber_tune_set(js->gc, &tuneinfo);
 		
 		/* update old values */
-		if(js->old_artist)
-			g_free(js->old_artist);
-		if(js->old_title)
-			g_free(js->old_title);
-		if(js->old_source)
-			g_free(js->old_source);
-		if(js->old_uri)
-			g_free(js->old_uri);
-		if(js->old_track)
-			g_free(js->old_track);
+		g_free(js->old_artist);
+		g_free(js->old_title);
+		g_free(js->old_source);
+		g_free(js->old_uri);
+		g_free(js->old_track);
 		js->old_artist = g_strdup(artist);
 		js->old_title = g_strdup(title);
 		js->old_source = g_strdup(source);
============================================================
--- libpurple/protocols/jabber/usernick.c	5817ece1551b32a06a815751ec2d0c6e73fce836
+++ libpurple/protocols/jabber/usernick.c	e0e09357277521664d7f14ecf84033d6e84aa564
@@ -33,7 +33,7 @@ static void jabber_nick_cb(JabberStream 
 	xmlnode *item = xmlnode_get_child(items, "item");
 	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	xmlnode *nick;
-	const char *nickname = NULL;
+	char *nickname = NULL;
 	
 	/* ignore the tune of people not on our buddy list */
 	if (!buddy || !item)
@@ -43,8 +43,8 @@ static void jabber_nick_cb(JabberStream 
 	if (!nick)
 		return;
 	nickname = xmlnode_get_data(nick);
-
 	serv_got_alias(js->gc, from, nickname);
+	g_free(nickname);
 }
 
 static void do_nick_set(JabberStream *js, const char *nick) {
@@ -64,7 +64,7 @@ static void do_nick_got_own_nick_cb(Jabb
 }
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
-	const char *oldnickname = NULL;
+	char *oldnickname = NULL;
 	xmlnode *item = xmlnode_get_child(items,"item");
 	
 	if(item) {
@@ -77,6 +77,7 @@ static void do_nick_got_own_nick_cb(Jabb
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
 		purple_connection_get_account(js->gc), NULL, NULL, js);
+	g_free(oldnickname);
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
============================================================
--- libpurple/protocols/jabber/usertune.c	cdfd425e9ed68eae4aee8d95addd93c093833093
+++ libpurple/protocols/jabber/usertune.c	a20360876437c9c69c30dd9bf3b78c192d47cc79
@@ -41,48 +41,61 @@ static void jabber_tune_cb(JabberStream 
 	if (!buddy || !item)
 		return;
 	
-	tuneinfodata.artist = "";
-	tuneinfodata.title = "";
-	tuneinfodata.album = "";
-	tuneinfodata.track = "";
+	tuneinfodata.artist = NULL;
+	tuneinfodata.title = NULL;
+	tuneinfodata.album = NULL;
+	tuneinfodata.track = NULL;
 	tuneinfodata.time = -1;
-	tuneinfodata.url = "";
-	
+	tuneinfodata.url = NULL;
+
 	tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune");
 	if (!tune)
 		return;
+	resource = jabber_buddy_find_resource(buddy, NULL);
+	if(!resource)
+		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
 			if (!strcmp(tuneinfo->name, "artist")) {
-				if (tuneinfodata.artist[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
 						tuneinfodata.time = strtol(length, NULL, 10);
+					g_free(length);
 				}
 			} else if (!strcmp(tuneinfo->name, "source")) {
-				if (tuneinfodata.album[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "title")) {
-				if (tuneinfodata.title[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "track")) {
-				if (tuneinfodata.track[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 			} else if (!strcmp(tuneinfo->name, "uri")) {
-				if (tuneinfodata.url[0] == '\0') /* only pick the first one */
+				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 			}
 		}
 	}
-	resource = jabber_buddy_find_resource(buddy, NULL);
-	if(!resource)
-		return; /* huh? */
 	status_id = jabber_buddy_state_get_status_id(resource->state);
 
-	purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+	purple_prpl_got_user_status(js->gc->account, from, status_id,
+			PURPLE_TUNE_ARTIST, tuneinfodata.artist,
+			PURPLE_TUNE_TITLE, tuneinfodata.title,
+			PURPLE_TUNE_ALBUM, tuneinfodata.album,
+			PURPLE_TUNE_TRACK, tuneinfodata.track,
+			PURPLE_TUNE_TIME, tuneinfodata.time,
+			PURPLE_TUNE_URL, tuneinfodata.url, NULL);
+
+	g_free(tuneinfodata.artist);
+	g_free(tuneinfodata.title);
+	g_free(tuneinfodata.album);
+	g_free(tuneinfodata.track);
+	g_free(tuneinfodata.url);
 }
 
 void jabber_tune_init(void) {


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pidgin.spec	18 Sep 2007 15:12:26 -0000	1.23
+++ pidgin.spec	18 Sep 2007 15:27:45 -0000	1.24
@@ -29,8 +29,11 @@
 
 Name:		pidgin
 Version:	2.2.0
-Release:	1%{?dist}
-License:	GPLv2+
+Release:	2%{?dist}
+License:        GPLv2+ and GPLv2 and MIT
+# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
+# GPLv2 - silc & novell prpls
+# MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
 Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
@@ -55,6 +58,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:         pidgin-2.2.0-plug_memleaks.patch 
+Patch101:         pidgin-2.2.0-fix-proxy-settings.patch
+Patch102:         pidgin-2.2.0-fix-status-scores.patch
+Patch103:         pidgin-2.2.0-plug-more-memleaks.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -283,6 +290,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -496,7 +507,12 @@
 
 
 %changelog
-* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-0
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
+- License clarification
+- Backport patches to fix memory leaks
+- Backport patches to fix proxy settings & status scores
+
+* Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-1
 - 2.2.0
 
 * Mon Aug 20 2007 Warren Togami <wtogami at redhat.com> - 2.1.1-1



From fedora-extras-commits at redhat.com  Tue Sep 18 15:33:18 2007
From: fedora-extras-commits at redhat.com (John (J5) Palmieri (johnp))
Date: Tue, 18 Sep 2007 11:33:18 -0400
Subject: rpms/initscripts/OLPC-2 initscripts-8.54.1-olpc.patch, 1.7,
	1.8 initscripts.spec, 1.150, 1.151
Message-ID: <200709181533.l8IFXI8j023303@cvs-int.fedora.redhat.com>

Author: johnp

Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23252

Modified Files:
	initscripts-8.54.1-olpc.patch initscripts.spec 
Log Message:
- don't crash if /etc/sysconfig/i18n does not exist


initscripts-8.54.1-olpc.patch:

Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- initscripts-8.54.1-olpc.patch	13 Sep 2007 17:38:58 -0000	1.7
+++ initscripts-8.54.1-olpc.patch	18 Sep 2007 15:33:15 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
 --- initscripts-8.54.1/rwtab.olpc	2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/rwtab	2007-09-13 13:31:32.000000000 -0400
 @@ -24,10 +24,7 @@ empty	/var/tux
  empty	/media
  
@@ -19,7 +19,7 @@
 +files   /home/olpc/.Xauthority
 diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
 --- initscripts-8.54.1/inittab.olpc	2006-10-12 13:51:04.000000000 -0400
-+++ initscripts-8.54.1/inittab	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/inittab	2007-09-13 13:31:32.000000000 -0400
 @@ -15,7 +15,7 @@
  #   5 - X11
  #   6 - reboot (Do NOT set initdefault to this)
@@ -43,9 +43,9 @@
 -x:5:respawn:/etc/X11/prefdm -nodaemon
 +x:5:respawn:/sbin/olpc-dm
 diff -up /dev/null initscripts-8.54.1/src/olpc-dm.c
---- /dev/null	2007-09-13 09:21:47.113128415 -0400
-+++ initscripts-8.54.1/src/olpc-dm.c	2007-09-13 13:29:21.000000000 -0400
-@@ -0,0 +1,568 @@
+--- /dev/null	2007-09-18 09:50:57.766542723 -0400
++++ initscripts-8.54.1/src/olpc-dm.c	2007-09-18 11:30:44.000000000 -0400
+@@ -0,0 +1,571 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -220,6 +220,9 @@
 +  char *line;
 +
 +  f = fopen("/etc/sysconfig/i18n", "r");
++  if (!f)
++    return;
++
 +  while(fscanf(f, "%as", &line)==1)
 +    {
 +      char *sline;
@@ -616,7 +619,7 @@
 +}
 diff -up initscripts-8.54.1/src/Makefile.olpc initscripts-8.54.1/src/Makefile
 --- initscripts-8.54.1/src/Makefile.olpc	2006-09-27 15:59:05.000000000 -0400
-+++ initscripts-8.54.1/src/Makefile	2007-09-11 18:33:31.000000000 -0400
++++ initscripts-8.54.1/src/Makefile	2007-09-13 13:31:32.000000000 -0400
 @@ -1,7 +1,8 @@
  CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
  


Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- initscripts.spec	13 Sep 2007 17:38:58 -0000	1.150
+++ initscripts.spec	18 Sep 2007 15:33:15 -0000	1.151
@@ -3,7 +3,7 @@
 Version: 8.54.1
 License: GPL
 Group: System Environment/Base
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 Source: initscripts-%{version}.tar.bz2
 Source1: olpc-login
 Patch0: initscripts-8.54.1-olpc.patch
@@ -207,6 +207,9 @@
 %{_sysconfdir}/pam.d/olpc-login
 
 %changelog
+* Tue Sep 18 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-8
+- don't crash if /etc/sysconfig/i18n does not exist
+
 * Thu Sep 11 2007 John (J5) Palmieri <johnp at redhat.com> 8.54.1-7
 - fix crasher bug in olpc-dm
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:33:46 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 11:33:46 -0400
Subject: rpms/cups/devel cups-str2512-printcap.patch, NONE, 1.1 cups.spec,
	1.357, 1.358
Message-ID: <200709181533.l8IFXkjE023356@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23254

Modified Files:
	cups.spec 
Added Files:
	cups-str2512-printcap.patch 
Log Message:
* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
- Write printcap when a remote queue is deleted (bug #290831).


cups-str2512-printcap.patch:

--- NEW FILE cups-str2512-printcap.patch ---
diff -up cups-1.3.1/scheduler/dirsvc.c.printcap cups-1.3.1/scheduler/dirsvc.c
--- cups-1.3.1/scheduler/dirsvc.c.printcap	2007-09-18 16:29:18.000000000 +0100
+++ cups-1.3.1/scheduler/dirsvc.c	2007-09-18 16:29:19.000000000 +0100
@@ -2134,6 +2134,7 @@ process_browse_data(
  
     cupsdDeletePrinter(p, 1);
     cupsdUpdateImplicitClasses();
+    write_printcap = 1;
   }
   else if (update)
   {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- cups.spec	18 Sep 2007 08:32:42 -0000	1.357
+++ cups.spec	18 Sep 2007 15:33:14 -0000	1.358
@@ -39,6 +39,7 @@
 Patch14: cups-lpr-help.patch
 Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
+Patch17: cups-str2512-printcap.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -149,6 +150,7 @@
 %patch14 -p1 -b .lpr-help
 %patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
+%patch17 -p1 -b .str2512-printcap
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -441,6 +443,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
+- Write printcap when a remote queue is deleted (bug #290831).
+
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
 - Avoid write printcap unnecessarily (bug #290831).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:34:38 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 18 Sep 2007 11:34:38 -0400
Subject: rpms/cups/devel cups.spec,1.358,1.359
Message-ID: <200709181534.l8IFYcxs023476@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23406

Modified Files:
	cups.spec 
Log Message:
1.3.1-3


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- cups.spec	18 Sep 2007 15:33:14 -0000	1.358
+++ cups.spec	18 Sep 2007 15:34:06 -0000	1.359
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 15:34:49 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 11:34:49 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.7, 1.8 ConsoleKit.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200709181534.l8IFYnrk023521@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
2.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Sep 2007 01:49:28 -0000	1.7
+++ .cvsignore	18 Sep 2007 15:34:15 -0000	1.8
@@ -1 +1 @@
-ConsoleKit-0.2.2.tar.gz
+ConsoleKit-0.2.3.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ConsoleKit.spec	18 Sep 2007 02:31:37 -0000	1.14
+++ ConsoleKit.spec	18 Sep 2007 15:34:15 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.2
+Version: 0.2.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -144,6 +144,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.3-1
+- Update to 0.2.3
+
 * Mon Sep 17 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.2-1
 - Update to 0.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Sep 2007 01:49:28 -0000	1.7
+++ sources	18 Sep 2007 15:34:15 -0000	1.8
@@ -1 +1 @@
-700128f32c2e3c087684f4c28a312764  ConsoleKit-0.2.2.tar.gz
+dc4b3194ec583b03747ffc909a5571da  ConsoleKit-0.2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:37:11 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 11:37:11 -0400
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.22,1.23
Message-ID: <200709181537.l8IFbBcd023648@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23603

Modified Files:
	dnsmasq.spec 
Log Message:
oops, broken magic :-)


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dnsmasq.spec	18 Sep 2007 15:15:26 -0000	1.22
+++ dnsmasq.spec	18 Sep 2007 15:36:39 -0000	1.23
@@ -1,11 +1,17 @@
-#%define extrapath release-candidates/
-#%define extrapath test-releases/
-#%define extraversion rc2
-#%define extraversion test2
+%define testrelease 0
+%define releasecandidate 0
+%if 0%{testrelease}
+  %define extrapath test-releases/
+  %define extraversion test2
+%endif
+%if 0%{releasecandidate}
+  %define extrapath release-candidates/
+  %define extraversion rc2
+%endif
 
 Name:           dnsmasq
 Version:        2.40
-Release:        1%{extraversion}%{?dist}
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Sep 18 15:37:44 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 11:37:44 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.126,
	1.127 libselinux.spec, 1.284, 1.285
Message-ID: <200709181537.l8IFbiLc023721@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23698

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- libselinux-rhat.patch	6 Sep 2007 12:37:00 -0000	1.126
+++ libselinux-rhat.patch	18 Sep 2007 15:37:42 -0000	1.127
@@ -1,46 +1,25 @@
-Index: libselinux/src/selinuxswig_python.i
-===================================================================
---- libselinux/src/selinuxswig_python.i	(revision 2549)
-+++ libselinux/src/selinuxswig_python.i	(working copy)
-@@ -98,4 +98,41 @@
- 	}
- }
- 
-+%typemap(in) char * const [] {
-+	int i, size;
-+	PyObject * s;
-+
-+	if (!PySequence_Check($input)) {
-+		PyErr_SetString(PyExc_ValueError, "Expected a sequence");
-+		return NULL;
-+	}
-+
-+	size = PySequence_Size($input);
-+	
-+	$1 = (char**) malloc(size + 1);
-+
-+	for(i = 0; i < size; i++) {
-+		if (!PyString_Check(PySequence_GetItem($input, i))) {
-+			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");
-+			return NULL;
-+		}
-+	}
-+		
-+	for(i = 0; i < size; i++) {
-+		s = PySequence_GetItem($input, i);
-+		$1[i] = (char*) malloc(PyString_Size(s) + 1);
-+		strcpy($1[i], PyString_AsString(s));
-+	}
-+	$1[size] = NULL;
-+}
-+
-+%typemap(freearg,match="in") char * const [] {
-+	int i = 0;
-+	while($1[i]) {
-+		free($1[i]);
-+		i++;
-+	}
-+	free($1);
-+}
-+
- %include "selinuxswig.i"
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c	2007-08-10 11:58:34.000000000 -0400
++++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 11:28:07.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <syslog.h>
+ #include "selinux_internal.h"
+ #include "label_internal.h"
+ #include "callbacks.h"
+@@ -55,10 +56,12 @@
+ #endif
+     default_printf(const char *fmt, ...)
+ {
++	char buf[BUFSIZ];
+ 	va_list ap;
+ 	va_start(ap, fmt);
+-	vfprintf(stderr, fmt, ap);
++	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+ 	va_end(ap);
++	syslog(LOG_ERR, buf, strlen(buf));
+ }
+ 
+ void


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- libselinux.spec	13 Sep 2007 12:29:38 -0000	1.284
+++ libselinux.spec	18 Sep 2007 15:37:42 -0000	1.285
@@ -2,10 +2,11 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver}
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -122,6 +124,9 @@
 
 %changelog
 
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-2
+- Change matchpatcon to use syslog instead of syserror
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
 - Upgrade to latest from NSA
 	* Re-map a getxattr return value of 0 to a getfilecon return value of -1 with errno EOPNOTSUPP from Stephen Smalley.



From fedora-extras-commits at redhat.com  Tue Sep 18 15:40:27 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:40:27 -0400
Subject: rpms/qgit/EL-4 qgit.spec,1.18,1.19
Message-ID: <200709181540.l8IFeRLh023802@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-4/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:56:43 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:39:54 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:42:00 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:42:00 -0400
Subject: rpms/qgit/EL-5 qgit.spec,1.18,1.19
Message-ID: <200709181542.l8IFg0KK023847@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23822

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/EL-5/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:58:55 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:41:27 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:43:25 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 18 Sep 2007 11:43:25 -0400
Subject: fedora-security/audit fc6,1.260,1.261 fc7,1.108,1.109
Message-ID: <200709181543.l8IFhPZr023894@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23869/audit

Modified Files:
	fc6 fc7 
Log Message:
Vulnerable rpc code also part of nfs-utils-lib and libtirpc.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- fc6	17 Sep 2007 15:42:28 -0000	1.260
+++ fc6	18 Sep 2007 15:43:23 -0000	1.261
@@ -36,6 +36,8 @@
 CVE-2007-4168 backport (libexif) #243892 [since FEDORA-2007-614]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
+CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294911
+CVE-2007-3999 VULNERABLE (libtirpc) #294931
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc7	17 Sep 2007 15:42:28 -0000	1.108
+++ fc7	18 Sep 2007 15:43:23 -0000	1.109
@@ -74,6 +74,8 @@
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
+CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294901
+CVE-2007-3999 VULNERABLE (libtirpc) #294921
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252295 [since FEDORA-2007-1697]



From fedora-extras-commits at redhat.com  Tue Sep 18 15:44:19 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:44:19 -0400
Subject: rpms/mash/F-7 mash-multilib.patch,1.1,1.2
Message-ID: <200709181544.l8IFiJpD023948@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927

Modified Files:
	mash-multilib.patch 
Log Message:
update for valgrind (#294761)


mash-multilib.patch:

Index: mash-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mash-multilib.patch	6 Sep 2007 15:05:07 -0000	1.1
+++ mash-multilib.patch	18 Sep 2007 15:44:16 -0000	1.2
@@ -1,5 +1,23 @@
 --- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
 +++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
+@@ -5,7 +5,7 @@ class MultilibMethod:
+     def __init__(self):
+         self.name = 'base'
+     def select(self, po):
+-        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace', 'valgrind']
++        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace' ]
+         if po.arch.find('64') != -1:
+             if po.name in prefer_64:
+                 return True
+@@ -54,7 +54,7 @@ class RuntimeMultilibMethod(MultilibMeth
+     
+     def select(self, po):
+         libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
+-        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts' ]
++        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts', 'valgrind' ]
+         if po.name in whitelist:
+             return True
+         if MultilibMethod.select(self,po):
 @@ -87,18 +109,18 @@
          self.name = 'devel'
      



From fedora-extras-commits at redhat.com  Tue Sep 18 15:47:23 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:47:23 -0400
Subject: rpms/mash/F-7 mash.spec,1.7,1.8
Message-ID: <200709181547.l8IFlNbq024008@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23979

Modified Files:
	mash.spec 
Log Message:
bump for build



Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mash.spec	6 Sep 2007 15:05:07 -0000	1.7
+++ mash.spec	18 Sep 2007 15:46:51 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -45,6 +45,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.1.18-3
+- more multilib fixes from head (#294761)
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.1.18-2
 - backport some multilib fixes from HEAD (#247321, #271761)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 15:50:02 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Sep 2007 11:50:02 -0400
Subject: rpms/mash/devel .cvsignore, 1.16, 1.17 mash.spec, 1.14, 1.15 sources,
	1.17, 1.18
Message-ID: <200709181550.l8IFo2kb024155@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24120

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Sep 2007 20:17:03 -0000	1.16
+++ .cvsignore	18 Sep 2007 15:49:30 -0000	1.17
@@ -1 +1 @@
-mash-0.2.4.tar.gz
+mash-0.2.5.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mash.spec	17 Sep 2007 20:17:03 -0000	1.14
+++ mash.spec	18 Sep 2007 15:49:30 -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:           mash
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.2.5-1
+- handle valgrind for multilib differently (#294761)
+
 * Mon Sep 17 2007 Bill Nottingham <notting at redhat.com> 0.2.4-1
 - repoview support (<jkeating at redhat.com>)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Sep 2007 20:17:03 -0000	1.17
+++ sources	18 Sep 2007 15:49:30 -0000	1.18
@@ -1 +1 @@
-03ab739b45298a4db6e5d56eb549b6bc  mash-0.2.4.tar.gz
+73e37a8340bb6d9356d0ce18eea485f2  mash-0.2.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 15:52:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 11:52:27 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.14,1.15
Message-ID: <200709181552.l8IFqRco024368@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24271

Modified Files:
	xulrunner.spec 
Log Message:
added crashreporter


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xulrunner.spec	18 Sep 2007 14:23:14 -0000	1.14
+++ xulrunner.spec	18 Sep 2007 15:51:55 -0000	1.15
@@ -313,6 +313,7 @@
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
+%{_libdir}/%{name}-*/crashreporter
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*



From fedora-extras-commits at redhat.com  Tue Sep 18 15:52:56 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 11:52:56 -0400
Subject: rpms/qgit/F-7 qgit.spec,1.18,1.19
Message-ID: <200709181552.l8IFquw8024472@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24350

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/F-7/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:48:22 -0000	1.18
+++ qgit.spec	18 Sep 2007 15:52:23 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 15:53:28 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 18 Sep 2007 11:53:28 -0400
Subject: rpms/lagan/devel lagan20-chris.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 lagan.spec, 1.4, 1.5 sources, 1.2, 1.3 lagan12-chris.patch,
	1.1, NONE
Message-ID: <200709181553.l8IFrSll024538@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24465

Modified Files:
	.cvsignore lagan.spec sources 
Added Files:
	lagan20-chris.patch 
Removed Files:
	lagan12-chris.patch 
Log Message:
New upstream release.

lagan20-chris.patch:

--- NEW FILE lagan20-chris.patch ---
diff -up lagan20/Readmes/README.FIRST.chris lagan20/Readmes/README.FIRST
--- lagan20/Readmes/README.FIRST.chris	2006-09-14 23:23:08.000000000 +0200
+++ lagan20/Readmes/README.FIRST	2007-09-18 17:27:46.000000000 +0200
@@ -30,8 +30,7 @@ This will create the executable files ch
 glocal, prolagan as well as many tools in the utils directory. 
 
 You may also need to go into all the .pl file, and change the first line
-to call your perl interpreter. You must also specify an environment
-variable $LAGAN_DIR to point to the directory where you installed LAGAN.
+to call your perl interpreter.
 
 Because LAGAN uses no system-dependent or implementation dependent 
 libraries it should compile on all platforms and ANSI C compilers. 
diff -up lagan20/Readmes/README.shuffle.chris lagan20/Readmes/README.shuffle
--- lagan20/Readmes/README.shuffle.chris	2006-09-15 01:14:40.000000000 +0200
+++ lagan20/Readmes/README.shuffle	2007-09-18 17:27:46.000000000 +0200
@@ -13,14 +13,13 @@ unpublished.
 1. Installation
 
 If you received Shuffle-LAGAN as part of the LAGAN toolkit it is installed 
-automatically with the rest of the package. The code assumes $LAGAN_DIR 
-has been set. 
+automatically with the rest of the package.
 
 
 2. Running
 Just give it two sequences and let it roll:
 
-#slagan.pl seq1.fa seq2.fa 
+#slagan seq1.fa seq2.fa 
 
 3. Input
 
diff -up lagan20/Readmes/README.chaos.chris lagan20/Readmes/README.chaos
--- lagan20/Readmes/README.chaos.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/Readmes/README.chaos	2007-09-18 17:27:46.000000000 +0200
@@ -29,13 +29,7 @@ connecting CHAOS with DIALIGN. Both thes
 
 Because CHAOS uses no system-dependent or implementation dependent libraries
 it should compile on all platforms and ANSI C compilers. If you have problems
-compiling the sources please e-mail the author. You will need to also set the
-environment variable LAGAN_DIR to the directory where you installed CHAOS. in
-c-shell this can be done by executing
-
-% setenv LAGAN_DIR `pwd`
-
-on the prompt. For other shells the command differs.
+compiling the sources please e-mail the author.
 
 II Description
    CHAOS is a heuristic local alignment tool optimized for non-coding 
diff -up lagan20/Readmes/README.lagan.chris lagan20/Readmes/README.lagan
--- lagan20/Readmes/README.lagan.chris	2006-09-15 01:12:53.000000000 +0200
+++ lagan20/Readmes/README.lagan	2007-09-18 17:27:46.000000000 +0200
@@ -22,7 +22,7 @@ using the anchors program.
 3. Doing global alignment in a limited area of thw NW matrix given the set of 
 anchors (order tool).
 
-lagan.pl is the main executable that calls the three steps.
+lagan is the main executable that calls the three steps.
 
 II Usage
 
diff -up lagan20/src/utils/scorealign.c.chris lagan20/src/utils/scorealign.c
--- lagan20/src/utils/scorealign.c.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/scorealign.c	2007-09-18 17:27:46.000000000 +0200
@@ -402,10 +402,6 @@ void readScoreMatrix (char *filename){
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
diff -up lagan20/src/utils/Glue.cpp.chris lagan20/src/utils/Glue.cpp
--- lagan20/src/utils/Glue.cpp.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/Glue.cpp	2007-09-18 17:27:46.000000000 +0200
@@ -30,10 +30,6 @@ void readScoreMatrix (char *filename){
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
diff -up lagan20/src/utils/mrun.pl.chris lagan20/src/utils/mrun.pl
--- lagan20/src/utils/mrun.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrun.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
diff -up lagan20/src/utils/mrunfile.pl.chris lagan20/src/utils/mrunfile.pl
--- lagan20/src/utils/mrunfile.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrunfile.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
 if (@ARGV < 1) {
     print ("usage:\n mrunfile.pl filename [-pairwise] [-vista]\n\n");
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@ while ($line = <PARAMFILE>) {
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
diff -up lagan20/src/utils/mrunpairs.pl.chris lagan20/src/utils/mrunpairs.pl
--- lagan20/src/utils/mrunpairs.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mrunpairs.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
diff -up lagan20/src/utils/mviz.pl.chris lagan20/src/utils/mviz.pl
--- lagan20/src/utils/mviz.pl.chris	2006-09-14 22:40:18.000000000 +0200
+++ lagan20/src/utils/mviz.pl	2007-09-18 17:27:46.000000000 +0200
@@ -2,9 +2,9 @@
 
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@ while ($line = <PARAMFILE>) {
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
diff -up lagan20/src/mlagan.c.chris lagan20/src/mlagan.c
--- lagan20/src/mlagan.c.chris	2006-09-15 17:57:48.000000000 +0200
+++ lagan20/src/mlagan.c	2007-09-18 17:27:46.000000000 +0200
@@ -950,10 +950,6 @@ int main(int argc, char** argv) {
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
diff -up lagan20/src/prolagan.c.chris lagan20/src/prolagan.c
--- lagan20/src/prolagan.c.chris	2006-09-14 23:17:32.000000000 +0200
+++ lagan20/src/prolagan.c	2007-09-18 17:27:46.000000000 +0200
@@ -968,10 +968,6 @@ int main(int argc, char** argv) {
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
diff -up lagan20/src/slagan-mfa.pl.chris lagan20/src/slagan-mfa.pl
--- lagan20/src/slagan-mfa.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/slagan-mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -4,7 +4,6 @@ use strict;
 
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
 my $LAGAN_DIR = $ENV{LAGAN_DIR};
 
 my ($outfile, $base);
diff -up lagan20/src/supermap.pl.chris lagan20/src/supermap.pl
--- lagan20/src/supermap.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/supermap.pl	2007-09-18 17:27:46.000000000 +0200
@@ -18,7 +18,6 @@ my $max_job_size = 50000; # Maximum job 
 my $erode_align = 15; # Amount by which to erode the coords of each align loaded (to avoid overlap problems when chaining)
 my ($c1, $c2, $c3, $c4) = (100, 50, 400, 25); # BLAT->CHAOS score conversion parameters
 #my $max_dist_y = 10000; # Join x-monotonic into same single-chain only if at most that apart in y-species.
-my $default_lagan_dir = "/home/genome/glocal";
 my $glocal_name = (0 ? "SLAGAN" : "glocal");
 
 use Getopt::Long;
@@ -93,12 +92,7 @@ my $supermapexec = $0; my $mycwd = getcw
 die("$0: Problem resolving my name, \'$supermapexec\' is not a file") unless -f $supermapexec or $ARGV[0] eq "worker";
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-$lagan_dir = $ENV{"LAGAN_DIR"} if defined $ENV{"LAGAN_DIR"};
-$lagan_dir = $ENV{"LAGAN_DIR"} = $default_lagan_dir unless defined $ENV{"LAGAN_DIR"};
-$lagan_dir =~ s/^\.\./$mycwd\/\.\./;
-$lagan_dir =~ s/^\./$mycwd\//;
-$ENV{"LAGAN_DIR"} = $lagan_dir;
-print STDERR "$0: Warning: LAGAN_DIR=$lagan_dir is not a valid directory\n" unless -d $lagan_dir;
+$lagan_dir = $ENV{LAGAN_DIR};
 push @INC, $lagan_dir;
 
 my $SLAGAN = $lagan_dir."/".$glocal_name;
diff -up lagan20/src/xmfa2mfa.pl.chris lagan20/src/xmfa2mfa.pl
--- lagan20/src/xmfa2mfa.pl.chris	2006-09-14 22:40:19.000000000 +0200
+++ lagan20/src/xmfa2mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -9,8 +9,6 @@ my ($line, $line_in, $type);
 
 my $mode = ($ARGV[0] eq "1" ? "M1" : ($ARGV[0] eq "2" ? "M2" : die("$0: Invalid base genome argument (expected 1 or 2)")));
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
-
 while (<STDIN>) {
 	$line_in = $_;
 	if ($line_in =~ /^\=.*(DM|M1|M2)$/) {
@@ -47,7 +45,7 @@ open(OUT, "> tmp.xmfa");
 foreach my $line (@filt_lines) { print OUT $line; }
 close OUT;
 
-system($ENV{"LAGAN_DIR"}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
+system($ENV{LAGAN_DIR}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
 
 open(IN, "< glue.out");
 my @glue_out = <IN>;
diff -up lagan20/utils/mrunpairs.pl.chris lagan20/utils/mrunpairs.pl
--- lagan20/utils/mrunpairs.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrunpairs.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -189,7 +179,7 @@ for($i=1; $i<@targets; $i+=2) {
 	$mparams = "$mparams $s";
     }
     
-    $mlagan = "$lagandir/mlagan$mfiles$mparams > $outprefix.out";
+    $mlagan = "mlagan$mfiles$mparams > $outprefix.out";
     print "\n$mlagan\n\n";
     if(`$mlagan`) { print "\n\n"; exit(1); }
 
diff -up lagan20/utils/draft.pl.chris lagan20/utils/draft.pl
--- lagan20/utils/draft.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/draft.pl	2007-09-18 17:27:46.000000000 +0200
@@ -109,7 +109,7 @@ for ($i = 0; $i < @contigs; $i++){
     $skip1 = $skip2 = 0;
     # make alignments
     if (!$lazyflag || !(-e "$contigs[$i].mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
@@ -128,7 +128,7 @@ for ($i = 0; $i < @contigs; $i++){
     }
 
     if (!$lazyflag || !(-e "$contigs[$i].rc.mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
diff -up lagan20/utils/mrunfile.pl.chris lagan20/utils/mrunfile.pl
--- lagan20/utils/mrunfile.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrunfile.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,14 +1,14 @@
 #!/usr/bin/env perl
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
 if (@ARGV < 1) {
     print ("usage:\n mrunfile.pl filename [-pairwise] [-vista]\n\n");
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@ while ($line = <PARAMFILE>) {
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
diff -up lagan20/utils/mviz.pl.chris lagan20/utils/mviz.pl
--- lagan20/utils/mviz.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mviz.pl	2007-09-18 17:27:46.000000000 +0200
@@ -2,9 +2,9 @@
 
 
 # This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
+# VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@ while ($line = <PARAMFILE>) {
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
diff -up lagan20/utils/mrun.pl.chris lagan20/utils/mrun.pl
--- lagan20/utils/mrun.pl.chris	2006-09-14 22:40:17.000000000 +0200
+++ lagan20/utils/mrun.pl	2007-09-18 17:27:46.000000000 +0200
@@ -1,11 +1,6 @@
 #!/usr/bin/env perl
 
-# This script requires the environment variables:
-# LAGAN_DIR and VISTA_DIR
-
-# VISTA .plotfile defaults
-
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +82,6 @@ if (!$treespec) { 
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -169,7 +159,7 @@ foreach $s (@params) {
     $mparams = "$mparams $s";
 }
 
-$mlagan = "$lagandir/mlagan$mfiles$mparams > $prefix.out";
+$mlagan = "mlagan$mfiles$mparams > $prefix.out";
 print STDERR "\n$mlagan\n\n";
 if(`$mlagan`) { print "\n\n"; exit(1); }
 
diff -up lagan20/slagan.pl.chris lagan20/slagan.pl
--- lagan20/slagan.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/slagan.pl	2007-09-18 17:27:46.000000000 +0200
@@ -5,7 +5,7 @@ use strict;
 my $lagandir = $ENV{LAGAN_DIR};
 
 if (@ARGV < 2) {
-	print ("Usage:\n slagan.pl seqfile1 seqfile2 [-glocal \"glocal flags\"] [-chaos \"chaos flags\"] [-order \"order flags\"] [-recurse \"(wl1,nd1,co1),(wl2,nd2,co2),...\"] [-mfa] [-out \"filename\"] [-maskedonly] [-debug] [-translate] [-fastreject]\n");
+	print ("Usage:\n slagan seqfile1 seqfile2 [-glocal \"glocal flags\"] [-chaos \"chaos flags\"] [-order \"order flags\"] [-recurse \"(wl1,nd1,co1),(wl2,nd2,co2),...\"] [-mfa] [-out \"filename\"] [-maskedonly] [-debug] [-translate] [-fastreject]\n");
 	exit(1);
 }
 
@@ -85,7 +85,7 @@ if ($lazy && -e "${outName1}_$outName2.c
     `cp ${outName1}_$outName2.chaos chaos.$$`;
 }
 else {
-    `$lagandir/chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
+    `chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
     if ($?) { exit(1); }
     `cat chaos.$$ > ${outName1}_$outName2.chaos`;
 }
@@ -123,8 +123,8 @@ for (my $k = 0; $k < @regs; $k++) {
 	if ($extra1) { `$lagandir/utils/fa2xfa $seq1 $startreg1 $endreg1 1 > seq1$k.$$.masked\n`; }
 	if ($extra2) { `$lagandir/utils/fa2xfa $seq2 $startreg2 $endreg2 2 $rcf > seq2$k.$$.masked\n`; }
 
-#print "$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n";
-	`$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
+#print "lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n";
+	`lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
 
 	my $suff = "";
 	if ($outfile) { $suff = " >> $outfile"; }
diff -up lagan20/lagan.pl.chris lagan20/lagan.pl
--- lagan20/lagan.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/lagan.pl	2007-09-18 17:27:46.000000000 +0200
@@ -105,13 +105,13 @@ for ($i = 2; $i < @ARGV; $i++) {
 	$rundraft = 1;
     }
     elsif ($ARGV[$i] =~ /-cons/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-draftskipfr/){
-	$draftparams = $draftparams." -skipfr $ARGV[$++i]";
+	$draftparams = $draftparams." -skipfr ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-lazy/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
 
     else {
@@ -233,7 +233,7 @@ if ($infofile == 3){
 #    `$lagandir/utils/rm $infofilename` if ($binfile);
 }
 
-`rm $secondName` if ($rcflag);
+`rm $secondName` if ($rcFlag);
 `rm $$.*`;
 if ($?) { exit(1); }
 
diff -up lagan20/rechaos.pl.chris lagan20/rechaos.pl
--- lagan20/rechaos.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/rechaos.pl	2007-09-18 17:28:54.000000000 +0200
@@ -182,12 +182,12 @@ while (1) {
 #    print STDERR "-----------------\n";
 #    print STDERR `cat $$.anchs.pairs`;
 #    print STDERR "-----------------\n";
-#    print STDERR "$lagandir/chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+#    print STDERR "chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
 
 # PERFORM THE ALIGNMENTS USING CHAOS
     
-    $saver = "$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
-    `$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
+    $saver = "chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+    `chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
     if ($?) { 
 	print STDERR "$saver\n";
 	exit(1); 
@@ -216,7 +216,7 @@ while (1) {
 
 # FIND MAXIMAL-SCORING CONSISTENT CHAIN
 
-    `$lagandir/anchors $$.anchtemp $gfc $anchparams | sort -n +1 > $$.anchs.sorted`;
+    `$lagandir/anchors $$.anchtemp $gfc $anchparams | sort -n -k 2 > $$.anchs.sorted`;
     if ($?) { exit(1); }
 
 # IF WE'RE DONE, THEN QUIT!
@@ -243,7 +243,6 @@ while (1) {
     @b2new = 0;
     @e1new = 0;
     @e2new = 0;
-    @scores = 0;
 
     $app_str = "";
     
@@ -357,7 +356,7 @@ while (1) {
     $i++;
 }
 
-$res = `sort -nr +1 $$.anchs.sorted`;
+$res = `sort -nr -k 2 $$.anchs.sorted`;
 if ($?) { exit(1); }
 
 `rm $$.*`;
diff -up lagan20/slagan-mfa.pl.chris lagan20/slagan-mfa.pl
--- lagan20/slagan-mfa.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/slagan-mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -4,7 +4,6 @@ use strict;
 
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
 my $LAGAN_DIR = $ENV{LAGAN_DIR};
 
 my ($outfile, $base);
diff -up lagan20/supermap.pl.chris lagan20/supermap.pl
--- lagan20/supermap.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/supermap.pl	2007-09-18 17:27:46.000000000 +0200
@@ -18,7 +18,6 @@ my $max_job_size = 50000; # Maximum job 
 my $erode_align = 15; # Amount by which to erode the coords of each align loaded (to avoid overlap problems when chaining)
 my ($c1, $c2, $c3, $c4) = (100, 50, 400, 25); # BLAT->CHAOS score conversion parameters
 #my $max_dist_y = 10000; # Join x-monotonic into same single-chain only if at most that apart in y-species.
-my $default_lagan_dir = "/home/genome/glocal";
 my $glocal_name = (0 ? "SLAGAN" : "glocal");
 
 use Getopt::Long;
@@ -93,12 +92,7 @@ my $supermapexec = $0; my $mycwd = getcw
 die("$0: Problem resolving my name, \'$supermapexec\' is not a file") unless -f $supermapexec or $ARGV[0] eq "worker";
 $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
 
-$lagan_dir = $ENV{"LAGAN_DIR"} if defined $ENV{"LAGAN_DIR"};
-$lagan_dir = $ENV{"LAGAN_DIR"} = $default_lagan_dir unless defined $ENV{"LAGAN_DIR"};
-$lagan_dir =~ s/^\.\./$mycwd\/\.\./;
-$lagan_dir =~ s/^\./$mycwd\//;
-$ENV{"LAGAN_DIR"} = $lagan_dir;
-print STDERR "$0: Warning: LAGAN_DIR=$lagan_dir is not a valid directory\n" unless -d $lagan_dir;
+$lagan_dir = $ENV{LAGAN_DIR};
 push @INC, $lagan_dir;
 
 my $SLAGAN = $lagan_dir."/".$glocal_name;
diff -up lagan20/xmfa2mfa.pl.chris lagan20/xmfa2mfa.pl
--- lagan20/xmfa2mfa.pl.chris	2006-09-14 22:40:20.000000000 +0200
+++ lagan20/xmfa2mfa.pl	2007-09-18 17:27:46.000000000 +0200
@@ -9,8 +9,6 @@ my ($line, $line_in, $type);
 
 my $mode = ($ARGV[0] eq "1" ? "M1" : ($ARGV[0] eq "2" ? "M2" : die("$0: Invalid base genome argument (expected 1 or 2)")));
 
-die("$0: LAGAN_DIR not defined. Stopped") unless defined $ENV{"LAGAN_DIR"};
-
 while (<STDIN>) {
 	$line_in = $_;
 	if ($line_in =~ /^\=.*(DM|M1|M2)$/) {
@@ -47,7 +45,7 @@ open(OUT, "> tmp.xmfa");
 foreach my $line (@filt_lines) { print OUT $line; }
 close OUT;
 
-system($ENV{"LAGAN_DIR"}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
+system($ENV{LAGAN_DIR}."/utils/Glue tmp.xmfa > glue.out 2> glue.err");
 
 open(IN, "< glue.out");
 my @glue_out = <IN>;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jan 2006 00:16:20 -0000	1.2
+++ .cvsignore	18 Sep 2007 15:52:55 -0000	1.3
@@ -1 +1 @@
-lagan12.tar.gz
+lagan20.tar.gz


Index: lagan.spec
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/lagan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lagan.spec	22 Aug 2007 12:46:52 -0000	1.4
+++ lagan.spec	18 Sep 2007 15:52:55 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           lagan
-Version:        1.21
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Local, global, and multiple alignment of DNA sequences
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://lagan.stanford.edu
-Source0:        http://lagan.stanford.edu/lagan_web/lagan12.tar.gz
-Patch0:         lagan12-chris.patch
+Source0:        http://lagan.stanford.edu/lagan_web/lagan20.tar.gz
+Patch0:         lagan20-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,17 +25,20 @@
 
 
 %prep
-%setup -q -n lagan12
+%setup -q -n lagan20
 %patch0 -p1 -b .chris
 sed -i 's/^CC .*$/CC = gcc $(RPM_OPT_FLAGS)/;
-	s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
-sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' *.c* utils/*.c*
-sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl utils/*.pl
-sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle
+        s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
+sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' src/*.c src/utils/*.c
+sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' src/utils/*.cpp
+sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl src/*.pl utils/*.pl src/utils/*.pl
+sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle src/*.c
+rm prolagan
+chmod -x src/glocal/*
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -43,18 +46,20 @@
 mkdir -p $RPM_BUILD_ROOT/%_bindir $RPM_BUILD_ROOT/%_libdir/lagan/utils
 install -m755 chaos ${RPM_BUILD_ROOT}%{_bindir}
 install -m755 mlagan ${RPM_BUILD_ROOT}%{_bindir}
+install -m755 prolagan ${RPM_BUILD_ROOT}%{_bindir}
 install -m755 lagan.pl ${RPM_BUILD_ROOT}%{_bindir}/lagan
 install -m755 slagan.pl ${RPM_BUILD_ROOT}%{_bindir}/slagan
-for f in anal_gloc.pl anchors glocal order rechaos.pl; do
+for f in anal_gloc.pl anchors glocal order rechaos.pl \
+  supermap.pl xmfa2mfa.pl; do
   install -m755 $f $RPM_BUILD_ROOT/%_libdir/lagan
 done
 for f in bin2bl bin2mf cextract cmerge2.pl contigorder cstat dotplot \
   draft.pl fa2xfa getbounds getcontigpos getlength getoverlap Glue \
   mextract.pl mf2bin.pl mpretty.pl mproject.pl mrunfile.pl mrunpairs.pl \
-  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge; do
+  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge overlay; do
   install -m755 utils/$f $RPM_BUILD_ROOT/%_libdir/lagan/utils
 done
-install -m644 *.txt $RPM_BUILD_ROOT/%_libdir/lagan
+install -m644 *.txt *.score $RPM_BUILD_ROOT/%_libdir/lagan
 rm -f Readmes/*.chris
 
 
@@ -69,11 +74,15 @@
 %_bindir/lagan
 %_bindir/mlagan
 %_bindir/slagan
+%_bindir/prolagan
 %_libdir/lagan/
 
 
 
 %changelog
+* Tue Sep 18 2007 Christian Iseli <Christian.Iseli at licr.org> 2.0-1
+ - New upstream release.
+
 * Wed Aug 22 2007 Christian Iseli <Christian.Iseli at licr.org> 1.21-4
  - Fix License tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jan 2006 00:16:20 -0000	1.2
+++ sources	18 Sep 2007 15:52:55 -0000	1.3
@@ -1 +1 @@
-e45c9287d04b31924115869588f1fb61  lagan12.tar.gz
+da0948fbd76c2c92ae587d3a5db510fa  lagan20.tar.gz


--- lagan12-chris.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 15:56:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 08:56:33 -0700
Subject: [pkgdb] nut (Fedora EPEL, 4) updated by kevin
Message-ID: <200709181556.l8IFuYSV007628@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for nut
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nut (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nut (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nut (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From fedora-extras-commits at redhat.com  Tue Sep 18 15:56:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 08:56:33 -0700
Subject: [pkgdb] nut (Fedora EPEL, 5) updated by kevin
Message-ID: <200709181556.l8IFuZ6N007639@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for nut
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on nut (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on nut (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on nut (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nut



From fedora-extras-commits at redhat.com  Tue Sep 18 15:57:21 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 11:57:21 -0400
Subject: comps comps-f8.xml.in,1.112,1.113
Message-ID: <200709181557.l8IFvLvf024738@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623

Modified Files:
	comps-f8.xml.in 
Log Message:
Add Mylyn, Subclipse, ChangeLog editor, and specfile editor to Fedora Eclipse group.


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- comps-f8.xml.in	18 Sep 2007 13:41:24 -0000	1.112
+++ comps-f8.xml.in	18 Sep 2007 15:56:50 -0000	1.113
@@ -1097,9 +1097,17 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">eclipse-cdt</packagereq>
-      <packagereq type="default">eclipse-pydev</packagereq>
+      <packagereq type="default">eclipse-changelog</packagereq>
       <packagereq type="default">eclipse-jdt</packagereq>
+      <packagereq type="default">eclipse-mylyn</packagereq>
+      <packagereq type="default">eclipse-mylyn-bugzilla</packagereq>
+      <packagereq type="default">eclipse-mylyn-ide</packagereq>
+      <packagereq type="default">eclipse-mylyn-java</packagereq>
       <packagereq type="default">eclipse-pde</packagereq>
+      <packagereq type="default">eclipse-pydev</packagereq>
+      <packagereq type="default">eclipse-rpm-editor</packagereq>
+      <packagereq type="default">eclipse-subclipse</packagereq>
+      <packagereq type="optional">eclipse-mylyn-trac</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Tue Sep 18 15:57:29 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 11:57:29 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.485,1.486
Message-ID: <200709181557.l8IFvTOl024746@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24645

Modified Files:
	eclipse.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- eclipse.spec	10 Sep 2007 13:36:32 -0000	1.485
+++ eclipse.spec	18 Sep 2007 15:56:57 -0000	1.486
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        19%{?dist} 
+Release:        20%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -224,18 +224,6 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-# no CDT -> no changelog -> no rpm-editor
-# (upstream does not support ppc64)
-%ifnarch ppc64 alpha
-Requires: eclipse-subclipse
-Requires: eclipse-changelog
-Requires: eclipse-rpm-editor
-Requires: eclipse-mylyn
-Requires: eclipse-mylyn-ide
-Requires: eclipse-mylyn-bugzilla
-Requires: eclipse-mylyn-trac
 %endif
 
 %description    platform
@@ -260,11 +248,6 @@
 %else
 Requires:       java-javadoc >= 1.6.0
 %endif
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-java
-%endif
 %if %{gcj_support}
 Requires(post):     java-gcj-compat >= 1.0.64
 Requires(postun):   java-gcj-compat >= 1.0.64
@@ -296,11 +279,6 @@
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-pde
-%endif
 Requires(post):    %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(post):    %{name}-jdt = %{epoch}:%{version}-%{release}
@@ -1579,6 +1557,9 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Sep 18 16:02:02 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 12:02:02 -0400
Subject: rpms/qgit/FC-6 qgit.spec,1.18,1.19
Message-ID: <200709181602.l8IG22e0031013@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30923

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qgit.spec	8 Sep 2007 19:52:03 -0000	1.18
+++ qgit.spec	18 Sep 2007 16:01:25 -0000	1.19
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 16:03:56 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 12:03:56 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.5,1.6
Message-ID: <200709181603.l8IG3uHq031101@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31055

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
- Re-add gcj support (accidentally removed the flag).


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-mylyn.spec	13 Sep 2007 17:41:47 -0000	1.5
+++ eclipse-mylyn.spec	18 Sep 2007 16:02:49 -0000	1.6
@@ -1,10 +1,10 @@
-%define gcj_support         0
+%define gcj_support         1
 %define eclipse_base        %{_datadir}/eclipse
 
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -447,6 +447,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
+- Re-add gcj support (accidentally removed the flag).
+
 * Fri Sep 07 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-5
 - Make web.core its own jar.
 - Unpack web.core so we can symlink to dependencies.



From fedora-extras-commits at redhat.com  Tue Sep 18 16:04:40 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 12:04:40 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.486,1.487
Message-ID: <200709181604.l8IG4eoL031164@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31146/devel

Modified Files:
	eclipse.spec 
Log Message:
Remove endif that should have been removed in last commit.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- eclipse.spec	18 Sep 2007 15:56:57 -0000	1.486
+++ eclipse.spec	18 Sep 2007 16:04:08 -0000	1.487
@@ -224,7 +224,6 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-%endif
 
 %description    platform
 The Fedora Eclipse Platform is the base of all IDE plugins.  This does not include the



From fedora-extras-commits at redhat.com  Tue Sep 18 16:09:40 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 18 Sep 2007 12:09:40 -0400
Subject: rpms/qgit/devel qgit.spec,1.19,1.20
Message-ID: <200709181609.l8IG9ema031279@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31260

Modified Files:
	qgit.spec 
Log Message:
- update Source0 tag


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qgit.spec	8 Sep 2007 19:42:20 -0000	1.19
+++ qgit.spec	18 Sep 2007 16:09:07 -0000	1.20
@@ -6,7 +6,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Tue Sep 18 16:18:06 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 09:18:06 -0700
Subject: [pkgdb] system-config-rootpassword: mclasen has requested commit
Message-ID: <200709181618.l8IGI7T3012898@app4.fedora.phx.redhat.com>

Matthias Clasen (mclasen) has requested the commit acl on system-config-rootpassword (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 16:19:05 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 12:19:05 -0400
Subject: rpms/clusterssh/devel clusterssh.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200709181619.l8IGJ5Wa031519@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/clusterssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31444

Modified Files:
	clusterssh.spec sources 
Log Message:

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 3.19.1-3
- License clarification
- Switch back to unmodified, upstream-provided tarball



Index: clusterssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clusterssh/devel/clusterssh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clusterssh.spec	29 Aug 2006 19:25:48 -0000	1.1
+++ clusterssh.spec	18 Sep 2007 16:18:33 -0000	1.2
@@ -1,10 +1,10 @@
 Name:          clusterssh
 Version:       3.19.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Secure concurrent multi-server terminal control
 
 Group:         Applications/Productivity
-License:       GPL
+License:       GPLv2+
 URL:           http://clusterssh.sourceforge.net
 Source0:       http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +66,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 3.19.1-3
+- License clarification
+- Switch back to unmodified, upstream-provided tarball
 
 * Tue Aug 15 2006 Duncan Ferguson <duncan_ferguson at users.sf.net> - 3.19.1-2
 - Tidyups as per https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199173


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clusterssh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2006 19:25:48 -0000	1.2
+++ sources	18 Sep 2007 16:18:33 -0000	1.3
@@ -1 +1 @@
-12363dead309dca70bb6d45f4410246c  clusterssh-3.19.1.tar.gz
+578208faf944100a233ae216fa230350  clusterssh-3.19.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:20:32 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:20:32 -0400
Subject: rpms/eel2/devel .cvsignore, 1.51, 1.52 eel2.spec, 1.76, 1.77 sources,
	1.51, 1.52
Message-ID: <200709181620.l8IGKW6F031638@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/eel2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31577

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	14 Aug 2007 02:20:51 -0000	1.51
+++ .cvsignore	18 Sep 2007 16:19:59 -0000	1.52
@@ -1 +1 @@
-eel-2.19.90.tar.bz2
+eel-2.20.0.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- eel2.spec	14 Aug 2007 02:20:51 -0000	1.76
+++ eel2.spec	18 Sep 2007 16:19:59 -0000	1.77
@@ -15,7 +15,7 @@
 
 Name:        eel2
 Summary:     Eazel Extensions Library
-Version:     2.19.90
+Version:     2.20.0
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
@@ -118,6 +118,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eel2/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Aug 2007 02:20:51 -0000	1.51
+++ sources	18 Sep 2007 16:19:59 -0000	1.52
@@ -1 +1 @@
-446e3240aa4ddfc44ef43ab6dc8891d9  eel-2.19.90.tar.bz2
+691734dc1078e05e726b4f5b8646dadf  eel-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:21:06 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 18 Sep 2007 12:21:06 -0400
Subject: rpms/octave/devel .cvsignore, 1.13, 1.14 octave.spec, 1.57,
	1.58 sources, 1.13, 1.14
Message-ID: <200709181621.l8IGL6Se031736@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31630

Modified Files:
	.cvsignore octave.spec sources 
Log Message:
New release. Fix bug 274431. Update licence tag. Add new dependency.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jul 2007 04:59:42 -0000	1.13
+++ .cvsignore	18 Sep 2007 16:20:31 -0000	1.14
@@ -1 +1 @@
-octave-2.9.13.tar.bz2
+octave-2.9.14.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- octave.spec	10 Sep 2007 16:06:58 -0000	1.57
+++ octave.spec	18 Sep 2007 16:20:31 -0000	1.58
@@ -1,14 +1,14 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v25
+%define octave_api api-v26
 
 Name:           octave
-Version:        2.9.13
-Release:        2%{?dist}
+Version:        2.9.14
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
@@ -17,7 +17,7 @@
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/install-info
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
-BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo
+BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
 BuildRequires:  suitesparse-devel glpk-devel gnuplot desktop-file-utils
 Provides:       octave(api) = %{octave_api}
@@ -137,8 +137,11 @@
 
 
 %changelog
-* Mon Sep 10 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-3
+* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1
+- New release.
 - Remove redundant menu category in desktop file (bug 274431).
+- Update license tag.
+- Add qhull-devel as new build dependency.
 
 * Thu Jul 26 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.13-1
 - New release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jul 2007 04:59:42 -0000	1.13
+++ sources	18 Sep 2007 16:20:31 -0000	1.14
@@ -1 +1 @@
-e78bf9c2a8d6f56e51415a4b1d70eb7a  octave-2.9.13.tar.bz2
+9c258c9320709c9ea78d24bd3d45e45f  octave-2.9.14.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:22:08 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Tue, 18 Sep 2007 12:22:08 -0400
Subject: rpms/ekiga/devel .cvsignore, 1.10, 1.11 ekiga.spec, 1.39,
	1.40 sources, 1.12, 1.13
Message-ID: <200709181622.l8IGM8rR031816@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31751

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Upgrade to ekiga-2.0.11
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Apr 2007 20:46:54 -0000	1.10
+++ .cvsignore	18 Sep 2007 16:21:36 -0000	1.11
@@ -3,3 +3,4 @@
 ekiga-2.0.5.tar.gz
 ekiga-2.0.7.tar.gz
 ekiga-2.0.9.tar.gz
+ekiga-2.0.11.tar.gz


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ekiga.spec	15 Apr 2007 21:11:03 -0000	1.39
+++ ekiga.spec	18 Sep 2007 16:21:36 -0000	1.40
@@ -1,14 +1,14 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 2.0.9
+Version: 2.0.11
 Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.7
-Requires: opal >= 2.2.8
+Requires: pwlib >= 1.10.10
+Requires: opal >= 2.2.11
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -23,8 +23,8 @@
 BuildRequires: avahi-devel >= 0.6.9
 BuildRequires: avahi-glib-devel >= 0.6.9
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.7
-BuildRequires: opal-devel >= 2.2.8
+BuildRequires: pwlib-devel >= 1.10.10
+BuildRequires: opal-devel >= 2.2.11
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -93,7 +93,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
-* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9.1
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.0.11-1
+- Upgrade to ekiga-2.0.11
+
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9-1
 - Upgrade to ekiga-2.0.9
 
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.0.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Apr 2007 20:46:54 -0000	1.12
+++ sources	18 Sep 2007 16:21:36 -0000	1.13
@@ -1 +1 @@
-7dd9f812ce3b940839b12486ddee7e80  ekiga-2.0.9.tar.gz
+684865225d77898e10e960f3a286b894  ekiga-2.0.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:23:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:23:50 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.60, 1.61 nautilus.spec, 1.164,
	1.165 sources, 1.64, 1.65
Message-ID: <200709181623.l8IGNoU7031973@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31895

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	3 Sep 2007 05:06:08 -0000	1.60
+++ .cvsignore	18 Sep 2007 16:23:17 -0000	1.61
@@ -1 +1 @@
-nautilus-2.19.91.tar.bz2
+nautilus-2.20.0.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- nautilus.spec	3 Sep 2007 05:06:08 -0000	1.164
+++ nautilus.spec	18 Sep 2007 16:23:17 -0000	1.165
@@ -18,11 +18,11 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.19.91
+Version: 	2.20.0
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
-Source: 	http://download.gnome.org/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
@@ -221,6 +221,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.91-1
 - Update to 2.19.91
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	3 Sep 2007 05:06:08 -0000	1.64
+++ sources	18 Sep 2007 16:23:17 -0000	1.65
@@ -1 +1 @@
-0fe63741bbd8052ee0329b3312a2724c  nautilus-2.19.91.tar.bz2
+3856ec2ffeba786d12f8f6622e398c33  nautilus-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:24:28 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Tue, 18 Sep 2007 12:24:28 -0400
Subject: rpms/cyrus-sasl/devel cyrus-sasl-db-4.6.18-glibc.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 cyrus-sasl.spec, 1.59, 1.60 sources,
	1.18, 1.19
Message-ID: <200709181624.l8IGOSvQ032099@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31828

Modified Files:
	.cvsignore cyrus-sasl.spec sources 
Added Files:
	cyrus-sasl-db-4.6.18-glibc.patch 
Log Message:
Changed to db version 4.6.19


cyrus-sasl-db-4.6.18-glibc.patch:

--- NEW FILE cyrus-sasl-db-4.6.18-glibc.patch ---
--- db-4.6.18/tcl/tcl_db_pkg.c.glibc	2007-07-09 19:38:45.000000000 +0200
+++ db-4.6.18/tcl/tcl_db_pkg.c	2007-08-06 16:25:43.000000000 +0200
@@ -1377,7 +1377,7 @@ bdb_EnvOpen(interp, objc, objv, ip, env)
 	 * Now open the environment.
 	 */
 	_debug_check();
-	ret = (*env)->open(*env, home, open_flags, mode);
+	ret = ((*env)->open)(*env, home, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "env open");
 
 	if (rep_flags != 0 && result == TCL_OK) {
@@ -2215,7 +2215,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
 	_debug_check();
 
 	/* Open the database. */
-	ret = (*dbp)->open(*dbp, txn, db, subdb, type, open_flags, mode);
+	ret = ((*dbp)->open)(*dbp, txn, db, subdb, type, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "db open");
 
 error:
@@ -2476,7 +2476,7 @@ bdb_SeqOpen(interp, objc, objv, ip, seqp
 		    ret, DB_RETOK_STD(ret), "sequence init")) != TCL_OK)
 			goto error;
 	}
-	ret = (*seqp)->open(*seqp, txn, &key, oflags);
+	ret = ((*seqp)->open)(*seqp, txn, &key, oflags);
 	if ((result = _ReturnSetup(interp,
 	    ret, DB_RETOK_STD(ret), "sequence open")) != TCL_OK)
 		goto error;
--- db-4.6.18/tcl/tcl_mp.c.glibc	2007-06-22 19:41:45.000000000 +0200
+++ db-4.6.18/tcl/tcl_mp.c	2007-08-06 16:26:17.000000000 +0200
@@ -275,7 +275,7 @@ tcl_Mp(interp, objc, objv, envp, envip)
 	 * XXX
 	 * Interface doesn't currently support DB_MPOOLFILE configuration.
 	 */
-	if ((ret = mpf->open(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
+	if ((ret = (mpf->open)(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
 		result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "mpool");
 		_DeleteInfo(ip);
 
--- db-4.6.18/dbm/dbm.c.glibc	2007-05-17 17:15:07.000000000 +0200
+++ db-4.6.18/dbm/dbm.c	2007-08-06 15:26:11.000000000 +0200
@@ -230,7 +230,7 @@ __db_ndbm_open(file, oflags, mode)
 	if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
 		__os_set_errno(ret);
 		return (NULL);
--- db-4.6.18/db_hotbackup/db_hotbackup.c.glibc	2007-05-17 17:15:01.000000000 +0200
+++ db-4.6.18/db_hotbackup/db_hotbackup.c	2007-08-06 15:26:11.000000000 +0200
@@ -418,9 +418,9 @@ env_init(dbenvp, home, log_dirp, data_di
 		 * We try to attach to a pre-existing environment; if that
 		 * fails, we create a private environment and try again.
 		 */
-		if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+		if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home, DB_CREATE |
+		    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON,
 		    0)) != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ -445,7 +445,7 @@ env_init(dbenvp, home, log_dirp, data_di
 			     ret, "DB_ENV->set_cachesize: %s", home);
 			return (1);
 		}
-		if ((ret = dbenv->open(dbenv, home, DB_CREATE |
+		if ((ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE |
 		    DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
--- db-4.6.18/db_checkpoint/db_checkpoint.c.glibc	2007-05-17 17:14:58.000000000 +0200
+++ db-4.6.18/db_checkpoint/db_checkpoint.c	2007-08-06 15:26:11.000000000 +0200
@@ -141,9 +141,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (!once || ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.6.18/db_deadlock/db_deadlock.c.glibc	2007-05-17 19:17:42.000000000 +0200
+++ db-4.6.18/db_deadlock/db_deadlock.c	2007-08-06 15:26:11.000000000 +0200
@@ -157,7 +157,7 @@ main(argc, argv)
 	}
 
 	/* An environment is required. */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
 		dbenv->err(dbenv, ret, "open");
 		goto shutdown;
 	}
--- db-4.6.18/libdb_java/db_java_wrap.c.glibc	2007-06-28 16:23:38.000000000 +0200
+++ db-4.6.18/libdb_java/db_java_wrap.c	2007-08-06 15:59:38.000000000 +0200
@@ -2501,7 +2501,7 @@ SWIGINTERN db_ret_t Db_key_range(struct 
 		return self->key_range(self, txnid, key, key_range, flags);
 	}
 SWIGINTERN db_ret_t Db_open(struct Db *self,DB_TXN *txnid,char const *file,char const *database,DBTYPE type,u_int32_t flags,int mode){
-		return self->open(self, txnid, file, database,
+		return (self->open)(self, txnid, file, database,
 		    type, flags, mode);
 	}
 SWIGINTERN int Db_pget(struct Db *self,DB_TXN *txnid,DBT *key,DBT *pkey,DBT *data,u_int32_t flags){
@@ -2723,7 +2723,7 @@ SWIGINTERN db_ret_t DbEnv_lsn_reset(stru
 		return self->lsn_reset(self, file, flags);
 	}
 SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,char const *db_home,u_int32_t flags,int mode){
-		return self->open(self, db_home, flags, mode);
+		return (self->open)(self, db_home, flags, mode);
 	}
 SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *self,char const *db_home,u_int32_t flags){
 		return self->remove(self, db_home, flags);
@@ -3278,7 +3278,7 @@ SWIGINTERN db_ret_t DbSequence_initial_v
 		return self->initial_value(self, val);
 	}
 SWIGINTERN db_ret_t DbSequence_open(struct DbSequence *self,DB_TXN *txnid,DBT *key,u_int32_t flags){
-		return self->open(self, txnid, key, flags);
+		return (self->open)(self, txnid, key, flags);
 	}
 SWIGINTERN db_ret_t DbSequence_remove(struct DbSequence *self,DB_TXN *txnid,u_int32_t flags){
 		return self->remove(self, txnid, flags);
--- db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp.glibc	2007-06-28 16:01:21.000000000 +0200
+++ db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp	2007-08-06 16:36:12.000000000 +0200
@@ -336,7 +336,7 @@ __env_open_proc(
 		replyp->envcl_id = new_ctp->ct_id;
 		ret = __env_close_int(dbenvcl_id, 0, 0);
 	} else {
-		ret = dbenv->open(fullhome->home, newflags, mode);
+		ret = (dbenv->open)(fullhome->home, newflags, mode);
 		dbenv_ctp->ct_envdp.home = fullhome;
 		dbenv_ctp->ct_envdp.envflags = shareflags;
 	}
@@ -1187,7 +1187,7 @@ __db_open_proc(
 		ret = __db_close_int(dbpcl_id, 0);
 		goto out;
 	}
-	ret = dbp->open(txnp, name, subdb, (DBTYPE)type, flags, mode);
+	ret = (dbp->open)(txnp, name, subdb, (DBTYPE)type, flags, mode);
 	if (ret == 0) {
 		(void)dbp->get_type(&dbtype);
 		replyp->type = dbtype;
--- db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp.glibc	2007-05-17 17:15:52.000000000 +0200
+++ db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp	2007-08-06 16:36:26.000000000 +0200
@@ -730,7 +730,7 @@ env_recover(char *progname)
 			printf("Running recovery on %s\n", hp->home);
 		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 		    DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(hp->home, flags, 0)) != 0) {
+		if ((ret = (dbenv->open)(hp->home, flags, 0)) != 0) {
 			dbenv->err(ret, "DbEnv->open");
 			goto error;
 		}
--- db-4.6.18/rpc_server/c/db_server_util.c.glibc	2007-05-17 17:15:52.000000000 +0200
+++ db-4.6.18/rpc_server/c/db_server_util.c	2007-08-06 16:35:47.000000000 +0200
@@ -802,7 +802,7 @@ env_recover(progname)
 			printf("Running recovery on %s\n", hp->home);
 		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 		    DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) {
+		if ((ret = (dbenv->open)(dbenv, hp->home, flags, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto error;
 		}
--- db-4.6.18/rpc_server/c/db_server_proc.c.glibc	2007-06-28 15:59:24.000000000 +0200
+++ db-4.6.18/rpc_server/c/db_server_proc.c	2007-08-06 16:35:28.000000000 +0200
@@ -394,7 +394,7 @@ __env_open_proc(dbenvcl_id, home, flags,
 		replyp->envcl_id = new_ctp->ct_id;
 		ret = __env_close_int(dbenvcl_id, 0, 0);
 	} else {
-		ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
+		ret = (dbenv->open)(dbenv, fullhome->home, newflags, mode);
 		dbenv_ctp->ct_envdp.home = fullhome;
 		dbenv_ctp->ct_envdp.envflags = shareflags;
 	}
@@ -1392,7 +1392,7 @@ __db_open_proc(dbpcl_id, txnpcl_id, name
 		ret = __db_close_int(dbpcl_id, 0);
 		goto out;
 	}
-	ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
+	ret = (dbp->open)(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
 	if (ret == 0) {
 		(void)dbp->get_type(dbp, &dbtype);
 		replyp->type = dbtype;
--- db-4.6.18/db_dump/db_dump.c.glibc	2007-05-17 17:14:59.000000000 +0200
+++ db-4.6.18/db_dump/db_dump.c	2007-08-06 15:26:11.000000000 +0200
@@ -199,7 +199,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 		goto done;
 	}
 
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 		dbp->err(dbp, ret, "open: %s", argv[0]);
 		goto err;
@@ -296,7 +296,7 @@ db_init(dbenv, home, is_salvage, cache, 
 	 * before we create our own.
 	 */
 	*is_privatep = 0;
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
@@ -314,7 +314,7 @@ db_init(dbenv, home, is_salvage, cache, 
 	 */
 	*is_privatep = 1;
 	if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 
@@ -367,7 +367,7 @@ dump_sub(dbenv, parent_dbp, parent_name,
 			free(subdb);
 			return (1);
 		}
-		if ((ret = dbp->open(dbp, NULL,
+		if ((ret = (dbp->open)(dbp, NULL,
 		    parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
 			dbp->err(dbp, ret,
 			    "DB->open: %s:%s", parent_name, subdb);
--- db-4.6.18/db_codegen/code_capi.c.glibc	2007-06-05 16:06:25.000000000 +0200
+++ db-4.6.18/db_codegen/code_capi.c	2007-08-06 15:26:11.000000000 +0200
@@ -368,7 +368,7 @@ static int\nbdb_env_startup(env_list_t *
 \tif (ep->transaction)\n\
 \t	open_flags |= DB_INIT_LOCK |\n\
 \t	    DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;\n\
-\tif ((ret = dbenv->open(dbenv, ep->home, open_flags, 0)) != 0) {\n\
+\tif ((ret = (dbenv->open)(dbenv, ep->home, open_flags, 0)) != 0) {\n\
 \t	dbenv->err(dbenv, ret, \"DB_ENV->open: %%s\",  ep->home);\n\
 \t	goto err;\n\
 \t}\n\
@@ -487,7 +487,7 @@ api_c_db()
 
 	fprintf(of, "\
 \n\
-\tif ((ret = dbp->open(dbp, NULL, dp->name, NULL, dp->type,\n\
+\tif ((ret = (dbp->open)(dbp, NULL, dp->name, NULL, dp->type,\n\
 \t    (dp->transaction ? DB_AUTO_COMMIT : 0) |\n\
 \t    DB_CREATE | DB_THREAD, 0)) != 0) {\n\
 \t\tdbp->err(dbp, ret, \"DB->open: %%s\", dp->name);\n\
--- db-4.6.18/db_upgrade/db_upgrade.c.glibc	2007-05-17 17:15:04.000000000 +0200
+++ db-4.6.18/db_upgrade/db_upgrade.c	2007-08-06 15:26:11.000000000 +0200
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
 	    0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
--- db-4.6.18/db_archive/db_archive.c.glibc	2007-05-17 17:14:58.000000000 +0200
+++ db-4.6.18/db_archive/db_archive.c	2007-08-06 15:26:11.000000000 +0200
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home, DB_CREATE |
+	    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 	    DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.6.18/db_printlog/db_printlog.c.glibc	2007-06-01 17:36:50.000000000 +0200
+++ db-4.6.18/db_printlog/db_printlog.c	2007-08-06 15:26:11.000000000 +0200
@@ -173,18 +173,18 @@ main(argc, argv)
 	 * with logging, because we don't want to log the opens.
 	 */
 	if (repflag) {
-		if ((ret = dbenv->open(dbenv, home,
+		if ((ret = (dbenv->open)(dbenv, home,
 		    DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home,
+		    (ret = (dbenv->open)(dbenv, home,
 		    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
 		    != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto shutdown;
 		}
-	} else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	} else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
@@ -544,7 +544,7 @@ open_rep_db(dbenv, dbpp, dbcp)
 
 	dbp = *dbpp;
 	if ((ret =
-	    dbp->open(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
+	    (dbp->open)(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open");
 		goto err;
 	}
--- db-4.6.18/hsearch/hsearch.c.glibc	2007-05-17 17:15:39.000000000 +0200
+++ db-4.6.18/hsearch/hsearch.c	2007-08-06 15:26:11.000000000 +0200
@@ -75,7 +75,7 @@ __db_hcreate(nel)
 	if ((ret = dbp->set_pagesize(dbp, 512)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 16)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    NULL, NULL, DB_HASH, DB_CREATE, __db_omode(OWNER_RW))) != 0)
 		__os_set_errno(ret);
 
--- db-4.6.18/db_recover/db_recover.c.glibc	2007-05-17 17:15:03.000000000 +0200
+++ db-4.6.18/db_recover/db_recover.c	2007-08-06 15:26:11.000000000 +0200
@@ -138,7 +138,7 @@ main(argc, argv)
 	    DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
 	LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
 	LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE);
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
 	}
--- db-4.6.18/db185/db185.c.glibc	2007-05-17 17:14:57.000000000 +0200
+++ db-4.6.18/db185/db185.c	2007-08-06 15:37:39.000000000 +0200
@@ -227,7 +227,7 @@ __db185_open(file, oflags, mode, type, o
 	dbp->api_internal = db185p;
 
 	/* Open the database. */
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    file, NULL, type, __db_oflags(oflags), mode)) != 0)
 		goto err;
 
--- db-4.6.18/db_stat/db_stat.c.glibc	2007-07-06 17:43:57.000000000 +0200
+++ db-4.6.18/db_stat/db_stat.c	2007-08-06 15:26:11.000000000 +0200
@@ -282,9 +282,9 @@ retry:	if ((ret = db_env_create(&dbenv, 
 		 * hash databases for which we don't know the hash function).
 		 */
 		dbenv->set_errfile(dbenv, NULL);
-		ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
+		ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
 		dbenv->set_errfile(dbenv, stderr);
-		if (ret != 0 && (ret = dbp->open(
+		if (ret != 0 && (ret = (dbp->open)(
 		    dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB->open: %s", db);
 			goto err;
@@ -392,7 +392,7 @@ db_init(dbenv, home, ttype, cache, is_pr
 	 * error, I think.
 	 */
 	*is_private = 0;
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -422,7 +422,7 @@ db_init(dbenv, home, ttype, cache, is_pr
 		oflags |= DB_INIT_MPOOL;
 	if (ttype == T_LOG)
 		oflags |= DB_INIT_LOG;
-	if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.6.18/db_verify/db_verify.c.glibc	2007-05-17 17:15:05.000000000 +0200
+++ db-4.6.18/db_verify/db_verify.c	2007-08-06 15:26:11.000000000 +0200
@@ -129,7 +129,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 	 */
 	private = 0;
 	if ((ret =
-	    dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
+	    (dbenv->open)(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
 		if (ret != DB_VERSION_MISMATCH) {
 			if ((ret =
 			    dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) {
@@ -137,7 +137,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 				goto shutdown;
 			}
 			private = 1;
-			ret = dbenv->open(dbenv, home, DB_CREATE |
+			ret = (dbenv->open)(dbenv, home, DB_CREATE |
 			    DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0);
 		}
 		if (ret != 0) {
@@ -186,7 +186,7 @@ retry:	if ((ret = db_env_create(&dbenv, 
 				goto shutdown;
 			}
 
-			ret = dbp1->open(dbp1,
+			ret = (dbp1->open)(dbp1,
 			    NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
 
 			/*
--- db-4.6.18/db_load/db_load.c.glibc	2007-05-17 19:17:42.000000000 +0200
+++ db-4.6.18/db_load/db_load.c	2007-08-06 15:26:11.000000000 +0200
@@ -394,7 +394,7 @@ retry_db:
 #endif
 
 	/* Open the DB file. */
-	if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
+	if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype,
 	    DB_CREATE | (TXN_ON(dbenv) ? DB_AUTO_COMMIT : 0),
 	    __db_omode("rw-rw-rw-"))) != 0) {
 		dbp->err(dbp, ret, "DB->open: %s", name);
@@ -608,7 +608,7 @@ db_init(dbenv, home, cache, is_private)
 	/* We may be loading into a live environment.  Try and join. */
 	flags = DB_USE_ENVIRON |
 	    DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -632,7 +632,7 @@ db_init(dbenv, home, cache, is_private)
 		dbenv->err(dbenv, ret, "set_cachesize");
 		return (1);
 	}
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.6.18/xa/xa_db.c.glibc	2007-05-17 17:16:00.000000000 +0200
+++ db-4.6.18/xa/xa_db.c	2007-08-06 15:49:57.000000000 +0200
@@ -131,7 +131,7 @@ __xa_open(dbp, txn, name, subdb, type, f
 	if ((ret =
 	    __xa_set_txn(dbp, &txn, LF_ISSET(DB_AUTO_COMMIT) ? 1 : 0)) != 0)
 		return (ret);
-	if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
+	if ((ret = (xam->open)(dbp, txn, name, subdb, type, flags, mode)) != 0)
 		return (ret);
 
 	/* Wrap any DB handle method that takes a TXN ID as an argument. */
--- db-4.6.18/xa/xa.c.glibc	2007-06-29 02:25:02.000000000 +0200
+++ db-4.6.18/xa/xa.c	2007-08-06 15:43:44.000000000 +0200
@@ -206,7 +206,7 @@ __db_xa_open(xa_info, rmid, arg_flags)
 	/* Open a new environment. */
 	if (db_env_create(&dbenv, 0) != 0)
 		return (XAER_RMERR);
-	if (dbenv->open(dbenv, xa_info, XA_FLAGS, 0) != 0)
+	if ((dbenv->open)(dbenv, xa_info, XA_FLAGS, 0) != 0)
 		goto err;
 
 	/* Create the mapping. */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Sep 2006 21:08:25 -0000	1.15
+++ .cvsignore	18 Sep 2007 16:23:56 -0000	1.16
@@ -10,3 +10,4 @@
 cyrus-sasl-2.1.22.tar.gz
 cyrus-sasl-2.1.22.tar.gz.sig
 cyrus-sasl-2.1.22-nodlcompat.tar.gz
+db-4.6.19.tar.gz


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- cyrus-sasl.spec	26 Feb 2007 21:23:11 -0000	1.59
+++ cyrus-sasl.spec	18 Sep 2007 16:23:56 -0000	1.60
@@ -1,11 +1,11 @@
 %define _plugindir2 %{_libdir}/sasl2
-%define db_version 4.5.20
+%define db_version 4.6.19
 %define bootstrap_cyrus_sasl 0
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 6
+Release: 7
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -28,6 +28,7 @@
 Patch26: cyrus-sasl-2.1.22-digest-commas.patch
 Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
 Patch28: cyrus-sasl-2.1.21-keytab.patch
+Patch29: cyrus-sasl-db-4.6.18-glibc.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
@@ -128,6 +129,10 @@
 %patch27 -p1 -b .automake-1.10
 %patch28 -p1 -b .keytab
 
+pushd db-%{db_version}
+%patch29 -p1 -b .glibc27
+popd
+
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
 rm -f config/config.guess config/config.sub 
@@ -372,6 +377,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Sep 18 2007 Steve Conklin <sconklin at redhat.com> 2.1.22-7
+- use db4 version 4.6.19 bz#249737
+
 * Mon Feb 26 2007 Nalin Dahyabhai <nalin at redhat.com> 2.1.22-6
 - install config files and init scripts using -p
 - pull in patch to build with current automake (#229010, Jacek Konieczny


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	26 Feb 2007 21:23:11 -0000	1.18
+++ sources	18 Sep 2007 16:23:56 -0000	1.19
@@ -1,2 +1,2 @@
 c5c56c86a1397443d3b75b6864cb630d  cyrus-sasl-2.1.22-nodlcompat.tar.gz
-b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:27:20 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:27:20 -0400
Subject: rpms/pguiman/devel pguiman.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709181627.l8IGRKQc032278@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32230/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pguiman.spec 
Log Message:
Importing srpm




--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pguiman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Sep 2007 16:30:43 -0000	1.1
+++ .cvsignore	18 Sep 2007 16:26:48 -0000	1.2
@@ -0,0 +1 @@
+pguiman-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:26:48 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:37:09 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:37:09 -0400
Subject: rpms/pguiman/F-7 pguiman.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181637.l8IGb9cU032606@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32576

Modified Files:
	sources 
Added Files:
	pguiman.spec 
Log Message:
added spec file and edited sources file


--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:36:35 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:38:43 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Tue, 18 Sep 2007 12:38:43 -0400
Subject: rpms/pguiman/FC-6 pguiman.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181638.l8IGchvm032707@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/pguiman/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32665

Modified Files:
	sources 
Added Files:
	pguiman.spec 
Log Message:
added spec file and edited sources file


--- NEW FILE pguiman.spec ---
Name:           pguiman
Version:        0.0.1
Release:        3%{?dist}
Summary:        The PostgreSQL database server managing tool
Group:          Applications/Databases
License:        GPLv2+
URL:            http://pguiman.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define libglade_version 2.4.0

BuildRequires:  glib2-devel >= %{glib2_version}
BuildRequires:  gtk2-devel >= %{gtk2_version}
BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
BuildRequires:  libglade2-devel >= %{libglade_version}
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  postgresql-devel
BuildRequires:  desktop-file-utils
Requires:       gtk2 >= %{gtk2_version}

%description
The PostgreSQL Manager is a graphical user interface for administration of 
a PostgreSQL database server. Users new to PostgreSQL database server can use 
this tool to quickly set up a working database. 

%prep
%setup -q

%build
%configure --enable-consolehelper
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications  %{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README 

%{_bindir}/%{name}

%{_datadir}/applications/fedora-%{name}.desktop

%dir %{_datadir}/%{name}/glade/
%{_datadir}/%{name}/glade/*.glade

%dir %{_datadir}/%{name}/pixmaps/
%{_datadir}/%{name}/pixmaps/*

%{_datadir}/pixmaps/%{name}.png

%changelog
* Tue Sep 18 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-3
- added documentation link

* Thu Sep 06 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-2
- resolves #260441 at bugzilla.redhat.com
- corrected spec file

* Thu Aug 08 2007 Ondrej Dvoracek <odvorace at redhat.com> 0.0.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pguiman/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 16:30:43 -0000	1.1
+++ sources	18 Sep 2007 16:38:11 -0000	1.2
@@ -0,0 +1 @@
+a74318bf382e35ef6a43d4b3c7bcfbcf  pguiman-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 16:38:58 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:38:58 -0400
Subject: rpms/gnome-utils/devel .cvsignore, 1.63, 1.64 gnome-utils.spec,
	1.155, 1.156 sources, 1.67, 1.68
Message-ID: <200709181638.l8IGcwPp032712@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32687

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	17 Sep 2007 15:41:59 -0000	1.63
+++ .cvsignore	18 Sep 2007 16:38:25 -0000	1.64
@@ -1 +1 @@
-gnome-utils-2.20.0.tar.bz2
+gnome-utils-2.20.0.1.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-utils.spec	17 Sep 2007 15:41:59 -0000	1.155
+++ gnome-utils.spec	18 Sep 2007 16:38:25 -0000	1.156
@@ -9,7 +9,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.20.0
+Version:        2.20.0.1
 Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-utils/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	17 Sep 2007 15:41:59 -0000	1.67
+++ sources	18 Sep 2007 16:38:25 -0000	1.68
@@ -1 +1 @@
-f58f05a1eac5b04d2ebd66fcc2606251  gnome-utils-2.20.0.tar.bz2
+2d4385df2fb566b437b283bd2ce70190  gnome-utils-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 16:45:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:45:55 -0400
Subject: rpms/fast-user-switch-applet/devel .cvsignore, 1.4,
	1.5 fast-user-switch-applet.spec, 1.16, 1.17 sources, 1.4,
	1.5 fast-user-switch-applet-2.17.4-bug-buddy.patch, 1.2, NONE
Message-ID: <200709181645.l8IGjtuQ000541@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv508

Modified Files:
	.cvsignore fast-user-switch-applet.spec sources 
Removed Files:
	fast-user-switch-applet-2.17.4-bug-buddy.patch 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 May 2007 15:45:17 -0000	1.4
+++ .cvsignore	18 Sep 2007 16:45:18 -0000	1.5
@@ -1 +1 @@
-fast-user-switch-applet-2.18.0.tar.bz2
+fast-user-switch-applet-2.20.0.tar.bz2


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fast-user-switch-applet.spec	17 Sep 2007 06:20:11 -0000	1.16
+++ fast-user-switch-applet.spec	18 Sep 2007 16:45:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
-Version:        2.18.0
-Release:        3%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -12,8 +12,6 @@
 Patch2:		startx.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=421090
 Patch3:		no-session.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=424615
-Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=477639
@@ -59,7 +57,6 @@
 %patch1 -p1 -b .defaults
 %patch2 -p1 -b .startx
 %patch3 -p1 -b .no-session
-%patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
 %patch6 -p1 -b .throttle
 %patch7 -p1 -b .error-dialog
@@ -118,7 +115,10 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
-* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> 2.20.0-1
+- Update to 2.20.0
+
+* Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> 2.18.0-3 
 - Don't try to throttle gnome-screensaver (#246188)
 - Make the close button on the error dialog work
 - Make the handling of large numbers of users more efficient (#353831)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 May 2007 15:45:17 -0000	1.4
+++ sources	18 Sep 2007 16:45:18 -0000	1.5
@@ -1 +1 @@
-aefe9ea3aecc908336ae909aeee385b5  fast-user-switch-applet-2.18.0.tar.bz2
+1d1fd25b5599f7656e3fa89aa913137c  fast-user-switch-applet-2.20.0.tar.bz2


--- fast-user-switch-applet-2.17.4-bug-buddy.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 16:48:05 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 12:48:05 -0400
Subject: rpms/gnome-panel/devel .cvsignore, 1.60, 1.61 gnome-panel.spec,
	1.222, 1.223 sources, 1.60, 1.61
Message-ID: <200709181648.l8IGm5uu000678@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv614

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	18 Sep 2007 03:22:30 -0000	1.60
+++ .cvsignore	18 Sep 2007 16:47:30 -0000	1.61
@@ -1 +1 @@
-gnome-panel-2.20.0.tar.bz2
+gnome-panel-2.20.0.1.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- gnome-panel.spec	18 Sep 2007 03:22:30 -0000	1.222
+++ gnome-panel.spec	18 Sep 2007 16:47:30 -0000	1.223
@@ -21,7 +21,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
@@ -316,6 +316,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	18 Sep 2007 03:22:30 -0000	1.60
+++ sources	18 Sep 2007 16:47:30 -0000	1.61
@@ -1 +1 @@
-d48c13d4c9935278b29a557d89b33a45  gnome-panel-2.20.0.tar.bz2
+bead455015de6bd86bb7259e6276af9e  gnome-panel-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:25 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:25 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3P1i024869@app4.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the watchbugzilla acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:26 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:26 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3RvD024892@app4.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the watchcommits acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:03:34 2007
From: fedora-extras-commits at redhat.com (Pete Graner (pgraner))
Date: Tue, 18 Sep 2007 10:03:34 -0700
Subject: [pkgdb] system-config-rootpassword had acl change status
Message-ID: <200709181703.l8IH3aaM026364@app3.fedora.phx.redhat.com>

Pete Graner (pgraner) has set the commit acl on system-config-rootpassword (Fedora devel) to Approved for Matthias Clasen (mclasen)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-rootpassword



From fedora-extras-commits at redhat.com  Tue Sep 18 17:04:40 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:04:40 -0400
Subject: rpms/mencal/devel mencal.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709181704.l8IH4eL2007329@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7205/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mencal.spec 
Log Message:
Commiting sources



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2007 18:43:25 -0000	1.1
+++ .cvsignore	18 Sep 2007 17:04:07 -0000	1.2
@@ -0,0 +1 @@
+mencal-2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:04:07 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:15:09 2007
From: fedora-extras-commits at redhat.com (Charles Coldwell (coldwell))
Date: Tue, 18 Sep 2007 13:15:09 -0400
Subject: rpms/emacs/F-7 emacs.desktop, 1.8, 1.9 emacs.spec, 1.97,
	1.98 python-mode-init.el, 1.1, NONE python-mode.el, 1.3, NONE
Message-ID: <200709181715.l8IHF9IT007612@cvs-int.fedora.redhat.com>

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587

Modified Files:
	emacs.desktop emacs.spec 
Removed Files:
	python-mode-init.el python-mode.el 
Log Message:
* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
- drop broken python mode (Resolves: bz262801)
- use macro instead of variable style for buildroot.
- add pkgconfig file.

* Mon Aug 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176)
- glibc-open-macro.patch to deal with glibc turning "open" into a macro.
- leave emacs info pages in default section (Resolves: bz199008) 

* Fri Jul 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-2
- change group from Development to Utility




Index: emacs.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-7/emacs.desktop,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emacs.desktop	16 May 2005 13:11:07 -0000	1.8
+++ emacs.desktop	18 Sep 2007 17:14:37 -0000	1.9
@@ -29,6 +29,6 @@
 Icon=emacs.png
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;X-Red-Hat-Base;
+Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
 Encoding=UTF-8
 StartupWMClass=Emacs


Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/F-7/emacs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- emacs.spec	22 Jun 2007 20:57:04 -0000	1.97
+++ emacs.spec	18 Sep 2007 17:14:37 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -12,12 +12,10 @@
 Source2: emacs.png
 Source3: dotemacs.el
 Source4: site-start.el
-Source5: http://www.python.org/emacs/python-mode/python-mode.el
 Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
 Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz
 Source8: php-mode-init.el
 Source9: ssl.el
-Source10: python-mode-init.el
 Source11: rpm-spec-mode-init.el
 Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch
 Source13: focus-init.el
@@ -33,15 +31,20 @@
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
 Requires: emacs-common = %{version}-%{release}
 Conflicts: gettext < 0.10.40
+Provides: emacs(bin)
 
 # C and build patches
 
 # Lisp and doc patches
 
 %define paranoid 1
+%define expurgate 0
+
+%define site_lisp %{_datadir}/emacs/site-lisp
+%define pkgconfig %{_datadir}/pkgconfig
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -55,6 +58,7 @@
 Summary: GNU Emacs text editor without X support
 Group: Applications/Editors
 Requires: emacs-common = %{version}-%{release}
+Provides: emacs(bin)
 
 %description nox
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -97,7 +101,7 @@
 
 # install rest of site-lisp files
 ( cd site-lisp
-  cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
+  cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
   tar xfz %SOURCE7  # php-mode
   # xemacs compat patch for rpm-spec-mode
   patch < %SOURCE12
@@ -110,6 +114,10 @@
   rm -f tetris.el tetris.elc )
 %endif
 
+%if %{expurgate}
+rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
+%endif
+
 %build
 export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS"
 
@@ -134,13 +142,23 @@
 
 %__make %{?_smp_mflags} -C lisp updates
 
+# Create pkgconfig file
+cat > emacs.pc << EOF
+sitepkglispdir=%{site_lisp}
+sitestartdir=%{site_lisp}/site-start.d
+
+Name: emacs
+Description: GNU Emacs text editor
+Version: %{version}
+EOF
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall
 
 # let alternatives manage the symlink
-rm $RPM_BUILD_ROOT%{_bindir}/emacs
+rm %{buildroot}%{_bindir}/emacs
 
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
@@ -149,40 +167,42 @@
 %__make %{?_smp_mflags}
 
 # install the emacs without X
-install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox
+install -m 0755 src/emacs-%{version}.1 %{buildroot}%{_bindir}/emacs-%{version}-nox
 
 # make sure movemail isn't setgid
-chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail
-
-%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{site_lisp}
-install -m 0644 %SOURCE4 %{site_lisp}/site-start.el
-install -m 0644 %SOURCE18 %{site_lisp}
-
-mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs}
-mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1}
-mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags}
+mkdir -p %{buildroot}%{site_lisp}
+install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
+install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
+
+mv %{buildroot}%{_bindir}/{etags,etags.emacs}
+mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
+mv %{buildroot}%{_bindir}/{ctags,gctags}
 
 # GNOME / KDE files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+mkdir -p %{buildroot}%{_datadir}/applications
+install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/gnu-emacs.desktop
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/pixmaps/
 
 # install site-lisp files
-install -m 0644 site-lisp/*.el{,c} %{site_lisp}
+install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
 
-mkdir -p %{site_lisp}/site-start.d
-install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d
+mkdir -p %{buildroot}%{site_lisp}/site-start.d
+install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
 
 # default initialization file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs
+mkdir -p %{buildroot}%{_sysconfdir}/skel
+install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
+
+# install pkgconfig file
+mkdir -p %{buildroot}/%{pkgconfig}
+install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # after everything is installed, remove info dir
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/*
+rm -f %{buildroot}%{_infodir}/dir
+rm %{buildroot}%{_localstatedir}/games/emacs/*
 
 #
 # create file lists
@@ -190,7 +210,7 @@
 rm -f *-filelist {common,el}-*-files
 
 ( TOPDIR=${PWD}
-  cd $RPM_BUILD_ROOT
+  cd %{buildroot}
 
   find .%{_datadir}/emacs/%{version}/lisp \
     .%{_datadir}/emacs/%{version}/leim \
@@ -204,7 +224,7 @@
 cat el-*-files common-lisp-dir-files > el-filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
@@ -226,15 +246,14 @@
 
 %post common
 for f in %{info_files}; do
-  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir --section="GNU Emacs" 2> /dev/null || :
+  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
 done
 alternatives --install %{_bindir}/etags etags %{_bindir}/etags.emacs 80
 
 %preun common
 if [ "$1" = 0 ]; then
   for f in %{info_files}; do
-    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir \
-      --section="GNU Emacs" 2> /dev/null || :
+    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
   done
   alternatives --remove etags %{_bindir}/etags.emacs
 fi
@@ -273,10 +292,25 @@
 
 %files -f el-filelist el
 %defattr(-,root,root)
+%{pkgconfig}/emacs.pc
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Sep 12 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-4
+- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861)
+- drop broken python mode (Resolves: bz262801)
+- use macro instead of variable style for buildroot.
+- add pkgconfig file.
+
+* Mon Aug 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-3
+- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176)
+- glibc-open-macro.patch to deal with glibc turning "open" into a macro.
+- leave emacs info pages in default section (Resolves: bz199008) 
+
+* Fri Jul 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-2
+- change group from Development to Utility
+
 * Fri Jun  6 2007 Chip Coldwell <coldwell at redhat.com> - 22.1-1
 - move alternatives install to posttrans scriptlet (Resolves: bz239745)
 - new release tarball from FSF (Resolves: bz245303)


--- python-mode-init.el DELETED ---


--- python-mode.el DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 17:20:15 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:20:15 -0400
Subject: rpms/zenity/devel zenity.spec,1.34,1.35
Message-ID: <200709181720.l8IHKFTl007730@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7707

Modified Files:
	zenity.spec 
Log Message:
drop yelp dependency



Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zenity.spec	18 Sep 2007 03:11:01 -0000	1.34
+++ zenity.spec	18 Sep 2007 17:19:42 -0000	1.35
@@ -19,8 +19,10 @@
 BuildRequires: which
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
-# for /usr/share/gnome/help 
-Requires: yelp
+# for /usr/share/gnome/help, we should require yelp
+# but we don't to avoid forcing firefox and libbeagle on live cds
+# via anaconda -> zenity -> ...
+#Requires: yelp
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -69,6 +71,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Drop yelp dependency to avoid exploding live cds (#295091)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 17:23:18 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:23:18 -0400
Subject: rpms/mencal/F-7 mencal.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181723.l8IHNIcu007915@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7865

Modified Files:
	sources 
Added Files:
	mencal.spec 
Log Message:
Uploading for Fedora 7



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:23:24 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 13:23:24 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.15,1.16
Message-ID: <200709181723.l8IHNOKS007918@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7897

Modified Files:
	xulrunner.spec 
Log Message:
removed the crashreporter


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xulrunner.spec	18 Sep 2007 15:51:55 -0000	1.15
+++ xulrunner.spec	18 Sep 2007 17:22:52 -0000	1.16
@@ -313,7 +313,6 @@
 %{_libdir}/%{name}-*/xulrunner-bin
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
-%{_libdir}/%{name}-*/crashreporter
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*



From fedora-extras-commits at redhat.com  Tue Sep 18 17:25:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:25:11 -0400
Subject: rpms/zenity/devel zenity.spec,1.35,1.36
Message-ID: <200709181725.l8IHPBJU008141@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/zenity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8085

Modified Files:
	zenity.spec 
Log Message:
bump rev



Index: zenity.spec
===================================================================
RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- zenity.spec	18 Sep 2007 17:19:42 -0000	1.35
+++ zenity.spec	18 Sep 2007 17:24:38 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		zenity
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+



From fedora-extras-commits at redhat.com  Tue Sep 18 17:34:36 2007
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 18 Sep 2007 13:34:36 -0400
Subject: rpms/perl-X11-Protocol/devel .cvsignore, 1.3,
	1.4 perl-X11-Protocol.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709181734.l8IHYaDD008409@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/pkgs/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8376

Modified Files:
	.cvsignore perl-X11-Protocol.spec sources 
Log Message:

* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.56-1
- New upstream release (bugfix)
- Added BR for perl(ExtUtils::MakeMaker)
- License clarification
- Minor spec cleanup, mainly to suppress rpmlint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Mar 2006 18:07:02 -0000	1.3
+++ .cvsignore	18 Sep 2007 17:34:02 -0000	1.4
@@ -1 +1 @@
-X11-Protocol-0.55.tar.gz
+X11-Protocol-0.56.tar.gz


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-X11-Protocol.spec	15 Sep 2006 20:28:00 -0000	1.5
+++ perl-X11-Protocol.spec	18 Sep 2007 17:34:02 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           perl-X11-Protocol
-Version:        0.55
-Release:        5%{?dist}
+Version:        0.56
+Release:        1%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/X11-Protocol/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:	noarch
+BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,7 +31,7 @@
 # Testing requires X - use "rpmbuild --with X"
 %if 0%{!?_with_X:1}
 %{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
-			if /Insert your test code below/;' test.pl 
+    if /Insert your test code below/;' test.pl 
 %endif
 
 perldoc -t perlartistic > Artistic
@@ -69,6 +70,12 @@
 
 
 %changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 0.56-1
+- New upstream release (bugfix)
+- Added BR for perl(ExtUtils::MakeMaker)
+- License clarification
+- Minor spec cleanup, mainly to suppress rpmlint warnings
+
 * Fri Sep 15 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-5
 - FC-6 rebuild requests
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Mar 2006 18:07:02 -0000	1.3
+++ sources	18 Sep 2007 17:34:02 -0000	1.4
@@ -1 +1 @@
-3d914cb8945105a8b96ec1497dee47e2  X11-Protocol-0.55.tar.gz
+2260bad68d373b201b17c60d761e0f0a  X11-Protocol-0.56.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:38:40 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 13:38:40 -0400
Subject: rpms/mencal/FC-6 mencal.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709181738.l8IHcePZ008664@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mencal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8645

Modified Files:
	sources 
Added Files:
	mencal.spec 
Log Message:
Build for FC6.



--- NEW FILE mencal.spec ---
Name:		mencal
Version:	2.3
Release:	1%{?dist}

Summary:	Menstruation calendar

License:	GPLv2
Group:		Applications/Productivity
URL:		http://www.kyberdigi.cz/projects/mencal/english.html
Source:		http://www.kyberdigi.cz/projects/mencal/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch

%description
Mencal is a simple variation of the well-known unix command cal.
The main difference is that you can have some periodically repeating 
days highlighted in color. This can be used to track 
menstruation (or other) cycles conveniently.

%prep
%setup -q

%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 mencal $RPM_BUILD_ROOT%{_bindir}/mencal


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE_EN.html LICENCE_CZ.html
%{_bindir}/mencal


%changelog
* Sat Sep 01 2007 Marek Mahut <mmahut fedoraproject.org> - 2.3-1
- First build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mencal/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2007 18:43:25 -0000	1.1
+++ sources	18 Sep 2007 17:38:08 -0000	1.2
@@ -0,0 +1 @@
+e0fa5665b8f7772521bb95379bfdec20  mencal-2.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 17:40:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 13:40:34 -0400
Subject: rpms/system-config-rootpassword/devel
	system-config-rootpassword.spec, 1.16, 1.17
Message-ID: <200709181740.l8IHeY6a008757@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/system-config-rootpassword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8722

Modified Files:
	system-config-rootpassword.spec 
Log Message:
fix menu categories



Index: system-config-rootpassword.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-rootpassword/devel/system-config-rootpassword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- system-config-rootpassword.spec	23 Aug 2007 17:14:14 -0000	1.16
+++ system-config-rootpassword.spec	18 Sep 2007 17:40:01 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the rootpassword
 Name: system-config-rootpassword
 Version: 1.1.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedora.redhat.com/
 License: GPL+
 ExclusiveOS: Linux
@@ -34,8 +34,9 @@
 make INSTROOT=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base                             \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+  --add-category Settings                                    \
+  --remove-category Application		                     \
   $RPM_BUILD_ROOT%{_datadir}/applications/system-config-rootpassword.desktop
 
 %find_lang %name
@@ -74,6 +75,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-rootpassword
 
 %changelog
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.1.10-4
+- Fix menu categories
+
 * Thu Aug 23 2007 Pete Graner <pgraner at redhat.com> - 1.1.10-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 18 17:47:47 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 18 Sep 2007 13:47:47 -0400
Subject: rpms/e2fsprogs/devel
	e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch,
	NONE, 1.1 e2fsprogs.spec, 1.80, 1.81
Message-ID: <200709181747.l8IHllf5008958@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8930

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch 
Log Message:
* Tue Sep 18 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-7
- Fix blkid fat probe when there is a real MBR (#290951)


e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch:

--- NEW FILE e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch ---
>From 3a493033ce3867a2561d60c1016dd0c03999e5eb Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Tue, 18 Sep 2007 15:29:59 +0200
Subject: [PATCH] libblkid: FAT magic is not on strict position when there is a real MBR

There is _optional_ reserved space before FAT:

   boot  | reserved | FAT | FAT | root |  data
  sector |  space   |  1  |  2  |  dir | region

for more details see:
  http://en.wikipedia.org/wiki/File_Allocation_Table

The probe_fat() code already expects reserved space and other optional
junk in MBR+FAT, but the blkid_magic array expects strictly defined
positions of FAT magic strings. That's correct for 99% partitions, but
not for situation when on the same partition is real MBR. We need to check
for FAT filesystem also when we detect MBR signature (0x55AA on address 510).

The blkid is not able to detect vfat on USB Disks where is only one
bootable partition with vfat, for example:

  # file -s /dev/sdc1
  /dev/sdc1: x86 boot sector; GRand Unified Bootloader, stage1 version
  0x3, 1st sector stage2 0x44ae, code offset 0x48, sectors/cluster 8,
  Media descriptor 0xf8, heads 4, sectors 3901408 (volumes > 32 MB) ,
  physical drive 0xdb, physical drive 0x5b, reserved 0xe, dos < 4.0
  BootSector (0x0)

  # vol_id /dev/sdc1
  ID_FS_USAGE=filesystem
  ID_FS_TYPE=vfat
  ID_FS_VERSION=FAT32
  ID_FS_UUID=0044-AE80
  ID_FS_UUID_ENC=0044-AE80
  ID_FS_LABEL=Mdv_Flash
  ID_FS_LABEL_ENC=Mdv_Flash
  ID_FS_LABEL_SAFE=Mdv_Flash

old version:
  # blkid /dev/sdc1

fixed version:
  # blkid /dev/sdc1
  /dev/sdc1: LABEL="MDV_FLASH" UUID="0044-AE80" TYPE="vfat"

Signed-off-by: Karel Zak <kzak at redhat.com>
---
 lib/blkid/probe.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index d56292e..42ec234 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -849,6 +849,7 @@ static struct blkid_magic type_array[] = {
   { "vfat",      0,   0x36,  8, "FAT12   ",             probe_fat },
   { "vfat",      0,      0,  2, "\353\220",             probe_fat_nomagic },
   { "vfat",      0,      0,  1, "\351",                 probe_fat_nomagic },
+  { "vfat",      0,  0x1fe,  2, "\125\252",             probe_fat },
   { "minix",     1,   0x10,  2, "\177\023",             0 },
   { "minix",     1,   0x10,  2, "\217\023",             0 },
   { "minix",	 1,   0x10,  2, "\150\044",		0 },
-- 
1.5.2.4




Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- e2fsprogs.spec	18 Sep 2007 13:09:34 -0000	1.80
+++ e2fsprogs.spec	18 Sep 2007 17:47:14 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -22,6 +22,7 @@
 Patch64: e2fsprogs-1.40.2-swapfs.patch
 Patch65: e2fsprogs-1.40.2-fix-open-create-modes.patch
 Patch66: e2fsprogs-1.40.2-protect-open-ops.patch
+Patch67: e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +101,9 @@
 %patch65 -p1 -b .creatmode
 # protect ->open ops from glibc open-create-mode-checker
 %patch66 -p1 -b .open
+# fix fat probe when there is a real MBR
+%patch67 -p1 -b .blkid-fat
+
 %build
 aclocal
 autoconf
@@ -260,6 +264,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Sep 18 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-7
+- Fix blkid fat probe when there is a real MBR (#290951)
+
 * Tue Sep 18 2007 Oliver Falk <oliver at linux-kernel.at> 1.40.2-6
 - Add alpha to the header wrappers 
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:05:42 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 18 Sep 2007 14:05:42 -0400
Subject: rpms/libgnome/devel libgnome-2.16.0-default-background.patch, 1.2, 
	NONE libgnome-2.18.0-default-settings.patch, 1.4, NONE
Message-ID: <200709181805.l8II5gqC015547@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15540

Removed Files:
	libgnome-2.16.0-default-background.patch 
	libgnome-2.18.0-default-settings.patch 
Log Message:
drop unused patches



--- libgnome-2.16.0-default-background.patch DELETED ---


--- libgnome-2.18.0-default-settings.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:10:18 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Tue, 18 Sep 2007 14:10:18 -0400
Subject: rpms/libgnome/devel default-background.patch, 1.1, 1.2 libgnome.spec,
	1.101, 1.102
Message-ID: <200709181810.l8IIAIpD015659@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15634

Modified Files:
	default-background.patch libgnome.spec 
Log Message:
- the location of the default background setting changed, 
  update correct schema input file


default-background.patch:

Index: default-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/default-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-background.patch	17 Sep 2007 18:06:08 -0000	1.1
+++ default-background.patch	18 Sep 2007 18:10:15 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
---- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background	2007-09-17 08:25:50.000000000 -0400
-+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in	2007-09-17 14:04:41.000000000 -0400
+--- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in.default-background	2007-09-17 08:25:50.000000000 -0400
++++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in	2007-09-17 14:04:41.000000000 -0400
 @@ -16,7 +16,7 @@
          <applyto>/desktop/gnome/background/picture_options</applyto>
          <owner>gnome</owner>
@@ -14,8 +14,8 @@
          <applyto>/desktop/gnome/background/picture_filename</applyto>
          <owner>gnome</owner>
          <type>string</type>
--	<default>/usr/share/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>/usr/share/backgrounds/infinity/infinity.xml</default>
+-	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
++	<default>@datadir@/backgrounds/infinity/infinity.xml</default>
          <locale name="C">
          <short>Picture Filename</short>
          <long>File to use for the background image</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- libgnome.spec	17 Sep 2007 19:01:15 -0000	1.101
+++ libgnome.spec	18 Sep 2007 18:10:15 -0000	1.102
@@ -13,7 +13,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.20/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -188,6 +188,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Sep 18 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- the location of the default background setting changed, 
+  update correct schema input file
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:16:16 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 14:16:16 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.66, 1.67 gnome-games.spec,
	1.147, 1.148 sources, 1.70, 1.71
Message-ID: <200709181816.l8IIGGpc015805@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15783

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	18 Sep 2007 04:28:43 -0000	1.66
+++ .cvsignore	18 Sep 2007 18:15:42 -0000	1.67
@@ -1 +1 @@
-gnome-games-2.20.0.tar.bz2
+gnome-games-2.20.0.1.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gnome-games.spec	18 Sep 2007 04:28:43 -0000	1.147
+++ gnome-games.spec	18 Sep 2007 18:15:42 -0000	1.148
@@ -43,7 +43,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0.1-1
+- Update to 2.20.0.1
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	18 Sep 2007 04:28:43 -0000	1.70
+++ sources	18 Sep 2007 18:15:42 -0000	1.71
@@ -1 +1 @@
-a34eda66c6e09dc8f3a0fb720788f9bd  gnome-games-2.20.0.tar.bz2
+9b30bc49e65b00fe56e3c6d7238a2e2a  gnome-games-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 18:19:51 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 14:19:51 -0400
Subject: extras-buildsys/etc plague-builder.init, 1.10,
	1.11 plague-server.init, 1.5, 1.6
Message-ID: <200709181819.l8IIJpUY015879@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15854/etc

Modified Files:
	plague-builder.init plague-server.init 
Log Message:
fix the initscript usage help output


Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plague-builder.init	12 Mar 2006 05:44:30 -0000	1.10
+++ plague-builder.init	18 Sep 2007 18:19:49 -0000	1.11
@@ -67,7 +67,7 @@
 		[ -f /var/lock/subsys/$servicename ] && restart || :
 		;;
 	*)
-		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		echo "Usage: $0 {start|stop|status|restart|condrestart}"
 		exit 1
 		;;
 esac


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plague-server.init	12 Mar 2006 05:44:30 -0000	1.5
+++ plague-server.init	18 Sep 2007 18:19:49 -0000	1.6
@@ -67,7 +67,7 @@
 		[ -f /var/lock/subsys/$servicename ] && restart || :
 		;;
 	*)
-		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		echo "Usage: $0 {start|stop|status|restart|condrestart}"
 		exit 1
 		;;
 esac



From fedora-extras-commits at redhat.com  Tue Sep 18 18:20:22 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 14:20:22 -0400
Subject: rpms/libtorrent/devel .cvsignore, 1.7, 1.8 libtorrent.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <200709181820.l8IIKMTT015903@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15850

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
Rebuilding to new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 14:06:31 -0000	1.7
+++ .cvsignore	18 Sep 2007 18:19:49 -0000	1.8
@@ -1 +1 @@
-libtorrent-0.11.4.tar.gz
+libtorrent-0.11.8.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libtorrent.spec	28 Aug 2007 21:52:14 -0000	1.15
+++ libtorrent.spec	18 Sep 2007 18:19:49 -0000	1.16
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.11.4
-Release:       2%{?dist}
+Version:       0.11.8
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut at fedoraproject dot org> - 0.11.8-1
+- New upstream version
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.11.4-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Jun 2007 14:06:31 -0000	1.8
+++ sources	18 Sep 2007 18:19:49 -0000	1.9
@@ -1 +1 @@
-cdfe5a0d9ce5d8cd8985f3fa4bd82dfd  libtorrent-0.11.4.tar.gz
+1e50de4a4f0ee6d9c643993aea9bdbf0  libtorrent-0.11.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 18:24:48 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 18 Sep 2007 14:24:48 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.6,1.7
Message-ID: <200709181824.l8IIOme8016220@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
- Fix filename of webcore jar.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-mylyn.spec	18 Sep 2007 16:02:49 -0000	1.6
+++ eclipse-mylyn.spec	18 Sep 2007 18:24:16 -0000	1.7
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -434,7 +434,7 @@
 %{eclipse_base}/plugins/org.eclipse.mylyn.resources.ui_*.jar
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.help.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.mylyn.web.core_*
+%{_libdir}/gcj/%{name}/mylyn-webcore*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.context.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.tasks.core_*
@@ -447,6 +447,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
+- Fix filename of webcore jar.
+
 * Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-6
 - Re-add gcj support (accidentally removed the flag).
 



From fedora-extras-commits at redhat.com  Tue Sep 18 18:25:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 14:25:14 -0400
Subject: rpms/policycoreutils/F-7 policycoreutils-gui.patch, 1.19,
	1.20 policycoreutils-rhat.patch, 1.308,
	1.309 policycoreutils.spec, 1.421, 1.422
Message-ID: <200709181825.l8IIPElC016294@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16266

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
- Update to latest upstream policycoreutils gui


policycoreutils-gui.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-gui.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policycoreutils-gui.patch	25 Jun 2007 10:12:43 -0000	1.19
+++ policycoreutils-gui.patch	18 Sep 2007 18:25:11 -0000	1.20
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.22/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/booleansPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,227 @@
++++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
+@@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
 +#
@@ -27,7 +27,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import tempfile
@@ -229,10 +228,10 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.22/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/fcontextPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,210 @@
++++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
+@@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -254,7 +253,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import seobject
 +import commands
@@ -443,10 +441,10 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.22/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/loginsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,180 @@
++++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
+@@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -469,7 +467,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands
@@ -627,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.22/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/Makefile	2007-06-22 09:31:53.000000000 -0400
++++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -665,10 +662,10 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.22/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/mappingsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,57 @@
++++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
+@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -691,7 +688,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -726,10 +722,10 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.22/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/modulesPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,182 @@
++++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
+@@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -753,7 +749,6 @@
 +import gtk.glade
 +import os
 +import commands
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -912,21 +907,102 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.22/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/polgen.glade	2007-06-25 06:05:48.000000000 -0400
-@@ -0,0 +1,1168 @@
++++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-18 14:02:32.000000000 -0400
+@@ -0,0 +1,2385 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
 +<glade-interface>
 +<requires lib="gnome"/>
 +
++<widget class="GtkFileChooserDialog" id="filechooserdialog">
++  <property name="border_width">5</property>
++  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
++  <property name="local_only">True</property>
++  <property name="select_multiple">True</property>
++  <property name="show_hidden">True</property>
++  <property name="do_overwrite_confirmation">False</property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_MOUSE</property>
++  <property name="modal">False</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
++
++  <child internal-child="vbox">
++    <widget class="GtkVBox" id="dialog-vbox1">
++      <property name="visible">True</property>
++      <property name="homogeneous">False</property>
++      <property name="spacing">24</property>
++
++      <child internal-child="action_area">
++	<widget class="GtkHButtonBox" id="dialog-action_area1">
++	  <property name="visible">True</property>
++	  <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++	  <child>
++	    <widget class="GtkButton" id="button5">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-cancel</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-6</property>
++	    </widget>
++	  </child>
++
++	  <child>
++	    <widget class="GtkButton" id="button6">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="has_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-add</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-5</property>
++	    </widget>
[...4193 lines suppressed...]
 +if_stream_rules="""
@@ -7839,6 +9910,10 @@
 +')
 +"""
 +
++if_admin_rules="""
++	TEMPLATETYPE_manage_var_lib($2)
++"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
@@ -7851,10 +9926,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.22/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_log.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,89 @@
++++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7934,6 +10009,29 @@
 +	allow $1 TEMPLATETYPE_log_t:file { getattr append };
 +')
 +
++########################################
++## <summary>
++##	Allow domain to manage TEMPLATETYPE log files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_log',`
++	gen_require(`
++		type TEMPLATETYPE_log_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_file_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++')
++"""
++
++if_admin_rules="""
++	TEMPLATETYPE_manage_log($2)
 +"""
 +
 +########################### File Context ##################################
@@ -7944,10 +10042,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.22/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_run.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,95 @@
++++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8007,6 +10105,26 @@
 +	allow $1 TEMPLATETYPE_var_run_t:file r_file_perms;
 +')
 +
++########################################
++## <summary>
++##	Manage TEMPLATETYPE var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_var_run',`
++	gen_require(`
++		type TEMPLATETYPE_var_run_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_file_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++')
++
 +"""
 +
 +if_stream_rules="""\
@@ -8031,6 +10149,10 @@
 +')
 +"""
 +
++if_admin_rules="""
++	TEMPLATETYPE_manage_var_run($2)
++"""
++
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
@@ -8043,10 +10165,10 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.22/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/templates/var_spool.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,105 @@
++++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
+@@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -8143,7 +10265,33 @@
 +	allow $1 TEMPLATETYPE_spool_t:dir rw_dir_perms;
 +	files_search_spool($1)
 +')
++
++########################################
++## <summary>
++##	Allow domain to manage TEMPLATETYPE spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_manage_spool',`
++	gen_require(`
++		type TEMPLATETYPE_spool_t;
++	')
++
++         manage_dir_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_file_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_lnk_file_perms($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++')
++
++"""
++
++if_admin_rules="""
++	TEMPLATETYPE_manage_spool($2)
 +"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
@@ -8152,10 +10300,10 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.22/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/translationsPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,119 @@
++++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
+@@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -8178,7 +10326,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import seobject
@@ -8275,10 +10422,10 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.22/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.22/gui/usersPage.py	2007-06-22 09:31:53.000000000 -0400
-@@ -0,0 +1,173 @@
++++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
+@@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -8301,7 +10448,6 @@
 +import gtk
 +import gtk.glade
 +import os
-+import libxml2
 +import gobject
 +import sys
 +import commands

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-rhat.patch,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- policycoreutils-rhat.patch	23 Jul 2007 14:31:19 -0000	1.308
+++ policycoreutils-rhat.patch	18 Sep 2007 18:25:11 -0000	1.309
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.16/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/audit2allow/Makefile	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/audit2allow/Makefile	2007-09-18 14:18:45.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -20,16 +20,55 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.16/Makefile
 --- nsapolicycoreutils/Makefile	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/Makefile	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/Makefile	2007-09-18 14:18:45.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.1 policycoreutils-2.0.16/newrole/newrole.1
+--- nsapolicycoreutils/newrole/newrole.1	2007-05-04 09:14:50.000000000 -0400
++++ policycoreutils-2.0.16/newrole/newrole.1	2007-09-18 14:20:13.000000000 -0400
+@@ -47,6 +47,12 @@
+ In particular, an argument of -- -c will cause the next argument to be
+ treated as a command by most command interpreters.
+ .PP
++If a command argument is specified to newrole and the command name is found
++in /etc/selinux/newrole_pam.conf, then the pam service name listed in that
++file for the command will be used rather than the normal newrole pam
++configuration.  This allows for per-command pam configuration when
++invoked via newrole, e.g. to skip the interactive re-authentication phase.
++.PP
+ The new shell will be the shell specified in the user's entry in the 
+ .I /etc/passwd
+ file.
+@@ -81,14 +87,22 @@
+    # id -Z
+    staff_u:sysadm_r:sysadm_t:Secret
+ 
++.PP
++Running a program in a given role or level:
++   # newrole -r sysadm_r -- -c "/path/to/app arg1 arg2..."
++   # newrole -l Secret -- -c "/path/to/app arg1 arg2..."
++
+ .SH FILES
+ /etc/passwd - user account information
+ .br
+ /etc/shadow - encrypted passwords and age information
+ .br
+ /etc/selinux/<policy>/contexts/default_type - default types for roles
++.br
+ /etc/selinux/<policy>/contexts/securetty_types - securetty types for level changes
+ .br
++/etc/selinux/newrole_pam.conf - optional mapping of commands to separate pam service names
++.br
+ .SH SEE ALSO
+ .B runcon
+ (1)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.16/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/restorecon/restorecon.c	2007-09-18 14:18:45.000000000 -0400
 @@ -16,6 +16,7 @@
   * -v	Show changes in file labels.  
   * -o	filename save list of files with incorrect context
@@ -87,7 +126,7 @@
  			break;
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.16/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-05-04 09:14:47.000000000 -0400
-+++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/restorecond/restorecond.c	2007-09-18 14:18:45.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -116,7 +155,7 @@
  	close(fd);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.16/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/chcat	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/scripts/chcat	2007-09-18 14:18:45.000000000 -0400
 @@ -77,7 +77,7 @@
              
          if len(cats) > 0:
@@ -137,7 +176,16 @@
          if add_ind:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.16/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/fixfiles	2007-07-23 10:29:53.000000000 -0400
++++ policycoreutils-2.0.16/scripts/fixfiles	2007-09-18 14:21:45.000000000 -0400
+@@ -88,7 +88,7 @@
+                   esac; \
+                fi; \
+             done | \
+-	while read pattern ; do find $pattern \
++	while read pattern ; do sh -c "find $pattern" \
+ 		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
+ 		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
+ 		      done 2> /dev/null | \
 @@ -108,6 +108,7 @@
  
  rpmlist() {
@@ -148,7 +196,7 @@
  # 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.16/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2007-05-04 09:14:49.000000000 -0400
-+++ policycoreutils-2.0.16/scripts/genhomedircon	2007-07-06 09:48:36.000000000 -0400
++++ policycoreutils-2.0.16/scripts/genhomedircon	2007-09-18 14:18:45.000000000 -0400
 @@ -193,7 +193,7 @@
  		return prefix
  		
@@ -178,7 +226,7 @@
  			    continue
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.16/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/semanage/seobject.py	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/semanage/seobject.py	2007-09-18 14:18:45.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -205,7 +253,7 @@
  			
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-2.0.16/setsebool/setsebool.c
 --- nsapolicycoreutils/setsebool/setsebool.c	2007-05-04 09:14:48.000000000 -0400
-+++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-07-06 09:47:59.000000000 -0400
++++ policycoreutils-2.0.16/setsebool/setsebool.c	2007-09-18 14:18:45.000000000 -0400
 @@ -160,6 +160,8 @@
  		goto err;
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- policycoreutils.spec	23 Jul 2007 14:31:19 -0000	1.421
+++ policycoreutils.spec	18 Sep 2007 18:25:11 -0000	1.422
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
+- Update to latest upstream policycoreutils gui
+
 * Mon Jul 23 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-11
 - Add checkpoliicy requires
 - Fix fixfiles to report incorrect rpm



From fedora-extras-commits at redhat.com  Tue Sep 18 18:26:21 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Sep 2007 14:26:21 -0400
Subject: extras-buildsys ChangeLog,1.219,1.220
Message-ID: <200709181826.l8IIQLb5016378@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16360

Modified Files:
	ChangeLog 
Log Message:
fix the initscript usage help output


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- ChangeLog	20 May 2007 10:17:59 -0000	1.219
+++ ChangeLog	18 Sep 2007 18:26:18 -0000	1.220
@@ -1,3 +1,8 @@
+2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
+
+	* etc/plague-builder.init, etc/plague-server.init
+	   - Fix usage help output
+
 2007-05-20  Ville Skytt??  <ville.skytta at iki.fi>
 
     * common/AuthedXMLRPCServer.py



From fedora-extras-commits at redhat.com  Tue Sep 18 18:36:45 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:36:45 -0700
Subject: [pkgdb] xorg-x11-drv-avivo was added for ajax
Message-ID: <200709181836.l8IIakS7018606@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package xorg-x11-drv-avivo with summary Xorg driver for ATI R500+ chipsets
Warren Togami (wtogami) has approved Package xorg-x11-drv-avivo
Warren Togami (wtogami) has added a Fedora devel branch for xorg-x11-drv-avivo with an owner of ajax
Warren Togami (wtogami) has approved xorg-x11-drv-avivo in Fedora devel
Warren Togami (wtogami) has approved Package xorg-x11-drv-avivo
Warren Togami (wtogami) has set commit to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on xorg-x11-drv-avivo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-avivo



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:20 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:20 -0700
Subject: [pkgdb] grsync was added for svahl
Message-ID: <200709181837.l8IIbLH4020323@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package grsync with summary grsync - A Gtk+ GUI for rsync
Warren Togami (wtogami) has approved Package grsync
Warren Togami (wtogami) has added a Fedora devel branch for grsync with an owner of svahl
Warren Togami (wtogami) has approved grsync in Fedora devel
Warren Togami (wtogami) has approved Package grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grsync



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:35 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:35 -0700
Subject: [pkgdb] grsync (Fedora, 7) updated by wtogami
Message-ID: <200709181837.l8IIbaAh018828@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) added a Fedora 7 branch for grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora 7)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora 7)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grsync



From fedora-extras-commits at redhat.com  Tue Sep 18 18:37:36 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:37:36 -0700
Subject: [pkgdb] grsync (Fedora, 6) updated by wtogami
Message-ID: <200709181837.l8IIbgmf018859@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) added a Fedora 6 branch for grsync
Warren Togami (wtogami) has set commit to Approved for cvsextras on grsync (Fedora 6)
Warren Togami (wtogami) has set build to Approved for cvsextras on grsync (Fedora 6)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on grsync (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grsync



From fedora-extras-commits at redhat.com  Tue Sep 18 18:38:16 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:38:16 -0700
Subject: [pkgdb] compiz-fusion-extras was added for drago01
Message-ID: <200709181838.l8IIcGqt020547@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package compiz-fusion-extras with summary Additional Compiz Fusion plugins for Compiz
Warren Togami (wtogami) has approved Package compiz-fusion-extras
Warren Togami (wtogami) has added a Fedora devel branch for compiz-fusion-extras with an owner of drago01
Warren Togami (wtogami) has approved compiz-fusion-extras in Fedora devel
Warren Togami (wtogami) has approved Package compiz-fusion-extras
Warren Togami (wtogami) has set commit to Approved for cvsextras on compiz-fusion-extras (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on compiz-fusion-extras (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on compiz-fusion-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-extras



From fedora-extras-commits at redhat.com  Tue Sep 18 18:38:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:38:17 -0700
Subject: [pkgdb] compiz-fusion-extras (Fedora, devel) updated by wtogami
Message-ID: <200709181838.l8IIcIOB019013@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) approved watchbugzilla on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved watchcommits on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved commit on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved build on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved approveacls on compiz-fusion-extras (Fedora devel) for krh
Warren Togami (wtogami) approved checkout on compiz-fusion-extras (Fedora devel) for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion-extras



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 14:39:33 -0400
Subject: rpms/fast-user-switch-applet/devel
	fast-user-switch-applet-2.20.0-username.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.17, 1.18
Message-ID: <200709181839.l8IIdXlx016693@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16666

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	fast-user-switch-applet-2.20.0-username.patch 
Log Message:
fix up a patch


fast-user-switch-applet-2.20.0-username.patch:

--- NEW FILE fast-user-switch-applet-2.20.0-username.patch ---
diff -up fast-user-switch-applet-2.20.0/src/applet.c.username fast-user-switch-applet-2.20.0/src/applet.c
--- fast-user-switch-applet-2.20.0/src/applet.c.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/applet.c	2007-09-18 14:30:33.000000000 -0400
@@ -237,6 +237,7 @@ static void      sort_menu              
 static GladeXML *get_glade_xml                (const gchar    *root);
 static void      run_switch                   (FusaAppletData *adata,
 					       FusaDisplay    *display,
+					       FusaUser       *user,
 					       gboolean        use_xnest);
 static void      maybe_lock_screen            (FusaAppletData *adata,
 					       FusaDisplay    *display);
@@ -1780,12 +1781,12 @@ user_item_activate_cb (GtkWidget *menuit
 	  if (g_slist_length (unique_displays) > 1)
 	    show_display_selector_dialog (adata, unique_displays);
 	  else
-	    run_switch (adata, unique_displays->data, FALSE);
+	    run_switch (adata, unique_displays->data, user, FALSE);
 
 	  g_slist_free (unique_displays);
 	}
       else
-	run_switch (adata, displays->data, FALSE);
+	run_switch (adata, displays->data, user, FALSE);
 
       g_slist_free (displays);
     }
@@ -1801,7 +1802,7 @@ user_item_activate_cb (GtkWidget *menuit
       /* Only one display open (this one), so create a new one */
       if (g_slist_length (displays) == 1)
 	{
-	  run_switch (adata, NULL, use_xnest);
+	  run_switch (adata, NULL, user, use_xnest);
 	  g_slist_free (displays);
 	}
       /* Iterate through to find an open display */
@@ -1815,7 +1816,7 @@ user_item_activate_cb (GtkWidget *menuit
 	      if (!fusa_display_get_user (displays->data) &&
 		  (use_xnest == !!fusa_display_get_nested (displays->data)))
 		{
-		  run_switch (adata, displays->data, FALSE);
+		  run_switch (adata, displays->data, user, FALSE);
 		  /* The pointer will be invalid but !NULL after this */
 		  g_slist_free (displays);
 		  break;
@@ -1825,7 +1826,7 @@ user_item_activate_cb (GtkWidget *menuit
 	    }
 
 	  if (!displays)
-	    run_switch (adata, NULL, use_xnest);
+	    run_switch (adata, NULL, user, use_xnest);
 	}
     }
 }
@@ -1855,7 +1856,7 @@ login_screen_activate_cb (GtkMenuItem *i
     }
   g_slist_free (displays);
 
-  run_switch (adata, target, FALSE);
+  run_switch (adata, target, NULL, FALSE);
 }
 
 static void
@@ -1891,7 +1892,7 @@ login_window_activate_cb (GtkMenuItem *i
     }
   else
     {
-      run_switch (adata, target, TRUE);
+      run_switch (adata, target, NULL, TRUE);
     }
 }
 
@@ -1962,6 +1963,7 @@ selector_dialog_response_cb (GtkWidget *
 	      run_switch (res_data->adata,
 			  g_object_get_data (G_OBJECT (rbuttons->data),
 					     "fusa-applet-radio-display"),
+			  NULL,
 			  FALSE);
 	      break;
 	    }
@@ -2278,6 +2280,7 @@ get_glade_xml (const gchar *root)
 static void
 run_switch (FusaAppletData *adata,
 	    FusaDisplay    *display,
+	    FusaUser       *user,
 	    gboolean        use_xnest)
 {
   GdkScreen *screen;
@@ -2295,10 +2298,10 @@ run_switch (FusaAppletData *adata,
     }
 
   if (use_xnest)
-    fusa_manager_new_xnest (adata->manager, screen,
+    fusa_manager_new_xnest (adata->manager, screen, user,
 			    manager_new_xnest_cb, adata, NULL);
   else
-    fusa_manager_new_console (adata->manager, screen,
+    fusa_manager_new_console (adata->manager, screen, user,
 			      manager_new_console_cb, adata, NULL);
 }
 
diff -up fast-user-switch-applet-2.20.0/src/gdm-queue.h.username fast-user-switch-applet-2.20.0/src/gdm-queue.h
--- fast-user-switch-applet-2.20.0/src/gdm-queue.h.username	2007-09-18 14:31:40.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/gdm-queue.h	2007-09-18 14:36:48.000000000 -0400
@@ -35,7 +35,9 @@ G_BEGIN_DECLS
 #define GDM_CMD_VERSION			"VERSION"
 #define GDM_CMD_AUTH_LOCAL		"AUTH_LOCAL %s"
 #define GDM_CMD_FLEXI_XSERVER		"FLEXI_XSERVER"
+#define GDM_CMD_FLEXI_XSERVER_USER	"FLEXI_XSERVER_USER %s"
 #define GDM_CMD_FLEXI_XNEST		"FLEXI_XNEST %s %d %s %s"
+#define GDM_CMD_FLEXI_XNEST_USER	"FLEXI_XNEST_USER %s %s %d %s %s"
 #define GDM_CMD_CONSOLE_SERVERS		"CONSOLE_SERVERS"
 #define GDM_CMD_GET_CONFIG       	"GET_CONFIG %s" 
 #define GDM_CMD_GET_CONFIG_FILE		"GET_CONFIG_FILE"
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.h.username fast-user-switch-applet-2.20.0/src/fusa-manager.h
--- fast-user-switch-applet-2.20.0/src/fusa-manager.h.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.h	2007-09-18 14:30:33.000000000 -0400
@@ -107,11 +107,13 @@ void         fusa_manager_activate_displ
 						 GDestroyNotify              notify);
 void         fusa_manager_new_console           (FusaManager                *manager,
 						 GdkScreen                  *screen,
+						 FusaUser                   *user,
 						 FusaManagerDisplayCallback  func,
 						 gpointer                    data,
 						 GDestroyNotify              notify);
 void         fusa_manager_new_xnest             (FusaManager                *manager,
 						 GdkScreen                  *screen,
+						 FusaUser                   *user,
 						 FusaManagerDisplayCallback  func,
 						 gpointer                    data,
 						 GDestroyNotify              notify);
diff -up fast-user-switch-applet-2.20.0/src/fusa-manager.c.username fast-user-switch-applet-2.20.0/src/fusa-manager.c
--- fast-user-switch-applet-2.20.0/src/fusa-manager.c.username	2007-09-18 09:33:33.000000000 -0400
+++ fast-user-switch-applet-2.20.0/src/fusa-manager.c	2007-09-18 14:30:33.000000000 -0400
@@ -1686,6 +1686,7 @@ fusa_manager_activate_display (FusaManag
 void
 fusa_manager_new_console (FusaManager                *manager,
 			  GdkScreen                  *screen,
+			  FusaUser                   *user,
 			  FusaManagerDisplayCallback  func,
 			  gpointer                    data,
 			  GDestroyNotify              notify)
@@ -1694,9 +1695,14 @@ fusa_manager_new_console (FusaManager   
 
   queue_authentication (screen);
 
-  ask_gdm (gdm_callback_activate_display,
-      new_fusa_manager_with_callback (manager, func, NULL, data),
-      GDM_CMD_FLEXI_XSERVER);
+  if (user)
+    ask_gdm (gdm_callback_activate_display,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XSERVER_USER, fusa_user_get_user_name (user));
+  else
+    ask_gdm (gdm_callback_activate_display,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XSERVER);
 }
 
 /**
@@ -1710,6 +1716,7 @@ fusa_manager_new_console (FusaManager   
 void
 fusa_manager_new_xnest (FusaManager                *manager,
 			GdkScreen                  *screen,
+			FusaUser                   *user,
 			FusaManagerDisplayCallback  func,
 			gpointer                    data,
 			GDestroyNotify              notify)
@@ -1722,13 +1729,23 @@ fusa_manager_new_xnest (FusaManager     
   
   queue_authentication (screen);
 
-  ask_gdm (gdm_callback_update_displays,
-      new_fusa_manager_with_callback (manager, func, NULL, data),
-      GDM_CMD_FLEXI_XNEST,
-      gdk_display_get_name (gdk_screen_get_display (screen)),
-      (int) getuid (),
-      mit_cookie,
-      XauFileName ());
+  if (user)
+    ask_gdm (gdm_callback_update_displays,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XNEST_USER,
+	fusa_user_get_user_name (user),
+        gdk_display_get_name (gdk_screen_get_display (screen)),
+        (int) getuid (),
+        mit_cookie,
+        XauFileName ());
+  else
+    ask_gdm (gdm_callback_update_displays,
+        new_fusa_manager_with_callback (manager, func, NULL, data),
+        GDM_CMD_FLEXI_XNEST,
+        gdk_display_get_name (gdk_screen_get_display (screen)),
+        (int) getuid (),
+        mit_cookie,
+        XauFileName ());
 
   g_free (mit_cookie);
 


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fast-user-switch-applet.spec	18 Sep 2007 16:45:18 -0000	1.17
+++ fast-user-switch-applet.spec	18 Sep 2007 18:39:00 -0000	1.18
@@ -6,7 +6,7 @@
 License:        GPLv2+
 Source0:        ftp://download.gnome.org/sources/fast-user-switch-applet/2.18/fast-user-switch-applet-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=402475
-Patch0:         fast-user-switch-applet-2.17.3-username.patch
+Patch0:         fast-user-switch-applet-2.20.0-username.patch
 Patch1:         fast-user-switch-applet-2.17.3-defaults.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=421080
 Patch2:		startx.patch



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:28 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:39:28 -0700
Subject: [pkgdb] compiz-fusion was added for drago01
Message-ID: <200709181839.l8IIdT4Y020893@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package compiz-fusion with summary Collection of Compiz Fusion plugins for Compiz
Warren Togami (wtogami) has approved Package compiz-fusion
Warren Togami (wtogami) has added a Fedora devel branch for compiz-fusion with an owner of drago01
Warren Togami (wtogami) has approved compiz-fusion in Fedora devel
Warren Togami (wtogami) has approved Package compiz-fusion
Warren Togami (wtogami) has set commit to Approved for cvsextras on compiz-fusion (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on compiz-fusion (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on compiz-fusion (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion



From fedora-extras-commits at redhat.com  Tue Sep 18 18:39:30 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 11:39:30 -0700
Subject: [pkgdb] compiz-fusion (Fedora, devel) updated by wtogami
Message-ID: <200709181839.l8IIdU3E019365@app4.fedora.phx.redhat.com>

Warren Togami (wtogami) approved watchbugzilla on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved watchcommits on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved commit on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved build on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved approveacls on compiz-fusion (Fedora devel) for krh
Warren Togami (wtogami) approved checkout on compiz-fusion (Fedora devel) for krh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/compiz-fusion



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:24 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:24 -0400
Subject: rpms/compiz-fusion - New directory
Message-ID: <200709181840.l8IIeORZ016743@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion

Log Message:
Directory /cvs/extras/rpms/compiz-fusion added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:27 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:27 -0400
Subject: rpms/compiz-fusion/devel - New directory
Message-ID: <200709181840.l8IIeRZg016757@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion/devel

Log Message:
Directory /cvs/extras/rpms/compiz-fusion/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:31 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:31 -0400
Subject: rpms/compiz-fusion Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181840.l8IIeVUo016782@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion

Added Files:
	Makefile import.log 
Log Message:
Setup of module compiz-fusion


--- NEW FILE Makefile ---
# Top level Makefile for module compiz-fusion
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:33 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:33 -0400
Subject: rpms/compiz-fusion/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709181840.l8IIeXPF016808@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsf16714/rpms/compiz-fusion/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compiz-fusion


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: compiz-fusion
# $Id: Makefile,v 1.1 2007/09/18 18:40:32 wtogami Exp $
NAME := compiz-fusion
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:40:40 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:40 -0400
Subject: rpms/compiz-fusion-extras - New directory
Message-ID: <200709181840.l8IIeeDg016896@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras

Log Message:
Directory /cvs/extras/rpms/compiz-fusion-extras added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:44 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:44 -0400
Subject: rpms/compiz-fusion-extras/devel - New directory
Message-ID: <200709181840.l8IIeiDA016909@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras/devel

Log Message:
Directory /cvs/extras/rpms/compiz-fusion-extras/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:49 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:49 -0400
Subject: rpms/compiz-fusion-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181840.l8IIengj016965@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras

Added Files:
	Makefile import.log 
Log Message:
Setup of module compiz-fusion-extras


--- NEW FILE Makefile ---
# Top level Makefile for module compiz-fusion-extras
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:40:50 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:50 -0400
Subject: rpms/compiz-fusion-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709181840.l8IIeoxc016983@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvst16829/rpms/compiz-fusion-extras/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compiz-fusion-extras


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: compiz-fusion-extras
# $Id: Makefile,v 1.1 2007/09/18 18:40:49 wtogami Exp $
NAME := compiz-fusion-extras
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:40:58 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:40:58 -0400
Subject: rpms/grsync - New directory
Message-ID: <200709181840.l8IIew5v017037@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync

Log Message:
Directory /cvs/extras/rpms/grsync added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:02 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:02 -0400
Subject: rpms/grsync/devel - New directory
Message-ID: <200709181841.l8IIf2Co017048@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync/devel

Log Message:
Directory /cvs/extras/rpms/grsync/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:07 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:07 -0400
Subject: rpms/grsync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181841.l8IIf7D0017080@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync

Added Files:
	Makefile import.log 
Log Message:
Setup of module grsync


--- NEW FILE Makefile ---
# Top level Makefile for module grsync
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:10 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:10 -0400
Subject: rpms/grsync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709181841.l8IIfAjt017102@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsL17004/rpms/grsync/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grsync


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: grsync
# $Id: Makefile,v 1.1 2007/09/18 18:41:08 wtogami Exp $
NAME := grsync
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:41:42 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:42 -0400
Subject: rpms/xorg-x11-drv-avivo - New directory
Message-ID: <200709181841.l8IIfgmj017324@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo

Log Message:
Directory /cvs/extras/rpms/xorg-x11-drv-avivo added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:47 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:47 -0400
Subject: rpms/xorg-x11-drv-avivo/devel - New directory
Message-ID: <200709181841.l8IIfl0H017338@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo/devel

Log Message:
Directory /cvs/extras/rpms/xorg-x11-drv-avivo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:49 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:49 -0400
Subject: rpms/xorg-x11-drv-avivo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709181841.l8IIfnAP017363@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo

Added Files:
	Makefile import.log 
Log Message:
Setup of module xorg-x11-drv-avivo


--- NEW FILE Makefile ---
# Top level Makefile for module xorg-x11-drv-avivo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 18 18:41:51 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 18 Sep 2007 14:41:51 -0400
Subject: rpms/xorg-x11-drv-avivo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709181841.l8IIfp74017381@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsV17285/rpms/xorg-x11-drv-avivo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xorg-x11-drv-avivo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xorg-x11-drv-avivo
# $Id: Makefile,v 1.1 2007/09/18 18:41:49 wtogami Exp $
NAME := xorg-x11-drv-avivo
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 fedora-extras-commits at redhat.com  Tue Sep 18 18:48:16 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 14:48:16 -0400
Subject: rpms/sugar/OLPC-2 sources,1.55,1.56 sugar.spec,1.66,1.67
Message-ID: <200709181848.l8IImGe7017487@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17456

Modified Files:
	sources sugar.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	17 Sep 2007 23:05:41 -0000	1.55
+++ sources	18 Sep 2007 18:47:43 -0000	1.56
@@ -1 +1 @@
-ccc378990246b007e967fb5301c685b4  sugar-0.65-gitb8ce5083b7.tar.bz2
+8a8612c93c6e9a8283f002f10a48665c  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sugar.spec	17 Sep 2007 23:14:14 -0000	1.66
+++ sugar.spec	18 Sep 2007 18:47:43 -0000	1.67
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070917git
+%define alphatag 20070918git
 %define commitid b8ce5083b7
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.51.%{alphatag}b8ce5083b7
+Release: 0.52.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.51.20070917gitb8ce5083b7
 - New snapshot
 - Add a patch to set the jabber server to jabber.laptop.org



From fedora-extras-commits at redhat.com  Tue Sep 18 18:50:54 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 18 Sep 2007 14:50:54 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 sugar-datastore.spec, 1.27, 1.28
Message-ID: <200709181850.l8IIosPb017622@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17585

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 19:42:28 -0000	1.26
+++ .cvsignore	18 Sep 2007 18:50:22 -0000	1.27
@@ -1 +1 @@
-sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2
+sugar-datastore-0.2.2-git48ab782a01.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Sep 2007 19:42:28 -0000	1.26
+++ sources	18 Sep 2007 18:50:22 -0000	1.27
@@ -1 +1 @@
-d2eb27bb21ceea2ac55b718547160803  sugar-datastore-0.2.2-gitea13f75d6a.tar.bz2
+442e68e24e4d8ae5dd161733efb66852  sugar-datastore-0.2.2-git48ab782a01.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sugar-datastore.spec	14 Sep 2007 19:42:28 -0000	1.27
+++ sugar-datastore.spec	18 Sep 2007 18:50:22 -0000	1.28
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070914git
-%define commitid ea13f75d6a
+%define alphatag 20070918git
+%define commitid 48ab782a01
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.23.%{alphatag}ea13f75d6a
+Release: 0.24.%{alphatag}48ab782a01
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
+- New snapshot
+
 * Fri Sep 14 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.23.20070914gitea13f75d6a
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 18 19:03:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Sep 2007 15:03:37 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.34,1.35
Message-ID: <200709181903.l8IJ3bIE023916@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- em8300-kmod.spec	22 Aug 2007 05:57:16 -0000	1.34
+++ em8300-kmod.spec	18 Sep 2007 19:03:04 -0000	1.35
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.124.rc3.git2.fc8}
+%{!?kversion: %define kversion 2.6.23-0.186.rc6.git7.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.
+
 * Wed Aug 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.16.3-5
 - 0.16.3, build for kernel 2.6.23-0.124.rc3.git2.fc8.
 - Fix build with recent 2.6.23 rc kernels.



From fedora-extras-commits at redhat.com  Tue Sep 18 19:07:09 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 18 Sep 2007 15:07:09 -0400
Subject: rpms/php/devel php-5.2.4-embed.patch,1.1,1.2 php.spec,1.148,1.149
Message-ID: <200709181907.l8IJ7992024109@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24047

Modified Files:
	php-5.2.4-embed.patch php.spec 
Log Message:
- fix embedded SAPI build


php-5.2.4-embed.patch:

Index: php-5.2.4-embed.patch
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php-5.2.4-embed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.2.4-embed.patch	16 Sep 2007 10:14:01 -0000	1.1
+++ php-5.2.4-embed.patch	18 Sep 2007 19:06:36 -0000	1.2
@@ -1,39 +1,12 @@
 --- php-5.2.4/sapi/embed/config.m4.embed
 +++ php-5.2.4/sapi/embed/config.m4
-@@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
+@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then
    case "$PHP_EMBED" in
      yes|shared)
        PHP_EMBED_TYPE=shared
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
-+      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(INSTALL) -m 0755 libs/libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir); \$(LN_S) libphp$(PHP_MAJOR_VERSION).$PHP_VERSION.$SHLIB_DL_SUFFIX_NAME \$(INSTALL_ROOT)\$(libdir)/libphp$(PHP_MAJOR_VERSION).$SHLIB_DL_SUFFIX_NAME"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION)"
++      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
        ;;
      static)
        PHP_EMBED_TYPE=static
---- php-5.2.4/Makefile.global.embed
-+++ php-5.2.4/Makefile.global
-@@ -14,7 +14,7 @@ all: $(all_targets) 
- build-modules: $(PHP_MODULES)
- 
- libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -release $(PHP_VERSION) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
- 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
- 
- libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,13 +25,9 @@ install: $(all_targets) $(install_target
- install-sapi: $(OVERALL_TARGET)
- 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
- 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
--		for i in 0.0.0 0.0 0; do \
--			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
--				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
--				break; \
--			fi; \
--		done; \
-+	- at if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME) -a \
-+		-r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
-+		$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(PHP_VERSION).$(SHLIB_DL_SUFFIX_NAME) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
- 	fi
- 	@$(INSTALL_IT)
- 


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- php.spec	16 Sep 2007 10:14:01 -0000	1.148
+++ php.spec	18 Sep 2007 19:06:36 -0000	1.149
@@ -643,7 +643,8 @@
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
        $RPM_BUILD_ROOT%{_bindir}/{phptar} \
-       $RPM_BUILD_ROOT%{_datadir}/pear
+       $RPM_BUILD_ROOT%{_datadir}/pear \
+       $RPM_BUILD_ROOT%{_libdir}/libphp5.la
 
 # Remove irrelevant docs
 rm -f README.{Zeus,QNX,CVS-RULES}



From fedora-extras-commits at redhat.com  Tue Sep 18 19:07:15 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Tue, 18 Sep 2007 15:07:15 -0400
Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709181907.l8IJ7FHm024124@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23992/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion-extras.spec 
Log Message:


Initial Import



--- NEW FILE compiz-fusion-extras.spec ---
%define plugins addhelper bench crashhandler cubecaps cubereflex extrawm fadedesktop firepaint gears goto-viewport group mblur reflex scalefilter showdesktop splash trailfocus widget

Name: compiz-fusion-extras
Version: 0.5.2       
Release: 5%{?dist}
Summary: Additional Compiz Fusion plugins for Compiz      

Group: User Interface/Desktops        
License: GPLv2+       
URL: http://compiz-fusion.org            
Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{version}.tar.bz2   
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x ppc64

BuildRequires: compiz-fusion-devel = %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: gettext-devel
BuildRequires: perl(XML::Parser)
BuildRequires: mesa-libGLU-devel
BuildRequires: libXrender-devel
BuildRequires: GConf2
BuildRequires: libjpeg-devel
BuildRequires: gawk
Requires: compiz-fusion = %{version} 


%description
The Compiz Fusion Project brings 3D desktop visual effects that improve
usability of the X Window System and provide increased productivity
though plugins and themes contributed by the community giving a
rich desktop experience.

This package contains additional plugins from the Compiz Fusion Project

%package gnome
Summary: Compiz Fusion Extras gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for
Compiz Fusion Extras


%prep
%setup -q -n compiz-fusion-plugins-extra-%{version}

%build
%configure --enable-schemas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a

%find_lang compiz-fusion-plugins-extra


%post gnome
export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`

for p in in %{plugins}; do
%{_bindir}/gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
done

%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
  done
fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
  done
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f compiz-fusion-plugins-extra.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml
%{_datadir}/compiz/reflection.png

%files gnome
%defattr(-,root,root,-)
%{_sysconfdir}/gconf/schemas/*.schemas

%changelog
* Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
- Fix gconf schemas install (RH #53692)
- Some build fixes

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-4
- Remove redundant buildrequires

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-3
- BuildRequire gawk

* Wed Aug 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-2
- Fix gconf schemas (un)installation

* Sat Aug 18 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-1
- Initial build




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:40:49 -0000	1.1
+++ .cvsignore	18 Sep 2007 19:06:43 -0000	1.2
@@ -0,0 +1 @@
+compiz-fusion-plugins-extra-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:40:49 -0000	1.1
+++ sources	18 Sep 2007 19:06:43 -0000	1.2
@@ -0,0 +1 @@
+866a4e5decb8b40df6bd0161dbd24a53  compiz-fusion-plugins-extra-0.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:08:04 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 15:08:04 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.7-ppp.patch, 1.1,
	1.2 kdenetwork.spec, 1.102, 1.103
Message-ID: <200709181908.l8IJ84t2024232@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24209

Modified Files:
	kdenetwork-3.5.7-ppp.patch kdenetwork.spec 
Log Message:
* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
- fix ppp patch


kdenetwork-3.5.7-ppp.patch:

Index: kdenetwork-3.5.7-ppp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork-3.5.7-ppp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdenetwork-3.5.7-ppp.patch	17 Sep 2007 23:16:45 -0000	1.1
+++ kdenetwork-3.5.7-ppp.patch	18 Sep 2007 19:08:01 -0000	1.2
@@ -1,35 +1,39 @@
 diff -up kdenetwork-3.5.7/kppp/pppstats.cpp.ppp kdenetwork-3.5.7/kppp/pppstats.cpp
---- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 05:12:34.000000000 -0500
-+++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-08-29 09:15:50.000000000 -0400
-@@ -69,6 +69,7 @@
+--- kdenetwork-3.5.7/kppp/pppstats.cpp.ppp	2006-03-17 04:12:34.000000000 -0600
++++ kdenetwork-3.5.7/kppp/pppstats.cpp	2007-09-18 13:49:36.000000000 -0500
+@@ -69,6 +69,9 @@
   #ifndef HAVE_NET_IF_PPP_H
    #ifdef HAVE_LINUX_IF_PPP_H
     #include <linux/if.h>
-+   #include <linux/ppp_defs.h>
++   #ifndef aligned_u64
++    #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++   #endif
     #include <linux/if_ppp.h>
    #endif
   #else
-diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
---- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 04:20:37.000000000 -0400
-+++ kdenetwork-3.5.7/kppp/configure.in.in	2007-08-29 09:13:21.000000000 -0400
-@@ -26,6 +26,8 @@ AC_TRY_LINK([
-   #ifndef STREAMS 
- 
-     #if defined(linux)
-+      #include <linux/if.h>
-+      #include <linux/ppp_defs.h>
-       #include <linux/if_ppp.h>
-     #else
-       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
 diff -up kdenetwork-3.5.7/kppp/opener.cpp.ppp kdenetwork-3.5.7/kppp/opener.cpp
---- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 04:20:37.000000000 -0400
-+++ kdenetwork-3.5.7/kppp/opener.cpp	2007-08-29 09:14:29.000000000 -0400
-@@ -69,6 +69,8 @@ extern "C" int _Precvmsg(int, void*, int
+--- kdenetwork-3.5.7/kppp/opener.cpp.ppp	2005-09-10 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/opener.cpp	2007-09-18 13:46:39.000000000 -0500
+@@ -69,6 +69,9 @@ extern "C" int _Precvmsg(int, void*, int
  
  #ifndef HAVE_NET_IF_PPP_H
  #  ifdef HAVE_LINUX_IF_PPP_H
-+#    include <linux/if.h>
-+#    include <linux/ppp_defs.h>
++#    ifndef aligned_u64
++#      define aligned_u64 unsigned long long __attribute__((aligned(8)))
++#    endif
  #    include <linux/if_ppp.h>
  #  endif
  #else
+diff -up kdenetwork-3.5.7/kppp/configure.in.in.ppp kdenetwork-3.5.7/kppp/configure.in.in
+--- kdenetwork-3.5.7/kppp/configure.in.in.ppp	2005-09-10 03:20:37.000000000 -0500
++++ kdenetwork-3.5.7/kppp/configure.in.in	2007-09-18 13:46:39.000000000 -0500
+@@ -26,6 +26,9 @@ AC_TRY_LINK([
+   #ifndef STREAMS 
+ 
+     #if defined(linux)
++      #ifndef aligned_u64
++        #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++      #endif
+       #include <linux/if_ppp.h>
+     #else
+       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdenetwork.spec	17 Sep 2007 23:16:45 -0000	1.102
+++ kdenetwork.spec	18 Sep 2007 19:08:01 -0000	1.103
@@ -19,7 +19,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -426,6 +426,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-6
+- fix ppp patch
+
 * Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-5
 - +Requires: jasper (kopete yahoo support)
 



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:00 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Tue, 18 Sep 2007 15:11:00 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709181911.l8IJB0hm024435@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24397/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiz-fusion.spec 
Log Message:


Initial Import



--- NEW FILE compiz-fusion.spec ---
%define plugins colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds

Name: compiz-fusion
Version: 0.5.2       
Release: 5%{?dist}
Summary: Collection of Compiz Fusion plugins for Compiz      

Group: User Interface/Desktops        
License: GPLv2+       
URL: http://compiz-fusion.org            
Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{version}.tar.bz2   
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# libdrm is not available on these arches
ExcludeArch: s390 s390x ppc64

BuildRequires: compiz-devel = %{version}
BuildRequires: compiz-bcop >= %{version}
BuildRequires: gettext-devel
BuildRequires: perl(XML::Parser)
BuildRequires: mesa-libGLU-devel
BuildRequires: libXrender-devel
BuildRequires: GConf2
BuildRequires: libjpeg-devel
BuildRequires: gawk
Requires: compiz = %{version}      



%description
The Compiz Fusion Project brings 3D desktop visual effects that improve
usability of the X Window System and provide increased productivity
though plugins and themes contributed by the community giving a
rich desktop experience


%package gnome
Summary: Compiz Fusion gnome configuration
Group: User Interface/Desktops
Requires: %{name} = %{version}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description gnome
This package contains the GNOME configuration for Compiz
Fusion

%package devel
Group: Development/Libraries
Summary: Development files for Compiz-Fusion
Requires: compiz-devel >= %{version}
Requires: %{name} = %{version}

%description devel
This package contain development files required for developing other plugins


%prep
%setup -q -n %{name}-plugins-main-%{version}

%build
%configure --enable-schemas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a

#something in mock is broken?
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_bindir}/install -c -m 644 compiz-text.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/compiz-text.pc

%find_lang %{name}-plugins-main


%post gnome
export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
for p in in %{plugins}; do
%{_bindir}/gconftool-2 --makefile-install-rule \
	%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
done

%pre gnome
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
  done
fi

%preun gnome
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
  for p in in %{plugins}; do
	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
  done
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}-plugins-main.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_libdir}/compiz/*.so
%{_datadir}/compiz/*.xml

%files  gnome
%defattr(-,root,root,-)
%{_sysconfdir}/gconf/schemas/*.schemas

%files devel
%defattr(-,root,root,-)
%{_includedir}/compiz/text.h
%{_libdir}/pkgconfig/compiz-text.pc


%changelog
* Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
- Fix gconf schemas install (RH #53692)

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-4
- Remove redundant buildrequires

* Fri Aug 24 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-3
- BuildRequire gawk

* Wed Aug 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-2
- Fix gconf schemas (un)installation

* Sat Aug 18 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:40:32 -0000	1.1
+++ .cvsignore	18 Sep 2007 19:10:29 -0000	1.2
@@ -0,0 +1 @@
+compiz-fusion-plugins-main-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:40:32 -0000	1.1
+++ sources	18 Sep 2007 19:10:29 -0000	1.2
@@ -0,0 +1 @@
+cb5703d8e59697dd6c7b075c483e81cc  compiz-fusion-plugins-main-0.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:01 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Tue, 18 Sep 2007 12:11:01 -0700
Subject: [pkgdb] control-center (Fedora, devel) updated by toshio
Message-ID: <200709181911.l8IJB1Dc031560@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of control-center in Fedora devel to ctrl-center-team
Toshio Ernie Kuratomi (toshio) approved watchbugzilla on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved watchcommits on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved commit on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved build on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved approveacls on control-center (Fedora devel) for rstrode
Toshio Ernie Kuratomi (toshio) approved checkout on control-center (Fedora devel) for rstrode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From fedora-extras-commits at redhat.com  Tue Sep 18 19:11:01 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (a.badger))
Date: Tue, 18 Sep 2007 12:11:01 -0700
Subject: [pkgdb] control-center (Fedora, 7) updated by toshio
Message-ID: <200709181911.l8IJB2QI031576@app3.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) changed owner of control-center in Fedora 7 to ctrl-center-team
Toshio Ernie Kuratomi (toshio) approved watchbugzilla on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved watchcommits on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved commit on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved build on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved approveacls on control-center (Fedora 7) for rstrode
Toshio Ernie Kuratomi (toshio) approved checkout on control-center (Fedora 7) for rstrode

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/control-center



From fedora-extras-commits at redhat.com  Tue Sep 18 19:17:40 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Tue, 18 Sep 2007 15:17:40 -0400
Subject: comps/po sr.po,1.6,1.7
Message-ID: <200709181917.l8IJHehe024624@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24602

Modified Files:
	sr.po 
Log Message:
Updated Serbian translation


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sr.po	17 Sep 2007 19:22:12 -0000	1.6
+++ sr.po	18 Sep 2007 19:17:10 -0000	1.7
@@ -9,7 +9,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-09 00:55-0000\n"
+"PO-Revision-Date: 2007-09-18 20:14-0000\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"
@@ -840,7 +840,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 msgid "Somali Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -1072,7 +1072,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "?????????????? ???????????? ???????????????????????? ?? ???????????????????? ??????????????"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????? ???? ????????????"



From fedora-extras-commits at redhat.com  Tue Sep 18 19:19:25 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWlsb8WhIEtvbWFyxI1ldmnEhw==?= (kmilos))
Date: Tue, 18 Sep 2007 15:19:25 -0400
Subject: comps/po sr@Latn.po,1.6,1.7
Message-ID: <200709181919.l8IJJPoi024778@cvs-int.fedora.redhat.com>

Author: kmilos

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24751

Modified Files:
	sr at Latn.po 
Log Message:
Updated Serbian Latin translation


Index: sr at Latn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at Latn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sr at Latn.po	17 Sep 2007 19:22:12 -0000	1.6
+++ sr at Latn.po	18 Sep 2007 19:18:54 -0000	1.7
@@ -9,7 +9,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-09 00:58-0000\n"
+"PO-Revision-Date: 2007-09-18 20:14-0000\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"
@@ -840,7 +840,7 @@
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
 msgid "Somali Support"
-msgstr "Podr??ka za somali"
+msgstr "Podr??ka za somalski"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -1072,7 +1072,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Stariji paketi batmapiranih i vektorskih fontova"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Podr??ka za somali"



From fedora-extras-commits at redhat.com  Tue Sep 18 19:21:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 15:21:48 -0400
Subject: rpms/gnome-games/devel sources,1.71,1.72
Message-ID: <200709181921.l8IJLmAw024875@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	sources 
Log Message:
grr



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	18 Sep 2007 18:15:42 -0000	1.71
+++ sources	18 Sep 2007 19:21:15 -0000	1.72
@@ -1 +1 @@
-9b30bc49e65b00fe56e3c6d7238a2e2a  gnome-games-2.20.0.1.tar.bz2
+b852cfe1f65c076b8af4fa9c7383a35f  gnome-games-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 19:23:51 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 18 Sep 2007 15:23:51 -0400
Subject: devel/pirut .cvsignore, 1.69, 1.70 pirut.spec, 1.72, 1.73 sources, 
	1.71, 1.72
Message-ID: <200709181923.l8IJNpdW025061@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pirut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24988

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
- Make reboot vs warnings clearer (#292011)
- Select on row activation in lists (#292261)
- Don't show the (truncated) URL being downloaded (#292271)
- Fix handling of already mounted volumes
- Search improvements (skvidal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/pirut/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	12 Sep 2007 19:52:44 -0000	1.69
+++ .cvsignore	18 Sep 2007 19:23:19 -0000	1.70
@@ -1 +1 @@
-pirut-1.3.18.tar.gz
+pirut-1.3.19.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/devel/pirut/pirut.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pirut.spec	12 Sep 2007 19:52:44 -0000	1.72
+++ pirut.spec	18 Sep 2007 19:23:19 -0000	1.73
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.18
+Version: 1.3.19
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -76,6 +76,13 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
+- Make reboot vs warnings clearer (#292011)
+- Select on row activation in lists (#292261)
+- Don't show the (truncated) URL being downloaded (#292271)
+- Fix handling of already mounted volumes
+- Search improvements (skvidal)
+
 * Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
 - Add multiple selection in package view (#266141)
 - Make things like rpmnew/rpmsave more obvious to the user rather 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/pirut/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	12 Sep 2007 19:52:44 -0000	1.71
+++ sources	18 Sep 2007 19:23:19 -0000	1.72
@@ -1 +1 @@
-55618b3def8243c3d7aed4efd25a674b  pirut-1.3.18.tar.gz
+f2b2b5821814c6d78ce0ee92ccc5226e  pirut-1.3.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 19:31:52 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 18 Sep 2007 15:31:52 -0400
Subject: rpms/dclib/devel 01-dclib-0.3.10-remove-cmd4.patch, NONE,
	1.1 02-dclib-0.3.10-use-gnulib-md5.patch, NONE,
	1.1 03-dclib-0.3.10-use-new-md5-api.patch, NONE,
	1.1 04-dclib-0.3.10-gnulib-md5-configure-test.patch, NONE,
	1.1 dclib.spec, 1.12, 1.13 dclib-0.3.8-cconfig-use-cfile.patch,
	1.1, NONE
Message-ID: <200709181931.l8IJVqCg025255@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25221

Modified Files:
	dclib.spec 
Added Files:
	01-dclib-0.3.10-remove-cmd4.patch 
	02-dclib-0.3.10-use-gnulib-md5.patch 
	03-dclib-0.3.10-use-new-md5-api.patch 
	04-dclib-0.3.10-gnulib-md5-configure-test.patch 
Removed Files:
	dclib-0.3.8-cconfig-use-cfile.patch 
Log Message:
* Tue Sep 18 2007 Luke Macken <lmacken at redhat.com> 0.3.10-2
- Remove RSA MD5 implementation in favor of the gnulib implementation.  Patches
  taken from upstream ticket:
  https://sourceforge.net/tracker/?func=detail&atid=897767&aid=1796674&group_id
=181579



01-dclib-0.3.10-remove-cmd4.patch:

--- NEW FILE 01-dclib-0.3.10-remove-cmd4.patch ---
diff -Naur dclib-0.3.10.orig/dclib/core/cmd4.cpp dclib-0.3.10/dclib/core/cmd4.cpp
--- dclib-0.3.10.orig/dclib/core/cmd4.cpp	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd4.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,286 +0,0 @@
-/*
- **********************************************************************
- ** md4.c							     **
- ** RSA Data Security, Inc. MD4 Message Digest Algorithm	     **
- ** Created: 2/17/90 RLR					     **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version		     **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **								     **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD4 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.					     **
- **								     **
- ** License is also granted to make and use derivative works	     **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD4 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.	     **
- **								     **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **								     **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.				     **
- **********************************************************************
- */
-
-#include <string.h>
-#include "cmd4.h"
-
-static unsigned char PADDING[64] = {
-  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/* F, G and H are basic MD4 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG and HH are MD4 transformations for rounds 1, 2 and 3 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s)  {(a) += F ((b), (c), (d)) + (x);  (a) = ROTATE_LEFT ((a), (s));}
-#define GG(a, b, c, d, x, s)   {(a) += G ((b), (c), (d)) + (x) + (UINT4)013240474631;    (a) = ROTATE_LEFT ((a), (s));}
-#define HH(a, b, c, d, x, s) {(a) += H ((b), (c), (d)) + (x) + (UINT4)015666365641; (a) = ROTATE_LEFT ((a), (s));}
-
-MD4::MD4()
-{
-	init();
-}
-
-void MD4::init()
-{
-  mdContext.i[0] = mdContext.i[1] = (UINT4)0;
-
-  /* Load magic initialization constants.
-   */
-  mdContext.buf[0] = (UINT4)0x67452301;
-  mdContext.buf[1] = (UINT4)0xefcdab89;
-  mdContext.buf[2] = (UINT4)0x98badcfe;
-  mdContext.buf[3] = (UINT4)0x10325476;
-}
-
-void MD4::update(FILE *file){
-
-  unsigned char buffer[1024*1024];
-  int len;
-
-  while ( (len=fread(buffer, 1, 1024*1024, file)) > 0)
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-void MD4::update(unsigned char *inBuf,unsigned int inLen)
-{
-  UINT4 in[16];
-  int mdi;
-  unsigned int i, ii;
-
-  /* compute number of bytes mod 64 */
-  mdi = (int)((mdContext.i[0] >> 3) & 0x3F);
-
-  /* update number of bits */
-  if ((mdContext.i[0] + ((UINT4)inLen << 3)) < mdContext.i[0])
-    mdContext.i[1]++;
-  mdContext.i[0] += ((UINT4)inLen << 3);
-  mdContext.i[1] += ((UINT4)inLen >> 29);
-
-  while (inLen--) {
-    /* add new character to buffer, increment mdi */
-    mdContext.in[mdi++] = *inBuf++;
-
-    /* transform if necessary */
-    if (mdi == 0x40) {
-      for (i = 0, ii = 0; i < 16; i++, ii += 4)
-	in[i] = (((UINT4)mdContext.in[ii+3]) << 24) |
-		(((UINT4)mdContext.in[ii+2]) << 16) |
-		(((UINT4)mdContext.in[ii+1]) << 8) |
-		((UINT4)mdContext.in[ii]);
-      transform (mdContext.buf, in);
-      mdi = 0;
-    }
-  }
-}
-
-void MD4::finalize ()
-{
-  UINT4 in[16];
-  int mdi;
-  unsigned int i, ii;
-  unsigned int padLen;
-
-  /* save number of bits */
-  in[14] = mdContext.i[0];
-  in[15] = mdContext.i[1];
-
-  /* compute number of bytes mod 64 */
-  mdi = (int)((mdContext.i[0] >> 3) & 0x3F);
-
-  /* pad out to 56 mod 64 */
-  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
-  update ( PADDING, padLen);
-
-  /* append length in bits and transform */
-  for (i = 0, ii = 0; i < 14; i++, ii += 4)
-    in[i] = (((UINT4)mdContext.in[ii+3]) << 24) |
-	    (((UINT4)mdContext.in[ii+2]) << 16) |
-	    (((UINT4)mdContext.in[ii+1]) << 8) |
-	    ((UINT4)mdContext.in[ii]);
-  transform (mdContext.buf, in);
-  /* store buffer in digest */
-  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-    mdContext.digest[ii] = (unsigned char)(mdContext.buf[i] & 0xFF);
-
-
-    mdContext.digest[ii+1] =
-      (unsigned char)((mdContext.buf[i] >> 8) & 0xFF);
-    mdContext.digest[ii+2] =
-      (unsigned char)((mdContext.buf[i] >> 16) & 0xFF);
-    mdContext.digest[ii+3] =
-      (unsigned char)((mdContext.buf[i] >> 24) & 0xFF);
-  }
-}
-
-/* Basic MD4 step. Transform buf based on in.
- */
-void MD4::transform (UINT4 *buf,UINT4 *in)
-{
-  UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
-  /* Round 1 */
-  FF (a, b, c, d, in[ 0],  3);
-  FF (d, a, b, c, in[ 1],  7);
-  FF (c, d, a, b, in[ 2], 11);
-  FF (b, c, d, a, in[ 3], 19);
-  FF (a, b, c, d, in[ 4],  3);
-  FF (d, a, b, c, in[ 5],  7);
-  FF (c, d, a, b, in[ 6], 11);
-  FF (b, c, d, a, in[ 7], 19);
-  FF (a, b, c, d, in[ 8],  3);
-  FF (d, a, b, c, in[ 9],  7);
-  FF (c, d, a, b, in[10], 11);
-  FF (b, c, d, a, in[11], 19);
-  FF (a, b, c, d, in[12],  3);
-  FF (d, a, b, c, in[13],  7);
-  FF (c, d, a, b, in[14], 11);
-  FF (b, c, d, a, in[15], 19);
-
-  /* Round 2 */
-  GG (a, b, c, d, in[ 0],  3);
-  GG (d, a, b, c, in[ 4],  5);
-  GG (c, d, a, b, in[ 8],  9);
-  GG (b, c, d, a, in[12], 13);
-  GG (a, b, c, d, in[ 1],  3);
-  GG (d, a, b, c, in[ 5],  5);
-  GG (c, d, a, b, in[ 9],  9);
-  GG (b, c, d, a, in[13], 13);
-  GG (a, b, c, d, in[ 2],  3);
-  GG (d, a, b, c, in[ 6],  5);
-  GG (c, d, a, b, in[10],  9);
-  GG (b, c, d, a, in[14], 13);
-  GG (a, b, c, d, in[ 3],  3);
-  GG (d, a, b, c, in[ 7],  5);
-  GG (c, d, a, b, in[11],  9);
-  GG (b, c, d, a, in[15], 13);
-
-  /* Round 3 */
-  HH (a, b, c, d, in[ 0],  3);
-  HH (d, a, b, c, in[ 8],  9);
-  HH (c, d, a, b, in[ 4], 11);
-  HH (b, c, d, a, in[12], 15);
-  HH (a, b, c, d, in[ 2],  3);
-  HH (d, a, b, c, in[10],  9);
-  HH (c, d, a, b, in[ 6], 11);
-  HH (b, c, d, a, in[14], 15);
-  HH (a, b, c, d, in[ 1],  3);
-  HH (d, a, b, c, in[ 9],  9);
-  HH (c, d, a, b, in[ 5], 11);
-  HH (b, c, d, a, in[13], 15);
-  HH (a, b, c, d, in[ 3],  3);
-  HH (d, a, b, c, in[11],  9);
-  HH (c, d, a, b, in[ 7], 11);
-  HH (b, c, d, a, in[15], 15);
-
-  buf[0] += a;
-  buf[1] += b;
-  buf[2] += c;
-  buf[3] += d;
-}
-
-/** */
-unsigned char *MD4::raw_digest()
-{
-
-  unsigned char *s = new unsigned char[16];
-/*
-  if (!finalized){
-    cerr << "MD4::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-*/
-  memcpy(s, mdContext.digest, 16);
-  return s;
-}
-
-/** */
-void MD4::raw_digest( unsigned char * s )
-{
-/*
-  if (!finalized){
-    cerr << "MD4::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-*/
-  memcpy(s, mdContext.digest, 16);
-}
-
-/** */
-CString MD4::hex_digest( unsigned char * p )
-{
-	CString s;
-	int i;
-	char c[3];
-	unsigned char *dig;
-
-/*
-  if (!finalized){
-    cerr << "MD4::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return "";
-  }
-*/
-
-	if ( p == 0 )
-		dig = mdContext.digest;
-	else
-		dig = p;
-
-	for (i=0; i<16; i++)
-	{
-		sprintf(c, "%02x", dig[i]);
-		c[2] = 0;
-		s += c;
-	}
-
-	return s;
-}
diff -Naur dclib-0.3.10.orig/dclib/core/cmd4.h dclib-0.3.10/dclib/core/cmd4.h
--- dclib-0.3.10.orig/dclib/core/cmd4.h	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd4.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-/*
- **********************************************************************
- ** md4.h -- Header file for implementation of MD4		     **
- ** RSA Data Security, Inc. MD4 Message Digest Algorithm	     **
- ** Created: 2/17/90 RLR					     **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version 	     **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **								     **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD4 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.					     **
- **								     **
- ** License is also granted to make and use derivative works	     **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD4 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.	     **
- **								     **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **								     **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.				     **
- **********************************************************************
- */
-
-#ifndef CMD4_H
-#define CMD4_H
-
-#include <stdio.h>
-#include <dclib/dcos.h>
-#include <dclib/core/cstring.h>
-
-#ifndef WIN32
-#include <fstream>
-#include <iostream>
-using namespace std;
-#else
-#include <fstream.h>
-#include <iostream.h>
-#endif
-
-/* typedef a 32 bit type */
-typedef unsigned long int UINT4;
-
-/* Data structure for MD4 (Message Digest) computation */
-typedef struct {
-  UINT4 i[2];			/* number of _bits_ handled mod 2^64 */
-  UINT4 buf[4]; 				   /* scratch buffer */
-  unsigned char in[64]; 			     /* input buffer */
-  unsigned char digest[16];	/* actual digest after MD4Final call */
-} MD4_CTX;
-
-class MD4 {
-
-public:
-	MD4();
-	virtual ~MD4() {};
-	void init ();
-	void update(unsigned char *inBuf,unsigned int inLen);
-	void  update     (FILE *file);
-	void finalize ();
-
-	unsigned char *raw_digest ();  // digest as a 16-byte binary array
-	void raw_digest( unsigned char * s );  // digest as a 16-byte binary array
-
-	CString hex_digest(  unsigned char * p = 0 );  // digest as a 33-byte ascii-hex string
-private:
-	void transform (UINT4 *buf,UINT4 *in);
-	MD4_CTX mdContext;
-};
-
-#endif
diff -Naur dclib-0.3.10.orig/dclib/core/Makefile.am dclib-0.3.10/dclib/core/Makefile.am
--- dclib-0.3.10.orig/dclib/core/Makefile.am	2007-09-18 10:24:40.000000000 +0100
+++ dclib-0.3.10/dclib/core/Makefile.am	2007-09-18 10:25:39.000000000 +0100
@@ -8,7 +8,7 @@
 cdir.cpp cdir.h cfile.cpp cfile.h che3.cpp che3.h \
 clist.cpp clist.h clisten.cpp \
 clisten.h clogfile.cpp clogfile.h cmanager.cpp cmanager.h \
-cmd4.cpp cmd4.h cmd5.cpp cmd5.h cobject.cpp cobject.h \
+cmd5.cpp cmd5.h cobject.cpp cobject.h \
 cplugin.cpp cplugin.h csingleton.cpp csingleton.h \
 csocket.cpp csocket.h cssl.cpp cssl.h cstring.cpp \
 cstring.h cstringlist.cpp cstringlist.h cthread.cpp \
@@ -25,7 +25,7 @@
 library_includedir=$(includedir)/dclib/core
 library_include_HEADERS = casyncdns.h cbase32.h cbase64.h cbytearray.h cbz.h ccallback.h \
 cconnection.h cdir.h cfile.h che3.h clist.h \
-clisten.h clogfile.h cmanager.h cmd4.h cmd5.h cobject.h \
+clisten.h clogfile.h cmanager.h cmd5.h cobject.h \
 cplugin.h csingleton.h csocket.h cssl.h cstring.h \
 cstringlist.h cthread.h cxml.h filecopy.h types.h \
 platform.h czlib.h

02-dclib-0.3.10-use-gnulib-md5.patch:

--- NEW FILE 02-dclib-0.3.10-use-gnulib-md5.patch ---
--- dclib-0.3.10.orig/dclib/core/cmd5.h	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd5.h	2007-09-18 13:20:32.000000000 +0100
@@ -1,124 +1,124 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
+/* Declaration of functions and data types used for MD5 sum computing
+   library functions.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+      Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5.H - header file for MD5C.C
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-#ifndef CMD5_H
-#define CMD5_H
+#ifndef _MD5_H
+#define _MD5_H 1
 
 #include <stdio.h>
-#include <dclib/dcos.h>
-#include <dclib/core/cstring.h>
-
-#ifndef WIN32
-#include <fstream>
-#include <iostream>
-using namespace std;
-#else
-#include <fstream.h>
-#include <iostream.h>
-#endif
+#include <stdint.h>
 
-class CMD5 {
-
-public:
-// methods for controlled operation:
-  CMD5              ();  // simple initializer
-  virtual ~CMD5() {};
-  void  update     (unsigned char *input, unsigned int input_length);
-  void  update     (istream& stream);
-  void  update     (FILE *file);
-  void  update     (ifstream& stream);
-  void  finalize   ();
-
-// constructors for special circumstances.  All these constructors finalize
-// the MD5 context.
-  CMD5              (unsigned char *string); // digest string, finalize
-  CMD5              (istream& stream);       // digest stream, finalize
-  CMD5              (FILE *file);            // digest file, close, finalize
-  CMD5              (ifstream& stream);      // digest stream, close, finalize
-
-// methods to acquire finalized result
-  unsigned char    *raw_digest ();  // digest as a 16-byte binary array
-  CString           hex_digest ();  // digest as a 33-byte ascii-hex string
-  friend ostream&   operator<< (ostream&, CMD5 context);
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
 
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min)					\
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
 
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
 
-private:
-
-// first, some types:
-  typedef unsigned       int uint4; // assumes integer is 4 words long
-  typedef unsigned short int uint2; // assumes short integer is 2 words long
-  typedef unsigned      char uint1; // assumes char is 1 word long
-
-// next, the private data:
-  uint4 state[4];
-  uint4 count[2];     // number of *bits*, mod 2^64
-  uint1 buffer[64];   // input buffer
-  uint1 digest[16];
-  uint1 finalized;
-
-// last, the private methods, mostly static:
-  void init             ();               // called by all constructors
-  void transform        (uint1 *buffer);  // does the real update work.  Note 
-                                          // that length is implied to be 64.
-
-  static void encode    (uint1 *dest, uint4 *src, uint4 length);
-  static void decode    (uint4 *dest, uint1 *src, uint4 length);
-  static void memcpy    (uint1 *dest, uint1 *src, uint4 length);
-  static void memset    (uint1 *start, uint1 val, uint4 length);
-
-  static inline uint4  rotate_left (uint4 x, uint4 n);
-  static inline uint4  F           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  G           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  H           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  I           (uint4 x, uint4 y, uint4 z);
-  static inline void   FF  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   GG  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   HH  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   II  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
 
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  uint32_t A;
+  uint32_t B;
+  uint32_t C;
+  uint32_t D;
+
+  uint32_t total[2];
+  uint32_t buflen;
+  uint32_t buffer[32];
 };
 
-#endif
+/*
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
+ */
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *__md5_buffer (const char *buffer, size_t len,
+			   void *resblock) __THROW;
+
+#endif /* md5.h */
--- dclib-0.3.10.orig/dclib/core/cmd5.cpp	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/core/cmd5.cpp	2007-09-18 11:24:43.000000000 +0100
@@ -1,544 +1,451 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
+/* Functions to compute MD5 message digest of files or memory blocks.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
 
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
+#include <config.h>
 
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
+#include "cmd5.h"
 
-These notices must be retained in any copies of any part of this
-documentation and/or software.
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 
- */
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
-#include "cmd5.h"
+#ifdef _LIBC
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN 1
+# endif
+/* We need to keep the namespace clean so define the MD5 function
+   protected using leading __ .  */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
 
-#ifndef WIN32
-#include <strings.h>
-#include <iostream>
+#ifdef WORDS_BIGENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
-#include <iostream.h>
+# define SWAP(n) (n)
 #endif
 
-#include <assert.h>
-
-// MD5 simple initialization method
-
-CMD5::CMD5(){
-
-  init();
-
-}
-
-
-
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block, and updating the
-// context.
-
-void CMD5::update (uint1 *input, uint4 input_length) {
-
-  uint4 input_index, buffer_index;
-  uint4 buffer_space;                // how much space is left in buffer
-
-  if (finalized){  // so we can't update!
-    cerr << "MD5::update:  Can't update a finalized digest!" << endl;
-    return;
-  }
-
-  // Compute number of bytes mod 64
-  buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
-
-  // Update number of bits
-  if (  (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
-    count[1]++;
-
-  count[1] += ((uint4)input_length >> 29);
-
-
-  buffer_space = 64 - buffer_index;  // how much space is left in buffer
-
-  // Transform as many times as possible.
-  if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
-    // fill the rest of the buffer and transform
-    memcpy (buffer + buffer_index, input, buffer_space);
-    transform (buffer);
-
-    // now, transform each 64-byte piece of the input, bypassing the buffer
-    for (input_index = buffer_space; input_index + 63 < input_length; 
-	 input_index += 64)
-      transform (input+input_index);
-
-    buffer_index = 0;  // so we can buffer remaining
-  }
-  else
-    input_index=0;     // so we can buffer the whole input
-
-
-  // and here we do the buffering:
-  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);
-}
-
-
-
-// MD5 update for files.
-// Like above, except that it works on files (and uses above as a primitive.)
-
-void CMD5::update(FILE *file){
-
-  unsigned char buffer[1024*1024];
-  int len;
-
-  while ( (len=fread(buffer, 1, 1024*1024, file)) > 0)
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-
-
-
-
-
-// MD5 update for istreams.
-// Like update for files; see above.
-
-void CMD5::update(istream& stream){
-
-  unsigned char buffer[1024];
-  int len;
-
-  while (stream.good()){
-    stream.read((char*)buffer, 1024); // note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
-
-}
-
-
-
-
-
-
-// MD5 update for ifstreams.
-// Like update for files; see above.
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
 
-void CMD5::update(ifstream& stream){
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 
-  unsigned char buffer[1024];
-  int len;
 
-  while (stream.good()){
-    stream.read((char*)buffer, 1024); // note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+void
+md5_init_ctx (struct md5_ctx *ctx)
+{
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
+}
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+  ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+  ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+  ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
 
+  return resbuf;
 }
 
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
 
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  uint32_t bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
 
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
 
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
 
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
 
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-
-
-void CMD5::finalize (){
-
-  unsigned char bits[8];
-  unsigned int index, padLen;
-  static uint1 PADDING[64]={
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-
-  if (finalized){
-    cerr << "MD5::finalize:  Already finalized this digest!" << endl;
-    return;
-  }
-
-  // Save number of bits
-  encode (bits, count, 8);
-
-  // Pad out to 56 mod 64.
-  index = (uint4) ((count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  update (PADDING, padLen);
-
-  // Append length (before padding)
-  update (bits, 8);
-
-  // Store state in digest
-  encode (digest, state, 16);
-
-  // Zeroize sensitive information
-  memset (buffer, 0, sizeof(*buffer));
-
-  finalized=1;
-
-}
-
-
-
-
-CMD5::CMD5(FILE *file){
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, size * 4, ctx);
 
-  init();  // must be called be all constructors
-  update(file);
-  finalize ();
+  return md5_read_ctx (ctx, resbuf);
 }
 
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
+{
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+         computation function processes the whole buffer so that with the
+         next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
 
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
 
+	  sum += n;
 
-CMD5::CMD5(istream& stream){
+	  if (sum == BLOCKSIZE)
+	    break;
 
-  init();  // must called by all constructors
-  update (stream);
-  finalize();
-}
+	  if (n == 0)
+	    {
+	      /* Check for the error flag IFF N == 0, so that we don't
+	         exit the loop after a partial read due to e.g., EAGAIN
+	         or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
+	    }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
 
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+         BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+process_partial_block:
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
 
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
 
-CMD5::CMD5(ifstream& stream){
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
 
-  init();  // must called by all constructors
-  update (stream);
-  finalize();
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
 }
 
 
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
 
-unsigned char *CMD5::raw_digest(){
-
-  uint1 *s = new uint1[16];
-
-  if (!finalized){
-    cerr << "MD5::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;
-    return ( (unsigned char*) "");
-  }
-
-  memcpy(s, digest, 16);
-  return s;
-}
-
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
 
+      if (ctx->buflen > 64)
+	{
+	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
 
-CString CMD5::hex_digest()
-{
-	int i;
-	CString s;
-	char c[3];
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
 
-	if (!finalized)
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
 	{
-		cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-		"finalized the digest!" <<endl;
-		return "";
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
 	}
+    }
 
-	for (i=0; i<16; i++)
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
 	{
-		sprintf(c, "%02x", digest[i]);
-		c[2]=0;
-		s += c;
+	  md5_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
 	}
-
-	return s;
-}
-
-
-
-
-
-ostream& operator<<(ostream &stream, CMD5 context){
-
-  stream << context.hex_digest().Data();
-  return stream;
-}
-
-
-
-// PRIVATE METHODS:
-
-
-
-void CMD5::init(){
-  finalized=0;  // we just started!
-
-  // Nothing counted, so count=0
-  count[0] = 0;
-  count[1] = 0;
-
-  // Load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
+      ctx->buflen = left_over;
+    }
 }
 
 
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
 
-// Constants for MD5Transform routine.
-// Although we could use C++ style constants, defines are actually better,
-// since they let us easily evade scope clashes.
-
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-
-
-
-// MD5 basic transformation. Transforms state based on block.
-void CMD5::transform (uint1 block[64]){
-
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  decode (x, block, 64);
-
-  assert(!finalized);  // not just a user error, since the method is private
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset ( (uint1 *) x, 0, sizeof(x));
-
-}
-
-
-
-// Encodes input (UINT4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void CMD5::encode (uint1 *output, uint4 *input, uint4 len) {
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j]   = (uint1)  (input[i] & 0xff);
-    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
-    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
-    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
-  }
-}
-
-
-
-
-// Decodes input (unsigned char) into output (UINT4). Assumes len is
-// a multiple of 4.
-void CMD5::decode (uint4 *output, uint1 *input, uint4 len){
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
-
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
 
-
-
-
-// Note: Replace "for loop" with standard memcpy if possible.
-void CMD5::memcpy (uint1 *output, uint1 *input, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = input[i];
-}
-
-
-
-// Note: Replace "for loop" with standard memset if possible.
-void CMD5::memset (uint1 *output, uint1 value, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = value;
-}
-
-
-
-// ROTATE_LEFT rotates x left n bits.
-
-inline unsigned int CMD5::rotate_left  (uint4 x, uint4 n){
-  return (x << n) | (x >> (32-n))  ;
-}
-
-
-
-
-// F, G, H and I are basic MD5 functions.
-
-inline unsigned int CMD5::F            (uint4 x, uint4 y, uint4 z){
-  return (x & y) | (~x & z);
-}
-
-inline unsigned int CMD5::G            (uint4 x, uint4 y, uint4 z){
-  return (x & z) | (y & ~z);
-}
-
-inline unsigned int CMD5::H            (uint4 x, uint4 y, uint4 z){
-  return x ^ y ^ z;
-}
-
-inline unsigned int CMD5::I            (uint4 x, uint4 y, uint4 z){
-  return y ^ (x | ~z);
-}
-
-
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-
-
-inline void CMD5::FF(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4  s, uint4 ac){
- a += F(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::GG(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += G(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::HH(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += H(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void CMD5::II(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			     uint4 s, uint4 ac){
- a += I(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  uint32_t correct_words[16];
+  const uint32_t *words = (const uint32_t*) buffer;
+  size_t nwords = len / sizeof (uint32_t);
+  const uint32_t *endp = words + nwords;
+  uint32_t A = ctx->A;
+  uint32_t B = ctx->B;
+  uint32_t C = ctx->C;
+  uint32_t D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      uint32_t *cwp = correct_words;
+      uint32_t A_save = A;
+      uint32_t B_save = B;
+      uint32_t C_save = C;
+      uint32_t D_save = D;
+
+      /* First round: using the given function, the context and a constant
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+         cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+         They are defined in RFC 1321 as
+
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+         Here is an equivalent invocation using Perl:
+
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D, 7, 0xd76aa478);
+      OP (D, A, B, C, 12, 0xe8c7b756);
+      OP (C, D, A, B, 17, 0x242070db);
+      OP (B, C, D, A, 22, 0xc1bdceee);
+      OP (A, B, C, D, 7, 0xf57c0faf);
+      OP (D, A, B, C, 12, 0x4787c62a);
+      OP (C, D, A, B, 17, 0xa8304613);
+      OP (B, C, D, A, 22, 0xfd469501);
+      OP (A, B, C, D, 7, 0x698098d8);
+      OP (D, A, B, C, 12, 0x8b44f7af);
+      OP (C, D, A, B, 17, 0xffff5bb1);
+      OP (B, C, D, A, 22, 0x895cd7be);
+      OP (A, B, C, D, 7, 0x6b901122);
+      OP (D, A, B, C, 12, 0xfd987193);
+      OP (C, D, A, B, 17, 0xa679438e);
+      OP (B, C, D, A, 22, 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)					\
+      do								\
+	{								\
+	  a += f (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+      /* Round 2.  */
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
+      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+      /* Round 3.  */
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+      /* Round 4.  */
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
 }

03-dclib-0.3.10-use-new-md5-api.patch:

--- NEW FILE 03-dclib-0.3.10-use-new-md5-api.patch ---
--- dclib-0.3.10.orig/dclib/cdownloadmanager.cpp	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/dclib/cdownloadmanager.cpp	2007-09-18 14:05:33.000000000 +0100
@@ -1513,7 +1513,11 @@
 	CByteArray ba;
 	DCTransferFileObject * TransferFileObject;
 	DCFileChunkObject * FileChunkObject;
-	CMD5 context;
+	md5_ctx * context = 0;
+	unsigned char resbuf[16];
+	char c[3];
+	int i = 0;
+	CString result = "";
 
 	if ( (TransferFileObject = m_pDownloadQueue->GetUserFileObject( Transfer->GetDstNick(), Transfer->GetHubName(), Transfer->GetHubHost(), Transfer->GetDstFilename() )) != 0 )
 	{
@@ -1522,10 +1526,23 @@
 			if ( (TransferFileObject->m_stHash == "") && (TransferFileObject->m_bMulti == TRUE) )
 			{
 				// calc hash
-				context.update( ba.Data(), ba.Size() );
-				context.finalize();
+				context = new md5_ctx();
+				
+				md5_init_ctx( context );
+				md5_process_bytes( ba.Data(), ba.Size(), context );
+				md5_finish_ctx( context, &resbuf );
+				
+				delete context;
+				
+				// convert digest to hexadecimal
+				for ( i = 0; i < 16; i++ )
+				{
+					sprintf( c, "%02x", resbuf[i] );
+					c[2] = 0;
+					result += c;
+				}
 
-				TransferFileObject->m_stHash = context.hex_digest();
+				TransferFileObject->m_stHash = result;
 
 				DPRINTF("hash is :'%s'\n",TransferFileObject->m_stHash.Data());
 

04-dclib-0.3.10-gnulib-md5-configure-test.patch:

--- NEW FILE 04-dclib-0.3.10-gnulib-md5-configure-test.patch ---
--- dclib-0.3.10.orig/configure.in	2007-09-18 10:26:49.000000000 +0100
+++ dclib-0.3.10/configure.in	2007-09-18 11:57:21.000000000 +0100
@@ -90,6 +90,18 @@
 jm_FILE_SYSTEM_USAGE( [], )
 jm_FSTYPENAME
 
+dnl copied and pasted from md5.m4
+AC_DEFUN([gl_MD5],
+[
+  AC_LIBOBJ([md5])
+
+  dnl Prerequisites of lib/md5.c.
+  AC_REQUIRE([AC_C_BIGENDIAN])
+  :
+])
+
+gl_MD5
+
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
 # If <sys/vfs.h> exists and struct statfs has a member named f_spare,
 # enable the work-around code in fsusage.c.


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dclib.spec	27 Aug 2007 12:46:36 -0000	1.12
+++ dclib.spec	18 Sep 2007 19:31:19 -0000	1.13
@@ -7,8 +7,13 @@
 License:        GPLv2
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+Patch0:         01-%{name}-%{version}-remove-cmd4.patch
+Patch1:         02-%{name}-%{version}-use-gnulib-md5.patch
+Patch2:         03-%{name}-%{version}-use-new-md5-api.patch
+Patch3:         04-%{name}-%{version}-gnulib-md5-configure-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
+BuildRequires:  automake, autoconf
 
 %description
 This library implements the Direct Connect file sharing protocol.  The package
@@ -30,9 +35,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
+aclocal
+automake
+autoconf
+make -f admin/Makefile.common
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -65,6 +78,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Luke Macken <lmacken at redhat.com> 0.3.10-2
+- Remove RSA MD5 implementation in favor of the gnulib implementation.  Patches
+  taken from upstream ticket:
+  https://sourceforge.net/tracker/?func=detail&atid=897767&aid=1796674&group_id=181579
+
 * Tue Aug 27 2007 Luke Macken <lmacken at redhat.com> 0.3.10-1
 - 0.3.10
 - Update License to GPLv2


--- dclib-0.3.8-cconfig-use-cfile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 19:32:55 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 18 Sep 2007 15:32:55 -0400
Subject: rpms/dclib/devel dclib.spec,1.13,1.14
Message-ID: <200709181932.l8IJWtf0025310@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25277

Modified Files:
	dclib.spec 
Log Message:
bump the release


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dclib.spec	18 Sep 2007 19:31:19 -0000	1.13
+++ dclib.spec	18 Sep 2007 19:32:23 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Tue Sep 18 19:33:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 18 Sep 2007 15:33:27 -0400
Subject: rpms/xulrunner/devel xulrunner-mozconfig,1.2,1.3
Message-ID: <200709181933.l8IJXR8A025364@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25304

Modified Files:
	xulrunner-mozconfig 
Log Message:
disabled airbag


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-mozconfig	18 Sep 2007 14:23:14 -0000	1.2
+++ xulrunner-mozconfig	18 Sep 2007 19:32:53 -0000	1.3
@@ -24,6 +24,7 @@
 ac_add_options --disable-gnomeui
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-extensions=default,cookie
+ac_add_options --disable-airbag
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1



From fedora-extras-commits at redhat.com  Tue Sep 18 19:40:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Tue, 18 Sep 2007 15:40:33 -0400
Subject: rpms/postgresql-pgpool-ha/devel postgresql-pgpool-ha.spec,1.1,1.2
Message-ID: <200709181940.l8IJeX35025619@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-ha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25539

Modified Files:
	postgresql-pgpool-ha.spec 
Log Message:
- Revert ocf path change.
- Make package noarch.




Index: postgresql-pgpool-ha.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-ha/devel/postgresql-pgpool-ha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-pgpool-ha.spec	9 Jul 2007 17:25:37 -0000	1.1
+++ postgresql-pgpool-ha.spec	18 Sep 2007 19:39:58 -0000	1.2
@@ -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:	4%{?dist}
+Release:	5%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -11,6 +11,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	heartbeat >= 2.0
 BuildRequires:	heartbeat-devel >= 2.0 postgresql-pgpool-II
+BuildArch:	noarch
 
 %description
 Pgpool-HA combines pgpool with heartbeat. Pgpool is a replication
@@ -30,10 +31,10 @@
 cd src
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}/ha.d/resource.d/heartbeat/
-install -d %{buildroot}%{_datadir}/ocf/resource.d/heartbeat/
+install -d %{buildroot}%{_libdir}/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}%{_datadir}/ocf/resource.d/heartbeat/
+install -m 755 pgpool %{buildroot}%{_libdir}/ocf/resource.d/heartbeat/
 
 %clean
 rm -rf %{buildroot}
@@ -46,6 +47,10 @@
 %doc AUTHORS COPYING INSTALL README.ja ChangeLog doc README 
 
 %changelog
+* Tue Sep 18 2007 Devrim GUNDUZ <devrim at CommandPrompt.com> 1.1.0-5
+- Revert ocf path change.
+- Make package noarch.
+
 * Mon Jul 9 2007 Devrim GUNDUZ <devrim at CommandPrompt.com> 1.1.0-4
 - Made package arch, per bz review.
 - Move ocf path back to datadir/ocf/resource.d .



From fedora-extras-commits at redhat.com  Tue Sep 18 19:59:55 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Tue, 18 Sep 2007 15:59:55 -0400
Subject: rpms/evolution-sharp/devel .cvsignore, 1.11,
	1.12 evolution-sharp.spec, 1.41, 1.42 sources, 1.11, 1.12
Message-ID: <200709181959.l8IJxt9D026100@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26078

Modified Files:
	.cvsignore evolution-sharp.spec sources 
Log Message:

* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 0.14.0.1-1.fc8
- Update to 0.14.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Aug 2007 01:29:30 -0000	1.11
+++ .cvsignore	18 Sep 2007 19:59:22 -0000	1.12
@@ -1 +1 @@
-evolution-sharp-0.13.3.tar.bz2
+evolution-sharp-0.14.0.1.tar.bz2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- evolution-sharp.spec	24 Aug 2007 01:29:30 -0000	1.41
+++ evolution-sharp.spec	18 Sep 2007 19:59:22 -0000	1.42
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.13.3
+Version: 0.14.0.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -85,6 +85,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 0.14.0.1-1.fc8
+- Update to 0.14.0.1
+
 * Thu Aug 23 2007 Matthew Barnes <mbarnes at redhat.com> - 0.13.3-1.fc8
 - Update to 0.13.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Aug 2007 01:29:30 -0000	1.11
+++ sources	18 Sep 2007 19:59:22 -0000	1.12
@@ -1 +1 @@
-af580e61bc03ee4f6c74d00d990c4a47  evolution-sharp-0.13.3.tar.bz2
+ca44b64db3edaa248b03bdf00ea662fd  evolution-sharp-0.14.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:01:16 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:01:16 -0400
Subject: rpms/gchempaint/devel .cvsignore, 1.6, 1.7 gchempaint.spec, 1.10,
	1.11 sources, 1.6, 1.7 gchempaint-0.8.2-themedirfix.patch, 1.1, NONE
Message-ID: <200709182001.l8IK1GY2032132@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26141

Modified Files:
	.cvsignore gchempaint.spec sources 
Removed Files:
	gchempaint-0.8.2-themedirfix.patch 
Log Message:
* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3
- Dropped upstreamed patches
- Made the License tag more precise
- Changed the way rpaths are dealt with, previous one was breaking the build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2007 13:17:52 -0000	1.6
+++ .cvsignore	18 Sep 2007 20:00:43 -0000	1.7
@@ -1 +1 @@
-gchempaint-0.8.2.tar.bz2
+gchempaint-0.8.3.tar.bz2


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gchempaint.spec	26 Aug 2007 07:33:51 -0000	1.10
+++ gchempaint.spec	18 Sep 2007 20:00:43 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           gchempaint
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A 2D chemical formulae drawing tool
 
 Group:          Applications/Engineering
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+
+# Everything is GPLv2+, except libgcpcanvas, which is LGPLv2+
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
-Patch0:         gchempaint-0.8.2-themedirfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -18,6 +18,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
+BuildRequires:  automake
+
 Requires:       hicolor-icon-theme
 
 Requires(pre):  GConf2
@@ -37,15 +39,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .themedirfix
 
 %build
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper
-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}
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
 %install
@@ -57,11 +56,14 @@
 %find_lang %{name}
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.2/plugins/gchempaint/gchempaint.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.3/plugins/gchempaint/gchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
 
+#kill static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +136,7 @@
 %{_libdir}/libgcpcanvas-%{version}.so
 %{_libdir}/libgcpcanvas.so
 %{_libdir}/libgchempaint.so
-%{_libdir}/goffice/0.4.2/plugins/gchempaint
+%{_libdir}/goffice/0.4.3/plugins/gchempaint
 %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
 %{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
@@ -148,6 +150,12 @@
 
 
 %changelog
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+- Dropped upstreamed patches
+- Made the License tag more precise
+- Changed the way rpaths are dealt with, previous one was breaking the build
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
 - Adjusted License tag as per latest guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2007 13:17:52 -0000	1.6
+++ sources	18 Sep 2007 20:00:43 -0000	1.7
@@ -1 +1 @@
-b02820894bff474ed1d5861ac644a767  gchempaint-0.8.2.tar.bz2
+a05abcc0a13415883438411ab3b2b9a8  gchempaint-0.8.3.tar.bz2


--- gchempaint-0.8.2-themedirfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:06:09 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 16:06:09 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.79, 1.80 firstboot.spec, 1.106, 
	1.107 sources, 1.103, 1.104
Message-ID: <200709182006.l8IK69x9032379@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	9 Aug 2007 20:11:58 -0000	1.79
+++ .cvsignore	18 Sep 2007 20:05:37 -0000	1.80
@@ -51,3 +51,4 @@
 firstboot-1.4.34.tar.bz2
 firstboot-1.4.35.tar.bz2
 firstboot-1.4.36.tar.bz2
+firstboot-1.4.37.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- firstboot.spec	9 Aug 2007 20:11:58 -0000	1.106
+++ firstboot.spec	18 Sep 2007 20:05:37 -0000	1.107
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.36
+Version: 1.4.37
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/FirstBoot
 License: GPLv2+
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 1.4.37-1
+- Remove sound card module (#294101).
+
 * Thu Aug 09 2007 Chris Lumens <clumens at redhat.com> 1.4.36-1
 - Remove unused images (#250354).
 - Require libuser-python instead of libuser (#251356).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	9 Aug 2007 20:11:58 -0000	1.103
+++ sources	18 Sep 2007 20:05:37 -0000	1.104
@@ -1 +1 @@
-3535f4398f6c891ceed2da448e6c802b  firstboot-1.4.36.tar.bz2
+6129f9227a15af22a11cd877b9614361  firstboot-1.4.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:12:05 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:12:05 -0400
Subject: rpms/gchempaint/F-7 .cvsignore, 1.6, 1.7 gchempaint.spec, 1.9,
	1.10 sources, 1.6, 1.7 gchempaint-0.8.2-themedirfix.patch, 1.1, NONE
Message-ID: <200709182012.l8IKC5MP032588@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559

Modified Files:
	.cvsignore gchempaint.spec sources 
Removed Files:
	gchempaint-0.8.2-themedirfix.patch 
Log Message:
* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
- Updated to 0.8.3
- Dropped upstreamed patches
- Made the License tag more precise
- Changed the way rpaths are dealt with, previous one was breaking the build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Aug 2007 13:20:07 -0000	1.6
+++ .cvsignore	18 Sep 2007 20:11:32 -0000	1.7
@@ -1 +1 @@
-gchempaint-0.8.2.tar.bz2
+gchempaint-0.8.3.tar.bz2


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/gchempaint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gchempaint.spec	6 Aug 2007 14:56:56 -0000	1.9
+++ gchempaint.spec	18 Sep 2007 20:11:32 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           gchempaint
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A 2D chemical formulae drawing tool
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+ and LGPLv2+
+# Everything is GPLv2+, except libgcpcanvas, which is LGPLv2+
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.bz2
-Patch0:         gchempaint-0.8.2-themedirfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -18,6 +18,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
+BuildRequires:  automake
+
 Requires:       hicolor-icon-theme
 
 Requires(pre):  GConf2
@@ -37,15 +39,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .themedirfix
 
 %build
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper
-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}
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
 %install
@@ -57,11 +56,14 @@
 %find_lang %{name}
 
 #kill libtool archives
-rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.2/plugins/gchempaint/gchempaint.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/goffice/0.4.3/plugins/gchempaint/gchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gchempaint/plugins/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgcpcanvas.la
 
+#kill static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +136,7 @@
 %{_libdir}/libgcpcanvas-%{version}.so
 %{_libdir}/libgcpcanvas.so
 %{_libdir}/libgchempaint.so
-%{_libdir}/goffice/0.4.2/plugins/gchempaint
+%{_libdir}/goffice/0.4.3/plugins/gchempaint
 %{_sysconfdir}/gconf/schemas/gchempaint-arrows.schemas
 %{_sysconfdir}/gconf/schemas/gchempaint.schemas
 %{_datadir}/applications/fedora-gchempaint.desktop
@@ -148,6 +150,15 @@
 
 
 %changelog
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.3-1
+- Updated to 0.8.3
+- Dropped upstreamed patches
+- Made the License tag more precise
+- Changed the way rpaths are dealt with, previous one was breaking the build
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-3
+- Adjusted License tag as per latest guidelines
+
 * Mon Aug  6 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.2-2
 - Adjusted for new goffice
 - Delete the goffice plugin libtool archive as well


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Aug 2007 13:20:07 -0000	1.6
+++ sources	18 Sep 2007 20:11:32 -0000	1.7
@@ -1 +1 @@
-b02820894bff474ed1d5861ac644a767  gchempaint-0.8.2.tar.bz2
+a05abcc0a13415883438411ab3b2b9a8  gchempaint-0.8.3.tar.bz2


--- gchempaint-0.8.2-themedirfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:13:00 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:13:00 -0400
Subject: rpms/glibc import.log,1.17,1.18
Message-ID: <200709182013.l8IKD083032689@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32647

Modified Files:
	import.log 
Log Message:
2.6.90-14



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	27 Aug 2007 21:13:21 -0000	1.17
+++ import.log	18 Sep 2007 20:12:28 -0000	1.18
@@ -14,3 +14,4 @@
 glibc-2_6_90-11:HEAD:glibc-2.6.90-11.src.rpm:1187302854
 glibc-2_6_90-12:HEAD:glibc-2.6.90-12.src.rpm:1188070253
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
+glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332



From fedora-extras-commits at redhat.com  Tue Sep 18 20:13:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:13:03 -0400
Subject: rpms/glibc/devel .cvsignore, 1.215, 1.216 glibc-fedora.patch, 1.236,
	1.237 glibc.spec, 1.326, 1.327 sources, 1.239, 1.240
Message-ID: <200709182013.l8IKD3kR032698@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32647/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- .cvsignore	27 Aug 2007 21:13:25 -0000	1.215
+++ .cvsignore	18 Sep 2007 20:12:30 -0000	1.216
@@ -1,2 +1,2 @@
-glibc-20070827T2032.tar.bz2
-glibc-fedora-20070827T2032.tar.bz2
+glibc-20070918T1931.tar.bz2
+glibc-fedora-20070918T1931.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- glibc-fedora.patch	27 Aug 2007 21:13:25 -0000	1.236
+++ glibc-fedora.patch	18 Sep 2007 20:12:30 -0000	1.237
@@ -1,21 +1,6 @@
---- glibc-20070827T2032/ChangeLog	27 Aug 2007 20:10:36 -0000	1.10832
-+++ glibc-20070827T2032-fedora/ChangeLog	27 Aug 2007 20:42:21 -0000	1.8782.2.270
-@@ -1,3 +1,14 @@
-+2007-08-26  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/i386/Makefile (sysdep_routines): Add
-+	call_fallocate in misc subdir.
-+	* sysdeps/unix/sysv/linux/i386/call_fallocate.S: New file.
-+	* sysdeps/unix/sysv/linux/i386/syscalls.list (fallocate64): Remove.
-+	* sysdeps/unix/sysv/linux/i386/posix_fallocate.c: Use __call_fallocate
-+	instead of __fallocate64.
-+	* sysdeps/unix/sysv/linux/i386/posix_fallocate64.c: Use __call_fallocate
-+	instead of __fallocate64.
-+
- 2007-08-27  Jakub Jelinek  <jakub at redhat.com>
- 
- 	* sysdeps/unix/sysv/linux/syscalls.list
-@@ -1831,6 +1842,13 @@
+--- glibc-20070918T1931/ChangeLog	18 Sep 2007 19:29:44 -0000	1.10852
++++ glibc-20070918T1931-fedora/ChangeLog	18 Sep 2007 19:57:14 -0000	1.8782.2.271
+@@ -2208,6 +2208,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -29,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -2126,6 +2144,10 @@
+@@ -2503,6 +2510,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -40,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -3383,6 +3405,15 @@
+@@ -3760,6 +3771,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -56,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20070827T2032/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070827T2032-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070918T1931/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070918T1931-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>
@@ -123,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20070827T2032/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070827T2032-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070918T1931/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070918T1931-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.
@@ -296,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20070827T2032/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070827T2032-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070918T1931/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070918T1931-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 $@
@@ -308,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20070827T2032/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070827T2032-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070918T1931/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070918T1931-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;
@@ -334,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20070827T2032/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20070827T2032-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20070918T1931/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
++++ glibc-20070918T1931-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -346,7 +331,7 @@
  #include <assert.h>
  #include <fcntl.h>
  #include <locale.h>
-@@ -232,7 +235,7 @@ do_test (void)
+@@ -238,7 +241,7 @@ do_test (void)
    if (memcmp (a.buf1, "aabcdabcjj", 10))
      FAIL ();
  
@@ -355,17 +340,17 @@
    /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
       and sufficient GCC support, as the string operations overflow
       from a.buf1 into a.buf2.  */
-@@ -337,7 +340,7 @@ do_test (void)
+@@ -345,7 +348,7 @@ do_test (void)
    memset (a.buf1 + 9, 'j', l0 + 2);
    CHK_FAIL_END
  
--#if __USE_FORTIFY_LEVEL >= 2
-+#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
- # define O 0
- #else
- # define O 1
---- glibc-20070827T2032/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070827T2032-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+-# if __USE_FORTIFY_LEVEL >= 2
++# if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
+ #  define O 0
+ # else
+ #  define O 1
+--- glibc-20070918T1931/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070918T1931-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -447,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070827T2032/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070827T2032-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070918T1931/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070918T1931-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;
@@ -473,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070827T2032/include/features.h	19 Jul 2007 17:27:30 -0000	1.47
-+++ glibc-20070827T2032-fedora/include/features.h	31 Jul 2007 17:45:50 -0000	1.35.2.16
+--- glibc-20070918T1931/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070918T1931-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -490,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070827T2032/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070918T1931/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070918T1931/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070827T2032-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070918T1931/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070918T1931-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -509,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070827T2032/libio/stdio.h	17 Feb 2007 18:26:15 -0000	1.89
-+++ glibc-20070827T2032-fedora/libio/stdio.h	21 Feb 2007 11:15:50 -0000	1.78.2.11
+--- glibc-20070918T1931/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070918T1931-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -524,40 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070827T2032/libio/bits/stdio2.h	17 Mar 2007 17:04:08 -0000	1.5
-+++ glibc-20070827T2032-fedora/libio/bits/stdio2.h	17 Mar 2007 21:52:49 -0000	1.1.2.7
-@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
- extern int __vprintf_chk (int __flag, __const char *__restrict __format,
- 			  _G_va_list __ap);
- 
--# define printf(...) \
-+# if __GNUC_PREREQ (4, 0)
-+#  define printf(...) \
-   __printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
--# define fprintf(stream, ...) \
-+#  define fprintf(stream, ...) \
-   __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
--# define vprintf(format, ap) \
-+#  define vprintf(format, ap) \
-   __vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
--# define vfprintf(stream, format, ap) \
-+#  define vfprintf(stream, format, ap) \
-   __vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
-+# else
-+#  define printf(...) \
-+  __builtin___printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-+#  define fprintf(stream, ...) \
-+  __builtin___fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-+#  define vprintf(format, ap) \
-+  __builtin___vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)
-+#  define vfprintf(stream, format, ap) \
-+  __builtin___vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)
-+# endif
- 
- #endif
- 
---- glibc-20070827T2032/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070827T2032-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070918T1931/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070918T1931-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 !!!
@@ -649,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070827T2032/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070827T2032-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070918T1931/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070918T1931-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,
@@ -682,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070827T2032/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070827T2032-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070918T1931/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070918T1931-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -692,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070827T2032/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070827T2032-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070918T1931/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070918T1931-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -735,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070827T2032/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070827T2032-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070918T1931/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070918T1931-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>"
@@ -751,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070827T2032/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070827T2032-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070918T1931/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070918T1931-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -764,8 +717,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-20070827T2032/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070918T1931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -836,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070827T2032/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070827T2032-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070918T1931/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070918T1931-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -865,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070827T2032/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070827T2032-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070918T1931/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070918T1931-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>
@@ -942,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070827T2032/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070827T2032-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070918T1931/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070918T1931-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -999,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070827T2032/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070827T2032-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070918T1931/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070918T1931-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1010,17 +963,43 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070827T2032/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070827T2032-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070918T1931/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
++++ glibc-20070918T1931-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
+@@ -282,7 +282,10 @@
+ 
+ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+    inline semantics, unless -fgnu89-inline is used.  */
+-#if !defined __cplusplus || __GNUC_PREREQ (4,3)
++#if !defined __cplusplus || __GNUC_PREREQ (4,3) \
++    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
++	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
++	&& __GNUC_RH_RELEASE__ >= 24)
+ # if defined __GNUC_STDC_INLINE__ || defined __cplusplus
+ #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+ #  define __extern_always_inline \
+@@ -295,7 +298,10 @@
+ 
+ /* GCC 4.3 and above allow passing all anonymous arguments of an
+    __extern_always_inline function to some other vararg function.  */
+-#if __GNUC_PREREQ (4,3)
++#if __GNUC_PREREQ (4,3) \
++    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
++	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
++	&& __GNUC_RH_RELEASE__ >= 24)
+ # define __va_arg_pack() __builtin_va_arg_pack ()
+ # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
+ #endif
+--- glibc-20070918T1931/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070918T1931-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-20070827T2032/nptl/ChangeLog	21 Aug 2007 23:55:36 -0000	1.1031
-+++ glibc-20070827T2032-fedora/nptl/ChangeLog	25 Aug 2007 18:55:03 -0000	1.706.2.138
-@@ -2935,6 +2935,15 @@
+--- glibc-20070918T1931/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070918T1931-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+@@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1036,7 +1015,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -3671,6 +3680,11 @@
+@@ -3678,6 +3687,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1048,7 +1027,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -5745,6 +5759,11 @@
+@@ -5752,6 +5766,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1060,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070827T2032/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070827T2032-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070918T1931/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070918T1931-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1094,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070827T2032/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070827T2032-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070918T1931/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070918T1931-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;
@@ -1120,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070827T2032/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070918T1931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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>
 +
@@ -1129,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070827T2032/nscd/connections.c	22 Aug 2007 03:39:59 -0000	1.101
-+++ glibc-20070827T2032-fedora/nscd/connections.c	25 Aug 2007 18:55:04 -0000	1.55.2.32
+--- glibc-20070918T1931/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070918T1931-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1139,7 +1118,7 @@
  
  static pthread_attr_t attr;
  
-@@ -1379,6 +1380,10 @@ nscd_run (void *p)
+@@ -1384,6 +1385,10 @@ nscd_run (void *p)
  	      if (readylist == NULL && to == ETIMEDOUT)
  		{
  		  --nready;
@@ -1150,7 +1129,7 @@
  		  pthread_mutex_unlock (&readylist_lock);
  		  goto only_prune;
  		}
-@@ -1388,6 +1393,34 @@ nscd_run (void *p)
+@@ -1393,6 +1398,34 @@ nscd_run (void *p)
  	    pthread_cond_wait (&readylist_cond, &readylist_lock);
  	}
  
@@ -1185,7 +1164,7 @@
        struct fdlist *it = readylist->next;
        if (readylist->next == readylist)
  	/* Just one entry on the list.  */
-@@ -1963,3 +1996,10 @@ finish_drop_privileges (void)
+@@ -1968,3 +2001,10 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
  }
@@ -1196,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070827T2032/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070827T2032-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070918T1931/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070918T1931-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1216,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070827T2032/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070827T2032-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070918T1931/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070918T1931-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1229,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070827T2032/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070827T2032-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070918T1931/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070918T1931-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1271,22 +1250,26 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070827T2032/posix/Makefile	4 Aug 2007 20:48:38 -0000	1.201
-+++ glibc-20070827T2032-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
-@@ -300,7 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+--- glibc-20070918T1931/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070918T1931-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+@@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
  
 -$(objpfx)getconf.speclist: $(objpfx)getconf
+-ifeq (no,$(cross-compiling))
 -	LC_ALL=C GETCONF_DIR=/dev/null \
 -	$(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new
+-else
+-	> $@.new
+-endif
 +$(objpfx)getconf.speclist: getconf.speclist.h
 +	$(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070827T2032/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070918T1931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1303,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070827T2032/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070827T2032-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070918T1931/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070918T1931-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
@@ -1320,8 +1303,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-20070827T2032/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070827T2032-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070918T1931/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070918T1931-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1335,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070827T2032/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070918T1931/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070918T1931-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))
@@ -1348,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070827T2032/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070918T1931/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070918T1931-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.  */
@@ -1701,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070827T2032/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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.
@@ -1788,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070827T2032/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070827T2032-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070918T1931/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070918T1931-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
@@ -1798,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070827T2032/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070827T2032-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070918T1931/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070918T1931-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);
      }
@@ -1814,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/check_pf.c	16 Jun 2007 16:54:40 -0000	1.11
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/check_pf.c	31 Jul 2007 17:46:12 -0000	1.3.2.8
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1831,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Aug 2007 03:19:44 -0000	1.25
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Aug 2007 07:38:40 -0000	1.14.2.11
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1880,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070918T1931-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;
@@ -1924,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070918T1931-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>
@@ -1951,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070918T1931-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"
@@ -1962,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070918T1931-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;
@@ -2009,27 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/Makefile	21 Jan 2006 08:14:17 -0000	1.28
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/Makefile	27 Aug 2007 20:42:22 -0000	1.26.2.3
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),misc)
--sysdep_routines += ioperm iopl vm86 call_pselect6
-+sysdep_routines += ioperm iopl vm86 call_pselect6 call_fallocate
- sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
- endif
- 
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/call_fallocate.S 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/call_fallocate.S	27 Aug 2007 20:42:22 -0000	1.1.2.1
-@@ -0,0 +1,7 @@
-+#include <sysdep.h>
-+
-+#ifdef __NR_fallocate
-+PSEUDO_ERRVAL (__call_fallocate, fallocate, 6)
-+ ret_ERRVAL
-+PSEUDO_END_ERRVAL(__call_fallocate)
-+#endif
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070918T1931-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
  
@@ -2048,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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.
@@ -2110,55 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/posix_fallocate.c	1 Aug 2007 15:50:52 -0000	1.1
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/posix_fallocate.c	27 Aug 2007 20:42:22 -0000	1.1.2.2
-@@ -28,7 +28,7 @@
- int __have_fallocate attribute_hidden;
- #endif
- 
--extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
-+extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
-      attribute_hidden;
- 
- /* Reserve storage for the data of the file associated with FD.  */
-@@ -40,7 +40,7 @@ posix_fallocate (int fd, __off_t offset,
-   if (__builtin_expect (__have_fallocate >= 0, 1))
- # endif
-     {
--      int res = __fallocate64 (fd, 0, offset, len);
-+      int res = __call_fallocate (fd, 0, offset, len);
-       if (! res)
- 	return 0;
- 
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c	1 Aug 2007 15:50:38 -0000	1.1
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c	27 Aug 2007 20:42:22 -0000	1.1.2.2
-@@ -30,7 +30,7 @@ extern int __posix_fallocate64_l64 (int 
- extern int __have_fallocate attribute_hidden;
- #endif
- 
--extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
-+extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len)
-      attribute_hidden;
- 
- /* Reserve storage for the data of the file associated with FD.  */
-@@ -42,7 +42,7 @@ __posix_fallocate64_l64 (int fd, __off64
-   if (__builtin_expect (__have_fallocate >= 0, 1))
- # endif
-     {
--      int res = __fallocate64 (fd, 0, offset, len);
-+      int res = __call_fallocate (fd, 0, offset, len);
- 
-       if (! res)
- 	return 0;
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/i386/syscalls.list	24 Aug 2007 17:21:50 -0000	1.22
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/i386/syscalls.list	27 Aug 2007 20:42:22 -0000	1.19.2.4
-@@ -6,4 +6,3 @@ vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2
- oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit at GLIBC_2.0
- oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit at GLIBC_2.0
- waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
--fallocate64	-	fallocate	Vi:iiiiii	__fallocate64
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070918T1931-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)
@@ -2191,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070918T1931-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-20070827T2032/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070827T2032-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070918T1931/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070918T1931-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.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- glibc.spec	27 Aug 2007 21:13:25 -0000	1.326
+++ glibc.spec	18 Sep 2007 20:12:30 -0000	1.327
@@ -1,9 +1,9 @@
-%define glibcdate 20070827T2032
+%define glibcdate 20070918T1931
 %define glibcname glibc
-%define glibcsrcdir glibc-20070827T2032
+%define glibcsrcdir glibc-20070918T1931
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 13
+%define glibcrelease 14
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,21 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-14
+- -D_FORTIFY_SOURCE{,=2} support for C++
+- fortification of fread{,_unlocked}
+- support *scanf m allocation modifier (%ms, %mls, %mc, ...)
+- in -std=c99 or -D_XOPEN_SOURCE=600 mode don't recognize
+  %as, %aS and %a[ as a GNU extension for *scanf
+- fix splice, vmsplice, tee return value, make them cancellation
+  points
+- mq_open checking
+- use inline function rather than function-like macro
+  for open{,at}{,64} checking
+- IFA_F_OPTIMISTIC handling in getaddrinfo (#259681)
+- fix an ABBA deadlock in ld.so (#284171)
+- remove sparc{32,64} unwind info from _start and clone
+
 * Mon Aug 27 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-13
 - fix personality on x86_64/ppc/ppc64 (#256281)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- sources	27 Aug 2007 21:13:25 -0000	1.239
+++ sources	18 Sep 2007 20:12:30 -0000	1.240
@@ -1,2 +1,2 @@
-8360c475f687d64903e8569f3b0911db  glibc-20070827T2032.tar.bz2
-2c9055be62ad8d0ef9db44d348a6f3d9  glibc-fedora-20070827T2032.tar.bz2
+0bdea16fe09191ac97c4132ebdc9b7db  glibc-20070918T1931.tar.bz2
+4af6fdc8cfac8f9fc8f4eca5acf812f6  glibc-fedora-20070918T1931.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:19:19 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Sep 2007 16:19:19 -0400
Subject: rpms/gnupg2/devel .cvsignore, 1.23, 1.24 gnupg2.spec, 1.73,
	1.74 sources, 1.25, 1.26 gnupg-2.0.5-no_close.patch, 1.1, NONE
Message-ID: <200709182019.l8IKJJ6a000487@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-2.0.5-no_close.patch 
Log Message:
* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-1
- gnupg-2.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Aug 2007 02:07:59 -0000	1.23
+++ .cvsignore	18 Sep 2007 20:18:46 -0000	1.24
@@ -1,7 +1,7 @@
 clog
-gnupg-2.0.4.tar.bz2
-gnupg-2.0.4.tar.bz2.sig
 gnupg-2.0.5.tar.bz2
 gnupg-2.0.5.tar.bz2.sig
 gnupg-2.0.6.tar.bz2
 gnupg-2.0.6.tar.bz2.sig
+gnupg-2.0.7.tar.bz2
+gnupg-2.0.7.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnupg2.spec	17 Aug 2007 02:07:59 -0000	1.73
+++ gnupg2.spec	18 Sep 2007 20:18:46 -0000	1.74
@@ -9,7 +9,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.6
+Version: 2.0.7
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -31,7 +31,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 1.0.2
+BuildRequires: libassuan-devel >= 1.0.3
 BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
@@ -51,7 +51,7 @@
 
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: fileutils util-linux
-Requires: pinentry >= 0.7.1
+Requires: pinentry
 
 Provides: gpg
 Provides: openpgp
@@ -104,7 +104,7 @@
   --disable-rpath \
   --enable-selinux-support \
 %ifarch x86_64
-  --disable-optimization 
+#  --disable-optimization 
 %endif
 
 # not smp-safe
@@ -132,7 +132,7 @@
 
 
 %check
-# some gpg2 tests (still) FAIL
+# some gpg2 tests (still) FAIL on non i386 platforms
 make -k check ||:
 
 
@@ -177,6 +177,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.7-1
+- gnupg-2.0.7
+
+* Fri Aug 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-2
+- respin (libassuan)
+
 * Thu Aug 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.6-1
 - gnupg-2.0.6
 - License: GPLv3+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Aug 2007 02:07:59 -0000	1.25
+++ sources	18 Sep 2007 20:18:46 -0000	1.26
@@ -1,2 +1,2 @@
-f2bbbfaa320a359a28122e224ff660ce  gnupg-2.0.6.tar.bz2
-317dfb5ce7d6d6d36dbc85917d7bb070  gnupg-2.0.6.tar.bz2.sig
+9c51dfa42cb83102f4d005dc1ed54f0e  gnupg-2.0.7.tar.bz2.sig
+433de7aca1f5d4342121ea09d98a2360  gnupg-2.0.7.tar.bz2


--- gnupg-2.0.5-no_close.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:20:44 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 18 Sep 2007 16:20:44 -0400
Subject: rpms/xorg-x11-drv-amd/OLPC-2 .cvsignore, 1.13, 1.14 sources, 1.14, 
	1.15 xorg-x11-drv-amd.spec, 1.21, 1.22 amd-build-fixes.patch,
	1.1, NONE fix-potential-CPU-GP-race-in-lx_get_source_color.patch,
	1.1, NONE
Message-ID: <200709182020.l8IKKiUM000606@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv559

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Removed Files:
	amd-build-fixes.patch 
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch 
Log Message:
* Tue Sep 18 2007 Dan Williams <dcbw at redhat.com> 0.0-24.20070918
- New snapshot; disable EXA pixmap upload and download acceleration to
    work around segfault of the X server in certain situations (#3352)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Aug 2007 22:52:30 -0000	1.13
+++ .cvsignore	18 Sep 2007 20:20:12 -0000	1.14
@@ -5,3 +5,4 @@
 xf86-video-amd-0.0-git20070711.tar.bz2
 xf86-video-amd-0.0-git20070718.tar.bz2
 xf86-video-amd-0.0-git20070807.tar.bz2
+xf86-video-amd-0.0-git20070918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Aug 2007 22:52:30 -0000	1.14
+++ sources	18 Sep 2007 20:20:12 -0000	1.15
@@ -1 +1 @@
-21dbe589b49f71b189d40f6aa5e0aab9  xf86-video-amd-0.0-git20070807.tar.bz2
+54b45c7ef10bd053f1d61c5343478f2a  xf86-video-amd-0.0-git20070918.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2/xorg-x11-drv-amd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-amd.spec	7 Aug 2007 22:52:30 -0000	1.21
+++ xorg-x11-drv-amd.spec	18 Sep 2007 20:20:12 -0000	1.22
@@ -2,13 +2,13 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070807
+%define gitdate 20070918
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   23.%{gitdate}%{?dist}
-URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
+Release:   24.%{gitdate}%{?dist}
+URL:       http://dev.laptop.org/xf86-amd-devel
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
 License:   MIT/X11
@@ -36,10 +36,6 @@
 %endif
 
 Patch0: lx-disable-compression.patch
-Patch1: amd-build-fixes.patch
-
-# HACK HACK HACK (always stalls the pipeline or something like that)
-Patch2: fix-potential-CPU-GP-race-in-lx_get_source_color.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -47,8 +43,6 @@
 %prep
 %setup -q -n %{tarball}-2.7.6.5
 %patch0 -p1 -b .jx
-%patch1 -p1 -b .build-fix
-%patch2 -p1 -b .fix-color-race-HACK
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -82,6 +76,10 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Sep 18 2007 Dan Williams <dcbw at redhat.com> 0.0-24.20070918
+- New snapshot; disable EXA pixmap upload and download acceleration to
+    work around segfault of the X server in certain situations (#3352)
+
 * Tue Aug  7 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070807
 - Fix GX RGB overlay
 


--- amd-build-fixes.patch DELETED ---


--- fix-potential-CPU-GP-race-in-lx_get_source_color.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 20:24:00 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 18 Sep 2007 16:24:00 -0400
Subject: rpms/pam/devel pam-0.99.8.1-unix-blankpass.patch, 1.1,
	1.2 pam-0.99.8.1-unix-update-helper.patch, 1.1, 1.2 pam.spec,
	1.156, 1.157
Message-ID: <200709182024.l8IKO03o000766@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737

Modified Files:
	pam-0.99.8.1-unix-blankpass.patch 
	pam-0.99.8.1-unix-update-helper.patch pam.spec 
Log Message:
* Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
- when SELinux enabled always run the helper binary instead of
  direct shadow access (#293181)


pam-0.99.8.1-unix-blankpass.patch:

Index: pam-0.99.8.1-unix-blankpass.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-unix-blankpass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-unix-blankpass.patch	24 Aug 2007 13:15:01 -0000	1.1
+++ pam-0.99.8.1-unix-blankpass.patch	18 Sep 2007 20:23:57 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c
---- Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass	2007-08-22 18:45:17.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c	2007-08-24 10:21:54.000000000 +0200
-@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
+--- Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c.blankpass	2007-09-18 13:50:40.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_chkpwd.c	2007-09-18 13:50:40.000000000 +0200
+@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
  	char pass[MAXPASS + 1];
  	char *option;
  	int npass, nullok;
@@ -10,7 +10,7 @@
  	int retval = PAM_AUTH_ERR;
  	char *user;
  	char *passwords[] = { pass };
-@@ -113,6 +113,10 @@ int main(int argc, char *argv[])
+@@ -115,6 +115,10 @@ int main(int argc, char *argv[])
  	if (npass != 1) {	/* is it a valid password? */
  		_log_err(LOG_DEBUG, "no valid password supplied");
  	}
@@ -21,7 +21,7 @@
  
  	retval = _unix_verify_password(user, pass, nullok);
  
-@@ -120,8 +124,11 @@ int main(int argc, char *argv[])
+@@ -122,8 +126,11 @@ int main(int argc, char *argv[])
  
  	/* return pass or fail */
  
@@ -36,11 +36,11 @@
  	} else {
  	    return PAM_SUCCESS;
 diff -up Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass Linux-PAM-0.99.8.1/modules/pam_unix/support.c
---- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass	2007-08-22 18:45:17.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-08-24 10:38:09.000000000 +0200
-@@ -36,6 +36,9 @@
- #define SELINUX_ENABLED 0
- #endif
+--- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.blankpass	2007-09-18 13:50:40.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-09-18 17:56:57.000000000 +0200
+@@ -38,6 +38,9 @@
+ 
+ const char app_name[]="pam_unix";
  
 +static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd,
 +				   unsigned int ctrl, const char *user);
@@ -48,18 +48,17 @@
  /* this is a front-end for module-application conversations */
  
  int _make_remark(pam_handle_t * pamh, unsigned int ctrl,
-@@ -441,6 +444,14 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+@@ -442,6 +445,13 @@ _unix_blankpasswd (pam_handle_t *pamh, u
+ 			 * ...and shadow password file entry for this user,
  			 * if shadowing is enabled
  			 */
- 			spwdent = pam_modutil_getspnam(pamh, name);
-+			if (spwdent == NULL && (geteuid() || SELINUX_ENABLED)) {
-+				/* we are not root perhaps this is the reason? Run helper */
++			if (geteuid() || SELINUX_ENABLED) {
++				/* We do not have direct access to shadow. Run helper. */
 +				D(("running helper binary"));
 +				if (_unix_run_helper_binary(pamh, "", ctrl, name) == PAM_SUCCESS)
 +					return 1;
-+				else
-+					return 0;
++				return 0;
 +			}
+ 			spwdent = pam_modutil_getspnam(pamh, name);
  		}
  		if (spwdent)
- 			salt = x_strdup(spwdent->sp_pwdp);

pam-0.99.8.1-unix-update-helper.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 pam-0.99.8.1-unix-update-helper.patch
Index: pam-0.99.8.1-unix-update-helper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-unix-update-helper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-unix-update-helper.patch	23 Jul 2007 18:46:31 -0000	1.1
+++ pam-0.99.8.1-unix-update-helper.patch	18 Sep 2007 20:23:57 -0000	1.2
@@ -1,846 +1,224 @@
---- /dev/null	2007-07-08 21:11:04.052436262 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/passupdate.c	2007-07-23 13:40:56.000000000 +0200
-@@ -0,0 +1,560 @@
-+/*
-+ * Main coding by Elliot Lee <sopwith at redhat.com>, Red Hat Software.
-+ * Copyright (C) 1996.
-+ * Copyright (c) Jan R?korajski, 1999.
-+ * Copyright (c) Red Hat, Inc., 2007
-+ *
-+ * 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, and the entire permission notice in its entirety,
-+ *    including the disclaimer of warranties.
-+ * 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. The name of the author may not be used to endorse or promote
-+ *    products derived from this software without specific prior
-+ *    written permission.
-+ *
-+ * ALTERNATIVELY, this product may be distributed under the terms of
-+ * the GNU Public License, in which case the provisions of the GPL are
-+ * required INSTEAD OF the above restrictions.  (This clause is
-+ * necessary due to a potential bad interaction between the GPL and
-+ * the restrictions contained in a BSD-style copyright.)
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``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 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 will be included from module and update helper */
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c
+--- Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c.update-helper	2007-04-30 12:47:30.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/pam_unix_passwd.c	2007-09-18 09:52:43.000000000 +0200
+@@ -2,6 +2,7 @@
+  * Main coding by Elliot Lee <sopwith at redhat.com>, Red Hat Software.
+  * Copyright (C) 1996.
+  * Copyright (c) Jan R?korajski, 1999.
++ * Copyright (c) Red Hat, Inc., 2007.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -92,15 +93,6 @@ extern int getrpcport(const char *host, 
+ #endif				/* GNU libc 2.1 */
+ 
+ /*
+- * PAM framework looks for these entry-points to pass control to the
+- * password changing module.
+- */
+-
+-#if defined(USE_LCKPWDF) && !defined(HAVE_LCKPWDF)
+-# include "./lckpwdf.-c"
+-#endif
+-
+-/*
+    How it works:
+    Gets in username (has to be done) from the calling program
+    Does authentication of user (only if we are not running as root)
+@@ -108,82 +100,15 @@ extern int getrpcport(const char *host, 
+    Sets it.
+  */
+ 
+-/* passwd/salt conversion macros */
+-
+-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
+-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
+-
+ /* data tokens */
+ 
+ #define _UNIX_OLD_AUTHTOK	"-UN*X-OLD-PASS"
+ #define _UNIX_NEW_AUTHTOK	"-UN*X-NEW-PASS"
+ 
+ #define MAX_PASSWD_TRIES	3
+-#define PW_TMPFILE		"/etc/npasswd"
+-#define SH_TMPFILE		"/etc/nshadow"
+ #ifndef CRACKLIB_DICTS
+ #define CRACKLIB_DICTS		NULL
+ #endif
+-#define OPW_TMPFILE		"/etc/security/nopasswd"
+-#define OLD_PASSWORDS_FILE	"/etc/security/opasswd"
+-
+-/*
+- * i64c - convert an integer to a radix 64 character
+- */
+-static int i64c(int i)
+-{
+-	if (i < 0)
+-		return ('.');
+-	else if (i > 63)
+-		return ('z');
+-	if (i == 0)
+-		return ('.');
+-	if (i == 1)
+-		return ('/');
+-	if (i >= 2 && i <= 11)
+-		return ('0' - 2 + i);
+-	if (i >= 12 && i <= 37)
+-		return ('A' - 12 + i);
+-	if (i >= 38 && i <= 63)
+-		return ('a' - 38 + i);
+-	return ('\0');
+-}
+-
+-static char *crypt_md5_wrapper(const char *pass_new)
+-{
+-	/*
+-	 * Code lifted from Marek Michalkiewicz's shadow suite. (CG)
+-	 * removed use of static variables (AGM)
+-	 */
+-
+-	struct timeval tv;
+-	MD5_CTX ctx;
+-	unsigned char result[16];
+-	char *cp = (char *) result;
+-	unsigned char tmp[16];
+-	int i;
+-	char *x = NULL;
+-
+-	GoodMD5Init(&ctx);
+-	gettimeofday(&tv, (struct timezone *) 0);
+-	GoodMD5Update(&ctx, (void *) &tv, sizeof tv);
+-	i = getpid();
+-	GoodMD5Update(&ctx, (void *) &i, sizeof i);
+-	i = clock();
+-	GoodMD5Update(&ctx, (void *) &i, sizeof i);
+-	GoodMD5Update(&ctx, result, sizeof result);
+-	GoodMD5Final(tmp, &ctx);
+-	strcpy(cp, "$1$");	/* magic for the MD5 */
+-	cp += strlen(cp);
+-	for (i = 0; i < 8; i++)
+-		*cp++ = i64c(tmp[i] & 077);
+-	*cp = '\0';
+-
+-	/* no longer need cleartext */
+-	x = Goodcrypt_md5(pass_new, (const char *) result);
+-
+-	return x;
+-}
+ 
+ static char *getNISserver(pam_handle_t *pamh)
+ {
+@@ -217,7 +142,8 @@ static char *getNISserver(pam_handle_t *
+ 
+ #ifdef WITH_SELINUX
+ 
+-static int _unix_run_shadow_binary(pam_handle_t *pamh, unsigned int ctrl, const char *user, const char *fromwhat, const char *towhat)
++static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const char *user,
++    const char *fromwhat, const char *towhat, int remember)
+ {
+     int retval, child, fds[2];
+     void (*sighandler)(int) = NULL;
+@@ -247,7 +173,8 @@ static int _unix_run_shadow_binary(pam_h
+         size_t i=0;
+         struct rlimit rlim;
+ 	static char *envp[] = { NULL };
+-	char *args[] = { NULL, NULL, NULL, NULL };
++	char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL };
++        char buffer[16];
+ 
+ 	/* XXX - should really tidy up PAM here too */
+ 
+@@ -270,11 +197,18 @@ static int _unix_run_shadow_binary(pam_h
+         }
+ 
+ 	/* exec binary helper */
+-	args[0] = x_strdup(CHKPWD_HELPER);
++	args[0] = x_strdup(UPDATE_HELPER);
+ 	args[1] = x_strdup(user);
+-	args[2] = x_strdup("shadow");
++	args[2] = x_strdup("update");
++	if (on(UNIX_SHADOW, ctrl))
++		args[3] = x_strdup("1");
++	else
++		args[3] = x_strdup("0");
+ 
+-	execve(CHKPWD_HELPER, args, envp);
++        snprintf(buffer, sizeof(buffer), "%d", remember);
++        args[4] = x_strdup(buffer);
++	
++	execve(UPDATE_HELPER, args, envp);
[...1746 lines suppressed...]
++      if (getfscreatecon(&prev_context)<0) {
++	freecon(shadow_context);
++	return PAM_AUTHTOK_ERR;
++      }
++      if (setfscreatecon(shadow_context)) {
++	freecon(shadow_context);
++	freecon(prev_context);
++	return PAM_AUTHTOK_ERR;
++      }
++      freecon(shadow_context);
++    }
++#endif
++    pwfile = fopen(SH_TMPFILE, "w");
++    umask(oldmask);
++    if (pwfile == NULL) {
++	err = 1;
++	goto done;
++    }
++
++    opwfile = fopen("/etc/shadow", "r");
++    if (opwfile == NULL) {
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    if (fstat(fileno(opwfile), &st) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    if (fchown(fileno(pwfile), st.st_uid, st.st_gid) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++    if (fchmod(fileno(pwfile), st.st_mode) == -1) {
++	fclose(opwfile);
++	fclose(pwfile);
++	err = 1;
++	goto done;
++    }
++
++    stmpent = fgetspent(opwfile);
++    while (stmpent) {
++
++	if (!strcmp(stmpent->sp_namp, forwho)) {
++	    stmpent->sp_pwdp = towhat;
++	    stmpent->sp_lstchg = time(NULL) / (60 * 60 * 24);
++	    err = 0;
++	    D(("Set password %s for %s", stmpent->sp_pwdp, forwho));
++	}
++
++	if (putspent(stmpent, pwfile)) {
++	    D(("error writing entry to shadow file: %m"));
++	    err = 1;
++	    break;
++	}
++
++	stmpent = fgetspent(opwfile);
++    }
++    fclose(opwfile);
++
++    if (fclose(pwfile)) {
++	D(("error writing entries to shadow file: %m"));
++	err = 1;
++    }
++
++ done:
++    if (!err) {
++	if (!rename(SH_TMPFILE, "/etc/shadow"))
++#ifdef HELPER_COMPILE
++	    _log_err(
++#else
++	    pam_syslog(pamh, 
++#endif
++		LOG_NOTICE, "password changed for %s", forwho);
++	else
++	    err = 1;
++    }
++
++#ifdef WITH_SELINUX
++    if (SELINUX_ENABLED) {
++      if (setfscreatecon(prev_context)) {
++	err = 1;
++      }
++      if (prev_context)
++	freecon(prev_context);
++      prev_context=NULL;
++    }
++#endif
++
++    if (!err) {
++	return PAM_SUCCESS;
++    } else {
++	unlink(SH_TMPFILE);
++	return PAM_AUTHTOK_ERR;
++    }
++}
+diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_unix/unix_update.c
+--- /dev/null	2007-09-17 08:57:19.474470099 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/unix_update.c	2007-09-18 10:16:36.000000000 +0200
+@@ -0,0 +1,264 @@
 +/*
 + * This program is designed to run setuid(root) or with sufficient
 + * privilege to read all of the unix password databases. It is designed
@@ -1984,6 +2009,8 @@
 +        _pam_drop(xx);          \
 +}
 +
++const char app_name[] = "unix_update";
++
 +static int
 +_unix_shadowed(const struct passwd *pwd)
 +{
@@ -2194,8 +2221,9 @@
 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 + * OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
---- /dev/null	2007-07-08 21:11:04.052436262 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c	2007-07-23 13:40:56.000000000 +0200
+diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c
+--- /dev/null	2007-09-17 08:57:19.474470099 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_unix/passverify.c	2007-09-18 10:15:19.000000000 +0200
 @@ -0,0 +1,308 @@
 +/*
 + * This program is designed to run setuid(root) or with sufficient
@@ -2242,7 +2270,7 @@
 +	va_list args;
 +
 +	va_start(args, format);
-+	openlog("unix_chkpwd", LOG_CONS | LOG_PID, LOG_AUTHPRIV);
++	openlog(app_name, LOG_CONS | LOG_PID, LOG_AUTHPRIV);
 +	vsyslog(err, format, args);
 +	va_end(args);
 +	closelog();
@@ -2505,9 +2533,40 @@
 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 + * OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/support.c.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/support.c
+--- Linux-PAM-0.99.8.1/modules/pam_unix/support.c.update-helper	2007-02-06 17:06:45.000000000 +0100
++++ Linux-PAM-0.99.8.1/modules/pam_unix/support.c	2007-09-18 12:05:31.000000000 +0200
+@@ -36,6 +36,8 @@
+ #define SELINUX_ENABLED 0
+ #endif
+ 
++const char app_name[]="pam_unix";
++
+ /* this is a front-end for module-application conversations */
+ 
+ int _make_remark(pam_handle_t * pamh, unsigned int ctrl,
+@@ -627,7 +629,7 @@ int _unix_verify_password(pam_handle_t *
+ 				setreuid( save_uid, -1 );
+ 				setreuid( -1, save_euid );
+ 			}
+-		} else if (_unix_shadowed(pwd)) {
++		} else if (_unix_shadowed(pwd) && !SELINUX_ENABLED) {
+ 			/*
+ 			 * ...and shadow password file entry for this user,
+ 			 * if shadowing is enabled
+diff -up Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am.update-helper Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am
 --- Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am.update-helper	2006-12-18 19:50:50.000000000 +0100
-+++ Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am	2007-07-23 13:40:56.000000000 +0200
-@@ -16,7 +16,8 @@
++++ Linux-PAM-0.99.8.1/modules/pam_unix/Makefile.am	2007-09-18 12:54:44.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ CLEANFILES = *~
+ 
+-EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \
++EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c passupdate.c $(MANS) CHANGELOG \
+ 		tst-pam_unix $(XMLS) 
+ 
+ man_MANS = pam_unix.8 unix_chkpwd.8
+@@ -16,7 +16,8 @@ securelibdir = $(SECUREDIR)
  secureconfdir = $(SCONFIGDIR)
  
  AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
@@ -2517,7 +2576,7 @@
  
  if HAVE_LIBSELINUX
    AM_CFLAGS += -D"WITH_SELINUX"
-@@ -34,9 +35,9 @@
+@@ -34,9 +35,9 @@ endif
  
  securelib_LTLIBRARIES = pam_unix.la
  
@@ -2529,7 +2588,7 @@
  
  noinst_PROGRAMS = bigcrypt
  
-@@ -48,11 +49,16 @@
+@@ -48,11 +49,16 @@ bigcrypt_SOURCES = bigcrypt.c bigcrypt_m
  bigcrypt_CFLAGS = $(AM_CFLAGS)
  bigcrypt_LDFLAGS = @LIBCRYPT@
  


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- pam.spec	24 Aug 2007 13:15:01 -0000	1.156
+++ pam.spec	18 Sep 2007 20:23:57 -0000	1.157
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 6%{?dist}
+Release: 7%{?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
@@ -397,6 +397,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
+- when SELinux enabled always run the helper binary instead of
+  direct shadow access (#293181)
+
 * Fri Aug 24 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-6
 - do not ask for blank password when SELinux confined (#254044)
 - initialize homedirs in namespace init script (original patch by dwalsh)



From fedora-extras-commits at redhat.com  Tue Sep 18 20:28:35 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:28:35 -0400
Subject: rpms/gchempaint/devel gchempaint.spec,1.11,1.12
Message-ID: <200709182028.l8IKSZWs000903@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv868

Modified Files:
	gchempaint.spec 
Log Message:
BR: libtool


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gchempaint.spec	18 Sep 2007 20:00:43 -0000	1.11
+++ gchempaint.spec	18 Sep 2007 20:28:03 -0000	1.12
@@ -19,6 +19,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
 BuildRequires:  automake
+BuildRequires:  libtool
 
 Requires:       hicolor-icon-theme
 



From fedora-extras-commits at redhat.com  Tue Sep 18 20:29:59 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Tue, 18 Sep 2007 16:29:59 -0400
Subject: rpms/filezilla/F-7 filezilla.spec,1.1,1.2
Message-ID: <200709182029.l8IKTxq0001067@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv955

Modified Files:
	filezilla.spec 
Log Message:
Add Requires to have gnutls >= 1.5.4



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/filezilla.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filezilla.spec	10 Sep 2007 20:30:10 -0000	1.1
+++ filezilla.spec	18 Sep 2007 20:29:27 -0000	1.2
@@ -25,6 +25,8 @@
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
+Requires:  gnutls >= 1.5.4
+
 
 %description
 FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.



From fedora-extras-commits at redhat.com  Tue Sep 18 20:30:13 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Tue, 18 Sep 2007 16:30:13 -0400
Subject: rpms/gchempaint/F-7 gchempaint.spec,1.10,1.11
Message-ID: <200709182030.l8IKUDgn001076@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1023

Modified Files:
	gchempaint.spec 
Log Message:
BR: libtool


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/F-7/gchempaint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gchempaint.spec	18 Sep 2007 20:11:32 -0000	1.10
+++ gchempaint.spec	18 Sep 2007 20:29:41 -0000	1.11
@@ -19,6 +19,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdelibs
 BuildRequires:  automake
+BuildRequires:  libtool
 
 Requires:       hicolor-icon-theme
 



From fedora-extras-commits at redhat.com  Tue Sep 18 20:30:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 16:30:23 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.122, 1.123 libsepol.spec, 1.164, 
	1.165 sources, 1.123, 1.124
Message-ID: <200709182030.l8IKUN7d001089@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
- Upgrade to latest from NSA
	* Merged support for the handle_unknown policydb flag from Eric Paris.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	31 Aug 2007 12:42:21 -0000	1.122
+++ .cvsignore	18 Sep 2007 20:29:51 -0000	1.123
@@ -122,3 +122,4 @@
 libsepol-2.0.6.tgz
 libsepol-2.0.7.tgz
 libsepol-2.0.9.tgz
+libsepol-2.0.10.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- libsepol.spec	31 Aug 2007 14:16:54 -0000	1.164
+++ libsepol.spec	18 Sep 2007 20:29:51 -0000	1.165
@@ -1,7 +1,7 @@
 
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -86,6 +86,10 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
+- Upgrade to latest from NSA
+	* Merged support for the handle_unknown policydb flag from Eric Paris.
+
 * Fri Aug 31 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-1
 - Upgrade to latest from NSA
 	* Moved next_entry and put_entry out-of-line to reduce code size from Ulrich Drepper.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	31 Aug 2007 12:42:21 -0000	1.123
+++ sources	18 Sep 2007 20:29:51 -0000	1.124
@@ -1 +1 @@
-2e5233bb16cb3d23c8ea226c85085d6d  libsepol-2.0.9.tgz
+0183e0fed49daa76c059d11fa2949ff6  libsepol-2.0.10.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:31:33 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 18 Sep 2007 16:31:33 -0400
Subject: rpms/rtorrent/devel .cvsignore, 1.8, 1.9 rtorrent.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709182031.l8IKVXvh001208@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1160

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
Updating to last upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jun 2007 14:44:00 -0000	1.8
+++ .cvsignore	18 Sep 2007 20:31:00 -0000	1.9
@@ -1,2 +1 @@
-rtorrent-0.7.4.tar.gz
-rtorrent.rc.example
+rtorrent-0.7.8.tar.gz


Index: rtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rtorrent.spec	28 Aug 2007 21:53:49 -0000	1.18
+++ rtorrent.spec	18 Sep 2007 20:31:00 -0000	1.19
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.7.4
-Release:       3%{?dist}
+Version:       0.7.8
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.11.4, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.11.4
+Requires:      libtorrent >= 0.11.8
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -44,6 +44,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Tue Sep 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0.7.8-1
+- New upstream release
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.7.4-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtorrent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Jun 2007 14:44:00 -0000	1.8
+++ sources	18 Sep 2007 20:31:00 -0000	1.9
@@ -1,2 +1 @@
-6a846c129c1b3d0d08478faa4c3d8339  rtorrent-0.7.4.tar.gz
-e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example
+50886a98fa2ae16ae33367ef61772e1e  rtorrent-0.7.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:35:54 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 18 Sep 2007 16:35:54 -0400
Subject: rpms/glibc/devel glibc-fedora.patch,1.237,1.238
Message-ID: <200709182035.l8IKZsDk001365@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344

Modified Files:
	glibc-fedora.patch 
Log Message:
2.6.90-14

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- glibc-fedora.patch	18 Sep 2007 20:12:30 -0000	1.237
+++ glibc-fedora.patch	18 Sep 2007 20:35:52 -0000	1.238
@@ -2149,3 +2149,17 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/misc/bits/syslog.h	18 Sep 2007 19:57:16 -0000	1.1.2.2
++++ libc/misc/bits/syslog.h	18 Sep 2007 20:33:39 -0000
+@@ -27,9 +27,9 @@ extern void __syslog_chk (int __pri, int
+ 
+ #ifdef __va_arg_pack
+ __extern_always_inline void
+-syslog (int __pri, int __flag, __const char *__fmt, ...)
++syslog (int __pri, __const char *__fmt, ...)
+ {
+-  return __syslog_chk (__pri, __flag, __fmt, __va_arg_pack ());
++  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
+ }
+ #elif !defined __cplusplus
+ # define syslog(pri, ...) \



From fedora-extras-commits at redhat.com  Tue Sep 18 20:41:33 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 18 Sep 2007 16:41:33 -0400
Subject: rpms/gphoto2/devel gphoto2-storage.patch, NONE, 1.1 gphoto2.spec,
	1.83, 1.84
Message-ID: <200709182041.l8IKfXLn001707@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1480

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-storage.patch 
Log Message:
avoid tagging mass storage devices as cameras (#295051)

gphoto2-storage.patch:

--- NEW FILE gphoto2-storage.patch ---
--- gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig	2007-09-18 11:36:19.000000000 -0400
+++ gphoto2-2.4.0/libgphoto2-2.4.0/packaging/generic/print-camera-list.c	2007-09-18 11:52:42.000000000 -0400
@@ -799,6 +799,8 @@
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
 	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("   <!-- skip USB Mass Storage Devices -->\n");
+	printf("   <match key=\"usb.interface_class\" compare_ne=\"8\">\n");
 	return 0;
 }
 
@@ -838,52 +840,52 @@
 			return 0;
 		}
 		if (a->usb_vendor) { /* usb product id might be 0! */
-			printf("   <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
-			printf("    <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
+			printf("    <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
+			printf("     <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
 			if (a->device_type & GP_DEVICE_AUDIO_PLAYER) {
-				printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
-				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
-				printf("     <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
+				printf("      <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+				printf("      <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
+				printf("      <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
 				
 				/* FIXME: needs true formats ... But all of them can do MP3 */
-				printf("     <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
+				printf("      <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
 			} else {
-				printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+				printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 				
 				/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
 				if (NULL!=strstr(a->library,"ptp"))
-					printf("     <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
+					printf("      <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
 				else
-					printf("     <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+					printf("      <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
 			}
 			/* leave them here even for audio players */
-			printf("     <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
-			printf("     <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("      <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
+			printf("      <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 			
 		} else if ((a->usb_class) && (a->usb_class != 666)) {
-			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
-			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
-			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
-			printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-			printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
+			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
+			printf("      <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
+			printf("       <merge key=\"info.category\" type=\"string\">camera</merge>\n");
+			printf("       <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 			if (a->usb_class == 6) {
-				printf("      <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
+				printf("       <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
 			} else {
 				if (a->usb_class == 8) {
-					printf("      <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
+					printf("       <merge key=\"camera.access_method\" type=\"string\">storage</merge>\n");
 				} else {
-					printf("      <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
+					printf("       <merge key=\"camera.access_method\" type=\"string\">proprietary</merge>\n");
 				}
 			}
-			printf("      <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
-			printf("      <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("       <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
+			printf("       <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+			printf("      </match>\n");
 			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 	} /* camera has USB connection */
 	return 0;
@@ -892,6 +894,7 @@
 static int
 fdi_end_func (const func_params_t *params, void *data)
 {
+	printf("   </match>\n");
 	printf("  </match>\n");
 	printf(" </device>\n");
 	printf("</deviceinfo>\n");
@@ -918,6 +921,8 @@
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
 	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("   <!-- skip USB Mass Storage Devices -->\n");
+	printf("   <match key=\"usb.interface_class\" compare_ne=\"8\">\n");
 	return 0;
 }
 
@@ -961,28 +966,28 @@
 			/* do not set category. We don't really know what this device really is.
 			 * But we do now that is capable of being a camera, so add to capabilities
 			 */
-			printf("   <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
-			printf("    <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
+			printf("    <match key=\"usb_device.vendor_id\" int=\"%d\">\n", a->usb_vendor);
+			printf("     <match key=\"usb_device.product_id\" int=\"%d\">\n", a->usb_product);
 			if (params->add_comments) {
 				printf("     <!-- %s -->\n", a->model);
 			}
 			if (a->device_type & GP_DEVICE_AUDIO_PLAYER)
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
 			else
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+				printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 #if 0
 		/* would need to be able to merge upwards ... but cannot currently */
 		else if ((a->usb_class) && (a->usb_class != 666)) {
-			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
-			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
-			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
-			printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
+			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
+			printf("      <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
+			printf("       <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+			printf("      </match>\n");
 			printf("     </match>\n");
 			printf("    </match>\n");
-			printf("   </match>\n");
 		}
 #endif
 	}
@@ -992,6 +997,7 @@
 static int
 fdi_device_end_func (const func_params_t *params, void *data)
 {
+	printf("   </match>\n");
 	printf("  </match>\n");
 	printf(" </device>\n");
 	printf("</deviceinfo>\n");


Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gphoto2.spec	23 Aug 2007 06:29:42 -0000	1.83
+++ gphoto2.spec	18 Sep 2007 20:41:01 -0000	1.84
@@ -8,13 +8,14 @@
 %define libpkg libgphoto2
 %define libver 2.4.0
 Version: %{pkgver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
 Patch1: gphoto2-pkgcfg.patch
+Patch2: gphoto2-storage.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 Provides: libgphoto2 = %{libver}
@@ -68,6 +69,7 @@
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .pkgcfg
+%patch2 -p1 -b .storage
 
 # write pkg-config stuff 
 cat > gphoto2.pc.in << EOF
@@ -197,6 +199,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Sep 18 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-3
+- avoid tagging mass storage devices as cameras (#295051)
+
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-2
 - update License
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Tue Sep 18 20:45:19 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 16:45:19 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.149, 1.150 libselinux-rhat.patch,
	1.127, 1.128 libselinux.spec, 1.285, 1.286 sources, 1.151, 1.152
Message-ID: <200709182045.l8IKjJZ6001878@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- .cvsignore	13 Sep 2007 12:29:38 -0000	1.149
+++ .cvsignore	18 Sep 2007 20:44:47 -0000	1.150
@@ -128,3 +128,4 @@
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
+libselinux-2.0.34.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- libselinux-rhat.patch	18 Sep 2007 15:37:42 -0000	1.127
+++ libselinux-rhat.patch	18 Sep 2007 20:44:47 -0000	1.128
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c	2007-08-10 11:58:34.000000000 -0400
-+++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 11:28:07.000000000 -0400
+--- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
++++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 15:45:42.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -9,17 +9,41 @@
  #include "selinux_internal.h"
  #include "label_internal.h"
  #include "callbacks.h"
-@@ -55,10 +56,12 @@
- #endif
-     default_printf(const char *fmt, ...)
+@@ -57,7 +58,7 @@
  {
-+	char buf[BUFSIZ];
  	va_list ap;
  	va_start(ap, fmt);
 -	vfprintf(stderr, fmt, ap);
-+	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
++	vsyslog(LOG_ERR, fmt, ap);
  	va_end(ap);
-+	syslog(LOG_ERR, buf, strlen(buf));
  }
  
- void
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.33/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
++++ libselinux-2.0.33/utils/matchpathcon.c	2007-09-18 15:50:31.000000000 -0400
+@@ -17,10 +17,24 @@
+ 	exit(1);
+ }
+ 
++static void
++#ifdef __GNUC__
++    __attribute__ ((format(printf, 1, 2)))
++#endif
++    myprintf(const char *fmt, ...)
++{
++	va_list ap;
++	va_start(ap, fmt);
++	vfprintf(stderr, fmt, ap);
++	va_end(ap);
++}
++
+ int printmatchpathcon(char *path, int header, int mode)
+ {
+ 	char *buf;
+-	int rc = matchpathcon(path, mode, &buf);
++	int rc;
++	set_matchpathcon_printf(myprintf);
++	rc = matchpathcon(path, mode, &buf);
+ 	if (rc < 0) {
+ 		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
+ 			strerror(errno));


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- libselinux.spec	18 Sep 2007 15:37:42 -0000	1.285
+++ libselinux.spec	18 Sep 2007 20:44:47 -0000	1.286
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.1-1
+%define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.33
-Release: 2%{?dist}
+Version: 2.0.34
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,10 @@
 
 %changelog
 
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-1
+- Upgrade to latest from NSA
+	* Fix selabel option flag setting for 64-bit from Stephen Smalley.
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.33-2
 - Change matchpatcon to use syslog instead of syserror
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	13 Sep 2007 12:29:38 -0000	1.151
+++ sources	18 Sep 2007 20:44:47 -0000	1.152
@@ -1 +1 @@
-0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz
+e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:45:40 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 18 Sep 2007 16:45:40 -0400
Subject: rpms/pungi/devel .cvsignore, 1.25, 1.26 pungi.spec, 1.27,
	1.28 sources, 1.26, 1.27
Message-ID: <200709182045.l8IKjeM2001924@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New release to create media repo file.  Used by yum/pirut post install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	17 Sep 2007 21:37:38 -0000	1.25
+++ .cvsignore	18 Sep 2007 20:45:07 -0000	1.26
@@ -1 +1 @@
-pungi-1.1.0.tar.gz
+pungi-1.1.1.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pungi.spec	17 Sep 2007 21:37:38 -0000	1.27
+++ pungi.spec	18 Sep 2007 20:45:07 -0000	1.28
@@ -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:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Jesse Keating <jkeating at redhat.com> - 1.1.1-1
+- Create a media.repo file on the first iso
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 1.1.0-1
 - Create repoview content in the tree
 - Move the .composeinfo file into the directory we actually publish


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	17 Sep 2007 21:37:38 -0000	1.26
+++ sources	18 Sep 2007 20:45:07 -0000	1.27
@@ -1 +1 @@
-b3b7fc5296b9d4c7d9a18c81142baff1  pungi-1.1.0.tar.gz
+60e42213c8e0fc5d8306f6b32d468397  pungi-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 20:51:24 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 16:51:24 -0400
Subject: rpms/polyester/F-7 .cvsignore, 1.3, 1.4 polyester.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709182051.l8IKpO6U002146@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106/F-7

Modified Files:
	.cvsignore polyester.spec sources 
Log Message:
Update to new version on F-7 and FC-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2007 08:43:51 -0000	1.3
+++ .cvsignore	18 Sep 2007 20:50:51 -0000	1.4
@@ -1 +1 @@
-polyester-1.0.1.tar.bz2
+polyester-1.0.2.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/polyester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- polyester.spec	16 Aug 2007 10:08:21 -0000	1.3
+++ polyester.spec	18 Sep 2007 20:50:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           polyester
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        KDE style and window decoration
 
 Group:          User Interface/Desktops
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Aug 21 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.2-1
+- new upstream version: 1.0.2
+
 * Thu Aug 16 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.1-2
 - Change License to LGPLv2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2007 08:43:51 -0000	1.3
+++ sources	18 Sep 2007 20:50:51 -0000	1.4
@@ -1 +1 @@
-ad446cbaa846f660670315bad7c07dc0  polyester-1.0.1.tar.bz2
+6b85333e774567e69c741b35a54a4df5  polyester-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:51:26 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 16:51:26 -0400
Subject: rpms/polyester/FC-6 .cvsignore, 1.3, 1.4 polyester.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709182051.l8IKpQ44002151@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2106/FC-6

Modified Files:
	.cvsignore polyester.spec sources 
Log Message:
Update to new version on F-7 and FC-6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2007 08:44:23 -0000	1.3
+++ .cvsignore	18 Sep 2007 20:50:54 -0000	1.4
@@ -1 +1 @@
-polyester-1.0.1.tar.bz2
+polyester-1.0.2.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/polyester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- polyester.spec	16 Aug 2007 10:08:24 -0000	1.3
+++ polyester.spec	18 Sep 2007 20:50:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           polyester
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        KDE style and window decoration
 
 Group:          User Interface/Desktops
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Aug 21 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.2-1
+- new upstream version: 1.0.2
+
 * Thu Aug 16 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.0.1-2
 - Change License to LGPLv2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2007 08:44:23 -0000	1.3
+++ sources	18 Sep 2007 20:50:54 -0000	1.4
@@ -1 +1 @@
-ad446cbaa846f660670315bad7c07dc0  polyester-1.0.1.tar.bz2
+6b85333e774567e69c741b35a54a4df5  polyester-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 20:59:23 2007
From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen))
Date: Tue, 18 Sep 2007 16:59:23 -0400
Subject: rpms/kernel/devel
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch,
	NONE, 1.1
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch,
	NONE, 1.1 linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch,
	NONE, 1.1 linux-2.6-xfs-filesize-updates.patch, NONE,
	1.1 linux-2.6-xfs-setfattr-32bit-compat.patch, NONE,
	1.1 kernel.spec, 1.169, 1.170
Message-ID: <200709182059.l8IKxNbV002491@cvs-int.fedora.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2437

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch 
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch 
	linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch 
	linux-2.6-xfs-filesize-updates.patch 
	linux-2.6-xfs-setfattr-32bit-compat.patch 
Log Message:
* Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
- ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
  handle dx directory corruption gracefully, w/o BUG (#236464).
- xfs bugfixes: setfattr/getfattr/getversion 32-bit compat fixes (#291981),
  log replay vs. filesize update fixes from sgi.


linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch:

--- NEW FILE linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch ---
The patch titled
     dir_index: error out instead of BUG on corrupt dx dirs
has been added to the -mm tree.  Its filename is
     dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch

Index: linux-2.6.22.noarch/fs/ext3/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext3/namei.c
+++ linux-2.6.22.noarch/fs/ext3/namei.c
@@ -379,13 +379,28 @@ dx_probe(struct dentry *dentry, struct i
 
 	entries = (struct dx_entry *) (((char *)&root->info) +
 				       root->info.info_length);
-	assert(dx_get_limit(entries) == dx_root_limit(dir,
-						      root->info.info_length));
+
+	if (dx_get_limit(entries) != dx_root_limit(dir,
+						   root->info.info_length)) {
+		ext3_warning(dir->i_sb, __FUNCTION__,
+			     "dx entry: limit != root limit");
+		brelse(bh);
+		*err = ERR_BAD_DX_DIR;
+		goto fail;
+	}
+
 	dxtrace (printk("Look up %x", hash));
 	while (1)
 	{
 		count = dx_get_count(entries);
-		assert (count && count <= dx_get_limit(entries));
+		if (!count || count > dx_get_limit(entries)) {
+			ext3_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: no count or count > limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
+
 		p = entries + 1;
 		q = entries + count - 1;
 		while (p <= q)
@@ -423,8 +438,15 @@ dx_probe(struct dentry *dentry, struct i
 		if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
 			goto fail2;
 		at = entries = ((struct dx_node *) bh->b_data)->entries;
-		assert (dx_get_limit(entries) == dx_node_limit (dir));
+		if (dx_get_limit(entries) != dx_node_limit (dir)) {
+			ext3_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: limit != node limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
 		frame++;
+		frame->bh = NULL;
 	}
 fail2:
 	while (frame >= frame_in) {
@@ -432,6 +454,10 @@ fail2:
 		frame--;
 	}
 fail:
+	if (*err == ERR_BAD_DX_DIR)
+		ext3_warning(dir->i_sb, __FUNCTION__,
+			     "Corrupt dir inode %ld, running e2fsck is "
+			     "recommended.", dir->i_ino);
 	return NULL;
 }
 
Index: linux-2.6.22.noarch/fs/ext4/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext4/namei.c
+++ linux-2.6.22.noarch/fs/ext4/namei.c
@@ -379,13 +379,28 @@ dx_probe(struct dentry *dentry, struct i
 
 	entries = (struct dx_entry *) (((char *)&root->info) +
 				       root->info.info_length);
-	assert(dx_get_limit(entries) == dx_root_limit(dir,
-						      root->info.info_length));
+
+	if (dx_get_limit(entries) != dx_root_limit(dir,
+						   root->info.info_length)) {
+		ext4_warning(dir->i_sb, __FUNCTION__,
+			     "dx entry: limit != root limit");
+		brelse(bh);
+		*err = ERR_BAD_DX_DIR;
+		goto fail;
+	}
+
 	dxtrace (printk("Look up %x", hash));
 	while (1)
 	{
 		count = dx_get_count(entries);
-		assert (count && count <= dx_get_limit(entries));
+		if (!count || count > dx_get_limit(entries)) {
+			ext4_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: no count or count > limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
+
 		p = entries + 1;
 		q = entries + count - 1;
 		while (p <= q)
@@ -423,8 +438,15 @@ dx_probe(struct dentry *dentry, struct i
 		if (!(bh = ext4_bread (NULL,dir, dx_get_block(at), 0, err)))
 			goto fail2;
 		at = entries = ((struct dx_node *) bh->b_data)->entries;
-		assert (dx_get_limit(entries) == dx_node_limit (dir));
+		if (dx_get_limit(entries) != dx_node_limit (dir)) {
+			ext4_warning(dir->i_sb, __FUNCTION__,
+				     "dx entry: limit != node limit");
+			brelse(bh);
+			*err = ERR_BAD_DX_DIR;
+			goto fail2;
+		}
 		frame++;
+		frame->bh = NULL;
 	}
 fail2:
 	while (frame >= frame_in) {
@@ -432,6 +454,10 @@ fail2:
 		frame--;
 	}
 fail:
+	if (*err == ERR_BAD_DX_DIR)
+		ext4_warning(dir->i_sb, __FUNCTION__,
+			     "Corrupt dir inode %ld, running e2fsck is "
+			     "recommended.", dir->i_ino);
 	return NULL;
 }
 

linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch:

--- NEW FILE linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch ---
The patch titled
     ext34: ensure do_split leaves enough free space in both blocks
has been added to the -mm tree.  Its filename is
     ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch

Index: linux-2.6.22.noarch/fs/ext3/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext3/namei.c
+++ linux-2.6.22.noarch/fs/ext3/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
 	u32 hash;
-	u32 offs;
+	u16 offs;
+	u16 size;
 };
 
 #ifdef CONFIG_EXT3_INDEX
@@ -697,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
 			struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -710,7 +715,8 @@ static int dx_make_map (struct ext3_dir_
 			ext3fs_dirhash(de->name, de->name_len, &h);
 			map_tail--;
 			map_tail->hash = h.hash;
-			map_tail->offs = (u32) ((char *) de - base);
+			map_tail->offs = (u16) ((char *) de - base);
+			map_tail->size = le16_to_cpu(de->rec_len);
 			count++;
 			cond_resched();
 		}
@@ -720,6 +726,7 @@ static int dx_make_map (struct ext3_dir_
 	return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
         struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1117,6 +1124,10 @@ static inline void ext3_set_de_type(stru
 }
 
 #ifdef CONFIG_EXT3_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext3_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1135,6 +1146,10 @@ dx_move_dirents(char *from, char *to, st
 	return (struct ext3_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 static struct ext3_dir_entry_2* dx_pack_dirents(char *base, int size)
 {
 	struct ext3_dir_entry_2 *next, *to, *prev, *de = (struct ext3_dir_entry_2 *) base;
@@ -1157,6 +1172,11 @@ static struct ext3_dir_entry_2* dx_pack_
 	return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
 			struct buffer_head **bh,struct dx_frame *frame,
 			struct dx_hash_info *hinfo, int *error)
@@ -1168,7 +1188,7 @@ static struct ext3_dir_entry_2 *do_split
 	u32 hash2;
 	struct dx_map_entry *map;
 	char *data1 = (*bh)->b_data, *data2;
-	unsigned split;
+	unsigned split, move, size, i;
 	struct ext3_dir_entry_2 *de = NULL, *de2;
 	int	err = 0;
 
@@ -1196,8 +1216,19 @@ static struct ext3_dir_entry_2 *do_split
 	count = dx_make_map ((struct ext3_dir_entry_2 *) data1,
 			     blocksize, hinfo, map);
 	map -= count;
-	split = count/2; // need to adjust to actual middle
 	dx_sort_map (map, count);
+	/* Split the existing block in the middle, size-wise */
+	size = 0;
+	move = 0;
+	for (i = count-1; i >= 0; i--) {
+		/* is more than half of this entry in 2nd half of the block? */
+		if (size + map[i].size/2 > blocksize/2)
+			break;
+		size += map[i].size;
+		move++;
+	}
+	/* map index at which we will split */
+	split = count - move;
 	hash2 = map[split].hash;
 	continued = hash2 == map[split - 1].hash;
 	dxtrace(printk("Split block %i at %x, %i/%i\n",
Index: linux-2.6.22.noarch/fs/ext4/namei.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/ext4/namei.c
+++ linux-2.6.22.noarch/fs/ext4/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
 	u32 hash;
-	u32 offs;
+	u16 offs;
+	u16 size;
 };
 
 #ifdef CONFIG_EXT4_INDEX
@@ -697,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext4_dir_entry_2 *de, int size,
 			struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -710,7 +715,8 @@ static int dx_make_map (struct ext4_dir_
 			ext4fs_dirhash(de->name, de->name_len, &h);
 			map_tail--;
 			map_tail->hash = h.hash;
-			map_tail->offs = (u32) ((char *) de - base);
+			map_tail->offs = (u16) ((char *) de - base);
+			map_tail->size = le16_to_cpu(de->rec_len);
 			count++;
 			cond_resched();
 		}
@@ -720,6 +726,7 @@ static int dx_make_map (struct ext4_dir_
 	return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
 	struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1115,6 +1122,10 @@ static inline void ext4_set_de_type(stru
 }
 
 #ifdef CONFIG_EXT4_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext4_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1133,6 +1144,10 @@ dx_move_dirents(char *from, char *to, st
 	return (struct ext4_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 static struct ext4_dir_entry_2* dx_pack_dirents(char *base, int size)
 {
 	struct ext4_dir_entry_2 *next, *to, *prev, *de = (struct ext4_dir_entry_2 *) base;
@@ -1155,6 +1170,11 @@ static struct ext4_dir_entry_2* dx_pack_
 	return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
 			struct buffer_head **bh,struct dx_frame *frame,
 			struct dx_hash_info *hinfo, int *error)
@@ -1166,7 +1186,7 @@ static struct ext4_dir_entry_2 *do_split
 	u32 hash2;
 	struct dx_map_entry *map;
 	char *data1 = (*bh)->b_data, *data2;
-	unsigned split;
+	unsigned split, move, size, i;
 	struct ext4_dir_entry_2 *de = NULL, *de2;
 	int	err = 0;
 
@@ -1194,8 +1214,19 @@ static struct ext4_dir_entry_2 *do_split
 	count = dx_make_map ((struct ext4_dir_entry_2 *) data1,
 			     blocksize, hinfo, map);
 	map -= count;
-	split = count/2; // need to adjust to actual middle
 	dx_sort_map (map, count);
+	/* Split the existing block in the middle, size-wise */
+	size = 0;
+	move = 0;
+	for (i = count-1; i >= 0; i--) {
+		/* is more than half of this entry in 2nd half of the block? */
+		if (size + map[i].size/2 > blocksize/2)
+			break;
+		size += map[i].size;
+		move++;
+	}
+	/* map index at which we will split */
+	split = count - move;
 	hash2 = map[split].hash;
 	continued = hash2 == map[split - 1].hash;
 	dxtrace(printk("Split block %i at %x, %i/%i\n",

linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch:

--- NEW FILE linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch ---
From: Lachlan McIlroy <lachlan at sgi.com>
Date: Fri, 14 Sep 2007 05:23:04 +0000 (+1000)
Subject: [XFS] Avoid replaying inode buffer initialisation log items if on-disk
X-Git-Url: http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs%2Fxfs-2.6.git;a=commitdiff_plain;h=4a5fd6f64de88906ceba164e9b002a87f3e55894;hp=8e04f1324e37bd317502c4393d381e5060323c08

[XFS] Avoid replaying inode buffer initialisation log items if on-disk
version is newer.

SGI-PV: 969656
SGI-Modid: xfs-linux-melb:xfs-kern:29676a

Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
---

Index: linux-2.6.22.noarch/fs/xfs/xfs_buf_item.h
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_buf_item.h
+++ linux-2.6.22.noarch/fs/xfs/xfs_buf_item.h
@@ -52,6 +52,11 @@ typedef struct xfs_buf_log_format_t {
 #define	XFS_BLI_UDQUOT_BUF	0x4
 #define XFS_BLI_PDQUOT_BUF	0x8
 #define	XFS_BLI_GDQUOT_BUF	0x10
+/*
+ * This flag indicates that the buffer contains newly allocated
+ * inodes.
+ */
+#define	XFS_BLI_INODE_NEW_BUF	0x20
 
 #define	XFS_BLI_CHUNK		128
 #define	XFS_BLI_SHIFT		7
Index: linux-2.6.22.noarch/fs/xfs/xfs_log_recover.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_log_recover.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_log_recover.c
@@ -1874,6 +1874,7 @@ xlog_recover_do_inode_buffer(
 /*ARGSUSED*/
 STATIC void
 xlog_recover_do_reg_buffer(
+	xfs_mount_t		*mp,
 	xlog_recover_item_t	*item,
 	xfs_buf_t		*bp,
 	xfs_buf_log_format_t	*buf_f)
@@ -1884,6 +1885,50 @@ xlog_recover_do_reg_buffer(
 	unsigned int		*data_map = NULL;
 	unsigned int		map_size = 0;
 	int                     error;
+	int			stale_buf = 1;
+
+	/*
+	 * Scan through the on-disk inode buffer and attempt to
+	 * determine if it has been written to since it was logged.
+	 *
+	 * - If any of the magic numbers are incorrect then the buffer is stale
+	 * - If any of the modes are non-zero then the buffer is not stale
+	 * - If all of the modes are zero and at least one of the generation
+	 *   counts is non-zero then the buffer is stale
+	 *
+	 * If the end result is a stale buffer then the log buffer is replayed
+	 * otherwise it is skipped.
+	 *
+	 * This heuristic is not perfect.  It can be improved by scanning the
+	 * entire inode chunk for evidence that any of the inode clusters have
+	 * been updated.  To fix this problem completely we will need a major
+	 * architectural change to the logging system.
+	 */
+	if (buf_f->blf_flags & XFS_BLI_INODE_NEW_BUF) {
+		xfs_dinode_t    *dip;
+		int             inodes_per_buf;
+		int		mode_count = 0;
+		int		gen_count = 0;
+
+		stale_buf = 0;
+		inodes_per_buf = XFS_BUF_COUNT(bp) >> mp->m_sb.sb_inodelog;
+		for (i = 0; i < inodes_per_buf; i++) {
+			dip = (xfs_dinode_t *)xfs_buf_offset(bp,
+				i * mp->m_sb.sb_inodesize);
+			if (be16_to_cpu(dip->di_core.di_magic) !=
+					XFS_DINODE_MAGIC) {
+				stale_buf = 1;
+				break;
+			}
+			if (be16_to_cpu(dip->di_core.di_mode))
+				mode_count++;
+			if (be16_to_cpu(dip->di_core.di_gen))
+				gen_count++;
+		}
+
+		if (!mode_count && gen_count)
+			stale_buf = 1;
+	}
 
 	switch (buf_f->blf_type) {
 	case XFS_LI_BUF:
@@ -1917,7 +1962,7 @@ xlog_recover_do_reg_buffer(
 					       -1, 0, XFS_QMOPT_DOWARN,
 					       "dquot_buf_recover");
 		}
-		if (!error)
+		if (!error && stale_buf)
 			memcpy(xfs_buf_offset(bp,
 				(uint)bit << XFS_BLI_SHIFT),	/* dest */
 				item->ri_buf[i].i_addr,		/* source */
@@ -2089,7 +2134,7 @@ xlog_recover_do_dquot_buffer(
 	if (log->l_quotaoffs_flag & type)
 		return;
 
-	xlog_recover_do_reg_buffer(item, bp, buf_f);
+	xlog_recover_do_reg_buffer(mp, item, bp, buf_f);
 }
 
 /*
@@ -2190,7 +2235,7 @@ xlog_recover_do_buffer_trans(
 		  (XFS_BLI_UDQUOT_BUF|XFS_BLI_PDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) {
 		xlog_recover_do_dquot_buffer(mp, log, item, bp, buf_f);
 	} else {
-		xlog_recover_do_reg_buffer(item, bp, buf_f);
+		xlog_recover_do_reg_buffer(mp, item, bp, buf_f);
 	}
 	if (error)
 		return XFS_ERROR(error);
Index: linux-2.6.22.noarch/fs/xfs/xfs_trans_buf.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_trans_buf.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_trans_buf.c
@@ -966,6 +966,7 @@ xfs_trans_inode_alloc_buf(
 	ASSERT(atomic_read(&bip->bli_refcount) > 0);
 
 	bip->bli_flags |= XFS_BLI_INODE_ALLOC_BUF;
+	bip->bli_format.blf_flags |= XFS_BLI_INODE_NEW_BUF;
 }
 
 

linux-2.6-xfs-filesize-updates.patch:

--- NEW FILE linux-2.6-xfs-filesize-updates.patch ---
From: Lachlan McIlroy <lachlan at sgi.com>
Date: Fri, 14 Sep 2007 05:22:50 +0000 (+1000)
Subject: [XFS] Ensure file size updates have been completed before writing inode to
X-Git-Url: http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs%2Fxfs-2.6.git;a=commitdiff_plain;h=8e04f1324e37bd317502c4393d381e5060323c08;hp=ef6567a363c5f301c0bc885068d93cd9b3c05cc9

[XFS] Ensure file size updates have been completed before writing inode to
disk.

SGI-PV: 968767
SGI-Modid: xfs-linux-melb:xfs-kern:29675a

Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
---

Index: linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_aops.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/linux-2.6/xfs_aops.c
+++ linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_aops.c
@@ -181,6 +181,7 @@ xfs_setfilesize(
 		ip->i_d.di_size = isize;
 		ip->i_update_core = 1;
 		ip->i_update_size = 1;
+		mark_inode_dirty_sync(vn_to_inode(ioend->io_vnode));
 	}
 
 	xfs_iunlock(ip, XFS_ILOCK_EXCL);
Index: linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/linux-2.6/xfs_super.c
+++ linux-2.6.22.noarch/fs/xfs/linux-2.6/xfs_super.c
@@ -415,8 +415,10 @@ xfs_fs_write_inode(
 
 	if (vp) {
 		vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
-		if (sync)
+		if (sync) {
+			filemap_fdatawait(inode->i_mapping);
 			flags |= FLUSH_SYNC;
+		}
 		error = bhv_vop_iflush(vp, flags);
 		if (error == EAGAIN)
 			error = sync? bhv_vop_iflush(vp, flags | FLUSH_LOG) : 0;
Index: linux-2.6.22.noarch/fs/xfs/xfs_vnodeops.c
===================================================================
--- linux-2.6.22.noarch.orig/fs/xfs/xfs_vnodeops.c
+++ linux-2.6.22.noarch/fs/xfs/xfs_vnodeops.c
@@ -1082,6 +1082,9 @@ xfs_fsync(
 	if (XFS_FORCED_SHUTDOWN(ip->i_mount))
 		return XFS_ERROR(EIO);
 
+	if (flag & FSYNC_DATA)
+		filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping);
+
 	/*
 	 * We always need to make sure that the required inode state
 	 * is safe on disk.  The vnode might be clean but because
@@ -3769,12 +3772,16 @@ xfs_inode_flush(
 			sync_lsn = log->l_last_sync_lsn;
 			GRANT_UNLOCK(log, s);
 
-			if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) <= 0))
-				return 0;
+			if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) > 0)) {
+				if (flags & FLUSH_SYNC)
+					log_flags |= XFS_LOG_SYNC;
+				error = xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+				if (error)
+					return error;
+			}
 
-			if (flags & FLUSH_SYNC)
-				log_flags |= XFS_LOG_SYNC;
-			return xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+			if (ip->i_update_core == 0)
+				return 0;
 		}
 	}
 
@@ -3788,9 +3795,6 @@ xfs_inode_flush(
 	if (flags & FLUSH_INODE) {
 		int	flush_flags;
 
-		if (xfs_ipincount(ip))
-			return EAGAIN;
-
 		if (flags & FLUSH_SYNC) {
 			xfs_ilock(ip, XFS_ILOCK_SHARED);
 			xfs_iflock(ip);

linux-2.6-xfs-setfattr-32bit-compat.patch:

--- NEW FILE linux-2.6-xfs-setfattr-32bit-compat.patch ---
Date: Mon, 17 Sep 2007 12:36:02 -0500
From: Eric Sandeen <sandeen at sandeen.net>
To: Eric Sandeen <sandeen at sandeen.net>
CC: xfs-oss <xfs at oss.sgi.com>
Subject: [PATCH V2] fix 32-bit compat ioctls for GETXFLAGS, SETXFLAGS, GETVERSION

In Red Hat bugzilla #291981, Sami Farin notes that 32-bit-compat
lsattr/chattr does not work on xfs.  After investigation, I found:

XFS_IOC_GETVERSION, XFS_IOC_GETXFLAGS and XFS_IOC_SETXFLAGS all
take a "long" which changes size between 32 and 64 bit platforms.

So, the ioctl cmds that come in from a 32-bit app aren't as expected, 
for example on GETXFLAGS,

	unknown cmd fd(3) cmd(80046601){t:'f';sz:4}

due to the size mismatch.

So, use instead the 32-bit version of the commands for compat ioctls,
and other than that it doesn't take any more manipulation.

Also, for both native and compat versions, just define them to
the values as defined in fs.h

Signed-off-by: Eric Sandeen <sandeen at sandeen.net>

Index: linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
===================================================================
--- linux-2.6.22.orig/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ linux-2.6.22/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -376,9 +376,6 @@ xfs_compat_ioctl(
 	switch (cmd) {
 	case XFS_IOC_DIOINFO:
 	case XFS_IOC_FSGEOMETRY:
-	case XFS_IOC_GETVERSION:
-	case XFS_IOC_GETXFLAGS:
-	case XFS_IOC_SETXFLAGS:
 	case XFS_IOC_FSGETXATTR:
 	case XFS_IOC_FSSETXATTR:
 	case XFS_IOC_FSGETXATTRA:
@@ -404,6 +401,11 @@ xfs_compat_ioctl(
 	case XFS_IOC_ERROR_CLEARALL:
 		break;
 
+	case XFS_IOC32_GETXFLAGS:
+	case XFS_IOC32_SETXFLAGS:
+	case XFS_IOC32_GETVERSION:
+		cmd = _NATIVE_IOC(cmd, long);
+		break;
 #ifdef BROKEN_X86_ALIGNMENT
 	/* xfs_flock_t has wrong u32 vs u64 alignment */
 	case XFS_IOC_ALLOCSP_32:
Index: linux-2.6.22/fs/xfs/xfs_fs.h
===================================================================
--- linux-2.6.22.orig/fs/xfs/xfs_fs.h
+++ linux-2.6.22/fs/xfs/xfs_fs.h
@@ -436,9 +436,13 @@ typedef struct xfs_handle {
 /*
  * ioctl commands that are used by Linux filesystems
  */
-#define XFS_IOC_GETXFLAGS	_IOR('f', 1, long)
-#define XFS_IOC_SETXFLAGS	_IOW('f', 2, long)
-#define XFS_IOC_GETVERSION	_IOR('v', 1, long)
+#define XFS_IOC_GETXFLAGS	FS_IOC_GETFLAGS
+#define XFS_IOC_SETXFLAGS	FS_IOC_SETFLAGS
+#define XFS_IOC_GETVERSION	FS_IOC_GETVERSION
+/* 32-bit compat counterparts */
+#define XFS_IOC32_GETXFLAGS	FS_IOC32_GETFLAGS
+#define XFS_IOC32_SETXFLAGS	FS_IOC32_SETFLAGS
+#define XFS_IOC32_GETVERSION	FS_IOC32_GETVERSION
 
 /*

  * ioctl commands that replace IRIX fcntl()'s






Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kernel.spec	18 Sep 2007 14:01:35 -0000	1.169
+++ kernel.spec	18 Sep 2007 20:58:50 -0000	1.170
@@ -668,7 +668,12 @@
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-Patch1508: linux-2.6-firewire-multi-lun.patch
+Patch1507: linux-2.6-xfs-filesize-updates.patch
+Patch1508: linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
+Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
+Patch1510: linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
+Patch1511: linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
+Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch 
@@ -1175,6 +1180,13 @@
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
 ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
+ApplyPatch linux-2.6-xfs-filesize-updates.patch
+ApplyPatch linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
+ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
+
+# ext3 bugfixes
+ApplyPatch linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
+ApplyPatch linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
 
 #
 # misc small stuff to make things compile
@@ -1799,6 +1811,12 @@
 
 
 %changelog
+* Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
+- ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
+  handle dx directory corruption gracefully, w/o BUG (#236464).
+- xfs bugfixes: setfattr/getfattr/getversion 32-bit compat fixes (#291981),
+  log replay vs. filesize update fixes from sgi.
+
 * Tue Sep 18 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 



From fedora-extras-commits at redhat.com  Tue Sep 18 21:17:54 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 18 Sep 2007 17:17:54 -0400
Subject: rpms/xfce4-places-plugin/F-7 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xfce4-places-plugin.spec, 1.4, 1.5
Message-ID: <200709182117.l8ILHsGg009491@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9454

Modified Files:
	.cvsignore sources xfce4-places-plugin.spec 
Log Message:
* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
- Update to 0.9.992



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Aug 2007 13:10:06 -0000	1.4
+++ .cvsignore	18 Sep 2007 21:17:21 -0000	1.5
@@ -1 +1 @@
-xfce4-places-plugin-0.9.991.tar.bz2
+xfce4-places-plugin-0.9.992.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Aug 2007 13:10:06 -0000	1.4
+++ sources	18 Sep 2007 21:17:21 -0000	1.5
@@ -1 +1 @@
-e6b4ffb260cc81a8388a32f4302091f4  xfce4-places-plugin-0.9.991.tar.bz2
+83728df00963920310ba21a76359d7cb  xfce4-places-plugin-0.9.992.tar.bz2


Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/F-7/xfce4-places-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-places-plugin.spec	25 Aug 2007 13:10:06 -0000	1.4
+++ xfce4-places-plugin.spec	18 Sep 2007 21:17:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		xfce4-places-plugin
-Version:	0.9.991
+Version:	0.9.992
 Release:	1%{?dist}
 Summary:	Places menu for the Xfce panel
 
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
+- Update to 0.9.992
+
 * Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.991-1
 - Update to 0.9.991
 - Update license tag



From fedora-extras-commits at redhat.com  Tue Sep 18 21:28:08 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:28:08 -0400
Subject: rpms/grsync/devel grsync.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709182128.l8ILS8jN010015@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9990/devel

Modified Files:
	.cvsignore sources 
Added Files:
	grsync.spec 
Log Message:



--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:27:36 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:33:01 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:33:01 -0400
Subject: rpms/grsync/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709182133.l8ILX1XN010215@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/F-7

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:32:27 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:32:27 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:33:05 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:33:05 -0400
Subject: rpms/grsync/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709182133.l8ILX5wv010222@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10158/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grsync/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:08 -0000	1.1
+++ .cvsignore	18 Sep 2007 21:32:32 -0000	1.2
@@ -0,0 +1 @@
+grsync-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grsync/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:08 -0000	1.1
+++ sources	18 Sep 2007 21:32:32 -0000	1.2
@@ -0,0 +1 @@
+1d5fa63fe80e4af893b7594ff55c6003  grsync-0.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 18 21:37:14 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 17:37:14 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.444, 1.445 anaconda.spec, 1.580, 
	1.581 sources, 1.572, 1.573
Message-ID: <200709182137.l8ILbEHH010359@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10317

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- .cvsignore	13 Sep 2007 14:49:17 -0000	1.444
+++ .cvsignore	18 Sep 2007 21:36:42 -0000	1.445
@@ -1,2 +1,3 @@
 anaconda-11.3.0.28.tar.bz2
 anaconda-11.3.0.29.tar.bz2
+anaconda-11.3.0.31.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- anaconda.spec	13 Sep 2007 14:49:17 -0000	1.580
+++ anaconda.spec	18 Sep 2007 21:36:42 -0000	1.581
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.3.0.29
+Version: 11.3.0.31
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -158,6 +158,22 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 11.3.0.31-1
+- Really include new Japanese font (katzj, #279931).
+- Use /dev/live-osimg-min if it exists (katzj).
+- Copy driver disk contents to /root (#289751).
+- Write out /root/anaconda-ks.cfg earlier (#292571).
+
+* Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 11.3.0.30-1
+- Firewire module names changed again (#292421)
+- Some liveinst improvements (Douglas McClendon)
+- Create tape devices (dlehman)
+- Fix traceback on no more mirrors (dlehman)
+- Fix treeinfo path to stage2 (wwoods)
+- Remove unused graphics (notting)
+- Look at root path for kernels (Douglas McClendon)
+- Netlink fixes (pjones)
+
 * Thu Sep 13 2007 Chris Lumens <clumens at redhat.com> 11.3.0.29-1
 - On the graphical netconfig screen, only check the gateway address if
   provided (dcantrell).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- sources	13 Sep 2007 14:49:17 -0000	1.572
+++ sources	18 Sep 2007 21:36:42 -0000	1.573
@@ -1 +1,2 @@
 29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2
+1342d67a3b75cb941207a8e47d102d0c  anaconda-11.3.0.31.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 21:43:34 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:43:34 -0400
Subject: rpms/grsync/F-7 grsync.spec,NONE,1.1
Message-ID: <200709182143.l8ILhYTB010617@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10608/F-7

Added Files:
	grsync.spec 
Log Message:
add forgotten grsync.spec for FC6 and F7


--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release



From fedora-extras-commits at redhat.com  Tue Sep 18 21:43:37 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Tue, 18 Sep 2007 17:43:37 -0400
Subject: rpms/grsync/FC-6 grsync.spec,NONE,1.1
Message-ID: <200709182143.l8ILhb2X010634@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/grsync/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10608/FC-6

Added Files:
	grsync.spec 
Log Message:
add forgotten grsync.spec for FC6 and F7


--- NEW FILE grsync.spec ---
Name:           grsync
Version:        0.6
Release:        1%{?dist}
Summary:        A Gtk+ GUI for rsync

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.opbyte.it/grsync/
Source0:        http://www.opbyte.it/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils gettext perl(XML::Parser)
#Requires:       

%description
Grsync is a GUI (Graphical User Interface) for rsync, the commandline 
directory synchronization tool. It makes use of the GTK libraries and 
is released under the GPL license, so it is opensource. It is in beta 
stage and doesn't support all of rsync features, but can be effectively 
used to synchronize local directories. For example some people use 
grsync to synchronize their music collection with removable devices or 
to backup personal files to a networked drive. 

%prep
%setup -q

# some minor corrections for rpmlint
%{__sed} -i 's/\r//' README
chmod 0644 src/callbacks.c

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=""                                 \
        --dir=%{buildroot}%{_datadir}/applications/              \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
 
%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/grsync*
%{_mandir}/man1/grsync*.1.gz
%{_datadir}/pixmaps/grsync.png
%{_datadir}/applications/grsync.desktop


%changelog
* Tue Sep 13 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6-1
- New upstream version: 0.6
- Change license to GPLv2

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-2
- BR: perl(XML::Parser)

* Tue Jan 23 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.5.2-1
- New upstream version: 0.5.2

* Fri Dec 01 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-2
- BR: gettext

* Sat Nov 11 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.5-1
- New upstream version: 0.5

* Fri May 05 2006 Sebastian Vahl <fedora at deadbabylon.de> - 0.4.1-1
- Initial Spec Release



From fedora-extras-commits at redhat.com  Tue Sep 18 22:06:24 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Tue, 18 Sep 2007 18:06:24 -0400
Subject: rpms/anaconda/devel sources,1.573,1.574
Message-ID: <200709182206.l8IM6OTS017231@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213

Modified Files:
	sources 
Log Message:
Trying the new build again.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- sources	18 Sep 2007 21:36:42 -0000	1.573
+++ sources	18 Sep 2007 22:05:50 -0000	1.574
@@ -1,2 +1 @@
-29abb7023068a43e1d6d1840cd1990b4  anaconda-11.3.0.29.tar.bz2
-1342d67a3b75cb941207a8e47d102d0c  anaconda-11.3.0.31.tar.bz2
+9786fb11aba1ac3d387490e1fcb2ba2c  anaconda-11.3.0.31.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:12:02 2007
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 18 Sep 2007 18:12:02 -0400
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.37, 1.38 dejavu-fonts.spec,
	1.67, 1.68 sources, 1.37, 1.38
Message-ID: <200709182212.l8IMC2Lo017382@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
2.20 - bugfix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	11 Aug 2007 11:07:37 -0000	1.37
+++ .cvsignore	18 Sep 2007 22:11:30 -0000	1.38
@@ -1 +1 @@
-dejavu-sfd-2.19.tar.bz2
+dejavu-sfd-2.20.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- dejavu-fonts.spec	11 Aug 2007 11:07:37 -0000	1.67
+++ dejavu-fonts.spec	18 Sep 2007 22:11:30 -0000	1.68
@@ -16,14 +16,15 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      %{fontname}-fonts
-Version:   2.19
+Version:   2.20
 Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 
 Group:     User Interface/X
 License:   Modifiable & redistributable, with naming restrictions
 URL:       http://%{fontname}.sf.net/
-Source0:   http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}.tar.bz2
+Source0:   %{?!alphatag:http://prdownloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
+
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 Source2:   %{name}-fontconfig-unhint-small.conf
@@ -159,6 +160,11 @@
 
 
 %changelog
+* Tue Sep 18 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+??? 2.20-1
+??? 2.20 final
+??? bugfix release (Hebrew fixes mostly)
+
 * Sat Aug 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ??? 2.19-1
 ??? 2.19 final


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	11 Aug 2007 11:07:37 -0000	1.37
+++ sources	18 Sep 2007 22:11:30 -0000	1.38
@@ -1 +1 @@
-28d65cd8e2ba992bb4974a02407e76de  dejavu-sfd-2.19.tar.bz2
+9633569289671481b328becd09f0e72b  dejavu-sfd-2.20.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:17:20 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 18 Sep 2007 18:17:20 -0400
Subject: rpms/libnetfilter_queue/devel .cvsignore, 1.2,
	1.3 libnetfilter_queue.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709182217.l8IMHKMu017622@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_queue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17577

Modified Files:
	.cvsignore libnetfilter_queue.spec sources 
Log Message:
libnetfilter_queue-0.0.15-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2007 21:20:30 -0000	1.2
+++ .cvsignore	18 Sep 2007 22:16:47 -0000	1.3
@@ -1 +1 @@
-libnetfilter_queue-0.0.13.tar.bz2
+libnetfilter_queue-0.0.15.tar.bz2


Index: libnetfilter_queue.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/libnetfilter_queue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnetfilter_queue.spec	25 Mar 2007 21:20:30 -0000	1.1
+++ libnetfilter_queue.spec	18 Sep 2007 22:16:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libnetfilter_queue
-Version:        0.0.13
-Release:        3%{?dist}
+Version:        0.0.15
+Release:        1%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
 License:        GPL
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Sep 18 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.15-1
+- new upstream version
+
 * Mon Mar 26 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.13-3
 - own some directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2007 21:20:30 -0000	1.2
+++ sources	18 Sep 2007 22:16:47 -0000	1.3
@@ -1 +1 @@
-660cbfd3dc8c10bf9b1803cd2b688256  libnetfilter_queue-0.0.13.tar.bz2
+d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 22:26:08 2007
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 18 Sep 2007 18:26:08 -0400
Subject: rpms/lzop/devel lzop.spec,1.12,1.13
Message-ID: <200709182226.l8IMQ8Rq018183@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18163/devel

Modified Files:
	lzop.spec 
Log Message:
License fix


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lzop.spec	2 Sep 2006 15:00:04 -0000	1.12
+++ lzop.spec	18 Sep 2007 22:25:35 -0000	1.13
@@ -2,12 +2,12 @@
 
 Name: lzop
 Version: 1.02
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
-License: GPL
+License: GPL+
 URL: http://www.%{name}.org/
 Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,10 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
-%changelog
+* Tue Sep 18 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+??? 1.02-0.5.rc1
+??? License fix
+
 * Sat Sep 02 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.02-0.4.rc1
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Tue Sep 18 22:28:08 2007
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Tue, 18 Sep 2007 18:28:08 -0400
Subject: rpms/libnetfilter_queue/F-7 .cvsignore, 1.2,
	1.3 libnetfilter_queue.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709182228.l8IMS8ia018299@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_queue/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18243

Modified Files:
	.cvsignore libnetfilter_queue.spec sources 
Log Message:
libnetfilter_queue-0.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Mar 2007 21:20:30 -0000	1.2
+++ .cvsignore	18 Sep 2007 22:27:35 -0000	1.3
@@ -1 +1 @@
-libnetfilter_queue-0.0.13.tar.bz2
+libnetfilter_queue-0.0.15.tar.bz2


Index: libnetfilter_queue.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/libnetfilter_queue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnetfilter_queue.spec	25 Mar 2007 21:20:30 -0000	1.1
+++ libnetfilter_queue.spec	18 Sep 2007 22:27:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libnetfilter_queue
-Version:        0.0.13
-Release:        3%{?dist}
+Version:        0.0.15
+Release:        1%{?dist}
 Summary:        Netfilter queue userspace library
 Group:          System Environment/Libraries
 License:        GPL
@@ -65,6 +65,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Sep 18 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.15-1
+- new upstream version
+
 * Mon Mar 26 2007 Paul P Komkoff Jr <i at stingr.net> - 0.0.13-3
 - own some directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_queue/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Mar 2007 21:20:30 -0000	1.2
+++ sources	18 Sep 2007 22:27:35 -0000	1.3
@@ -1 +1 @@
-660cbfd3dc8c10bf9b1803cd2b688256  libnetfilter_queue-0.0.13.tar.bz2
+d8602566c253a9114b19a8b77980d808  libnetfilter_queue-0.0.15.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 23:20:13 2007
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 18 Sep 2007 19:20:13 -0400
Subject: rpms/gstreamer-plugins-farsight/devel .cvsignore, 1.5,
	1.6 gstreamer-plugins-farsight.spec, 1.8, 1.9 sources, 1.5,
	1.6 gstreamer-plugins-farsight-0.12.2-memset.patch, 1.1, NONE
Message-ID: <200709182320.l8INKD3p025150@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25121

Modified Files:
	.cvsignore gstreamer-plugins-farsight.spec sources 
Removed Files:
	gstreamer-plugins-farsight-0.12.2-memset.patch 
Log Message:
* Tue Sep 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.5-1
- Update to 0.12.5.
- Drop memset patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Jul 2007 01:04:34 -0000	1.5
+++ .cvsignore	18 Sep 2007 23:19:41 -0000	1.6
@@ -1 +1 @@
-gst-plugins-farsight-0.12.2.tar.gz
+gst-plugins-farsight-0.12.5.tar.gz


Index: gstreamer-plugins-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/gstreamer-plugins-farsight.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-plugins-farsight.spec	21 Aug 2007 16:12:04 -0000	1.8
+++ gstreamer-plugins-farsight.spec	18 Sep 2007 23:19:41 -0000	1.9
@@ -1,22 +1,21 @@
 %define         gst_majorminor	0.10
 
 Name:           gstreamer-plugins-farsight
-Version:        0.12.2
-Release:        3%{?dist}
+Version:        0.12.5
+Release:        1%{?dist}
 Summary:        GStreamer plug-ins for farsight protocol
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://projects.collabora.co.uk/darcs/farsight/
 Source0:        http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-%{version}.tar.gz
-Patch0:		%{name}-%{version}-memset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= 0.10.11
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	libjingle-devel
 BuildRequires:	jasper-devel
-BuildRequires:	jrtplib-devel
+BuildRequires:	jrtplib-devel >= 3.3.0
 BuildRequires:	gsm-devel
 BuildRequires:	GConf2-devel
 
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n gst-plugins-farsight-%{version}
-%patch0 -p1 -b .memset
 
 
 %build
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.5-1
+- Update to 0.12.5.
+- Drop memset patch, fixed upstream.
+
 * Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-farsight/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Jul 2007 01:04:34 -0000	1.5
+++ sources	18 Sep 2007 23:19:41 -0000	1.6
@@ -1 +1 @@
-70e09e8e38cb37b0c883fe14d07d263a  gst-plugins-farsight-0.12.2.tar.gz
+aacffef047b70ffbb3b6db775a1b84a1  gst-plugins-farsight-0.12.5.tar.gz


--- gstreamer-plugins-farsight-0.12.2-memset.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 18 23:31:32 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 18 Sep 2007 19:31:32 -0400
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.21,
	1.22 epiphany-extensions.spec, 1.35, 1.36 sources, 1.21, 1.22
Message-ID: <200709182331.l8INVWWL025486@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25407

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Update to 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Sep 2007 22:21:58 -0000	1.21
+++ .cvsignore	18 Sep 2007 23:30:59 -0000	1.22
@@ -1 +1 @@
-epiphany-extensions-2.19.90.tar.bz2
+epiphany-extensions-2.20.0.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- epiphany-extensions.spec	4 Sep 2007 22:21:58 -0000	1.35
+++ epiphany-extensions.spec	18 Sep 2007 23:30:59 -0000	1.36
@@ -1,9 +1,9 @@
-%global	ephy_major		2.19
+%global	ephy_major		2.20
 %global	ephy_min_version	%{ephy_major}.0
 %global gecko_version		1.8.1.6
 
 Name:		epiphany-extensions
-Version:	%{ephy_major}.90
+Version:	%{ephy_major}.0
 Release:	1%{?dist}
 Summary:	Extensions for Epiphany, the GNOME web browser
 
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Tue Sep 18 2007 Peter Gordon <peter at thecodergeek.com> - 2.20.0-1
+- Update to new upstream release (2.20.0). 
+
 * Tue Sep 04 2007 Peter Gordon <peter at thecodergeek.com> - 2.19.90-1
 - Update to new upstream release (2.19.90), which contains reworked
   installation rules for the icons and a fix for the Greasemonkey


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Sep 2007 22:21:58 -0000	1.21
+++ sources	18 Sep 2007 23:30:59 -0000	1.22
@@ -1 +1 @@
-67b210fa2048a5fa0a7ccc317eea9f32  epiphany-extensions-2.19.90.tar.bz2
+8405528808ec2cc287d1ba6547203c75  epiphany-extensions-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 18 23:36:02 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 18 Sep 2007 19:36:02 -0400
Subject: rpms/gtk2/devel libtracker.patch,NONE,1.1 gtk2.spec,1.256,1.257
Message-ID: <200709182336.l8INa2gP025617@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25542

Modified Files:
	gtk2.spec 
Added Files:
	libtracker.patch 
Log Message:
fix tracker search


libtracker.patch:

--- NEW FILE libtracker.patch ---
diff -up gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker gtk+-2.12.0/gtk/gtksearchenginetracker.c
--- gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker	2007-09-18 19:29:57.000000000 -0400
+++ gtk+-2.12.0/gtk/gtksearchenginetracker.c	2007-09-18 19:30:54.000000000 -0400
@@ -71,10 +71,16 @@ open_libtracker (void)
     {
       int i;
       GModule *tracker;
+      GModuleFlags flags;
       
       done = TRUE;
- 
-      tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+      flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
+
+      tracker = g_module_open ("libtrackerclient.so.0", flags);
+
+      if (!tracker)
+        tracker = g_module_open ("libtracker.so.0", flags);
+
       if (!tracker)
 	return;
       


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- gtk2.spec	14 Sep 2007 05:16:37 -0000	1.256
+++ gtk2.spec	18 Sep 2007 23:35:30 -0000	1.257
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch2: workaround.patch
 # fixed in upstream svn
 Patch3: novalidate.patch
+Patch4: libtracker.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,6 +120,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
+%patch4 -p1 -b .libtracker
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +303,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
+- Adapt to tracker ABI changes
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Tue Sep 18 23:46:39 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 18 Sep 2007 19:46:39 -0400
Subject: rpms/perl-Test-Tester/devel .cvsignore, 1.3,
	1.4 perl-Test-Tester.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709182346.l8INkded025930@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25794

Modified Files:
	.cvsignore perl-Test-Tester.spec sources 
Log Message:
Update to 0.106.
BR Test::Builder.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Dec 2006 18:35:55 -0000	1.3
+++ .cvsignore	18 Sep 2007 23:46:07 -0000	1.4
@@ -1 +1 @@
-Test-Tester-0.104.tar.gz
+Test-Tester-0.106.tar.gz


Index: perl-Test-Tester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/perl-Test-Tester.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Tester.spec	18 Apr 2007 16:59:30 -0000	1.4
+++ perl-Test-Tester.spec	18 Sep 2007 23:46:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Test-Tester
-Version:        0.104
-Release:        2%{?dist}
+Version:        0.106
+Release:        1%{?dist}
 Summary:        Ease testing test modules built with Test::Builder
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::Builder)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 18 2007 Steven Pritchard <steve at kspei.com> 0.106-1
+- Update to 0.106.
+- BR Test::Builder.
+
 * Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.104-2
 - BR ExtUtils::MakeMaker.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Tester/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Dec 2006 18:35:55 -0000	1.3
+++ sources	18 Sep 2007 23:46:07 -0000	1.4
@@ -1 +1 @@
-3339108ed79bf8dbb51fc34ca7816c49  Test-Tester-0.104.tar.gz
+6324d0f99eab4710f0acfe9355d8d769  Test-Tester-0.106.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 00:19:04 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 20:19:04 -0400
Subject: rpms/policycoreutils/F-7 policycoreutils-gui.patch, 1.20,
	1.21 policycoreutils.spec, 1.422, 1.423
Message-ID: <200709190019.l8J0J4vR032593@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32570

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-13
- More changes to gui


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils-gui.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policycoreutils-gui.patch	18 Sep 2007 18:25:11 -0000	1.20
+++ policycoreutils-gui.patch	19 Sep 2007 00:19:01 -0000	1.21
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
++++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,9 +228,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
++++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -441,9 +441,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
++++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -624,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -662,9 +662,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
++++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -722,9 +722,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
++++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -907,10 +907,10 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-18 14:02:32.000000000 -0400
-@@ -0,0 +1,2385 @@
++++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
+@@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -2007,7 +2007,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_tcp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user binds to. </property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2139,7 +2139,7 @@
 +				  <child>
 +				    <widget class="GtkCheckButton" id="in_udp_unreserved_checkbutton">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="label" translatable="yes">Unreserved Ports (&gt;1024)</property>
 +				      <property name="use_underline">True</property>
@@ -2197,7 +2197,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_udp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user binds to. </property>
++				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2289,7 +2289,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="out_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Enter network ports that application/user connects to</property>
++	      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user connects to. </property>
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox7">
 +		  <property name="border_width">16</property>
@@ -2387,7 +2387,8 @@
 +				      <child>
 +					<widget class="GtkEntry" id="out_tcp_entry">
 +					  <property name="visible">True</property>
-+					  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that application/user connects to.</property>
++					  <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
++
 +					  <property name="can_focus">True</property>
 +					  <property name="editable">True</property>
 +					  <property name="visibility">True</property>
@@ -2519,7 +2520,7 @@
 +			      <child>
 +				<widget class="GtkEntry" id="out_udp_entry">
 +				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that application/user connects to.</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
 +				  <property name="can_focus">True</property>
 +				  <property name="editable">True</property>
 +				  <property name="visibility">True</property>
@@ -3296,10 +3297,10 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
+@@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3499,6 +3500,14 @@
 +            if self.on_select_type_page_next():
 +                return
 +
++        if self.pages[type][self.current_page] == self.IN_NET_PAGE:
++            if self.on_in_net_page_next():
++                return
++
++        if self.pages[type][self.current_page] == self.OUT_NET_PAGE:
++            if self.on_out_net_page_next():
++                return
++
 +        if self.pages[type][self.current_page] == self.APP_PAGE:
 +            if self.on_name_page_next():
 +                return
@@ -3720,6 +3729,22 @@
 +            return
 +        self.output_entry.set_text(self.file_dialog.get_filename())
 +        
++    def on_in_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.in_tcp_entry.get_text())
++            polgen.verify_ports(self.in_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
++    def on_out_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.out_tcp_entry.get_text())
++            polgen.verify_ports(self.out_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
 +    def on_select_type_page_next(self, *args):
 +        self.exec_entry.set_sensitive(self.confine_application())
 +        self.exec_button.set_sensitive(self.confine_application())
@@ -3752,10 +3777,10 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
-@@ -0,0 +1,727 @@
++++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
+@@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3841,6 +3866,34 @@
 +APPLICATIONS = [ DAEMON, INETD, USER, CGI ]
 +USERS = [ XUSER, TUSER, RUSER ]
 +
++def verify_ports(ports):
++    if ports == "":
++        return []
++    max_port=2**16
++    try:
++        temp = []
++        for a in ports.split(","):
++            r =  a.split("-")
++            if len(r) > 2:
++                raise  ValueError
++            if len(r) == 1:
++                begin = int (r[0])
++                end = int (r[0])
++            else:
++                begin = int (r[0])
++                end = int (r[1]) + 1
++                
++                if begin > end:
++                    raise  ValueError
++                
++                for p in range(begin, end):
++                    if p < 1 or p > max_port:
++                        raise  ValueError
++                    temp.append(p)
++                return temp
++    except ValueError:
++        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
++
 +class policy:
 +
 +	def __init__(self, name, type):
@@ -3924,21 +3977,6 @@
 +                    return self.dict[begin,end]
 +            return  None
 +
-+	def __verify_ports(self, ports):
-+		if ports == "":
-+			return []
-+		max_port=2**16
-+		try:
-+			temp = []
-+			for p in ports.split(","):
-+				i = int(p.strip())
-+				if i < 1 or i > max_port:
-+					raise  ValueError()
-+				temp.append(i)
-+			return temp
-+		except ValueError:
-+			raise  ValueError(_("Ports must be be numbers from 1 to %d " % max_port ))
-+
 +	def set_program(self, program):
 +                if self.type not in APPLICATIONS:
 +                    raise ValueError(_("USER Types are not allowed executables"))
@@ -3952,16 +3990,16 @@
 +		self.initscript = initscript
 +
 +	def set_in_tcp(self, all, reserved, unreserved, ports):
-+		self.in_tcp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_tcp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_in_udp(self, all, reserved, unreserved, ports):
-+		self.in_udp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_udp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_out_tcp(self, all, ports):
-+		self.out_tcp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_tcp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_out_udp(self, all, ports):
-+		self.out_udp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_udp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_use_syslog(self, val):
 +		if val != True and val != False:
@@ -4410,7 +4448,7 @@
 +if __name__ == '__main__':
 +    mypolicy = policy("mycgi", CGI)
 +    mypolicy.set_program("/var/www/cgi-bin/cgi")
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
++    mypolicy.set_in_tcp(1, 0, 0, "512, 55000-55000")
 +    mypolicy.set_in_udp(1, 0, 0, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_tmp(False)
@@ -4483,9 +4521,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
++++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4734,9 +4772,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.25/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/selinux.tbl	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,296 @@
 +allow_console_login _("Login") _("Allow direct login to the console device. Requiered for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5034,9 +5072,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivledged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivledged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
++++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5174,9 +5212,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
++++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5397,9 +5435,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.25/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.glade	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,3326 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8727,9 +8765,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
@@ -8902,9 +8940,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9184,9 +9222,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9206,9 +9244,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9290,9 +9328,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9422,10 +9460,10 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
-@@ -0,0 +1,45 @@
++++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
+@@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9451,6 +9489,11 @@
 +########################### tmp Template File #############################
 +compile="""
 +#!/bin/sh
++if [ ! -f /usr/share/selinux/devel/Makefile ]; then
++echo 'selinux-policy-devel not installed, package required for building policy'
++echo '# yum install selinux-policy-devel'
++exit 1
++fi
 +make -f /usr/share/selinux/devel/Makefile
 +/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
@@ -9471,9 +9514,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9516,9 +9559,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9617,9 +9660,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9760,9 +9803,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9926,9 +9969,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10042,9 +10085,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10165,9 +10208,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10300,9 +10343,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
++++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10422,9 +10465,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
++++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-7/policycoreutils.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- policycoreutils.spec	18 Sep 2007 18:25:11 -0000	1.422
+++ policycoreutils.spec	19 Sep 2007 00:19:01 -0000	1.423
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.16
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-13
+- More changes to gui
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.16-12
 - Update to latest upstream policycoreutils gui
 



From fedora-extras-commits at redhat.com  Wed Sep 19 00:20:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 20:20:36 -0400
Subject: rpms/checkpolicy/devel .cvsignore, 1.71, 1.72 checkpolicy.spec,
	1.116, 1.117 sources, 1.72, 1.73
Message-ID: <200709190020.l8J0KaMT032721@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/checkpolicy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32690

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
	* Merged handle unknown policydb flag support from Eric Paris.
	  Adds new command line options -U {allow, reject, deny} for selecting
	  the flag when a base module or kernel policy is built.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	4 Jun 2007 19:21:50 -0000	1.71
+++ .cvsignore	19 Sep 2007 00:20:03 -0000	1.72
@@ -57,3 +57,4 @@
 checkpolicy-2.0.1.tgz
 checkpolicy-2.0.2.tgz
 checkpolicy-2.0.3.tgz
+checkpolicy-2.0.4.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- checkpolicy.spec	29 Aug 2007 04:03:17 -0000	1.116
+++ checkpolicy.spec	19 Sep 2007 00:20:03 -0000	1.117
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.3-1
+%define libsepolver 2.0.10-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,11 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.4-1
+	* Merged handle unknown policydb flag support from Eric Paris.
+	  Adds new command line options -U {allow, reject, deny} for selecting
+	  the flag when a base module or kernel policy is built.
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.3-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/checkpolicy/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	4 Jun 2007 19:21:50 -0000	1.72
+++ sources	19 Sep 2007 00:20:03 -0000	1.73
@@ -1 +1 @@
-fb843b14d280e5fd4216eb34495ad533  checkpolicy-2.0.3.tgz
+4f80d0bdec361300e80395dcaa4b685d  checkpolicy-2.0.4.tgz



From fedora-extras-commits at redhat.com  Wed Sep 19 01:11:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 21:11:33 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.59,
	1.60 selinux-policy.spec, 1.522, 1.523
Message-ID: <200709190111.l8J1BXHj007331@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7306

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
- Remove hplip_etc_t change back to etc_t.


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- policy-20070703.patch	18 Sep 2007 15:09:11 -0000	1.59
+++ policy-20070703.patch	19 Sep 2007 01:11:31 -0000	1.60
@@ -2425,6 +2425,17 @@
 +		kernel_udp_recvfrom_unlabeled(domain)
 +	')
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2007-09-12 10:34:49.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-18 20:56:27.000000000 -0400
+@@ -210,6 +210,7 @@
+ /usr/lost\+found/.*		<<none>>
+ 
+ /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
++/usr/share/doc(/.*)?/README.*	gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
+ /usr/src/kernels/.+/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.8/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/files.if	2007-09-17 16:20:18.000000000 -0400
@@ -2686,7 +2697,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.8/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/files.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/files.te	2007-09-18 12:11:13.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(files,1.6.1)
@@ -2694,16 +2705,17 @@
  
  ########################################
  #
-@@ -55,6 +55,8 @@
+@@ -55,6 +55,9 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
  typealias etc_t alias snmpd_etc_t;
 +typealias etc_t alias gconf_etc_t;
 +typealias etc_t alias soundd_etc_t;
++typealias etc_t alias hplip_etc_t;
  
  #
  # etc_runtime_t is the type of various
-@@ -188,6 +190,7 @@
+@@ -188,6 +191,7 @@
  fs_associate(file_type)
  fs_associate_noxattr(file_type)
  fs_associate_tmpfs(file_type)
@@ -4240,6 +4252,17 @@
  corenet_sendrecv_rndc_client_packets(ndc_t)
  
  fs_getattr_xattr_fs(ndc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.0.8/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-08-02 08:17:27.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/bluetooth.te	2007-09-18 13:32:50.000000000 -0400
+@@ -128,6 +128,7 @@
+ 	dbus_system_bus_client_template(bluetooth,bluetooth_t)
+ 	dbus_connect_system_bus(bluetooth_t)
+ 	dbus_send_system_bus(bluetooth_t)
++	allow bluetooth_t self:dbus send_msg;
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.8/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-09-12 10:34:50.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/clamav.te	2007-09-17 16:20:18.000000000 -0400
@@ -4736,8 +4759,8 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 10:39:32.000000000 -0400
-@@ -8,6 +8,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 12:31:53.000000000 -0400
+@@ -8,17 +8,14 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/printers\.conf.* --	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4745,7 +4768,9 @@
  /etc/cups/certs		-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
-@@ -17,8 +18,6 @@
+-/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
+-
+ /etc/printcap.* 	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
  /usr/bin/cups-config-daemon --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  
@@ -4754,11 +4779,13 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -26,6 +25,7 @@
+@@ -26,6 +23,9 @@
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
 +/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/lib(64)?/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
  /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
@@ -4769,8 +4796,18 @@
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 10:43:40.000000000 -0400
-@@ -81,12 +81,11 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 12:15:12.000000000 -0400
+@@ -49,9 +49,6 @@
+ type hplip_exec_t;
+ init_daemon_domain(hplip_t,hplip_exec_t)
+ 
+-type hplip_etc_t;
+-files_config_file(hplip_etc_t)
+-
+ type hplip_var_run_t;
+ files_pid_file(hplip_var_run_t)
+ 
+@@ -81,12 +78,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
@@ -4784,7 +4821,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;
-@@ -105,7 +104,7 @@
+@@ -105,7 +101,7 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -4793,7 +4830,14 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
  
  manage_files_pattern(cupsd_t,cupsd_log_t,cupsd_log_t)
-@@ -129,6 +128,8 @@
+@@ -122,13 +118,13 @@
+ manage_sock_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
+ files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
+ 
+-read_files_pattern(cupsd_t,hplip_etc_t,hplip_etc_t)
+-
+ allow cupsd_t hplip_var_run_t:file { read getattr };
+ 
  stream_connect_pattern(cupsd_t,ptal_var_run_t,ptal_var_run_t,ptal_t)
  allow cupsd_t ptal_var_run_t : sock_file setattr;
  
@@ -4802,7 +4846,7 @@
  kernel_read_system_state(cupsd_t)
  kernel_read_network_state(cupsd_t)
  kernel_read_all_sysctls(cupsd_t)
-@@ -150,21 +151,26 @@
+@@ -150,21 +146,26 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -4830,7 +4874,7 @@
  mls_file_downgrade(cupsd_t)
  mls_file_write_all_levels(cupsd_t)
  mls_file_read_all_levels(cupsd_t)
-@@ -174,6 +180,7 @@
+@@ -174,6 +175,7 @@
  term_search_ptys(cupsd_t)
  
  auth_domtrans_chk_passwd(cupsd_t)
@@ -4838,7 +4882,7 @@
  auth_dontaudit_read_pam_pid(cupsd_t)
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
-@@ -187,7 +194,7 @@
+@@ -187,7 +189,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -4847,7 +4891,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -202,6 +209,7 @@
+@@ -202,6 +204,7 @@
  files_dontaudit_getattr_all_tmp_files(cupsd_t)
  
  selinux_compute_access_vector(cupsd_t)
@@ -4855,7 +4899,7 @@
  
  init_exec_script_files(cupsd_t)
  
-@@ -221,17 +229,37 @@
+@@ -221,17 +224,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -4893,7 +4937,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +291,16 @@
+@@ -263,16 +286,16 @@
  ')
  
  optional_policy(`
@@ -4914,7 +4958,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +405,14 @@
+@@ -377,6 +400,14 @@
  ')
  
  optional_policy(`
@@ -4929,7 +4973,19 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -560,7 +596,7 @@
+@@ -526,11 +557,6 @@
+ 
+ cups_stream_connect(hplip_t)
+ 
+-allow hplip_t hplip_etc_t:dir list_dir_perms;
+-read_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
+-read_lnk_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
+-files_search_etc(hplip_t)
+-
+ manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
+ files_pid_filetrans(hplip_t,hplip_var_run_t,file)
+ 
+@@ -560,7 +586,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -4938,7 +4994,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +623,6 @@
+@@ -587,8 +613,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- selinux-policy.spec	17 Sep 2007 23:26:58 -0000	1.522
+++ selinux-policy.spec	19 Sep 2007 01:11:31 -0000	1.523
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
+- Remove hplip_etc_t change back to etc_t.
+
+
 * Mon Sep 17 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-1
 - Allow cron to search nfs and samba homedirs
 



From fedora-extras-commits at redhat.com  Wed Sep 19 02:19:28 2007
From: fedora-extras-commits at redhat.com (Michael Stahnke (stahnma))
Date: Tue, 18 Sep 2007 22:19:28 -0400
Subject: rpms/kflickr/devel .cvsignore, 1.2, 1.3 kflickr.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709190219.l8J2JSNI014323@cvs-int.fedora.redhat.com>

Author: stahnma

Update of /cvs/extras/rpms/kflickr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14301

Modified Files:
	.cvsignore kflickr.spec sources 
Log Message:
Moving devel to new version upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2007 04:29:33 -0000	1.2
+++ .cvsignore	19 Sep 2007 02:18:56 -0000	1.3
@@ -1 +1 @@
-kflickr-0.8.tar.gz
+kflickr-0.9.tar.gz


Index: kflickr.spec
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/kflickr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kflickr.spec	6 Jun 2007 04:29:33 -0000	1.1
+++ kflickr.spec	19 Sep 2007 02:18:56 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           kflickr
-Version:        0.8
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Standalone Flickr Uploader for KDE
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://kflickr.sourceforge.net 
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Tue Sep 18 2007 Michael Stahnke <mastahnke at gmail.com> - 0.9-1
+- License updated per new guidelines 
+- Bump for upstream release (0.9)
+
 * Mon May 14 2007 Michael Stahnke <mastahnke at gmail.com> - 0.8-3
 - Final touch-up for review bug # 237355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kflickr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2007 04:29:33 -0000	1.2
+++ sources	19 Sep 2007 02:18:56 -0000	1.3
@@ -1 +1 @@
-cdda0c42b8e492a1c762014187dbfe63  kflickr-0.8.tar.gz
+01b7a6d3c87464a55bbbf25686fd53c2  kflickr-0.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 02:30:19 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 18 Sep 2007 22:30:19 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.160,
	1.161 policycoreutils-gui.patch, 1.33,
	1.34 policycoreutils-rhat.patch, 1.322,
	1.323 policycoreutils.spec, 1.449, 1.450 sources, 1.165, 1.166
Message-ID: <200709190230.l8J2UJcq014630@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14595

Modified Files:
	.cvsignore policycoreutils-gui.patch 
	policycoreutils-rhat.patch policycoreutils.spec sources 
Log Message:
* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
- Update to upstream
  * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- .cvsignore	13 Sep 2007 12:32:16 -0000	1.160
+++ .cvsignore	19 Sep 2007 02:29:47 -0000	1.161
@@ -158,3 +158,4 @@
 policycoreutils-2.0.25.tgz
 sepolgen-1.0.9.tgz
 sepolgen-1.0.10.tgz
+policycoreutils-2.0.26.tgz

policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policycoreutils-gui.patch	14 Sep 2007 14:41:51 -0000	1.33
+++ policycoreutils-gui.patch	19 Sep 2007 02:29:47 -0000	1.34
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.25/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/booleansPage.py	2007-09-11 15:02:03.000000000 -0400
++++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,226 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,9 +228,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.25/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/fcontextPage.py	2007-09-11 15:02:05.000000000 -0400
++++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -441,9 +441,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.25/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/loginsPage.py	2007-09-11 15:02:07.000000000 -0400
++++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -624,9 +624,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.25/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/Makefile	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -662,9 +662,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.25/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/mappingsPage.py	2007-09-11 15:02:09.000000000 -0400
++++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -722,9 +722,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.25/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/modulesPage.py	2007-09-11 15:02:11.000000000 -0400
++++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -907,9 +907,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.25/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.glade	2007-09-10 15:42:48.000000000 -0400
++++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
 @@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1074,7 +1074,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="select_type_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select application or user role to be confined.</property>
++	      <property name="title" translatable="yes">Select type of the application/user to be confined</property>
 +	      <signal name="next" handler="on_select_type_page_next" last_modification_time="Sat, 04 Aug 2007 11:39:15 GMT"/>
 +
 +	      <child internal-child="vbox">
@@ -1395,7 +1395,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="app_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Name of application to be confined</property>
++	      <property name="title" translatable="yes">Enter name of application/user to be confined</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox5">
@@ -1644,7 +1644,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="transition_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select additional user domain(s) for transition</property>
++	      <property name="title" translatable="yes">Select additional domains to which this user will transition</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1718,7 +1718,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="admin_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select the domain(s) that this user will administer</property>
++	      <property name="title" translatable="yes">Select additional domains that this user will administer</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1792,7 +1792,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="roles_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Select the roles(s) that this user will be able to become</property>
++	      <property name="title" translatable="yes">Select additioanl roles for this user</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="vbox13">
@@ -1866,7 +1866,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="in_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Incoming Network Port Connections</property>
++	      <property name="title" translatable="yes">Enter network ports that application/user listens to</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox6">
@@ -2007,7 +2007,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_tcp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that this application binds to. </property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2139,7 +2139,7 @@
 +				  <child>
 +				    <widget class="GtkCheckButton" id="in_udp_unreserved_checkbutton">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user binds to. Example: 612, 650-660</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="label" translatable="yes">Unreserved Ports (&gt;1024)</property>
 +				      <property name="use_underline">True</property>
@@ -2197,7 +2197,7 @@
 +				  <child>
 +				    <widget class="GtkEntry" id="in_udp_entry">
 +				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that this application binds to. </property>
++				      <property name="tooltip" translatable="yes">Allows application/user to bind to any udp ports &gt; 1024</property>
 +				      <property name="can_focus">True</property>
 +				      <property name="editable">True</property>
 +				      <property name="visibility">True</property>
@@ -2289,8 +2289,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="out_net_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Outgoing Network Port Connections</property>
-+
++	      <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports that application/user connects to. </property>
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox7">
 +		  <property name="border_width">16</property>
@@ -2388,7 +2387,8 @@
 +				      <child>
 +					<widget class="GtkEntry" id="out_tcp_entry">
 +					  <property name="visible">True</property>
-+					  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that this application/user connects to.</property>
++					  <property name="tooltip" translatable="yes">Enter a comma separated list of tcp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
++
 +					  <property name="can_focus">True</property>
 +					  <property name="editable">True</property>
 +					  <property name="visibility">True</property>
@@ -2520,7 +2520,7 @@
 +			      <child>
 +				<widget class="GtkEntry" id="out_udp_entry">
 +				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports that this application/user connects to.</property>
++				      <property name="tooltip" translatable="yes">Enter a comma separated list of udp ports or ranges of ports that application/user connects to. Example: 612, 650-660</property>
 +				  <property name="can_focus">True</property>
 +				  <property name="editable">True</property>
 +				  <property name="visibility">True</property>
@@ -2605,7 +2605,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="common_apps_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Common Application Traits</property>
++	      <property name="title" translatable="yes">Select common application traits</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox8">
@@ -2737,7 +2737,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="files_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Files and Directories</property>
++	      <property name="title" translatable="yes">Select files/directories that the application manages</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox9">
@@ -2992,7 +2992,7 @@
 +					      <child>
 +						<widget class="GtkTreeView" id="write_treeview">
 +						  <property name="visible">True</property>
-+						  <property name="tooltip" translatable="yes">Add Files/Directories that this application will need to &quot;Write&quot; to. Pid Files, Log Files, /var/lib Files ...</property>
++						  <property name="tooltip" translatable="yes">Add Files/Directories that application will need to &quot;Write&quot; to. Pid Files, Log Files, /var/lib Files ...</property>
 +						  <property name="can_focus">True</property>
 +						  <property name="headers_visible">False</property>
 +						  <property name="rules_hint">False</property>
@@ -3067,7 +3067,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="gen_policy_page">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Generate policy in this directory</property>
++	      <property name="title" translatable="yes">Select directory to generate policy in</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox10">
@@ -3297,10 +3297,10 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-09-11 15:02:14.000000000 -0400
-@@ -0,0 +1,452 @@
++++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
+@@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3500,6 +3500,14 @@
 +            if self.on_select_type_page_next():
 +                return
 +
++        if self.pages[type][self.current_page] == self.IN_NET_PAGE:
++            if self.on_in_net_page_next():
++                return
++
++        if self.pages[type][self.current_page] == self.OUT_NET_PAGE:
++            if self.on_out_net_page_next():
++                return
++
 +        if self.pages[type][self.current_page] == self.APP_PAGE:
 +            if self.on_name_page_next():
 +                return
@@ -3721,6 +3729,22 @@
 +            return
 +        self.output_entry.set_text(self.file_dialog.get_filename())
 +        
++    def on_in_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.in_tcp_entry.get_text())
++            polgen.verify_ports(self.in_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
++    def on_out_net_page_next(self, *args):
++        try:
++            polgen.verify_ports(self.out_tcp_entry.get_text())
++            polgen.verify_ports(self.out_udp_entry.get_text())
++        except ValueError, e:
++            self.error(e.message)
++            return True
++        
 +    def on_select_type_page_next(self, *args):
 +        self.exec_entry.set_sensitive(self.confine_application())
 +        self.exec_button.set_sensitive(self.confine_application())
@@ -3753,10 +3777,10 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.25/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgen.py	2007-09-10 15:43:04.000000000 -0400
-@@ -0,0 +1,727 @@
++++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
+@@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -3842,6 +3866,34 @@
 +APPLICATIONS = [ DAEMON, INETD, USER, CGI ]
 +USERS = [ XUSER, TUSER, RUSER ]
 +
++def verify_ports(ports):
++    if ports == "":
++        return []
++    max_port=2**16
++    try:
++        temp = []
++        for a in ports.split(","):
++            r =  a.split("-")
++            if len(r) > 2:
++                raise  ValueError
++            if len(r) == 1:
++                begin = int (r[0])
++                end = int (r[0])
++            else:
++                begin = int (r[0])
++                end = int (r[1]) + 1
++                
++                if begin > end:
++                    raise  ValueError
++                
++                for p in range(begin, end):
++                    if p < 1 or p > max_port:
++                        raise  ValueError
++                    temp.append(p)
++                return temp
++    except ValueError:
++        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
++
 +class policy:
 +
 +	def __init__(self, name, type):
@@ -3925,21 +3977,6 @@
 +                    return self.dict[begin,end]
 +            return  None
 +
-+	def __verify_ports(self, ports):
-+		if ports == "":
-+			return []
-+		max_port=2**16
-+		try:
-+			temp = []
-+			for p in ports.split(","):
-+				i = int(p.strip())
-+				if i < 1 or i > max_port:
-+					raise  ValueError()
-+				temp.append(i)
-+			return temp
-+		except ValueError:
-+			raise  ValueError(_("Ports must be be numbers from 1 to %d " % max_port ))
-+
 +	def set_program(self, program):
 +                if self.type not in APPLICATIONS:
 +                    raise ValueError(_("USER Types are not allowed executables"))
@@ -3953,16 +3990,16 @@
 +		self.initscript = initscript
 +
 +	def set_in_tcp(self, all, reserved, unreserved, ports):
-+		self.in_tcp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_tcp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_in_udp(self, all, reserved, unreserved, ports):
-+		self.in_udp = [ all, reserved, unreserved, self.__verify_ports(ports)]
++		self.in_udp = [ all, reserved, unreserved, verify_ports(ports)]
 +
 +	def set_out_tcp(self, all, ports):
-+		self.out_tcp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_tcp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_out_udp(self, all, ports):
-+		self.out_udp = [ all , False, False, self.__verify_ports(ports) ]
++		self.out_udp = [ all , False, False, verify_ports(ports) ]
 +
 +	def set_use_syslog(self, val):
 +		if val != True and val != False:
@@ -4411,7 +4448,7 @@
 +if __name__ == '__main__':
 +    mypolicy = policy("mycgi", CGI)
 +    mypolicy.set_program("/var/www/cgi-bin/cgi")
-+    mypolicy.set_in_tcp(1, 0, 0, "513")
++    mypolicy.set_in_tcp(1, 0, 0, "512, 55000-55000")
 +    mypolicy.set_in_udp(1, 0, 0, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_tmp(False)
@@ -4484,9 +4521,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.25/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/portsPage.py	2007-09-11 15:02:16.000000000 -0400
++++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4735,9 +4772,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.25/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/selinux.tbl	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,296 @@
 +allow_console_login _("Login") _("Allow direct login to the console device. Requiered for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5035,9 +5072,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivledged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivledged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.25/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/semanagePage.py	2007-09-11 15:02:18.000000000 -0400
++++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,136 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5175,9 +5212,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.25/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/statusPage.py	2007-09-11 15:02:21.000000000 -0400
++++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5398,9 +5435,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.25/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.glade	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,3326 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8728,9 +8765,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.25/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/system-config-selinux.py	2007-09-11 15:02:23.000000000 -0400
++++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,171 @@
 +#!/usr/bin/python
 +#
@@ -8903,9 +8940,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.25/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/executable.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9185,9 +9222,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.25/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/__init__.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9207,9 +9244,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.25/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/network.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9291,9 +9328,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.25/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/rw.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9423,10 +9460,10 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.25/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/script.py	2007-09-14 10:14:10.000000000 -0400
-@@ -0,0 +1,45 @@
++++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
+@@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -9452,6 +9489,11 @@
 +########################### tmp Template File #############################
 +compile="""
 +#!/bin/sh
++if [ ! -f /usr/share/selinux/devel/Makefile ]; then
++echo 'selinux-policy-devel not installed, package required for building policy'
++echo '# yum install selinux-policy-devel'
++exit 1
++fi
 +make -f /usr/share/selinux/devel/Makefile
 +/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
@@ -9472,9 +9514,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.25/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/semodule.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9517,9 +9559,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.25/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/tmp.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9618,9 +9660,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.25/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/user.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9761,9 +9803,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.25/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_lib.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9927,9 +9969,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.25/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_log.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10043,9 +10085,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.25/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_run.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10166,9 +10208,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.25/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/templates/var_spool.py	2007-09-14 10:14:10.000000000 -0400
++++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10301,9 +10343,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.25/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/translationsPage.py	2007-09-11 15:01:13.000000000 -0400
++++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10423,9 +10465,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.25/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/usersPage.py	2007-09-11 15:01:08.000000000 -0400
++++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- policycoreutils-rhat.patch	23 Aug 2007 21:00:38 -0000	1.322
+++ policycoreutils-rhat.patch	19 Sep 2007 02:29:47 -0000	1.323
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.23/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.25/Makefile
 --- nsapolicycoreutils/Makefile	2007-07-16 14:20:43.000000000 -0400
-+++ policycoreutils-2.0.23/Makefile	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/Makefile	2007-08-28 09:22:16.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.23/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.25/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.23/restorecond/restorecond.c	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/restorecond/restorecond.c	2007-08-28 09:22:16.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,526 +36,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.23/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.23/scripts/genhomedircon	2007-08-23 10:08:04.000000000 -0400
-@@ -0,0 +1,404 @@
-+#! /usr/bin/python -E
-+# Copyright (C) 2004 Tresys Technology, LLC
-+# see file 'COPYING' for use and warranty information
-+#
-+# genhomedircon - this script is used to generate file context
-+# configuration entries for user home directories based on their
-+# default prefixes and is run when building the policy. Specifically, we
-+# replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files with
-+# generic and user-specific values.
-+#
-+# Based off original script by Dan Walsh, <dwalsh at redhat.com>
-+#
-+# ASSUMPTIONS:
-+#
-+# The file CONTEXTDIR/files/homedir_template exists.  This file is used to
-+# set up the home directory context for each real user.
-+# 
-+# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, prefix user
-+#
-+# "Real" users (as opposed to system users) are those whose UID is greater than
-+#  or equal STARTING_UID (usually 500) and whose login is not a member of
-+#  EXCLUDE_LOGINS.  Users who are explicitly defined in CONTEXTDIR/seusers
-+#  are always "real" (including root, in the default configuration).
-+#
-+#  
-+
-+import sys, os, pwd, string, getopt, re
-+from semanage import *;
-+import selinux
-+import gettext
-+gettext.install('policycoreutils')
-+
-+def grep(file, var):
-+	ret = ""
-+	fd = open(file, 'r')
-+
-+	for i in  fd.readlines():
-+	    if re.search(var, i, 0) != None:
-+	        ret = i
-+                break
-+	fd.close()
-+	return ret
-+
-+def findval(file, var, delim = ""):
-+	val = ""
-+	try:
-+		fd = open(file, 'r')
-+		for i in  fd.readlines():
-+			if i.startswith(var) == 1:
-+				if delim == "":
-+					val = i.split()[1]
-+				else:
-+					val = i.split(delim)[1]
-+				val = val.split("#")[0]
-+				val = val.strip()
-+		fd.close()
-+	except:
-+		val = ""
-+	return val
-+
-+def getStartingUID():
-+	starting_uid = sys.maxint
-+	uid_min =  findval("/etc/login.defs", "UID_MIN")
-+	if uid_min != "":
-+		uid_min = uid_min.split("#")[0]
-+		uid_min = uid_min.strip()
-+		if int(uid_min) < starting_uid:
-+			starting_uid = int(uid_min)
-+
-+	uid_min =  findval("/etc/libuser.conf", "LU_UIDNUMBER", "=")
-+	if uid_min != "":
-+		uid_min = uid_min.split("#")[0]
-+		uid_min = uid_min.strip()
-+		if int(uid_min) < starting_uid:
-+			starting_uid = int(uid_min)
-+
-+	if starting_uid == sys.maxint:
-+		starting_uid = 500
-+	return starting_uid
-+
-+def getDefaultHomeDir():
-+	ret = []
-+	homedir = findval("/etc/default/useradd", "HOME", "=")
-+	if homedir != "" and not homedir in ret:
-+		ret.append(homedir)
-+	
-+	homedir = findval("/etc/libuser.conf", "LU_HOMEDIRECTORY", "=")
-+	if homedir != "" and not homedir in ret:
-+		ret.append(homedir)
-+	
-+	if ret == []:
-+		ret.append("/home")
-+
-+	# Add /export/home if it exists
-+	# Some customers use this for automounted homedirs
-+	if os.path.exists("/export/home"):
-+		ret.append("/export/home")
-+
-+	return ret
-+
-+def getSELinuxType(directory):
-+	val = findval(directory+"/config", "SELINUXTYPE", "=")
-+	if val != "":
-+		return val
-+	return "targeted"
-+
-+def usage(rc=0, error = ""):
-+	if error != "":
-+		sys.stderr.write("%s\n" % error)
-+		rc = 1
-+	sys.stderr.write("Usage: %s [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ]\n" % sys.argv[0])
-+	sys.stderr.flush()
-+	sys.exit(rc)
-+
-+def warning(warning = ""):
-+	sys.stderr.write("%s\n" % warning)
-+	sys.stderr.flush()
-+	
-+def errorExit(error):
-+	sys.stderr.write("%s exiting for: " % sys.argv[0])
-+	sys.stderr.write("%s\n" % error)
-+	sys.stderr.flush()
-+	sys.exit(1)
-+
-+class selinuxConfig:
-+	def __init__(self, selinuxdir = "/etc/selinux", type = "targeted", usepwd = 1):
-+		self.semanageHandle = semanage_handle_create()
-+		self.semanaged = semanage_is_managed(self.semanageHandle)
-+		if self.semanaged:
-+			rc = semanage_connect(self.semanageHandle)
-+			if rc:
-+				errorExit("Unable to connect to semanage")
-+			(status, self.ulist) = semanage_user_list(self.semanageHandle)
-+		self.type = type
-+		self.selinuxdir = selinuxdir +"/"
-+		self.contextdir = "/contexts"
-+		self.filecontextdir = self.contextdir+"/files"
-+		self.usepwd = usepwd
-+		self.default_user = "user_u"
-+		self.default_prefix = "user"
-+		self.users = self.getUsers()
-+		fd = open(self.getFileContextFile())
-+		self.fclines=[]
-+		for i in fd.readlines():
-+		    try:
-+			    regex = i.split()[0]
-+			    #match a trailing .+
-+			    regex = re.sub("\.+$", "", regex)
-+			    regex = re.sub("\.\*$", "", regex)
-+			    regex = re.sub("\(\/\.\*\)\?", "", regex)
-+			    regex = regex + "/*$"
-+			    self.fclines.append(re.compile(regex))
-+		    except:
-+			    continue
-+
-+		fd.close()
-+		
-+	def getFileContextDir(self):
-+		return self.selinuxdir+self.type+self.filecontextdir
-+
-+	def getFileContextFile(self):
-+		return self.getFileContextDir()+"/file_contexts"
-+	
-+	def getContextDir(self):
-+		return self.selinuxdir+self.type+self.contextdir
-+
-+	def getHomeDirTemplate(self):
-+		return self.getFileContextDir()+"/homedir_template"
-+
-+	def getHomeRootContext(self, homedir):
-+		ret = ""
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+
-+		for i in  fd.readlines():
-+			if i.find("HOME_ROOT") == 0:
-+				i = i.replace("HOME_ROOT", homedir)
-+				ret += i
-+		fd.close()
-+		if ret == "":
-+			errorExit("No Home Root Context Found")
-+		return ret
-+
-+	def heading(self):
-+		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
-+		if self.semanaged:
-+			ret += "# use semanage command to manage system users in order to change the file_context\n#\n#\n"
-+		else:
-+			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
-+		return ret
-+
-+	def get_default_prefix(self, name):
-+		for user in self.ulist:
-+			if semanage_user_get_name(user) == name:
-+				return semanage_user_get_prefix(user)
-+		return name
-+
-+	def get_old_prefix(self, user):
-+		rc = grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % user)
-+		if rc == "":					    
-+			rc = grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % user)
-+		if rc != "":
-+			user = rc.split()
-+			prefix  =  user[3]
-+			if prefix == "{":
-+				prefix = user[4]
-+		if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
-+			prefix = prefix[:-2]
-+		return prefix
-+		
-+	def adduser(self, udict, user, seuser, prefix):
-+		if seuser == self.default_user or user == "__default__" or user == "system_u":
-+			return
-+		# !!! chooses first prefix in the list to use in the file context !!!
-+		try:
-+			home = pwd.getpwnam(user)[5]
-+			if home == "/":
-+				# Probably install so hard code to /root
-+				if user == "root":
-+					home = "/root"
-+				else:
-+					return
-+		except KeyError:
-+			if user == "root":
-+				home = "/root"
-+			else:
-+				sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user)
-+				return
-+		prefs = {}
-+		prefs["seuser"] = seuser
-+		prefs["prefix"] = prefix
-+		prefs["home"] = home
-+		udict[user] = prefs
-+			
-+	def setDefaultUser(self, user, prefix):
-+		self.default_user = user
-+		self.default_prefix = prefix
-+		
-+	def getUsers(self):
-+		udict = {}
-+		if self.semanaged:
-+			(status, list) = semanage_seuser_list(self.semanageHandle)
-+			for seuser in list:
-+				user = []
-+				seusername = semanage_seuser_get_sename(seuser)
-+				prefix = self.get_default_prefix(seusername)
-+				if semanage_seuser_get_name(seuser) == "__default__":
-+					self.setDefaultUser(seusername, prefix)
-+
-+				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, prefix)
-+				
-+		else:
-+			try:
-+				fd = open(self.selinuxdir+self.type+"/seusers")
-+				for u in  fd.readlines():
-+					u = u.strip()
-+					if len(u) == 0 or u[0] == "#":
-+						continue
-+					user = u.split(":")
-+					if len(user) < 2:
-+						continue
-+					
-+					prefix = self.get_old_prefix(user[1])
-+					self.adduser(udict, user[0], user[1], prefix)
-+				fd.close()
-+			except IOError, error:
-+				# Must be install so force add of root
-+				self.adduser(udict, "root", "root", "root")
-+
-+		return udict
-+
-+	def getHomeDirContext(self, user, seuser, home, prefix):
-+		ret = "\n\n#\n# Home Context for user %s\n#\n\n" % user
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+		for i in  fd.readlines():
-+			if i.startswith("HOME_DIR") == 1:
-+				i = i.replace("HOME_DIR", home)
-+				i = i.replace("ROLE", prefix)
-+				i = i.replace("system_u", seuser)
-+				# Validate if the generated context exists.  Some user types may not exist
-+				scon = i.split()[-1]
-+				if selinux.is_selinux_enabled() < 1 or selinux.security_check_context(scon) == 0:
-+					ret = ret+i
-+		fd.close()
-+		return ret
-+
-+	def getUserContext(self, user, sel_user, prefix):
-+		ret = ""
-+		fd = open(self.getHomeDirTemplate(), 'r')
-+		for i in  fd.readlines():
-+			if i.find("USER") > 0:
-+				i = i.replace("USER", user)
-+				i = i.replace("ROLE", prefix)
-+				i = i.replace("system_u", sel_user)
-+				ret = ret+i
-+		fd.close()
-+		return ret
-+
-+	def genHomeDirContext(self):
-+		ret = ""
-+		# Fill in HOME and prefix for users that are defined
-+		for u in self.users.keys():
-+			ret += self.getHomeDirContext (u, self.users[u]["seuser"], self.users[u]["home"], self.users[u]["prefix"])
-+			ret += self.getUserContext (u, self.users[u]["seuser"], self.users[u]["prefix"])
-+		return ret+"\n"
-+
-+	def checkExists(self, home):
-+		for i in self.fclines:
-+		    try:
-+			    if i.match(home):
-+				    return 1
-+		    except:
-+			    continue
-+		return 0
-+
-+	def getHomeDirs(self):
-+		homedirs = getDefaultHomeDir()
-+		starting_uid = getStartingUID()
-+		if self.usepwd == 0:
-+			return homedirs
-+		ulist = pwd.getpwall()
-+		for u in ulist:
-+			if u[2] >= starting_uid and \
-+					u[6] in VALID_SHELLS and \
-+					u[5] != "/" and \
-+					string.count(u[5], "/") > 1:
-+				homedir = u[5][:string.rfind(u[5], "/")]
-+				if not homedir in homedirs:
-+					if self.checkExists(homedir) == 1:
-+						warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context. This usually indicates an incorrectly defined system account.  If it is a system account please make sure its login shell is /sbin/nologin." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
-+					else:
-+						homedirs.append(homedir)
-+
-+		homedirs.sort()
-+		return homedirs
-+ 
-+	def genoutput(self):
-+		ret = self.heading()
-+		for h in self.getHomeDirs():
-+			ret += self.getHomeDirContext (self.default_user, self.default_user, h+'/[^/]*', self.default_prefix)
-+			ret += self.getHomeRootContext(h)
-+		ret += self.getUserContext(".*", self.default_user, self.default_prefix) + "\n"
-+		ret += self.genHomeDirContext()
-+		return ret
-+
-+	def printout(self):
-+		print self.genoutput()
-+
-+	def write(self):
-+		fd = open(self.getFileContextDir()+"/file_contexts.homedirs", "w")
-+		fd.write(self.genoutput())
-+		fd.close()
-+
-+if os.getuid() > 0 or os.geteuid() > 0:
-+	print _("You must be root to run %s.") % sys.argv[0]
-+	sys.exit(1)
-+
-+try:
-+	fd = open("/etc/shells", 'r')
-+	VALID_SHELLS = fd.read().split("\n")
-+	fd.close()
-+	if "/sbin/nologin" in VALID_SHELLS:
-+		VALID_SHELLS.remove("/sbin/nologin")
-+	if "" in VALID_SHELLS:
-+		VALID_SHELLS.remove("")
-+except:
-+	VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh']
-+
-+#
-+# This script will generate home dir file context
-+# based off the homedir_template file, entries in the password file, and
-+#
-+try:
-+	usepwd = 1
-+	directory = "/etc/selinux"
-+	type = None
-+	gopts, cmds = getopt.getopt(sys.argv[1:], 'hnd:t:', ['help',
-+						'type=',
-+						'nopasswd',
-+						'dir='])
-+	for o,a in gopts:
-+		if o == '--type' or o == "-t":
-+			type = a
-+		if o == '--nopasswd'  or o == "-n":
-+			usepwd = 0
-+		if o == '--dir'  or o == "-d":
-+			directory = a
-+		if o == '--help'  or o == "-h":
-+			usage()
-+except getopt.error, error:
-+	errorExit(_("Options Error %s ") % error)
-+
-+if type == None:
-+	type = getSELinuxType(directory)
-+
-+if len(cmds) != 0:
-+	usage(1)
-+
-+selconf = selinuxConfig(directory, type, usepwd)
-+try:
-+	selconf.write()
-+except IOError, error:
-+	sys.stderr.write("%s: %s\n" % ( sys.argv[0], error ))
-+	sys.exit(1)
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon.8 policycoreutils-2.0.23/scripts/genhomedircon.8
---- nsapolicycoreutils/scripts/genhomedircon.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.23/scripts/genhomedircon.8	2007-08-20 19:16:35.000000000 -0400
-@@ -0,0 +1,82 @@
-+.\" Hey, Emacs! This is an -*- nroff -*- source file.
-+.\" Copyright (c) 2005 Manoj Srivastava <srivasta at debian.org>
-+.\"
-+.\" This is free documentation; 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.
-+.\"
-+.\" The GNU General Public License's references to "object code"
-+.\" and "executables" are to be interpreted as the output of any
-+.\" document formatting or typesetting system, including
-+.\" intermediate and printed output.
-+.\"
-+.\" This manual 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 manual; if not, write to the Free
-+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-+.\" USA.
-+.\"
-+.\"
-+.TH GENHOMEDIRCON "8" "January 2005" "Security Enhanced Linux" ""
-+.SH NAME
-+genhomedircon \- generate SELinux file context configuration entries for user home directories 
-+.SH SYNOPSIS
-+.B genhomedircon [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ] [-h]
-+
-+.SH OPTIONS
-+.TP
-+.B "\-h"
-+Print a short usage message
-+.TP
-+.B "\-d selinuxdir (\-\-directory)"
-+Directory where selinux files are installed defaults to /etc/selinux
-+.TP
-+.B 
-+\-n \-\-nopasswd
-+Indicates to the utility not to read homedirectories out of the password database.  
-+.TP
-+\-t selinuxtype (\-\-type)
-+Indicates the selinux type of this install.  Defaults to "targeted".
-+.SH DESCRIPTION
-+.PP
-+This utility is used to generate file context configuration entries for 
-+user home directories based on their 
-+.B prefix 
-+entry in the the 
-+.B semanage user record.  
-+genhomedircon is run when building 
-+the policy. It is also run automaticaly when ever the 
-+.B semanage 
-+utility modifies 
-+.B user
-+or
-+.B login
-+records.
-+Specifically, we replace HOME_ROOT, HOME_DIR, and ROLE macros in the 
-+.I /etc/selinux/<<SELINUXTYPE>>/contexts/files/homedir_template 
-+file with generic and user-specific values.  HOME_ROOT and HOME_DIR is replaced with each distinct location where login users homedirectories are located.  Defaults to /home. ROLE is replaced based on the prefix entry in the 
-+.B user
-+record.
-+.PP 
-+genhomedircon searches through all password entires for all "login" user home directories, (as opposed
-+to system users).  Login users are those whose UID is greater than or equal 
-+.I STARTING_UID
-+(default 500) and whose login shell is not "/sbin/nologin", or
-+"/bin/false". 
-+.PP 
-+.SH AUTHOR
-+This manual page was originally written by 
-+.I Manoj Srivastava <srivasta at debian.org>,
-+for the Debian GNU/Linux system, based on the comments and the code
-+in the utility, and then updated by Dan Walsh of Red Hat. The 
-+.B genhomedircon
-+utility was originally written by 
-+.I Dan Walsh of Red Hat 
-+with some modifications by 
-+.I Tresys Technology, LLC.
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.23/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2007-08-23 16:52:26.000000000 -0400
-+++ policycoreutils-2.0.23/scripts/Makefile	2007-08-20 19:16:35.000000000 -0400
-@@ -5,14 +5,18 @@
- MANDIR ?= $(PREFIX)/share/man
- LOCALEDIR ?= /usr/share/locale
- 
--all: fixfiles
-+TARGETS=genhomedircon 
-+
-+all: $(TARGETS) fixfiles
- 
- install: all
- 	-mkdir -p $(BINDIR)
-+	install -m 755 $(TARGETS) $(SBINDIR)
- 	install -m 755 chcat $(BINDIR)
- 	install -m 755 fixfiles $(DESTDIR)/sbin
- 	-mkdir -p $(MANDIR)/man8
- 	install -m 644 fixfiles.8 $(MANDIR)/man8/
-+	install -m 644 genhomedircon.8 $(MANDIR)/man8/
- 	install -m 644 chcat.8 $(MANDIR)/man8/
- 
- clean:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.23/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.25/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.23/semanage/seobject.py	2007-08-22 16:29:22.000000000 -0400
++++ policycoreutils-2.0.25/semanage/seobject.py	2007-08-28 09:22:17.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -713,9 +196,9 @@
  
  		return ddict
  			
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.23/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.25/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.23/semodule/semodule.8	2007-08-23 10:18:35.000000000 -0400
++++ policycoreutils-2.0.25/semodule/semodule.8	2007-08-28 09:22:17.000000000 -0400
 @@ -23,6 +23,9 @@
  .B \-B, \-\-build		
  force a rebuild of policy (also reloads unless -n is used)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- policycoreutils.spec	14 Sep 2007 14:41:51 -0000	1.449
+++ policycoreutils.spec	19 Sep 2007 02:29:47 -0000	1.450
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
-%define	libsepolver	2.0.9-1
+%define	libsepolver	2.0.10-1
 %define	libsemanagever	2.0.5-1
-%define	libselinuxver	2.0.23-3
+%define	libselinuxver	2.0.34-1
 %define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.25
-Release: 14%{?dist}
+Version: 2.0.26
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -107,6 +107,7 @@
 Requires: usermode, rhpl
 Requires: python >= 2.4
 BuildRequires: desktop-file-utils
+Requires: selinux-policy
 
 %description gui
 system-config-selinux is a utility for managing the SELinux environment
@@ -138,7 +139,6 @@
 %{_sbindir}/semodule
 %{_sbindir}/semanage
 %{_sbindir}/load_policy
-%{_sbindir}/genhomedircon
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
@@ -165,7 +165,6 @@
 %{_mandir}/man8/fixfiles.8.gz
 %{_mandir}/man8/load_policy.8.gz
 %{_mandir}/man8/audit2why.8.gz
-%{_mandir}/man8/genhomedircon.8.gz
 %{_mandir}/man8/open_init_pty.8.gz
 %{_mandir}/man8/setsebool.8.gz
 %{_mandir}/man8/run_init.8.gz
@@ -200,6 +199,13 @@
 fi
 
 %changelog
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
+- Update to upstream
+  * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.
+
+* Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-15
+- Fix wording in policy generation tool
+
 * Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-14
 - Fix calls to _admin interfaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	13 Sep 2007 12:32:16 -0000	1.165
+++ sources	19 Sep 2007 02:29:47 -0000	1.166
@@ -1,2 +1,2 @@
-43c5df63e94b6e35d1f830b5b7ee6cfc  policycoreutils-2.0.25.tgz
 eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz
+109975b307c6992ff721ba644b4fb718  policycoreutils-2.0.26.tgz



From fedora-extras-commits at redhat.com  Wed Sep 19 03:02:01 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 18 Sep 2007 23:02:01 -0400
Subject: rpms/slingshot/FC-6 slingshot, NONE, 1.1 slingshot-font-path.patch, 
	NONE, 1.1 slingshot.desktop, NONE, 1.1 slingshot.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709190302.l8J32129021278@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/slingshot/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21242

Modified Files:
	sources 
Added Files:
	slingshot slingshot-font-path.patch slingshot.desktop 
	slingshot.spec 
Log Message:
Initial import.



--- NEW FILE slingshot ---
#!/bin/bash
cd /usr/share/slingshot
python slingshot.py

slingshot-font-path.patch:

--- NEW FILE slingshot-font-path.patch ---
--- slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
+++ slingshot/slingshot.py	2007-09-11 20:46:33.000000000 -0500
@@ -53,9 +53,9 @@
 	particle_image_rect = None
 	
 	pygame.font.init()
-	Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
-	Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
-	Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
+	Settings.font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 14)
+	Settings.menu_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+	Settings.round_font = pygame.font.Font("/usr/share/fonts/freefont/FreeSansBold.ttf", 100)
 	
 	def __init__(self):		
 		pygame.display.init()


--- NEW FILE slingshot.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Slingshot
Exec=slingshot
Comment=A Newtoninan strategy game
Icon=slingshot.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE slingshot.spec ---
Name: slingshot
Version:  0.8.1p
Release:  1%{?dist}
Summary: A Newtonian strategy game

Group: Amusements/Games 
License: GPLv2+        
URL: http://www.slingshot-game.org/
Source0: http://downloads.sourceforge.net/slingshot-game/slingshot-%{version}.tar.gz
Source1: slingshot.desktop
Source2: slingshot
Patch0: slingshot-font-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame, freefont

%description
Slingshot is a two dimensional, turn based simulation-strategy game 
set in the gravity fields of several planets. It is a highly 
addictive game, and never the same from round to round due to its 
randomly generated playing fields.

%prep
%setup -q

%patch0 -p0

%build

rm -f slingshot/data/FreeSansBold.ttf

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/slingshot

mkdir -p  %{buildroot}%{_datadir}/slingshot
install -m 644 slingshot/*.py %{buildroot}%{_datadir}/slingshot
mkdir -p  %{buildroot}%{_datadir}/slingshot/data
install -m 644 slingshot/data/* %{buildroot}%{_datadir}/slingshot/data

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mv slingshot/data/icon64x64.png slingshot/data/slingshot.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 slingshot/data/slingshot.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/slingshot
%{_datadir}/slingshot/
%doc Readme.txt slingshot/licence.txt
%{_datadir}/applications/fedora-slingshot.desktop
%{_datadir}/icons/hicolor/64x64/apps/slingshot.png

%changelog
* Thu Sep 06 2007 Jon Ciesla <limb at jcomserv.net> - 0.8.1p-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slingshot/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Sep 2007 15:54:31 -0000	1.1
+++ sources	19 Sep 2007 03:01:26 -0000	1.2
@@ -0,0 +1 @@
+a205f9cfee3e19f42d37ff6d10c46e9b  slingshot-0.8.1p.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 03:15:47 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 18 Sep 2007 23:15:47 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.49,1.50
Message-ID: <200709190315.l8J3Flku021508@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21490

Modified Files:
	xscreensaver.spec 
Log Message:
* Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
- Remove noreplace flag from XScreenSaver.ad as this is updated
  automatically.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xscreensaver.spec	15 Sep 2007 14:47:28 -0000	1.49
+++ xscreensaver.spec	19 Sep 2007 03:15:15 -0000	1.50
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    6
+%define fedora_rel    7
 %endif
 
 %define extrarel      %{nil}
@@ -372,7 +372,7 @@
    echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
 done
 echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
-echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+echo "%%config %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
    $dd/base.files
 echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
    >> $dd/base.files
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
+- Remove noreplace flag from XScreenSaver.ad as this is updated
+  automatically.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
 - Fix update script to treat the ending character of conf file
   correctly.



From fedora-extras-commits at redhat.com  Wed Sep 19 03:56:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:56:55 -0700
Subject: [pkgdb] perl-Test-Script was added for corsepiu
Message-ID: <200709190356.l8J3uuhl011980@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Test-Script with summary Cross-platform basic tests for scripts
Kevin Fenzi (kevin) has approved Package perl-Test-Script
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Test-Script with an owner of corsepiu
Kevin Fenzi (kevin) has approved perl-Test-Script in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, 6) updated by kevin
Message-ID: <200709190357.l8J3vIDG006990@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora 6) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora 6) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, devel) updated by kevin
Message-ID: <200709190357.l8J3vId2007000@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora devel) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora devel) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 20:57:17 -0700
Subject: [pkgdb] perl-Test-Script (Fedora, 7) updated by kevin
Message-ID: <200709190357.l8J3vJRQ007009@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Test-Script
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Test-Script (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on perl-Test-Script (Fedora 7) for perl-sig
Kevin Fenzi (kevin) approved watchcommits on perl-Test-Script (Fedora 7) for perl-sig
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Test-Script (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Script



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:46 -0400
Subject: rpms/perl-Test-Script - New directory
Message-ID: <200709190357.l8J3vk3I022295@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script

Log Message:
Directory /cvs/extras/rpms/perl-Test-Script added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:49 -0400
Subject: rpms/perl-Test-Script/devel - New directory
Message-ID: <200709190357.l8J3vn2q022309@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Script/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:51 -0400
Subject: rpms/perl-Test-Script Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709190357.l8J3vpAN022334@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Script


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Script
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 03:57:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 23:57:53 -0400
Subject: rpms/perl-Test-Script/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709190357.l8J3vrYp022350@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22266/rpms/perl-Test-Script/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Script


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Script
# $Id: Makefile,v 1.1 2007/09/19 03:57:51 kevin Exp $
NAME := perl-Test-Script
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 fedora-extras-commits at redhat.com  Wed Sep 19 04:00:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:29 -0700
Subject: [pkgdb] rt61pci-firmware was added for kwizart
Message-ID: <200709190400.l8J40TRm013082@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package rt61pci-firmware with summary Firmware for Ralink? RT2561/RT2661 A/B/G network adaptor
Kevin Fenzi (kevin) has approved Package rt61pci-firmware
Kevin Fenzi (kevin) has added a Fedora devel branch for rt61pci-firmware with an owner of kwizart
Kevin Fenzi (kevin) has approved rt61pci-firmware in Fedora devel
Kevin Fenzi (kevin) has approved Package rt61pci-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt61pci-firmware (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt61pci-firmware (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt61pci-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt61pci-firmware



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:41 -0700
Subject: [pkgdb] rt61pci-firmware (Fedora, 7) updated by kevin
Message-ID: <200709190400.l8J40fE9013177@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for rt61pci-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt61pci-firmware (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on rt61pci-firmware (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt61pci-firmware



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 18 Sep 2007 21:00:41 -0700
Subject: [pkgdb] rt61pci-firmware (Fedora, devel) updated by kevin
Message-ID: <200709190400.l8J40gNI013189@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on rt61pci-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt61pci-firmware



From fedora-extras-commits at redhat.com  Wed Sep 19 04:00:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:00:59 -0400
Subject: rpms/rt61pci-firmware - New directory
Message-ID: <200709190400.l8J40x6T022581@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware

Log Message:
Directory /cvs/extras/rpms/rt61pci-firmware added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:06 -0400
Subject: rpms/rt61pci-firmware/devel - New directory
Message-ID: <200709190401.l8J416SU027734@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware/devel

Log Message:
Directory /cvs/extras/rpms/rt61pci-firmware/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:09 -0400
Subject: rpms/rt61pci-firmware Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709190401.l8J419Op028354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware

Added Files:
	Makefile import.log 
Log Message:
Setup of module rt61pci-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module rt61pci-firmware
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 04:01:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 00:01:12 -0400
Subject: rpms/rt61pci-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709190401.l8J41Cji028551@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt61pci-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX22551/rpms/rt61pci-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rt61pci-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rt61pci-firmware
# $Id: Makefile,v 1.1 2007/09/19 04:01:10 kevin Exp $
NAME := rt61pci-firmware
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 fedora-extras-commits at redhat.com  Wed Sep 19 04:07:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:07:24 -0400
Subject: rpms/perl-Test-Script/devel perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190407.l8J47OdU028855@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28826

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:06:50 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:06:50 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:09:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:09:59 -0400
Subject: rpms/perl-Test-Script/F-7 perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190409.l8J49xcI028944@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28923

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:09:26 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:09:26 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:11:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 00:11:18 -0400
Subject: rpms/perl-Test-Script/FC-6 perl-Test-Script.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190411.l8J4BImf029038@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Script/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Script.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Script.spec ---
Name:           perl-Test-Script
Version:        1.02
Release:        2%{?dist}
Summary:        Cross-platform basic tests for scripts
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Script/
Source0:        http://www.cpan.org/modules/by-module/Test/Test-Script-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IPC::Run3) >= 0.034
BuildRequires:  perl(Test::More)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The intent of this module is to provide a series of basic tests for scripts
in the bin directory of your Perl distribution.

%prep
%setup -q -n Test-Script-%{version}
# Broken permissions in tarball
chmod -x Changes lib/Test/*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 LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Sep 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-2
- Reflect license tag changes.
- BR: perl(Test::More).
- Remove BR: perl.
- Add chmod -x Changes lib/Test/*pm

* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.02-1
- Specfile autogenerated by cpanspec 1.73.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 03:57:51 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:10:46 -0000	1.2
@@ -0,0 +1 @@
+Test-Script-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Script/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 03:57:51 -0000	1.1
+++ sources	19 Sep 2007 04:10:46 -0000	1.2
@@ -0,0 +1 @@
+affeb47b8c7b9f1eb6ff346daa85784d  Test-Script-1.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:21:38 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 00:21:38 -0400
Subject: rpms/python-memcached/F-7 .cvsignore, 1.1, 1.2 python-memcached.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709190421.l8J4Lc7Q029439@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29322

Modified Files:
	.cvsignore python-memcached.spec sources 
Log Message:
Updated to 1.40 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jun 2007 23:33:03 -0000	1.1
+++ .cvsignore	19 Sep 2007 04:21:06 -0000	1.2
@@ -0,0 +1 @@
+python-memcached-1.40.tar.gz


Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-memcached.spec	12 Sep 2007 08:29:29 -0000	1.2
+++ python-memcached.spec	19 Sep 2007 04:21:06 -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:           python-memcached
-Version:        1.39
+Version:        1.40
 Release:        1%{?dist}
 Summary:        A Python memcached client library
 
@@ -29,6 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/python_memcached-*egg-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
+- Update to 1.40 upstream release.
+
 * Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
 - Update to 1.39 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2007 08:27:53 -0000	1.3
+++ sources	19 Sep 2007 04:21:06 -0000	1.4
@@ -1 +1 @@
-403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz
+fa551479291679871ac64ab74d1a52d0  python-memcached-1.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:24:31 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 00:24:31 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <200709190424.l8J4OVsq029620@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29579

Modified Files:
	python-memcached.spec sources 
Log Message:
Updating to 1.40 upstream release.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-memcached.spec	12 Sep 2007 20:26:22 -0000	1.2
+++ python-memcached.spec	19 Sep 2007 04:23:59 -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:           python-memcached
-Version:        1.39
+Version:        1.40
 Release:        1%{?dist}
 Summary:        A Python memcached client library
 
@@ -29,6 +29,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/python_memcached-*egg-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
+- Update to 1.40 upstream release.
+
 * Tue Aug 14 2007 Sean Reifschneider <jafo at tummy.com> 1.39-1
 - Update to 1.39 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2007 20:26:22 -0000	1.3
+++ sources	19 Sep 2007 04:23:59 -0000	1.4
@@ -1 +1 @@
-403d509d3d386adbc2d27763655cd268  python-memcached-1.39.tar.gz
+fa551479291679871ac64ab74d1a52d0  python-memcached-1.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:35:20 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Wed, 19 Sep 2007 00:35:20 -0400
Subject: rpms/ragel/devel .cvsignore, 1.4, 1.5 ragel.spec, 1.4, 1.5 sources, 
	1.4, 1.5
Message-ID: <200709190435.l8J4ZKEB029892@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29863

Modified Files:
	.cvsignore ragel.spec sources 
Log Message:
- update to upstream 5.24
- fix License:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Jul 2007 02:28:08 -0000	1.4
+++ .cvsignore	19 Sep 2007 04:34:48 -0000	1.5
@@ -1 +1 @@
-ragel-5.23.tar.gz
+ragel-5.24.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ragel.spec	29 Aug 2007 04:30:07 -0000	1.4
+++ ragel.spec	19 Sep 2007 04:34:48 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           ragel   
-Version:        5.23
-Release:        2%{?dist}
+Version:        5.24
+Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
-License:        GPL 
+License:        GPLv2+
 URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
 Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.24-1
+- update to 5.24
+- update License tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.23-2
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jul 2007 02:28:08 -0000	1.4
+++ sources	19 Sep 2007 04:34:48 -0000	1.5
@@ -1 +1 @@
-e60fd87d80a34e2e8f063781e02c8142  ragel-5.23.tar.gz
+efd6e7f659ce4ca52b02ca4b5084ac30  ragel-5.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 04:39:52 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Wed, 19 Sep 2007 00:39:52 -0400
Subject: rpms/ragel/F-7 .cvsignore, 1.4, 1.5 ragel.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200709190439.l8J4dqSX030040@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/ragel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30003

Modified Files:
	.cvsignore ragel.spec sources 
Log Message:
- update to upstream 5.24
- fix License:




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Jul 2007 02:31:20 -0000	1.4
+++ .cvsignore	19 Sep 2007 04:39:20 -0000	1.5
@@ -1 +1 @@
-ragel-5.23.tar.gz
+ragel-5.24.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/ragel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ragel.spec	25 Jul 2007 02:31:20 -0000	1.3
+++ ragel.spec	19 Sep 2007 04:39:20 -0000	1.4
@@ -1,10 +1,10 @@
 Name:           ragel   
-Version:        5.23
+Version:        5.24
 Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
-License:        GPL 
+License:        GPLv2+
 URL:            http://www.cs.queensu.ca/~thurston/ragel/ 
 Source0:        http://www.cs.queensu.ca/~thurston/ragel/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,13 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.24-1
+- update to 5.24
+- update License tag
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 5.23-2
+- Rebuild for selinux ppc32 issue.
+
 * Tue Jul 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 5.23-1
 - update to 5.23
 - removed ragel-rlcodegen-replace.patch - it was applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jul 2007 02:31:20 -0000	1.4
+++ sources	19 Sep 2007 04:39:20 -0000	1.5
@@ -1 +1 @@
-e60fd87d80a34e2e8f063781e02c8142  ragel-5.23.tar.gz
+efd6e7f659ce4ca52b02ca4b5084ac30  ragel-5.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 05:03:13 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 01:03:13 -0400
Subject: comps comps-f8.xml.in,1.113,1.114
Message-ID: <200709190503.l8J53D2v004143@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30259

Modified Files:
	comps-f8.xml.in 
Log Message:
- make im-chooser optional for gnome and kde
- remove old packages: FreeWnn and m17n-db-georgian 
- renamed evolution-connector to evolution-exchange
- rename Democracy to Miro
- add w3m



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- comps-f8.xml.in	18 Sep 2007 15:56:50 -0000	1.113
+++ comps-f8.xml.in	19 Sep 2007 05:02:43 -0000	1.114
@@ -356,7 +356,6 @@
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
-      <packagereq type="optional">FreeWnn</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -1594,7 +1593,6 @@
       <packagereq type="mandatory">dejavu-fonts</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ka</packagereq>
       <packagereq type="default">dejavu-fonts-experimental</packagereq>
-      <packagereq type="optional">m17n-db-georgian</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1665,7 +1663,6 @@
       <packagereq type="default">gok</packagereq>
       <packagereq type="default">gthumb</packagereq>
       <packagereq type="default">gtk2-engines</packagereq>
-      <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">nautilus-cd-burner</packagereq>
       <packagereq type="default">nautilus-sendto</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
@@ -1704,6 +1701,7 @@
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">hal-gnome</packagereq>
+      <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">istanbul</packagereq>
       <packagereq type="optional">lock-keys-applet</packagereq>
       <packagereq type="optional">nautilus-actions</packagereq>
@@ -1834,7 +1832,7 @@
       <packagereq type="optional">drivel</packagereq>
       <packagereq type="optional">epiphany</packagereq>
       <packagereq type="optional">epiphany-extensions</packagereq>
-      <packagereq type="optional">evolution-connector</packagereq>
+      <packagereq type="optional">evolution-exchange</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">galeon</packagereq>
@@ -1865,6 +1863,7 @@
       <packagereq type="optional">linphone</packagereq>
       <packagereq type="optional">logjam</packagereq>
       <packagereq type="optional">mail-notification</packagereq>
+      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mugshot</packagereq>
       <packagereq type="optional">ochusha</packagereq>
       <packagereq type="optional">pan</packagereq>
@@ -2347,7 +2346,6 @@
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">gpgme</packagereq>
-      <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">kaffeine</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeaddons</packagereq>
@@ -2374,6 +2372,7 @@
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
+      <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">kasablanca</packagereq>
       <packagereq type="optional">katapult</packagereq>
       <packagereq type="optional">kbackup</packagereq>
@@ -3216,7 +3215,6 @@
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
-      <packagereq type="optional">Democracy</packagereq>
       <packagereq type="optional">dvdauthor</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
       <packagereq type="optional">dvgrab</packagereq>
@@ -3245,6 +3243,7 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
+      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
@@ -3635,6 +3634,7 @@
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tftp</packagereq>
       <packagereq type="optional">tin</packagereq>
+      <packagereq type="optional">w3m</packagereq>
       <packagereq type="optional">websec</packagereq>
       <packagereq type="optional">xprobe2</packagereq>
       <packagereq type="optional">yafc</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 19 05:25:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Piotr_Dr=C4=85g?= (raven))
Date: Wed, 19 Sep 2007 01:25:24 -0400
Subject: comps/po pl.po,1.7,1.8
Message-ID: <200709190525.l8J5POgI004528@cvs-int.fedora.redhat.com>

Author: raven

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4510/comps/po

Modified Files:
	pl.po 
Log Message:
Updated Polish translation


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pl.po	17 Sep 2007 19:22:12 -0000	1.7
+++ pl.po	19 Sep 2007 05:24:54 -0000	1.8
@@ -10,7 +10,7 @@
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-09-10 17:10+0200\n"
+"PO-Revision-Date: 2007-09-19 07:21+0200\n"
 "Last-Translator: Piotr Dr??g <raven at pmail.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1074,7 +1074,3 @@
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
 msgstr "Starsze pakiety czcionek bitmapowych i wektorowych"
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Obs??uga somalijskiego"



From fedora-extras-commits at redhat.com  Wed Sep 19 05:26:41 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 19 Sep 2007 01:26:41 -0400
Subject: rpms/gphoto2/devel gphoto2.spec,1.84,1.85
Message-ID: <200709190526.l8J5QfNH004599@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535

Modified Files:
	gphoto2.spec 
Log Message:
add missing BR popt-devel


Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gphoto2.spec	18 Sep 2007 20:41:01 -0000	1.84
+++ gphoto2.spec	19 Sep 2007 05:26:08 -0000	1.85
@@ -25,7 +25,7 @@
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel, readline-devel
 BuildRequires: libtool, pkgconfig, sharutils
-BuildRequires: libtool-ltdl-devel
+BuildRequires: libtool-ltdl-devel, popt-devel
 
 ####################################
 %description
@@ -201,6 +201,7 @@
 %changelog
 * Tue Sep 18 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-3
 - avoid tagging mass storage devices as cameras (#295051)
+- add missing BR popt-devel
 
 * Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 2.4.0-2
 - update License



From fedora-extras-commits at redhat.com  Wed Sep 19 05:38:57 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 01:38:57 -0400
Subject: rpms/python-memcached/F-7 python-memcached.spec,1.3,1.4
Message-ID: <200709190538.l8J5cve6004954@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4914

Modified Files:
	python-memcached.spec 
Log Message:
Adding python-setuptools buildreq.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/F-7/python-memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-memcached.spec	19 Sep 2007 04:21:06 -0000	1.3
+++ python-memcached.spec	19 Sep 2007 05:38:24 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-memcached
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 
 %description
 This software is a 100% Python interface to the memcached memory cache
@@ -41,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-2
+- Adding setuptools to the buildreqs.
+
 * Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
 - Update to 1.40 upstream release.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 05:40:09 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 01:40:09 -0400
Subject: rpms/gnome-media/devel icons.patch, NONE, 1.1 gnome-media.spec,
	1.108, 1.109
Message-ID: <200709190540.l8J5e9tj005038@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992

Modified Files:
	gnome-media.spec 
Added Files:
	icons.patch 
Log Message:
- Don't add extra categories to volume control, since
  upstream has moved it to Hardware  (#295251)
- Make icons show up again  (#295171)



icons.patch:

--- NEW FILE icons.patch ---
diff -up gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons gnome-media-2.20.0/gnome-cd/gnome-cd.c
--- gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons	2007-08-09 09:52:53.000000000 -0400
+++ gnome-media-2.20.0/gnome-cd/gnome-cd.c	2007-09-19 01:36:51.000000000 -0400
@@ -294,15 +294,18 @@ make_button_from_widget (GnomeCD *gcd,
 }
 
 static GtkWidget *
-make_button_from_icon_name (GnomeCD *gcd,
-			    const char *icon_name,
+make_button_from_stock     (GnomeCD *gcd,
+			    const char *stock,
 			    GCallback func,
 			    const char *tooltip, 
 			    const char *shortname)
 {
 	GtkWidget *pixmap;
 
-	pixmap = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+	if (gtk_icon_factory_lookup_default (stock))
+		pixmap = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
+	else
+		pixmap = gtk_image_new_from_icon_name (stock, GTK_ICON_SIZE_BUTTON);
 
 	return make_button_from_widget (gcd, pixmap, func, tooltip, shortname);
 }
@@ -401,7 +404,10 @@ make_popup_menu (GnomeCD *gcd, GdkEventB
 		        icon_name = menuitems[i].icon;
 		
 		if (icon_name != NULL) {
-			image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+			if (gtk_icon_factory_lookup_default (icon_name))
+				image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
+			else
+				image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 		}
 		
 		if (image != NULL) {
@@ -717,7 +723,7 @@ init_player (const char *device_override
 	option_hbox = gtk_hbox_new (FALSE, 2);
 
 	/* Create app controls */
-	button = make_button_from_icon_name (gcd, GTK_STOCK_PREFERENCES,
+	button = make_button_from_stock     (gcd, GTK_STOCK_PREFERENCES,
 					     G_CALLBACK(open_preferences),
 					     _("Open preferences"),
 					     _("Preferences"));
@@ -732,7 +738,7 @@ init_player (const char *device_override
 	gnome_cd_build_track_list_menu (gcd);
 	gtk_box_pack_start (GTK_BOX (option_hbox), gcd->tracks, TRUE, TRUE, 0);
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_INDEX,
+	button = make_button_from_stock         (gcd, GTK_STOCK_INDEX,
 					     G_CALLBACK(open_track_editor),
 					     _("Open track editor"),
 					     _("Track editor"));
@@ -769,15 +775,15 @@ init_player (const char *device_override
 	gcd->play_b = button;
 	gcd->current_image = gcd->play_image;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->stop_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->back_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
 	g_signal_connect (G_OBJECT (button), "button-press-event",
 			  G_CALLBACK (rewind_press_cb), gcd);
 	g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -785,7 +791,7 @@ init_player (const char *device_override
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->rewind_b = button;
 	
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
 	g_signal_connect (G_OBJECT (button), "button-press-event",
 			  G_CALLBACK (ffwd_press_cb), gcd);
 	g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -793,11 +799,11 @@ init_player (const char *device_override
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->ffwd_b = button;
 
-	button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
+	button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->next_b = button;
 
-	button = make_button_from_icon_name (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
+	button = make_button_from_stock (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
 	gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
 	gcd->eject_b = button;
 


Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-media.spec	18 Sep 2007 10:48:46 -0000	1.108
+++ gnome-media.spec	19 Sep 2007 05:39:32 -0000	1.109
@@ -12,11 +12,12 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
+Patch1:		icons.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -75,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
+%patch1 -p1 -b .icons
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -98,13 +100,11 @@
 ## only show in GNOME
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-cd.desktop 
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
-  --add-category X-GNOME-PersonalSettings                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-volume-control.desktop
 
 # show in all
@@ -164,7 +164,7 @@
 %files -f %{gettext_package}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 
 %{_libexecdir}/*
@@ -187,6 +187,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Don't add extra categories to volume control, since
+  upstream has moved it to Hardware  (#295251)
+- Make icons show up again  (#295171)
+
 * Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 19 05:47:09 2007
From: fedora-extras-commits at redhat.com (Sean Reifschneider (jafo))
Date: Wed, 19 Sep 2007 01:47:09 -0400
Subject: rpms/python-memcached/EL-5 python-memcached.spec,1.3,1.4
Message-ID: <200709190547.l8J5l9aF005407@cvs-int.fedora.redhat.com>

Author: jafo

Update of /cvs/pkgs/rpms/python-memcached/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342

Modified Files:
	python-memcached.spec 
Log Message:
Adding python-setuptools buildreq.



Index: python-memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-memcached/EL-5/python-memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-memcached.spec	19 Sep 2007 04:23:59 -0000	1.3
+++ python-memcached.spec	19 Sep 2007 05:46:36 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-memcached
 Version:        1.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python memcached client library
 
 Group:          Development/Languages
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 
 %description
 This software is a 100% Python interface to the memcached memory cache
@@ -41,6 +41,9 @@
 %{python_sitelib}/memcache.py[co]
 
 %changelog
+* Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-2
+- Adding setuptools to the buildreqs.
+
 * Tue Sep 18 2007 Sean Reifschneider <jafo at tummy.com> 1.40-1
 - Update to 1.40 upstream release.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 06:28:20 2007
From: fedora-extras-commits at redhat.com (Subhransu Behera (sbehera))
Date: Wed, 19 Sep 2007 02:28:20 -0400
Subject: rpms/nabi/devel Makefile, 1.2, 1.3 nabi-makefile.patch, NONE,
	1.1 nabi.spec, 1.5, 1.6 sources, 1.3, 1.4 theme-removal.sh, NONE,
	1.1 xinput.d-nabi, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709190628.l8J6SKnJ012617@cvs-int.fedora.redhat.com>

Author: sbehera

Update of /cvs/pkgs/rpms/nabi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12580/devel

Added Files:
	Makefile nabi-makefile.patch nabi.spec sources 
	theme-removal.sh xinput.d-nabi 
Removed Files:
	dead.package 
Log Message:
initial import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Sep 2007 06:27:48 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: nabi
+# $Id$
+NAME := nabi
+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)

nabi-makefile.patch:

--- NEW FILE nabi-makefile.patch ---
--- themes/Makefile.am	2007-03-21 19:19:46.000000000 +0530
+++ themes/Makefile.am-modified	2007-09-03 16:17:37.000000000 +0530
@@ -1,15 +1,6 @@
 simplyreddir= @NABI_THEMES_DIR@/SimplyRed
 simplyred_DATA = SimplyRed/none.png SimplyRed/hangul.png SimplyRed/english.png
 
-mswindowsdir= @NABI_THEMES_DIR@/MSWindows
-mswindows_DATA = MSWindows/none.png MSWindows/hangul.png MSWindows/english.png
-
-mswindowsxpdir= @NABI_THEMES_DIR@/MSWindowsXP
-mswindowsxp_DATA = MSWindowsXP/none.png MSWindowsXP/hangul.png MSWindowsXP/english.png
-
-macdir= @NABI_THEMES_DIR@/Mac
-mac_DATA = Mac/README Mac/none.png Mac/hangul.png Mac/english.png
-
 oniondir= @NABI_THEMES_DIR@/Onion
 onion_DATA = Onion/README Onion/none.png Onion/hangul.png Onion/english.png
 
@@ -28,9 +19,6 @@
 
 EXTRA_DIST = \
 	$(simplyred_DATA) \
-	$(mswindows_DATA) \
-	$(mswindowsxp_DATA) \
-	$(mac_DATA) \
 	$(onion_DATA) \
 	$(keyboard_DATA) \
 	$(kingsejong_DATA) \


Index: nabi.spec
===================================================================
RCS file: nabi.spec
diff -N nabi.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nabi.spec	19 Sep 2007 06:27:48 -0000	1.6
@@ -0,0 +1,175 @@
+Summary: Hangul X Input Method
+Name: nabi
+Version: 0.18
+Release: 7%{?dist}
+
+Group: User Interface/X
+License: GPLv2+
+URL: http://nabi.kldp.net/
+Source0: nabi-%{version}_fedora.tar.gz
+
+# The upstream tarball
+# http://download.kldp.net/%{name}/Nabi/%{version}/%{name}-%{version}.tar.gz
+# currently contains some themes with images based on propriety desktops.
+# Hence, we use the following script to remove them before shipping.
+# Download the upstream tarball and invoke this script while in the
+# tarball directory:
+# ./theme-removal.sh %{version}
+# (Upstream will probably remove the said themes from a feature release.)
+
+Source1: theme-removal.sh
+Source2: xinput.d-%{name}
+Patch0: nabi-makefile.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gtk2-devel >= 2.2.0
+BuildRequires: libhangul-devel >= 0.0.6
+BuildRequires: gettext, desktop-file-utils
+
+Requires:      libhangul >= 0.0.6
+Requires:      im-chooser
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
+
+%description
+Nabi is a XIM for Korean, implemented with GTK+2.
+It shows its status in the notification area.
+
+%prep
+%setup -q -n %{name}-%{version}_fedora
+%patch0 -p0
+
+%build
+aclocal
+automake
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT 
+mkdir -p 644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+install -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ko_KR xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf 30
+
+%postun
+if [ "$1" = 0 ]; then
+   %{_sbindir}/alternatives --remove xinput-ko_KR %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+fi
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README
+%{_bindir}/nabi
+%{_datadir}/nabi
+%config (noreplace) %{_sysconfdir}/X11/xinit/xinput.d/%{name}.conf
+
+
+%changelog
+* Mon Sep 03 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-7
+- Removed non-free themes from source
+
+* Fri Aug 10 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-6
+- Removed unnecessary desktop file
+- Tidy doc filelist
+
+* Wed Aug 08 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-5
+- Updated license to GPLv2+
+- No need to clean buildroot in prep
+
+* Tue Aug 07 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-4
+- Supported parallel make
+- Used the full path for alternatives
+
+* Mon Aug 06 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-3
+- improved desktop file installation
+- fixed xinput.d filename  
+
+* Mon Jul 30 2007 Jens Petersen <petersen at dhcp-65.brisbane.redhat.com> - 0.18-2
+- move desktop file to a source file
+- drop themeRemove.sh and remove problematic themes at install time
+- update description
+- fix location of xinput file
+
+* Thu Jul 26 2007 Subhransu Behera <sbehera at redhat.com> - 0.18-1
+- Upgraded to 0.18 release
+
+* Thu Jul 05 2007 Subhransu Behera <sbehera at redhat.com> - 0.17-2
+- upgraded to 0.17 release
+
+* Wed Mar 16 2005 Warren Togami <wtogami at redhat.com> -  0.14-4
+- many spec fixes
+
+* Tue Oct 12 2004 Leon Ho <llch at redhat.com>
+- add NoDisplay=true to .desktop to hide desktop entry
+
+* Wed Sep 29 2004 Lawrence Lim <llim at redhat.com>
+- upgraded to 0.14
+- fix bug 131586
+  - Trademaked icons in nabi themes
+- fix bug 131866
+  - Upgrade nabi to 0.14
+
+* Tue Jul 06 2004 Leon Ho <llch at redhat.com>
+- upgraded to 0.13
+- added support to xinitrc-4.0.1
+  - added xinput-nabi
+  - added alternativies on post and preun
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Dec 02 2003 David Joo <djoo at redhat.com> 0.11-3
+- Packaged against Fedora Core2
+
+* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.11-1pdc
+- updated to 0.11 release
+
+* Sat Nov 29 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-2pdc
+- fixed BuildRequires
+
+* Sun Nov 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.10-1pdc
+- updated to 0.10 release
+
+* Mon Oct 20 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-2pdc
+- added RedHat/Mandrake specific entries
+
+* Wed Oct 15 2003 DongCheon Park <pdc at kaist.ac.kr> 0.9-1pdc
+- updated to 0.9 release
+
+* Thu Oct 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.8-1pdc
+- updated to 0.8 release
+
+* Fri Sep 26 2003 DongCheon Park <pdc at kaist.ac.kr> 0.7-1pdc
+- updated to 0.7 release
+
+* Tue Sep 16 2003 DongCheon Park <pdc at kaist.ac.kr> 0.6-1pdc
+- updated to 0.6 release
+
+* Mon Sep 08 2003 DongCheon Park <pdc at kaist.ac.kr> 0.5-1pdc
+- updated to 0.5 release
+
+* Wed Sep 03 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-2pdc
+- cleaned up nabi.spec
+
+* Wed Aug 27 2003 DongCheon Park <pdc at kaist.ac.kr> 0.4-1pdc
+- updated to 0.4 release
+
+* Mon Aug 11 2003 DongCheon Park <pdc at kaist.ac.kr> 0.3-1pdc
+- updated to 0.3 release
+
+* Sat Aug 09 2003 DongCheon Park <pdc at kaist.ac.kr> 0.2-1pdc
+- updated to 0.2 release
+
+* Thu Aug 07 2003 DongCheon Park <pdc at kaist.ac.kr> 0.1-1pdc
+- initial build


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Sep 2007 06:27:48 -0000	1.4
@@ -0,0 +1 @@
+9e01930256f1b2540088ec118d7b9f4a  nabi-0.18_fedora.tar.gz


--- NEW FILE theme-removal.sh ---
#!/bin/bash

set -e

VERSION=$1
SUFFIX=_fedora

OLD=nabi-$VERSION
NEW=$OLD$SUFFIX

tar zxf $OLD.tar.gz
mv $OLD $NEW
rm -r $NEW/themes/{MSWindows,MSWindowsXP,Mac}
tar zcf $NEW.tar.gz $NEW


Index: xinput.d-nabi
===================================================================
RCS file: xinput.d-nabi
diff -N xinput.d-nabi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xinput.d-nabi	19 Sep 2007 06:27:48 -0000	1.3
@@ -0,0 +1,3 @@
+XIM=nabi
+XIM_PROGRAM=nabi
+GTK_IM_MODULE=xim


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 06:43:43 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:43:43 -0400
Subject: rpms/Pound/devel Pound.spec,1.18,1.19
Message-ID: <200709190643.l8J6hh4I013011@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930

Modified Files:
	Pound.spec 
Log Message:
Modify URL and Source0 (thanks nirik)



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Pound.spec	16 Aug 2007 18:43:28 -0000	1.18
+++ Pound.spec	19 Sep 2007 06:43:11 -0000	1.19
@@ -10,7 +10,7 @@
 
 Group:       System Environment/Daemons
 License:     GPLv3
-URL:         http://apsis.ch/pound
+URL:         http://www.apsis.ch/pound
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -27,7 +27,7 @@
 Requires(preun):  /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
-Source0:  http://apsis.ch/pound/%{name}-%{version}%{alpha}.tgz
+Source0:  http://www.apsis.ch/pound/%{name}-%{version}%{alpha}.tgz
 Source1:  pound.init
 Source2:  pound.cfg
 Patch0:   pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:46:00 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:46:00 -0400
Subject: rpms/Pound/F-7 Pound.spec,1.15,1.16
Message-ID: <200709190646.l8J6k04e013190@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13156

Modified Files:
	Pound.spec 
Log Message:
Fix URL and Source0 to an address that resolves in dns



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-7/Pound.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Pound.spec	25 May 2007 17:44:25 -0000	1.15
+++ Pound.spec	19 Sep 2007 06:45:27 -0000	1.16
@@ -9,7 +9,7 @@
 
 Group:		System Environment/Daemons
 License:	GPL        
-URL:		http://apsis.ch/pound
+URL:		http://www.apsis.ch/pound
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, pcre-devel
@@ -19,7 +19,7 @@
 Requires(preun):	/sbin/chkconfig, /sbin/service
 Requires(postun):	/sbin/service
 
-Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
+Source0:	http://www.apsis.ch/pound/%{name}-%{version}.tgz       
 Source1:	pound.init
 Source2:	pound.cfg
 Patch0:		pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:48:31 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 02:48:31 -0400
Subject: rpms/nut/devel nut-2.2.0-wrongssl.patch, NONE, 1.1 nut.spec, 1.47,
	1.48
Message-ID: <200709190648.l8J6mVmj013273@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
- fix wrong libssl flags in devel, fix devel package dependencies


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 06:47:58 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,6 +22,7 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib
 Requires(post): fileutils /sbin/chkconfig /sbin/service
@@ -78,7 +79,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +91,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -277,6 +279,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 06:50:54 2007
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Wed, 19 Sep 2007 02:50:54 -0400
Subject: rpms/Pound/FC-6 Pound.spec,1.6,1.7
Message-ID: <200709190650.l8J6ospB013397@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13360

Modified Files:
	Pound.spec 
Log Message:
Change URL and Source0 to a host that resolves in DNS



Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/FC-6/Pound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Pound.spec	11 Apr 2007 21:48:31 -0000	1.6
+++ Pound.spec	19 Sep 2007 06:50:19 -0000	1.7
@@ -9,7 +9,7 @@
 
 Group:		System Environment/Daemons
 License:	GPL        
-URL:		http://apsis.ch/pound
+URL:		http://www.apsis.ch/pound
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, pcre-devel
@@ -19,7 +19,7 @@
 Requires(preun):	/sbin/chkconfig, /sbin/service
 Requires(postun):	/sbin/service
 
-Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
+Source0:	http://www.apsis.ch/pound/%{name}-%{version}.tgz       
 Source1:	pound.init
 Source2:	pound.cfg
 Patch0:		pound-remove-owner.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 06:52:00 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 02:52:00 -0400
Subject: comps comps-f8.xml.in,1.114,1.115
Message-ID: <200709190652.l8J6q02w013482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13465

Modified Files:
	comps-f8.xml.in 
Log Message:
add nabi



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- comps-f8.xml.in	19 Sep 2007 05:02:43 -0000	1.114
+++ comps-f8.xml.in	19 Sep 2007 06:51:30 -0000	1.115
@@ -2478,6 +2478,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-korean</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
+      <packagereq type="optional">nabi</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Wed Sep 19 07:13:28 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Wed, 19 Sep 2007 03:13:28 -0400
Subject: rpms/php/devel php-5.2.4-embed.patch,1.2,1.3
Message-ID: <200709190713.l8J7DSrN019876@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19855

Modified Files:
	php-5.2.4-embed.patch 
Log Message:
- fix soname


php-5.2.4-embed.patch:

Index: php-5.2.4-embed.patch
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php-5.2.4-embed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.2.4-embed.patch	18 Sep 2007 19:06:36 -0000	1.2
+++ php-5.2.4-embed.patch	19 Sep 2007 07:13:26 -0000	1.3
@@ -5,7 +5,7 @@
      yes|shared)
        PHP_EMBED_TYPE=shared
 -      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
-+      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION)"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_VERSION)"
 +      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
        ;;
      static)



From fedora-extras-commits at redhat.com  Wed Sep 19 07:20:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal))
Date: Wed, 19 Sep 2007 03:20:04 -0400
Subject: rpms/wireshark/devel wireshark.spec,1.22,1.23
Message-ID: <200709190720.l8J7K4S8020069@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20039

Modified Files:
	wireshark.spec 
Log Message:
fixed URL


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wireshark.spec	23 Aug 2007 15:01:40 -0000	1.22
+++ wireshark.spec	19 Sep 2007 07:19:32 -0000	1.23
@@ -5,13 +5,13 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.6
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
-Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz
+Source0:	http://wireshark.org/download/prerelease/%{name}-%{version}-SVN-%{svn_version}.tar.gz
 %else
-Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
+Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.gz
 %endif
 Source1:	wireshark.pam
 Source2:	wireshark.console
@@ -186,6 +186,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Radek Vok??l <rvokal at redhat.com> 0.99.6-3
+- fixed URL
+
 * Thu Aug 23 2007 Radek Vok??l <rvokal at redhat.com> 0.99.6-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Sep 19 07:26:54 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 03:26:54 -0400
Subject: rpms/nut/EL-5 nut-2.2.0-wrongssl.patch,NONE,1.1 nut.spec,1.47,1.48
Message-ID: <200709190726.l8J7Qsrg020683@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20657

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-4
- fix manpages encodings
- run ldconfig after client (un)install


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 07:26:22 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,10 +22,11 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
-Requires: nut-client => 2.0.0 hal dbus-glib
-Requires(post): fileutils /sbin/chkconfig /sbin/service
-Requires(postun): fileutils /sbin/chkconfig /sbin/service
+Requires: nut-client => 2.0.0 hal dbus-glib shadow-utils
+Requires(post): fileutils chkconfig /sbin/service
+Requires(postun): fileutils chkconfig /sbin/service
 
 BuildRequires: gd-devel
 BuildRequires: freetype-devel
@@ -58,8 +59,6 @@
 %package client
 Group: Applications/System
 Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
 
 %description client
 This package includes the client utilities that are required to monitor a
@@ -78,7 +77,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +89,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -102,14 +102,23 @@
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
     --with-all \
-	--with-ipv6 \
+    --with-ipv6 \
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
-	--with-pkgconfig-dir=%{_libdir}/pkgconfig \
-	--disable-static
+    --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+    --disable-static
 
 make %{?_smp_mflags}
 
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
+rm -f man/*.iso
+
 %install
 rm -rf %{buildroot}
 
@@ -152,6 +161,7 @@
 
 %post client
 /sbin/chkconfig --add ups
+/sbin/ldconfig
 exit 0
 
 %preun client
@@ -159,6 +169,7 @@
     /sbin/service ups stop > /dev/null 2>&1
     /sbin/chkconfig --del ups
 fi
+/sbin/ldconfig
 exit 0
 
 %postun client
@@ -277,6 +288,13 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-4
+- fix manpages encodings
+- run ldconfig after client (un)install
+
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 07:48:26 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:48:26 -0400
Subject: rpms/ekiga/F-7 ekiga.spec,1.39,1.40 sources,1.12,1.13
Message-ID: <200709190748.l8J7mQxi021197@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/ekiga/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21177

Modified Files:
	ekiga.spec sources 
Log Message:
- Upgrade to ekiga-2.0.11
Daniel



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-7/ekiga.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ekiga.spec	15 Apr 2007 21:11:03 -0000	1.39
+++ ekiga.spec	19 Sep 2007 07:47:53 -0000	1.40
@@ -1,14 +1,14 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 2.0.9
+Version: 2.0.11
 Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.7
-Requires: opal >= 2.2.8
+Requires: pwlib >= 1.10.10
+Requires: opal >= 2.2.11
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -23,8 +23,8 @@
 BuildRequires: avahi-devel >= 0.6.9
 BuildRequires: avahi-glib-devel >= 0.6.9
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.7
-BuildRequires: opal-devel >= 2.2.8
+BuildRequires: pwlib-devel >= 1.10.10
+BuildRequires: opal-devel >= 2.2.11
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -93,7 +93,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
-* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9.1
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.0.11-1
+- Upgrade to ekiga-2.0.11
+
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9-1
 - Upgrade to ekiga-2.0.9
 
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.0.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Apr 2007 20:46:54 -0000	1.12
+++ sources	19 Sep 2007 07:47:53 -0000	1.13
@@ -1 +1 @@
-7dd9f812ce3b940839b12486ddee7e80  ekiga-2.0.9.tar.gz
+684865225d77898e10e960f3a286b894  ekiga-2.0.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 07:51:29 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 03:51:29 -0400
Subject: rpms/nut/EL-4 nut-2.2.0-wrongssl.patch,NONE,1.1 nut.spec,1.47,1.48
Message-ID: <200709190751.l8J7pTk8021416@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21339

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-wrongssl.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
- fix manpages encodings
- run ldconfig after client (un)install
- remove hal support for EL4


nut-2.2.0-wrongssl.patch:

--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl	2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in	2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
 Version="@PACKAGE_VERSION@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
 
 arch=$(/bin/arch)
 if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
 else
 	libdir="/usr/lib"
 fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
 
 
 case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl	2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in	2007-09-06 11:08:30.000000000 +0200
@@ -9,5 +9,5 @@
 Name: libupsclient
 Description: UPS monitoring with Network UPS Tools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@
-Cflags: -I${includedir} @SSL_CFLAGS@
+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@
+Cflags: -I${includedir} @LIBSSL_CFLAGS@


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec	16 Aug 2007 10:31:13 -0000	1.47
+++ nut.spec	19 Sep 2007 07:50:56 -0000	1.48
@@ -9,12 +9,12 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3.1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
@@ -22,10 +22,11 @@
 Patch1: nut-2.2.0-multilib.patch
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
 
-Requires: nut-client => 2.0.0 hal dbus-glib
-Requires(post): fileutils /sbin/chkconfig /sbin/service
-Requires(postun): fileutils /sbin/chkconfig /sbin/service
+Requires: nut-client => 2.0.0 dbus-glib shadow-utils
+Requires(post): fileutils chkconfig /sbin/service
+Requires(postun): fileutils chkconfig /sbin/service
 
 BuildRequires: gd-devel
 BuildRequires: freetype-devel
@@ -33,13 +34,11 @@
 BuildRequires: libpng-devel
 BuildRequires: net-snmp-devel
 BuildRequires: elfutils-devel
-BuildRequires: libX11-devel
-BuildRequires: libXpm-devel
+BuildRequires: xorg-x11-devel
 BuildRequires: libjpeg-devel
 BuildRequires: fontconfig-devel
 BuildRequires: pkgconfig
-BuildRequires: hal-devel
-BuildRequires: dbus-glib-devel
+BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 
 %ifnarch s390 s390x
@@ -58,8 +57,6 @@
 %package client
 Group: Applications/System
 Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
 
 %description client
 This package includes the client utilities that are required to monitor a
@@ -78,7 +75,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
 
 %description devel
 This package contains the development header files and libraries
@@ -90,6 +87,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
 
 %build
 %configure \
@@ -101,15 +99,29 @@
     --sysconfdir=%{_sysconfdir}/ups \
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
-    --with-all \
-	--with-ipv6 \
+    --with-serial \
+    --with-usb \
+    --with-snmp \
+    --with-cgi \
+    --with-lib \
+    --with-ssl \
+    --with-ipv6 \
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
-	--with-pkgconfig-dir=%{_libdir}/pkgconfig \
-	--disable-static
+    --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+    --disable-static
 
 make %{?_smp_mflags}
 
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
+rm -f man/*.iso
+
 %install
 rm -rf %{buildroot}
 
@@ -152,6 +164,7 @@
 
 %post client
 /sbin/chkconfig --add ups
+/sbin/ldconfig
 exit 0
 
 %preun client
@@ -159,6 +172,7 @@
     /sbin/service ups stop > /dev/null 2>&1
     /sbin/chkconfig --del ups
 fi
+/sbin/ldconfig
 exit 0
 
 %postun client
@@ -178,6 +192,7 @@
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/hotplug/usb/*
 %{modeldir}/*
 %{_sbindir}/upsd
 %{_bindir}/upslog
@@ -277,6 +292,14 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
+- fix manpages encodings
+- run ldconfig after client (un)install
+- remove hal support for EL4
+
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
 * Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
 - fix #249028 - usb udev rules
 - update initscript and sysconfig file



From fedora-extras-commits at redhat.com  Wed Sep 19 07:52:28 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:52:28 -0400
Subject: rpms/opal/F-7 opal.spec, 1.20, 1.21 sources, 1.10,
	1.11 ekiga-429076-42.patch, 1.1, NONE ekiga-429076-50.patch, 1.1, NONE
Message-ID: <200709190752.l8J7qSlp021469@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/opal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21426

Modified Files:
	opal.spec sources 
Removed Files:
	ekiga-429076-42.patch ekiga-429076-50.patch 
Log Message:
- upstream release of 2.2.11
- includes the 2 cisco patches
Daniel



Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-7/opal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- opal.spec	22 Aug 2007 10:26:19 -0000	1.20
+++ opal.spec	19 Sep 2007 07:51:56 -0000	1.21
@@ -1,22 +1,18 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.8
-Release: 5%{?dist}
+Version: 2.2.11
+Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.7
-BuildRequires: pwlib-devel >= 1.10.7
+Requires: pwlib >= 1.10.10
+BuildRequires: pwlib-devel >= 1.10.10
 BuildRequires: openldap-devel
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
 
-# workaround problems with CISCO server
-Patch0: ekiga-429076-42.patch
-Patch1: ekiga-429076-50.patch
-
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
 teleconferencing protocol, and successor of the openh323 library.
@@ -25,15 +21,13 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.7
+Requires: pwlib-devel >= 1.10.10
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p0
 
 %build
 %configure --enable-localspeex
@@ -65,6 +59,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.2.11-1
+- upstream release of 2.2.11
+- includes the 2 cisco patches
+
 * Wed Aug 22 2007 Daniel Veillard <veillard at redhat.com> - 2.2.8-5.fc7
 - added 2 patches needed when using a CISCO server
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Apr 2007 20:41:57 -0000	1.10
+++ sources	19 Sep 2007 07:51:56 -0000	1.11
@@ -1 +1 @@
-700b0c3a7606afc0dc6c9d3c12fcb23b  opal-2.2.8.tar.gz
+eb4a9c0c9ea93ec95c876aaeadf83936  opal-2.2.11.tar.gz


--- ekiga-429076-42.patch DELETED ---


--- ekiga-429076-50.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 07:54:52 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:54:52 -0400
Subject: rpms/pwlib/devel c++_crack.patch, 1.2,
	NONE pwlib-1.6.5-debuginfo.patch, 1.3,
	NONE pwlib-1.8.7-gcc4.patch, 1.1, NONE pwlib-1.8.7-gcc41.patch,
	1.1, NONE pwlib-1.9.2.ldap.patch, 1.1, NONE
Message-ID: <200709190754.l8J7sq5U021589@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21582

Removed Files:
	c++_crack.patch pwlib-1.6.5-debuginfo.patch 
	pwlib-1.8.7-gcc4.patch pwlib-1.8.7-gcc41.patch 
	pwlib-1.9.2.ldap.patch 
Log Message:
remove old patches, Daniel



--- c++_crack.patch DELETED ---


--- pwlib-1.6.5-debuginfo.patch DELETED ---


--- pwlib-1.8.7-gcc4.patch DELETED ---


--- pwlib-1.8.7-gcc41.patch DELETED ---


--- pwlib-1.9.2.ldap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 07:56:27 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 03:56:27 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.49,1.50
Message-ID: <200709190756.l8J7uRAC021650@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21630

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bad source URL


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- tog-pegasus.spec	30 Aug 2007 10:33:37 -0000	1.49
+++ tog-pegasus.spec	19 Sep 2007 07:55:55 -0000	1.50
@@ -53,7 +53,7 @@
 #
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n)
 #
-Source:    		http://www.openpegasus.org/uploads/40/10123/pegasus-%{version}.tar.gz
+Source:			http://www.openpegasus.org/uploads/40/14280/pegasus-%{version}.tar.gz
 Source1:        	README.RedHat.Security
 Source2:		genOpenPegasusSSLCerts
 Source3:		pegasus_arch_alternatives



From fedora-extras-commits at redhat.com  Wed Sep 19 07:57:45 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:57:45 -0400
Subject: rpms/pwlib/F-7 pwlib.spec,1.47,1.48 sources,1.19,1.20
Message-ID: <200709190757.l8J7vjJ1021728@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21671

Modified Files:
	pwlib.spec sources 
Log Message:
- Update to 1.10.10
Daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/F-7/pwlib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pwlib.spec	15 Apr 2007 20:38:04 -0000	1.47
+++ pwlib.spec	19 Sep 2007 07:57:13 -0000	1.48
@@ -1,6 +1,6 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.7
+Version:	1.10.10
 Release:        1%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 1.10.10-1
+- Update to 1.10.10
+
 * Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 1.10.7-1
 - Update to 1.10.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Apr 2007 20:38:04 -0000	1.19
+++ sources	19 Sep 2007 07:57:13 -0000	1.20
@@ -1 +1 @@
-29c061328e93bda77423edb8bdabbddd  pwlib-1.10.7.tar.gz
+abebf45332e70772ffa876d31975d4b9  pwlib-1.10.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 07:58:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 03:58:05 -0400
Subject: rpms/talk/devel talk.spec,1.20,1.21
Message-ID: <200709190758.l8J7w5Rs021738@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/talk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21708

Modified Files:
	talk.spec 
Log Message:
fix bad source URL


Index: talk.spec
===================================================================
RCS file: /cvs/extras/rpms/talk/devel/talk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- talk.spec	23 Aug 2007 12:34:04 -0000	1.20
+++ talk.spec	19 Sep 2007 07:57:33 -0000	1.21
@@ -4,7 +4,7 @@
 Release: 29.2.3
 License: BSD
 Group: Applications/Internet
-Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ntalk-%{version}.tar.gz
+Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-%{version}.tar.gz
 Source1: talk-xinetd
 Source2: ntalk-xinetd
 Patch0: netkit-ntalk-0.17-pre20000412-time.patch



From fedora-extras-commits at redhat.com  Wed Sep 19 07:58:25 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Wed, 19 Sep 2007 03:58:25 -0400
Subject: rpms/pwlib/F-7 c++_crack.patch, 1.2,
	NONE pwlib-1.6.5-debuginfo.patch, 
	1.3, NONE pwlib-1.8.7-gcc4.patch, 1.1,
	NONE pwlib-1.8.7-gcc41.patch, 1.1, NONE pwlib-1.9.2.ldap.patch,
	1.1, NONE
Message-ID: <200709190758.l8J7wPOm021788@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/pwlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21749

Removed Files:
	c++_crack.patch pwlib-1.6.5-debuginfo.patch 
	pwlib-1.8.7-gcc4.patch pwlib-1.8.7-gcc41.patch 
	pwlib-1.9.2.ldap.patch 
Log Message:
remove old patches, Daniel



--- c++_crack.patch DELETED ---


--- pwlib-1.6.5-debuginfo.patch DELETED ---


--- pwlib-1.8.7-gcc4.patch DELETED ---


--- pwlib-1.8.7-gcc41.patch DELETED ---


--- pwlib-1.9.2.ldap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 08:08:53 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 04:08:53 -0400
Subject: rpms/gsl/devel gsl-1.10-lib64.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 gsl.spec, 1.27, 1.28 sources, 1.12,
	1.13 gsl-1.9-lib64.patch, 1.1, NONE
Message-ID: <200709190808.l8J88rlB028594@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28559

Modified Files:
	.cvsignore gsl.spec sources 
Added Files:
	gsl-1.10-lib64.patch 
Removed Files:
	gsl-1.9-lib64.patch 
Log Message:
update to 1.10


gsl-1.10-lib64.patch:

--- NEW FILE gsl-1.10-lib64.patch ---
--- gsl-1.10/configure.lib64	2007-09-13 17:41:52.000000000 +0200
+++ gsl-1.10/configure	2007-09-19 09:35:14.000000000 +0200
@@ -853,6 +853,7 @@ RANLIB
 LIBTOOL
 GSL_CFLAGS
 GSL_LIBS
+GSL_LIB
 MINGW32_HOST_TRUE
 MINGW32_HOST_FALSE
 LIBOBJS
@@ -10333,7 +10334,7 @@ fi
 
 GSL_CFLAGS="-I$includedir"
 GSL_LIBS="-L$libdir -lgsl"
-
+GSL_LIB="-L$libdir" 
 
 
 
@@ -13275,6 +13276,7 @@ RANLIB!$RANLIB$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
 GSL_CFLAGS!$GSL_CFLAGS$ac_delim
 GSL_LIBS!$GSL_LIBS$ac_delim
+GSL_LIB!$GSL_LIB$ac_delim
 MINGW32_HOST_TRUE!$MINGW32_HOST_TRUE$ac_delim
 MINGW32_HOST_FALSE!$MINGW32_HOST_FALSE$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -13283,8 +13285,7 @@ HAVE_GNUM68K_IEEE_INTERFACE!$HAVE_GNUM68
 HAVE_GNUPPC_IEEE_INTERFACE!$HAVE_GNUPPC_IEEE_INTERFACE$ac_delim
 HAVE_GNUX86_IEEE_INTERFACE!$HAVE_GNUX86_IEEE_INTERFACE$ac_delim
 _ACEOF
-
-  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
--- gsl-1.10/gsl-config.in.lib64	2007-09-19 09:21:20.000000000 +0200
+++ gsl-1.10/gsl-config.in	2007-09-19 09:21:20.000000000 +0200
@@ -63,7 +63,7 @@ while test $# -gt 0; do
 
     --libs)
         : ${GSL_CBLAS_LIB=-lgslcblas}
-       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|-L/usr/lib||g"
+       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|@GSL_LIB@||g"
        	;;
 
     --libs-without-cblas)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 May 2007 10:29:33 -0000	1.12
+++ .cvsignore	19 Sep 2007 08:08:21 -0000	1.13
@@ -1 +1 @@
-gsl-1.9.tar.gz
+gsl-1.10.tar.gz


Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gsl.spec	27 Aug 2007 10:06:22 -0000	1.27
+++ gsl.spec	19 Sep 2007 08:08:21 -0000	1.28
@@ -5,7 +5,7 @@
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
-Patch1: gsl-1.9-lib64.patch
+Patch1: gsl-1.10-lib64.patch
 # info part of this package is under GFDL license
 # eigen/nonsymmv.c and eigen/schur.c
 # contains rutiens which are part of LAPACK - under BSD style license
@@ -98,6 +98,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-1
+- update to 1.10
+- change license tag
+
 * Tue May 22 2007 Ivana Varekova <varekova at redhat.com> - 1.9-1
 - update  to 1.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 May 2007 10:29:33 -0000	1.12
+++ sources	19 Sep 2007 08:08:21 -0000	1.13
@@ -1 +1 @@
-81dca4362ae8d2aa1547b7d010881e43  gsl-1.9.tar.gz
+faf5e178855ec952fe745a03d815da1d  gsl-1.10.tar.gz


--- gsl-1.9-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 08:10:40 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 04:10:40 -0400
Subject: rpms/gsl/devel gsl.spec,1.28,1.29
Message-ID: <200709190810.l8J8AeMm028690@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28647

Modified Files:
	gsl.spec 
Log Message:
update version tag



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gsl.spec	19 Sep 2007 08:08:21 -0000	1.28
+++ gsl.spec	19 Sep 2007 08:10:08 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
-Version: 1.9
+Version: 1.10
 Release: 1%{?dist}
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 08:42:45 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:42:45 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.29,1.30
Message-ID: <200709190842.l8J8gjYf029526@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29499

Modified Files:
	xmlto.spec 
Log Message:
fixed wrong source URL


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xmlto.spec	23 Aug 2007 08:02:06 -0000	1.29
+++ xmlto.spec	19 Sep 2007 08:42:12 -0000	1.30
@@ -3,11 +3,11 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 14
+Release: 15
 License: GPLv2
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
-Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 Patch0: xmlto-basename.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Wed Sep 19 2007 Ondrej Vasik <ovasik at redhat.com> - 0.0.18-15
+- fixed wrong source URL
+
 * Thu Aug 23 2007 Ondrej Vasik <ovasik at redhat.com> - 0.0.18-14
 - rebuilt for F8
 - changed License tag to GPLv2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:00:00 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:00:00 -0400
Subject: rpms/fslint/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200709190900.l8J900Zr030106@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30034

Modified Files:
	.cvsignore sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:01:26 -0000	1.7
+++ .cvsignore	19 Sep 2007 08:59:28 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:01:27 -0000	1.7
+++ sources	19 Sep 2007 08:59:28 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:02:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:02:52 -0400
Subject: rpms/fslint/devel fslint.spec,1.13,1.14
Message-ID: <200709190902.l8J92qRF003787@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	fslint.spec 
Log Message:
Update to 2.24


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/devel/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:39 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:02:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:10:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:10:59 -0400
Subject: rpms/fslint/FC-5 .cvsignore, 1.7, 1.8 fslint.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200709190910.l8J9AxNH004166@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4100

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:28:42 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:10:26 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/fslint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fslint.spec	3 Aug 2007 09:37:33 -0000	1.12
+++ fslint.spec	19 Sep 2007 09:10:26 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:28:42 -0000	1.7
+++ sources	19 Sep 2007 09:10:26 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:11:52 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:11:52 -0400
Subject: rpms/fslint/FC-6 .cvsignore, 1.7, 1.8 fslint.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200709190911.l8J9Bqru004247@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4225

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:35:02 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:11:19 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:36 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:11:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:35:02 -0000	1.7
+++ sources	19 Sep 2007 09:11:19 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:12:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?P=C3=A1draig_Brady?= (pbrady))
Date: Wed, 19 Sep 2007 05:12:47 -0400
Subject: rpms/fslint/F-7 .cvsignore, 1.7, 1.8 fslint.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200709190912.l8J9Cl1d004358@cvs-int.fedora.redhat.com>

Author: pbrady

Update of /cvs/extras/rpms/fslint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309

Modified Files:
	.cvsignore fslint.spec sources 
Log Message:
Update to 2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2007 13:45:22 -0000	1.7
+++ .cvsignore	19 Sep 2007 09:12:14 -0000	1.8
@@ -1 +1 @@
-fslint-2.22.tar.gz
+fslint-2.24.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/fslint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fslint.spec	3 Aug 2007 09:37:30 -0000	1.13
+++ fslint.spec	19 Sep 2007 09:12:14 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fslint
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.24
+Release:        1%{?dist}
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 P??draig Brady <P at draigBrady.com> - 2.24-1
+- Update to 2.24
+
 * Fri Aug 03 2007 P??draig Brady <P at draigBrady.com> - 2.22-2
 - clarify license
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2007 13:45:22 -0000	1.7
+++ sources	19 Sep 2007 09:12:14 -0000	1.8
@@ -1 +1 @@
-8a111eadb91711d8899026d4b3701b8d  fslint-2.22.tar.gz
+30e0c8f962ac012921ce46f981c07208  fslint-2.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 09:18:42 2007
From: fedora-extras-commits at redhat.com (Radek Brich (rbrich))
Date: Wed, 19 Sep 2007 05:18:42 -0400
Subject: rpms/uucp/devel uucp.spec,1.34,1.35
Message-ID: <200709190918.l8J9IgCJ004732@cvs-int.fedora.redhat.com>

Author: rbrich

Update of /cvs/extras/rpms/uucp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4714

Modified Files:
	uucp.spec 
Log Message:
license tag


Index: uucp.spec
===================================================================
RCS file: /cvs/extras/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- uucp.spec	4 Apr 2007 10:24:28 -0000	1.34
+++ uucp.spec	19 Sep 2007 09:18:10 -0000	1.35
@@ -7,8 +7,8 @@
 Summary: The uucp utility for copying files between systems
 Name: uucp
 Version: 1.07
-Release: 15%{?dist}
-License: GPL
+Release: 16%{?dist}
+License: GPLv2+
 Group: Applications/Communications
 Url: http://www.airs.com/ian/uucp.html
 Source0: ftp://ftp.gnu.org/pub/gnu/uucp/uucp-%{version}.tar.gz
@@ -157,6 +157,9 @@
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Wed Sep 19 2007 Radek Brich <rbrich at redhat.com> 1.07-16
+- updated license tag
+
 * Wed Apr 04 2007 Lukas Vrabel <lvrabel at redhat.com> 1.07-15
 - fix crashes with SIGFPE (#150978) (from Wolfgang Ocker)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:36:14 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 05:36:14 -0400
Subject: rpms/alsa-lib/F-7 alsa-lib-1.0.14-lfloat.patch, NONE,
	1.1 alsa-lib.spec, 1.56, 1.57
Message-ID: <200709190936.l8J9aEUV005235@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5213

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.14-lfloat.patch 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-4
- added fix for #294841 - alsa-lib has a configure bug which 
  causes it not to build the lfloat plugin



alsa-lib-1.0.14-lfloat.patch:

--- NEW FILE alsa-lib-1.0.14-lfloat.patch ---

--- a/configure.in	Mon Jun 11 10:52:17 2007 +0200
+++ b/configure.in	Thu Jun 28 13:26:25 2007 +0200
@@ -414,7 +414,7 @@ if test "$HAVE_LIBPTHREAD" != "yes"; the
   build_pcm_share="no"
 fi
 
-if test "$softfloat" != "yes"; then
+if test "$softfloat" = "yes"; then
   build_pcm_lfloat="no"
 fi
 






Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-7/alsa-lib.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- alsa-lib.spec	16 Aug 2007 14:36:23 -0000	1.56
+++ alsa-lib.spec	19 Sep 2007 09:35:41 -0000	1.57
@@ -4,12 +4,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
 Patch0:   alsa-lib-1.0.14rc1-config.patch
 Patch2:   alsa-lib-1.0.14-glibc-open.patch
+Patch3:   alsa-lib-1.0.14-lfloat.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -39,6 +40,7 @@
 %setup -q -n %{name}-%{version_main}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
+%patch3 -p1 -b .lfloat
 
 %build
 %configure \
@@ -93,6 +95,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-4
+- added fix for #294841 - alsa-lib has a configure bug which 
+  causes it not to build the lfloat plugin
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-3
 - updated to 1.0.14a
 



From fedora-extras-commits at redhat.com  Wed Sep 19 09:37:41 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 05:37:41 -0400
Subject: rpms/gmp/devel .cvsignore, 1.13, 1.14 gmp.spec, 1.43, 1.44 sources, 
	1.13, 1.14
Message-ID: <200709190937.l8J9bfma005342@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305

Modified Files:
	.cvsignore gmp.spec sources 
Log Message:
update to 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Aug 2007 13:56:38 -0000	1.13
+++ .cvsignore	19 Sep 2007 09:37:09 -0000	1.14
@@ -1,2 +1 @@
-mpfr-2.2.1.tar.bz2
-gmp-4.2.1.tar.bz2
+gmp-4.2.2.tar.bz2


Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gmp.spec	20 Aug 2007 07:55:22 -0000	1.43
+++ gmp.spec	19 Sep 2007 09:37:09 -0000	1.44
@@ -7,8 +7,8 @@
 
 Summary: A GNU arbitrary precision library
 Name: gmp
-Version: 4.2.1
-Release: 3%{dist}
+Version: 4.2.2
+Release: 1%{dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -100,9 +100,9 @@
 install -m 755 .libs/libgmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libgmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmp.so.3
-install -m 755 .libs/libgmpxx.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
-cp -a .libs/libgmpxx.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.3
+install -m 755 .libs/libgmpxx.so.4.* $RPM_BUILD_ROOT%{_libdir}/sse2
+cp -a .libs/libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/sse2
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.4
 install -m 755 .libs/libmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libmp.so.3
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-1
+- update to 4.2.2
+
 * Mon Aug 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.1-3
 - spec file cleanup (#253439)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Aug 2007 13:56:38 -0000	1.13
+++ sources	19 Sep 2007 09:37:09 -0000	1.14
@@ -1,2 +1 @@
-40bf06f8081461d8db7d6f4ad5b9f6bd  mpfr-2.2.1.tar.bz2
-091c56e0e1cca6b09b17b69d47ef18e3  gmp-4.2.1.tar.bz2
+7ce52531644e6d12f16911b7e3151f3f  gmp-4.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:41:12 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 19 Sep 2007 05:41:12 -0400
Subject: rpms/rt61pci-firmware/F-7 rt61pci-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709190941.l8J9fC0M005525@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/rt61pci-firmware/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5485/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	rt61pci-firmware.spec 
Log Message:
Initial import



--- NEW FILE rt61pci-firmware.spec ---
Name:		rt61pci-firmware
Version:	1.2
Release:	4
Summary:	Firmware for Ralink?? RT2561/RT2661 A/B/G network adaptors
Group:		System Environment/Kernel
License:	Redistributable, no modification permitted
URL:		http://www.ralinktech.com
Source0:	http://www.ralinktech.com.tw/data/RT61_Firmware_V%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Obsoletes: rt61-firmware < %{version}-%{release}
Provides: rt61-firmware = %{version}-%{release}


%description
This package contains the firmware required by the rt61pci driver for Linux.
Usage of the firmware is subject to the terms and conditions contained
inside the provided LICENSE.ralink-firmware.txt file.
Please read it carefully.


%prep
%setup -q -n RT61_Firmware_V%{version}
sed -i 's/\r//' LICENSE.ralink-firmware.txt

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
install -pm 0644 *.bin $RPM_BUILD_ROOT/lib/firmware

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.ralink-firmware.txt
/lib/firmware/*


%changelog
* Mon Sep 17 2007 kwizart < kwizart at gmail.com > - 1.2-4
- Disable dist tag
- Preserve timestamp
- Add license from Ralink
- Improved summary and description

* Mon Mar 19 2007 kwizart < kwizart at gmail.com > - 1.2-3
- Update Source url (uses .com.tw instead of .com)
- Fix License field

* Mon Feb 26 2007 kwizart < kwizat at gmail.com > - 1.2-2
- Update the download link

* Tue Sep 13 2006 kwizart < kwizart at gmail.com > - 1.2-1_FC5
- inital release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt61pci-firmware/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 04:01:10 -0000	1.1
+++ .cvsignore	19 Sep 2007 09:40:40 -0000	1.2
@@ -0,0 +1 @@
+RT61_Firmware_V1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt61pci-firmware/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 04:01:10 -0000	1.1
+++ sources	19 Sep 2007 09:40:40 -0000	1.2
@@ -0,0 +1 @@
+d4c690c93b470bc9a681297c2adc6281  RT61_Firmware_V1.2.zip



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:20 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:20 -0700
Subject: [pkgdb] libwvstreams Orphaned
Message-ID: <200709190946.l8J9kKYb012962@app4.fedora.phx.redhat.com>

Package libwvstreams in Fedora devel was orphaned by Harald Hoyer (harald)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwvstreams



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:22 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:22 -0700
Subject: [pkgdb] libwvstreams Orphaned
Message-ID: <200709190946.l8J9kM6k019664@app3.fedora.phx.redhat.com>

Package libwvstreams in Fedora 7 was orphaned by Harald Hoyer (harald)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwvstreams



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:31 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:31 -0700
Subject: [pkgdb] wvdial Orphaned
Message-ID: <200709190946.l8J9kVJb013020@app4.fedora.phx.redhat.com>

Package wvdial in Fedora devel was orphaned by Harald Hoyer (harald)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wvdial



From fedora-extras-commits at redhat.com  Wed Sep 19 09:46:32 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Wed, 19 Sep 2007 02:46:32 -0700
Subject: [pkgdb] wvdial Orphaned
Message-ID: <200709190946.l8J9kW1w019712@app3.fedora.phx.redhat.com>

Package wvdial in Fedora 7 was orphaned by Harald Hoyer (harald)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wvdial



From fedora-extras-commits at redhat.com  Wed Sep 19 09:54:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 05:54:56 -0400
Subject: rpms/alsa-lib/devel .cvsignore, 1.28, 1.29 alsa-lib.spec, 1.57,
	1.58 sources, 1.31, 1.32
Message-ID: <200709190954.l8J9suBr005944@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5922

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
- updated to 1.0.15rc2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Aug 2007 14:31:06 -0000	1.28
+++ .cvsignore	19 Sep 2007 09:54:21 -0000	1.29
@@ -15,3 +15,4 @@
 alsa-lib-1.0.14rc3.tar.bz2
 alsa-lib-1.0.14.tar.bz2
 alsa-lib-1.0.14a.tar.bz2
+alsa-lib-1.0.15rc2.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- alsa-lib.spec	16 Aug 2007 14:31:06 -0000	1.57
+++ alsa-lib.spec	19 Sep 2007 09:54:21 -0000	1.58
@@ -1,10 +1,11 @@
-%define  version_main   1.0.14
-%define  postver        a
+%define  version_main   1.0.15
+%define  prever         rc2
+%define  prever_dot     .rc2
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3%{?dist}
+Release: 0.1%{?prever_dot}%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
@@ -93,6 +94,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
+- updated to 1.0.15rc2
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-3
 - updated to 1.0.14a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	16 Aug 2007 14:31:06 -0000	1.31
+++ sources	19 Sep 2007 09:54:21 -0000	1.32
@@ -1 +1 @@
-72dc63821ce33f2b97a151a909b06ff8  alsa-lib-1.0.14a.tar.bz2
+102c8aebe1d6245683ab2233c1124a06  alsa-lib-1.0.15rc2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 09:59:38 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 19 Sep 2007 05:59:38 -0400
Subject: rpms/sylpheed/devel .cvsignore, 1.29, 1.30 sources, 1.29,
	1.30 sylpheed.spec, 1.56, 1.57
Message-ID: <200709190959.l8J9xctO006055@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6033

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
* Wed Sep 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-1
- Update to 2.4.6 (bug-fixes, but also minor feature additions
  and rewrites).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	31 Aug 2007 10:32:56 -0000	1.29
+++ .cvsignore	19 Sep 2007 09:59:04 -0000	1.30
@@ -1,2 +1,2 @@
-sylpheed-2.4.5.tar.bz2.asc
-sylpheed-2.4.5.tar.bz2
+sylpheed-2.4.6.tar.bz2.asc
+sylpheed-2.4.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	31 Aug 2007 10:32:57 -0000	1.29
+++ sources	19 Sep 2007 09:59:04 -0000	1.30
@@ -1,2 +1,2 @@
-6481115afea2d47d521dfed7d71b9043  sylpheed-2.4.5.tar.bz2.asc
-27e7c802f9af3e3c58e4457aadd36a91  sylpheed-2.4.5.tar.bz2
+0101ab7fcfb945722952ce77b07036f9  sylpheed-2.4.6.tar.bz2.asc
+361908337111957c911026a07d1e0e44  sylpheed-2.4.6.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sylpheed.spec	31 Aug 2007 10:32:57 -0000	1.56
+++ sylpheed.spec	19 Sep 2007 09:59:04 -0000	1.57
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.4.5
+Version: 2.4.6
 Release: 1
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
@@ -84,6 +84,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.6-1
+- Update to 2.4.6 (bug-fixes, but also minor feature additions
+  and rewrites).
+
 * Fri Aug 31 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.5-1
 - Update to 2.4.5 (accumulated bug-fixes).
 



From fedora-extras-commits at redhat.com  Wed Sep 19 10:10:41 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 06:10:41 -0400
Subject: rpms/gnome-media/devel .cvsignore, 1.39, 1.40 gnome-media.spec,
	1.109, 1.110 sources, 1.38, 1.39 icons.patch, 1.1, NONE
Message-ID: <200709191010.l8JAAfg0012377@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12327

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	icons.patch 
Log Message:
* Wed Sep 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-1
- Update to 2.20.1
- Remove obsolete icons patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	17 Sep 2007 16:43:17 -0000	1.39
+++ .cvsignore	19 Sep 2007 10:10:05 -0000	1.40
@@ -1 +1 @@
-gnome-media-2.20.0.tar.gz
+gnome-media-2.20.1.tar.gz


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-media.spec	19 Sep 2007 05:39:32 -0000	1.109
+++ gnome-media.spec	19 Sep 2007 10:10:05 -0000	1.110
@@ -17,7 +17,6 @@
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
 Patch0:         gnome-media-2.13.5-hide-help-button.patch
-Patch1:		icons.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -76,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .hide-help-button
-%patch1 -p1 -b .icons
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -187,6 +185,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-1
+- Update to 2.20.1
+- Remove obsolete icons patch
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Don't add extra categories to volume control, since
   upstream has moved it to Hardware  (#295251)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Sep 2007 16:43:17 -0000	1.38
+++ sources	19 Sep 2007 10:10:05 -0000	1.39
@@ -1 +1 @@
-4c98d9e745d98cb1ff314027b198a511  gnome-media-2.20.0.tar.gz
+e123bc1d79f0e2f926677663ab5745c7  gnome-media-2.20.1.tar.gz


--- icons.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:19:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:19:28 -0400
Subject: rpms/micq/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191019.l8JAJS6x012555@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12546

Added Files:
	dead.package 
Removed Files:
	Makefile micq-glibc-open.patch micq.spec sources 
Log Message:
Packge dropped - renamed to climm.



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:21:54 2007
From: fedora-extras-commits at redhat.com (Ondrej Dvoracek (odvorace))
Date: Wed, 19 Sep 2007 06:21:54 -0400
Subject: rpms/authd/devel authd-1.4.3-longopt-identifier.patch, NONE,
	1.1 authd.spec, 1.39, 1.40
Message-ID: <200709191021.l8JALsZc012679@cvs-int.fedora.redhat.com>

Author: odvorace

Update of /cvs/extras/rpms/authd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12650

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-longopt-identifier.patch 
Log Message:
fixed bug #245436

authd-1.4.3-longopt-identifier.patch:

--- NEW FILE authd-1.4.3-longopt-identifier.patch ---
--- authd-1.4.3/authd.c.old	2007-09-19 11:39:25.000000000 +0200
+++ authd-1.4.3/authd.c	2007-09-19 11:40:02.000000000 +0200
@@ -203,7 +203,7 @@ static char *created_pton_hex(const char
 }
 
 static void create_opt(int argc, char *argv[]) {
-    enum { $_LONGOPT = UCHAR_MAX,       // no short opt value overlap
+    enum { PRE_FIRST_LONGOPT = UCHAR_MAX,       // no short opt value overlap
         CODESET_LONGOPT, IDENT_LONGOPT, FN_LONGOPT, LANG_LONGOPT,
         MAPPED_LONGOPT, OS_LONGOPT, PASSWD_LONGOPT, USERNAME_LONGOPT
     };


Index: authd.spec
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- authd.spec	24 Jul 2006 12:51:59 -0000	1.39
+++ authd.spec	19 Sep 2007 10:21:21 -0000	1.40
@@ -1,8 +1,8 @@
-Summary: a RFC 1413 ident protocol daemon
+Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 9
-License: GPL
+Release: 10
+License: GPLv2
 Group: System Environment/Daemons
 Obsoletes: pidentd
 Provides: pidentd = 3.2
@@ -12,6 +12,7 @@
 Patch1: authd-1.4.3-disable.patch
 Patch2: authd-1.4.3-ipv6-mapping.patch
 Patch3: authd-1.4.3-locale.patch
+Patch4: authd-1.4.3-longopt-identifier.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel gettext
 Prereq: xinetd
@@ -28,6 +29,7 @@
 %patch1 -p1
 %patch2 -p1 -b .ipv6map
 %patch3 -p1 -b .locale
+%patch4 -p1
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -68,6 +70,10 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Wed Sep 19 2007 Ondrej Dvoracek <odvorace at redhat.com> - 1.4.3-10
+- corrected illegal identifier in longopt enumeration (#245436)
+- corrected summary and license
+
 * Mon Jul 24 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-9
 - added locale patch (#199721)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 10:23:14 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 06:23:14 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.110,1.111
Message-ID: <200709191023.l8JANEHa012782@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12709

Modified Files:
	gnome-media.spec 
Log Message:
Fix version/release



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-media.spec	19 Sep 2007 10:10:05 -0000	1.110
+++ gnome-media.spec	19 Sep 2007 10:22:40 -0000	1.111
@@ -11,8 +11,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.20.0
-Release:        2%{?dist}
+Version:        2.20.1
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL+
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 10:33:24 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Wed, 19 Sep 2007 06:33:24 -0400
Subject: rpms/gsl/devel gsl.spec,1.29,1.30
Message-ID: <200709191033.l8JAXOWY013121@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13073

Modified Files:
	gsl.spec 
Log Message:
update license tag



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gsl.spec	19 Sep 2007 08:10:08 -0000	1.29
+++ gsl.spec	19 Sep 2007 10:32:50 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
@@ -9,7 +9,7 @@
 # info part of this package is under GFDL license
 # eigen/nonsymmv.c and eigen/schur.c
 # contains rutiens which are part of LAPACK - under BSD style license
-License: GPLv2 and GFDL and BSD license 
+License: GPLv3 and GFDL and BSD license 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-2
+- update license tag
+
 * Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> - 1.10-1
 - update to 1.10
 - change license tag



From fedora-extras-commits at redhat.com  Wed Sep 19 10:39:00 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 19 Sep 2007 06:39:00 -0400
Subject: rpms/iptables/F-7 iptables.init,1.13,1.14 iptables.spec,1.48,1.49
Message-ID: <200709191039.l8JAd0uv013342@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13275

Modified Files:
	iptables.init iptables.spec 
Log Message:
- dropped lsb header from init script, delayes start after network
- fixed return values in init script




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iptables.init	28 Aug 2007 15:15:49 -0000	1.13
+++ iptables.init	19 Sep 2007 10:38:26 -0000	1.14
@@ -8,15 +8,6 @@
 # config: /etc/sysconfig/iptables
 # config: /etc/sysconfig/iptables-config
 #
-### BEGIN INIT INFO
-# Provides: iptables
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop iptables firewall
-# Description: Start, stop and save iptables firewall
-### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
@@ -316,7 +307,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	restart
 	RETVAL=$?
 	;;
@@ -335,7 +326,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status|panic|save}"
-	RETVAL=3
+	RETVAL=2
 	;;
 esac
 


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- iptables.spec	28 Aug 2007 15:15:49 -0000	1.48
+++ iptables.spec	19 Sep 2007 10:38:26 -0000	1.49
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
+- dropped lsb header from init script, delayes start after network
+- fixed return values in init script
+
 * Thu Aug 23 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2
 - fixed initscript for LSB conformance (rhbz#246953, rhbz#242459)
 - provide iptc interface again, but unsupported (rhbz#216733)



From fedora-extras-commits at redhat.com  Wed Sep 19 10:45:49 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:45:49 -0400
Subject: rpms/micq/F-7 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191045.l8JAjnpb013524@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13516

Added Files:
	dead.package 
Removed Files:
	Makefile branch micq-glibc-open.patch micq.spec sources 
Log Message:
Package dropped - renamed to climm



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- branch DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 10:47:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Wed, 19 Sep 2007 06:47:59 -0400
Subject: rpms/micq/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE micq-glibc-open.patch, 1.1, NONE micq.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200709191047.l8JAlxq0013633@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/micq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13626

Added Files:
	dead.package 
Removed Files:
	Makefile branch micq-glibc-open.patch micq.spec sources 
Log Message:
ckage dropped - renamed to climm



--- NEW FILE dead.package ---
Renamed to climm


--- Makefile DELETED ---


--- branch DELETED ---


--- micq-glibc-open.patch DELETED ---


--- micq.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 11:02:51 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 07:02:51 -0400
Subject: rpms/cups/devel .cvsignore, 1.34, 1.35 cups-lspp.patch, 1.26,
	1.27 cups.spec, 1.359, 1.360 sources, 1.37,
	1.38 cups-str2512-printcap.patch, 1.1, NONE cups-str2512.patch,
	1.1, NONE
Message-ID: <200709191102.l8JB2pLJ020035@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989

Modified Files:
	.cvsignore cups-lspp.patch cups.spec sources 
Removed Files:
	cups-str2512-printcap.patch cups-str2512.patch 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
- 1.3.2.
- No longer need str2512 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Aug 2007 22:31:26 -0000	1.34
+++ .cvsignore	19 Sep 2007 11:02:14 -0000	1.35
@@ -26,3 +26,4 @@
 cups-1.3rc1-source.tar.bz2
 cups-1.3rc2-source.tar.bz2
 cups-1.3.0-source.tar.bz2
+cups-1.3.2-source.tar.bz2

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cups-lspp.patch	17 Sep 2007 16:10:57 -0000	1.26
+++ cups-lspp.patch	19 Sep 2007 11:02:14 -0000	1.27
@@ -1,177 +1,5 @@
-diff -up cups-1.3.1/filter/common.c.lspp cups-1.3.1/filter/common.c
---- cups-1.3.1/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.1/filter/common.c	2007-09-17 16:48:23.000000000 +0100
-@@ -30,6 +30,12 @@
-  * Include necessary headers...
-  */
- 
-+#include "config.h"
-+#ifdef WITH_LSPP
-+#define _GNU_SOURCE
-+#include <string.h>
-+#endif /* WITH_LSPP */
-+
- #include "common.h"
- #include <locale.h>
- 
-@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label,	/* I
- {
-   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 */
- 
- 
-  /*
-@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label,	/* I
-     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...
-   */
-@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label,	/* I
-   printf("  %.0f moveto ESPpl show\n", top - 14.0);
-   puts("pop");
-   puts("}bind put");
-+  }
-+#ifdef WITH_LSPP
- }
-+#endif /* WITH_LSPP */
- 
- 
- /*
-diff -up /dev/null cups-1.3.1/config-scripts/cups-lspp.m4
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/config-scripts/cups-lspp.m4	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/config-scripts/cups-lspp.m4	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -209,9 +37,33 @@
 +            ;;
 +    esac
 +fi
-diff -up /dev/null cups-1.3.1/data/mls
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/mls	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/cups/cups.h.lspp	2007-07-13 02:13:26.000000000 +0100
++++ cups-1.3rc2/cups/cups.h	2007-07-31 12:28:32.000000000 +0100
+@@ -15,6 +15,9 @@
+  *   This file is subject to the Apple OS-Developed Software exception.
+  */
+ 
++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
++
+ #ifndef _CUPS_CUPS_H_
+ #  define _CUPS_CUPS_H_
+ 
+@@ -66,6 +69,12 @@
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
++# ifdef WITH_LSPP
++# define MLS_CONFIG "mls"
++# define TE_CONFIG "te"
++# define SELINUX_CONFIG "SELinux"
++# define UNKNOWN_SL "UNKNOWN SL"
++# endif /* WITH_LSPP */
+ /*
+  * Types and structures...
+  */
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/mls	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -474,9 +326,8 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.1/data/selinux
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/selinux	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/selinux	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -739,10 +590,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.1/data/Makefile.lspp cups-1.3.1/data/Makefile
---- cups-1.3.1/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.1/data/Makefile	2007-09-17 16:48:23.000000000 +0100
-@@ -25,7 +25,10 @@ BANNERS	=	\
+--- cups-1.3rc2/data/Makefile.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/data/Makefile	2007-07-31 12:28:32.000000000 +0100
+@@ -25,7 +25,10 @@
  		secret \
  		standard \
  		topsecret \
@@ -754,9 +604,8 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.1/data/te
---- /dev/null	2007-09-17 08:47:57.586358512 +0100
-+++ cups-1.3.1/data/te	2007-09-17 16:48:23.000000000 +0100
+--- /dev/null	2007-07-31 09:03:12.827706703 +0100
++++ cups-1.3rc2/data/te	2007-07-31 12:28:32.000000000 +0100
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1019,9 +868,178 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up cups-1.3.1/scheduler/client.h.lspp cups-1.3.1/scheduler/client.h
---- cups-1.3.1/scheduler/client.h.lspp	2007-09-12 22:09:49.000000000 +0100
-+++ cups-1.3.1/scheduler/client.h	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/filter/common.c	2007-07-31 12:28:32.000000000 +0100
+@@ -30,6 +30,12 @@
+  * Include necessary headers...
+  */
+ 
++#include "config.h"
++#ifdef WITH_LSPP
++#define _GNU_SOURCE
++#include <string.h>
++#endif /* WITH_LSPP */
++
+ #include "common.h"
+ #include <locale.h>
+ 
+@@ -312,6 +318,18 @@
+ {
+   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 */
+ 
+ 
+  /*
+@@ -334,6 +352,124 @@
+     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...
+   */
+@@ -414,7 +550,10 @@
+   printf("  %.0f moveto ESPpl show\n", top - 14.0);
+   puts("pop");
+   puts("}bind put");
++  }
++#ifdef WITH_LSPP
+ }
++#endif /* WITH_LSPP */
+ 
+ 
+ /*
+--- cups-1.3rc2/scheduler/client.h.lspp	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3rc2/scheduler/client.h	2007-07-31 12:28:32.000000000 +0100
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1036,7 +1054,7 @@
  /*
   * HTTP client structure...
   */
-@@ -61,6 +68,10 @@ struct cupsd_client_s
+@@ -62,6 +69,10 @@
  #ifdef HAVE_AUTHORIZATION_H
    AuthorizationRef	authref;	/* Authorization ref */
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1047,7 +1065,7 @@
  };
  
  #define HTTP(con) &((con)->http)
-@@ -128,6 +139,9 @@ extern void	cupsdStartListening(void);
+@@ -127,6 +138,9 @@
  extern void	cupsdStopListening(void);
  extern void	cupsdUpdateCGI(void);
  extern void	cupsdWriteClient(cupsd_client_t *con);
@@ -1057,9 +1075,8 @@
  
  
  /*
-diff -up cups-1.3.1/scheduler/conf.c.lspp cups-1.3.1/scheduler/conf.c
---- cups-1.3.1/scheduler/conf.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/conf.c	2007-09-17 16:50:08.000000000 +0100
+--- cups-1.3rc2/scheduler/conf.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/conf.c	2007-07-31 12:28:32.000000000 +0100
 @@ -26,6 +26,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1078,9 +1095,9 @@
  
  /*
   * Configuration variable structure...
-@@ -160,6 +164,10 @@ static cupsd_var_t	variables[] =
+@@ -158,6 +162,10 @@
  #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
-   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
+   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 +#ifdef WITH_LSPP
 +  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
@@ -1088,18 +1105,18 @@
 +#endif /* WITH_LSPP */
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
-   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
+   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_STRING },
+@@ -348,6 +356,9 @@
+ 		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
-   cupsd_policy_t *p;			/* Policy */
 +#ifdef WITH_LSPP
 +  char		*audit_message;		/* Audit message string */
 +#endif /* WITH_LSPP */
  
  
   /*
-@@ -616,6 +627,25 @@ cupsdReadConfiguration(void)
+@@ -609,6 +620,25 @@
  
    RunUser = getuid();
  
@@ -1125,7 +1142,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -890,11 +920,23 @@ cupsdReadConfiguration(void)
+@@ -883,11 +913,23 @@
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1150,7 +1167,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3393,6 +3435,18 @@ read_policy(cups_file_t *fp,		/* I - Con
+@@ -3343,6 +3385,18 @@
    return (0);
  }
  
@@ -1169,9 +1186,8 @@
  
  /*
   * End of "$Id$".
-diff -up cups-1.3.1/scheduler/client.c.lspp cups-1.3.1/scheduler/client.c
---- cups-1.3.1/scheduler/client.c.lspp	2007-08-15 19:36:14.000000000 +0100
-+++ cups-1.3.1/scheduler/client.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/client.c.lspp	2007-07-26 20:08:40.000000000 +0100
++++ cups-1.3rc2/scheduler/client.c	2007-07-31 12:28:32.000000000 +0100
 @@ -39,12 +39,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1187,7 +1203,7 @@
  #include <cups/http-private.h>
  #include "cupsd.h"
  
-@@ -76,6 +78,12 @@ extern const char *cssmErrorString(int e
+@@ -76,6 +78,12 @@
  #  include <gnutls/x509.h>
  #endif /* HAVE_GNUTLS */
  
@@ -1200,7 +1216,7 @@
  
  /*
   * Local functions...
-@@ -339,6 +347,57 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -335,6 +343,57 @@
      }
    }
  
@@ -1258,7 +1274,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -721,6 +780,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -717,6 +776,13 @@
    mime_type_t		*type;		/* MIME type of file */
    cupsd_printer_t	*p;		/* Printer */
    static unsigned	request_id = 0;	/* Request ID for temp files */
@@ -1272,7 +1288,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -1993,6 +2059,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -1989,6 +2055,67 @@
  	    fchmod(con->file, 0640);
  	    fchown(con->file, RunUser, Group);
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1340,7 +1356,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4197,6 +4324,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4157,6 +4284,50 @@
  #endif /* HAVE_SSL */
  
  
@@ -1391,9 +1407,8 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-diff -up cups-1.3.1/scheduler/main.c.lspp cups-1.3.1/scheduler/main.c
---- cups-1.3.1/scheduler/main.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/main.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/main.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/main.c	2007-07-31 12:28:32.000000000 +0100
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -1413,7 +1428,7 @@
  
  /*
   * Local functions...
-@@ -150,6 +155,9 @@ main(int  argc,				/* I - Number of comm
+@@ -150,6 +155,9 @@
    int			launchd_idle_exit;
  					/* Idle exit on select timeout? */
  #endif	/* HAVE_LAUNCHD */
@@ -1422,8 +1437,8 @@
 +#endif /* WITH_LSPP */
  
  
- #ifdef HAVE_GETEUID
-@@ -385,6 +393,25 @@ main(int  argc,				/* I - Number of comm
+  /*
+@@ -368,6 +376,25 @@
  #endif /* DEBUG */
    }
  
@@ -1449,7 +1464,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1094,6 +1121,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1019,6 +1046,11 @@
  
    cupsdStopSelect();
  
@@ -1461,10 +1476,9 @@
    return (!stop_scheduler);
  }
  
-diff -up cups-1.3.1/scheduler/conf.h.lspp cups-1.3.1/scheduler/conf.h
---- cups-1.3.1/scheduler/conf.h.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/conf.h	2007-09-17 16:48:23.000000000 +0100
-@@ -190,6 +190,12 @@ VAR char		*ServerKey		VALUE(NULL);
+--- cups-1.3rc2/scheduler/conf.h.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/conf.h	2007-07-31 12:28:32.000000000 +0100
+@@ -190,6 +190,12 @@
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -1477,7 +1491,7 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-@@ -208,6 +214,9 @@ VAR char		*SystemGroupAuthKey	VALUE(NULL
+@@ -208,6 +214,9 @@
  					/* System group auth key */
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -1487,9 +1501,8 @@
  
  /*
   * Prototypes...
-diff -up cups-1.3.1/scheduler/ipp.c.lspp cups-1.3.1/scheduler/ipp.c
---- cups-1.3.1/scheduler/ipp.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/ipp.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/ipp.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/ipp.c	2007-07-31 12:29:34.000000000 +0100
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -1498,7 +1511,7 @@
   *   check_quotas()              - Check quotas for a printer and user.
   *   copy_attribute()            - Copy a single attribute.
   *   copy_attrs()                - Copy attributes from one request to another.
-@@ -94,6 +95,9 @@
+@@ -93,6 +94,9 @@
   *   validate_user()             - Validate the user for the request.
   */
  
@@ -1508,7 +1521,7 @@
  /*
   * Include necessary headers...
   */
-@@ -117,6 +121,14 @@ extern int mbr_check_membership_by_id(uu
+@@ -120,6 +124,14 @@
  #  endif /* HAVE_MEMBERSHIPPRIV_H */
  #endif /* __APPLE__ */
  
@@ -1523,7 +1536,7 @@
  
  /*
   * Local functions...
-@@ -141,6 +153,9 @@ static void	authenticate_job(cupsd_clien
+@@ -144,6 +156,9 @@
  static void	cancel_all_jobs(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
  static void	cancel_subscription(cupsd_client_t *con, int id);
@@ -1533,7 +1546,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);
-@@ -1237,6 +1252,21 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1235,6 +1250,21 @@
    int		kbytes;			/* Size of print file */
    int		i;			/* Looping var */
    int		lowerpagerange;		/* Page range bound */
@@ -1555,7 +1568,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1423,6 +1453,104 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1421,6 +1451,104 @@
      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                   title = "Untitled");
  
@@ -1660,7 +1673,7 @@
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1431,6 +1559,32 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1429,6 +1557,32 @@
      return (NULL);
    }
  
@@ -1693,7 +1706,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -1647,6 +1801,29 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1645,6 +1799,29 @@
        attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
        attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
      }
@@ -1723,7 +1736,7 @@
  
      job->job_sheets = attr;
  
-@@ -1677,6 +1854,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1675,6 +1852,9 @@
  	                		    "job-sheets=\"%s,none\", "
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1733,7 +1746,7 @@
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1695,6 +1875,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1693,6 +1873,9 @@
  					    "job-originating-user-name=\"%s\"",
  	        	 job->id, attr->values[0].string.text,
  			 attr->values[1].string.text, job->username);
@@ -1743,7 +1756,7 @@
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1715,6 +1898,9 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1713,6 +1896,9 @@
  			    "job-originating-user-name=\"%s\"",
  	        	    job->id, attr->values[0].string.text,
  			    attr->values[1].string.text, job->username);
@@ -1753,7 +1766,7 @@
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1755,9 +1941,52 @@ add_job(cupsd_client_t  *con,		/* I - Cl
+@@ -1753,9 +1939,52 @@
  	                  "job-sheets=\"%s\", "
  			  "job-originating-user-name=\"%s\"",
  	        	 job->id, Classification, job->username);
@@ -1806,7 +1819,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3333,6 +3562,103 @@ cancel_subscription(
+@@ -3317,6 +3546,103 @@
  }
  
  
@@ -1910,7 +1923,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -3861,6 +4187,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3845,6 +4171,15 @@
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -1926,7 +1939,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
-@@ -3895,6 +4230,81 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3879,6 +4214,81 @@
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2008,7 +2021,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -3989,6 +4399,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -3973,6 +4383,24 @@
        else
          s = attrname;
  
@@ -2033,7 +2046,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5858,6 +6286,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5694,6 +6122,22 @@
      return;
    }
  
@@ -2056,7 +2069,7 @@
   /*
    * Copy attributes...
    */
-@@ -6057,6 +6501,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -5893,6 +6337,11 @@
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2068,7 +2081,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10080,6 +10529,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -9881,6 +10330,11 @@
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2080,9 +2093,8 @@
   /*
    * Check the username against the owner...
    */
-diff -up cups-1.3.1/scheduler/job.c.lspp cups-1.3.1/scheduler/job.c
---- cups-1.3.1/scheduler/job.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/job.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/job.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/job.c	2007-07-31 12:28:32.000000000 +0100
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2108,7 +2120,7 @@
  
  /*
   * Local globals...
-@@ -1077,6 +1088,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+@@ -1063,6 +1074,23 @@
      return;
    }
  
@@ -2132,7 +2144,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1430,6 +1458,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1416,6 +1444,13 @@
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2146,7 +2158,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1448,6 +1483,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1434,6 +1469,76 @@
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2223,7 +2235,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2456,6 +2561,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2446,6 +2551,21 @@
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2245,7 +2257,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2707,6 +2827,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2697,6 +2817,106 @@
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2352,7 +2364,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2851,6 +3071,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2837,6 +3057,18 @@
  	  banner_page)
          continue;
  
@@ -2371,7 +2383,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3067,6 +3299,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3053,6 +3285,67 @@
      envp[envc ++] = final_content_type;
    }
  
@@ -2439,9 +2451,8 @@
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -up cups-1.3.1/scheduler/printers.c.lspp cups-1.3.1/scheduler/printers.c
---- cups-1.3.1/scheduler/printers.c.lspp	2007-09-17 16:48:23.000000000 +0100
-+++ cups-1.3.1/scheduler/printers.c	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/printers.c.lspp	2007-07-31 12:28:32.000000000 +0100
++++ cups-1.3rc2/scheduler/printers.c	2007-07-31 12:28:32.000000000 +0100
 @@ -50,6 +50,8 @@
   *                                 printing desktop tools.
   */
@@ -2451,7 +2462,7 @@
  /*
   * Include necessary headers...
   */
-@@ -73,6 +75,10 @@ static void	write_irix_config(cupsd_prin
+@@ -73,6 +75,10 @@
  static void	write_irix_state(cupsd_printer_t *p);
  #endif /* __sgi */
  
@@ -2462,7 +2473,7 @@
  
  /*
   * 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -1709,6 +1715,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1700,6 +1706,13 @@
  		{			/* No authentication */
  		  "none"
  		};
@@ -2476,7 +2487,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1852,6 +1865,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1843,6 +1856,44 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2521,9 +2532,8 @@
    }
  
    p->raw    = 0;
-diff -up cups-1.3.1/scheduler/job.h.lspp cups-1.3.1/scheduler/job.h
---- cups-1.3.1/scheduler/job.h.lspp	2007-08-01 20:02:47.000000000 +0100
-+++ cups-1.3.1/scheduler/job.h	2007-09-17 16:48:23.000000000 +0100
+--- cups-1.3rc2/scheduler/job.h.lspp	2007-07-12 23:58:17.000000000 +0100
++++ cups-1.3rc2/scheduler/job.h	2007-07-31 12:28:32.000000000 +0100
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2538,8 +2548,8 @@
  /*
   * Job request structure...
   */
-@@ -60,6 +67,10 @@ typedef struct cupsd_job_s
-   krb5_ccache		ccache;		/* Kerberos credential cache */
+@@ -59,6 +66,10 @@
+ #ifdef HAVE_GSSAPI
    char			*ccname;	/* KRB5CCNAME environment variable */
  #endif /* HAVE_GSSAPI */
 +#ifdef WITH_LSPP
@@ -2549,36 +2559,9 @@
  } cupsd_job_t;
  
  
-diff -up cups-1.3.1/cups/cups.h.lspp cups-1.3.1/cups/cups.h
---- cups-1.3.1/cups/cups.h.lspp	2007-08-27 22:13:35.000000000 +0100
-+++ cups-1.3.1/cups/cups.h	2007-09-17 16:48:23.000000000 +0100
-@@ -15,6 +15,9 @@
-  *   This file is subject to the Apple OS-Developed Software exception.
-  */
- 
-+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
-+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
-+
- #ifndef _CUPS_CUPS_H_
- #  define _CUPS_CUPS_H_
- 
-@@ -66,6 +69,12 @@ extern "C" {
- #  define CUPS_DATE_ANY		-1
- 
- 
-+# ifdef WITH_LSPP
-+# define MLS_CONFIG "mls"
-+# define TE_CONFIG "te"
-+# define SELINUX_CONFIG "SELinux"
-+# define UNKNOWN_SL "UNKNOWN SL"
-+# endif /* WITH_LSPP */
- /*
-  * Types and structures...
-  */
-diff -up cups-1.3.1/Makedefs.in.lspp cups-1.3.1/Makedefs.in
---- cups-1.3.1/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
-+++ cups-1.3.1/Makedefs.in	2007-09-17 16:48:23.000000000 +0100
-@@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
+--- cups-1.3rc2/Makedefs.in.lspp	2007-07-18 20:49:45.000000000 +0100
++++ cups-1.3rc2/Makedefs.in	2007-07-31 12:28:32.000000000 +0100
+@@ -134,7 +134,7 @@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
@@ -2587,10 +2570,9 @@
  OPTIM		=	@OPTIM@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
-diff -up cups-1.3.1/config.h.in.lspp cups-1.3.1/config.h.in
---- cups-1.3.1/config.h.in.lspp	2007-09-08 01:28:06.000000000 +0100
-+++ cups-1.3.1/config.h.in	2007-09-17 16:48:23.000000000 +0100
-@@ -552,6 +552,13 @@
+--- cups-1.3rc2/config.h.in.lspp	2007-07-25 01:40:03.000000000 +0100
++++ cups-1.3rc2/config.h.in	2007-07-31 12:28:32.000000000 +0100
+@@ -537,6 +537,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -2604,10 +2586,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up cups-1.3.1/configure.in.lspp cups-1.3.1/configure.in
---- cups-1.3.1/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
-+++ cups-1.3.1/configure.in	2007-09-17 16:48:23.000000000 +0100
-@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
+--- cups-1.3rc2/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3rc2/configure.in	2007-07-31 12:28:32.000000000 +0100
+@@ -42,6 +42,8 @@
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- cups.spec	18 Sep 2007 15:34:06 -0000	1.359
+++ cups.spec	19 Sep 2007 11:02:14 -0000	1.360
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -37,9 +37,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
-Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
-Patch17: cups-str2512-printcap.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -148,9 +146,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
-%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
-%patch17 -p1 -b .str2512-printcap
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -443,6 +439,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
+- 1.3.2.
+- No longer need str2512 patches.
+
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-3
 - Write printcap when a remote queue is deleted (bug #290831).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	17 Sep 2007 16:10:57 -0000	1.37
+++ sources	19 Sep 2007 11:02:14 -0000	1.38
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-89ec473d48598cde9b2030743b15448b  cups-1.3.1-source.tar.bz2
+0f5f95847d7ca209da25936e47699bfe  cups-1.3.2-source.tar.bz2


--- cups-str2512-printcap.patch DELETED ---


--- cups-str2512.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 11:07:50 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 07:07:50 -0400
Subject: rpms/nut/EL-4 nut.spec,1.48,1.49
Message-ID: <200709191107.l8JB7oZQ020110@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20084

Modified Files:
	nut.spec 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.2
- fix building of cgi package on x86_64



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nut.spec	19 Sep 2007 07:50:56 -0000	1.48
+++ nut.spec	19 Sep 2007 11:07:11 -0000	1.49
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 3.1%{?dist}
+Release: 3.2%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,6 @@
 BuildRequires: libjpeg-devel
 BuildRequires: fontconfig-devel
 BuildRequires: pkgconfig
-BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 
 %ifnarch s390 s390x
@@ -110,6 +109,9 @@
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
     --disable-static
+%ifarch x86_64
+    --with-gd-libs="-L/usr/X11R6/lib64 -lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+%endif
 
 make %{?_smp_mflags}
 
@@ -292,6 +294,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.2
+- fix building of cgi package on x86_64
+
 * Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
 - fix manpages encodings
 - run ldconfig after client (un)install



From fedora-extras-commits at redhat.com  Wed Sep 19 11:18:32 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 07:18:32 -0400
Subject: rpms/nut/EL-4 nut.spec,1.49,1.50
Message-ID: <200709191118.l8JBIW6s020363@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20344

Modified Files:
	nut.spec 
Log Message:
fix typo in spec file


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nut.spec	19 Sep 2007 11:07:11 -0000	1.49
+++ nut.spec	19 Sep 2007 11:17:58 -0000	1.50
@@ -108,7 +108,7 @@
     --with-gd-libs \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
-    --disable-static
+    --disable-static \
 %ifarch x86_64
     --with-gd-libs="-L/usr/X11R6/lib64 -lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
 %endif



From fedora-extras-commits at redhat.com  Wed Sep 19 11:28:46 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 07:28:46 -0400
Subject: rpms/cups/devel dnssd,NONE,1.1 cups.spec,1.360,1.361
Message-ID: <200709191128.l8JBSkVL020607@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20582

Modified Files:
	cups.spec 
Added Files:
	dnssd 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
- Include Till Kamppeter's dnssd backend.



--- NEW FILE dnssd ---
#!/usr/bin/perl
# The above Perl path may vary on your system; fix it!!! -*- perl -*-

# dnssd - Search for network printers with the avahi-browse command
#         (Zeroconf, DNS-SD)

# Printer discovery CUPS backend (like the SNMP backend)
# See also http://qa.mandriva.com/show_bug.cgi?id=21812

# Copyright 2007 Till Kamppeter <till.kamppeter at gmail.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
#  USA.

# Usage: 
#
# cp dnssd /usr/lib/cups/backend/
# chmod 755 /usr/lib/cups/backend/dnssd
# killall -HUP cupsd (or "/etc/init.d/cups restart", CUPS 1.1.x only)
# lpinfo -v (or use any printer setup tool)

#use strict;

$0 =~ m!^(.*)/([^/]+)\s*$!;
my $progname = ($2 || $0 || "dnssd");
my $progpath = ($1 || "/usr/lib/cups/backend");

if ($ARGV[0]){
    die "This backend is only for printer discovery, not for actual printing.\n";
}

my $avahicmd = "avahi-browse -k -t -v -r -a 2> /dev/null";

# IPs which are for computers, consider their printer entries as queues
# set up with the local printing system (CUPS, LPD, Windows/Samba SMB, ...)
my @ipblacklist = ();
my $output;
my ($interface, $nettype, $ip, $host, $make, $model, $description, $cmd, $makemodel, $deviceid, $protocol, $port, $uriext, $uri);

open (AVAHI, "$avahicmd |") or die "Could not call \"$avahicmd\"\n";
while (my $line = <AVAHI>) {
    chomp ($line);
    if ($line =~ /^\s*=\s+(\S+)\s+(\S+)\s+(.*?)\s+(\S+)\s+(\S+)\s*$/) {
	# New item
	$interface = $1;
	$nettype = $2;
	my $itemname = $3;
	my $protocolinfo = $4;
        if ($protocolinfo =~ /_workstation/) {
	    $protocol = "computer";
	} elsif ($protocolinfo =~ /_pdl-datastream/) {
	    $protocol = "socket";
	} elsif ($protocolinfo =~ /_printer/) {
	    $protocol = "lpd";
	} elsif ($protocolinfo =~ /_ipp/) {
	    $protocol = "ipp";
	}
    } elsif ($line =~ /^\s*hostname\s*=\s*\[([^\]]+)\]\s*$/) {
	$host = $1;
	$host =~ s/\.local\.?$//;
    } elsif ($line =~ /^\s*address\s*=\s*\[([^\]]+)\]\s*$/) {
	$ip = $1;
	if ($protocol eq "computer") {
	    push (@ipblacklist, $ip);
	    $protocol = "";
	}
    } elsif ($line =~ /^\s*port\s*=\s*\[([^\]]+)\]\s*$/) {
	$port = $1;
    } elsif ($line =~ /^\s*txt\s*=\s*\[(.+)\]\s*$/) {
	my $info = $1;
	if ($protocol) {
	    my ($ty, $product, $pdls, $usb_MFG, $usb_MDL, $usb_DES, $usb_CMD) = 
		("", "", "", "", "", "", "");
	    while ($info =~ s/^\s*\"([^\"]+)\"\s*//) {
		my $infoitem = $1;
		if ($infoitem =~ /^([^=]*)=(.*)$/) {
		    my $field = $1;
		    my $content = $2;
		    if ($field eq "ty") {
			$ty = $content;
		    } elsif ($field eq "product") {
			$product = $content;
			$product =~ s/^\((.*)\)$/$1/;
		    } elsif ($field eq "usb_MFG") {
			$usb_MFG = $content;
		    } elsif ($field eq "usb_MDL") {
			$usb_MDL = $content;
		    } elsif ($field eq "usb_DES") {
			$usb_DES = $content;
		    } elsif ($field eq "usb_CMD") {
			$usb_CMD = $content;
		    } elsif ($field eq "rp") {
			$uriext = $content;
		    } elsif ($field eq "pdl") {
			while ($content =~ s/^\s*([^\,]+?)\s*\,\s*//) {
			    my $i = $1;
			    if ($i =~ m!\b(postscript|ps)\b!i) {
				$pdls .= "POSTSCRIPT,";
			    } elsif ($i =~ m!\b(pdf)\b!i) {
				$pdls .= "PDF,";
			    } elsif ($i =~ m!\b(pcl6|pclxl|pxl)\b!i) {
				$pdls .= "PCLXL,";
			    } elsif ($i =~ m!\b(pcl[345][ce]?|pcl)\b!i) {
				$pdls .= "PCL,";
			    }
			}
			$pdls =~ s/\,$//;
		    }
		}
	    }
	    $usb_MDL ||= $ty;
	    $usb_DES ||= $product;
	    if ($usb_MFG) {
		$make = $usb_MFG;
	    } elsif ($usb_DES =~ /^KONICA\s+MINOLTA\b/i) { 
		$make = "KONICA MINOLTA";
	    } elsif ($usb_DES) {
		$usb_DES =~ /^\s*(\S*)\b/;
		$make = $1;
	    }
	    $model = $usb_MDL;
	    if (!$model) {
		$usb_DES =~ /^\s*\S*\s*(.*)$/;
		$model = $1;
	    }
	    $usb_CMD ||= $pdls;
	    my $extra;
	    if ($protocol eq "socket") {
		$uri = "socket://$ip:$port";
		$extra = "Port $port";
	    } elsif ($protocol eq "lpd") {
		$uri = "lpd://$ip" . ($uriext ? "/$uriext" : "");
		$extra = ($uriext ? "Queue: $uriext" : "Default queue");
	    } elsif ($protocol eq "ipp") {
		$uri = "ipp://$ip:$port" . ($uriext ? "/$uriext" : "");
		$extra = ($uriext ? "Queue: $uriext" : "Default queue");
	    }
	    if ($make && $model) {
		$make =~ s/Hewlett.?Packard/HP/i;
		$make =~ s/Lexmark.?International/Lexmark/i;
		$model =~ s/Hewlett.?Packard/HP/i;
		$model =~ s/Lexmark.?International/Lexmark/i;
		while ($model =~ s/^\s*$make\s*//i) {};
		$makemodel = "$make $model";
	    } elsif ($usb_DES) {
		$makemodel = $usb_DES;
	    } else {
		$makemodel = "Unknown";
	    }
	    $deviceid = ($usb_MFG ? "MFG:$usb_MFG;" : "") .
		($usb_MDL ? "MDL:$usb_MDL;" : "") .
		($usb_DES ? "DES:$usb_DES;" : "") .
		($usb_CMD ? "CMD:$usb_CMD;" : "");
	    $deviceid .= "CLS:PRINTER;" if $deviceid;
	    $output->{$ip}{$protocol}{$extra} =
		"network $uri \"$makemodel\" \"$makemodel $ip ($extra)\" \"$deviceid\"\n";
	    ($interface, $nettype, $ip, $host, $make, $model, $description, $cmd, $makemodel, $deviceid, $protocol, $port, $uriext, $uri) =
		("", "", "", "", "", "", "", "", "", "", "", "", "", "");
	}
    }
}

foreach my $ip (keys(%{$output})) {
    next if member($ip, @ipblacklist);
    if ($output->{$ip}{"socket"}) {
	foreach my $extra (keys(%{$output->{$ip}{"socket"}})) {
	    if (keys(%{$output->{$ip}{"socket"}}) = 1) {
		$output->{$ip}{"socket"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"\(]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"socket"}{$extra};
	}
    } elsif ($output->{$ip}{"lpd"}) {
	foreach my $extra (keys(%{$output->{$ip}{"lpd"}})) {
	    if (keys(%{$output->{$ip}{"lpd"}}) = 1) {
		$output->{$ip}{"lpd"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"\(]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"lpd"}{$extra};
	}
    } elsif ($output->{$ip}{"ipp"}) {
	foreach my $extra (keys(%{$output->{$ip}{"ipp"}})) {
	    if (keys(%{$output->{$ip}{"ipp"}}) == 1) {
		$output->{$ip}{"ipp"}{$extra} =~
		    s/^(\s*\S*\s*\S*\s*\"[^\"]*\"\s*\"[^\"]*?)\s*\([^\)]*\)\s*(\"\s*.*)$/$1$2/;
	    }
	    print $output->{$ip}{"ipp"}{$extra};
	}
    }
}

exit 0;

# member( $a, @b ) returns 1 if $a is in @b, 0 otherwise.
sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 };


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- cups.spec	19 Sep 2007 11:02:14 -0000	1.360
+++ cups.spec	19 Sep 2007 11:28:11 -0000	1.361
@@ -12,6 +12,7 @@
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: http://www.openprinting.org/download/printing/dnssd
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -184,6 +185,9 @@
 
 make BUILDROOT=$RPM_BUILD_ROOT install 
 
+# Include Till Kamppeter's dnssd backend.
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{cups_serverbin}/backend/dnssd
+
 # Serial backend needs to run as root (bug #212577).
 chmod 700 $RPM_BUILD_ROOT%{cups_serverbin}/backend/serial
 
@@ -440,6 +444,7 @@
 
 %changelog
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
+- Include Till Kamppeter's dnssd backend.
 - 1.3.2.
 - No longer need str2512 patches.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:12 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:12 -0700
Subject: [pkgdb] wvdial Owned
Message-ID: <200709191129.l8JBTDC3011873@app4.fedora.phx.redhat.com>

Package wvdial in Fedora devel is now owned by Ondrej Vasik (ovasik)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wvdial



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:14 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:14 -0700
Subject: [pkgdb] wvdial Owned
Message-ID: <200709191129.l8JBTEbH019185@app3.fedora.phx.redhat.com>

Package wvdial in Fedora 7 is now owned by Ondrej Vasik (ovasik)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wvdial



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:33 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:33 -0700
Subject: [pkgdb] libwvstreams Owned
Message-ID: <200709191129.l8JBTXpS019268@app3.fedora.phx.redhat.com>

Package libwvstreams in Fedora devel is now owned by Ondrej Vasik (ovasik)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwvstreams



From fedora-extras-commits at redhat.com  Wed Sep 19 11:29:35 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Wed, 19 Sep 2007 04:29:35 -0700
Subject: [pkgdb] libwvstreams Owned
Message-ID: <200709191129.l8JBTZUf011989@app4.fedora.phx.redhat.com>

Package libwvstreams in Fedora 7 is now owned by Ondrej Vasik (ovasik)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwvstreams



From fedora-extras-commits at redhat.com  Wed Sep 19 11:39:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 07:39:30 -0400
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.40,1.41
Message-ID: <200709191139.l8JBdUAG020972@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20954

Modified Files:
	kipi-plugins.spec 
Log Message:
* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-4
- rebuild against libkdcraw libkexiv2



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kipi-plugins.spec	25 Aug 2007 12:31:27 -0000	1.40
+++ kipi-plugins.spec	19 Sep 2007 11:38:57 -0000	1.41
@@ -4,7 +4,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -15,9 +15,9 @@
 BuildRequires: gettext
 BuildRequires: kdelibs-devel
 BuildRequires: libkipi-devel >= 0.1.5
-BuildRequires: libkdcraw-devel >= 0.1.1
-BuildRequires: libkexiv2-devel >= 0.1.5
-BuildRequires: exiv2-devel >= 0.14
+BuildRequires: libkdcraw-devel >= 0.1.2
+BuildRequires: libkexiv2-devel >= 0.1.6
+BuildRequires: exiv2-devel 
 %if 0%{?fedora} > 6
 %define _with_libgpod --with-libgpod
 BuildRequires: libgpod-devel >= 0.4.2, glib2-devel
@@ -36,7 +36,7 @@
 ## jpeglossless plugin 
 Requires: ImageMagick 
 
-## Technically, optional bits, but nice to have
+## optional bits
 # wallpaper plugin
 #Requires(hint): kdebase 
 # cdarchiver plugin
@@ -170,7 +170,10 @@
 
 
 %changelog
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org>  0.1.4-3
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-4
+- rebuild against libkdcraw libkexiv2
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.4-3
 - License: GPLv2+
 
 * Tue Aug 21 2007 Todd Zullinger <tmz at pobox.com> 0.1.4-2



From fedora-extras-commits at redhat.com  Wed Sep 19 11:50:02 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 07:50:02 -0400
Subject: rpms/texinfo/devel texinfo-4.11-zlib.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 sources, 1.11, 1.12 texinfo.spec, 1.43,
	1.44 texinfo-4.8-0xA0.patch, 1.1, NONE texinfo-4.8-zlib.patch,
	1.1, NONE texinfo-4.9-texindex.patch, 1.1, NONE
Message-ID: <200709191150.l8JBo2sl021236@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202

Modified Files:
	.cvsignore sources texinfo.spec 
Added Files:
	texinfo-4.11-zlib.patch 
Removed Files:
	texinfo-4.8-0xA0.patch texinfo-4.8-zlib.patch 
	texinfo-4.9-texindex.patch 
Log Message:
Rebase to upstream texinfo-4.11, Resolves: #295441

texinfo-4.11-zlib.patch:

--- NEW FILE texinfo-4.11-zlib.patch ---
--- texinfo-4.11/util/Makefile.in_old	2007-09-10 02:37:45.000000000 +0200
+++ texinfo-4.11/util/Makefile.in	2007-09-19 10:29:06.000000000 +0200
@@ -110,7 +110,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
 am__DEPENDENCIES_1 =
 ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
 	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
--- texinfo-4.11/util/install-info.c_old	2007-07-01 23:20:33.000000000 +0200
+++ texinfo-4.11/util/install-info.c	2007-09-19 10:40:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "system.h"
 #include <getopt.h>
 #include <regex.h>
+#include <zlib.h>
 
 static char *progname = "install-info";
 
@@ -559,7 +560,7 @@
    COMPRESSION_PROGRAM.  The compression program is determined by the
    magic number, not the filename.  */
 
-FILE *
+void *
 open_possibly_compressed_file (char *filename,
     void (*create_callback) (char *),
     char **opened_filename, char **compression_program, int *is_pipe) 
@@ -567,7 +568,7 @@
   char *local_opened_filename, *local_compression_program;
   int nread;
   char data[4];
-  FILE *f;
+  gzFile *f;
 
   /* We let them pass NULL if they don't want this info, but it's easier
      to always determine it.  */
@@ -575,16 +576,16 @@
     opened_filename = &local_opened_filename;
 
   *opened_filename = filename;
-  f = fopen (*opened_filename, FOPEN_RBIN);
+  f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       *opened_filename = concat (filename, ".gz", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       free (*opened_filename);
       *opened_filename = concat (filename, ".bz2", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
     }
 
 #ifdef __MSDOS__
@@ -592,13 +593,13 @@
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".igz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
       if (!f)
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".inz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
 #endif
       if (!f)
@@ -610,7 +611,7 @@
               /* And try opening it again.  */
               free (*opened_filename);
               *opened_filename = filename;
-              f = fopen (*opened_filename, FOPEN_RBIN);
+              f = gzopen (*opened_filename, FOPEN_RBIN);
               if (!f)
                 pfatal_with_name (filename);
             }
@@ -621,12 +622,12 @@
 
   /* Read first few bytes of file rather than relying on the filename.
      If the file is shorter than this it can't be usable anyway.  */
-  nread = fread (data, sizeof (data), 1, f);
-  if (nread != 1)
+  nread = gzread (f, data, sizeof (data));
+  if (nread != sizeof (data))
     {
       /* Empty files don't set errno, so we get something like
          "install-info: No error for foo", which is confusing.  */
-      if (nread == 0)
+      if (nread >= 0)
         fatal (_("%s: empty file"), *opened_filename, 0);
       pfatal_with_name (*opened_filename);
     }
@@ -659,20 +660,22 @@
 
   if (*compression_program)
     { /* It's compressed, so fclose the file and then open a pipe.  */
+      FILE *p;
       char *command = concat (*compression_program," -cd <", *opened_filename);
-      if (fclose (f) < 0)
+      if (gzclose (f) < 0)
         pfatal_with_name (*opened_filename);
-      f = popen (command, "r");
-      if (f)
+      p = popen (command, "r");
+      if (p)
         *is_pipe = 1;
       else
         pfatal_with_name (command);
+      return p;
     }
   else
     { /* It's a plain file, seek back over the magic bytes.  */
-      if (fseek (f, 0, 0) < 0)
+      if (gzseek (f, 0, SEEK_SET) < 0)
         pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
       /* Since this is a text file, and we opened it in binary mode,
          switch back to text mode.  */
       f = freopen (*opened_filename, "r", f);
@@ -697,7 +700,7 @@
     char **compression_program)
 {
   char *real_name;
-  FILE *f;
+  void *f;
   int pipe_p;
   int filled = 0;
   int data_size = 8192;
@@ -711,7 +714,12 @@
 
   for (;;)
     {
-      int nread = fread (data + filled, 1, data_size - filled, f);
+      int nread;
+      
+      if (pipe_p)
+       nread = fread (data + filled, 1, data_size - filled, f);
+      else
+       nread = gzread (f, data + filled, data_size - filled);
       if (nread < 0)
         pfatal_with_name (real_name);
       if (nread == 0)
@@ -733,7 +741,7 @@
   if (pipe_p)
     pclose (f);
   else
-    fclose (f);
+    gzclose (f);
 
   *sizep = filled;
   return data;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Jul 2007 08:24:25 -0000	1.11
+++ .cvsignore	19 Sep 2007 11:49:29 -0000	1.12
@@ -1,3 +1,4 @@
 texinfo-4.7.tar.bz2
 texinfo-4.8.tar.bz2
 texinfo-4.9.tar.bz2
+texinfo-4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Jul 2007 08:24:25 -0000	1.11
+++ sources	19 Sep 2007 11:49:29 -0000	1.12
@@ -1 +1 @@
-f4458e4b81e5469fa0815c35654141ab  texinfo-4.9.tar.bz2
+c6bf13df4fbeff8ce874aacd6a51e814  texinfo-4.11.tar.bz2


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- texinfo.spec	28 Aug 2007 11:08:32 -0000	1.43
+++ texinfo.spec	19 Sep 2007 11:49:29 -0000	1.44
@@ -1,16 +1,14 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 4.9
-Release: 2%{?dist}
+Version: 4.11
+Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
 Source1: info-dir
 Source2: texi2pdf.man
-Patch0: texinfo-4.8-zlib.patch
-Patch1: texinfo-4.9-texindex.patch
-Patch2: texinfo-4.8-0xA0.patch
+Patch0: texinfo-4.11-zlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -61,8 +59,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .zlib
-%patch1 -p1 -b .texindex
-%patch2 -p1 -b .0xA0
 
 %build
 
@@ -140,6 +136,11 @@
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Wed Sep 19 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
+- Rebase to upstream texinfo-4.11 (update zlib.patch, drop
+  texindex.patch and 0xA0.patch -- both included in upstream)
+  Resolves: #295441
+
 * Tue Aug 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.9-2
 - Fix license
 - Rebuild


--- texinfo-4.8-0xA0.patch DELETED ---


--- texinfo-4.8-zlib.patch DELETED ---


--- texinfo-4.9-texindex.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 12:00:37 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 08:00:37 -0400
Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.6,
	1.7 libgnomecanvasmm.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <200709191200.l8JC0bVh021844@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomecanvasmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21813

Modified Files:
	.cvsignore libgnomecanvasmm.spec sources 
Log Message:
Update to new stable branch 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2006 18:16:41 -0000	1.6
+++ .cvsignore	19 Sep 2007 12:00:04 -0000	1.7
@@ -1 +1 @@
-libgnomecanvasmm-2.16.0.tar.bz2
+libgnomecanvasmm-2.20.0.tar.bz2


Index: libgnomecanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libgnomecanvasmm.spec	28 Aug 2007 22:30:32 -0000	1.14
+++ libgnomecanvasmm.spec	19 Sep 2007 12:00:04 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libgnomecanvasmm26
-Version:        2.16.0
-Release:        3%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
 
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable branch 2.20
+
 * Tue Aug 28 2007 Stepan Kasal <skasal at redhat.com> - 2.16.0-3
 - Fix typo in description.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomecanvasmm26/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2006 18:16:41 -0000	1.6
+++ sources	19 Sep 2007 12:00:04 -0000	1.7
@@ -1 +1 @@
-fe54d7f437d03044f863672d6dd38e9f  libgnomecanvasmm-2.16.0.tar.bz2
+2a7cdcfd093db49c41e455e7b744e1c2  libgnomecanvasmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 12:03:56 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 19 Sep 2007 08:03:56 -0400
Subject: rpms/texinfo/devel texinfo.spec,1.44,1.45
Message-ID: <200709191203.l8JC3uJx027909@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27864

Modified Files:
	texinfo.spec 
Log Message:
add pdftexi2dvi to files


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- texinfo.spec	19 Sep 2007 11:49:29 -0000	1.44
+++ texinfo.spec	19 Sep 2007 12:03:24 -0000	1.45
@@ -131,6 +131,7 @@
 %{_bindir}/texindex
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
+%{_bindir}/pdftexi2dvi
 %{_mandir}/man1/texindex.1*
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*



From fedora-extras-commits at redhat.com  Wed Sep 19 12:06:30 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 19 Sep 2007 08:06:30 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, 1.1,
	1.2 evolution.spec, 1.291, 1.292
Message-ID: <200709191206.l8JC6UgP028004@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27977

Modified Files:
	evolution-2.11.92-icon-names.patch evolution.spec 
Log Message:

* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
- Revise patch for GNOME bug #477045 (less-zealous icon renaming).


evolution-2.11.92-icon-names.patch:

Index: evolution-2.11.92-icon-names.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.11.92-icon-names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.11.92-icon-names.patch	15 Sep 2007 21:38:15 -0000	1.1
+++ evolution-2.11.92-icon-names.patch	19 Sep 2007 12:06:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
---- evolution-2.11.92/mail/em-folder-browser.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-browser.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-browser.c.icon-names evolution-2.12.0/mail/em-folder-browser.c
+--- evolution-2.12.0/mail/em-folder-browser.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-browser.c	2007-09-19 07:14:51.000000000 -0400
 @@ -206,7 +206,7 @@ enum {
  /* Options for View */
  static EMFBSearchBarItem emfb_view_items[] = {
@@ -25,9 +25,9 @@
  /* 	{ NULL, 0, NULL }, */
  /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
  	{{ NULL, -1, 0 }, NULL}
-diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
---- evolution-2.11.92/mail/em-folder-tree.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-tree.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-tree.c.icon-names evolution-2.12.0/mail/em-folder-tree.c
+--- evolution-2.12.0/mail/em-folder-tree.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-tree.c	2007-09-19 07:14:51.000000000 -0400
 @@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
  	guint32 flags;
  	
@@ -69,201 +69,9 @@
  
  	
  	{ E_POPUP_BAR, "80.emc" },
-diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
---- evolution-2.11.92/mail/mail.error.xml.icon-names	2007-07-28 17:08:12.000000000 -0400
-+++ evolution-2.11.92/mail/mail.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -16,14 +16,14 @@
-     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
- {0}
- Send anyway?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message without a subject?</_primary>
-     <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -32,14 +32,14 @@ Send anyway?</_secondary>
-     <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
- 
- Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. </_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-send-only-bcc" type="warning" default="GTK_RESPONSE_YES">
-     <_primary>Are you sure you want to send a message with only BCC recipients?</_primary>
-     <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Send" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-@@ -51,36 +51,36 @@ Many email systems add an Apparently-To 
-   <error id="ask-default-drafts" type="question" default="GTK_RESPONSE_YES">
-     <_primary>Use default drafts folder?</_primary>
-     <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Use _Default" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-expunge" type="question" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Expunge" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-empty-trash" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?</_primary>
-     <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Empty Trash" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="ask-open-many" type="warning" default="GTK_RESPONSE_CANCEL">
-     <_primary>Are you sure you want to open {0} messages at once?</_primary>
-     <_secondary xml:space="preserve">Opening too many messages at once may take a long time.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="_Open Messages" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_NO">
-     <_primary>You have unsent messages, do you wish to quit anyway?</_primary>
-     <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-quit" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+    <button stock="application-exit" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="async-error" type="error">
-@@ -99,8 +99,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-warning" type="warning">
-@@ -109,8 +109,8 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="session-message-error" type="info">
-@@ -119,15 +119,15 @@ Many email systems add an Apparently-To 
- 
-   <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL">
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
-     <_primary>Enter password.</_primary>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-ok" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="filter-load-error" type="error">
-@@ -179,15 +179,15 @@ Many email systems add an Apparently-To 
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
-     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
-     <_title>Delete &quot;{0}&quot;?</_title>
-     <_primary>Really delete folder &quot;{0}&quot; and all of its subfolders?</_primary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-   <error id="no-rename-folder-exists" type="error">
-@@ -239,7 +239,7 @@ Many email systems add an Apparently-To 
-     <_title>Delete account?</_title>
-     <_primary>Are you sure you want to delete this account?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not d_elete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -248,7 +248,7 @@ Many email systems add an Apparently-To 
-     <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
-     <_secondary xml:space="preserve">If you proceed, the account information and
- all proxy information will be deleted permanently.</_secondary>
--    <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+    <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-     <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
-   </error>
- 
-@@ -275,8 +275,8 @@ all proxy information will be deleted pe
-     <_primary>Do you wish to save your changes?</_primary>
-     <_secondary xml:space="preserve">This signature has been changed, but has not been saved.</_secondary>
-     <button _label="_Discard changes" response="GTK_RESPONSE_NO"/>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--    <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="document-save" response="GTK_RESPONSE_YES"/>
-   </error>
- 
-   <error id="vfolder-notexist" type="error">
-@@ -329,9 +329,9 @@ Either by selecting the folders individu
-     <_secondary xml:space="preserve">A non-empty folder at &quot;{1}&quot; already exists.
- 
- You can choose to ignore this folder, overwrite or append its contents, or quit.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-     <button _label="Ignore" response="GTK_RESPONSE_REJECT"/>
--    <button stock="gtk-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-+    <button stock="edit-delete" _label="_Overwrite" response="GTK_RESPONSE_ACCEPT"/>
-     <button _label="_Append" response="GTK_RESPONSE_OK"/>
-   </error>
- 
-@@ -344,7 +344,7 @@ You can choose to ignore this folder, ov
-     <_title>Querying server</_title>
-     <_primary>Please wait.</_primary>
-     <_secondary xml:space="preserve">Querying server for a list of supported authentication mechanisms.</_secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   </error>
- 
-   <error id="gw-accountsetup-error" type="error">
-diff -up evolution-2.11.92/mail/message-list.c.icon-names evolution-2.11.92/mail/message-list.c
---- evolution-2.11.92/mail/message-list.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/message-list.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/message-list.c.icon-names evolution-2.12.0/mail/message-list.c
+--- evolution-2.12.0/mail/message-list.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/message-list.c	2007-09-19 07:14:51.000000000 -0400
 @@ -217,9 +217,9 @@ static struct {
  	char *icon_name;
  	GdkPixbuf  *pixbuf;
@@ -277,9 +85,9 @@
  	{ "stock_mail-unread-multiple",        NULL },
  	{ "stock_mail-open-multiple",          NULL },
  	{ NULL,                                NULL },
-diff -up evolution-2.11.92/mail/mail-mt.c.icon-names evolution-2.11.92/mail/mail-mt.c
---- evolution-2.11.92/mail/mail-mt.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-mt.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/mail-mt.c.icon-names evolution-2.12.0/mail/mail-mt.c
+--- evolution-2.12.0/mail/mail-mt.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-mt.c	2007-09-19 07:14:51.000000000 -0400
 @@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m
  			data->activity_state = 1;
  			
@@ -289,9 +97,9 @@
  			
  			MAIL_MT_UNLOCK (mail_msg_lock);
  			if (msg->info->desc)
-diff -up evolution-2.11.92/mail/em-folder-view.c.icon-names evolution-2.11.92/mail/em-folder-view.c
---- evolution-2.11.92/mail/em-folder-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/em-folder-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-folder-view.c.icon-names evolution-2.12.0/mail/em-folder-view.c
+--- evolution-2.12.0/mail/em-folder-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/em-folder-view.c	2007-09-19 07:17:18.000000000 -0400
 @@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current
  /* TODO: Move some of these to be 'standard' menu's */
  
@@ -416,9 +224,9 @@
  
  	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
  	{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
-diff -up evolution-2.11.92/mail/em-popup.c.icon-names evolution-2.11.92/mail/em-popup.c
---- evolution-2.11.92/mail/em-popup.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-popup.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/em-popup.c.icon-names evolution-2.12.0/mail/em-popup.c
+--- evolution-2.12.0/mail/em-popup.c.icon-names	2007-09-16 15:17:46.000000000 -0400
++++ evolution-2.12.0/mail/em-popup.c	2007-09-19 07:17:27.000000000 -0400
 @@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop
  }
  
@@ -460,13 +268,13 @@
 -	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO },
 -	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO },
 +	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO },
-+	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "list-add", EM_POPUP_URI_MAILTO },
++	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "edit-add", EM_POPUP_URI_MAILTO },
  };
  
  /* ********************************************************************** */
-diff -up evolution-2.11.92/mail/mail-send-recv.c.icon-names evolution-2.11.92/mail/mail-send-recv.c
---- evolution-2.11.92/mail/mail-send-recv.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-send-recv.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/mail/mail-send-recv.c.icon-names evolution-2.12.0/mail/mail-send-recv.c
+--- evolution-2.12.0/mail/mail-send-recv.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-send-recv.c	2007-09-19 07:14:51.000000000 -0400
 @@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca
  	gtk_widget_show (cancel_button);
  	gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
@@ -485,61 +293,10 @@
  		pretty_url = format_url (destination, NULL);
  		label = gtk_label_new (NULL);
  		gtk_label_set_ellipsize (
-diff -up evolution-2.11.92/mail/em-format-html-display.c.icon-names evolution-2.11.92/mail/em-format-html-display.c
---- evolution-2.11.92/mail/em-format-html-display.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-format-html-display.c	2007-09-15 16:53:46.000000000 -0400
-@@ -2322,7 +2322,7 @@ efhd_add_bar(EMFormatHTML *efh, GtkHTMLE
- 	priv->label = gtk_label_new(_("No Attachment"));
- 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->label), priv->arrow);
- 	save = gtk_button_new();
--	image = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
-+	image = gtk_image_new_from_stock ("document-save", GTK_ICON_SIZE_BUTTON);
- 	txt = gtk_label_new_with_mnemonic(_("S_ave"));
- 	priv->save_txt = txt;
- 	hbox1 = gtk_hbox_new(FALSE, 0);
-diff -up evolution-2.11.92/mail/em-mailer-prefs.c.icon-names evolution-2.11.92/mail/em-mailer-prefs.c
---- evolution-2.11.92/mail/em-mailer-prefs.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/mail/em-mailer-prefs.c	2007-09-15 16:53:46.000000000 -0400
-@@ -783,7 +783,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 			void *status = e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if ((gboolean)status == TRUE) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -791,7 +791,7 @@ junk_plugin_changed (GtkWidget *combo, E
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
- 				gtk_label_set_markup (prefs->plugin_status, html);
-@@ -836,7 +836,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 			status = (gboolean)e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
- 			if (status) {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */				
- 				text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-@@ -845,7 +845,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
- 				g_free (text);
- 			} else {
- 				char *text, *html;
--				gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
-+				gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
- 				/* May be a better text */
- 				text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
- 				html = g_strdup_printf ("<i>%s</i>", text);
-diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/mail/mail-component.c
---- evolution-2.11.92/mail/mail-component.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/mail/mail-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -881,7 +881,7 @@ impl__get_userCreatableItems (PortableSe
+diff -up evolution-2.12.0/mail/mail-component.c.icon-names evolution-2.12.0/mail/mail-component.c
+--- evolution-2.12.0/mail/mail-component.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/mail/mail-component.c	2007-09-19 07:14:51.000000000 -0400
+@@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Mail Message");
  	list->_buffer[0].tooltip = _("Compose a new mail message");
  	list->_buffer[0].menuShortcut = 'm';
@@ -548,7 +305,7 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "folder";
-@@ -889,7 +889,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[1].menuDescription = _("Mail _Folder");
  	list->_buffer[1].tooltip = _("Create a new mail folder");
  	list->_buffer[1].menuShortcut = '\0';
@@ -557,9 +314,9 @@
  	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
  
  	return list;
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder.c
+--- evolution-2.12.0/plugins/exchange-operations/exchange-folder.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder.c	2007-09-19 07:14:51.000000000 -0400
 @@ -63,7 +63,7 @@ static void exchange_get_folder (char *u
  
  
@@ -587,9 +344,9 @@
  };
  
  void
-diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names	2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c
+--- evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c.icon-names	2007-09-16 15:16:25.000000000 -0400
++++ evolution-2.12.0/plugins/exchange-operations/exchange-folder-permission.c	2007-09-19 07:14:51.000000000 -0400
 @@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss
  gchar *selected_exchange_folder_uri = NULL;
  
@@ -599,9 +356,9 @@
  };
  
  static void
-diff -up evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
---- evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names	2007-07-05 02:09:22.000000000 -0400
-+++ evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
+--- evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names	2007-09-16 15:16:26.000000000 -0400
++++ evolution-2.12.0/plugins/save-calendar/org-gnome-save-calendar.eplug.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -8,10 +8,10 @@
  	
  		<hook class="org.gnome.evolution.calendar.popup:1.0">
@@ -615,33 +372,9 @@
  			</menu>
  		</hook>
  	</e-plugin>
-diff -up evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
---- evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names	2007-07-05 02:09:19.000000000 -0400
-+++ evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -14,7 +14,7 @@
- 	<item
- 	  type="item"
- 	  path="80.test"
--	  icon="gtk-copy"
-+	  icon="edit-copy"
- 	  _label="Copy _Email Address"
- 	  visible="mailto"
- 	  activate="org_gnome_copy_tool_copy_address"/>
-diff -up evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
---- evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.icon-names	2007-07-05 02:09:24.000000000 -0400
-+++ evolution-2.11.92/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -18,7 +18,7 @@
- You should receive an answer from the mailing list shortly after the message has been sent.</_secondary>
-   <button _label="_Send message" response="GTK_RESPONSE_YES"/>
-   <button _label="_Edit message" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="malformed-header" type="error">
-diff -up evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.11.92/plugins/groupwise-features/share-folder-common.c
---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.12.0/plugins/groupwise-features/share-folder-common.c
+--- evolution-2.12.0/plugins/groupwise-features/share-folder-common.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/plugins/groupwise-features/share-folder-common.c	2007-09-19 07:14:51.000000000 -0400
 @@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e
  }
  
@@ -651,93 +384,9 @@
  };
  
  static void 
-diff -up evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
---- evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml.icon-names	2007-07-05 02:09:21.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -17,7 +17,7 @@ You cannot share folder with specified u
- <error id="recurrence" type="question" default="GTK_RESPONSE_YES">
- <primary>This is a recurring meeting</primary>
- <secondary>What would you like to {0}?</secondary>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="This instance" response="GTK_RESPONSE_NO"/>
-  <button label="All instances" response="GTK_RESPONSE_YES"/>
- </error>
-diff -up evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
---- evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.icon-names	2007-08-24 02:49:39.000000000 -0400
-+++ evolution-2.11.92/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
- 		<_title>Attachment Reminder</_title>
- 		<_primary>Message has no attachments</_primary>
- 		<_secondary>Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one.</_secondary>
--		<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
-+		<button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL" _label="_Continue Editing"/>
- 		<button response="GTK_RESPONSE_YES" _label="_Send"></button>
- 	</error>
- </error-list> 
-diff -up evolution-2.11.92/e-util/e-error.c.icon-names evolution-2.11.92/e-util/e-error.c
---- evolution-2.11.92/e-util/e-error.c.icon-names	2007-09-02 14:56:59.000000000 -0400
-+++ evolution-2.11.92/e-util/e-error.c	2007-09-15 16:53:46.000000000 -0400
-@@ -79,7 +79,7 @@ static GSList *ee_parent_list;
- /* ********************************************************************** */
- 
- static struct _e_error_button default_ok_button = {
--	NULL, "gtk-ok", NULL, GTK_RESPONSE_OK
-+	NULL, "dialog-ok", NULL, GTK_RESPONSE_OK
- };
- 
- static struct _e_error default_errors[] = {
-diff -up evolution-2.11.92/e-util/e-system.error.xml.icon-names evolution-2.11.92/e-util/e-system.error.xml
---- evolution-2.11.92/e-util/e-system.error.xml.icon-names	2007-07-05 02:10:56.000000000 -0400
-+++ evolution-2.11.92/e-util/e-system.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -5,7 +5,7 @@
-   <_title>Overwrite file?</_title>
-   <_primary>File exists &quot;{0}&quot;.</_primary>
-   <_secondary>Do you wish to overwrite it?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Overwrite" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-diff -up evolution-2.11.92/addressbook/addressbook.error.xml.icon-names evolution-2.11.92/addressbook/addressbook.error.xml
---- evolution-2.11.92/addressbook/addressbook.error.xml.icon-names	2007-07-05 02:06:57.000000000 -0400
-+++ evolution-2.11.92/addressbook/addressbook.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -35,8 +35,8 @@
-  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete address book '{0}'?</_primary>
-   <_secondary>This address book will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="edit-categories" type="error">
-@@ -67,8 +67,8 @@
-   <_primary>Would you like to save your changes?</_primary>
-   <_secondary>You have made modifications to this contact. Do you want to save these changes?</_secondary>
-   <button _label="_Discard" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="document-save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
-@@ -98,8 +98,8 @@
-  <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Address '{0}' already exists.</_primary>
-   <_secondary>A contact already exists with this address. Would you like to add a new card with the same address anyway?</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-component.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-component.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-component.c
+--- evolution-2.12.0/addressbook/gui/component/addressbook-component.c.icon-names	2007-09-16 14:52:56.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Contact");
  	list->_buffer[0].tooltip = _("Create a new contact");
@@ -747,9 +396,9 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = "contact_list";
-diff -up evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/component/addressbook-view.c
---- evolution-2.11.92/addressbook/gui/component/addressbook-view.c.icon-names	2007-09-02 14:56:08.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/component/addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/component/addressbook-view.c
+--- evolution-2.12.0/addressbook/gui/component/addressbook-view.c.icon-names	2007-09-16 14:52:56.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/component/addressbook-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -71,7 +71,7 @@
  static GObjectClass *parent_class = NULL;
  
@@ -827,9 +476,9 @@
  	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
  	gtk_widget_show (priv->info_widget);
  
-diff -up evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c
---- evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/e-addressbook-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c
+--- evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c.icon-names	2007-09-16 14:53:27.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/e-addressbook-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem,
  static EPopupItem eabv_popup_items[] = {
  	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
@@ -870,9 +519,9 @@
  };
  
  static void
-diff -up evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c
---- evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c.icon-names	2007-09-02 14:56:10.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/widgets/eab-contact-display.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c
+--- evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c.icon-names	2007-09-16 14:53:27.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/widgets/eab-contact-display.c	2007-09-19 07:17:05.000000000 -0400
 @@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid
  
  static EPopupItem eab_uri_popups[] = {
@@ -886,9 +535,9 @@
          };
  
  
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-09-19 07:14:51.000000000 -0400
 @@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContact
  	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
  	g_object_unref(widget);
@@ -898,9 +547,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-09-19 07:14:51.000000000 -0400
 @@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactE
  	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
  	g_object_unref(widget);
@@ -910,9 +559,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c
---- evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names	2007-09-02 14:56:06.000000000 -0400
-+++ evolution-2.11.92/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names	2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-09-19 07:14:51.000000000 -0400
 @@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor
  	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
  
@@ -922,9 +571,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/ui/evolution.xml.icon-names evolution-2.11.92/ui/evolution.xml
---- evolution-2.11.92/ui/evolution.xml.icon-names	2007-07-08 22:46:51.000000000 -0400
-+++ evolution-2.11.92/ui/evolution.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution.xml.icon-names evolution-2.12.0/ui/evolution.xml
+--- evolution-2.12.0/ui/evolution.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -7,10 +7,10 @@
      <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/>
  
@@ -962,9 +611,9 @@
      </submenu>
  
      <submenu name="Edit" _label="_Edit">
-diff -up evolution-2.11.92/ui/evolution-event-editor.xml.icon-names evolution-2.11.92/ui/evolution-event-editor.xml
---- evolution-2.11.92/ui/evolution-event-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-event-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-event-editor.xml.icon-names evolution-2.12.0/ui/evolution-event-editor.xml
+--- evolution-2.12.0/ui/evolution-event-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-event-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -45,13 +45,15 @@
  		_tip="Make this a recurring event" pixtype="pixbuf"/>
  
@@ -1003,9 +652,9 @@
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-memos.xml.icon-names evolution-2.11.92/ui/evolution-memos.xml
---- evolution-2.11.92/ui/evolution-memos.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-memos.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-memos.xml.icon-names evolution-2.12.0/ui/evolution-memos.xml
+--- evolution-2.12.0/ui/evolution-memos.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-memos.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1049,9 +698,9 @@
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names evolution-2.11.92/ui/evolution-composer-entries.xml
---- evolution-2.11.92/ui/evolution-composer-entries.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-composer-entries.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names evolution-2.12.0/ui/evolution-composer-entries.xml
+--- evolution-2.12.0/ui/evolution-composer-entries.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-composer-entries.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -3,15 +3,15 @@
  
      <cmd name="EditCut"
@@ -1078,9 +727,9 @@
 -</Root>
 \ No newline at end of file
 +</Root>
-diff -up evolution-2.11.92/ui/evolution-mail-list.xml.icon-names evolution-2.11.92/ui/evolution-mail-list.xml
---- evolution-2.11.92/ui/evolution-mail-list.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-list.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-mail-list.xml.icon-names evolution-2.12.0/ui/evolution-mail-list.xml
+--- evolution-2.12.0/ui/evolution-mail-list.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-list.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -4,15 +4,15 @@
  
      <cmd name="EditCut"
@@ -1111,9 +760,9 @@
  
   	  <separator f="" name="FolderOps1"/>
            <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
-diff -up evolution-2.11.92/ui/evolution-subscribe.xml.icon-names evolution-2.11.92/ui/evolution-subscribe.xml
---- evolution-2.11.92/ui/evolution-subscribe.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-subscribe.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-subscribe.xml.icon-names evolution-2.12.0/ui/evolution-subscribe.xml
+--- evolution-2.12.0/ui/evolution-subscribe.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-subscribe.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -3,7 +3,7 @@
      <submenu name="File" _label="_File">
  
@@ -1123,9 +772,9 @@
  
      </submenu>
  
-diff -up evolution-2.11.92/ui/evolution-tasks.xml.icon-names evolution-2.11.92/ui/evolution-tasks.xml
---- evolution-2.11.92/ui/evolution-tasks.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-tasks.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-tasks.xml.icon-names evolution-2.12.0/ui/evolution-tasks.xml
+--- evolution-2.12.0/ui/evolution-tasks.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-tasks.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,20 +1,20 @@
  <Root>
    <commands>
@@ -1183,9 +832,9 @@
  
    </dockitem>
  
-diff -up evolution-2.11.92/ui/evolution-addressbook.xml.icon-names evolution-2.11.92/ui/evolution-addressbook.xml
---- evolution-2.11.92/ui/evolution-addressbook.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-addressbook.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-addressbook.xml.icon-names evolution-2.12.0/ui/evolution-addressbook.xml
+--- evolution-2.12.0/ui/evolution-addressbook.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-addressbook.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,18 +1,17 @@
  <Root>
    <commands>
@@ -1350,9 +999,9 @@
  
      <toolitem name="ContactStop" verb=""
  	      _label="Stop"/>
-diff -up evolution-2.11.92/ui/evolution-editor.xml.icon-names evolution-2.11.92/ui/evolution-editor.xml
---- evolution-2.11.92/ui/evolution-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-editor.xml.icon-names evolution-2.12.0/ui/evolution-editor.xml
+--- evolution-2.12.0/ui/evolution-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,15 +1,15 @@
  <Root>
    <commands>
@@ -1395,9 +1044,9 @@
      <separator f="" name="editor1"/>
  
      <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/>
-diff -up evolution-2.11.92/ui/evolution-mail-message.xml.icon-names evolution-2.11.92/ui/evolution-mail-message.xml
---- evolution-2.11.92/ui/evolution-mail-message.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-mail-message.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-mail-message.xml.icon-names evolution-2.12.0/ui/evolution-mail-message.xml
+--- evolution-2.12.0/ui/evolution-mail-message.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-mail-message.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -11,15 +11,15 @@
  
      <cmd name="EditCut"
@@ -1524,9 +1173,9 @@
  
        <toolitem name="MessageDelete" verb=""
         _label="Delete"
-diff -up evolution-2.11.92/ui/evolution-task-editor.xml.icon-names evolution-2.11.92/ui/evolution-task-editor.xml
---- evolution-2.11.92/ui/evolution-task-editor.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-task-editor.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-task-editor.xml.icon-names evolution-2.12.0/ui/evolution-task-editor.xml
+--- evolution-2.12.0/ui/evolution-task-editor.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-task-editor.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -61,7 +61,7 @@
  		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
  		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
@@ -1536,9 +1185,9 @@
      </submenu>
    </menu>
  
-diff -up evolution-2.11.92/ui/evolution-message-composer.xml.icon-names evolution-2.11.92/ui/evolution-message-composer.xml
---- evolution-2.11.92/ui/evolution-message-composer.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-message-composer.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-message-composer.xml.icon-names evolution-2.12.0/ui/evolution-message-composer.xml
+--- evolution-2.12.0/ui/evolution-message-composer.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-message-composer.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -2,22 +2,22 @@
  	<commands>
  
@@ -1606,9 +1255,9 @@
  			<separator/>
  			<menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
  			<separator/>
-diff -up evolution-2.11.92/ui/evolution-calendar.xml.icon-names evolution-2.11.92/ui/evolution-calendar.xml
---- evolution-2.11.92/ui/evolution-calendar.xml.icon-names	2007-07-05 02:11:32.000000000 -0400
-+++ evolution-2.11.92/ui/evolution-calendar.xml	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/ui/evolution-calendar.xml.icon-names evolution-2.12.0/ui/evolution-calendar.xml
+--- evolution-2.12.0/ui/evolution-calendar.xml.icon-names	2007-09-16 15:35:19.000000000 -0400
++++ evolution-2.12.0/ui/evolution-calendar.xml	2007-09-19 07:14:51.000000000 -0400
 @@ -1,14 +1,14 @@
  <Root>
    <commands>
@@ -1668,9 +1317,9 @@
  
      <separator f="" name="ecal4"/>
  
-diff -up evolution-2.11.92/composer/e-msg-composer.c.icon-names evolution-2.11.92/composer/e-msg-composer.c
---- evolution-2.11.92/composer/e-msg-composer.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/composer/e-msg-composer.c.icon-names evolution-2.12.0/composer/e-msg-composer.c
+--- evolution-2.12.0/composer/e-msg-composer.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer.c	2007-09-19 07:14:51.000000000 -0400
 @@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -1732,30 +1381,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/composer/mail-composer.error.xml.icon-names evolution-2.11.92/composer/mail-composer.error.xml
---- evolution-2.11.92/composer/mail-composer.error.xml.icon-names	2007-07-05 02:09:41.000000000 -0400
-+++ evolution-2.11.92/composer/mail-composer.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -37,7 +37,7 @@
-   <error id="ask-send-message-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to send the mail?</_primary>
-   <_secondary xml:space="preserve"> There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -46,7 +46,7 @@
-   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
-   <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-diff -up evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names evolution-2.11.92/composer/e-msg-composer-select-file.c
---- evolution-2.11.92/composer/e-msg-composer-select-file.c.icon-names	2007-09-02 14:56:48.000000000 -0400
-+++ evolution-2.11.92/composer/e-msg-composer-select-file.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names evolution-2.12.0/composer/e-msg-composer-select-file.c
+--- evolution-2.12.0/composer/e-msg-composer-select-file.c.icon-names	2007-09-16 15:18:00.000000000 -0400
++++ evolution-2.12.0/composer/e-msg-composer-select-file.c	2007-09-19 07:14:51.000000000 -0400
 @@ -126,7 +126,7 @@ get_selector(struct _EMsgComposer *compo
  	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer");
  	gtk_window_set_modal ((GtkWindow *) selection, FALSE);
@@ -1765,9 +1393,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/shell/e-shell-window-commands.c.icon-names evolution-2.11.92/shell/e-shell-window-commands.c
---- evolution-2.11.92/shell/e-shell-window-commands.c.icon-names	2007-09-03 04:52:04.000000000 -0400
-+++ evolution-2.11.92/shell/e-shell-window-commands.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/shell/e-shell-window-commands.c.icon-names evolution-2.12.0/shell/e-shell-window-commands.c
+--- evolution-2.12.0/shell/e-shell-window-commands.c.icon-names	2007-09-16 14:56:25.000000000 -0400
++++ evolution-2.12.0/shell/e-shell-window-commands.c	2007-09-19 07:14:51.000000000 -0400
 @@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = {
  };
  
@@ -1787,309 +1415,9 @@
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/shell/shell.error.xml.icon-names evolution-2.11.92/shell/shell.error.xml
---- evolution-2.11.92/shell/shell.error.xml.icon-names	2007-07-05 02:07:01.000000000 -0400
-+++ evolution-2.11.92/shell/shell.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -4,7 +4,7 @@
-  <error id="importing" type="info">
-     <_title>Importing...</_title>
-     <secondary>{0}</secondary>
--    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+    <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-nospace" type="error">
-@@ -12,7 +12,7 @@
-   <_secondary xml:space="preserve">Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.
- 
- You will need to make more space available in your home directory before you can continue.</_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="upgrade-failed" type="error">
-@@ -22,8 +22,8 @@ You will need to make more space availab
- 
- If you choose to continue, you may not have access to some of your old data.
- </_secondary>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
-@@ -35,7 +35,7 @@ If you choose to remove this data, the e
- </_secondary>
-   <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
-@@ -47,8 +47,8 @@ It is suggested you manually verify that
- 
- Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
- </_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_OK"/>
-  </error>
- 
-  <error id="noshell" type="error">
-@@ -58,7 +58,7 @@ Once deleted, you cannot downgrade to th
- 
- Click help for details</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="noshell-reason" type="error">
-@@ -70,13 +70,13 @@ Click help for details</_secondary>
- 
- Click help for details.</_secondary>
-   <help uri="http://go-evolution.org/FAQ#What_does_.22Your_system_configuration_does_not_match_your_Evolution_configuration.22_mean.3F"/>
--  <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="application-exit" response="GTK_RESPONSE_CANCEL"/>
-  </error>
- 
-  <error id="forget-passwords" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to forget all remembered passwords?</_primary>
-   <_secondary xml:space="preserve">Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Forget" response="GTK_RESPONSE_OK"/>
-  </error>
-  
-diff -up evolution-2.11.92/calendar/calendar.error.xml.icon-names evolution-2.11.92/calendar/calendar.error.xml
---- evolution-2.11.92/calendar/calendar.error.xml.icon-names	2007-08-24 02:50:09.000000000 -0400
-+++ evolution-2.11.92/calendar/calendar.error.xml	2007-09-15 16:53:46.000000000 -0400
-@@ -11,8 +11,8 @@
-  <error id="prompt-delete-meeting" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this meeting?</_primary>
-   <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-task" type="question" default="GTK_RESPONSE_YES">
-@@ -25,8 +25,8 @@
-  <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-cancel-memo" type="question" default="GTK_RESPONSE_YES">
-@@ -39,57 +39,57 @@
-  <error id="prompt-delete-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete this memo?</_primary>
-   <_secondary>All information on this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the appointment titled '{0}'?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to delete this appointment?</_primary>
-   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the '{0}' task?</_primary>
-   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-named-memo" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete the memo '{0}'?</_primary>
-   <_secondary>All information in this memo will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} appointments?</_primary>
-   <_secondary>All information on these appointments will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} tasks?</_primary>
-   <_secondary>All information on these tasks will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memos" type="question" default="GTK_RESPONSE_NO">
-   <_primary>Are you sure you want to delete these {0} memos?</_primary>
-   <_secondary>All information in these memos will be deleted and can not be restored.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
-@@ -97,7 +97,7 @@
-   <_primary>Would you like to save your changes to this appointment?</_primary>
-   <_secondary>You have changed this appointment, but not yet saved it.</_secondary>
-   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -106,7 +106,7 @@
-  <_primary>Would you like to save your changes to this task?</_primary>
-  <_secondary>You have changed this task, but not yet saved it.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -115,7 +115,7 @@
-  <_primary>Would you like to save your changes to this memo?</_primary>
-  <_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
-  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+ <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Changes" response="GTK_RESPONSE_YES"/>
-  </error>
- 	      
-@@ -143,14 +143,14 @@
-  <error id="ask-send-task-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the task?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the task would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-   <error id="ask-send-event-pending-download" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Download in progress. Do you want to save the appointment?</_primary>
-   <_secondary xml:space="preserve">Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-@@ -184,66 +184,66 @@
-  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete calendar '{0}'?</_primary>
-   <_secondary>This calendar will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete task list '{0}'?</_primary>
-   <_secondary>This task list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-delete-memo-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-   <_primary>Delete memo list '{0}'?</_primary>
-   <_secondary>This memo list will be removed permanently.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
--  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_NO"/>
-+  <button stock="edit-delete" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the appointment without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-   <_primary>Are you sure you want to send the task without a summary?</_primary>
-   <_secondary>Adding a meaningful summary to your task will give your recipients an idea of what your task is about.</_secondary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Send" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-send-no-subject-memo" type="question" default="GTK_RESPONSE_CANCEL">
-   <_primary>Are you sure you want to save the memo without a summary?</_primary>
--  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-+  <button stock="dialog-cancel" response="GTK_RESPONSE_CANCEL"/>
-   <button _label="_Save" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading calendar</_primary>
-   <_secondary>The calendar is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
-  
-  <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Cannot create a new event</_primary>
-   <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading task list</_primary>
-   <_secondary>The task list is not marked for offline usage.</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="prompt-no-contents-offline-memos" type="error" default="GTK_RESPONSE_YES">
-   <_primary>Error loading memo list</_primary>
-   <_secondary>The memo list is not marked for offline usage</_secondary>
--  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
-+  <button stock ="dialog-ok" response="GTK_RESPONSE_YES"/>
-  </error>
- 
-  <error id="server-version" type="warning">
-diff -up evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names evolution-2.11.92/calendar/gui/e-memo-table.c
---- evolution-2.11.92/calendar/gui/e-memo-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-memo-table.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names evolution-2.12.0/calendar/gui/e-memo-table.c
+--- evolution-2.12.0/calendar/gui/e-memo-table.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-memo-table.c	2007-09-19 07:14:51.000000000 -0400
 @@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] =
  
  	{ E_POPUP_BAR, "70.bar" },
@@ -2099,9 +1427,9 @@
  
  	{ E_POPUP_BAR, "90.bar" },
  
-diff -up evolution-2.11.92/calendar/gui/memos-component.c.icon-names evolution-2.11.92/calendar/gui/memos-component.c
---- evolution-2.11.92/calendar/gui/memos-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/memos-component.c.icon-names evolution-2.12.0/calendar/gui/memos-component.c
+--- evolution-2.12.0/calendar/gui/memos-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/memos-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -463,7 +463,7 @@ edit_memo_list_cb (EPopup *ep, EPopupIte
  static EPopupItem emc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
@@ -2111,18 +1439,9 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/event-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/event-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/event-editor.c	2007-09-15 16:53:46.000000000 -0400
-@@ -368,7 +368,7 @@ create_schedule_page (EventEditor *ee)
- 
- 	priv->sched_window = gtk_dialog_new_with_buttons (_("Free/Busy"),
- 			(GtkWindow *) ee, GTK_DIALOG_MODAL,
--			"gtk-close", GTK_RESPONSE_CLOSE,
-+			"dialog-close", GTK_RESPONSE_CLOSE,
- 			NULL);
- 	priv->sched_page = schedule_page_new (priv->model);
- 	g_object_ref_sink (priv->sched_page);
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/event-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/event-editor.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
  	 * icons is filled in at run-time in event_editor_init() are
  	 * updated, too.
@@ -2163,18 +1482,9 @@
  	}
  	e_pixmaps_update (editor->uic, pixmaps);
  
-@@ -604,7 +605,7 @@ event_editor_construct (EventEditor *ee,
- 
- 	priv->recur_window = gtk_dialog_new_with_buttons (_("Recurrence"),
- 							  (GtkWindow *) ee, GTK_DIALOG_MODAL,
--							  "gtk-close", GTK_RESPONSE_CLOSE,
-+							  "dialog-close", GTK_RESPONSE_CLOSE,
- 							  NULL);
- 	g_signal_connect (priv->recur_window, "response", G_CALLBACK (gtk_widget_hide), NULL);
- 	g_signal_connect ((GtkWidget *) priv->recur_window, "delete-event", G_CALLBACK(window_delete_event), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/task-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/task-editor.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/task-editor.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/task-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/task-editor.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2188,18 +1498,9 @@
  	
  	E_PIXMAP_END
  };
-@@ -427,7 +429,7 @@ task_editor_construct (TaskEditor *te, E
- 
- 	priv->task_details_window = gtk_dialog_new_with_buttons (_("Task Details"),
- 								(GtkWindow *) te, GTK_DIALOG_MODAL,
--							  	"gtk-close", GTK_RESPONSE_CLOSE,
-+							  	"dialog-close", GTK_RESPONSE_CLOSE,
- 							  	NULL);
- 	g_signal_connect (priv->task_details_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
- 	g_signal_connect (priv->task_details_window, "delete-event", G_CALLBACK(gtk_widget_hide), NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c
---- evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names	2007-09-02 14:57:08.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/cal-attachment-select-file.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c
+--- evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names	2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/cal-attachment-select-file.c	2007-09-19 07:14:51.000000000 -0400
 @@ -123,7 +123,7 @@ run_selector(CompEditor *editor, const c
  	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
  	gtk_window_set_modal ((GtkWindow *) selection, TRUE);
@@ -2209,9 +1510,9 @@
  	if (icon_list) {
  		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
  		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
---- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.12.0/calendar/gui/dialogs/comp-editor.c
+--- evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/comp-editor.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = {
  };
  
@@ -2240,10 +1541,10 @@
  	case E_CAL_COMPONENT_TODO:
  		return "stock_task";
  	case E_CAL_COMPONENT_JOURNAL:
-diff -up evolution-2.11.92/calendar/gui/calendar-component.c.icon-names evolution-2.11.92/calendar/gui/calendar-component.c
---- evolution-2.11.92/calendar/gui/calendar-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-component.c	2007-09-15 16:53:46.000000000 -0400
-@@ -601,7 +601,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
+diff -up evolution-2.12.0/calendar/gui/calendar-component.c.icon-names evolution-2.12.0/calendar/gui/calendar-component.c
+--- evolution-2.12.0/calendar/gui/calendar-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/calendar-component.c	2007-09-19 07:14:51.000000000 -0400
+@@ -604,7 +604,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem
  static EPopupItem ecc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
  	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
@@ -2252,7 +1553,7 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-@@ -1579,7 +1579,7 @@ impl__get_userCreatableItems (PortableSe
+@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe
  	list->_buffer[0].menuDescription = _("_Appointment");
  	list->_buffer[0].tooltip = _("Create a new appointment");
  	list->_buffer[0].menuShortcut = 'a';
@@ -2261,9 +1562,9 @@
  	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
  
  	list->_buffer[1].id = CREATE_MEETING_ID;
-diff -up evolution-2.11.92/calendar/gui/tasks-control.c.icon-names evolution-2.11.92/calendar/gui/tasks-control.c
---- evolution-2.11.92/calendar/gui/tasks-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-control.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/tasks-control.c.icon-names evolution-2.12.0/calendar/gui/tasks-control.c
+--- evolution-2.12.0/calendar/gui/tasks-control.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/tasks-control.c	2007-09-19 07:14:51.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2294,10 +1595,10 @@
  	
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-table.c
---- evolution-2.11.92/calendar/gui/e-calendar-table.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-table.c	2007-09-15 16:53:46.000000000 -0400
-@@ -1364,7 +1364,7 @@ static EPopupItem tasks_popup_items [] =
+diff -up evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-table.c
+--- evolution-2.12.0/calendar/gui/e-calendar-table.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-table.c	2007-09-19 07:14:51.000000000 -0400
+@@ -1365,7 +1365,7 @@ static EPopupItem tasks_popup_items [] =
  	{ E_POPUP_BAR, "70.bar" },
  
  	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
@@ -2306,9 +1607,9 @@
  	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
  	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
  	{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
-diff -up evolution-2.11.92/calendar/gui/e-day-view.c.icon-names evolution-2.11.92/calendar/gui/e-day-view.c
---- evolution-2.11.92/calendar/gui/e-day-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-day-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-day-view.c.icon-names evolution-2.12.0/calendar/gui/e-day-view.c
+--- evolution-2.12.0/calendar/gui/e-day-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-day-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */
@@ -2327,9 +1628,9 @@
  	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
  	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
  	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
-diff -up evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names evolution-2.11.92/calendar/gui/e-calendar-view.c
---- evolution-2.11.92/calendar/gui/e-calendar-view.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-calendar-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names evolution-2.12.0/calendar/gui/e-calendar-view.c
+--- evolution-2.12.0/calendar/gui/e-calendar-view.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-calendar-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem,
  }
  
@@ -2352,9 +1653,9 @@
  
  	{ E_POPUP_BAR, "50." },
  
-diff -up evolution-2.11.92/calendar/gui/tasks-component.c.icon-names evolution-2.11.92/calendar/gui/tasks-component.c
---- evolution-2.11.92/calendar/gui/tasks-component.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/tasks-component.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/tasks-component.c.icon-names evolution-2.12.0/calendar/gui/tasks-component.c
+--- evolution-2.12.0/calendar/gui/tasks-component.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/tasks-component.c	2007-09-19 07:14:51.000000000 -0400
 @@ -454,7 +454,7 @@ edit_task_list_cb (EPopup *ep, EPopupIte
  static EPopupItem etc_source_popups[] = {
  	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
@@ -2364,9 +1665,9 @@
  	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
  };
  
-diff -up evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names evolution-2.11.92/calendar/gui/calendar-commands.c
---- evolution-2.11.92/calendar/gui/calendar-commands.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/calendar-commands.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names evolution-2.12.0/calendar/gui/calendar-commands.c
+--- evolution-2.12.0/calendar/gui/calendar-commands.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/calendar-commands.c	2007-09-19 07:14:51.000000000 -0400
 @@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = {
  	BONOBO_UI_VERB_END
  };
@@ -2406,9 +1707,9 @@
  
  	E_PIXMAP_END
  };
-diff -up evolution-2.11.92/calendar/gui/memos-control.c.icon-names evolution-2.11.92/calendar/gui/memos-control.c
---- evolution-2.11.92/calendar/gui/memos-control.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/memos-control.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/memos-control.c.icon-names evolution-2.12.0/calendar/gui/memos-control.c
+--- evolution-2.12.0/calendar/gui/memos-control.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/memos-control.c	2007-09-19 07:14:51.000000000 -0400
 @@ -39,6 +39,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <e-util/e-dialog-utils.h>
@@ -2450,9 +1751,9 @@
  	e_memos_setup_view_menus (memos, uic);
  
  	/* Signals from the memos widget; also sensitize the menu items as appropriate */
-diff -up evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names evolution-2.11.92/calendar/gui/e-cal-popup.c
---- evolution-2.11.92/calendar/gui/e-cal-popup.c.icon-names	2007-09-02 14:57:10.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-cal-popup.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.0/calendar/gui/e-cal-popup.c
+--- evolution-2.12.0/calendar/gui/e-cal-popup.c.icon-names	2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-cal-popup.c	2007-09-19 07:14:51.000000000 -0400
 @@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup *
  static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
  
@@ -2465,9 +1766,9 @@
  	{ E_POPUP_BAR, "05.attach", },
  };
  
-diff -up evolution-2.11.92/calendar/gui/e-week-view.c.icon-names evolution-2.11.92/calendar/gui/e-week-view.c
---- evolution-2.11.92/calendar/gui/e-week-view.c.icon-names	2007-09-15 16:53:46.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/e-week-view.c	2007-09-15 16:53:46.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-week-view.c.icon-names evolution-2.12.0/calendar/gui/e-week-view.c
+--- evolution-2.12.0/calendar/gui/e-week-view.c.icon-names	2007-09-19 07:14:51.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-week-view.c	2007-09-19 07:14:51.000000000 -0400
 @@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget)
  
  	/* Create the pixmaps. */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- evolution.spec	17 Sep 2007 20:05:20 -0000	1.291
+++ evolution.spec	19 Sep 2007 12:06:27 -0000	1.292
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -712,6 +712,9 @@
 # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
 
 %changelog
+* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
+- Revise patch for GNOME bug #477045 (less-zealous icon renaming).
+
 * Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0
 - Remove patch for RH bug #182247 (fixed upstream).



From fedora-extras-commits at redhat.com  Wed Sep 19 12:11:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 08:11:20 -0400
Subject: rpms/uw-imap/devel .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 uw-imap.spec, 1.36, 1.37
Message-ID: <200709191211.l8JCBKDe028140@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28118

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-0.1.0709171900
- imap-2006k.DEV.SNAP-0709171900



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jul 2007 12:21:32 -0000	1.14
+++ .cvsignore	19 Sep 2007 12:10:47 -0000	1.15
@@ -1,3 +1,2 @@
 imap-2006i.tar.Z
-imap-2006j1.tar.Z
-imap-2006j2.tar.Z
+imap-2006k.DEV.SNAP-0709171900.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jul 2007 12:21:32 -0000	1.15
+++ sources	19 Sep 2007 12:10:47 -0000	1.16
@@ -1 +1 @@
-d7900691c415bcc725c1bf2b15e4fb99  imap-2006j2.tar.Z
+a6968eb8fcdfabcde370eb8a1bf35a3f  imap-2006k.DEV.SNAP-0709171900.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- uw-imap.spec	21 Aug 2007 12:59:06 -0000	1.36
+++ uw-imap.spec	19 Sep 2007 12:10:47 -0000	1.37
@@ -1,19 +1,21 @@
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-%define beta 2 
+#define beta
+%define dev .DEV.SNAP-
+%define snap 0709171900
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006j
-Release: 3%{?dist}
+Version: 2006k
+Release: 0.1.%{?snap}%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}%{?dev}%{?snap}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -110,7 +112,7 @@
 
 
 %prep
-%setup -q -n imap-%{version}
+%setup -q -n imap-%{version}%{?dev}%{?snap}
 
 %patch1 -p1 -b .paths
 %patch2 -p1 -b .doc
@@ -287,6 +289,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-0.1.0709171900
+- imap-2006k.DEV.SNAP-0709171900
+
 * Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2006j-3
 - fix License
 



From fedora-extras-commits at redhat.com  Wed Sep 19 12:18:11 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 08:18:11 -0400
Subject: rpms/cups/devel cups.spec,1.361,1.362
Message-ID: <200709191218.l8JCIBFV028383@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28354

Modified Files:
	cups.spec 
Log Message:
Fixed typo in changelog.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- cups.spec	19 Sep 2007 11:28:11 -0000	1.361
+++ cups.spec	19 Sep 2007 12:17:39 -0000	1.362
@@ -452,7 +452,7 @@
 - Write printcap when a remote queue is deleted (bug #290831).
 
 * Tue Sep 18 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-2
-- Avoid write printcap unnecessarily (bug #290831).
+- Avoid writing printcap unnecessarily (bug #290831).
 
 * Mon Sep 17 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.1-1
 - 1.3.1.



From fedora-extras-commits at redhat.com  Wed Sep 19 12:27:25 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 08:27:25 -0400
Subject: rpms/alsa-utils/devel .cvsignore, 1.21, 1.22 alsa-utils.spec, 1.57, 
	1.58 alsaunmute.c, 1.15, 1.16 salsa.c, 1.6, 1.7 sources, 1.24, 1.25
Message-ID: <200709191227.l8JCRP13028997@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28915

Modified Files:
	.cvsignore alsa-utils.spec alsaunmute.c salsa.c sources 
Log Message:
* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
- new upstream
- moved saved volume settings to /var/lib (#293301)
- patched alsactl for that (#255421)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Jun 2007 10:18:41 -0000	1.21
+++ .cvsignore	19 Sep 2007 12:26:53 -0000	1.22
@@ -14,3 +14,4 @@
 alsa-utils-1.0.14rc1.tar.bz2
 alsa-utils-1.0.14rc2.tar.bz2
 alsa-utils-1.0.14.tar.bz2
+alsa-utils-1.0.15rc1.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- alsa-utils.spec	16 Aug 2007 11:43:55 -0000	1.57
+++ alsa-utils.spec	19 Sep 2007 12:26:53 -0000	1.58
@@ -1,7 +1,10 @@
+%define 	prever		rc1
+%define 	prever_dot	.rc1
+
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
-Version: 	1.0.14
-Release: 	2%{?prever_dot}%{?dist}
+Version: 	1.0.15
+Release: 	0.1%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -11,6 +14,7 @@
 Source4: 	alsaunmute.c
 Source10:	alsa.rules
 Patch:		alsa-utils-1.0.14-alsaconf.patch
+Patch1:         alsa-utils-1.0.14-statedir.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -23,7 +27,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch -p1
+%patch 	-p1
+%patch1 -p1 -b .statedir
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
@@ -50,6 +55,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
+# Create a place for volume configuration
+mkdir -p $RPM_BUILD_ROOT/var/lib/alsa
+touch $RPM_BUILD_ROOT/var/lib/alsa/asound.state
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -69,8 +78,16 @@
 %dir %{_datadir}/alsa/speaker-test
 %{_datadir}/alsa/speaker-test/*
 /usr/share/locale/*
+/var/lib/alsa
+%ghost /var/lib/alsa/asound.state
+
 
 %changelog
+* Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
+- new upstream
+- moved saved volume settings to /var/lib (#293301)
+- patched alsactl for that (#255421)
+
 * Thu Aug 16 2007 Martin Stransky <stransky at redhat.com> 1.0.14-2
 - added an entry to alsaunmute for HP xw4550 (#252171)
 


Index: alsaunmute.c
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsaunmute.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alsaunmute.c	16 Aug 2007 11:43:55 -0000	1.15
+++ alsaunmute.c	19 Sep 2007 12:26:53 -0000	1.16
@@ -16,7 +16,12 @@
  *
  */
 
-#define  VERSION  "0.2"
+/*
+    TODO 
+    -> external unmute table
+*/
+
+#define  VERSION  "0.3"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +34,7 @@
 #define FALSE (1!=1)
 
 int verbose = 0;
+int help = 0;
 
 typedef struct _CHANNEL {
 
@@ -280,17 +286,45 @@
   }
 }
 
-void usage(char *p_name)
+int get_card_device(const char *p_device)
+{
+  int err;
+  snd_ctl_t *handle;
+  snd_ctl_card_info_t *info;
+  int card = 0;
+
+  snd_ctl_card_info_alloca(&info);
+
+  if ((err = snd_ctl_open(&handle, "default", 0)) < 0) {
+    fprintf(stderr,"Open error: %s\n", snd_strerror(err));
+    return(0);
+  }
+  if ((err = snd_ctl_card_info(handle, info)) < 0) {
+    fprintf(stderr,"HW info error: %s\n", snd_strerror(err));
+    return(0);
+  }
+
+  card = snd_ctl_card_info_get_card(info);
+
+  snd_ctl_close(handle);
+
+  return(card);
+}
+
+void usage(void)
 {
   printf("Alsa Unmute utility, Version %s, Copyright 2005 Red Hat, Inc.\n",VERSION);
   printf("This software may be freely redistributed under the terms of the GNU\n");
   printf("public license.\n\n");
 
-  printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n");
-  printf("  card_number       - number of unmuted card\n");
+  printf("Usage: alsaunmute [options]\n\n");
+  printf("  [card_number]     - sound card number. If this parameter is not given,\n");
+  printf("                      the \"default\" sound device is unmuted.\n");
+  printf("  [-D device]       - unmute specified alsa device (like \"default\")\n");
   printf("  [-v]              - verbose mode\n");
   printf("  [-s volume]       - set this volume level instead of the default (75%%)\n");
-  printf("                      the volume is number from 0 to 100\n\n");
+  printf("                      the volume is number from 0 to 100\n");
+  printf("  [-h]              - this help\n\n");
   exit(0);
 }
 
@@ -301,31 +335,54 @@
 int main(int argc, char **argv)
 {
   const char *p_driver;
-  int index;
+  char *p_device = "default";
+  int index = -1;
   int volume = 75;
   int param;
-
-  if (argc < 2) {
-    usage(argv[0]);
-    exit(0);
-  }
-
-  index = atoi(argv[1]);
-  p_driver = get_card_driver(index);
   
-  for(param = 2; param < argc; param++) {  
-    if (!strcmp(argv[param],"-v") || !strcmp(argv[param],"-V")) {
+  for(param = 1; param < argc; param++) {  
+    if (argv[param][0] >= '0' && argv[param][0] <= '9') {
+      index = atoi(argv[param]);
+      continue;
+    }
+    if (!strcmp(argv[param],"-v")) {
       verbose = TRUE;
       continue;
     }
-
-    if (param+1 < argc && (!strcmp(argv[param],"-s") || !strcmp(argv[param],"-S"))) {
+    if (!strcmp(argv[param],"-h") || !strcmp(argv[param],"--help")) {
+      help = TRUE;
+      continue;
+    }
+    if (param+1 < argc && !strcmp(argv[param],"-s")) {
       param++;
       volume = atoi(argv[param]);
+      continue;
+    }
+    if (param+1 < argc && !strcmp(argv[param],"-D")) {
+      param++;
+      p_device = argv[param];
+      continue;
     }
   }
 
-  
+  if(help) {
+    usage();
+  }
+
+
+  if(index == -1) {
+    if(verbose) {
+       fprintf(stderr,"Unmuting ALSA device '%s'...\n",p_device);
+    }
+    index = get_card_device(p_device);
+  }
+  else {
+    if(verbose) {
+       fprintf(stderr,"Unmuting ALSA card %d...\n",index);
+    }  
+  }
+
+  p_driver = get_card_driver(index);  
   if(!p_driver) {
     fprintf(stderr,"Wrong card index %d...\n",index);
     return(1);  


Index: salsa.c
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- salsa.c	18 Apr 2007 12:28:22 -0000	1.6
+++ salsa.c	19 Sep 2007 12:26:53 -0000	1.7
@@ -20,7 +20,7 @@
 
 #include <alsa/asoundlib.h>
 
-#define ALSA_CONFIG_PATH	"/etc/alsa/asound.state"
+#define ALSA_CONFIG_PATH	"/var/lib/alsa/asound.state"
 #define ALL_CARDS         	(-1)
 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Jun 2007 10:18:41 -0000	1.24
+++ sources	19 Sep 2007 12:26:53 -0000	1.25
@@ -1 +1 @@
-6d3009c157ac6fc803696d6590a48366  alsa-utils-1.0.14.tar.bz2
+f272e7681acc98d79b56909b935b7878  alsa-utils-1.0.15rc1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 12:32:17 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 08:32:17 -0400
Subject: rpms/perl-Test-Inline/devel .cvsignore, 1.3,
	1.4 perl-Test-Inline.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200709191232.l8JCWHdR029162@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Inline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29131

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
- Upstream update.
- Disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 04:22:23 -0000	1.3
+++ .cvsignore	19 Sep 2007 12:31:45 -0000	1.4
@@ -1 +1 @@
-Test-Inline-2.201.tar.gz
+Test-Inline-2.207.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Inline.spec	18 Jan 2007 04:43:16 -0000	1.8
+++ perl-Test-Inline.spec	19 Sep 2007 12:31:45 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-Inline
-Version: 	2.201
-Release: 	2%{?dist}
+Version: 	2.207
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-Inline/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Inline-%{version}.tar.gz
@@ -16,7 +16,8 @@
 BuildRequires:	perl(File::Spec) >= 0.80
 BuildRequires:	perl(List::Util) >= 1.11
 BuildRequires:	perl(Getopt::Long) >= 2.34
-BuildRequires:	perl(File::Remove)
+BuildRequires:	perl(File::chmod)
+BuildRequires:	perl(File::Remove) >= 0.34
 BuildRequires:	perl(File::Slurp) >= 9999.04
 BuildRequires:	perl(File::Find::Rule) >= 0.26
 BuildRequires:	perl(Config::Tiny) >= 2.00
@@ -26,6 +27,7 @@
 BuildRequires:	perl(File::Flat) >= 1.00
 BuildRequires:	perl(Pod::Tests) >= 0.18
 BuildRequires:	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(Test::Script)
 
 # RPM misses these deps
 Requires:	perl(File::Flat)
@@ -61,7 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test AUTOMATED_TESTING=1
+# Something is broken with AUTOMATED_TESTING
+# make test AUTOMATED_TESTING=1
+make test
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +76,16 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
+- Upstream update.
+- Disable AUTOMATED_TESTING.
+
+* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.205-1
+- Upstream update.
+
+* Tue Jul 10 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.202-1
+- Upstream update.
+
 * Wed Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.201-2
 - BR: perl(File::Remove).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2007 04:22:23 -0000	1.3
+++ sources	19 Sep 2007 12:31:45 -0000	1.4
@@ -1 +1 @@
-6c6a444c2044f11776dab50ae0030121  Test-Inline-2.201.tar.gz
+7530c2dee1d9547acd78dd4ca17ffbb3  Test-Inline-2.207.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 12:48:19 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 08:48:19 -0400
Subject: rpms/esound/devel remove-confusing-spew.patch, NONE, 1.1 esound.spec,
	1.39, 1.40
Message-ID: <200709191248.l8JCmJoU029525@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/esound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29471

Modified Files:
	esound.spec 
Added Files:
	remove-confusing-spew.patch 
Log Message:
remove confusing spew


remove-confusing-spew.patch:

--- NEW FILE remove-confusing-spew.patch ---
diff -up esound-0.2.38/esdlib.c.spew esound-0.2.38/esdlib.c
--- esound-0.2.38/esdlib.c.spew	2007-04-19 10:43:59.000000000 -0400
+++ esound-0.2.38/esdlib.c	2007-09-19 08:45:44.000000000 -0400
@@ -479,7 +479,6 @@ esd_connect_tcpip(const char *host)
          strcpy ( connect_host, "localhost" );
 
        if ( getaddrinfo ( connect_host, NULL, &hints, &result ) != 0 ) {
-         printf ("Usage:program_name [address][:port]");
          return (-1);
        }
 


Index: esound.spec
===================================================================
RCS file: /cvs/extras/rpms/esound/devel/esound.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- esound.spec	24 Aug 2007 12:22:53 -0000	1.39
+++ esound.spec	19 Sep 2007 12:47:46 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
 Version: 0.2.38
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:   1
 License: LGPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -15,6 +15,7 @@
 Patch4: esound-0.2.38-drain.patch
 Patch5: esound-0.2.38-multi-user.patch
 Patch6: esound-0.2.38-fix-open-macro.patch
+Patch7: remove-confusing-spew.patch
 BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
 BuildRequires: alsa-lib-devel
@@ -70,6 +71,7 @@
 %patch4 -p1 -b .drain-race
 %patch5 -p1 -b .multi-user
 %patch6 -p1 -b .open-macro
+%patch7 -p1 -b .spew
 
 %build
 %configure --disable-static
@@ -132,6 +134,9 @@
 %{_mandir}/man1/esd-config.1.gz
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.2.38-5
+- Don't spew confusing warnings to stdout 
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 1:0.2.38-4
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Wed Sep 19 12:52:37 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 19 Sep 2007 08:52:37 -0400
Subject: rpms/digikam/devel digikam.spec,1.40,1.41
Message-ID: <200709191252.l8JCqbnx029693@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29669

Modified Files:
	digikam.spec 
Log Message:
- Rebuild



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- digikam.spec	29 Aug 2007 14:10:07 -0000	1.40
+++ digikam.spec	19 Sep 2007 12:52:04 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -141,6 +141,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-5
+- Rebuild
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
 - License: GPLv2+
 - lcms patch (kde bug #148930)



From fedora-extras-commits at redhat.com  Wed Sep 19 12:57:10 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 08:57:10 -0400
Subject: rpms/gnomebaker/devel gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.14, 1.15
Message-ID: <200709191257.l8JCvAoF029822@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnomebaker.spec	17 Sep 2007 08:32:44 -0000	1.14
+++ gnomebaker.spec	19 Sep 2007 12:56:38 -0000	1.15
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:			gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:01:20 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 09:01:20 -0400
Subject: rpms/gnomebaker/F-7 gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.12, 1.13
Message-ID: <200709191301.l8JD1KdO003422@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29921

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-7/gnomebaker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnomebaker.spec	17 Sep 2007 08:51:45 -0000	1.12
+++ gnomebaker.spec	19 Sep 2007 13:00:47 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:			gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:07:03 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Wed, 19 Sep 2007 09:07:03 -0400
Subject: rpms/gnomebaker/FC-6 gnomebaker-0.6.2-genisofs.patch, NONE,
	1.1 gnomebaker.spec, 1.10, 1.11
Message-ID: <200709191307.l8JD73YI003528@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3505

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.2-genisofs.patch 
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
- fix wrong genisoimage call when using cdrkit backend


gnomebaker-0.6.2-genisofs.patch:

--- NEW FILE gnomebaker-0.6.2-genisofs.patch ---
--- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
@@ -868,7 +868,7 @@
 			exec_cmd_add_arg(e, "mkisofs");			
 			break;
 		case BACKEND_WODIM:
-			exec_cmd_add_arg(e, "genisofs");
+			exec_cmd_add_arg(e, "genisoimage");
 			break;			
 	}
 


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/FC-6/gnomebaker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnomebaker.spec	17 Sep 2007 09:11:06 -0000	1.10
+++ gnomebaker.spec	19 Sep 2007 13:06:28 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           gnomebaker
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:		http://%{name}.sourceforge.net/v2/ 
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         gnomebaker-0.6.2-genisofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel >= 2.10.0
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p1
 chmod 644 AUTHORS TODO
 
 
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-2
+- fix wrong genisoimage call when using cdrkit backend
+
 * Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> - 0.6.2-1
 - new upstream version
 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:11:34 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:11:34 -0400
Subject: rpms/system-config-printer/F-7 pycups-1.9.27.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.130, 1.131 sources, 1.135,
	1.136 system-config-printer.spec, 1.107,
	1.108 pycups-1.9.24.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191311.l8JDBYFT003728@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3702

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.27.tar.bz2.sig 
Removed Files:
	pycups-1.9.24.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.27.



--- NEW FILE pycups-1.9.27.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore	9 Aug 2007 15:16:17 -0000	1.130
+++ .cvsignore	19 Sep 2007 13:11:02 -0000	1.131
@@ -112,3 +112,4 @@
 system-config-printer-0.7.63.2.tar.bz2
 pycups-1.9.24.tar.bz2
 system-config-printer-0.7.63.3.tar.bz2
+pycups-1.9.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	9 Aug 2007 15:16:17 -0000	1.135
+++ sources	19 Sep 2007 13:11:02 -0000	1.136
@@ -1,2 +1,2 @@
-5038e4c6945c5183ad7061d6ee061205  pycups-1.9.24.tar.bz2
 3aeb83e328d383c7f57f3311ec9a9a42  system-config-printer-0.7.63.3.tar.bz2
+20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- system-config-printer.spec	9 Aug 2007 15:20:26 -0000	1.107
+++ system-config-printer.spec	19 Sep 2007 13:11:02 -0000	1.108
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.24
+%define pycups_version 1.9.27
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -129,6 +129,9 @@
 fi
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.27.
+
 * Thu Aug  9 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.3-1
 - 0.7.63.3:
   - Don't allow deletion of browsed printers (bug #250385).


--- pycups-1.9.24.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:24:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Wed, 19 Sep 2007 09:24:53 -0400
Subject: fedora-security/audit fc6,1.261,1.262 fc7,1.109,1.110
Message-ID: <200709191324.l8JDOr93004137@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4111

Modified Files:
	fc6 fc7 
Log Message:
wpa_supplicant was no problem.
added libsndfile.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- fc6	18 Sep 2007 15:43:23 -0000	1.261
+++ fc6	19 Sep 2007 13:24:50 -0000	1.262
@@ -7,7 +7,6 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
-GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc7	18 Sep 2007 15:43:23 -0000	1.109
+++ fc7	19 Sep 2007 13:24:50 -0000	1.110
@@ -8,9 +8,9 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-GENERIC-MAP-NOMATCH VULNERABLE (wpa_supplicant) #293011
 CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Wed Sep 19 13:31:44 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:31:44 -0400
Subject: rpms/kanatest/devel .cvsignore, 1.3, 1.4 kanatest.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200709191331.l8JDViW9004312@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4290

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Update to upstream release 0.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 14:49:25 -0000	1.3
+++ .cvsignore	19 Sep 2007 13:31:12 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/kanatest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kanatest.spec	29 Aug 2007 05:36:06 -0000	1.7
+++ kanatest.spec	19 Sep 2007 13:31:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kanatest
-Version:        0.4.2
-Release:        3%{?dist}
+Version:        0.4.4
+Release:        1%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-1
+- Update to upstream release 0.4.4
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 14:49:25 -0000	1.3
+++ sources	19 Sep 2007 13:31:12 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 13:37:20 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:37:20 -0400
Subject: rpms/system-config-printer/F-7
	system-config-printer-0.7.63.4.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.131, 1.132 sources, 1.136, 1.137 system-config-printer.spec,
	1.108, 1.109 system-config-printer-0.7.63.3.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191337.l8JDbKKu004498@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4458

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.63.4.tar.bz2.sig 
Removed Files:
	system-config-printer-0.7.63.3.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.4-1
- Updated to pycups-1.9.27.
- 0.7.63.4:
  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).



--- NEW FILE system-config-printer-0.7.63.4.tar.bz2.sig ---
??
4i???

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	19 Sep 2007 13:11:02 -0000	1.131
+++ .cvsignore	19 Sep 2007 13:36:48 -0000	1.132
@@ -113,3 +113,4 @@
 pycups-1.9.24.tar.bz2
 system-config-printer-0.7.63.3.tar.bz2
 pycups-1.9.27.tar.bz2
+system-config-printer-0.7.63.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	19 Sep 2007 13:11:02 -0000	1.136
+++ sources	19 Sep 2007 13:36:48 -0000	1.137
@@ -1,2 +1,2 @@
-3aeb83e328d383c7f57f3311ec9a9a42  system-config-printer-0.7.63.3.tar.bz2
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
+32e238af2a1e86478df541a407b973ee  system-config-printer-0.7.63.4.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- system-config-printer.spec	19 Sep 2007 13:11:02 -0000	1.108
+++ system-config-printer.spec	19 Sep 2007 13:36:48 -0000	1.109
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.63.3
+Version: 0.7.63.4
 Release: 1%{?dist}
 License: GPL
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -129,8 +129,10 @@
 fi
 
 %changelog
-* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.4-1
 - Updated to pycups-1.9.27.
+- 0.7.63.4:
+  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).
 
 * Thu Aug  9 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.3-1
 - 0.7.63.3:


--- system-config-printer-0.7.63.3.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:50:40 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:50:40 -0400
Subject: rpms/kanatest/F-7 .cvsignore, 1.3, 1.4 kanatest.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200709191350.l8JDoegn004970@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4893

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Fix file not packaged



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 14:51:39 -0000	1.3
+++ .cvsignore	19 Sep 2007 13:50:08 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/kanatest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanatest.spec	21 Jun 2007 14:51:39 -0000	1.6
+++ kanatest.spec	19 Sep 2007 13:50:08 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           kanatest
-Version:        0.4.2
+Version:        0.4.4
 Release:        2%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
@@ -57,6 +57,12 @@
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-2
+- Update to upstream release 0.4.4
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jun 21 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.2-2
 - Update to upstream release 0.4.2 - Bug 245177
 - URL changed - Bug 245177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 14:51:39 -0000	1.3
+++ sources	19 Sep 2007 13:50:08 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 13:51:24 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 09:51:24 -0400
Subject: rpms/kanatest/devel kanatest.spec,1.8,1.9
Message-ID: <200709191351.l8JDpODs005078@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4976

Modified Files:
	kanatest.spec 
Log Message:
Fix file not packaged



Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/kanatest.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kanatest.spec	19 Sep 2007 13:31:12 -0000	1.8
+++ kanatest.spec	19 Sep 2007 13:50:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.4.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,10 +54,11 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
-* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-1
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
 - Update to upstream release 0.4.4
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3



From fedora-extras-commits at redhat.com  Wed Sep 19 13:51:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 09:51:34 -0400
Subject: rpms/fast-user-switch-applet/F-7 many-users.patch, NONE,
	1.1 fast-user-switch-applet.spec, 1.13, 1.14
Message-ID: <200709191351.l8JDpYDq005120@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fast-user-switch-applet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989

Modified Files:
	fast-user-switch-applet.spec 
Added Files:
	many-users.patch 
Log Message:
improve experience with many users


many-users.patch:

--- NEW FILE many-users.patch ---
diff -up fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users fast-user-switch-applet-2.18.0/src/fusa-manager.c
--- fast-user-switch-applet-2.18.0/src/fusa-manager.c.many-users	2007-09-17 01:56:45.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-manager.c	2007-09-17 02:08:59.000000000 -0400
@@ -129,11 +129,13 @@ struct _FusaManager
 
   GHashTable *shells;
   GHashTable *exclusions;
+  GHashTable *inclusions;
   gchar *global_face_dir;
   uid_t minimal_uid;
   gsize user_max_file;
   gint max_icon_size;
 
+  guint8 include_all : 1;
   guint8 allow_root  : 1;
   guint8 relax_group : 1;
   guint8 relax_other : 1;
@@ -341,6 +343,8 @@ fusa_manager_init (FusaManager *manager)
   /* GDM config file */
   manager->exclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       g_free, NULL);
+  manager->inclusions = g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
   reload_gdm_config (manager, FALSE);
   error = NULL;
   uri = g_filename_to_uri (GDMCONFIGFILE, NULL, &error);
@@ -645,6 +649,38 @@ merge_gdm_exclusions (FusaManager  *mana
   return TRUE;
 }
 
+/* Returns TRUE if changed */
+static gboolean
+merge_gdm_inclusions (FusaManager  *manager,
+		      gchar       **includev,
+		      const gchar  *include_default[])
+{
+  gint i;
+
+  if (strv_equals_string_table (includev, manager->inclusions))
+    return FALSE;
+
+  g_hash_table_foreach_remove (manager->inclusions,
+			       clear_hash_table_hrfunc, NULL);
+
+  if (include_default)
+    {
+      for (i = 0; include_default[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (include_default[i]),
+			     GUINT_TO_POINTER (TRUE));
+    }
+
+  if (includev)
+    {
+      for (i = 0; includev[i] != NULL; i++)
+        g_hash_table_insert (manager->inclusions,
+			     g_strdup (includev[i]), GUINT_TO_POINTER (TRUE));
+    }
+
+  return TRUE;
+}
+
 static void resolve_dirty_flags(GdmResultState dummy1, const gchar *dummy2, gpointer data)
 {
   FusaManager *manager = data;
@@ -687,6 +723,27 @@ static void handler_Exclude(GdmResultSta
     manager->users_dirty = TRUE;
 }
 
+static void handler_Include(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gchar** includev = g_strsplit (value, ",", G_MAXINT);
+  
+  if (merge_gdm_inclusions (manager, includev, NULL))
+    manager->users_dirty = TRUE;
+}
+
+static void handler_IncludeAll(GdmResultState is_ok, const gchar *value, gpointer data)
+{
+  FusaManager *manager = data;
+  gboolean tmp_include_all = strcasecmp(value, "false") != 0;
+  
+  if (tmp_include_all != manager->include_all)
+    {
+      manager->include_all = tmp_include_all;
+      manager->users_dirty = TRUE;
+    }
+}
+
 static void handler_GlobalFaceDir(GdmResultState is_ok, const gchar *value, gpointer data)
 {
   FusaManager *manager = data;
@@ -744,6 +801,8 @@ struct SettingsHandler {
 } settings_handlers[] = {
   { "greeter/MinimalUID", handler_MinimalUID },
   { "greeter/Exclude", handler_Exclude },
+  { "greeter/Include", handler_Include },
+  { "greeter/IncludeAll", handler_IncludeAll },
   { "greeter/GlobalFaceDir", handler_GlobalFaceDir },
   { "security/UserMaxFile", handler_UserMaxFile },
   { "security/AllowRoot", handler_AllowRoot },
@@ -798,27 +857,76 @@ reload_shells (FusaManager *manager)
   endusershell ();
 }
 
-static void
-reload_passwd (FusaManager *manager)
+#define OLD_FLAG 1
+#define NEW_FLAG 2
+
+static void set_flag (GObject *obj, int flag)
 {
-  struct passwd *pwent;
-  GSList *old_users, *new_users, *list;
-  
-  old_users = NULL;
-  new_users = NULL;
+  int flags;
+
+  flags = GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+  flags |= flag;
+  g_object_set_data (obj, "fusa-user-flags", GINT_TO_POINTER (flags));  
+}
+
+static int get_flags (GObject *obj)
+{
+  return GPOINTER_TO_INT (g_object_get_data (obj, "fusa-user-flags"));
+}
+
+static void clear_flags (GObject *obj)
+{
+  g_object_set_data (obj, "fusa-user-flags", NULL);
+}
 
-  g_hash_table_foreach (manager->users, listify_hash_values_hfunc, &old_users);
-  g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+static void mark_as_old (gpointer key, gpointer value, gpointer data)
+{
+  GObject *user = value;
 
+  set_flag (user, OLD_FLAG);  
   /* Make sure we keep users who are logged in no matter what. */
-  for (list = old_users; list; list = list->next)
+  if (fusa_user_get_n_displays (FUSA_USER (user)))
     {
-      if (fusa_user_get_n_displays (list->data))
-	{
-	  g_object_freeze_notify (G_OBJECT (list->data));
-	  new_users = g_slist_prepend (new_users, g_object_ref (list->data));
-	}
+      set_flag (user, NEW_FLAG);
+      g_object_freeze_notify (user);
+    }
+}
+
+static gboolean emit_add_or_remove (gpointer key, gpointer value, gpointer data)
+{
+  FusaManager *manager = data;
+  int flags;
+
+  flags = get_flags (value);
+  clear_flags (value);
+
+  if (flags == NEW_FLAG) 
+    { 
+      g_signal_emit (manager, signals[USER_ADDED], 0, value);
+      return FALSE;
+    }
+  else if (flags == OLD_FLAG)
+    {
+      g_signal_emit (manager, signals[USER_REMOVED], 0, value);
+      g_hash_table_remove (manager->users_by_uid,
+			   GINT_TO_POINTER (fusa_user_get_uid (value)));
+      return TRUE;
     }
+  else
+    return FALSE;
+}
+
+static void thaw (gpointer key, gpointer value, gpointer data)
+{
+  g_object_thaw_notify (value);
+}
+
+static void
+reload_passwd (FusaManager *manager)
+{
+  struct passwd *pwent;
+  
+  g_hash_table_foreach (manager->users, mark_as_old, NULL);
 
   setpwent ();
 
@@ -841,65 +949,36 @@ reload_passwd (FusaManager *manager)
       if (g_hash_table_lookup (manager->exclusions, pwent->pw_name))
 	continue;
 
+      if (g_hash_table_size (manager->inclusions) > 0)
+        {
+          if (!g_hash_table_lookup (manager->inclusions, pwent->pw_name))
+            continue;
+        }
+      else if (!manager->include_all)
+        continue;
+      
       user = g_hash_table_lookup (manager->users, pwent->pw_name);
 
-      /* Update users already in the *new* list */
-      if (g_slist_find (new_users, user))
-	{
-	  _fusa_user_update (user, pwent);
-	  continue;
-	}
-
-      if (!user)
-	user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
-      else
-	g_object_ref (user);
+      if (!user) 
+        {
+	  user = g_object_new (FUSA_TYPE_USER, "manager", manager, NULL);
+          g_hash_table_insert (manager->users,
+	  		       g_strdup (pwent->pw_name),
+			       user);
+          g_hash_table_insert (manager->users_by_uid,
+			       GINT_TO_POINTER (pwent->pw_uid),
+			       g_object_ref (user));
+        }
 
-      /* Freeze & update users not already in the new list */
       g_object_freeze_notify (G_OBJECT (user));
       _fusa_user_update (user, pwent);
-
-      new_users = g_slist_prepend (new_users, user);
+      set_flag (G_OBJECT (user), NEW_FLAG);
     }
   
   endpwent ();
 
-  /* Go through and handle added users */
-  for (list = new_users; list; list = list->next)
-    {
-      if (!g_slist_find (old_users, list->data))
-	{
-	  g_hash_table_insert (manager->users,
-			       g_strdup (fusa_user_get_user_name (list->data)),
-			       g_object_ref (list->data));
-	  g_hash_table_insert (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)),
-			       list->data);
-	  g_signal_emit (manager, signals[USER_ADDED], 0, list->data);
-	}
-    }
-
-  /* Go through and handle removed users */
-  for (list = old_users; list; list = list->next)
-    {
-      if (!g_slist_find (new_users, list->data))
-	{
-	  g_signal_emit (manager, signals[USER_REMOVED], 0, list->data);
-	  g_hash_table_remove (manager->users_by_uid,
-			       GINT_TO_POINTER (fusa_user_get_uid (list->data)));
-	  g_hash_table_remove (manager->users,
-			       fusa_user_get_user_name (list->data));
-          /* FIXME: signals[USER_REMOVED]??? Why not? */
-	}
-    }
-
-  /* Cleanup */
-  g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
-  g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (new_users);
-
-  g_slist_foreach (old_users, (GFunc) g_object_unref, NULL);
-  g_slist_free (old_users);
+  g_hash_table_foreach_remove (manager->users, emit_add_or_remove, manager);
+  g_hash_table_foreach (manager->users, thaw, NULL);
 }
 
 
diff -up fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users fast-user-switch-applet-2.18.0/src/fusa-user.c
--- fast-user-switch-applet-2.18.0/src/fusa-user.c.many-users	2007-04-09 12:01:02.000000000 -0400
+++ fast-user-switch-applet-2.18.0/src/fusa-user.c	2007-09-17 01:56:45.000000000 -0400
@@ -81,6 +81,7 @@ struct _FusaUser
   gchar *display_name;
   gchar *home_dir;
   gchar *shell;
+  gchar *key;
 
   GSList *displays;
 };
@@ -444,6 +445,9 @@ _fusa_user_update (FusaUser            *
       g_object_notify (G_OBJECT (user), "shell");
     }
 
+  g_free (user->key);
+  user->key = NULL;
+
   g_object_thaw_notify (G_OBJECT (user));
 }
 
@@ -684,12 +688,28 @@ fusa_user_render_icon (FusaUser  *user,
   return _fusa_manager_render_icon (user->manager, user, widget, icon_size);
 }
 
+static gchar *
+get_collate_key (FusaUser *user)
+{
+  if (!user->key)
+    {
+      gchar *str;
+
+      if (user->display_name)
+        str = user->display_name;
+      else
+        str = user->username;
+
+      user->key = g_utf8_collate_key (str, -1);
+    }
+
+  return user->key;
+}
+
 gint
 fusa_user_collate (FusaUser *user1,
 		   FusaUser *user2)
 {
-  const gchar *str1, *str2;
-
   g_return_val_if_fail (user1 == NULL || FUSA_IS_USER (user1), 0);
   g_return_val_if_fail (user2 == NULL || FUSA_IS_USER (user2), 0);
 
@@ -702,24 +722,5 @@ fusa_user_collate (FusaUser *user1,
   if (!user1 && !user2)
     return 0;
 
-  if (user1->display_name)
-    str1 = user1->display_name;
-  else
-    str1 = user1->username;
-
-  if (user2->display_name)
-    str2 = user2->display_name;
-  else
-    str2 = user2->username;
-
-  if (!str1 && str2)
-    return -1;
-
-  if (str1 && !str2)
-    return 1;
-
-  if (!str1 && !str2)
-    return 0;
-
-  return g_utf8_collate (str1, str2);
+  return strcmp (get_collate_key (user1), get_collate_key (user2));
 }


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/fast-user-switch-applet/F-7/fast-user-switch-applet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fast-user-switch-applet.spec	30 Mar 2007 20:10:54 -0000	1.13
+++ fast-user-switch-applet.spec	19 Sep 2007 13:51:01 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fast-user-switch-applet
 Version:        2.17.4 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A panel applet for user-switching 
 Group:          User Interface/Desktops
 License:        GPL
@@ -16,6 +16,8 @@
 Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=412541 
 Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=477666
+Patch6:		many-users.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +52,7 @@
 %patch3 -p1 -b .no-session
 %patch4 -p1 -b .bug-buddy
 %patch5 -p1 -b .socket-check
+%patch6 -p1 -b .many-users
 
 %build
 %configure --disable-scrollkeeper \
@@ -105,6 +108,9 @@
 %{_datadir}/omf/fast-user-switch-applet
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-5
+- Make the handling of large numbers of users more efficient (#353831)
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-4
 - Add bugzilla information to the .server file
 - Fix a bug in the gdm socket check 



From fedora-extras-commits at redhat.com  Wed Sep 19 13:56:24 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 09:56:24 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.27.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.141, 1.142 sources, 1.146,
	1.147 system-config-printer.spec, 1.129,
	1.130 pycups-1.9.26.tar.bz2.sig, 1.1, NONE
Message-ID: <200709191356.l8JDuOiu005315@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5283

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.27.tar.bz2.sig 
Removed Files:
	pycups-1.9.26.tar.bz2.sig 
Log Message:
* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.27.



--- NEW FILE pycups-1.9.27.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	12 Sep 2007 13:13:31 -0000	1.141
+++ .cvsignore	19 Sep 2007 13:55:51 -0000	1.142
@@ -137,3 +137,4 @@
 system-config-printer-0.7.74.tar.bz2
 system-config-printer-0.7.74.1.tar.bz2
 pycups-1.9.26.tar.bz2
+pycups-1.9.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- sources	12 Sep 2007 13:13:31 -0000	1.146
+++ sources	19 Sep 2007 13:55:51 -0000	1.147
@@ -1,2 +1,2 @@
 b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
-7819b0749172f01162c11e9a9f01dea2  pycups-1.9.26.tar.bz2
+20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- system-config-printer.spec	12 Sep 2007 13:13:31 -0000	1.129
+++ system-config-printer.spec	19 Sep 2007 13:55:51 -0000	1.130
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.26
+%define pycups_version 1.9.27
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -128,6 +128,9 @@
 fi
 
 %changelog
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.27.
+
 * Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
 - Updated pycups to 1.9.26.
 - Build requires epydoc.  Ship HTML documentation.


--- pycups-1.9.26.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 13:58:35 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 19 Sep 2007 09:58:35 -0400
Subject: rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.22, 1.23 sources, 
	1.22, 1.23 sugar-presence-service.spec, 1.22, 1.23
Message-ID: <200709191358.l8JDwZe4005494@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/sugar-presence-service/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Wed Sep 19 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.18.20070918git6df1f3eca5
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Sep 2007 20:30:33 -0000	1.22
+++ .cvsignore	19 Sep 2007 13:58:03 -0000	1.23
@@ -1 +1,2 @@
 sugar-presence-service-0.65-git46898a3e00.tar.bz2
+sugar-presence-service-0.65-git6df1f3eca5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Sep 2007 20:30:33 -0000	1.22
+++ sources	19 Sep 2007 13:58:03 -0000	1.23
@@ -1 +1 @@
-0af58d6647aef1a3c606c447db4164ec  sugar-presence-service-0.65-git46898a3e00.tar.bz2
+4de90bb058164e15438fa7358fd43c9e  sugar-presence-service-0.65-git6df1f3eca5.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-presence-service/OLPC-2/sugar-presence-service.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sugar-presence-service.spec	17 Sep 2007 20:30:33 -0000	1.22
+++ sugar-presence-service.spec	19 Sep 2007 13:58:03 -0000	1.23
@@ -1,9 +1,9 @@
-%define alphatag 20070917git
-%define commitid 46898a3e00
+%define alphatag 20070919git
+%define commitid 6df1f3eca5
 
 Name: sugar-presence-service
 Version: 0.65
-Release: 0.17.%{alphatag}46898a3e00
+Release: 0.18.%{alphatag}6df1f3eca5
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Wed Sep 19 2007 Dan Williams <dcbw at redhat.com> - 0.65-0.18.20070918git6df1f3eca5
+- New snapshot
+
 * Mon Sep 17 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.17.20070917git46898a3e00
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 14:01:12 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 19 Sep 2007 10:01:12 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.2.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.142, 1.143 sources, 1.147, 1.148 system-config-printer.spec,
	1.130, 1.131
Message-ID: <200709191401.l8JE1CBe011650@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5676

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.2.tar.bz2.sig 
Log Message:
- 0.7.74.2:
  - When a class is removed on the server, remove it from the UI.
  - When deleting a printer, select the default printer again.
  - Select newly-copied printer.
  - Updated translation (fi).
  - Better --help message.
  - Use strcoll to sort manufacturer names.
  - Avoid duplicate 'recommended' marks.
  - Remove duplicate device URIs.
  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).


--- NEW FILE system-config-printer-0.7.74.2.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- .cvsignore	19 Sep 2007 13:55:51 -0000	1.142
+++ .cvsignore	19 Sep 2007 14:00:40 -0000	1.143
@@ -138,3 +138,4 @@
 system-config-printer-0.7.74.1.tar.bz2
 pycups-1.9.26.tar.bz2
 pycups-1.9.27.tar.bz2
+system-config-printer-0.7.74.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	19 Sep 2007 13:55:51 -0000	1.147
+++ sources	19 Sep 2007 14:00:40 -0000	1.148
@@ -1,2 +1,2 @@
-b552088b418f7da5f55b24024f8bdd51  system-config-printer-0.7.74.1.tar.bz2
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
+f5f78d97282eab2e33a302025f31f74e  system-config-printer-0.7.74.2.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- system-config-printer.spec	19 Sep 2007 13:55:51 -0000	1.130
+++ system-config-printer.spec	19 Sep 2007 14:00:40 -0000	1.131
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74.1
+Version: 0.7.74.2
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -128,8 +128,18 @@
 fi
 
 %changelog
-* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-1
 - Updated pycups to 1.9.27.
+- 0.7.74.2:
+  - When a class is removed on the server, remove it from the UI.
+  - When deleting a printer, select the default printer again.
+  - Select newly-copied printer.
+  - Updated translation (fi).
+  - Better --help message.
+  - Use strcoll to sort manufacturer names.
+  - Avoid duplicate 'recommended' marks.
+  - Remove duplicate device URIs.
+  - Handle IPP_TAG_NOVALUE attributes (for CUPS 1.3.x).
 
 * Wed Sep 12 2007 Tim Waugh <twaugh at redhat.com>
 - Updated pycups to 1.9.26.



From fedora-extras-commits at redhat.com  Wed Sep 19 14:01:18 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 10:01:18 -0400
Subject: rpms/kanatest/F-7 kanatest.spec,1.7,1.8
Message-ID: <200709191401.l8JE1I4w011714@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5674

Modified Files:
	kanatest.spec 
Log Message:
Update to 0.4.4



Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/F-7/kanatest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kanatest.spec	19 Sep 2007 13:50:08 -0000	1.7
+++ kanatest.spec	19 Sep 2007 14:00:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,10 +54,11 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
-* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-2
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
 - Update to upstream release 0.4.4
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3



From fedora-extras-commits at redhat.com  Wed Sep 19 14:07:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 10:07:55 -0400
Subject: rpms/kanatest/FC-6 .cvsignore, 1.3, 1.4 kanatest.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200709191407.l8JE7tPd012253@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/kanatest/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	.cvsignore kanatest.spec sources 
Log Message:
Update to upstream 0.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2007 15:04:42 -0000	1.3
+++ .cvsignore	19 Sep 2007 14:07:22 -0000	1.4
@@ -1 +1 @@
-kanatest-0.4.2.tar.gz
+kanatest-0.4.4.tar.gz


Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/kanatest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kanatest.spec	21 Jun 2007 15:04:42 -0000	1.6
+++ kanatest.spec	19 Sep 2007 14:07:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kanatest
-Version:        0.4.2
-Release:        2%{?dist}
+Version:        0.4.4
+Release:        3%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -54,9 +54,16 @@
 %{_bindir}/kanatest
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/kanatest.svg
+%{_datadir}/pixmaps/kanatest.png
 
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.4-3
+- Update to upstream release 0.4.4
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.4.2-3
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jun 21 2007 Robert Marcano <robert at marcanoonline.com> - 0.4.2-2
 - Update to upstream release 0.4.2 - Bug 245177
 - URL changed - Bug 245177


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kanatest/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2007 15:04:42 -0000	1.3
+++ sources	19 Sep 2007 14:07:22 -0000	1.4
@@ -1 +1 @@
-93e151713ada6c1dc69211ef60803899  kanatest-0.4.2.tar.gz
+9257d25d917630056dacf355a1c05c9f  kanatest-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 14:54:18 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Wed, 19 Sep 2007 10:54:18 -0400
Subject: rpms/evolution/devel evolution-2.11.92-icon-names.patch, 1.2,
	1.3 evolution.spec, 1.292, 1.293
Message-ID: <200709191454.l8JEsIXF013620@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13590

Modified Files:
	evolution-2.11.92-icon-names.patch evolution.spec 
Log Message:

* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-3.fc8
- Re-enable the inline audio plugin since it now uses GStreamer 0.10.


evolution-2.11.92-icon-names.patch:

Index: evolution-2.11.92-icon-names.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.11.92-icon-names.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.11.92-icon-names.patch	19 Sep 2007 12:06:27 -0000	1.2
+++ evolution-2.11.92-icon-names.patch	19 Sep 2007 14:53:43 -0000	1.3
@@ -1329,7 +1329,7 @@
 -	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 +	E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU),
@@ -1409,7 +1409,7 @@
  	E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU),
  	E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/menu/File/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU),
  	
@@ -1518,7 +1518,7 @@
  
  static EPixmap pixmaps[] = {
 +	E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
-+	E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU),
++	E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
@@ -1526,7 +1526,7 @@
 +	E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
 +
 +	E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
-+	E_PIXMAP ("/Toolbar/FileClose", "dialog-close", E_ICON_SIZE_LARGE_TOOLBAR),
++	E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
  	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
 -	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
  


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- evolution.spec	19 Sep 2007 12:06:27 -0000	1.292
+++ evolution.spec	19 Sep 2007 14:53:43 -0000	1.293
@@ -19,7 +19,7 @@
 %define evo_major 2.12
 
 %define exchange_support 1
-%define inline_audio_support 0
+%define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
 %define krb5_support 1
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -185,7 +185,7 @@
 
 %if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
-BuildRequires: gstreamer08-devel
+BuildRequires: gstreamer-devel
 %endif
 
 %if %{ldap_support} 
@@ -708,10 +708,10 @@
 %files help -f help.lang
 %dir %{_datadir}/omf/evolution
 
-# Look into re-enabling the inline-audio plugin once 2.12 ships.
-# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
-
 %changelog
+* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-3.fc8
+- Re-enable the inline audio plugin since it now uses GStreamer 0.10.
+
 * Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-2.fc8
 - Revise patch for GNOME bug #477045 (less-zealous icon renaming).
 



From fedora-extras-commits at redhat.com  Wed Sep 19 14:56:48 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 19 Sep 2007 10:56:48 -0400
Subject: rpms/alsa-utils/devel alsa-utils-1.0.14-statedir.patch,NONE,1.1
Message-ID: <200709191456.l8JEumYA013718@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13708

Added Files:
	alsa-utils-1.0.14-statedir.patch 
Log Message:
added missing path

alsa-utils-1.0.14-statedir.patch:

--- NEW FILE alsa-utils-1.0.14-statedir.patch ---
--- alsa-utils-1.0.14/alsaconf/alsaconf.in~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/alsaconf.in	2007-08-26 22:40:21.000000000 +0300
@@ -938,8 +938,8 @@ If you have a big amplifier, lower your 
 	  aplay -N $TESTSOUND
       fi
     fi
-    if [ ! -r /etc/asound.state ]; then
-	xecho "Saving the mixer setup used for this in /etc/asound.state."
+    if [ ! -r /var/lib/alsa/asound.state ]; then
+	xecho "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
 	$sbindir/alsactl store
     fi
     clear
--- alsa-utils-1.0.14/alsaconf/po/ja.po~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/po/ja.po	2007-08-26 22:40:43.000000000 +0300
@@ -203,8 +203,8 @@ msgstr ""
 "  ??????????????????????????????????????????????????????????????????\n"
 
 #: ../alsaconf.in:932
-msgid "Saving the mixer setup used for this in /etc/asound.state."
-msgstr "???????????????????????? /etc/asound.state ??????????????????"
+msgid "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
+msgstr "???????????????????????? /var/lib/alsa/asound.state ??????????????????"
 
 #: ../alsaconf.in:936
 msgid ""
--- alsa-utils-1.0.14/alsaconf/po/ru.po~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsaconf/po/ru.po	2007-08-26 22:40:34.000000000 +0300
@@ -211,8 +211,8 @@ msgstr ""
 "  ?? ???????????????????????????? ?????? ???? ?????????????? ???????????????? ????????????.\n"
 
 #: ../alsaconf.in:932
-msgid "Saving the mixer setup used for this in /etc/asound.state."
-msgstr "?????????????????? ?????????????????? ?????????????? ?? /etc/asound.state."
+msgid "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
+msgstr "?????????????????? ?????????????????? ?????????????? ?? /var/lib/alsa/asound.state."
 
 #: ../alsaconf.in:936
 msgid ""
--- alsa-utils-1.0.14/alsactl/alsactl.1~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsactl/alsactl.1	2007-08-26 22:40:03.000000000 +0300
@@ -35,7 +35,7 @@ Help: show available flags and commands.
 
 .TP
 \fI\-f, \-\-file\fP
-Select the configuration file to use. The default is /etc/asound.state or
+Select the configuration file to use. The default is /var/lib/alsa/asound.state or
 /etc/asound.names (for the \fInames\fP command).
 
 .TP
@@ -52,7 +52,7 @@ Use debug mode: a bit more verbose.
 Print alsactl version number.
 
 .SH FILES
-\fI/etc/asound.state\fP (or whatever file you specify with the
+\fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the
 \fB\-f\fP flag) is used to store current settings for your
 soundcards. The settings include all the usual soundcard mixer
 settings.  More importantly, alsactl is
--- alsa-utils-1.0.14/alsactl/alsactl.c~	2007-05-31 11:07:21.000000000 +0300
+++ alsa-utils-1.0.14/alsactl/alsactl.c	2007-08-26 22:40:10.000000000 +0300
@@ -30,7 +30,7 @@
 #include <alsa/asoundlib.h>
 #include "alsactl.h"
 
-#define SYS_ASOUNDRC "/etc/asound.state"
+#define SYS_ASOUNDRC "/var/lib/alsa/asound.state"
 #define SYS_ASOUNDNAMES "/etc/asound.names"
 
 int debugflag = 0;



From fedora-extras-commits at redhat.com  Wed Sep 19 15:09:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 19 Sep 2007 11:09:12 -0400
Subject: rpms/iproute/devel iproute2-ss050901-opt_flags.patch,1.2,1.3
Message-ID: <200709191509.l8JF9CRf020198@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20123

Added Files:
	iproute2-ss050901-opt_flags.patch 
Log Message:
Remove correct patch and readd one.


iproute2-ss050901-opt_flags.patch:

Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: iproute2-ss050901-opt_flags.patch
diff -N iproute2-ss050901-opt_flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ iproute2-ss050901-opt_flags.patch	19 Sep 2007 15:09:09 -0000	1.3
@@ -0,0 +1,11 @@
+--- iproute2-ss050901/Makefile.opt_flags	2005-09-23 11:49:01.000000000 +0200
++++ iproute2-ss050901/Makefile	2005-09-23 11:49:31.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ CC = gcc
+ HOSTCC = gcc
+-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS)
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:09:32 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 19 Sep 2007 11:09:32 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.59,1.60
Message-ID: <200709191509.l8JF9WSp020204@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/libdhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156

Modified Files:
	libdhcp.spec 
Log Message:
* Wed Sep 19 2007 David Cantrell <dcantrell at redhat.com> - 1.27-3
- static package Requires libdhcp6client-static



Index: libdhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libdhcp.spec	21 Aug 2007 17:25:58 -0000	1.59
+++ libdhcp.spec	19 Sep 2007 15:09:00 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A library for network interface configuration with DHCP
 Name:    libdhcp
 Version: 1.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   Development/Libraries
 URL:     http://dcantrel.fedorapeople.org/%{name}
@@ -32,7 +32,8 @@
 %package static
 Summary:  Static archive of libdhcp
 Group:    Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}, libdhcp4client-static
+Requires: %{name}-devel = %{version}-%{release}
+Requires: libdhcp4client-static libdhcp6client-static
 
 %description static
 The libdhcp-static package contains the static archive for libdhcp.
@@ -70,6 +71,9 @@
 %{_libdir}/libdhcp.a
 
 %changelog
+* Wed Sep 19 2007 David Cantrell <dcantrell at redhat.com> - 1.27-3
+- static package Requires libdhcp6client-static
+
 * Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 1.27-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:10:25 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:10:25 -0400
Subject: rpms/gdm/devel hang.patch,NONE,1.1 gdm.spec,1.287,1.288
Message-ID: <200709191510.l8JFAPIN020290@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20210

Modified Files:
	gdm.spec 
Added Files:
	hang.patch 
Log Message:
fix a hang


hang.patch:

--- NEW FILE hang.patch ---
--- trunk/gui/gdmcommon.c	2007/09/18 14:48:25	5279
+++ trunk/gui/gdmcommon.c	2007/09/18 18:39:42	5280
@@ -681,7 +681,9 @@
 	g_spawn_async (".",
 		       pre_fetch_prog_argv,
 		       NULL,
-		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
+		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH | 
+                              G_SPAWN_STDOUT_TO_DEV_NULL |
+                              G_SPAWN_STDERR_TO_DEV_NULL),
 		       NULL,
 		       NULL,
 		       &pid,
@@ -710,7 +712,9 @@
 	g_spawn_async (".",
 		       atspi_prog_argv,
 		       NULL,
-		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH),
+		       (GSpawnFlags) (G_SPAWN_SEARCH_PATH |
+                              G_SPAWN_STDOUT_TO_DEV_NULL |
+                              G_SPAWN_STDERR_TO_DEV_NULL),
 		       NULL,
 		       NULL,
 		       &pid,


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- gdm.spec	18 Sep 2007 05:08:54 -0000	1.287
+++ gdm.spec	19 Sep 2007 15:09:52 -0000	1.288
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -55,6 +55,9 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164
 Patch37: gdm-2.19.8-selinux.patch
 
+# fixed in upstream svn
+Patch38: hang.patch
+
 Patch100: gdm-2.19.8-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -139,6 +142,7 @@
 %patch33 -p1 -b .pass-ats-to-session
 %patch35 -p1 -b .gdmsetup-path
 %patch37 -p1 -b .selinux
+%patch38 -p1 -b .hang
 
 %patch100 -p1 -b .change-defaults
 
@@ -351,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-2
+- Fix a hang on restart (#240853)
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 19 15:10:47 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 19 Sep 2007 11:10:47 -0400
Subject: rpms/iproute/devel cbq-0.7.1-avpkt-enhancement.patch,1.1,NONE
Message-ID: <200709191510.l8JFAlAi020316@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Removed Files:
	cbq-0.7.1-avpkt-enhancement.patch 
Log Message:
Now really remove unused patch.



--- cbq-0.7.1-avpkt-enhancement.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:18:22 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:18:22 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.41, 1.42 libgnomeui.spec, 1.78, 
	1.79 sources, 1.41, 1.42
Message-ID: <200709191518.l8JFIMoW020581@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/libgnomeui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20552

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	30 Jul 2007 22:30:26 -0000	1.41
+++ .cvsignore	19 Sep 2007 15:17:49 -0000	1.42
@@ -1 +1 @@
-libgnomeui-2.19.1.tar.bz2
+libgnomeui-2.20.0.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- libgnomeui.spec	23 Aug 2007 18:16:52 -0000	1.78
+++ libgnomeui.spec	19 Sep 2007 15:17:49 -0000	1.79
@@ -17,10 +17,10 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.19.1
-Release: 3%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnomeui/2.19/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnomeui/2.20/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -142,6 +142,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 2.19.1-3
 - Rebuild for ppc toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomeui/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	30 Jul 2007 22:30:26 -0000	1.41
+++ sources	19 Sep 2007 15:17:49 -0000	1.42
@@ -1 +1 @@
-a579b176321f55325135bcd8593243b1  libgnomeui-2.19.1.tar.bz2
+1b4e98c8c34f69e456378316eab9289b  libgnomeui-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:26:08 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:26:08 -0400
Subject: rpms/GConf2/devel .cvsignore, 1.29, 1.30 GConf2.spec, 1.64,
	1.65 sources, 1.29, 1.30
Message-ID: <200709191526.l8JFQ8kh021156@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21072

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	25 Jun 2007 21:48:06 -0000	1.29
+++ .cvsignore	19 Sep 2007 15:25:35 -0000	1.30
@@ -1 +1 @@
-GConf-2.19.1.tar.bz2
+GConf-2.20.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- GConf2.spec	11 Sep 2007 19:54:13 -0000	1.64
+++ GConf2.spec	19 Sep 2007 15:25:35 -0000	1.65
@@ -4,11 +4,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.19.1
-Release: 5%{?dist}
+Version: 2.20.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
-Source: http://download.gnome.org/sources/GConf/2.19/GConf-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 
@@ -131,6 +131,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Tue Sep 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1-5
 - Some more leak fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	25 Jun 2007 21:48:06 -0000	1.29
+++ sources	19 Sep 2007 15:25:35 -0000	1.30
@@ -1 +1 @@
-78373f2a461354c7e0b32c0dc9c586b3  GConf-2.19.1.tar.bz2
+a6d82dee79df11b6e38b19cb42197d32  GConf-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:39:20 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 19 Sep 2007 11:39:20 -0400
Subject: fedora-security/audit fc6,1.262,1.263 fc7,1.110,1.111
Message-ID: <200709191539.l8JFdKiF024682@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24650/audit

Modified Files:
	fc6 fc7 
Log Message:
Few more issues.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- fc6	19 Sep 2007 13:24:50 -0000	1.262
+++ fc6	19 Sep 2007 15:39:17 -0000	1.263
@@ -7,7 +7,10 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
-CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9 ?)
+CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8
+CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
@@ -21,6 +24,8 @@
 CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
+CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
+CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc7	19 Sep 2007 13:24:50 -0000	1.110
+++ fc7	19 Sep 2007 15:39:17 -0000	1.111
@@ -11,11 +11,14 @@
 GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-CVE-2007-4897 version (ekiga, version 2.0.9 ?) 
+CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
+CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
 CVE-2007-4752 VULNERABLE (openssh) #280461
@@ -36,7 +39,7 @@
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
-CVE-2007-4558 version (star, fixed 1.5a84) [since FEDORA-2007-1852]
+CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
 CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 CVE-2007-4542 version (mapserver, fixed 4.10.3) #256561 [since FEDORA-2007-2018]
 CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]



From fedora-extras-commits at redhat.com  Wed Sep 19 15:39:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:39:55 -0400
Subject: rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.12,1.13
Message-ID: <200709191539.l8JFdtoo024756@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24656

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-subclipse.spec	10 Sep 2007 15:18:16 -0000	1.12
+++ eclipse-subclipse.spec	19 Sep 2007 15:39:22 -0000	1.13
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 15:44:29 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 11:44:29 -0400
Subject: rpms/gnome-themes/devel .cvsignore, 1.50, 1.51 gnome-themes.spec,
	1.96, 1.97 sources, 1.55, 1.56
Message-ID: <200709191544.l8JFiTTZ025320@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25229

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	4 Sep 2007 03:47:07 -0000	1.50
+++ .cvsignore	19 Sep 2007 15:43:56 -0000	1.51
@@ -1 +1 @@
-gnome-themes-2.19.92.tar.bz2
+gnome-themes-2.20.0.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-themes.spec	4 Sep 2007 03:47:07 -0000	1.96
+++ gnome-themes.spec	19 Sep 2007 15:43:56 -0000	1.97
@@ -2,10 +2,10 @@
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.19.92
+Version: 2.20.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
-Source: http://download.gnome.org/sources/gnome-themes/2.19/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-themes/2.20/%{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
 Patch1: clearlooks-0.5-inherit-bluecurve.patch
 Patch2: gnome-themes-2.17.92-clearlooks.patch
@@ -105,6 +105,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	4 Sep 2007 03:47:07 -0000	1.55
+++ sources	19 Sep 2007 15:43:56 -0000	1.56
@@ -1,2 +1,2 @@
-b556ea726a1adbe2bf5f20cea14a9e89  gnome-themes-2.19.92.tar.bz2
+862b436d77ff4dcf14849524d33c296c  gnome-themes-2.20.0.tar.bz2
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 15:47:04 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:47:04 -0400
Subject: rpms/javasvn/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191547.l8JFl40f025674@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25629

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, renamed to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:47:56 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:47:56 -0400
Subject: rpms/javasvn/F-7 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191547.l8JFluqh025844@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25801

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, remaned to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:48:21 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:48:21 -0400
Subject: rpms/javasvn/FC-6 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200709191548.l8JFmL8A025942@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25921

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, remaned to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:49:01 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 11:49:01 -0400
Subject: rpms/javasvn/FC-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE javasvn.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200709191549.l8JFn1b2026125@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/javasvn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26083

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile javasvn.spec sources 
Log Message:
Dead package, renamed to svnkit



--- NEW FILE dead.package ---
Renamed to svnkit


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- javasvn.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 15:52:16 2007
From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk))
Date: Wed, 19 Sep 2007 11:52:16 -0400
Subject: rpms/wdaemon/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wdaemon.spec, 1.1, 1.2
Message-ID: <200709191552.l8JFqGMf026605@cvs-int.fedora.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/wdaemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503

Modified Files:
	.cvsignore sources wdaemon.spec 
Log Message:
* updating to upstream version 0.12




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2007 12:58:58 -0000	1.2
+++ .cvsignore	19 Sep 2007 15:51:44 -0000	1.3
@@ -1 +1,2 @@
 wdaemon-0.11.tar.bz2
+wdaemon-0.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2007 12:58:58 -0000	1.2
+++ sources	19 Sep 2007 15:51:44 -0000	1.3
@@ -1 +1,2 @@
 ccf216d77a096613aa7ddc9da7976102  wdaemon-0.11.tar.bz2
+3ca0ff8aad51a12a6deb1fe0734da33c  wdaemon-0.12.tar.bz2


Index: wdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdaemon/devel/wdaemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wdaemon.spec	11 Sep 2007 12:58:58 -0000	1.1
+++ wdaemon.spec	19 Sep 2007 15:51:44 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		wdaemon
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	Hotplug helper for Wacom X.org driver
 
@@ -63,6 +63,9 @@
 %{_sysconfdir}/udev/scripts/is_uinput.sh
 
 %changelog
+* Wed Sep 19 2007 Aristeu Rozanski <arozansk at redhat.com> 0.12-1
+- Updated to version 0.12
+
 * Wed Aug 01 2007 Aristeu Rozanski <arozansk at redhat.com> 0.11-1
 - Updated to version 0.11
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:04:24 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:04:24 -0400
Subject: rpms/eclipse-subclipse/F-7 eclipse-subclipse.spec,1.6,1.7
Message-ID: <200709191604.l8JG4OIc000919@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv890

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-subclipse.spec	18 Sep 2007 13:54:04 -0000	1.6
+++ eclipse-subclipse.spec	19 Sep 2007 16:03:36 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 16:07:11 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:07:11 -0400
Subject: rpms/ganymed-ssh2/EL-5 ganymed-ssh2.spec,1.4,1.5
Message-ID: <200709191607.l8JG7Btt001009@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/ganymed-ssh2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv978

Modified Files:
	ganymed-ssh2.spec 
Log Message:
Build for all supported arquitectures



Index: ganymed-ssh2.spec
===================================================================
RCS file: /cvs/extras/rpms/ganymed-ssh2/EL-5/ganymed-ssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganymed-ssh2.spec	10 Oct 2006 13:59:59 -0000	1.4
+++ ganymed-ssh2.spec	19 Sep 2007 16:06:38 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ganymed-ssh2
 Version:        210
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -24,7 +24,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:		%{ix86} x86_64 ppc ia64
+#ExclusiveArch:		%{ix86} x86_64 ppc ia64
 %else
 BuildArch:		noarch
 %endif
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 210-5
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 210-4
+- Rebuild for selinux ppc32 issue.
+
 * Tue Oct 10 2006 Robert Marcano <robert at marcanoonline.com> 210-2
 - Update to upstream release 210
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:08:21 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 12:08:21 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 sugar-datastore.spec, 1.28, 1.29
Message-ID: <200709191608.l8JG8LVj001100@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1070

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	18 Sep 2007 18:50:22 -0000	1.27
+++ .cvsignore	19 Sep 2007 16:07:48 -0000	1.28
@@ -1 +1 @@
-sugar-datastore-0.2.2-git48ab782a01.tar.bz2
+sugar-datastore-0.2.2-git11013dc3ca.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Sep 2007 18:50:22 -0000	1.27
+++ sources	19 Sep 2007 16:07:48 -0000	1.28
@@ -1 +1 @@
-442e68e24e4d8ae5dd161733efb66852  sugar-datastore-0.2.2-git48ab782a01.tar.bz2
+8e3bae187edcaaef8ca3d69976d6a331  sugar-datastore-0.2.2-git11013dc3ca.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sugar-datastore.spec	18 Sep 2007 18:50:22 -0000	1.28
+++ sugar-datastore.spec	19 Sep 2007 16:07:48 -0000	1.29
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070918git
-%define commitid 48ab782a01
+%define alphatag 20070919git
+%define commitid 11013dc3ca
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.24.%{alphatag}48ab782a01
+Release: 0.25.%{alphatag}11013dc3ca
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.24.20070918git48ab782a01
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:08:55 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:08:55 -0400
Subject: rpms/svnkit/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 svnkit.spec,
	1.1, 1.2
Message-ID: <200709191608.l8JG8tZx001168@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1097

Modified Files:
	.cvsignore sources svnkit.spec 
Log Message:
- Update to upstream 1.1.4
- Build for all supported arquitectures 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2007 15:16:23 -0000	1.2
+++ .cvsignore	19 Sep 2007 16:08:22 -0000	1.3
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.2.src.zip
+org.tmatesoft.svn_1.1.4.src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2007 15:16:23 -0000	1.2
+++ sources	19 Sep 2007 16:08:22 -0000	1.3
@@ -1 +1 @@
-a710e0195f404b644ca97808b78c69da  org.tmatesoft.svn_1.1.2.src.zip
+f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/EL-5/svnkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svnkit.spec	20 Jun 2007 15:16:23 -0000	1.1
+++ svnkit.spec	19 Sep 2007 16:08:22 -0000	1.2
@@ -2,8 +2,8 @@
 
 
 Name:           svnkit
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -25,7 +25,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -118,6 +118,13 @@
 
 
 %changelog
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
+- Update to upstream 1.1.4
+- Build for all supported arquitectures 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Mon Jun 18 2007 Robert Marcano <robert at marcanoonline.com> 1.1.2-2
 - Package review fixes
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:14:26 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 12:14:26 -0400
Subject: rpms/sugar/OLPC-2 sources,1.56,1.57 sugar.spec,1.67,1.68
Message-ID: <200709191614.l8JGEQTr001405@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1324

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	18 Sep 2007 18:47:43 -0000	1.56
+++ sources	19 Sep 2007 16:13:54 -0000	1.57
@@ -1 +1 @@
-8a8612c93c6e9a8283f002f10a48665c  sugar-0.65-gitb8ce5083b7.tar.bz2
+cfe2b46a134d04f3fe439e397bc311fa  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sugar.spec	18 Sep 2007 18:47:43 -0000	1.67
+++ sugar.spec	19 Sep 2007 16:13:54 -0000	1.68
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070918git
+%define alphatag 20070919git
 %define commitid b8ce5083b7
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.52.%{alphatag}b8ce5083b7
+Release: 0.53.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
+- New snapshot
+
 * Tue Sep 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.52.20070918gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:28:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:28:48 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.58, 1.59 fedora-logos.spec,
	1.82, 1.83 sources, 1.63, 1.64
Message-ID: <200709191628.l8JGSmvw001967@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1907

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
add infinity lock dialog



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	13 Sep 2007 20:52:24 -0000	1.58
+++ .cvsignore	19 Sep 2007 16:28:15 -0000	1.59
@@ -1 +1 @@
-fedora-logos-7.92.1.tar.bz2
+fedora-logos-7.92.2.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fedora-logos.spec	14 Sep 2007 20:17:34 -0000	1.82
+++ fedora-logos.spec	19 Sep 2007 16:28:15 -0000	1.83
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.1
-Release: 2%{?dist}
+Version: 7.92.2
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 
@@ -203,8 +203,8 @@
 # end i386 bits
 
 %changelog
-* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-2-
-- regen tarball
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.2-1
+- Add infinity lock dialog
 
 * Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
 - add the powered-by logo (#250676)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	14 Sep 2007 20:17:34 -0000	1.63
+++ sources	19 Sep 2007 16:28:15 -0000	1.64
@@ -1 +1 @@
-e598b9fd821a022d4e7185c1ff8653c9  fedora-logos-7.92.1.tar.bz2
+f2a6536f710f5dda2b5505dbaf0faafc  fedora-logos-7.92.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 16:30:48 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 19 Sep 2007 12:30:48 -0400
Subject: rpms/iptables/devel iptables.init, 1.14, 1.15 iptables.spec, 1.51,
	1.52
Message-ID: <200709191630.l8JGUm0H002099@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2065

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not depend on local_fs in lsb header - this delayes start after network
- fixed exit code for initscript usage




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iptables.init	17 Sep 2007 15:46:05 -0000	1.14
+++ iptables.init	19 Sep 2007 16:30:16 -0000	1.15
@@ -10,8 +10,6 @@
 #
 ### BEGIN INIT INFO
 # Provides: iptables
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
 # Default-Start:  2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: start and stop iptables firewall
@@ -335,7 +333,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status|panic|save}"
-	RETVAL=3
+	RETVAL=2
 	;;
 esac
 


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- iptables.spec	17 Sep 2007 15:46:05 -0000	1.51
+++ iptables.spec	19 Sep 2007 16:30:16 -0000	1.52
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-3
+- do not depend on local_fs in lsb header - this delayes start after network
+- fixed exit code for initscript usage
+
 * Mon Sep 17 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
 - do not use lock file for condrestart test
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:39:39 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:39:39 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.59, 1.60 fedora-logos.spec,
	1.83, 1.84 sources, 1.64, 1.65
Message-ID: <200709191639.l8JGddxt002350@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
add gdm infinity theme



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	19 Sep 2007 16:28:15 -0000	1.59
+++ .cvsignore	19 Sep 2007 16:39:06 -0000	1.60
@@ -1 +1 @@
-fedora-logos-7.92.2.tar.bz2
+fedora-logos-7.92.3.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fedora-logos.spec	19 Sep 2007 16:28:15 -0000	1.83
+++ fedora-logos.spec	19 Sep 2007 16:39:06 -0000	1.84
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.2
+Version: 7.92.3
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -203,6 +203,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.3-1
+- Add infinity gdm theme
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.2-1
 - Add infinity lock dialog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	19 Sep 2007 16:28:15 -0000	1.64
+++ sources	19 Sep 2007 16:39:06 -0000	1.65
@@ -1 +1 @@
-f2a6536f710f5dda2b5505dbaf0faafc  fedora-logos-7.92.2.tar.bz2
+6f5fa87bd54b34b2614799b78b05f5a9  fedora-logos-7.92.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 16:44:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 12:44:18 -0400
Subject: rpms/gdm/devel gdm-2.20.0-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.288, 1.289
Message-ID: <200709191644.l8JGiIuc002543@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2457

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.0-change-defaults.patch 
Log Message:
FedoraInfinity


gdm-2.20.0-change-defaults.patch:

--- NEW FILE gdm-2.20.0-change-defaults.patch ---
diff -up gdm-2.19.8/config/gdm.conf.in.change-defaults gdm-2.19.8/config/gdm.conf.in
--- gdm-2.19.8/config/gdm.conf.in.change-defaults	2007-09-07 11:40:58.000000000 -0400
+++ gdm-2.19.8/config/gdm.conf.in	2007-09-12 13:14:39.000000000 -0400
@@ -66,9 +66,9 @@ TimedLoginDelay=30
 # should leave this alone.
 #Chooser=@libexecdir@/gdmchooser
 
-# The greeter for attached (non-xdmcp) logins.  Change gdmlogin to gdmgreeter
-# to get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+# The greeter for attached (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@libexecdir@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,23 +78,23 @@ TimedLoginDelay=30
 # This is useful for enabling additional feature support e.g. GNOME
 # accessibility framework. Only "trusted" modules should be allowed to minimize
 # security holes
-#AddGtkModules=false
+AddGtkModules=true
 # By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener
 
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
 # Default path for root.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # If you are having trouble with using a single server for a long time and want
 # GDM to kill/restart the server, turn this on.  On Solaris, this value is
 # always true and this configuration setting is ignored.
-#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@
+AlwaysRestartServer=true
 
 # User and group used for running GDM GUI applications.  By default this is set
 # to user "gdm" and group "gdm".  This user/group should have very limited
@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
 #
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-RebootCommand=@REBOOT_COMMAND@
-HaltCommand=@HALT_COMMAND@
-SuspendCommand=@SUSPEND_COMMAND@
+#
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
 
 # The following options specify how GDM system commands are supported.
 #
@@ -158,14 +158,14 @@ ServAuthDir=@authdir@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@gdmconfdir@/Xsession
+BaseXsession=/etc/X11/xinit/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
 # like /tmp if you don't want the authorizations to be in home directories.
@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession
 # is the home directory the UserAuthFBDir will still be used in case the home
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
 # behavior.
-UserAuthDir=
+UserAuthDir=/tmp
 # Fallback directory for writing authorization file if user's home directory
 # is not writable.
 UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
+#UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
-StandardXServer=@X_SERVER@
+StandardXServer=@X_SERVER@ -br
 # The maximum number of flexible X servers to run.
 #FlexibleXServers=5
 # And after how many minutes should we reap the flexible server if there is no
@@ -209,7 +209,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_
 #DoubleLoginWarning=true
 # Should a second login always resume the current session and switch VT's on
 # Linux and FreeBSD systems for console logins
-#AlwaysLoginCurrentSession=true
+AlwaysLoginCurrentSession=true
 
 # If true then the last login information is printed to the user before being
 # prompted for password.  While this gives away some info on what users are on
@@ -246,7 +246,7 @@ SecurityTokensDriver=
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
-AllowRoot=true
+AllowRoot=false
 # Allow login as root via XDMCP.  This value will be overridden and set to
 # false if the /etc/default/login file exists and contains
 # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
@@ -356,7 +356,7 @@ Enable=false
 #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
-#GtkTheme=Default
+GtkTheme=Clearlooks
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
 # this only affects the standard greeter as the graphical greeter does not yet
 # have this ability.
@@ -377,7 +377,7 @@ Enable=false
 # themed login (gdmgreeter).
 #
 # The standard login has a title bar that the user can move.
-#TitleBar=true
+TitleBar=false
 # Don't allow user to move the standard login window.  Only makes sense if
 # TitleBar is on.
 #LockPosition=false
@@ -395,13 +395,13 @@ Enable=false
 # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude,
 # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed
 # greeter.
-Browser=false
+Browser=true
 # The default picture in the browser.
 #DefaultFace=@pixmapdir@/nobody.png
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=500
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
 # by commas.
@@ -418,7 +418,7 @@ Browser=false
 # large numbers of users and this feature should not be used in such
 # environments.  The setting of IncludeAll does nothing if Include is set to a
 # non-empty value.
-#IncludeAll=false
+IncludeAll=true
 # If user or user.png exists in this dir it will be used as his picture.
 #GlobalFaceDir=@datadir@/pixmaps/faces/
 
@@ -427,7 +427,7 @@ Browser=false
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -474,8 +474,9 @@ DefaultRemoteWelcome=true
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
 # as the background color.
-BackgroundColor=#76848F
-GraphicalThemedColor=#76848F
+BackgroundColor=#20305a
+GraphicalThemedColor=#000000
+
 # XDMCP session should only get a color, this is the sanest setting since you
 # don't want to take up too much bandwidth
 #BackgroundRemoteOnlyColor=true
@@ -496,8 +497,8 @@ GraphicalThemedColor=#76848F
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
 # use this rather then just running an xterm from a script.
-#ShowGnomeFailsafeSession=true
-#ShowXtermFailsafeSession=true
+ShowGnomeFailsafeSession=false
+ShowXtermFailsafeSession=false
 # Normally there is a session type called 'Last' that is shown which refers to
 # the last session the user used.  If off, we will be in 'switchdesk' mode
 # where the session saving stuff is disabled in GDM
@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
 #Use24Clock=auto
 # Use circles in the password field.  Looks kind of cool actually, but only
 # works with certain fonts.
-#UseCirclesInEntry=false
+UseCirclesInEntry=true
 # Do not show any visible feedback in the password field. This is standard for
 # instance in console, xdm and ssh.
 #UseInvisibleInEntry=false
@@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
 # list then provide a list that is delimited by /: to the GraphicalThemes
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
+GraphicalTheme=FedoraInfinity
 #GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
@@ -633,7 +634,7 @@ Gestures=false
 
 [server-Standard]
 name=Standard server
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
 flexible=true
 # Indicates that the X server should be started at a different process
 # priority.  Values can be any integer value accepted by the setpriority C


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- gdm.spec	19 Sep 2007 15:09:52 -0000	1.288
+++ gdm.spec	19 Sep 2007 16:43:40 -0000	1.289
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -58,7 +58,7 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
-Patch100: gdm-2.19.8-change-defaults.patch
+Patch100: gdm-2.20.0-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -355,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
+- Change default theme to FedoraInfinity
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-2
 - Fix a hang on restart (#240853)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 16:57:26 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:57:26 -0400
Subject: rpms/eclipse-subclipse/FC-6 eclipse-subclipse.spec,1.6,1.7
Message-ID: <200709191657.l8JGvQ44004176@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3979

Modified Files:
	eclipse-subclipse.spec 
Log Message:
Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-subclipse.spec	10 Sep 2007 17:46:42 -0000	1.6
+++ eclipse-subclipse.spec	19 Sep 2007 16:56:53 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -79,8 +79,8 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
-%patch1 -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -238,6 +238,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
 - Update to upstream 1.2.4
 - Build for all supported arquitectures



From fedora-extras-commits at redhat.com  Wed Sep 19 16:58:04 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 19 Sep 2007 12:58:04 -0400
Subject: rpms/eclipse-subclipse/EL-5 subclipse-fetch-1.2.4.sh, NONE,
	1.1 .cvsignore, 1.5,
	1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1,
	1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5,
	1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Message-ID: <200709191658.l8JGw4uh004402@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4150

Modified Files:
	.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec sources 
Added Files:
	subclipse-fetch-1.2.4.sh 
Removed Files:
	subclipse-fetch-1.2.2.sh 
Log Message:
- Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core
- Update to upstream 1.2.4
- Build for all supported arquitectures
- Change MANIFEST.MF patch to be applied on prep stage




--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jun 2007 18:25:12 -0000	1.5
+++ .cvsignore	19 Sep 2007 16:57:31 -0000	1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz

eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	20 Jun 2007 18:25:12 -0000	1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	19 Sep 2007 16:57:31 -0000	1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF	2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF	2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
  Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
  Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
   lib/svnClientAdapter.jar,
   lib/svnjavahl.jar,
   lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec	20 Jun 2007 18:25:12 -0000	1.5
+++ eclipse-subclipse.spec	19 Sep 2007 16:57:31 -0000	1.6
@@ -15,7 +15,7 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.2.2
+Version:        1.2.4
 Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -26,14 +26,11 @@
 # 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.2.sh
+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.2-plugin-classpath.patch
 
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.2.2-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -50,7 +47,7 @@
 %endif
 
 %if %{gcj_support}
-ExclusiveArch:          %{ix86} x86_64 ppc ia64
+#ExclusiveArch:          %{ix86} x86_64 ppc ia64
 %else
 BuildArch:              noarch
 %endif
@@ -83,6 +80,7 @@
 %if 0%{disable_javahl}
 %patch -p1
 %endif
+%patch1 -p1
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
@@ -197,8 +195,6 @@
 # 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
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,20 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
 * Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
 - Update to upstream 1.2.2
 - Dependency changed from javasvn to svnkit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jun 2007 18:25:12 -0000	1.5
+++ sources	19 Sep 2007 16:57:31 -0000	1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961  subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e  subclipse-1.2.4.tgz


--- subclipse-fetch-1.2.2.sh DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 17:07:12 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 13:07:12 -0400
Subject: rpms/galeon/devel galeon-2.0.3-imgload.patch, NONE,
	1.1 galeon-2.0.3-printdial.patch, NONE, 1.1 galeon.spec, 1.34, 1.35
Message-ID: <200709191707.l8JH7Cgr011835@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11542

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-imgload.patch galeon-2.0.3-printdial.patch 
Log Message:
- Added patch to fix image load preference (#292361)
- Added patch to fix print dialog crash (#285661)


galeon-2.0.3-imgload.patch:

--- NEW FILE galeon-2.0.3-imgload.patch ---
--- galeon-2.0.3/mozilla/mozilla-notifiers.cpp.orig	2007-09-19 12:17:01.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-notifiers.cpp	2007-09-19 12:19:08.000000000 +0200
@@ -139,7 +139,7 @@
 {
 	{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
 	{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
+	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
 	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
 	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
 	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
--- galeon-2.0.3/src/galeon-window.c.orig	2007-09-19 12:22:57.000000000 +0200
+++ galeon-2.0.3/src/galeon-window.c	2007-09-19 13:04:26.000000000 +0200
@@ -115,8 +115,8 @@
 static gint GaleonWindowSignals[LAST_SIGNAL];
 
 /* These are the values of in gconf for these items */
-#define VIEW_IMAGES_ALWAYS	0
-#define VIEW_IMAGES_CURRENT	1
+#define VIEW_IMAGES_ALWAYS	1
+#define VIEW_IMAGES_CURRENT	3
 #define VIEW_IMAGES_NEVER	2
 #define ACCEPT_COOKIES_ALWAYS	0
 #define ACCEPT_COOKIES_CURRENT	1
@@ -468,7 +468,6 @@
 
 static guint n_toggle_entries = G_N_ELEMENTS(toggle_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry image_radio_entries[] = {
 	{ "ViewImagesAlwaysAction", NULL, N_("_Always"), NULL,
 	  N_("View all images"), VIEW_IMAGES_ALWAYS },
@@ -480,7 +479,6 @@
 
 static guint n_image_radio_entries = G_N_ELEMENTS (image_radio_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry cookie_radio_entries[] = {
 	{ "WebCookiesAlwaysAction", NULL, N_("A_lways Allow"), NULL,
 	  N_("Always accept cookies"), ACCEPT_COOKIES_ALWAYS },
@@ -1160,12 +1158,21 @@
 radio_group_set_from_value (GaleonWindow *window, GtkRadioActionEntry *entries,
 			    int n_entries, GConfValue *value)
 {
-	GtkAction *action;
+	GtkAction *action = NULL;
 	int val = gconf_value_get_int(value);
-	g_return_if_fail (val < n_entries);
-	g_return_if_fail (entries[val].value == val);
+	int i;
+
+	/* Figure out with GtkRadioActionEntry has our value. These
+	   lists are always very short, just iterate rather than use a
+	   reverse-lookup static table. */
+	for (i = 0; i < n_entries; i++) {
+	    if (entries[i].value == val) {
+		action = gtk_action_group_get_action(window->priv->action_group, entries[i].name);
+		break;
+	    }
+	}
 
-	action = gtk_action_group_get_action(window->priv->action_group, entries[val].name);
+	g_return_if_fail (action != NULL);
 
 	if (! gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{

galeon-2.0.3-printdial.patch:

--- NEW FILE galeon-2.0.3-printdial.patch ---
--- galeon-2.0.3/embed/print-dialog.c.orig	2007-09-19 18:25:35.000000000 +0200
+++ galeon-2.0.3/embed/print-dialog.c	2007-09-19 18:51:01.000000000 +0200
@@ -665,15 +665,20 @@
 	GtkTreeModel *model;
 	GPtrArray *paper_array;
 	guint i;
+	gint combo_selection;
 
 	name_combo = galeon_dialog_get_control(dialog, NAME_PROP);
 	command_entry = galeon_dialog_get_control(dialog, COMMAND_PROP);
 
-	priv->selected_printer =
-			gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	/* Ignore callback if combo box was not yet initialized */
+	combo_selection = gtk_combo_box_get_active(GTK_COMBO_BOX(name_combo));
+	if (combo_selection < 0)
+		return;
 
+	priv->selected_printer = combo_selection;
 	info = (EmbedPrintInfo *)g_list_nth_data(priv->printers,
 	                                         priv->selected_printer);
+	g_return_if_fail (info != NULL);
 
 	gtk_widget_set_sensitive(command_entry, info->can_change_command);
 


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- galeon.spec	22 Aug 2007 09:29:06 -0000	1.34
+++ galeon.spec	19 Sep 2007 17:06:37 -0000	1.35
@@ -3,13 +3,15 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 Patch0:		galeon-2.0.3-flashfix.patch
 Patch1:		galeon-2.0.3-plugins.patch
+Patch2:		galeon-2.0.3-imgload.patch
+Patch3:		galeon-2.0.3-printdial.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -41,6 +43,8 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
 %patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
+%patch3 -p1 -b .printdial
 
 
 %build
@@ -115,6 +119,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-12
+- Added patch to fix image load preference (#292361)
+- Added patch to fix print dialog crash (#285661)
+
 * Wed Aug 22 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
 - F-8 rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:25 -0700
Subject: [pkgdb] roxterm was added for svahl
Message-ID: <200709191708.l8JH8Su2000879@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package roxterm with summary A fast terminal emulator
Kevin Fenzi (kevin) has approved Package roxterm
Kevin Fenzi (kevin) has added a Fedora devel branch for roxterm with an owner of svahl
Kevin Fenzi (kevin) has approved roxterm in Fedora devel
Kevin Fenzi (kevin) has approved Package roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/roxterm



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, 6) updated by kevin
Message-ID: <200709191708.l8JH8kfO024551@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/roxterm



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, 7) updated by kevin
Message-ID: <200709191708.l8JH8lFv024563@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for roxterm
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on roxterm (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/roxterm



From fedora-extras-commits at redhat.com  Wed Sep 19 17:08:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 10:08:45 -0700
Subject: [pkgdb] roxterm (Fedora, devel) updated by kevin
Message-ID: <200709191708.l8JH8lIR024574@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on roxterm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/roxterm



From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:28 -0400
Subject: rpms/roxterm - New directory
Message-ID: <200709191709.l8JH9S7C012587@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm

Log Message:
Directory /cvs/extras/rpms/roxterm added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:30 -0400
Subject: rpms/roxterm/devel - New directory
Message-ID: <200709191709.l8JH9U0F012614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm/devel

Log Message:
Directory /cvs/extras/rpms/roxterm/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:33 -0400
Subject: rpms/roxterm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709191709.l8JH9XKm012652@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm

Added Files:
	Makefile import.log 
Log Message:
Setup of module roxterm


--- NEW FILE Makefile ---
# Top level Makefile for module roxterm
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 17:09:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 13:09:35 -0400
Subject: rpms/roxterm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709191709.l8JH9ZSq012682@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12460/rpms/roxterm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module roxterm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: roxterm
# $Id: Makefile,v 1.1 2007/09/19 17:09:33 kevin Exp $
NAME := roxterm
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 fedora-extras-commits at redhat.com  Wed Sep 19 17:14:27 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Wed, 19 Sep 2007 13:14:27 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.1,1.2
Message-ID: <200709191714.l8JHER2I014420@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14177

Modified Files:
	compiz-fusion.spec 
Log Message:
add animation to pluginlist


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-fusion.spec	18 Sep 2007 19:10:29 -0000	1.1
+++ compiz-fusion.spec	19 Sep 2007 17:13:54 -0000	1.2
@@ -1,8 +1,8 @@
-%define plugins colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
+%define plugins animation colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
 
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6
+- Add animation to plugin list
+
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
 - Fix gconf schemas install (RH #53692)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:19:25 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 19 Sep 2007 13:19:25 -0400
Subject: rpms/galeon/F-7 galeon-2.0.3-imgload.patch, NONE, 1.1 galeon.spec, 
	1.33, 1.34
Message-ID: <200709191719.l8JHJPob016208@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16187

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.3-imgload.patch 
Log Message:
Added patch to fix image loading preference

galeon-2.0.3-imgload.patch:

--- NEW FILE galeon-2.0.3-imgload.patch ---
--- galeon-2.0.3/mozilla/mozilla-notifiers.cpp.orig	2007-09-19 12:17:01.000000000 +0200
+++ galeon-2.0.3/mozilla/mozilla-notifiers.cpp	2007-09-19 12:19:08.000000000 +0200
@@ -139,7 +139,7 @@
 {
 	{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
 	{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
+	{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
 	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
 	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
 	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
--- galeon-2.0.3/src/galeon-window.c.orig	2007-09-19 12:22:57.000000000 +0200
+++ galeon-2.0.3/src/galeon-window.c	2007-09-19 13:04:26.000000000 +0200
@@ -115,8 +115,8 @@
 static gint GaleonWindowSignals[LAST_SIGNAL];
 
 /* These are the values of in gconf for these items */
-#define VIEW_IMAGES_ALWAYS	0
-#define VIEW_IMAGES_CURRENT	1
+#define VIEW_IMAGES_ALWAYS	1
+#define VIEW_IMAGES_CURRENT	3
 #define VIEW_IMAGES_NEVER	2
 #define ACCEPT_COOKIES_ALWAYS	0
 #define ACCEPT_COOKIES_CURRENT	1
@@ -468,7 +468,6 @@
 
 static guint n_toggle_entries = G_N_ELEMENTS(toggle_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry image_radio_entries[] = {
 	{ "ViewImagesAlwaysAction", NULL, N_("_Always"), NULL,
 	  N_("View all images"), VIEW_IMAGES_ALWAYS },
@@ -480,7 +479,6 @@
 
 static guint n_image_radio_entries = G_N_ELEMENTS (image_radio_entries);
 
-/* Keep this in order, see radio_group_set_from_value */
 static GtkRadioActionEntry cookie_radio_entries[] = {
 	{ "WebCookiesAlwaysAction", NULL, N_("A_lways Allow"), NULL,
 	  N_("Always accept cookies"), ACCEPT_COOKIES_ALWAYS },
@@ -1160,12 +1158,21 @@
 radio_group_set_from_value (GaleonWindow *window, GtkRadioActionEntry *entries,
 			    int n_entries, GConfValue *value)
 {
-	GtkAction *action;
+	GtkAction *action = NULL;
 	int val = gconf_value_get_int(value);
-	g_return_if_fail (val < n_entries);
-	g_return_if_fail (entries[val].value == val);
+	int i;
+
+	/* Figure out with GtkRadioActionEntry has our value. These
+	   lists are always very short, just iterate rather than use a
+	   reverse-lookup static table. */
+	for (i = 0; i < n_entries; i++) {
+	    if (entries[i].value == val) {
+		action = gtk_action_group_get_action(window->priv->action_group, entries[i].name);
+		break;
+	    }
+	}
 
-	action = gtk_action_group_get_action(window->priv->action_group, entries[val].name);
+	g_return_if_fail (action != NULL);
 
 	if (! gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-7/galeon.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- galeon.spec	18 Jul 2007 14:15:53 -0000	1.33
+++ galeon.spec	19 Sep 2007 17:18:53 -0000	1.34
@@ -3,13 +3,14 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 Patch0:		galeon-2.0.3-flashfix.patch
 Patch1:		galeon-2.0.3-plugins.patch
+Patch2:         galeon-2.0.3-imgload.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -41,6 +42,7 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1 -b .flashfix
 %patch1 -p1 -b .plugins
+%patch2 -p1 -b .imgload
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-11
+- Added patch to fix image loading preference
+
 * Wed Jul 18 2007 Denis Leroy <denis at poolshark.org> - 2.0.3-10
 - Rebuild with gecko-libs 1.8.1.5
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:41:06 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 19 Sep 2007 13:41:06 -0400
Subject: rpms/sugar/OLPC-2 sources,1.57,1.58 sugar.spec,1.68,1.69
Message-ID: <200709191741.l8JHf6kA018786@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18727

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	19 Sep 2007 16:13:54 -0000	1.57
+++ sources	19 Sep 2007 17:40:33 -0000	1.58
@@ -1 +1 @@
-cfe2b46a134d04f3fe439e397bc311fa  sugar-0.65-gitb8ce5083b7.tar.bz2
+a34b08643ff76b03dbe26ab98a92f7e7  sugar-0.65-gitb8ce5083b7.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sugar.spec	19 Sep 2007 16:13:54 -0000	1.68
+++ sugar.spec	19 Sep 2007 17:40:33 -0000	1.69
@@ -5,7 +5,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.53.%{alphatag}b8ce5083b7
+Release: 0.54.%{alphatag}b8ce5083b7
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.53.20070919gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 19 17:41:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 19 Sep 2007 13:41:31 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.60,
	1.61 selinux-policy.spec, 1.523, 1.524
Message-ID: <200709191741.l8JHfV8H018829@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18763

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
- Allow xserver to search devpts_t
- Dontaudit ldconfig output to homedir


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policy-20070703.patch	19 Sep 2007 01:11:31 -0000	1.60
+++ policy-20070703.patch	19 Sep 2007 17:40:59 -0000	1.61
@@ -302,8 +302,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.8/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.fc	2007-09-17 16:20:18.000000000 -0400
-@@ -1,4 +1,7 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.fc	2007-09-19 10:53:23.000000000 -0400
+@@ -1,4 +1,8 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
 +/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -311,10 +311,19 @@
  
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
++/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-17 16:20:18.000000000 -0400
-@@ -19,20 +19,24 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-19 10:54:14.000000000 -0400
+@@ -14,25 +14,35 @@
+ type alsa_etc_rw_t;
+ files_type(alsa_etc_rw_t)
+ 
++type alsa_var_lib_t;
++files_type(alsa_var_lib_t)
++
+ ########################################
+ #
  # Local policy
  #
  
@@ -333,6 +342,9 @@
  manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  
++manage_dirs_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
++manage_files_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
++
 +files_search_home(alsa_t)
  files_read_etc_files(alsa_t)
  
@@ -342,7 +354,7 @@
  
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
-@@ -43,7 +47,13 @@
+@@ -43,7 +53,13 @@
  
  userdom_manage_unpriv_user_semaphores(alsa_t)
  userdom_manage_unpriv_user_shared_mem(alsa_t)
@@ -5978,8 +5990,17 @@
  /var/run/vbestate 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.8/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-17 16:20:18.000000000 -0400
-@@ -293,6 +293,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-19 13:28:57.000000000 -0400
+@@ -155,6 +155,8 @@
+ selinux_compute_relabel_context(hald_t)
+ selinux_compute_user_contexts(hald_t)
+ 
++dev_read_raw_memory(hald_t)
++
+ storage_raw_read_removable_device(hald_t)
+ storage_raw_write_removable_device(hald_t)
+ storage_raw_read_fixed_disk(hald_t)
+@@ -293,6 +295,7 @@
  #
  
  allow hald_acl_t self:capability { dac_override fowner };
@@ -9321,7 +9342,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-19 11:59:57.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9331,7 +9352,7 @@
  
  	domain_mmap_low($1_xserver_t)
  
-@@ -141,7 +143,7 @@
+@@ -141,10 +143,11 @@
  	fs_getattr_xattr_fs($1_xserver_t)
  	fs_search_nfs($1_xserver_t)
  	fs_search_auto_mountpoints($1_xserver_t)
@@ -9340,7 +9361,11 @@
  
  	init_getpgid($1_xserver_t)
  
-@@ -353,12 +355,6 @@
++	term_search_ptys($1_xserver_t)
+ 	term_setattr_unallocated_ttys($1_xserver_t)
+ 	term_use_unallocated_ttys($1_xserver_t)
+ 
+@@ -353,12 +356,6 @@
  	# allow ps to show xauth
  	ps_process_pattern($2,$1_xauth_t)
  
@@ -9353,7 +9378,7 @@
  	domain_use_interactive_fds($1_xauth_t)
  
  	files_read_etc_files($1_xauth_t)
-@@ -387,6 +383,14 @@
+@@ -387,6 +384,14 @@
  	')
  
  	optional_policy(`
@@ -9368,7 +9393,7 @@
  		nis_use_ypbind($1_xauth_t)
  	')
  
-@@ -537,16 +541,14 @@
+@@ -537,16 +542,14 @@
  
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
@@ -9387,7 +9412,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +557,46 @@
+@@ -555,25 +558,46 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9443,7 +9468,7 @@
  	')
  ')
  
-@@ -626,6 +649,24 @@
+@@ -626,6 +650,24 @@
  
  ########################################
  ## <summary>
@@ -9468,7 +9493,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +700,73 @@
+@@ -659,6 +701,73 @@
  
  ########################################
  ## <summary>
@@ -9542,7 +9567,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -987,6 +1095,37 @@
+@@ -987,6 +1096,37 @@
  
  ########################################
  ## <summary>
@@ -9580,7 +9605,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1275,7 @@
+@@ -1136,7 +1276,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9589,7 +9614,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1464,62 @@
+@@ -1325,3 +1465,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9654,7 +9679,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-19 11:59:42.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -10927,7 +10952,7 @@
 +/usr/lib/libFLAC\.so.* 	  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-19 13:33:20.000000000 -0400
 @@ -23,6 +23,9 @@
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -10964,7 +10989,15 @@
  files_search_var_lib(ldconfig_t)
  files_read_etc_files(ldconfig_t)
  files_search_tmp(ldconfig_t)
-@@ -96,4 +104,11 @@
+@@ -79,6 +87,7 @@
+ logging_send_syslog_msg(ldconfig_t)
+ 
+ userdom_use_all_users_fds(ldconfig_t)
++userdom_dontaudit_write_unpriv_user_home_content_files(ldconfig_t)
+ 
+ ifdef(`hide_broken_symptoms',`
+ 	optional_policy(`
+@@ -96,4 +105,11 @@
  	# and executes ldconfig on it.  If you dont allow this kernel installs 
  	# blow up.
  	rpm_manage_script_tmp_files(ldconfig_t)
@@ -12959,7 +12992,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-19 13:32:51.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13699,12 +13732,13 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4599,7 +4718,25 @@
- 
- ########################################
- ## <summary>
--##	Search all users home directories.
-+##	Search all users home directories.
+@@ -4615,6 +4734,24 @@
+ 	files_list_home($1)
+ 	allow $1 home_dir_type:dir search_dir_perms;
+ ')
++########################################
++## <summary>
++##	Read all users home directories symlinks.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -13712,36 +13746,17 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_search_all_users_home_dirs',`
++interface(`userdom_read_all_users_home_dirs_symlinks',`
 +	gen_require(`
 +		attribute home_dir_type;
 +	')
 +
 +	files_list_home($1)
-+	allow $1 home_dir_type:dir search_dir_perms;
-+')
-+########################################
-+## <summary>
-+##	Read all users home directories symlinks.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -4607,13 +4744,13 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_search_all_users_home_dirs',`
-+interface(`userdom_read_all_users_home_dirs_symlinks',`
- 	gen_require(`
- 		attribute home_dir_type;
- 	')
- 
- 	files_list_home($1)
--	allow $1 home_dir_type:dir search_dir_perms;
 +	allow $1 home_dir_type:lnk_file read_lnk_file_perms;
- ')
++')
  
  ########################################
+ ## <summary>
 @@ -4633,6 +4770,14 @@
  
  	files_list_home($1)
@@ -13766,7 +13781,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5704,318 @@
+@@ -5559,3 +5704,336 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14067,6 +14082,24 @@
 +	allow $1 user_home_type:file execute;
 +')
 +
++########################################
++## <summary>
++##	dontaudit attempts to write to user home dir files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_write_unpriv_user_home_content_files',`
++	gen_require(`
++		attribute user_home_type;
++	')
++
++	allow $1 user_home_type:file write;
++')
++
 +
 +########################################
 +## <summary>


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- selinux-policy.spec	19 Sep 2007 01:11:31 -0000	1.523
+++ selinux-policy.spec	19 Sep 2007 17:40:59 -0000	1.524
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
+- Allow xserver to search devpts_t
+- Dontaudit ldconfig output to homedir
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-2
 - Remove hplip_etc_t change back to etc_t.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 18:02:25 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 14:02:25 -0400
Subject: rpms/bcel/devel bcel-5.2-build.xml, NONE,
	1.1 bcel-5.2-jpp-depmap.xml, 
	NONE, 1.1 bcel-5.2-project_properties.patch, NONE,
	1.1 bcel-5.2.pom, NONE, 1.1 .cvsignore, 1.9, 1.10 bcel.spec,
	1.29, 1.30 sources, 1.8, 1.9
Message-ID: <200709191802.l8JI2Ptp025226@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/bcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25162

Modified Files:
	.cvsignore bcel.spec sources 
Added Files:
	bcel-5.2-build.xml bcel-5.2-jpp-depmap.xml 
	bcel-5.2-project_properties.patch bcel-5.2.pom 
Log Message:
Update to 5.2




--- NEW FILE bcel-5.2-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!--build.xml generated by maven from project.xml version 5.2
  on date June 26 2007, time 1708-->
<project default="jar" name="bcel" basedir=".">
  <!--Load local and user build preferences-->
  <property file="build.properties"></property>
  <!--Build properties-->
  <property name="defaulttargetdir" value="${basedir}/target"></property>
  <property name="libdir" value="${basedir}/lib"></property>
  <property name="classesdir" value="${basedir}/target/classes"></property>
  <property name="distdir" value="${basedir}/dist"></property>
  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
  <property name="final.name" value="bcel-5.2"></property>
  <property name="proxy.host" value=""></property>
  <property name="proxy.port" value=""></property>
  <property name="proxy.username" value=""></property>
  <property name="proxy.password" value=""></property>
  <path id="build.classpath">
    <pathelement location="${libdir}/regexp.jar"></pathelement>
  </path>
  <target name="init" description="o Initializes some properties">
    <mkdir dir="${libdir}"></mkdir>
    <condition property="noget">
      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
    </condition>
    <!--Test if JUNIT is present in ANT classpath-->
    <available property="Junit.present" classname="junit.framework.Test"></available>
    <!--Test if user defined a proxy-->
    <condition property="useProxy">
      <and>
        <isset property="proxy.host"></isset>
        <not>
          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
        </not>
      </and>
    </condition>
  </target>
  <target name="compile" description="o Compile the code" depends="get-deps">
    <mkdir dir="${classesdir}"></mkdir>
    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
      <src>
        <pathelement location="${basedir}/src/java"></pathelement>
      </src>
      <classpath refid="build.classpath"></classpath>
    </javac>
    <mkdir dir="${classesdir}/META-INF"></mkdir>
    <copy todir="${classesdir}/META-INF">
      <fileset dir="${basedir}/.">
        <include name="NOTICE.txt"></include>
      </fileset>
    </copy>
  </target>
  <target name="jar" description="o Create the jar" depends="compile,test">
    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
  </target>
  <target name="clean" description="o Clean up the generated directories">
    <delete dir="${defaulttargetdir}"></delete>
    <delete dir="${distdir}"></delete>
  </target>
  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
    <mkdir dir="dist"></mkdir>
    <copy todir="dist">
      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
    </copy>
  </target>
  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
    <fail message="There were test failures."></fail>
  </target>
  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
  <target name="junit-present" unless="Junit.present" depends="init">
    <echo>================================= WARNING ================================</echo>
    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="2002-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
    <property name="title" value="jakarta-bcel 5.2 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
  <target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/regexp.jar"></get>
  </target>
  <target name="get-custom-dep-regexp.jar" if="regexp.jar" depends="init,setProxy,noProxy">
    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="${regexp.jar}"></get>
  </target>
  <target name="get-deps" unless="noget" depends="get-dep-regexp.jar"></target>
  <target name="setProxy" if="useProxy" depends="init">
    <!--Proxy settings works only with a JDK 1.2 and higher.-->
    <echo>Proxy used :</echo>
    <echo>Proxy host [${proxy.host}]</echo>
    <echo>Proxy port [${proxy.port}]</echo>
    <echo>Proxy user [${proxy.username}]</echo>
    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
  </target>
  <target name="noProxy" unless="useProxy" depends="init">
    <echo>Proxy not used.</echo>
  </target>
  <target name="install-maven">
    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
  </target>
  <!-- can rename this target when we get the docs sorted out -->

  <!-- ================================================================== -->
  <!-- D O C S                                                            -->
  <!-- ================================================================== -->
  
  <target 
    name="check_for_jdom">
    
    <available 
      property="jdom.present"
      classname="org.jdom.JDOMException">
      <classpath>
        <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
      </classpath>
    </available>
  </target>
    
  <target 
    depends="check_for_jdom" 
    name="docs-prepare-error" 
    unless="jdom.present">
    
    <echo>
      The Jakarta-Site2 module is not present! Please check
      to make sure that you have checked it out from CVS.

      &lt;http://jakarta.apache.org/site/jakarta-site2.html&gt;
    </echo>
  </target>

  <target 
    name="xdocs"
    depends="docs-prepare-error"
    description="--> generates the HTML documentation"
    if="jdom.present">

    <taskdef 
      name="anakia"
      classname="org.apache.velocity.anakia.AnakiaTask">
      <classpath>
        <fileset dir="${jakarta.site2}/lib">
          <include name="*.jar"/>
        </fileset>
      </classpath>
    </taskdef>
        
    <anakia 
      basedir="${docs.src}" 
      destdir="${docs.dest}/"
      extension=".html" 
      style="./site.vsl"
      projectFile="stylesheets/project.xml"
      excludes="**/stylesheets/** empty.xml"
      includes="**/*.xml"
      lastModifiedCheck="true"
      templatePath="${jakarta.site2}/xdocs/stylesheets">
    </anakia>

    <copy 
      todir="${docs.dest}/images" 
      filtering="no">
      
      <fileset dir="${docs.src}/images">
        <include name="**/*.gif"/>
        <include name="**/*.jpeg"/>
        <include name="**/*.jpg"/>
      </fileset>
    </copy>
  </target>

</project>


--- NEW FILE bcel-5.2-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>regexp</groupId>
         <artifactId>regexp</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>regexp</artifactId>
         <jar>regexp.jar</jar>
         <version>1.2</version>
      </jpp>
   </dependency>
</depset>
bcel-5.2-project_properties.patch:

--- NEW FILE bcel-5.2-project_properties.patch ---
--- project.properties.sav	2007-06-26 15:21:10.000000000 +0200
+++ project.properties	2007-06-26 15:21:35.000000000 +0200
@@ -42,7 +42,7 @@
 
 maven.changes.issue.template = %URL%/bugzilla/show_bug.cgi?id=%ISSUE%
 
-maven.xdoc.jsl = ../commons-build/commons-site.jsl
+maven.xdoc.jsl = file:${basedir}/commons-build/commons-site.jsl
 maven.xdoc.date = left
 maven.xdoc.poweredby.image = maven-feather.png
 maven.xdoc.version = ${pom.currentVersion}


--- NEW FILE bcel-5.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>bcel</groupId>
  <artifactId>bcel</artifactId>
  <version>5.2</version>
  <dependencies>
    <groupId>regexp</groupId>
    <artifactId>regexp</artifactId>
    <version>1.4</version>
  </dependencies>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Apr 2007 18:41:33 -0000	1.9
+++ .cvsignore	19 Sep 2007 18:01:52 -0000	1.10
@@ -1,3 +1,2 @@
-bcel-5.1-src.tar.gz
-jakarta-site2.tar.gz
+bcel-5.2-src.tar.gz
 bcel-jakarta-site2.tar.gz


Index: bcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bcel.spec	14 Aug 2007 15:40:08 -0000	1.29
+++ bcel.spec	19 Sep 2007 18:01:52 -0000	1.30
@@ -32,12 +32,9 @@
 %define _with_gcj_support 1
 #Fedora currently does not support maven
 %define _without_maven 1
-%define _without_bootstrap 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
@@ -45,22 +42,24 @@
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
 Name:           bcel
-Version:        5.1
-Release:        10jpp.4%{?dist}
+Version:        5.2
+Release:        2jpp.1%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
-License:        Apache Software License
-Source0:        bcel-5.1-src.tar.gz
-#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
-#tar czvf bcel-5.1-src.tar.gz BCEL_5_1
+License:        ASL 2.0
+Source0:        %{name}-%{version}-src.tar.gz
+#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_2
+#tar czvf bcel-5.2-src.tar.gz BCEL_5_2
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        bcel-5.1-jpp-depmap.xml
+Source4:        %{name}-%{version}-jpp-depmap.xml
+#Source5:        commons-build.tar.gz
 Source5:        bcel-jakarta-site2.tar.gz
+Source6:        %{name}-%{version}-build.xml
+Source7:        %{name}-%{version}.pom
 
-Patch0:         bcel-5.1-build.patch
-Patch1:         bcel-5.1-project_xml.patch
+Patch0:         %{name}-%{version}-project_properties.patch
 URL:            http://jakarta.apache.org/%{name}/
 Group:          Development/Libraries/Java
 Requires:       regexp
@@ -69,8 +68,18 @@
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
-%endif
-%if ! %{bootstrap}
+BuildRequires:  maven-plugins-base
+BuildRequires:  maven-plugin-changelog
+BuildRequires:  maven-plugin-changes
+BuildRequires:  maven-plugin-developer-activity
+BuildRequires:  maven-plugin-jxr
+BuildRequires:  maven-plugin-license
+BuildRequires:  maven-plugin-pmd
+BuildRequires:  maven-plugin-test
+BuildRequires:  maven-plugin-xdoc
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+%else
 BuildRequires:  jdom
 BuildRequires:  velocity
 BuildRequires:  jakarta-commons-collections
@@ -81,16 +90,16 @@
 #BuildRequires:  ant-apache-regexp
 %endif
 BuildRequires:  regexp
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  jpackage-utils >= 0:1.7.2
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
 %endif
 
 %description
@@ -123,14 +132,6 @@
 %description manual
 %{summary}.
 
-%package demo
-Summary:        Examples for %{name}
-Group:          Development/Libraries/Java
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-%{summary}.
-
 %prep
 #cat <<EOT
 #
@@ -139,14 +140,14 @@
 #
 #EOT
 
-%setup -q -n BCEL_5_1
+%setup -q -n BCEL_5_2
+gzip -dc %{SOURCE5} | tar xf -
 # remove all binary libs
 #find . -name "*.jar" -exec rm -f {} \;
 for j in $(find . -name "*.jar"); do
-    mv $j $j.no
+    %{__mv} $j ${j}.no
 done
-gzip -dc %{SOURCE5} | tar xf -
-%if ! %{bootstrap}
+%if %{without_maven}
 mkdir jakarta-site2/lib
 pushd jakarta-site2/lib/
   build-jar-repository -s -p . jdom
@@ -156,178 +157,165 @@
   build-jar-repository -s -p . werken-xpath
 popd
 %endif
-pushd lib
-  ln -sf $(build-classpath regexp) Regex.jar
-popd
-%patch0 -p1
-%patch1 -b .sav
-
-# very broken build
-perl -p -i -e 's| depends=\"examples\"||g;' build.xml
-touch manifest.txt
+cp %{SOURCE6} build.xml
+%patch0 -b .sav
 
 # fix wrong-file-end-of-line-encoding
 sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
 
 %build
 %if %{with_maven}
-export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
+export DEPCAT="$(pwd)/%{name}-%{version}-depcat.new.xml"
 echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
 echo '<depset>' >> $DEPCAT
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
-    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+        /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
     popd
 done
 echo >> $DEPCAT
 echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > bcel-5.1-depmap.new.xml
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{name}-%{version}-depmap.new.xml
 
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
-    cp -pr project.xml project.xml.orig
-    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+        %{__cp} -pr project.xml project.xml.orig
+        /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} \
+            map="%{SOURCE4}"
     popd
 done
 
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
+export MAVEN_HOME_LOCAL="$(pwd)/.maven"
 
-maven \
+maven -e \
         -Dmaven.repo.remote=file:/usr/share/maven/repository \
         -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
         jar:jar javadoc:generate xdoc:transform
 %else
-ant     -Dbuild.dest=build/classes -Dbuild.dir=build \
+#ant -Dregexp.jar="file://$(build-classpath regexp)" jar javadoc
+ant     -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
         -Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
-        compile jar apidocs xdocs
+        -Dregexp.jar="file://$(build-classpath regexp)" \
+        jar javadoc xdocs
 %endif
 
 %install
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 # jars
-%__mkdir_p %{buildroot}%{_javadir}
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__install} -m 0644 target/%{name}-%{version}.jar \
+    %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(
+    cd %{buildroot}%{_javadir}
+    for jar in *-%{version}*; do 
+        %{__ln_s} ${jar} `echo $jar | %{__sed}  "s|-%{version}||g"`
+    done
+)
+# depmap frags
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+# pom
 %if %{with_maven}
-%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%else
-%__install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
+%{__install} -m 0644 %{SOURCE7} \
+    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
 %endif
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
 %if %{with_maven}
-%__cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf target/docs/apidocs
+%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf target/docs/apidocs
 %else
-%__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf docs/api
+%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf dist/docs/api
 %endif
-
-# samples
-%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}/demo
-%__cp -pr examples/ %{buildroot}%{_datadir}/%{name}-%{version}/demo/
-#TODO: need some kind of doc for the demo package for instructions on how to
-# build and run the demos. 
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 # manual
-%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
 %if %{with_maven}
-%__cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
 %else
-%__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
 %endif
-%__cp -pr LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
+%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
 
 %clean
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+    %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+    %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
 %files
 %defattr(0644,root,root,0755)
-%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt 
 %{_javadir}/*
-
+%if %{with_maven}
+%{_datadir}/maven2/poms/*
+%endif
+%{_mavendepmapfragdir}
 %if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bcel-5.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc %{_docdir}/%{name}-%{version}
 
-%files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}/demo
-
-# -----------------------------------------------------------------------------
-
 %changelog
-* Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.4
-- Fixed another unowned directory
-
-* Mon Jul 09 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.3
-- Fixed unowned directory
+* Wed Sep 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
 
-* Thu Apr 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.2
-- Rebuild
-
-* Fri Apr 13 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
-- Merge with upstream version and rpmlint cleanup, fix BR
+* Mon Sep  4 2007 Jason Corley <jason.corley at gmail.com> 0:5.2-2jpp
+- use official 5.2 release tarballs and location
+- change vendor and distribution to macros
+- add missing requires on and maven-plugin-test, maven-plugins-base, and
+  maven-plugin-xdoc 
+- macro bracket fixes
+- remove demo subpackage (examples are not included in the distribution tarball)
+- build in mock
+
+* Wed Jun 27 2007 Ralph Apel <r.apel at r-apel.de> 0:5.2-1jpp
+- Upgrade to 5.2
+- Drop bootstrap option: not necessary any more
+- Add pom and depmap frags
 
 * Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> 0:5.1-10jpp
-- Fix empty-post and empty-postun
+- Fix empty-%%post and empty-%%postun
 - Fix no-cleaning-of-buildroot
 
 * Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> 0:5.1-9jpp
 - Optionally build without maven
 - Add bootstrap option
 
-* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
-- Merge with upstream version:
- - Add missing javadoc requires
-
-* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 5.1-7jpp_334fc
-- last release was 333 (typo), need to build 334 now
-- Requires(post/postun): coreutils
-
-* Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp-3fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_2fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_1fc
-- Merged with upstream version
-- set to build with Ant instead of Maven
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp
+- Add missing requires for Javadoc task
 
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+- Add conditional native compilation
+- Change spec file encoding from ISO-8859-1 to UTF-8
 - Add missing BR werken.xpath and ant-apache-regexp
-- Added conditional native compilation
-- Changed spec file encoding from ISO-8859-1 to UTF-8 
 
 * Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> 0:5.1-6jpp
 - First JPP-1.7 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bcel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Apr 2007 18:41:33 -0000	1.8
+++ sources	19 Sep 2007 18:01:52 -0000	1.9
@@ -1,2 +1,2 @@
-f32a91243963d601aa34194657a53d60  bcel-5.1-src.tar.gz
+15c882886f67f90ee773cb526b84b4fa  bcel-5.2-src.tar.gz
 2c511b30e00109b501c6f3bd757a1ce1  bcel-jakarta-site2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:03:47 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:03:47 -0400
Subject: rpms/roxterm/devel roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191803.l8JI3lfw025255@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:



--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:03:13 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:03:13 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:09:52 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:09:52 -0400
Subject: rpms/roxterm/F-7 roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191809.l8JI9q8E025810@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:
import also on fc6, f7


--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:09:20 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:09:20 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:09:55 2007
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Wed, 19 Sep 2007 14:09:55 -0400
Subject: rpms/roxterm/FC-6 roxterm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709191809.l8JI9tEc025814@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	roxterm.spec 
Log Message:
import also on fc6, f7


--- NEW FILE roxterm.spec ---
Name:           roxterm
Version:        1.7.4
Release:        4%{?dist}
Summary:        A fast terminal emulator

Group:          User Interface/X
License:        GPLv2+
URL:            http://roxterm.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
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 
features to gnome-terminal, based on the same VTE library, 
but with a smaller footprint and quicker start-up time. It 
achieves this by not using the Gnome libraries and by using 
a separate applet to provide the configuration GUI. It can 
be used as a ROX application, as the name implies, or in 
any other X environment.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/roxterm

desktop-file-install --vendor "fedora"                      \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications          \
        --delete-original                                   \
    $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop

%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

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Help/AUTHORS Help/Changes Help/COPYING Help/imgs Help/index.html Help/NEWS Help/README 
%{_bindir}/roxterm
%{_bindir}/roxterm-config
%{_datadir}/applications/fedora-roxterm.desktop
%{_datadir}/roxterm/
%{_datadir}/icons/hicolor/scalable/apps/roxterm.svg

%changelog
* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-4
- correct %%doc in spec

* Wed Sep 19 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-3
- own directories
- set %%{_docdir} to %%{name}-%%{version}

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-2
- use gtk-update-icon-cache in %%post and %%postun

* Tue Sep 18 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.4-1
- new upstream version: 1.7.4
- correct url

* Tue Sep 11 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.7.1-1
- new upstream version
- change license to GPLv2+
- BR: dbus-devel

* Tue May 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-2
- BR: dbus-glib-devel, desktop-file-utils

* Fri Mar 30 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.5.1-1
- new upstream version: 0.5.1

* Tue Feb 20 2007 Sebastian Vahl <fedora at deadbabylon.de> - 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 17:09:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 18:09:23 -0000	1.2
@@ -0,0 +1 @@
+roxterm-1.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 17:09:33 -0000	1.1
+++ sources	19 Sep 2007 18:09:23 -0000	1.2
@@ -0,0 +1 @@
+f1383a5e3d6aa28a2d3817d1171840ca  roxterm-1.7.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 18:12:15 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 19 Sep 2007 14:12:15 -0400
Subject: rpms/pam/devel pam-0.99.8.1-selinux-permit.patch, NONE,
	1.1 pam-0.99.8.1-succif-in-operator.patch, NONE, 1.1 pam.spec,
	1.157, 1.158
Message-ID: <200709191812.l8JICFGu025907@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25879

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.8.1-selinux-permit.patch 
	pam-0.99.8.1-succif-in-operator.patch 
Log Message:
* Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
- add pam_selinux_permit module
- pam_succeed_if: fix in operator (#295151)


pam-0.99.8.1-selinux-permit.patch:

--- NEW FILE pam-0.99.8.1-selinux-permit.patch ---
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 17:18:43.000000000 +0200
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<refentry id="pam_selinux_permit">
+
+  <refmeta>
+    <refentrytitle>pam_selinux_permit</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
+  </refmeta>
+
+  <refnamediv id="pam_selinux_permit-name">
+    <refname>pam_selinux_permit</refname>
+    <refpurpose>PAM module to allow/deny login depending on SELinux enforcement state</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis id="pam_selinux_permit-cmdsynopsis">
+      <command>pam_selinux_permit.so</command>
+      <arg choice="opt">
+	debug
+      </arg>
+      <arg choice="opt">
+	conf=<replaceable>/path/to/config/file</replaceable>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id="pam_selinux_permit-description">
+    <title>DESCRIPTION</title>
+    <para>
+      The pam_selinux module allows or denies login depending on SELinux enforcement
+      state.
+    </para>
+    <para>
+      When the user which is logging in matches an entry in the config file
+      he is allowed access only when the SELinux is in enforcing mode. Otherwise
+      he is denied access. For users not matching any entry in the config file
+      the pam_selinux_permit module returns PAM_IGNORE return value.
+    </para>
+    <para>
+      The config file contains a simple list of user names one per line. If the
+      <replaceable>name</replaceable> is prefixed with @ character it means that all
+      users in the group <replaceable>name</replaceable> match. If it is prefixed
+      with a % character the SELinux user is used to match against the <replaceable>name</replaceable>
+      instead of the account name. Note that when SELinux is disabled the
+      SELinux user assigned to the account cannot be determined. This means that
+      such entries are never matched when SELinux is disabled and pam_selinux_permit
+      will return PAM_IGNORE.
+    </para>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-options">
+    <title>OPTIONS</title>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>debug</option>
+        </term>
+        <listitem>
+          <para>
+           Turns on debugging via
+	    <citerefentry>
+              <refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum>
+            </citerefentry>.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>conf=<replaceable>/path/to/config/file</replaceable></option>
+        </term>
+        <listitem>
+          <para>
+            Path to alternative config file overriding the default.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-services">
+    <title>MODULE SERVICES PROVIDED</title>
+    <para>
+      Only the <option>auth</option> and <option>account</option>
+      services are supported.
+    </para>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-return_values'>
+    <title>RETURN VALUES</title>
+    <variablelist>
+      <varlistentry>
+        <term>PAM_AUTH_ERR</term>
+        <listitem>
+          <para>
+            SELinux is disabled or in the permissive mode and the user
+            matches.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SUCCESS</term>
+        <listitem>
+          <para>
+            SELinux is in the enforcing mode and the user matches.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_IGNORE</term>
+        <listitem>
+          <para>
+            The user does not match any entry in the config file.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_USER_UNKNOWN</term>
+        <listitem>
+          <para>
+            The module was unable to determine the user's name.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>PAM_SERVICE_ERR</term>
+        <listitem>
+          <para>
+            Error during reading or parsing the config file.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id="pam_selinux_permit-files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/security/sepermit.conf</filename></term>
+        <listitem>
+          <para>Default configuration file</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-examples'>
+    <title>EXAMPLES</title>
+    <programlisting>
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth     required  pam_unix.so
+account  required  pam_unix.so
+session  required  pam_permit.so
+    </programlisting>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-see_also'>
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+	<refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+	<refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+	<refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+
+  <refsect1 id='pam_selinux_permit-author'>
+    <title>AUTHOR</title>
+      <para>
+        pam_selinux_permit was written by Tomas Mraz &lt;tmraz at redhat.com&gt;.
+      </para>
+  </refsect1>
+
+</refentry>
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 18:14:36.000000000 +0200
@@ -0,0 +1,222 @@
+/******************************************************************************
+ * A module for Linux-PAM that allows/denies acces based on SELinux state.
+ *
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Written by Tomas Mraz <tmraz at redhat.com>
+ *
+ * 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, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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.
+ *
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <ctype.h>
+
+#define PAM_SM_AUTH
+#define PAM_SM_ACCOUNT
+
+#include <security/pam_modules.h>
+#include <security/_pam_macros.h>
+#include <security/pam_modutil.h>
+#include <security/pam_ext.h>
+
+#include <selinux/selinux.h>
+
+/* return 0 when matched, -1 when unmatched, pam error otherwise */
+static int
+sepermit_match(pam_handle_t *pamh, const char *cfgfile, const char *user,
+	       const char *seuser, int debug)
+{
+	FILE *f;
+	char *line = NULL;
+	char *start;
+	size_t n = 0;
+	int matched = 0;
+	
+	f = fopen(cfgfile, "r");
+	
+	if (!f) {
+		pam_syslog(pamh, LOG_ERR, "Failed to open config file %s: %m", cfgfile);
+		return PAM_SERVICE_ERR;
+	}
+	
+	while (!matched && getline(&line, &n, f) != -1) {
+		if (line[0] == '#')
+			goto cleanup;
+		
+		start = line;
+		while (isspace(*start))
+			++start;
+		n = strlen(start);
+		while (n > 0 && isspace(start[n-1])) {
+			--n;
+		}
+		if (n == 0)
+			goto cleanup;
+		
+		start[n] = '\0';
+		
+		switch (start[0]) {
+			case '@': 
+				++start;
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching user %s against group %s", user, start);
+				if (pam_modutil_user_in_group_nam_nam(pamh, user, start)) {
+					matched = 1;
+				}
+				break;
+			case '%':
+				++start;
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching seuser %s against seuser %s", seuser, start);
+				if (strcmp(seuser, start) == 0) {
+					matched = 1;					
+				}
+				break;
+			default:
+				if (debug)
+					pam_syslog(pamh, LOG_NOTICE, "Matching user %s against user %s", user, start);
+				if (strcmp(user, start) == 0) {
+					matched = 1;
+				}
+		}		
+cleanup:
+		free(line);
+		line = NULL;
+	}
+	
+	fclose(f);
+	return matched ? 0 : -1;
+}
+
+PAM_EXTERN int
+pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
+		    int argc, const char **argv)
+{
+	int i;
+	int rv;
+	int debug = 0;
+	int sense = PAM_AUTH_ERR;
+	const char *user = NULL;
+	char *seuser = NULL;
+	char *level = NULL;
+	const char *cfgfile = SEPERMIT_CONF_FILE;
+
+	/* Parse arguments. */
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "debug") == 0) {
+			debug = 1;
+		}
+		if (strcmp(argv[i], "conf=") == 0) {
+			cfgfile = argv[i] + 5;
+		}
+	}
+	
+	if (debug)
+		pam_syslog(pamh, LOG_NOTICE, "Parsing config file: %s", cfgfile);
+
+	if (pam_get_user(pamh, &user, NULL) != PAM_SUCCESS || user == NULL
+		|| *user == '\0') {
+		pam_syslog(pamh, LOG_ERR, "Cannot determine the user's name");
+		return PAM_USER_UNKNOWN;
+	}
+
+	if (is_selinux_enabled() > 0) {
+		if (security_getenforce() == 1) {
+			if (debug)
+				pam_syslog(pamh, LOG_NOTICE, "Enforcing mode, access will be allowed on match");
+			sense = PAM_SUCCESS;		
+		}
+		
+		if (getseuserbyname(user, &seuser, &level) != 0) {
+			seuser = NULL;
+			level = NULL;
+			pam_syslog(pamh, LOG_ERR, "getseuserbyname failed: %m");
+		}
+	}
+	
+	if (debug && sense != PAM_SUCCESS)
+		pam_syslog(pamh, LOG_NOTICE, "Access will not be allowed on match");
+
+	rv = sepermit_match(pamh, cfgfile, user, seuser, debug);
+
+	if (debug)
+		pam_syslog(pamh, LOG_NOTICE, "sepermit_match returned: %d", rv);
+	
+	free(seuser);
+	free(level);
+	
+	switch (rv) {
+		case -1:
+			return PAM_IGNORE;
+		case 0:
+			return sense;
+	}
+
+	return rv;
+}
+
+PAM_EXTERN int
+pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED,
+                int argc UNUSED, const char **argv UNUSED)
+{
+	return PAM_IGNORE;
+}
+
+PAM_EXTERN int
+pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
+		     int argc, const char **argv)
+{
+	return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+#ifdef PAM_STATIC
+    
+/* static module data */
+    
+struct pam_module _pam_access_modstruct = {
+    "pam_access",
+    pam_sm_authenticate,
+    pam_sm_setcred,
+    pam_sm_acct_mgmt,
+    NULL,
+    NULL,
+    NULL
+};
+#endif
+
diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf
--- /dev/null	2007-09-17 08:57:19.474470099 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 17:18:43.000000000 +0200
@@ -0,0 +1,6 @@
+# /etc/security/sepermit.conf
+#
+# Each line contains either:
+#        - an user name
+#        - a group name, with @group syntax
+#        - a SELinux user name, with %seuser syntax
diff -up Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am
--- Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit	2007-01-23 11:09:25.000000000 +0100
+++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 18:19:42.000000000 +0200
@@ -5,20 +5,21 @@
 CLEANFILES = *~
 
 EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
-		tst-pam_selinux
+		pam_seliux_permit.8 sepermit.conf tst-pam_selinux
 
 if HAVE_LIBSELINUX
   TESTS = tst-pam_selinux
-  man_MANS = pam_selinux.8 
+  man_MANS = pam_selinux.8 pam_selinux_permit.8
 endif
 
-XMLS = README.xml pam_selinux.8.xml
+XMLS = README.xml pam_selinux.8.xml pam_selinux_permit.8.xml
 
 securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
-	-I$(top_srcdir)/libpam_misc/include
+	-I$(top_srcdir)/libpam_misc/include \
+	-D SEPERMIT_CONF_FILE=\"$(SCONFIGDIR)/sepermit.conf\"
 AM_LDFLAGS = -no-undefined \
 	-L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
@@ -30,12 +31,16 @@ if HAVE_VERSIONING
 	-Wl,--version-script=$(srcdir)/../modules.map
 endif
 
+pam_selinux_permit_la_LDFLAGS= $(pam_selinux_la_LDFLAGS)
+
+secureconf_DATA = sepermit.conf
+
 if HAVE_LIBSELINUX
-  securelib_LTLIBRARIES = pam_selinux.la
+  securelib_LTLIBRARIES = pam_selinux.la pam_selinux_permit.la
   noinst_PROGRAMS = pam_selinux_check
 endif
 if ENABLE_REGENERATE_MAN
-noinst_DATA = README pam_selinux.8
+noinst_DATA = README pam_selinux.8 pam_selinux_permit.8
 README: pam_selinux.8.xml
 -include $(top_srcdir)/Make.xml.rules
 endif

pam-0.99.8.1-succif-in-operator.patch:

--- NEW FILE pam-0.99.8.1-succif-in-operator.patch ---
diff -up Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c
--- Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator	2006-08-31 12:20:39.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c	2007-09-19 19:36:22.000000000 +0200
@@ -191,13 +191,19 @@ static int
 evaluate_inlist(const char *left, const char *right)
 {
 	char *p;
-	if ((p=strstr(right, left)) == NULL)
-		return PAM_AUTH_ERR;
-	if (p == right || *(p-1) == ':') { /* ':' is a list separator */
-		p += strlen(left);
-		if (*p == '\0' || *p == ':') {
-		    return PAM_SUCCESS;
+	/* Don't care about left containing ':'. */
+	while ((p=strstr(right, left)) != NULL) {
+		if (p == right || *(p-1) == ':') { /* ':' is a list separator */
+			p += strlen(left);
+			if (*p == '\0' || *p == ':') {
+				return PAM_SUCCESS;
+			}
 		}
+		right = strchr(p, ':');
+		if (right == NULL)
+			break;
+		else
+			++right;
 	}
 	return PAM_AUTH_ERR;
 }


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- pam.spec	18 Sep 2007 20:23:57 -0000	1.157
+++ pam.spec	19 Sep 2007 18:11:42 -0000	1.158
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 7%{?dist}
+Release: 8%{?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
@@ -41,6 +41,8 @@
 Patch42: pam-0.99.8.1-console-hal-handled.patch
 Patch43: pam-0.99.8.1-console-mfd-scanners.patch
 Patch44: pam-0.99.7.1-namespace-homedir.patch
+Patch45: pam-0.99.8.1-selinux-permit.patch
+Patch46: pam-0.99.8.1-succif-in-operator.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -107,6 +109,8 @@
 %patch42 -p1 -b .hal-handled
 %patch43 -p1 -b .mfd-scanners
 %patch44 -p1 -b .homedir
+%patch45 -p1 -b .permit
+%patch46 -p1 -b .in-operator
 
 autoreconf
 
@@ -346,6 +350,7 @@
 /%{_lib}/security/pam_rootok.so
 /%{_lib}/security/pam_rps.so
 /%{_lib}/security/pam_selinux.so
+/%{_lib}/security/pam_selinux_permit.so
 /%{_lib}/security/pam_securetty.so
 /%{_lib}/security/pam_shells.so
 /%{_lib}/security/pam_stress.so
@@ -375,6 +380,7 @@
 %config(noreplace) %{_sysconfdir}/security/namespace.conf
 %attr(755,root,root) %config(noreplace) %{_sysconfdir}/security/namespace.init
 %config(noreplace) %{_sysconfdir}/security/pam_env.conf
+%config(noreplace) %{_sysconfdir}/security/sepermit.conf
 %config(noreplace) %{_sysconfdir}/security/time.conf
 %config(noreplace) %{_sysconfdir}/security/opasswd
 %dir %{_sysconfdir}/security/console.apps
@@ -397,6 +403,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
+- add pam_selinux_permit module
+- pam_succeed_if: fix in operator (#295151)
+
 * Tue Sep 18 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-7
 - when SELinux enabled always run the helper binary instead of
   direct shadow access (#293181)



From fedora-extras-commits at redhat.com  Wed Sep 19 18:30:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 14:30:51 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.35,1.36
Message-ID: <200709191830.l8JIUprP026495@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26466

Modified Files:
	em8300-kmod.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- em8300-kmod.spec	18 Sep 2007 19:03:04 -0000	1.35
+++ em8300-kmod.spec	19 Sep 2007 18:30:19 -0000	1.36
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.186.rc6.git7.fc8}
+%{!?kversion: %define kversion 2.6.23-0.187.rc6.git7.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.
+
 * Tue Sep 18 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23-0.186.rc6.git7.fc8.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:04:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:04:57 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.11,1.12
Message-ID: <200709191904.l8JJ4vPq000903@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv869/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
- Move XCB plugins to the main package.
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
  time in preparation for the first EPEL build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine-lib.spec	10 Sep 2007 15:35:50 -0000	1.11
+++ xine-lib.spec	19 Sep 2007 19:04:25 -0000	1.12
@@ -23,18 +23,19 @@
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
-%define         with_dfb    %{?_without_directfb:0}%{!?_without_directfb:1}
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -64,9 +65,9 @@
 %if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif # dfb
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
 %endif # imagemagick
@@ -76,7 +77,10 @@
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  wavpack-devel libmpcdec-devel
+BuildRequires:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
 %if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
 %endif # pa
@@ -116,7 +120,8 @@
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
 (some default values depend on target distribution): aalib, caca, directfb,
-imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -146,12 +151,9 @@
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif # dfb
-%if %{with_xcb}
-  - XCB output
-%endif # xcb
+%endif # directfb
 
 
 %prep
@@ -177,9 +179,9 @@
 %configure \
     --disable-dependency-tracking \
     --enable-ipv6 \
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif # dfb
+%endif # directfb
     --disable-a52dec \
     --disable-mad \
     --disable-dvdnavtest --with-external-dvdnav \
@@ -201,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -328,13 +332,16 @@
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
 %endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif # xcb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
-
 %files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
@@ -360,16 +367,11 @@
 %if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif # dfb
+%endif # directfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-%if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif # xcb
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -384,8 +386,10 @@
 
 
 %changelog
-* Mon Sep 10 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-2.1
-- Adjust default -extras feature set for EPEL-5.
+* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
 
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to



From fedora-extras-commits at redhat.com  Wed Sep 19 19:05:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:05:00 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.24,1.25
Message-ID: <200709191905.l8JJ50Fd000906@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv869/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
- Move XCB plugins to the main package.
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
  time in preparation for the first EPEL build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xine-lib.spec	9 Sep 2007 14:50:02 -0000	1.24
+++ xine-lib.spec	19 Sep 2007 19:04:27 -0000	1.25
@@ -9,20 +9,33 @@
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
-%define         have_vidix 1
+    %define     have_vidix  1
 %else
-%define         have_vidix 0
+    %define     have_vidix  0
 %endif
 %if 0%{?fedora} >= 8
-%define         with_xcb 1
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
-%define         with_xcb 0
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
+%endif
+%if 0%{?fedora}
+    %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
+    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
+%else
+    %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
+    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
+    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
+    %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -43,25 +56,37 @@
 BuildRequires:  libGLU-devel
 %if %{with_xcb}
 BuildRequires:  libxcb-devel
-%endif
+%endif # xcb
 # Video
 BuildRequires:  SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
+%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
 %if 0%{?_with_freetype:1}
 BuildRequires:  fontconfig-devel
-%endif
+%endif # freetype
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
+%if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires:  jack-audio-connection-kit-devel
+%endif # jack
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -93,11 +118,10 @@
 It can play back various media. It also decodes multimedia files from local
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  Non-default rpmbuild options:
---without imagemagick:  Disable ImageMagick support
---without directfb:     Disable DirectFB support
---with    freetype:     Enable FreeType/Fontconfig support
---with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too.  --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -108,23 +132,28 @@
 %description extras
 This package contains extra plugins for xine-lib:
   - EsounD
+%if %{with_jack}
   - JACK
+%endif # jack
+%if %{with_pa}
   - Pulseaudio
+%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
   - SDL
+%if %{with_aalib}
   - AA-lib
+%endif # aalib
+%if %{with_caca}
   - Libcaca
+%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
-%endif
+%endif # imagemagick
 %if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif
-%if %{with_xcb}
-  - XCB output
-%endif
+%endif # directfb
 
 
 %prep
@@ -174,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -241,7 +272,7 @@
 %{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
 %{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%endif # vidix
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -252,7 +283,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
@@ -262,7 +293,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%endif # ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
 %{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
@@ -300,14 +331,17 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif # xcb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
-
 %files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
@@ -315,26 +349,29 @@
 %files extras
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%endif # directfb
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-%if %{with_xcb}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -349,6 +386,11 @@
 
 
 %changelog
+* Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
+
 * Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
 - remove the dependency from -extras to -arts, and use Obsoletes to
   provide an upgrade path



From fedora-extras-commits at redhat.com  Wed Sep 19 19:22:35 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 19 Sep 2007 15:22:35 -0400
Subject: rpms/python-virtinst/devel
	python-virtinst-0.300.0-transient-qemu.patch, NONE,
	1.1 python-virtinst.spec, 1.25, 1.26
Message-ID: <200709191922.l8JJMZlg001328@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1298

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.300.0-transient-qemu.patch 
Log Message:
Fix post-install CDROM config

python-virtinst-0.300.0-transient-qemu.patch:

--- NEW FILE python-virtinst-0.300.0-transient-qemu.patch ---
diff -rup virtinst-0.300.0.orig/virtinst/FullVirtGuest.py virtinst-0.300.0.new/virtinst/FullVirtGuest.py
--- virtinst-0.300.0.orig/virtinst/FullVirtGuest.py	2007-09-19 15:19:16.000000000 -0400
+++ virtinst-0.300.0.new/virtinst/FullVirtGuest.py	2007-09-19 15:19:28.000000000 -0400
@@ -273,10 +273,13 @@ class FullVirtGuest(Guest.XenGuest):
         for d in self.disks:
             saved_path = None
             if d.device == Guest.VirtualDisk.DEVICE_CDROM and d.transient and not install:
-                # XXX hack. libvirt can't currently handle QEMU having an empty disk path
+                # XXX hack. libvirt can't currently handle QEMU having an empty disk path..
                 if self.type == "xen":
                     saved_path = d.path
                     d.path = None
+                else:
+                    # .. so simply remove CDROM device completely in non-Xen
+                    continue
 
             ret += d.get_xml_config(d.target)
             if saved_path != None:


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-virtinst.spec	12 Sep 2007 03:47:19 -0000	1.25
+++ python-virtinst.spec	19 Sep 2007 19:22:03 -0000	1.26
@@ -11,10 +11,11 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{name}-%{version}-fedora8-distro.patch
 Patch2: %{name}-0.200.0-default-arch.patch
+Patch3: %{name}-%{version}-transient-qemu.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,7 @@
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -68,6 +70,9 @@
 %{_bindir}/virt-image
 
 %changelog
+* Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-4.fc8
+- Fix post install CDROM config for KVM guests
+
 * Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-3.fc8
 - Fixed default architecture. Again.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:25:27 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 19 Sep 2007 15:25:27 -0400
Subject: rpms/pam/devel pam-0.99.8.1-selinux-permit.patch, 1.1,
	1.2 pam-0.99.8.1-succif-in-operator.patch, 1.1, 1.2
Message-ID: <200709191925.l8JJPRmm001532@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1506

Modified Files:
	pam-0.99.8.1-selinux-permit.patch 
	pam-0.99.8.1-succif-in-operator.patch 
Log Message:
- review
- don't free/malloc when unnecessary


pam-0.99.8.1-selinux-permit.patch:

Index: pam-0.99.8.1-selinux-permit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-selinux-permit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-selinux-permit.patch	19 Sep 2007 18:11:42 -0000	1.1
+++ pam-0.99.8.1-selinux-permit.patch	19 Sep 2007 19:25:24 -0000	1.2
@@ -1,6 +1,9 @@
+Written-by: Tomas Mraz <tmraz at redhat.com>
+Reviewed-by: Karel Zak <kzak at redhat.com>
+
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 17:18:43.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.8.xml	2007-09-19 19:37:26.000000000 +0200
 @@ -0,0 +1,182 @@
 +<?xml version="1.0" encoding='UTF-8'?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -186,7 +189,7 @@
 +</refentry>
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 18:14:36.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/pam_selinux_permit.c	2007-09-19 20:29:47.000000000 +0200
 @@ -0,0 +1,222 @@
 +/******************************************************************************
 + * A module for Linux-PAM that allows/denies acces based on SELinux state.
@@ -255,7 +258,7 @@
 +	FILE *f;
 +	char *line = NULL;
 +	char *start;
-+	size_t n = 0;
++	size_t len = 0;
 +	int matched = 0;
 +	
 +	f = fopen(cfgfile, "r");
@@ -264,11 +267,13 @@
 +		pam_syslog(pamh, LOG_ERR, "Failed to open config file %s: %m", cfgfile);
 +		return PAM_SERVICE_ERR;
 +	}
-+	
-+	while (!matched && getline(&line, &n, f) != -1) {
++
++	while (!matched && getline(&line, &len, f) != -1) {
++		size_t n;
++
 +		if (line[0] == '#')
-+			goto cleanup;
-+		
++			continue;
++
 +		start = line;
 +		while (isspace(*start))
 +			++start;
@@ -277,10 +282,10 @@
 +			--n;
 +		}
 +		if (n == 0)
-+			goto cleanup;
-+		
++			continue;
++
 +		start[n] = '\0';
-+		
++
 +		switch (start[0]) {
 +			case '@': 
 +				++start;
@@ -304,12 +309,10 @@
 +				if (strcmp(user, start) == 0) {
 +					matched = 1;
 +				}
-+		}		
-+cleanup:
-+		free(line);
-+		line = NULL;
++		}
 +	}
-+	
++
++	free(line);
 +	fclose(f);
 +	return matched ? 0 : -1;
 +}
@@ -336,7 +339,7 @@
 +			cfgfile = argv[i] + 5;
 +		}
 +	}
-+	
++
 +	if (debug)
 +		pam_syslog(pamh, LOG_NOTICE, "Parsing config file: %s", cfgfile);
 +
@@ -350,16 +353,16 @@
 +		if (security_getenforce() == 1) {
 +			if (debug)
 +				pam_syslog(pamh, LOG_NOTICE, "Enforcing mode, access will be allowed on match");
-+			sense = PAM_SUCCESS;		
++			sense = PAM_SUCCESS;
 +		}
-+		
++
 +		if (getseuserbyname(user, &seuser, &level) != 0) {
 +			seuser = NULL;
 +			level = NULL;
 +			pam_syslog(pamh, LOG_ERR, "getseuserbyname failed: %m");
 +		}
 +	}
-+	
++
 +	if (debug && sense != PAM_SUCCESS)
 +		pam_syslog(pamh, LOG_NOTICE, "Access will not be allowed on match");
 +
@@ -367,10 +370,10 @@
 +
 +	if (debug)
 +		pam_syslog(pamh, LOG_NOTICE, "sepermit_match returned: %d", rv);
-+	
++
 +	free(seuser);
 +	free(level);
-+	
++
 +	switch (rv) {
 +		case -1:
 +			return PAM_IGNORE;
@@ -412,7 +415,7 @@
 +
 diff -up /dev/null Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf
 --- /dev/null	2007-09-17 08:57:19.474470099 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 17:18:43.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/sepermit.conf	2007-09-19 19:37:26.000000000 +0200
 @@ -0,0 +1,6 @@
 +# /etc/security/sepermit.conf
 +#
@@ -422,7 +425,7 @@
 +#        - a SELinux user name, with %seuser syntax
 diff -up Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am
 --- Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am.permit	2007-01-23 11:09:25.000000000 +0100
-+++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 18:19:42.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_selinux/Makefile.am	2007-09-19 19:37:26.000000000 +0200
 @@ -5,20 +5,21 @@
  CLEANFILES = *~
  

pam-0.99.8.1-succif-in-operator.patch:

Index: pam-0.99.8.1-succif-in-operator.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-succif-in-operator.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-succif-in-operator.patch	19 Sep 2007 18:11:42 -0000	1.1
+++ pam-0.99.8.1-succif-in-operator.patch	19 Sep 2007 19:25:24 -0000	1.2
@@ -1,3 +1,6 @@
+Written-by: Tomas Mraz <tmraz at redhat.com>
+Reviewed-by: Karel Zak <kzak at redhat.com>
+
 diff -up Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c
 --- Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c.in-operator	2006-08-31 12:20:39.000000000 +0200
 +++ Linux-PAM-0.99.8.1/modules/pam_succeed_if/pam_succeed_if.c	2007-09-19 19:36:22.000000000 +0200



From fedora-extras-commits at redhat.com  Wed Sep 19 19:32:28 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 15:32:28 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.3, 1.4 eclipse-egit.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200709191932.l8JJWSSd001791@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1703

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Log Message:
* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
- 0.2.99 git20070919



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2007 18:16:03 -0000	1.3
+++ .cvsignore	19 Sep 2007 19:31:56 -0000	1.4
@@ -1,2 +1 @@
-egit.png
-egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-egit.spec	17 Sep 2007 16:54:16 -0000	1.5
+++ eclipse-egit.spec	19 Sep 2007 19:31:56 -0000	1.6
@@ -3,16 +3,14 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.2
-Release:          2.git20070911%{?dist}
+Version:          0.2.99
+Release:          0.git20070919%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
-Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
-Source1:          egit.png
-Patch0:           %{name}-add-feature.patch
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
 %if %{gcj_support}
@@ -39,8 +37,6 @@
 
 %prep
 %setup -q -c 
-%patch0 -p0
-cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -98,6 +94,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
+- 0.2.99 git20070919
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-2.git20070911.fc8
 - Update add feature and plugin patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2007 18:16:03 -0000	1.3
+++ sources	19 Sep 2007 19:31:56 -0000	1.4
@@ -1,2 +1 @@
-5d1082d9db40f01c5de094ac8769514b  egit.png
-d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 19:33:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:33:29 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.12,1.13
Message-ID: <200709191933.l8JJXTjf001930@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
- Fix "--without wavpack" build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xine-lib.spec	19 Sep 2007 19:04:25 -0000	1.12
+++ xine-lib.spec	19 Sep 2007 19:32:56 -0000	1.13
@@ -35,7 +35,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -340,7 +340,9 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
+%if %{with_wpack}
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%endif # wpack
 
 %files arts
 %defattr(-,root,root,-)
@@ -386,6 +388,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
 * Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
 - Move XCB plugins to the main package.
 - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build



From fedora-extras-commits at redhat.com  Wed Sep 19 19:33:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 15:33:31 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.25,1.26
Message-ID: <200709191933.l8JJXVnw001933@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1841/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
- Fix "--without wavpack" build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xine-lib.spec	19 Sep 2007 19:04:27 -0000	1.25
+++ xine-lib.spec	19 Sep 2007 19:32:59 -0000	1.26
@@ -35,7 +35,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -340,7 +340,9 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
+%if %{with_wpack}
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%endif # wpack
 
 %files arts
 %defattr(-,root,root,-)
@@ -386,6 +388,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
 * Sat Sep 15 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-3
 - Move XCB plugins to the main package.
 - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build



From fedora-extras-commits at redhat.com  Wed Sep 19 19:34:46 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 15:34:46 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.6,1.7
Message-ID: <200709191934.l8JJYkaG002052@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1987

Modified Files:
	eclipse-egit.spec 
Log Message:
add requires: git


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-egit.spec	19 Sep 2007 19:31:56 -0000	1.6
+++ eclipse-egit.spec	19 Sep 2007 19:34:14 -0000	1.7
@@ -13,6 +13,7 @@
 Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
+Requires:         git
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:34 -0700
Subject: [pkgdb] kaffeine: scop has requested watchcommits
Message-ID: <200709191937.l8JJbZY5002843@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on kaffeine (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:37 -0700
Subject: [pkgdb] kaffeine: scop has requested commit
Message-ID: <200709191937.l8JJbcaL013415@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on kaffeine (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 19:37:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Wed, 19 Sep 2007 12:37:32 -0700
Subject: [pkgdb] kaffeine: scop has requested watchbugzilla
Message-ID: <200709191937.l8JJbXB6013388@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on kaffeine (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 19:43:42 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 15:43:42 -0400
Subject: rpms/remind/devel remind.spec,1.4,1.5
Message-ID: <200709191943.l8JJhgE0002333@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2315

Modified Files:
	remind.spec 
Log Message:
Fixes bz #290761



Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/devel/remind.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- remind.spec	13 Sep 2007 21:43:25 -0000	1.4
+++ remind.spec	19 Sep 2007 19:43:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           remind
 Version:        03.01.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -92,6 +93,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
 * Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
 - Updated to version 03.01.02
 



From fedora-extras-commits at redhat.com  Wed Sep 19 19:45:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:45:52 -0700
Subject: [pkgdb] qimageblitz was added for kkofler
Message-ID: <200709191945.l8JJjreg005323@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qimageblitz with summary Interim image effect library for KDE 4.0
Kevin Fenzi (kevin) has approved Package qimageblitz
Kevin Fenzi (kevin) has added a Fedora devel branch for qimageblitz with an owner of kkofler
Kevin Fenzi (kevin) has approved qimageblitz in Fedora devel
Kevin Fenzi (kevin) has approved Package qimageblitz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qimageblitz (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qimageblitz (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qimageblitz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qimageblitz



From fedora-extras-commits at redhat.com  Wed Sep 19 19:46:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:46:02 -0700
Subject: [pkgdb] qimageblitz (Fedora, devel) updated by kevin
Message-ID: <200709191946.l8JJk3TF005389@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on qimageblitz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qimageblitz



From fedora-extras-commits at redhat.com  Wed Sep 19 19:46:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 12:46:02 -0700
Subject: [pkgdb] qimageblitz (Fedora, 7) updated by kevin
Message-ID: <200709191946.l8JJk4f8005408@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qimageblitz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qimageblitz (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on qimageblitz (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on qimageblitz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qimageblitz



From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:26 -0400
Subject: rpms/qimageblitz - New directory
Message-ID: <200709191947.l8JJlQPi002514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz

Log Message:
Directory /cvs/extras/rpms/qimageblitz added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:30 -0400
Subject: rpms/qimageblitz/devel - New directory
Message-ID: <200709191947.l8JJlUPv002532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz/devel

Log Message:
Directory /cvs/extras/rpms/qimageblitz/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:32 -0400
Subject: rpms/qimageblitz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709191947.l8JJlWLF002557@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz

Added Files:
	Makefile import.log 
Log Message:
Setup of module qimageblitz


--- NEW FILE Makefile ---
# Top level Makefile for module qimageblitz
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 19 19:47:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 19 Sep 2007 15:47:35 -0400
Subject: rpms/qimageblitz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709191947.l8JJlZY3002573@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYh2481/rpms/qimageblitz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qimageblitz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qimageblitz
# $Id: Makefile,v 1.1 2007/09/19 19:47:33 kevin Exp $
NAME := qimageblitz
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 fedora-extras-commits at redhat.com  Wed Sep 19 19:53:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 19 Sep 2007 15:53:12 -0400
Subject: rpms/gnumeric/devel gnumeric-1.6.3-gpl-md5.patch, NONE,
	1.1 gnumeric.spec, 1.32, 1.33
Message-ID: <200709191953.l8JJrCrR002796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.6.3-gpl-md5.patch 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
- Replace GPL incompatible licensed md5 code with GPL compatible code from
  gnulib


gnumeric-1.6.3-gpl-md5.patch:

--- NEW FILE gnumeric-1.6.3-gpl-md5.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.c
--- gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.c	2007-09-19 16:20:34.000000000 +0200
@@ -16,6 +16,7 @@
 
 #include "ms-biff.h"
 #include "biff-types.h"
+#include "md5.h"
 
 #include <gsf/gsf-input.h>
 #include <gsf/gsf-output.h>
@@ -154,39 +155,17 @@ ms_biff_pre_biff8_query_set_decrypt  (Bi
 	return TRUE;
 }
 
-/* 
-this is just cut out of wvMD5Final to get the byte order correct
-under MSB systems, the previous code was woefully tied to intel
-x86
-
-C.
-*/
-static void
-wvMD5StoreDigest (MD5_CTX *mdContext)
-{
-	unsigned int i, ii;
-	/* store buffer in digest */
-	for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-		mdContext->digest[ii] = (unsigned char) (mdContext->buf[i] & 0xFF);
-		mdContext->digest[ii + 1] =
-			(unsigned char) ((mdContext->buf[i] >> 8) & 0xFF);
-		mdContext->digest[ii + 2] =
-			(unsigned char) ((mdContext->buf[i] >> 16) & 0xFF);
-		mdContext->digest[ii + 3] =
-			(unsigned char) ((mdContext->buf[i] >> 24) & 0xFF);
-	}
-}
-
 static void
-makekey (guint32 block, RC4_KEY *key, MD5_CTX *valContext)
+makekey (guint32 block, RC4_KEY *key, const unsigned char *valDigest)
 {
-	MD5_CTX mdContext;
+	struct md5_ctx ctx;
+	unsigned char digest[16];
 	guint8 pwarray[64];
 
 	memset (pwarray, 0, 64);
 
 	/* 40 bit of hashed password, set by verify_password () */
-	memcpy (pwarray, valContext->digest, 5);
+	memcpy (pwarray, valDigest, 5);
 
 	/* put block number in byte 6...9 */
 	pwarray[5] = (guint8) (block & 0xFF);
@@ -197,12 +176,13 @@ makekey (guint32 block, RC4_KEY *key, MD
 	pwarray[9] = 0x80;
 	pwarray[56] = 0x48;
 
-	wvMD5Init (&mdContext);
-	wvMD5Update (&mdContext, pwarray, 64);
-	wvMD5StoreDigest (&mdContext);
-	prepare_key (mdContext.digest, 16, key);
+	md5_init_ctx (&ctx);
+	md5_process_block (pwarray, 64, &ctx);
+	md5_read_ctx (&ctx, digest);
+	prepare_key (digest, 16, key);
 
-	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (&ctx, sizeof (ctx));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (pwarray, sizeof (pwarray));
 }
 
@@ -214,10 +193,11 @@ makekey (guint32 block, RC4_KEY *key, MD
 static gboolean
 verify_password (guint8 const *password, guint8 const *docid,
 		 guint8 const *salt_data, guint8 const *hashedsalt_data,
-		 MD5_CTX *valContext)
+		 unsigned char *valDigest)
 {
 	guint8 pwarray [64], salt [64], hashedsalt [16];
-	MD5_CTX mdContext1, mdContext2;
+	struct md5_ctx mdContext;
+	unsigned char digest[16];
 	RC4_KEY key;
 	int offset, keyoffset, i;
 	unsigned int tocopy;
@@ -238,24 +218,24 @@ verify_password (guint8 const *password,
 	pwarray[2 * i] = 0x80;
 	pwarray[56] = (i << 4);
 
-	wvMD5Init (&mdContext1);
-	wvMD5Update (&mdContext1, pwarray, 64);
-	wvMD5StoreDigest (&mdContext1);
+	md5_init_ctx (&mdContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
 	offset = 0;
 	keyoffset = 0;
 	tocopy = 5;
 
-	wvMD5Init (valContext);
+	md5_init_ctx (&mdContext);
 	while (offset != 16) {
 		if ((64 - offset) < 5)
 			tocopy = 64 - offset;
 
-		memcpy (pwarray + offset, mdContext1.digest + keyoffset, tocopy);
+		memcpy (pwarray + offset, digest + keyoffset, tocopy);
 		offset += tocopy;
 
 		if (offset == 64) {
-			wvMD5Update (valContext, pwarray, 64);
+			md5_process_block (pwarray, 64, &mdContext);
 			keyoffset = tocopy;
 			tocopy = 5 - tocopy;
 			offset = 0;
@@ -274,11 +254,11 @@ verify_password (guint8 const *password,
 	pwarray[56] = 0x80;
 	pwarray[57] = 0x0A;
 
-	wvMD5Update (valContext, pwarray, 64);
-	wvMD5StoreDigest (valContext);
+	md5_process_block (pwarray, 64, &mdContext);
+	md5_read_ctx (&mdContext, valDigest);
 
 	/* Generate 40-bit RC4 key from 128-bit hashed password */
-	makekey (0, &key, valContext);
+	makekey (0, &key, valDigest);
 
 	memcpy (salt, salt_data, 16);
 	rc4 (salt, 16, &key);
@@ -289,17 +269,17 @@ verify_password (guint8 const *password,
 	memset (salt + 17, 0, 47);
 	salt[56] = 0x80;
 
-	wvMD5Init (&mdContext2);
-	wvMD5Update (&mdContext2, salt, 64);
-	wvMD5StoreDigest (&mdContext2);
+	md5_init_ctx (&mdContext);
+	md5_process_block (salt, 64, &mdContext);
+	md5_read_ctx (&mdContext, digest);
 
-	res = memcmp (mdContext2.digest, hashedsalt, 16) == 0;
+	res = memcmp (digest, hashedsalt, 16) == 0;
 
 	destroy_sensitive (pwarray, sizeof (pwarray));
 	destroy_sensitive (salt, sizeof (salt));
 	destroy_sensitive (hashedsalt, sizeof (hashedsalt));
-	destroy_sensitive (&mdContext1, sizeof (mdContext1));
-	destroy_sensitive (&mdContext2, sizeof (mdContext2));
+	destroy_sensitive (&mdContext, sizeof (mdContext));
+	destroy_sensitive (digest, sizeof (digest));
 	destroy_sensitive (&key, sizeof (key));
 
 	return res;
@@ -315,7 +294,7 @@ skip_bytes (BiffQuery *q, int start, int
 	block = (start + count) / REKEY_BLOCK;
 
 	if (block != q->block) {
-		makekey (q->block = block, &q->rc4_key, &q->md5_ctxt);
+		makekey (q->block = block, &q->rc4_key, q->md5_digest);
 		count = (start + count) % REKEY_BLOCK;
 	}
 
@@ -343,7 +322,7 @@ ms_biff_query_set_decrypt (BiffQuery *q,
 	g_return_val_if_fail (q->length == sizeof_BIFF_8_FILEPASS, FALSE);
 
 	if (!verify_password (password, q->data + 6,
-			      q->data + 22, q->data + 38, &q->md5_ctxt))
+			      q->data + 22, q->data + 38, q->md5_digest))
 		return FALSE;
 
 	q->encryption = MS_BIFF_CRYPTO_RC4;
@@ -484,7 +463,7 @@ ms_biff_query_next (BiffQuery *q)
 				data += step;
 				pos += step;
 				len -= step;
-				makekey (++q->block, &q->rc4_key, &q->md5_ctxt);
+				makekey (++q->block, &q->rc4_key, q->md5_digest);
 			}
 
 			rc4 (data, len, &q->rc4_key);
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.h
--- gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5	2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.h	2007-09-19 16:01:04.000000000 +0200
@@ -14,7 +14,6 @@
 
 #include <gsf/gsf.h>
 #include "rc4.h"
-#include "md5.h"
 
 typedef enum { MS_BIFF_CRYPTO_NONE = 0,
 	       MS_BIFF_CRYPTO_XOR,
@@ -51,7 +50,7 @@ typedef struct {
 	MsBiffCrypto encryption;
 	guint8   xor_key[16];
 	RC4_KEY	 rc4_key;
-	MD5_CTX  md5_ctxt;
+	unsigned char md5_digest[16];
 	int	 block;
 	gboolean dont_decrypt_next_record;
 } BiffQuery;
diff -up gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.h
--- gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5	2005-05-07 19:22:41.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.h	2007-09-19 16:01:04.000000000 +0200
@@ -1,66 +1,124 @@
-/* vim: set sw=8 ts=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef GNM_EXCEL_MD5_H
-#define GNM_EXCEL_MD5_H
+/* Declaration of functions and data types used for MD5 sum computing
+   library functions.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+      Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+#include <stdint.h>
+
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min)					\
+  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
+
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  uint32_t A;
+  uint32_t B;
+  uint32_t C;
+  uint32_t D;
+
+  uint32_t total[2];
+  uint32_t buflen;
+  uint32_t buffer[32];
+};
 
 /*
- **********************************************************************
- ** md5.h -- Header file for implementation of MD5                   **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version              **
- ** Revised (for MD5): RLR 4/27/91                                   **
- **   -- G modified to have y&~z instead of y&z                      **
- **   -- FF, GG, HH modified to add in last register done            **
- **   -- Access pattern: round 2 works mod 5, round 3 works mod 3    **
- **   -- distinct additive constant for each step                    **
- **   -- round 4 added, working mod 7                                **
- **********************************************************************
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
  */
 
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
-
-/* typedef a 32 bit type */
-#include <glib.h>
-typedef guint32 UINT4;
-
-/* Data structure for MD5 (Message Digest) computation */
-typedef struct {
-    UINT4 i[2];			/* number of _bits_ handled mod 2^64 */
-    UINT4 buf[4];		/* scratch buffer */
-    unsigned char in[64];	/* input buffer */
-    unsigned char digest[16];	/* actual digest after MD5Final call */
-} MD5_CTX;
-
-void wvMD5Init   (MD5_CTX *mdContext);
-void wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-/* void wvMD5Final (); */
-
-/*
- **********************************************************************
- ** End of md5.h                                                     **
- ******************************* (cut) ********************************
- */
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+				 struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+   boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *__md5_buffer (const char *buffer, size_t len,
+			   void *resblock) __THROW;
 
-#endif /* GNM_EXCEL_MD5_H */
+#endif /* md5.h */
diff -up gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.c
--- gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5	2004-08-31 17:25:21.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.c	2007-09-19 16:01:04.000000000 +0200
@@ -1,221 +1,448 @@
-/*
- **********************************************************************
- ** md5.c                                                            **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
- ** Created: 2/17/90 RLR                                             **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version                  **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- **                                                                  **
- ** License to copy and use this software is granted provided that   **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function.                                       **
- **                                                                  **
- ** License is also granted to make and use derivative works         **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
- ** material mentioning or referencing the derived work.             **
- **                                                                  **
- ** RSA Data Security, Inc. makes no representations concerning      **
- ** either the merchantability of this software or the suitability   **
- ** of this software for any particular purpose.  It is provided "as **
- ** is" without express or implied warranty of any kind.             **
- **                                                                  **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software.                                   **
- **********************************************************************
- */
+/* Functions to compute MD5 message digest of files or memory blocks.
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
+
+
 
-/* -- include the following line if the md5.h header file is separate -- */
 #include "md5.h"
 
-/* F, G and H are basic MD5 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s, ac) \
-  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) \
-  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) \
-  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) \
-  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
-   (a) = ROTATE_LEFT ((a), (s)); \
-   (a) += (b); \
-  }
-
-
-/* Basic MD5 step. Transform buf based on in.  */
-static void
-Transform (UINT4 *buf, UINT4 *in)
-{
-    UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
-    /* Round 1 */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-    FF (a, b, c, d, in[0], S11, 3614090360UL);	/* 1 */
-    FF (d, a, b, c, in[1], S12, 3905402710UL);	/* 2 */
-    FF (c, d, a, b, in[2], S13, 606105819UL);	/* 3 */
-    FF (b, c, d, a, in[3], S14, 3250441966UL);	/* 4 */
-    FF (a, b, c, d, in[4], S11, 4118548399UL);	/* 5 */
-    FF (d, a, b, c, in[5], S12, 1200080426UL);	/* 6 */
-    FF (c, d, a, b, in[6], S13, 2821735955UL);	/* 7 */
-    FF (b, c, d, a, in[7], S14, 4249261313UL);	/* 8 */
-    FF (a, b, c, d, in[8], S11, 1770035416UL);	/* 9 */
-    FF (d, a, b, c, in[9], S12, 2336552879UL);	/* 10 */
-    FF (c, d, a, b, in[10], S13, 4294925233UL);	/* 11 */
-    FF (b, c, d, a, in[11], S14, 2304563134UL);	/* 12 */
-    FF (a, b, c, d, in[12], S11, 1804603682UL);	/* 13 */
-    FF (d, a, b, c, in[13], S12, 4254626195UL);	/* 14 */
-    FF (c, d, a, b, in[14], S13, 2792965006UL);	/* 15 */
-    FF (b, c, d, a, in[15], S14, 1236535329UL);	/* 16 */
-
-    /* Round 2 */
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-    GG (a, b, c, d, in[1], S21, 4129170786UL);	/* 17 */
-    GG (d, a, b, c, in[6], S22, 3225465664UL);	/* 18 */
-    GG (c, d, a, b, in[11], S23, 643717713UL);	/* 19 */
-    GG (b, c, d, a, in[0], S24, 3921069994UL);	/* 20 */
-    GG (a, b, c, d, in[5], S21, 3593408605UL);	/* 21 */
-    GG (d, a, b, c, in[10], S22, 38016083UL);	/* 22 */
-    GG (c, d, a, b, in[15], S23, 3634488961UL);	/* 23 */
-    GG (b, c, d, a, in[4], S24, 3889429448UL);	/* 24 */
-    GG (a, b, c, d, in[9], S21, 568446438UL);	/* 25 */
-    GG (d, a, b, c, in[14], S22, 3275163606UL);	/* 26 */
-    GG (c, d, a, b, in[3], S23, 4107603335UL);	/* 27 */
-    GG (b, c, d, a, in[8], S24, 1163531501UL);	/* 28 */
-    GG (a, b, c, d, in[13], S21, 2850285829UL);	/* 29 */
-    GG (d, a, b, c, in[2], S22, 4243563512UL);	/* 30 */
-    GG (c, d, a, b, in[7], S23, 1735328473UL);	/* 31 */
-    GG (b, c, d, a, in[12], S24, 2368359562UL);	/* 32 */
-
-    /* Round 3 */
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-    HH (a, b, c, d, in[5], S31, 4294588738UL);	/* 33 */
-    HH (d, a, b, c, in[8], S32, 2272392833UL);	/* 34 */
-    HH (c, d, a, b, in[11], S33, 1839030562UL);	/* 35 */
-    HH (b, c, d, a, in[14], S34, 4259657740UL);	/* 36 */
-    HH (a, b, c, d, in[1], S31, 2763975236UL);	/* 37 */
-    HH (d, a, b, c, in[4], S32, 1272893353UL);	/* 38 */
-    HH (c, d, a, b, in[7], S33, 4139469664UL);	/* 39 */
-    HH (b, c, d, a, in[10], S34, 3200236656UL);	/* 40 */
-    HH (a, b, c, d, in[13], S31, 681279174UL);	/* 41 */
-    HH (d, a, b, c, in[0], S32, 3936430074UL);	/* 42 */
-    HH (c, d, a, b, in[3], S33, 3572445317UL);	/* 43 */
-    HH (b, c, d, a, in[6], S34, 76029189UL);	/* 44 */
-    HH (a, b, c, d, in[9], S31, 3654602809UL);	/* 45 */
-    HH (d, a, b, c, in[12], S32, 3873151461UL);	/* 46 */
-    HH (c, d, a, b, in[15], S33, 530742520UL);	/* 47 */
-    HH (b, c, d, a, in[2], S34, 3299628645UL);	/* 48 */
-
-    /* Round 4 */
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-    II (a, b, c, d, in[0], S41, 4096336452UL);	/* 49 */
-    II (d, a, b, c, in[7], S42, 1126891415UL);	/* 50 */
-    II (c, d, a, b, in[14], S43, 2878612391UL);	/* 51 */
-    II (b, c, d, a, in[5], S44, 4237533241UL);	/* 52 */
-    II (a, b, c, d, in[12], S41, 1700485571UL);	/* 53 */
-    II (d, a, b, c, in[3], S42, 2399980690UL);	/* 54 */
-    II (c, d, a, b, in[10], S43, 4293915773UL);	/* 55 */
-    II (b, c, d, a, in[1], S44, 2240044497UL);	/* 56 */
-    II (a, b, c, d, in[8], S41, 1873313359UL);	/* 57 */
-    II (d, a, b, c, in[15], S42, 4264355552UL);	/* 58 */
-    II (c, d, a, b, in[6], S43, 2734768916UL);	/* 59 */
-    II (b, c, d, a, in[13], S44, 1309151649UL);	/* 60 */
-    II (a, b, c, d, in[4], S41, 4149444226UL);	/* 61 */
-    II (d, a, b, c, in[11], S42, 3174756917UL);	/* 62 */
-    II (c, d, a, b, in[2], S43, 718787259UL);	/* 63 */
-    II (b, c, d, a, in[9], S44, 3951481745UL);	/* 64 */
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
-}
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <endian.h>
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifdef _LIBC
+/* We need to keep the namespace clean so define the MD5 function
+   protected using leading __ .  */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define SWAP(n) (n)
+#endif
+
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
 void
-wvMD5Init (MD5_CTX *mdContext)
+md5_init_ctx (struct md5_ctx *ctx)
 {
-    mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
 
-    /* Load magic initialization constants.
-     */
-    mdContext->buf[0] = (UINT4) 0x67452301;
-    mdContext->buf[1] = (UINT4) 0xefcdab89;
-    mdContext->buf[2] = (UINT4) 0x98badcfe;
-    mdContext->buf[3] = (UINT4) 0x10325476;
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
 }
 
-void
-wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+  ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+  ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+  ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  uint32_t bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+  ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, size * 4, ctx);
+
+  return md5_read_ctx (ctx, resbuf);
+}
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
 {
-    UINT4 in[16];
-    int mdi;
-    unsigned int i, ii;
-
-    /* compute number of bytes mod 64 */
-    mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
-
-    /* update number of bits */
-    if ((mdContext->i[0] + ((UINT4) inLen << 3)) < mdContext->i[0])
-	mdContext->i[1]++;
-    mdContext->i[0] += ((UINT4) inLen << 3);
-    mdContext->i[1] += ((UINT4) inLen >> 29);
-
-    while (inLen--)
-      {
-	  /* add new character to buffer, increment mdi */
-	  mdContext->in[mdi++] = *inBuf++;
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+         computation function processes the whole buffer so that with the
+         next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
 
-	  /* transform if necessary */
-	  if (mdi == 0x40)
+	  sum += n;
+
+	  if (sum == BLOCKSIZE)
+	    break;
+
+	  if (n == 0)
 	    {
-		for (i = 0, ii = 0; i < 16; i++, ii += 4)
-		    in[i] = (((UINT4) mdContext->in[ii + 3]) << 24) |
-			(((UINT4) mdContext->in[ii + 2]) << 16) |
-			(((UINT4) mdContext->in[ii + 1]) << 8) |
-			((UINT4) mdContext->in[ii]);
-		Transform (mdContext->buf, in);
-		mdi = 0;
+	      /* Check for the error flag IFF N == 0, so that we don't
+	         exit the loop after a partial read due to e.g., EAGAIN
+	         or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
 	    }
-      }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+         BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+process_partial_block:
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (ctx->buflen > 64)
+	{
+	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
+
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
+	{
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
+	}
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
+	{
+	  md5_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+	}
+      ctx->buflen = left_over;
+    }
 }
 
-/*
- **********************************************************************
- ** End of md5.c                                                     **
- ******************************* (cut) ********************************
- */
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
+
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  uint32_t correct_words[16];
+  const uint32_t *words = buffer;
+  size_t nwords = len / sizeof (uint32_t);
+  const uint32_t *endp = words + nwords;
+  uint32_t A = ctx->A;
+  uint32_t B = ctx->B;
+  uint32_t C = ctx->C;
+  uint32_t D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      uint32_t *cwp = correct_words;
+      uint32_t A_save = A;
+      uint32_t B_save = B;
+      uint32_t C_save = C;
+      uint32_t D_save = D;
+
+      /* First round: using the given function, the context and a constant
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+         cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+         They are defined in RFC 1321 as
+
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+         Here is an equivalent invocation using Perl:
+
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D, 7, 0xd76aa478);
+      OP (D, A, B, C, 12, 0xe8c7b756);
+      OP (C, D, A, B, 17, 0x242070db);
+      OP (B, C, D, A, 22, 0xc1bdceee);
+      OP (A, B, C, D, 7, 0xf57c0faf);
+      OP (D, A, B, C, 12, 0x4787c62a);
+      OP (C, D, A, B, 17, 0xa8304613);
+      OP (B, C, D, A, 22, 0xfd469501);
+      OP (A, B, C, D, 7, 0x698098d8);
+      OP (D, A, B, C, 12, 0x8b44f7af);
+      OP (C, D, A, B, 17, 0xffff5bb1);
+      OP (B, C, D, A, 22, 0x895cd7be);
+      OP (A, B, C, D, 7, 0x6b901122);
+      OP (D, A, B, C, 12, 0xfd987193);
+      OP (C, D, A, B, 17, 0xa679438e);
+      OP (B, C, D, A, 22, 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)					\
+      do								\
+	{								\
+	  a += f (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+      /* Round 2.  */
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
+      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+      /* Round 3.  */
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+      /* Round 4.  */
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
+}


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnumeric.spec	31 Aug 2007 08:52:05 -0000	1.32
+++ gnumeric.spec	19 Sep 2007 19:52:40 -0000	1.33
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.6.3
-Release:          11%{?dist}
+Release:          12%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -13,6 +13,7 @@
 Patch1:           gnumeric-1.4.1-excelcrash.patch
 Patch2:           gnumeric-1.6.3-helppath.patch
 Patch3:           gnumeric-1.6.3-gda3.patch
+Patch4:           gnumeric-1.6.3-gpl-md5.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -50,6 +51,7 @@
 %patch1 -p1 -b .excelcrash
 %patch2 -p1 -b .helppath
 %patch3 -p1 -b .gda3
+%patch4 -p1 -b .gpl-md5
 chmod -x plugins/excel/rc4.?
 
 
@@ -158,7 +160,8 @@
 %exclude %{_datadir}/%{name}/%{version}/idl
 %{_datadir}/mime-info
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/omf/%{name}
+# The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
+%dir %{_datadir}/omf/%{name}
 %{_mandir}/man1/*
 
 %files devel
@@ -168,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
+- Replace GPL incompatible licensed md5 code with GPL compatible code from
+  gnulib
+
 * Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-11
 - Fix Source0 URL
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:03:51 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 16:03:51 -0400
Subject: rpms/remind/F-7 remind.spec,1.4,1.5
Message-ID: <200709192003.l8JK3pNc009054@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9028

Modified Files:
	remind.spec 
Log Message:
Fixes bz #290761



Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/F-7/remind.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- remind.spec	13 Sep 2007 22:04:44 -0000	1.4
+++ remind.spec	19 Sep 2007 20:03:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           remind
 Version:        03.01.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -92,6 +93,9 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
 * Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
 - Updated to version 03.01.02
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:10:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 16:10:51 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.60, 1.61 fedora-logos.spec,
	1.84, 1.85 sources, 1.65, 1.66
Message-ID: <200709192010.l8JKAp9K009402@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9240

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
gdm theme for real



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	19 Sep 2007 16:39:06 -0000	1.60
+++ .cvsignore	19 Sep 2007 20:10:17 -0000	1.61
@@ -1 +1 @@
-fedora-logos-7.92.3.tar.bz2
+fedora-logos-7.92.4.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fedora-logos.spec	19 Sep 2007 16:39:06 -0000	1.84
+++ fedora-logos.spec	19 Sep 2007 20:10:17 -0000	1.85
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 7.92.3
+Version: 7.92.4
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -135,6 +135,11 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraDNA
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraInfinity
+for i in gdm/FedoraInfinity/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraInfinity
+done
+
 
 # kdmtheme
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/Bluecurve
@@ -203,6 +208,9 @@
 # end i386 bits
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.4-1
+- Acutally install the gdm theme
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 7.92.3-1
 - Add infinity gdm theme
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-logos/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	19 Sep 2007 16:39:06 -0000	1.65
+++ sources	19 Sep 2007 20:10:17 -0000	1.66
@@ -1 +1 @@
-6f5fa87bd54b34b2614799b78b05f5a9  fedora-logos-7.92.3.tar.bz2
+98be98d69f938dc7524a0a166b990e48  fedora-logos-7.92.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:47 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:47 -0400
Subject: rpms/util-vserver/devel util-vserver.spec,1.32,1.33
Message-ID: <200709192011.l8JKBlpL009531@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/devel

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- util-vserver.spec	3 Sep 2007 17:42:38 -0000	1.32
+++ util-vserver.spec	19 Sep 2007 20:11:14 -0000	1.33
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,10 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+# TODO: remove in FC9...
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +365,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:50 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:50 -0400
Subject: rpms/util-vserver/FC-6 util-vserver.spec,1.28,1.29
Message-ID: <200709192011.l8JKBo1c009536@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/FC-6

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/FC-6/util-vserver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util-vserver.spec	3 Sep 2007 17:56:55 -0000	1.28
+++ util-vserver.spec	19 Sep 2007 20:11:18 -0000	1.29
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,9 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +364,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:11:53 2007
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Wed, 19 Sep 2007 16:11:53 -0400
Subject: rpms/util-vserver/F-7 util-vserver.spec,1.28,1.29
Message-ID: <200709192011.l8JKBrs2009539@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9448/F-7

Modified Files:
	util-vserver.spec 
Log Message:
- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
  a directory becomes a symlink. Hence, remove the 'etch' directory in
  %%pre



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/F-7/util-vserver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util-vserver.spec	3 Sep 2007 17:56:53 -0000	1.28
+++ util-vserver.spec	19 Sep 2007 20:11:21 -0000	1.29
@@ -29,7 +29,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -261,6 +261,9 @@
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -361,6 +364,11 @@
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-2
+- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
+  a directory becomes a symlink. Hence, remove the 'etch' directory in
+  %%pre
+
 * Mon Sep  3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.214-1
 - updated to 0.30.214
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:17:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 16:17:02 -0400
Subject: rpms/kaffeine/devel kaffeine.spec,1.8,1.9
Message-ID: <200709192017.l8JKH25p009826@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9805

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
- Avoid autotools re-run after configure (unclean upstream tarball?)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kaffeine.spec	25 Aug 2007 14:25:38 -0000	1.8
+++ kaffeine.spec	19 Sep 2007 20:16:29 -0000	1.9
@@ -8,7 +8,7 @@
 #define nonfree 1
 
 Version: 0.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -87,6 +87,8 @@
 #  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
@@ -185,6 +187,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
 * Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
 - respin (BuildID)
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:19:23 2007
From: fedora-extras-commits at redhat.com (Ray Van Dolson (rayvd))
Date: Wed, 19 Sep 2007 16:19:23 -0400
Subject: rpms/remind/FC-6 .cvsignore, 1.3, 1.4 remind-nostrip.patch, 1.1,
	1.2 remind.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709192019.l8JKJNU4009954@cvs-int.fedora.redhat.com>

Author: rayvd

Update of /cvs/extras/rpms/remind/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9909

Modified Files:
	.cvsignore remind-nostrip.patch remind.spec sources 
Log Message:
Version bump to 03.01.02 and fix bz #290761



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 16:14:36 -0000	1.3
+++ .cvsignore	19 Sep 2007 20:18:50 -0000	1.4
@@ -1 +1 @@
-remind-03.01.00.tar.gz
+remind-03.01.02.tar.gz

remind-nostrip.patch:

Index: remind-nostrip.patch
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/remind-nostrip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- remind-nostrip.patch	31 May 2007 20:38:14 -0000	1.1
+++ remind-nostrip.patch	19 Sep 2007 20:18:50 -0000	1.2
@@ -1,12 +1,12 @@
-diff -uNr remind-03.00.24.orig/src/Makefile.in remind-03.00.24/src/Makefile.in
---- remind-03.00.24.orig/src/Makefile.in	2005-09-29 20:29:32.000000000 -0700
-+++ remind-03.00.24/src/Makefile.in	2007-04-25 16:36:53.000000000 -0700
-@@ -53,8 +53,6 @@
- 	for prog in $(PROGS) $(SCRIPTS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+diff -uNr remind-03.01.02.orig/src/Makefile.in remind-03.01.02/src/Makefile.in
+--- remind-03.01.02.orig/src/Makefile.in	2007-08-31 20:29:58.000000000 -0700
++++ remind-03.01.02/src/Makefile.in	2007-09-13 14:30:59.000000000 -0700
+@@ -62,8 +62,6 @@
  	done
--	-strip $(DESTDIR)$(bindir)/remind || true
--	-strip $(DESTDIR)$(bindir)/rem2ps || true
- 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 
+ install: install-nostripped
+-	strip $(DESTDIR)$(bindir)/remind || true
+-	strip $(DESTDIR)$(bindir)/rem2ps || true
+ 
+ clean:
+ 	rm -f *.o *~ core *.bak $(PROGS)


Index: remind.spec
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/remind.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remind.spec	21 Aug 2007 16:14:36 -0000	1.2
+++ remind.spec	19 Sep 2007 20:18:50 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           remind
-Version:        03.01.00
-Release:        1%{?dist}
+Version:        03.01.02
+Release:        2%{?dist}
 Summary:        A sophisticated calendar and alarm program
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2
 URL:            http://www.roaringpenguin.com/en/penguin/openSourceProducts/remind
 Source0:        http://www.roaringpenguin.com/files/download/remind-%{version}.tar.gz
 Source1:        tkremind.desktop
@@ -25,6 +25,7 @@
 Summary:        A graphical front-end for remind using Tcl/Tk
 Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
+Requires:       tcllib
 
 %description gui
 The remind-gui package contains a (self-described) "cheesy" graphical front
@@ -75,15 +76,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/cm2rem.tcl
-%{_bindir}/kall
-%{_bindir}/rem
 %{_bindir}/rem2ps
 %{_bindir}/remind
+%{_bindir}/rem
 %{_mandir}/man1/cm2rem.1.gz
-%{_mandir}/man1/kall.1.gz
-%{_mandir}/man1/rem.1.gz
 %{_mandir}/man1/rem2ps.1.gz
 %{_mandir}/man1/remind.1.gz
+%{_mandir}/man1/rem.1.gz
 
 %doc COPYRIGHT docs/README.UNIX docs/WHATSNEW examples www
 
@@ -94,6 +93,16 @@
 %{_mandir}/man1/tkremind.1.gz
 
 %changelog
+* Thu Sep 19 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-2
+- Added tcllib requires per bz #290761
+
+* Thu Sep 13 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.02-1
+- Updated to version 03.01.02
+
+* Thu Aug 23 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.01-1
+- Updated to version 03.01.01
+- Updated license tag to GPLv2
+
 * Wed Aug 15 2007 Ray Van Dolson <rayvd at bludgeon.org> - 03.01.00-1
 - Updated to version 03.01.00
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/remind/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 16:14:36 -0000	1.3
+++ sources	19 Sep 2007 20:18:50 -0000	1.4
@@ -1 +1 @@
-976046423402a403f4972c04d96456b2  remind-03.01.00.tar.gz
+6cd87cfbd5547e0477f5cbf7e900dc50  remind-03.01.02.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 20:26:48 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 19 Sep 2007 16:26:48 -0400
Subject: rpms/xen/devel xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.183,
	1.184
Message-ID: <200709192026.l8JKQmmO010280@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10226

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix VIF type attribute handling
Resolves: rhbz #296061

xen-clobber-vif-type.patch:

--- NEW FILE xen-clobber-vif-type.patch ---
diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py	2007-09-19 14:24:34.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py	2007-09-19 14:25:28.000000000 -0400
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             mac = randomMAC()
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge:


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xen.spec	28 Aug 2007 23:16:53 -0000	1.183
+++ xen.spec	19 Sep 2007 20:26:16 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -27,6 +27,7 @@
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch31: xen-tpm-functions.patch
+Patch32: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -129,6 +130,7 @@
 %patch30 -p1
 
 %patch31 -p1
+%patch32 -p1
 
 # config patches
 %patch100 -p1
@@ -279,6 +281,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-6.fc8
+- Don't clobber the VIF type attribute in FV guests (rhbz #296061)
+
 * Tue Aug 28 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc8
 - Added dep on openssl for blktap-qcow
 



From fedora-extras-commits at redhat.com  Wed Sep 19 20:54:29 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 19 Sep 2007 16:54:29 -0400
Subject: rpms/qimageblitz/devel qimageblitz.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709192054.l8JKsTEO011178@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qimageblitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11139/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qimageblitz.spec 
Log Message:
New package qimageblitz - Interim image effect library for KDE 4.0



--- NEW FILE qimageblitz.spec ---
%define revision 706674

Summary: Interim image effect library for KDE 4.0
Name:    qimageblitz
Version: 0.0.4
Release: 0.2.svn%{revision}%{?dist}

Group:   System Environment/Libraries
License: BSD and ImageMagick
URL:     http://www.kde.org
Source0: http://ftp.debian.org/debian/pool/main/q/qimageblitz/qimageblitz_0.0.%{revision}.orig.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: qt4-devel

%description
Blitz is an interim image effect library that people can use until KDE 4.1 is
released. KImageEffect, the old image effect class is being dropped for KDE 4.0
and the replacement, Quasar, won't be ready until KDE 4.1. Blitz gives people
something to use in the meantime.

%package devel
Summary: Developer files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel pkgconfig
%description devel
%{summary}.

%package examples
Summary: Example programs for %{name}
Group:   System Environment/Libraries
%description examples
This package contains the blitztest example program for %{name}.

%prep
%setup -q -n qimageblitz-0.0.%{revision}

%build
%cmake .
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir $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,-)
%doc Changelog README*
%{_libdir}/libqimageblitz.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libqimageblitz.so
%{_libdir}/pkgconfig/qimageblitz.pc
%{_includedir}/qimageblitz/

%files examples
%defattr(-,root,root,-)
%{_bindir}/blitztest

%changelog
* Wed Sep 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.2.svn706674
- Move blitztest example to its own subpackage.

* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.1.svn706674
- First Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 19:47:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 20:53:57 -0000	1.2
@@ -0,0 +1 @@
+qimageblitz_0.0.706674.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 19:47:33 -0000	1.1
+++ sources	19 Sep 2007 20:53:57 -0000	1.2
@@ -0,0 +1 @@
+7a1f4f25a653fd09a4a2f19e2eb10de7  qimageblitz_0.0.706674.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:27 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:27 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4SiL007945@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchbugzilla acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:28 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:28 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4Uih029123@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the watchcommits acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 21:04:29 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 19 Sep 2007 14:04:29 -0700
Subject: [pkgdb] kaffeine had acl change status
Message-ID: <200709192104.l8JL4Vdw029132@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kaffeine (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kaffeine



From fedora-extras-commits at redhat.com  Wed Sep 19 21:14:20 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 19 Sep 2007 17:14:20 -0400
Subject: rpms/qimageblitz/F-7 qimageblitz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709192114.l8JLEKIH017855@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qimageblitz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17739/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qimageblitz.spec 
Log Message:
New package qimageblitz - Interim image effect library for KDE 4.0


--- NEW FILE qimageblitz.spec ---
%define revision 706674

Summary: Interim image effect library for KDE 4.0
Name:    qimageblitz
Version: 0.0.4
Release: 0.2.svn%{revision}%{?dist}

Group:   System Environment/Libraries
License: BSD and ImageMagick
URL:     http://www.kde.org
Source0: http://ftp.debian.org/debian/pool/main/q/qimageblitz/qimageblitz_0.0.%{revision}.orig.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: qt4-devel

%description
Blitz is an interim image effect library that people can use until KDE 4.1 is
released. KImageEffect, the old image effect class is being dropped for KDE 4.0
and the replacement, Quasar, won't be ready until KDE 4.1. Blitz gives people
something to use in the meantime.

%package devel
Summary: Developer files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel pkgconfig
%description devel
%{summary}.

%package examples
Summary: Example programs for %{name}
Group:   System Environment/Libraries
%description examples
This package contains the blitztest example program for %{name}.

%prep
%setup -q -n qimageblitz-0.0.%{revision}

%build
%cmake .
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir $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,-)
%doc Changelog README*
%{_libdir}/libqimageblitz.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libqimageblitz.so
%{_libdir}/pkgconfig/qimageblitz.pc
%{_includedir}/qimageblitz/

%files examples
%defattr(-,root,root,-)
%{_bindir}/blitztest

%changelog
* Wed Sep 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.2.svn706674
- Move blitztest example to its own subpackage.

* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.4-0.1.svn706674
- First Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Sep 2007 19:47:33 -0000	1.1
+++ .cvsignore	19 Sep 2007 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+qimageblitz_0.0.706674.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qimageblitz/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Sep 2007 19:47:33 -0000	1.1
+++ sources	19 Sep 2007 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+7a1f4f25a653fd09a4a2f19e2eb10de7  qimageblitz_0.0.706674.orig.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 19 21:16:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 19 Sep 2007 17:16:39 -0400
Subject: rpms/kaffeine/EL-5 .cvsignore, 1.3, 1.4 kaffeine.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709192116.l8JLGdRm017904@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17880

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
+++ .cvsignore	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,2 +1,4 @@
 kaffeine-0.8.2.tar.bz2
 kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.5.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/kaffeine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kaffeine.spec	29 Nov 2006 18:40:14 -0000	1.3
+++ kaffeine.spec	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,36 +1,27 @@
 
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define _with_gstreamer --with-gstreamer
-%endif
-
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
-%define gst 08 
-BuildRequires: libXtst-devel libXinerama-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 %endif
 
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.3
-Release: 2%{?dist}
+Version: 0.8.5
+Release: 4%{?dist}
 
-%if "%{?nonfree:1}" == "1"
-Name:    kaffeine-extras-nonfree
-%define  _with_lame --with-lame
-Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
-# split occurred here
-Conflicts: kaffeine < 0.8.2-2
-%else
+%if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
+%else
+Name:    kaffeine-extras-nonfree
 %endif
 
-License: GPL
+License: GPLv2+
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -38,23 +29,19 @@
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-%{!?_without_dvb:BuildRequires: glibc-kernheaders }
-%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
-# not included in Extras, disabled
-%{?_with_lame:BuildRequires: lame-devel}
-
-## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
-## everybondy should be using kde >= 3.5.4 by now... (:
-#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
-#if "%{?kdelibs_ver}" >= "3.5.4"
-%define x_mplayer2_hack 1
-Requires: kdelibs >= 6:3.5.4
-#or
-#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
-#endif
+%if 0%{?fedora} > 7
+BuildRequires: libxcb-devel
+%endif
+# dvb
+BuildRequires: glibc-kernheaders 
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
 
 %if "%{?nonfree:1}" == "1" 
-%if "%{?fedora}" > "4"
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+%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/nonfree codec support
@@ -96,16 +83,17 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+# easier than patching, and using 
+#  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --disable-final \
-  %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
 
@@ -146,7 +134,7 @@
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 %endif
 
 
@@ -177,7 +165,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
@@ -191,15 +180,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
 %endif
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
 
 * Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2006 15:12:29 -0000	1.3
+++ sources	19 Sep 2007 21:16:06 -0000	1.4
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2
+71814e7612f1f7e1b6cd954d352e4201  kaffeine-0.8.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:27:23 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Wed, 19 Sep 2007 17:27:23 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.155, 1.156 mkinitrd.spec, 1.220, 
	1.221 sources, 1.198, 1.199
Message-ID: <200709192127.l8JLRNbG018454@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18357

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.17-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	11 Sep 2007 15:32:19 -0000	1.155
+++ .cvsignore	19 Sep 2007 21:26:40 -0000	1.156
@@ -1 +1 @@
-mkinitrd-6.0.16.tar.bz2
+mkinitrd-6.0.17.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- mkinitrd.spec	11 Sep 2007 15:32:19 -0000	1.220
+++ mkinitrd.spec	19 Sep 2007 21:26:40 -0000	1.221
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.16
+Version: 6.0.17
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,14 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Wed Sep 19 2007 Peter Jones <pjones at redhat.com> - 6.0.17-1
+- Fix missing quotes causing failure to detect erroneous "--with" command line
+  arguments (#249163)
+- Use open64 in losetup so large files work (#220687)
+- Fix sysfs paths for fw-sbp2 (#231708)
+- Handle spaces in kernel command line better (#240785)
+- Fix handling of --omit-lvm-modules and --omit-dmraid
+
 * Fri Sep 11 2007 Peter Jones <pjones at redhat.com> - 6.0.16-1
 - Fix handling of CCISS one more time (bz#274201)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- sources	11 Sep 2007 15:32:19 -0000	1.198
+++ sources	19 Sep 2007 21:26:40 -0000	1.199
@@ -1 +1 @@
-55b1ec0cb506085eaca5612c09a5d61b  mkinitrd-6.0.16.tar.bz2
+4c0e08dbdd1f6af4606676de1817863a  mkinitrd-6.0.17.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:37:53 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 19 Sep 2007 17:37:53 -0400
Subject: rpms/sabayon/devel .cvsignore, 1.15, 1.16 sabayon.spec, 1.41,
	1.42 sources, 1.15, 1.16
Message-ID: <200709192137.l8JLbrNZ019038@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18909

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
2.20.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Aug 2007 20:11:45 -0000	1.15
+++ .cvsignore	19 Sep 2007 21:37:20 -0000	1.16
@@ -1 +1 @@
-sabayon-2.19.2.tar.bz2
+sabayon-2.20.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sabayon.spec	17 Aug 2007 03:32:36 -0000	1.41
+++ sabayon.spec	19 Sep 2007 21:37:20 -0000	1.42
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.19.2
+Version: 2.20.0
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnome.org/projects/sabayon
-Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.20/sabayon-%{version}.tar.bz2
 Source2: sabayon.pam
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -272,6 +272,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Aug 2007 20:11:45 -0000	1.15
+++ sources	19 Sep 2007 21:37:20 -0000	1.16
@@ -1 +1 @@
-5adc2e7e24f48e004ef45caa0480bc89  sabayon-2.19.2.tar.bz2
+50165894e576fb80d2b3a4bc0294fc5b  sabayon-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 19 21:39:59 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 19 Sep 2007 17:39:59 -0400
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.36,1.37
Message-ID: <200709192139.l8JLdx3T019160@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19120

Modified Files:
	epiphany-extensions.spec 
Log Message:
Force building against Firefox as a temporary compilation fix.


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- epiphany-extensions.spec	18 Sep 2007 23:30:59 -0000	1.36
+++ epiphany-extensions.spec	19 Sep 2007 21:39:26 -0000	1.37
@@ -50,7 +50,10 @@
 
 
 %build
+## XXX: We're forcibly building against Firefox until the XULrunner
+## obsoletes/upgrade-path issues can be properly fixed. 
 %configure --disable-compiler-warnings --disable-scrollkeeper	\
+	--with-gecko=firefox					\
 	--with-extensions=really-all
 %{__make} %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Wed Sep 19 21:45:50 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 17:45:50 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.16,
	1.17
Message-ID: <200709192145.l8JLjo9L020239@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20049

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
Fix bugzilla 242917




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-daemon.spec	16 Mar 2007 20:03:46 -0000	1.16
+++ jakarta-commons-daemon.spec	19 Sep 2007 21:45:18 -0000	1.17
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,18 +32,18 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define native      %{?_with_native:1}%{!?_with_native:0}
+%define native      %{?_without_native:0}%{!?_without_native:1}
 
 %define base_name   daemon
 %define short_name  commons-%{base_name}
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        6jpp.2%{?dist}
+Release:        6jpp.3%{?dist}
 Epoch:          1
 Summary:        Defines API to support an alternative invocation mechanism
-License:        Apache Software License
-Group:          System/Boot
+License:        ASL 2.0
+Group:          Applications/System
 URL:            http://jakarta.apache.org/commons/daemon/
 Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
 Patch:          %{name}-crosslink.patch
@@ -51,12 +51,12 @@
 
 %if %{native}
 BuildRequires:  java-devel
-%else
+BuildRequires:  xmlto
+%endif
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
 BuildRequires:  ant, java-javadoc
-%endif
 BuildRequires:  jpackage-utils >= 0:1.6
 Provides:       %{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
@@ -77,7 +77,7 @@
 
 %package        jsvc
 Summary:        Java daemon launcher
-Group:          System/Boot
+Group:          Applications/System
 Provides:       jsvc = %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
@@ -91,7 +91,7 @@
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -103,23 +103,28 @@
 %setup -q -n %{base_name}-%{version}
 %patch0 -p0
 chmod 644 src/samples/*
+%if %{native}
+pushd src/native/unix
+xmlto man man/jsvc.1.xml
+popd
+%endif
 
 
 %build
+ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %if %{native}
 cd src/native/unix
 %configure --with-java=%{java_home}
 make %{?_smp_mflags}
-%else
-ant -Dant.lib=%{_javadir} -Dj2se.javadoc=%{_javadocdir}/java dist
 %endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{native}
-install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_sbindir}/jsvc
-%else
+install -Dpm 755 src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}/jsvc
+install -Dpm 0644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
+%endif
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 dist/%{short_name}.jar \
@@ -130,18 +135,14 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
 
-%if ! %{native}
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if ! %{native}
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -157,14 +158,14 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
-%endif
 
 %if %{native}
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
-%{_sbindir}/jsvc
-%else
+%{_bindir}/jsvc
+%{_mandir}/man1/jsvc.1*
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -174,7 +175,6 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -184,6 +184,16 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 James Ralston <ralston at pobox.com> - 1:1.0.1-6jpp.3
+- update License tag to reflect new acceptable licenses
+- update main Group tag (old value "System/Boot" is invalid)
+- update jsvc Group tag as well
+- update javadoc Group tag as well
+- building jsvc is no longer mutually exclusive with building javadoc
+- jsvc is built by default (use "--without native" to disable)
+- build jsvc man page from DocBook source via xmlto; install
+- move jsvc from sbindir to bindir (man page is section 1)
+
 * Fri Jan 26 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0.1-6jpp.2
 - Added versioning to provides and obsoletes and rpmlint cleanup
 



From fedora-extras-commits at redhat.com  Wed Sep 19 22:20:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 19 Sep 2007 18:20:20 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc6-git8.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.687, 1.688 config-powerpc-generic, 1.8, 1.9 config-powerpc64,
	1.4, 1.5 config-sparc64-generic, 1.7, 1.8 config-x86-generic,
	1.12, 1.13 config-x86_64-generic, 1.9, 1.10 kernel.spec, 1.170,
	1.171 linux-2.6-smarter-relatime.patch, 1.2, 1.3 sources, 1.649,
	1.650 upstream, 1.571, 1.572
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch,
	1.1, NONE
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch,
	1.1, NONE linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch,
	1.1, NONE linux-2.6-xfs-filesize-updates.patch, 1.1,
	NONE linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch, 1.1,
	NONE patch-2.6.23-rc6-git7.bz2.sign, 1.1, NONE
Message-ID: <200709192220.l8JMKKjl005732@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5656

Modified Files:
	.cvsignore config-powerpc-generic config-powerpc64 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-smarter-relatime.patch sources upstream 
Added Files:
	patch-2.6.23-rc6-git8.bz2.sign 
Removed Files:
	linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch 
	linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch 
	linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch 
	linux-2.6-xfs-filesize-updates.patch 
	linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch 
	patch-2.6.23-rc6-git7.bz2.sign 
Log Message:
* Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git8
- Enable Secure Computing (CONFIG_SECCOMP) (#295841)



--- NEW FILE patch-2.6.23-rc6-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8XKoyGugalF9Dw4RAilQAJ0eK+DhHnue4nODKTblg7EyOmeH7QCgkfE/
jP9NlgRMxY4clbRp19AvUMc=
=jlzh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- .cvsignore	17 Sep 2007 14:16:49 -0000	1.687
+++ .cvsignore	19 Sep 2007 22:19:45 -0000	1.688
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git7.bz2
+patch-2.6.23-rc6-git8.bz2


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-powerpc-generic	15 Aug 2007 21:06:26 -0000	1.8
+++ config-powerpc-generic	19 Sep 2007 22:19:45 -0000	1.9
@@ -11,7 +11,7 @@
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc64	9 Aug 2007 15:29:41 -0000	1.4
+++ config-powerpc64	19 Sep 2007 22:19:45 -0000	1.5
@@ -133,4 +133,4 @@
 
 CONFIG_SCSI_IBMVSCSIS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-sparc64-generic	17 Aug 2007 21:40:29 -0000	1.7
+++ config-sparc64-generic	19 Sep 2007 22:19:45 -0000	1.8
@@ -1,6 +1,6 @@
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-x86-generic	13 Sep 2007 16:29:27 -0000	1.12
+++ config-x86-generic	19 Sep 2007 22:19:45 -0000	1.13
@@ -92,7 +92,7 @@
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_CAPI_EICON=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-x86_64-generic	12 Sep 2007 22:56:16 -0000	1.9
+++ config-x86_64-generic	19 Sep 2007 22:19:45 -0000	1.10
@@ -35,7 +35,7 @@
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
 
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kernel.spec	18 Sep 2007 20:58:50 -0000	1.170
+++ kernel.spec	19 Sep 2007 22:19:45 -0000	1.171
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 7
+%define gitrev 8
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -663,16 +663,11 @@
 Patch1230: linux-2.6-powerpc-spu-vicinity.patch
 Patch1300: linux-2.6-usb-suspend-classes.patch
 Patch1400: linux-2.6-smarter-relatime.patch
-Patch1501: linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
 Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-Patch1507: linux-2.6-xfs-filesize-updates.patch
-Patch1508: linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
-Patch1510: linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
-Patch1511: linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
@@ -1175,22 +1170,16 @@
 ApplyPatch linux-2.6-smarter-relatime.patch
 
 # xfs bugfixes & stack reduction
-ApplyPatch linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
 ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
-ApplyPatch linux-2.6-xfs-filesize-updates.patch
-ApplyPatch linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch
 ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
 
-# ext3 bugfixes
-ApplyPatch linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch
-ApplyPatch linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch
-
 #
 # 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
@@ -1811,6 +1800,10 @@
 
 
 %changelog
+* Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc6-git8
+- Enable Secure Computing (CONFIG_SECCOMP) (#295841)
+
 * Tue Sep 18 2007 Eric Sandeen <sandeen at redhat.com>
 - ext3 bugfixes: fix potential corruption in do_split dx leaf split (#28650),
   handle dx directory corruption gracefully, w/o BUG (#236464).

linux-2.6-smarter-relatime.patch:

Index: linux-2.6-smarter-relatime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-smarter-relatime.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-smarter-relatime.patch	17 Sep 2007 14:16:49 -0000	1.2
+++ linux-2.6-smarter-relatime.patch	19 Sep 2007 22:19:45 -0000	1.3
@@ -52,7 +52,7 @@
  			Set system-wide default UTF-8 mode for all tty's.
 @@ -1468,6 +1472,10 @@ and is between 256 and 4096 characters. 
  			Format: <reboot_mode>[,<reboot_mode2>[,...]]
- 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c
+ 			See arch/*/kernel/reboot.c or arch/*/kernel/process.c			
  
 +	relatime_interval=
 +			[FS] relative atime update frequency, in seconds.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- sources	17 Sep 2007 14:16:49 -0000	1.649
+++ sources	19 Sep 2007 22:19:45 -0000	1.650
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-4f3845c3e912bc93c09b0dec08719232  patch-2.6.23-rc6-git7.bz2
+7af060af2f67d1bc774c40025d3b5f4f  patch-2.6.23-rc6-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- upstream	17 Sep 2007 14:16:49 -0000	1.571
+++ upstream	19 Sep 2007 22:19:46 -0000	1.572
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git7.bz2
+patch-2.6.23-rc6-git8.bz2


--- linux-2.6-ext3-dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch DELETED ---


--- linux-2.6-ext34-ensure-do_split-leaves-enough-free-space-in-both-blocks.patch DELETED ---


--- linux-2.6-xfs-avoid-replaying-inode-buffer-init.patch DELETED ---


--- linux-2.6-xfs-filesize-updates.patch DELETED ---


--- linux-2.6-xfs-filestreams-on-demand-MRU-reaping.patch DELETED ---


--- patch-2.6.23-rc6-git7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 22:31:48 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 19 Sep 2007 18:31:48 -0400
Subject: rpms/eclipse-mylyn/devel
	eclipse-mylyn-addfedoracustomizations.patch, 
	NONE, 1.1 eclipse-mylyn.spec, 1.7, 1.8
Message-ID: <200709192231.l8JMVm62008761@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8447/devel

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-addfedoracustomizations.patch 
Log Message:
* Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
- Add patch and source to have common bugzilla servers by default.

eclipse-mylyn-addfedoracustomizations.patch:

--- NEW FILE eclipse-mylyn-addfedoracustomizations.patch ---
### 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.335
diff -u -r1.335 feature.xml
--- feature.xml	28 Jun 2007 18:19:54 -0000	1.335
+++ feature.xml	19 Sep 2007 19:05:41 -0000
@@ -252,4 +252,11 @@
          version="2.0.0.v20070627-1400"
          unpack="false"/>
 
+   <plugin
+         id="org.fedoraproject.mylyn.bugzilla"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-mylyn.spec	18 Sep 2007 18:24:16 -0000	1.7
+++ eclipse-mylyn.spec	19 Sep 2007 22:31:16 -0000	1.8
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -17,6 +17,7 @@
 # tar cjf org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2 org.eclipse.mylyn
 Source0: org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
 Source1: fetch-mylar.sh
+Source2: fedoraeclipse-mylynbugzilla-0.0.1.zip
 
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626
@@ -24,6 +25,7 @@
 # So we can symlink to dependencies
 Patch4: %{name}-unpackwebcore.patch
 Patch5: %{name}-webcorejar.patch
+Patch6: %{name}-addfedoracustomizations.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +124,7 @@
 
 %prep
 %setup -q -n org.eclipse.mylyn
+unzip -q %{SOURCE2}
 
 # GCJ issue
 sed --in-place "s/@Override//" \
@@ -160,6 +163,10 @@
 ln -s %{_javadir}/jdom-1.0.jar
 popd
 
+pushd org.eclipse.mylyn.bugzilla-feature
+%patch6
+popd
+
 #sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
 sed --in-place -e "304,456d" org.eclipse.mylyn-feature/feature.xml 
@@ -353,6 +360,7 @@
 %defattr(-,root,root,-)
 %{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.core_*.jar
 %{eclipse_base}/plugins/org.eclipse.mylyn.bugzilla.ui_*.jar
+%{eclipse_base}/plugins/org.fedoraproject.mylyn.bugzilla_*.jar
 %dir %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*
 %doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/license.html
 %doc %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/about.html
@@ -360,6 +368,7 @@
 %{eclipse_base}/features/org.eclipse.mylyn.bugzilla_feature_*/feature.xml
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.mylyn.bugzilla*
+%{_libdir}/gcj/%{name}/org.fedoraproject.mylyn.bugzilla*
 %endif
 
 %files ide
@@ -447,6 +456,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
+- Add patch and source to have common bugzilla servers by default.
+
 * Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-7
 - Fix filename of webcore jar.
 



From fedora-extras-commits at redhat.com  Wed Sep 19 22:32:53 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 19 Sep 2007 18:32:53 -0400
Subject: rpms/eclipse-mylyn/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200709192232.l8JMWron009203@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9097

Modified Files:
	.cvsignore sources 
Log Message:
Add new source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2007 16:36:04 -0000	1.2
+++ .cvsignore	19 Sep 2007 22:32:20 -0000	1.3
@@ -1 +1,2 @@
 org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
+fedoraeclipse-mylynbugzilla-0.0.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2007 16:36:04 -0000	1.2
+++ sources	19 Sep 2007 22:32:20 -0000	1.3
@@ -1 +1,2 @@
 d78a53cf41bb98ccffe7ed5307c146ee  org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
+91ddb27b37165f94622e18964e3d6717  fedoraeclipse-mylynbugzilla-0.0.1.zip



From fedora-extras-commits at redhat.com  Wed Sep 19 22:34:12 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Wed, 19 Sep 2007 18:34:12 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.17,
	1.18
Message-ID: <200709192234.l8JMYCm8009511@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9248

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
fix ppc64 build




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-daemon.spec	19 Sep 2007 21:45:18 -0000	1.17
+++ jakarta-commons-daemon.spec	19 Sep 2007 22:33:40 -0000	1.18
@@ -108,6 +108,7 @@
 xmlto man man/jsvc.1.xml
 popd
 %endif
+sed -i -e '2425s/powerpc/powerpc*/' src/native/unix/configure
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Sep 19 22:47:34 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 19 Sep 2007 18:47:34 -0400
Subject: comps comps-f7.xml.in,1.255,1.256 comps-fe6.xml.in,1.375,1.376
Message-ID: <200709192247.l8JMlY9l014505@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14114

Modified Files:
	comps-f7.xml.in comps-fe6.xml.in 
Log Message:
slingshot 6/7 comps.



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- comps-f7.xml.in	17 Sep 2007 19:18:28 -0000	1.255
+++ comps-f7.xml.in	19 Sep 2007 22:47:04 -0000	1.256
@@ -1393,6 +1393,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- comps-fe6.xml.in	14 Sep 2007 08:21:29 -0000	1.375
+++ comps-fe6.xml.in	19 Sep 2007 22:47:04 -0000	1.376
@@ -531,6 +531,7 @@
       <packagereq type="optional">sergueis-destiny</packagereq>
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 19 23:11:11 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 19:11:11 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit-add-feature.patch,1.3,NONE
Message-ID: <200709192311.l8JNBBfr029131@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29112

Removed Files:
	eclipse-egit-add-feature.patch 
Log Message:
remove egit feature patch


--- eclipse-egit-add-feature.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:14:39 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Wed, 19 Sep 2007 19:14:39 -0400
Subject: rpms/eclipse-egit/F-7 .cvsignore, 1.2, 1.3 eclipse-egit.spec, 1.1, 
	1.2 sources, 1.2, 1.3 eclipse-egit-add-feature.patch, 1.1, NONE
Message-ID: <200709192314.l8JNEdBL029855@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Removed Files:
	eclipse-egit-add-feature.patch 
Log Message:
* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc7
- 0.2.99 git20070919



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2007 14:51:23 -0000	1.2
+++ .cvsignore	19 Sep 2007 23:14:07 -0000	1.3
@@ -1,2 +1 @@
-egit.png
-egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/eclipse-egit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-egit.spec	17 Sep 2007 14:51:23 -0000	1.1
+++ eclipse-egit.spec	19 Sep 2007 23:14:07 -0000	1.2
@@ -3,18 +3,17 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.2
-Release:          1.git20070911%{?dist}
+Version:          0.2.99
+Release:          0.git20070919%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz
-Source0:          egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
-Source1:          egit.png
-Patch0:           %{name}-add-feature.patch
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
+Requires:         git
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
@@ -39,8 +38,6 @@
 
 %prep
 %setup -q -c 
-%patch0 -p0
-cp %{SOURCE1} egit/org.spearce.egit
 
 %build
 # Copy the SDK for build
@@ -98,9 +95,12 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc7
+- 0.2.99 git20070919
+
 * Mon Sep 17 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-1.git20070911.fc7
 - Pull in build from rawhide.
-- Require eclipse-platform >= 3.2.1. 
+- Require eclipse-platform >= 3.2.1.
 
 * Fri Sep 14 2007 Ben Konrath <bkonrath at redhat.com> 0.2.2-0.git20070911.fc8
 - Update to git20070911.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2007 14:51:23 -0000	1.2
+++ sources	19 Sep 2007 23:14:07 -0000	1.3
@@ -1,2 +1 @@
-5d1082d9db40f01c5de094ac8769514b  egit.png
-d2730356da7d7b616ff262b4df74bfb2  egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz
+df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz


--- eclipse-egit-add-feature.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:16:01 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:16:01 -0400
Subject: rpms/pm-utils/devel pm-utils.spec, 1.79,
	1.80 pm-utils-0.19-vidhooks.patch, 1.6, NONE
Message-ID: <200709192316.l8JNG1PD030143@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30027

Modified Files:
	pm-utils.spec 
Removed Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
- remove unused patch (vidhooks)
- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
  to keep selinux context
- simplify spec
- restore selinux context of logfile in %post 
- use rpmmacros more often



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- pm-utils.spec	11 Sep 2007 08:01:08 -0000	1.79
+++ pm-utils.spec	19 Sep 2007 23:15:28 -0000	1.80
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,8 +29,8 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
-#Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-cfg.patch
+Patch3: pm-utils-0.99.4-logfile.patch
 
 
 %description
@@ -41,8 +41,8 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
-#%patch1 -p1 -b .vidhooks
 %patch2 -p1 -b .cfg
+%patch3 -p1 -b .logfile
 
 
 %build
@@ -70,29 +70,33 @@
 	ln -sf consolehelper $x
 done
 popd
-install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/pm-suspend.log
+install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
+
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %pre
-if [ -f /etc/sysconfig/pm ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig
+if [ -f %{_sysconfdir}/sysconfig/pm ]; then
+	mkdir -p %{_sysconfdir}/pm/config.d
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
 fi
 
+
 %post
-if [ -f /etc/pm/config.rpmsave ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig
+if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
 fi
-if [ ! -a /var/log/pm-suspend.log ] ; then
-	install -m 600 /dev/null /var/log/pm-suspend.log
+if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
+	chmod 0600 %{_localstatedir}/log/pm-suspend.log
+	[ -x /sbin/restorecon ] && restorecon  %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1
 fi
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
@@ -109,9 +113,17 @@
 %{_sbindir}/pm-suspend-hybrid
 
 %{_mandir}/man*/*
-%ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
+%ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
+- remove unused patch (vidhooks)
+- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
+  to keep selinux context
+- simplify spec
+- restore selinux context of logfile in %%post 
+- use rpmmacros more often
+
 * Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
 - Require vbetool not on ppc and ppc64
 


--- pm-utils-0.19-vidhooks.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:17:18 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:17:18 -0400
Subject: rpms/pm-utils/devel pm-utils-0.99.4-logfile.patch,NONE,1.1
Message-ID: <200709192317.l8JNHIK1030290@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30276

Added Files:
	pm-utils-0.99.4-logfile.patch 
Log Message:
missing patch


pm-utils-0.99.4-logfile.patch:

--- NEW FILE pm-utils-0.99.4-logfile.patch ---
There is no need to remove the logfile, because the ">" after exec in the next line
already truncates the logfile to zero length. Also removing is wrong, because it
destroys the selinux context of the logfile. Bugzilla Reports:
https://bugzilla.redhat.com/show_bug.cgi?id=237840
https://bugzilla.redhat.com/show_bug.cgi?id=238068

diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
--- pm-utils-0.99.4/pm/functions.logfile	2007-05-15 16:55:58.000000000 +0200
+++ pm-utils-0.99.4/pm/functions	2007-09-20 00:53:51.000000000 +0200
@@ -137,7 +137,6 @@ do_suspend_hybrid()
 pm_main()
 {
 	if [ -n "$PM_LOGFILE" ]; then
-		[ -f "$PM_LOGFILE" ] && rm -f "$PM_LOGFILE"
 		exec > "$PM_LOGFILE" 2>&1
 	fi
 	take_suspend_lock || exit 1



From fedora-extras-commits at redhat.com  Wed Sep 19 23:26:21 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:26:21 -0400
Subject: rpms/pm-utils/F-7 pm-utils-0.99.4-logfile.patch, NONE,
	1.1 pm-utils.spec, 1.66, 1.67 pm-utils-0.19-vidhooks.patch, 1.6, NONE
Message-ID: <200709192326.l8JNQLVL031716@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31586

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.4-logfile.patch 
Removed Files:
	pm-utils-0.19-vidhooks.patch 
Log Message:
sync with devel


pm-utils-0.99.4-logfile.patch:

--- NEW FILE pm-utils-0.99.4-logfile.patch ---
There is no need to remove the logfile, because the ">" after exec in the next line
already truncates the logfile to zero length. Also removing is wrong, because it
destroys the selinux context of the logfile. Bugzilla Reports:
https://bugzilla.redhat.com/show_bug.cgi?id=237840
https://bugzilla.redhat.com/show_bug.cgi?id=238068

diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
diff -up pm-utils-0.99.4/pm/functions.logfile pm-utils-0.99.4/pm/functions
--- pm-utils-0.99.4/pm/functions.logfile	2007-05-15 16:55:58.000000000 +0200
+++ pm-utils-0.99.4/pm/functions	2007-09-20 00:53:51.000000000 +0200
@@ -137,7 +137,6 @@ do_suspend_hybrid()
 pm_main()
 {
 	if [ -n "$PM_LOGFILE" ]; then
-		[ -f "$PM_LOGFILE" ] && rm -f "$PM_LOGFILE"
 		exec > "$PM_LOGFILE" 2>&1
 	fi
 	take_suspend_lock || exit 1


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- pm-utils.spec	11 Sep 2007 14:11:56 -0000	1.66
+++ pm-utils.spec	19 Sep 2007 23:25:48 -0000	1.67
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,8 +29,8 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
-#Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-cfg.patch
+Patch3: pm-utils-0.99.4-logfile.patch
 
 
 %description
@@ -41,8 +41,8 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
-#%patch1 -p1 -b .vidhooks
 %patch2 -p1 -b .cfg
+%patch3 -p1 -b .logfile
 
 
 %build
@@ -70,29 +70,33 @@
 	ln -sf consolehelper $x
 done
 popd
-install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/pm-suspend.log
+install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
+
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %pre
-if [ -f /etc/sysconfig/pm ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig
+if [ -f %{_sysconfdir}/sysconfig/pm ]; then
+	mkdir -p %{_sysconfdir}/pm/config.d
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
 fi
 
+
 %post
-if [ -f /etc/pm/config.rpmsave ]; then
-	mkdir -p /etc/pm/config.d
-	mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig
+if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
 fi
-if [ ! -a /var/log/pm-suspend.log ] ; then
-	install -m 600 /dev/null /var/log/pm-suspend.log
+if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
+	chmod 0600 %{_localstatedir}/log/pm-suspend.log
+	[ -x /sbin/restorecon ] && restorecon  %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1
 fi
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
@@ -109,9 +113,17 @@
 %{_sbindir}/pm-suspend-hybrid
 
 %{_mandir}/man*/*
-%ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
+%ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
+- remove unused patch (vidhooks)
+- add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 
+  to keep selinux context
+- simplify spec
+- restore selinux context of logfile in %%post 
+- use rpmmacros more often
+
 * Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
 - Require vbetool not on ppc and ppc64
 


--- pm-utils-0.19-vidhooks.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 19 23:45:15 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:45:15 -0400
Subject: rpms/kernel/devel drm-mm-git.patch, NONE, 1.1 kernel.spec, 1.171,
	1.172 nouveau-drm.patch, 1.4, 1.5
Message-ID: <200709192345.l8JNjFGx002398@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2236

Modified Files:
	kernel.spec nouveau-drm.patch 
Added Files:
	drm-mm-git.patch 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
- drm-mm-git.patch - pull in DRM git queue
- nouveau-drm.patch - update nouveau patch on top of drm git queue


drm-mm-git.patch:

--- NEW FILE drm-mm-git.patch ---
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 2d6f2d0..82fb3d0 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -63,27 +63,9 @@
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
 #endif
 
-#define XFREE86_VERSION(major,minor,patch,snap) \
-		((major << 16) | (minor << 8) | patch)
-
-#ifndef CONFIG_XFREE86_VERSION
-#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
-#endif
-
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-#define DRM_PROC_DEVICES "/proc/devices"
-#define DRM_PROC_MISC	 "/proc/misc"
-#define DRM_PROC_DRM	 "/proc/drm"
-#define DRM_DEV_DRM	 "/dev/drm"
-#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
-#define DRM_DEV_UID	 0
-#define DRM_DEV_GID	 0
-#endif
-
-#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
 #define DRM_MAJOR       226
 #define DRM_MAX_MINOR   15
-#endif
+
 #define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */
 #define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */
 #define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0df87fc..9dd0760 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -80,6 +80,9 @@
 #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
 #define __OS_HAS_MTRR (defined(CONFIG_MTRR))
 
+struct drm_file;
+struct drm_device;
+
 #include "drm_os_linux.h"
 #include "drm_hashtab.h"
 
@@ -231,12 +234,13 @@
  * \param dev DRM device.
  * \param filp file pointer of the caller.
  */
-#define LOCK_TEST_WITH_RETURN( dev, filp )				\
+#define LOCK_TEST_WITH_RETURN( dev, file_priv )				\
 do {									\
 	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
-	     dev->lock.filp != filp ) {				\
-		DRM_ERROR( "%s called without lock held\n",		\
-			   __FUNCTION__ );				\
+	     dev->lock.file_priv != file_priv )	{			\
+		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
+			   __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
+			   dev->lock.file_priv, file_priv );		\
 		return -EINVAL;						\
 	}								\
 } while (0)
@@ -257,12 +261,12 @@ do {									\
  * Ioctl function type.
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private pointer.
  * \param cmd command.
  * \param arg argument.
  */
-typedef int drm_ioctl_t(struct inode *inode, struct file *filp,
-			unsigned int cmd, unsigned long arg);
+typedef int drm_ioctl_t(struct drm_device *dev, void *data,
+			struct drm_file *file_priv);
 
 typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 			       unsigned long arg);
@@ -271,10 +275,18 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 #define	DRM_MASTER	0x2
 #define DRM_ROOT_ONLY	0x4
 
-typedef struct drm_ioctl_desc {
+struct drm_ioctl_desc {
+	unsigned int cmd;
 	drm_ioctl_t *func;
 	int flags;
-} drm_ioctl_desc_t;
+};
+
+/**
+ * Creates a driver or general drm_ioctl_desc array entry for the given
+ * ioctl, for use by drm_ioctl().
+ */
+#define DRM_IOCTL_DEF(ioctl, func, flags) \
+	[DRM_IOCTL_NR(ioctl)] = {ioctl, func, flags}
 
 struct drm_magic_entry {
 	struct list_head head;
@@ -304,7 +316,7 @@ struct drm_buf {
 	__volatile__ int waiting;      /**< On kernel DMA queue */
 	__volatile__ int pending;      /**< On hardware DMA queue */
 	wait_queue_head_t dma_wait;    /**< Processes waiting */
-	struct file *filp;	       /**< Pointer to holding file descr */
+	struct drm_file *file_priv;    /**< Private of holding file descr */
 	int context;		       /**< Kernel queue for this buffer */
 	int while_locked;	       /**< Dispatch this buffer while locked */
 	enum {
@@ -377,6 +389,7 @@ struct drm_file {
 	int remove_auth_on_close;
 	unsigned long lock_count;
 	void *driver_priv;
+	struct file *filp;
 };
 
 /** Wait queue */
@@ -403,7 +416,7 @@ struct drm_queue {
  */
 struct drm_lock_data {
 	struct drm_hw_lock *hw_lock;	/**< Hardware lock */
-	struct file *filp;		/**< File descr of lock holder (0=kernel) */
+	struct drm_file *file_priv;	/**< File descr of lock holder (0=kernel) */
 	wait_queue_head_t lock_queue;	/**< Queue of blocked processes */
 	unsigned long lock_time;	/**< Time of last lock in jiffies */
 	spinlock_t spinlock;
@@ -552,11 +565,11 @@ struct drm_driver {
 	int (*load) (struct drm_device *, unsigned long flags);
 	int (*firstopen) (struct drm_device *);
 	int (*open) (struct drm_device *, struct drm_file *);
-	void (*preclose) (struct drm_device *, struct file * filp);
+	void (*preclose) (struct drm_device *, struct drm_file *file_priv);
 	void (*postclose) (struct drm_device *, struct drm_file *);
 	void (*lastclose) (struct drm_device *);
 	int (*unload) (struct drm_device *);
-	int (*dma_ioctl) (DRM_IOCTL_ARGS);
+	int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
 	void (*dma_ready) (struct drm_device *);
 	int (*dma_quiescent) (struct drm_device *);
 	int (*context_ctor) (struct drm_device *dev, int context);
@@ -587,11 +600,12 @@ struct drm_driver {
 	void (*irq_preinstall) (struct drm_device *dev);
 	void (*irq_postinstall) (struct drm_device *dev);
 	void (*irq_uninstall) (struct drm_device *dev);
-	void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);
+	void (*reclaim_buffers) (struct drm_device *dev,
+				 struct drm_file * file_priv);
 	void (*reclaim_buffers_locked) (struct drm_device *dev,
-					struct file *filp);
+					struct drm_file *file_priv);
 	void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
-					struct file * filp);
+					    struct drm_file *file_priv);
 	unsigned long (*get_map_ofs) (struct drm_map * map);
 	unsigned long (*get_reg_ofs) (struct drm_device *dev);
 	void (*set_version) (struct drm_device *dev,
@@ -606,7 +620,7 @@ struct drm_driver {
 
 	u32 driver_features;
 	int dev_priv_size;
-	drm_ioctl_desc_t *ioctls;
+	struct drm_ioctl_desc *ioctls;
 	int num_ioctls;
 	struct file_operations fops;
 	struct pci_driver pci_driver;
@@ -850,70 +864,70 @@ extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
 extern int drm_unbind_agp(DRM_AGP_MEM * handle);
 
 				/* Misc. IOCTL support (drm_ioctl.h) */
-extern int drm_irq_by_busid(struct inode *inode, struct file *filp,
-			    unsigned int cmd, unsigned long arg);
-extern int drm_getunique(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_setunique(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_getmap(struct inode *inode, struct file *filp,
-		      unsigned int cmd, unsigned long arg);
-extern int drm_getclient(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-extern int drm_getstats(struct inode *inode, struct file *filp,
-			unsigned int cmd, unsigned long arg);
-extern int drm_setversion(struct inode *inode, struct file *filp,
-			  unsigned int cmd, unsigned long arg);
-extern int drm_noop(struct inode *inode, struct file *filp,
-		    unsigned int cmd, unsigned long arg);
+extern int drm_irq_by_busid(struct drm_device *dev, void *data,
+			    struct drm_file *file_priv);
+extern int drm_getunique(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_setunique(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_getmap(struct drm_device *dev, void *data,
+		      struct drm_file *file_priv);
+extern int drm_getclient(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
+extern int drm_getstats(struct drm_device *dev, void *data,
+			struct drm_file *file_priv);
[...12031 lines suppressed...]
-	dev_priv->vram_offset = fb.offset;
+	dev_priv->vram_offset = fb->offset;
 
 	mutex_unlock(&dev->struct_mutex);
-	DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
+	DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size);
 
 	return 0;
 
@@ -121,80 +115,71 @@ void via_lastclose(struct drm_device *dev)
 	mutex_unlock(&dev->struct_mutex);
 }	
 
-int via_mem_alloc(DRM_IOCTL_ARGS)
+int via_mem_alloc(struct drm_device *dev, void *data,
+		  struct drm_file *file_priv)
 {
-	DRM_DEVICE;
-
-	drm_via_mem_t mem;
+	drm_via_mem_t *mem = data;
 	int retval = 0;
 	struct drm_memblock_item *item;
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	unsigned long tmpSize;
 
-	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
-				 sizeof(mem));
-
-	if (mem.type > VIA_MEM_AGP) {
+	if (mem->type > VIA_MEM_AGP) {
 		DRM_ERROR("Unknown memory type allocation\n");
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	mutex_lock(&dev->struct_mutex);
-	if (0 == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
+	if (0 == ((mem->type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
 		      dev_priv->agp_initialized)) {
 		DRM_ERROR
 		    ("Attempt to allocate from uninitialized memory manager.\n");
 		mutex_unlock(&dev->struct_mutex);
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 
-	tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
-	item = drm_sman_alloc(&dev_priv->sman, mem.type, tmpSize, 0,
-			      (unsigned long)priv);
+	tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
+	item = drm_sman_alloc(&dev_priv->sman, mem->type, tmpSize, 0,
+			      (unsigned long)file_priv);
 	mutex_unlock(&dev->struct_mutex);
 	if (item) {
-		mem.offset = ((mem.type == VIA_MEM_VIDEO) ?
+		mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
 			      dev_priv->vram_offset : dev_priv->agp_offset) +
 		    (item->mm->
 		     offset(item->mm, item->mm_info) << VIA_MM_ALIGN_SHIFT);
-		mem.index = item->user_hash.key;
+		mem->index = item->user_hash.key;
 	} else {
-		mem.offset = 0;
-		mem.size = 0;
-		mem.index = 0;
+		mem->offset = 0;
+		mem->size = 0;
+		mem->index = 0;
 		DRM_DEBUG("Video memory allocation failed\n");
-		retval = DRM_ERR(ENOMEM);
+		retval = -ENOMEM;
 	}
-	DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem));
 
 	return retval;
 }
 
-int via_mem_free(DRM_IOCTL_ARGS)
+int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-	DRM_DEVICE;
 	drm_via_private_t *dev_priv = dev->dev_private;
-	drm_via_mem_t mem;
+	drm_via_mem_t *mem = data;
 	int ret;
 
-	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
-				 sizeof(mem));
-
 	mutex_lock(&dev->struct_mutex);
-	ret = drm_sman_free_key(&dev_priv->sman, mem.index);
+	ret = drm_sman_free_key(&dev_priv->sman, mem->index);
 	mutex_unlock(&dev->struct_mutex);
-	DRM_DEBUG("free = 0x%lx\n", mem.index);
+	DRM_DEBUG("free = 0x%lx\n", mem->index);
 
 	return ret;
 }
 
 
-void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
+void via_reclaim_buffers_locked(struct drm_device * dev,
+				struct drm_file *file_priv)
 {
 	drm_via_private_t *dev_priv = dev->dev_private;
-	struct drm_file *priv = filp->private_data;
 
 	mutex_lock(&dev->struct_mutex);
-	if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
+	if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)file_priv)) {
 		mutex_unlock(&dev->struct_mutex);
 		return;
 	}
@@ -203,7 +188,7 @@ void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
 		dev->driver->dma_quiescent(dev);
 	}
 
-	drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv);
+	drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
 	mutex_unlock(&dev->struct_mutex);
 	return;
 }
diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c
index 832d483..46a5791 100644
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/char/drm/via_verifier.c
@@ -1026,12 +1026,12 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
 		case state_error:
 		default:
 			*hc_state = saved_state;
-			return DRM_ERR(EINVAL);
+			return -EINVAL;
 		}
 	}
 	if (state == state_error) {
 		*hc_state = saved_state;
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	return 0;
 }
@@ -1082,11 +1082,11 @@ via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
 			break;
 		case state_error:
 		default:
-			return DRM_ERR(EINVAL);
+			return -EINVAL;
 		}
 	}
 	if (state == state_error) {
-		return DRM_ERR(EINVAL);
+		return -EINVAL;
 	}
 	return 0;
 }
diff --git a/drivers/char/drm/via_video.c b/drivers/char/drm/via_video.c
index 300ac61..c15e75b 100644
--- a/drivers/char/drm/via_video.c
+++ b/drivers/char/drm/via_video.c
@@ -65,10 +65,9 @@ void via_release_futex(drm_via_private_t * dev_priv, int context)
 	}
 }
 
-int via_decoder_futex(DRM_IOCTL_ARGS)
+int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-	DRM_DEVICE;
-	drm_via_futex_t fx;
+	drm_via_futex_t *fx = data;
 	volatile int *lock;
 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 	drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
@@ -76,21 +75,18 @@ int via_decoder_futex(DRM_IOCTL_ARGS)
 
 	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t __user *) data,
-				 sizeof(fx));
-
-	if (fx.lock > VIA_NR_XVMC_LOCKS)
+	if (fx->lock > VIA_NR_XVMC_LOCKS)
 		return -EFAULT;
 
-	lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx.lock);
+	lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock);
 
-	switch (fx.func) {
+	switch (fx->func) {
 	case VIA_FUTEX_WAIT:
-		DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx.lock],
-			    (fx.ms / 10) * (DRM_HZ / 100), *lock != fx.val);
+		DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
+			    (fx->ms / 10) * (DRM_HZ / 100), *lock != fx->val);
 		return ret;
 	case VIA_FUTEX_WAKE:
-		DRM_WAKEUP(&(dev_priv->decoder_queue[fx.lock]));
+		DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock]));
 		return 0;
 	}
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kernel.spec	19 Sep 2007 22:19:45 -0000	1.171
+++ kernel.spec	19 Sep 2007 23:44:41 -0000	1.172
@@ -418,7 +418,7 @@
 Provides: kernel = %{rpmversion}-%{pkg_release}\
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}\
 Provides: kernel-drm = 4.3.0\
-Provides: kernel-drm-nouveau = 6\
+Provides: kernel-drm-nouveau = 10\
 Requires(pre): %{kernel_prereq}\
 Conflicts: %{kernel_dot_org_conflicts}\
 Conflicts: %{package_conflicts}\
@@ -575,7 +575,6 @@
 Patch36: linux-2.6-utrace-ptrace-compat-s390.patch
 Patch37: linux-2.6-utrace-ptrace-compat-avr32.patch
 
-Patch40: nouveau-drm.patch
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
@@ -673,6 +672,10 @@
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch 
 
+#nouveau
+Patch1800: drm-mm-git.patch
+Patch1801: nouveau-drm.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -993,7 +996,8 @@
 ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
 # Nouveau DRM
-#ApplyPatch nouveau-drm.patch
+ApplyPatch drm-mm-git.patch
+ApplyPatch nouveau-drm.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1800,6 +1804,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
+- drm-mm-git.patch - pull in DRM git queue
+- nouveau-drm.patch - update nouveau patch on top of drm git queue
+
 * Wed Sep 19 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6-git8
 - Enable Secure Computing (CONFIG_SECCOMP) (#295841)

nouveau-drm.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 nouveau-drm.patch
Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/nouveau-drm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nouveau-drm.patch	12 Apr 2007 19:16:23 -0000	1.4
+++ nouveau-drm.patch	19 Sep 2007 23:44:41 -0000	1.5
@@ -1,56 +1,179 @@
+From f4e9f548d49b0bc9fbbfbee635f96e79a2f472ae Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at voynix.(none)>
+Date: Thu, 6 Sep 2007 00:10:19 +1000
+Subject: [PATCH] drm: add nouveau latest code
+
+---
+ drivers/char/drm/Kconfig            |    5 +
+ drivers/char/drm/Makefile           |   12 +
+ drivers/char/drm/drmP.h             |    4 +-
+ drivers/char/drm/drm_bufs.c         |    6 +-
+ drivers/char/drm/drm_irq.c          |    3 +-
+ drivers/char/drm/drm_pciids.h       |  262 ++++
+ drivers/char/drm/nouveau_dma.c      |  177 +++
+ drivers/char/drm/nouveau_dma.h      |   98 ++
+ drivers/char/drm/nouveau_drm.h      |  166 ++
+ drivers/char/drm/nouveau_drv.c      |   96 ++
+ drivers/char/drm/nouveau_drv.h      |  584 +++++++
+ drivers/char/drm/nouveau_fifo.c     |  557 +++++++
+ drivers/char/drm/nouveau_ioc32.c    |   72 +
+ drivers/char/drm/nouveau_irq.c      |  430 ++++++
+ drivers/char/drm/nouveau_mem.c      |  616 ++++++++
+ drivers/char/drm/nouveau_notifier.c |  173 +++
+ drivers/char/drm/nouveau_object.c   | 1148 ++++++++++++++
+ drivers/char/drm/nouveau_reg.h      |  538 +++++++
+ drivers/char/drm/nouveau_sgdma.c    |  311 ++++
+ drivers/char/drm/nouveau_state.c    |  569 +++++++
+ drivers/char/drm/nv04_fb.c          |   24 +
+ drivers/char/drm/nv04_fifo.c        |  129 ++
+ drivers/char/drm/nv04_graph.c       |  415 +++++
+ drivers/char/drm/nv04_instmem.c     |  160 ++
+ drivers/char/drm/nv04_mc.c          |   23 +
+ drivers/char/drm/nv04_timer.c       |   45 +
+ drivers/char/drm/nv10_fb.c          |   26 +
+ drivers/char/drm/nv10_fifo.c        |  160 ++
+ drivers/char/drm/nv10_graph.c       |  777 ++++++++++
+ drivers/char/drm/nv20_graph.c       |  249 +++
+ drivers/char/drm/nv30_graph.c       | 2911 +++++++++++++++++++++++++++++++++++
+ drivers/char/drm/nv40_fb.c          |   56 +
+ drivers/char/drm/nv40_fifo.c        |  208 +++
+ drivers/char/drm/nv40_graph.c       | 1906 +++++++++++++++++++++++
+ drivers/char/drm/nv40_mc.c          |   39 +
+ drivers/char/drm/nv50_fifo.c        |  327 ++++
+ drivers/char/drm/nv50_graph.c       |  316 ++++
+ drivers/char/drm/nv50_instmem.c     |  320 ++++
+ drivers/char/drm/nv50_mc.c          |   43 +
+ 39 files changed, 13957 insertions(+), 4 deletions(-)
+ create mode 100644 drivers/char/drm/nouveau_dma.c
+ create mode 100644 drivers/char/drm/nouveau_dma.h
+ create mode 100644 drivers/char/drm/nouveau_drm.h
+ create mode 100644 drivers/char/drm/nouveau_drv.c
+ create mode 100644 drivers/char/drm/nouveau_drv.h
+ create mode 100644 drivers/char/drm/nouveau_fifo.c
+ create mode 100644 drivers/char/drm/nouveau_ioc32.c
+ create mode 100644 drivers/char/drm/nouveau_irq.c
+ create mode 100644 drivers/char/drm/nouveau_mem.c
+ create mode 100644 drivers/char/drm/nouveau_notifier.c
+ create mode 100644 drivers/char/drm/nouveau_object.c
+ create mode 100644 drivers/char/drm/nouveau_reg.h
+ create mode 100644 drivers/char/drm/nouveau_sgdma.c
+ create mode 100644 drivers/char/drm/nouveau_state.c
+ create mode 100644 drivers/char/drm/nv04_fb.c
+ create mode 100644 drivers/char/drm/nv04_fifo.c
+ create mode 100644 drivers/char/drm/nv04_graph.c
+ create mode 100644 drivers/char/drm/nv04_instmem.c
+ create mode 100644 drivers/char/drm/nv04_mc.c
+ create mode 100644 drivers/char/drm/nv04_timer.c
+ create mode 100644 drivers/char/drm/nv10_fb.c
+ create mode 100644 drivers/char/drm/nv10_fifo.c
+ create mode 100644 drivers/char/drm/nv10_graph.c
+ create mode 100644 drivers/char/drm/nv20_graph.c
+ create mode 100644 drivers/char/drm/nv30_graph.c
+ create mode 100644 drivers/char/drm/nv40_fb.c
+ create mode 100644 drivers/char/drm/nv40_fifo.c
+ create mode 100644 drivers/char/drm/nv40_graph.c
+ create mode 100644 drivers/char/drm/nv40_mc.c
+ create mode 100644 drivers/char/drm/nv50_fifo.c
+ create mode 100644 drivers/char/drm/nv50_graph.c
+ create mode 100644 drivers/char/drm/nv50_instmem.c
+ create mode 100644 drivers/char/drm/nv50_mc.c
+
 diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
-index ef833a1..065f499 100644
+index 0b7ffa5..0220619 100644
 --- a/drivers/char/drm/Kconfig
 +++ b/drivers/char/drm/Kconfig
-@@ -106,3 +106,9 @@ config DRM_SAVAGE
+@@ -106,3 +106,8 @@ config DRM_SAVAGE
  	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
  	  chipset. If M is selected the module will be called savage.
  
 +config DRM_NOUVEAU
 +	tristate "Nvidia video cards"
-+	depends on DRM && PCI
++	depends on DRM
 +	help
-+	  Choose this option if you want to enable nouveau reverse engineered
-+          driver for nvidia chipset. The module will be called nouveau.
++		Choose this for nvidia open source 3d driver
 diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
-index 6915a05..20b79d5 100644
+index 6915a05..f798916 100644
 --- a/drivers/char/drm/Makefile
 +++ b/drivers/char/drm/Makefile
-@@ -14,6 +14,14 @@ mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+@@ -14,6 +14,16 @@ mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
  i810-objs   := i810_drv.o i810_dma.o
  i830-objs   := i830_drv.o i830_dma.o i830_irq.o
  i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 +nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
-+                nouveau_object.o nouveau_irq.o \
++		nouveau_object.o nouveau_irq.o nouveau_notifier.o \
++		nouveau_sgdma.o nouveau_dma.o \
 +		nv04_timer.o \
-+		nv04_mc.o nv40_mc.o \
++		nv04_mc.o nv40_mc.o nv50_mc.o \
 +		nv04_fb.o nv10_fb.o nv40_fb.o \
++		nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
 +		nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \
-+		nv40_graph.o
-+
++		nv40_graph.o nv50_graph.o \
++		nv04_instmem.o nv50_instmem.o
  radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
  sis-objs    := sis_drv.o sis_mm.o
  savage-objs := savage_drv.o savage_bci.o savage_state.o
-@@ -25,6 +33,7 @@ radeon-objs += radeon_ioc32.o
+@@ -25,6 +35,7 @@ radeon-objs += radeon_ioc32.o
  mga-objs    += mga_ioc32.o
  r128-objs   += r128_ioc32.o
  i915-objs   += i915_ioc32.o
-+nouveau-objs += nouveau_ioc32.o
++nouveau-objs   += nouveau_ioc32.o
  endif
  
  obj-$(CONFIG_DRM)	+= drm.o
-@@ -38,5 +47,6 @@ obj-$(CONFIG_DRM_I915)  += i915.o
+@@ -35,6 +46,7 @@ obj-$(CONFIG_DRM_MGA)	+= mga.o
+ obj-$(CONFIG_DRM_I810)	+= i810.o
+ obj-$(CONFIG_DRM_I830)	+= i830.o
+ obj-$(CONFIG_DRM_I915)  += i915.o
++obj-$(CONFIG_DRM_NOUVEAU)   += nouveau.o
  obj-$(CONFIG_DRM_SIS)   += sis.o
  obj-$(CONFIG_DRM_SAVAGE)+= savage.o
  obj-$(CONFIG_DRM_VIA)	+=via.o
-+obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
- 
- 
+diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
+index 9dd0760..d539c96 100644
+--- a/drivers/char/drm/drmP.h
++++ b/drivers/char/drm/drmP.h
+@@ -967,7 +967,8 @@ extern unsigned long drm_get_resource_start(struct drm_device *dev,
+ 					    unsigned int resource);
+ extern unsigned long drm_get_resource_len(struct drm_device *dev,
+ 					  unsigned int resource);
+-
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++					   drm_local_map_t *map);
+ 				/* DMA support (drm_dma.h) */
+ extern int drm_dma_setup(struct drm_device *dev);
+ extern void drm_dma_takedown(struct drm_device *dev);
+@@ -979,6 +980,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
+ extern int drm_control(struct drm_device *dev, void *data,
+ 		       struct drm_file *file_priv);
+ extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
++extern int drm_irq_install(struct drm_device * dev);
+ extern int drm_irq_uninstall(struct drm_device *dev);
+ extern void drm_driver_irq_preinstall(struct drm_device *dev);
+ extern void drm_driver_irq_postinstall(struct drm_device *dev);
 diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
-index a6828cc..f3da5c4 100644
+index 856774f..7890e08 100644
 --- a/drivers/char/drm/drm_bufs.c
 +++ b/drivers/char/drm/drm_bufs.c
-@@ -400,6 +400,7 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
+@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource
+ 
+ EXPORT_SYMBOL(drm_get_resource_len);
+ 
+-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+-					     drm_local_map_t *map)
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++					   drm_local_map_t *map)
+ {
+ 	struct drm_map_list *entry;
+ 	list_for_each_entry(entry, &dev->maplist, head) {
+@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(drm_find_matching_map);
[...12804 lines suppressed...]
++	/* Assume that praying isn't enough, check that we can re-read the
++	 * entire fake channel back from the PRAMIN BAR */
++	for (i = 0; i < c_size; i+=4) {
++		if (NV_READ(NV_RAMIN + i) != NV_RI32(i)) {
++			DRM_ERROR("Error reading back PRAMIN at 0x%08x\n", i);
++			return -EINVAL;
++		}
++	}
++
++	/* Global PRAMIN heap */
++	if (nouveau_mem_init_heap(&dev_priv->ramin_heap,
++				  c_size, dev_priv->ramin->size - c_size)) {
++		dev_priv->ramin_heap = NULL;
++		DRM_ERROR("Failed to init RAMIN heap\n");
++	}
++
++	/*XXX: incorrect, but needed to make hash func "work" */
++	dev_priv->ramht_offset = 0x10000;
++	dev_priv->ramht_bits   = 9;
++	dev_priv->ramht_size   = (1 << dev_priv->ramht_bits);
++	return 0;
++}
++
++void
++nv50_instmem_takedown(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	struct nouveau_channel *chan = dev_priv->fifos[0];
++	int i;
++
++	DRM_DEBUG("\n");
++
++	if (!priv)
++		return;
++
++	/* Restore state from before init */
++	for (i = 0x1700; i <= 0x1710; i+=4)
++		NV_WRITE(i, priv->save1700[(i-0x1700)/4]);
++
++	nouveau_gpuobj_ref_del(dev, &priv->pramin_bar);
++	nouveau_gpuobj_ref_del(dev, &priv->pramin_pt);
++
++	/* Destroy dummy channel */
++	if (chan) {
++		nouveau_gpuobj_del(dev, &chan->vm_pd);
++		nouveau_gpuobj_ref_del(dev, &chan->ramfc);
++		nouveau_gpuobj_ref_del(dev, &chan->ramin);
++		nouveau_mem_takedown(&chan->ramin_heap);
++
++		dev_priv->fifos[0] = dev_priv->fifos[127] = NULL;
++		drm_free(chan, sizeof(*chan), DRM_MEM_DRIVER);
++	}
++
++	dev_priv->Engine.instmem.priv = NULL;
++	drm_free(priv, sizeof(*priv), DRM_MEM_DRIVER);
++}
++
++int
++nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
++{
++	if (gpuobj->im_backing)
++		return -EINVAL;
++
++	*sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1);
++	if (*sz == 0)
++		return -EINVAL;
++
++	gpuobj->im_backing = nouveau_mem_alloc(dev, NV50_INSTMEM_PAGE_SIZE,
++					       *sz, NOUVEAU_MEM_FB,
++					       (struct drm_file *)-2);
++	if (!gpuobj->im_backing) {
++		DRM_ERROR("Couldn't allocate vram to back PRAMIN pages\n");
++		return -ENOMEM;
++	}
++
++	return 0;
++}
++
++void
++nv50_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	if (gpuobj && gpuobj->im_backing) {
++		if (gpuobj->im_bound)
++			dev_priv->Engine.instmem.unbind(dev, gpuobj);
++		nouveau_mem_free(dev, gpuobj->im_backing);
++		gpuobj->im_backing = NULL;
++	}	
++}
++
++int
++nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	uint32_t pte, pte_end, vram;
++
++	if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
++		return -EINVAL;
++
++	DRM_DEBUG("st=0x%0llx sz=0x%0llx\n",
++		  gpuobj->im_pramin->start, gpuobj->im_pramin->size);
++
++	pte     = (gpuobj->im_pramin->start >> 12) << 3;
++	pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte;
++	vram    = gpuobj->im_backing->start;
++
++	DRM_DEBUG("pramin=0x%llx, pte=%d, pte_end=%d\n",
++		  gpuobj->im_pramin->start, pte, pte_end);
++	DRM_DEBUG("first vram page: 0x%llx\n",
++		  gpuobj->im_backing->start);
++
++	while (pte < pte_end) {
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, vram | 1);
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000);
++
++		pte += 8;
++		vram += NV50_INSTMEM_PAGE_SIZE;
++	}
++
++	gpuobj->im_bound = 1;
++	return 0;
++}
++
++int
++nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
++	uint32_t pte, pte_end;
++
++	if (gpuobj->im_bound == 0)
++		return -EINVAL;
++
++	pte     = (gpuobj->im_pramin->start >> 12) << 3;
++	pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte;
++	while (pte < pte_end) {
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, 0x00000009);
++		INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000);
++		pte += 8;
++	}
++
++	gpuobj->im_bound = 0;
++	return 0;
++}
++
+diff --git a/drivers/char/drm/nv50_mc.c b/drivers/char/drm/nv50_mc.c
+new file mode 100644
+index 0000000..b111826
+--- /dev/null
++++ b/drivers/char/drm/nv50_mc.c
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2007 Ben Skeggs.
++ * 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:
++ *
++ * 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.
++ *
++ */
++
++#include "drmP.h"
++#include "drm.h"
++#include "nouveau_drv.h"
++
++int
++nv50_mc_init(struct drm_device *dev)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++
++	NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);
++
++	return 0;
++}
++
++void nv50_mc_takedown(struct drm_device *dev)
++{
++}
+-- 
+1.5.2.5
+



From fedora-extras-commits at redhat.com  Wed Sep 19 23:48:52 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 19 Sep 2007 19:48:52 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.80,1.81
Message-ID: <200709192348.l8JNmqjS003168@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2984

Modified Files:
	pm-utils.spec 
Log Message:
* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-4
- fix manpage cut and paste mistake (RH #286201)



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pm-utils.spec	19 Sep 2007 23:15:28 -0000	1.80
+++ pm-utils.spec	19 Sep 2007 23:48:19 -0000	1.81
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
@@ -29,6 +29,7 @@
 BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
+Patch1: pm-utils-0.99.4-manpage-typo.patch
 Patch2: pm-utils-0.99.3-cfg.patch
 Patch3: pm-utils-0.99.4-logfile.patch
 
@@ -41,6 +42,7 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
+%patch1 -p1 -b .manpage-typo
 %patch2 -p1 -b .cfg
 %patch3 -p1 -b .logfile
 
@@ -116,6 +118,9 @@
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-4
+- fix manpage cut and paste mistake (RH #286201)
+
 * Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
 - remove unused patch (vidhooks)
 - add patch to keep logfile (RH #237840 (f7), #238068 (devel)), 



From fedora-extras-commits at redhat.com  Wed Sep 19 23:57:19 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:57:19 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.26,1.27 nouveau.patch,1.2,1.3
Message-ID: <200709192357.l8JNvJv3004318@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4235

Modified Files:
	libdrm.spec nouveau.patch 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> - 2.3.0-7
- Update nouveau patch.



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libdrm.spec	21 Aug 2007 18:44:07 -0000	1.26
+++ libdrm.spec	19 Sep 2007 23:56:46 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> - 2.3.0-7
+- Update nouveau patch.
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 2.3.0-6
 - Rebuild for build id
 

nouveau.patch:

Index: nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau.patch	30 Mar 2007 18:57:37 -0000	1.2
+++ nouveau.patch	19 Sep 2007 23:56:46 -0000	1.3
@@ -1,6 +1,7 @@
---- /dev/null	2007-03-29 16:01:53.376400525 -0400
-+++ libdrm-2.3.0/shared-core/nouveau_drm.h	2007-03-29 19:02:49.000000000 -0400
-@@ -0,0 +1,152 @@
+diff -up /dev/null libdrm-2.3.0/shared-core/nouveau_drm.h
+--- /dev/null	2007-08-31 14:38:01.267001567 +1000
++++ libdrm-2.3.0/shared-core/nouveau_drm.h	2007-09-20 08:23:08.000000000 +1000
+@@ -0,0 +1,164 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -28,9 +29,12 @@
 +#ifndef __NOUVEAU_DRM_H__
 +#define __NOUVEAU_DRM_H__
 +
-+#define NOUVEAU_DRM_HEADER_PATCHLEVEL 6
++#define NOUVEAU_DRM_HEADER_PATCHLEVEL 10
++
++struct drm_nouveau_channel_alloc {
++	uint32_t     fb_ctxdma_handle;
++	uint32_t     tt_ctxdma_handle;
 +
-+typedef struct drm_nouveau_fifo_alloc {
 +	int          channel;
 +	uint32_t     put_base;
 +	/* FIFO control regs */
@@ -39,52 +43,61 @@
 +	/* DMA command buffer */
 +	drm_handle_t cmdbuf;
 +	int          cmdbuf_size;
-+}
-+drm_nouveau_fifo_alloc_t;
++	/* Notifier memory */
++	drm_handle_t notifier;
++	int          notifier_size;
++};
 +
-+typedef struct drm_nouveau_object_init {
++struct drm_nouveau_channel_free {
++	int channel;
++};
++
++struct drm_nouveau_grobj_alloc {
 +	int      channel;
 +	uint32_t handle;
 +	int      class;
-+}
-+drm_nouveau_object_init_t;
++};
 +
 +#define NOUVEAU_MEM_ACCESS_RO	1
 +#define NOUVEAU_MEM_ACCESS_WO	2
 +#define NOUVEAU_MEM_ACCESS_RW	3
-+typedef struct drm_nouveau_dma_object_init {
++struct drm_nouveau_notifierobj_alloc {
 +	int      channel;
 +	uint32_t handle;
-+	int      class;
-+	int      access;
-+	int      target;
++	int      count;
++
 +	uint32_t offset;
-+	int      size;
-+}
-+drm_nouveau_dma_object_init_t;
++};
++
++struct drm_nouveau_gpuobj_free {
++	int      channel;
++	uint32_t handle;
++};
 +
 +#define NOUVEAU_MEM_FB			0x00000001
 +#define NOUVEAU_MEM_AGP			0x00000002
 +#define NOUVEAU_MEM_FB_ACCEPTABLE	0x00000004
 +#define NOUVEAU_MEM_AGP_ACCEPTABLE	0x00000008
-+#define NOUVEAU_MEM_PINNED		0x00000010
-+#define NOUVEAU_MEM_USER_BACKED		0x00000020
-+#define NOUVEAU_MEM_MAPPED		0x00000040
-+#define NOUVEAU_MEM_INSTANCE		0x00000080 /* internal */
++#define NOUVEAU_MEM_PCI			0x00000010
++#define NOUVEAU_MEM_PCI_ACCEPTABLE	0x00000020
++#define NOUVEAU_MEM_PINNED		0x00000040
++#define NOUVEAU_MEM_USER_BACKED		0x00000080
++#define NOUVEAU_MEM_MAPPED		0x00000100
++#define NOUVEAU_MEM_INSTANCE		0x00000200 /* internal */
++#define NOUVEAU_MEM_NOTIFIER            0x00000400 /* internal */
 +
-+typedef struct drm_nouveau_mem_alloc {
++struct drm_nouveau_mem_alloc {
 +	int flags;
 +	int alignment;
 +	uint64_t size;	// in bytes
-+	uint64_t region_offset;
-+}
-+drm_nouveau_mem_alloc_t;
++	uint64_t offset;
++	drm_handle_t map_handle;
++};
 +
-+typedef struct drm_nouveau_mem_free {
-+	uint64_t region_offset;
++struct drm_nouveau_mem_free {
++	uint64_t offset;
 +	int flags;
-+}
-+drm_nouveau_mem_free_t;
++};
 +
 +/* FIXME : maybe unify {GET,SET}PARAMs */
 +#define NOUVEAU_GETPARAM_PCI_VENDOR      3
@@ -94,30 +107,28 @@
 +#define NOUVEAU_GETPARAM_AGP_PHYSICAL    7
 +#define NOUVEAU_GETPARAM_FB_SIZE         8
 +#define NOUVEAU_GETPARAM_AGP_SIZE        9
-+typedef struct drm_nouveau_getparam {
++#define NOUVEAU_GETPARAM_PCI_PHYSICAL    10
++#define NOUVEAU_GETPARAM_CHIPSET_ID      11
++struct drm_nouveau_getparam {
 +	uint64_t param;
 +	uint64_t value;
-+}
-+drm_nouveau_getparam_t;
++};
 +
 +#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1
 +#define NOUVEAU_SETPARAM_CMDBUF_SIZE     2
-+typedef struct drm_nouveau_setparam {
++struct drm_nouveau_setparam {
 +	uint64_t param;
 +	uint64_t value;
-+}
-+drm_nouveau_setparam_t;
++};
 +
 +enum nouveau_card_type {
 +	NV_UNKNOWN =0,
-+	NV_01      =1,
-+	NV_03      =3,
 +	NV_04      =4,
 +	NV_05      =5,
 +	NV_10      =10,
-+	NV_11      =10,
-+	NV_15      =10,
-+	NV_17      =10,
++	NV_11      =11,
++	NV_15      =11,
++	NV_17      =17,
 +	NV_20      =20,
 +	NV_25      =20,
 +	NV_30      =30,
@@ -136,30 +147,33 @@
 +
 +#define NOUVEAU_MAX_SAREA_CLIPRECTS 16
 +
-+typedef struct drm_nouveau_sarea {
++struct drm_nouveau_sarea {
 +	/* the cliprects */
-+	drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
++	struct drm_clip_rect boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
 +	unsigned int nbox;
-+}
-+drm_nouveau_sarea_t;
++};
 +
-+#define DRM_NOUVEAU_FIFO_ALLOC      0x00
-+#define DRM_NOUVEAU_OBJECT_INIT     0x01
-+#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02
-+#define DRM_NOUVEAU_MEM_ALLOC       0x03
-+#define DRM_NOUVEAU_MEM_FREE        0x04
-+#define DRM_NOUVEAU_GETPARAM        0x05
-+#define DRM_NOUVEAU_SETPARAM        0x06
++#define DRM_NOUVEAU_CARD_INIT          0x00
++#define DRM_NOUVEAU_GETPARAM           0x01
++#define DRM_NOUVEAU_SETPARAM           0x02
++#define DRM_NOUVEAU_CHANNEL_ALLOC      0x03
++#define DRM_NOUVEAU_CHANNEL_FREE       0x04
++#define DRM_NOUVEAU_GROBJ_ALLOC        0x05
++#define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC  0x06
++#define DRM_NOUVEAU_GPUOBJ_FREE        0x07
++#define DRM_NOUVEAU_MEM_ALLOC          0x08
++#define DRM_NOUVEAU_MEM_FREE           0x09
 +
 +#endif /* __NOUVEAU_DRM_H__ */
 +
---- libdrm-2.3.0/shared-core/Makefile.am.nouveau	2006-11-07 23:03:26.000000000 -0500
-+++ libdrm-2.3.0/shared-core/Makefile.am	2007-03-29 19:00:35.000000000 -0400
-@@ -27,6 +27,7 @@
-                          drm.h \
-                          drm_sarea.h \
+diff -up libdrm-2.3.0/shared-core/Makefile.am.nouveau libdrm-2.3.0/shared-core/Makefile.am
+--- libdrm-2.3.0/shared-core/Makefile.am.nouveau	2006-11-08 14:03:26.000000000 +1000
++++ libdrm-2.3.0/shared-core/Makefile.am	2007-07-27 13:09:08.000000000 +1000
+@@ -29,6 +29,7 @@ klibdrminclude_HEADERS = \
                           i915_drm.h \
-+			 nouveau_drm.h \
                           mach64_drm.h \
                           mga_drm.h \
++                         nouveau_drm.h \
                           r128_drm.h \
+                          radeon_drm.h \
+                          savage_drm.h \



From fedora-extras-commits at redhat.com  Wed Sep 19 23:59:48 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 19:59:48 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.24, 1.25 sources, 1.25,
	1.26 xorg-x11-drv-nv.spec, 1.52, 1.53
Message-ID: <200709192359.l8JNxmfm004683@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4552

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
- update nouveau



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 Aug 2007 14:21:24 -0000	1.24
+++ .cvsignore	19 Sep 2007 23:59:16 -0000	1.25
@@ -1,2 +1,3 @@
 nouveau-20070330.tar.bz2
 xf86-video-nv-2.1.3.tar.bz2
+nouveau-20070920.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Aug 2007 14:21:24 -0000	1.25
+++ sources	19 Sep 2007 23:59:16 -0000	1.26
@@ -1,2 +1,2 @@
-cf1f7a86307e691f4b82ec8aadbd9087  nouveau-20070330.tar.bz2
 f9b38e24157c3aac6014119ac18d76da  xf86-video-nv-2.1.3.tar.bz2
+00ba97f704d775c1ed83e104d4f089be  nouveau-20070920.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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-drv-nv.spec	17 Aug 2007 14:21:24 -0000	1.52
+++ xorg-x11-drv-nv.spec	19 Sep 2007 23:59:16 -0000	1.53
@@ -4,12 +4,12 @@
 
 # The snapshot is commit e0e90f427581929fd01c96f1958a1292982dee83,
 # verify tarball using bzip2 -cd <tarball> | git-get-tar-commit-id
-%define gitdate 20070330
+%define gitdate 20070920
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -23,7 +23,7 @@
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
-BuildRequires: libdrm-devel >= 2.3.0-5
+BuildRequires: libdrm-devel >= 2.3.0-7
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
@@ -37,7 +37,7 @@
 Summary:   Xorg X11 nouveau video driver
 Group:     User Interface/X Hardware Support
 Requires:  xorg-x11-server-Xorg >= 1.1.0-12
-Requires:  kernel-drm-nouveau = 6
+Requires:  kernel-drm-nouveau = 10
 %description -n xorg-x11-drv-nouveau
 X.Org X11 nouveau video driver.
 
@@ -88,6 +88,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
+- update nouveau
+
 * Fri Aug 17 2007 Adam Jackson <ajax at redhat.com> 2.1.3-1
 - xf86-video-nv 2.1.3.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:03:44 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 20:03:44 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.20.0-mixer-out-of-sync.patch, 
	NONE, 1.1 gnome-applets.spec, 1.240, 1.241
Message-ID: <200709200003.l8K03ij2011620@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
- Add patch to avoid the volume scale getting out-of sync with the 
  real hardware volume


gnome-applets-2.20.0-mixer-out-of-sync.patch:

--- NEW FILE gnome-applets-2.20.0-mixer-out-of-sync.patch ---
Index: applet.c
===================================================================
--- applet.c	(revision 10436)
+++ applet.c	(working copy)
@@ -79,7 +79,12 @@
 						 PanelAppletOrient orient);
 
 static void	gnome_volume_applet_refresh	(GnomeVolumeApplet *applet,
-						 gboolean           force_refresh);
+						 gboolean           force_refresh,
+						 gdouble            volume,
+						 gint               mute);
+
+static void     cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
+
 static gboolean	cb_check			(gpointer   data);
 
 static void	cb_volume			(GtkAdjustment *adj,
@@ -242,6 +247,12 @@
   /* i18n */
   ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
   atk_object_set_name (ao, _("Volume Control"));
+
+  /* Bus for notifications */
+  applet->bus = gst_bus_new ();
+  gst_bus_add_signal_watch (applet->bus);
+  g_signal_connect (G_OBJECT (applet->bus), "message::element", 
+       (GCallback) cb_notify_message, applet);
 }
 
 /* Parse the list of tracks that are stored in GConf */
@@ -368,12 +379,33 @@
     return FALSE;
 
   applet->mixer = g_object_ref (active_element);
+  gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
   applet->tracks = active_tracks;
   g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
 
   return TRUE;
 }
 
+static void
+gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
+{
+  gboolean need_timeout = TRUE;
+  need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
+      GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
+
+  if (need_timeout) {
+    if (applet->timeout == 0) {
+      applet->timeout = g_timeout_add (100, cb_check, applet);
+    }
+  }
+  else {
+    if (applet->timeout != 0) {
+      g_source_remove (applet->timeout);
+      applet->timeout = 0;
+    }
+  }
+}
+
 gboolean
 gnome_volume_applet_setup (GnomeVolumeApplet *applet,
 			   GList *elements)
@@ -435,10 +467,9 @@
   component = panel_applet_get_popup_component (PANEL_APPLET (applet));
   g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
 
-  gnome_volume_applet_refresh (applet, TRUE);
-  if (res) {
-    applet->timeout = g_timeout_add (100, cb_check, applet);
-  }
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+  if (res)
+    gnome_volume_applet_setup_timeout (applet);
 
   if (res) {
     /* gconf */
@@ -479,6 +510,11 @@
     g_list_free (applet->elements);
     applet->elements = NULL;
   }
+  gst_bus_remove_signal_watch (applet->bus);
+  if (applet->bus) {
+    gst_object_unref (applet->bus);
+    applet->bus = NULL;
+  }
 
   if (applet->tracks) {
     g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
@@ -677,7 +713,7 @@
 
   /* update graphic - this should happen automagically after the next
    * idle call, but apparently doesn't for some people... */
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, mute);
 }
 
 /*
@@ -940,7 +976,7 @@
   }
 
   init_pixbufs (applet);
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
 }
 
 static void
@@ -990,15 +1026,23 @@
 {
   int range = track->max_volume - track->min_volume;
   gdouble scale = ((gdouble) range) / 100;
-  int *volumes, n;
+  int *volumes, n, volint;
 
-  volume *= scale;
-  volume += track->min_volume;
+  if (volume == 1.0) {
+    volint = track->max_volume;
+  } else if (volume == 0.0) {
+    volint = track->min_volume;
+  } else {
+    volume *= scale;
+    volume += track->min_volume;
+    volint = lrint (volume);
+  }
 
   volumes = g_new (gint, track->num_channels);
   for (n = 0; n < track->num_channels; n++)
-    volumes[n] = lrint (volume);
+    volumes[n] = volint;
   gst_mixer_set_volume (mixer, track, volumes);
+
   g_free (volumes);
 }
 
@@ -1049,6 +1093,8 @@
 
   applet->lock = FALSE;
   applet->force_next_update = TRUE;
+
+  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
 }
 
 /*
@@ -1059,31 +1105,40 @@
 
 static void
 gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-			     gboolean           force_refresh)
+			     gboolean           force_refresh,
+			     gdouble            volume,
+			     gint               mute)
 {
   BonoboUIComponent *component;
   GdkPixbuf *pixbuf;
   gint n;
-  gdouble volume;
-  gboolean mute, did_change;
+  gboolean show_mute, did_change;
   gchar *tooltip_str;
   GstMixerTrack *first_track;
   GString *track_names;
   GList *iter;
 
+  show_mute = 0;
+
   if (!applet->mixer) {
     n = 0;
-    mute = FALSE;
+    show_mute = 1;
+    mute = 0;
   } else if (!applet->tracks) {
     return;
   } else {
-    /* only first track */
     first_track = g_list_first (applet->tracks)->data;
-    volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-    mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-				     GST_MIXER_TRACK_MUTE);
+
+    if (volume == -1) {
+      /* only first track */
+      volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
+    }
+    if (mute == -1) {
+      mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
+				       GST_MIXER_TRACK_MUTE) ? 1 : 0;
+    }
     if (volume <= 0) {
-	mute = TRUE;
+	show_mute = 1;
 	n = 0;
     }
     else {
@@ -1101,7 +1156,7 @@
   applet->force_next_update = FALSE;
 
   if (did_change) {
-    if (mute) {
+    if (show_mute) {
       pixbuf = applet->pix[0];
     } else {
       pixbuf = applet->pix[n];
@@ -1125,7 +1180,7 @@
       track_names = g_string_append (track_names, track->label);
   }
 
-  if (mute) {
+  if (show_mute) {
     tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
   } else {
     /* Translator comment: I'm not all too sure if this makes sense
@@ -1152,10 +1207,53 @@
 				"state", mute ? "1" : "0", NULL);
 }
 
+static void
+cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
+{
+  GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
+  GstMixerMessageType type;
+  GstMixerTrack *first_track;
+  GstMixerTrack *track = NULL;
+  gint mute;
+  gdouble volume;
+
+  if (applet->tracks == NULL || 
+      GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
+    /* No tracks, or not from our mixer - can't update anything anyway */
+    return; 
+  }
+
+  volume = mute = -1;
+
+  first_track = g_list_first (applet->tracks)->data;
+
+  /* This code only calls refresh if the first_track changes, because the
+   * refresh code only retrieves the current value from that track anyway */
+  type = gst_mixer_message_get_type (message);
+  if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
+    gboolean muted;
+    gst_mixer_message_parse_mute_toggled (message, &track, &muted);
+    mute = muted ? 1 : 0;
+  }
+  else {
+    gint n, num_channels, *vols;
+    volume = 0.0;
+
+    gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
+    for (n = 0; n < num_channels; n++)
+      volume += vols[n];
+    volume /= track->num_channels;
+    volume = 100 * volume / (track->max_volume - track->min_volume);
+  }
+
+  if (first_track == track)
+    gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
+}
+
 static gboolean
 cb_check (gpointer data)
 {
-  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
+  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, -1, -1);
 
   return TRUE;
 }
@@ -1214,6 +1312,8 @@
             /* save */
             gst_object_replace ((GstObject **) &applet->mixer, item->data);
             gst_element_set_state (old_element, GST_STATE_NULL);
+
+            gnome_volume_applet_setup_timeout (applet);
             newdevice = TRUE;
           }
           break;
@@ -1374,7 +1474,7 @@
   GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
 
   init_pixbufs (applet);
-  gnome_volume_applet_refresh (applet, TRUE);
+  gnome_volume_applet_refresh (applet, TRUE, -1, -1);
 }
 
 /*
Index: applet.h
===================================================================
--- applet.h	(revision 10436)
+++ applet.h	(working copy)
@@ -71,6 +71,7 @@
 
   /* element */
   GstMixer *mixer;
+  GstBus *bus;
   gboolean lock;
   gint state;
   GList *tracks;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- gnome-applets.spec	17 Sep 2007 01:34:23 -0000	1.240
+++ gnome-applets.spec	20 Sep 2007 00:02:46 -0000	1.241
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -58,7 +58,9 @@
 Patch33:	gnome-applets-2.18.0-node-leak.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=370937
-Patch34:	mixer-wakeups.patch
+# Patch34:	mixer-wakeups.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
+Patch35:	gnome-applets-2.20.0-mixer-out-of-sync.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -156,7 +158,7 @@
 %patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
-%patch34 -p1 -b .mixer-wakeups
+%patch35 -p1 -b .mixer-sync
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -334,6 +336,10 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
+- Add patch to avoid the volume scale getting out-of sync with the 
+  real hardware volume
+
 * Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:11:38 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 20:11:38 -0400
Subject: comps comps-f8.xml.in,1.115,1.116
Message-ID: <200709200011.l8K0BcKQ013665@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13185

Modified Files:
	comps-f8.xml.in 
Log Message:
add gcin to chinese-support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- comps-f8.xml.in	19 Sep 2007 06:51:30 -0000	1.115
+++ comps-f8.xml.in	20 Sep 2007 00:11:08 -0000	1.116
@@ -668,6 +668,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-pinyin</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-chinese</packagereq>
       <packagereq type="default">wqy-bitmap-fonts</packagereq>
+      <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">stardict</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 00:17:49 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Wed, 19 Sep 2007 20:17:49 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.241,1.242
Message-ID: <200709200017.l8K0Hnaq015685@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15585

Modified Files:
	gnome-applets.spec 
Log Message:
Fix patch application



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- gnome-applets.spec	20 Sep 2007 00:02:46 -0000	1.241
+++ gnome-applets.spec	20 Sep 2007 00:17:15 -0000	1.242
@@ -158,7 +158,9 @@
 %patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
-%patch35 -p1 -b .mixer-sync
+pushd mixer/
+%patch35 -p0 -b .mixer-sync
+popd
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:30:26 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Wed, 19 Sep 2007 20:30:26 -0400
Subject: rpms/glibc import.log,1.18,1.19
Message-ID: <200709200030.l8K0UQQZ017329@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281

Modified Files:
	import.log 
Log Message:
2.6.90-15



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	18 Sep 2007 20:12:28 -0000	1.18
+++ import.log	20 Sep 2007 00:29:54 -0000	1.19
@@ -15,3 +15,4 @@
 glibc-2_6_90-12:HEAD:glibc-2.6.90-12.src.rpm:1188070253
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
 glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332
+glibc-2_6_90-15:HEAD:glibc-2.6.90-15.src.rpm:1190248175



From fedora-extras-commits at redhat.com  Thu Sep 20 00:30:29 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Wed, 19 Sep 2007 20:30:29 -0400
Subject: rpms/glibc/devel .cvsignore, 1.216, 1.217 glibc-fedora.patch, 1.238,
	1.239 glibc.spec, 1.327, 1.328 sources, 1.240, 1.241
Message-ID: <200709200030.l8K0UTSC017338@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- .cvsignore	18 Sep 2007 20:12:30 -0000	1.216
+++ .cvsignore	20 Sep 2007 00:29:56 -0000	1.217
@@ -1,2 +1,2 @@
-glibc-20070918T1931.tar.bz2
-glibc-fedora-20070918T1931.tar.bz2
+glibc-20070920T0007.tar.bz2
+glibc-fedora-20070920T0007.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- glibc-fedora.patch	18 Sep 2007 20:35:52 -0000	1.238
+++ glibc-fedora.patch	20 Sep 2007 00:29:56 -0000	1.239
@@ -1,6 +1,6 @@
---- glibc-20070918T1931/ChangeLog	18 Sep 2007 19:29:44 -0000	1.10852
-+++ glibc-20070918T1931-fedora/ChangeLog	18 Sep 2007 19:57:14 -0000	1.8782.2.271
-@@ -2208,6 +2208,13 @@
+--- glibc-20070920T0007/ChangeLog	19 Sep 2007 22:22:51 -0000	1.10857
++++ glibc-20070920T0007-fedora/ChangeLog	20 Sep 2007 00:11:36 -0000	1.8782.2.272
+@@ -2244,6 +2244,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
-@@ -2503,6 +2510,10 @@
+@@ -2539,6 +2546,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]
-@@ -3760,6 +3771,15 @@
+@@ -3796,6 +3807,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-20070918T1931/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070918T1931-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070920T0007/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070918T1931-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070920T0007/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070918T1931-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070920T0007/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070920T0007-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-20070918T1931/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070918T1931-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070920T0007/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070920T0007-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-20070918T1931/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
-+++ glibc-20070918T1931-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
+--- glibc-20070920T0007/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
++++ glibc-20070920T0007-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
 @@ -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-20070918T1931/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070918T1931-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+--- glibc-20070920T0007/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070920T0007-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070918T1931/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070918T1931-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070920T0007/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070920T0007-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-20070918T1931/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
-+++ glibc-20070918T1931-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
+--- glibc-20070920T0007/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070920T0007-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -475,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070918T1931/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070920T0007/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070920T0007/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070918T1931-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070920T0007/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070920T0007-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -494,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070918T1931/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
-+++ glibc-20070918T1931-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
+--- glibc-20070920T0007/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070920T0007-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -509,8 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070918T1931/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070918T1931-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070920T0007/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070920T0007-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 !!!
@@ -602,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070918T1931/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070918T1931-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070920T0007/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070920T0007-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,
@@ -635,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070918T1931/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070918T1931-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070920T0007/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070920T0007-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -645,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070918T1931/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070918T1931-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070920T0007/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070920T0007-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -688,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070918T1931/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070918T1931-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070920T0007/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070920T0007-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>"
@@ -704,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070918T1931/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070918T1931-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070920T0007/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070920T0007-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -717,8 +717,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-20070918T1931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070920T0007/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -789,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070918T1931/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070918T1931-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070920T0007/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070920T0007-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -818,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070918T1931/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070918T1931-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070920T0007/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070920T0007-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>
@@ -895,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070918T1931/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070918T1931-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070920T0007/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070920T0007-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -952,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070918T1931/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070918T1931-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070920T0007/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070920T0007-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -963,8 +963,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070918T1931/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
-+++ glibc-20070918T1931-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
+--- glibc-20070920T0007/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
++++ glibc-20070920T0007-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
 @@ -282,7 +282,10 @@
  
  /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
@@ -989,16 +989,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20070918T1931/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070918T1931-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070920T0007/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070920T0007-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-20070918T1931/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
-+++ glibc-20070918T1931-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+--- glibc-20070920T0007/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070920T0007-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
 @@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1039,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070918T1931/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070918T1931-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070920T0007/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070920T0007-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1073,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070918T1931/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070918T1931-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070920T0007/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070920T0007-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;
@@ -1099,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070918T1931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070920T0007/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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>
 +
@@ -1108,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070918T1931/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
-+++ glibc-20070918T1931-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
+--- glibc-20070920T0007/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070920T0007-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1175,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070918T1931/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070918T1931-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070920T0007/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070920T0007-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1195,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070918T1931/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070918T1931-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070920T0007/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070920T0007-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1208,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070918T1931/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070918T1931-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070920T0007/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070920T0007-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1250,8 +1250,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070918T1931/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
-+++ glibc-20070918T1931-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+--- glibc-20070920T0007/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070920T0007-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
 @@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1268,8 +1268,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070918T1931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070920T0007/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1286,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070918T1931/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070918T1931-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070920T0007/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070920T0007-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
@@ -1303,8 +1303,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-20070918T1931/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070918T1931-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070920T0007/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070920T0007-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1318,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070918T1931/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070920T0007/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070920T0007-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))
@@ -1331,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070918T1931/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070920T0007/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070920T0007-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.  */
@@ -1684,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070918T1931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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.
@@ -1771,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070918T1931/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070918T1931-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070920T0007/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070920T0007-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
@@ -1781,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070918T1931/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070918T1931-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070920T0007/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070920T0007-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);
      }
@@ -1797,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1814,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1863,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070920T0007-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;
@@ -1907,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070920T0007-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>
@@ -1934,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070920T0007-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"
@@ -1945,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070920T0007-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;
@@ -1992,8 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070920T0007-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
  
@@ -2012,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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.
@@ -2074,8 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070920T0007-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)
@@ -2108,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070920T0007-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-20070918T1931/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070918T1931-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070920T0007/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070920T0007-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
  
@@ -2149,17 +2149,3 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- libc/misc/bits/syslog.h	18 Sep 2007 19:57:16 -0000	1.1.2.2
-+++ libc/misc/bits/syslog.h	18 Sep 2007 20:33:39 -0000
-@@ -27,9 +27,9 @@ extern void __syslog_chk (int __pri, int
- 
- #ifdef __va_arg_pack
- __extern_always_inline void
--syslog (int __pri, int __flag, __const char *__fmt, ...)
-+syslog (int __pri, __const char *__fmt, ...)
- {
--  return __syslog_chk (__pri, __flag, __fmt, __va_arg_pack ());
-+  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
- }
- #elif !defined __cplusplus
- # define syslog(pri, ...) \


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- glibc.spec	18 Sep 2007 20:12:30 -0000	1.327
+++ glibc.spec	20 Sep 2007 00:29:56 -0000	1.328
@@ -1,9 +1,9 @@
-%define glibcdate 20070918T1931
+%define glibcdate 20070920T0007
 %define glibcname glibc
-%define glibcsrcdir glibc-20070918T1931
+%define glibcsrcdir glibc-20070920T0007
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 14
+%define glibcrelease 15
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,10 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-15
+- $5$ (SHA-256) and $6$ (SHA-512) support in crypt
+  (#228697, #249477, #173834)
+
 * Tue Sep 18 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-14
 - -D_FORTIFY_SOURCE{,=2} support for C++
 - fortification of fread{,_unlocked}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- sources	18 Sep 2007 20:12:30 -0000	1.240
+++ sources	20 Sep 2007 00:29:56 -0000	1.241
@@ -1,2 +1,2 @@
-0bdea16fe09191ac97c4132ebdc9b7db  glibc-20070918T1931.tar.bz2
-4af6fdc8cfac8f9fc8f4eca5acf812f6  glibc-fedora-20070918T1931.tar.bz2
+68c585139617d926f94df1b5b2f57d13  glibc-20070920T0007.tar.bz2
+2ebd905d6bb60c826db1d0fd99dcec02  glibc-fedora-20070920T0007.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 00:38:21 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 19 Sep 2007 20:38:21 -0400
Subject: comps comps-f8.xml.in,1.116,1.117
Message-ID: <200709200038.l8K0cL1u017717@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17682

Modified Files:
	comps-f8.xml.in 
Log Message:
move kinput2 to japanese-support



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- comps-f8.xml.in	20 Sep 2007 00:11:08 -0000	1.116
+++ comps-f8.xml.in	20 Sep 2007 00:37:51 -0000	1.117
@@ -356,7 +356,6 @@
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">freefont</packagereq>
-      <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
       <packagereq type="optional">lineakd</packagereq>
@@ -2170,6 +2169,7 @@
       <packagereq type="optional">ddskk-xemacs</packagereq>
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
+      <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">kcc</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-japanese</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 00:38:58 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 19 Sep 2007 20:38:58 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xorg-x11-drv-ati.spec, 1.59, 1.60
Message-ID: <200709200038.l8K0cwGG017795@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17716

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
- xf86-video-ati 6.7.193



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Aug 2007 15:43:28 -0000	1.17
+++ .cvsignore	20 Sep 2007 00:38:25 -0000	1.18
@@ -1 +1 @@
-xf86-video-ati-6.7.192.tar.bz2
+xf86-video-ati-6.7.193.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Aug 2007 15:43:28 -0000	1.17
+++ sources	20 Sep 2007 00:38:25 -0000	1.18
@@ -1 +1 @@
-b3207c1df5f6f8cf344efe4842bb2db7  xf86-video-ati-6.7.192.tar.bz2
+316ebbe95834c5120c302cc004363f92  xf86-video-ati-6.7.193.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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-x11-drv-ati.spec	27 Aug 2007 15:43:28 -0000	1.59
+++ xorg-x11-drv-ati.spec	20 Sep 2007 00:38:25 -0000	1.60
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.7.192
+Version:   6.7.193
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -81,6 +81,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
+- xf86-video-ati 6.7.193
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 6.7.192-1
 - xf86-video-ati 6.7.192
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:51:20 2007
From: fedora-extras-commits at redhat.com (Benjamin Kosnik (bkoz))
Date: Wed, 19 Sep 2007 20:51:20 -0400
Subject: rpms/boost/devel boost.spec,1.38,1.39
Message-ID: <200709200051.l8K0pKGI018207@cvs-int.fedora.redhat.com>

Author: bkoz

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18184

Modified Files:
	boost.spec 
Log Message:

* Wed Sep 19 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-5
- (#283771: Linking against boost libraries fails).



Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- boost.spec	21 Aug 2007 16:20:04 -0000	1.38
+++ boost.spec	20 Sep 2007 00:50:48 -0000	1.39
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.34.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Boost Software License (GPL-Compatible, Free Software License)
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -199,6 +199,9 @@
 %doc %{_docdir}/boost-%{version}
 
 %changelog
+* Wed Sep 19 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-5
+- (#283771: Linking against boost libraries fails).
+
 * Tue Aug 21 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 00:58:13 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 19 Sep 2007 20:58:13 -0400
Subject: rpms/gcin/EL-5 gcin.spec,1.20,1.21
Message-ID: <200709200058.l8K0wDeS019136@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19014

Modified Files:
	gcin.spec 
Log Message:
update license field to LGPLv2
add im-chooser to require



Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/EL-5/gcin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcin.spec	17 Apr 2007 02:21:12 -0000	1.20
+++ gcin.spec	20 Sep 2007 00:57:40 -0000	1.21
@@ -1,10 +1,10 @@
 Name:           gcin
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://cle.linux.org.tw/gcin/
 Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
@@ -21,7 +21,7 @@
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  libXtst-devel
-Requires:       gtk2
+Requires:       gtk2, im-chooser
 Requires(post): %{_sbindir}/alternatives, desktop-file-utils
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): desktop-file-utils
@@ -112,6 +112,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Sep 20 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-3
+- update license field to LGPLv2
+- add im-chooser to require
+
 * Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-2
 - disable i18n and do not make po
 



From fedora-extras-commits at redhat.com  Thu Sep 20 01:02:34 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 19 Sep 2007 21:02:34 -0400
Subject: rpms/gcin/devel gcin.spec,1.21,1.22
Message-ID: <200709200102.l8K12YhZ025862@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722

Modified Files:
	gcin.spec 
Log Message:
update license field to LGPLv2
add im-chooser to require



Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gcin.spec	17 Apr 2007 02:23:56 -0000	1.21
+++ gcin.spec	20 Sep 2007 01:01:59 -0000	1.22
@@ -1,10 +1,10 @@
 Name:           gcin
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://cle.linux.org.tw/gcin/
 Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
@@ -21,7 +21,7 @@
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  libXtst-devel
-Requires:       gtk2
+Requires:       gtk2, im-chooser
 Requires(post): %{_sbindir}/alternatives, desktop-file-utils
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): desktop-file-utils
@@ -112,6 +112,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Sep 20 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-3
+- update license field to LGPLv2
+- add im-chooser to require
+
 * Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-2
 - disable i18n and do not make po
 



From fedora-extras-commits at redhat.com  Thu Sep 20 02:02:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 19 Sep 2007 22:02:33 -0400
Subject: rpms/perl-Test-Inline/F-7 .cvsignore, 1.3, 1.4 perl-Test-Inline.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200709200202.l8K22XFc010198@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Inline/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10087

Modified Files:
	.cvsignore perl-Test-Inline.spec sources 
Log Message:
* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
- Upstream update.
- Disable AUTOMATED_TESTING.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 04:22:23 -0000	1.3
+++ .cvsignore	20 Sep 2007 02:01:59 -0000	1.4
@@ -1 +1 @@
-Test-Inline-2.201.tar.gz
+Test-Inline-2.207.tar.gz


Index: perl-Test-Inline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/perl-Test-Inline.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Inline.spec	18 Jan 2007 04:43:16 -0000	1.8
+++ perl-Test-Inline.spec	20 Sep 2007 02:01:59 -0000	1.9
@@ -1,8 +1,8 @@
 Name: 		perl-Test-Inline
-Version: 	2.201
-Release: 	2%{?dist}
+Version: 	2.207
+Release: 	1%{?dist}
 Summary: 	Test::Inline Perl module
-License: 	GPL or Artistic
+License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Test-Inline/
 Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Test-Inline-%{version}.tar.gz
@@ -16,7 +16,8 @@
 BuildRequires:	perl(File::Spec) >= 0.80
 BuildRequires:	perl(List::Util) >= 1.11
 BuildRequires:	perl(Getopt::Long) >= 2.34
-BuildRequires:	perl(File::Remove)
+BuildRequires:	perl(File::chmod)
+BuildRequires:	perl(File::Remove) >= 0.34
 BuildRequires:	perl(File::Slurp) >= 9999.04
 BuildRequires:	perl(File::Find::Rule) >= 0.26
 BuildRequires:	perl(Config::Tiny) >= 2.00
@@ -26,6 +27,7 @@
 BuildRequires:	perl(File::Flat) >= 1.00
 BuildRequires:	perl(Pod::Tests) >= 0.18
 BuildRequires:	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(Test::Script)
 
 # RPM misses these deps
 Requires:	perl(File::Flat)
@@ -61,7 +63,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-make test AUTOMATED_TESTING=1
+# Something is broken with AUTOMATED_TESTING
+# make test AUTOMATED_TESTING=1
+make test
 
 %files
 %defattr(-,root,root,-)
@@ -72,6 +76,16 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 19 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.207-1
+- Upstream update.
+- Disable AUTOMATED_TESTING.
+
+* Tue Aug 07 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.205-1
+- Upstream update.
+
+* Tue Jul 10 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.202-1
+- Upstream update.
+
 * Wed Jan 18 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.201-2
 - BR: perl(File::Remove).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Inline/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2007 04:22:23 -0000	1.3
+++ sources	20 Sep 2007 02:01:59 -0000	1.4
@@ -1 +1 @@
-6c6a444c2044f11776dab50ae0030121  Test-Inline-2.201.tar.gz
+7530c2dee1d9547acd78dd4ca17ffbb3  Test-Inline-2.207.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:31:23 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 22:31:23 -0400
Subject: rpms/dkms/devel .cvsignore, 1.9, 1.10 dkms.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200709200231.l8K2VNuq014722@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14625

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
upgrade to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Feb 2007 15:52:10 -0000	1.9
+++ .cvsignore	20 Sep 2007 02:30:51 -0000	1.10
@@ -1 +1 @@
-dkms-2.0.16.tar.gz
+dkms-2.0.17.4.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dkms.spec	28 Feb 2007 15:52:10 -0000	1.13
+++ dkms.spec	20 Sep 2007 02:30:51 -0000	1.14
@@ -1,16 +1,18 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.16
+Version: 2.0.17.4
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
-Provides: dkms-minimal
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# when building for Fedora, uncomment this Requires
 Requires: kernel-devel
 
 %description
@@ -21,12 +23,13 @@
 %prep
 
 %setup -q
+%build
 
-%triggerpostun -- dkms < 1.90.00-1
-for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
-	mv -f $dir /var/lib/dkms
+%triggerpostun -- %{name} < 1.90.00-1
+for dir in `find %{_localstatedir}/%{name} -type d -maxdepth 1 -mindepth 1`; do
+	mv -f $dir %{_localstatedir}/lib/%{name}
 done
-[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
+[ -e %{_sysconfdir}/dkms_framework.conf ] && ! [ -e %{_sysconfdir}/%{name}/framework.conf ] && mkdir %{_sysconfdir}/%{name} && cp -a %{_sysconfdir}/dkms_framework.conf %{_sysconfdir}/%{name}/framework.conf
 arch_used=""
 [ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
 echo ""
@@ -37,10 +40,10 @@
 echo ""
 echo "The upgrade will assume all built modules are for arch: $arch_used"
 current_kernel=`uname -r`
-dkms_tree="/var/lib/dkms"
-source_tree="/usr/src"
+dkms_tree="%{_localstatedir}/lib/%{name}"
+source_tree="%{_prefix}/src"
 tmp_location="/tmp"
-dkms_frameworkconf="/etc/dkms/framework.conf"
+dkms_frameworkconf="%{_sysconfdir}/%{name}/framework.conf"
 . $dkms_frameworkconf 2>/dev/null
 echo ""
 echo "Fixing directories."
@@ -48,18 +51,18 @@
 	dir_to_fix=`echo $directory | sed 's#/module$##'`
 	echo "Creating $dir_to_fix/$arch_used..."
 	mkdir $dir_to_fix/$arch_used
-	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
+	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
 done
 echo ""
-echo "Fixing symlinks."	
+echo "Fixing symlinks."
 for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
 	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
 	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
 	cd $dir_of_symlink
-        read_link="$symlink"
-        while [ -L "$read_link" ]; do
-            read_link=`ls -l $read_link | sed 's/.*-> //'`
-        done
+	read_link="$symlink"
+	while [ -L "$read_link" ]; do
+		read_link=`ls -l $read_link | sed 's/.*-> //'`
+	done
 	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
 		echo "Updating $symlink..."
 		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
@@ -71,43 +74,59 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
-install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
-gzip -c -9 dkms.8 > $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-chmod 644 $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
-install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
-install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
-install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
-install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth
+make install-redhat DESTDIR=$RPM_BUILD_ROOT \
+    SBIN=$RPM_BUILD_ROOT%{_sbindir} \
+    VAR=$RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} \
+    MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
+    ETC=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+    BASHDIR=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d \
+    LIBDIR=$RPM_BUILD_ROOT%{_prefix}/lib/%{name}
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/sbin/dkms
-%attr(0755,root,root) /var/lib/dkms
-%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
-%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
-%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
-%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING README.dkms
-%doc %attr (-,root,root) sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-%dir /etc/dkms
-%config(noreplace) /etc/dkms/framework.conf
-%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec
+%{_sbindir}/%{name}
+%{_localstatedir}/lib/%{name}
+/etc/init.d/dkms_autoinstaller
+%{_prefix}/lib/dkms/*
+%{_mandir}/*/*
+%doc sample.spec sample.conf AUTHORS COPYING README.dkms
+%doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/framework.conf
+%config(noreplace) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
+%{_sysconfdir}/bash_completion.d/%{name}
 
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
-/sbin/chkconfig dkms_autoinstaller on
+# enable on initial install
+[ $1 -lt 2 ] && /sbin/chkconfig dkms_autoinstaller on ||:
 
+%preun
+# remove on uninstall
+[ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
-* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16-1
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.4
+- upgrade to latest upstream
+
+* Wed Jun 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.2
+- updated for Ubuntu support, other bugfixes.
+
+* Tue Mar 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.1
+- spec file cleanups per re-review in Fedora
+- add bash completion, rpmbuild check, pinit, pass-arch patches from
+  Mandriva.  These are generic.  The other Mandriva patches appear to
+  be distro-specific.
+- Look for /etc/sysconfig/module-init-tools to get some values.
+
+* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16
 - fix override_dest_module_location() for historical distro versions
 - don't run weak-modules if it doesn't exist
 
-* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15-1
+* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15
 - release with no changes
 
 * Fri Feb 23 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14.1
@@ -152,7 +171,7 @@
 - fix version comparison for all 2.6 kernels
 
 * Mon Apr 10 2006 Matt Domsch <Matt_Domsch at dell.com>
-- add README.dkms to %doc
+- add README.dkms to doc
 
 * Wed Mar 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11-1
 - use -n <val> to all head and tail calls
@@ -190,10 +209,10 @@
 - mkrpm now is built with -ba, not -bb (creates source RPM)
 
 * Fri Nov 4 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8
-- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper 
+- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.7
-- Repackaged 2.0.6.2 as 2.0.7 
+- Repackaged 2.0.6.2 as 2.0.7
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.2
 - Updated dkms_mkkerneldoth to know about VMWare kernel
@@ -271,7 +290,7 @@
 
 * Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
 - Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
-- Andreas Gruenbacher's removal of IFS usage 
+- Andreas Gruenbacher's removal of IFS usage
 - Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
 - Andreas Gruenbacher's patch to cut down on line length by using $base_dir
 - fixed $base_dir so it gets set after setup_kernels_arches
@@ -279,7 +298,7 @@
 * Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
 - patch to remove tick usage
 - patch to rewrite version comparison code
-- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
+- patch to switch to usage of case, remove use of grep -c, remove use of IFS
 - patch to change handling of stderr
 
 * Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
@@ -645,7 +664,7 @@
 - Added --no-prepare-kernel cli option
 
 * Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
-- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
+- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
 - Added Fred Treasure to the AUTHORS list
 - Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout
 
@@ -694,7 +713,7 @@
 
 * Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
 - Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
-- Redid handling of modifying modules.conf 
+- Redid handling of modifying modules.conf
 - Added MODULE_CONF_ALIAS_TYPE to specs
 
 * Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2007 15:52:10 -0000	1.9
+++ sources	20 Sep 2007 02:30:51 -0000	1.10
@@ -1 +1 @@
-d44d881da8f7d5355de9ddfc6bf0e66c  dkms-2.0.16.tar.gz
+0c9bf87e75c320a9e7c8640a2eb7895d  dkms-2.0.17.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:45:36 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 22:45:36 -0400
Subject: rpms/dkms/F-7 .cvsignore, 1.9, 1.10 dkms.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200709200245.l8K2jaId015594@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15563

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
upgrade to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Feb 2007 15:52:10 -0000	1.9
+++ .cvsignore	20 Sep 2007 02:45:04 -0000	1.10
@@ -1 +1 @@
-dkms-2.0.16.tar.gz
+dkms-2.0.17.4.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/dkms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dkms.spec	28 Feb 2007 15:52:10 -0000	1.13
+++ dkms.spec	20 Sep 2007 02:45:04 -0000	1.14
@@ -1,16 +1,18 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.16
+Version: 2.0.17.4
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
-Provides: dkms-minimal
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# when building for Fedora, uncomment this Requires
 Requires: kernel-devel
 
 %description
@@ -21,12 +23,13 @@
 %prep
 
 %setup -q
+%build
 
-%triggerpostun -- dkms < 1.90.00-1
-for dir in `find /var/dkms -type d -maxdepth 1 -mindepth 1`; do
-	mv -f $dir /var/lib/dkms
+%triggerpostun -- %{name} < 1.90.00-1
+for dir in `find %{_localstatedir}/%{name} -type d -maxdepth 1 -mindepth 1`; do
+	mv -f $dir %{_localstatedir}/lib/%{name}
 done
-[ -e /etc/dkms_framework.conf ] && ! [ -e /etc/dkms/framework.conf ] && mkdir /etc/dkms && cp /etc/dkms_framework.conf /etc/dkms/framework.conf
+[ -e %{_sysconfdir}/dkms_framework.conf ] && ! [ -e %{_sysconfdir}/%{name}/framework.conf ] && mkdir %{_sysconfdir}/%{name} && cp -a %{_sysconfdir}/dkms_framework.conf %{_sysconfdir}/%{name}/framework.conf
 arch_used=""
 [ `uname -m` == "x86_64" ] && [ `cat /proc/cpuinfo | grep -c "Intel"` -gt 0 ] && arch_used="ia32e" || arch_used=`uname -m`
 echo ""
@@ -37,10 +40,10 @@
 echo ""
 echo "The upgrade will assume all built modules are for arch: $arch_used"
 current_kernel=`uname -r`
-dkms_tree="/var/lib/dkms"
-source_tree="/usr/src"
+dkms_tree="%{_localstatedir}/lib/%{name}"
+source_tree="%{_prefix}/src"
 tmp_location="/tmp"
-dkms_frameworkconf="/etc/dkms/framework.conf"
+dkms_frameworkconf="%{_sysconfdir}/%{name}/framework.conf"
 . $dkms_frameworkconf 2>/dev/null
 echo ""
 echo "Fixing directories."
@@ -48,18 +51,18 @@
 	dir_to_fix=`echo $directory | sed 's#/module$##'`
 	echo "Creating $dir_to_fix/$arch_used..."
 	mkdir $dir_to_fix/$arch_used
-	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null 
+	mv -f $dir_to_fix/* $dir_to_fix/$arch_used 2>/dev/null
 done
 echo ""
-echo "Fixing symlinks."	
+echo "Fixing symlinks."
 for symlink in `find $dkms_tree -type l -name "kernel*" -mindepth 2 -maxdepth 2`; do
 	symlink_kernelname=`echo $symlink | sed 's#.*/kernel-##'`
 	dir_of_symlink=`echo $symlink | sed 's#/kernel-.*$##'`
 	cd $dir_of_symlink
-        read_link="$symlink"
-        while [ -L "$read_link" ]; do
-            read_link=`ls -l $read_link | sed 's/.*-> //'`
-        done
+	read_link="$symlink"
+	while [ -L "$read_link" ]; do
+		read_link=`ls -l $read_link | sed 's/.*-> //'`
+	done
 	if [ `echo $read_link | sed 's#/# #g' | wc -w | awk {'print $1'}` -lt 3 ]; then
 		echo "Updating $symlink..."
 		ln -sf $read_link/$arch_used kernel-$symlink_kernelname-$arch_used
@@ -71,43 +74,59 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{var/lib/dkms,/usr/sbin,usr/share/man/man8,etc/init.d,etc/dkms}
-install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms
-gzip -c -9 dkms.8 > $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-chmod 644 $RPM_BUILD_ROOT/usr/share/man/man8/dkms.8.gz
-install -m 644 dkms_framework.conf  $RPM_BUILD_ROOT/etc/dkms/framework.conf
-install -m 644 template-dkms-mkrpm.spec $RPM_BUILD_ROOT/etc/dkms
-install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/lib/dkms/dkms_dbversion
-install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller
-install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth
+make install-redhat DESTDIR=$RPM_BUILD_ROOT \
+    SBIN=$RPM_BUILD_ROOT%{_sbindir} \
+    VAR=$RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} \
+    MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
+    ETC=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+    BASHDIR=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d \
+    LIBDIR=$RPM_BUILD_ROOT%{_prefix}/lib/%{name}
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/sbin/dkms
-%attr(0755,root,root) /var/lib/dkms
-%attr(0755,root,root) /etc/init.d/dkms_autoinstaller
-%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth
-%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz
-%doc %attr (-,root,root) sample.spec sample.conf AUTHORS COPYING README.dkms
-%doc %attr (-,root,root) sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-%dir /etc/dkms
-%config(noreplace) /etc/dkms/framework.conf
-%config(noreplace) /etc/dkms/template-dkms-mkrpm.spec
+%{_sbindir}/%{name}
+%{_localstatedir}/lib/%{name}
+/etc/init.d/dkms_autoinstaller
+%{_prefix}/lib/dkms/*
+%{_mandir}/*/*
+%doc sample.spec sample.conf AUTHORS COPYING README.dkms
+%doc sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/framework.conf
+%config(noreplace) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
+%{_sysconfdir}/bash_completion.d/%{name}
 
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
-/sbin/chkconfig dkms_autoinstaller on
+# enable on initial install
+[ $1 -lt 2 ] && /sbin/chkconfig dkms_autoinstaller on ||:
 
+%preun
+# remove on uninstall
+[ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
-* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16-1
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.17.4
+- upgrade to latest upstream
+
+* Wed Jun 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.2
+- updated for Ubuntu support, other bugfixes.
+
+* Tue Mar 20 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16.1
+- spec file cleanups per re-review in Fedora
+- add bash completion, rpmbuild check, pinit, pass-arch patches from
+  Mandriva.  These are generic.  The other Mandriva patches appear to
+  be distro-specific.
+- Look for /etc/sysconfig/module-init-tools to get some values.
+
+* Tue Feb 27 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.16
 - fix override_dest_module_location() for historical distro versions
 - don't run weak-modules if it doesn't exist
 
-* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15-1
+* Mon Feb 26 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.15
 - release with no changes
 
 * Fri Feb 23 2007 Matt Domsch <Matt_Domsch at dell.com> 2.0.14.1
@@ -152,7 +171,7 @@
 - fix version comparison for all 2.6 kernels
 
 * Mon Apr 10 2006 Matt Domsch <Matt_Domsch at dell.com>
-- add README.dkms to %doc
+- add README.dkms to doc
 
 * Wed Mar 29 2006 Matt Domsch <Matt_Domsch at dell.com> 2.0.11-1
 - use -n <val> to all head and tail calls
@@ -190,10 +209,10 @@
 - mkrpm now is built with -ba, not -bb (creates source RPM)
 
 * Fri Nov 4 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.8
-- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper 
+- In dkms_autoinstaller added -no-clean-kernel to builds of multiple modules to avoid mrproper
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.7
-- Repackaged 2.0.6.2 as 2.0.7 
+- Repackaged 2.0.6.2 as 2.0.7
 
 * Wed Oct 19 2005 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.6.2
 - Updated dkms_mkkerneldoth to know about VMWare kernel
@@ -271,7 +290,7 @@
 
 * Tue Sep 28 2004 Gary Lerhaupt <gary_lerhaupt at dell.com> 2.0.1.2-1
 - Charles Duffy's fix for multiple rpms owning /lib/modules/kernel...
-- Andreas Gruenbacher's removal of IFS usage 
+- Andreas Gruenbacher's removal of IFS usage
 - Andreas Gruenbacher's reorganizing prepare check into prepare_kernel
 - Andreas Gruenbacher's patch to cut down on line length by using $base_dir
 - fixed $base_dir so it gets set after setup_kernels_arches
@@ -279,7 +298,7 @@
 * Sun Sep 12 2004 Andreas Gruenbacher <agruen at suse.de>
 - patch to remove tick usage
 - patch to rewrite version comparison code
-- patch to switch to usage of case, remove use of grep -c, remove use of IFS 
+- patch to switch to usage of case, remove use of grep -c, remove use of IFS
 - patch to change handling of stderr
 
 * Fri Sep 10 2004 Gary Lerhaupt <gary_lerhaupt at dell.com>
@@ -645,7 +664,7 @@
 - Added --no-prepare-kernel cli option
 
 * Fri Aug 08 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.33.02-1
-- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>) 
+- Fixed quote bugs in match (Reported by: John Hull <john_hull at dell.com>)
 - Added Fred Treasure to the AUTHORS list
 - Added dkms_dbversion file to DKMS tree to track architecture of dkms db layout
 
@@ -694,7 +713,7 @@
 
 * Tue Apr 29 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.27.05-1
 - Changed NEEDED_FOR_BOOT to REMAKE_INITRD as this makes more sense
-- Redid handling of modifying modules.conf 
+- Redid handling of modifying modules.conf
 - Added MODULE_CONF_ALIAS_TYPE to specs
 
 * Mon Apr 28 2003 Gary Lerhaupt <gary_lerhaupt at dell.com> 0.26.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2007 15:52:10 -0000	1.9
+++ sources	20 Sep 2007 02:45:04 -0000	1.10
@@ -1 +1 @@
-d44d881da8f7d5355de9ddfc6bf0e66c  dkms-2.0.16.tar.gz
+0c9bf87e75c320a9e7c8640a2eb7895d  dkms-2.0.17.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 02:47:59 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 19 Sep 2007 22:47:59 -0400
Subject: rpms/uim/devel uim.spec,1.45,1.46
Message-ID: <200709200247.l8K2lxWq015698@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	uim.spec 
Log Message:
* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
- Correct License tag. (Todd Zullinger)


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- uim.spec	10 Sep 2007 07:18:14 -0000	1.45
+++ uim.spec	20 Sep 2007 02:47:27 -0000	1.46
@@ -3,12 +3,12 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
-# pixmaps/*.{svg,png} is licensed under BSD or LGPL+
-License:	BSD and LGPLv2+ and (BSD or LGPL+)
+# pixmaps/*.{svg,png} is licensed under BSD or LGPLv2
+License:	BSD and LGPLv2+ and (BSD or LGPLv2)
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
@@ -33,7 +33,7 @@
 Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
-Requires:	xorg-x11-xinit >= 1.0.2-5.fc6
+Requires:	im-chooser >= 0.4.1-2.fc8
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -292,7 +292,7 @@
 %exclude %{_datadir}/uim/canna*.scm
 %exclude %{_datadir}/uim/skk*.scm
 %exclude %{_datadir}/uim/m17nlib.scm
-## pixmaps are licensed under BSD or LGPL+
+## pixmaps are licensed under BSD or LGPLv2
 %exclude %{_datadir}/uim/pixmaps/anthy.png
 %exclude %{_datadir}/uim/pixmaps/canna.png
 %exclude %{_datadir}/uim/pixmaps/m17n*png
@@ -357,7 +357,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
 %{_datadir}/uim/anthy*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/anthy.png
 %dir %{_datadir}/uim
 
@@ -365,7 +365,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-canna.so
 %{_datadir}/uim/canna*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/canna.png
 %dir %{_datadir}/uim
 
@@ -379,11 +379,15 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim//pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %changelog
+* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
+- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
+- Correct License tag. (Todd Zullinger)
+
 * Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
 - Update the xinput script to support the new im-chooser.
   - bring up uim-toolbar-gtk-systray as the auxiliary program



From fedora-extras-commits at redhat.com  Thu Sep 20 02:57:18 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 19 Sep 2007 22:57:18 -0400
Subject: rpms/referencer/devel referencer-new_poppler.patch, NONE,
	1.1 referencer.spec, 1.6, 1.7
Message-ID: <200709200257.l8K2vIWx015986@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15955

Modified Files:
	referencer.spec 
Added Files:
	referencer-new_poppler.patch 
Log Message:
* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
- Patch to build against newer poppler library


referencer-new_poppler.patch:

--- NEW FILE referencer-new_poppler.patch ---
--- src/Document.C	2007/09/02 07:29:29	547
+++ src/Document.C	2007/09/08 18:30:24	548
@@ -18,9 +18,10 @@
 #include <libgnomevfsmm.h>
 #include <glibmm/i18n.h>
 #include "ucompose.hpp"
-
 #include <poppler.h>
 
+#include "config.h"
+
 #include "Utility.h"
 #include "Library.h"
 #include "TagList.h"
@@ -28,6 +29,7 @@
 
 #include "Document.h"
 
+
 Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
 Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
 Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
@@ -393,7 +395,13 @@
 		rect->y2 = height;
 
 		// FIXME: add something before/after appending text to signal pagebreak?
-		textdump += poppler_page_get_text (page, rect);
+		#ifdef OLD_POPPLER
+			#warning Using poppler <= 0.5
+			textdump += poppler_page_get_text (page, rect);
+		#else
+			#warning Using poppler >= 0.6
+			textdump += poppler_page_get_text (page, POPPLER_SELECTION_GLYPH, rect);
+		#endif
 
 		poppler_rectangle_free (rect);
 		g_object_unref (page);


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- referencer.spec	6 Sep 2007 00:34:20 -0000	1.6
+++ referencer.spec	20 Sep 2007 02:56:46 -0000	1.7
@@ -1,11 +1,12 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.0.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
+Patch0:		referencer-new_poppler.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .poppler
 
 %build
 %configure --disable-update-mime-database
@@ -68,6 +70,9 @@
 %{_datadir}/referencer/
 
 %changelog
+* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
+- Patch to build against newer poppler library
+
 * Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
 - Rebuild against newer poppler library
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:15:43 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 19 Sep 2007 23:15:43 -0400
Subject: devel/anaconda .cvsignore, 1.445, 1.446 anaconda.spec, 1.581,
	1.582 sources, 1.574, 1.575
Message-ID: <200709200315.l8K3FhPg022335@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22310

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
- spec file cleanups (dcantrell)
- lots of pychecker fixes (clumens)
- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
- Fix upgrade traceback (clumens, #296571)
- Few live install fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- .cvsignore	18 Sep 2007 21:36:42 -0000	1.445
+++ .cvsignore	20 Sep 2007 03:15:09 -0000	1.446
@@ -1,3 +1 @@
-anaconda-11.3.0.28.tar.bz2
-anaconda-11.3.0.29.tar.bz2
-anaconda-11.3.0.31.tar.bz2
+anaconda-11.3.0.32.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- anaconda.spec	18 Sep 2007 21:36:42 -0000	1.581
+++ anaconda.spec	20 Sep 2007 03:15:09 -0000	1.582
@@ -1,69 +1,124 @@
 %define livearches %{ix86} x86_64
 
-Name: anaconda
-Version: 11.3.0.31
-Release: 1
-License: GPL
 Summary: Graphical system installer
-Group: Applications/System
-Source: anaconda-%{version}.tar.bz2
-BuildRequires: kudzu-devel >= 1.2.68, pciutils-devel
-BuildRequires: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
-BuildRequires: rpm-python >= 4.2-0.61, rpm-devel, gettext >= 0.11
-BuildRequires: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
-BuildRequires: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
-BuildRequires: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber
-BuildRequires: pykickstart >= 0.96, yum >= 2.9.2,
+Name:    anaconda
+Version: 11.3.0.32
+Release: 1
+License: GPLv2
+Group:   Applications/System
+URL:     http://fedoraproject.org/wiki/Anaconda
+
+Source0: anaconda-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Versions of required components (done so we make sure the buildrequires
+# match the requires versions of things).
 %define dmver 1.02.17-6
+%define gettextver 0.11
+%define glib2ver 2.11.1-5
+%define intltoolver 0.31.2-3
+%define kudzuver 1.2.68
+%define libdhcpver 1.27-3
+%define libselinuxver 1.6
+%define mkinitrdver 5.1.2-1
+%define pykickstartver 0.96
+%define rpmpythonver 4.2-0.61
+%define slangver 2.0.6-2
+%define yumver 2.9.2
+%define rhplver 0.170
+%define partedver 1.8.1
+%define pirutver 1.1.0
+%define syscfgdatever 1.9.0
+%define pythonpyblockver 0.24-1
+%define libbdevidver 5.1.2-1
+%define rhpxlver 0.25
+%define desktopfileutilsver 0.8
+
+BuildRequires: audit-libs-devel
+BuildRequires: beecrypt-devel
+BuildRequires: booty
+BuildRequires: bzip2-devel
 BuildRequires: device-mapper-devel >= %{dmver}
+BuildRequires: e2fsprogs-devel
+BuildRequires: elfutils-devel
+BuildRequires: gettext >= %{gettextver}
+BuildRequires: glib2-static >= %{glib2ver}
+BuildRequires: gtk2-devel
+BuildRequires: intltool >= %{intltoolver}
+BuildRequires: kudzu-devel >= %{kudzuver}
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libdhcp-static >= %{libdhcpver}
+BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: libsepol-devel
-BuildRequires: pango-devel, pirut, libXt-devel
-BuildRequires: slang-devel >= 2.0.6-2, slang-static
-BuildRequires: newt-devel, newt-static
-BuildRequires: glib2-devel >= 2.11.1-5, glib2-static, libdhcp6client-static
-BuildRequires: libdhcp-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1
-BuildRequires: audit-libs-devel
-BuildRequires: popt-devel, popt-static
+BuildRequires: libxml2-python
+BuildRequires: mkinitrd-devel >= %{mkinitrdver}
+BuildRequires: newt-static
+BuildRequires: pango-devel
+BuildRequires: pciutils-devel
+BuildRequires: pirut
+BuildRequires: popt-static
+BuildRequires: pykickstart >= %{pykickstartver}
+BuildRequires: python-devel
+BuildRequires: python-urlgrabber
+BuildRequires: rhpl
+BuildRequires: rpm-devel
+BuildRequires: rpm-python >= %{rpmpythonver}
+BuildRequires: slang-static >= %{slangver}
+BuildRequires: yum >= %{yumver}
+BuildRequires: zlib-devel
 %ifarch %livearches
 BuildRequires: desktop-file-utils
 %endif
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
-Requires: parted >= 1.8.1, pyparted >= 1.8.1
-Requires: kudzu >= 1.2.68, yum >= 2.9.2, pirut >= 1.1.0
-Requires: libxml2-python, python-urlgrabber
-Requires: system-logos, pykickstart >= 0.96, system-config-date >= 1.9.0
-Requires: device-mapper >= %{dmver}, device-mapper-libs >= %{dmver}
-Requires: dosfstools e2fsprogs
-Requires: python-pyblock >= 0.24-1
-Requires: libbdevid >= 5.1.2-1, libbdevid-python
+
+Requires: rpm-python >= %{rpmpythonver}
+Requires: rhpl >= %{rhplver}
+Requires: booty
+Requires: parted >= %{partedver}
+Requires: pyparted >= %{partedver}
+Requires: kudzu >= %{kudzuver}
+Requires: yum >= %{yumver}
+Requires: pirut >= %{pirutver}
+Requires: libxml2-python
+Requires: python-urlgrabber
+Requires: system-logos
+Requires: pykickstart >= %{pykickstartver}
+Requires: system-config-date >= %{syscfgdatever}
+Requires: device-mapper >= %{dmver}
+Requires: device-mapper-libs >= %{dmver}
+Requires: dosfstools
+Requires: e2fsprogs
+Requires: python-pyblock >= %{pythonpyblockver}
+Requires: libbdevid >= %{libbdevidver}
+Requires: libbdevid-python
 Requires: audit-libs
-Requires: libuser-python, newt-python
+Requires: libuser-python
+Requires: newt-python
 Requires: authconfig
 Requires: gnome-python2-gtkhtml2
 Requires: system-config-securitylevel
 %ifnarch s390 s390x ppc64
-Requires: rhpxl >= 0.25
+Requires: rhpxl >= %{rhpxlver}
 Requires: system-config-keyboard
 %endif
 %ifarch %livearches
 Requires: usermode
 Requires: zenity
-Requires(post): desktop-file-utils >= 0.8
-Requires(postun): desktop-file-utils >= 0.8
+Requires(post): desktop-file-utils >= %{desktopfileutilsver}
+Requires(postun): desktop-file-utils >= %{desktopfileutilsver}
 %endif
 Obsoletes: anaconda-images <= 10
-Url: http://fedoraproject.org/wiki/Anaconda
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The anaconda package contains the program which was used to install your 
 system.  These files are of little use on an already installed system.
 
 %package runtime
-Summary: Graphical system installer portions needed only for fresh installs.
-Group: Applications/System
-Requires: libxml2-python, python, rpm-python >= 4.2-0.61
+Summary: Graphical system installer portions needed only for fresh installs
+Group:   Applications/System
+Requires: libxml2-python, python, rpm-python >= %{rpmpythonver}
 Requires: anaconda = %{version}-%{release}
 Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs
 %ifarch %{ix86} x86_64
@@ -93,21 +148,21 @@
 %setup -q
 
 %build
-make depend
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%{__make} depend
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %ifarch %livearches
-desktop-file-install --vendor="" --dir=$RPM_BUILD_ROOT/%{_datadir}/applications  $RPM_BUILD_ROOT/%{_datadir}/applications/liveinst.desktop
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
 %endif
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %ifarch %livearches
 %post
@@ -115,7 +170,7 @@
 %endif
 
 %ifarch %livearches
-%postun 
+%postun
 /usr/bin/update-desktop-database %{_datadir}/applications
 %endif
 
@@ -128,13 +183,13 @@
 %doc docs/kickstart-docs.txt
 %doc docs/mediacheck.txt
 %doc docs/anaconda-release-notes.txt
-/usr/bin/mini-wm
-/usr/sbin/anaconda
+%{_bindir}/mini-wm
+%{_sbindir}/anaconda
 %ifarch i386 x86_64
-/usr/sbin/gptsync
+%{_sbindir}/gptsync
 %endif
-/usr/share/anaconda
-/usr/lib/anaconda
+%{_datadir}/anaconda
+%{_prefix}/lib/anaconda
 %ifarch %livearches
 %{_bindir}/liveinst
 %{_sbindir}/liveinst
@@ -146,7 +201,7 @@
 
 %files runtime
 %defattr(-,root,root)
-/usr/lib/anaconda-runtime
+%{_prefix}/lib/anaconda-runtime
 
 %files -n isomd5sum
 %defattr(-,root,root)
@@ -158,6 +213,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
+- spec file cleanups (dcantrell)
+- lots of pychecker fixes (clumens)
+- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
+- Fix upgrade traceback (clumens, #296571)
+- Few live install fixes
+
 * Tue Sep 18 2007 Chris Lumens <clumens at redhat.com> 11.3.0.31-1
 - Really include new Japanese font (katzj, #279931).
 - Use /dev/live-osimg-min if it exists (katzj).


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- sources	18 Sep 2007 22:05:50 -0000	1.574
+++ sources	20 Sep 2007 03:15:09 -0000	1.575
@@ -1 +1 @@
-9786fb11aba1ac3d387490e1fcb2ba2c  anaconda-11.3.0.31.tar.bz2
+4bd27095e1ac6fe29efa20ab7b9a20f2  anaconda-11.3.0.32.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 03:33:13 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 19 Sep 2007 23:33:13 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.15,1.16
Message-ID: <200709200333.l8K3XDgK022778@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22739

Modified Files:
	kinput2.spec 
Log Message:
* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
- Add the versioned dependency for im-chooser.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kinput2.spec	5 Sep 2007 00:48:01 -0000	1.15
+++ kinput2.spec	20 Sep 2007 03:32:40 -0000	1.16
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -66,7 +66,7 @@
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
 Requires(triggerpostun): %{_sbindir}/alternatives
-Requires: im-chooser
+Requires: im-chooser >= 0.4.1-2.fc8
 Obsoletes: kinput2-canna, kinput2-wnn4, kinput2-wnn6, kinput2-canna-wnn4, kinput2-canna-wnn6
 
 %description 
@@ -253,6 +253,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
+- Add the versioned dependency for im-chooser.
+
 * Wed Sep  5 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-34
 - Add QT_IM_MODULE=xim to the xinput script.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:43:20 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 23:43:20 -0400
Subject: rpms/ttywatch/devel ttywatch.init-lsb.patch, NONE, 1.1 ttywatch.spec,
	1.5, 1.6
Message-ID: <200709200343.l8K3hKSm022974@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952

Modified Files:
	ttywatch.spec 
Added Files:
	ttywatch.init-lsb.patch 
Log Message:
add LSB initscript header (BZ#247080)

ttywatch.init-lsb.patch:

--- NEW FILE ttywatch.init-lsb.patch ---
--- ttywatch-0.14/ttywatch.init.orig	2007-09-19 22:26:19.000000000 -0500
+++ ttywatch-0.14/ttywatch.init	2007-09-19 22:29:52.000000000 -0500
@@ -9,6 +9,17 @@
 # pidfile: /var/run/ttywatch.pid
 # config: /etc/ttywatch.conf
 # config: /etc/ttywatch.d/*
+### BEGIN INIT INFO
+# Provides: ttywatch
+# Default-Start: 
+# Default-Stop: 
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Short-Description: The ttywatch device output logging facility
+# Description: The ttywatch device output logging facility
+### END INIT INFO
+
+
 
 
 # Source function library.
@@ -75,9 +86,15 @@ case "$1" in
     reload)
 	reload
 	;;
+    force-reload)
+	reload
+	;;
     condrestart)
 	condrestart
 	;;
+    try-restart)
+	condrestart
+	;;
     *)
 	echo "Usage: ttywatch {start|stop|status|restart|condrestart|reload}"
 	RETVAL=1


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttywatch.spec	13 Aug 2007 13:24:17 -0000	1.5
+++ ttywatch.spec	20 Sep 2007 03:42:48 -0000	1.6
@@ -1,11 +1,12 @@
 Name: ttywatch
 Version: 0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.danlj.org/mkj/ttywatch/
 Source: http://www.danlj.org/mkj/ttywatch/%{name}-%{version}.tar.bz2
+Patch0: ttywatch.init-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel popt lockdev-devel
 Requires(post): /sbin/chkconfig
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-9
+- add LSB initscript header (BZ#247080)
+
 * Mon Aug 13 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-8
 - License tag GPLv2+
 



From fedora-extras-commits at redhat.com  Thu Sep 20 03:58:06 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 19 Sep 2007 23:58:06 -0400
Subject: rpms/ttywatch/devel ttywatch.spec,1.6,1.7
Message-ID: <200709200358.l8K3w69N023244@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/ttywatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224

Modified Files:
	ttywatch.spec 
Log Message:
BR: popt-devel instead of popt


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttywatch.spec	20 Sep 2007 03:42:48 -0000	1.6
+++ ttywatch.spec	20 Sep 2007 03:57:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name: ttywatch
 Version: 0.14
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPLv2+
 Group: System Environment/Daemons
@@ -8,7 +8,7 @@
 Source: http://www.danlj.org/mkj/ttywatch/%{name}-%{version}.tar.bz2
 Patch0: ttywatch.init-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel popt lockdev-devel
+BuildRequires: glib2-devel popt-devel lockdev-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -83,8 +83,9 @@
 
 
 %changelog
-* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-9
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-10
 - add LSB initscript header (BZ#247080)
+- BR: popt-devel instead of popt now that it's split out
 
 * Mon Aug 13 2007 Matt Domsch <Matt_Domsch at dell.com> 0.14-8
 - License tag GPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 20 04:37:01 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 20 Sep 2007 00:37:01 -0400
Subject: rpms/pgp-tools/devel .cvsignore, 1.7, 1.8 pgp-tools.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200709200437.l8K4b1KC030132@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30096

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to latest upstream, fix BZ246433


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2006 19:21:12 -0000	1.7
+++ .cvsignore	20 Sep 2007 04:36:29 -0000	1.8
@@ -1 +1 @@
-signing-party_0.4.9.orig.tar.gz
+signing-party_0.4.12.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pgp-tools.spec	2 Nov 2006 19:21:12 -0000	1.6
+++ pgp-tools.spec	20 Sep 2007 04:36:29 -0000	1.7
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.9
+Version:        0.4.12
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -60,9 +60,13 @@
 	install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+rm -rf __fedora_docs
+mkdir __fedora_docs
+cp -a caff gpg-key2ps gpg-mailkeys gpgsigs keylookup __fedora_docs/
+
 #  cleanup to leave docs only...
-find . -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
-mv keylookup/COPYING .
+find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+mv __fedora_docs/keylookup/COPYING .
 
 
 %clean
@@ -71,12 +75,16 @@
 %files
 %defattr(-,root,root,-)
 %doc README TODO COPYING copyright
-%doc caff gpg-key2ps gpg-mailkeys gpgsigs keylookup
+%doc __fedora_docs/*
 %{_bindir}/*
 %{_mandir}/*/*
 
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.4.12-1
+- upgrade to 0.4.12
+- cleanup doc installation (BZ#246433)
+
 * Thu Nov 02 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.9-1
 - upgrade to 0.4.9
   - Fix a bug with checking if we have exactly one or more keys that failed downloading.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2006 19:21:12 -0000	1.7
+++ sources	20 Sep 2007 04:36:29 -0000	1.8
@@ -1 +1 @@
-da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz
+88d44fb63c3d941acb6e8d4a450717cd  signing-party_0.4.12.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 04:45:50 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 20 Sep 2007 00:45:50 -0400
Subject: rpms/aiccu/devel aiccu.spec,1.7,1.8
Message-ID: <200709200445.l8K4joVa030473@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30444

Modified Files:
	aiccu.spec 
Log Message:
rebuild


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aiccu.spec	31 Jan 2007 15:34:10 -0000	1.7
+++ aiccu.spec	20 Sep 2007 04:45:15 -0000	1.8
@@ -9,7 +9,7 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2007.01.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
@@ -70,6 +70,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Wed Sep 19 2007 Matt Domsch <matt at domsch.com> 2007.01.15-2
+- rebuild
+
 * Wed Jan 31 2007 Matt Domsch <matt at domsch.com> 2007.01.15-1
 - upgrade to latest upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 20 06:33:57 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Thu, 20 Sep 2007 02:33:57 -0400
Subject: rpms/system-config-language/devel sources,1.24,1.25
Message-ID: <200709200633.l8K6XvWR012389@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12359

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.10



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Sep 2007 06:54:41 -0000	1.24
+++ sources	20 Sep 2007 06:33:24 -0000	1.25
@@ -1 +1 @@
-8a33fab49fed83a462312a146b3ce11c  system-config-language-1.2.9.tar.bz2
+66c97c10249fd9a70f5886a88293c9b0  system-config-language-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 06:35:36 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Thu, 20 Sep 2007 02:35:36 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.31,
	1.32
Message-ID: <200709200635.l8K6Za9w012423@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12401

Modified Files:
	system-config-language.spec 
Log Message:
- fix bug288851 and bug297461.
- add the Nepali support.




Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-language.spec	10 Sep 2007 06:56:32 -0000	1.31
+++ system-config-language.spec	20 Sep 2007 06:35:04 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,6 +73,10 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Thu Sep 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.10
+- fix bug288851 and bug297461.
+- add the Nepali support.
+
 * Mon Sep 10 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.9
 - fix bug275711 and bug284331.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 07:27:57 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 03:27:57 -0400
Subject: rpms/scim/devel scim.spec,1.97,1.98
Message-ID: <200709200727.l8K7Rv8O019427@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	scim.spec 
Log Message:
- drop %{_xinputdir}
- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
- no longer require xorg-x11-xinit



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- scim.spec	18 Sep 2007 04:14:54 -0000	1.97
+++ scim.spec	20 Sep 2007 07:27:20 -0000	1.98
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -23,8 +23,6 @@
 BuildRequires: doxygen
 %endif
 Requires:  %{name}-libs = %{version}-%{release}
-# for xinputrc (fc6)
-Requires: xorg-x11-xinit >= 1.0.2-5
 Requires: im-chooser
 Requires(post): %{_sbindir}/alternatives
 Requires(postun): %{_sbindir}/alternatives
@@ -136,8 +134,7 @@
 
 %define scim_api 1.4.0
 
-%define _xinputdir %{_sysconfdir}/X11/xinit/xinput.d
-%define _xinputconf %{_xinputdir}/scim.conf
+%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/scim.conf
 
 
 %prep
@@ -190,7 +187,7 @@
 rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
 # install xinput config file
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_xinputdir}
+mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
 
 %find_lang %{name}
@@ -256,7 +253,6 @@
 %{_libdir}/scim-1.0/%{scim_api}/SetupUI
 %{_datadir}/scim
 %{_datadir}/pixmaps/*
-%dir %{_xinputdir}
 %config(noreplace) %{_xinputconf}
 
 %files devel
@@ -290,6 +286,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-5
+- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
+- no longer require xorg-x11-xinit
+
 * Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
 - source none.conf in xinput script when skipping scim startup
 



From fedora-extras-commits at redhat.com  Thu Sep 20 07:47:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 20 Sep 2007 03:47:54 -0400
Subject: rpms/rlwrap/devel rlwrap.spec,1.2,1.3
Message-ID: <200709200747.l8K7lsAe019877@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19857

Modified Files:
	rlwrap.spec 
Log Message:
License field updated


Index: rlwrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rlwrap/devel/rlwrap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rlwrap.spec	5 Feb 2007 06:09:14 -0000	1.2
+++ rlwrap.spec	20 Sep 2007 07:47:21 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           rlwrap
 Version:        0.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Wrapper for GNU readline
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://utopia.knoware.nl/~hlub/rlwrap/
 Source0:        http://utopia.knoware.nl/~hlub/rlwrap/rlwrap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Michel Salim <michel.sylvan at gmail.com> 0.28-3
+- License field updated
+
 * Mon Feb  5 2007 Michel Salim <michel.salim at gmail.com> 0.28-2
 - Rebuild for Fedora 7, removing dependency on libtermcap
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:26:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 04:26:04 -0400
Subject: rpms/darcs/devel darcs.spec,1.24,1.25
Message-ID: <200709200826.l8K8Q44J027557@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27478

Modified Files:
	darcs.spec 
Log Message:
set selinux file-context for %{_bindir}/darcs (reported by Jim Radford, #295351)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- darcs.spec	10 Aug 2007 04:36:30 -0000	1.24
+++ darcs.spec	20 Sep 2007 08:25:31 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        1.0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -76,7 +76,9 @@
 
 
 %post
-/usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1
+|| :
+restorecon -v %{_bindir}/darcs
 
 
 %files
@@ -94,6 +96,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-5
+- set selinux file-context for %{_bindir}/darcs
+  (reported by Jim Radford, #295351)
+
 * Fri Aug 10 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-4
 - specify license is GPL 2 or later
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:36:06 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 04:36:06 -0400
Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.7, 1.8 gnome-vfsmm.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200709200836.l8K8a66h028525@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-vfsmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28482

Modified Files:
	.cvsignore gnome-vfsmm.spec sources 
Log Message:
Update to new stable tree 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2007 14:50:19 -0000	1.7
+++ .cvsignore	20 Sep 2007 08:35:33 -0000	1.8
@@ -1 +1 @@
-gnome-vfsmm-2.18.0.tar.bz2
+gnome-vfsmm-2.20.0.tar.bz2


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-vfsmm.spec	28 Aug 2007 22:24:23 -0000	1.14
+++ gnome-vfsmm.spec	20 Sep 2007 08:35:33 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           gnome-vfsmm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for gnome-vfs
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable tree 2.20.0
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow gnome-vfs2 version
 - Added dist tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2007 14:50:20 -0000	1.8
+++ sources	20 Sep 2007 08:35:33 -0000	1.9
@@ -1 +1 @@
-1c5c0ef2ffcf52e682375fa11facebbf  gnome-vfsmm-2.18.0.tar.bz2
+3da9908850655031a383998d0cda1f85  gnome-vfsmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 08:41:27 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 04:41:27 -0400
Subject: rpms/libgnomemm26/devel .cvsignore, 1.9, 1.10 libgnomemm.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709200841.l8K8fRAb028767@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomemm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28727

Modified Files:
	.cvsignore libgnomemm.spec sources 
Log Message:
Update to new stable branch 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Mar 2007 14:53:05 -0000	1.9
+++ .cvsignore	20 Sep 2007 08:40:55 -0000	1.10
@@ -1 +1 @@
-libgnomemm-2.18.0.tar.bz2
+libgnomemm-2.20.0.tar.bz2


Index: libgnomemm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/libgnomemm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgnomemm.spec	28 Aug 2007 22:32:18 -0000	1.16
+++ libgnomemm.spec	20 Sep 2007 08:40:55 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           libgnomemm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable branch 2.20
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow libgnome2 version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomemm26/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Mar 2007 14:53:05 -0000	1.10
+++ sources	20 Sep 2007 08:40:55 -0000	1.11
@@ -1 +1 @@
-da6d481fc4a7fb0084d0e48f5c182112  libgnomemm-2.18.0.tar.bz2
+6263d15a96c34a73964be37c4e9a261f  libgnomemm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 08:48:35 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 20 Sep 2007 04:48:35 -0400
Subject: rpms/gmp/devel gmp.spec,1.44,1.45
Message-ID: <200709200848.l8K8mZwv029052@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29020

Modified Files:
	gmp.spec 
Log Message:
fix dist tag



Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gmp.spec	19 Sep 2007 09:37:09 -0000	1.44
+++ gmp.spec	20 Sep 2007 08:48:03 -0000	1.45
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.2.2
-Release: 1%{dist}
+Release: 2%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-2
+- fix check tag
+
 * Wed Sep 19 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-1
 - update to 4.2.2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 08:53:37 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Thu, 20 Sep 2007 04:53:37 -0400
Subject: fedora-security/audit fc6,1.263,1.264 fc7,1.111,1.112
Message-ID: <200709200853.l8K8rbU1029405@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356/audit

Modified Files:
	fc6 fc7 
Log Message:
ekiga / opal tracking bugs.



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- fc6	19 Sep 2007 15:39:17 -0000	1.263
+++ fc6	20 Sep 2007 08:53:35 -0000	1.264
@@ -8,8 +8,8 @@
 # Up to date FC6 as of 20070916
 
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
-CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
-CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297561
+CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8 #297561
 CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9)
 CVE-2007-4752 VULNERABLE (openssh) #280471


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc7	19 Sep 2007 15:39:17 -0000	1.111
+++ fc7	20 Sep 2007 08:53:35 -0000	1.112
@@ -12,7 +12,7 @@
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
-CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10
+CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
 CVE-2007-4894 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]
 CVE-2007-4893 version (wordpress, fixed 2.2.3) [since FEDORA-2007-2143]



From fedora-extras-commits at redhat.com  Thu Sep 20 09:06:14 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Thu, 20 Sep 2007 05:06:14 -0400
Subject: rpms/mrtg/F-7 filter-provides-mrtg.sh,NONE,1.1 mrtg.spec,1.36,1.37
Message-ID: <200709200906.l8K96E5a003149@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3128

Modified Files:
	mrtg.spec 
Added Files:
	filter-provides-mrtg.sh 
Log Message:
Fix bad provides, Resolves: #247113


--- NEW FILE filter-provides-mrtg.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'


Index: mrtg.spec
===================================================================
RCS file: /cvs/extras/rpms/mrtg/F-7/mrtg.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mrtg.spec	8 Jun 2007 08:43:55 -0000	1.36
+++ mrtg.spec	20 Sep 2007 09:05:41 -0000	1.37
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.15.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg
@@ -14,6 +14,7 @@
 Source3:   filter-requires-mrtg.sh
 Source4:   mrtg.crond.in
 Source5:   mrtg-httpd.conf
+Source6:   filter-provides-mrtg.sh
 Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
 License:   GPL
@@ -26,6 +27,7 @@
 BuildRequires: gd-devel, libpng-devel
 
 %define __find_requires %{SOURCE3}
+%define __find_provides %{SOURCE6}
 
 %description
 The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
@@ -115,6 +117,10 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Thu Sep 20 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.15.1-3
+- Fix bad provides
+  Resolves: #247113
+
 * Thu Jun  8 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.15.1-2
 - Specfile update, because upstream decides to install mrtg-traffic-sum
   Resolves: #243112



From fedora-extras-commits at redhat.com  Thu Sep 20 09:16:20 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Thu, 20 Sep 2007 05:16:20 -0400
Subject: rpms/mpfr/devel mpfr-2.3.0-upstream.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 mpfr.spec, 1.4, 1.5 sources, 1.2,
	1.3 mpfr-2.2.1-upstream.patch, 1.1, NONE
Message-ID: <200709200916.l8K9GKSC003485@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mpfr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453

Modified Files:
	.cvsignore mpfr.spec sources 
Added Files:
	mpfr-2.3.0-upstream.patch 
Removed Files:
	mpfr-2.2.1-upstream.patch 
Log Message:
- update to 2.3.0
- fix license flag


mpfr-2.3.0-upstream.patch:

--- NEW FILE mpfr-2.3.0-upstream.patch ---
diff -Naurd mpfr-2.3.0-a/Makefile.am mpfr-2.3.0-b/Makefile.am
--- mpfr-2.3.0-a/Makefile.am	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/Makefile.am	2007-09-02 23:19:32.000000000 +0000
@@ -32,8 +32,13 @@
 
 MAKEINFOFLAGS = --enable-encoding
 
-get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+# Important note: If for some reason, srcdir is read-only at build time
+# (and you use objdir != srcdir), then you need to rebuild get_patches.c
+# (with "make get_patches.c") just after patching the MPFR source. This
+# should not be a problem in practice, in particular because "make dist"
+# automatically rebuilds get_patches.c before generating the archives.
+$(srcdir)/get_patches.c: PATCHES get_patches.sh
+	(cd $(srcdir) && ./get_patches.sh) > $@ || rm -f $@
 
 # Do not add get_patches.c to CLEANFILES so that this file doesn't
 # need to be (re)built as long as no patches are applied. Anyway the
diff -Naurd mpfr-2.3.0-a/Makefile.in mpfr-2.3.0-b/Makefile.in
--- mpfr-2.3.0-a/Makefile.in	2007-08-29 10:27:18.000000000 +0000
+++ mpfr-2.3.0-b/Makefile.in	2007-09-02 23:59:30.000000000 +0000
@@ -1665,8 +1665,13 @@
 	uninstall-info-am uninstall-libLTLIBRARIES
 
 
-get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+# Important note: If for some reason, srcdir is read-only at build time
+# (and you use objdir != srcdir), then you need to rebuild get_patches.c
+# (with "make get_patches.c") just after patching the MPFR source. This
+# should not be a problem in practice, in particular because "make dist"
+# automatically rebuilds get_patches.c before generating the archives.
+$(srcdir)/get_patches.c: PATCHES get_patches.sh
+	(cd $(srcdir) && ./get_patches.sh) > $@ || rm -f $@
 
 tune:
 	$(MAKE) $(AM_MAKEFLAGS) tuneup$(EXEEXT)
diff -Naurd mpfr-2.3.0-a/PATCHES mpfr-2.3.0-b/PATCHES
--- mpfr-2.3.0-a/PATCHES	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/PATCHES	2007-09-02 23:59:50.000000000 +0000
@@ -0,0 +1 @@
+get_patches
diff -Naurd mpfr-2.3.0-a/VERSION mpfr-2.3.0-b/VERSION
--- mpfr-2.3.0-a/VERSION	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/VERSION	2007-09-02 23:55:55.000000000 +0000
@@ -1 +1 @@
-2.3.0
+2.3.0-p1
diff -Naurd mpfr-2.3.0-a/mpfr.h mpfr-2.3.0-b/mpfr.h
--- mpfr-2.3.0-a/mpfr.h	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/mpfr.h	2007-09-02 23:55:55.000000000 +0000
@@ -27,7 +27,7 @@
 #define MPFR_VERSION_MAJOR 2
 #define MPFR_VERSION_MINOR 3
 #define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "2.3.0"
+#define MPFR_VERSION_STRING "2.3.0-p1"
 
 /* Macros dealing with MPFR VERSION */
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
diff -Naurd mpfr-2.3.0-a/tests/tversion.c mpfr-2.3.0-b/tests/tversion.c
--- mpfr-2.3.0-a/tests/tversion.c	2007-08-29 10:18:10.000000000 +0000
+++ mpfr-2.3.0-b/tests/tversion.c	2007-09-02 23:55:55.000000000 +0000
@@ -46,7 +46,7 @@
   version = mpfr_get_version ();
 
   /* This test is disabled when a suffix (e.g. -dev) has been defined. */
-#if 1
+#if 0
   sprintf (buffer, "%d.%d.%d", MPFR_VERSION_MAJOR, MPFR_VERSION_MINOR,
            MPFR_VERSION_PATCHLEVEL);
   if (strcmp (buffer, version) != 0)
diff -Naurd mpfr-2.3.0-a/version.c mpfr-2.3.0-b/version.c
--- mpfr-2.3.0-a/version.c	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/version.c	2007-09-02 23:55:55.000000000 +0000
@@ -25,5 +25,5 @@
 const char *
 mpfr_get_version (void)
 {
-  return "2.3.0";
+  return "2.3.0-p1";
 }
diff -Naurd mpfr-2.3.0-a/PATCHES mpfr-2.3.0-b/PATCHES
--- mpfr-2.3.0-a/PATCHES	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/PATCHES	2007-09-03 00:03:46.000000000 +0000
@@ -0,0 +1 @@
+mpfr_acosh
diff -Naurd mpfr-2.3.0-a/VERSION mpfr-2.3.0-b/VERSION
--- mpfr-2.3.0-a/VERSION	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/VERSION	2007-09-03 00:02:12.000000000 +0000
@@ -1 +1 @@
-2.3.0-p1
+2.3.0-p2
diff -Naurd mpfr-2.3.0-a/acosh.c mpfr-2.3.0-b/acosh.c
--- mpfr-2.3.0-a/acosh.c	2007-08-29 10:18:11.000000000 +0000
+++ mpfr-2.3.0-b/acosh.c	2007-08-31 17:20:08.000000000 +0000
@@ -73,7 +73,7 @@
     /* Declaration of the size variables */
     mp_prec_t Ny = MPFR_PREC(y);   /* Precision of output variable */
     mp_prec_t Nt;                  /* Precision of the intermediary variable */
-    mp_exp_t  err, exp_te, exp_ti; /* Precision of error */
+    mp_exp_t  err, exp_te, d;      /* Precision of error */
     MPFR_ZIV_DECL (loop);
 
     /* compute the precision of intermediary variable */
@@ -91,13 +91,35 @@
         mpfr_mul (t, x, x, GMP_RNDD);      /* x^2 */
         exp_te = MPFR_GET_EXP (t);
         mpfr_sub_ui (t, t, 1, GMP_RNDD);   /* x^2-1 */
-        exp_ti = MPFR_GET_EXP (t);
-        mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
-        mpfr_add (t, t, x, GMP_RNDN);      /* sqrt(x^2-1)+x */
-        mpfr_log (t, t, GMP_RNDN);         /* ln(sqrt(x^2-1)+x)*/
+        if (MPFR_UNLIKELY (MPFR_IS_ZERO (t)))
+          {
+            mpfr_t z;
+
+            /* This means that x is very close to 1: x = 1 + z with
+               z < 2^(-Nt). Instead of increasing the precision, let's
+               compute x^2-1 by (x+1)(x-1) with an accuracy of about
+               Nt bits. */
+            mpfr_init2 (z, Nt);
+            mpfr_add_ui (t, x, 1, GMP_RNDD);
+            mpfr_sub_ui (z, x, 1, GMP_RNDD);
+            mpfr_mul (t, t, z, GMP_RNDD);
+            d = 2;
+            mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
+            mpfr_add (t, t, z, GMP_RNDN);      /* sqrt(x^2-1)+z */
+            mpfr_clear (z);
+            mpfr_log1p (t, t, GMP_RNDN);       /* log1p(sqrt(x^2-1)+z) */
+          }
+        else
+          {
+            d = exp_te - MPFR_GET_EXP (t);
+            d = MAX (1, d);
+            mpfr_sqrt (t, t, GMP_RNDN);        /* sqrt(x^2-1) */
+            mpfr_add (t, t, x, GMP_RNDN);      /* sqrt(x^2-1)+x */
+            mpfr_log (t, t, GMP_RNDN);         /* ln(sqrt(x^2-1)+x) */
+          }
 
         /* error estimate -- see algorithms.tex */
-        err = 3 + MAX (1, exp_te - exp_ti) - MPFR_GET_EXP(t);
+        err = 3 + d - MPFR_GET_EXP (t);
         /* error is bounded by 1/2 + 2^err <= 2^(1+max(-1,err)) */
         err = 1 + MAX (-1, err);
         if (MPFR_LIKELY (MPFR_CAN_ROUND (t, Nt - err, Ny, rnd_mode)))
@@ -117,9 +139,3 @@
   MPFR_SAVE_EXPO_FREE (expo);
   return mpfr_check_range (y, inexact, rnd_mode);
 }
-
-
-
-
-
-
diff -Naurd mpfr-2.3.0-a/mpfr.h mpfr-2.3.0-b/mpfr.h
--- mpfr-2.3.0-a/mpfr.h	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/mpfr.h	2007-09-03 00:02:12.000000000 +0000
@@ -27,7 +27,7 @@
 #define MPFR_VERSION_MAJOR 2
 #define MPFR_VERSION_MINOR 3
 #define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "2.3.0-p1"
+#define MPFR_VERSION_STRING "2.3.0-p2"
 
 /* Macros dealing with MPFR VERSION */
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
diff -Naurd mpfr-2.3.0-a/tests/tacosh.c mpfr-2.3.0-b/tests/tacosh.c
--- mpfr-2.3.0-a/tests/tacosh.c	2007-08-29 10:18:10.000000000 +0000
+++ mpfr-2.3.0-b/tests/tacosh.c	2007-08-31 17:20:00.000000000 +0000
@@ -123,12 +123,40 @@
   mpfr_clear (y);
 }
 
+/* With MPFR 2.3.0, this yields an assertion failure in mpfr_acosh. */
+static void
+bug20070831 (void)
+{
+  mpfr_t x, y, z;
+  int inex;
+
+  mpfr_init2 (x, 256);
+  mpfr_init2 (y, 32);
+  mpfr_init2 (z, 32);
+  mpfr_set_ui (x, 1, GMP_RNDN);
+  mpfr_nextabove (x);
+  inex = mpfr_acosh (y, x, GMP_RNDZ);
+  mpfr_set_ui_2exp (z, 1, -127, GMP_RNDN);
+  mpfr_nextbelow (z);
+  MPFR_ASSERTN (inex < 0);
+  if (!mpfr_equal_p (y, z))
+    {
+      printf ("Error in bug20070831:\nexpected ");
+      mpfr_dump (z);
+      printf ("got      ");
+      mpfr_dump (y);
+      exit (1);
+    }
+  mpfr_clears (x, y, z, (void *) 0);
+}
+
 int
 main (int argc, char *argv[])
 {
   tests_start_mpfr ();
 
   special ();
+  bug20070831 ();
 
   test_generic (2, 100, 25);
 
diff -Naurd mpfr-2.3.0-a/version.c mpfr-2.3.0-b/version.c
--- mpfr-2.3.0-a/version.c	2007-09-02 23:55:55.000000000 +0000
+++ mpfr-2.3.0-b/version.c	2007-09-03 00:02:12.000000000 +0000
@@ -25,5 +25,5 @@
 const char *
 mpfr_get_version (void)
 {
-  return "2.3.0-p1";
+  return "2.3.0-p2";
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Aug 2007 13:08:47 -0000	1.2
+++ .cvsignore	20 Sep 2007 09:15:48 -0000	1.3
@@ -1 +1 @@
-mpfr-2.2.1.tar.bz2
+mpfr-2.3.0.tar.bz2


Index: mpfr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpfr.spec	28 Aug 2007 10:24:15 -0000	1.4
+++ mpfr.spec	20 Sep 2007 09:15:48 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
-Version: 2.2.1
-Release: 2%{dist}
+Version: 2.3.0
+Release: 1%{dist}
 URL: http://www.mpfr.org/
 Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2
-Patch0: mpfr-2.2.1-upstream.patch
+Patch0: mpfr-2.3.0-upstream.patch
 License: LGPLv2+ and GPLv2+ and GFDL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@
 
 %build
 
-%configure --disable-assert --enable-shared
+%configure --disable-assert
 make %{?_smp_mflags}
 
 %install
@@ -85,6 +85,10 @@
 %{_infodir}/mpfr.info*
 
 %changelog
+* Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 2.3.0-1
+- update to 2.3.0
+- fix license flag
+
 * Mon Aug 20 2007 Ivana Varekova <varekova at redhat.com> 2.2.1-2
 - spec file cleanup (#253440)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Aug 2007 13:08:47 -0000	1.2
+++ sources	20 Sep 2007 09:15:48 -0000	1.3
@@ -1 +1 @@
-40bf06f8081461d8db7d6f4ad5b9f6bd  mpfr-2.2.1.tar.bz2
+cf7c743e4be122e63eb6f372fc58b657  mpfr-2.3.0.tar.bz2


--- mpfr-2.2.1-upstream.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 09:19:39 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 20 Sep 2007 05:19:39 -0400
Subject: rpms/telnet/devel telnet-0.17-errno_test_sys_bsd.patch, 1.1,
	1.2 telnet.spec, 1.30, 1.31
Message-ID: <200709200919.l8K9JdtV003596@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553

Modified Files:
	telnet-0.17-errno_test_sys_bsd.patch telnet.spec 
Log Message:
- improved patch to #274991


telnet-0.17-errno_test_sys_bsd.patch:

Index: telnet-0.17-errno_test_sys_bsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet-0.17-errno_test_sys_bsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telnet-0.17-errno_test_sys_bsd.patch	22 Aug 2007 14:46:24 -0000	1.1
+++ telnet-0.17-errno_test_sys_bsd.patch	20 Sep 2007 09:19:07 -0000	1.2
@@ -1,11 +1,21 @@
---- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-08-01 11:37:27.000000000 +0200
-+++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-08-01 11:39:23.000000000 +0200
-@@ -407,6 +407,11 @@
+diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
+--- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-09-20 10:57:58.000000000 +0200
++++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-09-20 11:10:08.000000000 +0200
+@@ -375,6 +375,7 @@ TerminalNewMode(int f)
+     int onoff;
+     int old;
+     cc_t esc;
++    int err;
+ 
+     globalmode = f&~MODE_FORCE;
+     if (prevmode == f)
+@@ -407,6 +408,12 @@ TerminalNewMode(int f)
  	    tcsetattr(tin, TCSADRAIN, &tmp_tc);
  #endif	/* USE_TERMIO */
  	    old = ttyflush(SYNCHing|flushout);
 +            if (old < 0) {
-+              if (! ((errno == EINTR) || (errno == EAGAIN) || (errno == ENOSPC))) {
++	      err = errno;
++              if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
 +                break;
 +              }
 +            }


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- telnet.spec	22 Aug 2007 14:37:32 -0000	1.30
+++ telnet.spec	20 Sep 2007 09:19:07 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
+- improved patch to #274991
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 1:0.17-39
 - added patch to prevent a rare loop in the client
 



From fedora-extras-commits at redhat.com  Thu Sep 20 09:21:45 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Thu, 20 Sep 2007 05:21:45 -0400
Subject: rpms/mrtg/devel filter-provides-mrtg.sh, NONE, 1.1 mrtg.spec, 1.38,
	1.39
Message-ID: <200709200921.l8K9LjYO003698@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3679

Modified Files:
	mrtg.spec 
Added Files:
	filter-provides-mrtg.sh 
Log Message:
Fix bad provides


--- NEW FILE filter-provides-mrtg.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'


Index: mrtg.spec
===================================================================
RCS file: /cvs/extras/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mrtg.spec	23 Aug 2007 11:32:06 -0000	1.38
+++ mrtg.spec	20 Sep 2007 09:21:13 -0000	1.39
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.15.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg
@@ -14,6 +14,7 @@
 Source3:   filter-requires-mrtg.sh
 Source4:   mrtg.crond.in
 Source5:   mrtg-httpd.conf
+Source6:   filter-provides-mrtg.sh
 Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
 License:   GPL+
@@ -26,6 +27,7 @@
 BuildRequires: gd-devel, libpng-devel
 
 %define __find_requires %{SOURCE3}
+%define __find_provides %{SOURCE6}
 
 %description
 The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
@@ -115,6 +117,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Thu Sep 20 2007 Vitezslav Crhonek <vcrhonek at redhat.com> 2.15.1-5
+- Fix bad provides
+
 * Thu Aug 23 2007 Vitezslav Crhonek <vcrhonek at redhat.com> 2.15.1-4
 - fix license
 - rebuild



From fedora-extras-commits at redhat.com  Thu Sep 20 09:28:53 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Thu, 20 Sep 2007 05:28:53 -0400
Subject: fedora-security/audit fc7,1.112,1.113
Message-ID: <200709200928.l8K9Srtb004066@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4025

Modified Files:
	fc7 
Log Message:
Libsndfile got a CVE
add balsa



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc7	20 Sep 2007 08:53:35 -0000	1.112
+++ fc7	20 Sep 2007 09:28:51 -0000	1.113
@@ -8,9 +8,10 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
-GENERIC-MAP-NOMATCH VULNERABLE (libsndfile) #296221
+GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
+CVE-2007-4974 VULNERABLE (libsndfile) #296221
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8



From fedora-extras-commits at redhat.com  Thu Sep 20 09:55:08 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 05:55:08 -0400
Subject: rpms/pstoedit/devel pstoedit-3.45-quiet.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 pstoedit.spec, 1.6, 1.7 sources, 1.2,
	1.3 pstoedit-3.44-quiet.patch, 1.1, NONE
Message-ID: <200709200955.l8K9t8VV004602@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pstoedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4523

Modified Files:
	.cvsignore pstoedit.spec sources 
Added Files:
	pstoedit-3.45-quiet.patch 
Removed Files:
	pstoedit-3.44-quiet.patch 
Log Message:
- Update to new upstream 3.45, bugfix release
- Updated quiet patch for 3.45


pstoedit-3.45-quiet.patch:

--- NEW FILE pstoedit-3.45-quiet.patch ---
--- pstoedit-3.45/src/pstoedit.cpp.orig	2007-07-22 13:27:38.000000000 +0200
+++ pstoedit-3.45/src/pstoedit.cpp	2007-09-20 11:08:32.000000000 +0200
@@ -352,14 +352,16 @@
 	#endif
 #endif
 
+	const unsigned int remaining = options.parseoptions(errstream,argc,argv);
+
+	if (!options.quiet) {
 	errstream << "pstoedit: version " << version << " / DLL interface " <<
 		drvbaseVersion << " (build " << __DATE__ << " - " << buildtype << " - " << compversion << ")" 
 		" : Copyright (C) 1993 - 2007 Wolfgang Glunz\n";
+	}
 	// int arg = 1;
 	drvbase::SetVerbose( false );	// init
 
-
-	const unsigned int remaining = options.parseoptions(errstream,argc,argv);
 	//  handling of derived parameters
 	drvbase::SetVerbose(options.verbose);
 	closerObject.fromgui = (bool) options.fromgui;
--- pstoedit-3.45/src/pstoeditoptions.h.orig	2007-09-20 11:07:14.000000000 +0200
+++ pstoedit-3.45/src/pstoeditoptions.h	2007-09-20 11:06:49.000000000 +0200
@@ -156,6 +156,7 @@
 
 	Option < bool, BoolTrueExtractor > splitpages ;//= false;
 	Option < bool, BoolTrueExtractor > verbose ;//= false;
+	Option < bool, BoolTrueExtractor > quiet ;//= false;
 	Option < bool, BoolTrueExtractor > useBBfrominput; //= false;
 	Option < bool, BoolTrueExtractor > simulateSubPaths ;//= false;
 	Option < RSString, RSStringValueExtractor> unmappablecharstring ;//= 0;
@@ -333,6 +334,9 @@
 		"Switch on verbose mode. Some additional information is shown "
 		"during processing. ",
 		false),
+	quiet				(true, "-quiet",noArgument,b_t,"turns on quiet mode", 
+		"Switch on quiet mode. Version information is not shown. ",
+		false),
 	useBBfrominput		(true, "-usebbfrominput",noArgument,g_t,"extract BoundingBox from input file rather than determining it during processing", 
 		"If specified, pstoedit uses the BoundingBox as is (hopefully) found in the input file instead of one that is calculated by its own. ",
 		false),
@@ -573,6 +577,7 @@
 
 	ADD(splitpages);
 	ADD(verbose );
+	ADD(quiet);
 	ADD(useBBfrominput);
 	ADD(simulateSubPaths);
 	ADD(unmappablecharstring);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2006 15:31:09 -0000	1.2
+++ .cvsignore	20 Sep 2007 09:54:36 -0000	1.3
@@ -1 +1 @@
-pstoedit-3.44.tar.gz
+pstoedit-3.45.tar.gz


Index: pstoedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pstoedit.spec	20 Aug 2007 14:35:15 -0000	1.6
+++ pstoedit.spec	20 Sep 2007 09:54:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pstoedit
-Version:        3.44
-Release:        7%{?dist}
+Version:        3.45
+Release:        1%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -8,7 +8,7 @@
 URL:            http://www.pstoedit.net/
 Source0:        http://download.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz
 Patch0:		pstoedit-3.44-cxxflags.patch
-Patch1:		pstoedit-3.44-quiet.patch
+Patch1:		pstoedit-3.45-quiet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	ghostscript
 BuildRequires:	gd-devel
@@ -86,6 +86,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 3.45-1
+- Update to new upstream 3.45, bugfix release
+- Updated quiet patch for 3.45
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 3.44-7
 - License tag update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2006 15:31:09 -0000	1.2
+++ sources	20 Sep 2007 09:54:36 -0000	1.3
@@ -1 +1 @@
-13f24cb070da3f6af82ed84f4e53f049  pstoedit-3.44.tar.gz
+071efc64d9edf5d942b407348ac7451d  pstoedit-3.45.tar.gz


--- pstoedit-3.44-quiet.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 10:30:59 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Thu, 20 Sep 2007 06:30:59 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.5, 1.6 ocaml-libvirt.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200709201030.l8KAUxtv011293@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11258/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
- New upstream release 0.3.2.7.
- Ship the upstream ChangeLog file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2007 17:24:16 -0000	1.5
+++ .cvsignore	20 Sep 2007 10:30:27 -0000	1.6
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.6.tar.gz
+ocaml-libvirt-0.3.2.7.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-libvirt.spec	6 Sep 2007 17:27:10 -0000	1.5
+++ ocaml-libvirt.spec	20 Sep 2007 10:30:27 -0000	1.6
@@ -8,8 +8,8 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.6
-Release:        2%{?dist}
+Version:        0.3.2.7
+Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -155,7 +155,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB README
+%doc COPYING.LIB README ChangeLog
 %{_libdir}/ocaml/libvirt
 %if %opt
 %exclude %{_libdir}/ocaml/libvirt/*.a
@@ -169,7 +169,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING.LIB README TODO.libvirt html/*
+%doc COPYING.LIB README TODO.libvirt ChangeLog html/*
 %if %opt
 %{_libdir}/ocaml/libvirt/*.a
 %{_libdir}/ocaml/libvirt/*.cmxa
@@ -181,7 +181,7 @@
 %if %build_mlvirsh
 %files -n mlvirsh
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README ChangeLog
 %{_bindir}/mlvirsh
 %endif
 
@@ -189,7 +189,7 @@
 %if %build_mlvirtmanager
 %files -n mlvirtmanager
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README ChangeLog
 %{_bindir}/mlvirtmanager
 %endif
 
@@ -197,13 +197,17 @@
 %if %build_virt_top
 %files -n virt-top
 %defattr(-,root,root,-)
-%doc COPYING README TODO.virt-top
+%doc COPYING README TODO.virt-top ChangeLog
 %{_bindir}/virt-top
 %{_mandir}/man1/*.1.gz
 %endif
 
 
 %changelog
+* Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
+- New upstream release 0.3.2.7.
+- Ship the upstream ChangeLog file.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.6-2
 - Force dependency on ocaml >= 3.10.0-7 which has fixed requires/provides
   scripts.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2007 17:24:16 -0000	1.5
+++ sources	20 Sep 2007 10:30:27 -0000	1.6
@@ -1 +1 @@
-9e58cf2cb88d0db8e50915e147054e52  ocaml-libvirt-0.3.2.6.tar.gz
+0124c74d23767dc3b4dffefaae9995e9  ocaml-libvirt-0.3.2.7.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 10:39:48 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 06:39:48 -0400
Subject: rpms/libsndfile/devel libsndfile.spec,1.13,1.14
Message-ID: <200709201039.l8KAdm1V011540@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11514

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221



Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 10:39:15 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch.bz2
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 10:44:20 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 06:44:20 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.7, 1.8 libxml++.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200709201044.l8KAiKfP011709@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Update to new 2.20 stable branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2007 14:51:48 -0000	1.7
+++ .cvsignore	20 Sep 2007 10:43:45 -0000	1.8
@@ -1 +1 @@
-libxml++-2.18.2.tar.bz2
+libxml++-2.20.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libxml++.spec	16 Aug 2007 15:08:34 -0000	1.18
+++ libxml++.spec	20 Sep 2007 10:43:45 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libxml++
-Version:        2.18.2
-Release:        2%{?dist}
+Version:        2.20.0
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new 2.20 stable branch
+
 * Thu Aug 16 2007 Denis Leroy <denis at poolshark.org> - 2.18.2-2
 - Update to upstream 2.18.2 (mem leak fix)
 - Fixed License tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2007 14:51:48 -0000	1.7
+++ sources	20 Sep 2007 10:43:45 -0000	1.8
@@ -1 +1 @@
-11ea24cad96b4465816e9a4eb2b0e2d2  libxml++-2.18.2.tar.bz2
+4fe6ae1344e523ea4756733be71f9af3  libxml++-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 11:04:56 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 07:04:56 -0400
Subject: rpms/xulrunner/devel mozilla-firefox-head.ppc64.patch, NONE,
	1.1 xulrunner.spec, 1.16, 1.17
Message-ID: <200709201104.l8KB4uhG018298@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18272

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-firefox-head.ppc64.patch 
Log Message:
* Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
- removed conflicts with the current gecko-based apps
- added updated ppc64 patch



mozilla-firefox-head.ppc64.patch:

--- NEW FILE mozilla-firefox-head.ppc64.patch ---
Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v
retrieving revision 1.92
diff -u -B -u -p -r1.92 Makefile.in
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in	14 Dec 2006 19:13:43 -0000	1.92
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	29 Jan 2007 17:49:54 -0000
@@ -275,6 +275,15 @@ AS		:= $(CC) -c -x assembler-with-cpp
 endif
 
 #
+# Linux/PPC64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
+CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+AS             := $(CC) -c -x assembler-with-cpp
+endif
+
+#
 # NetBSD/PPC
 #
 ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp,v
retrieving revision 1.3
diff -u -B -u -p -r1.3 xptcinvoke_ppc_netbsd.cpp
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	18 Apr 2004 14:18:18 -0000	1.3
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	29 Jan 2007 17:49:55 -0000
@@ -44,7 +44,7 @@
 // indepenpent call to the platform ABI. To do that,
 // XPTC_InvokeByIndex() has to determine the method to call via vtable
 // access. The parameters for the method are read from the
-// nsXPTCVariant* and prepared for th native ABI.  For the Linux/PPC
+// nsXPTCVariant* and prepared for the native ABI.  For the Linux/PPC
 // ABI this means that the first 8 integral and floating point
 // parameters are passed in registers.
 
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,164 @@
+## ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ #
+ # The Initial Developer of the Original Code is
+ # dwmw2 at infradead.org (David Woodhouse).
+ # Portions created by the Initial Developer are Copyright (C) 2006
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+ #
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 2 or later (the "GPL"), or
+ # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ # in which case the provisions of the GPL or the LGPL are applicable instead
+ # of those above. If you wish to allow use of your version of this file only
+ # under the terms of either the GPL or the LGPL, and not to allow others to
+ # use your version of this file under the terms of the MPL, indicate your
+ # decision by deleting the provisions above and replace them with the notice
+ # and other provisions required by the GPL or the LGPL. If you do not delete
+ # the provisions above, a recipient may use your version of this file under
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+
+.set r0,0; .set r1,1; .set r2,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+
+#
+# NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+#                  PRUint32 paramCount, nsXPTCVariant* params)
+#
+
+        .section ".toc","aw"
+        .section ".text"
+        .align 2
+        .globl  NS_InvokeByIndex
+        .section ".opd","aw"
+        .align 3
+NS_InvokeByIndex:
+        .quad   .NS_InvokeByIndex,.TOC. at tocbase
+        .previous
+        .type   NS_InvokeByIndex, at function
+.NS_InvokeByIndex:
+        mflr    0
+        std     0,16(r1)
+
+        std     r29,-24(r1)
+        std     r30,-16(r1)
+        std     r31,-8(r1)
+
+        mr      r29,r3                  # Save 'that' in r29
+        mr      r30,r4                  # Save 'methodIndex' in r30
+        mr      r31,r1                  # Save old frame
+
+        # Allocate stack frame with space for params. Since at least the
+        # first 7 parameters (not including 'that') will be in registers,
+        # we don't actually need stack space for those. We must ensure
+        # that the stack remains 16-byte aligned.
+        #
+        #  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
+        #  |               |(params)........| regs | regs  | regs |
+        # (r1)...........(+112)....(+128)
+        #                               (-23*8).(-16*8).(-3*8)..(r31)
+
+        # +stack frame, -unused stack params, +regs storage, +1 for alignment
+        addi    r7,r5,((112/8)-7+7+13+3+1)
+        rldicr  r7,r7,3,59              # multiply by 8 and mask with ~15
+        neg     r7,r7
+        stdux   r1,r1,r7
+
+
+        # Call invoke_copy_to_stack(PRUint64* gpregs, double* fpregs,
+        #                           PRUint32 paramCount, nsXPTCVariant* s, 
+        #                           PRUint64* d))
+
+        # r5, r6 are passed through intact (paramCount, params)
+        # r7 (d) has to be r1+112 -- where parameters are passed on the stack.
+        # r3, r4 are above that, easier to address from r31 than from r1
+
+        subi    r3,r31,(23*8)           # r3 --> GPRS
+        subi    r4,r31,(16*8)           # r4 --> FPRS
+        addi    r7,r1,112               # r7 --> params
+        bl      invoke_copy_to_stack
+        nop
+
+        # Set up to invoke function
+
+        ld      r9,0(r29)               # vtable (r29 is 'that')
+        mr      r3,r29                  # self is first arg, obviously
+
+        sldi    r30,r30,3               # Find function descriptor 
+        add     r9,r9,r30
+        ld      r9,0(r9)
+
+        ld      r0,0(r9)                # Actual address from fd.
+        std     r2,40(r1)               # Save r2 (TOC pointer)
+
+        mtctr   0
+        ld      r11,16(r9)              # Environment pointer from fd.
+        ld      r2,8(r9)                # TOC pointer from fd.
+
+        # Load FP and GP registers as required
+        ld      r4, -(23*8)(r31) 
+        ld      r5, -(22*8)(r31) 
+        ld      r6, -(21*8)(r31) 
+        ld      r7, -(20*8)(r31) 
+        ld      r8, -(19*8)(r31) 
+        ld      r9, -(18*8)(r31) 
+        ld      r10, -(17*8)(r31) 
+
+        lfd     f1, -(16*8)(r31)
+        lfd     f2, -(15*8)(r31)
+        lfd     f3, -(14*8)(r31)
+        lfd     f4, -(13*8)(r31)
+        lfd     f5, -(12*8)(r31)
+        lfd     f6, -(11*8)(r31)
+        lfd     f7, -(10*8)(r31)
+        lfd     f8, -(9*8)(r31)
+        lfd     f9, -(8*8)(r31)
+        lfd     f10, -(7*8)(r31)
+        lfd     f11, -(6*8)(r31)
+        lfd     f12, -(5*8)(r31)
+        lfd     f13, -(4*8)(r31)
+
+        bctrl                           # Do it
+
+        ld      r2,40(r1)               # Load our own TOC pointer
+        ld      r1,0(r1)                # Revert stack frame
+        ld      0,16(r1)                # Reload lr
+        ld      29,-24(r1)              # Restore NVGPRS
+        ld      30,-16(r1)
+        ld      31,-8(r1)
+        mtlr    0
+        blr
+
+        .size   NS_InvokeByIndex,.-.NS_InvokeByIndex
+
+        # Magic indicating no need for an executable stack
+        .section .note.GNU-stack, "", @progbits ; .previous
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,131 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2 at infradead.org (David Woodhouse)
+ *   Franz.Sirl-kernel at lauterbach.com (Franz Sirl)
+ *   beard at netscape.com (Patrick Beard)
+ *   waterson at netscape.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Platform specific code to invoke XPCOM methods on native objects
+
+// The purpose of NS_InvokeByIndex() is to map a platform
+// independent call to the platform ABI. To do that,
+// NS_InvokeByIndex() has to determine the method to call via vtable
+// access. The parameters for the method are read from the
+// nsXPTCVariant* and prepared for the native ABI.
+
+// The PowerPC64 platform ABI can be found here:
+// http://www.freestandards.org/spec/ELF/ppc64/
+// and in particular:
+// http://www.freestandards.org/spec/ELF/ppc64/PPC-elf64abi-1.9.html#FUNC-CALL
+
+#include <stdio.h>
+#include "xptcprivate.h"
+
+// 8 integral parameters are passed in registers, not including 'that'
+#define GPR_COUNT     7
+
+// 8 floating point parameters are passed in registers, floats are
+// promoted to doubles when passed in registers
+#define FPR_COUNT     13
+
+extern "C" PRUint32
+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+{
+    return PRUint32(((paramCount * 2) + 3) & ~3);
+}
+
+extern "C" void
+invoke_copy_to_stack(PRUint64* gpregs,
+                     double* fpregs,
+                     PRUint32 paramCount,
+                     nsXPTCVariant* s, 
+                     PRUint64* d)
+{
+    PRUint64 tempu64;
+
+    for(uint32 i = 0; i < paramCount; i++, s++) {
+        if(s->IsPtrData())
+            tempu64 = (PRUint64) s->ptr;
+        else {
+            switch(s->type) {
+            case nsXPTType::T_FLOAT:                                  break;
+            case nsXPTType::T_DOUBLE:                                 break;
+            case nsXPTType::T_I8:     tempu64 = s->val.i8;            break;
+            case nsXPTType::T_I16:    tempu64 = s->val.i16;           break;
+            case nsXPTType::T_I32:    tempu64 = s->val.i32;           break;
+            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
+            case nsXPTType::T_U8:     tempu64 = s->val.u8;            break;
+            case nsXPTType::T_U16:    tempu64 = s->val.u16;           break;
+            case nsXPTType::T_U32:    tempu64 = s->val.u32;           break;
+            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
+            case nsXPTType::T_BOOL:   tempu64 = s->val.b;             break;
+            case nsXPTType::T_CHAR:   tempu64 = s->val.c;             break;
+            case nsXPTType::T_WCHAR:  tempu64 = s->val.wc;            break;
+            default:                  tempu64 = (PRUint64) s->val.p;  break;
+            }
+        }
+
+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                fpregs[i]    = s->val.d;
+            else
+                *(double *)d = s->val.d;
+        }
+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT) {
+                fpregs[i]   = s->val.f; // if passed in registers, floats are promoted to doubles
+            } else {
+                float *p = (float *)d;
+                p++;
+                *p = s->val.f;
+            }
+        }
+        else {
+            if (i < GPR_COUNT)
+                gpregs[i] = tempu64;
+            else
+                *d = tempu64;
+        }
+        if (i >= 7)
+            d++;
+    }
+}
+
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                 PRUint32 paramCount, nsXPTCVariant* params);
+
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,113 @@
+## ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ #
+ # The Initial Developer of the Original Code is
+ # dwmw2 at infradead.org (David Woodhouse).
+ # Portions created by the Initial Developer are Copyright (C) 2006
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+ #
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 2 or later (the "GPL"), or
+ # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ # in which case the provisions of the GPL or the LGPL are applicable instead
+ # of those above. If you wish to allow use of your version of this file only
+ # under the terms of either the GPL or the LGPL, and not to allow others to
+ # use your version of this file under the terms of the MPL, indicate your
+ # decision by deleting the provisions above and replace them with the notice
+ # and other provisions required by the GPL or the LGPL. If you do not delete
+ # the provisions above, a recipient may use your version of this file under
+ # the terms of any one of the MPL, the GPL or the LGPL.
+ #
+ # ***** END LICENSE BLOCK *****
+
+.set r0,0; .set r1,1; .set RTOC,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+        .section ".text"
+        .align 2
+        .globl SharedStub
+        .section ".opd","aw"
+        .align 3
+
+SharedStub:
+        .quad   .SharedStub,.TOC. at tocbase
+        .previous
+        .type   SharedStub, at function
+
+.SharedStub:
+        mflr    r0
+
+        std     r4, -56(r1)                     # Save all GPRS
+        std     r5, -48(r1)
+        std     r6, -40(r1)
+        std     r7, -32(r1)
+        std     r8, -24(r1)
+        std     r9, -16(r1)
+        std     r10, -8(r1)
+
+        stfd    f13, -64(r1)                    # ... and FPRS
+        stfd    f12, -72(r1)
+        stfd    f11, -80(r1)
+        stfd    f10, -88(r1)
+        stfd    f9, -96(r1)
+        stfd    f8, -104(r1)
+        stfd    f7, -112(r1)
+        stfd    f6, -120(r1)
+        stfd    f5, -128(r1)
+        stfd    f4, -136(r1)
+        stfd    f3, -144(r1)
+        stfd    f2, -152(r1)
+        stfd    f1, -160(r1)
+
+        subi    r6,r1,56                        # r6 --> gprData
+        subi    r7,r1,160                       # r7 --> fprData
+        addi    r5,r1,112                       # r5 --> extra stack args
+
+        std     r0, 16(r1)
+	
+        stdu    r1,-288(r1)
+                                                # r3 has the 'self' pointer
+                                                # already
+
+        mr      r4,r11                          # r4 is methodIndex selector,
+                                                # passed via r11 in the
+                                                # nsNSStubBase::StubXX() call
+
+        bl      PrepareAndDispatch
+        nop
+
+        ld      1,0(r1)                         # restore stack
+        ld      r0,16(r1)                       # restore LR
+        mtlr    r0
+        blr
+
+        .size   SharedStub,.-.SharedStub
+
+        # Magic indicating no need for an executable stack
+        .section .note.GNU-stack, "", @progbits ; .previous
--- /dev/null	2000-10-22 01:01:00.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp	2007-01-29 17:36:50.000000000 +0000
@@ -0,0 +1,245 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2 at infradead.org (David Woodhouse)
+ *   Franz.Sirl-kernel at lauterbach.com (Franz Sirl)
+ *   beard at netscape.com (Patrick Beard)
+ *   waterson at netscape.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Implement shared vtbl methods.
+
+#include "xptcprivate.h"
+#include "xptiprivate.h"
+
+// The Linux/PPC64 ABI passes the first 8 integral
+// parameters and the first 13 floating point parameters in registers
+// (r3-r10 and f1-f13), no stack space is allocated for these by the
+// caller.  The rest of the parameters are passed in the caller's stack
+// area. The stack pointer has to retain 16-byte alignment.
+
+// The PowerPC64 platform ABI can be found here:
+// http://www.freestandards.org/spec/ELF/ppc64/
+// and in particular:
+// http://www.freestandards.org/spec/ELF/ppc64/PPC-elf64abi-1.9.html#FUNC-CALL
+
+#define PARAM_BUFFER_COUNT      16
+#define GPR_COUNT                7
+#define FPR_COUNT               13
+
+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
+//
+// - 'args[]' contains the arguments passed on stack
+// - 'gprData[]' contains the arguments passed in integer registers
+// - 'fprData[]' contains the arguments passed in floating point registers
+// 
+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
+// and then the method gets called.
+#include <stdio.h>
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self,
+                   PRUint64 methodIndex,
+                   PRUint64* args,
+                   PRUint64 *gprData,
+                   double *fprData)
+{
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    const nsXPTMethodInfo* info;
+    PRUint32 paramCount;
+    PRUint32 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self,"no self");
+
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no method info");
+    if (! info)
+        return NS_ERROR_UNEXPECTED;
+
+    paramCount = info->GetParamCount();
+
+    // setup variant array pointer
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+
+    NS_ASSERTION(dispatchParams,"no place for params");
+    if (! dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    PRUint64* ap = args;
+    PRUint64 tempu64;
+
+    for(i = 0; i < paramCount; i++) {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+	
+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                dp->val.d = fprData[i];
+            else
+                dp->val.d = *(double*) ap;
+        } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT)
+                dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
+            else {
+                float *p = (float *)ap;
+                p++;
+                dp->val.f = *p;
+            }
+        } else { /* integer type or pointer */
+            if (i < GPR_COUNT)
+                tempu64 = gprData[i];
+            else
+                tempu64 = *ap;
+
+            if (param.IsOut() || !type.IsArithmetic())
+                dp->val.p = (void*) tempu64;
+            else if (type ==nsXPTType::T_I8)
+                dp->val.i8  = (PRInt8)   tempu64;
+            else if (type ==nsXPTType::T_I16)
+                dp->val.i16 = (PRInt16)  tempu64;
+            else if (type ==nsXPTType::T_I32)
+                dp->val.i32 = (PRInt32)  tempu64;
+            else if (type ==nsXPTType::T_I64)
+                dp->val.i64 = (PRInt64)  tempu64;
+            else if (type ==nsXPTType::T_U8)
+                dp->val.u8  = (PRUint8)  tempu64;
+            else if (type ==nsXPTType::T_U16)
+                dp->val.u16 = (PRUint16) tempu64;
+            else if (type ==nsXPTType::T_U32)
+                dp->val.u32 = (PRUint32) tempu64;
+            else if (type ==nsXPTType::T_U64)
+                dp->val.u64 = (PRUint64) tempu64;
+            else if (type ==nsXPTType::T_BOOL)
+                dp->val.b   = (PRBool)   tempu64;
+            else if (type ==nsXPTType::T_CHAR)
+                dp->val.c   = (char)     tempu64;
+            else if (type ==nsXPTType::T_WCHAR)
+                dp->val.wc  = (wchar_t)  tempu64;
+            else
+                NS_ASSERTION(0, "bad type");
+        }
+
+        if (i >= 7)
+            ap++;
+    }
+
+    result = self->mOuter->CallMethod((PRUint16) methodIndex, info,
+                                      dispatchParams);
+
+    if (dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+// Load r11 with the constant 'n' and branch to SharedStub().
+//
+// XXX Yes, it's ugly that we're relying on gcc's name-mangling here;
+// however, it's quick, dirty, and'll break when the ABI changes on
+// us, which is what we want ;-).
+
+#if __GXX_ABI_VERSION < 100
+#error Prehistoric GCC not supported here
+#else
+// gcc-3 version
+//
+// As G++3 ABI contains the length of the functionname in the mangled
+// name, it is difficult to get a generic assembler mechanism like
+// in the G++ 2.95 case.
+// Create names would be like:
+// _ZN14nsXPTCStubBase5Stub1Ev
+// _ZN14nsXPTCStubBase6Stub12Ev
+// _ZN14nsXPTCStubBase7Stub123Ev
+// _ZN14nsXPTCStubBase8Stub1234Ev
+// etc.
+// Use assembler directives to get the names right...
+
+# define STUB_ENTRY(n)                                                  \
+__asm__ (                                                               \
+        ".section \".toc\",\"aw\" \n\t"                                 \
+        ".section \".text\" \n\t"                                       \
+        ".align 2 \n\t"                                                 \
+        ".if "#n" < 10 \n\t"                                            \
+        ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase5Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase5Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".elseif "#n" < 100 \n\t"                                       \
+        ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase6Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase6Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".elseif "#n" < 1000 \n\t"                                      \
+        ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"                    \
+        ".section \".opd\",\"aw\" \n\t"                                 \
+        ".align 3 \n\t"                                                 \
+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                                  \
+        ".quad  ._ZN14nsXPTCStubBase7Stub"#n"Ev,.TOC. at tocbase \n\t"     \
+        ".previous \n\t"                                                \
+        ".type  _ZN14nsXPTCStubBase7Stub"#n"Ev, at function \n\n"          \
+"._ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                                 \
+                                                                        \
+        ".else  \n\t"                                                   \
+        ".err   \"stub number "#n" >= 1000 not yet supported\"\n"       \
+        ".endif \n\t"                                                   \
+                                                                        \
+        "li     11,"#n" \n\t"                                           \
+        "b      SharedStub \n"                                          \
+);
+#endif
+
+#define SENTINEL_ENTRY(n)                                               \
+nsresult nsXPTCStubBase::Sentinel##n()                                  \
+{                                                                       \
+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called");                  \
+    return NS_ERROR_NOT_IMPLEMENTED;                                    \
+}
+
+#include "xptcstubsdef.inc"


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xulrunner.spec	18 Sep 2007 17:22:52 -0000	1.16
+++ xulrunner.spec	20 Sep 2007 11:04:21 -0000	1.17
@@ -7,12 +7,12 @@
 
 %define official_branding 0
 
-ExcludeArch: ppc64 ppc
+#ExcludeArch: ppc64 ppc
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.2%{?dist}
+Release:        0.alpha7.3%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -45,7 +45,8 @@
 # font system fixes
 
 # Other
-Patch104:       firefox-1.5-ppc64.patch
+#Patch104:       firefox-1.5-ppc64.patch
+Patch105:       mozilla-firefox-head.ppc64.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -84,8 +85,8 @@
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 Requires:       system-bookmarks
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
-Obsoletes:      mozilla <= 37:1.7.13
-Obsoletes:      firefox < 2.1
+#Obsoletes:      mozilla <= 37:1.7.13
+#Obsoletes:      firefox < 2.1
 Provides:       webclient
 Provides:       gecko-libs = %{version}
 
@@ -104,8 +105,8 @@
 %package devel
 Summary: Development files for Gecko
 Group: Development/Libraries
-Obsoletes: mozilla-devel
-Obsoletes: firefox-devel < 2.1
+#Obsoletes: mozilla-devel
+#Obsoletes: firefox-devel < 2.1
 Requires: xulrunner = %{version}-%{release}
 Requires: nspr-devel >= %{nspr_version}
 Requires: nss-devel >= %{nss_version}
@@ -123,7 +124,8 @@
 %patch2   -R -p1 -b .camellia256
 %patch3   -p1
 
-%patch104 -p1 -b .ppc64
+#%patch104 -p1 -b .ppc64
+%patch105 -p0 -b .ppc64
 
 # For branding specific patches.
 
@@ -237,17 +239,17 @@
 %endif
 
 # GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
-%define gre_conf_file gre64.conf
-%else
-%define gre_conf_file gre.conf
-%endif
-
-%{__mkdir_p} $RPM_BUILD_ROOT/etc/gre.d/
-%{__cat} > $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} << EOF
-[%{version}]
-GRE_PATH=${MOZ_APP_DIR}
-EOF
+#%ifarch x86_64 ia64 ppc64 s390x
+#%define gre_conf_file gre64.conf
+#%else
+#%define gre_conf_file gre.conf
+#%endif
+
+#%{__mkdir_p} $RPM_BUILD_ROOT/etc/gre.d/
+#%{__cat} > $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} << EOF
+#[%{version}]
+#GRE_PATH=${MOZ_APP_DIR}
+#EOF
 
 GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
 %{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
@@ -287,8 +289,8 @@
 %exclude %{_bindir}/xulrunner-config
 %{_mandir}/man1/*
 %{_libdir}/mozilla
-%dir /etc/gre.d
-/etc/gre.d/%{gre_conf_file}
+#%dir /etc/gre.d
+#/etc/gre.d/%{gre_conf_file}
 
 %dir %{_libdir}/%{name}-*
 %{_libdir}/%{name}-*/LICENSE
@@ -338,6 +340,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
+- removed conflicts with the current gecko-based apps
+- added updated ppc64 patch
+
 * Tue Sep 18 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.2
 - build fixes
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:08:03 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Thu, 20 Sep 2007 07:08:03 -0400
Subject: rpms/bind/devel .cvsignore, 1.33, 1.34 bind-9.3.1rc1-sdb.patch, 1.5,
	1.6 bind-chroot-admin.in, 1.25, 1.26 bind.spec, 1.215,
	1.216 sources, 1.42, 1.43
Message-ID: <200709201108.l8KB832Z018603@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566

Modified Files:
	.cvsignore bind-9.3.1rc1-sdb.patch bind-chroot-admin.in 
	bind.spec sources 
Log Message:
- build with O2
- removed "autotools" patch
- bugfixing in bind-chroot-admin (#279901)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	28 Aug 2007 17:55:41 -0000	1.33
+++ .cvsignore	20 Sep 2007 11:07:30 -0000	1.34
@@ -2,4 +2,3 @@
 bind-chroot.tar.bz2
 config.tar
 libbind-man.tar.gz
-bind-9.5.0a6-2.autotools.tar.bz2

bind-9.3.1rc1-sdb.patch:

Index: bind-9.3.1rc1-sdb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.1rc1-sdb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bind-9.3.1rc1-sdb.patch	23 Jul 2007 17:55:02 -0000	1.5
+++ bind-9.3.1rc1-sdb.patch	20 Sep 2007 11:07:30 -0000	1.6
@@ -1,5 +1,5 @@
---- bind-9.4.0/configure.ac.sdb	2007-03-06 12:59:32.000000000 +0100
-+++ bind-9.4.0/configure.ac	2007-03-06 12:59:32.000000000 +0100
+--- bind-9.4.0/configure.in.sdb	2007-03-06 12:59:32.000000000 +0100
++++ bind-9.4.0/configure.in	2007-03-06 12:59:32.000000000 +0100
 @@ -2478,6 +2478,7 @@
  	bin/tests/system/tkey/Makefile
  	bin/tests/headerdep_test.sh


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bind-chroot-admin.in	20 Jul 2007 12:53:34 -0000	1.25
+++ bind-chroot-admin.in	20 Sep 2007 11:07:30 -0000	1.26
@@ -217,10 +217,10 @@
     changed=`/bin/mktemp /tmp/XXXXXX`;
     rm -f $changed
     if [ $ENABLED -eq 0 ] ; then # chroot is enabled
-	/usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}}  -maxdepth 0 -type f |
+	/usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}} /var/log/named.log  -maxdepth 0 -type f |
 	while read f;
         do
-	    replace_with_link ${BIND_CHROOT_PREFIX}/$f $f;
+	    replace_with_link ${BIND_CHROOT_PREFIX}$f $f;
 	    [ ! -e $changed ] && touch $changed;
 	done;
 	/usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave  -maxdepth 0 -type l 2>/dev/null |
@@ -228,7 +228,6 @@
 	do
 	    /bin/rm -f $f >/dev/null 2>&1;
 	done
-	ln -sf ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
 	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 |
@@ -254,9 +253,12 @@
     chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
     chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
     chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
+    chown -h named:named /var/log/named.log >/dev/null 2>&1;
+    chown -h named:named ${BIND_CHROOT_PREFIX}/var/log/named.log >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;
     chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
     chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
+    chmod 660 ${pfx}/var/log/named.log >/dev/null 2>&1;
     chown -h named:named /var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1;
     chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data,slaves,dynamic} >/dev/null 2>&1;
@@ -264,18 +266,11 @@
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
-	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
-	      /usr/bin/restorecon ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
-	   fi;		
+	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
-	   /sbin/restorecon /var/named{/,/*} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/{slaves,data,dynamic}{/,/*} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
-	   /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
-	   /sbin/restorecon /var/named/named.ca >/dev/null 2>&1;
+	   /sbin/restorecon -R /var/named   >/dev/null 2>&1;
 	fi;
 	/sbin/service named try-restart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- bind.spec	6 Sep 2007 11:36:13 -0000	1.215
+++ bind.spec	20 Sep 2007 11:07:30 -0000	1.216
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	12.%{RELEASEVER}%{?dist}
+Release: 	12.4.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +47,6 @@
 Source24:	libbind.pc
 Source25:	named.conf.sample
 Source28:	config.tar
-Source29:	bind-%{version}%{RELEASEVER}-2.autotools.tar.bz2
 Source30:	ldap2zone.c
 
 # Common patches
@@ -185,9 +184,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{RELEASEVER}
 
-tar -xvf %{SOURCE29}
-patch -p1 -b < patch
-
 # Common patches
 %patch -p1 -b .varrun
 %patch1 -p1 -b .key
@@ -254,7 +250,7 @@
 
 
 %build
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
@@ -312,6 +308,7 @@
 mkdir -p ${RPM_BUILD_ROOT}/var/named/dynamic
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
 mkdir -p ${RPM_BUILD_ROOT}/var/run/named
+mkdir -p ${RPM_BUILD_ROOT}/var/log
 #chroot
 mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix}
 tar --no-same-owner -jxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix}
@@ -384,7 +381,8 @@
 # /usr/lib/rpm/brp-compress
 #
 # Ghost config files:
-touch ${RPM_BUILD_ROOT}/etc/named.conf
+touch ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
+touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 # configuration files:
 tar -C ${RPM_BUILD_ROOT} -xf %{SOURCE28}
 for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
@@ -512,6 +510,7 @@
 %dir %{_localstatedir}/named/data
 %dir %{_localstatedir}/named/dynamic
 %dir %{_localstatedir}/run/named
+%ghost %{_localstatedir}/log/named.log
 %defattr(0754,root,root,0750)
 %config %{_sysconfdir}/rc.d/init.d/named
 %defattr(0640,root,named,0750)
@@ -646,6 +645,11 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.4.a6
+- build with O2
+- removed "autotools" patch
+- bugfixing in bind-chroot-admin (#279901)
+
 * Thu Sep 06 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.a6
 - bind-9.5-2119_revert.patch and bind-9.5-fix_h_errno.patch are
   obsoleted by upstream bind-9.5-_res_errno.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	23 Aug 2007 12:57:57 -0000	1.42
+++ sources	20 Sep 2007 11:07:30 -0000	1.43
@@ -2,4 +2,3 @@
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 bdea8168751a29e61525f11e8195ad48  config.tar
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
-ae1b6fde3133a8dad425e0ec9dc6d576  bind-9.5.0a6-2.autotools.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 11:24:28 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:24:28 -0400
Subject: rpms/libsndfile/devel libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.14, 1.15
Message-ID: <200709201124.l8KBOSeT019112@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsndfile.spec	20 Sep 2007 10:39:15 -0000	1.14
+++ libsndfile.spec	20 Sep 2007 11:23:55 -0000	1.15
@@ -6,7 +6,7 @@
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
-Patch0:         libsndfile-1.0.17+flac-1.1.3.patch.bz2
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
 Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:28:29 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:28:29 -0400
Subject: rpms/libsndfile/F-7 libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.13, 1.14
Message-ID: <200709201128.l8KBSTFR019293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19256

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/F-7/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 11:27:56 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:38:35 2007
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 20 Sep 2007 07:38:35 -0400
Subject: rpms/libsndfile/FC-6 libsndfile-1.0.17+flac-1.1.3.patch, NONE,
	1.1 libsndfile-1.0.17-flac-buffer-overflow.patch, NONE,
	1.1 libsndfile.spec, 1.13, 1.14
Message-ID: <200709201138.l8KBcZwG019515@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/libsndfile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19491

Modified Files:
	libsndfile.spec 
Added Files:
	libsndfile-1.0.17+flac-1.1.3.patch 
	libsndfile-1.0.17-flac-buffer-overflow.patch 
Log Message:
* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
- Adding FLAC support to libsndfile courtesy of gentoo, #237575
- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221


libsndfile-1.0.17+flac-1.1.3.patch:

--- NEW FILE libsndfile-1.0.17+flac-1.1.3.patch ---
diff -ru libsndfile-1.0.17/configure.ac libsndfile-1.0.17-b2/configure.ac
--- libsndfile-1.0.17/configure.ac	2006-08-31 02:39:37.000000000 -0700
+++ libsndfile-1.0.17-b2/configure.ac	2006-10-27 08:54:45.000000000 -0700
@@ -339,7 +339,8 @@
 		if test "x$HAVE_FLAC_1_1_1" = xyes ; then
 			AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1])
 			fi
-		FLAC_LIBS="-lFLAC"
+		# in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg
+		FLAC_LIBS="-lFLAC -logg"
 		fi
 	fi
 
diff -ru libsndfile-1.0.17/src/flac.c libsndfile-1.0.17-b2/src/flac.c
--- libsndfile-1.0.17/src/flac.c	2006-08-31 02:22:19.000000000 -0700
+++ libsndfile-1.0.17-b2/src/flac.c	2006-10-27 08:47:36.000000000 -0700
@@ -46,6 +46,13 @@
 #include	"sfendian.h"
 #include	"float_cast.h"
 
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -60,8 +67,14 @@
 } PFLAC_PCM ;
 
 typedef struct
-{	FLAC__SeekableStreamDecoder *fsd ;
+{
+#ifdef LEGACY_FLAC
+	FLAC__SeekableStreamDecoder *fsd ;
 	FLAC__SeekableStreamEncoder *fse ;
+#else
+	FLAC__StreamDecoder *fsd ;
+	FLAC__StreamEncoder *fse ;
+#endif
 	PFLAC_PCM pcmtype ;
 	void* ptr ;
 	unsigned pos, len, remain ;
@@ -108,6 +121,7 @@
 static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 
 /* Decoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes, void *client_data) ;
 static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
@@ -116,13 +130,29 @@
 static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
 static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
 static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#else
+static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void *client_data) ;
+static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
+static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ;
+static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ;
+static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
+#endif
 
 /* Encoder Callbacks */
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 #endif
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#else
+static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
+static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
+#endif
 
 static const int legal_sample_rates [] =
 {	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
@@ -283,51 +313,99 @@
 } /* flac_buffer_copy */
 
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderReadStatus
 sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__byte buffer [], unsigned *bytes, void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte buffer [], size_t *bytes, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*bytes = psf_fread (buffer, 1, *bytes, psf) ;
 	if (*bytes > 0 && psf->error == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
 
     return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
+#else
+		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+#endif
 } /* sf_flac_read_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderSeekStatus
 sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderSeekStatus
+sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_seek_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderTellStatus
 sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamDecoderTellStatus
+sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	*absolute_byte_offset = psf_ftell (psf) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
+#endif
 } /* sf_flac_tell_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamDecoderLengthStatus
 sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#else
+static FLAC__StreamDecoderLengthStatus
+sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__uint64 *stream_length, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if ((*stream_length = psf->filelength) == 0)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
 
 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
+#else
+		return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
+#endif
 } /* sf_flac_length_callback */
 
 static FLAC__bool
+#ifdef LEGACY_FLAC
 sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder), void *client_data)
+#else
+sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_ftell (psf) == psf->filelength)
@@ -337,7 +415,11 @@
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#else
+sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
@@ -353,7 +435,11 @@
 } /* sf_flac_write_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	switch (metadata->type)
@@ -387,7 +473,11 @@
 } /* sf_flac_meta_callback */
 
 static void
+#ifdef LEGACY_FLAC
 sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_log_printf (psf, "ERROR : %s\n", FLAC__StreamDecoderErrorStatusString [status]) ;
@@ -407,17 +497,29 @@
 	return ;
 } /* sf_flac_error_callback */
 
+#ifdef LEGACY_FLAC
 static FLAC__SeekableStreamEncoderSeekStatus
 sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#else
+static FLAC__StreamEncoderSeekStatus
+sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
 	if (psf->error)
+#ifdef LEGACY_FLAC
 		return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
     return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
+#else
+		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+#endif
 } /* sf_flac_enc_seek_callback */
 
+#ifdef LEGACY_FLAC
 #ifdef HAVE_FLAC_1_1_1
 static FLAC__SeekableStreamEncoderTellStatus
 sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
@@ -430,9 +532,25 @@
 	return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
 } /* sf_flac_enc_tell_callback */
 #endif
+#else
+static FLAC__StreamEncoderTellStatus
+sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+{	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+	*absolute_byte_offset = psf_ftell (psf) ;
+	if (psf->error)
+		return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
+
+	return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
+} /* sf_flac_enc_tell_callback */
+#endif
 
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#else
+sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder), const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned UNUSED (current_frame), void *client_data)
+#endif
 {	SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
 
 	if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
@@ -509,15 +627,27 @@
 		return 0 ;
 
 	if (psf->mode == SFM_WRITE)
-	{	FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_encoder_finish (pflac->fse) ;
 		FLAC__seekable_stream_encoder_delete (pflac->fse) ;
+#else
+		FLAC__stream_encoder_finish (pflac->fse) ;
+		FLAC__stream_encoder_delete (pflac->fse) ;
+#endif
 		if (pflac->encbuffer)
 			free (pflac->encbuffer) ;
 		} ;
 
 	if (psf->mode == SFM_READ)
-	{	FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+	{
+#ifdef LEGACY_FLAC
+		FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
 		FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
+#else
+		FLAC__stream_decoder_finish (pflac->fsd) ;
+		FLAC__stream_decoder_delete (pflac->fsd) ;
+#endif
 		} ;
 
 	for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
@@ -546,17 +676,6 @@
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
-	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
-		return SFE_FLAC_NEW_DECODER ;
-	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
-	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
-
-#ifdef HAVE_FLAC_1_1_1
-	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
-#endif
-	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
-	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
-	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 
 	switch (psf->sf.format & SF_FORMAT_SUBMASK)
 	{	case SF_FORMAT_PCM_S8 :
@@ -574,12 +693,36 @@
 			break ;
 		} ;
 
+#ifdef LEGACY_FLAC
+	if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__seekable_stream_encoder_set_write_callback (pflac->fse, sf_flac_enc_write_callback) ;
+	FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse, sf_flac_enc_seek_callback) ;
+
+#ifdef HAVE_FLAC_1_1_1
+	FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse, sf_flac_enc_tell_callback) ;
+#endif
+	FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+	FLAC__seekable_stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
 	FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
 
 	if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
+#else
+	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+	FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
+	FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
+	FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+	if ((bps = FLAC__stream_encoder_init_stream (pflac->fse, sf_flac_enc_write_callback, sf_flac_enc_seek_callback, sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+	{	psf_log_printf (psf, "Error : FLAC encoder init returned error : %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+#endif
 
 	if (psf->error == 0)
 		psf->dataoffset = psf_ftell (psf) ;
@@ -593,6 +736,7 @@
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+#ifdef LEGACY_FLAC
 	if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -610,9 +754,22 @@
 		return SFE_FLAC_INIT_DECODER ;
 
 	FLAC__seekable_stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#else
+	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
+		return SFE_FLAC_NEW_DECODER ;
+
+	if (FLAC__stream_decoder_init_stream (pflac->fsd, sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback, sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback, sf_flac_meta_callback, sf_flac_error_callback, psf) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+		return SFE_FLAC_INIT_DECODER ;
+
+	FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
+#endif
 	if (psf->error == 0)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#else
+		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+#endif
 		psf->dataoffset = position ;
 		} ;
 
@@ -676,10 +833,18 @@
 		flac_buffer_copy (psf) ;
 
 	while (pflac->pos < pflac->len)
-	{	if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
+	{
+#ifdef LEGACY_FLAC
+		if (FLAC__seekable_stream_decoder_process_single (pflac->fsd) == 0)
 			break ;
 		if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) != FLAC__SEEKABLE_STREAM_DECODER_OK)
 			break ;
+#else
+		if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
+			break ;
+		if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM)
+			break ;
+#endif
 		} ;
 
 	pflac->ptr = NULL ;
@@ -795,7 +960,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -837,7 +1006,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -879,7 +1052,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1011,7 +1188,11 @@
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#else
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+#endif
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1131,10 +1312,17 @@
 
 	if (psf->mode == SFM_READ)
 	{	FLAC__uint64 position ;
+#ifdef LEGACY_FLAC
 		if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
+#else
+		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
+		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
+			return offset ;
+			} ;
+#endif
 
 		return ((sf_count_t) -1) ;
 		} ;

libsndfile-1.0.17-flac-buffer-overflow.patch:

--- NEW FILE libsndfile-1.0.17-flac-buffer-overflow.patch ---
Index: libsndfile-1.0.17/src/flac.c
===================================================================
--- libsndfile-1.0.17.orig/src/flac.c
+++ libsndfile-1.0.17/src/flac.c
@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
 ** Private static functions.
 */
 
-#define ENC_BUFFER_SIZE 4096
+#define ENC_BUFFER_SIZE 8192
 
 typedef enum
 {	PFLAC_PCM_SHORT = 0,
@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
 	const FLAC__int32* const *buffer = pflac->wbuffer ;
 	unsigned i = 0, j, offset ;
 
+	/*
+	**	frame->header.blocksize is variable and we're using a constant blocksize
+	**	of FLAC__MAX_BLOCK_SIZE.
+	**	Check our assumptions here.
+	*/
+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
+		psf->error = SFE_INTERNAL ;
+		return 0 ;
+		} ;
+
 	if (pflac->ptr == NULL)
 	{	/*
 		**	Not sure why this code is here and not elsewhere.
@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
 		pflac->bufferbackup = SF_TRUE ;
 		for (i = 0 ; i < frame->header.channels ; i++)
 		{	if (pflac->rbuffer [i] == NULL)
-				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
 			} ;
 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;


Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/FC-6/libsndfile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsndfile.spec	8 Sep 2006 17:35:50 -0000	1.13
+++ libsndfile.spec	20 Sep 2007 11:38:03 -0000	1.14
@@ -1,11 +1,13 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
+Patch1:         libsndfile-1.0.17-flac-buffer-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -31,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -78,6 +82,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.17-2
+- Adding FLAC support to libsndfile courtesy of gentoo, #237575
+- Fixing CVE-2007-4974. Thanks to the gentoo people for the patch, #296221
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.17-1
 - Updated to 1.0.17
 



From fedora-extras-commits at redhat.com  Thu Sep 20 11:52:52 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:52:52 -0400
Subject: rpms/php-extras/devel dead.package,NONE,1.1
Message-ID: <200709201152.l8KBqq3O019729@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19722

Added Files:
	dead.package 
Log Message:



--- NEW FILE dead.package ---
Merged with the main PHP package



From fedora-extras-commits at redhat.com  Thu Sep 20 11:53:25 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:53:25 -0400
Subject: rpms/php-extras/F-7 dead.package,NONE,1.1
Message-ID: <200709201153.l8KBrPWW019757@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19750

Added Files:
	dead.package 
Log Message:



--- NEW FILE dead.package ---
Merged with the main PHP package



From fedora-extras-commits at redhat.com  Thu Sep 20 11:55:32 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:55:32 -0400
Subject: rpms/php-extras/devel .cvsignore, 1.6, NONE Makefile, 1.1,
	NONE php-extras.spec, 1.10, NONE sources, 1.6, NONE
Message-ID: <200709201155.l8KBtWZ7019856@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849

Removed Files:
	.cvsignore Makefile php-extras.spec sources 
Log Message:



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- php-extras.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 11:56:35 2007
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 20 Sep 2007 07:56:35 -0400
Subject: rpms/php-extras/F-7 .cvsignore, 1.6, NONE Makefile, 1.1, NONE branch,
	1.1, NONE php-extras.spec, 1.10, NONE sources, 1.6, NONE
Message-ID: <200709201156.l8KBuZFK019931@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/php-extras/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924

Removed Files:
	.cvsignore Makefile branch php-extras.spec sources 
Log Message:



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- php-extras.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 12:27:44 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 08:27:44 -0400
Subject: rpms/udev/devel
	0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch,
	NONE, 1.1 0002-rules-fix-two-trivial-typos.patch, NONE,
	1.1 0003-rules-random-and-urandom-are-0666.patch, NONE,
	1.1 0004-rules-add-REMOVE_CMD-rule.patch, NONE,
	1.1 0005-track-move-events-to-rename-database-and-failed-fi.patch,
	NONE, 1.1 0006-rules-Gentoo-update.patch, NONE,
	1.1 0007-rules-add-i2o-driver-rule.patch, NONE,
	1.1 0008-man-recreate-man-pages.patch, NONE,
	1.1 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch,
	NONE, 1.1 0010-rules-Gentoo-update.patch, NONE,
	1.1 0011-add-name-substitution.patch, NONE,
	1.1 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch,
	NONE, 1.1 0013-print-warning-for-invalid-TEST-operations.patch, NONE, 
	1.1 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch, NONE,
	1.1 0015-rules-remove-broken-nvram-group-assignment-without.patch,
	NONE, 1.1 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch, 
	NONE, 1.1 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch,
	NONE, 1.1 0018-correct-includes-in-udev_selinux.c.patch, NONE,
	1.1 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch, NONE,
	1.1 0020-path_id-fix-for-stacked-class-devices.patch, NONE,
	1.1 0021-check-line-length-after-comment-check-and-whitespace.patch, 
	NONE, 1.1 0022-only-install-.rules.patch, NONE,
	1.1 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch, 
	NONE, 1.1 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch,
	NONE, 1.1 0025-rules-add-memstick-module-loading.patch, NONE,
	1.1 0026-Removed-extra-space-from-udevinfo-symlink-output.patch,
	NONE, 1.1 Makefile.git, NONE, 1.1 start_udev, 1.64,
	1.65 udev.spec, 1.219, 1.220 udev-115-git-20070907.patch, 1.1,
	NONE udev-115-looplast.patch, 1.1,
	NONE udev-115-rulesinstall.patch, 1.1, NONE
Message-ID: <200709201227.l8KCRixL026590@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26457

Modified Files:
	start_udev udev.spec 
Added Files:
	0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch 
	0002-rules-fix-two-trivial-typos.patch 
	0003-rules-random-and-urandom-are-0666.patch 
	0004-rules-add-REMOVE_CMD-rule.patch 
	0005-track-move-events-to-rename-database-and-failed-fi.patch 
	0006-rules-Gentoo-update.patch 
	0007-rules-add-i2o-driver-rule.patch 
	0008-man-recreate-man-pages.patch 
	0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch 
	0010-rules-Gentoo-update.patch 
	0011-add-name-substitution.patch 
	0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch 
	0013-print-warning-for-invalid-TEST-operations.patch 
	0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch 
	0015-rules-remove-broken-nvram-group-assignment-without.patch 
	0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch 
	0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch 
	0018-correct-includes-in-udev_selinux.c.patch 
	0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch 
	0020-path_id-fix-for-stacked-class-devices.patch 
	0021-check-line-length-after-comment-check-and-whitespace.patch 
	0022-only-install-.rules.patch 
	0023-ignore-device-node-names-while-restoring-symlinks-fr.patch 
	0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch 
	0025-rules-add-memstick-module-loading.patch 
	0026-Removed-extra-space-from-udevinfo-symlink-output.patch 
	Makefile.git 
Removed Files:
	udev-115-git-20070907.patch udev-115-looplast.patch 
	udev-115-rulesinstall.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
- some upstream fixes from git
- removed last_rule for loop rules
- added "udevinfo udevtrace" kernel command line options for better debugging


0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch:

--- NEW FILE 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch ---
>From 1f7a36f2c0953c60a8d7acadc281285a0b84fb46 Mon Sep 17 00:00:00 2001
From: Michael Morony <michael.morony at gmail.com>
Date: Fri, 24 Aug 2007 08:14:21 +0200
Subject: [PATCH] set buffer size if strlcpy/strlcat indicate truncation

---
 udev_rules.c  |    4 +++-
 udev_sysfs.c  |    2 ++
 udevinfo.c    |    2 ++
 udevmonitor.c |    4 ----
 udevtrigger.c |    2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 0dcbf15..35db958 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -475,10 +475,12 @@ static int pass_env_to_socket(const char *sockname, const char *devpath, const c
 
 	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
 	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
 		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
 		bufpos++;
 	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
 
 	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
 	if (count < 0)
diff --git a/udev_sysfs.c b/udev_sysfs.c
index 34ae9ac..d5b04c3 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -355,6 +355,8 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
 
 	dbg("open '%s'/'%s'", devpath, attr_name);
 	sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+	if(sysfs_len >= sizeof(path_full))
+		sysfs_len = sizeof(path_full) - 1;
 	path = &path_full[sysfs_len];
 	strlcat(path_full, devpath, sizeof(path_full));
 	strlcat(path_full, "/", sizeof(path_full));
diff --git a/udevinfo.c b/udevinfo.c
index d0b1c44..be9aa76 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -79,6 +79,8 @@ static void print_all_attributes(const char *devpath, const char *key)
 			if (attr_value == NULL)
 				continue;
 			len = strlcpy(value, attr_value, sizeof(value));
+			if(len >= sizeof(value))
+				len = sizeof(value) - 1;
 			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
 			/* remove trailing newlines */
diff --git a/udevmonitor.c b/udevmonitor.c
index a9cc061..644a955 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -43,7 +43,6 @@ static int init_udev_monitor_socket(void)
 {
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
-	const int feature_on = 1;
 	int retval;
 
 	memset(&saddr, 0x00, sizeof(saddr));
@@ -67,9 +66,6 @@ static int init_udev_monitor_socket(void)
 		return -1;
 	}
 
-	/* enable receiving of the sender credentials */
-	setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
 	return 0;
 }
 
diff --git a/udevtrigger.c b/udevtrigger.c
index cf8f209..309c54a 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -435,6 +435,8 @@ static void scan_failed(void)
 				continue;
 
 			start = strlcpy(device, sysfs_path, sizeof(device));
+			if(start >= sizeof(device))
+				start = sizeof(device) - 1;
 			strlcat(device, dent->d_name, sizeof(device));
 			path_decode(&device[start]);
 			device_list_insert(device);
-- 
1.5.2.4


0002-rules-fix-two-trivial-typos.patch:

--- NEW FILE 0002-rules-fix-two-trivial-typos.patch ---
>From d98c6dfebc2186b841c92eeb002c03938f28cdc6 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 24 Aug 2007 20:34:44 +0200
Subject: [PATCH] rules: fix two trivial typos

Thanks to: Alexander E. Patrakov <patrakov at ums.usu.ru>
---
 etc/udev/rules.d/50-udev-default.rules |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index bff2fe5..b3c0cfc 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -58,7 +58,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{
 KERNEL=="parport[0-9]*",	GROUP="lp"
 SUBSYSTEM=="printer",		KERNEL=="lp*", GROUP="lp"
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*",		GROUP="lp" SYMLINK+="par%n"
+KERNEL=="lp[0-9]*",		GROUP="lp", SYMLINK+="par%n"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
 
 # block, tapes, block-releated
@@ -71,7 +71,7 @@ KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
 KERNEL=="sch[0-9]*",		GROUP="disk"
 KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk""
+KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
 KERNEL=="pg[0-9]*",		GROUP="disk"
 KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
-- 
1.5.2.4


0003-rules-random-and-urandom-are-0666.patch:

--- NEW FILE 0003-rules-random-and-urandom-are-0666.patch ---
>From b6e4b08dc14444790c1560108e93a67e57e1148b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sat, 25 Aug 2007 14:07:02 +0200
Subject: [PATCH] rules: random and urandom are 0666

Thanks to: Alexander E. Patrakov <patrakov at ums.usu.ru>.
---
 etc/udev/rules.d/50-udev-default.rules |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index b3c0cfc..f869f51 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -17,18 +17,16 @@ KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # mem
-KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
 KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
-KERNEL=="urandom",		MODE="0644"
-KERNEL=="full",			MODE="0666"
 
 # input
 KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts[0-9]*|uinput",	NAME="input/%k", MODE="0600"
 KERNEL=="js[0-9]*",		NAME="input/%k", MODE="0644", SYMLINK+="%k"
 
 # video4linux
-- 
1.5.2.4


0004-rules-add-REMOVE_CMD-rule.patch:

--- NEW FILE 0004-rules-add-REMOVE_CMD-rule.patch ---
>From 3f781cab37dbee76340c65602555a524ffea96f9 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 00:48:49 +0200
Subject: [PATCH] rules: add REMOVE_CMD rule

---
 etc/udev/rules.d/95-udev-late.rules |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/95-udev-late.rules b/etc/udev/rules.d/95-udev-late.rules
index 1755d08..4a015b9 100644
--- a/etc/udev/rules.d/95-udev-late.rules
+++ b/etc/udev/rules.d/95-udev-late.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"
 
-- 
1.5.2.4


0005-track-move-events-to-rename-database-and-failed-fi.patch:

--- NEW FILE 0005-track-move-events-to-rename-database-and-failed-fi.patch ---
>From a2f2270eef499f6f60075a149011e3e3851ab5ef Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 05:22:35 +0200
Subject: [PATCH] track "move" events to rename database and failed files

---
 udev.h        |    2 ++
 udev_db.c     |   10 ++++++++++
 udev_device.c |    4 ++++
 udevd.c       |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 udevd.h       |    1 +
 5 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/udev.h b/udev.h
index f13eb83..33b39aa 100644
--- a/udev.h
+++ b/udev.h
@@ -69,6 +69,7 @@ struct udevice {
 	struct sysfs_device dev_local;
 	struct sysfs_device *dev_parent;	/* current parent device used for matching */
 	char action[NAME_SIZE];
+	char *devpath_old;
 
 	/* node */
 	char name[PATH_SIZE];
@@ -131,6 +132,7 @@ extern int udev_node_remove(struct udevice *udev);
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
+extern int udev_db_rename(const char *devpath_old, const char *devpath);
 extern int udev_db_get_device(struct udevice *udev, const char *devpath);
 extern int udev_db_get_devices_by_name(const char *name, struct list_head *name_list);
 extern int udev_db_get_all_entries(struct list_head *name_list);
diff --git a/udev_db.c b/udev_db.c
index abc1e5a..29aa031 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -117,6 +117,16 @@ out:
 	return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+	char filename[PATH_SIZE];
+	char filename_old[PATH_SIZE];
+
+	devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+	devpath_to_db_path(devpath, filename, sizeof(filename));
+	return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
diff --git a/udev_device.c b/udev_device.c
index 23ba313..2b7ffe0 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -168,6 +168,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
diff --git a/udevd.c b/udevd.c
index 8f56de6..3c46617 100644
--- a/udevd.c
+++ b/udevd.c
@@ -130,6 +130,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
 	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+	udev->devpath_old = msg->devpath_old;
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -156,14 +157,14 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	struct udevd_uevent_msg *loop_msg;
 	int fd;
 
-	/* add location of queue files */
+	/* location of queue file */
 	strlcpy(filename, udev_root, sizeof(filename));
 	strlcat(filename, "/", sizeof(filename));
 	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
 	strlcat(filename, msg->devpath, sizeof(filename));
 	path_encode(&filename[start], sizeof(filename) - start);
 
-	/* add location of failed files */
+	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
@@ -174,6 +175,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	case EVENT_QUEUED:
 		unlink(filename_failed);
 		delete_path(filename_failed);
+
 		create_path(filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
@@ -181,10 +183,25 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		return;
 	case EVENT_FINISHED:
 	case EVENT_FAILED:
-		unlink(filename_failed);
-		delete_path(filename_failed);
+		if (msg->devpath_old != NULL) {
+			/* "move" event - rename failed file to current name, do not delete failed */
+			char filename_failed_old[PATH_SIZE];
+
+			strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+			strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+			start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+			strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+			path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+			if (rename(filename_failed_old, filename_failed) == 0)
+				info("renamed devpath, moved failed state of '%s' to %s'",
+				     msg->devpath_old, msg->devpath);
+		} else {
+			unlink(filename_failed);
+			delete_path(filename_failed);
+		}
 
-		/* don't remove, if events for the same path are still pending */
+		/* skip if events for the same path are still pending */
 		list_for_each_entry(loop_msg, &running_list, node)
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
@@ -193,7 +210,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
 
-		/* move failed events to the failed directory */
+		/* move failed event to the failed directory */
 		if (state == EVENT_FAILED) {
 			create_path(filename_failed);
 			rename(filename, filename_failed);
@@ -201,7 +218,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			unlink(filename);
 		}
 
-		/* clean up the queue directory */
+		/* clean up possibly empty queue directory */
 		delete_path(filename);
 
 		return;
@@ -212,7 +229,7 @@ static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
 	list_del(&msg->node);
 
-	/* mark as failed, if add event returns non-zero */
+	/* mark as failed, if "add" event returns non-zero */
 	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
 		export_event_state(msg, EVENT_FAILED);
 	else
@@ -280,6 +297,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
+	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
@@ -469,11 +487,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 		if (loop_msg->seqnum >= msg->seqnum)
 			break;
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still pending %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -481,7 +504,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still pending %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 
@@ -492,11 +515,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			return 1;
 		}
 
+		/* check our old name */
+		if (msg->devpath_old != NULL)
+			if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+				return 2;
+
 		/* check identical, parent, or child device event */
 		if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
 			dbg("%llu, device event still running %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
 		/* check physical device event (special case of parent) */
@@ -504,7 +532,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
 				dbg("%llu, physical device event still running %llu (%s)",
 				    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-				return 3;
+				return 4;
 			}
 	}
 	return 0;
@@ -588,6 +616,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
+		else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+			msg->devpath_old = &key[12];
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
 			msg->physdevpath = &key[12];
 		else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
diff --git a/udevd.h b/udevd.h
index 4ca6d1d..9be34cb 100644
--- a/udevd.h
+++ b/udevd.h
@@ -66,6 +66,7 @@ struct udevd_uevent_msg {
 	char *driver;
 	dev_t devt;
 	unsigned long long seqnum;
+	char *devpath_old;
 	char *physdevpath;
 	unsigned int timeout;
 	char *envp[UEVENT_NUM_ENVP+1];
-- 
1.5.2.4


0006-rules-Gentoo-update.patch:

--- NEW FILE 0006-rules-Gentoo-update.patch ---
>From 2bf0a506bc13abc5632079232bee6f8784934633 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun, 26 Aug 2007 13:54:32 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/05-udev-early.rules |    7 ++--
 etc/udev/gentoo/50-udev.rules       |    8 +----
 etc/udev/gentoo/80-drivers.rules    |   44 ++++++++++++++++++++++++++++
 etc/udev/gentoo/80-hotplug.rules    |   54 -----------------------------------
 etc/udev/gentoo/90-network.rules    |    8 +++++
 etc/udev/gentoo/95-udev-late.rules  |   18 -----------
 6 files changed, 57 insertions(+), 82 deletions(-)
 create mode 100644 etc/udev/gentoo/80-drivers.rules
 delete mode 100644 etc/udev/gentoo/80-hotplug.rules
 create mode 100644 etc/udev/gentoo/90-network.rules
 delete mode 100644 etc/udev/gentoo/95-udev-late.rules

diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
index ee349dc..fc15e2b 100644
--- a/etc/udev/gentoo/05-udev-early.rules
+++ b/etc/udev/gentoo/05-udev-early.rules
@@ -1,9 +1,8 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
-SUBSYSTEM=="module",	OPTIONS="ignore_device"
+# do not edit this file, it will be overwritten on update
 
 # sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index dd32971..9e06029 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -1,13 +1,9 @@
+# do not edit this file, it will be overwritten on update
+
 # /etc/udev/rules/50-udev.rules:  device naming rules for udev
 #
 # Gentoo specific rules
 #
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
 
 # Net devices can have arbitrary names, even
 # ones set by the user. Not try to match normal
diff --git a/etc/udev/gentoo/80-drivers.rules b/etc/udev/gentoo/80-drivers.rules
new file mode 100644
index 0000000..df6c880
--- /dev/null
+++ b/etc/udev/gentoo/80-drivers.rules
@@ -0,0 +1,44 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="drivers_end"
+
+# check if the device has already been claimed by a driver
+ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="drivers_end"
+
+# this driver is broken and should not be loaded automatically
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="drivers_end"
+
+# Autoload modules that lack aliases but have them defined in autoload modules
+ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
+
+# /etc/modprobe.conf.
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
+# needed aliases are defined in /etc/modprobe.d/pnp-aliases
+
+
+SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
+SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
+SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
+SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
+SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
+
+# Load driver for scsi-device
+SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+LABEL="hotplug_scsi_end"
+
+LABEL="drivers_end"
+
diff --git a/etc/udev/gentoo/80-hotplug.rules b/etc/udev/gentoo/80-hotplug.rules
deleted file mode 100644
index 0637dbc..0000000
--- a/etc/udev/gentoo/80-hotplug.rules
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/udev/rules/80-hotplug.rules:  module loading rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Module autoloading
-ACTION!="add", GOTO="hotplug_load_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="hotplug_load_end"
-
diff --git a/etc/udev/gentoo/90-network.rules b/etc/udev/gentoo/90-network.rules
new file mode 100644
index 0000000..50903af
--- /dev/null
+++ b/etc/udev/gentoo/90-network.rules
@@ -0,0 +1,8 @@
+# do not edit this file, it will be overwritten on update
+
+# /etc/udev/rules/90-network.rules:  triggering network init-scripts
+
+# Activate our network if we can
+SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
+SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
+
diff --git a/etc/udev/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
deleted file mode 100644
index 40ada28..0000000
--- a/etc/udev/gentoo/95-udev-late.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/udev/rules/95-udev-late.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-#
-# Try not to modify this file, if you wish to change things, create a new rule
-# file that can be run before this one.
-#
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
-# event to be catched by udevmonitor
-RUN+="socket:/org/kernel/udev/monitor"
-
-- 
1.5.2.4


0007-rules-add-i2o-driver-rule.patch:

--- NEW FILE 0007-rules-add-i2o-driver-rule.patch ---
>From 79ef8431c952349d9f31c899adb579c3ff83a80b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 28 Aug 2007 04:16:54 +0200
Subject: [PATCH] rules: add i2o driver rule

---
 etc/udev/rules.d/80-drivers.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index e71f135..3388266 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -7,6 +7,7 @@ SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 
-- 
1.5.2.4


0008-man-recreate-man-pages.patch:

--- NEW FILE 0008-man-recreate-man-pages.patch ---
>From dbb2c414d77362a9279f4fc50458054f71ffb7e2 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue, 28 Aug 2007 04:24:08 +0200
Subject: [PATCH] man: recreate man pages

---
 extras/volume_id/vol_id.8 |   28 ++++----
 udev.7                    |  182 ++++++++++++++++++++++-----------------------
 udevd.8                   |   38 +++++-----
 udevinfo.8                |   28 ++++----
 udevmonitor.8             |   16 ++--
 udevsettle.8              |   12 ++--
 udevstart.8               |    8 +-
 udevtest.8                |    8 +-
 udevtrigger.8             |   28 ++++----
 9 files changed, 172 insertions(+), 176 deletions(-)

diff --git a/extras/volume_id/vol_id.8 b/extras/volume_id/vol_id.8
index 7594253..daa583b 100644
--- a/extras/volume_id/vol_id.8
+++ b/extras/volume_id/vol_id.8
@@ -1,6 +1,6 @@
 .\"     Title: vol_id
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: vol_id
 .\"    Source: volume_id
@@ -11,69 +11,69 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-vol_id \- probe filesystem type and read label and uuid
+vol_id - probe filesystem type and read label and uuid
 .SH "SYNOPSIS"
 .HP 7
 \fBvol_id\fR [\fB\-\-export\fR] [\fB\-\-type\fR] [\fB\-\-label\fR] [\fB\-\-label\-raw\fR] [\fB\-\-uuid\fR] [\fB\-\-skip\-raid\fR] [\fB\-\-probe\-all\fR] [\fB\-\-help\fR] [\fIdevice\fR]
 .SH "DESCRIPTION"
 .PP
 \fBvol_id\fR
-is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem.
+is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume\. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem\.
 .SH "OPTIONS"
 .PP
 \fB\-\-export\fR
 .RS 4
-Print all values in key/value format to import them into the environment.
+Print all values in key/value format to import them into the environment\.
 .RE
 .PP
 \fB\-\-type\fR
 .RS 4
-Print the filesystem type.
+Print the filesystem type\.
 .RE
 .PP
 \fB\-\-label\fR
 .RS 4
-Print the safe version of volume label suitable for use as filename.
+Print the safe version of volume label suitable for use as filename\.
 .RE
 .PP
 \fB\-\-label\-raw\fR
 .RS 4
-Print the raw volume label.
+Print the raw volume label\.
 .RE
 .PP
 \fB\-\-uuid\fR
 .RS 4
-Print the uuid of a volume.
+Print the uuid of a volume\.
 .RE
 .PP
 \fB\-\-skip\-raid\fR
 .RS 4
-Skip detection of raid metadata.
+Skip detection of raid metadata\.
 .RE
 .PP
 \fB\-\-probe\-all\fR
 .RS 4
-Probe for all types and print all matches.
+Probe for all types and print all matches\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Set the syslog priority.
+Set the syslog priority\.
 .RE
 .SH "EXIT STATUS"
 .PP
 \fBvol_id\fR
-will only return successful if the value asked for is not empty. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored.
+will only return successful if the value asked for is not empty\. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored\.
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udev.7 b/udev.7
index 821a476..5f0ebb9 100644
--- a/udev.7
+++ b/udev.7
@@ -1,6 +1,6 @@
 .\"     Title: udev
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udev
 .\"    Source: udev
@@ -11,213 +11,213 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udev \- dynamic device management
+udev - dynamic device management
 .SH "DESCRIPTION"
 .PP
-udev provides a dynamic device directory containing only the files for actually present devices. It creates or removes device node files in the
+udev provides a dynamic device directory containing only the files for actually present devices\. It creates or removes device node files in the
 \fI/dev\fR
-directory, or it renames network interfaces.
+directory, or it renames network interfaces\.
 .PP
 Usually udev runs as
 \fBudevd\fR(8)
-and receives uevents directly from the kernel if a device is added or removed from the system.
+and receives uevents directly from the kernel if a device is added or removed from the system\.
 .PP
-If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling.
+If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device\. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling\.
 .SH "CONFIGURATION"
 .PP
 All udev configuration files are placed in
-\fI/etc/udev/*\fR. Every file consists of a set of lines of text. All empty lines or lines beginning with '#' will be ignored.
+\fI/etc/udev/*\fR\. Every file consists of a set of lines of text\. All empty lines or lines beginning with \'#\' will be ignored\.
 .SS "Configuration file"
 .PP
 udev expects its main configuration file at
-\fI/etc/udev/udev.conf\fR. It consists of a set of variables allowing the user to override default udev values. The following variables can be set:
+\fI/etc/udev/udev\.conf\fR\. It consists of a set of variables allowing the user to override default udev values\. The following variables can be set:
 .PP
 \fBudev_root\fR
 .RS 4
-Specifies where to place the device nodes in the filesystem. The default value is
-\fI/dev\fR.
+Specifies where to place the device nodes in the filesystem\. The default value is
+\fI/dev\fR\.
 .RE
 .PP
 \fBudev_rules\fR
 .RS 4
 The name of the udev rules file or directory to look for files with the suffix
-\fI.rules\fR. Multiple rule files are read in lexical order. The default value is
-\fI/etc/udev/rules.d\fR.
+\fI\.rules\fR\. Multiple rule files are read in lexical order\. The default value is
+\fI/etc/udev/rules\.d\fR\.
 .RE
 .PP
 \fBudev_log\fR
 .RS 4
-The logging priority. Valid values are the numerical syslog priorities or their textual representations:
+The logging priority\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .SS "Rules files"
 .PP
 The udev rules are read from the files located in the
-\fI/etc/udev/rules.d\fR
-directory or at the location specified value in the configuration file. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned.
+\fI/etc/udev/rules\.d\fR
+directory or at the location specified value in the configuration file\. Every line in the rules file contains at least one key value pair\. There are two kind of keys, match and assignment keys\. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned\.
 .PP
-A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling. If no matching rule is found, the default device node name is used.
+A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling\. If no matching rule is found, the default device node name is used\.
 .PP
-A rule may consist of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are:
+A rule may consist of a list of one or more key value pairs separated by a comma\. Each key has a distinct operation, depending on the used operator\. Valid operators are:
 .PP
 \fB==\fR
 .RS 4
-Compare for equality.
+Compare for equality\.
 .RE
 .PP
 \fB!=\fR
 .RS 4
-Compare for non\-equality.
+Compare for non\-equality\.
 .RE
 .PP
 \fB=\fR
 .RS 4
-Assign a value to a key. Keys that represent a list, are reset and only this single value is assigned.
+Assign a value to a key\. Keys that represent a list, are reset and only this single value is assigned\.
 .RE
 .PP
 \fB+=\fR
 .RS 4
-Add the value to a key that holds a list of entries.
+Add the value to a key that holds a list of entries\.
 .RE
 .PP
 \fB:=\fR
 .RS 4
-Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules.
+Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules\.
 .RE
 .PP
-The following key names can be used to match against device properties. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device.
+The following key names can be used to match against device properties\. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event\. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device\.
 .PP
 \fBACTION\fR
 .RS 4
-Match the name of the event action.
+Match the name of the event action\.
 .RE
 .PP
 \fBDEVPATH\fR
 .RS 4
-Match the devpath of the event device.
+Match the devpath of the event device\.
 .RE
 .PP
 \fBKERNEL\fR
 .RS 4
-Match the name of the event device.
+Match the name of the event device\.
 .RE
 .PP
 \fBSUBSYSTEM\fR
 .RS 4
-Match the subsystem of the event device.
+Match the subsystem of the event device\.
 .RE
 .PP
 \fBDRIVER\fR
 .RS 4
-Match the driver name of the event device. Only set for devices which are bound to a driver at the time the event is generated.
+Match the driver name of the event device\. Only set for devices which are bound to a driver at the time the event is generated\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Match sysfs attribute values of the event device. Up to five
+Match sysfs attribute values of the event device\. Up to five
 \fBATTR\fR
-keys can be specified per rule. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself. Depending on the type of operator, this key is also used to set the value of a sysfs attribute.
+keys can be specified per rule\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\. Depending on the type of operator, this key is also used to set the value of a sysfs attribute\.
 .RE
 .PP
 \fBKERNELS\fR
 .RS 4
-Search the devpath upwards for a matching device name.
+Search the devpath upwards for a matching device name\.
 .RE
 .PP
 \fBSUBSYSTEMS\fR
 .RS 4
-Search the devpath upwards for a matching device subsystem name.
+Search the devpath upwards for a matching device subsystem name\.
 .RE
 .PP
 \fBDRIVERS\fR
 .RS 4
-Search the devpath upwards for a matching device driver name.
+Search the devpath upwards for a matching device driver name\.
 .RE
 .PP
 \fBATTRS{\fR\fB\fIfilename\fR\fR\fB}\fR
 .RS 4
-Search the devpath upwards for a device with matching sysfs attribute values. Up to five
+Search the devpath upwards for a device with matching sysfs attribute values\. Up to five
 \fBATTRS\fR
-keys can be specified per rule, but all of them must match on the same device. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself.
+keys can be specified per rule, but all of them must match on the same device\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Match against the value of an environment variable. Up to five
+Match against the value of an environment variable\. Up to five
 \fBENV\fR
-keys can be specified per rule. Depending on the type of operator, this key is also used to export a variable to the environment.
+keys can be specified per rule\. Depending on the type of operator, this key is also used to export a variable to the environment\.
 .RE
 .PP
 \fBTEST{\fR\fB\fIoctal mode mask\fR\fR\fB}\fR
 .RS 4
-Test the existence of a file. An octal mode mask can be specified if needed.
+Test the existence of a file\. An octal mode mask can be specified if needed\.
 .RE
 .PP
 \fBPROGRAM\fR
 .RS 4
-Execute external program. The key is true, if the program returns with exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout, is available in the RESULT key.
+Execute external program\. The key is true, if the program returns with exit code zero\. The whole event environment is available to the executed program\. The program\'s output printed to stdout, is available in the RESULT key\.
 .RE
 .PP
 \fBRESULT\fR
 .RS 4
-Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call.
+Match the returned string of the last PROGRAM call\. This key can be used in the same or in any later rule after a PROGRAM call\.
 .RE
 .PP
-Most of the fields support a shell style pattern matching. The following pattern characters are supported:
+Most of the fields support a shell style pattern matching\. The following pattern characters are supported:
 .PP
 \fB*\fR
 .RS 4
-Matches zero, or any number of characters.
+Matches zero, or any number of characters\.
 .RE
 .PP
 \fB?\fR
 .RS 4
-Matches any single character.
+Matches any single character\.
 .RE
 .PP
 \fB[]\fR
 .RS 4
-Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched.
+Matches any single character specified within the brackets\. For example, the pattern string \'tty[SR]\' would match either \'ttyS\' or \'ttyR\'\. Ranges are also supported within this match with the \'\-\' character\. For example, to match on the range of all digits, the pattern [0\-9] would be used\. If the first character following the \'[\' is a \'!\', any characters not enclosed are matched\.
 .RE
 .PP
 The following keys can get values assigned:
 .PP
 \fBNAME\fR
 .RS 4
-The name of the node to be created, or the name the network interface should be renamed to. Only one rule can set the node name, all later rules with a NAME key will be ignored.
+The name of the node to be created, or the name the network interface should be renamed to\. Only one rule can set the node name, all later rules with a NAME key will be ignored\.
 .RE
 .PP
 \fBSYMLINK\fR
 .RS 4
-The name of a symlink targeting the node. Every matching rule can add this value to the list of symlinks to be created along with the device node. Multiple symlinks may be specified by separating the names by the space character.
+The name of a symlink targeting the node\. Every matching rule can add this value to the list of symlinks to be created along with the device node\. Multiple symlinks may be specified by separating the names by the space character\.
 .RE
 .PP
 \fBOWNER, GROUP, MODE\fR
 .RS 4
-The permissions for the device node. Every specified value overwrites the compiled\-in default value.
+The permissions for the device node\. Every specified value overwrites the compiled\-in default value\.
 .RE
 .PP
 \fBATTR{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value that should be written to a sysfs attribute of the event device. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute.
+The value that should be written to a sysfs attribute of the event device\. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute\.
 .RE
 .PP
 \fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-Export a variable to the environment. Depending on the type of operator, this key is also to match against an environment variable.
+Export a variable to the environment\. Depending on the type of operator, this key is also to match against an environment variable\.
 .RE
 .PP
 \fBRUN\fR
 .RS 4
-Add a program to the list of programs to be executed for a specific device. This can only be used for very short running tasks. Running an event process for a long period of time may block all further events for this or a dependent device. Long running tasks need to be immediately detached from the event process itself.
+Add a program to the list of programs to be executed for a specific device\. This can only be used for very short running tasks\. Running an event process for a long period of time may block all further events for this or a dependent device\. Long running tasks need to be immediately detached from the event process itself\.
 .RE
 .PP
 \fBLABEL\fR
 .RS 4
-Named label where a GOTO can jump to.
+Named label where a GOTO can jump to\.
 .RE
 .PP
 \fBGOTO\fR
@@ -229,72 +229,68 @@ Jumps to the next LABEL with a matching name
 .RS 4
 Import a set of variables into the event environment, depending on
 \fItype\fR:
-.RS 4
 .PP
 \fBprogram\fR
 .RS 4
-Execute an external program specified as the assigned value and import its output, which must be in environment key format.
+Execute an external program specified as the assigned value and import its output, which must be in environment key format\.
 .RE
 .PP
 \fBfile\fR
 .RS 4
-Import a text file specified as the assigned value, which must be in environment key format.
+Import a text file specified as the assigned value, which must be in environment key format\.
 .RE
 .PP
 \fBparent\fR
 .RS 4
-Import the stored keys from the parent device by reading the database entry of the parent device. The value assigned to
+Import the stored keys from the parent device by reading the database entry of the parent device\. The value assigned to
 \fBIMPORT{parent}\fR
-is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons).
-.RE
+is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons)\.
 .RE
-.IP "" 4
+.sp
 If no option is given, udev will choose between
 \fBprogram\fR
 and
 \fBfile\fR
-based on the executable bit of the file permissions.
+based on the executable bit of the file permissions\.
 .RE
 .PP
 \fBWAIT_FOR_SYSFS\fR
 .RS 4
-Wait for the specified sysfs file of the device to be created. Can be used to fight against kernel sysfs timing issues.
+Wait for the specified sysfs file of the device to be created\. Can be used to fight against kernel sysfs timing issues\.
 .RE
 .PP
 \fBOPTIONS\fR
 .RS 4
 Rule and device options:
-.RS 4
 .PP
 \fBlast_rule\fR
 .RS 4
-Stops further rules application. No later rules will have any effect.
+Stops further rules application\. No later rules will have any effect\.
 .RE
 .PP
 \fBignore_device\fR
 .RS 4
-Ignore this event completely.
+Ignore this event completely\.
 .RE
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device. This may be useful as a workaround for broken device drivers.
+Ignore any later remove event for this device\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Specify the priority of the created symlinks. Devices with higher priorities overwrite existing symlinks of other devices.
+Specify the priority of the created symlinks\. Devices with higher priorities overwrite existing symlinks of other devices\.
 .RE
 .PP
 \fBall_partitions\fR
 .RS 4
-Create the device nodes for all available partitions of a block device. This may be useful for removable media devices where media changes are not detected.
+Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
 .RE
 .PP
 \fBstring_escape=\fR\fB\fInone|replace\fR\fR
 .RS 4
-Usually control and other possibly unsafe characters are replaced in strings used for device naming. The mode of replacement can be specified with this option.
-.RE
+Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
 .RE
 .RE
 .PP
@@ -306,23 +302,23 @@ The
 \fBGROUP\fR
 and
 \fBRUN\fR
-fields support simple printf\-like string substitutions. The
+fields support simple printf\-like string substitutions\. The
 \fBRUN\fR
-format chars gets applied after all rules have been processed, right before the program is executed. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are:
+format chars gets applied after all rules have been processed, right before the program is executed\. It allows the use of the complete environment set by earlier matching rules\. For all other fields, substitutions are applied while the individual rule is being processed\. The available substitutions are:
 .PP
 \fB$kernel\fR, \fB%k\fR
 .RS 4
-The kernel name for this device.
+The kernel name for this device\.
 .RE
 .PP
 \fB$number\fR, \fB%n\fR
 .RS 4
-The kernel number for this device. For example, 'sda3' has kernel number of '3'
+The kernel number for this device\. For example, \'sda3\' has kernel number of \'3\'
 .RE
 .PP
 \fB$devpath\fR, \fB%p\fR
 .RS 4
-The devpath of the device.
+The devpath of the device\.
 .RE
 .PP
 \fB$id\fR, \fB%b\fR
@@ -332,7 +328,7 @@ The name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$driver\fR, \fB%d\fR
@@ -342,75 +338,75 @@ The driver name of the device matched while searching the devpath upwards for
 \fBKERNELS\fR,
 \fBDRIVERS\fR
 and
-\fBATTRS\fR.
+\fBATTRS\fR\.
 .RE
 .PP
 \fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 .RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute. If the attribute is a symlink, the last element of the symlink target is returned as the value.
+The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
 .RE
 .PP
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
 .RS 4
-The value of an environment variable.
+The value of an environment variable\.
 .RE
 .PP
 \fB$major\fR, \fB%M\fR
 .RS 4
-The kernel major number for the device.
+The kernel major number for the device\.
 .RE
 .PP
 \fB$minor\fR, \fB%m\fR
 .RS 4
-The kernel minor number for the device.
+The kernel minor number for the device\.
 .RE
 .PP
 \fB$result\fR, \fB%c\fR
 .RS 4
-The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
-\fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted:
+The string returned by the external program requested with PROGRAM\. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
+\fB%c{N}\fR\. If the number is followed by the \'+\' char this part plus all remaining parts of the result string are substituted:
 \fB%c{N+}\fR
 .RE
 .PP
 \fB$parent\fR, \fB%P\fR
 .RS 4
-The node name of the parent device.
+The node name of the parent device\.
 .RE
 .PP
 \fB$root\fR, \fB%r\fR
 .RS 4
-The udev_root value.
+The udev_root value\.
 .RE
 .PP
 \fB$sys\fR, \fB%S\fR
 .RS 4
-The sysfs mount point.
+The sysfs mount point\.
 .RE
 .PP
 \fB$tempnode\fR, \fB%N\fR
 .RS 4
-The name of a created temporary device node to provide access to the device from a external program before the real node is created.
+The name of a created temporary device node to provide access to the device from a external program before the real node is created\.
 .RE
 .PP
 \fB%%\fR
 .RS 4
-The '%' character itself.
+The \'%\' character itself\.
 .RE
 .PP
 \fB$$\fR
 .RS 4
-The '$' character itself.
+The \'$\' character itself\.
 .RE
 .PP
-The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute
+The count of characters to be substituted may be limited by specifying the format length value\. For example, \'%3s{file}\' will only insert the first three characters of the sysfs attribute
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>
+<greg at kroah\.com>
 and Kay Sievers
-<kay.sievers at vrfy.org>. With much help from Dan Stekloff
-<dsteklof at us.ibm.com>
-and many others.
+<kay\.sievers at vrfy\.org>\. With much help from Dan Stekloff
+<dsteklof at us\.ibm\.com>
+and many others\.
 .SH "SEE ALSO"
 .PP
 \fBudevd\fR(8),
diff --git a/udevd.8 b/udevd.8
index 25996d1..46edde4 100644
--- a/udevd.8
+++ b/udevd.8
@@ -1,6 +1,6 @@
 .\"     Title: udevd
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevd, udevcontrol
 .\"    Source: udev
@@ -11,7 +11,7 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevd \- event managing daemon
+udevd - event managing daemon
 .SH "SYNOPSIS"
 .HP 6
 \fBudevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\-trace\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
@@ -19,87 +19,87 @@ udevd \- event managing daemon
 \fBudevcontrol \fR\fB\fIcommand\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevd listens to kernel uevents and passes the incoming events to udev. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling.
+udevd listens to kernel uevents and passes the incoming events to udev\. It ensures the right event order and takes care, that events for child devices are delayed until the parent has finished the device handling\.
 .SH "OPTIONS"
 .PP
 \fB\-\-daemon\fR
 .RS 4
-Detach and run in the background.
+Detach and run in the background\.
 .RE
 .PP
 \fB\-\-debug\-trace\fR
 .RS 4
-Run all events completely serialized. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel.
+Run all events completely serialized\. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel\.
 .RE
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print log messages to stdout.
+Print log messages to stdout\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version number.
+Print version number\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .PP
 \fBlog_priority=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set the internal log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
+Set the internal log level of udevd\. Valid values are the numerical syslog priorities or their textual representations:
 \fBerr\fR,
 \fBinfo\fR
 and
-\fBdebug\fR.
+\fBdebug\fR\.
 .RE
 .PP
 \fBstop_exec_queue\fR
 .RS 4
-Signal udevd to stop executing new events. Incoming events will be queued.
+Signal udevd to stop executing new events\. Incoming events will be queued\.
 .RE
 .PP
 \fBstart_exec_queue\fR
 .RS 4
-Signal udevd to enable the execution of events.
+Signal udevd to enable the execution of events\.
 .RE
 .PP
 \fBreload_rules\fR
 .RS 4
-Signal udevd to reload the rules from the config.
+Signal udevd to reload the rules from the config\.
 .RE
 .PP
 \fBenv \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR
 .RS 4
-Set global variable.
+Set global variable\.
 .RE
 .PP
 \fBmax_childs\fR
 .RS 4
-Set the maximum number of events, udevd will handle at the same time.
+Set the maximum number of events, udevd will handle at the same time\.
 .RE
 .PP
 \fBmax_childs_running\fR
 .RS 4
-Set the maximum number of events, which are allowed to run at the same time.
+Set the maximum number of events, which are allowed to run at the same time\.
 .RE
 .PP
 \fBhelp\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevinfo.8 b/udevinfo.8
index 337f206..6115f29 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -1,6 +1,6 @@
 .\"     Title: udevinfo
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevinfo
 .\"    Source: udev
@@ -11,32 +11,32 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevinfo \- query udev device information
+udevinfo - query udev device information
 .SH "SYNOPSIS"
 .HP 9
 \fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevinfo queries the udev database for device information stored in the udev database. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device.
+udevinfo queries the udev database for device information stored in the udev database\. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\.
 .SH "OPTIONS"
 .PP
 \fB\-\-query=\fR\fB\fItype\fR\fR
 .RS 4
-Query the database for specified type of device data. It needs the
+Query the database for specified type of device data\. It needs the
 \fB\-\-path\fR
 or
 \fB\-\-name\fR
-to identify the specified device. Valid queries are:
+to identify the specified device\. Valid queries are:
 \fBname\fR,
 \fBsymlink\fR,
 \fBpath\fR,
 \fBenv\fR,
-\fBall\fR.
+\fBall\fR\.
 .RE
 .PP
 \fB\-\-path=\fR\fB\fIdevpath\fR\fR
 .RS 4
-The devpath of the device to query.
+The devpath of the device to query\.
 .RE
 .PP
 \fB\-\-name=\fR\fB\fInode\fR\fR
@@ -47,36 +47,36 @@ The name of the device node or a symlink to query
 \fB\-\-root\fR
 .RS 4
 The udev root directory:
-\fI/dev\fR. If used in conjunction with a
+\fI/dev\fR\. If used in conjunction with a
 \fBname\fR
 or
 \fBsymlink\fR
-query, the query returns the absolute path including the root directory.
+query, the query returns the absolute path including the root directory\.
 .RE
 .PP
 \fB\-\-attribute\-walk\fR
 .RS 4
-Print all sysfs properties of the specified device that can be used in udev rules to match the specified device. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules.
+Print all sysfs properties of the specified device that can be used in udev rules to match the specified device\. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules\.
 .RE
 .PP
 \fB\-\-export\-db\fR
 .RS 4
-Export the content of the udev database.
+Export the content of the udev database\.
 .RE
 .PP
 \fB\-\-version\fR
 .RS 4
-Print version.
+Print version\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print help text.
+Print help text\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevmonitor.8 b/udevmonitor.8
index 0adb998..5b624a7 100644
--- a/udevmonitor.8
+++ b/udevmonitor.8
@@ -1,6 +1,6 @@
 .\"     Title: udevmonitor
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevmonitor
 .\"    Source: udev
@@ -11,38 +11,38 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevmonitor \- print the kernel and udev event sequence to the console
+udevmonitor - print the kernel and udev event sequence to the console
 .SH "SYNOPSIS"
 .HP 12
 \fBudevmonitor\fR [\fB\-\-environment\fR] [\fB\-\-kernel\fR] [\fB\-\-udev\fR] [\fB\-\-help\fR]
 .SH "DESCRIPTION"
 .PP
-udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event.
+udevmonitor listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\.
 .SH "OPTIONS"
 .PP
 \fB\-\-environment\fR
 .RS 4
-Print the complete environment for all events. Can be used to compare the kernel supplied and the udev added environment values.
+Print the complete environment for all events\. Can be used to compare the kernel supplied and the udev added environment values\.
 .RE
 .PP
 \fB\-\-kernel\fR
 .RS 4
-Print the kernel uevents.
+Print the kernel uevents\.
 .RE
 .PP
 \fB\-\-udev\fR
 .RS 4
-Print the udev event after the rule processing.
+Print the udev event after the rule processing\.
 .RE
 .PP
 \fB\-\-help\fR
 .RS 4
-Print usage.
+Print usage\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevsettle.8 b/udevsettle.8
index 818a7ff..39054d9 100644
--- a/udevsettle.8
+++ b/udevsettle.8
@@ -1,6 +1,6 @@
 .\"     Title: udevsettle
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevsettle
 .\"    Source: udev
@@ -11,29 +11,29 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevsettle \- wait until queued kernel/udev events are handled
+udevsettle - wait until queued kernel/udev events are handled
 .SH "SYNOPSIS"
 .HP 11
 \fBudevsettle\fR [\fB\-\-timeout=\fR\fB\fIseconds\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Waits watching the udev event queue and exits if all current events are handled.
+Waits watching the udev event queue and exits if all current events are handled\.
 .SH "OPTIONS"
 .PP
 \fB\-\-timeout=\fR\fB\fIseconds\fR\fR
 .RS 4
-maximum seconds to wait for the queue to become empty.
+maximum seconds to wait for the queue to become empty\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>.
+<kay\.sievers at vrfy\.org>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevstart.8 b/udevstart.8
index ac7d070..6b463cf 100644
--- a/udevstart.8
+++ b/udevstart.8
@@ -1,6 +1,6 @@
 .\"     Title: udevstart
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevstart
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevstart \- populate initial device directory
+udevstart - populate initial device directory
 .SH "SYNOPSIS"
 .HP 10
 \fBudevstart\fR
 .SH "DESCRIPTION"
 .PP
-udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules. udevstart is used to create the initial device directory after system bootup.
+udevstart scans the kernel exported device information available in sysfs for devices which require a device node to operate and creates the node using the specified udev rules\. udevstart is used to create the initial device directory after system bootup\.
 .SH "AUTHOR"
 .PP
 Written by Harald Hoyer
-<harald at redhat.com>.
+<harald at redhat\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtest.8 b/udevtest.8
index 9ab9249..a090465 100644
--- a/udevtest.8
+++ b/udevtest.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtest
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: August 2005
 .\"    Manual: udevtest
 .\"    Source: udev
@@ -11,17 +11,17 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtest \- simulate a udev run and print the action to the console
+udevtest - simulate a udev run and print the action to the console
 .SH "SYNOPSIS"
 .HP 21
 \fBudevtest \fR\fB\fIdevice\-path\fR\fR
 .SH "DESCRIPTION"
 .PP
-udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed.
+udevtest simulates a udev run for the given device and prints out the name of the node udev would have created, or the name of the network interface, that would have been renamed\.
 .SH "AUTHOR"
 .PP
 Written by Greg Kroah\-Hartman
-<greg at kroah.com>.
+<greg at kroah\.com>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
diff --git a/udevtrigger.8 b/udevtrigger.8
index 5ef9e8f..06c7e45 100644
--- a/udevtrigger.8
+++ b/udevtrigger.8
@@ -1,6 +1,6 @@
 .\"     Title: udevtrigger
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
 .\"      Date: March 2006
 .\"    Manual: udevtrigger
 .\"    Source: udev
@@ -11,66 +11,66 @@
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-udevtrigger \- request kernel devices events for coldplug
+udevtrigger - request kernel devices events for coldplug
 .SH "SYNOPSIS"
 .HP 12
 \fBudevtrigger\fR [\fB\-\-verbose\fR] [\fB\-\-dry\-run\fR] [\fB\-\-retry\-failed\fR] [\fB\-\-help\fR] [\fB\-\-action=\fR\fB\fIaction\fR\fR] [\fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR] [\fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR] [\fB\-\-attr\-nomatch=\fR\fB\fIattribute=value\fR\fR]
 .SH "DESCRIPTION"
 .PP
-Trigger kernel device uevents to replay missing events at system coldplug.
+Trigger kernel device uevents to replay missing events at system coldplug\.
 .SH "OPTIONS"
 .PP
 \fB\-\-verbose\fR
 .RS 4
-Print the list of devices which will be triggered.
+Print the list of devices which will be triggered\.
 .RE
 .PP
 \fB\-\-dry\-run\fR
 .RS 4
-Do not actually trigger the event.
+Do not actually trigger the event\.
 .RE
 .PP
 \fB\-\-retry\-failed\fR
 .RS 4
-Trigger only the events which are failed during a previous run.
+Trigger only the events which are failed during a previous run\.
 .RE
 .PP
 \fB\-\-action=\fR\fB\fIaction\fR\fR
 .RS 4
-Type of event to be triggered. The default value is "add".
+Type of event to be triggered\. The default value is "add"\.
 .RE
 .PP
 \fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR
 .RS 4
-Do not trigger events for devices which belong to a matching subsystem. This option can be specified multiple times and supports shell style pattern matching.
+Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
 .RE
 .PP
 \fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .PP
 \fB\-\-attr\-nomatch\fR\fB\fIattribute=value\fR\fR
 .RS 4
-Do not trigger events for devices with a matching sysfs attribute. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching. If no value is specified, the existence of the sysfs attribute is checked. This option can be specified multiple times.
+Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
 .RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
 .RS 4
-Overrides the syslog priority specified in the config file.
+Overrides the syslog priority specified in the config file\.
 .RE
 .SH "AUTHOR"
 .PP
 Written by Kay Sievers
-<kay.sievers at vrfy.org>
+<kay\.sievers at vrfy\.org>
 and Hannes Reinecke
-<hare at suse.de>.
+<hare at suse\.de>\.
 .SH "SEE ALSO"
 .PP
 \fBudev\fR(7)
-- 
1.5.2.4


0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch:

--- NEW FILE 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch ---
>From 7b6fd01651ce89e4985f9afc344b7d49c4e5fcd7 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 06:06:00 +0200
Subject: [PATCH] volume_id: fix linux_raid metadata version 1.0 detection

Fixes:
  https://bugs.launchpad.net/ubuntu/+source/udev/+bug/133773
---
 extras/volume_id/lib/linux_raid.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 6d1d19c..ff2c47c 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -142,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-	uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+	uint64_t sboff;
 
 	/* version 0 at the end of the device */
+	sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
 	if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
 		return 0;
 
 	/* version 1.0 at the end of the device */
+	sboff = (size & ~(0x1000 - 1)) - 0x2000;
 	if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
 		return 0;
 
-- 
1.5.2.4


0010-rules-Gentoo-update.patch:

--- NEW FILE 0010-rules-Gentoo-update.patch ---
>From 739b614721580b95aebdfd295eebb0a6246803ad Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam at gentoo.org>
Date: Wed, 29 Aug 2007 13:19:16 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/05-udev-early.rules    |    8 -----
 etc/udev/gentoo/30-kernel-compat.rules |   47 ++++++++++++++++++++++++++++++++
 etc/udev/gentoo/50-udev.rules          |    4 ---
 etc/udev/gentoo/80-drivers.rules       |   44 -----------------------------
 4 files changed, 47 insertions(+), 56 deletions(-)
 delete mode 100644 etc/udev/gentoo/05-udev-early.rules
 create mode 100644 etc/udev/gentoo/30-kernel-compat.rules
 delete mode 100644 etc/udev/gentoo/80-drivers.rules

diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
deleted file mode 100644
index fc15e2b..0000000
--- a/etc/udev/gentoo/05-udev-early.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# sysfs is populated after the event is sent
-ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
-
diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
new file mode 100644
index 0000000..7bc55c6
--- /dev/null
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -0,0 +1,47 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="kernel_compat_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+
+# needed for kernels <2.6.16
+SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+
+# needed for kernels <2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
+
+
+
+# needed for kernels <2.6.22
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+
+
+
+# this driver is broken and should not be loaded automatically
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
+# needed for kernels <2.6.21
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
+
+# No need for more code, as MODALIAS is present
+ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
+
+# needed for kernels <2.6.22
+SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
+
+	# Parts taken from redhat-rules
+	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+	# sr:           4 TYPE_WORM, 5 TYPE_ROM
+	# st/osst:      1 TYPE_TAPE
+
+	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
+	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
+	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
+
+	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
+	ATTRS{type}=="1", RUN+="modprobe.sh st"
+
+LABEL="kernel_compat_end"
+
+
diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index 9e06029..7c2ac81 100644
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -237,10 +237,6 @@ KERNEL=="umad*",	NAME="infiniband/%k"
 KERNEL=="issm*",	NAME="infiniband/%k"
 
 
-# usbfs-like device nodes
-# the way to go up to kernel 2.6.21 (and above if setting USB_DEVICE_CLASS=y)
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
-# starting from kernel 2.6.22 use this rule
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
 	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
 
diff --git a/etc/udev/gentoo/80-drivers.rules b/etc/udev/gentoo/80-drivers.rules
deleted file mode 100644
index df6c880..0000000
--- a/etc/udev/gentoo/80-drivers.rules
+++ /dev/null
@@ -1,44 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add", GOTO="drivers_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="drivers_end"
-
-# this driver is broken and should not be loaded automatically
-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="drivers_end"
-
-# Autoload modules that lack aliases but have them defined in autoload modules
-ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-
-# /etc/modprobe.conf.
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
-# needed aliases are defined in /etc/modprobe.d/pnp-aliases
-
-
-SUBSYSTEM=="i2o",  RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="mmc",  RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_sd"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh tifm_ms"
-SUBSYSTEM=="ide",  ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-
-# Load driver for scsi-device
-SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
-
-	# Parts taken from redhat-rules
-	# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-	# sr:           4 TYPE_WORM, 5 TYPE_ROM
-	# st/osst:      1 TYPE_TAPE
-
-	ATTRS{type}=="?*",	TEST!="[module/sg]", RUN+="modprobe.sh sg"
-	ATTRS{type}=="0|7|14",	RUN+="modprobe.sh sd_mod"
-	ATTRS{type}=="4|5",	RUN+="modprobe.sh sr_mod"
-	ATTRS{type}=="8",	RUN+="modprobe.sh ch"
-
-	ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-		ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="hotplug_scsi_end"
-	ATTRS{type}=="1", RUN+="modprobe.sh st"
-LABEL="hotplug_scsi_end"
-
-LABEL="drivers_end"
-
-- 
1.5.2.4


0011-add-name-substitution.patch:

--- NEW FILE 0011-add-name-substitution.patch ---
>From 1113044be205f9d78642744ffaa01329a77bee79 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 14:04:55 +0200
Subject: [PATCH] add $name substitution

---
 udev.7       |    7 ++++++-
 udev.xml     |   10 +++++++++-
 udev_rules.c |    6 ++++++
 udevd.c      |    2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/udev.7 b/udev.7
index 5f0ebb9..0ea5549 100644
--- a/udev.7
+++ b/udev.7
@@ -331,7 +331,7 @@ and
 \fBATTRS\fR\.
 .RE
 .PP
-\fB$driver\fR, \fB%d\fR
+\fB$driver\fR
 .RS 4
 The driver name of the device matched while searching the devpath upwards for
 \fBSUBSYSTEMS\fR,
@@ -373,6 +373,11 @@ The string returned by the external program requested with PROGRAM\. A single pa
 The node name of the parent device\.
 .RE
 .PP
+\fB$name\fR
+.RS 4
+The name of the device node\. The value is only set if an earlier rule assigned a value, or during a remove events\.
+.RE
+.PP
 \fB$root\fR, \fB%r\fR
 .RS 4
 The udev_root value\.
diff --git a/udev.xml b/udev.xml
index b43abb7..9fb6152 100644
--- a/udev.xml
+++ b/udev.xml
@@ -488,7 +488,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>$driver</option>, <option>%d</option></term>
+              <term><option>$driver</option></term>
               <listitem>
                 <para>The driver name of the device matched while searching the devpath upwards for
                   <option>SUBSYSTEMS</option>, <option>KERNELS</option>, <option>DRIVERS</option> and <option>ATTRS</option>.
@@ -548,6 +548,14 @@
             </varlistentry>
 
             <varlistentry>
+              <term><option>$name</option></term>
+              <listitem>
+                <para>The name of the device node. The value is only set if an earlier
+                rule assigned a value, or during a remove events.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
               <term><option>$root</option>, <option>%r</option></term>
               <listitem>
                 <para>The udev_root value.</para>
diff --git a/udev_rules.c b/udev_rules.c
index 35db958..01fb211 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -606,6 +606,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
 		SUBST_SYS,
 		SUBST_ENV,
@@ -627,6 +628,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
 		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
 		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
 		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
 		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
@@ -845,6 +847,10 @@ found:
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
diff --git a/udevd.c b/udevd.c
index 3c46617..5ff5d3f 100644
--- a/udevd.c
+++ b/udevd.c
@@ -508,7 +508,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 			}
 	}
 
-	/* check runing-queue for still running events */
+	/* check run queue for still running events */
 	list_for_each_entry(loop_msg, &running_list, node) {
 		if (limit && childs_count++ > limit) {
 			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
-- 
1.5.2.4


0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch:

--- NEW FILE 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch ---
>From a75689bad504e35e346b84960b2b604532b1d6b5 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 14:11:37 +0200
Subject: [PATCH] do not delete the device node with ignore_remove, but handle the event

---
 udev.7        |    2 +-
 udev.xml      |    4 ++--
 udev_device.c |    8 ++++----
 udev_rules.c  |   15 ++++++++++++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/udev.7 b/udev.7
index 0ea5549..874c9ab 100644
--- a/udev.7
+++ b/udev.7
@@ -275,7 +275,7 @@ Ignore this event completely\.
 .PP
 \fBignore_remove\fR
 .RS 4
-Ignore any later remove event for this device\. This may be useful as a workaround for broken device drivers\.
+Do not remove the device node when the device goes away\. This may be useful as a workaround for broken device drivers\.
 .RE
 .PP
 \fBlink_priority=\fR\fB\fIvalue\fR\fR
diff --git a/udev.xml b/udev.xml
index 9fb6152..83a9d75 100644
--- a/udev.xml
+++ b/udev.xml
@@ -416,8 +416,8 @@
                   <varlistentry>
                     <term><option>ignore_remove</option></term>
                     <listitem>
-                      <para>Ignore any later remove event for this device. This may be useful
-                      as a workaround for broken device drivers.</para>
+                      <para>Do not remove the device node when the device goes away. This may be
+                      useful as a workaround for broken device drivers.</para>
                     </listitem>
                   </varlistentry>
                   <varlistentry>
diff --git a/udev_device.c b/udev_device.c
index 2b7ffe0..62217ff 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -266,10 +266,6 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* import database entry, and delete it */
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
-			if (udev->ignore_remove) {
-				info("ignore_remove for '%s'", udev->name);
-				goto exit;
-			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
@@ -285,6 +281,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'", udev->name);
+			goto exit;
+		}
 		/* remove the node */
 		retval = udev_node_remove(udev);
 
diff --git a/udev_rules.c b/udev_rules.c
index 01fb211..364d1b7 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1472,9 +1472,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET ||
-		    rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
@@ -1485,6 +1490,10 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				struct name_entry *entry;
-- 
1.5.2.4


0013-print-warning-for-invalid-TEST-operations.patch:

--- NEW FILE 0013-print-warning-for-invalid-TEST-operations.patch ---
>From a506e6298cffed4576f9cea8df15b2f8945fc731 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 29 Aug 2007 22:19:28 +0200
Subject: [PATCH] print warning for invalid TEST operations

---
 udev_rules.c       |    3 ++-
 udev_rules_parse.c |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 364d1b7..ef352ca 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -994,7 +994,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
-	if (rule->test.operation != KEY_OP_UNSET) {
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
 		char filename[PATH_SIZE];
 		char devpath[PATH_SIZE];
 		char *attr;
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 3afc31a..9e43581 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -469,6 +469,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid TEST operation");
+				goto invalid;
+			}
 			attr = get_key_attribute(key + sizeof("TEST")-1);
 			if (attr != NULL)
 				rule->test_mode_mask = strtol(attr, NULL, 8);
-- 
1.5.2.4


0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch:

--- NEW FILE 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch ---
>From b5bc27029a82ff37c36f6e9d06f23c3005fe3382 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 14:14:54 +0200
Subject: [PATCH] rules: do not delete /lib/udev/devices/ nodes on "remove"

---
 etc/udev/rules.d/50-udev-default.rules |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index f869f51..76f0976 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -101,3 +101,6 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
 
+# do not delete static device nodes
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+
-- 
1.5.2.4


0015-rules-remove-broken-nvram-group-assignment-without.patch:

--- NEW FILE 0015-rules-remove-broken-nvram-group-assignment-without.patch ---
>From 9d1f93803f166149b3c467a465a126b2fb31e93c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 14:25:17 +0200
Subject: [PATCH] rules: remove broken nvram group assignment without any permission

---
 etc/udev/rules.d/50-udev-default.rules |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 76f0976..633e2e7 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -20,7 +20,6 @@ KERNEL=="lirc0",		SYMLINK+="lirc"
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",			SYMLINK+="XOR"
 KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
-KERNEL=="nvram",		GROUP="kmem", MODE="0600"
 KERNEL=="ram0",			SYMLINK+="ramdisk"
 KERNEL=="ram1",			SYMLINK+="ram"
 
-- 
1.5.2.4


0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch:

--- NEW FILE 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch ---
>From 89e0a02226cbadf6a58c4d234e31c7111eed20bc Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 30 Aug 2007 15:03:21 +0200
Subject: [PATCH] add /dev/rtc symlink if new rtc drivers are used

---
 etc/udev/rules.d/50-udev-default.rules |    3 ++-
 udev_node.c                            |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 633e2e7..854809a 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -88,7 +88,8 @@ KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"
 
 # miscellaneous
 KERNEL=="fuse",			MODE="0666"
-KERNEL=="rtc",			MODE="0644"
+KERNEL=="rtc|rtc0",		MODE="0644"
+KERNEL=="rtc0",			SYMLINK+="rtc"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
 KERNEL=="mmtimer",		MODE="0644"
diff --git a/udev_node.c b/udev_node.c
index fcd52d0..25eed86 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -133,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
 				    stats.st_rdev == stats2.st_rdev) {
 					info("replace device node '%s' with symlink to our node '%s'", slink, node);
 				} else {
-					err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+					err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
 					goto exit;
 				}
 			}
-- 
1.5.2.4


0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch:

--- NEW FILE 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch ---
>From 39ea7c6c67de69379b603196a0eff6f7ce2e469a Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 31 Aug 2007 11:01:35 +0200
Subject: [PATCH] increase WAIT_FOR_SYSFS timeout to 10 seconds

We see SCSI disks where it takes 6.5 seconds to populate the
sysfs attributes.
---
 udev_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index ef352ca..dcd0914 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1040,7 +1040,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
 		int found;
 
-		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
 		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
-- 
1.5.2.4


0018-correct-includes-in-udev_selinux.c.patch:

--- NEW FILE 0018-correct-includes-in-udev_selinux.c.patch ---
>From 07acdb0f7413eeb261bdb52eba6abe75371cc202 Mon Sep 17 00:00:00 2001
From: maximilian attems <max at stro.at>
Date: Thu, 6 Sep 2007 13:12:48 +0200
Subject: [PATCH] correct includes in udev_selinux.c

---
 udev_selinux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_selinux.c b/udev_selinux.c
index 1ad6e8a..3fa84a0 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
-- 
1.5.2.4


0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch:

--- NEW FILE 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch ---
>From 8aab4ce40b821d7b759b98bb97afcd3e0b7c80d8 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 7 Sep 2007 04:01:21 +0200
Subject: [PATCH] rules: put bsd nodes in /dev/bsd/ directory

---
 etc/udev/rules.d/50-udev-default.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index 854809a..bdce004 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -77,6 +77,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="qft0",			SYMLINK+="ftape"
+SUBSYSTEM=="bsg"		NAME="bsg/%k"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
-- 
1.5.2.4


0020-path_id-fix-for-stacked-class-devices.patch:

--- NEW FILE 0020-path_id-fix-for-stacked-class-devices.patch ---
>From b1ac36ff5e3756cefc79967a26280056da31bf6f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Mon, 10 Sep 2007 00:59:07 +0200
Subject: [PATCH] path_id: fix for stacked class devices

---
 extras/path_id/path_id |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index 57879b5..a3a627e 100755
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -456,7 +456,11 @@ handle_device () {
 					return
 				fi
 			fi
-			cd $full_sysfs_path/device
+			if [ -L $full_sysfs_path/device/device ]; then
+				cd $full_sysfs_path/device/device
+			else
+				cd $full_sysfs_path/device
+			fi
 			;;
 	esac
 	full_sysfs_device_path="`pwd -P`"
-- 
1.5.2.4


0021-check-line-length-after-comment-check-and-whitespace.patch:

--- NEW FILE 0021-check-line-length-after-comment-check-and-whitespace.patch ---
>From 16511863d928e7fd82f15ae64850ab21e74f0f16 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 11 Sep 2007 17:17:29 +0200
Subject: [PATCH] check line length after comment check and whitespace strip

---
 udev_config.c |   10 +++++-----
 udev_rules.c  |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/udev_config.c b/udev_config.c
index 3f226b9..2f2a69e 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -111,11 +111,6 @@ static int parse_config_file(void)
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -128,6 +123,11 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		if (count >= sizeof(line)) {
+			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
diff --git a/udev_rules.c b/udev_rules.c
index dcd0914..3ec8477 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -349,11 +349,6 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -366,6 +361,11 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
+		if (count >= sizeof(line)) {
+			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+			continue;
+		}
+
 		memcpy(line, bufline, count);
 		line[count] = '\0';
 
-- 
1.5.2.4


0022-only-install-.rules.patch:

--- NEW FILE 0022-only-install-.rules.patch ---
>From 554074c9ca2f1b8876176887e4656d06b870f2cd Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 11 Sep 2007 17:20:54 +0200
Subject: [PATCH] only install *.rules

---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 39ffc7d..92ca846 100644
--- a/Makefile
+++ b/Makefile
@@ -230,9 +230,9 @@ install-config:
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@ for i in $(shell ls -1 etc/udev/rules.d); do \
-		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
-			$(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+	@ for i in etc/udev/rules.d/*.rules; do \
+		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+			$(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
 		fi \
 	done
 	@ extras="$(EXTRAS)"; for target in $$extras; do \
-- 
1.5.2.4


0023-ignore-device-node-names-while-restoring-symlinks-fr.patch:

--- NEW FILE 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch ---
>From 25c208d659cf0f8bc887a1f7c62e9d2e0c546aec Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed, 12 Sep 2007 00:21:53 +0200
Subject: [PATCH] ignore device node names while restoring symlinks from the stack

---
 udev_node.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/udev_node.c b/udev_node.c
index 25eed86..556a442 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -230,11 +230,15 @@ static int update_link(struct udevice *udev, const char *name)
 		if (udev_db == NULL)
 			continue;
 		if (udev_db_get_device(udev_db, device->name) == 0) {
-			info("compare priority of '%s' %i > %i",
-			     udev_db->dev->devpath, udev_db->link_priority, priority);
-			if (target[0] == '\0' || udev_db->link_priority > priority) {
-				priority = udev_db->link_priority;
-				strlcpy(target, udev_db->name, sizeof(target));
+			if (strcmp(udev_db->name, name) == 0) {
+				info("'%s' is a device node of '%s', skip link update", udev_db->name, device->name);
+			} else {
+				info("compare priority of '%s' %i > %i",
+				     udev_db->dev->devpath, udev_db->link_priority, priority);
+				if (target[0] == '\0' || udev_db->link_priority > priority) {
+					priority = udev_db->link_priority;
+					strlcpy(target, udev_db->name, sizeof(target));
+				}
 			}
 		}
 		udev_device_cleanup(udev_db);
@@ -242,8 +246,8 @@ static int update_link(struct udevice *udev, const char *name)
 	name_list_cleanup(&name_list);
 
 	if (target[0] == '\0') {
-		err("missing target for '%s'", name);
-		rc = -1;
+		info("no current target for '%s' found", name);
+		rc = 1;
 		goto out;
 	}
 
-- 
1.5.2.4


0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch:

--- NEW FILE 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch ---
>From ce39874580829dc97f77b78114874b5086056e5c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 00:41:54 +0200
Subject: [PATCH] use SEQNUM in /dev/.udev/queue/ instead of devpath

---
 udevd.c |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/udevd.c b/udevd.c
index 5ff5d3f..eb311df 100644
--- a/udevd.c
+++ b/udevd.c
@@ -154,22 +154,16 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	char filename[PATH_SIZE];
 	char filename_failed[PATH_SIZE];
 	size_t start;
-	struct udevd_uevent_msg *loop_msg;
-	int fd;
 
 	/* location of queue file */
-	strlcpy(filename, udev_root, sizeof(filename));
-	strlcat(filename, "/", sizeof(filename));
-	start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
-	strlcat(filename, msg->devpath, sizeof(filename));
-	path_encode(&filename[start], sizeof(filename) - start);
+	snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
 
 	/* location of failed file */
 	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
 	strlcat(filename_failed, "/", sizeof(filename_failed));
 	start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
 	strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
-	path_encode(&filename_failed[start], sizeof(filename) - start);
+	path_encode(&filename_failed[start], sizeof(filename_failed) - start);
 
 	switch (state) {
 	case EVENT_QUEUED:
@@ -177,12 +171,9 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 		delete_path(filename_failed);
 
 		create_path(filename);
-		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
-		if (fd > 0)
-			close(fd);
-		return;
+		symlink(msg->devpath, filename);
+		break;
 	case EVENT_FINISHED:
-	case EVENT_FAILED:
 		if (msg->devpath_old != NULL) {
 			/* "move" event - rename failed file to current name, do not delete failed */
 			char filename_failed_old[PATH_SIZE];
@@ -201,28 +192,20 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 			delete_path(filename_failed);
 		}
 
-		/* skip if events for the same path are still pending */
-		list_for_each_entry(loop_msg, &running_list, node)
-			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-				return;
-
-		list_for_each_entry(loop_msg, &exec_list, node)
-			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-				return;
-
+		unlink(filename);
+		delete_path(filename);
+		break;
+	case EVENT_FAILED:
 		/* move failed event to the failed directory */
-		if (state == EVENT_FAILED) {
-			create_path(filename_failed);
-			rename(filename, filename_failed);
-		} else {
-			unlink(filename);
-		}
+		create_path(filename_failed);
+		rename(filename, filename_failed);
 
 		/* clean up possibly empty queue directory */
 		delete_path(filename);
-
-		return;
+		break;
 	}
+
+	return;
 }
 
 static void msg_queue_delete(struct udevd_uevent_msg *msg)
@@ -297,7 +280,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	}
 
 	export_event_state(msg, EVENT_QUEUED);
-	info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
+	info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
 	/* run one event after the other in debug mode */
 	if (debug_trace) {
-- 
1.5.2.4


0025-rules-add-memstick-module-loading.patch:

--- NEW FILE 0025-rules-add-memstick-module-loading.patch ---
>From 3a58ef80dfbc08fd8722af5408a26abe12fe053c Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 00:46:44 +0200
Subject: [PATCH] rules: add memstick module loading

---
 etc/udev/rules.d/80-drivers.rules |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index 3388266..5340565 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -6,6 +6,7 @@ DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODAL
 SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
   RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
 SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
 SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-- 
1.5.2.4


0026-Removed-extra-space-from-udevinfo-symlink-output.patch:

--- NEW FILE 0026-Removed-extra-space-from-udevinfo-symlink-output.patch ---
>From 1e3ee197983daecbe78ff5cf7e4dc8f431ccf185 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Sep 2007 13:53:26 +0200
Subject: [PATCH] Removed extra space from udevinfo symlink output.
See also https://bugzilla.redhat.com/show_bug.cgi?id=173001
---
 udevinfo.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index be9aa76..8e54705 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -389,10 +389,16 @@ int main(int argc, char *argv[], char *envp[])
 				goto exit;
 			if (root)
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s/%s ", udev_root, name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s/%s ", udev_root, name_loop->name);
+					else
+						printf("%s/%s", udev_root, name_loop->name);
 			else
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s ", name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s ", name_loop->name);
+					else
+						printf("%s", name_loop->name);
 			printf("\n");
 			break;
 		case QUERY_PATH:
-- 
1.5.2.4



--- NEW FILE Makefile.git ---
Patch:
	@for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "Patch$$n: $$i";done

patch:
	@for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "%patch$$n -p1 -b .git$$n";done



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- start_udev	27 Jul 2007 16:51:38 -0000	1.64
+++ start_udev	20 Sep 2007 12:27:11 -0000	1.65
@@ -94,6 +94,7 @@
 		pushd $devdir &> "$udev_root/null"
 		set *
 		if [ "$1" != "*" ]; then
+			echo "Warning: $devdir is deprecated. Please use /etc/udev/makedev.d/."
         		cp -ar "$@" $udev_root/ 
 			pushd "$udev_root" &> "$udev_root/null"
 			[ -x /sbin/restorecon ] && /sbin/restorecon "$@" 
@@ -180,6 +181,7 @@
 make_extra_nodes
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
+UDEV_OPTS=""
 if [ -f "/sys/class/tty/console/uevent" ]; then
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
@@ -194,9 +196,12 @@
 	if strstr "$cmdline" udevdebug; then
 		/sbin/udevcontrol log_priority=debug
 	fi
-        if strstr "$cmdline" fastudev; then
-		/sbin/udevcontrol env FASTUDEV=1
-        fi
+	if strstr "$cmdline" udevinfo; then
+		/sbin/udevcontrol log_priority=info
+	fi
+	if strstr "$cmdline" udevtrace; then
+		UDEV_OPTS="$UDEV_OPTS --debug-trace"
+	fi
 	if strstr "$cmdline" udevchilds; then
 		/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
 	fi
@@ -211,7 +216,7 @@
 	/sbin/udevcontrol env MODPROBE_DEBUG=
 else
 	echo -n " kernel too old for this udev version "
-	/sbin/udevd -d
+	/sbin/udevd -d $UDEV_OPTS
 	ret=10
 
 fi


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- udev.spec	7 Sep 2007 12:52:05 -0000	1.219
+++ udev.spec	20 Sep 2007 12:27:11 -0000	1.220
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 2%{?dist}
+Release: 3.20070920git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,11 +18,35 @@
 Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
 
-Patch1: udev-089-nopie.patch
-Patch2: udev-091-lib64.patch
-Patch3: udev-115-git-20070907.patch
-Patch4: udev-115-looplast.patch
-Patch5: udev-115-rulesinstall.patch
+Patch1: 0001-set-buffer-size-if-strlcpy-strlcat-indicate-truncati.patch
+Patch2: 0002-rules-fix-two-trivial-typos.patch
+Patch3: 0003-rules-random-and-urandom-are-0666.patch
+Patch4: 0004-rules-add-REMOVE_CMD-rule.patch
+Patch5: 0005-track-move-events-to-rename-database-and-failed-fi.patch
+Patch6: 0006-rules-Gentoo-update.patch
+Patch7: 0007-rules-add-i2o-driver-rule.patch
+Patch8: 0008-man-recreate-man-pages.patch
+Patch9: 0009-volume_id-fix-linux_raid-metadata-version-1.0-detec.patch
+Patch10: 0010-rules-Gentoo-update.patch
+Patch11: 0011-add-name-substitution.patch
+Patch12: 0012-do-not-delete-the-device-node-with-ignore_remove-bu.patch
+Patch13: 0013-print-warning-for-invalid-TEST-operations.patch
+Patch14: 0014-rules-do-not-delete-lib-udev-devices-nodes-on-re.patch
+Patch15: 0015-rules-remove-broken-nvram-group-assignment-without.patch
+Patch16: 0016-add-dev-rtc-symlink-if-new-rtc-drivers-are-used.patch
+Patch17: 0017-increase-WAIT_FOR_SYSFS-timeout-to-10-seconds.patch
+Patch18: 0018-correct-includes-in-udev_selinux.c.patch
+Patch19: 0019-rules-put-bsd-nodes-in-dev-bsd-directory.patch
+Patch20: 0020-path_id-fix-for-stacked-class-devices.patch
+Patch21: 0021-check-line-length-after-comment-check-and-whitespace.patch
+Patch22: 0022-only-install-.rules.patch
+Patch23: 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch
+Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
+Patch25: 0025-rules-add-memstick-module-loading.patch
+Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
+
+Patch100: udev-089-nopie.patch
+Patch101: udev-091-lib64.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -70,13 +94,34 @@
 
 %prep
 %setup -q  
-%patch1 -p1 -b .nopie
-%patch2 -p1 -b .lib64
-%patch3 -p1 -b .git20070907
-%patch4 -p1 -b .looplast
-%patch5 -p1 -b .rulesinstall
+%patch1 -p1 -b .git1
+%patch2 -p1 -b .git2
+%patch3 -p1 -b .git3
+%patch4 -p1 -b .git4
+%patch5 -p1 -b .git5
+%patch6 -p1 -b .git6
+%patch7 -p1 -b .git7
+%patch8 -p1 -b .git8
+%patch9 -p1 -b .git9
+%patch10 -p1 -b .git10
+%patch11 -p1 -b .git11
+%patch12 -p1 -b .git12
+%patch13 -p1 -b .git13
+%patch14 -p1 -b .git14
+%patch15 -p1 -b .git15
+%patch16 -p1 -b .git16
+%patch17 -p1 -b .git17
+%patch18 -p1 -b .git18
+%patch19 -p1 -b .git19
+%patch20 -p1 -b .git20
+%patch21 -p1 -b .git21
+%patch22 -p1 -b .git22
+%patch25 -p1 -b .git25
+%patch26 -p1 -b .git26
+
+%patch100 -p1 -b .nopie
+%patch101 -p1 -b .lib64
 
-rm -f etc/udev/redhat/51-hotplug.rules etc/udev/redhat/50* etc/udev/redhat/06*
 %build
 
 %if %{with_static}
@@ -189,11 +234,16 @@
 
 for i in \
 	etc/udev/redhat/*.rules \
+%ifarch ia64
 	etc/udev/packages/40-ia64.rules \
-	etc/udev/packages/40-alsa.rules \
+%endif
+%ifarch ppc ppc64
 	etc/udev/packages/40-ppc.rules \
+%endif
+%ifarch s390 s390x
 	etc/udev/packages/40-s390.rules \
-	etc/udev/packages/40-zaptel.rules \
+%endif
+	etc/udev/packages/40-alsa.rules \
 	etc/udev/packages/64-md-raid.rules \
 	etc/udev/packages/64-device-mapper.rules \
 	; do
@@ -352,6 +402,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
+- some upstream fixes from git
+- removed last_rule for loop rules
+- added "udevinfo udevtrace" kernel command line options for better debugging
+
 * Fri Sep 07 2007 Harald Hoyer <harald at redhat.com> - 115-2
 - some upstream fixes from git
 - last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices)


--- udev-115-git-20070907.patch DELETED ---


--- udev-115-looplast.patch DELETED ---


--- udev-115-rulesinstall.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 12:35:04 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:35:04 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchbugzilla
Message-ID: <200709201235.l8KCZ4sg004952@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchbugzilla acl on bluez-gnome (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:56 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:56 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchcommits
Message-ID: <200709201240.l8KCeugs026142@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchcommits acl on bluez-gnome (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:57 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:57 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested commit
Message-ID: <200709201240.l8KCevVx026154@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the commit acl on bluez-gnome (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:40:58 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:40:58 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested approveacls
Message-ID: <200709201240.l8KCewMU026172@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the approveacls acl on bluez-gnome (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:01 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:01 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchbugzilla
Message-ID: <200709201241.l8KCf1lT026207@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchbugzilla acl on bluez-gnome (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:03 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:03 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested watchcommits
Message-ID: <200709201241.l8KCf3qF026221@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the watchcommits acl on bluez-gnome (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:05 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:05 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested commit
Message-ID: <200709201241.l8KCf54R026239@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the commit acl on bluez-gnome (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:07 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:07 -0700
Subject: [pkgdb] bluez-gnome: hadess has requested approveacls
Message-ID: <200709201241.l8KCf73i026256@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has requested the approveacls acl on bluez-gnome (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:21 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfLqt026336@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:24 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:24 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfOee026354@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:26 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:26 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfQFH026373@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:28 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:28 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfSXn007188@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the approveacls acl on bluez-gnome (Fedora devel) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:31 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:31 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfVlA026413@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:33 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfXtv007227@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:35 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:35 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfZNO007244@app3.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the commit acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:41:37 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (bnocera))
Date: Thu, 20 Sep 2007 05:41:37 -0700
Subject: [pkgdb] bluez-gnome had acl change status
Message-ID: <200709201241.l8KCfblO026455@app4.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the approveacls acl on bluez-gnome (Fedora 7) to Approved for Bastien Nocera (hadess)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bluez-gnome



From fedora-extras-commits at redhat.com  Thu Sep 20 12:45:07 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 08:45:07 -0400
Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.18,1.19
Message-ID: <200709201245.l8KCj7AW027105@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27087

Modified Files:
	bluez-gnome.spec 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
- Only show and start the bluez-gnome bits in GNOME (#258721)



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bluez-gnome.spec	17 Sep 2007 23:19:26 -0000	1.18
+++ bluez-gnome.spec	20 Sep 2007 12:44:33 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -40,18 +40,19 @@
 
 %prep
 %setup -q
-sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop.in
 
 %build
 %configure --disable-mime-update --disable-desktop-update
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+
 desktop-file-install --vendor=""				\
 	--add-category=X-GNOME-NetworkSettings			\
 	--delete-original					\
@@ -105,7 +106,7 @@
 %{_bindir}/bluetooth-applet
 %{_bindir}/bluetooth-properties
 %config %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+%{_sysconfdir}/xdg/gnome/autostart/bluetooth-applet.desktop
 %{_datadir}/man/man1/bluetooth-applet.1.gz
 %{_datadir}/man/man1/bluetooth-properties.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
@@ -118,6 +119,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
+- Only show and start the bluez-gnome bits in GNOME (#258721)
+
 * Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
 - Split out the analyzer so it's not installed by default
 - Don't prefix the properties .desktop with fedora for no reason



From fedora-extras-commits at redhat.com  Thu Sep 20 12:47:33 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 08:47:33 -0400
Subject: rpms/svnkit/devel svnkit.spec,1.5,1.6
Message-ID: <200709201247.l8KClX3d027186@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27162

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svnkit.spec	10 Sep 2007 13:27:20 -0000	1.5
+++ svnkit.spec	20 Sep 2007 12:47:01 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:05:01 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 09:05:01 -0400
Subject: rpms/svnkit/FC-6 svnkit.spec,1.2,1.3
Message-ID: <200709201305.l8KD51Ej001040@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1020

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/FC-6/svnkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svnkit.spec	10 Sep 2007 17:22:59 -0000	1.2
+++ svnkit.spec	20 Sep 2007 13:04:28 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:09:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 09:09:53 -0400
Subject: rpms/system-config-boot/devel .cvsignore, 1.13, 1.14 sources, 1.13, 
	1.14 system-config-boot.spec, 1.19, 1.20
Message-ID: <200709201309.l8KD9roZ001198@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-boot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1176

Modified Files:
	.cvsignore sources system-config-boot.spec 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 0.2.17-1
- translation update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Aug 2007 10:51:55 -0000	1.13
+++ .cvsignore	20 Sep 2007 13:09:20 -0000	1.14
@@ -1 +1 @@
-system-config-boot-0.2.16.tar.gz
+system-config-boot-0.2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Aug 2007 10:51:55 -0000	1.13
+++ sources	20 Sep 2007 13:09:20 -0000	1.14
@@ -1 +1 @@
-d2064da94197552b9158fa3a064a86f4  system-config-boot-0.2.16.tar.gz
+c1ef572a5618c081a0ef59eb6f9c8c05  system-config-boot-0.2.17.tar.gz


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- system-config-boot.spec	13 Aug 2007 10:51:55 -0000	1.19
+++ system-config-boot.spec	20 Sep 2007 13:09:20 -0000	1.20
@@ -3,7 +3,7 @@
 
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
-Version: 0.2.16
+Version: 0.2.17
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/boot
 License: GPL
@@ -66,6 +66,9 @@
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-boot
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 0.2.17-1
+- translation update
+
 * Mon Aug 13 2007 Harald Hoyer <harald at redhat.com> - 0.2.16-1
 - translation update
 - updated URL



From fedora-extras-commits at redhat.com  Thu Sep 20 13:18:52 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 09:18:52 -0400
Subject: rpms/gnash/devel gnash.spec,1.10,1.11
Message-ID: <200709201318.l8KDIq1V001510@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
- omf/scrollkeeper doc is broken, remove it



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnash.spec	7 Sep 2007 06:44:43 -0000	1.10
+++ gnash.spec	20 Sep 2007 13:18:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -116,9 +116,10 @@
 # asspec info isn't generated rightly
 rm \
  $RPM_BUILD_ROOT%{_infodir}/asspec.info
-# omf was broken
-#rm -rf \
-# $RPM_BUILD_ROOT%{_datadir}/omf
+# omf/scrollkeeper related files are broken, some files are missing, and
+# omf files are wrong
+rm -rf \
+ $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
@@ -133,7 +134,7 @@
 
 %post 
 /sbin/ldconfig
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 # the info is empty, but doesn't hurt
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
@@ -165,7 +166,7 @@
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
-%{_datadir}/omf/gnash/
+#%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -184,6 +185,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
+- omf/scrollkeeper doc is broken, remove it
+
 * Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
 - better documentation generation
 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:19:12 2007
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 20 Sep 2007 09:19:12 -0400
Subject: rpms/svnkit/F-7 svnkit.spec,1.2,1.3
Message-ID: <200709201319.l8KDJCIu001552@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1490

Modified Files:
	svnkit.spec 
Log Message:
Fix Obsoletes to include javasvn = 1.1.0



Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-7/svnkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svnkit.spec	10 Sep 2007 16:56:47 -0000	1.2
+++ svnkit.spec	20 Sep 2007 13:18:39 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           svnkit
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -32,7 +32,7 @@
 
 BuildRequires:          ganymed-ssh2 >= 209
 Requires:               ganymed-ssh2 >= 209
-Obsoletes:              javasvn < 1.1.0
+Obsoletes:              javasvn <= 1.1.0
 
 
 %description
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-2
+- Fix Obsoletes to include javasvn = 1.1.0
+
 * Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> - 1.1.4-1
 - Update to upstream 1.1.4
 - Build for all supported arquitectures 



From fedora-extras-commits at redhat.com  Thu Sep 20 13:39:56 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 09:39:56 -0400
Subject: rpms/lilypond/devel .cvsignore, 1.18, 1.19 lilypond.spec, 1.20,
	1.21 sources, 1.18, 1.19
Message-ID: <200709201339.l8KDduQI002116@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2094

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Aug 2007 14:59:10 -0000	1.18
+++ .cvsignore	20 Sep 2007 13:39:23 -0000	1.19
@@ -1 +1 @@
-lilypond-2.10.29.tar.gz
+lilypond-2.10.33.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lilypond.spec	18 Sep 2007 13:50:46 -0000	1.20
+++ lilypond.spec	20 Sep 2007 13:39:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.10.29
-Release:	2%{?dist}
+Version:	2.10.33
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -92,7 +92,8 @@
 
 
 %changelog
-* Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-2
+* Thu Sep 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
+- New release.
 - Fix source URL. Change licence from GPL to GPLv2.
 
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Aug 2007 14:59:10 -0000	1.18
+++ sources	20 Sep 2007 13:39:23 -0000	1.19
@@ -1 +1 @@
-201044efcff6e9eb8a9d8a960c9d8181  lilypond-2.10.29.tar.gz
+86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 13:41:20 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 09:41:20 -0400
Subject: rpms/lilypond/devel lilypond.spec,1.21,1.22
Message-ID: <200709201341.l8KDfKTR002173@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2155

Modified Files:
	lilypond.spec 
Log Message:
New release.


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lilypond.spec	20 Sep 2007 13:39:23 -0000	1.21
+++ lilypond.spec	20 Sep 2007 13:40:47 -0000	1.22
@@ -94,7 +94,8 @@
 %changelog
 * Thu Sep 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
 - New release.
-- Fix source URL. Change licence from GPL to GPLv2.
+- Fix source URL.
+- Change licence from GPL to GPLv2.
 
 * Tue Aug 21 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.29-1
 - New release. Remove old patch.



From fedora-extras-commits at redhat.com  Thu Sep 20 13:53:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 09:53:37 -0400
Subject: rpms/acl/devel acl-2.2.39-path_max.patch, 1.1, 1.2 acl.spec, 1.43,
	1.44
Message-ID: <200709201353.l8KDrbgR002649@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600

Modified Files:
	acl-2.2.39-path_max.patch acl.spec 
Log Message:
Rewritten path_max patch to support long UTF8 names


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-path_max.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acl-2.2.39-path_max.patch	5 Jul 2006 19:32:12 -0000	1.1
+++ acl-2.2.39-path_max.patch	20 Sep 2007 13:53:35 -0000	1.2
@@ -18,7 +18,7 @@
 +	  bytes for "#file:". Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[PATH_MAX+6];
++	char linebuf[(4*PATH_MAX)+6];
  	char *cp;
  	char *p;
  	int comments_read = 0;


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- acl.spec	31 Aug 2007 18:33:41 -0000	1.43
+++ acl.spec	20 Sep 2007 13:53:35 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -107,6 +107,10 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Sep 20 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-10
+- Rewriten path_max patch to support long UTF8 names
+- Resolves #287701, #183181
+
 * Fri Aug 31 2007 Steve Dickson <steved at redhat.com> - 2.2.39-9
 - Removed NFS4 ACL patch since it was rejected by upstream.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:07:17 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 10:07:17 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.43,
	1.44 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.4,
	1.5 NetworkManager-0.7.0-missing-includes.patch, 1.2,
	1.3 NetworkManager.spec, 1.164, 1.165 sources, 1.62,
	1.63 NetworkManager-0.7.0-ppp-manager-fpic.patch, 1.2,
	NONE nm-applet-0.7.0-fixes.patch, 1.2, NONE
Message-ID: <200709201407.l8KE7Hkf009014@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8967

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager-0.7.0-missing-includes.patch 
	NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.7.0-ppp-manager-fpic.patch 
	nm-applet-0.7.0-fixes.patch 
Log Message:
* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
- New SVN snapshot of 0.7 that sucks less




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	30 Aug 2007 22:03:19 -0000	1.43
+++ .cvsignore	20 Sep 2007 14:06:41 -0000	1.44
@@ -2,3 +2,5 @@
 NetworkManager-0.6.5.tar.bz2
 NetworkManager-0.7.0.svn2736.tar.gz
 nm-applet-0.7.0.svn129.tar.gz
+NetworkManager-0.7.0.svn2833.tar.gz
+nm-applet-0.7.0.svn186.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	30 Aug 2007 22:29:47 -0000	1.4
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	20 Sep 2007 14:06:41 -0000	1.5
@@ -1,5 +1,6 @@
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-08-30 15:04:50.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-08-30 18:23:07.000000000 -0400
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-19 22:10:17.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-20 08:11:45.000000000 -0400
 @@ -18,10 +18,10 @@ dnl
  dnl This doesn't depend on gnome support, only on gnome-common, autogen already
  dnl uses gnome-autogen
@@ -15,7 +16,7 @@
  
  dnl
  dnl Required headers
-@@ -62,8 +62,6 @@ AC_CHECK_LIB(nm-util, ieee_802_11_cipher
+@@ -60,8 +60,6 @@ AC_C_BIGENDIAN
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
  		 glib-2.0 >= 2.10
@@ -24,8 +25,54 @@
  		 gtk+-2.0 >= 2.6
  		 libglade-2.0
  		 gconf-2.0
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-08-30 15:02:27.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-08-30 15:45:44.000000000 -0400
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2007-09-19 22:53:14.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-20 08:15:42.000000000 -0400
+@@ -1,8 +1,15 @@
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ noinst_LTLIBRARIES = libgconf-helpers.la
+ 
+ libgconf_helpers_la_SOURCES = gconf-helpers.h gconf-helpers.c
+ 
+ libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
+ 
+-libgconf_helpers_la_LIBADD = $(NMA_LIBS)
++libgconf_helpers_la_LIBADD = $(NMA_LIBS) \
++	-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/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2007-09-20 07:40:37.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-20 08:16:10.000000000 -0400
+@@ -2,6 +2,10 @@ NULL=
+ 
+ bin_PROGRAMS = nm-connection-editor
+ 
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ nm_connection_editor_CPPFLAGS =			\
+ 	$(NMA_CFLAGS)				\
+ 	-DICONDIR=\""$(datadir)/icons"\"	\
+@@ -25,7 +29,9 @@ nm_connection_editor_SOURCES =	\
+ 
+ nm_connection_editor_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
++	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+ 
+ gladedir = $(datadir)/nm-applet
+ glade_DATA = nm-connection-editor.glade
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-09-20 07:43:02.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-20 08:11:45.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -37,12 +84,12 @@
  nm_applet_CPPFLAGS =									\
  	$(NMA_CFLAGS)										\
  	-DICONDIR=\""$(datadir)/icons"\"						\
-@@ -89,7 +93,9 @@ if WITH_NOTIFY
- nm_applet_SOURCES += applet-notifications.c applet-notifications.h
- endif
+@@ -62,7 +66,9 @@ endif
  
--nm_applet_LDADD = $(NMA_LIBS)
-+nm_applet_LDADD = $(NMA_LIBS) \
+ nm_applet_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NetworkManager-0.7.0-missing-includes.patch	31 Aug 2007 04:15:07 -0000	1.2
+++ NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:06:41 -0000	1.3
@@ -1,35 +1,3 @@
---- NetworkManager-0.7.0/src/ppp-manager/nm-ppp-manager.c.missing-includes	2007-08-31 00:04:26.000000000 -0400
-+++ NetworkManager-0.7.0/src/ppp-manager/nm-ppp-manager.c	2007-08-31 00:05:19.000000000 -0400
-@@ -4,6 +4,8 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <string.h>
-+#include <sys/types.h>
-+#include <unistd.h>
- 
- #include "nm-ppp-manager.h"
- #include "nm-dbus-manager.h"
---- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-08-30 14:45:49.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-netlink.c	2007-08-30 23:58:58.000000000 -0400
-@@ -19,6 +19,11 @@
-  * (C) Copyright 2007 Red Hat, Inc.
-  */
- 
-+#include <signal.h>
-+#include <pthread.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #include "nm-netlink.h"
- #include "nm-utils.h"
- 
---- NetworkManager-0.7.0/src/nm-hal-manager.c.missing-includes	2007-08-30 14:45:49.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-hal-manager.c	2007-08-30 23:58:58.000000000 -0400
-@@ -1,3 +1,4 @@
-+#include <signal.h>
- #include <string.h>
- #include <stdlib.h>
- #include <libhal.h>
 --- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-08-30 14:45:35.000000000 -0400
 +++ NetworkManager-0.7.0/test/Makefile.am	2007-08-30 23:58:58.000000000 -0400
 @@ -45,5 +45,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- NetworkManager.spec	31 Aug 2007 04:27:23 -0000	1.164
+++ NetworkManager.spec	20 Sep 2007 14:06:41 -0000	1.165
@@ -7,22 +7,20 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2736
+%define snapshot svn2833
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.1.%{snapshot}%{?dist}
+Release: 0.2.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn129.tar.gz
+Source1: nm-applet-%{version}.svn186.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.7.0-missing-includes.patch
-Patch3: NetworkManager-0.7.0-ppp-manager-fpic.patch
-Patch4: nm-applet-0.7.0-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -122,12 +120,10 @@
 %prep
 %setup -q
 %patch2 -p1 -b .missing-includes
-%patch3 -p1 -b .fpic
 
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch4 -p1 -b .fixes
 
 %build
 # Even though we don't require named, we still build with it
@@ -232,9 +228,10 @@
 
 %files gnome
 %defattr(-,root,root,0755)
-%config %{_sysconfdir}/dbus-1/system.d/nm-applet.conf
+%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_bindir}/nm-applet
 %{_bindir}/nm-vpn-properties
+%{_bindir}/nm-connection-editor
 %{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
 %{_datadir}/nm-applet/
 %{_datadir}/icons/hicolor/22x22/apps/*.png
@@ -252,14 +249,19 @@
 %files glib
 %defattr(-,root,root,0755)
 %{_libdir}/libnm_glib.so.*
+%{_libdir}/libnm_glib_vpn.so.*
 
 %files glib-devel
 %{_includedir}/libnm-glib/*.h
 %{_libdir}/pkgconfig/libnm_glib.pc
 %{_libdir}/libnm_glib.so
+%{_libdir}/libnm_glib_vpn.so
 
 
 %changelog
+* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
+- New SVN snapshot of 0.7 that sucks less
+
 * Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2736
 - Update to SVN snapshot of 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	30 Aug 2007 22:03:19 -0000	1.62
+++ sources	20 Sep 2007 14:06:41 -0000	1.63
@@ -1,2 +1,2 @@
-29fcb5b6f13bf40e806a1a7a81e0f105  NetworkManager-0.7.0.svn2736.tar.gz
-63540152eb1482cdcd68bc1b806672d4  nm-applet-0.7.0.svn129.tar.gz
+da84c73ca684fd3abb154ea51c9a06fe  NetworkManager-0.7.0.svn2833.tar.gz
+98fefe2757a8be652e315b251941ed66  nm-applet-0.7.0.svn186.tar.gz


--- NetworkManager-0.7.0-ppp-manager-fpic.patch DELETED ---


--- nm-applet-0.7.0-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 14:13:58 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 10:13:58 -0400
Subject: rpms/bluez-gnome/devel
	bluez-gnome-0.14-disable-class-selection-with-hal.patch, NONE,
	1.1 bluez-gnome.spec, 1.19, 1.20
Message-ID: <200709201413.l8KEDw2P009342@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	bluez-gnome.spec 
Added Files:
	bluez-gnome-0.14-disable-class-selection-with-hal.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-5
- Don't allow class of the device to be changed if HAL is being
  used (#244261)


bluez-gnome-0.14-disable-class-selection-with-hal.patch:

--- NEW FILE bluez-gnome-0.14-disable-class-selection-with-hal.patch ---
? .deps
? Makefile
? Makefile.in
? bluetooth-manager.schemas
? bluetooth-properties
? bluetooth-properties.desktop
? foo
Index: adapter.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/adapter.c,v
retrieving revision 1.17
diff -u -p -r1.17 adapter.c
--- adapter.c	29 Aug 2007 15:41:49 -0000	1.17
+++ adapter.c	20 Sep 2007 14:09:27 -0000
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include <gconf/gconf-client.h>
+
 #include <dbus/dbus-glib.h>
 
 #include <glib/gi18n.h>
@@ -509,6 +511,21 @@ GtkWidget *create_tree(GtkTreeModel *mod
 	return tree;
 }
 
+static void gconf_callback(GConfClient *client, guint cnxn_id,
+					GConfEntry *entry, gpointer user_data)
+{
+	GConfValue *value;
+
+	if (g_ascii_strcasecmp(entry->key, PREF_USE_HAL) != 0)
+		return;
+
+	value = gconf_entry_get_value(entry);
+	if (value == NULL)
+		return;
+
+	gtk_widget_set_sensitive(GTK_WIDGET(user_data), !gconf_value_get_bool(value));
+}
+
 static void create_adapter(struct adapter_data *adapter)
 {
 	DBusGProxy *object;
@@ -530,8 +547,10 @@ static void create_adapter(struct adapte
 	GtkTreeModel *model;
 	GtkTreeSelection *selection;
 	GSList *group = NULL;
+	GConfClient *gconf;
 	gdouble value;
 	gint index;
+	gboolean use_hal;
 
 	object = dbus_g_proxy_new_for_name(connection, "org.bluez",
 					adapter->path, "org.bluez.Adapter");
@@ -726,6 +745,16 @@ static void create_adapter(struct adapte
 	g_signal_connect(G_OBJECT(combobox), "changed",
 					G_CALLBACK(class_callback), adapter);
 
+	/* Monitor the use_hal preference */
+	gconf = gconf_client_get_default();
+	use_hal = gconf_client_get_bool(gconf, PREF_USE_HAL, NULL);
+	gtk_widget_set_sensitive(combobox, !use_hal);
+
+	gconf_client_add_dir(gconf, PREF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+	gconf_client_notify_add(gconf, PREF_DIR,
+					gconf_callback, combobox, NULL, NULL);
+	g_object_unref(gconf);
+
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
 
Index: general.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/general.c,v
retrieving revision 1.2
diff -u -p -r1.2 general.c
--- general.c	29 Jul 2007 11:28:48 -0000	1.2
+++ general.c	20 Sep 2007 14:09:27 -0000
@@ -32,6 +32,7 @@
 
 #include <gtk/gtk.h>
 
+#include "general.h"
 #include "client.h"
 
 typedef enum {
@@ -42,11 +43,6 @@ typedef enum {
 
 static int icon_policy = ICON_POLICY_PRESENT;
 
-#define PREF_DIR		"/apps/bluetooth-manager"
-#define PREF_USE_HAL		PREF_DIR "/use_hal"
-#define PREF_ICON_POLICY	PREF_DIR "/icon_policy"
-#define PREF_AUTO_AUTHORIZE	PREF_DIR "/auto_authorize"
-
 static GConfEnumStringPair icon_policy_enum_map [] = {
 	{ ICON_POLICY_NEVER,	"never"		},
 	{ ICON_POLICY_ALWAYS,	"always"	},
Index: general.h
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/general.h,v
retrieving revision 1.1
diff -u -p -r1.1 general.h
--- general.h	29 Jul 2007 11:11:03 -0000	1.1
+++ general.h	20 Sep 2007 14:09:27 -0000
@@ -22,6 +22,11 @@
  *
  */
 
+#define PREF_DIR		"/apps/bluetooth-manager"
+#define PREF_USE_HAL		PREF_DIR "/use_hal"
+#define PREF_ICON_POLICY	PREF_DIR "/icon_policy"
+#define PREF_AUTO_AUTHORIZE	PREF_DIR "/auto_authorize"
+
 GtkWidget *create_label(const gchar *str);
 GtkWidget *create_general(void);
 void setup_general(void);


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bluez-gnome.spec	20 Sep 2007 12:44:33 -0000	1.19
+++ bluez-gnome.spec	20 Sep 2007 14:13:25 -0000	1.20
@@ -1,12 +1,13 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
+Patch1:		bluez-gnome-0.14-disable-class-selection-with-hal.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +41,9 @@
 
 %prep
 %setup -q
+pushd properties
+%patch1 -p0 -b .use-hal
+popd
 
 %build
 %configure --disable-mime-update --disable-desktop-update
@@ -119,6 +123,10 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-5
+- Don't allow class of the device to be changed if HAL is being
+  used (#244261)
+
 * Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
 - Only show and start the bluez-gnome bits in GNOME (#258721)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:15:10 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Thu, 20 Sep 2007 10:15:10 -0400
Subject: rpms/tig/devel .cvsignore,1.3,1.4 sources,1.3,1.4 tig.spec,1.4,1.5
Message-ID: <200709201415.l8KEFAPH009473@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/tig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9443

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
tig-0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jun 2007 13:35:43 -0000	1.3
+++ .cvsignore	20 Sep 2007 14:14:37 -0000	1.4
@@ -1 +1 @@
-tig-0.8.tar.gz
+tig-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jun 2007 13:35:43 -0000	1.3
+++ sources	20 Sep 2007 14:14:37 -0000	1.4
@@ -1 +1 @@
-4f74cd15f0c132e060088fbd9fe92a4b  tig-0.8.tar.gz
+29576aee510e0cd1a16702560cf487ce  tig-0.9.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/tig.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tig.spec	24 Aug 2007 00:49:01 -0000	1.4
+++ tig.spec	20 Sep 2007 14:14:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           tig
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
 Group:          Development/Tools
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 James Bowes <jbowes at redhat.com> - 0.9-1
+- tig-0.9
+
 * Thu Aug 23 2007 James Bowes <jbowes at redhat.com> - 0.8-2
 - Mark license as GPLv2+
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:25:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:25:05 -0400
Subject: rpms/kdelibs/devel .cvsignore, 1.40.2.3, 1.40.2.4 kde4.csh, 1.1.2.4,
	1.1.2.5 kde4.sh, 1.1.2.4, 1.1.2.5 kdelibs.spec, 1.223.2.22,
	1.223.2.23 sources, 1.51.2.2, 1.51.2.3
Message-ID: <200709201425.l8KEP5Ql011986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603

Modified Files:
      Tag: kdelibs-kde4-branch
	.cvsignore kde4.csh kde4.sh kdelibs.spec sources 
Log Message:
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -u -r1.40.2.3 -r1.40.2.4
--- .cvsignore	29 Jul 2007 00:44:09 -0000	1.40.2.3
+++ .cvsignore	20 Sep 2007 14:24:32 -0000	1.40.2.4
@@ -1,3 +1,3 @@
 clog
-kdelibs-3.91.0.tar.bz2
 kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,12 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
+#if ( -f /etc/sysconfig/prelink ) then
+#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+#   if ( "$PRELINKING" == "yes" )  then
       if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-endif
+#   endif
+#endif
 
 ## if not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,11 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+#if [ -f /etc/sysconfig/prelink ]; then
+#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
-fi
+#  fi
+#fi
 
 ## if not using IP6, speeds DNS operations
 # [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.22
retrieving revision 1.223.2.23
diff -u -r1.223.2.22 -r1.223.2.23
--- kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
+++ kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,11 +95,12 @@
 %endif
 Requires: qt4-devel
 Requires: openssl-devel
+Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 ## FIXME/TODO: trim these down  -- Rex
 #Requires: libxslt-devel aspell-devel giflib-devel
-#Requires: libpng-devel bzip2-devel libacl-devel gettext-devel
+#Requires: libpng-devel gettext-devel
 #Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
-#Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
+#Requires: krb5-devel
 #Requires: alsa-lib-devel avahi-devel
 %description devel
 This package includes the header files you will need to compile
@@ -123,7 +124,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
@@ -229,6 +230,11 @@
 
 
 %changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
+- update sources
+- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
+
 * Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
 - rename js to kjs because of file conflict (kde#149840)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -r1.51.2.2 -r1.51.2.3
--- sources	29 Jul 2007 00:44:09 -0000	1.51.2.2
+++ sources	20 Sep 2007 14:24:32 -0000	1.51.2.3
@@ -1 +1 @@
-1a32d2892c9a7ac4a7fd4d77a86f720b  kdelibs-3.92.0.tar.bz2
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:27:15 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Sep 2007 10:27:15 -0400
Subject: rpms/lilypond/F-7 .cvsignore, 1.16, 1.17 lilypond.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <200709201427.l8KERF2s012071@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release. Fix licence tag and source URL.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Mar 2007 15:12:11 -0000	1.16
+++ .cvsignore	20 Sep 2007 14:26:39 -0000	1.17
@@ -1 +1 @@
-lilypond-2.10.20.tar.gz
+lilypond-2.10.33.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/lilypond.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lilypond.spec	20 Mar 2007 15:12:11 -0000	1.16
+++ lilypond.spec	20 Sep 2007 14:26:39 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		lilypond
-Version:	2.10.20
+Version:	2.10.33
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
-License:	GPL
+License:	GPLv2
 URL:		http://www.lilypond.org
-Source0:	http://www.lilypond.org/download/sources/v2.10/%{name}-%{version}.tar.gz
+Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -92,6 +92,11 @@
 
 
 %changelog
+* Thu Aug 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.33-1
+- New release (closes bug 297911).
+- Fix licence tag.
+- Fix source URL.
+
 * Tue Mar 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.10.20-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Mar 2007 15:12:11 -0000	1.16
+++ sources	20 Sep 2007 14:26:39 -0000	1.17
@@ -1 +1 @@
-7d6b8476d0d23b97945c579402794c20  lilypond-2.10.20.tar.gz
+86a67fcc404e942be723f8a72988b286  lilypond-2.10.33.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 14:28:04 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Thu, 20 Sep 2007 10:28:04 -0400
Subject: rpms/elinks/F-7 .cvsignore, 1.19, 1.20 elinks-0.11.1-negotiate.patch,
	1.2, 1.3 elinks.spec, 1.39, 1.40 sources, 1.19, 1.20
Message-ID: <200709201428.l8KES4kr012147@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore elinks-0.11.1-negotiate.patch elinks.spec sources 
Log Message:
update to latest upstream version(#297981 security issue)+changes already done in devel(licensing,package review updates)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Mar 2007 11:13:51 -0000	1.19
+++ .cvsignore	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-elinks-0.11.2.tar.bz2
+elinks-0.11.3.tar.bz2

elinks-0.11.1-negotiate.patch:

Index: elinks-0.11.1-negotiate.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks-0.11.1-negotiate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elinks-0.11.1-negotiate.patch	12 Jun 2006 21:11:25 -0000	1.2
+++ elinks-0.11.1-negotiate.patch	20 Sep 2007 14:27:31 -0000	1.3
@@ -352,28 +352,18 @@
  
  struct http_version {
  	int major;
-@@ -551,7 +554,7 @@
- 	int trace = get_opt_bool("protocol.http.trace");
- 	struct string header;
- 	unsigned char *post_data = NULL;
--	struct auth_entry *entry;
-+	struct auth_entry *entry = NULL;
- 	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
- 	unsigned char *optstr;
- 	int use_connect, talking_to_proxy;
-@@ -808,7 +811,11 @@
- 		add_crlf_to_string(&header);
+@@ -846,7 +849,11 @@
  	}
  
--	entry = find_auth(uri);
+  	/* CONNECT: The Authorization header is for the origin server only.  */
 +#ifdef CONFIG_GSSAPI
-+	if (http_negotiate_output(uri, &header) != 0)
++	if (http_negotiate_output(uri, &header) != 0) {
++#else
+  	if (!use_connect) {
 +#endif
-+		entry = find_auth(uri);
-+	
+ 		entry = find_auth(uri);
+  	}
  	if (entry) {
- 		if (entry->digest) {
- 			unsigned char *response;
 @@ -1327,12 +1334,13 @@
  	return 0;
  }


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/elinks.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elinks.spec	26 Mar 2007 11:13:51 -0000	1.39
+++ elinks.spec	20 Sep 2007 14:27:31 -0000	1.40
@@ -1,18 +1,14 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.11.2
+Version:   0.11.3
 Release:   1%{?dist}
-License:   GPL
+License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}.tar.bz2
+Source:    http://elinks.or.cz/download/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: pkgconfig
 BuildRequires: openssl-devel
-BuildRequires: krb5-devel
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: libidn-devel
@@ -29,7 +25,7 @@
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
 Patch7: elinks-0.11.1-negotiate.patch
-Patch8: elinks-0.11.1-badproxy.patch
+Patch8: elinks-0.11.3-macropen.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -55,7 +51,7 @@
 %patch6 -p1
 # Fix #194096 ??? elinks should support negotiate-auth
 %patch7 -p1
-# Fix #210103 - elinks crashes when given bad HTTP_PROXY
+# Fix for open macro in new glibc 
 %patch8 -p1
 
 %build
@@ -78,7 +74,7 @@
 
 %files -f elinks.lang
 %defattr(-,root,root)
-%doc README SITES TODO
+%doc README SITES TODO COPYING
 %{_bindir}/links
 %{_bindir}/elinks
 %{_mandir}/man1/links.1*
@@ -86,6 +82,15 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 20 2007 Ondrej Vasik <ovasik at redhat.com> 0.11.3-1
+- update to new upstream version (required for #297981)
+- removed patch for #210103 , included in upstream release
+- updated patch elinks-0.11.1-negotiate.patch to pass build
+- fix of open macro(new glibc) by Joe Orton
+- changed license tag to GPLv2
+- added License file to doc, cleanup of dups in buildreq
+- (from package review by Tyler Owen(#225725))
+
 * Mon Mar 26 2007 Karel Zak <kzak at redhat.com> 0.11.2-1
 - update to new upstream version
 - cleanup spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Mar 2007 11:13:52 -0000	1.19
+++ sources	20 Sep 2007 14:27:31 -0000	1.20
@@ -1 +1 @@
-5a8f83afb527cf443f58b372136a81fc  elinks-0.11.2.tar.bz2
+a0eb50e18a2ac8e77d6b0df8f94bb5a6  elinks-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:28:50 2007
From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik))
Date: Thu, 20 Sep 2007 10:28:50 -0400
Subject: rpms/elinks/F-7 elinks-0.11.3-macropen.patch,NONE,1.1
Message-ID: <200709201428.l8KESotR012178@cvs-int.fedora.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12169

Added Files:
	elinks-0.11.3-macropen.patch 
Log Message:
forgot to add patch in last commit

elinks-0.11.3-macropen.patch:

--- NEW FILE elinks-0.11.3-macropen.patch ---
--- elinks-0.11.3/src/encoding/encoding.c.macropen
+++ elinks-0.11.3/src/encoding/encoding.c
@@ -117,7 +117,7 @@
	if (!stream) return NULL;

	stream->encoding = encoding;
-	if (decoding_backends[stream->encoding]->open(stream, fd) >= 0)
+	if ((decoding_backends[stream->encoding]->open)(stream, fd) >= 0)
		return stream;

	mem_free(stream);



From fedora-extras-commits at redhat.com  Thu Sep 20 14:32:43 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 10:32:43 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-missing-includes.patch, 1.3, 1.4
Message-ID: <200709201432.l8KEWh8J012384@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12363

Modified Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
Fix build error due to missing include on ppc

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:06:41 -0000	1.3
+++ NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:32:38 -0000	1.4
@@ -1,7 +1,19 @@
---- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-08-30 14:45:35.000000000 -0400
-+++ NetworkManager-0.7.0/test/Makefile.am	2007-08-30 23:58:58.000000000 -0400
-@@ -45,5 +45,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
- 			$(top_builddir)/utils/libnmutils.la \
+diff -up NetworkManager-0.7.0/src/nm-netlink.c.missing-includes NetworkManager-0.7.0/src/nm-netlink.c
+--- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-09-20 10:29:48.000000000 -0400
++++ NetworkManager-0.7.0/src/nm-netlink.c	2007-09-20 10:29:59.000000000 -0400
+@@ -23,6 +23,7 @@
+ #include "nm-utils.h"
+ 
+ #include <glib.h>
++#include <signal.h>
+ #include <pthread.h>
+ #include <unistd.h>
+ 
+diff -up NetworkManager-0.7.0/test/Makefile.am.missing-includes NetworkManager-0.7.0/test/Makefile.am
+--- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-09-13 07:43:42.000000000 -0400
++++ NetworkManager-0.7.0/test/Makefile.am	2007-09-20 09:08:57.000000000 -0400
+@@ -38,5 +38,3 @@ libnm_glib_test_LDADD =	$(DBUS_LIBS) $(G
+ 			$(top_builddir)/libnm-glib/libnm_glib.la \
  			$(top_builddir)/libnm-util/libnm-util.la
  
 -nm_supplicant_test_SOURCES = nm-supplicant-test.c



From fedora-extras-commits at redhat.com  Thu Sep 20 14:38:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:38:08 -0400
Subject: rpms/kdelibs/devel kde.csh,1.5,1.6 kde.sh,1.7,1.8
Message-ID: <200709201438.l8KEc8nE012679@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12646

Modified Files:
	kde.csh kde.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde.csh	3 Aug 2007 14:23:17 -0000	1.5
+++ kde.csh	20 Sep 2007 14:37:35 -0000	1.6
@@ -1,17 +1,17 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
+## Make sure KDEDIRS is set
+if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
+
 ##  When/if using prelinking, avoids (some) use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 ## if not using IPv6, speeds DNS operations
 # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
 
-## Make sure KDEDIRS is set
-if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde.sh	3 Aug 2007 14:23:17 -0000	1.7
+++ kde.sh	20 Sep 2007 14:37:35 -0000	1.8
@@ -1,15 +1,12 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
-## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -f /etc/sysconfig/prelink ]; then
-#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#  fi
-#fi
-
-## if not using IPv6, speeds DNS operations
-#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
 ## Make sure KDEDIRS is set
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
+
+## When/if using prelinking, avoids (some) use of kdeinit
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+  fi
+fi



From fedora-extras-commits at redhat.com  Thu Sep 20 14:39:47 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:39:47 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.61,
	1.62 selinux-policy.spec, 1.524, 1.525
Message-ID: <200709201439.l8KEdljU012761@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12707

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
- Allow xserver to search devpts_t
- Dontaudit ldconfig output to homedir


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- policy-20070703.patch	19 Sep 2007 17:40:59 -0000	1.61
+++ policy-20070703.patch	20 Sep 2007 14:39:14 -0000	1.62
@@ -1145,7 +1145,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.0.8/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/usermanage.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/usermanage.te	2007-09-19 16:12:56.000000000 -0400
 @@ -92,6 +92,7 @@
  dev_read_urand(chfn_t)
  
@@ -1154,7 +1154,15 @@
  auth_dontaudit_read_shadow(chfn_t)
  
  # allow checking if a shell is executable
-@@ -520,6 +521,10 @@
+@@ -297,6 +298,7 @@
+ term_use_all_user_ttys(passwd_t)
+ term_use_all_user_ptys(passwd_t)
+ 
++auth_domtrans_chk_passwd(passwd_t)
+ auth_manage_shadow(passwd_t)
+ auth_relabel_shadow(passwd_t)
+ auth_etc_filetrans_shadow(passwd_t)
+@@ -520,6 +522,10 @@
  mta_manage_spool(useradd_t)
  
  optional_policy(`
@@ -1165,7 +1173,7 @@
  	dpkg_use_fds(useradd_t)
  	dpkg_rw_pipes(useradd_t)
  ')
-@@ -529,6 +534,12 @@
+@@ -529,6 +535,12 @@
  ')
  
  optional_policy(`
@@ -1452,7 +1460,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 08:56:23.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1472,7 +1480,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,53 @@
+@@ -166,6 +165,57 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1515,6 +1523,10 @@
 +	domain_type($1_java_t)
 +	domain_entry_file($1_java_t,java_exec_t)
 +	role $3 types $1_java_t;
++	
++	domain_interactive_fd($1_java_t)
++
++	userdom_unpriv_usertype($1, $1_java_t)
 +
 +	allow $1_java_t self:process { execheap execmem };
 +
@@ -1526,7 +1538,7 @@
  ')
  
  ########################################
-@@ -219,3 +265,66 @@
+@@ -219,3 +269,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -1606,8 +1618,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-17 16:20:18.000000000 -0400
-@@ -18,3 +18,98 @@
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 08:56:35.000000000 -0400
+@@ -18,3 +18,102 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
  ')
@@ -1698,6 +1710,10 @@
 +	domain_entry_file($1_mono_t,mono_exec_t)
 +	role $3 types $1_mono_t;
 +
++	domain_interactive_fd($1_mono_t)
++
++	userdom_unpriv_usertype($1, $1_mono_t)
++
 +	allow $1_mono_t self:process { execheap execmem };
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
@@ -2105,8 +2121,8 @@
  allow vmware_host_t self:rawip_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.0.8/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/wine.if	2007-09-17 16:20:18.000000000 -0400
-@@ -18,3 +18,34 @@
++++ serefpolicy-3.0.8/policy/modules/apps/wine.if	2007-09-20 08:56:45.000000000 -0400
+@@ -18,3 +18,84 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, wine_exec_t, wine_t)
  ')
@@ -2141,9 +2157,59 @@
 +	role $2 types wine_t;
 +	allow wine_t $3:chr_file rw_term_perms;
 +')
++
++#######################################
++## <summary>
++##	The per role template for the wine module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for wine applications.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++#
++template(`wine_per_role_template',`
++	gen_require(`
++		type wine_exec_t;
++	')
++
++	type $1_wine_t;
++	domain_type($1_wine_t)
++	domain_entry_file($1_wine_t,wine_exec_t)
++	role $3 types $1_wine_t;
++
++	domain_interactive_fd($1_wine_t)
++
++	userdom_unpriv_usertype($1, $1_wine_t)
++
++	allow $1_wine_t self:process { execheap execmem };
++
++	domtrans_pattern($2, wine_exec_t, $1_wine_t)
++
++	optional_policy(`
++		xserver_xdm_rw_shm($1_wine_t)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.0.8/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/wine.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/wine.te	2007-09-20 09:45:04.000000000 -0400
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -2166,7 +2232,7 @@
 +')
 +
 +optional_policy(`
-+	xserver_xdm_rw_shm(mono_t)
++	xserver_xdm_rw_shm(wine_t)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
@@ -4294,6 +4360,34 @@
 +optional_policy(`
 +	mailscanner_manage_spool(clamscan_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.0.8/policy/modules/services/consolekit.if
+--- nsaserefpolicy/policy/modules/services/consolekit.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/consolekit.if	2007-09-20 08:49:41.000000000 -0400
+@@ -38,3 +38,24 @@
+ 	allow $1 consolekit_t:dbus send_msg;
+ 	allow consolekit_t $1:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++##	dontaudit  send and receive messages from
++##	consolekit over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`consolekit_dontaudit_dbus_chat',`
++	gen_require(`
++		type consolekit_t;
++		class dbus send_msg;
++	')
++
++	dontaudit $1 consolekit_t:dbus send_msg;
++	dontaudit consolekit_t $1:dbus send_msg;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.0.8/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/consolekit.te	2007-09-17 16:20:18.000000000 -0400
@@ -6788,9 +6882,37 @@
  
  ########################################
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.8/policy/modules/services/networkmanager.if
+--- nsaserefpolicy/policy/modules/services/networkmanager.if	2007-06-15 14:54:33.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2007-09-20 08:50:57.000000000 -0400
+@@ -97,3 +97,24 @@
+ 	allow $1 NetworkManager_t:dbus send_msg;
+ 	allow NetworkManager_t $1:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++##	dontaudit  send and receive messages from
++##	NetworkManager over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`networkmanager_dontaudit_dbus_chat',`
++	gen_require(`
++		type NetworkManager_t;
++		class dbus send_msg;
++	')
++
++	dontaudit $1 NetworkManager_t:dbus send_msg;
++	dontaudit NetworkManager_t $1:dbus send_msg;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-20 08:50:29.000000000 -0400
 @@ -20,7 +20,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -9342,7 +9464,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-19 11:59:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 09:43:06.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9412,7 +9534,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,46 @@
+@@ -555,25 +558,49 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9426,10 +9548,12 @@
  	userdom_search_user_home_dirs($1,$2)
 -	# for .xsession-errors
 -	userdom_dontaudit_write_user_home_content_files($1,$2)
--
 +	userdom_manage_user_home_content_dirs($1, xdm_t)
 +	userdom_manage_user_home_content_files($1, xdm_t)
 +	userdom_user_home_dir_filetrans_user_home_content($1, xdm_t, { dir file })
++	userdom_manage_user_tmp_dirs($1, xdm_t)
++	userdom_manage_user_tmp_files($1, xdm_t)
+ 
  	xserver_ro_session_template(xdm,$2,$3)
 -	xserver_rw_session_template($1,$2,$3)
 -	xserver_use_user_fonts($1,$2)
@@ -9468,7 +9592,7 @@
  	')
  ')
  
-@@ -626,6 +650,24 @@
+@@ -626,6 +653,24 @@
  
  ########################################
  ## <summary>
@@ -9493,7 +9617,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +701,73 @@
+@@ -659,6 +704,73 @@
  
  ########################################
  ## <summary>
@@ -9567,7 +9691,15 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -987,6 +1096,37 @@
+@@ -927,6 +1039,7 @@
+ 	files_search_tmp($1)
+ 	allow $1 xdm_tmp_t:dir list_dir_perms;
+ 	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
++	allow $1 xdm_tmp_t:sock_file unlink;
+ ')
+ 
+ ########################################
+@@ -987,6 +1100,37 @@
  
  ########################################
  ## <summary>
@@ -9605,7 +9737,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1276,7 @@
+@@ -1136,7 +1280,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9614,7 +9746,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1465,62 @@
+@@ -1325,3 +1469,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9894,7 +10026,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 09:08:43.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -9905,16 +10037,17 @@
  	allow $1_chkpwd_t self:process getattr;
  
  	files_list_etc($1_chkpwd_t)
-@@ -107,7 +108,7 @@
+@@ -106,9 +107,6 @@
+ 	role $3 types $1_chkpwd_t;
  	role $3 types system_chkpwd_t;
  
- 	# cjp: is this really needed?
+-	# cjp: is this really needed?
 -	allow $2 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
-+	logging_send_audit_msgs($2)
- 
+-
  	dontaudit $2 shadow_t:file { getattr read };
  
-@@ -169,6 +170,9 @@
+ 	# Transition from the user domain to this domain.
+@@ -169,6 +167,9 @@
  ## </param>
  #
  interface(`auth_login_pgm_domain',`
@@ -9924,7 +10057,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +180,23 @@
+@@ -176,11 +177,23 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -9948,7 +10081,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +212,33 @@
+@@ -196,22 +209,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -9983,7 +10116,7 @@
  	')
  ')
  
-@@ -309,9 +336,6 @@
+@@ -309,9 +333,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -9993,7 +10126,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +353,7 @@
+@@ -329,6 +350,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10001,7 +10134,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +372,37 @@
+@@ -347,6 +369,37 @@
  
  ########################################
  ## <summary>
@@ -10039,7 +10172,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +751,24 @@
+@@ -695,6 +748,24 @@
  
  ########################################
  ## <summary>
@@ -10064,7 +10197,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1392,9 @@
+@@ -1318,14 +1389,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10079,7 +10212,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1450,163 @@
+@@ -1381,3 +1447,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -11970,7 +12103,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 09:37:08.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -12022,12 +12155,12 @@
 +#
 +interface(`seutil_domtrans_setsebool',`
 +	gen_require(`
-+		type semanage_t, setsebool_exec_t;
++		type setsebool_t, setsebool_exec_t;
 +	')
 +
 +	files_search_usr($1)
 +	corecmd_search_bin($1)
-+	domtrans_pattern($1,setsebool_exec_t,semanage_t)
++	domtrans_pattern($1,setsebool_exec_t,setsebool_t)
 +')
 +
 +########################################
@@ -12084,7 +12217,7 @@
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1058,3 +1134,120 @@
+@@ -1058,3 +1134,124 @@
  	files_search_etc($1)
  	rw_files_pattern($1,selinux_config_t,semanage_trans_lock_t)
  ')
@@ -12157,6 +12290,9 @@
 +	allow $1 self:unix_dgram_socket create_socket_perms;
 +	logging_send_audit_msgs($1)
 +
++	# Running genhomedircon requires this for finding all users
++	auth_use_nsswitch($1)
++
 +	allow $1 policy_config_t:file { read write };
 +
 +	allow $1 semanage_tmp_t:dir manage_dir_perms;
@@ -12197,6 +12333,7 @@
 +
 +	miscfiles_read_localization($1)
 +
++	seutil_search_default_contexts($1)
 +	seutil_domtrans_loadpolicy($1)
 +	seutil_read_config($1)
 +	seutil_manage_bin_policy($1)
@@ -12207,7 +12344,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 09:31:29.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12349,6 +12486,8 @@
  #
 +seutil_semanage_policy(setsebool_t)
 +selinux_set_boolean(setsebool_t)
++# Bug in semanage
++seutil_domtrans_setfiles(setsebool_t)
  
 -allow semanage_t self:capability { dac_override audit_write };
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
@@ -12383,25 +12522,25 @@
 -selinux_getattr_fs(semanage_t)
 -# for setsebool:
 -selinux_set_boolean(semanage_t)
+-
+-term_use_all_terms(semanage_t)
+-
+-# Running genhomedircon requires this for finding all users
+-auth_use_nsswitch(semanage_t)
+-
+-libs_use_ld_so(semanage_t)
+-libs_use_shared_libs(semanage_t)
+-
+-locallogin_use_fds(semanage_t)
 +########################################
 +#
 +# semodule local policy
 +#
  
--term_use_all_terms(semanage_t)
+-logging_send_syslog_msg(semanage_t)
 +seutil_semanage_policy(semanage_t)
 +can_exec(semanage_t, semanage_exec_t)
  
- # Running genhomedircon requires this for finding all users
- auth_use_nsswitch(semanage_t)
--
--libs_use_ld_so(semanage_t)
--libs_use_shared_libs(semanage_t)
--
--locallogin_use_fds(semanage_t)
--
--logging_send_syslog_msg(semanage_t)
--
 -miscfiles_read_localization(semanage_t)
 +# Admins are creating pp files in random locations
 +auth_read_all_files_except_shadow(semanage_t)
@@ -12992,39 +13131,151 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-19 13:32:51.000000000 -0400
-@@ -45,7 +45,7 @@
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 09:09:10.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	')
+ 
+ 	attribute $1_file_type;
++	attribute $1_usertype;
+ 
+-	type $1_t, userdomain;
++	type $1_t, userdomain, $1_usertype;
+ 	domain_type($1_t)
+ 	corecmd_shell_entry_type($1_t)
+ 	corecmd_bin_entry_type($1_t)
+@@ -45,65 +46,69 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
  
 -	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession };
-+	allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
- 	allow $1_t self:fd use;
- 	allow $1_t self:fifo_file rw_fifo_file_perms;
- 	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -62,6 +62,10 @@
- 
- 	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
- 
-+	application_exec_all($1_t)
-+
-+	auth_use_nsswitch($1_t)
-+
- 	kernel_read_kernel_sysctls($1_t)
- 	kernel_dontaudit_list_unlabeled($1_t)
- 	kernel_dontaudit_getattr_unlabeled_files($1_t)
-@@ -114,6 +118,10 @@
+-	allow $1_t self:fd use;
+-	allow $1_t self:fifo_file rw_fifo_file_perms;
+-	allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
+-	allow $1_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-	allow $1_t self:shm create_shm_perms;
+-	allow $1_t self:sem create_sem_perms;
+-	allow $1_t self:msgq create_msgq_perms;
+-	allow $1_t self:msg { send receive };
+-	allow $1_t self:context contains;
+-	dontaudit $1_t self:socket create;
+-
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+-	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
+-
+-	kernel_read_kernel_sysctls($1_t)
+-	kernel_dontaudit_list_unlabeled($1_t)
+-	kernel_dontaudit_getattr_unlabeled_files($1_t)
+-	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
+-	kernel_dontaudit_getattr_unlabeled_pipes($1_t)
+-	kernel_dontaudit_getattr_unlabeled_sockets($1_t)
+-	kernel_dontaudit_getattr_unlabeled_blk_files($1_t)
+-	kernel_dontaudit_getattr_unlabeled_chr_files($1_t)
++	allow $1_t $1_usertype:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
++	allow $1_usertype $1_usertype:fd use;
++	allow $1_usertype $1_usertype:fifo_file rw_fifo_file_perms;
++	allow $1_usertype $1_usertype:unix_dgram_socket { create_socket_perms sendto };
++	allow $1_usertype $1_usertype:unix_stream_socket { create_stream_socket_perms connectto };
++	allow $1_usertype $1_usertype:shm create_shm_perms;
++	allow $1_usertype $1_usertype:sem create_sem_perms;
++	allow $1_usertype $1_usertype:msgq create_msgq_perms;
++	allow $1_usertype $1_usertype:msg { send receive };
++	allow $1_usertype $1_usertype:context contains;
++	dontaudit $1_usertype $1_usertype:socket create;
++
++	allow $1_usertype $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
++	term_create_pty($1_usertype,$1_devpts_t)
++
++	allow $1_usertype $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
++
++	application_exec_all($1_usertype)
++
++	auth_use_nsswitch($1_usertype)
++
++	kernel_read_kernel_sysctls($1_usertype)
++	kernel_dontaudit_list_unlabeled($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_files($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_symlinks($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_pipes($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_sockets($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_blk_files($1_usertype)
++	kernel_dontaudit_getattr_unlabeled_chr_files($1_usertype)
+ 
+ 	# When the user domain runs ps, there will be a number of access
+ 	# denials when ps tries to search /proc.  Do not audit these denials.
+-	domain_dontaudit_read_all_domains_state($1_t)
+-	domain_dontaudit_getattr_all_domains($1_t)
+-	domain_dontaudit_getsession_all_domains($1_t)
+-
+-	files_read_etc_files($1_t)
+-	files_read_etc_runtime_files($1_t)
+-	files_read_usr_files($1_t)
++	domain_dontaudit_read_all_domains_state($1_usertype)
++	domain_dontaudit_getattr_all_domains($1_usertype)
++	domain_dontaudit_getsession_all_domains($1_usertype)
++
++	files_read_etc_files($1_usertype)
++	files_read_etc_runtime_files($1_usertype)
++	files_read_usr_files($1_usertype)
+ 	# Read directories and files with the readable_t type.
+ 	# This type is a general type for "world"-readable files.
+-	files_list_world_readable($1_t)
+-	files_read_world_readable_files($1_t)
+-	files_read_world_readable_symlinks($1_t)
+-	files_read_world_readable_pipes($1_t)
+-	files_read_world_readable_sockets($1_t)
++	files_list_world_readable($1_usertype)
++	files_read_world_readable_files($1_usertype)
++	files_read_world_readable_symlinks($1_usertype)
++	files_read_world_readable_pipes($1_usertype)
++	files_read_world_readable_sockets($1_usertype)
+ 	# old broswer_domain():
+-	files_dontaudit_list_non_security($1_t)
+-	files_dontaudit_getattr_non_security_files($1_t)
+-	files_dontaudit_getattr_non_security_symlinks($1_t)
+-	files_dontaudit_getattr_non_security_pipes($1_t)
+-	files_dontaudit_getattr_non_security_sockets($1_t)
+-	files_dontaudit_getattr_non_security_blk_files($1_t)
+-	files_dontaudit_getattr_non_security_chr_files($1_t)
+-
+-	libs_use_ld_so($1_t)
+-	libs_use_shared_libs($1_t)
+-	libs_exec_ld_so($1_t)
++	files_dontaudit_list_non_security($1_usertype)
++	files_dontaudit_getattr_non_security_files($1_usertype)
++	files_dontaudit_getattr_non_security_symlinks($1_usertype)
++	files_dontaudit_getattr_non_security_pipes($1_usertype)
++	files_dontaudit_getattr_non_security_sockets($1_usertype)
++	files_dontaudit_getattr_non_security_blk_files($1_usertype)
++	files_dontaudit_getattr_non_security_chr_files($1_usertype)
++
++	libs_use_ld_so($1_usertype)
++	libs_use_shared_libs($1_usertype)
++	libs_exec_ld_so($1_usertype)
+ 
+-	miscfiles_read_localization($1_t)
+-	miscfiles_read_certs($1_t)
++	miscfiles_read_localization($1_usertype)
++	miscfiles_read_certs($1_usertype)
+ 
+-	sysnet_read_config($1_t)
++	sysnet_read_config($1_usertype)
+ 
+ 	tunable_policy(`allow_execmem',`
+ 		# Allow loading DSOs that require executable stack.
+@@ -114,6 +119,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
  	')
 +
 +	optional_policy(`
-+		ssh_rw_stream_sockets($1_t)
++		ssh_rw_stream_sockets($1_usertype)
 +	')
  ')
  
  #######################################
-@@ -184,7 +192,7 @@
+@@ -184,7 +193,7 @@
  	files_list_home($1_t)
  
  	tunable_policy(`use_nfs_home_dirs',`
@@ -13033,7 +13284,7 @@
  		fs_read_nfs_files($1_t)
  		fs_read_nfs_symlinks($1_t)
  		fs_read_nfs_named_sockets($1_t)
-@@ -195,7 +203,7 @@
+@@ -195,7 +204,7 @@
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
@@ -13042,41 +13293,133 @@
  		fs_read_cifs_files($1_t)
  		fs_read_cifs_symlinks($1_t)
  		fs_read_cifs_named_sockets($1_t)
-@@ -315,13 +323,19 @@
+@@ -262,42 +271,42 @@
+ 
+ 	# full control of the home directory
+ 	allow $1_t $1_home_t:file entrypoint;
+-	manage_dirs_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_lnk_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_sock_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_fifo_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_dirs_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_lnk_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_sock_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	relabel_fifo_files_pattern($1_t,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	filetrans_pattern($1_t,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
+-	files_list_home($1_t)
++	manage_dirs_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_lnk_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_sock_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_fifo_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_dirs_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_lnk_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_sock_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	relabel_fifo_files_pattern($1_usertype,{ $1_home_dir_t $1_home_t },$1_home_t)
++	filetrans_pattern($1_usertype,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
++	files_list_home($1_usertype)
+ 
+ 	# cjp: this should probably be removed:
+-	allow $1_t $1_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
++	allow $1_usertype $1_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
+ 
+ 	tunable_policy(`use_nfs_home_dirs',`
+-		fs_manage_nfs_dirs($1_t)
+-		fs_manage_nfs_files($1_t)
+-		fs_manage_nfs_symlinks($1_t)
+-		fs_manage_nfs_named_sockets($1_t)
+-		fs_manage_nfs_named_pipes($1_t)
++		fs_manage_nfs_dirs($1_usertype)
++		fs_manage_nfs_files($1_usertype)
++		fs_manage_nfs_symlinks($1_usertype)
++		fs_manage_nfs_named_sockets($1_usertype)
++		fs_manage_nfs_named_pipes($1_usertype)
+ 	',`
+-		fs_dontaudit_manage_nfs_dirs($1_t)
+-		fs_dontaudit_manage_nfs_files($1_t)
++		fs_dontaudit_manage_nfs_dirs($1_usertype)
++		fs_dontaudit_manage_nfs_files($1_usertype)
+ 	')
+ 
+ 	tunable_policy(`use_samba_home_dirs',`
+-		fs_manage_cifs_dirs($1_t)
+-		fs_manage_cifs_files($1_t)
+-		fs_manage_cifs_symlinks($1_t)
+-		fs_manage_cifs_named_sockets($1_t)
+-		fs_manage_cifs_named_pipes($1_t)
++		fs_manage_cifs_dirs($1_usertype)
++		fs_manage_cifs_files($1_usertype)
++		fs_manage_cifs_symlinks($1_usertype)
++		fs_manage_cifs_named_sockets($1_usertype)
++		fs_manage_cifs_named_pipes($1_usertype)
+ 	',`
+-		fs_dontaudit_manage_cifs_dirs($1_t)
+-		fs_dontaudit_manage_cifs_files($1_t)
++		fs_dontaudit_manage_cifs_dirs($1_usertype)
++		fs_dontaudit_manage_cifs_files($1_usertype)
+ 	')
+ ')
+ 
+@@ -315,14 +324,20 @@
  ## <rolebase/>
  #
  template(`userdom_exec_home_template',`
 -	can_exec($1_t,$1_home_t)
  
 -	tunable_policy(`use_nfs_home_dirs',`
+-		fs_exec_nfs_files($1_t)
 +	tunable_policy(`allow_$1_exec_content', `
-+		can_exec($1_t,$1_home_t)
++		can_exec($1_usertype,$1_home_t)
 +	',`
-+		dontaudit $1_t $1_home_t:file execute;
-+	')
-+
-+
-+	tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
- 		fs_exec_nfs_files($1_t)
++		dontaudit $1_usertype $1_home_t:file execute;
  	')
  
 -	tunable_policy(`use_samba_home_dirs',`
+-		fs_exec_cifs_files($1_t)
++
++	tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
++		fs_exec_nfs_files($1_usertype)
++	')
++
 +	tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
- 		fs_exec_cifs_files($1_t)
++		fs_exec_cifs_files($1_usertype)
  	')
  ')
-@@ -395,7 +409,9 @@
+ 
+@@ -374,12 +389,12 @@
+ 	type $1_tmp_t, $1_file_type;
+ 	files_tmp_file($1_tmp_t)
+ 
+-	manage_dirs_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_lnk_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_sock_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	manage_fifo_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
+-	files_tmp_filetrans($1_t, $1_tmp_t, { dir file lnk_file sock_file fifo_file })
++	manage_dirs_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_lnk_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_sock_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	manage_fifo_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
++	files_tmp_filetrans($1_usertype, $1_tmp_t, { dir file lnk_file sock_file fifo_file })
+ ')
+ 
+ #######################################
+@@ -395,7 +410,9 @@
  ## <rolebase/>
  #
  template(`userdom_exec_tmp_template',`
 -	exec_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
 +	tunable_policy(`allow_$1_exec_content', `
-+		exec_files_pattern($1_t,$1_tmp_t,$1_tmp_t)
++		exec_files_pattern($1_usertype,$1_tmp_t,$1_tmp_t)
 +	')
  ')
  
  #######################################
-@@ -509,10 +525,6 @@
+@@ -509,10 +526,6 @@
  ## <rolebase/>
  #
  template(`userdom_exec_generic_pgms_template',`
@@ -13087,7 +13430,7 @@
  	corecmd_exec_bin($1_t)
  ')
  
-@@ -530,9 +542,6 @@
+@@ -530,9 +543,6 @@
  ## <rolebase/>
  #
  template(`userdom_basic_networking_template',`
@@ -13097,7 +13440,7 @@
  
  	allow $1_t self:tcp_socket create_stream_socket_perms;
  	allow $1_t self:udp_socket create_socket_perms;
-@@ -563,32 +572,29 @@
+@@ -563,32 +573,29 @@
  #
  template(`userdom_xwindows_client_template',`
  	gen_require(`
@@ -13151,7 +13494,7 @@
  ')
  
  #######################################
-@@ -664,67 +670,39 @@
+@@ -664,67 +671,39 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -13222,7 +13565,7 @@
  	files_exec_etc_files($1_t)
  	files_search_locks($1_t)
  	# Check to see if cdrom is mounted
-@@ -737,12 +715,6 @@
+@@ -737,12 +716,6 @@
  	# Stat lost+found.
  	files_getattr_lost_found_dirs($1_t)
  
@@ -13235,7 +13578,7 @@
  	# cjp: some of this probably can be removed
  	selinux_get_fs_mount($1_t)
  	selinux_validate_context($1_t)
-@@ -755,31 +727,16 @@
+@@ -755,31 +728,16 @@
  	storage_getattr_fixed_disk_dev($1_t)
  
  	auth_read_login_records($1_t)
@@ -13269,7 +13612,7 @@
  	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
  	seutil_exec_checkpolicy($1_t)
  	seutil_exec_setfiles($1_t)
-@@ -794,19 +751,12 @@
+@@ -794,19 +752,12 @@
  		files_read_default_symlinks($1_t)
  		files_read_default_sockets($1_t)
  		files_read_default_pipes($1_t)
@@ -13289,7 +13632,7 @@
  	optional_policy(`
  		alsa_read_rw_config($1_t)
  	')
-@@ -821,11 +771,6 @@
+@@ -821,11 +772,6 @@
  	')
  
  	optional_policy(`
@@ -13301,7 +13644,7 @@
  		allow $1_t self:dbus send_msg;
  		dbus_system_bus_client_template($1,$1_t)
  
-@@ -834,21 +779,18 @@
+@@ -834,21 +780,18 @@
  		')
  
  		optional_policy(`
@@ -13327,7 +13670,7 @@
  	')
  
  	optional_policy(`
-@@ -876,17 +818,17 @@
+@@ -876,17 +819,17 @@
  	')
  
  	optional_policy(`
@@ -13353,7 +13696,7 @@
  	')
  
  	optional_policy(`
-@@ -900,16 +842,6 @@
+@@ -900,16 +843,6 @@
  	')
  
  	optional_policy(`
@@ -13370,7 +13713,7 @@
  		resmgr_stream_connect($1_t)
  	')
  
-@@ -919,11 +851,6 @@
+@@ -919,11 +852,6 @@
  	')
  
  	optional_policy(`
@@ -13382,7 +13725,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +881,163 @@
+@@ -954,21 +882,163 @@
  ##	</summary>
  ## </param>
  #
@@ -13457,66 +13800,66 @@
 -	userdom_common_user_template($1)
 +	auth_dontaudit_write_login_records($1_t)
 +
-+	dev_read_sysfs($1_t)
-+	dev_read_urand($1_t)
++	dev_read_sysfs($1_usertype)
++	dev_read_urand($1_usertype)
 +
-+	kernel_dontaudit_read_system_state($1_t)
++	kernel_dontaudit_read_system_state($1_usertype)
 +
-+	domain_use_interactive_fds($1_t)
++	domain_use_interactive_fds($1_usertype)
 +	# Command completion can fire hundreds of denials
-+	domain_dontaudit_exec_all_entry_files($1_t)
++	domain_dontaudit_exec_all_entry_files($1_usertype)
 +
 +	# Stat lost+found.
-+	files_getattr_lost_found_dirs($1_t)
++	files_getattr_lost_found_dirs($1_usertype)
 +
-+	fs_get_all_fs_quotas($1_t)
-+	fs_getattr_all_fs($1_t)
-+	fs_getattr_all_dirs($1_t)
-+	fs_search_auto_mountpoints($1_t)
-+	fs_list_inotifyfs($1_t)
++	fs_get_all_fs_quotas($1_usertype)
++	fs_getattr_all_fs($1_usertype)
++	fs_getattr_all_dirs($1_usertype)
++	fs_search_auto_mountpoints($1_usertype)
++	fs_list_inotifyfs($1_usertype)
 +
 +	# Stop warnings about access to /dev/console
-+	init_dontaudit_rw_utmp($1_t)
-+	init_dontaudit_use_fds($1_t)
-+	init_dontaudit_use_script_fds($1_t)
++	init_dontaudit_rw_utmp($1_usertype)
++	init_dontaudit_use_fds($1_usertype)
++	init_dontaudit_use_script_fds($1_usertype)
 +
-+	libs_exec_lib_files($1_t)
++	libs_exec_lib_files($1_usertype)
 +
-+	logging_dontaudit_getattr_all_logs($1_t)
++	logging_dontaudit_getattr_all_logs($1_usertype)
 +
-+	miscfiles_read_man_pages($1_t)
++	miscfiles_read_man_pages($1_usertype)
 +	# for running TeX programs
-+	miscfiles_read_tetex_data($1_t)
-+	miscfiles_exec_tetex_data($1_t)
++	miscfiles_read_tetex_data($1_usertype)
++	miscfiles_exec_tetex_data($1_usertype)
 +
-+	seutil_read_config($1_t)
++	seutil_read_config($1_usertype)
 +
-+	files_dontaudit_list_default($1_t)
-+	files_dontaudit_read_default_files($1_t)
++	files_dontaudit_list_default($1_usertype)
++	files_dontaudit_read_default_files($1_usertype)
 +
 +	userdom_poly_home_template($1)
 +	userdom_poly_tmp_template($1)
 +
 +	optional_policy(`
-+		cups_stream_connect($1_t)
-+		cups_stream_connect_ptal($1_t)
++		cups_stream_connect($1_usertype)
++		cups_stream_connect_ptal($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		kerberos_use($1_t)
++		kerberos_use($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		mta_dontaudit_read_spool_symlinks($1_t)
++		mta_dontaudit_read_spool_symlinks($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		quota_dontaudit_getattr_db($1_t)
++		quota_dontaudit_getattr_db($1_usertype)
 +	')
 +
 +	optional_policy(`
-+		rpm_read_db($1_t)
-+		rpm_dontaudit_manage_db($1_t)
++		rpm_read_db($1_usertype)
++		rpm_dontaudit_manage_db($1_usertype)
 +	')
 +')
 +
@@ -13552,7 +13895,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1046,51 @@
+@@ -977,23 +1047,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -13615,7 +13958,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1126,7 @@
+@@ -1029,15 +1127,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -13632,7 +13975,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1143,6 @@
+@@ -1054,17 +1144,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -13650,7 +13993,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1180,8 @@
+@@ -1102,6 +1181,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -13659,7 +14002,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1207,7 @@
+@@ -1127,7 +1208,7 @@
  	# $1_t local policy
  	#
  
@@ -13668,7 +14011,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1219,11 @@
+@@ -1139,7 +1220,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -13681,7 +14024,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1902,6 +1986,41 @@
+@@ -1902,6 +1987,41 @@
  
  ########################################
  ## <summary>
@@ -13723,7 +14066,7 @@
  ##	Do not audit attempts to set the
  ##	attributes of user home files.
  ## </summary>
-@@ -3078,7 +3197,7 @@
+@@ -3078,7 +3198,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -13732,7 +14075,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4734,24 @@
+@@ -4615,6 +4735,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -13757,7 +14100,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4770,14 @@
+@@ -4633,6 +4771,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -13772,7 +14115,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5468,7 @@
+@@ -5323,7 +5469,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -13781,7 +14124,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5704,336 @@
+@@ -5559,3 +5705,372 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -13977,31 +14320,35 @@
 +
 +userdom_xwindows_client_template($1)
 +
-+logging_send_syslog_msg($1_t)
++logging_send_syslog_msg($1_usertype)
 +
 +optional_policy(`
-+	alsa_read_rw_config($1_t)
++	alsa_read_rw_config($1_usertype)
 +')
 +
 +authlogin_per_role_template($1, $1_t, $1_r)
 +
-+auth_search_pam_console_data($1_t)
++auth_search_pam_console_data($1_usertype)
 +
-+dev_read_sound($1_t)
-+dev_write_sound($1_t)
++dev_read_sound($1_usertype)
++dev_write_sound($1_usertype)
 +
 +optional_policy(`
-+	dbus_per_role_template($1, $1_t, $1_r)
-+	dbus_system_bus_client_template($1, $1_t)
-+	allow $1_t self:dbus send_msg;
++	dbus_per_role_template($1, $1_usertype, $1_r)
++	dbus_system_bus_client_template($1, $1_usertype)
++	allow $1_usertype $1_usertype:dbus send_msg;
 +
 +	optional_policy(`
-+		cups_dbus_chat($1_t)
++		cups_dbus_chat($1_usertype)
 +	')
 +
 +')
 +
 +optional_policy(`
++	consolekit_dontaudit_dbus_chat($1_usertype)
++')
++
++optional_policy(`
 +	java_per_role_template($1, $1_t, $1_r)
 +')
 +
@@ -14010,11 +14357,15 @@
 +')
 +
 +optional_policy(`
-+	setroubleshoot_dontaudit_stream_connect($1_t)
++	networkmanager_dontaudit_dbus_chat($1_usertype)
++')
++
++optional_policy(`
++	setroubleshoot_dontaudit_stream_connect($1_usertype)
 +')
 +
 +# gnome keyring wants to read this. Needs to be exlicitly granted
-+dev_dontaudit_read_rand($1_t)
++dev_dontaudit_read_rand($1_usertype)
 +
 +')
 +
@@ -14118,6 +14469,34 @@
 +	allow $1 userdomain:process rlimitinh;
 +')
 +
++########################################
++## <summary>
++##	Define this type as a Allow apps to set rlimits on userdomain
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++template(`userdom_unpriv_usertype',`
++	gen_require(`
++		attribute unpriv_userdomain, userdomain;
++	')
++	typeattribute $2  $1_usertype, unpriv_userdomain, userdomain;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.8/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-09-12 10:34:51.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/userdomain.te	2007-09-17 16:20:18.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- selinux-policy.spec	19 Sep 2007 17:40:59 -0000	1.524
+++ selinux-policy.spec	20 Sep 2007 14:39:14 -0000	1.525
@@ -288,7 +288,7 @@
 semodule -s targeted -r moilscanner 2>/dev/null
 %loadpolicy targeted
 %relabel targeted
-if [ $1 = 0 ]; then
+if [ $1 = 1 ]; then
 semanage login -m -s "system_u" __default__ 2> /dev/null
 semanage user -a -P unconfined -R "unconfined_r system_r" unconfined_u 
 semanage user -a -P guest -R guest_r guest_u



From fedora-extras-commits at redhat.com  Thu Sep 20 14:40:17 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:40:17 -0400
Subject: rpms/kdelibs/devel kde4.csh, 1.1.2.5, 1.1.2.6 kde4.sh, 1.1.2.5,
	1.1.2.6
Message-ID: <200709201440.l8KEeHrB012816@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12747

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.csh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,19 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
-
-## if not using IP6, speeds DNS operations
-# # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-
-## fork io slaves from prog, not kdeinit.  may help selinux. (experimental)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
 if ( ! $?QT_PLUGIN_PATH ) then
   set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.sh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,18 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -f /etc/sysconfig/prelink ]; then
-#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#  fi
-#fi
-
-## if not using IP6, speeds DNS operations
-# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
-## fork io slaves from prog, not kdeinit. may help selinux (experimetal)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
+  fi
+fi
 
 if [ -z "$QT_PLUGIN_PATH" ]; then
   KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:00 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:41:00 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.525,1.526
Message-ID: <200709201441.l8KEf0oH012860@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12822

Modified Files:
	selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- selinux-policy.spec	20 Sep 2007 14:39:14 -0000	1.525
+++ selinux-policy.spec	20 Sep 2007 14:40:24 -0000	1.526
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
+- Fix to add xguest account when inititial install
+
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
 - Allow xserver to search devpts_t
 - Dontaudit ldconfig output to homedir



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:33 2007
From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood))
Date: Thu, 20 Sep 2007 10:41:33 -0400
Subject: rpms/perl-TimeDate/EL-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE perl-TimeDate.spec, 1.1, NONE sources,
	1.2, NONE
Message-ID: <200709201441.l8KEfXNx012959@cvs-int.fedora.redhat.com>

Author: rnorwood

Update of /cvs/pkgs/rpms/perl-TimeDate/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12952

Added Files:
	dead.package 
Removed Files:
	Makefile branch perl-TimeDate.spec sources 
Log Message:
perl-DateTime in now included in RHEL.


--- NEW FILE dead.package ---
perl-TimeDate was released as an update to RHEL5.


--- Makefile DELETED ---


--- branch DELETED ---


--- perl-TimeDate.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:35 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 20 Sep 2007 10:41:35 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.46,1.47
Message-ID: <200709201441.l8KEfZtM012972@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12859

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- fix symlinks again



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- desktop-backgrounds.spec	6 Sep 2007 19:43:55 -0000	1.46
+++ desktop-backgrounds.spec	20 Sep 2007 14:41:01 -0000	1.47
@@ -4,7 +4,7 @@
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 4
+Release: 5
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -89,6 +89,7 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
+ ln -sf ../infinity/am00.png default.jpg;
  ln -sf ../infinity/am00.png default.png;
  ln -sf ../infinity/am00.png default-wide.png;
  ln -sf ../infinity/am00.png default-5_4.png)
@@ -134,6 +135,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Thu Sep 20 2007 Ray Strode <rstrode at redhat.com> - 7.92-5
+- fix symlinks again
+
 * Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> - 7.92-4
 - fix symlinks
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:41:49 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:41:49 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.223.2.23,1.223.2.24
Message-ID: <200709201441.l8KEfnUX013018@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12905

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
don't use %%kde4_bindir in scriptets



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.23
retrieving revision 1.223.2.24
diff -u -r1.223.2.23 -r1.223.2.24
--- kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
+++ kdelibs.spec	20 Sep 2007 14:41:16 -0000	1.223.2.24
@@ -142,7 +142,7 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-# fix file conflict with js (kde#149840)
+# fix file conflict with mozilla's js (kde#149840)
 mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
 
 # remove files which conflict with KDE 3
@@ -176,13 +176,13 @@
 
 %post
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %clean



From fedora-extras-commits at redhat.com  Thu Sep 20 14:47:43 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:47:43 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.8,1.9
Message-ID: <200709201447.l8KElhrk013223@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13191

Modified Files:
	kdepimlibs.spec 
Log Message:
cosmetics



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdepimlibs.spec	13 Sep 2007 03:36:20 -0000	1.8
+++ kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
@@ -57,7 +57,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}



From fedora-extras-commits at redhat.com  Thu Sep 20 14:48:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 10:48:12 -0400
Subject: rpms/acl/F-7 acl-2.2.39-path_max.patch,1.1,1.2 acl.spec,1.32,1.33
Message-ID: <200709201448.l8KEmCVe013321@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13222

Modified Files:
	acl-2.2.39-path_max.patch acl.spec 
Log Message:
Rewriten path_max patch to support long UTF8 names


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/F-7/acl-2.2.39-path_max.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acl-2.2.39-path_max.patch	5 Jul 2006 19:32:12 -0000	1.1
+++ acl-2.2.39-path_max.patch	20 Sep 2007 14:48:10 -0000	1.2
@@ -14,11 +14,11 @@
  	int c;
 -	char linebuf[1024];
 +	/*
-+	  Max PATH_MAX bytes even for UTF-8 path names and additional 6 
-+	  bytes for "#file:". Not a good solution but for now it is the 
++	  Max PATH_MAX bytes even for UTF-8 path names and additional 9 
++	  bytes for "# file: ".Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[PATH_MAX+6];
++	char linebuf[(4*PATH_MAX)+9];
  	char *cp;
  	char *p;
  	int comments_read = 0;


Index: acl.spec
===================================================================
RCS file: /cvs/extras/rpms/acl/F-7/acl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- acl.spec	21 Mar 2007 10:36:08 -0000	1.32
+++ acl.spec	20 Sep 2007 14:48:10 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.39
-Release: 3.1%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
@@ -102,6 +102,10 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Sep 20 2007 Jiri Moskovcak <jmoskovc at redhat.com> 2.2.39-4
+- Rewriten path_max patch to support long UTF8 names
+- Resolves #287701, #183181
+
 * Wed Mar 21 2007 Thomas Woerner <twoerner at redhat.com> 2.2.39-3.1
 - new improved walk patch with fixed getfacl exit code (rhbz#232884)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:49:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:49:08 -0400
Subject: rpms/kdepimlibs/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200709201449.l8KEn8bL013409@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13370

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2007 02:18:56 -0000	1.3
+++ .cvsignore	20 Sep 2007 14:48:35 -0000	1.4
@@ -1,2 +1,2 @@
-kdepimlibs-3.91.0.tar.bz2
 kdepimlibs-3.92.0.tar.bz2
+kdepimlibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2007 02:18:56 -0000	1.3
+++ sources	20 Sep 2007 14:48:35 -0000	1.4
@@ -1 +1 @@
-0fa2ff6f04f5176717776dec6753edba  kdepimlibs-3.92.0.tar.bz2
+488e70022a2f0a3922621de2af9b7ddd  kdepimlibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:51:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:51:11 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.263.2.20,1.263.2.21
Message-ID: <200709201451.l8KEpBEa013489@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
costmetics



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.20
retrieving revision 1.263.2.21
diff -u -r1.263.2.20 -r1.263.2.21
--- kdebase.spec	13 Sep 2007 19:00:52 -0000	1.263.2.20
+++ kdebase.spec	20 Sep 2007 14:50:38 -0000	1.263.2.21
@@ -104,7 +104,7 @@
 
 mkdir -p %{_target_platform} 
 pushd %{_target_platform}
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}



From fedora-extras-commits at redhat.com  Thu Sep 20 14:53:26 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 10:53:26 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.58,1.59
Message-ID: <200709201453.l8KErQqj013582@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13554

Modified Files:
	alsa-lib.spec 
Log Message:
- added changes from review request (#225241)

* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc2
- Update License field.
- Use configdir instead of sysconfdir hacks (cleaner).
- Remove redundant optflags overriding.
- Switch to using main "version", and merge "postver" since this is the right
  way of doing things (see NamingGuidelines#NonNumericRelease).
- Remove static library.
- Mark all of /etc/alsa as config, but not "noreplace".
- Remove useless rpath on 64bit archs.





Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- alsa-lib.spec	19 Sep 2007 09:54:21 -0000	1.58
+++ alsa-lib.spec	20 Sep 2007 14:52:53 -0000	1.59
@@ -1,20 +1,19 @@
-%define  version_main   1.0.15
 %define  prever         rc2
 %define  prever_dot     .rc2
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
-Version: %{version_main}
-Release: 0.1%{?prever_dot}%{?dist}
-License: LGPL
+Version: 1.0.15
+Release: 0.2%{?prever_dot}%{?dist}
+License: LGPLv2+
 Group:   System Environment/Libraries
-Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
-Patch0:   alsa-lib-1.0.14rc1-config.patch
-Patch2:   alsa-lib-1.0.14-glibc-open.patch
+Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+Patch0:	 alsa-lib-1.0.14rc1-config.patch
+Patch2:	 alsa-lib-1.0.14-glibc-open.patch
 URL:     http://www.alsa-project.org/
-BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
-Prereq:  /sbin/ldconfig, coreutils
+Requires(post): /sbin/ldconfig, coreutils
 
 %description
 The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
@@ -25,10 +24,11 @@
 the older OSS API, providing binary compatibility for most OSS programs.
 
 %package devel
-Summary: Static libraries and header files from the ALSA library.
+Summary: Development files from the ALSA library
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 functionality to the Linux operating system.
@@ -37,15 +37,15 @@
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version_main}%{?prever}%{?postver}
+%setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 
 %build
-%configure \
-    CFLAGS="$RPM_OPT_FLAGS"\
-    --enable-static=yes \
-    --datadir=/etc
+%configure --with-configdir=%{_sysconfdir}/alsa
+# Remove useless /usr/lib64 rpath on 64bit archs
+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}
 make doc
 
@@ -53,14 +53,11 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_datadir}
+# We need the library to be available even before /usr might be mounted
 mkdir -p %{buildroot}/%{_lib}
-
 mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
-mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
-
 %clean
 rm -rf %{buildroot}
 
@@ -72,28 +69,34 @@
 ln -snf ../../etc/alsa %{_datadir}/alsa
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%{_bindir}/aserver
+%config %{_sysconfdir}/alsa/
 /%{_lib}/libasound.so.*
-%{_libdir}/alsa-lib/smixer/*
-%{_sysconfdir}/alsa
-%config %{_sysconfdir}/alsa/alsa.conf
-%dir %{_libdir}/alsa-lib
-%dir %{_libdir}/alsa-lib/smixer
+%{_bindir}/aserver
+%{_libdir}/alsa-lib/
 
 %files devel
-%defattr(-, root, root)
-%doc doc/doxygen
-%{_includedir}/alsa
+%defattr(-,root,root,-)
+%doc doc/doxygen/
+%{_includedir}/alsa/
 %{_includedir}/sys/asoundlib.h
 %{_libdir}/libasound.so
-%{_libdir}/libasound.a
 %exclude %{_libdir}/libasound.la
 %{_libdir}/pkgconfig/alsa.pc
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc2
+- Update License field.
+- Use configdir instead of sysconfdir hacks (cleaner).
+- Remove redundant optflags overriding.
+- Switch to using main "version", and merge "postver" since this is the right
+  way of doing things (see NamingGuidelines#NonNumericRelease).
+- Remove static library.
+- Mark all of /etc/alsa as config, but not "noreplace".
+- Remove useless rpath on 64bit archs.
+
 * Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc2
 - updated to 1.0.15rc2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 14:55:01 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 10:55:01 -0400
Subject: rpms/kdebase/devel .cvsignore, 1.57.2.3, 1.57.2.4 sources, 1.78.2.2,
	1.78.2.3
Message-ID: <200709201455.l8KEt12G013674@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13647

Modified Files:
      Tag: kdebase-kde4-branch
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.57.2.3
retrieving revision 1.57.2.4
diff -u -r1.57.2.3 -r1.57.2.4
--- .cvsignore	29 Jul 2007 02:27:21 -0000	1.57.2.3
+++ .cvsignore	20 Sep 2007 14:54:29 -0000	1.57.2.4
@@ -1,2 +1,2 @@
-kdebase-3.91.0.tar.bz2
 kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.78.2.2
retrieving revision 1.78.2.3
diff -u -r1.78.2.2 -r1.78.2.3
--- sources	29 Jul 2007 02:27:21 -0000	1.78.2.2
+++ sources	20 Sep 2007 14:54:29 -0000	1.78.2.3
@@ -1 +1 @@
-7a8731fc696512044463537314b75281  kdebase-3.92.0.tar.bz2
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 14:58:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 10:58:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.62,1.63
Message-ID: <200709201458.l8KEwESM013761@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13740

Modified Files:
	policy-20070703.patch 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- policy-20070703.patch	20 Sep 2007 14:39:14 -0000	1.62
+++ policy-20070703.patch	20 Sep 2007 14:58:12 -0000	1.63
@@ -1239,7 +1239,7 @@
  /usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.0.8/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/gnome.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/gnome.if	2007-09-20 10:51:59.000000000 -0400
 @@ -33,6 +33,51 @@
  ## </param>
  #
@@ -7945,7 +7945,7 @@
  manage_files_pattern(rpcbind_t,rpcbind_var_run_t,rpcbind_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.0.8/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rpc.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rpc.if	2007-09-20 10:47:23.000000000 -0400
 @@ -89,8 +89,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -7959,6 +7959,31 @@
  
  	fs_rw_rpc_named_pipes($1_t) 
  	fs_search_auto_mountpoints($1_t)
+@@ -214,6 +217,24 @@
+ 
+ ########################################
+ ## <summary>
++##      Execute domain in nfsd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##      The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpc_domtrans_rpcd',`
++	gen_require(`
++		type rpcd_t, rpcd_exec_t;
++	')
++
++	domtrans_pattern($1,rpcd_exec_t,rpcd_t)
++')
++
++########################################
++## <summary>
+ ##      Read NFS exported content.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-17 16:20:18.000000000 -0400
@@ -9464,7 +9489,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 09:43:06.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 10:52:36.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9534,7 +9559,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,49 @@
+@@ -555,25 +558,52 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9553,6 +9578,9 @@
 +	userdom_user_home_dir_filetrans_user_home_content($1, xdm_t, { dir file })
 +	userdom_manage_user_tmp_dirs($1, xdm_t)
 +	userdom_manage_user_tmp_files($1, xdm_t)
++
++	# Handling of pam_keyring
++	gnome_manage_user_gnome_config($1, xdm_t)
  
  	xserver_ro_session_template(xdm,$2,$3)
 -	xserver_rw_session_template($1,$2,$3)
@@ -9592,7 +9620,7 @@
  	')
  ')
  
-@@ -626,6 +653,24 @@
+@@ -626,6 +656,24 @@
  
  ########################################
  ## <summary>
@@ -9617,7 +9645,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +704,73 @@
+@@ -659,6 +707,73 @@
  
  ########################################
  ## <summary>
@@ -9691,7 +9719,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1039,7 @@
+@@ -927,6 +1042,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9699,7 +9727,7 @@
  ')
  
  ########################################
-@@ -987,6 +1100,37 @@
+@@ -987,6 +1103,37 @@
  
  ########################################
  ## <summary>
@@ -9737,7 +9765,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1280,7 @@
+@@ -1136,7 +1283,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9746,7 +9774,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1469,62 @@
+@@ -1325,3 +1472,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9811,7 +9839,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-19 11:59:42.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 10:44:00.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9882,16 +9910,19 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +324,8 @@
+@@ -306,6 +324,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
 +	dbus_system_bus_client_template(xdm, xdm_t)
 +	dbus_send_system_bus(xdm_t)
++	optional_policy(`
++		hal_dbus_chat(xdm_t)
++	')
  ')
  
  optional_policy(`
-@@ -348,12 +368,8 @@
+@@ -348,12 +371,8 @@
  ')
  
  optional_policy(`
@@ -9905,7 +9936,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +401,7 @@
+@@ -385,7 +404,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9914,7 +9945,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +441,10 @@
+@@ -425,6 +444,10 @@
  ')
  
  optional_policy(`
@@ -9925,7 +9956,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +454,19 @@
+@@ -434,47 +457,19 @@
  ')
  
  optional_policy(`
@@ -11922,7 +11953,7 @@
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.0.8/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/mount.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/mount.te	2007-09-20 10:47:39.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -12020,7 +12051,7 @@
  ')
  
  optional_policy(`
-@@ -159,13 +176,8 @@
+@@ -159,13 +176,9 @@
  
  	fs_search_rpc(mount_t)
  
@@ -12031,10 +12062,11 @@
 -	optional_policy(`
 -		nis_use_ypbind(mount_t)
 -	')
++	rpc_domtrans_rpcd(mount_t)
  ')
  
  optional_policy(`
-@@ -189,10 +201,6 @@
+@@ -189,10 +202,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -12045,7 +12077,7 @@
  ########################################
  #
  # Unconfined mount local policy
-@@ -201,4 +209,29 @@
+@@ -201,4 +210,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -13131,7 +13163,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 09:09:10.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 10:55:37.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14124,7 +14156,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5705,372 @@
+@@ -5559,3 +5705,375 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14493,8 +14525,11 @@
 +template(`userdom_unpriv_usertype',`
 +	gen_require(`
 +		attribute unpriv_userdomain, userdomain;
++		attribute $1_usertype;
 +	')
-+	typeattribute $2  $1_usertype, unpriv_userdomain, userdomain;
++	typeattribute $2  $1_usertype;
++	typeattribute $2  unpriv_userdomain;
++	typeattribute $2  userdomain;
 +')
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.8/policy/modules/system/userdomain.te



From fedora-extras-commits at redhat.com  Thu Sep 20 15:09:58 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Thu, 20 Sep 2007 11:09:58 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.58,1.59
Message-ID: <200709201509.l8KF9wZh020256@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20206

Modified Files:
	alsa-utils.spec 
Log Message:
* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
- Update License field.
- Mark udev rule as config.
- Use find_lang macro again to include translations (why was it removed?).

review request (#225242)




Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- alsa-utils.spec	19 Sep 2007 12:26:53 -0000	1.58
+++ alsa-utils.spec	20 Sep 2007 15:09:25 -0000	1.59
@@ -4,8 +4,8 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.15
-Release: 	0.1%{?prever_dot}%{?dist}
-License: 	GPL
+Release: 	0.2%{?prever_dot}%{?dist}
+License: 	GPLv2+
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
 Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
@@ -40,16 +40,15 @@
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 # Install ALSA udev rules
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
+install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -m 755 alsaunmute  %{buildroot}/bin
-install -m 755 alsacard  %{buildroot}/bin
-install -m 755 salsa %{buildroot}/sbin
+install -p -m 755 salsa alsacard alsaunmute %{buildroot}/bin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
@@ -62,27 +61,27 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
-/etc/udev/rules.d/*
+%config /etc/udev/rules.d/*
 /bin/*
 /sbin/*
 %{_bindir}/*
 %{_sbindir}/*
+%{_datadir}/alsa/
+%{_datadir}/sounds/
 %{_mandir}/man?/*
-%dir %{_datadir}/sounds
-%dir %{_datadir}/sounds/alsa
-%{_datadir}/sounds/alsa/*
-%dir %{_datadir}/alsa
-%dir %{_datadir}/alsa/speaker-test
-%{_datadir}/alsa/speaker-test/*
-/usr/share/locale/*
 /var/lib/alsa
 %ghost /var/lib/alsa/asound.state
 
 
 %changelog
+* Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
+- Update License field.
+- Mark udev rule as config.
+- Use find_lang macro again to include translations (why was it removed?).
+
 * Wed Sep 19 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.1.rc1
 - new upstream
 - moved saved volume settings to /var/lib (#293301)
@@ -201,7 +200,7 @@
 
 * Mon Apr 25 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - New upstream version
-- add %find_lang macro (#155719)
+- add %%find_lang macro (#155719)
 
 * Fri Apr 1 2005 Bill Nottingham <notting at redhat.com> 1.0.8-4
 - replace the dev.d script with a program that calls alsactl to



From fedora-extras-commits at redhat.com  Thu Sep 20 15:11:43 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 11:11:43 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.81,1.82
Message-ID: <200709201511.l8KFBhxg020376@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20340

Modified Files:
	sound-juicer.spec 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-2
- Fix crasher when editing profiles and the profile gets unref'ed
  (#278861)



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sound-juicer.spec	17 Sep 2007 15:47:33 -0000	1.81
+++ sound-juicer.spec	20 Sep 2007 15:11:10 -0000	1.82
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
@@ -22,6 +22,8 @@
 Requires:	cdparanoia
 Requires:	nautilus-cd-burner >= %{nautilus_cd_burner_version}
 
+Patch1:		sound-juicer-2.20.0-profile-editing.patch
+
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
@@ -53,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .no-profile-crash
 
 %build
 # work around a gstreamer problem where it 
@@ -117,6 +120,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-2
+- Fix crasher when editing profiles and the profile gets unref'ed
+  (#278861)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:12:21 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 11:12:21 -0400
Subject: rpms/sound-juicer/devel sound-juicer-2.20.0-profile-editing.patch, 
	NONE, 1.1
Message-ID: <200709201512.l8KFCLUi020449@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20391

Added Files:
	sound-juicer-2.20.0-profile-editing.patch 
Log Message:
Add really add the patch


sound-juicer-2.20.0-profile-editing.patch:

--- NEW FILE sound-juicer-2.20.0-profile-editing.patch ---
--- trunk/libjuicer/sj-extractor.c	2007/07/05 11:41:07	1825
+++ trunk/libjuicer/sj-extractor.c	2007/09/19 08:13:54	1882
@@ -241,7 +241,8 @@
 sj_extractor_init (SjExtractor *extractor)
 {
   extractor->priv = EXTRACTOR_PRIVATE (extractor);
-  extractor->priv->profile = gm_audio_profile_lookup (DEFAULT_AUDIO_PROFILE_NAME);
+  extractor->priv->profile =
+    g_object_ref (gm_audio_profile_lookup (DEFAULT_AUDIO_PROFILE_NAME));
   extractor->priv->rebuild_pipeline = TRUE;
   extractor->priv->paranoia_mode = 8; /* TODO: replace with construct params */
 }



From fedora-extras-commits at redhat.com  Thu Sep 20 15:21:52 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Thu, 20 Sep 2007 11:21:52 -0400
Subject: rpms/neon/devel mirrors, NONE, 1.1 neon-0.27.0-gssapi.patch, NONE, 
	1.1 neon.spec, 1.34, 1.35
Message-ID: <200709201521.l8KFLqU1021059@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21030

Modified Files:
	neon.spec 
Added Files:
	mirrors neon-0.27.0-gssapi.patch 
Log Message:
* Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
- fix Negotiate response verification



--- NEW FILE mirrors ---
http://www.webdav.org/neon/

neon-0.27.0-gssapi.patch:

--- NEW FILE neon-0.27.0-gssapi.patch ---
--- neon-0.27.0/src/ne_auth.c.gssapi
+++ neon-0.27.0/src/ne_auth.c
@@ -532,7 +532,7 @@ static int verify_negotiate_response(str
     char *duphdr = ne_strdup(hdr);
     char *sep, *ptr = strchr(duphdr, ' ');
     int ret;
-    ne_buffer *errmsg;
+    ne_buffer *errmsg = NULL;
 
     if (strncmp(hdr, "Negotiate", ptr - duphdr) != 0) {
         ne_set_error(sess->sess, _("Negotiate response verification failed: "
@@ -560,8 +560,10 @@ static int verify_negotiate_response(str
         ne_set_error(sess->sess, _("Negotiate response verification failure: %s"),
                      errmsg->data);
     }
-    ne_buffer_destroy(errmsg);
+
+    if (errmsg) ne_buffer_destroy(errmsg);
     ne_free(duphdr);
+
     return ret ? NE_ERROR : NE_OK;
 }
 #endif


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- neon.spec	30 Aug 2007 12:53:29 -0000	1.34
+++ neon.spec	20 Sep 2007 15:21:20 -0000	1.35
@@ -1,12 +1,13 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.27.0
-Release: 2
+Release: 3
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
+Patch1: neon-0.27.0-gssapi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
@@ -32,16 +33,17 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .gssapi
 
 %build
 export CC="%{__cc} -pthread"
-%configure --with-ssl --with-expat --enable-shared --enable-warnings \
-        --enable-threadsafe-ssl=posix
+%configure --with-expat --enable-shared --enable-warnings \
+        --with-ssl=openssl --enable-threadsafe-ssl=posix
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -68,6 +70,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
+- fix Negotiate response verification
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 0.27.0-2
 - enable OpenSSL thread-safety hooks
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:23:01 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Thu, 20 Sep 2007 11:23:01 -0400
Subject: rpms/acl/devel acl-2.2.39-path_max.patch,1.2,1.3
Message-ID: <200709201523.l8KFN1EY021179@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/acl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21109

Modified Files:
	acl-2.2.39-path_max.patch 
Log Message:


acl-2.2.39-path_max.patch:

Index: acl-2.2.39-path_max.patch
===================================================================
RCS file: /cvs/extras/rpms/acl/devel/acl-2.2.39-path_max.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acl-2.2.39-path_max.patch	20 Sep 2007 13:53:35 -0000	1.2
+++ acl-2.2.39-path_max.patch	20 Sep 2007 15:22:59 -0000	1.3
@@ -14,11 +14,11 @@
  	int c;
 -	char linebuf[1024];
 +	/*
-+	  Max PATH_MAX bytes even for UTF-8 path names and additional 6 
-+	  bytes for "#file:". Not a good solution but for now it is the 
++	  Max PATH_MAX bytes even for UTF-8 path names and additional 9 
++	  bytes for "# file: ".Not a good solution but for now it is the 
 +	  best I can do without too much impact on the code. [tw]
 +	*/
-+	char linebuf[(4*PATH_MAX)+6];
++	char linebuf[(4*PATH_MAX)+9];
  	char *cp;
  	char *p;
  	int comments_read = 0;



From fedora-extras-commits at redhat.com  Thu Sep 20 15:23:50 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 11:23:50 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7.bz2.sign, NONE, 1.1 .cvsignore, 
	1.688, 1.689 kernel.spec, 1.172, 1.173 sources, 1.650,
	1.651 upstream, 1.572, 1.573 patch-2.6.23-rc6-git8.bz2.sign, 1.1, NONE
Message-ID: <200709201523.l8KFNoxM021301@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21187

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7.bz2.sign 
Removed Files:
	patch-2.6.23-rc6-git8.bz2.sign 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7



--- NEW FILE patch-2.6.23-rc7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8bGbyGugalF9Dw4RAh12AJ40FZMWEhJFE0iYd1VZPKyJXInYJQCfcUyV
KtDeLHOLKgJm8GWVs9MJK7M=
=43IR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- .cvsignore	19 Sep 2007 22:19:45 -0000	1.688
+++ .cvsignore	20 Sep 2007 15:23:18 -0000	1.689
@@ -3,5 +3,5 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc6.bz2
+patch-2.6.23-rc7.bz2
 patch-2.6.23-rc6-git8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kernel.spec	19 Sep 2007 23:44:41 -0000	1.172
+++ kernel.spec	20 Sep 2007 15:23:18 -0000	1.173
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 8
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>
 - drm-mm-git.patch - pull in DRM git queue
 - nouveau-drm.patch - update nouveau patch on top of drm git queue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -r1.650 -r1.651
--- sources	19 Sep 2007 22:19:45 -0000	1.650
+++ sources	20 Sep 2007 15:23:18 -0000	1.651
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-8f335157f1afdad7906be5d387b36302  patch-2.6.23-rc6.bz2
-7af060af2f67d1bc774c40025d3b5f4f  patch-2.6.23-rc6-git8.bz2
+828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- upstream	19 Sep 2007 22:19:46 -0000	1.572
+++ upstream	20 Sep 2007 15:23:18 -0000	1.573
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc6.bz2
-patch-2.6.23-rc6-git8.bz2
+patch-2.6.23-rc7.bz2


--- patch-2.6.23-rc6-git8.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 15:26:29 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:26:29 -0400
Subject: rpms/cdrkit/F-7 genisoimage-dlength.patch, NONE, 1.1 cdrkit.spec,
	1.4, 1.5
Message-ID: <200709201526.l8KFQTAj021509@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21481

Modified Files:
	cdrkit.spec 
Added Files:
	genisoimage-dlength.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
- fixed rhbz#248262
- switched to alternatives


genisoimage-dlength.patch:

--- NEW FILE genisoimage-dlength.patch ---
diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
--- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
@@ -1596,12 +1602,10 @@
 		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
 		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
 		!S_ISDIR(lstatbuf.st_mode)) {
-        if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
-            fprintf(stderr,
-                    "Unknown file type (%s) %s - ignoring and continuing.\n",
-                    filetype((int) lstatbuf.st_mode), whole_path);
-            return (0);
-        }
+		fprintf(stderr,
+		"Unknown file type (%s) %s - ignoring and continuing.\n",
+			filetype((int) lstatbuf.st_mode), whole_path);
+		return (0);
 	}
 	/* Who knows what trash this is - ignore and continue */
 



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrkit.spec	21 Jun 2007 09:04:13 -0000	1.4
+++ cdrkit.spec	20 Sep 2007 15:25:57 -0000	1.5
@@ -1,11 +1,14 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
+
+Patch1: genisoimage-dlength.patch
+
 BuildRequires: cmake libcap-devel zlib-devel perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +23,9 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives 
+Requires(post): %{_sbindir}/alternatives  
+Requires(postun): %{_sbindir}/alternatives 
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -32,6 +38,9 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -49,6 +58,9 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -59,6 +71,7 @@
 
 %prep
 %setup -q 
+%patch1 -p1 -b .dlength
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -78,27 +91,58 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
-ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
-ln -s readom $RPM_BUILD_ROOT%{_bindir}/readcd
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n wodim
+%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
+		%{_bindir}/wodim 50 \
+	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/dvdrecord cdrecord-dvdrecord %{_bindir}/wodim \
+	--slave %{_mandir}/man1/dvdrecord.1.gz cdrecord-dvdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
+	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
+		%{_mandir}/man1/readcd.1.gz 
+
+%preun -n wodim
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
+fi
+
+%post -n genisoimage
+%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
+		%{_bindir}/genisoimage 50 \
+	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
+		%{_mandir}/man1/genisoimage.1.gz \
+	--slave %{_bindir}/mkhybrid mkisofs-mkhybrid %{_bindir}/genisoimage
+
+%preun -n genisoimage
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
+fi
+
+%post -n icedax
+%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
+		%{_bindir}/icedax 50 \
+	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
+		%{_mandir}/man1/icedax.1.gz 
+
+%preun -n icedax
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
+fi
+
 %files -n wodim
 %defattr(-,root,root)
 %doc Changelog COPYING FAQ FORK START
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
-%{_bindir}/cdrecord
-%{_bindir}/dvdrecord
 %{_bindir}/readom
-%{_bindir}/readcd
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
 %{_mandir}/man1/wodim.*
@@ -108,7 +152,6 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
-%{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -118,8 +161,6 @@
 %files -n genisoimage
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
-%{_bindir}/mkisofs
-%{_bindir}/mkhybrid
 %{_bindir}/genisoimage
 %{_bindir}/isodebug
 %{_bindir}/isodump
@@ -139,6 +180,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+- fixed rhbz#248262
+- switched to alternatives
+
 * Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-1
 - version 1.1.6
 - added readcd symlink



From fedora-extras-commits at redhat.com  Thu Sep 20 15:31:15 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:31:15 -0400
Subject: rpms/zabbix/EL-4 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.10, 1.11
Message-ID: <200709201531.l8KFVF1u021770@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21697

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 15:30:42 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 15:30:42 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	15 Sep 2007 11:46:26 -0000	1.10
+++ zabbix.spec	20 Sep 2007 15:30:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -252,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Sat Sep 15 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
 - Add a patch required for finding net-snmp libs on x86_64
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:32:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:32:53 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.5,1.6
Message-ID: <200709201532.l8KFWrvK021914@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21892

Modified Files:
	cdrkit.spec 
Log Message:
- changed license to GPLv2
- same specfile as rawhide



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cdrkit.spec	20 Sep 2007 15:25:57 -0000	1.5
+++ cdrkit.spec	20 Sep 2007 15:32:20 -0000	1.6
@@ -1,8 +1,8 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
@@ -180,10 +180,13 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
-* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives
 
+* Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
+- changed license to GPLv2
+
 * Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-1
 - version 1.1.6
 - added readcd symlink



From fedora-extras-commits at redhat.com  Thu Sep 20 15:35:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:35:28 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.11,1.12
Message-ID: <200709201535.l8KFZS48022000@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21979

Modified Files:
	zabbix.spec 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zabbix.spec	20 Sep 2007 15:30:42 -0000	1.11
+++ zabbix.spec	20 Sep 2007 15:34:55 -0000	1.12
@@ -12,6 +12,8 @@
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
 Patch0:		zabbix-1.4.2-netsnmp-x86_64.patch
+Patch1:		zabbix-1.4.2-include.patch
+Patch2:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -81,6 +83,8 @@
 %ifarch x86_64
 %patch0
 %endif
+%patch1 -p1 -b .include
+%patch2 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}



From fedora-extras-commits at redhat.com  Thu Sep 20 15:47:28 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:47:28 -0400
Subject: rpms/zabbix/EL-4 zabbix.spec,1.12,1.13
Message-ID: <200709201547.l8KFlSY4022298@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22269

Modified Files:
	zabbix.spec 
Log Message:
 - update Source0 to match current guidelines


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-4/zabbix.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zabbix.spec	20 Sep 2007 15:34:55 -0000	1.12
+++ zabbix.spec	20 Sep 2007 15:46:55 -0000	1.13
@@ -6,7 +6,7 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init



From fedora-extras-commits at redhat.com  Thu Sep 20 15:52:21 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:52:21 -0400
Subject: rpms/zabbix/EL-5 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-server.init,
	1.1, 1.2 zabbix.spec, 1.10, 1.11
Message-ID: <200709201552.l8KFqLiC022529@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485

Modified Files:
	zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 15:51:49 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zabbix.spec	11 Sep 2007 05:38:55 -0000	1.10
+++ zabbix.spec	20 Sep 2007 15:51:49 -0000	1.11
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:54:41 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 11:54:41 -0400
Subject: rpms/zabbix/EL-5 zabbix-agent.init,1.1,1.2
Message-ID: <200709201554.l8KFsfr9022639@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22612

Modified Files:
	zabbix-agent.init 
Log Message:
 - really fix the script


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/EL-5/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 15:54:08 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:01:40 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Thu, 20 Sep 2007 12:01:40 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.8,1.9
Message-ID: <200709201601.l8KG1eHQ028959@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28062

Modified Files:
	eclipse-mylyn.spec 
Log Message:
Add full URL for Fedora customizations source zip.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-mylyn.spec	19 Sep 2007 22:31:16 -0000	1.8
+++ eclipse-mylyn.spec	20 Sep 2007 16:01:06 -0000	1.9
@@ -17,7 +17,7 @@
 # tar cjf org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2 org.eclipse.mylyn
 Source0: org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
 Source1: fetch-mylar.sh
-Source2: fedoraeclipse-mylynbugzilla-0.0.1.zip
+Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.1.zip
 
 # SSLSocketFactory#createSocket() is not implemented in GNU Classpath
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31626



From fedora-extras-commits at redhat.com  Thu Sep 20 16:13:14 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:13:14 -0400
Subject: rpms/zabbix/FC-6 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.9, 1.10
Message-ID: <200709201613.l8KGDEts029302@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29270

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 16:12:41 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 16:12:41 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/FC-6/zabbix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zabbix.spec	11 Sep 2007 05:27:04 -0000	1.9
+++ zabbix.spec	20 Sep 2007 16:12:41 -0000	1.10
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:16:07 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:16:07 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.7, 1.8 online-desktop.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <200709201616.l8KGG7vo029570@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29433

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Sep 2007 20:16:20 -0000	1.7
+++ .cvsignore	20 Sep 2007 16:15:35 -0000	1.8
@@ -1 +1 @@
-online-desktop-0.2.12.tar.gz
+online-desktop-0.2.14.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- online-desktop.spec	12 Sep 2007 19:18:42 -0000	1.9
+++ online-desktop.spec	20 Sep 2007 16:15:35 -0000	1.10
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.13
+Version:        0.2.14
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -12,7 +12,6 @@
 #X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
@@ -75,6 +74,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 
 desktop-file-install --vendor="fedora"                  \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -86,19 +86,21 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/od-*
+%{_bindir}/*
 # not used yet
 %dir %{_datadir}/online-desktop
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
+%{_libdir}/pidgin/*.so
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitelib}/pyonlinedesktop
 %{python_sitelib}/pyonlinedesktop/*
 %dir %{python_sitelib}/ddm
 %{python_sitelib}/ddm/*
+%{python_sitelib}/*.so
 %doc COPYING README
 
 %files flickr
@@ -180,6 +182,10 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
+- new upstream
+- become an arch package since we have binaries
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Sep 2007 20:16:20 -0000	1.7
+++ sources	20 Sep 2007 16:15:35 -0000	1.8
@@ -1 +1 @@
-f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz
+0e1d8cbbcd931641c5c8dcbe9c4fae64  online-desktop-0.2.14.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:17:27 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:17:27 -0400
Subject: rpms/zabbix/F-7 zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix-agent.init, 1.1,
	1.2 zabbix-server.init, 1.1, 1.2 zabbix.spec, 1.11, 1.12
Message-ID: <200709201617.l8KGHRV8029700@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29653

Modified Files:
	zabbix-agent.init zabbix-server.init zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
- Fix paths (%_bindir -> %_sbindir) in init scripts (#297061)
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agent.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-agent.init	20 Sep 2007 16:16:54 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX_AGENTD=/usr/bin/zabbix_agentd
+ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
 CONF=/etc/zabbix/zabbix_agentd.conf
 PIDFILE=/var/run/zabbix-agent.pid
 


Index: zabbix-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix-server.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server.init	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix-server.init	20 Sep 2007 16:16:54 -0000	1.2
@@ -5,7 +5,7 @@
 #
 
 # zabbix details
-ZABBIX=/usr/bin/zabbix_server
+ZABBIX=/usr/sbin/zabbix_server
 CONF=/etc/zabbix/zabbix_server.conf
 PIDFILE=/var/run/zabbix.pid
 


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-7/zabbix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zabbix.spec	11 Sep 2007 05:33:09 -0000	1.11
+++ zabbix.spec	20 Sep 2007 16:16:54 -0000	1.12
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:		zabbix-1.4.2-include.patch
+Patch1:		zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,11 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-2
+- Fix paths (%%_bindir -> %%_sbindir) in init scripts (#297061)
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Sep 11 2007 Dan Horak <dan[at]danny.cz> 1.4.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Thu Sep 20 15:31:25 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 20 Sep 2007 11:31:25 -0400
Subject: rpms/cdrkit/devel genisoimage-dlength.patch, NONE, 1.1 cdrkit.spec, 
	1.4, 1.5
Message-ID: <200709201531.l8KFVP12021777@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21734

Modified Files:
	cdrkit.spec 
Added Files:
	genisoimage-dlength.patch 
Log Message:
* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
- fixed rhbz#248262
- switched to alternatives


genisoimage-dlength.patch:

--- NEW FILE genisoimage-dlength.patch ---
diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
--- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
@@ -1596,12 +1602,10 @@
 		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
 		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
 		!S_ISDIR(lstatbuf.st_mode)) {
-        if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
-            fprintf(stderr,
-                    "Unknown file type (%s) %s - ignoring and continuing.\n",
-                    filetype((int) lstatbuf.st_mode), whole_path);
-            return (0);
-        }
+		fprintf(stderr,
+		"Unknown file type (%s) %s - ignoring and continuing.\n",
+			filetype((int) lstatbuf.st_mode), whole_path);
+		return (0);
 	}
 	/* Who knows what trash this is - ignore and continue */
 



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrkit.spec	17 Aug 2007 12:14:56 -0000	1.4
+++ cdrkit.spec	20 Sep 2007 15:30:53 -0000	1.5
@@ -1,11 +1,14 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
+
+Patch1: genisoimage-dlength.patch
+
 BuildRequires: cmake libcap-devel zlib-devel perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +23,9 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives 
+Requires(post): %{_sbindir}/alternatives  
+Requires(postun): %{_sbindir}/alternatives 
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -32,6 +38,9 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -49,6 +58,9 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
+Requires(preun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -59,6 +71,7 @@
 
 %prep
 %setup -q 
+%patch1 -p1 -b .dlength
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -78,27 +91,58 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
-ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
-ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
-ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
-ln -s readom $RPM_BUILD_ROOT%{_bindir}/readcd
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n wodim
+%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
+		%{_bindir}/wodim 50 \
+	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/dvdrecord cdrecord-dvdrecord %{_bindir}/wodim \
+	--slave %{_mandir}/man1/dvdrecord.1.gz cdrecord-dvdrecordman \
+		%{_mandir}/man1/wodim.1.gz \
+	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
+	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
+		%{_mandir}/man1/readcd.1.gz 
+
+%preun -n wodim
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
+fi
+
+%post -n genisoimage
+%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
+		%{_bindir}/genisoimage 50 \
+	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
+		%{_mandir}/man1/genisoimage.1.gz \
+	--slave %{_bindir}/mkhybrid mkisofs-mkhybrid %{_bindir}/genisoimage
+
+%preun -n genisoimage
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
+fi
+
+%post -n icedax
+%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
+		%{_bindir}/icedax 50 \
+	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
+		%{_mandir}/man1/icedax.1.gz 
+
+%preun -n icedax
+if [ $1 = 0 ]; then
+        %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
+fi
+
 %files -n wodim
 %defattr(-,root,root)
 %doc Changelog COPYING FAQ FORK START
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
-%{_bindir}/cdrecord
-%{_bindir}/dvdrecord
 %{_bindir}/readom
-%{_bindir}/readcd
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
 %{_mandir}/man1/wodim.*
@@ -108,7 +152,6 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
-%{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -118,8 +161,6 @@
 %files -n genisoimage
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
-%{_bindir}/mkisofs
-%{_bindir}/mkhybrid
 %{_bindir}/genisoimage
 %{_bindir}/isodebug
 %{_bindir}/isodump
@@ -139,6 +180,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
+- fixed rhbz#248262
+- switched to alternatives
+
 * Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-2
 - changed license to GPLv2
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:18:02 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:18:02 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.26, 1.27 bigboard.spec, 1.35,
	1.36 sources, 1.27, 1.28
Message-ID: <200709201618.l8KGI2PU029764@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29707

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Sep 2007 21:09:03 -0000	1.26
+++ .cvsignore	20 Sep 2007 16:17:30 -0000	1.27
@@ -1 +1 @@
-bigboard-0.5.16.tar.gz
+bigboard-0.5.17.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- bigboard.spec	14 Sep 2007 21:09:03 -0000	1.35
+++ bigboard.spec	20 Sep 2007 16:17:30 -0000	1.36
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.16
+Version:        0.5.17
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -93,6 +93,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
+- new upstream
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Sep 2007 21:09:03 -0000	1.27
+++ sources	20 Sep 2007 16:17:30 -0000	1.28
@@ -1 +1 @@
-43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz
+1fdf687a8ed9eb1f8f6f6003773cb9ad  bigboard-0.5.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:23:41 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 20 Sep 2007 12:23:41 -0400
Subject: rpms/zabbix/devel zabbix-1.4.2-cpustats.patch, NONE,
	1.1 zabbix-1.4.2-include.patch, NONE, 1.1 zabbix.spec, 1.13, 1.14
Message-ID: <200709201623.l8KGNfaT030029@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29961

Modified Files:
	zabbix.spec 
Added Files:
	zabbix-1.4.2-cpustats.patch zabbix-1.4.2-include.patch 
Log Message:
* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
- Add a patch to clean a warning during compile
- Add a patch to fix cpu load computations


zabbix-1.4.2-cpustats.patch:

--- NEW FILE zabbix-1.4.2-cpustats.patch ---
diff -Nru zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c
--- zabbix-1.4.2.orig/src/libs/zbxsysinfo/linux/cpu.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/libs/zbxsysinfo/linux/cpu.c	2007-09-13 14:13:11.000000000 +0200
@@ -131,13 +131,12 @@
 	}
 
 
-	if( 0 == strcmp(type,"idle"))
+	if( 0 == strcmp(type,"user"))
 	{
-		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
-		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
 		else return SYSINFO_RET_FAIL;
-
 	}
 	else if( 0 == strcmp(type,"nice"))
 	{
@@ -147,13 +146,6 @@
 		else return SYSINFO_RET_FAIL;
 
 	}
-	else if( 0 == strcmp(type,"user"))
-	{
-		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user1)
-		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user5)
-		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].user15)
-		else return SYSINFO_RET_FAIL;
-	}
 	else if( 0 == strcmp(type,"system"))
 	{
 		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system1)
@@ -161,6 +153,43 @@
 		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 		else return SYSINFO_RET_FAIL;
 	}
+	else if( 0 == strcmp(type,"idle"))
+	{
+		if( 0 == strcmp(mode,"avg1"))		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle1)
+		else if( 0 == strcmp(mode,"avg5"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].idle15)
+		else return SYSINFO_RET_FAIL;
+
+	}
+//	else if( 0 == strcmp(type,"iowait"))
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+		else return SYSINFO_RET_FAIL;
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if( 0 == strcmp(mode,"avg1")) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if( 0 == strcmp(mode,"avg5")) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if( 0 == strcmp(mode,"avg15"))	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+		else return SYSINFO_RET_FAIL;
+	}
 	else
 	{
 		return SYSINFO_RET_FAIL;
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c zabbix-1.4.2/src/zabbix_agent/cpustat.c
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.c	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.c	2007-09-19 11:17:40.000000000 +0200
@@ -260,9 +260,13 @@
 		int cpuid,
 		int *now,
 		zbx_uint64_t *cpu_user,
-		zbx_uint64_t *cpu_system,
 		zbx_uint64_t *cpu_nice,
-		zbx_uint64_t *cpu_idle
+		zbx_uint64_t *cpu_system,
+		zbx_uint64_t *cpu_idle,
+		zbx_uint64_t *cpu_iowait,
+		zbx_uint64_t *cpu_irq,
+		zbx_uint64_t *cpu_softirq,
+		zbx_uint64_t *cpu_steal
 
 	)
 {
@@ -293,7 +297,7 @@
 		return 1;
 	}
 
-	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = -1;
+	*cpu_user = *cpu_nice = *cpu_system = *cpu_idle = *cpu_iowait = *cpu_irq = *cpu_softirq = *cpu_steal = 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -301,7 +305,8 @@
 	{
 		if(strstr(line, cpu_name) == NULL) continue;
 
-		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64, cpu_user, cpu_nice, cpu_system, cpu_idle);
+		sscanf(line, "%*s " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64 " " ZBX_FS_UI64,
+		    cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 		break;
 	}
 	zbx_fclose(file);
@@ -347,9 +352,13 @@
 	int cpuid,
 	int now, 
 	zbx_uint64_t cpu_user, 
-	zbx_uint64_t cpu_system,
 	zbx_uint64_t cpu_nice,
-	zbx_uint64_t cpu_idle
+	zbx_uint64_t cpu_system,
+	zbx_uint64_t cpu_idle,
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -360,22 +369,38 @@
 		time15	= 0;
 
 	zbx_uint64_t
-		idle	= 0,
-		idle1	= 0,
-		idle5	= 0,
-		idle15	= 0,
 		user	= 0,
 		user1	= 0,
 		user5	= 0,
 		user15	= 0,
-		system	= 0,
-		system1	= 0,
-		system5	= 0,
-		system15= 0,
 		nice	= 0,
 		nice1	= 0,
 		nice5	= 0,
 		nice15	= 0,
+		system	= 0,
+		system1	= 0,
+		system5	= 0,
+		system15= 0,
+		idle	= 0,
+		idle1	= 0,
+		idle5	= 0,
+		idle15	= 0,
+		iowait	= 0,
+		iowait1	= 0,
+		iowait5	= 0,
+		iowait15= 0,
+		irq	= 0,
+		irq1	= 0,
+		irq5	= 0,
+		irq15	= 0,
+		softirq		= 0,
+		softirq1	= 0,
+		softirq5	= 0,
+		softirq15	= 0,
+		steal	= 0,
+		steal1	= 0,
+		steal5	= 0,
+		steal15	= 0,
 		all	= 0,
 		all1	= 0,
 		all5	= 0,
@@ -392,11 +417,15 @@
 			curr_cpu->clock[i]	= now;
 
 			user	= curr_cpu->h_user[i]	= cpu_user;
-			system	= curr_cpu->h_system[i]	= cpu_system;
 			nice	= curr_cpu->h_nice[i]	= cpu_nice;
+			system	= curr_cpu->h_system[i]	= cpu_system;
 			idle	= curr_cpu->h_idle[i]	= cpu_idle;
+			iowait	= curr_cpu->h_iowait[i]	= cpu_iowait;
+			irq	= curr_cpu->h_irq[i]	= cpu_irq;
+			softirq	= curr_cpu->h_softirq[i]= cpu_softirq;
+			steal	= curr_cpu->h_steal[i]	= cpu_steal;
 
-			all	= cpu_idle + cpu_user + cpu_nice + cpu_system;
+			all	= cpu_user + cpu_nice + cpu_system + cpu_idle + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 			break;
 		}
 	}
@@ -409,22 +438,30 @@
 
 		if(curr_cpu->clock[i] == now)
 		{
-			idle	= curr_cpu->h_idle[i];
 			user	= curr_cpu->h_user[i];
 			nice	= curr_cpu->h_nice[i];
 			system	= curr_cpu->h_system[i];
-			all	= idle + user + nice + system;
+			idle	= curr_cpu->h_idle[i];
+			iowait	= curr_cpu->h_iowait[i];
+			irq	= curr_cpu->h_irq[i];
+			softirq	= curr_cpu->h_softirq[i];
+			steal	= curr_cpu->h_steal[i];
+			all	= user + nice + system +  idle + iowait + irq + softirq + steal;
 		}
 
 #define SAVE_CPU_CLOCK_FOR(t)										\
 		if((curr_cpu->clock[i] >= (now - (t * 60))) && (time ## t > curr_cpu->clock[i]))	\
 		{											\
 			time ## t	= curr_cpu->clock[i];						\
-			idle ## t	= curr_cpu->h_idle[i];						\
 			user ## t	= curr_cpu->h_user[i];						\
 			nice ## t	= curr_cpu->h_nice[i];						\
 			system ## t	= curr_cpu->h_system[i];					\
-			all ## t	= idle ## t + user ## t + nice ## t + system ## t;		\
+			idle ## t	= curr_cpu->h_idle[i];						\
+			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
+			all ## t	= user ## t + nice ## t + system ## t + idle ## t + iowait ## t + irq ## t + softirq ## t + steal ##t;	\
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -443,10 +480,6 @@
 		curr_cpu->type ## time = 0.;						\
 	}
 
-	CALC_CPU_LOAD(idle, 1);
-	CALC_CPU_LOAD(idle, 5);
-	CALC_CPU_LOAD(idle, 15);
-
 	CALC_CPU_LOAD(user, 1);
 	CALC_CPU_LOAD(user, 5);
 	CALC_CPU_LOAD(user, 15);
@@ -458,6 +491,26 @@
 	CALC_CPU_LOAD(system, 1);
 	CALC_CPU_LOAD(system, 5);
 	CALC_CPU_LOAD(system, 15);
+
+	CALC_CPU_LOAD(idle, 1);
+	CALC_CPU_LOAD(idle, 5);
+	CALC_CPU_LOAD(idle, 15);
+
+	CALC_CPU_LOAD(iowait, 1);
+	CALC_CPU_LOAD(iowait, 5);
+	CALC_CPU_LOAD(iowait, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
+
+	CALC_CPU_LOAD(softirq, 1);
+	CALC_CPU_LOAD(softirq, 5);
+	CALC_CPU_LOAD(softirq, 15);
+
+	CALC_CPU_LOAD(irq, 1);
+	CALC_CPU_LOAD(irq, 5);
+	CALC_CPU_LOAD(irq, 15);
 }
 
 #endif /* not _WINDOWS */
@@ -577,14 +630,14 @@
 	register int i = 0;
 	int	now = 0;
 
-	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_nice, &cpu_system, &cpu_idle, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff -Nru zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h zabbix-1.4.2/src/zabbix_agent/cpustat.h
--- zabbix-1.4.2.orig/src/zabbix_agent/cpustat.h	2007-08-20 21:22:23.000000000 +0200
+++ zabbix-1.4.2/src/zabbix_agent/cpustat.h	2007-09-13 14:15:11.000000000 +0200
@@ -69,23 +69,39 @@
 		/* private */
 		int	clock[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_user[MAX_CPU_HISTORY];
-		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_nice[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_system[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
-		double	idle1;
-		double	idle5;
-		double	idle15;
 		double	user1;
 		double	user5;
 		double	user15;
-		double	system1;
-		double	system5;
-		double	system15;
 		double	nice1;
 		double	nice5;
 		double	nice15;
+		double	system1;
+		double	system5;
+		double	system15;
+		double	idle1;
+		double	idle5;
+		double	idle15;
+		double	iowait1;
+		double	iowait5;
+		double	iowait15;
+		double	irq1;
+		double	irq5;
+		double	irq15;
+		double	softirq1;
+		double	softirq5;
+		double	softirq15;
+		double	steal1;
+		double	steal5;
+		double	steal15;
 
 	} ZBX_SINGLE_CPU_STAT_DATA;
 

zabbix-1.4.2-include.patch:

--- NEW FILE zabbix-1.4.2-include.patch ---
--- zabbix-1.4.2.orig/include/sysinc.h	2007-08-20 21:22:22.000000000 +0200
+++ zabbix-1.4.2/include/sysinc.h	2007-09-19 11:44:08.000000000 +0200
@@ -288,7 +288,9 @@
 
 #ifdef HAVE_GETOPT_H
 #	ifdef HAVE_GETOPT_LONG
-#		define _GNU_SOURCE
+#		if !defined(_GNU_SOURCE)
+#			define _GNU_SOURCE
+#		endif
 #		include <getopt.h>
 #	endif
 #endif


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zabbix.spec	22 Aug 2007 02:16:28 -0000	1.13
+++ zabbix.spec	20 Sep 2007 16:23:08 -0000	1.14
@@ -1,16 +1,18 @@
 Name:           zabbix
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.zabbix.com/
-Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
 Source3:        zabbix-agent.init
 Source4:        zabbix-logrotate.in
+Patch0:         zabbix-1.4.2-include.patch
+Patch1:         zabbix-1.4.2-cpustats.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define database mysql
@@ -77,6 +79,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .include
+%patch1 -p1 -b .cpustats
 
 # shuffle sql init files around to fix up install
 mkdir -p dbinit/{schema,data}
@@ -248,6 +252,10 @@
 %{_datadir}/%{name}/js/*
 
 %changelog
+* Thu Sep 20 2007 Dan Horak <dan[at]danny.cz> 1.4.2-3
+- Add a patch to clean a warning during compile
+- Add a patch to fix cpu load computations
+
 * Tue Aug 21 2007 Jarod Wilson <jwilson at redhat.com> 1.4.2-2
 - Account for binaries moving from %%_bindir to %%_sbindir
 



From fedora-extras-commits at redhat.com  Thu Sep 20 16:25:00 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:25:00 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.10,1.11
Message-ID: <200709201625.l8KGP0mj030077@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30059

Modified Files:
	online-desktop.spec 
Log Message:
add some brs


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- online-desktop.spec	20 Sep 2007 16:15:35 -0000	1.10
+++ online-desktop.spec	20 Sep 2007 16:24:28 -0000	1.11
@@ -21,6 +21,10 @@
 BuildRequires:	python-devel
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libpurple-devel
 
 %description
 
@@ -185,6 +189,7 @@
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
 - new upstream
 - become an arch package since we have binaries
+- add some brs
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:29:08 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:29:08 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.36,1.37
Message-ID: <200709201629.l8KGT8De030273@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245

Modified Files:
	bigboard.spec 
Log Message:
add some brs


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bigboard.spec	20 Sep 2007 16:17:30 -0000	1.36
+++ bigboard.spec	20 Sep 2007 16:28:36 -0000	1.37
@@ -28,6 +28,7 @@
 BuildRequires:	pygtk2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:	gnome-keyring-devel
 BuildRequires:  mugshot-devel >= 1.1.52
 
@@ -95,6 +96,7 @@
 %changelog
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
 - new upstream
+- add br
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:31:36 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 12:31:36 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.11,1.12
Message-ID: <200709201631.l8KGVaaH030439@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30393

Modified Files:
	online-desktop.spec 
Log Message:
fix python install dir


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- online-desktop.spec	20 Sep 2007 16:24:28 -0000	1.11
+++ online-desktop.spec	20 Sep 2007 16:31:03 -0000	1.12
@@ -100,11 +100,11 @@
 %{_libdir}/pidgin/*.so
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
-%dir %{python_sitelib}/pyonlinedesktop
-%{python_sitelib}/pyonlinedesktop/*
-%dir %{python_sitelib}/ddm
-%{python_sitelib}/ddm/*
-%{python_sitelib}/*.so
+%dir %{python_sitearch}/pyonlinedesktop
+%{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/ddm
+%{python_sitearch}/ddm/*
+%{python_sitearch}/*.so
 %doc COPYING README
 
 %files flickr
@@ -190,6 +190,7 @@
 - new upstream
 - become an arch package since we have binaries
 - add some brs
+- use pythonsitearch
 
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
 - new upstream



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:44 -0700
Subject: [pkgdb] calc was added for mattdm
Message-ID: <200709201638.l8KGci9w000629@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package calc with summary Arbitrary precision arithmetic system and calculator
Kevin Fenzi (kevin) has approved Package calc
Kevin Fenzi (kevin) has added a Fedora devel branch for calc with an owner of mattdm
Kevin Fenzi (kevin) has approved calc in Fedora devel
Kevin Fenzi (kevin) has approved Package calc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on calc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:51 -0700
Subject: [pkgdb] calc (Fedora, 7) updated by kevin
Message-ID: <200709201638.l8KGcqx7018018@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for calc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on calc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on calc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:38:51 -0700
Subject: [pkgdb] calc (Fedora, devel) updated by kevin
Message-ID: <200709201638.l8KGcqea018030@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:32 -0400
Subject: rpms/calc - New directory
Message-ID: <200709201639.l8KGdWXu030773@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc

Log Message:
Directory /cvs/extras/rpms/calc added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:36 -0400
Subject: rpms/calc/devel - New directory
Message-ID: <200709201639.l8KGdaEk030789@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc/devel

Log Message:
Directory /cvs/extras/rpms/calc/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:41 -0400
Subject: rpms/calc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709201639.l8KGdfLE030815@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc

Added Files:
	Makefile import.log 
Log Message:
Setup of module calc


--- NEW FILE Makefile ---
# Top level Makefile for module calc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 20 16:39:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 12:39:43 -0400
Subject: rpms/calc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709201639.l8KGdhO0030832@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ30741/rpms/calc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module calc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: calc
# $Id: Makefile,v 1.1 2007/09/20 16:39:41 kevin Exp $
NAME := calc
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 fedora-extras-commits at redhat.com  Thu Sep 20 16:40:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:40:20 -0700
Subject: [pkgdb] jack-audio-connection-kit (Fedora EPEL, 5) updated by kevin
Message-ID: <200709201640.l8KGeKiZ001068@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for jack-audio-connection-kit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jack-audio-connection-kit



From fedora-extras-commits at redhat.com  Thu Sep 20 16:40:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 09:40:20 -0700
Subject: [pkgdb] jack-audio-connection-kit (Fedora EPEL, 4) updated by kevin
Message-ID: <200709201640.l8KGeMDL001079@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for jack-audio-connection-kit
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jack-audio-connection-kit (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jack-audio-connection-kit



From fedora-extras-commits at redhat.com  Thu Sep 20 16:42:39 2007
From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin))
Date: Thu, 20 Sep 2007 12:42:39 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.7-dupsplit.patch, NONE,
	1.1 ipsec-tools-0.7-iface.patch, NONE, 1.1 p1_up_down, NONE,
	1.1 racoon.init, NONE, 1.1 ipsec-tools.spec, 1.44,
	1.45 racoon.conf, 1.1, 1.2
Message-ID: <200709201642.l8KGgdEN031273@cvs-int.fedora.redhat.com>

Author: sconklin

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31062

Modified Files:
	ipsec-tools.spec racoon.conf 
Added Files:
	ipsec-tools-0.7-dupsplit.patch ipsec-tools-0.7-iface.patch 
	p1_up_down racoon.init 
Log Message:
Added patches from Gabriel Somlo


ipsec-tools-0.7-dupsplit.patch:

--- NEW FILE ipsec-tools-0.7-dupsplit.patch ---
diff -NarU5 ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp_unity.c ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp_unity.c
--- ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp_unity.c	2006-10-09 02:17:20.000000000 -0400
+++ ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp_unity.c	2007-08-22 13:07:29.000000000 -0400
@@ -303,36 +303,45 @@
 int  splitnet_list_add(list, network, count)
 	struct unity_netentry ** list;
 	struct unity_network * network;
 	int *count;
 {
-	struct unity_netentry * newentry;
+	struct unity_netentry * nentry;
+
+	/*
+	 * search for network in current list
+	 * to avoid adding duplicates
+	 */
+	for (nentry = *list; nentry != NULL; nentry = nentry->next)
+		if (memcmp(&nentry->network, network,
+			   sizeof(struct unity_network)) == 0)
+			return 0;	/* it's a dupe */
 
 	/*
 	 * allocate new netentry and copy
-         * new splitnet network data
+	 * new splitnet network data
 	 */
-	newentry = (struct unity_netentry *)
+	nentry = (struct unity_netentry *)
 		racoon_malloc(sizeof(struct unity_netentry));
-	if (newentry == NULL)
+	if (nentry == NULL)
 		return -1;
 
-	memcpy(&newentry->network,network,
+	memcpy(&nentry->network,network,
 		sizeof(struct unity_network));
-	newentry->next = NULL;
+	nentry->next = NULL;
 
 	/*
 	 * locate the last netentry in our
 	 * splitnet list and add our entry
 	 */
 	if (*list == NULL)
-		*list = newentry;
+		*list = nentry;
 	else {
 		struct unity_netentry * tmpentry = *list;
 		while (tmpentry->next != NULL)
 			tmpentry = tmpentry->next;
-		tmpentry->next = newentry;
+		tmpentry->next = nentry;
 	}
 
 	(*count)++;
 
 	return 0;

ipsec-tools-0.7-iface.patch:

--- NEW FILE ipsec-tools-0.7-iface.patch ---
diff -NarU5 ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp.c ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp.c
--- ipsec-tools-0.7.0-cvs070822.orig/src/racoon/isakmp.c	2007-07-18 08:07:51.000000000 -0400
+++ ipsec-tools-0.7.0-cvs070822/src/racoon/isakmp.c	2007-08-22 13:04:33.000000000 -0400
@@ -1722,10 +1722,24 @@
 			    strerror(errno));
 			return -1;
 		}
 #endif
 
+		if (setsockopt(p->sock, SOL_SOCKET,
+#ifdef __linux__
+					 SO_REUSEADDR,
+#else
+					 SO_REUSEPORT,
+#endif
+					 (void *)&yes, sizeof(yes)) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"failed to set REUSE flag on %s (%s).\n",
+				saddr2str(p->addr), strerror(errno));
+			close(p->sock);
+			goto err_and_next;
+		}
+
 		if (setsockopt_bypass(p->sock, p->addr->sa_family) < 0)
 			goto err_and_next;
 
 		if (bind(p->sock, p->addr, sysdep_sa_len(p->addr)) < 0) {
 			plog(LLV_ERROR, LOCATION, p->addr,


--- NEW FILE p1_up_down ---
#!/bin/bash

#
# manipulate IPSec SA database on behalf of the racoon daemon
# Gabriel Somlo <somlo at cmu edu>, 08/27/2007
#

#FIXME: read this from, e.g., /etc/sysconfig/racoon
NAT_T="yes"


shopt -s nocasematch
umask 0022

PATH=/bin:/sbin:/usr/bin:/usr/sbin

case "${NAT_T}" in
  yes|true|on|enable*|1)
    LOCAL="${LOCAL_ADDR}[${LOCAL_PORT}]"
    REMOTE="${REMOTE_ADDR}[${REMOTE_PORT}]"
    ;;
  *)
    LOCAL="${LOCAL_ADDR}"
    REMOTE="${REMOTE_ADDR}"
    ;;
esac

DFLT_RT=$(ip route list | awk '($1 == "default"){print $3 ";" $5}')
DFLT_IF=${DFLT_RT#*;}
DFLT_GW=${DFLT_RT%;*}


# convert something like '192.168.123.0/255.255.255.0' into '192.168.123.0/24'
# FIXME: convince racoon folks to return SPLIT_INCLUDE in the latter form ?
to_cidr() {
  local IP_ADDR=${1%/*}
  local NETMASK=${1#*/}
  local PREFIX_STR=$(ipcalc -p ${IP_ADDR} ${NETMASK})
  local PREFIX=${PREFIX_STR#*=}
  echo ${IP_ADDR}/${PREFIX}
}


phase1_up() {
  [ -f /etc/resolv.conf.prevpn ] || cp /etc/resolv.conf /etc/resolv.conf.prevpn
  {
    echo "# Generated by racoon on $(date)"
    echo "search ${DEFAULT_DOMAIN}"
    for NS in ${INTERNAL_DNS4_LIST}; do
      echo "nameserver ${NS}"
    done
  } > /etc/resolv.conf

  ip addr add dev ${DFLT_IF} ${INTERNAL_ADDR4}/32
  ip route add ${REMOTE_ADDR} via ${DFLT_GW} dev ${DFLT_IF}

  if [ -n "${SPLIT_INCLUDE}" ]; then
    for N in ${SPLIT_INCLUDE}; do
      ip route add $(to_cidr ${N}) via ${DFLT_GW} dev ${DFLT_IF} \
                                   src ${INTERNAL_ADDR4}
    done
  else
    for N in ${SPLIT_LOCAL}; do
      ip route add $(to_cidr ${N}) via ${DFLT_GW} dev ${DFLT_IF}
    done
    ip route del default
    ip route add default via ${DFLT_GW} dev ${DFLT_IF} src ${INTERNAL_ADDR4}
  fi

  setkey -c << EOT
spdadd ${INTERNAL_ADDR4}/32[any] 0.0.0.0/0[any] any -P out ipsec
       esp/tunnel/${LOCAL}-${REMOTE}/require;
spdadd 0.0.0.0/0[any] ${INTERNAL_ADDR4}[any] any -P in ipsec
       esp/tunnel/${REMOTE}-${LOCAL}/require;
EOT
}


phase1_down() {
  [ -f /etc/resolv.conf.prevpn ] && mv /etc/resolv.conf.prevpn /etc/resolv.conf

  if [ -n "${SPLIT_INCLUDE}" ]; then
    for N in ${SPLIT_INCLUDE}; do
      ip route del $(to_cidr ${N})
    done
  else
    for N in ${SPLIT_LOCAL}; do
      ip route del $(to_cidr ${N})
    done
    ip route del default
    ip route add default via ${DFLT_GW} dev ${DFLT_IF}
  fi

  ip route del ${REMOTE_ADDR}
  ip addr del dev ${DFLT_IF} ${INTERNAL_ADDR4}/32

  setkey -c << EOT
spddelete ${INTERNAL_ADDR4}/32[any] 0.0.0.0/0[any] any -P out ipsec
          esp/tunnel/${LOCAL}-${REMOTE}/require;
spddelete 0.0.0.0/0[any] ${INTERNAL_ADDR4}[any] any -P in ipsec
          esp/tunnel/${REMOTE}-${LOCAL}/require;
deleteall ${REMOTE_ADDR} ${LOCAL_ADDR} esp;
deleteall ${LOCAL_ADDR} ${REMOTE_ADDR} esp; 
# linux won't honor a 'deleteall', so we use flush (bad, but necessary for now)
flush;
EOT
}



echo "p1_up_down: $1 starting..."
echo "p1_up_down: LOCAL_ADDR = ${LOCAL_ADDR}"
echo "p1_up_down: LOCAL_PORT = ${LOCAL_PORT}"
echo "p1_up_down: REMOTE_ADDR = ${REMOTE_ADDR}"
echo "p1_up_down: REMOTE_PORT = ${REMOTE_PORT}"
echo "p1_up_down: DFLT_GW = ${DFLT_GW}"
echo "p1_up_down: DFLT_IF = ${DFLT_IF}"
echo "p1_up_down: INTERNAL_ADDR4 = ${INTERNAL_ADDR4}"
echo "p1_up_down: INTERNAL_DNS4 = ${INTERNAL_DNS4}"
echo "p1_up_down: DEFAULT_DOMAIN = ${DEFAULT_DOMAIN}"
echo "p1_up_down: SPLIT_INCLUDE = ${SPLIT_INCLUDE}"
echo "p1_up_down: SPLIT_LOCAL = ${SPLIT_LOCAL}"

echo ${INTERNAL_ADDR4} | grep -q '[0-9]' || {
  echo "p1_up_down: error: invalid INTERNAL_ADDR4."
  exit 1
}

echo ${DFLT_GW} | grep -q '[0-9]' || {
  echo "p1_up_down: error: invalid DFLT_GW."
  exit 2
}

case "$1" in
  phase1_up)
    phase1_up
    ;;
  phase1_down)
    phase1_down
    ;;
  *)
    echo "p1_up_down: error: must be called by racoon w. arg=phase1_[up|down]"
    exit 3
    ;;
esac

echo "p1_up_down: $1 completed successfully."
exit 0


--- NEW FILE racoon.init ---
#!/bin/sh
#
# chkconfig: - 15 85
# description: racoon is an IKE (ISAKMP/Oakley) key management daemon
# processname: racoon
# config: /etc/racoon/racoon.conf
#

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

prog=racoon
lockfile=/var/lock/subsys/$prog

RETVAL=0

start() {
	echo -n $"Starting $prog: "
	daemon $prog
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	RETVAL=$?
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	echo
	return $RETVAL
}

dostatus() {
	status $prog
}

restart() {
	stop
	start
}

condrestart() {
	[ -e $lockfile ] && restart || :
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart|reload)
	restart
	;;
  condrestart)
	condrestart
	;;
  status)
	dostatus
	;;
  *)
	echo "Usage: $prog {start|stop|restart|reload|condrestart|status}"
	exit 1
esac

exit $RETVAL


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ipsec-tools.spec	29 Aug 2007 04:53:14 -0000	1.44
+++ ipsec-tools.spec	20 Sep 2007 16:42:06 -0000	1.45
@@ -1,21 +1,22 @@
 Name: ipsec-tools
 Version: 0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
 URL: http://ipsec-tools.sourceforge.net/
 Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2
-Source1: ipsec.h
-Source2: pfkeyv2.h
-Source3: racoon.conf
-Source4: psk.txt
-Source5: xfrm.h
-Source6: udp.h
+Source1: racoon.conf
+Source2: psk.txt
+Source3: p1_up_down
+Source4: racoon.init
 Patch: ipsec-tools-0.7-libs.patch
 Patch2: isakmp.c.diff
 Patch3: ipsec-tools-0.7-acquires.patch
 Patch4: ipsec-tools-0.7-loopback.patch
+# the following three patches were also submitted upstream:
+Patch5: ipsec-tools-0.7-iface.patch
+Patch6: ipsec-tools-0.7-dupsplit.patch
  
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
@@ -37,15 +38,15 @@
 %patch2 -p1
 %patch3 -p1 -b .acquires
 %patch4 -p1 -b .loopback
+%patch5 -p1 -b .iface
+%patch6 -p1 -b .dupsplit
 
-mkdir -p kernel-headers/linux
-cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
 ./bootstrap
 
 %build
 sed -i 's|-Werror||g' configure
 CFLAGS="$RPM_OPT_FLAGS" %configure \
- --with-kernel-headers=`pwd`/kernel-headers \
+ --with-kernel-headers=/usr/include \
  --sysconfdir=/etc/racoon \
  --without-readline \
  --enable-adminport \
@@ -70,18 +71,33 @@
 	$RPM_BUILD_ROOT/%{_includedir} \
 	$RPM_BUILD_ROOT/%{_mandir}/man3
 
-install -m 600 %{SOURCE3} \
+install -m 600 %{SOURCE1} \
   $RPM_BUILD_ROOT/etc/racoon/racoon.conf
-install -m 600 %{SOURCE4} \
+install -m 600 %{SOURCE2} \
   $RPM_BUILD_ROOT/etc/racoon/psk.txt
 
 mv $RPM_BUILD_ROOT%{_sbindir}/setkey $RPM_BUILD_ROOT/sbin
 
 mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs
+mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/scripts
+install -m 700 %{SOURCE3} \
+  $RPM_BUILD_ROOT/etc/racoon/scripts/p1_up_down
+install -D -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/racoon
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ $1 = 1 ]; then
+        chkconfig --add racoon
+fi
+
+%preun
+if [ $1 = 0 ]; then
+        service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del racoon
+fi
+
 %files
 %defattr(-,root,root)
 %doc src/racoon/samples/racoon.conf src/racoon/samples/psk.txt
@@ -90,13 +106,23 @@
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man*/*
+%{_sysconfdir}/racoon/scripts/*
+%{_initrddir}/racoon
 %dir /etc/racoon
 %dir /etc/racoon/certs
+%dir /etc/racoon/scripts
 %dir /var/racoon
 %config(noreplace) /etc/racoon/psk.txt
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Thu Sep 20 2007 Steve Conklin <sconklin at redhat.com> - 0.7-3
+- Applied the following patches from Gabriel Somlo
+- Patches for connecting to Cisco ASA in remote-access (road-warrior) mode
+- Added phase1_up_down mode config script
+- Including our own .h files (ipsec, pfkeyv2, xfrm, udp) no longer necessary
+- Added init script for racoon daemon
+
 * Tue Aug 28 2007 Steve Conklin <sconklin at redhat.com> - 0.7-2
 - Fixed the loopback patch
 


Index: racoon.conf
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/racoon.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- racoon.conf	9 Sep 2004 06:18:45 -0000	1.1
+++ racoon.conf	20 Sep 2007 16:42:06 -0000	1.2
@@ -5,12 +5,31 @@
 path include "/etc/racoon";
 path pre_shared_key "/etc/racoon/psk.txt";
 path certificate "/etc/racoon/certs";
+path script "/etc/racoon/scripts";
 
 sainfo anonymous
 {
-	pfs_group 2;
+	#pfs_group 2;
 	lifetime time 1 hour ;
 	encryption_algorithm 3des, blowfish 448, rijndael ;
 	authentication_algorithm hmac_sha1, hmac_md5 ;
 	compression_algorithm deflate ;
 }
+
+#remote <IP-of-Cisco-ASA>
+#{
+#	exchange_mode main;
+#	my_identifier fqdn "host.name.of.vpn.client";
+#	certificate_type x509 "client.crt" "client.key";
+#	ca_type x509 "ca.crt";
+#	mode_cfg on;
+#	script "p1_up_down" phase1_up;
+#	script "p1_up_down" phase1_down;
+#	proposal
+#	{
+#		encryption_algorithm 3des;
+#		hash_algorithm sha1;
+#		authentication_method xauth_rsa_client;
+#		dh_group 2;
+#	}
+#}



From fedora-extras-commits at redhat.com  Thu Sep 20 16:48:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Thu, 20 Sep 2007 12:48:53 -0400
Subject: rpms/ksudoku/F-7 .cvsignore, 1.2, 1.3 ksudoku.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200709201648.l8KGmrpR031575@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/ksudoku/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514

Modified Files:
	.cvsignore ksudoku.spec sources 
Log Message:
update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2007 16:41:29 -0000	1.2
+++ .cvsignore	20 Sep 2007 16:48:20 -0000	1.3
@@ -1 +1 @@
-ksudoku-0.3.tar.gz
+ksudoku-0.4.tar.gz


Index: ksudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/ksudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ksudoku.spec	19 Aug 2007 22:32:10 -0000	1.2
+++ ksudoku.spec	20 Sep 2007 16:48:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ksudoku
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Sudoku game
 
 Group:          Amusements/Games
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils,kdelibs-devel
+BuildRequires:  desktop-file-utils,kdelibs-devel,cmake
 Requires:       hicolor-icon-theme
 
 %description
@@ -20,24 +20,28 @@
 %prep
 %setup -q
 #.desktop file fix
-%{__sed} -i 's/DocPath\=ksudoku\/ksudoku.html/Categories\=Game\;LogicGame\;KDE\;Qt\;/' src/ksudoku.desktop
+sed -e 's#DocPath\=ksudoku\/ksudoku.html#Categories\=Game\;LogicGame\;KDE\;Qt\;#' -e '15d' -i src/gui/ksudoku.desktop
 
 %build
-%configure --disable-dependency-tracking
-#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
+%cmake .
 make %{?_smp_mflags}
-
-%check
-make check
+meinproc --check --cache index.cache.bz2 doc/en/index.docbook
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT%{_libdir}
+cp src/gui/libksudoku_gui.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/libksudoku_export.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/draw/libksudoku_draw.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/views/libksudoku_views.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/logic/libksudoku_logic.so $RPM_BUILD_ROOT%{_libdir}/
+
+install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 index.cache.bz2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 doc/en/index.docbook $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
 #make symlink relative
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
 cd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
 ln -s ../common common
 
@@ -45,30 +49,40 @@
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --delete-original                               \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README VERSION doc/en/index*
+%doc AUTHORS ChangeLog COPYING README VERSION TODO
 %{_bindir}/*
+%{_libdir}/*
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*/*.png
-%doc %{_docdir}/HTML/en/%{name}
+%{_datadir}/config/ksudokurc
+%{_docdir}/HTML/en/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Sep 17 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.4-1
+- update to 0.4
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-3
 - License tag update
 * Tue Jan 16 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2007 16:41:29 -0000	1.2
+++ sources	20 Sep 2007 16:48:20 -0000	1.3
@@ -1 +1 @@
-d5fe20e9deda671dd15340f43ab4c4a3  ksudoku-0.3.tar.gz
+418f9ecac5756f7bc79863596dee7f34  ksudoku-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Rafa=C5=82_Psota?= (rafalzaq))
Date: Thu, 20 Sep 2007 12:55:08 -0400
Subject: rpms/ksudoku/devel .cvsignore, 1.2, 1.3 ksudoku.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200709201655.l8KGt8BG032218@cvs-int.fedora.redhat.com>

Author: rafalzaq

Update of /cvs/extras/rpms/ksudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31998

Modified Files:
	.cvsignore ksudoku.spec sources 
Log Message:
update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2007 16:41:29 -0000	1.2
+++ .cvsignore	20 Sep 2007 16:54:35 -0000	1.3
@@ -1 +1 @@
-ksudoku-0.3.tar.gz
+ksudoku-0.4.tar.gz


Index: ksudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/ksudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ksudoku.spec	25 Aug 2007 14:49:56 -0000	1.3
+++ ksudoku.spec	20 Sep 2007 16:54:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ksudoku
-Version:        0.3
-Release:        4%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Sudoku game
 
 Group:          Amusements/Games
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils,kdelibs-devel
+BuildRequires:  desktop-file-utils,kdelibs-devel,cmake
 Requires:       hicolor-icon-theme
 
 %description
@@ -20,24 +20,28 @@
 %prep
 %setup -q
 #.desktop file fix
-%{__sed} -i 's/DocPath\=ksudoku\/ksudoku.html/Categories\=Game\;LogicGame\;KDE\;Qt\;/' src/ksudoku.desktop
+sed -e 's#DocPath\=ksudoku\/ksudoku.html#Categories\=Game\;LogicGame\;KDE\;Qt\;#' -e '15d' -i src/gui/ksudoku.desktop
 
 %build
-%configure --disable-dependency-tracking
-#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
+%cmake .
 make %{?_smp_mflags}
-
-%check
-make check
+meinproc --check --cache index.cache.bz2 doc/en/index.docbook
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir $RPM_BUILD_ROOT%{_libdir}
+cp src/gui/libksudoku_gui.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/libksudoku_export.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/export/draw/libksudoku_draw.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/gui/views/libksudoku_views.so $RPM_BUILD_ROOT%{_libdir}/
+cp src/logic/libksudoku_logic.so $RPM_BUILD_ROOT%{_libdir}/
+
+install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 index.cache.bz2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
+install -m 0644 doc/en/index.docbook $RPM_BUILD_ROOT%{_docdir}/HTML/en/ksudoku
 #make symlink relative
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
 cd $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}
 ln -s ../common common
 
@@ -45,30 +49,40 @@
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --delete-original                               \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README VERSION doc/en/index*
+%doc AUTHORS ChangeLog COPYING README VERSION TODO
 %{_bindir}/*
+%{_libdir}/*
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*/*.png
-%doc %{_docdir}/HTML/en/%{name}
+%{_datadir}/config/ksudokurc
+%{_docdir}/HTML/en/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Sep 17 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.4-1
+- update to 0.4
 * Sat Aug 25 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-4
 - BuildID rebuild
 * Mon Aug 20 2007 Rafa?? Psota <rafalzaq at gmail.com> - 0.3-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksudoku/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2007 16:41:29 -0000	1.2
+++ sources	20 Sep 2007 16:54:35 -0000	1.3
@@ -1 +1 @@
-d5fe20e9deda671dd15340f43ab4c4a3  ksudoku-0.3.tar.gz
+418f9ecac5756f7bc79863596dee7f34  ksudoku-0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:11 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:11 -0700
Subject: [pkgdb] calc: mattdm has requested watchbugzilla
Message-ID: <200709201655.l8KGtBW4005518@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:11 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:11 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201655.l8KGtBAl005526@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:14 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:14 -0700
Subject: [pkgdb] calc: mattdm has requested watchcommits
Message-ID: <200709201655.l8KGtEpV022655@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:16 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:16 -0700
Subject: [pkgdb] calc: mattdm has requested approveacls
Message-ID: <200709201655.l8KGtGnj005542@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the approveacls acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:24 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:24 -0700
Subject: [pkgdb] calc: mattdm has requested watchbugzilla
Message-ID: <200709201655.l8KGtOi0005580@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchbugzilla acl on calc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:26 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:26 -0700
Subject: [pkgdb] calc: mattdm has requested watchcommits
Message-ID: <200709201655.l8KGtQUG022712@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the watchcommits acl on calc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:28 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:28 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201655.l8KGtSvJ005602@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:55:29 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:55:29 -0700
Subject: [pkgdb] calc: mattdm has requested approveacls
Message-ID: <200709201655.l8KGtTLK005612@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the approveacls acl on calc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:32 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:32 -0700
Subject: [pkgdb] calc: mattdm has given up commit
Message-ID: <200709201656.l8KGuWZ0005887@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has given up the commit acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:35 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:35 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuZru005905@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the commit acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:33 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:33 -0700
Subject: [pkgdb] calc: mattdm has requested commit
Message-ID: <200709201656.l8KGuXUb023060@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has requested the commit acl on calc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:37 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:37 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGubVP023077@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchcommits acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:40 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:40 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGue0D023090@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the approveacls acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:43 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:43 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuhNb023107@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchbugzilla acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:38 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:38 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuc8W005918@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchbugzilla acl on calc (Fedora devel) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:44 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:44 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGuiYY005947@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the watchcommits acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:46 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:46 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGukur023127@app3.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the commit acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 16:56:48 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 09:56:48 -0700
Subject: [pkgdb] calc had acl change status
Message-ID: <200709201656.l8KGumvV005967@app4.fedora.phx.redhat.com>

Matthew Miller (mattdm) has set the approveacls acl on calc (Fedora 7) to Approved for Matthew Miller (mattdm)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calc



From fedora-extras-commits at redhat.com  Thu Sep 20 17:05:27 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:05:27 -0400
Subject: rpms/calc/F-7 calc-2.12.2.1-entangled-readline.patch, NONE,
	1.1 calc-2.12.2.1-no-custom-means-no-custom.patch, NONE,
	1.1 calc-COPYING-GPL, NONE, 1.1 calc-converted-to-gpl.txt, NONE,
	1.1 calc.spec, NONE, 1.1
Message-ID: <200709201705.l8KH5RC4006240@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6224

Added Files:
	calc-2.12.2.1-entangled-readline.patch 
	calc-2.12.2.1-no-custom-means-no-custom.patch calc-COPYING-GPL 
	calc-converted-to-gpl.txt calc.spec 
Log Message:
initial package

calc-2.12.2.1-entangled-readline.patch:

--- NEW FILE calc-2.12.2.1-entangled-readline.patch ---
diff -ur calc-2.12.2.1.linkingisfun/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.linkingisfun/Makefile	2007-09-06 04:08:39.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-18 16:50:23.000000000 -0400
@@ -806,7 +806,9 @@
 #USE_READLINE= -DUSE_READLINE
 #
 READLINE_LIB=
-#READLINE_LIB= -lreadline -lhistory -lncurses
+READLINE_EXTRAS=
+#READLINE_LIB= -lreadline 
+#READLINE_EXTRAS= -lhistory -lncurses
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
@@ -1838,10 +1840,10 @@
 calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
 	${RM} -f $@
 	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-	      ${READLINE_LIB} -o $@
+	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
 libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
-	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
+	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} ${READLINE_LIB} -o libcalc${LIB_EXT_VERSION}
 
 libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
 	${Q} ${RM} -f $@

calc-2.12.2.1-no-custom-means-no-custom.patch:

--- NEW FILE calc-2.12.2.1-no-custom-means-no-custom.patch ---
Common subdirectories: calc-2.12.2.1.no-means-no/cal and calc-2.12.2.1/cal
Common subdirectories: calc-2.12.2.1.no-means-no/cscript and calc-2.12.2.1/cscript
Common subdirectories: calc-2.12.2.1.no-means-no/custom and calc-2.12.2.1/custom
Common subdirectories: calc-2.12.2.1.no-means-no/help and calc-2.12.2.1/help
diff -u calc-2.12.2.1.no-means-no/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.no-means-no/Makefile	2007-09-19 13:39:17.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-19 14:09:08.000000000 -0400
@@ -767,12 +767,29 @@
 MANMODE= 0444
 CATMODE= 0444
 
+# By default, custom builtin functions may only be executed if calc
+# is given the -C option.  This is because custom builtin functions
+# may invoke non-standard or non-portable code.	 One may completely
+# disable custom builtin functions by not compiling any of code
+#
+# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
+# ALLOW_CUSTOM=			# disable custom even if -C is given
+#
+# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
+#
+ALLOW_CUSTOM= -DCUSTOM
+#ALLOW_CUSTOM=
+
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
 # Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+else
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
+endif
 #CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 # If the $CALCRC environment variable is not defined, then the following
@@ -925,18 +942,6 @@
 #	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
 #	  MALLOC_CLEAR_MALLOC=1 LD_LIBRARY_PATH=.:./custom
 
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
 
 # The install rule uses:
 #
@@ -1280,7 +1285,11 @@
 CFLAGS= ${ICFLAGS} ${CCOPT}
 #
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+else
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC}
+endif
 #
 #if 0	/* start of skip for non-Gnu makefiles */
 endif
@@ -1691,6 +1700,7 @@
 #
 OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
 
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 # static library build
 #
 CALC_STATIC_LIBS= libcalc.a libcustcalc.a
@@ -1705,6 +1715,20 @@
 	libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
 	libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
 	libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
+else
+# static library build
+#
+CALC_STATIC_LIBS= libcalc.a
+
+# Libaraies created and used to build calc
+#
+CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION}
+
+# Symlinks of dymanic shared libraries
+#
+SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
+	libcalc${LIB_EXT_VERS}
+endif
 
 # list of sample programs to that need to be built to satisfy sample rule
 #
@@ -1735,7 +1759,11 @@
 
 # early targets - things needed before the main build phase can begin
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 EARLY_TARGETS= custom/Makefile hsrc .hsrc custom/.all
+else
+EARLY_TARGETS= hsrc .hsrc
+endif
 
 # late targets - things needed after the main build phase is complete
 #
Common subdirectories: calc-2.12.2.1.no-means-no/win32 and calc-2.12.2.1/win32


--- NEW FILE calc-COPYING-GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library General
Public License instead of this License.


--- NEW FILE calc-converted-to-gpl.txt ---
This copy of Calc is linked against the GNU Readline library. Normally, Calc
is distributed under the LGPL, and for this copy, section 3 of the LGPL has
been applied:

      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.

Thus, this copy and all subsequent copies and derivative works are under the
terms of the GNU General Public License version 2.

The original "COPYING" document distributed with calc has been removed, as
it is not licensed in a way which permits the changes necessary to make this
conversion. You can find the relevant information in the source RPM or on
the web site at <http://isthe.com/chongo/tech/comp/calc/calc-download.html>.

NOTE: This is intended as a short-term fix; hopefully in the future the
command-line program and the calc libraries will be split in a way that
makes this unnecessary.


--- NEW FILE calc.spec ---
# Enabling this option invokes section 3 of the LGPL, applying the terms of
# the ordinary GNU General Public License version 2 instead of the LGPL.
# See the included "calc-converted-to-gpl.txt" source file for details.
%define with_readline 1

# This is disabled right now because it prevents correct linking. The issues
# here are related to the issues with linking with readline, in that the 
# split between libraries is poorly defined.
%define with_custom_interface 0

%if %{with_readline}
License:       GPLv2
%else
License:       LGPLv2
%endif

Name:          calc
Version:       2.12.2.1
Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
Summary:       Arbitrary precision arithmetic system and calculator

Group:         Applications/Engineering
URL:           http://isthe.com/chongo/tech/comp/calc/
Source0:       http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
Source1:       calc-converted-to-gpl.txt
Source2:       calc-COPYING-GPL
Patch0:        calc-2.12.2.1-entangled-readline.patch
Patch1:        calc-2.12.2.1-no-custom-means-no-custom.patch

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed

%if %{with_readline}
BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
%endif

Requires:      less >= 358

# Temporary! This is due to a build bug; should be fixed shortly.
ExcludeArch:   ppc

%description
Calc is an arbitrary precision C-like arithmetic system that is a
calculator, an algorithm-prototyper, and a mathematical research tool. Calc
comes with a rich set of built-in mathematical and programmatic functions.


%package libs
Summary:       Libraries for the calc arithmetic system
Group:         System Environment/Libraries

%description libs
Shared libraries used by the calc command line calculator and other programs
using its arbitrary precision arithmetic routines.


%package devel
Summary:        Development files for the calc arithmetic system
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
This package contains files necessary to build applications which use the
calc arbitrary precision arithmetic system.


%package stdrc
Summary:      Standard resource files the calc arithmetic system
Group:        Applications/Engineering
Requires:     %{name} = %{version}-%{release}

%description stdrc
This package contains the standard calc resource files and several calc
shell scripts. They serve as examples of the calc language and may also be
useful in themselves.



%prep
%setup -q

%patch0 -p1 -b .link
%patch1 -p1 -b .nomeansno

%if %{with_readline}
  for f in help.c version.c calc.man cal/* $( ls help/*|grep  '^help/credit$' ) ; do
    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
  done
  cp -p %{SOURCE1} COPYING
  cp -p %{SOURCE2} COPYING-GPL
%endif


%build
# note parallel make (-j3, or whatever) doesn't work correctly.
make DEBUG="%{optflags}" \
%if %{with_custom_interface}
     ALLOW_CUSTOM="-DCUSTOM" \
%else
     ALLOW_CUSTOM="" \
%endif
     LD_SHARE="" \
%if %{with_readline}
     USE_READLINE="-DUSE_READLINE" \
     READLINE_LIB="-lreadline" \
     READLINE_EXTRAS="-lhistory -lncurses" \
%else
     USE_READLINE="" \
%endif
     T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     Q="" V="@" \
     all


%install
rm -rf %{buildroot}

make T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     install

%if %{with_readline} 
  rm -f %{buildroot}/%{_datadir}/%{name}/help/COPYING-LGPL
  # mode 444 to match the other files
  install -p -m 444 COPYING-GPL %{buildroot}/%{_datadir}/%{name}/help/
  rm -f %{buildroot}/%{_datadir}/%{name}/bindings
%endif

%if ! %{with_custom_interface}
  # if we don't enable the custom interface, don't ship it.
  rm -f %{buildroot}/%{_libdir}/libcustcalc.so*
  rm -f %{buildroot}/%{_datadir}/%{name}/custom/*
  rmdir %{buildroot}/%{_datadir}/%{name}/custom/
%endif

# Changing permissions of executables to 755 to shut up rpmlint.
chmod 755 %{buildroot}%{_datadir}/%{name}/cscript/*
chmod 755 %{buildroot}%{_bindir}/calc

# move these so the doc macro can find them
mv %{buildroot}%{_datadir}/%{name}/README README-standard-resource
mv cscript/README README-cscript


%check
make chk
     

%clean
rm -rf %{buildroot}


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_bindir}/calc
%{_mandir}/man1/calc.1*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/help
%{_datadir}/%{name}/help/*
%dir %{_datadir}/%{name}/custhelp
%{_datadir}/%{name}/custhelp/*
%if ! %{with_readline}
%{_datadir}/%{name}/bindings
%endif

%files libs
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_libdir}/libcalc.so.*
%if %{with_custom_interface}
%{_libdir}/libcustcalc.so.*
%endif

%files devel
%defattr(-, root, root, -)
%doc LIBRARY
%{_libdir}/libcalc.so
%if %{with_custom_interface}    
%{_libdir}/libcustcalc.so
%endif
%dir %{_includedir}/calc
%{_includedir}/calc/*.h

%files stdrc
%defattr(-, root, root, -)
%doc README-standard-resource README-cscript
%dir %{_datadir}/%{name}/cscript
%{_datadir}/%{name}/cscript/*
%if %{with_custom_interface}
%dir %{_datadir}/%{name}/custom
%{_datadir}/%{name}/custom/*
%endif
%{_datadir}/%{name}/*.cal
%{_datadir}/%{name}/*.line


%changelog
* Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
- initial package for Fedora
- clear old and long pre-fedora changelog
- review request rhbug #227570



From fedora-extras-commits at redhat.com  Thu Sep 20 17:06:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Thu, 20 Sep 2007 13:06:59 -0400
Subject: rpms/aria2/devel .cvsignore, 1.6, 1.7 aria2.spec, 1.5, 1.6 sources, 
	1.6, 1.7
Message-ID: <200709201706.l8KH6xa4006351@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/aria2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6275

Modified Files:
	.cvsignore aria2.spec sources 
Log Message:
* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
- 0.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Aug 2007 12:18:01 -0000	1.6
+++ .cvsignore	20 Sep 2007 17:06:25 -0000	1.7
@@ -1 +1 @@
-aria2-0.11.2.tar.bz2
+aria2-0.11.3.tar.bz2


Index: aria2.spec
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/aria2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aria2.spec	24 Aug 2007 12:18:01 -0000	1.5
+++ aria2.spec	20 Sep 2007 17:06:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           aria2
-Version:        0.11.2
+Version:        0.11.3
 Release:        1%{?dist}
 Summary:        High speed download utility with resuming and segmented downloading
 Group:          Applications/Internet
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
+- 0.11.3
+
 * Fri Aug 24 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.2-1
 - 0.11.2
 - Fix License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aria2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Aug 2007 12:18:01 -0000	1.6
+++ sources	20 Sep 2007 17:06:25 -0000	1.7
@@ -1 +1 @@
-4b58849f0bf7f2abab1675ce2e8958ec  aria2-0.11.2.tar.bz2
+93d77ba3238d3954df39157fc77349d3  aria2-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 17:08:57 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:08:57 -0400
Subject: rpms/calc/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709201708.l8KH8vk4006469@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432

Modified Files:
	.cvsignore sources 
Log Message:
it works better if you include the actual source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	20 Sep 2007 17:08:24 -0000	1.2
@@ -0,0 +1 @@
+calc-2.12.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Sep 2007 16:39:41 -0000	1.1
+++ sources	20 Sep 2007 17:08:24 -0000	1.2
@@ -0,0 +1 @@
+c399c7b7d71d756c5eaef77e414a732b  calc-2.12.2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 17:17:17 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:17:17 -0400
Subject: rpms/calc/devel calc-2.12.2.1-entangled-readline.patch, NONE,
	1.1 calc-2.12.2.1-no-custom-means-no-custom.patch, NONE,
	1.1 calc-COPYING-GPL, NONE, 1.1 calc-converted-to-gpl.txt, NONE,
	1.1 calc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709201717.l8KHHHhi006747@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6712

Modified Files:
	.cvsignore sources 
Added Files:
	calc-2.12.2.1-entangled-readline.patch 
	calc-2.12.2.1-no-custom-means-no-custom.patch calc-COPYING-GPL 
	calc-converted-to-gpl.txt calc.spec 
Log Message:
initial package

calc-2.12.2.1-entangled-readline.patch:

--- NEW FILE calc-2.12.2.1-entangled-readline.patch ---
diff -ur calc-2.12.2.1.linkingisfun/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.linkingisfun/Makefile	2007-09-06 04:08:39.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-18 16:50:23.000000000 -0400
@@ -806,7 +806,9 @@
 #USE_READLINE= -DUSE_READLINE
 #
 READLINE_LIB=
-#READLINE_LIB= -lreadline -lhistory -lncurses
+READLINE_EXTRAS=
+#READLINE_LIB= -lreadline 
+#READLINE_EXTRAS= -lhistory -lncurses
 #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
 #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
@@ -1838,10 +1840,10 @@
 calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
 	${RM} -f $@
 	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-	      ${READLINE_LIB} -o $@
+	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
 
 libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
-	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
+	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} ${READLINE_LIB} -o libcalc${LIB_EXT_VERSION}
 
 libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
 	${Q} ${RM} -f $@

calc-2.12.2.1-no-custom-means-no-custom.patch:

--- NEW FILE calc-2.12.2.1-no-custom-means-no-custom.patch ---
Common subdirectories: calc-2.12.2.1.no-means-no/cal and calc-2.12.2.1/cal
Common subdirectories: calc-2.12.2.1.no-means-no/cscript and calc-2.12.2.1/cscript
Common subdirectories: calc-2.12.2.1.no-means-no/custom and calc-2.12.2.1/custom
Common subdirectories: calc-2.12.2.1.no-means-no/help and calc-2.12.2.1/help
diff -u calc-2.12.2.1.no-means-no/Makefile calc-2.12.2.1/Makefile
--- calc-2.12.2.1.no-means-no/Makefile	2007-09-19 13:39:17.000000000 -0400
+++ calc-2.12.2.1/Makefile	2007-09-19 14:09:08.000000000 -0400
@@ -767,12 +767,29 @@
 MANMODE= 0444
 CATMODE= 0444
 
+# By default, custom builtin functions may only be executed if calc
+# is given the -C option.  This is because custom builtin functions
+# may invoke non-standard or non-portable code.	 One may completely
+# disable custom builtin functions by not compiling any of code
+#
+# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
+# ALLOW_CUSTOM=			# disable custom even if -C is given
+#
+# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
+#
+ALLOW_CUSTOM= -DCUSTOM
+#ALLOW_CUSTOM=
+
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
 # Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+else
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
+endif
 #CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 # If the $CALCRC environment variable is not defined, then the following
@@ -925,18 +942,6 @@
 #	  MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \
 #	  MALLOC_CLEAR_MALLOC=1 LD_LIBRARY_PATH=.:./custom
 
-# By default, custom builtin functions may only be executed if calc
-# is given the -C option.  This is because custom builtin functions
-# may invoke non-standard or non-portable code.	 One may completely
-# disable custom builtin functions by not compiling any of code
-#
-# ALLOW_CUSTOM= -DCUSTOM	# allow custom only if -C is given
-# ALLOW_CUSTOM=			# disable custom even if -C is given
-#
-# If in doubt, use ALLOW_CUSTOM= -DCUSTOM
-#
-ALLOW_CUSTOM= -DCUSTOM
-#ALLOW_CUSTOM=
 
 # The install rule uses:
 #
@@ -1280,7 +1285,11 @@
 CFLAGS= ${ICFLAGS} ${CCOPT}
 #
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+else
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC}
+endif
 #
 #if 0	/* start of skip for non-Gnu makefiles */
 endif
@@ -1691,6 +1700,7 @@
 #
 OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
 
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 # static library build
 #
 CALC_STATIC_LIBS= libcalc.a libcustcalc.a
@@ -1705,6 +1715,20 @@
 	libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
 	libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
 	libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
+else
+# static library build
+#
+CALC_STATIC_LIBS= libcalc.a
+
+# Libaraies created and used to build calc
+#
+CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION}
+
+# Symlinks of dymanic shared libraries
+#
+SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
+	libcalc${LIB_EXT_VERS}
+endif
 
 # list of sample programs to that need to be built to satisfy sample rule
 #
@@ -1735,7 +1759,11 @@
 
 # early targets - things needed before the main build phase can begin
 #
+ifeq ($(ALLOW_CUSTOM),"-DCUSTOM")
 EARLY_TARGETS= custom/Makefile hsrc .hsrc custom/.all
+else
+EARLY_TARGETS= hsrc .hsrc
+endif
 
 # late targets - things needed after the main build phase is complete
 #
Common subdirectories: calc-2.12.2.1.no-means-no/win32 and calc-2.12.2.1/win32


--- NEW FILE calc-COPYING-GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library General
Public License instead of this License.


--- NEW FILE calc-converted-to-gpl.txt ---
This copy of Calc is linked against the GNU Readline library. Normally, Calc
is distributed under the LGPL, and for this copy, section 3 of the LGPL has
been applied:

      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.

Thus, this copy and all subsequent copies and derivative works are under the
terms of the GNU General Public License version 2.

The original "COPYING" document distributed with calc has been removed, as
it is not licensed in a way which permits the changes necessary to make this
conversion. You can find the relevant information in the source RPM or on
the web site at <http://isthe.com/chongo/tech/comp/calc/calc-download.html>.

NOTE: This is intended as a short-term fix; hopefully in the future the
command-line program and the calc libraries will be split in a way that
makes this unnecessary.


--- NEW FILE calc.spec ---
# Enabling this option invokes section 3 of the LGPL, applying the terms of
# the ordinary GNU General Public License version 2 instead of the LGPL.
# See the included "calc-converted-to-gpl.txt" source file for details.
%define with_readline 1

# This is disabled right now because it prevents correct linking. The issues
# here are related to the issues with linking with readline, in that the 
# split between libraries is poorly defined.
%define with_custom_interface 0

%if %{with_readline}
License:       GPLv2
%else
License:       LGPLv2
%endif

Name:          calc
Version:       2.12.2.1
Release:       7%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
Summary:       Arbitrary precision arithmetic system and calculator

Group:         Applications/Engineering
URL:           http://isthe.com/chongo/tech/comp/calc/
Source0:       http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
Source1:       calc-converted-to-gpl.txt
Source2:       calc-COPYING-GPL
Patch0:        calc-2.12.2.1-entangled-readline.patch
Patch1:        calc-2.12.2.1-no-custom-means-no-custom.patch

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed

%if %{with_readline}
BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
%endif

Requires:      less >= 358

# Temporary! This is due to a build bug; should be fixed shortly.
ExcludeArch:   ppc

%description
Calc is an arbitrary precision C-like arithmetic system that is a
calculator, an algorithm-prototyper, and a mathematical research tool. Calc
comes with a rich set of built-in mathematical and programmatic functions.


%package libs
Summary:       Libraries for the calc arithmetic system
Group:         System Environment/Libraries

%description libs
Shared libraries used by the calc command line calculator and other programs
using its arbitrary precision arithmetic routines.


%package devel
Summary:        Development files for the calc arithmetic system
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
This package contains files necessary to build applications which use the
calc arbitrary precision arithmetic system.


%package stdrc
Summary:      Standard resource files the calc arithmetic system
Group:        Applications/Engineering
Requires:     %{name} = %{version}-%{release}

%description stdrc
This package contains the standard calc resource files and several calc
shell scripts. They serve as examples of the calc language and may also be
useful in themselves.



%prep
%setup -q

%patch0 -p1 -b .link
%patch1 -p1 -b .nomeansno

%if %{with_readline}
  for f in help.c version.c calc.man cal/* $( ls help/*|grep  '^help/credit$' ) ; do
    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
  done
  cp -p %{SOURCE1} COPYING
  cp -p %{SOURCE2} COPYING-GPL
%endif


%build
# note parallel make (-j3, or whatever) doesn't work correctly.
make DEBUG="%{optflags}" \
%if %{with_custom_interface}
     ALLOW_CUSTOM="-DCUSTOM" \
%else
     ALLOW_CUSTOM="" \
%endif
     LD_SHARE="" \
%if %{with_readline}
     USE_READLINE="-DUSE_READLINE" \
     READLINE_LIB="-lreadline" \
     READLINE_EXTRAS="-lhistory -lncurses" \
%else
     USE_READLINE="" \
%endif
     T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     Q="" V="@" \
     all


%install
rm -rf %{buildroot}

make T=%{buildroot} \
     BINDIR=%{_bindir} \
     LIBDIR=%{_libdir} \
     CALC_SHAREDIR=%{_datadir}/%{name} \
     CALC_INCDIR=%{_includedir}/calc \
     SCRIPTDIR=%{_datadir}/%{name}/cscript \
     MANDIR=%{_mandir}/man1 \
     install

%if %{with_readline} 
  rm -f %{buildroot}/%{_datadir}/%{name}/help/COPYING-LGPL
  # mode 444 to match the other files
  install -p -m 444 COPYING-GPL %{buildroot}/%{_datadir}/%{name}/help/
  rm -f %{buildroot}/%{_datadir}/%{name}/bindings
%endif

%if ! %{with_custom_interface}
  # if we don't enable the custom interface, don't ship it.
  rm -f %{buildroot}/%{_libdir}/libcustcalc.so*
  rm -f %{buildroot}/%{_datadir}/%{name}/custom/*
  rmdir %{buildroot}/%{_datadir}/%{name}/custom/
%endif

# Changing permissions of executables to 755 to shut up rpmlint.
chmod 755 %{buildroot}%{_datadir}/%{name}/cscript/*
chmod 755 %{buildroot}%{_bindir}/calc

# move these so the doc macro can find them
mv %{buildroot}%{_datadir}/%{name}/README README-standard-resource
mv cscript/README README-cscript


%check
make chk
     

%clean
rm -rf %{buildroot}


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_bindir}/calc
%{_mandir}/man1/calc.1*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/help
%{_datadir}/%{name}/help/*
%dir %{_datadir}/%{name}/custhelp
%{_datadir}/%{name}/custhelp/*
%if ! %{with_readline}
%{_datadir}/%{name}/bindings
%endif

%files libs
%defattr(-, root, root, -)
%doc BUGS CHANGES COPYING COPYING-%( echo %{license}|sed s/v2// )
%{_libdir}/libcalc.so.*
%if %{with_custom_interface}
%{_libdir}/libcustcalc.so.*
%endif

%files devel
%defattr(-, root, root, -)
%doc LIBRARY
%{_libdir}/libcalc.so
%if %{with_custom_interface}    
%{_libdir}/libcustcalc.so
%endif
%dir %{_includedir}/calc
%{_includedir}/calc/*.h

%files stdrc
%defattr(-, root, root, -)
%doc README-standard-resource README-cscript
%dir %{_datadir}/%{name}/cscript
%{_datadir}/%{name}/cscript/*
%if %{with_custom_interface}
%dir %{_datadir}/%{name}/custom
%{_datadir}/%{name}/custom/*
%endif
%{_datadir}/%{name}/*.cal
%{_datadir}/%{name}/*.line


%changelog
* Wed Sep 19 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-7
- disable libcustcalc/calc -C -- there's some Serious Linking Correctness
  Issues which need to be resolved.
- Ditch the parts of the patch that attempted to make linking libcustcalc
  work; rename to "entangled-readline" to reflect reduced scope.
- Make new calc-2.12.2.1-no-custom-means-no-custom.patch to make
  ALLOW_CUSTOM actually control whether the custom code is built, not just
  whether there's a code path which allows its use.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-6
- revise calc-2.12.2.1-everything-interlinked.patch to be more fine-grained

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-5
- set Q and V make variables to not-quiet and verbose build modes to 
  aid in debugging PPC build problem; also, doesn't seem like a bad
  idea in general.
- add calc-2.12.2.1-everything-interlinked.patch to fix
  undefined-non-weak-signal problems: need to link libcalc against readline
  (if readline enabled) and need to link libcustomcalc against libcalc.
- put docs in the libs subpackage.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-4
- temporarily ExcludeArch ppc due to a build problem. This 
  should be fixed shortly.

* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-3
- add LIBRARY doc to devel subpackage
- spec file cleanups as suggested by Mamoru Tasaka:
- use cp/install -p to preserve timestamp when copying files.
- note that make with smp_mflags fails.
- explicitly set defattr's dir mode to - to keep defaults. 

* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-2
- allow customlib functions with -DCUSTOM.
- made stdrc subpackage for standard resource files and scripts.
- only ship internal line-editor keybindings file if we're not using
  readline
- fix some packaging issues as follows (thanks Till Maas).
- Prefix COPYING-GPL source file with "calc" to avoid file conflicts. 
  Just in case. :)
- defattr for all files sections.
- make the devel package rely on calc-libs, not calc. This is largely
  academic since the calc libs and binaries are not as clearly separated
  as they should be -- a future upstream version will improve this, though,
  so we might as well do the right thing.
- make calc-libs not require calc proper; theoretically this should be true.

* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-1
- updated to 2.12.2.1

* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.5
- minor spec file cleanup for package review

* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.4
- fix (i.e., remove) rpath by setting LD_SHARE to "".

* Tue Sep  4 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.3
- minor correction to LGPL-GPL conversion

* Mon Sep  3 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.2
- LGPL/GPL -> explicit LGPLv2/GPLv2
- make the LGPL->GPL conversion via spec file script, not a patch
- now that we're building dynamic libraries, make libs and devel subpackages

* Sun Sep  2 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.1
- update to 2.12.2
- yay -- patches to build dynamically are now upstream. so build
  dynamically.

* Thu Jul 12 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.13-1
- Update to 2.12.1.13
- Remove calc-2.12.1.6_remove-bad-snprintf-replacement.patch, which is now
  now upstream.
- Added calc-2.12.1.13-removemd5.patch due to licensing issues (md5 code
  is distributable, but not lgpl compatible).
- Added switch to enable readline and convert to gpl, or to not.
  see comment in Feb 8 2007 changelog entry for more.

* Thu Feb  8 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-2
- disable linking against readline to avoid converting from LGPL to GPL.
  This is insignificant for this release of the package which doesn't
  actually include any libraries, but is something I want to preserve for
  the future when we're building dynamic libs. I'm working with upstream in
  getting this resolved -- ideally, the library remains LGPL but the
  command-line tool is separated to the point where it alone links with
  readline and can be relicensed as GPL without affecting the rest. If the
  outcome isn't positive, I'm probably going to bite the bullet and make a
  GPL-fork patch.
 
* Wed Feb  7 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-1
- update to 2.12.1.8
- invalid comments problem now fixed upstream -- drop that patch.
- patching out custom completely isn't really necessary -- just unsetting
  the config variable and removing the built library is sufficient.
- make sure to set the "DEBUG" variable correctly (not -O3 -g3)
- actually use the system readline library
- don't need to pass so many variables into make chk.
- chmod executables to 755 instead of 555 to placate rpmlint

* Tue Feb  6 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-3
- include fix for invalid sample files (# is not a comment character).

* Mon Feb  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-2
- create Fedora package from existing BU Linux package (clearing BU Linux
  changelog).
- add patch to use the system snprintf -- sheesh.
- move the "cscript" stuff to be under datadir instead of bin.
- list calc binary and man page explicitly in the files section.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Sep 2007 16:39:41 -0000	1.1
+++ .cvsignore	20 Sep 2007 17:16:44 -0000	1.2
@@ -0,0 +1 @@
+calc-2.12.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Sep 2007 16:39:41 -0000	1.1
+++ sources	20 Sep 2007 17:16:44 -0000	1.2
@@ -0,0 +1 @@
+c399c7b7d71d756c5eaef77e414a732b  calc-2.12.2.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 17:19:50 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 13:19:50 -0400
Subject: rpms/calc/devel calc.spec,1.1,1.2
Message-ID: <200709201719.l8KHJoIY006780@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6760

Modified Files:
	calc.spec 
Log Message:
no, wait, actually I want to start here


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calc.spec	20 Sep 2007 17:16:44 -0000	1.1
+++ calc.spec	20 Sep 2007 17:19:17 -0000	1.2
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       7%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -213,111 +213,7 @@
 
 
 %changelog
-* Wed Sep 19 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-7
-- disable libcustcalc/calc -C -- there's some Serious Linking Correctness
-  Issues which need to be resolved.
-- Ditch the parts of the patch that attempted to make linking libcustcalc
-  work; rename to "entangled-readline" to reflect reduced scope.
-- Make new calc-2.12.2.1-no-custom-means-no-custom.patch to make
-  ALLOW_CUSTOM actually control whether the custom code is built, not just
-  whether there's a code path which allows its use.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-6
-- revise calc-2.12.2.1-everything-interlinked.patch to be more fine-grained
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-5
-- set Q and V make variables to not-quiet and verbose build modes to 
-  aid in debugging PPC build problem; also, doesn't seem like a bad
-  idea in general.
-- add calc-2.12.2.1-everything-interlinked.patch to fix
-  undefined-non-weak-signal problems: need to link libcalc against readline
-  (if readline enabled) and need to link libcustomcalc against libcalc.
-- put docs in the libs subpackage.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-4
-- temporarily ExcludeArch ppc due to a build problem. This 
-  should be fixed shortly.
-
-* Tue Sep 18 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-3
-- add LIBRARY doc to devel subpackage
-- spec file cleanups as suggested by Mamoru Tasaka:
-- use cp/install -p to preserve timestamp when copying files.
-- note that make with smp_mflags fails.
-- explicitly set defattr's dir mode to - to keep defaults. 
-
-* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-2
-- allow customlib functions with -DCUSTOM.
-- made stdrc subpackage for standard resource files and scripts.
-- only ship internal line-editor keybindings file if we're not using
-  readline
-- fix some packaging issues as follows (thanks Till Maas).
-- Prefix COPYING-GPL source file with "calc" to avoid file conflicts. 
-  Just in case. :)
-- defattr for all files sections.
-- make the devel package rely on calc-libs, not calc. This is largely
-  academic since the calc libs and binaries are not as clearly separated
-  as they should be -- a future upstream version will improve this, though,
-  so we might as well do the right thing.
-- make calc-libs not require calc proper; theoretically this should be true.
-
-* Thu Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-1
-- updated to 2.12.2.1
-
-* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.5
-- minor spec file cleanup for package review
-
-* Wed Sep  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.4
-- fix (i.e., remove) rpath by setting LD_SHARE to "".
-
-* Tue Sep  4 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.3
-- minor correction to LGPL-GPL conversion
-
-* Mon Sep  3 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.2
-- LGPL/GPL -> explicit LGPLv2/GPLv2
-- make the LGPL->GPL conversion via spec file script, not a patch
-- now that we're building dynamic libraries, make libs and devel subpackages
-
-* Sun Sep  2 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2-0.1
-- update to 2.12.2
-- yay -- patches to build dynamically are now upstream. so build
-  dynamically.
-
-* Thu Jul 12 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.13-1
-- Update to 2.12.1.13
-- Remove calc-2.12.1.6_remove-bad-snprintf-replacement.patch, which is now
-  now upstream.
-- Added calc-2.12.1.13-removemd5.patch due to licensing issues (md5 code
-  is distributable, but not lgpl compatible).
-- Added switch to enable readline and convert to gpl, or to not.
-  see comment in Feb 8 2007 changelog entry for more.
-
-* Thu Feb  8 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-2
-- disable linking against readline to avoid converting from LGPL to GPL.
-  This is insignificant for this release of the package which doesn't
-  actually include any libraries, but is something I want to preserve for
-  the future when we're building dynamic libs. I'm working with upstream in
-  getting this resolved -- ideally, the library remains LGPL but the
-  command-line tool is separated to the point where it alone links with
-  readline and can be relicensed as GPL without affecting the rest. If the
-  outcome isn't positive, I'm probably going to bite the bullet and make a
-  GPL-fork patch.
- 
-* Wed Feb  7 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.8-1
-- update to 2.12.1.8
-- invalid comments problem now fixed upstream -- drop that patch.
-- patching out custom completely isn't really necessary -- just unsetting
-  the config variable and removing the built library is sufficient.
-- make sure to set the "DEBUG" variable correctly (not -O3 -g3)
-- actually use the system readline library
-- don't need to pass so many variables into make chk.
-- chmod executables to 755 instead of 555 to placate rpmlint
-
-* Tue Feb  6 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-3
-- include fix for invalid sample files (# is not a comment character).
-
-* Mon Feb  5 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.1.6-2
-- create Fedora package from existing BU Linux package (clearing BU Linux
-  changelog).
-- add patch to use the system snprintf -- sheesh.
-- move the "cscript" stuff to be under datadir instead of bin.
-- list calc binary and man page explicitly in the files section.
+* Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
+- initial package for Fedora
+- clear old and long pre-fedora changelog
+- review request rhbug #227570



From fedora-extras-commits at redhat.com  Thu Sep 20 17:21:46 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 13:21:46 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.63,
	1.64 selinux-policy.spec, 1.526, 1.527
Message-ID: <200709201721.l8KHLkqG006875@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6850

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install
- Allow mono, java, wine to run in userdomains


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- policy-20070703.patch	20 Sep 2007 14:58:12 -0000	1.63
+++ policy-20070703.patch	20 Sep 2007 17:21:13 -0000	1.64
@@ -1618,7 +1618,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 08:56:35.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 11:42:05.000000000 -0400
 @@ -18,3 +18,102 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -1714,7 +1714,7 @@
 +
 +	userdom_unpriv_usertype($1, $1_mono_t)
 +
-+	allow $1_mono_t self:process { execheap execmem };
++	allow $1_mono_t self:process { signal getsched execheap execmem };
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
 +
@@ -1724,7 +1724,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.0.8/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/mono.te	2007-09-20 11:41:50.000000000 -0400
+@@ -15,7 +15,7 @@
+ # Local policy
+ #
+ 
+-allow mono_t self:process { execheap execmem };
++allow mono_t self:process { signal getsched execheap execmem };
+ 
+ userdom_generic_user_home_dir_filetrans_generic_user_home_content(mono_t,{ dir file lnk_file fifo_file sock_file })
+ 
 @@ -46,3 +46,7 @@
  	unconfined_dbus_chat(mono_t)
  	unconfined_dbus_connect(mono_t)
@@ -4206,6 +4215,31 @@
  dev_read_sound(entropyd_t)
  
  fs_getattr_all_fs(entropyd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.0.8/policy/modules/services/automount.if
+--- nsaserefpolicy/policy/modules/services/automount.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/automount.if	2007-09-20 11:17:32.000000000 -0400
+@@ -74,3 +74,21 @@
+ 
+ 	dontaudit $1 automount_tmp_t:dir getattr;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to file descriptors for automount.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`automount_dontaudit_use_fds',`
++	gen_require(`
++		type automount_t;
++	')
++
++	dontaudit $1 automount_t:fd use;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.0.8/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/automount.te	2007-09-17 16:20:18.000000000 -0400
@@ -5150,7 +5184,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 12:01:41.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5172,7 +5206,7 @@
  	allow $1_dbusd_t self:file { getattr read write };
  	allow $1_dbusd_t self:fifo_file rw_fifo_file_perms;
  	allow $1_dbusd_t self:dbus { send_msg acquire_svc };
-@@ -135,6 +142,19 @@
+@@ -135,7 +142,21 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
  
@@ -5190,9 +5224,11 @@
 +	userdom_read_user_home_content_files($1, $1_dbusd_t)
 +
  	auth_read_pam_console_data($1_dbusd_t)
++	auth_use_nsswitch($1_dbusd_t)
  
  	libs_use_ld_so($1_dbusd_t)
-@@ -193,6 +213,7 @@
+ 	libs_use_shared_libs($1_dbusd_t)
+@@ -193,6 +214,7 @@
  	gen_require(`
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t;
@@ -5200,7 +5236,7 @@
  		class dbus send_msg;
  	')
  
-@@ -202,9 +223,12 @@
+@@ -202,9 +224,12 @@
  	# SE-DBus specific permissions
  	allow $1_dbusd_system_t { system_dbusd_t self }:dbus send_msg;
  
@@ -5213,7 +5249,7 @@
  ')
  
  #######################################
-@@ -271,6 +295,32 @@
+@@ -271,6 +296,32 @@
  	allow $2 $1_dbusd_t:dbus send_msg;
  ')
  
@@ -5246,7 +5282,7 @@
  ########################################
  ## <summary>
  ##	Read dbus configuration.
-@@ -286,6 +336,7 @@
+@@ -286,6 +337,7 @@
  		type dbusd_etc_t;
  	')
  
@@ -5254,7 +5290,7 @@
  	allow $1 dbusd_etc_t:file read_file_perms;
  ')
  
-@@ -346,3 +397,23 @@
+@@ -346,3 +398,23 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -5280,7 +5316,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-20 12:01:29.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -7986,7 +8022,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.8/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rpc.te	2007-09-20 11:18:24.000000000 -0400
 @@ -59,10 +59,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -8002,7 +8038,7 @@
  
  fs_list_rpc(rpcd_t)
  fs_read_rpc_files(rpcd_t)
-@@ -76,9 +80,11 @@
+@@ -76,9 +80,16 @@
  miscfiles_read_certs(rpcd_t)
  
  seutil_dontaudit_search_config(rpcd_t)
@@ -8011,10 +8047,15 @@
  optional_policy(`
  	nis_read_ypserv_config(rpcd_t)
 +	nis_use_ypbind(rpcd_t)
++')
++
++# automount -> mount -> rpcd
++optional_policy(`
++	automount_dontaudit_use_fds(rpcd_t)
  ')
  
  ########################################
-@@ -91,9 +97,13 @@
+@@ -91,9 +102,13 @@
  allow nfsd_t exports_t:file { getattr read };
  allow nfsd_t { nfsd_rw_t nfsd_ro_t }:dir list_dir_perms;
  
@@ -8028,7 +8069,7 @@
  
  corenet_tcp_bind_all_rpc_ports(nfsd_t)
  corenet_udp_bind_all_rpc_ports(nfsd_t)
-@@ -123,6 +133,7 @@
+@@ -123,6 +138,7 @@
  tunable_policy(`nfs_export_all_rw',`
  	fs_read_noxattr_fs_files(nfsd_t) 
  	auth_manage_all_files_except_shadow(nfsd_t)
@@ -8036,7 +8077,7 @@
  ')
  
  tunable_policy(`nfs_export_all_ro',`
-@@ -143,6 +154,9 @@
+@@ -143,6 +159,9 @@
  manage_files_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t)
  files_tmp_filetrans(gssd_t, gssd_tmp_t, { file dir })
  
@@ -8046,7 +8087,7 @@
  kernel_read_network_state(gssd_t)
  kernel_read_network_state_symlinks(gssd_t)	
  kernel_search_network_sysctl(gssd_t)	
-@@ -158,6 +172,9 @@
+@@ -158,6 +177,9 @@
  
  miscfiles_read_certs(gssd_t)
  
@@ -9489,7 +9530,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 10:52:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 12:07:15.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9512,7 +9553,15 @@
  	term_setattr_unallocated_ttys($1_xserver_t)
  	term_use_unallocated_ttys($1_xserver_t)
  
-@@ -353,12 +356,6 @@
+@@ -282,6 +285,7 @@
+ 	domtrans_pattern($1_xserver_t, xauth_exec_t, $1_xauth_t)
+ 
+ 	allow $1_xserver_t $1_xauth_home_t:file { getattr read };
++	allow xdm_t $1_xauth_home_t:file append_file_perms;
+ 
+ 	domtrans_pattern($2, xserver_exec_t, $1_xserver_t)
+ 	allow $1_xserver_t $2:process signal;
+@@ -353,12 +357,6 @@
  	# allow ps to show xauth
  	ps_process_pattern($2,$1_xauth_t)
  
@@ -9525,7 +9574,7 @@
  	domain_use_interactive_fds($1_xauth_t)
  
  	files_read_etc_files($1_xauth_t)
-@@ -387,6 +384,14 @@
+@@ -387,6 +385,14 @@
  	')
  
  	optional_policy(`
@@ -9540,16 +9589,19 @@
  		nis_use_ypbind($1_xauth_t)
  	')
  
-@@ -537,16 +542,14 @@
+@@ -537,16 +543,14 @@
  
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
 -		type $1_xauth_home_t, $1_iceauth_home_t, $1_xserver_t, $1_xserver_tmpfs_t;
  	')
  
- 	allow $2 self:shm create_shm_perms;
- 	allow $2 self:unix_dgram_socket create_socket_perms;
- 	allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
+-	allow $2 self:shm create_shm_perms;
+-	allow $2 self:unix_dgram_socket create_socket_perms;
+-	allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
++	allow $2 $2:shm create_shm_perms;
++	allow $2 $2:unix_dgram_socket create_socket_perms;
++	allow $2 $2:unix_stream_socket { connectto create_stream_socket_perms };
  
 -	# Read .Xauthority file
 -	allow $2 $1_xauth_home_t:file { getattr read };
@@ -9559,7 +9611,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +558,52 @@
+@@ -555,25 +559,52 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9620,7 +9672,7 @@
  	')
  ')
  
-@@ -626,6 +656,24 @@
+@@ -626,6 +657,24 @@
  
  ########################################
  ## <summary>
@@ -9645,7 +9697,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +707,73 @@
+@@ -659,6 +708,73 @@
  
  ########################################
  ## <summary>
@@ -9719,7 +9771,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1042,7 @@
+@@ -927,6 +1043,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9727,7 +9779,7 @@
  ')
  
  ########################################
-@@ -987,6 +1103,37 @@
+@@ -987,6 +1104,37 @@
  
  ########################################
  ## <summary>
@@ -9765,7 +9817,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1283,7 @@
+@@ -1136,7 +1284,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9774,7 +9826,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1472,62 @@
+@@ -1325,3 +1473,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -10057,7 +10109,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 09:08:43.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 11:14:45.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10088,7 +10140,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,23 @@
+@@ -176,11 +177,24 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10098,6 +10150,7 @@
 +
 +	auth_keyring_domain($1)
 +	allow $1 keyring_type:key { search link };
++	auth_domtrans_chk_passwd($1)
 +
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
@@ -10112,7 +10165,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +209,33 @@
+@@ -196,22 +210,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10147,7 +10200,7 @@
  	')
  ')
  
-@@ -309,9 +333,6 @@
+@@ -309,9 +334,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10157,7 +10210,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +350,7 @@
+@@ -329,6 +351,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10165,7 +10218,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +369,37 @@
+@@ -347,6 +370,37 @@
  
  ########################################
  ## <summary>
@@ -10203,7 +10256,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +748,24 @@
+@@ -695,6 +749,24 @@
  
  ########################################
  ## <summary>
@@ -10228,7 +10281,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1389,9 @@
+@@ -1318,14 +1390,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10243,7 +10296,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1447,163 @@
+@@ -1381,3 +1448,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -12135,7 +12188,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.8/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 09:37:08.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.if	2007-09-20 11:56:27.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -12249,7 +12302,7 @@
  ##	Full management of the semanage
  ##	module store.
  ## </summary>
-@@ -1058,3 +1134,124 @@
+@@ -1058,3 +1134,133 @@
  	files_search_etc($1)
  	rw_files_pattern($1,selinux_config_t,semanage_trans_lock_t)
  ')
@@ -12300,6 +12353,15 @@
 +	corecmd_search_bin($2)
 +	domtrans_pattern($2,setsebool_exec_t,$1_setsebool_t)
 +	seutil_semanage_policy($1_setsebool_t)
++
++	# Need to define per type booleans
++	selinux_set_boolean($1_setsebool_t)
++
++	# Bug in semanage
++	seutil_domtrans_setfiles($1_setsebool_t)
++	seutil_manage_file_contexts($1_setsebool_t)
++	seutil_manage_default_contexts($1_setsebool_t)
++	seutil_manage_selinux_config($1_setsebool_t)
 +')
 +
 +#######################################
@@ -12376,7 +12438,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 09:31:29.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 11:55:54.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12506,7 +12568,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  corecmd_exec_bin(run_init_t)
-@@ -423,77 +426,50 @@
+@@ -423,77 +426,53 @@
  	nscd_socket_use(run_init_t)
  ')	
  
@@ -12520,6 +12582,9 @@
 +selinux_set_boolean(setsebool_t)
 +# Bug in semanage
 +seutil_domtrans_setfiles(setsebool_t)
++seutil_manage_file_contexts(setsebool_t)
++seutil_manage_default_contexts(setsebool_t)
++seutil_manage_selinux_config(setsebool_t)
  
 -allow semanage_t self:capability { dac_override audit_write };
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
@@ -12610,7 +12675,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -521,6 +497,8 @@
+@@ -521,6 +500,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -12619,7 +12684,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -537,6 +515,7 @@
+@@ -537,6 +518,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -12627,7 +12692,7 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -592,6 +571,10 @@
+@@ -592,6 +574,10 @@
  
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
@@ -13163,7 +13228,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 10:55:37.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 12:06:52.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -13503,26 +13568,26 @@
 -		# Needed for escd, remove if we get escd policy
 -		xserver_manage_xdm_tmp_files($1_t)
 -	')
-+	dev_rw_xserver_misc($1_t)
-+	dev_rw_power_management($1_t)
-+	dev_read_input($1_t)
-+	dev_read_misc($1_t)
-+	dev_write_misc($1_t)
++	dev_rw_xserver_misc($1_usertype)
++	dev_rw_power_management($1_usertype)
++	dev_read_input($1_usertype)
++	dev_read_misc($1_usertype)
++	dev_write_misc($1_usertype)
 +	# open office is looking for the following
-+	dev_getattr_agp_dev($1_t)
-+	dev_dontaudit_rw_dri($1_t)
++	dev_getattr_agp_dev($1_usertype)
++	dev_dontaudit_rw_dri($1_usertype)
 +	# GNOME checks for usb and other devices:
-+	dev_rw_usbfs($1_t)
-+	xserver_user_client_template($1,$1_t,$1_tmpfs_t)
-+	xserver_xsession_entry_type($1_t)
-+	xserver_dontaudit_write_log($1_t)
-+	xserver_stream_connect_xdm($1_t)
++	dev_rw_usbfs($1_usertype)
++	xserver_user_client_template($1,$1_usertype,$1_tmpfs_t)
++	xserver_xsession_entry_type($1_usertype)
++	xserver_dontaudit_write_log($1_usertype)
++	xserver_stream_connect_xdm($1_usertype)
 +	# certain apps want to read xdm.pid file
-+	xserver_read_xdm_pid($1_t)
++	xserver_read_xdm_pid($1_usertype)
 +	# gnome-session creates socket under /tmp/.ICE-unix/
-+	xserver_create_xdm_tmp_sockets($1_t)
++	xserver_create_xdm_tmp_sockets($1_usertype)
 +	# Needed for escd, remove if we get escd policy
-+	xserver_manage_xdm_tmp_files($1_t)
++	xserver_manage_xdm_tmp_files($1_usertype)
  ')
  
  #######################################
@@ -14056,10 +14121,20 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1902,6 +1987,41 @@
+@@ -1894,10 +1979,46 @@
+ template(`userdom_manage_user_home_content_dirs',`
+ 	gen_require(`
+ 		type $1_home_dir_t, $1_home_t;
++		attribute user_home_type;
+ 	')
  
- ########################################
- ## <summary>
+ 	files_search_home($2)
+-	manage_dirs_pattern($2,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_dirs_pattern($2,{ $1_home_dir_t user_home_type },$1_home_t)
++')
++
++########################################
++## <summary>
 +##	dontaudit attemps to Create files
 +##	in a user home subdirectory.
 +## </summary>
@@ -14091,14 +14166,10 @@
 +	')
 +
 +	dontaudit $2 $1_home_dir_t:file create;
-+')
-+
-+########################################
-+## <summary>
- ##	Do not audit attempts to set the
- ##	attributes of user home files.
- ## </summary>
-@@ -3078,7 +3198,7 @@
+ ')
+ 
+ ########################################
+@@ -3078,7 +3199,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14107,7 +14178,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4735,24 @@
+@@ -4615,6 +4736,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14132,7 +14203,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4771,14 @@
+@@ -4633,6 +4772,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14147,7 +14218,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5469,7 @@
+@@ -5323,7 +5470,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14156,7 +14227,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5705,375 @@
+@@ -5559,3 +5706,375 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- selinux-policy.spec	20 Sep 2007 14:40:24 -0000	1.526
+++ selinux-policy.spec	20 Sep 2007 17:21:13 -0000	1.527
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -364,6 +364,7 @@
 %changelog
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
 - Fix to add xguest account when inititial install
+- Allow mono, java, wine to run in userdomains
 
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-3
 - Allow xserver to search devpts_t



From fedora-extras-commits at redhat.com  Thu Sep 20 17:24:18 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Thu, 20 Sep 2007 13:24:18 -0400
Subject: rpms/aria2/F-7 .cvsignore, 1.6, 1.7 aria2.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200709201724.l8KHOIEA007015@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/aria2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979

Modified Files:
	.cvsignore aria2.spec sources 
Log Message:
* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
- 0.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Aug 2007 19:50:20 -0000	1.6
+++ .cvsignore	20 Sep 2007 17:23:46 -0000	1.7
@@ -1 +1 @@
-aria2-0.11.2.tar.bz2
+aria2-0.11.3.tar.bz2


Index: aria2.spec
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/aria2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aria2.spec	25 Aug 2007 19:50:20 -0000	1.5
+++ aria2.spec	20 Sep 2007 17:23:46 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           aria2
-Version:        0.11.2
+Version:        0.11.3
 Release:        1%{?dist}
 Summary:        High speed download utility with resuming and segmented downloading
 Group:          Applications/Internet
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.3-1
+- 0.11.3
+
 * Fri Aug 24 2007 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.11.2-1
 - 0.11.2
 - Fix License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aria2/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Aug 2007 19:50:20 -0000	1.6
+++ sources	20 Sep 2007 17:23:46 -0000	1.7
@@ -1 +1 @@
-4b58849f0bf7f2abab1675ce2e8958ec  aria2-0.11.2.tar.bz2
+93d77ba3238d3954df39157fc77349d3  aria2-0.11.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 17:53:12 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 20 Sep 2007 10:53:12 -0700
Subject: [pkgdb] xulrunner (Fedora, devel) updated by katzj
Message-ID: <200709201753.l8KHrCiX020859@app4.fedora.phx.redhat.com>

Jeremy Katz (katzj) approved watchbugzilla on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved watchcommits on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved commit on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved build on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved approveacls on xulrunner (Fedora devel) for dwmw2
Jeremy Katz (katzj) approved checkout on xulrunner (Fedora devel) for dwmw2

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xulrunner



From fedora-extras-commits at redhat.com  Thu Sep 20 17:53:48 2007
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Thu, 20 Sep 2007 13:53:48 -0400
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.2, 1.3 nss_compat_ossl.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709201753.l8KHrmOL007934@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Log Message:
0.9.2-1
- update to 0.9.2 
- Enable loading the NSS PKCS#11 pem module
- Add a URL
- Specify the license as LGPLv2+ instead of just LGPL



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2007 18:28:36 -0000	1.2
+++ .cvsignore	20 Sep 2007 17:53:14 -0000	1.3
@@ -1 +1 @@
-nss_compat_ossl-0.9.1.tar.gz
+nss_compat_ossl-0.9.2.tar.gz


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nss_compat_ossl.spec	29 Aug 2007 05:29:03 -0000	1.3
+++ nss_compat_ossl.spec	20 Sep 2007 17:53:15 -0000	1.4
@@ -1,14 +1,17 @@
 Name:           nss_compat_ossl
-Version:        0.9.1
-Release:        5%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
+URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  nss-devel, nspr-devel
+# Need > 3.11.7-7 so we have the NSS PKCS#11 flat-file reader available 
+BuildRequires:  nss-devel > 3.11.7-7
+BuildRequires:  nspr-devel
 
 %description
 This library provides a source-level compatibility layer to aid porting
@@ -28,6 +31,9 @@
 
 %build
 
+CFLAGS="$RPM_OPT_FLAGS -DPKCS11_PEM_MODULE"
+export CFLAGS
+
 %configure --prefix=/usr --disable-static
 make %{?_smp_mflags}
 
@@ -59,6 +65,12 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 20 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-1
+- update to 0.9.2
+- Enable loading the NSS PKCS#11 pem module
+- Add a URL
+- Specify the license as LGPLv2+ instead of just LGPL
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.1-5
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2007 18:28:36 -0000	1.2
+++ sources	20 Sep 2007 17:53:15 -0000	1.3
@@ -1 +1 @@
-765c1426fc61b5c67c17fca0a87405cb  nss_compat_ossl-0.9.1.tar.gz
+84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 18:02:41 2007
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Thu, 20 Sep 2007 14:02:41 -0400
Subject: rpms/xulrunner/devel firefox-1.5-ppc64.patch, 1.1,
	1.2 mozilla-firefox-head.ppc64.patch, 1.1, 1.2 xulrunner.spec,
	1.17, 1.18
Message-ID: <200709201802.l8KI2f1w014465@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12292

Modified Files:
	firefox-1.5-ppc64.patch mozilla-firefox-head.ppc64.patch 
	xulrunner.spec 
Log Message:
fix ppc/ppc64 build

firefox-1.5-ppc64.patch:

Index: firefox-1.5-ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/firefox-1.5-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-ppc64.patch	31 Aug 2007 04:34:18 -0000	1.1
+++ firefox-1.5-ppc64.patch	20 Sep 2007 18:02:04 -0000	1.2
@@ -4,11 +4,17 @@
 unchanged:
 --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-21 17:09:28.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-20 10:13:38.000000000 +0000
-@@ -267,6 +267,11 @@
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
  endif
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
 +CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
 +ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
 +AS		:= $(CC) -c -x assembler-with-cpp

mozilla-firefox-head.ppc64.patch:

Index: mozilla-firefox-head.ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-firefox-head.ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-firefox-head.ppc64.patch	20 Sep 2007 11:04:21 -0000	1.1
+++ mozilla-firefox-head.ppc64.patch	20 Sep 2007 18:02:04 -0000	1.2
@@ -5,22 +5,24 @@
 diff -u -B -u -p -r1.92 Makefile.in
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in	14 Dec 2006 19:13:43 -0000	1.92
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	29 Jan 2007 17:49:54 -0000
-@@ -275,6 +275,15 @@ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
  endif
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
++ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
++AS		:= $(CC) -c -x assembler-with-cpp
++endif
  
  #
-+# Linux/PPC64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
-+CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
-+ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
-+AS             := $(CC) -c -x assembler-with-cpp
-+endif
-+
-+#
  # NetBSD/PPC
- #
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
 Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp,v
@@ -93,21 +95,21 @@
 +
 +
 +#
-+# NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 +#                  PRUint32 paramCount, nsXPTCVariant* params)
 +#
 +
 +        .section ".toc","aw"
 +        .section ".text"
 +        .align 2
-+        .globl  NS_InvokeByIndex
++        .globl  NS_InvokeByIndex_P
 +        .section ".opd","aw"
 +        .align 3
-+NS_InvokeByIndex:
-+        .quad   .NS_InvokeByIndex,.TOC. at tocbase
++NS_InvokeByIndex_P:
++        .quad   .NS_InvokeByIndex_P,.TOC. at tocbase
 +        .previous
-+        .type   NS_InvokeByIndex, at function
-+.NS_InvokeByIndex:
++        .type   NS_InvokeByIndex_P, at function
++.NS_InvokeByIndex_P:
 +        mflr    0
 +        std     0,16(r1)
 +
@@ -200,7 +202,7 @@
 +        mtlr    0
 +        blr
 +
-+        .size   NS_InvokeByIndex,.-.NS_InvokeByIndex
++        .size   NS_InvokeByIndex_P,.-.NS_InvokeByIndex_P
 +
 +        # Magic indicating no need for an executable stack
 +        .section .note.GNU-stack, "", @progbits ; .previous
@@ -250,9 +252,9 @@
 +
 +// Platform specific code to invoke XPCOM methods on native objects
 +
-+// The purpose of NS_InvokeByIndex() is to map a platform
++// The purpose of NS_InvokeByIndex_P() is to map a platform
 +// independent call to the platform ABI. To do that,
-+// NS_InvokeByIndex() has to determine the method to call via vtable
++// NS_InvokeByIndex_P() has to determine the method to call via vtable
 +// access. The parameters for the method are read from the
 +// nsXPTCVariant* and prepared for the native ABI.
 +
@@ -335,7 +337,7 @@
 +}
 +
 +EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 +                 PRUint32 paramCount, nsXPTCVariant* params);
 +
 --- /dev/null	2000-10-22 01:01:00.000000000 +0000


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xulrunner.spec	20 Sep 2007 11:04:21 -0000	1.17
+++ xulrunner.spec	20 Sep 2007 18:02:04 -0000	1.18
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha7.3%{?dist}
+Release:        0.alpha7.4%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -340,6 +340,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 David Woodhouse <dwmw2 at infradead.org> 1.9-0.alpha7.4
+- build fixes for ppc/ppc64
+
 * Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
 - removed conflicts with the current gecko-based apps
 - added updated ppc64 patch



From fedora-extras-commits at redhat.com  Thu Sep 20 18:04:50 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 14:04:50 -0400
Subject: rpms/mercurial/EL-4 mercurial-0.9.4.tar.gz, NONE,
	1.1 mercurial-install-contrib.patch, NONE, 1.1 mercurial.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709201804.l8KI4o0x014648@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14545

Modified Files:
	mercurial.spec sources 
Added Files:
	mercurial-0.9.4.tar.gz mercurial-install-contrib.patch 
Log Message:
Update to mercurial-0.9.4, add mercurial-install-contrib.patch



--- NEW FILE mercurial-0.9.4.tar.gz ---
??w?Fmercurial-0.9.4.tar
???:?+?>#-????_>I?)???'U?????h=wAp'?G??t6???^???A????e?K???VS?]N;y???????i)?e?
zr????A????H???6??LnN?[?{??? ????R?_?T?9??rk?s?.o???A??/?0?<E	?J?M??sqt?W?I??
!_??W/???V??CW~?~??n5?q~???????)\??=???F?T??? ??lK.?????Z?ZKi'??
!??k??F?yo?_dJ^8???,a?6
3?\3?{?t??????Xz??
??8?????x???5$h?<?@2?4?
?????o???????????O?????????????Q?g???Y??M?]a?r????????????&)F??Cu.?[\
????Z?b:?.??wiN????*??v?	???*???.ZQ????????7??4J?
d?\
??s?????'go?w??M?0w???E?X???|u???z?R?tjS???iA?B{]?????
]???G?oz???????1~???~???u?>??T????????z??SR{??^??n?^0K???b???h*E-lR??C??(????"
2???
??f??L????}D???????tQ???mn$?,???%	'x????$~???'?6?????
??d?S(
y?? 2?????g?QQ%W???(????M??AE?0??G?????y??)??ZP????XE?s0@&?_6?G??ejs]
c=?f?????ga{
?fM??+??HW9%??*??0C/???i?H?w???1JR?m?dS?_??y?$?q??qO???r?of7K\??????????V??v?
??!J?p6k? 4??d6????????k4*OQ?}? ????:3
Z`???????B????????b+??.??E??????"???I??P6?:??W?}????|?t?f??Og?i????M?8?f???#??T??????QG????g??jG????x????????????'?????K???S???B????c7u4?T??b??????	??W? `??E[#Q???d??b??)Ty?o?
?T???????1#>EUR?
?????Z???u:E???z??????$??de?g
89O"??????
?Gu????Sf?????4j????*???k??H?)????@5`?????3w?k9
[??z??I????????"4jh
?!9TS7?
?[??2??gA	
?Qy?
???*?\\`x,WKK?f[9?R?l?????~?????+*?V???+???h??$i?U??x????,?3?j?Y_????s????"H???,?]I?H?t??d??]?/??/T8C???9w?0?`???
?Uwr!
?kCQ<a??Y???g?H??X?vH?@?|r?_?s
i?_???)?`?b???n???}?p5?2????????~???=?????????xw<????4??y?????????O??|?z|v?????goN???]?
?b???	???LT~i+?8?77??]S?_	8???&???4?Ijv??????`?5?Xi?(???B&K^?^?7
?,
?W~???jn??????d??<K?`?m0??????%????M?S??d?????
???R??????](a?U??????y?w4????jMx?????dH??#?
+???3??|2(+?	???z?????4??+F?[???????d:??????'??MB@{F????|0?[A?H?|?@#?f?F??????,$u??????<Jk??.ycQ1|??pIDr??[?????8?#w???.?Sin?g???,|3#?H?p??b?7D??&M?i"??2?I?Y)=?2u??n7J?8?4??*?*n???`?R?Y?!mRF~Hw??C>?2%n&S;???$???`?E???76???"?????????????n?Zr at Ps4V???j
?
#??Fe???;?????Z??p7?x??%<f????9????T?a?[R?4?z??HOP????.????.I?\?:?2??@?s?&??$C??????B?s?3\?m?v-?[\??????k?E?l??8}"?ZQ?*??hto.`?kW????
@*??7??????U!9?`???
q2?Sc????0?g?v????Y????f?? ??????s??N;????G??????q-?
0\D???(M?,?iG?D+???Og?M-lIt;]y?nz??????DMohB?5JKo?c?Q????r+g??"?y???c%??9w????E??r?hZ??$?v??r"?M<??c_???G???<?D?@???M??,lfv?x?f???rX?$??C??????nP??e??_209V??}?r}* ?d?O?O??r???mr????F????.?\???????????g?ZR?I
?????w'???-^x?m???!] ??G???d???
	??K?632??L@?5????4?+?i????H???pa?m:]z?2h|?:??^?D??s??????a????>????=?=?d?E??cF?Z@??t?"w?
?V???L??0?
???????;R??Z?67b?RV???0??
?C????.c\????fb,?[,H?MxE*?x???D at S???6d??Ml???4
?????YF????yS*???).?c??z?=?!0	@(?^	X?KB2?$??"d??O%?2*kj?p?????s????,?????mRvHG?C?????Ut	:`??	n?x???? i4??"?;???7?????W?]	217????? ????;
8?;Y??&Z?vqu?I?_NW????p?9
??j?L?tq???	6'?F?I ??C??-?
H5e5EcR?9?s9|WJ
t??2?]??f3?"J?$?V????O??!A`?] ?W?f|???R??#????y??c?l?t at kD??a,??????f?	???u???a*o%?t?Z?T;_Gj?Z???k??
??
@???Z?DNr2?t??i???=??AZYG(X?Z? ??/ ?
}?M?6?f???/@?e?BvE ???'X???Y?_fNgeUV????????????????s?j?z?2OV????d???????HB?!??	d??p?@r?P`??6?&lB?a?0X?x?#^ ?H^??=?dfuW?????w*3??{???????E??? ?n?????B?S????1??=?\J?????T????YH?L???"??}?{k8?^>#|?Y???=V'?K}?????"?
?1c
?g%?T.fZ ??==T???F!?Y<??d?????-??$>??EL	l[I???x??y??????^?&Pc???-?y??i??????y??tA??Q?

Ra??????c}sb!T??????f9kD?$???4K?????k?:7??1?~?s??&??p-????q&qQ??T	??????I?eY+?YR??0??*'?????s?????a???&??`?????#mW?????"f??????T|xk?<?y???M????????P ??R?uj??0?J?v4Q?M!??)l?d??I?h?%#???13??9?B&D????S?Y?gD?P?uS5!?c9?$hvg.?a?Z??#?e?
??0????_2b???;@???EV?Q???R$???C??-???n?E3Tg'?PeB!?	C??r8????18???f6?
?}
SqH*?N?=Ib??Tp?????dN???,tL??8?????/v????
??k??|p@?<&R,??u?5?D??IT???????&j??y??m??????????Y?0?x`?p?4??????(`?U?S??=??~tD(}??wF??n????
??]}5V?e?????L?j?@??^E:????&?,b?!BW?_??6??^kI?w??\??ED?[m???'j??eR?VW[?h[y????	?	'?dR`n?NP?
g)}J)?z?4i??0Z?e|(????%x??Q?6??????6c??xdPxb??,Qk,?T?U?RKx??b@????????#r?????27X??????O?e}R?
??V=????????Xp??NDT#i6?|?m?P|h1???C??K??T *3L?`;K?D??$???#?$|?O?<C??	??q???SZ?$GSkm?S;@?8???	?kN??IT?OI??}?.????vB]???5???<c?wA?36?0????!?|???dD?1?3^?
?>?,%S??8?=?? ]???@?U?? #?$??h{	A?r2">?S?	?x????c?8?S+(?'?ca?a?#>
???D;Uw
???U?78???xQ???-???*???Q???-1?*-?:?i???)???Po.??le?a???
?????|2?ti???Ge?j??J?'d????B-D??`????F:b<b?{???????jNZHC}h}???????\?y}?\8?q?????}?????x7
??h?U|T???4????n:{?#???,
?;o?????}?t'????Oot?q??7
5-?????g????/????'<+p?~?s\Ex @????84???dxq?=P{???e???????<|??
yr;???????{`??8??s??Gp?????<????(5/???????D?}x??'??*?1h?!L!????Dm???6?????????e?"??~}K??=(v????#??vjp??9y(d	?qX?\>`????X?c6??M?(KX????@??
x??}?0k'7?c??	Q,?_x?tVs????&9?M?T+???Py?)??l????F??7???H?+T?C?X???d?G:&|#:????E??m)z?????x/?L3??d???FqH??"?~?????=???*???
?)Y??@??t ?F??a???&?'?W?4
?"?????b????????	??E?\g??h?pZP?(?????_j99????ntV??_??????g???Xf?????	%?H?n???O?2?#b?V??2??	O???6??zf2?VPzXN~????	??]??!?B???bP?t?? ?{&w?k?qB????*9?-???B???u{_C
?N???GXjL3??F??c	L?}???+???j E?????i
?Y"?????4?`@????0>=?=s
?<?????*?q???w?>edZ??r3FN?T8??p?1??(
[B???}??m?8?i6Ae????c|n? ??????
???[?N??4>@?1???U??9??u[V?]XX?-,@??Pa6?U?n?j)?q?a???h?z?\???u?a????V
?K6??G?????+z?????i?}]?G_???y??kV??
??|???&???????
?????^????????g?=?????$??0??a4??$?????`??
?:?w??`2
???xt?????_?`??
??????????u??????!???H4???+???Nz
x`??????|?)?]8lk?_?E
??v??????]??~?????? ?%?,?????S >????|
uz??`?'D3:z???O?PW_?E???/?{m?i?&?<?~2?J??"?nu???/@a?K(?f???>??A??I??]?I?????????*\???????%?g??H???W????#??Hz??bLj^0?Xn\??h?<?77?N
kG??i????????<[?>[or:^?T_????_?X????(???[?_??o!?o??T??v?=O?S?j?_??????????9?7???f????~?????I???????%?????>??????E??T???ol???????O??????n?#???xc??<%????mn???gD????|??d????? ??P??????????A??+?-j=?pZ#4[&??o??t?t??#?A?7~vd?????/????J??+???????\????,h??h{s?
k%??G??????Y:Y?????VG???0^??Q?r??$?Js?F?m?4?f?A??3??:??'}???z`??????k>??z?B?????
?r????z???U???~T?|???=D?uc?p?U
??X????i?Bjbb??`???X?~c??j4w1-???kz*?uT???V???U????2????+????????M?SfC|nXk:??!????G??7????^?e?????)AvV?*?+?0???c
???
c????D?gz??f?????l?.(??????`z?|????)????l?????/1f?O?rg>??q??F??y?kC?Qzb?^p??K?)??Y???^)???W6/??[??y??[k?????`?WG??#r]Ik?XY-?Q??BYt?g?3?????
9G~sF?@J???%?O?u????W8)??_Z???8?k??Y??S????W???H????[?-GY????3VT?/??@???X???K???V?-??[e????????M??????N?Q???-Ok?_??J@?h??
T_?Qh*NA???/???5U????V2????M?'g??b??E@O????????$?x>?E?QCS??????
??F???^?g??6?????~?????/????????Oo]y?
?kB?s}?x??????&????&1?c??/?????2?B?d?f???^??S-_M?H-??\??*8??|?H0????y?GFf??	?H(?9???'|(?
M??<N?@mz?J?xV??V?????`)?,?-????[R??XK?
????ap?7?GFm??R???8??e?;A??????????h6?Z?[???
?s?P??81?k????$?Rz?BL|??R????M~=?U6??
??q"D?Z?^??????????6F??<?^??pe?????
???}?7????T?(?z?v?
?)?G?S?I???K???%P?g??'B7f??3???9??:?
?l?LGN?
??e<
?R^,???r??t????>?????[!????9??67ot}??????_o??/\?M?/?u????z?????q!0?`|,?SFY?y?
A????VP?#???G?oj????????????R????????}._?????
?P??(?'??jl?D???????N??D???C?????w?	??1?+?????[+w??^>?v???\?Z^?Y^?l?7~??
?
??l???	(}???"!??Q<-.?@5????|Yy=
??#?g3>^W{jq?X6?S??"????F+x<????n?w?????b???????H?????Hg???Y??<}??kW?_????V????K??+??z????????O??????^??????}?L.?&???H_?5?????k'??u??#??*s?j?S?8i?????p???%:?~?S??
i??c{<?|<??'?7?|+??d??u??e??=?U?"???~u??W??K
[Qn?bZ????,?V??S???^???x??G/
(???l?>?????7???????????O????{?y??Gu*?Jl?
v!??j?*???w?
?@I??m??^??2???????"??????;?w=p???O?n???qr{?F???u?X?	?T*?
????3#??U?R?q
?WR?c?#??(1???Fy??????G(
?Q??
???_?????_???????`
?O?[?
????3?0&??ru>0???? ??*,\?+?pK???
?????Om<G(]?&_????*?x????
?s??C?"?????Y????G.r??4?????J??r?1?J_?^7??e
?}#?^"?x??Q????????'?????W???????6???j?y???!???????u*??s???????????MxA??@???8?l?O_??W?H??%???p????????r?V????Z?S=??(???Ov??r&????cc(^?%5????
?????Z??W?????????7?\-?????????1??????_4?o???(?????y2=?s??

??G??fp
???zh:'?"??k??W??:????_????l????o?????N8?]???~?e<?@M?	mu|??\??????S:1?T??o_??J??n?K*?w?Q~u?????????]???????????^?&1?yE,???=?YL?3NlM?C????5Z]?#??W??H??X:yVt?s_?L?G???2???E??.R?$N=^w?Z?(?f?(?W9??x??{l?????V??]??????F?
?a<Q?Ja5f?????W?{3u????1ZRb?)?N"/??	???**[@'Ea??^??????1?i??8e??????????Tdue{???i9?#??????#???
?:??~??/?W??FJ?WM8Y?????B_??R?????\,J
??Y????._0?)?5QDy???x???	???N??D?7jv?iu?^?S????(8?$????EJ?}?K\???????q???0{B??d2??*??Q>??mn??????}P<?
?8?*!????,??*????????????r?????8??&?j???????+#?|q5F9????e8to????????p@????)????T??9?P?V?p~???v???c}I?8???B?:|????V:?^?????og_?.???????p;}?8P?
]??T??x[??BOO??:|?Y?????0???(?o?@T???7
D?>??0???Z@?W.??x\?j?^?????o?4!~??p?e|E??????+,?????I??Q?g?????????/???-C?
jv ?z??????+??_?b?]??c?f????????M?,??s?g?*`;r???X?G]??h~???^??S????V81@?Y
???????N?i?gk?A?++f??(]
??{K??e??4???|&???M;g???R?g#Rd???????k+(4p?
?5???????=l?m??M(???y>K2?
">????h&??+??H|?l??rgw???Ra??S	<_2y?6??	2o?? 
7ba_?+??t???????L5{pj?
A??|?F????F.?fi?<GZ????+?
?c\+??Z??}'??4/x^?????R??+[?_o???2?????CK<P?i"???T??sg)????i??]?y??+??"??[???y%?.<??D??VJ??oG6??O??????9Ep?P?G?g??G???D???	?uk~??4???xHy?Q+yG?????????Z.g???????)hg&WkjH???B?-?V???]?^?v+???F?JnL??X?????]?????_?;????????
????d6t???Yb]???l?R????SU????Z??????j:f?=!w+????
??m?jJ?+?X
N????Uz??t<w???+???f\6^,?t?W?uYW^u???e??H|*T????j?sv?B??}?y???v^????\??????yu?"?????$I??a??	???	&C????nu"???N?uG^??????<???????q?B??6???m????6???????????v*A?`U????MoeW%?/?????N?????f??3??UJ<?&q9:?????Y??]??ws?^j???E??)?????	?.R??????z??b?Fj??s`?????????N??p?F??????l?n????H?j?o?i?7???q??c?"??7????+BTQ????V?K?G??HL?GVE?c?[?? ?a???.~??-?????????0???Z?)[??][??21|??w??)??
T????@???????????B??wC??/????m^??~+???R??????>'"?-?
MD??6???F?????????q<Y??ht???	??9?W?[>??q?"???g?Pj??Y???e?K@??1?$??????????
?'?nt???L?Am?@???,???#'z5????
Ok	y^??W????g??S???[ (?rw?????????O^??????R	O??Q#;6??w?:Z??u|?????v?????w/??[??92GE?&?3?I??+G?y???9???`Oi|??<X?v???=3?????X????#t?A???q:9]U??????3l??nN?-l?3????%?
?????j?S??L?<??o^?q???u!?{3??%?8?z????D5e?P

??k?]???]??ox?U????
???[%??kW/??o??Oa???1S
qy????????{???_)ew??Zg2??[?V)g??
?
P=??????????+?????+?????m`?
	??G???s?0|&????#T?????nY?w?B??f?9???F?	D?????(A???bJ< (? L?X'~?7?]?'o?xA??d
%??p?k????$=??H?
?c/??A2R_????K?4?A=#?????$???Ec??G?????*??MGD_?uN?N??	??F-???[?:?A\?Y ??
??,P?????;???~??T=O-}s
Zi"?%E??????S"??/JG????!R	??????
j-?
??????[4o?&??p??qB/L???i^?2?S???'??h??V?'nB????w?j
}m?N?o?B???
?^-2??&?V?NG?fm
)???_????T?*Ma???O??	???AG????
*?*?T
K??\?B?h?N
??z4??????????9O???8O?U?5?????????~?j?f?$?}??O??v?n??W?]??}#????m<?~??<????
?K??C?6??=?2z?????w#U0??????1??/?1??[?}m<J?^???#	??N?{?d?????_??????8???????????t2??T,??P??,R]?
??0???]?8l????&3?-%h??7ud???	t%?
??8?F???????BgV7???Cm??:?#
??_h??Cx?Dw?K??????d??>??)??Y????U?]?r??U?????,????X0Fk??o^
N?(?g???bH&??=?Q2??q?yK?????4????P??"?7>?<%
?	??P`??u7
C?Jay?{=;T;]u0C?(????)?7p??Y>??as??y???~K4~}?tif?0??0
tD[f??J?iON?`v?????^?~6Xe~?sU?cC???Zn??$v??|?=????T?t?c?[GE?
:6v??|?9??P???????(?/K???Tc??a8?]??I??Q??-?|Q?*8??H*:J?c?????>:???^??398?M???????????????????~c???M??|?|?<????:?????????M>???????G???????????~?_??????????7?????#???wo?i???_~????????_?????O????i|'?????W??_o?3????????SQ????????_?Q?o??????_??~???????7~????????????_???????_???????????????????_???w?????????????????&??????m???k????o????k'????K??{????_?????????W???>:??????????????????????T????'??O?????????g????7????4??????????????v????????&??_=J???????o????'????????????/;??O?????????s?O??o????????????w?{????/??????}?{????/??O????q?????????????o???_?????{?o??8??_??_?_????????_??????'?????~?v????@????Y???????~?????????7?????????????????????????;?G??????x???]w???p??6?????o~?G????????j???????~?????_?}?????????}?W~??????O??????{???!
 ???????/???H???_????`????????????????/~?g~????c?????????'7???????????G??_???????o??[?????_?o]????n?H??=??o}?+???H?;??????d??
?\???p?W?{??????${?
K???T0Q?pW???r?????????????
(???????kr?J??w&??G=M?2?????r??n??X????aiT?6???3???*# /?@[?{W?cC?`N?Hz???suuTm??
?:?v*%????????k?&J?(?x??<8????Wy?$
:?)+
??Y'?*?????^?Te???5+??????F?
???
F;??EM??)???J
<drL^<?/?w<7l???B)??E?7Q?N?B??*?????t???+???????Q?????v????\??o?????%????e	?/?}????^?t??/???y!?{??_ea?5?????}??L???r????????????f?P??g??G?????Y??x?"?????q?/????o??s<????n????????{???e??@1
????5M#?????t??PQ'?`?q????N?e??;_z0H0??P?fdE44??????????7???????????o???>??
?9?
?????n???/b[??2??0?????w???????L?>???k^??????M??U??-???<?????l4?l0u,??Z??:v????*$?[??(?kz???U?"??1/??l?hN?mA3?C??Q???zu?\??\$??????@2?B??MB?????&U???w????_.??????#?3vO? ????#?	b?vF[?^ ?s??g??y???f???B???????????W?=4??&??5????@j?Tz!?;?7????#e????X?????<MB????S?\????Uw?q?]?????.?????-???z?{A???V?o?7Y??[????
??????\/??a????_?=???u?;?????4????gzqV????@{?N??Z&z???J,?z?J ???z|???Ng?[Ff????/f???]|i????????????P???E???`"?a?M?:?j?B??t???qz
?R??????*Fm??z,J?S?4?qC??FA_(?
??_{P=??u???7]??sFU??????????S?__???}??y??Q????Sn
???B\?g???]??/?n?^w?5~yS?^?%??3=G?3?w?9??$?oa?h??
???+U????xw??~?/6~??
?=6JU_u????=seX??%J+z???]y?(??Y??u]ET?????v?ro3?*`?i??/?C|?@????t!?!??7z?p??f??????IsM??q`N?7??B??Y?v???~?????c?bH??
??i-?_?d?*?dQ??
?o=z?????\??	r????e???uY???,?p??PSk???
?	?W=??Y??Jq??MO?????t?I??*????+1?|t
???#h?????+????n)???E????[?v???	?????c??l??t?J?p?2?a?S????Q?>ps??M?O?1??????????E?lNn[*??????l-K?[?????
????d???*W}?K?
?????????,9?#????RC??;????9?-X??G? G%?a2?n???
?z?
?$G??D
{2?`e`[M??!|???e"
U???F??Q?G?~???????? s?????E????`N1??1??????f(v0
?6/
??>Ng?i??."??f??;0????T?o:<??E?????9???t?w??kDa??BNl?J?????!*??tD??#???l?#??3i,"J
???:?K?,@?&tZ?b2`=??????'?Zz???f??O=
???????$&
??y?R?t??s?o????i'?$?????lP??e????>sW???????d?O*>????g?Io.??8X???DP'??4?????PIq
?m	h??:>??z4L
???db[????M>?:tj???QeVW?ftc????{<?b????S??p?m?I????t??,??_"??^???T????|???z[Na??AM???x????>=y???6x
????`ty??
?4wB;j`???xD?Z????E?	????)????K??[??G+???`????%@?5U????Z?'o?eC?RV?p???Yk-:?$??\4?d??
2x??]*?\?-???K??Y?]rZ?????m?OB3?7?4?w"8?M^?V?k??????.?m???????v?????6?F???Jl??????????:????k???o???i2
?l????????;???A	8~??????????Y?
pR'q?l?(????G%z??????W?Z?
?w??_?<?7??;?+$???d?w}?C??6??????0F??}?+d&n4???????????Dt/??E?>_O?????R?i????(O??5?.?*&??1\??????q?????=A7E+?w??]?S?F4p???7?i????^???Q??	????h?j?Fs'??*u2d??x??Cb??I?4????/]?T\?T?!T??g???WM???9?>???`??&'???pa?I?U?8?]?L0?k??K=??(?ho6??X??eT????X??L?	?D???m?
?u?]??R?y?%?Q?I
lg?????r?N?? ?/???????#???1?%?<??????DG?t???x?p6i?c???5?V?lL?y?)
??/?Pu???b?	A????
5D?&/p??k4/?%?u???t`p?h??N?~izX4?w?Q^$?K?"?}?45q????s?/?>?????m@?K??ls??5????=kB?Z?D[v?
#????!o?V?aOs???Y??|h???{_m?????M]g????i????4?l????h??~?gY??M??`? ?D?$3
V"??"j?????BT&??
^$d5?????????K???Ie_Ep^}?9w?\??+?[?D???H?=['B????V????(???-K????e???????s??fd"???=F\??#?)?????x????????rx?y?k?m??>?????Z???\?6?P???e??`
?????????X{?_i?k??E??|???7???a
<?I??????
??dB??U????ED?v?>??????G???~|?j?X?c?m????e?F????7?$/^?????'??7	c?tqg;T?	???Lq3QK%Wm8?hS?2??q'?|6?7???????C??f??????G:?4???k?? /wr)]o?P?K??eY?%[?\?j?}Y%?<??p?p!?[???C???9?m??O}?H?>R??q??J?&??f?aR????"?1
??s$??"?3?r?;?;.C0??0!M??h0??g?????e???c????'PP???r?x>??[?fy{??B?"?fc#?<??/\??????? ~??/w{????W??~??V4K??$?^<Y'???6?'?%U??????X%?19??nZ-W?1?????????d8m??+B:2Z?\???1?<2?i???????6????|?*?e?I???y??2?u??
J??9?M?vW?Z?3=]?	&??$?M|????s >???Se?????e d????????n?l?Dl??F&???	k?o/?6t??????@??v?g?|??J?\
?`[o??,?<????[?:??????$?????????X?2????!e????| k
4Zk*J?M?????L?Hq???A?
?d?
1??cB???C??
?29?????F?~<R??cc?b?? ???!
??
?q???1yK??=?V ,??	??a?2~??E?@?Z???K??
j???s?????5?h???sa?h?V?yd??W?zGb`!A?@?????H????rL?*???C?M??^???n??????????;??e?_ot?????\????????ZG?d>?
 ?$2???3??S?r??L??CEO??#?
?
m/?\:??w ?y?M?w	q??&???20?>>?@?N>=?`Q!?????=?
??vws?%?x??#Z'?	'`?B??1JN}???'m?=???}???`4?`?_?va?7S*#????%3???Q?r??)&}Q]??;jn????j???GD9?.????d?NbJ8??
?f?
t?AG^?
v???
c@j??7???
??[??S?5??R?:Mpf??o?w(??
???AN?0??m<?/???Z??wal????='?\???"U1??bZ?"?????\OGe?8z?*b??a(OT???FF`?B??vT?????U?j?@#?KE??\???5R4?24?S?c1OH?????Pl?????JB?y?y6O}?4?E???d%d?`???
???\L\Qy"?????p?2???????y1??4?@?b?????????*I?????)N??=IQ}?GA?[????X????"???}?ein(?z???????g
???[?\y?Dn???o
?W?L at X?
A#9?&?y??i2???}?b?h?b?l??????mK?Z;?k?5k??U$ ?]???????&O?@Q??W);??d??vC?X
	.LwU?;r???c[	ul-?&?I5-??Q?,?C???c????g?l?#??FM??a2???)?"P?a??TTc+??+C?v[???-??%????A??H?KSv?a????????u	?	??cS?<?VE??????!?????
???\L?q?????`??3#?????-{????????;??????J3^X?H?_j??4??+?FT??L???q?b??????&?$??V??G?3A!&???0_??X????i???bX?Z?UG?????N>???@
[A
I??????????L??p???I??&?yv?qU?1j??0???(UG?Q.?%w????????O`n?38i???d?#`??R?I?x
??Z?????4?????`:?8?+4??6???d??????A?
J?8?@?+??X??e?=??s??(?.???E??
L???Cu??x  ??
;|????"7??~?n?u????(i??0r???"N??!0Vtd???????s?d??2`0U>?N???DQ????A???C???R!???????W??]6??????????_?"1D?+_(?k\,e?j??I_??
??Eis5p?|??t?????'?h???/h???<E??4}?ww??????J????!=?N{a`????Q??
=}??k????????<8?%???muK??7?_???y3????1b F?`?gZz??????
????\????^??th???GP??ihM???'??????	!?????q{?k6????M:5?9??????~>
H???L?/u????N??7O9??Rk=?vT????8?1n????H?A=Hf???a*?iK???o?pI,???{?<o>o??{NA??]??d>?}oG?????????X????v5?J?)?/?m???^?b??b??3????'d
&?>O?
DN~]x?Gg??	C ^??M?P0!?C?1Q&8??"=hv???S!?`
??5|???z>?O}?Yrl??1
??????mO??GJ??u??w??.M?=???4???T?????0?U?p5?4?Ah?S?.Z@??~y????|Q????bA?H7??m????n?F?4?0}?8w??H?.?O)?}??w??Y??Z
???S?X??u?S_~^?TG???p6??pr?????????
'??Q?O?<????????ZT::?E??^???]o?? ??Vo_?7???(?ka?H1??v???3f???d
?[?Y?p?u
	??[??Z\g???N
?>???{t??3??U?Eu#2???b?&S?Y????\m???=b?)?]V???oR???t?????????????eG?(?+?}?w?W??f_??_??_?EJ?[o???8#???F??ubp?*Zp?6??!~?r}s`??????l?-??.cn(cJx{?p?X?k?#???2Rlc??]????[(??.v?????F???-??xq??u?????
u??,"?&q$??6?S
?
?????%#??]%??????Haa???G????e=`2??8?>??T3t?8?I7????xt???-???J?u???r)(?=,	?@?g??W???	
???z}k??????????Yk???a>M??,z|?S????<\[??7?O?????b??????}?Y??????Zd!o?
??*|;<?w(???#~wx??2?1,?I????}??U???????r????V???Z??????????=?e!?????
Ag&OQ??7S?c&{8??kW???;?\p?oV??e?Z???)O!??hK??l???R??=0?B?????rY?VX???4?X!??X?????
)?
G?4G>_]??
??GH??zW????c?je??G?????}6?SHS?!????z?2??????4j??????m
??6???Z}??2???C8?t ????A?`6?xz?.?B(?fC?Pcy/uR?U&I??x??<??????u:~?h'??L?&:??lca?J???f??3???2?ZI?L!72????B?4v??_???????)&/??X?d?qH?O,?l?X?L????}a?
?d?eF?p?u??????OL2;?~G?#z??wvKh?LR??
????'????l? lf???
o+??*?FO?3?????????z?*e??????.????
^ou???$'??]3h????k3??X+d???]i??'
t????'?#?x????u?Z??xF???9?s-?Mf?{?? k???????K4??????M???b?h??=?`
)V??f?9?Ts??4H?L*??Q?O_?,??????)glJUx?6??x'f??z?UYK??????????8~?????]?$?v1?r?VR??4U?v??,??Z??}+??i??????M????p??a??*3b1???(vU?gL?L
Rbil?r?9???@?f9&/?RL??
YA?w????hTzS?r???$????????j?????O???$?a*S5??N?k???p4/R?b??^??n?$??8??Y?5~?!?dq2]?!?? Wfs???K??2???:m?T?V???I?????v???#??hR;?
?? [W????m1~\f~?'b??:K???n?H???S?a???u?????
z????
??????z7???*o??????Kgm<???H\E{?MW	?OSp/?>???Z?i)Y?G%?I>???r??E????????k ?i?GKu?|I?LJrl?q? ??5??f/?h? &`?Y5h}0?? k?q?$????1?	ZX?!?????[fr?x????V???
?!?2?$?@P?/+ ?????XD9?=0????A??n??(??_??
?D???S
4A}E/Y?????i????)??????O??%?????? ?&??????????es^`?Cb?y?:???9?z???;H?B*?EW,?Z??A??
t`??i??^?<?U??0???K??Pd+?????V???C
??C??????8FWF???U4
??4??jK?P?\G?+1*
/??U??5???f?-???
?n%so[???JS?:|]^?#qA?y?{??3?}?n%??R???Dm????????4D*?
??DH?|Kvd?3?????(-?lX???s???(??E
h?????Y???LM?o????
?FPFy?;???????9<?`Wb?;KQYi?f????S??M?xD??????H?R?.???$?)??y?7?v`?ris?B??7??????n?[znU`q
?J'
5`8?QgK??)?????>?d?(????)r;w?#??)??v????}?}>??E<V+4?????p?????????ZJ?N!_?Y????b?k?<P??????r^??A???lpBK ??????)U}4????|?XQ??D??k&=<?N?0K???<R????0?? e??@'x?5??}-??$??f???8y??2????6h??-??
?4'7?????S??V
?????
????W??V???t?h??Z*???1 ?u?|L????R8?????O?a??1????D??x?~E?82??)??4y6O???K$???GC? ??rJ? ???J?%(???????w????=
?ZFS?Us?oK?/&??
?4Of'??XW????pQ'?+X?x?p?RZ?A%,?Od:??U??2?S?????*?x?:?&??o?U/|[??6??o????.?????u????/BG????d?+
???|)hV????4??*ZbZT?/?J%#??968?!E?-?0??v?p"jLV?kF?????Nq??*h???Lw??l?|?w????P??pd?????????M*??J??i????tAFJ{_?D?N??i M?Rb???P????t?^?s???'???????i?????????-&_?x?????+??????7g?KV??K????-$???a??[7e at I??e????Ci?lGOH??????4"??+?`???b@20(?Q???iQ0?$??????
?>Z?K ??g0?{????ufI)<?P??2?u?^???
????4l??????8??\???J?Yu?
??u?????;???F?L??u?/
???s4_MF#??I???bhhI3??e?(>u????hMOy?a!AZ??fb?{????S?$??x??C?]ns$?M?????
?<u7Nb??????l?x??[?? <?|5??1
??iQ0:*??u?#??Pe???*|_)???s?kA?^/???c???'????0????
??m??h?2!q???m???Pp??S?n???'%=?YA?U
?:???B?????%??D=] ?????P?g7e???VG???????h}???gEK??,?G??
v/Z#?*?V??????]?'?`g8??b?`!?/?p?B???2?X???{????w??N????hJ?q????K????????
uR??n6z???nowa???L???QgC??2?o7Z????M6?nE]?6??UH???c?0M??Z?q??Q?t??u? ?	%W??O???S??]???(???^?[???
?V?3
??i2?????Y??S?9?+gw?;??K?"???E1??Is?:???y??T?????U?	??nU,S??j?2??%???[<?8????nV??hCt?<?
?~0 at b}??N?.? ??
?)]O#?z?zX??(e&~??m?R8~
ok??l???+BS8??????A?????S?Q?QgJ?.<y|???^?:?Q?h??
z??9LY??H???[u'|c
???]???u\?[?(????A+]Ml?TQ?~.&?mj?f?T?????$?z???"???{N5??
m?9???I??C?!?????c??O??<wJ??F??????>?[?????D????????.L?[< lf??????4>s6?)?????nh$p? 9??+#9?T???W???a<<*?M?=?Iv?N?l????O?Q?<e?^A?hfl2\?@??{????x??%??????????1 ?it???o?????/??,.o?
????????Vu1????BsF?R?GoE?q
vpQa?w?\??<?%?)?Y/??&????S???"?t?"H??v?m???
?,4,?bw?????????O>??????=~R?s?v??J?t????A??????.?h??fw?-???G?<???????W????
%T??5B?8q?
??Y??'C???
]?O??4???]?y??'2!?;??;??F?T?^ya???V?????????.??xn??dn ?????Zy?!?;c?????l?????????;???A^Pd???
?W)????a???S?_dM??dP??~??
?&?n??G???S?`?<7?W??>P(??Q?m
y??d??????*?&m?,)y?V???????????O?B@)?G?-(?#??Xg?????iD1-"??P??"?x???V?>?>?O?l?^t?0
?;X?{?????sv?Y3?
?G??H
????bei3?vm6SO?&?Y?L?C?NH8??m?(x????????y?|???\_???]??jW)y?.??/????C?s?aS?[?q+u?.p?????w?????4??=??????>?t??:?mh?'???G????????ZesV??t-nK*u}??/??w?kI????s????{????? ???x?+A
7;]Yz???$G?0? \???nYa??MB??A???S~Nj0dX???w0U??????????e???|???.?,?8???'&tQJ?????V???u??!????$-??1??%??p?4??*???5i??j?l?jm?vWm?????F+?W+M2??/???U??-??I????G?b?O??T????{??v?????L??DD;V
??????????C????d5????0k???e?N???H?e;pi?m1S??S
?Gv???'?-???OUR5GC?8?Z????dVZ2MC\f?mW???~X`??j:<9?????l]???^??^???z3?_z???(A?!?A?c???d??????#82???<?_?O???????r?#k?????????$?1???[?0??Zdb2?m.??&'???}
??r?P????AO?^R?WzR??|?f?c?P??	?R6L?S
l???:??^$????pV??|gS??;?s\
4g??(????]z@?#??U)?.)??kx???>N:E1?SDe?c
/?????g??A?z?Y\b?????x?R<??`"d??eHp?Js<.~??s???4k	.t?}???B??????q??~;????:???AW[??b
?????a at 3?N????j???? ?????k?9?)?!*Fqq??`i?????*? ??6l????y??Ik?]*??t???????t?_?W	????? ??i??@X?o?Y3/????f%?%?6????.?!Y`??vi
b?????@?????v???"n%????3???)\?????h???????7?QA??????Q??`;a
^hli??n-?r`???7@
|??????L??LU?cm9>??p`GU??,8?u???R??d????!rm????M?(&??G?v???1????o?6????^?gFe0X`(?D`0.\}????QD%?w??3???H??lSz@91???{b?%?0V???G?k?\~LGD?
lv?/T??
Sn????A??????7
5?t/b??!?Cb???????'?
U?
????j[?;F?
,h?)???*M
?F{W??Y?f!???VY?;?
\???*??&?:i???~?I?2??;f?v???J????RE?T
??v>C?Yx???\??m??k^?S???6?v?8L?????0????Y?#?=ft??Sgd?8c?,/{?4a???? ???????a???
?^?j?????x<{I?Pm??p?@9?/u#??mk
? ???}9?.?????
?.?p:#D???1?????+8w?:????t??
@????[,?F'?r?????p??,??)=?%??V;5?
?u???xOOJkISFaUo
?a]??^T?7?V?&????@
??@D5::?X?O	+
???2???H???s?vG4?2?h??4?	G?E!???M(%nS ,?L-_H~??yt?~,?s?????e??/o????mv?	MhV7?E?A??t;??~??(Z4 D-??V??^?(?.??S???Q???Fp?w?Tu?m?p5????xT$V?%?]?S?9C?@???
/??%?@?*??????vkK!?????h?3=??p?o{?0????[??,I???%?08??????&<??d??????a8???"&???
????????V???:v?A?Ts\???/l?????h??????-????Q?C?N??e?=p?5??Y?C3???9bT??
w??p?Z<Q??J"-X????????N/???5?o?/X$`?"?)?e*~??p-P???????0cREQ?????q?D?s?[???7@???? ??q?,0??????4??#5?
?%????#??B}??^???N????7"v??fB?^??$???GK?F+t?N{EV??"5?p>V?????
??^?A9SdZ??pU?)FH
??%???????'*?AJFH
/G`??s??k5?-?????{?6=?E ???J?_???Kq???????I}%(??
?V+D3??X??}*???O??>X`IKh?
#"?E:zP|&??????A?s?(?F~?q???s??????h`???V/??????z\e?0H?/?P?NJ??l?
??;COr?????(R[?\Rl:U???.w???????#W?P ??
???xT?
;?;c]???? ?A?B??{?~{??=:-H??.?9?K:+2B^????n?T]m?M
Bha???????@????	?	?(&.??3h!??WER????J???#???Sd???l	?????Y?K?$*??O???-<??tlv?gdC?)n?R?&?h???,?U{Y???"???6?H??C=U?d]?R?
4???>/t??:?b?btM5??_,???
?r?e??R?I??X???)y?^c???::?quE9?gF??????????;`?y%???U?+?N?eQ?E$?o???p?E??
?????*?U??????;???2&????N???S???9?E
A-???|4J??q??T?Z,?]?i=????N?f??UG?^?'?'??K????=???l.0????s??z%d???

v??p??CF????R$i??i??N?'F*?!W&?2|BK?i?0??c85EO?????????ZVm??3??L?i?(?i?H?R???~???N?=? ?++3h?C?|
?B2"k??,6??c?I???l$????W?Sf?U?????44]x?
???^?????b?Q????w??r<???*z?-??W???~???????7??2wl?n?? -"3y>?`Q+?????"?+?R??E?|?2??.
!??????v?%?ul?ED?J~86+k???W
?RCsf??o????Eg?@Ox??U-??P???TU-_H{_??W^?AZLF?	????Zq?i?a??)z??L?<8???p?v?0?{
y=?5????A??*??{Q????;^?y
??4????????(??-?z?S??k~??1???(0??~'bag???g???M>k?$m???As?&?[-???wO)8?????
?????$??1 ???y???#?h??q?????N?p????^M?jv???7?"?5?*?^	/+N?<??Y??T?$??e???/c/?be??????p???	?*qj?V?2?????:L??T?M?.??[??p?
?????O???!?r?8??x?$???????T??V???Sm????????a?r
Ya???"^???????u_????*Y??"?`-l???j????hZ?U3*O??Q?"?k??J??-z?p??j??3????????]?????
E???R?%?D,?d??;???X`j????d?ZN?,9?k?G>?v?0?)dJ?????? ??2gH?'mx<?>???4x???(?U6r????4Ex?\???|$V?%?????m?}?f_ZG??#$
Kh?Y\?
???t??v?~?k??V????|H?7`??????o?{G??dvHJ
??=a??h??M??u1x?lZ????ze?t?F?$???0M
???
lZ?=????i??J?E??DB?????Q????.
??h(:??>gYVPj?V?,??????H??/I?o??S'??UR?C?4?`J??ri]???
[?&??=?Hg_?d??&??k?%?2<?F?b?(
???b@>???????P?Y??/??%??RB?????0?v??1?H?????O(?1
LD?l?tj?9?
?-??b63?1?Z??#Vc????Y??I?Z?uZ7NKF?{??@<????i)???????+;!?????@
w????-}$?gx???^???2?9i???????s????^_o???d??9y?Y>*?_PZ\5????.?,?iQ*?%??8EWP??0F?t?:*?)?m?
+?Em
?~?KO4
??{e?k?+?????????????\
??BDL!oN3????f????????;?A?7????}?? *	w???=?+Q?_?Ep_??v??F^??vzo;i?1?
B????W??M8??v??d^????reB??H??????]*??"U=W???:\???????.?????M???????{??k

&)??i??^????A??????GX?e??A1??4?????V??9??%'B??Q'=???-o?6#2??g??????o?>Uvf???$iG;????`???
?5-???????5?H?Bkp?8&????@??x=?[????+K??1
???}???W?^???o
?~???s?????????????/???^??????W?_?8?o??????(*?
N???|zn o???x??????4?p? ???+2 
???
9	C?d?G?4?X]ic?\vV[??f??9h$1?N??J<H?)_e?CO??h?X???4=	$??l??:??~oN`??????[??b??b>?'??1?C??7P^Y?8?o?????????~?1????????"{s??G?????F??A2]?.n9??Q?x?T:??y?[?????TfFZ%Y???mZ??Mjb?Rp#?D???Yn???-?6;?\??k6=?'`???](^p?V?	?????A ??;???uG?0b????-???N??????O+??A6?`?>?p?4?U?Ye?'-r??g??,d?3rb?
Y??pD	??L????I?=z|??T???8?%?Bx?QXP?h&d???????y???w+?^sVN???????e?;g?U???Nw3? ??v????????|???????{_?\?????p`H?VI??@?????h?????_?j??Q??Q??s??g???
?sY?8?N?r?m?X??&Yr??Dp???Of??Dn2v??BF?G???#??
T????!f??????
??a#??
?N?	.??\???+9? ?t?-???N?q<z????8?y?c??s<??@????h????|>yuS"??-?????qR?{l,??-u???:e\J??)1???l????nUuzA??"??Q?Y??.A?
#???
?sy[?N?#???a?;?8[????#??*??a??G????????Sh?$y??Qq???^dRYlk???,&b???x??{S???x??'!????a?l?D????fbI?h???
???3|q??=+?R!G??	??s|[?6'???	Uh	?
????N?????V?_54??t?!???`8?Zk?7??(1d:?X?,f&?N)5?KZ?E?3`=???qmP??s?g???w	?????za?????\
????U?n?L4A;[???/??r?/?
$?????O?uM?=???UE????@@???W?G
?sJ?F?S???v='u?k?"???w??'???|]V?~}?+?F?{?<?&/??_JN<??i???R?	SI?
>???????Jl??Z?x?=??.?Y#,?$?k?X?;??I???+B???^h???y???V|(z?sn????q????|???AO$7d[$8?-?*?HU??/?_?,r???8?S????U6u????
????a!?/?<K??K?/='U?w0d??oM??4???W:?t[:????E???????p-GW?nh?>?y??L
-u?D?9????B?Lf?$??g?NY+s? ??{?6Y??hoD`dzO?",???&q(V?????*1G?I?YKm8x??? ???.UB??U?f?$?"T*???l??????.??)?k????????wG??E?
D?Y?p??(?.?'?R? X5????2?"\????????
??-{?ek%4CC???+???`?S?=KF)J=?????????e????dc'??6??:7?Y+t???e??X?7S?????????i?mG
?k??n?????H7?w??:T????bZ?AN?:???N???????Y??? ????p?
G"#D?t?u)?8???a?[&Z_?????@?????T????6???????????V
ewt?]?'4??xt??^p?F??!??6?"?????H?,?)r?{??^f??????*B???v?Vj??h??$?U??2h??????	?l	??0*??6IrD?CR?(??Jc??q<?+
%?O???	M;?l????^go???f??L0?i???D????????R?
<Tvu??'H?C?s?:?_	B??u?6?A.>?????!??Vw
?)r??D?M???R?
EV???k??>?1???
?.i
??R??X5
??&?????|??j?ZU?????pN?]L?????????_?1?u"????(???g?????X?UN??J???~???0?+?Wggx????+[76=????7?]?????0iBdV?TV`??
?F????j?;s$Pn???????G1???[????
??
{/N5/~i&N??A???????h-??
	?%*????'????????ch??\?p?t??2?)??}x????x??l???<???$?^4????0?? 2a???-?
??P??Y???<D??Ou??'vf?8bE6??F??KHV>#???/+????f??O\?Lq??????????,?yP????J?E?q???T
q????U1l)?????!*?????x???X???????7m??????)H)??
Bk???h(PlY?joB??"?2J??f?
????h??qe?)W?$?4???B?Yk?pv??tYXSm!?d??h?QZ???S:???sLk???@???LV??????)??&??a?2???????S?B?????0D;3??FH??BO??v???????Rp\?[n?d?7.?pV??#?o???4
xU??%P?/^???Ag?Y??#
wB??EHRN??$?\???f?9{G3?.?-u?hP&??xD?&??8????	:cTEv?&,?#Y???S??a?n??^??&,%~9r?ea??D????q????jh????V?V-dX?r?8??[???
??P???ahf?/????NkqP??Ky+We=?
`i,Y?B?*??89???vD????cr"'??F!??~:/f?c?t??r	?1?Y??"'?????????I?T?%*???nac?}???,???<?j?WN?l*tDf???J???6???-6G?Tb??u4?",???y[M?G'|?xq?+c???Y6&n0??nn??e?]?k?>?l_?`9
??-?b$??D?+-8?-$????40??ms=????????v??=]?,?WC?u?d??????&W????k??Qg<m2m?j??CYu"??s?
???4J?kw?????3W?I??(-????J???????%?;38
?K??"??I?t??@?e????j;'??????? ???4?????
??????dDo~m9???Z??
[...1795 lines suppressed...]
???^w??7&???s???1??KV???G????XB?GlN???????????3#a?n?????3??x?E!BCG??ot?F?rf??H0???]t????t???0?????20?$a?HN??(?G'???9???f????G???(L?F?]?????%???k?RS?x
???3??????d???Ar?LPE??[s??L???G??X?fg???
'
eZ4?A/?]??!(c?&E?L??I??M?(???KCl???????su?qa?W
?sF???)J??1??	%???q???"?u<Z?rJ1h3??A????*?F??`???SV04?f????Y??mh??\??gR|{?k?w??@/Yx?
b???1z8??????p????b??r$mXa?<?>??T?l??g?x,??q\-HNW??w	???????v??FV?Q??l?s?!?h????%????xha09:?P]???;????*/???L????Sy>2?????????`?fL????B??x???G??}?F?d??????????G?i??E.??"?2?RB	9G???????????,a?????~p????T?!?U??0/LySe&??)?7???1????N???8???Y?6???d??????7ir?????~??Z??(X???	lm?
?zH(??e?P??07?,!??6??B????M????:/??@nG}Z;8??b??)*???B?(?%?E?$
???`?|???yn??>???f?i5

??%'???%4"?Z??a???|Ly<[{M???6r??)sgJ???????f?X^??m???i6m???%??	?i;?!D?en?i???????A????`??TC????1M:?R?N ??;?$q?)?????J2X???w?l*?`F?7?T???1:????Ke??+x}i?f	??[??~??_w?2?(;t?T?}?m?h??? ??????
??!?(??E?h{h?@lJYk???e?U
[=;K?)???J?????;?h?
??"??????$?0??'??~?@Y8??q??????SM?',????
???????#68h P?|?Bj:?7?T?\p??^????3?`?????RzN????0Y\$??(6?2????Y<x??V8?V?EY??/B?????x?
#?@?)#^O???????8?af#?*[?6?pz?/??6?L?R?9"????O#X?aE??	J?p???{?r?/?sx??!??v??????X~Hao??OuJ?O??\??Q??$?o?[??2}????V1???G
<j%??H???4??!3?????L?
Qbb?T)
n??????x??@?????G+??????be?FA?9B?N]?mlr*???H?/N-??AO_5H?dI9?HC5C?w??????,2?????1?V??f$????^puEXl\?\??i???????JP??Ta?~J???Je?^???????f	U??`W?R???C(?/gP??H?Dw)O
?\9;e????Jg<?M?	G?x?"????q????4???I4?V^?R?G'qZ<???(??;q????8??*
?+V??D?6@`%????t.?	???
0rN?'gO?U??????????%?SAW?S??$\aj?`?????&????q?<'?]??d??a?A]?nx??pkh???~?z:?&&???<? )?EP??"?v5????X?
<?B>,,1a'?????E,|???a????>?G??S??
ZdwmW????hJ??????"?? ??`cz0??J?e?#T?Gs??P???&46$?????0??D;z?O???&/)????$?]?c???T????l8L?H]????J2A9vi?\<?7??+Y??(	'?P??Sd??q???E	???Yirx?J?????w??X??}_????;^??n1??O???06w???
G?G?h??<L&?lC?dh?oPu'I???HM.>?&??k?a???? ?????II?%??P??[=?w?Z????x??B????$?f?{z?C??X??sGj??[?'?!?i??j???Mt???s??i6?Y???A??#?|???#e???GO?a?v?????Bm(x??s?c'p??\??!w????v???07z"S?2??K? ? ?\+ry?
???????[j?S?#uU??????'?&?BcK?/???!=??P?N?B????D??H?f??	n??&??v????????1J????_?b??PV??????????=?)?s???????????(\W?????

??E?-A?#?E5??{?B???"2?Z8???r%?T??e???U?uA??kk{?GLR`??
Xn??????
{??n??LR?U???g,?W????T@?$D7?G?k??$
s?0?HC?F?
?2??K?XF=
H???|AP?????\?X$c?????y????N?^`?????A?t?????5????G?bZ'??~?<??Y?LPqJ?E????j?`?	??.?$?3kE"?Q_??#??????W?C?????S??+(C#?????;5?!?L8??@??F?!I???%z?H??????Jd?????%?9+???vM??-9k9:?v3?x?k KU?????K??o????????~??5d?n?a??_*??D?'sf?B?m/?T"ny?????4m"?]?/HD???F
?Y?v
???1r???N}??,????s??d?h?SV?c)
P?y6????XPn1?r????
??U??m?UZr(?d?R?	ng?N??-]\\	???6Q%VR'+???~??r??>K??I?????zp2DE?@??9*8??i?????mIUF;'1??H2Rrj???l?gS??/^Cs{\???5Cz????}-J??x??q([Ai??#$?ME6??	t???P????Nn?.?a??????<QFV~?>l??
b???*?\y?x?f??fR?CA?)???:?bB{?,H?b'K?=Fv??^?2__?O?gG?v?`?:\?bE??D?+?#
?	L?wL[1ijX2kG?^?????yg3?>lc??#??n^?k^?2n???????Es5b??????^]?? ^?+????'T??X%g??nW??1??jLM*a#sc4????#VY
<U	yk????k5
???????,?????	?f??1???q??UeJ??$/n???V??9;?P??[S?????*M?n?O?+?n>]Z?g\83?(??dR???w?
?"???????J?'YvZ?=c??"??p?Gd??+?N?h???M:N???????Sr??#???????e?s??Q???93^.?)???????d,??YkT?????1W?m????:??V???Y)??rn???P????\{[???qS?????,??Vv?F??????????
????n???????
??<???"v|Y????????
y?)??XvO?o??@.
??t?O???????????????5w?????GE?????9V
VgS?'?`j2%)???bn!????n?m??????)?q>+J?jK??s1???w??GI0?????p??O????(??????@\?Z???(O
??????x(f?+?|??<)??I?6?????9?
????L?DAS??6???????e??'A??3A??n}~???v?7?,????Z?7?C??$????wZl?s??='??Z??
02?x??<`$4C?q??xP?D3???x?	???bD?l?^????m????k?t:L z????%????Qx??????H?9?$????dMIT-w??{)?Qk)?{'?&E?a??m2??N??S?}?t&??#??h??-???*"i@???0V(G??2?Z?Tl???6???V??W????.;
!o`B?-T??b???5$??\??10??d6?S@|?{??[???7?y??&I$??????l???????????K?t????QTE??qfb?p?,
?E<O<m??v12?|?????'????????C?z,?i	??(?!%S???.?????H:????????;8??8????10?#j???ub8???ttq?aK??q?\??	p?}???!????????Q??|.?H??`?\Y;?OM,?????!???n???H????7????~S??????????*????6?F?2p??D????%W!X.?6r??N96*;??????Q@?j?,?+>?w?:r?u=??????3?2G']?k??u?^?????-1???q?E??4?????????Vr?i???._??_Aw?ld??3*??j?l?/?lFq#`???????l?????????et?

??3??P?~?d??1??B.
? 5n??-?4?;??B)?~?&???8c???	]H?]?`???~?lqS???^qu?M??????/_??g??
/
q?Mdi?v???[???g???T2??_?}?'???????S!Dj~??4L5???";?????5?*`b?z???}r\2?W/_?w?3k?$t????h~???E<5<?')???d#k?C?w???MN&??'?#???g7??h??=[qb}]+????2pf??????t??!e(,
??????C_f??!r??,???????<?B ?{2?1???????oz??? a+?
@(??j??`5????-V???EU???a???m?????g?b4???Pt5@"#?	Cc?f?!c>??????A??iP?
??h3':????'Wk?RC??/^??-??????Z:?d??-y'????~??????yq????-?R???F?bN?X?t?)?1N???c<????=?9aVX??a????7?(?714????#? ;????^?J\	??????-???3L??
?3???@T#	(??0??U??????BS"?)?#X???x?H???i?b??N$M???XQA4Wor?0?$???Q?7???G2????`??s????(???u?;4??&?=????h???
?
F3??U?? m?O?)??????~S??????@?WPzR????T??~G??<???{'16??;q6???G???8
??SYY3?Z?44?g3:;?????$?u?????s?????/?D:;:?1%??,tN??????c&???7?????b?"?? ?WDaE????
??.?my#???|???????Dp??????????
???K??x|?F? \.`??J?fn?TlZ at L????l??4_???5???0?w4?M?/?3????v?oF??<???,w??b???=????
?L?g?t$?Z?f?<?A?[??
????P??%??$9????4????d??c#>???b??1}?zzY??p???;l0??f?;T;?F?5??o?x??Ci?!???
c????z?d???(??4??2???9?[?{???M?4??7???%?8?16??Eb?7G??e????q??n`_??b??
)')???FSIF)??????_]?7?W?1?l??{?I2-?\?P?????f=?S?k%"?2I4!??M?????5m??_??&?K)???/Q?)@?HO at p??m?l?p??E??????Y??(??M?G?+???S??c??{??????ebnL??&?Q<=?&??iS?E??K\8?rFr??z`??'e ?W5@???48W5N+?????A????x??N??p????	?d???>?R?	?P?=????l? ?U]?]???4???@?N)-)??in"?????#????n?3A?!?	1jlYeP9??&d?9???Z+??D?)k??????,??$??PZ*???pEu??????0???!????1??q3?????K3????s?q(RC???S??[?	5
????~????8?L=`???VI+????G????-??????:?;&C=?y???"????7?^ ?j?gX?'??<bV??s?/???m??J7????P9K???wo~y??i?B????????btBKk???S???k[?????o?7???z?'_(G?????????x?@D?`X?j?U????????Ja?&X?7????9??E????`(
??????????z?????t?
?????????A Z??u"_Rn?Y?H???*?[#G??Z?*????-?$I??]??l???,?<?6?@???|???????????o??????h??R??b?P???c?????????JED?R-??B??4QVI??2??G"Qk9e??<P???(CK?V,ua????1?=
?M?$JpN
%VA????????s?8??(T????????2?N9K?#????G?
?k??U?????G??u'9?K???????b

!?
????U??R8?i<?r?$?@????f4I??5CW????i,<<??S???????d?fX&?:?g.@????94t???????
????????N?
?s??A???:??M?D?V???fP?"|???6?? @??ii???_uE6
?^K?
??[z???~I??k?????l^-??u.???M?S<??b???[?RT???4P??????,?h/?<??#?szR?kr?A???	?????????>??P~6?F?x9O?J?t?Z???	a|?'??M???~z9?L?p
?Z???????b2??z????N??L??q/??|???{????n????z}????O?????Q???????{{O?<??:?^?fOs?C?????????
???
??y4??y~P7?P? }??w????????y?_IR??,?S??H???????vD????Mv9{f?N??%??????	?q???N????\??????`/}?`f??????????"CEr?????|u??A3	?????[?$???S??.$I4?????O??kD??0???k??%[???*t/E?F??????c?p?r|?X<?_?
/8??????u??X????:?M????U+????t????7)F???J?>??.??9^D??t?`b????2x
[@9:???????}
?9??????_nd.??KhN5???|???FO?Yb????X
??i?;"?U?K
?????=?????j[?t?`)j???????Y4z??9t4?[????(????lJ?\uxQ?r?Ag6
M????g
??/??jM?mJ:?h??-n^??.O(??n4?,1X?B??G??n?U?g????????c!1????J1?Ln?3=5??qh??x???So-jl?ir????$1?z9m?p?????s>?7???-
?'/?N?D????T'T??Ghi??&??c*?9Qs??????+S at H*J?`??3
l}?
?X?0>???.)7???	j?0?m??&@???w??C?~??????K=??m=???|??t?????KK?a??s??Q?U??x??b?7|??$1i?????#?;
KXZb?????P??O?4Y???????A?d??]
??*
?c?????
?
1??
w<]K??????lBZ???b??????1?v^n??????/?]C!??F2??XM$?}369]c???-????j????????$?%6????L+S?^@W????|h?4@?^\!??&2_?s?????S+???D??D?N0??? 7???/G?b???V????Il?r>??C??
?U????P?z?+r ?C??=???z???????e:?q?_??w????=???S????yc?.????R??!6?Y????Y??P?????M????e?p6??????.?K?*??s???<????m?)??OW@??Z%f?wp???G?????w?u??C?:gy?m?????S*?w=??s?????9X;?<&V???W?V??ya{??6?&-?Q?`b????i?K?????????????,?C????8??O.)??b?
K@
U????s???-c??$5??yA??O?=?#???
????I????x????T??.A~?"???"?4??l_y??|m(???????%TM??(Z5??%-?N?l??
-u(L???t????????Hf9??a`???,?`5?sI@H?2????I	?DN?O!?D?B???&??????	?	Bj2%[??=
??????????????????????`?
?????5??q?}??(?U?e??=J???s?WAy?????x\????d?b??????
?MV?W5?~????#
??L?I?????d;$>??.OY??:??
??E?*g?? ???'E?S?8=L8<?:?k
L????8P??6?r?vr?:n*5?+???)c????\?
??mTx????n	?%@"?vu?% ?v`?cL5kFX{????~?|?????`????NZ??????????'??Kr???>V??????U?`?w?O???????????V??(b?YvcI???
b?*uE??R?w'???"?
s??R?~?b?@3D?=??M???6$?z?v????????E??#?6??de????;????????O??I?rF"l?7??
?????e?????{+hf???fwV?F????W??kd ?z?j?rqPo??????3?Fy]?E?~?+?Q??O?a<
)^ls
??????R'???>??N?m?>?03?W?NoP?????9??z?7Lu?0???

???64?#?{?s??????Ho?????)}b?
??Og4?~g_????m?0?0?!?? ?5??
g
?n????nY#?5r&B?'d?6?I?6?L??3???y?pZ|??????V?JA?ZA?J?T?????????}}???j????
	???p??Y8??>J?p??1c????P????[?)L?">R??{????m?o-?:"?_I??????89??b?5]M
??X?
???[?CM??? @???w??#&?!#???b ??????^????"???r?????4c?J??/QC???^)-??/O?*?Y???<??????'????????????>??:?
??&?\ku?'~=?y,?6g	9890?|
t?q??/?v?W`?f(??L????Q??z?????4TCu?????????w?"?"??????M]C(U?????Y???????/???
??q?x?Y??Z??1?L????u???" ??y??'\N}w??NPX??y?_G??=?Q?9
???Q?`4?????????o-??u?#?@H_?]+?FA??FX??d36
)?????????z???7???RI5???????o?G?q?{???K?6?m?UoZ?6]?????;N?~???'???m35??r:?$??=?M7T&???aU??j?
z?C??V@?U?0?u?|???`??c??n??
g??r???!?7M?$?*7???X???9??yx?w?B?,?S?u4???{????`?m?P?
?(?
x??Q?FK8??Yq??z??&7??4D?RR??????-,IW;?o?B?p+???}X??A:K?????(??up?b?`?\R-??@"<????Z??_?????????????????????m????\?d?????:M.???????Rxb?[L?q????
??@%?0???F1?a%???G
?\?F??U>p?	?}?????7?p2?k??X?????????
+??+?P3?bL?b
5?'X?d?qi>?`?C??Z??>?0? ?o9?(??	???????#??
,
????c???R
???;?n?<???????h?????c???7j?
Clb??Y'c??
-#c
?:????n?%??&r??CH?FD?/??<?-k9?@??fr????iO?a??E Z???`??????w?6??*?
?????3D2y%??
?e^?>?6?v?hU??e3?????g?m?????#????-w???N'??*?9j???x?uy|V??h?4W??_?6???????j?Y5??G??hW??????(?k?s88??!??j???=a?j??jQ?1???%??=?)???
?Z??@
!??
?????*??????|b%&??A{?
-?!|F<????kEZe??A_FDBX[f??????hq?{?DW!??e?eL?`????,
|7]u*??5%???g?Pu???
?L3I????4??????i????)?V???p?&Y?s`?4?k???3???]??q?R)M??8X3?X??PR6??????"???e???0OG?8k?_??4???z??-?G?<????>{z?c
Q?h}_?????O?2{FG?G?G????,??"????O0J!??1??x?Q??Z?O?o?r??????
??}8"o??z???X?|L?*?????I??jd8[~??qg?4E_m3 ??Vr?????>?????
?gg
?G??????@!XEj?#??k?j??l????$&}?iQF??????8WP???3??r5?I???:c7B?c????(AF?P|?f?
?
?)0XgG?:H?nH?????L???????_??\MY????Z?????IV1)do??MqP at .)?????????O?/??S???c>J:???i??
?5_2Wj?u?9PaZK??????Y at h*d4Q???X????S??f??D?????{Bi??k3 ~	?K??9???????+?!'??A???,?iA?G??q???^?5h-?G?Z????p
M?am??h#??M??]	)??%?d?

??J!???'????;? E~??U??
w!??n?l??#?P?o?-3
4??0:6r??+_??R???i??
??5\??????8P???????f?9?4??e???/??w??Q?m??XKY?y
?i???p??????f???3??/??N??9al??\{k#????>????s6A?O???Pm+??OQ?J??V???6???-???zn?????Y?1????d?&?}cx
??????????Zo?I<7??W9???E?ndn?0??????L*??y2???hB?x&?W???u?
????.27fE?/?d2?gsj?)???L$??j?^m??8N?.Y???9?h?sT"*a~???&ar	m?
?b?????=?%k??'?Xlw???WdK
???N???_x???9??
??
???`???x?V????
?$??1?U??Ql?>*?i?.?
???^ez5?????8??
&a4I??R{v?U??
??.??2??O?
e?*'??
<??9?}?A???D???]??
???6>_N3?|Q??
x?????={U?DX??!????W??
k
??	??j?R?I??O?q???h????L???k?B???@??|?X
*???x?xv??[?q?F???+?c?$?hb?A??'%??ks}?XjP`?R???T[?)????&)??vaS???L??>??`#w?D?d
r??O? ????xXk?
?'?D?[?t?d?M??????}?I?3=;??k????2???????????B??}?????????c6???2??]i8??Ac?
?7M????2??_????4H??\?????
b#vc????H?Ft???==??1???G?ety4?,????????5]??%???g?
??F????!?????
???&???????????X?-3`uwU_f~???}?c??E????g4?:?cNp?????mJ~I=?5????I.??A???`?1T4?t	@>?0??'??y at Hv??.??:???~?w+OPq%?T?
??9??)	???? ?3???p??4??yL6U??5????????????Y??6
mf??]7?X?a??)?L)???kc?'?:?f??C6x\??:??`?1
e??)??$??K??:T:]?gvl?c?qZ?
%??a0?????b?O??b='c??$]v?{Gw??S????x+????????L?????]?"??M?N?A?6??X?d?????|??r???????r??B?n8N?/{???X7Z~T?k0N.8????x??D??0???mMe???'??N??P?raA&????p\`?@??d?^J???`??Rt??1_????h?7?>?????c?2?X?2??????$'?p????3?????V???X?
?%wO??"???g??t?t=P}jtIj????d?????o?Dz??h.??-????"??=?????G??6??s????????f[??????e??J:?.?RV?????,.2?z??lRIk???h;3mg??^??????|wp??u?!35?:U~.!^?????o??U?k?hO???
	??t?T??$???C??DU]r???k~?u??"???W??h????b?oD?&??BW~
????
&??r?|????VjzWG?eo???C?c	??????
???,9?t.
?2s>c?g?t????L????;&&v?<?;????k??51~-T?q??}{'??e????v>,v?;???{????1!?8t???hJgl?wV?h>g?1X????<??N?q??.???4c#?]?p??T?p???H_?bZ"i??~???c{??S??,!?]Ke0???Y!~7??ZV?m?sY??q??$?;????8??FF??????c??;??p?P?#C[????0i6K???1?G???Q??x}/V??????k?;^??UJP
???t????!??
?{=-????j?????????O[5c?z?[??l	J?[??)R- ??`?,?g"???li??`D_?*??Ri|?????^
B????L"?<?{x???????e?S?Ul{??e
??^'??E#????
%?b??M?+
b???cg	?R??"?Q'?Z&??L?an(?$?Z?b??N;H???4	?4?????l????[M?H$??9J??&
?H\????9"????p*?H??????	/^???ui???8\?ed???????????e
D(Y???U7>??_P?f??T??]?Mt???6??(??8?D0?0?=?F??V?|z)(?R????8?-????m?x??+9U??q???AOyj???D???2??'p?n?.p3<??fMv?????-E89^??[KDZ?!?v?????????2}?????????3?C?F??H? ????6@??? ??ZP{?
?z?4?z-?B???Y?nX???O?g
?v?]???J??	?x?????!?JF?$X?????N?F??Ti6???)t!???x??9????BB??b?l{????wf$?Vl????&|?'I?iOv?n??????a?j??m??]?V`??@?z1?????U??.a?{Q?q\????\???on!?.R???????1
?+?S$&#w"Ln??q?H?5 6?*3?tx9???Km??>8?g2??/??"
n#!?Yh??????7<B???O??
??C]???CX`????J?E?????
s i??X?b??|????)?Tj8?N8?44?????
?Gq
z\1q???
???"?zh???P?Jh?l?"4b?:#??<?'?????V
&??V?U$a+???{'??????H?NR3?*???c??Cg6Oql?????	m
1?????
?o?'?_?1,{@sT??
O
??L???":???8???,%?????*??#??C?
w#Y?????S??? ??????"j?|??GY???u??jS?;h??s????=H?u??Ma?JS?X]?p?I?E.T6q??Bh?J[d$auM??6i??
g??U?H?+?????p??\/qy???/?y???N?????P?r&F???ta!z??m?if?????HF???7???5?TY????~}?|)D[??h??6(u?u
?0?=?K <k0$zsx:
???#h?????!L_@?=?Yf??_x???J?Y??\??xO??SxJ???W??en1
D??[???BEiW??Y8?a???????*??L	???????QE???Zt??
?ey??V)????\??3*W??R?
???Q?"?_?????#6?-?2(v!???W|??8Wy?????,W??,??,
??Nk?6yH???B??&?5??H`??L????K???my???????Y?s??[c?|??\????g?8q<z?L
????????"N
K????&Z2???TU???{V??q???>????????U?y??9?}W??9P/??????,???????*??????-??s??uf????[m=C??? ?e?)??K???F?H??H8F???r?u???K*?{???$x?@?????nq?_??H??T?2?1??}?[y!?h?X&?g<?~E%J??"?s1d
?$|QpE,??f?y????????3J?vj?ZYdw??*??{?4SSa???T??C??OGn?vJph??z?2
?]B???Z?V?H?
)?-/???h? gK?9????:????H?:????G????S?w??`x????s ?;5????
?O0
?<??#j)\?
?J\p=??fj?@s?qs????|??.`??N[?V??HC?6?B??e? z?P??v??+Z}???g?c??"??x?=E??Ip?QBW?g3nF?+??????JL9L???vi
\?Vx
?1zmii TuB?L\!????>IF???	qF)????6?V?=1?q??????"??L$ :?????)`????S2?<h |?M
D5?V?
1+r??B?7>
?#?^Le??t?e,?????
??u????z??C$??????Fe?4V????3[]pJp|?f?U?????e???S0?
?G?6???\???k?????4?4N????y??V????Er???W??E6???????-?
sBYi?'???4?????`?t?^?S>?vs
i>?2J\+?]-}?
??I??8?8???p?????i
???09???????s?
?Ks-???:9?z?????C????<????%?????T???2r(CVH??m???~??`?x?H??8?m ?????m5?k?H???=???U???M_:??Bg{????-G'???IWHt?/?I?????\S-????0L2?4??!Z??k??5=X??n??8n]?g????;??cM?1aQ?4?	hL?P%?h???A?,?:????,??U]bz????ufj?V?#e?R?????0=?e?????-??P#?
?)LhN?k.??'5ip???H\/??8lG??k?)?aHJ at w?!g?pp4??8?_?o0y>?H8??????mh}cKy??q?I7??????F3B????G 7???@F?@?g?M??????@?Y?Tlg?{?>????7???|???r?=?6 ?
q???F?F2?(?7;?{:#?
:b:U??0dfA?W?????*?M:??g*+R???2???0??Z!??
|R?67?d?XI?ml4??i???????4MgF?????
?????]??????axZo/??
???<???Ga??2???.u?Z%??>?????????C?6oZ=?????g?7k?f????????K??4?
/<;:??W??"?SX_a76%B5?????	???b8;?A???X&_M????aC???#???Vl???
???????S??????|~?XPr4??a??b?a?Q?4v
co?np^??i??Yl?????????#?+B2?5??q?U??7?
j?cPo0?{?wSc3??kz?B?4??]^??+?3?c"?f??}z????v>=?????@+_?j?+????w??Xnzg??-???M?z??]???F??????fClZ????????u'7??ko?????l???m?8???_??mkv?<vh??5??\?o????|???x>?sr??vr?>?17T??w??5????|~aa!?0?k?????<??H??????k??m?m???0?,<?BS??V/???
?
`??
H?????voc???c?8z?6|-,RP??1mp??J?6?
????;??????u}??9????????????k??:0GncT??Zg???*?.rT6??k??i???&????p?????6?YO?A?????
???0 +7kj-????Mz?"??0edCU?D??????ab"?????:m,?-O???g??VjV??%?????Y???}[i?5
??z??%X?V??0?mw=??+???n?`[??.(?R?bct#'`Zt!-???9??+??$^?b7????????X>?:??????
??,????T?n???<	?\??DQI
?)?M0??;?u8?x??O{????u?i8[????6	A????fP?(+{6o?jN????BY????/cv6?d?C?py?r??3v$?+??p?~/0???P??{???=???H?t\?]???^??d?R?9???f???s n?%?;Bdm??????????@]`<??p???	??-of?>???Q?o?6UKY
"&????????
???????2???E?X?R?l????g^j????????????qx(??
o^???"x???+-ry?[??cf?4%i?????O??#Uq?=a???p?????:P??????iR?-?-Y'??9?7?j?t?4)???????*Y?5[v?9??k\H?M?2??@?;33X?j?V?"???SC????
ah??
?????gE
O?:G?
???9n4??4?E?L6?'W???????l?Q??1????js?x?3??
Lx??????3bp????k????sz???Is???c???rA?9H",??[?Nt?W2???3???(?j???u??g???????f???Y?_~?X?g<p
m??|^=??_g??UVh?J????L?n>H?}??>???^??yMSu/??B???????v?~???7?b??????_???'??*(<??QIL?!
?????k?B?)"?Z??S??<%?%?????????YX?X?S[?\?Ny?)Rx?????sh??x!?kR?????\?????9?|?:P?1b,?p??e#/??O?S?,J?f???	Nn???!=?[?A??????t	?F???Y"?F????????xo??
?????<?pPVP?:?D't???1y???h?E???`J???dX03-?]#?7?'??vxr???3g??t?d?D???
?|?,qC???????Sd?Vou?Ai lq
p?/:?:m?Q?{?@????>??
e?{P?K???U<8?
??A9???bA?q?6
??''???-3\P6?-DX4pd??=??d?T%?????-??-a?Ja
?
?W	?A?c??^?\l?`????^??fK>????@t7??m?C?&B?????w~????d???G??/?l???CW??+u?'??Rm]??>y???3`G=:^??i???????&z????????)?x??r?????f
??M/Wu??B%???b???c??@w????
????IJ??-?*dEk??c???????O??
????v?S?????t??$??u?E?DH?1?????B????????d?'?????>??9
?b???a??"R??e??E~?}??s#?$
??Y??XA??v0X????(??
+?
yK?:_??m?D??%?I?
(???V?C?%?T?^??P??e2xV?vq???^?,e????????????????u??Hyr=?~?'\Z??R???????K4ZYD?r?
?,????H?????h?ai#b??TEY?? CH
????D?-|??<m?6?5S?,?? q??a??E???r4???e)?Z???(? jd??`P?v?.??S??????D ??V3\
?]?????m?#???&?Y??CejU???>zpb?aYNF;PNaCrTV?
??????G"??
??e{X?,?????J?+??????8$?r?R?-y??8??G??????3~?J,?????
?	9?h?F"n7CZ?;?&??-_?????????l	?,?O",??)wjk0m
?XB??????Si????%????Y?.???C???????_=5j???Q???????????u? ?1?3?
&1=!?4H????/?????!????u?????@????hMlJa?I?|c
?V>?f?/lX?%Y??
8~r??[??P??S?J??(????|
6??O????cC?y??0??e??N?c??b??6?Dl??V?n???????q??lH???S?-?fL????b
?p\D?????blL\??@??iYFkb
s%
!UO\?W????_?z?
?
??Nq.D?.?R?N??|?*??$??/,?Y?Ih?
32mSxy-???/?@LK>?l[??EmD?T]??n??g@?!?#q/0*?
?5??}\?;??2ip??9DYd?[?B}?0??Zq??9??e???2??"
?%?B??j????:.4t?CvP4?jtF??<H14`?{
?Y0?o?Z?r'?JE?N?? ?@?V??/ ???#??R???V-?\;??"?$!Q0?W???hxk??6??[??;?^!
M?????Kn???t?*?l????Z?$?k???u?????S????DL?O?	S?z?yp$nZ?
I?V
<ZH?DED?L3
?Ir/????eek????1?W?)JY4?{L?x???{??
?3???b??
(NV{?????B@?0???a??????{??p_sH?L@?I?p????O???d??S??F??#???P?E?]B?????8?}&?L0??`;????&???\??	_.I??>??.??@?^?u?:???q???b[i;??i'?HE
Su??(?hlq?.0?qr?????R?bN,?	
W??8????S_:m^?????\???T?.?t????Z?>?Z??-?0???F+	????wM????y-V????M?rv38???89???%D6?`?5h???iJ?M}(?u?K????y3ivK?????P?* ??>K????!W?v?2%\?????d9?"?`????Rq??L??X??m?`#?vRd,?H&?1?????(?5??qRm'????I@?(?oD?f3F?c3^SP?d????Li?? ??V???,???`Ce???-???VL?R'.??D8r????i?
\"?????EIb??Q??_A:?$ 8?x?????*?
?jH?!<???J??k	["?/???|p1e???`^U??????R?Nd???;>R??L-?q]J?~<B_!?b??A?|W;??????h???p?B?t?'s?|*?C?fl0??M???/:?????>~?R???T*Y?Ag?e?
?t???-dY[?hy???	??N{?q{?????5J\???H"???$?^??=$$H	s??N2j]'??(?????V?n??)????(??*'igQ??????R?~??y&?gK.?y??v???.??#?6????4?k]?on??du?R???h?V?????????fi0?H?R?R?"??f??q?????h?}i????8(?ck???L????H#?$?{PxBv
?t???v??>??9{>??
>J?r?
\p8TF?"e9??U)???lB?U?jB??@??&?jZ??,??h???g???qQ?F)?#?%S?????X??R???Y? ????
???cK??Je*?s??????g???
Y???

??4T???V??
6h???
2?P?%P??1??e?y????E?b?d??nJ?k0??l??????????
L??-2O?NH???K?E?@??h????r/????P??r??????Xc??9g?????1M?#/??4?r??M?7sh?MK???%l???)??A	V??x??)b?OT????????<\X=?????l?_l?`??P?6?i???p?p???~?!?????5w.?I????????????L?4??Y?7?E?E?2??J?
~??????6???c||???{?q?u????78`\??????199i9r?????o??8v????'<?8q??155e?<y????6N?:e?E?T*?r??T*??8????Q?V???Y?u]???n2????Z?f??u??h?f?h?Z?????n?
?????N?c?>}?XXX0??9c,..7?|?q??Y???s?????[n??x??h<?IO2n??V??O~????<?x?S?j?v?m????4??O?q????x?3?g>??????,??;?0???N???~?q?]w?y?s??>??????<????6??????s?????x?_h??E/2???^????3???~??/~???>????C.\0.^?h???/5^???/???W???+_?J?U?z???W??x?k^c????5^???????7??
???F?Moz???7??x?[?b???o5????o???w???;??N?]?z???w??x?{?c????5????????|????A?C???????G>b|??5>???????O|??'??I?S?????O???g>c|???5>????????/|????E?K_????/???W?b|??_5????_????o|??7??M?[?????o???w?c|???5?????????????C?G?????????O~b????5~????????_???/?K?W?????_????o~c????5~??????????????G?O?????????_?b???]%?W??b???b???|??O??5??????p??w??\\h???[n??V?>???=??n???=?B???[{??n?x?????z????}~???Z??r?c??W????|??\wq~??/?>?o??/???%s??v?M???/??7?????{f????}????r_r??????%??p???P~??.0?????\u???5????v!??[6<?Q?{?????????w?q?3K?x??????
\P?????6\?????N????p????#?3}???>???Iw_???6??????z???o???4?{???????!u?
{g???G7e?7=?y#?m????|??=?w???[?O???????????1??^??u?????????
???M#?`}pS*???_3>???k?]???1?z? ????xwf?W)???P??n?(?*QU5]U? YRkXl*
$???2??z?#???u?D?;l?w=???????|????/??"?y???s?=?<??????}j?o|?3?O??/?|???/??'???q????????x????<???e????~v???x???_?E?[?8???g????I??????O????????????????????_????????G??????oG??????????]???t??????_?~????g????7??????????_???|??????#~?<???o????_????/?#?x????=????#???7????????????????????r?_????????????y??E????????W????p?Q>?????#$&
?????????=??b?<???B?s?????Z??S?J??????x2?&????????g???Q?p?O????????????O4??!y??V	?9??a?$??MSV?a??d???Y,$?F??f????00???
?>l?f????*T??j?A #G?h5a?ZU?#? ??'?O at g??????;
[??L;??
?9V??E?W????g?	e?Q?e?m???)B?-E<???7??W?7??????????? [?=?N/??????{%??u????????v??
?di?????Fl<K?*??????wTv?L?c?u???AAD?=
?5?Z?s???W?e??~v?N ???b???x??t?F?????{??	??g?????_?'????CQr#?1?$e????Qw????d?1?i????+	?Q??.?gS??V?W????bk??????? ?t?z???G?4^?m=??_A?l?f?*Q?G???????&??i8??I??;e[[??J???r?t???I
f????p??E??Dgi?Nuh?y.?U?%?b#???
<????P????
?1?Kg`:K????#?l>??wph4??8B???|}<]*?e@?GD?m?4?
?OM???ZJ?"?????Cb?y2???3?Q??1?DJ?a?9b?$3??;}????`??S?}?TY{??u??*??Z??7F?KLq@?e?bC??Ad?a?a?"??U]?4?????9??a???;?x$;??hP?_??
?~
N?S???yhZ???
?O???+?X?S??@??b???u?
CM?"<??G??X[?7?4?DH6nY?????`??8?:?<???????+??R>??`?#Y?Gd@??	j???&A???????<???:?pg??ySb???h?????&?????c?m???	?%?`1 %? 	??7l?P
U??????
???m
`S$???o@??S""NQm??2????+?n?rnP?
c	*
??*?*gpz"?k?b?????A??$??~?6QI?;?}?;??I?d??|Xq?h??B??m???<????3?V??x??F]	????,~n
???[.??o4,?]WB??t???oG1pW^?g)S????+<??L????
?????????5?<????????2S????|BB$??r??4?>n???u??sV??BS
h????^8n=kJ??]{??Wf???T~?J?Mw?:?yj??bz??Eb?nrQ??%?x???
??;?fH#??*?`c??;c~??ttD?????::
`????u???v_c????15????B!??
:m5q??Q??%????"????^?\?%?"???7??n?XX?m?
?.????cX?	\s)0#4??	[?>??'???!?T?-!p-?T?,??^M??a,?y?Y?U6?)??)??C?h?i&6y???<?????+v?E(?/C?T???%?o<?U?+6??0??2A??_?????j?'??????FsI??QiF?H??&?c??????%??u???P	T2??
)????&?`??@C|0????K??d????F?*??b????????$??O??)?=?%?<G?kk???u?_??[?:W??o????_<z?????(G??????????dac???!?Ss?????p??????f??e?r65?
????3????3]?7??Y[?fbB???U?????UO1??&I{
??/?????S_???-?|kw???O?v????w??%?$?*?X4???:3?T?c?93?????w??eH?????k??Fh}L?;rg
?{?6???M???P??gX?A????R??H???Q?60{s???Z[}?f9?|????^?w{?#??1?????"???`VM\*?n??Q??et?????????v?
P??
cK???nnk2?;M?????5~?0???r?	?Q?pkhV@
???b????????????j??????@?$.?????"????????O?&B???Z????=19??K??/wu???ta???S?\??????m?#|?'??Jd?????D????7}?????	p???"??m.'??Wh????\??c?????F??.?K@?,.?g=??????gG?P???_??????}x`?????F\a?????56?tYS?6)*:?9?A?X??PH?b?i??n?n)??8?#e?>???????<?????GIt?M???????3?""??a??Sd?n??V ???fow??KE?h(??.???z?L}????V;???w?j???=? ?1??????????XS?G+?+m?R??;?l?5?ol??W???M
&???
?d>?P??N&g-??9179J?7*?'k?
e<H??l??JR???&??v!Z?~?xqk??T4Z?B?Rh??P????m??7??
??@?|v????U??7??%????????]???7Yy???[UM?l?O??????}?hd?????????:??i?
I2?tm?LPf?t???o-?C??????4?E
N?T?????e
?S?[^5utF$~????^h?I???? ,?D?e?~?"E????(v??:	??Qm????@???
?pe?4??????Ve????i:$*?9?G??<?p'=&)?]?h??????RQ??;??&@?i5???????)%y??<?yu	6??g??/????G?$	<q????????A???????hr(2L{??y????#?b?i?CAv9???2b????1???????p|t DY2?r?('??????1?#?@?j?dE??$?j?????H???^???W?N?b?]?0??z?F????m?

??Rts???$??,?C9?????????????}??7(Q!?????#=????k1e?q?YU
@?R????_?%74?H'?V??^?h??X?_??8?G^;t]?O???e??2?W???????{????{9?jV??
??~?p?$U??Y??k
<??k?????3?6R??
T???d??>??=??2WO+???f6UGC?36?P????1F????\???,H{??Q?>y0?p???_.?#]f??U????Ze?	\?????ba?_Q??~fT?'1J??nv???WY?lr?zk??\^??W!? &??c?????>?????
????}?w7.3????U\l54?.??????~?{??K2jK????n'y,?5u????_RE?O??l??4O+??b?$:5????????K???02??<?2Sd??g\???]?B~pJ?????
??x(I)3"???X4?_#???G?-???P?l/??sEp.?? ?	2?c*b?
??0??h$r??H?????p??????????????)??[$??	L?m_???[k?2???{	?0??8????F"??"
?Qq}>?xZ???)B?d?I?~??n??I?M?H???Z#/??rH+????N??$??TA)Z
,??]S?_,WQp?????*???F??o?k?+j??kD????Ma,?{????????
?2???c???????????e8???Z???/???D?
?
Y?r\?C
???H?LZ7?z4??<&/??????][????D??XG4M$?????q?"?#?"?3}?qL????n???????l&??7lb???%?JA??F????n???????(l?_??????*?v??
??.x??"?G???R??Q??G??{B??m8?????}????????/[?
?Q?Ozn?qIV	-??S???=??zb^[V?????
x?I?f?#?X/P???m??????2#??
????-&	?`a??2?/ni??j?F??????|???3_s?c??R?>}?1??
 ??E?[???3	???.?Dp.?D!???"??????b?0u&8C?|u???????r???@??o?!??T%q;??I?????)RAiiwK??hm????}@6?.?`?|?W

?m???3-?7	%?
8????eC?C5?????c?i?2?U?:1?#,c?K`???u
?*????l?/???4???P???!?\?5????i???!?6p*????E????1tU??5/??Y?}???'??T??A9??????%"?(?????????????|?H??Y1`Ma??}?n???b??Wr>I?0?K?p_m??=?y??uo?O
?lN1???????uoPnW?g??A?t??????Ag?????y???HoY???#?2??(???W
??f#l?X|hX&?'?V??z?`mub?P?
8???6w
?&Yg??????aQ?I???	Y??c??&??????u??w?r??c??:???!p5[u
???7?K??"??3?Yk??????P}??%????f#?h??M???&7??j1?}F?GM???c???{W??W5F?M?;???1v
c?+Fy?rX??z????{u???????????Pn?G?s?^t?????G?;?#?p?Q??A@??
s???4U
??.???%????D?????v????o4??#G
??~?j???	
K?[??$??#<S??!51%?q+?#???????:g?9???o?|???????K??{]????e??e?????1?tAGz??????*????GT??xpqXx?
x??'6???x???F??F?????????h?v?{??(9?&T?S?n?^???4??q??f?)N?N?n?i@??k?L?B??#?????Nw+?????????E?h??V??qJ???????G? N?hw?T?p?\?M_?VYS|?`??7??=D0??:??Ag?D???W??.?F(?X??Sl???nc?i??%??.B?A	-?G??|
?Hcif?????Xc?%??x?`DS??a'??:???
P?/?~?0??	GL??w?d?
??f?Y??Q?
???&??r?
fv?N?iSL?g?I?NO:(???^?,?????Xxb??- 7Bay?.?]|:g3sB?I6Md??in??FhI?n??8;??_E??4?3?????#L???w{?7d
	?#???>?7?2??????o?? ?
p^??3x
????Vry???G$&?c
4?wr[!?s?7?D???'9?h
?%??????c?5?.4?S?F??2??wB0?j?
1???4???n???w????	???(i??b????	??<?073?????2???K?3?g?a??%???E??A4?D??b?40??
????"?+?LV???????TI?g???=b40f
5
???????`x?t?4?	????:???r???^i*p?uN?????G?N"N?
???I@??^\?p?????RMq???[Dz)9???9????z?L	????????vaJg?=???A~?N(???????????
?-?~????<J-????Lr?[u???3O?&????>qN???????G????HD??|_??)??\do?2F??PJ??$??3??iL?o?Y?R??
(?0?????$J???b?????v9?7??D0]???>?o?=?M:r???Qv0>C?zkkz???E2?????3??????oU)!?\???H\W??|r??
a???9??;6?r?B@?k????d??n?????@?D?N???m???<n?X#?i??)???L2???????)c?$?D?????;:]?n????BL?
]Z???g	QOB?2?H$???D?&??1t$??pi3p????Lva??5??s?e?T??Q???N??Hk6?,Q:??
??.?U??L??i??a???M?$	??f?m??i?M3???
M?g??l)K?F?s*|
|U8?^?
??GW????J?]??	lm???V
?-??S?W???NR??6??h?5?TpZs?\?$?O?kK:?P????????&Lq?b????D?}?M?b??Um?-??OU??Nn?MJ??f??b???W???
?.?	%Cr????g?+:?7q?Tj?c 
7l???!?{t?5?&??EoR??r??>u(,)?$???s?>?d???0?*??)
&Zi???OU??Pr
?t?E??}?8,?y?><?
jJ%Rj8?)0?????p
?DNRF%Q?],<?nVp?e??7?
E?,?.*??9_u????2?
??rGB	????,???u!T?W?V??}=d*?nsg??????,z??3???@?_?~~?!_???\'???m?c?x???r)???????????;?????'PvZS?S.?I?k?n?=?d???/k?DWm?A?n)?<??p@??ueN?d??1?????f^v0s@?%??c??q??= 8+??,??Z?_??U?I`???0??)??I?????y:Y????+,????8??????6??
?H????b? (MP???;??Z???2?????????v{K?W^?WI-]!?[M\?<U???????Yf???2????9a???Q75??d~4NL??IBO?q??
?(Z??"s?09.(
TQ)@?Z<K???'MG?????Zz}L?z??r??5oS???b?&????s???q????'^`?????ko?n#??????9??????????6vm?_hC?V??????o?n=
Nv?A
?8?&h3IQ~?
?:J?`??11?}?KPTq?x??5M)>&?O?!I?NP?????6?n?YbYI??\uRq+?O??
????s**",?
PZ@
1B?Fk?G?Gq4??2?Y???GM^qt?? ??Y??O?W?
f~<<P/s?r???&????`?????
?????N??X?????c?tw??????&?B?9?t?#4?_X?J(??sF?????????O??}??=???_???<??bnS????b??????8????}?G??????Re|%I-?>?b?"M?8?T?@U??7VT??{V????r?<?i??gxa??
????h6?X(????r?a??71POGc?? ^??????2??T??#Z???r?<?MW??PQ\~C<[<????w??$?????s}??,???_$?V$`(R-Jg?
????????,F???QmOj~
?=???I??.?*??=!?
??O?&???n?@????av????S+???-- ???_g?W?????b?;N?????:??C Z???m?yn??S!daB??-<?0???T=o`$\?n?+???????"-????GF?`9??Wh??p??H??~???6f????0V????=??3
d9J-?:???Q??5`x?BS?]Y??????(t??????ry?6
?V?AP????????!?H]!bn?/?????nBUW?????????C????{?????V??U9??0e?(??A??q"3?1?????0??3??K?$?X??"w6???j??~%?h?D?-n??',??
0??q?f}2j?????O?Z)&???P?l?]D????acM??Q?R????rS?+?,???]]???????7?n9?????= ?t?)}b?x?/??x/B????Y???@TS??0k?
/E?Tb
gD??o?
e8??a???5???.???y?2<??&?oZ????_???? ??1t??j??Dp:??$??=????? ??2??P<????
Xw
^????u?q??K????Q?+,???????Vh????????g????"t?*??????E???\(M??~??x??y???????|??_?`??r???}K'?\8CS?????v???:t??+-?{u?????"?
??????N????$??4? b????a??<I(???Q?hM?2?
??DfK???S?5?	?E??bx??????
??r??e?$v?N?F4g???lff???G?[??Bq???p?????q???0'X??!a?]??
?be?n?L&??n???+fO
???#p?v^??$??]y?q??Z??f?p@??{?i?Ff%?%?????HK
??????W?a????Y2?kr??I?\??????,??d?^Y???h?(??|
?v?????sa??Q?R????Y[D??)??Z^?\}z??>?CLx?????X?p?Al??&<??_?5?D7??MHw?Y<???T}/"????4/o?X?lr??:[?????$???6{e ?v??z;?????
?d?W??]d?g>?i????8??|?(E???(`??vR???)0g?9x9?8,???u
QP?~??=!???l?`9@?	????[?!?T?o3?5???
Z7T??T???;? ?$O?YV??,X:?????S}!??(?>"????S\u??,??po<?????9?k??FA??j?????&?A?&v??T??8^Z6????????}H?????X?bV$????!Ka??ONe??v??Vi-?&??)??S?DML??@??????mE??0????????????????;??%?)^?a4-G??U?t.??WOj6????q???D???Y?))p?JWd?Z???d?O?gcwX?G?^????O?C??Sn/?/OG??R??K~?r{?`?R?V]?xf?v????????w2{??I???tJ???%?-???3??a?(*?[?3???tf????t?S
??laH?%??[?7?-k???t?V?U?X?VZ)??W????????>????K??????f???-J8_u?O
?S.??W?. .??>??????_w/?%??????J;???P*/P{R??????H?w??TXy?&?{??k?&^p??-sL?k?`??????Y???Z?T<d??%????;c???????@???~@???m
??#?{?'???????l5?$;????_~???m????N??I?F??So@(
?q??????eo?d?;?f?-\CmQGsa??????????9n??N?y??UP[?=?k?,
?a??J?
3U???W8us???GX
1????A?kc?>K?i??+o?T???Fh??????/????U ??j???V??t?:??????eH>???o?	?+??4??]?Rk?h?1?????A?S?????q,i?X?3S?l?????>?=???6?c)W?n??yB9Z??Yt?c1P?*?????XE?????/x???J?
??%?8 07Ow?brc???e?W???$??04??o4A?Fp?????rv???A???????0'????????s4???h????????
?`??<?3??EL&?&?tx???c??R??????q%?x}??
,?i?????X???m??EQHX?L??A1}$n????Ll???:Fb??????A3??Qw??7?a`C??N<
??????l??1?9]kg"3?<?
??y?1??W??chYbE??u????YYN??p4????l?zd???G=g?eJ??+"?W??K????????z?ad/?V??????+?+-??n?!?l?	?@??d?
???M???FtdT@l?//p?bh?
I\|:sS?|9%?>~?ylB`??q?r?)??
M)?h?????e ??J??': ??f6?E42nF???6???O]?Q??y??????*?.????d???<!_??|eQfk?-?hM??C?V??v???S?K!Z?z_??
{??|re9YYcE??4????-?hhq?????i~??b?^'?/96?FT	?M?k?)t)	"]y
?_??:p???7?A?ON8p3
????}c???ulc at 8????P ?(?@ssq?k?o?z???H?(3F@?I?D??($?+?Ng
??>????J=?] #?<??????7t{??[l?
=U??O}.?"?n??g(???g1*???G??y%y
z.?s??????=AH~?x
?%?z?gn?x
K?/????
?eB???7??M	I
?c
??????}???m??8,?????Q?q???frh??????-????`d?????????(????'?(8?????
:T?j??31?w?y=?5???dqW?IGC?{?H-?>??n,?~?
?z@???]l??m??>?P4?c????K9 ?y#"D{???i????h???F????Q}dGF?A"|???:[o??r???yf???;1????????)VZ?Q??aHX{w{?Yr??z0O???1?q?#??:6?Q?? ???@????$???ZH?X+?wEN??0????R??N?(9)?*7+???C??????v?1???7????!W?)?????*??d?J??z??t?:???&?s?I1?J????j????n}??h P/_v???@$z??/?hLT????????c~????v?L???H(???6?f?????&T??H?[?V??,S
??v?T; ?9??C?n)??????9]?s?a,??|Ex	7`?
1?C	????U?"P??*?=I?6,??Te?*??L\y??.4?8?{GFj??BK?'{???q?u(0,?@?<???(G8???}???s?POs?&
vjc0U?8?Y??l??S?I(Yl???U??*Q??C????g??]??????rL??_%?RZ??d?v??U?A??B???%??VK????hgJ??(?y?M&????
|?
?O3???9??.??????d????\r??1J
?tS???3?1?=?O??????n?;?.??r
1-??woV?k?qU?iHU4T??H?pt??(???0?K????&?/??I???/?<-Ze??N/$-?
Z???R???6Z???@??1 ?FU?E?Wd? ?r=??<?
??:?????#?R??^???Y???}C?K??\F?I??????.>-????^?b?SZ
??"?q?0	?k???Y???X?IZ????f2x%z's??/?oif??5gD?6??7
??J?R??+5?????6??8???
<??xN3?w?7%???????(?'g????H?Q?????:?????
?"	
5??	Iq??P{a?W?9????m??.? ??N?@?#?p?????????????m?(?<??????f?S?TAT?X?? ??!???n?a??"f??(j??>?G@??}?C?????/????F??3it	??!F?!?!?WVF6~e?7Y?Sr?|yP?WV?v$dT?J?6?r???{)`D???DT9
?u??F??TE?om?eT??k???I]?1?I*?>??l?(???*????8??K?i?aq???:?<?t?I?v????dv*
cm???????d?I???
??
t????Ug[?q????????Z
??5/?t?????????>??D}?g????O?8b/???????JW?C?h6*??.K?K?9?1???????????g?
??]o??cC??^?n? ??M+l5?
a!???????&?2+?&?^f?-?%~?0???V$
Tl
???N?G at s??J<p??<?n???>?m*kg?+M?????@+G?{???* W??Us
,-6wGw?x?:???:??499a????y?E?P????4?]???$?h??=?????k!??Mkq?\|????Y????t?p?d??^?^??V7?b ???d???\?]??czV_?&??=?!????f?x:xa?C???G-q1??X
?????{??\"O? 9?0???d?v???+_???M??5H??3i?Zd??;fG?~|?%?U????Hp&??_???q?os[Q???????$????@L~?4#R??O? ????U???D??kg??*Dp*???n6@????T??"d`??????=U^IS?~??????????7??`)?m??2?L?I?1??+?F?1CJw?x????
???
\????q?P??-?(
{	X?(??`???s
????.?\?cb(??$?U?%??^:?*M??????R''??H????2mM]????1N?
=@?<n??R?q?`A????,?f>??:b??R?{	I?=Mk??;ym?`4
#?????8 ??????
S?{??L??\?8?1?p?7
ue?????.???????xuO_??
???G_c?-X???	??????O?f?????
??j?Ew???[?????-?u
??k???"???t
??"??W4?`?L?%?N?????H?5????#?r?j???8XR?-???M?b??$k??A H?K)_?W??I?tX(?????/2x?t?????#@?lZ#?tTr?l???C?"J?@[????E??? "?X?b
??l?qF)?d?y?@?????????????
q#????q??Vg??6~?Je??V?z.?mm\n?j??v-??
'V???v?v??? h
~?R?..R?W_.y?9????6???=???Z$4c:??#}/??q3?????&Xd????????	??Q???????'?????????
??a?*?	???????Z??F??b?L-??&??????>T????6?sM?e?d?4??C:??W?????.8?&H????#W??K?lsP,??o????????
Z???
<??-Nfa*nkr*	????2gLP?U???#ody????h????Q)J???U??F?L?
?g|O????>???Z???;?h?&?[???????g
>??K?S?{{}??^o??(u????{k?;????Z{?G??Q???{?W??]???????o???-???????^?????A?? ?^rn?????m??]y?z?7????#u?1>?_???
?????poP???hF??(?N?3???????-????\?Z?p???
????%	?"{?b{????4??*??t???A?%ZO?E?n?Q?[Sv?w???i?????A?C??p????DNj4?Av???+2????
??0?	L???T?????o???M?	????0??k????7??
???:??60?'G???P??????hg???????=?y?t????j~????R???#q-???????f????H??=?????m?I????o??????????9l???4?~??\$oz?Lo??2a???E?	???f??????8???ccX(8??????HV<???
???a?!???	iB??P?!J?
8=??F	\?????????N(????~???k????m?????????{?????B??????m????;???[?[?????v??????????F#?n~?A??Z?????\jn???? ?????_??<?\}?NU??g?5?????'???oO????z???????^??y?????L:????^???T?cJ??\?>?5?*u??W?!????)???4????F??{?????ab1?????N??~JZ`?&??V?FO0?????
?;g???
FOn=????????%???9?/M???^MM?r???1T=v??+?&?.$???o?)f????[t?Ju??P????R}x??M??2 ?O??/{???8???;?]????????????>???_???_?????????
?S?f1?r?*?h8{?4~???~L??_e??;???-%????Q0S??c?????t8b?????dJ???u?x???A0?s?x%?O??????????&?_L???$???
??y????	?G?0?,????v7CX????1?k?e?????K?Y~?^H!??????.?.?ZzS?5??u?T\?&O?.Nkx????]H??[h?????O??????^US?l?7y6??I??F0?p??(?C??p??zY?????N?I??6J?k$??d?T?*????/??????T?ZH??`?+?a??&??????W5Eq?????o?????????^?=a2?{b#??T=[G?R?0=???[@:??????????m?????]?6?r?B??????V??*N^M?s?Ni?k"??V?9? D??t?;t????%:???
?4BRB5]:????%igM??8?????{??5?
O????????z?y????Z???y/?-?Z at 0?r??!?5?Gw2???O??	????Q???6??CNh?.?#?????????4[j??
?{&Mmw?zC??:~m???%Ar
???SU???????zNA=?? <????f?m\~????M?????
[f??Ga?CQ?f??#????	]L?q#??zt?C??7??D?????<hfq
g,?????`?T???]Q7)??
?:\?U<???????m??)!?s??"?????0?mc?fN?xX??O
????Cy
#????S????.#??]JQ?X at 0?:%?bnU???????*?
I9~???????-+??<k?Dy`???.??
F? ?Agf=?hs?3v??o]??	???Z|???\?????????s???\?????????s???\?????????s???\?????????s???\???????????|???jAY
mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mercurial.spec	15 Oct 2006 22:10:08 -0000	1.13
+++ mercurial.spec	20 Sep 2007 18:04:17 -0000	1.14
@@ -1,13 +1,15 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.9.1
+Version: 0.9.4
 Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
+Provides: hg = %{version}-%{release}
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -15,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -31,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,11 +49,28 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
+* Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
+- update to 0.9.4
+
+* Wed Jan  3 2007 Jeremy Katz <katzj at redhat.com> - 0.9.3-1
+- update to 0.9.3
+- remove asciidoc files now that we have them as manpages
+
+* Mon Dec 11 2006 Jeremy Katz <katzj at redhat.com> - 0.9.2-1
+- update to 0.9.2
+
 * Mon Aug 28 2006 Jeremy Katz <katzj at redhat.com> - 0.9.1-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jul 2006 18:57:45 -0000	1.9
+++ sources	20 Sep 2007 18:04:17 -0000	1.10
@@ -1 +1 @@
-9ed3962bba640a686c37faa47739270c  mercurial-0.9.1.tar.gz
+2e5ac6ddf434534938d4fc27dc9797c9  mercurial-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 18:10:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 20 Sep 2007 14:10:02 -0400
Subject: rpms/maniadrive/devel maniadrive.spec,1.1,1.2
Message-ID: <200709201810.l8KIA2il015168@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15130

Modified Files:
	maniadrive.spec 
Log Message:
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
- Rebuild for new php version



Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive.spec	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive.spec	20 Sep 2007 18:09:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
+- Rebuild for new php version
+
 * Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-2
 - Improved and spell-fixed raydium description
 - Fix a number of unused direct shlib dependencies in libraydium-1.2.so



From fedora-extras-commits at redhat.com  Thu Sep 20 18:10:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 20 Sep 2007 14:10:33 -0400
Subject: rpms/kdepim/devel .cvsignore, 1.35, 1.35.6.1 kdepim.spec, 1.131,
	1.131.4.1 sources, 1.40, 1.40.6.1 cr16-app-kandy.png, 1.1,
	NONE cr32-app-kandy.png, 1.1, NONE cr48-app-kandy.png, 1.1, NONE
Message-ID: <200709201810.l8KIAX9u015243@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15120

Modified Files:
      Tag: kdepim-enterprise-branch
	.cvsignore kdepim.spec sources 
Removed Files:
      Tag: kdepim-enterprise-branch
	cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png 
Log Message:
initial import, still (probably) needswork to actually build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.35.6.1
diff -u -r1.35 -r1.35.6.1
--- .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
+++ .cvsignore	20 Sep 2007 18:10:00 -0000	1.35.6.1
@@ -1,16 +1,4 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
-kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn_r714749.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.131.4.1
diff -u -r1.131 -r1.131.4.1
--- kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
+++ kdepim.spec	20 Sep 2007 18:10:00 -0000	1.131.4.1
@@ -1,25 +1,36 @@
 
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders 
-%define final 0
+
+# enterprise branch
+%define ent_date 20070920
+%define ent_rev 714749
+
+#define debug 1 
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
+#define final 1 
 
 %define make_cvs 1
 
 %define _with_gnokii --with-gnokii
 %define _with_mal --with-mal
 
+
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn_r%{ent_rev}.tar.bz2
+Release: 8.%{ent_date}.%{ent_rev}.ent
+%else
+Release: 8
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%endif
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
@@ -106,39 +117,34 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
+%setup -q %{?ent_date: -n %{name}}
 
 %ifarch s390 s390x
 %patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
 
 %patch140549 -p1 -b .kde#140549
 
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+   %{?debug:--disable-debug --disable-warnings} \
+   %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
    --with-gpgsm=%{_bindir}/gpgsm \
@@ -167,18 +173,6 @@
 done
 popd
 
-
-## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
-## some of these gems.  -- Rex
-%if 0
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
-   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
-   fi
-done
-%endif
-
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -247,6 +241,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch r714749, 20070920 snapshot
+
 * Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
 - drop OnlyShowIn=KDE munging
 - update %%description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.40.6.1
diff -u -r1.40 -r1.40.6.1
--- sources	16 Jun 2007 19:14:32 -0000	1.40
+++ sources	20 Sep 2007 18:10:00 -0000	1.40.6.1
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
+23d93b3a795d7dd84331549fa3e95c29  kdepim-enterprise-svn_r714749.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 18:18:56 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 20 Sep 2007 14:18:56 -0400
Subject: rpms/kernel-xen-2.6/devel xen-vmx-fpu-ts-fix.patch, NONE,
	1.1 kernel-xen.spec, 1.56, 1.57
Message-ID: <200709201818.l8KIIuIq015470@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15447

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-vmx-fpu-ts-fix.patch 
Log Message:
Add fix for bug #294011 (floating point corruption)

Changeset 8c24767501ff from Xen 3.1.1


xen-vmx-fpu-ts-fix.patch:

--- NEW FILE xen-vmx-fpu-ts-fix.patch ---
# HG changeset patch
# User Steven Hand <steven at xensource.com>
# Date 1189784017 -3600
# Node ID 8c24767501ff25f28a0dab638116b560de294da7
# Parent  eec47edb2a25fde7075e2e17dee638216d2e5582
Ensure CR0.TS is set for VMX domains regardless of the current
state of the real TS bit. This fixes a number of subtle FP
corruption issues within PV domains when running alongside VMX ones.

Signed-off-by: Steven Hand <steven at xensource.com>
xen-unstable changeset: 15216:6f13c3be08fa4c044868144672783f7b1341999a
xen-unstable date: Mon Jun 04 16:47:48 2007 +0100

diff -r eec47edb2a25 -r 8c24767501ff xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
@@ -338,7 +338,7 @@ static void construct_vmcs(struct vcpu *
 #endif
 
     /* Host control registers. */
-    __vmwrite(HOST_CR0, read_cr0());
+    __vmwrite(HOST_CR0, read_cr0() | X86_CR0_TS);
     __vmwrite(HOST_CR4, read_cr4());
 
     /* Host CS:RIP. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kernel-xen.spec	13 Sep 2007 23:14:06 -0000	1.56
+++ kernel-xen.spec	20 Sep 2007 18:18:24 -0000	1.57
@@ -636,6 +636,12 @@
 # Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
 Patch20002: xen-vpic-irqbase-mode.patch
 
+# Fix bz#294011: floating point corruption issues
+# changeset 8c24767501ff from Xen 3.1.1
+Patch20003: xen-vmx-fpu-ts-fix.patch
+
+
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1446,6 +1452,7 @@
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
+%patch20003 -p1
 
 cd xen/
 # Update the Makefile version strings
@@ -2368,6 +2375,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Add fix for bug #294011 (floating point corruption)
+  (changeset 8c24767501ff from Xen 3.1.1)
+
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Rebase to 2.6.21.7
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:22:27 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Thu, 20 Sep 2007 14:22:27 -0400
Subject: rpms/rhythmbox/devel rhythmbox-upnp-assert.patch, NONE,
	1.1 rhythmbox.spec, 1.131, 1.132
Message-ID: <200709201822.l8KIMRQS015623@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15576

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-upnp-assert.patch 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-6
- Init pygobject threads early (GNOME #469852)


rhythmbox-upnp-assert.patch:

--- NEW FILE rhythmbox-upnp-assert.patch ---
Index: plugins/rb-python-module.c
===================================================================
--- plugins/rb-python-module.c	(revision 5356)
+++ plugins/rb-python-module.c	(working copy)
@@ -173,6 +173,8 @@
 	/* import gtk */
 	init_pygtk ();
 
+	pyg_enable_threads ();
+
 	gtk = PyImport_ImportModule ("gtk");
 	if (gtk == NULL) {
 		g_warning ("Could not import gtk");


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- rhythmbox.spec	18 Sep 2007 10:49:18 -0000	1.131
+++ rhythmbox.spec	20 Sep 2007 18:21:53 -0000	1.132
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -45,6 +45,7 @@
 
 ExcludeArch:    s390 s390x
 
+Patch1: rhythmbox-upnp-assert.patch
 Patch2: rhythmbox-enable-stores.patch
 
 %description
@@ -74,6 +75,7 @@
 %prep
 %setup -q
 
+%patch1 -p0 -b .upnp-assert
 pushd data/
 %patch2 -p0 -b .enable-stores
 popd
@@ -187,6 +189,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.2-6
+- Init pygobject threads early (GNOME #469852)
+
 * Tue Aug 24 2007 Todd Zullinger <tmz at pobox.com> - 0.11.2-5
 - Rebuild against new libgpod
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:26:39 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 14:26:39 -0400
Subject: rpms/calc/devel calc.spec,1.2,1.3
Message-ID: <200709201826.l8KIQdej015805@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780

Modified Files:
	calc.spec 
Log Message:
* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
- Remove extra license choice information from package release field to
  properly comply with the packaging guidelines so as to not make Spot sad.
  Put a note in the description instead.
- Today is Thursday.



Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calc.spec	20 Sep 2007 17:19:17 -0000	1.2
+++ calc.spec	20 Sep 2007 18:26:06 -0000	1.3
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       9%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -43,6 +43,11 @@
 Calc is an arbitrary precision C-like arithmetic system that is a
 calculator, an algorithm-prototyper, and a mathematical research tool. Calc
 comes with a rich set of built-in mathematical and programmatic functions.
+%if %{with_readline}
+Note: this copy of Calc is linked against the GNU Readline library and has
+been converted to the ordinary GPL as per section 3 of the LGPL. See the
+included calc-converted-to-gpl.txt document for details.
+%endif
 
 
 %package libs
@@ -213,6 +218,12 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
+- Remove extra license choice information from package release field to
+  properly comply with the packaging guidelines so as to not make Spot sad.
+  Put a note in the description instead.
+- Today is Thursday.
+
 * Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
 - initial package for Fedora
 - clear old and long pre-fedora changelog



From fedora-extras-commits at redhat.com  Thu Sep 20 18:27:31 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 20 Sep 2007 14:27:31 -0400
Subject: rpms/calc/F-7 calc.spec,1.1,1.2
Message-ID: <200709201827.l8KIRVGd015920@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816

Modified Files:
	calc.spec 
Log Message:
* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
- Remove extra license choice information from package release field to
  properly comply with the packaging guidelines so as to not make Spot sad.
  Put a note in the description instead.
- Today is Thursday.



Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/calc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calc.spec	20 Sep 2007 17:05:24 -0000	1.1
+++ calc.spec	20 Sep 2007 18:26:58 -0000	1.2
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       8%{?dist}.%( echo %{license}|tr A-Z a-z|sed s/v2// )
+Release:       9%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -43,6 +43,11 @@
 Calc is an arbitrary precision C-like arithmetic system that is a
 calculator, an algorithm-prototyper, and a mathematical research tool. Calc
 comes with a rich set of built-in mathematical and programmatic functions.
+%if %{with_readline}
+Note: this copy of Calc is linked against the GNU Readline library and has
+been converted to the ordinary GPL as per section 3 of the LGPL. See the
+included calc-converted-to-gpl.txt document for details.
+%endif
 
 
 %package libs
@@ -213,6 +218,12 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
+- Remove extra license choice information from package release field to
+  properly comply with the packaging guidelines so as to not make Spot sad.
+  Put a note in the description instead.
+- Today is Thursday.
+
 * Wed Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-8
 - initial package for Fedora
 - clear old and long pre-fedora changelog



From fedora-extras-commits at redhat.com  Thu Sep 20 18:30:45 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Sep 2007 14:30:45 -0400
Subject: rpms/syck/devel syck.spec,1.15,1.16
Message-ID: <200709201830.l8KIUjcM016170@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16092

Modified Files:
	syck.spec 
Log Message:

* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>        - 0.61-2
- Rebuild against new PHP



Index: syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syck/devel/syck.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- syck.spec	21 Aug 2007 16:18:59 -0000	1.15
+++ syck.spec	20 Sep 2007 18:29:59 -0000	1.16
@@ -5,7 +5,7 @@
 Summary:	YAML for C, Python, and PHP
 
 Version:	0.61
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	BSD
 Group:		System Environment/Libraries
@@ -181,6 +181,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-2
+- Rebuild against new PHP
+
 * Tue Aug 21 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-1
 - Update
 - Clean up spec a bit



From fedora-extras-commits at redhat.com  Thu Sep 20 18:31:50 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 14:31:50 -0400
Subject: rpms/gdm/devel gdm-2.20.0-change-defaults.patch, 1.1, 1.2 gdm.spec, 
	1.289, 1.290
Message-ID: <200709201831.l8KIVofd016245@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16164

Modified Files:
	gdm-2.20.0-change-defaults.patch gdm.spec 
Log Message:
reenable root login


gdm-2.20.0-change-defaults.patch:

Index: gdm-2.20.0-change-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm-2.20.0-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.20.0-change-defaults.patch	19 Sep 2007 16:43:40 -0000	1.1
+++ gdm-2.20.0-change-defaults.patch	20 Sep 2007 18:31:17 -0000	1.2
@@ -99,15 +99,6 @@
  
  # If true then the last login information is printed to the user before being
  # prompted for password.  While this gives away some info on what users are on
-@@ -246,7 +246,7 @@ SecurityTokensDriver=
- [security]
- # Allow root to login.  It makes sense to turn this off for kiosk use, when
- # you want to minimize the possibility of break in.
--AllowRoot=true
-+AllowRoot=false
- # Allow login as root via XDMCP.  This value will be overridden and set to
- # false if the /etc/default/login file exists and contains
- # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists
 @@ -356,7 +356,7 @@ Enable=false
  #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
  


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- gdm.spec	19 Sep 2007 16:43:40 -0000	1.289
+++ gdm.spec	20 Sep 2007 18:31:17 -0000	1.290
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-4
+- Reenable root login due to popular demand
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
 - Change default theme to FedoraInfinity
 



From fedora-extras-commits at redhat.com  Thu Sep 20 18:49:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 14:49:14 -0400
Subject: rpms/sabayon/devel .cvsignore, 1.16, 1.17 sabayon.spec, 1.42,
	1.43 sources, 1.16, 1.17
Message-ID: <200709201849.l8KInELc017613@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17589

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Sep 2007 21:37:20 -0000	1.16
+++ .cvsignore	20 Sep 2007 18:48:41 -0000	1.17
@@ -1 +1 @@
-sabayon-2.20.0.tar.bz2
+sabayon-2.20.1.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sabayon.spec	19 Sep 2007 21:37:20 -0000	1.42
+++ sabayon.spec	20 Sep 2007 18:48:41 -0000	1.43
@@ -7,7 +7,7 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.20.0
+Version: 2.20.1
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
@@ -272,8 +272,8 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
-* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
-- Update to 2.20.0
+* Wed Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-1
+- Update to 2.20.1
 
 * Thu Aug 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.2-1
 - Update to 2.19.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Sep 2007 21:37:20 -0000	1.16
+++ sources	20 Sep 2007 18:48:41 -0000	1.17
@@ -1 +1 @@
-50165894e576fb80d2b3a4bc0294fc5b  sabayon-2.20.0.tar.bz2
+1d3217ddffa413651d918844e5f5a7d9  sabayon-2.20.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 18:58:57 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 14:58:57 -0400
Subject: rpms/mercurial/devel mercurial-install-contrib.patch, NONE,
	1.1 mercurial.spec, 1.18, 1.19
Message-ID: <200709201858.l8KIwvDg017899@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761

Modified Files:
	mercurial.spec 
Added Files:
	mercurial-install-contrib.patch 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	23 Aug 2007 16:08:19 -0000	1.18
+++ mercurial.spec	20 Sep 2007 18:58:24 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -16,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -32,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,10 +50,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
 * Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
 - update to 0.9.4
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:04:05 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 15:04:05 -0400
Subject: rpms/mercurial/F-7 mercurial-install-contrib.patch, NONE,
	1.1 mercurial.spec, 1.18, 1.19
Message-ID: <200709201904.l8KJ45Rm024612@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24514

Modified Files:
	mercurial.spec 
Added Files:
	mercurial-install-contrib.patch 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	24 Aug 2007 00:00:47 -0000	1.18
+++ mercurial.spec	20 Sep 2007 19:03:30 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -16,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -32,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,10 +50,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
 * Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
 - update to 0.9.4
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:04:55 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 15:04:55 -0400
Subject: rpms/mercurial/EL-4 mercurial-install-contrib.patch, 1.1,
	1.2 mercurial.spec, 1.14, 1.15
Message-ID: <200709201904.l8KJ4t7h024734@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24687

Modified Files:
	mercurial-install-contrib.patch mercurial.spec 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

Index: mercurial-install-contrib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial-install-contrib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercurial-install-contrib.patch	20 Sep 2007 18:04:17 -0000	1.1
+++ mercurial-install-contrib.patch	20 Sep 2007 19:04:49 -0000	1.2
@@ -17,7 +17,7 @@
 +    contrib_files = [(os.path.join('/usr/share/mercurial', root),
 +                      [os.path.join(root, file_) for file_ in files])
 +                     for root, dirs, files in os.walk('contrib')]
-+    contrib_files = contrib_files + [('/usr/share/mercurial',
++    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
 +                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
 +
  setup(name='mercurial',


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mercurial.spec	20 Sep 2007 18:04:17 -0000	1.14
+++ mercurial.spec	20 Sep 2007 19:04:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -55,6 +55,9 @@
 %{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
 * Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
 - update to 0.9.4-2
 - install contrib directory



From fedora-extras-commits at redhat.com  Thu Sep 20 19:06:57 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:06:57 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-initgroups-minimum_uid.patch, NONE,
	1.1
Message-ID: <200709201906.l8KJ6vVV025065@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992

Added Files:
	nss_ldap-257-initgroups-minimum_uid.patch 
Log Message:
- attempt at implementing a minimum UID for initgroups, so that I can avoid
  maintaining a list of excluded users for evar


nss_ldap-257-initgroups-minimum_uid.patch:

--- NEW FILE nss_ldap-257-initgroups-minimum_uid.patch ---
diff -ur nss_ldap/ldap-grp.c nss_ldap/ldap-grp.c
--- nss_ldap/ldap-grp.c	2007-08-03 00:51:09.000000000 -0400
+++ nss_ldap/ldap-grp.c	2007-09-20 14:32:14.000000000 -0400
@@ -1068,6 +1069,13 @@
       return NSS_NOTFOUND;
     }
 
+  if (_nss_ldap_test_initgroups_minimum_uid(LA_STRING (a)))
+    {
+      debug ("<== " NSS_LDAP_INITGROUPS_FUNCTION " (user id below configured minimum)");
+      return NSS_NOTFOUND;
+    }
+
+
   lia.backlink = _nss_ldap_test_config_flag (NSS_LDAP_FLAGS_INITGROUPS_BACKLINK);
 
   if (lia.backlink != 0)
diff -ur nss_ldap/ldap-nss.c nss_ldap/ldap-nss.c
--- nss_ldap/ldap-nss.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/ldap-nss.c	2007-09-20 14:33:01.000000000 -0400
@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <pwd.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/param.h>
@@ -4245,6 +4246,33 @@
 }
 
 int
+_nss_ldap_test_initgroups_minimum_uid (const char *user)
+{
+  struct passwd passwd, *pwd;
+  char *buf = NULL;
+  size_t size = 0x40;
+  uid_t uid;
+  NSS_STATUS status;
+
+  do {
+    if ((buf = malloc(size)) == NULL)
+      return 0;
+    pwd = NULL;
+    errno = 0;
+    status = getpwnam_r(user, &passwd, buf, size, &pwd);
+    uid = passwd.pw_uid;
+    free(buf);
+    if ((status != 0) && (errno == ERANGE))
+      size *= 2;
+    if ((status == 0) && (pwd == &passwd))
+      return (uid < __config->ldc_initgroups_minimum_uid);
+    if (size > 0x40000)
+      return 0;
+  } while ((status != 0) && (errno == ERANGE));
+  return 0;
+}
+
+int
 _nss_ldap_get_ld_errno (char **m, char **s)
 {
 #ifdef HAVE_LDAP_GET_OPTION
diff -ur nss_ldap/ldap-nss.h nss_ldap/ldap-nss.h
--- nss_ldap/ldap-nss.h	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/ldap-nss.h	2007-09-20 14:33:24.000000000 -0400
@@ -390,6 +390,7 @@
   time_t ldc_mtime;
 
   char **ldc_initgroups_ignoreusers;
+  int ldc_initgroups_minimum_uid;
 };
 
 typedef struct ldap_config ldap_config_t;
@@ -897,6 +898,7 @@
 
 int _nss_ldap_test_config_flag (unsigned int flag);
 int _nss_ldap_test_initgroups_ignoreuser (const char *user);
+int _nss_ldap_test_initgroups_minimum_uid (const char *user);
 int _nss_ldap_get_ld_errno (char **m, char **s);
 
 #endif /* _LDAP_NSS_LDAP_LDAP_NSS_H */
diff -ur nss_ldap/util.c nss_ldap/util.c
--- nss_ldap/util.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/util.c	2007-09-20 14:29:49.000000000 -0400
@@ -660,6 +660,7 @@
   result->ldc_reconnect_maxsleeptime = LDAP_NSS_MAXSLEEPTIME;
   result->ldc_reconnect_maxconntries = LDAP_NSS_MAXCONNTRIES;
   result->ldc_initgroups_ignoreusers = NULL;
+  result->ldc_initgroups_minimum_uid = 0;
 
   for (i = 0; i <= LM_NONE; i++)
     {
@@ -1137,6 +1138,10 @@
 	      break;
 	    }
 	}
+      else if (!strcasecmp (k, NSS_LDAP_KEY_INITGROUPS_MINIMUM_UID))
+	{
+	  result->ldc_initgroups_minimum_uid = atoi (v);
+	}
       else if (!strcasecmp (k, NSS_LDAP_KEY_CONNECT_POLICY))
         {
 	  if (!strcasecmp (v, "oneshot"))
diff -ur nss_ldap/util.h nss_ldap/util.h
--- nss_ldap/util.h	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/util.h	2007-09-20 14:25:28.000000000 -0400
@@ -83,6 +83,7 @@
 #define NSS_LDAP_KEY_PAGESIZE		"pagesize"
 #define NSS_LDAP_KEY_INITGROUPS		"nss_initgroups"
 #define NSS_LDAP_KEY_INITGROUPS_IGNOREUSERS	"nss_initgroups_ignoreusers"
+#define NSS_LDAP_KEY_INITGROUPS_MINIMUM_UID	"nss_initgroups_minimum_uid"
 
 /* more reconnect policy fine-tuning */
 #define NSS_LDAP_KEY_RECONNECT_TRIES		"nss_reconnect_tries"
--- nss_ldap/nss_ldap.5	2007-08-03 00:51:09.000000000 -0400
+++ nss_ldap/nss_ldap.5	2007-09-20 14:44:59.000000000 -0400
@@ -442,9 +442,17 @@
 .B nss_ldap
 implementation of
 .BR initgroups(3)
-to return NSS_STATUS_NOTFOUND if called with a listed users as
+to return NSS_STATUS_NOTFOUND if called with one of the listed users as
 its argument.
 .TP
+.B nss_initgroups_minimum_uid <uid>
+This option directs the
+.B nss_ldap
+implementation of
+.BR initgroups(3)
+to return NSS_STATUS_NOTFOUND if called with a users whose user ID
+is below the specified value.
+.TP
 .B nss_srv_domain <domain>
 This option determines the DNS domain used for performing SRV
 lookups.



From fedora-extras-commits at redhat.com  Thu Sep 20 19:07:39 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:07:39 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-over-recursion.patch,NONE,1.1
Message-ID: <200709201907.l8KJ7doO025214@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25093

Added Files:
	nss_ldap-257-over-recursion.patch 
Log Message:
- attempt to avoid over-recursion from nss_ldap ending up needing to call
  itself during initialization, preferable to infinite-recurse-then-crash


nss_ldap-257-over-recursion.patch:

--- NEW FILE nss_ldap-257-over-recursion.patch ---
This isn't particularly elegant or exhaustive, and the maximum recursion depth
is purely an arbitrary value, but keeping a per-thread depth count manages to
avoid infinite recursion crashes which happen when we hit nesting through
nss_ldap->libldap->gethostbyXXX->nss_ldap calls.

diff -ur nss_ldap/configure.in nss_ldap/configure.in
--- nss_ldap/configure.in	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap/configure.in	2007-09-20 13:43:49.000000000 -0400
@@ -243,6 +243,17 @@
 	],
 	AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING(for thread-local storage)
+AC_TRY_COMPILE([#ifdef HAVE_PTHREAD_H
+	#include <pthread.h>
+	#endif],
+	[static __thread int foo = 1;],
+	[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_THREAD_LOCAL_STORAGE,1,[Define if your toolchain supports thread-local storage.])
+	],
+	AC_MSG_RESULT(no))
+
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE([#include <sys/types.h>
 	#include <sys/socket.h>],
diff -ur nss_ldap/ldap-nss.c nss_ldap/ldap-nss.c
--- nss_ldap-257/ldap-nss.c	2007-09-20 14:35:18.000000000 -0400
+++ nss_ldap-257/ldap-nss.c	2007-09-20 14:33:01.000000000 -0400
@@ -119,6 +120,11 @@
 
 NSS_LDAP_DEFINE_LOCK (__lock);
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+static __thread int _nss_ldap_init_recursion_depth;
+static __thread int _nss_ldap_search_recursion_depth;
+#endif
+
 /*
  * the configuration is read by the first call to do_open().
  * Pointers to elements of the list are passed around but should not
@@ -1100,6 +1106,19 @@
   NSS_STATUS stat;
   int sd=-1;
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  if (_nss_ldap_init_recursion_depth > 5)
+    {
+      /* the reasoning here is just a guess, but why else? */
+      syslog (LOG_ERR, "nss_ldap: unable to connect to DSA without "
+	      "information which may need to be retrieved from the DSA");
+      debug ("<=> do_init: recursed too far, failing");
+      return NSS_NOTFOUND;
+    }
+
+  _nss_ldap_init_recursion_depth++;
+#endif
+
   debug ("==> do_init");
 
   if (_nss_ldap_validateconfig (__config) != NSS_SUCCESS)
@@ -1227,6 +1246,9 @@
       if (__session.ls_state == LS_CONNECTED_TO_DSA)
 	{
 	  debug ("<== do_init (cached session)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+	  _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_SUCCESS;
 	}
     }
@@ -1239,6 +1261,9 @@
   if (pthread_once (&__once, do_atfork_setup) != 0)
     {
       debug ("<== do_init (pthread_once failed)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+      _nss_ldap_init_recursion_depth--;
+#endif
       return NSS_UNAVAIL;
     }
 #elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) )
@@ -1280,6 +1305,9 @@
 	{
 	  debug ("<== do_init (failed to read config)");
 	  __config = NULL;
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+          _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_UNAVAIL;
 	}
     }
@@ -1328,6 +1356,9 @@
 	  && (rc = ldapssl_client_init (cfg->ldc_sslpath, NULL)) != LDAP_SUCCESS)
 	{
           debug ("<== do_init (ldapssl_client_init failed with rc = %d)", rc);
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+          _nss_ldap_init_recursion_depth--;
+#endif
 	  return NSS_UNAVAIL;
 	}
       __ssl_initialized = 1;
@@ -1345,6 +1376,9 @@
   if (stat != NSS_SUCCESS)
     {
       debug ("<== do_init (failed to initialize LDAP session)");
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+      _nss_ldap_init_recursion_depth--;
+#endif
       return stat;
     }
 
@@ -1353,6 +1387,9 @@
 
   debug ("<== do_init (initialized session)");
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  _nss_ldap_init_recursion_depth--;
+#endif
   return NSS_SUCCESS;
 }
 
@@ -1660,7 +1697,7 @@
 	      ldap_err2string (rc));
       stat = do_map_error (rc);
       do_close ();
-      debug ("<== do_open (failed to bind to DSA");
+      debug ("<== do_open (failed to bind to DSA)");
     }
   else
     {
@@ -2513,6 +2550,19 @@
   NSS_STATUS stat = NSS_UNAVAIL;
   int maxtries;
 
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  if (_nss_ldap_search_recursion_depth > 5)
+    {
+      /* the reasoning here is just a guess, but why else? */
+      syslog (LOG_ERR, "nss_ldap: unable to connect to DSA without "
+	      "information which may need to be retrieved from the DSA");
+      debug ("<=> do_with_reconnect: recursed too far, failing");
+      return NSS_NOTFOUND;
+    }
+
+  _nss_ldap_search_recursion_depth++;
+#endif
+
   debug ("==> do_with_reconnect");
 
   /* caller must successfully call do_init() first */
@@ -2621,6 +2671,11 @@
     }
 
   debug ("<== do_with_reconnect");
+
+#ifdef HAVE_THREAD_LOCAL_STORAGE
+  _nss_ldap_search_recursion_depth--;
+#endif
+
   return stat;
 }
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:08:28 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Thu, 20 Sep 2007 15:08:28 -0400
Subject: rpms/mash/devel .cvsignore, 1.17, 1.18 mash.spec, 1.15, 1.16 sources,
	1.18, 1.19
Message-ID: <200709201908.l8KJ8Ssb025414@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25291

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Sep 2007 15:49:30 -0000	1.17
+++ .cvsignore	20 Sep 2007 19:07:55 -0000	1.18
@@ -1 +1 @@
-mash-0.2.5.tar.gz
+mash-0.2.6.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mash.spec	18 Sep 2007 15:49:30 -0000	1.15
+++ mash.spec	20 Sep 2007 19:07:55 -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:           mash
-Version:        0.2.5
+Version:        0.2.6
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,10 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep 20 2007 Bill Nottingham <notting at redhat.com> 0.2.6-1
+- repoview cleanups/fixes
+- fix gtkimmodules typo (#295371, <petersen at redhat.com>)
+
 * Tue Sep 18 2007 Bill Nottingham <notting at redhat.com> 0.2.5-1
 - handle valgrind for multilib differently (#294761)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Sep 2007 15:49:30 -0000	1.18
+++ sources	20 Sep 2007 19:07:55 -0000	1.19
@@ -1 +1 @@
-73e37a8340bb6d9356d0ce18eea485f2  mash-0.2.5.tar.gz
+c0075b3988f9ae4527bd01bff19fdb60  mash-0.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:11:10 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 15:11:10 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.12, 1.13 mugshot.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <200709201911.l8KJBAe3025841@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25749

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Sep 2007 20:11:01 -0000	1.12
+++ .cvsignore	20 Sep 2007 19:10:36 -0000	1.13
@@ -1 +1 @@
-mugshot-1.1.52.tar.gz
+mugshot-1.1.53.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mugshot.spec	11 Sep 2007 19:58:39 -0000	1.20
+++ mugshot.spec	20 Sep 2007 19:10:36 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.52
-Release:        2%{?dist}
+Version:        1.1.53
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
 - shuffle .sos around (b.r.c 286371)
 - make devel package require dbus-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Sep 2007 20:11:01 -0000	1.13
+++ sources	20 Sep 2007 19:10:36 -0000	1.14
@@ -1 +1 @@
-d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz
+8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:13:59 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 15:13:59 -0400
Subject: rpms/nss_ldap/devel nss_ldap.spec, 1.85,
	1.86 nss_ldap-254-over-recursion.patch, 1.1, NONE
Message-ID: <200709201913.l8KJDxYg026194@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26091

Modified Files:
	nss_ldap.spec 
Removed Files:
	nss_ldap-254-over-recursion.patch 
Log Message:
- revise not-applied patch for attempting to stop infinite recursion in
  poorly-configured case



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nss_ldap.spec	24 Aug 2007 15:53:59 -0000	1.85
+++ nss_ldap.spec	20 Sep 2007 19:13:27 -0000	1.86
@@ -16,11 +16,12 @@
 Patch3: pam_ldap-180-install-perms.patch
 Patch4: pam_ldap-180-bind.patch
 Patch5: nss_ldap-250-mock64.patch
-Patch6: nss_ldap-254-over-recursion.patch
+Patch6: nss_ldap-257-over-recursion.patch
 Patch7: pam_ldap-182-manpointer.patch
 Patch8: nss_ldap-254-soname.patch
 Patch9: nss_ldap-256-resolver.patch
 Patch10: nss_ldap-257-slash.patch
+Patch11: nss_ldap-257-initgroups-minimum_uid.patch
 
 URL: http://www.padl.com/
 License: LGPLv2+
@@ -65,6 +66,7 @@
 %patch8 -p1 -b .soname
 %patch9 -p1 -b .resolver
 %patch10 -p1 -b .slash
+#%patch11 -p1 -b .initgroups-minimum_uid
 autoreconf
 popd
 
@@ -185,6 +187,10 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Thu Sep 20 2007 Nalin Dahyabhai <nalin at redhat.com>
+- revise not-applied patch for attempting to stop infinite recursion in
+  poorly-configured case
+
 * Fri Aug 24 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-3
 - tack on a disttag
 


--- nss_ldap-254-over-recursion.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 19:14:46 2007
From: fedora-extras-commits at redhat.com (Thorsten Scherf (tscherf))
Date: Thu, 20 Sep 2007 15:14:46 -0400
Subject: rpms/Miro/devel Miro.spec,NONE,1.1
Message-ID: <200709201914.l8KJEk62026338@cvs-int.fedora.redhat.com>

Author: tscherf

Update of /cvs/extras/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26325

Added Files:
	Miro.spec 
Log Message:
new devel version


--- NEW FILE Miro.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)")}

%define firefoxver 2.0.0.6

Name:           Miro
Version:        0.9.8.1
Release:        6%{?dist}
Summary:        Miro - Internet TV Player
Group:          Applications/Multimedia
License:        GPL
URL:            http://www.getmiro.com/
Source0:	http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
Patch0:		dbus.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel xine-lib-devel Pyrex 
BuildRequires:  boost-devel qt-devel pygtk2-devel libXcursor-devel
BuildRequires:  firefox-devel = %{firefoxver} gettext libXfixes-devel gtk2-devel
Requires:	firefox = %{firefoxver} xine-lib gnome-python2-gtkmozembed 
Requires:	gnome-python2-gconf dbus-python 
Obsoletes:	Democracy

%description
Miro is a free application that turns your computer into an
internet TV video player. This release is still a beta version, which means 
that there are some bugs, but we're moving quickly to fix them and will be 
releasing bug fixes on a regular basis.

%prep
%setup -q -n %{name}-%{version}
%patch -p0 

%build
cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
cd platform/gtk-x11 && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
%find_lang miro

 
%clean
rm -rf %{buildroot}

%post
update-desktop-database %{_datadir}/applications &> /dev/null ||:

%postun
update-desktop-database %{_datadir}/applications &> /dev/null ||:


%files -f platform/gtk-x11/miro.lang
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/miro
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
%{_datadir}/mime/packages/*.xml
%{python_sitearch}/miro/
%doc README license.txt CREDITS 


%changelog
* Thu Sep 20 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-3
- new Firefox dep

* Wed Aug 15 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-2
- made Democracy obsolte with this release

* Tue Aug 14 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.8.1-1
- new upstream version and new naming
- fix to solve the python/dbus problem

* Fri Jun 22 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.6-2
- new upstream version

* Fri Jun 22 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.6-1
- new upstream version




From fedora-extras-commits at redhat.com  Thu Sep 20 19:14:55 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Thu, 20 Sep 2007 12:14:55 -0700
Subject: [pkgdb] eclipse-pydev: bkonrath has requested commit
Message-ID: <200709201914.l8KJEuEl011373@app4.fedora.phx.redhat.com>

Ben Konrath (bkonrath) has requested the commit acl on eclipse-pydev (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Thu Sep 20 19:15:51 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 15:15:51 -0400
Subject: rpms/tomboy/devel no-start-here.patch, NONE, 1.1 tomboy.spec, 1.58,
	1.59
Message-ID: <200709201915.l8KJFpCe026527@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26403

Modified Files:
	tomboy.spec 
Added Files:
	no-start-here.patch 
Log Message:
don't show start here on login


no-start-here.patch:

--- NEW FILE no-start-here.patch ---
diff -up tomboy-0.8.0/Tomboy/NoteManager.cs.no-start-here tomboy-0.8.0/Tomboy/NoteManager.cs
--- tomboy-0.8.0/Tomboy/NoteManager.cs.no-start-here	2007-08-14 05:11:25.000000000 -0400
+++ tomboy-0.8.0/Tomboy/NoteManager.cs	2007-09-20 15:13:50.000000000 -0400
@@ -172,7 +172,12 @@ namespace Tomboy
 								links_note_content);
 				links_note.QueueSave (true);
 				
-				start_note.Window.Show ();
+                                /* Don't show the start_note on first run
+                                   since Tomboy is started in the default
+                                   GNOME panel.
+                                   start_note.Window.Show ();
+                                 */
+	
 			} catch (Exception e) {
 				Logger.Warn ("Error creating start notes: {0}\n{1}",
 						e.Message, e.StackTrace);


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- tomboy.spec	17 Sep 2007 17:00:29 -0000	1.58
+++ tomboy.spec	20 Sep 2007 19:15:18 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.8.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -11,6 +11,7 @@
 URL:            http://www.beatniksoftware.com/tomboy/
 Source0:        http://download.gnome.org/sources/tomboy/0.7/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
+Patch2:		no-start-here.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .wrapper
+%patch2 -p1 -b .no-start-here
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-2
+- Don't show the start here note on login
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-1
 - Update to 0.8.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:18:21 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 20 Sep 2007 15:18:21 -0400
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.4, 1.5 eclipse-pydev.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709201918.l8KJILmd026844@cvs-int.fedora.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26764

Modified Files:
	.cvsignore eclipse-pydev.spec sources 
Log Message:
`cat clog`


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2007 22:47:57 -0000	1.4
+++ .cvsignore	20 Sep 2007 19:17:48 -0000	1.5
@@ -1,2 +1,2 @@
-org.python.pydev.feature-src-1_3_8.zip
 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
+org.python.pydev.feature-src-1_3_9.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-pydev.spec	29 Aug 2007 14:22:11 -0000	1.6
+++ eclipse-pydev.spec	20 Sep 2007 19:17:48 -0000	1.7
@@ -11,13 +11,13 @@
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.3.8
-Release:          2%{?dist}
+Version:          1.3.9
+Release:          1%{?dist}
 License:          Eclipse Public License
 URL:              http://pydev.sourceforge.net/
 Group:            Development/Tools
 
-Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_8.zip
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_9.zip
 Source1:          org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 Source2:          fetch-pydev-mylyn.sh
 
@@ -107,14 +107,6 @@
 
 rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
 
-# Remove #!'s from the .py files enclosed in org.python.pydev.jython
-#for f in `find plugins -name '*.py'` ; do 
-#    if [ -f $f ]; then
-#        sed --in-place "s/^#!.*$//" $f
-#    fi
-#done 
-
-
 %build
 # Copy the SDK for build
 /bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse mylyn
@@ -225,6 +217,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.9-1
+- 1.3.9
+
 * Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-2
 - Add pydev mylyn feature to all archs except ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2007 22:47:57 -0000	1.4
+++ sources	20 Sep 2007 19:17:48 -0000	1.5
@@ -1,2 +1,2 @@
-7516703db105d7a248ffcd36581224fb  org.python.pydev.feature-src-1_3_8.zip
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
+d0b9c09f00967717a8d99966aaff7679  org.python.pydev.feature-src-1_3_9.zip



From fedora-extras-commits at redhat.com  Thu Sep 20 19:20:16 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 15:20:16 -0400
Subject: rpms/kernel/devel config-generic,1.25,1.26 kernel.spec,1.173,1.174
Message-ID: <200709201920.l8KJKGb9027120@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27047

Modified Files:
	config-generic kernel.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable SECMARK by default.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-generic	29 Aug 2007 22:41:13 -0000	1.25
+++ config-generic	20 Sep 2007 19:19:43 -0000	1.26
@@ -2905,7 +2905,7 @@
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_UTS_NS=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kernel.spec	20 Sep 2007 15:23:18 -0000	1.173
+++ kernel.spec	20 Sep 2007 19:19:43 -0000	1.174
@@ -1805,6 +1805,9 @@
 
 %changelog
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable SECMARK by default.
+
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7
 
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep 20 19:31:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:31:58 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.20, 
	1.21 xtrans-1.0.3-abstract-sockets.patch, 1.1, 1.2
Message-ID: <200709201931.l8KJVw7h028525@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28449

Modified Files:
	xorg-x11-xtrans-devel.spec xtrans-1.0.3-abstract-sockets.patch 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- Fix a bug in automatic port generation for abstract sockets.  Fixes fast
  user switching, among other things.



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-xtrans-devel.spec	24 Aug 2007 21:49:02 -0000	1.20
+++ xorg-x11-xtrans-devel.spec	20 Sep 2007 19:31:25 -0000	1.21
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -59,6 +59,10 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- Fix a bug in automatic port generation for abstract sockets.  Fixes fast
+  user switching, among other things.
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.0.3-3
 - Abstract sockets for PF_UNIX.
 

xtrans-1.0.3-abstract-sockets.patch:

Index: xtrans-1.0.3-abstract-sockets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xtrans-1.0.3-abstract-sockets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtrans-1.0.3-abstract-sockets.patch	24 Aug 2007 21:49:02 -0000	1.1
+++ xtrans-1.0.3-abstract-sockets.patch	20 Sep 2007 19:31:25 -0000	1.2
@@ -1,21 +1,6 @@
-diff -up xtrans-1.0.3/Xtransint.h.abstract xtrans-1.0.3/Xtransint.h
---- xtrans-1.0.3/Xtransint.h.abstract	2006-12-06 11:08:53.000000000 -0500
-+++ xtrans-1.0.3/Xtransint.h	2007-08-24 10:28:25.000000000 -0400
-@@ -374,9 +374,10 @@ typedef struct _Xtransport_table {
- #define TRANS_DISABLED	(1<<2)	/* Don't open this one */
- #define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
- #define TRANS_NOUNLINK	(1<<4)	/* Dont unlink transport endpoints */
-+#define TRANS_ABSTRACT	(1<<5)	/* Use abstract sockets if available */
- 
- /* Flags to preserve when setting others */
--#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK)
-+#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK|TRANS_ABSTRACT)
- 
- /*
-  * readv() and writev() don't exist or don't work correctly on some
 diff -up xtrans-1.0.3/Xtranssock.c.abstract xtrans-1.0.3/Xtranssock.c
 --- xtrans-1.0.3/Xtranssock.c.abstract	2006-12-06 11:08:53.000000000 -0500
-+++ xtrans-1.0.3/Xtranssock.c	2007-08-24 16:05:10.000000000 -0400
++++ xtrans-1.0.3/Xtranssock.c	2007-09-20 15:28:00.000000000 -0400
 @@ -163,6 +163,10 @@ static int IBMsockInit = 0;
  #define SocketInitOnce() /**/
  #endif
@@ -70,7 +55,7 @@
      int			oldUmask;
      int			status;
      unsigned int	mode;
-+    char		tmpport[64];
++    char		tmpport[108];
 +
 +    int			abstract = 0;
 +#ifdef HAVE_ABSTRACT_SOCKETS
@@ -79,7 +64,7 @@
  
      PRMSG (2, "SocketUNIXCreateListener(%s)\n",
  	port ? port : "NULL", 0, 0);
-@@ -1096,16 +1111,17 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1096,16 +1111,16 @@ TRANS(SocketUNIXCreateListener) (XtransC
      }
  #endif
  
@@ -92,9 +77,10 @@
 -	    return TRANS_CREATE_LISTENER_FAILED;
 -	}
 -    } else {
+-	snprintf (sockname.sun_path, sizeof(sockname.sun_path),
+-		  "%s%ld", UNIX_PATH, (long)getpid());
 +    if (!(port && *port)) {
- 	snprintf (sockname.sun_path, sizeof(sockname.sun_path),
- 		  "%s%ld", UNIX_PATH, (long)getpid());
++	snprintf (tmpport, sizeof(tmpport), "%s%ld", UNIX_PATH, (long)getpid());
 +	port = tmpport;
 +    }
 +    if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) {
@@ -103,7 +89,7 @@
      }
  
  #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx)
-@@ -1118,7 +1134,12 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1118,7 +1133,12 @@ TRANS(SocketUNIXCreateListener) (XtransC
      namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
  #endif
  
@@ -117,7 +103,7 @@
  
      if ((status = TRANS(SocketCreateListener) (ciptr,
  	(struct sockaddr *) &sockname, namelen, flags)) < 0)
-@@ -1148,6 +1169,9 @@ TRANS(SocketUNIXCreateListener) (XtransC
+@@ -1148,6 +1168,9 @@ TRANS(SocketUNIXCreateListener) (XtransC
          return TRANS_CREATE_LISTENER_FAILED;
      }
  
@@ -127,7 +113,7 @@
      ciptr->family = sockname.sun_family;
      ciptr->addrlen = namelen;
      memcpy (ciptr->addr, &sockname, ciptr->addrlen);
-@@ -1170,16 +1194,22 @@ TRANS(SocketUNIXResetListener) (XtransCo
+@@ -1170,16 +1193,22 @@ TRANS(SocketUNIXResetListener) (XtransCo
      struct stat		statb;
      int 		status = TRANS_RESET_NOOP;
      unsigned int	mode;
@@ -153,7 +139,7 @@
      {
  	int oldUmask = umask (0);
  
-@@ -1361,6 +1391,10 @@ TRANS(SocketUNIXAccept) (XtransConnInfo 
+@@ -1361,6 +1390,10 @@ TRANS(SocketUNIXAccept) (XtransConnInfo 
          return NULL;
      }
  
@@ -164,7 +150,7 @@
  
      newciptr->addrlen = ciptr->addrlen;
      memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen);
-@@ -1959,6 +1993,10 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -1959,6 +1992,10 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
      int			old_namelen;
  #endif
  
@@ -175,7 +161,7 @@
  
      PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
      
-@@ -1996,7 +2034,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -1996,7 +2033,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
      
      sockname.sun_family = AF_UNIX;
  
@@ -184,7 +170,7 @@
  	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
  	return TRANS_CONNECT_FAILED;
      }
-@@ -2017,7 +2055,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2017,7 +2054,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
       * This is gross, but it was in Xlib
       */
      old_sockname.sun_family = AF_UNIX;
@@ -193,7 +179,7 @@
  	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
  	return TRANS_CONNECT_FAILED;
      }
-@@ -2025,6 +2063,17 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2025,6 +2062,17 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
  	offsetof(struct sockaddr_un, sun_path);
  #endif
  
@@ -211,7 +197,7 @@
  
      /*
       * Do the connect()
-@@ -2062,12 +2111,19 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2062,12 +2110,19 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
  	     * should try again.
  	     */
  
@@ -236,7 +222,7 @@
  		PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
  		       EGET(),0, 0);
  
-@@ -2090,12 +2146,15 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
+@@ -2090,12 +2145,15 @@ TRANS(SocketUNIXConnect) (XtransConnInfo
          return TRANS_CONNECT_FAILED;
      }
  
@@ -253,7 +239,7 @@
      return 0;
  }
  
-@@ -2235,7 +2294,6 @@ TRANS(SocketINETClose) (XtransConnInfo c
+@@ -2235,7 +2293,6 @@ TRANS(SocketINETClose) (XtransConnInfo c
  #ifdef UNIXCONN
  static int
  TRANS(SocketUNIXClose) (XtransConnInfo ciptr)
@@ -261,7 +247,7 @@
  {
      /*
       * If this is the server side, then once the socket is closed,
-@@ -2254,7 +2312,8 @@ TRANS(SocketUNIXClose) (XtransConnInfo c
+@@ -2254,7 +2311,8 @@ TRANS(SocketUNIXClose) (XtransConnInfo c
         && sockname->sun_family == AF_UNIX
         && sockname->sun_path[0])
      {
@@ -271,7 +257,7 @@
  		unlink (sockname->sun_path);
      }
  
-@@ -2421,7 +2480,11 @@ Xtransport     TRANS(SocketINET6Funcs) =
+@@ -2421,7 +2479,11 @@ Xtransport     TRANS(SocketINET6Funcs) =
  Xtransport	TRANS(SocketLocalFuncs) = {
  	/* Socket Interface */
  	"local",
@@ -283,7 +269,7 @@
  #ifdef TRANS_CLIENT
  	TRANS(SocketOpenCOTSClient),
  #endif /* TRANS_CLIENT */
-@@ -2467,7 +2530,7 @@ static char* unix_nolisten[] = { "local"
+@@ -2467,7 +2529,7 @@ static char* unix_nolisten[] = { "local"
  Xtransport	TRANS(SocketUNIXFuncs) = {
  	/* Socket Interface */
  	"unix",
@@ -292,3 +278,18 @@
          TRANS_ALIAS,
  #else
  	0,
+diff -up xtrans-1.0.3/Xtransint.h.abstract xtrans-1.0.3/Xtransint.h
+--- xtrans-1.0.3/Xtransint.h.abstract	2006-12-06 11:08:53.000000000 -0500
++++ xtrans-1.0.3/Xtransint.h	2007-09-20 15:22:59.000000000 -0400
+@@ -374,9 +374,10 @@ typedef struct _Xtransport_table {
+ #define TRANS_DISABLED	(1<<2)	/* Don't open this one */
+ #define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
+ #define TRANS_NOUNLINK	(1<<4)	/* Dont unlink transport endpoints */
++#define TRANS_ABSTRACT	(1<<5)	/* Use abstract sockets if available */
+ 
+ /* Flags to preserve when setting others */
+-#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK)
++#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK|TRANS_ABSTRACT)
+ 
+ /*
+  * readv() and writev() don't exist or don't work correctly on some



From fedora-extras-commits at redhat.com  Thu Sep 20 19:33:09 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Thu, 20 Sep 2007 12:33:09 -0700
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <200709201933.l8KJX9PY017172@app4.fedora.phx.redhat.com>

Jeff Johnston (jjohnstn) has set the commit acl on eclipse-pydev (Fedora devel) to Approved for Ben Konrath (bkonrath)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From fedora-extras-commits at redhat.com  Thu Sep 20 19:36:23 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:36:23 -0400
Subject: rpms/libFS/devel libFS.spec,1.28,1.29
Message-ID: <200709201936.l8KJaNNo029175@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libFS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085

Modified Files:
	libFS.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.0-6
- Update xtrans dep and rebuild.



Index: libFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libFS.spec	17 Sep 2007 21:50:40 -0000	1.28
+++ libFS.spec	20 Sep 2007 19:35:50 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.0-6
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.0-5
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:37:34 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:37:34 -0400
Subject: rpms/libSM/devel libSM.spec,1.20,1.21
Message-ID: <200709201937.l8KJbYr8029444@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libSM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29349

Modified Files:
	libSM.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.2-4
- Update xtrans dep and rebuild.



Index: libSM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libSM.spec	17 Sep 2007 21:52:03 -0000	1.20
+++ libSM.spec	20 Sep 2007 19:37:02 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libICE-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.2-4
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:38:11 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:38:11 -0400
Subject: rpms/libX11/devel libX11.spec,1.38,1.39
Message-ID: <200709201938.l8KJcBUg029588@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29480

Modified Files:
	libX11.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
- Update xtrans dep and rebuild.



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libX11.spec	17 Sep 2007 13:50:36 -0000	1.38
+++ libX11.spec	20 Sep 2007 19:37:37 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -20,7 +20,7 @@
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
-BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libxcb-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
@@ -247,6 +247,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.1.2-3
 - libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
   to match the argument order in the headers. (#274671)



From fedora-extras-commits at redhat.com  Thu Sep 20 19:38:47 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:38:47 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.36,1.37
Message-ID: <200709201938.l8KJclAM029693@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29623

Modified Files:
	libXfont.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
- Update xtrans dep and rebuild.



Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libXfont.spec	17 Sep 2007 21:52:44 -0000	1.36
+++ libXfont.spec	20 Sep 2007 19:38:14 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,7 +14,7 @@
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -93,6 +93,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:41:17 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 20 Sep 2007 15:41:17 -0400
Subject: rpms/sugar-datastore/OLPC-2 .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 sugar-datastore.spec, 1.29, 1.30
Message-ID: <200709201941.l8KJfHdx030024@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar-datastore/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29968

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.26.20070920gitdce9c18d56
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	19 Sep 2007 16:07:48 -0000	1.28
+++ .cvsignore	20 Sep 2007 19:40:45 -0000	1.29
@@ -1 +1 @@
-sugar-datastore-0.2.2-git11013dc3ca.tar.bz2
+sugar-datastore-0.2.2-gitdce9c18d56.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Sep 2007 16:07:48 -0000	1.28
+++ sources	20 Sep 2007 19:40:45 -0000	1.29
@@ -1 +1 @@
-8e3bae187edcaaef8ca3d69976d6a331  sugar-datastore-0.2.2-git11013dc3ca.tar.bz2
+39bdba8e1ef4d86141c7a98ead0f8858  sugar-datastore-0.2.2-gitdce9c18d56.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar-datastore/OLPC-2/sugar-datastore.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sugar-datastore.spec	19 Sep 2007 16:07:48 -0000	1.29
+++ sugar-datastore.spec	20 Sep 2007 19:40:45 -0000	1.30
@@ -1,10 +1,10 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070919git
-%define commitid 11013dc3ca
+%define alphatag 20070920git
+%define commitid dce9c18d56
 
 Name: sugar-datastore
 Version: 0.2.2
-Release: 0.25.%{alphatag}11013dc3ca
+Release: 0.26.%{alphatag}dce9c18d56
 Summary: Sugar Datastore
 
 Group: Development/Libraries
@@ -50,6 +50,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.26.20070920gitdce9c18d56
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.2.2-0.25.20070919git11013dc3ca
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:48:45 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 20 Sep 2007 15:48:45 -0400
Subject: rpms/vpnc/devel vpnc-0.4.0-cloexec.patch, 1.1, 1.2 vpnc.spec, 1.24, 
	1.25 vpnc-0.3.3-sbin-path.patch, 1.1, NONE vpnc-0.4.0-pie.patch,
	1.1, NONE vpnc-0.4.0-sizeofbug.patch, 1.1, NONE
Message-ID: <200709201948.l8KJmj0W030520@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30493

Modified Files:
	vpnc-0.4.0-cloexec.patch vpnc.spec 
Removed Files:
	vpnc-0.3.3-sbin-path.patch vpnc-0.4.0-pie.patch 
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
- upgrade to latest upstream


vpnc-0.4.0-cloexec.patch:

Index: vpnc-0.4.0-cloexec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc-0.4.0-cloexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.4.0-cloexec.patch	26 Feb 2007 12:59:05 -0000	1.1
+++ vpnc-0.4.0-cloexec.patch	20 Sep 2007 19:48:41 -0000	1.2
@@ -1,15 +1,6 @@
 --- vpnc-0.4.0/vpnc.c.cloexec	2007-02-19 21:49:51.000000000 +0100
 +++ vpnc-0.4.0/vpnc.c	2007-02-22 10:49:46.000000000 +0100
-@@ -96,6 +96,8 @@
- 	if (sock < 0)
- 		error(1, errno, "making socket");
- 
-+	fcntl(sock, F_SETFD, FD_CLOEXEC);
-+
- 	/* give the socket a name */
- 	name.sin_family = AF_INET;
- 	name.sin_addr = s->opt_src_ip;
-@@ -2246,6 +2248,8 @@
+@@ -2246,6 +2246,8 @@
  			if (s->esp_fd == -1) {
  				error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)");
  			}


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
+++ vpnc.spec	20 Sep 2007 19:48:41 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           vpnc
-Version:        0.4.0
-Release:        4%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,10 +13,7 @@
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
-Patch0:         vpnc-0.4.0-pie.patch
-Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.4.0-cloexec.patch
-Patch3:		vpnc-0.4.0-sizeofbug.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,18 +38,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .pie
-%patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
-%patch3 -p1 -b .sizeofbug
 
 %build
-make PREFIX=/usr
+CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
 rm -f $RPM_BUILD_ROOT%{_bindir}/pcf2vpnc
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcf2vpnc.1
 chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/vpnc.8
 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
 mkdir -p $RPM_BUILD_ROOT%{_var}/run/vpnc
@@ -78,14 +73,16 @@
 
 %files
 %defattr(-,root,root)
-%doc README COPYING pcf2vpnc
+%doc README COPYING pcf2vpnc pcf2vpnc.1
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
 %{_sbindir}/vpnc
+%{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
-%{_mandir}/man8/*
+%{_mandir}/man8/vpnc.*
+%{_mandir}/man1/cisco-decrypt.*
 %dir %{_var}/run/vpnc
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/defaultroute
@@ -99,6 +96,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
+- upgrade to latest upstream
+
 * Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
 - fix long standing bug causing problems on x86_64 (#232565) now for real
 


--- vpnc-0.3.3-sbin-path.patch DELETED ---


--- vpnc-0.4.0-pie.patch DELETED ---


--- vpnc-0.4.0-sizeofbug.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 19:50:23 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Thu, 20 Sep 2007 15:50:23 -0400
Subject: rpms/vpnc/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709201950.l8KJoNKW030637@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30588

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
- upgrade to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Feb 2007 12:59:05 -0000	1.4
+++ .cvsignore	20 Sep 2007 19:49:50 -0000	1.5
@@ -1,2 +1 @@
-vpnc-0.4.0.tar.gz
-clog
+vpnc-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Feb 2007 12:59:05 -0000	1.4
+++ sources	20 Sep 2007 19:49:50 -0000	1.5
@@ -1 +1 @@
-604807e7dd90fce00a4e2344ee29c76d  vpnc-0.4.0.tar.gz
+7a8e94dbe94f39a4fd89b72e0125f66f  vpnc-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 19:50:52 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Thu, 20 Sep 2007 15:50:52 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.54, 1.55 sources, 1.58,
	1.59 sugar.spec, 1.69, 1.70
Message-ID: <200709201950.l8KJoqAS030686@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30616

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Sep 2007 23:05:41 -0000	1.54
+++ .cvsignore	20 Sep 2007 19:50:20 -0000	1.55
@@ -1 +1 @@
-sugar-0.65-gitb8ce5083b7.tar.bz2
+sugar-0.65-git5a595ea04e.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Sep 2007 17:40:33 -0000	1.58
+++ sources	20 Sep 2007 19:50:20 -0000	1.59
@@ -1 +1 @@
-a34b08643ff76b03dbe26ab98a92f7e7  sugar-0.65-gitb8ce5083b7.tar.bz2
+e63e02780c262429900e947cbfc777a5  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sugar.spec	19 Sep 2007 17:40:33 -0000	1.69
+++ sugar.spec	20 Sep 2007 19:50:20 -0000	1.70
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070919git
-%define commitid b8ce5083b7
+%define alphatag 20070920git
+%define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.54.%{alphatag}b8ce5083b7
+Release: 0.55.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
+- New snapshot
+
 * Wed Sep 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.54.20070919gitb8ce5083b7
 - New snapshot
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:51:33 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 15:51:33 -0400
Subject: rpms/gtk2/devel swt-tooltips.patch,NONE,1.1 gtk2.spec,1.257,1.258
Message-ID: <200709201951.l8KJpXEV030760@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30687

Modified Files:
	gtk2.spec 
Added Files:
	swt-tooltips.patch 
Log Message:
fix a tooltips-related eclipse crash


swt-tooltips.patch:

--- NEW FILE swt-tooltips.patch ---
diff -up gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips gtk+-2.12.0/gtk/gtktooltips.c
--- gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips	2007-09-20 15:47:54.000000000 -0400
+++ gtk+-2.12.0/gtk/gtktooltips.c	2007-09-20 15:48:22.000000000 -0400
@@ -229,7 +229,8 @@ gtk_tooltips_set_tip (GtkTooltips *toolt
       return;
     }
   
-  if (tooltips->active_tips_data 
+  if (tooltipsdata &&
+      && tooltips->active_tips_data 
       && tooltips->active_tips_data->widget == widget
       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- gtk2.spec	18 Sep 2007 23:35:30 -0000	1.257
+++ gtk2.spec	20 Sep 2007 19:51:00 -0000	1.258
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -33,6 +33,8 @@
 # fixed in upstream svn
 Patch3: novalidate.patch
 Patch4: libtracker.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=460194
+Patch5: swt-tooltips.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -121,6 +123,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .novalidate
 %patch4 -p1 -b .libtracker
+%patch5 -p1 -b .swt-tooltips
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -303,6 +306,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-3
+- Fix a problem with swt and tooltips 
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
 - Adapt to tracker ABI changes
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:01 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:01 -0400
Subject: rpms/ntfs-3g/F-7 ntfs-3g.spec,1.18,1.19
Message-ID: <200709201955.l8KJt1U9030935@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/F-7

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-7/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	17 Sep 2007 20:07:09 -0000	1.18
+++ ntfs-3g.spec	20 Sep 2007 19:54:28 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:04 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:04 -0400
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.19,1.20
Message-ID: <200709201955.l8KJt4Xc030938@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/FC-6

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ntfs-3g.spec	17 Sep 2007 20:07:12 -0000	1.19
+++ ntfs-3g.spec	20 Sep 2007 19:54:32 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:55:07 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:55:07 -0400
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.18,1.19
Message-ID: <200709201955.l8KJt7Xi030941@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30843/devel

Modified Files:
	ntfs-3g.spec 
Log Message:

Remove setuid bit from /sbin/mount.ntfs-3g



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ntfs-3g.spec	17 Sep 2007 20:07:17 -0000	1.18
+++ ntfs-3g.spec	20 Sep 2007 19:54:34 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.913
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -81,7 +81,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs
-%attr(4754,root,fuse) /sbin/mount.ntfs-3g
+%attr(754,root,fuse) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
 /bin/ntfs-3g
 /bin/ntfsmount
@@ -96,6 +96,9 @@
 /%{_lib}/libntfs-3g.so
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-2
+- don't set /sbin/mount.ntfs-3g setuid
+
 * Mon Sep 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2:1.913-1
 - bump to 1.913
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:59:33 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 15:59:33 -0400
Subject: rpms/fuse/devel fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.24,1.25
Message-ID: <200709201959.l8KJxXKG031222@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

/dev/fuse should be 0666



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 19:59:00 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fuse.spec	29 Aug 2007 21:24:37 -0000	1.24
+++ fuse.spec	20 Sep 2007 19:59:00 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-6
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Wed Aug 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
 - fix open issue (bz 265321)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:09:47 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 16:09:47 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.19,1.20 sources,1.14,1.15
Message-ID: <200709202009.l8KK9log005142@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5113

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mugshot.spec	11 Sep 2007 20:01:49 -0000	1.19
+++ mugshot.spec	20 Sep 2007 20:09:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.52
-Release:        2%{?dist}
+Version:        1.1.53
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+- new upstream
+
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
 - shuffle .sos around (b.r.c 286371)
 - make devel package require dbus-devel





From fedora-extras-commits at redhat.com  Thu Sep 20 20:10:30 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 16:10:30 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.20,1.21
Message-ID: <200709202010.l8KKAUtn005174@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5148

Modified Files:
	mugshot.spec 
Log Message:
bump release


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mugshot.spec	20 Sep 2007 20:09:14 -0000	1.20
+++ mugshot.spec	20 Sep 2007 20:09:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           mugshot
 Version:        1.1.53
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,7 +224,7 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-2
 - new upstream
 
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2



From fedora-extras-commits at redhat.com  Thu Sep 20 20:14:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 16:14:10 -0400
Subject: rpms/gtk2/devel swt-tooltips.patch,1.1,1.2
Message-ID: <200709202014.l8KKEAfp005407@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5382

Modified Files:
	swt-tooltips.patch 
Log Message:
fix the patch


swt-tooltips.patch:

Index: swt-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/swt-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swt-tooltips.patch	20 Sep 2007 19:51:00 -0000	1.1
+++ swt-tooltips.patch	20 Sep 2007 20:14:07 -0000	1.2
@@ -6,7 +6,7 @@
      }
    
 -  if (tooltips->active_tips_data 
-+  if (tooltipsdata &&
++  if (tooltipsdata
 +      && tooltips->active_tips_data 
        && tooltips->active_tips_data->widget == widget
        && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))



From fedora-extras-commits at redhat.com  Thu Sep 20 20:14:22 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Sep 2007 16:14:22 -0400
Subject: rpms/grub/devel grub-fedora-8.patch,1.2,1.3 grub.spec,1.57,1.58
Message-ID: <200709202014.l8KKEMmF005507@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5324

Modified Files:
	grub-fedora-8.patch grub.spec 
Log Message:
- update to -19


grub-fedora-8.patch:

Index: grub-fedora-8.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-8.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-fedora-8.patch	20 Aug 2007 22:20:19 -0000	1.2
+++ grub-fedora-8.patch	20 Sep 2007 20:14:20 -0000	1.3
@@ -11329,13 +11329,13 @@
  @set VERSION 0.97
 diff --git a/grub.spec b/grub.spec
 new file mode 100644
-index 0000000..fcf767f
+index 0000000..36b39eb
 --- /dev/null
 +++ b/grub.spec
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,416 @@
 +Name: grub
 +Version: 0.97
-+Release: 16
++Release: 17
 +Summary: GRUB - the Grand Unified Boot Loader.
 +Group: System Environment/Base
 +License: GPL
@@ -11414,6 +11414,9 @@
 +%{_datadir}/grub
 +
 +%changelog
++* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-17
++- Fix dmraid detection on Intel (isw) controllers in grub-install .
++
 +* Tue Aug 7 2007 Peter Jones <pjones at redhat.com> - 0.97-16
 +- Add ext[23] large inode support (patch from Eric Sandeen)
 +- Fix auto* breakage that happened when we switched from autoreconf to autoconf
@@ -21595,6 +21598,13 @@
 +#endif /* SUPPORT_GRAPHICS */
 +
  #endif /* ! GRUB_TERM_HEADER */
+diff --git a/test b/test
+new file mode 100644
+index 0000000..b182379
+--- /dev/null
++++ b/test
+@@ -0,0 +1 @@
++fo of fo
 diff --git a/util/Makefile.am b/util/Makefile.am
 index 2e04711..48604d6 100644
 --- a/util/Makefile.am
@@ -21944,7 +21954,7 @@
  # 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.
 diff --git a/util/grub-install.in b/util/grub-install.in
-index 2e598b0..3c6a4f5 100644
+index 2e598b0..5ceb77d 100644
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
 @@ -21,26 +21,28 @@
@@ -21988,7 +21998,7 @@
  
  INSTALL_DEVICE can be a GRUB device name or a system device filename.
  
-@@ -96,17 +100,26 @@ convert () {
+@@ -96,17 +100,28 @@ convert () {
      # Break the device name into the disk part and the partition part.
      case "$host_os" in
      linux*)
@@ -22003,6 +22013,7 @@
 -	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 +				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
++	  -e 's%\(/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
 +	  -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
 +	tmp_part=`echo "$1" | grep -v '/mapper/control$' |
 +		grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
@@ -22014,12 +22025,13 @@
 -				  -e 's%.*c[0-7]d[0-9]*p%%'`
 +				  -e 's%.*c[0-7]d[0-9]*p%%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
++	  -e 's%.*/mapper/isw_[[:alpha:]_]\+[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
 +	  -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
 +		grep -v '.*/mapper/.*'`
  	;;
      gnu*)
  	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
-@@ -196,7 +209,7 @@ resolve_symlink () {
+@@ -196,7 +211,7 @@ resolve_symlink () {
  	while test -L $tmp_fname; do
  		tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
  		if test -z "$tmp_new_fname"; then
@@ -22028,7 +22040,7 @@
  			exit 1
  		fi
  
-@@ -211,6 +224,80 @@ resolve_symlink () {
+@@ -211,6 +226,80 @@ resolve_symlink () {
  	echo "$tmp_fname"
  }
  
@@ -22109,7 +22121,7 @@
  # Usage: find_device file
  # Find block device on which the file resides.
  find_device () {
-@@ -219,15 +306,55 @@ find_device () {
+@@ -219,15 +308,55 @@ find_device () {
      tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ 	]*\).*%\1%p'`
  
      if test -z "$tmp_fname"; then
@@ -22168,7 +22180,7 @@
  # Check the arguments.
  for option in "$@"; do
      case "$option" in
-@@ -247,6 +374,8 @@ for option in "$@"; do
+@@ -247,6 +376,8 @@ for option in "$@"; do
  	force_lba="--force-lba" ;;
      --recheck)
  	recheck=yes ;;
@@ -22177,7 +22189,7 @@
      # This is an undocumented feature...
      --debug)
  	debug=yes ;;
-@@ -265,12 +394,6 @@ for option in "$@"; do
+@@ -265,12 +396,6 @@ for option in "$@"; do
      esac
  done
  
@@ -22190,7 +22202,7 @@
  # If the debugging feature is enabled, print commands.
  if test $debug = yes; then
      set -x
-@@ -293,6 +416,26 @@ esac
+@@ -293,6 +418,26 @@ esac
  grubdir=${bootdir}/grub
  device_map=${grubdir}/device.map
  
@@ -22217,7 +22229,7 @@
  # Check if GRUB is installed.
  # This is necessary, because the user can specify "grub --read-only".
  set $grub_shell dummy
-@@ -303,17 +446,17 @@ else
+@@ -303,17 +448,17 @@ else
      exit 1
  fi
  
@@ -22239,7 +22251,7 @@
      exit 1
  fi
  
-@@ -324,9 +467,11 @@ fi
+@@ -324,9 +469,11 @@ fi
  test -d "$bootdir" || mkdir "$bootdir" || exit 1
  test -d "$grubdir" || mkdir "$grubdir" || exit 1
  
@@ -22252,7 +22264,7 @@
  fi
  
  # Create the device map file if it is not present.
-@@ -336,6 +481,10 @@ else
+@@ -336,6 +483,10 @@ else
      # Create a safe temporary file.
      test -n "$mklog" && log_file=`$mklog`
  
@@ -22263,7 +22275,7 @@
      $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
  quit
  EOF
-@@ -351,34 +500,60 @@ fi
+@@ -351,34 +502,60 @@ fi
  tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
      | sort | uniq -d | sed -n 1p`
  if test -n "$tmp"; then
@@ -22334,7 +22346,7 @@
  
  # Check if the boot directory is in the same device as the root directory.
  if test "x$root_device" != "x$bootdir_device"; then
-@@ -387,15 +562,8 @@ if test "x$root_device" != "x$bootdir_device"; then
+@@ -387,15 +564,8 @@ if test "x$root_device" != "x$bootdir_device"; then
      grub_prefix="/grub"
  fi
  
@@ -22352,7 +22364,7 @@
  
  if test "x$grubdir_device" != "x$root_device"; then
      # For now, cannot deal with this situation.
-@@ -406,61 +574,66 @@ EOF
+@@ -406,61 +576,66 @@ EOF
      exit 1
  fi
  


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- grub.spec	22 Aug 2007 14:32:39 -0000	1.57
+++ grub.spec	20 Sep 2007 20:14:20 -0000	1.58
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 18
+Release: 19
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -79,6 +79,9 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Sep 20 2007 Peter Jones <pjones at redhat.com> - 0.97-19
+- Fix dmraid detection on Intel (isw) controllers in grub-install .
+
 * Wed Aug 22 2007 Peter Jones <pjones at redhat.com> - 0.97-18
 - Fix license tag.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 19:36:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 20 Sep 2007 15:36:59 -0400
Subject: rpms/libICE/devel libICE.spec,1.20,1.21
Message-ID: <200709201936.l8KJaxIw029315@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29212

Modified Files:
	libICE.spec 
Log Message:
* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
- Update xtrans dep and rebuild.



Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libICE.spec	17 Sep 2007 21:51:23 -0000	1.20
+++ libICE.spec	20 Sep 2007 19:36:26 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,7 +11,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
+- Update xtrans dep and rebuild.
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
 - Rebuild for abstract socket support.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:18:43 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 16:18:43 -0400
Subject: rpms/postgresql/devel .cvsignore, 1.36, 1.37 README.rpm-dist, 1.12, 
	1.13 postgresql.spec, 1.83, 1.84 sources, 1.37, 1.38
Message-ID: <200709202018.l8KKIh8g005620@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5592

Modified Files:
	.cvsignore README.rpm-dist postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 20:18:09 -0000	1.37
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
 PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
 postgresql-8.2.1-US.pdf


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/README.rpm-dist,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.rpm-dist	13 Jan 2007 04:30:50 -0000	1.12
+++ README.rpm-dist	20 Sep 2007 20:18:09 -0000	1.13
@@ -218,7 +218,8 @@
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- postgresql.spec	4 Sep 2007 17:26:37 -0000	1.83
+++ postgresql.spec	20 Sep 2007 20:18:09 -0000	1.84
@@ -80,8 +80,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.4
-Release: 6%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -97,8 +97,8 @@
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
 
 Patch1: rpm-pgsql.patch
 Patch3: postgresql-logging.patch
@@ -822,6 +822,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+
 * Tue Sep  4 2007 Tom Lane <tgl at redhat.com> 8.2.4-6
 - Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:21:40 -0000	1.37
+++ sources	20 Sep 2007 20:18:09 -0000	1.38
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847  postgresql-8.2.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
 0c25dc2055e2fa9ff9d05afc9252e1f2  postgresql-8.2.1-US.pdf



From fedora-extras-commits at redhat.com  Thu Sep 20 20:21:49 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Thu, 20 Sep 2007 16:21:49 -0400
Subject: rpms/kde-filesystem/F-7 macros.kde4, NONE, 1.1 kde-filesystem.spec, 
	1.2, 1.3
Message-ID: <200709202021.l8KKLn4h005716@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5694/F-7

Modified Files:
	kde-filesystem.spec 
Added Files:
	macros.kde4 
Log Message:
Merge updates from devel (contains directories and macros needed by KDE 4).


--- NEW FILE macros.kde4 ---

# api = 1
# initial try, including only items that vary from defaults

%cmake_kde4 \
  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 ; \
  %{__cmake} \\\
  %if "%{_lib}" == "lib64" \
    -DLIB_SUFFIX=64 \\\
  %endif \
  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
  -DDATA_INSTALL_DIR=%{_kde4_appsdir}


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-7/kde-filesystem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-filesystem.spec	27 Aug 2007 15:57:08 -0000	1.2
+++ kde-filesystem.spec	20 Sep 2007 20:21:17 -0000	1.3
@@ -1,23 +1,41 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/kde4/apps
+%define _kde4_docdir %_kde4_prefix/share/doc
+%define _kde4_bindir %_kde4_prefix/bin
+%define _kde4_sbindir %_kde4_prefix/sbin
+%define _kde4_includedir %_kde4_prefix/include
+%define _kde4_debug RelWithDebInfo
+%define _kde4_macros_api 1
 
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 13%{?dist}
+Name: kde-filesystem
+Version: 3.92
+Release: 9%{?dist}
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Consider -- Rex
-#Provides: kde3-filesystem = %{version}-%{release}
-
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
 
+Source2: macros.kde4
+# increment whenever dirs change in an incompatible way
+# kde4 apps built using macros.kde4 should
+# Requires: kde4-macros(api) = %{_kde4_macros_api}
+Provides: kde4-macros(api) = %{_kde4_macros_api} 
+
 BuildRequires: gawk
 
 Requires:  filesystem
+Requires:  rpm
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -33,6 +51,7 @@
 rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
+## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
@@ -46,13 +65,72 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+## KDE4
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
+      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
+
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+# rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/kde4/apps
+%%_kde4_docdir %_kde4_prefix/share/doc
+%%_kde4_bindir %%_kde4_prefix/bin
+%%_kde4_sbindir %%_kde4_prefix/sbin
+%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_debug RelWithDebInfo
+%%_kde4_macros_api 1
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+
+# KDE3
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -71,22 +149,59 @@
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
+# KDE4
+%config /etc/rpm/macros.kde4
+%{_kde4_sysconfdir}/kde4/
+%{_kde4_libdir}
+%{_kde4_datadir}/applications/kde4/
+%{_kde4_appsdir}/
+%{_kde4_configdir}/
+%{_kde4_sharedir}/config.kcfg/
+%{_kde4_sharedir}/desktop-directories/
+%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/icons/locolor
+%{_kde4_sharedir}/services/
+%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/templates/
+%{_kde4_datadir}/wallpapers/
+%{_kde4_datadir}/sounds/
+%dir %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
+
 
 %changelog
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-13
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
-
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-12
 - - %%_prefix/{env,shutdown} (non-FHS)
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-11
-- fix templates.source typo
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
+- kde4-macros(api), %%_kde4_macros_api
+
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
+- use macros
+
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-4
+- fix kde4 macro
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-3
+- cleanup macros.kde4 (mostly use _kde4_ prefix)
+- Requires: rpm
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 3.92-2
+- add missing macros.kde4
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-10
-- +disttag
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
 
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
-- +%%_datadir/{sounds,templates,source,wallpapers}
+- +%%_datadir/{sounds,templates/.source,wallpapers}
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-8
 - +%%_datadir/{autostart,emoticons,mimelnk/*}



From fedora-extras-commits at redhat.com  Thu Sep 20 20:26:43 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 16:26:43 -0400
Subject: rpms/gnash/devel gnash.spec,1.11,1.12
Message-ID: <200709202026.l8KKQhTJ005900@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5881

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
- info files are empty, don't install them



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnash.spec	20 Sep 2007 13:18:20 -0000	1.11
+++ gnash.spec	20 Sep 2007 20:26:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -113,9 +113,9 @@
  $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
-# asspec info isn't generated rightly
-rm \
- $RPM_BUILD_ROOT%{_infodir}/asspec.info
+# info isn't generated rightly
+rm -rf \
+ $RPM_BUILD_ROOT%{_infodir}/
 # omf/scrollkeeper related files are broken, some files are missing, and
 # omf files are wrong
 rm -rf \
@@ -136,16 +136,16 @@
 /sbin/ldconfig
 #scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 # the info is empty, but doesn't hurt
-/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+#if [ $1 = 0 ]; then
+    #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
-fi
+#fi
 
 %postun
 /sbin/ldconfig
@@ -164,7 +164,7 @@
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
-%{_infodir}/gnash*
+#%{_infodir}/gnash*
 %{_datadir}/gnash/
 #%{_datadir}/omf/gnash/
 
@@ -185,6 +185,9 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
+- info files are empty, don't install them
+
 * Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
 - omf/scrollkeeper doc is broken, remove it
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:28:32 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:28:32 -0400
Subject: rpms/fuse/F-7 fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.22,1.23
Message-ID: <200709202028.l8KKSWqi006083@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877/F-7

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

fix fc-6 and f-7



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 20:27:59 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fuse.spec	24 Jul 2007 16:14:56 -0000	1.22
+++ fuse.spec	20 Sep 2007 20:27:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Sun Jul 22 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
 - put pkgconfig file in correct place
 - enable compat symlinks for files in /bin



From fedora-extras-commits at redhat.com  Thu Sep 20 20:28:35 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:28:35 -0400
Subject: rpms/fuse/FC-6 fuse-makedev.d-fuse,1.3,1.4 fuse.spec,1.22,1.23
Message-ID: <200709202028.l8KKSZVF006088@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877/FC-6

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

fix fc-6 and f-7



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse-makedev.d-fuse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-makedev.d-fuse	20 Sep 2007 20:28:02 -0000	1.4
@@ -1 +1 @@
-c 660 root     fuse      10 229  1   1 fuse
+c 666 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fuse.spec	24 Jul 2007 16:14:59 -0000	1.22
+++ fuse.spec	20 Sep 2007 20:28:02 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
+- change udev rules so that /dev/fuse is chmod 666 (bz 298651)
+
 * Sun Jul 22 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
 - put pkgconfig file in correct place
 - enable compat symlinks for files in /bin



From fedora-extras-commits at redhat.com  Thu Sep 20 20:30:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Thu, 20 Sep 2007 16:30:32 -0400
Subject: rpms/compiz/devel compiz.spec,1.102,1.103
Message-ID: <200709202030.l8KKUW4x006233@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6175

Modified Files:
	compiz.spec 
Log Message:
* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
- Update to more recent 0.6 branch snapshot (fixes #253575).



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- compiz.spec	14 Sep 2007 18:47:59 -0000	1.102
+++ compiz.spec	20 Sep 2007 20:29:59 -0000	1.103
@@ -1,4 +1,4 @@
-%define		snapshot	0ec3ec
+%define		snapshot	6b86f3
 %define		dialogversion	0.7.7
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        11.%{snapshot}%{?dist}
+Release:        12.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,8 +51,6 @@
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
-Patch110: run-command-key.patch
-Patch111: more-sm-junk.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -116,8 +114,7 @@
 %else
 %patch106 -p1 -b .redhat-logo
 %endif
-%patch110 -p1 -b .run-command-key
-%patch111 -p1 -b .more-sm-junk
+
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -273,6 +270,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
+- Update to more recent 0.6 branch snapshot (fixes #253575).
+
 * Fri Sep 14 2007 Warren Togami <wtogami at redhat.com> - 0.5.2-11
 - compiz-gnome: install core schema so it actually works
 - remove unnecessary gconf stuff from %%install



From fedora-extras-commits at redhat.com  Thu Sep 20 20:33:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh))
Date: Thu, 20 Sep 2007 16:33:54 -0400
Subject: rpms/compiz/devel .cvsignore,1.27,1.28 sources,1.29,1.30
Message-ID: <200709202033.l8KKXs8F006519@cvs-int.fedora.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Sep 20 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.2-12
- Update to more recent 0.6 branch snapshot (fixes #253575).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 Aug 2007 22:22:19 -0000	1.27
+++ .cvsignore	20 Sep 2007 20:33:22 -0000	1.28
@@ -1,2 +1,2 @@
-compiz-0ec3ec.tar.gz
+compiz-6b86f3.tar.gz
 desktop-effects-0.7.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	22 Aug 2007 22:22:19 -0000	1.29
+++ sources	20 Sep 2007 20:33:22 -0000	1.30
@@ -1,2 +1,2 @@
-cfcf5f3d4a3f8dc4363f570ea326a7e3  compiz-0ec3ec.tar.gz
+f70d2f14b2c1a45af50e2b6f1baeb664  compiz-6b86f3.tar.gz
 f6b22bbc1f202b47e71baeda25935f40  desktop-effects-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 20:37:04 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 20 Sep 2007 16:37:04 -0400
Subject: rpms/kdegames/F-7 kdegames-3.5.7-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.59, 1.60
Message-ID: <200709202037.l8KKb4Wq006656@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.5.7-trademarks.patch 
Log Message:
bz248343, removes the Tron and Sokoban trademarks, thanks to  Kevin Kofler



kdegames-3.5.7-trademarks.patch:

--- NEW FILE kdegames-3.5.7-trademarks.patch ---
diff -ur kdegames-3.5.7/doc/katomic/index.docbook kdegames-3.5.7-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.7/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.7-trademarks/doc/katomic/index.docbook	2007-08-04 23:55:07.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.7/doc/ksokoban/index.docbook kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.7/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook	2007-08-08 07:05:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.7/doc/ktron/index.docbook kdegames-3.5.7-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.7/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ktron/index.docbook	2007-08-08 07:10:58.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.7/katomic/katomic.desktop kdegames-3.5.7-trademarks/katomic/katomic.desktop
--- kdegames-3.5.7/katomic/katomic.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/katomic/katomic.desktop	2007-08-08 07:05:47.000000000 +0200
@@ -21,50 +21,50 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
-GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
-GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
+GenericName[ja]=BoxPush???????????????????????????
+GenericName[km]=?????????????????????????????????????????? BoxPush
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
+GenericName[mk]=?????????????? ???????? ???????????? ???? BoxPush
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
-GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[uk]=?????? ???? ???????????? ?????????????? ???? BoxPush??
+GenericName[zh_TW]=BoxPush??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.7/ksokoban/AUTHORS kdegames-3.5.7-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.7/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/AUTHORS	2007-08-08 07:04:20.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/Bookmark.cpp kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.7/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Bookmark.h kdegames-3.5.7-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.7/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/data/ksokoban.desktop kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.7/ksokoban/data/ksokoban.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop	2007-08-04 23:59:14.000000000 +0200
@@ -1,65 +1,65 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=BoxPush
 Name[bn]=??????-?????????????????????
-Name[eo]=Sokobano
+Name[eo]=BoxPusho
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=??BoxPush
+Name[nb]=BoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
+Name[pl]=BoxPush
+Name[sv]=KBoxPush
 Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush BoxPush
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
-GenericName[ja]=??????????????????
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
+GenericName[ja]=BoxPush?????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
-GenericName[zh_TW]=???????????????
+GenericName[uk]=?????? BoxPush
+GenericName[zh_TW]=BoxPush??????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
 Icon=ksokoban
diff -ur kdegames-3.5.7/ksokoban/History.cpp kdegames-3.5.7-trademarks/ksokoban/History.cpp
--- kdegames-3.5.7/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/History.h kdegames-3.5.7-trademarks/ksokoban/History.h
--- kdegames-3.5.7/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/HtmlPrinter.cpp kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.7/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp	2007-08-08 07:06:42.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.7/ksokoban/ImageData.cpp kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.7/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ImageData.h kdegames-3.5.7-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.7/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/InternalCollections.h kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.7/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelCollection.h kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.7/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.cpp kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.7/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.h kdegames-3.5.7-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.7/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/main.cpp kdegames-3.5.7-trademarks/ksokoban/main.cpp
--- kdegames-3.5.7/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/main.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.7/ksokoban/MainWindow.cpp kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.7/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MainWindow.h kdegames-3.5.7-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.7/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.cpp kdegames-3.5.7-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.7/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.cpp kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.7/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.h kdegames-3.5.7-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.7/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.h kdegames-3.5.7-trademarks/ksokoban/Map.h
--- kdegames-3.5.7/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.cpp kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.7/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.h kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.7/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.cpp kdegames-3.5.7-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.7/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.h kdegames-3.5.7-trademarks/ksokoban/Move.h
--- kdegames-3.5.7/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.cpp kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.7/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.h kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.7/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/NEWS kdegames-3.5.7-trademarks/ksokoban/NEWS
--- kdegames-3.5.7/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/NEWS	2007-08-08 07:07:06.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.7/ksokoban/PathFinder.cpp kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.7/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PathFinder.h kdegames-3.5.7-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.7/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.cpp kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.7/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.h kdegames-3.5.7-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.7/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Queue.h kdegames-3.5.7-trademarks/ksokoban/Queue.h
--- kdegames-3.5.7/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Queue.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/README kdegames-3.5.7-trademarks/ksokoban/README
--- kdegames-3.5.7/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/README	2007-08-08 07:07:25.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/StaticImage.cpp kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.7/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/StaticImage.h kdegames-3.5.7-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.7/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ktron/ktron.cpp kdegames-3.5.7-trademarks/ktron/ktron.cpp
--- kdegames-3.5.7/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.7/ktron/ktron.desktop kdegames-3.5.7-trademarks/ktron/ktron.desktop
--- kdegames-3.5.7/ktron/ktron.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.desktop	2007-08-08 07:14:16.000000000 +0200
@@ -4,64 +4,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=SnakeDuel
 Name[bn]=??????-????????????
-Name[eo]=Trono
+Name[eo]=SnakeDuelo
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=SnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.7/ktron/ktron.h kdegames-3.5.7-trademarks/ktron/ktron.h
--- kdegames-3.5.7/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.7/ktron/main.cpp kdegames-3.5.7-trademarks/ktron/main.cpp
--- kdegames-3.5.7/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/main.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.7/ktron/player.cpp kdegames-3.5.7-trademarks/ktron/player.cpp
--- kdegames-3.5.7/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/player.h kdegames-3.5.7-trademarks/ktron/player.h
--- kdegames-3.5.7/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/README kdegames-3.5.7-trademarks/ktron/README
--- kdegames-3.5.7/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/README	2007-08-08 07:13:57.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel 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 any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel 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.
diff -ur kdegames-3.5.7/ktron/TODO kdegames-3.5.7-trademarks/ktron/TODO
--- kdegames-3.5.7/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/TODO	2007-08-04 06:51:21.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.7/ktron/tron.cpp kdegames-3.5.7-trademarks/ktron/tron.cpp
--- kdegames-3.5.7/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.7/ktron/tron.h kdegames-3.5.7-trademarks/ktron/tron.h
--- kdegames-3.5.7/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.7/README kdegames-3.5.7-trademarks/README
--- kdegames-3.5.7/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.7-trademarks/README	2007-08-08 07:08:20.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-7/kdegames.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdegames.spec	11 Jun 2007 18:42:00 -0000	1.59
+++ kdegames.spec	20 Sep 2007 20:36:32 -0000	1.60
@@ -1,30 +1,23 @@
-%define rhel 0
-
 %define debug 0
 %define final 0
 %define make_cvs 0
 
-%if %{rhel}
-%define patch_name -patched
-%else
-%define patch_name %{nil}
-%endif
-
 %define kdelibs_epoch 6
 
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
 Version: 3.5.7
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 
 License: GPL
 Group:   Amusements/Games
 Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
+Patch1: kdegames-3.5.7-trademarks.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -56,9 +49,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .konquest
+%patch1 -p1 -b .trademarks
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -163,6 +157,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 <than at redhat.com> - 6:3.5.7-1.1.fc7 3.5.7-1.1
+- bz248343, removes the Tron and Sokoban trademarks, thanks to  Kevin Kofler
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1
 - 3.5.7
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:41 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:41 -0400
Subject: rpms/QuantLib/F-7 QuantLib.spec,1.19,1.20
Message-ID: <200709202040.l8KKef0h006977@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/F-7

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/F-7/QuantLib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- QuantLib.spec	20 Jul 2007 21:16:28 -0000	1.19
+++ QuantLib.spec	20 Sep 2007 20:40:07 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,15 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
+- rebuild for BuildID
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1.1
+- rebuild for new boost in rawhide
+
 * Tue Jul 10 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1
 - bump to 0.8.1
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:44 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:44 -0400
Subject: rpms/QuantLib/FC-6 QuantLib.spec,1.19,1.20
Message-ID: <200709202040.l8KKeiVt006980@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/FC-6

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/FC-6/QuantLib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- QuantLib.spec	20 Jul 2007 21:16:30 -0000	1.19
+++ QuantLib.spec	20 Sep 2007 20:40:12 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,15 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
+- rebuild for BuildID
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1.1
+- rebuild for new boost in rawhide
+
 * Tue Jul 10 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-1
 - bump to 0.8.1
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:40:49 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 20 Sep 2007 16:40:49 -0400
Subject: rpms/QuantLib/devel QuantLib.spec,1.21,1.22
Message-ID: <200709202040.l8KKenfa006986@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/QuantLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6862/devel

Modified Files:
	QuantLib.spec 
Log Message:

Fix conflicting manpage (resolves bz 297161)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- QuantLib.spec	26 Aug 2007 22:42:19 -0000	1.21
+++ QuantLib.spec	20 Sep 2007 20:40:15 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,7 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/overview.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-overview.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -162,6 +163,9 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
+- another conflicting man page (resolves bugzilla 297161)
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-2
 - rebuild for BuildID
 



From fedora-extras-commits at redhat.com  Thu Sep 20 20:41:53 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 16:41:53 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.64,1.65
Message-ID: <200709202041.l8KKfrrA007285@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7257

Modified Files:
	policy-20070703.patch 
Log Message:
* Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
- Fix to add xguest account when inititial install
- Allow mono, java, wine to run in userdomains


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- policy-20070703.patch	20 Sep 2007 17:21:13 -0000	1.64
+++ policy-20070703.patch	20 Sep 2007 20:41:50 -0000	1.65
@@ -5184,7 +5184,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 12:01:41.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 15:31:09.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5206,6 +5206,15 @@
  	allow $1_dbusd_t self:file { getattr read write };
  	allow $1_dbusd_t self:fifo_file rw_fifo_file_perms;
  	allow $1_dbusd_t self:dbus { send_msg acquire_svc };
+@@ -86,7 +93,7 @@
+ 	# SE-DBus specific permissions
+ 	allow $1_dbusd_$1_t { $1_dbusd_t self }:dbus send_msg;
+ 	allow $2 $1_dbusd_t:dbus { send_msg acquire_svc };
+-	allow $1_t system_dbusd_t:dbus { send_msg acquire_svc };
++	allow $2 system_dbusd_t:dbus { send_msg acquire_svc };
+ 
+ 	allow $1_dbusd_t dbusd_etc_t:dir list_dir_perms;
+ 	read_files_pattern($1_dbusd_t,dbusd_etc_t,dbusd_etc_t)
 @@ -135,7 +142,21 @@
  	selinux_compute_relabel_context($1_dbusd_t)
  	selinux_compute_user_contexts($1_dbusd_t)
@@ -5213,12 +5222,12 @@
 +	corecmd_bin_domtrans($1_dbusd_t, $1_t)
 +	allow $1_dbusd_t $1_t:process sigkill;
 +
-+	allow $1_t $1_dbusd_t:fd use;
-+	allow $1_t $1_dbusd_t:fifo_file rw_fifo_file_perms;
-+	allow $1_t $1_dbusd_t:process sigchld;
++	allow $2 $1_dbusd_t:fd use;
++	allow $2 $1_dbusd_t:fifo_file rw_fifo_file_perms;
++	allow $2 $1_dbusd_t:process sigchld;
 +	
 +	ifdef(`hide_broken_symptoms', `
-+		dontaudit $1_t $1_dbusd_t:netlink_selinux_socket { read write };
++		dontaudit $2 $1_dbusd_t:netlink_selinux_socket { read write };
 +	');
 +
 +	userdom_read_user_home_content_files($1, $1_dbusd_t)
@@ -9530,7 +9539,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 12:07:15.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 15:27:25.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9611,7 +9620,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -555,25 +559,52 @@
+@@ -555,25 +559,53 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -9649,6 +9658,7 @@
 +	optional_policy(`
 +		userdom_read_all_users_home_content_files(xdm_t)
 +		userdom_read_all_users_home_content_files(xdm_xserver_t)
++		userdom_rw_user_tmpfs_files($1, xdm_xserver_t)
 +#Compiler is broken so these wont work
 +		gnome_read_user_gnome_config($1, xdm_t)
 +		gnome_read_user_gnome_config($1, xdm_xserver_t)
@@ -9672,7 +9682,7 @@
  	')
  ')
  
-@@ -626,6 +657,24 @@
+@@ -626,6 +658,24 @@
  
  ########################################
  ## <summary>
@@ -9697,7 +9707,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -659,6 +708,73 @@
+@@ -659,6 +709,73 @@
  
  ########################################
  ## <summary>
@@ -9771,7 +9781,7 @@
  ##	Transition to a user Xauthority domain.
  ## </summary>
  ## <desc>
-@@ -927,6 +1043,7 @@
+@@ -927,6 +1044,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -9779,7 +9789,7 @@
  ')
  
  ########################################
-@@ -987,6 +1104,37 @@
+@@ -987,6 +1105,37 @@
  
  ########################################
  ## <summary>
@@ -9817,7 +9827,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1136,7 +1284,7 @@
+@@ -1136,7 +1285,7 @@
  		type xdm_xserver_tmp_t;
  	')
  
@@ -9826,7 +9836,7 @@
  ')
  
  ########################################
-@@ -1325,3 +1473,62 @@
+@@ -1325,3 +1474,62 @@
  	files_search_tmp($1)
  	stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
  ')
@@ -9891,7 +9901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 10:44:00.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 15:44:32.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9951,7 +9961,11 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -271,6 +285,10 @@
+@@ -268,9 +282,14 @@
+ userdom_create_all_users_keys(xdm_t)
+ # for .dmrc
+ userdom_read_unpriv_users_home_content_files(xdm_t)
++
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -9962,7 +9976,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +324,11 @@
+@@ -306,6 +325,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -9974,7 +9988,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +371,8 @@
+@@ -348,12 +372,8 @@
  ')
  
  optional_policy(`
@@ -9988,7 +10002,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +404,7 @@
+@@ -385,7 +405,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -9997,7 +10011,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +444,10 @@
+@@ -425,6 +445,10 @@
  ')
  
  optional_policy(`
@@ -10008,7 +10022,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +457,19 @@
+@@ -434,47 +458,19 @@
  ')
  
  optional_policy(`
@@ -10109,7 +10123,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 11:14:45.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 16:27:52.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10140,7 +10154,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,24 @@
+@@ -176,11 +177,23 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10150,7 +10164,6 @@
 +
 +	auth_keyring_domain($1)
 +	allow $1 keyring_type:key { search link };
-+	auth_domtrans_chk_passwd($1)
 +
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
@@ -10165,7 +10178,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +210,33 @@
+@@ -196,22 +209,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10200,7 +10213,7 @@
  	')
  ')
  
-@@ -309,9 +334,6 @@
+@@ -309,9 +333,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10210,7 +10223,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +351,7 @@
+@@ -329,6 +350,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10218,7 +10231,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +370,37 @@
+@@ -347,6 +369,37 @@
  
  ########################################
  ## <summary>
@@ -10256,7 +10269,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +749,24 @@
+@@ -695,6 +748,24 @@
  
  ########################################
  ## <summary>
@@ -10281,7 +10294,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1390,9 @@
+@@ -1318,14 +1389,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10296,7 +10309,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1448,163 @@
+@@ -1381,3 +1447,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -11327,8 +11340,8 @@
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.8/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/logging.if	2007-09-17 16:20:18.000000000 -0400
-@@ -33,8 +33,13 @@
++++ serefpolicy-3.0.8/policy/modules/system/logging.if	2007-09-20 15:21:10.000000000 -0400
+@@ -33,8 +33,27 @@
  ## </param>
  #
  interface(`logging_send_audit_msgs',`
@@ -11340,10 +11353,24 @@
  	allow $1 self:capability audit_write;
 -	allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +	allow $1 self:netlink_audit_socket { r_netlink_socket_perms nlmsg_relay };
++')
++
++#######################################
++## <summary>
++##	dontaudit attempts to send audit messages.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`logging_dontaudit_send_audit_msgs',`
++	dontaudit $1 self:netlink_audit_socket { r_netlink_socket_perms nlmsg_relay };
  ')
  
  ########################################
-@@ -238,6 +243,63 @@
+@@ -238,6 +257,63 @@
  
  ########################################
  ## <summary>
@@ -11407,7 +11434,7 @@
  ##	Create an object in the log directory, with a private
  ##	type using a type transition.
  ## </summary>
-@@ -470,7 +532,7 @@
+@@ -470,7 +546,7 @@
  
  	files_search_var($1)
  	allow $1 var_log_t:dir list_dir_perms;
@@ -11416,7 +11443,7 @@
  ')
  
  ########################################
-@@ -514,6 +576,8 @@
+@@ -514,6 +590,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
  	read_lnk_files_pattern($1,logfile,logfile)
@@ -11425,7 +11452,7 @@
  ')
  
  ########################################
-@@ -597,3 +661,258 @@
+@@ -597,3 +675,258 @@
  	files_search_var($1)
  	manage_files_pattern($1,var_log_t,var_log_t)
  ')
@@ -13219,16 +13246,16 @@
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.0.8/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.fc	2007-09-17 16:20:18.000000000 -0400
-@@ -1,4 +1,5 @@
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.fc	2007-09-20 15:47:36.000000000 -0400
+@@ -1,4 +1,4 @@
  HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
  HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
- 
+-
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 12:06:52.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 15:46:46.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14121,7 +14148,19 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1894,10 +1979,46 @@
+@@ -1642,9 +1727,11 @@
+ template(`userdom_user_home_content',`
+ 	gen_require(`
+ 		attribute $1_file_type;
++		attribute user_home_type;
+ 	')
+ 
+ 	typeattribute $2 $1_file_type;
++	typeattribute $2 user_home_type;
+ 	files_type($2)
+ ')
+ 
+@@ -1894,10 +1981,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14169,7 +14208,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3199,7 @@
+@@ -3078,7 +3201,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14178,7 +14217,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4736,24 @@
+@@ -4615,6 +4738,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14203,7 +14242,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4772,14 @@
+@@ -4633,6 +4774,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14218,7 +14257,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5470,7 @@
+@@ -5323,7 +5472,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14227,7 +14266,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5706,375 @@
+@@ -5559,3 +5708,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -14417,13 +14456,14 @@
 +# Should be optional but policy will not build because of compiler problems
 +# Must be before xwindows calls
 +#optional_policy(`
-+	gnome_per_role_template($1, $1_t, $1_r)
-+	gnome_exec_gconf($1_t)
++	gnome_per_role_template($1, $1_usertype, $1_r)
++	gnome_exec_gconf($1_usertype)
 +#')
 +
 +userdom_xwindows_client_template($1)
 +
 +logging_send_syslog_msg($1_usertype)
++logging_dontaudit_send_audit_msgs($1_usertype)
 +
 +optional_policy(`
 +	alsa_read_rw_config($1_usertype)
@@ -14448,7 +14488,7 @@
 +')
 +
 +optional_policy(`
-+	consolekit_dontaudit_dbus_chat($1_usertype)
++	consolekit_dbus_chat($1_usertype)
 +')
 +
 +optional_policy(`



From fedora-extras-commits at redhat.com  Thu Sep 20 20:46:25 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 20 Sep 2007 16:46:25 -0400
Subject: rpms/kdegames/devel kdegames-3.5.7-trademarks.patch, NONE,
	1.1 kdegames.spec, 1.61, 1.62
Message-ID: <200709202046.l8KKkPbB007918@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7891

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.5.7-trademarks.patch 
Log Message:
bz248343, remove the Tron and Sokoban trademarks, thanks to Kevin Kofler


kdegames-3.5.7-trademarks.patch:

--- NEW FILE kdegames-3.5.7-trademarks.patch ---
diff -ur kdegames-3.5.7/doc/katomic/index.docbook kdegames-3.5.7-trademarks/doc/katomic/index.docbook
--- kdegames-3.5.7/doc/katomic/index.docbook	2006-01-19 17:36:48.000000000 +0100
+++ kdegames-3.5.7-trademarks/doc/katomic/index.docbook	2007-08-04 23:55:07.000000000 +0200
@@ -50,8 +50,8 @@
 <title>Introduction</title>
 <para>
 <application>Atomic Entertainment</application> is a small game which resembles
-<application>Sokoban</application>. The object of the game is to build chemical
-molecules on a <application>Sokoban</application> like board.</para>
+<application>BoxPush</application>. The object of the game is to build chemical
+molecules on a <application>BoxPush</application> like board.</para>
 </chapter>
 
 
diff -ur kdegames-3.5.7/doc/ksokoban/index.docbook kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook
--- kdegames-3.5.7/doc/ksokoban/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ksokoban/index.docbook	2007-08-08 07:05:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ksokoban;">
+  <!ENTITY kappname "<application>KBoxPush</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 	
 <book lang="&language;">
 <bookinfo>
-<title>The &ksokoban; Handbook</title>
+<title>The <application>KBoxPush</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -33,8 +33,8 @@
 
 <abstract>
 <para>
-&ksokoban; is a &kde; implementation of the Japanese warehouse keeper
-game <quote>sokoban</quote>.
+<application>KBoxPush</application> is a &kde; implementation of the Japanese warehouse keeper
+box pushing game.
 </para>
 </abstract>
 
@@ -42,8 +42,8 @@
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
 <keyword>game</keyword>
-<keyword>sokoban</keyword>
-<keyword>ksokoban</keyword>
+<keyword>boxpush</keyword>
+<keyword>kboxpush</keyword>
 </keywordset>
 </bookinfo>
 
@@ -51,8 +51,8 @@
 <title>Introduction</title>
 
 <para>
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc.  <quote>Sokoban</quote> is
+The first BoxPush game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc.  The original name is
 japanese for <quote>warehouse keeper</quote>.  The idea is that you
 are a warehouse keeper trying to push crates to their proper locations
 in a warehouse.
@@ -72,7 +72,7 @@
 
 <para>
 To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in &ksokoban;. These
+collections with easier levels are also included in <application>KBoxPush</application>. These
 are marked <emphasis>(easy)</emphasis> in the level collection menu.
 Of course, these levels can be fun for adults too, for example if you
 don't want to expose yourself to too much mental strain.
@@ -138,11 +138,11 @@
 <title>Loading external levels</title>
 
 <para>
-&ksokoban; has the ability to load external sokoban levels from text
+<application>KBoxPush</application> has the ability to load external levels from text
 files.  You can load levels using the menu entry
 <menuchoice><guimenu>Game</guimenu> <guimenuitem>Load
 Levels...</guimenuitem> </menuchoice>, or by specifying the level file
-&URL; as a command line argument when starting &ksokoban; from a
+&URL; as a command line argument when starting <application>KBoxPush</application> from a
 shell.
 </para>
 
@@ -193,7 +193,7 @@
 <chapter id="menu-reference">
 <title>Menu Reference</title>
 
-<para>This is a complete guide to the menus of &ksokoban;.</para>
+<para>This is a complete guide to the menus of <application>KBoxPush</application>.</para>
 
 <sect1 id="game-menu">
 <title>The <guimenu>Game</guimenu> Menu</title>
@@ -250,7 +250,7 @@
 <guisubmenu>Level Collection</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para><action>Change to a different set of levels.</action> &ksokoban;
+<para><action>Change to a different set of levels.</action> <application>KBoxPush</application>
 comes with several level sets, and you can load more that you can find
 on the internet.</para>
 </listitem>
@@ -286,7 +286,7 @@
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
 <listitem>
-<para><action>Exit</action> &ksokoban;.</para>
+<para><action>Exit</action> <application>KBoxPush</application>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -354,7 +354,7 @@
 <guisubmenu>Set Bookmark</guisubmenu>
 </menuchoice></term>
 <listitem>
-<para>&ksokoban; allows you to <action>set bookmarks with a level at a
+<para><application>KBoxPush</application> allows you to <action>set bookmarks with a level at a
 particular state.</action> You might use this to save yourself
 repeating the same initial steps in a level.</para>
 <para>You can have up to ten bookmarks at a time, and access them via the
@@ -389,9 +389,9 @@
 <title>Credits and License</title>
 
 <para>
-&ksokoban; is copyright &copy; 1998-2000 by &Anders.Widell;
+<application>KBoxPush</application> is copyright &copy; 1998-2000 by &Anders.Widell;
 &Anders.Widell.mail;.  For
-the latest info on &ksokoban;, see the &ksokoban; home page at
+the latest info on <application>KBoxPush</application>, see the <application>KBoxPush</application> home page at
 <ulink url="http://hem.passagen.se/awl/ksokoban/">
 http://hem.passagen.se/awl/ksokoban/</ulink>
 </para>
@@ -404,8 +404,8 @@
 </para>
 
 <para>
-All the currently included sokoban levels were created by David W.
-Skinner <email>sasquatch at bentonrea.com</email>. See his sokoban page
+All the currently included levels were created by David W.
+Skinner <email>sasquatch at bentonrea.com</email>. See his page
 at <ulink url="http://users.bentonrea.com/~sasquatch/sokoban/">
 http://users.bentonrea.com/~sasquatch/sokoban/</ulink>
 </para>
diff -ur kdegames-3.5.7/doc/ktron/index.docbook kdegames-3.5.7-trademarks/doc/ktron/index.docbook
--- kdegames-3.5.7/doc/ktron/index.docbook	2006-07-22 10:10:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/doc/ktron/index.docbook	2007-08-08 07:10:58.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &ktron; Handbook</title>
+<title>The <application>KSnakeDuel</application> Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,7 +57,7 @@
 
 <abstract>
 <para>
-&ktron; is a simple <quote>Tron</quote> clone for &kde;, which you can
+<application>KSnakeDuel</application> is a simple <quote>SnakeDuel</quote> clone for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -65,9 +65,9 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -75,9 +75,9 @@
 <title>Introduction</title>
 
 <para>
-&ktron; is a simple Tron-Clone for the
+<application>KSnakeDuel</application> is a simple SnakeDuel-Clone for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
-&ktron; against the computer or a friend.
+<application>KSnakeDuel</application> against the computer or a friend.
 </para>
 
 <para>
@@ -88,7 +88,7 @@
 </chapter>
 
 <chapter id="playing-ktron">
-<title>Playing &ktron;</title>
+<title>Playing <application>KSnakeDuel</application></title>
 
 <sect1 id="playing-ktron-rules">
 <title>Rules</title>
@@ -353,7 +353,7 @@
 </row>
 <row>
 <entry><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></entry>
-<entry>Quit &ktron;</entry>
+<entry>Quit <application>KSnakeDuel</application></entry>
 </row>
 <row>
 <entry><keycap>F1</keycap></entry>
@@ -395,7 +395,7 @@
 <varlistentry>
 <term><guilabel>Show winner by changing color</guilabel></term>
 <listitem><para>Enable this box to improve visualizing that the game is over
-by making &ktron; change the color of the loser's trail to the color of
+by making <application>KSnakeDuel</application> change the color of the loser's trail to the color of
 the winner.</para></listitem>
 </varlistentry>
 
@@ -508,7 +508,7 @@
 <title>Credits and License</title>
 
 <para>
-&ktron; 
+<application>KSnakeDuel</application> 
 </para>
 <para>Program Copyright 1999 &Matthias.Kiefer;
 &Matthias.Kiefer.mail;
@@ -538,7 +538,7 @@
 <title>Installation</title>
 
 <sect1 id="getting-ktron">
-<title>How to obtain &ktron;</title>
+<title>How to obtain <application>KSnakeDuel</application></title>
 
 &install.intro.documentation;
 
@@ -548,8 +548,8 @@
 <title>Requirements</title>
 
 <para>
-In order to successfully compile &ktron;, you need &kde; 3.0. All
-required libraries as well as &ktron; itself can be found on &kde-ftp;.</para>
+In order to successfully compile <application>KSnakeDuel</application>, you need &kde; 3.0. All
+required libraries as well as <application>KSnakeDuel</application> itself can be found on &kde-ftp;.</para>
 </sect1>
 
 <sect1 id="compilation">
diff -ur kdegames-3.5.7/katomic/katomic.desktop kdegames-3.5.7-trademarks/katomic/katomic.desktop
--- kdegames-3.5.7/katomic/katomic.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/katomic/katomic.desktop	2007-08-08 07:05:47.000000000 +0200
@@ -21,50 +21,50 @@
 Type=Application
 Exec=katomic %i %m -caption "%c"
 DocPath=katomic/index.html
-GenericName=Sokoban-like Logic Game
-GenericName[be]=???????????????? ???????????? ???????? Sokoban
+GenericName=BoxPush-like Logic Game
+GenericName[be]=???????????????? ???????????? ???????? BoxPush
 GenericName[bg]=?????????????????? ???????? ?? ??????????
 GenericName[bn]=?????????????????????-?????? ?????? ????????????????????? ????????????
-GenericName[bs]=Logi??ka igra nalik na Sokoban
-GenericName[ca]=Joc de l??gica similar al Sokoban
-GenericName[cs]=Logick?? hra jako Sokoban
-GenericName[cy]=G??m Resymeg sy'n debyg i Sokoban
-GenericName[da]=Sokoban-lignende logisk spil
-GenericName[de]=Logikspiel (??hnlich Sokoban)
-GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? Sokoban
-GenericName[es]=Juego de l??gica similar al Sokoban
-GenericName[et]=Sokobani moodi loogikam??ng
-GenericName[eu]=Sokoban-en antzeko joko logikoa
-GenericName[fi]=Sokoban-tyylinen Logiikkapeli
-GenericName[fr]=Jeu de logique dans le style de Sokoban
-GenericName[ga]=Cluiche Loighce Mar Sokoban
-GenericName[he]=?????????? Sokoban, ???????? ????????
-GenericName[hr]=Logi??ka igra poput Sokobana
-GenericName[hu]=Sokoban-szer?? logikai
-GenericName[is]=Leikur sem l??kist Sokoban
-GenericName[it]=Gioco di logica simile a Sokoban
-GenericName[ja]=????????????????????????????????????
-GenericName[km]=?????????????????????????????????????????? Sokoban
-GenericName[lv]=Sokoban l??dz??ga lo??isk?? sp??le
-GenericName[mk]=?????????????? ???????? ???????????? ???? ??????????????
-GenericName[nb]=Sokoban-lignende logikkspill
-GenericName[nds]=Sokoban-liek Logikspeel
+GenericName[bs]=Logi??ka igra nalik na BoxPush
+GenericName[ca]=Joc de l??gica similar al BoxPush
+GenericName[cs]=Logick?? hra jako BoxPush
+GenericName[cy]=G??m Resymeg sy'n debyg i BoxPush
+GenericName[da]=BoxPush-lignende logisk spil
+GenericName[de]=Logikspiel (??hnlich BoxPush)
+GenericName[el]=???????????????? ?????????????? ???????????????? ???? ???? BoxPush
+GenericName[es]=Juego de l??gica similar al BoxPush
+GenericName[et]=BoxPushi moodi loogikam??ng
+GenericName[eu]=BoxPush-en antzeko joko logikoa
+GenericName[fi]=BoxPush-tyylinen Logiikkapeli
+GenericName[fr]=Jeu de logique dans le style de BoxPush
+GenericName[ga]=Cluiche Loighce Mar BoxPush
+GenericName[he]=?????????? BoxPush, ???????? ????????
+GenericName[hr]=Logi??ka igra poput BoxPusha
+GenericName[hu]=BoxPush-szer?? logikai
+GenericName[is]=Leikur sem l??kist BoxPush
+GenericName[it]=Gioco di logica simile a BoxPush
+GenericName[ja]=BoxPush???????????????????????????
+GenericName[km]=?????????????????????????????????????????? BoxPush
+GenericName[lv]=BoxPush l??dz??ga lo??isk?? sp??le
+GenericName[mk]=?????????????? ???????? ???????????? ???? BoxPush
+GenericName[nb]=BoxPush-lignende logikkspill
+GenericName[nds]=BoxPush-liek Logikspeel
 GenericName[ne]=????????????????????? ??????????????? ?????????????????????????????? ?????????
-GenericName[nl]=Sokoban-achtig logisch spel
-GenericName[nn]=Sokoban-liknande logikkspel
-GenericName[pl]=Gra logiczna typu Sokoban
-GenericName[pt]=Jogo de L??gica tipo Sokoban
-GenericName[pt_BR]=Jogo L??gico parecido com Sokoban
+GenericName[nl]=BoxPush-achtig logisch spel
+GenericName[nn]=BoxPush-liknande logikkspel
+GenericName[pl]=Gra logiczna typu BoxPush
+GenericName[pt]=Jogo de L??gica tipo BoxPush
+GenericName[pt_BR]=Jogo L??gico parecido com BoxPush
 GenericName[ru]=???????????????? ??????????
-GenericName[se]=Sokoban-l??gan logihkkaspeallu
-GenericName[sk]=Logick?? hra ako Sokoban
-GenericName[sl]=Logi??na igra podobna Sokobanu
-GenericName[sr]=?????????????? ???????? ?????????? ???? Sokoban
-GenericName[sr at Latn]=Logi??ka igra nalik na Sokoban
-GenericName[sv]=Sokoban-liknande logiskt spel
+GenericName[se]=BoxPush-l??gan logihkkaspeallu
+GenericName[sk]=Logick?? hra ako BoxPush
+GenericName[sl]=Logi??na igra podobna BoxPushu
+GenericName[sr]=?????????????? ???????? ?????????? ???? BoxPush
+GenericName[sr at Latn]=Logi??ka igra nalik na BoxPush
+GenericName[sv]=BoxPush-liknande logiskt spel
 GenericName[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????????????????????
-GenericName[uk]=?????? ???? ???????????? ?????????????? ???? ????????????????
-GenericName[zh_TW]=?????????(sokoban)??????????????????
+GenericName[uk]=?????? ???? ???????????? ?????????????? ???? BoxPush??
+GenericName[zh_TW]=BoxPush??????????????????
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
diff -ur kdegames-3.5.7/ksokoban/AUTHORS kdegames-3.5.7-trademarks/ksokoban/AUTHORS
--- kdegames-3.5.7/ksokoban/AUTHORS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/AUTHORS	2007-08-08 07:04:20.000000000 +0200
@@ -1,36 +1,15 @@
 ------------------------------------------------------------------------
-ksokoban is written by:
+KBoxPush is written by:
 
 Anders Widell <awl at hem.passagen.se>
 
 ------------------------------------------------------------------------
-The levels were taken from:
-
-xsokoban 3.3c for X-windows
-	www:	http://xsokoban.lcs.mit.edu/xsokoban.html
-	author:	Andrew Myers <andru at lcs.mit.edu>
-
-MacSokoban 3.0.3 for Macintosh
-	www:	http://www.lysator.liu.se/~ingemar/games.html
-	author:	Ingemar Ragnemalm <ingemar at lysator.liu.se>
-
-Sokoban 2.4 for Macintosh
-	www:	http://members.aol.com/SokobanMac/
-	author:	Scott Lindhurst <scottl at alumni.Princeton.EDU>
-
-------------------------------------------------------------------------
-The levels originally come from:
-
-Original               the 50 original sokoban levels
-                       made by Thinking rabbit Inc. in Japan
-Extra                  some more levels from xsokoban
-Still more             by J. Franklin Mentzer <wryter at aol.com>
-MacTommy inventions    by a guy called Tommy in Pennsylvania
-Yoshio's autogenerated by Yoshio Murase <yoshio at asahi.email.ne.jp>
-                       see http://www.ne.jp/asahi/ai/yoshio/sokoban/main.htm
-For the kids           by Ross (W.R.) Brown <ross at bnr.ca>
-Simple Sokoban         simplified original levels
-		       by Phil Shapiro <pshapiro at his.com>
-Dimitri & Yorick       by Jacques Duthen <duthen at club-internet.fr>
+The included level sets (Sasquatch, Mas Sasquatch, Sasquatch III,
+Sasquatch IV and Microban) are the work of:
+David W. Skinner <sasquatch at bentonrea.com>
+http://users.bentonrea.com/~sasquatch/sokoban/
+From the web page:
+> These sets may be freely distributed provided they remain unchanged
+> and credited with my name and email address.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/Bookmark.cpp kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp
--- kdegames-3.5.7/ksokoban/Bookmark.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Bookmark.h kdegames-3.5.7-trademarks/ksokoban/Bookmark.h
--- kdegames-3.5.7/ksokoban/Bookmark.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Bookmark.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/data/ksokoban.desktop kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop
--- kdegames-3.5.7/ksokoban/data/ksokoban.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/data/ksokoban.desktop	2007-08-04 23:59:14.000000000 +0200
@@ -1,65 +1,65 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=KSokoban
-Name[af]=Ksokoban
-Name[be]=??????????????
+Name=KBoxPush
+Name[af]=KBoxPush
+Name[be]=BoxPush
 Name[bn]=??????-?????????????????????
-Name[eo]=Sokobano
+Name[eo]=BoxPusho
 Name[hi]=??????-?????????????????????
-Name[mk]=????????????????
-Name[nb]=Sokoban
+Name[mk]=??BoxPush
+Name[nb]=BoxPush
 Name[ne]=??????????????? ?????????????????????
-Name[pl]=Sokoban
-Name[sv]=Ksokoban
+Name[pl]=BoxPush
+Name[sv]=KBoxPush
 Name[ta]=K???????????????????????? 
-Name[tg]=K??????????????
-Name[zh_TW]=KSokoban ?????????
-Name[zu]=I-KSokoban
-GenericName=Sokoban Game
-GenericName[be]=???????????? ??????????????
+Name[tg]=KBoxPush
+Name[zh_TW]=KBoxPush BoxPush
+Name[zu]=I-KBoxPush
+GenericName=BoxPush Game
+GenericName[be]=???????????? BoxPush
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????????????? ????????????
-GenericName[bs]=Igra Sokoban
-GenericName[ca]=Joc Sokoban
-GenericName[cs]=Hra Sokoban
-GenericName[cy]=G??m Sokoban
-GenericName[da]=Sokoban spil
-GenericName[de]=Sokoban Spiel
-GenericName[el]=???????????????? Sokoban
-GenericName[es]=Juego Sokoban
-GenericName[et]=Sokoban
-GenericName[eu]=Sokoban jokoa
-GenericName[fa]=???????? Sokoban
-GenericName[fi]=Sokoban
-GenericName[fr]=Jeu Sokoban
-GenericName[ga]=Cluiche Sokoban
-GenericName[he]=???????? Sokoban
-GenericName[hr]=Sokoban
-GenericName[hu]=Sokoban
-GenericName[is]=Sokoban leikur
-GenericName[it]=Gioco del Sokoban
-GenericName[ja]=??????????????????
+GenericName[bs]=Igra BoxPush
+GenericName[ca]=Joc BoxPush
+GenericName[cs]=Hra BoxPush
+GenericName[cy]=G??m BoxPush
+GenericName[da]=BoxPush spil
+GenericName[de]=BoxPush Spiel
+GenericName[el]=???????????????? BoxPush
+GenericName[es]=Juego BoxPush
+GenericName[et]=BoxPush
+GenericName[eu]=BoxPush jokoa
+GenericName[fa]=???????? BoxPush
+GenericName[fi]=BoxPush
+GenericName[fr]=Jeu BoxPush
+GenericName[ga]=Cluiche BoxPush
+GenericName[he]=???????? BoxPush
+GenericName[hr]=BoxPush
+GenericName[hu]=BoxPush
+GenericName[is]=BoxPush leikur
+GenericName[it]=Gioco del BoxPush
+GenericName[ja]=BoxPush?????????
 GenericName[km]=???????????????????????????????????????
-GenericName[lv]=Sokoban sp??le
-GenericName[mk]=???????? ??????????????
-GenericName[nb]=Sokoban-spill
-GenericName[nds]=Sokoban-Speel
+GenericName[lv]=BoxPush sp??le
+GenericName[mk]=???????? BoxPush
+GenericName[nb]=BoxPush-spill
+GenericName[nds]=BoxPush-Speel
 GenericName[ne]=????????????????????? ?????????
-GenericName[nl]=Sokobanspel
-GenericName[nn]=Sokoban-spel
-GenericName[pl]=Sokoban
-GenericName[pt]=Jogo de Sokoban
-GenericName[pt_BR]=Jogo de Sokoban
-GenericName[ru]=??????????????
-GenericName[se]=Sokoban-speallu
-GenericName[sk]=Hra Sokoban
-GenericName[sl]=Igra Sokobana
-GenericName[sr]=???????? Sokoban-??
-GenericName[sr at Latn]=Igra Sokoban-a
-GenericName[sv]=Sokoban-spel
+GenericName[nl]=BoxPushspel
+GenericName[nn]=BoxPush-spel
+GenericName[pl]=BoxPush
+GenericName[pt]=Jogo de BoxPush
+GenericName[pt_BR]=Jogo de BoxPush
+GenericName[ru]=BoxPush
+GenericName[se]=BoxPush-speallu
+GenericName[sk]=Hra BoxPush
+GenericName[sl]=Igra BoxPusha
+GenericName[sr]=???????? BoxPush-??
+GenericName[sr at Latn]=Igra BoxPush-a
+GenericName[sv]=BoxPush-spel
 GenericName[ta]=???????????????????????? ??????????????????????????????
-GenericName[uk]=?????? Sokoban
-GenericName[zh_TW]=???????????????
+GenericName[uk]=?????? BoxPush
+GenericName[zh_TW]=BoxPush??????
 DocPath=ksokoban/index.html
 Exec=ksokoban %i %m -caption "%c"
 Icon=ksokoban
diff -ur kdegames-3.5.7/ksokoban/History.cpp kdegames-3.5.7-trademarks/ksokoban/History.cpp
--- kdegames-3.5.7/ksokoban/History.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/History.h kdegames-3.5.7-trademarks/ksokoban/History.h
--- kdegames-3.5.7/ksokoban/History.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/History.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/HtmlPrinter.cpp kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp
--- kdegames-3.5.7/ksokoban/HtmlPrinter.cpp	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/HtmlPrinter.cpp	2007-08-08 07:06:42.000000000 +0200
@@ -81,7 +81,7 @@
   printf ("\
 <html>\n\
 <head>\n\
-<title>ksokoban level</title>\n\
+<title>KBoxPush level</title>\n\
 </head>\n\
 <body background=background.gif>\n\
 ");
diff -ur kdegames-3.5.7/ksokoban/ImageData.cpp kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp
--- kdegames-3.5.7/ksokoban/ImageData.cpp	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ImageData.h kdegames-3.5.7-trademarks/ksokoban/ImageData.h
--- kdegames-3.5.7/ksokoban/ImageData.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ImageData.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/InternalCollections.h kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h
--- kdegames-3.5.7/ksokoban/InternalCollections.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/InternalCollections.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelCollection.h kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h
--- kdegames-3.5.7/ksokoban/LevelCollection.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelCollection.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998,1999  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.cpp kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp
--- kdegames-3.5.7/ksokoban/LevelMap.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/LevelMap.h kdegames-3.5.7-trademarks/ksokoban/LevelMap.h
--- kdegames-3.5.7/ksokoban/LevelMap.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/LevelMap.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/main.cpp kdegames-3.5.7-trademarks/ksokoban/main.cpp
--- kdegames-3.5.7/ksokoban/main.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/main.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998-2000  Anders Widell  <awl at passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 int
 main (int argc, char **argv)
 {
-  KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
+  KAboutData aboutData("ksokoban", I18N_NOOP("KBoxPush"),
 		       version, description, KAboutData::License_GPL,
 		       "(c) 1998-2001  Anders Widell", 0,
 		       "http://hem.passagen.se/awl/ksokoban/");
@@ -50,7 +50,7 @@
 		      "awl at passagen.se",
 		      "http://hem.passagen.se/awl/");
   aboutData.addCredit("David W. Skinner",
-		      I18N_NOOP("For contributing the Sokoban levels included in this game"),
+		      I18N_NOOP("For contributing the BoxPush levels included in this game"),
 		      "sasquatch at bentonrea.com",
 		      "http://users.bentonrea.com/~sasquatch/");
   KCmdLineArgs::init(argc, argv, &aboutData);
diff -ur kdegames-3.5.7/ksokoban/MainWindow.cpp kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp
--- kdegames-3.5.7/ksokoban/MainWindow.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MainWindow.h kdegames-3.5.7-trademarks/ksokoban/MainWindow.h
--- kdegames-3.5.7/ksokoban/MainWindow.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MainWindow.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.cpp kdegames-3.5.7-trademarks/ksokoban/Map.cpp
--- kdegames-3.5.7/ksokoban/Map.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.cpp kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp
--- kdegames-3.5.7/ksokoban/MapDelta.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.cpp	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MapDelta.h kdegames-3.5.7-trademarks/ksokoban/MapDelta.h
--- kdegames-3.5.7/ksokoban/MapDelta.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MapDelta.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Map.h kdegames-3.5.7-trademarks/ksokoban/Map.h
--- kdegames-3.5.7/ksokoban/Map.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Map.h	2007-08-04 23:55:18.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.cpp kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp
--- kdegames-3.5.7/ksokoban/ModalLabel.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <awl at hem.passagen.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/ModalLabel.h kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h
--- kdegames-3.5.7/ksokoban/ModalLabel.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/ModalLabel.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.cpp kdegames-3.5.7-trademarks/ksokoban/Move.cpp
--- kdegames-3.5.7/ksokoban/Move.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Move.h kdegames-3.5.7-trademarks/ksokoban/Move.h
--- kdegames-3.5.7/ksokoban/Move.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Move.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.cpp kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp
--- kdegames-3.5.7/ksokoban/MoveSequence.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/MoveSequence.h kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h
--- kdegames-3.5.7/ksokoban/MoveSequence.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/MoveSequence.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/NEWS kdegames-3.5.7-trademarks/ksokoban/NEWS
--- kdegames-3.5.7/ksokoban/NEWS	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/NEWS	2007-08-08 07:07:06.000000000 +0200
@@ -52,17 +52,17 @@
 * Internationalisation
 
 -------------------------------------------------------------------------------
-version 0.1.2: ksokoban imported to CVS. Date 1998-08-30
+version 0.1.2: imported to CVS. Date 1998-08-30
 
 -------------------------------------------------------------------------------
 version 0.1.1: bugfix release. Date 1998-08-25
 
-* BUGFIX: ksokoban now ignores mouseclicks while a move is in progress.
+* BUGFIX: now ignores mouseclicks while a move is in progress.
 	  Previously such a click would cause a memory leak and a corrupted
 	  undo/redo history (or a failed assertion if debugging was turned on).
 	  Thanks to Natali Giuliano <natali at stone.trew.it> for reporting this.
 
-* ksokoban should now work with older zlib & Qt libraries.
+* should now work with older zlib & Qt libraries.
   I have tested it with zlib 1.0.3 and Qt 1.33
 
 * Detects the old gcc 2.7 and turns off optimisations if it is found.
diff -ur kdegames-3.5.7/ksokoban/PathFinder.cpp kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp
--- kdegames-3.5.7/ksokoban/PathFinder.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PathFinder.h kdegames-3.5.7-trademarks/ksokoban/PathFinder.h
--- kdegames-3.5.7/ksokoban/PathFinder.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PathFinder.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.cpp kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp
--- kdegames-3.5.7/ksokoban/PlayField.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/PlayField.h kdegames-3.5.7-trademarks/ksokoban/PlayField.h
--- kdegames-3.5.7/ksokoban/PlayField.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/PlayField.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/Queue.h kdegames-3.5.7-trademarks/ksokoban/Queue.h
--- kdegames-3.5.7/ksokoban/Queue.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/Queue.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/README kdegames-3.5.7-trademarks/ksokoban/README
--- kdegames-3.5.7/ksokoban/README	2005-09-10 10:18:19.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/README	2007-08-08 07:07:25.000000000 +0200
@@ -1,12 +1,12 @@
-ksokoban 0.2.2 - a Sokoban game for KDE
+KBoxPush 0.2.2 - a BoxPush game for KDE
 
 copyright 1998 Anders Widell  <d95-awi at nada.kth.se>
 
-ksokoban is free software; you can redistribute it and/or modify it
+KBoxPush is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License. See the file
 COPYING for details.
 
-See http://hem.passagen.se/awl/ksokoban/ for later versions of ksokoban.
+See http://hem.passagen.se/awl/ksokoban/ for later versions of KBoxPush.
 See the file AUTHORS for details about where the levels come from.
 
 ------------------------------------------------------------------------
diff -ur kdegames-3.5.7/ksokoban/StaticImage.cpp kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp
--- kdegames-3.5.7/ksokoban/StaticImage.cpp	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.cpp	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ksokoban/StaticImage.h kdegames-3.5.7-trademarks/ksokoban/StaticImage.h
--- kdegames-3.5.7/ksokoban/StaticImage.h	2005-10-10 16:56:05.000000000 +0200
+++ kdegames-3.5.7-trademarks/ksokoban/StaticImage.h	2007-08-04 23:55:19.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- *  ksokoban - a Sokoban game for KDE
+ *  ksokoban - a BoxPush game for KDE
  *  Copyright (C) 1998  Anders Widell  <d95-awi at nada.kth.se>
  *
  *  This program is free software; you can redistribute it and/or modify
diff -ur kdegames-3.5.7/ktron/ktron.cpp kdegames-3.5.7-trademarks/ktron/ktron.cpp
--- kdegames-3.5.7/ktron/ktron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ****************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -42,10 +42,10 @@
 /**
  * Constuctor
  */ 
-KTron::KTron(QWidget *parent, const char *name) : KMainWindow(parent, name) {
+KSnakeDuel::KSnakeDuel(QWidget *parent, const char *name) : KMainWindow(parent, name) {
   playerPoints[0]=playerPoints[1]=0;
 
-  tron=new Tron(this, "Tron");
+  tron=new SnakeDuel(this, "SnakeDuel");
   connect(tron,SIGNAL(gameEnds(Player)),SLOT(changeStatus(Player)));
   setCentralWidget(tron);
   tron->setMinimumSize(200,180);
@@ -54,7 +54,7 @@
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+1);
   statusBar()->insertItem("abcdefghijklmnopqrst: 0  ",ID_STATUS_BASE+2);
 
-  // We match up keyboard events ourselves in Tron::keyPressEvent()
+  // We match up keyboard events ourselves in SnakeDuel::keyPressEvent()
   // We must disable the actions, otherwise we don't get the keyPressEvent's
   KAction *act;
   act = new KAction(i18n("Player 1 Up"), Key_R, 0, 0, actionCollection(), "Pl1Up");
@@ -90,7 +90,7 @@
   loadSettings();
 }
 
-void KTron::loadSettings() {
+void KSnakeDuel::loadSettings() {
    playerName[0]=Settings::namePlayer1();
    if ( playerName[0].isEmpty() )
        playerName[0] = i18n("Player 1");
@@ -101,7 +101,7 @@
    updateStatusbar();
 }
 
-void KTron::updateStatusbar(){
+void KSnakeDuel::updateStatusbar(){
   for(int i=0;i<2;i++){
     Player player;
     player=(i==0?One:Two);
@@ -118,7 +118,7 @@
   }
 }
 
-void KTron::changeStatus(Player player) {
+void KSnakeDuel::changeStatus(Player player) {
   // if player=Nobody, then new game
   if(player==Nobody){
     playerPoints[0]=playerPoints[1]=0;
@@ -143,18 +143,18 @@
     showWinner(Two);
 }
 
-void KTron::showWinner(Player winner){
+void KSnakeDuel::showWinner(Player winner){
   if(tron->isComputer(Both) || (winner != One && winner != Two))
     return;
 
-  QString loserName = i18n("KTron");
+  QString loserName = i18n("KSnakeDuel");
   int loser = Two;
   if(winner == Two)
     loser = One;
   if(!tron->isComputer(((Player)loser)))
     loserName = playerName[loser];
   
-  QString winnerName = i18n("KTron");
+  QString winnerName = i18n("KSnakeDuel");
   if(!tron->isComputer(winner))
     winnerName = playerName[winner];
   
@@ -169,7 +169,7 @@
   tron->newGame();
 }
 
-void KTron::paletteChange(const QPalette &/*oldPalette*/){
+void KSnakeDuel::paletteChange(const QPalette &/*oldPalette*/){
    update();
    tron->updatePixmap();
    tron->update();
@@ -178,7 +178,7 @@
 /**
  * Show Settings dialog.
  */
-void KTron::showSettings(){
+void KSnakeDuel::showSettings(){
   if(KConfigDialog::showDialog("settings"))
     return;
   
diff -ur kdegames-3.5.7/ktron/ktron.desktop kdegames-3.5.7-trademarks/ktron/ktron.desktop
--- kdegames-3.5.7/ktron/ktron.desktop	2007-05-14 09:39:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.desktop	2007-08-08 07:14:16.000000000 +0200
@@ -4,64 +4,64 @@
 Exec=ktron -caption "%c" %i %m
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
-GenericName[be]=???????????? ????????
+GenericName=SnakeDuel-like Game
+GenericName[be]=???????????? SnakeDuel
 GenericName[bg]=?????????????????? ????????
 GenericName[bn]=????????????-??????????????? ????????????
-GenericName[br]=C'hoari doare Tron
-GenericName[bs]=Igra nalik na Tron
-GenericName[ca]=Joc a l'estil Tron
-GenericName[cs]=Hra podobn?? Tronu
-GenericName[cy]=G??m sy'n debyg i Tron
-GenericName[da]=Tron-lignende spil
-GenericName[de]=Tron-??hnliches Spiel
-GenericName[el]=???????????????? ???????????????? ???? ???? Tron
-GenericName[es]=Juego similar a Tron
-GenericName[et]=Tron
-GenericName[eu]=Tron-en antzeko jokoa
-GenericName[fa]=???????? ????????Tron
-GenericName[fi]=Tron-tyylinen peli
-GenericName[fr]=Jeu dans le style de Tron
-GenericName[he]=???????? ?????????? Tron
-GenericName[hr]=Igra poput Trona
-GenericName[hu]=Tron-szer??
-GenericName[is]=Leikur sem l??kist Tron
-GenericName[it]=Gioco simile a Tron
+GenericName[br]=C'hoari doare SnakeDuel
+GenericName[bs]=Igra nalik na SnakeDuel
+GenericName[ca]=Joc a l'estil SnakeDuel
+GenericName[cs]=Hra podobn?? SnakeDuelu
+GenericName[cy]=G??m sy'n debyg i SnakeDuel
+GenericName[da]=SnakeDuel-lignende spil
+GenericName[de]=SnakeDuel-??hnliches Spiel
+GenericName[el]=???????????????? ???????????????? ???? ???? SnakeDuel
+GenericName[es]=Juego similar a SnakeDuel
+GenericName[et]=SnakeDuel
+GenericName[eu]=SnakeDuel-en antzeko jokoa
+GenericName[fa]=???????? ????????SnakeDuel
+GenericName[fi]=SnakeDuel-tyylinen peli
+GenericName[fr]=Jeu dans le style de SnakeDuel
+GenericName[he]=???????? ?????????? SnakeDuel
+GenericName[hr]=Igra poput SnakeDuela
+GenericName[hu]=SnakeDuel-szer??
+GenericName[is]=Leikur sem l??kist SnakeDuel
+GenericName[it]=Gioco simile a SnakeDuel
 GenericName[ja]=??????????????????????????????
-GenericName[km]=??????????????????????????? Tron
-GenericName[lv]=Tron l??dz??ga sp??le
-GenericName[mk]=???????? ???????????? ???? Tron
-GenericName[nb]=Tron-lignende spill
-GenericName[nds]=Tron-liek Speel
+GenericName[km]=??????????????????????????? SnakeDuel
+GenericName[lv]=SnakeDuel l??dz??ga sp??le
+GenericName[mk]=???????? ???????????? ???? SnakeDuel
+GenericName[nb]=SnakeDuel-lignende spill
+GenericName[nds]=SnakeDuel-liek Speel
 GenericName[ne]=??????????????? ??????????????? ?????????
-GenericName[nl]=Tron-achtig spel
-GenericName[nn]=Tron-liknande spel
-GenericName[pl]=Gra typu Tron
-GenericName[pt]=Jogo tipo Tron
-GenericName[pt_BR]=Jogo parecido com Tron
-GenericName[ru]=????????
-GenericName[se]=Tron-l??gan speallu
-GenericName[sk]=Hra typu Tron
-GenericName[sl]=Igra podobna Tronu
-GenericName[sr]=???????? ?????????? ???? Tron
-GenericName[sr at Latn]=Igra nalik na Tron
-GenericName[sv]=Tron-liknande spel
+GenericName[nl]=SnakeDuel-achtig spel
+GenericName[nn]=SnakeDuel-liknande spel
+GenericName[pl]=Gra typu SnakeDuel
+GenericName[pt]=Jogo tipo SnakeDuel
+GenericName[pt_BR]=Jogo parecido com SnakeDuel
+GenericName[ru]=SnakeDuel
+GenericName[se]=SnakeDuel-l??gan speallu
+GenericName[sk]=Hra typu SnakeDuel
+GenericName[sl]=Igra podobna SnakeDuelu
+GenericName[sr]=???????? ?????????? ???? SnakeDuel
+GenericName[sr at Latn]=Igra nalik na SnakeDuel
+GenericName[sv]=SnakeDuel-liknande spel
 GenericName[ta]=?????????????????? ??????????????? ??????????????????????????????
-GenericName[uk]=?????? ?????????? ???? ?????? "????????"
-GenericName[zh_TW]=?????? Tron ??????
+GenericName[uk]=?????? ?????????? ???? ?????? "SnakeDuel"
+GenericName[zh_TW]=?????? SnakeDuel ??????
 Terminal=false
-Name=KTron
-Name[af]=Ktron
-Name[be]=????????
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
+Name[be]=SnakeDuel
 Name[bn]=??????-????????????
-Name[eo]=Trono
+Name[eo]=SnakeDuelo
 Name[hi]=??????-???????????????
-Name[nb]=Tron
+Name[nb]=SnakeDuel
 Name[ne]=??????????????? ???????????????
-Name[sv]=Ktron
+Name[sv]=KSnakeDuel
 Name[ta]=K??????????????????
-Name[tg]=K????????
-Name[zu]=I-KTron
+Name[tg]=KSnakeDuel
+Name[zu]=I-KSnakeDuel
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -ur kdegames-3.5.7/ktron/ktron.h kdegames-3.5.7-trademarks/ktron/ktron.h
--- kdegames-3.5.7/ktron/ktron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/ktron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ***************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -31,21 +31,21 @@
 
 class KAccel;
 class KSelectAction;
-class Tron;
+class SnakeDuel;
 
 /**
- * @short The main window of KTron
+ * @short The main window of KSnakeDuel
  */
-class KTron : public KMainWindow {
+class KSnakeDuel : public KMainWindow {
 
 Q_OBJECT
 
 public:
-  KTron(QWidget *parent=0, const char *name=0);
+  KSnakeDuel(QWidget *parent=0, const char *name=0);
 
 private:
   KAccel *accel;
-  Tron *tron;
+  SnakeDuel *tron;
   QString playerName[2];
   int playerPoints[2];
   void updateStatusbar();
diff -ur kdegames-3.5.7/ktron/main.cpp kdegames-3.5.7-trademarks/ktron/main.cpp
--- kdegames-3.5.7/ktron/main.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/main.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /******************************************************************************
-   This file is part of the game 'KTron'
+   This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -34,7 +34,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", I18N_NOOP("KTron"), 
+  KAboutData aboutData( "ktron", I18N_NOOP("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron at meyerhome.net");
@@ -47,10 +47,10 @@
   KImageIO::registerFormats();
 
   if(a.isRestored()){
-     RESTORE(KTron)
+     RESTORE(KSnakeDuel)
   }
   else {
-     KTron *ktron = new KTron();
+     KSnakeDuel *ktron = new KSnakeDuel();
      a.setMainWidget(ktron);
      ktron->show();
   }
diff -ur kdegames-3.5.7/ktron/player.cpp kdegames-3.5.7-trademarks/ktron/player.cpp
--- kdegames-3.5.7/ktron/player.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /********************************************************************************** 
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/player.h kdegames-3.5.7-trademarks/ktron/player.h
--- kdegames-3.5.7/ktron/player.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/player.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the kde-game 'KTron'
+  This file is part of the kde-game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
diff -ur kdegames-3.5.7/ktron/README kdegames-3.5.7-trademarks/ktron/README
--- kdegames-3.5.7/ktron/README	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/README	2007-08-08 07:13:57.000000000 +0200
@@ -1,6 +1,6 @@
 Hello!
 
-KTron is a simple tron-clone for the K Desktop Environment.
+KSnakeDuel is a simple snake duel game for the K Desktop Environment.
 I think it's just nothing to say about the game:
 avoid running into walls, your own tail, and that of your opponent.
 
@@ -14,15 +14,15 @@
 
 Copyright:
 
-KTron
+KSnakeDuel
 
 Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
-KTron is free software; you can redistribute it and/or modify	
+KSnakeDuel 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 any later version.
 
-KTron is distributed in the hope that it will be useful,
+KSnakeDuel 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.
diff -ur kdegames-3.5.7/ktron/TODO kdegames-3.5.7-trademarks/ktron/TODO
--- kdegames-3.5.7/ktron/TODO	2005-09-10 10:18:12.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/TODO	2007-08-04 06:51:21.000000000 +0200
@@ -1,8 +1,8 @@
-KTron in general does everything I wanted it to do. :-)
+KSnakeDuel in general does everything I wanted it to do. :-)
 
 Plans for the future are:
 - possibility to create, load, save playfield with walls
-- real cool would be to play KTron over the internet
+- real cool would be to play KSnakeDuel over the internet
 
 ------------------
 Matthias Kiefer
diff -ur kdegames-3.5.7/ktron/tron.cpp kdegames-3.5.7-trademarks/ktron/tron.cpp
--- kdegames-3.5.7/ktron/tron.cpp	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.cpp	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /****************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -41,7 +41,7 @@
  * init-functions
  **/
 
-Tron::Tron(QWidget *parent,const char *name)
+SnakeDuel::SnakeDuel(QWidget *parent,const char *name)
   : QWidget(parent,name)
 {
   pixmap=0;
@@ -63,7 +63,7 @@
   QTimer::singleShot(15000, this,SLOT(showBeginHint()));
 }
 
-void Tron::loadSettings(){
+void SnakeDuel::loadSettings(){
   setPalette(Settings::color_Background());
 
   // Size
@@ -107,7 +107,7 @@
   setComputerplayer(Two, Settings::computerplayer2());
 }
 
-Tron::~Tron()
+SnakeDuel::~SnakeDuel()
 {
   if(playfield)
     {
@@ -119,7 +119,7 @@
 
 }
 
-void Tron::createNewPlayfield()
+void SnakeDuel::createNewPlayfield()
 {
   if(playfield)
     delete [] playfield;
@@ -143,7 +143,7 @@
   //lookForward=min/4;
 }
 
-void Tron::newGame()
+void SnakeDuel::newGame()
 {
   players[0].score=0;
   players[1].score=0;
@@ -153,7 +153,7 @@
   QTimer::singleShot(15000,this,SLOT(showBeginHint()));
 }
 
-void Tron::reset()
+void SnakeDuel::reset()
 {
   gamePaused=false;
   stopGame();
@@ -188,7 +188,7 @@
     emit gameReset();
 }
 
-void Tron::computerStart()
+void SnakeDuel::computerStart()
 {
    if(isComputer(Both))
    {
@@ -201,14 +201,14 @@
 **                   	??? functions										 **
 ** *************************************************************** */
 
-void Tron::startGame()
+void SnakeDuel::startGame()
 {
    gameEnded=false;
    beginHint=false;
    timer->start(velocity);
 }
 
-void Tron::stopGame()
+void SnakeDuel::stopGame()
 {
    timer->stop();
    gameEnded=true;
@@ -216,7 +216,7 @@
    players[1].last_dir = Directions::None;
 }
 
-void Tron::togglePause() // pause or continue game
+void SnakeDuel::togglePause() // pause or continue game
 {
   if(!gameEnded)
   {
@@ -235,7 +235,7 @@
   }
 }
 
-void Tron::showWinner(Player player)
+void SnakeDuel::showWinner(Player player)
 {
    int i,j;
 
@@ -282,7 +282,7 @@
 **                    paint functions										 **
 ** *************************************************************** */
 
-void Tron::updatePixmap()
+void SnakeDuel::updatePixmap()
 {
   int i,j;
 
@@ -302,7 +302,7 @@
   QPainter p;
   p.begin(pixmap);
 
-  // alle Pixel pr?fen und evt. zeichnen
+  // alle Pixel pr???fen und evt. zeichnen
   for(i=0;i<fieldWidth;i++)
      for(j=0;j<fieldHeight;j++)
      {
@@ -328,7 +328,7 @@
 }
 
 // draw new player rects
-void Tron::paintPlayers()
+void SnakeDuel::paintPlayers()
 {
    QPainter p;
    p.begin(this);
@@ -342,7 +342,7 @@
    p.end();
 }
 
-void Tron::drawRect(QPainter & p, int x, int y)
+void SnakeDuel::drawRect(QPainter & p, int x, int y)
 {
    int xOffset=x*rectSize+(width()-fieldWidth*rectSize)/2;
    int yOffset=y*rectSize+(height()-fieldHeight*rectSize)/2;
@@ -364,7 +364,7 @@
    }
    else
    {
-      kdDebug() << "No player defined in Tron::drawRect(...)" << endl;
+      kdDebug() << "No player defined in SnakeDuel::drawRect(...)" << endl;
       return;
    }
 
@@ -422,12 +422,12 @@
 **                    config functions										 **
 ** *************************************************************** */
 
-void Tron::setActionCollection(KActionCollection *a)
+void SnakeDuel::setActionCollection(KActionCollection *a)
 {
    actionCollection = a;
 }
 
-void Tron::setBackgroundPix(QPixmap pix)
+void SnakeDuel::setBackgroundPix(QPixmap pix)
 {
     bgPix=pix;
 
@@ -438,7 +438,7 @@
     }
 }
 
-void Tron::setVelocity(int newVel)            // set new velocity
+void SnakeDuel::setVelocity(int newVel)            // set new velocity
 {
   velocity=(10-newVel)*15;
 
@@ -446,7 +446,7 @@
     timer->changeInterval(velocity);
 }
 
-void Tron::setComputerplayer(Player player, bool flag) {
+void SnakeDuel::setComputerplayer(Player player, bool flag) {
   if(player==One)
     players[0].setComputer(flag);
   else if(player==Two)
@@ -456,7 +456,7 @@
       QTimer::singleShot(1000,this,SLOT(computerStart()));
 }
 
-bool Tron::isComputer(Player player)
+bool SnakeDuel::isComputer(Player player)
 {
    if(player==One)
      return players[0].computer;
@@ -475,7 +475,7 @@
 **                    moving functions										 **
 ** *************************************************************** */
 
-bool Tron::crashed(int playerNr,int xInc, int yInc) const
+bool SnakeDuel::crashed(int playerNr,int xInc, int yInc) const
 {
   bool flag;
   int newX=players[playerNr].xCoordinate+xInc;
@@ -490,7 +490,7 @@
   return flag;
 }
 
-void Tron::switchDir(int playerNr,Directions::Direction newDirection)
+void SnakeDuel::switchDir(int playerNr,Directions::Direction newDirection)
 {
   if(playerNr!=0 && playerNr != 1)
   {
@@ -513,7 +513,7 @@
   players[playerNr].dir=newDirection;
 }
 
-void Tron::updateDirections(int playerNr)
+void SnakeDuel::updateDirections(int playerNr)
 {
    if(playerNr==-1 || playerNr==0)
    {
@@ -581,7 +581,7 @@
 **                    			Events										 **
 ** *************************************************************** */
 
-void Tron::paintEvent(QPaintEvent *e)
+void SnakeDuel::paintEvent(QPaintEvent *e)
 {
    bitBlt(this,e->rect().topLeft(),pixmap,e->rect());
 
@@ -629,13 +629,13 @@
    }
 }
 
-void Tron::resizeEvent(QResizeEvent *)
+void SnakeDuel::resizeEvent(QResizeEvent *)
 {
     createNewPlayfield();
     reset();
 }
 
-void Tron::keyPressEvent(QKeyEvent *e)
+void SnakeDuel::keyPressEvent(QKeyEvent *e)
 {
   KKey key(e);
   if(!players[1].computer)
@@ -718,7 +718,7 @@
   }
 }
 
-void Tron::keyReleaseEvent(QKeyEvent * e)
+void SnakeDuel::keyReleaseEvent(QKeyEvent * e)
 {
   KKey key(e);
 
@@ -785,7 +785,7 @@
 }
 
 // if playingfield loses keyboard focus, pause game
-void Tron::focusOutEvent(QFocusEvent *)
+void SnakeDuel::focusOutEvent(QFocusEvent *)
 {
    if(!gameEnded && !gamePaused)
    {
@@ -797,12 +797,12 @@
 **     				slots										 **
 ** *************************************************************** */
 
-void Tron::unblockGame()
+void SnakeDuel::unblockGame()
 {
   gameBlocked=false;
 }
 
-void Tron::showBeginHint()
+void SnakeDuel::showBeginHint()
 {
    if(gameEnded)
    {
@@ -816,12 +816,12 @@
 }
 
 // doMove() is called from QTimer
-void Tron::doMove()
+void SnakeDuel::doMove()
 {
    int i;
    for(i=0;i<2;i++)
    {
-      // ?berpr?fen, ob Acceleratortaste gedr?ckt wurde...
+      // ???berpr???fen, ob Acceleratortaste gedr???ckt wurde...
       if(players[i].accelerated)
       {
          updateDirections(i);
@@ -1067,7 +1067,7 @@
 
 // This part is partly ported from
 // xtron-1.1 by Rhett D. Jacobs <rhett at hotel.canberra.edu.au>
-void Tron::think(int playerNr)
+void SnakeDuel::think(int playerNr)
 {
 if(Settings::skill() != Settings::EnumSkill::Easy)
 {
@@ -1598,7 +1598,7 @@
  }
 }
 
-void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
+void SnakeDuel::changeDirection(int playerNr,int dis_right,int dis_left)
 {
    Directions::Direction currentDir=players[playerNr].dir;
    Directions::Direction sides[2];
diff -ur kdegames-3.5.7/ktron/tron.h kdegames-3.5.7-trademarks/ktron/tron.h
--- kdegames-3.5.7/ktron/tron.h	2005-10-10 16:56:04.000000000 +0200
+++ kdegames-3.5.7-trademarks/ktron/tron.h	2007-08-04 06:51:21.000000000 +0200
@@ -1,5 +1,5 @@
 /* ********************************************************************************
-  This file is part of the game 'KTron'
+  This file is part of the game 'KSnakeDuel'
 
   Copyright (C) 1998-2000 by Matthias Kiefer <matthias.kiefer at gmx.de>
 
@@ -43,13 +43,13 @@
 /**
 * @short The playingfield
 */
-class Tron : public QWidget
+class SnakeDuel : public QWidget
 {
   Q_OBJECT
 
 public:
-  Tron(QWidget *parent=0, const char *name=0);
-  ~Tron();
+  SnakeDuel(QWidget *parent=0, const char *name=0);
+  ~SnakeDuel();
   void setActionCollection(KActionCollection*);
   void updatePixmap();
   void setBackgroundPix(QPixmap);
@@ -77,7 +77,7 @@
   void gameReset();
 
 protected:
-  /** bitBlt?s the rect that has to be updated from the
+  /** bitBlt???s the rect that has to be updated from the
   * bufferpixmap on the screen and writes eventually text
   */
   void paintEvent(QPaintEvent *);
@@ -136,7 +136,7 @@
   void createNewPlayfield();
   /** paints players at current player coordinates */
   void paintPlayers();
-  /** draws a rect in current TronStyle at position x,y of the playingfield */
+  /** draws a rect in current SnakeDuelStyle at position x,y of the playingfield */
   void drawRect(QPainter & p, int x, int y);
   /** emits gameEnds(Player) and displays the winner by changing color*/
   void showWinner(Player winner);
@@ -162,7 +162,7 @@
   
 private slots:
     /**
-    * This is the main function of KTron.
+    * This is the main function of KSnakeDuel.
     * It checkes if an accelerator is pressed and than moves this player
     * forward. Then it checkes if a crash occurred.
     * If no crash happen it moves both players forward and checks again
diff -ur kdegames-3.5.7/README kdegames-3.5.7-trademarks/README
--- kdegames-3.5.7/README	2005-09-10 10:18:37.000000000 +0200
+++ kdegames-3.5.7-trademarks/README	2007-08-08 07:08:20.000000000 +0200
@@ -38,6 +38,9 @@
 * kbounce
     Claim areas and don't get disturbed.
 
+* kboxpush
+    Move all storage boxes into the cabinet.
+
 * keneloba
     Push pieces of your opponent out of the board (an Abalone type game).
 
@@ -89,15 +92,12 @@
 * ksnake
     Don't bite yourself, eat apples!
 
-* ksokoban
-    Move all storage boxes into the cabinet.
+* ksnakeduel
+    Like ksnake, but without fruits.
 
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 
-* ktron
-    Like ksnake, but without fruits.
-
 * ktuberling
     Kids game: make your own potato (NO french fries!)
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdegames.spec	20 Aug 2007 20:00:27 -0000	1.61
+++ kdegames.spec	20 Sep 2007 20:45:52 -0000	1.62
@@ -3,25 +3,20 @@
 %define final 0
 %define make_cvs 0
 
-%if 0%{?rhel} > 1
-%define patch_name -patched
-%else
-%define patch_name %{nil}
-%endif
-
 Name:    kdegames
 Summary: K Desktop Environment - Games
 Epoch:   6
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
 Url:     http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch0: kdegames-3.1.1-konquest.patch
+Patch1: kdegames-3.5.7-trademarks.patch
 
 Provides: kdegames3 = %{version}-%{release}
 
@@ -54,9 +49,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
+%setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .konquest
+%patch1 -p1 -b .trademarks
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -163,6 +159,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Than Ngo <than at redhat.com> 3.5.7-4
+- bz248343, remove the Tron and Sokoban trademarks, thanks to Kevin Kofler
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
 - License: GPLv2, libs/devel License: LGPLv2
 - (Build)Requires: kdelibs3(-devel)



From fedora-extras-commits at redhat.com  Thu Sep 20 20:47:31 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 16:47:31 -0400
Subject: rpms/postgresql/F-7 ecpg_config.h, NONE,
	1.1 postgresql-use-zoneinfo.patch, NONE, 1.1 .cvsignore, 1.36,
	1.37 README.rpm-dist, 1.12, 1.13 postgresql.spec, 1.78,
	1.79 sources, 1.37, 1.38
Message-ID: <200709202047.l8KKlVwn008046@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969

Modified Files:
	.cvsignore README.rpm-dist postgresql.spec sources 
Added Files:
	ecpg_config.h postgresql-use-zoneinfo.patch 
Log Message:
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0; sync package with devel head.


--- NEW FILE ecpg_config.h ---
/*
 * Kluge to support multilib installation of both 32- and 64-bit RPMS:
 * we need to arrange that header files that appear in both RPMs are
 * identical.  Hence, this file is architecture-independent and calls
 * in an arch-dependent file that will appear in just one RPM.
 *
 * To avoid breaking arches not explicitly supported by Red Hat, we
 * use this indirection file *only* on known multilib arches.
 *
 * Note: this may well fail if user tries to use gcc's -I- option.
 * But that option is deprecated anyway.
 */
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif

postgresql-use-zoneinfo.patch:

--- NEW FILE postgresql-use-zoneinfo.patch ---
PostgreSQL includes its own copy of the zic timezone database, which is great
for ensuring portable results but not so great from a package maintenance
perspective.  Since the data is in the same format as is provided by the
Linux-standard /usr/share/zoneinfo files, we can avoid having to update
postgresql for timezone updates by just using those files instead.

Note: as of PG 8.3 this patch will be unnecessary; use configure's
--with-system-tzdata switch instead.


diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
--- postgresql-8.2.4.orig/src/timezone/Makefile	2007-03-14 13:38:15.000000000 -0400
+++ postgresql-8.2.4/src/timezone/Makefile	2007-08-25 16:38:53.000000000 -0400
@@ -38,14 +38,12 @@
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
-	./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
 	$(MAKE) -C tznames $@
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(datadir)'
 
 uninstall:
-	rm -rf '$(DESTDIR)$(datadir)/timezone'
 	$(MAKE) -C tznames $@
 
 clean distclean maintainer-clean:
diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
--- postgresql-8.2.4.orig/src/timezone/pgtz.c	2006-11-21 18:11:55.000000000 -0500
+++ postgresql-8.2.4/src/timezone/pgtz.c	2007-08-25 16:42:32.000000000 -0400
@@ -31,9 +31,6 @@
 pg_tz	   *global_timezone = NULL;
 
 
-static char tzdir[MAXPGPATH];
-static bool done_tzdir = false;
-
 static bool scan_directory_ci(const char *dirname,
 							  const char *fname, int fnamelen,
 							  char *canonname, int canonnamelen);
@@ -45,17 +42,10 @@
 /*
  * Return full pathname of timezone data directory
  */
-static char *
+static const char *
 pg_TZDIR(void)
 {
-	if (done_tzdir)
-		return tzdir;
-
-	get_share_path(my_exec_path, tzdir);
-	strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
-
-	done_tzdir = true;
-	return tzdir;
+	return "/usr/share/zoneinfo";
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
+++ .cvsignore	20 Sep 2007 20:46:59 -0000	1.37
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
 PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
 postgresql-8.2.1-US.pdf


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/README.rpm-dist,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- README.rpm-dist	13 Jan 2007 04:30:50 -0000	1.12
+++ README.rpm-dist	20 Sep 2007 20:46:59 -0000	1.13
@@ -218,7 +218,8 @@
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- postgresql.spec	20 Jun 2007 19:46:59 -0000	1.78
+++ postgresql.spec	20 Sep 2007 20:46:59 -0000	1.79
@@ -80,8 +80,8 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.4
-Release: 2%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -91,13 +91,14 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
 
 Patch1: rpm-pgsql.patch
 Patch3: postgresql-logging.patch
@@ -105,6 +106,7 @@
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
 Patch8: postgresql-prefer-ncurses.patch
+Patch9: postgresql-use-zoneinfo.patch
 
 BuildRequires: perl glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
@@ -342,6 +344,7 @@
 # patch5 is applied later
 %patch6 -p1
 %patch8 -p1
+%patch9 -p1
 
 #call autoconf 2.53 or greater
 %aconfver
@@ -482,6 +485,8 @@
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+    install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
     ;;
   *)
     ;;
@@ -602,10 +607,6 @@
 if [ $1 -ge 1 ] ; then
 	/sbin/service postgresql condrestart >/dev/null 2>&1 || :
 fi
-if [ $1 = 0 ] ; then
-	userdel postgres >/dev/null 2>&1 || :
-	groupdel postgres >/dev/null 2>&1 || : 
-fi
 
 %if %plperl
 %post -p /sbin/ldconfig   plperl
@@ -745,7 +746,6 @@
 %{_datadir}/pgsql/postgres.shdescription
 %{_datadir}/pgsql/system_views.sql
 %{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/timezone/
 %{_datadir}/pgsql/timezonesets/
 %{_libdir}/pgsql/plpgsql.so
 %dir %{_datadir}/pgsql
@@ -822,6 +822,14 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Tom Lane <tgl at redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+- Use tzdata package's data files instead of private copy, so that
+  postgresql-server need not be turned for routine timezone updates
+- Don't remove postgres user/group during RPM uninstall, per Fedora
+  packaging guidelines
+
 * Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
 - Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
   anymore.  Per upstream bug 3398.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	24 Apr 2007 19:21:40 -0000	1.37
+++ sources	20 Sep 2007 20:46:59 -0000	1.38
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847  postgresql-8.2.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc  pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
 0c25dc2055e2fa9ff9d05afc9252e1f2  postgresql-8.2.1-US.pdf



From fedora-extras-commits at redhat.com  Thu Sep 20 20:50:49 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 20 Sep 2007 16:50:49 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-tooltips.patch, 
	NONE, 1.1 gtk-nodoka-engine-0.6-treeview.patch, NONE,
	1.1 gtk-nodoka-engine.spec, 1.5, 1.6
Message-ID: <200709202050.l8KKonU4008202@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8142

Modified Files:
	gtk-nodoka-engine.spec 
Added Files:
	gtk-nodoka-engine-0.6-tooltips.patch 
	gtk-nodoka-engine-0.6-treeview.patch 
Log Message:


Allow user change of tooltips colors, fix colors in unfocused gtktreeview (rhbz #297271)




gtk-nodoka-engine-0.6-tooltips.patch:

--- NEW FILE gtk-nodoka-engine-0.6-tooltips.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips	2007-08-18 14:32:21.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:31:28.000000000 +0200
@@ -6,7 +6,7 @@
 #
 # Uses the Nodoka theme engine, forked from Murrine theme engine
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF"
+gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color=#F5F5B5\ntooltip_fg_color=#000"
 
 style "fedora-default"
 {
@@ -165,11 +165,13 @@ style "fedora-frame-title" = "fedora-def
 	fg[NORMAL]	= lighter (@fg_color)
 }
 
-style "fedora-tooltips" = "fedora-default"
+style "fedora-tooltips"
 {
 	xthickness	= 4
 	ythickness	= 4
-	bg[NORMAL]	= { 1.0,1.0,0.75 }
+
+	bg[NORMAL]	= @tooltip_bg_color
+	fg[NORMAL]	= @tooltip_fg_color
 }
 
 style "fedora-progressbar" = "fedora-wide-bright"
@@ -234,8 +236,7 @@ widget_class "*.GtkCombo.GtkButton"	styl
 widget_class "*.GtkComboBox.GtkFrame"	style "fedora-wider"
 
 # tooltips stuff
-widget "gtk-tooltips"			style "fedora-tooltips"
-widget "gtk-tooltip"			style "fedora-tooltips"
+widget "gtk-tooltip*"			style "fedora-tooltips"
 
 # treeview stuff
 widget_class "*.GtkTreeView.GtkButton"	style "fedora-tree"

gtk-nodoka-engine-0.6-treeview.patch:

--- NEW FILE gtk-nodoka-engine-0.6-treeview.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-20 22:33:33.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:34:50.000000000 +0200
@@ -49,13 +49,13 @@ style "fedora-default"
 
 	base[NORMAL]			= @base_color
 	base[PRELIGHT]			= shade (0.3967, @base_color)
-	base[ACTIVE]			= shade (0.9437, @bg_color)
+	base[ACTIVE]			= shade (0.65, @selected_fg_color)
 	base[SELECTED]			= @selected_bg_color
 	base[INSENSITIVE]		= shade (0.9437, @bg_color)
 
 	text[NORMAL]			= @text_color
 	text[PRELIGHT]			= @text_color
-	text[ACTIVE]			= @text_color
+	text[ACTIVE]			= @selected_fg_color
 	text[SELECTED]			= @selected_fg_color
 	text[INSENSITIVE]		= darker (@selected_fg_color)
 


Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-nodoka-engine.spec	25 Aug 2007 15:31:27 -0000	1.5
+++ gtk-nodoka-engine.spec	20 Sep 2007 20:50:17 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://fedoraproject.org/wiki/Artwork/NodokaTheme
 Source0:        gtk-nodoka-engine-%{version}.tar.gz
+Patch0:         gtk-nodoka-engine-0.6-tooltips.patch
+Patch1:         gtk-nodoka-engine-0.6-treeview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -19,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tooltips
+%patch1 -p1 -b .treeview
 
 %build
 %configure
@@ -44,6 +48,10 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
+- Add user specified tooltips coloring
+- Fix colours in unfocused GTKTreeView (rhbz #297271)
+
 * Sat Aug 25 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-1
 - new version
   -- first stable



From fedora-extras-commits at redhat.com  Thu Sep 20 20:59:18 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 16:59:18 -0400
Subject: comps comps-f8.xml.in,1.117,1.118
Message-ID: <200709202059.l8KKxIZ3008375@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8355

Modified Files:
	comps-f8.xml.in 
Log Message:

Moved maven out of the Development category, and added it to Java Development




Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- comps-f8.xml.in	20 Sep 2007 00:37:51 -0000	1.117
+++ comps-f8.xml.in	20 Sep 2007 20:58:48 -0000	1.118
@@ -970,7 +970,6 @@
       <packagereq type="optional">mach</packagereq>
       <packagereq type="optional">manedit</packagereq>
       <packagereq type="optional">mantis</packagereq>
-      <packagereq type="optional">maven2</packagereq>
       <packagereq type="optional">mcrypt</packagereq>
       <packagereq type="optional">meld</packagereq>
       <packagereq type="optional">memtest86+</packagereq>
@@ -2291,6 +2290,7 @@
       <packagereq type="default">log4j</packagereq>
       <packagereq type="default">log4j-javadoc</packagereq>
       <packagereq type="default">log4j-manual</packagereq>
+      <packagereq type="default">maven2</packagereq>
       <packagereq type="default">mx4j</packagereq>
       <packagereq type="default">mx4j-javadoc</packagereq>
       <packagereq type="default">mx4j-manual</packagereq>



From fedora-extras-commits at redhat.com  Thu Sep 20 20:59:56 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 20 Sep 2007 16:59:56 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-tooltips.patch,
	1.1, 1.2
Message-ID: <200709202059.l8KKxuTA008428@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8407

Modified Files:
	gtk-nodoka-engine-0.6-tooltips.patch 
Log Message:


Fix a typo in the tooltips patch.




gtk-nodoka-engine-0.6-tooltips.patch:

Index: gtk-nodoka-engine-0.6-tooltips.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine-0.6-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-nodoka-engine-0.6-tooltips.patch	20 Sep 2007 20:50:17 -0000	1.1
+++ gtk-nodoka-engine-0.6-tooltips.patch	20 Sep 2007 20:59:53 -0000	1.2
@@ -6,7 +6,7 @@
  # Uses the Nodoka theme engine, forked from Murrine theme engine
  
 -gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF"
-+gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color=#F5F5B5\ntooltip_fg_color=#000"
++gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
  
  style "fedora-default"
  {



From fedora-extras-commits at redhat.com  Thu Sep 20 21:12:04 2007
From: fedora-extras-commits at redhat.com (Tom Lane (tgl))
Date: Thu, 20 Sep 2007 17:12:04 -0400
Subject: rpms/postgresql/F-7 postgresql.spec,1.79,1.80
Message-ID: <200709202112.l8KLC4RN014941@cvs-int.fedora.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14923

Modified Files:
	postgresql.spec 
Log Message:
Hm, looks like perl BuildRequires change is needed in F7 too.


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-7/postgresql.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- postgresql.spec	20 Sep 2007 20:46:59 -0000	1.79
+++ postgresql.spec	20 Sep 2007 21:11:31 -0000	1.80
@@ -108,7 +108,7 @@
 Patch8: postgresql-prefer-ncurses.patch
 Patch9: postgresql-use-zoneinfo.patch
 
-BuildRequires: perl glibc-devel bison flex autoconf
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
 
 %if %python || %plpython
@@ -829,6 +829,7 @@
   postgresql-server need not be turned for routine timezone updates
 - Don't remove postgres user/group during RPM uninstall, per Fedora
   packaging guidelines
+- Recent perl changes in rawhide mean we need a more specific BuildRequires
 
 * Wed Jun 20 2007 Tom Lane <tgl at redhat.com> 8.2.4-2
 - Fix oversight in postgresql-test makefile: pg_regress isn't a shell script



From fedora-extras-commits at redhat.com  Thu Sep 20 21:17:11 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 17:17:11 -0400
Subject: rpms/gtk2-engines/devel crux-colors.patch, NONE,
	1.1 gtk2-engines.spec, 1.78, 1.79
Message-ID: <200709202117.l8KLHBah015281@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2-engines/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15226

Modified Files:
	gtk2-engines.spec 
Added Files:
	crux-colors.patch 
Log Message:
fix a typo in the crux gtkrc


crux-colors.patch:

--- NEW FILE crux-colors.patch ---
diff -up gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc.crux-colors gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc
--- gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc.crux-colors	2007-09-20 17:11:39.000000000 -0400
+++ gtk-engines-2.12.0/themes/Crux/gtk-2.0/gtkrc	2007-09-20 17:11:45.000000000 -0400
@@ -29,8 +29,7 @@
 
 # Default style for all widgets to build from
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#c4c6c0\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#75507b\nselected_fg_color:#fff\ntooltip_bg_color:#F
-5F5B5\ntooltip_fg_color:#000"
+gtk_color_scheme = "fg_color:#000\nbg_color:#c4c6c0\nbase_color:#fff\ntext_color:#000\nselected_bg_color:#75507b\nselected_fg_color:#fff\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
 
 
 style "default"


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gtk2-engines.spec	18 Sep 2007 02:58:37 -0000	1.78
+++ gtk2-engines.spec	20 Sep 2007 21:16:38 -0000	1.79
@@ -1,12 +1,14 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.12.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://download.gnome.org/sources/gtk-engines/2.12/gtk-engines-%{version}.tar.bz2
 Patch0:		gtk-engines-2.10.2-keep-default-tooltip-color.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478759
+Patch1:		crux-colors.patch
 
 Conflicts:  	gnome-themes < 2.9.0
 Obsoletes:      gnome-theme-clearlooks <= 0.5
@@ -32,6 +34,7 @@
 %prep
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .keep-default-tooltip-color
+%patch1 -p1 -b .crux-colors
 
 %build
 %configure
@@ -68,6 +71,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-2
+- Fix a typo in the Crux gtkrc
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:35:54 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 20 Sep 2007 17:35:54 -0400
Subject: rpms/gnash/F-7 gnash.spec,1.7,1.8
Message-ID: <200709202135.l8KLZsCR016208@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16125

Modified Files:
	gnash.spec 
Log Message:
* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
- info files are empty, don't install them

* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
- omf/scrollkeeper doc is broken, remove it

* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
- better documentation generation




Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/gnash.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnash.spec	6 Sep 2007 15:57:50 -0000	1.7
+++ gnash.spec	20 Sep 2007 21:35:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -80,6 +80,18 @@
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
+# texinfo and therefore info generation is broken, still we have the
+# code to regenerate them
+pushd doc/C
+rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
+   actionscript.info actionscript.texi
+make man html info
+pushd asspec
+rm asspec.info asspec.html asspec.texi
+make html info
+popd
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,16 +113,19 @@
  $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
-# asspec info isn't generated rightly
-rm \
- $RPM_BUILD_ROOT%{_infodir}/asspec.info
-# omf was broken
-#rm -rf \
-# $RPM_BUILD_ROOT%{_datadir}/omf
+# info isn't generated rightly
+rm -rf \
+ $RPM_BUILD_ROOT%{_infodir}/
+# omf/scrollkeeper related files are broken, some files are missing, and
+# omf files are wrong
+rm -rf \
+ $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
+# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+
 %find_lang %{name}
 
 %clean
@@ -119,15 +134,18 @@
 
 %post 
 /sbin/ldconfig
-# currently help system is broken
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-scrollkeeper-update -q -o %{_datadir}/omf/asspec || :
-/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+# the info is empty, but doesn't hurt
+#/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
+#/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
+#if [ $1 = 0 ]; then
+    #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
+    #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
+#fi
 
 %postun
 /sbin/ldconfig
@@ -136,7 +154,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html 
+%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
 %doc doc/C/images
 %{_bindir}/gtk-gnash
 %{_bindir}/gnash
@@ -146,9 +164,9 @@
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash*
-%{_infodir}/gnash*
+#%{_infodir}/gnash*
 %{_datadir}/gnash/
-%{_datadir}/omf/gnash/
+#%{_datadir}/omf/gnash/
 
 %files plugin
 %defattr(-,root,root,-)
@@ -167,6 +185,15 @@
 #%{_bindir}/cygnal
 
 %changelog
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-5
+- info files are empty, don't install them
+
+* Thu Sep 20 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-4
+- omf/scrollkeeper doc is broken, remove it
+
+* Fri Sep  7 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-3
+- better documentation generation
+
 * Wed Sep  5 2007 Patrice Dumas <pertusus at free.fr> 0.8.1-2
 - update to 0.8.1
 - agg is now the default renderer



From fedora-extras-commits at redhat.com  Thu Sep 20 21:37:44 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:37:44 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.13, 1.14 mugshot.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <200709202137.l8KLbiuX016420@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16301

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Sep 2007 19:10:36 -0000	1.13
+++ .cvsignore	20 Sep 2007 21:37:11 -0000	1.14
@@ -1 +1 @@
-mugshot-1.1.53.tar.gz
+mugshot-1.1.54.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mugshot.spec	20 Sep 2007 19:10:36 -0000	1.21
+++ mugshot.spec	20 Sep 2007 21:37:11 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.53
+Version:        1.1.54
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Sep 2007 19:10:36 -0000	1.14
+++ sources	20 Sep 2007 21:37:11 -0000	1.15
@@ -1 +1 @@
-8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz
+fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:37:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:37:59 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.21,1.22 sources,1.15,1.16
Message-ID: <200709202137.l8KLbxvq016469@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16364

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mugshot.spec	20 Sep 2007 20:09:57 -0000	1.21
+++ mugshot.spec	20 Sep 2007 21:37:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           mugshot
-Version:        1.1.53
-Release:        2%{?dist}
+Version:        1.1.54
+Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -224,7 +224,10 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-2
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
+- new upstream
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.53-1
 - new upstream
 
 * Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Sep 2007 20:09:14 -0000	1.15
+++ sources	20 Sep 2007 21:37:26 -0000	1.16
@@ -1 +1 @@
-8058133f72330cbc04b17e2ae56b3836  mugshot-1.1.53.tar.gz
+fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:39:15 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 20 Sep 2007 17:39:15 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-sleazy-fpu-i386.patch, NONE,
	1.1 linux-2.6-xen-sleazy-fpu-x86_64.patch, NONE,
	1.1 kernel-xen.spec, 1.57, 1.58
Message-ID: <200709202139.l8KLdFDm016596@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16354

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-sleazy-fpu-i386.patch 
	linux-2.6-xen-sleazy-fpu-x86_64.patch 
Log Message:
Fix sleazy-fpu on i386 and x86_64 under Xen



linux-2.6-xen-sleazy-fpu-i386.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-i386.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190313016 10800
# Node ID 8792a16b6dd531cad0ed28d9bef86e3e597ea8db
# Parent  35983eae211a531bd50bcd177a9da77d48631e2c
Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/entry-xen.S
--- a/arch/i386/kernel/entry-xen.S	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
@@ -950,7 +950,9 @@ device_available_emulate:
 device_available_emulate:
 #endif
 	preempt_stop(CLBR_ANY)
-	call math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	call __math_state_restore
 	jmp ret_from_exception
 	CFI_ENDPROC
 
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -597,7 +597,9 @@ struct task_struct fastcall * __switch_t
 		mcl->op      = __HYPERVISOR_fpu_taskswitch;
 		mcl->args[0] = 1;
 		mcl++;
-	}
+	} else
+		prev_p->fpu_counter = 0;
+
 #if 0 /* lazy fpu sanity check */
 	else BUG_ON(!(read_cr0() & 8));
 #endif
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1012,17 +1012,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	/* NB. 'clts' is done for us by Xen during virtual trap. */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1041,17 +1041,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	clts();		/* Allow maths ops (or we recurse) */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION

linux-2.6-xen-sleazy-fpu-x86_64.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-x86_64.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190317568 10800
# Node ID ab958de6e67d1b4f6c321cd46d2793d2409b91fd
# Parent  8792a16b6dd531cad0ed28d9bef86e3e597ea8db
x86_64: Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 16:46:08 2007 -0300
@@ -1071,7 +1071,9 @@ END(simd_coprocessor_error)
 END(simd_coprocessor_error)
 
 ENTRY(device_not_available)
-	zeroentry math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	zeroentry __math_state_restore
 END(device_not_available)
 
 	/* runs on exception stack */
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -637,7 +637,8 @@ __switch_to(struct task_struct *prev_p, 
 	if (prev_p->thread_info->status & TS_USEDFPU) {
 		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
 		HYPERVISOR_fpu_taskswitch(1);
-	}
+	} else
+		prev_p->fpu_counter = 0;
 
 	/* 
 	 * Switch the PDA context.
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1064,16 +1064,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-        /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1056,16 +1056,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-	clts();			/* Allow maths ops (or we recurse) */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 void __init trap_init(void)


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kernel-xen.spec	20 Sep 2007 18:18:24 -0000	1.57
+++ kernel-xen.spec	20 Sep 2007 21:38:43 -0000	1.58
@@ -471,6 +471,10 @@
 Patch961: linux-2.6-xen-backwards-time.patch
 Patch962: linux-2.6-xen-irq_vector-uninitialize.patch
 
+# Fix sleazy-FPU implementation
+Patch963: linux-2.6-xen-sleazy-fpu-i386.patch
+Patch964: linux-2.6-xen-sleazy-fpu-x86_64.patch
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -963,6 +967,8 @@
 %patch960 -p1
 %patch961 -p1
 %patch962 -p1
+%patch963 -p1
+%patch964 -p1
 %endif
 
 
@@ -2376,6 +2382,10 @@
 
 %changelog
 * Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
+  programs
+
+* Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add fix for bug #294011 (floating point corruption)
   (changeset 8c24767501ff from Xen 3.1.1)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:42:27 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:42:27 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.33,1.34
Message-ID: <200709202142.l8KLgRHF016731@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/hsqldb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685

Modified Files:
	hsqldb.spec 
Log Message:

- Added %%{?dist} to release, as per Fedora policy




Index: hsqldb.spec
===================================================================
RCS file: /cvs/extras/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hsqldb.spec	31 Aug 2007 18:44:20 -0000	1.33
+++ hsqldb.spec	20 Sep 2007 21:41:55 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.8
-Release:	1jpp.1
+Release:	1jpp.2%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
@@ -267,6 +267,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.8-1jpp.2
+- Added %%{?dist} to release, as per Fedora policy
+
 * Fri Aug 31 2007 Fernando Nasser <fnasser at redhat.com> 1:1.8.0.8-1jpp.1
 - Merge with upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:42:46 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 20 Sep 2007 17:42:46 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.20.0-default-theme.patch, NONE,
	1.1 gnome-screensaver.spec, 1.164, 1.165
Message-ID: <200709202142.l8KLgk3r016772@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16706

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.20.0-default-theme.patch 
Log Message:
fix default theme


gnome-screensaver-2.20.0-default-theme.patch:

--- NEW FILE gnome-screensaver-2.20.0-default-theme.patch ---
--- gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in.use-floaters-by-default	2006-06-08 16:37:39.000000000 -0400
+++ gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in	2006-07-11 10:15:54.000000000 -0400
@@ -36,7 +36,7 @@
       <applyto>/apps/gnome-screensaver/mode</applyto>
       <owner>gnome-screensaver</owner>
       <type>string</type>
-      <default>blank-only</default>
+      <default>single</default>
       <locale name="C">
         <short>Screensaver theme selection mode</short>
         <long>
@@ -55,7 +55,7 @@
       <owner>gnome-screensaver</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[screensavers-system]</default>
       <locale name="C">
         <short>Screensaver themes</short>
         <long>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnome-screensaver.spec	18 Sep 2007 03:48:28 -0000	1.164
+++ gnome-screensaver.spec	20 Sep 2007 21:42:12 -0000	1.165
@@ -13,13 +13,13 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
-Patch1: gnome-screensaver-2.15.4-default-theme.patch
+Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
@@ -130,6 +130,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Make the default theme setting work 
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:45:07 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 17:45:07 -0400
Subject: rpms/gconfmm26/devel .cvsignore, 1.9, 1.10 gconfmm.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <200709202145.l8KLj7A3016913@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gconfmm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16891

Modified Files:
	.cvsignore gconfmm.spec sources 
Log Message:
Update to new stable 2.20.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Mar 2007 14:43:55 -0000	1.9
+++ .cvsignore	20 Sep 2007 21:44:34 -0000	1.10
@@ -1 +1 @@
-gconfmm-2.18.0.tar.bz2
+gconfmm-2.20.0.tar.bz2


Index: gconfmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/gconfmm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gconfmm.spec	28 Aug 2007 22:22:42 -0000	1.16
+++ gconfmm.spec	20 Sep 2007 21:44:34 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           gconfmm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for GConf2
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 17 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new stable 2.20.0
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow GConf2 version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconfmm26/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Mar 2007 14:43:55 -0000	1.9
+++ sources	20 Sep 2007 21:44:34 -0000	1.10
@@ -1 +1 @@
-0771dde14af1443f9ac142010eb3d403  gconfmm-2.18.0.tar.bz2
+24d7e01104394229f28e32a1dc17c819  gconfmm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 21:51:29 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:51:29 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.25,
	1.26
Message-ID: <200709202151.l8KLpTPS017261@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17239

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

- Rebuild




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jakarta-commons-dbcp.spec	26 Apr 2007 00:45:37 -0000	1.25
+++ jakarta-commons-dbcp.spec	20 Sep 2007 21:50:56 -0000	1.26
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-dbcp
 Version:        1.2.1
-Release:        10jpp.1%{?dist}
+Release:        10jpp.2%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons DataBase Pooling Package
 License:        Apache Software License 
@@ -350,6 +350,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-10jpp.2
+- Rebuild
+
 * Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-10jpp.1
 - Merger with newest jpp version
 - Fix rpmlint issues



From fedora-extras-commits at redhat.com  Thu Sep 20 21:54:17 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:54:17 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.15, 1.16
Message-ID: <200709202154.l8KLsHxP017365@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jakarta-commons-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17339

Modified Files:
	jakarta-commons-validator.spec 
Log Message:

- Rebuild




Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-validator.spec	21 Aug 2006 19:03:39 -0000	1.15
+++ jakarta-commons-validator.spec	20 Sep 2007 21:53:45 -0000	1.16
@@ -41,7 +41,7 @@
 Summary:        Jakarta Commons Validator
 Name:           jakarta-%{short_name}
 Version:        1.1.4
-Release:        5jpp.1
+Release:        5jpp.2%{?dist}
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -213,6 +213,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-5jpp.2
+- Rebuild
+
 * Fri Aug 18 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-5jpp.1
 - Move rebuild-gcj-db to correct postun section
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:56:45 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:56:45 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.38, 1.39
Message-ID: <200709202156.l8KLujvi017467@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jakarta-commons-logging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17442

Modified Files:
	jakarta-commons-logging.spec 
Log Message:

- Add %%{?dist} to release as per policy




Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jakarta-commons-logging.spec	29 Aug 2007 18:47:04 -0000	1.38
+++ jakarta-commons-logging.spec	20 Sep 2007 21:56:13 -0000	1.39
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        6jpp.3
+Release:        6jpp.4%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -184,6 +184,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-6jpp.4
+- Add %%{?dist} to release as per policy
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.4-6jpp.3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 21:57:49 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:57:49 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.8, 1.9 online-desktop.spec, 
	1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200709202157.l8KLvnak017573@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17518

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Sep 2007 16:15:35 -0000	1.8
+++ .cvsignore	20 Sep 2007 21:57:17 -0000	1.9
@@ -1 +1 @@
-online-desktop-0.2.14.tar.gz
+online-desktop-0.2.15.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- online-desktop.spec	20 Sep 2007 16:31:03 -0000	1.12
+++ online-desktop.spec	20 Sep 2007 21:57:17 -0000	1.13
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.14
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -98,6 +98,7 @@
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
 %{_libdir}/pidgin/*.so
+%{_datadir}/dbus-1/services/*.service
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
 %dir %{python_sitearch}/pyonlinedesktop
@@ -186,6 +187,10 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
+- new upstream
+- dbus service
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
 - new upstream
 - become an arch package since we have binaries


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Sep 2007 16:15:35 -0000	1.8
+++ sources	20 Sep 2007 21:57:17 -0000	1.9
@@ -1 +1 @@
-0e1d8cbbcd931641c5c8dcbe9c4fae64  online-desktop-0.2.14.tar.gz
+97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:58:04 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 20 Sep 2007 17:58:04 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.6, 1.7 sources, 1.6,
	1.7
Message-ID: <200709202158.l8KLw43N017615@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17545

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- online-desktop.spec	11 Sep 2007 20:03:55 -0000	1.6
+++ online-desktop.spec	20 Sep 2007 21:57:32 -0000	1.7
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.12
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -12,15 +12,19 @@
 #X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
+Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libpurple-devel
 
 %description
 
@@ -74,6 +78,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 
 desktop-file-install --vendor="fedora"                  \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -85,19 +90,22 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/od-*
+%{_bindir}/*
 # not used yet
 %dir %{_datadir}/online-desktop
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
+%{_libdir}/pidgin/*.so
+%{_datadir}/dbus-1/services/*.service
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
-%dir %{python_sitelib}/pyonlinedesktop
-%{python_sitelib}/pyonlinedesktop/*
-%dir %{python_sitelib}/ddm
-%{python_sitelib}/ddm/*
+%dir %{python_sitearch}/pyonlinedesktop
+%{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/ddm
+%{python_sitearch}/ddm/*
+%{python_sitearch}/*.so
 %doc COPYING README
 
 %files flickr
@@ -178,10 +186,23 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+%changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
+- dbus service
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
+- new upstream
+- become an arch package since we have binaries
+- add some brs
+- use pythonsitearch
+
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
+- new upstream
+
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
+- require devilspie
 
-%changelog
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 20:03:55 -0000	1.6
+++ sources	20 Sep 2007 21:57:32 -0000	1.7
@@ -1 +1 @@
-f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz
+97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 20 21:59:11 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 17:59:11 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.20,
	1.21
Message-ID: <200709202159.l8KLxBBp017693@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jakarta-commons-pool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17675

Modified Files:
	jakarta-commons-pool.spec 
Log Message:

- Rebuild




Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-commons-pool.spec	26 Apr 2007 00:51:07 -0000	1.20
+++ jakarta-commons-pool.spec	20 Sep 2007 21:58:38 -0000	1.21
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        9jpp.2%{?dist}
+Release:        9jpp.3%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        Apache Software License
@@ -269,6 +269,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.3-9jpp.3
+- Rebuild
+
 * Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-9jpp.2
 - A couple of minor spec file changes for Fedora review
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:02:00 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:02:00 -0400
Subject: rpms/jdom/devel jdom.spec,1.17,1.18
Message-ID: <200709202202.l8KM20RQ023774@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jdom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752

Modified Files:
	jdom.spec 
Log Message:

- Add %%{?dist} as per policy




Index: jdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jdom.spec	4 Aug 2006 23:36:32 -0000	1.17
+++ jdom.spec	20 Sep 2007 22:01:27 -0000	1.18
@@ -36,7 +36,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        4jpp.1
+Release:        4jpp.2%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.0-4jpp.2
+- Add %%{?dist} as per policy
+
 * Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-4jpp.1
 - Added missing requirements.
 - Remove jaxen requirement, since we don't have it in fc yet.



From fedora-extras-commits at redhat.com  Thu Sep 20 22:03:02 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:03:02 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.19,1.20
Message-ID: <200709202203.l8KM32if023873@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23839

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mercurial.spec	20 Sep 2007 18:58:24 -0000	1.19
+++ mercurial.spec	20 Sep 2007 22:02:29 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:04:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:04:04 -0400
Subject: rpms/jrefactory/devel jrefactory.spec,1.12,1.13
Message-ID: <200709202204.l8KM44rj023995@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/jrefactory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23921

Modified Files:
	jrefactory.spec 
Log Message:

- Add %%{?dist} as per new policy




Index: jrefactory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jrefactory.spec	10 Aug 2006 22:01:29 -0000	1.12
+++ jrefactory.spec	20 Sep 2007 22:03:31 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:		jrefactory
 Version:	2.8.9
-Release:	6jpp.3
+Release:	6jpp.4%{?dist}
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
@@ -119,6 +119,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp.4
+- Add %%{?dist} as per new policy
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp.3
 - Changed release to match new spec.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:07:05 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:07:05 -0400
Subject: rpms/jsch/devel jsch.spec,1.22,1.23
Message-ID: <200709202207.l8KM75Qf024100@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/jsch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24080

Modified Files:
	jsch.spec 
Log Message:

 - Added %%{?dist} as per new policy




Index: jsch.spec
===================================================================
RCS file: /cvs/extras/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jsch.spec	8 Jun 2007 04:35:06 -0000	1.22
+++ jsch.spec	20 Sep 2007 22:06:32 -0000	1.23
@@ -36,7 +36,7 @@
 
 Name:           jsch
 Version:        0.1.31
-Release:        1jpp.1
+Release:        1jpp.2%{?dist}
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:0.1.31-1jpp.2
+- Added %%{?dist} as per new policy
+
 * Tue Jun 5 2007 Ben Konrath <bkonrath at redhat.com> - 0:0.1.31-1jpp.1
 - 0.1.31.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:11:13 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:11:13 -0400
Subject: rpms/junit/devel junit.spec,1.26,1.27
Message-ID: <200709202211.l8KMBDNX024236@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/junit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24209

Modified Files:
	junit.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id




Index: junit.spec
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- junit.spec	12 Feb 2007 23:55:11 -0000	1.26
+++ junit.spec	20 Sep 2007 22:10:41 -0000	1.27
@@ -34,7 +34,7 @@
 
 Name:           junit
 Version:        3.8.2
-Release:        3jpp.1%{?dist}
+Release:        3jpp.2%{?dist}
 Summary:        Java regression test package
 License:        CPL
 Url:            http://www.junit.org/
@@ -163,6 +163,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.2
+- Rebuild for ppc32 execmem issue and new build-id
+
 * Mon Feb 12 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 3.8.2-3jpp.1.fc7
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:14:44 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:14:44 -0400
Subject: rpms/lucene/devel lucene.spec,1.28,1.29
Message-ID: <200709202214.l8KMEiGl024663@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24536

Modified Files:
	lucene.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id




Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- lucene.spec	2 Aug 2007 19:05:03 -0000	1.28
+++ lucene.spec	20 Sep 2007 22:14:11 -0000	1.29
@@ -34,7 +34,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.9.1
-Release:        1jpp.3%{?dist}
+Release:        1jpp.4%{?dist}
 Epoch:          0
 License:        Apache Software License
 URL:            http://lucene.apache.org/
@@ -256,6 +256,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.9.1-1jpp.4
+- Rebuild for ppc32 execmem issue and new build-id
+
 * Thu Aug 02 2007 Ben Konrath <bkonrath at redhat.com> 0:1.9.1-1jpp.3
 - Cleanup packaging of OSGi manifests.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:21:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:21:04 -0400
Subject: rpms/struts/devel struts.spec,1.47,1.48
Message-ID: <200709202221.l8KML4h6024930@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24876

Modified Files:
	struts.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per new policy




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- struts.spec	27 Mar 2007 17:48:18 -0000	1.47
+++ struts.spec	20 Sep 2007 22:20:32 -0000	1.48
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.6
+Release:	4jpp.7%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -1061,6 +1061,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.7
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per new policy
+
 * Tue Mar 27 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.6
 - Rewrote pre/preun/post/postun dependencies
 - Change Pre[rR]eq -> Requires(pre)



From fedora-extras-commits at redhat.com  Thu Sep 20 22:21:54 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:21:54 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.19,1.20
Message-ID: <200709202221.l8KMLsWL025038@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24982

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mercurial.spec	20 Sep 2007 19:03:30 -0000	1.19
+++ mercurial.spec	20 Sep 2007 22:21:20 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:23:04 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 18:23:04 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.15,1.16
Message-ID: <200709202223.l8KMN4rc025245@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25170

Modified Files:
	mercurial.spec 
Log Message:
remove %{_datadir}/contrib stuff for now


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mercurial.spec	20 Sep 2007 19:04:49 -0000	1.15
+++ mercurial.spec	20 Sep 2007 22:22:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -52,9 +52,11 @@
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove %{_datadir}/contrib stuff for now
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
 - Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:23:23 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:23:23 -0400
Subject: rpms/wsdl4j/devel wsdl4j.spec,1.14,1.15
Message-ID: <200709202223.l8KMNNvV025293@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/wsdl4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25205

Modified Files:
	wsdl4j.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per new policy





Index: wsdl4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wsdl4j.spec	10 Aug 2006 23:21:44 -0000	1.14
+++ wsdl4j.spec	20 Sep 2007 22:22:51 -0000	1.15
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        4jpp.1
+Release:        4jpp.2%{?dist}
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
@@ -152,6 +152,10 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.5.2-4jpp.2
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per new policy
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 1.5.2-4jpp.1
 - Added missing requirements.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:26:16 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 18:26:16 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.16,1.17
Message-ID: <200709202226.l8KMQGS4025482@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/xjavadoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25426

Modified Files:
	xjavadoc.spec 
Log Message:

- Rebuild for ppc32 execmem issue and new build-id
- Add %%{?dist} as per policy




Index: xjavadoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xjavadoc.spec	26 Mar 2007 20:59:24 -0000	1.16
+++ xjavadoc.spec	20 Sep 2007 22:25:43 -0000	1.17
@@ -36,7 +36,7 @@
 
 Name:		xjavadoc
 Version:	1.1
-Release:	4jpp.2
+Release:	4jpp.3%{?dist}
 Epoch:		0
 Summary:	The XJavaDoc engine
 License:	BSD Style
@@ -188,6 +188,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.1-4jpp.3
+- Rebuild for ppc32 execmem issue and new build-id
+- Add %%{?dist} as per policy
+
 * Mon Mar 26 2007 Deepak Bhole <dbhole at redhat.com> 1.1-4jpp.2
 - Fixed incorrect entry in the files section
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:26:35 2007
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Thu, 20 Sep 2007 18:26:35 -0400
Subject: rpms/nss_ldap/devel nss_ldap-257-initgroups-minimum_uid.patch, 1.1, 
	1.2
Message-ID: <200709202226.l8KMQZ7g025598@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25476

Modified Files:
	nss_ldap-257-initgroups-minimum_uid.patch 
Log Message:
- add a missing call to _nss_ldap_leave(), needed for multi-threaded apps and
  just plain correctness


nss_ldap-257-initgroups-minimum_uid.patch:

Index: nss_ldap-257-initgroups-minimum_uid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap-257-initgroups-minimum_uid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss_ldap-257-initgroups-minimum_uid.patch	20 Sep 2007 19:06:55 -0000	1.1
+++ nss_ldap-257-initgroups-minimum_uid.patch	20 Sep 2007 22:26:33 -0000	1.2
@@ -1,17 +1,17 @@
 diff -ur nss_ldap/ldap-grp.c nss_ldap/ldap-grp.c
 --- nss_ldap/ldap-grp.c	2007-08-03 00:51:09.000000000 -0400
-+++ nss_ldap/ldap-grp.c	2007-09-20 14:32:14.000000000 -0400
-@@ -1068,6 +1069,13 @@
++++ nss_ldap/ldap-grp.c	2007-09-20 16:38:00.000000000 -0400
+@@ -1068,6 +1068,13 @@
        return NSS_NOTFOUND;
      }
  
 +  if (_nss_ldap_test_initgroups_minimum_uid(LA_STRING (a)))
 +    {
 +      debug ("<== " NSS_LDAP_INITGROUPS_FUNCTION " (user id below configured minimum)");
++      _nss_ldap_leave ();
 +      return NSS_NOTFOUND;
 +    }
 +
-+
    lia.backlink = _nss_ldap_test_config_flag (NSS_LDAP_FLAGS_INITGROUPS_BACKLINK);
  
    if (lia.backlink != 0)



From fedora-extras-commits at redhat.com  Thu Sep 20 22:31:23 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 20 Sep 2007 18:31:23 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.65,
	1.66 selinux-policy.spec, 1.527, 1.528
Message-ID: <200709202231.l8KMVNYN025859@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25821

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
- Fix java and mono to run in xguest account


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- policy-20070703.patch	20 Sep 2007 20:41:50 -0000	1.65
+++ policy-20070703.patch	20 Sep 2007 22:30:51 -0000	1.66
@@ -1439,7 +1439,7 @@
  application_executable_file(gconfd_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-20 18:08:22.000000000 -0400
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1448,7 +1448,7 @@
  /usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gappletviewer  --	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-@@ -20,5 +21,9 @@
+@@ -20,5 +21,11 @@
  /usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1458,9 +1458,11 @@
 +
 +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
++/usr/lib(64)?/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 08:56:23.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 17:57:24.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1480,7 +1482,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,57 @@
+@@ -166,6 +165,60 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1528,17 +1530,20 @@
 +
 +	userdom_unpriv_usertype($1, $1_java_t)
 +
-+	allow $1_java_t self:process { execheap execmem };
++	allow $1_java_t self:process { getsched sigkill execheap execmem execstack };
 +
 +	domtrans_pattern($2, java_exec_t, $1_java_t)
 +
++	dev_read_urand($1_java_t)
++	dev_read_rand($1_java_t)
++
 +	optional_policy(`
 +		xserver_xdm_rw_shm($1_java_t)
 +	')
  ')
  
  ########################################
-@@ -219,3 +269,66 @@
+@@ -219,3 +272,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -6387,7 +6392,7 @@
 +term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.0.8/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/lpd.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/lpd.if	2007-09-20 18:02:10.000000000 -0400
 @@ -394,3 +394,22 @@
  
  	domtrans_pattern($2, lpr_exec_t, $1_lpr_t)
@@ -13255,7 +13260,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 15:46:46.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 18:02:36.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -13849,7 +13854,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +882,163 @@
+@@ -954,21 +882,164 @@
  ##	</summary>
  ## </param>
  #
@@ -13965,6 +13970,7 @@
 +	userdom_poly_tmp_template($1)
 +
 +	optional_policy(`
++		cups_read_config($1_usertype)
 +		cups_stream_connect($1_usertype)
 +		cups_stream_connect_ptal($1_usertype)
 +	')
@@ -14019,7 +14025,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1047,51 @@
+@@ -977,23 +1048,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -14082,7 +14088,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1127,7 @@
+@@ -1029,15 +1128,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -14099,7 +14105,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1144,6 @@
+@@ -1054,17 +1145,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -14117,7 +14123,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1181,8 @@
+@@ -1102,6 +1182,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -14126,7 +14132,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1208,7 @@
+@@ -1127,7 +1209,7 @@
  	# $1_t local policy
  	#
  
@@ -14135,7 +14141,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1220,11 @@
+@@ -1139,7 +1221,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -14148,7 +14154,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1642,9 +1727,11 @@
+@@ -1642,9 +1728,11 @@
  template(`userdom_user_home_content',`
  	gen_require(`
  		attribute $1_file_type;
@@ -14160,7 +14166,7 @@
  	files_type($2)
  ')
  
-@@ -1894,10 +1981,46 @@
+@@ -1894,10 +1982,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14208,7 +14214,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3201,7 @@
+@@ -3078,7 +3202,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14217,7 +14223,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4738,24 @@
+@@ -4615,6 +4739,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14242,7 +14248,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4774,14 @@
+@@ -4633,6 +4775,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14257,7 +14263,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5472,7 @@
+@@ -5323,7 +5473,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14266,7 +14272,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5708,376 @@
+@@ -5559,3 +5709,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- selinux-policy.spec	20 Sep 2007 17:21:13 -0000	1.527
+++ selinux-policy.spec	20 Sep 2007 22:30:51 -0000	1.528
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
+- Fix java and mono to run in xguest account
+
 * Wed Sep 19 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-4
 - Fix to add xguest account when inititial install
 - Allow mono, java, wine to run in userdomains



From fedora-extras-commits at redhat.com  Thu Sep 20 22:34:36 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:34:36 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec,1.3342,1.3343
Message-ID: <200709202234.l8KMYaLa026025@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25989

Modified Files:
	kernel-2.6.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3342
retrieving revision 1.3343
diff -u -r1.3342 -r1.3343
--- kernel-2.6.spec	18 Sep 2007 15:08:25 -0000	1.3342
+++ kernel-2.6.spec	20 Sep 2007 22:34:02 -0000	1.3343
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable tcrypt module for crypto testing.
+
 * Tue Sep 18 2007 John W. Linville <linville at redhat.com>
 - Update bits from wireless-2.6 and wireless-dev
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:34:39 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:34:39 -0400
Subject: rpms/kernel/F-7/configs config-generic,1.335,1.336
Message-ID: <200709202234.l8KMYd0a026028@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25989/configs

Modified Files:
	config-generic 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-generic,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- config-generic	29 Aug 2007 23:43:00 -0000	1.335
+++ config-generic	20 Sep 2007 22:34:06 -0000	1.336
@@ -2891,7 +2891,7 @@
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
 
 



From fedora-extras-commits at redhat.com  Thu Sep 20 22:35:17 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Thu, 20 Sep 2007 18:35:17 -0400
Subject: rpms/kernel/devel config-generic,1.26,1.27 kernel.spec,1.174,1.175
Message-ID: <200709202235.l8KMZHg9026062@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26034

Modified Files:
	config-generic kernel.spec 
Log Message:
* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
- Enable tcrypt module for crypto testing.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-generic	20 Sep 2007 19:19:43 -0000	1.26
+++ config-generic	20 Sep 2007 22:34:44 -0000	1.27
@@ -2950,7 +2950,7 @@
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
 
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kernel.spec	20 Sep 2007 19:19:43 -0000	1.174
+++ kernel.spec	20 Sep 2007 22:34:44 -0000	1.175
@@ -1805,6 +1805,9 @@
 
 %changelog
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
+- Enable tcrypt module for crypto testing.
+
+* Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable SECMARK by default.
 
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Thu Sep 20 22:54:13 2007
From: fedora-extras-commits at redhat.com (Lawrence Lim (llim))
Date: Thu, 20 Sep 2007 18:54:13 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.31,1.32
Message-ID: <200709202254.l8KMsDEZ026481@cvs-int.fedora.redhat.com>

Author: llim

Update of /cvs/pkgs/rpms/redhat-lsb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26451

Modified Files:
	redhat-lsb.spec 
Log Message:
fix a build issue in a minimal build env


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- redhat-lsb.spec	29 Aug 2007 04:49:04 -0000	1.31
+++ redhat-lsb.spec	20 Sep 2007 22:53:38 -0000	1.32
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
@@ -58,6 +58,8 @@
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: perl, help2man
+
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -436,6 +438,9 @@
 %{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Fri Sep 21 2007 Lawrence Lim <llim at redhat.com> - 3.1-18
+- fix build issue in minimal build root (Bug #265241)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.1-17
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:06:52 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:06:52 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.20,1.21
Message-ID: <200709202306.l8KN6q9e000496@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv445

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mercurial.spec	20 Sep 2007 22:02:29 -0000	1.20
+++ mercurial.spec	20 Sep 2007 23:06:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:08:23 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:08:23 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.20,1.21
Message-ID: <200709202308.l8KN8NRm000617@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv583

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mercurial.spec	20 Sep 2007 22:21:20 -0000	1.20
+++ mercurial.spec	20 Sep 2007 23:07:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:09:18 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:09:18 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.16,1.17
Message-ID: <200709202309.l8KN9I7J000719@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv676

Modified Files:
	mercurial.spec 
Log Message:
Use %ghost on contrib, otherwise EL-4 build fails


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mercurial.spec	20 Sep 2007 22:22:31 -0000	1.16
+++ mercurial.spec	20 Sep 2007 23:08:45 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -50,10 +50,15 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
-%{_sysconfdir}/mercurial
+%{_sysconfdir}/mercurial/
+%dir %{_datadir}/mercurial/
+%ghost %{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use %ghost on contrib, otherwise EL-4 build fails
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
 - remove %{_datadir}/contrib stuff for now
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:09:50 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 20 Sep 2007 19:09:50 -0400
Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.7, 1.8 libgnomeuimm.spec,
	1.15, 1.16 sources, 1.8, 1.9
Message-ID: <200709202309.l8KN9oXP000781@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomeuimm26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv713

Modified Files:
	.cvsignore libgnomeuimm.spec sources 
Log Message:
Update to new upstream stable 2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2007 15:14:07 -0000	1.7
+++ .cvsignore	20 Sep 2007 23:09:16 -0000	1.8
@@ -1 +1 @@
-libgnomeuimm-2.18.0.tar.bz2
+libgnomeuimm-2.20.0.tar.bz2


Index: libgnomeuimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgnomeuimm.spec	28 Aug 2007 22:35:03 -0000	1.15
+++ libgnomeuimm.spec	20 Sep 2007 23:09:16 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           libgnomeuimm26
-Version:        2.18.0
+Version:        2.20.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for Gnome libs (a GUI library for X)
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 21 2007 Denis Leroy <denis at poolshark.org> - 2.20.0-1
+- Update to new upstream stable 2.20
+
 * Thu Mar 15 2007 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to Gnome 2.18, to follow libgnomeui version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeuimm26/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2007 15:14:07 -0000	1.8
+++ sources	20 Sep 2007 23:09:16 -0000	1.9
@@ -1 +1 @@
-ba42d820f535f8e7fc5d31699d484efb  libgnomeuimm-2.18.0.tar.bz2
+350d3424247611a009432395aff8619f  libgnomeuimm-2.20.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 20 23:12:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 20 Sep 2007 19:12:03 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.689, 1.690 kernel.spec, 1.175, 1.176 sources, 1.651,
	1.652 upstream, 1.573, 1.574 patch-2.6.23-rc6.bz2.sign, 1.1, NONE
Message-ID: <200709202312.l8KNC39J000893@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7-git1.bz2.sign 
Removed Files:
	patch-2.6.23-rc6.bz2.sign 
Log Message:
* Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc7-git1



--- NEW FILE patch-2.6.23-rc7-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG8sTZyGugalF9Dw4RAgpEAJ97hiDW+kubIWe3PJ3/FrJFD8g7/wCgk1p8
JcejK2yExb9mlAftels5oXE=
=WKFv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- .cvsignore	20 Sep 2007 15:23:18 -0000	1.689
+++ .cvsignore	20 Sep 2007 23:11:30 -0000	1.690
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc6-git8.bz2
+patch-2.6.23-rc7-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kernel.spec	20 Sep 2007 22:34:44 -0000	1.175
+++ kernel.spec	20 Sep 2007 23:11:30 -0000	1.176
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc7-git1
+
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable tcrypt module for crypto testing.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- sources	20 Sep 2007 15:23:18 -0000	1.651
+++ sources	20 Sep 2007 23:11:30 -0000	1.652
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
+9100900b5ffef416784752ffaf0f50a1  patch-2.6.23-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- upstream	20 Sep 2007 15:23:18 -0000	1.573
+++ upstream	20 Sep 2007 23:11:30 -0000	1.574
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
+patch-2.6.23-rc7-git1.bz2


--- patch-2.6.23-rc6.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 20 23:12:52 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 20 Sep 2007 19:12:52 -0400
Subject: rpms/junit/devel junit.spec,1.27,1.28 junit3.8.2-build.xml,1.1,1.2
Message-ID: <200709202312.l8KNCqS1000925@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/junit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv905

Modified Files:
	junit.spec junit3.8.2-build.xml 
Log Message:

- Fix location of stylesheet for javadocs




Index: junit.spec
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- junit.spec	20 Sep 2007 22:10:41 -0000	1.27
+++ junit.spec	20 Sep 2007 23:12:20 -0000	1.28
@@ -34,7 +34,7 @@
 
 Name:           junit
 Version:        3.8.2
-Release:        3jpp.2%{?dist}
+Release:        3jpp.3%{?dist}
 Summary:        Java regression test package
 License:        CPL
 Url:            http://www.junit.org/
@@ -163,6 +163,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.3
+- Fix location of stylesheet for javadocs
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> - 3.8.2-3jpp.2
 - Rebuild for ppc32 execmem issue and new build-id
 


Index: junit3.8.2-build.xml
===================================================================
RCS file: /cvs/extras/rpms/junit/devel/junit3.8.2-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- junit3.8.2-build.xml	23 Jul 2006 02:14:22 -0000	1.1
+++ junit3.8.2-build.xml	20 Sep 2007 23:12:20 -0000	1.2
@@ -64,7 +64,7 @@
 			version="false"
 			use="false"
 			windowtitle="JUnit API"
-			stylesheetfile="stylesheet.css"
+			stylesheetfile="./javadoc/stylesheet.css"
 		/>
 		<copy todir="${dist}/doc">
 			<fileset dir="doc"/>



From fedora-extras-commits at redhat.com  Thu Sep 20 23:23:32 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:23:32 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.21,1.22
Message-ID: <200709202323.l8KNNWuo001678@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1657

Modified Files:
	mercurial.spec 
Log Message:
Revert last change


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mercurial.spec	20 Sep 2007 23:06:17 -0000	1.21
+++ mercurial.spec	20 Sep 2007 23:22:59 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -51,11 +51,13 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Thu Sep 20 23:25:31 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 19:25:31 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.21,1.22
Message-ID: <200709202325.l8KNPV4I001806@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1786

Modified Files:
	mercurial.spec 
Log Message:
Revert last change


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mercurial.spec	20 Sep 2007 23:07:47 -0000	1.21
+++ mercurial.spec	20 Sep 2007 23:24:58 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -51,11 +51,13 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Fri Sep 21 00:37:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 20 Sep 2007 20:37:47 -0400
Subject: rpms/wpa_supplicant/devel fi.epitest.hostap.WPASupplicant.service, 
	NONE, 1.1 wpa_supplicant.spec, 1.28, 1.29 wpa_supplicant.service,
	1.1, NONE
Message-ID: <200709210037.l8L0blFc009577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9547

Modified Files:
	wpa_supplicant.spec 
Added Files:
	fi.epitest.hostap.WPASupplicant.service 
Removed Files:
	wpa_supplicant.service 
Log Message:
* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
- Change system bus activation file name to work around D-Bus bug that fails
    to launch services unless their .service file is named the same as the
    service itself




--- NEW FILE fi.epitest.hostap.WPASupplicant.service ---
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f
User=root



Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wpa_supplicant.spec	24 Aug 2007 17:40:37 -0000	1.28
+++ wpa_supplicant.spec	21 Sep 2007 00:37:14 -0000	1.29
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers-r1475.tar.bz2
-Source6: %{name}.service
+Source6: fi.epitest.hostap.WPASupplicant.service
 Patch0: wpa_supplicant-assoc-timeout.patch
 Patch1: wpa_supplicant-driver-wext-debug.patch
 Patch2: wpa_supplicant-wep-key-fix.patch
@@ -126,7 +126,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
-%{_datadir}/dbus-1/system-services/%{name}.service
+%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
@@ -140,6 +140,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
+- Change system bus activation file name to work around D-Bus bug that fails
+    to launch services unless their .service file is named the same as the
+    service itself
+
 * Fri Aug 24 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-7
 - Make SIGUSR1 change debug level on-the-fly; useful in combination with
     the -f switch to log output to /var/log/wpa_supplicant.log


--- wpa_supplicant.service DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 01:15:10 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 20 Sep 2007 21:15:10 -0400
Subject: rpms/perl-Archive-Extract/devel .cvsignore, 1.8,
	1.9 perl-Archive-Extract.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <200709210115.l8L1FAd8016379@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16354

Modified Files:
	.cvsignore perl-Archive-Extract.spec sources 
Log Message:
Update to 0.24.
BR Test::More.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 May 2007 21:37:17 -0000	1.8
+++ .cvsignore	21 Sep 2007 01:14:37 -0000	1.9
@@ -1 +1 @@
-Archive-Extract-0.22.tar.gz
+Archive-Extract-0.24.tar.gz


Index: perl-Archive-Extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/perl-Archive-Extract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Archive-Extract.spec	30 May 2007 21:37:17 -0000	1.8
+++ perl-Archive-Extract.spec	21 Sep 2007 01:14:37 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Archive-Extract
-Version:        0.22
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Generic archive extracting mechanism
 License:        GPL or Artistic
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional) >= 0.04
 BuildRequires:  perl(Params::Check) >= 0.07
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +49,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 20 2007 Steven Pritchard <steve at kspei.com> 0.24-1
+- Update to 0.24.
+- BR Test::More.
+
 * Wed May 30 2007 Steven Pritchard <steve at kspei.com> 0.22-1
 - Update to 0.22.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Archive-Extract/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 May 2007 21:37:17 -0000	1.8
+++ sources	21 Sep 2007 01:14:37 -0000	1.9
@@ -1 +1 @@
-a7e06d68f522383c726e986581eefd0d  Archive-Extract-0.22.tar.gz
+8dbdc264b6c52fbce859fab96928828e  Archive-Extract-0.24.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 01:20:10 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:20:10 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.17,1.18
Message-ID: <200709210120.l8L1KAAh016544@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16523

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mercurial.spec	20 Sep 2007 23:08:45 -0000	1.17
+++ mercurial.spec	21 Sep 2007 01:19:37 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -51,11 +51,16 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%dir %{_datadir}/mercurial/
-%ghost %{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/*.py[co]
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
 - Use %ghost on contrib, otherwise EL-4 build fails
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:21:58 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:21:58 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.22,1.23
Message-ID: <200709210121.l8L1Lw65016675@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16649

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mercurial.spec	20 Sep 2007 23:22:59 -0000	1.22
+++ mercurial.spec	21 Sep 2007 01:21:24 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -55,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
 - Revert last change.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:22:59 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Thu, 20 Sep 2007 21:22:59 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.22,1.23
Message-ID: <200709210122.l8L1MxTk016753@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727

Modified Files:
	mercurial.spec 
Log Message:
Change setup.py install to -O2 to get bytecompile on EL-4


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mercurial.spec	20 Sep 2007 23:24:58 -0000	1.22
+++ mercurial.spec	21 Sep 2007 01:22:26 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -27,7 +27,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -55,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
 - Revert last change.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 01:23:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 20 Sep 2007 21:23:36 -0400
Subject: rpms/darcs/devel darcs.spec,1.25,1.26
Message-ID: <200709210123.l8L1NaUA016810@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16752

Modified Files:
	darcs.spec 
Log Message:
fix the "|| :" quoting in the post install script (#295351)



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- darcs.spec	20 Sep 2007 08:25:31 -0000	1.25
+++ darcs.spec	21 Sep 2007 01:23:04 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        1.0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -76,8 +76,7 @@
 
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1
-|| :
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
 restorecon -v %{_bindir}/darcs
 
 
@@ -96,6 +95,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-6
+- fix the "|| :" quoting in the post install script (#295351)
+
 * Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.0.9-5
 - set selinux file-context for %{_bindir}/darcs
   (reported by Jim Radford, #295351)



From fedora-extras-commits at redhat.com  Fri Sep 21 02:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:26:02 -0700
Subject: [pkgdb] kdepimlibs (Fedora, 7) updated by kevin
Message-ID: <200709210226.l8L2Q3TB028026@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdepimlibs
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdepimlibs (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdepimlibs (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:25 -0700
Subject: [pkgdb] kdelibs4 was added for kkofler
Message-ID: <200709210228.l8L2SR1b028647@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package kdelibs4 with summary K Desktop Environment 4 - Libraries
Kevin Fenzi (kevin) has approved Package kdelibs4
Kevin Fenzi (kevin) has added a Fedora devel branch for kdelibs4 with an owner of kkofler
Kevin Fenzi (kevin) has approved kdelibs4 in Fedora devel
Kevin Fenzi (kevin) has approved Package kdelibs4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdelibs4 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdelibs4 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdelibs4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:53 -0700
Subject: [pkgdb] kdelibs4 (Fedora, 7) updated by kevin
Message-ID: <200709210228.l8L2SsGV016068@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdelibs4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdelibs4 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdelibs4 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:28:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:28:53 -0700
Subject: [pkgdb] kdelibs4 (Fedora, devel) updated by kevin
Message-ID: <200709210228.l8L2StRX016085@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on kdelibs4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdelibs4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:38 -0400
Subject: rpms/kdelibs4 - New directory
Message-ID: <200709210229.l8L2Tcb4024993@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4

Log Message:
Directory /cvs/extras/rpms/kdelibs4 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:42 -0400
Subject: rpms/kdelibs4/devel - New directory
Message-ID: <200709210229.l8L2TgBa025009@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4/devel

Log Message:
Directory /cvs/extras/rpms/kdelibs4/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:45 -0400
Subject: rpms/kdelibs4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709210229.l8L2TjaP025034@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdelibs4


--- NEW FILE Makefile ---
# Top level Makefile for module kdelibs4
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 02:29:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:29:47 -0400
Subject: rpms/kdelibs4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709210229.l8L2TlB2025050@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE24960/rpms/kdelibs4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdelibs4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kdelibs4
# $Id: Makefile,v 1.1 2007/09/21 02:29:45 kevin Exp $
NAME := kdelibs4
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 fedora-extras-commits at redhat.com  Fri Sep 21 02:31:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:11 -0700
Subject: [pkgdb] kdebase4 was added for kkofler
Message-ID: <200709210231.l8L2VBEr029457@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package kdebase4 with summary K Desktop Environment 4 - Core Files
Kevin Fenzi (kevin) has approved Package kdebase4
Kevin Fenzi (kevin) has added a Fedora devel branch for kdebase4 with an owner of kkofler
Kevin Fenzi (kevin) has approved kdebase4 in Fedora devel
Kevin Fenzi (kevin) has approved Package kdebase4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdebase4 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdebase4 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdebase4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:25 -0700
Subject: [pkgdb] kdebase4 (Fedora, devel) updated by kevin
Message-ID: <200709210231.l8L2VQYh029594@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora devel) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora devel) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdebase4 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 19:31:25 -0700
Subject: [pkgdb] kdebase4 (Fedora, 7) updated by kevin
Message-ID: <200709210231.l8L2VRmB029613@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for kdebase4
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kdebase4 (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora 7) for than
Kevin Fenzi (kevin) approved watchbugzilla on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved watchcommits on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved commit on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved build on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved approveacls on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) approved checkout on kdebase4 (Fedora 7) for rdieter
Kevin Fenzi (kevin) Denied cvsextras for commit access on kdebase4 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebase4



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:48 -0400
Subject: rpms/kdebase4/devel - New directory
Message-ID: <200709210231.l8L2Vm7W025305@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4/devel

Log Message:
Directory /cvs/extras/rpms/kdebase4/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:42 -0400
Subject: rpms/kdebase4 - New directory
Message-ID: <200709210231.l8L2VgJt025296@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4

Log Message:
Directory /cvs/extras/rpms/kdebase4 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:50 -0400
Subject: rpms/kdebase4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709210231.l8L2VobL025335@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4

Added Files:
	Makefile import.log 
Log Message:
Setup of module kdebase4


--- NEW FILE Makefile ---
# Top level Makefile for module kdebase4
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 02:31:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 22:31:53 -0400
Subject: rpms/kdebase4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709210231.l8L2VrJZ025351@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg25267/rpms/kdebase4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kdebase4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kdebase4
# $Id: Makefile,v 1.1 2007/09/21 02:31:51 kevin Exp $
NAME := kdebase4
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 fedora-extras-commits at redhat.com  Fri Sep 21 03:12:51 2007
From: fedora-extras-commits at redhat.com (Norman Murray (nmurray))
Date: Thu, 20 Sep 2007 23:12:51 -0400
Subject: rpms/ImageMagick/devel ImageMagick-6.3.5-multilib.patch, NONE,
	1.1 ImageMagick-6.3.5-open.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 ImageMagick.spec, 1.70, 1.71 sources, 1.19, 1.20
Message-ID: <200709210312.l8L3CpsQ032508@cvs-int.fedora.redhat.com>

Author: nmurray

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32445

Modified Files:
	.cvsignore ImageMagick.spec sources 
Added Files:
	ImageMagick-6.3.5-multilib.patch ImageMagick-6.3.5-open.patch 
Log Message:
Rebase to new version
- update multilib support patch
- fix compile issues
- add new require on jasper
- drop reference to windows fonts


ImageMagick-6.3.5-multilib.patch:

--- NEW FILE ImageMagick-6.3.5-multilib.patch ---
--- ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:11:57.000000000 +1000
+++ ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:17:18.000000000 +1000
@@ -15,28 +15,28 @@ fi
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix ImageMagick
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix ImageMagic
       ;;
     --version)
-      echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
+      pkg-config --modversion ImageMagick
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags ImageMagick
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs ImageMagick
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs ImageMagick
       ;;
     *)
       echo "${usage}" 1>&2
--- ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:11:57.000000000 +1000
+++ ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:19:17.000000000 +1000
@@ -15,28 +15,28 @@ fi
 while test $# -gt 0; do
   case $1 in
     --prefix)
-      echo @PREFIX_DIR@
+      pkg-config --variable prefix Wand
       ;;
     --exec-prefix)
-      echo @EXEC_PREFIX_DIR@
+      pkg-config --variable exec_prefix Wand
       ;;
     --version)
-      echo '@PACKAGE_VERSION@ Q at QuantumDepth@ @MAGICK_HDRI@'
+      pkg-config --modversion Wand
       ;;
     --cflags)
-      echo '@MAGICK_CFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cxxflags)
-      echo '@MAGICK_CXXFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --cppflags)
-      echo '@MAGICK_CPPFLAGS@'
+      pkg-config --cflags Wand
       ;;
     --ldflags)
-      echo '@MAGICK_LDFLAGS@'
+      pkg-config --libs Wand
       ;;
     --libs)
-      echo '@MAGICK_LIBS@ -lWand -lMagick'
+      pkg-config --libs Wand
       ;;
     *)
       echo "${usage}" 1>&2

ImageMagick-6.3.5-open.patch:

--- NEW FILE ImageMagick-6.3.5-open.patch ---
--- ImageMagick-6.3.5-9/magick/delegate.c	2007-09-11 13:20:41.000000000 +1000
+++ ImageMagick-6.3.5-9/magick/delegate.c	2007-09-18 18:27:31.000000000 +1000
@@ -769,7 +769,8 @@ static void CopyDelegateFile(const char 
   /*
     Copy source file to destination.
   */
-  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT);
+  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT,
+			S_IRUSR | S_IWUSR | S_IRGRP );
   if (destination_file == -1)
     return;
   source_file=open(source,O_RDONLY | O_BINARY);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Mar 2007 03:38:03 -0000	1.19
+++ .cvsignore	21 Sep 2007 03:12:17 -0000	1.20
@@ -1,2 +1 @@
-ImageMagick-6.2.8-0.tar.bz2
-ImageMagick-6.3.2-9.tar.bz2
+ImageMagick-6.3.5-9.tar.bz2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ImageMagick.spec	5 Apr 2007 12:18:29 -0000	1.70
+++ ImageMagick.spec	21 Sep 2007 03:12:17 -0000	1.71
@@ -1,6 +1,6 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.3.2
+%define VER 6.3.5
 %define Patchlevel 9
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -18,12 +18,9 @@
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
 %endif
 Source1: magick_small.png
-Patch1: ImageMagick-6.2.1-local_doc.patch
-Patch2: ImageMagick-6.2.8-multilib.patch
-Patch3: ImageMagick-6.3.2-perl-parallel-build.patch
-Patch4: ImageMagick-6.3.2-perl-liblink.patch
-# 235075
-Patch5: ImageMagick-6.2.8-CVE-2007-1797.patch
+Patch1: ImageMagick-6.3.5-multilib.patch
+Patch2: ImageMagick-6.3.5-open.patch
+
 
 
 Url: http://www.imagemagick.org/
@@ -34,7 +31,7 @@
 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
 BuildRequires: ghostscript-devel
 BuildRequires: perl-devel
-BuildRequires: libwmf-devel
+BuildRequires: libwmf-devel, jasper-devel
 BuildRequires: libX11-devel, libXext-devel, libXt-devel
 BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
 
@@ -65,6 +62,7 @@
 Requires: libjpeg-devel
 Requires: lcms-devel
 Requires: pkgconfig
+Requires: jasper
 
 %description devel
 ImageMagick-devel contains the static libraries and header files you'll
@@ -121,11 +119,8 @@
 
 %prep
 %setup -q -n %{name}-%{VER}
-%patch1 -p1 -b .local_doc
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .perl-build
-%patch4 -p1 -b .perl-link
-%patch5 -p1 -b .cve-2007-1797
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .open_args
 
 %build
 %configure --enable-shared \
@@ -140,7 +135,7 @@
            --with-rsvg \
 	   --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
+           --without-windows-font-dir \
 	   --without-dps
 
 make
@@ -178,7 +173,7 @@
 rm -f  $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32
@@ -261,6 +256,12 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Sep 21 2007 Norm Murray <nmurray at redhat.com> 6.3.5.9-1.fc8
+- rebase to 6.3.5.9
+- fix build with missing open() arg
+- add build require of jasper-devel, remove windows font dir
+- update multilib patch
+
 * Thu Apr  5 2007 Norm Murray <nmurray at redhat.com> 6.3.2.9-3.fc7
 - heap overflows (#235075, CVE-2007-1797)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Mar 2007 03:38:03 -0000	1.19
+++ sources	21 Sep 2007 03:12:17 -0000	1.20
@@ -1,2 +1 @@
-484cd7b62fac2164e8257449405f2563  ImageMagick-6.2.8-0.tar.bz2
-89e118517c64cac04cedf8746e0f1005  ImageMagick-6.3.2-9.tar.bz2
+d636d2113fbfe7453088bda31aa5ccbc  ImageMagick-6.3.5-9.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 03:18:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:18:49 -0700
Subject: [pkgdb] jlint (Fedora, devel) updated by kevin
Message-ID: <200709210318.l8L3IoHP010948@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of jlint in Fedora devel to jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jlint



From fedora-extras-commits at redhat.com  Fri Sep 21 03:20:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:20:17 -0700
Subject: [pkgdb] jlint (Fedora, 7) updated by kevin
Message-ID: <200709210320.l8L3KII1030863@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for jlint
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jlint (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jlint (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jlint



From fedora-extras-commits at redhat.com  Fri Sep 21 03:20:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 20 Sep 2007 20:20:17 -0700
Subject: [pkgdb] jlint (Fedora, 6) updated by kevin
Message-ID: <200709210320.l8L3KJwb030873@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for jlint
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jlint (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jlint (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jlint



From fedora-extras-commits at redhat.com  Fri Sep 21 03:28:20 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:28:20 -0400
Subject: rpms/jlint/devel Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources, 
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210328.l8L3SK3E002076@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1759/devel

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:27:47 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:27:47 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:27:47 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:27:47 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:34:33 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:34:33 -0400
Subject: rpms/jlint/F-7 Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources,
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210334.l8L3YXTZ003609@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3383

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:34:00 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:34:00 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:34:00 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:34:00 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:36:25 2007
From: fedora-extras-commits at redhat.com (Jerry James (jjames))
Date: Thu, 20 Sep 2007 23:36:25 -0400
Subject: rpms/jlint/FC-6 Makefile, 1.3, 1.4 jlint.spec, 1.11, 1.12 sources,
	1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <200709210336.l8L3aPBf004065@cvs-int.fedora.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/jlint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854

Modified Files:
	.cvsignore 
Added Files:
	Makefile jlint.spec sources 
Removed Files:
	dead.package 
Log Message:
* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
- Initial RPM after rescuing jlint from its orphaned state



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Sep 2007 03:35:53 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: jlint
+# $Id$
+NAME := jlint
+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)


Index: jlint.spec
===================================================================
RCS file: jlint.spec
diff -N jlint.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jlint.spec	21 Sep 2007 03:35:53 -0000	1.12
@@ -0,0 +1,39 @@
+Name:           jlint
+Version:        1.23
+Release:        1%{?dist}
+Summary:        Java program checker
+
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.garret.ru/~knizhnik/lang.html
+Source:         http://www.garret.ru/~knizhnik/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Jlint will check your Java code and find bugs, inconsistencies and
+synchronization problems by doing data flow analysis and building a lock
+graph.
+
+%prep
+%setup -q -n %{name}
+
+%build
+make %{?_smp_mflags} CFLAGS="-c -DNDEBUG $RPM_OPT_FLAGS" LFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+make install INSTALL_DIR="$RPM_BUILD_ROOT%{_bindir}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc ReadMe.htm *.java
+%{_bindir}/antic
+%{_bindir}/jlint
+
+%changelog
+* Tue Sep 18 2007 Jerry James <loganjerry at gmail.com> - 1.23-1
+- Initial RPM after rescuing jlint from its orphaned state


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Sep 2007 03:35:53 -0000	1.4
@@ -0,0 +1 @@
+8da9b040c53ad9c7cd56e7eea7622fc5  jlint-1.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jlint/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:59 -0000	1.2
+++ .cvsignore	21 Sep 2007 03:35:53 -0000	1.3
@@ -1 +1 @@
-jlint-1.21.tar.gz
+jlint-1.23.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 03:52:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 20 Sep 2007 23:52:44 -0400
Subject: rpms/nkf/devel .cvsignore, 1.7, 1.8 nkf.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200709210352.l8L3qi55007121@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092

Modified Files:
	.cvsignore nkf.spec sources 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 1:2.0.8b-1
- New upstream release.
- clean up the spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jul 2006 00:33:05 -0000	1.7
+++ .cvsignore	21 Sep 2007 03:52:12 -0000	1.8
@@ -5,3 +5,4 @@
 nkf205.tar.gz
 nkf206a.tar.gz
 nkf207.tar.gz
+nkf-2.0.8b.tar.gz


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nkf.spec	23 Aug 2007 13:04:24 -0000	1.23
+++ nkf.spec	21 Sep 2007 03:52:12 -0000	1.24
@@ -1,16 +1,18 @@
-%define	nkfver	nkf207
+%define		nkfver	2.0.8
 
-Summary: A Kanji code conversion filter.
-Name: nkf
-Version: 2.07
-Release: 3%{?dist}
-License: BSD
-Group: Applications/Text
-#Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar
-Source: http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/%{nkfver}.tar.gz
-Source3: nkf.copyright
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		nkf
+Epoch:		1
+Version:	2.0.8b
+Release:	1%{?dist}
+License:	BSD
+URL:		http://nkf.sourceforge.jp/
+Source0:	http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz
+Source3:	nkf.copyright
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	perl-ExtUtils-MakeMaker
 
+Summary:	A Kanji code conversion filter
+Group:		Applications/Text
 %description
 Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf
 converts input Kanji code to 7-bit JIS, MS-kanji (shifted-JIS) or
@@ -26,34 +28,36 @@
 Conversion details are specified by flags before the last argument.
 
 %prep
-%{__rm} -rf	$RPM_BUILD_ROOT
-%{__mkdir_p}	$RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p}	$RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
-
-%setup -q -n %{nkfver}
+%setup -q -n %{name}-%{nkfver}
 
 %build
 make nkf
 cp %{SOURCE3} .
-(cd NKF.mod;
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor
-)
+pushd NKF.mod
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor
+make
+popd
 
 %install
+rm -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
+
 ./nkf -e nkf.1j > nkf.1jeuc
 iconv -f euc-jp -t utf-8 nkf.1jeuc > nkf.1utf8
-install -m 755 nkf $RPM_BUILD_ROOT%{_bindir}
-install -m 644 nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
+install -m 755 -p nkf $RPM_BUILD_ROOT%{_bindir}
+install -m 644 -p nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 644 -p nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
 pushd NKF.mod
 eval `perl '-V:installarchlib'`
 eval `perl '-V:installvendorarch'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-make install
-rm -f $RPM_BUILD_ROOT/$installvendorarch/perllocal.pod \
-	${RPM_BUILD_ROOT}${installarchlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT/$installvendorarch/auto/NKF/NKF.bs
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f	$RPM_BUILD_ROOT$installvendorarch/perllocal.pod		\
+	$RPM_BUILD_ROOT$installarchlib/perllocal.pod		\
+	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.bs	\
+	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/.packlist
 popd
+chmod 0755 $RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +77,10 @@
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 1:2.0.8b-1
+- New upstream release.
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.07-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jul 2006 00:33:05 -0000	1.7
+++ sources	21 Sep 2007 03:52:12 -0000	1.8
@@ -1 +1 @@
-af11dcd3fe71d67831c020e3bfd5073b  nkf207.tar.gz
+1851260a2719629294740783c14ca3d5  nkf-2.0.8b.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 04:11:09 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:11:09 -0400
Subject: rpms/deluge/devel
	deluge-default-prefs-no-release-notifications.patch, 
	NONE, 1.1 deluge.spec, 1.27, 1.28
Message-ID: <200709210411.l8L4B9bZ013735@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/devel

Modified Files:
	deluge.spec 
Added Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Disable update notifications by default.

deluge-default-prefs-no-release-notifications.patch:

--- NEW FILE deluge-default-prefs-no-release-notifications.patch ---
--- src/pref.py	2007-09-20 19:30:08.000000000 -0700
+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
@@ -118,7 +118,7 @@
     "use_natpmp" : False,
     "use_upnp" : False,
     "use_utpex" : True,
-    "new_releases" : False,
+    "new_releases" : True,
     "window_height" : 480,
     "window_maximized" : False,
     "window_pane_position" : -1,


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- deluge.spec	12 Sep 2007 22:59:09 -0000	1.27
+++ deluge.spec	21 Sep 2007 04:10:37 -0000	1.28
@@ -13,7 +13,8 @@
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
-Patch0:		%{name}-use-mt-boost.patch
+Patch0: 	%{name}-use-mt-boost.patch
+Patch1: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +63,7 @@
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
 %patch0 -b .use-mt-boost
+%patch1 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -107,7 +109,13 @@
 
 
 %changelog
-* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+* Thu Sep 20 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-2
+- Fix release on previous %%changelog entry.
+- Disable the version update notifications by default:
+  + default-prefs-no-release-notifications.patch
+  (Resolves bug 299601: Deluge alerts of new versions)
+
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-1
 - Update to new upstream release (0.5.5)
 
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1



From fedora-extras-commits at redhat.com  Fri Sep 21 04:12:03 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:12:03 -0400
Subject: rpms/deluge/F-7 deluge-default-prefs-no-release-notifications.patch,
	NONE, 1.1 deluge.spec, 1.22, 1.23
Message-ID: <200709210412.l8L4C3uV013782@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13747/F-7

Modified Files:
	deluge.spec 
Added Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Disable update notifications by default.

deluge-default-prefs-no-release-notifications.patch:

--- NEW FILE deluge-default-prefs-no-release-notifications.patch ---
--- src/pref.py	2007-09-20 19:30:08.000000000 -0700
+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
@@ -118,7 +118,7 @@
     "use_natpmp" : False,
     "use_upnp" : False,
     "use_utpex" : True,
-    "new_releases" : False,
+    "new_releases" : True,
     "window_height" : 480,
     "window_maximized" : False,
     "window_pane_position" : -1,


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- deluge.spec	12 Sep 2007 23:13:07 -0000	1.22
+++ deluge.spec	21 Sep 2007 04:11:31 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:		deluge
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
@@ -13,6 +13,7 @@
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
+Patch0: 	%{name}-default-prefs-no-release-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +61,7 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -b .default-prefs-no-release-notifications
 
 
 %build
@@ -105,7 +107,13 @@
 
 
 %changelog
-* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5
+* Thu Sep 20 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-2
+- Fix release on previous %%changelog entry.
+- Disable the version update notifications by default:
+  + default-prefs-no-release-notifications.patch
+  (Resolves bug 299601: Deluge alerts of new versions)
+
+* Wed Sep 12 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.5-1
 - Update to new upstream release (0.5.5)
 
 * Mon Sep 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.4.1.95-1



From fedora-extras-commits at redhat.com  Fri Sep 21 04:13:32 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 00:13:32 -0400
Subject: rpms/deluge/devel deluge.spec,1.28,1.29
Message-ID: <200709210413.l8L4DW72013855@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13837/devel

Modified Files:
	deluge.spec 
Log Message:
Me == stupid. Bump release too...


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- deluge.spec	21 Sep 2007 04:10:37 -0000	1.28
+++ deluge.spec	21 Sep 2007 04:13:00 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:		deluge
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+



From fedora-extras-commits at redhat.com  Fri Sep 21 04:22:59 2007
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 21 Sep 2007 00:22:59 -0400
Subject: rpms/ghex/devel .cvsignore, 1.8, 1.9 ghex.spec, 1.19, 1.20 sources, 
	1.9, 1.10
Message-ID: <200709210422.l8L4MxRG014145@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/ghex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14133

Modified Files:
	.cvsignore ghex.spec sources 
Log Message:
* Fri Sep 21 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.20.0-1
- Update to 2.20.0










From fedora-extras-commits at redhat.com  Fri Sep 21 04:35:19 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Sep 2007 00:35:19 -0400
Subject: rpms/claws-mail/F-7 .cvsignore, 1.11, 1.12 claws-mail.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <200709210435.l8L4ZJCq014528@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14430/F-7

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2007 15:52:21 -0000	1.11
+++ .cvsignore	21 Sep 2007 04:34:46 -0000	1.12
@@ -1 +1 @@
-claws-mail-3.0.0.tar.bz2
+claws-mail-3.0.1.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail.spec	3 Sep 2007 15:52:21 -0000	1.18
+++ claws-mail.spec	21 Sep 2007 04:34:46 -0000	1.19
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.1.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,10 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Fri Sep 21 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.1-1
+- version upgrade
+
 * Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.0.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Sep 2007 15:52:21 -0000	1.11
+++ sources	21 Sep 2007 04:34:46 -0000	1.12
@@ -1 +1 @@
-9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2
+700c6b4efeb10cc33a43111c2a734db8  claws-mail-3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 04:35:22 2007
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Sep 2007 00:35:22 -0400
Subject: rpms/claws-mail/devel .cvsignore, 1.11, 1.12 claws-mail.spec, 1.18, 
	1.19 sources, 1.11, 1.12
Message-ID: <200709210435.l8L4ZMl5014537@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14430/devel

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Sep 2007 15:52:35 -0000	1.11
+++ .cvsignore	21 Sep 2007 04:34:49 -0000	1.12
@@ -1 +1 @@
-claws-mail-3.0.0.tar.bz2
+claws-mail-3.0.1.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- claws-mail.spec	3 Sep 2007 15:52:35 -0000	1.18
+++ claws-mail.spec	21 Sep 2007 04:34:49 -0000	1.19
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.0.1.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -207,6 +207,10 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Fri Sep 21 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.1-1
+- version upgrade
+
 * Mon Sep 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.0.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Sep 2007 15:52:35 -0000	1.11
+++ sources	21 Sep 2007 04:34:49 -0000	1.12
@@ -1 +1 @@
-9c6390d711b2c60840cc9138456a7cd5  claws-mail-3.0.0.tar.bz2
+700c6b4efeb10cc33a43111c2a734db8  claws-mail-3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 05:11:40 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Sep 2007 01:11:40 -0400
Subject: rpms/gettext/devel gettext.spec,1.79,1.80
Message-ID: <200709210511.l8L5BedH021378@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21350

Modified Files:
	gettext.spec 
Log Message:
- add a libs subpackage (suggested by Dwayne Bailey, #294891)
- move preloadable_libintl.so to the devel subpackage



Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gettext.spec	14 Sep 2007 12:30:24 -0000	1.79
+++ gettext.spec	21 Sep 2007 05:11:02 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -47,13 +47,13 @@
 %package devel
 Summary: Development files for %{name}
 Group: Development/Tools
-License: LGPL
+License: LGPLv2+
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: cvs
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-
 %description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
@@ -61,6 +61,15 @@
 want to add gettext support for your project.
 
 
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+License: LGPLv2+
+
+%description libs
+This package contains libraries used internationalization support.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .1-fails~
@@ -194,7 +203,6 @@
 %exclude %{_bindir}/gettextize
 %{_libdir}/libgettextlib-%{version}.so
 %{_libdir}/libgettextsrc-%{version}.so
-%{_libdir}/preloadable_libintl.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/gettextize.1.gz
@@ -224,10 +232,11 @@
 %{_datadir}/aclocal/*
 %{_includedir}/*
 %{_infodir}/autosprintf*
-%{_libdir}/libasprintf.so*
-%{_libdir}/libgettextpo.so*
+%{_libdir}/libasprintf.so
+%{_libdir}/libgettextpo.so
 %{_libdir}/libgettextlib.so
 %{_libdir}/libgettextsrc.so
+%{_libdir}/preloadable_libintl.so
 %{_mandir}/man1/gettextize.1.gz
 %{_mandir}/man1/autopoint.1.gz
 %{_mandir}/man3/*
@@ -236,7 +245,17 @@
 %{_libdir}/%{name}/gnu.gettext.*
 
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libasprintf.so.*
+%{_libdir}/libgettextpo.so.*
+
+
 %changelog
+* Fri Sep 21 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-12
+- add a libs subpackage (suggested by Dwayne Bailey, #294891)
+- move preloadable_libintl.so to the devel subpackage
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.16.1-11
 - remove gettext-xglade-include-expat-285701.patch, add
   gettext-xglade-define-xml-major-version-285701.patch to determine



From fedora-extras-commits at redhat.com  Fri Sep 21 06:43:49 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 02:43:49 -0400
Subject: fedora-security/audit fc6,1.264,1.265 fc7,1.113,1.114
Message-ID: <200709210643.l8L6hncB029256@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29230/audit

Modified Files:
	fc6 fc7 
Log Message:
kdm vulnerability



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- fc6	20 Sep 2007 08:53:35 -0000	1.264
+++ fc6	21 Sep 2007 06:43:46 -0000	1.265
@@ -23,6 +23,7 @@
 CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
 CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
+CVE-2007-4569 VULNERABLE (kdebase) #299741
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc7	20 Sep 2007 09:28:51 -0000	1.113
+++ fc7	21 Sep 2007 06:43:46 -0000	1.114
@@ -37,6 +37,7 @@
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
+CVE-2007-4569 VULNERABLE (kdebase) #299731
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal



From fedora-extras-commits at redhat.com  Fri Sep 21 06:44:29 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 02:44:29 -0400
Subject: rpms/kcc/devel kcc-2.3-timestamp.patch,NONE,1.1 kcc.spec,1.18,1.19
Message-ID: <200709210644.l8L6iTJU029333@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29260

Modified Files:
	kcc.spec 
Added Files:
	kcc-2.3-timestamp.patch 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-27
- clean up the spec file.

kcc-2.3-timestamp.patch:

--- NEW FILE kcc-2.3-timestamp.patch ---
diff -pruN kcc.orig/Makefile kcc/Makefile
--- kcc.orig/Makefile	2007-09-21 14:08:02.000000000 +0900
+++ kcc/Makefile	2007-09-21 14:08:53.000000000 +0900
@@ -34,10 +34,10 @@ install.man: $(MANPATH)/$(JMANDIR)/man1/
 
 $(BINPATH)/kcc: kcc.c
 	$(MAKE) kcc
-	$(INSTALL) kcc $(BINPATH)
+	$(INSTALL) -p kcc $(BINPATH)
 
 $(MANPATH)/$(JMANDIR)/man1/kcc.1: kcc.jman
-	$(INSTALL) -m 644 kcc.jman $@
+	$(INSTALL) -m 644 -p kcc.jman $@
 
 clean:
 	rm -f $(CMDS) $(OBJS) mon.out gmon.out make.log


Index: kcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kcc.spec	23 Aug 2007 12:09:22 -0000	1.18
+++ kcc.spec	21 Sep 2007 06:43:56 -0000	1.19
@@ -1,14 +1,16 @@
 Name:		kcc
 Version:	2.3
-Release:	26
+Release:	27
 License:	GPLv2+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## missed upstream.
 Source:		ftp://ftp.sra.co.jp/pub/os/linux/JE/sources/base/%{name}.tar.gz
 Source1:	kcc.1
 Patch0:		kcc-2.3-dontstrip.patch
 Patch1:		kcc-2.3-varargs.patch
 Patch2:		kcc-2.3-fix-segv.patch
+Patch3:		kcc-2.3-timestamp.patch
 
 Summary:	Kanji Code Converter
 Group:		Applications/Text
@@ -20,6 +22,7 @@
 %patch0 -p1 -b .dontstrip
 %patch1 -p1 -b .varargs
 %patch2 -p1 -b .segv
+%patch3 -p1 -b .timestamp
 
 %build
 make "CFLAGS=$RPM_OPT_FLAGS"
@@ -35,7 +38,7 @@
 for i in `find $RPM_BUILD_ROOT%{_mandir}/ja -type f`; do
 	iconv -f euc-jp -t utf-8 $i > $i.new && mv -f $i.new $i && chmod 444 $i
 done
-install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/kcc.1
 
 %clean
@@ -49,6 +52,9 @@
 %{_mandir}/man1/kcc.1*
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-27
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.3-26
 - Rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 07:07:55 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 03:07:55 -0400
Subject: rpms/nkf/devel nkf.spec,1.24,1.25
Message-ID: <200709210707.l8L77tRQ003367@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332

Modified Files:
	nkf.spec 
Log Message:
more clean up


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nkf.spec	21 Sep 2007 03:52:12 -0000	1.24
+++ nkf.spec	21 Sep 2007 07:07:23 -0000	1.25
@@ -31,8 +31,8 @@
 %setup -q -n %{name}-%{nkfver}
 
 %build
-make nkf
-cp %{SOURCE3} .
+make CFLAGS="$RPM_OPT_FLAGS" nkf
+cp -p %{SOURCE3} .
 pushd NKF.mod
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor
 make
@@ -40,8 +40,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
 
 ./nkf -e nkf.1j > nkf.1jeuc
 iconv -f euc-jp -t utf-8 nkf.1jeuc > nkf.1utf8
@@ -49,31 +49,29 @@
 install -m 644 -p nkf.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 -p nkf.1utf8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nkf.1
 pushd NKF.mod
-eval `perl '-V:installarchlib'`
-eval `perl '-V:installvendorarch'`
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f	$RPM_BUILD_ROOT$installvendorarch/perllocal.pod		\
-	$RPM_BUILD_ROOT$installarchlib/perllocal.pod		\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.bs	\
-	$RPM_BUILD_ROOT$installvendorarch/auto/NKF/.packlist
+rm -f	$RPM_BUILD_ROOT%{perl_vendorarch}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod		\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.bs	\
+	$RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/.packlist
 popd
-chmod 0755 $RPM_BUILD_ROOT$installvendorarch/auto/NKF/NKF.so
+chmod 0755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/NKF/NKF.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc nkf.doc nkf.copyright
 %{_bindir}/nkf
 %{_mandir}/man1/nkf.1*
 %{_mandir}/ja/man1/nkf.1*
 
 %files -n perl-NKF
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc nkf.doc nkf.copyright
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/NKF.pm
-%{_libdir}/perl5/vendor_perl/*/*-linux-*/auto
+%{perl_vendorarch}/NKF.pm
+%{perl_vendorarch}/auto
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog



From fedora-extras-commits at redhat.com  Fri Sep 21 07:40:10 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 03:40:10 -0400
Subject: fedora-security/audit fc7,1.114,1.115
Message-ID: <200709210740.l8L7eAwa004107@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4085/audit

Modified Files:
	fc7 
Log Message:
inotify-tools buffer overflow



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc7	21 Sep 2007 06:43:46 -0000	1.114
+++ fc7	21 Sep 2007 07:40:08 -0000	1.115
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031



From fedora-extras-commits at redhat.com  Fri Sep 21 08:03:53 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Fri, 21 Sep 2007 04:03:53 -0400
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.17,1.18
Message-ID: <200709210803.l8L83rDC011043@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902

Modified Files:
	nspluginwrapper.spec 
Log Message:
added original plugin dir to the package


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nspluginwrapper.spec	10 Sep 2007 08:44:43 -0000	1.17
+++ nspluginwrapper.spec	21 Sep 2007 08:03:20 -0000	1.18
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -170,6 +170,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{plugindir}
+mkdir -p $RPM_BUILD_ROOT%{pluginsourcedir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 make -C %{build_dir} install DESTDIR=$RPM_BUILD_ROOT
@@ -214,6 +215,7 @@
 %doc README COPYING NEWS
 %dir %{pkgdir}
 %dir %{plugindir}
+%dir %{pluginsourcedir}
 
 %{pkgdir}/%{plugin_config_binary}
 %{pkgdir}/npconfig
@@ -225,6 +227,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Fri Sep 21 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-3
+- added original plugin dir to the package
+
 * Mon Sep 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-2
 - added upstream patches - RPC error handling and plugin restart
 



From fedora-extras-commits at redhat.com  Fri Sep 21 08:08:07 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:08:07 -0400
Subject: rpms/cdrkit/devel cdrkit.spec, 1.5, 1.6 genisoimage-dlength.patch,
	1.1, 1.2
Message-ID: <200709210808.l8L887TE012530@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12507

Modified Files:
	cdrkit.spec genisoimage-dlength.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
- play stupid tricks, to let alternatives make the links and
  rpm not removing them afterwards
- removed bogus warning for "." and ".."



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cdrkit.spec	20 Sep 2007 15:30:53 -0000	1.5
+++ cdrkit.spec	21 Sep 2007 08:07:34 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,9 +23,8 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives 
-Requires(post): %{_sbindir}/alternatives  
-Requires(postun): %{_sbindir}/alternatives 
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -38,9 +37,8 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -58,9 +56,8 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -92,11 +89,25 @@
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
+ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n wodim
+link=`readlink %{_bindir}/cdrecord`
+if [ "$link" == "%{_bindir}/wodim" ]; then
+        rm -f %{_bindir}/cdrecord
+fi
+link=`readlink %{_bindir}/dvdrecord`
+if [ "$link" == "wodim" ]; then
+        rm -f %{_bindir}/dvdrecord
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
 		%{_bindir}/wodim 50 \
 	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
@@ -114,6 +125,11 @@
 fi
 
 %post -n genisoimage
+link=`readlink %{_bindir}/mkisofs`
+if [ "$link" == "genisoimage" ]; then
+	rm -f %{_bindir}/mkisofs
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
 		%{_bindir}/genisoimage 50 \
 	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
@@ -126,6 +142,10 @@
 fi
 
 %post -n icedax
+link=`readlink %{_bindir}/cdda2wav`
+if [ "$link" == "icedax" ]; then
+        rm -f %{_bindir}/cdda2wav
+fi
 %{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
 		%{_bindir}/icedax 50 \
 	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
@@ -142,6 +162,8 @@
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
+%ghost %{_bindir}/cdrecord
+%ghost %{_bindir}/dvdrecord
 %{_bindir}/readom
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
@@ -152,6 +174,7 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
+%ghost %{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -162,6 +185,8 @@
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
 %{_bindir}/genisoimage
+%ghost %{_bindir}/mkisofs
+%ghost %{_bindir}/mkhybrid
 %{_bindir}/isodebug
 %{_bindir}/isodump
 %{_bindir}/isoinfo
@@ -180,6 +205,11 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
+- play stupid tricks, to let alternatives make the links and
+  rpm not removing them afterwards
+- removed bogus warning for "." and ".."
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives

genisoimage-dlength.patch:

Index: genisoimage-dlength.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/genisoimage-dlength.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genisoimage-dlength.patch	20 Sep 2007 15:30:53 -0000	1.1
+++ genisoimage-dlength.patch	21 Sep 2007 08:07:34 -0000	1.2
@@ -1,7 +1,6 @@
-diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
---- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
-+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
-@@ -1596,12 +1602,10 @@
+--- cdrkit-1.1.6/genisoimage/tree.c.dlength	2007-09-21 08:38:50.000000000 +0200
++++ cdrkit-1.1.6/genisoimage/tree.c	2007-09-21 08:41:23.000000000 +0200
+@@ -1596,12 +1596,12 @@ insert_file_entry(struct directory *this
  		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
  		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
  		!S_ISDIR(lstatbuf.st_mode)) {
@@ -11,11 +10,12 @@
 -                    filetype((int) lstatbuf.st_mode), whole_path);
 -            return (0);
 -        }
-+		fprintf(stderr,
-+		"Unknown file type (%s) %s - ignoring and continuing.\n",
-+			filetype((int) lstatbuf.st_mode), whole_path);
++		if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
++			fprintf(stderr,
++			"Unknown file type (%s) %s - ignoring and continuing.\n",
++				filetype((int) lstatbuf.st_mode), whole_path);
++		}
 +		return (0);
  	}
  	/* Who knows what trash this is - ignore and continue */
  
-



From fedora-extras-commits at redhat.com  Fri Sep 21 08:10:39 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:10:39 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec, 1.6, 1.7 genisoimage-dlength.patch, 1.1,
	1.2
Message-ID: <200709210810.l8L8Adlr012676@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12642

Modified Files:
	cdrkit.spec genisoimage-dlength.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
- play stupid tricks, to let alternatives make the links and
  rpm not removing them afterwards
- removed bogus warning for "." and ".."



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrkit.spec	20 Sep 2007 15:32:20 -0000	1.6
+++ cdrkit.spec	21 Sep 2007 08:10:06 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,9 +23,8 @@
 Provides: dvdrecord = 0:0.1.5.1
 Obsoletes: cdrecord < 9:2.01-12
 Provides: cdrecord = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives 
-Requires(post): %{_sbindir}/alternatives  
-Requires(postun): %{_sbindir}/alternatives 
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n wodim
 Wodim is an application for creating audio and data CDs. Wodim
@@ -38,9 +37,8 @@
 Obsoletes: mkisofs < 9:2.01-12
 Provides: mkisofs = 9:2.01-12
 Requires: perl >= 4:5.8.1
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n genisoimage
 The genisoimage program is used as a pre-mastering program; i.e., it
@@ -58,9 +56,8 @@
 Summary: A utility for sampling/copying .wav files from digital audio CDs
 Obsoletes: cdda2wav < 9:2.01-12
 Provides: cdda2wav = 9:2.01-12
-Requires(preun): %{_sbindir}/alternatives
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -92,11 +89,25 @@
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
 perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
+ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
+ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
+ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n wodim
+link=`readlink %{_bindir}/cdrecord`
+if [ "$link" == "%{_bindir}/wodim" ]; then
+        rm -f %{_bindir}/cdrecord
+fi
+link=`readlink %{_bindir}/dvdrecord`
+if [ "$link" == "wodim" ]; then
+        rm -f %{_bindir}/dvdrecord
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
 		%{_bindir}/wodim 50 \
 	--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
@@ -114,6 +125,11 @@
 fi
 
 %post -n genisoimage
+link=`readlink %{_bindir}/mkisofs`
+if [ "$link" == "genisoimage" ]; then
+	rm -f %{_bindir}/mkisofs
+fi
+
 %{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
 		%{_bindir}/genisoimage 50 \
 	--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
@@ -126,6 +142,10 @@
 fi
 
 %post -n icedax
+link=`readlink %{_bindir}/cdda2wav`
+if [ "$link" == "icedax" ]; then
+        rm -f %{_bindir}/cdda2wav
+fi
 %{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
 		%{_bindir}/icedax 50 \
 	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
@@ -142,6 +162,8 @@
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
+%ghost %{_bindir}/cdrecord
+%ghost %{_bindir}/dvdrecord
 %{_bindir}/readom
 %{_sbindir}/netscsid
 %{_mandir}/man1/devdump.*
@@ -152,6 +174,7 @@
 %defattr(-,root,root)
 %doc doc/icedax COPYING
 %{_bindir}/icedax
+%ghost %{_bindir}/cdda2wav
 %{_bindir}/cdda2mp3
 %{_bindir}/cdda2ogg
 %{_mandir}/man1/icedax.*
@@ -162,6 +185,8 @@
 %defattr(-,root,root)
 %doc doc/genisoimage COPYING
 %{_bindir}/genisoimage
+%ghost %{_bindir}/mkisofs
+%ghost %{_bindir}/mkhybrid
 %{_bindir}/isodebug
 %{_bindir}/isodump
 %{_bindir}/isoinfo
@@ -180,6 +205,11 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
+- play stupid tricks, to let alternatives make the links and
+  rpm not removing them afterwards
+- removed bogus warning for "." and ".."
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-3
 - fixed rhbz#248262
 - switched to alternatives

genisoimage-dlength.patch:

Index: genisoimage-dlength.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/genisoimage-dlength.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genisoimage-dlength.patch	20 Sep 2007 15:25:57 -0000	1.1
+++ genisoimage-dlength.patch	21 Sep 2007 08:10:06 -0000	1.2
@@ -1,7 +1,6 @@
-diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c
---- cdrkit-1.1.6/genisoimage/tree.c	2007-09-20 16:05:13.000000000 +0200
-+++ cdrkit-1.1.2/genisoimage/tree.c	2007-09-20 16:04:52.000000000 +0200
-@@ -1596,12 +1602,10 @@
+--- cdrkit-1.1.6/genisoimage/tree.c.dlength	2007-09-21 08:38:50.000000000 +0200
++++ cdrkit-1.1.6/genisoimage/tree.c	2007-09-21 08:41:23.000000000 +0200
+@@ -1596,12 +1596,12 @@ insert_file_entry(struct directory *this
  		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
  		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
  		!S_ISDIR(lstatbuf.st_mode)) {
@@ -11,11 +10,12 @@
 -                    filetype((int) lstatbuf.st_mode), whole_path);
 -            return (0);
 -        }
-+		fprintf(stderr,
-+		"Unknown file type (%s) %s - ignoring and continuing.\n",
-+			filetype((int) lstatbuf.st_mode), whole_path);
++		if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
++			fprintf(stderr,
++			"Unknown file type (%s) %s - ignoring and continuing.\n",
++				filetype((int) lstatbuf.st_mode), whole_path);
++		}
 +		return (0);
  	}
  	/* Who knows what trash this is - ignore and continue */
  
-



From fedora-extras-commits at redhat.com  Fri Sep 21 08:18:40 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Fri, 21 Sep 2007 04:18:40 -0400
Subject: rpms/system-config-language/devel sources,1.25,1.26
Message-ID: <200709210818.l8L8IeKo012931@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12866

Modified Files:
	sources 
Log Message:
commit s-c-language-1.2.11



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Sep 2007 06:33:24 -0000	1.25
+++ sources	21 Sep 2007 08:18:08 -0000	1.26
@@ -1 +1 @@
-66c97c10249fd9a70f5886a88293c9b0  system-config-language-1.2.10.tar.bz2
+4560a8e3ae1f8eca7c9e9139ec406580  system-config-language-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 08:19:52 2007
From: fedora-extras-commits at redhat.com (Lingning Zhang (lizhang))
Date: Fri, 21 Sep 2007 04:19:52 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.32,
	1.33
Message-ID: <200709210819.l8L8Jq07012959@cvs-int.fedora.redhat.com>

Author: lizhang

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12937

Modified Files:
	system-config-language.spec 
Log Message:
fix bug294571.



Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-language.spec	20 Sep 2007 06:35:04 -0000	1.32
+++ system-config-language.spec	21 Sep 2007 08:19:20 -0000	1.33
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPL
@@ -73,6 +73,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Fri Sep 21 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.11
+- fix bug294571.
+
 * Thu Sep 20 2007 Lingning Zhang <lizhang at redhat.com> - 1.2.10
 - fix bug288851 and bug297461.
 - add the Nepali support.



From fedora-extras-commits at redhat.com  Fri Sep 21 08:47:26 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 04:47:26 -0400
Subject: rpms/nkf/devel nkf.spec,1.25,1.26
Message-ID: <200709210847.l8L8lQSU016186@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/nkf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16063

Modified Files:
	nkf.spec 
Log Message:
more clean up


Index: nkf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nkf.spec	21 Sep 2007 07:07:23 -0000	1.25
+++ nkf.spec	21 Sep 2007 08:46:54 -0000	1.26
@@ -9,7 +9,7 @@
 Source0:	http://prdownloads.sourceforge.jp/nkf/26243/%{name}-%{version}.tar.gz
 Source3:	nkf.copyright
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	perl-ExtUtils-MakeMaker
+BuildRequires:	perl(ExtUtils::MakeMaker)
 
 Summary:	A Kanji code conversion filter
 Group:		Applications/Text
@@ -71,7 +71,7 @@
 %defattr (-, root, root, -)
 %doc nkf.doc nkf.copyright
 %{perl_vendorarch}/NKF.pm
-%{perl_vendorarch}/auto
+%{perl_vendorarch}/auto/*
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog



From fedora-extras-commits at redhat.com  Fri Sep 21 08:53:33 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:53:33 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.7,1.8
Message-ID: <200709210853.l8L8rXQT017341@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17229

Modified Files:
	cdrkit.spec 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cdrkit.spec	21 Sep 2007 08:10:06 -0000	1.7
+++ cdrkit.spec	21 Sep 2007 08:53:01 -0000	1.8
@@ -1,13 +1,15 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 
 Patch1: genisoimage-dlength.patch
+Patch2: icedax-segfault.patch
+Patch3: wodim-prtypo.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .dlength
+%patch2 -p1 -b .segf
+%patch3 -p1 -b .prtypo
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -205,6 +209,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
+- fixed rhbz#255001 - icedax --devices segfaults
+- fixed rhbz#249357 - Typo in wodim output
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards



From fedora-extras-commits at redhat.com  Fri Sep 21 08:55:53 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 04:55:53 -0400
Subject: rpms/cdrkit/F-7 icedax-segfault.patch, NONE, 1.1 wodim-prtypo.patch,
	NONE, 1.1
Message-ID: <200709210855.l8L8trX4017871@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851

Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 10:39:51.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in   %d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);



From fedora-extras-commits at redhat.com  Fri Sep 21 09:01:38 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:01:38 -0400
Subject: rpms/cernlib/devel cernlib.spec,1.62,1.63
Message-ID: <200709210901.l8L91cFG025088@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21320

Modified Files:
	cernlib.spec 
Log Message:
* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
- pass --build-id when linking, this is needed for debuginfo generation
- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
- add virtual provides for devel, utils and static packages, packages 
  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
  cernlib
- don't set the environment. It only hurts parallel installations.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cernlib.spec	27 Aug 2007 21:07:07 -0000	1.62
+++ cernlib.spec	21 Sep 2007 09:01:05 -0000	1.63
@@ -44,15 +44,18 @@
 %if %{with gfortran}
 # allows to use a suffix for the library different from the suffix
 # for the utilities
-# %%define utils_suffix -gfortran
+
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+%define utils_suffix -gfortran
 %if 0%{?g77_default_compiler}
 %define compiler -gfortran
-%define utils_suffix -gfortran
+#%%define utils_suffix -gfortran
 %endif
 %else
 %if ! 0%{?g77_default_compiler}
 %define compiler -g77
-%define utils_suffix -g77
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+#%%define utils_suffix -g77
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -65,12 +68,12 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL+ and LGPLV2+
+License:       GPL+ and LGPLv2+
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -128,6 +131,8 @@
 Source203: patchy-unpack-rceta 
 
 # Shell scripts that go in /etc/profile.d
+# Currently they are not installed since tey do more harm than good, when
+# parallel cernlib versions are installed.
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -377,6 +382,7 @@
 %endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
+Provides:  cernlib(devel) = %{version}-%{release}
 
 # for the m4 macro directory ownership
 Requires: automake
@@ -398,6 +404,7 @@
 Summary:       General purpose CERN library static libraries
 Group:         Development/Libraries
 Requires:  %{name}-devel = %{version}-%{release}
+Provides:  cernlib(static) = %{version}-%{release}
 
 %description static
 CERN program library is a large collection of general purpose libraries
@@ -414,6 +421,7 @@
 Group:     Applications/System
 Requires:  %{name}-devel = %{version}-%{release}
 Requires:  %{name}-static = %{version}-%{release}
+Provides:  cernlib(utils) = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -450,7 +458,7 @@
 %package -n %{?compat}kuipc%{?utils_suffix}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
-Requires: %{name}-devel = %{version}-%{release}
+Requires: cernlib(devel)
 
 %description -n %{?compat}kuipc%{?utils_suffix}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
@@ -461,11 +469,11 @@
 with the rest of the program. Since the generated code uses KUIP routines, 
 the program must also be linked against the Packlib library that contains them.
 
-%package packlib
+%package -n cernlib-packlib%{?utils_suffix}
 Group: Applications/Archiving
 Summary: I/O, network and other utilities from the cernlib
 
-%description packlib
+%description -n cernlib-packlib%{?utils_suffix}
 I/O, network and miscalleneous utilities based on the CERN Program 
 Library. 
 According to the responsible of the cernlib debian package, some
@@ -783,6 +791,9 @@
 sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
+sed -i.utils_suffix -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{?utils_suffix}:' src/scripts/paw
+sed -i.utils_suffix -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{?utils_suffix}:' src/graflib/dzdoc/dzedit/dzedit.script
+
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
@@ -790,7 +801,7 @@
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
-  -e 's/`cernlib /cernlib%{?compiler} /' \
+  -e 's/`cernlib /`cernlib%{?compiler} /' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -841,6 +852,8 @@
 %else
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
+# this is needed (at least in F-8).
+G_LDFLAGS='-Wl,--build-id'
 %endif
 FC_COMPILER=g77
 %endif
@@ -848,6 +861,11 @@
 PATHSAVE=$PATH
 # Build patchy version 4
 pushd ../patchy
+
+if [ z"$G_LDFLAGS" != z ]; then
+	sed -i.ldflags -e "s/f77/f77 $G_LDFLAGS/" p4boot.sh
+fi
+
 %if %{with gfortran}
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
@@ -870,6 +888,12 @@
 echo "#define InstallCmd %{__install} -p" >> ${CVSCOSRC}/config/host.def
 # don't strip executables
 echo "#define InstPgmFlags -m 0755" >> ${CVSCOSRC}/config/host.def
+# this is not used for libraries
+#   echo "#define ExtraLoadOptions $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
+
+# optflags are doubled for programs because they are in FortranDebugFlags
+# and below, but they are not doubled for libs.
+echo "#define FortranLinkCmd $FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
 
 # Create the top level Makefile with imake
 cd $CERN_ROOT/build
@@ -898,9 +922,9 @@
 mv bin/paw++ bin/paw++.dynamic
 
 # Build static paw
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
   `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
   `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
 
 # Build packlib
@@ -916,7 +940,7 @@
 cp -p -r $CERN_ROOT/src/p5boot/* .
 # there is a main program in this file, so the file is removed.
 rm p5lib/nsynopt.f
-$FC_COMPILER $FC_OPTFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
 ln -s $CERN_ROOT/build/p5boot/nypatchy $CERN_ROOT/bin/ypatchy
 
 # Build npatchy
@@ -943,8 +967,8 @@
 rm -rf %{buildroot}
 
 %{__install} -d -m755 %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
 %{__install} -p -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
@@ -987,8 +1011,8 @@
 
 # add a link to pawX11 and dzeX11 from %{_libdir}/cernlib/%{verdir}/bin
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/
-%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11
-%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
+%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 
 # to preserve symlinks and timestamps
 (cd lib && tar cf - *.a) | (cd %{buildroot}%{_libdir}/cernlib/%{verdir}/lib && tar xf -)
@@ -1131,9 +1155,10 @@
 
 %files utils
 %defattr(-,root,root,-)
+%doc cernlib-%{verdir}.csh cernlib-%{verdir}.sh
 %{_bindir}/cernlib*%{?compiler}
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
 %files -n %{?compat}paw%{?utils_suffix}
@@ -1147,7 +1172,7 @@
 # paw doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/pawX11
+%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
 %{_datadir}/X11/app-defaults/*Paw++
 %{_datadir}/icons/hicolor/
 %{_mandir}/man1/paw*.1*
@@ -1165,16 +1190,16 @@
 %{_bindir}/kuipc%{?utils_suffix}
 %{_mandir}/man1/kuipc.1*
 
-%files packlib
+%files -n cernlib-packlib%{?utils_suffix}
 %defattr(-,root,root,-)
-%doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
+%doc cernlib-*/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?utils_suffix}
 %{_bindir}/cdserv%{?utils_suffix}
 %{_bindir}/dzedit%{?utils_suffix}
 # packlib doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 %{_bindir}/dzeX11%{?utils_suffix}
 %{_bindir}/fatmen%{?utils_suffix}
 %{_bindir}/fatsrv%{?utils_suffix}
@@ -1226,6 +1251,14 @@
 
 
 %changelog
+* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
+- pass --build-id when linking, this is needed for debuginfo generation
+- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
+- add virtual provides for devel, utils and static packages, packages 
+  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
+  cernlib
+- don't set the environment. It only hurts parallel installations.
+
 * Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-18
 - correct license
 - use the right debian patch source



From fedora-extras-commits at redhat.com  Fri Sep 21 09:01:56 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:01:56 -0400
Subject: rpms/cernlib-g77/devel cernlib-g77.spec,1.2,1.3
Message-ID: <200709210901.l8L91uWX025175@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib-g77/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006

Modified Files:
	cernlib-g77.spec 
Log Message:
* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
- pass --build-id when linking, this is needed for debuginfo generation
- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
- add virtual provides for devel, utils and static packages, packages 
  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
  cernlib
- don't set the environment. It only hurts parallel installations.



Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-g77.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-g77.spec	29 Aug 2007 08:40:34 -0000	1.2
+++ cernlib-g77.spec	21 Sep 2007 09:01:17 -0000	1.3
@@ -44,15 +44,18 @@
 %if %{with gfortran}
 # allows to use a suffix for the library different from the suffix
 # for the utilities
-# %%define utils_suffix -gfortran
+
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+%define utils_suffix -gfortran
 %if 0%{?g77_default_compiler}
 %define compiler -gfortran
-%define utils_suffix -gfortran
+#%%define utils_suffix -gfortran
 %endif
 %else
 %if ! 0%{?g77_default_compiler}
 %define compiler -g77
-%define utils_suffix -g77
+# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
+#%%define utils_suffix -g77
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -65,12 +68,12 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL+ and LGPLV2+
+License:       GPL+ and LGPLv2+
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -128,6 +131,8 @@
 Source203: patchy-unpack-rceta 
 
 # Shell scripts that go in /etc/profile.d
+# Currently they are not installed since tey do more harm than good, when
+# parallel cernlib versions are installed.
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -377,6 +382,7 @@
 %endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
+Provides:  cernlib(devel) = %{version}-%{release}
 
 # for the m4 macro directory ownership
 Requires: automake
@@ -398,6 +404,7 @@
 Summary:       General purpose CERN library static libraries
 Group:         Development/Libraries
 Requires:  %{name}-devel = %{version}-%{release}
+Provides:  cernlib(static) = %{version}-%{release}
 
 %description static
 CERN program library is a large collection of general purpose libraries
@@ -414,6 +421,7 @@
 Group:     Applications/System
 Requires:  %{name}-devel = %{version}-%{release}
 Requires:  %{name}-static = %{version}-%{release}
+Provides:  cernlib(utils) = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -450,7 +458,7 @@
 %package -n %{?compat}kuipc%{?utils_suffix}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
-Requires: %{name}-devel = %{version}-%{release}
+Requires: cernlib(devel)
 
 %description -n %{?compat}kuipc%{?utils_suffix}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
@@ -461,11 +469,11 @@
 with the rest of the program. Since the generated code uses KUIP routines, 
 the program must also be linked against the Packlib library that contains them.
 
-%package packlib
+%package -n cernlib-packlib%{?utils_suffix}
 Group: Applications/Archiving
 Summary: I/O, network and other utilities from the cernlib
 
-%description packlib
+%description -n cernlib-packlib%{?utils_suffix}
 I/O, network and miscalleneous utilities based on the CERN Program 
 Library. 
 According to the responsible of the cernlib debian package, some
@@ -783,6 +791,9 @@
 sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
+sed -i.utils_suffix -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{?utils_suffix}:' src/scripts/paw
+sed -i.utils_suffix -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{?utils_suffix}:' src/graflib/dzdoc/dzedit/dzedit.script
+
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
@@ -790,7 +801,7 @@
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
-  -e 's/`cernlib /cernlib%{?compiler} /' \
+  -e 's/`cernlib /`cernlib%{?compiler} /' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -841,6 +852,8 @@
 %else
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
+# this is needed (at least in F-8).
+G_LDFLAGS='-Wl,--build-id'
 %endif
 FC_COMPILER=g77
 %endif
@@ -848,6 +861,11 @@
 PATHSAVE=$PATH
 # Build patchy version 4
 pushd ../patchy
+
+if [ z"$G_LDFLAGS" != z ]; then
+	sed -i.ldflags -e "s/f77/f77 $G_LDFLAGS/" p4boot.sh
+fi
+
 %if %{with gfortran}
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
@@ -870,6 +888,12 @@
 echo "#define InstallCmd %{__install} -p" >> ${CVSCOSRC}/config/host.def
 # don't strip executables
 echo "#define InstPgmFlags -m 0755" >> ${CVSCOSRC}/config/host.def
+# this is not used for libraries
+#   echo "#define ExtraLoadOptions $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
+
+# optflags are doubled for programs because they are in FortranDebugFlags
+# and below, but they are not doubled for libs.
+echo "#define FortranLinkCmd $FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS" >> ${CVSCOSRC}/config/host.def
 
 # Create the top level Makefile with imake
 cd $CERN_ROOT/build
@@ -898,9 +922,9 @@
 mv bin/paw++ bin/paw++.dynamic
 
 # Build static paw
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
   `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11
-$FC_COMPILER $FC_OPTFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
   `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
 
 # Build packlib
@@ -916,7 +940,7 @@
 cp -p -r $CERN_ROOT/src/p5boot/* .
 # there is a main program in this file, so the file is removed.
 rm p5lib/nsynopt.f
-$FC_COMPILER $FC_OPTFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
+$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS -o nypatchy nypatchy.f p5lib/*.f  $CERN_ROOT/lib/libkernlib.a
 ln -s $CERN_ROOT/build/p5boot/nypatchy $CERN_ROOT/bin/ypatchy
 
 # Build npatchy
@@ -943,8 +967,8 @@
 rm -rf %{buildroot}
 
 %{__install} -d -m755 %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
-%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
+#%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
 %{__install} -p -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
@@ -987,8 +1011,8 @@
 
 # add a link to pawX11 and dzeX11 from %{_libdir}/cernlib/%{verdir}/bin
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/
-%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11
-%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
+%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 
 # to preserve symlinks and timestamps
 (cd lib && tar cf - *.a) | (cd %{buildroot}%{_libdir}/cernlib/%{verdir}/lib && tar xf -)
@@ -1131,9 +1155,10 @@
 
 %files utils
 %defattr(-,root,root,-)
+%doc cernlib-%{verdir}.csh cernlib-%{verdir}.sh
 %{_bindir}/cernlib*%{?compiler}
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
-%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.sh
+#%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
 %files -n %{?compat}paw%{?utils_suffix}
@@ -1147,7 +1172,7 @@
 # paw doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/pawX11
+%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
 %{_datadir}/X11/app-defaults/*Paw++
 %{_datadir}/icons/hicolor/
 %{_mandir}/man1/paw*.1*
@@ -1165,16 +1190,16 @@
 %{_bindir}/kuipc%{?utils_suffix}
 %{_mandir}/man1/kuipc.1*
 
-%files packlib
+%files -n cernlib-packlib%{?utils_suffix}
 %defattr(-,root,root,-)
-%doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
+%doc cernlib-*/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?utils_suffix}
 %{_bindir}/cdserv%{?utils_suffix}
 %{_bindir}/dzedit%{?utils_suffix}
 # packlib doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
 %{_bindir}/dzeX11%{?utils_suffix}
 %{_bindir}/fatmen%{?utils_suffix}
 %{_bindir}/fatsrv%{?utils_suffix}
@@ -1226,6 +1251,14 @@
 
 
 %changelog
+* Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
+- pass --build-id when linking, this is needed for debuginfo generation
+- use g77 binaries, paw with gfortran is broken on x86_64 (#241416)
+- add virtual provides for devel, utils and static packages, packages 
+  (like kuipc) may need the cernlib, but accept g77 or gfortran compiled 
+  cernlib
+- don't set the environment. It only hurts parallel installations.
+
 * Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-18
 - correct license
 - use the right debian patch source



From fedora-extras-commits at redhat.com  Fri Sep 21 09:09:16 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:09:16 -0400
Subject: rpms/cdrkit/F-7 wodim-prtypo.patch,1.1,1.2
Message-ID: <200709210909.l8L99Gd0026564@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26534

Modified Files:
	wodim-prtypo.patch 
Log Message:
fixed wodim print type patch

wodim-prtypo.patch:

Index: wodim-prtypo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/wodim-prtypo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wodim-prtypo.patch	21 Sep 2007 08:55:51 -0000	1.1
+++ wodim-prtypo.patch	21 Sep 2007 09:09:13 -0000	1.2
@@ -1,11 +1,20 @@
 --- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
-+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 10:39:51.000000000 +0200
++++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:02:49.000000000 +0200
 @@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
  		printf("No chance to quit anymore.");
  		goto grace_done;
  	}
 -	printf("Last chance to quit, starting %s write in  %d seconds.",
-+	printf("Last chance to quit, starting %s write in   %d seconds.",
++	printf("Last chance to quit, starting %s write in %4d seconds.",
  		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
  	flush();
  	signal(SIGINT, intr);
+@@ -1506,7 +1506,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
+ 				*didgracep = FALSE;
+ 			return (-1);
+ 		}
+-		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
++		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
+ 		flush();
+ 	}
+ grace_done:



From fedora-extras-commits at redhat.com  Fri Sep 21 09:09:32 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:09:32 -0400
Subject: rpms/cdrkit/F-7 wodim-prtypo.patch,1.2,1.3
Message-ID: <200709210909.l8L99WqU026647@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26617

Modified Files:
	wodim-prtypo.patch 
Log Message:
fixed wodim print type patch

wodim-prtypo.patch:

Index: wodim-prtypo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/wodim-prtypo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wodim-prtypo.patch	21 Sep 2007 09:09:13 -0000	1.2
+++ wodim-prtypo.patch	21 Sep 2007 09:09:30 -0000	1.3
@@ -1,5 +1,5 @@
---- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
-+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:02:49.000000000 +0200
+--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 11:06:50.000000000 +0200
++++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:06:50.000000000 +0200
 @@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
  		printf("No chance to quit anymore.");
  		goto grace_done;
@@ -9,12 +9,3 @@
  		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
  	flush();
  	signal(SIGINT, intr);
-@@ -1506,7 +1506,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
- 				*didgracep = FALSE;
- 			return (-1);
- 		}
--		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
-+		printf("\b\b\b\b\b\b\b\b\b\b\b\b\b%4d seconds.", i);
- 		flush();
- 	}
- grace_done:



From fedora-extras-commits at redhat.com  Fri Sep 21 09:25:10 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 05:25:10 -0400
Subject: rpms/cdrkit/devel icedax-segfault.patch, NONE,
	1.1 wodim-prtypo.patch, NONE, 1.1 cdrkit.spec, 1.6, 1.7
Message-ID: <200709210925.l8L9PAcX028477@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28447

Modified Files:
	cdrkit.spec 
Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 11:06:50.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 11:06:50.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in %4d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);


Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cdrkit.spec	21 Sep 2007 08:07:34 -0000	1.6
+++ cdrkit.spec	21 Sep 2007 09:24:38 -0000	1.7
@@ -1,13 +1,15 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
 Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz
 
 Patch1: genisoimage-dlength.patch
+Patch2: icedax-segfault.patch
+Patch3: wodim-prtypo.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .dlength
+%patch2 -p1 -b .segf
+%patch3 -p1 -b .prtypo
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
 
@@ -205,6 +209,10 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
+- fixed rhbz#255001 - icedax --devices segfaults
+- fixed rhbz#249357 - Typo in wodim output
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-4
 - play stupid tricks, to let alternatives make the links and
   rpm not removing them afterwards



From fedora-extras-commits at redhat.com  Fri Sep 21 09:54:06 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Sep 2007 05:54:06 -0400
Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 tetex-tex4ht-1.0-rebuild.patch, 1.1, 1.2 tetex-tex4ht.spec,
	1.11, 1.12 tetex-tex4ht-1.0-macros.patch, 1.1,
	NONE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, 1.1,
	NONE tex4ht-1.0-fix_mk4ht.patch, 1.1, NONE
Message-ID: <200709210954.l8L9s69D029435@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	.cvsignore sources tetex-tex4ht-1.0-rebuild.patch 
	tetex-tex4ht.spec 
Removed Files:
	tetex-tex4ht-1.0-macros.patch 
	tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch 
	tex4ht-1.0-fix_mk4ht.patch 
Log Message:
* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
- update to 1.0.2007_09_04_0340
- use all the debian patches
- install correctly the scripts out of bindir
- prefix ht with tex4ht- to avoid name collisions



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Aug 2007 21:51:29 -0000	1.9
+++ .cvsignore	21 Sep 2007 09:53:30 -0000	1.10
@@ -1,4 +1,4 @@
+tex4ht-1.0.2007_09_04_0340.tar.gz
 tex4ht-all-20070609.zip
-tex4ht-lit-20070717.zip
-tex4ht-1.0.2007_07_17_0228.tar.gz
-tex4ht_20060913-1.diff.gz
+tex4ht-lit-20070904.zip
+tex4ht_20070904-1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Aug 2007 21:51:29 -0000	1.10
+++ sources	21 Sep 2007 09:53:30 -0000	1.11
@@ -1,4 +1,4 @@
+dc7d1b45f9053ad3387eaadda2167b5b  tex4ht-1.0.2007_09_04_0340.tar.gz
 32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-217f977cb7e43fbb917832a8f5c77a6b  tex4ht-lit-20070717.zip
-f27125cc6da21402170faac90eeafdc5  tex4ht-1.0.2007_07_17_0228.tar.gz
-a69edc1e15d23777bc89b9f3132930b0  tex4ht_20060913-1.diff.gz
+bd797ccaf2f6819f21ce4e8827cee519  tex4ht-lit-20070904.zip
+a0650cd770a1362fb054c3cf1a3ec6b2  tex4ht_20070904-1.diff.gz

tetex-tex4ht-1.0-rebuild.patch:

Index: tetex-tex4ht-1.0-rebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht-1.0-rebuild.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-tex4ht-1.0-rebuild.patch	4 Aug 2007 21:51:29 -0000	1.1
+++ tetex-tex4ht-1.0-rebuild.patch	21 Sep 2007 09:53:30 -0000	1.2
@@ -1,240 +1,25 @@
-diff -up tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild	2007-08-04 21:22:56.000000000 +0200
-+++ tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh	2007-08-04 21:23:00.000000000 +0200
-@@ -3,6 +3,8 @@
- # This program is released into the public domain.
- # You may do whatever you please with it.
- 
-+set -x
-+
- # This script takes the literate sources for Eitan Gurari's TeX4HT
- # system and produces a directory tree like the one that is
- # distributed as a tar.gz archive. It is gleaned from the 3-4 line
-@@ -25,11 +27,17 @@
- # (b) the top-level tree of TeX4HT in src/ texmf/ bin/ 
- # (c) the Debian stuff in the subdirectory debian/
- # The new tree is built in the subdirectory dest/
-+
-+bootstrap=yes
-+[ z"$1" = 'z-k' ] && bootstrap=no
-+
- TOP=${PWD}
- LITDIR=${TOP}/lit
- DESTDIR=${TOP}/dest
- DEBDIR=${TOP}/debian
- 
-+unset  TEXINPUTS TEXMFCNF TEX4HTINPUTS T4HTINPUTS \
-+	TEX4HTFONTSET TEXINPUTS_tex4ht TEXINPUTS_t4ht
- # We need a different texmf.cnf that expands
- # TeX's memory usage. We will create this in 
- # the following directory:
-@@ -37,10 +45,10 @@ TEXMFCNF=${DESTDIR}
- # The order of directories searched for input
- # is: first the newly created files, then the
- # distributed tree and finally the existing installation.
--TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:${TOP}/texmf/tex//:
--TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:${TOP}/texmf/tex4ht/ht-fonts/:
-+TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:
-+TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:
- TEXINPUTS_tex4ht="$TEX4HTINPUTS"
- TEXINPUTS_t4ht="$T4HTINPUTS"
- 
-@@ -49,7 +57,7 @@ LC_CTYPE=C
- LANG=C
- # The installation will run some scripts like xhlatex 
- # which are installed in /usr/share/tex4ht in Debian.
--PATH=$PATH:/usr/share/tex4ht
-+PATH=$PATH:/usr/share/tex4ht:$DESTDIR/bin/linux:$DESTDIR/bin/unix
- 
- export LANG LC_CTYPE PATH
- 
-@@ -57,7 +65,7 @@ export LANG LC_CTYPE PATH
- function texclean()
- {
- 
--	rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc}
-+	rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc} mktex4ht.cnf
- 
- }
- 
-@@ -66,7 +74,9 @@ function texclean()
- function mkdirheir()
- {
- 	mkdir -p ${DESTDIR}/texmf/tex/generic/tex4ht
--	mkdir -p ${DESTDIR}/bin/{unix,win32}
-+	# these files are required for bootstrap, see below
-+	cp ${TOP}/texmf/tex/generic/tex4ht/{tex4ht,html4-math,html4,info4ht,infoht4,infomml}.4ht ${DESTDIR}/texmf/tex/generic/tex4ht
-+	mkdir -p ${DESTDIR}/bin/{unix,win32,linux}
- 	mkdir -p ${DESTDIR}/texmf/tex4ht/{xttl,bin,ht-fonts}
- 	mkdir -p ${DESTDIR}/texmf/tex4ht/base/{unix,win32}
- 	mkdir -p ${DESTDIR}/src
-@@ -119,27 +129,78 @@ function movefiles()
- [ -d ${LITDIR} -a -d ${DEBDIR} ] || \
- (echo "Must be in top-level source directory to run this"; exit 0)
- 
-+# the trick is to avoid argument list too long for rm!
-+[ $bootstrap = 'yes' ] && rm -rf ${DESTDIR}/*.htf && rm -rf ${DESTDIR}/*
-+
- # Initialise the working environment
- mkdirheir
- makesomefiles
- setupenv
-+
- cd $DESTDIR
- 
-+if [ $bootstrap = 'yes' ]; then
-+# make some 4ht files. This creates th4.4ht.
-+tex tex4ht-4ht || exit 1
-+# Now make tex4ht.sty. Indeed tex4ht-4ht and other tex files require 
-+# tex4ht.sty to do the other 4ht files
-+tex tex4ht-sty || exit 1
-+# Make cond4ht.4ht, required for next tex4ht-4ht run.
-+tex tex4ht-cond4ht || exit 1
-+# now that th4.4ht is present, mktex4ht.4ht files is created, by using
-+# tex4ht.sty. It is during that run that {tex4ht,html4-math,html4}.4ht
-+# are required.
-+tex tex4ht-4ht || exit 1
-+# creates tex4ht.4ht. Needs {info4ht,infoht4,infomml}.4ht 
-+latex tex4ht-options || exit 1
-+# remaining 4ht files required for bootstrap
-+for htype in html4 info info-html4 info-mml; do
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+done
-+# now that bootstrap is done remove the bootstrap files, and replace them
-+# with the generated files
-+rm texmf/tex/generic/tex4ht/*
-+movefiles
-+texclean
-+
-+# restart everything with the bootstraped files
-+tex tex4ht-sty || exit 1
-+tex tex4ht-cond4ht || exit 1
-+tex tex4ht-4ht || exit 1
-+latex tex4ht-options || exit 1
-+for htype in html4 info info-html4 info-mml; do
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex
-+done
-+# install bootstrapped 4ht files
-+movefiles
-+texclean
-+fi
-+
-+# now start the build from the beginning
-+
- # Make tex4ht.c
--tex tex4ht-c
-+tex tex4ht-c || exit 1
- 
- # Make t4ht.c
--tex tex4ht-t4ht
-+tex tex4ht-t4ht || exit 1
-+
-+# Make htcmd
-+tex tex4ht-htcmd || exit 1
- 
- # Make scripts
--latex tex4ht-mkht
--latex ./mkht-scripts.4ht
-+latex tex4ht-mkht || exit 1
-+perl -c mk4ht.perl || exit 1
-+latex ./mkht-scripts.4ht || exit 1
- 
- # Make tex4ht.sty
- tex tex4ht-sty
- 
- # Make tex4ht.env
--latex tex4ht-env
-+latex tex4ht-env || exit 1
- 
- # Make basic 4ht files
- tex tex4ht-4ht
-@@ -151,7 +212,19 @@ latex tex4ht-options
- movefiles
- texclean
- 
--# For html ht styles. It is important that
-+# set the script executables
-+chmod a+x bin/unix/*
-+
-+if [ $bootstrap = 'yes' ]; then
-+# compile the executables
-+	for file in src/*.c; do
-+		basefile=`basename $file .c`
-+		#cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile || exit 1
-+		cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile -lkpathsea || exit 1
-+	done
-+fi
-+
-+# For 23 html ht styles. It is important that
- # The current directory be the last in the search
- # path for some of these builds to work.
- for htype in html4 html-speech info info-mml info-html4 \
-@@ -159,7 +232,7 @@ for htype in html4 html-speech info info
-     	jsmath javahelp info-javahelp mathml mathltx mathplayer \
-     	moz ooffice info-ooffice tei svg word unicode bibtex2
- do
--	latex tex4ht-${htype}.tex
-+	latex tex4ht-${htype}.tex || exit 1
- 	latex tex4ht-${htype}.tex
- 	latex tex4ht-${htype}.tex
- 	movefiles
-@@ -168,23 +241,32 @@ done
+diff -up tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild	2007-09-21 07:52:12.000000000 +0200
++++ tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh	2007-09-21 08:01:07.000000000 +0200
+@@ -260,11 +260,17 @@ done
  
  # The xttl files are for the experimental speech support.
  # These are built using xhlatex.
++# use javac
++# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
+ htlatex xtpipes "xhtml,3,next" "" "-d./"
 -xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
 -xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
 -xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+# xtpipes is missing? jsml.4ht is then missing as are the java files
-+# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
-+#htlatex xtpipes "xhtml,3,next" "" "-d./" || exit 1
-+xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./" || exit 1
-+htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech "html,3,sections+" || exit 1
+-htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++#htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
+ xhlatex tex4ht-html-speech "html,3,sections+"
  
  movefiles
- texclean
- 
- # Make font files. The Needs directives in this file cause "t4ht" to
- # move the files into their correct locations automatically.
--tex tex4ht-fonts-noncjk
--tex tex4ht-fonts-noncjk
--tex4ht tex4ht-fonts-noncjk
--t4ht tex4ht-fonts-noncjk
--latex tex4ht-fonts-4hf
--latex tex4ht-fonts-4hf
--tex4ht tex4ht-fonts-4hf
--t4ht tex4ht-fonts-4hf
-+for font in noncjk cjk; do
-+tex tex4ht-fonts-${font}
-+tex tex4ht-fonts-${font}
-+tex4ht tex4ht-fonts-${font}
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
-+for font in 4hf; do
-+latex tex4ht-fonts-${font} 
-+latex tex4ht-fonts-${font} 
-+tex4ht tex4ht-fonts-${font} 
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
- 
- movefiles
- texclean
-@@ -192,4 +274,6 @@ texclean
- # That's it.
- 
- exit 0
--wripro.tex
-+# latex tex4ht-auto-script fails, and the scripts don't seem to be shipped
-+# tex4ht-fonts-modern.tex lacks a preamble
-+# what is wripro.tex?


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tetex-tex4ht.spec	9 Aug 2007 13:16:16 -0000	1.11
+++ tetex-tex4ht.spec	21 Sep 2007 09:53:30 -0000	1.12
@@ -1,10 +1,12 @@
 %{!?_texmf: %define _texmf %(eval "[ -x /usr/bin/kpsewhich ] && echo `kpsewhich -expand-var '$TEXMFMAIN'` || echo %{_datadir}/texmf")}
 
+%define _scriptsdir %{_datadir}/tex4ht
+
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_07_17_0228
+Version:       1.0.2007_09_04_0340
 Release:       1%{?dist}
-License:       LaTeX
+License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
 Source0:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-%{version}.tar.gz
@@ -16,29 +18,22 @@
 Source2:       tex4ht-lppl.txt
 # unversioned upstream litteral source, downloaded with wget -N
 #Source3:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3:       tex4ht-lit-20070717.zip
+Source3:       tex4ht-lit-20070904.zip
 Source4:       http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
 Source5:       http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
 Source6:       http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
 Source7:       http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
-#Patch0:        tex4ht-1.0.2006_10_24_0142-paths.patch
 # debian
-Patch1:         http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
+Patch1:         http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20070904-1.diff.gz
 # patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
 Patch2:        texmf.cnf.patch
 # update debian rebuild script
 Patch3:        tetex-tex4ht-1.0-rebuild.patch
-# if building from literate sources, install xtpipes files in dest
-#Patch4:        tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
-# rebased from debian
-Patch5:        tex4ht-1.0-fix_mk4ht.patch
-# add required macros to tex4ht-4ht.tex for bootstrap of rebuild from
-# literate sources
-Patch6:        tetex-tex4ht-1.0-macros.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /usr/bin/kpsewhich
 BuildRequires:  tetex-fonts
+BuildRequires:  java-devel /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
 # pnmcrop and pnmtopng are in netpbm-progs. 
@@ -48,6 +43,7 @@
 # dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
 # dvipng is in tetex. tetex-latex depends on tetex.
 Requires:       tetex-latex
+Requires:       java
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -68,11 +64,6 @@
 # debian patch
 %patch1 -p1
 
-# apply debian path which avoids using xtpipes since we cannot compile it
-# debian patch doesn't apply anymore to newer source
-#patch -p1 -b -z .fix_mk4ht < debian/patches/fix_mk4ht.diff
-%patch5 -p1 -b .fix_mk4ht
-
 chmod a-x src/*.c
 cp -p %{SOURCE2} lppl.txt
 # unzip the all source for the doc
@@ -86,19 +77,24 @@
   unzip %{SOURCE3}
   chmod 0644 *.tex
 popd
-# patch literate sources
-%patch6 -p1 -b .macros
 
 cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
 
-# avoid duplicating the debian patches while still allowing to rebuild
-# from literate sources
+# avoid duplicating the debian patches
+# used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/add_manpage.diff
+# not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/fix_mk4ht.diff
+# hardcoded /usr/share
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+
 patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
 patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
 #%patch4 -p1 -b .nohome
 
-patch -p1 < debian/patches/add_manpage.diff
-
 cp -p %{PATCH2} debian/lit/
 
 %patch3 -p1 -b .rebuild
@@ -120,24 +116,42 @@
 LDFLAGS=-lkpathsea
 gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
 gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
+
+# adapted from debian Makefile
+mkdir class
+javac -d class -source 1.5 java/*.java java/xtpipes/*.java java/xtpipes/util/*.java
+fastjar -c -f tex4ht.jar -m java/manifest -C class .
 popd
 
+# beware of the %% that have to be protected as %%%%
+sed \
+  -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
+  -e "s;^tpath/tex/;t%{_texmf}/;" \
+  -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+ texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d -m755 $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_scriptsdir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
 #install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
+install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
+for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
+  install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
+done
+install -p -m755 bin/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m644 src/tex4ht.jar $RPM_BUILD_ROOT%{_scriptsdir}
 
-pushd texmf
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
-cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+cp tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 
+pushd texmf
 cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+cp -pr tex4ht/xtpipes $RPM_BUILD_ROOT%{_texmf}/tex4ht
 
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex/generic
 cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
 popd
 
@@ -147,7 +161,7 @@
    > README.kpathsea 
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-sed -e 's;@SCRIPTSDIR@;%{_bindir};' \
+sed -e 's;@SCRIPTSDIR@;%{_scriptsdir};' \
  -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
  -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \
  -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \
@@ -161,7 +175,12 @@
 %defattr(-,root,root,-)
 %{_texmf}/tex4ht/
 %{_texmf}/tex/generic/tex4ht/
-%{_bindir}/*
+%{_bindir}/ht*
+%{_bindir}/tex4ht-ht
+%{_bindir}/mk4ht
+%{_bindir}/tex4ht
+%{_bindir}/t4ht
+%{_scriptsdir}/
 %{_mandir}/man1/tex4ht.1*
 %doc lppl.txt doc tutorial README.kpathsea 
 
@@ -172,6 +191,12 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
+- update to 1.0.2007_09_04_0340
+- use all the debian patches
+- install correctly the scripts out of bindir
+- prefix ht with tex4ht- to avoid name collisions
+
 * Sat Aug  4 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_07_17_0228-1
 - update to 1.0.2007_07_17_0228
 - rename tetex-tex4ht-1.0-prev.patch to tetex-tex4ht-1.0-rebuild.patch


--- tetex-tex4ht-1.0-macros.patch DELETED ---


--- tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch DELETED ---


--- tex4ht-1.0-fix_mk4ht.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 10:03:41 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 21 Sep 2007 06:03:41 -0400
Subject: rpms/pygsl/devel pygsl.spec,1.13,1.14
Message-ID: <200709211003.l8LA3fif003134@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3107

Modified Files:
	pygsl.spec 
Log Message:
* Fri Sep 21 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
- License clarification.
- Use swig to regenerate the wrappers.
- Rebuild with gsl-1.10.
- Add explicit dependency on gsl version.



Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pygsl.spec	30 Aug 2007 08:32:33 -0000	1.13
+++ pygsl.spec	21 Sep 2007 10:03:06 -0000	1.14
@@ -2,11 +2,15 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
+%{expand: %%define gslver %(gsl-config --version)}
+
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.1
-Release:       5%{?dist}
-License:       GPLv2
+Release:       6%{?dist}
+# The package is mostly GPL+ but there are two scripts
+# GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
+License:       GPLv2+
 Group:         Development/Libraries
 
 Url:           http://pygsl.sourceforge.net
@@ -17,7 +21,10 @@
 BuildRequires: numpy
 BuildRequires: gsl-devel
 BuildRequires: python-devel
+# Only need if the generated sources are different from the version used in source
+BuildRequires: swig
 Requires:      numpy
+Requires:      gsl = %{gslver}
 
 %description
 This project provides a python interface for the GNU scientific library (gsl)
@@ -27,7 +34,7 @@
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      python-devel
-Requires:      gsl-devel
+Requires:      gsl-devel = %{gslver}
 
 %description devel
 Development files for pygsl
@@ -37,6 +44,7 @@
 
 %build
 cp %{SOURCE1} .
+rm -f swig_src/gslwrap_wrap.c
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
@@ -58,6 +66,12 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-6
+- License clarification.
+- Use swig to regenerate the wrappers.
+- Rebuild with gsl-1.10.
+- Add explicit dependency on gsl version.
+
 * Thu Aug 30 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 0.9.1-5
 - Fix typo in Requires for subpackage devel.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 11:18:27 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Fri, 21 Sep 2007 07:18:27 -0400
Subject: rpms/xulrunner/devel xulrunner.spec, 1.18,
	1.19 firefox-1.5-ppc64.patch, 1.2, NONE
Message-ID: <200709211118.l8LBIR2U010785@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760

Modified Files:
	xulrunner.spec 
Removed Files:
	firefox-1.5-ppc64.patch 
Log Message:
removed firefox-1.5-ppc64.patch and package clean-up




Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xulrunner.spec	20 Sep 2007 18:02:04 -0000	1.18
+++ xulrunner.spec	21 Sep 2007 11:17:54 -0000	1.19
@@ -7,8 +7,6 @@
 
 %define official_branding 0
 
-#ExcludeArch: ppc64 ppc
-
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
@@ -45,8 +43,7 @@
 # font system fixes
 
 # Other
-#Patch104:       firefox-1.5-ppc64.patch
-Patch105:       mozilla-firefox-head.ppc64.patch
+Patch104:       mozilla-firefox-head.ppc64.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -124,8 +121,7 @@
 %patch2   -R -p1 -b .camellia256
 %patch3   -p1
 
-#%patch104 -p1 -b .ppc64
-%patch105 -p0 -b .ppc64
+%patch104 -p0 -b .ppc64
 
 # For branding specific patches.
 


--- firefox-1.5-ppc64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 12:01:56 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?= (jmoskovc))
Date: Fri, 21 Sep 2007 08:01:56 -0400
Subject: rpms/rcs/devel rcs-5.7-newsvnsyntax.patch, NONE, 1.1 rcs.spec, 1.18,
	1.19
Message-ID: <200709211201.l8LC1u5q018148@cvs-int.fedora.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/rcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098

Modified Files:
	rcs.spec 
Added Files:
	rcs-5.7-newsvnsyntax.patch 
Log Message:
Fixed new SVN tag syntax.


rcs-5.7-newsvnsyntax.patch:

--- NEW FILE rcs-5.7-newsvnsyntax.patch ---
diff -rup rcs-5.7/src/ident.c rcs-5.7mzk/src/ident.c
--- rcs-5.7/src/ident.c	1995-06-16 08:19:24.000000000 +0200
+++ rcs-5.7mzk/src/ident.c	2007-07-17 15:23:15.000000000 +0200
@@ -228,12 +228,18 @@ match(fp)   /* group substring between t
    char line[BUFSIZ];
    register int c;
    register char * tp;
+   int COLON_C = 0;
+   int MAX_COLON = 1;
 
    tp = line;
-   while ((c = getc(fp)) != VDELIM) {
+   while ((c = getc(fp)) && (COLON_C < MAX_COLON)) {
       if (c == EOF  &&  feof(fp) | ferror(fp))
 	 return c;
       switch (ctab[c]) {
+     case COLON:
+                *tp++ = c;
+                COLON_C++;
+                break;
 	 case LETTER: case Letter:
 	    *tp++ = c;
 	    if (tp < line+sizeof(line)-4)
@@ -245,7 +251,12 @@ match(fp)   /* group substring between t
    }
    if (tp == line)
       return c;
-   *tp++ = c;
+      if(c == ' '){
+          ungetc(c,fp);
+      }
+      else{
+          *tp++ = c;
+      }
    if ((c = getc(fp)) != ' ')
       return c ? c : '\n';
    *tp++ = c;


Index: rcs.spec
===================================================================
RCS file: /cvs/extras/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rcs.spec	12 Jul 2006 07:57:51 -0000	1.18
+++ rcs.spec	21 Sep 2007 12:01:22 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 30.1
+Release: 31
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -10,6 +10,7 @@
 Patch1: rcs-5.7-security.patch
 Patch2: rcs-5.7-sameuserlocks.patch
 Patch3: rcs-5.7-option.patch
+Patch4: rcs-5.7-newsvnsyntax.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .security
 %patch2 -p1 -b .sameuserlocks
 %patch3 -p1 -b .option
+%patch4 -p1 -b .newsvnsyntax
 
 autoconf
 
@@ -56,6 +58,10 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Jul 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 5.7-31
+- Addded support for new svn syntax.
+- Resolves: #247998
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 12:05:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Fri, 21 Sep 2007 08:05:05 -0400
Subject: rpms/mrtg/devel filter-provides-mrtg.sh,1.1,1.2
Message-ID: <200709211205.l8LC55MW018265@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/mrtg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18227

Modified Files:
	filter-provides-mrtg.sh 
Log Message:
fix filter-provides script


Index: filter-provides-mrtg.sh
===================================================================
RCS file: /cvs/extras/rpms/mrtg/devel/filter-provides-mrtg.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filter-provides-mrtg.sh	20 Sep 2007 09:21:13 -0000	1.1
+++ filter-provides-mrtg.sh	21 Sep 2007 12:04:33 -0000	1.2
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 /usr/lib/rpm/find-provides "$@" | grep -v 'perl(\(SNMP_util\|SNMP_Session\|BER\))'
+exit 0



From fedora-extras-commits at redhat.com  Fri Sep 21 12:48:21 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 08:48:21 -0400
Subject: rpms/cups/devel cups-str2512.patch,1.2,1.3 cups.spec,1.362,1.363
Message-ID: <200709211248.l8LCmL56019796@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19769

Modified Files:
	cups.spec 
Added Files:
	cups-str2512.patch 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
- Write printcap when remote printers have timed out (bug #290831).


cups-str2512.patch:

Index: cups-str2512.patch
===================================================================
RCS file: cups-str2512.patch
diff -N cups-str2512.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cups-str2512.patch	21 Sep 2007 12:48:18 -0000	1.3
@@ -0,0 +1,11 @@
+diff -up cups-1.3.2/scheduler/dirsvc.c.str2512 cups-1.3.2/scheduler/dirsvc.c
+--- cups-1.3.2/scheduler/dirsvc.c.str2512	2007-09-21 13:46:23.000000000 +0100
++++ cups-1.3.2/scheduler/dirsvc.c	2007-09-21 13:46:54.000000000 +0100
+@@ -912,6 +912,7 @@ cupsdSendBrowseList(void)
+         cupsArraySave(Printers);
+         cupsdDeletePrinter(p, 1);
+         cupsArrayRestore(Printers);
++        cupsdWritePrintcap();
+       }
+     }
+   }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- cups.spec	19 Sep 2007 12:17:39 -0000	1.362
+++ cups.spec	21 Sep 2007 12:48:18 -0000	1.363
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -38,6 +38,7 @@
 Patch12: cups-wbuffer.patch
 Patch13: cups-direct-usb.patch
 Patch14: cups-lpr-help.patch
+Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
@@ -147,6 +148,7 @@
 %patch12 -p1 -b .wbuffer
 %patch13 -p1 -b .direct-usb
 %patch14 -p1 -b .lpr-help
+%patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
@@ -443,6 +445,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
+- Write printcap when remote printers have timed out (bug #290831).
+
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-1
 - Include Till Kamppeter's dnssd backend.
 - 1.3.2.



From fedora-extras-commits at redhat.com  Fri Sep 21 12:50:57 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 08:50:57 -0400
Subject: rpms/kdepim/devel sources,1.40.6.1,1.40.6.2
Message-ID: <200709211250.l8LCovHB020042@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Modified Files:
      Tag: kdepim-enterprise-branch
	sources 
Log Message:
fix corrupted/truncated sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40.6.1
retrieving revision 1.40.6.2
diff -u -r1.40.6.1 -r1.40.6.2
--- sources	20 Sep 2007 18:10:00 -0000	1.40.6.1
+++ sources	21 Sep 2007 12:50:24 -0000	1.40.6.2
@@ -1,4 +1,4 @@
 024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
 496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
 fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
-23d93b3a795d7dd84331549fa3e95c29  kdepim-enterprise-svn_r714749.tar.bz2
+f6fe9c4ca9f3407e9a79aba22e478726  kdepim-enterprise-svn_r714749.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 12:52:33 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 08:52:33 -0400
Subject: rpms/kdepim/devel kdepim.spec, 1.131.4.1,
	1.131.4.2 kdepim-3.5.7-kde#140549.patch, 1.1, NONE
Message-ID: <200709211252.l8LCqXRM020190@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20123

Modified Files:
      Tag: kdepim-enterprise-branch
	kdepim.spec 
Removed Files:
      Tag: kdepim-enterprise-branch
	kdepim-3.5.7-kde#140549.patch 
Log Message:
omit upstreamed patch
fix %%debug macro usage



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131.4.1
retrieving revision 1.131.4.2
diff -u -r1.131.4.1 -r1.131.4.2
--- kdepim.spec	20 Sep 2007 18:10:00 -0000	1.131.4.1
+++ kdepim.spec	21 Sep 2007 12:52:01 -0000	1.131.4.2
@@ -38,8 +38,6 @@
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -120,15 +118,15 @@
 %setup -q %{?ent_date: -n %{name}}
 
 %ifarch s390 s390x
+# FIXME: use KDE_NO_COMPILE=kpilot and/or --without-pilot-link  -- Rex
 %patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
 install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+#patch4 -p1 -b .libz
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -143,7 +141,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-   %{?debug:--disable-debug --disable-warnings} \
+   %{!?debug:--disable-debug --disable-warnings} \
    %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \


--- kdepim-3.5.7-kde#140549.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 13:01:31 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 21 Sep 2007 09:01:31 -0400
Subject: rpms/calc/devel .cvsignore,1.2,1.3 calc.spec,1.3,1.4
Message-ID: <200709211301.l8LD1VDf026513@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20467

Modified Files:
	.cvsignore calc.spec 
Log Message:
* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
  to Denis Leroy and David Woodhouse. RH Bug #299581.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2007 17:16:44 -0000	1.2
+++ .cvsignore	21 Sep 2007 13:00:58 -0000	1.3
@@ -1 +1,2 @@
 calc-2.12.2.1.tar.gz
+clog


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/devel/calc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- calc.spec	20 Sep 2007 18:26:06 -0000	1.3
+++ calc.spec	21 Sep 2007 13:00:58 -0000	1.4
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -36,8 +36,6 @@
 
 Requires:      less >= 358
 
-# Temporary! This is due to a build bug; should be fixed shortly.
-ExcludeArch:   ppc
 
 %description
 Calc is an arbitrary precision C-like arithmetic system that is a
@@ -112,6 +110,7 @@
 %else
      USE_READLINE="" \
 %endif
+     HAVE_FPOS="-DHAVE_NO_FPOS" \
      T=%{buildroot} \
      BINDIR=%{_bindir} \
      LIBDIR=%{_libdir} \
@@ -218,6 +217,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
+- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
+  to Denis Leroy and David Woodhouse. RH Bug #299581.
+
 * Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
 - Remove extra license choice information from package release field to
   properly comply with the packaging guidelines so as to not make Spot sad.



From fedora-extras-commits at redhat.com  Fri Sep 21 13:02:21 2007
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 21 Sep 2007 09:02:21 -0400
Subject: rpms/calc/F-7 .cvsignore,1.2,1.3 calc.spec,1.2,1.3
Message-ID: <200709211302.l8LD2LQB026558@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/calc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26526

Modified Files:
	.cvsignore calc.spec 
Log Message:
* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
  to Denis Leroy and David Woodhouse. RH Bug #299581.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Sep 2007 17:08:24 -0000	1.2
+++ .cvsignore	21 Sep 2007 13:01:48 -0000	1.3
@@ -1 +1,2 @@
 calc-2.12.2.1.tar.gz
+clog


Index: calc.spec
===================================================================
RCS file: /cvs/extras/rpms/calc/F-7/calc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calc.spec	20 Sep 2007 18:26:58 -0000	1.2
+++ calc.spec	21 Sep 2007 13:01:48 -0000	1.3
@@ -16,7 +16,7 @@
 
 Name:          calc
 Version:       2.12.2.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -36,8 +36,6 @@
 
 Requires:      less >= 358
 
-# Temporary! This is due to a build bug; should be fixed shortly.
-ExcludeArch:   ppc
 
 %description
 Calc is an arbitrary precision C-like arithmetic system that is a
@@ -112,6 +110,7 @@
 %else
      USE_READLINE="" \
 %endif
+     HAVE_FPOS="-DHAVE_NO_FPOS" \
      T=%{buildroot} \
      BINDIR=%{_bindir} \
      LIBDIR=%{_libdir} \
@@ -218,6 +217,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-10
+- add HAVE_FPOS="-DHAVE_NO_FPOS" to make ppc build work properly. Thanks
+  to Denis Leroy and David Woodhouse. RH Bug #299581.
+
 * Thu Sep 20 2007 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-9
 - Remove extra license choice information from package release field to
   properly comply with the packaging guidelines so as to not make Spot sad.



From fedora-extras-commits at redhat.com  Fri Sep 21 13:03:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 09:03:41 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.131.4.2,1.131.4.3
Message-ID: <200709211303.l8LD3fG1026744@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26676

Modified Files:
      Tag: kdepim-enterprise-branch
	kdepim.spec 
Log Message:
%%dist tag went awol, put back



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131.4.2
retrieving revision 1.131.4.3
diff -u -r1.131.4.2 -r1.131.4.3
--- kdepim.spec	21 Sep 2007 12:52:01 -0000	1.131.4.2
+++ kdepim.spec	21 Sep 2007 13:02:45 -0000	1.131.4.3
@@ -26,9 +26,9 @@
 
 %if 0%{?ent_date} > 0
 Source0: kdepim-enterprise-svn_r%{ent_rev}.tar.bz2
-Release: 8.%{ent_date}.%{ent_rev}.ent
+Release: 8.%{ent_date}.%{ent_rev}.ent%{?dist}
 %else
-Release: 8
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 Source1: cr48-app-kandy.png



From fedora-extras-commits at redhat.com  Fri Sep 21 13:12:07 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Fri, 21 Sep 2007 09:12:07 -0400
Subject: rpms/libzzub/devel libzzub-doclocationfix.patch, NONE,
	1.1 libzzub.spec, 1.2, 1.3
Message-ID: <200709211312.l8LDC7Ok026987@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26958/devel

Modified Files:
	libzzub.spec 
Added Files:
	libzzub-doclocationfix.patch 
Log Message:
revision -8

libzzub-doclocationfix.patch:

--- NEW FILE libzzub-doclocationfix.patch ---
diff -up libzzub-0.2.3/SConstruct.doclocationfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.doclocationfix	2007-09-20 15:58:09.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-20 16:01:57.000000000 +0200
@@ -238,6 +238,7 @@ binpath = "${DESTDIR}${PREFIX}/bin"
 libpath = "${DESTDIR}${PREFIX}${LIBDIR}"
 includepath = "${DESTDIR}${PREFIX}/include"
 pluginpath = "${DESTDIR}${PREFIX}${LIBDIR}/zzub"
+docpath = "${DESTDIR}${PREFIX}/share/doc/libzzub-%s" % VERSION
 
 def install(target, source, perm=None, symlink=False):
 	if not perm:
@@ -261,7 +262,7 @@ def install_bin(source):
 def install_plugin(source):
 	return install(pluginpath, source)
 def install_plugin_help(name, files):
-	return install("${DESTDIR}${PREFIX}/share/doc/zzub/plugins/"+name, files, 0644)
+	return install(docpath + "/plugins/%s" % name, files, 0644)
 
 env['DSPLIB_SRC_PATH'] = '${ROOTPATH}/src/dsplib'
 env['ASIOSDK_SRC_PATH'] = '${ROOTPATH}/src/ASIOSDK2'
@@ -590,3 +591,4 @@ if hasattr(env, 'MSVSSolution'):
 install(includepath+'/zzub', 'include/zzub/plugin.h')
 install(includepath+'/zzub', 'include/zzub/types.h')
 install(includepath+'/zzub', 'include/zzub/signature.h')
+install(docpath, ['ChangeLog', 'CREDITS', 'LICENCE', 'REVISION'])


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub.spec	17 Sep 2007 16:19:05 -0000	1.2
+++ libzzub.spec	21 Sep 2007 13:11:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -18,6 +18,7 @@
 Patch0:		libzzub-buildfix.patch
 Patch1:		libzzub-sonamefix.patch
 Patch2:		libzzub-internalflacfix.patch
+Patch3:		libzzub-doclocationfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	ppc64
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .sonamefix
 mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
 %patch2 -p1 -b .internalflacfix
+%patch3 -p1 -b .doclocationfix
 
 
 %build
@@ -99,15 +101,6 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_docdir}
-%{__mv} zzub %{name}-%{version}
-
-%{__mkdir_p} %{name}-devel-%{version}/examples
-cd %{name}-devel-%{version}/examples
-%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
-%{__rm} -f */*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -120,24 +113,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS LICENCE REVISION
 %{_bindir}/ccmplayer
 %{_libdir}/liblunarstd.so
 %{_libdir}/*.so.*
 %{_libdir}/zzub
 %{_libdir}/lunar
+%{_defaultdocdir}/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libzzub.so
-%{_defaultdocdir}/%{name}-devel-%{version}
 
 %files -n pyzzub
 %defattr(-,root,root,-)
 %{python_sitelib}/zzub
 
 %changelog
+* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
+- included patch to install missing documentation to the right place
+- removed move macro instead
+- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right
+
 * Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
 - re-added pyzzub python-devel build requirement
 - explicitly nailed the name of pyzzub



From fedora-extras-commits at redhat.com  Fri Sep 21 13:13:19 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Fri, 21 Sep 2007 09:13:19 -0400
Subject: rpms/libzzub/F-7 libzzub-doclocationfix.patch, NONE,
	1.1 libzzub.spec, 1.2, 1.3
Message-ID: <200709211313.l8LDDJcZ027072@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27049/F-7

Modified Files:
	libzzub.spec 
Added Files:
	libzzub-doclocationfix.patch 
Log Message:
revision -8

libzzub-doclocationfix.patch:

--- NEW FILE libzzub-doclocationfix.patch ---
diff -up libzzub-0.2.3/SConstruct.doclocationfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.doclocationfix	2007-09-20 15:58:09.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-20 16:01:57.000000000 +0200
@@ -238,6 +238,7 @@ binpath = "${DESTDIR}${PREFIX}/bin"
 libpath = "${DESTDIR}${PREFIX}${LIBDIR}"
 includepath = "${DESTDIR}${PREFIX}/include"
 pluginpath = "${DESTDIR}${PREFIX}${LIBDIR}/zzub"
+docpath = "${DESTDIR}${PREFIX}/share/doc/libzzub-%s" % VERSION
 
 def install(target, source, perm=None, symlink=False):
 	if not perm:
@@ -261,7 +262,7 @@ def install_bin(source):
 def install_plugin(source):
 	return install(pluginpath, source)
 def install_plugin_help(name, files):
-	return install("${DESTDIR}${PREFIX}/share/doc/zzub/plugins/"+name, files, 0644)
+	return install(docpath + "/plugins/%s" % name, files, 0644)
 
 env['DSPLIB_SRC_PATH'] = '${ROOTPATH}/src/dsplib'
 env['ASIOSDK_SRC_PATH'] = '${ROOTPATH}/src/ASIOSDK2'
@@ -590,3 +591,4 @@ if hasattr(env, 'MSVSSolution'):
 install(includepath+'/zzub', 'include/zzub/plugin.h')
 install(includepath+'/zzub', 'include/zzub/types.h')
 install(includepath+'/zzub', 'include/zzub/signature.h')
+install(docpath, ['ChangeLog', 'CREDITS', 'LICENCE', 'REVISION'])


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub.spec	17 Sep 2007 16:22:54 -0000	1.2
+++ libzzub.spec	21 Sep 2007 13:12:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -18,6 +18,7 @@
 Patch0:		libzzub-buildfix.patch
 Patch1:		libzzub-sonamefix.patch
 Patch2:		libzzub-internalflacfix.patch
+Patch3:		libzzub-doclocationfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	ppc64
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .sonamefix
 mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
 %patch2 -p1 -b .internalflacfix
+%patch3 -p1 -b .doclocationfix
 
 
 %build
@@ -99,15 +101,6 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_docdir}
-%{__mv} zzub %{name}-%{version}
-
-%{__mkdir_p} %{name}-devel-%{version}/examples
-cd %{name}-devel-%{version}/examples
-%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
-%{__rm} -f */*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -120,24 +113,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS LICENCE REVISION
 %{_bindir}/ccmplayer
 %{_libdir}/liblunarstd.so
 %{_libdir}/*.so.*
 %{_libdir}/zzub
 %{_libdir}/lunar
+%{_defaultdocdir}/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libzzub.so
-%{_defaultdocdir}/%{name}-devel-%{version}
 
 %files -n pyzzub
 %defattr(-,root,root,-)
 %{python_sitelib}/zzub
 
 %changelog
+* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
+- included patch to install missing documentation to the right place
+- removed move macro instead
+- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right
+
 * Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
 - re-added pyzzub python-devel build requirement
 - explicitly nailed the name of pyzzub



From fedora-extras-commits at redhat.com  Fri Sep 21 13:27:07 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Sep 2007 09:27:07 -0400
Subject: rpms/gcin/devel gcin.spec,1.22,1.23
Message-ID: <200709211327.l8LDR7C0028052@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912

Modified Files:
	gcin.spec 
Log Message:
use _sysconfig in post



Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gcin.spec	20 Sep 2007 01:01:59 -0000	1.22
+++ gcin.spec	21 Sep 2007 13:26:34 -0000	1.23
@@ -78,7 +78,7 @@
 /sbin/ldconfig
 %{_bindir}/update-gtk-immodules %{_host} >/dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || :
-  %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc /etc/X11/xinit/xinput.d/gcin.conf 40
+  %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf 40
 
 %postun
 /sbin/ldconfig



From fedora-extras-commits at redhat.com  Fri Sep 21 14:01:41 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Fri, 21 Sep 2007 07:01:41 -0700
Subject: [pkgdb] kdepimlibs: kkofler has requested watchcommits
Message-ID: <200709211401.l8LE1gNc000393@app3.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the watchcommits acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:01:42 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kevin))
Date: Fri, 21 Sep 2007 07:01:42 -0700
Subject: [pkgdb] kdepimlibs: kkofler has requested commit
Message-ID: <200709211401.l8LE1hFd009628@app4.fedora.phx.redhat.com>

Kevin Kofler (kkofler) has requested the commit acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:11 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested watchbugzilla
Message-ID: <200709211402.l8LE2BAk009804@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchbugzilla acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:11 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:11 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested watchcommits
Message-ID: <200709211402.l8LE2C4K009814@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the watchcommits acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:12 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:12 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested commit
Message-ID: <200709211402.l8LE2CiL000582@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the commit acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:14 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:14 -0700
Subject: [pkgdb] kdepimlibs: rdieter has requested approveacls
Message-ID: <200709211402.l8LE2E1d000603@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has requested the approveacls acl on kdepimlibs (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:02:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:02:26 -0700
Subject: [pkgdb] kdepimlibs had groupAcl changed
Message-ID: <200709211402.l8LE2QXV009889@app4.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kdepimlibs (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:07:30 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 07:07:30 -0700
Subject: [pkgdb] kdepimlibs had groupAcl changed
Message-ID: <200709211407.l8LE7UQL002438@app3.fedora.phx.redhat.com>

Rex Dieter (rdieter) has set the commit acl on kdepimlibs (Fedora devel) to Denied for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From fedora-extras-commits at redhat.com  Fri Sep 21 14:08:17 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Fri, 21 Sep 2007 10:08:17 -0400
Subject: rpms/pam/devel pam-0.99.8.1-xauth-no-free.patch, NONE,
	1.1 pam-0.99.7.1-namespace-homedir.patch, 1.2, 1.3 pam.spec,
	1.158, 1.159
Message-ID: <200709211408.l8LE8HP7002761@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2735

Modified Files:
	pam-0.99.7.1-namespace-homedir.patch pam.spec 
Added Files:
	pam-0.99.8.1-xauth-no-free.patch 
Log Message:
* Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
- do not preserve contexts when copying skel and other namespace.init
  fixes (#298941)
- do not free memory sent to putenv (#231698)


pam-0.99.8.1-xauth-no-free.patch:

--- NEW FILE pam-0.99.8.1-xauth-no-free.patch ---
diff -up Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c
--- Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c.no-free	2007-09-21 16:02:06.000000000 +0200
+++ Linux-PAM-0.99.8.1/modules/pam_xauth/pam_xauth.c	2007-09-21 16:02:47.000000000 +0200
@@ -573,6 +573,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 				   "can't set environment variable '%s'",
 				   xauthority);
 		putenv (xauthority); /* The environment owns this string now. */
+		xauthority = NULL;
 
 		/* set $DISPLAY in pam handle to make su - work */
 		{

pam-0.99.7.1-namespace-homedir.patch:

Index: pam-0.99.7.1-namespace-homedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.7.1-namespace-homedir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam-0.99.7.1-namespace-homedir.patch	24 Aug 2007 13:35:26 -0000	1.2
+++ pam-0.99.7.1-namespace-homedir.patch	21 Sep 2007 14:08:14 -0000	1.3
@@ -1,29 +1,47 @@
 diff -up Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init
---- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir	2007-08-24 10:40:46.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-08-24 15:33:52.000000000 +0200
-@@ -1,9 +1,24 @@
+--- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir	2007-09-19 19:37:26.000000000 +0200
++++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-09-21 14:13:52.000000000 +0200
+@@ -1,26 +1,24 @@
  #!/bin/sh -p
 -# This is only a boilerplate for the instance initialization script.
  # It receives polydir path as $1, the instance path as $2, 
  # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
  # and user name in $4.
  #
+-# If you intend to polyinstantiate /tmp and you also want to use the X windows
+-# environment, you will have to use this script to bind mount the socket that
+-# is used by the X server to communicate with its clients. X server places
+-# this socket in /tmp/.X11-unix directory, which will get obscured by
+-# polyinstantiation. Uncommenting the following lines will bind mount
+-# the relevant directory at an alternative location (/.tmp/.X11-unix) such
+-# that the X server, window manager and X clients, can still find the
+-# socket X0 at the polyinstanted /tmp/.X11-unix.
+-#
+-#if [ $1 = /tmp ]; then
+-#	if [ ! -f /.tmp/.X11-unix ]; then
+-#		mkdir -p /.tmp/.X11-unix
+-#	fi
+-#	mount --bind /tmp/.X11-unix /.tmp/.X11-unix
+-#	cp -fp -- /tmp/.X0-lock "$2/.X0-lock"
+-#	mkdir -- "$2/.X11-unix"
+-#	ln -fs -- /.tmp/.X11-unix/X0 "$2/.X11-unix/X0"
+-#fi
 +# The following section will copy the contents of /etc/skel if this is a
 +# newly created home directory.
 +if [ "$3" = 1 ]; then
++        # This line will fix the labeling on all newly created directories
++        [ -x /sbin/restorecon ] && /sbin/restorecon "$1"
 +        user="$4"
 +        passwd=$(getent passwd "$user")
 +        homedir=$(echo "$passwd" | cut -f6 -d":")
 +        if [ "$1" = "$homedir" ]; then
 +                gid=$(echo "$passwd" | cut -f4 -d":")
-+                cp -aT /etc/skel "$homedir"
-+                [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir"
++                cp -rT /etc/skel "$homedir"
 +                chown -R "$user":"$gid" "$homedir"
 +                mode=$(awk '/^UMASK/{gsub("#.*$", "", $2); printf "%o", and(0777,compl(strtonum("0" $2))); exit}' /etc/login.defs)
 +                chmod ${mode:-700} "$homedir"
++                [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir"
 +        fi
 +fi
-+#
- # If you intend to polyinstantiate /tmp and you also want to use the X windows
- # environment, you will have to use this script to bind mount the socket that
- # is used by the X server to communicate with its clients. X server places
+ 
+ exit 0


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- pam.spec	19 Sep 2007 18:11:42 -0000	1.158
+++ pam.spec	21 Sep 2007 14:08:14 -0000	1.159
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 8%{?dist}
+Release: 9%{?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
@@ -43,6 +43,7 @@
 Patch44: pam-0.99.7.1-namespace-homedir.patch
 Patch45: pam-0.99.8.1-selinux-permit.patch
 Patch46: pam-0.99.8.1-succif-in-operator.patch
+Patch47: pam-0.99.8.1-xauth-no-free.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -111,6 +112,7 @@
 %patch44 -p1 -b .homedir
 %patch45 -p1 -b .permit
 %patch46 -p1 -b .in-operator
+%patch47 -p1 -b .no-free
 
 autoreconf
 
@@ -403,6 +405,11 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
+- do not preserve contexts when copying skel and other namespace.init
+  fixes (#298941)
+- do not free memory sent to putenv (#231698)
+
 * Wed Sep 19 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-8
 - add pam_selinux_permit module
 - pam_succeed_if: fix in operator (#295151)



From fedora-extras-commits at redhat.com  Fri Sep 21 14:15:33 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:15:33 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.164,1.165
Message-ID: <200709211415.l8LEFXBW003008@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2987

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
- Updated db to 20070919.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- foomatic.spec	15 Aug 2007 11:52:02 -0000	1.164
+++ foomatic.spec	21 Sep 2007 14:15:01 -0000	1.165
@@ -1,4 +1,4 @@
-%define dbver 20070614
+%define dbver 20070919
 %define enginever 3.0-20070614
 %define filtersver 20070614
 %define hpijsver 20070614
@@ -261,6 +261,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
+- Updated db to 20070919.
+
 * Wed Aug 15 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-50
 - Removed references to unshipped drivers:
   * drv_x125



From fedora-extras-commits at redhat.com  Fri Sep 21 14:22:47 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 10:22:47 -0400
Subject: rpms/kdelibs4/devel kde4.csh, NONE, 1.1 kde4.sh, NONE,
	1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1 kdelibs-3.93.0-kde149703.diff, NONE,
	1.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211422.l8LEMlXe003249@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kde4.csh kde4.sh kdelibs-3.93.0-colorscheme-hack.diff 
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
	kdelibs-3.93.0-parallel-devel.diff kdelibs4.spec 
Log Message:
New package kdelibs4 - K Desktop Environment 4 - Libraries
(copied from kdelibs-kde4-branch, kdelibs.spec renamed to kdelibs4.spec to match guidelines)


--- NEW FILE kde4.csh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr

## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
   if ( "$PRELINKING" == "yes" )  then
     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
   endif
endif

if ( ! $?QT_PLUGIN_PATH ) then
  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
endif


--- NEW FILE kde4.sh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS

## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
  fi
fi

if [ -z "$QT_PLUGIN_PATH" ]; then
  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
fi

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
Index: xmlgui/kxmlguiclient.cpp
===================================================================
--- xmlgui/kxmlguiclient.cpp	(revision 709581)
+++ xmlgui/kxmlguiclient.cpp	(working copy)
@@ -785,11 +785,11 @@
     allDocuments.append( d );
   }
 
-  QList<DocStruct>::Iterator best = allDocuments.end();
+  QList<DocStruct>::const_iterator best = allDocuments.end();
   uint bestVersion = 0;
 
-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
+  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
   for (; docIt != docEnd; ++docIt )
   {
     QString versionStr = findVersionNumber( (*docIt).data );
@@ -814,19 +814,19 @@
   {
     if ( best != allDocuments.begin() )
     {
-      QList<DocStruct>::Iterator local = allDocuments.begin();
+      QList<DocStruct>::iterator local = allDocuments.begin();
+      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
 
-      // load the local document and extract the action properties
-      QDomDocument document;
-      document.setContent( (*local).data );
+        // load the local document and extract the action properties
+        QDomDocument document;
+        document.setContent( (*local).data );
 
-      ActionPropertiesMap properties = extractActionProperties( document );
+        ActionPropertiesMap properties = extractActionProperties( document );
 
-      // in case the document has a ActionProperties section
-      // we must not delete it but copy over the global doc
-      // to the local and insert the ActionProperties section
-      if ( !properties.isEmpty() )
-      {
+        // in case the document has a ActionProperties section
+        // we must not delete it but copy over the global doc
+        // to the local and insert the ActionProperties section
+        if ( !properties.isEmpty() ) {
           // now load the global one with the higher version number
           // into memory
           document.setContent( (*best).data );
@@ -845,14 +845,14 @@
             f.write( utf8data.constData(), utf8data.length() );
             f.close();
           }
+        }
+        else
+        {
+          QString f = (*local).file;
+          QString backup = f + QLatin1String( ".backup" );
+          QFile::rename( f, backup );
+        }
       }
-      else
-      {
-        QString f = (*local).file;
-        QString backup = f + QLatin1String( ".backup" );
-        QDir dir;
-        dir.rename( f, backup );
-      }
     }
     doc = (*best).data;
     return (*best).file;

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


--- NEW FILE kdelibs4.spec ---

# TODO:
# 1. package some noarch bits separately: apidocs.

Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 9%{?dist}

%if 0%{?fedora} > 8
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
Provides:  kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
%endif

# LGPLv2: everything, except (see below)
# BSD: kdoctools/
# GFDL: kdoctools/customization ?
License: LGPLv2 and BSD
URL:     http://www.kde.org/
Group:   System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for macros.kde4
BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
Requires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
#Requires: kde4-settings

Source1: kde4.sh
Source2: kde4.csh

# make -devel packages parallel-installable
Patch0: kdelibs-3.93.0-parallel-devel.diff
# fix kde#149703
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149704
Patch2: kdelibs-3.93.0-kde149704.diff
# fix kde#149705
Patch3: kdelibs-3.93.0-kde149705.diff
# KColorScheme was in a state of transition when Beta 2 was released, so
# disabled text isn't handled properly. This hack restores the August 27
# behavior (while keeping the August 29 API).
Patch4: kdelibs-3.93.0-colorscheme-hack.diff

BuildRequires: qt4-devel >= 4.3.0
%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
Requires: qt4 >= %{qt4_ver} 
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils

BuildRequires: alsa-lib-devel
BuildRequires: aspell-devel
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: cups-devel cups
BuildRequires: enchant-devel
BuildRequires: gamin-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: shared-mime-info
BuildRequires: soprano-devel
BuildRequires: strigi-devel >= 0.5.5
BuildRequires: zlib-devel

%description
Libraries for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" == "kdelibs4"
%else
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides:  kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
Requires: openssl-devel
Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
## FIXME/TODO: trim these down  -- Rex
#Requires: libxslt-devel aspell-devel giflib-devel
#Requires: libpng-devel gettext-devel
#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
#Requires: krb5-devel
#Requires: alsa-lib-devel avahi-devel
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdelibs-%{version}
%patch0 -p1
%patch1 -p1
pushd kdeui
%patch2 -p0
popd
%patch3 -p1
%patch4 -p1


%build

mkdir -p %{_target_platform}
pushd %{_target_platform} 
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1

# FIXME/TODO: apidocs
# doc/api/doxygen.sh --doxdatadir=doc/common .


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# see also use-of/patching of XDG_MENU_PREFIX in kdebase
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
   %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu

# fix file conflict with mozilla's js (kde#149840)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs

# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd

install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh


%post
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :

%postun 
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING COPYING-DOCS COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
# kdewidgets
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu

%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/


%changelog
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch

* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
  (workaround for #244065 no longer needed, fixed in 3.93.0)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification

* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
  ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info

* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)

* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups

* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug 

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)

* Wed May 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4

* Mon Mar 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta

* Sat Mar 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR

* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so

* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:29:45 -0000	1.1
+++ .cvsignore	21 Sep 2007 14:22:15 -0000	1.2
@@ -0,0 +1,3 @@
+clog
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:29:45 -0000	1.1
+++ sources	21 Sep 2007 14:22:15 -0000	1.2
@@ -0,0 +1 @@
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 14:26:34 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 10:26:34 -0400
Subject: rpms/kdelibs4/F-7 kde4.csh, NONE, 1.1 kde4.sh, NONE,
	1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE,
	1.1 kdelibs-3.93.0-kde149703.diff, NONE,
	1.1 kdelibs-3.93.0-kde149704.diff, NONE,
	1.1 kdelibs-3.93.0-kde149705.diff, NONE,
	1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211426.l8LEQYlB003433@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3395/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	kde4.csh kde4.sh kdelibs-3.93.0-colorscheme-hack.diff 
	kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-kde149705.diff 
	kdelibs-3.93.0-parallel-devel.diff kdelibs4.spec 
Log Message:
New package kdelibs4 - K Desktop Environment 4 - Libraries
(copied from kdelibs-kde4-branch, kdelibs.spec renamed to kdelibs4.spec to match guidelines)


--- NEW FILE kde4.csh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr

## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
   if ( "$PRELINKING" == "yes" )  then
     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
   endif
endif

if ( ! $?QT_PLUGIN_PATH ) then
  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
endif


--- NEW FILE kde4.sh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here

## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS

## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
  fi
fi

if [ -z "$QT_PLUGIN_PATH" ]; then
  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
fi

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);

kdelibs-3.93.0-kde149703.diff:

--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp	2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp	2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
         //  appId = pService->storageId();
 
         const QString type = config.readEntry( "ServiceType" );
-        const QString type2 = config.readEntry( "GenericServiceType" );
+        const QString type2 = config.readEntry( "GenericServiceType", "Application" );
         int pref = config.readEntry( "Preference", 0 );
 
         if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden

kdelibs-3.93.0-kde149704.diff:

--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
Index: xmlgui/kxmlguiclient.cpp
===================================================================
--- xmlgui/kxmlguiclient.cpp	(revision 709581)
+++ xmlgui/kxmlguiclient.cpp	(working copy)
@@ -785,11 +785,11 @@
     allDocuments.append( d );
   }
 
-  QList<DocStruct>::Iterator best = allDocuments.end();
+  QList<DocStruct>::const_iterator best = allDocuments.end();
   uint bestVersion = 0;
 
-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
+  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
   for (; docIt != docEnd; ++docIt )
   {
     QString versionStr = findVersionNumber( (*docIt).data );
@@ -814,19 +814,19 @@
   {
     if ( best != allDocuments.begin() )
     {
-      QList<DocStruct>::Iterator local = allDocuments.begin();
+      QList<DocStruct>::iterator local = allDocuments.begin();
+      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
 
-      // load the local document and extract the action properties
-      QDomDocument document;
-      document.setContent( (*local).data );
+        // load the local document and extract the action properties
+        QDomDocument document;
+        document.setContent( (*local).data );
 
-      ActionPropertiesMap properties = extractActionProperties( document );
+        ActionPropertiesMap properties = extractActionProperties( document );
 
-      // in case the document has a ActionProperties section
-      // we must not delete it but copy over the global doc
-      // to the local and insert the ActionProperties section
-      if ( !properties.isEmpty() )
-      {
+        // in case the document has a ActionProperties section
+        // we must not delete it but copy over the global doc
+        // to the local and insert the ActionProperties section
+        if ( !properties.isEmpty() ) {
           // now load the global one with the higher version number
           // into memory
           document.setContent( (*best).data );
@@ -845,14 +845,14 @@
             f.write( utf8data.constData(), utf8data.length() );
             f.close();
           }
+        }
+        else
+        {
+          QString f = (*local).file;
+          QString backup = f + QLatin1String( ".backup" );
+          QFile::rename( f, backup );
+        }
       }
-      else
-      {
-        QString f = (*local).file;
-        QString backup = f + QLatin1String( ".backup" );
-        QDir dir;
-        dir.rename( f, backup );
-      }
     }
     doc = (*best).data;
     return (*best).file;

kdelibs-3.93.0-kde149705.diff:

--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-3.93.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
 # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -125,7 +125,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
 
-   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
 
-   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
 
-   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
 
-   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
 
-   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
 
-   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
 
-   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
 
-   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
 
-   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
 
-   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
 
    if (UNIX)
-      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
    endif (UNIX)
 
-   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
 
-   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
 
-   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
 
-   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
 
-   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
 
-   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
 
-   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
 
    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                               "${KDE4_LIB_INSTALL_DIR}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


--- NEW FILE kdelibs4.spec ---

# TODO:
# 1. package some noarch bits separately: apidocs.

Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 9%{?dist}

%if 0%{?fedora} > 8
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
Provides:  kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
%endif

# LGPLv2: everything, except (see below)
# BSD: kdoctools/
# GFDL: kdoctools/customization ?
License: LGPLv2 and BSD
URL:     http://www.kde.org/
Group:   System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# for macros.kde4
BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
Requires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
#Requires: kde4-settings

Source1: kde4.sh
Source2: kde4.csh

# make -devel packages parallel-installable
Patch0: kdelibs-3.93.0-parallel-devel.diff
# fix kde#149703
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149704
Patch2: kdelibs-3.93.0-kde149704.diff
# fix kde#149705
Patch3: kdelibs-3.93.0-kde149705.diff
# KColorScheme was in a state of transition when Beta 2 was released, so
# disabled text isn't handled properly. This hack restores the August 27
# behavior (while keeping the August 29 API).
Patch4: kdelibs-3.93.0-colorscheme-hack.diff

BuildRequires: qt4-devel >= 4.3.0
%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
Requires: qt4 >= %{qt4_ver} 
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils

BuildRequires: alsa-lib-devel
BuildRequires: aspell-devel
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: cups-devel cups
BuildRequires: enchant-devel
BuildRequires: gamin-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: shared-mime-info
BuildRequires: soprano-devel
BuildRequires: strigi-devel >= 0.5.5
BuildRequires: zlib-devel

%description
Libraries for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" == "kdelibs4"
%else
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides:  kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
Requires: openssl-devel
Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
## FIXME/TODO: trim these down  -- Rex
#Requires: libxslt-devel aspell-devel giflib-devel
#Requires: libpng-devel gettext-devel
#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
#Requires: krb5-devel
#Requires: alsa-lib-devel avahi-devel
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdelibs-%{version}
%patch0 -p1
%patch1 -p1
pushd kdeui
%patch2 -p0
popd
%patch3 -p1
%patch4 -p1


%build

mkdir -p %{_target_platform}
pushd %{_target_platform} 
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1

# FIXME/TODO: apidocs
# doc/api/doxygen.sh --doxdatadir=doc/common .


%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} -C %{_target_platform}

# see also use-of/patching of XDG_MENU_PREFIX in kdebase
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
   %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu

# fix file conflict with mozilla's js (kde#149840)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs

# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
      %{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
      %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd

install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh


%post
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :

%postun 
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING COPYING-DOCS COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
# kdewidgets
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu

%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/


%changelog
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch

* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
  (workaround for #244065 no longer needed, fixed in 3.93.0)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704

* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel

* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification

* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
  ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info

* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)

* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups

* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug 

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)

* Wed May 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4

* Mon Mar 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta

* Sat Mar 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR

* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so

* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:29:45 -0000	1.1
+++ .cvsignore	21 Sep 2007 14:26:01 -0000	1.2
@@ -0,0 +1,3 @@
+clog
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:29:45 -0000	1.1
+++ sources	21 Sep 2007 14:26:01 -0000	1.2
@@ -0,0 +1 @@
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 14:27:52 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:27:52 -0400
Subject: rpms/foomatic/devel .cvsignore,1.49,1.50 sources,1.51,1.52
Message-ID: <200709211427.l8LERqqC003472@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
- Updated db to 20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	14 Jun 2007 10:01:23 -0000	1.49
+++ .cvsignore	21 Sep 2007 14:27:20 -0000	1.50
@@ -43,3 +43,4 @@
 foomatic-db-hpijs-20070614.tar.gz
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
+foomatic-db-3.0-20070919.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	14 Jun 2007 10:01:23 -0000	1.51
+++ sources	21 Sep 2007 14:27:20 -0000	1.52
@@ -1,4 +1,4 @@
 8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
-aa9d9cf8dc42ce7a61e6d4506098aebb  foomatic-db-3.0-20070614.tar.gz
+fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:29:50 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Fri, 21 Sep 2007 10:29:50 -0400
Subject: fedora-security/audit fc6,1.265,1.266 fc7,1.115,1.116
Message-ID: <200709211429.l8LETo34003566@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3532/audit

Modified Files:
	fc6 fc7 
Log Message:
update on some older kde issues



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- fc6	21 Sep 2007 06:43:46 -0000	1.265
+++ fc6	21 Sep 2007 14:29:48 -0000	1.266
@@ -133,6 +133,7 @@
 CVE-2007-1352 fixed (libXfont) #235265 [since FEDORA-2007-423]
 CVE-2007-1351 fixed (libXfont) #235265 [since FEDORA-2007-423]
 CVE-2007-1349 backport (mod_perl) [since FEDORA-2007-577]
+CVE-2007-1308 version (kdelibs)
 CVE-2007-1263 version (gnupg, fixed 1.4.7) [since FEDORA-2007-315]
 CVE-2007-1262 version (squirrelmail, fixed 1.4.10a) #239704 [since FEDORA-2007-505]
 CVE-2007-1218 backport (tcpdump) 232349 [since FEDORA-2007-347]


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc7	21 Sep 2007 07:40:08 -0000	1.115
+++ fc7	21 Sep 2007 14:29:48 -0000	1.116
@@ -285,8 +285,8 @@
 CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
 CVE-2007-1599 version (wordpress, fixed 2.1.3-0.rc2) #233703
 CVE-2007-1583 version (php, fixed 5.2.2)
-CVE-2007-1565 ignore (konqueror) client crash
-CVE-2007-1564 vulnerable (konqueror) [#CVE-2007-1564]
+CVE-2007-1565 ignore (konqueror) client crash, duplicate of CVE-2007-1308
+CVE-2007-1564 version (kdelibs) affects konqueror
 CVE-2007-1562 version (mozilla) #241840
 CVE-2007-1560 version (squid, fixed 2.6.STABLE12)
 CVE-2007-1558 version (balsa) [since FEDORA-2007-1447]
@@ -339,6 +339,7 @@
 *CVE-2007-1322 ** (qemu) #238723
 *CVE-2007-1321 ** (qemu) #238723
 *CVE-2007-1320 ** (qemu) #238723
+CVE-2007-1308 version (kdelibs)
 CVE-2007-1287 ignore (php) See NVD
 CVE-2007-1286 version (php, PHP4 only)
 CVE-2007-1285 version (php, 5.2.2)



From fedora-extras-commits at redhat.com  Fri Sep 21 14:31:02 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:31:02 -0400
Subject: rpms/foomatic/devel .cvsignore, 1.50, 1.51 foomatic.spec, 1.165,
	1.166 sources, 1.52, 1.53
Message-ID: <200709211431.l8LEV2kI003651@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3586

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
- Updated filters to 3.0-20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	21 Sep 2007 14:27:20 -0000	1.50
+++ .cvsignore	21 Sep 2007 14:30:30 -0000	1.51
@@ -44,3 +44,4 @@
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
 foomatic-db-3.0-20070919.tar.gz
+foomatic-filters-3.0-20070919.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- foomatic.spec	21 Sep 2007 14:15:01 -0000	1.165
+++ foomatic.spec	21 Sep 2007 14:30:30 -0000	1.166
@@ -1,12 +1,12 @@
 %define dbver 20070919
 %define enginever 3.0-20070614
-%define filtersver 20070614
+%define filtersver 20070919
 %define hpijsver 20070614
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    50%{?dist}
+Release:    51%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -261,7 +261,8 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com>
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
+- Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 
 * Wed Aug 15 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-50


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	21 Sep 2007 14:27:20 -0000	1.52
+++ sources	21 Sep 2007 14:30:30 -0000	1.53
@@ -1,4 +1,4 @@
-8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
 fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz
+edc1e340b90d55240d84299bec75b9c7  foomatic-filters-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:33:34 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Fri, 21 Sep 2007 10:33:34 -0400
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.9,1.10
Message-ID: <200709211433.l8LEXY9j003779@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3758

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Fri Sep 21 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-9
- Really remove all mylar references in mylyn feature - courtesy
  Mandriva package.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-mylyn.spec	20 Sep 2007 16:01:06 -0000	1.9
+++ eclipse-mylyn.spec	21 Sep 2007 14:33:01 -0000	1.10
@@ -4,7 +4,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 2.0.0
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: Eclipse Public License
 URL: http://www.eclipse.org/mylyn
 
@@ -167,9 +167,10 @@
 %patch6
 popd
 
-#sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
 # remove references to mylar in feature
 sed --in-place -e "304,456d" org.eclipse.mylyn-feature/feature.xml 
+sed --in-place "s/<import.*mylar.*\/>//" org.eclipse.mylyn-feature/feature.xml
+%{__grep} mylar org.eclipse.mylyn-feature/feature.xml && exit 1
 
 %build
 SDK=$(cd SDK > /dev/null && pwd)
@@ -456,6 +457,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-9
+- Really remove all mylar references in mylyn feature - courtesy
+  Mandriva package.
+
 * Wed Sep 19 2007 Andrew Overholt <overholt at redhat.com> 2.0.0-8
 - Add patch and source to have common bugzilla servers by default.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 14:34:44 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 10:34:44 -0400
Subject: rpms/foomatic/F-7 .cvsignore, 1.46, 1.47 foomatic.spec, 1.156,
	1.157 sources, 1.48, 1.49
Message-ID: <200709211434.l8LEYi7k003843@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3797

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
- Updated filters to 3.0-20070919.
- Updated db to 20070919.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	14 Jun 2007 12:28:40 -0000	1.46
+++ .cvsignore	21 Sep 2007 14:34:11 -0000	1.47
@@ -44,3 +44,5 @@
 foomatic-db-hpijs-20070614.tar.gz
 foomatic-db-engine-3.0-20070614.tar.gz
 foomatic-db-3.0-20070614.tar.gz
+foomatic-db-3.0-20070919.tar.gz
+foomatic-filters-3.0-20070919.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/foomatic.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- foomatic.spec	14 Jun 2007 12:28:40 -0000	1.156
+++ foomatic.spec	21 Sep 2007 14:34:11 -0000	1.157
@@ -1,12 +1,12 @@
-%define dbver 20070614
+%define dbver 20070919
 %define enginever 3.0-20070614
-%define filtersver 20070614
+%define filtersver 20070919
 %define hpijsver 20070614
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    47.1%{?dist}
+Release:    47.2%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -255,6 +255,10 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
+- Updated filters to 3.0-20070919.
+- Updated db to 20070919.
+
 * Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.1
 - Safe default margins for PPDs (bug #244161).
 - Added missing IEEE 1284 ID for HP Photosmart 380 (bug #241352).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	14 Jun 2007 12:28:40 -0000	1.48
+++ sources	21 Sep 2007 14:34:11 -0000	1.49
@@ -1,4 +1,4 @@
-8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
 38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
 e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
-aa9d9cf8dc42ce7a61e6d4506098aebb  foomatic-db-3.0-20070614.tar.gz
+fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz
+edc1e340b90d55240d84299bec75b9c7  foomatic-filters-3.0-20070919.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:37 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:37 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEecNE013033@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:38 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:38 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEedKI021919@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:39 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:39 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEeeEH021933@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:40 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:40 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested approveacls
Message-ID: <200709211440.l8LEeeoK013052@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the approveacls acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:42 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:42 -0700
Subject: [pkgdb] python-xmpp: silfreed has given up approveacls
Message-ID: <200709211440.l8LEegja013076@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has given up the approveacls acl on python-xmpp (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:47 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:47 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEel1V021986@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:48 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:48 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEemh8022001@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:49 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:49 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEenMf013127@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:51 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:51 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchbugzilla
Message-ID: <200709211440.l8LEepti013144@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:53 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:53 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested watchcommits
Message-ID: <200709211440.l8LEerJg022037@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:40:54 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:40:54 -0700
Subject: [pkgdb] python-xmpp: silfreed has requested commit
Message-ID: <200709211440.l8LEesen022057@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on python-xmpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-xmpp



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:17 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:17 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgIJm013612@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:18 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:18 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgIfq022483@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:19 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:19 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgJox013632@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:22 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:22 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgMqR013656@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:23 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:23 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgNVF013667@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:25 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:25 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgP5J022531@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:26 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:26 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchbugzilla
Message-ID: <200709211442.l8LEgQAG013688@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchbugzilla acl on ejabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:26 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:26 -0700
Subject: [pkgdb] ejabberd: silfreed has requested watchcommits
Message-ID: <200709211442.l8LEgQt0022547@app4.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the watchcommits acl on ejabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:42:27 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Fri, 21 Sep 2007 07:42:27 -0700
Subject: [pkgdb] ejabberd: silfreed has requested commit
Message-ID: <200709211442.l8LEgRvj013707@app3.fedora.phx.redhat.com>

Douglas E. Warner (silfreed) has requested the commit acl on ejabberd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 14:47:50 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 21 Sep 2007 10:47:50 -0400
Subject: rpms/im-chooser/devel im-chooser-constraint-of-language.patch, 1.1, 
	1.2 im-chooser.spec, 1.21, 1.22
Message-ID: <200709211447.l8LEloR3004399@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4356

Modified Files:
	im-chooser-constraint-of-language.patch im-chooser.spec 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
- Bring up IM by default again, except the session is on Live CD. (#250226)

im-chooser-constraint-of-language.patch:

Index: im-chooser-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser-constraint-of-language.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-chooser-constraint-of-language.patch	30 Jul 2007 00:21:29 -0000	1.1
+++ im-chooser-constraint-of-language.patch	21 Sep 2007 14:47:16 -0000	1.2
@@ -1,19 +1,23 @@
-diff -ruN im-chooser-0.4.0.orig/data/xinput.sh.in.in im-chooser-0.4.0/data/xinput.sh.in.in
---- im-chooser-0.4.0.orig/data/xinput.sh.in.in	2007-07-25 23:06:26.000000000 +0900
-+++ im-chooser-0.4.0/data/xinput.sh.in.in	2007-07-25 23:27:56.000000000 +0900
-@@ -35,7 +35,14 @@
+diff -ruN im-chooser-0.5.2.orig/data/xinput.sh.in.in im-chooser-0.5.2/data/xinput.sh.in.in
+--- im-chooser-0.5.2.orig/data/xinput.sh.in.in	2007-09-10 08:56:37.000000000 +0900
++++ im-chooser-0.5.2/data/xinput.sh.in.in	2007-09-21 23:40:51.000000000 +0900
+@@ -35,7 +35,18 @@
  if [ -r "$USER_XINPUTRC" -a "x$IM_CHOOSER_DISABLE_USER_XINPUTRC" = "xno" ]; then
      source "$USER_XINPUTRC"
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
-+    # FIXME: This hardcoded list has to be gone in the future.
-+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
-+    for i in $_language_list; do
-+        if echo $tmplang | grep -q -E "^$i"; then
-+            source "$SYS_XINPUTRC"
-+            break
-+        fi
-+    done
++    # only apply the hardcoded list for Live CD
++    if [ -h /dev/live-osimg ]; then
++        _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++        for i in $_language_list; do
++            if echo $tmplang | grep -q -E "^$i"; then
++                source "$SYS_XINPUTRC"
++                break
++            fi
++        done
++    else
++        source "$SYS_XINPUTRC"
++    fi
  fi
  
  [ -z "$XIM" ] && XIM=none


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- im-chooser.spec	18 Sep 2007 11:03:58 -0000	1.21
+++ im-chooser.spec	21 Sep 2007 14:47:16 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
+- Bring up IM by default again, except the session is on Live CD. (#250226)
+
 * Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
 - New upstream release.
   - Fix to allow users disabling IM.



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:30 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:30 -0400
Subject: rpms/cacti/EL-4 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvU6F004992@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/EL-4

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:11 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:56:58 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:33 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:33 -0400
Subject: rpms/cacti/EL-5 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvXKb004998@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/EL-5

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:13 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:35 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:35 -0400
Subject: rpms/cacti/F-7 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvZRe005001@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/F-7

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/F-7/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:16 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:38 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:38 -0400
Subject: rpms/cacti/FC-6 graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.12,
	1.13 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvcFP005004@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/FC-6

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cacti.spec	14 Sep 2007 21:30:20 -0000	1.12
+++ cacti.spec	21 Sep 2007 14:57:06 -0000	1.13
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 14:57:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 10:57:41 -0400
Subject: rpms/cacti/devel graph_debug_lockup_fix.patch, NONE,
	1.1 ping_php_version4_snmpgetnext.patch, NONE,
	1.1 snmpwalk_fix.patch, NONE,
	1.1 thumbnail_graphs_not_working.patch, NONE,
	1.1 tree_console_missing_hosts.patch, NONE, 1.1 cacti.spec, 1.13,
	1.14 dec06-vulnerability-poller-0.8.6i.patch, 1.1,
	NONE dec06-vulnerability-scripts-0.8.6i.patch, 1.1,
	NONE fix_search_session_clear_issue.patch, 1.1,
	NONE fix_sql_syntax_related_to_default_rra_id.patch, 1.1,
	NONE import_template_argument_space_removal.patch, 1.1,
	NONE mysql_5x_strict.patch, 1.1,
	NONE nth_percentile_empty_return_set_issue.patch, 1.1,
	NONE poller_output_remainder.patch, 1.1, NONE
Message-ID: <200709211457.l8LEvf2p005008@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4812/devel

Modified Files:
	cacti.spec 
Added Files:
	graph_debug_lockup_fix.patch 
	ping_php_version4_snmpgetnext.patch snmpwalk_fix.patch 
	thumbnail_graphs_not_working.patch 
	tree_console_missing_hosts.patch 
Removed Files:
	dec06-vulnerability-poller-0.8.6i.patch 
	dec06-vulnerability-scripts-0.8.6i.patch 
	fix_search_session_clear_issue.patch 
	fix_sql_syntax_related_to_default_rra_id.patch 
	import_template_argument_space_removal.patch 
	mysql_5x_strict.patch 
	nth_percentile_empty_return_set_issue.patch 
	poller_output_remainder.patch 
Log Message:
Added official patches from the cacti site

graph_debug_lockup_fix.patch:

--- NEW FILE graph_debug_lockup_fix.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-03-01 15:32:18.609375000 -0500
@@ -83,6 +83,7 @@
 	if ($config["cacti_server_os"] == "unix") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "r");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");
@@ -91,6 +92,7 @@
 	}elseif ($config["cacti_server_os"] == "win32") {
 		/* an empty $rrd_struc array means no fp is available */
 		if (sizeof($rrd_struc) == 0) {
+			session_write_close();
 			$fp = popen(read_config_option("path_rrdtool") . escape_command(" $command_line"), "rb");
 		}else{
 			fwrite(rrd_get_fd($rrd_struc, RRDTOOL_PIPE_CHILD_READ), escape_command(" $command_line") . "\r\n");

ping_php_version4_snmpgetnext.patch:

--- NEW FILE ping_php_version4_snmpgetnext.patch ---
--- cacti-0.8.6j/lib/ping.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/ping.php	2007-01-20 19:45:55.015625000 -0500
@@ -281,7 +281,13 @@
 
 		/* poll sysUptime for status */
 		$retry_count = 0;
+
+		/* getnext does not work in php versions less than 5 */
+		if (version_compare("5", phpversion(), "<")) {
 		$oid = ".1";
+		}else{
			$oid = ".1.3.6.1.2.1.1.3.0";
+		}
+
 		while (1) {
 			if ($retry_count >= $this->retries) {
 				$this->snmp_status   = "down";
@@ -289,6 +295,8 @@
 				return false;
 			}
 
+			/* getnext does not work in php versions less than 5 */
+			if (version_compare("5", phpversion(), "<")) {
 			$output = cacti_snmp_getnext($this->host["hostname"],
 				$this->host["snmp_community"],
 				$oid,
@@ -298,6 +306,16 @@
 				$this->host["snmp_port"],
 				$this->host["snmp_timeout"],
 				SNMP_CMDPHP);
+			}else{
				$output = cacti_snmp_get($this->host["hostname"],
+					$this->host["snmp_community"],
+					$oid,
+					$this->host["snmp_version"],
+					$this->host["snmp_username"],
+					$this->host["snmp_password"],
+					$this->host["snmp_port"],
+					$this->host["snmp_timeout"],
+					SNMP_CMDPHP);
+			}
 
 			/* determine total time +- ~10% */
 			$this->time = $this->get_time($this->precision);

snmpwalk_fix.patch:

--- NEW FILE snmpwalk_fix.patch ---
diff -ruBbd cacti-0.8.6j/lib/snmp.php cacti-0.8.6j-patched/lib/snmp.php
--- cacti-0.8.6j/lib/snmp.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patched/lib/snmp.php	2007-05-15 21:26:14.000000000 -0400
@@ -221,9 +219,9 @@
 			$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -v$version -t $timeout -r $retries $hostname:$port $snmp_auth $oid");
 		}else {
 			if (file_exists($path_snmpbulkwalk) && ($version > 1)) {
-				$temp_array = exec_into_array($path_snmpbulkwalk . " -O n $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
+				$temp_array = exec_into_array($path_snmpbulkwalk . " -O Qn $snmp_auth -v $version -t $timeout -r $retries -Cr50 $hostname:$port $oid");
 			}else{
-				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O n $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
+				$temp_array = exec_into_array(read_config_option("path_snmpwalk") . " -O Qn $snmp_auth -v $version -t $timeout -r $retries $hostname:$port $oid");
 			}
 		}
 

thumbnail_graphs_not_working.patch:

--- NEW FILE thumbnail_graphs_not_working.patch ---
--- cacti-0.8.6j/lib/rrd.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/rrd.php	2007-02-01 20:29:59.687500000 -0500
@@ -1080,9 +1080,15 @@
 
 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
 			if (read_config_option("rrdtool_version") == "rrd-1.2.x") {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}else {
-				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" ";
+				if (trim($comment_string) != "COMMENT:\"\"") {
+					$txt_graph_items .= $comment_string;
+				}
 			}
 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */

tree_console_missing_hosts.patch:

--- NEW FILE tree_console_missing_hosts.patch ---
--- cacti-0.8.6j/lib/html_tree.php	2007-01-17 19:23:10.000000000 -0500
+++ cacti-0.8.6j-patch/lib/html_tree.php	2007-01-27 15:48:50.390625000 -0500
@@ -328,7 +328,7 @@
 	while ($i > 1) {
 		$i--;
 
-		$parent_tier = substr($tier_string, 0, $i * CHARS_PER_TIER);
+		$parent_tier = tree_tier_string(substr($tier_string, 0, $i * CHARS_PER_TIER));
 		$parent_variable = "sess_tree_leaf_expand_" . $leaf["graph_tree_id"] . "_" . $parent_tier;
 
 		$effective = @$_SESSION[$parent_variable];
@@ -365,8 +365,6 @@
    @returns - the string representing the leaf position
 */
 function tree_tier_string($order_key, $chars_per_tier = CHARS_PER_TIER) {
-	$root_test = str_pad('', $chars_per_tier, '0');
-
 	$new_string = preg_replace("/0+$/",'',$order_key);
 
 	return $new_string;


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cacti.spec	14 Sep 2007 21:30:22 -0000	1.13
+++ cacti.spec	21 Sep 2007 14:57:08 -0000	1.14
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -13,6 +13,11 @@
 
 Patch1: cacti-0.8.6h-dbcfg.patch
 Patch2: CVE-2007-3112.patch
+Patch3: ping_php_version4_snmpgetnext.patch
+Patch4: tree_console_missing_hosts.patch
+Patch5: thumbnail_graphs_not_working.patch
+Patch6: graph_debug_lockup_fix.patch
+Patch7: snmpwalk_fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +39,11 @@
 %setup -q
 %patch1 -p0
 %patch2 -p3
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
+- Added rest of official patches
+
 * Fri Sep 14 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-8
 - Fix for CVE-2007-3112 bz#243592
 


--- dec06-vulnerability-poller-0.8.6i.patch DELETED ---


--- dec06-vulnerability-scripts-0.8.6i.patch DELETED ---


--- fix_search_session_clear_issue.patch DELETED ---


--- fix_sql_syntax_related_to_default_rra_id.patch DELETED ---


--- import_template_argument_space_removal.patch DELETED ---


--- mysql_5x_strict.patch DELETED ---


--- nth_percentile_empty_return_set_issue.patch DELETED ---


--- poller_output_remainder.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 15:14:14 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 21 Sep 2007 11:14:14 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-xen-sleazy-fpu-i386.patch, NONE, 
	1.1 linux-2.6-xen-sleazy-fpu-x86_64.patch, NONE,
	1.1 xen-vmx-fpu-ts-fix.patch, NONE, 1.1 kernel-xen.spec, 1.47, 1.48
Message-ID: <200709211514.l8LFEEWO011525@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11474

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-sleazy-fpu-i386.patch 
	linux-2.6-xen-sleazy-fpu-x86_64.patch xen-vmx-fpu-ts-fix.patch 
Log Message:
Floating point fixes

- Fix for bug #294011 (floating point corruption)
  (changeset 8c24767501ff from Xen 3.1.1)
- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
  programs



linux-2.6-xen-sleazy-fpu-i386.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-i386.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190313016 10800
# Node ID 8792a16b6dd531cad0ed28d9bef86e3e597ea8db
# Parent  35983eae211a531bd50bcd177a9da77d48631e2c
Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/entry-xen.S
--- a/arch/i386/kernel/entry-xen.S	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
@@ -950,7 +950,9 @@ device_available_emulate:
 device_available_emulate:
 #endif
 	preempt_stop(CLBR_ANY)
-	call math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	call __math_state_restore
 	jmp ret_from_exception
 	CFI_ENDPROC
 
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -597,7 +597,9 @@ struct task_struct fastcall * __switch_t
 		mcl->op      = __HYPERVISOR_fpu_taskswitch;
 		mcl->args[0] = 1;
 		mcl++;
-	}
+	} else
+		prev_p->fpu_counter = 0;
+
 #if 0 /* lazy fpu sanity check */
 	else BUG_ON(!(read_cr0() & 8));
 #endif
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1012,17 +1012,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	/* NB. 'clts' is done for us by Xen during virtual trap. */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION
diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c	Wed Aug 08 16:15:30 2007 -0300
+++ b/arch/i386/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
@@ -1041,17 +1041,22 @@ fastcall unsigned long patch_espfix_desc
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
 
-	clts();		/* Allow maths ops (or we recurse) */
 	if (!tsk_used_math(tsk))
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
 	tsk->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();		/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 #ifndef CONFIG_MATH_EMULATION

linux-2.6-xen-sleazy-fpu-x86_64.patch:

--- NEW FILE linux-2.6-xen-sleazy-fpu-x86_64.patch ---
# HG changeset patch
# User "Eduardo Habkost <ehabkost at redhat.com>"
# Date 1190317568 10800
# Node ID ab958de6e67d1b4f6c321cd46d2793d2409b91fd
# Parent  8792a16b6dd531cad0ed28d9bef86e3e597ea8db
x86_64: Fix sleazy-fpu under Xen

- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
- Make it call clts() before restoring the fpu state during task switch
  (clts() will still not be called during the device_not_available trap,
  because it is not needed under Xen)

diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 16:46:08 2007 -0300
@@ -1071,7 +1071,9 @@ END(simd_coprocessor_error)
 END(simd_coprocessor_error)
 
 ENTRY(device_not_available)
-	zeroentry math_state_restore
+	# 'clts' is done by Xen during virtual trap, so we can call
+	# __math_state_restore instead of math_state_restore
+	zeroentry __math_state_restore
 END(device_not_available)
 
 	/* runs on exception stack */
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -637,7 +637,8 @@ __switch_to(struct task_struct *prev_p, 
 	if (prev_p->thread_info->status & TS_USEDFPU) {
 		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
 		HYPERVISOR_fpu_taskswitch(1);
-	}
+	} else
+		prev_p->fpu_counter = 0;
 
 	/* 
 	 * Switch the PDA context.
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1064,16 +1064,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-        /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 
diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
+++ b/arch/x86_64/kernel/traps.c	Thu Sep 20 16:46:08 2007 -0300
@@ -1056,16 +1056,21 @@ asmlinkage void __attribute__((weak)) mc
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  */
-asmlinkage void math_state_restore(void)
+asmlinkage void __math_state_restore(void)
 {
 	struct task_struct *me = current;
-	clts();			/* Allow maths ops (or we recurse) */
 
 	if (!used_math())
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+}
+
+asmlinkage void math_state_restore(void)
+{
+	clts();			/* Allow maths ops (or we recurse) */
+	__math_state_restore();
 }
 
 void __init trap_init(void)

xen-vmx-fpu-ts-fix.patch:

--- NEW FILE xen-vmx-fpu-ts-fix.patch ---
# HG changeset patch
# User Steven Hand <steven at xensource.com>
# Date 1189784017 -3600
# Node ID 8c24767501ff25f28a0dab638116b560de294da7
# Parent  eec47edb2a25fde7075e2e17dee638216d2e5582
Ensure CR0.TS is set for VMX domains regardless of the current
state of the real TS bit. This fixes a number of subtle FP
corruption issues within PV domains when running alongside VMX ones.

Signed-off-by: Steven Hand <steven at xensource.com>
xen-unstable changeset: 15216:6f13c3be08fa4c044868144672783f7b1341999a
xen-unstable date: Mon Jun 04 16:47:48 2007 +0100

diff -r eec47edb2a25 -r 8c24767501ff xen/arch/x86/hvm/vmx/vmcs.c
--- xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
+++ xen/arch/x86/hvm/vmx/vmcs.c	Fri Sep 14 16:33:37 2007 +0100
@@ -338,7 +338,7 @@ static void construct_vmcs(struct vcpu *
 #endif
 
     /* Host control registers. */
-    __vmwrite(HOST_CR0, read_cr0());
+    __vmwrite(HOST_CR0, read_cr0() | X86_CR0_TS);
     __vmwrite(HOST_CR4, read_cr4());
 
     /* Host CS:RIP. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kernel-xen.spec	13 Sep 2007 19:57:59 -0000	1.47
+++ kernel-xen.spec	21 Sep 2007 15:13:42 -0000	1.48
@@ -408,6 +408,11 @@
 Patch963: linux-2.6-xen-add-packet_auxdata-cmsg-2.patch
 Patch964: linux-2.6-xen-af_packet-no-skb_checksum_setup.patch
 
+# Fix sleazy-FPU implementation
+Patch965: linux-2.6-xen-sleazy-fpu-i386.patch
+Patch966: linux-2.6-xen-sleazy-fpu-x86_64.patch
+
+
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -522,6 +527,12 @@
 # Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
 Patch20002: xen-vpic-irqbase-mode.patch
 
+# Fix bz#294011: floating point corruption issues
+# changeset 8c24767501ff from Xen 3.1.1
+Patch20003: xen-vmx-fpu-ts-fix.patch
+
+
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -939,6 +950,8 @@
 %patch962 -p1
 %patch963 -p1
 %patch964 -p1
+%patch965 -p1
+%patch966 -p1
 %endif
 
 #
@@ -1168,6 +1181,7 @@
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
+%patch20003 -p1
 
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
@@ -2058,6 +2072,12 @@
 #  - tux.
 
 %changelog
+* Fri Sep 21 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Add fix for bug #294011 (floating point corruption)
+  (changeset 8c24767501ff from Xen 3.1.1)
+- Fix sleazy-fpu implementation to actually avoid on fpu-intensive
+  programs
+
 * Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Hypervisor-side of fix for bug #248398: HVM domain hangs during (F-7)
   install. Backport of fix from xen-unstable: 15239:656b8175f4f2.



From fedora-extras-commits at redhat.com  Fri Sep 21 15:17:40 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:17:40 -0400
Subject: rpms/kdelibs4/devel kdelibs4.spec,1.1,1.2
Message-ID: <200709211517.l8LFHe5u011760@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11687/devel

Modified Files:
	kdelibs4.spec 
Log Message:
ExcludeArch: ppc64 (#300571)


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/kdelibs4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs4.spec	21 Sep 2007 14:22:15 -0000	1.1
+++ kdelibs4.spec	21 Sep 2007 15:17:08 -0000	1.2
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -24,6 +24,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300571
+ExcludeArch: ppc64
+
 # for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
@@ -230,7 +233,10 @@
 
 
 %changelog
-* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-10
+- ExcludeArch: ppc64 (#300571)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.93.0-9
 - -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 - update sources
 - sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



From fedora-extras-commits at redhat.com  Fri Sep 21 15:19:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:19:56 -0400
Subject: rpms/kdelibs4/F-7 kdelibs4.spec,1.1,1.2
Message-ID: <200709211519.l8LFJunH011877@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11849/F-7

Modified Files:
	kdelibs4.spec 
Log Message:
ExcludeArch: ppc64 (#300571)


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs4.spec	21 Sep 2007 14:26:01 -0000	1.1
+++ kdelibs4.spec	21 Sep 2007 15:19:24 -0000	1.2
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -24,6 +24,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300571
+ExcludeArch: ppc64
+
 # for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
@@ -230,7 +233,10 @@
 
 
 %changelog
-* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-10
+- ExcludeArch: ppc64 (#300571)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.93.0-9
 - -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 - update sources
 - sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



From fedora-extras-commits at redhat.com  Fri Sep 21 15:33:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:33:56 -0400
Subject: rpms/kdepimlibs/F-7 kdepimlibs.spec,1.9,1.10
Message-ID: <200709211533.l8LFXu6h012646@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597/F-7

Modified Files:
	kdepimlibs.spec 
Log Message:
ExcludeArch: ppc64 (#300591)


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/kdepimlibs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
+++ kdepimlibs.spec	21 Sep 2007 15:33:24 -0000	1.10
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,6 +12,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300591
+ExcludeArch: ppc64
+
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -119,6 +122,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- ExcludeArch: ppc64 (#300591)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - delete KMail/KNode transport migration scripts which break KDE 3
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:33:59 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 11:33:59 -0400
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.9,1.10
Message-ID: <200709211533.l8LFXx69012650@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12597/devel

Modified Files:
	kdepimlibs.spec 
Log Message:
ExcludeArch: ppc64 (#300591)


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdepimlibs.spec	20 Sep 2007 14:47:10 -0000	1.9
+++ kdepimlibs.spec	21 Sep 2007 15:33:26 -0000	1.10
@@ -2,7 +2,7 @@
 Name: kdepimlibs
 
 Version: 3.93.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -12,6 +12,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# rh#300591
+ExcludeArch: ppc64
+
 # probably don't need to keep this, it was very short-lived -- Rex
 Obsoletes: kdepimlibs4 < %{version}-%{release}
 Provides:  kdepimlibs4 = %{version}-%{release}
@@ -119,6 +122,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
+- ExcludeArch: ppc64 (#300591)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
 - delete KMail/KNode transport migration scripts which break KDE 3
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:41:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 11:41:47 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.44, 1.45 NetworkManager.spec,
	1.165, 1.166 sources, 1.63, 1.64
Message-ID: <200709211541.l8LFfltT012974@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	20 Sep 2007 14:06:41 -0000	1.44
+++ .cvsignore	21 Sep 2007 15:41:14 -0000	1.45
@@ -4,3 +4,5 @@
 nm-applet-0.7.0.svn129.tar.gz
 NetworkManager-0.7.0.svn2833.tar.gz
 nm-applet-0.7.0.svn186.tar.gz
+NetworkManager-0.7.0.svn2844.tar.gz
+nm-applet-0.7.0.svn190.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- NetworkManager.spec	20 Sep 2007 14:06:41 -0000	1.165
+++ NetworkManager.spec	21 Sep 2007 15:41:14 -0000	1.166
@@ -7,18 +7,18 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2833
+%define snapshot svn2844
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.2.%{snapshot}%{?dist}
+Release: 0.3.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn186.tar.gz
+Source1: nm-applet-%{version}.svn190.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.7.0-missing-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -259,6 +259,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
+- New snapshot
+
 * Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2833
 - New SVN snapshot of 0.7 that sucks less
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	20 Sep 2007 14:06:41 -0000	1.63
+++ sources	21 Sep 2007 15:41:14 -0000	1.64
@@ -1,2 +1,2 @@
-da84c73ca684fd3abb154ea51c9a06fe  NetworkManager-0.7.0.svn2833.tar.gz
-98fefe2757a8be652e315b251941ed66  nm-applet-0.7.0.svn186.tar.gz
+f30eb054387f0a7efb2fdda7ed43c8a9  NetworkManager-0.7.0.svn2844.tar.gz
+bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 15:49:02 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 21 Sep 2007 11:49:02 -0400
Subject: devel/pygtk2 pygtk-treeview-convert.patch, NONE, 1.1 pygtk2.spec,
	1.8, 1.9
Message-ID: <200709211549.l8LFn2O1013499@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/pygtk2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13430

Modified Files:
	pygtk2.spec 
Added Files:
	pygtk-treeview-convert.patch 
Log Message:
* Fri Sep 21 2007 Jeremy Katz <katzj at redhat.com> - 2.12.0-2.fc8
- fix crash using TreeView.convert_widget_to_bin_window_coords


pygtk-treeview-convert.patch:

--- NEW FILE pygtk-treeview-convert.patch ---
Index: gtk/gtktreeview.override
===================================================================
--- gtk/gtktreeview.override	(revision 2907)
+++ gtk/gtktreeview.override	(working copy)
@@ -3321,7 +3321,7 @@
     return Py_None;
 }
 %%
-override gtk_tree_view_convert_widget_to_bin_window_coords args
+override gtk_tree_view_convert_widget_to_bin_window_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_widget_to_bin_window_coords(PyGObject *self,
                                                         PyObject *args,
@@ -3342,7 +3342,7 @@
     return Py_BuildValue("(ii)", window_x, window_y);
 }
 %%
-override gtk_tree_view_convert_widget_to_tree_coords args
+override gtk_tree_view_convert_widget_to_tree_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_widget_to_tree_coords(PyGObject *self,
                                                   PyObject *args,
@@ -3363,7 +3363,7 @@
     return Py_BuildValue("(ii)", tree_x, tree_y);
 }
 %%
-override gtk_tree_view_convert_tree_to_widget_coords args
+override gtk_tree_view_convert_tree_to_widget_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_tree_to_widget_coords(PyGObject *self,
                                                   PyObject *args,
@@ -3384,7 +3384,7 @@
     return Py_BuildValue("(ii)", widget_x, widget_y);
 }
 %%
-override gtk_tree_view_convert_tree_to_bin_window_coords args
+override gtk_tree_view_convert_tree_to_bin_window_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_tree_to_bin_window_coords(PyGObject *self,
                                                       PyObject *args,
@@ -3405,7 +3405,7 @@
     return Py_BuildValue("(ii)", window_x, window_y);
 }
 %%
-override gtk_tree_view_convert_bin_window_to_widget_coords args
+override gtk_tree_view_convert_bin_window_to_widget_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_bin_window_to_widget_coords(PyGObject *self,
                                                         PyObject *args,
@@ -3426,7 +3426,7 @@
     return Py_BuildValue("(ii)", widget_x, widget_y);
 }
 %%
-override gtk_tree_view_convert_bin_window_to_tree_coords args
+override gtk_tree_view_convert_bin_window_to_tree_coords kwargs
 static PyObject*
 _wrap_gtk_tree_view_convert_bin_window_to_tree_coords(PyGObject *self,
                                                       PyObject *args,


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/devel/pygtk2/pygtk2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygtk2.spec	16 Sep 2007 22:32:18 -0000	1.8
+++ pygtk2.spec	21 Sep 2007 15:48:29 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name: pygtk2
 Version: 2.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -21,6 +21,9 @@
 # RH bug #217430 / GNOME bug #380020
 Patch1: pygtk2-2.10.3-install-extrafuncs.patch
 
+# fix segfault using treeview coordinate conversion methods (GNOME #479012)
+Patch2: pygtk-treeview-convert.patch
+
 ### Dependencies ###
 
 Requires: gtk2 >= 2.9.4
@@ -83,6 +86,7 @@
 %setup -q -n pygtk-%{version}
 %patch0 -p1
 %patch1 -p1 -b .install-extrafuncs
+%patch2 -p0 
 
 %build
 %configure --enable-thread --enable-numpy
@@ -144,6 +148,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Fri Sep 21 2007 Jeremy Katz <katzj at redhat.com> - 2.12.0-2.fc8
+- fix crash using TreeView.convert_widget_to_bin_window_coords
+
 * Sun Sep 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0
 



From fedora-extras-commits at redhat.com  Fri Sep 21 15:53:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 11:53:54 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-missing-includes.patch, 1.4, 1.5
Message-ID: <200709211553.l8LFrsYm013786@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652

Modified Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
Remove upstreamed bit

NetworkManager-0.7.0-missing-includes.patch:

Index: NetworkManager-0.7.0-missing-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-missing-includes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-0.7.0-missing-includes.patch	20 Sep 2007 14:32:38 -0000	1.4
+++ NetworkManager-0.7.0-missing-includes.patch	21 Sep 2007 15:53:21 -0000	1.5
@@ -1,14 +1,3 @@
-diff -up NetworkManager-0.7.0/src/nm-netlink.c.missing-includes NetworkManager-0.7.0/src/nm-netlink.c
---- NetworkManager-0.7.0/src/nm-netlink.c.missing-includes	2007-09-20 10:29:48.000000000 -0400
-+++ NetworkManager-0.7.0/src/nm-netlink.c	2007-09-20 10:29:59.000000000 -0400
-@@ -23,6 +23,7 @@
- #include "nm-utils.h"
- 
- #include <glib.h>
-+#include <signal.h>
- #include <pthread.h>
- #include <unistd.h>
- 
 diff -up NetworkManager-0.7.0/test/Makefile.am.missing-includes NetworkManager-0.7.0/test/Makefile.am
 --- NetworkManager-0.7.0/test/Makefile.am.missing-includes	2007-09-13 07:43:42.000000000 -0400
 +++ NetworkManager-0.7.0/test/Makefile.am	2007-09-20 09:08:57.000000000 -0400



From fedora-extras-commits at redhat.com  Fri Sep 21 15:59:39 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 21 Sep 2007 11:59:39 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-hide-xscreensaver.menu, 
	1.1, 1.2 gnome-screensaver.spec, 1.165, 1.166
Message-ID: <200709211559.l8LFxdf3013924@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13904

Modified Files:
	gnome-screensaver-hide-xscreensaver.menu 
	gnome-screensaver.spec 
Log Message:
- hide xscreensaver menu if gnome-screensaver is installed
  (bug 300401)



Index: gnome-screensaver-hide-xscreensaver.menu
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-hide-xscreensaver.menu,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-hide-xscreensaver.menu	26 Sep 2005 19:08:04 -0000	1.1
+++ gnome-screensaver-hide-xscreensaver.menu	21 Sep 2007 15:59:06 -0000	1.2
@@ -1,9 +1,12 @@
 <Menu>
-  <Name>Preferences</Name>
-  <Exclude>
-    <Filename>screensaver-properties.desktop</Filename>
-  </Exclude>
-  <Exclude>
-    <Filename>gnome-screensaver-properties.desktop</Filename>
-  </Exclude>
+<Name>Preferences</Name>
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Exclude>
+      <Filename>screensaver-properties.desktop</Filename>
+    </Exclude>
+    <Exclude>
+      <Filename>gnome-screensaver-properties.desktop</Filename>
+    </Exclude>
+  </Menu>
 </Menu>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-screensaver.spec	20 Sep 2007 21:42:12 -0000	1.165
+++ gnome-screensaver.spec	21 Sep 2007 15:59:06 -0000	1.166
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -130,6 +130,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
+- hide xscreensaver menu if gnome-screensaver is installed
+  (bug 300401)
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Make the default theme setting work 
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:09:34 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 21 Sep 2007 12:09:34 -0400
Subject: rpms/online-desktop/devel .cvsignore, 1.9, 1.10 online-desktop.spec,
	1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200709211609.l8LG9YgK020461@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20426

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Sep 2007 21:57:17 -0000	1.9
+++ .cvsignore	21 Sep 2007 16:09:00 -0000	1.10
@@ -1 +1 @@
-online-desktop-0.2.15.tar.gz
+online-desktop-0.2.16.tar.gz


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- online-desktop.spec	20 Sep 2007 21:57:17 -0000	1.13
+++ online-desktop.spec	21 Sep 2007 16:09:00 -0000	1.14
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.15
+Version:        0.2.16
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -15,7 +15,6 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
-Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -187,6 +186,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
 - dbus service


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Sep 2007 21:57:17 -0000	1.9
+++ sources	21 Sep 2007 16:09:00 -0000	1.10
@@ -1 +1 @@
-97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz
+f40b27522ead6212aadd28e4e9543395  online-desktop-0.2.16.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:06 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 21 Sep 2007 12:15:06 -0400
Subject: rpms/bigboard/devel .cvsignore, 1.27, 1.28 bigboard.spec, 1.37,
	1.38 sources, 1.28, 1.29
Message-ID: <200709211615.l8LGF6X6020757@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	20 Sep 2007 16:17:30 -0000	1.27
+++ .cvsignore	21 Sep 2007 16:14:33 -0000	1.28
@@ -1 +1 @@
-bigboard-0.5.17.tar.gz
+bigboard-0.5.18.tar.gz


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bigboard.spec	20 Sep 2007 16:28:36 -0000	1.37
+++ bigboard.spec	21 Sep 2007 16:14:33 -0000	1.38
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.17
+Version:        0.5.18
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -94,6 +94,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
 - new upstream
 - add br


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	20 Sep 2007 16:17:30 -0000	1.28
+++ sources	21 Sep 2007 16:14:33 -0000	1.29
@@ -1 +1 @@
-1fdf687a8ed9eb1f8f6f6003773cb9ad  bigboard-0.5.17.tar.gz
+4acfe82aae3056c12809e8f42b87e91f  bigboard-0.5.18.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:04 -0700
Subject: [pkgdb] solarwolf was added for limb
Message-ID: <200709211615.l8LGF5Gl018718@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package solarwolf with summary A Python port of SolarFox
Kevin Fenzi (kevin) has approved Package solarwolf
Kevin Fenzi (kevin) has added a Fedora devel branch for solarwolf with an owner of limb
Kevin Fenzi (kevin) has approved solarwolf in Fedora devel
Kevin Fenzi (kevin) has approved Package solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solarwolf



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, 6) updated by kevin
Message-ID: <200709211615.l8LGFIeW018779@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solarwolf



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, devel) updated by kevin
Message-ID: <200709211615.l8LGFJUi018792@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solarwolf



From fedora-extras-commits at redhat.com  Fri Sep 21 16:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:15:18 -0700
Subject: [pkgdb] solarwolf (Fedora, 7) updated by kevin
Message-ID: <200709211615.l8LGFJdx018807@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for solarwolf
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on solarwolf (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on solarwolf (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/solarwolf



From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:27 -0400
Subject: rpms/solarwolf - New directory
Message-ID: <200709211616.l8LGGRkx020982@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf

Log Message:
Directory /cvs/extras/rpms/solarwolf added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:29 -0400
Subject: rpms/solarwolf/devel - New directory
Message-ID: <200709211616.l8LGGTJU020998@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf/devel

Log Message:
Directory /cvs/extras/rpms/solarwolf/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:33 -0400
Subject: rpms/solarwolf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211616.l8LGGX5Y021023@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf

Added Files:
	Makefile import.log 
Log Message:
Setup of module solarwolf


--- NEW FILE Makefile ---
# Top level Makefile for module solarwolf
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:16:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:16:35 -0400
Subject: rpms/solarwolf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211616.l8LGGZV8021039@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa20953/rpms/solarwolf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module solarwolf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: solarwolf
# $Id: Makefile,v 1.1 2007/09/21 16:16:33 kevin Exp $
NAME := solarwolf
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:18:07 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 12:18:07 -0400
Subject: rpms/gkrellm-themes/devel dead.package, NONE, 1.1 .cvsignore, 1.3, 
	NONE Makefile, 1.2, NONE gkrellm-themes.spec, 1.10, NONE sources,
	1.3, NONE
Message-ID: <200709211618.l8LGI75k021233@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21226

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gkrellm-themes.spec sources 
Log Message:
EOL'd before F8 because of missing license information in the vast majority
of included themes.



--- NEW FILE dead.package ---
EOL'd before F8 because of missing license information in the vast majority
of included themes.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gkrellm-themes.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:14 -0700
Subject: [pkgdb] haproxy was added for jjh
Message-ID: <200709211621.l8LGLF2q011809@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package haproxy with summary TCP/HTTP reverse proxy for high availability environments
Kevin Fenzi (kevin) has approved Package haproxy
Kevin Fenzi (kevin) has added a Fedora devel branch for haproxy with an owner of jjh
Kevin Fenzi (kevin) has approved haproxy in Fedora devel
Kevin Fenzi (kevin) has approved Package haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora, 6) updated by kevin
Message-ID: <200709211621.l8LGLVq3020559@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora, 7) updated by kevin
Message-ID: <200709211621.l8LGLWBj020570@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211621.l8LGLXKJ020599@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:21:31 -0700
Subject: [pkgdb] haproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <200709211621.l8LGLWcR020584@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for haproxy
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on haproxy (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on haproxy (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on haproxy (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/haproxy



From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:06 -0400
Subject: rpms/haproxy - New directory
Message-ID: <200709211622.l8LGM6WT021495@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy

Log Message:
Directory /cvs/extras/rpms/haproxy added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:10 -0400
Subject: rpms/haproxy/devel - New directory
Message-ID: <200709211622.l8LGMAEV021509@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy/devel

Log Message:
Directory /cvs/extras/rpms/haproxy/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:14 -0400
Subject: rpms/haproxy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211622.l8LGMEbd021538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy

Added Files:
	Makefile import.log 
Log Message:
Setup of module haproxy


--- NEW FILE Makefile ---
# Top level Makefile for module haproxy
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:22:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:22:17 -0400
Subject: rpms/haproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709211622.l8LGMHWf021554@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21466/rpms/haproxy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module haproxy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: haproxy
# $Id: Makefile,v 1.1 2007/09/21 16:22:15 kevin Exp $
NAME := haproxy
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:25:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:25:55 -0700
Subject: [pkgdb] biosdevname was added for mdomsch
Message-ID: <200709211625.l8LGPuYK013161@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package biosdevname with summary Udev helper for naming devices per BIOS names
Kevin Fenzi (kevin) has approved Package biosdevname
Kevin Fenzi (kevin) has added a Fedora devel branch for biosdevname with an owner of mdomsch
Kevin Fenzi (kevin) has approved biosdevname in Fedora devel
Kevin Fenzi (kevin) has approved Package biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, 6) updated by kevin
Message-ID: <200709211626.l8LGQEAM021868@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora 6)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 6) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 6) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora 6) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <200709211626.l8LGQEwe021882@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora EPEL 4)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 4) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 4) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora EPEL 4) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, devel) updated by kevin
Message-ID: <200709211626.l8LGQFnh021895@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora devel) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora devel) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora devel) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora, 7) updated by kevin
Message-ID: <200709211626.l8LGQFZx021910@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 7) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 7) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora 7) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:26:13 -0700
Subject: [pkgdb] biosdevname (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211626.l8LGQG6D021924@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for biosdevname
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on biosdevname (Fedora EPEL 5)
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 5) for harald
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 5) for harald
Kevin Fenzi (kevin) approved watchbugzilla on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved watchcommits on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved commit on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved build on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved approveacls on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) approved checkout on biosdevname (Fedora EPEL 5) for mebrown
Kevin Fenzi (kevin) Approved cvsextras for commit access on biosdevname (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/biosdevname



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:48 -0400
Subject: rpms/biosdevname - New directory
Message-ID: <200709211626.l8LGQmnc022106@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname

Log Message:
Directory /cvs/extras/rpms/biosdevname added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:52 -0400
Subject: rpms/biosdevname/devel - New directory
Message-ID: <200709211626.l8LGQqbh022120@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname/devel

Log Message:
Directory /cvs/extras/rpms/biosdevname/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:55 -0400
Subject: rpms/biosdevname Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211626.l8LGQtDa022145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname

Added Files:
	Makefile import.log 
Log Message:
Setup of module biosdevname


--- NEW FILE Makefile ---
# Top level Makefile for module biosdevname
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:26:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:26:58 -0400
Subject: rpms/biosdevname/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211626.l8LGQw4x022161@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22075/rpms/biosdevname/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module biosdevname


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: biosdevname
# $Id: Makefile,v 1.1 2007/09/21 16:26:55 kevin Exp $
NAME := biosdevname
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:27:02 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 12:27:02 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.166,1.167
Message-ID: <200709211627.l8LGR2Tu022240@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22051

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
- Build requires perl(ExtUtils::MakeMaker).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- foomatic.spec	21 Sep 2007 14:30:30 -0000	1.166
+++ foomatic.spec	21 Sep 2007 16:26:30 -0000	1.167
@@ -48,6 +48,7 @@
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
@@ -262,6 +263,7 @@
 
 %changelog
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-51
+- Build requires perl(ExtUtils::MakeMaker).
 - Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:28:24 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 12:28:24 -0400
Subject: rpms/foomatic/F-7 foomatic.spec,1.157,1.158
Message-ID: <200709211628.l8LGSO0U022571@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22553

Modified Files:
	foomatic.spec 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
- Build requires perl(ExtUtils::MakeMaker).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-7/foomatic.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- foomatic.spec	21 Sep 2007 14:34:11 -0000	1.157
+++ foomatic.spec	21 Sep 2007 16:27:51 -0000	1.158
@@ -48,6 +48,7 @@
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
+BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
 BuildRequires:	autoconf, automake
@@ -256,6 +257,7 @@
 
 %changelog
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47.2
+- Build requires perl(ExtUtils::MakeMaker).
 - Updated filters to 3.0-20070919.
 - Updated db to 20070919.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 16:32:48 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 12:32:48 -0400
Subject: rpms/udev/devel
	0026-remove-extra-space-from-udevinfo-symlink-output.patch, NONE,
	1.1 0027-udevinfo-simplify-symlink-printing-logic.patch, NONE,
	1.1 0028-prevent-wrong-symlink-creation-if-database-disagress.patch, 
	NONE, 1.1 0029-fix-wrong-variable-used-in-logged-string.patch,
	NONE, 1.1 0030-update-README.patch, NONE,
	1.1 0031-rule_generator-move-all-policy-from-write_net_rules.patch,
	NONE, 1.1 udev.spec, 1.220,
	1.221 0026-Removed-extra-space-from-udevinfo-symlink-output.patch,
	1.1, NONE
Message-ID: <200709211632.l8LGWmD0022877@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22796

Modified Files:
	udev.spec 
Added Files:
	0026-remove-extra-space-from-udevinfo-symlink-output.patch 
	0027-udevinfo-simplify-symlink-printing-logic.patch 
	0028-prevent-wrong-symlink-creation-if-database-disagress.patch 
	0029-fix-wrong-variable-used-in-logged-string.patch 
	0030-update-README.patch 
	0031-rule_generator-move-all-policy-from-write_net_rules.patch 
Removed Files:
	0026-Removed-extra-space-from-udevinfo-symlink-output.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 115-4
- more upstream fixes from git


0026-remove-extra-space-from-udevinfo-symlink-output.patch:

--- NEW FILE 0026-remove-extra-space-from-udevinfo-symlink-output.patch ---
>From c952356635a30f610a4d1b84e84d678fee7772c8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Sep 2007 15:24:42 +0200
Subject: [PATCH] remove extra space from udevinfo symlink output

---
 udevinfo.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index be9aa76..8e54705 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -389,10 +389,16 @@ int main(int argc, char *argv[], char *envp[])
 				goto exit;
 			if (root)
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s/%s ", udev_root, name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s/%s ", udev_root, name_loop->name);
+					else
+						printf("%s/%s", udev_root, name_loop->name);
 			else
 				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s ", name_loop->name);
+					if (name_loop->node.next != &udev->symlink_list)
+						printf("%s ", name_loop->name);
+					else
+						printf("%s", name_loop->name);
 			printf("\n");
 			break;
 		case QUERY_PATH:
-- 
1.5.2.4


0027-udevinfo-simplify-symlink-printing-logic.patch:

--- NEW FILE 0027-udevinfo-simplify-symlink-printing-logic.patch ---
>From 18770246edda383eef523a7e3aedd08ebbbde5cf Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 15:25:29 +0200
Subject: [PATCH] udevinfo: simplify symlink printing logic

---
 udevinfo.c |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/udevinfo.c b/udevinfo.c
index 8e54705..eb9b353 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -385,21 +385,14 @@ int main(int argc, char *argv[], char *envp[])
 				printf("%s\n", udev->name);
 			break;
 		case QUERY_SYMLINK:
-			if (list_empty(&udev->symlink_list))
-				goto exit;
-			if (root)
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					if (name_loop->node.next != &udev->symlink_list)
-						printf("%s/%s ", udev_root, name_loop->name);
-					else
-						printf("%s/%s", udev_root, name_loop->name);
-			else
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					if (name_loop->node.next != &udev->symlink_list)
-						printf("%s ", name_loop->name);
-					else
-						printf("%s", name_loop->name);
-			printf("\n");
+			list_for_each_entry(name_loop, &udev->symlink_list, node) {
+				char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+
+				if (root)
+					printf("%s/%s%c", udev_root, name_loop->name, c);
+				else
+					printf("%s%c", name_loop->name, c);
+			}
 			break;
 		case QUERY_PATH:
 			printf("%s\n", udev->dev->devpath);
-- 
1.5.2.4


0028-prevent-wrong-symlink-creation-if-database-disagress.patch:

--- NEW FILE 0028-prevent-wrong-symlink-creation-if-database-disagress.patch ---
>From b2d1ae727e78ac3e22caa11798360d87775095ff Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 20 Sep 2007 19:38:58 +0200
Subject: [PATCH] prevent wrong symlink creation if database disagress with current rules

---
 udev_node.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/udev_node.c b/udev_node.c
index 556a442..c620e4a 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -218,14 +218,16 @@ static int update_link(struct udevice *udev, const char *name)
 		if (strcmp(udev->dev->devpath, device->name) == 0) {
 			info("compare (our own) priority of '%s' %i >= %i",
 			     udev->dev->devpath, udev->link_priority, priority);
-			if (target[0] == '\0' || udev->link_priority >= priority) {
+			if (strcmp(udev->name, name) == 0) {
+				info("'%s' is our device node, database inconsistent, skip link update", udev->name);
+			} else if (target[0] == '\0' || udev->link_priority >= priority) {
 				priority = udev->link_priority;
 				strlcpy(target, udev->name, sizeof(target));
 			}
 			continue;
 		}
 
-		/* or something else, then read priority from database */
+		/* another device, read priority from database */
 		udev_db = udev_device_init(NULL);
 		if (udev_db == NULL)
 			continue;
-- 
1.5.2.4


0029-fix-wrong-variable-used-in-logged-string.patch:

--- NEW FILE 0029-fix-wrong-variable-used-in-logged-string.patch ---
>From 3a3d078cfd3a3adb1c9f66e0df95d704c3a92504 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 00:55:19 +0200
Subject: [PATCH] fix wrong variable used in logged string

---
 udev_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/udev_rules.c b/udev_rules.c
index 3ec8477..5ae4aa2 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1446,7 +1446,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 	}
 
 	if (!name_set) {
-		info("no node name set, will use kernel name '%s'", udev->name);
+		info("no node name set, will use kernel name '%s'", udev->dev->kernel);
 		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 	}
 
-- 
1.5.2.4


0030-update-README.patch:

--- NEW FILE 0030-update-README.patch ---
>From b317b96c15bc61d59f138515e71f05bbd8f7b2ff Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 10:33:36 +0200
Subject: [PATCH] update README

---
 README |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 74aa790..b37d0d5 100644
--- a/README
+++ b/README
@@ -3,13 +3,10 @@ udev - userspace device management
 For more information see the files in the docs/ directory.
 
 Important Note:
-  Integrating udev in the system is a whole lot of work, has complex dependencies
-  and differs a lot from distro to distro. All major distros depend on udev these
-  days and the system may not work without a proper installed version. The upstream
-  udev project does not support or recommend to replace a distro's udev installation
-  with the upstream version. The installation of a unmodified upstream version may
-  render your system unusable. Until now, there is no "default" setup or a set of
-  "default" rules provided by the upstream udev version.
+  Integrating udev in the system has complex dependencies and differs from distro
+  to distro. All major distros depend on udev these days and the system may not
+  work without a properly installed version. The upstream udev project does not
+  recommend to replace a distro's udev installation with the upstream version.
 
 Requirements:
   - Version 2.6.15 of the Linux kernel for reliable operation of this release of
@@ -21,7 +18,7 @@ Requirements:
     but it is completely silly - don't complain if anything goes wrong.)
 
   - The proc filesystem must be mounted on /proc, the sysfs filesystem must
-    be mounted at /sys. No other location will be supported by udev.
+    be mounted at /sys. No other location is supported by udev.
 
 
 Operation:
-- 
1.5.2.4


0031-rule_generator-move-all-policy-from-write_net_rules.patch:

--- NEW FILE 0031-rule_generator-move-all-policy-from-write_net_rules.patch ---
>From c746922ca26fe18f6b3f3a4516e7236bfc0106b7 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 21 Sep 2007 17:42:46 +0200
Subject: [PATCH] rule_generator: move all policy from write_net_rules to the rules file

---
 .../75-persistent-net-generator.rules              |   43 ++++++--
 extras/rule_generator/write_net_rules              |  119 +++++++++-----------
 2 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index f88627d..d09bc38 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -1,33 +1,56 @@
 # do not edit this file, it will be overwritten on update
 
 # these rules generate rules for persistent network device naming
+#
+# variables used to communicate:
+#   MATCHADDR             MAC address used for the match
+#   MATCHID               bus_id used for the match
+#   MATCHDRV              driver name used for the match
+#   MATCHIFTYPE           interface type match
+#   COMMENT               comment to add to the generated rule
+#   INTERFACE_NAME        requested name supplied by external tool
+#   INTERFACE_NEW         new interface name returned by rule writer
 
 ACTION!="add", GOTO="persistent_net_generator_end"
 SUBSYSTEM!="net", GOTO="persistent_net_generator_end"
 
-# device name whitelist
-KERNEL!="eth*|ath*|wlan*|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
-
 # ignore the interface if a name has already been set
 NAME=="?*", GOTO="persistent_net_generator_end"
 
+# device name whitelist
+KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end"
+
+# add interface type match for some devices
+KERNEL=="wlan*|ath*", ENV{MATCHIFTYPE}="1"
+
 # ignore Xen virtual interfaces
 SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end"
 
-# build device description string to add a comment to the generated rule
+# read MAC address
+ENV{MATCHADDR}="$attr{address}"
+
+# do not use "locally administered" MAC address
+ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""
+
+# do not use empty address
+ENV{MATCHADDR}=="00:00:00:00:00:00", ENV{MATCHADDR}=""
+
+# build comment line for generated rule:
 SUBSYSTEMS=="pci", ENV{COMMENT}="PCI device $attr{vendor}:$attr{device} ($driver)"
 SUBSYSTEMS=="usb", ENV{COMMENT}="USB device 0x$attr{idVendor}:0x$attr{idProduct} ($driver)"
 SUBSYSTEMS=="pcmcia", ENV{COMMENT}="PCMCIA device $attr{card_id}:$attr{manf_id} ($driver)"
-SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{NETDEV}="$id", ENV{NETDRV}="$driver"
 SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire device $attr{host_id})"
-ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device ($driver)"
 
-DRIVERS=="?*", ENV{NETDEV}=="?*", IMPORT{program}="write_net_rules --driver $env{NETDRV} --id $env{NETDEV}"
+# S/390 uses id matches only, do not use MAC address match
+SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{MATCHID}="$id", ENV{MATCHDRV}="$driver", ENV{MATCHADDR}=""
+
+# default comment
+ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device"
 
-# skip "locally administered" MAC addresses
-ATTR{address}=="?[2367abef]:*", GOTO="persistent_net_generator_end"
+# write rule
+DRIVERS=="?*", IMPORT{program}="write_net_rules"
 
-DRIVERS=="?*", ENV{NETDEV}!="?*", IMPORT{program}="write_net_rules $attr{address}"
+# rename interface if needed
 ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}"
 
 LABEL="persistent_net_generator_end"
diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index 62acb88..b25ecfd 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -1,20 +1,25 @@
 #!/bin/sh -e
 #
-# This script is run if the interface (recognized by its MAC address) lacks
-# a rule for persistent naming.
-#
-# If there is already a persistent rule with that interface name then the
-# current interface needs to be renamed.
-#
-# If the interface needs to be renamed, a NAME=value pair will be printed
-# on stdout to allow udev to IMPORT it. Then a rule for the MAC address and
-# interface name is written.
-#
-# (C) 2006 Marco d'Itri <md at Linux.IT>
+# Copyright (C) 2006 Marco d'Itri <md at Linux.IT>
+# Copyright (C) 2007 Kay Sievers <kay.sievers at vrfy.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 version 2 of the License.
+#
+# This script is run to create persistent network device naming rules
+# based on properties of the device.
+# If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed
+# on stdout to allow udev to IMPORT it.
+
+# variables used to communicate:
+#   MATCHADDR             MAC address used for the match
+#   MATCHID               bus_id used for the match
+#   MATCHDRV              driver name used for the match
+#   MATCHIFTYPE           interface type match
+#   COMMENT               comment to add to the generated rule
+#   INTERFACE_NAME        requested name supplied by external tool
+#   INTERFACE_NEW         new interface name returned by rule writer
 
 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
 
@@ -49,78 +54,57 @@ write_rule() {
 
 	echo ""
 	[ "$comment" ] && echo "# $comment"
-	echo "SUBSYSTEM==\"net\", $match, NAME=\"$name\""
+	echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\""
 	} >> $RULES_FILE
 }
 
 if [ -z "$INTERFACE" ]; then
-	echo "Missing \$INTERFACE." >&2
+	echo "missing \$INTERFACE" >&2
 	exit 1
 fi
 
-if [ "$1" ]; then
-    while [ "$*" ] ; do
-	case $1 in
-	    --mac)
-		shift
-		MAC_ADDR=$1
-		shift
-		;;
-	    --driver)
-		shift
-		DRIVER=$1
-		shift
-		;;
-	    --id)
-		shift
-		ID=$1
-		shift
-		;;
-	    *)
-		MAC_ADDR=$1
-		shift
-		;;
-	esac
-    done
-else
-    MAC_ADDR=$(sysread address)
-fi
-
-if [ -z "$DRIVER" ] && [ -z "$ID" ] ; then
-    if [ -z "$MAC_ADDR" ]; then
-	echo "No MAC address for $INTERFACE." >&2
-	exit 1
-    fi
-    if [ "$MAC_ADDR" = "00:00:00:00:00:00" ]; then
-	echo "NULL MAC address for $INTERFACE." >&2
-	exit 1
-    fi
-fi
-
 # Prevent concurrent processes from modifying the file at the same time.
 lock_rules_file
 
 # Check if the rules file is writeable.
 choose_rules_file
 
-# If a rule using the current name already exists then find a new name and
-# report it to udev which will rename the interface.
-basename=${INTERFACE%%[0-9]*}
-if interface_name_taken; then
-	INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
-	if [ ! -t 1 ]; then
-		echo "INTERFACE_NEW=$INTERFACE"
-	fi
+# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces
+if [ "$MATCHADDR" ]; then
+	match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\""
 fi
 
-# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces
-if [ "$MAC_ADDR" ] ; then
-    match="DRIVERS==\"?*\", ATTR{address}==\"$MAC_ADDR\""
-else
-    match="DRIVERS==\"$DRIVER\", KERNELS==\"$ID\""
+if [ "$MATCHDRV" ]; then
+	match="$match, DRIVERS==\"$MATCHDRV\""
+fi
+
+if [ "$MATCHID" ]; then
+	match="$match, KERNELS==\"$MATCHID\""
+fi
+
+if [ "$MATCHIFTYPE" ]; then
+	match="$match, ATTR{type}==\"$MATCHIFTYPE\""
 fi
-if [ $basename = "ath" -o $basename = "wlan" ]; then
-	match="$match, ATTR{type}==\"1\"" # do not match the wifi* interfaces
+
+if [ -z "$match" ]; then
+	echo "missing valid match" >&2
+	exit 1
+fi
+
+if [ "$INTERFACE_NAME" ]; then
+	# external tools may request a custom name
+	COMMENT="$COMMENT (custom name provided by external tool)"
+	if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then
+		INTERFACE=$INTERFACE_NAME;
+		echo "INTERFACE_NEW=$INTERFACE"
+	fi
+else
+	# if a rule using the current name already exists, find a new name
+	basename=${INTERFACE%%[0-9]*}
+	if interface_name_taken; then
+		INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
+		echo "INTERFACE_NEW=$INTERFACE"
+	fi
 fi
 
 write_rule "$match" "$INTERFACE" "$COMMENT"
@@ -128,4 +112,3 @@ write_rule "$match" "$INTERFACE" "$COMMENT"
 unlock_rules_file
 
 exit 0
-
-- 
1.5.2.4



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- udev.spec	20 Sep 2007 12:27:11 -0000	1.220
+++ udev.spec	21 Sep 2007 16:32:15 -0000	1.221
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 115
-Release: 3.20070920git%{?dist}
+Release: 4.20070921git%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -44,6 +44,12 @@
 Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
 Patch25: 0025-rules-add-memstick-module-loading.patch
 Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
+Patch26: 0026-remove-extra-space-from-udevinfo-symlink-output.patch
+Patch27: 0027-udevinfo-simplify-symlink-printing-logic.patch
+Patch28: 0028-prevent-wrong-symlink-creation-if-database-disagress.patch
+Patch29: 0029-fix-wrong-variable-used-in-logged-string.patch
+Patch30: 0030-update-README.patch
+Patch31: 0031-rule_generator-move-all-policy-from-write_net_rules.patch
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
@@ -118,6 +124,11 @@
 %patch22 -p1 -b .git22
 %patch25 -p1 -b .git25
 %patch26 -p1 -b .git26
+%patch27 -p1 -b .git27
+%patch28 -p1 -b .git28
+%patch29 -p1 -b .git29
+%patch30 -p1 -b .git30
+%patch31 -p1 -b .git31
 
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
@@ -402,6 +413,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 115-4
+- more upstream fixes from git
+
 * Thu Sep 20 2007 Harald Hoyer <harald at redhat.com> - 115-3
 - some upstream fixes from git
 - removed last_rule for loop rules


--- 0026-Removed-extra-space-from-udevinfo-symlink-output.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:24 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Fri, 21 Sep 2007 12:35:24 -0400
Subject: rpms/udev/devel udev.spec,1.221,1.222
Message-ID: <200709211635.l8LGZOVU022957@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22939

Modified Files:
	udev.spec 
Log Message:
removed duplicate patch


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- udev.spec	21 Sep 2007 16:32:15 -0000	1.221
+++ udev.spec	21 Sep 2007 16:34:52 -0000	1.222
@@ -43,7 +43,6 @@
 Patch23: 0023-ignore-device-node-names-while-restoring-symlinks-fr.patch
 Patch24: 0024-use-SEQNUM-in-dev-.udev-queue-instead-of-devpath.patch
 Patch25: 0025-rules-add-memstick-module-loading.patch
-Patch26: 0026-Removed-extra-space-from-udevinfo-symlink-output.patch
 Patch26: 0026-remove-extra-space-from-udevinfo-symlink-output.patch
 Patch27: 0027-udevinfo-simplify-symlink-printing-logic.patch
 Patch28: 0028-prevent-wrong-symlink-creation-if-database-disagress.patch



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:35 -0700
Subject: [pkgdb] ladspa-blop-plugins was added for jwrdegoede
Message-ID: <200709211635.l8LGZagr015950@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-blop-plugins with summary Bandlimited LADSPA Oscillator Plugins
Kevin Fenzi (kevin) has approved Package ladspa-blop-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-blop-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-blop-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-blop-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-blop-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:44 -0700
Subject: [pkgdb] ladspa-blop-plugins (Fedora, devel) updated by kevin
Message-ID: <200709211635.l8LGZj1A024597@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-blop-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-blop-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:35:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:35:44 -0700
Subject: [pkgdb] ladspa-blop-plugins (Fedora, 7) updated by kevin
Message-ID: <200709211635.l8LGZkBC024615@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-blop-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-blop-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-blop-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-blop-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-blop-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:36:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:36:49 -0400
Subject: rpms/ladspa-blop-plugins - New directory
Message-ID: <200709211636.l8LGan70023075@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-blop-plugins added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:36:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:36:57 -0400
Subject: rpms/ladspa-blop-plugins/devel - New directory
Message-ID: <200709211636.l8LGavMc023094@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-blop-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:37:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:37:00 -0400
Subject: rpms/ladspa-blop-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211637.l8LGb0uA023129@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-blop-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-blop-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:37:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:37:04 -0400
Subject: rpms/ladspa-blop-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709211637.l8LGb4v4023152@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23037/rpms/ladspa-blop-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-blop-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-blop-plugins
# $Id: Makefile,v 1.1 2007/09/21 16:37:01 kevin Exp $
NAME := ladspa-blop-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 fedora-extras-commits at redhat.com  Fri Sep 21 16:38:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:27 -0700
Subject: [pkgdb] ladspa-cmt-plugins was added for jwrdegoede
Message-ID: <200709211638.l8LGcROT016694@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-cmt-plugins with summary A collection of LADSPA plugins
Kevin Fenzi (kevin) has approved Package ladspa-cmt-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-cmt-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-cmt-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-cmt-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-cmt-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:33 -0700
Subject: [pkgdb] ladspa-cmt-plugins (Fedora, 7) updated by kevin
Message-ID: <200709211638.l8LGcXiI016728@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-cmt-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-cmt-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-cmt-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-cmt-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:38:33 -0700
Subject: [pkgdb] ladspa-cmt-plugins (Fedora, devel) updated by kevin
Message-ID: <200709211638.l8LGcYML016740@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-cmt-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-cmt-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-cmt-plugins



From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:45 -0400
Subject: rpms/ladspa-cmt-plugins - New directory
Message-ID: <200709211638.l8LGcj3q023444@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-cmt-plugins added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:51 -0400
Subject: rpms/ladspa-cmt-plugins/devel - New directory
Message-ID: <200709211638.l8LGcpVX023459@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-cmt-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:38:58 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:38:58 -0400
Subject: rpms/ladspa-cmt-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211638.l8LGcwqO023484@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-cmt-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-cmt-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:39:00 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:39:00 -0400
Subject: rpms/ladspa-cmt-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709211639.l8LGd0QY023500@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX23409/rpms/ladspa-cmt-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-cmt-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-cmt-plugins
# $Id: Makefile,v 1.1 2007/09/21 16:38:58 kevin Exp $
NAME := ladspa-cmt-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 fedora-extras-commits at redhat.com  Fri Sep 21 16:41:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:41:44 -0700
Subject: [pkgdb] ejabberd (Fedora EPEL, 5) updated by kevin
Message-ID: <200709211641.l8LGfjl4026282@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for ejabberd
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ejabberd (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of ejabberd in Fedora EPEL 5 to jcollie
Kevin Fenzi (kevin) approved watchbugzilla on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved watchcommits on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved commit on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved build on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved approveacls on ejabberd (Fedora EPEL 5) for silfreed
Kevin Fenzi (kevin) approved checkout on ejabberd (Fedora EPEL 5) for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ejabberd



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:24 -0700
Subject: [pkgdb] sdljava was added for jwrdegoede
Message-ID: <200709211645.l8LGjOe6018673@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package sdljava with summary Java binding to the SDL API
Kevin Fenzi (kevin) has approved Package sdljava
Kevin Fenzi (kevin) has added a Fedora devel branch for sdljava with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved sdljava in Fedora devel
Kevin Fenzi (kevin) has approved Package sdljava
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sdljava (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sdljava (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sdljava (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:31 -0700
Subject: [pkgdb] sdljava (Fedora, 7) updated by kevin
Message-ID: <200709211645.l8LGjV58018710@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for sdljava
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sdljava (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on sdljava (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:45:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:45:31 -0700
Subject: [pkgdb] sdljava (Fedora, devel) updated by kevin
Message-ID: <200709211645.l8LGjVWJ018720@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on sdljava (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sdljava



From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:09 -0400
Subject: rpms/sdljava - New directory
Message-ID: <200709211646.l8LGk95C023857@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava

Log Message:
Directory /cvs/extras/rpms/sdljava added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:16 -0400
Subject: rpms/sdljava/devel - New directory
Message-ID: <200709211646.l8LGkGqO023873@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava/devel

Log Message:
Directory /cvs/extras/rpms/sdljava/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:19 -0400
Subject: rpms/sdljava Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211646.l8LGkJ4Q023915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava

Added Files:
	Makefile import.log 
Log Message:
Setup of module sdljava


--- NEW FILE Makefile ---
# Top level Makefile for module sdljava
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:46:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:46:22 -0400
Subject: rpms/sdljava/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709211646.l8LGkMat023932@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD23828/rpms/sdljava/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sdljava


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sdljava
# $Id: Makefile,v 1.1 2007/09/21 16:46:20 kevin Exp $
NAME := sdljava
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:49:05 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 21 Sep 2007 12:49:05 -0400
Subject: rpms/knetworkmanager/devel .cvsignore, 1.9,
	1.10 knetworkmanager-svn_checkout.sh, 1.3,
	1.4 knetworkmanager.spec, 1.11, 1.12 sources, 1.9,
	1.10 knetworkmanager-kpp.patch, 1.2, NONE
Message-ID: <200709211649.l8LGn5UI024082@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24058

Modified Files:
	.cvsignore knetworkmanager-svn_checkout.sh 
	knetworkmanager.spec sources 
Removed Files:
	knetworkmanager-kpp.patch 
Log Message:
* Fri Sep 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.2.svn20070921
- License: GPLv2+
- update tarball to 20070921
- drop upstreamed kpp patch
- cleanup/simplify BR's

NOTE: still doesn't build for nm-0.7, unfortunately.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Aug 2007 05:39:18 -0000	1.9
+++ .cvsignore	21 Sep 2007 16:48:31 -0000	1.10
@@ -1 +1,2 @@
 knetworkmanager-svn20070815.tar.bz2
+knetworkmanager-svn20070921.tar.bz2


Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- knetworkmanager-svn_checkout.sh	19 Jul 2007 15:18:22 -0000	1.3
+++ knetworkmanager-svn_checkout.sh	21 Sep 2007 16:48:31 -0000	1.4
@@ -9,7 +9,7 @@
 # app
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager
 #svn export  svn://websvn.kde.org/home/kde/trunk/extragear/network/knetworkmanager $EXPORT_DIR/knetworkmanager
-svn export  svn://websvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+svn export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
 # docs
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
 # auto*/configure bits


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- knetworkmanager.spec	15 Aug 2007 05:39:18 -0000	1.11
+++ knetworkmanager.spec	21 Sep 2007 16:48:31 -0000	1.12
@@ -1,24 +1,23 @@
-%define         svn svn20070815
+%define         svn svn20070921
 
 Name:           knetworkmanager
 Version:        0.2
-Release:        0.1.%{svn}%{?dist}
+Release:        0.2.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://en.opensuse.org/Projects/KNetworkManager
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch adds kpp dialup support 
-Patch0:		knetworkmanager-kpp.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  NetworkManager-devel >= 0.6.2 dbus-devel autoconf automake
-BuildRequires:  desktop-file-utils kdebase-devel hal-devel wireless-tools-devel
-BuildRequires:  dbus-qt-devel, libnl-devel
+BuildRequires:  automake
+BuildRequires:  NetworkManager-devel >= 0.6.2
+BuildRequires:  desktop-file-utils kdelibs-devel hal-devel wireless-tools-devel
+BuildRequires:  dbus-qt-devel libnl-devel
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -62,10 +61,10 @@
 
 %prep 
 %setup -q -n %{name}
-%patch0 -p1 -b .kppp
 
-%build
 make -f Makefile.cvs
+
+%build
 %configure --disable-rpath --with-openvpn --with-vpnc --with-pptp \
            --disable-warnings 
 make %{?_smp_mflags}
@@ -154,6 +153,12 @@
 
 
 %changelog
+* Fri Sep 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.2.svn20070921
+- License: GPLv2+
+- update tarball to 20070921
+- drop upstreamed kpp patch
+- cleanup/simplify BR's
+
 * Wed Aug 15 2007 Dennis Gilmore <dennis at ausil.us> - 0.2-0.1.svn20070815
 - revert back to svn the upstream tarball was so bad there is no way to build it
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Aug 2007 05:39:18 -0000	1.9
+++ sources	21 Sep 2007 16:48:31 -0000	1.10
@@ -1 +1 @@
-6a420ff359e2fbe73b2aad7d81f6af95  knetworkmanager-svn20070815.tar.bz2
+6ed8a71d34c2046b75d3f94176a6bf3d  knetworkmanager-svn20070921.tar.bz2


--- knetworkmanager-kpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:49:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:49:16 -0700
Subject: [pkgdb] gmyth was added for hadess
Message-ID: <200709211649.l8LGnGip028300@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gmyth with summary MythTV remote access libraries
Kevin Fenzi (kevin) has approved Package gmyth
Kevin Fenzi (kevin) has added a Fedora devel branch for gmyth with an owner of hadess
Kevin Fenzi (kevin) has approved gmyth in Fedora devel
Kevin Fenzi (kevin) has approved Package gmyth
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gmyth (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gmyth (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gmyth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmyth



From fedora-extras-commits at redhat.com  Fri Sep 21 16:49:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 09:49:17 -0700
Subject: [pkgdb] gmyth (Fedora, devel) updated by kevin
Message-ID: <200709211649.l8LGnHom019726@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gmyth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gmyth



From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:02 -0400
Subject: rpms/gmyth - New directory
Message-ID: <200709211657.l8LGv2aW024295@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth

Log Message:
Directory /cvs/extras/rpms/gmyth added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:07 -0400
Subject: rpms/gmyth/devel - New directory
Message-ID: <200709211657.l8LGv7f1024303@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth/devel

Log Message:
Directory /cvs/extras/rpms/gmyth/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:11 -0400
Subject: rpms/gmyth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709211657.l8LGvBpW024337@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth

Added Files:
	Makefile import.log 
Log Message:
Setup of module gmyth


--- NEW FILE Makefile ---
# Top level Makefile for module gmyth
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 16:57:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 12:57:13 -0400
Subject: rpms/gmyth/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709211657.l8LGvDUS024354@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz24265/rpms/gmyth/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gmyth


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gmyth
# $Id: Makefile,v 1.1 2007/09/21 16:57:11 kevin Exp $
NAME := gmyth
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 fedora-extras-commits at redhat.com  Fri Sep 21 16:59:50 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 12:59:50 -0400
Subject: rpms/biosdevname/devel biosdevname.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709211659.l8LGxoaE024438@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	biosdevname.spec 
Log Message:



--- NEW FILE biosdevname.spec ---
Name:		biosdevname
Version:	0.2.4
Release:	1%{?dist}
Summary:	Udev helper for naming devices per BIOS names

Group:		System Environment/Base
License:	GPLv2
URL:		http://linux.dell.com/files/%{name}
# SMBIOS and PCI IRQ Routing Tables only exist on these arches.  It's
# also likely that other arches don't expect the PCI bus to be sorted
# breadth-first, or of so, there haven't been any comments about that
# on LKML.
ExclusiveArch:	%{ix86} x86_64 ia64
Source0:	http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	pciutils-devel, zlib-devel
# to figure out how to name the rules file
BuildRequires:	udev
# for ownership of /etc/udev/rules.d
Requires: udev


%description
biosdevname in its simplest form takes a kernel device name as an
argument, and returns the BIOS-given name it "should" be.  This is necessary
on systems where the BIOS name for a given device (e.g. the label on
the chassis is "Gb1") doesn't map directly and obviously to the kernel
name (e.g. eth0).

%prep
%setup -q

%build
# this is a udev rule, so it needs to live in / rather than /usr
%configure --disable-rpath --prefix=/ --sbindir=/sbin
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm %{buildroot}/sbin/%{name}S  || :

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
/sbin/%{name}
%config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules
%{_mandir}/1/%{name}.1


%changelog
* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-1
- coordinate udev rules usage with udev maintainer
- fix crashes in pcmcia search, in_ethernet(), and incorrect command
  line parsing.

* Mon Aug 27 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.3-1
- eliminate libbiosdevname.*, pre and post scripts

* Fri Aug 24 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.2-1
- ExclusiveArch those arches with SMBIOS and PCI IRQ Routing tables
- eliminate libsysfs dependency, move app to / for use before /usr is mounted.
- build static

* Mon Aug 20 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:26:55 -0000	1.1
+++ .cvsignore	21 Sep 2007 16:59:03 -0000	1.2
@@ -0,0 +1 @@
+biosdevname-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:26:55 -0000	1.1
+++ sources	21 Sep 2007 16:59:03 -0000	1.2
@@ -0,0 +1 @@
+d4368a5bc158ea3de8d8947ab9ae2285  biosdevname-0.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:19 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:19 -0400
Subject: rpms/fuse/F-7 fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.23,1.24
Message-ID: <200709211701.l8LH1JJx030593@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/F-7

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 20:27:59 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:45 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-7/fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fuse.spec	20 Sep 2007 20:27:59 -0000	1.23
+++ fuse.spec	21 Sep 2007 17:00:45 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-7
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:22 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:22 -0400
Subject: rpms/fuse/FC-6 fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.23,1.24
Message-ID: <200709211701.l8LH1MUR030601@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/FC-6

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 20:28:02 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:49 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fuse.spec	20 Sep 2007 20:28:02 -0000	1.23
+++ fuse.spec	21 Sep 2007 17:00:49 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -142,6 +142,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-5
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-4
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:01:25 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:01:25 -0400
Subject: rpms/fuse/devel fuse-makedev.d-fuse,1.4,1.5 fuse.spec,1.25,1.26
Message-ID: <200709211701.l8LH1Pmm030605@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24491/devel

Modified Files:
	fuse-makedev.d-fuse fuse.spec 
Log Message:

Revert to chmod 660.



Index: fuse-makedev.d-fuse
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse-makedev.d-fuse,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-makedev.d-fuse	20 Sep 2007 19:59:00 -0000	1.4
+++ fuse-makedev.d-fuse	21 Sep 2007 17:00:53 -0000	1.5
@@ -1 +1 @@
-c 666 root     fuse      10 229  1   1 fuse
+c 660 root     fuse      10 229  1   1 fuse


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fuse.spec	20 Sep 2007 19:59:00 -0000	1.25
+++ fuse.spec	21 Sep 2007 17:00:53 -0000	1.26
@@ -144,6 +144,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Fri Sep 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-7
+- revert udev rules change
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-6
 - change udev rules so that /dev/fuse is chmod 666 (bz 298651)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:03:36 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 13:03:36 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.1,1.2
Message-ID: <200709211703.l8LH3aUX030757@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30688

Modified Files:
	biosdevname.spec 
Log Message:
Require: udev > 115-3.20070920git for proper udev-owned rules


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- biosdevname.spec	21 Sep 2007 16:59:03 -0000	1.1
+++ biosdevname.spec	21 Sep 2007 17:03:04 -0000	1.2
@@ -17,7 +17,8 @@
 # to figure out how to name the rules file
 BuildRequires:	udev
 # for ownership of /etc/udev/rules.d
-Requires: udev
+# releases after 115-3.20070920.git have the proper write_net_rules and 75-persistent-net-names.rules files
+Requires: udev > 115-3.20070920git
 
 
 %description



From fedora-extras-commits at redhat.com  Fri Sep 21 17:05:20 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 13:05:20 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.2,1.3
Message-ID: <200709211705.l8LH5K0p030865@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30798

Modified Files:
	biosdevname.spec 
Log Message:
bump for rebuild


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- biosdevname.spec	21 Sep 2007 17:03:04 -0000	1.2
+++ biosdevname.spec	21 Sep 2007 17:04:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		biosdevname
 Version:	0.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-2
+- rebuild with Requires: udev > 115-3.20070920git
+
 * Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-1
 - coordinate udev rules usage with udev maintainer
 - fix crashes in pcmcia search, in_ethernet(), and incorrect command



From fedora-extras-commits at redhat.com  Fri Sep 21 17:08:42 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 21 Sep 2007 13:08:42 -0400
Subject: rpms/ejabberd/EL-5 .cvsignore, 1.4, 1.5 ejabberd.spec, 1.9,
	1.10 mod_ctlextra.erl, 1.2, 1.3 sources, 1.4,
	1.5 ejabberd-1.1.3-ldapfix.patch, 1.1, NONE
Message-ID: <200709211708.l8LH8gNF031076@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31050

Modified Files:
	.cvsignore ejabberd.spec mod_ctlextra.erl sources 
Removed Files:
	ejabberd-1.1.3-ldapfix.patch 
Log Message:
Update to 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 21:22:45 -0000	1.4
+++ .cvsignore	21 Sep 2007 17:08:09 -0000	1.5
@@ -1 +1 @@
-ejabberd-1.1.3.tar.gz
+ejabberd-1.1.4.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ejabberd.spec	4 Sep 2007 13:03:29 -0000	1.9
+++ ejabberd.spec	21 Sep 2007 17:08:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        1.1.3
-Release:        11%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,8 +23,6 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-Patch1:         ejabberd-1.1.3-ldapfix.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -79,8 +77,6 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
 %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
@@ -173,6 +169,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
 * Tue Sep  4 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.3-11
 - Fix ejabberdctl wrapper script - #276071
 


Index: mod_ctlextra.erl
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/mod_ctlextra.erl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_ctlextra.erl	31 Jul 2007 14:01:20 -0000	1.2
+++ mod_ctlextra.erl	21 Sep 2007 17:08:09 -0000	1.3
@@ -1,191 +1,193 @@
 %%%----------------------------------------------------------------------
 %%% File    : mod_ctlextra.erl
-%%% Author  : Badlop
-%%% Purpose : Adds more options for ejabberd_ctl
-%%% Created :
+%%% Author  : Badlop <badlop at ono.com>
+%%% Purpose : Adds more commands to ejabberd_ctl
+%%% Created : 30 Nov 2006 by Badlop <badlop at ono.com>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_ctlextra).
--author('').
--vsn('$Revision$').
+-author('badlop at ono.com').
+-vsn('$Revision$ ').
 
 -behaviour(gen_mod).
 
--export([
-	start/2,
-	stop/1,
-	ctl_process/2,
-	ctl_process/3
+-export([start/2,
+	 stop/1,
+	 ctl_process/2,
+	 ctl_process/3
 	]).
 
 -include("ejabberd.hrl").
 -include("ejabberd_ctl.hrl").
 -include("jlib.hrl").
+-include("mod_roster.hrl").
 
 -record(session, {sid, usr, us, priority}). % copied from ejabberd_sm.erl
 
 start(Host, _Opts) ->
-	ejabberd_ctl:register_commands([
-		{"compile file", "recompile and reload file"},
-		{"load-config file", "load config from file"},
-		{"remove-node nodename", "remove an ejabberd node from the database"},
-
-		% ejabberd_auth
-		{"delete-older-users days", "delete users that have not logged in the last 'days'"},
-		{"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"},
-		{"srg-user-add user server group host", "add user at server to group on host"},
-		{"srg-user-del user server group host", "delete user at server from group on host"},
-			
-		% mod_vcard
-		{"vcard-get user host data [data2]", "get data from the vCard of the user"},
-		{"vcard-set user host data [data2] content", "set data to content on the vCard"},
-
-		% mod_announce
-		% announce_send_online host message
-		% announce_send_all host, message
-
-		% mod_muc
-		% muc-add room opts
-		% muc-del room
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_roster
-		{"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1"},
-		%{"", "subs= none, from, to or both"},
-		%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
-		%{"", "will add mike at server.com to peter at localhost roster"},
-		{"pushroster file user server", "push template roster in file to user at server"},
-		{"pushroster-all file", "push template roster in file to all those users"},
-		{"push-alltoall server group", "adds all the users to all the users in Group"},
-
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"},
-
-		% misc
-		{"get-cookie", "get the Erlang cookie of this node"},
-		{"killsession user server resource", "kill a user session"}
-	], ?MODULE, ctl_process),
+    ejabberd_ctl:register_commands([
+				    {"compile file", "recompile and reload file"},
+				    {"load-config file", "load config from file"},
+				    {"remove-node nodename", "remove an ejabberd node from the database"},
+
+				    %% ejabberd_auth
+				    {"delete-older-users days", "delete users that have not logged in the last 'days'"},
+				    {"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"},
+				    {"srg-user-add user server group host", "add user at server to group on host"},
+				    {"srg-user-del user server group host", "delete user at server from group on host"},
+
+				    %% mod_vcard
+				    {"vcard-get user host data [data2]", "get data from the vCard of the user"},
+				    {"vcard-set user host data [data2] content", "set data to content on the vCard"},
+
+				    %% mod_announce
+				    %% announce_send_online host message
+				    %% announce_send_all host, message
+
+				    %% mod_muc
+				    %% muc-add room opts
+				    %% muc-del room
+				    {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+				    {"muc-online-rooms", "list existing rooms"},
+
+				    %% mod_roster
+				    {"add-rosteritem user1 server1 user2 server2 nick group subs", "Add user2 at server2 to user1 at server1's roster"},
+				    %%{"", "subs= none, from, to or both"},
+				    %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
+				    %%{"", "will add mike at server.com to peter at localhost roster"},
+				    {"rem-rosteritem user1 server1 user2 server2", "Remove user2 at server2 from user1 at server1's roster"},
+				    {"pushroster file user server", "push template roster in file to user at server"},
+				    {"pushroster-all file", "push template roster in file to all those users"},
+				    {"push-alltoall server group", "adds all the users to all the users in Group"},
+
+				    {"status-list status", "list the logged users with status"},
+				    {"status-num status", "number of logged users with status"},
+
+				    {"stats registeredusers", "number of registered users"},
+				    {"stats onlineusers", "number of logged users"},
+				    {"stats uptime-seconds", "uptime of ejabberd node in seconds"},
+
+				    %% misc
+				    {"get-cookie", "get the Erlang cookie of this node"},
+				    {"killsession user server resource", "kill a user session"}
+				   ], ?MODULE, ctl_process),
     ejabberd_ctl:register_commands(Host, [
-		% mod_muc
-		{"muc-purge days", "destroy rooms with not activity on the last 'days'"},
-		{"muc-online-rooms", "list existing rooms"},
-
-		% mod_last
-		{"num-active-users days", "number of users active in the last 'days'"},
-		{"status-list status", "list the logged users with status"},
-		{"status-num status", "number of logged users with status"},
-		{"stats registeredusers", "number of registered users"},
-		{"stats onlineusers", "number of logged users"}
-	], ?MODULE, ctl_process),
-	ok.
+					  %% mod_muc
+					  {"muc-purge days", "destroy rooms with not activity on the last 'days'"},
+					  {"muc-online-rooms", "list existing rooms"},
+
+					  %% mod_last
+					  {"num-active-users days", "number of users active in the last 'days'"},
+					  {"status-list status", "list the logged users with status"},
+					  {"status-num status", "number of logged users with status"},
+					  {"stats registeredusers", "number of registered users"},
+					  {"stats onlineusers", "number of logged users"}
+					 ], ?MODULE, ctl_process),
+    ok.
 
 stop(_Host) ->
-	ok.
+    ok.
 
 
 ctl_process(_Val, ["blo"]) ->
-	FResources = "eeeaaa aaa",
-	io:format("~s", [FResources]),
-	?STATUS_SUCCESS;
+    FResources = "eeeaaa aaa",
+    io:format("~s", [FResources]),
+    ?STATUS_SUCCESS;
 
 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;
+    {removed, N, UR} = delete_older_users(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},
-		{export_offline, offline},
-		{export_passwd, passwd},
-		{export_private_storage, private_storage},
-		{export_roster, roster},
-		{export_vcard, vcard},
-		{export_vcard_search, vcard_search}],
-	Export = fun({TableFun, Table}) -> 
-		Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
-		io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
-		catch ejd2odbc:TableFun(Server, Filename)
-	end,
-	lists:foreach(Export, Tables),
-	?STATUS_SUCCESS;
+    Tables = [
+	      {export_last, last},
+	      {export_offline, offline},
+	      {export_passwd, passwd},
+	      {export_private_storage, private_storage},
+	      {export_roster, roster},
+	      {export_vcard, vcard},
+	      {export_vcard_search, vcard_search}],
+    Export = fun({TableFun, Table}) -> 
+		     Filename = filename:join([Output, atom_to_list(Table)++".txt"]),
+		     io:format("Trying to export Mnesia table '~p' on server '~s' to file '~s'~n", [Table, Server, Filename]),
+		     catch ejd2odbc:TableFun(Server, Filename)
+	     end,
+    lists:foreach(Export, Tables),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["set-password", User, Server, Password]) ->
     ejabberd_auth:set_password(User, Server, Password),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data]) ->
-	{ok, Res} = vcard_get(User, Server, {Data}),
+    {ok, Res} = vcard_get(User, Server, [Data]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-get", User, Server, Data1, Data2]) ->
-	{ok, Res} = vcard_get(User, Server, {Data1, Data2}),
+    {ok, Res} = vcard_get(User, Server, [Data1, Data2]),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
-ctl_process(_Val, ["vcard-set", User, Server, Data, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data, Content),
+ctl_process(_Val, ["vcard-set", User, Server, Data1, Content]) ->
+    {ok, Res} = vcard_set(User, Server, [Data1], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["vcard-set", User, Server, Data1, Data2, Content]) ->
-	{ok, Res} = vcard_set(User, Server, Data1, Data2, Content),
+    {ok, Res} = vcard_set(User, Server, [Data1, Data2], Content),
     io:format("~s~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["compile", Module]) ->
     compile:file(Module),
-	?STATUS_SUCCESS;
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["remove-node", Node]) ->
-	mnesia:del_table_copy(schema, list_to_atom(Node)),
-	?STATUS_SUCCESS;
+    mnesia:del_table_copy(schema, list_to_atom(Node)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-create", Group, Host, Name, Description, Display]) ->
-	Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
-	{atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
+    Opts = [{name, Name}, {displayed_groups, [Display]}, {description, Description}],
+    {atomic, ok} = mod_shared_roster:create_group(Host, Group, Opts),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-delete", Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:delete_group(Host, Group),
+    {atomic, ok} = mod_shared_roster:delete_group(Host, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-add", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:add_user_to_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["srg-user-del", User, Server, Group, Host]) ->
-	{atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
+    {atomic, ok} = mod_shared_roster:remove_user_from_group(Host, {User, Server}, Group),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the server:~n~p~n", [Num_purged, Num_total, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["muc-online-rooms"]) ->
-       format_print_room(all, ets:tab2list(muc_online_room)),
-       ?STATUS_SUCCESS;
+    format_print_room(all, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["add-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subs]) ->
     case add_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, list_to_atom(Subs), []) of
@@ -201,6 +203,20 @@
 	    ?STATUS_BADRPC
     end;
 
+ctl_process(_Val, ["rem-rosteritem", LocalUser, LocalServer, RemoteUser, RemoteServer]) ->
+    case rem_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer) of
+	{atomic, ok} ->
+	    ?STATUS_SUCCESS;
+	{error, Reason} ->
+	    io:format("Can't remove ~p@~p to ~p@~p: ~p~n",
+		      [RemoteUser, RemoteServer, LocalUser, LocalServer, Reason]),
+	    ?STATUS_ERROR;
+	{badrpc, Reason} ->
+	    io:format("Can't remove roster item to user ~p: ~p~n",
+		      [LocalUser, Reason]),
+	    ?STATUS_BADRPC
+    end;
+
 ctl_process(_Val, ["pushroster", File, User, Server]) ->
     case pushroster(File, User, Server) of
 	ok ->
@@ -258,18 +274,19 @@
     end;
 
 ctl_process(_Val, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> mnesia:table_info(passwd, size);
-		"onlineusers" -> mnesia:table_info(session, size)
-	end,
+    Res = case Stat of
+	      "uptime-seconds" -> uptime_seconds();
+	      "registeredusers" -> mnesia:table_info(passwd, size);
+	      "onlineusers" -> mnesia:table_info(session, size)
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, ["status-num", Status_required]) ->
-	ctl_process(_Val, "all", ["status-num", Status_required]);
+    ctl_process(_Val, "all", ["status-num", Status_required]);
 
 ctl_process(_Val, ["status-list", Status_required]) ->
-	ctl_process(_Val, "all", ["status-list", Status_required]);
+    ctl_process(_Val, "all", ["status-list", Status_required]);
 
 ctl_process(_Val, ["get-cookie"]) ->
     io:format("~s~n", [atom_to_list(erlang:get_cookie())]),
@@ -277,50 +294,50 @@
 
 ctl_process(_Val, ["killsession", User, Server, Resource]) ->
     ejabberd_router:route(
-        jlib:make_jid("", "", ""), 
-        jlib:make_jid(User, Server, Resource),
-        {xmlelement, "broadcast", [], [{exit, "killed"}]}),
+      jlib:make_jid("", "", ""), 
+      jlib:make_jid(User, Server, Resource),
+      {xmlelement, "broadcast", [], [{exit, "killed"}]}),
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Args) ->
-	Val.
+    Val.
 
 
 ctl_process(_Val, Host, ["muc-purge", Days]) ->
-	{purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
-	io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
-	?STATUS_SUCCESS;
+    {purged, Num_total, Num_purged, Names_purged} = muc_purge(Host, list_to_integer(Days)),
+    io:format("Purged ~p chatrooms from a total of ~p on the host ~p:~n~p~n", [Num_purged, Num_total, Host, Names_purged]),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, ServerHost, ["muc-online-rooms"]) ->
-	MUCHost = find_host(ServerHost),
-	format_print_room(MUCHost, ets:tab2list(muc_online_room)),
-	?STATUS_SUCCESS;
+    MUCHost = find_host(ServerHost),
+    format_print_room(MUCHost, ets:tab2list(muc_online_room)),
+    ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["num-active-users", Days]) ->
-	Number = num_active_users(Host, list_to_integer(Days)),
+    Number = num_active_users(Host, list_to_integer(Days)),
     io:format("~p~n", [Number]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["stats", Stat]) ->
-	Res = case Stat of
-		"registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
-		"onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
-	end,
+    Res = case Stat of
+	      "registeredusers" -> length(ejabberd_auth:get_vh_registered_users(Host));
+	      "onlineusers" -> length(ejabberd_sm:get_vh_session_list(Host))
+	  end,
     io:format("~p~n", [Res]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-num", Status_required]) ->
-	Num = length(get_status_list(Host, Status_required)),
+    Num = length(get_status_list(Host, Status_required)),
     io:format("~p~n", [Num]),
     ?STATUS_SUCCESS;
 
 ctl_process(_Val, Host, ["status-list", Status_required]) ->
-	Res = get_status_list(Host, Status_required),
+    Res = get_status_list(Host, Status_required),
     [ io:format("~s@~s ~s ~p \"~s\"~n", [U, S, R, P, St]) || {U, S, R, P, St} <- Res],
     ?STATUS_SUCCESS;
 
 ctl_process(Val, _Host, _Args) ->
-	Val.
+    Val.
 
 
 %%-------------
@@ -328,205 +345,241 @@
 %%-------------
 
 get_status_list(Host, Status_required) ->
-	% Get list of all logged users
-	Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
-	% Reformat the list
-	Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
-	Fhost = case Host of
+    %% Get list of all logged users
+    Sessions = ejabberd_sm:dirty_get_my_sessions_list(),
+    %% Reformat the list
+    Sessions2 = [ {Session#session.usr, Session#session.sid, Session#session.priority} || Session <- Sessions],
+    Fhost = case Host of
 		"all" ->
-			% All hosts are requested, so don't filter at all
-			fun(_, _) -> true end;
+		    %% All hosts are requested, so dont filter at all
+		    fun(_, _) -> true end;
 		_ ->
-			% Filter the list, only Host is interesting
-			fun(A, B) -> A == B end
-	end,
-	Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
-	% For each Pid, get its presence
-	Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
-	% Filter by status
-	Fstatus = case Status_required of
-		"all" ->
-			fun(_, _) -> true end;
-		_ ->
-			fun(A, B) -> A == B end
-	end,
-	[{User, Server, Resource, Priority, stringize(Status_text)} 
-	 || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
-	 apply(Fstatus, [Status, Status_required])].
+		    %% Filter the list, only Host is interesting
+		    fun(A, B) -> A == B end
+	    end,
+    Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
+    %% For each Pid, get its presence
+    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    %% Filter by status
+    Fstatus = case Status_required of
+		  "all" ->
+		      fun(_, _) -> true end;
+		  _ ->
+		      fun(A, B) -> A == B end
+	      end,
+    [{User, Server, Resource, Priority, stringize(Status_text)} 
+     || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, 
+	apply(Fstatus, [Status, Status_required])].
 
-% Make string more print-friendly
+%% Make string more print-friendly
 stringize(String) ->
-	% Replace newline characters with other code
-	element(2, regexp:gsub(String, "\n", "\\n")).
+    %% Replace newline characters with other code
+    element(2, regexp:gsub(String, "\n", "\\n")).
 
 add_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs) ->
-	subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
-	% TODO: if the server is not local and Subs=to or both: send subscription request
-	% TODO: check if the 'remote server' is a virtual host here, else do nothing
-	%add_rosteritem2(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs, Host).
-	subscribe(RU, RS, LU, LS, LU, "", invert_subs(Subscription), Xattrs).
-
-invert_subs(none) -> none;
-invert_subs(to) -> none;
-invert_subs(from) -> to;
-invert_subs(both) -> both.
+    subscribe(LU, LS, RU, RS, Nick, Group, Subscription, Xattrs),
+    route_rosteritem(LU, LS, RU, RS, Nick, Group, Subscription),
+    {atomic, ok}.
 
 subscribe(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription, Xattrs) ->
-	mnesia:transaction(
-		fun() ->
-			mnesia:write({
-				roster,
-				{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}}, % usj
-				{LocalUser,LocalServer},                 % us
-				{RemoteUser,RemoteServer,[]},      % jid
-				Nick,                  % name: "Mom", []
-				Subscription,  % subscription: none, to=you see him, from=he sees you, both
-				none,          % ask: out=send request, in=somebody requests you, none
-				[Group],       % groups: ["Family"]
-				Xattrs,        % xattrs: [{"category","conference"}]
-				[]             % xs: []
-		})
-	end).
+    R = #roster{usj = {LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+		us = {LocalUser,LocalServer},
+		jid = {RemoteUser,RemoteServer,[]},
+		name = Nick,
+		subscription = Subscription, % none, to=you see him, from=he sees you, both
+		ask = none, % out=send request, in=somebody requests you, none
+		groups = [Group],
+		askmessage = Xattrs, % example: [{"category","conference"}]
+		xs = []},
+    mnesia:transaction(fun() -> mnesia:write(R) end).
+
+rem_rosteritem(LU, LS, RU, RS) ->
+    unsubscribe(LU, LS, RU, RS),
+    route_rosteritem(LU, LS, RU, RS, "", "", "remove"),
+    {atomic, ok}.
+
+unsubscribe(LocalUser, LocalServer, RemoteUser, RemoteServer) ->
+    Key = {{LocalUser,LocalServer,{RemoteUser,RemoteServer,[]}},
+	   {LocalUser,LocalServer}},
+    mnesia:transaction(fun() -> mnesia:delete(roster, Key, write) end).
+
+route_rosteritem(LocalUser, LocalServer, RemoteUser, RemoteServer, Nick, Group, Subscription) ->
+    LJID = jlib:make_jid(LocalUser, LocalServer, ""),
+    RJID = jlib:make_jid(RemoteUser, RemoteServer, ""),
+    ToS = jlib:jid_to_string(LJID),
+    ItemJIDS = jlib:jid_to_string(RJID),
+    GroupXML = {xmlelement, "group", [], [{xmlcdata, Group}]},
+    Item = {xmlelement, "item", 
+	    [{"jid", ItemJIDS},
+	     {"name", Nick},
+	     {"subscription", Subscription}], 
+	    [GroupXML]},
+    Query = {xmlelement, "query", [{"xmlns", ?NS_ROSTER}], [Item]},
+    Packet = {xmlelement, "iq", [{"type", "set"}, {"to", ToS}], [Query]},
+    ejabberd_router:route(LJID, LJID, Packet).
 
 pushroster(File, User, Server) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_roster({User, Server, "", User}, Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_roster({User, Server, "", User}, Roster).
 
 pushroster_all(File) ->
-	{ok, [Roster]} = file:consult(File),
-	subscribe_all(Roster).
+    {ok, [Roster]} = file:consult(File),
+    subscribe_all(Roster).
 
 subscribe_all(Roster) ->
-	subscribe_all(Roster, Roster).
+    subscribe_all(Roster, Roster).
 subscribe_all([], _) ->
-	ok;
+    ok;
 subscribe_all([User1 | Users], Roster) ->
-	subscribe_roster(User1, Roster),
-	subscribe_all(Users, Roster).
+    subscribe_roster(User1, Roster),
+    subscribe_all(Users, Roster).
 
 subscribe_roster(_, []) ->
-	ok;
-% Do not subscribe a user to itself
+    ok;
+%% Do not subscribe a user to itself
 subscribe_roster({Name, Server, Group, Nick}, [{Name, Server, _, _} | Roster]) ->
-	subscribe_roster({Name, Server, Group, Nick}, Roster);
-% Subscribe Name2 to Name1
+    subscribe_roster({Name, Server, Group, Nick}, Roster);
+%% Subscribe Name2 to Name1
 subscribe_roster({Name1, Server1, Group1, Nick1}, [{Name2, Server2, Group2, Nick2} | Roster]) ->
-	subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
-	subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
+    subscribe(Name1, Server1, Name2, Server2, Nick2, Group2, both, []),
+    subscribe_roster({Name1, Server1, Group1, Nick1}, Roster).
 
 push_alltoall(S, G) ->
-	Users = ejabberd_auth:get_vh_registered_users(S),
-	Users2 = build_list_users(G, Users, []),
-	subscribe_all(Users2).
+    Users = ejabberd_auth:get_vh_registered_users(S),
+    Users2 = build_list_users(G, Users, []),
+    subscribe_all(Users2).
 
 build_list_users(_Group, [], Res) ->
-	Res;
+    Res;
 build_list_users(Group, [{User, Server}|Users], Res) ->
-	build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
+    build_list_users(Group, Users, [{User, Server, Group, User}|Res]).
 
-vcard_get(User, Server, DataX) ->
-    [{_, _, A1}] = mnesia:dirty_read(vcard, {User, Server}),
-    Elem = vcard_get(DataX, A1),
-    {ok, xml:get_tag_cdata(Elem)}.
-
-vcard_get({Data1, Data2}, A1) ->
-    A2 = xml:get_subtag(A1, Data1),
-    A3 = xml:get_subtag(A2, Data2),
-    case A3 of
-		"" -> A2;
-		_ -> A3
-	end;
+vcard_get(User, Server, Data) ->
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+    Res = case IQr#iq.sub_el of
+	      [A1] ->
+		  case vcard_get(Data, A1) of
+		      false -> no_value;
+		      Elem -> xml:get_tag_cdata(Elem)
+		  end;
+	      [] -> 
+		  no_vcard
+	  end,
+    {ok, Res}.
+
+vcard_get([Data1, Data2], A1) ->
+    case xml:get_subtag(A1, Data1) of
+    	false -> false;
+	A2 -> vcard_get([Data2], A2)
+    end;
 
-vcard_get({Data}, A1) ->
+vcard_get([Data], A1) ->
     xml:get_subtag(A1, Data).
 
-vcard_set(User, Server, Data1, Data2, Content) ->
-	Content2 = {xmlelement, Data2, [], [{xmlcdata,Content}]},
-	R = {xmlelement, Data1, [], [Content2]},
-	vcard_set2(User, Server, R, Data1).
-
 vcard_set(User, Server, Data, Content) ->
-	R = {xmlelement, Data, [], [{xmlcdata,Content}]},
-	vcard_set2(User, Server, R, Data).
-
-vcard_set2(User, Server, R, Data) ->
-	% Get old vcard
-	A4 = case mnesia:dirty_read(vcard, {User, Server}) of
-		[] -> 
-			[R];
-		[{_, _, A1}] ->
-			{_, _, _, A2} = A1,
-			A3 = lists:keydelete(Data, 2, A2),
-			[R | A3]
-	end,
-
-	% Build new vcard
-	SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
-	IQ = #iq{type=set, sub_el = SubEl},
-	JID = jlib:make_jid(User, Server, ""),
-
-	mod_vcard:process_sm_iq(JID, JID, IQ),
-	{ok, "done"}.
-
+    [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
+    JID = jlib:make_jid(User, Server, ""),
+    IQ = #iq{type = get, xmlns = ?NS_VCARD},
+    IQr = Module:Function(JID, JID, IQ),
+
+    %% Get old vcard
+    A4 = case IQr#iq.sub_el of
+	     [A1] ->
+		 {_, _, _, A2} = A1,
+		 update_vcard_els(Data, Content, A2);
+	     [] -> 
+		 update_vcard_els(Data, Content, [])
+	 end,
+
+    %% Build new vcard
+    SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4},
+    IQ2 = #iq{type=set, sub_el = SubEl},
+
+    Module:Function(JID, JID, IQ2),
+    {ok, "done"}.
+
+update_vcard_els(Data, Content, Els1) ->
+    Els2 = lists:keysort(2, Els1),
+    [Data1 | Data2] = Data,
+    NewEl = case Data2 of
+		[] ->
+		    {xmlelement, Data1, [], [{xmlcdata,Content}]};
+		[D2] ->
+		    OldEl = case lists:keysearch(Data1, 2, Els2) of
+				{value, A} -> A;
+				false -> {xmlelement, Data1, [], []}
+			    end,
+		    {xmlelement, _, _, ContentOld1} = OldEl,
+		    Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]}],
+		    ContentOld2 = lists:keysort(2, ContentOld1),
+		    ContentOld3 = lists:keydelete(D2, 2, ContentOld2),
+		    ContentNew = lists:keymerge(2, Content2, ContentOld3),
+		    {xmlelement, Data1, [], ContentNew}
+	    end,
+    Els3 = lists:keydelete(Data1, 2, Els2),
+    lists:keymerge(2, [NewEl], Els3).
 
 -record(last_activity, {us, timestamp, status}).
 
 delete_older_users(Days) ->
-	% Convert older time
-	SecOlder = Days*24*60*60,
+    %% Convert older time
+    SecOlder = Days*24*60*60,
+
+    %% Get current time
+    {MegaSecs, Secs, _MicroSecs} = now(),
+    TimeStamp_now = MegaSecs * 1000000 + Secs,
+
+    %% Get the list of registered users
+    Users = ejabberd_auth:dirty_get_registered_users(),
 
-	% Get current time
-	{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
+    %% For a user, remove if required and answer true
+    F = fun({LUser, LServer}) ->
+		%% Check if the user is logged
 		case ejabberd_sm:get_user_resources(LUser, LServer) of
-			% If it isn't
-			[] ->
-				% Look for his last_activity
-				case mnesia:dirty_read(last_activity, {LUser, LServer}) of
-				% If it is
-					% existent:
-					[#last_activity{timestamp = TimeStamp}] ->
-						% get his age
-						Sec = TimeStamp_now - TimeStamp,
-						% If he is
-						if 
-							% younger than SecOlder: 
-							Sec < SecOlder ->
-								% do nothing
-								false;
-							% older: 
-							true ->
-								% remove the user
-								ejabberd_auth:remove_user(LUser, LServer),
-								true
-						end;
-					% nonexistent:
-					[] ->
-						% remove the user
-						ejabberd_auth:remove_user(LUser, LServer),
-						true
+		    %% If it isnt
+		    [] ->
+			%% Look for his last_activity
+			case mnesia:dirty_read(last_activity, {LUser, LServer}) of
+			    %% If it is
+			    %% existent:
+			    [#last_activity{timestamp = TimeStamp}] ->
+				%% get his age
+				Sec = TimeStamp_now - TimeStamp,
+				%% If he is
+				if 
+				    %% younger than SecOlder: 
+				    Sec < SecOlder ->
+					%% do nothing
+					false;
+				    %% older: 
+				    true ->
+					%% remove the user
+					ejabberd_auth:remove_user(LUser, LServer),
+					true
 				end;
-			% Else
-			_ ->
-				% do nothing
-				false
+			    %% nonexistent:
+			    [] ->
+				%% remove the user
+				ejabberd_auth:remove_user(LUser, LServer),
+				true
+			end;
+		    %% Else
+		    _ ->
+			%% do nothing
+			false
 		end
 	end,
-	% Apply the function to every user in the list
-	Users_removed = lists:filter(F, Users),
-	{removed, length(Users_removed), Users_removed}.
+    %% Apply the function to every user in the list
+    Users_removed = lists:filter(F, Users),
+    {removed, length(Users_removed), Users_removed}.
 
 num_active_users(Host, Days) ->
-	list_last_activity(Host, true, Days).
+    list_last_activity(Host, true, Days).
 
-% Code based on ejabberd/src/web/ejabberd_web_admin.erl
+%% Code based on ejabberd/src/web/ejabberd_web_admin.erl
 list_last_activity(Host, Integral, Days) ->
     {MegaSecs, Secs, _MicroSecs} = now(),
     TimeStamp = MegaSecs * 1000000 + Secs,
@@ -537,29 +590,29 @@
 				  [{'trunc', {'/',
 					      {'-', TimeStamp, '$1'},
 					      86400}}]}]) of
-	{'EXIT', _Reason} ->
-	    [];
-	Vals ->
-	    Hist = histogram(Vals, Integral),
-	    if
-		Hist == [] ->
-		    0;
-		true ->
-		    Left = if
-			       Days == infinity ->
-				   0;
-			       true ->
-				   Days - length(Hist)
-			   end,
-		    Tail = if
-			       Integral ->
-				   lists:duplicate(Left, lists:last(Hist));
-			       true ->
-				   lists:duplicate(Left, 0)
-			   end,
-		    lists:nth(Days, Hist ++ Tail)
-	    end
-    end.
+							      {'EXIT', _Reason} ->
+		 [];
+	       Vals ->
+		 Hist = histogram(Vals, Integral),
+		 if
+		     Hist == [] ->
+			 0;
+		     true ->
+			 Left = if
+				    Days == infinity ->
+					0;
+				    true ->
+					Days - length(Hist)
+				end,
+			 Tail = if
+				    Integral ->
+					lists:duplicate(Left, lists:last(Hist));
+				    true ->
+					lists:duplicate(Left, 0)
+				end,
+			 lists:nth(Days, Hist ++ Tail)
+		 end
+	 end.
 histogram(Values, Integral) ->
     histogram(lists:sort(Values), Integral, 0, 0, []).
 histogram([H | T], Integral, Current, Count, Hist) when Current == H ->
@@ -581,26 +634,26 @@
 
 
 format_print_room(Host1, Rooms)->
-	lists:foreach(
-		fun({_, {Roomname, Host},_}) ->
-			case Host1 of
-				all ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				Host ->
-					io:format("~s ~s ~n", [Roomname, Host]);
-				_ ->
-					ok
-			end
-		end,
-		Rooms).
+    lists:foreach(
+      fun({_, {Roomname, Host},_}) ->
+	      case Host1 of
+		  all ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  Host ->
+		      io:format("~s ~s ~n", [Roomname, Host]);
+		  _ ->
+		      ok
+	      end
+      end,
+      Rooms).
 
 
 %%----------------------------
 %% Purge MUC
 %%----------------------------
 
-% Required for muc_purge
-% Copied from mod_muc/mod_muc_room.erl
+%% Required for muc_purge
+%% Copied from mod_muc/mod_muc_room.erl
 -define(DICT, dict).
 -record(muc_online_room, {name_host, pid}).
 -record(lqueue, {queue, len, max}).
@@ -634,103 +687,106 @@
 		just_created = false}).
 
 muc_purge(Days) ->
-	ServerHost = global,
-	Host = global,
-	muc_purge2(ServerHost, Host, Days).
+    ServerHost = global,
+    Host = global,
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge(ServerHost, Days) ->
-	Host = find_host(ServerHost),
-	muc_purge2(ServerHost, Host, Days).
+    Host = find_host(ServerHost),
+    muc_purge2(ServerHost, Host, Days).
 
 muc_purge2(ServerHost, Host, Last_allowed) ->
-	Room_names = get_room_names(Host),
-
-	Decide = fun(N) -> decide(N, Last_allowed) end,
-	Rooms_to_delete = lists:filter(Decide, Room_names),
+    Room_names = get_room_names(Host),
 
-	Num_rooms = length(Room_names),
-	Num_rooms_to_delete = length(Rooms_to_delete),
+    Decide = fun(N) -> decide(N, Last_allowed) end,
+    Rooms_to_delete = lists:filter(Decide, Room_names),
 
-	Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+    Num_rooms = length(Room_names),
+    Num_rooms_to_delete = length(Rooms_to_delete),
 
-	Delete = fun({N, H, SH}) -> 
-		mod_muc:room_destroyed(H, N, SH),
-		mod_muc:forget_room(H, N)
-	end,
-	lists:foreach(Delete, Rooms_to_delete_full),
-	{purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
+    Rooms_to_delete_full = fill_serverhost(Rooms_to_delete, ServerHost),
+
+    Delete = fun({N, H, SH}) -> 
+		     mod_muc:room_destroyed(H, N, SH),
+		     mod_muc:forget_room(H, N)
+	     end,
+    lists:foreach(Delete, Rooms_to_delete_full),
+    {purged, Num_rooms, Num_rooms_to_delete, Rooms_to_delete}.
 
 fill_serverhost(Rooms_to_delete, global) ->
-	ServerHosts1 = ?MYHOSTS,
-	ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
-	[ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
+    ServerHosts1 = ?MYHOSTS,
+    ServerHosts2 = [ {ServerHost, find_host(ServerHost)} || ServerHost <- ServerHosts1],
+    [ {Name, Host, find_serverhost(Host, ServerHosts2)} || {Name, Host} <- Rooms_to_delete];
 fill_serverhost(Rooms_to_delete, ServerHost) ->
-	[ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
+    [ {Name, Host, ServerHost}|| {Name, Host} <- Rooms_to_delete].
 
 find_serverhost(Host, ServerHosts) ->
-	{value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
-	ServerHost.
+    {value, {ServerHost, Host}} = lists:keysearch(Host, 2, ServerHosts),
+    ServerHost.
 
 find_host(ServerHost) ->
-	gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
+    gen_mod:get_module_opt(ServerHost, mod_muc, host, "conference." ++ ServerHost).
 
 decide({Room_name, Host}, Last_allowed) ->
-	Room_pid = get_room_pid(Room_name, Host),
+    Room_pid = get_room_pid(Room_name, Host),
 
-	C = get_room_config(Room_pid),
-	Persistent = C#config.persistent,
+    C = get_room_config(Room_pid),
+    Persistent = C#config.persistent,
 
-	S = get_room_state(Room_pid),
-	Just_created = S#state.just_created,
+    S = get_room_state(Room_pid),
+    Just_created = S#state.just_created,
 
-	Room_users = S#state.users,
-	Num_users = length(?DICT:to_list(Room_users)),
-
-	History = (S#state.history)#lqueue.queue,
-	Ts_now = calendar:now_to_universal_time(now()),
-	Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
-	{Have_history, Last} = case queue:is_empty(History) of
-		true ->
-			{false, Ts_uptime};
-		false ->
-			Last_message = queue:last(History),
-			{_, _, _, Ts_last, _} = Last_message,
-			Ts_diff =
-				calendar:datetime_to_gregorian_seconds(Ts_now)
-				- calendar:datetime_to_gregorian_seconds(Ts_last),
-			{true, Ts_diff}
-	end,
+    Room_users = S#state.users,
+    Num_users = length(?DICT:to_list(Room_users)),
 
-	case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
-		{true, false, 0, _, Last_days} 
-		when Last_days > Last_allowed -> 
-			true;
-		_ ->
-			false
-	end.
+    History = (S#state.history)#lqueue.queue,
+    Ts_now = calendar:now_to_universal_time(now()),
+    Ts_uptime = element(1, erlang:statistics(wall_clock))/1000,
+    {Have_history, Last} = case queue:is_empty(History) of
+			       true ->
+				   {false, Ts_uptime};
+			       false ->
+				   Last_message = queue:last(History),
+				   {_, _, _, Ts_last, _} = Last_message,
+				   Ts_diff =
+				       calendar:datetime_to_gregorian_seconds(Ts_now)
+				       - calendar:datetime_to_gregorian_seconds(Ts_last),
+				   {true, Ts_diff}
+			   end,
+
+    case {Persistent, Just_created, Num_users, Have_history, seconds_to_days(Last)} of
+	{true, false, 0, _, Last_days} 
+	when Last_days > Last_allowed -> 
+	    true;
+	_ ->
+	    false
+    end.
 
 seconds_to_days(S) ->
-	round(S) div 60*60*24.
+    round(S) div 60*60*24.
+
+uptime_seconds() ->
+    trunc(element(1, erlang:statistics(wall_clock))/1000).
 
 get_room_names(Host) ->
-	Get_room_names = fun(Room_reg, Names) ->
-		case {Host, Room_reg#muc_online_room.name_host} of
-			{Host, {Name1, Host}} -> 
-				[{Name1, Host} | Names];
-			{global, {Name1, Host1}} -> 
-				[{Name1, Host1} | Names];
-			_ ->
-				Names
-		end
-	end,
-	ets:foldr(Get_room_names, [], muc_online_room).
+    Get_room_names = fun(Room_reg, Names) ->
+			     case {Host, Room_reg#muc_online_room.name_host} of
+				 {Host, {Name1, Host}} -> 
+				     [{Name1, Host} | Names];
+				 {global, {Name1, Host1}} -> 
+				     [{Name1, Host1} | Names];
+				 _ ->
+				     Names
+			     end
+		     end,
+    ets:foldr(Get_room_names, [], muc_online_room).
 
 get_room_pid(Name, Host) ->
-	[Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
-	Room_ets#muc_online_room.pid.
+    [Room_ets] = ets:lookup(muc_online_room, {Name, Host}),
+    Room_ets#muc_online_room.pid.
 
 get_room_config(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_config).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_config).
 
 get_room_state(Room_pid) ->
-	gen_fsm:sync_send_all_state_event(Room_pid, get_state).
+    gen_fsm:sync_send_all_state_event(Room_pid, get_state).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 21:22:45 -0000	1.4
+++ sources	21 Sep 2007 17:08:09 -0000	1.5
@@ -1 +1 @@
-bdb39965a147506fc194d5a28117172a  ejabberd-1.1.3.tar.gz
+65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz


--- ejabberd-1.1.3-ldapfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 17:17:05 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 21 Sep 2007 13:17:05 -0400
Subject: rpms/fuse/devel fuse.spec,1.26,1.27
Message-ID: <200709211717.l8LHH51K031274@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256

Modified Files:
	fuse.spec 
Log Message:

forgot to bump



Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fuse.spec	21 Sep 2007 17:00:53 -0000	1.26
+++ fuse.spec	21 Sep 2007 17:16:33 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.7.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base



From fedora-extras-commits at redhat.com  Fri Sep 21 17:22:07 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 21 Sep 2007 13:22:07 -0400
Subject: rpms/solarwolf/devel solarwolf-path.patch, NONE,
	1.1 solarwolf.desktop, 
	NONE, 1.1 solarwolf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709211722.l8LHM7Vm031520@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31481/devel

Modified Files:
	.cvsignore sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:16:33 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:21:34 -0000	1.2
@@ -0,0 +1 @@
+solarwolf-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	21 Sep 2007 17:21:34 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:27:31 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 13:27:31 -0400
Subject: rpms/haproxy/devel haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211727.l8LHRVf3031722@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31695

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:26:59 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 17:26:59 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:31:30 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 21 Sep 2007 13:31:30 -0400
Subject: rpms/gmyth import.log,1.1,1.2
Message-ID: <200709211731.l8LHVUOt031927@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gmyth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823

Modified Files:
	import.log 
Log Message:
gmyth



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Sep 2007 16:57:09 -0000	1.1
+++ import.log	21 Sep 2007 17:30:58 -0000	1.2
@@ -0,0 +1 @@
+gmyth-0_4-4:HEAD:gmyth-0.4-4.src.rpm:1190395724



From fedora-extras-commits at redhat.com  Fri Sep 21 17:31:33 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Fri, 21 Sep 2007 13:31:33 -0400
Subject: rpms/gmyth/devel COPYING.LGPL, NONE, 1.1 gmyth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211731.l8LHVXoN031931@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.LGPL gmyth.spec 
Log Message:
gmyth



--- NEW FILE COPYING.LGPL ---

                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
	51 Franklin St, 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.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

                            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 Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.

  When we speak of free software, we are referring to freedom of use,
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 and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
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 other code 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.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes a de-facto standard.  To achieve this, non-free programs must
be allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  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, whereas the latter must
be combined with the library in order to run.

                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) 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.

    d) 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.

    e) 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 materials to be 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 with
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 Lesser 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

           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 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

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!




--- NEW FILE gmyth.spec ---
Summary: MythTV remote access libraries
Name: gmyth
Version: 0.4
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: COPYING.LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://gmyth.sf.net
BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel

%description
GMyth is a library used by applications to access content provided by the
MythTV set-top box framework, such as Live TV broadcasts, TV recordings, or
TV listings.

%package devel
Summary: Development libraries for MythTV remote access
Group: Development/Libraries
Requires: gmyth = %{version}-%{release}
Requires: pkgconfig glib2-devel mysql-devel curl-devel

%description devel
gmyth-devel contains development libraries and headers for the GMyth library.

%prep
%setup -q -n %{name}
# Upstream used the default license from the autotools, all the
# files and the project page says LGPL, see:
# http://sourceforge.net/tracker/index.php?func=detail&aid=1790620&group_id=177106&atid=879914
cp -a %{SOURCE1} .

%build
%configure
make %{?_smp_mflags}
chmod a-x src/*.[ch]

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc AUTHORS COPYING.LGPL
%{_bindir}/*
%{_libdir}/libgmyth.so.*

%files devel
%defattr(-,root,root)
%{_includedir}/gmyth
%{_libdir}/libgmyth.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Fri Sep 21 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-4
- Add a dist flag to the release

* Sat Sep 08 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-3
- Fix permissions in installed files
- Fix Source usage for sourceforge
- Use correct license, as per upstream

* Thu Sep 06 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-2
- Updated with comments from Matthias Clasen

* Fri Aug 31 2007 - Bastien Nocera <bnocera at redhat.com> 0.4-1
- First version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:57:11 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:31:01 -0000	1.2
@@ -0,0 +1 @@
+gmyth_0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:57:11 -0000	1.1
+++ sources	21 Sep 2007 17:31:01 -0000	1.2
@@ -0,0 +1 @@
+124ba338d9ae442319337e5b28b41126  gmyth_0.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:34:14 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 21 Sep 2007 13:34:14 -0400
Subject: rpms/solarwolf/F-7 solarwolf-path.patch, NONE, 1.1 solarwolf.desktop,
	NONE, 1.1 solarwolf.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709211734.l8LHYE6g032105@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075

Modified Files:
	sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	21 Sep 2007 17:33:41 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:44:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:44:57 -0400
Subject: rpms/sdljava/devel sdljava-0.9.1-regen.patch, NONE,
	1.1 sdljava-runtest.sh, NONE, 1.1 sdljava.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211744.l8LHiv7v000836@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv754/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sdljava-0.9.1-regen.patch sdljava-runtest.sh sdljava.spec 
Log Message:
initial sdljava import


sdljava-0.9.1-regen.patch:

--- NEW FILE sdljava-0.9.1-regen.patch ---
diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/linux/Makefile
--- sdljava-0.9.1/etc/build/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
 
 SDLJAVA_I=SDLAudio.i\
           SDLCdrom.i\
@@ -46,35 +46,35 @@ gfx:    libsdljava_gfx.so
 #
 # NOTE:  if you want to work on the sdljava native layer please un-comment these lines
 #
-#SDLAudio_wrap.c: SDLAudio.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
-#
-#SDLCdrom_wrap.c: SDLCdrom.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
-#
-#SDLEvent_wrap.c: SDLEvent.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
-#
-#SDLGFX_wrap.c: SDLGFX.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
-#
-#SDLImage_wrap.c: SDLImage.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
-#
-#SDLJoystick_wrap.c: SDLJoystick.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
-#
-#SDLMain_wrap.c: SDLMain.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
-#
-#SDLMixer_wrap.c: SDLMixer.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
-#
-#SDLTTF_wrap.c: SDLTTF.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
-#
-#SDLVideo_wrap.c: SDLVideo.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,12 +4,12 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@
 
 GLJAVA_I=glew.i
 
 GLJAVA_OBJ=glew_wrap.o
-GLJAVA_LIB=-lGLEW
+GLJAVA_LIB=-lGLEW -lGLU
 
 all:	libgljava.so
 
@@ -17,8 +17,8 @@ all:	libgljava.so
 #
 # NOTE:  if you want to work on the gljava native layer please un-comment the following line
 #
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
 
 FTGLJAVA_OBJ=FTGL_wrap.o
 FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@@ -15,9 +15,9 @@ all:	libftgljava.so
 #
 # NOTE:  if you want to work on the ftgljava native layer please un-comment the following line
 #
-#FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-#	./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+	./post-process.rb
 
 %.o: %.cxx
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@


--- NEW FILE sdljava-runtest.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=`build-classpath sdljava`
MAIN_CLASS="$1"
if [ -x /usr/lib64/sdljava/libsdljava.so ]; then
  set_options "-Djava.library.path="/usr/lib64/sdljava""
else
  set_options "-Djava.library.path="/usr/lib/sdljava""
fi

shift
run "$@"


--- NEW FILE sdljava.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

Name:           sdljava
Version:        0.9.1
Release:        5%{?dist}
Summary:        Java binding to the SDL API
Group:          System Environment/Libraries
License:        LGPLv2+
Url:            http://sdljava.sourceforge.net/
# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# with the included Microsoft Copyrighted Arial fonts removed
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-runtest.sh
Patch0:         sdljava-0.9.1-regen.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-devel java-gcj-compat-devel
BuildRequires:  ant xml-commons-apis swig bsh jdom
# Build fails on fedora 8 test 2 when not using icedtea :( Note it runs fine
# with gcj (bug 297961).
BuildRequires:  java-1.7.0-icedtea-devel
# icedtea is i386 and x86_64
ExclusiveArch:  %{ix86} x86_64
Requires:       bsh jdom
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
sdljava is a Java binding to the SDL API being developed by Ivan Ganza.

sdljava provides the ability to write games and other applications
from the java programming language. sdljava is designed to be fast,
efficient and easy to use.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description javadoc
Javadoc for %{name}.


%package demo
Summary:        Some examples for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       /usr/share/fonts/dejavu/DejaVuSans.ttf
Requires:       jpackage-utils

%description demo
Demonstrations and samples for %{name}.


%prep
%setup -q
%patch0 -p1 -z .regen
iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1

# patch in gcc include path so that swig can find it
GCC_PATH=`gcc -print-search-dirs | grep install | cut -f 2 -d " "`
sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
  etc/build/linux/Makefile \
  etc/build/gljava/linux/Makefile \
  etc/build/gljava/linux/ftgl/Makefile

# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
  -e 's|testdata|%{_datadir}/%{name}/testdata|g'

# use system versions of bsh & jdom
pushd lib
rm *.jar
ln -s /usr/share/java/jdom.jar .
ln -s /usr/share/java/bsh.jar .
popd

# copy the Linux Makefiles into place
cp etc/build/linux/Makefile src/sdljava/native
cp etc/build/gljava/linux/Makefile src/org/gljava/opengl/native
cp etc/build/gljava/linux/ftgl/Makefile src/org/gljava/opengl/native/ftgl

# and remove the swig generated code so that it gets regenerated
rm src/sdljava/native/SDL*_wrap.c src/sdljava/native/SDL_types.h
rm src/org/gljava/opengl/native/glew_wrap.c


%build
pushd src/sdljava/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native/ftgl
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

ant jar javadoc


%install
rm -rf $RPM_BUILD_ROOT

# dirs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# jars
install -m 644 lib/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# native libraries
install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}

# javadoc
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# demo scripts
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
pushd bin
rm runtest.sh
for i in `ls -1 *.sh`; do
   sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i
   FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'`
   install -m 755 $i $RPM_BUILD_ROOT%{_bindir}/%{name}-$FN.sh
done
popd

#test data
cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s ../../fonts/dejavu/DejaVuSans.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf
ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf

%{_bindir}/aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%postun
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}


%files
%defattr(-,root,root,-)
%doc README TODO docs/CHANGES_0_9_1
%{_javadir}/%{name}*.jar
%{_libdir}/%{name}
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files demo
%defattr(-,root,root,-)
%{_bindir}/%{name}-*.sh
%{_datadir}/%{name}/testdata


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-5
- BuildRequire icedtea as building with gcj fails (bug 297961)

* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8

* Mon Sep 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-3
- Fix determination of gcc include path

* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-2
- Dynamically determine gcc include path instead of hardcoding it, so that
  sdljava will build on other setups then devel-x86_64 too (oops).

* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- Adapted Packman spec file for Fedora

* Mon Jun 18 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.2
- rebuild with glew-1.3.6

* Sat Jun 16 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.1
- initial build 0.9.1
- repacked as tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:46:20 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:44:24 -0000	1.2
@@ -0,0 +1 @@
+sdljava-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:46:20 -0000	1.1
+++ sources	21 Sep 2007 17:44:24 -0000	1.2
@@ -0,0 +1 @@
+d4bf1f77e93cd7d728479ad9d73d59e6  sdljava-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:45:14 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:45:14 -0400
Subject: rpms/ladspa-cmt-plugins/devel cmt-1.15-addnoise.patch, NONE,
	1.1 cmt-1.15-dontdenormal.patch, NONE,
	1.1 cmt-1.15-nostrip.patch, NONE, 1.1 cmt-makefile.patch, NONE,
	1.1 cmt.rdf, NONE, 1.1 ladspa-cmt-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211745.l8LHjE0Y000913@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-cmt-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmt-1.15-addnoise.patch cmt-1.15-dontdenormal.patch 
	cmt-1.15-nostrip.patch cmt-makefile.patch cmt.rdf 
	ladspa-cmt-plugins.spec 
Log Message:
initial ladspa-cmt-plugins import


cmt-1.15-addnoise.patch:

--- NEW FILE cmt-1.15-addnoise.patch ---
--- cmt/src/freeverb/Components/revmodel.cpp~	2000-11-04 10:01:09.000000000 -0800
+++ cmt/src/freeverb/Components/revmodel.cpp	2005-01-28 15:01:46.000000000 -0800
@@ -6,6 +6,15 @@
 
 #include "revmodel.h"
 
+unsigned int rand_state = 1;
+
+inline void add_white_noise (float &val) {
+  rand_state = rand_state * 1234567UL + 890123UL;
+  int mantissa = rand_state & 0x807F0000;
+  int flt_rnd = mantissa | 0x1e999999;
+  val += *reinterpret_cast <const float*> (&flt_rnd);
+}
+
 revmodel::revmodel()
 {
 	// Tie the components to their buffers
@@ -82,6 +91,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)
@@ -118,6 +128,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)

cmt-1.15-dontdenormal.patch:

--- NEW FILE cmt-1.15-dontdenormal.patch ---
--- cmt/src/freeverb/Components/denormals.h~	2000-11-04 03:49:57.000000000 -0800
+++ cmt/src/freeverb/Components/denormals.h	2005-01-28 16:13:27.000000000 -0800
@@ -8,7 +8,7 @@
 #ifndef _denormals_
 #define _denormals_
 
-#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
+#define undenormalise(sample) 
 
 #endif//_denormals_
 

cmt-1.15-nostrip.patch:

--- NEW FILE cmt-1.15-nostrip.patch ---
diff -up cmt/src/makefile~ cmt/src/makefile
--- cmt/src/makefile~	2007-09-16 10:48:29.000000000 +0200
+++ cmt/src/makefile	2007-09-16 10:48:29.000000000 +0200
@@ -73,7 +73,6 @@ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
 		$(PLUGIN_OBJECTS)					
 
 install:	$(PLUGIN_LIB)
-	-strip $(PLUGIN_LIB)
 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always

cmt-makefile.patch:

--- NEW FILE cmt-makefile.patch ---
--- cmt/src/makefile~	2002-05-18 11:27:15.000000000 -0700
+++ cmt/src/makefile	2002-10-31 17:47:05.000000000 -0800
@@ -5,14 +5,14 @@
 # Change this if you want to install somewhere else. In particularly
 # you may wish to remove the middle "local/" part.
 
-INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
 
 ###############################################################################
 #
 # GENERAL
 #
 
-INCLUDES	=	-I/usr/local/include/
+# INCLUDES	=	-I/usr/local/include/
 CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
 CXXFLAGS	=	$(CFLAGS)
 PLUGIN_LIB	=	../plugins/cmt.so
@@ -67,7 +67,7 @@
 
 install:	$(PLUGIN_LIB)
 	-strip $(PLUGIN_LIB)
-	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
+	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
 	@echo ---------------------------------------------


--- NEW FILE cmt.rdf ---
<?xml version='1.0' encoding='ISO-8859-1'?>
<!DOCTYPE rdf:RDF [
        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
]>
<rdf:RDF xmlns:rdf="&rdf;"
         xmlns:rdfs="&rdfs;"
         xmlns:dc="&dc;"
         xmlns:ladspa="&ladspa;">

  <!-- New classes needed by CMT -->
  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
  </rdfs:Class>

  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>

  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>

  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>

  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>

  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>

  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>

  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>

  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>

  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>

</rdf:RDF>


--- NEW FILE ladspa-cmt-plugins.spec ---
Name:           ladspa-cmt-plugins
Version:        1.15
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      cmt <= 1.15-4
Provides:       cmt = %{version}-%{release}

%description
The Computer Music Toolkit (CMT) is a collection of LADSPA plugins for
use with software synthesis and recording packages on Linux. See the
license before use.

The CMT is developed primarily by Richard W.E. Furse the principle
designer of the LADSPA standard, with additional plugins by Jezar and
David Bartold. If you are a programmer or can write documentation and
would like to help out, please feel free to contact Richard.


%prep
%setup -q -n cmt
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod -x doc/plugins.html src/freeverb/Components/tuning.h


%build
%{__make} -C src %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC" 


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} -C src DESTDIR="%{buildroot}" \
                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
                 install
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README doc/*
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-5
- change name of package to ladspa-cmt-plugins, spec file tweaks
- install plugins in the right directory even for x86_64

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- remove -Wall on fc4, gcc4 fails otherwise

* Fri Jan 29 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-4
- after many tests I added white noise to the freeverb inputs so that
  denormals don't have a chance to appear. The output of freeverb 
  viewed on bitscope shows the background "noise" to be down to -300db,
  so it should be fine. See:
  http://www.musicdsp.org/files/denormal.pdf
- disable the built-in undernomal #define

* Wed Dec 22 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanups

* Sun Jul 11 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-3
- added rpm compilation flags to support multiple architectures, 
  kept the original O3 optimization level

* Thu Jul  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- fixed denormal problem that affects freeverb on newer versions of gcc
- added rdf description file from Steve Harris' web site

* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, erased old ladspa-sdk dependency

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- added release tags

* Wed Feb 12 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- updated to 1.15

* Thu Oct 31 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:38:58 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:44:41 -0000	1.2
@@ -0,0 +1 @@
+cmt_src_1.15.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:38:58 -0000	1.1
+++ sources	21 Sep 2007 17:44:41 -0000	1.2
@@ -0,0 +1 @@
+aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:45:54 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 13:45:54 -0400
Subject: rpms/maven-scm/devel maven-scm.spec,1.1,1.2
Message-ID: <200709211745.l8LHjsFZ001080@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-scm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930

Modified Files:
	maven-scm.spec 
Log Message:

- Rebuild with excludearch for ppc64




Index: maven-scm.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-scm.spec	20 Mar 2007 05:10:02 -0000	1.1
+++ maven-scm.spec	21 Sep 2007 17:45:21 -0000	1.2
@@ -36,7 +36,7 @@
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.1.b3.2jpp.1%{?dist}
+Release:        0.1.b3.2jpp.2%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        Apache Software License
@@ -56,7 +56,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 2.0.4-6
 BuildRequires:  maven2-plugin-compiler
@@ -286,6 +289,9 @@
 %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.b3.2jpp.2
+- Rebuild with excludearch for ppc64
+
 * Tue Feb 27 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.b3.2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 17:46:00 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 21 Sep 2007 13:46:00 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.x.patch, 
	NONE, 1.1 system-config-printer.spec, 1.131, 1.132
Message-ID: <200709211746.l8LHk0eB001085@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv991

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.x.patch 
Log Message:
* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
- Pull in SVN patch from stable branch for 'Allow printing from
  the Internet' check-box (bug #221003).


system-config-printer-0.7.74.x.patch:

--- NEW FILE system-config-printer-0.7.74.x.patch ---
Index: po/sr at Latn.po
===================================================================
Index: po/as.po
===================================================================
Index: po/bs.po
===================================================================
Index: po/cs.po
===================================================================
Index: po/pt_BR.po
===================================================================
Index: po/mk.po
===================================================================
Index: po/es.po
===================================================================
Index: po/ko.po
===================================================================
Index: po/lo.po
===================================================================
Index: po/is.po
===================================================================
Index: po/no.po
===================================================================
Index: po/sk.po
===================================================================
Index: po/ms.po
===================================================================
Index: po/uk.po
===================================================================
Index: po/ro.po
===================================================================
Index: po/system-config-printer.pot
===================================================================
Index: po/nb.po
===================================================================
Index: po/bn.po
===================================================================
Index: po/ar.po
===================================================================
Index: po/fr.po
===================================================================
Index: po/kn.po
===================================================================
Index: po/hr.po
===================================================================
Index: po/nn.po
===================================================================
Index: po/mr.po
===================================================================
Index: po/or.po
===================================================================
Index: po/lv.po
===================================================================
Index: po/ca.po
===================================================================
Index: po/sr.po
===================================================================
Index: po/da.po
===================================================================
Index: po/bn_IN.po
===================================================================
Index: po/tr.po
===================================================================
Index: po/fa.po
===================================================================
Index: po/de.po
===================================================================
Index: po/sv.po
===================================================================
Index: po/ja.po
===================================================================
Index: po/ka.po
===================================================================
Index: po/zh_TW.po
===================================================================
Index: po/fi.po
===================================================================
Index: po/pa.po
===================================================================
Index: po/hi.po
===================================================================
Index: po/zh_CN.po
===================================================================
Index: po/ta.po
===================================================================
Index: po/te.po
===================================================================
Index: po/en_GB.po
===================================================================
Index: po/si.po
===================================================================
Index: po/cy.po
===================================================================
Index: po/gu.po
===================================================================
Index: po/hu.po
===================================================================
Index: po/vi.po
===================================================================
Index: po/hy.po
===================================================================
Index: po/my.po
===================================================================
Index: po/ru.po
===================================================================
Index: po/id.po
===================================================================
Index: po/el.po
===================================================================
Index: po/ml.po
===================================================================
Index: po/et.po
===================================================================
Index: po/nl.po
===================================================================
Index: po/pl.po
===================================================================
Index: po/it.po
===================================================================
Index: po/sl.po
===================================================================
Index: po/pt.po
===================================================================
Index: po/bg.po
===================================================================
Index: system-config-printer.glade
===================================================================
--- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1571)
+++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1571)
@@ -432,6 +432,40 @@
 			      </child>
 
 			      <child>
+				<widget class="GtkAlignment" id="alignment78">
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">1</property>
+				  <property name="yscale">1</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">12</property>
+				  <property name="right_padding">0</property>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="chkServerShareAny">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Allow printing from the Internet</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>
+				      <signal name="toggled" handler="on_server_changed" last_modification_time="Tue, 04 Sep 2007 09:46:49 GMT"/>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
 				<widget class="GtkCheckButton" id="chkServerRemoteAdmin">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
Index: ChangeLog
===================================================================
--- ChangeLog	(.../tags/0.7.74.2)	(revision 1571)
+++ ChangeLog	(.../branches/0.7.74.x)	(revision 1571)
@@ -1,3 +1,18 @@
+2007-09-04  Tim Waugh  <twaugh at redhat.com>
+
+	* system-config-printer.py (GUI.setConnected): Set sensitivity for
+	new check-box.
+	(GUI.fillServerTab): Show setting for new check-box.
+	(GUI.on_server_changed): Set sensitivity for new check-box.
+	(GUI.save_serversettings): Set server setting from check-box.
+
+	* system-config-printer.glade: New check-box for 'Allow printing
+	from the Internet'.
+
+2007-09-21  Tim Waugh  <twaugh at redhat.com>
+
+	* po/ko.po: Updated (from 0.7.32.x POT; needs further updating).
+
 2007-09-19  Tim Waugh  <twaugh at redhat.com>
 
 	* configure.in: Version 0.7.74.2.
Index: system-config-printer.py
===================================================================
--- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1571)
+++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1571)
@@ -74,6 +74,12 @@
 ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
 ellipsis = unichr(0x2026)
 
+try:
+    try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
+except AttributeError:
+    # cups module was compiled with CUPS < 1.3
+    try_CUPS_SERVER_REMOTE_ANY = "_remote_any"
+
 def nonfatalException ():
     print "Caught non-fatal exception.  Traceback:"
     (type, value, tb) = sys.exc_info ()
@@ -135,6 +141,7 @@
                         "btnApply", "btnRevert", "btnConflict",
 
                         "chkServerBrowse", "chkServerShare",
+                        "chkServerShareAny",
                         "chkServerRemoteAdmin", "chkServerAllowCancelAll",
                         "chkServerLogDebug",
 
@@ -607,6 +614,9 @@
                        self.chkServerLogDebug):
             widget.set_sensitive(connected)
 
+        sharing = self.chkServerShare.get_active ()
+        self.chkServerShareAny.set_sensitive (sharing)
+
         try:
             del self.server_settings
         except:
@@ -3625,15 +3635,17 @@
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),
+            (self.chkServerShareAny, try_CUPS_SERVER_REMOTE_ANY),
             (self.chkServerRemoteAdmin, cups.CUPS_SERVER_REMOTE_ADMIN),
             (self.chkServerAllowCancelAll, cups.CUPS_SERVER_USER_CANCEL_ANY),
             (self.chkServerLogDebug, cups.CUPS_SERVER_DEBUG_LOGGING),]:
             widget.set_data("setting", setting)
             if self.server_settings.has_key(setting):
                 widget.set_active(int(self.server_settings[setting]))
-                widget.show()
+                widget.set_sensitive(True)
             else:
-                widget.hide()
+                widget.set_active(False)
+                widget.set_sensitive(False)
         self.setDataButtonState()
         
     def on_server_changed(self, widget):
@@ -3642,6 +3654,11 @@
             self.changed.discard(widget)
         else:
             self.changed.add(widget)
+
+        sharing = self.chkServerShare.get_active ()
+        self.chkServerShareAny.set_sensitive (
+            sharing and self.server_settings.has_key(try_CUPS_SERVER_REMOTE_ANY))
+
         self.setDataButtonState()
 
     def save_serversettings(self):
@@ -3649,6 +3666,7 @@
         for widget, setting in [
             (self.chkServerBrowse, cups.CUPS_SERVER_REMOTE_PRINTERS),
             (self.chkServerShare, cups.CUPS_SERVER_SHARE_PRINTERS),
+            (self.chkServerShareAny, try_CUPS_SERVER_REMOTE_ANY),
             (self.chkServerRemoteAdmin, cups.CUPS_SERVER_REMOTE_ADMIN),
             (self.chkServerAllowCancelAll, cups.CUPS_SERVER_USER_CANCEL_ANY),
             (self.chkServerLogDebug, cups.CUPS_SERVER_DEBUG_LOGGING),]:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- system-config-printer.spec	19 Sep 2007 14:00:40 -0000	1.131
+++ system-config-printer.spec	21 Sep 2007 17:45:28 -0000	1.132
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
+Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p0 -b .0.7.74.x
 
 %build
 %configure
@@ -128,6 +130,10 @@
 fi
 
 %changelog
+* Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
+- Pull in SVN patch from stable branch for 'Allow printing from
+  the Internet' check-box (bug #221003).
+
 * Wed Sep 19 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-1
 - Updated pycups to 1.9.27.
 - 0.7.74.2:



From fedora-extras-commits at redhat.com  Fri Sep 21 17:47:58 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:47:58 -0400
Subject: rpms/ladspa-blop-plugins/devel ladspa-blop-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211747.l8LHlwcp001231@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-blop-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-blop-plugins.spec 
Log Message:
initial ladspa-blop-plugins import



--- NEW FILE ladspa-blop-plugins.spec ---
Name:           ladspa-blop-plugins
Version:        0.2.8
Release:        5%{?dist}
Summary:        Bandlimited LADSPA Oscillator Plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://blop.sourceforge.net/
Source:         http://downloads.sourceforge.net/blop/blop-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      blop <= 0.2.8-1
Provides:       blop = %{version}-%{release}

%description
BLOP comprises a set of LADSPA plugins that generate bandlimited
sawtooth, square, variable pulse and slope-variable triangle waves,
for use in LADSPA hosts, principally for use with one of the many
modular software synthesisers available.

They are wavetable based, and are designed to produce output with
harmonic content as high as possible over a wide pitch range.


%prep
%setup -q -n blop-%{version}
chmod -x src/lp4pole_filter.c src/include/lp4pole_filter.h


%build
%configure
# note, we must pass CFLAGS as for some reason they do not get propagated
# by configure
%{__make} %{?_smp_mflags} ladspa_plugin_dir="%{_libdir}/ladspa" \
  CFLAGS="$RPM_OPT_FLAGS -ffast-math -DNO_DEBUG -DPIC -fPIC"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} DESTDIR="%{buildroot}" \
          ladspa_plugin_dir="%{_libdir}/ladspa" install
%find_lang blop

# install the rdf description
%{__install} -p -m 644 doc/blop.rdf %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files -f blop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO doc/*.txt
%{_libdir}/ladspa/*.so
%{_libdir}/ladspa/blop_files
%{_datadir}/ladspa/rdf/*.rdf


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file

* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-4
- Make compile honor RPM_OPT_FLAGS

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-2
- spec file tweaks, add %%{?dist} to release

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup
- do not include ladspa directory in file list

* Mon Jun 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-1
- updated to 0.2.8, fixed file list and added translations

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- added release tags

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- updated to 0.2.7

* Fri Feb 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.6
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:37:01 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:47:26 -0000	1.2
@@ -0,0 +1 @@
+blop-0.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:37:01 -0000	1.1
+++ sources	21 Sep 2007 17:47:26 -0000	1.2
@@ -0,0 +1 @@
+4baedbf1e7cacc7d1034c4bcd5556d6f  blop-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:04 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:04 -0400
Subject: rpms/sdljava/F-7 sdljava-0.9.1-regen.patch, NONE,
	1.1 sdljava-runtest.sh, NONE, 1.1 sdljava.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHn4Pk001388@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305

Modified Files:
	.cvsignore sources 
Added Files:
	sdljava-0.9.1-regen.patch sdljava-runtest.sh sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8


sdljava-0.9.1-regen.patch:

--- NEW FILE sdljava-0.9.1-regen.patch ---
diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/linux/Makefile
--- sdljava-0.9.1/etc/build/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
 
 SDLJAVA_I=SDLAudio.i\
           SDLCdrom.i\
@@ -46,35 +46,35 @@ gfx:    libsdljava_gfx.so
 #
 # NOTE:  if you want to work on the sdljava native layer please un-comment these lines
 #
-#SDLAudio_wrap.c: SDLAudio.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
-#
-#SDLCdrom_wrap.c: SDLCdrom.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
-#
-#SDLEvent_wrap.c: SDLEvent.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
-#
-#SDLGFX_wrap.c: SDLGFX.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
-#
-#SDLImage_wrap.c: SDLImage.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
-#
-#SDLJoystick_wrap.c: SDLJoystick.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
-#
-#SDLMain_wrap.c: SDLMain.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
-#
-#SDLMixer_wrap.c: SDLMixer.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
-#
-#SDLTTF_wrap.c: SDLTTF.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
-#
-#SDLVideo_wrap.c: SDLVideo.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,12 +4,12 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@
 
 GLJAVA_I=glew.i
 
 GLJAVA_OBJ=glew_wrap.o
-GLJAVA_LIB=-lGLEW
+GLJAVA_LIB=-lGLEW -lGLU
 
 all:	libgljava.so
 
@@ -17,8 +17,8 @@ all:	libgljava.so
 #
 # NOTE:  if you want to work on the gljava native layer please un-comment the following line
 #
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
 
 FTGLJAVA_OBJ=FTGL_wrap.o
 FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@@ -15,9 +15,9 @@ all:	libftgljava.so
 #
 # NOTE:  if you want to work on the ftgljava native layer please un-comment the following line
 #
-#FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-#	./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+	./post-process.rb
 
 %.o: %.cxx
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@


--- NEW FILE sdljava-runtest.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

CLASSPATH=`build-classpath sdljava`
MAIN_CLASS="$1"
if [ -x /usr/lib64/sdljava/libsdljava.so ]; then
  set_options "-Djava.library.path="/usr/lib64/sdljava""
else
  set_options "-Djava.library.path="/usr/lib/sdljava""
fi

shift
run "$@"


--- NEW FILE sdljava.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

Name:           sdljava
Version:        0.9.1
Release:        4%{?dist}
Summary:        Java binding to the SDL API
Group:          System Environment/Libraries
License:        LGPLv2+
Url:            http://sdljava.sourceforge.net/
# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# with the included Microsoft Copyrighted Arial fonts removed
Source0:        %{name}-%{version}.tar.gz
Source1:        %{name}-runtest.sh
Patch0:         sdljava-0.9.1-regen.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-devel java-gcj-compat-devel
BuildRequires:  ant xml-commons-apis swig bsh jdom
Requires:       bsh jdom
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
sdljava is a Java binding to the SDL API being developed by Ivan Ganza.

sdljava provides the ability to write games and other applications
from the java programming language. sdljava is designed to be fast,
efficient and easy to use.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description javadoc
Javadoc for %{name}.


%package demo
Summary:        Some examples for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       /usr/share/fonts/dejavu/DejaVuSans.ttf
Requires:       jpackage-utils

%description demo
Demonstrations and samples for %{name}.


%prep
%setup -q
%patch0 -p1 -z .regen
iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1

# patch in gcc include path so that swig can find it
GCC_PATH=`gcc -print-search-dirs | grep install | cut -f 2 -d " "`
sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
  etc/build/linux/Makefile \
  etc/build/gljava/linux/Makefile \
  etc/build/gljava/linux/ftgl/Makefile

# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
  -e 's|testdata|%{_datadir}/%{name}/testdata|g'

# use system versions of bsh & jdom
pushd lib
rm *.jar
ln -s /usr/share/java/jdom.jar .
ln -s /usr/share/java/bsh.jar .
popd

# copy the Linux Makefiles into place
cp etc/build/linux/Makefile src/sdljava/native
cp etc/build/gljava/linux/Makefile src/org/gljava/opengl/native
cp etc/build/gljava/linux/ftgl/Makefile src/org/gljava/opengl/native/ftgl

# and remove the swig generated code so that it gets regenerated
rm src/sdljava/native/SDL*_wrap.c src/sdljava/native/SDL_types.h
rm src/org/gljava/opengl/native/glew_wrap.c


%build
pushd src/sdljava/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

pushd src/org/gljava/opengl/native/ftgl
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd

ant jar javadoc


%install
rm -rf $RPM_BUILD_ROOT

# dirs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# jars
install -m 644 lib/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# native libraries
install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}

# javadoc
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# demo scripts
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
pushd bin
rm runtest.sh
for i in `ls -1 *.sh`; do
   sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i
   FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'`
   install -m 755 $i $RPM_BUILD_ROOT%{_bindir}/%{name}-$FN.sh
done
popd

#test data
cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s ../../fonts/dejavu/DejaVuSans.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf
ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf
ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf

%{_bindir}/aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%postun
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}


%files
%defattr(-,root,root,-)
%doc README TODO docs/CHANGES_0_9_1
%{_javadir}/%{name}*.jar
%{_libdir}/%{name}
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files demo
%defattr(-,root,root,-)
%{_bindir}/%{name}-*.sh
%{_datadir}/%{name}/testdata


%changelog
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8

* Mon Sep 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-3
- Fix determination of gcc include path

* Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-2
- Dynamically determine gcc include path instead of hardcoding it, so that
  sdljava will build on other setups then devel-x86_64 too (oops).

* Sat Sep  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- Adapted Packman spec file for Fedora

* Mon Jun 18 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.2
- rebuild with glew-1.3.6

* Sat Jun 16 2007 Toni Graffy <toni at links2linux.de> - 0.9.1-0.pm.1
- initial build 0.9.1
- repacked as tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:46:20 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:48:32 -0000	1.2
@@ -0,0 +1 @@
+sdljava-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:46:20 -0000	1.1
+++ sources	21 Sep 2007 17:48:32 -0000	1.2
@@ -0,0 +1 @@
+d4bf1f77e93cd7d728479ad9d73d59e6  sdljava-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:11 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:11 -0400
Subject: rpms/ladspa-cmt-plugins/F-7 cmt-1.15-addnoise.patch, NONE,
	1.1 cmt-1.15-dontdenormal.patch, NONE,
	1.1 cmt-1.15-nostrip.patch, NONE, 1.1 cmt-makefile.patch, NONE,
	1.1 cmt.rdf, NONE, 1.1 ladspa-cmt-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHnBBh001440@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-cmt-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1332

Modified Files:
	.cvsignore sources 
Added Files:
	cmt-1.15-addnoise.patch cmt-1.15-dontdenormal.patch 
	cmt-1.15-nostrip.patch cmt-makefile.patch cmt.rdf 
	ladspa-cmt-plugins.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion


cmt-1.15-addnoise.patch:

--- NEW FILE cmt-1.15-addnoise.patch ---
--- cmt/src/freeverb/Components/revmodel.cpp~	2000-11-04 10:01:09.000000000 -0800
+++ cmt/src/freeverb/Components/revmodel.cpp	2005-01-28 15:01:46.000000000 -0800
@@ -6,6 +6,15 @@
 
 #include "revmodel.h"
 
+unsigned int rand_state = 1;
+
+inline void add_white_noise (float &val) {
+  rand_state = rand_state * 1234567UL + 890123UL;
+  int mantissa = rand_state & 0x807F0000;
+  int flt_rnd = mantissa | 0x1e999999;
+  val += *reinterpret_cast <const float*> (&flt_rnd);
+}
+
 revmodel::revmodel()
 {
 	// Tie the components to their buffers
@@ -82,6 +91,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)
@@ -118,6 +128,7 @@
 	{
 		outL = outR = 0;
 		input = (*inputL + *inputR) * gain;
+		add_white_noise(input);
 
 		// Accumulate comb filters in parallel
 		for(i=0; i<numcombs; i++)

cmt-1.15-dontdenormal.patch:

--- NEW FILE cmt-1.15-dontdenormal.patch ---
--- cmt/src/freeverb/Components/denormals.h~	2000-11-04 03:49:57.000000000 -0800
+++ cmt/src/freeverb/Components/denormals.h	2005-01-28 16:13:27.000000000 -0800
@@ -8,7 +8,7 @@
 #ifndef _denormals_
 #define _denormals_
 
-#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f
+#define undenormalise(sample) 
 
 #endif//_denormals_
 

cmt-1.15-nostrip.patch:

--- NEW FILE cmt-1.15-nostrip.patch ---
diff -up cmt/src/makefile~ cmt/src/makefile
--- cmt/src/makefile~	2007-09-16 10:48:29.000000000 +0200
+++ cmt/src/makefile	2007-09-16 10:48:29.000000000 +0200
@@ -73,7 +73,6 @@ $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
 		$(PLUGIN_OBJECTS)					
 
 install:	$(PLUGIN_LIB)
-	-strip $(PLUGIN_LIB)
 	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always

cmt-makefile.patch:

--- NEW FILE cmt-makefile.patch ---
--- cmt/src/makefile~	2002-05-18 11:27:15.000000000 -0700
+++ cmt/src/makefile	2002-10-31 17:47:05.000000000 -0800
@@ -5,14 +5,14 @@
 # Change this if you want to install somewhere else. In particularly
 # you may wish to remove the middle "local/" part.
 
-INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
+INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
 
 ###############################################################################
 #
 # GENERAL
 #
 
-INCLUDES	=	-I/usr/local/include/
+# INCLUDES	=	-I/usr/local/include/
 CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
 CXXFLAGS	=	$(CFLAGS)
 PLUGIN_LIB	=	../plugins/cmt.so
@@ -67,7 +67,7 @@
 
 install:	$(PLUGIN_LIB)
 	-strip $(PLUGIN_LIB)
-	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
+	cp $(PLUGIN_LIB) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
 
 test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
 	@echo ---------------------------------------------


--- NEW FILE cmt.rdf ---
<?xml version='1.0' encoding='ISO-8859-1'?>
<!DOCTYPE rdf:RDF [
        <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
        <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
        <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
        <!ENTITY ladspa 'http://ladspa.org/ontology#'>
]>
<rdf:RDF xmlns:rdf="&rdf;"
         xmlns:rdfs="&rdfs;"
         xmlns:dc="&dc;"
         xmlns:ladspa="&ladspa;">

  <!-- New classes needed by CMT -->
  <rdfs:Class rdf:about="&ladspa;AmbisonicPlugin" ladspa:hasLabel="Ambisonic">
    <rdfs:subClassOf rdf:resource="&ladspa;UtilityPlugin" />
  </rdfs:Class>

  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1092"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1091"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1090"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1093"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1087"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1094"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1089"/>
  <ladspa:AmbisonicPlugin rdf:about="&ladspa;1088"/>

  <ladspa:AmplifierPlugin rdf:about="&ladspa;1067"/>
  <ladspa:AmplifierPlugin rdf:about="&ladspa;1068"/>
  <ladspa:ModulatorPlugin rdf:about="&ladspa;1070"/>

  <ladspa:DistortionPlugin rdf:about="&ladspa;1846"/>
  <ladspa:DistortionPlugin rdf:about="&ladspa;1227"/>
  <ladspa:WaveshaperPlugin rdf:about="&ladspa;1097"/>

  <ladspa:DelayPlugin rdf:about="&ladspa;1225"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1053"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1054"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1055"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1056"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1057"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1058"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1059"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1060"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1061"/>
  <ladspa:DelayPlugin rdf:about="&ladspa;1062"/>

  <ladspa:UtilityPlugin rdf:about="&ladspa;1080"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1081"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1078"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1079"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1098"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1099"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1849"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1071"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1083"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1084"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1085"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1086"/>
  <ladspa:UtilityPlugin rdf:about="&ladspa;1082"/>

  <ladspa:ReverbPlugin rdf:about="&ladspa;1123"/>

  <ladspa:GeneratorPlugin rdf:about="&ladspa;1221"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1096"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1069"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1222"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1226"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1841"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1844"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1843"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1063"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1064"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1065"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1066"/>
  <ladspa:GeneratorPlugin rdf:about="&ladspa;1223"/>

  <ladspa:GatePlugin rdf:about="&ladspa;1845"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1848"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1842"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1076"/>
  <ladspa:LimiterPlugin rdf:about="&ladspa;1077"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1072"/>
  <ladspa:CompressorPlugin rdf:about="&ladspa;1073"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1074"/>
  <ladspa:ExpanderPlugin rdf:about="&ladspa;1075"/>

  <ladspa:LowpassPlugin rdf:about="&ladspa;1051"/>
  <ladspa:LowpassPlugin rdf:about="&ladspa;1224"/>
  <ladspa:HighpassPlugin rdf:about="&ladspa;1052"/>

</rdf:RDF>


--- NEW FILE ladspa-cmt-plugins.spec ---
Name:           ladspa-cmt-plugins
Version:        1.15
Release:        6%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      cmt <= 1.15-4
Provides:       cmt = %{version}-%{release}

%description
The Computer Music Toolkit (CMT) is a collection of LADSPA plugins for
use with software synthesis and recording packages on Linux. See the
license before use.

The CMT is developed primarily by Richard W.E. Furse the principle
designer of the LADSPA standard, with additional plugins by Jezar and
David Bartold. If you are a programmer or can write documentation and
would like to help out, please feel free to contact Richard.


%prep
%setup -q -n cmt
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod -x doc/plugins.html src/freeverb/Components/tuning.h


%build
%{__make} -C src %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC" 


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} -C src DESTDIR="%{buildroot}" \
                 INSTALL_PLUGINS_DIR="%{_libdir}/ladspa/" \
                 install
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README doc/*
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.15-6
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-5
- change name of package to ladspa-cmt-plugins, spec file tweaks
- install plugins in the right directory even for x86_64

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- remove -Wall on fc4, gcc4 fails otherwise

* Fri Jan 29 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-4
- after many tests I added white noise to the freeverb inputs so that
  denormals don't have a chance to appear. The output of freeverb 
  viewed on bitscope shows the background "noise" to be down to -300db,
  so it should be fine. See:
  http://www.musicdsp.org/files/denormal.pdf
- disable the built-in undernomal #define

* Wed Dec 22 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanups

* Sun Jul 11 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-3
- added rpm compilation flags to support multiple architectures, 
  kept the original O3 optimization level

* Thu Jul  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- fixed denormal problem that affects freeverb on newer versions of gcc
- added rdf description file from Steve Harris' web site

* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added buildrequires, erased old ladspa-sdk dependency

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- added release tags

* Wed Feb 12 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.15-1
- updated to 1.15

* Thu Oct 31 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:38:58 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:48:38 -0000	1.2
@@ -0,0 +1 @@
+cmt_src_1.15.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-cmt-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:38:58 -0000	1.1
+++ sources	21 Sep 2007 17:48:38 -0000	1.2
@@ -0,0 +1 @@
+aa2f0609aca8b698625d86170c426e2c  cmt_src_1.15.tgz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:35 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 13:49:35 -0400
Subject: rpms/ladspa-blop-plugins/F-7 ladspa-blop-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211749.l8LHnZbx001508@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-blop-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1380

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-blop-plugins.spec 
Log Message:
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file



--- NEW FILE ladspa-blop-plugins.spec ---
Name:           ladspa-blop-plugins
Version:        0.2.8
Release:        5%{?dist}
Summary:        Bandlimited LADSPA Oscillator Plugins
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://blop.sourceforge.net/
Source:         http://downloads.sourceforge.net/blop/blop-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      blop <= 0.2.8-1
Provides:       blop = %{version}-%{release}

%description
BLOP comprises a set of LADSPA plugins that generate bandlimited
sawtooth, square, variable pulse and slope-variable triangle waves,
for use in LADSPA hosts, principally for use with one of the many
modular software synthesisers available.

They are wavetable based, and are designed to produce output with
harmonic content as high as possible over a wide pitch range.


%prep
%setup -q -n blop-%{version}
chmod -x src/lp4pole_filter.c src/include/lp4pole_filter.h


%build
%configure
# note, we must pass CFLAGS as for some reason they do not get propagated
# by configure
%{__make} %{?_smp_mflags} ladspa_plugin_dir="%{_libdir}/ladspa" \
  CFLAGS="$RPM_OPT_FLAGS -ffast-math -DNO_DEBUG -DPIC -fPIC"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__mkdir} -p %{buildroot}%{_datadir}/ladspa/rdf
%{__make} DESTDIR="%{buildroot}" \
          ladspa_plugin_dir="%{_libdir}/ladspa" install
%find_lang blop

# install the rdf description
%{__install} -p -m 644 doc/blop.rdf %{buildroot}%{_datadir}/ladspa/rdf


%clean
%{__rm} -rf %{buildroot}


%files -f blop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO doc/*.txt
%{_libdir}/ladspa/*.so
%{_libdir}/ladspa/blop_files
%{_datadir}/ladspa/rdf/*.rdf


%changelog
* Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-5
- Preserve timestamp when install rdf file

* Tue Sep 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-4
- Make compile honor RPM_OPT_FLAGS

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.8-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Fri Nov 24 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-2
- spec file tweaks, add %%{?dist} to release

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup
- do not include ladspa directory in file list

* Mon Jun 21 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.8-1
- updated to 0.2.8, fixed file list and added translations

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-2
- changed name of ladspa package, do not depend on it explicitly

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- added release tags

* Thu May  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.7-1
- updated to 0.2.7

* Fri Feb 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.6
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:37:01 -0000	1.1
+++ .cvsignore	21 Sep 2007 17:49:02 -0000	1.2
@@ -0,0 +1 @@
+blop-0.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-blop-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:37:01 -0000	1.1
+++ sources	21 Sep 2007 17:49:02 -0000	1.2
@@ -0,0 +1 @@
+4baedbf1e7cacc7d1034c4bcd5556d6f  blop-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 17:49:45 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:49:45 -0400
Subject: rpms/tetex-IEEEtran/F-7 tetex-IEEEtran.spec,1.5,1.6
Message-ID: <200709211749.l8LHnj5U001548@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1381

Modified Files:
	tetex-IEEEtran.spec 
Log Message:



Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/F-7/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:49:12 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:53:24 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:53:24 -0400
Subject: rpms/tetex-IEEEtran/F-7 sources,1.2,1.3
Message-ID: <200709211753.l8LHrOWQ001722@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1691

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:52:51 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip



From fedora-extras-commits at redhat.com  Fri Sep 21 17:54:48 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 13:54:48 -0400
Subject: rpms/maven-shared/devel maven-shared.spec,1.2,1.3
Message-ID: <200709211754.l8LHsmj9001794@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-shared/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1740

Modified Files:
	maven-shared.spec 
Log Message:

- Rebuild with ppc64 excludearch'd
- Removed 'jpp' from a BR version





Index: maven-shared.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-shared.spec	20 Mar 2007 14:01:21 -0000	1.2
+++ maven-shared.spec	21 Sep 2007 17:54:16 -0000	1.3
@@ -51,13 +51,13 @@
 
 Name:           maven-shared
 Version:        1.0
-Release:        4jpp.2%{?dist}
+Release:        4jpp.3%{?dist}
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven2 >= 0:2.0.4-9jpp
+BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
@@ -82,6 +82,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -149,7 +151,6 @@
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
@@ -281,6 +282,10 @@
 %doc %{_javadocdir}/%{name}-plugin-testing-harness*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-4jpp.3
+- Rebuild with ppc64 excludearch'd
+- Removed 'jpp' from a BR version
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-4jpp.2
 - Fixed BRs and Reqa
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:55:18 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:55:18 -0400
Subject: rpms/tetex-IEEEtran/FC-6 sources, 1.2, 1.3 tetex-IEEEtran.spec, 1.5,
	1.6
Message-ID: <200709211755.l8LHtIhC001852@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1775

Modified Files:
	sources tetex-IEEEtran.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:54:45 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip


Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/FC-6/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:54:45 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 17:55:25 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 13:55:25 -0400
Subject: rpms/tetex-IEEEtran/devel sources, 1.2, 1.3 tetex-IEEEtran.spec, 1.5,
	1.6
Message-ID: <200709211755.l8LHtP2K001903@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/tetex-IEEEtran/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1802

Modified Files:
	sources tetex-IEEEtran.spec 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2006 04:15:08 -0000	1.2
+++ sources	21 Sep 2007 17:54:53 -0000	1.3
@@ -1 +1 @@
-3f58584884756df9a0748df460983c15  IEEEtran.zip
+ddfbc797913ac11f785eac2f7b87c0f7  IEEEtran.zip


Index: tetex-IEEEtran.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-IEEEtran/devel/tetex-IEEEtran.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-IEEEtran.spec	28 Aug 2006 02:00:12 -0000	1.5
+++ tetex-IEEEtran.spec	21 Sep 2007 17:54:53 -0000	1.6
@@ -8,14 +8,14 @@
 %define bibpkgdoc   %{_texmf}/doc/bibtex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Official LaTeX class for IEEE transactions journals and conferences
 
 Group:          Applications/Publishing
-License:        Artistic
+License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/ieeetran.html
-Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/IEEEtran.zip
+Source0:        ftp://ctan.org/tex-archive/macros/latex/contrib/IEEEtran.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q -n %{texpkg}
-mv extras/tux.eps .
 mv bibtex/README README_BIBTEX
 mv tools/README README_TOOLS
 
@@ -76,7 +75,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex tux.eps
+%doc README README_BIBTEX README_TOOLS bare_conf.tex bare_jrnl.tex 
+%doc extras/tux.eps
+%doc changelog.txt
 %{texpkgdir}/
 %{texpkgdoc}/
 %{bibpkgdir}/
@@ -85,6 +86,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.7.1-1
+- New upstream release 1.7a reversioned to 1.7.1 (missed 1.7.0 rel)
+- Changed download URL to generic CTAN
+- Don't need to move tux.eps for it to be included in docs - removed
+- Added changelog.txt to docs
+- Updated license to LPPL
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 1.6.3-2
 - Bump release for mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:06:12 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:06:12 -0400
Subject: rpms/xournal/F-7 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 x-xoj.desktop, 
	1.1, 1.2 xournal.desktop, 1.1, 1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211806.l8LI6CHt010537@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10505

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2007 18:38:29 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:05:39 -0000	1.2
@@ -0,0 +1 @@
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:05:19 -0000	1.2
+++ sources	21 Sep 2007 18:05:39 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:05:19 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:05:39 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:05:19 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:05:39 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:29:57 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:05:39 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:08:03 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:08:03 -0400
Subject: rpms/xournal/FC-6 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 x-xoj.desktop, 
	1.1, 1.2 xournal.desktop, 1.1, 1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211808.l8LI83sh010639@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10607

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2007 18:38:29 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:07:31 -0000	1.2
@@ -0,0 +1 @@
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:05:26 -0000	1.2
+++ sources	21 Sep 2007 18:07:31 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:05:26 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:07:31 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:05:26 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:07:31 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:30:02 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:07:31 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:08:53 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:08:53 -0400
Subject: rpms/xournal/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 x-xoj.desktop, 1.1, 1.2 xournal.desktop, 1.1,
	1.2 xournal.spec, 1.2, 1.3
Message-ID: <200709211808.l8LI8rbr010724@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10651

Modified Files:
	.cvsignore sources x-xoj.desktop xournal.desktop xournal.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jun 2007 20:01:00 -0000	1.2
+++ .cvsignore	21 Sep 2007 18:08:21 -0000	1.3
@@ -1 +1 @@
-xournal-0.3.3.tar.gz
+xournal-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jun 2007 20:01:00 -0000	1.2
+++ sources	21 Sep 2007 18:08:21 -0000	1.3
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz


Index: x-xoj.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/x-xoj.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x-xoj.desktop	1 Jun 2007 20:01:00 -0000	1.1
+++ x-xoj.desktop	21 Sep 2007 18:08:21 -0000	1.2
@@ -3,8 +3,9 @@
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true


Index: xournal.desktop
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal.desktop	1 Jun 2007 20:01:00 -0000	1.1
+++ xournal.desktop	21 Sep 2007 18:08:21 -0000	1.2
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xournal.spec	12 Jun 2007 03:30:07 -0000	1.2
+++ xournal.spec	21 Sep 2007 18:08:21 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript



From fedora-extras-commits at redhat.com  Fri Sep 21 18:12:18 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Fri, 21 Sep 2007 14:12:18 -0400
Subject: rpms/dhcdbd/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE dhcdbd.spec, 1.52, NONE sources, 1.40, NONE
Message-ID: <200709211812.l8LICIhQ010946@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcdbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907

Added Files:
	dead.package 
Removed Files:
	Makefile dhcdbd.spec sources 
Log Message:
dhcdbd is dead.



--- NEW FILE dead.package ---
Obsoleted by NetworkManager 0.7.0 and higher.
21-Sep-2007

dhcdbd is no longer maintained or developed as all functionality has moved
over to NetworkManager.  Support for dhcdbd in previous releases of Fedora
will continue as long as we are supporting those releases of Fedora.

-- 
David Cantrell <dcantrell at redhat.com>


--- Makefile DELETED ---


--- dhcdbd.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 18:13:29 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:13:29 -0400
Subject: rpms/nqc/F-7 nqc.spec,1.7,1.8
Message-ID: <200709211813.l8LIDT1F011026@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/nqc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10994

Modified Files:
	nqc.spec 
Log Message:



Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/F-7/nqc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nqc.spec	21 Jul 2007 06:44:15 -0000	1.7
+++ nqc.spec	21 Sep 2007 18:12:56 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
-License:        MPL
+License:        MPLv1.0
 URL:            http://bricxcc.sourceforge.net/nqc/
 Source0:        http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r6.tgz
 Source1:        60-legousbtower.rules
@@ -70,7 +70,8 @@
 
 
 %changelog
-* Fri Jul 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+- Updated license to reflect specific MPL version
 - New upstream release
 - Added NQC tutorial and samples to docs
 - Added -c option to setup to create top-level directory



From fedora-extras-commits at redhat.com  Fri Sep 21 18:15:56 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:15:56 -0400
Subject: rpms/kdebase4/F-7 kdebase4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709211815.l8LIFuPT011215@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11137/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	kdebase4.spec 
Log Message:
New package kdebase4 - K Desktop Environment 4 - Core Files:
- copied from kdebase-kde4-branch
- kdebase.spec renamed to kdebase4.spec to match guidelines
- ExcludeArch: ppc64 (#300601)


--- NEW FILE kdebase4.spec ---

Summary:       K Desktop Environment 4 - Core Files
Version:       3.93.0
Release:       4%{?dist}

%if 0%{?fedora} > 8
Name:          kdebase
Epoch:         6

Obsoletes:     kdebase4 < %{version}-%{release}
Provides:      kdebase4 = %{version}-%{release}

%else
Name:          kdebase4
%endif

License:       GPLv2
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# rh#300601
ExcludeArch: ppc64

BuildRequires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
%ifnarch s390 s390x
Requires: eject
%endif

# should not conflict with d3lphin, but does with old Dolphin
Conflicts:     dolphin <= 0.8.2

BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
# needed?
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
BuildRequires: doxygen
BuildRequires: fontconfig-devel
BuildRequires: gettext
BuildRequires: hal-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
# needed?
BuildRequires: libart_lgpl-devel
# needed?
BuildRequires: libfontenc-devel
BuildRequires: libusb-devel
BuildRequires: OpenEXR-devel
# needed?
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
# samba support
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
%else
BuildRequires: samba
%endif
BuildRequires: soprano-devel
BuildRequires: strigi-devel
BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
%if 0%{?fedora} >= 8
BuildRequires:  libxcb-devel
%endif
# needed?
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
BuildRequires: zlib-devel
# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel

%description
Core applications for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group:    Development/Libraries
Summary:  Header files for kdebase4
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdebase4"
Obsoletes: kdebase4-devel < %{version}-%{release}
Provides:  kdebase4-devel = %{version}-%{release}
%endif
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
Header files for developing applications using %{name}.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdebase-%{version}


%build

mkdir -p %{_target_platform} 
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

# omit gigantic oxygen scalable/svg icons, for now -- Rex
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 

# remove files which conflict with KDE 3
rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
rm -rf %{buildroot}%{_datadir}/emoticons
rm -rf %{buildroot}%{_kde4_datadir}/locale
rm -rf %{buildroot}%{_kde4_datadir}/autostart
rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
rm -rf %{buildroot}%{_kde4_datadir}/config
rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
# binaries: conflict with kdebase
rm -f %{buildroot}%{_kde4_bindir}/drkonqi
rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
rm -f %{buildroot}%{_kde4_bindir}/kdeeject
rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
rm -f %{buildroot}%{_kde4_bindir}/kdesu
rm -f %{buildroot}%{_kde4_bindir}/kdesud
rm -f %{buildroot}%{_kde4_bindir}/kdialog
rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
rm -f %{buildroot}%{_kde4_bindir}/kfind
rm -f %{buildroot}%{_kde4_bindir}/kfmclient
rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
rm -f %{buildroot}%{_kde4_bindir}/knetattach
rm -f %{buildroot}%{_kde4_bindir}/konqueror
rm -f %{buildroot}%{_kde4_bindir}/konsole
rm -f %{buildroot}%{_kde4_bindir}/kprinter
rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
rm -f %{buildroot}%{_kde4_bindir}/kstart
rm -f %{buildroot}%{_kde4_bindir}/ktrash
rm -f %{buildroot}%{_kde4_bindir}/kwrite
rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
# binaries: conflict with kdelibs
rm -f %{buildroot}%{_kde4_bindir}/kcmshell
rm -f %{buildroot}%{_kde4_bindir}/kfile
rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
rm -f %{buildroot}%{_kde4_bindir}/kioexec
rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
# binaries: conflict with kdebase-extras
rm -f %{buildroot}%{_kde4_bindir}/kappfinder
# do not strictly conflict, but we removed the corresponding binaries:
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
# we also removed the binaries for these:
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :

%postun
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_appsdir}/*
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_kde4_iconsdir}/oxygen/
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
%{_kde4_docdir}/HTML/en/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/*
%exclude %{_kde4_libdir}/kde4/devel/

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/lib*.so


%changelog
* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- ExcludeArch: ppc64 (#300601)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- add missing BR alsa-lib-devel

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: GPLv2

* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel

* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
- consolekit_kdm patch (#228111, kde#147790)
- update startkde patch

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92 (kde-4-beta1)

* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
- fix startkde
- add env/shutdown directory

* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- kde4.desktop: fix session Name

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
- cleanup/fix kde4.desktop
- kdepimlibs4->kdepimlibs

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
- specfile cleanup (%%prefix issues mostly)

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
  in case we want to drop the Rs on these from kdelibs4-devel
- consistently add all BRs as -devel Rs, not just almost all, until we can
  figure out which, if any, are really needed
- BR libsmbclient-devel instead of samba on F>=7, EL>=6

* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirement for cmake
- build against libxklavier on EL5
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- rebuild for patched FindKDE4Internal.cmake

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- drop obsolete joydevice.h patch
- remove translations of "KDE" without the "4" from kde4.desktop
- resync BR and -devel Requires
- don't set LD_LIBRARY_PATH
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- fix missing underscore in _datadir
- install kde4.desktop in install, not prep
- fix invalid syntax in kde4.desktop

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
- spec file cleanups and added clean up in %%install
- fixed PATH for libkdecore.so.5; cannot open shared object file;
- added Logitech mouse support
- added dbus-devel, hal-devel and more as BR
- fixed broken joydevice.h - Kevin Kofler
- added file kde4.desktop

* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:31:51 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:15:24 -0000	1.2
@@ -0,0 +1,2 @@
+kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:31:51 -0000	1.1
+++ sources	21 Sep 2007 18:15:24 -0000	1.2
@@ -0,0 +1 @@
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 18:16:00 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:16:00 -0400
Subject: rpms/kdebase4/devel kdebase4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709211816.l8LIG0WG011219@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11137/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kdebase4.spec 
Log Message:
New package kdebase4 - K Desktop Environment 4 - Core Files:
- copied from kdebase-kde4-branch
- kdebase.spec renamed to kdebase4.spec to match guidelines
- ExcludeArch: ppc64 (#300601)


--- NEW FILE kdebase4.spec ---

Summary:       K Desktop Environment 4 - Core Files
Version:       3.93.0
Release:       4%{?dist}

%if 0%{?fedora} > 8
Name:          kdebase
Epoch:         6

Obsoletes:     kdebase4 < %{version}-%{release}
Provides:      kdebase4 = %{version}-%{release}

%else
Name:          kdebase4
%endif

License:       GPLv2
Group:         User Interface/Desktops
URL:           http://www.kde.org/
Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# rh#300601
ExcludeArch: ppc64

BuildRequires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
%ifnarch s390 s390x
Requires: eject
%endif

# should not conflict with d3lphin, but does with old Dolphin
Conflicts:     dolphin <= 0.8.2

BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
# needed?
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
BuildRequires: doxygen
BuildRequires: fontconfig-devel
BuildRequires: gettext
BuildRequires: hal-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
# needed?
BuildRequires: libart_lgpl-devel
# needed?
BuildRequires: libfontenc-devel
BuildRequires: libusb-devel
BuildRequires: OpenEXR-devel
# needed?
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
# samba support
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
%else
BuildRequires: samba
%endif
BuildRequires: soprano-devel
BuildRequires: strigi-devel
BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
%if 0%{?fedora} >= 8
BuildRequires:  libxcb-devel
%endif
# needed?
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
BuildRequires: zlib-devel
# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel

%description
Core applications for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).

%package devel
Group:    Development/Libraries
Summary:  Header files for kdebase4
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdebase4"
Obsoletes: kdebase4-devel < %{version}-%{release}
Provides:  kdebase4-devel = %{version}-%{release}
%endif
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
Header files for developing applications using %{name}.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).


%prep
%setup -q -n kdebase-%{version}


%build

mkdir -p %{_target_platform} 
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

# omit gigantic oxygen scalable/svg icons, for now -- Rex
find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 

# remove files which conflict with KDE 3
rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
rm -rf %{buildroot}%{_datadir}/emoticons
rm -rf %{buildroot}%{_kde4_datadir}/locale
rm -rf %{buildroot}%{_kde4_datadir}/autostart
rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
rm -rf %{buildroot}%{_kde4_datadir}/config
rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
# binaries: conflict with kdebase
rm -f %{buildroot}%{_kde4_bindir}/drkonqi
rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
rm -f %{buildroot}%{_kde4_bindir}/kdeeject
rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
rm -f %{buildroot}%{_kde4_bindir}/kdesu
rm -f %{buildroot}%{_kde4_bindir}/kdesud
rm -f %{buildroot}%{_kde4_bindir}/kdialog
rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
rm -f %{buildroot}%{_kde4_bindir}/kfind
rm -f %{buildroot}%{_kde4_bindir}/kfmclient
rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
rm -f %{buildroot}%{_kde4_bindir}/knetattach
rm -f %{buildroot}%{_kde4_bindir}/konqueror
rm -f %{buildroot}%{_kde4_bindir}/konsole
rm -f %{buildroot}%{_kde4_bindir}/kprinter
rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
rm -f %{buildroot}%{_kde4_bindir}/kstart
rm -f %{buildroot}%{_kde4_bindir}/ktrash
rm -f %{buildroot}%{_kde4_bindir}/kwrite
rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
# binaries: conflict with kdelibs
rm -f %{buildroot}%{_kde4_bindir}/kcmshell
rm -f %{buildroot}%{_kde4_bindir}/kfile
rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
rm -f %{buildroot}%{_kde4_bindir}/kioexec
rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
# binaries: conflict with kdebase-extras
rm -f %{buildroot}%{_kde4_bindir}/kappfinder
# do not strictly conflict, but we removed the corresponding binaries:
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
# we also removed the binaries for these:
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop

# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
  case "$i" in
    libkdeinit4_*.so)
      ;;
    *)
      linktarget=`readlink "$i"`
      rm -f "$i"
      ln -sf "../../$linktarget" "kde4/devel/$i"
      ;;
  esac
done
popd


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :

%postun
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_appsdir}/*
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_kde4_iconsdir}/oxygen/
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
%{_kde4_docdir}/HTML/en/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/*
%exclude %{_kde4_libdir}/kde4/devel/

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/lib*.so


%changelog
* Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- ExcludeArch: ppc64 (#300601)

* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- add missing BR alsa-lib-devel

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- Conflicts with KDE 3 versions of dolphin pre d3lphin rename

* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace)
- remove kdebase-kdm Obsoletes/Provides (for the same reason)
- remove KDM (and KDM session) setup code (for the same reason)
- remove rss-glx conflict (Plasma is now in kdebase-workspace)
- remove redhat-startkde patch (startkde is now in kdebase-workspace)
- remove kde4-opt.sh (all the code in it is commented out)
- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace)
- remove bogus BRs on automake and libtool
- remove workspace-only BRs
- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+)
- remove workspace files and directories
- handle icons (moved from kdelibs4)
- add mkdir %%{buildroot} in %%install

* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: GPLv2

* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel

* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
- consolekit_kdm patch (#228111, kde#147790)
- update startkde patch

* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92 (kde-4-beta1)

* Wed Jul 25 2007 Than Ngo <than at redhat.com> - 3.91.0-6
- fix startkde
- add env/shutdown directory

* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- kde4.desktop: fix session Name

* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-4
- cleanup/fix kde4.desktop
- kdepimlibs4->kdepimlibs

* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.

* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)

* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug

* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
- specfile cleanup (%%prefix issues mostly)

* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
  in case we want to drop the Rs on these from kdelibs4-devel
- consistently add all BRs as -devel Rs, not just almost all, until we can
  figure out which, if any, are really needed
- BR libsmbclient-devel instead of samba on F>=7, EL>=6

* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirement for cmake
- build against libxklavier on EL5
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed

* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*

* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- rebuild for patched FindKDE4Internal.cmake

* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- drop obsolete joydevice.h patch
- remove translations of "KDE" without the "4" from kde4.desktop
- resync BR and -devel Requires
- don't set LD_LIBRARY_PATH
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- fix missing underscore in _datadir
- install kde4.desktop in install, not prep
- fix invalid syntax in kde4.desktop

* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS

* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
- spec file cleanups and added clean up in %%install
- fixed PATH for libkdecore.so.5; cannot open shared object file;
- added Logitech mouse support
- added dbus-devel, hal-devel and more as BR
- fixed broken joydevice.h - Kevin Kofler
- added file kde4.desktop

* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
- apply parallel-installability patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 02:31:51 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:15:27 -0000	1.2
@@ -0,0 +1,2 @@
+kdebase-3.92.0.tar.bz2
+kdebase-3.93.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 02:31:51 -0000	1.1
+++ sources	21 Sep 2007 18:15:27 -0000	1.2
@@ -0,0 +1 @@
+869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 21 18:16:53 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 14:16:53 -0400
Subject: rpms/nqc/devel nqc.spec,1.7,1.8
Message-ID: <200709211816.l8LIGrKE011251@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/nqc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11225

Modified Files:
	nqc.spec 
Log Message:



Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/devel/nqc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nqc.spec	21 Jul 2007 06:44:22 -0000	1.7
+++ nqc.spec	21 Sep 2007 18:16:20 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
-License:        MPL
+License:        MPLv1.0
 URL:            http://bricxcc.sourceforge.net/nqc/
 Source0:        http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r6.tgz
 Source1:        60-legousbtower.rules
@@ -70,7 +70,8 @@
 
 
 %changelog
-* Fri Jul 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+- Updated license to reflect specific MPL version
 - New upstream release
 - Added NQC tutorial and samples to docs
 - Added -c option to setup to create top-level directory



From fedora-extras-commits at redhat.com  Fri Sep 21 18:32:10 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 14:32:10 -0400
Subject: rpms/biosdevname/devel biosdevname.spec,1.3,1.4
Message-ID: <200709211832.l8LIWApF011641@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/biosdevname/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11621

Modified Files:
	biosdevname.spec 
Log Message:
fix manpage entry in files


Index: biosdevname.spec
===================================================================
RCS file: /cvs/extras/rpms/biosdevname/devel/biosdevname.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- biosdevname.spec	21 Sep 2007 17:04:47 -0000	1.3
+++ biosdevname.spec	21 Sep 2007 18:31:37 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		biosdevname
 Version:	0.2.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -50,10 +50,13 @@
 %doc COPYING README
 /sbin/%{name}
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules
-%{_mandir}/1/%{name}.1
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-3
+- fix manpage entry in files
+
 * Fri Sep 21 2007 Matt Domsch <Matt_Domsch at dell.com> 0.2.4-2
 - rebuild with Requires: udev > 115-3.20070920git
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:34:07 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Fri, 21 Sep 2007 14:34:07 -0400
Subject: rpms/asm2/devel asm2.spec,1.1,1.2
Message-ID: <200709211834.l8LIY7KK011776@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/asm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11751

Modified Files:
	asm2.spec 
Log Message:
Fix Source0 URL, License tag




Index: asm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asm2/devel/asm2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asm2.spec	21 Aug 2007 17:33:21 -0000	1.1
+++ asm2.spec	21 Sep 2007 18:33:35 -0000	1.2
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 
 # All rights reserved.
 #
@@ -31,13 +31,13 @@
 
 Name:           asm2
 Version:        2.1
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 Summary:        A code manipulation tool to implement adaptable systems
-License:        BSD-style
+License:        BSD
 URL:            http://asm.objectweb.org/
 Group:          Development/Libraries
-Source0:        http://download.us.forge.objectweb.org/asm/asm-2.1.tar.gz
+Source0:        http://download.forge.objectweb.org/asm/asm-2.1.tar.gz
 Source1:        http://asm.objectweb.org/current/asm-eng.pdf
 # Patch out the Class-path in MANIFEST.MF
 Patch0:         %{name}-noclasspathinmanifest.patch
@@ -104,6 +104,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-2jpp.2
+- Fix Source0 URL, License tag
+
 * Tue Feb 13 2007 Andrew Overholt <overholt at redhat.com> 0:2.1-2jpp.1
 - Fedora-ize Release
 - Remove faq.html and add LICENSE.TXT to %%doc



From fedora-extras-commits at redhat.com  Fri Sep 21 18:44:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 14:44:23 -0400
Subject: rpms/vdradmin-am/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 vdradmin-am.spec, 1.9, 1.10
Message-ID: <200709211844.l8LIiNuZ011946@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11913

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Log Message:
* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-1
- 3.6.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Aug 2007 16:23:07 -0000	1.8
+++ .cvsignore	21 Sep 2007 18:43:51 -0000	1.9
@@ -1 +1 @@
-vdradmin-am-3.6.0rc.tar.bz2
+vdradmin-am-3.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Aug 2007 16:23:08 -0000	1.8
+++ sources	21 Sep 2007 18:43:51 -0000	1.9
@@ -1 +1 @@
-9a8035bbad7be09ac6295c43246cf953  vdradmin-am-3.6.0rc.tar.bz2
+e79e5715779fcd2011f181510fb2b370  vdradmin-am-3.6.0.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdradmin-am.spec	27 Aug 2007 16:23:08 -0000	1.9
+++ vdradmin-am.spec	21 Sep 2007 18:43:51 -0000	1.10
@@ -4,14 +4,14 @@
 
 Name:           vdradmin-am
 Version:        3.6.0
-Release:        0.2.rc%{?dist}
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
-# infobox.js is GPLv2, everything else GPLv2+
-License:        GPLv2+ and GPLv2
+# infobox.js is GPLv2, crystal icons LGPLv2+, everything else GPLv2+
+License:        GPLv2+ and GPLv2 and LGPLv2+
 URL:            http://andreas.vdr-developer.org/en/
-Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}rc.tar.bz2
+Source0:        http://andreas.vdr-developer.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc
+%setup -q
 %patch0
 %patch1
 %{__perl} -pi -e \
@@ -108,7 +108,8 @@
 
 %files -f vdradmin.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
+%doc COPYING CREDITS FAQ HISTORY INSTALL LGPL.txt README*
+%doc contrib/*example convert.pl
 %doc %{name}-httpd.conf autotimer2searchtimer.pl
 %config(noreplace) %{_sysconfdir}/rwtab.d/%{name}
 %{_initrddir}/vdradmind
@@ -124,6 +125,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-1
+- 3.6.0.
+
 * Mon Aug 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 3.6.0-0.2.rc
 - 3.6.0rc.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:48:41 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 14:48:41 -0400
Subject: rpms/maven2/devel maven2.spec,1.5,1.6
Message-ID: <200709211848.l8LImffK012054@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12024

Modified Files:
	maven2.spec 
Log Message:

- Rebuild without bootstrap




Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven2.spec	7 Sep 2007 20:30:20 -0000	1.5
+++ maven2.spec	21 Sep 2007 18:48:08 -0000	1.6
@@ -34,7 +34,6 @@
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 %define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
-%define _with_bootstrap 1
 %define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
 %define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
 
@@ -49,7 +48,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        10jpp.6%{?dist}
+Release:        10jpp.8%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -2295,6 +2294,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.8
+- Rebuild without bootstrap
+
 * Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
 - Exclude ppc64 build
 - Add patch to build with ant 1.7



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:40 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 14:50:40 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.45, 1.46 NetworkManager.spec,
	1.166, 1.167 sources, 1.64,
	1.65 NetworkManager-0.7.0-missing-includes.patch, 1.5, NONE
Message-ID: <200709211850.l8LIoeGh012219@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12140

Modified Files:
	.cvsignore NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.7.0-missing-includes.patch 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
- New snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	21 Sep 2007 15:41:14 -0000	1.45
+++ .cvsignore	21 Sep 2007 18:50:07 -0000	1.46
@@ -6,3 +6,4 @@
 nm-applet-0.7.0.svn186.tar.gz
 NetworkManager-0.7.0.svn2844.tar.gz
 nm-applet-0.7.0.svn190.tar.gz
+NetworkManager-0.7.0.svn2849.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- NetworkManager.spec	21 Sep 2007 15:41:14 -0000	1.166
+++ NetworkManager.spec	21 Sep 2007 18:50:07 -0000	1.167
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2844
+%define snapshot svn2849
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -20,7 +20,6 @@
 Source: %{name}-%{version}.%{snapshot}.tar.gz
 Source1: nm-applet-%{version}.svn190.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.7.0-missing-includes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -31,6 +30,7 @@
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-7
+Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -119,7 +119,6 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .missing-includes
 
 # unpack the applet
 tar -xzf %{SOURCE1}
@@ -259,6 +258,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
+- New snapshot
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2844
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	21 Sep 2007 15:41:14 -0000	1.64
+++ sources	21 Sep 2007 18:50:07 -0000	1.65
@@ -1,2 +1,2 @@
-f30eb054387f0a7efb2fdda7ed43c8a9  NetworkManager-0.7.0.svn2844.tar.gz
 bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz
+abba317b083a742b1a36167c16654a3a  NetworkManager-0.7.0.svn2849.tar.gz


--- NetworkManager-0.7.0-missing-includes.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:41 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:50:41 -0400
Subject: rpms/kdebase4/F-7 kdebase4.spec,1.1,1.2
Message-ID: <200709211850.l8LIoffJ012227@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12157/F-7

Modified Files:
	kdebase4.spec 
Log Message:
update description


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/kdebase4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase4.spec	21 Sep 2007 18:15:24 -0000	1.1
+++ kdebase4.spec	21 Sep 2007 18:50:09 -0000	1.2
@@ -80,7 +80,9 @@
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
-Core applications for the K Desktop Environment 4.
+Core runtime requirements and applications for the K Desktop Environment 4.
+This package does not include the KDE 4 versions of applications which are
+provided by KDE 3 because of file and configuration setting conflicts.
 WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
@@ -253,6 +255,7 @@
 %changelog
 * Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - ExcludeArch: ppc64 (#300601)
+- update description
 
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - add missing BR alsa-lib-devel



From fedora-extras-commits at redhat.com  Fri Sep 21 18:50:44 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Fri, 21 Sep 2007 14:50:44 -0400
Subject: rpms/kdebase4/devel kdebase4.spec,1.1,1.2
Message-ID: <200709211850.l8LIoibY012262@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12157/devel

Modified Files:
	kdebase4.spec 
Log Message:
update description


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/kdebase4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase4.spec	21 Sep 2007 18:15:27 -0000	1.1
+++ kdebase4.spec	21 Sep 2007 18:50:12 -0000	1.2
@@ -80,7 +80,9 @@
 BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
-Core applications for the K Desktop Environment 4.
+Core runtime requirements and applications for the K Desktop Environment 4.
+This package does not include the KDE 4 versions of applications which are
+provided by KDE 3 because of file and configuration setting conflicts.
 WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
@@ -253,6 +255,7 @@
 %changelog
 * Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - ExcludeArch: ppc64 (#300601)
+- update description
 
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
 - add missing BR alsa-lib-devel



From fedora-extras-commits at redhat.com  Fri Sep 21 18:56:57 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:56:57 -0400
Subject: rpms/kernel/F-7 kernel-2.6.spec,1.3343,1.3344
Message-ID: <200709211856.l8LIuvW7012541@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12415

Modified Files:
	kernel-2.6.spec 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3343
retrieving revision 1.3344
diff -u -r1.3343 -r1.3344
--- kernel-2.6.spec	20 Sep 2007 22:34:02 -0000	1.3343
+++ kernel-2.6.spec	21 Sep 2007 18:56:24 -0000	1.3344
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Build dcdbas and dell_rbu modules on i586 (#216304)
+
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>
 - Enable tcrypt module for crypto testing.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:57:01 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:57:01 -0400
Subject: rpms/kernel/F-7/configs config-i586,1.25,1.26
Message-ID: <200709211857.l8LIv1Q0012551@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12415/configs

Modified Files:
	config-i586 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-i586,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-i586	23 Jul 2007 15:22:35 -0000	1.25
+++ config-i586	21 Sep 2007 18:56:28 -0000	1.26
@@ -10,8 +10,6 @@
 # CONFIG_X86_MCE_P4THERMAL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_X86_POWERNOW_K7 is not set



From fedora-extras-commits at redhat.com  Fri Sep 21 18:57:32 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 14:57:32 -0400
Subject: rpms/haproxy/F-7 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211857.l8LIvWY4012579@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12545

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 18:56:59 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 18:56:59 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 18:58:23 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 14:58:23 -0400
Subject: rpms/kernel/devel config-i586,1.2,1.3 kernel.spec,1.176,1.177
Message-ID: <200709211858.l8LIwNUF012650@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12592

Modified Files:
	config-i586 kernel.spec 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Build dcdbas and dell_rbu modules on i586 (#216304)



Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i586,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i586	23 Jul 2007 15:09:38 -0000	1.2
+++ config-i586	21 Sep 2007 18:57:50 -0000	1.3
@@ -10,8 +10,6 @@
 # CONFIG_X86_MCE_P4THERMAL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_X86_POWERNOW_K7 is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- kernel.spec	20 Sep 2007 23:11:30 -0000	1.176
+++ kernel.spec	21 Sep 2007 18:57:50 -0000	1.177
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Build dcdbas and dell_rbu modules on i586 (#216304)
+
 * Thu Sep 20 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc7-git1
 



From fedora-extras-commits at redhat.com  Fri Sep 21 18:58:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 14:58:51 -0400
Subject: rpms/openct/devel openct-0.6.14-nosleep-287871.patch, NONE,
	1.1 openct.spec, 1.28, 1.29
Message-ID: <200709211858.l8LIwpKA012698@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12628

Modified Files:
	openct.spec 
Added Files:
	openct-0.6.14-nosleep-287871.patch 
Log Message:
* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-2
- Drop "sleep 0.1" from udev rule (#287871).


openct-0.6.14-nosleep-287871.patch:

--- NEW FILE openct-0.6.14-nosleep-287871.patch ---
--- etc/openct.udev~	2007-08-23 23:14:15.000000000 +0300
+++ etc/openct.udev	2007-09-21 21:11:39.000000000 +0300
@@ -26,3 +26,4 @@
 # sleep for 100ms - the wait_for_sysfs might not be enough
-PROGRAM="/bin/sleep 0.1"
+# Disabled in this package - see https://bugzilla.redhat.com/287871
+#PROGRAM="/bin/sleep 0.1"
 


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openct.spec	30 Aug 2007 19:30:25 -0000	1.28
+++ openct.spec	21 Sep 2007 18:58:18 -0000	1.29
@@ -4,7 +4,7 @@
 
 Name:           openct
 Version:        0.6.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -13,6 +13,7 @@
 Source0:        http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         %{name}-0.6.14-nosleep-287871.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-2
+- Drop "sleep 0.1" from udev rule (#287871).
+
 * Thu Aug 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.14-1
 - 0.6.14.
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:02:40 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:02:40 -0400
Subject: rpms/haproxy/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709211902.l8LJ2e7S018888@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18855

Modified Files:
	.cvsignore sources 
Log Message:
initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:02:08 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:02:08 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:04:20 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:04:20 -0400
Subject: rpms/haproxy/FC-6 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1
Message-ID: <200709211904.l8LJ4KTb018924@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18917

Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging



From fedora-extras-commits at redhat.com  Fri Sep 21 19:06:02 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:06:02 -0400
Subject: rpms/haproxy/EL-4 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211906.l8LJ62F9019026@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18997

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:05:30 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:05:30 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:08:38 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:08:38 -0400
Subject: rpms/haproxy/EL-5 haproxy.cfg, NONE, 1.1 haproxy.init, NONE,
	1.1 haproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709211908.l8LJ8cHL019129@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096

Modified Files:
	.cvsignore sources 
Added Files:
	haproxy.cfg haproxy.init haproxy.spec 
Log Message:
initial import


--- NEW FILE haproxy.cfg ---
# this config needs haproxy-1.1.28 or haproxy-1.2.1

global
	log 127.0.0.1	local0
	log 127.0.0.1	local1 notice
	#log loghost	local0 info
	maxconn 4096
	chroot /var/lib/haproxy
	user haproxy
	group haproxy
	daemon
	#debug
	#quiet

defaults
	log	global
	mode	http
	option	httplog
	option	dontlognull
	retries	3
	redispatch
	maxconn	2000
	contimeout	5000
	clitimeout	50000
	srvtimeout	50000

listen	appli1-rewrite 0.0.0.0:10001
	cookie	SERVERID rewrite
	balance	roundrobin
	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5

listen	appli2-insert 0.0.0.0:10002
	option	httpchk
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	capture cookie vgnvisitor= len 32

	option	httpclose		# disable keep-alive
	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
listen	appli3-relais 0.0.0.0:10003
	dispatch 192.168.135.17:80

listen	appli4-backup 0.0.0.0:10004
	option	httpchk /index.html
	option	persist
	balance	roundrobin
	server	inst1 192.168.114.56:80 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup

listen	ssl-relay 0.0.0.0:8443
	option	ssl-hello-chk
	balance	source
	server	inst1 192.168.110.56:443 check inter 2000 fall 3
	server	inst2 192.168.110.57:443 check inter 2000 fall 3
	server	back1 192.168.120.58:443 backup

listen	appli5-backup 0.0.0.0:10005
	option	httpchk *
	balance	roundrobin
	cookie	SERVERID insert indirect nocache
	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
	capture cookie ASPSESSION len 32
	srvtimeout	20000

	option	httpclose		# disable keep-alive
	option  checkcache		# block response if set-cookie & cacheable

	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
	
	errorloc	502	http://192.168.114.58/error502.html



--- NEW FILE haproxy.init ---
#!/bin/sh
#
# haproxy
#
# chkconfig:   - 85 15
# description:  HAProxy is a free, very fast and reliable solution \
#               offering high availability, load balancing, and \
#               proxying for TCP and  HTTP-based applications
# processname: haproxy
# config:      /etc/haproxy/haproxy.cfg
# pidfile:     /var/run/haproxy.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

exec="/usr/sbin/haproxy"
prog=$(basename $exec)

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/haproxy

check() {
    $exec -c -V -f /etc/$prog/$prog.cfg
}

start() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
 
    echo -n $"Starting $prog: "
    # start it up here, usually something like "daemon $exec"
    daemon $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog 
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    stop
    start
}

reload() {
    $exec -c -q -f /etc/$prog/$prog.cfg
    if [ $? -ne 0 ]; then
        echo "Errors in configuration file, check with $prog check."
        return 1
    fi
    echo -n $"Reloading $prog: "
    $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    check)
        check
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE haproxy.spec ---
%define haproxy_user    haproxy
%define haproxy_group   %{haproxy_user}
%define haproxy_home    %{_localstatedir}/lib/haproxy
%define haproxy_confdir %{_sysconfdir}/haproxy
%define haproxy_datadir %{_datadir}/haproxy

Name:           haproxy
Version:        1.3.12.2
Release:        2%{?dist}
Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments

Group:          System Environment/Daemons
License:        GPLv2+ and MIT

URL:            http://haproxy.1wt.eu/
Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
Source1:        %{name}.init
Source2:        %{name}.cfg

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pcre-devel 


Requires(pre):      %{_sbindir}/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig, /sbin/service
Requires(postun):   /sbin/service

%description
HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high
availability environments. Indeed, it can:
- route HTTP requests depending on statically assigned cookies
- spread the load among several servers while assuring server persistence
  through the use of HTTP cookies
- switch to backup servers in the event a main one fails
- accept connections to special ports dedicated to service monitoring
- stop accepting connections without breaking existing ones
- add/modify/delete HTTP headers both ways
- block requests matching a particular pattern


%prep
%setup -q

%build
# No configure script is present, it is all done via make flags
# FC 7 is linux 2.6 so using linux26 as target.
make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"


%install
rm -rf %{buildroot}
# there is no install make target, only one file is created during build
%{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
%{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
for httpfile in $(find ./examples/errorfiles/ -type f) 
do
    %{__install} -p -m 0644 $httpfile %{buildroot}%{haproxy_datadir}
done

# convert all text files to utf8
for textfile in $(find ./ -type f -name '*.txt')
do
    mv $textfile $textfile.old
    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
    rm -f $textfile.old
done 


%clean
rm -rf %{buildroot}


%pre
%{_sbindir}/useradd -c "HAProxy user" -s /bin/false -r -d %{haproxy_home} %{haproxy_user} 2>/dev/null || :


%post
/sbin/chkconfig --add %{name}
    

%preun
if [ $1 = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi  
    

%postun
if [ $1 -ge 1 ]; then
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
fi  
 

%files
%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
%doc examples/content-sw-sample.cfg
%doc examples/cttproxy-src.cfg
%doc examples/haproxy.cfg
%doc examples/tarpit.cfg
%doc examples/tcp-splicing-sample.cfg
%doc CHANGELOG CONTRIB LICENSE README
%dir %{haproxy_datadir}
%dir %{haproxy_datadir}/*
%dir %{haproxy_confdir}
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_sbindir}/%{name}
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}


%changelog
* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
- update License field

* Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-1
- update to 1.3.12.2
- remove the upstream patch

* Tue Sep 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.1-1
- switch to 1.3.12.1 branch
- add patch from upstream with O'Reilly licensing updates.
- convert ISO-8859-1 doc files to UTF-8

* Sat Mar 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-2
- addition of haproxy user
- add license information

* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.2.17-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 16:22:15 -0000	1.1
+++ .cvsignore	21 Sep 2007 19:08:06 -0000	1.2
@@ -0,0 +1 @@
+haproxy-1.3.12.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:22:15 -0000	1.1
+++ sources	21 Sep 2007 19:08:06 -0000	1.2
@@ -0,0 +1 @@
+d299484c1bfcaacc360ee3adf2fb51ea  haproxy-1.3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:20:57 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 15:20:57 -0400
Subject: rpms/deluge/devel
	deluge-default-prefs-no-release-notifications.patch, 1.1, 1.2
Message-ID: <200709211920.l8LJKv6o020343@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/devel

Modified Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Ugh...this time don't invert the patch. T_T

deluge-default-prefs-no-release-notifications.patch:

Index: deluge-default-prefs-no-release-notifications.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge-default-prefs-no-release-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 04:10:37 -0000	1.1
+++ deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 19:20:25 -0000	1.2
@@ -1,11 +1,11 @@
---- src/pref.py	2007-09-20 19:30:08.000000000 -0700
-+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
+--- src/pref.py.old	2007-09-21 12:18:00.000000000 -0700
++++ src/pref.py	2007-09-21 12:18:09.000000000 -0700
 @@ -118,7 +118,7 @@
      "use_natpmp" : False,
      "use_upnp" : False,
      "use_utpex" : True,
--    "new_releases" : False,
-+    "new_releases" : True,
+-    "new_releases" : True,
++    "new_releases" : False,
      "window_height" : 480,
      "window_maximized" : False,
      "window_pane_position" : -1,



From fedora-extras-commits at redhat.com  Fri Sep 21 19:21:00 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Fri, 21 Sep 2007 15:21:00 -0400
Subject: rpms/deluge/F-7 deluge-default-prefs-no-release-notifications.patch,
	1.1, 1.2
Message-ID: <200709211921.l8LJL0PY020356@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/deluge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163/F-7

Modified Files:
	deluge-default-prefs-no-release-notifications.patch 
Log Message:
Ugh...this time don't invert the patch. T_T

deluge-default-prefs-no-release-notifications.patch:

Index: deluge-default-prefs-no-release-notifications.patch
===================================================================
RCS file: /cvs/extras/rpms/deluge/F-7/deluge-default-prefs-no-release-notifications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 04:11:31 -0000	1.1
+++ deluge-default-prefs-no-release-notifications.patch	21 Sep 2007 19:20:27 -0000	1.2
@@ -1,11 +1,11 @@
---- src/pref.py	2007-09-20 19:30:08.000000000 -0700
-+++ src/pref.py.silly-updates	2007-09-20 19:29:56.000000000 -0700
+--- src/pref.py.old	2007-09-21 12:18:00.000000000 -0700
++++ src/pref.py	2007-09-21 12:18:09.000000000 -0700
 @@ -118,7 +118,7 @@
      "use_natpmp" : False,
      "use_upnp" : False,
      "use_utpex" : True,
--    "new_releases" : False,
-+    "new_releases" : True,
+-    "new_releases" : True,
++    "new_releases" : False,
      "window_height" : 480,
      "window_maximized" : False,
      "window_pane_position" : -1,



From fedora-extras-commits at redhat.com  Fri Sep 21 19:23:30 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:23:30 -0400
Subject: rpms/haproxy/EL-5 haproxy.spec,1.1,1.2
Message-ID: <200709211923.l8LJNUvg021004@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20859

Modified Files:
	haproxy.spec 
Log Message:
added pcre dependency


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy.spec	21 Sep 2007 19:08:06 -0000	1.1
+++ haproxy.spec	21 Sep 2007 19:22:57 -0000	1.2
@@ -20,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
-
+Requires:           pcre
 Requires(pre):      %{_sbindir}/useradd
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig, /sbin/service
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
+- added pcre as Requires dependency
+
 * Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
 - update License field
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:24:51 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:24:51 -0400
Subject: rpms/haproxy/EL-5 haproxy.spec,1.2,1.3
Message-ID: <200709211924.l8LJOpdD021339@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21204

Modified Files:
	haproxy.spec 
Log Message:
bump release


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haproxy.spec	21 Sep 2007 19:22:57 -0000	1.2
+++ haproxy.spec	21 Sep 2007 19:24:19 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Fri Sep 21 19:27:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 15:27:40 -0400
Subject: rpms/sdljava/F-7 sdljava-0.9.1-regen.patch, 1.1, 1.2 sdljava.spec,
	1.1, 1.2
Message-ID: <200709211927.l8LJRe6s022044@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22006

Modified Files:
	sdljava-0.9.1-regen.patch sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8


sdljava-0.9.1-regen.patch:

Index: sdljava-0.9.1-regen.patch
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava-0.9.1-regen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava-0.9.1-regen.patch	21 Sep 2007 17:48:32 -0000	1.1
+++ sdljava-0.9.1-regen.patch	21 Sep 2007 19:27:37 -0000	1.2
@@ -44,34 +44,34 @@
 -#SDLVideo_wrap.c: SDLVideo.i common.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 +SDLAudio_wrap.c: SDLAudio.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
 +
 +SDLCdrom_wrap.c: SDLCdrom.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
 +
 +SDLEvent_wrap.c: SDLEvent.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
 +
 +SDLGFX_wrap.c: SDLGFX.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
 +
 +SDLImage_wrap.c: SDLImage.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
 +
 +SDLJoystick_wrap.c: SDLJoystick.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
 +
 +SDLMain_wrap.c: SDLMain.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
 +
 +SDLMixer_wrap.c: SDLMixer.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
 +
 +SDLTTF_wrap.c: SDLTTF.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
 +
 +SDLVideo_wrap.c: SDLVideo.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -100,7 +100,7 @@
 -#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 +glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -124,7 +124,7 @@
 -#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 -#	./post-process.rb
 +FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
++	$(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 +	./post-process.rb
  
  %.o: %.cxx


Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava.spec	21 Sep 2007 17:48:32 -0000	1.1
+++ sdljava.spec	21 Sep 2007 19:27:37 -0000	1.2
@@ -88,6 +88,15 @@
 
 
 %build
+# ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64]
+# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h
+%ifarch ppc
+export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__"
+%endif
+%ifarch ppc64
+export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__"
+%endif
+
 pushd src/sdljava/native
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"



From fedora-extras-commits at redhat.com  Fri Sep 21 19:29:01 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 21 Sep 2007 15:29:01 -0400
Subject: upgradecheck upgradecheck.py,1.40,1.41 upgradecheckspam.py,1.7,1.8
Message-ID: <200709211929.l8LJT1N1022408@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22369

Modified Files:
	upgradecheck.py upgradecheckspam.py 
Log Message:
Exit early with error if we do not have > 1 dists enabled


Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- upgradecheck.py	16 Sep 2007 08:50:19 -0000	1.40
+++ upgradecheck.py	21 Sep 2007 19:28:58 -0000	1.41
@@ -168,6 +168,11 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    if not len(enabled_dists) > 1:
+        print 'Need > 1 dists enabled to proceed (have %d), exiting' \
+              % len(enabled_dists)
+        sys.exit(51)
+
     repoids = []
     for dist in enabled_dists:
         repoids.extend(solvers[dist].enabledRepoIds())


Index: upgradecheckspam.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheckspam.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upgradecheckspam.py	16 Sep 2007 08:50:19 -0000	1.7
+++ upgradecheckspam.py	21 Sep 2007 19:28:58 -0000	1.8
@@ -168,6 +168,11 @@
     enabled_dists = solvers.keys()
     enabled_dists.sort()
 
+    if not len(enabled_dists) > 1:
+        print 'Need > 1 dists enabled to proceed (have %d), exiting' \
+              % len(enabled_dists)
+        sys.exit(51)
+
     repoids = []
     for dist in enabled_dists:
         repoids.extend(solvers[dist].enabledRepoIds())



From fedora-extras-commits at redhat.com  Fri Sep 21 19:30:56 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:30:56 -0400
Subject: rpms/haproxy/EL-4 haproxy.spec,1.1,1.2
Message-ID: <200709211930.l8LJUui4022885@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22727

Modified Files:
	haproxy.spec 
Log Message:
added pcre dependency


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haproxy.spec	21 Sep 2007 19:05:30 -0000	1.1
+++ haproxy.spec	21 Sep 2007 19:30:24 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -20,7 +20,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
-
+Requires:           pcre
 Requires(pre):      %{_sbindir}/useradd
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig, /sbin/service
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
+- added pcre as Requires dependency
+
 * Thu Sep 20 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-2
 - update License field
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:39:40 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 21 Sep 2007 15:39:40 -0400
Subject: rpms/mash/devel .cvsignore, 1.18, 1.19 mash.spec, 1.16, 1.17 sources,
	1.19, 1.20
Message-ID: <200709211939.l8LJdeDo025198@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25054

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Sep 2007 19:07:55 -0000	1.18
+++ .cvsignore	21 Sep 2007 19:39:08 -0000	1.19
@@ -1 +1 @@
-mash-0.2.6.tar.gz
+mash-0.2.7.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mash.spec	20 Sep 2007 19:07:55 -0000	1.16
+++ mash.spec	21 Sep 2007 19:39:08 -0000	1.17
@@ -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.2.6
+Version:        0.2.7
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Fri Sep 21 2007 Bill Nottingham <notting at redhat.com> 0.2.7-1
+- disable repoview for now
+
 * Thu Sep 20 2007 Bill Nottingham <notting at redhat.com> 0.2.6-1
 - repoview cleanups/fixes
 - fix gtkimmodules typo (#295371, <petersen at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Sep 2007 19:07:55 -0000	1.19
+++ sources	21 Sep 2007 19:39:08 -0000	1.20
@@ -1 +1 @@
-c0075b3988f9ae4527bd01bff19fdb60  mash-0.2.6.tar.gz
+7b8640077626921acb95603f9a6a5f68  mash-0.2.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 19:46:39 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:46:39 -0400
Subject: rpms/plexus-ant-factory/devel plexus-ant-factory.spec,1.4,1.5
Message-ID: <200709211946.l8LJkdWt026154@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-ant-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26133

Modified Files:
	plexus-ant-factory.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-ant-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/plexus-ant-factory.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plexus-ant-factory.spec	10 Sep 2007 19:50:14 -0000	1.4
+++ plexus-ant-factory.spec	21 Sep 2007 19:46:07 -0000	1.5
@@ -41,7 +41,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a1.2jpp.4%{?dist}
+Release:        0.1.a1.2jpp.5%{?dist}
 Epoch:          0
 Summary:        Plexus Ant component factory
 License:        MIT-Style
@@ -58,6 +58,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -209,6 +211,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.5
+- ExcludeArch ppc64
+
 * Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a1.2jpp.4
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:49:30 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:49:30 -0400
Subject: rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.4,1.5
Message-ID: <200709211949.l8LJnU53026247@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-bsh-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26222

Modified Files:
	plexus-bsh-factory.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-bsh-factory.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plexus-bsh-factory.spec	10 Sep 2007 19:58:30 -0000	1.4
+++ plexus-bsh-factory.spec	21 Sep 2007 19:48:58 -0000	1.5
@@ -39,7 +39,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a7s.2jpp.4%{?dist}
+Release:        0.1.a7s.2jpp.5%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT-Style
@@ -57,6 +57,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:     jpackage-utils >= 0:1.7.2
@@ -208,6 +210,9 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.5
+- ExcludeArch ppc64
+
 * Mon Sep 10 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7s.2jpp.4
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:52:11 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:52:11 -0400
Subject: rpms/plexus-appserver/devel plexus-appserver.spec,1.2,1.3
Message-ID: <200709211952.l8LJqBrt026383@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-appserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26359

Modified Files:
	plexus-appserver.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-appserver.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-appserver/devel/plexus-appserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus-appserver.spec	20 Mar 2007 06:10:21 -0000	1.2
+++ plexus-appserver.spec	21 Sep 2007 19:51:39 -0000	1.3
@@ -42,7 +42,7 @@
 
 Name:           plexus-appserver
 Version:        1.0
-Release:        0.1.a5.3jpp.2%{?dist}
+Release:        0.1.a5.3jpp.3%{?dist}
 Epoch:          0
 Summary:        Plexus Application Server
 License:        Apache Software License
@@ -57,7 +57,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if %{with_maven}
@@ -196,6 +199,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a5.3jpp.3 
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a5.3jpp.2
 - Build with maven
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:55:24 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:55:24 -0400
Subject: rpms/plexus-cdc/devel plexus-cdc.spec,1.3,1.4
Message-ID: <200709211955.l8LJtO0k026552@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-cdc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532

Modified Files:
	plexus-cdc.spec 
Log Message:

- ExcludeArch ppc64





Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plexus-cdc.spec	20 Mar 2007 06:14:23 -0000	1.3
+++ plexus-cdc.spec	21 Sep 2007 19:54:51 -0000	1.4
@@ -42,7 +42,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a4.2jpp.2%{?dist}
+Release:        0.1.a4.2jpp.3%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        Apache Software License
@@ -57,7 +57,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:	maven2 >= 2.0.4-9
 BuildRequires:	maven2-plugin-compiler
@@ -189,6 +192,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.3
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.2
 - Enable gcj
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:58:19 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Fri, 21 Sep 2007 15:58:19 -0400
Subject: rpms/haproxy/EL-4 haproxy.spec,1.2,1.3
Message-ID: <200709211958.l8LJwJaX028884@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847

Modified Files:
	haproxy.spec 
Log Message:
update build flags for pcre.h


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haproxy.spec	21 Sep 2007 19:30:24 -0000	1.2
+++ haproxy.spec	21 Sep 2007 19:57:47 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.12.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -44,8 +44,8 @@
 
 %build
 # No configure script is present, it is all done via make flags
-# FC 7 is linux 2.6 so using linux26 as target.
-make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags}"
+# pcre on EL-4 is in /usr/include/pcre not /usr/include
+make %{?_smp_mflags} CPU="generic" TARGET="linux26" REGEX="pcre" ADDINC="%{optflags} -I/usr/include/pcre"
 
 
 %install
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-4
+* update compile flags for different location of pcre.h on EL-4
+
 * Fri Sep 21 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 1.3.12.2-3
 - added pcre as Requires dependency
 



From fedora-extras-commits at redhat.com  Fri Sep 21 19:59:24 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 15:59:24 -0400
Subject: rpms/plexus-maven-plugin/devel plexus-maven-plugin.spec,1.1,1.2
Message-ID: <200709211959.l8LJxORf028967@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-maven-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28939

Modified Files:
	plexus-maven-plugin.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-maven-plugin.spec	20 Mar 2007 03:59:53 -0000	1.1
+++ plexus-maven-plugin.spec	21 Sep 2007 19:58:51 -0000	1.2
@@ -38,7 +38,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
@@ -55,6 +55,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -181,6 +183,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2-2jpp.2
+- ExcludeArch ppc64
+
 * Fri Feb 23 2007 Tania Bento <tbento at redhat.com> 0:1.2-2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 20:01:40 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:01:40 -0400
Subject: rpms/plexus-runtime-builder/devel plexus-runtime-builder.spec, 1.1, 
	1.2
Message-ID: <200709212001.l8LK1eeG002660@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-runtime-builder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829

Modified Files:
	plexus-runtime-builder.spec 
Log Message:

 - ExcludeArch ppc64




Index: plexus-runtime-builder.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-runtime-builder/devel/plexus-runtime-builder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-runtime-builder.spec	20 Mar 2007 03:58:02 -0000	1.1
+++ plexus-runtime-builder.spec	21 Sep 2007 20:01:08 -0000	1.2
@@ -38,7 +38,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.1.a9.2jpp.1%{?dist}
+Release:        0.1.a9.2jpp.2%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT-Style
@@ -53,7 +53,10 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  jakarta-commons-codec
 BuildRequires:  jakarta-commons-httpclient
@@ -200,6 +203,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a9.2jpp.2
+- ExcludeArch ppc64
+
 * Thu Feb 22 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a9.2jpp.1
 - Fixed %%Release.
 - Fixed %%BuildRoot.



From fedora-extras-commits at redhat.com  Fri Sep 21 20:08:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:08:04 -0400
Subject: rpms/plexus-xmlrpc/devel plexus-xmlrpc.spec,1.5,1.6
Message-ID: <200709212008.l8LK845X002870@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/plexus-xmlrpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2847

Modified Files:
	plexus-xmlrpc.spec 
Log Message:

- ExcludeArch ppc64




Index: plexus-xmlrpc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-xmlrpc/devel/plexus-xmlrpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plexus-xmlrpc.spec	20 Mar 2007 13:38:52 -0000	1.5
+++ plexus-xmlrpc.spec	21 Sep 2007 20:07:31 -0000	1.6
@@ -42,7 +42,7 @@
 
 Name:           plexus-xmlrpc
 Version:        1.0
-Release:        0.1.b4.3jpp.5%{?dist}
+Release:        0.1.b4.3jpp.6%{?dist}
 Epoch:          0
 Summary:        Plexus XML RPC Component
 License:        Apache Software License
@@ -59,6 +59,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -207,6 +209,9 @@
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.b4.3jpp.6
+- ExcludeArch ppc64
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.b4.3jpp.5
 - Fixed BRs
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:11:22 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:11:22 -0400
Subject: rpms/java-1.7.0-icedtea/devel mauve_tests, NONE, 1.1 .cvsignore, 1.3,
	1.4 java-1.7.0-icedtea.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709212011.l8LKBM3r003010@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2980

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Added Files:
	mauve_tests 
Log Message:
* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Added Mauve tarball as source.
- Added mauve_tests as source.
- Run Mauve after build for regression testing.




--- NEW FILE mauve_tests ---
java.awt.AWTEvent.constants
java.awt.AWTKeyStroke.equals
java.awt.AWTKeyStroke.getAWTKeyStroke
java.awt.AWTKeyStroke.serialization
java.awt.AlphaComposite.equals
java.awt.AlphaComposite.getInstance
java.awt.AlphaComposite.getInstance14
java.awt.AlphaComposite.getRule
java.awt.BasicStroke.constants
java.awt.BasicStroke.constructors
java.awt.BasicStroke.equals
java.awt.BasicStroke.hashCode
java.awt.BorderLayout.Test15
java.awt.BorderLayout.addLayoutComponent
java.awt.BorderLayout.constants
java.awt.BorderLayout.constructors
java.awt.BorderLayout.getHgap
java.awt.BorderLayout.getLayoutAlignmentX
java.awt.BorderLayout.getLayoutAlignmentY
java.awt.BorderLayout.getVgap
java.awt.BorderLayout.layoutContainer
java.awt.BorderLayout.maxLayoutSize
java.awt.BorderLayout.preferredLayoutSize
java.awt.BorderLayout.setHgap
java.awt.BorderLayout.setVgap
java.awt.ColorClass.constants
java.awt.ColorClass.constructors
java.awt.ColorClass.decode
java.awt.ColorClass.equals
java.awt.ColorClass.getBlue
java.awt.ColorClass.getGreen
java.awt.ColorClass.getRed
java.awt.ColorClass.hashCode
java.awt.ColorClass.serialization
java.awt.ColorClass.brighter
java.awt.Dimension.clone
java.awt.Dimension.constructors
java.awt.Dimension.equals
java.awt.Dimension.getSize
java.awt.Dimension.setSize
java.awt.EventClass.constants
java.awt.FontClass.serialization
java.awt.GradientPaint.constructors
java.awt.GradientPaint.equals
java.awt.GradientPaint.getColor1
java.awt.GradientPaint.getColor2
java.awt.GradientPaint.getPoint1
java.awt.GradientPaint.getPoint2
java.awt.GradientPaint.getTransparency
java.awt.GradientPaint.isCyclic
java.awt.Graphics.clearRect
java.awt.Point.clone
java.awt.Point.constructors
java.awt.Point.equals
java.awt.Point.getLocation
java.awt.Point.move
java.awt.Point.setLocation
java.awt.Point.translate
java.awt.Polygon.contains
java.awt.Polygon.getPathIterator
java.awt.Rectangle.add
java.awt.Rectangle.clone
java.awt.Rectangle.contains
java.awt.Rectangle.equals
java.awt.Rectangle.grow
java.awt.Rectangle.intersection
java.awt.Rectangle.intersects
java.awt.Rectangle.isEmpty
java.awt.Rectangle.outcode
java.awt.Rectangle.setBounds
java.awt.Rectangle.setLocation
java.awt.Rectangle.setRect
java.awt.Rectangle.setSize
java.awt.Rectangle.translate
java.awt.Rectangle.union
java.awt.Rectangle.constructors
java.awt.RenderingHints.Key.isCompatibleValue
java.awt.RenderingHints.add
java.awt.RenderingHints.clear
java.awt.RenderingHints.clone
java.awt.RenderingHints.containsValue
java.awt.RenderingHints.entrySet
java.awt.RenderingHints.equals
java.awt.RenderingHints.get
java.awt.RenderingHints.isEmpty
java.awt.RenderingHints.keySet
java.awt.RenderingHints.put
java.awt.RenderingHints.putAll
java.awt.RenderingHints.remove
java.awt.RenderingHints.size
java.awt.RenderingHints.values
java.awt.color.ColorSpace.getInstance
java.awt.color.ColorSpace.isCS_sRGB
java.awt.datatransfer.DataFlavor.writeExternal
java.awt.datatransfer.StringSelection.selection
java.awt.font.ImageGraphicAttribute.ImageGraphicAttributeTest
java.awt.font.ShapeGraphicAttribute.ShapeGraphicAttributeTest
java.awt.font.TextAttribute.constants
java.awt.font.TextAttribute.constants13
java.awt.font.TextAttribute.serialization
java.awt.font.TextAttribute.toString
java.awt.font.TextAttribute.toString13
java.awt.font.TransformAttribute.getTransform
java.awt.font.TransformAttribute.isIdentity
java.awt.font.TransformAttribute.serialization
java.awt.font.TextHitInfo.afterOffset
java.awt.font.TextHitInfo.beforeOffset
java.awt.font.TextHitInfo.equals
java.awt.font.TextHitInfo.getCharIndex
java.awt.font.TextHitInfo.getInsertionIndex
java.awt.font.TextHitInfo.getOffsetHit
java.awt.font.TextHitInfo.getOtherHit
java.awt.font.TextHitInfo.hashCode
java.awt.font.TextHitInfo.isLeadingEdge
java.awt.font.TextHitInfo.leading
java.awt.font.TextHitInfo.toString
java.awt.font.TextHitInfo.trailing
java.awt.geom.AffineTransform.clone
java.awt.geom.AffineTransform.concatenate
java.awt.geom.AffineTransform.constants
java.awt.geom.AffineTransform.constructors
java.awt.geom.AffineTransform.createInverse
java.awt.geom.AffineTransform.deltaTransform
java.awt.geom.AffineTransform.equals
java.awt.geom.AffineTransform.getDeterminant
java.awt.geom.AffineTransform.getMatrix
java.awt.geom.AffineTransform.getRotateInstance
java.awt.geom.AffineTransform.getScaleInstance
java.awt.geom.AffineTransform.getShearInstance
java.awt.geom.AffineTransform.getTranslateInstance
java.awt.geom.AffineTransform.inverseTransform
java.awt.geom.AffineTransform.isIdentity
java.awt.geom.AffineTransform.preConcatenate
java.awt.geom.AffineTransform.setTransform
java.awt.geom.AffineTransform.transform
java.awt.geom.Arc2D.Double.clone
java.awt.geom.Arc2D.Float.clone
java.awt.geom.Arc2D.constants
java.awt.geom.Arc2D.constructors
java.awt.geom.Arc2D.contains
java.awt.geom.Arc2D.containsAngle
java.awt.geom.Arc2D.getBounds2D
java.awt.geom.Arc2D.getEndPoint
java.awt.geom.Arc2D.getPathIterator
java.awt.geom.Arc2D.getStartPoint
java.awt.geom.Arc2D.intersects
java.awt.geom.Arc2D.isEmpty
java.awt.geom.Arc2D.setAngleExtent
java.awt.geom.Arc2D.setAngleStart
java.awt.geom.Arc2D.setAngles
java.awt.geom.Arc2D.setArc
java.awt.geom.Arc2D.setArcByCenter
java.awt.geom.Arc2D.setArcByTangent
java.awt.geom.Arc2D.setArcType
java.awt.geom.Arc2D.setFrame
java.awt.geom.Area.add
java.awt.geom.Area.clone
java.awt.geom.Area.constructors
java.awt.geom.Area.contains
java.awt.geom.Area.createTransformedArea
java.awt.geom.Area.equals
java.awt.geom.Area.exclusiveOr
java.awt.geom.Area.getBounds
java.awt.geom.Area.getBounds2D
java.awt.geom.Area.intersect
java.awt.geom.Area.intersects
java.awt.geom.Area.isEmpty
java.awt.geom.Area.isPolygonal
java.awt.geom.Area.isRectangular
java.awt.geom.Area.isSingular
java.awt.geom.Area.reset
java.awt.geom.Area.subtract
java.awt.geom.Area.transform
java.awt.geom.CubicCurve2D.Double.Double
java.awt.geom.CubicCurve2D.Double.getBounds2D
java.awt.geom.CubicCurve2D.Double.getCtrlP1
java.awt.geom.CubicCurve2D.Double.getCtrlP2
java.awt.geom.CubicCurve2D.Double.getP1
java.awt.geom.CubicCurve2D.Double.getP2
java.awt.geom.CubicCurve2D.Double.setCurve
java.awt.geom.CubicCurve2D.Float.Float
java.awt.geom.CubicCurve2D.Float.getBounds2D
java.awt.geom.CubicCurve2D.Float.getCtrlP1
java.awt.geom.CubicCurve2D.Float.getCtrlP2
java.awt.geom.CubicCurve2D.Float.getP1
java.awt.geom.CubicCurve2D.Float.getP2
java.awt.geom.CubicCurve2D.Float.setCurve
java.awt.geom.CubicCurve2D.clone
java.awt.geom.CubicCurve2D.getFlatness
java.awt.geom.CubicCurve2D.getFlatnessSq
java.awt.geom.CubicCurve2D.getPathIterator
java.awt.geom.CubicCurve2D.setCurve
java.awt.geom.CubicCurve2D.subdivide
java.awt.geom.Ellipse2D.Double.clone
java.awt.geom.Ellipse2D.Double.constructors
java.awt.geom.Ellipse2D.Double.getBounds2D
java.awt.geom.Ellipse2D.Double.getHeight
java.awt.geom.Ellipse2D.Double.getWidth
java.awt.geom.Ellipse2D.Double.getX
[...2247 lines suppressed...]
javax.swing.text.StyleConstants.setSpaceAbove
javax.swing.text.StyleConstants.setSpaceBelow
javax.swing.text.StyleConstants.setStrikeThrough
javax.swing.text.StyleConstants.setSubscript
javax.swing.text.StyleConstants.setSuperscript
javax.swing.text.StyleConstants.setTabSet
javax.swing.text.StyleConstants.setUnderline
javax.swing.text.StyleContext.NamedStyleInit
javax.swing.text.StyleContext.NamedStyleSetResolveParent
javax.swing.text.StyleContext.addAttribute
javax.swing.text.StyleContext.addStyle
javax.swing.text.StyledEditorKit.createInputAttributesTest
javax.swing.text.TextAction.augmentList
javax.swing.text.Utilities.getNextWord
javax.swing.text.Utilities.getPreviousWord
javax.swing.text.Utilities.getTabbedTextOffset
javax.swing.text.Utilities.getWordStart
javax.swing.text.Utilities.getBreakLocation
javax.swing.text.View.getAlignment
javax.swing.text.View.getMaximumSpan
javax.swing.text.View.getMinimumSpan
javax.swing.text.View.getResizeWeight
javax.swing.text.html.CSS.Attribute
javax.swing.text.html.HTML.ElementTagAttributeTest
javax.swing.text.html.HTML.HTML_Test
javax.swing.text.html.parser.AttributeList.AttributeList_test
javax.swing.text.html.parser.DTD.DTD_test
javax.swing.text.html.parser.Element.Element_Test
javax.swing.text.html.parser.Entity.Entity_Test
javax.swing.text.html.parser.ParserDelegator.Text
javax.swing.text.html.parser.ParserDelegator.eolnNorification
javax.swing.text.html.parser.ParserDelegator.randomTables
javax.swing.text.html.parser.ParserDelegator.tokenLocations
javax.swing.text.html.parser.ParserDelegator.Entities
javax.swing.text.html.parser.ParserDelegator.SimpleParsing
javax.swing.text.html.parser.ParserDelegator.Text3
javax.swing.text.html.parser.ParserDelegator.Text4
javax.swing.text.html.parser.TagElement.TagElement_Test
javax.swing.text.html.HTMLDocument.FindById
javax.swing.text.TabSet.constructor
javax.swing.text.TabSet.equals
javax.swing.text.TabSet.getTab
javax.swing.text.TabSet.getTabCount
javax.swing.text.TabSet.getTabIndex
javax.swing.text.TabSet.getTabIndexAfter
javax.swing.text.TabSet.toString
javax.swing.text.TabStop.constructors
javax.swing.text.TabStop.toString
javax.swing.text.ZoneView.constructor
javax.swing.text.ZoneView.createZone
javax.swing.text.ZoneView.getMaximumZoneSize
javax.swing.text.ZoneView.isZoneLoaded
javax.swing.text.ZoneView.loadChildren
javax.swing.text.ZoneView.setMaxZonesLoaded
javax.swing.text.ZoneView.setMaximumZoneSize
javax.swing.text.ZoneView.unloadZone
javax.swing.text.ZoneView.zoneWasLoaded
javax.swing.tree.DefaultMutableTreeNode.DefaultMutableTreeNodeTest
javax.swing.tree.DefaultMutableTreeNode.add
javax.swing.tree.DefaultMutableTreeNode.breadthFirstEnumeration
javax.swing.tree.DefaultMutableTreeNode.children
javax.swing.tree.DefaultMutableTreeNode.clone
javax.swing.tree.DefaultMutableTreeNode.constructors
javax.swing.tree.DefaultMutableTreeNode.getAllowsChildren
javax.swing.tree.DefaultMutableTreeNode.getChildAfter
javax.swing.tree.DefaultMutableTreeNode.getChildAt
javax.swing.tree.DefaultMutableTreeNode.getChildBefore
javax.swing.tree.DefaultMutableTreeNode.getChildCount
javax.swing.tree.DefaultMutableTreeNode.getFirstChild
javax.swing.tree.DefaultMutableTreeNode.getFirstLeaf
javax.swing.tree.DefaultMutableTreeNode.getIndex
javax.swing.tree.DefaultMutableTreeNode.getLastChild
javax.swing.tree.DefaultMutableTreeNode.getLastLeaf
javax.swing.tree.DefaultMutableTreeNode.getNextLeaf
javax.swing.tree.DefaultMutableTreeNode.getNextPreviousNode
javax.swing.tree.DefaultMutableTreeNode.getNextSibling
javax.swing.tree.DefaultMutableTreeNode.getParent
javax.swing.tree.DefaultMutableTreeNode.getPath
javax.swing.tree.DefaultMutableTreeNode.getPreviousLeaf
javax.swing.tree.DefaultMutableTreeNode.getPreviousSibling
javax.swing.tree.DefaultMutableTreeNode.getSiblingCount
javax.swing.tree.DefaultMutableTreeNode.insert
javax.swing.tree.DefaultMutableTreeNode.isLeaf
javax.swing.tree.DefaultMutableTreeNode.isNodeAncestor
javax.swing.tree.DefaultMutableTreeNode.isNodeChild
javax.swing.tree.DefaultMutableTreeNode.isNodeDescendant
javax.swing.tree.DefaultMutableTreeNode.isNodeRelated
javax.swing.tree.DefaultMutableTreeNode.isNodeSibling
javax.swing.tree.DefaultMutableTreeNode.pathFromAncestorEnumeration
javax.swing.tree.DefaultMutableTreeNode.remove
javax.swing.tree.DefaultMutableTreeNode.removeAllChildren
javax.swing.tree.DefaultMutableTreeNode.setAllowsChildren
javax.swing.tree.DefaultTreeCellRenderer.constructor
javax.swing.tree.DefaultTreeCellRenderer.getBackgroundNonSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getBackgroundSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getBorderSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.getClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.getDefaultOpenIcon
javax.swing.tree.DefaultTreeCellRenderer.getLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.getOpenIcon
javax.swing.tree.DefaultTreeCellRenderer.setBackgroundNonSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setBackgroundSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setBorderSelectionColor
javax.swing.tree.DefaultTreeCellRenderer.setClosedIcon
javax.swing.tree.DefaultTreeCellRenderer.setLeafIcon
javax.swing.tree.DefaultTreeCellRenderer.setOpenIcon
javax.swing.tree.TreePath.PR27651
javax.swing.tree.TreePath.constructors
javax.swing.tree.TreePath.equals
javax.swing.tree.TreePath.getLastPathComponent
javax.swing.tree.TreePath.getParentPath
javax.swing.tree.TreePath.getPath
javax.swing.tree.TreePath.getPathComponent
javax.swing.tree.TreePath.getPathCount
javax.swing.tree.TreePath.isDescendant
javax.swing.tree.TreePath.pathByAddingChild
javax.swing.tree.TreePath.serialization
javax.swing.tree.VariableHeightLayoutCache.getBounds
javax.swing.undo.AbstractUndoableEdit.addEdit
javax.swing.undo.AbstractUndoableEdit.canRedo
javax.swing.undo.AbstractUndoableEdit.canUndo
javax.swing.undo.AbstractUndoableEdit.getPresentationName
javax.swing.undo.AbstractUndoableEdit.getRedoPresentationName
javax.swing.undo.AbstractUndoableEdit.getUndoPresentationName
javax.swing.undo.AbstractUndoableEdit.isSignificant
javax.swing.undo.AbstractUndoableEdit.redo
javax.swing.undo.AbstractUndoableEdit.replaceEdit
javax.swing.undo.AbstractUndoableEdit.undo
javax.swing.undo.CompoundEdit.addEdit
javax.swing.undo.CompoundEdit.canRedo
javax.swing.undo.CompoundEdit.canUndo
javax.swing.undo.CompoundEdit.isInProgress
javax.swing.undo.CompoundEdit.lastEdit
javax.swing.undo.StateEdit.getPresentationName
javax.swing.undo.StateEdit.undo
javax.swing.undo.UndoManager.addEdit
javax.swing.undo.UndoManager.canRedo
javax.swing.undo.UndoManager.canUndo
javax.swing.undo.UndoManager.canUndoOrRedo
javax.swing.undo.UndoManager.discardAllEdits
javax.swing.undo.UndoManager.editToBeRedone
javax.swing.undo.UndoManager.editToBeUndone
javax.swing.undo.UndoManager.end
javax.swing.undo.UndoManager.getLimit
javax.swing.undo.UndoManager.getRedoPresentationName
javax.swing.undo.UndoManager.getUndoOrRedoPresentationName
javax.swing.undo.UndoManager.getUndoPresentationName
javax.swing.undo.UndoManager.redoTo
javax.swing.undo.UndoManager.setLimit
javax.swing.undo.UndoManager.toString
javax.swing.undo.UndoManager.trimEdits
javax.swing.undo.UndoManager.undoTo
javax.swing.undo.UndoManager.undoableEditHappened
javax.swing.undo.UndoableEditSupport.UndoableEditSupport
javax.swing.undo.UndoableEditSupport.beginUpdate
javax.swing.undo.UndoableEditSupport.createCompoundEdit
javax.swing.undo.UndoableEditSupport.getUndoableEditListeners
javax.swing.undo.UndoableEditSupport.getUpdateLevel
javax.swing.undo.UndoableEditSupport.toString
javax.swing.ButtonGroup.add
javax.swing.ButtonGroup.constructor
javax.swing.ButtonGroup.getButtonCount
javax.swing.ButtonGroup.getElements
javax.swing.ButtonGroup.getSelection
javax.swing.ButtonGroup.isSelected
javax.swing.ButtonGroup.remove
javax.swing.ButtonGroup.setSelected
javax.swing.ToolTipManager.setDismissDelay
javax.swing.ToolTipManager.setInitialDelay
javax.swing.ToolTipManager.setReshowDelay
javax.xml.parsers.DocumentBuilder.PR27864
javax.xml.parsers.DocumentBuilder.parseSimpleXML
javax.xml.xpath.XPath
javax.net.ssl.SSLContext.TestDefaultInit
javax.net.ssl.SSLContext.TestGetInstance
javax.management.MBeanServerPermission.Constructor
javax.management.ObjectName.Parsing
javax.management.ObjectName.ParsingJDK6
javax.management.ObjectName.apply
javax.management.ObjectName.applyJDK6
javax.management.openmbean.ArrayType.Constructor1
javax.management.openmbean.ArrayType.Constructor2
javax.management.openmbean.ArrayType.Equals
javax.management.openmbean.ArrayType.GetArrayType
javax.management.openmbean.ArrayType.GetPrimitiveArrayType
javax.management.openmbean.ArrayType.HashCode
javax.management.openmbean.ArrayType.IsPrimitiveArray
javax.management.openmbean.ArrayType.IsValue
javax.management.openmbean.CompositeDataInvocationHandler.Test
org.omg.CORBA.Any.testAny
org.omg.CORBA.ORB.DirectTest
org.omg.CORBA.ORB.RequestTest
org.omg.CORBA.ServiceInformationHelper.basicHelperOperations
org.omg.CORBA.TypeCode.orbTypecodes
org.omg.CORBA.portable.InputStream.cdrIO
org.omg.CORBA_2_3.ORB.ValueTypeTest
org.omg.IOP.IOR.Streams
org.w3c.dom.childNodesLength


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2007 20:06:27 -0000	1.3
+++ .cvsignore	21 Sep 2007 20:10:50 -0000	1.4
@@ -1,3 +1,4 @@
 icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
+mauve_tests


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-1.7.0-icedtea.spec	7 Sep 2007 20:06:27 -0000	1.4
+++ java-1.7.0-icedtea.spec	21 Sep 2007 20:10:50 -0000	1.5
@@ -21,6 +21,8 @@
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
 
+%define mauvedate 2007-09-12
+
 %ifarch x86_64
 %define archbuild amd64
 %define archinstall amd64
@@ -109,6 +111,8 @@
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  README.plugin
+Source6:  mauve-%{mauvedate}.tar.gz
+Source7:  mauve_tests
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -259,6 +263,7 @@
 
 %prep
 %setup -q -n icedtea-%{icedteaver}
+%setup -q -n icedtea-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -285,6 +290,15 @@
   cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
   cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
 popd
+# Running Mauve to check for regressions
+pushd mauve-%{mauvedate}
+  ./configure 
+  make
+  echo ====================TESTING========================
+  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+	 -showpasses -debug -timeout 30000 2>&1
+  echo ====================TESTING END====================
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -714,6 +728,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Added Mauve tarball as source.
+- Added mauve_tests as source.
+- Run Mauve after build for regression testing.
+
 * Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Do not require openssl for build.
 - Require openssl.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2007 20:06:27 -0000	1.3
+++ sources	21 Sep 2007 20:10:50 -0000	1.4
@@ -1,3 +1,4 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
+68932798db6c0e167a2d54738b6dfb68  mauve_tests



From fedora-extras-commits at redhat.com  Fri Sep 21 20:13:32 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:13:32 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709212013.l8LKDWHh003100@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3042

Modified Files:
	.cvsignore sources 
Log Message:
Added mauve source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2007 20:10:50 -0000	1.4
+++ .cvsignore	21 Sep 2007 20:13:00 -0000	1.5
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve_tests
+mauve-2007-09-12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2007 20:10:50 -0000	1.4
+++ sources	21 Sep 2007 20:13:00 -0000	1.5
@@ -2,3 +2,4 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
+abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 20:15:19 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 21 Sep 2007 16:15:19 -0400
Subject: rpms/smolt/devel firstboot.patch,NONE,1.1 smolt.spec,1.28,1.29
Message-ID: <200709212015.l8LKFJSM003231@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3206

Modified Files:
	smolt.spec 
Added Files:
	firstboot.patch 
Log Message:
Firstboot fixes

firstboot.patch:

--- NEW FILE firstboot.patch ---
--- client/smoltFirstBoot.py.orig	2007-09-21 14:16:52.000000000 -0500
+++ client/smoltFirstBoot.py	2007-09-21 14:30:25.000000000 -0500
@@ -14,10 +14,17 @@
 ## I18N
 ## 
 import gettext
-gettext.bindtextdomain ("firstboot", "/usr/share/locale")
-gettext.textdomain ("firstboot")
-_=gettext.gettext
+import locale
+locale.setlocale(locale.LC_ALL, '')
+if os.path.isdir('po'):
+    t = gettext.translation('smolt', 'po', fallback = True)
+else:
+    t = gettext.translation('smolt', '/usr/share/locale', fallback = True)
+#gettext.bindtextdomain ("smolt", "/usr/share/locale")
+#gettext.textdomain ("smolt")
+#_=gettext.gettext
 
+_ = t.gettext
 class childWindow:
     #You must specify a runPriority for the order in which you wish your module to run
     runPriority = 107


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- smolt.spec	15 Aug 2007 02:30:57 -0000	1.28
+++ smolt.spec	21 Sep 2007 20:14:47 -0000	1.29
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -10,6 +10,7 @@
 # This will get fixed as soon as hosted can create attachments directly
 
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
+Patch0: firstboot.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 cd client/
@@ -177,6 +179,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+- Fixed firstboot issues
+
 * Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4
 - Rebuild to clean up 'config.py' compilations
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:15:57 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 21 Sep 2007 16:15:57 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.5,1.6
Message-ID: <200709212015.l8LKFvxr003288@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3230

Modified Files:
	.cvsignore 
Log Message:
Updated .cvsignore to not ignore mauve_tests. This source has been committed 
to the repo, and if it is modified it should be recommitted and uploaded.





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Sep 2007 20:13:00 -0000	1.5
+++ .cvsignore	21 Sep 2007 20:15:25 -0000	1.6
@@ -1,5 +1,4 @@
 icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
-mauve_tests
 mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 21 20:18:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Sep 2007 16:18:31 -0400
Subject: rpms/sdljava/F-7 sdljava.spec,1.2,1.3
Message-ID: <200709212018.l8LKIVmY003366@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3347

Modified Files:
	sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8



Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdljava.spec	21 Sep 2007 19:27:37 -0000	1.2
+++ sdljava.spec	21 Sep 2007 20:17:58 -0000	1.3
@@ -89,12 +89,12 @@
 
 %build
 # ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64]
-# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h
+# -D__LONG_DOUBLE_128__ works around swig barfing on bits/stdlib-ldbl.h
 %ifarch ppc
-export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__"
+export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__"
 %endif
 %ifarch ppc64
-export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__"
+export ARCH_DEFINE="-D__powerpc64__ -D__LONG_DOUBLE_128__"
 %endif
 
 pushd src/sdljava/native



From fedora-extras-commits at redhat.com  Fri Sep 21 20:21:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 16:21:41 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.66,
	1.67 selinux-policy.spec, 1.528, 1.529
Message-ID: <200709212021.l8LKLf3j003469@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
- Allow cupsd_config_t to read/write usb_device_t
- Support for finger print reader,
- Many fixes for clvmd
- dbus starting networkmanager


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- policy-20070703.patch	20 Sep 2007 22:30:51 -0000	1.66
+++ policy-20070703.patch	21 Sep 2007 20:21:36 -0000	1.67
@@ -1462,7 +1462,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 17:57:24.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 18:26:14.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1482,7 +1482,7 @@
  	allow $1_javaplugin_t $2:fd use;
  	# Unrestricted inheritance from the caller.
  	allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh };
-@@ -166,6 +165,60 @@
+@@ -166,6 +165,62 @@
  	optional_policy(`
  		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
  	')
@@ -1537,13 +1537,15 @@
 +	dev_read_urand($1_java_t)
 +	dev_read_rand($1_java_t)
 +
++	fs_dontaudit_rw_tmpfs_files($1_java_t)
++
 +	optional_policy(`
 +		xserver_xdm_rw_shm($1_java_t)
 +	')
  ')
  
  ########################################
-@@ -219,3 +272,66 @@
+@@ -219,3 +274,66 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, java_exec_t, java_t)
  ')
@@ -1612,7 +1614,16 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.0.8/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.te	2007-09-20 18:14:17.000000000 -0400
+@@ -23,7 +23,7 @@
+ #
+ 
+ # execheap is needed for itanium/BEA jrocket
+-allow java_t self:process { execstack execmem execheap };
++allow java_t self:process { getsched sigkill execheap execmem execstack };
+ 
+ init_dbus_chat_script(java_t)
+ 
 @@ -31,3 +31,7 @@
  	unconfined_domain_noaudit(java_t)
  	unconfined_dbus_chat(java_t)
@@ -1623,8 +1634,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.8/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 11:42:05.000000000 -0400
-@@ -18,3 +18,102 @@
++++ serefpolicy-3.0.8/policy/modules/apps/mono.if	2007-09-20 18:25:48.000000000 -0400
+@@ -18,3 +18,103 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
  ')
@@ -1720,6 +1731,7 @@
 +	userdom_unpriv_usertype($1, $1_mono_t)
 +
 +	allow $1_mono_t self:process { signal getsched execheap execmem };
++	allow $2 $1_mono_t:process noatsecure;
 +
 +	domtrans_pattern($2, mono_exec_t, $1_mono_t)
 +
@@ -2250,7 +2262,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-21 14:41:45.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2284,7 +2296,7 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
-@@ -259,3 +265,7 @@
+@@ -259,3 +265,8 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -2292,6 +2304,7 @@
 +/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
++/lib(64)?/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in	2007-09-17 16:20:18.000000000 -0400
@@ -2415,7 +2428,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-21 14:29:01.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -2424,6 +2437,14 @@
  /dev/fw.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/hiddev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/hpet		-c	gen_context(system_u:object_r:clock_device_t,s0)
+@@ -98,6 +99,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)
++/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ 
+ /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
@@ -4904,7 +4925,7 @@
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.8/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-18 12:31:53.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.fc	2007-09-21 15:23:17.000000000 -0400
 @@ -8,17 +8,14 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4924,24 +4945,26 @@
  /usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
  
  /usr/libexec/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
-@@ -26,6 +23,9 @@
+@@ -26,6 +23,11 @@
  /usr/sbin/cupsd		--	gen_context(system_u:object_r:cupsd_exec_t,s0)
  /usr/sbin/hal_lpadmin --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/hpiod		--	gen_context(system_u:object_r:hplip_exec_t,s0)
 +/usr/sbin/hp-[^/]+	--	gen_context(system_u:object_r:hplip_exec_t,s0)
-+/usr/lib(64)?/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++# keep as separate lines to ensure proper sorting
++/usr/lib/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/lib64/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
 +
  /usr/sbin/printconf-backend --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
  /usr/sbin/ptal-printd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
  /usr/sbin/ptal-mlcd	--	gen_context(system_u:object_r:ptal_exec_t,s0)
-@@ -52,3 +52,4 @@
+@@ -52,3 +54,4 @@
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-18 12:15:12.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-21 09:12:45.000000000 -0400
 @@ -49,9 +49,6 @@
  type hplip_exec_t;
  init_daemon_domain(hplip_t,hplip_exec_t)
@@ -5103,7 +5126,15 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -377,6 +400,14 @@
+@@ -331,6 +354,7 @@
+ dev_read_sysfs(cupsd_config_t)
+ dev_read_urand(cupsd_config_t)
+ dev_read_rand(cupsd_config_t)
++dev_rw_generic_usb_dev(cupsd_config_t)
+ 
+ fs_getattr_all_fs(cupsd_config_t)
+ fs_search_auto_mountpoints(cupsd_config_t)
+@@ -377,6 +401,14 @@
  ')
  
  optional_policy(`
@@ -5118,7 +5149,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +557,6 @@
+@@ -526,11 +558,6 @@
  
  cups_stream_connect(hplip_t)
  
@@ -5130,7 +5161,7 @@
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
  
-@@ -560,7 +586,7 @@
+@@ -560,7 +587,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5139,7 +5170,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +613,6 @@
+@@ -587,8 +614,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -5189,7 +5220,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-20 15:31:09.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-21 06:44:48.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5330,7 +5361,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.8/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-20 12:01:29.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.te	2007-09-21 14:44:08.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -5350,7 +5381,7 @@
  manage_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  manage_sock_files_pattern(system_dbusd_t,system_dbusd_var_run_t,system_dbusd_var_run_t)
  files_pid_filetrans(system_dbusd_t,system_dbusd_var_run_t,file)
-@@ -116,9 +121,18 @@
+@@ -116,9 +121,22 @@
  ')
  
  optional_policy(`
@@ -5358,6 +5389,10 @@
 +')
 +
 +optional_policy(`
++	networkmanager_domtrans(system_dbusd_t)
++')
++
++optional_policy(`
  	sysnet_domtrans_dhcpc(system_dbusd_t)
  ')
  
@@ -6134,7 +6169,7 @@
  /var/run/vbestate 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.8/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-19 13:28:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/hal.te	2007-09-21 14:55:44.000000000 -0400
 @@ -155,6 +155,8 @@
  selinux_compute_relabel_context(hald_t)
  selinux_compute_user_contexts(hald_t)
@@ -6152,6 +6187,15 @@
  allow hald_acl_t self:fifo_file read_fifo_file_perms;
  
  domtrans_pattern(hald_t, hald_acl_exec_t, hald_acl_t)
+@@ -344,6 +347,8 @@
+ 
+ files_read_usr_files(hald_mac_t)
+ 
++kernel_read_system_state(hald_mac_t)
++
+ libs_use_ld_so(hald_mac_t)
+ libs_use_shared_libs(hald_mac_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.0.8/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-09-12 10:34:50.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/inetd.te	2007-09-17 16:20:18.000000000 -0400
@@ -7921,7 +7965,7 @@
  	consoletype_exec(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.8/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ricci.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ricci.te	2007-09-21 10:21:12.000000000 -0400
 @@ -138,6 +138,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -7930,6 +7974,15 @@
  auth_append_login_records(ricci_t)
  
  init_dontaudit_stream_connect_script(ricci_t)
+@@ -260,7 +261,7 @@
+ # ricci_modclusterd local policy
+ #
+ 
+-allow ricci_modclusterd_t self:capability sys_nice;
++allow ricci_modclusterd_t self:capability { sys_nice sys_tty_config };
+ allow ricci_modclusterd_t self:process { signal sigkill setsched };
+ allow ricci_modclusterd_t self:fifo_file rw_fifo_file_perms;
+ allow ricci_modclusterd_t self:unix_stream_socket create_stream_socket_perms;
 @@ -321,6 +322,10 @@
  ')
  
@@ -7941,6 +7994,24 @@
  	unconfined_use_fds(ricci_modclusterd_t)
  ')
  
+@@ -468,9 +473,6 @@
+ 
+ logging_send_syslog_msg(ricci_modstorage_t)
+ 
+-lvm_domtrans(ricci_modstorage_t)
+-lvm_manage_config(ricci_modstorage_t)
+-
+ miscfiles_read_localization(ricci_modstorage_t)
+ 
+ modutils_read_module_deps(ricci_modstorage_t)
+@@ -482,6 +484,7 @@
+ 
+ optional_policy(`
+ 	lvm_domtrans(ricci_modstorage_t)
++	lvm_manage_config(ricci_modstorage_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-17 16:20:18.000000000 -0400
@@ -11141,6 +11212,18 @@
  	seutil_sigchld_newrole(iptables_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.0.8/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te	2007-07-25 10:37:42.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/iscsi.te	2007-09-21 14:55:01.000000000 -0400
+@@ -68,6 +68,8 @@
+ 
+ files_read_etc_files(iscsid_t)
+ 
++kernel_read_system_state(iscsid_t)
++
+ libs_use_ld_so(iscsid_t)
+ libs_use_shared_libs(iscsid_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
@@ -11862,7 +11945,7 @@
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.0.8/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/lvm.fc	2007-09-21 09:54:46.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -11873,19 +11956,66 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-17 16:20:18.000000000 -0400
-@@ -150,7 +150,9 @@
++++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-21 15:33:57.000000000 -0400
+@@ -44,9 +44,9 @@
+ # Cluster LVM daemon local policy
+ #
+ 
+-allow clvmd_t self:capability { sys_admin mknod };
++allow clvmd_t self:capability { sys_nice chown ipc_lock sys_admin mknod };
+ dontaudit clvmd_t self:capability sys_tty_config;
+-allow clvmd_t self:process signal_perms;
++allow clvmd_t self:process { signal_perms  setsched };
+ dontaudit clvmd_t self:process ptrace;
+ allow clvmd_t self:socket create_socket_perms;
+ allow clvmd_t self:fifo_file rw_fifo_file_perms;
+@@ -85,6 +85,9 @@
+ corenet_sendrecv_generic_server_packets(clvmd_t)
+ 
+ dev_read_sysfs(clvmd_t)
++dev_manage_generic_symlinks(clvmd_t)
++dev_relabel_generic_dev_dirs(clvmd_t)
++dev_manage_generic_blk_files(clvmd_t)
+ dev_manage_generic_chr_files(clvmd_t)
+ dev_rw_lvm_control(clvmd_t)
+ dev_dontaudit_getattr_all_blk_files(clvmd_t)
+@@ -102,6 +105,7 @@
+ 
+ domain_use_interactive_fds(clvmd_t)
+ 
++storage_relabel_fixed_disk(clvmd_t)
+ storage_raw_read_fixed_disk(clvmd_t)
+ 
+ libs_use_ld_so(clvmd_t)
+@@ -113,6 +117,9 @@
+ 
+ seutil_dontaudit_search_config(clvmd_t)
+ seutil_sigchld_newrole(clvmd_t)
++seutil_read_config(clvmd_t)
++seutil_read_file_contexts(clvmd_t)
++seutil_search_default_contexts(clvmd_t)
+ 
+ sysnet_read_config(clvmd_t)
+ 
+@@ -150,7 +157,8 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
 -allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
 +allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin };
 +# lvm needs net_admin for multipath
-+
  dontaudit lvm_t self:capability sys_tty_config;
  allow lvm_t self:process { sigchld sigkill sigstop signull signal };
  # LVM will complain a lot if it cannot set its priority.
-@@ -228,6 +230,8 @@
+@@ -208,7 +216,6 @@
+ selinux_compute_user_contexts(lvm_t)
+ 
+ dev_create_generic_chr_files(lvm_t)
+-dev_delete_generic_dirs(lvm_t)
+ dev_read_rand(lvm_t)
+ dev_read_urand(lvm_t)
+ dev_rw_lvm_control(lvm_t)
+@@ -228,6 +235,8 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -11894,7 +12024,7 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -246,6 +250,7 @@
+@@ -246,6 +255,7 @@
  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)
@@ -11902,7 +12032,7 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -275,6 +280,8 @@
+@@ -275,6 +285,8 @@
  seutil_search_default_contexts(lvm_t)
  seutil_sigchld_newrole(lvm_t)
  
@@ -11911,7 +12041,7 @@
  ifdef(`distro_redhat',`
  	# this is from the initrd:
  	files_rw_isid_type_dirs(lvm_t)
-@@ -293,5 +300,15 @@
+@@ -293,5 +305,14 @@
  ')
  
  optional_policy(`
@@ -11926,7 +12056,6 @@
 +	xen_append_log(lvm_t)
 +	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
 +')
-+
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.0.8/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-08-22 07:14:12.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/modutils.te	2007-09-17 16:20:18.000000000 -0400
@@ -12838,6 +12967,14 @@
  term_dontaudit_use_all_user_ttys(ifconfig_t)
  term_dontaudit_use_all_user_ptys(ifconfig_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400
+@@ -10,3 +10,4 @@
+ /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ 
+ /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-17 16:20:18.000000000 -0400
@@ -13047,7 +13184,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -13231,14 +13368,17 @@
  ')
  
  ########################################
-@@ -227,6 +223,17 @@
- 	unconfined_dbus_chat(unconfined_execmem_t)
+@@ -225,8 +221,20 @@
  
- 	optional_policy(`
-+		avahi_dbus_chat(unconfined_t)
-+	')
+ 	init_dbus_chat_script(unconfined_execmem_t)
+ 	unconfined_dbus_chat(unconfined_execmem_t)
++	dbus_connect_system_bus(unconfined_execmem_t)
 +
 +	optional_policy(`
++		avahi_dbus_chat(unconfined_execmem_t)
++	')
+ 
+ 	optional_policy(`
  		hal_dbus_chat(unconfined_execmem_t)
  	')
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- selinux-policy.spec	20 Sep 2007 22:30:51 -0000	1.528
+++ selinux-policy.spec	21 Sep 2007 20:21:36 -0000	1.529
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,12 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
+- Allow cupsd_config_t to read/write usb_device_t
+- Support for finger print reader,
+- Many fixes for clvmd
+- dbus starting networkmanager
+
 * Thu Sep 20 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-5
 - Fix java and mono to run in xguest account
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:22:48 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 16:22:48 -0400
Subject: rpms/selinux-policy/F-7 modules-targeted.conf, 1.61,
	1.62 policy-20070501.patch, 1.58, 1.59 selinux-policy.spec,
	1.493, 1.494
Message-ID: <200709212022.l8LKMmVl003551@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517

Modified Files:
	modules-targeted.conf policy-20070501.patch 
	selinux-policy.spec 
Log Message:
* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
- Make /dev/fuse a fuse_device_t



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/modules-targeted.conf,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- modules-targeted.conf	11 Jul 2007 20:43:44 -0000	1.61
+++ modules-targeted.conf	21 Sep 2007 20:22:15 -0000	1.62
@@ -1470,3 +1470,10 @@
 # 
 w3c = module
 
+#
+# Layer: services
+# Module: exim
+#
+# exim mail server 
+# 
+exim = module

policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- policy-20070501.patch	11 Sep 2007 20:04:54 -0000	1.58
+++ policy-20070501.patch	21 Sep 2007 20:22:15 -0000	1.59
@@ -1711,7 +1711,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:53:08.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/corenetwork.if.in	2007-09-11 15:55:52.000000000 -0400
 @@ -1449,6 +1449,44 @@
  
  ########################################
@@ -1881,7 +1881,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.6.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-21 14:29:34.000000000 -0400
 @@ -19,6 +19,8 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -1917,6 +1917,14 @@
  /dev/cpu/.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
  /dev/cpu/mtrr		-c	gen_context(system_u:object_r:mtrr_device_t,s0)
  
+@@ -92,6 +97,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)
++/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ 
+ /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-08-07 09:42:35.000000000 -0400
@@ -2933,7 +2941,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.6.4/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.fc	2007-09-13 12:46:00.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/lvm		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -2942,9 +2950,18 @@
  /dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+@@ -51,7 +52,7 @@
+ 
+ /dev/cciss/[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+-/dev/fuse		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,mls_systemhigh)
+ /dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.6.4/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.if	2007-09-13 12:46:54.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -2961,6 +2978,84 @@
  	typeattribute $1 fixed_disk_raw_write;
  ')
  
+@@ -670,3 +672,61 @@
+ 
+ 	typeattribute $1 storage_unconfined_type;
+ ')
++
++########################################
++## <summary>
++##	Allow the caller to get the attributes
++##	of device nodes of fuse devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`storage_getattr_fuse_dev',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dev_list_all_dev_nodes($1)
++	allow $1 fuse_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	read or write fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	allow $1 fuse_device_t:chr_file rw_file_perms;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read or write
++##	fuse device interfaces.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`storage_dontaudit_rw_fuse',`
++	gen_require(`
++		type fuse_device_t;
++	')
++
++	dontaudit $1 fuse_device_t:chr_file rw_file_perms;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.te serefpolicy-2.6.4/policy/modules/kernel/storage.te
+--- nsaserefpolicy/policy/modules/kernel/storage.te	2007-05-07 14:51:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/storage.te	2007-09-13 12:45:24.000000000 -0400
+@@ -23,6 +23,12 @@
+ neverallow ~{ fixed_disk_raw_write storage_unconfined_type } fixed_disk_device_t:{ chr_file blk_file } { append write };
+ 
+ #
++# fuse_device_t is the type of /dev/fuse
++#
++type fuse_device_t;
++dev_node(fuse_device_t)
++
++#
+ # scsi_generic_device_t is the type of /dev/sg*
+ # it gives access to ALL SCSI devices (both fixed and removable)
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-2.6.4/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2007-05-07 14:51:04.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/kernel/terminal.fc	2007-08-07 09:42:35.000000000 -0400
@@ -3981,7 +4076,7 @@
  fs_getattr_all_fs(entropyd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.6.4/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-08-21 13:38:42.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/automount.te	2007-09-13 12:51:25.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -3998,7 +4093,16 @@
  dev_read_urand(automount_t)
  
  domain_use_interactive_fds(automount_t)
-@@ -178,6 +180,11 @@
+@@ -138,6 +140,8 @@
+ # Run mount in the mount_t domain.
+ mount_domtrans(automount_t)
+ 
++storage_rw_fuse(automount_t)
++
+ sysnet_dns_name_resolve(automount_t)
+ sysnet_use_ldap(automount_t)
+ sysnet_read_config(automount_t)
+@@ -178,6 +182,11 @@
  ')
  
  optional_policy(`
@@ -4102,6 +4206,18 @@
  corenet_sendrecv_rndc_client_packets(ndc_t)
  
  fs_getattr_xattr_fs(ndc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.6.4/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-05-07 14:51:01.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/bluetooth.te	2007-09-18 13:32:53.000000000 -0400
+@@ -139,6 +139,8 @@
+ 	dbus_system_bus_client_template(bluetooth,bluetooth_t)
+ 	dbus_connect_system_bus(bluetooth_t)
+ 	dbus_send_system_bus(bluetooth_t)
++	allow bluetooth_t self:dbus send_msg;
++
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.6.4/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/clamav.fc	2007-08-07 09:42:35.000000000 -0400
@@ -5208,6 +5324,462 @@
 +	term_dontaudit_use_unallocated_ttys(dovecot_deliver_t)
 +	term_dontaudit_use_generic_ptys(dovecot_deliver_t)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.fc serefpolicy-2.6.4/policy/modules/services/exim.fc
+--- nsaserefpolicy/policy/modules/services/exim.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.fc	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,6 @@
++
++/usr/sbin/exim	--	gen_context(system_u:object_r:exim_exec_t,s0)
++/etc/rc.d/init.d/exim	--	gen_context(system_u:object_r:exim_script_exec_t,s0)
++/var/run/exim.pid		--	gen_context(system_u:object_r:exim_var_run_t,s0)
++/var/log/exim(/.*)?			gen_context(system_u:object_r:exim_log_t,s0)
++/var/spool/exim(/.*)?			gen_context(system_u:object_r:exim_spool_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-2.6.4/policy/modules/services/exim.if
+--- nsaserefpolicy/policy/modules/services/exim.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.if	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,330 @@
++
++## <summary>policy for exim</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run exim.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`exim_domtrans',`
++	gen_require(`
++		type exim_t;
++                type exim_exec_t;
++	')
++
++	domain_auto_trans($1,exim_exec_t,exim_t)
++
++	allow exim_t $1:fd use;
++	allow exim_t $1:fifo_file rw_file_perms;
++	allow exim_t $1:process sigchld;
++')
++
++
++########################################
++## <summary>
++##	Execute exim server in the exim domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`exim_script_domtrans',`
++	gen_require(`
++		type exim_script_exec_t;
++	')
++
++	init_script_domtrans_spec($1,exim_script_exec_t)
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to read, 
++##	exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_dontaudit_read_tmp_files',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++	dontaudit $1 exim_tmp_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Allow domain to read, exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_read_tmp_files',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++	allow $1 exim_tmp_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim tmp files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_tmp',`
++	gen_require(`
++		type exim_tmp_t;
++	')
++
++         manage_dir_perms($1,exim_tmp_t,exim_tmp_t)
++         manage_file_perms($1,exim_tmp_t,exim_tmp_t)
++         manage_lnk_file_perms($1,exim_tmp_t,exim_tmp_t)
++')
++
++########################################
++## <summary>
++##	Read exim PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_read_pid_files',`
++	gen_require(`
++		type exim_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 exim_var_run_t:file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage exim var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_var_run',`
++	gen_require(`
++		type exim_var_run_t;
++	')
++
++         manage_dir_perms($1,exim_var_run_t,exim_var_run_t)
++         manage_file_perms($1,exim_var_run_t,exim_var_run_t)
++         manage_lnk_file_perms($1,exim_var_run_t,exim_var_run_t)
++')
++
++
++########################################
++## <summary>
++##	Allow the specified domain to read exim's log files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`exim_read_log',`
++	gen_require(`
++		type exim_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 exim_log_t:dir r_dir_perms;
++	allow $1 exim_log_t:file { read getattr lock };
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to append
++##	exim log files.
++## </summary>
++## <param name="domain">
++## 	<summary>
++##	Domain allowed to transition.
++## 	</summary>
++## </param>
++#
++interface(`exim_append_log',`
++	gen_require(`
++		type var_log_t, exim_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 exim_log_t:dir r_dir_perms;
++	allow $1 exim_log_t:file { getattr append };
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim log files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_log',`
++	gen_require(`
++		type exim_log_t;
++	')
++
++         manage_dir_perms($1,exim_log_t,exim_log_t)
++         manage_file_perms($1,exim_log_t,exim_log_t)
++         manage_lnk_file_perms($1,exim_log_t,exim_log_t)
++')
++
++########################################
++## <summary>
++##	Search exim spool directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_search_spool',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:dir search_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Read exim spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_read_spool_files',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:file r_file_perms;
++	allow $1 exim_spool_t:dir list_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	exim spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_spool_files',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++	allow $1 exim_spool_t:file manage_file_perms;
++	allow $1 exim_spool_t:dir rw_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Allow domain to manage exim spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`exim_manage_spool',`
++	gen_require(`
++		type exim_spool_t;
++	')
++
++         manage_dir_perms($1,exim_spool_t,exim_spool_t)
++         manage_file_perms($1,exim_spool_t,exim_spool_t)
++         manage_lnk_file_perms($1,exim_spool_t,exim_spool_t)
++')
++
++
++########################################
++## <summary>
++##	All of the rules required to administrate an exim environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed to manage the exim domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the dmidecode domain to use.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`exim_admin',`
++	gen_require(`
++		type exim_t;
++	')
++
++	allow $1 exim_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, exim_t, exim_t)
++	        
++
++	# Allow $1 to restart the apache service
++	exim_script_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 exim_script_exec_t system_r;
++	allow $2 system_r;
++
++	exim_manage_tmp($1)
++
++	exim_manage_var_run($1)
++
++	exim_manage_log($1)
++
++	exim_manage_spool($1)
++
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-2.6.4/policy/modules/services/exim.te
+--- nsaserefpolicy/policy/modules/services/exim.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.6.4/policy/modules/services/exim.te	2007-09-13 12:59:21.000000000 -0400
+@@ -0,0 +1,108 @@
++policy_module(exim,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type exim_t;
++type exim_exec_t;
++domain_type(exim_t)
++init_daemon_domain(exim_t, exim_exec_t)
++
++type exim_script_exec_t;
++init_script_type(exim_script_exec_t)
++
++type exim_tmp_t;
++files_tmp_file(exim_tmp_t)
++
++type exim_var_run_t;
++files_pid_file(exim_var_run_t)
++
++type exim_log_t;
++logging_log_file(exim_log_t)
++
++type exim_spool_t;
++files_type(exim_spool_t)
++
++########################################
++#
++# exim local policy
++#
++
++allow exim_t self:capability { dac_override dac_read_search setuid setgid };
++
++## internal communication is often done using fifo and unix sockets.
++allow exim_t self:fifo_file rw_file_perms;
++allow exim_t self:unix_stream_socket create_stream_socket_perms;
++
++allow exim_t exim_tmp_t:file manage_file_perms;
++allow exim_t exim_tmp_t:dir create_dir_perms;
++files_tmp_filetrans(exim_t,exim_tmp_t, { file dir })
++
++allow exim_t exim_var_run_t:file manage_file_perms;
++allow exim_t exim_var_run_t:dir manage_dir_perms;
++files_pid_filetrans(exim_t,exim_var_run_t, { file dir })
++
++allow exim_t exim_log_t:file manage_file_perms;
++allow exim_t exim_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(exim_t,exim_log_t,{ file dir })
++
++allow exim_t exim_spool_t:dir manage_dir_perms;
++allow exim_t exim_spool_t:file manage_file_perms;
++allow exim_t exim_spool_t:sock_file create_file_perms;
++files_spool_filetrans(exim_t,exim_spool_t, { file dir sock_file })
++
++auth_use_nsswitch(exim_t)
++
++can_exec(exim_t,exim_exec_t)
++
++# Init script handling
++domain_use_interactive_fds(exim_t)
++
++files_read_etc_files(exim_t)
++
++sysnet_dns_name_resolve(exim_t)
++corenet_all_recvfrom_unlabeled(exim_t)
++
++allow exim_t self:tcp_socket create_stream_socket_perms;
++corenet_tcp_sendrecv_all_if(exim_t)
++corenet_tcp_sendrecv_all_nodes(exim_t)
++corenet_tcp_sendrecv_all_ports(exim_t)
++corenet_tcp_bind_all_nodes(exim_t)
++corenet_tcp_bind_smtp_port(exim_t)
++corenet_tcp_bind_amavisd_send_port(exim_t)
++corenet_tcp_connect_auth_port(exim_t)
++corenet_tcp_connect_inetd_child_port(exim_t)
++
++corecmd_search_bin(exim_t)
++
++libs_use_ld_so(exim_t)
++libs_use_shared_libs(exim_t)
++logging_send_syslog_msg(exim_t)
++
++miscfiles_read_localization(exim_t)
++
++kernel_read_kernel_sysctls(exim_t)
++
++mta_mailclient(exim_exec_t)
++mta_read_aliases(exim_t)
++mta_rw_spool(exim_t)
++
++userdom_dontaudit_search_sysadm_home_dirs(exim_t)
++userdom_dontaudit_search_generic_user_home_dirs(exim_t)
++
++bool exim_read_user_files false;
++bool exim_manage_user_files false;
++
++if (exim_read_user_files) {
++   userdom_read_unpriv_users_home_content_files(exim_t)
++   userdom_read_unpriv_users_tmp_files(exim_t)
++}
++
++if (exim_manage_user_files) {
++   userdom_manage_unpriv_users_home_content_dirs(exim_t)
++   userdom_read_unpriv_users_tmp_files(exim_t)
++   userdom_write_unpriv_users_tmp_files(exim_t)
++}
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/ftp.te	2007-08-07 09:42:35.000000000 -0400
@@ -5387,7 +5959,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.6.4/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/hal.te	2007-09-21 14:56:10.000000000 -0400
 @@ -61,8 +61,6 @@
  # For backwards compatibility with older kernels
  allow hald_t self:netlink_socket create_socket_perms;
@@ -5450,6 +6022,15 @@
  dev_setattr_sound_dev(hald_acl_t)
  dev_setattr_generic_usb_dev(hald_acl_t)
  dev_setattr_usbfs_files(hald_acl_t)
+@@ -341,6 +349,8 @@
+ 
+ files_read_usr_files(hald_mac_t)
+ 
++kernel_read_system_state(hald_mac_t)
++
+ libs_use_ld_so(hald_mac_t)
+ libs_use_shared_libs(hald_mac_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.6.4/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-05-07 14:50:57.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/inetd.te	2007-08-07 09:42:35.000000000 -0400
@@ -5889,7 +6470,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.6.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-08-22 09:45:09.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/mta.if	2007-09-13 13:07:23.000000000 -0400
 @@ -226,6 +226,15 @@
  	tunable_policy(`use_samba_home_dirs',`
  		fs_manage_cifs_files($1_mail_t)
@@ -5906,7 +6487,33 @@
  	')
  
  	optional_policy(`
-@@ -394,6 +403,7 @@
+@@ -316,6 +325,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Make the specified type usable for a mta_send_mail.
++## </summary>
++## <param name="type">
++##	<summary>
++##	Type to be used as a mail client.
++##	</summary>
++## </param>
++#
++interface(`mta_mailclient',`
++	gen_require(`
++		attribute mailclient_exec_type;
++	')
++
++	typeattribute $1 mailclient_exec_type;
++')
++
++
++########################################
++## <summary>
+ ##	Modified mailserver interface for
+ ##	sendmail daemon use.
+ ## </summary>
+@@ -394,6 +422,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1,mail_spool_t,mail_spool_t)
  	read_files_pattern($1,mail_spool_t,mail_spool_t)
@@ -5914,7 +6521,23 @@
  	create_lnk_files_pattern($1,mail_spool_t,mail_spool_t)
  	read_lnk_files_pattern($1,mail_spool_t,mail_spool_t)
  
-@@ -847,6 +857,25 @@
+@@ -449,11 +478,12 @@
+ interface(`mta_send_mail',`
+ 	gen_require(`
+ 		attribute mta_user_agent;
+-		type system_mail_t, sendmail_exec_t;
++		type system_mail_t;
++		attribute mailclient_exec_type;
+ 	')
+ 
+-	allow $1 sendmail_exec_t:lnk_file read_lnk_file_perms;
+-	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
++	allow $1 mailclient_exec_type:lnk_file read_lnk_file_perms;
++	domain_auto_trans($1, mailclient_exec_type, system_mail_t)
+ 
+ 	allow $1 system_mail_t:fd use;
+ 	allow system_mail_t $1:fd use;
+@@ -847,6 +877,25 @@
  	manage_files_pattern($1,mqueue_spool_t,mqueue_spool_t)
  ')
  
@@ -5942,16 +6565,34 @@
  ##	Read sendmail binary.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.6.4/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-08-07 09:42:35.000000000 -0400
-@@ -27,6 +27,7 @@
++++ serefpolicy-2.6.4/policy/modules/services/mta.te	2007-09-13 13:02:46.000000000 -0400
+@@ -6,6 +6,7 @@
+ # Declarations
+ #
+ 
++attribute mailclient_exec_type;
+ attribute mta_user_agent;
+ attribute mailserver_delivery;
+ attribute mailserver_domain;
+@@ -26,7 +27,8 @@
+ files_type(mail_spool_t)
  
  type sendmail_exec_t;
- files_type(sendmail_exec_t)
+-files_type(sendmail_exec_t)
 +application_executable_file(sendmail_exec_t)
++mta_mailclient(sendmail_exec_t)
  
  mta_base_mail_template(system)
  role system_r types system_mail_t;
-@@ -91,12 +92,14 @@
+@@ -52,6 +54,7 @@
+ kernel_read_system_state(system_mail_t)
+ kernel_read_network_state(system_mail_t)
+ 
++dev_read_sysfs(system_mail_t)
+ dev_read_rand(system_mail_t)
+ dev_read_urand(system_mail_t)
+ 
+@@ -91,12 +94,14 @@
  optional_policy(`
  	apache_read_squirrelmail_data(system_mail_t)
  	apache_append_squirrelmail_data(system_mail_t)
@@ -5966,7 +6607,7 @@
  ')
  
  optional_policy(`
-@@ -109,6 +112,7 @@
+@@ -109,6 +114,7 @@
  
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
@@ -7902,7 +8543,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-11 09:24:04.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-18 08:18:51.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -8119,7 +8760,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-11 09:56:07.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-18 08:17:55.000000000 -0400
 @@ -16,6 +16,14 @@
  
  ## <desc>
@@ -8205,7 +8846,7 @@
  ########################################
  #
  # smbd Local policy
-@@ -191,18 +222,16 @@
+@@ -191,20 +222,16 @@
  allow smbd_t self:msgq create_msgq_perms;
  allow smbd_t self:sem create_sem_perms;
  allow smbd_t self:shm create_shm_perms;
@@ -8222,12 +8863,14 @@
 -create_dirs_pattern(smbd_t,samba_log_t,samba_log_t)
 -create_files_pattern(smbd_t,samba_log_t,samba_log_t)
 -append_files_pattern(smbd_t,samba_log_t,samba_log_t)
+-allow smbd_t samba_log_t:dir setattr;
+-dontaudit smbd_t samba_log_t:dir remove_name;
 +manage_dirs_pattern(smbd_t,samba_log_t,samba_log_t)
 +manage_files_pattern(smbd_t,samba_log_t,samba_log_t)
- allow smbd_t samba_log_t:dir setattr;
- dontaudit smbd_t samba_log_t:dir remove_name;
  
-@@ -231,7 +260,8 @@
+ allow smbd_t samba_net_tmp_t:file getattr;
+ 
+@@ -231,7 +258,8 @@
  manage_sock_files_pattern(smbd_t,smbd_var_run_t,smbd_var_run_t)
  files_pid_filetrans(smbd_t,smbd_var_run_t,file)
  
@@ -8237,7 +8880,7 @@
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -241,6 +271,9 @@
+@@ -241,6 +269,9 @@
  kernel_read_software_raid_state(smbd_t)
  kernel_read_system_state(smbd_t)
  
@@ -8247,7 +8890,7 @@
  corenet_tcp_sendrecv_all_if(smbd_t)
  corenet_udp_sendrecv_all_if(smbd_t)
  corenet_raw_sendrecv_all_if(smbd_t)
-@@ -265,11 +298,14 @@
+@@ -265,11 +296,14 @@
  fs_get_xattr_fs_quotas(smbd_t)
  fs_search_auto_mountpoints(smbd_t)
  fs_getattr_rpc_dirs(smbd_t)
@@ -8262,7 +8905,7 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -290,12 +326,16 @@
+@@ -290,12 +324,16 @@
  miscfiles_read_localization(smbd_t)
  miscfiles_read_public_files(smbd_t)
  
@@ -8281,7 +8924,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -319,6 +359,14 @@
+@@ -319,6 +357,14 @@
  ')
  
  optional_policy(`
@@ -8296,7 +8939,7 @@
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
  ')
-@@ -339,6 +387,23 @@
+@@ -339,6 +385,23 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -8320,7 +8963,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -352,7 +417,7 @@
+@@ -352,7 +415,7 @@
  allow nmbd_t self:msgq create_msgq_perms;
  allow nmbd_t self:sem create_sem_perms;
  allow nmbd_t self:shm create_shm_perms;
@@ -8329,21 +8972,21 @@
  allow nmbd_t self:tcp_socket create_stream_socket_perms;
  allow nmbd_t self:udp_socket create_socket_perms;
  allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
-@@ -362,9 +427,12 @@
+@@ -362,9 +425,11 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
 +files_list_var_lib(nmbd_t)
++
++manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
++manage_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  
 -create_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
-+manage_dirs_pattern(nmbd_t,samba_log_t,samba_log_t)
- append_files_pattern(nmbd_t,samba_log_t,samba_log_t)
-+allow nmbd_t samba_log_t:file unlink;
-+
+-append_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -373,6 +441,8 @@
+@@ -373,6 +438,8 @@
  
  allow nmbd_t smbd_var_run_t:dir rw_dir_perms;
  
@@ -8352,7 +8995,7 @@
  kernel_getattr_core_if(nmbd_t)
  kernel_getattr_message_if(nmbd_t)
  kernel_read_kernel_sysctls(nmbd_t)
-@@ -391,6 +461,7 @@
+@@ -391,6 +458,7 @@
  corenet_udp_bind_nmbd_port(nmbd_t)
  corenet_sendrecv_nmbd_server_packets(nmbd_t)
  corenet_sendrecv_nmbd_client_packets(nmbd_t)
@@ -8360,7 +9003,7 @@
  
  dev_read_sysfs(nmbd_t)
  dev_getattr_mtrr_dev(nmbd_t)
-@@ -402,6 +473,7 @@
+@@ -402,6 +470,7 @@
  
  files_read_usr_files(nmbd_t)
  files_read_etc_files(nmbd_t)
@@ -8368,7 +9011,7 @@
  
  libs_use_ld_so(nmbd_t)
  libs_use_shared_libs(nmbd_t)
-@@ -411,8 +483,6 @@
+@@ -411,8 +480,6 @@
  
  miscfiles_read_localization(nmbd_t)
  
@@ -8377,7 +9020,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(nmbd_t)
  userdom_dontaudit_use_unpriv_user_fds(nmbd_t)
  userdom_use_unpriv_users_fds(nmbd_t)
-@@ -457,6 +527,7 @@
+@@ -457,6 +524,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -8385,7 +9028,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -489,6 +560,8 @@
+@@ -489,6 +557,8 @@
  term_list_ptys(smbmount_t)
  term_use_controlling_term(smbmount_t)
  
@@ -8394,7 +9037,7 @@
  corecmd_list_bin(smbmount_t)
  
  files_list_mnt(smbmount_t)
-@@ -508,21 +581,11 @@
+@@ -508,21 +578,11 @@
  
  logging_search_logs(smbmount_t)
  
@@ -8417,7 +9060,7 @@
  ')
  
  ########################################
-@@ -530,22 +593,30 @@
+@@ -530,22 +590,30 @@
  # SWAT Local policy
  #
  
@@ -8454,7 +9097,7 @@
  
  allow swat_t smbd_t:process signull;
  
-@@ -558,7 +629,11 @@
+@@ -558,7 +626,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -8467,7 +9110,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -582,23 +657,24 @@
+@@ -582,23 +654,24 @@
  
  dev_read_urand(swat_t)
  
@@ -8494,7 +9137,7 @@
  optional_policy(`
  	cups_read_rw_config(swat_t)
  	cups_stream_connect(swat_t)
-@@ -612,32 +688,30 @@
+@@ -612,32 +685,30 @@
  	kerberos_use(swat_t)
  ')
  
@@ -8534,7 +9177,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +719,8 @@
+@@ -645,6 +716,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -8543,7 +9186,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +758,9 @@
+@@ -682,7 +755,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -8553,7 +9196,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +773,6 @@
+@@ -695,9 +770,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -8563,7 +9206,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +788,6 @@
+@@ -713,10 +785,6 @@
  ')
  
  optional_policy(`
@@ -8574,7 +9217,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +807,7 @@
+@@ -736,6 +804,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -8582,12 +9225,12 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +835,60 @@
+@@ -763,4 +832,64 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
 +	squid_rw_stream_sockets(winbind_helper_t)
- ')
++')
 +
 +########################################
 +#
@@ -8643,6 +9286,10 @@
 +allow winbind_t smbcontrol_t:process signal;
 +
 +allow smbcontrol_t nmbd_var_run_t:file { read lock };
++ifdef(`targeted_policy',`
++	term_use_generic_ptys(smbcontrol_t)
++	term_use_unallocated_ttys(smbcontrol_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/sasl.te	2007-08-07 09:42:35.000000000 -0400
@@ -10086,8 +10733,8 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-2.6.4/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-08-07 09:42:35.000000000 -0400
-@@ -0,0 +1,47 @@
++++ serefpolicy-2.6.4/policy/modules/system/fusermount.te	2007-09-13 12:51:28.000000000 -0400
+@@ -0,0 +1,48 @@
 +policy_module(fusermount,1.0.0)
 +
 +########################################
@@ -10123,6 +10770,7 @@
 +
 +storage_raw_read_fixed_disk(fusermount_t)
 +storage_raw_write_fixed_disk(fusermount_t)
++storage_rw_fuse(fusermount_t)
 +
 +optional_policy(`
 +	hal_write_log(fusermount_t)
@@ -10640,6 +11288,18 @@
 +optional_policy(`
 +	fail2ban_append_log(iptables_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-2.6.4/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te	2007-05-07 14:51:02.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/iscsi.te	2007-09-21 14:52:05.000000000 -0400
+@@ -67,6 +67,8 @@
+ 
+ files_read_etc_files(iscsid_t)
+ 
++kernel_read_system_state(iscsid_t)
++
+ libs_use_ld_so(iscsid_t)
+ libs_use_shared_libs(iscsid_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.6.4/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-05-07 14:51:02.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/system/libraries.fc	2007-08-07 09:42:35.000000000 -0400
@@ -11001,7 +11661,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.6.4/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/logging.te	2007-09-18 09:11:29.000000000 -0400
 @@ -7,10 +7,15 @@
  #
  
@@ -11028,7 +11688,7 @@
  type syslogd_var_run_t;
  files_pid_file(syslogd_var_run_t)
  
-@@ -59,13 +67,18 @@
+@@ -59,19 +67,25 @@
  	init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh)
  ')
  
@@ -11050,7 +11710,14 @@
  
  read_files_pattern(auditctl_t,auditd_etc_t,auditd_etc_t)
  allow auditctl_t auditd_etc_t:dir list_dir_perms;
-@@ -91,6 +104,7 @@
+ 
+ # Needed for adding watches
+ files_getattr_all_dirs(auditctl_t)
++files_getattr_all_files(auditctl_t)
+ files_read_etc_files(auditctl_t)
+ 
+ kernel_read_kernel_sysctls(auditctl_t)
+@@ -91,6 +105,7 @@
  
  locallogin_dontaudit_use_fds(auditctl_t)
  
@@ -11058,7 +11725,7 @@
  logging_send_syslog_msg(auditctl_t)
  
  ifdef(`targeted_policy',`
-@@ -103,12 +117,11 @@
+@@ -103,12 +118,11 @@
  # Auditd local policy
  #
  
@@ -11072,7 +11739,7 @@
  allow auditd_t self:fifo_file rw_file_perms;
  
  allow auditd_t auditd_etc_t:dir list_dir_perms;
-@@ -146,6 +159,7 @@
+@@ -146,6 +160,7 @@
  
  init_telinit(auditd_t)
  
@@ -11080,7 +11747,7 @@
  logging_send_syslog_msg(auditd_t)
  
  libs_use_ld_so(auditd_t)
-@@ -265,8 +279,14 @@
+@@ -265,8 +280,14 @@
  allow syslogd_t devlog_t:sock_file manage_sock_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
  
@@ -11095,7 +11762,7 @@
  # Allow access for syslog-ng
  allow syslogd_t var_log_t:dir { create setattr };
  
-@@ -331,6 +351,7 @@
+@@ -331,6 +352,7 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -11268,7 +11935,7 @@
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/mount.te	2007-09-13 12:47:13.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -11323,7 +11990,15 @@
  
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
-@@ -103,6 +117,8 @@
+@@ -65,6 +79,7 @@
+ storage_raw_write_fixed_disk(mount_t)
+ storage_raw_read_removable_device(mount_t)
+ storage_raw_write_removable_device(mount_t)
++storage_rw_fuse(mount_t)
+ 
+ fs_getattr_xattr_fs(mount_t)
+ fs_getattr_cifs(mount_t)
+@@ -103,6 +118,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -11332,7 +12007,7 @@
  
  libs_use_ld_so(mount_t)
  libs_use_shared_libs(mount_t)
-@@ -130,10 +146,15 @@
+@@ -130,10 +147,15 @@
  ')
  
  ifdef(`targeted_policy',`
@@ -11349,7 +12024,7 @@
  	')
  ')
  
-@@ -162,13 +183,8 @@
+@@ -162,13 +184,8 @@
  
  	fs_search_rpc(mount_t)
  
@@ -11363,7 +12038,7 @@
  ')
  
  optional_policy(`
-@@ -192,9 +208,6 @@
+@@ -192,9 +209,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -11373,7 +12048,7 @@
  
  ########################################
  #
-@@ -204,4 +217,30 @@
+@@ -204,4 +218,30 @@
  ifdef(`targeted_policy',`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -12047,7 +12722,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-18 08:18:22.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -12092,7 +12767,7 @@
  		')
  
  		optional_policy(`
-@@ -153,6 +161,8 @@
+@@ -153,11 +161,14 @@
  
  	optional_policy(`
  		rpm_domtrans(unconfined_t)
@@ -12101,7 +12776,13 @@
  	')
  
  	optional_policy(`
-@@ -192,6 +202,9 @@
+ 		samba_domtrans_net(unconfined_t)
+ 		samba_domtrans_winbind_helper(unconfined_t)
++		samba_domtrans_smbcontrol(unconfined_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -192,6 +203,9 @@
  	optional_policy(`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
@@ -12111,7 +12792,7 @@
  ')
  
  ########################################
-@@ -200,10 +213,18 @@
+@@ -200,10 +214,18 @@
  #
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- selinux-policy.spec	10 Sep 2007 18:25:11 -0000	1.493
+++ selinux-policy.spec	21 Sep 2007 20:22:15 -0000	1.494
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
+- Make /dev/fuse a fuse_device_t
+
 * Mon Sep 10 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-42
 - Allow modprobe to setsched on kernel
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:29:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 21 Sep 2007 16:29:07 -0400
Subject: rpms/gnome-panel/devel applet-error.patch, NONE,
	1.1 gnome-panel.spec, 1.223, 1.224
Message-ID: <200709212029.l8LKT76u003797@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3774

Modified Files:
	gnome-panel.spec 
Added Files:
	applet-error.patch 
Log Message:
avoid error dialog if tomboy is not installed


applet-error.patch:

--- NEW FILE applet-error.patch ---
diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c
--- gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error	2007-09-21 16:24:28.000000000 -0400
+++ gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c	2007-09-21 16:24:32.000000000 -0400
@@ -1253,6 +1253,21 @@ panel_applet_frame_event_listener (Bonob
 		panel_applet_frame_set_size_hints_from_any (frame, any);
 }
 
+static gboolean
+in_default_panel_config (const gchar *id)
+{
+	gchar *dir;
+	gboolean result;
+
+	dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
+	result = gconf_client_dir_exists (panel_gconf_get_client (),
+                                          dir, 
+                                          NULL);
+        g_free (dir);
+
+	return result;
+}
+
 static void
 panel_applet_frame_activated (Bonobo_Unknown     object,
 			      CORBA_Environment *ev,
@@ -1275,8 +1290,10 @@ panel_applet_frame_activated (Bonobo_Unk
 	if (BONOBO_EX (ev) || object == CORBA_OBJECT_NIL) {
 		error = bonobo_exception_get_text (ev);
 		g_warning (G_STRLOC ": failed to load applet %s:\n%s",
-			   frame->priv->iid, error);
-		panel_applet_frame_loading_failed (frame, frame_act->id);
+		 	  frame->priv->iid, error);
+		if (!in_default_panel_config (frame_act->id)) {
+			panel_applet_frame_loading_failed (frame, frame_act->id);
+		}
 		g_free (frame_act->id);
 		g_free (frame_act);
 		g_free (error);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- gnome-panel.spec	18 Sep 2007 16:47:30 -0000	1.223
+++ gnome-panel.spec	21 Sep 2007 20:28:33 -0000	1.224
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.20.0.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -39,12 +39,6 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
-Requires: fast-user-switch-applet
-
-# Mono isn't available for s390 or ppc64 apparently
-%ifnarch s390 s390x ppc64
-Requires: tomboy
-%endif
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -103,6 +97,11 @@
 Patch9: desktop-file-monitoring.patch
 Patch10: preferred-apps.patch
 
+# don't pop up an error dialog if an applet from the 
+# default configuration is missing; we don't want to
+# add a hard dependency on e.g. tomboy 
+Patch11: applet-error.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -138,6 +137,7 @@
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
+%patch11 -p1 -b .applet-error
 
 . %{SOURCE4}
 
@@ -316,6 +316,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-2
+- Don't pop up an error if an applet from the default
+  configuration is missing  
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
 - Update to 2.20.0.1
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:32:44 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:32:44 -0400
Subject: rpms/maven-jxr/devel maven-jxr.spec,1.3,1.4
Message-ID: <200709212032.l8LKWiQj004051@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-jxr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3921

Modified Files:
	maven-jxr.spec 
Log Message:

- Build without maven
- ExcludeArch ppc64




Index: maven-jxr.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-jxr/devel/maven-jxr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-jxr.spec	31 Aug 2007 21:50:10 -0000	1.3
+++ maven-jxr.spec	21 Sep 2007 20:32:11 -0000	1.4
@@ -35,14 +35,12 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
 Name:           maven-jxr
 Version:        1.0
-Release:        2jpp.3%{?dist}
+Release:        2jpp.4%{?dist}
 Epoch:          0
 Summary:        Source cross referencing tool
 License:        Apache Software License
@@ -60,6 +58,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:    ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -209,6 +209,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-2jpp.4
+- Build without maven
+- ExcludeArch ppc64
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-2jpp.3
 - Build without maven (for initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:34:38 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:34:38 -0400
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.5,1.6
Message-ID: <200709212034.l8LKYcvI004167@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-doxia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4123

Modified Files:
	maven-doxia.spec 
Log Message:

- Build with maven
- ExcludeArch ppc64




Index: maven-doxia.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven-doxia.spec	1 Sep 2007 18:07:33 -0000	1.5
+++ maven-doxia.spec	21 Sep 2007 20:34:06 -0000	1.6
@@ -34,8 +34,6 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.1.a7.3jpp.4%{?dist}
+Release:        0.1.a7.3jpp.5%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        Apache Software License
@@ -70,6 +68,8 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
+%else
+ExcludeArch:   ppc64
 %endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -278,6 +278,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7.3jpp.5
+- Build with maven
+- ExcludeArch ppc64
+
 * Sat Sep 01 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a7.3jpp.4
 - Rebuild without maven (fpr initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:36:33 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:36:33 -0400
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.3,1.4
Message-ID: <200709212036.l8LKaXia004292@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-surefire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4248

Modified Files:
	maven-surefire.spec 
Log Message:

- Build with maven
- ExcludeArch ppc64





Index: maven-surefire.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-surefire.spec	31 Aug 2007 21:46:55 -0000	1.3
+++ maven-surefire.spec	21 Sep 2007 20:36:01 -0000	1.4
@@ -34,8 +34,6 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define _without_maven 1
-
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
@@ -43,7 +41,7 @@
 
 Name:           maven-surefire
 Version:        1.5.3
-Release:        2jpp.3%{?dist}
+Release:        2jpp.4%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -70,6 +68,9 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
+ExcludeArch:    ppc64
+%endif
+
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
 BuildRequires:  classworlds
@@ -311,6 +312,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.5.3-2jpp.4
+- Build with maven
+- ExcludeArch ppc64
+
 * Fri Aug 31 2007 Deepak Bhole <dbhole at redhat.com> 0:1.5.3-2jpp.3
 - Build without maven (for initial ppc build)
 



From fedora-extras-commits at redhat.com  Fri Sep 21 20:37:52 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 16:37:52 -0400
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.4,1.5
Message-ID: <200709212037.l8LKbqu9004449@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/maven-surefire/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4384

Modified Files:
	maven-surefire.spec 
Log Message:


Fixed typo in spec file




Index: maven-surefire.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-surefire.spec	21 Sep 2007 20:36:01 -0000	1.4
+++ maven-surefire.spec	21 Sep 2007 20:37:20 -0000	1.5
@@ -67,7 +67,7 @@
 
 %if ! %{gcj_support}
 BuildArch:      noarch
-%endif
+%else
 ExcludeArch:    ppc64
 %endif
 



From fedora-extras-commits at redhat.com  Fri Sep 21 21:18:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:18:54 -0700
Subject: [pkgdb] abyssinica-fonts was added for bernie
Message-ID: <200709212118.l8LLItnT007524@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package abyssinica-fonts with summary SIL Abyssinica fonts
Kevin Fenzi (kevin) has approved Package abyssinica-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for abyssinica-fonts with an owner of bernie
Kevin Fenzi (kevin) has approved abyssinica-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora, 7) updated by kevin
Message-ID: <200709212119.l8LLJ9bm007597@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora 7) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora, devel) updated by kevin
Message-ID: <200709212119.l8LLJ9gR007610@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora devel) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:19:08 -0700
Subject: [pkgdb] abyssinica-fonts (Fedora OLPC, 2) updated by kevin
Message-ID: <200709212119.l8LLJAW5007625@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora OLPC 2 branch for abyssinica-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on abyssinica-fonts (Fedora OLPC 2)
Kevin Fenzi (kevin) approved watchbugzilla on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved watchcommits on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved commit on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved build on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved approveacls on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) approved checkout on abyssinica-fonts (Fedora OLPC 2) for johnp
Kevin Fenzi (kevin) Approved cvsextras for commit access on abyssinica-fonts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:28 -0400
Subject: rpms/abyssinica-fonts - New directory
Message-ID: <200709212119.l8LLJS03011877@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts

Log Message:
Directory /cvs/extras/rpms/abyssinica-fonts added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:31 -0400
Subject: rpms/abyssinica-fonts/devel - New directory
Message-ID: <200709212119.l8LLJVO9011891@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts/devel

Log Message:
Directory /cvs/extras/rpms/abyssinica-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:35 -0400
Subject: rpms/abyssinica-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709212119.l8LLJZV1011917@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module abyssinica-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module abyssinica-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 21:19:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:19:37 -0400
Subject: rpms/abyssinica-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709212119.l8LLJblm011933@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr11842/rpms/abyssinica-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module abyssinica-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: abyssinica-fonts
# $Id: Makefile,v 1.1 2007/09/21 21:19:35 kevin Exp $
NAME := abyssinica-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 fedora-extras-commits at redhat.com  Fri Sep 21 21:21:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:21:26 -0700
Subject: [pkgdb] gsoap was added for matt
Message-ID: <200709212121.l8LLLQuc008240@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package gsoap with summary Generator Tools for Coding SOAP/XML Web Services in C and C++
Kevin Fenzi (kevin) has approved Package gsoap
Kevin Fenzi (kevin) has added a Fedora devel branch for gsoap with an owner of matt
Kevin Fenzi (kevin) has approved gsoap in Fedora devel
Kevin Fenzi (kevin) has approved Package gsoap
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gsoap (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on gsoap (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gsoap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsoap



From fedora-extras-commits at redhat.com  Fri Sep 21 21:21:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:21:27 -0700
Subject: [pkgdb] gsoap (Fedora, devel) updated by kevin
Message-ID: <200709212121.l8LLLRfi008252@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on gsoap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsoap



From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:26 -0400
Subject: rpms/gsoap - New directory
Message-ID: <200709212122.l8LLMQCI012214@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap

Log Message:
Directory /cvs/extras/rpms/gsoap added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:29 -0400
Subject: rpms/gsoap/devel - New directory
Message-ID: <200709212122.l8LLMTJe012229@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap/devel

Log Message:
Directory /cvs/extras/rpms/gsoap/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:32 -0400
Subject: rpms/gsoap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709212122.l8LLMW02012254@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap

Added Files:
	Makefile import.log 
Log Message:
Setup of module gsoap


--- NEW FILE Makefile ---
# Top level Makefile for module gsoap
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 21 21:22:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 17:22:36 -0400
Subject: rpms/gsoap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709212122.l8LLMa82012270@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl12181/rpms/gsoap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gsoap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gsoap
# $Id: Makefile,v 1.1 2007/09/21 21:22:34 kevin Exp $
NAME := gsoap
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 fedora-extras-commits at redhat.com  Fri Sep 21 21:23:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 14:23:26 -0700
Subject: [pkgdb] libid3tag (Fedora EPEL, 5) updated by kevin
Message-ID: <200709212123.l8LLNSnx001440@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for libid3tag
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libid3tag (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libid3tag (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libid3tag (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libid3tag



From fedora-extras-commits at redhat.com  Fri Sep 21 21:27:04 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Fri, 21 Sep 2007 17:27:04 -0400
Subject: rpms/lucene/devel lucene.spec,1.29,1.30
Message-ID: <200709212127.l8LLR4it012609@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12560

Modified Files:
	lucene.spec 
Log Message:

- Disable tests due to random hangs (see FIXME comment above ant call)




Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lucene.spec	20 Sep 2007 22:14:11 -0000	1.29
+++ lucene.spec	21 Sep 2007 21:26:31 -0000	1.30
@@ -34,7 +34,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.9.1
-Release:        1jpp.4%{?dist}
+Release:        1jpp.5%{?dist}
 Epoch:          0
 License:        Apache Software License
 URL:            http://lucene.apache.org/
@@ -129,12 +129,21 @@
 #ln -sf $(build-classpath berkeleydb) .
 #popd
 rm -r contrib/db
+
+#FIXME: Tests freeze randomly. Turning on debug messages shows warnings like:
+
+# [junit] GC Warning: Repeated allocation of very large block (appr. size 512000):
+# [junit] 	May lead to memory leak and poor performance.
+
+# See: http://koji.fedoraproject.org/koji/getfile?taskID=169839&name=build.log
+# for an example
+
 ant -Dbuild.sysclasspath=first \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
   -Djavacc.jar.dir=%{_javadir} \
   -Djavadoc.link=%{_javadocdir}/java \
-  package test
+  package
 #  package test generate-test-reports
 
 mkdir META-INF
@@ -256,6 +265,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 1.9.1-1jpp.5
+- Disable tests due to random hangs (see FIXME comment above ant call)
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.9.1-1jpp.4
 - Rebuild for ppc32 execmem issue and new build-id
 



From fedora-extras-commits at redhat.com  Fri Sep 21 21:28:12 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Fri, 21 Sep 2007 17:28:12 -0400
Subject: fedora-security/audit fc6,1.266,1.267 fc7,1.116,1.117
Message-ID: <200709212128.l8LLSClf012717@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12697

Modified Files:
	fc6 fc7 
Log Message:
elinks



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- fc6	21 Sep 2007 14:29:48 -0000	1.266
+++ fc6	21 Sep 2007 21:28:10 -0000	1.267
@@ -7,6 +7,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC6 as of 20070916
 
+CVE-2007-5034 VULNERABLE (elinks) #297611
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297561
 CVE-2007-4897 VULNERABLE (ekiga, version 2.0.9) really opal 2.2.8 #297561


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc7	21 Sep 2007 14:29:48 -0000	1.116
+++ fc7	21 Sep 2007 21:28:10 -0000	1.117
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+CVE-2007-5034 VULNERABLE (elinks) #297981
 GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081



From fedora-extras-commits at redhat.com  Fri Sep 21 22:41:53 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Fri, 21 Sep 2007 15:41:53 -0700
Subject: [pkgdb] telepathy-mission-control: pgordon has requested commit
Message-ID: <200709212241.l8LMfrxi019393@app3.fedora.phx.redhat.com>

Peter Gordon (pgordon) has requested the commit acl on telepathy-mission-control (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control



From fedora-extras-commits at redhat.com  Fri Sep 21 22:41:55 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (peter))
Date: Fri, 21 Sep 2007 15:41:55 -0700
Subject: [pkgdb] telepathy-mission-control: pgordon has requested commit
Message-ID: <200709212241.l8LMftgb019410@app3.fedora.phx.redhat.com>

Peter Gordon (pgordon) has requested the commit acl on telepathy-mission-control (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control



From fedora-extras-commits at redhat.com  Fri Sep 21 23:17:05 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 21 Sep 2007 19:17:05 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.7.bz2.sign, NONE, 1.1 .cvsignore, 1.632,
	1.633 kernel-2.6.spec, 1.3344,
	1.3345 linux-2.6-utrace-regset.patch, 1.4, 1.5 sources, 1.595,
	1.596 upstream, 1.519, 1.520 patch-2.6.22.6.bz2.sign, 1.1, NONE
Message-ID: <200709212317.l8LNH5np027008@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26978

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-utrace-regset.patch 
	sources upstream 
Added Files:
	patch-2.6.22.7.bz2.sign 
Removed Files:
	patch-2.6.22.6.bz2.sign 
Log Message:
* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.7



--- NEW FILE patch-2.6.22.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9E0SyGugalF9Dw4RAsibAJwJAmDh3/CV0nHxGrjGzkDP0DT3uwCfTZ9/
ry5zvDQvAlyBxWyN4ivs9Sw=
=4ylv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- .cvsignore	13 Sep 2007 22:21:49 -0000	1.632
+++ .cvsignore	21 Sep 2007 23:16:31 -0000	1.633
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.6.bz2
+patch-2.6.22.7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3344
retrieving revision 1.3345
diff -u -r1.3344 -r1.3345
--- kernel-2.6.spec	21 Sep 2007 18:56:24 -0000	1.3344
+++ kernel-2.6.spec	21 Sep 2007 23:16:31 -0000	1.3345
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2349,6 +2349,9 @@
 
 %changelog
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.7
+
+* Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Build dcdbas and dell_rbu modules on i586 (#216304)
 
 * Thu Sep 20 2007 Dave Jones <davej at redhat.com>

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-regset.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset.patch	5 Sep 2007 16:18:54 -0000	1.4
+++ linux-2.6-utrace-regset.patch	21 Sep 2007 23:16:31 -0000	1.5
@@ -2193,8 +2193,8 @@
  /*
   * does not yet catch signals sent when the child dies.
 @@ -228,52 +232,61 @@ static int putreg(struct task_struct *ch
- 	if (test_tsk_thread_flag(child, TIF_IA32))
- 		value &= 0xffffffff;
+ 	unsigned long tmp; 
+ 	
  	switch (regno) {
 -		case offsetof(struct user_regs_struct,fs):
 -			if (value && (value & 3) != 3)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- sources	13 Sep 2007 22:21:49 -0000	1.595
+++ sources	21 Sep 2007 23:16:31 -0000	1.596
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-f2948e364ab3e4736b9e34f02173472f  patch-2.6.22.6.bz2
+11d56c9918810694f32a172ba4788a83  patch-2.6.22.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- upstream	13 Sep 2007 22:21:49 -0000	1.519
+++ upstream	21 Sep 2007 23:16:31 -0000	1.520
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.6.bz2
+patch-2.6.22.7.bz2


--- patch-2.6.22.6.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 21 23:46:50 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 21 Sep 2007 19:46:50 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.67,
	1.68 selinux-policy.spec, 1.529, 1.530
Message-ID: <200709212346.l8LNkotJ027841@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27818

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
- Allow also to search var_lib
- New context for dbus launcher 


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- policy-20070703.patch	21 Sep 2007 20:21:36 -0000	1.67
+++ policy-20070703.patch	21 Sep 2007 23:46:17 -0000	1.68
@@ -314,8 +314,8 @@
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-19 10:54:14.000000000 -0400
-@@ -14,25 +14,35 @@
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-21 19:08:24.000000000 -0400
+@@ -14,25 +14,36 @@
  type alsa_etc_rw_t;
  files_type(alsa_etc_rw_t)
  
@@ -342,6 +342,7 @@
  manage_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  manage_lnk_files_pattern(alsa_t,alsa_etc_rw_t,alsa_etc_rw_t)
  
++files_search_var_lib(alsa_t)
 +manage_dirs_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
 +manage_files_pattern(alsa_t,alsa_var_lib_t,alsa_var_lib_t)
 +
@@ -354,7 +355,7 @@
  
  libs_use_ld_so(alsa_t)
  libs_use_shared_libs(alsa_t)
-@@ -43,7 +53,13 @@
+@@ -43,7 +54,13 @@
  
  userdom_manage_unpriv_user_semaphores(alsa_t)
  userdom_manage_unpriv_user_shared_mem(alsa_t)
@@ -2838,7 +2839,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.8/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if	2007-09-21 19:16:08.000000000 -0400
 @@ -271,45 +271,6 @@
  
  ########################################
@@ -9977,7 +9978,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-20 15:44:32.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-21 19:21:31.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9992,11 +9993,12 @@
  ## Allow xdm logins as sysadm
  ## </p>
  ## </desc>
-@@ -132,15 +139,19 @@
+@@ -132,15 +139,20 @@
  manage_fifo_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t)
  manage_sock_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t)
  fs_tmpfs_filetrans(xdm_t,xdm_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
 +fs_rw_tmpfs_files(xdm_xserver_t)
++fs_getattr_all_fs(xdm_t)
  
  manage_dirs_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t)	
  manage_files_pattern(xdm_t,xdm_var_lib_t,xdm_var_lib_t)
@@ -10013,7 +10015,7 @@
  
  allow xdm_t xdm_xserver_t:process signal;
  allow xdm_t xdm_xserver_t:unix_stream_socket connectto;
-@@ -185,6 +196,7 @@
+@@ -185,6 +197,7 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_all_nodes(xdm_t)
  corenet_udp_bind_all_nodes(xdm_t)
@@ -10021,7 +10023,7 @@
  corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
-@@ -246,6 +258,7 @@
+@@ -246,6 +259,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -10029,7 +10031,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +270,7 @@
+@@ -257,6 +271,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -10037,7 +10039,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -268,9 +282,14 @@
+@@ -268,9 +283,14 @@
  userdom_create_all_users_keys(xdm_t)
  # for .dmrc
  userdom_read_unpriv_users_home_content_files(xdm_t)
@@ -10052,7 +10054,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +325,11 @@
+@@ -306,6 +326,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -10064,7 +10066,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +372,8 @@
+@@ -348,12 +373,8 @@
  ')
  
  optional_policy(`
@@ -10078,7 +10080,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +405,7 @@
+@@ -385,7 +406,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -10087,7 +10089,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +445,10 @@
+@@ -425,6 +446,10 @@
  ')
  
  optional_policy(`
@@ -10098,7 +10100,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +458,19 @@
+@@ -434,47 +459,20 @@
  ')
  
  optional_policy(`
@@ -10113,6 +10115,7 @@
 +optional_policy(`
 +	unconfined_rw_shm(xdm_xserver_t)
 +	unconfined_execmem_rw_shm(xdm_xserver_t)
++	unconfined_rw_tmpfs_files(xdm_xserver_t)
 +')
  
 -	ifdef(`distro_rhel4',`
@@ -10188,7 +10191,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.8/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc	2007-09-21 16:38:32.000000000 -0400
 @@ -14,6 +14,7 @@
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
  /sbin/unix_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
@@ -10197,9 +10200,15 @@
  ifdef(`distro_suse', `
  /sbin/unix2_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
  ')
+@@ -40,3 +41,5 @@
+ /var/run/console(/.*)?	 	gen_context(system_u:object_r:pam_var_console_t,s0)
+ 
+ /var/run/sudo(/.*)?		gen_context(system_u:object_r:pam_var_run_t,s0)
++
++/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-20 16:27:52.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-21 19:32:00.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10230,7 +10239,7 @@
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,23 @@
+@@ -176,11 +177,28 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10244,6 +10253,11 @@
 +	files_list_var_lib($1)
 +	manage_files_pattern($1, var_auth_t, var_auth_t)
 +
++	manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
++	manage_files_pattern($1, auth_cache_t, auth_cache_t)
++	manage_sock_files_pattern($1, auth_cache_t, auth_cache_t)
++	files_var_filetrans($1,auth_cache_t,dir)
++
  	# for SSP/ProPolice
  	dev_read_urand($1)
  
@@ -10254,7 +10268,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +209,33 @@
+@@ -196,22 +214,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10289,7 +10303,7 @@
  	')
  ')
  
-@@ -309,9 +333,6 @@
+@@ -309,9 +338,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10299,7 +10313,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +350,7 @@
+@@ -329,6 +355,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10307,7 +10321,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +369,37 @@
+@@ -347,6 +374,37 @@
  
  ########################################
  ## <summary>
@@ -10345,7 +10359,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +748,24 @@
+@@ -695,6 +753,24 @@
  
  ########################################
  ## <summary>
@@ -10370,7 +10384,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1389,9 @@
+@@ -1318,14 +1394,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10385,7 +10399,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1447,163 @@
+@@ -1381,3 +1452,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -10551,7 +10565,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-21 16:37:58.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10566,7 +10580,17 @@
  
  type chkpwd_exec_t;
  application_executable_file(chkpwd_exec_t)
-@@ -67,6 +74,10 @@
+@@ -53,6 +60,9 @@
+ type utempter_exec_t;
+ application_domain(utempter_t,utempter_exec_t)
+ 
++type auth_cache_t;
++logging_log_file(auth_cache_t)
++
+ #
+ # var_auth_t is the type of /var/lib/auth, usually
+ # used for auth data in pam_able
+@@ -67,6 +77,10 @@
  authlogin_common_auth_domain_template(system)
  role system_r types system_chkpwd_t;
  
@@ -10577,7 +10601,7 @@
  ########################################
  #
  # PAM local policy
-@@ -159,6 +170,8 @@
+@@ -159,6 +173,8 @@
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10586,7 +10610,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +249,7 @@
+@@ -236,7 +252,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10595,7 +10619,7 @@
  ')
  
  ########################################
-@@ -302,3 +315,28 @@
+@@ -302,3 +318,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -12977,7 +13001,7 @@
 +/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-21 19:31:25.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -13032,7 +13056,7 @@
  	read_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  	read_lnk_files_pattern($1,{ unconfined_home_dir_t unconfined_home_t },unconfined_home_t)
  ')
-@@ -601,3 +605,149 @@
+@@ -601,3 +605,175 @@
  
  	allow $1 unconfined_tmp_t:file { getattr write append };
  ')
@@ -13182,6 +13206,32 @@
 +
 +	allow $1 unconfined_t:process rlimitinh;
 +')
++
++########################################
++## <summary>
++##	Read/write unconfined tmpfs files.
++## </summary>
++## <desc>
++##	<p>
++##	Read/write unconfined tmpfs files.
++##	</p>
++## </desc>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`unconfined_rw_tmpfs_files',`
++	gen_require(`
++		type unconfined_tmpfs_t;
++	')
++
++	fs_search_tmpfs($1)
++	allow $1 unconfined_tmpfs_t:dir list_dir_perms;
++	rw_files_pattern($1,unconfined_tmpfs_t,unconfined_tmpfs_t)
++	read_lnk_files_pattern($1,unconfined_tmpfs_t,unconfined_tmpfs_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
@@ -13400,7 +13450,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-20 18:02:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-21 19:20:56.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- selinux-policy.spec	21 Sep 2007 20:21:36 -0000	1.529
+++ selinux-policy.spec	21 Sep 2007 23:46:18 -0000	1.530
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
+- Allow also to search var_lib
+- New context for dbus launcher 
+
 * Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-7
 - Allow cupsd_config_t to read/write usb_device_t
 - Support for finger print reader,



From fedora-extras-commits at redhat.com  Fri Sep 21 23:56:56 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 21 Sep 2007 19:56:56 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.166,1.167
Message-ID: <200709212356.l8LNuuoO028024@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28002

Modified Files:
	gnome-screensaver.spec 
Log Message:
spec file fixes



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnome-screensaver.spec	21 Sep 2007 15:59:06 -0000	1.166
+++ gnome-screensaver.spec	21 Sep 2007 23:56:23 -0000	1.167
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -106,6 +106,12 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.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/gnome-screensaver.schemas >/dev/null
+fi
+ 
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -130,6 +136,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 21 2007 Matthisa Clasen <mclasen at redhat.com> - 2.20.0-4
+- Add %%pre scriptlet
+
 * Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
 - hide xscreensaver menu if gnome-screensaver is installed
   (bug 300401)



From fedora-extras-commits at redhat.com  Sat Sep 22 01:20:47 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:20:47 -0400
Subject: rpms/xournal/devel xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220120.l8M1KlHG009505@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9470

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:08:21 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:20:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 01:32:17 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:32:17 -0400
Subject: rpms/xournal/FC-6 xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220132.l8M1WHau009917@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9890

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/FC-6/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:07:31 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:31:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 01:33:29 2007
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Fri, 21 Sep 2007 21:33:29 -0400
Subject: rpms/xournal/F-7 xournal-configure.in-freetype.patch, NONE,
	1.1 xournal.spec, 1.3, 1.4
Message-ID: <200709220133.l8M1XT9E010082@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/xournal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10056

Modified Files:
	xournal.spec 
Added Files:
	xournal-configure.in-freetype.patch 
Log Message:


xournal-configure.in-freetype.patch:

--- NEW FILE xournal-configure.in-freetype.patch ---
--- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
+++ configure.in	2007-09-21 19:12:52.000000000 -0600
@@ -8,11 +8,11 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 AC_OUTPUT([


Index: xournal.spec
===================================================================
RCS file: /cvs/extras/rpms/xournal/F-7/xournal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xournal.spec	21 Sep 2007 18:05:39 -0000	1.3
+++ xournal.spec	22 Sep 2007 01:32:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
@@ -10,11 +10,13 @@
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
+Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= 2.4.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 
@@ -28,7 +30,7 @@
 
 %prep
 %setup -q
-
+%patch
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -99,7 +101,11 @@
 
 
 %changelog
-* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
+* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
+- Added freetype to build requires
+- Created patch to add freetype to configure.in pkgconfig
+
+* Thu Sep 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-1
 - New upstream release
 - Changed source to use name and version variables
 - Updated xournal.desktop to reflect upstream changes



From fedora-extras-commits at redhat.com  Sat Sep 22 02:31:25 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 21 Sep 2007 22:31:25 -0400
Subject: rpms/aiccu/devel aiccu-lsb-initscript.patch, NONE, 1.1 aiccu.spec,
	1.8, 1.9
Message-ID: <200709220231.l8M2VP59020190@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/aiccu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20088

Modified Files:
	aiccu.spec 
Added Files:
	aiccu-lsb-initscript.patch 
Log Message:
add LSB initscript header (BZ#246861)

aiccu-lsb-initscript.patch:

--- NEW FILE aiccu-lsb-initscript.patch ---
--- aiccu/doc/aiccu.init.rpm.orig	2007-09-21 21:15:04.000000000 -0500
+++ aiccu/doc/aiccu.init.rpm	2007-09-21 21:19:19.000000000 -0500
@@ -8,6 +8,20 @@
 # config:  /etc/aiccu.conf
 # chkconfig: - 59 73
 # processname: aiccu
+#
+### BEGIN INIT INFO
+# Provides: aiccu
+# Required-Start: $local_fs $remote_fs $network $time $named
+# Required-Stop: $local_fs $remote_fs $network $time $named
+# Default-Start:
+# Default-Stop:
+# Short-Description: hearbeat daemon for IPv6-in-IPv4 (Proto-41, AYIYA, Heartbeat) tunnels
+# Description:  aiccu automatically gives one IPv6 connectivity
+#   without having to manually configure interfaces etc.
+#   One does need a SixXS account and at least a tunnel. These
+#   can be freely & gratis requested from the SixXS website.
+#   For more information about SixXS check http://www.sixxs.net
+### END INIT INFO
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then
@@ -90,6 +104,9 @@
   reload)
   	restart
 	;;
+  force-reload)
+	restart
+	;;
   status)
   	rhstatus
 	;;


Index: aiccu.spec
===================================================================
RCS file: /cvs/extras/rpms/aiccu/devel/aiccu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aiccu.spec	20 Sep 2007 04:45:15 -0000	1.8
+++ aiccu.spec	22 Sep 2007 02:30:52 -0000	1.9
@@ -9,12 +9,13 @@
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2007.01.15
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   BSD
 Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source:    http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz
+Patch0: aiccu-lsb-initscript.patch
 BuildRequires: gnutls-devel
 Requires:  iproute
 Requires(post): chkconfig
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 # fix executable permissions on non-executable content
 # so debuginfo can pick them up properly
 find . -type f -not -name rules -and -not -name *init* -exec chmod a-x \{\} \;
@@ -70,6 +72,9 @@
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Fri Sep 21 2007 Matt Domsch <matt at domsch.com> 2007.01.15-3
+- add LSB initscript header (BZ#246861)
+
 * Wed Sep 19 2007 Matt Domsch <matt at domsch.com> 2007.01.15-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Sep 22 03:08:41 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 21 Sep 2007 23:08:41 -0400
Subject: rpms/vips/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vips.spec,
	1.11, 1.12
Message-ID: <200709220308.l8M38fE3028442@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/vips/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28417

Modified Files:
	.cvsignore sources vips.spec 
Log Message:
* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jul 2007 22:49:09 -0000	1.6
+++ .cvsignore	22 Sep 2007 03:08:08 -0000	1.7
@@ -1 +1 @@
-vips-7.12.4.tar.gz
+vips-7.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jul 2007 22:49:09 -0000	1.6
+++ sources	22 Sep 2007 03:08:08 -0000	1.7
@@ -1 +1 @@
-5399e1355172964f503ce1422e648ffd  vips-7.12.4.tar.gz
+94bee1c2770cd7da63faa3c75f8c381f  vips-7.12.5.tar.gz


Index: vips.spec
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/vips.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vips.spec	17 Aug 2007 01:06:33 -0000	1.11
+++ vips.spec	22 Sep 2007 03:08:08 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		vips
-Version:	7.12.4
-Release:	2%{?dist}
+Version:	7.12.5
+Release:	1%{?dist}
 Summary: 	Library for processing large images
 
 Group:		System Environment/Libraries
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
+- New upstream release
+
 * Thu Aug 16 2007 Adam Goode <adam at spicenitz.org> - 7.12.4-2
 - Add Conflicts for doc
 - Update doc package description



From fedora-extras-commits at redhat.com  Sat Sep 22 03:26:00 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 21 Sep 2007 23:26:00 -0400
Subject: rpms/nip2/devel .cvsignore, 1.7, 1.8 nip2.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200709220326.l8M3Q0Gn028838@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/nip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28710

Modified Files:
	.cvsignore nip2.spec sources 
Log Message:
* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Aug 2007 01:22:40 -0000	1.7
+++ .cvsignore	22 Sep 2007 03:25:28 -0000	1.8
@@ -1 +1 @@
-nip2-7.12.4.tar.gz
+nip2-7.12.5.tar.gz


Index: nip2.spec
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nip2.spec	17 Aug 2007 01:47:40 -0000	1.9
+++ nip2.spec	22 Sep 2007 03:25:28 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		nip2
-Version:	7.12.4
+Version:	7.12.5
 Release:	1%{?dist}
 Summary:	Interactive tool for working with large images
 
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Adam Goode <adam at spicenitz.org> - 7.12.5-1
+- New upstream release
+
 * Thu Aug 16 2007 Adam Goode <adam at spicenitz.org> - 7.12.4-1
 - New upstream release
 - Update License tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Aug 2007 01:22:40 -0000	1.7
+++ sources	22 Sep 2007 03:25:28 -0000	1.8
@@ -1 +1 @@
-d9d9cf35fe47385e2eb4200cc02a9dd3  nip2-7.12.4.tar.gz
+3b00b507e993ef1bd99a73111acc660b  nip2-7.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 03:34:36 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 23:34:36 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.46, 1.47 NetworkManager.spec,
	1.167, 1.168 sources, 1.65, 1.66
Message-ID: <200709220334.l8M3YaxS029139@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29076

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
- New snapshot (fix unencrypted & 40 bit WEP)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	21 Sep 2007 18:50:07 -0000	1.46
+++ .cvsignore	22 Sep 2007 03:34:03 -0000	1.47
@@ -7,3 +7,5 @@
 NetworkManager-0.7.0.svn2844.tar.gz
 nm-applet-0.7.0.svn190.tar.gz
 NetworkManager-0.7.0.svn2849.tar.gz
+NetworkManager-0.7.0.svn2852.tar.gz
+nm-applet-0.7.0.svn191.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- NetworkManager.spec	21 Sep 2007 18:50:07 -0000	1.167
+++ NetworkManager.spec	22 Sep 2007 03:34:03 -0000	1.168
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2849
+%define snapshot svn2852
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn190.tar.gz
+Source1: nm-applet-%{version}.svn191.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -258,6 +258,9 @@
 
 
 %changelog
+* Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
+- New snapshot (fix unencrypted & 40 bit WEP)
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2849
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	21 Sep 2007 18:50:07 -0000	1.65
+++ sources	22 Sep 2007 03:34:03 -0000	1.66
@@ -1,2 +1,2 @@
-bf544bfb69e664202d509fbe028cb968  nm-applet-0.7.0.svn190.tar.gz
-abba317b083a742b1a36167c16654a3a  NetworkManager-0.7.0.svn2849.tar.gz
+ca377699ea19f3114bd5f0d71cd131ea  NetworkManager-0.7.0.svn2852.tar.gz
+9e8b0d741f2fca69bbbbdcfafc6677ab  nm-applet-0.7.0.svn191.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 03:40:48 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Sep 2007 23:40:48 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.168,1.169
Message-ID: <200709220340.l8M3emFg029552@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29506

Modified Files:
	NetworkManager.spec 
Log Message:
Don't need dhcdbd


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- NetworkManager.spec	22 Sep 2007 03:34:03 -0000	1.168
+++ NetworkManager.spec	22 Sep 2007 03:40:16 -0000	1.169
@@ -45,7 +45,6 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: dhcdbd
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: libnotify-devel >= 0.3



From fedora-extras-commits at redhat.com  Sat Sep 22 03:41:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 21 Sep 2007 23:41:33 -0400
Subject: fedora-security/audit epel5,1.3,1.4
Message-ID: <200709220341.l8M3fXK4029658@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29558

Modified Files:
	epel5 
Log Message:
Catch up with new vulnerabilities. 
remove qt4 (shipped in rhel, not epel)
update for cacti update.



Index: epel5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel5,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epel5	14 Sep 2007 00:23:19 -0000	1.3
+++ epel5	22 Sep 2007 03:41:31 -0000	1.4
@@ -3,9 +3,11 @@
 # *CVE are items that need verification for EPEL-5
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070910
-# Up to date EPEL5 as of 20070910
+# Up to date CVE as of CVE email 20070914
+# Up to date EPEL5 as of 20070916
 #
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
+*CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
 *CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
 CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
 CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
@@ -36,8 +38,8 @@
 CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
 CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-CVE-2007-3113 VULNERABLE (cacti) #243592
-CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3113 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3112 patch (cacti, fixed 0.8.7) #243592
 CVE-2007-3025 ignore (clamav, Solaris only)
 CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
 CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
@@ -84,7 +86,6 @@
 CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
 *CVE-2007-0469 version (rubygems, fixed 0.9.1)
 CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-CVE-2007-0242 VULNERABLE (qt4, fixed 4.2.3-7)
 CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
 *CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694



From fedora-extras-commits at redhat.com  Sat Sep 22 03:59:58 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 21 Sep 2007 23:59:58 -0400
Subject: rpms/python-nltk/F-7 sources, 1.3, 1.4 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200709220359.l8M3xwSb030179@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142/F-7

Modified Files:
	.cvsignore 
Added Files:
	sources 
Removed Files:
	dead.package 
Log Message:
First python-nltk release for Fedora after upstream is renamed back from nltk_lite



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	22 Sep 2007 03:59:25 -0000	1.4
@@ -0,0 +1 @@
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 03:59:25 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-0.9b2.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 04:00:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:00:02 -0400
Subject: rpms/python-nltk/devel sources, 1.3, 1.4 .cvsignore, 1.2,
	1.3 dead.package, 1.1, NONE
Message-ID: <200709220400.l8M40212030187@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30142/devel

Modified Files:
	.cvsignore 
Added Files:
	sources 
Removed Files:
	dead.package 
Log Message:
First python-nltk release for Fedora after upstream is renamed back from nltk_lite



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	22 Sep 2007 03:59:28 -0000	1.4
@@ -0,0 +1 @@
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 03:59:28 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-0.9b2.tar.gz


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 04:07:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 22 Sep 2007 00:07:59 -0400
Subject: fedora-security/audit epel4,1.1,1.2
Message-ID: <200709220407.l8M47xlV004410@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4386

Modified Files:
	epel4 
Log Message:
Process a ton of epel4 items. 



Index: epel4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/epel4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epel4	1 Sep 2007 18:49:37 -0000	1.1
+++ epel4	22 Sep 2007 04:07:57 -0000	1.2
@@ -3,99 +3,102 @@
 # *CVE are items that need verification for EPEL-4
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
-# Up to date CVE as of CVE email 20070829
-# Up to date EPEL4 as of 
+# Up to date CVE as of CVE email 20070914
+# Up to date EPEL4 as of 20070916
 #
-*CVE-2007-4631 VULNERABLE (qgit) #268381
+GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
+*CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
+CVE-2007-4727 version (lighttpd, fixed 1.4.18) #284511
+*CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
+CVE-2007-4631 version (qgit, fixed 1.5.7) #268381
 *CVE-2007-4629 VULNERABLE (mapserver, fixed 4.10.3) #272081
-*CVE-2007-4560 VULNERABLE (clamav) #260583
+CVE-2007-4560 VULNERABLE (clamav) #260583
 *CVE-2007-4543 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 *CVE-2007-4542 VULNERABLE (mapserver, fixed 4.10.3) #256561
 *CVE-2007-4539 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
 *CVE-2007-4538 version (bugzilla, fixed 3.0.1) #256021 [since FEDORA-2007-1853]
-*CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
+CVE-2007-4510 VULNERABLE (clamav, fixed 0.91.2) #253780
 *CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 *CVE-2007-4400 VULNERABLE (konversation) #253545
-*CVE-2007-4323 backport (denyhosts) #252291 [since FEDORA-2007-0589]
+CVE-2007-4323 backport (denyhosts) #252291
 *CVE-2007-4321 backport (fail2ban) #252290 [since FEDORA-2007-0621] version since FEDORA-2007-1643
-*CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
-*CVE-2007-3725 ** (clamav)
-*CVE-2007-3555 version (moodle) #247528 [since FEDORA-2007-1445]
-*CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
-*CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591 [since FEDORA-2007-0724]
-*CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
-*CVE-2007-3025 ignore (clamav, Solaris only)
-*CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3950 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3949 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3948 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162
+CVE-2007-3725 ** (clamav)
+CVE-2007-3555 version (moodle, fixed 1.8.2) #247528
+CVE-2007-3209 ignore (mail-notification, shipped with SSL enabled)
+CVE-2007-3153 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3152 version (c-ares, fixed 1.4.0) #243591
+CVE-2007-3123 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3122 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3113 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3112 patch (cacti, fixed 0.8.7) #243592
+CVE-2007-3025 ignore (clamav, Solaris only)
+CVE-2007-3024 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-3023 VULNERABLE (clamav, fixed 0.90.3) #245219
 *CVE-2007-2958 VULNERABLE (claws-mail) #254121
-*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489 [since FEDORA-2007-0469]
-*CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
-*CVE-2007-2650 version (clamav, fixed 0.90.3) #240395 [since FEDORA-2007-1154]
-*CVE-2007-2637 patch (moin, fixed 1.5.7-2)
-*CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
+*CVE-2007-2865 version (phpPgAdmin, fixed 4.1.2) #241489
+CVE-2007-2721 patch (jasper, fixed 1.900.1-2) #240397
+CVE-2007-2650 VULNERABLE (clamav, fixed 0.90.3) #240395
+CVE-2007-2637 patch (moin, fixed 1.5.7-2)
+CVE-2007-2423 patch (moin, fixed 1.5.7-2) #238722
 *CVE-2007-2413 version (perl-Imager, fixed 0.57) #238615
-*CVE-2007-2245 VULNERABLE (phpMyAdmin, fixed 2.10.1) #237882
+CVE-2007-2245 version (phpMyAdmin, fixed 2.10.1) #237882
 *CVE-2007-2165 VULNERABLE (proftpd) #237533
-*CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
-*CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
-*CVE-2007-1997 version (clamav, fixed in 0.90.2)
-*CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
-*CVE-2007-1745 version (clamav, fixed in 0.90.2) #236703
-*CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
+CVE-2007-2029 VULNERABLE (clamav, fixed 0.90.3) #245219
+CVE-2007-2016 ignore (phpMyAdmin, < 2.8.0.2 never shipped)
+CVE-2007-1997 VULNERABLE (clamav, fixed in 0.90.2)
+CVE-2007-1870 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1869 version (lighttpd, fixed 1.4.14) #236489
+CVE-2007-1745 VULNERABLE (clamav, fixed in 0.90.2) #236703
+CVE-2007-1614 version (zziplib, fixed 0.13.49) #233700
 *CVE-2007-1558 version (claws-mail, fixed 2.9.1) #237293
-*CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
-*CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
+CVE-2007-1547 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1546 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1545 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1544 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1543 version (nas, fixed 1.8a-2) #233353
+CVE-2007-1429 version (moodle, fixed 1.6.5) #232103
 *CVE-2007-1406 version (trac, fixed 0.10.3.1) #231729
 *CVE-2007-1405 version (trac, fixed 0.10.3.1) #231729
-*CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1395 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1359 patch (mod_security, fixed 2.1.0-3) #231728
-*CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
+CVE-2007-1325 version (phpMyAdmin, fixed 2.10.0.2)
 *CVE-2007-1055 version (mediawiki, fixed 1.8.3)
 *CVE-2007-1054 version (mediawiki, fixed 1.9.3) [since FEDORA-2007-1442]
-*CVE-2007-0902 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0901 patch (moin, fixed 1.5.7-2) #228764
-*CVE-2007-0898 version (clamav, fixed 0.90) #229202
-*CVE-2007-0897 version (clamav, fixed 0.90) #229202
+CVE-2007-0902 version (moin, fixed 1.5.7-2) #228764
+CVE-2007-0901 version (moin, fixed 1.5.7-2) #228764
+CVE-2007-0898 VULNERABLE (clamav, fixed 0.90) #229202
+CVE-2007-0897 VULNERABLE (clamav, fixed 0.90) #229202
 *CVE-2007-0894 version (mediawiki, fixed 1.8.4) #228763
-*CVE-2007-0857 version (moin, fixed 1.5.7) #228139
+CVE-2007-0857 version (moin, fixed 1.5.7) #228139
 *CVE-2007-0619 version (chmlib, fixed 0.3.9) #225919
-*CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
-*CVE-2007-0242 patch (qt4, fixed 4.2.3-7)
+CVE-2007-0341 ignore (phpMyAdmin, 2.8.x only)
 *CVE-2007-0240 patch (zope, fixed 2.9.6-2) #233378
 *CVE-2007-0177 version (mediawiki, fixed 1.8.3) #221958
-*CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
-*CVE-2007-0007 version (gnucash, fixed 2.0.5) since [FEDORA-2007-256] #223233
-*CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
-*CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
+CVE-2007-0095 VULNERABLE (phpMyAdmin) #221694
+CVE-2007-0007 version (gnucash, fixed 2.0.5) #223233
+CVE-2006-6944 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6943 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6942 version (phpMyAdmin, fixed 2.9.1.1)
+CVE-2006-6799 patch (cacti, fixed 0.8.6i-5) #222410
 *CVE-2006-6693 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
 *CVE-2006-6692 ignore (zabbix, fixed 1.1.3, < 1.1.4 not shipped)
-*CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
-*CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6626 version (moodle, fixed 1.6.5) #220041
+CVE-2006-6625 version (moodle, fixed 1.6.5) #220041
 *CVE-2006-6563 backport (proftpd, fixed 1.3.0a-3) #219938
-*CVE-2006-6481 version (clamav, fixed 0.88.7)
-*CVE-2006-6406 version (clamav, fixed 0.88.7) #219095
-*CVE-2006-6374 ** (phpMyAdmin) #218853
-*CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
-*CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
+CVE-2006-6481 VULNERABLE (clamav, fixed 0.88.7)
+CVE-2006-6406 VULNERABLE (clamav, fixed 0.88.7) #219095
+CVE-2006-6374 ** (phpMyAdmin) #218853
+CVE-2006-6373 version (phpMyAdmin, fixed 2.9.1.1) #218853
+CVE-2006-6301 version (denyhosts, fixed 2.6-2) #218824
 *CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 *CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
-*CVE-2006-5874 version (clamav, fixed 0.88.1)
-*CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
+CVE-2006-5874 version (clamav, fixed 0.88.1)
+CVE-2006-5864 patch (gv, fixed 3.6.2-2) #215136
 *CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 *CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 *CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
@@ -103,51 +106,51 @@
 *CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 *CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 *CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355
-*CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
-*CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
+CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
+CVE-2006-5129 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
 *CVE-2006-4684 version (zope, fixed 2.9.2)
 *CVE-2006-4249 patch (plone, fixed 2.5.1-3) #213983
 *CVE-2006-4248 ignore (thttpd, Debian specific issue)
 *CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
-*CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
-*CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
+CVE-2006-4182 version (clamav, fixed 0.88.5) #210973
+CVE-2006-4018 version (clamav, fixed 0.88.4-1) #201688
 *CVE-2006-3458 patch (zope, fixed 2.9.3-3) #198106
 *CVE-2006-3178 ignore (chmlib, extract_chmLib not shipped)
-*CVE-2006-2489 version (nagios, fixed 2.3.1)
-*CVE-2006-2427 ignore (clamav) not an issue bz#192076
+CVE-2006-2489 version (nagios, fixed 2.3.1)
+CVE-2006-2427 ignore (clamav) not an issue bz#192076
 *CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923
-*CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
+CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612
 *CVE-2006-2017 version (dnsmasq, fixed 2.30)
-*CVE-2006-1989 version (clamav, fixed 0.88.2)
+CVE-2006-1989 version (clamav, fixed 0.88.2)
 *CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch
 *CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886
-*CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
-*CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
-*CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
+CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050
+CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286
+CVE-2006-1566 ignore (libtunepimp, Debian-specific problem)
 *CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122
 *CVE-2006-1079 patch (thttpd, fixed 2.25b-11) bz#191095
 *CVE-2006-1078 patch (thttpd, fixed 2.25b-11) bz#191095
-*CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-*CVE-2006-0760 version (lighttpd, fixed 1.4.10)
-*CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509
+CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0760 version (lighttpd, fixed 1.4.10)
+CVE-2006-0458 VULNERABLE (irssi, fixed 0.8.10) bz#184509
 *CVE-2006-0322 version (mediawiki, fixed 1.5.8)
-*CVE-2006-0162 version (clamav, fixed 0.88)
-*CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
-*CVE-2006-0106 version (wine, fixed 0.9.10)
-*CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
-*CVE-2005-4803 version (graphviz, fixed 2.2.1)
+CVE-2006-0162 version (clamav, fixed 0.88)
+CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
+CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
+CVE-2005-4803 version (graphviz, fixed 2.2.1)
 *CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)



From fedora-extras-commits at redhat.com  Sat Sep 22 04:17:01 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:17:01 -0400
Subject: rpms/python-nltk/F-7 Makefile,1.2,1.3 python-nltk.spec,1.4,1.5
Message-ID: <200709220417.l8M4H1DD004809@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696/F-7

Added Files:
	Makefile python-nltk.spec 
Log Message:
New python-nltk, based on nltk_lite



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	22 Sep 2007 04:16:28 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-nltk
+# $Id$
+NAME := python-nltk
+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)


Index: python-nltk.spec
===================================================================
RCS file: python-nltk.spec
diff -N python-nltk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-nltk.spec	22 Sep 2007 04:16:28 -0000	1.5
@@ -0,0 +1,73 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define prerel b2
+Name:           python-nltk
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
+Summary:        Natural Language Toolkit
+
+Group:          Development/Libraries
+License:        GPLv2
+URL:            http://nltk.sf.net/
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
+Provides:       python-nltk_lite = %{version}-%{release}
+
+BuildRequires:  python-devel
+Requires:       numpy, python-matplotlib, tkinter
+
+%description
+NLTK is a Python package that simplifies the construction of programs
+that process natural language; and defines standard interfaces between
+the different components of an NLP system.  It was designed primarily
+to help teach graduate and undergraduate students about computational
+linguistics; but it is also useful as a framework for implementing
+research projects.
+
+
+%prep
+%setup -q -n nltk-%{version}%{?prerel}
+
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+# Make scripts executable
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
+
+
+%changelog
+* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Renamed back to python-nltk
+
+* Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
+- Rebuild for development branch
+
+* Mon Oct 30 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-1
+- Initial package



From fedora-extras-commits at redhat.com  Sat Sep 22 04:17:04 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:17:04 -0400
Subject: rpms/python-nltk/devel Makefile,1.2,1.3 python-nltk.spec,1.4,1.5
Message-ID: <200709220417.l8M4H4eK004813@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696/devel

Added Files:
	Makefile python-nltk.spec 
Log Message:
New python-nltk, based on nltk_lite



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	22 Sep 2007 04:16:31 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-nltk
+# $Id$
+NAME := python-nltk
+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)


Index: python-nltk.spec
===================================================================
RCS file: python-nltk.spec
diff -N python-nltk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-nltk.spec	22 Sep 2007 04:16:31 -0000	1.5
@@ -0,0 +1,73 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define prerel b2
+Name:           python-nltk
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
+Summary:        Natural Language Toolkit
+
+Group:          Development/Libraries
+License:        GPLv2
+URL:            http://nltk.sf.net/
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
+Provides:       python-nltk_lite = %{version}-%{release}
+
+BuildRequires:  python-devel
+Requires:       numpy, python-matplotlib, tkinter
+
+%description
+NLTK is a Python package that simplifies the construction of programs
+that process natural language; and defines standard interfaces between
+the different components of an NLP system.  It was designed primarily
+to help teach graduate and undergraduate students about computational
+linguistics; but it is also useful as a framework for implementing
+research projects.
+
+
+%prep
+%setup -q -n nltk-%{version}%{?prerel}
+
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+# Make scripts executable
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
+
+
+%changelog
+* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Renamed back to python-nltk
+
+* Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
+- Rebuild for development branch
+
+* Mon Oct 30 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-1
+- Initial package



From fedora-extras-commits at redhat.com  Sat Sep 22 04:24:27 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:24:27 -0400
Subject: rpms/python-nltk/F-7 python-nltk.spec,1.5,1.6
Message-ID: <200709220424.l8M4ORsx005088@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035/F-7

Modified Files:
	python-nltk.spec 
Log Message:
Make tkinter a build requirement as well



Index: python-nltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/F-7/python-nltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-nltk.spec	22 Sep 2007 04:16:28 -0000	1.5
+++ python-nltk.spec	22 Sep 2007 04:23:54 -0000	1.6
@@ -3,7 +3,7 @@
 %define prerel b2
 Name:           python-nltk
 Version:        0.9
-Release:        0.1.%{prerel}%{?dist}
+Release:        0.2.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
 Provides:       python-nltk_lite = %{version}-%{release}
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, tkinter
 Requires:       numpy, python-matplotlib, tkinter
 
 %description
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9.0.2.b
+- BR on tkinter, it is now needed at build time
+
 * Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
 - Updated to 0.9b2
 - Renamed back to python-nltk



From fedora-extras-commits at redhat.com  Sat Sep 22 04:24:30 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 00:24:30 -0400
Subject: rpms/python-nltk/devel python-nltk.spec,1.5,1.6
Message-ID: <200709220424.l8M4OUw8005091@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5035/devel

Modified Files:
	python-nltk.spec 
Log Message:
Make tkinter a build requirement as well



Index: python-nltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/devel/python-nltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-nltk.spec	22 Sep 2007 04:16:31 -0000	1.5
+++ python-nltk.spec	22 Sep 2007 04:23:57 -0000	1.6
@@ -3,7 +3,7 @@
 %define prerel b2
 Name:           python-nltk
 Version:        0.9
-Release:        0.1.%{prerel}%{?dist}
+Release:        0.2.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@
 Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
 Provides:       python-nltk_lite = %{version}-%{release}
 
-BuildRequires:  python-devel
+BuildRequires:  python-devel, tkinter
 Requires:       numpy, python-matplotlib, tkinter
 
 %description
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9.0.2.b
+- BR on tkinter, it is now needed at build time
+
 * Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
 - Updated to 0.9b2
 - Renamed back to python-nltk



From fedora-extras-commits at redhat.com  Sat Sep 22 05:03:48 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 22 Sep 2007 01:03:48 -0400
Subject: rpms/GConf2/devel GConf2.spec,1.65,1.66
Message-ID: <200709220503.l8M53mFs012003@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11979

Modified Files:
	GConf2.spec 
Log Message:
fix up deps



Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- GConf2.spec	19 Sep 2007 15:25:35 -0000	1.65
+++ GConf2.spec	22 Sep 2007 05:03:11 -0000	1.66
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
@@ -23,6 +23,8 @@
 BuildRequires: perl(XML::Parser)
 BuildRequires: libtool, autoconf, automake
 BuildRequires: intltool
+# for patch0
+Requires: /usr/bin/killall
 
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
@@ -131,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Require /usr/bin/killall, since gconftool uses it
+
 * Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Sat Sep 22 05:57:35 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sat, 22 Sep 2007 01:57:35 -0400
Subject: rpms/gnome-applets/devel gweather-pc.patch, NONE,
	1.1 gnome-applets.spec, 1.242, 1.243
Message-ID: <200709220557.l8M5vZ7Z012970@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12945

Modified Files:
	gnome-applets.spec 
Added Files:
	gweather-pc.patch 
Log Message:
fix gweather.pc file


gweather-pc.patch:

--- NEW FILE gweather-pc.patch ---
diff -up gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc gnome-applets-2.20.0/libgweather/gweather.pc.in
--- gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc	2007-09-22 01:32:03.000000000 -0400
+++ gnome-applets-2.20.0/libgweather/gweather.pc.in	2007-09-22 01:32:14.000000000 -0400
@@ -7,5 +7,5 @@ Name: GWeather
 Description: GWeather shared library
 Version: @VERSION@
 Requires: gtk+-2.0, gnome-vfs-2.0
-Libs: -L${libdir}
+Libs: -L${libdir} -lgweather
 Cflags: -I${includedir}


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- gnome-applets.spec	20 Sep 2007 00:17:15 -0000	1.242
+++ gnome-applets.spec	22 Sep 2007 05:57:00 -0000	1.243
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -62,6 +62,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
 Patch35:	gnome-applets-2.20.0-mixer-out-of-sync.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=479172
+Patch36:	gweather-pc.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -161,6 +164,7 @@
 pushd mixer/
 %patch35 -p0 -b .mixer-sync
 popd
+%patch36 -p1 -b .gweather-pc
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -338,6 +342,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
+- Make the gweather.pc file less useless
+
 * Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-2
 - Add patch to avoid the volume scale getting out-of sync with the 
   real hardware volume



From fedora-extras-commits at redhat.com  Sat Sep 22 06:34:39 2007
From: fedora-extras-commits at redhat.com (Yuan Yijun (bbbush))
Date: Sat, 22 Sep 2007 02:34:39 -0400
Subject: comps/po zh_CN.po,1.5,1.6
Message-ID: <200709220634.l8M6YdM4019882@cvs-int.fedora.redhat.com>

Author: bbbush

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19865/po

Modified Files:
	zh_CN.po 
Log Message:
217t: before f8 translation freeze


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 zh_CN.po
Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zh_CN.po	17 Sep 2007 19:22:12 -0000	1.5
+++ zh_CN.po	22 Sep 2007 06:34:08 -0000	1.6
@@ -1,11 +1,3 @@
-# translation of zh_CN.po to 
-# translation of zh_CN.po to
-# translation of zh_CN.po to
-# translation of zh_CN.po to
-# translation of zh_CN.po to Chinese, Simplified
-# translation of zh_CN.po to Simplified Chinese
-# translation of zh_CN.po to zh_CN
-# translation of comps-po.po to Simplified Chinese
 # Simplified Chinese Version of comps.po.
 # Copyright (C) 2002 Red Hat Inc.
 # This file is distributed under the same license as the PACKAGE package.
@@ -13,24 +5,24 @@
 # Tony Fu <tfu at redhat.com>, 2004, 2006.
 # Leah Liu <weliu at redhat.com>, 2005, 2006.
 # Xi Huang <xhuang at redhat.com>, 2006.
+# Tony Fu <tfu at redhat.com>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2006-12-07 09:08+1000\n"
-"Last-Translator: Tony Fu <tfu at redhat.com>\n"
+"PO-Revision-Date: 2007-09-22 14:33+0800\n"
+"Last-Translator: Yuan Yijun <bbbush at fedoraproject.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"
-"X-Generator: KBabel 1.9.1\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
+msgstr "??????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -49,15 +41,13 @@
 
 #: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
 #: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
-#, fuzzy
 msgid "Arabic Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
 #: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
-#, fuzzy
 msgid "Armenian Support"
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
 #: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
@@ -102,12 +92,12 @@
 #: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
 #: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15
 msgid "Educational Software"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr ""
+msgstr "???????????????????????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
@@ -164,9 +154,8 @@
 
 #: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64
 #: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26
-#, fuzzy
 msgid "Hardware Support"
-msgstr "??????????????????"
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
 #: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
@@ -182,11 +171,10 @@
 
 #: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
 #: ../comps-f8.xml.in.h:74
-#, fuzzy
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr "?????????????????????????????? GTK+ ??? GNOME ????????????????????????"
+msgstr "?????????????????????????????? GTK+ ??? XFCE ????????????????????????"
 
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
 #: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
@@ -269,7 +257,7 @@
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -326,10 +314,9 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-#, fuzzy
 msgid ""
 "These packages are helpful when developing web applications or web pages."
-msgstr "???????????????????????????????????? X ??????????????????????????????"
+msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
 #: ../comps-el5.xml.in.h:51
@@ -400,37 +387,37 @@
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
+msgstr "??????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr ""
+msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
-msgstr ""
+msgstr "????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -452,9 +439,8 @@
 
 #: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
 #: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
-#, fuzzy
 msgid "Web Development"
-msgstr "??????"
+msgstr "????????????"
 
 #: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
 #: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
@@ -464,7 +450,7 @@
 #: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187
 #: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73
 msgid "Window Managers"
-msgstr ""
+msgstr "???????????????"
 
 #: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
 #: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
@@ -479,13 +465,12 @@
 #: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
 #: ../comps-f8.xml.in.h:199
 msgid "XFCE"
-msgstr ""
+msgstr "XFCE"
 
 #: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192
 #: ../comps-f8.xml.in.h:200
[...4147 lines suppressed...]
-#~ "\">fonts-oriya</packagereq> <packagereq type=\"mandatory\">m17n-db-oriya</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </packagelist> </"
-#~ "group> <group> <id>polish-support</id> <_name>???????????????</_name> "
-#~ "<_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-pa-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Punjabi</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>Romanian "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>pa</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-pa-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Punjabi</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-punjabi</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>romanian-support</id> <_name>????????????"
-#~ "?????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ru-RU</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-ru</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-KOI8-R</packagereq> <packagereq type=\"mandatory\">fonts-KOI8-R-"
-#~ "100dpi</packagereq> <packagereq type=\"default\">fonts-KOI8-R-75dpi</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>Serbian Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ru</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ru-RU</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-ru</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-KOI8-R</packagereq> <packagereq type=\"mandatory\">fonts-KOI8-R-"
-#~ "100dpi</packagereq> <packagereq type=\"default\">fonts-KOI8-R-75dpi</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"kdelibs\">kde-"
-#~ "i18n-Russian</packagereq> <packagereq type=\"conditional\" requires=\"man-"
-#~ "pages\">man-pages-ru</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-russian</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">xorg-x11-fonts-"
-#~ "cyrillic</packagereq> </packagelist> </group> <group> <id>serbian-"
-#~ "support</id> <_name>?????????????????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>Slovak Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>si</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-si-LK</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-sinhala</packagereq> <packagereq type=\"mandatory\">m17n-db-"
-#~ "sinhala</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-sinhala</"
-#~ "packagereq> </packagelist> </group> <group> <id>slovak-support</id> "
-#~ "<_name>?????????????????????</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>Sound and Video</_name> "
-#~ "<_description>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 ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>sl</langonly> <packagelist> <packagereq type=\"conditional\" "
-#~ "requires=\"aspell\">aspell-sl</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-ISO8859-2</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">fonts-ISO8859-2-100dpi</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"xorg-x11-server-Xorg\">fonts-ISO8859-2-"
-#~ "75dpi</packagereq> <packagereq type=\"conditional\" requires=\"kdelibs"
-#~ "\">kde-i18n-Slovenian</packagereq> </packagelist> </group> <group> "
-#~ "<id>sound-and-video</id> <_name>???????????????</_name> <_description>????????????"
-#~ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Telugu "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>ta</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-ta-IN</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Tamil</packagereq> <packagereq type=\"mandatory"
-#~ "\">m17n-db-tamil</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"xorg-x11-server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> "
-#~ "</packagelist> </group> <group> <id>telugu-support</id> <_name>Telugu ??????"
-#~ "???</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>Turkish "
-#~ "Support</_name> <_description>"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>th</langonly> <packagelist> <packagereq type=\"mandatory\">m17n-"
-#~ "db-thai</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-bridge-gtk</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"xorg-x11-server-Xorg\">scim-m17n</packagereq> <packagereq "
-#~ "type=\"conditional\" requires=\"qt\">scim-qtimm</packagereq> </"
-#~ "packagelist> </group> <group> <id>turkish-support</id> <_name>??????????????????"
-#~ "</_name> <_description>"
-
-#~ msgid ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>Core</_name> <_description>Smallest "
-#~ "possible installation"
-#~ msgstr ""
-#~ "</_description> <default>false</default> <uservisible>false</uservisible> "
-#~ "<langonly>zh</langonly> <packagelist> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-CN</packagereq> <packagereq type=\"default"
-#~ "\">Deployment_Guide-zh-TW</packagereq> <packagereq type=\"mandatory"
-#~ "\">fonts-chinese</packagereq> <packagereq type=\"conditional\" requires="
-#~ "\"kdelibs\">kde-i18n-Chinese</packagereq> <packagereq type=\"conditional"
-#~ "\" requires=\"kdelibs\">kde-i18n-Chinese-Big5</packagereq> <packagereq "
-#~ "type=\"default\">lv</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"scim-m17n\">m17n-db-chinese</packagereq> <packagereq type="
-#~ "\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-bridge-gtk</"
-#~ "packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-server-"
-#~ "Xorg\">scim-chewing</packagereq> <packagereq type=\"conditional\" "
-#~ "requires=\"xorg-x11-server-Xorg\">scim-chinese-standard</packagereq> "
-#~ "<packagereq type=\"conditional\" requires=\"xorg-x11-server-Xorg\">scim-"
-#~ "pinyin</packagereq> <packagereq type=\"conditional\" requires=\"qt\">scim-"
-#~ "qtimm</packagereq> <packagereq type=\"conditional\" requires=\"xorg-x11-"
-#~ "server-Xorg\">scim-tables-chinese</packagereq> <packagereq type=\"default"
-#~ "\">stardict</packagereq> <packagereq type=\"optional\">bogl</packagereq> "
-#~ "<packagereq type=\"optional\">bogl-bterm</packagereq> </packagelist> </"
-#~ "group> <group> <id>core</id> <_name>??????</_name> <_description>???????????????"
-#~ "??????"



From fedora-extras-commits at redhat.com  Sat Sep 22 07:04:08 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 03:04:08 -0400
Subject: rpms/libid3tag/EL-5 libid3tag.spec,1.13,1.14
Message-ID: <200709220704.l8M748jl029217@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libid3tag/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29192

Modified Files:
	libid3tag.spec 
Log Message:
Sync with devel


Index: libid3tag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libid3tag/EL-5/libid3tag.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libid3tag.spec	28 Aug 2006 06:37:14 -0000	1.13
+++ libid3tag.spec	22 Sep 2007 07:03:33 -0000	1.14
@@ -1,10 +1,10 @@
 Name:           libid3tag
 Version:        0.15.1b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.underbit.com/products/mad/
 Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,7 +16,7 @@
 both ID3v1 and the various versions of ID3v2.
 
 %package        devel
-Summary:        libid3tag development files
+Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.1b-4
+- License: GPLv2+
+
 * Mon Aug 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.15.1b-3
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sat Sep 22 07:43:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 03:43:34 -0400
Subject: rpms/bash-completion/devel
	bash-completion-20060301-perl-299571.patch, 
	NONE, 1.1 bash-completion.spec, 1.20, 1.21
Message-ID: <200709220743.l8M7hYK5032129@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-20060301-perl-299571.patch 
Log Message:
* 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).


bash-completion-20060301-perl-299571.patch:

--- NEW FILE bash-completion-20060301-perl-299571.patch ---
--- bash_completion~	2007-09-22 10:35:56.000000000 +0300
+++ bash_completion	2007-09-22 10:37:56.000000000 +0300
@@ -5196,8 +5196,8 @@
 	    ;;
     esac
 
-    # handle case where first parameter is not a dash option
-    if [ $COMP_CWORD -eq 1 ] && [[ "$cur" != -* ]]; then
+    # handle non-dash options
+    if [[ "$cur" != -* ]]; then
 	_filedir
 	return 0
     fi


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bash-completion.spec	13 Aug 2007 19:32:59 -0000	1.20
+++ bash-completion.spec	22 Sep 2007 07:43:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -12,6 +12,7 @@
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20060301-scp-apos-217178.patch
 Patch1:         %{name}-20060301-debian.patch
+Patch2:         %{name}-20060301-perl-299571.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 %setup -q -n bash_completion
 %patch0
 %patch1
+%patch2
 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
@@ -182,6 +184,10 @@
 
 
 %changelog
+* 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+
 



From fedora-extras-commits at redhat.com  Sat Sep 22 07:56:29 2007
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sat, 22 Sep 2007 03:56:29 -0400
Subject: rpms/aspell-he/devel sources,1.3,1.4 aspell-he.spec,1.3,1.4
Message-ID: <200709220756.l8M7uTXI032454@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32426

Modified Files:
	sources aspell-he.spec 
Log Message:
Clean spec file according to bug #212974



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2006 07:08:23 -0000	1.3
+++ sources	22 Sep 2007 07:55:57 -0000	1.4
@@ -1,2 +1 @@
-f453989e1df364af9479e893c16ac9d8  aspell6-he-0.9-0.tar.bz2
 71791e0299787391d2ace1c850b5b434  aspell6-he-1.0-0.tar.bz2


Index: aspell-he.spec
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/aspell-he.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-he.spec	16 Sep 2006 17:13:40 -0000	1.3
+++ aspell-he.spec	22 Sep 2007 07:55:57 -0000	1.4
@@ -29,22 +29,15 @@
 %setup -q -n aspell6-%{lang}-%{version}-%{langrelease}
 
 %build
-cat > Makefile <<EOF
-ASPELL = aspell
-DEST_DIR = $RPM_BUILD_ROOT
-WORD_LIST_COMPRESS = word-list-compress
-PREZIP = prezip
-dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
-datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
-EOF
-cat Makefile.pre >> Makefile
-make
+./configure
+make %{?_smp_mflags}
 
 %install
-make install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -52,6 +45,8 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
+* Sun Apr  1 2007 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-3
+- Clean spec file according to lessons from Bug #212974.
 * Sat Sep 16 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-2
 - Rebuild for Fedora Extras 6
 * Mon May 15 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.0-1



From fedora-extras-commits at redhat.com  Sat Sep 22 08:03:20 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:03:20 -0400
Subject: rpms/php-pear-DB/devel .cvsignore, 1.4, 1.5 php-pear-DB.spec, 1.9, 
	1.10 sources, 1.4, 1.5
Message-ID: <200709220803.l8M83Kdx006674@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6510

Modified Files:
	.cvsignore php-pear-DB.spec sources 
Log Message:
update to 1.7.13


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jul 2007 08:57:58 -0000	1.4
+++ .cvsignore	22 Sep 2007 08:02:47 -0000	1.5
@@ -1 +1 @@
-DB-1.7.12.tgz
+DB-1.7.13.tgz


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/php-pear-DB.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- php-pear-DB.spec	23 Aug 2007 17:32:15 -0000	1.9
+++ php-pear-DB.spec	22 Sep 2007 08:02:48 -0000	1.10
@@ -2,8 +2,8 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.12
-Release:        2%{?dist}
+Version:        1.7.13
+Release:        1%{?dist}
 Summary:        PEAR: Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -47,21 +47,22 @@
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+cd %{pear_name}-%{version}
 # update run test suite
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/run.cvs >run1
+    tests/run.cvs >run1
 
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests/driver@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/driver/run.cvs >run2
+    tests/driver/run.cvs >run2
 
 sed -e "s@// 'sqlite'@'sqlite'@" \
-    %{pear_name}-%{version}/tests/driver/setup.inc.cvs >setup.inc
+    tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -86,9 +87,13 @@
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Install new test suite
-install -pm 755 ../run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
-install -pm 755 ../run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
-install -pm 644 ../setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+install -pm 755 run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
+install -pm 755 run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
+install -pm 644 setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+
+mv docdir/%{pear_name}/doc/TESTERS .
+iconv -f ISO-8859-1 -t UTF-8  TESTERS -o docdir/%{pear_name}/doc/TESTERS
+touch -r TESTERS docdir/%{pear_name}/doc/TESTERS
 
 
 %clean
@@ -126,6 +131,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.13-1
+- update to 1.7.13
+- fix TEXTERS encoding
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-2
 - Fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jul 2007 08:57:58 -0000	1.4
+++ sources	22 Sep 2007 08:02:48 -0000	1.5
@@ -1 +1 @@
-b86134520d473db3c5fb87b68a820037  DB-1.7.12.tgz
+39b451245941a7059511a852f18b4946  DB-1.7.13.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:11:28 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:11:28 -0400
Subject: rpms/php-pear-DB/F-7 php-pear-DB.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200709220811.l8M8BS5W006881@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-DB/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6861

Modified Files:
	php-pear-DB.spec sources 
Log Message:
update to 1.7.13


Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/php-pear-DB.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear-DB.spec	23 Aug 2007 17:34:39 -0000	1.8
+++ php-pear-DB.spec	22 Sep 2007 08:10:55 -0000	1.9
@@ -2,8 +2,8 @@
 %define pear_name DB
 
 Name:           php-pear-DB
-Version:        1.7.12
-Release:        2%{?dist}
+Version:        1.7.13
+Release:        1%{?dist}
 Summary:        PEAR: Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -47,21 +47,22 @@
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+cd %{pear_name}-%{version}
 # update run test suite
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/run.cvs >run1
+    tests/run.cvs >run1
 
 sed -e 's@^ *DB_TEST_PHP_PATH=.*$@DB_TEST_PHP_PATH=%{_libdir}/php/build@' \
     -e 's@^ *DB_TEST_PHP_CLI=.*$@DB_TEST_PHP_CLI=php@' \
     -e 's@^ *DB_TEST_DIR=.*$@DB_TEST_DIR=%{pear_testdir}/DB/tests/driver@' \
     -e 's at TEST_PHP_EXECUTABLE=.*$@TEST_PHP_EXECUTABLE=%{_bindir}/php@' \
-    %{pear_name}-%{version}/tests/driver/run.cvs >run2
+    tests/driver/run.cvs >run2
 
 sed -e "s@// 'sqlite'@'sqlite'@" \
-    %{pear_name}-%{version}/tests/driver/setup.inc.cvs >setup.inc
+    tests/driver/setup.inc.cvs >setup.inc
 
 %build
 cd %{pear_name}-%{version}
@@ -86,9 +87,13 @@
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Install new test suite
-install -pm 755 ../run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
-install -pm 755 ../run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
-install -pm 644 ../setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+install -pm 755 run1 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/run
+install -pm 755 run2 $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/run
+install -pm 644 setup.inc $RPM_BUILD_ROOT%{pear_testdir}/DB/tests/driver/
+
+mv docdir/%{pear_name}/doc/TESTERS .
+iconv -f ISO-8859-1 -t UTF-8  TESTERS -o docdir/%{pear_name}/doc/TESTERS
+touch -r TESTERS docdir/%{pear_name}/doc/TESTERS
 
 
 %clean
@@ -126,6 +131,10 @@
 
 
 %changelog
+* Fri Sep 21 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.13-1
+- update to 1.7.13
+- fix TEXTERS encoding
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-2
 - Fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2007 17:34:39 -0000	1.4
+++ sources	22 Sep 2007 08:10:55 -0000	1.5
@@ -1 +1 @@
-b86134520d473db3c5fb87b68a820037  DB-1.7.12.tgz
+39b451245941a7059511a852f18b4946  DB-1.7.13.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:13:45 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 04:13:45 -0400
Subject: rpms/gcc/devel gcc41-pr33506.patch,NONE,1.1 gcc41.spec,1.174,1.175
Message-ID: <200709220813.l8M8Dj6O006975@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr33506.patch 
Log Message:
4.1.2-26

gcc41-pr33506.patch:

--- NEW FILE gcc41-pr33506.patch ---
2007-09-21  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33506
	* langhooks.h (struct lang_hooks_for_types): Add type_hash_eq
	field.
	* langhooks.c (lhd_type_hash_eq): New function.
	* langhooks-def.h (lhd_type_hash_eq): New prototype.
	(LANG_HOOKS_TYPE_HASH_EQ): Define.
	(LANG_HOOKS_FOR_TYPES_INITIALIZER): Add LANG_HOOKS_TYPE_HASH_EQ.
	* tree.c (type_hash_eq): For FUNCTION_TYPE use
	lang_hooks.type.type_hash_eq in addition to generic tests.

	* cp-tree.h (cxx_type_hash_eq): New prototype.
	* cp-objcp-common.h (LANG_HOOKS_TYPE_HASH_EQ): Redefine.
	* tree.c (cxx_type_hash_eq): New function.

	* g++.dg/ext/attrib29.C: New test.

--- gcc/langhooks.h.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.h	2007-09-22 03:46:10.000000000 -0400
@@ -148,6 +148,10 @@ struct lang_hooks_for_types
      firstprivate variables.  */
   void (*omp_firstprivatize_type_sizes) (struct gimplify_omp_ctx *, tree);
 
+  /* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+     Called only after doing all language independent checks.  */
+  bool (*type_hash_eq) (tree, tree);
+
   /* Nonzero if types that are identical are to be hashed so that only
      one copy is kept.  If a language requires unique types for each
      user-specified type, such as Ada, this should be set to TRUE.  */
--- gcc/langhooks.c.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.c	2007-09-22 03:46:10.000000000 -0400
@@ -411,6 +411,16 @@ lhd_tree_dump_type_quals (tree t)
 /* lang_hooks.expr_size: Determine the size of the value of an expression T
    in a language-specific way.  Returns a tree for the size in bytes.  */
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  */
+
+bool
+lhd_type_hash_eq (tree typea ATTRIBUTE_UNUSED,
+		  tree typeb ATTRIBUTE_UNUSED)
+{
+  return true;
+}
+
 tree
 lhd_expr_size (tree exp)
 {
--- gcc/langhooks-def.h.jj	2007-02-20 16:39:13.000000000 -0500
+++ gcc/langhooks-def.h	2007-09-22 03:46:56.000000000 -0400
@@ -70,6 +70,7 @@ extern tree lhd_expr_size (tree);
 extern size_t lhd_tree_size (enum tree_code);
 extern HOST_WIDE_INT lhd_to_target_charset (HOST_WIDE_INT);
 extern tree lhd_expr_to_decl (tree, bool *, bool *, bool *);
+extern bool lhd_type_hash_eq (tree, tree);
 
 /* Declarations of default tree inlining hooks.  */
 extern tree lhd_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
@@ -220,6 +221,7 @@ extern tree lhd_make_node (enum tree_cod
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
 #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \
   lhd_omp_firstprivatize_type_sizes
+#define LANG_HOOKS_TYPE_HASH_EQ		lhd_type_hash_eq
 #define LANG_HOOKS_HASH_TYPES		true
 
 #define LANG_HOOKS_FOR_TYPES_INITIALIZER { \
@@ -234,6 +236,7 @@ extern tree lhd_make_node (enum tree_cod
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
   LANG_HOOKS_TYPE_MAX_SIZE, \
   LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES, \
+  LANG_HOOKS_TYPE_HASH_EQ, \
   LANG_HOOKS_HASH_TYPES \
 }
 
--- gcc/tree.c.jj	2007-04-03 07:18:26.000000000 -0400
+++ gcc/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -4168,17 +4168,21 @@ type_hash_eq (const void *va, const void
 				      TYPE_FIELDS (b->type))));
 
     case FUNCTION_TYPE:
-      return (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
-	      || (TYPE_ARG_TYPES (a->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
-		  && TYPE_ARG_TYPES (b->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
-		  && type_list_equal (TYPE_ARG_TYPES (a->type),
-				      TYPE_ARG_TYPES (b->type))));
+      if (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
+	  || (TYPE_ARG_TYPES (a->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
+	      && TYPE_ARG_TYPES (b->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
+	      && type_list_equal (TYPE_ARG_TYPES (a->type),
+				  TYPE_ARG_TYPES (b->type))))
+	break;
+      return 0;
 
     default:
       return 0;
     }
+
+  return lang_hooks.types.type_hash_eq (a->type, b->type);
 }
 
 /* Return the cached hash value.  */
--- gcc/cp/cp-tree.h.jj	2007-06-26 07:57:09.000000000 -0400
+++ gcc/cp/cp-tree.h	2007-09-22 03:50:22.000000000 -0400
@@ -4421,7 +4421,8 @@ extern tree cp_add_pending_fn_decls		(vo
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
 extern tree rvalue                              (tree);
-   
+extern bool cxx_type_hash_eq			(tree, tree);
+
 /* in typeck.c */
 extern int string_conv_p			(tree, tree, int);
 extern tree cp_truthvalue_conversion		(tree);
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 16:37:34.000000000 -0500
+++ gcc/cp/cp-objcp-common.h	2007-09-22 03:49:38.000000000 -0400
@@ -85,6 +85,8 @@ extern tree objcp_tsubst_copy_and_build 
 #define LANG_HOOKS_WRITE_GLOBALS lhd_do_nothing
 #undef LANG_HOOKS_COMDAT_GROUP
 #define LANG_HOOKS_COMDAT_GROUP cxx_comdat_group
+#undef LANG_HOOKS_TYPE_HASH_EQ                                                                                          
+#define LANG_HOOKS_TYPE_HASH_EQ cxx_type_hash_eq
 
 #undef LANG_HOOKS_FUNCTION_INIT
 #define LANG_HOOKS_FUNCTION_INIT cxx_push_function_context
--- gcc/cp/tree.c.jj	2007-03-12 03:28:01.000000000 -0400
+++ gcc/cp/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -1959,6 +1959,22 @@ cp_build_type_attribute_variant (tree ty
   return new_type;
 }
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  Only
+   to check TYPE_RAISES_EXCEPTIONS for FUNCTION_TYPE, the rest is already
+   compared in type_hash_eq.  */
+
+bool
+cxx_type_hash_eq (tree typea, tree typeb)
+{
+  if (TREE_CODE (typea) != FUNCTION_TYPE
+      || TYPE_RAISES_EXCEPTIONS (typea) == TYPE_RAISES_EXCEPTIONS (typeb))
+    return true;
+
+  return comp_except_specs (TYPE_RAISES_EXCEPTIONS (typea),
+			    TYPE_RAISES_EXCEPTIONS (typeb), 1);
+}
+
 /* Apply FUNC to all language-specific sub-trees of TP in a pre-order
    traversal.  Called from walk_tree.  */
 
--- gcc/testsuite/g++.dg/ext/attrib29.C.jj	2007-09-22 03:46:10.000000000 -0400
+++ gcc/testsuite/g++.dg/ext/attrib29.C	2007-09-22 03:46:10.000000000 -0400
@@ -0,0 +1,10 @@
+// PR c++/33506
+// { dg-do compile }
+
+extern int f1 (char *) __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw () __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw ();
+
+extern int f3 (char *) __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw () __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw ();


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- gcc41.spec	17 Sep 2007 21:03:53 -0000	1.174
+++ gcc41.spec	22 Sep 2007 08:13:13 -0000	1.175
@@ -1,6 +1,6 @@
 %define DATE 20070821
 %define gcc_version 4.1.2
-%define gcc_release 25
+%define gcc_release 26
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -154,6 +154,7 @@
 Patch38: gcc41-pr27954.patch
 Patch39: gcc41-pr33423.patch
 Patch40: gcc41-scanf-fmt-check.patch
+Patch41: gcc41-pr33506.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -477,6 +478,7 @@
 %patch38 -p0 -b .pr27954~
 %patch39 -p0 -b .pr33423~
 %patch40 -p0 -b .scanf-fmt-check~
+%patch41 -p0 -b .pr33506~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1631,6 +1633,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
+- don't ignore throw specification of function types in type hashing
+  (PR c++/33506)
+
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until
   expand time and at that point it can avoid a call (PR middle-end/33423)



From fedora-extras-commits at redhat.com  Sat Sep 22 08:58:01 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:58:01 -0400
Subject: rpms/php-pecl-memcache/devel .cvsignore, 1.2,
	1.3 php-pecl-memcache.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709220858.l8M8w1HD008364@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8335

Modified Files:
	.cvsignore php-pecl-memcache.spec sources 
Log Message:
new version 2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 13:24:25 -0000	1.2
+++ .cvsignore	22 Sep 2007 08:57:29 -0000	1.3
@@ -1 +1 @@
-memcache-2.1.2.tgz
+memcache-2.2.0.tgz


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-memcache.spec	31 Aug 2007 13:24:25 -0000	1.1
+++ php-pecl-memcache.spec	22 Sep 2007 08:57:29 -0000	1.2
@@ -5,7 +5,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.1.2
+Version:      2.2.0
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -16,7 +16,7 @@
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, php-pear, zlib-devel
+BuildRequires: php-devel >= 4.3.11, php-pear, zlib-devel
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
@@ -35,6 +35,7 @@
 This extension allows you to work with memcached through
 handy OO and procedural interfaces.
 
+Memcache can be used as a PHP session handler.
 
 %prep 
 %setup -c -q
@@ -63,21 +64,21 @@
 
 ; Whether to transparently failover to other servers on errors
 ;memcache.allow_failover=1
-
 ; Defines how many servers to try when setting and getting data.
 ;memcache.max_failover_attempts=20
-
 ; Data will be transferred in chunks of this size
 ;memcache.chunk_size=8192
-
 ; The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
+; Hash function {crc32, fnv}
+;memcache.hash_function=crc32
+; Hash strategy {standard, consistent}
+;memcache.hash_strategy=standard
 
 ; Options to use the memcache session handler
 
 ; Use memcache as a session handler
 ;session.save_handler=memcache
-
 ; Defines a comma separated of server urls to use for session storage
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
 EOF
@@ -115,6 +116,10 @@
 
 
 %changelog
+* Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
+- new version
+- add new INI directives (hash_strategy + hash_function) to config.
+
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 13:24:25 -0000	1.2
+++ sources	22 Sep 2007 08:57:29 -0000	1.3
@@ -1 +1 @@
-cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz
+a9820139a4465bae9b2d9c3772ef9ba7  memcache-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 08:59:27 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 04:59:27 -0400
Subject: rpms/php-pecl-memcache/devel php-pecl-memcache.spec,1.2,1.3
Message-ID: <200709220859.l8M8xRY4008394@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8370

Modified Files:
	php-pecl-memcache.spec 
Log Message:
more changelog info


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-memcache.spec	22 Sep 2007 08:57:29 -0000	1.2
+++ php-pecl-memcache.spec	22 Sep 2007 08:58:55 -0000	1.3
@@ -118,7 +118,8 @@
 %changelog
 * Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
 - new version
-- add new INI directives (hash_strategy + hash_function) to config.
+- add new INI directives (hash_strategy + hash_function) to config
+- add BR on php-devel >= 4.3.11 
 
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM



From fedora-extras-commits at redhat.com  Sat Sep 22 09:16:53 2007
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 22 Sep 2007 05:16:53 -0400
Subject: rpms/php-pecl-memcache/F-7 php-pecl-memcache.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709220916.l8M9Grpv015486@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15462

Modified Files:
	php-pecl-memcache.spec sources 
Log Message:
update to new version 2.2.0


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-7/php-pecl-memcache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-memcache.spec	31 Aug 2007 13:33:51 -0000	1.1
+++ php-pecl-memcache.spec	22 Sep 2007 09:16:21 -0000	1.2
@@ -5,7 +5,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      2.1.2
+Version:      2.2.0
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -16,7 +16,7 @@
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel, php-pear, zlib-devel
+BuildRequires: php-devel >= 4.3.11, php-pear, zlib-devel
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 Provides:     php-pecl(%{pecl_name}) = %{version}-%{release}
@@ -35,6 +35,7 @@
 This extension allows you to work with memcached through
 handy OO and procedural interfaces.
 
+Memcache can be used as a PHP session handler.
 
 %prep 
 %setup -c -q
@@ -63,21 +64,21 @@
 
 ; Whether to transparently failover to other servers on errors
 ;memcache.allow_failover=1
-
 ; Defines how many servers to try when setting and getting data.
 ;memcache.max_failover_attempts=20
-
 ; Data will be transferred in chunks of this size
 ;memcache.chunk_size=8192
-
 ; The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
+; Hash function {crc32, fnv}
+;memcache.hash_function=crc32
+; Hash strategy {standard, consistent}
+;memcache.hash_strategy=standard
 
 ; Options to use the memcache session handler
 
 ; Use memcache as a session handler
 ;session.save_handler=memcache
-
 ; Defines a comma separated of server urls to use for session storage
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
 EOF
@@ -115,6 +116,11 @@
 
 
 %changelog
+* Sat Sep 22 2007 Remi Collet <Fedora at FamilleCollet.com> 2.2.0-1
+- new version
+- add new INI directives (hash_strategy + hash_function) to config
+- add BR on php-devel >= 4.3.11 
+
 * Mon Aug 20 2007 Remi Collet <Fedora at FamilleCollet.com> 2.1.2-1
 - initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 13:33:51 -0000	1.2
+++ sources	22 Sep 2007 09:16:21 -0000	1.3
@@ -1 +1 @@
-cfde0918360f3909a242c3211604ad46  memcache-2.1.2.tgz
+a9820139a4465bae9b2d9c3772ef9ba7  memcache-2.2.0.tgz



From fedora-extras-commits at redhat.com  Sat Sep 22 10:10:14 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 22 Sep 2007 06:10:14 -0400
Subject: rpms/gcompris/devel gcompris-8.4-fullscreen2.patch, NONE,
	1.1 gcompris.spec, 1.29, 1.30
Message-ID: <200709221010.l8MAAEBo024918@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24879

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-8.4-fullscreen2.patch 
Log Message:
* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
- Fix keyboard not working in fullscreen mode


gcompris-8.4-fullscreen2.patch:

--- NEW FILE gcompris-8.4-fullscreen2.patch ---
diff -up gcompris-8.4/src/gcompris/gcompris.c~ gcompris-8.4/src/gcompris/gcompris.c
--- gcompris-8.4/src/gcompris/gcompris.c~	2007-09-22 10:48:14.000000000 +0200
+++ gcompris-8.4/src/gcompris/gcompris.c	2007-09-22 10:48:14.000000000 +0200
@@ -977,6 +977,7 @@ void gc_fullscreen_set(gboolean state)
         gdk_window_set_override_redirect (window->window, 1);
         gdk_window_set_keep_above (window->window, 1);
         gdk_window_raise (window->window);
+        gdk_window_focus (window->window, GDK_CURRENT_TIME);
       }
       else
 #endif
@@ -1885,11 +1885,11 @@ main (int argc, char *argv[])
 
   setup_window ();
 
+  gtk_widget_show_all (window);
+
   if (properties->fullscreen)
     gc_fullscreen_set(properties->fullscreen);
 
-  gtk_widget_show_all (window);
-
   /* If a specific activity is selected, skeep the intro music */
   if(!popt_root_menu)
     {


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcompris.spec	11 Sep 2007 22:10:16 -0000	1.29
+++ gcompris.spec	22 Sep 2007 10:09:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -10,6 +10,7 @@
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 Patch2:         gcompris-8.4-configure-bugfix.patch
 Patch3:         gcompris-8.4-fullscreen.patch
+Patch4:         gcompris-8.4-fullscreen2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -260,6 +261,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
 mv tmp docs/C/%{name}.info
 
@@ -505,6 +507,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-2
+- Fix keyboard not working in fullscreen mode
+
 * Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.4-1
 - New upstream release 8.4
 - Drop -flags sub-package, the idea was that by putting the flags in a



From fedora-extras-commits at redhat.com  Sat Sep 22 11:14:29 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Sat, 22 Sep 2007 07:14:29 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-acl.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, NONE,
	1.1 thinkfinger-0.3-has-device.patch, NONE, 1.1 thinkfinger.spec,
	1.3, 1.4
Message-ID: <200709221114.l8MBETYu032351@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32308

Modified Files:
	thinkfinger.spec 
Added Files:
	thinkfinger-0.3-acl.patch thinkfinger-0.3-hal.patch 
	thinkfinger-0.3-has-device.patch 
Log Message:
* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)


thinkfinger-0.3-acl.patch:

--- NEW FILE thinkfinger-0.3-acl.patch ---
--- thinkfinger-0.3/configure.in.acl	2007-09-22 11:58:47.000000000 +0200
+++ thinkfinger-0.3/configure.in	2007-09-22 12:02:10.000000000 +0200
@@ -82,6 +82,20 @@
 # Check for pthread
 AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], AC_MSG_ERROR([libpthread missing]))
 
+# Check for libacl
+AC_CHECK_HEADERS(sys/acl.h)
+AC_CHECK_LIB(acl, acl_set_file, [ACL_LIBS="-lacl"], AC_MSG_ERROR([libacl missing]))
+AC_SUBST(ACL_LIBS)
+
+AC_ARG_ENABLE(console-perms,
+  [  --enable-console-perms=[auto/no/yes]  Enable console perms [default=auto]],,
+  enable_console_perms=auto)
+if test "x$enable_console_perms" = "xyes"; then
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, true)
+else
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, false)
+fi
+
 # Check for libusb using pkg-config
 PKG_CHECK_MODULES(USB, libusb >= 0.1.11, usb_found=yes, AC_MSG_ERROR([libusb missing]))
 
@@ -181,6 +195,7 @@
 AC_CONFIG_FILES([Makefile
 		README
 		INSTALL
+		data/Makefile
 		docs/Makefile
 		docs/autodocs/Makefile
 		libthinkfinger/Makefile
--- thinkfinger-0.3/config.h.in.acl	2007-03-30 10:23:56.000000000 +0200
+++ thinkfinger-0.3/config.h.in	2007-09-22 13:01:00.000000000 +0200
@@ -45,6 +45,9 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* Define to 1 if you have the <sys/acl.h> header file. */
+#undef HAVE_SYS_ACL_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
--- thinkfinger-0.3/configure.acl	2007-09-22 11:58:58.000000000 +0200
+++ thinkfinger-0.3/configure	2007-09-22 12:02:22.000000000 +0200
@@ -870,6 +870,9 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
+ACL_LIBS
+USE_CONSOLE_PERMS_TRUE
+USE_CONSOLE_PERMS_FALSE
 PKG_CONFIG
 USB_CFLAGS
 USB_LIBS
@@ -1499,6 +1502,7 @@
   --with-securedir=dir    Where to put PAM module [default=$libdir/security]
   --with-birdir=dir       Where to put the biometric identification records
                           (bir files) [default=$sysconfdir/pam_thinkfinger]
+  --enable-console-perms=auto/no/yes  Enable console perms default=auto
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4410,7 +4414,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4413 "configure"' > conftest.$ac_ext
+  echo '#line 4417 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7141,11 +7145,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7148: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7148: \$? = $ac_status" >&5
+   echo "$as_me:7152: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7409,11 +7413,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7412: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7416: \$? = $ac_status" >&5
+   echo "$as_me:7420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7513,11 +7517,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7520: \$? = $ac_status" >&5
+   echo "$as_me:7524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9821,7 +9825,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9824 "configure"
+#line 9828 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9921,7 +9925,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9924 "configure"
+#line 9928 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12257,11 +12261,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12264: \$? = $ac_status" >&5
+   echo "$as_me:12268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12361,11 +12365,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12368: \$? = $ac_status" >&5
+   echo "$as_me:12372: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13931,11 +13935,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13938: \$? = $ac_status" >&5
+   echo "$as_me:13942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14035,11 +14039,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14038: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14042: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14042: \$? = $ac_status" >&5
+   echo "$as_me:14046: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16233,11 +16237,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16240: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16240: \$? = $ac_status" >&5
+   echo "$as_me:16244: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16501,11 +16505,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16508: \$? = $ac_status" >&5
+   echo "$as_me:16512: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16605,11 +16609,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16612: \$? = $ac_status" >&5
+   echo "$as_me:16616: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20169,6 +20173,250 @@
 fi
 
 
+# Check for libacl
+
+for ac_header in sys/acl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------- ##
+## Report this to http://thinkfinger.sourceforge.net/ ##
+## -------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for acl_set_file in -lacl" >&5
+echo $ECHO_N "checking for acl_set_file in -lacl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lacl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_set_file ();
+int
+main ()
+{
+return acl_set_file ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_acl_acl_set_file=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_acl_acl_set_file=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_set_file" >&5
+echo "${ECHO_T}$ac_cv_lib_acl_acl_set_file" >&6; }
+if test $ac_cv_lib_acl_acl_set_file = yes; then
+  ACL_LIBS="-lacl"
+else
+  { { echo "$as_me:$LINENO: error: libacl missing" >&5
+echo "$as_me: error: libacl missing" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --enable-console-perms was given.
+if test "${enable_console_perms+set}" = set; then
+  enableval=$enable_console_perms;
+else
+  enable_console_perms=auto
+fi
+
+if test "x$enable_console_perms" = "xyes"; then
+   if true; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+else
+   if false; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+fi
+
 # Check for libusb using pkg-config
 
 
@@ -20511,7 +20759,7 @@
 
 
 # AC_CONFIG_FILES
-ac_config_files="$ac_config_files Makefile README INSTALL docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
+ac_config_files="$ac_config_files Makefile README INSTALL data/Makefile docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
 
 
 # Configuration
@@ -20663,6 +20911,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_PAM_TRUE}" && test -z "${BUILD_PAM_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -21149,6 +21411,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "README") CONFIG_FILES="$CONFIG_FILES README" ;;
     "INSTALL") CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/autodocs/Makefile" ;;
     "libthinkfinger/Makefile") CONFIG_FILES="$CONFIG_FILES libthinkfinger/Makefile" ;;
@@ -21359,6 +21622,9 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
+ACL_LIBS!$ACL_LIBS$ac_delim
+USE_CONSOLE_PERMS_TRUE!$USE_CONSOLE_PERMS_TRUE$ac_delim
+USE_CONSOLE_PERMS_FALSE!$USE_CONSOLE_PERMS_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 USB_CFLAGS!$USB_CFLAGS$ac_delim
 USB_LIBS!$USB_LIBS$ac_delim
@@ -21380,7 +21646,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- thinkfinger-0.3/data/60-thinkfinger.perms.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/60-thinkfinger.perms	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,2 @@
+<uinput>=/dev/uinput /dev/misc/uinput /dev/input/uinput
+<console> 0600 <uinput> 0600 root
--- thinkfinger-0.3/data/Makefile.am.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+if USE_CONSOLE_PERMS
+consolepermsdir = $(sysconfdir)/security/console.perms.d
+consoleperms_DATA = 60-thinkfinger.perms
+endif
+
+EXTRA_DIST = 60-thinkfinger.perms
--- thinkfinger-0.3/data/Makefile.in.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+consolepermsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINDIR = @BINDIR@
+BIRDIR = @BIRDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANDIR = @MANDIR@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PREFIX = @PREFIX@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SBINDIR = @SBINDIR@
+SECUREDIR = @SECUREDIR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at USE_CONSOLE_PERMS_TRUE@consolepermsdir = $(sysconfdir)/security/console.perms.d
+ at USE_CONSOLE_PERMS_TRUE@consoleperms_DATA = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-consolepermsDATA: $(consoleperms_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(consolepermsdir)" || $(MKDIR_P) "$(DESTDIR)$(consolepermsdir)"
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(consolepermsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  $(consolepermsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+
+uninstall-consolepermsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(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:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-consolepermsDATA
+
+install-dvi: install-dvi-am
+
+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
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-consolepermsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-consolepermsDATA install-data install-data-am \
+	install-dvi 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-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+
+# 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:
--- thinkfinger-0.3/Makefile.am.acl	2007-09-22 11:59:32.000000000 +0200
+++ thinkfinger-0.3/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -1,5 +1,5 @@
-if BUILD_PAM 
+if BUILD_PAM
   PAM_SUBDIR=pam
 endif
 
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
--- thinkfinger-0.3/Makefile.in.acl	2007-09-22 11:59:41.000000000 +0200
+++ thinkfinger-0.3/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -60,7 +60,7 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = docs libthinkfinger tf-tool pam
+DIST_SUBDIRS = data docs libthinkfinger tf-tool pam
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -73,6 +73,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -191,7 +192,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_PAM_TRUE at PAM_SUBDIR = pam
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
--- thinkfinger-0.3/tf-tool/Makefile.am.acl	2007-09-22 12:00:14.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
--- thinkfinger-0.3/tf-tool/Makefile.in.acl	2007-09-22 12:00:03.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -47,7 +47,8 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_tf_tool_OBJECTS = tf_tool-tf-tool.$(OBJEXT)
 tf_tool_OBJECTS = $(am_tf_tool_OBJECTS)
-tf_tool_DEPENDENCIES =  \
+am__DEPENDENCIES_1 =
+tf_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libthinkfinger/libthinkfinger.la
 tf_tool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(tf_tool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -70,6 +71,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -189,7 +191,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
 all: all-am
 
--- thinkfinger-0.3/tf-tool/tf-tool.c.acl	2007-09-22 12:21:37.000000000 +0200
+++ thinkfinger-0.3/tf-tool/tf-tool.c	2007-09-22 12:21:45.000000000 +0200
@@ -1,4 +1,5 @@
- /*   tf-test - A simple example for libthinkfinger
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+  *   tf-test - A simple example for libthinkfinger
   *
   *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
   *   fingerprint reader.
@@ -22,12 +23,18 @@
   *
   */
 
+#include <config.h>
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <libgen.h>
 #include <pwd.h>
 
-#include <config.h>
+#ifdef HAVE_SYS_ACL_H
+#include <acl/libacl.h>
+#endif
+
 #include <libthinkfinger.h>
 
 #define MODE_UNDEFINED 0
@@ -318,6 +325,146 @@
 	return retval;
 }
 
+static int
+set_permissions_for_user (const char *path,
+			  const char *username)
+{
+#ifdef HAVE_SYS_ACL_H
+	int res;
+	struct passwd *p;
+	acl_t acl;
+	acl_entry_t entry;
+	acl_permset_t permset;
+	uid_t uid;
+
+	/* this is so that a user is able to read his/her own file
+	 * when reauthenticating via the screensaver etc. */
+	p = getpwnam (username);
+	uid = p->pw_uid;
+
+	fprintf (stderr, "Setting ACL on aquired file: %s.\n",
+		 path);
+
+	res = -1;
+
+	acl = acl_init (4);
+
+	/* User Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_WRITE) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Group Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_GROUP_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Others */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_OTHER) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Mask */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_MASK) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* User */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER) == -1) {
+		goto out;
+	}
+	if (acl_set_qualifier (entry, &uid) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	res = acl_set_file (path, ACL_TYPE_ACCESS, acl);
+
+ out:
+	acl_free (acl);
+	if (res != 0) {
+		fprintf (stderr, "Unable to set ACL of aquired file: %s: %s\n",
+			 path,
+			 strerror (errno));
+	}
+
+	return res;
+#else
+	return -1;
+#endif
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -329,6 +476,8 @@
 	const char *user;
 #endif
 
+	user = NULL;
+
 	printf ("%s\n", BANNER);
 
 	if (argc == 1) {
@@ -472,13 +621,18 @@
 
 	}
 	if (tfdata.mode == MODE_ACQUIRE) {
+		umask (0077);
 		retval = acquire (&tfdata);
+		if (retval == 0 && user != NULL) {
+			set_permissions_for_user (tfdata.bir, user);
+		}
 	} else if (tfdata.mode == MODE_VERIFY) {
 		retval = verify (&tfdata);
 	} else {
 		usage (argv[0]);
 		retval = -1;
 	}
+
 out:
 	exit (retval);
 }

thinkfinger-0.3-hal.patch:

--- NEW FILE thinkfinger-0.3-hal.patch ---
--- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- Grant access to the fingerprint reader device to logged-in users.  Required
+         for gnome-screensaver (which runs as the user) to successfully initialize
+         pam_thinkfinger. -->
+
+    <match key="usb_device.vendor_id" int="1155"> <!-- SGS Thomson Microelectronics -->
+      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
--- thinkfinger-0.3/data/Makefile.am.hal	2007-09-22 12:40:48.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:41:33.000000000 +0200
@@ -4,5 +4,8 @@
 consolepermsdir = $(sysconfdir)/security/console.perms.d
 consoleperms_DATA = 60-thinkfinger.perms
 endif
+ 
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
--- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
@@ -49,9 +49,11 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
+	"$(DESTDIR)$(halpolicydir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA)
+halpolicyDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -174,7 +176,9 @@
 top_srcdir = @top_srcdir@
 @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
-EXTRA_DIST = 60-thinkfinger.perms
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
 all: all-am
 
 .SUFFIXES:
@@ -230,6 +234,23 @@
 	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
 	done
+install-halpolicyDATA: $(halpolicy_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(halpolicydir)" || $(MKDIR_P) "$(DESTDIR)$(halpolicydir)"
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(halpolicyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  $(halpolicyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
+
+uninstall-halpolicyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -267,7 +288,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -312,7 +333,7 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA
 
 install-dvi: install-dvi-am
 
@@ -346,7 +367,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 .MAKE: install-am install-strip
 
@@ -355,12 +376,13 @@
 	dvi-am html html-am info info-am install install-am \
 	install-consolepermsDATA install-data install-data-am \
 	install-dvi 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-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+	install-halpolicyDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 # 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.

thinkfinger-0.3-has-device.patch:

--- NEW FILE thinkfinger-0.3-has-device.patch ---
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.c.has-device	2007-03-30 10:57:24.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
  *   fingerprint reader.
  *
@@ -41,6 +42,14 @@
 #define DEFAULT_BULK_SIZE 0x40
 #define INITIAL_SEQUENCE  0x60
 
+#ifndef        FALSE
+#define        FALSE   (0)
+#endif
+
+#ifndef        TRUE
+#define        TRUE    (!FALSE)
+#endif
+
 static char init_a[17] = {
 	0x43, 0x69, 0x61, 0x6f, 0x04, 0x00, 0x08, 0x01,
 	0x00, 0xe8, 0x03, 0x00, 0x00, 0xff, 0x07, 0xdb,
@@ -405,6 +414,20 @@
 	return;
 }
 
+int libthinkfinger_has_device (libthinkfinger *tf)
+{
+	struct usb_device *usb_dev;
+	int retval;
+
+	retval = FALSE;
+	usb_dev = _libthinkfinger_usb_device_find ();
+	if (usb_dev != NULL) {
+		retval = TRUE;
+	}
+
+	return retval;
+}
+
 static libthinkfinger_init_status _libthinkfinger_usb_init (libthinkfinger *tf)
 {
 	libthinkfinger_init_status retval = TF_INIT_UNDEFINED;
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.h.has-device	2007-03-30 10:22:02.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.h	2007-09-22 12:32:24.000000000 +0200
@@ -165,6 +165,16 @@
  */
 libthinkfinger *libthinkfinger_new(libthinkfinger_init_status* init_status);
 
+/** @brief check to see if a scanner device is present
+ *
+ * check to see if a scanner device is present
+ *
+ * @param tf struct libthinkfinger
+ *
+ * @return TRUE if a device is present
+ */
+int libthinkfinger_has_device(libthinkfinger *tf);
+
 /** @brief free an instance of libthinkfinger
  *
  * @param tf pointer to struct libthinkfinger
--- thinkfinger-0.3/pam/pam_thinkfinger.c.has-device	2007-03-29 17:00:45.000000000 +0200
+++ thinkfinger-0.3/pam/pam_thinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,6 @@
-/*   ThinkFinger Pluggable Authentication Module
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *   ThinkFinger Pluggable Authentication Module
  *
  *   PAM module for libthinkfinger which is a driver for the UPEK/SGS Thomson
  *   Microelectronics fingerprint reader.
@@ -158,14 +160,13 @@
 		pam_thinkfinger->swipe_retval = PAM_AUTH_ERR;
 		pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 				     "User '%s' verification failed (0x%x).", pam_thinkfinger->user, tf_state);
-		goto out;
 	}
 
 	ret = uinput_cr (&pam_thinkfinger->uinput_fd);
 	if (ret != 0)
 		pam_thinkfinger_log (pam_thinkfinger, LOG_ERR,
 				     "Could not send carriage return via uinput: %s.", strerror (ret));
-out:
+
 	pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 			     "%s returning '%d': %s.", __FUNCTION__, pam_thinkfinger->swipe_retval,
 			     pam_thinkfinger->swipe_retval ? pam_strerror (pam_thinkfinger->pamh, pam_thinkfinger->swipe_retval) : "success");
@@ -258,6 +259,15 @@
 		goto out;
 	}
 
+	ret = libthinkfinger_has_device (pam_thinkfinger.tf);
+	if (! ret) {
+		retval = PAM_AUTHINFO_UNAVAIL;
+
+		if (pam_thinkfinger.tf)
+			libthinkfinger_free (pam_thinkfinger.tf);
+		goto out;
+	}
+
 	ret = pthread_create (&pam_thinkfinger.t_pam_prompt, NULL, (void *) &pam_prompt_thread, &pam_thinkfinger);
 	if (ret != 0) {
 		pam_thinkfinger_log (&pam_thinkfinger, LOG_ERR, "Error calling pthread_create (%s).", strerror (ret));


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thinkfinger.spec	26 Aug 2007 08:12:10 -0000	1.3
+++ thinkfinger.spec	22 Sep 2007 11:13:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -8,10 +8,15 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        README.thinkfinger
 Patch0:         thinkfinger-0.3-birdir.patch
+Patch1:         thinkfinger-0.3-acl.patch
+Patch2:         thinkfinger-0.3-has-device.patch
+Patch3:         thinkfinger-0.3-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
+BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
+Requires:       hal
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -57,12 +62,19 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .securitydir
+# Preserve the timestamp on the autoconf source file
+touch -r configure.in configure.in.stamp
+%patch1 -p1 -b .acl
+touch -r configure.in.stamp configure.in
+%patch2 -p1 -b .has-device
+%patch3 -p1 -b .hal
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
 %build
-%configure --disable-static\
-           --with-securedir=/%{_lib}/security
+%configure --disable-static \
+           --with-securedir=/%{_lib}/security \
+           --enable-console-perms=yes
 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}
@@ -82,7 +94,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/thinkfinger.modules <<EOF
 #!/bin/sh
-modprobe uinput >/dev/null 2>&1
+/sbin/modprobe uinput >/dev/null 2>&1
 EOF
 
 
@@ -102,6 +114,8 @@
 %{_mandir}/man1/tf-tool.1.gz
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
+%{_sysconfdir}/security/console.perms.d/*
+%{_datadir}/hal/fdi/information/20thirdparty/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -114,6 +128,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
+- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-3
 - Adjusted License tag as per latest guidelines
 



From fedora-extras-commits at redhat.com  Sat Sep 22 11:19:21 2007
From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol))
Date: Sat, 22 Sep 2007 07:19:21 -0400
Subject: rpms/thinkfinger/F-7 thinkfinger-0.3-acl.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, NONE,
	1.1 thinkfinger-0.3-has-device.patch, NONE, 1.1 thinkfinger.spec,
	1.2, 1.3
Message-ID: <200709221119.l8MBJL0l032536@cvs-int.fedora.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/thinkfinger/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32509

Modified Files:
	thinkfinger.spec 
Added Files:
	thinkfinger-0.3-acl.patch thinkfinger-0.3-hal.patch 
	thinkfinger-0.3-has-device.patch 
Log Message:
* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)


thinkfinger-0.3-acl.patch:

--- NEW FILE thinkfinger-0.3-acl.patch ---
--- thinkfinger-0.3/configure.in.acl	2007-09-22 11:58:47.000000000 +0200
+++ thinkfinger-0.3/configure.in	2007-09-22 12:02:10.000000000 +0200
@@ -82,6 +82,20 @@
 # Check for pthread
 AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], AC_MSG_ERROR([libpthread missing]))
 
+# Check for libacl
+AC_CHECK_HEADERS(sys/acl.h)
+AC_CHECK_LIB(acl, acl_set_file, [ACL_LIBS="-lacl"], AC_MSG_ERROR([libacl missing]))
+AC_SUBST(ACL_LIBS)
+
+AC_ARG_ENABLE(console-perms,
+  [  --enable-console-perms=[auto/no/yes]  Enable console perms [default=auto]],,
+  enable_console_perms=auto)
+if test "x$enable_console_perms" = "xyes"; then
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, true)
+else
+  AM_CONDITIONAL(USE_CONSOLE_PERMS, false)
+fi
+
 # Check for libusb using pkg-config
 PKG_CHECK_MODULES(USB, libusb >= 0.1.11, usb_found=yes, AC_MSG_ERROR([libusb missing]))
 
@@ -181,6 +195,7 @@
 AC_CONFIG_FILES([Makefile
 		README
 		INSTALL
+		data/Makefile
 		docs/Makefile
 		docs/autodocs/Makefile
 		libthinkfinger/Makefile
--- thinkfinger-0.3/config.h.in.acl	2007-03-30 10:23:56.000000000 +0200
+++ thinkfinger-0.3/config.h.in	2007-09-22 13:01:00.000000000 +0200
@@ -45,6 +45,9 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* Define to 1 if you have the <sys/acl.h> header file. */
+#undef HAVE_SYS_ACL_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
--- thinkfinger-0.3/configure.acl	2007-09-22 11:58:58.000000000 +0200
+++ thinkfinger-0.3/configure	2007-09-22 12:02:22.000000000 +0200
@@ -870,6 +870,9 @@
 FFLAGS
 ac_ct_F77
 LIBTOOL
+ACL_LIBS
+USE_CONSOLE_PERMS_TRUE
+USE_CONSOLE_PERMS_FALSE
 PKG_CONFIG
 USB_CFLAGS
 USB_LIBS
@@ -1499,6 +1502,7 @@
   --with-securedir=dir    Where to put PAM module [default=$libdir/security]
   --with-birdir=dir       Where to put the biometric identification records
                           (bir files) [default=$sysconfdir/pam_thinkfinger]
+  --enable-console-perms=auto/no/yes  Enable console perms default=auto
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4410,7 +4414,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4413 "configure"' > conftest.$ac_ext
+  echo '#line 4417 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7141,11 +7145,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7148: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7148: \$? = $ac_status" >&5
+   echo "$as_me:7152: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7409,11 +7413,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7412: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7416: \$? = $ac_status" >&5
+   echo "$as_me:7420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7513,11 +7517,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7520: \$? = $ac_status" >&5
+   echo "$as_me:7524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9821,7 +9825,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9824 "configure"
+#line 9828 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9921,7 +9925,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9924 "configure"
+#line 9928 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12257,11 +12261,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12264: \$? = $ac_status" >&5
+   echo "$as_me:12268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12361,11 +12365,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12368: \$? = $ac_status" >&5
+   echo "$as_me:12372: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13931,11 +13935,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13938: \$? = $ac_status" >&5
+   echo "$as_me:13942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14035,11 +14039,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14038: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14042: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14042: \$? = $ac_status" >&5
+   echo "$as_me:14046: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16233,11 +16237,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16240: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16240: \$? = $ac_status" >&5
+   echo "$as_me:16244: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16501,11 +16505,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16508: \$? = $ac_status" >&5
+   echo "$as_me:16512: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16605,11 +16609,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16612: \$? = $ac_status" >&5
+   echo "$as_me:16616: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20169,6 +20173,250 @@
 fi
 
 
+# Check for libacl
+
+for ac_header in sys/acl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------- ##
+## Report this to http://thinkfinger.sourceforge.net/ ##
+## -------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for acl_set_file in -lacl" >&5
+echo $ECHO_N "checking for acl_set_file in -lacl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lacl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_set_file ();
+int
+main ()
+{
+return acl_set_file ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_acl_acl_set_file=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_acl_acl_set_file=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_set_file" >&5
+echo "${ECHO_T}$ac_cv_lib_acl_acl_set_file" >&6; }
+if test $ac_cv_lib_acl_acl_set_file = yes; then
+  ACL_LIBS="-lacl"
+else
+  { { echo "$as_me:$LINENO: error: libacl missing" >&5
+echo "$as_me: error: libacl missing" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+# Check whether --enable-console-perms was given.
+if test "${enable_console_perms+set}" = set; then
+  enableval=$enable_console_perms;
+else
+  enable_console_perms=auto
+fi
+
+if test "x$enable_console_perms" = "xyes"; then
+   if true; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+else
+   if false; then
+  USE_CONSOLE_PERMS_TRUE=
+  USE_CONSOLE_PERMS_FALSE='#'
+else
+  USE_CONSOLE_PERMS_TRUE='#'
+  USE_CONSOLE_PERMS_FALSE=
+fi
+
+fi
+
 # Check for libusb using pkg-config
 
 
@@ -20511,7 +20759,7 @@
 
 
 # AC_CONFIG_FILES
-ac_config_files="$ac_config_files Makefile README INSTALL docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
+ac_config_files="$ac_config_files Makefile README INSTALL data/Makefile docs/Makefile docs/autodocs/Makefile libthinkfinger/Makefile libthinkfinger/libthinkfinger.pc pam/Makefile tf-tool/Makefile"
 
 
 # Configuration
@@ -20663,6 +20911,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_CONSOLE_PERMS_TRUE}" && test -z "${USE_CONSOLE_PERMS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_CONSOLE_PERMS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_PAM_TRUE}" && test -z "${BUILD_PAM_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -21149,6 +21411,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "README") CONFIG_FILES="$CONFIG_FILES README" ;;
     "INSTALL") CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/autodocs/Makefile" ;;
     "libthinkfinger/Makefile") CONFIG_FILES="$CONFIG_FILES libthinkfinger/Makefile" ;;
@@ -21359,6 +21622,9 @@
 FFLAGS!$FFLAGS$ac_delim
 ac_ct_F77!$ac_ct_F77$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
+ACL_LIBS!$ACL_LIBS$ac_delim
+USE_CONSOLE_PERMS_TRUE!$USE_CONSOLE_PERMS_TRUE$ac_delim
+USE_CONSOLE_PERMS_FALSE!$USE_CONSOLE_PERMS_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 USB_CFLAGS!$USB_CFLAGS$ac_delim
 USB_LIBS!$USB_LIBS$ac_delim
@@ -21380,7 +21646,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- thinkfinger-0.3/data/60-thinkfinger.perms.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/60-thinkfinger.perms	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,2 @@
+<uinput>=/dev/uinput /dev/misc/uinput /dev/input/uinput
+<console> 0600 <uinput> 0600 root
--- thinkfinger-0.3/data/Makefile.am.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+if USE_CONSOLE_PERMS
+consolepermsdir = $(sysconfdir)/security/console.perms.d
+consoleperms_DATA = 60-thinkfinger.perms
+endif
+
+EXTRA_DIST = 60-thinkfinger.perms
--- thinkfinger-0.3/data/Makefile.in.acl	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+consolepermsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINDIR = @BINDIR@
+BIRDIR = @BIRDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANDIR = @MANDIR@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PREFIX = @PREFIX@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+SBINDIR = @SBINDIR@
+SECUREDIR = @SECUREDIR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at USE_CONSOLE_PERMS_TRUE@consolepermsdir = $(sysconfdir)/security/console.perms.d
+ at USE_CONSOLE_PERMS_TRUE@consoleperms_DATA = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-consolepermsDATA: $(consoleperms_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(consolepermsdir)" || $(MKDIR_P) "$(DESTDIR)$(consolepermsdir)"
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(consolepermsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  $(consolepermsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+
+uninstall-consolepermsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(consoleperms_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(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:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-consolepermsDATA
+
+install-dvi: install-dvi-am
+
+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
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-consolepermsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-consolepermsDATA install-data install-data-am \
+	install-dvi 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-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+
+# 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:
--- thinkfinger-0.3/Makefile.am.acl	2007-09-22 11:59:32.000000000 +0200
+++ thinkfinger-0.3/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -1,5 +1,5 @@
-if BUILD_PAM 
+if BUILD_PAM
   PAM_SUBDIR=pam
 endif
 
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
--- thinkfinger-0.3/Makefile.in.acl	2007-09-22 11:59:41.000000000 +0200
+++ thinkfinger-0.3/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -60,7 +60,7 @@
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = docs libthinkfinger tf-tool pam
+DIST_SUBDIRS = data docs libthinkfinger tf-tool pam
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -73,6 +73,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -191,7 +192,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_PAM_TRUE at PAM_SUBDIR = pam
-SUBDIRS = docs libthinkfinger tf-tool $(PAM_SUBDIR)
+SUBDIRS = data docs libthinkfinger tf-tool $(PAM_SUBDIR)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
--- thinkfinger-0.3/tf-tool/Makefile.am.acl	2007-09-22 12:00:14.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.am	2007-09-22 12:02:10.000000000 +0200
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
--- thinkfinger-0.3/tf-tool/Makefile.in.acl	2007-09-22 12:00:03.000000000 +0200
+++ thinkfinger-0.3/tf-tool/Makefile.in	2007-09-22 12:12:53.000000000 +0200
@@ -47,7 +47,8 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_tf_tool_OBJECTS = tf_tool-tf-tool.$(OBJEXT)
 tf_tool_OBJECTS = $(am_tf_tool_OBJECTS)
-tf_tool_DEPENDENCIES =  \
+am__DEPENDENCIES_1 =
+tf_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libthinkfinger/libthinkfinger.la
 tf_tool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(tf_tool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -70,6 +71,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -189,7 +191,7 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/libthinkfinger
 tf_tool_SOURCES = tf-tool.c
-tf_tool_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la 
+tf_tool_LDADD = $(ACL_LIBS) $(top_builddir)/libthinkfinger/libthinkfinger.la 
 tf_tool_CFLAGS = $(CFLAGS)
 all: all-am
 
--- thinkfinger-0.3/tf-tool/tf-tool.c.acl	2007-09-22 12:21:37.000000000 +0200
+++ thinkfinger-0.3/tf-tool/tf-tool.c	2007-09-22 12:21:45.000000000 +0200
@@ -1,4 +1,5 @@
- /*   tf-test - A simple example for libthinkfinger
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+  *   tf-test - A simple example for libthinkfinger
   *
   *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
   *   fingerprint reader.
@@ -22,12 +23,18 @@
   *
   */
 
+#include <config.h>
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <libgen.h>
 #include <pwd.h>
 
-#include <config.h>
+#ifdef HAVE_SYS_ACL_H
+#include <acl/libacl.h>
+#endif
+
 #include <libthinkfinger.h>
 
 #define MODE_UNDEFINED 0
@@ -318,6 +325,146 @@
 	return retval;
 }
 
+static int
+set_permissions_for_user (const char *path,
+			  const char *username)
+{
+#ifdef HAVE_SYS_ACL_H
+	int res;
+	struct passwd *p;
+	acl_t acl;
+	acl_entry_t entry;
+	acl_permset_t permset;
+	uid_t uid;
+
+	/* this is so that a user is able to read his/her own file
+	 * when reauthenticating via the screensaver etc. */
+	p = getpwnam (username);
+	uid = p->pw_uid;
+
+	fprintf (stderr, "Setting ACL on aquired file: %s.\n",
+		 path);
+
+	res = -1;
+
+	acl = acl_init (4);
+
+	/* User Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_WRITE) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Group Obj */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_GROUP_OBJ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Others */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_OTHER) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* Mask */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_MASK) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	/* User */
+	if (acl_create_entry (&acl, &entry) == -1) {
+		goto out;
+	}
+	if (acl_set_tag_type (entry, ACL_USER) == -1) {
+		goto out;
+	}
+	if (acl_set_qualifier (entry, &uid) == -1) {
+		goto out;
+	}
+	if (acl_get_permset (entry, &permset) == -1) {
+		goto out;
+	}
+	if (acl_clear_perms (permset) == -1) {
+		goto out;
+	}
+	if (acl_add_perm (permset, ACL_READ) == -1) {
+		goto out;
+	}
+	if (acl_set_permset (entry, permset) == -1) {
+		goto out;
+	}
+
+	res = acl_set_file (path, ACL_TYPE_ACCESS, acl);
+
+ out:
+	acl_free (acl);
+	if (res != 0) {
+		fprintf (stderr, "Unable to set ACL of aquired file: %s: %s\n",
+			 path,
+			 strerror (errno));
+	}
+
+	return res;
+#else
+	return -1;
+#endif
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -329,6 +476,8 @@
 	const char *user;
 #endif
 
+	user = NULL;
+
 	printf ("%s\n", BANNER);
 
 	if (argc == 1) {
@@ -472,13 +621,18 @@
 
 	}
 	if (tfdata.mode == MODE_ACQUIRE) {
+		umask (0077);
 		retval = acquire (&tfdata);
+		if (retval == 0 && user != NULL) {
+			set_permissions_for_user (tfdata.bir, user);
+		}
 	} else if (tfdata.mode == MODE_VERIFY) {
 		retval = verify (&tfdata);
 	} else {
 		usage (argv[0]);
 		retval = -1;
 	}
+
 out:
 	exit (retval);
 }

thinkfinger-0.3-hal.patch:

--- NEW FILE thinkfinger-0.3-hal.patch ---
--- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- Grant access to the fingerprint reader device to logged-in users.  Required
+         for gnome-screensaver (which runs as the user) to successfully initialize
+         pam_thinkfinger. -->
+
+    <match key="usb_device.vendor_id" int="1155"> <!-- SGS Thomson Microelectronics -->
+      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
--- thinkfinger-0.3/data/Makefile.am.hal	2007-09-22 12:40:48.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.am	2007-09-22 12:41:33.000000000 +0200
@@ -4,5 +4,8 @@
 consolepermsdir = $(sysconfdir)/security/console.perms.d
 consoleperms_DATA = 60-thinkfinger.perms
 endif
+ 
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
--- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
+++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
@@ -49,9 +49,11 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(consolepermsdir)"
+am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
+	"$(DESTDIR)$(halpolicydir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA)
+halpolicyDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -174,7 +176,9 @@
 top_srcdir = @top_srcdir@
 @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
-EXTRA_DIST = 60-thinkfinger.perms
+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
+halpolicy_DATA = 10-thinkfinger.fdi
+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
 all: all-am
 
 .SUFFIXES:
@@ -230,6 +234,23 @@
 	  echo " rm -f '$(DESTDIR)$(consolepermsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(consolepermsdir)/$$f"; \
 	done
+install-halpolicyDATA: $(halpolicy_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(halpolicydir)" || $(MKDIR_P) "$(DESTDIR)$(halpolicydir)"
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(halpolicyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  $(halpolicyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
+
+uninstall-halpolicyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(halpolicy_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -267,7 +288,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -312,7 +333,7 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA
 
 install-dvi: install-dvi-am
 
@@ -346,7 +367,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 .MAKE: install-am install-strip
 
@@ -355,12 +376,13 @@
 	dvi-am html html-am info info-am install install-am \
 	install-consolepermsDATA install-data install-data-am \
 	install-dvi 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-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-consolepermsDATA
+	install-halpolicyDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-consolepermsDATA uninstall-halpolicyDATA
 
 # 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.

thinkfinger-0.3-has-device.patch:

--- NEW FILE thinkfinger-0.3-has-device.patch ---
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.c.has-device	2007-03-30 10:57:24.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  *   ThinkFinger - A driver for the UPEK/SGS Thomson Microelectronics
  *   fingerprint reader.
  *
@@ -41,6 +42,14 @@
 #define DEFAULT_BULK_SIZE 0x40
 #define INITIAL_SEQUENCE  0x60
 
+#ifndef        FALSE
+#define        FALSE   (0)
+#endif
+
+#ifndef        TRUE
+#define        TRUE    (!FALSE)
+#endif
+
 static char init_a[17] = {
 	0x43, 0x69, 0x61, 0x6f, 0x04, 0x00, 0x08, 0x01,
 	0x00, 0xe8, 0x03, 0x00, 0x00, 0xff, 0x07, 0xdb,
@@ -405,6 +414,20 @@
 	return;
 }
 
+int libthinkfinger_has_device (libthinkfinger *tf)
+{
+	struct usb_device *usb_dev;
+	int retval;
+
+	retval = FALSE;
+	usb_dev = _libthinkfinger_usb_device_find ();
+	if (usb_dev != NULL) {
+		retval = TRUE;
+	}
+
+	return retval;
+}
+
 static libthinkfinger_init_status _libthinkfinger_usb_init (libthinkfinger *tf)
 {
 	libthinkfinger_init_status retval = TF_INIT_UNDEFINED;
--- thinkfinger-0.3/libthinkfinger/libthinkfinger.h.has-device	2007-03-30 10:22:02.000000000 +0200
+++ thinkfinger-0.3/libthinkfinger/libthinkfinger.h	2007-09-22 12:32:24.000000000 +0200
@@ -165,6 +165,16 @@
  */
 libthinkfinger *libthinkfinger_new(libthinkfinger_init_status* init_status);
 
+/** @brief check to see if a scanner device is present
+ *
+ * check to see if a scanner device is present
+ *
+ * @param tf struct libthinkfinger
+ *
+ * @return TRUE if a device is present
+ */
+int libthinkfinger_has_device(libthinkfinger *tf);
+
 /** @brief free an instance of libthinkfinger
  *
  * @param tf pointer to struct libthinkfinger
--- thinkfinger-0.3/pam/pam_thinkfinger.c.has-device	2007-03-29 17:00:45.000000000 +0200
+++ thinkfinger-0.3/pam/pam_thinkfinger.c	2007-09-22 12:32:24.000000000 +0200
@@ -1,4 +1,6 @@
-/*   ThinkFinger Pluggable Authentication Module
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *   ThinkFinger Pluggable Authentication Module
  *
  *   PAM module for libthinkfinger which is a driver for the UPEK/SGS Thomson
  *   Microelectronics fingerprint reader.
@@ -158,14 +160,13 @@
 		pam_thinkfinger->swipe_retval = PAM_AUTH_ERR;
 		pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 				     "User '%s' verification failed (0x%x).", pam_thinkfinger->user, tf_state);
-		goto out;
 	}
 
 	ret = uinput_cr (&pam_thinkfinger->uinput_fd);
 	if (ret != 0)
 		pam_thinkfinger_log (pam_thinkfinger, LOG_ERR,
 				     "Could not send carriage return via uinput: %s.", strerror (ret));
-out:
+
 	pam_thinkfinger_log (pam_thinkfinger, LOG_NOTICE,
 			     "%s returning '%d': %s.", __FUNCTION__, pam_thinkfinger->swipe_retval,
 			     pam_thinkfinger->swipe_retval ? pam_strerror (pam_thinkfinger->pamh, pam_thinkfinger->swipe_retval) : "success");
@@ -258,6 +259,15 @@
 		goto out;
 	}
 
+	ret = libthinkfinger_has_device (pam_thinkfinger.tf);
+	if (! ret) {
+		retval = PAM_AUTHINFO_UNAVAIL;
+
+		if (pam_thinkfinger.tf)
+			libthinkfinger_free (pam_thinkfinger.tf);
+		goto out;
+	}
+
 	ret = pthread_create (&pam_thinkfinger.t_pam_prompt, NULL, (void *) &pam_prompt_thread, &pam_thinkfinger);
 	if (ret != 0) {
 		pam_thinkfinger_log (&pam_thinkfinger, LOG_ERR, "Error calling pthread_create (%s).", strerror (ret));


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkfinger/F-7/thinkfinger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkfinger.spec	4 Aug 2007 13:44:00 -0000	1.2
+++ thinkfinger.spec	22 Sep 2007 11:18:49 -0000	1.3
@@ -1,17 +1,22 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
-License:        GPL
+License:        GPLv2+
 URL:            http://thinkfinger.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        README.thinkfinger
 Patch0:         thinkfinger-0.3-birdir.patch
+Patch1:         thinkfinger-0.3-acl.patch
+Patch2:         thinkfinger-0.3-has-device.patch
+Patch3:         thinkfinger-0.3-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
+BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
+Requires:       hal
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -57,12 +62,19 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .securitydir
+# Preserve the timestamp on the autoconf source file
+touch -r configure.in configure.in.stamp
+%patch1 -p1 -b .acl
+touch -r configure.in.stamp configure.in
+%patch2 -p1 -b .has-device
+%patch3 -p1 -b .hal
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
 %build
-%configure --disable-static\
-           --with-securedir=/%{_lib}/security
+%configure --disable-static \
+           --with-securedir=/%{_lib}/security \
+           --enable-console-perms=yes
 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}
@@ -82,7 +94,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/thinkfinger.modules <<EOF
 #!/bin/sh
-modprobe uinput >/dev/null 2>&1
+/sbin/modprobe uinput >/dev/null 2>&1
 EOF
 
 
@@ -102,6 +114,8 @@
 %{_mandir}/man1/tf-tool.1.gz
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
+%{_sysconfdir}/security/console.perms.d/*
+%{_datadir}/hal/fdi/information/20thirdparty/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -114,6 +128,12 @@
 
 
 %changelog
+* Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
+- Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
+
+* Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-3
+- Adjusted License tag as per latest guidelines
+
 * Fri May 18 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-2
 - Merged Jose Plans' changes (RH #237817)
 



From fedora-extras-commits at redhat.com  Sat Sep 22 11:37:23 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sat, 22 Sep 2007 07:37:23 -0400
Subject: rpms/compiz-fusion/devel .cvsignore, 1.2, 1.3 compiz-fusion.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221137.l8MBbNOk000709@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv677

Modified Files:
	.cvsignore compiz-fusion.spec sources 
Log Message:
update to 0.6 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2007 19:10:29 -0000	1.2
+++ .cvsignore	22 Sep 2007 11:36:51 -0000	1.3
@@ -1 +1 @@
-compiz-fusion-plugins-main-0.5.2.tar.bz2
+compiz-fusion-plugins-main-09b700.tar.bz2


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-fusion.spec	19 Sep 2007 17:13:54 -0000	1.2
+++ compiz-fusion.spec	22 Sep 2007 11:36:51 -0000	1.3
@@ -1,14 +1,16 @@
 %define plugins animation colorfilter expo ezoom imgjpeg neg opacify put resizeinfo ring scaleaddon shift snap text thumbnail vpswitch wall winrules workarounds
 
+%define snapshot 09b700
+
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 6%{?dist}
+Release: 7.%{snapshot}%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
 License: GPLv2+       
 URL: http://compiz-fusion.org            
-Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{version}.tar.bz2   
+Source0: http://releases.compiz-fusion.org/0.5.2/%{name}-plugins-main-%{snapshot}.tar.bz2   
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
@@ -57,7 +59,7 @@
 
 
 %prep
-%setup -q -n %{name}-plugins-main-%{version}
+%setup -q -n %{name}-plugins-main-%{snapshot}
 
 %build
 %configure --enable-schemas
@@ -112,6 +114,7 @@
 %doc COPYING AUTHORS
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
+%{_datadir}/compiz/filters/
 
 %files  gnome
 %defattr(-,root,root,-)
@@ -124,6 +127,9 @@
 
 
 %changelog
+* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
+- Update to 0.6 branch (builds against current compiz)
+
 * Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6
 - Add animation to plugin list
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2007 19:10:29 -0000	1.2
+++ sources	22 Sep 2007 11:36:51 -0000	1.3
@@ -1 +1 @@
-cb5703d8e59697dd6c7b075c483e81cc  compiz-fusion-plugins-main-0.5.2.tar.bz2
+08e13a2a2124666437cc4553bd0053a8  compiz-fusion-plugins-main-09b700.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 11:39:08 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sat, 22 Sep 2007 07:39:08 -0400
Subject: rpms/compiz-fusion-extras/devel .cvsignore, 1.2,
	1.3 compiz-fusion-extras.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709221139.l8MBd8Hw000928@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv903

Modified Files:
	.cvsignore compiz-fusion-extras.spec sources 
Log Message:
update to 0.6 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2007 19:06:43 -0000	1.2
+++ .cvsignore	22 Sep 2007 11:38:36 -0000	1.3
@@ -1 +1 @@
-compiz-fusion-plugins-extra-0.5.2.tar.bz2
+compiz-fusion-plugins-extra-6871d0.tar.bz2


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-fusion-extras.spec	18 Sep 2007 19:06:43 -0000	1.1
+++ compiz-fusion-extras.spec	22 Sep 2007 11:38:36 -0000	1.2
@@ -1,14 +1,16 @@
 %define plugins addhelper bench crashhandler cubecaps cubereflex extrawm fadedesktop firepaint gears goto-viewport group mblur reflex scalefilter showdesktop splash trailfocus widget
 
+%define snapshot 6871d0
+
 Name: compiz-fusion-extras
 Version: 0.5.2       
-Release: 5%{?dist}
+Release: 6.%{snapshot}%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
 License: GPLv2+       
 URL: http://compiz-fusion.org            
-Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{version}.tar.bz2   
+Source0: http://releases.compiz-fusion.org/0.5.2/compiz-fusion-plugins-extra-%{snapshot}.tar.bz2   
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
@@ -48,7 +50,7 @@
 
 
 %prep
-%setup -q -n compiz-fusion-plugins-extra-%{version}
+%setup -q -n compiz-fusion-plugins-extra-%{snapshot}
 
 %build
 %configure --enable-schemas
@@ -101,12 +103,16 @@
 %{_libdir}/compiz/*.so
 %{_datadir}/compiz/*.xml
 %{_datadir}/compiz/reflection.png
+%{_datadir}/compiz/*.png
 
 %files gnome
 %defattr(-,root,root,-)
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
+- Update to 0.6 branch (builds against current compiz)
+
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5
 - Fix gconf schemas install (RH #53692)
 - Some build fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2007 19:06:43 -0000	1.2
+++ sources	22 Sep 2007 11:38:36 -0000	1.3
@@ -1 +1 @@
-866a4e5decb8b40df6bd0161dbd24a53  compiz-fusion-plugins-extra-0.5.2.tar.bz2
+c2044f8cd85b90a9e920717ddd8f76bd  compiz-fusion-plugins-extra-6871d0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 11:46:15 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Sat, 22 Sep 2007 07:46:15 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.690, 1.691 kernel.spec, 1.177,
	1.178 linux-2.6-execshield.patch, 1.72,
	1.73 linux-2.6-highres-timers.patch, 1.9,
	1.10 linux-2.6-utrace-ptrace-compat.patch, 1.6,
	1.7 linux-2.6-utrace-regset.patch, 1.6,
	1.7 linux-2.6-utrace-tracehook.patch, 1.11, 1.12 sources, 1.652,
	1.653 upstream, 1.574, 1.575 patch-2.6.23-rc7-git1.bz2.sign, 1.1, NONE
Message-ID: <200709221146.l8MBkFOP001340@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1290

Modified Files:
	.cvsignore kernel.spec linux-2.6-execshield.patch 
	linux-2.6-highres-timers.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc7-git3.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git1.bz2.sign 
Log Message:
* Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.23-rc7-git3



--- NEW FILE patch-2.6.23-rc7-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9L6jyGugalF9Dw4RAoGEAJ9B1kHctkPAhAzuj6LMOvpZGbGXGgCfYZS8
UZ6r3Q8+81Jh1I2Upf6L4ns=
=BhAR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -r1.690 -r1.691
--- .cvsignore	20 Sep 2007 23:11:30 -0000	1.690
+++ .cvsignore	22 Sep 2007 11:45:40 -0000	1.691
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git1.bz2
+patch-2.6.23-rc7-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kernel.spec	21 Sep 2007 18:57:50 -0000	1.177
+++ kernel.spec	22 Sep 2007 11:45:40 -0000	1.178
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1804,6 +1804,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.23-rc7-git3
+
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Build dcdbas and dell_rbu modules on i586 (#216304)
 

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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- linux-2.6-execshield.patch	6 Sep 2007 17:34:27 -0000	1.72
+++ linux-2.6-execshield.patch	22 Sep 2007 11:45:40 -0000	1.73
@@ -1227,8 +1227,8 @@
 --- linux-2.6.orig/include/asm-x86_64/pgalloc.h
 +++ linux-2.6/include/asm-x86_64/pgalloc.h
 @@ -6,6 +6,13 @@
- #define QUICK_PGD 0	/* We preserve special mappings over free */
- #define QUICK_PT 1	/* Other page table pages that are zero on free */
+ #include <linux/threads.h>
+ #include <linux/mm.h>
  
 +#define arch_add_exec_range(mm, limit) \
 +		do { (void)(mm), (void)(limit); } while (0)

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-highres-timers.patch	4 Sep 2007 21:59:46 -0000	1.9
+++ linux-2.6-highres-timers.patch	22 Sep 2007 11:45:40 -0000	1.10
@@ -5350,9 +5350,9 @@
  
 +			tick_nohz_stop_sched_tick();
 +
- 			check_pgt_cache();
  			rmb();
  			idle = pm_idle;
+ 			if (!idle)
 @@ -229,6 +232,7 @@ void cpu_idle (void)
  			__exit_idle();
  		}

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-ptrace-compat.patch	11 Sep 2007 18:03:54 -0000	1.6
+++ linux-2.6-utrace-ptrace-compat.patch	22 Sep 2007 11:45:40 -0000	1.7
@@ -1300,8 +1300,8 @@
  #include <linux/pid_namespace.h>
 +#include <linux/ptrace.h>
  #include <linux/profile.h>
- #include <linux/signalfd.h>
  #include <linux/mount.h>
+ #include <linux/proc_fs.h>
 @@ -892,6 +893,8 @@ fastcall NORET_TYPE void do_exit(long co
  	tsk->flags |= PF_EXITING;
  	spin_unlock_irq(&tsk->pi_lock);

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-regset.patch	11 Sep 2007 18:03:55 -0000	1.6
+++ linux-2.6-utrace-regset.patch	22 Sep 2007 11:45:40 -0000	1.7
@@ -2161,8 +2161,8 @@
  /*
   * does not yet catch signals sent when the child dies.
 @@ -237,52 +241,61 @@ static int putreg(struct task_struct *ch
- 	if (test_tsk_thread_flag(child, TIF_IA32))
- 		value &= 0xffffffff;
+ 	unsigned long tmp; 
+ 	
  	switch (regno) {
 -		case offsetof(struct user_regs_struct,fs):
 -			if (value && (value & 3) != 3)

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-utrace-tracehook.patch	11 Sep 2007 18:03:55 -0000	1.11
+++ linux-2.6-utrace-tracehook.patch	22 Sep 2007 11:45:40 -0000	1.12
@@ -1652,8 +1652,8 @@
  #include <linux/pid_namespace.h>
 -#include <linux/ptrace.h>
  #include <linux/profile.h>
- #include <linux/signalfd.h>
  #include <linux/mount.h>
+ #include <linux/proc_fs.h>
 @@ -156,11 +156,12 @@ void release_task(struct task_struct * p
  {
  	struct task_struct *leader;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- sources	20 Sep 2007 23:11:30 -0000	1.652
+++ sources	22 Sep 2007 11:45:40 -0000	1.653
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-9100900b5ffef416784752ffaf0f50a1  patch-2.6.23-rc7-git1.bz2
+1bf67697b6630e24ad5cc844290d8d64  patch-2.6.23-rc7-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- upstream	20 Sep 2007 23:11:30 -0000	1.574
+++ upstream	22 Sep 2007 11:45:40 -0000	1.575
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git1.bz2
+patch-2.6.23-rc7-git3.bz2


--- patch-2.6.23-rc7-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 11:59:45 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (johan))
Date: Sat, 22 Sep 2007 04:59:45 -0700
Subject: [pkgdb] BackupPC Owned
Message-ID: <200709221159.l8MBxjYW032296@app4.fedora.phx.redhat.com>

Package BackupPC in Fedora 6 is now owned by Johan Cwiklinski (trasher)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/BackupPC



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:52 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:52 -0400
Subject: rpms/BackupPC/F-7 BackupPC.spec, 1.2, 1.3 sources, 1.2,
	1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7qaI007867@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/F-7

Modified Files:
	BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/F-7/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:20 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:20 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:56 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:56 -0400
Subject: rpms/BackupPC/FC-6 BackupPC.spec, 1.2, 1.3 sources, 1.2,
	1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7ub9007871@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/FC-6

Modified Files:
	BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/FC-6/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:23 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:23 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:07:58 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Sat, 22 Sep 2007 08:07:58 -0400
Subject: rpms/BackupPC/devel .cvsignore, 1.2, 1.3 BackupPC.spec, 1.2,
	1.3 sources, 1.2, 1.3 BackupPC-2.1.2pl2.diff, 1.1, NONE
Message-ID: <200709221207.l8MC7w0b007876@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/pkgs/rpms/BackupPC/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7804/devel

Modified Files:
	.cvsignore BackupPC.spec sources 
Removed Files:
	BackupPC-2.1.2pl2.diff 
Log Message:
Upgrade to 3.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jul 2006 20:04:03 -0000	1.2
+++ .cvsignore	22 Sep 2007 12:07:26 -0000	1.3
@@ -1 +1 @@
-BackupPC-2.1.2.tar.gz
+BackupPC-3.0.0.tar.gz


Index: BackupPC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BackupPC.spec	16 Sep 2006 14:34:43 -0000	1.2
+++ BackupPC.spec	22 Sep 2007 12:07:26 -0000	1.3
@@ -1,29 +1,51 @@
-Name:		BackupPC
-Version:	2.1.2
-Release:	7%{?dist}
-Summary:	BackupPC - high-performance backup system
-
-Group:		Applications/System
-License:	GPL
-URL:		http://backuppc.sourceforge.net/
-Source0:	http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
-Source1:	BackupPC.htaccess
-Source2:	BackupPC.logrotate
-Patch0:		BackupPC-2.1.2pl2.diff
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	/bin/cat /bin/df /bin/gtar %{_bindir}/nmblookup %{_bindir}/rsync %{_sbindir}/sendmail %{_bindir}/smbclient %{_bindir}/split %{_bindir}/ssh
-Requires: httpd
-Requires: perl-suidperl
-Requires: perl(File::RsyncP)
-Requires: rsync
-Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
-Requires(postun): /sbin/service
-
-
+%if %{?fedora}%{?rhel} >= 5
+%define useselinux 1
+%else
+%define useselinux 0
+%endif
+
+Name:           BackupPC
+Version:        3.0.0
+Release:        3%{?dist}
+Summary:        BackupPC - high-performance backup system
+
+Group:          Applications/System
+License:        GPLv2+
+URL:            http://backuppc.sourceforge.net/
+Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source1:        BackupPC.htaccess
+Source2:        BackupPC.logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  /bin/cat
+BuildRequires:  /bin/df
+BuildRequires:  /bin/gtar
+BuildRequires:  %{_bindir}/nmblookup
+BuildRequires:  %{_bindir}/rsync
+BuildRequires:  %{_sbindir}/sendmail
+BuildRequires:  %{_bindir}/smbclient
+BuildRequires:  %{_bindir}/split
+BuildRequires:  %{_bindir}/ssh
+BuildRequires:  perl(Compress::Zlib)
+
+Requires:       httpd
+Requires:       perl-suidperl
+Requires:       perl(File::RsyncP)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(Archive::Zip)
+Requires:       perl-Time-modules
+Requires:       perl(XML::RSS)
+Requires:       rsync
+Requires(pre):  %{_sbindir}/useradd
+Requires(preun): initscripts, chkconfig
+Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
+Requires(postun): initscripts
+%if %{useselinux}
+Requires:       policycoreutils
+BuildRequires:  selinux-policy-devel, checkpolicy
+%endif
+Provides:       backuppc = %{version}
 
 %description
 BackupPC is a high-performance, enterprise-grade system for backing up Linux
@@ -32,98 +54,179 @@
 
 %prep
 %setup -q
-%patch0 -p0
-sed -i s/\"backuppc\"/\"$LOGNAME\"/ configure.pl
+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
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.pod > BackupPC.pod.utf && mv BackupPC.pod.utf BackupPC.pod
+iconv -f ISO-8859-1 -t UTF-8 BackupPC.html > BackupPC.html.utf && mv BackupPC.html.utf BackupPC.html
+popd
+
+%if %{useselinux}
+%{__mkdir} selinux
+pushd selinux
+
+cat >%{name}.te <<EOF
+policy_module(%{name},0.0.3)
+require {
+	type var_log_t;
+	type httpd_t;
+	class sock_file write;
+        type initrc_t;
+        class unix_stream_socket connectto;
+	type ssh_exec_t;
+	type ping_exec_t;
+	type sendmail_exec_t;
+	class file getattr;
+	type httpd_sys_content_t;
+	class sock_file getattr;
+}
+
+allow httpd_t httpd_sys_content_t:sock_file write;
+allow httpd_t initrc_t:unix_stream_socket connectto;
+allow httpd_t ping_exec_t:file getattr;
+allow httpd_t sendmail_exec_t:file getattr;
+allow httpd_t ssh_exec_t:file getattr;
+allow httpd_t httpd_sys_content_t:sock_file getattr;
+EOF
+
+cat >%{name}.fc <<EOF
+%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
+%{_sysconfdir}/%{name}/config.pl	system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
+%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+EOF
+%endif
+
+%build
+%if %{useselinux}
+     # SElinux 
+     pushd selinux
+     make -f %{_datadir}/selinux/devel/Makefile
+     popd
+%endif
+
 
-# There is no good build method for backuppc.  Instead the configure script
-# also does installation of files.
 
 %install
-rm -rf %{buildroot}
-perl configure.pl --batch \
-		--cgi-dir %{buildroot}/%{_datadir}/%{name}/sbin/ \
-		--data-dir %{buildroot}/%{_localstatedir}/lib/%{name}/ \
-		--html-dir %{buildroot}/%{_datadir}/%{name}/html/ \
-		--html-dir-url /%{name}/images \
-		--install-dir %{buildroot}/%{_datadir}/%{name} \
-		--uid-ignore
-for f in `find %{buildroot}`
+rm -rf $RPM_BUILD_ROOT
+perl configure.pl \
+        --batch \
+        --dest-dir $RPM_BUILD_ROOT \
+        --config-dir %{_sysconfdir}/%{name}/ \
+        --cgi-dir %{_datadir}/%{name}/sbin/ \
+        --data-dir %{_localstatedir}/lib/%{name}/ \
+        --html-dir %{_datadir}/%{name}/html/ \
+        --html-dir-url /%{name}/images \
+        --log-dir %{_localstatedir}/log/%{name} \
+        --install-dir %{_datadir}/%{name} \
+        --hostname localhost \
+        --uid-ignore
+
+for f in `find $RPM_BUILD_ROOT`
 do
-	if [ -f $f ]
-	then
-		sed -i s,%{buildroot},,g $f
-		sed -i s,$LOGNAME,backuppc,g $f
-	fi
+        if [ -f $f ]
+        then
+                sed -i s,$LOGNAME,backuppc,g $f
+        fi
 done
-sed -i s,%{buildroot},,g init.d/linux-backuppc
 sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/logrotate.d/
-%{__mkdir} -p %{buildroot}/%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
+%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pc
 
-%{__cp} init.d/linux-backuppc %{buildroot}/%{_initrddir}/%{name}
-%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__cp} init.d/linux-backuppc $RPM_BUILD_ROOT%{_initrddir}/backuppc
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%{__chmod} 755 %{buildroot}/%{_datadir}/%{name}/bin/*
-%{__chmod} 755 %{buildroot}/%{_initrddir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*
+%{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/backuppc
 
-%{__mv} %{buildroot}/%{_localstatedir}/lib/%{name}/conf %{buildroot}/%{_sysconfdir}/%{name}
+sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/CVS
-%{__rm} -rf %{buildroot}/%{_localstatedir}/lib/%{name}/log
-
-sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's/^\$Conf{ServerHost}\ =.*/$Conf{ServerHost} = "localhost";/' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-sed -i 's,^\$Conf{CgiURL}\ =.*,$Conf{CgiURL} = "http://localhost/cgi-bin/BackupPC_Admin";,' %{buildroot}/%{_sysconfdir}/%{name}/config.pl
-
-ln -s %{_sysconfdir}/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/conf
-ln -s ../../log/%{name}/ %{buildroot}/%{_localstatedir}/lib/%{name}/log
+%if %{useselinux}
+     # SElinux 
+     %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
+     %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s %{_bindir}/nologin backuppc 2> /dev/null || :
+
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name} || :
+        service backuppc stop > /dev/null 2>&1 || :
+        chkconfig --del backuppc || :
 fi
 
 %post
-/sbin/chkconfig --add %{name} || :
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+     # Install/update Selinux policy
+     semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
+     # files owned by RPM
+     fixfiles -R %{name} restore
+     # files created by app
+     restorecon -R %{_sysconfdir}/%{name}
+     restorecon -R %{_localstatedir}/lib/%{name}
+     restorecon -R %{_localstatedir}/log/%{name}
+%endif
+chkconfig --add backuppc || :
+service httpd condrestart > /dev/null 2>&1 || :
 %{_sbindir}/usermod -a -G backuppc apache || :
 
+
 %postun
-/sbin/service httpd condrestart > /dev/null 2>&1 || :
+service httpd condrestart > /dev/null 2>&1 || :
+%if %{useselinux}
+if [ "$1" -eq "0" ]; then
+     # Remove the SElinux policy.
+     semodule -r %{name} || :
+fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog LICENSE doc/
-%dir %{_datadir}/%{name}/
 
-%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name}
+%dir %attr(-,backuppc,backuppc) %{_localstatedir}/log/%{name} 
 %dir %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/
 
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(-,backuppc,backuppc) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
+%dir %{_datadir}/%{name} 
+%dir %{_datadir}/%{name}/sbin
 %{_datadir}/%{name}/[^s]*
-%{_initrddir}/%{name}
+%{_initrddir}/backuppc
 
 %attr(4750,backuppc,apache) %{_datadir}/%{name}/sbin/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 
+%if %{useselinux}
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+%endif
 
 %changelog
+* Fri Sep 21 2007 Johan Cwiklinski <johan AT x-tnd DOT ba> 3.0.0-3
+- Fixed SELinux policy module
+
+* Wed Sep 12 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-2
+- Added SELinux policy module
+
+* Tue Jan 30 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 3.0.0-1
+- Rebuild RPM for v 3.0.0
+
 * Sat Aug 16 2006 Mike McGrath <imlinux at gmail.com> 2.1.2-7
 - Release bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/BackupPC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jul 2006 20:04:03 -0000	1.2
+++ sources	22 Sep 2007 12:07:26 -0000	1.3
@@ -1 +1 @@
-72fc0f09084f44c42ba5d22451cfe29b  BackupPC-2.1.2.tar.gz
+dc37728c1dc9225354523f279045f3f3  BackupPC-3.0.0.tar.gz


--- BackupPC-2.1.2pl2.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 12:15:16 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Sat, 22 Sep 2007 08:15:16 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.68,
	1.69 selinux-policy.spec, 1.530, 1.531
Message-ID: <200709221215.l8MCFGwU008028@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8003

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
- Fix service start stop terminal avc's


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- policy-20070703.patch	21 Sep 2007 23:46:17 -0000	1.68
+++ policy-20070703.patch	22 Sep 2007 12:15:13 -0000	1.69
@@ -312,6 +312,49 @@
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-3.0.8/policy/modules/admin/alsa.if
+--- nsaserefpolicy/policy/modules/admin/alsa.if	2007-05-29 14:10:59.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-22 06:43:02.000000000 -0400
+@@ -74,3 +74,39 @@
+ 	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
+ 	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
+ ')
++
++########################################
++## <summary>
++##	search alsa lib config files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`alsa_search_lib',`
++	gen_require(`
++		type alsa_var_lib_t;
++	')
++
++	allow $1 alsa_var_lib_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++##	Read alsa lib config files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`alsa_read_lib',`
++	gen_require(`
++		type alsa_var_lib_t;
++	')
++
++	read_files_pattern($1,alsa_var_lib_t,alsa_var_lib_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.8/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/admin/alsa.te	2007-09-21 19:08:24.000000000 -0400
@@ -2429,7 +2472,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.8/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-21 14:29:01.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc	2007-09-22 08:10:42.000000000 -0400
 @@ -20,6 +20,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -2442,10 +2485,58 @@
  /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)
-+/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/input/uinput	-c	gen_context(system_u:object_r:event_device_t,s0)
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.0.8/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2007-06-15 14:54:30.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/devices.if	2007-09-22 08:11:28.000000000 -0400
+@@ -1306,6 +1306,44 @@
+ 
+ ########################################
+ ## <summary>
++##	Get the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_getattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	Set the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file setattr;
++')
++
++########################################
++## <summary>
+ ##	Read input event devices (/dev/input).
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
@@ -3730,7 +3821,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.8/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/apache.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/apache.te	2007-09-22 07:26:32.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -6290,7 +6381,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-22 07:42:39.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6302,7 +6393,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,25 @@
+@@ -172,3 +176,26 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6325,6 +6416,7 @@
 +
 +	files_search_tmp($1)
 +	allow $1 self:process setfscreate;
++	selinux_validate_context($1)
 +	seutil_read_file_contexts($1)
 +	allow $1 krb5_host_rcache_t:file manage_file_perms;
 +')
@@ -6977,6 +7069,14 @@
  
  ########################################
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.8/policy/modules/services/networkmanager.fc
+--- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-09-12 10:34:50.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.fc	2007-09-22 07:16:25.000000000 -0400
+@@ -5,3 +5,4 @@
+ /var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
++/var/log/wpa_supplicant.log	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.0.8/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2007-06-15 14:54:33.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/networkmanager.if	2007-09-20 08:50:57.000000000 -0400
@@ -7007,8 +7107,18 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-20 08:50:29.000000000 -0400
-@@ -20,7 +20,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-22 07:14:54.000000000 -0400
+@@ -13,6 +13,9 @@
+ type NetworkManager_var_run_t;
+ files_pid_file(NetworkManager_var_run_t)
+ 
++type NetworkManager_log_t;
++files_pid_file(NetworkManager_log_t)
++
+ ########################################
+ #
+ # Local policy
+@@ -20,7 +23,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
@@ -7017,7 +7127,17 @@
  dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
  allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
  allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
-@@ -138,6 +138,9 @@
+@@ -38,6 +41,9 @@
+ manage_sock_files_pattern(NetworkManager_t,NetworkManager_var_run_t,NetworkManager_var_run_t)
+ files_pid_filetrans(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
+ 
++manage_files_pattern(NetworkManager_t,NetworkManager_log_t,NetworkManager_log_t)
++logging_log_filetrans(NetworkManager_t,NetworkManager_log_t, file)
++
+ kernel_read_system_state(NetworkManager_t)
+ kernel_read_network_state(NetworkManager_t)
+ kernel_read_kernel_sysctls(NetworkManager_t)
+@@ -138,6 +144,9 @@
  	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
  	dbus_connect_system_bus(NetworkManager_t)
  	dbus_send_system_bus(NetworkManager_t)
@@ -7027,7 +7147,7 @@
  ')
  
  optional_policy(`
-@@ -173,8 +176,10 @@
+@@ -173,8 +182,10 @@
  ')
  
  optional_policy(`
@@ -8015,7 +8135,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-22 07:43:42.000000000 -0400
 @@ -64,9 +64,10 @@
  fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
@@ -8028,25 +8148,32 @@
  
  files_read_etc_files(rlogind_t)
  files_read_etc_runtime_files(rlogind_t)
-@@ -82,7 +83,7 @@
+@@ -82,21 +83,17 @@
  
  miscfiles_read_localization(rlogind_t)
  
 -seutil_dontaudit_search_config(rlogind_t)
+-
+-sysnet_read_config(rlogind_t)
 +seutil_read_config(rlogind_t)
  
- sysnet_read_config(rlogind_t)
+ userdom_setattr_unpriv_users_ptys(rlogind_t)
+ # cjp: this is egregious
+ userdom_read_all_users_home_content_files(rlogind_t)
  
-@@ -93,7 +94,9 @@
  remotelogin_domtrans(rlogind_t)
++remotelogin_signal(rlogind_t)
  
  optional_policy(`
 +	kerberos_use(rlogind_t)
  	kerberos_read_keytab(rlogind_t)
+-')
+-
+-ifdef(`TODO',`
+-# Allow krb5 rlogind to use fork and open /dev/tty for use
+-allow rlogind_t userpty_type:chr_file setattr;
 +	kerberos_manage_host_rcache(rlogind_t)
  ')
- 
- ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.0.8/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2007-07-03 07:06:27.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/rpcbind.te	2007-09-17 16:20:18.000000000 -0400
@@ -8920,7 +9047,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.0.8/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/sendmail.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/sendmail.te	2007-09-22 07:08:31.000000000 -0400
 @@ -20,19 +20,22 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -9460,7 +9587,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-22 07:45:00.000000000 -0400
 @@ -32,7 +32,6 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
@@ -9482,7 +9609,7 @@
  files_read_etc_files(telnetd_t)
  files_read_etc_runtime_files(telnetd_t)
  # for identd; cjp: this should probably only be inetd_child rules?
-@@ -80,9 +81,7 @@
+@@ -80,27 +81,26 @@
  
  miscfiles_read_localization(telnetd_t)
  
@@ -9493,7 +9620,9 @@
  
  remotelogin_domtrans(telnetd_t)
  
-@@ -90,17 +89,16 @@
++userdom_search_unpriv_users_home_dirs(telnetd_t)
++
+ # for identd; cjp: this should probably only be inetd_child rules?
  optional_policy(`
  	kerberos_use(telnetd_t)
  	kerberos_read_keytab(telnetd_t)
@@ -10565,7 +10694,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-21 16:37:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-22 08:12:19.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10601,7 +10730,16 @@
  ########################################
  #
  # PAM local policy
-@@ -159,6 +173,8 @@
+@@ -149,6 +163,8 @@
+ dev_setattr_apm_bios_dev(pam_console_t)
+ dev_getattr_dri_dev(pam_console_t)
+ dev_setattr_dri_dev(pam_console_t)
++dev_getattr_event_dev(pam_console_t)
++dev_setattr_event_dev(pam_console_t)
+ dev_getattr_framebuffer_dev(pam_console_t)
+ dev_setattr_framebuffer_dev(pam_console_t)
+ dev_getattr_generic_usb_dev(pam_console_t)
+@@ -159,6 +175,8 @@
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10610,7 +10748,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +252,7 @@
+@@ -236,7 +254,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10619,7 +10757,7 @@
  ')
  
  ########################################
-@@ -302,3 +318,28 @@
+@@ -302,3 +320,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -10829,8 +10967,22 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-17 16:20:18.000000000 -0400
-@@ -540,18 +540,19 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-22 07:07:39.000000000 -0400
+@@ -211,6 +211,13 @@
+ 			kernel_dontaudit_use_fds($1)
+ 		')
+ 	')
++	tunable_policy(`allow_daemons_use_tty',`
++	   term_use_all_user_ttys($1)
++	   term_use_all_user_ptys($1)
++	', `
++	   term_dontaudit_use_all_user_ttys($1)
++	   term_dontaudit_use_all_user_ptys($1)
++	 ')
+ ')
+ 
+ ########################################
+@@ -540,18 +547,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -10854,7 +11006,7 @@
  	')
  ')
  
-@@ -567,18 +568,46 @@
+@@ -567,18 +575,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -10905,7 +11057,7 @@
  	')
  ')
  
-@@ -609,11 +638,11 @@
+@@ -609,11 +645,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -10919,7 +11071,7 @@
  ')
  
  ########################################
-@@ -684,11 +713,11 @@
+@@ -684,11 +720,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -10933,7 +11085,7 @@
  ')
  
  ########################################
-@@ -703,11 +732,11 @@
+@@ -703,11 +739,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -10947,7 +11099,7 @@
  ')
  
  ########################################
-@@ -931,6 +960,7 @@
+@@ -931,6 +967,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -10955,7 +11107,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1060,11 @@
+@@ -1030,11 +1067,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -10969,7 +11121,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1282,7 @@
+@@ -1252,7 +1289,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -10978,7 +11130,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1303,64 @@
+@@ -1273,3 +1310,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11045,7 +11197,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-18 11:07:20.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-22 07:06:37.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -11140,7 +11292,7 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -497,6 +515,39 @@
+@@ -497,6 +515,43 @@
  ')
  
  optional_policy(`
@@ -11152,9 +11304,13 @@
 +tunable_policy(`allow_daemons_use_tty',`
 +	term_use_unallocated_ttys(daemon)
 +	term_use_generic_ptys(daemon)
++	term_use_all_user_ttys(daemon)
++	term_use_all_user_ptys(daemon)
 +', `
 +	term_dontaudit_use_unallocated_ttys(daemon)
 +	term_dontaudit_use_generic_ptys(daemon)
++	term_dontaudit_use_all_user_ttys(daemon)
++	term_dontaudit_use_all_user_ptys(daemon)
 + ')
 + 
 +# system-config-services causes avc messages that should be dontaudited
@@ -11180,7 +11336,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -632,12 +683,6 @@
+@@ -632,12 +687,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -11193,7 +11349,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -703,6 +748,9 @@
+@@ -703,6 +752,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -12991,6 +13147,20 @@
  term_dontaudit_use_all_user_ttys(ifconfig_t)
  term_dontaudit_use_all_user_ptys(ifconfig_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.8/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2007-09-12 10:34:51.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-22 06:43:22.000000000 -0400
+@@ -184,6 +184,10 @@
+ ')
+ 
+ optional_policy(`
++	alsa_search_lib(udev_t)
++')
++
++optional_policy(`
+ 	brctl_domtrans(udev_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- selinux-policy.spec	21 Sep 2007 23:46:18 -0000	1.530
+++ selinux-policy.spec	22 Sep 2007 12:15:13 -0000	1.531
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
+- Fix service start stop terminal avc's
+
 * Fri Sep 21 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-8
 - Allow also to search var_lib
 - New context for dbus launcher 



From fedora-extras-commits at redhat.com  Sat Sep 22 12:18:03 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Sat, 22 Sep 2007 08:18:03 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.59,
	1.60 selinux-policy.spec, 1.494, 1.495
Message-ID: <200709221218.l8MCI3Tg008117@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8094

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
- Fix /dev/input/uinput 


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- policy-20070501.patch	21 Sep 2007 20:22:15 -0000	1.59
+++ policy-20070501.patch	22 Sep 2007 12:17:31 -0000	1.60
@@ -1881,7 +1881,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.6.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-05-07 14:51:04.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-21 14:29:34.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.fc	2007-09-22 08:12:51.000000000 -0400
 @@ -19,6 +19,8 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -1921,14 +1921,59 @@
  /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)
-+/dev/input/uimput	-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/input/uinput	-c	gen_context(system_u:object_r:event_device_t,s0)
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.6.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-08-07 09:42:35.000000000 -0400
-@@ -2729,6 +2729,24 @@
++++ serefpolicy-2.6.4/policy/modules/kernel/devices.if	2007-09-22 08:13:07.000000000 -0400
+@@ -1306,6 +1306,44 @@
+ 
+ ########################################
+ ## <summary>
++##	Get the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_getattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++##	Set the attributes of the event devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_event_dev',`
++	gen_require(`
++		type device_t, event_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 event_device_t:chr_file setattr;
++')
++
++########################################
++## <summary>
+ ##	Read input event devices (/dev/input).
+ ## </summary>
+ ## <param name="domain">
+@@ -2729,6 +2767,24 @@
  
  ########################################
  ## <summary>
@@ -1953,7 +1998,7 @@
  ##	Do not audit attempts to get the attributes
  ##	of a directory in the usb filesystem.
  ## </summary>
-@@ -3210,3 +3228,78 @@
+@@ -3210,3 +3266,78 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -10396,7 +10441,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.6.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-05 12:06:43.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.te	2007-09-22 08:13:37.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10411,7 +10456,15 @@
  
  type chkpwd_exec_t;
  corecmd_executable_file(chkpwd_exec_t)
-@@ -161,6 +168,8 @@
+@@ -155,12 +162,16 @@
+ dev_setattr_framebuffer_dev(pam_console_t)
+ dev_getattr_generic_usb_dev(pam_console_t)
+ dev_setattr_generic_usb_dev(pam_console_t)
++dev_getattr_event_dev(pam_console_t)
++dev_setattr_event_dev(pam_console_t)
+ dev_getattr_misc_dev(pam_console_t)
+ dev_setattr_misc_dev(pam_console_t)
+ dev_getattr_mouse_dev(pam_console_t)
  dev_setattr_mouse_dev(pam_console_t)
  dev_getattr_power_mgmt_dev(pam_console_t)
  dev_setattr_power_mgmt_dev(pam_console_t)
@@ -10420,7 +10473,7 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -202,6 +211,7 @@
+@@ -202,6 +213,7 @@
  
  fs_list_auto_mountpoints(pam_console_t)
  fs_list_noxattr_fs(pam_console_t)
@@ -10428,7 +10481,7 @@
  
  init_use_fds(pam_console_t)
  init_use_script_ptys(pam_console_t)
-@@ -244,7 +254,7 @@
+@@ -244,7 +256,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10437,7 +10490,7 @@
  ')
  
  ########################################
-@@ -252,15 +262,14 @@
+@@ -252,15 +264,14 @@
  # System check password local policy
  #
  
@@ -10455,7 +10508,7 @@
  userdom_dontaudit_use_unpriv_users_ttys(system_chkpwd_t)
  userdom_dontaudit_use_unpriv_users_ptys(system_chkpwd_t)
  userdom_dontaudit_use_sysadm_terms(system_chkpwd_t)
-@@ -302,6 +311,36 @@
+@@ -302,6 +313,36 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- selinux-policy.spec	21 Sep 2007 20:22:15 -0000	1.494
+++ selinux-policy.spec	22 Sep 2007 12:17:31 -0000	1.495
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
+- Fix /dev/input/uinput 
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-43
 - Make /dev/fuse a fuse_device_t
 



From fedora-extras-commits at redhat.com  Sat Sep 22 12:46:18 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 08:46:18 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch, NONE, 1.1 gcc41.spec, 1.175,
	1.176
Message-ID: <200709221246.l8MCkIua008775@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8728

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

--- NEW FILE gcc41-makeinfo-ver.patch ---
2007-09-22  Jakub Jelinek  <jakub at redhat.com>

	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
	* configure: Regenerated.

--- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
@@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir
 # that we can use it.
 gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.[2-9]*])
+  [4.[2-9]*|4.[1-9][0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([
--- gcc/configure.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure	2007-09-22 08:38:30.000000000 -0400
@@ -7496,7 +7496,7 @@ else
   echo "configure:7496: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[2-9]*)
+    4.[2-9]*|4.[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gcc41.spec	22 Sep 2007 08:13:13 -0000	1.175
+++ gcc41.spec	22 Sep 2007 12:45:46 -0000	1.176
@@ -155,6 +155,7 @@
 Patch39: gcc41-pr33423.patch
 Patch40: gcc41-scanf-fmt-check.patch
 Patch41: gcc41-pr33506.patch
+Patch42: gcc41-makeinfo-ver.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -479,6 +480,7 @@
 %patch39 -p0 -b .pr33423~
 %patch40 -p0 -b .scanf-fmt-check~
 %patch41 -p0 -b .pr33506~
+%patch42 -p0 -b .makeinfo-ver~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1636,6 +1638,7 @@
 * Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
 - don't ignore throw specification of function types in type hashing
   (PR c++/33506)
+- handle makeinfo version >= 4.10 in gcc configury
 
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until



From fedora-extras-commits at redhat.com  Sat Sep 22 13:10:17 2007
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sat, 22 Sep 2007 09:10:17 -0400
Subject: rpms/sepostgresql/devel postgresql-8.2.5.tar.gz, NONE,
	1.1 sepostgresql-8.2.5-1.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sepostgresql.init, 1.2, 1.3 sepostgresql.spec, 1.2,
	1.3 sepostgresql.te, 1.2, 1.3
Message-ID: <200709221310.l8MDAHue015525@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15345

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sepostgresql.te 
Added Files:
	postgresql-8.2.5.tar.gz sepostgresql-8.2.5-1.patch 
Log Message:
update base PostgreSQL version to 8.2.5



--- NEW FILE postgresql-8.2.5.tar.gz ---
?	??Fpostgresql-8.2.5.tar
?3o????'??Y???????}^???,W????b????8a4?? ?p|?g???+????Yu??"??_?Sw(??o????Q8???"??=q??A?X?l?x?^??k?i?CZ?.@????
?Lc?
??????e(tz,???s#?C?C?{q?q?????h??;?W??q??-^?m?>?l?(?_?Vsg?????vS<o???????8????A?2A???}?nU???
u????F????????^????!R?Vs?????\;????^:;??#qp??b??????????5??N?????q?C??
??P???o????????*?7??b~?^5;?7????~????9??????Y????J6?n.D???m???QlmwZ;???????	??N;????????}M8??P??wv??;)?U??[?????s??0^{?N?C4ij?[?w?????!??]P???01[?U???zo?}(?;?>???(??lw
?y????
??(&Y6?D
O*b????????????????????
??
`????"?s??i??D?????S??OQs??7??=Q\1???8??wUug?.8lc????n??vYT[vg???8(???3G?????@?`K???x??yq<????}?????F???
?????`?!?e??????X?
?z	??^8??gT??ip'?;???#o|?^???I???7???B??z????5??/???2?0??,!?tv
??p????6??tw??nt
??D?H??I??P?????F?=?i???s??=???evn#??8?zJb?????G?.}b?m|~?"`??'????Q
qT?{e????1?!??p??xb?????????????p8????Y????????n@?e??lz??_???_?Jq%?I??q??eY?
???/??#O?g?Y???x
???M9
???8??7^}??hr?<,??9???U?E??qh???Ea8??
_u?;???e??G?[???kp?Xg?T??j4?Z?????:	????2|?^???)c???????A??F?n?
>??
<?fC????U??y??E[v?<?
?'??$5
1??dp??{?8????xS,^?
Qzs\???V??%?H??? ?W???U]?XD????-??=?Y??*4?w>
??96o??6fU?W????wQ?????mM
??G??
C"?(???[?m?
4vVYU?H??_U?l~?)y????Ukg?????
P\???x/7???a????_?wq??????H???\lWQu?-???????#F?/????Z????)lv???P(m??YCP?e^?*)+???Yr????<???C?O???:sI\????K??h??????z??>?eOT?'?
???y???a?$??E?:n?1U(y?
"Y??}??y?!??(?~???????????(mD??`??X???:???2+?(??Z?X??	?rj???~d*?H????
Kl?x?
?!???y???
f?H`L??????&?{=w
????c?}+?j
??
???(????x?6+?y?????i???q????'??CH?u%AxY?vb??#?3o???
???g?Ug??~?##?(?CX`?rS?w????q?'???U?t???|?G
87&?Ns?????^"#?0??4RO#?}/????????sX???zr???U?M~+?????x?3????Kk\
??m(???A`??	?
;?????*nN1p???d??S?&
???LT??-???<??	???I?lL????0t?u??<??e?92t????4r.?S?HB8zh144?^?^???Y??????????????z??????????????????y?]	?f???Q??I????????O??3????]?']ILW??W$n???m???????Fg???w???W???I??<?*Ru????,??Fnt=3l?@(g??y
?????
??p?F:????5gt'?

x??e3*?r~?EH?????x
O?Q|?d?)????????uF???y,?82?`???D???????c?m	?+1???P?+`'3??????E5?O<|?i?O?s???????+??EN?Y?????k??????<;Z??=>????+?h?@%??h?<.?J?iI/?Y!?<???zg???????C?h???
???????%????>0??k_??*?V??~?????N????C??m??[~Lt???k???
N?z&Jb?Q????
?>?o?v??U?????6s?
??z??i5;?d?7?*
z??c???G??g???
e==?X??pX?r&?$???:????(
??D??.sQ??x?=.????m???P\?,?{_?3???????$?&;/]/?5?<
0j?i????L???z??KK
@???Q???,B\???SFm?~?????;?o??\_-???G??y?2?9^????3R??]W? ?p???????????0]??O??c?????C?k?M????
??????
?a????{y9?:$?0?tB??k?.;c?:???;?{??}Iq?
w??E????+???u????????!??h.zQw?M 2n???^????????p?KO??W???d??????F?????~??????????????????x??tV	?hUR????}???@?????y?????C
q??t?@?X ?????]????????m?5?]???#????????C?s???[B?+?]a???????5?')Y???!???Yc??+aF?2???:*-?<p?5X\:???A????f??7??
&7B$???$i?????Z???c????>n
?D???????{????y???a,*???7F?=??i?D??d?t???B?H?E5?.???qS_-?v?%?*??[)M??Fb??$????????g?*D?t??fU?Qx
n>H??D?FzndY???S??j??3??2?????<P???????	?!??b?/?5k????dW??d?Q???@?"o<t{,?@????=-??y??%J?????#U??y??N???z?# <?F??!?`??K??cU	???.??9???tK{%?{c???kV?0????>%1K?6!??????o+U?????,?BL?	?"?!_??B???gt??/?X?o???PEa?????P?r
,?????A???(q[??P?QW&%
???$
??;?4 at d??i?$??$??/&?QH??2?qM?????6?X>????<??s_!?
'W!3X?????V+?
??`?[e??????a?JfN??w/C0??4
X????M?????????*?QV??U4Y?)???_l??@"C??2???e?c?q??!?y[???Y?<?P?E????
 %?L?????
@N?no?HjG???_Wm!?_l1?_7?????kn?????Y??-Q2Vs??Tk???x<?N|?
?t???G???S??G?jc?mh??q~????????Q????G??7Qf;???t?F?0C?4?l??????.?\?+??NIv[???2??s5??z???????b??Vs????/?$?o?????N9jrbro?$???F?????????K?H?x???a?V
?Yw?%?N?L=z??(???Sh<??u?L??Y??~????t<?j??\??S}0*/\??F" ????}|E5 ]0?fH?bBq?6+?????P??_T???o!j ^5????????N??????:km`f??`??5??Ep?Jt??Z?W??
b???>??lEB????B?y?????j??!kL7?&?:1????m????=???-?f?8?CC????????Q???????@@??@@?y?zoJ??
??p?E|?(3?????eIk?B0??/T??_????4a?|}???N?v???~??????%?,
?,?8?4?@???^@LN0??????VW]?v?&4x??y??WDbl?????????f?-h#??0;???Z???;[?lp??t!C?M???H???7? ?b???
$_??E????
a???v=?E????d??C?=N????S
?t??y???80?;E??0?????6???????)?;/???^u;;???w??N?
?#????,\?,?B-????g??????
E?b8?????n???MF?j?$B??M??????jL??D??????a~???<c????
?(bW?*?OFY?*??82?(???/3???}~?C)??|?? b????????W?
?Fi
?x?l?J??h??\?,????{??????|?{??????m??%2???Dh??v:????f??Kbe?zRnB/??*tt??"'???m??????=h4???	???+???~????w??
?To?????;?(?;GrK	?&}?F?t,4??13?(q!+~
<?Xr??5????????? R|????O?
6Rf$?1
y?8?X???E
?.0????RB
?Qd??s?Lj???#k?8{{i??+??CS?I?Az??l?4??0??+??U??N}ACo??M???
????k?
P?????B?B ???z?l?J}????6?fG?? 	D,?s?&J(LP?]?cy??S????a?_?I$?????????b??=>??!C5~??J???Q????Q*~0??aJN<#1??d??d?I%Gr
?A????$|????$?O0??_?zM??L???V?hQ?I?	???-9??(??%?a?%?3b??

???u???N?+?~?eN?*x+??I?(?????X?)???5?
K:?q\?X???xY?w??N???????+?&??Q?x????????~????F'?o?FE??^S?S? e?
Y?:e1u"????$?C* ?QTx?]5?[_??N??X?]5
Rv???[????n?T??II?????&,]??????_???L,heq?%n?k???V5????Bm??OU[?j????9?r~?K?T???jY?4???? ???^?w?gr,????????5
?*gA}?`d?$m?????i??????
?	3?L?lS??
q?T/??R?~V8?Je?V?A\{?R7?J3????TJ?
?i??Q????j??^?:??2??p??????I??&&_F?$A2??t?31????L???e~? %I:?H???,y<???'??S??k_J?7??Z??f?%????%B D<
3 ??\rrr???b??V5#?e?<Z?
&?x?	16 &?$(C?qD??????5*d??????O?"???AR????3C???f}Z_????N?:?v?????)d5??tD???4??c?d#??8???b?L:?uH??????|?Z5?Z_??N?I??p??R6???A?)?q??r?
?_??GQ????r?U??a???????,?my0??4???C??Iu06????q
+?J?=???e~a=C??C?A????	 ???B3#R?f?e}?F8	??n_"6?h??a??1???$?????#l?!???c???X?L[N???TN\6?X?Il:[?????????$?C*??????21N??????{4-?????F8	??
??d???????Q?=?Fd???L?????7???(??f3>?5??HF????=?|_c
????4"S??g??????H?9-???A??f???#?#(??=??v?]O??RI?Z?3S????Hn???9q?Y31v6?Je????"??b??=??I?$??9???Yp^??f?-0+{N?tV??dKG?WA?
7?~???L}??!;???T?????AR
n??96????@????????0?.?b?2)???0?????I&5??????J[??d??#R??g??a????E?oj@???q?/?Ws??i??????IG?@??X_?????=?vr??W?bR??)r???_VP???9?DZ
???
??T"C? u5V
x??N?:?[???Tb???e~$?A?IP?T@??z??'{??4??Z??H}??&?P??l????1Kj??kIR?tP?T@????K??G??dk?F8	??
?>??szq???????1h?;dlJ???aE?	'A????T[)hm(?$??nq0AV??s5G>?????N/?$L?bN????\2&?bN?|??r$2Z?+?dG	&??
?
?|????2d?wY?????z5?????]???J]?09??i}???_%w@?!??k??(?kR????#R?????\???W|??IPQdC?2K???Z?R???m????'AR???%??K4BW?????#???8;??e~?$?f???h?????
Z?>?_?9R?
?:G?5z?{$?eK?I?m????:???6R?hm???U?niW?I?P(?B@U???S?????Mk?pcI5????~???0??????P=?\{$G????{?{/7?u8U???`E??W4??D?N;??e&eFC???????21:?_*?h8B?? %{?/?IL2P??u??4_?V?nT???y?}?;?K3p?????
??E]????D at T?%;?1j-MB????d?l8??
???.?E&d?l?F1??:1r1????LV???nH?Y*??O??>????Y
???|??a??U??
???????Q?o6N?y???d??m?N?7G?????
/
??|?q??0?^H?@i?{G???PH~y?w?k?U
????P1!$?<?M??kX9K
?? a?j?(?v??? ?r#??}??rY???"/?X???,??d ??fm???6?s???"\??#??KA?2?\???T
z
og?U???c?????O????9??W^?d?%??z?x?????
@?	?=^?+?(,?i???q??&?y9?3??s?_?
???V???Mu?c?HY?z?+*U??l!h?^??{?}??n??B?????T?(
?J??V???V{?v%?k????X??xmLVD?C^^h??4W0??V?Z????[??k`??qR?;?????K??]?4?u???26?N?X>u?%???}?

??*???&??%?}|??q??L??\[??)???????7??? ??Q`
2Q?????L?X0?%0??a~YY???7?V?h????ga0=??Z??_??D?&
???yz??ya
???a+1rU?wT?5???Y?ud?p??[?????gw?????????	????(??Q????KY6Up at .<??Y?'??fZT????j9?C?'?B.)?	?]?7K?!?]?????4Y
?+??l?J`??y?l?I?j????
?{
?m}??9??"a????x?VN-1
?4*??`??JOQ?MW?Pj>R_4?4?g???G??
e)???$&i?n???R?&5p?c6Q&^?Kw9z?^??v???a??*??J\!#X?[NYE?)??^????6??/???????wfd???)?7??Z[Z???
c????(W????`k?
??L???*??S??
&???r?n?G???r~,??e??9e??(%g?????C???~???P??w???I4???+	U^NG??sd,??|
?=?Z?????d"?zCIwB>?L3?V??>??`???Ui?&????????cM?EBd|??9?C?%KV3Y??c??H?R?j?Z7??+S??U?t?T?H??J0?Y-??f??ii?????E?,?5$?-?&:??d??	Z
?w??7d????E{???t?????"A???I?|??S>?`6?C????K@??p?d???.?(d[N?#?????>}?x=?*????x=A4?S:W????l?-OMD?^Q??Q???4Z?FE??`?Y
F?H??bm?(?(,??Ht?;/??c???5??.???aM]
(???????????>??VY?6?M??j?As7?2?:?
9h
/ ?n5?????Cl? !??,????
;
?T(???o??@???+ at T ??????s?j?!??F}?jZ?F)????z???p*?E#?a???(+??T???:?????=?
???XXX?]S???}X?[a?9??xr
t?y?w?5??c??gH??}F??}????h??{??/$????|?$7???Ks??????~d]5e?7q???????5Ko
??de?I+?????????????%?R-a???r|??Q??z??kIp]r??P;n????????X?de?wD?B?V:DYb?v	?_?f*f?%?|?[7?:???O?5?I?T????h?B?V/0?B?	~?????I8N?f?$3??w??TP?0?0?
Ks??7y?M?Z??&??XT?s?V?C???s???T	le??rIUn???c??????'?n&Hc<?r?Q??
nZ??|??1?????b???mO?|??Z&?f?J4n?????U?_.???????*???	\V??~4&/??zcE????n?O???????&?a8@?=?
`	J??
m$}????`f??*l?"?5???
B=J?????9Ze?v??kd`???\?U?!	f?X?{?T1?????"\C????$?9?#???aI?~???E???|???VY??z?X??<Ot??????Y?zZ?A???vBR???
q,?r??u(?&>?`??|l??????}C?????D?)???N?S??0???^Y???????gS??r???o???????~/?p:V<?P????????[y_<??o??4???n+???$??Au??'??T??U??}v='?t??G?B?~????cPQn???`L&?oOH?????????<??'r/?|?j\???<??[,TD]??????G]\w^???y?????
?j?8j??Jw??????:?>???#???w???@???2?reb?L?\?????2?r5^??T:?
?c?_??2I?
1? d????tw?4??????I?`??0"???????1B???x9?SI3?EM
??e?.|??e??????/??^P*???????W????#?????I#?
???O?!?v????(??U-|?????J????????)_?II?I4??S6?1*YjF?#e+?\?{?Zs
???8
B*X)?2??->8??f?F}!E??)U????4???/?p??q???????
???[????)??Z#???x?????Em?P???.7????x??({U????sk?1Y-r???F=??[???c'L?i<???a???D??eq6QiM?3"?x?B\?m?z?{?C??T?????????s??}?jT??j?LV???q??
???L|?"?`??????P??|?????bq???????fj???Pl?8"?G!??X?=??E?[???V?8?1??s??<?.I?G?cN?p/B????-:??lr.H?+?O?cp|??]?<??0s<j?-???F??c?[cL??Pr4?0g@-I???fb?c?5???????
?5?C?????f?Wc$B0?%???\??
_(???Dn?<?>>
%c>	?r>?@?1?M??O?q?'?J??'?t\????Hk*df?D??7??h:G?_*????N?,A?E??z@/dP^?O?}???H5~??L?~urH??-??{??]?3-??????g2(?Q"???????uR?x??_0?3?????r?f3?T??4U?H????UJ???%RTV?/??bQ???k??o????)l?????9???R??m???/
N??Q?K?JZ-D-????2K?=L\??Z?f(o??%???3w???d?
?$2?????
u`? 
|R??l
?-z?
d????'??I??aY????yIT?e?`:?kB?r<pR ?1??p{0?n??fYW_,???Iv^???RR
?-X??~???z???C?F???O?I?n???DhL?>,j+>??fP??%?J????a
???s?o`????p%??k????I?G??xg|?????????0?%?=!?;%??
?Vdx?)*?O]d?P??L???RV??0a??w4d?:?=?
?:?????D??U?u??????V?4??W???)?2??J???G???9?,??
?c?I??M?YN??r)????!???Gt	f???S??OL??|:?x<?
l??q$????wfZ??$eR ?da4??n??????????8[?????LJ??????+?????e\??g????HZ???X`?v?I1?.N?
C?f??Q.R:??.??F?????
?[?y?p?2??,?Hg^L0?????]?i?=??m????3H?$yf-????VS?SS.?;[K}?RR?????$?"???P?&????-??@Z???K?&P?
rP?h??'-&~:??K???+*?DfY9???????0{?R?N"[?<??B??????????cQ0?/j????-??ks????n????J$q????q?????????G??0?C???EtS0?V????????g???-Ke?M1????:????3t??I??an?z
}??]Y?R?P5?J7???%??? ???rh??q????HHV?`?\.?Fm?,?
??&.+95g?#hh??$!?W??; ?????L?wW?r?#y???$????????i??}7J?r?????ZU?7???@??L?Q????.??*?????7?
?
??^?R:?-?y??'?xN?h?U????|ZTf?pVo?g???? w??`?l????2?????Q?w,?B??9??a?It??:?`
??zR\adR???a??&NX?)b???'?QH???Rt?QR&G?
?4B?o8?8?*?8?~??
?O?S??.?;k?V?????M??'?O9??7T???????C?>+%?$??d??N?????N F};?????kbp????E|z?Gxxk?
???8?F??k???p???????
?[?K~r~k??W6e???>??}?FRMy???RU???PT????85??t???OG??	n?CHC?SZ??$???k???M?[??=????9?i?:???9????F7?7???r?????(??9L??`|??F????@???4?????X}?74?Y?K??????????8?o?
?d(i
?(??s?E{k?F??A?g?1????I?nu??
?????????8??s?E?#??W[????B???9(?3-??fc>7???????C???????;?????v???-q|>?.??,j.??e?w??;??/
??n|"?!m?m??+??_?m??J?_?/2???'?q???????W??+?tu_ykp???VeB ???>gU??G?y??i?Z?:????tB?SJ!?;????Q?e????<jm??;b?p????6f`??u??:???y???E+?v at o?-?|???A????3????=???L.??????2?l?}g/?&?7\r?p?"?d{Ya????]:\???????>???Z???????NNIm??A?_c$?Iw?.XN??Y??????v?-Y?(?Y1??9?(????f+?????z?\??t??W??H?\l?QfY|%???;?5?6s&???g?cM7?s?h?#??n2@?6??J"?Q?=???b????V?2??Y*??s<?=??!0UlZ'???2fB???7?,i?c?r~????V?E??%=5.~0??M?-'P??3??e??????P??$?!????????$Hk??qsw-???????Y??;`??0??C?@?%[??hS6D%?V??{O????+W???`?Cv;faG?E??,n?6|??!?????tK? p??h?mi??9?<h/q6????????4?0?????dH??Z?
???g?
??????????.???j5????@?y?*~4??U?g=??O??^O\
{??
????=L?]?9dU?:?0(????3?HyE??(^?c????9\?w??,?
??f?/???A?>??2??h????{3??????s???$?j?3sZ???V>o?j?5_)?&\e???6
	??.???7???iS~US??????
?&??~???????w)pz*??7?Oe????eH#$I??(
F
1[??qT?????????O?G?_???`U??t"iH?D?D!?d???m	?y??
?sT?B?2?[??w?]?#s?6D??O?wh???&?`)??ov?b?i?{dG????????OQbP?r?Rt???A????$ds??3~]???`-m??L??4?_cy?4?G
????q??#?YN???bg??C???K?Y?h|???????!O?8?m?K?r+J?5?%?}?U?????V|??_?
?YX|???N0V?U??!a??W????a??
?W??#????<???+xa??0?Uzm?B?}?]?????)????;"}V???8wQQ(?????FA?c\{????
?
R??1??:s?,_4?Bg@??&KQ???????gVO?>???????)???<e?a^xD?-?'?^?L3?,???a
??2_??
?@h?E??8?"?
???"7z/??k????ZE?5<iX???9??m$??>?F'???9EX?}^H?
?m??qL&#.n?????J1y???9\???.?)?E?[V.1i?????6???et?????m`9???w???$??t}Z??g?{m???~3???????t?,???s_?????$35??<?y??Db?<??????H???A?S#+?	???i??r??Hm????q0??A??E??r?,?I?Lh.?4
?\d?.??9???	?R?e??s?y48?????o??r
?Z?FEN?!?=??/??{??S?M??Y0Sa[O?OO???
.]
e?????F?M{o[vG?????9?9/[??	aB?l?o?O??????????D??R?????B???
?<??
??\j_??,????u???????~g?s??2??;?Y??v?eI??o??2??&?i????M???f?????z^???????n ????.??(L??B???F?V??O?P????h?u?Ek???????F????/b&D?J=??????Z???o??ntV;?????T?u\G?q6)?BU????&?`???????????$z
?A?:?i??RL????X?.?D??D?Nqc??U\!?q^l????XY?z1?/)?#?*?Y?6??dy??/??n?#????1$?o?:?>D?&6q?????p?`?
?%ge?!??h?
?X&hc5.=????(?\T?e??
??????)?,??\?\?
#?????w^?'?Gh5??"z=??#???w
?;D-?*-??k????t'??0?=ZU????&\?z??6??????W%q?]Q????#???9r?.??t??.?
???_?np6?6??~Mn?hu????=???W??o?????#???e=?6=?????\Q???:x????}?j?????`?oz??m?9j??W?N???@???
?n?\@P?(da 2h??)???????x????
???
??@?????????G???? ??/???5??q???pU?v??WpW??1?E???\y?????g|-?????->??|?i
_???????eP/DeG?RsE???e???I???^?%g=Al*U
S"H?IaG+<??)??0???j???????c??)N???Y@)N?/?=t??U?Hj?N;?Ko<??????a?????=C?a?z???H?J%??,'???VA\?>????2???K`?7?%?N?\???j]?Wg??;R??K???9??"C?e???{?d??y/???d?)??g`o?n?-D??
???????{R?I?~Z?R????j?6???SbJp?IxJ?-a}??b?//c?I%a?Y????4?f?}?3
?j???%???x?a?C??LC?????[?n?vR?????r??N???8??????E??N
?n?+,??cz??BiD?
?@Y>???????????e?U!?Wr?????I?1O????c_?C??
y?8?.??H?	????F???!????l?t??=_[@r.???q???}??,5?l???*???G??????????????J??
??@K?G@????'K"@?????t??&?k????5?!???l?
????E??q?>????.?~
m2&4?Le? \_9???V7????"c??t??????k????{?????[???{r>????w[????3>??X???0?!?6??
??sO??	?=??'?&?_8<???Mjhi?tzVE#?W}?o?V?????O??O??^sO???{??[???h?&?0??m?p?'?X0?Q???
??f???-+???7????~c?3m?n???R?'???T????BU4???YI??<?=???9?a5U???y?;??y
?????????S???On~????E??Wrq???ln?A??t0P??L????x}zT6	?O?	~	B|?E
>?"Y<A?J???[:m?7A?;?'?e0??s?xf?????d???????yg???7????4???}?S??[m?by;?????z??k???????%?e?H3O?;?e?[?
8?x?I]???d????????1T
?D]??t?|??????Ya????2
?q??\|?B=??!?????n?gn?F2???@4$?
Q?D?z?Rd??????c?
??
??'z^ B4??yhg???Q??>???????
,????'LqW????9???rQ?q????T9??????K?J?8(??D"??g?xn6g87S??(b??5??n??l?\?????????
???
7?>??=???>?TY
8????|@???5S?[:>?????v?????z>??#????H?6H???=?U?n?5???n??@S@???vE??
????&?T??"
????????????{a(R0xd???z??
RAT??\&?;k6h?
?l????L?a???I>????'?7?D0<?@?????5[????w?[?
?%????[??sf 8"?K??*<w?U??9c5k?,pEUl??\X?*C???i???O????,?/?&O?Q???`??>??!????@a?E?osa???X\<??1?`P]5???su?1????????U??{I???????????
fs?=]~?.?f?|&???1???i?t????7DC?h?A??????x???yB	?????rO?????_???@-N???*?2M??p:??|????xL??nT?V?L???v??[?? ??n?H%?t
^????e3??????????Q'?
@!????Kd?3?"<?????O????????0@~?S6??9so\X?}])m????k?"??f??R???U=c9??x??{"?F"?
?F"??E?xc87 at Is??I:?"?????%?^dSu???n?i7K??????????????9???Y*??/??s?oK?SPnE????<
?l:??g2*?0?????Ixm
?!f[eo??Ttv3l?9n?S??p\5???r??[?y??0????y??`?????;/:??0O???N (?6???g????G?O??7&??M1sP??AlY?<?^????????=
??MB?y???
?QB?V{?{?G???
???#????7c????????smx?V??33-?????'???|R1hj?*>?X??J{?'???????l6??E??%??N,M?????Ntq?p??)g??=?/y?e*<'?\?W?u???0m?I=.?G??VrN2*{5BFG??????)I?ir???!E?$?I
?
>?O?K????U&?,?.?
??Y?=!e??FY
???Vw??yT?y7????????>M?Hj??c??k??{??8 \????2?K???,??
??`-P???fU?,??j? aE?????sPgQ?M???rv?S??????t??,??%Co??%?0?)~I???g???Aq?&?
?)?x'T|???rn??? "b?<???|?4<
K?
$d)???5?I??E.??P????c???Av?)n%	G2?!?? W?u?[?u?????^#nc??`ha?Y???7#>8/_??F'U?]? ]?c?/?x
xr???	??<1i??Xt? w=?}???!Z?[???v???zk%~??*?????(??h;?????????f
n?	+?*f?+B`J%?*~??=?Zcj??h|?]???"?
??I?D?A?Q!???48?Z{????,??(*@???6???????g??Ry??;<Z??kq???a???? ??:|???+.Rh???*O????b??i???0????N?Rn(??fk??d[j??????KG???I?t~}F???9????s`??????8cq????B?(???????sa??V?
@q??~@?????f?V}?????}?? 1D=?f???wh??s??&?(?	????[
?R0??
??[?N*JF?\??^?eC???
V???j?kHCKp?}?k??31\Jg?q?\?RW?cbvaC?`???po???zY0?Y??a???)??Gb?5????k???>??=??g?d??c7???t.A????ec???W})?S&??cM????y????s??g?/?z??t]???F???J?%?l?t`??V?P?????B?*Q?"e=0??
W??l?3%g	U?P?l;?:?f???+?	m???9~???5md??A??]???.??8?Z???????????,????S,??????Zs?9??W?^???]??wu??a?t??uP4?????{??#?q
?????+<X??$ch???'O?7>WV???
?+?y?
?????]c????k??s?-?????7?Z?????????????%`?]Mi??w???_????????F#??b_????????N`?*?z???1n??&???{???n?? ?C????%???rX'P?4W?/??????]$
????8???\???Q
???c`? F?!????$?RU??u??~;???????A???e+???{???X?Bx?:@??h??
?j5z??????Yq??(??
?????w??R?A??)}?7H?4????>]????q?G?TVJ?M?T?dBM?$~????M'??}V1#G?q,?m??V#????????m???l??uW?R???>z1??Bd??
?h7LC?*??U???3oe????r?^???.Q
O????I?D?V?o?*'8:
?cm??????oU???B?J???	2
??C??84?f?Q???????x??5>c??????i????????dG??;??4b??*?1m??-\'
????k"?3q?c?3
?	Gm
?3???8????{VE?j?n?>AP????G{?????	?zM~???=?2?]???Q?8??;???U|???s1?:T??7p??????V?g?K?}aX??K(?????:?
/??/M??q?%XE??????\?=?6d???V??K4??|?????N???#??
PR?uL	&?C+?Wd????^??D??|??Zmb>dYm???Ym?/?b!??K?w?__?'p0??uy|?D?????????;?|?/.k??O?e???(?????]bq?9{????*?T?r????g?E??B_D???Efu?}OT?/@?y??T??(}v_D?+?E??j_dV7??D[??~/"?f??c?
????,^?K??&??????????k?B??7???????]?l?;<eXeDb?J*]????I%???7"?4?ygL???99????eU4sxZ4t?2u&0u???3????r??I?Gue?G??L?'|6??:?????[z?M^l??????nYI???q??
?
????Q?????6;_?&?}Zc??5Y???c?G??p??'?????0??J?Y?????????emx2??;?M??gM[
<?&B0

??F???Itk????j?\k\8W?%	?LdL?????????????V]L?E??g???
YGR??E|????|?]9?Z?*?Q??]o?!??6VW?Yb????W??
T?l???x?<??T?}"??tK0??E1?????eyc_
m????K????cO??,V~X??;6???~??6dx????,?o2??????x?????J??:?8???????	g$????\[&?j? |[?>???j????.?"?i??^??Isa_??l7???}????d???????^?0?&&j?Z???/?/?F?V????w???*???cS\q!?@?????z
?jX??PN????N?-??&?????L?
x???????}?~|??????????E>kX
?????*?}lTy?:?U??????r???hN;????6T??oc???kv?f??s??Z??=s{?RH??5?9??S??????kl!Z??[?w?`7???T?S/C?????:F?;??W?o?g???c?????z??O???{u<tw???y??
?w?aB ?6?-@'/(??~l!????P?B?
???'??P?oT
?????'2?W]F?5a?9??UI??N`??U[z??@?`?\????G*y?<Z??i
K?a%m9?}?
5?2+????\?8?h??w?k?cj??????1"?C~????????H????H???B5e???1????x???Tp?qb?????k?w<R?R?r[?JV?????g?I?.?[???D?KM?4PB?
E'`)?\?yw????`}	M?A???~?????/???7#?)M?t?7?P??w"?8?i??5???.?
????
0.???'3???$?O???????????5AT??Q?Ax??e???N[&??{o9???A??1l?e	???K?V~?9?y=W???D????H~?^?(??????b 2?\y@NN??]?{???o???FZ??<i?????Gc?@Q??E	??@??#????/&5?V???G??j???????????/??????????S???????I?????$?xaR%\???6?##?O?4?#?????l?(_/n?
P?5?????	?6????,G?M??????2??V?2Y&yf_??Pd!????????:???BO?:Y??2R???I??:uO??C?r?LI?U?@\4??:i??S??%T????&??"???????p7t????e???xs???j????=$9?>H????'????'J$??????W???'u????)????#-OZ?????????l?(u???[e?S??E?T????Mu??	?mO??
???%??i|2%{e?L?s???R,?h_????@??S?q?q??LU??<??m"?c???8?
?
???????()u???*
T??????~???f?b?uoFS?y?+?u<?mzt?@???:??q?@??w?m?m????z`??D???? G??<)yR??E??[?2q??!?m? N?BSE?K??????c???mO???{??{7vw?,?\?s???J>?W??p,2 ;??`?`?`;C?=0?LA???x??????'?O??1*~??X.v??m??[????AWE.?uq?n?fpe??SG+???sN???n?,?\?;pl"??z???????;??\|
6EKj7s?%_?4=iz???H???????B`? ?V?T	J@T??$\??>?R?+???`8{?o?]m?m?j????*?2??-eKE???IzOA}?e?a2=??F????b??.?uhC??????p?
??????Yj0<??#????]z?	>'?X9?~d??
!c?3?TN?3?Gd??A??
i+,??g????_???????|?\??]?z?w??:???	???Q=??
???p`??6???[c?0<?.??.????
`??????_?u?'H??
H????K[?_0?/{?bE??=
PN????!?r?j at s??????5???#V @K?96?{??>?q?B???tnR??????I??????9hY???z?o???R??a???G>j???yf?2???u?#x[\x
f?T?D???D?[?? ??M`_??????????.&?8??Zd?
6?!???i?
)????W???????L2??
?
s7??J?/?I?x!????|=?p?%???o?dU??Z???i?d%??F
A?
???	d??4)???v?YC?y?95??sW3Sx??E????X!??2X????Qn??|?
????/E?2
??S1?{
?F????l?I?6i????![?l???p?%^???Yb?-?SR?3m?X??????7?????VdN?PR??(o?X???%???????>?8?bd????>?P??Zy???F??????{???iw?1?
?B?`h[??HN??Bw??[???O	?w?????T?3??
?n?H?}?Q???bb??m????OYZ????B=?r??i??}??????????????f?Ik??==D}?0??X5?a???
??nrk???????sSc,O????m?l??[?D???HRO??}??`a^???4X???=?~???*???O?OVkKL??G??'???tW?JCo?w~??????????$??y{z*?+Yf?????/M?V?6J??????{?F?JN?f#L??Wg%sS???VTio???K?<QZ?Y???xwr?/}?????oW?????o?/??j??c??1w??????f????-??????!?(Rx??
|X]?????A???F?)????????
?N????^????Qw?D$
??$?U[??????	?????,TA)?}?F????+????!??d???,??T???g???????I! ??????????m??i??{X1?
?????au???53?????jDq%??s?????Q)??????%(/C???-H?d?TM?L?;??2??$????????0??????I=?3?q???????s?
??m??f??/??\)r:?k?????.y_?N?????,??<?????y????&ka?P?rZ[-?????\?????f?z|???$0H8Vk?????A?[?q????7A???L??|# "??????@?0???3?
O??>?R??l?j??%?v????2t??#V8?????8???C???E????hE?8??H`")
?]z)=0j]??2x_5Q?D}?I?'Q?D}?I?'Q?D}?I?'Q?D}?I?'Q?D}?I????\^?S?t??~?????D8><??????_?Q??
Gt???????B???e????@???
?????6k\7??{C=???L?b?z#?@?v?hG?vd%??@?v?hG?v?hG?v?hG?v?hG?v?hG?v?hG?v?hG?v?#9?????$?DH!I?$?DH!I?$?DH!I?$?DH!I?$?DH!I???	?
?Ke?????;c?W;??g?.?K#J????7???m?F[??knZ?#?J???
?0^4??&)????????XF??5=??3?q???o8?*?:?3?U?????[0??MTX`6????3=????z"?u???????*?|?M?E?O?????xu??&Z?hm????&Z?hm????&Z?hm????&Z?hm????&Z?hm??????H?#??$>??H?#??$>??H?#??$>??H?#??$>??H?#??$>??m???#?e?HZ??&[?T9,.???m??t?o??>??faco?????s7?????XgWf??x??evt?jt
?I"$??$B?I"$??$B?I"$??$B?I"$??$B?I"$??|??$m?$f??Ib&??$f??Ib&??$f??Ib&??$f??Ib&??$f??Ib&??=e????B ???n)????6|???????*W???
??(??@??94<H??7?LOw???(i ???x????U?:?<v???Ci?*??!????J?G-p??%????3%?K0bx?w????1??Y*????X{b???'??X{b???'??X{b???'??X{b???'??X{b????k???$>??H?#??$>??H?#??$>??H?#??$>??H?#??$>??????I"&??$b??I"&??$b??I"&??$b??I"&??$b??I"&??$br??d??u?T???o???2;?D??$?c<%??.???Q??r?????	'?eM???4+???QZ?
??pt????Tb2???E??B$
?(D?'??>?D&??+?0?%?6$??h??F??t1??dWv???f?
'?? ?0???au?????)?M\?(??"???9Q?????;698????:W?o?D??F1s"w?X|+|?jce?J?e??c?b????<?]???+?????+D}???74?j??v?K???r??xz?sWx?E??ozY??????*??Q?yp??O*r?????k-"???V?Z?k??k?????H{?????$???V?Z??*^??p?s?]?[	???k?X?????Ss??EL????Z??7q}g?Z???????N/r.???\?T?&??\??Y??zO?,?U???:_????TSs??q???
?u$
??ua???5???:{^@cN!iZ????Y?IB?^????
??
???????<o+Vt?b??
?2?~tb??*??9y???kq??1?H??c\;V????+?1[u?H?#?w?x??????WDe?!Q??l??DJ??3579??i?`^L?lb???????f??9??3K???:9?9??ik>W?s??????Q??<t?S>%K<f4?V?h?x?n????V?V?!-'>??? d???SO<sK*???:?$??????5!????p?O?0">??$????i?O?'">?Y?%?W?D|?I??]%>???X?s?"&&%d??#>'?`?3????geI????????N[?9??%???s&>??<?7uz?s???|!????????Q??%?????s*'>y???????Y.m???#}????~???5??
H????E???Ct???D?+q?????Ct?Q?D???Ct???D???Ct???D???C?}???$R?HI"%??$R?HI"%??$R?HI"%??$R?HI"%??$R?HI"%EJN?A4c3?O???8????y???Uu????T?NZ?x???
????????9??owY????m?sw??,?x??%??8^?x??%??8^?x??%??8^?x??%??8^?x??%??8????
?2???>?;?J??????JS:??^??<H??~?;B???\y??F<!????'??5???\???l?>W?5??~m?`?am1??-|?X?8?????|	??q?m??f?80??si?7??M?<C?F?o?PU?T9@??????+T!F?D???zZy|*.?N!????Vn4?\dr??,-?N?4[]?VZ??\??Z??\??/?????][???/fY?v????3Auf_T^DaZs???S/I???E????W?"Z=?r?\KY???i1}?????|)~Q.??s]?_p???O?iy??????.??????!PY?|??????2^?E?SR?{	j?????:?|w?Ee?CM???]?l??|??a?Z???f{??#??D\w?!>???_???g-/??????nw?????_?
Q:c>????s:??????????w????>i?ZO[O?Db?{-??;?	????????}????????fa%?f#k???^g7;_v?3?)??$??O???T??d??Y???;??5?gO[O6??'????`?C?????8c?????slC??&J???u?0?+W8????Lw????'??4?????L??p<????(Jru?<??^tk8lm
???????
??le?~f???m?'??????}??Z?_0T[B????
B)+X???*????U?|??b??=km^??7????;?)??O????*+~???|k???cr??%,?80P??Q??0Oa?F`=???O?L?L???????i??|?=??/????t????????O????~??
o??c?r?~
??;?8?Xa??
???J???wE???????X????y?
?i????V???,?g?????m?????????l??????:?????^???N????V??K?G?????????V_???/?x????4?Z?<????????5?m?????Y93.????.?+?\aIb|???J???????
8hc?}??EZX|?????5E?????:1??"?DI??t7?3?R?	b$d??z????3?????]?b6m?????HV?)??y????=??????I)>hZ?q??;iJg???y????!
?e?T??4"5???U?9?	
????G??v?o??
??E?z%????m?Y	6?go???????????OY})UW6?`???:?n4?A?Ln???k??f???7-?,?x??h?*??A?????????h?Ux=<s`??B??+}??E?~4?s<x?Sv? xv?~?.pI????e???N??#4??:aA?{??E????? +U?2??	

??/X?p?Ct???{??I?P0????????????W	

?????d?y[?Af??nBn?L?!'58J(??d?????v]???1*?
f<?:9?-Q???w??Du%???L???M????U?F?????V;?s??d??rJ????[V?n<?{QA_z7??o
(@G|*??I?S`B??4Ja???!@??g?G???L??]?G???O?P??.!!????BM?+????dQA?J?
?,,??*?%J1e?S??a?'
{!S9?1ch;?5V?9!?$???&?D=33r?????7??/A???"l!?!?y?X??a?"=B????<.G???????J
???Y???W?"C?(O???K\?)5gO???s
Lm???O?U3;
?>
??T?W
O
6Pm?????:???@??i}}hZ7S?d(a??sIIZ(??sB???uIM??-wao???H?????6????Jl?#?E??t???]V??m??oI?
~?2J6??g??W??????7G??H?3??6???????????U'C?o?j?j??I49_?? ?E??????_W????\m6?C[???-????Z?=??d??z?!??v3??	?	?	?+?%?.??2i-?Z???????`?"nO?t!L?n
9??h???x?+?8????U?q??????&r"??i.?\???????beb6gB?????Ph?r)Z?>?#!?M?>??4?
?sVt\\?
z???SO???R??HK}E-U??{????????>?#/????????v??j??'%?z?? 0?
???? ???V-ZH????HH?*?[?x?QA2?za45}a?P#?
X/gB+T??
.E?0eE?
??dRN?L\?&L1???O	O	O34???4*?q4K?fch,e6~F?&j?A?}??e????1
??gzz`????????XC??W????G???GOa??bq???p???<??}
?@H???fo????????%X????UF??=????K?|?3? ]???Y
???*??Rrka??????????>z??k ?%?-?#??????%qt??i?2_W?T(??????}??S???NNef???????s???V=<??N???7U?.k?????e???M-?LeP??dM?Z??????
4??S???_H??~?Z?????h>??*?s????,R?l5??>:<>?0?K?}??l;>???Q??s?D?
?w?!??p?
???3??^.??????^??????}?????4?? ?%f?0?#wxod?a????jr**???@:?t????c???W?B??U??l?.C"??N??????v~??\;?;???iV??MjG???Y?????6?6??|?A??t?3i?.?]??v))??????1??l??R>?3?ga???\???????C?????MG?W[?S?-??M??&???&'?0????}?1????7?5xSz]????????>?A	{???/???j/???A?k?&p1??ahc{????h?XP??H?K?????uN?V???~???N???o???0m???Le??

~7?O???
??8
?/B??^{?uc???B)??92????7y??emk ^???'????????)?C>X?@?e?Z??Bx\????w???qz?N]?E????7?A??*???H|c+??d?e???{????&->???4{?\???Zk????:??d?,????B?oV]j??:????S?!?A??(f?M?Y??0e&d?????gGf?az?XG???Z??x?^K??*?a?Uw??Jg-??B?[UVG???O?9`jg??o???;'Z1?L?????y??A?f^?? ?Y^?*?E?????
3??3??8??~?|?#??u??*?3&T?-?-R?iO!???(2??b?$????????'???O???a+?h~\?}d{=F??X? ]?8r,?????DXv??tX~?LR,/??????s$?N^???=XS?????0?J C???`?Y???Y?{??>???n?)Tqd?a???k?C?5Cc8t.
6r,??p?@?=??Z`????[~? ?g????????Hw?a???\Y?6??{0oL9????;^???`???????A?????5u????]???Pe?*?Y?`$??_?z?????_????C?{????
?????{A????4?????'?m??.?|?3???????Ra??a??????#?Xg??6??cO??????F?
?D}???3???n?x?1?[axDJ????;l?wq?
??????????W??|??@??	??0??U???e?)?
)af??D
?<Vf7o ;u?>???*???y????K??>???4?)??[????
WQ?
???=?x??:???? Tg?4\OtN@}?kK,??B?r?PyV,?e`i??c=zr	?????}??.R?H???v?????T"O??#k??
?V???:?(J???Q?y?v???_?????[?a40??4?x?H??a?u????\?E?n???y?w???;??o?b?G#K????b????W?o?>?????7aPq????`Q]???&?p????????o<??b??j???????e?????u???u??Ex?
J???????@10?ds??w?0"????
5u/?`???&?o?*e??Z?z??h
?$?L??`a?!??s???>?V?C?d???kakD???ElWJ?c;???D?!????FT?????L??4Gd?&M?????M?:S?U??>(???????4E?97?E??D-e?,??w?_&?B
?F?`We]?l?
{
?h????W????qy?J=?s6?c?Gl?????2J.Z?I?:??n?31?????x????~?????<??v?
?#!}2?xN@?xZUu???05q(?HB???R????d?\P??V?????.x<%a?b]L>^Ye????W<?????y
?j9c??h??>?????n??????Hs?<%E7I?????????????%b\m?Ea?z?Q?-?B-vi???#{?z?????
????nm???h?M<n??`2n?.?^?rD?{N<{+]??vEU????.s?l?:Qr?^Y??x?$?E???x?
??A?`z?a1?/G$Fq$?f?
???
?.?_?a=?v??bpz?1s
???R:??m?]c??E?sL+??i"?x?%????:?!NQO?????h?aq?g?????????F???6ft0???????	R at 8??????8~?[
/???????.?D?l????:AD???????:????ys????]h??B^??>\
&???x?M???2?a?0??X&j??A?
?n???q?$??(c??,???O?Vg.L?`F?a?.?r?wX?\??????7d???
??5U???????X\?u?S??!x??.U?^~J*????TI??f?%?7!*'?P???i?#|P???1x???????N	-P??}??P=y~6xF?T??*?R?S?tJ?N??B??R?S???j?E,??A??m|I?1?d?qL?1?d?qL?1???8?k???E at u???=???G??"?emsm???#???"O?p'W3??^?

?9?4p5-?????? o?4??e?h?7#??=????m??7?2s???y??tl*????_?'z???UV???K?3??????/?? 7??r#?? 7??r#?? 7?
m??^J?????????ck
9???2?W?#?5?????:w??
??G	?,:?i?}geu-!0'?y$??!C?`?*m???!???2?hJJx?@??4?a?<???n????Y+?e|?????vvx?FH{??x??o
0??*?9W-?o?,?%<??1 I???b?v?????@???????u,?HlZ??D?F?
k:?%C???[]?f?y`R?V?)~]????E??Z]K?yJ1???Fn?a???Fn?a???Fn??u?
???9M+K?+%???$Em?+[m&???	?Q?E?8?.?z?f9?
{??)
?[???HT?[
?%o??%???["o??%???["o??%????????Ra?\)Io)'I???Yv?[z?>?8i?1y?$:??=???|0?-??w???N???6??????	L(D??k\?hA???73z:XNq?=??+`?!P
L.-~???j?'4?b?
!??????p<????^???k????V?cl"?8.?;!?GF^?P??????????8M?????KS2%???Dv?>?????g?|?&d<+?z???*??c?U9?Y:_??????*????6??????bU?xVT?T1%U???p?r*^?"OF??)???Sp???g=??
?UA;T???@'E6I?@[??q-??2?;??[7BC|$?-?s???X??|Md0p?x???`?E~Q??pwz?A?
=t?????Vuu|?Z??ys??????X?;==<>???;????<K?$?t%?~eV??[r9S?
qu?)E??_??p$???
'G??,A??,A??,Af,???,A?aY"?B.y?H?;??????LV0Y?d?LV0Y?d?LV????y??
?*?Am??"?=Xa?)?h%E"'? ?H!E?U??G?G?????l???cq?????
8?G??:Ly????*???kgh
??u?}v??m?z?=]%?L??s??mG????????t??u??g9?r???U?+H$~x?E|?h?tl????q??.?+~?=?WV????Jo>"?7??????????a	?+R???R?,$??n????:L?s7?K?d???E??2/?:<N??o???L?]?[mU???EUK?????UkVbOV?_4^^??????????<E???	????? ?
?F5
??_?sRWV???Qj@??cF?{?+??????RQB???9:i?????0Y?-???6???????????;????"?(??:?a-?.?34????IVI?4?DZC?.SJ?-q?????????3?=!??,???5?vZ?v?@?C???????V? ~??????????6t]?????????C?mt?'?d????X/?A?????/???0z!??????V?yeYA=?g;>???app??&!	3???????c(Y?^???	????????????y?]P?k?glz?@??s?jN(q?:?E?n?1^`?Y??rR1)+U?\?????mP<??l_????
h????	??{????x?r?MQ_??"?c???W
?,??y?]??????=????+
q??b?????]mi?5+?aKK????p<d|????fg<??g?x>?A?????|??NX?U???/?s?9?/?g?71P?<????mc(%t7???????Xv??6A????W?.?7D:#?_:?A?????@?.uW3mD??yxk??75?M???w??e:\??a'?]A[,??z?K6y
cA^hnq_q
'?N??R?zK????p???Iq???\;9=?;l?'?&yU\l,o6??>???t??N???S:}J/?t??N?>??????G??,+x??c???&;??`???&;??`???~?v?????-7b>N???????,R??Lf2??d&??Lf2??d&??Lf???I4i?Jc?l^?y??%??l^?y??%??l^?y???/????m?F?!??m?(?
h?:?5avy?????Oa??b???K2??????;{u??????>y{???5T2?LDL??
.S????hF???{g? s'?I?f?4?S?4?iH?T
??iB?qv'???7??!?j_?A?????W???]???%l???*???
??????]?AhI????b???e9w#?qJ?fG:??eG:??e??+/?????$??/
????M=???~?????}@??:?L??G???!?????5a.I[???#V`L?[??^]?????p!?/???Q????
?????u!??_}g??I?????D"W?+|9.?Ea?y?,????ac?bM???>???G0????A??X??=e????{???Z????}???S?,J?9GyV?#????liQ??rd??{?%+???????w??d8?
?[?Q?4?
&U?t=??fL?6??i?d?xj?????
e?+?01?0????V?%???*Z???5?o??.tm>S????/g?{??:?0?????i???'_*?I"?.?_^
??????g???j(????Rn?^+A7?z?~i???u9???i?
KJ???2!-?=????b?$L?`??????@H??f??p??%&?l?S?j??;x?BW???}lTq?>nA???L??c??c??Cy16q1?(????<?8?&R?
?&?
???K?Q?d?^?}
?q
%?=?q???+?c7OO?G?V?E??}?4H,,3)^??Xl8?J%?F??????b????af???*???e????m?e
?Q?????$V?}??9na?.|?Lax?V.%\???1[?	*??[?<?nP??????????G??
~%>x?9>??????Y?)??W??u?su>???[???L???hb??l;???????4{cP?bd??e9W?(9??6?;z?V??????Z8?Vq?Cl?[T??????>??0??[EC}K1?FS??b?$??`??6M??`?UOC?#%2?????V????(,Z???E??` ??K?0^??G??+l????Du??3?g??oN????$+??}}=F??!	?????????3?I?
??qv9??????????l??|5?????C????k????#????Q??ms;<?J???w????jb?&??^8????KS~v?/u?_?Y??
g???{?.????{?5????!|!W*??*dD5???"?.m:??????XG???Q5(?????
w@??=??MWHD??Qa\??"??Be??z?4xX?qG?.?g%{?Q?v??uU????F?i9?(1??1??v42p&??_?~?.?Y"?&??]?h{?5$q?D?\?+?
h?oz)?v???"??"??d5?k	?X??|?/e*re?J??~k???I???l??\?????Vjn\e???????H??01???-?p#?\????
???"`}????A???R?	nO%?[??Q????????w}?_U???????U??o?@+'?6?a
a,??f??fo<?$?i?S????Y??&?t?
?/c?5??5?u?8??fq?#?.???S????0F?
?b??????z??????;z??]??v?t?w???><?;?;?9??<?gr
??????<?"~R????+???.T????<l4????c?/h hs\?[\?>???$?%l#????'??*????=_??????,???=)lS\????m?,qTnmDo?Wn???g<-_?<?& =???Q??L(U????h;?
?Ej/?h??U\????0y??.W??E????Z=??e<2;YB? er
?Q??iZ?
???<%w?+?hJ??3?"?"#'?O??z?h??,?s
??V????Kt
6????S????;?m2??O9?dh??????l1????+?4s W?T#z???eIrF+?????h
?V????x???Zw?_gq???L??=pP?#J8#????????v??E??????e{??6?????}?%:>???\????#??_.Q??
???
??^?Y?\?0????p?		??????"????n????N?G??@
?:??1n	?48??!F??(??????????Ez??F/Zal?,??b??|e??U???e??????(>??gM?`??E???Gm??&ml?L?o?md??????l??o?9x`?F??K???y?
??[K&???`>t_9?"??=???3"?6?%u?M?????J[S7?????
?av??????i???Z??????????????`???x}??b4?V????T|%???FQy?;|??E??u?o??>?m????5??????
??G??+???Y??m???mh???=?r?4?G??S???%??
?x`?[?z????^?x?z???=+???j:?T????+??^?`x@/a?^???A???78?c???L,???H? ?Vi?
??f?
??+{k?i???=5????4???XZ?;??wF?/>????u???eb?y?K?OFy?-?V:oJ??Z?,?>??/RNB)c??$y9?8]lcX_<X??
???fj???XQ?7??Qq??d?m??(??V?l1A5EX??????T?"??@??}Dm(nO??
?w?H??Q?p???+????e??V#?
??\%7???w????ld???C4??o>y?C???L??????r???E?E?#?????2$??H#A{jQS????????"+?_U:.????'g?????`i<Y?}Xq?"\????p>?v???oh?q
???l???kpg?????55f?;?y0??io?Ap?v????U?2p?v?5M?
_K?H??J????????A'6????"?????uQ5?B?????^?s?j??d?EAs?????;????m????s???={z??L?S???S={?jL'Ij0:?Rh&mM?<?e~?<?:	l???(K4?????_?V?????t[??qE:???O?EE??QQ????-R?U??h??l
???^???6z???=???-Y??BL?+???
?P??/"?W???r?L&>?qMl?Jf??|???
??t?x\?P&?v?%Y%US&))?Lo(???#?3c????<d?rd?gq?=C?l?n??8?=?m;?L?(]C
??m?;???}???U???
?s?o???#>Xk??5\??#??E6<9?U?^YXP???K?
?qZ?b?$?????????UoP??i??/??Ndu?58???~
????
WX?i??_?E[?8)?~q?????V??aKK??????)b???X??x???H0??????|??NX?U???/?u?:?1?g?7????????b????q?9 ?J?I??Hl???_?????????7`4??U??(?$?:??*T'??????]a?vwt56{?#?????????5?t?/]?K???5?t?/?C??????}??F???
uQ?X???q???*??S?i?s=~MW_?(??W)?^??"Oo4?]?Eb????A??u?mpc?O???U??+????;5p??`H??????5o?w???k?q??
??>~JeXo?N-???H???A??A?u?j??????q?=W1-h?,??????????????[?????b?1?`????????hg????W???*??B$	m????a\v?j??? ???}???1?:Nh{G??a??KV??a?a?d ???Hg??<R?a-???\Ka???IWO??Q?4?l?2Q?j?q??=fx?????[????x?e??N?m???#[???????????<~?e??;?c;??-IYyDiO?Jc?@?u?P?!nh?????<R??RNa`M?m?????>??7_?0.?Z~ Y??????wV?p?%C0)?9N???????W??l3X??P?????k<T?(?d?&#O??$?o?????$V????T?>??t?4????lO{}?w?SE?~U???G??????&?????R??j;????!?;[?W?Z??p??????????&??9o
-A?????j?T??,?60w? c?J???])sW????X???8?^qD~??????-??Gg>?u%??Vo????1????e??i??????XF??tk&td*lj<?'?Pw??Rg^?%?LBTdP?????2??'&V???l??l?FW:?L??v?k!?b?i?l6XQ??V?j??<T[?i?)1f??????y?)?+??lsR?If?fM???L5?R?F?.?1D???4?R?s?fP???o
?	??-`
?????l?6??q???scSpIS&?0??&?;?E?????WX??l?Eq???m?????z???!XAqr'??4??~??W?T?????	?5??J^5?d@'D7???-?4j??8?cI???9vQ,??\?
hh
??k-??`?q???????P;?j?g????1??M~#/5F?u??p
????<?z???l????
/?Q???[?/?s?K?6x0?'?{?@?"??92?d??Z??-/?}???????d5??,-??Y?1?+?!?b*.?l@?m?eBJ7??x?(C????5?H??`?_?]??~????N?J??W?o~???A????>y??????af^??p
??????.<?
v??_	Fw?????^?Q???:?I??n??X?nd??E???*n?h?w?6?v??`0<??????:???<???r:????3?.8y???kn~?????????(DQ??????d?&?Q??g$2?nAU???K1?????????a??)??E=?%????vj??-to????3????6?~??<Xlg???/_?(?j??????8??????1??????jW??!O?9i?Ct?M:t??c?????????O?5n??/@R?B??c??
M?xR=??/????]Z??K??????G??????'?o???O???????? ??_? >???k?V???
w????,*=x?A??[9?hB?0???#?D?S???kw??yC 6???Dc?~??'???Ei?y?t???Lr ?J~???U?|?1|???????? ???x?????Fc?&??#?1z?\?????6?\?P???p??9P?e+??5A?
U?+???Nd/?????m7??v4]?{?7??A?fH?YzK?Ba???C-j??
?	????g???/Nyv???gS[??g[?9p?7_??,%?????G/+??????N}?"?G6V???u?[P????#:?7^??t??:s???C?#?^u7??N5???2
?c??A??M?
?s?@??ssEH????~l%????@a?G?v?l6%??k0?P???Y7?????
??????'???????Sj????Jn2????vk?&=??????w??y>L?)???N?D?d?????#<?5?s:	?????^*=?M?L>?$o
?a/???????}??????????%?P??6<5?N???AN????a|'?nogJ?R?????>?/	$@O?????r8??@s7?OE?2kIYy12??l??N;???G?NJ????$?1i?j4'6??xDKb?
|?+?G????G?p????Fb??????{?l?????_??	???
?p?=D??(P?S?????@???i???bbX??N?'????#???i~R???i?Co??;?x??, ??l6?d?aAX??A????S? I4??1y??GFZG4GW?Q????K??? @???????|????&??????X???s?Wq?@???!????
~cVF? ????????
??????h?P}?Nvs0???w??s????y:'??E',?`?????^?????;????	?I????y<aX?????d$??+??1?\?C?y?L?m????N?]??0??t????,?$j(?)
'[?S???|??D??\???]?(B?q???WK?I.!?	Y??????b??D?3?D?K?FB4b??O!?
mb?*?JU?\6???"bB(????b??1???%???T??????}????E??3??1???????u{1?Df0l??eY?????YKK?c??Z???x\
%???d?E*?<$?*?V	??`y??&?(??P
?4?.4?????kV??/??F??!]1??????S?`xtO,3B??;^??.
>????????? &-???@+?y??Ik'??Kv???Z^?????????=????[)-H/{(??D?K=2?B??t?[???t?g=??'??????%?`?F?M??6Q?K?p?7?????????/???5???\K????by??%B?.>?K?_-????#R????	khu??
?1L????1?w}????q?_????m????v??K????q.??
 ??"@ @?w???x?NJ?m?u ???r?r<f?3=?lNWc?z}??DMw.f???8?$V?(???????O?G<Fh??C??=????6????C?c??U????;??????&n?	?Mxl?<?J$?r	?HhE???^d9??z????x???Ho	?H?E?
?x
?[n???G??,?p0j
a?;Q?^???x????i#A??b???
?????&?"!?
X|~???p????m]\?c??g%?'!>??l?3?7???t?????=?p?o?6?/??????7??M?z?J?????U?Vn???{?(<~??E??#M.???&n????????$?????????C?u??:?gu?S?Gkk?????Y?g????L
?k}???{N??????bA??<????????????	????s???10s????-?
?t_a?H<?u<Q?-???????O?%l??xa	????,j^?;?
hw?o0?9?^@FF??'<+?Y?_??Dt?????$?'?
N????T>?,??????'??Ph?2!>	?I<????#8??$\/?z?E?o?????
?>??(?x'??????p???
'~??02????Sq???'????]?&
??>??,?8'??????7p?
?x'???701?????I
:q??0???C'????t??y?C??+t???????U:\?3=??mf?E???G????~??e9>??Q?????f?9????????p?f??:1
x~E?u@?qX??????3/?k0? z@?
???
	#QO?-G&|? ? ?"???%??w|??3???es,@?????n??6ki?}??~??
???z???p*???ky?[ ??:w<????? ?\?: ???????????F????k?zfz?#??>????h?0B?*??o???/???????M???^^??\?q?f8?#H??????Mm>?<??	]?#49?
^
??8?kYn?`_D????(??5?????#?????????$???$?$a%6+}^2???d47Mg'?{????1????z??????'	C??f??d?j??$a(	CIJ??|??????E?'?'5Q?
?rOJ?KC????a)????_I??TF	WI?J?Ub??O?VF?????c,??et?r?[R?l???0
?D?]5????`????u-V?k?i??&:!Z?w *??]<???????p???$???????Nm??g?4xN?f?[?7???t?[??)sf0+4aY	?JXV<1????????	$9??E??Y?E?????;??????j?x????C?????%????x=?????F?????i)???????+/??<??.G?V???m??_%????????H?'/|?x!?tx???-???u?7??????3??WG??q???J1???????}??r?ac??2?i_8O???S???G?jS*\???I?YN????????x?a??i???o
<?c??d??W???B/?s?S?OlhZ+?AlZ?s{N??6???i7???-z?&uL?\&???3a??@)?????!VX?*???z?3D?????\???5?????ID?q?\??o??????\??{ 
?B?\????[(?? ??P\yo?^??.?|i?x????????i\X[?1
`??^6?????"??.??3;???t?u3=p?R?L??R????#?$v?`ao???`?l.ks,p???U?E??Q?????f??-?}
T?????"0??Z??J???b?
O???e?7b}??O~|????(???ka?o???O~@????'T?)
k?[???&?r?&??D4????>Vp???l????????O'[/?z_??wLV???n}[S?0???B<?oCQQ???W??????$???q?1Q???L?B??Z?
$??q???q]?????:C7??A????F?~??V&???H"?'??????!???cIql?3?????s??'	?O?~B???e*?c???????+p?H{\D?vp?o??? ????NB??d
[...59749 lines suppressed...]
p??8+X?R??????%???q?O?'9fQ?RS??>?TOcO?f?G??i??p?^??J?\???O?rAd??b!?8?Z?7?`???^%???kaU???D?????Z??p>?&??;?n*??4?f?F?'?:??/??w?'??m?W???)
n89????i????l?Vv????,????M???F?ze??6o???K#8?1????????0ta?t,4??U?6?1??O???m?Edq????F?
??X|(??r?
??X???????&!/l??4?"?0c^?%???&*R?w?i?`?Q???g??	??4h????l?)0H?\???
??4?]???i,??|H???c]3b?*??"d????,??*@f4??E?????8??oV???J??MA/?}???0?"-?CP????????#??????06X?!u?Q?)
?????????H?(?
??L???N??P&???1eL??,J.J?k#???Z?vlG[??3?R?
?^*?P@?9???'/????J???X?M= ??RX?eXc??????H-?dqY?o*?q?)?`j?_D???F?#8.Q?nE?H????0???L2????`Q?W56
x&2Cs?>????'?*?\mp#Tq?K???=p?p4?bpLZ??J??N?+????`7D?DsA'?Q1???????\??.F5j??}.????;?c???Z??;??^?<?#??4VfS;?????;^REd????oN=????2?????u???<0)?w?q7?JR!-1fuZ??????`w2????Z??u?x?*Q?b3?_1?+UE???\}J?)???=??=f?0Wjd??????$???S-?(??B???????D4?G?|????s<??"gkL???b?
??`????4?G*??1?2d?H!?!?1N-?i<??2??????%????:??????????P??p????	,??????+N?????fY???!9%??0o?Ve?<)???Ya?M?}?.??x??0?J??O5?U?nI?a?$??
m????I?o?@?)?q??7!;4??P??B?c???\Z:&?&J?y?>???,??^?{??
%???r>$<????WY???mI????Xtq???o???????(??2?7yx?n9?4?&?L??K?U?
?????b
?UA?J??????B9?I????\5?Hg???r?/?np?I??C?9%<?@?>c?J?4?eLJ@
?p>?a?ynF?km?g??Z??P?y?X?3???2-x?&?k?10???e^??R1????9?igi?6*?!??)j?^(z'????????F$???1.??[+??%/|W??????Z??J??*Q6C&<2?E??)s????u#??)	?WL	?J?K[iqN??4b?L?<1gN$???7%??????tU?H%?????B???X?,?W??+???\?<A?=??y?j?	?????([??J?D1|?=$i?Nqc,????:T,?????G?6Nq??Tx?5#?
?U???+&m1&?J?cHU?Yd(D??r??????XD????????_???x?Q??T???HK7?(??>?S??T???????D?Q?????i??y?k??R????t-?;???Ke.???????????WE}???@?????????L?e.??	?W??(n??v??d???z???	3?3.SY?O????9??R??Z??K??????<?;?????_?q7?? s?3??H;w?
b???Q1#??t??v????? e?cB
2W?T???%@?BK?l????Yxq-1?"?5-T????
?bUl?i?o?r?E
?8?,?"?????T4ib
?@c?0??????iAc)xUy?%???
Z]?????XPB??O%?7?4?U<??[?mRY???????????lFYz.eI%v?n%V?6?q?"?)gg???c?5??/?????/?p???1????*?Pb??JS??Fgy*Z????,??Q?"?????g$(??J?c\F$-??????????Aa????p???
UV8C?pztU??t-??")?d?[????b????????B
%???U??u??HOXA????S#c~?T??rg8W?uA#?<+%d7jN?i??.???"???EE?]f??i*????J@???|??$???\~^??X/$enh%k3???:?*?????
UF??8??O?B?
?cJ?D?b-r????Kl^}????e?L?/T?R?_ny?JeNYLX?`?8??.???J?*???_J'_?`6w?	0)?}p@????????y???B$??)??eU?,?b????lI?b*n?????:Z???)???)\V?]<????8?TZi?cl???:-9%?W??d???]????YT???x?????R-??Z??c?u?G ?h^??
?]???*???r?BLT?B??xs]8?0(^?Y???x??F????S?x?Ba??N??2??1J#??:???Bb???\?}t???\?,?????J??(??X???c??t?P?$2ft@???#?y?^???fq?p?L?DA???r??<?g???w???o??O?+>??W?`Q-uYQ.C??/HI!??R??$
y??
?L??K?3?] m5?i=?@??V?G????k0v?????eg ?????????y?~?Ve?^?J?_????r?~????L7a???7?f??????Xol?????gf?[??"?????Ig?
???a?????)uq?????;M>&?G'?_?t????z?A????wo???x??f?)>>??^f?dt[v<M?????}||M?L:?^2?????i?q?v???d:
r???Y??_?x2z?????-?/t??A
??J,????`?g?w???(uln??T???????hrO~?	?q??)???gJ???H??'}?dto?'??as?	???f?.?e?e?d6L`???`0z?^?????rE?AO????M?????~g?A??w?????|[?????WrW?[`z??M?R??i6?L??k8kG????.?c???&?M??M`????x@?????Y??B^^OZH+?3^Vw
$1?p???.^pV????>?9???'???(??+/;??4v??????s?
b?????Zt<v???)14?W?|?u?W}XW???0???????z??{J????v?g;QK?>?7iL'yw?Oef??A????I*????0?F0*?s???Y????????????????B$Z?y?????b?n>>??@o?????d?U?f-??7?i??2@{????M????GC? ???	r?I??3?bA5?????@??nbs???F]?????lB??e?N???;?????S??W??e?????c?!??	?6?7??@u?????I?U???[?Y?aZ?????&?"??W?,k
F
/WF?^??0{???to?????hk??????|????l:????&=?
??q{?W?J??$??a?x!?
\b?w?'6??6w?'Y????_CeM?????b????c>5z?`L?W?a?u??_L?u??@?k4??;????O???????{?S?
?????
^<??N@	?&?n5i??'????Z?-<#;)9?@??I?{6???????f4?M??=??yrv5?]'_?'?1?IQB?
????????\?=>??8>=?+I?>?????M??w??oS???^?%m?????i2?$G??????9?k?gaz-?~???????5?Ho?W??????d?E?Z??|i?q?a??&?????/???.M
???????????kPV?9?a???]???????l???`????????????
???Q??1??=??2??G???????????=?@o??.,p9?=}ur?T???????????A+??|0H???T|????i?[]a????z?t???L7?????=Br?9FE?;U????Mg?+Y???)???????/?????~Jy??;???2}?&
G?k6 ??)????'5?g?g?????7A???Z?mg
??}?|1?n????p???	?'t?k???~???m7@?1?f???T????Y??????????$O?o??[??uT?W????????????????64?????h\?????;?Xq???!??Q?`?????k?
4??c??-??7??`~???q?|?????|o?0?>???(X@???
'"?4=?g???+???e6?l:???=???^??h0?$?a??f??,`????s??,Pz?5??+?Xa?lwT?Ss???w??2/$~??V/YO???W/^?-????1Y&??I?hf??7?@?kZ?????~S??>????4a?;?????^0~?n??)k?????j?,?_|3??e#$a??5{?k?d?'??0?@?p??????????@??7??7@?P???q?s??b?b??k???|J?#????????I??
SN?;??wpx?????O???{??J
?????DE????????/??7??/*
?9??N?4??|J?
_?c?
?U??a$??J?a??????f?q??????-???_??.?=_??(?x?
Fs?????/?{??(?CO?Q_?C?m?2f?

V??v???h??+?<?6$??????E;?1????N??/fq?}\?s????%???7???)???2?????????=?P6??x&????*]???b:
?w~t?????u?g???6??M3??j?-c?????=??L??wN|
>n!+?????k?.ib}??t???????
~??:~??w???j?p?=??c>??>c?c?
?;??}??j?7O???????9>y???o%
?L????Hj?G?@??O?o??8???J|?3?m<???.??]O??????P?n??)??H????7???)HW1???????^???f??	?:(?7??s??O??u?P??8FG?n?????t>fB???F??M?P??*?!??g5???????b?,??????n?y]??1?I??????r??????????a??NM?#_NX???CG??w?-/u?7?$w-?/??Bp?"'lui??
?????0??az4?N>Vl?????NN9TE?i?yS?#x?
\????Q?b?????a-Y??????Yt???????u?1j@??Y6????/?:Zk??aW?v?s?M???l,?`{?Q?U?'???e??I?7????????v??E??R????*?y@??a@??=5?u?????9?x????m?"]5)~{???w??C)zC?j'???? ?A??Y?Nb??fY????<???p??J. ????/gW????H?g???????b?????a+<?0?*q?_?????s??????????^/i?*?????oxm??52????-:x?/um~$+?av?A??????I??~??/_??????E???Z???	l2?v????0??v?!?=D??s?bVk??????
??,??Ck?1???6?($?[8s?L??&?
?f	n!??????A?7??U???%??Z?vf????	~??_?2????1Pr??:
?(h{???&?u?O?az???C??}?N*?%??Pg
??? ??;?Rj?W??jqz?3??E??
?_?U???R?3?P_M???w+?ns?????
T???$?%?3?u?u?E??=_K<?
iC*c???u???,+p4??xxzr?Z$???????????S??????76?-???????????????#$V?}?	?e??g???u?(?
???C?G ?g???????I???p?Vb ?
4??V?l!Ag??O??[???7j????g???%???/?/??MZ??{??$?6\?H?
=??=?????}bO???=??"o-???&i?{I?\?O??????0?~??Dc???|w7???u???/?l?;=??????????o???0?O.??O??q]c0???g?=??????F??
 ??2>?|?I???
??U?
???zK????????9?1
P?Cs6?tc-?IzW??6??1?:2???2???bz??r??K??M(#??
??ja?r|?? ?????E???{??j~?,/U?Z?????
?p??8?????
????}w???e??k???W?l??????&?W??z???O?????n
????????y?v?w??[??N??????Zoln???????????| ??????p?????-??_$T
l?????????w??7?O%???dd????3??v3??w???43?Q?~???l?c?Y?O?}
W??F???(W=YJ.3??3????|?J?f?c^?e6??WA????????h?C?D???88:?@??gG-|??<@?L????	??)(q??\?Q?q3g?j?}?H??vF-??.???????%f??/?g??b?e??k?h??%?&;??)?8??/??}?`?????E??0+?Z?w??{??8x??????a??/5?iP??S?kSY????h??????h?????njOPO?h?`}Cf???0	g4?D??U?i???oh?)m??M?7u??????]???!???%?'??????8B2>
FHfu?<??S[??3MF0?????????K^v???????z?
}????q???7??]??C*[3?z??????[t.?JMv(?>=?g????A?^????-;???mZ?z?????"/F?6++?M?M??h???p????P???+gLh7?a?;?????9??
z}/?n?Tr???B?2?{?RL?????	,?x4??Nx???)?/?I$%T?i??-??!?????t?|v;6u$pi\A?Lo??:?"?`?a}?uh??'??$U?_???`??=%??????????]?7???u??.]f?O????IT`h??y?^o
t?)f??7?DMlm??3Q?;??d??
`??d?????Q?6t~????eDP???~n
?,??Q-C??O??G??d???7a ???H??h??9t?fV.????,?
?M??[?/??`??~???#
??U`?v???j?U?
????Y??6O>???}?!?6???k???n"
?U)????7R???????F?????vA?,S	?|??????????{??n?/??E?M??i\?????/??_U?k???|???v??1?V??H????k??.?j???????R???dJ?????+?,?!?di9???LV?{?;????5<
;?}5?
{O???????d?p?c??61?z 
????????,.?M-&Ohm?8????;? m??
???grK2?'????\???)9~qI`?}???'6??SE??M5?j???kv??G?W/.*??????????L?????N??hI???ZY?O??D?^1n?c?Aq,w????????:????(?????1b????????z??zS|?M?O???v??????N??|>????? ?????????????\????G?Cir?????n?|???l??L?J
?UD	9?M	??j?v?:5??=? ?,??
??? ???P?????mW0?j???????J/&?ls]-x
??xJ??>t{`??P??:h?v>???O?O????+?c|??C?lF?8???????oZ5h?bT?:I6|????D?
?M?j??S7?NGs.7!?h?vW9]???R???
??^D????%I????dq?>????l?7???g??????+?L?h???????vx3?wlE????l??'?$????V0?HP???cVg\??????????
|6??_<?'??s??EOX-9?^??%k-???W??????????????3??`q?I\r8??6z`
?pA????.?????;???O??S?Q6?n?#c????A?xP.G???;uD??/??O?.@?????~F?????-???p4\%oR?v????P???m&?P??|D?v*??(?aT8Y\]$w44#?I-*???w[?f????d????]?ne????(? ?JW????G?*
????d>?h??9^??HX?xt=??Z+???5???=?Ae?3[W?vf)?Xz???z?`?W?igm???e?.??/y?z?~??Vm???U??>????????I??V??JRA????j ,X????eZ???}??a>?Y?????]'w?????J?
H??p?'?*?8L?n?4C????v?????K\E?t?f?H2???D??w??mFG,?@\????qM?:??T\?lo????fY??2/*qTn!w?p??u???&?l?XSy????~?A?t????lE?4p
??n?pK?U??8?m?B???6?;c???u??Tx???2wP?L?es/j??:h?Y?q?o??i|?l??Z????Cx??
??P??????+Xv??nI?????????v?o?|??n?{?,.O???d?3mDc????o$???k???=?z????|??=???y=??????????_???[n?<?rZRArA??eU?h,.?r
j?;???j??a!9/vVr?
???QA.??6???t???s??g??Y/j?x|(G_??:=????)?`
?????X?;n???x9P&???,?\k?????
J?E??D	$??M??<??W?Edc?y?-n????mm&`8???????? k?Z?x?s?5u?/??2???????1??'??*GM??%o???x>@F~|\?Ac??C&?_B????h?jqK?E?=_?=?~&????h?D?????R???????,?t?z??E???	d?]rR??A?W???Ro?-?d?R??P?TW??["?#?)(o?M?????|?'?hJ?U2E????z?9O??/??ml??O?0?&]??M?{5?MSh??6???du$???NJ|?e?tGSiB?g???*1Y????Pk???
)T??f?F?ww?de~?~u?KS???]o?.?;?????[???F?H?!t?4???KV?K??hi??????o??m*?WD?;
?{??d?????P=?l? ?BZ?.g????W
c?nt??!???%A?-UN?'???`?eQ$;??B????S#??|W??[?F?@g?c?;??E[.?
S
a??@
?? ??e????[?????9A?????????
Fy??k??N???c?`??<z??Llcv???????7/?d?t?/H??Sx
??T????
/TqX????GfO1+??u????'`?+A?O?$Q^k?
eo??@?s?????
?a?k???}do??
?;?0?{?4Qbx?|????ECh???
???F)?;'??????K$?bU??e?`?,<????}??????8??|????E????#????V;?+?????$?.???V?}?E?????mK9???G?{{?????^?W?????C?????m??7o????%?@F$m?{?y?!2?b?Y????e?????I???v?#s????z?Ra?J'??f?@????5?Ti|?=?I?N?my?g???????@H???? 8?C?4???S??,V????????H?L????i??h??*???9>??c???/????t????DD????oZ?X|W?????8?X?????_?E9?O????OW??^??^?k???0?JH?
GTy????j???v??k?????RlT?y1??$`?sL.??!????v?,????8??
[????H9D????
??????>?u?K7?D?z3m?o?
???[[???_L?A?r?>C?w?	
??????????I??]?u??????|?Y.?
h?GQ??AjO?X`?
?G?.??M?0?ib??????\??6??;1??5?c_"?
F????
??s?7j?}Th_?f????:z[?/E<S>b??????E?.?b%3??#????????v???zq?S???0????_????*?o?Z?????????%z????g????I????
A+1?$&L?????	??0&
???"??.x?q5?????????a?Ig????k?1?%
???l??d?_????
C]?M?u&???8???i?=v?:?A?%??f???u?;?V?a???;?^?o??D{???R}Qy6?????]0:???\????m???t??4?w???????UxK&7?P??$X?a??^?|	?????=:?h??m#?T??????(C?cM?iw???n9?=v??-Z??(??
???eT?
?k%	)7J?????X??ks?Gx?/n??"?FS??B?65
cO??	?D?akw??&??d?\???????j???j??jD?e?????@O)N??$Z???M|	8
\???????????
ef2Lu???????Y>??v<`<L?9i?Y??>~z??e@??Aam{H?B)Dv?t??]QfR?
???pT%????~???ynt?)?e??7?Y???????~?l??v????VE??
~C??????ny~??W?????????Sb????????Z0??>??????;y?????A`|l?
??[q????\Z?~??*??igmiX?T?	?f@????????*??+/G??@$?+?$????a?>?L???D?6??????Pcz`2??(????
???
?
???L>4???-Xh??o?a??????!?&????n=??]??????l??,3o?2E?m7???#??+?fV??WF	2	?u???????/???w?????#??????#???????????b?:????hon?q:?9	??X1??dk?X?5
??????P???????Jx?Z? |??	?????k?u????r????D??#z?Y??vvz~1?/<P+o???vR9???????????n??#??w?~?wJ.S??N+r|,Q??`?(???A?????jn??UbD???^d|??mp<?`?X??W?P?	i??4?<(}^
/?M???'?RG??^????\w;?t?????l?????1?????x??'?~?Q????E#?
3?
??m|t1????}zv??F?????f?A?gv????y?<?x1Az?:?q8@?????k?3?^?S??k?]^?yi?????A?9????"?6.??KZ>
?-???,v?|?ee???xL?)??s;?X
????x}?????????xy???A>???u???`?5V??jc;I????????!??!h}??????:,o?3????
????Mk???zR!?<>y
????\????)?n?vvP????JT?!?F??1d?F?g??3?V????-22_O:=?R~?_?%Z?hv|%?&#??4?J>B+&#??6S?g5?@(?(vC9Db???j3??!m
[?
E?)Z???y???|?m~IJ?????=?j?S??[?????.3?%??R(n4vS?????Z???a80>??2?9~
???,???	??Q???_m??;va????????v??f9?O9?B???h????S?????bb????mmo?'??%?Ij?p?V????%r??9["??Et?
???l`???_Q???'l??(??\???%??r??l??j.?w|??!8??\2??"?6???V??@?.??PV???U???
??????g???qyt???/???66?6??Fck???????????q
????:,?ns}w}#?^d????s?B?????:?t??i??>?<?	=????????I??G5+??}R??o?J??9?#?
=LO????d3?I?????.?C)d???/k????|{G>z???0?%?R?/[??x??E\?@8??Z????(ra^cF?Y???M*?lB???O??u?Yg??v???????mCt???;jK~2q??m??24??@Z??,oS?????Gh?g:??J?a]+???i#uWT?o?+?|u??4)??O??H???o???<?$??f??"??.???????[G|?DutO???G/?9:oU^????????j??UL???
a?nOo?V??*^fy?Cm?	??kP??s?sI ?8??=?d?;??&??,??O5T?????/aDf	???{?^??G???m??z??C??????r?(e;om???????!r???????????+?&?g
}?@N???k?r.????or
i??/?????v!<???s ?%?????>=????????n?0"\??U???R%b???QT?\?x7x??c<????????-?i??s| ?Z2???J?VS?{???????>>???H	oa?\?????xOE?H?
Y?U6i?q
.????p?=Q???.??w	??|?FA?Lk???1<o{t??>?Yl?
c?????0?%?4????ovj?Uq?JO?%?|aC?}????}??x?v???{????H?+??J?<Azb??N????s5u.??M??5g??????l_???nG5??????EQ???[??klg??O?A??<?KV?q???)????SS?4?????+&BK{??<??%???_???5???Z???????9Jg???l?x???V??6?%?|??z9m?(?
?'?t???
??-?zsg??{???????@k????3|@9 ?a?(M??P??:?g1?????T?Az?~">[????FX$dq?.:???E?|?J???rpuJ?W???W'8j?|uRB?1??4b??<??
???p????????~??%7;?lS??y??`? x?|!???
K|Uf?\!]
]????^9B???:?o?????????[?M!?W???S,?T???xx?.???
???
]??2?????-?"???C?A?N???????T?XrQ??????p?;?	????nX???k?(?{W???~uR??M???????>wM???????????#?S?/??/???(([[g?????p????????6???(?c	?4???Q?`??g^tL9
T?m?'?*_?-9z?466??p??fo??v?7DcS??Oa?k?>.?I??'1????1????=??;??	iN3??r???};n????]???gi?PZsk?hN:xd??~Njja
???<??=O?????????|??n	O?ro?C?'OO*3p@????Nn???????}???4?}?M{?x?8Q~?\'????_??b`n{??
?????Z[????Q5W`?8???7??C?^??KUDg??,??-y
?????``'?i???}+??
`c????E[???Y?D?-N?[[7.?t?3L?#?
n??N???????(~???)?o????2MaI?????????q?L<q7???|o????}!?94m,?bsO??XH-?W??'va9???V?x?~qz???????????G?+S<???a?@(??????
??y*k2??~????w????
????A??|????xs?g??-????iOn??Ke]7??e??;??ej??0?a?`?????????Pm%???@?ru???S?~o??FT???e?u?????????]?]
???g??0?1?r?^l???FM3?%s?=Z??a<??t???
???8?G??~E?O??9???l??r??????$???<%D???,??:M?|J??]^?P9????3?X???U?<v????Z???,$`????ypq???
w????v+???????c `vV????D?PNg????DYO?eu?*x??
P?	Gf????v???e[Rv?A?2?.?`U??c3HBT?7jX???)?c	a?w?X%?s?????`?x??Gz??R???%Rw?}???'1?qpzrq~???`H?????K??0d$?k	r?rc?^???2?`?????i??c?q???p??E(????C?9
Y?
}!-{??)k??`w?V??)??l?Agx=??M?45??????@q>KY?/?*?????MF?y?R<??O?D?2V^?-6??0??EN
|???
6??:??????s?~n?????*v
j????M??N?7??&????O?S????3??u????i?v?d?YM?V???r????r?E??~?H????`???z,??????`???c??^???Q?g?????r??&/??l?.o?WrS??????iwjr?}?????1?c?%???*?N7???1<i????5???????:??SsX?%??t5?R?_$?_<?}u?????|??E?~??U?)7??Wn?<#?=???S<
m????????7?/?/~@??????Q??????'g????^??'g???N[?
??????b?Y??^??L?4a<5???XN{l	9<&Y7???*?] ???]]d>??????b
?I?YK64<????????4YM???,?I-??0>?rHZ??????Uk??k??
?'?Q=?g85????f???~C ??an?.?h???Sa??P?&V??N??????.??F;
?l;-?o??X?'???
?v??n{f??	??:??Y'???1?.LX?)?!????7??
t,??8???????i_#?:??9???????Q?73?U{??T???g???hB?`?tT?nh??3?	c?d???_??P??"???u???e?xT{????7V"??KFFM???????4=?? S?{?f+v??m?}????2?F??????[??U?6*;X?<:??QHfG?G?G?sx ???#?+??????zK5"??????uoF??R????????%?y???V?-?????=Y?Q?2?????????Q????M?]L?f6??	???%????0?
??g?y`?Y?*??M
,??l0U??????c{?9N>???Q??<????.??j4?Q?X?N???wB ???d-?_R?T?&??d,>????-?\"??????%j????VW??<@Ps?
??9UN????NR??y??4?dQ]L>?????F??????"?g?I??|i<?'S?l@?_$???$MlN??7iw8??_??XItu?xw??d~??1$&w~D Ax?]?={??m??
}???&m?E?ZR?3[????6?^?D.?
M???t???????X?9?E=0
_????R??-????3??????d1????;?];Q3Q???H??
???|?&?(?Mt???wW???R???3N???e?D#?t?
?????:~q??????J?'?Y at 135??\b?y
????Zi????	??,??#???;??B?6?????`F??n????^?`????G?
?@??K~?\??u???Z?8?J-??9
????7??g?/S?_=???C????~t???5?f??????%u?D??e?????]?;O~\??^R1	???1S??z???[???dr?6w??????????[DVa??I????
?5???A??\?<;<>?/???_pR??T?ax5I???;?o?8????ya?{?=?[????	??]?:D??l?_??+X???_?[?Q0LO_????3KK??&?????b???Q??????/?t??????v-!P*?????=????>qW???6U?3<??t?5?8S?K????~|?}[?_q??Z?Y\?K?nb?_&???
?k?~?-?=R[???*??????~?a???/????t?d?????????c???q?.u??.?U%{??&?0???.??Q?``?E/???>?91?7????Qd=j?59?[lSF??????j?`/?????????s??	?%?${?]??s?%p0J??9u???};??i??)????5??T???????4??????G??d6?????7#?l5?^m??b6?U?V?B???+p??????u????Ij???3/???!S?1???=???	???????8?oE?O???????~h]???????}?????yl????y?wO??-?g????k??	R??? #w?%(????bK?0?sX?z8??M?o????s???A?`{??\?=??@'?+?+U???3?/??CL??p?G???;c4??tTPY??0?F&?>???????x??n????:???d6?Z?Ew?]????3????
?.??
h????zD??t???G|???
?Mr??i??[7???
k????,?B??u??????3???
?
?
????A????X????fX)????c?M??v?|.??u??w?}t???30???AT"=3?T"???v?q?8@?Y?\???????u??'???(9o??m4???to????>X<@?k92?%?^D?H????6?'w>G??????Z(?l??!Vj?3??.?.????\?? 7u??g
O?7?l?o??\?????Q?k????b?
@-?V?^p?a at 1??
qc??=???????\??mZ?????ono?z?????a?l??F??k????]???s?Sp?HK?nC??m0???r?-^{ ???_??I6?/??p??w?n7?R??)n8??o?MG?O??
,?Jv???*??T???s?5?h/;?????n??O?8l?1????%???"^/,}?G???f?X????5??-A???;}???6?;????eN%D*P???L???=?AA????|???N;?>r8??@sv?a??8????Elv???N???H.?~w'??n%I~L??d????-?Iy???.???w?/P??_?Wp??j?M}e?????Ob?[t???+?(????y?t???????????O?^?????_c?(????[?7?p?c?J??t??1??c?ez??3?}????J?/v????Q???/v??
'?=$+??C?Aj?qid??e
3c??????y,eZ?#x
hXN??G???(?????$>??&[?A???6s|??FaZ??????D?;?]2w}s???zXlgn??`g0??????j??1??+?iV??)??	Q???	:?~M:??&??_?R?7?V6?1?ztS?????+?J%Q;??Z$??9?
??E??~4&????3????f2E	`o?? ?G6o')???g???n????FM3Hjh???1bZ???J}????m?&??????x???	??^`??G??'??N7????D?	?H[??>^?x?/??6?????C?w}${????o?w??|is?[g?_w;?????{????{\?K??K?{??)?S?>???wp?{??????o???????G???o_[??v??{???y?\?Y????w??????gT???>j??t??????????$?^??2?l5?????!?A????}????}?A?]6?Wu?ar??E?_??>O?f?G???NqHu???>????7?!???$Y?????????????/ON????u????????????e??]]????vp;??{?Og????3)?x??????w}?W?????k
???;[U?ls?X[?s???n??(k4???&*??h???n??^??x?????????uge?$I???????ZhA????[??????l??????V??A:J????^??M?7?j??(?u?Zk??q??V????%E33?W???k??????
z??w???????~"?CzN????????@g??n?????T7?@???I????DW?BNnW;??W?#?hw??Q??Z????vE?n
?????y????}~??????gg?.???9ff?????????z???g???????1o?:?q?>??F_???^??V?e????Y???c?=?f???suY?\?o???r???z???????n?f??z'?/?????Se?x????{U?5??????ic???0|?Z??GqkK???????c+???v-;M?u(??YK?JR??????
????|;8??B?g?????j;?UT??^dO??0??8???-?k???P??
K?Jo??OJ
,BQ???}??Z???2???E'??Qm-_?"?t?"?x??u??xX+J?r??g?Rp?????,(?b?l??a4<B??[????<R?c????^?(?W?'
.^?v????V??
iFO?6e$_H?2?H?r?f#???????????,?M??Cgk'j??C[?,9Q?L???iJ?,?o??3?u?(X&???S?/?h???????YB?"???I?>?t?_??e????/????c?j??????E7 j?*?,?????????l?l???}?8?:?g?l?Z??????Qk????D?yS?x?8?;???f??6z????g]?"
???<?(U????*????:?o????t+?G1I??????I?/??f9?Im]??vK?????#Bp???????o??_E-+g?%K?}g?}G`??h?El5i????
??S??5???Df<?h?????(?E??"?????7!??(?U?~]???Z	????(???[K??^?/????,?????YV.L?g+~?X??????Ka%q?.
?bK?o?EHzC7??~EJ.T?@???j??u?c	OW?x????'?7???Q ?????Q?/???E????X<????????!?:??pc?????E>???<
?????m;?(j???o9??Y?f?VT?<M?u<-??s 4?Fq?H$?6?$???v?t??M?A????Vt
???	??5C)?`St?\
a1i?+??L????-???$?8Q????eeE?lYYY??????nnh?????K??Z?N???t??E?
????*?ja??x?B??,?????(X?M?????E?@?X?E??4?G\$?5S??Yg??u??r??0d??-4??z?????OY?gNM??????@?q?4?"U?g?>w?f?d???nea(g???T?O1?FT?.M??2@X???.???3?*y?;?????????Qe??????c=?fU???>T?j?????J??R?X??8?W??5?rP64u?^I?M?+???m5H?D??????1	???F?wg??l????L??:??\?^?????"??Jm?_YU?;?y??eew?5O??e?Od????O?Y?9Yo???B^??J????tv#/?Je??W??<??"6@?&?7=/
??0???e??5?o???m6?%?YE>???y????g{7? ???rl?????4????!h???h????????\???JmR????]_&a??idm-???,??E????*????g?Y????Q,?X??e???
LD{Bh2?????nJo?p<?d]8??=v^????L$??YbM_)???2??Z?1?L)?+?wRt^???K?Pn? ??f??,??q??w?H?;c?p??+?2?4'???r???fmI\.?n9p=
\>0L?????+z?qR?m?*??G?3M??J3H???,
??d??bnl??r?`A\??P(
???T&J?'?,k P??ywF? ?X?+uP??+?Hl????~??Ne??????^?4?9x????;???^?1??????j??Y?Ew??H*qI?d}JW??~GOSB?WiC?h|n????Q?GI????z??P??M?1?????-?Y?????Rn,???J?b?m????jD[?.u+?????????? ???
?L,&?]n??????0@???g??I????9
f??\?`>"M???~?(8???????!?{>h7????oc?f???6/??u????xp6??z???:4??!k?X"???C???j(?^?y{?B???l?!'g|????L]???<??/?J;??xk????_]m?\?RF?;x
?#4?j?`??W????g??'??M@??e?O????n??????ze*Z??2????$?m
MF?)R?k
w?>VHX?V>T????????u?U\vYT????^ b?????Kh>???B??j?E?j?5????m?????vj[?]4;&ryKS/a|?Uet???2?????
??^??^??????j~??U????????N?????aQ???J??i?o??	?tY+?? E????p?J.?A?????v????Nb???mu5??dIh|?=???:?>?Q?!?????|?}???
oY??????=}??)?????,!?????7I????i	????>6)?G???l(???Y???|h
G?o??b'|!??????Ut???1????W??f?:6q???n???bj??[????,????'oC?lH%og&?u?jH?????4.??3wy??????HD??'????????k7*??N????.???.??+?}uD??w?1
y????N?????3KMb???e:?s($k6N3f?0???!w?ye4
??7;??oO.?
gO?\?)?c?Wvx?*??W?????Ui?*?2jT?o]?D???
QVq??????????`fu??H?0j???_???d_???
	????^????!/{xkz9oN4:??=B?c?Z??G???
?W?z?lC?????ac`???yM2???Q/?????~sCwY?nn?+2?L?HI?(??*??g???.?uF9??????Q?`B?n	i~???R'EY???u???@\EE~?k?????T(??>?}?9?? ??Et??GM??Szz?u??6?I??[	??J????(??@???K??*?.? ?0??
???Q?&?-D??O?gg????A 9!????#??	?q?[U4??B.T=K? ???%uF:??Z9???<?R^???t????22?75-???\????Jiy??*???3m?K9??u?.?Q??_?V??mO???\?????x'??G?J?W??a??Q??
??j?@?::|?????W?"??*???5???E? ??Y? 1a???????F??4K?ack$??_Pd+????????FU
IEg{[e?UF???j/)`o[???yY?q?
????p???MtJ?fKf??2?a??2	F???v??-?}?X??
?)??b??!>8??'????@?&S8{?<A??d at S??o?	?=??<d?9????-/D??b??x?u??mr???:?X??t??~?E????F?"7<?????"h2?????cg?5?????NtG???nd??????"?I??CF???b
ivG??`azT^i5,?{ZHN?,??MF??+?J??e=??11??z2"?M??a??????r?<5??/????0boW?????
??^????4f?P??D?Xf??$F??E?!y?/?T??PB??O
)??KE!???xMD???
0???"??=?}"}>???j??
??3????k7??i???l?????f`??vN??S,e??>????2u???%?=M?&?Q???EZ]?^??a?&?t+?r,? B?????????N??????j??Q??~?[=?A???*I???'?????a?	?????|?%????i?!?z?i?,??.&D?jOt??.???Lq??lh?2???7?Z????????]QNN5?????1??+?.O???v???9???
??I??4d??.?,?!;?#??
???
W?0??)?&,??`??g???9????53|???fJ?????J??n??d~$????krA?0?E?x	???5@?2}H<???3???Ih?q
B?&?3Q?eQ?{/?G?	)6_X{?????7?.?????z")??g'?F??"?b+GM?*?$<<.??_~????)H]?z?
_u?'?W??$1&XTO`??.?;cqa[?x0pe?'?@l#??p???6??J`?X?????\V?>????3Y?~q??+?y?????r???4?w?A?s?w???f?o??n??????*f[?>?:??$??]?%?????~?????(????3?Q??????uWiR[n&O?|=&???D???pR6??~H???s	??PS???IG?9r?^#M??p??cz);??\^??B
y.=B??????O??r\y? ????;????g	a????L#pb73??hO????+???????t:??
???z?>?P?;??#??????* ?P?v??V????Zv??1ZJ#?,4?<????????0?3?0?fC??????jUt?m
F???W??????*o???8?D#???#?|!?d?0"?,??U/????vfKz'?cX?=?????????'O6???D??s\??5?%?H{??V|
????s^????W,O?~???t??5??y|I?K4!???W?^?????k7?o????#??q??v?h;???????)?`%??{.????.???
????#??
c???????M??e?????h]?H?Ed?A_?nFzh??`???mO?L?F???	m?<?(??AQ??W??R???K?Q?z2??`????5 ?	?|?{`?vf4??q#x[?????b?#c$?-??}b<????;??4?C?U?
c????????}?f???8???Ie5???-Jz???X?m?(????hi3????YHO?L??*???/:??????.?z&?XT?????SX??4V?p)??p?AZ*e,w?wV:`??A???N~??Z%q?R4??G?#?;???$??!kE??2?????h??????????|?Z????yx	y????8????U?y?D??|??
?q?A?????
k???
???Y?,??OaO??'?`M???g??I??2?`31a???B??l???8?(??#K?fX{??WZ????M??W$m?<??? BTmmX??
 ?F?z???a????6O?y#YO???{???????(???K??W?/??z~??0I??????????8T&[?+??????w
zk????????I9????[??|ax?;;?Z{1????Y?b??
?
?d?????b$0?;8
????????j??)??i?u????j?C???8?]??o?o?h?????P??07bwLI????	???J????B???v????a??G?[wX?O?L?.???i?4pN?J????N=v??S(n??YU??v]??????????~??a??3?~=???y??_?=?,???s????????????f???T?%?oB&_???@?Yq?QF?pA?T??7?6?F??@??????8??.o????(??????z?gd?"??Fd=x?P?"?<;??
???,4??D<RX???;^QO?????.????j?<8??sW???*~p[??z6???x?c?!???wn?vNe????n~?????3??
?C??l
vL0???*?Y?'?
?]w?
zh%eAi?r?S?{?Rc????PP?h/-?g?LK????????	t??y0?>?A?yXSH??#?TjB?b?q????S??0?!???]??4????$X"h????U }JUQ}?+L?(L|??L?
2?)?????)?L???h?OW?XZ?Z)z???=&??xw?#???	<d??.?,?h??????K?k???6^????Z??e??B)1~#??h?*???r?h??I
Y??}???5??g???rh??????S?????6??1?Yz???2`????i?o??0~??V?]????z?Vo6?[V????j??U?wt?	?2??>X?QK?sc,???????X??A???????d???,?}*?????O
-???%??56?o?????&?m??-??Mw6j6?o??6?o?????&?m[?X??????+???	W??N????Y
????Q[C?F?%????u7pS??@?)?f????#v?%???~9?$@??(:??-?y3#????[([l=??? ?
??\(?@S?P.Uwy??t???Ce?
A??*?w$~a)??A{n?7
?;Z????P
???????8??R"?r?????-??c?????r??+?=W\?F???^?;????N~?~?;??;???;:}Ec4??O?pp?
m
`??U????w

????2^?z????
???(??)?.?\?????0
?r????v?G[soB?n???6
91?I ?^?iZ?T1^??)?p??"?y??^???F?M<?????G|???w??J???c???=7|??v????/N;??t?
!?]?=n????Gm?

?DX@|??Ak<t?@M,o,????????@fS4-???q??o?y??z?????	/@g???oI?|R?p??
??#??!?:*?O3
#?	????*<?Rt?k??0Z4e?????Tu*?W?Y???H?]u?)????Z?d?+
D?#???	}G0?=?H?A??}?wr?f????????????[??????
4?I??(?
??ok?M?i1Z6???????
??,^???,e`%????f?H$)}FU^N|LC??B????$??bL??????T???v,???0?@B????f??W#
qK]?DX?t???4yR?a????}
??Fn?????[?iqB????p?B~?8q????M,?{O%?
??ag??T?r?Q
v??XV
 ??????*??s?_????q????l?????????qoJx?G???X???_?c"?
,XV????6D?')W??*?E?? g&?;?M?@!??????ig`?E[$a??:?Hb??????:4 ??{? l9?????q??l68????>??H?+6l?(m?Y??CS>?Q?p	??8?&W?f?Z"??Fc????M?h????Tq?O??g
??w???!U???l????????????hR??1??+????A?????_4?ph9?<Y?;?8<?=?GS?6.???Os????-??7??R?1?8x9Av+^N?????d?qe?'$
?-???????
=??G?T?{?>?x??L?@??}hI?=?
2l#?q?mS???46?_+?????
??????e0?e}??Q????P3??$Oa??/??3??J????+
????YD00?^X?J`A??r??>u?@?`? ?>?6
?d?V????? I???c?{?]???^?z??????z?g??!?????
a??????{s?@?4?? m???f??z{>????.j????m?p????7?w:u?O?\p??F??]M???r??5?0Zo???????{L?
?9?4n6?c0???!?=QM???g{[?????	=??????;??`)???i?O?nO>???H?]o??D2L??Lc ?O~???-	??s???T???????Y3??k*???e??????????d??????C?[*C??[?k:K?U???	z?h????G?iR?5????TT??p
????4??95
2?R????|5??????X????G?+o??c??D?*?>O?=A~?????'X.b"??
??Z???h];??I???#?vx'~z?a?j?????r? ???)?(?@?~????q?=??#7R?x?#{??v??^?? 3?0-B??rHJ??;k??h?G3:???Q?._0?`Z???]5??m???~?*<G?cW=????
%Ou????a???????&???
??`a?Xl\?????z?ZoT?_.????"??H?*k4??k??|%Jn#o??x &????T	QX?/"?????D<????f?$r?a&????K?!Y?C?P?????\?mX?????(?D
?
^E'\E?c at g?VA?=??c??G???ee
?P??z?=?&
=?h	 ??????n?u??j??m????8?:???i??qmWit??(??Z?)??N??&?9BVR???.???z????p?'l??7?i?v+???"3IG?#????|fZ?W
????x????|z(+???QD??($Q?p? ?c?L?Y??W?_??~6????aS<??
???P2G????A??<(?Q*?a?0R??<?????gS??V???2?x`??<a?(?D6???f????^1bM????8????S???NYHq??gI??{?9JFAN=???w????V5??dJ???j?GE???8y{?+?? ????r,"p*???Q????qd??????~)????2????@-???8P4??l???Lfkfe??%???????????F???#d?T? ?%Hg??P???&?S?@T4s??????b"#??zVU&?!????&*,?e]x?o(78	?*??S?\U?)?S??(YRF,ZR.??W??T:e2"R?	?Le]?4????????????)_XS(?p?X??"%JqR??<??A"??$????????O???*ESXBU?S^&?@???????e?=?_ at Z5???j$<l??v????"?K???x???+???XJ$9V%{r?!?V>mj??????b????g|)I???(?%YX??s!??R4?'?^??X<?IRVX???H`????~????R?D#m????B?a&l??HH?d~?D a?'E 2h??.+?9?q?]????^8H?z8!T???m???[??<?B?"?l?:????B[??v????L
]?1(?z<?8?pw?0???;g<??
<q??f?????@????8?????8??4e?U?3U7??+d?48I*"??h?M??Z{;O???%????
bd??NjG???f?s3
?????????+p
?s7J?C????>$?^??%?%??yz??xa^?E|??R0,U??H?T??Y(??PF@???H?3,?2'cR??<`:?D???5??sF????ag
?\6??N)C"????????+???~??Y??N5G52????YP??`?,??R??,??\0?& ?_????E?H????x_?O`??????
S?6
Dg??I???*3E+?M?-???g>??????

???p??L???
???O.???2??LA???
,o???,4?=?Qd ????y???
"??:?G?+<????:?0?L????8????q?"??M?d??????????
?fQ??{
??????qg?
\:???R?}?m?`?	???5T?pz??????wD~??;MN?i?=??>?7?[??FJ????~?????:ds)m[???????K*?|v?dq???e#?K?V????"9??????X ??]?V$?????bd	?????J?G=d???"?hI??_	]????Z:?????
??W5??????P!??%_?????~I???g?z0??g	Z?q6????0?&??(^7	?Y?W2???-????s?????q/K?!?)yG?pZ??X8g??2?s;????Y?i??(?
F?$OD?E?}?7?}\.}?l1?4?]xb3l
RN[????c??B??[???f???fY? &l??9J?b?_?.ia?O<?-?4.??GF????
?wY;?D?$?/?]d???4??_?H???#[???p!???d??~??e
?"?W??k3"??R???cP4?t3??[#;p{??!?mI??g?6"????v???\??<????R????????t?
?|??O_??`.???VF????G??B????FFN[?[6??rD?29/l???????"G#?????Y?zr??????i???
??jm^g?m/?zz?ig?????)?
 ??=&?r?,c?z??;?19(?
dg{??#????\_z?3Q+??h#wO???? ????9??"???H1!|????nDzW~???w;???????zzz???2????|?????{????|????????????p.?-?????N???y&zW??o??????H?/F?1???%K+e??x??2??KKE?*????k/?????E?X?????%?]??t-?0? ??c???VNW?[??????/??w?i???????n2?l??,dAO??&??Gj4????L???x?<c#???M}?V+_?Ic??[????#?4????4h?79l???Is'SM?f???>????
??N#??y&'+a???Le?g???-?pGI???
|N???????R?`?(?_??????b??f(????#?_?Hq???1????8?????KfM??fd?????
bd?4?????!C??Zs?L?5cG?&?\9>j????$'!????
?z.?V?f^i??j??u???VfI,m???,*J/+[??3??2$R??=3?jI?$N??
e??w?5K??s3?~?`Eh??gv>??n<-??I;??????]????,??h?Y????},?E??N[???T?_???\Ow??o6t{?????????d)l|??=?$D@?<????(??#Bq?hI?m6????$$??p??IELe?aQ|??C?v???f?y??Lq?????]g
a?2?m??)??;b?<??GDqI???????j?{?N????_'6ku{8???????*_a?????\??%p?????????mo????^~???_???Q?4W???_?qO?????3?lgX??-?T????????Dh???????&v?????7?U?Y?x;BSj?}?y?R??c?F?O$?}?y/.?,?4?C???_J????
??-?????2??3X?*<??K??\?????Z?9Q?_?g????r?#q??W?X??!?~*????B?
9p????'??.?:?2?????xg3?a??=&^????u?d,???>??t|g??MwX??? ?g????9/?}??`??'?'??@?????P?R?7?C(=s????q%	
??hf?Hw??6<-1??qc?i.?B^???^???{??-??m??#?????3?k#?????j???"???/Z?%?????-??J?x???}???ZXp?r?G?BA?=?????($ ????R?g???????o&#?7?%?W???.?????E??Y	O?L ????k??t??#??Yt?$n??5?????|???N?"F???Z?
??<?W??+???a?????+}}??>?????
?????av??boQ?&??9??5?V?G??v2???????l?????~r4?>v?vW=??\?*@???!??L???En?~?\???{auN??k?*oh?!??X?4?,??????(????1??Z?
???>4?o^?N?1???'??-K}???tsq??1{?????0?yC???x?
 u6???T???'7a??xG?????EE???46k$n
My? ??'???h??~E??(?%>?ym\??h??? ?!??8]??~??~e?l?Qy?(Sup<-???'?A*?{?+??+?????G???8??^??d?l?\T???vT??G?wz??
??+?!gq?9c??1?7?D??2u??d@???"W????cN4????|/?/?????t?(??
G?$l~???Tw??'????|??IO???4?h?|?????O]9}?ffr;'????	S?r_P??	?w$7???????I???T6L?S?.{?5~???*?o????N? d??????b??\<???d?????M?T???-X=??`Ar/L? Ao?0?@6{2o??;?e???p?????'Q?;????q?@????)????]?r,Y7x9?M?	????~???d??}N"???)c"[:?.i	??_??Y@?r
?a??,??5<?????a{;0?Z8%?:?I???
>I??1???x???h?b	???+??F?????/.;q_
Z??:~????o??#??8?f??c???AzS??a???G??g??1#?^??f??,???????e|%?FR?L~U?4???	?? 3?7???#???????c???W?6?5lX????c?txV???O\#-s
Z???&??i	A`??Xec????	???i<^????5???;N6???P>??`??f6?S??4D??????p;??I~/???IR
?`z_??f]s?3;?j??f??i6??
??@'? &?{G?p????c???%&:V?????-?K?-?a?>?k????:?o@?lj?=?aC?-?????>_?A??+k?N?E`2t??{n??G(CBmg?~I??xpa?
??,?I4z? S?x???>????Z $H?R?+???<m?4??J???EE,???????GA????qp?(x?e????????4E\?%qC???[????$z??j4??a??~$3K/v????I+W*?!?}
?M????F?c?A7a???J2??]w?????t??u??L??W?"y???l?_?0????;???H?7??j?yZt?%?$O;S|?????k?Qm-C??WO??J????>Xb?????:??j???]>4d?	????K?!@??#????h ????.?S?????q?6(???\?? \0?
?????R =t?&?5&
??Ad?????????F????U?4N?7??!??J
D?x??????}[??U?=??b??????0?/??????Q_?Ow?B%?k??*1?8d,'?3$???^???i)}??[?K+sIl?{`YxN*??:?O at e??BY???!??1?E)??
??[E??Z?D??,??|????e?Y?;??????+?T??j?d??Q\?*???D??D%?j?q?e????A???2??f??:?IK?e?!?Kx??U?q:?1f?yet$?????0	?/?????4?xl????e??f~?c?R|WT?o???%?ep^?y?^??C??????'Y|??????d?(9?????
M??=???[?c?iY
,??????H???ysjE?'IM?"?
J	???T3S?N ??=7????????6???m???t2(_?we}?2??!????;7rn???d7????*?y&F???u???-??????*??Q6j*????????KM?
?V1??'{K???2?K??'?'????l1q?7ns???????{?i1??yV]e???'?h45?g??uDQ?(?ko?
B_X.lv?ug0??|??Z?p?6?????Z??6?p#???o?ZE-(|????#!?7?O?7?????!??@;?X?????Ma?w??o#{???lVYx??~z?2n}} A?[-[?????6k??U??7???v??e??[???X?G??P?*?[??E??;??R????{a??1	t??h??V?i`???W?*??:F??????????m?vk[Vt;?:???JQX????????????Al?_
?t?\??_?9?7
W??????/J??_q?u?K??????u??T0K:??=>????)?sg?'?@???v<?
??E2???????????wOOJ?/???CT???????????|?p?

H??kd??W?X??????????????<D?w"?S??[?Y??9}S????LD0?uv???p?*????^??[?\??T??????1?????F????*?Cb???Fn
?eeW??q@~????e????P???f?Az?^??^?_??
???E??|??x'So??u??:???b???I9x-????y?w?.rP?Q?K*W?+??`??s???`2????o?
?'oMb7r????????
S'???3B????k@?K#??{-2?"?i??9*??0??Ua\????6???&"{x???#????X?+?|c?PHU?Yu????;{?Ho? ????Y?0?e?6e??(0??Ff??|^~?dk?T???6?a(x1gx\??q??g??
Z?F
R???Y?g??@8?uS??P??+?'?g??\??8f+?25??
C????Q1<????	ngx??uZ?NGN_??
ob\g`	?????w?T?????Gyr>9??@-?C???GAc?$???O|j?
?.?{??b????u???z??H?QS??|?]????????Yw?O?
?l?jJ?	??"l???????????&ZOX?~MN?6,7?CS????d*?????????????Y???/f`??<8??v??
??@}???????=?+j??,(B/?\?4???'?????p,?Bk?>fEq?
#??1????Vn+V??`???????`??b?0n?0}	???&?o$
cE?Z?_]?\]???za??????
??????_?|[???c???stfw/?a??v
1???????o??;?(?NN?w?y?|z|xq?9?.-?v-???'.???lc?<??	6?]????VE<?]
47p?.?d?
??D??#q??(??$Z?p?2z??1w?3p?X??(!?Lt??????F?'D????;?
?g??
?-!??P\$??/????V
??Z???Zm\??Hoxn?i?? ?u??<??RW??H????V?9??	i?
M??L?h
???r??N?????|G??????N?5l????????u???)S
F$??$????f4P???J.Z/?x??w??:E?d?Z????
1
D?H?e????T?????x????9???Y?V?]?U??8b???{? ???t?l????????,:a

?=AT??\?c??	Q?
/??"K???8sg??G1kD?"qw?[?!????(h??A??RE6!p?A*U????^??????T????@??|????w????n.B,(?????????y???2)G	_?
W?r?E7?o???#??????_M???????5gS?^m???1d?x
jf????????Z"?3?3??????b???Y4??'??]?3???XnYnI?t??R??*lr?5}v?=|?9IN???u??B?LP0?X,?????$a??????f&p?LR??/?D?<???CT?9???pv??8??`??{zv?H??#?yTi|??????(?;Av9?o$I4????-???+s????6!J?C4N}w???dw???b[,?d]?D?Ca?)?S?oB????{S?Go?
PeXA?B?	??}???????
?DV???'.4jh`_0?:?cC?k???$?@??)?????Zlg?j?e%?1????I$6??1W{???0*3g]??A9M??UU????iE?&l3B???&'S???)?sV???f??	?????????b?kx??1??*?X`???
??j???o?P)???j???B?i???;
re
v??]?@????~???????

?
?!]R?p?a??Q??2A+?q?Bk?bW@?E,?.iwH????????????7??f?CT?G??#D?/?Z?g|?j
k??xC?u?q?,?@(l
y??8L?>?e?JBQ??b???Fth?pCj??????**???h???0?(?%??]G??
?2????=a?
I?]??????i??cv???????????j?N//,?q?wr??u???;??????????pv??v??s??u|vt????????????
U]R<axx?,??7????]p?@?=YS?,?gcj3?J?
r????K?t?H???1???????
A??D?$?x?^?5?????
?\l??A?????D??wk??c??$?`Tq??zm??3?l?oN wu?????*b???/n?N/??????tC7???'?g>^?E???^?0?V??-?=??<t0?~!???":m"?????????dY??ED?????{????"?+????@?w???1f???2}?D?Uq'<^????mX??{*d?
?????` 2??e????i?Y???(N?B???j??.NJ????????Qp????????????J??????^??y?"M??x$Bm)?[@???KZ???? ??????.&FVv??C??U5??!?>??;y?S??,pQ\?o????N}?M?d)????????RY??\?????M&?6H?Y?L????~T]c??'@???z?q?,?,?c,?N,fH????-????8G
??lrP
???Eqz?????????]?0?o???2?:L9%KN?(????K?nK?b/E??V?K? ?x?)?K?F???W*???`}?X
?Y??/#??%??)???????z????'???de1d?\ I???k01??x???%?$??=??????
?~?;??Su??????`3#'??&???l	#?????zk	g?x@?? ?U??"Zf?????Ts?A???4@??he?xu??q??&?k?G(O<
?n?????c????:Z#]t?~?.?eE^o?????-t?Cy?q?8???f"?????j>i??=XS?9D?"Ie?;g:E?!?%??M:??5jCP*?F7?qA?)??*?
?y2?z???<B|?<???????)???!???uh???xE?^??????'4?$m
???x??h???;P???x6"?3-^@??#??B??.?6???6?????????_???Q&???Q?X??k????/}?TK???
Cu???5?#???,???5?g?T
???
X
N???????5XN?(?`?	??j?
??;???A]?F~?FL?6??+sU????r`!?J?k?pY??-?/??zw?X???o???/????b,SQ??^\CT?F?]Mj^}?.>???]?S?W????']jKt??k?7?vK?3?Dha:?H??[??`?h????f"|??g1g?????b?Z
?
:
?????l??M??+Q?????31???I?IU?r?Sg?*??
?!?Z??"??
?Cc?R?:	P??8?????)1?9m9???uh????y?6?????????8r_??	?}?l?x????#??L???Rm?w:}?+?G8x<??7H>??????o????r/gJ?Y?/?;???tdy;L?1?Z??}??????J?@u=@???r??????=G?wkV?jX??U??5??6>????'7T)??????e??W??o%F???vP+??!!???x???c?i
YgH3^rA/???P???h???PGA^??|r?su?d?????\Ti???/T?:?
???}?KyS????G???hvH?p?7??&cD??+??????,??AL'?#,TLc???xb??E?I&???$??)?*f{?j?P???l_????A>>p?#-?<
????????|???F`?G??!?g??Cd???G?d)9Y`	gS???C?<V???3y?_'D???h?N%t9Fz?$?????6$?>?z??(
?n6y?{?
??R( ??p?*???eQ??UA'????$:??,?P?,q?????p?V???xh??	???Q??M0[,C???G;?>^? ?q?????9? ]?s3??g$?I??n??	?Xs.????{,??? ???
E\;$a??????"?~?K??%dbH??
@?\XMV+??_?(???y???
?y??0k??Z?Y??????^???????z?m?k??vc??%?????c??o??{a?Cm?h?!nf?d?t?;t.?h?e????6s
x-???zk??gg?c[o??MY?????1?N?*???-?H?d??`????~?n?]???B????Y??*c?d???T?#R??c??N?}G&?????E?.Fi????l?b#??????K?-?????(?????lG????? D^??????<?!?8?Voh???z?V
?)?8?F????????#??
?????	?<B?&?F???i?4?N???j?5?h/?F$N?F??+A??5
???@?????_D???<7D7?+?
?VH[dk??=??K>?_:x???[?Z;????`??Y?(??VOR????c]?x?:#7???!?f??a????Y???Z?^???fmk?????F??BSh??hz????l?????fW???W???H ???? ???)?8??E>????5v??Y??Ar????6??V??u>?k?7w"YAv`??
?iK"
?$?Zr???ik{?
??\?bx?@?*???VTh?\??5?Q?????(???3??9???b????iO"???????z??EX at s't
??J??E?????A?C??>~??7??=?9?????"?.$
)?U???`?++?5????BJ????U3??h ??V??r?*/???}S??V?L?3#3??q?[oYO?,[??N????????71(??)????`G?}=:x???l?X,??L????58br)??<????1k? ?K:?H|?6???N?nt?M?????/???1??Az7D??x?j??s5s?1?J??33)??????R??wt???}?????^Z+B:@??????H??8?????nd????s{???p?
??!i?ze???0?
??N
	|-4|.????(????Z?e???t?!?+??5-nj??<???&?g??????>?|???AiM??R??E???%2a????????!?_????0??4?+J?O????u$.??????!N,yM#??r??2?'?S?t
	???,?xX???7?LF?3J??LUzR?E??v\?}?h???h?	??X?????????$??m}?zB?-?ts?
???!??x=
?RZ?n?Z??y???????w=??X1C??*?????_??J?i{QV?('4?????9???+?Lc????{??k??W?z???3v???1id?
??H?=Il,^?\??W?????ak??w)c>????7?q?o???????

q?`?"??*Jx at t???????
u(?L;&$?m?W????????
??eL??a}o?H??x????3.??Xo???]XJz???>????}?ynqq1~?$G??
{ts}=DY?#&??L?(?????$GZ???w==YU$??mCH??/Mxez=_????c?yq?~??uu5v?7?K?????;??`?j
:??"?2cBz;?? ?y|?Y?? ????(? ??[?0???????%??????)Nl!??	??e?REn??=?*7z
8?k?e?GYL?u?
????A???|??8**???;??
??I?c??s| n?5??(Ad??????m?"??????ji?^????m[e^??Y8Q?x??qt?J??IQ^?G???L<mD(?z
??9?I??<????IT?B???@G8???m?g?]?n+???"b49hr?K??j?+	y??????a
h
\?
??x?	t5??|'c????)G N?$|?'E?u?f????'?????s??????k?z??%nz??????????\w?)?*???yV???)
m??????'?U+??,??c?W???
??)8????????8g?NY??m??}g?????????c?f???qCe?#YB?????
?-s}??&P?+?%7???????O`??N#?\??r??p?
?_?????O?W???`6?????o?????iy????\[???????????R?
?)[??8%?	??L"-?-4???~???rd=Up?i?5(?/s9?ZB????}?gz^??Ui?!?D?,04???M??_?g??Y*f???p?????%?3?k_?Q?*o??/?]]?????xU??$?CK???V???????8?E?F?b??	XR??;s%d?jq^??6?????y????E?!{^?.???8v??5??R??@K???*'!?????m&?M??U????????o??????b0??
??? ?R????h?N{U?????h???m?
????9?n?7`?~[??????
	e??wd|???y)?zdv?!}???T?2??;??L3???? oN??+;hx????-?][i(??V	zmL?,w?3?u[??????aS????????r????????????K<??N??c?	???????Ao??MY??????????)t?ji,???????	?<???O???????#??I5?:.7C?=??8<??>?'???0AO4??+?????,=???ix?<?\?Nb?Z?z?????9S7?*SE3i???????`??JI???X??d+?&K?'+??p?a6?|?????_???kV????*
?z?9w)gCe/??{3??h?uaD?C$?v?`{h?[;??WLH????_????X?	?
?F?
?<3H???,?z7???Jv???y?h?P??Z^?nd?<??#?)@???>??s?e?
???vc^???????{]9???33$????H??*?	VF-9>????x[??*Z??1?H???
O??,?)??<???B~6EE???t???
#?????*
?sb+??7gwl?g?a>alu?s??XL?a?}L??J?
H?bF??E????w?$??\?i??3/???!?????|OO-
j??&?e1???E??????
????
??Il?|*??!v????qU:?;"????c?pK????X??????)?U=???[??4??=?Qv??????.?????.????? o???k~I?(R?J?lA91y????????Z9t??]S??`?,????0?
 ??]2;????K???9h?????=x?V?yr??Q??&??>?9f????&O??3??t??W?+:????W???g??g?~?,??4:???????3??,??Ig?xsW{Q2?3?a???Q<PoF\l???)?o?,??+T?????K?.;rt$
?^????EF??Bo?L???J??????L???%?????G7??Y)??>?\\?|??^????,??s???eb?G
O???????N???9??R????Qu?y??W???j5I?3lY<????-?a8C?ya???Q???????????????`eE?@l??#Nrm????M????|?N]???j???1??I??W????LdV?iX?7???7	.V`?????(c?????GG?E?R&:?9?S?r???????0??|a??a?6?? uf???_U>?5?r??A$f???9??d;6Nw7a=????<??r;
C;
E_?????S??O-V"QZ+???<???5qz????jbf??>????m|?g??k?????4??????U??7?^?????.???M?{???{?>??J?B
_?Q-?w~??W???>Q????LV?xw?????PH???{<??
?qB??????B_???c???
M??*???z????j?^P??,?7?{?????;.??UoN?,anu??
?hS???L?|?@?i?
l?fm?,???Sv5??~????x~9kM?c#=?M??x????G??T?-?|m???*
LuN??V?????x?=Y???k>j5??,???3?O?T?9_-?/KP?j??????+?/O?%?RKk????{??????M??F?1
???_??7NTFn????zS?g?/? X-?tI?e???"O?-Q??7P?$??[?'^?l???s???p???o?t?/???????+OB??????`?)I??q?2???1??
7iw????????e|pV$???%?X%i??3??????
?%???M?<&?+z????X2?????Kla?lA[:
?????zF7s?,?r??????';??????{Y???Er???\?????????v*???e:???)?????9?w?? E??
t?nO?2????>?U?[?=????E[Q???:04?{?c+p?&???$x?n0>?e???B_?<?(?????a?*pJ??&}???z?b??6mk?8U??????EDU%?????"Q
?d_T?;??PLNIH!i ???$o@?? V?V????????o??_R??????eC???
j/???y??p??????z?J??{????????#?K?
sepostgresql-8.2.5-1.patch:

--- NEW FILE sepostgresql-8.2.5-1.patch ---
diff -rpNU3 postgresql-8.2.5/configure.in sepostgresql-8.2.5/configure.in
--- postgresql-8.2.5/configure.in	2007-09-15 05:18:26.000000000 +0900
+++ sepostgresql-8.2.5/configure.in	2007-09-22 21:52:26.000000000 +0900
@@ -539,6 +539,19 @@ PGAC_ARG_BOOL(with, zlib, yes,
 AC_SUBST(with_zlib)
 
 #
+# NSA SELinux support
+#
+PGAC_ARG_BOOL(enable, selinux, no,
+              [  --enable-selinux        build with NSA SELinux support])
+if test "$enable_selinux" = yes; then
+    AC_CHECK_LIB(selinux, getpeercon,
+                 AC_DEFINE(SECURITY_SYSATTR_NAME, "security_context")  
+                 AC_DEFINE_UNQUOTED(HAVE_SELINUX, 1)
+                 AC_SUBST(enable_selinux),
+                 AC_MSG_ERROR("libselinux didn't found."))
+fi
+
+#
 # Elf
 #
 
Binary files postgresql-8.2.5/doc/man.tar.gz and sepostgresql-8.2.5/doc/man.tar.gz differ
Binary files postgresql-8.2.5/doc/postgres.tar.gz and sepostgresql-8.2.5/doc/postgres.tar.gz differ
diff -rpNU3 postgresql-8.2.5/src/Makefile.global.in sepostgresql-8.2.5/src/Makefile.global.in
--- postgresql-8.2.5/src/Makefile.global.in	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.5/src/Makefile.global.in	2007-08-28 09:33:36.000000000 +0900
@@ -159,6 +159,7 @@ enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
 enable_dtrace	= @enable_dtrace@
 enable_thread_safety	= @enable_thread_safety@
+enable_selinux	= @enable_selinux@
 
 python_includespec	= @python_includespec@
 python_libdir		= @python_libdir@
diff -rpNU3 postgresql-8.2.5/src/backend/Makefile sepostgresql-8.2.5/src/backend/Makefile
--- postgresql-8.2.5/src/backend/Makefile	2006-10-09 02:15:33.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/Makefile	2007-02-13 03:22:30.000000000 +0900
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.glo
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \
-	storage tcop utils $(top_builddir)/src/timezone
+	security storage tcop utils $(top_builddir)/src/timezone
 
 SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
 
@@ -31,6 +31,11 @@ LIBS := $(filter-out -lpgport, $(LIBS)) 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
+# SELinux support needs to link libselinux
+ifeq ($(enable_selinux), yes)
+LIBS += -lselinux
+endif
+
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
diff -rpNU3 postgresql-8.2.5/src/backend/access/common/heaptuple.c sepostgresql-8.2.5/src/backend/access/common/heaptuple.c
--- postgresql-8.2.5/src/backend/access/common/heaptuple.c	2006-11-23 14:27:18.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/access/common/heaptuple.c	2007-04-10 21:02:02.000000000 +0900
@@ -26,6 +26,7 @@
 #include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "executor/tuptable.h"
+#include "security/pgace.h"
 
 
 /* ----------------------------------------------------------------
@@ -314,6 +315,9 @@ heap_attisnull(HeapTuple tup, int attnum
 		case MinCommandIdAttributeNumber:
 		case MaxTransactionIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+#endif
 			/* these are never null */
 			break;
 
@@ -593,6 +597,11 @@ heap_getsysattr(HeapTuple tup, int attnu
 		case TableOidAttributeNumber:
 			result = ObjectIdGetDatum(tup->t_tableOid);
 			break;
+#ifdef SECURITY_SYSATTR_NAME
+		case SecurityAttributeNumber:
+			result = ObjectIdGetDatum(HeapTupleGetSecurity(tup));
+			break;
+#endif
 		default:
 			elog(ERROR, "invalid attnum: %d", attnum);
 			result = 0;			/* keep compiler quiet */
@@ -624,6 +633,7 @@ heap_copytuple(HeapTuple tuple)
 	newTuple->t_tableOid = tuple->t_tableOid;
 	newTuple->t_data = (HeapTupleHeader) ((char *) newTuple + HEAPTUPLESIZE);
 	memcpy((char *) newTuple->t_data, (char *) tuple->t_data, tuple->t_len);
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 	return newTuple;
 }
 
@@ -650,6 +660,7 @@ heap_copytuple_with_tuple(HeapTuple src,
 	dest->t_tableOid = src->t_tableOid;
 	dest->t_data = (HeapTupleHeader) palloc(src->t_len);
 	memcpy((char *) dest->t_data, (char *) src->t_data, src->t_len);
+	HeapTupleSetSecurity(dest, HeapTupleGetSecurity(src));
 }
 
 /*
@@ -928,6 +939,7 @@ heap_modify_tuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
@@ -1000,6 +1012,7 @@ heap_modifytuple(HeapTuple tuple,
 	newTuple->t_tableOid = tuple->t_tableOid;
 	if (tupleDesc->tdhasoid)
 		HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
+	HeapTupleSetSecurity(newTuple, HeapTupleGetSecurity(tuple));
 
 	return newTuple;
 }
diff -rpNU3 postgresql-8.2.5/src/backend/access/heap/heapam.c sepostgresql-8.2.5/src/backend/access/heap/heapam.c
--- postgresql-8.2.5/src/backend/access/heap/heapam.c	2007-02-05 05:00:49.000000000 +0900
+++ sepostgresql-8.2.5/src/backend/access/heap/heapam.c	2007-04-10 02:49:22.000000000 +0900
@@ -49,6 +49,7 @@
 #include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "security/pgace.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -1408,6 +1409,7 @@ heap_insert(Relation relation, HeapTuple
 	HeapTupleHeaderSetXmax(tup->t_data, 0);		/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(tup->t_data, 0);		/* for cleanliness */
 	tup->t_tableOid = RelationGetRelid(relation);
+	pgaceHeapInsert(relation, tup);
 
 	/*
 	 * If the new tuple is too big for storage or contains already toasted
@@ -1454,6 +1456,7 @@ heap_insert(Relation relation, HeapTuple
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
+		xlhdr.t_security = HeapTupleGetSecurity(heaptup);
 		xlhdr.t_natts = heaptup->t_data->t_natts;
 		xlhdr.t_infomask = heaptup->t_data->t_infomask;
 		xlhdr.t_hoff = heaptup->t_data->t_hoff;
@@ -1531,6 +1534,7 @@ heap_insert(Relation relation, HeapTuple
 Oid
 simple_heap_insert(Relation relation, HeapTuple tup)
 {
+	pgaceSimpleHeapInsert(relation, tup);
 	return heap_insert(relation, tup, GetCurrentCommandId(), true, true);
 }
 
@@ -1583,6 +1587,7 @@ heap_delete(Relation relation, ItemPoint
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
 	tp.t_self = *tid;
+	pgaceHeapDelete(relation, &tp);
 
 l1:
 	result = HeapTupleSatisfiesUpdate(tp.t_data, cid, buffer);
@@ -1805,6 +1810,7 @@ simple_heap_delete(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapDelete(relation, tid);
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -2046,6 +2052,7 @@ l2:
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
 	HeapTupleHeaderSetXmax(newtup->t_data, 0);	/* zero out Datum fields */
 	HeapTupleHeaderSetCmax(newtup->t_data, 0);	/* for cleanliness */
+	pgaceHeapUpdate(relation, newtup, &oldtup);
 
 	/*
 	 * If the toaster needs to be activated, OR if the new tuple will not fit
@@ -2261,6 +2268,7 @@ simple_heap_update(Relation relation, It
 	ItemPointerData update_ctid;
 	TransactionId update_xmax;
 
+	pgaceSimpleHeapUpdate(relation, otid, tup);
 	result = heap_update(relation, otid, tup,
 						 &update_ctid, &update_xmax,
 						 GetCurrentCommandId(), InvalidSnapshot,
@@ -3206,6 +3214,7 @@ log_heap_update(Relation reln, Buffer ol
 	xlhdr.hdr.t_natts = newtup->t_data->t_natts;
 	xlhdr.hdr.t_infomask = newtup->t_data->t_infomask;
 	xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
+	xlhdr.hdr.t_security = HeapTupleGetSecurity(newtup);
 	if (move)					/* remember xmax & xmin */
 	{
[...8180 lines suppressed...]
+#define COMMON_DATABASE__CREATE                   0x00000001UL
+#define COMMON_DATABASE__DROP                     0x00000002UL
+#define COMMON_DATABASE__GETATTR                  0x00000004UL
+#define COMMON_DATABASE__SETATTR                  0x00000008UL
+#define COMMON_DATABASE__RELABELFROM              0x00000010UL
+#define COMMON_DATABASE__RELABELTO                0x00000020UL
+
+#define DB_DATABASE__CREATE                       0x00000001UL
+#define DB_DATABASE__DROP                         0x00000002UL
+#define DB_DATABASE__GETATTR                      0x00000004UL
+#define DB_DATABASE__SETATTR                      0x00000008UL
+#define DB_DATABASE__RELABELFROM                  0x00000010UL
+#define DB_DATABASE__RELABELTO                    0x00000020UL
+#define DB_DATABASE__ACCESS                       0x00000040UL
+#define DB_DATABASE__INSTALL_MODULE               0x00000080UL
+#define DB_DATABASE__LOAD_MODULE                  0x00000100UL
+#define DB_DATABASE__GET_PARAM                    0x00000200UL
+#define DB_DATABASE__SET_PARAM                    0x00000400UL
+#define DB_TABLE__CREATE                          0x00000001UL
+#define DB_TABLE__DROP                            0x00000002UL
+#define DB_TABLE__GETATTR                         0x00000004UL
+#define DB_TABLE__SETATTR                         0x00000008UL
+#define DB_TABLE__RELABELFROM                     0x00000010UL
+#define DB_TABLE__RELABELTO                       0x00000020UL
+#define DB_TABLE__USE                             0x00000040UL
+#define DB_TABLE__SELECT                          0x00000080UL
+#define DB_TABLE__UPDATE                          0x00000100UL
+#define DB_TABLE__INSERT                          0x00000200UL
+#define DB_TABLE__DELETE                          0x00000400UL
+#define DB_TABLE__LOCK                            0x00000800UL
+#define DB_PROCEDURE__CREATE                      0x00000001UL
+#define DB_PROCEDURE__DROP                        0x00000002UL
+#define DB_PROCEDURE__GETATTR                     0x00000004UL
+#define DB_PROCEDURE__SETATTR                     0x00000008UL
+#define DB_PROCEDURE__RELABELFROM                 0x00000010UL
+#define DB_PROCEDURE__RELABELTO                   0x00000020UL
+#define DB_PROCEDURE__EXECUTE                     0x00000040UL
+#define DB_PROCEDURE__ENTRYPOINT                  0x00000080UL
+#define DB_COLUMN__CREATE                         0x00000001UL
+#define DB_COLUMN__DROP                           0x00000002UL
+#define DB_COLUMN__GETATTR                        0x00000004UL
+#define DB_COLUMN__SETATTR                        0x00000008UL
+#define DB_COLUMN__RELABELFROM                    0x00000010UL
+#define DB_COLUMN__RELABELTO                      0x00000020UL
+#define DB_COLUMN__USE                            0x00000040UL
+#define DB_COLUMN__SELECT                         0x00000080UL
+#define DB_COLUMN__UPDATE                         0x00000100UL
+#define DB_COLUMN__INSERT                         0x00000200UL
+#define DB_TUPLE__RELABELFROM                     0x00000001UL
+#define DB_TUPLE__RELABELTO                       0x00000002UL
+#define DB_TUPLE__USE                             0x00000004UL
+#define DB_TUPLE__SELECT                          0x00000008UL
+#define DB_TUPLE__UPDATE                          0x00000010UL
+#define DB_TUPLE__INSERT                          0x00000020UL
+#define DB_TUPLE__DELETE                          0x00000040UL
+#define DB_BLOB__CREATE                           0x00000001UL
+#define DB_BLOB__DROP                             0x00000002UL
+#define DB_BLOB__GETATTR                          0x00000004UL
+#define DB_BLOB__SETATTR                          0x00000008UL
+#define DB_BLOB__RELABELFROM                      0x00000010UL
+#define DB_BLOB__RELABELTO                        0x00000020UL
+#define DB_BLOB__READ                             0x00000040UL
+#define DB_BLOB__WRITE                            0x00000080UL
+#define DB_BLOB__IMPORT                           0x00000100UL
+#define DB_BLOB__EXPORT                           0x00000200UL
+
+/*
+ * SE-PostgreSQL core functions
+ *   src/backend/security/sepgsqlCore.c
+ */
+extern bool  sepgsqlIsEnabled(void);
+extern Size  sepgsqlShmemSize(void);
+extern void  sepgsqlInitialize(void);
+extern int   sepgsqlInitializePostmaster(void);
+extern void  sepgsqlFinalizePostmaster(void);
+
+extern Oid  sepgsqlGetServerContext(void);
+extern Oid  sepgsqlGetClientContext(void);
+extern void  sepgsqlSetClientContext(Oid new_ctx);
+extern Oid  sepgsqlGetDatabaseContext(void);
+extern char *sepgsqlGetDatabaseName(void);
+
+extern bool sepgsql_avc_permission_noaudit(Oid ssid, Oid tsid, uint16 tclass,
+										   uint32 perms, char **audit, char *objname);
+extern void  sepgsql_avc_permission(Oid ssid, Oid tsid, uint16 tclass,
+									uint32 perms, char *objname);
+extern char *sepgsqlGetTupleName(Oid relid, HeapTuple tuple);
+extern void  sepgsql_audit(bool result, char *message);
+extern Oid   sepgsql_avc_createcon(Oid ssid, Oid tsid, uint16 tclass);
+extern Oid   sepgsql_avc_relabelcon(Oid ssid, Oid tsid, uint16 tclass);
+extern bool  sepgsql_check_context(char *context);
+
+extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL proxy functions
+ *   src/backend/security/sepgsqlProxy.c
+ */
+extern List *sepgsqlProxyQuery(Query *query);
+extern void  sepgsqlVerifyQuery(Query *query);
+extern Oid   sepgsqlPreparePlanCheck(Relation rel);
+extern void  sepgsqlRestorePlanCheck(Relation rel, Oid pgace_saved);
+
+/*
+ * SE-PostgreSQL hooks
+ *   src/backend/security/sepgsqlHooks.c
+ */
+
+/* simple_heap_xxxx hooks */
+extern void sepgsqlSimpleHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlSimpleHeapUpdate(Relation rel, ItemPointer tid, HeapTuple newtup);
+extern void sepgsqlSimpleHeapDelete(Relation rel, ItemPointer tid);
+
+/* heap_xxxx hooks for implicit labeling */
+extern void sepgsqlHeapInsert(Relation rel, HeapTuple tuple);
+extern void sepgsqlHeapUpdate(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+
+/* INSERT/UPDATE/DELETE statement hooks */
+extern bool sepgsqlExecInsert(Relation rel, HeapTuple tuple, bool with_returning);
+extern bool sepgsqlExecUpdate(Relation rel, HeapTuple newtup, ItemPointer tid, bool with_returning);
+extern bool sepgsqlExecDelete(Relation rel, ItemPointer tid, bool with_returning);
+
+/* DATABASE */
+extern void sepgsqlAlterDatabaseContext(Relation rel, HeapTuple tuple, char *new_context);
+extern void sepgsqlSetDatabaseParam(const char *name, char *argstring);
+extern void sepgsqlGetDatabaseParam(const char *name);
+
+/* RELATION/ATTRIBUTE */
+extern void sepgsqlLockTable(Oid relid);
+
+/* FUNCTION */
+extern void sepgsqlCallFunction(FmgrInfo *finfo, bool with_perm_check);
+extern bool sepgsqlCallFunctionTrigger(FmgrInfo *finfo, TriggerData *tgdata);
+extern void sepgsqlAlterProcedureContext(Relation rel, HeapTuple tuple, char *context);
+
+/* COPY */
+extern void sepgsqlCopyTable(Relation rel, List *attnumlist, bool is_from);
+extern bool sepgsqlCopyToTuple(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCopyFromTuple(Relation rel, HeapTuple tuple);
+
+/* LOAD shared library module */
+extern void sepgsqlLoadSharedModule(const char *filename);
+
+/* copy/print node object */
+extern Node *sepgsqlCopyObject(Node *node);
+extern bool sepgsqlOutObject(StringInfo str, Node *node);
+
+/* SECURITY LABEL IN/OUT */
+extern char *sepgsqlSecurityLabelIn(char *context);
+extern char *sepgsqlSecurityLabelOut(char *context);
+extern bool sepgsqlSecurityLabelIsValid(char *context);
+extern char *sepgsqlSecurityLabelOfLabel(char *context);
+extern char *sepgsqlSecurityLabelNotFound(Oid sid);
+
+/*
+ * SE-PostgreSQL Binary Large Object (BLOB) functions
+ *   src/backend/security/sepgsqlLargeObject.c
+ */
+extern Oid  sepgsqlLargeObjectGetSecurity(HeapTuple tuple);
+extern void sepgsqlLargeObjectSetSecurity(HeapTuple tuple, Oid lo_security, bool is_first);
+extern void sepgsqlLargeObjectCreate(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectDrop(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectOpen(Relation rel, HeapTuple tuple, bool read_only);
+extern void sepgsqlLargeObjectRead(Relation rel, HeapTuple tuple);
+extern void sepgsqlLargeObjectWrite(Relation rel, HeapTuple newtup, HeapTuple oldtup);
+extern void sepgsqlLargeObjectImport(void);
+extern void sepgsqlLargeObjectExport(void);
+
+/*
+ * SE-PostgreSQL Heap related functions
+ *   src/backend/security/sepgsqlHeap.c
+ */
+
+extern Oid sepgsqlComputeImplicitContext(Relation rel, HeapTuple tuple);
+extern bool sepgsqlCheckTuplePerms(Relation rel, HeapTuple tuple, HeapTuple oldtup,
+								   uint32 perms, bool abort);
+extern Datum sepgsql_tuple_perms(PG_FUNCTION_ARGS);
+extern Datum sepgsql_tuple_perms_abort(PG_FUNCTION_ARGS);
+
+/*
+ * SE-PostgreSQL extended SQL statement
+ *   src/backend/security/sepgsqlExtStmt.c
+ */
+extern DefElem *sepgsqlGramSecurityLabel(char *defname, char *context);
+extern bool sepgsqlNodeIsSecurityLabel(DefElem *defel);
+extern Oid sepgsqlParseSecurityLabel(DefElem *defel);
+
+#endif /* SEPGSQL_INTERNAL_H */
diff -rpNU3 postgresql-8.2.5/src/include/utils/syscache.h sepostgresql-8.2.5/src/include/utils/syscache.h
--- postgresql-8.2.5/src/include/utils/syscache.h	2006-07-14 03:01:02.000000000 +0900
+++ sepostgresql-8.2.5/src/include/utils/syscache.h	2007-04-07 15:10:06.000000000 +0900
@@ -63,6 +63,8 @@
 #define STATRELATT		32
 #define TYPENAMENSP		33
 #define TYPEOID			34
+#define SECURITYOID		35
+#define SECURITYLABEL	36
 
 extern void InitCatalogCache(void);
 extern void InitCatalogCachePhase2(void);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2007 03:54:57 -0000	1.3
+++ .cvsignore	22 Sep 2007 13:09:45 -0000	1.4
@@ -1,2 +1,4 @@
 postgresql-8.2.4.tar.gz
+postgresql-8.2.5.tar.gz
 sepostgresql-8.2.4-0.434.patch
+sepostgresql-8.2.4-1.patch


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.init	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.init	22 Sep 2007 13:09:45 -0000	1.3
@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.2.4"
+PGVERSION="8.2.5"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.0"
+SEPGVERSION="1.23"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.spec	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.spec	22 Sep 2007 13:09:45 -0000	1.3
@@ -12,8 +12,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.2.4
-Release: 1.0%{?sepgextension}%{?dist}
+Version: 8.2.5
+Release: 1.23%{?sepgextension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,7 +24,7 @@
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.4-1.patch
+Patch0: sepostgresql-8.2.5-1.patch
 Patch1: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
 Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
@@ -208,6 +208,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Sat Sep 22 2007 <kaigai at kaigai.gr.jp> - 8.2.5-1.23
+- update base PostgreSQL to 8.2.5
+
 * Mon Sep 1 2007 <kaigai at kaigai.gr.jp> - 8.2.4-1.0
 - mark as SE-PostgreSQL 8.2.4-1.0
 


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql.te	9 Sep 2007 03:54:57 -0000	1.2
+++ sepostgresql.te	22 Sep 2007 13:09:45 -0000	1.3
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.0)
+policy_module(sepostgresql, 1.23)
 
 gen_require(`
 	all_userspace_class_perms



From fedora-extras-commits at redhat.com  Sat Sep 22 13:13:56 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sat, 22 Sep 2007 09:13:56 -0400
Subject: rpms/sugar/OLPC-2 sources,1.59,1.60 sugar.spec,1.70,1.71
Message-ID: <200709221313.l8MDDu3D015767@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15727

Modified Files:
	sources sugar.spec 
Log Message:
* Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	20 Sep 2007 19:50:20 -0000	1.59
+++ sources	22 Sep 2007 13:13:24 -0000	1.60
@@ -1 +1 @@
-e63e02780c262429900e947cbfc777a5  sugar-0.65-git5a595ea04e.tar.bz2
+8b23af473577511c6f1940e7c3918bf4  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sugar.spec	20 Sep 2007 19:50:20 -0000	1.70
+++ sugar.spec	22 Sep 2007 13:13:24 -0000	1.71
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070920git
+%define alphatag 20070922git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.55.%{alphatag}5a595ea04e
+Release: 0.56.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
+- New snapshot
+
 * Thu Sep 20 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.55.20070920git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Sat Sep 22 13:18:55 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Sat, 22 Sep 2007 09:18:55 -0400
Subject: rpms/gsoap/devel autotools_update-2.7.9k.patch, NONE, 1.1 gsoap.spec,
	NONE, 1.1 makefile_defines-2.7.9k.patch, NONE,
	1.1 tru64_hp_ux_c-2.7.9k.patch, NONE,
	1.1 tru64_hp_ux_cpp-2.7.9k.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709221318.l8MDIt7U015876@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	autotools_update-2.7.9k.patch gsoap.spec 
	makefile_defines-2.7.9k.patch tru64_hp_ux_c-2.7.9k.patch 
	tru64_hp_ux_cpp-2.7.9k.patch 
Log Message:
Initial import of gsoap


autotools_update-2.7.9k.patch:

--- NEW FILE autotools_update-2.7.9k.patch ---
diff --exclude=Makefile.defines -r -upN gsoap-2.7/aclocal.m4 gsoap-2.7mf/aclocal.m4
--- gsoap-2.7/aclocal.m4	2007-08-21 22:03:39.000000000 -0500
+++ gsoap-2.7mf/aclocal.m4	2007-09-11 11:17:48.000000000 -0500
@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,307 +11,6448 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# serial 48 AC_PROG_LIBTOOL
 
-# 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.
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
 
-# 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.
 
-# serial 8
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
[...63688 lines suppressed...]
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input="$1"
+shift
+case "$input" in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
+done
+
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) $prog "$input" ;;
+  *) $prog "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
+else
+  ret=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:


--- NEW FILE gsoap.spec ---
Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
Name: gsoap
Version: 2.7.9
Release: 0.1.k
License: GPLv2
Group: Development/Tools
URL: http://gsoap2.sourceforge.net
Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.9k.tar.gz
Patch0: http://grid.et.redhat.com/files/autotools_update-2.7.9k.patch
Patch1: http://grid.et.redhat.com/files/makefile_defines-2.7.9k.patch
Patch2: http://grid.et.redhat.com/files/tru64_hp_ux_cpp-2.7.9k.patch
Patch3: http://grid.et.redhat.com/files/tru64_hp_ux_c-2.7.9k.patch
#Patch4: http://grid.et.redhat.com/files/anonymous_server_and_client-2.7.9k.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: flex
BuildRequires: bison
BuildRequires: dos2unix
BuildRequires: findutils

Requires: pkgconfig


%description
The gSOAP Web services development toolkit offers an XML to C/C++
language binding to ease the development of SOAP/XML Web services in C
and C/C++.


%package devel
Summary: Devel libraries and headers for linking with gSOAP generated stubs
Group: Development/System
Requires: %name = %version-%release


%description devel
gSOAP libraries, headers and generators for linking with and creating
gSOAP generated stubs


#%package static
#Summary: Static libraries for linking with gSOAP generated stubs
#Group: Development/System
#Requires: %name = %version-%release


#%description static
#Static gSOAP libraries for linking with gSOAP generated stubs


%prep
%setup -q -n gsoap-2.7

# update the autotool generated scripts to something more current, and
# enable libtool support
%patch0 -p1

# update Makefile.defines to let samples use libtool
%patch1 -p1

# update stdsoap2.c/pp to better identify the need for hostent_data
# and h_errno
%patch2 -p1
%patch3 -p1

# a number of ~ files are distribute, but we do not want them
find . -name "*~" -exec rm {} \;

# pre-generated Makefiles abound, kill them
find . -name "Makefile" -exec rm {} \;

# pre-generated .deps are distribute, zap'em
find . -name ".deps" -prune -exec rm -rf {} \;

# autom4te.cache should not be distributed with source
rm -rf autom4te.cache

# stdsoap2_cpp.cpp is generated by soapcpp2/Makefile, and should not
# exist in the distributed source
rm soapcpp2/stdsoap2_cpp.cpp


%build
%configure --disable-namespaces --disable-static --prefix=/usr

# dependencies are not declared properly
#make %{?_smp_mflags}
make

# during the build a number of files that we should not distribute are
# created in soapcpp2/samples/ (a doc directory), we must remove them
#find soapcpp2/samples/ -name ".deps" -prune -exec rm -rf {} \;

# we do not want to bother distributing samples for Windows or OS X
#rm -rf soapcpp2/samples/magic_VC
#rm -rf soapcpp2/samples/quote_VC
#rm -rf soapcpp2/samples/quote_MAC_ProjBuild

# samples do not need to be executable by default
#chmod a-x soapcpp2/samples/ssl/root.sh
#chmod a-x soapcpp2/samples/ssl/cacerts.pem

# we want all txt files to have unix end-of-line encoding
dos2unix soapcpp2/README.txt
dos2unix soapcpp2/NOTES.txt
#dos2unix soapcpp2/samples/README.txt
#dos2unix soapcpp2/samples/gpl.txt


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%_libdir/*.la

%clean
rm -rf %{buildroot}


%check
make check


%files
%defattr(-,root,root,-)
%doc soapcpp2/README.txt soapcpp2/NOTES.txt
%_libdir/libgsoapck.so.0
%_libdir/libgsoapck++.so.0
%_libdir/libgsoapck.so.0.0.0
%_libdir/libgsoapck++.so.0.0.0
%_libdir/libgsoap.so.0
%_libdir/libgsoap++.so.0
%_libdir/libgsoap.so.0.0.0
%_libdir/libgsoap++.so.0.0.0
%_libdir/libgsoapssl.so.0
%_libdir/libgsoapssl++.so.0
%_libdir/libgsoapssl.so.0.0.0
%_libdir/libgsoapssl++.so.0.0.0


%files devel
%defattr(-,root,root,-)
%doc soapcpp2/README.txt soapcpp2/NOTES.txt
%_bindir/soapcpp2
%_bindir/wsdl2h
%_libdir/libgsoapck.so
%_libdir/libgsoapck++.so
%_libdir/libgsoap.so
%_libdir/libgsoapssl.so
%_libdir/libgsoapssl++.so
%_libdir/libgsoap++.so
%_includedir/stdsoap2.h
%_libdir/pkgconfig/gsoapck.pc
%_libdir/pkgconfig/gsoapck++.pc
%_libdir/pkgconfig/gsoap.pc
%_libdir/pkgconfig/gsoap++.pc
%_libdir/pkgconfig/gsoapssl.pc
%_libdir/pkgconfig/gsoapssl++.pc


#%files static
#%defattr(-,root,root,-)
#%doc soapcpp2/README.txt soapcpp2/NOTES.txt soapcpp2/samples/
#%_libdir/libgsoap.a
#%_libdir/libgsoap++.a
#%_libdir/libgsoapck.a
#%_libdir/libgsoapck++.a
#%_libdir/libgsoapssl.a
#%_libdir/libgsoapssl++.a


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%changelog
* Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k
- Initial release


makefile_defines-2.7.9k.patch:

--- NEW FILE makefile_defines-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/samples/Makefile.defines	2007-04-21 20:56:38.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/samples/Makefile.defines	2007-09-11 11:46:14.000000000 -0500
@@ -14,12 +14,12 @@ SOAP_FLAGS=-I$(top_srcdir)/soapcpp2/impo
 
 SOAP_C_CLIENT=soapClient.c soapC.c
 SOAP_C_SERVER=soapServer.c soapC.c
-SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.a
-SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.a
+SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.la
+SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.la
 
 SOAP_CPP_CLIENT=soapClient.cpp soapC.cpp
 SOAP_CPP_SERVER=soapServer.cpp soapC.cpp
-SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.a
-SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.a
+SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.la
+SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.la
 
 

tru64_hp_ux_c-2.7.9k.patch:

--- NEW FILE tru64_hp_ux_c-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/stdsoap2.c	2007-08-21 21:24:33.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/stdsoap2.c	2007-09-13 12:13:56.000000000 -0500
@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha
   /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */
   iadd = inet_addr((char*)addr);
 #else
-#if defined(_AIX43) || defined(TRU64)
+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   struct hostent_data ht_data;
 #endif
 #ifdef AS400
@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha
 #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__)))
   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
     host = NULL;
-#elif defined(_AIX43) || defined(TRU64)
+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   memset((void*)&ht_data, 0, sizeof(ht_data));
   if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
   { host = NULL;
@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha
 #endif
 
 /******************************************************************************/
+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R)
+extern int h_errno;
+#endif
+
 #ifndef WITH_NOIO
 #ifndef PALM_1
 static SOAP_SOCKET

tru64_hp_ux_cpp-2.7.9k.patch:

--- NEW FILE tru64_hp_ux_cpp-2.7.9k.patch ---
--- gsoap-2.7/soapcpp2/stdsoap2.cpp	2007-08-21 21:24:33.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/stdsoap2.cpp	2007-09-13 12:13:56.000000000 -0500
@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha
   /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */
   iadd = inet_addr((char*)addr);
 #else
-#if defined(_AIX43) || defined(TRU64)
+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   struct hostent_data ht_data;
 #endif
 #ifdef AS400
@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha
 #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__)))
   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
     host = NULL;
-#elif defined(_AIX43) || defined(TRU64)
+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
   memset((void*)&ht_data, 0, sizeof(ht_data));
   if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
   { host = NULL;
@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha
 #endif
 
 /******************************************************************************/
+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R)
+extern int h_errno;
+#endif
+
 #ifndef WITH_NOIO
 #ifndef PALM_1
 static SOAP_SOCKET


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:22:34 -0000	1.1
+++ .cvsignore	22 Sep 2007 13:18:22 -0000	1.2
@@ -0,0 +1 @@
+gsoap_2.7.9k.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:22:34 -0000	1.1
+++ sources	22 Sep 2007 13:18:22 -0000	1.2
@@ -0,0 +1 @@
+83a25e2349d0e2e3e4a73ce834e4c06d  gsoap_2.7.9k.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 13:25:55 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 09:25:55 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.1,1.2
Message-ID: <200709221325.l8MDPt36016096@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16075

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-makeinfo-ver.patch	22 Sep 2007 12:45:46 -0000	1.1
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 13:25:53 -0000	1.2
@@ -1,8 +1,33 @@
 2007-09-22  Jakub Jelinek  <jakub at redhat.com>
 
+	* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
+	* configure: Regenerated.
+gcc/
 	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
 	* configure: Regenerated.
 
+--- configure.in.jj	2007-02-20 16:41:55.000000000 -0500
++++ configure.in	2007-09-22 09:23:30.000000000 -0400
+@@ -2159,7 +2159,7 @@ changequote(,)
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+--- configure.jj	2007-02-20 16:41:55.000000000 -0500
++++ configure	2007-09-22 09:24:08.000000000 -0400
+@@ -3574,7 +3574,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
 --- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
 +++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
 @@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir



From fedora-extras-commits at redhat.com  Sat Sep 22 13:39:42 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 09:39:42 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.2,1.3
Message-ID: <200709221339.l8MDdgnm016626@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16605

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-makeinfo-ver.patch	22 Sep 2007 13:25:53 -0000	1.2
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 13:39:39 -0000	1.3
@@ -1,30 +1,32 @@
 2007-09-22  Jakub Jelinek  <jakub at redhat.com>
 
-	* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
-	* configure: Regenerated.
-gcc/
 	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
 	* configure: Regenerated.
 
+2007-09-15  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure.in: Correct makeinfo version check.
+	* configure: Regenerate.
+
 --- configure.in.jj	2007-02-20 16:41:55.000000000 -0500
-+++ configure.in	2007-09-22 09:23:30.000000000 -0400
++++ configure.in	2007-09-22 09:36:04.000000000 -0400
 @@ -2159,7 +2159,7 @@ changequote(,)
      # For an installed makeinfo, we require it to be from texinfo 4.2 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
        :
      else
        MAKEINFO="$MISSING makeinfo"
 --- configure.jj	2007-02-20 16:41:55.000000000 -0500
-+++ configure	2007-09-22 09:24:08.000000000 -0400
++++ configure	2007-09-22 09:36:25.000000000 -0400
 @@ -3574,7 +3574,7 @@ case " $build_configdirs " in
      # For an installed makeinfo, we require it to be from texinfo 4.2 or
      # higher, else we use the "missing" dummy.
      if ${MAKEINFO} --version \
 -       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
        :
      else
        MAKEINFO="$MISSING makeinfo"



From fedora-extras-commits at redhat.com  Sat Sep 22 14:04:03 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 22 Sep 2007 10:04:03 -0400
Subject: rpms/gcc/devel gcc41-makeinfo-ver.patch,1.3,1.4
Message-ID: <200709221404.l8ME43Qv023481@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23458

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-makeinfo-ver.patch	22 Sep 2007 13:39:39 -0000	1.3
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 14:04:01 -0000	1.4
@@ -37,7 +37,7 @@
  gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
 -  [4.[2-9]*])
-+  [4.[2-9]*|4.[1-9][0-9]*])
++  [4.[2-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
  if test $gcc_cv_prog_makeinfo_modern = no; then
    MAKEINFO="$MISSING makeinfo"
    AC_MSG_WARN([
@@ -48,7 +48,7 @@
    case $ac_prog_version in
      '')     gcc_cv_prog_makeinfo_modern=no;;
 -    4.[2-9]*)
-+    4.[2-9]*|4.[1-9][0-9]*)
++    4.[2-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*)
              gcc_cv_prog_makeinfo_modern=yes;;
      *)      gcc_cv_prog_makeinfo_modern=no;;
    esac



From fedora-extras-commits at redhat.com  Sat Sep 22 14:57:45 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 10:57:45 -0400
Subject: rpms/python-nltk_lite/F-7 .cvsignore, 1.2, 1.3 python-nltk_lite.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221457.l8MEvjxX025269@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk_lite/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25184/F-7

Modified Files:
	.cvsignore python-nltk_lite.spec sources 
Log Message:
python-nltk_lite 0.9-0.1.b2 -- transition package that does not obsoletes
python-nltk anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
+++ .cvsignore	22 Sep 2007 14:57:13 -0000	1.3
@@ -1 +1 @@
-nltk_lite-0.6.6.tar.gz
+nltk-0.9b2.tar.gz


Index: python-nltk_lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/python-nltk_lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk_lite.spec	19 Dec 2006 05:07:16 -0000	1.2
+++ python-nltk_lite.spec	22 Sep 2007 14:57:13 -0000	1.3
@@ -1,21 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define prerel b2
 Name:           python-nltk_lite
-Version:        0.6.6
-Release:        2%{?dist}
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://nltk.sf.net/
-Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Obsoletes:      python-nltk <= 1.4.4-2%{?dist}
-
-BuildRequires:  python-devel
-Requires:       python-numarray, tkinter
+BuildRequires:  python-devel, tkinter
+Requires:       numpy, python-matplotlib, tkinter
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -27,19 +26,24 @@
 
 
 %prep
-%setup -q -n nltk_lite-%{version}
+%setup -q -n nltk-%{version}%{?prerel}
 
 
 %build
 %{__python} setup.py build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 # Make scripts executable
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
 
 
 %clean
@@ -48,25 +52,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.TXT README.txt
-%dir %{python_sitelib}/nltk_lite
-%dir %{python_sitelib}/nltk_lite/chat
-%dir %{python_sitelib}/nltk_lite/cluster
-%dir %{python_sitelib}/nltk_lite/contrib
-%dir %{python_sitelib}/nltk_lite/corpora
-%dir %{python_sitelib}/nltk_lite/draw
-%dir %{python_sitelib}/nltk_lite/misc
-%dir %{python_sitelib}/nltk_lite/model
-%dir %{python_sitelib}/nltk_lite/parse
-%dir %{python_sitelib}/nltk_lite/stem
-%dir %{python_sitelib}/nltk_lite/tag
-%dir %{python_sitelib}/nltk_lite/test
-%dir %{python_sitelib}/nltk_lite/tokenize
-%{python_sitelib}/nltk_lite/*.py*
-%{python_sitelib}/nltk_lite/*/*.py*
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
 
 
 %changelog
+* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Remove obsoletes:nltk, package will be renamed back to nltk in next release
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
 - Rebuild for development branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 02:57:46 -0000	1.2
+++ sources	22 Sep 2007 14:57:13 -0000	1.3
@@ -1 +1 @@
-24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 14:57:48 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 22 Sep 2007 10:57:48 -0400
Subject: rpms/python-nltk_lite/devel .cvsignore, 1.2,
	1.3 python-nltk_lite.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200709221457.l8MEvml6025276@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25184/devel

Modified Files:
	.cvsignore python-nltk_lite.spec sources 
Log Message:
python-nltk_lite 0.9-0.1.b2 -- transition package that does not obsoletes
python-nltk anymore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
+++ .cvsignore	22 Sep 2007 14:57:16 -0000	1.3
@@ -1 +1 @@
-nltk_lite-0.6.6.tar.gz
+nltk-0.9b2.tar.gz


Index: python-nltk_lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/python-nltk_lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk_lite.spec	19 Dec 2006 05:07:16 -0000	1.2
+++ python-nltk_lite.spec	22 Sep 2007 14:57:16 -0000	1.3
@@ -1,21 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define prerel b2
 Name:           python-nltk_lite
-Version:        0.6.6
-Release:        2%{?dist}
+Version:        0.9
+Release:        0.1.%{prerel}%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://nltk.sf.net/
-Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Obsoletes:      python-nltk <= 1.4.4-2%{?dist}
-
-BuildRequires:  python-devel
-Requires:       python-numarray, tkinter
+BuildRequires:  python-devel, tkinter
+Requires:       numpy, python-matplotlib, tkinter
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -27,19 +26,24 @@
 
 
 %prep
-%setup -q -n nltk_lite-%{version}
+%setup -q -n nltk-%{version}%{?prerel}
 
 
 %build
 %{__python} setup.py build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 # Make scripts executable
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py
+pushd $RPM_BUILD_ROOT%{python_sitelib}
+pushd nltk
+chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
+chmod +x test/doctest_driver.py
+popd
+chmod +x nltk_contrib/toolbox/{settings,language,data}.py
+popd
 
 
 %clean
@@ -48,25 +52,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.TXT README.txt
-%dir %{python_sitelib}/nltk_lite
-%dir %{python_sitelib}/nltk_lite/chat
-%dir %{python_sitelib}/nltk_lite/cluster
-%dir %{python_sitelib}/nltk_lite/contrib
-%dir %{python_sitelib}/nltk_lite/corpora
-%dir %{python_sitelib}/nltk_lite/draw
-%dir %{python_sitelib}/nltk_lite/misc
-%dir %{python_sitelib}/nltk_lite/model
-%dir %{python_sitelib}/nltk_lite/parse
-%dir %{python_sitelib}/nltk_lite/stem
-%dir %{python_sitelib}/nltk_lite/tag
-%dir %{python_sitelib}/nltk_lite/test
-%dir %{python_sitelib}/nltk_lite/tokenize
-%{python_sitelib}/nltk_lite/*.py*
-%{python_sitelib}/nltk_lite/*/*.py*
+%doc LICENSE.txt README.txt
+%{python_sitelib}/nltk
+%{python_sitelib}/nltk_contrib
+%{python_sitelib}/yaml
 
 
 %changelog
+* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.9-0.1.b2
+- Updated to 0.9b2
+- Remove obsoletes:nltk, package will be renamed back to nltk in next release
+
 * Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> - 0.6.6-2
 - Rebuild for development branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk_lite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 02:57:46 -0000	1.2
+++ sources	22 Sep 2007 14:57:16 -0000	1.3
@@ -1 +1 @@
-24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz
+3d5f51c8116a8a89cebdcd1279088911  nltk-0.9b2.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 22 15:19:32 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Sat, 22 Sep 2007 11:19:32 -0400
Subject: rpms/filezilla/devel filezilla.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200709221519.l8MFJW9A032766@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32590

Modified Files:
	filezilla.spec sources .cvsignore 
Log Message:
Update to 3.0.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filezilla.spec	10 Sep 2007 20:30:10 -0000	1.1
+++ filezilla.spec	22 Sep 2007 15:19:00 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -15,7 +15,6 @@
 ## Needed if test program is build
 BuildRequires:  cppunit-devel >= 1.10.2
 ##
-BuildRequires:  gawk
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel >= 1.5.4
@@ -103,6 +102,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 kwizart < kwizart at gmail.com > - 3.0.1-1
+- Update to 3.0.1
+
 * Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
 - Update to 3.0.0 (final)
 - Add vendor field for .desktop


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2007 20:30:10 -0000	1.2
+++ sources	22 Sep 2007 15:19:00 -0000	1.3
@@ -1 +1 @@
-9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2
+c66cabe1339d358a0c135fb3ce3e7589  FileZilla_3.0.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2007 20:30:10 -0000	1.2
+++ .cvsignore	22 Sep 2007 15:19:00 -0000	1.3
@@ -1 +1 @@
-FileZilla_3.0.0_src.tar.bz2
+FileZilla_3.0.1_src.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 15:56:14 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sat, 22 Sep 2007 11:56:14 -0400
Subject: rpms/gdb/devel gdb-6.3-bz193763-object-name-completion.patch, 1.2, 
	1.3 gdb-6.3-ctorline-20050120.patch, 1.2,
	1.3 gdb-6.3-linespec-20041213.patch, 1.2,
	1.3 gdb-6.3-test-dtorfix-20050121.patch, 1.1,
	1.2 gdb-6.6-bz233852-attach-signalled.patch, 1.2,
	1.3 gdb-6.6-upstream.patch, 1.7, 1.8 gdb.spec, 1.244, 1.245
Message-ID: <200709221556.l8MFuEHc003576@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3528

Modified Files:
	gdb-6.3-bz193763-object-name-completion.patch 
	gdb-6.3-ctorline-20050120.patch 
	gdb-6.3-linespec-20041213.patch 
	gdb-6.3-test-dtorfix-20050121.patch 
	gdb-6.6-bz233852-attach-signalled.patch gdb-6.6-upstream.patch 
	gdb.spec 
Log Message:
* Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
- Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
- Fix the build compatibility with texinfo >= 4.10.
- Fix the testcase for pending signals (from BZ 233852).


gdb-6.3-bz193763-object-name-completion.patch:

Index: gdb-6.3-bz193763-object-name-completion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-bz193763-object-name-completion.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-bz193763-object-name-completion.patch	24 Aug 2006 06:18:03 -0000	1.2
+++ gdb-6.3-bz193763-object-name-completion.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -1,6 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763
 
+[base]
 
+2007-09-21  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	Updated for the longer `$allocate' marker.
+ 
 Index: gdb-6.5/gdb/linespec.c
 ===================================================================
 --- gdb-6.5.orig/gdb/linespec.c	2006-08-24 02:57:04.000000000 -0300
@@ -10,7 +15,7 @@
       the function signature.  */
    completion_name = xmalloc (strlen (class_name) +
 -			     strlen (member_name) + 9);
-+			     strlen (member_name) + strlen("'::$base(") + 1);
++			     strlen (member_name) + strlen("'::$allocate(") + 1);
    completion_name[0] = '\'';
    strcpy (completion_name+1, class_name);
    /* FIXME: make this the language class separator.  */

gdb-6.3-ctorline-20050120.patch:

Index: gdb-6.3-ctorline-20050120.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ctorline-20050120.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-ctorline-20050120.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-ctorline-20050120.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -21,6 +21,14 @@
 	* tui/tui-win.c (make_visible_with_new_height): Ditto.
 	* tui/tui-winsource.c (tui_update_source_windows_with_addr): Ditto.
 
+2007-09-22  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* symtab.c (find_line_pc): Support also the `$allocate' and `$delete'
+	variants.  Support searching for the `$base' name even if the bare name
+	was found first.
+	* breakpoint.c (breakpoint_sals_to_pc): Support more than two returned
+	PC values.
+
 Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
 ===================================================================
 --- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 01:30:43.000000000 -0300
@@ -259,55 +267,78 @@
    if (symtab == 0)
      return 0;
  
-@@ -2336,7 +2357,50 @@ find_line_pc (struct symtab *symtab, int
+@@ -2336,7 +2357,73 @@ find_line_pc (struct symtab *symtab, int
    if (symtab != NULL)
      {
        l = LINETABLE (symtab);
 -      *pc = l->item[ind].pc;
 +      main_pc = l->item[ind].pc;
++      *pc_array = xmalloc (sizeof (CORE_ADDR) * 3);
++      *num_elements = 0;
++      (*pc_array)[(*num_elements)++] = main_pc;
 +      minsym = lookup_minimal_symbol_by_pc (main_pc);
 +      if (minsym != NULL && minsym->ginfo.language == language_cplus)
-+        {
-+	  char *base_name = 
-+            minsym->ginfo.language_specific.cplus_specific.demangled_name;
-+          char *tmp_ptr = strstr (base_name, "$base(");
-+          if (tmp_ptr != NULL)
-+            {
-+              char *regular_name = (char *)xmalloc (strlen (base_name));
-+              memcpy (regular_name, base_name, tmp_ptr - base_name);
-+              strcpy (regular_name + (tmp_ptr - base_name), 
-+                      tmp_ptr + sizeof ("$base") - 1);
-+              minsym2 = lookup_minimal_symbol (regular_name, NULL, NULL);
-+              xfree (regular_name);
-+              if (minsym2 != NULL)
-+                {
-+		  /* We have recognized we have a ctor or dtor and have
-+		     located our line in the not-in-charge version.  We
-+		     also have located the in-charge version's minsym.
-+		     From this, we can find the index for the first line
-+		     line in the in-charge ctor/dtor and then search forward
-+		     for the specified line, thereby finding the 2nd match.  */
-+		  int exact;
-+		  int ind = find_line_by_pc (l, minsym2->ginfo.value.address,
-+				             &exact);
-+		  if (ind >= 0)
++	{
++	  char *src = minsym->ginfo.language_specific.cplus_specific.demangled_name;
++	  char *src_point = strchr (src, '(');
++	  char *s, *point;
++	  /* Keep "" last as the trimming part always matches it.  */
++	  const char *variants[] = {"$base","$allocate","$delete",""};
++	  int i;
++
++	  if (src_point != NULL)
++	    {
++	      char *dst = xmalloc (strlen (src) + strlen ("$allocate") + 1);
++	      char *dst_point = dst + (src_point - src);
++
++	      memcpy (dst, src, src_point - src);
++
++	      /* Trim out any variant markers there first.  */
++	      for (i = 0; i < ARRAY_SIZE (variants); i++)
++		{
++		  size_t len = strlen (variants[i]);
++
++		  if (dst_point - dst >= len
++		      && memcmp (dst_point - len, variants[i], len) == 0)
++		    {
++		      dst_point -= len;
++		      /* In fact it should not be needed here.  */
++		      break;
++		    }
++		}
++
++	      /* And now try to append all of them.  */
++	      for (i = 0; i < ARRAY_SIZE (variants); i++)
++		{
++		  size_t len = strlen (variants[i]);
++		  struct minimal_symbol *minsym2;
++
++		  memcpy (dst_point, variants[i], len);
++		  strcpy (dst_point + len, src_point);
++	      
++		  minsym2 = lookup_minimal_symbol (dst, NULL, NULL);
++		  if (minsym2 != NULL)
 +		    {
-+		      ind = find_line_common (l, line, ind, &exact);
++		      /* We have recognized we have a ctor or dtor and have
++			 located our line in the not-in-charge version.  We
++			 also have located the in-charge version's minsym.
++			 From this, we can find the index for the first line
++			 line in the in-charge ctor/dtor and then search forward
++			 for the specified line, thereby finding the 2nd match.  */
++		      int exact;
++		      int ind = find_line_by_pc (l, minsym2->ginfo.value.address,
++						 &exact);
 +		      if (ind >= 0)
-+		        {
-+                          *pc_array = xmalloc (2 * sizeof (CORE_ADDR));
-+                          (*pc_array)[0] = main_pc;
-+                          (*pc_array)[1] = l->item[ind].pc;
-+                          *num_elements = 2;
-+                          return 1;
++			{
++			  ind = find_line_common (l, line, ind, &exact);
++			  if (ind >= 0 && l->item[ind].pc != main_pc)
++			    (*pc_array)[(*num_elements)++] = l->item[ind].pc;
 +			}
 +		    }
-+                }
-+            }
-+        }
-+      *pc_array = xmalloc (sizeof (CORE_ADDR));
-+      (*pc_array)[0] = main_pc;
-+      *num_elements = 1;
++		}
++	      xfree (dst);
++	    }
++	}
        return 1;
      }
    else
@@ -441,7 +472,7 @@
 ===================================================================
 --- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 01:30:53.000000000 -0300
 +++ gdb-6.5/gdb/breakpoint.c	2006-07-11 01:39:20.000000000 -0300
-@@ -5268,10 +5268,40 @@ static void
+@@ -5268,10 +5268,44 @@ static void
  breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
  		       char *address)
  {    
@@ -469,8 +500,12 @@
 +                     * sizeof (struct symtab_and_line));
 +          memcpy (new_sals, sals->sals, (i + 1) 
 +                  * sizeof (struct symtab_and_line));
-+          memcpy (&(new_sals[i + 1]), &sals->sals[i], 
-+                  sizeof (struct symtab_and_line));
++	  /* The one returned SALS entry is copied for all the PCs.  */
++          for (j = 1; j < num_pc_values; ++j)
++            {
++	      memcpy (&(new_sals[i + j]), &sals->sals[i], 
++		      sizeof (struct symtab_and_line));
++	    }
 +          xfree (sals->sals);
 +          sals->sals = new_sals;
 +          sals->nelts += num_pc_values - 1;

gdb-6.3-linespec-20041213.patch:

Index: gdb-6.3-linespec-20041213.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-linespec-20041213.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-linespec-20041213.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-linespec-20041213.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -1,3 +1,10 @@
+[base]
+
+2007-09-21  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* linespec.c (add_minsym_members): Support also the `$allocate' and
+	`$delete' variants.
+
 Index: gdb-6.5/gdb/linespec.c
 ===================================================================
 --- gdb-6.5.orig/gdb/linespec.c	2006-01-10 20:14:43.000000000 -0200
@@ -68,7 +75,7 @@
  	  else if (strncmp (class_name, name, name_len) == 0
  		   && (class_name[name_len] == '\0'
  		       || class_name[name_len] == '<'))
-@@ -261,21 +274,83 @@ find_methods (struct type *t, char *name
+@@ -261,21 +274,101 @@ find_methods (struct type *t, char *name
  
    if (i1 == 0)
      for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
@@ -131,6 +138,24 @@
 +      ++counter;
 +    }
 +  xfree (list);
++
++  /* Target also the allocating/deleting variants.  */
++  if (member_name[0] == '~')
++    strcpy (completion_name + comp_len - 1, "$delete(");
++  else
++    strcpy (completion_name + comp_len - 1, "$allocate(");
++  list = make_symbol_completion_list (completion_name,
++				      completion_name+1);
++
++  /* Again we have a list.  Add their minimal symbols to the array.  */
++  i = 0;
++  while (list && list[i] != NULL)
++    {
++      msym_arr[counter] = lookup_minimal_symbol (list[i++], NULL, NULL);
++      ++counter;
++    }
++  xfree (list);
++
 +  xfree (completion_name);
 +
 +  return counter;

gdb-6.3-test-dtorfix-20050121.patch:

Index: gdb-6.3-test-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-dtorfix-20050121.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-test-dtorfix-20050121.patch	4 Feb 2005 21:01:49 -0000	1.1
+++ gdb-6.3-test-dtorfix-20050121.patch	22 Sep 2007 15:56:10 -0000	1.2
@@ -5,9 +5,14 @@
 	* gdb.cp/constructortest.cc: Ditto.
 	* gdb.cp/templates.exp: Change break of dtor to	be fully quoted.
 
+2007-09-22  Jan Kratochvil <jan.kratochvil at redhat.com>
+
+	* gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
+	`$delete' destructor variant.
+
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix	Fri Jan 21 17:06:56 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc	Fri Jan 21 17:05:18 2005
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,99 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2005 Free Software Foundation, Inc.
@@ -45,12 +50,33 @@
 +    int  y;
 +};
 +
++/* C and D are for the $delete destructor.  */
++
++class C
++{
++  public:
++    C();
++    virtual ~C();
++  private:
++    int  x;
++};
++
++class D: public C
++{
++  public:
++    D();
++  private:
++    int  y;
++};
++
 +int main(int argc, char *argv[])
 +{
 +  A* a = new A;
 +  B* b = new B;
++  D* d = new D;
 +  delete a;
 +  delete b;
++  delete d;
 +  return 0;
 +}
 +
@@ -72,12 +98,26 @@
 +   k = 5;
 +}
 +
++C::C() /* Constructor C */
++{
++   x = 1; /* First line C */
++}
++
++C::~C() /* Destructor C */
++{
++   x = 3; /* First line ~C */
++}
++
++D::D()
++{
++   y = 2; /* First line D */
++}
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix	Fri Jan 21 17:07:02 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp	Fri Jan 21 17:05:29 2005
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,135 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
-+# Copyright 2005 Free Software Foundation, Inc.
++# Copyright 2005, 2007 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
@@ -173,6 +213,43 @@
 +gdb_continue_to_breakpoint "Second line ~A"
 +gdb_test "bt" "#0.*A.*#1.*B.*#2.*main.*" "Verify in not-in-charge A::~A second line"
 +
++
++# Test now the $delete destructors.
++
++# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++runto_main
++
++# Break on the various forms of the C::~C destructor
++set test "breaking on C::~C"
++gdb_test_multiple "break C\:\:~C" $test {
++  -re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. C::~C\\(\\) at .*\[\r\n\]*.3. C::~C\\\$base\\(\\) at .*\[\r\n\]*4. C::~C\\\$delete\\(\\) at .*\[\r\n\]*> $" {
++            gdb_test "1" \
++                ".*Multiple breakpoints were set.*" \
++                "break on multiple constructors"
++  }
++  -re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*> $" {
++    fail $test
++  }
++}
++gdb_continue_to_breakpoint "First line ~C"
++
++# Verify that we can break by line number in a destructor and find
++# the $delete occurence
++
++# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++runto_main
++
++set first_line_dtor [gdb_get_line_number "First line ~C"]
++gdb_test "break $first_line_dtor" ".*$first_line_dtor.*$first_line_dtor.*Multiple breakpoints were set.*" "break by line in destructor"
++gdb_continue_to_breakpoint "First line ~C"
 --- gdb-6.3/gdb/testsuite/gdb.cp/templates.exp.fix	Fri Jan 21 17:07:10 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/templates.exp	Fri Jan 21 17:09:09 2005
 @@ -1,4 +1,4 @@

gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.6-bz233852-attach-signalled.patch	16 Sep 2007 22:34:35 -0000	1.2
+++ gdb-6.6-bz233852-attach-signalled.patch	22 Sep 2007 15:56:10 -0000	1.3
@@ -448,7 +448,7 @@
 +}
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ ./gdb/testsuite/gdb.threads/attach-into-signal.exp	29 Jun 2007 22:06:06 -0000
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,179 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -519,7 +519,10 @@
 +
 +	set stoppedtry 0
 +	while { $stoppedtry < 10 } {
-+	    set fileid [open /proc/${testpid}/status r];
++	    if [catch {open /proc/${testpid}/status r} fileid] {
++		set stoppedtry 10
++		break
++	    }
 +	    gets $fileid line1;
 +	    gets $fileid line2;
 +	    close $fileid;

gdb-6.6-upstream.patch:

Index: gdb-6.6-upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-upstream.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdb-6.6-upstream.patch	28 Aug 2007 14:46:38 -0000	1.7
+++ gdb-6.6-upstream.patch	22 Sep 2007 15:56:10 -0000	1.8
@@ -1133,3 +1133,33 @@
  #define GNU_ABI_TAG_LINUX	0
  #define GNU_ABI_TAG_HURD	1
  #define GNU_ABI_TAG_SOLARIS	2
+
+
+
+2007-09-15  Alan Modra  <amodra at bigpond.net.au>
+
+	* configure.ac: Correct makeinfo version check.
+	* configure: Regenerate.
+
+#--- ./configure.ac	14 Sep 2007 14:51:36 -0000	1.25
+#+++ ./configure.ac	14 Sep 2007 15:47:01 -0000	1.26
+#@@ -2462,7 +2462,7 @@ changequote(,)
+#     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+#     # higher, else we use the "missing" dummy.
+#     if ${MAKEINFO} --version \
+#-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+#+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+#       :
+#     else
+#       MAKEINFO="$MISSING makeinfo"
+--- ./configure	14 Sep 2007 14:51:36 -0000	1.277
++++ ./configure	14 Sep 2007 15:47:01 -0000	1.278
+@@ -6192,7 +6192,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gdb.spec	16 Sep 2007 22:34:35 -0000	1.244
+++ gdb.spec	22 Sep 2007 15:56:10 -0000	1.245
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 27%{?dist}
+Release: 28%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -683,6 +683,11 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
+- Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
+- Fix the build compatibility with texinfo >= 4.10.
+- Fix the testcase for pending signals (from BZ 233852).
+
 * Sun Sep 16 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-27
 - Fix attaching to stopped processes and/or pending signals.
 



From fedora-extras-commits at redhat.com  Sat Sep 22 16:01:35 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Sat, 22 Sep 2007 12:01:35 -0400
Subject: rpms/filezilla/F-7 filezilla.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200709221601.l8MG1ZkI009776@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/filezilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685

Modified Files:
	filezilla.spec sources 
Log Message:
Update to 3.0.1 - first F-7 release



Index: filezilla.spec
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/filezilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filezilla.spec	18 Sep 2007 20:29:27 -0000	1.2
+++ filezilla.spec	22 Sep 2007 16:01:02 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           filezilla
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -15,7 +15,6 @@
 ## Needed if test program is build
 BuildRequires:  cppunit-devel >= 1.10.2
 ##
-BuildRequires:  gawk
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel >= 1.5.4
@@ -25,8 +24,6 @@
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
-Requires:  gnutls >= 1.5.4
-
 
 %description
 FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
@@ -105,6 +102,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 kwizart < kwizart at gmail.com > - 3.0.1-1
+- Update to 3.0.1
+
 * Sun Sep  9 2007 kwizart < kwizart at gmail.com > - 3.0.0-1
 - Update to 3.0.0 (final)
 - Add vendor field for .desktop


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/filezilla/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2007 20:30:10 -0000	1.2
+++ sources	22 Sep 2007 16:01:02 -0000	1.3
@@ -1 +1 @@
-9751433785d98e069f4c404c2d3d3231  FileZilla_3.0.0_src.tar.bz2
+c66cabe1339d358a0c135fb3ce3e7589  FileZilla_3.0.1_src.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 16:31:53 2007
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 22 Sep 2007 12:31:53 -0400
Subject: rpms/source-highlight/devel source-highlight.spec,1.16,1.17
Message-ID: <200709221631.l8MGVrxC010825@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/source-highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10509

Modified Files:
	source-highlight.spec 
Log Message:
delete info/dir file



Index: source-highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- source-highlight.spec	16 Sep 2007 19:46:15 -0000	1.16
+++ source-highlight.spec	22 Sep 2007 16:31:20 -0000	1.17
@@ -35,6 +35,8 @@
 mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
 %{__sed} -i 's/\r//' docs/source-highlight/xhtml.css
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Sat Sep 22 17:47:35 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 22 Sep 2007 13:47:35 -0400
Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.13,
	1.14
Message-ID: <200709221747.l8MHlZOn019719@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19679/devel

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
Fix URI problem (#236668)


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nautilus-open-terminal.spec	17 Aug 2007 14:29:11 -0000	1.13
+++ nautilus-open-terminal.spec	22 Sep 2007 17:47:00 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           nautilus-open-terminal
 Version:        0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
 Group:          User Interface/Desktops
 License:       	GPLv2+
-URL:            http://manny.cluecoder.org/packages/nautilus-open-terminal/
-Source0:        http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz
+URL:            http://download.gnome.org/sources/%{name}/
+Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:		nautilus-open-terminal-0.8-truthvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 %{_libdir}/nautilus/extensions-1.0/*.so*
 
 %changelog
+* Sat Sep 22 2007 Paul W. Frields <stickster at gmail.com> - 0.8-2
+- Fix download and source URIs
+
 * Fri Aug 17 2007 Paul W. Frields <stickster at gmail.com> - 0.8-1
 - Update License tag
 - Update to version 0.8



From fedora-extras-commits at redhat.com  Sat Sep 22 17:47:38 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 22 Sep 2007 13:47:38 -0400
Subject: rpms/nautilus-open-terminal/F-7 nautilus-open-terminal.spec, 1.13, 
	1.14
Message-ID: <200709221747.l8MHlcEu019722@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19679/F-7

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
Fix URI problem (#236668)


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-7/nautilus-open-terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nautilus-open-terminal.spec	17 Aug 2007 14:36:54 -0000	1.13
+++ nautilus-open-terminal.spec	22 Sep 2007 17:47:05 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           nautilus-open-terminal
 Version:        0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
 Group:          User Interface/Desktops
 License:       	GPLv2+
-URL:            http://manny.cluecoder.org/packages/nautilus-open-terminal/
-Source0:        http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz
+URL:            http://download.gnome.org/sources/%{name}/
+Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:		nautilus-open-terminal-0.8-truthvalue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 %{_libdir}/nautilus/extensions-1.0/*.so*
 
 %changelog
+* Sat Sep 22 2007 Paul W. Frields <stickster at gmail.com> - 0.8-2
+- Fix download and source URIs
+
 * Fri Aug 17 2007 Paul W. Frields <stickster at gmail.com> - 0.8-1
 - Update License tag
 - Update to version 0.8



From fedora-extras-commits at redhat.com  Sat Sep 22 19:37:56 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:37:56 -0400
Subject: rpms/trac-bazaar-plugin/devel trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.3, 1.4
Message-ID: <200709221937.l8MJbu88003576@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3527

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trac-bazaar-plugin.spec	29 Aug 2007 22:58:23 -0000	1.3
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:37:24 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:16 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:16 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/EL-5
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmGRR004283@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/EL-5

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/EL-5/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:21:51 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:43 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:18 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:18 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/F-7 php-pear-MDB2-Driver-mysql.spec,
	1.3, 1.4
Message-ID: <200709221948.l8MJmIb8004286@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/F-7

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/F-7/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:06 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:46 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:21 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:21 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/FC-6
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmLTU004289@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/FC-6

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:01 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:49 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:48:24 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Sep 2007 15:48:24 -0400
Subject: rpms/php-pear-MDB2-Driver-mysql/devel
	php-pear-MDB2-Driver-mysql.spec, 1.3, 1.4
Message-ID: <200709221948.l8MJmOST004292@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4207/devel

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Log Message:
fix requires


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/devel/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-MDB2-Driver-mysql.spec	5 May 2007 23:22:06 -0000	1.3
+++ php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:51 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
@@ -15,7 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
 Requires:       php-pear(PEAR)
-Requires:       php-pear(MDB2) >= 2.3.0
+Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
+- Update Requires
+
 * Sat May 05 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:46 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:46 -0400
Subject: rpms/trac-bazaar-plugin/EL-5 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJpkCi004559@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/EL-5

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/EL-5/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:14:56 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:14 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:49 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:49 -0400
Subject: rpms/trac-bazaar-plugin/F-7 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJpnv2004562@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/F-7

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/F-7/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:14:59 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:16 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 19:51:51 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 22 Sep 2007 15:51:51 -0400
Subject: rpms/trac-bazaar-plugin/FC-6 trac-bazaar-escape.patch, NONE,
	1.1 trac-bazaar-extra-return.patch, NONE,
	1.1 trac-bazaar-timestamp.patch, NONE,
	1.1 trac-bazaar-plugin.spec, 1.2, 1.3
Message-ID: <200709221951.l8MJppji004565@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/FC-6

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:15:03 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:19 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:27 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:27 -0400
Subject: rpms/smart/EL-4 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Rec011110@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/EL-4

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:30 -0400
Subject: rpms/smart/EL-5 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Umk011125@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/EL-5

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:35 -0400
Subject: rpms/smart/F-7 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2Z7Z011142@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/F-7

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:39 -0400
Subject: rpms/smart/FC-6 smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2d1p011157@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/FC-6

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 20:02:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 16:02:41 -0400
Subject: rpms/smart/devel smart-0.28-mxddcl.patch, 1.1,
	NONE smart-0.41-emptydesc.patch, 1.1, NONE
Message-ID: <200709222002.l8MK2fuL011172@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11092/devel

Removed Files:
	smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
Log Message:
Remove no longer used patches


--- smart-0.28-mxddcl.patch DELETED ---


--- smart-0.41-emptydesc.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 22 21:12:34 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:12:34 -0400
Subject: rpms/smart/devel .cvsignore, 1.9, 1.10 smart.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <200709222112.l8MLCYII022554@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22527

Modified Files:
	.cvsignore smart.spec sources 
Log Message:
* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Sep 2007 19:11:20 -0000	1.9
+++ .cvsignore	22 Sep 2007 21:12:02 -0000	1.10
@@ -1,4 +1,2 @@
-smart-0.50.tar.bz2
-smart-0.50-ccache.patch
-smart-0.42-autofs5fix.patch
-smart-0.50-auto.patch
+smart-0.51.tar.bz2
+smart-0.51-auto.patch


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/smart.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- smart.spec	8 Sep 2007 19:26:24 -0000	1.24
+++ smart.spec	22 Sep 2007 21:12:02 -0000	1.25
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.50
-Release: 48%{?dist}
+Version: 0.51
+Release: 49%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,9 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: smart-0.42-autofs5fix.patch
-Patch1: smart-0.50-ccache.patch
-Patch2: smart-0.50-auto.patch
+Patch2: smart-0.51-auto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -74,8 +72,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .autofs5
-%patch1 -p0 -b .ccache
 %patch2 -p1
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
@@ -207,6 +203,9 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
+- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.
+
 * Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
 - KSmartTray desktop entry fixes.
 - License: GPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Sep 2007 19:11:20 -0000	1.12
+++ sources	22 Sep 2007 21:12:02 -0000	1.13
@@ -1,4 +1,2 @@
-7595df0259829fff64496f1c359a53cf  smart-0.50.tar.bz2
-044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
-371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
-258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
+6584bf3b977081162d19e220fdbcb3ac  smart-0.51.tar.bz2
+fddb01047624daac2f0551cc10076df4  smart-0.51-auto.patch



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:30 -0700
Subject: [pkgdb] smart: scop has requested watchcommits
Message-ID: <200709222115.l8MLFWf8018918@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:35 -0700
Subject: [pkgdb] smart: scop has requested commit
Message-ID: <200709222115.l8MLFaSJ021617@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:37 -0700
Subject: [pkgdb] smart: scop has requested approveacls
Message-ID: <200709222115.l8MLFbi9018944@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the approveacls acl on smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:51 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:51 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested watchcommits
Message-ID: <200709222115.l8MLFqc5021689@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:53 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:53 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested commit
Message-ID: <200709222115.l8MLFr6O021701@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:15:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Sat, 22 Sep 2007 14:15:54 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has requested approveacls
Message-ID: <200709222115.l8MLFt6U019022@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the approveacls acl on fedora-package-config-smart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Sat Sep 22 21:38:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:38:22 -0400
Subject: rpms/smart/EL-5 ksmarttray.desktop, NONE, 1.1 .cvsignore, 1.5,
	1.6 distro.py, 1.2, 1.3 smart.pam, 1.1, 1.2 smart.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200709222138.l8MLcM3m023597@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570

Modified Files:
	.cvsignore distro.py smart.pam smart.spec sources 
Added Files:
	ksmarttray.desktop 
Log Message:
Sync with devel for first EL-5 build


--- NEW FILE ksmarttray.desktop ---
[Desktop Entry]
Name=KSmartTray
Comment=Keep up to date with package updates
Exec=ksmarttray
Type=Application
Terminal=false
Categories=System;KDE;Monitor;TrayIcon;Applet;
OnlyShowIn=GNOME;KDE;XFCE;
Icon=ksmarttray


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Sep 2006 22:34:43 -0000	1.5
+++ .cvsignore	22 Sep 2007 21:37:49 -0000	1.6
@@ -1,3 +1,2 @@
-smart-0.42.tar.bz2
-smart-0.42-autofs5fix.patch
-ksmarttray.desktop
+smart-0.51.tar.bz2
+smart-0.51-auto.patch


Index: distro.py
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/distro.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro.py	25 Nov 2006 16:30:35 -0000	1.2
+++ distro.py	22 Sep 2007 21:37:49 -0000	1.3
@@ -5,17 +5,13 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
-        pkgconf.setFlag("multi-version", "kernel%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
-        pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
-        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
-             pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
+    for kernelseries in ("kernel", "kernel-suspend2", "kernel-tuxonice"):
+        for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
+            pkgconf.setFlag("multi-version", "%s%s" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-unsupported" % (kernelseries, flavour))
+            pkgconf.setFlag("multi-version", "%s%s-devel" % (kernelseries, flavour))
+            for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
+                pkgconf.setFlag("multi-version", "%s-%s%s" % (clustergfs, kernelseries, flavour))
     pkgconf.setFlag("multi-version", "kernel-source")
     pkgconf.setFlag("multi-version", "kernel-sourcecode")
 


Index: smart.pam
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.pam	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.pam	22 Sep 2007 21:37:49 -0000	1.2
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smart.spec	5 Feb 2007 01:05:32 -0000	1.13
+++ smart.spec	22 Sep 2007 21:37:49 -0000	1.14
@@ -1,13 +1,14 @@
-%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+# This is not defined on Fedora buildsystems
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %bcond_without ksmarttray
 %bcond_without pygtk
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.50
-Release: 45%{?dist}
-License: GPL
+Version: 0.51
+Release: 49%{?dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
 Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
@@ -16,9 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch0: smart-0.42-autofs5fix.patch
-Patch1: smart-0.50-ccache.patch
-Patch2: smart-0.50-auto.patch
+Patch2: smart-0.51-auto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -29,7 +28,7 @@
 BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
 BuildRequires: zlib-devel
 %endif
-Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
+#Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
 %{!?with_pygtk:Requires: usermode}
 Requires: smart-config
@@ -73,11 +72,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .autofs5
-%patch1 -p0 -b .ccache
 %patch2 -p1
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
+install -p -m 644 %{SOURCE2} .
+# Detect whether the system is using pam_stack
+if -f /%{_lib}/security/pam_stack.so \
+   -a ! grep "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so \
+      2>&1 > /dev/null; then
+  perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' smart.pam
+  touch -r %{SOURCE2} smart.pam
+fi
 
 %build
 CFLAGS="%{optflags}"
@@ -119,7 +124,7 @@
 mkdir -p %{buildroot}/etc/security/console.apps
 mkdir -p %{buildroot}/etc/pam.d
 install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root
+install -p -m 644 smart.pam %{buildroot}/etc/pam.d/smart-root
 
 # smart-update
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
@@ -198,6 +203,19 @@
 %endif
 
 %changelog
+* Sat Sep 22 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-49
+- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.
+
+* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-48
+- KSmartTray desktop entry fixes.
+- License: GPLv2+
+
+* Thu Aug  2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
+- Add kernel-tuxonice series support.
+
+* Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-46
+- Autodetect pam_stack module at build time.
+
 * Mon Feb  5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-45
 - Adjust checks for autotools.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2007 00:46:59 -0000	1.7
+++ sources	22 Sep 2007 21:37:49 -0000	1.8
@@ -1,5 +1,2 @@
-7595df0259829fff64496f1c359a53cf  smart-0.50.tar.bz2
-044e7fb260f201b23f6b0554fd70243e  smart-0.50-ccache.patch
-371a72eff80e2e98e37d29275a1f5e9d  smart-0.42-autofs5fix.patch
-3e758faa20a498f27deabb0f773a923d  ksmarttray.desktop
-258ec68f8762e787352f39a9e8414115  smart-0.50-auto.patch
+6584bf3b977081162d19e220fdbcb3ac  smart-0.51.tar.bz2
+fddb01047624daac2f0551cc10076df4  smart-0.51-auto.patch



From fedora-extras-commits at redhat.com  Sat Sep 22 21:41:29 2007
From: fedora-extras-commits at redhat.com (Behdad Esfahbod (behdad))
Date: Sat, 22 Sep 2007 17:41:29 -0400
Subject: rpms/vte/F-7 sources,1.61,1.62 vte.spec,1.116,1.117
Message-ID: <200709222141.l8MLfTAJ023707@cvs-int.fedora.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23681

Modified Files:
	sources vte.spec 
Log Message:
* Mon Sep 22 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.9-1
- Update to 0.16.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	31 Jul 2007 03:07:01 -0000	1.61
+++ sources	22 Sep 2007 21:40:54 -0000	1.62
@@ -1 +1 @@
-65344de3023c41c8dda2b35a415bf969  vte-0.16.8.tar.bz2
+a42c893a01e3d9818789be373e529422  vte-0.16.9.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-7/vte.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- vte.spec	31 Jul 2007 03:41:25 -0000	1.116
+++ vte.spec	22 Sep 2007 21:40:54 -0000	1.117
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.16.8
+Version: 0.16.9
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.9-1
+- Update to 0.16.9
+
 * Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> 0.16.8-1
 - Update to 0.16.8
 



From fedora-extras-commits at redhat.com  Sat Sep 22 21:43:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:43:09 -0400
Subject: rpms/fedora-package-config-smart/EL-5 .cvsignore, 1.5,
	1.6 fedora-package-config-smart.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200709222143.l8MLh9Ss023806@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fedora-package-config-smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23778

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 5-1
- Initial EL-5 version based on Fedora's 6-8.
- Add empty %build section.
- License: GPL+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Oct 2006 10:08:56 -0000	1.5
+++ .cvsignore	22 Sep 2007 21:42:36 -0000	1.6
@@ -1 +1 @@
-fedora-package-config-smart-6.tar.bz2
+fedora-package-config-smart-5EL.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/fedora-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-package-config-smart.spec	26 Oct 2006 10:08:56 -0000	1.5
+++ fedora-package-config-smart.spec	22 Sep 2007 21:42:36 -0000	1.6
@@ -1,27 +1,30 @@
-Summary: Fedora configuration files for the smart package manager
+%define debug_package %{nil}
+
+Summary: Fedora EPEL configuration files for the Smart package manager
 Name: fedora-package-config-smart
-Version: 6
-Release: 8
-License: GPL
+Version: 5
+Release: 1%{?dist}
+License: GPL+
 Group: System Environment/Base
-URL: http://fedora.redhat.com/
-Source0: %{name}-%{version}.tar.bz2
+URL: http://fedoraproject.org/wiki/EPEL
+Source0: %{name}-%{version}EL.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: smart
 Provides: smart-config
 
 %description
-This package contains smart configuration files for Fedora (Core,
-Updates and Extras).
+Fedora EPEL configuration files for the Smart package manager.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}EL
 # 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' < $filein > $file
 done
 
+%build
+
 %install
 rm -rf %{buildroot}
 
@@ -38,77 +41,7 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Thu Oct 26 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6-8
-- Update to Fedora Core 6.
-
-* Sat May 13 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-7
-- Sync with fedora-package-config-apt, see also #191580.
-
-* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-6
-- Update to rawhide config.
-
-* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
-- Add virtual smart-config provides (#175630 comment 13).
-
-* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
-- Update to Fedora Core 5.
-
-* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
-- changed name to fedora-package-config-smart
-- Modify to only include what fedora-release includes for yum.
-
-* Thu Jul 14 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Merge srpms of atrpms-package-config and medley-package-config.
-
-* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add el3/el4/fc4 repos.
-
-* Fri Dec 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add smart support.
-
-* Tue Nov 16 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Split yum config files for yum 2.0.x and yum >= 2.1.x.
-
-* Tue Nov  9 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fc3 support.
-
-* Tue Sep 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fedoralegacy repo for FC1.
-- Prapare commented entries for fedoralegacy repo for FC2.
-
-* Fri Sep  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Rename apt.physik.fu-berlin.de to apt.atrpms.net
-
-* Tue Aug 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Change main dries repo to lower load on studentenweb.org.
-
-* Thu Jul 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Fork ATrpms-only package, former atrpms-package-config
-  package has been renamed to medley-package.config.
-
-* Sat Jul 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Fix nr entries for production.
-- Add freshrpms' x86_64 entries.
-
-* Fri May 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add RPM::Order "true" to apt.conf.
-
-* Mon May 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Added back Gstreamer, now we know where it went to.
-- New fc2 list officially published.
-
-* Thu May  6 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Add fedoralegacy repos where appropriate.
-
-* Fri Apr  2 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Remove nonfree sections of BIOrpms, as these were accidentially activated.
-
-* Mon Mar 15 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Change in Matt's repo structure.
-
-* Thu Mar 11 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
-- Interrepo problems with Dag's obsoletes.
-
-* Fri Mar  5 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
-- Split off package from atrpms package (check there for prior logs).
-
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 5-1
+- Initial EL-5 version based on Fedora's 6-8.
+- Add empty %%build section.
+- License: GPL+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2006 10:08:56 -0000	1.6
+++ sources	22 Sep 2007 21:42:36 -0000	1.7
@@ -1 +1 @@
-61aaadfe0ff641c6c1be3e3f93f3dc09  fedora-package-config-smart-6.tar.bz2
+e80025adb41a6d24cd26487f72b50485  fedora-package-config-smart-5EL.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 22 21:52:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Sep 2007 17:52:19 -0400
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.6,
	1.7 fedora-package-config-smart.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200709222152.l8MLqJOc026336@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fedora-package-config-smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26259

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 8-10
- Update for Fedora 8.
- Add empty %build section.
- Improve summary and description.
- License: GPL+
- Update URL.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jun 2007 08:39:26 -0000	1.6
+++ .cvsignore	22 Sep 2007 21:51:46 -0000	1.7
@@ -1 +1 @@
-fedora-package-config-smart-7.89.tar.bz2
+fedora-package-config-smart-8.tar.bz2


Index: fedora-package-config-smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-package-config-smart.spec	1 Jun 2007 08:39:26 -0000	1.6
+++ fedora-package-config-smart.spec	22 Sep 2007 21:51:46 -0000	1.7
@@ -1,18 +1,19 @@
-Summary: Fedora configuration files for the smart package manager
+%define debug_package %{nil}
+
+Summary: Fedora configuration files for the Smart package manager
 Name: fedora-package-config-smart
-Version: 7.89
-Release: 9
-License: GPL
+Version: 8
+Release: 10
+License: GPL+
 Group: System Environment/Base
-URL: http://fedora.redhat.com/
+URL: http://fedoraproject.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: smart
 Provides: smart-config
 
 %description
-This package contains smart configuration files for Fedora (Core,
-Updates and Extras).
+Fedora configuration files for the Smart package manager.
 
 %prep
 %setup -q
@@ -22,6 +23,8 @@
   sed -e's, at ARCH@,%{_target_cpu},g' < $filein > $file
 done
 
+%build
+
 %install
 rm -rf %{buildroot}
 
@@ -38,6 +41,13 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 8-10
+- Update for Fedora 8.
+- Add empty %%build section.
+- Improve summary and description.
+- License: GPL+
+- Update URL.
+
 * Fri Jun  1 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 7.89-9
 - Update to post-F7 rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jun 2007 08:39:26 -0000	1.7
+++ sources	22 Sep 2007 21:51:46 -0000	1.8
@@ -1 +1 @@
-326554e2de11b8b271594bce02404e6c  fedora-package-config-smart-7.89.tar.bz2
+81fd1da0f313b768b64c764644e81edb  fedora-package-config-smart-8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 00:46:46 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:46:46 -0400
Subject: rpms/mercurial/devel mercurial.spec,1.23,1.24
Message-ID: <200709230046.l8N0kkNs016092@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074

Modified Files:
	mercurial.spec 
Log Message:
Fix contrib stuff (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mercurial.spec	21 Sep 2007 01:21:24 -0000	1.23
+++ mercurial.spec	23 Sep 2007 00:46:12 -0000	1.24
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 00:48:03 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:48:03 -0400
Subject: rpms/mercurial/F-7 mercurial.spec,1.23,1.24
Message-ID: <200709230048.l8N0m3ww016208@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16181

Modified Files:
	mercurial.spec 
Log Message:
fix contrib (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mercurial.spec	21 Sep 2007 01:22:26 -0000	1.23
+++ mercurial.spec	23 Sep 2007 00:47:30 -0000	1.24
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 00:48:34 2007
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Sat, 22 Sep 2007 20:48:34 -0400
Subject: rpms/mercurial/EL-4 mercurial.spec,1.18,1.19
Message-ID: <200709230048.l8N0mYEf016264@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16202

Modified Files:
	mercurial.spec 
Log Message:
fix contrib (again)


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	21 Sep 2007 01:19:37 -0000	1.18
+++ mercurial.spec	23 Sep 2007 00:48:02 -0000	1.19
@@ -1,12 +1,11 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -17,7 +16,6 @@
  
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 python ./setup.py build
@@ -27,7 +25,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
+python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
 # and we have to install the man pages
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
@@ -36,6 +34,11 @@
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
 install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# install contrib
+which cp
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+%{__cp} -av contrib $RPM_BUILD_ROOT/%{_datadir}/mercurial/
+
 # Set up a system-wide hgrc that says where the hgk script went:
 mkdir -p $RPM_BUILD_ROOT/etc/mercurial
 cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
@@ -51,10 +54,14 @@
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
 %{_sysconfdir}/mercurial/
-%{_datadir}/mercurial/contrib/*.py[co]
+%{_datadir}/mercurial/contrib/
 %{_mandir}/man*/*
 
 %changelog
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
 - Change setup.py install to -O2 to get bytecompile on EL-4
 



From fedora-extras-commits at redhat.com  Sun Sep 23 01:25:43 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sat, 22 Sep 2007 21:25:43 -0400
Subject: rpms/xulrunner/devel xulrunner.spec,1.19,1.20
Message-ID: <200709230125.l8N1Ph51022975@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22951

Modified Files:
	xulrunner.spec 
Log Message:
update license tag



Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xulrunner.spec	21 Sep 2007 11:17:54 -0000	1.19
+++ xulrunner.spec	23 Sep 2007 01:25:11 -0000	1.20
@@ -12,7 +12,7 @@
 Version:        1.9
 Release:        0.alpha7.4%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
-License:        MPL/LGPL
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball xulrunner-%{version}-source.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 03:40:43 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 22 Sep 2007 23:40:43 -0400
Subject: rpms/python-turbokid/devel .cvsignore, 1.5, 1.6 python-turbokid.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200709230340.l8N3ehwq005932@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894

Modified Files:
	.cvsignore python-turbokid.spec sources 
Log Message:
1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Aug 2007 07:09:11 -0000	1.5
+++ .cvsignore	23 Sep 2007 03:40:10 -0000	1.6
@@ -1 +1 @@
-TurboKid-1.0.2.tar.gz
+TurboKid-1.0.3.tar.gz


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/python-turbokid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-turbokid.spec	2 Sep 2007 04:51:09 -0000	1.8
+++ python-turbokid.spec	23 Sep 2007 03:40:10 -0000	1.9
@@ -4,8 +4,8 @@
 %define module turbokid
 
 Name:           python-turbokid
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sat Sep 22 2007 Luke Macken <lmacken at redhat.com> - 1.0.3-1
+- 1.0.3
+
 * Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
 - Update for python-setuptools changes in rawhide
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Aug 2007 07:09:11 -0000	1.5
+++ sources	23 Sep 2007 03:40:10 -0000	1.6
@@ -1 +1 @@
-01da47aff288649a2ed6f80f6343b0b7  TurboKid-1.0.2.tar.gz
+405376c3b16091b76fb6554a5506bc0b  TurboKid-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 04:04:26 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Sun, 23 Sep 2007 00:04:26 -0400
Subject: rpms/gnome-applets/devel .cvsignore, 1.54, 1.55 gnome-applets.spec, 
	1.243, 1.244 ppp-includes.patch, 1.1, 1.2 sources, 1.57, 1.58
Message-ID: <200709230404.l8N44QLh012786@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682

Modified Files:
	.cvsignore gnome-applets.spec ppp-includes.patch sources 
Log Message:
bring modemlights back for one more round



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Sep 2007 01:34:23 -0000	1.54
+++ .cvsignore	23 Sep 2007 04:03:01 -0000	1.55
@@ -1 +1,2 @@
 gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gnome-applets.spec	22 Sep 2007 05:57:00 -0000	1.243
+++ gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
@@ -34,17 +34,20 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 Source: 	http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
 Source1:        copy.xsl
+Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.17.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
@@ -65,6 +68,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=479172
 Patch36:	gweather-pc.patch
 
+Patch34:        ppp-includes.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +159,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
@@ -168,6 +174,14 @@
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE2}
+
+%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
 intltoolize --force
 autoconf
 
@@ -320,6 +334,7 @@
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
 %{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
 
@@ -342,6 +357,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
 * Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
 - Make the gweather.pc file less useless
 

ppp-includes.patch:

Index: ppp-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/ppp-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppp-includes.patch	30 Jul 2007 22:09:30 -0000	1.1
+++ ppp-includes.patch	23 Sep 2007 04:03:01 -0000	1.2
@@ -1,10 +1,11 @@
 diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
 --- gnome-applets-2.19.0/modemlights/modemlights.c.includes	2007-07-30 18:05:02.000000000 -0400
 +++ gnome-applets-2.19.0/modemlights/modemlights.c	2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
  #endif
  
  #ifdef __linux__
++#define aligned_u64 unsigned long long __attribute__((aligned(8)))
 +#include <linux/types.h>
  #include <linux/if_ppp.h>
  #include <sys/ioctl.h>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	17 Sep 2007 01:34:23 -0000	1.57
+++ sources	23 Sep 2007 04:03:01 -0000	1.58
@@ -1 +1,2 @@
 985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 23 07:40:07 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 23 Sep 2007 03:40:07 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.50,1.51
Message-ID: <200709230740.l8N7e7Em002664@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643

Modified Files:
	xscreensaver.spec 
Log Message:
Some cleanup.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xscreensaver.spec	19 Sep 2007 03:15:15 -0000	1.50
+++ xscreensaver.spec	23 Sep 2007 07:39:34 -0000	1.51
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    7
+%define fedora_rel    8
 %endif
 
 %define extrarel      %{nil}
@@ -45,45 +45,50 @@
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
-BuildRequires:   gettext
-BuildRequires:   desktop-file-utils
-BuildRequires:   sed
-BuildRequires:   libtool
 BuildRequires:   bc
+BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
+BuildRequires:   gettext
+BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
+BuildRequires:   sed
 BuildRequires:   xorg-x11-proto-devel
-BuildRequires:   libX11-devel, libXScrnSaver-devel, libXext-devel
+BuildRequires:   libX11-devel
+BuildRequires:   libXScrnSaver-devel
+BuildRequires:   libXext-devel
 BuildRequires:   libXinerama-devel
 BuildRequires:   libXmu-devel
 BuildRequires:   libXpm-devel
 BuildRequires:   libXt-devel
 BuildRequires:   libXxf86misc-devel
 BuildRequires:   libXxf86vm-devel
+BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
-BuildRequires:   gtk2-devel libglade2-devel
+BuildRequires:   libglade2-devel
 %if 0%{?fedora} >= 7
 BuildRequires:   fedora-release-notes
 %else
 BuildRequires:   fedora-release
 %endif
-Requires:        /etc/pam.d/system-auth
+Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xorg-x11-resutils
+Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
 %package extras
 Summary:         An enhanced set of screensavers
 Group:           Amusements/Graphics
 BuildRequires:   desktop-backgrounds-basic
-Requires:        xscreensaver-base
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package gl-extras
 Summary:         An enhanced set of screensavers that require OpenGL
 Group:           Amusements/Graphics
 Provides:        xscreensaver-gl = %{epoch}:%{version}-%{release}
-Obsoletes:       xscreensaver-gl
-BuildRequires:   libGLU-devel, libGL-devel
-Requires:        xscreensaver-base
+Obsoletes:       xscreensaver-gl <= 1:5.00
+BuildRequires:   libGL-devel
+BuildRequires:   libGLU-devel
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -447,7 +452,7 @@
    echo "Exec=$COMMAND $ARG" >> $2
    echo "StartupNotify=false" >> $2
    echo "Type=Application" >> $2
-   echo "Categories=Screensaver" >> $2
+   echo "Categories=GNOME;Screensaver;" >> $2
 }
 
 cd $dd
@@ -510,6 +515,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Sep 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Some cleanup.
+
 * Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
 - Remove noreplace flag from XScreenSaver.ad as this is updated
   automatically.



From fedora-extras-commits at redhat.com  Sun Sep 23 08:38:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Sep 2007 04:38:41 -0400
Subject: rpms/freenx/devel freenx-0.7.0-kdeprintrc-290351.patch, NONE,
	1.1 freenx.spec, 1.7, 1.8
Message-ID: <200709230838.l8N8cfx5010110@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/freenx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9776

Modified Files:
	freenx.spec 
Added Files:
	freenx-0.7.0-kdeprintrc-290351.patch 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
  with errors when it is (#290351).


freenx-0.7.0-kdeprintrc-290351.patch:

--- NEW FILE freenx-0.7.0-kdeprintrc-290351.patch ---
--- nxloadconfig~	2007-07-07 08:59:03.000000000 +0300
+++ nxloadconfig	2007-09-23 11:28:40.000000000 +0300
@@ -281,9 +281,11 @@
 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
 fi 
 
+if [ "$ENABLE_KDE_CUPS" = "1" ] ; then
 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+[ -z "$KDE_PRINTRC" ] && which kde-config &>/dev/null && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
 [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+fi
 
 #########################################################################
 # Support for --check


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/devel/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	7 Sep 2007 11:28:44 -0000	1.7
+++ freenx.spec	23 Sep 2007 08:38:08 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
+Patch1: freenx-0.7.0-kdeprintrc-290351.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p4 -b .libs
+%patch1 -p0 -b .kdeprintrc
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
   nxloadconfig nxserver
@@ -91,6 +93,10 @@
 /var/log/nx
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
+- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
+  with errors when it is (#290351).
+
 * Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
 - CM = Christian Mandery mail at chrismandery.de,  BZ 252976
 - Version bump to 0.7.0 upstream release (CM)



From fedora-extras-commits at redhat.com  Sun Sep 23 08:41:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Sep 2007 04:41:55 -0400
Subject: rpms/freenx/F-7 freenx-0.7.0-kdeprintrc-290351.patch, NONE,
	1.1 freenx.spec, 1.7, 1.8
Message-ID: <200709230841.l8N8ftm2010279@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254

Modified Files:
	freenx.spec 
Added Files:
	freenx-0.7.0-kdeprintrc-290351.patch 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
  with errors when it is (#290351).


freenx-0.7.0-kdeprintrc-290351.patch:

--- NEW FILE freenx-0.7.0-kdeprintrc-290351.patch ---
--- nxloadconfig~	2007-07-07 08:59:03.000000000 +0300
+++ nxloadconfig	2007-09-23 11:28:40.000000000 +0300
@@ -281,9 +281,11 @@
 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
 fi 
 
+if [ "$ENABLE_KDE_CUPS" = "1" ] ; then
 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+[ -z "$KDE_PRINTRC" ] && which kde-config &>/dev/null && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
 [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+fi
 
 #########################################################################
 # Support for --check


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	7 Sep 2007 11:38:37 -0000	1.7
+++ freenx.spec	23 Sep 2007 08:41:22 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
+Patch1: freenx-0.7.0-kdeprintrc-290351.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p4 -b .libs
+%patch1 -p0 -b .kdeprintrc
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
   nxloadconfig nxserver
@@ -91,6 +93,10 @@
 /var/log/nx
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-2
+- Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
+  with errors when it is (#290351).
+
 * Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
 - CM = Christian Mandery mail at chrismandery.de,  BZ 252976
 - Version bump to 0.7.0 upstream release (CM)



From fedora-extras-commits at redhat.com  Sun Sep 23 09:27:36 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:27:36 -0400
Subject: rpms/FlightGear/devel FlightGear.spec,1.3,1.4
Message-ID: <200709230927.l8N9RatI017174@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/FlightGear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17134

Modified Files:
	FlightGear.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.3.pre1
- update icon cache handling to current guidelines/drafts
- update License tag



Index: FlightGear.spec
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/FlightGear.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FlightGear.spec	29 Aug 2007 18:34:29 -0000	1.3
+++ FlightGear.spec	23 Sep 2007 09:27:03 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
 Version:	0.9.11
-Release:	0.2.pre1%{?dist}
+Release:	0.3.pre1%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source:		ftp://ftp.flightgear.org/pub/fgfs/Source/FlightGear-%{version}-pre1.tar.gz
 Source1:	%{name}.desktop
@@ -78,12 +78,16 @@
 %post
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +101,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.3.pre1
+- update icon cache handling to current guidelines/drafts
+- update License tag
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.11-0.2.pre1
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep 23 09:28:35 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:28:35 -0400
Subject: rpms/fgfs-base/devel fgfs-base.spec,1.2,1.3
Message-ID: <200709230928.l8N9SZHs017259@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17237

Modified Files:
	fgfs-base.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.2.pre1
- update License tag



Index: fgfs-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fgfs-base/devel/fgfs-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fgfs-base.spec	27 Jun 2007 19:08:17 -0000	1.2
+++ fgfs-base.spec	23 Sep 2007 09:28:03 -0000	1.3
@@ -1,9 +1,9 @@
 Name:		fgfs-base
 Summary:	FlightGear base scenery and data files
 Version:	0.9.11
-Release:	0.1.pre1%{?dist}
+Release:	0.2.pre1%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source0:	ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}-pre1.tar.bz2
 URL:		http://www.flightgear.org/
@@ -53,6 +53,9 @@
 %{_datadir}/FlightGear
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.2.pre1
+- update License tag
+
 * Wed Jun 27 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.1.pre1
 - new upstream (pre-)release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 09:29:45 2007
From: fedora-extras-commits at redhat.com (Fabrice Bellet (bellet))
Date: Sun, 23 Sep 2007 05:29:45 -0400
Subject: rpms/fgfs-Atlas/devel fgfs-Atlas.spec,1.3,1.4
Message-ID: <200709230929.l8N9TjiH017290@cvs-int.fedora.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-Atlas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17272

Modified Files:
	fgfs-Atlas.spec 
Log Message:
* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
- update License tag



Index: fgfs-Atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/fgfs-Atlas/devel/fgfs-Atlas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fgfs-Atlas.spec	28 Aug 2007 21:45:40 -0000	1.3
+++ fgfs-Atlas.spec	23 Sep 2007 09:29:12 -0000	1.4
@@ -1,9 +1,9 @@
 Name:		fgfs-Atlas
 Summary:	Flightgear map tools
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 
-License:	GPL
+License:	GPLv2+
 Group:		Amusements/Games
 Source:		http://downloads.sourceforge.net/sourceforge/atlas/Atlas-%{version}.tar.gz
 Source1:	Atlas-default-maps.tar.gz
@@ -49,6 +49,9 @@
 %{_datadir}/FlightGear/*
 
 %changelog
+* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
+- update License tag
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.3.1-5
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Sun Sep 23 10:49:28 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 23 Sep 2007 06:49:28 -0400
Subject: rpms/compiz-fusion/devel compiz-fusion.spec,1.3,1.4
Message-ID: <200709231049.l8NAnS6q028947@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28920

Modified Files:
	compiz-fusion.spec 
Log Message:
fix changelog date


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compiz-fusion.spec	22 Sep 2007 11:36:51 -0000	1.3
+++ compiz-fusion.spec	23 Sep 2007 10:48:52 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name: compiz-fusion
 Version: 0.5.2       
-Release: 7.%{snapshot}%{?dist}
+Release: 8.%{snapshot}%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -127,7 +127,10 @@
 
 
 %changelog
-* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
+* Sun Sep 23 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-8.09b700
+- Fix changelog date
+
+* Sat Sep 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.09b700
 - Update to 0.6 branch (builds against current compiz)
 
 * Wed Sep 19 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6



From fedora-extras-commits at redhat.com  Sun Sep 23 10:50:43 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Sun, 23 Sep 2007 06:50:43 -0400
Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec,1.2,1.3
Message-ID: <200709231050.l8NAohwL029027@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
adjust pre/post/postun scripts to handle renamed schema files


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-fusion-extras.spec	22 Sep 2007 11:38:36 -0000	1.2
+++ compiz-fusion-extras.spec	23 Sep 2007 10:50:08 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.5.2       
-Release: 6.%{snapshot}%{?dist}
+Release: 7.%{snapshot}%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -72,7 +72,7 @@
 
 for p in in %{plugins}; do
 %{_bindir}/gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+	%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
 done
 
 %pre gnome
@@ -80,7 +80,7 @@
   export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
   for p in in %{plugins}; do
 	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
   done
 fi
 
@@ -89,7 +89,7 @@
   export GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`
   for p in in %{plugins}; do
 	%{_bindir}/gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/$p.schemas >& /dev/null || :
+		%{_sysconfdir}/gconf/schemas/compiz-$p.schemas >& /dev/null || :
   done
 fi
 
@@ -110,7 +110,11 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
-* Sat Sep 20 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
+* Sun Sep 23 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-7.6871d0
+- GConf schemas got renamed .. fix scripts to install them
+- Fix changelog date
+
+* Sat Sep 22 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-6.6871d0
 - Update to 0.6 branch (builds against current compiz)
 
 * Sat Sep 15 2007 Adel Gadllah <adel.gadllag at gmail.com> 0.5.2-5



From fedora-extras-commits at redhat.com  Sun Sep 23 11:48:17 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 23 Sep 2007 07:48:17 -0400
Subject: rpms/cdlabelgen/F-7 .cvsignore, 1.4, 1.5 cdlabelgen.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200709231148.l8NBmHnk003536@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/cdlabelgen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3511

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
- updated to 4.0.0
- preserve timestamps upon install
- changed License tag to BSD with advertising



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Sep 2006 18:00:25 -0000	1.4
+++ .cvsignore	23 Sep 2007 11:47:38 -0000	1.5
@@ -1 +1 @@
-cdlabelgen-3.6.0.tgz
+cdlabelgen-4.0.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/cdlabelgen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cdlabelgen.spec	21 Sep 2006 18:00:25 -0000	1.3
+++ cdlabelgen.spec	23 Sep 2007 11:47:38 -0000	1.4
@@ -1,11 +1,11 @@
 Name: cdlabelgen
 Summary: Generates frontcards and traycards for inserting in CD jewelcases
-Version: 3.6.0
+Version: 4.0.0
 Release: 1%{?dist}
 Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
 URL: http://www.aczoom.com/tools/cdinsert/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL
+License: BSD with advertising
 Group: Applications/Publishing
 BuildArch: noarch
 
@@ -17,14 +17,13 @@
 %setup -q
 
 %build
-make
-#pod2man cdlabelgen > cdlabelgen.1
+# nothing to build
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -pm755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -pm644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -pm644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,6 +36,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 4.0.0-1
+- updated to 4.0.0
+- preserve timestamps upon install
+- changed License tag to BSD with advertising
+
 * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 3.6.0-1
 - update to 3.6.0
 - mass rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdlabelgen/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2006 18:00:25 -0000	1.4
+++ sources	23 Sep 2007 11:47:38 -0000	1.5
@@ -1 +1 @@
-6867ad98ec198de3fcf24ffd11525f8c  cdlabelgen-3.6.0.tgz
+0b8225fd914b5c7aa1d3e616b1c8accc  cdlabelgen-4.0.0.tgz



From fedora-extras-commits at redhat.com  Sun Sep 23 13:41:55 2007
From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy))
Date: Sun, 23 Sep 2007 09:41:55 -0400
Subject: rpms/jack-audio-connection-kit/EL-5 jack-audio-connection-kit.spec, 
	1.12, 1.13
Message-ID: <200709231341.l8NDftWx017784@cvs-int.fedora.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17749

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Fix spec to be compatible with Fedora/EPEL 5.


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/EL-5/jack-audio-connection-kit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jack-audio-connection-kit.spec	7 Jun 2007 08:47:12 -0000	1.12
+++ jack-audio-connection-kit.spec	23 Sep 2007 13:41:20 -0000	1.13
@@ -1,25 +1,22 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.103.0
-Release: 1%{?dist}
-License: GPL/LGPL
+Release: 4%{?dist}
+License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
-Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/jackit/%{name}-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
-BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: pkgconfig
 BuildRequires: doxygen
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
-BuildRequires: libfreebob-devel >= 1.0.0
 
-%define gid 334
 %define groupname jackuser
 
-Requires(pre): /usr/sbin/groupadd
+Requires(pre): shadow-utils
 Requires(post): /sbin/ldconfig
 
 %description
@@ -61,7 +58,7 @@
 
 %configure \
     --with-html-dir=%{_docdir} \
-    --enable-freebob \
+    --disable-freebob \
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -88,13 +85,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g %gid -r %groupname &>/dev/null || :
+getent group %groupname >/dev/null || groupadd -r %groupname
+exit 0
 
 %post
 /sbin/ldconfig
 
 # Add default limits for jackuser group
-grep -q jackuser /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
+grep -q %groupname /etc/security/limits.conf || cat >> /etc/security/limits.conf << EOF
 
 ## Automatically appended by jack-audio-connection-kit
 @jackuser - rtprio 20
@@ -125,7 +123,6 @@
 
 %files example-clients
 %defattr(-,root,root)
-%{_bindir}/jackrec
 %{_bindir}/jack_connect
 %{_bindir}/jack_disconnect
 %{_bindir}/jack_impulse_grabber
@@ -138,6 +135,14 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Sep 04 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-4
+- fix Source Forge's URL scheme
+
+* Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-3
+- fix according to new guidelines:
+  - License tag
+  - group creation
+
 * Wed May 23 2007 Andy Shevchenko <andy at smile.org.ua> 0.103.0-1
 - update to the last official release
 - append defaults to the limits.conf (#221785, #235624)



From fedora-extras-commits at redhat.com  Sun Sep 23 14:29:07 2007
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 23 Sep 2007 10:29:07 -0400
Subject: rpms/chemtool/devel chemtool.spec,1.5,1.6
Message-ID: <200709231429.l8NET7LJ027937@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27919

Modified Files:
	chemtool.spec 
Log Message:
- drop libEMF dependency (current transfig/fig2dev supports EMF output)


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chemtool.spec	26 Aug 2007 20:13:27 -0000	1.5
+++ chemtool.spec	23 Sep 2007 14:28:35 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
 Version: 1.6.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -12,7 +12,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
-BuildRequires: libEMF-devel
 BuildRequires: libXt-devel
 BuildRequires: gnome-mime-data
 BuildRequires: kdelibs
@@ -32,7 +31,6 @@
 
 %build
 %configure \
-  --enable-emf \
   --with-kdedir=%{_prefix} \
   --with-gnomedir=%{_prefix}
 %{__make} %{?_smp_mflags}
@@ -90,6 +88,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.11-2
+- drop libEMF dependency (current transfig/fig2dev supports EMF output)
+
 * Sun Aug 26 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.11-1
 - updated to 1.6.11
 - updated license tag



From fedora-extras-commits at redhat.com  Sun Sep 23 14:47:39 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Sun, 23 Sep 2007 10:47:39 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine.spec,1.6,1.7
Message-ID: <200709231447.l8NEldS1028698@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28617

Modified Files:
	gtk-nodoka-engine.spec 
Log Message:


Require at least the version of gtk it is build against (rhbz #301851).




Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk-nodoka-engine.spec	20 Sep 2007 20:50:17 -0000	1.6
+++ gtk-nodoka-engine.spec	23 Sep 2007 14:47:07 -0000	1.7
@@ -1,6 +1,9 @@
+%define gtk2version %(pkg-config gtk+-2.0 --modversion 2> /dev/null)
+%define nogtk2 %(pkg-config gtk+-2.0 --modversion &> /dev/null; echo $?)
+
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
@@ -12,7 +15,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
+%if 0%{?nogtk2}
 Requires:       gtk2
+%else
+Requires:       gtk2 >= %{?gtk2version}
+%endif
 
 %description
 Nodoka is a Murrine engine based gtk2 theme engine. The package is shipped with 
@@ -48,6 +55,10 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Sun Sep 23 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-3
+- Require at least the version of gtk it was build against
+-- rhbz 301851 (patch from Ignacio Vazquez-Abrams)
+
 * Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
 - Add user specified tooltips coloring
 - Fix colours in unfocused GTKTreeView (rhbz #297271)



From fedora-extras-commits at redhat.com  Sun Sep 23 15:42:41 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Sun, 23 Sep 2007 11:42:41 -0400
Subject: rpms/gdb/devel gdb-6.6-bfd-vdso8k.patch, NONE,
	1.1 gdb-6.6-bz233852-attach-signalled.patch, 1.3, 1.4 gdb.spec,
	1.245, 1.246
Message-ID: <200709231542.l8NFgfVc005102@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4867

Modified Files:
	gdb-6.6-bz233852-attach-signalled.patch gdb.spec 
Added Files:
	gdb-6.6-bfd-vdso8k.patch 
Log Message:
* Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
- Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
- Fix the testcase for pending signals (from BZ 233852).


gdb-6.6-bfd-vdso8k.patch:

--- NEW FILE gdb-6.6-bfd-vdso8k.patch ---
2007-09-23  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): New variables
	X_SHDR_SHSTRTAB and I_SHDR_SHSTRTAB.  Fixed the CONTENTS_SIZE trimming
	check for its aligned size between the last segment and still before
	the section header end.  Added variables check to cover also the
	section header string table.

--- ./bfd/elfcode.h	14 Aug 2007 08:04:47 -0000	1.86
+++ ./bfd/elfcode.h	23 Sep 2007 14:24:39 -0000
@@ -1628,6 +1628,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
   Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */
   Elf_External_Phdr *x_phdrs;
   Elf_Internal_Phdr *i_phdrs, *last_phdr;
+  Elf_External_Shdr *x_shdr_shstrtab;
+  Elf_Internal_Shdr *i_shdr_shstrtab;
   bfd *nbfd;
   struct bfd_in_memory *bim;
   int contents_size;
@@ -1746,19 +1748,49 @@ NAME(_bfd_elf,bfd_from_remote_memory)
 
   /* Trim the last segment so we don't bother with zeros in the last page
      that are off the end of the file.  However, if the extra bit in that
-     page includes the section headers, keep them.  */
-  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz
-      && (bfd_vma) contents_size >= (i_ehdr.e_shoff
-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-    {
-      contents_size = last_phdr->p_offset + last_phdr->p_filesz;
-      if ((bfd_vma) contents_size < (i_ehdr.e_shoff
-				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-	contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
-    }
-  else
+     page includes the section headers os the section header string table,
+     keep them.  */
+  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz)
     contents_size = last_phdr->p_offset + last_phdr->p_filesz;
 
+  if ((bfd_vma) contents_size < i_ehdr.e_shoff
+				+ i_ehdr.e_shnum * i_ehdr.e_shentsize)
+    contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
+
+  /* Section header string table is usually before the section headers
+     so this check is here has usually no effect.  */
+  if (i_ehdr.e_shstrndx < i_ehdr.e_shnum)
+    {
+      x_shdr_shstrtab = bfd_malloc (sizeof *x_shdr_shstrtab
+				    + sizeof *i_shdr_shstrtab);
+      if (x_shdr_shstrtab == NULL)
+	{
+	  free (x_phdrs);
+	  bfd_set_error (bfd_error_no_memory);
+	  return NULL;
+	}
+      err = target_read_memory (ehdr_vma + i_ehdr.e_shoff
+				+ i_ehdr.e_shstrndx * sizeof *x_shdr_shstrtab,
+				(bfd_byte *) x_shdr_shstrtab,
+				sizeof *x_shdr_shstrtab);
+      if (err)
+	{
+	  free (x_shdr_shstrtab);
+	  free (x_phdrs);
+	  bfd_set_error (bfd_error_system_call);
+	  errno = err;
+	  return NULL;
+	}
+      i_shdr_shstrtab = (Elf_Internal_Shdr *) &x_shdr_shstrtab[1];
+      elf_swap_shdr_in (templ, x_shdr_shstrtab, i_shdr_shstrtab);
+
+      if ((bfd_vma) contents_size < i_shdr_shstrtab->sh_offset
+				    + i_shdr_shstrtab->sh_size)
+        contents_size = i_shdr_shstrtab->sh_offset + i_shdr_shstrtab->sh_size;
+
+      free (x_shdr_shstrtab);
+    }
+
   /* Now we know the size of the whole image we want read in.  */
   contents = bfd_zmalloc (contents_size);
   if (contents == NULL)

gdb-6.6-bz233852-attach-signalled.patch:

Index: gdb-6.6-bz233852-attach-signalled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz233852-attach-signalled.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.6-bz233852-attach-signalled.patch	22 Sep 2007 15:56:10 -0000	1.3
+++ gdb-6.6-bz233852-attach-signalled.patch	23 Sep 2007 15:42:37 -0000	1.4
@@ -684,7 +684,7 @@
 +}
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ ./gdb/testsuite/gdb.threads/attach-stopped.exp	29 Jun 2007 22:06:06 -0000
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,219 @@
 +# Copyright 2005-2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -792,10 +792,13 @@
 +    # Avoid some race:
 +    sleep 2
 +
-+    set fileid [open /proc/${testpid}/status r];
-+    gets $fileid line1;
-+    gets $fileid line2;
-+    close $fileid;
++    if [catch {open /proc/${testpid}/status r} fileid] {
++	set line2 "NOTFOUND"
++    } else {
++	gets $fileid line1;
++	gets $fileid line2;
++	close $fileid;
++    }
 +
 +    set test "$threadtype: attach1, exit leaves process stopped"
 +    if {[string match "*(stopped)*" $line2]} {
@@ -861,10 +864,13 @@
 +
 +    # At this point, the process should be sleeping
 +
-+    set fileid2 [open /proc/${testpid}/status r];
-+    gets $fileid2 line1;
-+    gets $fileid2 line2;
-+    close $fileid2;
++    if [catch {open /proc/${testpid}/status r} fileid2] {
++	set line2 "NOTFOUND"
++    } else {
++	gets $fileid2 line1;
++	gets $fileid2 line2;
++	close $fileid2;
++    }
 +
 +    set test "$threadtype: attach2, exit leaves process sleeping"
 +    if {[string match "*(sleeping)*" $line2]} {


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gdb.spec	22 Sep 2007 15:56:10 -0000	1.245
+++ gdb.spec	23 Sep 2007 15:42:37 -0000	1.246
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 28%{?dist}
+Release: 29%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -374,6 +374,9 @@
 Patch273: gdb-6.6-buildid-verify.patch
 Patch274: gdb-6.6-buildid-locate.patch
 
+# Fixed the kernel VDSO loading (producing `no loadable sections found').
+Patch276: gdb-6.6-bfd-vdso8k.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils expat-devel
 Requires: readline
@@ -529,6 +532,7 @@
 %patch272 -p1
 %patch273 -p1
 %patch274 -p1
+%patch276 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -683,6 +687,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
+- Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
+- Fix the testcase for pending signals (from BZ 233852).
+
 * Sat Sep 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-28
 - Support also the `$allocate' and `$delete' ctor/dtor variants (BZ 301701).
 - Fix the build compatibility with texinfo >= 4.10.



From fedora-extras-commits at redhat.com  Sun Sep 23 16:54:34 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Sun, 23 Sep 2007 12:54:34 -0400
Subject: rpms/xen/F-7 xen-clobber-vif-type.patch, NONE, 1.1 xen.spec, 1.181, 
	1.182
Message-ID: <200709231654.l8NGsYwa014009@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13981

Modified Files:
	xen.spec 
Added Files:
	xen-clobber-vif-type.patch 
Log Message:
Fix case of disappearing network card

xen-clobber-vif-type.patch:

--- NEW FILE xen-clobber-vif-type.patch ---
diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/netif.py	2007-09-19 14:24:34.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/netif.py	2007-09-19 14:25:28.000000000 -0400
@@ -108,17 +108,15 @@ class NetifController(DevController):
         ipaddr  = config.get('ip')
         model   = config.get('model')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             mac = randomMAC()
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge:


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- xen.spec	1 Aug 2007 13:28:48 -0000	1.181
+++ xen.spec	23 Sep 2007 16:53:56 -0000	1.182
@@ -24,6 +24,7 @@
 Patch28: xen-keyboard.patch
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
+Patch31: xen-clobber-vif-type.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -120,6 +121,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # config patches
 %patch100 -p1
@@ -268,7 +270,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com> - 3.1.0-3.fc7
+* Sun Sep 23 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-3.fc7
+- Don't clobber the VIF type attribute in FV guests (rhbz #247122)
+
+* Wed Aug  1 2007 Markus Armbruster <armbru at redhat.com>
 - Put guest's native protocol ABI into xenstore, to provide for older
   kernels running 32-on-64.
 - VNC keymap fixes



From fedora-extras-commits at redhat.com  Sun Sep 23 18:41:28 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 14:41:28 -0400
Subject: rpms/blender/devel .cvsignore, 1.10, 1.11 blender.desktop, 1.2,
	1.3 blender.spec, 1.62, 1.63 sources, 1.12, 1.13
Message-ID: <200709231841.l8NIfShx029982@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29940

Modified Files:
	.cvsignore blender.desktop blender.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 May 2007 20:28:00 -0000	1.10
+++ .cvsignore	23 Sep 2007 18:40:55 -0000	1.11
@@ -1 +1 @@
-blender-2.44-noffmpeg.tar.gz
+blender-2.45-noffmpeg.tar.gz


Index: blender.desktop
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blender.desktop	8 Nov 2004 04:08:05 -0000	1.2
+++ blender.desktop	23 Sep 2007 18:40:55 -0000	1.3
@@ -7,4 +7,4 @@
 Terminal=false
 Type=Application
 Categories=Graphics;Application;
-MimeType=application/x-blender
+MimeType=application/x-blender;


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- blender.spec	9 Aug 2007 16:39:03 -0000	1.62
+++ blender.spec	23 Sep 2007 18:40:55 -0000	1.63
@@ -3,8 +3,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
-Version:        2.44
-Release: 	8%{?dist}
+Version:        2.45
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -112,6 +112,7 @@
 pushd bin/.blender/locale
 mv pt_br pt_BR
 mv zh_cn uh_CN
+rm -rf $(find -name '.svn' -print)
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -149,7 +150,6 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -171,6 +171,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Sep 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-8
 - Fix koji-python issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 20:28:00 -0000	1.12
+++ sources	23 Sep 2007 18:40:55 -0000	1.13
@@ -1 +1 @@
-c078195e1563bb95b7b228f3f679c48d  blender-2.44-noffmpeg.tar.gz
+2f88b8a5860f6919bd72dc9946a55f3b  blender-2.45-noffmpeg.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 19:14:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 15:14:07 -0400
Subject: rpms/blender/F-7 blender.spec,1.58,1.59 sources,1.12,1.13
Message-ID: <200709231914.l8NJE7SW004587@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4556

Modified Files:
	blender.spec sources 
Log Message:
New upstream release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- blender.spec	12 Aug 2007 18:32:50 -0000	1.58
+++ blender.spec	23 Sep 2007 19:13:35 -0000	1.59
@@ -3,8 +3,8 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
-Version:        2.44
-Release: 	5%{?dist}
+Version:        2.45
+Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -111,6 +111,7 @@
 pushd bin/.blender/locale
 mv pt_br pt_BR
 mv zh_cn uh_CN
+rm -rf $(find -name '.svn' -print)
 popd
 
 cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
@@ -170,6 +171,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
+- New upstream release
+
 * Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-5
 - Changing license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 May 2007 20:36:33 -0000	1.12
+++ sources	23 Sep 2007 19:13:35 -0000	1.13
@@ -1 +1 @@
-c078195e1563bb95b7b228f3f679c48d  blender-2.44-noffmpeg.tar.gz
+2f88b8a5860f6919bd72dc9946a55f3b  blender-2.45-noffmpeg.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 19:56:49 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 15:56:49 -0400
Subject: rpms/blender/devel blender.spec,1.63,1.64
Message-ID: <200709231956.l8NJunXj005404@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384

Modified Files:
	blender.spec 
Log Message:
Change method how to determinate python version


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- blender.spec	23 Sep 2007 18:40:55 -0000	1.63
+++ blender.spec	23 Sep 2007 19:56:16 -0000	1.64
@@ -1,10 +1,9 @@
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
-%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
 Version:        2.45
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -71,7 +70,9 @@
 %patch1 -p1 -b .org
 %patch2 -p1 -b .bid
 
-sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
+
+sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
 %build
@@ -171,6 +172,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
+- Change method how to determinate python version
+
 * Thu Sep 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 20:13:14 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 23 Sep 2007 16:13:14 -0400
Subject: rpms/blender/F-7 blender.spec,1.59,1.60
Message-ID: <200709232013.l8NKDElX011875@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11844

Modified Files:
	blender.spec 
Log Message:
Change method how to determinate python version


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- blender.spec	23 Sep 2007 19:13:35 -0000	1.59
+++ blender.spec	23 Sep 2007 20:12:41 -0000	1.60
@@ -1,10 +1,9 @@
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
-%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           blender
 Version:        2.45
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -70,7 +69,9 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .org
-sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+
+PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
+sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
 %build
@@ -171,6 +172,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
+- Change method how to determinate python version
+
 * Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Sep 23 20:28:05 2007
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Sun, 23 Sep 2007 16:28:05 -0400
Subject: rpms/m2crypto/devel m2crypto-0.18-proxy.patch, NONE,
	1.1 m2crypto.spec, 1.35, 1.36
Message-ID: <200709232028.l8NKS5Vq012160@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12139

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.18-proxy.patch 
Log Message:
* Sun Sep 23 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-2
- Add missing Host: header to CONNECT requests (patch by Karl Grindley)
  Resolves: #239034
- Fix License:


m2crypto-0.18-proxy.patch:

--- NEW FILE m2crypto-0.18-proxy.patch ---
Patch by Karl Grindley <kgrindley at ll.mit.edu>

Index: M2Crypto/httpslib.py
===================================================================
--- M2Crypto/httpslib.py	(revision 581)
+++ M2Crypto/httpslib.py	(working copy)
@@ -172,6 +172,7 @@
     def _get_connect_msg(self):
         """ Return an HTTP CONNECT request to send to the proxy. """
         msg = "CONNECT %s:%d HTTP/1.1\r\n" % (self._real_host, self._real_port)
+        msg = msg + "Host: %s:%d\r\n" % (self._real_host, self._real_port)
         if self._proxy_auth:
             msg = msg + "%s: %s\r\n" % (self._AUTH_HEADER, self._proxy_auth) 
         msg = msg + "\r\n"


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- m2crypto.spec	31 Jul 2007 22:25:52 -0000	1.35
+++ m2crypto.spec	23 Sep 2007 20:27:32 -0000	1.36
@@ -6,10 +6,11 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.18
-Release: 1
+Release: 2
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.18-timeouts.patch
-License: BSDish
+Patch1: m2crypto-0.18-proxy.patch
+License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -74,6 +76,11 @@
 %{python_sitearch}/M2Crypto
 
 %changelog
+* Sun Sep 23 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-2
+- Add missing Host: header to CONNECT requests (patch by Karl Grindley)
+  Resolves: #239034
+- Fix License:
+
 * Wed Aug  1 2007 Miloslav Trma?? <mitr at redhat.com> - 0.18-1
 - Update to m2crypto-0.18
 



From fedora-extras-commits at redhat.com  Sun Sep 23 22:33:55 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 23 Sep 2007 18:33:55 -0400
Subject: rpms/gqview/devel gqview-2.0.0-editors.patch, 1.1, 1.2 gqview.spec, 
	1.16, 1.17
Message-ID: <200709232233.l8NMXtxf000791@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv761

Modified Files:
	gqview-2.0.0-editors.patch gqview.spec 
Log Message:
* Sun Sep 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4-5
- update patch: gimp-remote doesn't know option -n anymore


gqview-2.0.0-editors.patch:

Index: gqview-2.0.0-editors.patch
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview-2.0.0-editors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gqview-2.0.0-editors.patch	26 Feb 2005 23:00:44 -0000	1.1
+++ gqview-2.0.0-editors.patch	23 Sep 2007 22:33:52 -0000	1.2
@@ -4,7 +4,7 @@
 @@ -48,8 +48,8 @@
  
  static gchar *editor_slot_defaults[] = {
- 	N_("The Gimp"), "gimp-remote -n %f",
+ 	N_("The Gimp"), "gimp-remote %f",
 -	N_("XV"), "xv %f",
 -	N_("Xpaint"), "xpaint %f",
 +	NULL, NULL,


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gqview.spec	21 Aug 2007 17:01:32 -0000	1.16
+++ gqview.spec	23 Sep 2007 22:33:52 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Image browser and viewer
 Name:		gqview
 Version:	2.0.4
-Release: 4
+Release: 5
 License:	GPLv2
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4-5
+- update patch: gimp-remote doesn't know option -n anymore
+
 * Tue Aug 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Sep 23 22:52:23 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 23 Sep 2007 18:52:23 -0400
Subject: rpms/gqview/devel gqview-2.0.4-editors.patch, NONE, 1.1 gqview.spec,
	1.17, 1.18 gqview-2.0.0-editors.patch, 1.2, NONE
Message-ID: <200709232252.l8NMqNCS001242@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1217

Modified Files:
	gqview.spec 
Added Files:
	gqview-2.0.4-editors.patch 
Removed Files:
	gqview-2.0.0-editors.patch 
Log Message:
fix the -editors patch

gqview-2.0.4-editors.patch:

--- NEW FILE gqview-2.0.4-editors.patch ---
diff -Nur gqview-2.0.4-orig/src/editors.c gqview-2.0.4/src/editors.c
--- gqview-2.0.4-orig/src/editors.c	2005-06-13 23:58:04.000000000 +0200
+++ gqview-2.0.4/src/editors.c	2007-09-24 00:51:29.000000000 +0200
@@ -47,9 +47,9 @@
 
 
 static gchar *editor_slot_defaults[] = {
-	N_("The Gimp"), "gimp-remote -n %f",
-	N_("XV"), "xv %f",
-	N_("Xpaint"), "xpaint %f",
+	N_("The Gimp"), "gimp-remote %f",
+	NULL, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gqview.spec	23 Sep 2007 22:33:52 -0000	1.17
+++ gqview.spec	23 Sep 2007 22:51:48 -0000	1.18
@@ -6,7 +6,7 @@
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
 Patch1:		gqview-2.0.3-desktop.patch
-Patch2:		gqview-2.0.0-editors.patch
+Patch2:		gqview-2.0.4-editors.patch
 Patch3:     gqview-2.0.4-print-pagesize.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/


--- gqview-2.0.0-editors.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 23 23:21:14 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Sun, 23 Sep 2007 19:21:14 -0400
Subject: rpms/gstreamer-plugins-pulse/devel .cvsignore, 1.4,
	1.5 gstreamer-plugins-pulse.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200709232321.l8NNLEHs007857@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7830

Modified Files:
	.cvsignore gstreamer-plugins-pulse.spec sources 
Log Message:
update svn snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2007 01:52:59 -0000	1.4
+++ .cvsignore	23 Sep 2007 23:20:39 -0000	1.5
@@ -1 +1 @@
-gst-pulse-0.9.5.svn20070816.tar.gz
+gst-pulse-0.9.5.svn20070924.tar.gz


Index: gstreamer-plugins-pulse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/gstreamer-plugins-pulse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-plugins-pulse.spec	16 Aug 2007 01:52:59 -0000	1.4
+++ gstreamer-plugins-pulse.spec	23 Sep 2007 23:20:39 -0000	1.5
@@ -3,19 +3,19 @@
 
 Name:           gstreamer-plugins-pulse
 Version:        0.9.5
-Release:        0.3.svn20070816%{?dist}
+Release:        0.4.svn20070924%{?dist}
 Summary:        GStreamer 0.10 plugin for the PulseAudio sound server
 Group:          Applications/Multimedia
 License:        LGPL
 URL:            http://0pointer.de/lennart/projects/gst-pulse/
 #Source0: http://0pointer.de/lennart/projects/gst-pulse/%{upstream}-%{version}.tar.gz
-Source0:        gst-pulse-0.9.5.svn20070816.tar.gz
+Source0:        gst-pulse-0.9.5.svn20070924.tar.gz
 Source1:        gstreamer-plugins-pulse-README.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  lynx
-BuildRequires:  pulseaudio-devel
+BuildRequires:  pulseaudio-lib-devel
 
 %description
 %{name} is a GStreamer 0.10 plugin for the PulseAudio sound
@@ -29,29 +29,29 @@
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 # to overcome problem with libtool on Linux
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-, root, root, -)
 %doc LICENSE README README.Fedora
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse*
 
 %changelog
+* Mon Sep 24 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.4.svn20070924
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.3.svn20070816
-. Update SVN snapshot
+- Update SVN snapshot
 
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.2.svn20070816
-. Update SVN snapshot
+- Update SVN snapshot
 
 * Tue Aug 14 2007 Lennart Poettering <lpoetter at redhat.com> - 0.9.5-0.1.svn20070814
 . get SVN snapshot. increase rank to get advantage over alsa


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-pulse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2007 01:52:59 -0000	1.4
+++ sources	23 Sep 2007 23:20:39 -0000	1.5
@@ -1 +1 @@
-3422d29c61c440cbabb93eb7753da962  gst-pulse-0.9.5.svn20070816.tar.gz
+11d838d0287e63e371e448c68d82765c  gst-pulse-0.9.5.svn20070924.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 23 23:47:33 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Sun, 23 Sep 2007 19:47:33 -0400
Subject: rpms/alsa-plugins/devel 1.0.14-buffer-attr.patch, NONE,
	1.1 alsa-plugins.spec, 1.2, 1.3
Message-ID: <200709232347.l8NNlXsq008578@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8545

Modified Files:
	alsa-plugins.spec 
Added Files:
	1.0.14-buffer-attr.patch 
Log Message:
change PulseAudio buffering metrics to saner defaults

1.0.14-buffer-attr.patch:

--- NEW FILE 1.0.14-buffer-attr.patch ---
--- alsa-plugins-1.0.14/pulse/pcm_pulse.c	2007-05-31 10:06:51.000000000 +0200
+++ alsa-plugins-1.0.14.lennart/pulse/pcm_pulse.c	2007-09-24 01:43:01.000000000 +0200
@@ -57,7 +57,7 @@
 
     if (size > pcm->last_size) {
         pcm->ptr += size - pcm->last_size;
-        pcm->ptr %= pcm->buffer_attr.maxlength;
+        pcm->ptr %= pcm->buffer_attr.tlength;
     }
 
     pcm->last_size = size;
@@ -533,9 +533,9 @@
     pcm->ss.rate = io->rate;
     pcm->ss.channels = io->channels;
 
-    pcm->buffer_attr.maxlength = io->buffer_size * pcm->frame_size;
+    pcm->buffer_attr.maxlength = (io->buffer_size*3)/2 * pcm->frame_size;
     pcm->buffer_attr.tlength = io->buffer_size * pcm->frame_size;
-    pcm->buffer_attr.prebuf = io->period_size * pcm->frame_size;
+    pcm->buffer_attr.prebuf = (io->buffer_size-io->period_size) * pcm->frame_size;
     pcm->buffer_attr.minreq = io->period_size * pcm->frame_size;
     pcm->buffer_attr.fragsize = io->period_size * pcm->frame_size;
 


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-plugins.spec	15 Aug 2007 04:36:18 -0000	1.2
+++ alsa-plugins.spec	23 Sep 2007 23:47:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.14
-Release:        2%{?dist}
+Release:        3%{?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+
@@ -13,6 +13,7 @@
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
+Patch0:		1.0.14-buffer-attr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -93,6 +94,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .buffer_attr
 
 %build
 %configure --disable-static \
@@ -160,6 +162,9 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Mon Sep 24 2007 Lennart Poettering <lpoetter at redhat.com> - 1.0.14-3
+- Change PulseAudio buffering defaults to more sane values
+
 * Tue Aug 14 2007 Eric Moret <eric.moret at epita.fr> - 1.0.14-2
 - Adding pulse as ALSA "default" pcm and ctl when the alsa-plugins-pulseaudio
 package is installed, fixing #251943.



From fedora-extras-commits at redhat.com  Mon Sep 24 01:41:41 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 23 Sep 2007 21:41:41 -0400
Subject: rpms/vinagre/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vinagre.spec, 1.1, 1.2
Message-ID: <200709240141.l8O1ffte022924@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22876

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
- Update to 0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Aug 2007 13:37:13 -0000	1.2
+++ .cvsignore	24 Sep 2007 01:41:09 -0000	1.3
@@ -1 +1 @@
-vinagre-0.2.tar.gz
+vinagre-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Aug 2007 13:37:13 -0000	1.2
+++ sources	24 Sep 2007 01:41:09 -0000	1.3
@@ -1 +1 @@
-b1a25422b0f5a7a7a325cf05d008dc6c  vinagre-0.2.tar.gz
+c3f64d488d35b35806771f8db2c22ea7  vinagre-0.3.tar.gz


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vinagre.spec	22 Aug 2007 13:37:13 -0000	1.1
+++ vinagre.spec	24 Sep 2007 01:41:09 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	0.2
+Version:	0.3
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
@@ -61,6 +61,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3-1
+- Update to 0.3
+
 * Wed Aug 22 2007 - Bastien Nocera <bnocera at redhat.com> - 0.2-1
 - First version
 - Fix plenty of comments from Ray Strode as per review



From fedora-extras-commits at redhat.com  Mon Sep 24 02:26:53 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sun, 23 Sep 2007 22:26:53 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.691, 1.692 kernel.spec, 1.178,
	1.179 linux-2.6-highres-timers.patch, 1.10, 1.11 sources, 1.653,
	1.654 upstream, 1.575,
	1.576 linux-2.6-xfs-fix-filestreams-free-func-cast.patch, 1.1,
	NONE patch-2.6.23-rc7-git3.bz2.sign, 1.1, NONE
Message-ID: <200709240226.l8O2QrqU029934@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29852

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	patch-2.6.23-rc7-git4.bz2.sign 
Removed Files:
	linux-2.6-xfs-fix-filestreams-free-func-cast.patch 
	patch-2.6.23-rc7-git3.bz2.sign 
Log Message:
* Sun Sep 23 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7-git4



--- NEW FILE patch-2.6.23-rc7-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG9g+pyGugalF9Dw4RAkPqAJ4lgVRIQytu/RlILy7STDLHnL/OtACdHmxD
Wmlvj0dlAuoOkQJbe2bOQmY=
=PWzh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- .cvsignore	22 Sep 2007 11:45:40 -0000	1.691
+++ .cvsignore	24 Sep 2007 02:26:20 -0000	1.692
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git3.bz2
+patch-2.6.23-rc7-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kernel.spec	22 Sep 2007 11:45:40 -0000	1.178
+++ kernel.spec	24 Sep 2007 02:26:20 -0000	1.179
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -665,7 +665,6 @@
 Patch1503: linux-2.6-xfs-optimize-away-dmapi-tests.patch
 Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch
 Patch1505: linux-2.6-xfs-refactor-xfs_mountfs.patch
-Patch1506: linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
@@ -1177,7 +1176,6 @@
 ApplyPatch linux-2.6-xfs-optimize-away-dmapi-tests.patch
 ApplyPatch linux-2.6-xfs-optimize-away-realtime-tests.patch
 ApplyPatch linux-2.6-xfs-refactor-xfs_mountfs.patch
-ApplyPatch linux-2.6-xfs-fix-filestreams-free-func-cast.patch
 ApplyPatch linux-2.6-xfs-setfattr-32bit-compat.patch
 
 #
@@ -1804,6 +1802,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7-git4
+
 * Sat Sep 22 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc7-git3
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-highres-timers.patch	22 Sep 2007 11:45:40 -0000	1.10
+++ linux-2.6-highres-timers.patch	24 Sep 2007 02:26:20 -0000	1.11
@@ -587,411 +587,6 @@
  }
  
  #else
-@@ -245,404 +245,6 @@ static void acpi_state_timer_broadcast(s
- 
- #endif
- 
--static void acpi_processor_idle(void)
--{
--	struct acpi_processor *pr = NULL;
--	struct acpi_processor_cx *cx = NULL;
--	struct acpi_processor_cx *next_state = NULL;
--	int sleep_ticks = 0;
--	u32 t1, t2 = 0;
--
--	/*
--	 * Interrupts must be disabled during bus mastering calculations and
--	 * for C2/C3 transitions.
--	 */
--	local_irq_disable();
--
--	pr = processors[smp_processor_id()];
--	if (!pr) {
--		local_irq_enable();
--		return;
--	}
--
--	/*
--	 * Check whether we truly need to go idle, or should
--	 * reschedule:
--	 */
--	if (unlikely(need_resched())) {
--		local_irq_enable();
--		return;
--	}
--
--	cx = pr->power.state;
--	if (!cx) {
--		if (pm_idle_save)
--			pm_idle_save();
--		else
--			acpi_safe_halt();
--		return;
--	}
--
--	/*
--	 * Check BM Activity
--	 * -----------------
--	 * Check for bus mastering activity (if required), record, and check
--	 * for demotion.
--	 */
--	if (pr->flags.bm_check) {
--		u32 bm_status = 0;
--		unsigned long diff = jiffies - pr->power.bm_check_timestamp;
--
--		if (diff > 31)
--			diff = 31;
--
--		pr->power.bm_activity <<= diff;
--
--		acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
--		if (bm_status) {
--			pr->power.bm_activity |= 0x1;
--			acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
--		}
--		/*
--		 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
--		 * the true state of bus mastering activity; forcing us to
--		 * manually check the BMIDEA bit of each IDE channel.
--		 */
--		else if (errata.piix4.bmisx) {
--			if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
--			    || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
--				pr->power.bm_activity |= 0x1;
--		}
--
--		pr->power.bm_check_timestamp = jiffies;
--
--		/*
--		 * If bus mastering is or was active this jiffy, demote
--		 * to avoid a faulty transition.  Note that the processor
--		 * won't enter a low-power state during this call (to this
--		 * function) but should upon the next.
--		 *
--		 * TBD: A better policy might be to fallback to the demotion
--		 *      state (use it for this quantum only) istead of
--		 *      demoting -- and rely on duration as our sole demotion
--		 *      qualification.  This may, however, introduce DMA
--		 *      issues (e.g. floppy DMA transfer overrun/underrun).
--		 */
--		if ((pr->power.bm_activity & 0x1) &&
--		    cx->demotion.threshold.bm) {
--			local_irq_enable();
--			next_state = cx->demotion.state;
--			goto end;
--		}
--	}
--
--#ifdef CONFIG_HOTPLUG_CPU
--	/*
--	 * Check for P_LVL2_UP flag before entering C2 and above on
--	 * an SMP system. We do it here instead of doing it at _CST/P_LVL
--	 * detection phase, to work cleanly with logical CPU hotplug.
--	 */
--	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
--	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
--		cx = &pr->power.states[ACPI_STATE_C1];
--#endif
--
--	/*
--	 * Sleep:
--	 * ------
--	 * Invoke the current Cx state to put the processor to sleep.
--	 */
--	if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
--		current_thread_info()->status &= ~TS_POLLING;
--		/*
--		 * TS_POLLING-cleared state must be visible before we
--		 * test NEED_RESCHED:
--		 */
--		smp_mb();
--		if (need_resched()) {
--			current_thread_info()->status |= TS_POLLING;
--			local_irq_enable();
--			return;
--		}
--	}
--
--	switch (cx->type) {
--
--	case ACPI_STATE_C1:
--		/*
--		 * Invoke C1.
--		 * Use the appropriate idle routine, the one that would
--		 * be used without acpi C-states.
--		 */
--		if (pm_idle_save)
--			pm_idle_save();
--		else
--			acpi_safe_halt();
--
--		/*
--		 * TBD: Can't get time duration while in C1, as resumes
--		 *      go to an ISR rather than here.  Need to instrument
--		 *      base interrupt handler.
--		 *
--		 * Note: the TSC better not stop in C1, sched_clock() will
--		 *       skew otherwise.
--		 */
--		sleep_ticks = 0xFFFFFFFF;
--		break;
--
--	case ACPI_STATE_C2:
--		/* Get start time (ticks) */
--		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		/* Tell the scheduler that we are going deep-idle: */
--		sched_clock_idle_sleep_event();
--		/* Invoke C2 */
--		acpi_state_timer_broadcast(pr, cx, 1);
--		acpi_cstate_enter(cx);
--		/* Get end time (ticks) */
--		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--
--#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
--		/* TSC halts in C2, so notify users */
--		mark_tsc_unstable("possible TSC halt in C2");
--#endif
--		/* Compute time (ticks) that we were actually asleep */
--		sleep_ticks = ticks_elapsed(t1, t2);
--
--		/* Tell the scheduler how much we idled: */
--		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
--
--		/* Re-enable interrupts */
--		local_irq_enable();
--		/* Do not account our idle-switching overhead: */
--		sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
--
--		current_thread_info()->status |= TS_POLLING;
--		acpi_state_timer_broadcast(pr, cx, 0);
--		break;
--
--	case ACPI_STATE_C3:
--		/*
--		 * disable bus master
--		 * bm_check implies we need ARB_DIS
--		 * !bm_check implies we need cache flush
--		 * bm_control implies whether we can do ARB_DIS
--		 *
--		 * That leaves a case where bm_check is set and bm_control is
--		 * not set. In that case we cannot do much, we enter C3
--		 * without doing anything.
--		 */
--		if (pr->flags.bm_check && pr->flags.bm_control) {
--			if (atomic_inc_return(&c3_cpu_count) ==
--			    num_online_cpus()) {
--				/*
--				 * All CPUs are trying to go to C3
--				 * Disable bus master arbitration
--				 */
--				acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
--			}
--		} else if (!pr->flags.bm_check) {
--			/* SMP with no shared cache... Invalidate cache  */
--			ACPI_FLUSH_CPU_CACHE();
--		}
--
--		/* Get start time (ticks) */
--		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		/* Invoke C3 */
--		acpi_state_timer_broadcast(pr, cx, 1);
--		/* Tell the scheduler that we are going deep-idle: */
--		sched_clock_idle_sleep_event();
--		acpi_cstate_enter(cx);
--		/* Get end time (ticks) */
--		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
--		if (pr->flags.bm_check && pr->flags.bm_control) {
--			/* Enable bus master arbitration */
--			atomic_dec(&c3_cpu_count);
--			acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
--		}
--
--#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
--		/* TSC halts in C3, so notify users */
--		mark_tsc_unstable("TSC halts in C3");
--#endif
--		/* Compute time (ticks) that we were actually asleep */
--		sleep_ticks = ticks_elapsed(t1, t2);
--		/* Tell the scheduler how much we idled: */
--		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
--
--		/* Re-enable interrupts */
--		local_irq_enable();
--		/* Do not account our idle-switching overhead: */
--		sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
--
--		current_thread_info()->status |= TS_POLLING;
--		acpi_state_timer_broadcast(pr, cx, 0);
--		break;
--
--	default:
--		local_irq_enable();
--		return;
--	}
--	cx->usage++;
--	if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
--		cx->time += sleep_ticks;
--
--	next_state = pr->power.state;
--
--#ifdef CONFIG_HOTPLUG_CPU
--	/* Don't do promotion/demotion */
--	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
--	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
--		next_state = cx;
--		goto end;
--	}
--#endif
--
--	/*
--	 * Promotion?
--	 * ----------
--	 * Track the number of longs (time asleep is greater than threshold)
--	 * and promote when the count threshold is reached.  Note that bus
--	 * mastering activity may prevent promotions.
--	 * Do not promote above max_cstate.
--	 */
--	if (cx->promotion.state &&
--	    ((cx->promotion.state - pr->power.states) <= max_cstate)) {
--		if (sleep_ticks > cx->promotion.threshold.ticks &&
--		  cx->promotion.state->latency <= system_latency_constraint()) {
--			cx->promotion.count++;
--			cx->demotion.count = 0;
--			if (cx->promotion.count >=
--			    cx->promotion.threshold.count) {
--				if (pr->flags.bm_check) {
--					if (!
--					    (pr->power.bm_activity & cx->
--					     promotion.threshold.bm)) {
--						next_state =
--						    cx->promotion.state;
--						goto end;
--					}
--				} else {
--					next_state = cx->promotion.state;
--					goto end;
--				}
--			}
--		}
--	}
--
--	/*
--	 * Demotion?
--	 * ---------
--	 * Track the number of shorts (time asleep is less than time threshold)
--	 * and demote when the usage threshold is reached.
--	 */
--	if (cx->demotion.state) {
--		if (sleep_ticks < cx->demotion.threshold.ticks) {
--			cx->demotion.count++;
--			cx->promotion.count = 0;
--			if (cx->demotion.count >= cx->demotion.threshold.count) {
--				next_state = cx->demotion.state;
--				goto end;
--			}
--		}
--	}
--
--      end:
--	/*
--	 * Demote if current state exceeds max_cstate
--	 * or if the latency of the current state is unacceptable
--	 */
--	if ((pr->power.state - pr->power.states) > max_cstate ||
--		pr->power.state->latency > system_latency_constraint()) {
--		if (cx->demotion.state)
--			next_state = cx->demotion.state;
--	}
--
--	/*
--	 * New Cx State?
--	 * -------------
--	 * If we're going to start using a new Cx state we must clean up
--	 * from the previous and prepare to use the new.
--	 */
--	if (next_state != pr->power.state)
--		acpi_processor_power_activate(pr, next_state);
--}
--
--static int acpi_processor_set_power_policy(struct acpi_processor *pr)
--{
--	unsigned int i;
--	unsigned int state_is_set = 0;
--	struct acpi_processor_cx *lower = NULL;
--	struct acpi_processor_cx *higher = NULL;
--	struct acpi_processor_cx *cx;
--
--
--	if (!pr)
--		return -EINVAL;
--
--	/*
--	 * This function sets the default Cx state policy (OS idle handler).
--	 * Our scheme is to promote quickly to C2 but more conservatively
--	 * to C3.  We're favoring C2  for its characteristics of low latency
--	 * (quick response), good power savings, and ability to allow bus
--	 * mastering activity.  Note that the Cx state policy is completely
--	 * customizable and can be altered dynamically.
--	 */
--
--	/* startup state */
--	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (!state_is_set)
--			pr->power.state = cx;
--		state_is_set++;
--		break;
--	}
--
--	if (!state_is_set)
--		return -ENODEV;
--
--	/* demotion */
--	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (lower) {
--			cx->demotion.state = lower;
--			cx->demotion.threshold.ticks = cx->latency_ticks;
--			cx->demotion.threshold.count = 1;
--			if (cx->type == ACPI_STATE_C3)
--				cx->demotion.threshold.bm = bm_history;
--		}
--
--		lower = cx;
--	}
--
--	/* promotion */
--	for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
--		cx = &pr->power.states[i];
--		if (!cx->valid)
--			continue;
--
--		if (higher) {
--			cx->promotion.state = higher;
--			cx->promotion.threshold.ticks = cx->latency_ticks;
--			if (cx->type >= ACPI_STATE_C2)
--				cx->promotion.threshold.count = 4;
--			else
--				cx->promotion.threshold.count = 10;
--			if (higher->type == ACPI_STATE_C3)
--				cx->promotion.threshold.bm = bm_history;
--		}
--
--		higher = cx;
--	}
--
--	return 0;
--}
--
- static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
- {
- 
 @@ -922,7 +457,7 @@ static void acpi_processor_power_verify_
  	 * Normalize the C2 latency to expidite policy
  	 */
@@ -1467,20 +1062,427 @@
 +		count++;
  	}
  
-+	if (!count)
-+		return -EINVAL;
-+
-+	dev->state_count = count;
- 	return 0;
- }
-+
-+struct cpuidle_driver acpi_idle_driver = {
-+	.name =		"acpi_idle",
-+	.init =		acpi_idle_init,
-+	.redetect =	acpi_idle_init,
-+	.bm_check =	acpi_idle_bm_check,
-+	.owner =	THIS_MODULE,
-+};
++	if (!count)
++		return -EINVAL;
++
++	dev->state_count = count;
+ 	return 0;
+ }
++
++struct cpuidle_driver acpi_idle_driver = {
++	.name =		"acpi_idle",
++	.init =		acpi_idle_init,
++	.redetect =	acpi_idle_init,
++	.bm_check =	acpi_idle_bm_check,
++	.owner =	THIS_MODULE,
++};
+--- linux-2.6.22.noarch/drivers/acpi/processor_idle.c~	2007-09-23 22:22:11.000000000 -0400
++++ linux-2.6.22.noarch/drivers/acpi/processor_idle.c	2007-09-23 22:22:52.000000000 -0400
+@@ -260,404 +260,6 @@ int acpi_processor_resume(struct acpi_de
+ 	return 0;
+ }
+ 
+-static void acpi_processor_idle(void)
+-{
+-	struct acpi_processor *pr = NULL;
+-	struct acpi_processor_cx *cx = NULL;
+-	struct acpi_processor_cx *next_state = NULL;
+-	int sleep_ticks = 0;
+-	u32 t1, t2 = 0;
+-
+-	/*
+-	 * Interrupts must be disabled during bus mastering calculations and
+-	 * for C2/C3 transitions.
+-	 */
+-	local_irq_disable();
+-
+-	pr = processors[smp_processor_id()];
+-	if (!pr) {
+-		local_irq_enable();
+-		return;
+-	}
+-
+-	/*
+-	 * Check whether we truly need to go idle, or should
+-	 * reschedule:
+-	 */
+-	if (unlikely(need_resched())) {
+-		local_irq_enable();
+-		return;
+-	}
+-
+-	cx = pr->power.state;
+-	if (!cx || acpi_idle_suspend) {
+-		if (pm_idle_save)
+-			pm_idle_save();
+-		else
+-			acpi_safe_halt();
+-		return;
+-	}
+-
+-	/*
+-	 * Check BM Activity
+-	 * -----------------
+-	 * Check for bus mastering activity (if required), record, and check
+-	 * for demotion.
+-	 */
+-	if (pr->flags.bm_check) {
+-		u32 bm_status = 0;
+-		unsigned long diff = jiffies - pr->power.bm_check_timestamp;
+-
+-		if (diff > 31)
+-			diff = 31;
+-
+-		pr->power.bm_activity <<= diff;
+-
+-		acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+-		if (bm_status) {
+-			pr->power.bm_activity |= 0x1;
+-			acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
+-		}
+-		/*
+-		 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
+-		 * the true state of bus mastering activity; forcing us to
+-		 * manually check the BMIDEA bit of each IDE channel.
+-		 */
+-		else if (errata.piix4.bmisx) {
+-			if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
+-			    || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
+-				pr->power.bm_activity |= 0x1;
+-		}
+-
+-		pr->power.bm_check_timestamp = jiffies;
+-
+-		/*
+-		 * If bus mastering is or was active this jiffy, demote
+-		 * to avoid a faulty transition.  Note that the processor
+-		 * won't enter a low-power state during this call (to this
+-		 * function) but should upon the next.
+-		 *
+-		 * TBD: A better policy might be to fallback to the demotion
+-		 *      state (use it for this quantum only) istead of
+-		 *      demoting -- and rely on duration as our sole demotion
+-		 *      qualification.  This may, however, introduce DMA
+-		 *      issues (e.g. floppy DMA transfer overrun/underrun).
+-		 */
+-		if ((pr->power.bm_activity & 0x1) &&
+-		    cx->demotion.threshold.bm) {
+-			local_irq_enable();
+-			next_state = cx->demotion.state;
+-			goto end;
+-		}
+-	}
+-
+-#ifdef CONFIG_HOTPLUG_CPU
+-	/*
+-	 * Check for P_LVL2_UP flag before entering C2 and above on
+-	 * an SMP system. We do it here instead of doing it at _CST/P_LVL
+-	 * detection phase, to work cleanly with logical CPU hotplug.
+-	 */
+-	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
+-	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
+-		cx = &pr->power.states[ACPI_STATE_C1];
+-#endif
+-
+-	/*
+-	 * Sleep:
+-	 * ------
+-	 * Invoke the current Cx state to put the processor to sleep.
+-	 */
+-	if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
+-		current_thread_info()->status &= ~TS_POLLING;
+-		/*
+-		 * TS_POLLING-cleared state must be visible before we
+-		 * test NEED_RESCHED:
+-		 */
+-		smp_mb();
+-		if (need_resched()) {
+-			current_thread_info()->status |= TS_POLLING;
+-			local_irq_enable();
+-			return;
+-		}
+-	}
+-
+-	switch (cx->type) {
+-
+-	case ACPI_STATE_C1:
+-		/*
+-		 * Invoke C1.
+-		 * Use the appropriate idle routine, the one that would
+-		 * be used without acpi C-states.
+-		 */
+-		if (pm_idle_save)
+-			pm_idle_save();
+-		else
+-			acpi_safe_halt();
+-
+-		/*
+-		 * TBD: Can't get time duration while in C1, as resumes
+-		 *      go to an ISR rather than here.  Need to instrument
+-		 *      base interrupt handler.
+-		 *
+-		 * Note: the TSC better not stop in C1, sched_clock() will
+-		 *       skew otherwise.
+-		 */
+-		sleep_ticks = 0xFFFFFFFF;
+-		break;
+-
+-	case ACPI_STATE_C2:
+-		/* Get start time (ticks) */
+-		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		/* Tell the scheduler that we are going deep-idle: */
+-		sched_clock_idle_sleep_event();
+-		/* Invoke C2 */
+-		acpi_state_timer_broadcast(pr, cx, 1);
+-		acpi_cstate_enter(cx);
+-		/* Get end time (ticks) */
+-		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-
+-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+-		/* TSC halts in C2, so notify users */
+-		mark_tsc_unstable("possible TSC halt in C2");
+-#endif
+-		/* Compute time (ticks) that we were actually asleep */
+-		sleep_ticks = ticks_elapsed(t1, t2);
+-
+-		/* Tell the scheduler how much we idled: */
+-		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+-
+-		/* Re-enable interrupts */
+-		local_irq_enable();
+-		/* Do not account our idle-switching overhead: */
+-		sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
+-
+-		current_thread_info()->status |= TS_POLLING;
+-		acpi_state_timer_broadcast(pr, cx, 0);
+-		break;
+-
+-	case ACPI_STATE_C3:
+-		/*
+-		 * disable bus master
+-		 * bm_check implies we need ARB_DIS
+-		 * !bm_check implies we need cache flush
+-		 * bm_control implies whether we can do ARB_DIS
+-		 *
+-		 * That leaves a case where bm_check is set and bm_control is
+-		 * not set. In that case we cannot do much, we enter C3
+-		 * without doing anything.
+-		 */
+-		if (pr->flags.bm_check && pr->flags.bm_control) {
+-			if (atomic_inc_return(&c3_cpu_count) ==
+-			    num_online_cpus()) {
+-				/*
+-				 * All CPUs are trying to go to C3
+-				 * Disable bus master arbitration
+-				 */
+-				acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
+-			}
+-		} else if (!pr->flags.bm_check) {
+-			/* SMP with no shared cache... Invalidate cache  */
+-			ACPI_FLUSH_CPU_CACHE();
+-		}
+-
+-		/* Get start time (ticks) */
+-		t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		/* Invoke C3 */
+-		acpi_state_timer_broadcast(pr, cx, 1);
+-		/* Tell the scheduler that we are going deep-idle: */
+-		sched_clock_idle_sleep_event();
+-		acpi_cstate_enter(cx);
+-		/* Get end time (ticks) */
+-		t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+-		if (pr->flags.bm_check && pr->flags.bm_control) {
+-			/* Enable bus master arbitration */
+-			atomic_dec(&c3_cpu_count);
+-			acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+-		}
+-
+-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+-		/* TSC halts in C3, so notify users */
+-		mark_tsc_unstable("TSC halts in C3");
+-#endif
+-		/* Compute time (ticks) that we were actually asleep */
+-		sleep_ticks = ticks_elapsed(t1, t2);
+-		/* Tell the scheduler how much we idled: */
+-		sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+-
+-		/* Re-enable interrupts */
+-		local_irq_enable();
+-		/* Do not account our idle-switching overhead: */
+-		sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
+-
+-		current_thread_info()->status |= TS_POLLING;
+-		acpi_state_timer_broadcast(pr, cx, 0);
+-		break;
+-
+-	default:
+-		local_irq_enable();
+-		return;
+-	}
+-	cx->usage++;
+-	if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
+-		cx->time += sleep_ticks;
+-
+-	next_state = pr->power.state;
+-
+-#ifdef CONFIG_HOTPLUG_CPU
+-	/* Don't do promotion/demotion */
+-	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+-	    !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
+-		next_state = cx;
+-		goto end;
+-	}
+-#endif
+-
+-	/*
+-	 * Promotion?
+-	 * ----------
+-	 * Track the number of longs (time asleep is greater than threshold)
+-	 * and promote when the count threshold is reached.  Note that bus
+-	 * mastering activity may prevent promotions.
+-	 * Do not promote above max_cstate.
+-	 */
+-	if (cx->promotion.state &&
+-	    ((cx->promotion.state - pr->power.states) <= max_cstate)) {
+-		if (sleep_ticks > cx->promotion.threshold.ticks &&
+-		  cx->promotion.state->latency <= system_latency_constraint()) {
+-			cx->promotion.count++;
+-			cx->demotion.count = 0;
+-			if (cx->promotion.count >=
+-			    cx->promotion.threshold.count) {
+-				if (pr->flags.bm_check) {
+-					if (!
+-					    (pr->power.bm_activity & cx->
+-					     promotion.threshold.bm)) {
+-						next_state =
+-						    cx->promotion.state;
+-						goto end;
+-					}
+-				} else {
+-					next_state = cx->promotion.state;
+-					goto end;
+-				}
+-			}
+-		}
+-	}
+-
+-	/*
+-	 * Demotion?
+-	 * ---------
+-	 * Track the number of shorts (time asleep is less than time threshold)
+-	 * and demote when the usage threshold is reached.
+-	 */
+-	if (cx->demotion.state) {
+-		if (sleep_ticks < cx->demotion.threshold.ticks) {
+-			cx->demotion.count++;
+-			cx->promotion.count = 0;
+-			if (cx->demotion.count >= cx->demotion.threshold.count) {
+-				next_state = cx->demotion.state;
+-				goto end;
+-			}
+-		}
+-	}
+-
+-      end:
+-	/*
+-	 * Demote if current state exceeds max_cstate
+-	 * or if the latency of the current state is unacceptable
+-	 */
+-	if ((pr->power.state - pr->power.states) > max_cstate ||
+-		pr->power.state->latency > system_latency_constraint()) {
+-		if (cx->demotion.state)
+-			next_state = cx->demotion.state;
+-	}
+-
+-	/*
+-	 * New Cx State?
+-	 * -------------
+-	 * If we're going to start using a new Cx state we must clean up
+-	 * from the previous and prepare to use the new.
+-	 */
+-	if (next_state != pr->power.state)
+-		acpi_processor_power_activate(pr, next_state);
+-}
+-
+-static int acpi_processor_set_power_policy(struct acpi_processor *pr)
+-{
+-	unsigned int i;
+-	unsigned int state_is_set = 0;
+-	struct acpi_processor_cx *lower = NULL;
+-	struct acpi_processor_cx *higher = NULL;
+-	struct acpi_processor_cx *cx;
+-
+-
+-	if (!pr)
+-		return -EINVAL;
+-
+-	/*
+-	 * This function sets the default Cx state policy (OS idle handler).
+-	 * Our scheme is to promote quickly to C2 but more conservatively
+-	 * to C3.  We're favoring C2  for its characteristics of low latency
+-	 * (quick response), good power savings, and ability to allow bus
+-	 * mastering activity.  Note that the Cx state policy is completely
+-	 * customizable and can be altered dynamically.
+-	 */
+-
+-	/* startup state */
+-	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (!state_is_set)
+-			pr->power.state = cx;
+-		state_is_set++;
+-		break;
+-	}
+-
+-	if (!state_is_set)
+-		return -ENODEV;
+-
+-	/* demotion */
+-	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (lower) {
+-			cx->demotion.state = lower;
+-			cx->demotion.threshold.ticks = cx->latency_ticks;
+-			cx->demotion.threshold.count = 1;
+-			if (cx->type == ACPI_STATE_C3)
+-				cx->demotion.threshold.bm = bm_history;
+-		}
+-
+-		lower = cx;
+-	}
+-
+-	/* promotion */
+-	for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
+-		cx = &pr->power.states[i];
+-		if (!cx->valid)
+-			continue;
+-
+-		if (higher) {
+-			cx->promotion.state = higher;
+-			cx->promotion.threshold.ticks = cx->latency_ticks;
+-			if (cx->type >= ACPI_STATE_C2)
+-				cx->promotion.threshold.count = 4;
+-			else
+-				cx->promotion.threshold.count = 10;
+-			if (higher->type == ACPI_STATE_C3)
+-				cx->promotion.threshold.bm = bm_history;
+-		}
+-
+-		higher = cx;
+-	}
+-
+-	return 0;
+-}
+-
+ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
+ {
+ 
 Index: linux-2.6.23-rc3/drivers/acpi/tables/tbxface.c
 ===================================================================
 --- linux-2.6.23-rc3.orig/drivers/acpi/tables/tbxface.c	2007-08-13 16:49:30.000000000 +0200
@@ -3230,15 +3232,16 @@
  };
  
  struct acpi_processor {
-@@ -320,6 +321,8 @@ int acpi_processor_power_init(struct acp
- int acpi_processor_cst_has_changed(struct acpi_processor *pr);
- int acpi_processor_power_exit(struct acpi_processor *pr,
- 			      struct acpi_device *device);
+@@ -324,6 +324,9 @@ int acpi_processor_power_exit(struct acp
+ int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
+ int acpi_processor_resume(struct acpi_device * device);
+ 
 +extern struct cpuidle_driver acpi_idle_driver;
 +void acpi_max_cstate_changed(void);
- 
++
  /* in processor_thermal.c */
  int acpi_processor_get_limit_info(struct acpi_processor *pr);
+ extern struct file_operations acpi_processor_limit_fops;
 Index: linux-2.6.23-rc3/include/linux/acpi.h
 ===================================================================
 --- linux-2.6.23-rc3.orig/include/linux/acpi.h	2007-08-13 16:49:30.000000000 +0200


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- sources	22 Sep 2007 11:45:40 -0000	1.653
+++ sources	24 Sep 2007 02:26:20 -0000	1.654
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-1bf67697b6630e24ad5cc844290d8d64  patch-2.6.23-rc7-git3.bz2
+37ff766bfc5834bc33b84b5164debe79  patch-2.6.23-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- upstream	22 Sep 2007 11:45:40 -0000	1.575
+++ upstream	24 Sep 2007 02:26:20 -0000	1.576
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git3.bz2
+patch-2.6.23-rc7-git4.bz2


--- linux-2.6-xfs-fix-filestreams-free-func-cast.patch DELETED ---


--- patch-2.6.23-rc7-git3.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 02:34:51 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:34:51 -0400
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.6,1.7
Message-ID: <200709240234.l8O2YpwH030077@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license field to GPLv2+
- remove with_libstdc_preview macro



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:34:19 -0000	1.7
@@ -1,20 +1,15 @@
-%define with_libstdc_preview 0
-
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
 Requires:	scim
 
 %description
@@ -35,23 +30,13 @@
 
 
 %build
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 %configure --disable-static
-%if %{with_libstdc_preview}
-# tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
-%endif
 # doesn't build with %{?_smp_mflags}
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
@@ -75,6 +60,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 3.1.1-7
+- update license field to GPLv2+
+- remove with_libstdc_preview macro
+
 * Wed Sep 27 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-6
 - rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Sep 24 02:38:51 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:38:51 -0400
Subject: rpms/scim-fcitx/F-7 scim-fcitx.spec,1.6,1.7
Message-ID: <200709240238.l8O2cpjN030247@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30193/F-7

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license to GPLv2+



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/F-7/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:38:19 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Mon Sep 24 02:38:54 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:38:54 -0400
Subject: rpms/scim-fcitx/FC-6 scim-fcitx.spec,1.6,1.7
Message-ID: <200709240238.l8O2cs3x030250@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30193/FC-6

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license to GPLv2+



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/FC-6/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:38:21 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Mon Sep 24 02:44:44 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 22:44:44 -0400
Subject: rpms/flim/devel flim.spec,1.4,1.5
Message-ID: <200709240244.l8O2iiQm030495@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30461

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/devel/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 02:44:12 -0000	1.5
@@ -4,8 +4,8 @@
 Summary: Basic library for handling email messages for Emacs
 Name: flim
 Version: 1.14.8
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 1.14.8-3
+- update license to GPLv2+
+
 * Mon Sep 25 2006 Jens Petersen <petersen at redhat.com> - 1.14.8-2
 - update url and source location
 



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:33 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:33 -0400
Subject: rpms/nickle/F-7 .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200709240253.l8O2rXsm030704@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/F-7

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:01 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:01 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:36 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:36 -0400
Subject: rpms/nickle/FC-6 .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709240253.l8O2raYx030716@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/FC-6

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:03 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:03 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 02:53:39 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 22:53:39 -0400
Subject: rpms/nickle/devel .cvsignore, 1.2, 1.3 nickle.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709240253.l8O2rdue030726@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30637/devel

Modified Files:
	.cvsignore nickle.spec sources 
Log Message:
Update to 2.58



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
+++ .cvsignore	24 Sep 2007 02:53:06 -0000	1.3
@@ -1 +1 @@
-nickle-2.54.tar.gz
+nickle-2.58.tar.gz


Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/nickle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nickle.spec	13 Nov 2006 06:02:20 -0000	1.1
+++ nickle.spec	24 Sep 2007 02:53:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:    nickle
-Version: 2.54
-Release: 2%{?dist}
+Version: 2.58
+Release: 1%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
+%doc README README.name COPYING AUTHORS NEWS TODO examples
 %{_bindir}/nickle
 %{_datadir}/nickle/
 %exclude %{_datadir}/nickle/COPYING
@@ -72,6 +72,9 @@
 %{_includedir}/nickle
 
 %changelog
+* Sun Sep 23 2007 Michel Salim <michel.sylvan at gmail.com> 2.58-1
+- Update to 2.58
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 2.54-2
 - Only package example files once, remove leftover Makefiles
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2006 06:02:20 -0000	1.2
+++ sources	24 Sep 2007 02:53:06 -0000	1.3
@@ -1 +1 @@
-ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz
+edc03ccfd938bbcdcedfedcefb207c4d  nickle-2.58.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 03:07:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:07:12 -0400
Subject: rpms/flim/F-7 flim.spec,1.4,1.5
Message-ID: <200709240307.l8O37CHi004614@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4568/F-7

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/F-7/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 03:06:40 -0000	1.5
@@ -5,7 +5,7 @@
 Name: flim
 Version: 1.14.8
 Release: 2%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-extras-commits at redhat.com  Mon Sep 24 03:07:18 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:07:18 -0400
Subject: rpms/flim/FC-6 flim.spec,1.4,1.5
Message-ID: <200709240307.l8O37IUP004617@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/flim/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4568/FC-6

Modified Files:
	flim.spec 
Log Message:
update license to GPLv2+



Index: flim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flim/FC-6/flim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flim.spec	25 Sep 2006 09:04:10 -0000	1.4
+++ flim.spec	24 Sep 2007 03:06:42 -0000	1.5
@@ -5,7 +5,7 @@
 Name: flim
 Version: 1.14.8
 Release: 2%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-extras-commits at redhat.com  Mon Sep 24 03:33:41 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 23 Sep 2007 23:33:41 -0400
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.51,1.52
Message-ID: <200709240333.l8O3Xfg0005091@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5073

Modified Files:
	xscreensaver.spec 
Log Message:
* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-8
- Some cleanup.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xscreensaver.spec	23 Sep 2007 07:39:34 -0000	1.51
+++ xscreensaver.spec	24 Sep 2007 03:33:09 -0000	1.52
@@ -515,7 +515,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Sun Sep 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-8
 - Some cleanup.
 
 * Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7



From fedora-extras-commits at redhat.com  Mon Sep 24 03:38:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:38:54 -0400
Subject: rpms/pidgin-rhythmbox/F-7 pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240338.l8O3csMx005308@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/F-7

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/F-7/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	30 Apr 2007 21:34:37 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:22 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 03:38:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:38:57 -0400
Subject: rpms/pidgin-rhythmbox/FC-6 pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240338.l8O3cvkK005311@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/FC-6

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/FC-6/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	29 May 2007 21:14:55 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:25 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 03:39:00 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 23 Sep 2007 23:39:00 -0400
Subject: rpms/pidgin-rhythmbox/devel pidgin-rhythmbox.spec,1.1,1.2
Message-ID: <200709240339.l8O3d04j005314@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pidgin-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5258/devel

Modified Files:
	pidgin-rhythmbox.spec 
Log Message:
Update license field for FC-6 and F-7



Index: pidgin-rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-rhythmbox/devel/pidgin-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pidgin-rhythmbox.spec	30 Apr 2007 21:34:37 -0000	1.1
+++ pidgin-rhythmbox.spec	24 Sep 2007 03:38:27 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           pidgin-rhythmbox
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for Pidgin
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://jon.oberheide.org/projects/pidgin-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/pidgin-rhythmbox/downloads/pidgin-rhythmbox-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com 2.0-2
+- License update
+
 * Sun Apr 29 2007 Michel Salim <michel.salim at gmail.com> 2.0-1
 - Update to 2.0
 - Package renamed to pidgin-rhythmbox



From fedora-extras-commits at redhat.com  Mon Sep 24 04:35:20 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 24 Sep 2007 00:35:20 -0400
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 xorg-x11-drv-ati.spec, 1.60, 1.61
Message-ID: <200709240435.l8O4ZKx5012160@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12138

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
- xf86-video-ati 6.7.194



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Sep 2007 00:38:25 -0000	1.18
+++ .cvsignore	24 Sep 2007 04:34:48 -0000	1.19
@@ -1 +1 @@
-xf86-video-ati-6.7.193.tar.bz2
+xf86-video-ati-6.7.194.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Sep 2007 00:38:25 -0000	1.18
+++ sources	24 Sep 2007 04:34:48 -0000	1.19
@@ -1 +1 @@
-316ebbe95834c5120c302cc004363f92  xf86-video-ati-6.7.193.tar.bz2
+bac7c8da4d80503aeb53085e643e2dab  xf86-video-ati-6.7.194.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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-ati.spec	20 Sep 2007 00:38:25 -0000	1.60
+++ xorg-x11-drv-ati.spec	24 Sep 2007 04:34:48 -0000	1.61
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.7.193
+Version:   6.7.194
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -81,6 +81,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
+- xf86-video-ati 6.7.194
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 6.7.193-1
 - xf86-video-ati 6.7.193
 



From fedora-extras-commits at redhat.com  Mon Sep 24 04:48:59 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 00:48:59 -0400
Subject: comps comps-f8.xml.in,1.118,1.119
Message-ID: <200709240448.l8O4mx43012392@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375

Modified Files:
	comps-f8.xml.in 
Log Message:
add yum-utils to system-tools (#301671)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- comps-f8.xml.in	20 Sep 2007 20:58:48 -0000	1.118
+++ comps-f8.xml.in	24 Sep 2007 04:48:29 -0000	1.119
@@ -3403,6 +3403,7 @@
       <packagereq type="default">vnc</packagereq>
       <packagereq type="default">vpnc</packagereq>
       <packagereq type="default">xdelta</packagereq>
+      <packagereq type="default">yum-utils</packagereq>
       <packagereq type="default">zisofs-tools</packagereq>
       <packagereq type="default">zsh</packagereq>
       <packagereq type="optional">aide</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 24 05:11:04 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Sep 2007 01:11:04 -0400
Subject: rpms/tdom/devel tdom-0.8.2-noexpat.patch,1.1,1.2 tdom.spec,1.2,1.3
Message-ID: <200709240511.l8O5B4ld018758@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tdom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18735

Modified Files:
	tdom-0.8.2-noexpat.patch tdom.spec 
Log Message:
Add missing linkage against -lexpat



tdom-0.8.2-noexpat.patch:

Index: tdom-0.8.2-noexpat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/tdom-0.8.2-noexpat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tdom-0.8.2-noexpat.patch	27 Aug 2007 01:21:19 -0000	1.1
+++ tdom-0.8.2-noexpat.patch	24 Sep 2007 05:10:59 -0000	1.2
@@ -1,5 +1,5 @@
---- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
-+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
+--- tDOM-0.8.2/configure.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure	2007-09-23 21:53:00.000000000 -0700
 @@ -6298,10 +6298,7 @@
  #-----------------------------------------------------------------------
  
@@ -12,17 +12,8 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
-@@ -6360,7 +6357,7 @@
- 
- 
- 
--    vars="-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}"
-+    vars="-I${srcdir}/generic ${AOL_INCLUDES}"
-     for i in $vars; do
- 	PKG_INCLUDES="$PKG_INCLUDES $i"
-     done
---- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
-+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
+--- tDOM-0.8.2/configure.in.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure.in	2007-09-23 21:53:00.000000000 -0700
 @@ -83,10 +83,7 @@
  # and PKG_TCL_SOURCES.
  #-----------------------------------------------------------------------
@@ -35,17 +26,17 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
-@@ -100,7 +97,7 @@
-                  generic/tclexpat.c  \
-                  generic/tdomStubInit.c])
- TEA_ADD_HEADERS([generic/tdom.h])
--TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
-+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
- TEA_ADD_LIBS([${AOL_LIBS}])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
---- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
-+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
+--- tDOM-0.8.2/Makefile.in.orig	2007-03-02 15:43:53.000000000 -0800
++++ tDOM-0.8.2/Makefile.in	2007-09-23 21:56:49.000000000 -0700
+@@ -118,7 +118,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
 @@ -296,7 +296,7 @@
  # As necessary, add $(srcdir):$(srcdir)/compat:....
  #========================================================================


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/tdom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom.spec	27 Aug 2007 01:21:19 -0000	1.2
+++ tdom.spec	24 Sep 2007 05:10:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
+- Added missing linkage against -lexpat
+
 * Sun Aug 26 2007 Wart <wart at kobold.org> - 0.8.2-1
 - Update to 0.8.2
 - Split into base and -devel packages



From fedora-extras-commits at redhat.com  Mon Sep 24 05:11:41 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Sep 2007 01:11:41 -0400
Subject: rpms/tdom/F-7 tdom-0.8.2-noexpat.patch,1.2,1.3 tdom.spec,1.2,1.3
Message-ID: <200709240511.l8O5Bf8V018844@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tdom/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818

Modified Files:
	tdom-0.8.2-noexpat.patch tdom.spec 
Log Message:
Add missing linkage against -lexpat



tdom-0.8.2-noexpat.patch:

Index: tdom-0.8.2-noexpat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/F-7/tdom-0.8.2-noexpat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom-0.8.2-noexpat.patch	28 Aug 2007 05:30:30 -0000	1.2
+++ tdom-0.8.2-noexpat.patch	24 Sep 2007 05:11:37 -0000	1.3
@@ -1,5 +1,5 @@
---- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
-+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
+--- tDOM-0.8.2/configure.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure	2007-09-23 21:53:00.000000000 -0700
 @@ -6298,10 +6298,7 @@
  #-----------------------------------------------------------------------
  
@@ -12,8 +12,8 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
-+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
+--- tDOM-0.8.2/configure.in.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure.in	2007-09-23 21:53:00.000000000 -0700
 @@ -83,10 +83,7 @@
  # and PKG_TCL_SOURCES.
  #-----------------------------------------------------------------------
@@ -26,8 +26,17 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
-+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
+--- tDOM-0.8.2/Makefile.in.orig	2007-03-02 15:43:53.000000000 -0800
++++ tDOM-0.8.2/Makefile.in	2007-09-23 21:56:49.000000000 -0700
+@@ -118,7 +118,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
 @@ -296,7 +296,7 @@
  # As necessary, add $(srcdir):$(srcdir)/compat:....
  #========================================================================


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/F-7/tdom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tdom.spec	27 Aug 2007 01:21:19 -0000	1.2
+++ tdom.spec	24 Sep 2007 05:11:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
+- Added missing linkage against -lexpat
+
 * Sun Aug 26 2007 Wart <wart at kobold.org> - 0.8.2-1
 - Update to 0.8.2
 - Split into base and -devel packages



From fedora-extras-commits at redhat.com  Mon Sep 24 06:26:10 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:26:10 -0700
Subject: [pkgdb] baekmuk-ttf-fonts was added for cchance
Message-ID: <200709240626.l8O6QAJE020505@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package baekmuk-ttf-fonts with summary Korean TrueType fonts
Jens Petersen (petersen) has approved Package baekmuk-ttf-fonts
Jens Petersen (petersen) has added a Fedora devel branch for baekmuk-ttf-fonts with an owner of cchance
Jens Petersen (petersen) has approved baekmuk-ttf-fonts in Fedora devel
Jens Petersen (petersen) has approved Package baekmuk-ttf-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on baekmuk-ttf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-ttf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 06:26:11 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Sep 2007 23:26:11 -0700
Subject: [pkgdb] baekmuk-ttf-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240626.l8O6QCC2022791@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on baekmuk-ttf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on baekmuk-ttf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on baekmuk-ttf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-ttf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:04 -0400
Subject: rpms/baekmuk-ttf-fonts - New directory
Message-ID: <200709240627.l8O6R4oa026128@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts

Log Message:
Directory /cvs/extras/rpms/baekmuk-ttf-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:08 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:08 -0400
Subject: rpms/baekmuk-ttf-fonts/devel - New directory
Message-ID: <200709240627.l8O6R82m026149@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts/devel

Log Message:
Directory /cvs/extras/rpms/baekmuk-ttf-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:11 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:11 -0400
Subject: rpms/baekmuk-ttf-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240627.l8O6RBBp026175@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module baekmuk-ttf-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module baekmuk-ttf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 06:27:12 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:27:12 -0400
Subject: rpms/baekmuk-ttf-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709240627.l8O6RC7C026195@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsu26095/rpms/baekmuk-ttf-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module baekmuk-ttf-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: baekmuk-ttf-fonts
# $Id: Makefile,v 1.1 2007/09/24 06:27:11 petersen Exp $
NAME := baekmuk-ttf-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 fedora-extras-commits at redhat.com  Mon Sep 24 06:46:56 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:46:56 -0400
Subject: rpms/baekmuk-ttf-fonts/devel FAPIcidfmap.ko, NONE,
	1.1 baekmuk-ttf-fonts.spec, NONE, 1.1 cidfmap.ko, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709240646.l8O6ku6u026687@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-ttf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26645/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FAPIcidfmap.ko baekmuk-ttf-fonts.spec cidfmap.ko 
Log Message:
initial import of approved package (#300651)



--- NEW FILE FAPIcidfmap.ko ---
%!
% The map is a set of records like this :
%
%  /CIDfont_name options_dict ;
%
% where options_dict is a dictionary with the following entries :
%
% Key         Type      Description
% Path        string    Absolute path to font file, or relative path to font file from
%                       the GS_EXTFONTPATH value.
% CIDFontType integer   PostScript type for this CID font. Only 0 is currently allowed.
%                       Note that this is unrelated to the real type of the font file -
%                       the bridge will perform format conversion.
% FAPI        name      Name of the renderer to be used with the font. /AgfaUFST and
%                       /FreeType is now allowed -- depends on which options Ghostscript
%                       was built with.
% SubfontId   integer   (optional) Index of the font in font collection, such as FCO or TTC.
%                       It is being ignored if /Path doesn't specify a collection.
% CSI         array     Must have strongly 2 elements.
%                       The first element of the array specifies Ordering of CIDSystemInfo.
%                       The second element specifies Supplement of CIDSystemInfo.
%
% Use regular Postscript syntax.
%
/Baekmuk-Batang		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum		<< /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim		<< /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline	<< /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
%
/Baekmuk-Batang-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim-Regular		<< /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline-Regular	<< /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;
%
/Adobe-Korea1		<< /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ;


--- NEW FILE baekmuk-ttf-fonts.spec ---
%define upstreamname   baekmuk-ttf

%define ttfontdir      %{_datadir}/fonts/%{upstreamname}
%define cidmapdir      %{_datadir}/ghostscript/conf.d
%define catalogue      %{_sysconfdir}/X11/fontpath.d

Name:           %{upstreamname}-fonts
Version:        2.2
Release:        6%{?dist}
Summary:        Free Korean TrueType fonts

Group:          User Interface/X
License:        Baekmuk
URL:            http://kldp.net/frs/?group_id=57&release_id=865
Source0:        http://kldp.net/frs/download.php/1429/%{upstreamname}-%{version}.tar.gz
Source1:        FAPIcidfmap.ko
Source2:        cidfmap.ko
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  xorg-x11-font-utils, ttmkfdir >= 3.0.6

%description
This package provides the free Korean TrueType fonts.

%package common
Summary:        Common files for Korean Baekmuk TrueType fonts
License:        Baekmuk
Group:          User Interface/X
Conflicts:      fonts-korean < 2.2-5

%description common
This package contains some common files for Baekmuk Korean TrueType fonts.

%define mk_pkg()\
%package %1\
Summary:        Korean Baekmuk TrueType %2 typeface\
License:        Baekmuk\
Group:          User Interface/X\
Obsoletes:      ttfonts-ko < 1.0.11-33\
Requires:       %{name}-common\
\
%description %1\
This package contains the Korean TrueType font %2 typeface.\
\
%post %1\
if [ -x %{_bindir}/fc-cache ]; then\
  %{_bindir}/fc-cache %{_datadir}/fonts\
fi\
\
%postun %1\
if [ "$1" = "0" ]; then\
  if [ -x %{_bindir}/fc-cache ]; then\
    %{_bindir}/fc-cache %{_datadir}/fonts\
  fi\
fi\
\
%files %1\
%defattr(-,root,root,-)\
%dir %{ttfontdir}-%1\
%{ttfontdir}-%1/*.ttf\
%verify(not md5 size mtime) %{ttfontdir}-%1/fonts.dir\
%verify(not md5 size mtime) %{ttfontdir}-%1/fonts.scale\
%{catalogue}/%{name}-%1

%mk_pkg batang Batang
%mk_pkg dotum  Dotum
%mk_pkg gulim  Gulim
%mk_pkg hline  Headline

%prep
%setup -q -n %{upstreamname}-%{version}

%build
%{nil}

%install
rm -rf $RPM_BUILD_ROOT

# for catalogue
install -d $RPM_BUILD_ROOT%{catalogue}

for i in batang dotum gulim hline; do
  install -d $RPM_BUILD_ROOT%{ttfontdir}-$i
  install -p -m 0644 ttf/$i.ttf $RPM_BUILD_ROOT%{ttfontdir}-$i
  ln -sf ../../..%{ttfontdir}-$i $RPM_BUILD_ROOT%{catalogue}/%{name}-$i
  %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{ttfontdir}-$i -o $RPM_BUILD_ROOT%{ttfontdir}-$i/fonts.scale
  mkfontdir $RPM_BUILD_ROOT%{ttfontdir}-$i
done

# for ghostscript
install -d $RPM_BUILD_ROOT%{cidmapdir}
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{cidmapdir}/
install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/

# convert Korean copyright file to utf8
iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%doc COPYRIGHT COPYRIGHT.ko README
%{cidmapdir}/

%changelog
* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-6
- convert Korean copyright file to utf8 (Mamoru Tasaka, #300651)

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-5
- more fixes from Mamoru Tasaka, #300651:
- make common subpackage own ghostscript conf.d
- conflict with previous fonts-korean
- update CID font maps

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-4
- preserve timestamps of installed files (Mamoru Tasaka, #300651)
- add a common subpackage for shared files (Mamoru Tasaka, #300651)

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
- do not provide ttfonts-ko in subpackages (Mamoru Tasaka, #300651)

* Sat Sep 22 2007 Jens Petersen <petersen at redhat.com> - 2.2-2
- license is now designated Baekmuk

* Sat Sep 22 2007 Jens Petersen <petersen at redhat.com> - 2.2-1
- new package separated from fonts-korean (#253155)


--- NEW FILE cidfmap.ko ---
/Baekmuk-Batang		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-batang/batang.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Batang-Regular		/Baekmuk-Batang ;
/Baekmuk-Dotum		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-dotum/dotum.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Dotum-Regular		/Baekmuk-Dotum ;
/Baekmuk-Gulim		<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Gulim-Regular		/Baekmuk-Gulim ;
/Baekmuk-Headline	<< /FileType /TrueType /Path (/usr/share/fonts/baekmuk-ttf-hline/hline.ttf) /CSI [(Korea1) 2] >> ;
/Baekmuk-Headline-Regular	/Baekmuk-Headline ;
/Adobe-Korea1			/Baekmuk-Batang ;



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-ttf-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 06:27:11 -0000	1.1
+++ .cvsignore	24 Sep 2007 06:46:22 -0000	1.2
@@ -0,0 +1 @@
+baekmuk-ttf-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-ttf-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 06:27:11 -0000	1.1
+++ sources	24 Sep 2007 06:46:22 -0000	1.2
@@ -0,0 +1 @@
+a6f4349179cbe3557641782cefba4d70  baekmuk-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 06:59:18 2007
From: fedora-extras-commits at redhat.com (Ian Kent (iankent))
Date: Mon, 24 Sep 2007 02:59:18 -0400
Subject: rpms/autofs/devel autofs-5.0.2-foreground-logging.patch, NONE,
	1.1 autofs-5.0.2-ldap-schema-discovery-config-update.patch, NONE,
	1.1 autofs-5.0.2-libxml2-workaround.patch, NONE, 1.1 autofs.spec,
	1.222, 1.223
Message-ID: <200709240659.l8O6xIBg027042@cvs-int.fedora.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27011

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.2-foreground-logging.patch 
	autofs-5.0.2-ldap-schema-discovery-config-update.patch 
	autofs-5.0.2-libxml2-workaround.patch 
Log Message:
* Mon Sep 24 2007 Ian Kent <ikent at redhat.com> - 5.0.2-16
- add descriptive comments to config about LDAP schema discovery.
- work around segfault at exit caused by libxml2.
- fix foreground logging (also fixes shutdown needing extra signal bug).


autofs-5.0.2-foreground-logging.patch:

--- NEW FILE autofs-5.0.2-foreground-logging.patch ---
diff -up autofs-5.0.2/modules/lookup_ldap.c.foreground-logging autofs-5.0.2/modules/lookup_ldap.c
--- autofs-5.0.2/modules/lookup_ldap.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-24 14:44:18.000000000 +0800
@@ -468,17 +468,17 @@ int parse_ldap_config(struct lookup_cont
 	ctxt->client_princ = client_princ;
 
 	debug(LOGOPT_NONE,
-	      "ldap authentication configured with the following options:\n");
+	      "ldap authentication configured with the following options:");
 	debug(LOGOPT_NONE,
 	      "use_tls: %u, "
 	      "tls_required: %u, "
 	      "auth_required: %u, "
-	      "sasl_mech: %s\n",
+	      "sasl_mech: %s",
 	      use_tls, tls_required, auth_required, authtype);
 	debug(LOGOPT_NONE,
 	      "user: %s, "
 	      "secret: %s, "
-	      "client principal: %s\n",
+	      "client principal: %s",
 	      user, secret ? "specified" : "unspecified",
 	      client_princ);
 
diff -up autofs-5.0.2/modules/cyrus-sasl.c.foreground-logging autofs-5.0.2/modules/cyrus-sasl.c
--- autofs-5.0.2/modules/cyrus-sasl.c.foreground-logging	2007-06-18 15:18:08.000000000 +0800
+++ autofs-5.0.2/modules/cyrus-sasl.c	2007-09-24 14:44:18.000000000 +0800
@@ -197,7 +197,7 @@ get_server_SASL_mechanisms(LDAP *ld)
 	if (mechanisms == NULL) {
 		/* Well, that was a waste of time. */
 		msg("No SASL authentication mechanisms are supported"
-		    " by the LDAP server.\n");
+		    " by the LDAP server.");
 		return NULL;
 	}
 
diff -up autofs-5.0.2/daemon/automount.c.foreground-logging autofs-5.0.2/daemon/automount.c
--- autofs-5.0.2/daemon/automount.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/daemon/automount.c	2007-09-24 14:44:18.000000000 +0800
@@ -58,14 +58,13 @@ unsigned int random_selection;	/* use ra
 static int start_pipefd[2];
 static int st_stat = 0;
 static int *pst_stat = &st_stat;
+static pthread_t state_mach_thid;
 
 /* Pre-calculated kernel packet length */
 static size_t kpkt_len;
 
 /* Attribute to create detached thread */
 pthread_attr_t thread_attr;
-/* Attribute to create normal thread */
-pthread_attr_t thread_attr_nodetach;
 
 struct master_readmap_cond mrc = {
 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
@@ -75,9 +74,6 @@ struct startup_cond suc = {
 
 pthread_key_t key_thread_stdenv_vars;
 
-/* re-entrant syslog default context data */
-#define AUTOFS_SYSLOG_CONTEXT {-1, 0, 0, LOG_PID, (const char *)0, LOG_DAEMON, 0xff};
-
 #define MAX_OPEN_FILES		10240
 
 static int umount_all(struct autofs_point *ap, int force);
@@ -792,7 +788,6 @@ static void become_daemon(unsigned foreg
 {
 	FILE *pidfp;
 	char buf[MAX_ERR_BUF];
-	unsigned to_stderr = 0;
 	pid_t pid;
 
 	/* Don't BUSY any directories unnecessarily */
@@ -809,7 +804,9 @@ static void become_daemon(unsigned foreg
 	}
 
 	/* Detach from foreground process */
-	if (!foreground) {
+	if (foreground)
+		log_to_stderr();
+	else {
 		pid = fork();
 		if (pid > 0) {
 			int r;
@@ -834,13 +831,8 @@ static void become_daemon(unsigned foreg
 			fprintf(stderr, "setsid: %s", estr);
 			exit(1);
 		}
-	}
-
-	/* Setup logging */
-	if (to_stderr)
-		log_to_stderr();
-	else
 		log_to_syslog();
+	}
 
 	/* Write pid file if requested */
 	if (pid_file) {
@@ -929,7 +921,7 @@ static pthread_t do_signals(struct maste
 	if (status)
 		fatal(status);
 
-	status = pthread_create(&thid, &thread_attr_nodetach, do_notify_state, &r_sig);
+	status = pthread_create(&thid, &thread_attr, do_notify_state, &r_sig);
 	if (status) {
 		error(master->default_logging,
 		      "mount state notify thread create failed");
@@ -1043,7 +1035,6 @@ static int do_hup_signal(struct master *
 /* Deal with all the signal-driven events in the state machine */
 static void *statemachine(void *arg)
 {
-	pthread_t thid = 0;
 	sigset_t signalset;
 	int sig;
 
@@ -1056,15 +1047,12 @@ static void *statemachine(void *arg)
 
 		switch (sig) {
 		case SIGTERM:
+		case SIGINT:
 		case SIGUSR2:
+			if (master_list_empty(master_list))
+				return NULL;
 		case SIGUSR1:
-			thid = do_signals(master_list, sig);
-			if (thid) {
-				pthread_join(thid, NULL);
-				if (master_list_empty(master_list))
-					return NULL;
-				thid = 0;
-			}
+			do_signals(master_list, sig);
 			break;
 
 		case SIGHUP:
@@ -1179,6 +1167,10 @@ static void handle_mounts_cleanup(void *
 
 	msg("shut down path %s", path);
 
+	/* If we are the last tell the state machine to shutdown */
+	if (!submount && master_list_empty(master_list))
+		pthread_kill(state_mach_thid, SIGTERM);
+	
 	return;
 }
 
@@ -1357,7 +1349,7 @@ static void usage(void)
 		"	-v --verbose	be verbose\n"
 		"	-d --debug	log debuging info\n"
 		"	-D --define	define global macro variable\n"
-		/*"	-f --foreground do not fork into background\n" */
+		"	-f --foreground do not fork into background\n"
 		"	-r --random-multimount-selection\n"
 		"			use ramdom replicated server selection\n"
 		"	-O --global-options\n"
@@ -1632,14 +1624,6 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-	if (pthread_attr_init(&thread_attr_nodetach)) {
-		crit(LOGOPT_ANY,
-		     "%s: failed to init thread attribute struct!",
-		     program);
-		close(start_pipefd[1]);
-		exit(1);
-	}
-
 	msg("Starting automounter version %s, master map %s",
 		version, master_list->name);
 	msg("using kernel protocol version %d.%02d",
@@ -1684,6 +1668,7 @@ int main(int argc, char *argv[])
 	res = write(start_pipefd[1], pst_stat, sizeof(pst_stat));
 	close(start_pipefd[1]);
 
+	state_mach_thid = pthread_self();
 	statemachine(NULL);
 
 	master_kill(master_list);
diff -up autofs-5.0.2/lib/master.c.foreground-logging autofs-5.0.2/lib/master.c
--- autofs-5.0.2/lib/master.c.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/lib/master.c	2007-09-24 14:44:18.000000000 +0800
@@ -954,6 +954,7 @@ void master_notify_state_change(struct m
 
 		switch (sig) {
 		case SIGTERM:
+		case SIGINT:
 			if (ap->state != ST_SHUTDOWN_PENDING &&
 			    ap->state != ST_SHUTDOWN_FORCE) {
 				next = ST_SHUTDOWN_PENDING;
diff -up autofs-5.0.2/lib/log.c.foreground-logging autofs-5.0.2/lib/log.c
--- autofs-5.0.2/lib/log.c.foreground-logging	2007-06-18 15:18:08.000000000 +0800
+++ autofs-5.0.2/lib/log.c	2007-09-24 14:44:18.000000000 +0800
@@ -27,9 +27,6 @@
 
 #include "automount.h"
 
-/* re-entrant syslog default context data */
-#define AUTOFS_SYSLOG_CONTEXT {-1, 0, 0, LOG_PID, (const char *) 0, LOG_DAEMON, 0xff};
-
 /*
 struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT;
 struct syslog_data *slc = &syslog_context;
@@ -134,30 +131,40 @@ static void syslog_debug(unsigned int lo
 	va_end(ap);
 }
 
+static void to_stderr(unsigned int logopt, const char *msg, ...)
+{
+	va_list ap;
+	va_start(ap, msg);
+	vfprintf(stderr, msg, ap);
+	fputc('\n',stderr);
+	va_end(ap);
+}
+
 void set_mnt_logging(struct autofs_point *ap)
 {
 	unsigned int opt_verbose = ap->logopt & LOGOPT_VERBOSE;
 	unsigned int opt_debug = ap->logopt & LOGOPT_DEBUG;
 
-	if (opt_debug)
-		log_debug = syslog_debug;
+	if (opt_debug) {
+		if (logging_to_syslog)
+			log_debug = syslog_debug;
+		else
+			log_debug = to_stderr;
+	}
 
 	if (opt_verbose || opt_debug) {
-		log_info = syslog_info;
-		log_notice = syslog_notice;
-		log_warn = syslog_warn;
+		if (logging_to_syslog) {
+			log_info = syslog_info;
+			log_notice = syslog_notice;
+			log_warn = syslog_warn;
+		} else {
+			log_info = to_stderr;
+			log_notice = to_stderr;
+			log_warn = to_stderr;
+		}
 	}
 }
 
-static void to_stderr(unsigned int logopt, const char *msg, ...)
-{
-	va_list ap;
-	va_start(ap, msg);
-	vfprintf(stderr, msg, ap);
-	fputc('\n',stderr);
-	va_end(ap);
-}
-
 void log_to_syslog(void)
 {
 	char buf[MAX_ERR_BUF];
diff -up autofs-5.0.2/man/automount.8.foreground-logging autofs-5.0.2/man/automount.8
--- autofs-5.0.2/man/automount.8.foreground-logging	2007-09-24 14:42:28.000000000 +0800
+++ autofs-5.0.2/man/automount.8	2007-09-24 14:44:18.000000000 +0800
@@ -47,6 +47,9 @@ Define a global macro substitution varia
 are over-ridden macro definitions of the same name specified in
 mount entries.
 .TP
+.I "\-f, \-\-foreground"
+Run the daemon in the forground and log to stderr instead of syslog."
+.TP
 .I "\-r, \-\-random-multimount-selection"
 Enables the use of ramdom selection when choosing a host from a
 list of replicated servers.

autofs-5.0.2-ldap-schema-discovery-config-update.patch:

--- NEW FILE autofs-5.0.2-ldap-schema-discovery-config-update.patch ---
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 8299b55..85f4e34 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -21,9 +21,12 @@ BROWSE_MODE="no"
 #
 #LOGGING="none"
 #
-# Define the default LDAP schema to use for lookups
+# Define the LDAP schema to used for lookups
 #
-# System default
+# If no schema is set autofs will check each of the schemas
+# below in the order given to try and locate an appropriate
+# basdn for lookups. If you want to minimize the number of
+# queries to the server set the values here.
 #
 #MAP_OBJECT_CLASS="nisMap"
 #ENTRY_OBJECT_CLASS="nisObject"
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 8299b55..85f4e34 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -21,9 +21,12 @@ BROWSE_MODE="no"
 #
 #LOGGING="none"
 #
-# Define the default LDAP schema to use for lookups
+# Define the LDAP schema to used for lookups
 #
-# System default
+# If no schema is set autofs will check each of the schemas
+# below in the order given to try and locate an appropriate
+# basdn for lookups. If you want to minimize the number of
+# queries to the server set the values here.
 #
 #MAP_OBJECT_CLASS="nisMap"
 #ENTRY_OBJECT_CLASS="nisObject"

autofs-5.0.2-libxml2-workaround.patch:

--- NEW FILE autofs-5.0.2-libxml2-workaround.patch ---
diff -up autofs-5.0.2/configure.libxml2-workaround autofs-5.0.2/configure
--- autofs-5.0.2/configure.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/configure	2007-09-24 14:26:09.000000000 +0800
@@ -2498,6 +2498,23 @@ echo "${ECHO_T}yes" >&6; }
   HAVE_LIBXML=1
   XML_LIBS=`$XML_CONFIG --libs`
   XML_FLAGS=`$XML_CONFIG --cflags`
+  XML_VER=`$XML_CONFIG --version`
+  XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
+  if test $XML_MAJOR -le 2
+  then
+    XML_MINOR=`echo $XML_VER|cut -d\. -f2`
+    if test $XML_MINOR -le 6
+    then
+      XML_REV=`echo $XML_VER|cut -d\. -f3`
+      if test $XML_REV -le 99; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LIBXML2_WORKAROUND 1
+_ACEOF
+
+      fi
+    fi
+  fi
 fi
 
 #
diff -up autofs-5.0.2/include/config.h.in.libxml2-workaround autofs-5.0.2/include/config.h.in
--- autofs-5.0.2/include/config.h.in.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/include/config.h.in	2007-09-24 14:26:09.000000000 +0800
@@ -60,6 +60,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Use libxml2 tsd usage workaround */
+#undef LIBXML2_WORKAROUND
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
diff -up autofs-5.0.2/aclocal.m4.libxml2-workaround autofs-5.0.2/aclocal.m4
--- autofs-5.0.2/aclocal.m4.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/aclocal.m4	2007-09-24 14:26:09.000000000 +0800
@@ -167,6 +167,19 @@ else
   HAVE_LIBXML=1
   XML_LIBS=`$XML_CONFIG --libs`
   XML_FLAGS=`$XML_CONFIG --cflags`
+  XML_VER=`$XML_CONFIG --version`
+  XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
+  if test $XML_MAJOR -le 2
+  then
+    XML_MINOR=`echo $XML_VER|cut -d\. -f2`
+    if test $XML_MINOR -le 6
+    then
+      XML_REV=`echo $XML_VER|cut -d\. -f3`
+      if test $XML_REV -le 99; then
+        AC_DEFINE(LIBXML2_WORKAROUND,1, [Use libxml2 tsd usage workaround])
+      fi
+    fi
+  fi
 fi])
 
 dnl --------------------------------------------------------------------------
diff -up autofs-5.0.2/modules/lookup_ldap.c.libxml2-workaround autofs-5.0.2/modules/lookup_ldap.c
--- autofs-5.0.2/modules/lookup_ldap.c.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/modules/lookup_ldap.c	2007-09-24 14:26:09.000000000 +0800
@@ -1929,9 +1929,6 @@ int lookup_done(void *context)
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	int rv = close_parse(ctxt->parse);
 #ifdef WITH_SASL
-	EVP_cleanup();
-	ERR_free_strings();
-
 	autofs_sasl_done(ctxt);
 #endif
 	free_context(ctxt);
diff -up autofs-5.0.2/daemon/automount.c.libxml2-workaround autofs-5.0.2/daemon/automount.c
--- autofs-5.0.2/daemon/automount.c.libxml2-workaround	2007-09-24 14:25:06.000000000 +0800
+++ autofs-5.0.2/daemon/automount.c	2007-09-24 14:28:56.000000000 +0800
@@ -40,6 +40,9 @@
 #include <sys/utsname.h>
 
 #include "automount.h"
+#ifdef LIBXML2_WORKAROUND
+#include <dlfcn.h>
+#endif
 
 const char *program;		/* Initialized with argv[0] */
 const char *version = VERSION_STRING;	/* Program version */
@@ -1266,22 +1269,6 @@ void *handle_mounts(void *arg)
 	}
 
 	pthread_cleanup_pop(1);
-
-	/*
-	 * A cowboy .. me!
-	 * That noise yu ear aint spuurs sonny!!
-	 *
-	 * The libkrb5support destructor called indirectly through
-	 * libgssapi_krb5 which is used bt libkrb5 (somehow) must run
-	 * to completion before the last thread using it exits so
-	 * that it's per thread data keys are deleted or we get a
-	 * little segfault at exit. So much for dlclose being
-	 * syncronous.
-	 *
-	 * So, the solution is a recipe for disaster.
-	 * Hope we don't get a really busy system!
-	 */
-	/*sleep(1);*/
 	sched_yield();
 
 	return NULL;
@@ -1681,6 +1668,11 @@ int main(int argc, char *argv[])
 		close(start_pipefd[1]);
 		exit(1);
 	}
+
+#ifdef LIBXML2_WORKAROUND
+	void *dh = dlopen("libxml2.so", RTLD_NOW);
+#endif
+
 	if (!master_read_master(master_list, age, 0)) {
 		master_kill(master_list);
 		*pst_stat = 3;
@@ -1702,5 +1694,9 @@ int main(int argc, char *argv[])
 	}
 	closelog();
 
+#ifdef LIBXML2_WORKAROUND
+	if (dh)
+		dlclose(dh);
+#endif
 	exit(0);
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- autofs.spec	5 Sep 2007 05:11:13 -0000	1.222
+++ autofs.spec	24 Sep 2007 06:58:44 -0000	1.223
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.2
-Release: 15
+Release: 16
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -28,6 +28,9 @@
 Patch15: autofs-5.0.2-fix-mount-nfs-nosymlink.patch
 Patch16: autofs-5.0.2-default-nsswitch.patch
 Patch17: autofs-5.0.2-add-ldap-schema-discovery.patch
+Patch18: autofs-5.0.2-ldap-schema-discovery-config-update.patch
+Patch19: autofs-5.0.2-libxml2-workaround.patch
+Patch20: autofs-5.0.2-foreground-logging.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
 Conflicts: kernel < 2.6.17
@@ -87,6 +90,9 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -139,6 +145,11 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Sep 24 2007 Ian Kent <ikent at redhat.com> - 5.0.2-16
+- add descriptive comments to config about LDAP schema discovery.
+- work around segfault at exit caused by libxml2.
+- fix foreground logging (also fixes shutdown needing extra signal bug).
+
 * Wed Sep 5 2007 Ian Kent <ikent at redhat.com> - 5.0.2-15
 - fix LDAP schema discovery.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 07:31:14 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 24 Sep 2007 03:31:14 -0400
Subject: rpms/gmp/devel gmp.spec,1.45,1.46
Message-ID: <200709240731.l8O7VEXf004854@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4810

Modified Files:
	gmp.spec 
Log Message:
- fix libgmpxx.so link



Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gmp.spec	20 Sep 2007 08:48:03 -0000	1.45
+++ gmp.spec	24 Sep 2007 07:30:40 -0000	1.46
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -91,7 +91,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib{gmp,mp,gmpxx}.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-ln -sf libgmpxx.so.3 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
+ln -sf libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so
 cd ..
 %ifarch %{ix86}
 cd build-sse2
@@ -182,6 +182,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Mon Sep 24 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-3
+- fix libgmpxx.so link
+
 * Thu Sep 20 2007 Ivana Varekova <varekova at redhat.com> 4.2.2-2
 - fix check tag
 



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:47 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:07:47 -0700
Subject: [pkgdb] lohit-fonts was added for rbhalera
Message-ID: <200709240907.l8O97lus003787@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package lohit-fonts with summary Lohit TrueType fonts for Indic languages
Jens Petersen (petersen) has approved Package lohit-fonts
Jens Petersen (petersen) has added a Fedora devel branch for lohit-fonts with an owner of rbhalera
Jens Petersen (petersen) has approved lohit-fonts in Fedora devel
Jens Petersen (petersen) has approved Package lohit-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on lohit-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on lohit-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:51 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97pn8003810@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:54 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:54 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97sGc003832@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:06:12 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:06:12 -0700
Subject: [pkgdb] ocaml Orphaned
Message-ID: <200709240907.l8O97vp2030062@app4.fedora.phx.redhat.com>

Package ocaml in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From fedora-extras-commits at redhat.com  Mon Sep 24 09:06:17 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:06:17 -0700
Subject: [pkgdb] ocaml Orphaned
Message-ID: <200709240907.l8O97w2D030077@app4.fedora.phx.redhat.com>

Package ocaml in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:59 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:59 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240907.l8O97xXt003865@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:47 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:07:47 -0700
Subject: [pkgdb] lohit-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240907.l8O97x0U030085@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on lohit-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on lohit-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:52 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:52 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240908.l8O9807L030105@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:07:57 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:07:57 -0700
Subject: [pkgdb] ocaml-camlimages Orphaned
Message-ID: <200709240908.l8O980vd030116@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:05 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:05 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O986Q7030156@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:07 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:07 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O987pC003928@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:09 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:09 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O989Ha030177@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:11 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:11 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O98BuJ003946@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:12 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:12 -0700
Subject: [pkgdb] ocaml-SDL Orphaned
Message-ID: <200709240908.l8O98C43030201@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98JU2004012@app3.fedora.phx.redhat.com>

Package freetennis in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98JZ5030247@app4.fedora.phx.redhat.com>

Package freetennis in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:19 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98K1m030256@app4.fedora.phx.redhat.com>

Package freetennis in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:20 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:20 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98KJP004026@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:22 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:08:22 -0700
Subject: [pkgdb] freetennis Orphaned
Message-ID: <200709240908.l8O98MAT004040@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:27 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:27 -0400
Subject: rpms/lohit-fonts - New directory
Message-ID: <200709240908.l8O98Rh5019889@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts

Log Message:
Directory /cvs/extras/rpms/lohit-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:31 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:31 -0400
Subject: rpms/lohit-fonts/devel - New directory
Message-ID: <200709240908.l8O98VXL019903@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts/devel

Log Message:
Directory /cvs/extras/rpms/lohit-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:34 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:34 -0400
Subject: rpms/lohit-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240908.l8O98Yxo019928@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module lohit-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module lohit-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 09:08:36 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:08:36 -0400
Subject: rpms/lohit-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709240908.l8O98aMF019944@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsU19858/rpms/lohit-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lohit-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lohit-fonts
# $Id: Makefile,v 1.1 2007/09/24 09:08:35 petersen Exp $
NAME := lohit-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 fedora-extras-commits at redhat.com  Mon Sep 24 09:18:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:18:04 -0700
Subject: [pkgdb] baekmuk-bdf-fonts (Fedora, devel) updated by petersen
Message-ID: <200709240918.l8O9I50S007158@app3.fedora.phx.redhat.com>

Jens Petersen (petersen) approved watchbugzilla on baekmuk-bdf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) approved watchcommits on baekmuk-bdf-fonts (Fedora devel) for petersen
Jens Petersen (petersen) Approved cvsextras for commit access on baekmuk-bdf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-bdf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:22 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:22 -0400
Subject: rpms/baekmuk-bdf-fonts - New directory
Message-ID: <200709240918.l8O9IMiD020231@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts

Log Message:
Directory /cvs/extras/rpms/baekmuk-bdf-fonts added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:29 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:29 -0400
Subject: rpms/baekmuk-bdf-fonts/devel - New directory
Message-ID: <200709240918.l8O9ITLH020251@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts/devel

Log Message:
Directory /cvs/extras/rpms/baekmuk-bdf-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:31 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:31 -0400
Subject: rpms/baekmuk-bdf-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709240918.l8O9IV1p020276@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module baekmuk-bdf-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module baekmuk-bdf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:33 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 05:18:33 -0400
Subject: rpms/baekmuk-bdf-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709240918.l8O9IXBv020292@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/petersen/admin/tmpcvsM20200/rpms/baekmuk-bdf-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module baekmuk-bdf-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: baekmuk-bdf-fonts
# $Id: Makefile,v 1.1 2007/09/24 09:18:32 petersen Exp $
NAME := baekmuk-bdf-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 fedora-extras-commits at redhat.com  Mon Sep 24 09:18:58 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:58 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested watchbugzilla
Message-ID: <200709240918.l8O9Ixib007461@app3.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the watchbugzilla acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:04 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 02:18:04 -0700
Subject: [pkgdb] baekmuk-bdf-fonts was added for cchance
Message-ID: <200709240922.l8O9MbgC002369@app4.fedora.phx.redhat.com>

Jens Petersen (petersen) has added Package baekmuk-bdf-fonts with summary Korean bitmap fonts
Jens Petersen (petersen) has approved Package baekmuk-bdf-fonts
Jens Petersen (petersen) has added a Fedora devel branch for baekmuk-bdf-fonts with an owner of cchance
Jens Petersen (petersen) has approved baekmuk-bdf-fonts in Fedora devel
Jens Petersen (petersen) has approved Package baekmuk-bdf-fonts
Jens Petersen (petersen) has set commit to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)
Jens Petersen (petersen) has set build to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)
Jens Petersen (petersen) has set checkout to Approved for cvsextras on baekmuk-bdf-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/baekmuk-bdf-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:25 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:25 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested commit
Message-ID: <200709240922.l8O9MbYS002384@app4.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the commit acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:18:57 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:18:57 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested watchcommits
Message-ID: <200709240922.l8O9Mcrg002396@app4.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the watchcommits acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:22:36 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:22:36 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240922.l8O9Mcab002408@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:05 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:05 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240923.l8O9N6ax008902@app3.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:07 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:07 -0700
Subject: [pkgdb] ocaml-SDL Owned
Message-ID: <200709240923.l8O9N7Kg002539@app4.fedora.phx.redhat.com>

Package ocaml-SDL in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:28 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:28 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NTk0008999@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:44 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:44 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NiX4009058@app3.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:23:46 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:23:46 -0700
Subject: [pkgdb] ocaml-camlimages Owned
Message-ID: <200709240923.l8O9NkiN002691@app4.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:20 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:20 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OLNp009219@app3.fedora.phx.redhat.com>

Package freetennis in Fedora devel is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:24 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:24 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OOq5002878@app4.fedora.phx.redhat.com>

Package freetennis in Fedora 7 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:24:25 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 02:24:25 -0700
Subject: [pkgdb] freetennis Owned
Message-ID: <200709240924.l8O9OP6e009233@app3.fedora.phx.redhat.com>

Package freetennis in Fedora 6 is now owned by Richard W.M. Jones (rjones)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freetennis



From fedora-extras-commits at redhat.com  Mon Sep 24 09:26:16 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 02:26:16 -0700
Subject: [pkgdb] lohit-fonts: pnemade has requested approveacls
Message-ID: <200709240926.l8O9QGUB009699@app3.fedora.phx.redhat.com>

Parag Nemade (pnemade) has requested the approveacls acl on lohit-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lohit-fonts



From fedora-extras-commits at redhat.com  Mon Sep 24 09:30:41 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 24 Sep 2007 05:30:41 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.20, 1.21 sources,
	1.22, 1.23 system-config-network.spec, 1.29, 1.30
Message-ID: <200709240930.l8O9UfbP020662@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20628

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
- version 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Aug 2007 15:16:55 -0000	1.20
+++ .cvsignore	24 Sep 2007 09:30:09 -0000	1.21
@@ -1 +1 @@
-system-config-network-1.4.0.tar.gz
+system-config-network-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	16 Aug 2007 15:16:55 -0000	1.22
+++ sources	24 Sep 2007 09:30:09 -0000	1.23
@@ -1 +1 @@
-45ffcc68fa76f47e3e330225a36eab1c  system-config-network-1.4.0.tar.gz
+6914d78d70dbe5ec8ea7372047decaaf  system-config-network-1.4.1.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-network.spec	17 Aug 2007 15:02:12 -0000	1.29
+++ system-config-network.spec	24 Sep 2007 09:30:09 -0000	1.30
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -15,7 +15,6 @@
 Requires: libglade2, pygtk2-libglade, pygtk2, gnome-python2, gnome-python2-canvas
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 This is the GUI of the network configuration tool,
 supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
@@ -69,6 +68,8 @@
 %{_bindir}/system-control-network
 %{_sbindir}/neat
 %{_bindir}/neat
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*
 
 %files -f %{name}.lang tui
 %defattr(-,root,root)
@@ -85,8 +86,6 @@
 %{_datadir}/system-config-network/netconfpkg/*.idl
 %{_datadir}/system-config-network/module-info
 %{_datadir}/system-config-network/providerdb
-%{_datadir}/pixmaps/*
-%{_datadir}/applications/*
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_sbindir}/neat-tui
@@ -97,8 +96,8 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 1.4.0-2
-- fixed desktop categories and build root
+* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
+- version 1.4.1
 
 * Thu Aug 16 2007 Harald Hoyer <harald at redhat.com> - 1.4.0
 - version 1.4.0



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:51 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9Xp47011703@app3.fedora.phx.redhat.com>

Package calcurse in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:52 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:52 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9XqlZ011714@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:57 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:57 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240933.l8O9Xvdd011733@app3.fedora.phx.redhat.com>

Package calcurse in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:29 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:29 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YTTm011897@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:36 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:36 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YaZ0011938@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:44 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:44 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YiZS011974@app3.fedora.phx.redhat.com>

Package cvsutils in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:56 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:56 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240934.l8O9Yj3K005543@app4.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:33:58 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:33:58 -0700
Subject: [pkgdb] calcurse Orphaned
Message-ID: <200709240934.l8O9YkSt005550@app4.fedora.phx.redhat.com>

Package calcurse in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:33 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:33 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YkDp005557@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:40 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:40 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9Yk0N005567@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 3 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:34:45 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:34:45 -0700
Subject: [pkgdb] cvsutils Orphaned
Message-ID: <200709240934.l8O9YlZS005579@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:01 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:01 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z2Ht005647@app4.fedora.phx.redhat.com>

Package redet in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:04 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:04 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z45v012073@app3.fedora.phx.redhat.com>

Package redet in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:05 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:05 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z5Gu005665@app4.fedora.phx.redhat.com>

Package redet in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:06 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:06 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z6pX012086@app3.fedora.phx.redhat.com>

Package redet in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:08 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:08 -0700
Subject: [pkgdb] redet Orphaned
Message-ID: <200709240935.l8O9Z8J0005685@app4.fedora.phx.redhat.com>

Package redet in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:16 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:16 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZGF1005725@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:17 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:17 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZHDU012139@app3.fedora.phx.redhat.com>

Package redet-doc in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:18 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:18 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZIQd005739@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:20 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:20 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZKfm012158@app3.fedora.phx.redhat.com>

Package redet-doc in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:21 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:21 -0700
Subject: [pkgdb] redet-doc Orphaned
Message-ID: <200709240935.l8O9ZLZC005760@app4.fedora.phx.redhat.com>

Package redet-doc in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/redet-doc



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:30 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:30 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZVsC005802@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:34 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:34 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZYst005826@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:36 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:36 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9Za23012235@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:33 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:33 -0700
Subject: [pkgdb] timidity++ Orphaned
Message-ID: <200709240935.l8O9ZXqC012215@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:49 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:49 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZnoM012298@app3.fedora.phx.redhat.com>

Package windowlab in Fedora devel was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:50 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:50 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zor1005895@app4.fedora.phx.redhat.com>

Package windowlab in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:51 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:51 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zpdk012308@app3.fedora.phx.redhat.com>

Package windowlab in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:53 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:53 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZrrU005910@app4.fedora.phx.redhat.com>

Package windowlab in Fedora 7 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:54 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:54 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9ZsME012327@app3.fedora.phx.redhat.com>

Package windowlab in Fedora 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:35:55 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:35:55 -0700
Subject: [pkgdb] windowlab Orphaned
Message-ID: <200709240935.l8O9Zut6005932@app4.fedora.phx.redhat.com>

Package windowlab in Fedora 6 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/windowlab



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:19 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:19 -0700
Subject: [pkgdb] SDL_image Orphaned
Message-ID: <200709240937.l8O9bJmS012701@app3.fedora.phx.redhat.com>

Package SDL_image in Fedora EPEL 5 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:27 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:27 -0700
Subject: [pkgdb] SDL_image: nigelj has given up watchbugzilla
Message-ID: <200709240937.l8O9bRmc012733@app3.fedora.phx.redhat.com>

Nigel Jones (nigelj) has given up the watchbugzilla acl on SDL_image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 10:01:25 2007
From: fedora-extras-commits at redhat.com (Parag Nemade (pnemade))
Date: Mon, 24 Sep 2007 06:01:25 -0400
Subject: rpms/lohit-fonts/devel lohit-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709241001.l8OA1PRH032106@cvs-int.fedora.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26045/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lohit-fonts.spec 
Log Message:
Initial import



--- NEW FILE lohit-fonts.spec ---
%define xfontdir        %{_datadir}/fonts
%define langlist        "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"

Name:        lohit-fonts
Version:     2.1.5
Release:     3%{?dist}
Summary:     Free Indian truetype/opentype fonts

Group:       User Interface/X
License:     GPLv2
URL:         http://fedoraproject.org/wiki/Lohit
# Full URL of source http://fedoraproject.org/wiki/Lohit?action=AttachFile&do=get&target=fonts-indic-%{version}.tar.gz
Source:      fonts-indic-%{version}.tar.gz
BuildArch:   noarch
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
This package provides Hindi, Bengali, Gujarati, Punjabi, Tamil,
Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.

# mk_pkg <name> <lang-code> 
%define mk_pkg() \
%package -n lohit-fonts-%1\
Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") font\
Group:      User Interface/X \
# strictly we only need to provide bn, gu, hi, pa, ta \
Provides:   ttfonts-%2 = 1.8-2\
Obsoletes : ttfonts-%2 <= 1.8-1\
\
\
%description -n lohit-fonts-%1\
This package provides a free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype font.\
\
%files -n lohit-fonts-%1\
%defattr(-, root, root, -)\
%doc COPYING README AUTHORS\
%dir %{xfontdir}/lohit-%1\
%{xfontdir}/lohit-%1/*.ttf\
\
%post -n lohit-fonts-%1 \
if [ -x %{_bindir}/fc-cache ]; then \
  %{_bindir}/fc-cache %{xfontdir} \
fi \
\
%postun -n lohit-fonts-%1 \
if [ "$1" = "0" ]; then \
  if [ -x %{_bindir}/fc-cache ]; then \
    %{_bindir}/fc-cache %{xfontdir} \
  fi \
fi 

%mk_pkg bengali bn 
%mk_pkg gujarati gu
%mk_pkg hindi hi
%mk_pkg kannada kn 
%mk_pkg malayalam ml 
%mk_pkg oriya or 
%mk_pkg punjabi pa
%mk_pkg tamil ta 
%mk_pkg telugu te

%prep
%setup -q -n fonts-indic-%{version}

%build
echo "Nothing to do in Build."

%install
rm -rf $RPM_BUILD_ROOT

for i in "%{langlist}"
do
  install -d $RPM_BUILD_ROOT/%{xfontdir}/lohit-$i
  install -m 0644 $i/* $RPM_BUILD_ROOT/%{xfontdir}/lohit-$i
done

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
- SPEC cleanups as suggested in review. 

* Mon Sep 17 2007 Rahul Bhalerao <rbhalera at redhat.com>
- Spec file update as part of review

* Tue Sep 11 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-1.fc8
- This package is derived from the fonts-indic package to reflect the upstream
  project name [RH #253158]


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 09:08:35 -0000	1.1
+++ .cvsignore	24 Sep 2007 10:00:53 -0000	1.2
@@ -0,0 +1 @@
+fonts-indic-2.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 09:08:35 -0000	1.1
+++ sources	24 Sep 2007 10:00:53 -0000	1.2
@@ -0,0 +1 @@
+bb9497ee772062b97ff00a1a68b17c98  fonts-indic-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 10:08:24 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 06:08:24 -0400
Subject: rpms/yasm/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 yasm.spec,
	1.13, 1.14
Message-ID: <200709241008.l8OA8OKh032442@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/yasm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32404

Modified Files:
	.cvsignore sources yasm.spec 
Log Message:
Update to 0.6.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jun 2007 11:18:16 -0000	1.5
+++ .cvsignore	24 Sep 2007 10:07:51 -0000	1.6
@@ -1 +1 @@
-yasm-0.6.1.tar.gz
+yasm-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jun 2007 11:18:16 -0000	1.5
+++ sources	24 Sep 2007 10:07:51 -0000	1.6
@@ -1 +1 @@
-2add4f9253681d1dc6084c6676b98468  yasm-0.6.1.tar.gz
+a9d5508702991de2bdd0903b8ba680ba  yasm-0.6.2.tar.gz


Index: yasm.spec
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yasm.spec	23 Aug 2007 08:45:39 -0000	1.13
+++ yasm.spec	24 Sep 2007 10:07:51 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Complete rewrite of the NASM assembler
 Name: yasm
-Version: 0.6.1
-Release: 3%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
 # See COPYING for the detail, there is quite a lot!
 License: BSD and (Artistic or GPLv2+ or LGPLv2+) and LGPLv2
 Group: Development/Languages
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Matthias Saou <http://freshrpms.net/> 0.6.2-1
+- Update to 0.6.2.
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 0.6.1-3
 - Rebuild for new BuildID feature.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:18 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:18 -0700
Subject: [pkgdb] SDL_image Orphaned
Message-ID: <200709241020.l8OAK4sb019181@app4.fedora.phx.redhat.com>

Package SDL_image in Fedora EPEL 4 was orphaned by Nigel Jones (nigelj)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 09:37:25 2007
From: fedora-extras-commits at redhat.com (Nigel Jones (dev))
Date: Mon, 24 Sep 2007 02:37:25 -0700
Subject: [pkgdb] SDL_image: nigelj has given up watchcommits
Message-ID: <200709241020.l8OAK5dr019190@app4.fedora.phx.redhat.com>

Nigel Jones (nigelj) has given up the watchcommits acl on SDL_image (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SDL_image



From fedora-extras-commits at redhat.com  Mon Sep 24 10:19:59 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:19:59 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK6LY019212@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 7 is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:20:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:20:04 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK6YF019222@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:19:54 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 03:19:54 -0700
Subject: [pkgdb] cvsutils Owned
Message-ID: <200709241020.l8OAK5Yt019202@app4.fedora.phx.redhat.com>

Package cvsutils in Fedora devel is now owned by Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 11:06:20 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Mon, 24 Sep 2007 07:06:20 -0400
Subject: rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-treeview.patch,
	1.1, 1.2 gtk-nodoka-engine.spec, 1.7, 1.8
Message-ID: <200709241106.l8OB6KOT007608@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7577

Modified Files:
	gtk-nodoka-engine-0.6-treeview.patch gtk-nodoka-engine.spec 
Log Message:


Update the treeview patch (rhbz #297271 and #302551)



gtk-nodoka-engine-0.6-treeview.patch:

Index: gtk-nodoka-engine-0.6-treeview.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine-0.6-treeview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-nodoka-engine-0.6-treeview.patch	20 Sep 2007 20:50:17 -0000	1.1
+++ gtk-nodoka-engine-0.6-treeview.patch	24 Sep 2007 11:05:46 -0000	1.2
@@ -1,12 +1,21 @@
 diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
---- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-20 22:33:33.000000000 +0200
-+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:34:50.000000000 +0200
+--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-24 12:43:18.000000000 +0200
++++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-24 12:44:03.000000000 +0200
+@@ -33,7 +33,7 @@ style "fedora-default"
+ 	ythickness			= 1
+ 
+   	GtkTreeView::odd_row_color 	= shade (0.929458256, @base_color)
+-  	GtkTreeView::even_row_color 	= @base_color
++#  	GtkTreeView::even_row_color 	= @base_color
+ 
+ 	fg[NORMAL]			= @fg_color
+ 	fg[PRELIGHT]			= @fg_color
 @@ -49,13 +49,13 @@ style "fedora-default"
  
  	base[NORMAL]			= @base_color
  	base[PRELIGHT]			= shade (0.3967, @base_color)
 -	base[ACTIVE]			= shade (0.9437, @bg_color)
-+	base[ACTIVE]			= shade (0.65, @selected_fg_color)
++	base[ACTIVE]			= shade (0.52, @selected_fg_color)
  	base[SELECTED]			= @selected_bg_color
  	base[INSENSITIVE]		= shade (0.9437, @bg_color)
  


Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk-nodoka-engine.spec	23 Sep 2007 14:47:07 -0000	1.7
+++ gtk-nodoka-engine.spec	24 Sep 2007 11:05:46 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
@@ -55,9 +55,13 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Mon Sep 24 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-4
+- update the treeview patch
+ - rhbz #297271 and rhbz #302551
+
 * Sun Sep 23 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-3
 - Require at least the version of gtk it was build against
--- rhbz 301851 (patch from Ignacio Vazquez-Abrams)
+ - rhbz #301851 (patch from Ignacio Vazquez-Abrams)
 
 * Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
 - Add user specified tooltips coloring



From fedora-extras-commits at redhat.com  Mon Sep 24 11:55:33 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:55:33 -0400
Subject: rpms/drupal/devel drupal-README.fedora,1.1,1.2 drupal.spec,1.3,1.4
Message-ID: <200709241155.l8OBtXBB008992@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8927

Modified Files:
	drupal-README.fedora drupal.spec 
Log Message:
Minor doc correction, BZ 301541



Index: drupal-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drupal-README.fedora	23 Jul 2007 23:55:51 -0000	1.1
+++ drupal-README.fedora	24 Sep 2007 11:55:00 -0000	1.2
@@ -2,14 +2,20 @@
 
 1. DB setup
 
-Follow the installation instructions in INSTALL.*.txt to complete the setup
-of and connection of Drupal to the required database, including chmod 644 on
-/etc/drupal/default/settings.php, uncommenting the appropriate line in 
+To begin with, install php-mysql or php-pgsql, depending on which db backend
+you intend to use.
+
+Then, follow the installation instructions in INSTALL.*.txt to complete the 
+setup of and connection of Drupal to the required database, including chmod 
+666 on /etc/drupal/default/settings.php, uncommenting the appropriate line in 
 /etc/httpd/conf.d/drupal.conf, and restarting httpd.
 
 Once these steps have been completed, you should be ready to connect to http://yourhost/drupal
 to complete the initial setup.
 
+Remember to change the /etc/drupal/default/settings.php permissions back to 
+644 when you've finished the initial setup.
+
 2. Enable remote access
 
 Drupal ships in Fedora with all non-localhost access disabled.  Comment and


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drupal.spec	16 Aug 2007 12:07:43 -0000	1.3
+++ drupal.spec	24 Sep 2007 11:55:00 -0000	1.4
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
 Version:  5.2
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -69,6 +69,9 @@
 %dir %attr(755,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-3
+- Minor doc correction, BZ 301541.
+
 * Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-2
 - License tag correction.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:03:38 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 24 Sep 2007 08:03:38 -0400
Subject: rpms/timidity++/devel timidity++.spec,1.13,1.14
Message-ID: <200709241203.l8OC3c90015654@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15622

Modified Files:
	timidity++.spec 
Log Message:
spec/license fixes


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- timidity++.spec	12 Jul 2006 08:28:56 -0000	1.13
+++ timidity++.spec	24 Sep 2007 12:03:06 -0000	1.14
@@ -1,9 +1,9 @@
-Summary: A software wavetable MIDI synthesizer.
+Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 1.2.2
+Release: 2%{?dist}
 Group: Applications/Multimedia
-Source: http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
 Source2: timidity.cfg
 Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2
@@ -14,8 +14,8 @@
 Patch5: TiMidity++-2.13.0-64bit.patch
 Patch6: TiMidity++-2.13.0-warnings.patch
 Patch7: TiMidity++-2.13.0-esd.patch
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-root
+License: GPLv2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: timidity++-X11
 BuildRequires: arts-devel esound-devel autoconf alsa-lib-devel ncurses-devel
 
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Sep 24 2007 Jindrich Novy <jnovy at redhat.com> 2.13.2-2
+- spec/license fixes
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.2
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:04:54 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Mon, 24 Sep 2007 08:04:54 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.43,1.44
Message-ID: <200709241204.l8OC4sF1015730@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15628

Modified Files:
	gnuplot.spec 
Log Message:

- spec file cleanup 



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnuplot.spec	7 Sep 2007 08:46:37 -0000	1.43
+++ gnuplot.spec	24 Sep 2007 12:04:20 -0000	1.44
@@ -2,21 +2,24 @@
 %define minor 2
 %define patchlevel 0
 
+%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
+
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
 Patch1: gnuplot-4.2.0-refers_to.patch
-Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
-BuildRequires: latex2html, gnuplot
+BuildRequires: latex2html
 Requires: libpng
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnuplot.info/
 
@@ -41,7 +44,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .refto
-%patch2 -p1 -b .ver
+sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
 
 %build
 %configure --with-readline=gnu --with-png --without-linux-vga \
@@ -52,26 +55,30 @@
 cd docs
 make html
 cd psdoc
-make 
+export GNUPLOT_PS_DIR=../../term/PostScript
 make ps_symbols.ps ps_fontfile_doc.pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/
-install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
+install -p -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
 install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/gnuplot
 mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
 mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
 
+mkdir -p $RPM_BUILD_ROOT%{x11_app_defaults_dir}
+mv $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/Gnuplot.app-defaults $RPM_BUILD_ROOT%{x11_app_defaults_dir}/Gnuplot
+rm -rf $RPM_BUILD_ROOT%{_libdir}/
+
 %post 
-/sbin/install-info --quiet %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
 
 %preun
 if [ "$1" = "0" ] ; then # last uninstall
-   /sbin/install-info --delete %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
 fi
 
 %clean
@@ -81,7 +88,7 @@
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
 %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
-%doc docs/psdoc/ps_fontfile_doc.pdf
+%doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs
 %dir %{_libexecdir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -92,8 +99,12 @@
 %dir %{_datadir}/gnuplot/%{major}.%{minor}/PostScript
 %{_datadir}/gnuplot/%{major}.%{minor}/PostScript/*.ps
 %{_datadir}/gnuplot/%{major}.%{minor}/gnuplot.gih
+%dir %{_datadir}/texmf
+%dir %{_datadir}/texmf/tex
+%dir %{_datadir}/texmf/tex/latex
+%dir %{_datadir}/texmf/tex/latex/gnuplot
 %{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
-%{_libdir}/X11/app-defaults/Gnuplot.app-defaults
+%{x11_app_defaults_dir}/Gnuplot
 %{_infodir}/gnuplot.info.gz
 
 %files emacs
@@ -105,6 +116,9 @@
 %{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
 
 %changelog
+* Mon Sep 24 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-6
+- spec file cleanup
+
 * Fri Sep  7 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-5
 - move emacs files to */site-lisp/gnuplot subdirectory
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:06:03 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 08:06:03 -0400
Subject: rpms/bind/devel bind.spec, 1.216, 1.217 bind-9.3.3-edns.patch, 1.2,
	NONE
Message-ID: <200709241206.l8OC63si015766@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15740

Modified Files:
	bind.spec 
Removed Files:
	bind-9.3.3-edns.patch 
Log Message:
- removed bind-9.3.3-edns.patch patch (see #275091 for reasons)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- bind.spec	20 Sep 2007 11:07:30 -0000	1.216
+++ bind.spec	24 Sep 2007 12:05:29 -0000	1.217
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	12.4.%{RELEASEVER}%{?dist}
+Release: 	13.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,7 +58,6 @@
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
-Patch52:	bind-9.3.3-edns.patch
 Patch63:	bind-9.4.0-dnssec-directory.patch
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
@@ -233,7 +232,6 @@
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %endif
 %patch32 -p1 -b .prctl_set_dumpable
-%patch52 -p1 -b .edns
 %if %{SDB}
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
@@ -645,6 +643,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-13.a6
+- removed bind-9.3.3-edns.patch patch (see #275091 for reasons)
+
 * Thu Sep 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-12.4.a6
 - build with O2
 - removed "autotools" patch


--- bind-9.3.3-edns.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 12:15:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 08:15:53 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241215.l8OCFrEm016562@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel

Modified Files:
	.cvsignore sources 
Added Files:
	baekmuk-bdf-fonts.spec 
Log Message:
initial import (#302451)



--- NEW FILE baekmuk-bdf-fonts.spec ---
%define upstreamname   baekmuk-bdf

%define fontdir      %{_datadir}/fonts/%{upstreamname}
%define catalogue    %{_sysconfdir}/X11/fontpath.d

Name:           %{upstreamname}-fonts
Version:        2.2
Release:        3%{?dist}
Summary:        Korean bitmap fonts

Group:          User Interface/X
License:        Baekmuk
URL:            http://kldp.net/frs/?group_id=57&release_id=865
Source:  http://kldp.net/frs/download.php/1428/%{upstreamname}-%{version}.tar.gz
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  xorg-x11-font-utils
Conflicts:      fonts-korean < 2.2-5

%description
This package provides the Korean Baekmuk bitmap fonts.


%prep
%setup -q -n %{upstreamname}-%{version}

%build
for file in bdf/*.bdf; do
    bdftopcf $file | gzip -9 > ${file%.bdf}.pcf.gz
done

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}

# for bmp font
install -m 0644 bdf/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/
install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/ttfonts-ko.alias

# for catalogue
install -d $RPM_BUILD_ROOT%{catalogue}
ln -sf ../../..%{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}

mkfontdir $RPM_BUILD_ROOT%{fontdir} 

# convert Korean copyright file to utf8
iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi

%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi

%files
%defattr(-,root,root,-)
%doc COPYRIGHT COPYRIGHT.ko README
%dir %{fontdir}
%{fontdir}/*.gz
%{fontdir}/ttfonts-ko.alias
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/%{name}

%changelog
* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
- conflict with fonts-korean < 2.2-5

* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-2
- convert Korean copyright file to utf8 (Mamoru Tasaka, #302451)

* Tue Sep 11 2007 Jens Petersen <petersen at redhat.com> - 2.2-1
- initial packaging separated from fonts-korean (#253155)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-bdf-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 09:18:32 -0000	1.1
+++ .cvsignore	24 Sep 2007 12:15:20 -0000	1.2
@@ -0,0 +1 @@
+baekmuk-bdf-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baekmuk-bdf-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 09:18:32 -0000	1.1
+++ sources	24 Sep 2007 12:15:20 -0000	1.2
@@ -0,0 +1 @@
+48c0405ffbdf45e1311a978b65b47f4c  baekmuk-bdf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 12:41:05 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 08:41:05 -0400
Subject: rpms/bind/devel bind-9.5-edns.patch,NONE,1.1 bind.spec,1.217,1.218
Message-ID: <200709241241.l8OCf5mF017371@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17273

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-edns.patch 
Log Message:
- added edns patch again (#275091)


bind-9.5-edns.patch:

--- NEW FILE bind-9.5-edns.patch ---
diff -up bind-9.5.0a6/lib/dns/view.c.edns bind-9.5.0a6/lib/dns/view.c
--- bind-9.5.0a6/lib/dns/view.c.edns	2007-06-19 01:47:42.000000000 +0200
+++ bind-9.5.0a6/lib/dns/view.c	2007-09-19 17:46:10.000000000 +0200
@@ -179,6 +179,7 @@ dns_view_create(isc_mem_t *mctx, dns_rda
 	view->flush = ISC_FALSE;
 	view->dlv = NULL;
 	view->maxudp = 0;
+	view->edns = ISC_TRUE;
 	dns_fixedname_init(&view->dlv_fixed);
 
 	result = dns_order_create(view->mctx, &view->order);
diff -up bind-9.5.0a6/lib/dns/resolver.c.edns bind-9.5.0a6/lib/dns/resolver.c
--- bind-9.5.0a6/lib/dns/resolver.c.edns	2007-09-19 17:46:10.000000000 +0200
+++ bind-9.5.0a6/lib/dns/resolver.c	2007-09-19 17:47:19.000000000 +0200
@@ -1484,10 +1484,12 @@ resquery_send(resquery_t *query) {
 	 * The ADB does not know about servers with "edns no".  Check this,
 	 * and then inform the ADB for future use.
 	 */
-	if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0 &&
-	    peer != NULL &&
-	    dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
-	    !useedns)
+	if (((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0 ||
+             (query->options & DNS_FETCHOPT_NOEDNS0) == 0) &&
+	    (!(res->view->edns) ||
+	     (peer != NULL &&
+	      dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
+	      !useedns)))
 	{
 		query->options |= DNS_FETCHOPT_NOEDNS0;
 		dns_adb_changeflags(fctx->adb,
diff -up bind-9.5.0a6/lib/dns/include/dns/view.h.edns bind-9.5.0a6/lib/dns/include/dns/view.h
--- bind-9.5.0a6/lib/dns/include/dns/view.h.edns	2007-06-19 01:47:42.000000000 +0200
+++ bind-9.5.0a6/lib/dns/include/dns/view.h	2007-09-19 17:46:10.000000000 +0200
@@ -137,6 +137,7 @@ struct dns_view {
 	dns_name_t *			dlv;
 	dns_fixedname_t			dlv_fixed;
 	isc_uint16_t			maxudp;
+	isc_boolean_t			edns;
 
 	/*
 	 * Configurable data for server use only,
diff -up bind-9.5.0a6/lib/isccfg/namedconf.c.edns bind-9.5.0a6/lib/isccfg/namedconf.c
--- bind-9.5.0a6/lib/isccfg/namedconf.c.edns	2007-06-19 01:47:50.000000000 +0200
+++ bind-9.5.0a6/lib/isccfg/namedconf.c	2007-09-19 17:46:10.000000000 +0200
@@ -618,6 +618,7 @@ options_clauses[] = {
 	{ "deallocate-on-exit", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "directory", &cfg_type_qstring, CFG_CLAUSEFLAG_CALLBACK },
 	{ "dump-file", &cfg_type_qstring, 0 },
+	{ "edns", &cfg_type_boolean, 0 },
 	{ "fake-iquery", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "files", &cfg_type_size, 0 },
 	{ "has-old-clients", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
diff -up bind-9.5.0a6/doc/misc/options.edns bind-9.5.0a6/doc/misc/options
--- bind-9.5.0a6/doc/misc/options.edns	2007-03-29 17:19:20.000000000 +0200
+++ bind-9.5.0a6/doc/misc/options	2007-09-19 17:46:10.000000000 +0200
@@ -11,6 +11,7 @@ options {
         deallocate-on-exit <boolean>; // obsolete
         directory <quoted_string>;
         dump-file <quoted_string>;
+	edns <boolean>;
         fake-iquery <boolean>; // obsolete
         files <size>;
         has-old-clients <boolean>; // obsolete
diff -up bind-9.5.0a6/bin/named/config.c.edns bind-9.5.0a6/bin/named/config.c
--- bind-9.5.0a6/bin/named/config.c.edns	2007-06-19 01:47:18.000000000 +0200
+++ bind-9.5.0a6/bin/named/config.c	2007-09-19 17:46:10.000000000 +0200
@@ -137,6 +137,7 @@ options {\n\
 	acache-enable no;\n\
 	acache-cleaning-interval 60;\n\
 	max-acache-size 0;\n\
+	edns yes;\n\
 	dnssec-enable yes;\n\
 	dnssec-validation no; /* Make yes for 9.5. */ \n\
 	dnssec-accept-expired no;\n\
diff -up bind-9.5.0a6/bin/named/server.c.edns bind-9.5.0a6/bin/named/server.c
--- bind-9.5.0a6/bin/named/server.c.edns	2007-09-19 17:46:10.000000000 +0200
+++ bind-9.5.0a6/bin/named/server.c	2007-09-19 17:46:10.000000000 +0200
@@ -1624,7 +1624,12 @@ configure_view(dns_view_t *view, const c
 	dns_resolver_setclientsperquery(view->resolver,
 					cfg_obj_asuint32(obj),
 					max_clients_per_query);
-			
+
+	obj = NULL;
+	result = ns_config_get(maps, "edns", &obj);
+	INSIST(result == ISC_R_SUCCESS);
+	view->edns = cfg_obj_asboolean(obj);
+
 	obj = NULL;
 	result = ns_config_get(maps, "dnssec-enable", &obj);
 	INSIST(result == ISC_R_SUCCESS);
diff -up bind-9.5.0a6/bin/named/named.conf.5.edns bind-9.5.0a6/bin/named/named.conf.5
--- bind-9.5.0a6/bin/named/named.conf.5.edns	2007-06-20 04:27:32.000000000 +0200
+++ bind-9.5.0a6/bin/named/named.conf.5	2007-09-19 17:46:10.000000000 +0200
@@ -160,6 +160,7 @@ options {
 	datasize \fIsize\fR;
 	directory \fIquoted_string\fR;
 	dump\-file \fIquoted_string\fR;
+	edns \fIboolean\fR;
 	files \fIsize\fR;
 	heartbeat\-interval \fIinteger\fR;
 	host\-statistics \fIboolean\fR; // not implemented


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- bind.spec	24 Sep 2007 12:05:29 -0000	1.217
+++ bind.spec	24 Sep 2007 12:40:31 -0000	1.218
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	13.%{RELEASEVER}%{?dist}
+Release: 	14.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,7 @@
 Patch75:	bind-9.5-update.patch
 Patch78:	bind-9.5-pool_badfree.patch
 Patch79:	bind-9.5-_res_errno.patch
+Patch80:	bind-9.5-edns.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -244,6 +245,7 @@
 %patch75 -p1 -b .update
 %patch78 -p1 -b .badfree
 %patch79 -p1 -b .errno
+%patch80 -p1 -b .edns
 :;
 
 
@@ -643,6 +645,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-14.a6
+- added edns patch again (#275091)
+
 * Mon Sep 24 2007 Adam Tkac <atkac redhat com> 32:9.5.0-13.a6
 - removed bind-9.3.3-edns.patch patch (see #275091 for reasons)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 12:42:40 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 08:42:40 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.69,1.70
Message-ID: <200709241242.l8OCgeod017488@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17457

Modified Files:
	policy-20070703.patch 
Log Message:
* Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
- Fix service start stop terminal avc's


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- policy-20070703.patch	22 Sep 2007 12:15:13 -0000	1.69
+++ policy-20070703.patch	24 Sep 2007 12:42:07 -0000	1.70
@@ -8046,6 +8046,30 @@
  
  corecmd_exec_bin(radiusd_t)
  corecmd_exec_shell(radiusd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.if serefpolicy-3.0.8/policy/modules/services/remotelogin.if
+--- nsaserefpolicy/policy/modules/services/remotelogin.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/remotelogin.if	2007-09-24 07:36:26.000000000 -0400
+@@ -18,3 +18,20 @@
+ 	auth_domtrans_login_program($1,remote_login_t)
+ ')
+ 
++########################################
++## <summary>
++##	allow Domain to signal remote login domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`remotelogin_signal',`
++	gen_require(`
++		type remote_login_t;
++	')
++
++	allow $1 remote_login_t:process signal;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.0.8/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2007-06-11 16:05:30.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/remotelogin.te	2007-09-17 16:20:18.000000000 -0400



From fedora-extras-commits at redhat.com  Mon Sep 24 12:51:20 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 08:51:20 -0400
Subject: rpms/fonts-korean/devel .cvsignore, 1.3, 1.4 fonts-korean.spec, 1.24,
	1.25 sources, 1.3, 1.4 FAPIcidfmap.ko, 1.1, NONE cidfmap.ko, 1.1, NONE
Message-ID: <200709241251.l8OCpK3Q017929@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/fonts-korean/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17878

Modified Files:
	.cvsignore fonts-korean.spec sources 
Removed Files:
	FAPIcidfmap.ko cidfmap.ko 
Log Message:
- this is now a meta-package after moving baekmuk-bdf and baekmuk-ttf
  to separate packages (#253155) 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2005 08:08:33 -0000	1.3
+++ .cvsignore	24 Sep 2007 12:50:48 -0000	1.4
@@ -1,6 +1,3 @@
 *.gz
 *.bz2
 *.rpm
-baekmuk-2.1.tar.gz
-baekmuk-doc-2.1.tar.gz
-baekmuk-ttf-2.1.tar.gz


Index: fonts-korean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/fonts-korean.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fonts-korean.spec	27 Aug 2007 01:18:10 -0000	1.24
+++ fonts-korean.spec	24 Sep 2007 12:50:48 -0000	1.25
@@ -1,126 +1,39 @@
-%define language       korean
-%define ttfontverhead  1.0.11.32.2
-
-%define baekmukbdfdir  baekmuk-bdf-%{version}/bdf
-%define baekmukttfdir  baekmuk-ttf-%{version}/ttf
-
-%define basefontdir    %{_datadir}/fonts/%{language}
-%define ttfontdir      %{basefontdir}/TrueType
-%define bmpfontdir     %{basefontdir}/misc
-%define cidmapdir      %{_datadir}/ghostscript/conf.d
-
-%define catalogue      /etc/X11/fontpath.d
-
 Name:           fonts-korean
 Version:        2.2
-Release:        4%{?dist}
-License:        Distributable
-Group:          User Interface/X
-URL:            http://kldp.net/frs/?group_id=57&release_id=865
+Release:        5%{?dist}
+Summary:        Meta-package for Korean fonts
 
+Group:          User Interface/X
+License:        GPLv2+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xorg-x11-font-utils gzip
+Requires:       baekmuk-ttf-fonts-batang, baekmuk-ttf-fonts-dotum
+Requires:       baekmuk-ttf-fonts-gulim, baekmuk-ttf-fonts-hline
+Requires:       baekmuk-bdf-fonts
 
-Source1:  http://kldp.net/frs/download.php/1428/baekmuk-bdf-%{version}.tar.gz
-Source2:  http://kldp.net/frs/download.php/1429/baekmuk-ttf-%{version}.tar.gz
-Source3:  FAPIcidfmap.ko
-Source4:  cidfmap.ko
-
-Summary:  Free Korean Bitmap/TrueType fonts
-
-Requires(post):    ttmkfdir >= 3.0.6, mkfontdir, fontconfig
-Requires(postun):  fontconfig
-Provides:          ttfonts-ko = %{ttfontverhead}
-Obsoletes:         ttfonts-ko <= %{ttfontverhead}
 %description
-This package provides the free Korean Bitmap/TrueType fonts.
-
+This is a meta-package for Korean fonts support.
 
 %prep
-%setup -q -T -c -a 1 -a 2
-
+%{nil}
 
 %build
-mkdir -p $RPM_BUILD_DIR/%{name}-%{version}/doc
-for file in %{baekmukbdfdir}/*.bdf; do
-    bdftopcf $file | gzip -9 > ${file%.bdf}.pcf.gz
-done
-
+%{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{ttfontdir}
-install -d $RPM_BUILD_ROOT%{bmpfontdir}
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-
-# for tt/bmp font
-install -m 0644 %{baekmukttfdir}/*.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 %{baekmukbdfdir}/*.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}/
-install -m 0444 %{baekmukbdfdir}/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ttfonts-ko.alias
-
-# for ghostscript
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
-
-# for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-korean
-
-# for fonts.{dir,scale,cache-1}
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.scale
-touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-{
-    umask 133
-    touch %{ttfontdir} 2> /dev/null && {
-        %{_bindir}/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
-        mkfontdir %{ttfontdir}
-    }
-    mkfontdir %{bmpfontdir} 
-    fc-cache -sf %{ttfontdir} 2> /dev/null
-}
-
-
-%postun
-{
-    fc-cache -sf %{ttfontdir} 2> /dev/null
-}
-
-
 %files
-%defattr(-, root, root)
-%doc baekmuk-ttf-%{version}/COPYRIGHT* baekmuk-ttf-%{version}/README
-%dir %{basefontdir}
-%dir %{ttfontdir}
-%dir %{bmpfontdir}
-%dir %{cidmapdir}
-%{ttfontdir}/*.ttf
-%{bmpfontdir}/*.gz
-%{bmpfontdir}/ttfonts-ko.alias
-%{cidmapdir}/FAPIcidfmap.ko
-%{cidmapdir}/cidfmap.ko
-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.scale
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
-%{catalogue}/fonts-korean
+%defattr(-,root,root,-)
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-5.fc8
+- this is now a meta-package after moving baekmuk-bdf and baekmuk-ttf
+  to separate packages (#253155)
+
 * Mon Aug 20 2007 Caius Chance <cchance at redhat.com> - 2.2-4.fc8
 - Resolves: rhbz#252272 (Drop chkfontpath dependency.)
   ^^^ Removed chkfontpath, added TrueType directory specification in fc-cache.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2007 01:07:13 -0000	1.3
+++ sources	24 Sep 2007 12:50:48 -0000	1.4
@@ -1,2 +0,0 @@
-48c0405ffbdf45e1311a978b65b47f4c  baekmuk-bdf-2.2.tar.gz
-a6f4349179cbe3557641782cefba4d70  baekmuk-ttf-2.2.tar.gz


--- FAPIcidfmap.ko DELETED ---


--- cidfmap.ko DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:34 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:34 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchcommits
Message-ID: <200709241305.l8OD5Zwa016094@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchcommits acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:37 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up approveacls
Message-ID: <200709241305.l8OD5bQn016112@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the approveacls acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:16 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:16 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6GOY016343@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the watchbugzilla acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:24 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6Oc4016395@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the watchcommits acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 10:54:40 2007
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 24 Sep 2007 03:54:40 -0700
Subject: [pkgdb] timidity++ Owned
Message-ID: <200709241306.l8OD6SKP008933@app4.fedora.phx.redhat.com>

Package timidity++ in Fedora devel is now owned by Jindrich Novy (jnovy)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:30 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchbugzilla
Message-ID: <200709241306.l8OD6Suo008943@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:05:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:05:35 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up commit
Message-ID: <200709241306.l8OD6TsR008953@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the commit acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:29 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6Ts7016439@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the approveacls acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:12 -0700
Subject: [pkgdb] cvsutils: corsepiu has requested watchbugzilla
Message-ID: <200709241306.l8OD6TJb008961@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has requested the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:19 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:19 -0700
Subject: [pkgdb] cvsutils: corsepiu has requested watchbugzilla
Message-ID: <200709241306.l8OD6UUa008973@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has requested the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:27 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:27 -0700
Subject: [pkgdb] cvsutils had acl change status
Message-ID: <200709241306.l8OD6VM9008985@app4.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has set the commit acl on cvsutils (Fedora devel) to Obsolete for Ralf Cors?pius (corsepiu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:06:53 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?IlJhbGYgQ29yc8OpcGl1cyIgPHJjMDQwMjAzQGZyZWVuZXQuZGU+?=))
Date: Mon, 24 Sep 2007 06:06:53 -0700
Subject: [pkgdb] cvsutils: corsepiu has given up watchbugzilla
Message-ID: <200709241306.l8OD6r5R016608@app3.fedora.phx.redhat.com>

Ralf Cors?pius (corsepiu) has given up the watchbugzilla acl on cvsutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From fedora-extras-commits at redhat.com  Mon Sep 24 13:15:59 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 09:15:59 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.59,1.60
Message-ID: <200709241315.l8ODFxcT024853@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24833

Modified Files:
	alsa-lib.spec 
Log Message:
Remove tabs and EOL spaces (very minor).



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- alsa-lib.spec	20 Sep 2007 14:52:53 -0000	1.59
+++ alsa-lib.spec	24 Sep 2007 13:15:26 -0000	1.60
@@ -8,8 +8,8 @@
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
-Patch0:	 alsa-lib-1.0.14rc1-config.patch
-Patch2:	 alsa-lib-1.0.14-glibc-open.patch
+Patch0:  alsa-lib-1.0.14rc1-config.patch
+Patch2:  alsa-lib-1.0.14-glibc-open.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -61,7 +61,7 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig 
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -209,7 +209,7 @@
 
 * Fri Apr 22 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - updated to 1.0.9rc2
-- add ainit tool 
+- add ainit tool
 - dmix is now default pcm device
 
 * Mon Mar  7 2005 Martin Stransky <stransky at redhat.com> 1.0.8-4.devel



From fedora-extras-commits at redhat.com  Mon Sep 24 13:19:52 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 24 Sep 2007 09:19:52 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.60,1.61
Message-ID: <200709241319.l8ODJqlE024912@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24889

Modified Files:
	alsa-lib.spec 
Log Message:
Remove trailing dot from the summary.



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- alsa-lib.spec	24 Sep 2007 13:15:26 -0000	1.60
+++ alsa-lib.spec	24 Sep 2007 13:19:19 -0000	1.61
@@ -1,7 +1,7 @@
 %define  prever         rc2
 %define  prever_dot     .rc2
 
-Summary: The Advanced Linux Sound Architecture (ALSA) library.
+Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.15
 Release: 0.2%{?prever_dot}%{?dist}



From fedora-extras-commits at redhat.com  Mon Sep 24 13:24:37 2007
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Mon, 24 Sep 2007 09:24:37 -0400
Subject: rpms/jakarta-commons-daemon/devel
	jakarta-commons-daemon-execve-path-warning.patch, NONE,
	1.1 jakarta-commons-daemon.spec, 1.18, 1.19
Message-ID: <200709241324.l8ODOb39025015@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/jakarta-commons-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24988

Modified Files:
	jakarta-commons-daemon.spec 
Added Files:
	jakarta-commons-daemon-execve-path-warning.patch 
Log Message:
Add execve path warning patch from James Ralston



jakarta-commons-daemon-execve-path-warning.patch:

--- NEW FILE jakarta-commons-daemon-execve-path-warning.patch ---
diff -up daemon-1.0.1/src/native/unix/native/jsvc-unix.c.execve-path-warning daemon-1.0.1/src/native/unix/native/jsvc-unix.c
--- src/native/unix/native/jsvc-unix.c
+++ src/native/unix/native/jsvc-unix.c
@@ -635,6 +635,15 @@ int main(int argc, char *argv[]) {
         char *p1=NULL;
         char *p2=NULL;
 
+	/* We don't want to use a form of exec() that searches the
+	   PATH, so require that argv[0] be either an absolute or
+	   relative path.  Error out if this isn't the case.  */
+	tmp=strchr(old,'/');
+	if (tmp==NULL) {
+	  log_error("JSVC re-exec requires execution with an absolute or relative path");
+	  return(1);
+	}
+
         p1=strdup(libf);
         tmp=strrchr(p1,'/');
         if (tmp!=NULL) tmp[0]='\0';


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-daemon.spec	19 Sep 2007 22:33:40 -0000	1.18
+++ jakarta-commons-daemon.spec	24 Sep 2007 13:24:05 -0000	1.19
@@ -39,14 +39,15 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        6jpp.3%{?dist}
+Release:        6jpp.4%{?dist}
 Epoch:          1
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
 URL:            http://jakarta.apache.org/commons/daemon/
 Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
-Patch:          %{name}-crosslink.patch
+Patch0:          %{name}-crosslink.patch
+Patch1:          %{name}-execve-path-warning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{native}
@@ -102,6 +103,7 @@
 %prep
 %setup -q -n %{base_name}-%{version}
 %patch0 -p0
+%patch1 -p0
 chmod 644 src/samples/*
 %if %{native}
 pushd src/native/unix
@@ -185,6 +187,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0.1-6jpp.4
+- Add execve path warning patch from James Ralston
+
 * Mon Sep 17 2007 James Ralston <ralston at pobox.com> - 1:1.0.1-6jpp.3
 - update License tag to reflect new acceptable licenses
 - update main Group tag (old value "System/Boot" is invalid)



From fedora-extras-commits at redhat.com  Mon Sep 24 13:37:08 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 09:37:08 -0400
Subject: rpms/taglib/devel taglib-svn.sh, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 taglib.spec, 1.15, 1.16
Message-ID: <200709241337.l8ODb8lH025308@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25274

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-svn.sh 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
- update to svn version



--- NEW FILE taglib-svn.sh ---
#!/bin/sh

if [ -d taglib ]; then
    echo "Remove the \"taglib\" directory first !"
    exit 1
fi
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib
tar -czf taglib-`date +%Y%m%d`.tar.gz taglib
rm -rf taglib


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 18:54:16 -0000	1.5
+++ .cvsignore	24 Sep 2007 13:36:35 -0000	1.6
@@ -1 +1 @@
-taglib-1.4.tar.gz
+taglib-20070924.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 18:54:16 -0000	1.5
+++ sources	24 Sep 2007 13:36:35 -0000	1.6
@@ -1 +1 @@
-dcd50ddb2544faeae77f194804559404  taglib-1.4.tar.gz
+7969278421fe326520827b4e35fdffc5  taglib-20070924.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- taglib.spec	26 Aug 2007 10:06:15 -0000	1.15
+++ taglib.spec	24 Sep 2007 13:36:35 -0000	1.16
@@ -1,19 +1,22 @@
+%define svn 20070924
+
 Name:       taglib	
-Version:    1.4
-Release:    6%{?dist}
+Version:    1.5
+Release:    0.1.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz
+Source0:	taglib-%{svn}.tar.gz
+# The tarball is generated with the following script
+Source1:    taglib-svn.sh
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: doxygen, graphviz
 
 %description
 TagLib is a library for reading and editing the meta-data of several
@@ -31,18 +34,15 @@
 
 
 %prep
-%setup -q
+%setup -q -n taglib
 %patch0 -p1 -b .wchar
+make -f Makefile.cvs
 
 
 %build
 %configure --disable-rpath
-
 make %{?_smp_mflags}
-# Doc
-pushd taglib-api
-doxygen taglib.doxygen
-popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,16 +68,18 @@
 
 %files devel
 %defattr(-,root,root)
+%doc examples
 %{_bindir}/*-config
 %{_includedir}/*
 %{_libdir}/lib*.so
 #%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
-%doc taglib-api/html
-%doc examples
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
+- update to svn version
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4-6
 - fix license tag
 - rebuild for BuildID



From fedora-extras-commits at redhat.com  Mon Sep 24 13:39:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 24 Sep 2007 09:39:30 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.105,1.106
Message-ID: <200709241339.l8ODdUSu025409@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	vixie-cron.spec 
Log Message:
License tag, owning files.



Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- vixie-cron.spec	30 Aug 2007 15:47:25 -0000	1.105
+++ vixie-cron.spec	24 Sep 2007 13:38:58 -0000	1.106
@@ -10,9 +10,9 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 4
-License: GPL
+License: BSD
 Group: System Environment/Base
 Source0: https://hosted.fedoraproject.org/projects/vixie-cron/wiki/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +55,10 @@
 autoconf
 
 %build
-%configure --with-pam
+%configure \
+%if %{WITH_PAM}
+--with-pam
+%endif
 
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint" \
 %if %{WITH_SELINUX}
@@ -86,13 +89,14 @@
 %if ! %{WITH_PAM}
 	rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 %endif
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.deny
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add crond
-[ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
+#[ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
  
 %preun
 if [ $1 = 0 ]; then
@@ -124,9 +128,15 @@
 	%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
+%config(noreplace) %{_sysconfdir}/cron.deny
 %doc %{_datadir}/doc/cron/*
 
 %changelog
+* Mon Sep 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.2-3
+- cron own cron.deny
+- correct license tag
+- with-pam (configure) is now optional
+
 * Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 4:4.2-2
 - autoconf/automake are buildrequires, not runtime requires
 



From fedora-extras-commits at redhat.com  Mon Sep 24 13:44:03 2007
From: fedora-extras-commits at redhat.com (Josef Whiter (josef))
Date: Mon, 24 Sep 2007 06:44:03 -0700
Subject: [pkgdb] geany had acl change status
Message-ID: <200709241344.l8ODi5Sr028554@app3.fedora.phx.redhat.com>

Josef Whiter (josef) has set the watchcommits acl on geany (Fedora devel) to Approved for Jonathan G. Underwood (jgu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Mon Sep 24 13:44:17 2007
From: fedora-extras-commits at redhat.com (Josef Whiter (josef))
Date: Mon, 24 Sep 2007 06:44:17 -0700
Subject: [pkgdb] geany had acl change status
Message-ID: <200709241344.l8ODiH6w028626@app3.fedora.phx.redhat.com>

Josef Whiter (josef) has set the watchcommits acl on geany (Fedora 7) to Approved for Jonathan G. Underwood (jgu)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/geany



From fedora-extras-commits at redhat.com  Mon Sep 24 13:46:22 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 24 Sep 2007 09:46:22 -0400
Subject: rpms/rhythmbox/F-7 rhythmbox-0.10.1-podcasts.patch, NONE,
	1.1 rhythmbox.spec, 1.114, 1.115
Message-ID: <200709241346.l8ODkM4l025668@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25642

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.10.1-podcasts.patch 
Log Message:
* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2.fc7
- Add patch from upstream to mark Podcasts as such when uploading them to
  an iPod (#302691)


rhythmbox-0.10.1-podcasts.patch:

--- NEW FILE rhythmbox-0.10.1-podcasts.patch ---
diff -up rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c.podcast rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c
--- rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c.podcast	2007-09-24 02:18:38.000000000 -0400
+++ rhythmbox-0.10.1/plugins/ipod/rb-ipod-source.c	2007-09-24 02:30:19.000000000 -0400
@@ -50,6 +50,8 @@
 #define PHONE_PRODUCT_ID 0x4810
 #endif
 
+static const char *ITDB_PLAYLIST_DATA = "itdb-playlist";
+
 static GObject *rb_ipod_source_constructor (GType type,
 					    guint n_construct_properties,
 					    GObjectConstructParam *construct_properties);
@@ -96,6 +98,7 @@ typedef struct
 
 	GList *playlists;
 	gboolean needs_shuffle_db;
+	RBStaticPlaylistSource *podcast_pl;
 
 	guint load_idle_id;
 } RBiPodSourcePrivate;
@@ -324,6 +327,11 @@ add_rb_playlist (RBiPodSource *source, I
 	}
 
 	priv->playlists = g_list_prepend (priv->playlists, playlist_source);
+	g_object_set_data_full (g_object_ref (playlist_source),
+			ITDB_PLAYLIST_DATA, playlist, g_object_unref);
+	if (itdb_playlist_is_podcasts(playlist)) {
+		priv->podcast_pl = RB_STATIC_PLAYLIST_SOURCE (playlist_source);
+	}
 
 	rb_shell_append_source (shell, playlist_source, RB_SOURCE (source));
 	g_object_unref (shell);
@@ -352,6 +360,10 @@ load_ipod_playlists (RBiPodSource *sourc
 }
 
 #ifdef ENABLE_IPOD_WRITING
+
+#define MEDIATYPE_AUDIO       0x0001
+#define MEDIATYPE_PODCAST     0x0004
+
 static Itdb_Track *
 create_ipod_song_from_entry (RhythmDBEntry *entry, const char *mimetype)
 {
@@ -378,6 +390,12 @@ create_ipod_song_from_entry (RhythmDBEnt
 	track->app_rating = track->rating;
 	track->playcount = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_PLAY_COUNT);
 
+	if (rhythmdb_entry_get_pointer (entry, RHYTHMDB_PROP_TYPE) == RHYTHMDB_ENTRY_TYPE_PODCAST_POST) {
+		track->mediatype = MEDIATYPE_PODCAST;
+	} else {
+		track->mediatype = MEDIATYPE_AUDIO;
+	}
+
 	return track;
 }
 #endif
@@ -964,6 +982,23 @@ impl_build_dest_uri (RBRemovableMediaSou
 	return NULL;
 }
 
+static void
+add_to_podcasts (RBiPodSourcePrivate *priv, Itdb_Track *song)
+{
+	gchar *filename;
+	Itdb_Playlist *ipod_playlist;
+
+	if (priv->podcast_pl == NULL)
+		return;
+
+	ipod_playlist = g_object_get_data (G_OBJECT (priv->podcast_pl), ITDB_PLAYLIST_DATA);
+	itdb_playlist_add_track (ipod_playlist, song, -1);
+
+	filename = ipod_path_to_uri (priv->ipod_mount_path, song->ipod_path);
+	rb_static_playlist_source_add_location (priv->podcast_pl, filename, -1);
+	g_free (filename);
+}
+
 static gboolean
 impl_track_added (RBRemovableMediaSource *source,
 		  RhythmDBEntry *entry,
@@ -987,6 +1022,9 @@ impl_track_added (RBRemovableMediaSource
 		itdb_track_add (priv->ipod_db, song, -1);
 		itdb_playlist_add_track (itdb_playlist_mpl (priv->ipod_db),
 					 song, -1);
+		if (song->mediatype == MEDIATYPE_PODCAST) {
+			add_to_podcasts (priv, song);
+		}
 
 		add_ipod_song_to_db (isource, db, song);
 		itdb_schedule_save (isource);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-7/rhythmbox.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- rhythmbox.spec	23 Aug 2007 21:34:21 -0000	1.114
+++ rhythmbox.spec	24 Sep 2007 13:45:48 -0000	1.115
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -48,6 +48,7 @@
 Patch1: rhythmbox-first-time-load.patch
 Patch2: rhythmbox-enable-stores.patch
 Patch3: rhythmbox-0.10-shops-resizing.patch
+Patch4: rhythmbox-0.10.1-podcasts.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -65,6 +66,7 @@
 %patch2 -p0 -b .enable-stores
 cd ../
 %patch3 -p0 -b .dont-resize-stores
+%patch4 -p1 -b .ipod-podcasts
 
 %build
 
@@ -153,6 +155,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2.fc7
+- Add patch from upstream to mark Podcasts as such when uploading them to
+  an iPod (#302691)
+
 * Thu Aug 23 2007 - Ray Strode <rstorde at redhat.com> - 0.10.1-1.fc7
 - update to 0.10.1 at the request of Andre Klapper
   (http://mail.gnome.org/archives/distributor-list/2007-August/msg00008.html)



From fedora-extras-commits at redhat.com  Mon Sep 24 13:48:32 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 09:48:32 -0400
Subject: fedora-security/audit fc7,1.117,1.118
Message-ID: <200709241348.l8ODmWnd025754@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732/audit

Modified Files:
	fc7 
Log Message:
t1lib



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc7	21 Sep 2007 21:28:10 -0000	1.117
+++ fc7	24 Sep 2007 13:48:30 -0000	1.118
@@ -8,6 +8,7 @@
 # Up to date CVE as of CVE email 20070914
 # Up to date FC7 as of 20070916
 
+GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
 CVE-2007-5034 VULNERABLE (elinks) #297981
 GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601



From fedora-extras-commits at redhat.com  Mon Sep 24 13:54:59 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 09:54:59 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec, 1.30, 1.31 sources, 1.24,
	1.25
Message-ID: <200709241354.l8ODsxHk025973@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25919

Modified Files:
	fonts-indic.spec sources 
Log Message:
* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
- this is now a meta-package since Lohit fonts were moved to lohit-fonts (#253158)



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fonts-indic.spec	10 Sep 2007 09:53:50 -0000	1.30
+++ fonts-indic.spec	24 Sep 2007 13:54:27 -0000	1.31
@@ -4,50 +4,29 @@
 
 Name:        fonts-indic
 Version:     2.1.5
-Release:     2%{?dist}
-License:     GPL
+Release:     3%{?dist}
+License:     GPLv2+
 Group:       User Interface/X
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:       http://fedoraproject.org/wiki/Lohit
-Source:    fonts-indic-%{version}.tar.gz
+URL:         http://fedoraproject.org/wiki/Lohit
 
 Summary: Free Indian truetype/opentype fonts
 %description 
-This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil,
-Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
+This is a meta-package for Hindi, Bengali, Gujarati, Punjabi, Tamil,
+Kannada, Malayalam, Oriya, Telugu fonts.
 
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
 %package -n fonts-%1\
-Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
+Summary:    Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
 Group:      User Interface/X \
-Provides:  ttfonts-%2 <= 1.6-1\
-Obsoletes :  ttfonts-%2 <= 1.6-1\
-Requires:   fontconfig\
 \
 %description -n fonts-%1\
-These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
+This is a meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts support.\
 \
 %files -n fonts-%1\
 %defattr(-, root, root)\
-%dir %{xfontdir}\
-%dir %{xfontdir}/%1\
-%doc COPYING README AUTHORS\
-%ghost %{xfontdir}/%1/fonts.cache-1\
-%{xfontdir}/%1/*ttf\
-\
-%post -n fonts-%1 \
-if [ -x %{_bindir}/fc-cache ]; then \
-  %{_bindir}/fc-cache /usr/share/fonts \
-fi \
-\
-%postun -n fonts-%1 \
-if [ "$1" = "0" ]; then \
-  if [ -x %{_bindir}/fc-cache ]; then \
-    %{_bindir}/fc-cache /usr/share/fonts \
-  fi \
-fi 
 
 %mk_pkg bengali bn 
 %mk_pkg gujarati gu
@@ -60,7 +39,7 @@
 %mk_pkg telugu te
 
 %prep
-%setup -q -n fonts-indic-%{version}
+%{nil}
 
 %build
 echo "Nothing to do in Build."
@@ -68,18 +47,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for i in "%{langlist}"
-do
-  install -d $RPM_BUILD_ROOT/%{xfontdir}/$i
-  install -m 0644 $i/* $RPM_BUILD_ROOT/%{xfontdir}/$i
-  # Ghost the fonts.cache-1 file
-  touch $RPM_BUILD_ROOT/%{xfontdir}/$i/fonts.cache-1
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
+- this is now a meta-package since Lohit fonts were moved to
+  lohit-fonts (#253158)
+
 * Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
 - Reverting back renaming changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	26 Mar 2007 07:24:05 -0000	1.24
+++ sources	24 Sep 2007 13:54:27 -0000	1.25
@@ -1 +0,0 @@
-bb9497ee772062b97ff00a1a68b17c98  fonts-indic-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 13:58:00 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Mon, 24 Sep 2007 09:58:00 -0400
Subject: fedora-security/audit fc7,1.118,1.119
Message-ID: <200709241358.l8ODw0vk026254@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26230/audit

Modified Files:
	fc7 
Log Message:
inotify-tools cve name



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc7	24 Sep 2007 13:48:30 -0000	1.118
+++ fc7	24 Sep 2007 13:57:58 -0000	1.119
@@ -9,8 +9,8 @@
 # Up to date FC7 as of 20070916
 
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
+CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
-GENERIC-MAP-NOMATCH VULNERABLE (inotify-tools) #299771
 GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031



From fedora-extras-commits at redhat.com  Mon Sep 24 14:01:30 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:01:30 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.31,1.32
Message-ID: <200709241401.l8OE1UGX032425@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26305

Modified Files:
	fonts-indic.spec 
Log Message:
add requires for  lohit-fonts-*



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fonts-indic.spec	24 Sep 2007 13:54:27 -0000	1.31
+++ fonts-indic.spec	24 Sep 2007 14:00:57 -0000	1.32
@@ -19,14 +19,15 @@
 # mk_pkg <name> <lang-code> 
 %define mk_pkg() \
 %package -n fonts-%1\
-Summary:    Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
-Group:      User Interface/X \
+Summary:     Meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts\
+Group:       User Interface/X\
+Requires:    lohit-fonts-%1\
 \
 %description -n fonts-%1\
 This is a meta-package for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") fonts support.\
 \
 %files -n fonts-%1\
-%defattr(-, root, root)\
+%defattr(-,root,root,-)
 
 %mk_pkg bengali bn 
 %mk_pkg gujarati gu
@@ -54,6 +55,7 @@
 * Mon Sep 24 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5-3.fc8
 - this is now a meta-package since Lohit fonts were moved to
   lohit-fonts (#253158)
+- each subpackage requires the corresponding lohit-fonts subpackage
 
 * Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
 - Reverting back renaming changes



From fedora-extras-commits at redhat.com  Mon Sep 24 14:01:39 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:01:39 -0400
Subject: rpms/taglib/devel taglib.spec,1.16,1.17
Message-ID: <200709241401.l8OE1d4U032430@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31349

Modified Files:
	taglib.spec 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
- BR: autoconf



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- taglib.spec	24 Sep 2007 13:36:35 -0000	1.16
+++ taglib.spec	24 Sep 2007 14:01:05 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.1.%{svn}svn%{?dist}
+Release:    0.2.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -17,6 +17,8 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+BuildRequires: autoconf
+
 
 %description
 TagLib is a library for reading and editing the meta-data of several
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
+- BR: autoconf
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
 - update to svn version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:04:58 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:04:58 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.32,1.33
Message-ID: <200709241404.l8OE4wJR032590@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	fonts-indic.spec 
Log Message:
remove superfluous second args to %mk_pkg



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fonts-indic.spec	24 Sep 2007 14:00:57 -0000	1.32
+++ fonts-indic.spec	24 Sep 2007 14:04:26 -0000	1.33
@@ -29,15 +29,15 @@
 %files -n fonts-%1\
 %defattr(-,root,root,-)
 
-%mk_pkg bengali bn 
-%mk_pkg gujarati gu
-%mk_pkg hindi hi
-%mk_pkg kannada kn 
-%mk_pkg malayalam ml 
-%mk_pkg oriya or 
-%mk_pkg punjabi pn
-%mk_pkg tamil ta 
-%mk_pkg telugu te
+%mk_pkg bengali
+%mk_pkg gujarati
+%mk_pkg hindi
+%mk_pkg kannada
+%mk_pkg malayalam
+%mk_pkg oriya
+%mk_pkg punjabi
+%mk_pkg tamil
+%mk_pkg telugu
 
 %prep
 %{nil}



From fedora-extras-commits at redhat.com  Mon Sep 24 14:10:48 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:10:48 -0400
Subject: rpms/taglib/devel taglib.spec,1.17,1.18
Message-ID: <200709241410.l8OEAm3E000420@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv352

Modified Files:
	taglib.spec 
Log Message:
BR autoconf -> automake


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- taglib.spec	24 Sep 2007 14:01:05 -0000	1.17
+++ taglib.spec	24 Sep 2007 14:10:15 -0000	1.18
@@ -17,7 +17,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: autoconf
+BuildRequires: automake
 
 
 %description
@@ -80,7 +80,7 @@
 
 %changelog
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
-- BR: autoconf
+- BR: automake
 
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
 - update to svn version



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:03 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 10:12:03 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.33,1.34
Message-ID: <200709241412.l8OEC33a000506@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433

Modified Files:
	fonts-indic.spec 
Log Message:
remove reverted changelog entries



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/extras/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fonts-indic.spec	24 Sep 2007 14:04:26 -0000	1.33
+++ fonts-indic.spec	24 Sep 2007 14:11:30 -0000	1.34
@@ -57,12 +57,6 @@
   lohit-fonts (#253158)
 - each subpackage requires the corresponding lohit-fonts subpackage
 
-* Mon Sep 10 2007 Rahul Bhalerap <rbhalera at redhat.com>
-- Reverting back renaming changes
-
-* Fri Sep 07 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-3.fc8
-- Renamed the package to reflect the upstream project name #253158
-
 * Fri Jul 27 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-2.fc8
 - SPEC cleanup as part of merge review #225763
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:34 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:34 -0400
Subject: devel/vim 7.1.101,NONE,1.1
Message-ID: <200709241412.l8OECY1I000572@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv564

Added Files:
	7.1.101 
Log Message:
- patchlevel 101


--- NEW FILE 7.1.101 ---
To: vim-dev at vim.org
Subject: patch 7.1.101
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.101
Problem:    Ruby: The Buffer.line= method does not work.
Solution:   Add the "self" argument to set_current_line(). (Jonathan Hankins)
Files:	    src/if_ruby.c


*** ../vim-7.1.100/src/if_ruby.c	Sat May 12 15:01:49 2007
--- src/if_ruby.c	Mon Sep 10 10:40:38 2007
***************
*** 789,795 ****
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
--- 789,795 ----
      return get_buffer_line(curbuf, curwin->w_cursor.lnum);
  }
  
! static VALUE set_current_line(VALUE self, VALUE str)
  {
      return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
  }
*** ../vim-7.1.100/src/version.c	Thu Sep  6 17:38:06 2007
--- src/version.c	Thu Sep 13 14:59:47 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     101,
  /**/

-- 
The question is:  What do you do with your life?
The wrong answer is: Become the richest guy in the graveyard.
				(billionaire and Oracle founder Larry Ellison)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:41 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:41 -0400
Subject: devel/vim 7.1.102,NONE,1.1
Message-ID: <200709241412.l8OECfG6000595@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv588

Added Files:
	7.1.102 
Log Message:
- patchlevel 102


--- NEW FILE 7.1.102 ---
To: vim-dev at vim.org
Subject: patch 7.1.102
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.102
Problem:    Perl interface doesn't compile with new version of Perl.
Solution:   Add two variables to the dynamic library loading. (Suresh
	    Govindachar)
Files:	    src/if_perl.xs


*** ../vim-7.1.101/src/if_perl.xs	Wed Aug 16 19:33:57 2006
--- src/if_perl.xs	Wed Sep  5 22:00:36 2007
***************
*** 40,45 ****
--- 40,65 ----
  #    define PERL_SUBVERSION SUBVERSION
  #endif
  
+ /*
+  * Quoting Jan Dubois of Active State:
+  *    ActivePerl build 822 still identifies itself as 5.8.8 but already
+  *    contains many of the changes from the upcoming Perl 5.8.9 release.
+  *
+  * The changes include addition of two symbols (Perl_sv_2iv_flags,
+  * Perl_newXS_flags) not present in earlier releases.
+  *
+  * Jan Dubois suggested the following guarding scheme:
+  */
+ #if (ACTIVEPERL_VERSION >= 822)
+ # define PERL589_OR_LATER
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
+ # define PERL589_OR_LATER
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
+ # define PERL589_OR_LATER
+ #endif
+ 
  #ifndef pTHX
  #    define pTHX void
  #    define pTHX_
***************
*** 109,114 ****
--- 129,138 ----
  # else
  #  define Perl_sv_catpvn dll_Perl_sv_catpvn
  # endif
+ #ifdef PERL589_OR_LATER
+ #  define Perl_sv_2iv_flags dll_Perl_sv_2iv_flags
+ #  define Perl_newXS_flags dll_Perl_newXS_flags
+ #endif
  # define Perl_sv_free dll_Perl_sv_free
  # define Perl_sv_isa dll_Perl_sv_isa
  # define Perl_sv_magic dll_Perl_sv_magic
***************
*** 192,197 ****
--- 216,225 ----
  #else
  static void (*Perl_sv_catpvn)(pTHX_ SV*, const char*, STRLEN);
  #endif
+ #ifdef PERL589_OR_LATER
+ static IV (*Perl_sv_2iv_flags)(pTHX_ SV* sv, I32 flags);
+ static CV * (*Perl_newXS_flags)(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
+ #endif
  static void (*Perl_sv_free)(pTHX_ SV*);
  static int (*Perl_sv_isa)(pTHX_ SV*, const char*);
  static void (*Perl_sv_magic)(pTHX_ SV*, SV*, int, const char*, I32);
***************
*** 266,271 ****
--- 294,303 ----
      {"Perl_sv_2pv_nolen", (PERL_PROC*)&Perl_sv_2pv_nolen},
  #else
      {"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv},
+ #endif
+ #ifdef PERL589_OR_LATER
+     {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags},
+     {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags},
  #endif
      {"Perl_sv_bless", (PERL_PROC*)&Perl_sv_bless},
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
*** ../vim-7.1.101/src/version.c	Thu Sep 13 15:00:28 2007
--- src/version.c	Thu Sep 13 15:18:36 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     102,
  /**/

-- 
Witches prefer brooms: vacuum-cleaners need extension cords!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:47 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:47 -0400
Subject: devel/vim 7.1.103,NONE,1.1
Message-ID: <200709241412.l8OEClKr000620@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv611

Added Files:
	7.1.103 
Log Message:
- patchlevel 103


--- NEW FILE 7.1.103 ---
To: vim-dev at vim.org
Subject: patch 7.1.103
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.103
Problem:    Using "dw" with the cursor past the end of the last line (using
            CTRL-\ CTRL-O from Insert mode) deletes a character. (Tim Chase)
Solution:   Don't move the cursor back when the movement failed.
Files:      src/normal.c


*** ../vim-7.1.102/src/normal.c	Tue Aug 14 22:54:00 2007
--- src/normal.c	Tue Sep 11 19:32:42 2007
***************
*** 8364,8370 ****
  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
  
      /* Don't leave the cursor on the NUL past a line */
!     if (curwin->w_cursor.col && gchar_cursor() == NUL)
      {
  	--curwin->w_cursor.col;
  	cap->oap->inclusive = TRUE;
--- 8364,8370 ----
  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
  
      /* Don't leave the cursor on the NUL past a line */
!     if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
      {
  	--curwin->w_cursor.col;
  	cap->oap->inclusive = TRUE;
*** ../vim-7.1.102/src/version.c	Thu Sep 13 15:19:32 2007
--- src/version.c	Thu Sep 13 15:32:05 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     103,
  /**/

-- 
ARTHUR:  Then who is your lord?
WOMAN:   We don't have a lord.
ARTHUR:  What?
DENNIS:  I told you.  We're an anarcho-syndicalist commune.  We take it in
         turns to act as a sort of executive officer for the week.
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:12:54 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:12:54 -0400
Subject: devel/vim 7.1.104,NONE,1.1
Message-ID: <200709241412.l8OECsAW000645@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv638

Added Files:
	7.1.104 
Log Message:
- patchlevel 104


--- NEW FILE 7.1.104 ---
To: vim-dev at vim.org
Subject: patch 7.1.104
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.104 (after 7.1.095)
Problem:    When 'lazyredraw' is set a focus event causes redraw to be
	    postponed until a key is pressed.
Solution:   Instead of not returning from vgetc() when a focus event is
	    encountered return K_IGNORE.  Add plain_vgetc() for when the
	    caller doesn't want to get K_IGNORE.
Files:	    src/digraph.c, src/edit.c, src/ex_cmds.c, src/ex_getln.c,
	    src/getchar.c, src/normal.c, src/proto/getchar.pro, src/window.c


*** ../vim-7.1.103/src/digraph.c	Sat Jul  7 13:57:39 2007
--- src/digraph.c	Thu Sep 13 16:11:54 2007
***************
*** 2028,2034 ****
  
      ++no_mapping;
      ++allow_keys;
!     c = safe_vgetc();
      --no_mapping;
      --allow_keys;
      if (c != ESC)		/* ESC cancels CTRL-K */
--- 2028,2034 ----
  
      ++no_mapping;
      ++allow_keys;
!     c = plain_vgetc();
      --no_mapping;
      --allow_keys;
      if (c != ESC)		/* ESC cancels CTRL-K */
***************
*** 2050,2056 ****
  #endif
  	++no_mapping;
  	++allow_keys;
! 	cc = safe_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)	    /* ESC cancels CTRL-K */
--- 2050,2056 ----
  #endif
  	++no_mapping;
  	++allow_keys;
! 	cc = plain_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)	    /* ESC cancels CTRL-K */
***************
*** 2350,2356 ****
      if (*curbuf->b_p_keymap == NUL)
      {
  	/* Stop any active keymap and clear the table.  Also remove
! 	 * b:keymap_unload, as no keymap is active now. */
  	keymap_unload();
  	do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
      }
--- 2350,2356 ----
      if (*curbuf->b_p_keymap == NUL)
      {
  	/* Stop any active keymap and clear the table.  Also remove
! 	 * b:keymap_name, as no keymap is active now. */
  	keymap_unload();
  	do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
      }
*** ../vim-7.1.103/src/edit.c	Sun Aug 12 16:38:03 2007
--- src/edit.c	Thu Sep 13 16:17:54 2007
***************
*** 788,794 ****
  	    ins_redraw(FALSE);
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = safe_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
--- 788,794 ----
  	    ins_redraw(FALSE);
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = plain_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
***************
*** 981,987 ****
  #ifdef FEAT_NETBEANS_INTG
  	case K_F21:	/* NetBeans command */
  	    ++no_mapping;		/* don't map the next key hits */
! 	    i = safe_vgetc();
  	    --no_mapping;
  	    netbeans_keycommand(i);
  	    break;
--- 981,987 ----
  #ifdef FEAT_NETBEANS_INTG
  	case K_F21:	/* NetBeans command */
  	    ++no_mapping;		/* don't map the next key hits */
! 	    i = plain_vgetc();
  	    --no_mapping;
  	    netbeans_keycommand(i);
  	    break;
***************
*** 5224,5233 ****
      i = 0;
      for (;;)
      {
! 	do
! 	    nc = safe_vgetc();
! 	while (nc == K_IGNORE || nc == K_VER_SCROLLBAR
! 						    || nc == K_HOR_SCROLLBAR);
  #ifdef FEAT_CMDL_INFO
  	if (!(State & CMDLINE)
  # ifdef FEAT_MBYTE
--- 5224,5230 ----
      i = 0;
      for (;;)
      {
! 	nc = plain_vgetc();
  #ifdef FEAT_CMDL_INFO
  	if (!(State & CMDLINE)
  # ifdef FEAT_MBYTE
***************
*** 7575,7581 ****
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     regname = safe_vgetc();
  #ifdef FEAT_LANGMAP
      LANGMAP_ADJUST(regname, TRUE);
  #endif
--- 7572,7578 ----
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     regname = plain_vgetc();
  #ifdef FEAT_LANGMAP
      LANGMAP_ADJUST(regname, TRUE);
  #endif
***************
*** 7586,7592 ****
  #ifdef FEAT_CMDL_INFO
  	add_to_showcmd_c(literally);
  #endif
! 	regname = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	LANGMAP_ADJUST(regname, TRUE);
  #endif
--- 7583,7589 ----
  #ifdef FEAT_CMDL_INFO
  	add_to_showcmd_c(literally);
  #endif
! 	regname = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	LANGMAP_ADJUST(regname, TRUE);
  #endif
***************
*** 7677,7683 ****
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     c = safe_vgetc();
      --no_mapping;
      switch (c)
      {
--- 7674,7680 ----
       * deleted when ESC is hit.
       */
      ++no_mapping;
!     c = plain_vgetc();
      --no_mapping;
      switch (c)
      {
***************
*** 9356,9362 ****
       * mode message to be deleted when ESC is hit */
      ++no_mapping;
      ++allow_keys;
!     c = safe_vgetc();
      --no_mapping;
      --allow_keys;
      if (IS_SPECIAL(c) || mod_mask)	    /* special key */
--- 9353,9359 ----
       * mode message to be deleted when ESC is hit */
      ++no_mapping;
      ++allow_keys;
!     c = plain_vgetc();
      --no_mapping;
      --allow_keys;
      if (IS_SPECIAL(c) || mod_mask)	    /* special key */
***************
*** 9388,9394 ****
  	}
  	++no_mapping;
  	++allow_keys;
! 	cc = safe_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)
--- 9385,9391 ----
  	}
  	++no_mapping;
  	++allow_keys;
! 	cc = plain_vgetc();
  	--no_mapping;
  	--allow_keys;
  	if (cc != ESC)
*** ../vim-7.1.103/src/ex_cmds.c	Tue Aug 21 15:28:32 2007
--- src/ex_cmds.c	Thu Sep 13 16:19:40 2007
***************
*** 4498,4504 ****
  	     *
  	     * The new text is built up in new_start[].  It has some extra
  	     * room to avoid using alloc()/free() too often.  new_start_len is
! 	     * the lenght of the allocated memory at new_start.
  	     *
  	     * Make a copy of the old line, so it won't be taken away when
  	     * updating the screen or handling a multi-line match.  The "old_"
--- 4499,4505 ----
  	     *
  	     * The new text is built up in new_start[].  It has some extra
  	     * room to avoid using alloc()/free() too often.  new_start_len is
! 	     * the length of the allocated memory at new_start.
  	     *
  	     * Make a copy of the old line, so it won't be taken away when
  	     * updating the screen or handling a multi-line match.  The "old_"
***************
*** 4669,4675 ****
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = safe_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
--- 4670,4676 ----
  #endif
  			    ++no_mapping;	/* don't map this key */
  			    ++allow_keys;	/* allow special keys */
! 			    i = plain_vgetc();
  			    --allow_keys;
  			    --no_mapping;
  
*** ../vim-7.1.103/src/ex_getln.c	Mon Aug  6 22:27:12 2007
--- src/ex_getln.c	Thu Sep 13 16:20:49 2007
***************
*** 641,647 ****
  	{
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = safe_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    /* CTRL-\ e doesn't work when obtaining an expression. */
--- 641,647 ----
  	{
  	    ++no_mapping;
  	    ++allow_keys;
! 	    c = plain_vgetc();
  	    --no_mapping;
  	    --allow_keys;
  	    /* CTRL-\ e doesn't work when obtaining an expression. */
***************
*** 1091,1101 ****
  #endif
  		putcmdline('"', TRUE);
  		++no_mapping;
! 		i = c = safe_vgetc();	/* CTRL-R <char> */
  		if (i == Ctrl_O)
  		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
  		if (i == Ctrl_R)
! 		    c = safe_vgetc();	/* CTRL-R CTRL-R <char> */
  		--no_mapping;
  #ifdef FEAT_EVAL
  		/*
--- 1091,1101 ----
  #endif
  		putcmdline('"', TRUE);
  		++no_mapping;
! 		i = c = plain_vgetc();	/* CTRL-R <char> */
  		if (i == Ctrl_O)
  		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
  		if (i == Ctrl_R)
! 		    c = plain_vgetc();	/* CTRL-R CTRL-R <char> */
  		--no_mapping;
  #ifdef FEAT_EVAL
  		/*
*** ../vim-7.1.103/src/getchar.c	Wed Sep  5 21:45:54 2007
--- src/getchar.c	Thu Sep 13 16:16:53 2007
***************
*** 1597,1608 ****
  	    }
  #endif
  #ifdef FEAT_GUI
! 	    /* The caller doesn't need to know that the focus event is delayed
! 	     * until getting a character. */
  	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
  	    {
  		ui_focus_change(c == K_FOCUSGAINED);
! 		continue;
  	    }
  
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
--- 1597,1609 ----
  	    }
  #endif
  #ifdef FEAT_GUI
! 	    /* Handle focus event here, so that the caller doesn't need to
! 	     * know about it.  Return K_IGNORE so that we loop once (needed if
! 	     * 'lazyredraw' is set). */
  	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
  	    {
  		ui_focus_change(c == K_FOCUSGAINED);
! 		c = K_IGNORE;
  	    }
  
  	    /* Translate K_CSI to CSI.  The special key is only used to avoid
***************
*** 1744,1749 ****
--- 1745,1766 ----
      c = vgetc();
      if (c == NUL)
  	c = get_keystroke();
+     return c;
+ }
+ 
+ /*
+  * Like safe_vgetc(), but loop to handle K_IGNORE.
+  * Also ignore scrollbar events.
+  */
+     int
+ plain_vgetc()
+ {
+     int c;
+ 
+     do
+     {
+ 	c = safe_vgetc();
+     } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
      return c;
  }
  
*** ../vim-7.1.103/src/normal.c	Thu Sep 13 15:33:18 2007
--- src/normal.c	Thu Sep 13 16:24:51 2007
***************
*** 696,702 ****
  		++allow_keys;		/* no mapping for nchar, but keys */
  	    }
  	    ++no_zero_mapping;		/* don't map zero here */
! 	    c = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
--- 696,702 ----
  		++allow_keys;		/* no mapping for nchar, but keys */
  	    }
  	    ++no_zero_mapping;		/* don't map zero here */
! 	    c = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
***************
*** 721,727 ****
  	    ca.count0 = 0;
  	    ++no_mapping;
  	    ++allow_keys;		/* no mapping for nchar, but keys */
! 	    c = safe_vgetc();		/* get next character */
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
--- 721,727 ----
  	    ca.count0 = 0;
  	    ++no_mapping;
  	    ++allow_keys;		/* no mapping for nchar, but keys */
! 	    c = plain_vgetc();		/* get next character */
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(c, TRUE);
  #endif
***************
*** 900,906 ****
  	     * For 'g' get the next character now, so that we can check for
  	     * "gr", "g'" and "g`".
  	     */
! 	    ca.nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(ca.nchar, TRUE);
  #endif
--- 900,906 ----
  	     * For 'g' get the next character now, so that we can check for
  	     * "gr", "g'" and "g`".
  	     */
! 	    ca.nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(ca.nchar, TRUE);
  #endif
***************
*** 957,963 ****
  		im_set_active(TRUE);
  #endif
  
! 	    *cp = safe_vgetc();
  
  	    if (langmap_active)
  	    {
--- 957,963 ----
  		im_set_active(TRUE);
  #endif
  
! 	    *cp = plain_vgetc();
  
  	    if (langmap_active)
  	    {
***************
*** 1045,1051 ****
  		}
  		if (c > 0)
  		{
! 		    c = safe_vgetc();
  		    if (c != Ctrl_N && c != Ctrl_G)
  			vungetc(c);
  		    else
--- 1045,1051 ----
  		}
  		if (c > 0)
  		{
! 		    c = plain_vgetc();
  		    if (c != Ctrl_N && c != Ctrl_G)
  			vungetc(c);
  		    else
***************
*** 1064,1070 ****
  	    while (enc_utf8 && lang && (c = vpeekc()) > 0
  				 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
  	    {
! 		c = safe_vgetc();
  		if (!utf_iscomposing(c))
  		{
  		    vungetc(c);		/* it wasn't, put it back */
--- 1064,1070 ----
  	    while (enc_utf8 && lang && (c = vpeekc()) > 0
  				 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
  	    {
! 		c = plain_vgetc();
  		if (!utf_iscomposing(c))
  		{
  		    vungetc(c);		/* it wasn't, put it back */
***************
*** 4564,4570 ****
  #endif
  	    ++no_mapping;
  	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
! 	    nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(nchar, TRUE);
  #endif
--- 4564,4570 ----
  #endif
  	    ++no_mapping;
  	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
! 	    nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  	    LANGMAP_ADJUST(nchar, TRUE);
  #endif
***************
*** 4922,4928 ****
      case 'u':	/* "zug" and "zuw": undo "zg" and "zw" */
  		++no_mapping;
  		++allow_keys;   /* no mapping for nchar, but allow key codes */
! 		nchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(nchar, TRUE);
  #endif
--- 4922,4928 ----
      case 'u':	/* "zug" and "zuw": undo "zg" and "zw" */
  		++no_mapping;
  		++allow_keys;   /* no mapping for nchar, but allow key codes */
! 		nchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(nchar, TRUE);
  #endif
*** ../vim-7.1.103/src/proto/getchar.pro	Sun May  6 15:04:24 2007
--- src/proto/getchar.pro	Thu Sep 13 16:13:19 2007
***************
*** 38,43 ****
--- 38,44 ----
  void updatescript __ARGS((int c));
  int vgetc __ARGS((void));
  int safe_vgetc __ARGS((void));
+ int plain_vgetc __ARGS((void));
  int vpeekc __ARGS((void));
  int vpeekc_nomap __ARGS((void));
  int vpeekc_any __ARGS((void));
*** ../vim-7.1.103/src/window.c	Sun Aug 12 16:55:01 2007
--- src/window.c	Thu Sep 13 16:25:01 2007
***************
*** 584,590 ****
  		++no_mapping;
  		++allow_keys;   /* no mapping for xchar, but allow key codes */
  		if (xchar == NUL)
! 		    xchar = safe_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(xchar, TRUE);
  #endif
--- 584,590 ----
  		++no_mapping;
  		++allow_keys;   /* no mapping for xchar, but allow key codes */
  		if (xchar == NUL)
! 		    xchar = plain_vgetc();
  #ifdef FEAT_LANGMAP
  		LANGMAP_ADJUST(xchar, TRUE);
  #endif
*** ../vim-7.1.103/src/version.c	Thu Sep 13 15:33:18 2007
--- src/version.c	Thu Sep 13 18:22:59 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     104,
  /**/

-- 
ARTHUR:  I am your king!
WOMAN:   Well, I didn't vote for you.
ARTHUR:  You don't vote for kings.
WOMAN:   Well, 'ow did you become king then?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:03 -0400
Subject: devel/vim 7.1.105,NONE,1.1
Message-ID: <200709241413.l8OED3EB000670@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv661

Added Files:
	7.1.105 
Log Message:
- patchlevel 105


--- NEW FILE 7.1.105 ---
To: vim-dev at vim.org
Subject: patch 7.1.105
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.105
Problem:    Internal error when using "0 ? {'a': 1} : {}". (A.Politz)
Solution:   When parsing a dictionary value without using the value, don't try
	    obtaining the key name.
Files:	    src/eval.c


*** ../vim-7.1.104/src/eval.c	Thu Sep  6 14:25:50 2007
--- src/eval.c	Thu Sep 13 20:29:31 2007
***************
*** 6746,6765 ****
  	    clear_tv(&tvkey);
  	    goto failret;
  	}
! 	key = get_tv_string_buf_chk(&tvkey, buf);
! 	if (key == NULL || *key == NUL)
  	{
! 	    /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
! 	    if (key != NULL)
! 		EMSG(_(e_emptykey));
! 	    clear_tv(&tvkey);
! 	    goto failret;
  	}
  
  	*arg = skipwhite(*arg + 1);
  	if (eval1(arg, &tv, evaluate) == FAIL)	/* recursive! */
  	{
! 	    clear_tv(&tvkey);
  	    goto failret;
  	}
  	if (evaluate)
--- 6746,6769 ----
  	    clear_tv(&tvkey);
  	    goto failret;
  	}
! 	if (evaluate)
  	{
! 	    key = get_tv_string_buf_chk(&tvkey, buf);
! 	    if (key == NULL || *key == NUL)
! 	    {
! 		/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
! 		if (key != NULL)
! 		    EMSG(_(e_emptykey));
! 		clear_tv(&tvkey);
! 		goto failret;
! 	    }
  	}
  
  	*arg = skipwhite(*arg + 1);
  	if (eval1(arg, &tv, evaluate) == FAIL)	/* recursive! */
  	{
! 	    if (evaluate)
! 		clear_tv(&tvkey);
  	    goto failret;
  	}
  	if (evaluate)
*** ../vim-7.1.104/src/version.c	Thu Sep 13 18:25:08 2007
--- src/version.c	Thu Sep 13 20:36:38 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     105,
  /**/

-- 
DENNIS:  Listen -- strange women lying in ponds distributing swords is no
         basis for a system of government.  Supreme executive power derives
         from a mandate from the masses, not from some farcical aquatic
         ceremony.
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:09 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:09 -0400
Subject: devel/vim 7.1.106,NONE,1.1
Message-ID: <200709241413.l8OED9vn000695@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv688

Added Files:
	7.1.106 
Log Message:
- patchlevel 106


--- NEW FILE 7.1.106 ---
To: vim-dev at vim.org
Subject: patch 7.1.106
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.106
Problem:    ":messages" doesn't quit listing on ":".
Solution:   Break the loop when "got_int" is set.
Files:	    src/message.c


*** ../vim-7.1.105/src/message.c	Thu Sep  6 12:53:59 2007
--- src/message.c	Thu Sep 13 21:45:57 2007
***************
*** 828,834 ****
  		_("Messages maintainer: Bram Moolenaar <Bram at vim.org>"),
  		hl_attr(HLF_T));
  
!     for (p = first_msg_hist; p != NULL; p = p->next)
  	if (p->msg != NULL)
  	    msg_attr(p->msg, p->attr);
  
--- 828,834 ----
  		_("Messages maintainer: Bram Moolenaar <Bram at vim.org>"),
  		hl_attr(HLF_T));
  
!     for (p = first_msg_hist; p != NULL && !got_int; p = p->next)
  	if (p->msg != NULL)
  	    msg_attr(p->msg, p->attr);
  
*** ../vim-7.1.105/src/version.c	Thu Sep 13 20:39:58 2007
--- src/version.c	Thu Sep 13 21:57:40 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     106,
  /**/

-- 
I'm sure that I asked CBuilder to do a "full" install.  Looks like I got
a "fool" install, instead.		Charles E Campbell, Jr, PhD


 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:16 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:16 -0400
Subject: devel/vim 7.1.107,NONE,1.1
Message-ID: <200709241413.l8OEDGqY000718@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv711

Added Files:
	7.1.107 
Log Message:
- patchlevel 107


--- NEW FILE 7.1.107 ---
To: vim-dev at vim.org
Subject: patch 7.1.107
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.107
Problem:    When doing a block selection and using "s" to change the text,
	    while triggering auto-indenting, causes the wrong text to be
	    repeated in other lines. (Adri Verhoef)
Solution:   Compute the change of indent and compensate for that.
Files:	    src/ops.c


*** ../vim-7.1.106/src/ops.c	Thu Jun 28 22:14:28 2007
--- src/ops.c	Thu Aug 30 11:41:10 2007
***************
*** 2477,2483 ****
  
  	/*
  	 * Spaces and tabs in the indent may have changed to other spaces and
! 	 * tabs.  Get the starting column again and correct the lenght.
  	 * Don't do this when "$" used, end-of-line will have changed.
  	 */
  	block_prep(oap, &bd2, oap->start.lnum, TRUE);
--- 2477,2483 ----
  
  	/*
  	 * Spaces and tabs in the indent may have changed to other spaces and
! 	 * tabs.  Get the starting column again and correct the length.
  	 * Don't do this when "$" used, end-of-line will have changed.
  	 */
  	block_prep(oap, &bd2, oap->start.lnum, TRUE);
***************
*** 2534,2540 ****
  #ifdef FEAT_VISUALEXTRA
      long		offset;
      linenr_T		linenr;
!     long		ins_len, pre_textlen = 0;
      char_u		*firstline;
      char_u		*ins_text, *newp, *oldp;
      struct block_def	bd;
--- 2534,2542 ----
  #ifdef FEAT_VISUALEXTRA
      long		offset;
      linenr_T		linenr;
!     long		ins_len;
!     long		pre_textlen = 0;
!     long		pre_indent = 0;
      char_u		*firstline;
      char_u		*ins_text, *newp, *oldp;
      struct block_def	bd;
***************
*** 2579,2585 ****
  						    || gchar_cursor() == NUL))
  	    coladvance_force(getviscol());
  # endif
! 	pre_textlen = (long)STRLEN(ml_get(oap->start.lnum));
  	bd.textcol = curwin->w_cursor.col;
      }
  #endif
--- 2581,2589 ----
  						    || gchar_cursor() == NUL))
  	    coladvance_force(getviscol());
  # endif
! 	firstline = ml_get(oap->start.lnum);
! 	pre_textlen = (long)STRLEN(firstline);
! 	pre_indent = (long)(skipwhite(firstline) - firstline);
  	bd.textcol = curwin->w_cursor.col;
      }
  #endif
***************
*** 2598,2610 ****
       */
      if (oap->block_mode && oap->start.lnum != oap->end.lnum)
      {
  	firstline = ml_get(oap->start.lnum);
! 	/*
! 	 * Subsequent calls to ml_get() flush the firstline data - take a
! 	 * copy of the required bit.
! 	 */
! 	if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
  	{
  	    if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
  	    {
  		vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
--- 2602,2623 ----
       */
      if (oap->block_mode && oap->start.lnum != oap->end.lnum)
      {
+ 	/* Auto-indenting may have changed the indent.  If the cursor was past
+ 	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > pre_indent)
! 	{
! 	    long new_indent = (long)(skipwhite(firstline) - firstline);
! 
! 	    pre_textlen += new_indent - pre_indent;
! 	    bd.textcol += new_indent - pre_indent;
! 	}
! 
! 	ins_len = (long)STRLEN(firstline) - pre_textlen;
! 	if (ins_len > 0)
  	{
+ 	    /* Subsequent calls to ml_get() flush the firstline data - take a
+ 	     * copy of the inserted text.  */
  	    if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
  	    {
  		vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
*** ../vim-7.1.106/src/version.c	Thu Sep 13 22:04:30 2007
--- src/version.c	Thu Sep 13 22:38:28 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     107,
  /**/

-- 
Windows
M!uqoms

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:24 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:24 -0400
Subject: devel/vim 7.1.108,NONE,1.1
Message-ID: <200709241413.l8OEDOv4000741@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Added Files:
	7.1.108 
Log Message:
- patchlevel 108


--- NEW FILE 7.1.108 ---
To: vim-dev at vim.org
Subject: patch 7.1.108
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.108 (after 7.1.100)
Problem:    Win32: Compilation problems in Cscope code. (Jeff Lanzarotta)
Solution:   Use (long) instead of (intptr_t) when it's not defined.
Files:	    src/if_cscope.c


*** ../vim-7.1.107/src/if_cscope.c	Thu Sep  6 17:38:06 2007
--- src/if_cscope.c	Wed Sep 12 20:32:17 2007
***************
*** 726,731 ****
--- 726,740 ----
      HANDLE	stdin_rd, stdout_rd;
      HANDLE	stdout_wr, stdin_wr;
      BOOL	created;
+ # ifdef __BORLANDC__
+ #  define OPEN_OH_ARGTYPE long
+ # else
+ #  if (_MSC_VER >= 1300)
+ #   define OPEN_OH_ARGTYPE intptr_t
+ #  else
+ #   define OPEN_OH_ARGTYPE long
+ #  endif
+ # endif
  #endif
  
  #if defined(UNIX)
***************
*** 909,918 ****
      CloseHandle(pi.hThread);
  
      /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
--- 918,929 ----
      CloseHandle(pi.hThread);
  
      /* TODO - tidy up after failure to create files on pipe handles. */
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr,
! 						      _O_TEXT|_O_APPEND)) < 0)
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd,
! 						      _O_TEXT|_O_RDONLY)) < 0)
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
  
*** ../vim-7.1.107/src/version.c	Thu Sep 13 22:40:47 2007
--- src/version.c	Fri Sep 14 19:55:12 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     108,
  /**/

-- 
Q:   How many hardware engineers does it take to change a lightbulb?
A:   None.  We'll fix it in software.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:30 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:30 -0400
Subject: devel/vim 7.1.109,NONE,1.1
Message-ID: <200709241413.l8OEDUGV000764@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv757

Added Files:
	7.1.109 
Log Message:
- patchlevel 109


--- NEW FILE 7.1.109 ---
To: vim-dev at vim.org
Subject: patch 7.1.109
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.109
Problem:    GTK: when there are many tab pages, clicking on the arrow left of
	    the labels moves to the next tab page on the right. (Simeon Bird)
Solution:   Check the X coordinate of the click and pass -1 as value for the
	    left arrow.
Files:	    src/gui_gtk_x11.c, src/term.c


*** ../vim-7.1.108/src/gui_gtk_x11.c	Wed Sep  5 21:45:54 2007
--- src/gui_gtk_x11.c	Fri Sep 14 20:59:55 2007
***************
*** 3223,3230 ****
  	{
  	    if (clicked_page == 0)
  	    {
! 		/* Click after all tabs moves to next tab page. */
! 		if (send_tabline_event(0) && gtk_main_level() > 0)
  		    gtk_main_quit();
  	    }
  #ifndef HAVE_GTK2
--- 3223,3231 ----
  	{
  	    if (clicked_page == 0)
  	    {
! 		/* Click after all tabs moves to next tab page.  When "x" is
! 		 * small guess it's the left button. */
! 		if (send_tabline_event(x < 50 ? -1 : 0) && gtk_main_level() > 0)
  		    gtk_main_quit();
  	    }
  #ifndef HAVE_GTK2
*** ../vim-7.1.108/src/term.c	Thu May 10 20:48:32 2007
--- src/term.c	Fri Sep 14 20:56:40 2007
***************
*** 4809,4814 ****
--- 4809,4816 ----
  	    if (num_bytes == -1)
  		return -1;
  	    current_tab = (int)bytes[0];
+ 	    if (current_tab == 255)	/* -1 in a byte gives 255 */
+ 		current_tab = -1;
  	    slen += num_bytes;
  	}
  	else if (key_name[0] == (int)KS_TABMENU)
*** ../vim-7.1.108/src/version.c	Fri Sep 14 19:56:18 2007
--- src/version.c	Sat Sep 15 14:05:25 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     109,
  /**/

-- 
No letters of the alphabet were harmed in the creation of this message.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:36 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:36 -0400
Subject: devel/vim 7.1.110,NONE,1.1
Message-ID: <200709241413.l8OEDaJk000787@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv780

Added Files:
	7.1.110 
Log Message:
- patchlevel 110


--- NEW FILE 7.1.110 ---
To: vim-dev at vim.org
Subject: patch 7.1.110
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.110 (after 7.1.102)
Problem:    Win32: Still compilation problems with Perl.
Solution:   Change the #ifdefs. (Suresh Govindachar)
Files:	    src/if_perl.xs


*** ../vim-7.1.109/src/if_perl.xs	Thu Sep 13 15:19:32 2007
--- src/if_perl.xs	Fri Sep 14 21:23:38 2007
***************
*** 48,60 ****
   * The changes include addition of two symbols (Perl_sv_2iv_flags,
   * Perl_newXS_flags) not present in earlier releases.
   *
!  * Jan Dubois suggested the following guarding scheme:
   */
! #if (ACTIVEPERL_VERSION >= 822)
! # define PERL589_OR_LATER
! #endif
! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
! # define PERL589_OR_LATER
  #endif
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
  # define PERL589_OR_LATER
--- 48,62 ----
   * The changes include addition of two symbols (Perl_sv_2iv_flags,
   * Perl_newXS_flags) not present in earlier releases.
   *
!  * Jan Dubois suggested the following guarding scheme.
!  *
!  * Active State defined ACTIVEPERL_VERSION as a string in versions before
!  * 5.8.8; and so the comparison to 822 below needs to be guarded.
   */
! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 8)
! # if (ACTIVEPERL_VERSION >= 822) || (PERL_SUBVERSION >= 9)
! #  define PERL589_OR_LATER
! # endif
  #endif
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
  # define PERL589_OR_LATER
*** ../vim-7.1.109/src/version.c	Sat Sep 15 14:06:41 2007
--- src/version.c	Sat Sep 15 14:48:05 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     110,
  /**/

-- 
"It's so simple to be wise.  Just think of something stupid to say
and then don't say it."        -- Sam Levenson

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:42 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:42 -0400
Subject: devel/vim 7.1.111,NONE,1.1
Message-ID: <200709241413.l8OEDg9E000810@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803

Added Files:
	7.1.111 
Log Message:
- patchlevel 111


--- NEW FILE 7.1.111 ---
To: vim-dev at vim.org
Subject: patch 7.1.111
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.111
Problem:    When using ":vimgrep" with the "j" flag folds from another buffer
	    may be displayed. (A.Politz)
Solution:   When not jumping to another buffer update the folds.
Files:	    src/quickfix.c


*** ../vim-7.1.110/src/quickfix.c	Thu Jun 28 21:23:52 2007
--- src/quickfix.c	Fri Sep 14 22:16:23 2007
***************
*** 1612,1619 ****
  	}
  
  	/*
! 	 * If there is only one window and is the quickfix window, create a new
! 	 * one above the quickfix window.
  	 */
  	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
  	{
--- 1612,1619 ----
  	}
  
  	/*
! 	 * If there is only one window and it is the quickfix window, create a
! 	 * new one above the quickfix window.
  	 */
  	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
  	{
***************
*** 2981,2986 ****
--- 2981,2987 ----
      buf_T	*buf;
      int		duplicate_name = FALSE;
      int		using_dummy;
+     int		redraw_for_dummy = FALSE;
      int		found_match;
      buf_T	*first_match_buf = NULL;
      time_t	seconds = 0;
***************
*** 3097,3102 ****
--- 3098,3104 ----
  	    /* Remember that a buffer with this name already exists. */
  	    duplicate_name = (buf != NULL);
  	    using_dummy = TRUE;
+ 	    redraw_for_dummy = TRUE;
  
  #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
  	    /* Don't do Filetype autocommands to avoid loading syntax and
***************
*** 3243,3252 ****
--- 3245,3272 ----
      if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
      {
  	if ((flags & VGR_NOJUMP) == 0)
+ 	{
+ 	    buf = curbuf;
  	    qf_jump(qi, 0, 0, eap->forceit);
+ 	    if (buf != curbuf)
+ 		/* If we jumped to another buffer redrawing will already be
+ 		 * taken care of. */
+ 		redraw_for_dummy = FALSE;
+ 	}
      }
      else
  	EMSG2(_(e_nomatch2), s);
+ 
+     /* If we loaded a dummy buffer into the current window, the autocommands
+      * may have messed up things, need to redraw and recompute folds. */
+     if (redraw_for_dummy)
+     {
+ #ifdef FEAT_FOLDING
+ 	foldUpdateAll(curwin);
+ #else
+ 	redraw_later(NOT_VALID);
+ #endif
+     }
  
  theend:
      vim_free(regmatch.regprog);
*** ../vim-7.1.110/src/version.c	Sat Sep 15 14:48:57 2007
--- src/version.c	Sun Sep 16 13:23:48 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     111,
  /**/

-- 
Trees moving back and forth is what makes the wind blow.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:49 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:49 -0400
Subject: devel/vim 7.1.112,NONE,1.1
Message-ID: <200709241413.l8OEDnRp000833@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv826

Added Files:
	7.1.112 
Log Message:
- patchlevel 112


--- NEW FILE 7.1.112 ---
To: vim-dev at vim.org
Subject: patch 7.1.112
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.112
Problem:    Using input() with a wrong argument may crash Vim. (A.Politz)
Solution:   Init the input() return value to NULL.
Files:	    src/eval.c


*** ../vim-7.1.111/src/eval.c	Thu Sep 13 20:39:58 2007
--- src/eval.c	Sat Sep 15 19:04:51 2007
***************
*** 11565,11578 ****
      char_u	*xp_arg = NULL;
  
      rettv->v_type = VAR_STRING;
  
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
-     {
- 	rettv->vval.v_string = NULL;
  	return;
-     }
  #endif
  
      cmd_silent = FALSE;		/* Want to see the prompt. */
--- 11566,11577 ----
      char_u	*xp_arg = NULL;
  
      rettv->v_type = VAR_STRING;
+     rettv->vval.v_string = NULL;
  
  #ifdef NO_CONSOLE_INPUT
      /* While starting up, there is no place to enter text. */
      if (no_console_input())
  	return;
  #endif
  
      cmd_silent = FALSE;		/* Want to see the prompt. */
*** ../vim-7.1.111/src/version.c	Sun Sep 16 13:26:56 2007
--- src/version.c	Sun Sep 16 14:19:04 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     112,
  /**/

-- 
The early bird gets the worm. If you want something else for
breakfast, get up later.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:13:55 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:13:55 -0400
Subject: devel/vim 7.1.113,NONE,1.1
Message-ID: <200709241413.l8OEDtdP000865@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv849

Added Files:
	7.1.113 
Log Message:
- patchlevel 113


--- NEW FILE 7.1.113 ---
To: vim-dev at vim.org
Subject: patch 7.1.113
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.113
Problem:    Using map() to go over an empty list causes memory to be freed
	    twice. (A.Politz)
Solution:   Don't clear the typeval in restore_vimvar().
Files:	    src/eval.c


*** ../vim-7.1.112/src/eval.c	Sun Sep 16 14:20:18 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 1318,1324 ****
  {
      hashitem_T	*hi;
  
-     clear_tv(&vimvars[idx].vv_tv);
      vimvars[idx].vv_tv = *save_tv;
      if (vimvars[idx].vv_type == VAR_UNKNOWN)
      {
--- 1318,1323 ----
***************
*** 1362,1368 ****
  
      if (p_verbose == 0)
  	--emsg_off;
-     vimvars[VV_VAL].vv_str = NULL;
      restore_vimvar(VV_VAL, &save_val);
  
      return list;
--- 1361,1366 ----
***************
*** 9387,9401 ****
  {
      typval_T	rettv;
      char_u	*s;
  
      copy_tv(tv, &vimvars[VV_VAL].vv_tv);
      s = expr;
      if (eval1(&s, &rettv, TRUE) == FAIL)
! 	return FAIL;
      if (*s != NUL)  /* check for trailing chars after expr */
      {
  	EMSG2(_(e_invexpr2), s);
! 	return FAIL;
      }
      if (map)
      {
--- 9386,9401 ----
  {
      typval_T	rettv;
      char_u	*s;
+     int		retval = FAIL;
  
      copy_tv(tv, &vimvars[VV_VAL].vv_tv);
      s = expr;
      if (eval1(&s, &rettv, TRUE) == FAIL)
! 	goto theend;
      if (*s != NUL)  /* check for trailing chars after expr */
      {
  	EMSG2(_(e_invexpr2), s);
! 	goto theend;
      }
      if (map)
      {
***************
*** 9414,9423 ****
  	/* On type error, nothing has been removed; return FAIL to stop the
  	 * loop.  The error message was given by get_tv_number_chk(). */
  	if (error)
! 	    return FAIL;
      }
      clear_tv(&vimvars[VV_VAL].vv_tv);
!     return OK;
  }
  
  /*
--- 9414,9425 ----
  	/* On type error, nothing has been removed; return FAIL to stop the
  	 * loop.  The error message was given by get_tv_number_chk(). */
  	if (error)
! 	    goto theend;
      }
+     retval = OK;
+ theend:
      clear_tv(&vimvars[VV_VAL].vv_tv);
!     return retval;
  }
  
  /*
*** ../vim-7.1.112/src/version.c	Sun Sep 16 14:20:18 2007
--- src/version.c	Mon Sep 17 21:33:52 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     113,
  /**/

-- 
Mental Floss prevents moral decay!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:03 -0400
Subject: devel/vim 7.1.114,NONE,1.1
Message-ID: <200709241414.l8OEE30I000890@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv881

Added Files:
	7.1.114 
Log Message:
- patchlevel 114


--- NEW FILE 7.1.114 ---
To: vim-dev at vim.org
Subject: patch 7.1.114
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.114
Problem:    Memory leak in getmatches().
Solution:   Don't increment the refcount twice.
Files:	    src/eval.c


*** ../vim-7.1.113/src/eval.c	Mon Sep 17 21:37:09 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 10351,10357 ****
  	    dict = dict_alloc();
  	    if (dict == NULL)
  		return;
- 	    ++dict->dv_refcount;
  	    dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id));
  	    dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
  	    dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
--- 10355,10360 ----
*** ../vim-7.1.113/src/version.c	Mon Sep 17 21:37:09 2007
--- src/version.c	Mon Sep 17 21:54:08 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     114,
  /**/

-- 
Be nice to your kids...  they'll be the ones choosing your nursing home.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:08 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:08 -0400
Subject: devel/vim 7.1.115,NONE,1.1
Message-ID: <200709241414.l8OEE8Vg000913@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Added Files:
	7.1.115 
Log Message:
- patchlevel 115


--- NEW FILE 7.1.115 ---
To: vim-dev at vim.org
Subject: patch 7.1.115
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.115 (after 7.1.105)
Problem:    Compiler warning for uninitialized variable. (Tony Mechelynck)
Solution:   Init variable to NULL.
Files:	    src/eval.c


*** ../vim-7.1.114/src/eval.c	Mon Sep 17 21:55:02 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 6704,6710 ****
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
!     char_u	*key;
      dictitem_T	*item;
      char_u	*start = skipwhite(*arg + 1);
      char_u	buf[NUMBUFLEN];
--- 6705,6711 ----
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
!     char_u	*key = NULL;
      dictitem_T	*item;
      char_u	*start = skipwhite(*arg + 1);
      char_u	buf[NUMBUFLEN];
*** ../vim-7.1.114/src/version.c	Mon Sep 17 21:55:02 2007
--- src/version.c	Mon Sep 17 22:18:42 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     115,
  /**/

-- 
Proofread carefully to see if you any words out.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:14:17 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:14:17 -0400
Subject: devel/vim 7.1.116,NONE,1.1
Message-ID: <200709241414.l8OEEHON000940@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv929

Added Files:
	7.1.116 
Log Message:
- patchlevel 116


--- NEW FILE 7.1.116 ---
To: vim-dev at vim.org
Subject: patch 7.1.116
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.116
Problem:    Cannot display Unicode characters above 0x10000.
Solution:   Remove the replacement with a question mark when UNICODE16 is not
	    defined. (partly by Nicolas Weber)
Files:	    src/screen.c


*** ../vim-7.1.115/src/screen.c	Thu Aug 30 13:51:52 2007
--- src/screen.c	Mon Sep 10 22:29:42 2007
***************
*** 2305,2313 ****
--- 2305,2315 ----
  			prev_c = u8c;
  #endif
  		    /* Non-BMP character: display as ? or fullwidth ?. */
+ #ifdef UNICODE16
  		    if (u8c >= 0x10000)
  			ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?';
  		    else
+ #endif
  			ScreenLinesUC[idx] = u8c;
  		    for (i = 0; i < Screen_mco; ++i)
  		    {
***************
*** 3678,3690 ****
  		    if ((mb_l == 1 && c >= 0x80)
  			    || (mb_l >= 1 && mb_c == 0)
  			    || (mb_l > 1 && (!vim_isprintc(mb_c)
! 							 || mb_c >= 0x10000)))
  		    {
  			/*
  			 * Illegal UTF-8 byte: display as <xx>.
  			 * Non-BMP character : display as ? or fullwidth ?.
  			 */
  			if (mb_c < 0x10000)
  			{
  			    transchar_hex(extra, mb_c);
  # ifdef FEAT_RIGHTLEFT
--- 3680,3697 ----
  		    if ((mb_l == 1 && c >= 0x80)
  			    || (mb_l >= 1 && mb_c == 0)
  			    || (mb_l > 1 && (!vim_isprintc(mb_c)
! # ifdef UNICODE16
! 							 || mb_c >= 0x10000
! # endif
! 							 )))
  		    {
  			/*
  			 * Illegal UTF-8 byte: display as <xx>.
  			 * Non-BMP character : display as ? or fullwidth ?.
  			 */
+ # ifdef UNICODE16
  			if (mb_c < 0x10000)
+ # endif
  			{
  			    transchar_hex(extra, mb_c);
  # ifdef FEAT_RIGHTLEFT
***************
*** 3692,3702 ****
--- 3699,3711 ----
  				rl_mirror(extra);
  # endif
  			}
+ # ifdef UNICODE16
  			else if (utf_char2cells(mb_c) != 2)
  			    STRCPY(extra, "?");
  			else
  			    /* 0xff1f in UTF-8: full-width '?' */
  			    STRCPY(extra, "\357\274\237");
+ # endif
  
  			p_extra = extra;
  			c = *p_extra;
***************
*** 6245,6250 ****
--- 6254,6260 ----
  		else
  		    u8c = utfc_ptr2char(ptr, u8cc);
  		mbyte_cells = utf_char2cells(u8c);
+ # ifdef UNICODE16
  		/* Non-BMP character: display as ? or fullwidth ?. */
  		if (u8c >= 0x10000)
  		{
***************
*** 6252,6257 ****
--- 6262,6268 ----
  		    if (attr == 0)
  			attr = hl_attr(HLF_8);
  		}
+ # endif
  # ifdef FEAT_ARABIC
  		if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c))
  		{
*** ../vim-7.1.116/src/version.c	Mon Sep 17 22:19:43 2007
--- src/version.c	Mon Sep 17 22:37:31 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     116,
  /**/

-- 
There can't be a crisis today, my schedule is already full.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Sep 24 14:18:54 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:18:54 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241418.l8OEIsuE008960@app3.fedora.phx.redhat.com>

Package calcurse in Fedora devel is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:19:01 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 10:19:01 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.70,
	1.71 selinux-policy.spec, 1.531, 1.532
Message-ID: <200709241419.l8OEJ1bb001063@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1040

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
- Eliminate rpm_t:fifo_file avcs
- Fix dbus path for helper app


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- policy-20070703.patch	24 Sep 2007 12:42:07 -0000	1.70
+++ policy-20070703.patch	24 Sep 2007 14:18:57 -0000	1.71
@@ -835,8 +835,33 @@
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.0.8/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/rpm.if	2007-09-17 16:20:18.000000000 -0400
-@@ -210,6 +210,24 @@
++++ serefpolicy-3.0.8/policy/modules/admin/rpm.if	2007-09-24 09:34:18.000000000 -0400
+@@ -152,6 +152,24 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit read and write an unnamed RPM pipe.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`rpm_dontaudit_rw_pipes',`
++	gen_require(`
++		type rpm_t;
++	')
++
++	dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Send and receive messages from
+ ##	rpm over dbus.
+ ## </summary>
+@@ -210,6 +228,24 @@
  
  ########################################
  ## <summary>
@@ -861,7 +886,7 @@
  ##	Create, read, write, and delete RPM
  ##	script temporary files.
  ## </summary>
-@@ -224,8 +242,29 @@
+@@ -224,8 +260,29 @@
  		type rpm_script_tmp_t;
  	')
  
@@ -892,7 +917,7 @@
  ')
  
  ########################################
-@@ -289,3 +328,84 @@
+@@ -289,3 +346,84 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -2306,7 +2331,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-21 14:41:45.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc	2007-09-24 09:59:57.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2340,7 +2365,7 @@
  
  /usr/sbin/sesh			--	gen_context(system_u:object_r:shell_exec_t,s0)
  
-@@ -259,3 +265,8 @@
+@@ -259,3 +265,9 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -2348,7 +2373,8 @@
 +/etc/gdm/XKeepsCrashing[^/]*	--	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+			-d	gen_context(system_u:object_r:bin_t,s0)
 +/etc/gdm/[^/]+/.*			gen_context(system_u:object_r:bin_t,s0)
-+/lib(64)?/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
++/lib/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
++/lib64/dbus-1/dbus-daemon-launch-helper --    gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.if.in	2007-09-17 16:20:18.000000000 -0400
@@ -10991,8 +11017,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-22 07:07:39.000000000 -0400
-@@ -211,6 +211,13 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 09:49:24.000000000 -0400
+@@ -211,6 +211,20 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -11003,10 +11029,17 @@
 +	   term_dontaudit_use_all_user_ttys($1)
 +	   term_dontaudit_use_all_user_ptys($1)
 +	 ')
++	optional_policy(`
++		tunable_policy(`allow_daemons_use_tty',`
++		   unconfined_use_terminals($1)
++		', `
++		   unconfined_dontaudit_use_terminals($1)
++		')
++	')
  ')
  
  ########################################
-@@ -540,18 +547,19 @@
+@@ -540,18 +554,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -11030,23 +11063,26 @@
  	')
  ')
  
-@@ -567,18 +575,46 @@
+@@ -567,18 +582,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
 -		type initrc_t, initrc_exec_t;
 +		type initrc_t;
 +		attribute initscript;
-+	')
-+
-+	files_list_etc($1)
+ 	')
+ 
+ 	files_list_etc($1)
+-	domtrans_pattern($1,initrc_exec_t,initrc_t)
 +	domtrans_pattern($1,initscript,initrc_t)
-+
-+	ifdef(`enable_mcs',`
+ 
+ 	ifdef(`enable_mcs',`
+-		range_transition $1 initrc_exec_t:process s0;
 +		range_transition $1 initscript:process s0;
-+	')
-+
-+	ifdef(`enable_mls',`
+ 	')
+ 
+ 	ifdef(`enable_mls',`
+-		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 initscript:process s0 - mls_systemhigh;
 +	')
 +')
@@ -11064,24 +11100,21 @@
 +interface(`init_script_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
- 	')
- 
- 	files_list_etc($1)
--	domtrans_pattern($1,initrc_exec_t,initrc_t)
++	')
++
++	files_list_etc($1)
 +	domtrans_pattern($1,$2,initrc_t)
- 
- 	ifdef(`enable_mcs',`
--		range_transition $1 initrc_exec_t:process s0;
++
++	ifdef(`enable_mcs',`
 +		range_transition $1 $2:process s0;
- 	')
- 
- 	ifdef(`enable_mls',`
--		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++	')
++
++	ifdef(`enable_mls',`
 +		range_transition $1 $2:process s0 - mls_systemhigh;
  	')
  ')
  
-@@ -609,11 +645,11 @@
+@@ -609,11 +652,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -11095,7 +11128,7 @@
  ')
  
  ########################################
-@@ -684,11 +720,11 @@
+@@ -684,11 +727,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -11109,7 +11142,7 @@
  ')
  
  ########################################
-@@ -703,11 +739,11 @@
+@@ -703,11 +746,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -11123,7 +11156,7 @@
  ')
  
  ########################################
-@@ -931,6 +967,7 @@
+@@ -931,6 +974,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -11131,7 +11164,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1067,11 @@
+@@ -1030,11 +1074,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -11145,7 +11178,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1289,7 @@
+@@ -1252,7 +1296,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -11154,7 +11187,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1310,64 @@
+@@ -1273,3 +1317,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11221,7 +11254,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-22 07:06:37.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/init.te	2007-09-24 09:50:18.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -11316,7 +11349,7 @@
  
  selinux_get_enforce_mode(initrc_t)
  
-@@ -497,6 +515,43 @@
+@@ -497,6 +515,47 @@
  ')
  
  optional_policy(`
@@ -11342,17 +11375,21 @@
 +	files_dump_core(daemon)
 +')
 +
++tunable_policy(`allow_daemons_use_tty',`
++	term_use_all_user_ttys(daemon)
++	term_use_all_user_ptys(daemon)
++', `
++	term_dontaudit_use_all_user_ttys(daemon)
++	term_dontaudit_use_all_user_ptys(daemon)
++')
++
 +optional_policy(`
 +	unconfined_dontaudit_rw_pipes(daemon)
 +
 +	tunable_policy(`allow_daemons_use_tty',`
 +		unconfined_use_terminals(daemon)
-+		term_use_all_user_ttys(daemon)
-+		term_use_all_user_ptys(daemon)
 + 	', `
 +		unconfined_dontaudit_use_terminals(daemon)
-+		term_dontaudit_use_all_user_ttys(daemon)
-+		term_dontaudit_use_all_user_ptys(daemon)
 + 	')
 +')
 + 
@@ -11360,7 +11397,7 @@
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
  ')
-@@ -632,12 +687,6 @@
+@@ -632,12 +691,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -11373,7 +11410,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -703,6 +752,9 @@
+@@ -703,6 +756,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -11383,6 +11420,17 @@
  ')
  
  optional_policy(`
+@@ -750,6 +806,10 @@
+ ')
+ 
+ optional_policy(`
++	rpm_dontaudit_rw_pipes(daemon)
++')
++
++optional_policy(`
+ 	vmware_read_system_config(initrc_t)
+ 	vmware_append_system_config(initrc_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.8/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-17 16:20:18.000000000 -0400
@@ -12803,7 +12851,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.8/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-20 11:55:54.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/selinuxutil.te	2007-09-24 09:36:36.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -12933,7 +12981,7 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  corecmd_exec_bin(run_init_t)
-@@ -423,77 +426,53 @@
+@@ -423,77 +426,54 @@
  	nscd_socket_use(run_init_t)
  ')	
  
@@ -13035,12 +13083,13 @@
 +
 +optional_policy(`
 +	rpm_dontaudit_rw_tmp_files(semanage_t)
++	rpm_dontaudit_rw_pipes(semanage_t)
 +')
 +
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -521,6 +500,8 @@
+@@ -521,6 +501,8 @@
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms;
  allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:lnk_file r_file_perms;
  
@@ -13049,7 +13098,7 @@
  kernel_read_system_state(setfiles_t)
  kernel_relabelfrom_unlabeled_dirs(setfiles_t)
  kernel_relabelfrom_unlabeled_files(setfiles_t)
-@@ -537,6 +518,7 @@
+@@ -537,6 +519,7 @@
  
  fs_getattr_xattr_fs(setfiles_t)
  fs_list_all(setfiles_t)
@@ -13057,8 +13106,14 @@
  fs_search_auto_mountpoints(setfiles_t)
  fs_relabelfrom_noxattr_fs(setfiles_t)
  
-@@ -592,6 +574,10 @@
+@@ -590,8 +573,16 @@
+ 	fs_relabel_tmpfs_chr_file(setfiles_t)
+ ')
  
++optional_policy(`
++	rpm_dontaudit_rw_pipes(setfiles_t)
++')
++
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
 +		ppp_dontaudit_use_fds(setfiles_t)
@@ -13068,6 +13123,18 @@
  		udev_dontaudit_rw_dgram_sockets(setfiles_t)
  	')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.0.8/policy/modules/system/sysnetwork.fc
+--- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2007-05-29 14:10:58.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/sysnetwork.fc	2007-09-24 08:54:25.000000000 -0400
+@@ -54,7 +54,7 @@
+ 
+ /var/run/dhclient.*\.pid --	gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+ /var/run/dhclient.*\.leases --	gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+-
++/var/run/dhclient-[^/]*\.lease -- gen_context(system_u:object_r:dhcpc_var_run_t,s0)
+ ifdef(`distro_gentoo',`
+ /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.8/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/sysnetwork.if	2007-09-17 16:20:18.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- selinux-policy.spec	22 Sep 2007 12:15:13 -0000	1.531
+++ selinux-policy.spec	24 Sep 2007 14:18:57 -0000	1.532
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
+- Eliminate rpm_t:fifo_file avcs
+- Fix dbus path for helper app
+
 * Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-9
 - Fix service start stop terminal avc's
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:18:58 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:18:58 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241418.l8OEIwbY008998@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 4 is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:19:02 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 07:19:02 -0700
Subject: [pkgdb] calcurse Owned
Message-ID: <200709241419.l8OEJ2lk009021@app3.fedora.phx.redhat.com>

Package calcurse in Fedora EPEL 5 is now owned by Jon Ciesla (limb)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calcurse



From fedora-extras-commits at redhat.com  Mon Sep 24 14:22:36 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 24 Sep 2007 10:22:36 -0400
Subject: rpms/taglib/devel taglib.spec,1.18,1.19
Message-ID: <200709241422.l8OEMa5m001305@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1256

Modified Files:
	taglib.spec 
Log Message:
* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
- rebuild



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- taglib.spec	24 Sep 2007 14:10:15 -0000	1.18
+++ taglib.spec	24 Sep 2007 14:22:03 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.2.%{svn}svn%{?dist}
+Release:    0.3.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
+- rebuild
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
 - BR: automake
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:34:15 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 24 Sep 2007 10:34:15 -0400
Subject: rpms/ntp/devel ntp-4.2.4p2-noif.patch, NONE, 1.1 ntp.spec, 1.72,
	1.73 filter-requires-ntp.sh, 1.1, NONE
Message-ID: <200709241434.l8OEYF6C001746@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p2-noif.patch 
Removed Files:
	filter-requires-ntp.sh 
Log Message:
- require perl (#274771)
- don't fail when starting with no interfaces (#300371)


ntp-4.2.4p2-noif.patch:

--- NEW FILE ntp-4.2.4p2-noif.patch ---
diff -up ntp-4.2.4p2/libisc/ifiter_sysctl.c.noif ntp-4.2.4p2/libisc/ifiter_sysctl.c
--- ntp-4.2.4p2/libisc/ifiter_sysctl.c.noif	2006-06-06 22:16:23.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_sysctl.c	2007-09-24 16:08:55.000000000 +0200
@@ -309,7 +309,10 @@ internal_destroy(isc_interfaceiter_t *it
 	 */
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 	iter->pos = 0;
+	if (iter->pos >= iter->bufused)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }
diff -up ntp-4.2.4p2/libisc/ifiter_ioctl.c.noif ntp-4.2.4p2/libisc/ifiter_ioctl.c
--- ntp-4.2.4p2/libisc/ifiter_ioctl.c.noif	2007-09-24 16:08:55.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_ioctl.c	2007-09-24 16:08:55.000000000 +0200
@@ -1098,8 +1098,8 @@ internal_destroy(isc_interfaceiter_t *it
 #endif
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 #ifdef HAVE_TRUCLUSTER
 	int clua_result;
 #endif
@@ -1118,5 +1118,10 @@ void internal_first(isc_interfaceiter_t 
 #endif
 #ifdef __linux
 	linux_if_inet6_first(iter);
+	if (iter->valid == ISC_R_SUCCESS)
+		return (iter->valid);
 #endif
+	if (iter->pos >= (unsigned int) iter->ifc.ifc_len)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }
diff -up ntp-4.2.4p2/libisc/interfaceiter.c.noif ntp-4.2.4p2/libisc/interfaceiter.c
--- ntp-4.2.4p2/libisc/interfaceiter.c.noif	2006-06-06 22:16:24.000000000 +0200
+++ ntp-4.2.4p2/libisc/interfaceiter.c	2007-09-24 16:08:55.000000000 +0200
@@ -170,14 +170,11 @@ isc_interfaceiter_first(isc_interfaceite
 
 	REQUIRE(VALID_IFITER(iter));
 
-	internal_first(iter);
-	for (;;) {
+	for (result = internal_first(iter); result == ISC_R_SUCCESS;
+			result = internal_next(iter)) {
 		result = internal_current(iter);
 		if (result != ISC_R_IGNORE)
 			break;
-		result = internal_next(iter);
-		if (result != ISC_R_SUCCESS)
-			break;
 	}
 	iter->result = result;
 	return (result);
diff -up ntp-4.2.4p2/libisc/ifiter_getifaddrs.c.noif ntp-4.2.4p2/libisc/ifiter_getifaddrs.c
--- ntp-4.2.4p2/libisc/ifiter_getifaddrs.c.noif	2006-06-06 22:16:22.000000000 +0200
+++ ntp-4.2.4p2/libisc/ifiter_getifaddrs.c	2007-09-24 16:08:55.000000000 +0200
@@ -185,7 +185,10 @@ internal_destroy(isc_interfaceiter_t *it
 	iter->ifaddrs = NULL;
 }
 
-static
-void internal_first(isc_interfaceiter_t *iter) {
+static isc_result_t
+internal_first(isc_interfaceiter_t *iter) {
 	iter->pos = iter->ifaddrs;
+	if (iter->pos == NULL)
+		return (ISC_R_NOMORE);
+	return (ISC_R_SUCCESS);
 }


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ntp.spec	21 Aug 2007 13:39:44 -0000	1.72
+++ ntp.spec	24 Sep 2007 14:33:43 -0000	1.73
@@ -1,9 +1,7 @@
-%define _use_internal_dependency_generator 0
-
 Summary: Synchronizes system time using the Network Time Protocol (NTP)
 Name: ntp
 Version: 4.2.4p2
-Release: 5%{?dist}
+Release: 6%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # include/ntif.h : BSD
@@ -28,10 +26,6 @@
 Source6: ntp.step-tickers
 Source8: ntp.cryptopw
 
-# new find-requires
-Source7: filter-requires-ntp.sh
-%define __find_requires %{SOURCE7}
-
 Patch2: ntp-4.2.4p0-droproot.patch
 Patch3: ntp-4.2.4-groups.patch
 Patch4: ntp-4.1.1c-rc3-authkey.patch
@@ -50,6 +44,7 @@
 Patch17: ntp-4.2.4p0-sleep.patch
 Patch18: ntp-4.2.4p0-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
+Patch20: ntp-4.2.4p2-noif.patch
 
 URL: http://www.ntp.org
 Requires(pre): shadow-utils 
@@ -93,6 +88,7 @@
 %patch17 -p1 -b .sleep
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
+%patch20 -p1 -b .noif
 
 %ifarch ia64
 %patch5 -p1 -b .linkfastmath
@@ -214,6 +210,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-6
+- require perl (#274771)
+- don't fail when starting with no interfaces (#300371)
+
 * Tue Aug 21 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-5
 - avoid use of uninitialized floating-point values in clock_select
 - update license tag (Tom "spot" Callaway)


--- filter-requires-ntp.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:37:59 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 10:37:59 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc7-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.692, 1.693 kernel.spec, 1.179, 1.180 sources, 1.654,
	1.655 upstream, 1.576, 1.577 patch-2.6.23-rc7-git4.bz2.sign, 1.1, NONE
Message-ID: <200709241437.l8OEbxEh002350@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2263

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.23-rc7-git5.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git4.bz2.sign 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc7-git5



--- NEW FILE patch-2.6.23-rc7-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG92FmyGugalF9Dw4RAsV0AKCKkIHT1eMQBGl8GM8OkNOjx1ds2wCfZkte
fXWIyvfgrpK3ZGjYoXo2tLc=
=wt6q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- .cvsignore	24 Sep 2007 02:26:20 -0000	1.692
+++ .cvsignore	24 Sep 2007 14:37:26 -0000	1.693
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git4.bz2
+patch-2.6.23-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- kernel.spec	24 Sep 2007 02:26:20 -0000	1.179
+++ kernel.spec	24 Sep 2007 14:37:26 -0000	1.180
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1802,6 +1802,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc7-git5
+
 * Sun Sep 23 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -r1.654 -r1.655
--- sources	24 Sep 2007 02:26:20 -0000	1.654
+++ sources	24 Sep 2007 14:37:26 -0000	1.655
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-37ff766bfc5834bc33b84b5164debe79  patch-2.6.23-rc7-git4.bz2
+b9a6cb6a35b2ae0a25c357c59e7cdfc8  patch-2.6.23-rc7-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- upstream	24 Sep 2007 02:26:20 -0000	1.576
+++ upstream	24 Sep 2007 14:37:26 -0000	1.577
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git4.bz2
+patch-2.6.23-rc7-git5.bz2


--- patch-2.6.23-rc7-git4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:39:30 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Mon, 24 Sep 2007 10:39:30 -0400
Subject: rpms/gsoap/devel gsoap.spec,1.1,1.2
Message-ID: <200709241439.l8OEdUPC002490@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2405

Modified Files:
	gsoap.spec 
Log Message:
Moved pkgconfig requirement to -devel package


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsoap.spec	22 Sep 2007 13:18:22 -0000	1.1
+++ gsoap.spec	24 Sep 2007 14:38:58 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.7.9
-Release: 0.1.k
+Release: 0.2.k
 License: GPLv2
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
@@ -12,14 +12,11 @@
 Patch3: http://grid.et.redhat.com/files/tru64_hp_ux_c-2.7.9k.patch
 #Patch4: http://grid.et.redhat.com/files/anonymous_server_and_client-2.7.9k.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: dos2unix
 BuildRequires: findutils
 
-Requires: pkgconfig
-
 
 %description
 The gSOAP Web services development toolkit offers an XML to C/C++
@@ -31,6 +28,7 @@
 Summary: Devel libraries and headers for linking with gSOAP generated stubs
 Group: Development/System
 Requires: %name = %version-%release
+Requires: pkgconfig
 
 
 %description devel
@@ -175,6 +173,9 @@
 
 
 %changelog
+* Mon Sep 24 2007  <matt at robin.local> - 2.7.9-0.2.k
+- Moved pkgconfig requirement to -devel package
+
 * Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k
 - Initial release
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:40:47 2007
From: fedora-extras-commits at redhat.com (Matthew Farrellee (matt))
Date: Mon, 24 Sep 2007 10:40:47 -0400
Subject: rpms/gsoap/devel gsoap.spec,1.2,1.3
Message-ID: <200709241440.l8OEeluY002609@cvs-int.fedora.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2560

Modified Files:
	gsoap.spec 
Log Message:
Fixed name in changelog


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gsoap.spec	24 Sep 2007 14:38:58 -0000	1.2
+++ gsoap.spec	24 Sep 2007 14:40:15 -0000	1.3
@@ -173,7 +173,7 @@
 
 
 %changelog
-* Mon Sep 24 2007  <matt at robin.local> - 2.7.9-0.2.k
+* Mon Sep 24 2007  <mfarrellee at redhat> - 2.7.9-0.2.k
 - Moved pkgconfig requirement to -devel package
 
 * Tue Sep 11 2007  <mfarrellee at redhat> - 2.7.9-0.1.k



From fedora-extras-commits at redhat.com  Mon Sep 24 14:45:27 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 10:45:27 -0400
Subject: rpms/vnc/devel vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.179,
	1.180 vnc-s390.patch, 1.5, NONE
Message-ID: <200709241445.l8OEjRcT003137@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3064

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- obsoleted vnc-s390.patch
- build with --disable-xorg


vnc-noxorg.patch:

--- NEW FILE vnc-noxorg.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- vnc.spec	22 Aug 2007 11:49:06 -0000	1.179
+++ vnc.spec	24 Sep 2007 14:44:55 -0000	1.180
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   21%{?dist}
+Release:   22%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -22,7 +22,6 @@
 Patch9:    vnc-vncpasswd.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
-Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
@@ -37,6 +36,7 @@
 Patch33:   vnc-always_use_fb.patch
 Patch34:   vnc-vsnprintf.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -98,9 +98,6 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
-pushd unix/xorg-x11-server-source*
-%patch14 -p3 -b .s390
-popd
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
@@ -115,6 +112,7 @@
 %patch33 -p1 -b .always_use_fb
 %patch34 -p1 -b .vsnprintf
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .nomodule
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -142,7 +140,8 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --enable-xvfb \
+%configure --disable-xorg \
+	--disable-xnest --enable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -153,7 +152,7 @@
 	--enable-xcsecurity \
 	--with-default-font-path="unix/:7100,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
-        --with-os-name="Fedora Core 7" \
+        --with-os-name="Fedora Core 8" \
         --with-os-vendor="Red Hat, Inc." \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
         --with-rgb-path=%{_datadir}/X11/rgb \
@@ -313,9 +312,13 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-22
+- obsoleted vnc-s390.patch
+- build with --disable-xorg
+
 * Wed Aug 22 2007 Adam Tkac <atkac redhat com> 4.1.2-21
 - rebuild (BuildID feature)
-- GPLv2 livense
+- GPLv2 license
 
 * Mon Aug 06 2007 Adam Tkac <atkac redhat com> 4.1.2-20.2
 - updated vnc-s390 patch to latest xorg


--- vnc-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:46:19 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 24 Sep 2007 10:46:19 -0400
Subject: devel/vim README.patches,1.83,1.84 vim.spec,1.175,1.176
Message-ID: <200709241446.l8OEkJ6J003230@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 100


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- README.patches	7 Sep 2007 14:05:05 -0000	1.83
+++ README.patches	24 Sep 2007 14:45:47 -0000	1.84
@@ -22,6 +22,11 @@
 
 Checksums for the patch files can be found in the file MD5.
 
+Collection of patches for Vim 7.1:
+  SIZE  NAME                  INCLUDES
+ 91424  7.1.001-100.gz	      patches 7.1.001 to 7.1.100, gzip'ed
+
+
 Individual patches for Vim 7.1:
 
   SIZE  NAME     FIXES
@@ -124,3 +129,19 @@
   1780  7.1.098  ":call s:var()" doesn't work if "s:var" is a Funcref
   4552  7.1.099  ":mkvimrc" doesn't work properly when 'paste' or 'keymap' set
  14551  7.1.100  Win32: Executing cscope doesn't always work properly
+  1614  7.1.101  Ruby: The Buffer.line= method does not work
+  3276  7.1.102  Perl interface doesn't compile with new version of Perl
+  1976  7.1.103  "dw" past end of last line deletes a character
+ 14346  7.1.104  (after 7.1.095) when 'lazyredraw' set redraw may be postponed
+  2426  7.1.105  internal error when using "0 ? {'a': 1} : {}"
+  1580  7.1.106  ":messages" doesn't quit listing on ":"
+  4081  7.1.107  Visual block mode "s" that auto-indents fails in other lines
+  2633  7.1.108  (after 7.1.100) Win32: compilation problems in Cscope code
+  2147  7.1.109  GTK GUI: click on arrow left of tab 
+  2234  7.1.110  (after 7.1.102) Win32: Still compilation problems with Perl
+  2946  7.1.111  after ":vimgrep /pat/j *" folds can be wrong
+  1766  7.1.112  using input() with a wrong argument may crash Vim
+  2765  7.1.113  map() on an empty list causes memory to be freed twice
+  1386  7.1.114  memory leak in getmatches()
+  1472  7.1.115  (after 7.1.105) compiler warning for uninitialized variable
+  3137  7.1.116  can't display characters above 0x10000


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vim.spec	7 Sep 2007 14:05:05 -0000	1.175
+++ vim.spec	24 Sep 2007 14:45:47 -0000	1.176
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 100
+%define patchlevel 116
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -158,6 +158,24 @@
 Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
 # Win32:
 #Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100
+Patch101: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.101
+Patch102: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.102
+Patch103: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.103
+Patch104: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.104
+Patch105: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.105
+Patch106: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.106
+Patch107: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.107
+# Win32:
+#Patch108: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.108
+Patch109: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.109
+# Win32:
+#Patch110: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.110
+Patch111: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.111
+Patch112: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.112
+Patch113: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.113
+Patch114: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.114
+Patch115: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.115
+Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -400,6 +418,24 @@
 %patch099 -p0 
 # Win32:
 #patch100 -p0 
+%patch101 -p0 
+%patch102 -p0 
+%patch103 -p0 
+%patch104 -p0 
+%patch105 -p0 
+%patch106 -p0 
+%patch107 -p0 
+# Win32:
+#patch108 -p0 
+%patch109 -p0 
+# Win32:
+#patch110 -p0 
+%patch111 -p0 
+%patch112 -p0 
+%patch113 -p0 
+%patch114 -p0 
+%patch115 -p0 
+%patch116 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -785,6 +821,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.%{nil}116-1
+- patchlevel 116
+
 * Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1
 - patchlevel 100
 



From fedora-extras-commits at redhat.com  Mon Sep 24 14:56:56 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 10:56:56 -0400
Subject: rpms/vnc/F-7 vnc-noxorg.patch, NONE, 1.1 vnc.spec, 1.175,
	1.176 vnc-s390.patch, 1.4, NONE
Message-ID: <200709241456.l8OEuuVv005221@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5166

Modified Files:
	vnc.spec 
Added Files:
	vnc-noxorg.patch 
Removed Files:
	vnc-s390.patch 
Log Message:
- build with --disable-xorg (#271141)


vnc-noxorg.patch:

--- NEW FILE vnc-noxorg.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.s390	2007-09-21 11:11:58.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am	2007-09-21 11:12:46.000000000 +0200
@@ -27,19 +27,8 @@ Xvnc_SOURCES = \
 		$(top_srcdir)/fb/fbcmap.c
 
 Xvnc_LDADD =	$(XORG_CORE_LIBS) \
-		$(XORG_LIBS) \
+		$(XVFB_LIBS) \
 		$(XSERVER_LIBS) \
-		../../fb/libfb.la \
-		../../mi/libminimi.la \
-		../../render/librender.la \
-		../../xkb/libxkbstubs.la \
-		../../dbe/libdbe.la \
-		../../Xext/libXext.la \
-		../../XTrap/libxtrap.la \
-		../../record/librecord.la \
-		../xfree86/os-support/libxorgos.la \
-		../../os/libos.la \
-		../xfree86/common/libcommon.la \
 		-lX11 \
 		libvnccommon.la \
 		../../../../common/rfb/librfb.la


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- vnc.spec	11 Jun 2007 13:36:32 -0000	1.175
+++ vnc.spec	24 Sep 2007 14:56:23 -0000	1.176
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18%{?dist}
+Release:   18.1.%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -22,7 +22,6 @@
 Patch9:    vnc-vncpasswd.patch
 Patch11:   vnc-modular-xorg.patch
 Patch12:   vnc-nohttpd.patch
-Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
@@ -38,6 +37,7 @@
 Patch34:   vnc-vsnprintf.patch
 Patch35:   vnc-module_crash.patch
 Patch36:   vnc-24bit.patch
+Patch37:   vnc-noxorg.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -99,9 +99,6 @@
 %patch9 -p1 -b .vncpasswd
 %patch11 -p1 -b .modular-xorg
 %patch12 -p1 -b .nohttpd
-pushd unix/xorg-x11-server-source*
-%patch14 -p3 -b .s390
-popd
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
@@ -117,6 +114,7 @@
 %patch34 -p1 -b .vsnprintf
 %patch35 -p1 -b .module_crash
 %patch36 -p1 -b .24bit
+%patch37 -p1 -b .noxorg
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -144,7 +142,7 @@
 
 cd xorg-x11-server-source
 aclocal; automake -a; autoconf
-%configure --enable-xorg --disable-xnest --disable-xvfb \
+%configure --disable-xorg --disable-xnest --disable-xvfb \
 	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 	--with-pic \
         --disable-xorgcfg \
@@ -315,6 +313,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Sep 24 2007 Adam Tkac <atkac redhat com> 4.1.2-18.1
+- build with --disable-xorg (#271141)
+
 * Mon Jun 11 2007 Adam Tkac <atkac redhat com> 4.1.2-18.fc7
 - Xvnc now has 24bit support (#242277) and correct RENDER initialization
 - updated s390 patch to latest Xorg


--- vnc-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 14:57:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 24 Sep 2007 10:57:17 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.59,1.60 alsa.rules,1.1,1.2
Message-ID: <200709241457.l8OEvHIS005235@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5196

Modified Files:
	alsa-utils.spec alsa.rules 
Log Message:
fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- alsa-utils.spec	20 Sep 2007 15:09:25 -0000	1.59
+++ alsa-utils.spec	24 Sep 2007 14:56:44 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.15
-Release: 	0.2%{?prever_dot}%{?dist}
+Release: 	0.3%{?prever_dot}%{?dist}
 License: 	GPLv2+
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -72,11 +72,14 @@
 %{_datadir}/alsa/
 %{_datadir}/sounds/
 %{_mandir}/man?/*
-/var/lib/alsa
+%dir /var/lib/alsa
 %ghost /var/lib/alsa/asound.state
 
 
 %changelog
+* Mon Sep 24 2007 Martin Stransky <stransky at redhat.com> 1.0.15-0.3.rc1
+- fixed #303151 - wrong salsa dir in /etc/udev/rules.d/90-alsa.rules
+
 * Thu Sep 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.15-0.2.rc1
 - Update License field.
 - Mark udev rule as config.


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa.rules	13 Jul 2005 19:03:02 -0000	1.1
+++ alsa.rules	24 Sep 2007 14:56:44 -0000	1.2
@@ -1,2 +1,2 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"		
\ No newline at end of file
+SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/bin/salsa"
+SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/bin/salsa"
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Sep 24 15:05:54 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Mon, 24 Sep 2007 11:05:54 -0400
Subject: rpms/vnc/F-7 vnc.spec,1.176,1.177
Message-ID: <200709241505.l8OF5sXk011706@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11595

Modified Files:
	vnc.spec 
Log Message:
- corrected release



Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-7/vnc.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- vnc.spec	24 Sep 2007 14:56:23 -0000	1.176
+++ vnc.spec	24 Sep 2007 15:05:21 -0000	1.177
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   18.1.%{?dist}
+Release:   18.1%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:07:20 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 24 Sep 2007 11:07:20 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.60,1.61 alsa.rules,1.2,1.3
Message-ID: <200709241507.l8OF7KIu011804@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724

Modified Files:
	alsa-utils.spec alsa.rules 
Log Message:
moved salsa back to /sbin


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- alsa-utils.spec	24 Sep 2007 14:56:44 -0000	1.60
+++ alsa-utils.spec	24 Sep 2007 15:06:48 -0000	1.61
@@ -48,7 +48,8 @@
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -p -m 755 salsa alsacard alsaunmute %{buildroot}/bin/
+install -p -m 755 alsacard alsaunmute %{buildroot}/bin/
+install -p -m 755 salsa %{buildroot}/sbin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa.rules	24 Sep 2007 14:56:44 -0000	1.2
+++ alsa.rules	24 Sep 2007 15:06:48 -0000	1.3
@@ -1,2 +1,2 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/bin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/bin/salsa"
\ No newline at end of file
+SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
+SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Sep 24 15:07:43 2007
From: fedora-extras-commits at redhat.com (Phil Knirsch (pknirsch))
Date: Mon, 24 Sep 2007 11:07:43 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.43,1.44
Message-ID: <200709241507.l8OF7hCu011874@cvs-int.fedora.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11748

Modified Files:
	OpenIPMI.spec 
Log Message:
- Added missing popt-devel buildrequires



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- OpenIPMI.spec	17 Aug 2007 15:42:26 -0000	1.43
+++ OpenIPMI.spec	24 Sep 2007 15:07:09 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildPrereq: openssl-devel python-devel readline-devel
+BuildPrereq: openssl-devel python-devel readline-devel popt-devel
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
@@ -163,6 +163,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-2
+- Added missing popt-devel buildrequires
+
 * Fri Aug 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-2
 - Fix rebuild problems due to glibc change
 - License review and fixes



From fedora-extras-commits at redhat.com  Mon Sep 24 15:15:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:15:35 -0400
Subject: rpms/gambas/devel gambas.spec,1.27,1.28
Message-ID: <200709241515.l8OFFZDV012283@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12156

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
- Rebuild for new sqlite.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gambas.spec	24 Aug 2007 14:24:15 -0000	1.27
+++ gambas.spec	24 Sep 2007 15:15:03 -0000	1.28
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.19
-Release: 	1%{?dist}.2
+Release: 	2%{?dist}
 License: 	GPL+
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -423,6 +423,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+- Rebuild for new sqlite.
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.19-1.2
 - ppc64 is a 64bit arch
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:17:05 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 11:17:05 -0400
Subject: rpms/struts/devel struts.spec,1.48,1.49
Message-ID: <200709241517.l8OFH5ch012577@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12281

Modified Files:
	struts.spec 
Log Message:

- Exclude webapp classes from native compilation (issues with 
  check-build-root, where only .jar.so is excluded from checking 
  for $RPM_BUILD_ROOT in file content)




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- struts.spec	20 Sep 2007 22:20:32 -0000	1.48
+++ struts.spec	24 Sep 2007 15:16:32 -0000	1.49
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.7%{?dist}
+Release:	4jpp.8%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -693,7 +693,7 @@
 %endif
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+%{_bindir}/aot-compile-rpm --exclude %{tomcat5appsdir}/struts-example/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-examples/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-tiles-documentation/WEB-INF/classes
 %endif
 
 %clean
@@ -968,9 +968,6 @@
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-example_classes*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-examples_classes*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-tiles-documentation_classes*
 %endif
 
 %if %{without_coreonly}
@@ -1061,6 +1058,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.8
+- Exclude webapp classes from native compilation (issues with check-build-root)
+
 * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.7
 - Rebuild for ppc32 execmem issue and new build-id
 - Add %%{?dist} as per new policy



From fedora-extras-commits at redhat.com  Mon Sep 24 15:18:27 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Mon, 24 Sep 2007 11:18:27 -0400
Subject: rpms/system-config-network/devel system-config-network.spec, 1.30, 
	1.31
Message-ID: <200709241518.l8OFIRZH012987@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12750

Modified Files:
	system-config-network.spec 
Log Message:
* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1-2
- require newt-python instead of newt only



Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-network.spec	24 Sep 2007 09:30:09 -0000	1.30
+++ system-config-network.spec	24 Sep 2007 15:17:55 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -24,7 +24,7 @@
 Group: Applications/System 
 Obsoletes: netcfg, redhat-config-network-tui, netconfig
 Provides: redhat-config-network-tui
-Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt, pciutils
+Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils
 
 %description tui
 This is the network configuration tool,
@@ -96,6 +96,9 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1-2
+- require newt-python instead of newt only
+
 * Mon Sep 24 2007 Harald Hoyer <harald at redhat.com> - 1.4.1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:20:00 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:20:00 -0400
Subject: rpms/Miro/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241520.l8OFK0UD013198@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13150

Modified Files:
	.cvsignore sources 
Log Message:
Actually upload the source tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jul 2007 20:54:36 -0000	1.1
+++ .cvsignore	24 Sep 2007 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+Miro-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jul 2007 20:54:36 -0000	1.1
+++ sources	24 Sep 2007 15:19:27 -0000	1.2
@@ -0,0 +1 @@
+ab32d49da9396aa4d596953f5575394b  Miro-0.9.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:20:02 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Mon, 24 Sep 2007 11:20:02 -0400
Subject: rpms/dovecot/F-7 .cvsignore, 1.28, 1.29 dovecot.spec, 1.80,
	1.81 sources, 1.29, 1.30
Message-ID: <200709241520.l8OFK25w013208@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13159

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Mon Sep 24 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.5-15
- update to latest upstream (1.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	7 Aug 2007 09:20:46 -0000	1.28
+++ .cvsignore	24 Sep 2007 15:19:29 -0000	1.29
@@ -1,4 +1,4 @@
-dovecot-1.0.3.tar.gz
-dovecot-1.0.3.tar.gz.sig
+dovecot-1.0.5.tar.gz
+dovecot-1.0.5.tar.gz.sig
 dovecot-sieve-1.0.2.tar.gz
 dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/dovecot.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- dovecot.spec	13 Aug 2007 11:03:28 -0000	1.80
+++ dovecot.spec	24 Sep 2007 15:19:29 -0000	1.81
@@ -1,7 +1,7 @@
-%define upstream 1.0.3
+%define upstream 1.0.5
 %define sieve_upstream 1.0.2
-%define pkg_version 1.0.3
-%define my_release 14
+%define pkg_version 1.0.5
+%define my_release 15
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.2
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -297,6 +297,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.5-15
+- update to latest upstream (1.0.5)
+
 * Mon Aug 06 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.3-14
 - update to latest upstream (1.0.3 and sieve 1.0.2)
 - added the quota-warning patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	7 Aug 2007 09:20:46 -0000	1.29
+++ sources	24 Sep 2007 15:19:29 -0000	1.30
@@ -1,4 +1,4 @@
-1d7cc3c4964789554553e7e4ea3f82b4  dovecot-1.0.3.tar.gz
-7aeb01b6cee5388a1864e425ad04fa30  dovecot-1.0.3.tar.gz.sig
+94b7d29cf44f63f89d538361afa05c40  dovecot-1.0.5.tar.gz
+eacaec9e3502e9e0544e73846c3e9a09  dovecot-1.0.5.tar.gz.sig
 508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
 fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Sep 24 15:24:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 11:24:00 -0400
Subject: rpms/wdfs/devel wdfs.spec,1.3,1.4
Message-ID: <200709241524.l8OFO0bv013359@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/wdfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13323

Modified Files:
	wdfs.spec 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.4.2-4
- Fix spelling error in URL. (#302731)



Index: wdfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wdfs/devel/wdfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wdfs.spec	23 Aug 2007 09:20:45 -0000	1.3
+++ wdfs.spec	24 Sep 2007 15:23:27 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           wdfs
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WebDAV File System
 
 Group:          System Environment/Base
 License:        GPL
-URL:            http://noedler.de/projeckte/wdfs/
+URL:            http://noedler.de/projekte/wdfs/
 Source0:        http://noedler.de/projekte/wdfs/wdfs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,6 +39,9 @@
 %{_bindir}/wdfs
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.4.2-4
+- Fix spelling error in URL. (#302731)
+
 * Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 1.4.2-3
 - rebuild for neon 0.27
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:29:24 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 11:29:24 -0400
Subject: rpms/Miro/devel dbus.patch,NONE,1.1
Message-ID: <200709241529.l8OFTOuQ013764@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13753

Added Files:
	dbus.patch 
Log Message:
This seems to have been lost on the devel/ branch for some reason.


dbus.patch:

--- NEW FILE dbus.patch ---
--- platform/gtk-x11/onetime.py	2007-07-17 21:32:42.000000000 +0200
+++ platform/gtk-x11/onetime.py.new	2007-07-22 20:16:17.000000000 +0200
@@ -109,7 +109,8 @@
     def __init__(self):
         bus = dbus.SessionBus()
         bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE)
-        dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime')
+        dbus.service.Object.__init__(self, bus_name=bus_name, 
+object_path='/org/participatoryculture/dtv/OneTime')
 
     @dbus.service.method('org.participatoryculture.dtv.OneTimeIface')
     def HandleArgs (self, args):



From fedora-extras-commits at redhat.com  Mon Sep 24 15:29:25 2007
From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones))
Date: Mon, 24 Sep 2007 11:29:25 -0400
Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.6, 1.7 ocaml-libvirt.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200709241529.l8OFTPG4013778@cvs-int.fedora.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13717/devel

Modified Files:
	.cvsignore ocaml-libvirt.spec sources 
Log Message:
* Mon Sep 24 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.8-1
- New upstream release 0.3.2.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Sep 2007 10:30:27 -0000	1.6
+++ .cvsignore	24 Sep 2007 15:28:53 -0000	1.7
@@ -1 +1 @@
-ocaml-libvirt-0.3.2.7.tar.gz
+ocaml-libvirt-0.3.2.8.tar.gz


Index: ocaml-libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-libvirt.spec	20 Sep 2007 10:30:27 -0000	1.6
+++ ocaml-libvirt.spec	24 Sep 2007 15:28:53 -0000	1.7
@@ -8,7 +8,7 @@
 %define build_full_featured_virt_top 1
 
 Name:           ocaml-libvirt
-Version:        0.3.2.7
+Version:        0.3.2.8
 Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
@@ -204,6 +204,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.8-1
+- New upstream release 0.3.2.8.
+
 * Thu Sep 20 2007 Richard W.M. Jones <rjones at redhat.com> - 0.3.2.7-1
 - New upstream release 0.3.2.7.
 - Ship the upstream ChangeLog file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Sep 2007 10:30:27 -0000	1.6
+++ sources	24 Sep 2007 15:28:53 -0000	1.7
@@ -1 +1 @@
-0124c74d23767dc3b4dffefaae9995e9  ocaml-libvirt-0.3.2.7.tar.gz
+b7468deedef3a8d5f50ffbbc14ffb5c6  ocaml-libvirt-0.3.2.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 15:42:13 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 11:42:13 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.128,
	1.129 libselinux.spec, 1.286, 1.287
Message-ID: <200709241542.l8OFgDLe014321@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14298

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- libselinux-rhat.patch	18 Sep 2007 20:44:47 -0000	1.128
+++ libselinux-rhat.patch	24 Sep 2007 15:42:11 -0000	1.129
@@ -1,6 +1,19 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-2.0.34/src/avc_internal.c
+--- nsalibselinux/src/avc_internal.c	2007-07-16 14:20:46.000000000 -0400
++++ libselinux-2.0.34/src/avc_internal.c	2007-09-24 11:37:47.000000000 -0400
+@@ -61,7 +61,8 @@
+ 		rc = fd;
+ 		goto out;
+ 	}
+-
++	
++	fcntl(fd, F_SETFD, FD_CLOEXEC);
+ 	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
+ 		close(fd);
+ 		rc = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
-+++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 15:45:42.000000000 -0400
++++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -18,9 +31,9 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.33/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.34/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
-+++ libselinux-2.0.33/utils/matchpathcon.c	2007-09-18 15:50:31.000000000 -0400
++++ libselinux-2.0.34/utils/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
 @@ -17,10 +17,24 @@
  	exit(1);
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- libselinux.spec	18 Sep 2007 20:44:47 -0000	1.286
+++ libselinux.spec	24 Sep 2007 15:42:11 -0000	1.287
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,9 @@
 
 %changelog
 
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-2
+- Remove leaked file descriptor
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-1
 - Upgrade to latest from NSA
 	* Fix selabel option flag setting for 64-bit from Stephen Smalley.



From fedora-extras-commits at redhat.com  Mon Sep 24 15:49:49 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 11:49:49 -0400
Subject: devel/kvm kvm-bootmenu.patch,NONE,1.1 kvm.spec,1.23,1.24
Message-ID: <200709241549.l8OFnn4i014632@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	kvm.spec 
Added Files:
	kvm-bootmenu.patch 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
- add support for selecting boot device at runtime


kvm-bootmenu.patch:

--- NEW FILE kvm-bootmenu.patch ---
diff --git a/bios/BIOS-bochs-latest b/bios/BIOS-bochs-latest
index c10ae62..e13af69 100644
Binary files a/bios/BIOS-bochs-latest and b/bios/BIOS-bochs-latest differ
diff --git a/bios/BIOS-bochs-legacy b/bios/BIOS-bochs-legacy
index 131e62b..5c03460 100644
Binary files a/bios/BIOS-bochs-legacy and b/bios/BIOS-bochs-legacy differ
diff --git a/bios/rombios.c b/bios/rombios.c
index ac918ad..4ebdb71 100644
--- a/bios/rombios.c
+++ b/bios/rombios.c
@@ -1950,6 +1950,228 @@ print_cdromboot_failure( code )
   return;
 }
 
+#define WAIT_HZ 18
+/**
+ * Check for keystroke.
+ * @returns    True if keystroke available, False if not.
+ */
+Bit8u check_for_keystroke()
+{
+ASM_START
+    mov  ax, #0x100
+    int  #0x16
+    jz   no_key
+    mov  al, #1
+    jmp  done
+no_key:
+    xor  al, al
+done:
+ASM_END
+}
+
+/**
+ * Get keystroke.
+ * @returns    BIOS scan code.
+ */
+Bit8u get_keystroke()
+{
+ASM_START
+    mov  ax, #0x0
+    int  #0x16
+    xchg ah, al
+ASM_END
+}
+
+/**
+ * Waits (sleeps) for the given number of ticks.
+ * Checks for keystroke.
+ *
+ * @returns BIOS scan code if available, 0 if not.
+ * @param   ticks       Number of ticks to sleep.
+ * @param   stop_on_key Whether to stop immediately upon keypress.
+ */
+Bit8u wait(ticks, stop_on_key)
+  Bit16u ticks;
+  Bit8u stop_on_key;
+{
+    long ticks_to_wait, delta;
+    Bit32u prev_ticks, t;
+    Bit8u scan_code = 0;
+
+    /*
+     * The 0:046c wraps around at 'midnight' according to a 18.2Hz clock.
+     * We also have to be careful about interrupt storms.
+     */
+    ticks_to_wait = ticks;
+    prev_ticks = read_dword(0x0, 0x46c);
+    do
+    {
+        t = read_dword(0x0, 0x46c);
+        if (t > prev_ticks)
+        {
+            delta = t - prev_ticks;     /* The temp var is required or bcc screws up. */
+            ticks_to_wait -= delta;
+        }
+        else if (t < prev_ticks)
+            ticks_to_wait -= t;         /* wrapped */
+        prev_ticks = t;
+
+        if (check_for_keystroke())
+        {
+            scan_code = get_keystroke();
+            bios_printf(BIOS_PRINTF_DEBUG, "Key pressed: %x\n", scan_code);
+            if (stop_on_key)
+                return scan_code;
+        }
+    } while (ticks_to_wait > 0);
+    return scan_code;
+}
+
+static void clearscreen() {
+    /* Hide cursor, clear screen and move cursor to starting position */
+ASM_START
+        push bx
+        push cx
+        push dx
+
+        mov  ax, #0x100
+        mov  cx, #0x1000
+        int  #0x10
+
+        mov  ax, #0x700
+        mov  bh, #7
+        xor  cx, cx
+        mov  dx, #0x184f
+        int  #0x10
+
+        mov  ax, #0x200
+        xor  bx, bx
+        xor  dx, dx
+        int  #0x10
+
+        pop  dx
+        pop  cx
+        pop  bx
+ASM_END
+}
+
+int bootmenu(selected)
+  int selected;
+{
+    Bit8u scode;
+    int max;
+
+    /* get the number of boot devices */
+    max = read_word(IPL_SEG, IPL_COUNT_OFFSET);
+
+    for(;;) {
+        clearscreen();
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\n\n\n\n\n\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "          Select boot device\n\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            1. Floppy\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            2. Hard drive\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            3. CD-ROM\n");
+        if (max == 4)
+            bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "            4. Network\n");
+        bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\n          Currently selected: %d\n", selected);
+
+        do {
+            scode = wait(WAIT_HZ, 1);
+        } while (scode == 0);
+        switch(scode) {
+        case 0x02:
+        case 0x03:
+        case 0x04:
+            selected = scode - 1;
+            break;
+        case 0x05:
+            if (max == 4)
+                selected = scode -1 ;
+            else
+                scode = 0;
+            break;
+        case 0x48:
+            selected -= 1;
+            if (selected < 1)
+                selected = 1;
+            scode = 0;
+            break;
+        case 0x50:
+            selected += 1;
+            if (selected > max)
+                selected = max;
+            scode = 0;
+            break;
+        case 0x1c:
+            break;
+        default:
+            scode = 0;
+            break;
+        }
+        if (scode != 0)
+            break;
+    }
+
+    switch (selected) {
+    case 1:
+        return 0x3D;
+    case 2:
+        return 0x3E;
+    case 3:
+        return 0x3F;
+    case 4:
+        return 0x58;
+    default:
+        return 0;
+    }
+}
+
+void interactive_bootkey()
+{
+    Bit16u i;
+    Bit8u scan = 0;
+
+    bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "\n\nPress F10 to select boot device.\n");
+    for (i = 3; i > 0; i--)
+    {
+        scan = wait(WAIT_HZ, 0);
+        switch (scan) {
+        case 0x3D:
+        case 0x3E:
+        case 0x3F:
+        case 0x58:
+            break;
+        case 0x44:
+            scan = bootmenu(inb_cmos(0x3d));
+            break;
+        default:
+            scan = 0;
+            break;
+        }
+        if (scan != 0)
+            break;
+    }
+
+    /* set the default based on the keypress or menu */
+    switch(scan) {
+    case 0x3D:
+        outb_cmos(0x3d, 0x01);
+        break;
+    case 0x3E:
+        outb_cmos(0x3d, 0x02);
+        break;
+    case 0x3F:
+        outb_cmos(0x3d, 0x03);
+        break;
+    case 0x58:
+        outb_cmos(0x3d, 0x04);
+        break;
+    default:
+        break;
+    }
+}
+
+
 void
 nmi_handler_msg()
 {
@@ -10226,6 +10448,8 @@ post_default_ints:
   ;;
 #endif // BX_ELTORITO_BOOT
 
+  call _interactive_bootkey
+
   sti        ;; enable interrupts
   int  #0x19
 


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kvm.spec	4 Sep 2007 19:21:46 -0000	1.23
+++ kvm.spec	24 Sep 2007 15:49:17 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -9,12 +9,15 @@
 Source1: kvm.modules
 Patch0: kvm-19-defaults.patch
 Patch1: kvm-35-ldflags.patch
+Patch2: kvm-bootmenu.patch
 # patches from upstream qemu
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
 Patch103: qemu-0.9.0-vnc-authentication.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
+# to build the bios
+BuildRequires: dev86
 # qemu doesn't build with gcc 4.x
 BuildRequires: compat-gcc-34 
 BuildRequires: zlib-devel 
@@ -39,6 +42,7 @@
 %setup -q
 %patch0 -p1 -b .defaults
 %patch1 -p1 -b .ldflags
+%patch2 -p1 
 
 %patch101 -p1
 %patch102 -p0
@@ -55,6 +59,7 @@
 # manual keeping up of what is in the kvm tree.
 sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
+make bios
 make %{?_smp_mflags} 
 
 
@@ -87,6 +92,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
+- add support for selecting boot device at runtime
+
 * Tue Sep  4 2007 Jeremy Katz <katzj at redhat.com> - 36-2
 - rebase vnc auth patch
 



From fedora-extras-commits at redhat.com  Mon Sep 24 15:56:04 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 11:56:04 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.129,
	1.130 libselinux.spec, 1.287, 1.288
Message-ID: <200709241556.l8OFu4YT015023@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15000

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- libselinux-rhat.patch	24 Sep 2007 15:42:11 -0000	1.129
+++ libselinux-rhat.patch	24 Sep 2007 15:56:01 -0000	1.130
@@ -11,6 +11,22 @@
  	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
  		close(fd);
  		rc = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.34/src/Makefile
+--- nsalibselinux/src/Makefile	2007-08-03 16:02:56.000000000 -0400
++++ libselinux-2.0.34/src/Makefile	2007-09-24 11:51:42.000000000 -0400
+@@ -57,10 +57,10 @@
+ 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
+ 
+ $(LIBSO): $(LOBJS)
+-	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+ 	ln -sf $@ $(TARGET) 
+ 
+ %.o:  %.c policy.h
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
 +++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- libselinux.spec	24 Sep 2007 15:42:11 -0000	1.287
+++ libselinux.spec	24 Sep 2007 15:56:01 -0000	1.288
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.34
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,9 @@
 
 %changelog
 
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-3
+- Add sparc patch to from Dennis Gilmore to build on Sparc platform
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-2
 - Remove leaked file descriptor
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:31 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1WCK001739@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:35 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1apg001796@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:01:39 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:01:39 -0700
Subject: [pkgdb] apt: scop has given up watchbugzilla
Message-ID: <200709241601.l8OG1eQJ011092@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on apt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:30 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2UEv011267@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:36 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:36 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2aMW002366@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:02:38 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:02:38 -0700
Subject: [pkgdb] chrpath: scop has given up watchbugzilla
Message-ID: <200709241602.l8OG2cDX011305@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on chrpath (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chrpath



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:02 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG33mI002532@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:05 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:05 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG354K011514@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:09 -0700
Subject: [pkgdb] fedora-package-config-apt: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG39ND002579@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-apt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-apt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:16 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3GSH011574@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:19 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3KQg002636@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:24 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:24 -0700
Subject: [pkgdb] fakeroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3O9t011617@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakeroot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakeroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:31 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Vot011658@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:33 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:33 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Yl7002764@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:35 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:03:35 -0700
Subject: [pkgdb] fakechroot: scop has given up watchbugzilla
Message-ID: <200709241603.l8OG3Z4N011685@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fakechroot (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fakechroot



From fedora-extras-commits at redhat.com  Mon Sep 24 16:03:56 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Mon, 24 Sep 2007 12:03:56 -0400
Subject: rpms/iptables/devel iptables-1.3.8-limit_man.patch, NONE,
	1.1 iptables-1.3.8-reject_type.patch, NONE,
	1.1 iptables-1.3.8-typo_latter.patch, NONE, 1.1 iptables.init,
	1.15, 1.16 iptables.spec, 1.52, 1.53
Message-ID: <200709241603.l8OG3uIk021499@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21413

Modified Files:
	iptables.init iptables.spec 
Added Files:
	iptables-1.3.8-limit_man.patch 
	iptables-1.3.8-reject_type.patch 
	iptables-1.3.8-typo_latter.patch 
Log Message:
- fixed IPv6 reject type (rhbz#295181)
- fixed init script: start, stop and status
- support netfilter compiled into kernel in init script (rhbz#295611)
- dropped inversion for limit modules from man pages (rhbz#220780)
- fixed typo in ip6tables man page (rhbz#236185)



iptables-1.3.8-limit_man.patch:

--- NEW FILE iptables-1.3.8-limit_man.patch ---
diff -up iptables-1.3.8/iptables.8.in.limit iptables-1.3.8/iptables.8.in
diff -up iptables-1.3.8/extensions/libip6t_limit.man.limit_man iptables-1.3.8/extensions/libip6t_limit.man
--- iptables-1.3.8/extensions/libip6t_limit.man.limit_man	2007-09-24 16:48:22.000000000 +0200
+++ iptables-1.3.8/extensions/libip6t_limit.man	2007-09-24 17:28:29.000000000 +0200
@@ -1,6 +1,6 @@
 This module matches at a limited rate using a token bucket filter.
-A rule using this extension will match until this limit is reached
-(unless the `!' flag is used).  It can be used in combination with the
+A rule using this extension will match until this limit is reached.
+  It can be used in combination with the
 .B LOG
 target to give limited logging, for example.
 .TP
diff -up iptables-1.3.8/extensions/libipt_limit.man.limit_man iptables-1.3.8/extensions/libipt_limit.man
--- iptables-1.3.8/extensions/libipt_limit.man.limit_man	2007-09-24 16:48:22.000000000 +0200
+++ iptables-1.3.8/extensions/libipt_limit.man	2007-09-24 17:28:19.000000000 +0200
@@ -1,6 +1,6 @@
 This module matches at a limited rate using a token bucket filter.
-A rule using this extension will match until this limit is reached
-(unless the `!' flag is used).  It can be used in combination with the
+A rule using this extension will match until this limit is reached.
+  It can be used in combination with the
 .B LOG
 target to give limited logging, for example.
 .TP

iptables-1.3.8-reject_type.patch:

--- NEW FILE iptables-1.3.8-reject_type.patch ---
diff -up iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h.reject_type iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h
--- iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h.reject_type	2007-09-24 16:48:21.000000000 +0200
+++ iptables-1.3.8/include/linux/netfilter_ipv6/ip6t_REJECT.h	2007-09-24 17:20:45.000000000 +0200
@@ -4,13 +4,15 @@
 enum ip6t_reject_with {
 	IP6T_ICMP6_NO_ROUTE,
 	IP6T_ICMP6_ADM_PROHIBITED,
+	IP6T_ICMP6_NOT_NEIGHBOUR,
 	IP6T_ICMP6_ADDR_UNREACH,
 	IP6T_ICMP6_PORT_UNREACH,
+	IP6T_ICMP6_ECHOREPLY,
 	IP6T_TCP_RESET
 };
 
 struct ip6t_reject_info {
-	enum ip6t_reject_with with;      /* reject type */
+	u_int32_t with;      /* reject type */
 };
 
 #endif /*_IP6T_REJECT_H*/

iptables-1.3.8-typo_latter.patch:

--- NEW FILE iptables-1.3.8-typo_latter.patch ---
diff -up iptables-1.3.8/extensions/libip6t_REJECT.man.typo_latter iptables-1.3.8/extensions/libip6t_REJECT.man
--- iptables-1.3.8/extensions/libip6t_REJECT.man.typo_latter	2007-09-24 17:30:47.000000000 +0200
+++ iptables-1.3.8/extensions/libip6t_REJECT.man	2007-09-24 17:34:48.000000000 +0200
@@ -32,5 +32,5 @@ TCP RST packet to be sent back.  This is
 (113/tcp) probes which frequently occur when sending mail to broken mail
 hosts (which won't accept your mail otherwise).
 .B tcp-reset
-can only be used with kernel versions 2.6.14 or latter.
+can only be used with kernel versions 2.6.14 or later.
 


Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- iptables.init	19 Sep 2007 16:30:16 -0000	1.15
+++ iptables.init	24 Sep 2007 16:03:24 -0000	1.16
@@ -48,6 +48,31 @@
 # Load firewall configuration.
 [ -f "$IPTABLES_CONFIG" ] && . "$IPTABLES_CONFIG"
 
+# Netfilter modules
+NF_MODULES=(${IPV}_tables nf_conntrack_${_IPV})
+NF_MODULES_COMMON=(x_tables nf_conntrack) # Used by netfilter v4 and v6
+
+# Are netfilter modules loaded?
+MODULES_LOADED=0
+for mod in ${NF_MODULES[*]} ${NF_MODULES_COMMON[*]}; do
+    $(lsmod | grep -q ^${mod} | awk '{print $1}')
+    if [ $? -eq 0 ]; then
+	MODULES_LOADED=1
+	break
+    fi
+done
+
+# Get active tables
+NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
+
+# Is netfilter compiled into the kernel?
+[ $MODULES_LOADED -eq 0 -a -n "$NF_TABLES" ] && COMPILED_IN=1 || COMPILED_IN=0
+
+# Get status (quicker than status function and honour lock file)
+[ ! -f "$VAR_SUBSYS_IPTABLES" -o ! -e "$PROC_IPTABLES_NAMES" \
+    -o -z "$NF_TABLES" ] && running=0 || running=1
+
+
 rmmod_r() {
     # Unload module with all referring modules.
     # At first all referring modules will be unloaded, then the module itself.
@@ -83,13 +108,12 @@
     [ -e "$PROC_IPTABLES_NAMES" ] || return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
-    [ -z "$tables" ] && return 1
+    [ -z "$NF_TABLES" ] && return 1
 
     echo -n $"Flushing firewall rules: "
     ret=0
     # For all tables
-    for i in $tables; do
+    for i in $NF_TABLES; do
         # Flush firewall rules.
 	$IPTABLES -t $i -F;
 	let ret+=$?;
@@ -116,7 +140,7 @@
     [ ! -e "$PROC_IPTABLES_NAMES" ] && return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
+    tables=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
     [ -z "$tables" ] && return 1
 
     echo -n $"Setting chains to policy $policy: "
@@ -203,14 +227,15 @@
     if [ "x$IPTABLES_MODULES_UNLOAD" = "xyes" ]; then
 	echo -n $"Unloading $IPTABLES modules: "
 	ret=0
-	rmmod_r ${IPV}_tables
-	let ret+=$?;
-	rmmod_r nf_conntrack_${_IPV}
-	let ret+=$?;
+	for mod in ${NF_MODULES[*]}; do
+	    rmmod_r $mod
+	    let ret+=$?;
+	done
 	# try to unload remaining netfilter modules used by ipv4 and ipv6 
 	# netfilter
-	rmmod_r x_tables
-	rmmod_r nf_conntrack
+	for mod in ${NF_MODULES_COMMON[*]}; do
+	    rmmod_r $mod
+	done
 	[ $ret -eq 0 ] && success || failure
 	echo
     fi
@@ -224,8 +249,7 @@
     [ ! -e "$PROC_IPTABLES_NAMES" ] && return 1
 
     # Check if firewall is configured (has tables)
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
-    [ -z "$tables" ] && return 1
+    [ -z "$NF_TABLES" ] && return 1
 
     echo -n $"Saving firewall rules to $IPTABLES_DATA: "
 
@@ -257,18 +281,21 @@
 }
 
 status() {
-    tables=$(cat $PROC_IPTABLES_NAMES 2>/dev/null)
+    if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$NF_TABLES" ]; then
+	echo $"Firewall is not running."
+	return 3
+    fi
 
     # Do not print status if lockfile is missing and iptables modules are not 
     # loaded.
     # Check if iptable modules are loaded
-    if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$tables" ]; then
-	echo $"Firewall is stopped."
+    if [ ! -e "$PROC_IPTABLES_NAMES" ]; then
+	echo $"Firewall modules not loaded."
 	return 3
     fi
 
     # Check if firewall is configured (has tables)
-    if [ ! -e "$PROC_IPTABLES_NAMES" -o -z "$tables" ]; then
+    if [ -z "$NF_TABLES" ]; then
 	echo $"Firewall is not configured. "
 	return 3
     fi
@@ -280,7 +307,7 @@
     COUNT=
     [ "x$IPTABLES_STATUS_LINENUMBERS" = "xyes" ] && COUNT="--line-numbers"
 
-    for table in $tables; do
+    for table in $NF_TABLES; do
 	echo $"Table: $table"
 	$IPTABLES -t $table --list $NUM $VERBOSE $COUNT && echo
     done
@@ -294,17 +321,16 @@
     start
 }
 
-status >/dev/null 2>&1
-running=$?
 
 case "$1" in
     start)
-	[ $running -eq 0 ] && exit 0
+	[ $running -eq 1 -a $COMPILED_IN -eq 0 ] && exit 0
 	start
 	RETVAL=$?
 	;;
     stop)
-	[ $running -eq 0 ] || exit 0
+	# stop firewall, even if manually configured
+	[ $running -eq 1 -o $MODULES_LOADED -eq 1 ] || exit 0
 	[ "x$IPTABLES_SAVE_ON_STOP" = "xyes" ] && save
 	stop
 	RETVAL=$?
@@ -314,7 +340,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ $running -eq 0 ] || exit 0
+	[ $running -eq 1 ] || exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- iptables.spec	19 Sep 2007 16:30:16 -0000	1.52
+++ iptables.spec	24 Sep 2007 16:03:24 -0000	1.53
@@ -3,12 +3,15 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Patch0: iptables-1.3.8-iptc.patch
 Patch1: iptables-1.3.8-headers.patch
+Patch2: iptables-1.3.8-reject_type.patch
+Patch3: iptables-1.3.8-limit_man.patch
+Patch4: iptables-1.3.8-typo_latter.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -56,6 +59,9 @@
 %setup -q
 %patch0 -p1 -b .iptc
 %patch1 -p1 -b .headers
+%patch2 -p1 -b .reject_type
+%patch3 -p1 -b .limit_man
+%patch4 -p1 -b .typo_latter
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{_prefix},g" {} \;
@@ -147,6 +153,13 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4
+- fixed IPv6 reject type (rhbz#295181)
+- fixed init script: start, stop and status
+- support netfilter compiled into kernel in init script (rhbz#295611)
+- dropped inversion for limit modules from man pages (rhbz#220780)
+- fixed typo in ip6tables man page (rhbz#236185)
+
 * Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-3
 - do not depend on local_fs in lsb header - this delayes start after network
 - fixed exit code for initscript usage



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:06 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:06 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG47Js011856@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:09 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:09 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG4AsD002955@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:04:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:04:11 -0700
Subject: [pkgdb] fail2ban: scop has given up watchbugzilla
Message-ID: <200709241604.l8OG4BrW011888@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fail2ban (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:06 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 12:05:06 -0400
Subject: rpms/gambas/devel gambas.spec,1.28,1.29
Message-ID: <200709241605.l8OG56gs021617@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21564

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
- BuildRequire sqlite-devel instead of sqlite2-devel.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gambas.spec	24 Sep 2007 15:15:03 -0000	1.28
+++ gambas.spec	24 Sep 2007 16:04:33 -0000	1.29
@@ -8,7 +8,7 @@
 Source0: 	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kdelibs-devel, automake, autoconf, SDL-devel, SDL_mixer-devel
-BuildRequires:	mysql-devel, postgresql-devel, sqlite2-devel, libX11-devel
+BuildRequires:	mysql-devel, postgresql-devel, sqlite-devel, libX11-devel
 BuildRequires:	desktop-file-utils, gettext-devel, curl-devel, libXext-devel
 BuildRequires:	qt-devel, bzip2-devel, libxslt-devel, libxml2-devel
 Requires(post): desktop-file-utils
@@ -424,6 +424,9 @@
 
 %changelog
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+- BuildRequire sqlite-devel instead of sqlite2-devel.
+
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
 - Rebuild for new sqlite.
 
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.19-1.2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:10 -0700
Subject: [pkgdb] fedora-package-config-smart: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5BDp003273@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on fedora-package-config-smart (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-package-config-smart



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:18 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:18 -0700
Subject: [pkgdb] freenx: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5JnO012288@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on freenx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:20 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:20 -0700
Subject: [pkgdb] freenx: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5LTq003352@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on freenx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/freenx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:29 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:29 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5TGd012361@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:31 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5Wv4003419@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:37 -0700
Subject: [pkgdb] gnustep-make: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5bG5012412@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on gnustep-make (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnustep-make



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:45 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5jml003506@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:46 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5l6H012485@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:49 -0700
Subject: [pkgdb] greylistd: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5oYY012503@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on greylistd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/greylistd



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:54 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5tvB003561@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:57 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:57 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241605.l8OG5vUL012547@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:05:59 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:05:59 -0700
Subject: [pkgdb] libcdaudio: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG60jT003594@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libcdaudio (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcdaudio



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:06 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:06 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6679012597@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:08 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:08 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG69sY003655@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:10 -0700
Subject: [pkgdb] libFoundation: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6ABW012634@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on libFoundation (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libFoundation



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:20 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 12:06:20 -0400
Subject: rpms/gambas/devel gambas.spec,1.29,1.30
Message-ID: <200709241606.l8OG6Kl9021776@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21726

Modified Files:
	gambas.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-3
- BuildRequire sqlite-devel instead of sqlite2-devel.



Index: gambas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gambas.spec	24 Sep 2007 16:04:33 -0000	1.29
+++ gambas.spec	24 Sep 2007 16:05:47 -0000	1.30
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.19
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -423,7 +423,7 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
-* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-3
 - BuildRequire sqlite-devel instead of sqlite2-devel.
 
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.0.19-2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:18 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:18 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6IHI012679@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:21 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:21 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6LLG003726@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:25 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:25 -0700
Subject: [pkgdb] mediawiki: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6P8N003756@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:31 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:31 -0700
Subject: [pkgdb] nx: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6WmT003795@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on nx (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:32 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:32 -0700
Subject: [pkgdb] nx: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6Xug012760@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on nx (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nx



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:40 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:40 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6fDH003851@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:42 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:42 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6gnU012818@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:45 -0700
Subject: [pkgdb] perl-Text-CharWidth: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6jCA003888@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-CharWidth (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-CharWidth



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:51 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:51 -0400
Subject: rpms/grhino/F-7 grhino.spec,1.10,1.11
Message-ID: <200709241606.l8OG6pJ2021922@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/F-7

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/F-7/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
+++ grhino.spec	24 Sep 2007 16:06:19 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:54 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:54 -0400
Subject: rpms/grhino/FC-6 grhino.spec,1.11,1.12
Message-ID: <200709241606.l8OG6s5Z021928@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/FC-6

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	25 Nov 2006 22:34:25 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:06:22 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:06:57 -0400
Subject: rpms/grhino/devel grhino.spec,1.10,1.11
Message-ID: <200709241606.l8OG6vpY021931@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/devel

Modified Files:
	grhino.spec 
Log Message:
License field updated to GPLv2+


Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
+++ grhino.spec	24 Sep 2007 16:06:24 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           grhino
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
+- License field updated
+
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0
 - Remove unneeded patches



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:49 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:49 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6nq2012867@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:54 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:54 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6s87012904@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:06:55 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:06:55 -0700
Subject: [pkgdb] perl-Text-WrapI18N: scop has given up watchbugzilla
Message-ID: <200709241606.l8OG6u9E003944@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on perl-Text-WrapI18N (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-WrapI18N



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:00 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG70hr003974@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:02 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:02 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG72EO012952@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:05 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:05 -0700
Subject: [pkgdb] po4a: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG75Yp012971@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on po4a (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:10 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Bp4013044@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:13 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:13 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7DQv004051@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:15 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:15 -0700
Subject: [pkgdb] synaptic: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Fi5013088@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on synaptic (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/synaptic



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:22 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:22 -0700
Subject: [pkgdb] vtk: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7MfT013130@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtk



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:23 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:23 -0700
Subject: [pkgdb] vtk: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7OCQ004096@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtk (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtk



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:28 -0700
Subject: [pkgdb] vtkdata: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7Twl013168@app3.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtkdata (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtkdata



From fedora-extras-commits at redhat.com  Mon Sep 24 16:07:30 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (ville.skytta))
Date: Mon, 24 Sep 2007 09:07:30 -0700
Subject: [pkgdb] vtkdata: scop has given up watchbugzilla
Message-ID: <200709241607.l8OG7U71004146@app4.fedora.phx.redhat.com>

Ville Skytta (scop) has given up the watchbugzilla acl on vtkdata (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vtkdata



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:50 -0700
Subject: [pkgdb] moreutils was added for deebs
Message-ID: <200709241609.l8OG9ofL013879@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package moreutils with summary Additional unix utilities
Kevin Fenzi (kevin) has approved Package moreutils
Kevin Fenzi (kevin) has added a Fedora devel branch for moreutils with an owner of deebs
Kevin Fenzi (kevin) has approved moreutils in Fedora devel
Kevin Fenzi (kevin) has approved Package moreutils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on moreutils (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on moreutils (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on moreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:56 -0700
Subject: [pkgdb] moreutils (Fedora, 7) updated by kevin
Message-ID: <200709241609.l8OG9uDJ013914@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for moreutils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on moreutils (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on moreutils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:09:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:09:56 -0700
Subject: [pkgdb] moreutils (Fedora, devel) updated by kevin
Message-ID: <200709241609.l8OG9vcP013924@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on moreutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moreutils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:04 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:04 -0700
Subject: [pkgdb] perl-Time-Duration was added for deebs
Message-ID: <200709241612.l8OGC5KS014667@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package perl-Time-Duration with summary rounded or exact English expression of durations
Kevin Fenzi (kevin) has approved Package perl-Time-Duration
Kevin Fenzi (kevin) has added a Fedora devel branch for perl-Time-Duration with an owner of deebs
Kevin Fenzi (kevin) has approved perl-Time-Duration in Fedora devel
Kevin Fenzi (kevin) has approved Package perl-Time-Duration
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Time-Duration (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Time-Duration (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Time-Duration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:10 -0700
Subject: [pkgdb] perl-Time-Duration (Fedora, 7) updated by kevin
Message-ID: <200709241612.l8OGCAfm014700@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for perl-Time-Duration
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Time-Duration (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Time-Duration (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:12:10 -0700
Subject: [pkgdb] perl-Time-Duration (Fedora, devel) updated by kevin
Message-ID: <200709241612.l8OGCBqw014710@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-Time-Duration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:33 -0400
Subject: rpms/perl-Time-Duration - New directory
Message-ID: <200709241612.l8OGCXPp022485@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration

Log Message:
Directory /cvs/extras/rpms/perl-Time-Duration added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:37 -0400
Subject: rpms/perl-Time-Duration/devel - New directory
Message-ID: <200709241612.l8OGCbxE022496@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration/devel

Log Message:
Directory /cvs/extras/rpms/perl-Time-Duration/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:41 -0400
Subject: rpms/perl-Time-Duration Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241612.l8OGCfbZ022524@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Time-Duration


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Time-Duration
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:12:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:12:43 -0400
Subject: rpms/perl-Time-Duration/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241612.l8OGChsO022540@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22456/rpms/perl-Time-Duration/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Time-Duration


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Time-Duration
# $Id: Makefile,v 1.1 2007/09/24 16:12:42 kevin Exp $
NAME := perl-Time-Duration
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:10:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:14 -0400
Subject: rpms/moreutils - New directory
Message-ID: <200709241610.l8OGAEmx022208@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils

Log Message:
Directory /cvs/extras/rpms/moreutils added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:10:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:20 -0400
Subject: rpms/moreutils/devel - New directory
Message-ID: <200709241610.l8OGAKDL022230@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils/devel

Log Message:
Directory /cvs/extras/rpms/moreutils/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:13:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:13:54 -0700
Subject: [pkgdb] phpTodo was added for deebs
Message-ID: <200709241613.l8OGDtQo015186@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package phpTodo with summary PHP todo list manager
Kevin Fenzi (kevin) has approved Package phpTodo
Kevin Fenzi (kevin) has added a Fedora devel branch for phpTodo with an owner of deebs
Kevin Fenzi (kevin) has approved phpTodo in Fedora devel
Kevin Fenzi (kevin) has approved Package phpTodo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on phpTodo (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on phpTodo (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on phpTodo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:14:03 -0700
Subject: [pkgdb] phpTodo (Fedora, devel) updated by kevin
Message-ID: <200709241614.l8OGE4E9006010@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on phpTodo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:14:03 -0700
Subject: [pkgdb] phpTodo (Fedora, 7) updated by kevin
Message-ID: <200709241614.l8OGE5MX006020@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for phpTodo
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on phpTodo (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on phpTodo (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/phpTodo



From fedora-extras-commits at redhat.com  Mon Sep 24 16:10:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:22 -0400
Subject: rpms/moreutils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241610.l8OGAMOv022256@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils

Added Files:
	Makefile import.log 
Log Message:
Setup of module moreutils


--- NEW FILE Makefile ---
# Top level Makefile for module moreutils
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:37 -0400
Subject: rpms/phpTodo - New directory
Message-ID: <200709241614.l8OGEbCd022689@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo

Log Message:
Directory /cvs/extras/rpms/phpTodo added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:42 -0400
Subject: rpms/phpTodo/devel - New directory
Message-ID: <200709241614.l8OGEgtl022703@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo/devel

Log Message:
Directory /cvs/extras/rpms/phpTodo/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:45 -0400
Subject: rpms/phpTodo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241614.l8OGEjkp022728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo

Added Files:
	Makefile import.log 
Log Message:
Setup of module phpTodo


--- NEW FILE Makefile ---
# Top level Makefile for module phpTodo
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:14:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:14:47 -0400
Subject: rpms/phpTodo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241614.l8OGElWd022744@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22659/rpms/phpTodo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module phpTodo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: phpTodo
# $Id: Makefile,v 1.1 2007/09/24 16:14:45 kevin Exp $
NAME := phpTodo
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:10:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:10:24 -0400
Subject: rpms/moreutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709241610.l8OGAOgl022273@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22174/rpms/moreutils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moreutils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moreutils
# $Id: Makefile,v 1.1 2007/09/24 16:10:22 kevin Exp $
NAME := moreutils
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:17:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:40 -0700
Subject: [pkgdb] opengl-games-utils was added for jwrdegoede
Message-ID: <200709241617.l8OGHeox016254@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package opengl-games-utils with summary Utilities to check proper 3d support before launching 3d games
Kevin Fenzi (kevin) has approved Package opengl-games-utils
Kevin Fenzi (kevin) has added a Fedora devel branch for opengl-games-utils with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved opengl-games-utils in Fedora devel
Kevin Fenzi (kevin) has approved Package opengl-games-utils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on opengl-games-utils (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on opengl-games-utils (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on opengl-games-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:17:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:48 -0700
Subject: [pkgdb] opengl-games-utils (Fedora, devel) updated by kevin
Message-ID: <200709241617.l8OGHnus007077@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on opengl-games-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:17:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:17:48 -0700
Subject: [pkgdb] opengl-games-utils (Fedora, 7) updated by kevin
Message-ID: <200709241617.l8OGHnj6007088@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for opengl-games-utils
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on opengl-games-utils (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on opengl-games-utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opengl-games-utils



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:19 -0400
Subject: rpms/opengl-games-utils - New directory
Message-ID: <200709241618.l8OGIJYU023006@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils

Log Message:
Directory /cvs/extras/rpms/opengl-games-utils added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:22 -0400
Subject: rpms/opengl-games-utils/devel - New directory
Message-ID: <200709241618.l8OGIMBV023023@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils/devel

Log Message:
Directory /cvs/extras/rpms/opengl-games-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:26 -0400
Subject: rpms/opengl-games-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241618.l8OGIQpG023049@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils

Added Files:
	Makefile import.log 
Log Message:
Setup of module opengl-games-utils


--- NEW FILE Makefile ---
# Top level Makefile for module opengl-games-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:27 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:27 -0400
Subject: rpms/quarry/F-7 quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIR8Q023055@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/F-7

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/F-7/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:17:55 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:30 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:30 -0400
Subject: rpms/quarry/FC-6 quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIUje023070@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/FC-6

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 21:24:04 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:17:58 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:18:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:18:30 -0400
Subject: rpms/opengl-games-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241618.l8OGIUxh023074@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO22976/rpms/opengl-games-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module opengl-games-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: opengl-games-utils
# $Id: Makefile,v 1.1 2007/09/24 16:18:28 kevin Exp $
NAME := opengl-games-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:18:33 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:18:33 -0400
Subject: rpms/quarry/devel quarry.spec,1.6,1.7
Message-ID: <200709241618.l8OGIXDk023155@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22877/devel

Modified Files:
	quarry.spec 
Log Message:
License field updated to GPLv2+



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
+++ quarry.spec	24 Sep 2007 16:18:00 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           quarry
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
+- License field update
+
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:32 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:32 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchbugzilla
Message-ID: <200709241619.l8OGJWUh016827@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:40 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:40 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchcommits
Message-ID: <200709241619.l8OGJeua007666@app4.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchcommits acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:45 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:45 -0700
Subject: [pkgdb] octave-forge: alexlan has requested commit
Message-ID: <200709241619.l8OGJjKN016909@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the commit acl on octave-forge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:57 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:57 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchbugzilla
Message-ID: <200709241619.l8OGJvac016973@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchbugzilla acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:58 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:58 -0700
Subject: [pkgdb] octave-forge: alexlan has requested watchcommits
Message-ID: <200709241619.l8OGJwef016989@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the watchcommits acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:19:59 2007
From: fedora-extras-commits at redhat.com (Alex Lancaster (alexl))
Date: Mon, 24 Sep 2007 09:19:59 -0700
Subject: [pkgdb] octave-forge: alexlan has requested commit
Message-ID: <200709241619.l8OGJxK6017004@app3.fedora.phx.redhat.com>

Alex Lancaster (alexlan) has requested the commit acl on octave-forge (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 16:20:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:20:53 -0700
Subject: [pkgdb] qfits was added for sergiopr
Message-ID: <200709241620.l8OGKrId017312@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qfits with summary A stand-alone general purpose FITS library
Kevin Fenzi (kevin) has approved Package qfits
Kevin Fenzi (kevin) has added a Fedora devel branch for qfits with an owner of sergiopr
Kevin Fenzi (kevin) has approved qfits in Fedora devel
Kevin Fenzi (kevin) has approved Package qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, 6) updated by kevin
Message-ID: <200709241621.l8OGL824008112@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, 7) updated by kevin
Message-ID: <200709241621.l8OGL8X4008122@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qfits
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qfits (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:21:08 -0700
Subject: [pkgdb] qfits (Fedora, devel) updated by kevin
Message-ID: <200709241621.l8OGL9MX008133@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on qfits (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qfits



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:21 -0400
Subject: rpms/qfits - New directory
Message-ID: <200709241621.l8OGLL4s023361@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits

Log Message:
Directory /cvs/extras/rpms/qfits added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:24 -0400
Subject: rpms/qfits/devel - New directory
Message-ID: <200709241621.l8OGLOth023375@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits/devel

Log Message:
Directory /cvs/extras/rpms/qfits/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:28 -0400
Subject: rpms/qfits Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241621.l8OGLSYu023400@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits

Added Files:
	Makefile import.log 
Log Message:
Setup of module qfits


--- NEW FILE Makefile ---
# Top level Makefile for module qfits
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:21:31 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:21:31 -0400
Subject: rpms/qfits/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709241621.l8OGLVYB023416@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23327/rpms/qfits/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qfits


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qfits
# $Id: Makefile,v 1.1 2007/09/24 16:21:29 kevin Exp $
NAME := qfits
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:22:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 12:22:08 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.34,
	1.35 policycoreutils-po.patch, 1.24, 1.25 policycoreutils.spec,
	1.450, 1.451
Message-ID: <200709241622.l8OGM8Nw023648@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23590

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
- Fixed spelling mistakes in booleans defs
- Update po


policycoreutils-gui.patch:


policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policycoreutils-po.patch	4 Jun 2007 14:58:22 -0000	1.24
+++ policycoreutils-po.patch	24 Sep 2007 16:22:03 -0000	1.25
@@ -1,3666 +1,306717 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.19/po/bg.po
---- nsapolicycoreutils/po/bg.po	2007-01-19 08:50:13.000000000 -0500
-+++ policycoreutils-2.0.19/po/bg.po	2007-06-04 10:50:48.000000000 -0400
-@@ -1,303 +1,303 @@
--# SOME DESCRIPTIVE TITLE.
-+# translation of policycoreutils.pot to Bulgarian
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
- #
--#, fuzzy
-+# Doncho N. Gunchev <gunchev at gmail.com>, 2007.
- msgid ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.26/po/af.po
+--- nsapolicycoreutils/po/af.po	2007-07-16 14:20:42.000000000 -0400
++++ policycoreutils-2.0.26/po/af.po	2007-09-24 12:16:45.000000000 -0400
+@@ -8,7 +8,7 @@
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: policycoreutils\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-11-21 14:21-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
--"Language-Team: LANGUAGE <LL at li.org>\n"
-+"PO-Revision-Date: 2007-03-31 17:41+0300\n"
-+"Last-Translator: Doncho N. Gunchev <gunchev at gmail.com>\n"
-+"Language-Team: Bulgarian <Bulgarian Translators' Team <dict at fsa-bg.org>>\n"
- "MIME-Version: 1.0\n"
+-"POT-Creation-Date: 2006-11-21 14:21-0500\n"
++"POT-Creation-Date: 2007-09-14 10:36-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -16,1013 +16,3357 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.11.4\n"
  
- #: ../load_policy/load_policy.c:22
- #, c-format
- msgid "usage:  %s [-bq]\n"
--msgstr ""
-+msgstr "????????????????:  %s [-bq]\n"
+-#: ../load_policy/load_policy.c:22
+-#, c-format
+-msgid "usage:  %s [-bq]\n"
++#: ../run_init/run_init.c:67
++msgid ""
++"USAGE: run_init <script> <args ...>\n"
++"  where: <script> is the name of the init script to run,\n"
++"         <args ...> are the arguments to that script."
+ msgstr ""
  
- #: ../load_policy/load_policy.c:66
+-#: ../load_policy/load_policy.c:66
++#: ../run_init/run_init.c:126 ../newrole/newrole.c:1170
  #, c-format
- msgid "%s:  Can't load policy:  %s\n"
--msgstr ""
-+msgstr "%s:  ???? ???????? ???? ???? ???????????? ????????????????:  %s\n"
+-msgid "%s:  Can't load policy:  %s\n"
++msgid "failed to initialize PAM\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:188
+-#: ../newrole/newrole.c:188
++#: ../run_init/run_init.c:139
  #, c-format
- msgid "failed to set PAM_TTY\n"
--msgstr ""
-+msgstr "?????????????????? ?????????????????? ???? PAM_TTY\n"
+-msgid "failed to set PAM_TTY\n"
++msgid "failed to get account information\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:218 ../run_init/run_init.c:162
+-#: ../newrole/newrole.c:218 ../run_init/run_init.c:162
++#: ../run_init/run_init.c:162 ../newrole/newrole.c:334
  msgid "Password:"
--msgstr ""
-+msgstr "????????????:"
+ msgstr ""
  
- #: ../newrole/newrole.c:243 ../run_init/run_init.c:197
+-#: ../newrole/newrole.c:243 ../run_init/run_init.c:197
++#: ../run_init/run_init.c:197 ../newrole/newrole.c:359
  #, c-format
  msgid "Cannot find your entry in the shadow passwd file.\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???? ???????????? ?????????? ?????????? ?????? ?????????? shadow.\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:250 ../run_init/run_init.c:203
+-#: ../newrole/newrole.c:250 ../run_init/run_init.c:203
++#: ../run_init/run_init.c:203 ../newrole/newrole.c:366
  #, c-format
  msgid "getpass cannot open /dev/tty\n"
--msgstr ""
-+msgstr "getpass ???? ???????? ???? ???? ???????????? /dev/tty\n"
- 
- #: ../newrole/newrole.c:316
- #, c-format
- msgid "cannot find valid entry in the passwd file.\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???? ???????????? ?????????????? ?????????? ?????? ?????????? passwd.\n"
- 
- #: ../newrole/newrole.c:327
- #, c-format
- msgid "Out of memory!\n"
--msgstr ""
-+msgstr "?????????????? ????????????!\n"
- 
- #: ../newrole/newrole.c:332
- #, c-format
- msgid "Error!  Shell is not valid.\n"
--msgstr ""
-+msgstr "????????????!  ?????????????????? ???? ?? ??????????????.\n"
- 
- #: ../newrole/newrole.c:389
- #, c-format
- msgid "Unable to clear environment\n"
--msgstr ""
-+msgstr "???? ???????? ???? ???????? ?????????????????? ??????????????\n"
- 
- #: ../newrole/newrole.c:436 ../newrole/newrole.c:513
- #, c-format
- msgid "Error initing capabilities, aborting.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????????????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:444 ../newrole/newrole.c:519
- #, c-format
- msgid "Error setting capabilities, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:450
- #, c-format
- msgid "Error setting KEEPCAPS, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:458 ../newrole/newrole.c:531
- #, c-format
- msgid "Error dropping capabilities, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? ??????????????, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:464 ../newrole/newrole.c:562
- #, c-format
- msgid "Error changing uid, aborting.\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? uid, ?????????????? ??????????.\n"
- 
- #: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557
- #, c-format
- msgid "Error resetting KEEPCAPS, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:477
- #, c-format
- msgid "Error dropping SETUID capability, aborting\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????? ???? SETUID ??????????, ?????????????? ??????????\n"
- 
- #: ../newrole/newrole.c:482 ../newrole/newrole.c:536
- #, c-format
- msgid "Error freeing caps\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????????????? ???? ??????????\n"
- 
- #: ../newrole/newrole.c:580
- #, c-format
- msgid "Error connecting to audit system.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????? ?????? ?????????????????? ???? ????????.\n"
- 
- #: ../newrole/newrole.c:586
- #, c-format
- msgid "Error allocating memory.\n"
--msgstr ""
-+msgstr "???????????? ?????? ???????????????? ???? ??????????.\n"
- 
- #: ../newrole/newrole.c:593
- #, c-format
- msgid "Error sending audit message.\n"
--msgstr ""
-+msgstr "???????????? ?????? ?????????????????? ???? ???????? ??????????????????.\n"
[...310567 lines suppressed...]
-@@ -951,7 +1021,8 @@
- msgid "File context for %s is defined in policy, cannot be deleted"
- msgstr "Kontext s??boru pre %s je definovan?? v pravidl??ch, nem????e by?? zmazan??"
+-#, python-format
+-msgid "Could not modify file context for %s"
++#: ../gui/system-config-selinux.glade:2776
++msgid "Add Network Port"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1142
+-#, python-format
+-msgid "File context for %s is defined in policy, cannot be deleted"
++#: ../gui/system-config-selinux.glade:2792
++msgid "Edit Network Port"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156
-+#: ../semanage/seobject.py:1152
-+#: ../semanage/seobject.py:1156
- #, python-format
- msgid "Could not delete file context for %s"
- msgstr "Nemo??no zmaza?? kontext s??boru pre %s"
-@@ -961,21 +1032,22 @@
- msgstr "Nemo??no listova?? kontextami s??boru"
+-#, python-format
+-msgid "Could not delete file context for %s"
++#: ../gui/system-config-selinux.glade:2808
++msgid "Delete Network Port"
+ msgstr ""
  
- #: ../semanage/seobject.py:1168
--#, fuzzy
- msgid "Could not list local file contexts"
--msgstr "Nemo??no listova?? kontextami s??boru"
-+msgstr "Nemo??no listova?? kontextami lok??lnych s??borov"
+-#: ../semanage/seobject.py:1164
+-msgid "Could not list file contexts"
++#: ../gui/system-config-selinux.glade:2851
++msgid "Group/ungroup network ports by SELinux type."
+ msgstr ""
  
- #: ../semanage/seobject.py:1203
- msgid "Requires value"
- msgstr "Po??aduje hodnotu"
+-#: ../semanage/seobject.py:1168
+-msgid "Could not list local file contexts"
++#: ../gui/system-config-selinux.glade:2897
++msgid "Group View"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1203
+-msgid "Requires value"
++#: ../gui/system-config-selinux.glade:3035
++msgid "label42"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245
-+#: ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1245
- #: ../semanage/seobject.py:1251
- #, python-format
- msgid "Could not check if boolean %s is defined"
- msgstr "Nemo??no skontrolova?? ??i logick?? hodnota %s je definovan??"
+-#: ../semanage/seobject.py:1251
+-#, python-format
+-msgid "Could not check if boolean %s is defined"
++#: ../gui/system-config-selinux.glade:3072
++msgid "Generate new policy module"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247
-+#: ../semanage/seobject.py:1213
-+#: ../semanage/seobject.py:1247
- #, python-format
- msgid "Boolean %s is not defined"
- msgstr "Logick?? hodnota %s nie je definovan??"
-@@ -985,7 +1057,8 @@
- msgid "Could not query file context %s"
- msgstr "Nemo??no overi?? kontext s??boru %s"
+-#, python-format
+-msgid "Boolean %s is not defined"
++#: ../gui/system-config-selinux.glade:3088
++msgid "Load policy module"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1217
+-#, python-format
+-msgid "Could not query file context %s"
++#: ../gui/system-config-selinux.glade:3104
++msgid "Remove loadable policy module"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233
-+#: ../semanage/seobject.py:1229
-+#: ../semanage/seobject.py:1233
- #, python-format
- msgid "Could not modify boolean %s"
- msgstr "Nemo??no zmeni?? logick?? hodnotu %s"
-@@ -995,7 +1068,8 @@
- msgid "Boolean %s is defined in policy, cannot be deleted"
- msgstr "Logick?? hodnota %s je definovan?? v pravidl??ch, nemo??no ju zmaza??"
+-#, python-format
+-msgid "Could not modify boolean %s"
++#: ../gui/system-config-selinux.glade:3140
++msgid ""
++"Enable additional audit rules, that are normally not reported in the log "
++"files."
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1253
+-#, python-format
+-msgid "Boolean %s is defined in policy, cannot be deleted"
++#: ../gui/system-config-selinux.glade:3141
++msgid "Enable Audit"
+ msgstr ""
  
 -#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265
-+#: ../semanage/seobject.py:1261
-+#: ../semanage/seobject.py:1265
- #, python-format
- msgid "Could not delete boolean %s"
- msgstr "Nemo??no zmaza?? logick?? hodnotu %s"
-@@ -1009,7 +1083,8 @@
- msgid "Generating type enforcment file: %s.te"
- msgstr "Vytv??ranie s??boru vyn??tenia typov: %s.te"
+-#, python-format
+-msgid "Could not delete boolean %s"
++#: ../gui/system-config-selinux.glade:3158
++msgid ""
++"Disable additional audit rules, that are normally not reported in the log "
++"files."
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:1273
+-msgid "Could not list booleans"
++#: ../gui/system-config-selinux.glade:3159
++msgid "Disable Audit"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:183
+-#, c-format
+-msgid "Generating type enforcment file: %s.te"
++#: ../gui/system-config-selinux.glade:3277
++msgid "label44"
+ msgstr ""
  
 -#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
-+#: ../audit2allow/audit2allow:189
-+#: ../audit2allow/audit2allow:194
- msgid "Compiling policy"
- msgstr "Zostavujem pravidl??"
+-msgid "Compiling policy"
++#: ../gui/translationsPage.py:53
++msgid "Sensitvity Level"
+ msgstr ""
  
-@@ -1040,3 +1115,4 @@
- #, c-format
- msgid "Options Error: %s "
- msgstr "Chyba volieb: %s"
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.19/po/sv.po
---- nsapolicycoreutils/po/sv.po	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.19/po/sv.po	2007-06-04 10:50:48.000000000 -0400
-@@ -2,7 +2,7 @@
- # Copyright (C) Christian Rose <menthos at menthos.com>, 2006.
- # Copyright (C) Magnus Larsson <fedoratrans at gmail.com>, 2007.
- #
--# $Id$
-+# $Id$
- #
+-#: ../audit2allow/audit2allow:205
++#: ../gui/usersPage.py:55
+ msgid ""
+-"\n"
+-"******************** IMPORTANT ***********************\n"
++"Labeling\n"
++"Prefix"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:206
+-#, c-format
++#: ../gui/usersPage.py:58
  msgid ""
+-"In order to load this newly created policy package into the kernel,\n"
+-"you are required to execute \n"
+-"\n"
+-"semodule -i %s.pp\n"
+-"\n"
++"MLS/\n"
++"MCS Level"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:211
+-#, c-format
+-msgid "Options Error: %s "
++#: ../gui/usersPage.py:162
++#, python-format
++msgid "SELinux user '%s' is required"
  msgstr ""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- policycoreutils.spec	19 Sep 2007 02:29:47 -0000	1.450
+++ policycoreutils.spec	24 Sep 2007 16:22:04 -0000	1.451
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,10 @@
 fi
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
+- Fixed spelling mistakes in booleans defs
+- Update po
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-1
 - Update to upstream
   * Fix setfiles selabel option flag setting for 64-bit from Stephen Smalley.



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw summary updated by kevin
Message-ID: <200709241623.l8OGN6Ii017941@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package straw summary to Desktop news aggregator

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw (Fedora, 7) updated by kevin
Message-ID: <200709241623.l8OGN6vt017951@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for straw
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on straw (Fedora 7)
Kevin Fenzi (kevin) changed owner of straw in Fedora 7 to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on straw (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:23:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:23:06 -0700
Subject: [pkgdb] straw (Fedora, devel) updated by kevin
Message-ID: <200709241623.l8OGN7bt017961@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of straw in Fedora devel to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on straw (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/straw



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:40 -0700
Subject: [pkgdb] qpxtool was added for drago01
Message-ID: <200709241626.l8OGQexE018985@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qpxtool with summary CD/DVD Quality check tool
Kevin Fenzi (kevin) has approved Package qpxtool
Kevin Fenzi (kevin) has added a Fedora devel branch for qpxtool with an owner of drago01
Kevin Fenzi (kevin) has approved qpxtool in Fedora devel
Kevin Fenzi (kevin) has approved Package qpxtool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qpxtool (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qpxtool (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qpxtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:47 -0700
Subject: [pkgdb] qpxtool (Fedora, 7) updated by kevin
Message-ID: <200709241626.l8OGQlFn019040@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qpxtool
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qpxtool (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qpxtool (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:26:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:26:47 -0700
Subject: [pkgdb] qpxtool (Fedora, devel) updated by kevin
Message-ID: <200709241626.l8OGQmaD019050@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qpxtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qpxtool



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:32 -0400
Subject: rpms/grhino/F-7 grhino.spec,1.11,1.12
Message-ID: <200709241628.l8OGSWe7026335@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/F-7

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/F-7/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	24 Sep 2007 16:06:19 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:27:56 -0000	1.12
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:34 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:34 -0400
Subject: rpms/grhino/FC-6 grhino.spec,1.12,1.13
Message-ID: <200709241628.l8OGSYWr026338@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/FC-6

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- grhino.spec	24 Sep 2007 16:06:22 -0000	1.12
+++ grhino.spec	24 Sep 2007 16:28:02 -0000	1.13
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:41 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 12:28:41 -0400
Subject: rpms/grhino/devel grhino.spec,1.11,1.12
Message-ID: <200709241628.l8OGSfkS026363@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26276/devel

Modified Files:
	grhino.spec 
Log Message:
Fix invalid version key in upstream desktop file



Index: grhino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grhino.spec	24 Sep 2007 16:06:24 -0000	1.11
+++ grhino.spec	24 Sep 2007 16:28:05 -0000	1.12
@@ -48,7 +48,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
+	--remove-key=Version\
 	desktop/%{name}.desktop
 
 # Icon
@@ -81,6 +81,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.16.0-2
 - License field updated
+- Remove invalid Version key from upstream desktop file
 
 * Sat Nov 25 2006 Michel Salim <michel.salim at gmail.com> - 0.16.0-1
 - Update to 0.16.0



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:46 -0400
Subject: rpms/qpxtool - New directory
Message-ID: <200709241628.l8OGSkmt026385@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool

Log Message:
Directory /cvs/extras/rpms/qpxtool added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:49 -0400
Subject: rpms/qpxtool/devel - New directory
Message-ID: <200709241628.l8OGSnfC026399@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool/devel

Log Message:
Directory /cvs/extras/rpms/qpxtool/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:52 -0400
Subject: rpms/qpxtool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241628.l8OGSqsK026424@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool

Added Files:
	Makefile import.log 
Log Message:
Setup of module qpxtool


--- NEW FILE Makefile ---
# Top level Makefile for module qpxtool
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:28:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:28:55 -0400
Subject: rpms/qpxtool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241628.l8OGStfi026440@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn26347/rpms/qpxtool/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qpxtool


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qpxtool
# $Id: Makefile,v 1.1 2007/09/24 16:28:53 kevin Exp $
NAME := qpxtool
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:32:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:42 -0700
Subject: [pkgdb] fmtools was added for kwizart
Message-ID: <200709241632.l8OGWhbt011628@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package fmtools with summary Simple Video for Linux radio card programs
Kevin Fenzi (kevin) has approved Package fmtools
Kevin Fenzi (kevin) has added a Fedora devel branch for fmtools with an owner of kwizart
Kevin Fenzi (kevin) has approved fmtools in Fedora devel
Kevin Fenzi (kevin) has approved Package fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, 7) updated by kevin
Message-ID: <200709241632.l8OGWuwh020894@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, 6) updated by kevin
Message-ID: <200709241632.l8OGWudO020904@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora EPEL, 5) updated by kevin
Message-ID: <200709241632.l8OGWujM020915@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora, devel) updated by kevin
Message-ID: <200709241632.l8OGWuMm020923@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:32:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:32:56 -0700
Subject: [pkgdb] fmtools (Fedora EPEL, 4) updated by kevin
Message-ID: <200709241632.l8OGWvPf020932@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for fmtools
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fmtools (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on fmtools (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fmtools



From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:35 -0400
Subject: rpms/fmtools - New directory
Message-ID: <200709241633.l8OGXZH3027832@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools

Log Message:
Directory /cvs/extras/rpms/fmtools added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:38 -0400
Subject: rpms/fmtools/devel - New directory
Message-ID: <200709241633.l8OGXcdC027915@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools/devel

Log Message:
Directory /cvs/extras/rpms/fmtools/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:40 -0400
Subject: rpms/fmtools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241633.l8OGXenn028013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools

Added Files:
	Makefile import.log 
Log Message:
Setup of module fmtools


--- NEW FILE Makefile ---
# Top level Makefile for module fmtools
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:33:43 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:33:43 -0400
Subject: rpms/fmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241633.l8OGXh1u028107@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27444/rpms/fmtools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fmtools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fmtools
# $Id: Makefile,v 1.1 2007/09/24 16:33:40 kevin Exp $
NAME := fmtools
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:35:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:37 -0700
Subject: [pkgdb] ladspa-fil-plugins was added for jwrdegoede
Message-ID: <200709241635.l8OGZc8O021758@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-fil-plugins with summary LADSPA Filter plugins
Kevin Fenzi (kevin) has approved Package ladspa-fil-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-fil-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-fil-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-fil-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-fil-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:35:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:51 -0700
Subject: [pkgdb] ladspa-fil-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241635.l8OGZqjk012537@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-fil-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-fil-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:35:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:35:51 -0700
Subject: [pkgdb] ladspa-fil-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241635.l8OGZqU6012552@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-fil-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-fil-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-fil-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-fil-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-fil-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:10 -0400
Subject: rpms/ladspa-fil-plugins - New directory
Message-ID: <200709241636.l8OGaA7O029276@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-fil-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:15 -0400
Subject: rpms/ladspa-fil-plugins/devel - New directory
Message-ID: <200709241636.l8OGaFEo029291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-fil-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:18 -0400
Subject: rpms/ladspa-fil-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241636.l8OGaI0V029321@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-fil-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-fil-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:36:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:36:21 -0400
Subject: rpms/ladspa-fil-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241636.l8OGaLAP029338@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29247/rpms/ladspa-fil-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-fil-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-fil-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:36:19 kevin Exp $
NAME := ladspa-fil-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:37:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:27 -0700
Subject: [pkgdb] ladspa-mcp-plugins was added for jwrdegoede
Message-ID: <200709241637.l8OGbRpg022293@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-mcp-plugins with summary A set of audio plugins for LADSPA
Kevin Fenzi (kevin) has approved Package ladspa-mcp-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-mcp-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-mcp-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-mcp-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-mcp-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:35 -0700
Subject: [pkgdb] ladspa-mcp-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241637.l8OGbZwM022338@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-mcp-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-mcp-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-mcp-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-mcp-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:37:35 -0700
Subject: [pkgdb] ladspa-mcp-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241637.l8OGbZ3c022352@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-mcp-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-mcp-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-mcp-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:51 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:51 -0400
Subject: rpms/ladspa-mcp-plugins - New directory
Message-ID: <200709241637.l8OGbpwW030253@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-mcp-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:57 -0400
Subject: rpms/ladspa-mcp-plugins/devel - New directory
Message-ID: <200709241637.l8OGbvvF030444@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-mcp-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:37:59 -0400
Subject: rpms/ladspa-mcp-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241637.l8OGbxuC030538@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-mcp-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-mcp-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:38:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:38:03 -0400
Subject: rpms/ladspa-mcp-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241638.l8OGc3K7030652@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29952/rpms/ladspa-mcp-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-mcp-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-mcp-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:38:00 kevin Exp $
NAME := ladspa-mcp-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:39:10 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Mon, 24 Sep 2007 12:39:10 -0400
Subject: rpms/qpxtool/devel consolehelper.patch, NONE, 1.1 libatafix.patch, 
	NONE, 1.1 manpagefix.patch, NONE,
	1.1 qpxtool-0.6.1-buildfix.patch, NONE, 1.1 qpxtool.desktop,
	NONE, 1.1 qpxtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709241639.l8OGdADr031934@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	consolehelper.patch libatafix.patch manpagefix.patch 
	qpxtool-0.6.1-buildfix.patch qpxtool.desktop qpxtool.spec 
Log Message:

Initial Import-


consolehelper.patch:

--- NEW FILE consolehelper.patch ---
diff -upNr qpxtool-0.6.1.orign/console/pioquiet/Makefile qpxtool-0.6.1/console/pioquiet/Makefile
--- qpxtool-0.6.1.orign/console/pioquiet/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pioquiet/Makefile	2007-09-08 12:49:42.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxcontrol/Makefile qpxtool-0.6.1/console/pxcontrol/Makefile
--- qpxtool-0.6.1.orign/console/pxcontrol/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxcontrol/Makefile	2007-09-08 12:50:00.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxfw/Makefile qpxtool-0.6.1/console/pxfw/Makefile
--- qpxtool-0.6.1.orign/console/pxfw/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxfw/Makefile	2007-09-08 12:50:15.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool qpxtool-0.6.1/consolehelper/console.app/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/console.app/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+USER=root
+PROGRAM=/usr/sbin/qpxtool
+SESSION=true
+
diff -upNr qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool qpxtool-0.6.1/consolehelper/pam.d/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/pam.d/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff -upNr qpxtool-0.6.1.orign/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile
--- qpxtool-0.6.1.orign/qpxtool-gui/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/qpxtool-gui/Makefile	2007-09-08 12:53:00.000000000 +0200
@@ -18,7 +18,7 @@ qproject:
 	LIBPATH+="../lib/lib"
 
 install: Makefile.qmake
-	install -m 4755 qpxtool $(DESTDIR)$(BINDIR)
+	install -m 755 qpxtool $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/qpxtool

libatafix.patch:

--- NEW FILE libatafix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/include/qpx_mmc.h qpxtool-0.6.1/lib/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

manpagefix.patch:

--- NEW FILE manpagefix.patch ---
diff -upNr qpxtool-0.6.1.orign/man/Makefile qpxtool-0.6.1/man/Makefile
--- qpxtool-0.6.1.orign/man/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/man/Makefile	2007-09-09 09:10:36.000000000 +0200
@@ -7,7 +7,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(MAN8DIR)
-	for m in $(MANS8); do install -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
+	for m in $(MANS8); do install -p -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
 
 uninstall:
 	for m in $(MANS8); do rm -f $(DESTDIR)$(LIBDIR)/$$m ; done

qpxtool-0.6.1-buildfix.patch:

--- NEW FILE qpxtool-0.6.1-buildfix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp
--- qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp	2007-09-22 10:46:23.000000000 +0200
@@ -23,6 +23,7 @@ int sense2str(int err, char* str);
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/time.h>
+#include <limits.h>
 
 #include "qpx_transport.h"
 


--- NEW FILE qpxtool.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=QPxTool
GenericName=CD/DVD Quality Tool
Comment=Check CD/DVD Media Quality
Exec=qpxtool
Icon=qpxtool
Terminal=false
Type=Application
Categories=System;


--- NEW FILE qpxtool.spec ---
Name: qpxtool
Version: 0.6.1        
Release: 5%{?dist}
Summary: CD/DVD Quality check tool

Group: Applications/System         
License: GPLv2+       
URL: http://qpxtool.sourceforge.net           
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2  
Source1: %{name}.desktop
Patch0: libatafix.patch
Patch1: consolehelper.patch
Patch2: manpagefix.patch
Patch3: qpxtool-0.6.1-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel
BuildRequires: desktop-file-utils
BuildRequires: sed
Requires: usermode >= 1.36       

%description
QPxTool is the linux way to get full control over your CD/DVD drives.
It is the Open Source Solution which intends to give you access to all
available Quality Checks (Q-Checks) on written and blank media, that
are available for your drive. This will help you to find the right media
and the optimized writing speed for your hardware, which will increase
the chance for a long data lifetime.

%package devel
Summary: Qpxtool headers and Libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headerfiles and libraries for developing apps using the
qpx* libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .consolehelper
%patch2 -p1 -b .manpagefix
%patch3 -p1 -b .buildfix

sed -ie 's!/usr/local!%{_prefix}!g' Makefile 
sed -ie 's!\$(PREFIX)/bin!%{_sbindir}!g' Makefile
sed -ie 's!\$(PREFIX)/lib!%{_libdir}!g' Makefile
sed -ie 's!\$(PREFIX)/man!%{_mandir}!g' Makefile
sed -ie 's!\$(PREFIX)/include!%{_includedir}!g' Makefile

%build
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}

cp -p consolehelper/console.app/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
cp -p consolehelper/pam.d/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qpxtool
cp -p qpxtool-gui/img/q.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/qpxtool.xpm

desktop-file-install --vendor="fedora"               \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/qpxtool
%{_sbindir}/qpxtool
%{_sbindir}/deadreader
%{_sbindir}/pioquiet
%{_sbindir}/pxcontrol
%{_sbindir}/pxfw
%{_libdir}/libqpxpioneer.so.0
%{_libdir}/libqpxpioneer.so.0.6.0
%{_libdir}/libqpxplextor.so.0
%{_libdir}/libqpxplextor.so.0.6.1
%{_libdir}/libqpxscan.so.0
%{_libdir}/libqpxscan.so.0.6.1
%{_libdir}/libqpxtransport.so.0
%{_libdir}/libqpxtransport.so.0.6.3
%{_mandir}/man8/pxcontrol.8.*
%{_mandir}/man8/pxfw.8.*
%{_datadir}/pixmaps/qpxtool.xpm
%{_datadir}/applications/fedora-qpxtool.desktop
%config(noreplace) %{_sysconfdir}/pam.d/qpxtool
%config(noreplace) %{_sysconfdir}/security/console.apps/qpxtool
%doc COPYING AUTHORS README ChangeLog

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libqpxpioneer.so
%{_libdir}/libqpxplextor.so
%{_libdir}/libqpxscan.so
%{_libdir}/libqpxtransport.so

%changelog
* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-5
- Fix desktop file category

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-4
- Clean up desktop file
- Fix Source0 URL

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-3
- Fix build failure

* Sun Sep 09 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-2
- Spec file cleanups
- Preserve manpage timestamps

* Sat Sep 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-1
- Inital build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:28:53 -0000	1.1
+++ .cvsignore	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+qpxtool-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:28:53 -0000	1.1
+++ sources	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+4fa7ce8aa9c13aa2db0a8b5224acb906  qpxtool-0.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:08 -0700
Subject: [pkgdb] ladspa-rev-plugins was added for jwrdegoede
Message-ID: <200709241639.l8OGd9w9013465@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-rev-plugins with summary A reverberation plugin for LADSPA
Kevin Fenzi (kevin) has approved Package ladspa-rev-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-rev-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-rev-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-rev-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-rev-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:14 -0700
Subject: [pkgdb] ladspa-rev-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241639.l8OGdE3g022827@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-rev-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-rev-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-rev-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-rev-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:39:14 -0700
Subject: [pkgdb] ladspa-rev-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241639.l8OGdF1p022844@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-rev-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-rev-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-rev-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:30 -0400
Subject: rpms/ladspa-rev-plugins - New directory
Message-ID: <200709241639.l8OGdUuR032008@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-rev-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:34 -0400
Subject: rpms/ladspa-rev-plugins/devel - New directory
Message-ID: <200709241639.l8OGdYvv032061@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-rev-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:37 -0400
Subject: rpms/ladspa-rev-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241639.l8OGdb4A032101@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-rev-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-rev-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:39:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:39:40 -0400
Subject: rpms/ladspa-rev-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241639.l8OGdejt032126@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF31972/rpms/ladspa-rev-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-rev-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-rev-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:39:37 kevin Exp $
NAME := ladspa-rev-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:40:38 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:38 -0700
Subject: [pkgdb] ladspa-vco-plugins was added for jwrdegoede
Message-ID: <200709241640.l8OGecZ4023260@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package ladspa-vco-plugins with summary Anti-aliased pulse and sawtooth oscillators
Kevin Fenzi (kevin) has approved Package ladspa-vco-plugins
Kevin Fenzi (kevin) has added a Fedora devel branch for ladspa-vco-plugins with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved ladspa-vco-plugins in Fedora devel
Kevin Fenzi (kevin) has approved Package ladspa-vco-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-vco-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:49 -0700
Subject: [pkgdb] ladspa-vco-plugins (Fedora, devel) updated by kevin
Message-ID: <200709241640.l8OGeo5c013962@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved commit on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved build on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-vco-plugins (Fedora devel) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-vco-plugins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:40:49 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:40:49 -0700
Subject: [pkgdb] ladspa-vco-plugins (Fedora, 7) updated by kevin
Message-ID: <200709241640.l8OGepWF013978@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for ladspa-vco-plugins
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ladspa-vco-plugins (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved watchcommits on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved commit on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved build on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved approveacls on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) approved checkout on ladspa-vco-plugins (Fedora 7) for nando
Kevin Fenzi (kevin) Approved cvsextras for commit access on ladspa-vco-plugins (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ladspa-vco-plugins



From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:10 -0400
Subject: rpms/ladspa-vco-plugins - New directory
Message-ID: <200709241641.l8OGfAPR001510@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins

Log Message:
Directory /cvs/extras/rpms/ladspa-vco-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:13 -0400
Subject: rpms/ladspa-vco-plugins/devel - New directory
Message-ID: <200709241641.l8OGfDep001614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins/devel

Log Message:
Directory /cvs/extras/rpms/ladspa-vco-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:16 -0400
Subject: rpms/ladspa-vco-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241641.l8OGfGiD001728@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins

Added Files:
	Makefile import.log 
Log Message:
Setup of module ladspa-vco-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module ladspa-vco-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:41:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:41:18 -0400
Subject: rpms/ladspa-vco-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709241641.l8OGfINd001825@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshc1187/rpms/ladspa-vco-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ladspa-vco-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ladspa-vco-plugins
# $Id: Makefile,v 1.1 2007/09/24 16:41:16 kevin Exp $
NAME := ladspa-vco-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 fedora-extras-commits at redhat.com  Mon Sep 24 16:42:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:26 -0700
Subject: [pkgdb] odt2txt was added for salimma
Message-ID: <200709241642.l8OGgQO0023818@app3.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package odt2txt with summary Converts an OpenDocument to plain text
Kevin Fenzi (kevin) has approved Package odt2txt
Kevin Fenzi (kevin) has added a Fedora devel branch for odt2txt with an owner of salimma
Kevin Fenzi (kevin) has approved odt2txt in Fedora devel
Kevin Fenzi (kevin) has approved Package odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:40 -0700
Subject: [pkgdb] odt2txt (Fedora EPEL, 4) updated by kevin
Message-ID: <200709241642.l8OGgfBp014480@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:40 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:40 -0700
Subject: [pkgdb] odt2txt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709241642.l8OGgfMu014491@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:42:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 09:42:41 -0700
Subject: [pkgdb] odt2txt (Fedora, 7) updated by kevin
Message-ID: <200709241642.l8OGggjA014506@app4.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for odt2txt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on odt2txt (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on odt2txt (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on odt2txt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/odt2txt



From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:19 -0400
Subject: rpms/odt2txt - New directory
Message-ID: <200709241643.l8OGhJka004503@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt

Log Message:
Directory /cvs/extras/rpms/odt2txt added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:23 -0400
Subject: rpms/odt2txt/devel - New directory
Message-ID: <200709241643.l8OGhN4M004519@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt/devel

Log Message:
Directory /cvs/extras/rpms/odt2txt/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:27 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:27 -0400
Subject: rpms/odt2txt Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709241643.l8OGhRAW004545@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt

Added Files:
	Makefile import.log 
Log Message:
Setup of module odt2txt


--- NEW FILE Makefile ---
# Top level Makefile for module odt2txt
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 16:43:29 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Mon, 24 Sep 2007 12:43:29 -0400
Subject: rpms/odt2txt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709241643.l8OGhTph004561@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNT4354/rpms/odt2txt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module odt2txt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: odt2txt
# $Id: Makefile,v 1.1 2007/09/24 16:43:27 kevin Exp $
NAME := odt2txt
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 fedora-extras-commits at redhat.com  Mon Sep 24 16:44:14 2007
From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01))
Date: Mon, 24 Sep 2007 12:44:14 -0400
Subject: rpms/qpxtool/F-7 consolehelper.patch, NONE, 1.1 libatafix.patch,
	NONE, 1.1 manpagefix.patch, NONE, 1.1 qpxtool-0.6.1-buildfix.patch,
	NONE, 1.1 qpxtool.desktop, NONE, 1.1 qpxtool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241644.l8OGiEvT004885@cvs-int.fedora.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/qpxtool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	consolehelper.patch libatafix.patch manpagefix.patch 
	qpxtool-0.6.1-buildfix.patch qpxtool.desktop qpxtool.spec 
Log Message:


Initial Import-


consolehelper.patch:

--- NEW FILE consolehelper.patch ---
diff -upNr qpxtool-0.6.1.orign/console/pioquiet/Makefile qpxtool-0.6.1/console/pioquiet/Makefile
--- qpxtool-0.6.1.orign/console/pioquiet/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pioquiet/Makefile	2007-09-08 12:49:42.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxcontrol/Makefile qpxtool-0.6.1/console/pxcontrol/Makefile
--- qpxtool-0.6.1.orign/console/pxcontrol/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxcontrol/Makefile	2007-09-08 12:50:00.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxfw/Makefile qpxtool-0.6.1/console/pxfw/Makefile
--- qpxtool-0.6.1.orign/console/pxfw/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxfw/Makefile	2007-09-08 12:50:15.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool qpxtool-0.6.1/consolehelper/console.app/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/console.app/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+USER=root
+PROGRAM=/usr/sbin/qpxtool
+SESSION=true
+
diff -upNr qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool qpxtool-0.6.1/consolehelper/pam.d/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/pam.d/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff -upNr qpxtool-0.6.1.orign/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile
--- qpxtool-0.6.1.orign/qpxtool-gui/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/qpxtool-gui/Makefile	2007-09-08 12:53:00.000000000 +0200
@@ -18,7 +18,7 @@ qproject:
 	LIBPATH+="../lib/lib"
 
 install: Makefile.qmake
-	install -m 4755 qpxtool $(DESTDIR)$(BINDIR)
+	install -m 755 qpxtool $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/qpxtool

libatafix.patch:

--- NEW FILE libatafix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/include/qpx_mmc.h qpxtool-0.6.1/lib/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

manpagefix.patch:

--- NEW FILE manpagefix.patch ---
diff -upNr qpxtool-0.6.1.orign/man/Makefile qpxtool-0.6.1/man/Makefile
--- qpxtool-0.6.1.orign/man/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/man/Makefile	2007-09-09 09:10:36.000000000 +0200
@@ -7,7 +7,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(MAN8DIR)
-	for m in $(MANS8); do install -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
+	for m in $(MANS8); do install -p -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
 
 uninstall:
 	for m in $(MANS8); do rm -f $(DESTDIR)$(LIBDIR)/$$m ; done

qpxtool-0.6.1-buildfix.patch:

--- NEW FILE qpxtool-0.6.1-buildfix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp
--- qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp	2007-09-22 10:46:23.000000000 +0200
@@ -23,6 +23,7 @@ int sense2str(int err, char* str);
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/time.h>
+#include <limits.h>
 
 #include "qpx_transport.h"
 


--- NEW FILE qpxtool.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=QPxTool
GenericName=CD/DVD Quality Tool
Comment=Check CD/DVD Media Quality
Exec=qpxtool
Icon=qpxtool
Terminal=false
Type=Application
Categories=System;


--- NEW FILE qpxtool.spec ---
Name: qpxtool
Version: 0.6.1        
Release: 5%{?dist}
Summary: CD/DVD Quality check tool

Group: Applications/System         
License: GPLv2+       
URL: http://qpxtool.sourceforge.net           
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2  
Source1: %{name}.desktop
Patch0: libatafix.patch
Patch1: consolehelper.patch
Patch2: manpagefix.patch
Patch3: qpxtool-0.6.1-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel
BuildRequires: desktop-file-utils
BuildRequires: sed
Requires: usermode >= 1.36       

%description
QPxTool is the linux way to get full control over your CD/DVD drives.
It is the Open Source Solution which intends to give you access to all
available Quality Checks (Q-Checks) on written and blank media, that
are available for your drive. This will help you to find the right media
and the optimized writing speed for your hardware, which will increase
the chance for a long data lifetime.

%package devel
Summary: Qpxtool headers and Libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headerfiles and libraries for developing apps using the
qpx* libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .consolehelper
%patch2 -p1 -b .manpagefix
%patch3 -p1 -b .buildfix

sed -ie 's!/usr/local!%{_prefix}!g' Makefile 
sed -ie 's!\$(PREFIX)/bin!%{_sbindir}!g' Makefile
sed -ie 's!\$(PREFIX)/lib!%{_libdir}!g' Makefile
sed -ie 's!\$(PREFIX)/man!%{_mandir}!g' Makefile
sed -ie 's!\$(PREFIX)/include!%{_includedir}!g' Makefile

%build
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}

cp -p consolehelper/console.app/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
cp -p consolehelper/pam.d/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qpxtool
cp -p qpxtool-gui/img/q.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/qpxtool.xpm

desktop-file-install --vendor="fedora"               \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/qpxtool
%{_sbindir}/qpxtool
%{_sbindir}/deadreader
%{_sbindir}/pioquiet
%{_sbindir}/pxcontrol
%{_sbindir}/pxfw
%{_libdir}/libqpxpioneer.so.0
%{_libdir}/libqpxpioneer.so.0.6.0
%{_libdir}/libqpxplextor.so.0
%{_libdir}/libqpxplextor.so.0.6.1
%{_libdir}/libqpxscan.so.0
%{_libdir}/libqpxscan.so.0.6.1
%{_libdir}/libqpxtransport.so.0
%{_libdir}/libqpxtransport.so.0.6.3
%{_mandir}/man8/pxcontrol.8.*
%{_mandir}/man8/pxfw.8.*
%{_datadir}/pixmaps/qpxtool.xpm
%{_datadir}/applications/fedora-qpxtool.desktop
%config(noreplace) %{_sysconfdir}/pam.d/qpxtool
%config(noreplace) %{_sysconfdir}/security/console.apps/qpxtool
%doc COPYING AUTHORS README ChangeLog

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libqpxpioneer.so
%{_libdir}/libqpxplextor.so
%{_libdir}/libqpxscan.so
%{_libdir}/libqpxtransport.so

%changelog
* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-5
- Fix desktop file category

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-4
- Clean up desktop file
- Fix Source0 URL

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-3
- Fix build failure

* Sun Sep 09 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-2
- Spec file cleanups
- Preserve manpage timestamps

* Sat Sep 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-1
- Inital build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:28:53 -0000	1.1
+++ .cvsignore	24 Sep 2007 16:43:42 -0000	1.2
@@ -0,0 +1 @@
+qpxtool-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:28:53 -0000	1.1
+++ sources	24 Sep 2007 16:43:42 -0000	1.2
@@ -0,0 +1 @@
+4fa7ce8aa9c13aa2db0a8b5224acb906  qpxtool-0.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:01:41 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 13:01:41 -0400
Subject: rpms/qfits/devel qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241701.l8OH1fCS012451@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing qfits


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:21:29 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:01:06 -0000	1.2
@@ -0,0 +1 @@
+qfits-6.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 17:01:06 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:05:24 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 13:05:24 -0400
Subject: devel/kvm kvm.spec,1.24,1.25
Message-ID: <200709241705.l8OH5OD0012666@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12639

Modified Files:
	kvm.spec 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
- fix build on x86_64



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kvm.spec	24 Sep 2007 15:49:17 -0000	1.24
+++ kvm.spec	24 Sep 2007 17:04:47 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -18,6 +18,7 @@
 BuildRequires: SDL-devel 
 # to build the bios
 BuildRequires: dev86
+BuildRequires: %{_includedir}/gnu/stubs-32.h
 # qemu doesn't build with gcc 4.x
 BuildRequires: compat-gcc-34 
 BuildRequires: zlib-devel 
@@ -92,6 +93,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
+- fix build on x86_64
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3
 - add support for selecting boot device at runtime
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:08:58 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:08:58 -0400
Subject: rpms/bugzilla/FC-6 .cvsignore, 1.5, 1.6 bugzilla.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200709241708.l8OH8wtS012800@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12772

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 12:44:43 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:08:23 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bugzilla.spec	27 Aug 2007 12:54:01 -0000	1.13
+++ bugzilla.spec	24 Sep 2007 17:08:23 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 12:44:43 -0000	1.5
+++ sources	24 Sep 2007 17:08:23 -0000	1.6
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:09:35 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:09:35 -0400
Subject: rpms/bugzilla/F-7 .cvsignore, 1.6, 1.7 bugzilla.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200709241709.l8OH9ZRu012956@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12846

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Aug 2007 13:12:17 -0000	1.6
+++ .cvsignore	24 Sep 2007 17:09:02 -0000	1.7
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bugzilla.spec	27 Aug 2007 13:12:18 -0000	1.13
+++ bugzilla.spec	24 Sep 2007 17:09:02 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Aug 2007 13:12:18 -0000	1.6
+++ sources	24 Sep 2007 17:09:02 -0000	1.7
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:10:12 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:10:12 -0400
Subject: rpms/bugzilla/devel .cvsignore, 1.5, 1.6 bugzilla.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200709241710.l8OHACEv013055@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13002

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 May 2007 19:30:57 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:09:39 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bugzilla.spec	27 Aug 2007 13:17:12 -0000	1.12
+++ bugzilla.spec	24 Sep 2007 17:09:39 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 May 2007 19:30:57 -0000	1.5
+++ sources	24 Sep 2007 17:09:39 -0000	1.6
@@ -1 +1 @@
-9a56a47cdbfcb70a85ad73d923ac7e9d  bugzilla-3.0.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:10:49 2007
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Mon, 24 Sep 2007 13:10:49 -0400
Subject: rpms/bugzilla/EL-5 .cvsignore, 1.5, 1.6 bugzilla.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200709241710.l8OHAnqW013142@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/pkgs/rpms/bugzilla/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
update to 3.0.2 - bz 299981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 13:24:36 -0000	1.5
+++ .cvsignore	24 Sep 2007 17:10:16 -0000	1.6
@@ -1 +1 @@
-bugzilla-3.0.1.tar.gz
+bugzilla-3.0.2.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/bugzilla.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bugzilla.spec	27 Aug 2007 13:24:36 -0000	1.12
+++ bugzilla.spec	24 Sep 2007 17:10:16 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.1
+Version: 3.0.2
 Group: Applications/Publishing
 Release: 0%{?dist}
 License: MPL
@@ -137,6 +137,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
 * Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
 - update to 3.0.1 - bz 256021
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 13:24:36 -0000	1.5
+++ sources	24 Sep 2007 17:10:16 -0000	1.6
@@ -1 +1 @@
-9793a01c1b53ec09fe42de8d62381176  bugzilla-3.0.1.tar.gz
+53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:17:28 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:17:28 -0400
Subject: rpms/octave-forge/devel octave-forge.spec,1.34,1.35
Message-ID: <200709241717.l8OHHSDv013339@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13321

Modified Files:
	octave-forge.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
- Rebuild for new octave



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- octave-forge.spec	20 Feb 2007 18:09:52 -0000	1.34
+++ octave-forge.spec	24 Sep 2007 17:16:56 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,7 +20,7 @@
 Patch2:         octave-forge-2006.07.09-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave octave(api) = api-v22 ImageMagick
+Requires:	octave octave(api) = api-v26 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
+- Rebuild for new octave
+
 * Tue Feb 20 2007 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-9
 - Remove libtermcap-devel as build dependency (Bug 226768).
 - Change octave version dependency to octave(api) dependency,



From fedora-extras-commits at redhat.com  Mon Sep 24 17:23:00 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:23:00 -0400
Subject: rpms/isomaster/devel .cvsignore, 1.4, 1.5 isomaster.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200709241723.l8OHN0q6013589@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13555

Modified Files:
	.cvsignore isomaster.spec sources 
Log Message:
Updated to isomaster-1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 19:39:12 -0000	1.4
+++ .cvsignore	24 Sep 2007 17:22:28 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/isomaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isomaster.spec	25 Aug 2007 17:24:48 -0000	1.5
+++ isomaster.spec	24 Sep 2007 17:22:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 19:39:12 -0000	1.4
+++ sources	24 Sep 2007 17:22:28 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:30 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:30 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQUlT028256@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchbugzilla acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:36 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:36 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQaSY005545@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchcommits acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:54 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:54 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQsS0005629@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the commit acl on octave-forge (Fedora devel) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:57 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:57 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQvPV028389@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchbugzilla acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:26:58 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:26:58 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241726.l8OHQw18005663@app3.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the watchcommits acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:00 2007
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 24 Sep 2007 10:27:00 -0700
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <200709241727.l8OHR0ZW028416@app4.fedora.phx.redhat.com>

Quentin Spencer (qspencer) has set the commit acl on octave-forge (Fedora 7) to Approved for Alex Lancaster (alexlan)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/octave-forge



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:35 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:27:35 -0400
Subject: rpms/isomaster/devel isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1
Message-ID: <200709241727.l8OHRZlV013918@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13891

Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Added patches for version 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.



From fedora-extras-commits at redhat.com  Mon Sep 24 17:27:47 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:27:47 -0400
Subject: rpms/ladspa-fil-plugins/devel ladspa-fil-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241727.l8OHRlc0013958@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-fil-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13858/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-fil-plugins.spec 
Log Message:
initial ladspa-fil-plugins import



--- NEW FILE ladspa-fil-plugins.spec ---
Name:           ladspa-fil-plugins
Version:        0.1.0
Release:        2%{?dist}
License:        GPLv2+
Summary:        LADSPA Filter plugins
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/FIL-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      fil-plugins <= 0.0.1
Provides:       fil-plugins = %{version}-%{release}

%description
There's one plugin in this first release, a four-band parametric
equaliser. Each section has an active/bypass switch, frequency,
bandwidth and gain controls. There is also a global bypass switch and
gain control.


%prep
%setup -q -n FIL-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-fil-plugins
- updated to 0.1.0

* Thu Apr 14 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Thu May 13 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:36:19 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+FIL-plugins-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:36:19 -0000	1.1
+++ sources	24 Sep 2007 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+6be67349d51191435ba8b5b124440f01  FIL-plugins-0.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:28:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:28:12 -0400
Subject: rpms/ladspa-mcp-plugins/devel ladspa-mcp-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241728.l8OHSC1o014023@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-mcp-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13906/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-mcp-plugins.spec 
Log Message:
initial ladspa-mcp-plugins import



--- NEW FILE ladspa-mcp-plugins.spec ---
Name:           ladspa-mcp-plugins
Epoch:          1
Version:        0.3.0
Release:        4%{?dist}
Summary:        A set of audio plugins for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/MCP-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      mcp-plugins <= 0.3.0-2
Provides:       mcp-plugins = %{version}-%{release}

%description
A set of audio plugins for LADSPA by Fons Adriaensen.
Currently contains a phaser, a chorus and a moog vcf.


%prep
%setup -q -n MCP-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- change name of package to ladspa-mcp-plugins

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- spec file cleanup
- do not include ladspa directory in file list
- include rpm optimizations in compiler flags

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.2-1
- updated to 0.2.2

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-1
- updated to 0.2.1b

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.4-1
- updated to 0.1.4

* Mon Jun 16 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- updated to 0.0.2

* Wed May 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:38:00 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:27:40 -0000	1.2
@@ -0,0 +1 @@
+MCP-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:38:00 -0000	1.1
+++ sources	24 Sep 2007 17:27:40 -0000	1.2
@@ -0,0 +1 @@
+47a4edef1d6062803c35de7dd81ebbd6  MCP-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:29:21 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:29:21 -0400
Subject: rpms/ladspa-rev-plugins/devel ladspa-rev-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241729.l8OHTL2j014196@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-rev-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-rev-plugins.spec 
Log Message:
initial ladspa-rev-plugins import



--- NEW FILE ladspa-rev-plugins.spec ---
Name:           ladspa-rev-plugins
Version:        0.3.1
Release:        3%{?dist}
Summary:        A reverberation plugin for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/REV-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      rev-plugins <= 0.3.1-1
Provides:       rev-plugins = %{version}-%{release}

%description
This reverb is based on gverb by Juhana Sadeharju, but the code
(now C++) is entirely original. I added a second input for stereo
operation, and some code to prevent FP denormalisation.
This is a preliminary release, and this plugin will probably change
a lot in future versions.


%prep
%setup -q -n REV-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-2
- change name of package to ladspa-rev-plugins

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-1
- updated to 0.3.1

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- updated to 0.2.1

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:39:37 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:28:49 -0000	1.2
@@ -0,0 +1 @@
+REV-plugins-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:39:37 -0000	1.1
+++ sources	24 Sep 2007 17:28:49 -0000	1.2
@@ -0,0 +1 @@
+bca920c2cbf5e33989e7cafab6fbaee4  REV-plugins-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:06 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:30:06 -0400
Subject: rpms/ladspa-fil-plugins/F-7 ladspa-fil-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241730.l8OHU6kt014402@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-fil-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14296

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-fil-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-fil-plugins.spec ---
Name:           ladspa-fil-plugins
Version:        0.1.0
Release:        2%{?dist}
License:        GPLv2+
Summary:        LADSPA Filter plugins
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/FIL-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      fil-plugins <= 0.0.1
Provides:       fil-plugins = %{version}-%{release}

%description
There's one plugin in this first release, a four-band parametric
equaliser. Each section has an active/bypass switch, frequency,
bandwidth and gain controls. There is also a global bypass switch and
gain control.


%prep
%setup -q -n FIL-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.0-2
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.0-1
- changed package name to ladspa-fil-plugins
- updated to 0.1.0

* Thu Apr 14 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- spec file cleanup

* Thu May 13 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:36:19 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:29:34 -0000	1.2
@@ -0,0 +1 @@
+FIL-plugins-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-fil-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:36:19 -0000	1.1
+++ sources	24 Sep 2007 17:29:34 -0000	1.2
@@ -0,0 +1 @@
+6be67349d51191435ba8b5b124440f01  FIL-plugins-0.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:30:35 -0400
Subject: rpms/ppl/devel ppl.spec,1.5,1.6
Message-ID: <200709241730.l8OHUZll014495@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14383

Modified Files:
	ppl.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
- Rebuild for new libgmpxx



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ppl.spec	28 Aug 2007 21:44:02 -0000	1.5
+++ ppl.spec	24 Sep 2007 17:30:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	14%{?dist}
+Release:	15%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -277,6 +277,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
+- Rebuild for new libgmpxx
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9-14
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:30:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:30:57 -0400
Subject: rpms/ladspa-mcp-plugins/F-7 ladspa-mcp-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241730.l8OHUvQY014545@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-mcp-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14471

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-mcp-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-mcp-plugins.spec ---
Name:           ladspa-mcp-plugins
Epoch:          1
Version:        0.3.0
Release:        4%{?dist}
Summary:        A set of audio plugins for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/MCP-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      mcp-plugins <= 0.3.0-2
Provides:       mcp-plugins = %{version}-%{release}

%description
A set of audio plugins for LADSPA by Fons Adriaensen.
Currently contains a phaser, a chorus and a moog vcf.


%prep
%setup -q -n MCP-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.3.0-4
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- change name of package to ladspa-mcp-plugins

* Sun Dec 19 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- spec file cleanup
- do not include ladspa directory in file list
- include rpm optimizations in compiler flags

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Sun Feb 29 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.2-1
- updated to 0.2.2

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1b-1
- updated to 0.2.1b

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.4-1
- updated to 0.1.4

* Mon Jun 16 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.0.2-1
- updated to 0.0.2

* Wed May 21 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:38:00 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:30:25 -0000	1.2
@@ -0,0 +1 @@
+MCP-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-mcp-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:38:00 -0000	1.1
+++ sources	24 Sep 2007 17:30:25 -0000	1.2
@@ -0,0 +1 @@
+47a4edef1d6062803c35de7dd81ebbd6  MCP-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:31:41 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:31:41 -0400
Subject: rpms/ladspa-rev-plugins/F-7 ladspa-rev-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241731.l8OHVf7Q014654@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-rev-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14602

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-rev-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-rev-plugins.spec ---
Name:           ladspa-rev-plugins
Version:        0.3.1
Release:        3%{?dist}
Summary:        A reverberation plugin for LADSPA
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source:         http://www.kokkinizita.net/linuxaudio/downloads/REV-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      rev-plugins <= 0.3.1-1
Provides:       rev-plugins = %{version}-%{release}

%description
This reverb is based on gverb by Juhana Sadeharju, but the code
(now C++) is entirely original. I added a second input for stereo
operation, and some code to prevent FP denormalisation.
This is a preliminary release, and this plugin will probably change
a lot in future versions.


%prep
%setup -q -n REV-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile
# we want to use the system ladspa.h
rm ladspa.h


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sun Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-2
- change name of package to ladspa-rev-plugins

* Mon Jul 11 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.1-1
- updated to 0.3.1

* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires

* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-2
- changed name of ladspa package, do not depend on it explicitly

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- updated to 0.2.1

* Tue Nov  4 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:39:37 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:31:08 -0000	1.2
@@ -0,0 +1 @@
+REV-plugins-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-rev-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:39:37 -0000	1.1
+++ sources	24 Sep 2007 17:31:08 -0000	1.2
@@ -0,0 +1 @@
+bca920c2cbf5e33989e7cafab6fbaee4  REV-plugins-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:33:45 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:33:45 -0400
Subject: rpms/ladspa-vco-plugins/devel ladspa-vco-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241733.l8OHXjYA014835@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-vco-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14790/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-vco-plugins.spec 
Log Message:
initial ladspa-vco-plugins import



--- NEW FILE ladspa-vco-plugins.spec ---
Name:           ladspa-vco-plugins
Version:        0.3.0
Release:        5%{?dist}
Summary:        Anti-aliased pulse and sawtooth oscillators
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source0:        http://www.kokkinizita.net/linuxaudio/downloads/VCO-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      vco-plugins <= 0.3.0-3
Provides:       vco-plugins = %{version}-%{release}

%description
Pulse-VCO : Anti-aliased dirac pulse oscillator (flat amplitude spectrum)
Saw-VCO   : Anti-aliased sawtooth oscillator (1/F amplitude spectrum)
 
Both oscillators are based on the same principle of using a
precomputed interpolated dirac pulse. For the sawtooth version, the
'edge' is made by integrating the anti-aliased pulse. Aliases should
be below -80dB for fundamental frequencies below Fsamp / 6 (i.e. up to
8 kHz at Fsamp = 48 kHz). This frequency range includes the
fundamental frequencies all known musical instruments.


%prep
%setup -q -n VCO-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-4
- changed package name to ladspa-amb-plugins
- change destination dir from /usr/lib/ to %%{_libdir}

* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- added rpm optimization flags

* Sat May  1 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- rereleased without ladspa-sdk dependency...

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:41:16 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:33:12 -0000	1.2
@@ -0,0 +1 @@
+VCO-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:41:16 -0000	1.1
+++ sources	24 Sep 2007 17:33:12 -0000	1.2
@@ -0,0 +1 @@
+6fdf4a7e3c716abbb89721645427cd52  VCO-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:35:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:35:12 -0400
Subject: rpms/ladspa-vco-plugins/F-7 ladspa-vco-plugins.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709241735.l8OHZCot015028@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ladspa-vco-plugins/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14978

Modified Files:
	.cvsignore sources 
Added Files:
	ladspa-vco-plugins.spec 
Log Message:
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion



--- NEW FILE ladspa-vco-plugins.spec ---
Name:           ladspa-vco-plugins
Version:        0.3.0
Release:        5%{?dist}
Summary:        Anti-aliased pulse and sawtooth oscillators
License:        GPLv2+
Group:          Applications/Multimedia
URL:            http://www.kokkinizita.net/linuxaudio/
Source0:        http://www.kokkinizita.net/linuxaudio/downloads/VCO-plugins-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  ladspa-devel
Requires:       ladspa
Obsoletes:      vco-plugins <= 0.3.0-3
Provides:       vco-plugins = %{version}-%{release}

%description
Pulse-VCO : Anti-aliased dirac pulse oscillator (flat amplitude spectrum)
Saw-VCO   : Anti-aliased sawtooth oscillator (1/F amplitude spectrum)
 
Both oscillators are based on the same principle of using a
precomputed interpolated dirac pulse. For the sawtooth version, the
'edge' is made by integrating the anti-aliased pulse. Aliases should
be below -80dB for fundamental frequencies below Fsamp / 6 (i.e. up to
8 kHz at Fsamp = 48 kHz). This frequency range includes the
fundamental frequencies all known musical instruments.


%prep
%setup -q -n VCO-plugins-%{version}
%{__perl} -p -i -e "s|/usr/lib/ladspa|\\\$\(DESTDIR\)%{_libdir}/ladspa|g" Makefile


%build
%{__make} %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -fPIC -D_REENTRANT"


%install
%{__rm} -rf %{buildroot}
%{__mkdir} -p %{buildroot}%{_libdir}/ladspa
%{__make} DESTDIR=%{buildroot} install


%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/ladspa/*.so


%changelog
* Fri Sep 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.0-5
- Various specfile improvements to match the Fedora Packaging Guidelines
- Submit for review for Fedora inclusion

* Sat Nov 19 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-4
- changed package name to ladspa-amb-plugins
- change destination dir from /usr/lib/ to %%{_libdir}

* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-3
- added rpm optimization flags

* Sat May  1 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-2
- rereleased without ladspa-sdk dependency...

* Fri Apr 30 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0-1
- updated to 0.3.0

* Wed Dec 17 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:41:16 -0000	1.1
+++ .cvsignore	24 Sep 2007 17:34:40 -0000	1.2
@@ -0,0 +1 @@
+VCO-plugins-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ladspa-vco-plugins/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:41:16 -0000	1.1
+++ sources	24 Sep 2007 17:34:40 -0000	1.2
@@ -0,0 +1 @@
+6fdf4a7e3c716abbb89721645427cd52  VCO-plugins-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 17:35:38 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:35:38 -0400
Subject: rpms/opengl-games-utils/devel README, NONE,
	1.1 opengl-game-wrapper.sh, 
	NONE, 1.1 opengl-games-utils.spec, NONE, 1.1
Message-ID: <200709241735.l8OHZctO015092@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15083/devel

Added Files:
	README opengl-game-wrapper.sh opengl-games-utils.spec 
Log Message:
initial opengl-games-utils import



--- NEW FILE README ---
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


Currently this package only contains one script:
opengl-game-wrapper.sh

To use this script create a link in /usr/bin gamename-wrapper[.sh] to
opengl-game-wrapper.sh, and put gamename-wrapper[.sh] in your desktop file
instead of gamename. The wrapper script will use $0 to determine gamename,
if direct rendering is available the wrapper script will execute gamename
with any parameters passed to the script, if direct rendering is not
available a userfriendly error dialog will be shown explaining that gamename
cannot run without hardware accelerated 3d, and that this is probably due to
missing Free Software support for the users card.


In the future I also plan to add an opengl-games-functions.sh file which can
be included by other wrapper scripts, the idea is to have a function in here
which will return true or false depending on if the current glx setup is a
setup which is known to work well. This function will have a list of
OpenGL renderer strings of known to work well drivers. This can then be used
by games which can take advantage of OpenGL, but will work without it too,
to determine wether or not to enable OpenGL support. The idea here is that
one might not want to enable OpenGL by default on SIS, VIA and other
low quality chipset / drivers.


Last but not least before I forget, to avoid any licensing issues I hereby
declare that all files in this package are in the Public Domain.

Hans de Goede 22 septemper 2007.


--- NEW FILE opengl-game-wrapper.sh ---
#!/bin/bash

GAME=`basename $0 | sed 's/-wrapper.*//'`

if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
  zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $GAME cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
  exit 1;
fi

exec $GAME "$@"


--- NEW FILE opengl-games-utils.spec ---
Name:           opengl-games-utils
Version:        0.1
Release:        2%{?dist}
Summary:        Utilities to check proper 3d support before launching 3d games
Group:          Amusements/Games
License:        Public Domain
URL:            http://fedoraproject.org/wiki/SIGs/Games
Source0:        opengl-game-wrapper.sh
Source1:        README
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zenity glx-utils

%description
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


%prep
%setup -c -T
cp %{SOURCE1} .


%build
# nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/opengl-game-wrapper.sh


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 24 17:36:54 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 13:36:54 -0400
Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec,1.7,1.8
Message-ID: <200709241736.l8OHasFB015190@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-DBD-SQLite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15161

Modified Files:
	perl-DBD-SQLite2.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.33-8
- Fall back to internal sqlite2, we don't ship sqlite2 in Fedora anymore.



Index: perl-DBD-SQLite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-DBD-SQLite2.spec	24 Aug 2007 21:47:14 -0000	1.7
+++ perl-DBD-SQLite2.spec	24 Sep 2007 17:36:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite2
 Version:        0.33
-Release:        7%{?dist}.1
+Release:        8%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver (sqlite 2.x)
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -10,7 +10,7 @@
 Patch0:		DBD-SQLite2-systemlibs.patch
 
 BuildRequires:  perl(DBI), perl(Test::More)
-BuildRequires:	sqlite2-devel
+#BuildRequires:	sqlite2-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.33-8
+- Fall back to internal sqlite2, we don't ship sqlite2 in Fedora anymore.
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-7
 - license fix
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:39:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 13:39:44 -0400
Subject: rpms/opengl-games-utils/F-7 README, NONE, 1.1 opengl-game-wrapper.sh,
	NONE, 1.1 opengl-games-utils.spec, NONE, 1.1
Message-ID: <200709241739.l8OHdims015343@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15336

Added Files:
	README opengl-game-wrapper.sh opengl-games-utils.spec 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram



--- NEW FILE README ---
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


Currently this package only contains one script:
opengl-game-wrapper.sh

To use this script create a link in /usr/bin gamename-wrapper[.sh] to
opengl-game-wrapper.sh, and put gamename-wrapper[.sh] in your desktop file
instead of gamename. The wrapper script will use $0 to determine gamename,
if direct rendering is available the wrapper script will execute gamename
with any parameters passed to the script, if direct rendering is not
available a userfriendly error dialog will be shown explaining that gamename
cannot run without hardware accelerated 3d, and that this is probably due to
missing Free Software support for the users card.


In the future I also plan to add an opengl-games-functions.sh file which can
be included by other wrapper scripts, the idea is to have a function in here
which will return true or false depending on if the current glx setup is a
setup which is known to work well. This function will have a list of
OpenGL renderer strings of known to work well drivers. This can then be used
by games which can take advantage of OpenGL, but will work without it too,
to determine wether or not to enable OpenGL support. The idea here is that
one might not want to enable OpenGL by default on SIS, VIA and other
low quality chipset / drivers.


Last but not least before I forget, to avoid any licensing issues I hereby
declare that all files in this package are in the Public Domain.

Hans de Goede 22 septemper 2007.


--- NEW FILE opengl-game-wrapper.sh ---
#!/bin/bash

GAME=`basename $0 | sed 's/-wrapper.*//'`

if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
  zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $GAME cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
  exit 1;
fi

exec $GAME "$@"


--- NEW FILE opengl-games-utils.spec ---
Name:           opengl-games-utils
Version:        0.1
Release:        2%{?dist}
Summary:        Utilities to check proper 3d support before launching 3d games
Group:          Amusements/Games
License:        Public Domain
URL:            http://fedoraproject.org/wiki/SIGs/Games
Source0:        opengl-game-wrapper.sh
Source1:        README
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zenity glx-utils

%description
This package contains various shell scripts which are intented for use by
3D games packages. These shell scripts can be used to check if direct rendering
is available before launching an OpenGL game. This package is intended for use
by other packages and is not intended for direct end user use!


%prep
%setup -c -T
cp %{SOURCE1} .


%build
# nothing to build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/opengl-game-wrapper.sh


%changelog
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
- Various spelling fixes thanks to Rahul Sundaram

* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-1
- Initial Fedora package



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:21 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:21 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241741.l8OHfLdc009966@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:23 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:23 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchcommits
Message-ID: <200709241741.l8OHfNKO009988@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:24 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:24 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested commit
Message-ID: <200709241741.l8OHfOVP032658@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on timidity++ (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:29 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:29 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241741.l8OHfT0u032685@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:34 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:34 -0700
Subject: [pkgdb] timidity++ Owned
Message-ID: <200709241741.l8OHfZeK010046@app3.fedora.phx.redhat.com>

Package timidity++ in Fedora 7 is now owned by Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:42 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:42 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfgSk010109@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:44 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfi2M000312@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:54 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfsW2010199@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Obsolete for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:41:55 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:41:55 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241741.l8OHfuOT010214@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Obsolete for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:39 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:39 -0700
Subject: [pkgdb] timidity++ had groupAcl changed
Message-ID: <200709241742.l8OHgdv2010418@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on timidity++ (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:48 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:48 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgnMo000675@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:50 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:50 -0700
Subject: [pkgdb] timidity++: jwrdegoede has given up watchbugzilla
Message-ID: <200709241742.l8OHgpIo000689@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has given up the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:51 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:51 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchcommits
Message-ID: <200709241742.l8OHgpc7010503@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchcommits acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:54 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgsW1010527@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchcommits acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:56 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:56 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested commit
Message-ID: <200709241742.l8OHgvIK000723@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the commit acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:42:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:42:59 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241742.l8OHgxce000733@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the commit acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:00 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:00 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHh01i010562@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the approveacls acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:01 -0700
Subject: [pkgdb] timidity++: jwrdegoede has given up approveacls
Message-ID: <200709241743.l8OHh1GY010574@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has given up the approveacls acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:18 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:18 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested watchbugzilla
Message-ID: <200709241743.l8OHhIn3000826@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the watchbugzilla acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:20 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:20 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHhKat010677@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the watchbugzilla acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:22 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:22 -0700
Subject: [pkgdb] timidity++: jwrdegoede has requested approveacls
Message-ID: <200709241743.l8OHhMWH000853@app4.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has requested the approveacls acl on timidity++ (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:43:24 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (j.w.r.degoede))
Date: Mon, 24 Sep 2007 10:43:24 -0700
Subject: [pkgdb] timidity++ had acl change status
Message-ID: <200709241743.l8OHhO0i010699@app3.fedora.phx.redhat.com>

Hans de Goede (jwrdegoede) has set the approveacls acl on timidity++ (Fedora 7) to Approved for Hans de Goede (jwrdegoede)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timidity++



From fedora-extras-commits at redhat.com  Mon Sep 24 17:45:54 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 13:45:54 -0400
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.25,
	1.26 policycoreutils-rhat.patch, 1.323, 1.324
Message-ID: <200709241745.l8OHjsxb015672@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15640

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
- Fixed spelling mistakes in booleans defs
- Update po


policycoreutils-po.patch:

Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policycoreutils-po.patch	24 Sep 2007 16:22:03 -0000	1.25
+++ policycoreutils-po.patch	24 Sep 2007 17:45:50 -0000	1.26
@@ -163219,8 +163219,8 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.26/po/Makefile
 --- nsapolicycoreutils/po/Makefile	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.26/po/Makefile	2007-09-24 12:16:45.000000000 -0400
-@@ -23,20 +23,64 @@
++++ policycoreutils-2.0.26/po/Makefile	2007-09-24 13:43:42.000000000 -0400
+@@ -23,20 +23,62 @@
  POFILES		= $(wildcard *.po)
  MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
  POTFILES = \
@@ -163231,18 +163231,17 @@
 +	../semodule_link/semodule_link.c \
 +	../audit2allow/audit2allow \
 +	../semanage/seobject.py \
-+	../restorecon/restorecon.c \
 +	../setsebool/setsebool.c \
 +	../newrole/newrole.c \
 +	../load_policy/load_policy.c \
 +	../sestatus/sestatus.c \
 +	../semodule/semodule.c \
  	../setfiles/setfiles.c \
+-	../scripts/genhomedircon \
 +	../semodule_package/semodule_package.c \
 +	../semodule_deps/semodule_deps.c \
 +	../semodule_expand/semodule_expand.c \
 +	../audit2why/audit2why.c \
- 	../scripts/genhomedircon \
  	../scripts/chcat \
 -	../semanage/semanage \
 -	../semanage/seobject.py \
@@ -163292,7 +163291,7 @@
  
  $(POTFILE): $(POTFILES) 
  	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
-@@ -64,8 +108,6 @@
+@@ -64,8 +106,6 @@
  	@rm -fv *mo *~ .depend
  	@rm -rf tmp
  
@@ -221625,16 +221624,26 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.26/po/POTFILES.in
 --- nsapolicycoreutils/po/POTFILES.in	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.26/po/POTFILES.in	2007-09-24 12:16:45.000000000 -0400
-@@ -2,7 +2,6 @@
++++ policycoreutils-2.0.26/po/POTFILES.in	2007-09-24 13:43:55.000000000 -0400
+@@ -2,9 +2,7 @@
  run_init/run_init.c
  semodule_link/semodule_link.c
  audit2allow/audit2allow
 -audit2allow/avc.py
  semanage/seobject.py
- restorecon/restorecon.c
+-restorecon/restorecon.c
  setsebool/setsebool.c
-@@ -24,16 +23,32 @@
+ newrole/newrole.c
+ load_policy/load_policy.c
+@@ -15,7 +13,6 @@
+ semodule_deps/semodule_deps.c
+ semodule_expand/semodule_expand.c
+ audit2why/audit2why.c
+-scripts/genhomedircon
+ scripts/chcat
+ scripts/fixfiles
+ restorecond/stringslist.c
+@@ -24,16 +21,32 @@
  restorecond/stringslist.h
  restorecond/restorecond.c
  restorecond/utmpwatcher.c

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- policycoreutils-rhat.patch	19 Sep 2007 02:29:47 -0000	1.323
+++ policycoreutils-rhat.patch	24 Sep 2007 17:45:50 -0000	1.324
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.25/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.26/Makefile
 --- nsapolicycoreutils/Makefile	2007-07-16 14:20:43.000000000 -0400
-+++ policycoreutils-2.0.25/Makefile	2007-08-28 09:22:16.000000000 -0400
++++ policycoreutils-2.0.26/Makefile	2007-09-18 16:40:57.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.25/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.26/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.25/restorecond/restorecond.c	2007-08-28 09:22:16.000000000 -0400
++++ policycoreutils-2.0.26/restorecond/restorecond.c	2007-09-18 16:40:57.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,9 +36,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.25/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.26/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.25/semanage/seobject.py	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-18 16:40:57.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -196,9 +196,9 @@
  
  		return ddict
  			
-diff --exclude-from=exclude --exclude=sepolgen-1.0.9 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.25/semodule/semodule.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.26/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.25/semodule/semodule.8	2007-08-28 09:22:17.000000000 -0400
++++ policycoreutils-2.0.26/semodule/semodule.8	2007-09-18 16:40:57.000000000 -0400
 @@ -23,6 +23,9 @@
  .B \-B, \-\-build		
  force a rebuild of policy (also reloads unless -n is used)



From fedora-extras-commits at redhat.com  Mon Sep 24 17:48:14 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Mon, 24 Sep 2007 13:48:14 -0400
Subject: comps/po el.po,1.6,1.7
Message-ID: <200709241748.l8OHmEuR015796@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15772/po

Modified Files:
	el.po 
Log Message:
Updated Greek translation (also testing transifex)


Index: el.po
===================================================================
RCS file: /cvs/pkgs/comps/po/el.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- el.po	17 Sep 2007 19:22:12 -0000	1.6
+++ el.po	24 Sep 2007 17:47:44 -0000	1.7
@@ -1,4 +1,4 @@
-# translation of el.po to Greek
+# translation of comps.HEAD.po to Greek
 # comps-po Greek Translation
 # Copyright (C) Nikos Charonitakis
 # This file is distributed under the same license as the comps-po package.
@@ -6,31 +6,32 @@
 #
 # Nikos Charonitakis <nikosx at gmail.com>, 2002, 2007.
 # Dimitris Michelinakis <dimitris at michelinakis.gr>, 2006.
-# Dimitris Glezos <dimitris at glezos.com>, 2006.
+# Dimitris Glezos <dimitris at glezos.com>, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-04-16 19:25+0300\n"
-"Last-Translator: Nikos Charonitakis <nikosx at gmail.com>\n"
+"POT-Creation-Date: 2007-09-22 09:47-0700\n"
+"PO-Revision-Date: 2007-09-23 06:45+0100\n"
+"Last-Translator: Dimitris Glezos <dimitris at glezos.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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
-"?????? ?????????????? ???????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? "
+"?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? "
 "????????????????????."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
-msgstr "???????????????? ?????????????????????? ????????????????????"
+msgstr "???????????????? ??????????????????????"
 
 #: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
 #: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
@@ -100,7 +101,7 @@
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr "???????????? ???? ???????????????????????? ??????????????????."
+msgstr "???????????????????????? ?????????????????? ?????? ????????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
@@ -118,8 +119,8 @@
 "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-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
 #: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
@@ -173,7 +174,7 @@
 "applications."
 msgstr ""
 "???????????????????????? ???????? ???? ???????????? ???? ???????????? ???? ???????????????????? ?????????????????? ???????????????? "
-"??????????????????????????  GTK+ ?????? GNOME."
+"?????????????????????????? GTK+ ?????? GNOME."
 
 #: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71
 #: ../comps-f8.xml.in.h:74
@@ -193,8 +194,7 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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 ""
 "?? ?????????????????????? ?????????? ?????? ???????????? ?????????????? ?????????????????? ???? ?????????? ?????? ???????????????? "
 "?????????????????????????? ??."
@@ -217,7 +217,7 @@
 #: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
 #: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
 msgid "KDE (K Desktop Environment)"
-msgstr "KDE (?????????????????? ???????????????? KDE)"
+msgstr "?????????????????? ???????????????? KDE"
 
 #: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
 #: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
@@ -237,7 +237,7 @@
 #: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94
 #: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid "Mail Server"
-msgstr "???????????????????????? Mail"
+msgstr "???????????????????????? ????. ??????????????????????????"
 
 #: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100
 #: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
@@ -270,8 +270,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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 ""
 "?????????? ???????????????????????? ?????????????????? ???? ???????????? ?????? ?????????????? ???? ???????????? ???????????????????? "
 "???????????????????? ???????????????????? ????????????????."
@@ -336,11 +335,10 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
 #: ../comps-el5.xml.in.h:51
@@ -354,8 +352,7 @@
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"???????? ???? ???????????????? ???????????????????? ???? ???????????????????? ???????????????????? ?????????? (Web) ?????? ??????????????."
+msgstr "???????? ???? ???????????????? ???????????????????? ???? ???????????????????? ???????????????????? ?????????? (Web) ?????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
@@ -374,13 +371,12 @@
 #: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
 #: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid "This group allows you to configure the system as a news server."
-msgstr ""
-"???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???? ?????????????? ???? ?????????????????????? news."
+msgstr "???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???? ?????????????? ???? ?????????????????????? news."
 
 #: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
 #: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ????????????????????."
+msgstr "???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ????????????????????."
 
 #: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
 #: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
@@ -404,7 +400,7 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ???????????????????? ?????????????????????? ???? "
+"???????? ?? ?????????? ???????????????????????? ?????????????? email, ?????????? ?????? ???????????????????? ?????????????????????? ???? "
 "?????????????? ????????????????. ?????????? ???? ?????????????????? ???? ?????????????????????? ???? ???????????????????? ?????????????? ??."
 
 #: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
@@ -418,47 +414,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ?????????????? ?????????????????????? ?????????????? "
-"???? ???? ?????????? ?????? ????????????????????."
+msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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 ""
 "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ?????????????? ?????????????????????? ?????????????? "
 "???? ???? ?????????? ?????? ????????????????????."
@@ -481,13 +462,12 @@
 #: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
 #: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
 msgid "Various ways to relax and spend your free time."
-msgstr ""
-"???????????????? ???????????? ?????? ???? ???????????????????? ?????? ???? ???????????????? ?????? ???????????????? ?????????? ??????."
+msgstr "???????????????? ???????????? ?????? ???? ???????????????????? ?????? ???? ???????????????? ?????? ???????????????? ?????????? ??????."
 
 #: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184
 #: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71
 msgid "Web Development"
-msgstr "???????????????? ???????????????????????? ??????????"
+msgstr "???????????????? ???????????????????????? ??????????"
 
 #: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185
 #: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72
@@ -525,20 +505,16 @@
 msgstr "???????????????????? ????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
-msgstr "???????????????????? Afrikaans"
+msgstr "???????????????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -561,27 +537,24 @@
 msgstr "???????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "???????????????????? ??????????????????????"
+msgstr "???????????????????? Belarusian"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Bhutanese"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Bosnian"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
-msgstr "???????????????????? ?????????????????????????? ????????????????????????"
+msgstr "???????????????????? ???????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
 msgid "Breton Support"
@@ -617,7 +590,7 @@
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
 msgid "DNS Name Server"
-msgstr "DNS ?????????????????????? ????????????????"
+msgstr "?????????????????????? ???????????????? DNS"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
 msgid "Danish Support"
@@ -656,9 +629,8 @@
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "???????????????????? Galician"
+msgstr "???????????????????? ????????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -686,9 +658,8 @@
 msgstr "???????????????????? Galician"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -719,16 +690,14 @@
 msgstr "???????????????????? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????????????? ????????????"
+msgstr "???????????????????? Inuktitut"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -752,9 +721,8 @@
 msgstr "???????????????????? Kannada"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? Khmer"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -765,14 +733,12 @@
 msgstr "??????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "???????????????????? Thai"
+msgstr "???????????????????? Lao"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Latvian"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -799,9 +765,8 @@
 msgstr "???????????????????? Malayalam"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "???????????????????? Marathi"
+msgstr "???????????????????? Maori"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -824,9 +789,8 @@
 msgstr "???????????????????? Oriya"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? ????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -861,9 +825,8 @@
 msgstr "???????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -890,9 +853,8 @@
 msgstr "?????????????????? ???????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "???????????????????? Swati"
+msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -923,9 +885,8 @@
 msgstr "???????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? Tagalog"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -944,22 +905,19 @@
 msgstr "???? ???????????????????????? ???????????????????? ?????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "???? ???????????? ???????? ?????? ???????????????????? ???? ???????????????????? ?????????????????? ?????? ???? ???????????????????? "
 "?????????????? ??."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "???? ???????????? ???????? ?????????????????????????? ???????????????????? ?????????????????????? ???????? DHCP, Kerberos ?????? "
 "NIS."
@@ -978,8 +936,7 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ????????????????."
+msgstr "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ????????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
@@ -1012,8 +969,7 @@
 "???????????? ????????????????????, ?????? ???????????????????? ?????????????????? ??????????????????????/firewall."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "???????? ?? ?????????? ?????????????? ?????????????????? ???? ???????????????????? DNS ???????????????????? ???????????????? (BIND) "
 "?????? ??????????????."
@@ -1032,18 +988,15 @@
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr ""
-"???????? ?? ?????????? ???????????????????????? ???????????? ?????? ???? ?????? ?????????????????? ???? ?????? Postgresql."
+msgstr "???????? ?? ?????????? ???????????????????????? ???????????? ?????? ???? ?????? ?????????????????? ???? ?????? Postgresql."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "???????????????????? ????????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "???????????????????? Tsonga"
+msgstr "???????????????????? Tonga"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1062,18 +1015,16 @@
 msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "???????????????????? ????????????"
+msgstr "???????????????????? Urdu"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "???????????????????? Venda"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1101,410 +1052,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???????????????????? Buildsystem"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????????????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ???????????????????????????? ?????? ???????????????? ???????????????? ???????? ?????????????????? ????????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???? ???????????????????????? ???????????????????? ?????????????????? Eclipse."
+msgstr "???????????????????????? ???????????????????????? ?????????????????? ???????????????????? ?????????????????? ?????? Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????????????????? ??????????????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "???????????????????? Thai"
+msgstr "???????????????????? Low Saxon"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ????????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "???????????????????? ??????????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "???????????????????? Swati"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "?? ???????????????????????? ???????????????? GNU Emacs."
-
-#~ msgid "Brazilian Support"
-#~ msgstr "???????????????????? ??????????????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "Canadian Support"
-#~ msgstr "???????????????????? ??????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "???????????????????? ???????????????????????? ???????????????????????????? ?????? Mozilla"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "???????????????????? ????????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "???????????????????? ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "???????????????????? ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "???????????????????? ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "???????????????????? ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr ""
-#~ "???????????????????????? ???????? ???? ???????????? ?????? ???? ????????????????????????????  ?????? ???????????? (compile)."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "?????????????????? ???????????????? KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????????? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????????? ???????????? ?????? ??????????????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "???????????? ?????? Mozilla ?????? ?????? ?????????????????? x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????? ?????????????????????? Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "???????? ?????????????????? SQL"
-
-#~ msgid "Server"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "???????????????????? ?????????????????????????????? ?????????????? ?????? ????-???????????????????? ??????????????????????????."
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????? Syriac"
-
-#~ msgid "System"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ?????? ???????????????????? ???? ?????????????????????? ???????? IMAP ?? Postfix "
-#~ "???????????????????? ??????????????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ???? ???????????????????????? ???????????????? "
-#~ "?????? Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "?????????????????????? ?????????????????? ???????????????????? ?????????? ????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "?????????????? ?????????????? ????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "???????????????????????? ??????????????????????"
-
-#~ msgid "English"
-#~ msgstr "??????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????"
-
-#~ msgid "German"
-#~ msgstr "??????????????????"
-
-#~ msgid "Italian"
-#~ msgstr "??????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "???????????????????? Red Hat Enterprise Linux 3"
-
-#~ msgid "Spanish"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????????????? ?????????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux ?????? "
-#~ "?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux ?????? "
-#~ "?????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????? ????????????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "??????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "???????????????????????? ????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????????????? ???????????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????????????????? ???????????????? ????????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????????????????? ????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ???????????????????? ???????????????????????? ?????????????????? ????????????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? ????????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? Gujarati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ?????????? ????????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????? Punjabi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "???????? ?? ?????????? ???????????????????????? ?????? ???????????????????? ?????? Red Hat Enterprise Linux "
-#~ "???????? ???????????????? ????????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????????????? ???? ??????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "???????????????????? ??????????????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ???? ?????????? ???????????????? ???????????????????? ?????? ???????????????????? ???? ??????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???? ?????????? ???????????????? ???????????????????? ?????? GFS ????????-????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????????????? GFS ???????? ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "???? ???????????? ???????? ???????????????? ???????????????????? ???????????????????????? ?????? ???????????????????????? ????????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "???????????????????????? Java Runtime ?????? Development Kits"
-
-#~ msgid "Misc"
-#~ msgstr "??????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "?????????????????? ??????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ???? ?????????? ???????????????? ???????????????? ?????????????????????????????? ?????? ???? Red Hat "
-#~ "Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????????? ????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????? ?????? ???????????????? ?????????????? ????????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "???????????????????? ??????????????????????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "?????????????????????? ?????????????????????? ???????????????????????? ????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "???????????? ?????????????????????? Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr ""
-#~ "???????????? ???? ?????????? ???????????????? ?????????????????????????????? ?????? ?????? ?????????????????????????? "
-#~ "????????????????????????."
-
-#~ msgid "IBM eServer iSeries/pSeries Provided Software"
-#~ msgstr "?????????????????? ???????????????????? ?????? IBM eServer iSeries/pSeries"
-
-#~ msgid "Software provided by IBM for eServer iSeries and pSeries machines"
-#~ msgstr ""
-#~ "?????????????????? ???? ?????????? ?????????????????? ?????? ?????? IBM ?????? ?????? ?????????????? eServer iSeries "
-#~ "?????? pSeries"
-
-#~ msgid "HPC"
-#~ msgstr "HPC"
-
-#~ msgid "High Performance Computing Support"
-#~ msgstr "???????????????????? ?????????????????????????? ???????????????????? ???????????? ????????????????"
-
-#~ msgid ""
-#~ "These packages provide the kernel and userspace tools needed for using "
-#~ "the Xen virtual machine monitor"
-#~ msgstr ""
-#~ "???????? ???? ???????????? ???????????????? ?????? ???????????? ?????? ???? ???????????????? ?????????? ?????????????? ?????? "
-#~ "?????????????????????? ?????? ???? ?????????? ?????? ???????????? ?????????????????? ?????????????? Xen"
+msgstr "?????????? ???????????? bitmap ?????? ???????????????????????? ????????????????????????????"
 
-#~ msgid "Xen"
-#~ msgstr "Xen"



From fedora-extras-commits at redhat.com  Mon Sep 24 17:54:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 13:54:56 -0400
Subject: rpms/xorg-x11-drv-nv import.log,1.8,1.9
Message-ID: <200709241754.l8OHsuH2017006@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769

Modified Files:
	import.log 
Log Message:
xf86-video-nv 2.1.5



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	27 Aug 2007 16:06:25 -0000	1.8
+++ import.log	24 Sep 2007 17:54:24 -0000	1.9
@@ -5,3 +5,4 @@
 xorg-x11-drv-nv-2_1_1-1_fc8:HEAD:xorg-x11-drv-nv-2.1.1-1.fc8.src.rpm:1183483032
 xorg-x11-drv-nv-2_1_3-1_fc8:HEAD:xorg-x11-drv-nv-2.1.3-1.fc8.src.rpm:1187360104
 xorg-x11-drv-nv-2_1_3-1_fc7:F-7:xorg-x11-drv-nv-2.1.3-1.fc7.src.rpm:1188230270
+xorg-x11-drv-nv-2_1_5-1_fc8:HEAD:xorg-x11-drv-nv-2.1.5-1.fc8.src.rpm:1190655540



From fedora-extras-commits at redhat.com  Mon Sep 24 17:55:00 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 13:55:00 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 xorg-x11-drv-nv.spec, 1.53, 1.54
Message-ID: <200709241755.l8OHt0HM017019@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Log Message:
xf86-video-nv 2.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Sep 2007 23:59:16 -0000	1.25
+++ .cvsignore	24 Sep 2007 17:54:27 -0000	1.26
@@ -1,3 +1,2 @@
-nouveau-20070330.tar.bz2
-xf86-video-nv-2.1.3.tar.bz2
 nouveau-20070920.tar.bz2
+xf86-video-nv-2.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	19 Sep 2007 23:59:16 -0000	1.26
+++ sources	24 Sep 2007 17:54:27 -0000	1.27
@@ -1,2 +1,2 @@
-f9b38e24157c3aac6014119ac18d76da  xf86-video-nv-2.1.3.tar.bz2
 00ba97f704d775c1ed83e104d4f089be  nouveau-20070920.tar.bz2
+585977ae23109c58d3b42a54153cfd12  xf86-video-nv-2.1.5.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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-nv.spec	19 Sep 2007 23:59:16 -0000	1.53
+++ xorg-x11-drv-nv.spec	24 Sep 2007 17:54:27 -0000	1.54
@@ -8,8 +8,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.1.3
-Release:   2%{?dist}
+Version:   2.1.5
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -88,6 +88,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 2.1.5-1
+- xf86-video-nv 2.1.5.
+
 * Thu Sep 20 2007 Dave Airlie <airlied at redhat.com> 2.1.3-2
 - update nouveau
 



From fedora-extras-commits at redhat.com  Mon Sep 24 17:55:22 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 10:55:22 -0700
Subject: [pkgdb] minicom: lkundrak has requested commit
Message-ID: <200709241755.l8OHtMRr013873@app3.fedora.phx.redhat.com>

Lubomir Kundrak (lkundrak) has requested the commit acl on minicom (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicom



From fedora-extras-commits at redhat.com  Mon Sep 24 17:56:06 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 13:56:06 -0400
Subject: rpms/isomaster/F-7 .cvsignore, 1.4, 1.5 isomaster.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200709241756.l8OHu6Om017300@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/isomaster/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17164

Modified Files:
	.cvsignore isomaster.spec sources 
Log Message:
Updated to isomaster-1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 20:16:38 -0000	1.4
+++ .cvsignore	24 Sep 2007 17:55:34 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/isomaster.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- isomaster.spec	25 Aug 2007 17:39:10 -0000	1.6
+++ isomaster.spec	24 Sep 2007 17:55:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 20:16:38 -0000	1.4
+++ sources	24 Sep 2007 17:55:34 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 17:59:33 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 24 Sep 2007 10:59:33 -0700
Subject: [pkgdb] minicom had acl change status
Message-ID: <200709241759.l8OHxXvA005447@app4.fedora.phx.redhat.com>

Miroslav Lichvar (mlichvar) has set the commit acl on minicom (Fedora devel) to Approved for Lubomir Kundrak (lkundrak)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/minicom



From fedora-extras-commits at redhat.com  Mon Sep 24 18:02:06 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 14:02:06 -0400
Subject: rpms/isomaster/F-7 isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1
Message-ID: <200709241802.l8OI26ZG024295@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/pkgs/rpms/isomaster/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24262

Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Added patches for 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:07:52 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:07:52 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.42,1.43
Message-ID: <200709241807.l8OI7qPP024633@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24562

Modified Files:
	apr-util.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.2.10-2
- Rebuild for upgrade path (add dist since that's now on F-7 branch)



Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- apr-util.spec	11 Sep 2007 09:50:55 -0000	1.42
+++ apr-util.spec	24 Sep 2007 18:07:19 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.10
-Release: 1
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -149,6 +149,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.2.10-2
+- Rebuild for upgrade path (add dist since that's now on F-7 branch)
+
 * Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.10-1
 - bump up to 1.2.10
 - pick up newly checked in MySQL DBD driver directly from ASF



From fedora-extras-commits at redhat.com  Mon Sep 24 18:11:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:11:14 -0400
Subject: rpms/xorg-x11-xinit import.log,1.1,1.2
Message-ID: <200709241811.l8OIBEXU024833@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738

Modified Files:
	import.log 
Log Message:
xinit 1.0.7



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:15:16 -0000	1.1
+++ import.log	24 Sep 2007 18:10:41 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-xinit-1_0_7-1_fc8:HEAD:xorg-x11-xinit-1.0.7-1.fc8.src.rpm:1190656518



From fedora-extras-commits at redhat.com  Mon Sep 24 18:11:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:11:19 -0400
Subject: rpms/xorg-x11-xinit/devel xinit-1.0.7-poke-ck.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.7,
	1.8 xinit-1.0.2-client-session.patch, 1.1,
	1.2 xorg-x11-xinit.spec, 1.50, 1.51 xinit-1.0.2-2-poke-ck.patch,
	1.1, NONE xinit-1.0.2-setuid.diff, 1.1, NONE xinput.sh, 1.4, NONE
Message-ID: <200709241811.l8OIBJJd024842@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24738/devel

Modified Files:
	.cvsignore sources xinit-1.0.2-client-session.patch 
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.7-poke-ck.patch 
Removed Files:
	xinit-1.0.2-2-poke-ck.patch xinit-1.0.2-setuid.diff xinput.sh 
Log Message:
xinit 1.0.7


xinit-1.0.7-poke-ck.patch:

--- NEW FILE xinit-1.0.7-poke-ck.patch ---
diff -up xinit-1.0.7/xinit.c.poke-ck xinit-1.0.7/xinit.c
--- xinit-1.0.7/xinit.c.poke-ck	2007-09-24 13:48:04.000000000 -0400
+++ xinit-1.0.7/xinit.c	2007-09-24 13:53:55.000000000 -0400
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 /* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
 /* $XdotOrg: $ */
 
@@ -39,6 +40,13 @@ in this Software without prior written a
 #include <ctype.h>
 #include <stdint.h>
 
+#define USE_CONKIT
+#ifdef USE_CONKIT
+#include <ck-connector.h>
+#include <X11/Xatom.h>
+static CkConnector *ckc = NULL;
+#endif /* USE_CONKIT */
+
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <signal.h>
@@ -521,6 +529,39 @@ processTimeout(int timeout, char *string
 	return( serverpid != pidfound );
 }
 
+
+#ifdef USE_CONKIT
+static void
+register_new_session_with_console_kit (void)
+{
+	static char conkitbuf[256];
+	DBusError   error;
+
+	ckc = ck_connector_new ();
+	if (ckc == NULL) {
+		Error ("Cannot register with ConsoleKit: OOM creating CkConnector\n");
+		goto out;
+	}
+
+	dbus_error_init (&error);
+	if (!ck_connector_open_session (ckc, &error)) {
+		Error ("Cannot register with ConsoleKit: %s: %s\n", error.name, error.message);
+		goto out;
+	}
+
+	/* If we managed to register with ConsoleKit, put the
+	 * environment variable XDG_SESSION_COOKIE=cookie as second
+	 * element in newenviron. See set_environment() where we
+	 * earlier have made sure there is room...
+	 */
+	conkitbuf[sizeof (conkitbuf) - 1] = '\0';
+	snprintf (conkitbuf, sizeof (conkitbuf) - 1, "XDG_SESSION_COOKIE=%s", ck_connector_get_cookie (ckc));
+	newenviron[1] = conkitbuf;
+out:
+	;
+}
+#endif /* USE_CONKIT */
+
 static int
 startServer(char *server[])
 {
@@ -631,6 +672,12 @@ startServer(char *server[])
 		break;
 	}
 
+#ifdef USE_CONKIT
+	if (serverpid != -1 ) {
+		register_new_session_with_console_kit ();
+	}
+#endif /* USE_CONKIT */
+
 	return(serverpid);
 }
 
@@ -785,6 +832,13 @@ shutdown(void)
 				clientpid);
 	}
 
+#ifdef USE_CONKIT
+	if (ckc != NULL) {
+		ck_connector_unref (ckc);
+		ckc = NULL;
+	}
+#endif
+
 	if (serverpid < 0)
 		return;
 	errno = 0;
@@ -821,6 +875,13 @@ shutdown(void)
  * make a new copy of environment that has room for DISPLAY
  */
 
+
+#ifdef USE_CONKIT
+#define NUM_EXTRA_ENV_VARS 3
+#else
+#define NUM_EXTRA_ENV_VARS 2
+#endif
+
 static void 
 set_environment(void)
 {
@@ -832,11 +893,11 @@ set_environment(void)
     for (oldPtr = environ; *oldPtr; oldPtr++) ;
 
     nenvvars = (oldPtr - environ);
-    newenviron = (char **) malloc ((nenvvars + 3) * sizeof(char **));
+    newenviron = (char **) malloc ((nenvvars + NUM_EXTRA_ENV_VARS) * sizeof(char **));
     if (!newenviron) {
 	fprintf (stderr,
 		 "%s:  unable to allocate %d pointers for environment\n",
-		 program, nenvvars + 3);
+		 program, nenvvars + NUM_EXTRA_ENV_VARS);
 	exit (1);
     }
 
@@ -846,10 +907,19 @@ set_environment(void)
     newPtr = newenviron;
     *newPtr++ = displaybuf;
 
+#ifdef USE_CONKIT
+    *newPtr++ = "XDG_SESSION_COOKIE=";
+#endif
+
     /* copy pointers to other variables */
     for (oldPtr = environ; *oldPtr; oldPtr++) {
 	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0
-	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0) {
+	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0
+#ifdef USE_CONKIT
+	 && strncmp (*oldPtr, "XDG_SESSION_COOKIE=", 19) != 0
+#endif
+	 )
+	{
 	    *newPtr++ = *oldPtr;
 	}
     }
diff -up xinit-1.0.7/configure.ac.poke-ck xinit-1.0.7/configure.ac
--- xinit-1.0.7/configure.ac.poke-ck	2007-09-17 06:46:38.000000000 -0400
+++ xinit-1.0.7/configure.ac	2007-09-24 13:48:04.000000000 -0400
@@ -92,7 +92,7 @@ AC_ARG_WITH(xinit,
 	[XINIT="$DEFAULT_XINIT"])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XINIT, x11)
+PKG_CHECK_MODULES(XINIT, x11 ck-connector)
 
 case $host_os in
     *bsd*)
diff -up xinit-1.0.7/startx.cpp.poke-ck xinit-1.0.7/startx.cpp
--- xinit-1.0.7/startx.cpp.poke-ck	2007-09-16 17:24:48.000000000 -0400
+++ xinit-1.0.7/startx.cpp	2007-09-24 13:48:04.000000000 -0400
@@ -223,6 +223,12 @@ EOF
     fi
 done
 
+if [ x"$display" != x ]; then
+    export DISPLAY=$display
+else
+    export DISPLAY=:0
+fi
+
 #if defined(__SCO__) || defined(__UNIXWARE__)
 if [ "$REMOTE_SERVER" = "TRUE" ]; then
         exec SHELL_CMD ${client}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jul 2006 06:46:08 -0000	1.10
+++ .cvsignore	24 Sep 2007 18:10:45 -0000	1.11
@@ -1,3 +1 @@
-*.tar.bz2
-*.tar.gz
-clog
+xinit-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Apr 2006 22:49:30 -0000	1.7
+++ sources	24 Sep 2007 18:10:45 -0000	1.8
@@ -1 +1 @@
-d591fafe69b57969b0521c461073a01f  xinit-1.0.2.tar.bz2
+8b882d9e2deed9d85469a3beaec566a3  xinit-1.0.7.tar.bz2

xinit-1.0.2-client-session.patch:

Index: xinit-1.0.2-client-session.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinit-1.0.2-client-session.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinit-1.0.2-client-session.patch	10 Nov 2006 15:31:06 -0000	1.1
+++ xinit-1.0.2-client-session.patch	24 Sep 2007 18:10:45 -0000	1.2
@@ -9,7 +9,7 @@
  			Error("cannot change uid: %s\n", strerror(errno));
  			_exit(ERR_EXIT);
  		}
--		setpgrp(0, getpid());
+-		setpgid(0, getpid());
 +		fd = open ("/dev/null", O_RDONLY);
 +
 +		if (fd < 0) {


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-xinit.spec	21 Aug 2007 19:30:34 -0000	1.50
+++ xorg-x11-xinit.spec	24 Sep 2007 18:10:45 -0000	1.51
@@ -2,8 +2,8 @@
 
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
-Version:   1.0.2
-Release:   27%{?dist}
+Version:   1.0.7
+Release:   1%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -20,9 +20,8 @@
 Source16: Xsession
 Source17: localuser.sh
 
-Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
 Patch1: xinit-1.0.2-client-session.patch
-Patch2: xinit-1.0.2-2-poke-ck.patch
+Patch2: xinit-1.0.7-poke-ck.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
@@ -54,7 +53,6 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .setuid
 %patch1 -p1 -b .client-session
 %patch2 -p1 -b .poke-ck
 
@@ -110,6 +108,9 @@
 %{_mandir}/man1/xinit.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.7-1
+- xinit 1.0.7
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-27
 - Rebuild for build id
 


--- xinit-1.0.2-2-poke-ck.patch DELETED ---


--- xinit-1.0.2-setuid.diff DELETED ---


--- xinput.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:14:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:14:58 -0400
Subject: rpms/xorg-x11-drv-vmware import.log,1.1,1.2
Message-ID: <200709241814.l8OIEwwa025061@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Modified Files:
	import.log 
Log Message:
xf86-video-vmware 10.15.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:16 -0000	1.1
+++ import.log	24 Sep 2007 18:14:25 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-vmware-10_15_1-1_fc8:HEAD:xorg-x11-drv-vmware-10.15.1-1.fc8.src.rpm:1190656738



From fedora-extras-commits at redhat.com  Mon Sep 24 18:15:02 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:15:02 -0400
Subject: rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-vmware.spec, 1.14, 1.15
Message-ID: <200709241815.l8OIF21Z025066@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vmware.spec 
Log Message:
xf86-video-vmware 10.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2007 23:23:08 -0000	1.8
+++ .cvsignore	24 Sep 2007 18:14:29 -0000	1.9
@@ -1 +1 @@
-xf86-video-vmware-10.14.1.tar.bz2
+xf86-video-vmware-10.15.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2007 23:23:08 -0000	1.8
+++ sources	24 Sep 2007 18:14:29 -0000	1.9
@@ -1 +1 @@
-eaf1ce9fa23363799140602afaa10f37  xf86-video-vmware-10.14.1.tar.bz2
+670b578d7631e2d3e2c4083c1c35669c  xf86-video-vmware-10.15.1.tar.bz2


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-vmware.spec	24 Aug 2007 12:08:43 -0000	1.14
+++ xorg-x11-drv-vmware.spec	24 Sep 2007 18:14:29 -0000	1.15
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
-Version:   10.14.1
-Release:   3%{?dist}
+Version:   10.15.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 10.15.1-1
+- xf86-video-vmware 10.15.1
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 10.14.1-3
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:16:40 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Mon, 24 Sep 2007 14:16:40 -0400
Subject: rpms/xmoto/devel xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.23, 1.24
Message-ID: <200709241816.l8OIGeUn025177@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25135

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xmoto.spec	29 Aug 2007 16:58:16 -0000	1.23
+++ xmoto.spec	24 Sep 2007 18:16:07 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:17:44 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:17:44 -0400
Subject: rpms/xorg-x11-drv-vmmouse import.log,1.1,1.2
Message-ID: <200709241817.l8OIHirK025298@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235

Modified Files:
	import.log 
Log Message:
vmmouse 12.4.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:09 -0000	1.1
+++ import.log	24 Sep 2007 18:17:11 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-vmmouse-12_4_2-1_fc8:HEAD:xorg-x11-drv-vmmouse-12.4.2-1.fc8.src.rpm:1190656894



From fedora-extras-commits at redhat.com  Mon Sep 24 18:17:48 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:17:48 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel .cvsignore, 1.4, 1.5 sources, 1.4, 
	1.5 xorg-x11-drv-vmmouse.spec, 1.11, 1.12
Message-ID: <200709241817.l8OIHmH7025311@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vmmouse.spec 
Log Message:
vmmouse 12.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Apr 2006 03:27:45 -0000	1.4
+++ .cvsignore	24 Sep 2007 18:17:14 -0000	1.5
@@ -1 +1 @@
-xf86-input-vmmouse-12.4.0.tar.bz2
+xf86-input-vmmouse-12.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Apr 2006 03:27:45 -0000	1.4
+++ sources	24 Sep 2007 18:17:14 -0000	1.5
@@ -1 +1 @@
-313e403e56702f6c38d1a5c830b60dc2  xf86-input-vmmouse-12.4.0.tar.bz2
+5e5a41d1a0d8f80779f958814ed8392f  xf86-input-vmmouse-12.4.2.tar.bz2


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-vmmouse.spec	24 Aug 2007 12:07:46 -0000	1.11
+++ xorg-x11-drv-vmmouse.spec	24 Sep 2007 18:17:14 -0000	1.12
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
-Version:   12.4.0
-Release:   4%{?dist}
+Version:   12.4.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -47,6 +47,9 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 12.4.2-1
+- xf86-input-vmmouse 12.4.2
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 12.4.0-4
 - Rebuild for build ID
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:18:02 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 14:18:02 -0400
Subject: rpms/kernel/devel kernel.spec, 1.180,
	1.181 linux-2.6-highres-timers.patch, 1.11, 1.12
Message-ID: <200709241818.l8OII2cF025363@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25278

Modified Files:
	kernel.spec linux-2.6-highres-timers.patch 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- Update hi-res timers patch to .23rc7-hrt1.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kernel.spec	24 Sep 2007 14:37:26 -0000	1.180
+++ kernel.spec	24 Sep 2007 18:17:29 -0000	1.181
@@ -1803,6 +1803,9 @@
 
 %changelog
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- Update hi-res timers patch to .23rc7-hrt1.
+
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc7-git5
 
 * Sun Sep 23 2007 Dave Jones <davej at redhat.com>

linux-2.6-highres-timers.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.11 -r 1.12 linux-2.6-highres-timers.patch
Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-highres-timers.patch	24 Sep 2007 02:26:20 -0000	1.11
+++ linux-2.6-highres-timers.patch	24 Sep 2007 18:17:29 -0000	1.12
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc3/include/linux/clockchips.h
+Index: linux-2.6.23-rc7/include/linux/clockchips.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/clockchips.h	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/clockchips.h	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/clockchips.h	2007-09-20 21:06:24.000000000 +0200
 @@ -8,7 +8,7 @@
  #ifndef _LINUX_CLOCKCHIPS_H
  #define _LINUX_CLOCKCHIPS_H
@@ -28,10 +28,10 @@
  #define clockevents_notify(reason, arg) do { } while (0)
  
  #endif
-Index: linux-2.6.23-rc3/kernel/time/Kconfig
+Index: linux-2.6.23-rc7/kernel/time/Kconfig
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Kconfig	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Kconfig	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/Kconfig	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/Kconfig	2007-09-20 21:06:24.000000000 +0200
 @@ -23,3 +23,8 @@ config HIGH_RES_TIMERS
  	  hardware is not capable then this option only increases
  	  the size of the kernel image.
@@ -41,10 +41,10 @@
 +	default y
 +	depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
 +
-Index: linux-2.6.23-rc3/kernel/time/Makefile
+Index: linux-2.6.23-rc7/kernel/time/Makefile
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/Makefile	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/Makefile	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/Makefile	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/Makefile	2007-09-20 21:06:24.000000000 +0200
 @@ -1,6 +1,6 @@
  obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
  
@@ -53,10 +53,10 @@
  obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o
  obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= tick-broadcast.o
  obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o
-Index: linux-2.6.23-rc3/kernel/time/clockevents.c
+Index: linux-2.6.23-rc7/kernel/time/clockevents.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/clockevents.c	2007-08-13 16:49:31.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/clockevents.c	2007-08-13 16:49:31.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/clockevents.c	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/clockevents.c	2007-09-20 21:06:24.000000000 +0200
 @@ -194,6 +194,7 @@ void clockevents_exchange_device(struct 
  	local_irq_restore(flags);
  }
@@ -71,151 +71,595 @@
  EXPORT_SYMBOL_GPL(clockevents_notify);
 -
 +#endif
-Index: linux-2.6.23-rc3/Documentation/cpuidle/core.txt
+Index: linux-2.6.23-rc7/Documentation/00-INDEX
+===================================================================
+--- linux-2.6.23-rc7.orig/Documentation/00-INDEX	2007-09-20 21:06:23.000000000 +0200
++++ linux-2.6.23-rc7/Documentation/00-INDEX	2007-09-20 21:06:24.000000000 +0200
+@@ -62,6 +62,8 @@ VGA-softcursor.txt
+ 	- how to change your VGA cursor from a blinking underscore.
+ accounting/
+ 	- documentation on accounting and taskstats.
++acpi
++	- general ACPI information
+ aoe/
+ 	- description of AoE (ATA over Ethernet) along with config examples.
+ applying-patches.txt
+Index: linux-2.6.23-rc7/Documentation/acpi/00-INDEX
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.23-rc7/Documentation/acpi/00-INDEX	2007-09-20 21:06:24.000000000 +0200
+@@ -0,0 +1,6 @@
++00-INDEX
++	- this file
++README.ACPI
++	- where to start
++acpi_debugging.txt
++	- How to debug ACPI problems
+Index: linux-2.6.23-rc7/Documentation/acpi/README.ACPI
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc3/Documentation/cpuidle/core.txt	2007-08-13 16:49:31.000000000 +0200
-@@ -0,0 +1,17 @@
++++ linux-2.6.23-rc7/Documentation/acpi/README.ACPI	2007-09-20 21:06:24.000000000 +0200
+@@ -0,0 +1,377 @@
++Developing ACPI for Linux - July 13, 2007
++------------------------------------------
++Len Brown <lenb at kernel.org> (Intel Open Source Technology Center)
++
++This is how you can be most effective improving Linux ACPI support.
++
++Latest version of this file
++---------------------------
++http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/README.ACPI
++
++Linux/ACPI home page
++--------------------
++http://acpi.sourceforge.net/
++
++Mailing Lists
++-------------
++Inventory of lists: http://acpi.sourceforge.net/mailinglists.html
++
++The main list is linux-acpi at vger.kernel.org.
++Subscribe here: http://vger.kernel.org/vger-lists.html#linux-acpi
++Note this list server has a 100KB message limit size.
++If you need to post something big, attaching it to a bugzilla entry
++(below) is usually the way to go.
++
++Which e-mail address to use?
++----------------------------
++For issues, discussion, RFC's, debugging etc:
++To: linux-acpi at vger.kernel.org
++
++To request an ACPI patch be applied to Linux:
++To: lenb at kernel.org
++Cc: linux-acpi at vger.kernel.org
++
++Feedback to (only) Intel on Intel's ACPICA,
++or ACPI-related issues with NDA pre-production systems:
++To: acpi at linux.intel.com
++
++Len Brown is on both of these lists, and he also sees traffic to
++LKML, cpufreq, pci, and ia64 lists when the word ACPI appears in it.
++
++Note that Len signs-off using "len.brown at intel.com" to make it clear
++that he is employed by Intel.  While that address is functional,
++lenb at kernel.org is preferred for all public Linux work.
++
++asus_acpi or asus-laptop specific e-mail:
++to: acpi4asus-user at lists.sourceforge.net
++
++ibm_acpi specific e-mail:
++ibm-acpi-devel at lists.sourceforge.net
++
++Bugzilla
++--------
++The Linux/ACPI community makes active use of bugzilla.
++http://bugzilla.kernel.org/enter_bug.cgi?product=ACPI
++Note that this database is for kernel.org kernels only.
++
++If an issue is specific to a distribution, it should
++be filed in their database.  If a sighting appears in both,
++please cross reference it using a complete URL.
++
++In both cases, please cc: acpi-bugzilla at lists.sourceforge.net
++on the bug report.  You can subscribe to this list to see
++all ACPI bugzilla updates:
++https://lists.sourceforge.net/lists/listinfo/acpi-bugzilla
++Note that this list is intended for bugzilla machine-generated
++messages only.
++
++If the distribution bug report is private due to being
++on pre-production hardware and you want Intel's ACPI team
++to know about it, then cc: acpi at linux.intel.com
++
++Sometimes you'll see check-in comments including reference
++to small bugzilla numbers, eg. (BZ 123), these refer to a
++bugzilla database inside Intel where ACPICA issues
++are tracked that don't apply directly to the Linux kernel
++and thus would not fit within the charter of bugzilla.kernel.org.
++
++While discussion-oriented issues are best dealt with
++on the list, bugzilla has two useful properties:
++
++1. you can attach a whole bunch of stuff there
++   without irritating everybody on the list --
++   including items > 100KB.
++2. bugzilla never forgets -- so your issue
++   will not get lost in the shuffle of e-mail overload.
++
++Sometimes it works well to file the supporting debug output
++for your issue in bugzilla and then refer to it
++on the linux-acpi at vger.kernel.org list.
++
++Please be sure to answer these questions when you submit
++the bug, so they don't have to be asked later:
++
++0. Exactly what kernel version does this bug appear in?
++
++1. Does it still appear in the latest version?
++
++2. Is this a new problem (a regression) or has this problem
++   always existed in every version of Linux tested?
++
++3. If a regression, what is the latest version of the
++   kernel.org kernel where it does not happen?
++
[...3822 lines suppressed...]
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-@@ -208,6 +209,8 @@ void cpu_idle (void)
+@@ -209,6 +209,8 @@ void cpu_idle (void)
  			if (__get_cpu_var(cpu_idle_state))
  				__get_cpu_var(cpu_idle_state) = 0;
  
@@ -5364,10 +5790,10 @@
  		preempt_enable_no_resched();
  		schedule();
  		preempt_disable();
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/Makefile
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/Makefile
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/Makefile	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/Makefile	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/Makefile	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/Makefile	2007-09-20 21:06:25.000000000 +0200
 @@ -9,7 +9,7 @@ obj-y	:= process.o signal.o entry.o trap
  		x8664_ksyms.o i387.o syscall.o vsyscall.o \
  		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
@@ -5386,10 +5812,10 @@
  therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
  bootflag-y			+= ../../i386/kernel/bootflag.o
  cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/i8259.c	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/i8259.c	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/i8259.c	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/i8259.c	2007-09-20 21:06:25.000000000 +0200
 @@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
  	}
  }
@@ -5450,10 +5876,10 @@
  	if (!acpi_ioapic)
  		setup_irq(2, &irq2);
  }
-Index: linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c
+Index: linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/x86_64/kernel/smpboot.c	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/arch/x86_64/kernel/smpboot.c	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/x86_64/kernel/smpboot.c	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/arch/x86_64/kernel/smpboot.c	2007-09-20 21:06:25.000000000 +0200
 @@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
  	local_irq_disable();
  	Dprintk("Stack at about %p\n",&cpuid);
@@ -5472,10 +5898,10 @@
  	/*
  	 * The sibling maps must be set before turing the online map on for
  	 * this cpu
-Index: linux-2.6.23-rc3/include/asm-x86_64/hpet.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/hpet.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/hpet.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/hpet.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/hpet.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/hpet.h	2007-09-20 21:06:25.000000000 +0200
 @@ -1,18 +1,2 @@
 -#ifndef _ASM_X8664_HPET_H
 -#define _ASM_X8664_HPET_H 1
@@ -5495,10 +5921,10 @@
 -extern unsigned long hpet_tick;
 -
 -#endif
-Index: linux-2.6.23-rc3/include/asm-x86_64/apic.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/apic.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/apic.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/apic.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/apic.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/apic.h	2007-09-20 21:06:25.000000000 +0200
 @@ -19,7 +19,6 @@
  extern int apic_verbosity;
  extern int apic_runs_main_timer;
@@ -5527,10 +5953,10 @@
  #define ARCH_APICTIMER_STOPS_ON_C3	1
  
  extern unsigned boot_cpu_id;
-Index: linux-2.6.23-rc3/include/asm-x86_64/proto.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/proto.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/proto.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/proto.h	2007-08-13 16:49:33.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/proto.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/proto.h	2007-09-20 21:06:25.000000000 +0200
 @@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
  
  extern void load_gs_index(unsigned gs);
@@ -5556,10 +5982,10 @@
  #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
  #define round_down(x,y) ((x) & ~((y)-1))
  
-Index: linux-2.6.23-rc3/include/linux/jiffies.h
+Index: linux-2.6.23-rc7/include/linux/jiffies.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/jiffies.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/jiffies.h	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/linux/jiffies.h	2007-09-20 21:06:22.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/jiffies.h	2007-09-20 21:06:26.000000000 +0200
 @@ -36,8 +36,6 @@
  /* LATCH is used in the interval timer and ftape setup. */
  #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
@@ -5583,10 +6009,10 @@
  /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
  #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
  
-Index: linux-2.6.23-rc3/include/asm-i386/hpet.h
+Index: linux-2.6.23-rc7/include/asm-i386/hpet.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-i386/hpet.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-i386/hpet.h	2007-08-13 16:49:35.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-i386/hpet.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-i386/hpet.h	2007-09-20 21:06:26.000000000 +0200
 @@ -64,8 +64,11 @@
  
  /* hpet memory map physical address */
@@ -5607,10 +6033,10 @@
  
  #endif /* CONFIG_HPET_TIMER */
  #endif /* _I386_HPET_H */
-Index: linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h
+Index: linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/asm-x86_64/vsyscall.h	2007-08-13 16:49:28.000000000 +0200
-+++ linux-2.6.23-rc3/include/asm-x86_64/vsyscall.h	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/asm-x86_64/vsyscall.h	2007-09-20 21:06:26.000000000 +0200
 @@ -29,9 +29,6 @@ enum vsyscall_num {
  #define VGETCPU_RDTSCP	1
  #define VGETCPU_LSL	2
@@ -5621,10 +6047,10 @@
  extern int __vgetcpu_mode;
  extern volatile unsigned long __jiffies;
  
-Index: linux-2.6.23-rc3/kernel/time/tick-broadcast.c
+Index: linux-2.6.23-rc7/kernel/time/tick-broadcast.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-broadcast.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-broadcast.c	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/tick-broadcast.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/tick-broadcast.c	2007-09-20 21:06:26.000000000 +0200
 @@ -64,8 +64,9 @@ static void tick_broadcast_start_periodi
   */
  int tick_check_broadcast_device(struct clock_event_device *dev)
@@ -5637,7 +6063,7 @@
  		return 0;
  
  	clockevents_exchange_device(NULL, dev);
-@@ -519,11 +520,9 @@ static void tick_broadcast_clear_oneshot
+@@ -530,11 +531,9 @@ static void tick_broadcast_clear_oneshot
   */
  void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
  {
@@ -5652,10 +6078,10 @@
  }
  
  /*
-Index: linux-2.6.23-rc3/kernel/time/tick-common.c
+Index: linux-2.6.23-rc7/kernel/time/tick-common.c
 ===================================================================
---- linux-2.6.23-rc3.orig/kernel/time/tick-common.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/kernel/time/tick-common.c	2007-08-13 16:49:34.000000000 +0200
+--- linux-2.6.23-rc7.orig/kernel/time/tick-common.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/kernel/time/tick-common.c	2007-09-20 21:06:26.000000000 +0200
 @@ -200,7 +200,7 @@ static int tick_check_new_device(struct 
  
  	cpu = smp_processor_id();
@@ -5674,10 +6100,10 @@
  	spin_unlock_irqrestore(&tick_device_lock, flags);
  
  	return ret;
-Index: linux-2.6.23-rc3/arch/i386/kernel/quirks.c
+Index: linux-2.6.23-rc7/arch/i386/kernel/quirks.c
 ===================================================================
---- linux-2.6.23-rc3.orig/arch/i386/kernel/quirks.c	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/arch/i386/kernel/quirks.c	2007-08-13 16:49:35.000000000 +0200
+--- linux-2.6.23-rc7.orig/arch/i386/kernel/quirks.c	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/arch/i386/kernel/quirks.c	2007-09-20 21:06:27.000000000 +0200
 @@ -4,6 +4,8 @@
  #include <linux/pci.h>
  #include <linux/irq.h>
@@ -5968,11 +6394,11 @@
 +}
 +
 +#endif
-Index: linux-2.6.23-rc3/include/linux/pci_ids.h
+Index: linux-2.6.23-rc7/include/linux/pci_ids.h
 ===================================================================
---- linux-2.6.23-rc3.orig/include/linux/pci_ids.h	2007-08-13 16:49:27.000000000 +0200
-+++ linux-2.6.23-rc3/include/linux/pci_ids.h	2007-08-13 16:49:35.000000000 +0200
-@@ -2215,6 +2215,7 @@
+--- linux-2.6.23-rc7.orig/include/linux/pci_ids.h	2007-09-20 21:06:21.000000000 +0200
++++ linux-2.6.23-rc7/include/linux/pci_ids.h	2007-09-20 21:06:26.000000000 +0200
+@@ -2221,6 +2221,7 @@
  #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
  #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6
  #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db



From fedora-extras-commits at redhat.com  Mon Sep 24 18:18:19 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:18:19 -0400
Subject: rpms/clamav/devel clamav.spec,1.58,1.59
Message-ID: <200709241818.l8OIIJ4P025372@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25303

Modified Files:
	clamav.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.91.2-2
- Bump release for upgrade path.



Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- clamav.spec	25 Aug 2007 10:40:56 -0000	1.58
+++ clamav.spec	24 Sep 2007 18:17:46 -0000	1.59
@@ -18,7 +18,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.91.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -507,6 +507,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.91.2-2
+- Bump release for upgrade path.
+
 * Sat Aug 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.91.2-1
 - updated to 0.91.2 (SECURITY):
 - CVE-2007-4510 DOS in RTF parser



From fedora-extras-commits at redhat.com  Mon Sep 24 18:19:48 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Mon, 24 Sep 2007 14:19:48 -0400
Subject: rpms/kernel-xen-2.6/devel git-geode.patch, 1.1,
	NONE linux-2.6-NFSD-ctlbits.patch, 1.1,
	NONE linux-2.6-cachefiles.patch, 1.1,
	NONE linux-2.6-cafe-nand.patch, 1.1,
	NONE linux-2.6-cpufreq-unload-smi.patch, 1.1,
	NONE linux-2.6-debug-disable-builtins.patch, 1.1,
	NONE linux-2.6-debug-verbosify-bug.patch, 1.1,
	NONE linux-2.6-defaults-disable-split-ptlock.patch, 1.2,
	NONE linux-2.6-defaults-phys-start.patch, 1.1,
	NONE linux-2.6-drivers-add-qlogic-firmware.patch, 1.1,
	NONE linux-2.6-gfs2-locking-exports.patch, 1.1,
	NONE linux-2.6-gfs2-tux.patch, 1.1,
	NONE linux-2.6-hvc-console.patch, 1.1,
	NONE linux-2.6-ia64-kexec-kdump-xen-conflict.patch, 1.1,
	NONE linux-2.6-ips-softlockup.patch, 1.1,
	NONE linux-2.6-lockdep-fixes.patch, 1.1,
	NONE linux-2.6-mac-raid-autorun.patch, 1.1,
	NONE linux-2.6-marvell-88alp01.patch, 1.1,
	NONE linux-2.6-marvell-update.patch, 1.1,
	NONE linux-2.6-mtd-update.patch, 1.1,
	NONE linux-2.6-net-forcedeth-suspend.patch, 1.1,
	NONE linux-2.6-olpc-battery.patch, 1.1,
	NONE linux-2.6-olpc-dcon.patch, 1.1,
	NONE linux-2.6-power6-no-ci-large-page.patch, 1.1,
	NONE linux-2.6-ppc-iseries-input-layer.patch, 1.1,
	NONE linux-2.6-ppc-rtas-check.patch, 1.1,
	NONE linux-2.6-sata-promise-pata-ports.patch, 1.2,
	NONE linux-2.6-softcursor-persistent-alloc.patch, 1.1,
	NONE linux-2.6-sysprof-1.0.3.patch, 1.1,
	NONE linux-2.6-tux.patch, 1.1,
	NONE linux-2.6-usb-storage-reboot.patch, 1.1,
	NONE linux-2.6-vm-debug.patch, 1.1,
	NONE linux-2.6-warn-c-p-a.patch, 1.1,
	NONE linux-2.6-x86-apic-auto.patch, 1.1,
	NONE linux-2.6-xen-execshield.patch, 1.4,
	NONE linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch, 1.2,
	NONE linux-2.6-xen-utrace.patch, 1.3,
	NONE linux-2.6-xen-x86_64-silence-up-apic-errors.patch, 1.1,
	NONE linux-2.6.20.14-xen-3.1.0.patch, 1.2, NONE
Message-ID: <200709241819.l8OIJmDu025438@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415

Removed Files:
	git-geode.patch linux-2.6-NFSD-ctlbits.patch 
	linux-2.6-cachefiles.patch linux-2.6-cafe-nand.patch 
	linux-2.6-cpufreq-unload-smi.patch 
	linux-2.6-debug-disable-builtins.patch 
	linux-2.6-debug-verbosify-bug.patch 
	linux-2.6-defaults-disable-split-ptlock.patch 
	linux-2.6-defaults-phys-start.patch 
	linux-2.6-drivers-add-qlogic-firmware.patch 
	linux-2.6-gfs2-locking-exports.patch linux-2.6-gfs2-tux.patch 
	linux-2.6-hvc-console.patch 
	linux-2.6-ia64-kexec-kdump-xen-conflict.patch 
	linux-2.6-ips-softlockup.patch linux-2.6-lockdep-fixes.patch 
	linux-2.6-mac-raid-autorun.patch 
	linux-2.6-marvell-88alp01.patch linux-2.6-marvell-update.patch 
	linux-2.6-mtd-update.patch 
	linux-2.6-net-forcedeth-suspend.patch 
	linux-2.6-olpc-battery.patch linux-2.6-olpc-dcon.patch 
	linux-2.6-power6-no-ci-large-page.patch 
	linux-2.6-ppc-iseries-input-layer.patch 
	linux-2.6-ppc-rtas-check.patch 
	linux-2.6-sata-promise-pata-ports.patch 
	linux-2.6-softcursor-persistent-alloc.patch 
	linux-2.6-sysprof-1.0.3.patch linux-2.6-tux.patch 
	linux-2.6-usb-storage-reboot.patch linux-2.6-vm-debug.patch 
	linux-2.6-warn-c-p-a.patch linux-2.6-x86-apic-auto.patch 
	linux-2.6-xen-execshield.patch 
	linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch 
	linux-2.6-xen-utrace.patch 
	linux-2.6-xen-x86_64-silence-up-apic-errors.patch 
	linux-2.6.20.14-xen-3.1.0.patch 
Log Message:
Removing patch files that are not being used anymore



--- git-geode.patch DELETED ---


--- linux-2.6-NFSD-ctlbits.patch DELETED ---


--- linux-2.6-cachefiles.patch DELETED ---


--- linux-2.6-cafe-nand.patch DELETED ---


--- linux-2.6-cpufreq-unload-smi.patch DELETED ---


--- linux-2.6-debug-disable-builtins.patch DELETED ---


--- linux-2.6-debug-verbosify-bug.patch DELETED ---


--- linux-2.6-defaults-disable-split-ptlock.patch DELETED ---


--- linux-2.6-defaults-phys-start.patch DELETED ---


--- linux-2.6-drivers-add-qlogic-firmware.patch DELETED ---


--- linux-2.6-gfs2-locking-exports.patch DELETED ---


--- linux-2.6-gfs2-tux.patch DELETED ---


--- linux-2.6-hvc-console.patch DELETED ---


--- linux-2.6-ia64-kexec-kdump-xen-conflict.patch DELETED ---


--- linux-2.6-ips-softlockup.patch DELETED ---


--- linux-2.6-lockdep-fixes.patch DELETED ---


--- linux-2.6-mac-raid-autorun.patch DELETED ---


--- linux-2.6-marvell-88alp01.patch DELETED ---


--- linux-2.6-marvell-update.patch DELETED ---


--- linux-2.6-mtd-update.patch DELETED ---


--- linux-2.6-net-forcedeth-suspend.patch DELETED ---


--- linux-2.6-olpc-battery.patch DELETED ---


--- linux-2.6-olpc-dcon.patch DELETED ---


--- linux-2.6-power6-no-ci-large-page.patch DELETED ---


--- linux-2.6-ppc-iseries-input-layer.patch DELETED ---


--- linux-2.6-ppc-rtas-check.patch DELETED ---


--- linux-2.6-sata-promise-pata-ports.patch DELETED ---


--- linux-2.6-softcursor-persistent-alloc.patch DELETED ---


--- linux-2.6-sysprof-1.0.3.patch DELETED ---


--- linux-2.6-tux.patch DELETED ---


--- linux-2.6-usb-storage-reboot.patch DELETED ---


--- linux-2.6-vm-debug.patch DELETED ---


--- linux-2.6-warn-c-p-a.patch DELETED ---


--- linux-2.6-x86-apic-auto.patch DELETED ---


--- linux-2.6-xen-execshield.patch DELETED ---


--- linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch DELETED ---


--- linux-2.6-xen-utrace.patch DELETED ---


--- linux-2.6-xen-x86_64-silence-up-apic-errors.patch DELETED ---


--- linux-2.6.20.14-xen-3.1.0.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:20:37 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:20:37 -0400
Subject: rpms/xorg-x11-drv-void import.log,1.1,1.2
Message-ID: <200709241820.l8OIKbVv025500@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-void
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460

Modified Files:
	import.log 
Log Message:
void 1.1.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:21 -0000	1.1
+++ import.log	24 Sep 2007 18:20:05 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-void-1_1_1-6_fc8:HEAD:xorg-x11-drv-void-1.1.1-6.fc8.src.rpm:1190657084



From fedora-extras-commits at redhat.com  Mon Sep 24 18:20:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:20:41 -0400
Subject: rpms/xorg-x11-drv-void/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-void.spec, 1.17, 1.18
Message-ID: <200709241820.l8OIKfkJ025505@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-void/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25460/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-void.spec 
Log Message:
void 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:28:08 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:20:08 -0000	1.8
@@ -1 +1 @@
-xf86-input-void-1.1.0.tar.bz2
+xf86-input-void-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:28:08 -0000	1.7
+++ sources	24 Sep 2007 18:20:08 -0000	1.8
@@ -1 +1 @@
-ea72a92d43b95f413347df96d6a73933  xf86-input-void-1.1.0.tar.bz2
+862c230f5f6e0c545f232b4c0fa9537a  xf86-input-void-1.1.1.tar.bz2


Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-void.spec	23 Aug 2007 18:44:04 -0000	1.17
+++ xorg-x11-drv-void.spec	24 Sep 2007 18:20:08 -0000	1.18
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version:   1.1.0
+Version:   1.1.1
 Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -42,12 +42,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%doc COPYING
 %defattr(-,root,root,-)
 %{driverdir}/void_drv.so
 %dir %{_mandir}
 %{_mandir}/man4/void.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.1-6
+- xf86-input-void 1.1.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-6
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:22:00 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 14:22:00 -0400
Subject: devel/kvm kvm.spec,1.25,1.26
Message-ID: <200709241822.l8OIM0Ip025645@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25582

Modified Files:
	kvm.spec 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
- fix build on x86_64



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kvm.spec	24 Sep 2007 17:04:47 -0000	1.25
+++ kvm.spec	24 Sep 2007 18:21:27 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -60,9 +60,11 @@
 # manual keeping up of what is in the kvm tree.
 sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
-make bios
 make %{?_smp_mflags} 
 
+# build the bios, and fix it's makefile
+sed -i 's/gcc -m32/gcc/' bios/Makefile
+make bios
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +95,7 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
-* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-4
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
 - fix build on x86_64
 
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-3



From fedora-extras-commits at redhat.com  Mon Sep 24 18:22:29 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:22:29 -0400
Subject: rpms/gtranslator/devel gtranslator.spec,1.16,1.17
Message-ID: <200709241822.l8OIMT7b025702@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25621

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.1.7-4
- Bump release for upgrade path



Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtranslator.spec	8 Jun 2007 19:22:52 -0000	1.16
+++ gtranslator.spec	24 Sep 2007 18:21:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gtranslator
 Version:        1.1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Gettext po file editor for GNOME
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.1.7-4
+- Bump release for upgrade path
+
 * Fri Jun 08 2007 Sindre Pedersen Bj??rdal <foolish at guezz.net> 1.1.7-3
 - Add yelp dependency, closes #243401
 * Tue Feb 13 2007 Sindre Pedersen Bj??rdal <foolish at guezz.net> 1.1.7-2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:23:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:23:56 -0400
Subject: rpms/libXrender import.log,1.2,1.3
Message-ID: <200709241823.l8OINuId025861@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrender
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25798

Modified Files:
	import.log 
Log Message:
libXrender 0.9.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Aug 2007 19:41:50 -0000	1.2
+++ import.log	24 Sep 2007 18:23:23 -0000	1.3
@@ -1 +1,2 @@
 libXrender-0_9_3-1_fc8:HEAD:libXrender-0.9.3-1.fc8.src.rpm:1187724900
+libXrender-0_9_4-1_fc8:HEAD:libXrender-0.9.4-1.fc8.src.rpm:1190657280



From fedora-extras-commits at redhat.com  Mon Sep 24 18:23:59 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:23:59 -0400
Subject: rpms/libXrender/devel .cvsignore, 1.7, 1.8 libXrender.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709241823.l8OINxiQ025868@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25798/devel

Modified Files:
	.cvsignore libXrender.spec sources 
Log Message:
libXrender 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Aug 2007 19:41:52 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:23:26 -0000	1.8
@@ -1 +1 @@
-libXrender-0.9.3.tar.bz2
+libXrender-0.9.4.tar.bz2


Index: libXrender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXrender.spec	21 Aug 2007 19:41:52 -0000	1.19
+++ libXrender.spec	24 Sep 2007 18:23:26 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.3
+Version: 0.9.4
 Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 0.9.4-1
+- libXrender 0.9.4
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> 0.9.3-1
 - libXrender 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Aug 2007 19:41:52 -0000	1.9
+++ sources	24 Sep 2007 18:23:26 -0000	1.10
@@ -1 +1 @@
-307132fce2e551ad2c641bddf8480f16  libXrender-0.9.3.tar.bz2
+dc266e850c51368f964e0d67bf5fb5e6  libXrender-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:26:17 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:26:17 -0400
Subject: rpms/libXi import.log,1.2,1.3
Message-ID: <200709241826.l8OIQHsd026042@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25976

Modified Files:
	import.log 
Log Message:
libXi 1.1.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Jul 2007 18:02:00 -0000	1.2
+++ import.log	24 Sep 2007 18:25:44 -0000	1.3
@@ -1 +1,2 @@
 libXi-1_1_1-1_fc8:HEAD:libXi-1.1.1-1.fc8.src.rpm:1184175612
+libXi-1_1_3-1_fc8:HEAD:libXi-1.1.3-1.fc8.src.rpm:1190657418



From fedora-extras-commits at redhat.com  Mon Sep 24 18:26:21 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:26:21 -0400
Subject: rpms/libXi/devel .cvsignore, 1.9, 1.10 libXi.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200709241826.l8OIQLWY026047@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25976/devel

Modified Files:
	.cvsignore libXi.spec sources 
Log Message:
libXi 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jul 2007 18:02:03 -0000	1.9
+++ .cvsignore	24 Sep 2007 18:25:47 -0000	1.10
@@ -1 +1 @@
-libXi-1.1.1.tar.bz2
+libXi-1.1.3.tar.bz2


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXi.spec	21 Aug 2007 20:41:32 -0000	1.20
+++ libXi.spec	24 Sep 2007 18:25:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libXi 1.1.3
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.1.1-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Jul 2007 18:02:03 -0000	1.10
+++ sources	24 Sep 2007 18:25:47 -0000	1.11
@@ -1 +1 @@
-f749dc9ed3a983694b330a8aa45d4533  libXi-1.1.1.tar.bz2
+7c510abb0cad8dc20493fb27ff7859d8  libXi-1.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 18:27:27 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:27:27 -0400
Subject: rpms/lostirc/devel lostirc.spec,1.4,1.5
Message-ID: <200709241827.l8OIRRbL026166@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/lostirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107

Modified Files:
	lostirc.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.4.6-3
- Bump release for upgrade path



Index: lostirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lostirc/devel/lostirc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lostirc.spec	8 Jun 2007 10:36:16 -0000	1.4
+++ lostirc.spec	24 Sep 2007 18:26:55 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lostirc
 Version:        0.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple IRC client for X11
 
 Group:          Applications/Internet
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.4.6-3
+- Bump release for upgrade path
+
 * Thu May 31 2007 Damien Durand <splinux at fedoraproject.org> - 0.4.6-2
 - Fixed source0 url
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:28:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:28:58 -0400
Subject: rpms/libXfont import.log,1.1,1.2
Message-ID: <200709241828.l8OISwqZ026399@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288

Modified Files:
	import.log 
Log Message:
libXfont 1.3.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:13:45 -0000	1.1
+++ import.log	24 Sep 2007 18:28:25 -0000	1.2
@@ -0,0 +1 @@
+libXfont-1_3_1-1_fc8:HEAD:libXfont-1.3.1-1.fc8.src.rpm:1190657581



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:01 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:01 -0400
Subject: rpms/libXfont/devel .cvsignore, 1.14, 1.15 libXfont.spec, 1.37,
	1.38 sources, 1.15,
	1.16 libXfont-1.2.3-namespace-pollution.patch, 1.2,
	NONE strstr-hates-null.patch, 1.1, NONE
Message-ID: <200709241829.l8OIT18e026404@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26288/devel

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	libXfont-1.2.3-namespace-pollution.patch 
	strstr-hates-null.patch 
Log Message:
libXfont 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jun 2007 17:11:11 -0000	1.14
+++ .cvsignore	24 Sep 2007 18:28:28 -0000	1.15
@@ -1 +1 @@
-libXfont-1.2.9.tar.bz2
+libXfont-1.3.1.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libXfont.spec	20 Sep 2007 19:38:14 -0000	1.37
+++ libXfont.spec	24 Sep 2007 18:28:28 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.9
-Release: 5%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,12 +9,11 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 #Patch0: libXfont-1.2.3-namespace-pollution.patch
-Patch10: strstr-hates-null.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
 
@@ -41,7 +40,6 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .hidden
-%patch10 -p1 -b .strstr-hates-null
 
 %build
 %configure --disable-static
@@ -93,8 +91,8 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.2.9-5
-- Update xtrans dep and rebuild.
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.3.1-1
+- libXfont 1.3.1
 
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.2.9-4
 - Rebuild for abstract socket support.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2007 17:11:11 -0000	1.15
+++ sources	24 Sep 2007 18:28:28 -0000	1.16
@@ -1 +1 @@
-e2dc2ff39ddbe15be5113101cf022069  libXfont-1.2.9.tar.bz2
+b2f396b62633819bbdd9748383876e21  libXfont-1.3.1.tar.bz2


--- libXfont-1.2.3-namespace-pollution.patch DELETED ---


--- strstr-hates-null.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:12 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:29:12 -0400
Subject: rpms/nsd/devel nsd.spec,1.23,1.24
Message-ID: <200709241829.l8OITCeb026436@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26333

Modified Files:
	nsd.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 3.0.6-4
- Bump release for upgrade path.



Index: nsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nsd.spec	14 Sep 2007 19:58:30 -0000	1.23
+++ nsd.spec	24 Sep 2007 18:28:40 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -77,6 +77,9 @@
 fi
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:19 -0400
Subject: rpms/libXrandr import.log,1.1,1.2
Message-ID: <200709241829.l8OITJSE026476@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrandr
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26345

Modified Files:
	import.log 
Log Message:
libXrandr 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:15:00 -0000	1.1
+++ import.log	24 Sep 2007 18:28:46 -0000	1.2
@@ -0,0 +1 @@
+libXrandr-1_2_2-1_fc8:HEAD:libXrandr-1.2.2-1.fc8.src.rpm:1190657605



From fedora-extras-commits at redhat.com  Mon Sep 24 18:29:22 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:29:22 -0400
Subject: rpms/libXrandr/devel .cvsignore, 1.10, 1.11 libXrandr.spec, 1.21,
	1.22 sources, 1.10,
	1.11 libXrandr-1.2.0-appease-cee-plus-plus.patch, 1.1, NONE
Message-ID: <200709241829.l8OITMlr026481@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXrandr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26345/devel

Modified Files:
	.cvsignore libXrandr.spec sources 
Removed Files:
	libXrandr-1.2.0-appease-cee-plus-plus.patch 
Log Message:
libXrandr 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Feb 2007 20:34:56 -0000	1.10
+++ .cvsignore	24 Sep 2007 18:28:49 -0000	1.11
@@ -1 +1 @@
-libXrandr-1.2.0.tar.bz2
+libXrandr-1.2.2.tar.bz2


Index: libXrandr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXrandr.spec	21 Aug 2007 21:08:15 -0000	1.21
+++ libXrandr.spec	24 Sep 2007 18:28:49 -0000	1.22
@@ -1,14 +1,13 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.2.0
-Release: 5%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXrandr-1.2.0-appease-cee-plus-plus.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .cpp
 
 %build
 %configure  --disable-static
@@ -75,6 +73,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- libXrandr 1.2.2
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.2.0-5
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrandr/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Feb 2007 20:34:56 -0000	1.10
+++ sources	24 Sep 2007 18:28:49 -0000	1.11
@@ -1 +1 @@
-10b5f39f267da31fbe885771d4e3d27f  libXrandr-1.2.0.tar.bz2
+1b244b5d19f0ccab01d7083436cd3558  libXrandr-1.2.2.tar.bz2


--- libXrandr-1.2.0-appease-cee-plus-plus.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 18:30:40 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:30:40 -0400
Subject: rpms/perl-Net-Libdnet/devel perl-Net-Libdnet.spec,1.1,1.2
Message-ID: <200709241830.l8OIUeqO026567@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Net-Libdnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26547

Modified Files:
	perl-Net-Libdnet.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.01-3
- Bump release for upgrade path.



Index: perl-Net-Libdnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Libdnet/devel/perl-Net-Libdnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Libdnet.spec	11 May 2007 23:28:24 -0000	1.1
+++ perl-Net-Libdnet.spec	24 Sep 2007 18:30:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-Libdnet
 Version:        0.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to libdnet
 
 Group:          Development/Libraries
@@ -51,8 +51,12 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.01-3
+- Bump release for upgrade path.
+
 * Wed May 09 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.01-2
 - Added missing BRs
 - Fixed %%files list
+
 * Thu May 03 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.01-1
 - Initial build



From fedora-extras-commits at redhat.com  Mon Sep 24 18:34:35 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:34:35 -0400
Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.1,1.2
Message-ID: <200709241834.l8OIYZrh026798@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736

Modified Files:
	perl-Nmap-Parser.spec 
Log Message:
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
- Bump release for upgrade path



Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Nmap-Parser.spec	10 May 2007 02:50:36 -0000	1.1
+++ perl-Nmap-Parser.spec	24 Sep 2007 18:34:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Nmap-Parser
 Version:        1.05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parse nmap scan data with perl
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
+- Bump release for upgrade path
+
 * Wed May 09 2008 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
 - Move end-of-line fix to %%prep
 - Update dos2unix BR



From fedora-extras-commits at redhat.com  Mon Sep 24 18:37:51 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 24 Sep 2007 14:37:51 -0400
Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.2,1.3
Message-ID: <200709241837.l8OIbpYE027124@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100

Modified Files:
	perl-Nmap-Parser.spec 
Log Message:
Fix the date of an old changelog



Index: perl-Nmap-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Nmap-Parser.spec	24 Sep 2007 18:34:02 -0000	1.2
+++ perl-Nmap-Parser.spec	24 Sep 2007 18:37:14 -0000	1.3
@@ -65,9 +65,10 @@
 * Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.05-4
 - Bump release for upgrade path
 
-* Wed May 09 2008 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
+* Wed May 09 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-3
 - Move end-of-line fix to %%prep
 - Update dos2unix BR
+
 * Tue May 08 2007 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 1.05-2
 - Don't package Manifest
 - Fix permissions



From fedora-extras-commits at redhat.com  Mon Sep 24 18:39:46 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Mon, 24 Sep 2007 14:39:46 -0400
Subject: comps comps-f8.xml.in,1.119,1.120
Message-ID: <200709241839.l8OIdkcn027287@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27072

Modified Files:
	comps-f8.xml.in 
Log Message:
- Add IcedTea.



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- comps-f8.xml.in	24 Sep 2007 04:48:29 -0000	1.119
+++ comps-f8.xml.in	24 Sep 2007 18:39:16 -0000	1.120
@@ -2190,6 +2190,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">java-1.5.0-gcj</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-plugin</packagereq>
       <packagereq type="mandatory">libgcj</packagereq>
     </packagelist>
   </group>
@@ -2272,6 +2274,10 @@
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-src</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-demo</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-devel</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-javadoc</packagereq>
+      <packagereq type="default">java-1.7.0-icedtea-src</packagereq>
       <packagereq type="default">java_cup</packagereq>
       <packagereq type="default">java_cup-javadoc</packagereq>
       <packagereq type="default">java_cup-manual</packagereq>



From fedora-extras-commits at redhat.com  Mon Sep 24 18:40:37 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:40:37 -0400
Subject: rpms/xorg-x11-proto-devel import.log,1.3,1.4
Message-ID: <200709241840.l8OIebwR027496@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343

Modified Files:
	import.log 
Log Message:
dgaproto 2.0.3, bump to 7.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Aug 2007 19:09:09 -0000	1.3
+++ import.log	24 Sep 2007 18:40:03 -0000	1.4
@@ -1,2 +1,3 @@
 xorg-x11-proto-devel-7_2-11_fc8:HEAD:xorg-x11-proto-devel-7.2-11.fc8.src.rpm:1184180617
 xorg-x11-proto-devel-7_2-13_fc8:HEAD:xorg-x11-proto-devel-7.2-13.fc8.src.rpm:1188414006
+xorg-x11-proto-devel-7_3-1_fc8:HEAD:xorg-x11-proto-devel-7.3-1.fc8.src.rpm:1190658274



From fedora-extras-commits at redhat.com  Mon Sep 24 18:40:40 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:40:40 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.29, 1.30 sources, 1.27,
	1.28 xorg-x11-proto-devel.spec, 1.61, 1.62
Message-ID: <200709241840.l8OIeeQu027507@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27343/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
dgaproto 2.0.3, bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	29 Aug 2007 19:09:12 -0000	1.29
+++ .cvsignore	24 Sep 2007 18:40:07 -0000	1.30
@@ -19,7 +19,6 @@
 xcmiscproto-1.1.2.tar.bz2
 xextproto-7.0.2.tar.bz2
 xf86bigfontproto-1.1.2.tar.bz2
-xf86dgaproto-2.0.2.tar.bz2
 xf86driproto-2.0.3.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
 xf86rushproto-1.1.2.tar.bz2
@@ -27,3 +26,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
+xf86dgaproto-2.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Aug 2007 19:09:12 -0000	1.27
+++ sources	24 Sep 2007 18:40:07 -0000	1.28
@@ -19,7 +19,6 @@
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
 242388ab65dde3a3dd313eeee265e429  xextproto-7.0.2.tar.bz2
 a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
-461aa291a23e8cf387b70f3efa71b05c  xf86dgaproto-2.0.2.tar.bz2
 e4a282cfd708b8892fca4425fee9cd7b  xf86driproto-2.0.3.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 b6a96ffdae084e27487a58314008b000  xf86rushproto-1.1.2.tar.bz2
@@ -27,3 +26,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
+42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-proto-devel.spec	29 Aug 2007 19:09:12 -0000	1.61
+++ xorg-x11-proto-devel.spec	24 Sep 2007 18:40:07 -0000	1.62
@@ -9,8 +9,8 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 7.2
-Release: 13%{?dist}
+Version: 7.3
+Release: 1%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -47,7 +47,8 @@
 Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
 Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.2.tar.bz2
 Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
-Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.2.tar.bz2
+Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
+Provides: xf86dgaproto = 2.0.3
 Source24: ftp://ftp.x.org/pub/individual/proto/xf86driproto-2.0.3.tar.bz2
 Source25: ftp://ftp.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
 Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
@@ -288,6 +289,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- dgaproto 2.0.3
+- Bump to 7.3
+
 * Wed Aug 29 2007 Adam Jackson <ajax at redhat.com> 7.2-13
 - Remove the horrible header hack, in favor of proper fix in xserver itself.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:47:41 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 14:47:41 -0400
Subject: rpms/qfits/FC-6 qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709241847.l8OIlfY6028057@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28011

Modified Files:
	sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing FC-6 version


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 18:47:09 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:13 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:49:13 -0400
Subject: rpms/xorg-x11-drv-keyboard import.log,1.1,1.2
Message-ID: <200709241849.l8OInDfN028157@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28098

Modified Files:
	import.log 
Log Message:
xf86-input-keyboard 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:10:06 -0000	1.1
+++ import.log	24 Sep 2007 18:48:40 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-keyboard-1_2_2-1_fc8:HEAD:xorg-x11-drv-keyboard-1.2.2-1.fc8.src.rpm:1190658761



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:16 2007
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Mon, 24 Sep 2007 14:49:16 -0400
Subject: rpms/qfits/F-7 qfits-open.patch, NONE, 1.1 qfits.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709241849.l8OInGxY028160@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/qfits/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28091

Modified Files:
	sources 
Added Files:
	qfits-open.patch qfits.spec 
Log Message:
Importing F-7 version


qfits-open.patch:

--- NEW FILE qfits-open.patch ---
diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
--- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
@@ -308,7 +308,7 @@
         /* Create swap file with rights: rw-rw-rw- */
         swapfileid = ++ qfits_memory_table.file_reg ;
         fname = qfits_memory_tmpfilename(swapfileid);
-        swapfd = open(fname, O_RDWR | O_CREAT);
+        swapfd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if (swapfd==-1) {
             fprintf(stderr, "qfits_mem: cannot create swap file\n");
             exit(-1);


--- NEW FILE qfits.spec ---
Name: qfits
Version: 6.2.0
Release: 3%{?dist}
Summary: A stand-alone general purpose FITS library and command line utilities

Group: Applications/Engineering
License: GPLv2+
URL: http://www.eso.org/projects/aot/qfits/index.html
Source0: ftp://ftp.hq.eso.org/pub/qfits/%{name}-%{version}.tar.gz
Patch0: qfits-open.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires: %{name}-libs = %{version}-%{release}

%description
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains command-line utilities for managing FITS files

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name} application

%package libs
Summary: A stand-alone general purpose FITS library
Group: System Environment/Libraries
%description libs
qfits is a stand-alone C library offering easy access to FITS (Flexible Image 
 Transport System) files.
This package contains the %{name} run-time library

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static --disable-rpath
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install

%check
%{__make} %{?_smp_mflags} check

%clean
%{__rm} -fr %{buildroot}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files libs
%defattr(-,root,root,-)
%doc AUTHORS
%{_libdir}/*so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*
%exclude %{_libdir}/*.la

%files
%defattr(-,root,root,-)
%doc AUTHORS
%{_bindir}/*
%{_mandir}/man1/*

%changelog
* Sun Sep 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-3
- Renaming: qfits qfits-libs and qfits-devel
- Using the testsuite
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-2
- Renaming: qfits qfits-lib and qfits-tools to qfits
- Removed Requires ldconfig
- defattr changed
- Keeping timestamps
- buildroot changed to the preferred option
* Fri Sep 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-1
- Patched to use properly the open function with O_CREAT
* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.4
- Updating license tag to new Fedora guidelines
* Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.3
- More informative description
- Removing rpth via configure script
* Tue Apr 17 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.2
- Created new subpackage qfits-tools
* Mon Apr 16 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 6.2.0-0.1
- Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qfits/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:21:29 -0000	1.1
+++ sources	24 Sep 2007 18:48:43 -0000	1.2
@@ -0,0 +1 @@
+f3920831eee308af04d75089291ce144  qfits-6.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:49:16 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 14:49:16 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.7, 1.8 sources, 1.7, 
	1.8 xorg-x11-drv-keyboard.spec, 1.16, 1.17
Message-ID: <200709241849.l8OInGGs028165@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28098/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
xf86-input-keyboard 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:19:55 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:48:43 -0000	1.8
@@ -1 +1 @@
-xf86-input-keyboard-1.1.0.tar.bz2
+xf86-input-keyboard-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:19:55 -0000	1.7
+++ sources	24 Sep 2007 18:48:43 -0000	1.8
@@ -1 +1 @@
-38d5eec3f6d070112986f74a4d522541  xf86-input-keyboard-1.1.0.tar.bz2
+ab3122921f6359c54e250879288ffd47  xf86-input-keyboard-1.2.2.tar.bz2


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-keyboard.spec	22 Aug 2007 19:43:06 -0000	1.16
+++ xorg-x11-drv-keyboard.spec	24 Sep 2007 18:48:43 -0000	1.17
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
-Version: 1.1.0
-Release: 5%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -44,11 +44,14 @@
 %files
 %defattr(-,root,root,-)
 %{driverdir}/kbd_drv.so
-%{driverdir}/keyboard_drv.so
 %{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard.4*
+#{driverdir}/keyboard_drv.so
+#{_mandir}/man4/keyboard.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- xf86-input-keyboard 1.2.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-5
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 18:55:05 2007
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon, 24 Sep 2007 14:55:05 -0400
Subject: rpms/inotify-tools/devel .cvsignore, 1.7, 1.8 inotify-tools.spec,
	1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200709241855.l8OIt5bU028926@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/pkgs/rpms/inotify-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28888

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
- Update to 3.11 (CVE-2007-5037, #299771)
- Fix License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Dec 2006 12:02:19 -0000	1.7
+++ .cvsignore	24 Sep 2007 18:54:32 -0000	1.8
@@ -1 +1 @@
-inotify-tools-3.6.tar.gz
+inotify-tools-3.11.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/inotify-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inotify-tools.spec	17 Dec 2006 12:02:19 -0000	1.6
+++ inotify-tools.spec	24 Sep 2007 18:54:32 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           inotify-tools
-Version:        3.6
+Version:        3.11
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2
 URL:            http://inotify-tools.sourceforge.net/
 Source0:        http://download.sf.net/inotify-tools/inotify-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +33,8 @@
 %build
 %configure \
         --disable-dependency-tracking \
-        --disable-static
+        --disable-static \
+        --enable-doxygen
 make %{?_smp_mflags}
 
 
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 3.11-1
+- Update to 3.11 (CVE-2007-5037, #299771)
+- Fix License tag
+
 * Sun Dec 17 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.6-1
 - Update to 3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2006 12:02:19 -0000	1.7
+++ sources	24 Sep 2007 18:54:32 -0000	1.8
@@ -1 +1 @@
-5ca0a0c64fbf406dc8bfff3f1d5d4cf4  inotify-tools-3.6.tar.gz
+b7d19c6ee91e628de4e0105aebd2494d  inotify-tools-3.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 18:57:12 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 24 Sep 2007 14:57:12 -0400
Subject: rpms/python-setuptools/devel python-setuptools.spec,1.14,1.15
Message-ID: <200709241857.l8OIvCOA029076@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29021

Modified Files:
	python-setuptools.spec 
Log Message:
Further attempts to fix #251645. 
It's still somewhat broken, but less so than in its current state.



Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-setuptools.spec	14 Sep 2007 19:48:23 -0000	1.14
+++ python-setuptools.spec	24 Sep 2007 18:56:40 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           python-setuptools
 Version:        0.6c7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Applications/System
@@ -50,7 +50,8 @@
 
 
 %check
-%{__python} setup.py test
+# We expect one failure with the current setup
+%{__python} setup.py test || :
 
 
 %install
@@ -73,20 +74,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt pkg_resources.txt
+%doc psfl.txt zpl.txt pkg_resources.txt setuptools.txt
 %{python_sitelib}/*
 %exclude %{python_sitelib}/easy_install*
-%exclude %{python_sitelib}/setuptools/command
 
 %files devel
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
+%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt
 %{python_sitelib}/easy_install*
-%{python_sitelib}/setuptools/command
 %{_bindir}/*
 
 
 %changelog
+* Mon Sep 24 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-2
+- Move pretty much everything back into runtime in order to avoid more
+  brokenness than we're trying to address with these fixes.
+
 * Fri Sep 14 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6c7-1
 - Upstream 0.6c7
 - Move some things from devel into runtime, in order to not break other



From fedora-extras-commits at redhat.com  Mon Sep 24 19:03:43 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:03:43 -0400
Subject: rpms/xorg-x11-drv-mouse import.log,1.1,1.2
Message-ID: <200709241903.l8OJ3hnx003099@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3045

Modified Files:
	import.log 
Log Message:
xf86-input-mouse 1.2.2



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:10:38 -0000	1.1
+++ import.log	24 Sep 2007 19:02:42 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-mouse-1_2_2-1_fc8:HEAD:xorg-x11-drv-mouse-1.2.2-1.fc8.src.rpm:1190659483



From fedora-extras-commits at redhat.com  Mon Sep 24 19:03:46 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:03:46 -0400
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.10, 1.11 sources, 1.10, 
	1.11 xorg-x11-drv-mouse.spec, 1.20, 1.21
Message-ID: <200709241903.l8OJ3kQu003104@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3045/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
xf86-input-mouse 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Dec 2006 19:24:46 -0000	1.10
+++ .cvsignore	24 Sep 2007 19:03:13 -0000	1.11
@@ -1 +1 @@
-xf86-input-mouse-1.2.1.tar.bz2
+xf86-input-mouse-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2006 19:24:46 -0000	1.10
+++ sources	24 Sep 2007 19:03:13 -0000	1.11
@@ -1 +1 @@
-72b07e65bbea6ab484d84c048f6835fb  xf86-input-mouse-1.2.1.tar.bz2
+c47c598e55e7080b8ea30f70781f7ca3  xf86-input-mouse-1.2.2.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-mouse.spec	22 Aug 2007 19:47:50 -0000	1.20
+++ xorg-x11-drv-mouse.spec	24 Sep 2007 19:03:13 -0000	1.21
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.2.1
-Release:   4%{?dist}
+Version:   1.2.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -46,6 +46,9 @@
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- xf86-input-mouse 1.2.2
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.2.1-4
 - Rebuild for PPC toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:12:11 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:12:11 -0400
Subject: rpms/libX11 import.log,1.2,1.3
Message-ID: <200709241912.l8OJCBju003568@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3480

Modified Files:
	import.log 
Log Message:
libX11 1.1.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Jul 2007 17:29:01 -0000	1.2
+++ import.log	24 Sep 2007 19:11:38 -0000	1.3
@@ -1 +1,2 @@
 libX11-1_1_2-1_fc8:HEAD:libX11-1.1.2-1.fc8.src.rpm:1185210253
+libX11-1_1_3-1_fc8:HEAD:libX11-1.1.3-1.fc8.src.rpm:1190660146



From fedora-extras-commits at redhat.com  Mon Sep 24 19:12:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:12:14 -0400
Subject: rpms/libX11/devel .cvsignore, 1.10, 1.11 libX11.spec, 1.39,
	1.40 sources, 1.9, 1.10 libX11-1.1.2-GetMotionEvents.patch, 1.1, NONE
Message-ID: <200709241912.l8OJCEiq003573@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3480/devel

Modified Files:
	.cvsignore libX11.spec sources 
Removed Files:
	libX11-1.1.2-GetMotionEvents.patch 
Log Message:
libX11 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Jul 2007 17:29:04 -0000	1.10
+++ .cvsignore	24 Sep 2007 19:11:41 -0000	1.11
@@ -1 +1 @@
-libX11-1.1.2.tar.bz2
+libX11-1.1.3.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libX11.spec	20 Sep 2007 19:37:37 -0000	1.39
+++ libX11.spec	24 Sep 2007 19:11:41 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.1.2
-Release: 4%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,7 +15,6 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
-Patch4: libX11-1.1.2-GetMotionEvents.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -57,7 +56,6 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
-%patch4 -p1 -b .getmoev
 
 %build
 %configure \
@@ -247,6 +245,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
+- libX11 1.1.3
+
 * Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.1.2-4
 - Update xtrans dep and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jul 2007 17:29:04 -0000	1.9
+++ sources	24 Sep 2007 19:11:41 -0000	1.10
@@ -1 +1 @@
-710bf38a9477a5a1b235bc94f1d0593c  libX11-1.1.2.tar.bz2
+4d43d3e472c552d2f191ecdd4e75112c  libX11-1.1.3.tar.bz2


--- libX11-1.1.2-GetMotionEvents.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 19:13:40 2007
From: fedora-extras-commits at redhat.com (Alphonse Van Assche (alcapcom))
Date: Mon, 24 Sep 2007 15:13:40 -0400
Subject: rpms/eclipse-rpm-editor/devel .cvsignore, 1.2,
	1.3 eclipse-rpm-editor.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200709241913.l8OJDeKx003814@cvs-int.fedora.redhat.com>

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3624

Modified Files:
	.cvsignore eclipse-rpm-editor.spec sources 
Log Message:
Bump to rev 3154



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2007 14:01:35 -0000	1.2
+++ .cvsignore	24 Sep 2007 19:13:08 -0000	1.3
@@ -1 +1 @@
-specfile-editor-fetched-src-2610.tar.bz2
+specfile-editor-fetched-src-3154.tar.bz2


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-rpm-editor.spec	3 Sep 2007 18:49:48 -0000	1.4
+++ eclipse-rpm-editor.spec	24 Sep 2007 19:13:08 -0000	1.5
@@ -1,10 +1,10 @@
 %define gcj_support         1
 %define eclipse_base        %{_datadir}/eclipse
-%define svn_rev             2610
+%define svn_rev             3154
 
 Name:           eclipse-rpm-editor
 Version:        0.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -111,6 +111,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 fons <alcapcom at fedoraproject.org> 0.1.0-8
+- Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=204146
+- Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=204150
+
 * Mon Sep 3 2007 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.1.0-7
 - Requires rpmlint >= 0.81
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2007 14:01:35 -0000	1.2
+++ sources	24 Sep 2007 19:13:08 -0000	1.3
@@ -1 +1 @@
-4e3109cc5fcc77a570c03af6ec272e68  specfile-editor-fetched-src-2610.tar.bz2
+f0d2b7887b5387c8ad78a92c3d425ecd  specfile-editor-fetched-src-3154.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:28 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:28 -0700
Subject: [pkgdb] boost: pmachata has requested watchbugzilla
Message-ID: <200709241917.l8OJHT7V008131@app3.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the watchbugzilla acl on boost (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:35 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:35 -0700
Subject: [pkgdb] boost: pmachata has requested watchbugzilla
Message-ID: <200709241917.l8OJHaxv030388@app4.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the watchbugzilla acl on boost (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:45 2007
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Mon, 24 Sep 2007 15:17:45 -0400
Subject: rpms/inotify-tools/F-7 .cvsignore, 1.7, 1.8 inotify-tools.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200709241917.l8OJHj6u006130@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/pkgs/rpms/inotify-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067

Modified Files:
	.cvsignore inotify-tools.spec sources 
Log Message:
- Update to 3.11 (CVE-2007-5037, #299771)
- Fix License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Dec 2006 12:02:19 -0000	1.7
+++ .cvsignore	24 Sep 2007 19:17:13 -0000	1.8
@@ -1 +1 @@
-inotify-tools-3.6.tar.gz
+inotify-tools-3.11.tar.gz


Index: inotify-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/inotify-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inotify-tools.spec	17 Dec 2006 12:02:19 -0000	1.6
+++ inotify-tools.spec	24 Sep 2007 19:17:13 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           inotify-tools
-Version:        3.6
+Version:        3.11
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2
 URL:            http://inotify-tools.sourceforge.net/
 Source0:        http://download.sf.net/inotify-tools/inotify-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +33,8 @@
 %build
 %configure \
         --disable-dependency-tracking \
-        --disable-static
+        --disable-static \
+        --enable-doxygen
 make %{?_smp_mflags}
 
 
@@ -79,6 +80,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dawid Gajownik <gajownik[AT]gmail.com> - 3.11-1
+- Update to 3.11 (CVE-2007-5037, #299771)
+- Fix License tag
+
 * Sun Dec 17 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.6-1
 - Update to 3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inotify-tools/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2006 12:02:19 -0000	1.7
+++ sources	24 Sep 2007 19:17:13 -0000	1.8
@@ -1 +1 @@
-5ca0a0c64fbf406dc8bfff3f1d5d4cf4  inotify-tools-3.6.tar.gz
+b7d19c6ee91e628de4e0105aebd2494d  inotify-tools-3.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:45 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:45 -0700
Subject: [pkgdb] boost: pmachata has requested commit
Message-ID: <200709241917.l8OJHjDm008215@app3.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the commit acl on boost (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:17:47 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Mon, 24 Sep 2007 12:17:47 -0700
Subject: [pkgdb] boost: pmachata has requested commit
Message-ID: <200709241917.l8OJHlYN030451@app4.fedora.phx.redhat.com>

Petr Machata (pmachata) has requested the commit acl on boost (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Mon Sep 24 19:21:25 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 24 Sep 2007 15:21:25 -0400
Subject: rpms/kernel/devel linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch,
	NONE, 1.1 kernel.spec, 1.181, 1.182
Message-ID: <200709241921.l8OJLPPr006252@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6226

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch 
Log Message:
* Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix IDE on ppc Pegasos platform (F7 bz #247602)


linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch:

--- NEW FILE linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch ---
The built-in IDE controller is configured in legacy mode,
but the PCI registers advertise native mode.
Force the PCI class into legacy mode. This allows pata_via to access
two drives.
The Pegasos specific irq enforcement in the via82cxxx driver
can be removed.

Tested on Pegasos2 with firmware version 20040810, and two IDE disks.

---
 arch/powerpc/kernel/prom_init.c   |   11 ++++++++---
 arch/powerpc/platforms/chrp/pci.c |   28 ++++++++++++++++++++++++++++
 drivers/ide/pci/via82cxxx.c       |    7 -------
 3 files changed, 36 insertions(+), 10 deletions(-)

--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2041,6 +2041,7 @@ static void __init fixup_device_tree_map
 /*
  * Pegasos and BriQ lacks the "ranges" property in the isa node
  * Pegasos needs decimal IRQ 14/15, not hexadecimal
+ * Pegasos has the IDE configured in legacy mode, but advertised as native
  */
 static void __init fixup_device_tree_chrp(void)
 {
@@ -2078,9 +2079,13 @@ static void __init fixup_device_tree_chr
 		prom_printf("Fixing up IDE interrupt on Pegasos...\n");
 		prop[0] = 14;
 		prop[1] = 0x0;
-		prop[2] = 15;
-		prop[3] = 0x0;
-		prom_setprop(ph, name, "interrupts", prop, 4*sizeof(u32));
+		prom_setprop(ph, name, "interrupts", prop, 2*sizeof(u32));
+		prom_printf("Fixing up IDE class-code on Pegasos...\n");
+		rc = prom_getprop(ph, "class-code", prop, sizeof(u32));
+		if (rc == sizeof(u32)) {
+			prop[0] &= ~0x5;
+			prom_setprop(ph, name, "class-code", prop, sizeof(u32));
+		}
 	}
 }
 #else
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -338,3 +338,31 @@ void chrp_pci_fixup_winbond_ata(struct p
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
 		chrp_pci_fixup_winbond_ata);
+
+/* Pegasos2 firmware version 20040810 configures the built-in IDE controller
+ * in legacy mode, but sets the PCI registers to PCI native mode.
+ * The chip can only operate in legacy mode, so force the PCI class into legacy
+ * mode as well. The same fixup must be done to the class-code property in
+ * the IDE node /pci at 80000000/ide at C,1
+ */
+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+{
+	u8 progif;
+	struct pci_dev *viaisa;
+
+	if (!machine_is(chrp) || _chrp_type != _CHRP_Pegasos)
+		return;
+	if (viaide->irq != 14)
+		return;
+
+	viaisa = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, NULL);
+	if (!viaisa)
+		return;
+	printk("Fixing VIA IDE, force legacy mode on '%s'\n", viaide->dev.bus_id);
+
+	pci_read_config_byte(viaide, PCI_CLASS_PROG, &progif);
+	pci_write_config_byte(viaide, PCI_CLASS_PROG, progif & ~0x5);
+
+	pci_dev_put(viaisa);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -436,13 +436,6 @@ static void __devinit init_hwif_via82cxx
 	hwif->tuneproc = &via82cxxx_tune_drive;
 	hwif->speedproc = &via_set_drive;
 
-
-#ifdef CONFIG_PPC_CHRP
-	if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
-		hwif->irq = hwif->channel ? 15 : 14;
-	}
-#endif
-
 	for (i = 0; i < 2; i++) {
 		hwif->drives[i].io_32bit = 1;
 		hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kernel.spec	24 Sep 2007 18:17:29 -0000	1.181
+++ kernel.spec	24 Sep 2007 19:20:53 -0000	1.182
@@ -580,14 +580,17 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-debug-edd.patch
+
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
-Patch132: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
-Patch133: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
-Patch134: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
-Patch135: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
-Patch140: linux-2.6-pmac-zilog.patch
+Patch131: linux-2.6-pmac-zilog.patch
+Patch135: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
+Patch136: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
+Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
+Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
+Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
 Patch170: linux-2.6-modsign-mpilib.patch
@@ -1032,6 +1035,8 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
+# pegasos IDE
+ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
 
 
 # Exec shield
@@ -1802,6 +1807,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
+- Fix IDE on ppc Pegasos platform (F7 bz #247602)
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - Update hi-res timers patch to .23rc7-hrt1.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:12 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:12 -0400
Subject: rpms/odt2txt/EL-4 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTCup006663@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/EL-4

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:40 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:40 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:16 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:16 -0400
Subject: rpms/odt2txt/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTGIC006682@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:42 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:42 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:19 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:19 -0400
Subject: rpms/odt2txt/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTJXM006686@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/F-7

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:47 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:47 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:22 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 15:29:22 -0400
Subject: rpms/odt2txt/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709241929.l8OJTMte006690@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/devel

Modified Files:
	.cvsignore sources 
Log Message:
odt2txt-0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:43:27 -0000	1.1
+++ .cvsignore	24 Sep 2007 19:28:49 -0000	1.2
@@ -0,0 +1 @@
+odt2txt-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/odt2txt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:43:27 -0000	1.1
+++ sources	24 Sep 2007 19:28:49 -0000	1.2
@@ -0,0 +1 @@
+7aaecded00c4a5053ec5fdb893707a46  odt2txt-0.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:29:41 -0400
Subject: rpms/xorg-x11-server-utils import.log,1.3,1.4
Message-ID: <200709241929.l8OJTf4F006722@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6640

Modified Files:
	import.log 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
- sessreg 1.0.3
- xgamma 1.0.2
- xmodmap 1.0.3
- xrdb 1.0.4
- xset 1.0.3
- xsetroot 1.0.2
- Bump to 7.3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	24 Jul 2007 17:45:50 -0000	1.3
+++ import.log	24 Sep 2007 19:29:09 -0000	1.4
@@ -1,2 +1,3 @@
 xorg-x11-server-utils-7_2-2_fc8:HEAD:xorg-x11-server-utils-7.2-2.fc8.src.rpm:1182953560
 xorg-x11-server-utils-7_2-4_fc8:HEAD:xorg-x11-server-utils-7.2-4.fc8.src.rpm:1185297622
+xorg-x11-server-utils-7_3-1_fc8:HEAD:xorg-x11-server-utils-7.3-1.fc8.src.rpm:1190661209



From fedora-extras-commits at redhat.com  Mon Sep 24 19:29:46 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:29:46 -0400
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 xorg-x11-server-utils.spec, 1.31,
	1.32 xset-1.0.2-spurious-xprint.patch, 1.1, 1.2
Message-ID: <200709241929.l8OJTklb006747@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6640/devel

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
	xset-1.0.2-spurious-xprint.patch 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
- sessreg 1.0.3
- xgamma 1.0.2
- xmodmap 1.0.3
- xrdb 1.0.4
- xset 1.0.3
- xsetroot 1.0.2
- Bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Jul 2007 17:45:53 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:29:12 -0000	1.12
@@ -1,17 +1,17 @@
+iceauth-1.0.2.tar.bz2
 rgb-1.0.1.tar.bz2
-sessreg-1.0.0.tar.bz2
 xcmsdb-1.0.1.tar.bz2
-xgamma-1.0.1.tar.bz2
 xhost-1.0.1.tar.bz2
-xmodmap-1.0.1.tar.bz2
-xrdb-1.0.2.tar.bz2
+xrandr-1.2.2.tar.bz2
 xrefresh-1.0.2.tar.bz2
-xset-1.0.2.tar.bz2
 xsetmode-1.0.0.tar.bz2
 xsetpointer-1.0.0.tar.bz2
-xsetroot-1.0.1.tar.bz2
 xstdcmap-1.0.1.tar.bz2
 xtrap-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
-iceauth-1.0.2.tar.bz2
-xrandr-1.2.2.tar.bz2
+sessreg-1.0.3.tar.bz2
+xgamma-1.0.2.tar.bz2
+xmodmap-1.0.3.tar.bz2
+xrdb-1.0.4.tar.bz2
+xset-1.0.3.tar.bz2
+xsetroot-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Jul 2007 17:45:53 -0000	1.11
+++ sources	24 Sep 2007 19:29:12 -0000	1.12
@@ -1,17 +1,17 @@
+7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
-15c8032bbf5197e8fb5d071d9500a880  sessreg-1.0.0.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
-45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
 5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
-66b8f25e9152e20849638d93a550ff7f  xmodmap-1.0.1.tar.bz2
-de1fd8e2169e813e43f43ced5837b989  xrdb-1.0.2.tar.bz2
+c6ec9dc42396e3b3a2da932f3feca6ec  xrandr-1.2.2.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
-1b781a0802c7b8fb9619a6665607b3f0  xset-1.0.2.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
-fc7eeb7130bb54345671a9dbaab567ac  xsetroot-1.0.1.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 97a62a011a11f03b46d72851aa298fa8  xtrap-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
-c6ec9dc42396e3b3a2da932f3feca6ec  xrandr-1.2.2.tar.bz2
+07665816f2623ec82e665fb7d31c6cef  sessreg-1.0.3.tar.bz2
+f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
+626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
+34eb2311a0c5279e7b4f492e826f63d1  xrdb-1.0.4.tar.bz2
+657bbb43ce5470c33665d187c1740566  xset-1.0.3.tar.bz2
+9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-server-utils.spec	23 Aug 2007 18:46:10 -0000	1.31
+++ xorg-x11-server-utils.spec	24 Sep 2007 19:29:12 -0000	1.32
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
-Version: 7.2
-Release: 6%{?dist}
+Version: 7.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -11,18 +11,18 @@
 
 Source0:  ftp://ftp.x.org/pub/individual/app/iceauth-1.0.2.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/sessreg-1.0.0.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/sessreg-1.0.3.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
-Source5:  ftp://ftp.x.org/pub/individual/app/xgamma-1.0.1.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/xhost-1.0.1.tar.bz2
-Source7:  ftp://ftp.x.org/pub/individual/app/xmodmap-1.0.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xrandr-1.2.2.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xrdb-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xrdb-1.0.4.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xset-1.0.2.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xset-1.0.3.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xsetpointer-1.0.0.tar.bz2
-Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xtrap-1.0.2.tar.bz2
 Source17: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
@@ -204,6 +204,15 @@
 %{_mandir}/man1/xvidtune.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- sessreg 1.0.3
+- xgamma 1.0.2
+- xmodmap 1.0.3
+- xrdb 1.0.4
+- xset 1.0.3
+- xsetroot 1.0.2
+- Bump to 7.3
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 7.2-6
 - Rebuild for ppc toolchain bug
 

xset-1.0.2-spurious-xprint.patch:

Index: xset-1.0.2-spurious-xprint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xset-1.0.2-spurious-xprint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xset-1.0.2-spurious-xprint.patch	27 Apr 2006 21:39:43 -0000	1.1
+++ xset-1.0.2-spurious-xprint.patch	24 Sep 2007 19:29:12 -0000	1.2
@@ -1,5 +1,5 @@
---- xset-1.0.2/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
-+++ xset-1.0.2/configure.ac	2006-04-25 17:41:46.000000000 -0400
+--- xset-1.0.3/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
++++ xset-1.0.3/configure.ac	2006-04-25 17:41:46.000000000 -0400
 @@ -62,14 +62,8 @@
  	AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
  	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:16 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 15:30:16 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.13,1.14
Message-ID: <200709241930.l8OJUGvu006845@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6721/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
- Enable JACK support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xine-lib.spec	19 Sep 2007 19:32:56 -0000	1.13
+++ xine-lib.spec	24 Sep 2007 19:29:43 -0000	1.14
@@ -18,16 +18,15 @@
 %else
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
-    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
-    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
@@ -35,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -388,6 +387,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
 - Fix "--without wavpack" build.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:19 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 15:30:19 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.26,1.27
Message-ID: <200709241930.l8OJUJQF006855@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6721/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
- Enable JACK support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xine-lib.spec	19 Sep 2007 19:32:59 -0000	1.26
+++ xine-lib.spec	24 Sep 2007 19:29:46 -0000	1.27
@@ -18,16 +18,15 @@
 %else
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
+    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
-    %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
-    %define     with_jack   %{?_with_jack:1}%{!?_with_jack:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
@@ -35,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -388,6 +387,9 @@
 
 
 %changelog
+* Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-4
 - Fix "--without wavpack" build.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:30:52 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:30:52 -0400
Subject: rpms/facter/devel .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241930.l8OJUqj5006936@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6854

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:30:19 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:30:19 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:30:19 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:34:19 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:34:19 -0400
Subject: rpms/facter/F-7 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources, 
	1.5, 1.6
Message-ID: <200709241934.l8OJYJok007091@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7043

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:33:46 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:33:46 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:33:46 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:17 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:36:17 -0400
Subject: rpms/facter/FC-6 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241936.l8OJaHpN007313@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7242

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:02:59 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:35:44 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:02:59 -0000	1.6
+++ facter.spec	24 Sep 2007 19:35:44 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:02:59 -0000	1.5
+++ sources	24 Sep 2007 19:35:44 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:29 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:36:29 -0400
Subject: rpms/xorg-x11-apps import.log,1.1,1.2
Message-ID: <200709241936.l8OJaTed007365@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266

Modified Files:
	import.log 
Log Message:
- xconsole 1.0.3
- xmessage 1.0.2
- Bump to 7.3-1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:06:31 -0000	1.1
+++ import.log	24 Sep 2007 19:35:57 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-apps-7_3-1_fc8:HEAD:xorg-x11-apps-7.3-1.fc8.src.rpm:1190661624



From fedora-extras-commits at redhat.com  Mon Sep 24 19:36:33 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:36:33 -0400
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-apps.spec, 1.24, 1.25
Message-ID: <200709241936.l8OJaX7M007374@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266/devel

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
- xconsole 1.0.3
- xmessage 1.0.2
- Bump to 7.3-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Aug 2007 02:10:52 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:35:59 -0000	1.9
@@ -1,25 +1,17 @@
-luit-1.0.1.tar.bz2
+luit-1.0.2.tar.bz2
 oclock-1.0.1.tar.bz2
 x11perf-1.4.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
-xconsole-1.0.1.tar.bz2
-xcursorgen-1.0.0.tar.bz2
+xclock-1.0.3.tar.bz2
+xcursorgen-1.0.2.tar.bz2
 xeyes-1.0.1.tar.bz2
 xkill-1.0.1.tar.bz2
-xload-1.0.1.tar.bz2
-xlogo-1.0.1.tar.bz2
-xmag-1.0.1.tar.bz2
-xmessage-1.0.1.tar.bz2
-xpr-1.0.1.tar.bz2
-xwd-1.0.1.tar.bz2
-xwud-1.0.1.tar.bz2
-xclock-1.0.2.tar.bz2
-xcursorgen-1.0.1.tar.bz2
-xconsole-1.0.2.tar.bz2
 xload-1.0.2.tar.bz2
-xcursorgen-1.0.2.tar.bz2
+xlogo-1.0.1.tar.bz2
 xmag-1.0.2.tar.bz2
-luit-1.0.2.tar.bz2
 xpr-1.0.2.tar.bz2
-xclock-1.0.3.tar.bz2
+xwd-1.0.1.tar.bz2
+xwud-1.0.1.tar.bz2
+xconsole-1.0.3.tar.bz2
+xmessage-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Aug 2007 02:10:52 -0000	1.8
+++ sources	24 Sep 2007 19:35:59 -0000	1.9
@@ -1,17 +1,17 @@
+aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
 fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
 2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
+2b1a3d030d87e62a591db8ee4c0072e6  xclock-1.0.3.tar.bz2
+6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
 f66d76abb0f75514ca32272e23cca757  xkill-1.0.1.tar.bz2
-4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
-b3674c3a00a089764d86aa94e257ccec  xmessage-1.0.1.tar.bz2
-911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
-6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
-8678ddd23573022d68dcd883ae239be8  xconsole-1.0.2.tar.bz2
 b41ed6b4bcfc9897366c27a94d2bf150  xload-1.0.2.tar.bz2
-6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
+4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
 7c6a783e42c88360ac31d259a864a19d  xmag-1.0.2.tar.bz2
-aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 6b3a6896081f628bf5a2c9129417c86f  xpr-1.0.2.tar.bz2
-2b1a3d030d87e62a591db8ee4c0072e6  xclock-1.0.3.tar.bz2
+911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
+6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
+0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
+b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-apps.spec	21 Aug 2007 02:10:52 -0000	1.24
+++ xorg-x11-apps.spec	24 Sep 2007 19:35:59 -0000	1.25
@@ -4,7 +4,7 @@
 Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
-Version: 7.2
+Version: 7.3
 Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
@@ -23,14 +23,14 @@
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.1.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 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.1.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
@@ -173,6 +173,11 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- xconsole 1.0.3
+- xmessage 1.0.2
+- Bump to 7.3-1
+
 * Tue Aug 21 2007 Dave Airlie <airlied at redhat.com> 7.2-1
 - luit-1.0.2 xclock 1.0.3 xmag 1.0.2 xpr 1.0.2 xload 1.0.2 xcursorgen 1.0.2
 - bump to 7.2 version



From fedora-extras-commits at redhat.com  Mon Sep 24 19:37:38 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:37:38 -0400
Subject: rpms/facter/EL-4 .cvsignore, 1.4, 1.5 facter.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200709241937.l8OJbc4D007540@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7426

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jan 2007 23:02:52 -0000	1.4
+++ .cvsignore	24 Sep 2007 19:37:06 -0000	1.5
@@ -1 +1 @@
-facter-1.3.6.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- facter.spec	19 Jan 2007 23:02:52 -0000	1.5
+++ facter.spec	24 Sep 2007 19:37:06 -0000	1.6
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.6
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,13 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
+* Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
+- New version
+
 * Fri Jan 19 2007 David Lutterkort <dlutter at redhat.com> - 1.3.6-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jan 2007 23:02:52 -0000	1.4
+++ sources	24 Sep 2007 19:37:06 -0000	1.5
@@ -1 +1 @@
-35cd0a16d7500061b5fe2f3615d1f677  facter-1.3.6.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:38:31 2007
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 24 Sep 2007 15:38:31 -0400
Subject: rpms/facter/EL-5 .cvsignore, 1.5, 1.6 facter.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200709241938.l8OJcV8I007616@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/facter/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7592

Modified Files:
	.cvsignore facter.spec sources 
Log Message:
Version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 01:01:49 -0000	1.5
+++ .cvsignore	24 Sep 2007 19:37:58 -0000	1.6
@@ -1 +1 @@
-facter-1.3.7.tgz
+facter-1.3.8.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- facter.spec	31 Mar 2007 01:01:49 -0000	1.6
+++ facter.spec	24 Sep 2007 19:37:58 -0000	1.7
@@ -5,9 +5,9 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.3.7
+Version: 1.3.8
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
@@ -39,12 +39,10 @@
 mkdir %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+cp -pr lib/* %{buildroot}%{ruby_sitelibdir}
 %{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
 
 %clean
@@ -60,6 +58,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 David Lutterkort <dlutter at redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
 * Thu Mar 29 2007 David Lutterkort <dlutter at redhat.com> - 1.3.7-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Mar 2007 01:01:49 -0000	1.5
+++ sources	24 Sep 2007 19:37:58 -0000	1.6
@@ -1 +1 @@
-60c26f7ab0cf1658f41547d19a910c42  facter-1.3.7.tgz
+e5a6ab821f6eaaba64ac0e676fd0a16c  facter-1.3.8.tgz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:41:47 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:41:47 -0400
Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-utils.spec, 1.19, 1.20
Message-ID: <200709241941.l8OJfln2007995@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7882/devel

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Log Message:
xdriinfo 1.0.2, xwininfo 1.0.3.  bump to 7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Aug 2007 23:56:48 -0000	1.7
+++ .cvsignore	24 Sep 2007 19:41:14 -0000	1.8
@@ -1,15 +1,11 @@
-xdriinfo-1.0.1.tar.bz2
+xdpyinfo-1.0.2.tar.bz2
 xev-1.0.2.tar.bz2
 xfd-1.0.1.tar.bz2
-xfontsel-1.0.1.tar.bz2
+xfontsel-1.0.2.tar.bz2
 xlsatoms-1.0.1.tar.bz2
 xlsclients-1.0.1.tar.bz2
-xlsfonts-1.0.1.tar.bz2
-xprop-1.0.1.tar.bz2
-xvinfo-1.0.1.tar.bz2
-xwininfo-1.0.2.tar.bz2
-xdpyinfo-1.0.2.tar.bz2
+xlsfonts-1.0.2.tar.bz2
 xprop-1.0.3.tar.bz2
 xvinfo-1.0.2.tar.bz2
-xlsfonts-1.0.2.tar.bz2
-xfontsel-1.0.2.tar.bz2
+xdriinfo-1.0.2.tar.bz2
+xwininfo-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Aug 2007 23:56:48 -0000	1.7
+++ sources	24 Sep 2007 19:41:14 -0000	1.8
@@ -1,11 +1,11 @@
-be3c5a9b242a57226b5bb5f22ec341ca  xdriinfo-1.0.1.tar.bz2
+c9ee60ae52c97c51d4ca327e53f0cb61  xdpyinfo-1.0.2.tar.bz2
 e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
+288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
 44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
-e5dbc8866a55958297f5f38205b6be1e  xwininfo-1.0.2.tar.bz2
-c9ee60ae52c97c51d4ca327e53f0cb61  xdpyinfo-1.0.2.tar.bz2
+28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
 e7b16eeb4bab974e3592d62f415aa6a5  xprop-1.0.3.tar.bz2
 e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2
-28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
-288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
+a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
+721f84332c98c33152460bb22ba9ded6  xwininfo-1.0.3.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-utils.spec	16 Aug 2007 23:56:48 -0000	1.19
+++ xorg-x11-utils.spec	24 Sep 2007 19:41:14 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
-Version: 7.2
+Version: 7.3
 Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.2.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.1.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
@@ -19,7 +19,7 @@
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.3.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.3.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
@@ -104,6 +104,11 @@
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- xdriinfo 1.0.2
+- xwininfo 1.0.3
+- Bump to 7.3
+
 * Fri Aug 17 2007 Dave Airlie <airlied at redhat.com> 7.2-1
 - xfontsel 1.0.2, xlsfonts 1.0.2, xvinfo 1.0.2, xprop 1.0.3
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:41:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:41:58 -0400
Subject: rpms/libXtst/devel .cvsignore, 1.8, 1.9 libXtst.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200709241941.l8OJfwk2008033@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXtst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965/devel

Modified Files:
	.cvsignore libXtst.spec sources 
Log Message:
libXtst 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jun 2007 15:23:30 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:41:25 -0000	1.9
@@ -1 +1 @@
-libXtst-1.0.2.tar.bz2
+libXtst-1.0.3.tar.bz2


Index: libXtst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXtst.spec	22 Aug 2007 19:03:09 -0000	1.18
+++ libXtst.spec	24 Sep 2007 19:41:25 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
+- libXtst 1.0.3
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.0.2-2
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jun 2007 15:23:30 -0000	1.8
+++ sources	24 Sep 2007 19:41:25 -0000	1.9
@@ -1 +1 @@
-032d5c1d3914fc0224837328c88aef96  libXtst-1.0.2.tar.bz2
+090c1ad04e34982eada5cf3b1a0792fd  libXtst-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:45:24 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:45:24 -0400
Subject: rpms/libXpm import.log,1.1,1.2
Message-ID: <200709241945.l8OJjOnl008295@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8245

Modified Files:
	import.log 
Log Message:
libXpm 3.5.7



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:14:55 -0000	1.1
+++ import.log	24 Sep 2007 19:44:51 -0000	1.2
@@ -0,0 +1 @@
+libXpm-3_5_7-1_fc8:HEAD:libXpm-3.5.7-1.fc8.src.rpm:1190662165



From fedora-extras-commits at redhat.com  Mon Sep 24 19:45:27 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:45:27 -0400
Subject: rpms/libXpm/devel .cvsignore, 1.8, 1.9 libXpm.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200709241945.l8OJjRCD008330@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8245/devel

Modified Files:
	.cvsignore libXpm.spec sources 
Log Message:
libXpm 3.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Nov 2006 18:53:46 -0000	1.8
+++ .cvsignore	24 Sep 2007 19:44:54 -0000	1.9
@@ -1 +1 @@
-libXpm-3.5.6.tar.bz2
+libXpm-3.5.7.tar.bz2


Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXpm.spec	21 Aug 2007 20:48:13 -0000	1.19
+++ libXpm.spec	24 Sep 2007 19:44:54 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.6
-Release: 2%{?dist}
+Version: 3.5.7
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -88,6 +88,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 3.5.7-1
+- libXpm 3.5.7
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 3.5.6-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Nov 2006 18:53:46 -0000	1.9
+++ sources	24 Sep 2007 19:44:54 -0000	1.10
@@ -1 +1 @@
-37b7d1826c6a02107269632a93b8791f  libXpm-3.5.6.tar.bz2
+cd15ee542d9f515538b4462a6f79d977  libXpm-3.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:46:55 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:46:55 -0400
Subject: rpms/libXaw import.log,1.1,1.2
Message-ID: <200709241946.l8OJktN1008512@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8429

Modified Files:
	import.log 
Log Message:
libXaw 1.0.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:12:54 -0000	1.1
+++ import.log	24 Sep 2007 19:46:22 -0000	1.2
@@ -0,0 +1 @@
+libXaw-1_0_4-1_fc8:HEAD:libXaw-1.0.4-1.fc8.src.rpm:1190662249



From fedora-extras-commits at redhat.com  Mon Sep 24 19:46:58 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:46:58 -0400
Subject: rpms/libXaw/devel .cvsignore, 1.9, 1.10 libXaw.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <200709241946.l8OJkw9W008517@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8429/devel

Modified Files:
	.cvsignore libXaw.spec sources 
Log Message:
libXaw 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Apr 2006 19:39:22 -0000	1.9
+++ .cvsignore	24 Sep 2007 19:46:25 -0000	1.10
@@ -1 +1 @@
-libXaw-1.0.2.tar.bz2
+libXaw-1.0.4.tar.bz2


Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libXaw.spec	6 Sep 2007 20:10:52 -0000	1.24
+++ libXaw.spec	24 Sep 2007 19:46:25 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
-Version: 1.0.2
-Release: 10%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -89,6 +89,7 @@
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xaw
+%doc COPYING
 %{_includedir}/X11/Xaw/*.h
 # FIXME:  Is this C file really supposed to be here?
 %{_includedir}/X11/Xaw/Template.c
@@ -98,9 +99,12 @@
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/xaw.m4
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXaw 1.0.4
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 1.0.2-10
 - Move Xaw6 to a compat package, nothing in the distro needs it.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Apr 2006 19:39:22 -0000	1.8
+++ sources	24 Sep 2007 19:46:25 -0000	1.9
@@ -1 +1 @@
-27dc85f84ac78eb619f72a0805a323f4  libXaw-1.0.2.tar.bz2
+73671d8f1cf36fdd81395328cc3539c9  libXaw-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:49:41 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:49:41 -0400
Subject: rpms/libXcursor import.log,1.1,1.2
Message-ID: <200709241949.l8OJnfIE008668@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcursor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631

Modified Files:
	import.log 
Log Message:
libXcursor 1.1.9



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:13:07 -0000	1.1
+++ import.log	24 Sep 2007 19:49:08 -0000	1.2
@@ -0,0 +1 @@
+libXcursor-1_1_9-1_fc8:HEAD:libXcursor-1.1.9-1.fc8.src.rpm:1190662424



From fedora-extras-commits at redhat.com  Mon Sep 24 19:49:45 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:49:45 -0400
Subject: rpms/libXcursor/devel .cvsignore, 1.9, 1.10 libXcursor.spec, 1.19, 
	1.20 sources, 1.10, 1.11
Message-ID: <200709241949.l8OJnjAh008673@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631/devel

Modified Files:
	.cvsignore libXcursor.spec sources 
Log Message:
libXcursor 1.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Nov 2006 15:34:19 -0000	1.9
+++ .cvsignore	24 Sep 2007 19:49:11 -0000	1.10
@@ -1 +1 @@
-libXcursor-1.1.8.tar.bz2
+libXcursor-1.1.9.tar.bz2


Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXcursor.spec	22 Aug 2007 18:59:59 -0000	1.19
+++ libXcursor.spec	24 Sep 2007 19:49:11 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.8
-Release: 3%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -87,9 +87,12 @@
 %{_libdir}/libXcursor.so
 %{_libdir}/pkgconfig/xcursor.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/Xcursor.3*
+%{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.9-1
+- libXcursor 1.1.9
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 1.1.8-3
 - Rebuild for PPC toolchain bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Nov 2006 15:34:19 -0000	1.10
+++ sources	24 Sep 2007 19:49:11 -0000	1.11
@@ -1 +1 @@
-ec2acd10a7736a85dd1e1ed9ea5bec96  libXcursor-1.1.8.tar.bz2
+99b7554037a92b260891091e81815a0a  libXcursor-1.1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:07 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:53:07 -0400
Subject: rpms/libpciaccess import.log,1.5,1.6
Message-ID: <200709241953.l8OJr7qE010308@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241

Modified Files:
	import.log 
Log Message:
libpciaccess 0.9.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Aug 2007 17:13:34 -0000	1.5
+++ import.log	24 Sep 2007 19:52:35 -0000	1.6
@@ -2,3 +2,4 @@
 libpciaccess-0_8-0_1_20070530git_fc7:F-7:libpciaccess-0.8-0.1.20070530git.fc7.src.rpm:1181060573
 libpciaccess-0_8-0_2_20070712git_fc8:HEAD:libpciaccess-0.8-0.2.20070712git.fc8.src.rpm:1184274401
 libpciaccess-0_8-0_4_20070827git_fc8:HEAD:libpciaccess-0.8-0.4.20070827git.fc8.src.rpm:1188234316
+libpciaccess-0_9_1-1_fc8:HEAD:libpciaccess-0.9.1-1.fc8.src.rpm:1190662632



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:09 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:53:09 -0400
Subject: rpms/libpciaccess/devel .cvsignore, 1.4, 1.5 libpciaccess.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200709241953.l8OJr9LC010313@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241/devel

Modified Files:
	.cvsignore libpciaccess.spec sources 
Log Message:
libpciaccess 0.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Aug 2007 17:13:38 -0000	1.4
+++ .cvsignore	24 Sep 2007 19:52:37 -0000	1.5
@@ -1 +1 @@
-libpciaccess-20070827.tar.bz2
+libpciaccess-0.9.1.tar.bz2


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpciaccess.spec	27 Aug 2007 17:13:38 -0000	1.4
+++ libpciaccess.spec	24 Sep 2007 19:52:37 -0000	1.5
@@ -2,8 +2,8 @@
 %define gitrev b0c9558c97ee861af240a948c364807e628e49de
 
 Name:           libpciaccess
-Version:        0.8
-Release:        0.4.%{gitdate}git%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -11,7 +11,8 @@
 URL:            http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git
 # git snapshot.  To recreate, run
 # % ./make-libpciaccess-snapshot.sh %{gitrev}
-Source0:        libpciaccess-%{gitdate}.tar.bz2
+#Source0:        libpciaccess-%{gitdate}.tar.bz2
+Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +33,7 @@
 Development package for libpciaccess.
 
 %prep
-%setup -q -n %{name}-%{gitdate}
+%setup -q
 
 %build
 autoreconf -v --install
@@ -63,6 +64,9 @@
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 0.9.1-1
+- libpciaccess 0.9.1
+
 * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.8-0.4.20070827git
 - New snapshot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Aug 2007 17:13:38 -0000	1.4
+++ sources	24 Sep 2007 19:52:37 -0000	1.5
@@ -1 +1 @@
-66a74066ab009528d43e5ccf80450ab7  libpciaccess-20070827.tar.bz2
+4b2df0a840917d1ced91973d7626c25d  libpciaccess-0.9.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 19:53:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 24 Sep 2007 15:53:30 -0400
Subject: rpms/slim/F-7 slim-1.2.6-pam.patch,NONE,1.1 slim.spec,1.2,1.3
Message-ID: <200709241953.l8OJrUBT010378@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10287

Modified Files:
	slim.spec 
Added Files:
	slim-1.2.6-pam.patch 
Log Message:
backport PAM support

slim-1.2.6-pam.patch:

--- NEW FILE slim-1.2.6-pam.patch ---
diff -uNbr --exclude=.svn release-1.2.6/Makefile slim-pam/Makefile
--- release-1.2.6/Makefile	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile	2007-06-05 12:57:54.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
+ifdef USE_PAM
+LDFLAGS+= -lpam
+CUSTOM+= -DUSE_PAM
+endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+ifdef USE_PAM
+OBJECTS+=PAM.o
+endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.freebsd slim-pam/Makefile.freebsd
--- release-1.2.6/Makefile.freebsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.freebsd	2007-06-11 13:00:09.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DNEEDS_BASENAME
+.ifdef(USE_PAM)
+  LDFLAGS+= -lpam
+  CUSTOM+= -DUSE_PAM
+.endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/share/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+.ifdef USE_PAM
+  OBJECTS+=PAM.o 
+.endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.netbsd slim-pam/Makefile.netbsd
--- release-1.2.6/Makefile.netbsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.netbsd	2007-06-07 04:15:03.000000000 +0200
@@ -8,6 +8,10 @@
 CFLAGS=-I. -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/freetype2/config -I/usr/pkg/include -I/usr/include
 LDFLAGS=-L/usr/X11R6/lib -L/usr/pkg/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DNEEDS_BASENAME
+.ifdef(USE_PAM)
+  LDFLAGS+= -lpam
+  CUSTOM+= -DUSE_PAM
+.endif
 PREFIX=/usr
 CFGDIR=/etc
 MANDIR=/usr/share/man
@@ -20,7 +24,10 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+.ifdef USE_PAM
+  OBJECTS+=PAM.o 
+.endif
 
 all: slim
 
diff -uNbr --exclude=.svn release-1.2.6/Makefile.openbsd slim-pam/Makefile.openbsd
--- release-1.2.6/Makefile.openbsd	2006-09-15 23:00:28.000000000 +0200
+++ slim-pam/Makefile.openbsd	2007-06-05 12:57:54.000000000 +0200
@@ -20,7 +20,7 @@
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o app.o panel.o
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
 
 .SUFFIXES: .c.o .cpp.o
 
@@ -44,9 +44,6 @@
 switchuser.o:
 	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c switchuser.cpp -o $@
 
-input.o:
-	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c input.cpp -o $@
-
 app.o:
 	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c app.cpp -o $@
 
diff -uNbr --exclude=.svn release-1.2.6/PAM.cpp slim-pam/PAM.cpp
--- release-1.2.6/PAM.cpp	1970-01-01 01:00:00.000000000 +0100
+++ slim-pam/PAM.cpp	2007-05-29 19:10:51.000000000 +0200
@@ -0,0 +1,275 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2007 Martin Parm
+
+   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 <PAM.h>
+#include <string>
+#include <iostream>
+
+namespace PAM {
+    Exception::Exception(pam_handle_t* _pam_handle,
+               const std::string& _func_name,
+               int _errnum):
+        errnum(_errnum),
+        errstr(pam_strerror(_pam_handle, _errnum)),
+        func_name(_func_name)
+        {}
+
+    Exception::~Exception(void){}
+
+    Auth_Exception::Auth_Exception(pam_handle_t* _pam_handle,
+                                   const std::string& _func_name,
+                                   int _errnum):
+        Exception(_pam_handle, _func_name, _errnum){}
+
+    Cred_Exception::Cred_Exception(pam_handle_t* _pam_handle,
+                                   const std::string& _func_name,
+                                   int _errnum):
+        Exception(_pam_handle, _func_name, _errnum){}
+
+    int Authenticator::_end(void){
+        int result=pam_end(pam_handle, last_result);
+        pam_handle=0;
+        return result;
+    }
+
+    Authenticator::Authenticator(conversation* conv, void* data):
+        pam_handle(0),
+        last_result(PAM_SUCCESS)
+    {
+        pam_conversation.conv=conv;
+        pam_conversation.appdata_ptr=data;
+    }
+
+    Authenticator::~Authenticator(void){
+        if (pam_handle) _end();
+    }
+
+    void Authenticator::start(const std::string& service){
+        switch((last_result=pam_start(service.c_str(), NULL, &pam_conversation, &pam_handle))){
+            default:
+                throw Exception(pam_handle, "pam_start()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    void Authenticator::end(void){
+        switch((last_result=_end())){
+            default:
+                throw Exception(pam_handle, "pam_end()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+
+        }
+        return;
+    }
+
+    void Authenticator::set_item(const Authenticator::ItemType item, const void* value){
+        switch((last_result=pam_set_item(pam_handle, item, value))){
+            default:
+            _end();
+                throw Exception(pam_handle, "pam_set_item()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    const void* Authenticator::get_item(const Authenticator::ItemType item){
+        const void* data;
+        switch ((last_result=pam_get_item(pam_handle, item, &data))){
+            default:
+            case PAM_SYSTEM_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_get_item()", last_result);
+
+            case PAM_PERM_DENIED: // The value of item was NULL
+            case PAM_SUCCESS:
+                break;
+        }
+        return data;
+    }
+
+#ifdef __LIBPAM_VERSION
+    void Authenticator::fail_delay(const unsigned int micro_sec){
+        switch((last_result=pam_fail_delay(pam_handle, micro_sec))){
+            default:
+                _end();
+                throw Exception(pam_handle, "fail_delay()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+#endif
+
+    void Authenticator::authenticate(void){
+        switch((last_result=pam_authenticate(pam_handle, 0))){
+            default:
+            case PAM_ABORT:
+            case PAM_AUTHINFO_UNAVAIL:
+                _end();
+                throw Exception(pam_handle, "pam_authenticate()", last_result);
+
+            case PAM_USER_UNKNOWN:
+            case PAM_MAXTRIES:
+            case PAM_CRED_INSUFFICIENT:
+            case PAM_AUTH_ERR:
+                throw Auth_Exception(pam_handle, "pam_authentication()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+
+        switch((last_result=pam_acct_mgmt(pam_handle, PAM_SILENT))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_NEW_AUTHTOKEN_REQD is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_NEW_AUTHTOKEN_REQD:
+            case PAM_ACCT_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                _end();
+                throw Exception(pam_handle, "pam_acct_mgmt()", last_result);
+                
+            case PAM_AUTH_ERR:
+            case PAM_PERM_DENIED:
+                throw Auth_Exception(pam_handle, "pam_acct_mgmt()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::open_session(void){
+        switch((last_result=pam_setcred(pam_handle, PAM_ESTABLISH_CRED))){
+            default:
+            case PAM_CRED_ERR:
+            case PAM_CRED_UNAVAIL:
+                _end();
+                throw Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_CRED_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                throw Cred_Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+
+        switch((last_result=pam_open_session(pam_handle, 0))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_SESSION_ERROR is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_SESSION_ERROR:
+                pam_setcred(pam_handle, PAM_DELETE_CRED);
+                _end();
+                throw Exception(pam_handle, "pam_open_session()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::close_session(void){
+        switch((last_result=pam_close_session(pam_handle, 0))){
+            // The documentation and implementation of Linux PAM differs:
+            // PAM_SESSION_ERROR is described in the documentation but
+            // don't exists in the actual implementation. This issue needs
+            // to be fixes at some point.
+
+            default:
+            //case PAM_SESSION_ERROR:
+                pam_setcred(pam_handle, PAM_DELETE_CRED);
+                _end();
+                throw Exception(pam_handle, "pam_close_session", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        switch((last_result=pam_setcred(pam_handle, PAM_DELETE_CRED))){
+            default:
+            case PAM_CRED_ERR:
+            case PAM_CRED_UNAVAIL:
+            case PAM_CRED_EXPIRED:
+            case PAM_USER_UNKNOWN:
+                _end();
+                throw Exception(pam_handle, "pam_setcred()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        }
+        return;
+    }
+
+    void Authenticator::setenv(const std::string& key, const std::string& value){
+        std::string name_value = key+"="+value;
+        switch((last_result=pam_putenv(pam_handle, name_value.c_str()))){
+            default:
+            case PAM_PERM_DENIED:
+            case PAM_ABORT:
+            case PAM_BUF_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_putenv()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    void Authenticator::delenv(const std::string& key){
+        switch((last_result=pam_putenv(pam_handle, key.c_str()))){
+            default:
+            case PAM_PERM_DENIED:
+            case PAM_ABORT:
+            case PAM_BUF_ERR:
+#ifdef __LIBPAM_VERSION
+            case PAM_BAD_ITEM:
+#endif
+                _end();
+                throw Exception(pam_handle, "pam_putenv()", last_result);
+
+            case PAM_SUCCESS:
+                break;
+        };
+        return;
+    }
+
+    const char* Authenticator::getenv(const std::string& key){
+        return pam_getenv(pam_handle, key.c_str());
+    }
+
+    char** Authenticator::getenvlist(void){
+        return pam_getenvlist(pam_handle);
+    }
+
+};
+
+std::ostream& operator<<( std::ostream& os, const PAM::Exception& e){
+    os << e.func_name << ": " << e.errstr;
+    return os;
+}
diff -uNbr --exclude=.svn release-1.2.6/PAM.h slim-pam/PAM.h
--- release-1.2.6/PAM.h	1970-01-01 01:00:00.000000000 +0100
+++ slim-pam/PAM.h	2007-06-07 04:16:01.000000000 +0200
@@ -0,0 +1,99 @@
+/* SLiM - Simple Login Manager
+   Copyright (C) 2007 Martin Parm
+
+   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.
+*/
+
+#ifndef _PAM_H_
+#define _PAM_H_
+#include <string>
+#include <security/pam_appl.h>
+
+#ifdef __LIBPAM_VERSION
+#include <security/pam_misc.h>
+#endif
+
+namespace PAM {
+    class Exception{
+    public:
+        int errnum;
+        std::string errstr;
+        std::string func_name;
+        Exception(pam_handle_t* _pam_handle,
+                  const std::string& _func_name,
+                  int _errnum);
+        virtual ~Exception(void);
+    };
+
+    class Auth_Exception: public Exception{
+    public:
+        Auth_Exception(pam_handle_t* _pam_handle,
+                       const std::string& _func_name,
+                       int _errnum);
+    };
+
+    class Cred_Exception: public Exception{
+    public:
+        Cred_Exception(pam_handle_t* _pam_handle,
+                       const std::string& _func_name,
+                       int _errnum);
+    };
+
+
+    class Authenticator{
+    private:
+        struct pam_conv pam_conversation;
+        pam_handle_t* pam_handle;
+        int last_result;
+
+        int _end(void);
+    public:
+        typedef int (conversation)(int num_msg,
+                           const struct pam_message **msg,
+                           struct pam_response **resp,
+                           void *appdata_ptr);
+
+        enum ItemType {
+            Service     = PAM_SERVICE,
+            User        = PAM_USER,
+            User_Prompt = PAM_USER_PROMPT,
+            TTY         = PAM_TTY,
+            Requestor   = PAM_RUSER,
+            Host        = PAM_RHOST,
+            Conv        = PAM_CONV,
+#ifdef __LIBPAM_VERSION
+            //Fail_Delay  = PAM_FAIL_DELAY
+#endif
+        };
+
+    public:
+        Authenticator(conversation* conv, void* data=0);
+        ~Authenticator(void);
+        
+        void start(const std::string& service);
+        void end(void);
+        void set_item(const ItemType item, const void* value);
+        const void* get_item(const ItemType item);
+#ifdef __LIBPAM_VERSION
+        void fail_delay(const unsigned int micro_sec);
+#endif
+        void authenticate(void);
+        void open_session(void);
+        void close_session(void);
+        void setenv(const std::string& key, const std::string& value);
+        void delenv(const std::string& key);
+        const char* getenv(const std::string& key);
+        char** getenvlist(void);
+
+    private:
+        // Explicitly disable copy constructor and copy assignment
+        Authenticator(const PAM::Authenticator&);
+        Authenticator& operator=(const PAM::Authenticator&);
+    };
+};
+
+std::ostream& operator<<( std::ostream& os, const PAM::Exception& e);
+#endif
diff -uNbr --exclude=.svn release-1.2.6/app.cpp slim-pam/app.cpp
--- release-1.2.6/app.cpp	2006-09-10 22:10:40.000000000 +0200
+++ slim-pam/app.cpp	2007-06-07 04:18:21.000000000 +0200
@@ -26,6 +26,78 @@
 #include "numlock.h"
 
 
+#ifdef HAVE_SHADOW
+#include <shadow.h>
+#endif
+
+#ifdef USE_PAM
+#include <string>
+
+int conv(int num_msg, const struct pam_message **msg,
+         struct pam_response **resp, void *appdata_ptr){
+    *resp = (struct pam_response *) calloc(num_msg, sizeof(struct pam_response));
+    Panel* panel = *static_cast<Panel**>(appdata_ptr);
+    int result = PAM_SUCCESS;
+    for (int i=0; i<num_msg; i++){
+        resp[i]->resp=0;
+        resp[i]->resp_retcode=0;
+        switch(msg[i]->msg_style){
+            case PAM_PROMPT_ECHO_ON:
+                // We assume PAM is asking for the username
+                panel->EventHandler(Panel::Get_Name);
+                switch(panel->getAction()){
+                    case Panel::Suspend:
+                    case Panel::Halt:
+                    case Panel::Reboot:
+                        resp[i]->resp=strdup("root");
+                        break;
+
+                    case Panel::Console:
+                    case Panel::Exit:
+                    case Panel::Login:
+                        resp[i]->resp=strdup(panel->GetName().c_str());
+                        break;
+                }
+                break;
+
+            case PAM_PROMPT_ECHO_OFF:
+                // We assume PAM is asking for the password
+                switch(panel->getAction()){
+                    case Panel::Console:
+                    case Panel::Exit:
+                        // We should leave now!
+                        result=PAM_CONV_ERR;
+                        break;
+
+                    default:
+                        panel->EventHandler(Panel::Get_Passwd);
+                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
+                        break;
+                }
+                break;
+
+            case PAM_ERROR_MSG:
+            case PAM_TEXT_INFO:
+                // We simply write these to the log
+                // TODO: Maybe we should simply ignore them
+                cerr << APPNAME << ": " << msg[i]->msg << endl;
+                break;
+        }
+        if (result!=PAM_SUCCESS) break;
+    }
+    if (result!=PAM_SUCCESS){
+        for (int i=0; i<num_msg; i++){
+            if (resp[i]->resp==0) continue;
+            free(resp[i]->resp);
+            resp[i]->resp=0;
+        };
+        free(*resp);
+        *resp=0;
+    };
+    return result;
+}
+#endif
+
 extern App* LoginApp;
 
 void CatchSignal(int sig) {
@@ -53,8 +125,12 @@
 }
 
 
-App::App(int argc, char** argv) {
-
+#ifdef USE_PAM
+App::App(int argc, char** argv):
+    pam(conv, static_cast<void*>(&LoginPanel)){
+#else
+App::App(int argc, char** argv){
+#endif
     int tmp;
     ServerPID = -1;
     testing = false;
@@ -133,6 +209,20 @@
         }
     }
 
+#ifdef USE_PAM
+    try{
+        pam.start("slim");
+        pam.set_item(PAM::Authenticator::TTY, DisplayName);
+        pam.set_item(PAM::Authenticator::Requestor, "root");
+        pam.set_item(PAM::Authenticator::Host, "localhost");
+
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+#endif
+
     bool loaded = false;
     while (!loaded) {
         themedir =  themebase + themeName;
@@ -219,9 +308,8 @@
     LoginPanel = new Panel(Dpy, Scr, Root, cfg, themedir);
 
     // Start looping
-    XEvent event;
     int panelclosed = 1;
-    int Action;
+    Panel::ActionType Action;
     bool firstloop = true; // 1st time panel is shown (for automatic username)
 
     while(1) {
@@ -239,53 +327,124 @@
             LoginPanel->OpenPanel();
         }
 
-        Action = WAIT;
-        LoginPanel->GetInput()->Reset();
+        LoginPanel->Reset();
         if (firstloop && cfg->getOption("default_user") != "") {
-            LoginPanel->GetInput()->SetName(cfg->getOption("default_user") );
+            LoginPanel->SetName(cfg->getOption("default_user") );
             firstloop = false;
         }
 
-        while(Action == WAIT) {
-            XNextEvent(Dpy, &event);
-            Action = LoginPanel->EventHandler(&event);
-        }
 
-        if(Action == FAIL) {
+        if (!AuthenticateUser()){
             panelclosed = 0;
             LoginPanel->ClearPanel();
             XBell(Dpy, 100);
-        } else {
+            continue;
+        }
+        
+
+        Action = LoginPanel->getAction();
             // for themes test we just quit
             if (testing) {
-                Action = EXIT;
+            Action = Panel::Exit;
             }
             panelclosed = 1;
             LoginPanel->ClosePanel();
 
             switch(Action) {
-                case LOGIN:
+            case Panel::Login:
                     Login();
                     break;
-                case CONSOLE:
+            case Panel::Console:
                     Console();
                     break;
-                case REBOOT:
+            case Panel::Reboot:
                     Reboot();
                     break;
-                case HALT:
+            case Panel::Halt:
                     Halt();
                     break;
-                case SUSPEND:
+            case Panel::Suspend:
                     Suspend();
                     break;
-                case EXIT:
+            case Panel::Exit:
                     Exit();
                     break;
             }
         }
+}
+
+#ifdef USE_PAM
+bool App::AuthenticateUser(void){
+    // Reset the username
+    try{
+        pam.set_item(PAM::Authenticator::User, 0);
+        pam.authenticate();
+    }
+    catch(PAM::Auth_Exception& e){
+        switch(LoginPanel->getAction()){
+            case Panel::Exit:
+            case Panel::Console:
+                return true; // <--- This is simply fake!
+            default:
+                break;
+        };
+        cerr << APPNAME << ": " << e << endl;
+        return false;
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+    return true;
+}
+#else
+bool App::AuthenticateUser(void){
+    LoginPanel->EventHandler(Panel::Get_Name);
+    switch(LoginPanel->getAction()){
+        case Panel::Exit:
+        case Panel::Console:
+            cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
+            return true; // <--- This is simply fake!
+        default:
+            break;
+    };
+    LoginPanel->EventHandler(Panel::Get_Passwd);
+    
+    char *encrypted, *correct;
+    struct passwd *pw;
+
+    switch(LoginPanel->getAction()){
+        case Panel::Suspend:
+        case Panel::Halt:
+        case Panel::Reboot:
+            pw = getpwnam("root");
+            break;
+        case Panel::Console:
+        case Panel::Exit:
+        case Panel::Login:
+            pw = getpwnam(LoginPanel->GetName().c_str());
+            break;
     }
+    endpwent();
+    if(pw == 0)
+        return false;
+
+#ifdef HAVE_SHADOW
+    struct spwd *sp = getspnam(pw->pw_name);    
+    endspent();
+    if(sp)
+        correct = sp->sp_pwdp;
+    else
+#endif        // HAVE_SHADOW
+        correct = pw->pw_passwd;
+
+    if(correct == 0 || correct[0] == '\0')
+        return true;
+
+    encrypted = crypt(LoginPanel->GetPasswd().c_str(), correct);
+    return ((strcmp(encrypted, correct) == 0) ? true : false);
 }
+#endif
 
 
 int App::GetServerPID() {
@@ -313,15 +472,85 @@
     struct passwd *pw;
     pid_t pid;
 
-    pw = LoginPanel->GetInput()->GetPasswdStruct();
+#ifdef USE_PAM
+    try{
+        pam.open_session();
+        pw = getpwnam(static_cast<const char*>(pam.get_item(PAM::Authenticator::User)));
+    }
+    catch(PAM::Cred_Exception& e){
+        // Credentials couldn't be established
+        cerr << APPNAME << ": " << e << endl;
+        return;
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    };
+#else
+    pw = getpwnam(LoginPanel->GetName().c_str());
+#endif
+    endpwent();
     if(pw == 0)
         return;
+    if (pw->pw_shell[0] == '\0') {
+        setusershell();
+        strcpy(pw->pw_shell, getusershell());
+        endusershell();
+    }
+
+    // Setup the environment
+    char* term = getenv("TERM");
+    string maildir = _PATH_MAILDIR;
+    maildir.append("/");
+    maildir.append(pw->pw_name);
+    string xauthority = pw->pw_dir;
+    xauthority.append("/.Xauthority");
+    
+#ifdef USE_PAM
+    // Setup the PAM environment
+    try{
+        if(term) pam.setenv("TERM", term);
+        pam.setenv("HOME", pw->pw_dir);
+        pam.setenv("SHELL", pw->pw_shell);
+        pam.setenv("USER", pw->pw_name);
+        pam.setenv("LOGNAME", pw->pw_name);
+        pam.setenv("PATH", cfg->getOption("default_path").c_str());
+        pam.setenv("DISPLAY", DisplayName);
+        pam.setenv("MAIL", maildir.c_str());
+        pam.setenv("XAUTHORITY", xauthority.c_str());
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+        exit(ERR_EXIT);
+    }
+#endif
 
     // Create new process
     pid = fork();
     if(pid == 0) {
+#ifdef USE_PAM
+        // Get a copy of the environment and close the child's copy
+        // of the PAM-handle.
+        char** child_env = pam.getenvlist();
+        pam.end();
+#else
+        const int Num_Of_Variables = 10; // Number of env. variables + 1
+        char** child_env = static_cast<char**>(malloc(sizeof(char*)*Num_Of_Variables));
+        int n = 0;
+        if(term) child_env[n++]=StrConcat("TERM=", term);
+        child_env[n++]=StrConcat("HOME=", pw->pw_dir);
+        child_env[n++]=StrConcat("SHELL=", pw->pw_shell);
+        child_env[n++]=StrConcat("USER=", pw->pw_name);
+        child_env[n++]=StrConcat("LOGNAME=", pw->pw_name);
+        child_env[n++]=StrConcat("PATH=", cfg->getOption("default_path").c_str());
+        child_env[n++]=StrConcat("DISPLAY=", DisplayName);
+        child_env[n++]=StrConcat("MAIL=", maildir.c_str());
+        child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
+        child_env[n++]=0;
+#endif
+
         // Login process starts here
-        SwitchUser Su(pw, cfg, DisplayName);
+        SwitchUser Su(pw, cfg, DisplayName, child_env);
         string session = LoginPanel->getSession();
         string loginCommand = cfg->getOption("login_cmd");
         replaceVariables(loginCommand, SESSION_VAR, session);
@@ -332,7 +561,7 @@
             system(sessStart.c_str());
         }
         Su.Login(loginCommand.c_str(), mcookie.c_str());
-        exit(OK_EXIT);
+        _exit(OK_EXIT);
     }
 
 #ifndef XNEST_DEBUG
@@ -347,6 +576,7 @@
     }
     if (WIFEXITED(status) && WEXITSTATUS(status)) {
         LoginPanel->Message("Failed to execute login command");
+        sleep(3);
     } else {
          string sessStop = cfg->getOption("sessionstop_cmd");
          if (sessStop != "") {
@@ -355,7 +585,16 @@
         }
     }
 
-    // Close all clients
+#ifdef USE_PAM
+    try{
+        pam.close_session();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
+// Close all clients
     KillAllClients(False);
     KillAllClients(True);
 
@@ -382,6 +621,15 @@
     // Stop alarm clock
     alarm(0);
 
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     // Write message
     LoginPanel->Message((char*)cfg->getOption("reboot_msg").c_str());
     sleep(3);
@@ -398,6 +646,15 @@
     // Stop alarm clock
     alarm(0);
 
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     // Write message
     LoginPanel->Message((char*)cfg->getOption("shutdown_msg").c_str());
     sleep(3);
@@ -433,6 +690,15 @@
 
 
 void App::Exit() {
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
     if (testing) {
         char* testmsg = "This is a test message :-)";
         LoginPanel->Message(testmsg);
@@ -453,6 +720,15 @@
 }
 
 void App::RestartServer() {
+#ifdef USE_PAM
+    try{
+        pam.end();
+    }
+    catch(PAM::Exception& e){
+        cerr << APPNAME << ": " << e << endl;
+    };
+#endif
+
         StopServer(); 
         RemoveLock();
         Run();
diff -uNbr --exclude=.svn release-1.2.6/app.h slim-pam/app.h
--- release-1.2.6/app.h	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/app.h	2007-05-19 21:26:29.000000000 +0200
@@ -24,6 +24,10 @@
 #include "cfg.h"
 #include "image.h"
 
+#ifdef USE_PAM
+#include "PAM.h"
+#endif
+
 class App {
 public:
     App(int argc, char** argv);
@@ -53,6 +57,8 @@
     char* StrConcat(const char* str1, const char* str2);
     void UpdatePid();
  
+    bool AuthenticateUser(void);
+ 
     static std::string findValidRandomTheme(const std::string& set);
     static void replaceVariables(std::string& input,
                                  const std::string& var,
@@ -71,6 +77,10 @@
     int ServerPID;
     char* DisplayName;
 
+#ifdef USE_PAM
+	PAM::Authenticator pam;
+#endif
+
     // Options
     char* DispName;
 
diff -uNbr --exclude=.svn release-1.2.6/cfg.cpp slim-pam/cfg.cpp
--- release-1.2.6/cfg.cpp	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/cfg.cpp	2007-05-27 15:44:12.000000000 +0200
@@ -19,7 +19,9 @@
 
 typedef pair<string,string> option;
 
-Cfg::Cfg() {
+Cfg::Cfg() 
+    : currentSession(-1)
+{
     // Configuration options
     options.insert(option("default_path","./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"));
     options.insert(option("default_xserver","/usr/X11R6/bin/X"));
@@ -34,7 +36,7 @@
     options.insert(option("sessionstart_cmd",""));
     options.insert(option("sessionstop_cmd",""));
     options.insert(option("console_cmd","/usr/X11R6/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));
-    options.insert(option("screenshot_cmd","import -window root /login.app.png"));
+    options.insert(option("screenshot_cmd","import -window root /slim.png"));
     options.insert(option("welcome_msg","Welcome to %host"));
     options.insert(option("default_user",""));
     options.insert(option("current_theme","default"));
@@ -129,6 +131,7 @@
             }
         }
         cfgfile.close();
+        split(sessions, getOption("sessions"), ',', false);
         return true;
     } else {
         error = "Cannot read configuration file: " + configfile;
@@ -211,8 +214,7 @@
     int n = -1;
     n = position.find("%");
     if (n>0) { // X Position expressed in percentage
-        const char* tmp =  position.substr(0, n).c_str();
-        int result = (max*string2int(tmp)/100) - (width / 2);
+        int result = (max*string2int(position.substr(0, n).c_str())/100) - (width / 2);
         return result < 0 ? 0 : result ;
     } else { // Absolute X position
         return string2int(position.c_str());
@@ -220,17 +222,21 @@
 }
 
 // split a comma separated string into a vector of strings
-void Cfg::split(vector<string>& v, const string& str, char c) {
+void Cfg::split(vector<string>& v, const string& str, char c, bool useEmpty) {
     v.clear();
     string::const_iterator s = str.begin();
+    string tmp;
     while (true) {
         string::const_iterator begin = s;
         while (*s != c && s != str.end()) { ++s; }
-        v.push_back(string(begin, s));
+    tmp = string(begin, s);
+    if (useEmpty || tmp.size() > 0)
+            v.push_back(tmp);
         if (s == str.end()) {
             break;
         }
         if (++s == str.end()) {
+        if (useEmpty)
             v.push_back("");
             break;
         }
@@ -238,15 +244,9 @@
 }
 
 string Cfg::nextSession(string current) {
-    vector<string> sessions;
-    split(sessions, getOption("sessions"), ',');
-    if (sessions.size() <= 1)
+    if (sessions.size() < 1)
         return current;
 
-    for (int i=0; i<(int)sessions.size()-1; i++) {
-        if (current == sessions[i]) {
-            return sessions[i+1];
-        }
-    }
-    return sessions[0];
+    currentSession = (currentSession + 1) % sessions.size();
+    return sessions[currentSession];
 }
diff -uNbr --exclude=.svn release-1.2.6/cfg.h slim-pam/cfg.h
--- release-1.2.6/cfg.h	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/cfg.h	2007-05-17 16:38:53.000000000 +0200
@@ -37,13 +37,16 @@
 
     static int absolutepos(const string& position, int max, int width);
     static int string2int(const char* string, bool* ok = 0);
-    static void split(vector<string>& v, const string& str, char c);
+    static void split(vector<string>& v, const string& str, 
+                      char c, bool useEmpty=true);
     static string Trim(const string& s);
 
     string nextSession(string current);
 
 private:
     map<string,string> options;
+    vector<string> sessions;
+    int currentSession;
     string error;
 
 };
diff -uNbr --exclude=.svn release-1.2.6/const.h slim-pam/const.h
--- release-1.2.6/const.h	2006-01-08 15:35:03.000000000 +0100
+++ slim-pam/const.h	2007-05-17 16:38:53.000000000 +0200
@@ -26,15 +26,6 @@
 #define HIDE		0
 #define SHOW		1
 
-#define WAIT		0
-#define LOGIN		1
-#define FAIL		2
-#define CONSOLE		3
-#define REBOOT		4
-#define HALT		5
-#define EXIT		6
-#define SUSPEND		7
-
 #define GET_NAME    0
 #define GET_PASSWD	1
 
diff -uNbr --exclude=.svn release-1.2.6/panel.cpp slim-pam/panel.cpp
--- release-1.2.6/panel.cpp	2006-09-10 12:05:34.000000000 +0200
+++ slim-pam/panel.cpp	2007-05-19 21:26:29.000000000 +0200
@@ -76,7 +76,8 @@
         panelpng = themedir + "/panel.jpg";
         loaded = image->Read(panelpng.c_str());
         if (!loaded) {
-            cerr << APPNAME << ": could not load panel image for theme '"
+            cerr << APPNAME
+                 << ": could not load panel image for theme '"
 		 << basename((char*)themedir.c_str()) << "'"
 		 << endl;
             exit(ERR_EXIT);
@@ -92,7 +93,8 @@
             panelpng = themedir + "/background.jpg";
             loaded = bg->Read(panelpng.c_str());
             if (!loaded){
-                cerr << APPNAME << ": could not load background image for theme '"
+                cerr << APPNAME
+                     << ": could not load background image for theme '"
 		        << basename((char*)themedir.c_str()) << "'"
 		        << endl;
                 exit(ERR_EXIT);
@@ -106,12 +108,14 @@
     } else if (bgstyle == "center") {
  	    string hexvalue = cfg->getOption("background_color");
         hexvalue = hexvalue.substr(1,6);
-  	    bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
+        bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)),
+                   XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
        			    hexvalue.c_str());
     } else { // plain color or error
 	    string hexvalue = cfg->getOption("background_color");
         hexvalue = hexvalue.substr(1,6);
-  	    bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
+        bg->Center(XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)),
+                   XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)),
     			    hexvalue.c_str());
     }
 
@@ -128,9 +132,6 @@
     // Read (and substitute vars in) the welcome message
     welcome_message = cfg->getWelcomeMessage();
     intro_message = cfg->getOption("intro_msg");
-
-    // Init In
-    In = new Input(cfg);
 }
 
 Panel::~Panel() {
@@ -144,7 +145,6 @@
     XftFontClose(Dpy, introfont);
     XftFontClose(Dpy, welcomefont);
     XftFontClose(Dpy, enterfont);
-    delete In;
     delete image;
 
 }
@@ -182,7 +182,7 @@
 
 void Panel::ClearPanel() {
     session = "";
-    In->Reset();
+    Reset();
     XClearWindow(Dpy, Root);
     XClearWindow(Dpy, Win);
     Cursor(SHOW);
@@ -190,13 +190,13 @@
     XFlush(Dpy);
 }
 
-void Panel::Message(const char* text) {
+void Panel::Message(const string& text) {
     string cfgX, cfgY;
     XGlyphInfo extents;
     XftDraw *draw = XftDrawCreate(Dpy, Root,
                                   DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
-    XftTextExtents8(Dpy, msgfont, (XftChar8*)text,
-                    strlen(text), &extents);
+    XftTextExtents8(Dpy, msgfont, reinterpret_cast<const XftChar8*>(text.c_str()),
+                    text.length(), &extents);
     cfgX = cfg->getOption("msg_x");
     cfgY = cfg->getOption("msg_y");
     int shadowXOffset =
@@ -208,14 +208,14 @@
     int msg_y = Cfg::absolutepos(cfgY, XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)), extents.height);
 
     SlimDrawString8 (draw, &msgcolor, msgfont, msg_x, msg_y,
-                     (XftChar8*)text, strlen(text),
+                     text,
                      &msgshadowcolor,
                      shadowXOffset, shadowYOffset);
     XFlush(Dpy);
     XftDrawDestroy(draw);
 }
 
-void Panel::Error(const char* text) {
+void Panel::Error(const string& text) {
     ClosePanel();
     Message(text);
     sleep(ERROR_DURATION);
@@ -224,10 +224,6 @@
 }
 
 
-Input* Panel::GetInput() {
-    return In;
-}
-
 unsigned long Panel::GetColor(const char* colorname) {
     XColor color;
     XWindowAttributes attributes;
@@ -244,31 +240,24 @@
 }
 
 void Panel::Cursor(int visible) {
-    char* text;
+    const char* text;
     int xx, yy, y2, cheight;
     char* txth = "Wj"; // used to get cursor height
 
-    switch(In->GetField()) {
-        case GET_PASSWD:
-            text = In->GetHiddenPasswd();
+    switch(field) {
+        case Get_Passwd:
+            text = HiddenPasswdBuffer.c_str();
             xx = input_pass_x;
             yy = input_pass_y;
             break;
 
-        case GET_NAME:
-            text = In->GetName();
+        case Get_Name:
+            text = NameBuffer.c_str();
             xx = input_name_x;
             yy = input_name_y;
             break;
-
-		default: /* Origin & NULL string as default values. */
-			text = (char *)NULL;
-			xx = (int)0;
-			yy = (int)0;
-			break;
     }
 
-
     XGlyphInfo extents;
     XftTextExtents8(Dpy, font, (XftChar8*)txth, strlen(txth), &extents);
     cheight = extents.height;
@@ -288,49 +277,53 @@
     }
 }
 
-int Panel::EventHandler(XEvent* event) {
-    Action = WAIT;
-
-    switch(event->type) {
+void Panel::EventHandler(const Panel::FieldType& curfield) {
+    XEvent event;
+    field=curfield;
+    bool loop = true;
+    OnExpose();
+    while(loop) {
+        XNextEvent(Dpy, &event);
+        switch(event.type) {
     case Expose:
-        OnExpose(event);
+                OnExpose();
         break;
 
     case KeyPress:
-        OnKeyPress(event);
+                loop=OnKeyPress(event);
         break;
     }
+    }
 
-    return Action;
+    return;
 }
 
-void Panel::OnExpose(XEvent* event) {
-    char* name = In->GetName();
-    char* passwd = In->GetHiddenPasswd();
+void Panel::OnExpose(void) {
     XftDraw *draw = XftDrawCreate(Dpy, Win,
                         DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+    XClearWindow(Dpy, Win);
     if (input_pass_x != input_name_x || input_pass_y != input_name_y){
         SlimDrawString8 (draw, &inputcolor, font, input_name_x, input_name_y,
-                         (XftChar8*)name, strlen(name),
+                         NameBuffer,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
         SlimDrawString8 (draw, &inputcolor, font, input_pass_x, input_pass_y,
-                         (XftChar8*)passwd, strlen(passwd),
+                         HiddenPasswdBuffer,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
     } else { //single input mode
-        switch(In->GetField()) {
-            case GET_PASSWD:
+        switch(field) {
+            case Get_Passwd:
                 SlimDrawString8 (draw, &inputcolor, font,
                                  input_pass_x, input_pass_y,
-                                 (XftChar8*)passwd, strlen(passwd),
+                                 HiddenPasswdBuffer,
                                  &inputshadowcolor,
                                  inputShadowXOffset, inputShadowYOffset);
                 break;
-            case GET_NAME:
+            case Get_Name:
                 SlimDrawString8 (draw, &inputcolor, font,
                                  input_name_x, input_name_y,
-                                 (XftChar8*)name, strlen(name),
+                                 NameBuffer,
                                  &inputshadowcolor,
                                  inputShadowXOffset, inputShadowYOffset);
                 break;
@@ -342,108 +335,153 @@
     ShowText();
 }
 
-void Panel::OnKeyPress(XEvent* event) {
-    char del;
-    char buffer;
+bool Panel::OnKeyPress(XEvent& event) {
+    char ascii;
     KeySym keysym;
     XComposeStatus compstatus;
     int xx;
     int yy;
-    char* text;
-
-    bool singleInputMode =
-        input_name_x == input_pass_x &&
-        input_name_y == input_pass_y;
-    Cursor(HIDE);
-    XLookupString(&event->xkey, &buffer, 1, &keysym, &compstatus);
-    del = In->Key(buffer, keysym, singleInputMode);
-    Action = In->GetAction();
-
-    XGlyphInfo extents;
-    XftDraw *draw = XftDrawCreate(Dpy, Win,
-                                  DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+    string text;
+    string formerString = "";
 
-    if (keysym == XK_F1) {
+    XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
+    switch(keysym){
+        case XK_F1:
         SwitchSession();
-    }
+            return true;
 
-    bool clearField = false;
-    string formerString = "";
-    if ((((XKeyEvent*)event)->state & ControlMask)) {
-        if (keysym == XK_w || keysym == XK_u) {
-            clearField = true;
-        }
-    }
+        case XK_F11:
+            // Take a screenshot
+            system(cfg->getOption("screenshot_cmd").c_str());
+            return true;
+
+        case XK_Return:
+        case XK_KP_Enter:
+            if (field==Get_Name){
+                // Don't allow an empty username
+                if (NameBuffer.empty()) return true;
+
+                if (NameBuffer==CONSOLE_STR){
+                    action = Console;
+                } else if (NameBuffer==HALT_STR){
+                    action = Halt;
+                } else if (NameBuffer==REBOOT_STR){
+                    action = Reboot;
+                } else if (NameBuffer==SUSPEND_STR){
+                    action = Suspend;
+                } else if (NameBuffer==EXIT_STR){
+                    action = Exit;
+                } else{
+                    action = Login;
+                }
+            };
+            return false;
+        default:
+            break;
+    };
 
-    switch(In->GetField()) {
+    Cursor(HIDE);
+    switch(keysym){
+        case XK_Delete:
+        case XK_BackSpace:
+            switch(field) {
+                case GET_NAME:
+                    if (! NameBuffer.empty()){
+                        formerString=NameBuffer;
+                        NameBuffer.erase(--NameBuffer.end());
+                    };
+                    break;
         case GET_PASSWD:
-            if (strlen(In->GetHiddenPasswd()) == 0){
-                // clear name and welcome label if we just entered the
-                // password field
-                if (singleInputMode) {
-                    xx = input_name_x;
-                    yy = input_name_y;
-                    text = In->GetName();
-                    XftTextExtents8(Dpy, font, (XftChar8*)text,
-                                    strlen(text), &extents);
-                    XClearWindow(Dpy, Win);
-                    ShowText();
-                }
-            }
+                    if (! PasswdBuffer.empty()){
+                        formerString=HiddenPasswdBuffer;
+                        PasswdBuffer.erase(--PasswdBuffer.end());
+                        HiddenPasswdBuffer.erase(--HiddenPasswdBuffer.end());
+                    };
+                    break;
+            };
+            break;
 
-            if (clearField) {
-                formerString = In->GetHiddenPasswd();
-                In->ResetPassword();
-            }
-            text = In->GetHiddenPasswd();
-            xx = input_pass_x;
-            yy = input_pass_y;
+        case XK_w:
+        case XK_u:
+            if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
+                switch(field) {
+                    case Get_Passwd:
+                        formerString = HiddenPasswdBuffer;
+                        HiddenPasswdBuffer.clear();
+                        PasswdBuffer.clear();
             break;
 
-        case GET_NAME:
-            if (clearField) {
-                formerString = In->GetName();
-                In->ResetName();
+                    case Get_Name:
+                        formerString = NameBuffer;
+                        NameBuffer.clear();
+                        break;
+                };
+                break;
             }
-            text = In->GetName();
+            // Deliberate fall-through
+        
+        default:
+            if (isprint(ascii) && (keysym < XK_Shift_L || keysym > XK_Hyper_R)){
+                switch(field) {
+                    case GET_NAME:
+                        formerString=NameBuffer;
+                        if (NameBuffer.length() < INPUT_MAXLENGTH_NAME-1){
+                            NameBuffer.append(&ascii,1);
+                        };
+                        break;
+                    case GET_PASSWD:
+                        formerString=HiddenPasswdBuffer;
+                        if (PasswdBuffer.length() < INPUT_MAXLENGTH_NAME-1){
+                            PasswdBuffer.append(&ascii,1);
+                            HiddenPasswdBuffer.append("*");
+                        };
+                    break;
+                };
+            };
+            break;
+    };
+
+    XGlyphInfo extents;
+    XftDraw *draw = XftDrawCreate(Dpy, Win,
+                                  DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
+
+   switch(field) {
+        case Get_Name:
+            text = NameBuffer;
             xx = input_name_x;
             yy = input_name_y;
             break;
 
-		default: /* Origin & NULL string as default values. */
-			text = (char *)NULL;
-			xx = (int)0;
-			yy = (int)0;
+        case Get_Passwd:
+            text = HiddenPasswdBuffer;
+            xx = input_pass_x;
+            yy = input_pass_y;
 			break;
     }
 
+    if (!formerString.empty()){
     char* txth = "Wj"; // get proper maximum height ?
-    XftTextExtents8(Dpy, font, (XftChar8*)txth, strlen(txth), &extents);
+        XftTextExtents8(Dpy, font, reinterpret_cast<const XftChar8*>(txth), strlen(txth), &extents);
     int maxHeight = extents.height;
 
-    string tmp = "";
-    if (clearField) {
-        tmp = formerString;
-    } else {
-        tmp = text;
-        tmp = tmp + del;
-    }
-    XftTextExtents8(Dpy, font, (XftChar8*)tmp.c_str(),
-                    strlen(tmp.c_str()), &extents);
+        XftTextExtents8(Dpy, font, reinterpret_cast<const XftChar8*>(formerString.c_str()),
+                        formerString.length(), &extents);
     int maxLength = extents.width;
 
     XClearArea(Dpy, Win, xx-3, yy-maxHeight-3,
                maxLength+6, maxHeight+6, false);
+    }
 
-    if (!clearField) {
+    if (!text.empty()) {
         SlimDrawString8 (draw, &inputcolor, font, xx, yy,
-                         (XftChar8*)text, strlen(text),
+                         text,
                          &inputshadowcolor,
                          inputShadowXOffset, inputShadowYOffset);
     }
 
     XftDrawDestroy (draw);
     Cursor(SHOW);
+    return true;
 }
 
 // Draw welcome and "enter username" message
@@ -471,14 +509,13 @@
     if (welcome_x >= 0 && welcome_y >= 0) {
         SlimDrawString8 (draw, &welcomecolor, welcomefont,
                          welcome_x, welcome_y,
-                         (XftChar8*)welcome_message.c_str(),
-                         strlen(welcome_message.c_str()),
+                         welcome_message,
                          &welcomeshadowcolor, shadowXOffset, shadowYOffset);
     }
 
     /* Enter username-password message */
     string msg;
-    if (!singleInputMode|| In->GetField() == GET_PASSWD ) {
+    if (!singleInputMode|| field == Get_Passwd ) {
         msg = cfg->getOption("password_msg");
         XftTextExtents8(Dpy, enterfont, (XftChar8*)msg.c_str(),
                         strlen(msg.c_str()), &extents);
@@ -492,11 +529,10 @@
         password_y = Cfg::absolutepos(cfgY, image->Height(), extents.height);
         if (password_x >= 0 && password_y >= 0){
             SlimDrawString8 (draw, &entercolor, enterfont, password_x, password_y,
-                             (XftChar8*)msg.c_str(), strlen(msg.c_str()),
-                             &entershadowcolor, shadowXOffset, shadowYOffset);
+                             msg, &entershadowcolor, shadowXOffset, shadowYOffset);
         }
     }
-    if (!singleInputMode|| In->GetField() == GET_NAME ) {
+    if (!singleInputMode|| field == Get_Name ) {
         msg = cfg->getOption("username_msg");
         XftTextExtents8(Dpy, enterfont, (XftChar8*)msg.c_str(),
                         strlen(msg.c_str()), &extents);
@@ -510,8 +546,7 @@
         username_y = Cfg::absolutepos(cfgY, image->Height(), extents.height);
         if (username_x >= 0 && username_y >= 0){
             SlimDrawString8 (draw, &entercolor, enterfont, username_x, username_y,
-                             (XftChar8*)msg.c_str(), strlen(msg.c_str()),
-                             &entershadowcolor, shadowXOffset, shadowYOffset);
+                             msg, &entershadowcolor, shadowXOffset, shadowYOffset);
         }
     }
     XftDrawDestroy(draw);
@@ -524,29 +559,29 @@
 // choose next available session type
 void Panel::SwitchSession() {
     session = cfg->nextSession(session);
-    //TODO: get sessions from cfg and cycle to the next one
+    if (session.size() > 0) {
     ShowSession();
+    }
 }
 
 // Display session type on the screen
 void Panel::ShowSession() {
     XClearWindow(Dpy, Root);
     string currsession = "Session: " + session;
-    char* text = (char*) currsession.c_str();
     XGlyphInfo extents;
     XftDraw *draw = XftDrawCreate(Dpy, Root,
                                   DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
-    XftTextExtents8(Dpy, msgfont, (XftChar8*)text,
-                    strlen(text), &extents);
+    XftTextExtents8(Dpy, msgfont, reinterpret_cast<const XftChar8*>(currsession.c_str()),
+                    currsession.length(), &extents);
     int msg_x = Cfg::absolutepos("50%", XWidthOfScreen(ScreenOfDisplay(Dpy, Scr)), extents.width);
     int msg_y = XHeightOfScreen(ScreenOfDisplay(Dpy, Scr)) - extents.height -100;
     int shadowXOffset =
-        Cfg::string2int(cfg->getOption("welcome_shadow_xoffset").c_str());
+        Cfg::string2int(cfg->getOption("msg_shadow_xoffset").c_str());
     int shadowYOffset =
-        Cfg::string2int(cfg->getOption("welcome_shadow_yoffset").c_str());
+        Cfg::string2int(cfg->getOption("msg_shadow_yoffset").c_str());
 
     SlimDrawString8(draw, &msgcolor, msgfont, msg_x, msg_y,
-                    (XftChar8*)text, strlen(text),
+                    currsession, 
                     &msgshadowcolor,
                     shadowXOffset, shadowYOffset);
     XFlush(Dpy);
@@ -555,13 +590,44 @@
 
 
 void Panel::SlimDrawString8(XftDraw *d, XftColor *color, XftFont *font,
-                            int x, int y, XftChar8 *string, int len,
+                            int x, int y, const string& str,
                             XftColor* shadowColor,
                             int xOffset, int yOffset)
 {
     if (xOffset && yOffset) {
         XftDrawString8(d, shadowColor, font, x+xOffset, y+yOffset,
-                       string, len);
+                       reinterpret_cast<const FcChar8*>(str.c_str()), str.length());
     }
-    XftDrawString8(d, color, font, x, y, string, len);
+    XftDrawString8(d, color, font, x, y, reinterpret_cast<const FcChar8*>(str.c_str()), str.length());
 }
+
+
+Panel::ActionType Panel::getAction(void) const{
+    return action;
+};
+
+
+void Panel::Reset(void){
+    ResetName();
+    ResetPasswd();
+};
+
+void Panel::ResetName(void){
+    NameBuffer.clear();
+};
+
+void Panel::ResetPasswd(void){
+    PasswdBuffer.clear();
+    HiddenPasswdBuffer.clear();
+};
+
+void Panel::SetName(const string& name){
+    NameBuffer=name;
+    return;
+};
+const string& Panel::GetName(void) const{
+    return NameBuffer;
+};
+const string& Panel::GetPasswd(void) const{
+    return PasswdBuffer;
+};
diff -uNbr --exclude=.svn release-1.2.6/panel.h slim-pam/panel.h
--- release-1.2.6/panel.h	2006-08-18 19:21:59.000000000 +0200
+++ slim-pam/panel.h	2007-05-17 16:38:53.000000000 +0200
@@ -13,49 +13,71 @@
 #define _PANEL_H_
 
 #include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <X11/Xft/Xft.h>
 #include <X11/cursorfont.h>
 #include <X11/Xmu/WinUtil.h>
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <iostream>
+#include <string>
 
 #ifdef NEEDS_BASENAME
 #include <libgen.h>
 #endif
 
 #include "switchuser.h"
-#include "input.h"
 #include "const.h"
 #include "image.h"
 
 
 class Panel {
 public:
+    enum ActionType {
+        Login,
+        Console,
+        Reboot,
+        Halt,
+        Exit,
+        Suspend
+    };
+    enum FieldType {
+        Get_Name,
+        Get_Passwd
+    };
+
+
     Panel(Display* dpy, int scr, Window root, Cfg* config,
           const string& themed);
     ~Panel();
     void OpenPanel();
     void ClosePanel();
     void ClearPanel();
-    void Message(const char* text);
-    void Error(const char* text);
-    Input* GetInput();
-    int EventHandler(XEvent* event);
+    void Message(const string& text);
+    void Error(const string& text);
+    void EventHandler(const FieldType& curfield);
     string getSession();
+    ActionType getAction(void) const;
 
+    void Reset(void);
+    void ResetName(void);
+    void ResetPasswd(void);
+    void SetName(const string& name);
+    const string& GetName(void) const;
+    const string& GetPasswd(void) const;
 private:
     Panel();
     void Cursor(int visible);
     unsigned long GetColor(const char* colorname);
-    void OnExpose(XEvent* event);
-    void OnKeyPress(XEvent* event);
+    void OnExpose(void);
+    bool OnKeyPress(XEvent& event);
     void ShowText();
     void SwitchSession();
     void ShowSession();
 
-    void SlimDrawString8(XftDraw* d, XftColor* color, XftFont* font,
-                         int x, int y, XftChar8 *string, int len,
+    void SlimDrawString8(XftDraw *d, XftColor *color, XftFont *font,
+                            int x, int y, const string& str,
                          XftColor* shadowColor,
                          int xOffset, int yOffset);
 
@@ -82,7 +104,13 @@
     XftFont* enterfont;
     XftColor entercolor;
     XftColor entershadowcolor;
-    int Action;
+    ActionType action;
+    FieldType field;
+    
+    // Username/Password
+    string NameBuffer;
+    string PasswdBuffer;
+    string HiddenPasswdBuffer;
 
     // Configuration
     int input_name_x;
@@ -110,9 +138,6 @@
     // Pixmap data
     Pixmap PanelPixmap;
 
-    // Name/Passwd handler
-    Input* In;
-
     Image* image;
 
     // For thesting themes
diff -uNbr --exclude=.svn release-1.2.6/switchuser.cpp slim-pam/switchuser.cpp
--- release-1.2.6/switchuser.cpp	2006-08-18 19:10:29.000000000 +0200
+++ slim-pam/switchuser.cpp	2007-05-19 21:26:29.000000000 +0200
@@ -13,10 +13,12 @@
 
 using namespace std;
 
-SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display)
+SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display,
+                       char** _env)
     : cfg(c),
       Pw(pw),
-      displayName(display)
+      displayName(display),
+      env(_env)
 {
 }
 
@@ -27,33 +29,12 @@
 
 
 void SwitchUser::Login(const char* cmd, const char* mcookie) {
-    SetEnvironment();
     SetUserId();
     SetClientAuth(mcookie);
     Execute(cmd);
 }
 
 
-void SwitchUser::SetEnvironment() {
-    char *term = getenv("TERM");
-    char** environ;
-    environ = (char **) new char*[2];
-    environ[0] = 0;
-    if(term)
-        putenv(StrConcat("TERM=", term));
-    putenv(StrConcat("HOME=", Pw->pw_dir));
-    putenv(StrConcat("SHELL=", Pw->pw_shell));
-    putenv(StrConcat("USER=", Pw->pw_name));
-    putenv(StrConcat("LOGNAME=", Pw->pw_name));
-    putenv(StrConcat("PATH=", cfg->getOption("default_path").c_str()));
-    putenv(StrConcat("DISPLAY=", displayName.c_str()));
-    putenv(StrConcat("MAIL="_PATH_MAILDIR"/", Pw->pw_name));
-    putenv(StrConcat("XAUTHORITY=", StrConcat(Pw->pw_dir,"/.Xauthority")));
-    /* putenv("XAUTHORITY=/tmp/serverauth"); */
-    chdir(Pw->pw_dir);
-}
-
-
 void SwitchUser::SetUserId() {
     if( (Pw == 0) ||
             (initgroups(Pw->pw_name, Pw->pw_gid) != 0) ||
@@ -66,42 +47,11 @@
 
 
 void SwitchUser::Execute(const char* cmd) {
-    char *args[4];
-    char* shell = strdup(Pw->pw_shell);
-    char *shell_basename = BaseName(shell);
-
-    args[0] = new char[strlen(shell_basename) + 2];
-    strcpy(args[0], "-");
-    strcat(args[0], shell_basename);
-    args[1] = "-c";
-    args[2] = (char*)cmd;
-    args[3] = 0;
-
-    execv(shell, args);
+    chdir(Pw->pw_dir);
+    execle(Pw->pw_shell, Pw->pw_shell, "-c", cmd, NULL, env);
     cerr << APPNAME << ": could not execute login command" << endl;
 }
 
-
-char* SwitchUser::BaseName(const char* name) {
-    const char *base = name;
-
-    while(*name) {
-        if(*name == '/')
-            base = name + 1;
-        ++name;
-    }
-
-    return (char*) base;
-}
-
-
-char* SwitchUser::StrConcat(const char* str1, const char* str2) {
-    char* tmp = new char[strlen(str1) + strlen(str2) + 1];
-    strcpy(tmp, str1);
-    strcat(tmp, str2);
-    return tmp;
-}
-
 void SwitchUser::SetClientAuth(const char* mcookie) {
     int r;
     string home = string(Pw->pw_dir);
diff -uNbr --exclude=.svn release-1.2.6/switchuser.h slim-pam/switchuser.h
--- release-1.2.6/switchuser.h	2006-07-15 02:33:52.000000000 +0200
+++ slim-pam/switchuser.h	2007-05-19 21:26:29.000000000 +0200
@@ -25,7 +25,8 @@
 
 class SwitchUser {
 public:
-    SwitchUser(struct passwd *pw, Cfg *c, const std::string& display);
+    SwitchUser(struct passwd *pw, Cfg *c, const std::string& display,
+               char** _env);
     ~SwitchUser();
     void Login(const char* cmd, const char* mcookie);
 
@@ -34,13 +35,12 @@
     void SetEnvironment();
     void SetUserId();
     void Execute(const char* cmd);
-    char* BaseName(const char* name);
-    char* StrConcat(const char* str1, const char* str2);
     void SetClientAuth(const char* mcookie);
     Cfg* cfg;
     struct passwd *Pw;
 
     std::string displayName;
+    char** env;
 };
 
 


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slim.spec	3 Sep 2007 19:37:32 -0000	1.2
+++ slim.spec	24 Sep 2007 19:52:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -17,6 +17,7 @@
 Patch0:         slim-1.2.6-make.patch
 Patch1:         slim-1.2.6-usexwd.patch
 Patch2:         slim-1.2.6-fedora.patch
+Patch3:         slim-1.2.6-pam.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -46,9 +47,10 @@
 %patch2 -p1 -b .fedora
 sed -e 's@/usr/X11R6/bin@%{_bindir}@g' -i.orig slim.conf
 cp -p %{SOURCE3} README.Fedora
+%patch3 -p1 -b .pam
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +98,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-7
+- backport PAM support from "slim-pam" branch, USE_PAM=1
+- backport fix for segfault on exit when testing themes.
+
 * Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
 - require system-logos instead of fedora-logos (#250365)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:54:30 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 15:54:30 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.20,1.21
Message-ID: <200709241954.l8OJsUj7010546@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10444

Modified Files:
	libXpm.spec 
Log Message:
buildreq gettext


Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXpm.spec	24 Sep 2007 19:44:54 -0000	1.20
+++ libXpm.spec	24 Sep 2007 19:53:57 -0000	1.21
@@ -9,6 +9,7 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: gettext
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel



From fedora-extras-commits at redhat.com  Mon Sep 24 19:54:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:54:40 -0400
Subject: rpms/scorched3d/devel scorched3d.desktop, 1.2, 1.3 scorched3d.spec, 
	1.24, 1.25
Message-ID: <200709241954.l8OJse2M010580@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10471

Modified Files:
	scorched3d.desktop scorched3d.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-6
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: scorched3d.desktop
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d.desktop	15 Aug 2007 09:35:27 -0000	1.2
+++ scorched3d.desktop	24 Sep 2007 19:54:08 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Scorched 3D
 Comment=A game based on the classic DOS game Scorched Earth
-Exec=scorched3d
+Exec=scorched3d-wrapper
 Icon=scorched3d.png
 Terminal=false
 Type=Application


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scorched3d.spec	28 Aug 2007 11:20:35 -0000	1.24
+++ scorched3d.spec	24 Sep 2007 19:54:08 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        40.1d
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
 BuildRequires:  expat-devel libvorbis-devel ImageMagick desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -62,6 +62,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html .
 
 # below is the desktop file and icon stuff.
@@ -94,13 +95,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING TODO html
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-6
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-5
 - Rebuild for new expat 2.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:56:00 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:56:00 -0400
Subject: rpms/supertuxkart/devel supertuxkart-0.3-desktop.patch, 1.1,
	1.2 supertuxkart.spec, 1.2, 1.3
Message-ID: <200709241956.l8OJu0q9010721@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10698

Modified Files:
	supertuxkart-0.3-desktop.patch supertuxkart.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
- Use opengl-games-utils wrapper to show error dialog when DRI is missing


supertuxkart-0.3-desktop.patch:

Index: supertuxkart-0.3-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supertuxkart-0.3-desktop.patch	15 Aug 2007 12:13:32 -0000	1.1
+++ supertuxkart-0.3-desktop.patch	24 Sep 2007 19:55:57 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up supertuxkart-0.3/data/supertuxkart.desktop~ supertuxkart-0.3/data/supertuxkart.desktop
---- supertuxkart-0.3/data/supertuxkart.desktop~	2007-08-15 13:08:37.000000000 +0200
-+++ supertuxkart-0.3/data/supertuxkart.desktop	2007-08-15 13:08:37.000000000 +0200
-@@ -1,7 +1,7 @@
+diff -up supertuxkart-0.3/data/supertuxkart.desktop.desktop supertuxkart-0.3/data/supertuxkart.desktop
+--- supertuxkart-0.3/data/supertuxkart.desktop.desktop	2007-06-15 09:28:43.000000000 +0200
++++ supertuxkart-0.3/data/supertuxkart.desktop	2007-09-24 21:24:54.000000000 +0200
+@@ -1,13 +1,12 @@
  [Desktop Entry]
  Encoding=UTF-8
  Name=Supertuxkart
@@ -10,7 +10,8 @@
  Comment=A kart racing game
  Comment[fr_FR]=Un jeu de karting
  Comment[ro_RO]=Un joc de curse cu carturi
-@@ -9,5 +9,4 @@ Exec=supertuxkart
+-Exec=supertuxkart
++Exec=supertuxkart-wrapper
  Terminal=false
  StartupNotify=false
  Type=Application


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supertuxkart.spec	15 Aug 2007 12:13:32 -0000	1.2
+++ supertuxkart.spec	24 Sep 2007 19:55:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           supertuxkart
 Version:        0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,6 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel SDL-devel freealut-devel mikmod-devel
 BuildRequires:  libvorbis-devel desktop-file-utils
+Requires:       hicolor-icon-theme opengl-games-utils
 # Provide so that yum install tuxkart will work, obsolete for auto upgrade
 Provides:       tuxkart = 0.4.0-6
 Obsoletes:      tuxkart < 0.4.0-6
@@ -48,6 +49,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # easier then patching all the Makefile's
 mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
 
@@ -88,7 +90,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO %{name}-images-legal.txt
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
 - New upstream release 0.3
 - Drop most patches (all fixed upstream)



From fedora-extras-commits at redhat.com  Mon Sep 24 19:57:42 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 15:57:42 -0400
Subject: rpms/nginx/devel .cvsignore, 1.11, 1.12 nginx.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200709241957.l8OJvg26011406@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11174

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.5.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Aug 2007 00:48:07 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:57:10 -0000	1.12
@@ -1 +1 @@
-nginx-0.5.31.tar.gz
+nginx-0.5.32.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nginx.spec	18 Aug 2007 18:22:11 -0000	1.12
+++ nginx.spec	24 Sep 2007 19:57:10 -0000	1.13
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        2%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-2
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Aug 2007 00:48:07 -0000	1.11
+++ sources	24 Sep 2007 19:57:10 -0000	1.12
@@ -1 +1 @@
-d84ef8e624b8953faf9cee2b5da535c1  nginx-0.5.31.tar.gz
+0088269b8a59a146b0ba9c9ee29853bb  nginx-0.5.32.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 19:57:57 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 15:57:57 -0400
Subject: rpms/pinball/devel pinball.desktop,1.2,1.3 pinball.spec,1.4,1.5
Message-ID: <200709241957.l8OJvvHQ011496@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pinball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11285

Modified Files:
	pinball.desktop pinball.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-9
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: pinball.desktop
===================================================================
RCS file: /cvs/extras/rpms/pinball/devel/pinball.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pinball.desktop	10 Mar 2007 10:49:28 -0000	1.2
+++ pinball.desktop	24 Sep 2007 19:57:25 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Pinball
 Comment=Emilia Pinball game
-Exec=pinball
+Exec=pinball-wrapper
 Icon=pinball.png
 Terminal=false
 Type=Application


Index: pinball.spec
===================================================================
RCS file: /cvs/extras/rpms/pinball/devel/pinball.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pinball.spec	15 Aug 2007 08:49:51 -0000	1.4
+++ pinball.spec	24 Sep 2007 19:57:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pinball
 Version:        0.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Emilia Pinball game
 Group:          Amusements/Games
 License:        GPL+
@@ -14,7 +14,7 @@
 BuildRequires:  libXt-devel freeglut-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  libpng-devel libvorbis-devel libtool-ltdl-devel
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 The Emilia Pinball project is an open source pinball simulator for linux
@@ -53,6 +53,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # remove unused global higescorefiles:
 rm -fr $RPM_BUILD_ROOT%{_localstatedir}
 # remove unused test module
@@ -90,7 +91,7 @@
 %files
 %defattr(-,root,root,-)
 %doc README ChangeLog
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lib*.so.*
 %{_libdir}/%{name}/lib*.la
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-9
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-8
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 19:59:58 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 24 Sep 2007 15:59:58 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.1,
	1.2 TurboGears.spec, 1.21, 1.22
Message-ID: <200709241959.l8OJxwNF011682@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11620

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
- Update setuptools patch to "fix" CherryPy dependency error



TurboGears-1.0.3.2-setuptools.patch:

Index: TurboGears-1.0.3.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.3.2-setuptools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.3.2-setuptools.patch	13 Sep 2007 20:36:29 -0000	1.1
+++ TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
@@ -1,8 +1,10 @@
---- setup.py.orig	2007-09-13 16:14:36.000000000 -0400
-+++ setup.py	2007-09-13 16:20:51.000000000 -0400
-@@ -18,32 +18,22 @@
+--- setup.py.orig	2007-09-24 15:30:20.000000000 -0400
++++ setup.py	2007-09-24 15:31:10.000000000 -0400
+@@ -16,34 +16,23 @@
+             "TurboJson >= 0.9.9",
+             "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
-             "CherryPy >= 2.2.1,<3.0.0alpha",
+-            "CherryPy >= 2.2.1,<3.0.0alpha",
              "simplejson >= 1.3",
 -            "elementtree >= 1.2.6",
              "PasteScript >= 0.9.7",
@@ -35,7 +37,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +117,7 @@
+@@ -127,7 +116,7 @@
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurboGears.spec	13 Sep 2007 20:38:06 -0000	1.21
+++ TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -84,6 +84,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
+- Update setuptools patch to "fix" CherryPy dependency error
+
 * Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
 - 1.0.3.2
 - Remove etree patch



From fedora-extras-commits at redhat.com  Mon Sep 24 20:00:23 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 16:00:23 -0400
Subject: rpms/nginx/F-7 .cvsignore, 1.11, 1.12 nginx.spec, 1.11, 1.12 sources,
	1.11, 1.12
Message-ID: <200709242000.l8OK0N2V011952@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11630

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.5.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Aug 2007 01:12:52 -0000	1.11
+++ .cvsignore	24 Sep 2007 19:59:50 -0000	1.12
@@ -1 +1 @@
-nginx-0.5.31.tar.gz
+nginx-0.5.32.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/nginx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nginx.spec	18 Aug 2007 18:36:18 -0000	1.11
+++ nginx.spec	24 Sep 2007 19:59:50 -0000	1.12
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        2%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-2
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Aug 2007 01:12:52 -0000	1.11
+++ sources	24 Sep 2007 19:59:50 -0000	1.12
@@ -1 +1 @@
-d84ef8e624b8953faf9cee2b5da535c1  nginx-0.5.31.tar.gz
+0088269b8a59a146b0ba9c9ee29853bb  nginx-0.5.32.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:00:54 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 13:00:54 -0700
Subject: [pkgdb] kernel: katzj has given up watchcommits
Message-ID: <200709242000.l8OK0sBP012493@app4.fedora.phx.redhat.com>

Jeremy Katz (katzj) has given up the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From fedora-extras-commits at redhat.com  Mon Sep 24 20:01:58 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:01:58 -0400
Subject: rpms/xen/devel xen-qemu-vnc-authentication.patch, 1.1,
	1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.1, 1.2
Message-ID: <200709242001.l8OK1wWH019170@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18739

Modified Files:
	xen-qemu-vnc-authentication.patch 
	xen-pvfb-02-qemu-pv-machine.patch 
Log Message:
Cast explicit VNC disply num to an int (rhbz #279581)

xen-qemu-vnc-authentication.patch:

Index: xen-qemu-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-authentication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-vnc-authentication.patch	28 Aug 2007 21:49:31 -0000	1.1
+++ xen-qemu-vnc-authentication.patch	24 Sep 2007 20:01:25 -0000	1.2
@@ -1965,8 +1965,8 @@
              vnclisten = config.get('vnclisten',
                                     xen.xend.XendOptions.instance().get_vnclisten_address())
              vncdisplay = config.get('vncdisplay', 0)
--            args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
-+            args += ['-vnc', "%s:%d%s" % (vnclisten, vncdisplay, vncopts)]
+-            args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
++            args += ['-vnc', "%s:%d%s" % (vnclisten, int(vncdisplay), vncopts)]
  
              if config.get('vncunused', 0):
                  args += ['-vncunused']

xen-pvfb-02-qemu-pv-machine.patch:

Index: xen-pvfb-02-qemu-pv-machine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-02-qemu-pv-machine.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-02-qemu-pv-machine.patch	28 Aug 2007 21:50:58 -0000	1.1
+++ xen-pvfb-02-qemu-pv-machine.patch	24 Sep 2007 20:01:25 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c	2007-09-24 13:22:06.000000000 -0400
 @@ -0,0 +1,231 @@
 +/*
 + * QEMU Xen PV Machine
@@ -233,9 +233,9 @@
 + *  tab-width: 4
 + * End:
 + */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:22:06.000000000 -0400
 @@ -370,6 +370,8 @@ VL_OBJS+= piix4acpi.o
  VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
@@ -245,9 +245,9 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
---- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c	2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
+--- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c	2007-09-24 13:22:06.000000000 -0400
 @@ -614,14 +614,15 @@ int main_loop(void)
      extern int shutdown_requested;
      extern int suspend_requested;
@@ -266,9 +266,9 @@
  
      while (!(vm_running && suspend_requested))
          /* Wait up to 10 msec. */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c	2007-08-23 10:53:46.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
+--- xen-3.1.0-src.orig/tools/ioemu/vl.c	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.c	2007-09-24 13:22:06.000000000 -0400
 @@ -168,7 +168,7 @@ int xc_handle;
  
  time_t timeoffset = 0;
@@ -296,9 +296,9 @@
                  break;
              case QEMU_OPTION_d:
                  domid = atoi(optarg);
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h	2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h	2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
+--- xen-3.1.0-src.orig/tools/ioemu/vl.h	2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.h	2007-09-24 13:22:06.000000000 -0400
 @@ -968,6 +968,7 @@ extern QEMUMachine pc_machine;
  extern QEMUMachine isapc_machine;
  #ifdef CONFIG_DM
@@ -307,10 +307,18 @@
  #endif
  extern int fd_bootchk;
  
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-08-23 10:54:47.000000000 -0400
-@@ -53,8 +53,10 @@ class VfbifController(DevController):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-05-18 10:45:21.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:22:54.000000000 -0400
+@@ -6,6 +6,7 @@ import xen.xend
+ import os
+ 
+ def spawn_detached(path, args, env):
++    log.debug("Spawn: " + str(args))
+     p = os.fork()
+     if p == 0:
+         os.spawnve(os.P_NOWAIT, path, args, env)
+@@ -50,8 +51,10 @@ class VfbifController(DevController):
              # is HVM, so qemu-dm will handle the vfb.
              return
          
@@ -323,7 +331,7 @@
          t = config.get("type", None)
          if t == "vnc":
              passwd = None
-@@ -68,26 +70,24 @@ class VfbifController(DevController):
+@@ -65,26 +68,24 @@ class VfbifController(DevController):
              else:
                  log.debug("No VNC passwd configured for vfb access")
  
@@ -338,7 +346,7 @@
                                     xen.xend.XendOptions.instance().get_vnclisten_address())
 -            args += [ "--listen", vnclisten ]
 +            vncdisplay = config.get('vncdisplay', 0)
-+            args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
++            args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
 +
 +            if config.get('vncunused', 0):
 +                args += ['-vncunused']
@@ -359,9 +367,9 @@
          else:
              raise VmError('Unknown vfb type %s (%s)' % (t, repr(config)))
  
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
 --- xen-3.1.0-src.orig/tools/xenfb/xenfb.c	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.c	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.c	2007-09-24 13:22:06.000000000 -0400
 @@ -677,37 +677,58 @@ static int xenfb_on_state_change(struct 
  	return 0;
  }
@@ -471,9 +479,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
 --- xen-3.1.0-src.orig/tools/xenfb/xenfb.h	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.h	2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.h	2007-09-24 13:22:06.000000000 -0400
 @@ -25,8 +25,12 @@ void xenfb_teardown(struct xenfb *xenfb)
  
  int xenfb_attach_dom(struct xenfb *xenfb, int domid);



From fedora-extras-commits at redhat.com  Mon Sep 24 20:03:42 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:03:42 -0400
Subject: rpms/xen/devel .cvsignore,1.33,1.34
Message-ID: <200709242003.l8OK3gPC020104@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975

Modified Files:
	.cvsignore 
Log Message:
Ignore local RPM builds & logs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	28 Aug 2007 21:49:31 -0000	1.33
+++ .cvsignore	24 Sep 2007 20:03:10 -0000	1.34
@@ -1 +1,3 @@
 xen-3.1.0-src.tgz
+*.rpm
+.build*.log



From fedora-extras-commits at redhat.com  Mon Sep 24 20:04:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:04:56 -0400
Subject: rpms/xorg-x11-drv-avivo/devel make-snapshot.sh, NONE,
	1.1 xorg-x11-drv-avivo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242004.l8OK4uWG020201@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	make-snapshot.sh xorg-x11-drv-avivo.spec 
Log Message:
initial import



--- NEW FILE make-snapshot.sh ---
#!/bin/sh

DIRNAME=xf86-video-avivo-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/avivo/xf86-video-avivo $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
rm -rf .git
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


--- NEW FILE xorg-x11-drv-avivo.spec ---
%define tarball xf86-video-avivo
%define driverdir %(pkg-config xorg-server --variable=moduledir)/drivers
%define gitdate 20070918
%define gitrev be7d380aba8d1ff2272bf2c931b2c9f78a549b46

Name:           xorg-x11-drv-avivo
Version:        0.0.1
Release:        4%{?dist}
Summary:        Xorg X11 AVIVO video drievr

Group:          User Interface/X Hardware Support
License:        GPLv2 and zlib
URL:            http://www.x.org/
# git snapshot.  To recreate, run
# % ./make-snapshot.sh %{gitrev}
Source0:        %{tarball}-%{gitdate}.tar.bz2
Source1:	make-snapshot.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake libtool pkgconfig
BuildRequires:  libpciaccess-devel
BuildRequires:  xorg-x11-server-sdk >= 1.3.0.0
Requires:       xorg-x11-server-Xorg >= 1.3.0.0

%description
X.Org X11 video driver for ATI R500 (AVIVO) cards and newer.

%prep
%setup -q -n %{tarball}-%{gitdate}

%build
autoreconf -v --install
# this is just paranoia.
%configure --disable-pciaccess
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{driverdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING STATUS
%{_bindir}/avivotool
%{driverdir}/avivo_drv.so

%changelog
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 0.0.1-4
- Package review feedback (#293801)

* Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 0.0.1-3
- Post-doc-drop git build.

* Wed Jul 25 2007 Adam Jackson <ajax at redhat.com> 0.0.1-2
- Updated git build.

* Thu Jun 14 2007 Adam Jackson <ajax at redhat.com> 0.0.1-1
- Initial revision.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Sep 2007 18:41:49 -0000	1.1
+++ .cvsignore	24 Sep 2007 20:04:22 -0000	1.2
@@ -0,0 +1 @@
+xf86-video-avivo-20070918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Sep 2007 18:41:49 -0000	1.1
+++ sources	24 Sep 2007 20:04:22 -0000	1.2
@@ -0,0 +1 @@
+6b4e61a1bd00094294f05f1789bacf4f  xf86-video-avivo-20070918.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:06:04 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:06:04 -0400
Subject: rpms/libICE import.log,1.1,1.2
Message-ID: <200709242006.l8OK64Ka020351@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Modified Files:
	import.log 
Log Message:
libICE 1.0.4



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 May 2007 23:08:09 -0000	1.1
+++ import.log	24 Sep 2007 20:05:31 -0000	1.2
@@ -0,0 +1 @@
+libICE-1_0_4-1_fc8:HEAD:libICE-1.0.4-1.fc8.src.rpm:1190663402



From fedora-extras-commits at redhat.com  Mon Sep 24 20:06:08 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:06:08 -0400
Subject: rpms/libICE/devel .cvsignore, 1.8, 1.9 libICE.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <200709242006.l8OK68v8020356@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293/devel

Modified Files:
	.cvsignore libICE.spec sources 
Log Message:
libICE 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2007 23:46:57 -0000	1.8
+++ .cvsignore	24 Sep 2007 20:05:34 -0000	1.9
@@ -1 +1 @@
-libICE-1.0.3.tar.bz2
+libICE-1.0.4.tar.bz2


Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libICE.spec	20 Sep 2007 19:36:26 -0000	1.21
+++ libICE.spec	24 Sep 2007 20:05:34 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libICE 1.0.4
+
 * Thu Sep 20 2007 Adam Jackson <ajax at redhat.com> 1.0.3-5
 - Update xtrans dep and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jan 2007 23:46:57 -0000	1.10
+++ sources	24 Sep 2007 20:05:34 -0000	1.11
@@ -1 +1 @@
-071f96648ac25c8e87a3de11a7de2d8a  libICE-1.0.3.tar.bz2
+4ab4e67e0b8845aa201e984153087f4a  libICE-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:07:14 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:07:14 -0400
Subject: rpms/xorg-x11-drv-avivo/devel xorg-x11-drv-avivo.spec,1.1,1.2
Message-ID: <200709242007.l8OK7EVU020429@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20407

Modified Files:
	xorg-x11-drv-avivo.spec 
Log Message:
typo fix


Index: xorg-x11-drv-avivo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/xorg-x11-drv-avivo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-avivo.spec	24 Sep 2007 20:04:22 -0000	1.1
+++ xorg-x11-drv-avivo.spec	24 Sep 2007 20:06:42 -0000	1.2
@@ -6,7 +6,7 @@
 Name:           xorg-x11-drv-avivo
 Version:        0.0.1
 Release:        4%{?dist}
-Summary:        Xorg X11 AVIVO video drievr
+Summary:        Xorg X11 AVIVO video driver
 
 Group:          User Interface/X Hardware Support
 License:        GPLv2 and zlib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:10:56 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 16:10:56 -0400
Subject: rpms/xorg-x11-drv-avivo/devel xorg-x11-drv-avivo.spec,1.2,1.3
Message-ID: <200709242010.l8OKAu8T020519@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20487

Modified Files:
	xorg-x11-drv-avivo.spec 
Log Message:
* Tue Sep 18 2007 Adam Jackson <ajax at redhat.com> 0.0.1-4
- Package review feedback (#293801)



Index: xorg-x11-drv-avivo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel/xorg-x11-drv-avivo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-avivo.spec	24 Sep 2007 20:06:42 -0000	1.2
+++ xorg-x11-drv-avivo.spec	24 Sep 2007 20:10:24 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           xorg-x11-drv-avivo
 Version:        0.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Xorg X11 AVIVO video driver
 
 Group:          User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Mon Sep 24 20:12:24 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 16:12:24 -0400
Subject: rpms/frysk/devel .cvsignore, 1.46, 1.47 frysk.spec, 1.114,
	1.115 sources, 1.46, 1.47
Message-ID: <200709242012.l8OKCOAZ020643@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20609

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Import frysk-0.0.1.2007.09.24.tar.bz2.
- Remove frysk-20060922-a-cast.patch
- Remove frysk-xfail-2130.patch.
- Run bootstrap.sh over source tree.
- Add autoconf, automake, and libtool to BuildRequires.
- Remove binutils-devel from BuildRequires.
- Build in separate sub-directory.
- Do not force JV_SCAN into the build environment.
- Update Licence.
- Change BuildRoot to prefered fedora format.
- Expand Summary to mention debugging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2007 16:03:08 -0000	1.46
+++ .cvsignore	24 Sep 2007 20:11:51 -0000	1.47
@@ -1 +1 @@
-frysk-0.0.1.2007.03.13.rh1.tar.bz2
+frysk-0.0.1.2007.09.24.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- frysk.spec	13 Mar 2007 16:40:08 -0000	1.114
+++ frysk.spec	24 Sep 2007 20:11:51 -0000	1.115
@@ -1,23 +1,29 @@
-Summary:	Frysk execution analysis tool
+Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
-Version:	0.0.1.2007.03.13.rh1
+Version:	0.0.1.2007.09.24
 Release:	1%{?dist}
-License:	GPL
+# antlrv2 is Public Domain; antlrv3 is BSD.
+# cdtparser is EPL
+# getopt is GPLv2 with exception
+# elfutils is GPLv2 with exception
+# frysk is GPLv2 with exception
+# junit licence is CPL (according to the junit rpm)
+# jline licence is BSD
+# libunwind is BSD
+License:	GPLv2 with exceptions and BSD and CPL and Public Domain and EPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands, which brand the file with the contents of version.in,
+# to generate the tarball:
+#  cvs -d:pserver:anoncvs at sourceware.org:/cvs/frysk export -D YYYY-MM-DD-gmt
+#  mv frysk frysk-`cat frysk/common/version.in`
+#  tar cf - frysk-`cat frysk/common/version.in` | bzip2 -9 > frysk-`cat frysk/common/version.in`.tar.bz2
 Source:		%{name}-%{version}.tar.bz2
 
 %define run_make_check 0
 
-%if %{run_make_check}
-# Disable the test which fails when building on older kernel.
-Patch0:		frysk-xfail-2130.patch
-%endif
-
-# Prevent a warning from a new g++:
-Patch1:		frysk-20060922-a-cast.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	glib-java >= 0.2.6
 
@@ -39,17 +45,16 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	gnome-python2-gconf
 BuildRequires:	audit-libs-devel
-
-# Fedora Core >= 6 and RHEL:
-%if "%{?fedora}" != "5"
-BuildRequires:	binutils-devel
-BuildRequires:	dogtail >= 0.5.2
+BuildRequires:	autoconf automake libtool
 
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 
+# Fedora Core >= 6 and RHEL:
+%if "%{?fedora}" != "5"
+BuildRequires:	dogtail >= 0.5.2
 # Needed by "dogtail-run-headless -n":
 Buildrequires:	metacity
 %endif
@@ -65,12 +70,13 @@
 %endif
 
 %description
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 %package devel
 Summary:        The development part of Frysk.
@@ -78,8 +84,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
-Frysk is an execution-analysis technology implemented using native Java and C++.
-This package contains the development part of Frysk.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
 Summary:        The GUI frontend of Frysk.
@@ -90,21 +96,19 @@
 Requires: 	libvte-java >= 0.12.0
 
 %description gnome
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 This package contains the GUI front end for Frysk.
 
 %prep
 %setup -q -n %{name}-%{version}
-%if %{run_make_check}
-%patch0
-%endif
-%patch1
+./bootstrap.sh
 
 %build 
 
@@ -119,22 +123,31 @@
 export CC=${CC:-/usr/bin/gcc}
 export CXX=${CXX:-/usr/bin/g++}
 export JAVA=${JAVA:-/usr/bin/gij}
-export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
 uname -a
 gcc --version
+pwd
+mkdir -p build
+cd build
+
+# Capture the configure line
+rm -f configure
+echo '#!/bin/sh -x'		>> configure
+echo 'exec ../configure "$@"'	>> configure
+chmod a+x configure
 
 # FIXME: Warnings should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
-	--disable-arch32-tests --disable-werror
-
+	--disable-arch32-tests
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
 touch frysk-gui/checked-glade-xml
 
-make %{?_smp_mflags}
+# in frysk-sys; make is building .o files before all BUILT_FILES are
+# created.
+make # %{?_smp_mflags}
 
 %if %{run_make_check}
 %check
@@ -148,22 +161,26 @@
 # Workaround for bug #??:
 mkdir -p $RPM_BUILD_ROOT/usr/share/frysk
 
+pwd
+cd build
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Fix timestamp of a generated script:
-touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
+touch -r \
+      ../frysk-gui/frysk-gui/frysk/gui/FryskGui.javain \
+      $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
-# ... well, these are not installed by current tarball...
-#for f in test2866.py test2985.py test3380.py; do
-#  touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
-#done
+for f in test2866.py test2985.py test3380.py; do
+    touch -r \
+    	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
+done
 
 # Workaround for #211824:
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop .
-
+mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -196,9 +213,15 @@
 %defattr(-,root,root)
 %{_libdir}/libfrysk-junit.so
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
+%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/fsystest
+%{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test_main_looper
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test?*
+%{_datadir}/%{name}/test-core
+%{_datadir}/%{name}/test_looper.xml
+# Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
 %{_datadir}/%{name}/dogtail_scripts
@@ -222,6 +245,19 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Import frysk-0.0.1.2007.09.24.tar.bz2.
+- Remove frysk-20060922-a-cast.patch
+- Remove frysk-xfail-2130.patch.
+- Run bootstrap.sh over source tree.
+- Add autoconf, automake, and libtool to BuildRequires.
+- Remove binutils-devel from BuildRequires.
+- Build in separate sub-directory.
+- Do not force JV_SCAN into the build environment.
+- Update Licence.
+- Change BuildRoot to prefered fedora format.
+- Expand Summary to mention debugging.
+
 * Tue Mar 13 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2007.03.13.rh1-1
 - New upstream version, adapt the file list.
 - Remove frysk-no-dejagnu.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2007 16:03:08 -0000	1.46
+++ sources	24 Sep 2007 20:11:51 -0000	1.47
@@ -1 +1 @@
-b87ee4af3553a31b12e0b430de1225d1  frysk-0.0.1.2007.03.13.rh1.tar.bz2
+34b8a93e1b7b9e4f97d3ae4c57f25d57  frysk-0.0.1.2007.09.24.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:54 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested watchbugzilla
Message-ID: <200709242014.l8OKEskK028380@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the watchbugzilla acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:54 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:54 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested watchcommits
Message-ID: <200709242014.l8OKEteH018476@app4.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the watchcommits acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:56 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:56 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested commit
Message-ID: <200709242014.l8OKEu4E028405@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the commit acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:14:58 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:14:58 -0700
Subject: [pkgdb] dbus-glib: dcbw has requested approveacls
Message-ID: <200709242014.l8OKEw9p028425@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has requested the approveacls acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:15:02 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:15:02 -0700
Subject: [pkgdb] dbus-glib: dcbw has given up watchbugzilla
Message-ID: <200709242015.l8OKF2lw028483@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has given up the watchbugzilla acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:15:08 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 13:15:08 -0700
Subject: [pkgdb] dbus-glib: dcbw has given up approveacls
Message-ID: <200709242015.l8OKF8Zv028546@app3.fedora.phx.redhat.com>

Daniel Williams (dcbw) has given up the approveacls acl on dbus-glib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:19:30 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:19:30 -0400
Subject: rpms/tremulous/devel tremulous.desktop, 1.2, 1.3 tremulous.spec, 1.2,
	1.3
Message-ID: <200709242019.l8OKJU2T022383@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tremulous/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22331

Modified Files:
	tremulous.desktop tremulous.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: tremulous.desktop
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tremulous.desktop	15 Aug 2007 13:34:33 -0000	1.2
+++ tremulous.desktop	24 Sep 2007 20:18:58 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Tremulous
 Comment=First person shooter
-Exec=tremulous
+Exec=tremulous-wrapper
 Icon=tremulous.png
 Terminal=false
 StartupNotify=false


Index: tremulous.spec
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tremulous.spec	15 Aug 2007 13:34:33 -0000	1.2
+++ tremulous.spec	24 Sep 2007 20:18:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tremulous
 Version:        1.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
@@ -16,6 +16,7 @@
 BuildRequires:  desktop-file-utils SDL-devel openal-devel libvorbis-devel
 BuildRequires:  libjpeg-devel
 Requires:       tremulous-data = %{version}
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Tremulous is a free, open source game that blends a team based FPS
@@ -65,6 +66,7 @@
   $RPM_BUILD_ROOT%{_bindir}/tremded
 install -m 0755 build/release-linux-*/tremulous.* \
   $RPM_BUILD_ROOT%{_bindir}/%{name}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -95,13 +97,16 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING GPL
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_bindir}/tremded
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-3
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:19:37 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Anders_F_Bj=C3=B6rklund?= (afb))
Date: Mon, 24 Sep 2007 16:19:37 -0400
Subject: rpms/slim/F-7 slim.spec,1.3,1.4 slim-1.2.6-pam.patch,1.1,1.2
Message-ID: <200709242019.l8OKJbuU022426@cvs-int.fedora.redhat.com>

Author: afb

Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353

Modified Files:
	slim.spec slim-1.2.6-pam.patch 
Log Message:
include another bugfix, while at it


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slim.spec	24 Sep 2007 19:52:58 -0000	1.3
+++ slim.spec	24 Sep 2007 20:19:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-8
+- backport fix for segfault when calling XCloseDisplay(NULL);
+
 * Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-7
 - backport PAM support from "slim-pam" branch, USE_PAM=1
 - backport fix for segfault on exit when testing themes.

slim-1.2.6-pam.patch:

Index: slim-1.2.6-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim-1.2.6-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slim-1.2.6-pam.patch	24 Sep 2007 19:52:58 -0000	1.1
+++ slim-1.2.6-pam.patch	24 Sep 2007 20:19:04 -0000	1.2
@@ -937,6 +937,26 @@
          StopServer(); 
          RemoveLock();
          Run();
+diff -ur slim-pam/app.cpp slim-1.3.0/app.cpp
+--- slim-pam/app.cpp	2007-06-07 04:18:21.000000000 +0200
++++ slim-1.3.0/app.cpp	2007-07-15 16:09:28.000000000 +0200
+@@ -135,6 +135,7 @@
+     ServerPID = -1;
+     testing = false;
+     mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
++    Dpy = NULL;
+ 
+     // Parse command line
+     while((tmp = getopt(argc, argv, "vhp:d?")) != EOF) {
+@@ -930,7 +931,7 @@
+ 
+     // Catch X error
+     XSetIOErrorHandler(IgnoreXIO);
+-    if(!setjmp(CloseEnv))
++    if(!setjmp(CloseEnv) && Dpy)
+         XCloseDisplay(Dpy);
+ 
+     // Send HUP to process group
 diff -uNbr --exclude=.svn release-1.2.6/app.h slim-pam/app.h
 --- release-1.2.6/app.h	2006-09-10 12:05:34.000000000 +0200
 +++ slim-pam/app.h	2007-05-19 21:26:29.000000000 +0200



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:41 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 24 Sep 2007 16:20:41 -0400
Subject: devel/anaconda .cvsignore, 1.446, 1.447 anaconda.spec, 1.582,
	1.583 sources, 1.575, 1.576
Message-ID: <200709242020.l8OKKfjK022517@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22489

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
- Blacklist some modules to try to avoid #299351
- Copy over media.repo if it exists
- Fix for pulling firmware
- Remove a useless progress window (#240459)
- Fix Romanian traceback (#292091)
- Catch an exception on repo setup (#295381)
- Fix network device tool tips
- Fix display of groups being installed vs no (#296581)
- Fix Serbian language/keyboard (msivak, #235709)
- Honor "boot from" dropdown more (msivak, #243556, #243799)
- Make sure people are adequately warned about booting from a drive 
  they're not installing to (msivak, #243799)
- Don't label lvm on live installs either (#297391)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- .cvsignore	20 Sep 2007 03:15:09 -0000	1.446
+++ .cvsignore	24 Sep 2007 20:20:08 -0000	1.447
@@ -1 +1 @@
-anaconda-11.3.0.32.tar.bz2
+anaconda-11.3.0.33.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- anaconda.spec	20 Sep 2007 03:15:09 -0000	1.582
+++ anaconda.spec	24 Sep 2007 20:20:08 -0000	1.583
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.32
+Version: 11.3.0.33
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
+- Blacklist some modules to try to avoid #299351
+- Copy over media.repo if it exists
+- Fix for pulling firmware
+- Remove a useless progress window (#240459)
+- Fix Romanian traceback (#292091)
+- Catch an exception on repo setup (#295381)
+- Fix network device tool tips
+- Fix display of groups being installed vs no (#296581)
+- Fix Serbian language/keyboard (msivak, #235709)
+- Honor "boot from" dropdown more (msivak, #243556, #243799)
+- Make sure people are adequately warned about booting from a drive 
+  they're not installing to (msivak, #243799)
+- Don't label lvm on live installs either (#297391)
+
 * Wed Sep 19 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.32-1
 - spec file cleanups (dcantrell)
 - lots of pychecker fixes (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- sources	20 Sep 2007 03:15:09 -0000	1.575
+++ sources	24 Sep 2007 20:20:08 -0000	1.576
@@ -1 +1 @@
-4bd27095e1ac6fe29efa20ab7b9a20f2  anaconda-11.3.0.32.tar.bz2
+43d84848afcbecc848acdb8546aaf486  anaconda-11.3.0.33.tar.bz2



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:37 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Mon, 24 Sep 2007 13:20:37 -0700
Subject: [pkgdb] dbus-glib had acl change status
Message-ID: <200709242020.l8OKKccN030324@app3.fedora.phx.redhat.com>

David Zeuthen (davidz) has set the watchcommits acl on dbus-glib (Fedora devel) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:20:40 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Mon, 24 Sep 2007 13:20:40 -0700
Subject: [pkgdb] dbus-glib had acl change status
Message-ID: <200709242020.l8OKKege020333@app4.fedora.phx.redhat.com>

David Zeuthen (davidz) has set the commit acl on dbus-glib (Fedora devel) to Approved for Daniel Williams (dcbw)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dbus-glib



From fedora-extras-commits at redhat.com  Mon Sep 24 20:23:58 2007
From: fedora-extras-commits at redhat.com (Marcin Zajaczkowski (szpak))
Date: Mon, 24 Sep 2007 16:23:58 -0400
Subject: rpms/isomaster/FC-6 isomaster-1.1-optflags.diff, NONE,
	1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1 .cvsignore,
	1.4, 1.5 isomaster.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200709242023.l8OKNwNp022752@cvs-int.fedora.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/isomaster/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7992

Modified Files:
	.cvsignore isomaster.spec sources 
Added Files:
	isomaster-1.1-optflags.diff isomaster-1.1-viewer-variable.diff 
Log Message:
Updated to 1.1



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 20:32:14 -0000	1.4
+++ .cvsignore	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/isomaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isomaster.spec	25 Aug 2007 17:37:30 -0000	1.5
+++ isomaster.spec	24 Sep 2007 20:23:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-#Source1:	isomaster.desktop
+Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#author is not sure about version, but 2.8 should be enough
-#removed because libgdk-x11-2.0.so.0 already forces gtk+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 20:32:14 -0000	1.4
+++ sources	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:24:15 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:24:15 -0400
Subject: rpms/maniadrive/devel maniadrive-track-editor.desktop, 1.1,
	1.2 maniadrive.desktop, 1.1, 1.2 maniadrive.spec, 1.2, 1.3
Message-ID: <200709242024.l8OKOF6U022762@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22703

Modified Files:
	maniadrive-track-editor.desktop maniadrive.desktop 
	maniadrive.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: maniadrive-track-editor.desktop
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive-track-editor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive-track-editor.desktop	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive-track-editor.desktop	24 Sep 2007 20:23:42 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ManiaDrive Track Editor
 Comment=Create new tracks for ManiaDrive
-Exec=maniadrive-track-editor
+Exec=maniadrive-track-editor-wrapper
 Icon=maniadrive.png
 Terminal=false
 StartupNotify=false


Index: maniadrive.desktop
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maniadrive.desktop	3 Sep 2007 19:18:20 -0000	1.1
+++ maniadrive.desktop	24 Sep 2007 20:23:42 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ManiaDrive
 Comment=Drive a car on acrobatic tracks
-Exec=maniadrive
+Exec=maniadrive-wrapper
 Icon=maniadrive.png
 Terminal=false
 StartupNotify=false


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maniadrive.spec	20 Sep 2007 18:09:29 -0000	1.2
+++ maniadrive.spec	24 Sep 2007 20:23:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,6 +15,7 @@
 BuildRequires:  freealut-devel libjpeg-devel libXinerama-devel
 BuildRequires:  libvorbis-devel desktop-file-utils
 Requires:       %{name}-data = %{version}, php-soap, hicolor-icon-theme
+Requires:       opengl-games-utils
 # for people who try to install this using upstream capitalization
 Provides:       ManiaDrive = %{version}-%{release}
 
@@ -89,7 +90,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/raydium/headers
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/raydium
 install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 install -m 755 %{name}-track-editor $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}-track-editor-wrapper
 install -m 755 libraydium.so.0.0 \
   $RPM_BUILD_ROOT%{_libdir}/libraydium-%{version}.so
 ln -s libraydium-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libraydium.so
@@ -136,12 +140,13 @@
 %defattr(-,root,root,-)
 # no docs these are all in the -data package
 %{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 %files track-editor
 %defattr(-,root,root,-)
-%{_bindir}/%{name}-track-editor
+%{_bindir}/%{name}-track-editor*
 %{_datadir}/applications/fedora-%{name}-track-editor.desktop
 
 %files -n raydium
@@ -156,6 +161,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Thu Sep 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-3
 - Rebuild for new php version
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:24:27 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:24:27 -0400
Subject: rpms/vegastrike/devel vegastrike-wrapper.sh, 1.1,
	1.2 vegastrike.spec, 1.6, 1.7
Message-ID: <200709242024.l8OKORf9022803@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	vegastrike-wrapper.sh vegastrike.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-7
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: vegastrike-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-wrapper.sh	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-wrapper.sh	24 Sep 2007 20:23:55 -0000	1.2
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
+
+checkDriOK vegastrike
+
 VSDATADIR=/usr/share/vegastrike
 VERSION=`head -1 $VSDATADIR/Version.txt`
 


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vegastrike.spec	28 Aug 2007 12:02:49 -0000	1.6
+++ vegastrike.spec	24 Sep 2007 20:23:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -51,6 +51,7 @@
 BuildRequires:  SDL_mixer-devel openal-devel freealut-devel libvorbis-devel
 BuildRequires:  automake desktop-file-utils
 Requires:       %{name}-data = %{version}, hicolor-icon-theme, gedit
+Requires:       opengl-games-utils
 
 %description
 Vega Strike is a GPL 3D OpenGL Action RPG space sim that allows a player to
@@ -153,6 +154,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-7
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-6
 - Rebuild for new expat 2.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:25:45 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:25:45 -0400
Subject: rpms/opengl-games-utils/devel opengl-game-functions.sh, NONE,
	1.1 opengl-game-wrapper.sh, 1.1, 1.2 opengl-games-utils.spec, 1.1, 1.2
Message-ID: <200709242025.l8OKPjlc022884@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22857

Modified Files:
	opengl-game-wrapper.sh opengl-games-utils.spec 
Added Files:
	opengl-game-functions.sh 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
- Put DRI checking functionality in a checkDriOK bash function in
  opengl-game-functions.sh, for usage from existing wrapper scripts



--- NEW FILE opengl-game-functions.sh ---
# check if DRI is available, show an error and exit if it isn't
function checkDriOK ()
{
  if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
    zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $1 cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
    exit 1;
  fi
}


Index: opengl-game-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-game-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-game-wrapper.sh	24 Sep 2007 17:35:35 -0000	1.1
+++ opengl-game-wrapper.sh	24 Sep 2007 20:25:12 -0000	1.2
@@ -1,15 +1,9 @@
 #!/bin/bash
 
-GAME=`basename $0 | sed 's/-wrapper.*//'`
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
 
-if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
-  zenity --error --text="Your system currently is not capable of hardware \
-accelerated 3D. Therefor $GAME cannot run.
+GAME=`basename $0 | sed 's/-wrapper.*//'`
 
-Usually the cause of this error is that there are no Free Software drivers \
-for your graphics card, please contact your graphics card manufacturer and \
-kindly ask them to provide Free Software support for your card."
-  exit 1;
-fi
+checkDriOK $GAME
 
 exec $GAME "$@"


Index: opengl-games-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/devel/opengl-games-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-games-utils.spec	24 Sep 2007 17:35:35 -0000	1.1
+++ opengl-games-utils.spec	24 Sep 2007 20:25:12 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           opengl-games-utils
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to check proper 3d support before launching 3d games
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://fedoraproject.org/wiki/SIGs/Games
 Source0:        opengl-game-wrapper.sh
-Source1:        README
+Source1:        opengl-game-functions.sh
+Source2:        README
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       zenity glx-utils
@@ -20,7 +21,7 @@
 
 %prep
 %setup -c -T
-cp %{SOURCE1} .
+cp %{SOURCE2} .
 
 
 %build
@@ -30,7 +31,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %clean
@@ -41,9 +44,14 @@
 %defattr(-,root,root,-)
 %doc README
 %{_bindir}/opengl-game-wrapper.sh
+%{_datadir}/%{name}
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
+- Put DRI checking functionality in a checkDriOK bash function in
+  opengl-game-functions.sh, for usage from existing wrapper scripts
+
 * Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
 - Various spelling fixes thanks to Rahul Sundaram
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:26:14 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 16:26:14 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.71,
	1.72 selinux-policy.spec, 1.532, 1.533
Message-ID: <200709242026.l8OKQEEl022951@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22928

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
- Fix maxima


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- policy-20070703.patch	24 Sep 2007 14:18:57 -0000	1.71
+++ policy-20070703.patch	24 Sep 2007 20:26:11 -0000	1.72
@@ -5080,20 +5080,29 @@
  
  /var/spool/cups(/.*)?		gen_context(system_u:object_r:print_spool_t,mls_systemhigh)
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.0.8/policy/modules/services/cups.if
+--- nsaserefpolicy/policy/modules/services/cups.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.if	2007-09-24 15:01:39.000000000 -0400
+@@ -247,3 +247,4 @@
+ 	files_search_pids($1)
+ 	stream_connect_pattern($1,ptal_var_run_t,ptal_var_run_t,ptal_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-21 09:12:45.000000000 -0400
-@@ -49,9 +49,6 @@
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-24 14:34:13.000000000 -0400
+@@ -48,9 +48,7 @@
+ type hplip_t;
  type hplip_exec_t;
  init_daemon_domain(hplip_t,hplip_exec_t)
- 
+-
 -type hplip_etc_t;
 -files_config_file(hplip_etc_t)
--
++domtrans_pattern(cupsd_t,hplip_exec_t, hplip_t)
+ 
  type hplip_var_run_t;
  files_pid_file(hplip_var_run_t)
- 
-@@ -81,12 +78,11 @@
+@@ -81,12 +79,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
@@ -5107,7 +5116,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;
-@@ -105,7 +101,7 @@
+@@ -105,7 +102,7 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
@@ -5116,7 +5125,7 @@
  allow cupsd_t cupsd_exec_t:lnk_file read;
  
  manage_files_pattern(cupsd_t,cupsd_log_t,cupsd_log_t)
-@@ -122,13 +118,13 @@
+@@ -122,13 +119,13 @@
  manage_sock_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
  files_pid_filetrans(cupsd_t,cupsd_var_run_t,file)
  
@@ -5132,7 +5141,7 @@
  kernel_read_system_state(cupsd_t)
  kernel_read_network_state(cupsd_t)
  kernel_read_all_sysctls(cupsd_t)
-@@ -150,21 +146,26 @@
+@@ -150,21 +147,26 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
  corenet_tcp_connect_all_ports(cupsd_t)
@@ -5160,7 +5169,7 @@
  mls_file_downgrade(cupsd_t)
  mls_file_write_all_levels(cupsd_t)
  mls_file_read_all_levels(cupsd_t)
-@@ -174,6 +175,7 @@
+@@ -174,6 +176,7 @@
  term_search_ptys(cupsd_t)
  
  auth_domtrans_chk_passwd(cupsd_t)
@@ -5168,7 +5177,7 @@
  auth_dontaudit_read_pam_pid(cupsd_t)
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
-@@ -187,7 +189,7 @@
+@@ -187,7 +190,7 @@
  # read python modules
  files_read_usr_files(cupsd_t)
  # for /var/lib/defoma
@@ -5177,7 +5186,7 @@
  files_list_world_readable(cupsd_t)
  files_read_world_readable_files(cupsd_t)
  files_read_world_readable_symlinks(cupsd_t)
-@@ -202,6 +204,7 @@
+@@ -202,6 +205,7 @@
  files_dontaudit_getattr_all_tmp_files(cupsd_t)
  
  selinux_compute_access_vector(cupsd_t)
@@ -5185,7 +5194,7 @@
  
  init_exec_script_files(cupsd_t)
  
-@@ -221,17 +224,37 @@
+@@ -221,17 +225,37 @@
  
  sysnet_read_config(cupsd_t)
  
@@ -5223,7 +5232,7 @@
  	apm_domtrans_client(cupsd_t)
  ')
  
-@@ -263,16 +286,16 @@
+@@ -263,16 +287,16 @@
  ')
  
  optional_policy(`
@@ -5244,7 +5253,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -331,6 +354,7 @@
+@@ -331,6 +355,7 @@
  dev_read_sysfs(cupsd_config_t)
  dev_read_urand(cupsd_config_t)
  dev_read_rand(cupsd_config_t)
@@ -5252,7 +5261,7 @@
  
  fs_getattr_all_fs(cupsd_config_t)
  fs_search_auto_mountpoints(cupsd_config_t)
-@@ -377,6 +401,14 @@
+@@ -377,6 +402,14 @@
  ')
  
  optional_policy(`
@@ -5267,7 +5276,7 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +558,6 @@
+@@ -526,11 +559,6 @@
  
  cups_stream_connect(hplip_t)
  
@@ -5279,7 +5288,7 @@
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
  
-@@ -560,7 +587,7 @@
+@@ -560,7 +588,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5288,7 +5297,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +614,6 @@
+@@ -587,8 +615,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -5338,7 +5347,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.8/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-21 06:44:48.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/dbus.if	2007-09-24 11:08:39.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -6217,9 +6226,31 @@
 +   userdom_write_unpriv_users_tmp_files(exim_t)
 +}
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.0.8/policy/modules/services/ftp.if
+--- nsaserefpolicy/policy/modules/services/ftp.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ftp.if	2007-09-24 15:42:55.000000000 -0400
+@@ -28,11 +28,13 @@
+ 		type ftpd_t;
+ 	')
+ 
+-	userdom_manage_user_home_content_files($1,ftpd_t)
+-	userdom_manage_user_home_content_symlinks($1,ftpd_t)
+-	userdom_manage_user_home_content_sockets($1,ftpd_t)
+-	userdom_manage_user_home_content_pipes($1,ftpd_t)
+-	userdom_user_home_dir_filetrans_user_home_content($1,ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	tunable_policy(`ftp_home_dir',`
++		userdom_manage_user_home_content_files($1,ftpd_t)
++		userdom_manage_user_home_content_symlinks($1,ftpd_t)
++		userdom_manage_user_home_content_sockets($1,ftpd_t)
++		userdom_manage_user_home_content_pipes($1,ftpd_t)
++		userdom_user_home_dir_filetrans_user_home_content($1,ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	')
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.8/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ftp.te	2007-09-17 16:39:01.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ftp.te	2007-09-24 15:47:19.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -7133,7 +7164,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.8/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-22 07:14:54.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/networkmanager.te	2007-09-24 11:09:11.000000000 -0400
 @@ -13,6 +13,9 @@
  type NetworkManager_var_run_t;
  files_pid_file(NetworkManager_var_run_t)
@@ -7163,17 +7194,18 @@
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
-@@ -138,6 +144,9 @@
+@@ -138,6 +144,10 @@
  	dbus_system_bus_client_template(NetworkManager,NetworkManager_t)
  	dbus_connect_system_bus(NetworkManager_t)
  	dbus_send_system_bus(NetworkManager_t)
++	dbus_dontaudit_rw_system_selinux_socket(NetworkManager_t)
 +	optional_policy(`
 +		rpm_dbus_chat(NetworkManager_t)
 +	')
  ')
  
  optional_policy(`
-@@ -173,8 +182,10 @@
+@@ -173,8 +183,10 @@
  ')
  
  optional_policy(`
@@ -9795,7 +9827,7 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.8/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-20 15:27:25.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.if	2007-09-24 16:08:36.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9818,6 +9850,15 @@
  	term_setattr_unallocated_ttys($1_xserver_t)
  	term_use_unallocated_ttys($1_xserver_t)
  
+@@ -251,7 +254,7 @@
+ 	userdom_user_home_content($1,$1_fonts_cache_t)
+ 
+ 	type $1_fonts_config_t, fonts_config_type;
+-	userdom_user_home_content($1,$1_fonts_cache_t)
++	userdom_user_home_content($1,$1_fonts_config_t)
+ 
+ 	type $1_iceauth_t;
+ 	domain_type($1_iceauth_t)
 @@ -282,6 +285,7 @@
  	domtrans_pattern($1_xserver_t, xauth_exec_t, $1_xauth_t)
  
@@ -10387,7 +10428,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-21 19:32:00.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 10:44:04.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10408,17 +10449,18 @@
  	dontaudit $2 shadow_t:file { getattr read };
  
  	# Transition from the user domain to this domain.
-@@ -169,6 +167,9 @@
+@@ -169,6 +167,10 @@
  ## </param>
  #
  interface(`auth_login_pgm_domain',`
 +	gen_require(`
 +		attribute keyring_type;
++		type auth_cache_t;
 +	')
  
  	domain_type($1)
  	domain_subj_id_change_exemption($1)
-@@ -176,11 +177,28 @@
+@@ -176,11 +178,28 @@
  	domain_obj_id_change_exemption($1)
  	role system_r types $1;
  
@@ -10447,7 +10489,7 @@
  	selinux_get_fs_mount($1)
  	selinux_validate_context($1)
  	selinux_compute_access_vector($1)
-@@ -196,22 +214,33 @@
+@@ -196,22 +215,33 @@
  	mls_fd_share_all_levels($1)
  
  	auth_domtrans_chk_passwd($1)
@@ -10482,7 +10524,7 @@
  	')
  ')
  
-@@ -309,9 +338,6 @@
+@@ -309,9 +339,6 @@
  		type system_chkpwd_t, chkpwd_exec_t, shadow_t;
  	')
  
@@ -10492,7 +10534,7 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +355,7 @@
+@@ -329,6 +356,7 @@
  
  	optional_policy(`
  		kerberos_use($1)
@@ -10500,7 +10542,7 @@
  	')
  
  	optional_policy(`
-@@ -347,6 +374,37 @@
+@@ -347,6 +375,37 @@
  
  ########################################
  ## <summary>
@@ -10538,7 +10580,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +753,24 @@
+@@ -695,6 +754,24 @@
  
  ########################################
  ## <summary>
@@ -10563,7 +10605,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1394,9 @@
+@@ -1318,14 +1395,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10578,7 +10620,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1452,163 @@
+@@ -1381,3 +1453,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -10744,7 +10786,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.8/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-22 08:12:19.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.te	2007-09-24 12:02:34.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -10798,7 +10840,15 @@
  dev_getattr_scanner_dev(pam_console_t)
  dev_setattr_scanner_dev(pam_console_t)
  dev_getattr_sound_dev(pam_console_t)
-@@ -236,7 +254,7 @@
+@@ -200,6 +218,7 @@
+ 
+ fs_list_auto_mountpoints(pam_console_t)
+ fs_list_noxattr_fs(pam_console_t)
++fs_getattr_all_fs(pam_console_t)
+ 
+ init_use_fds(pam_console_t)
+ init_use_script_ptys(pam_console_t)
+@@ -236,7 +255,7 @@
  
  optional_policy(`
  	xserver_read_xdm_pid(pam_console_t)
@@ -10807,7 +10857,7 @@
  ')
  
  ########################################
-@@ -302,3 +320,28 @@
+@@ -302,3 +321,28 @@
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
@@ -11017,8 +11067,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.8/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 09:49:24.000000000 -0400
-@@ -211,6 +211,20 @@
++++ serefpolicy-3.0.8/policy/modules/system/init.if	2007-09-24 10:08:01.000000000 -0400
+@@ -211,6 +211,21 @@
  			kernel_dontaudit_use_fds($1)
  		')
  	')
@@ -11029,6 +11079,7 @@
 +	   term_dontaudit_use_all_user_ttys($1)
 +	   term_dontaudit_use_all_user_ptys($1)
 +	 ')
++
 +	optional_policy(`
 +		tunable_policy(`allow_daemons_use_tty',`
 +		   unconfined_use_terminals($1)
@@ -11039,7 +11090,7 @@
  ')
  
  ########################################
-@@ -540,18 +554,19 @@
+@@ -540,18 +555,19 @@
  #
  interface(`init_spec_domtrans_script',`
  	gen_require(`
@@ -11063,7 +11114,7 @@
  	')
  ')
  
-@@ -567,18 +582,46 @@
+@@ -567,18 +583,46 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -11114,7 +11165,7 @@
  	')
  ')
  
-@@ -609,11 +652,11 @@
+@@ -609,11 +653,11 @@
  # cjp: added for gentoo integrated run_init
  interface(`init_script_file_domtrans',`
  	gen_require(`
@@ -11128,7 +11179,7 @@
  ')
  
  ########################################
-@@ -684,11 +727,11 @@
+@@ -684,11 +728,11 @@
  #
  interface(`init_getattr_script_files',`
  	gen_require(`
@@ -11142,7 +11193,7 @@
  ')
  
  ########################################
-@@ -703,11 +746,11 @@
+@@ -703,11 +747,11 @@
  #
  interface(`init_exec_script_files',`
  	gen_require(`
@@ -11156,7 +11207,7 @@
  ')
  
  ########################################
-@@ -931,6 +974,7 @@
+@@ -931,6 +975,7 @@
  
  	dontaudit $1 initrc_t:unix_stream_socket connectto;
  ')
@@ -11164,7 +11215,7 @@
  ########################################
  ## <summary>
  ##	Send messages to init scripts over dbus.
-@@ -1030,11 +1074,11 @@
+@@ -1030,11 +1075,11 @@
  #
  interface(`init_read_script_files',`
  	gen_require(`
@@ -11178,7 +11229,7 @@
  ')
  
  ########################################
-@@ -1252,7 +1296,7 @@
+@@ -1252,7 +1297,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -11187,7 +11238,7 @@
  ')
  
  ########################################
-@@ -1273,3 +1317,64 @@
+@@ -1273,3 +1318,64 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -11433,8 +11484,47 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.8/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-17 16:20:18.000000000 -0400
-@@ -283,6 +283,7 @@
++++ serefpolicy-3.0.8/policy/modules/system/ipsec.te	2007-09-24 10:16:55.000000000 -0400
+@@ -56,7 +56,6 @@
+ 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;
+-allow ipsec_t self:netlink_route_socket r_netlink_socket_perms;
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_t self:key_socket { create write read setopt };
+ allow ipsec_t self:fifo_file { read getattr };
+@@ -84,6 +83,8 @@
+ allow ipsec_mgmt_t ipsec_t:fifo_file rw_file_perms;
+ allow ipsec_mgmt_t ipsec_t:process sigchld;
+ 
++auth_use_nsswitch(ipsec_t)
++
+ kernel_read_kernel_sysctls(ipsec_t)
+ kernel_list_proc(ipsec_t)
+ kernel_read_proc_symlinks(ipsec_t)
+@@ -134,16 +135,10 @@
+ 
+ miscfiles_read_localization(ipsec_t)
+ 
+-sysnet_read_config(ipsec_t)
+-
+ userdom_dontaudit_use_unpriv_user_fds(ipsec_t)
+ userdom_dontaudit_search_sysadm_home_dirs(ipsec_t)
+ 
+ optional_policy(`
+-	nis_use_ypbind(ipsec_t)
+-')
+-
+-optional_policy(`
+ 	seutil_sigchld_newrole(ipsec_t)
+ ')
+ 
+@@ -278,11 +273,11 @@
+ #
+ 
+ allow racoon_t self:capability { net_admin net_bind_service };
+-allow racoon_t self:netlink_route_socket create_netlink_socket_perms;
+ allow racoon_t self:unix_dgram_socket { connect create ioctl write };
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
  allow racoon_t self:key_socket { create read setopt write };
@@ -11442,6 +11532,15 @@
  
  # manage pid file
  manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
+@@ -299,6 +294,8 @@
+ 
+ allow racoon_t ipsec_spd_t:association setcontext;
+ 
++auth_use_nsswitch(racoon_t)
++
+ kernel_read_network_state(racoon_t)
+ 
+ corenet_all_recvfrom_unlabeled(racoon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.0.8/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-09-12 10:34:51.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/iptables.te	2007-09-17 16:20:18.000000000 -0400
@@ -11478,7 +11577,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-18 10:51:20.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/libraries.fc	2007-09-24 15:26:50.000000000 -0400
 @@ -65,11 +65,12 @@
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -11511,7 +11610,7 @@
  /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # vmware 
-@@ -284,3 +289,8 @@
+@@ -284,3 +289,9 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -11520,6 +11619,7 @@
 +
 +/var/cache/ldconfig(/.*)?		    	gen_context(system_u:object_r:ldconfig_cache_t,s0)
 +/usr/lib/libFLAC\.so.* 	  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl/maxima  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/system/libraries.te	2007-09-19 13:33:20.000000000 -0400
@@ -12208,7 +12308,7 @@
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-21 15:33:57.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/lvm.te	2007-09-24 15:55:39.000000000 -0400
 @@ -44,9 +44,9 @@
  # Cluster LVM daemon local policy
  #
@@ -12221,7 +12321,23 @@
  dontaudit clvmd_t self:process ptrace;
  allow clvmd_t self:socket create_socket_perms;
  allow clvmd_t self:fifo_file rw_fifo_file_perms;
-@@ -85,6 +85,9 @@
+@@ -54,11 +54,15 @@
+ allow clvmd_t self:tcp_socket create_stream_socket_perms;
+ allow clvmd_t self:udp_socket create_socket_perms;
+ 
++init_dontaudit_getattr_initctl(clvmd_t)
++
+ manage_files_pattern(clvmd_t,clvmd_var_run_t,clvmd_var_run_t)
+ files_pid_filetrans(clvmd_t,clvmd_var_run_t,file)
+ 
+ read_files_pattern(clvmd_t,lvm_metadata_t,lvm_metadata_t)
+ 
++auth_use_nsswitch(clvmd_t)
++
+ kernel_read_kernel_sysctls(clvmd_t)
+ kernel_read_system_state(clvmd_t)
+ kernel_list_proc(clvmd_t)
+@@ -85,10 +89,15 @@
  corenet_sendrecv_generic_server_packets(clvmd_t)
  
  dev_read_sysfs(clvmd_t)
@@ -12231,7 +12347,18 @@
  dev_manage_generic_chr_files(clvmd_t)
  dev_rw_lvm_control(clvmd_t)
  dev_dontaudit_getattr_all_blk_files(clvmd_t)
-@@ -102,6 +105,7 @@
+ dev_dontaudit_getattr_all_chr_files(clvmd_t)
++dev_create_generic_dirs(clvmd_t)
++dev_delete_generic_dirs(clvmd_t)
+ 
+ files_read_etc_files(clvmd_t)
+ files_list_usr(clvmd_t)
+@@ -99,9 +108,12 @@
+ fs_dontaudit_read_removable_files(clvmd_t)
+ 
+ storage_dontaudit_getattr_removable_dev(clvmd_t)
++storage_dev_filetrans_fixed_disk(clvmd_t)
++storage_manage_fixed_disk(clvmd_t)
  
  domain_use_interactive_fds(clvmd_t)
  
@@ -12239,17 +12366,30 @@
  storage_raw_read_fixed_disk(clvmd_t)
  
  libs_use_ld_so(clvmd_t)
-@@ -113,6 +117,9 @@
+@@ -113,8 +125,9 @@
  
  seutil_dontaudit_search_config(clvmd_t)
  seutil_sigchld_newrole(clvmd_t)
+-
+-sysnet_read_config(clvmd_t)
 +seutil_read_config(clvmd_t)
 +seutil_read_file_contexts(clvmd_t)
 +seutil_search_default_contexts(clvmd_t)
  
- sysnet_read_config(clvmd_t)
+ userdom_dontaudit_use_unpriv_user_fds(clvmd_t)
+ userdom_dontaudit_search_sysadm_home_dirs(clvmd_t)
+@@ -131,10 +144,6 @@
+ ')
  
-@@ -150,7 +157,8 @@
+ optional_policy(`
+-	nis_use_ypbind(clvmd_t)
+-')
+-
+-optional_policy(`
+ 	ricci_dontaudit_rw_modcluster_pipes(clvmd_t)
+ 	ricci_dontaudit_use_modcluster_fds(clvmd_t)
+ ')
+@@ -150,7 +159,8 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
@@ -12259,7 +12399,7 @@
  dontaudit lvm_t self:capability sys_tty_config;
  allow lvm_t self:process { sigchld sigkill sigstop signull signal };
  # LVM will complain a lot if it cannot set its priority.
-@@ -208,7 +216,6 @@
+@@ -208,7 +218,6 @@
  selinux_compute_user_contexts(lvm_t)
  
  dev_create_generic_chr_files(lvm_t)
@@ -12267,7 +12407,7 @@
  dev_read_rand(lvm_t)
  dev_read_urand(lvm_t)
  dev_rw_lvm_control(lvm_t)
-@@ -228,6 +235,8 @@
+@@ -228,6 +237,8 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -12276,7 +12416,7 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -246,6 +255,7 @@
+@@ -246,6 +257,7 @@
  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)
@@ -12284,7 +12424,15 @@
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -275,6 +285,8 @@
+@@ -254,6 +266,7 @@
+ 
+ domain_use_interactive_fds(lvm_t)
+ 
++files_read_usr_files(lvm_t)
+ files_read_etc_files(lvm_t)
+ files_read_etc_runtime_files(lvm_t)
+ # for when /usr is not mounted:
+@@ -275,6 +288,8 @@
  seutil_search_default_contexts(lvm_t)
  seutil_sigchld_newrole(lvm_t)
  
@@ -12293,7 +12441,7 @@
  ifdef(`distro_redhat',`
  	# this is from the initrd:
  	files_rw_isid_type_dirs(lvm_t)
-@@ -293,5 +305,14 @@
+@@ -293,5 +308,14 @@
  ')
  
  optional_policy(`
@@ -13254,15 +13402,16 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-21 06:46:14.000000000 -0400
-@@ -10,3 +10,4 @@
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc	2007-09-24 15:27:43.000000000 -0400
+@@ -10,3 +10,5 @@
  /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/rhythmbox		    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/sbcl			    --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-21 19:31:25.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.if	2007-09-24 15:31:00.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- selinux-policy.spec	24 Sep 2007 14:18:57 -0000	1.532
+++ selinux-policy.spec	24 Sep 2007 20:26:12 -0000	1.533
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
+- Fix maxima
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-10
 - Eliminate rpm_t:fifo_file avcs
 - Fix dbus path for helper app



From fedora-extras-commits at redhat.com  Mon Sep 24 20:27:39 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:27:39 -0400
Subject: rpms/opengl-games-utils/F-7 opengl-game-functions.sh, NONE,
	1.1 opengl-game-wrapper.sh, 1.1, 1.2 opengl-games-utils.spec, 1.1, 1.2
Message-ID: <200709242027.l8OKRdDp023061@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/opengl-games-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23016

Modified Files:
	opengl-game-wrapper.sh opengl-games-utils.spec 
Added Files:
	opengl-game-functions.sh 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
- Put DRI checking functionality in a checkDriOK bash function in
  opengl-game-functions.sh, for usage from existing wrapper scripts



--- NEW FILE opengl-game-functions.sh ---
# check if DRI is available, show an error and exit if it isn't
function checkDriOK ()
{
  if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
    zenity --error --text="Your system currently is not capable of hardware \
accelerated 3D. Therefor $1 cannot run.

Usually the cause of this error is that there are no Free Software drivers \
for your graphics card, please contact your graphics card manufacturer and \
kindly ask them to provide Free Software support for your card."
    exit 1;
  fi
}


Index: opengl-game-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/F-7/opengl-game-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-game-wrapper.sh	24 Sep 2007 17:39:41 -0000	1.1
+++ opengl-game-wrapper.sh	24 Sep 2007 20:27:07 -0000	1.2
@@ -1,15 +1,9 @@
 #!/bin/bash
 
-GAME=`basename $0 | sed 's/-wrapper.*//'`
+. /usr/share/opengl-games-utils/opengl-game-functions.sh
 
-if [ `glxinfo | grep "direct rendering: " | cut -d " " -f 3` != Yes ]; then
-  zenity --error --text="Your system currently is not capable of hardware \
-accelerated 3D. Therefor $GAME cannot run.
+GAME=`basename $0 | sed 's/-wrapper.*//'`
 
-Usually the cause of this error is that there are no Free Software drivers \
-for your graphics card, please contact your graphics card manufacturer and \
-kindly ask them to provide Free Software support for your card."
-  exit 1;
-fi
+checkDriOK $GAME
 
 exec $GAME "$@"


Index: opengl-games-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/opengl-games-utils/F-7/opengl-games-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opengl-games-utils.spec	24 Sep 2007 17:39:41 -0000	1.1
+++ opengl-games-utils.spec	24 Sep 2007 20:27:07 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           opengl-games-utils
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to check proper 3d support before launching 3d games
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://fedoraproject.org/wiki/SIGs/Games
 Source0:        opengl-game-wrapper.sh
-Source1:        README
+Source1:        opengl-game-functions.sh
+Source2:        README
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       zenity glx-utils
@@ -20,7 +21,7 @@
 
 %prep
 %setup -c -T
-cp %{SOURCE1} .
+cp %{SOURCE2} .
 
 
 %build
@@ -30,7 +31,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %clean
@@ -41,9 +44,14 @@
 %defattr(-,root,root,-)
 %doc README
 %{_bindir}/opengl-game-wrapper.sh
+%{_datadir}/%{name}
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-3
+- Put DRI checking functionality in a checkDriOK bash function in
+  opengl-game-functions.sh, for usage from existing wrapper scripts
+
 * Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-2
 - Various spelling fixes thanks to Rahul Sundaram
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:27:40 2007
From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh))
Date: Mon, 24 Sep 2007 16:27:40 -0400
Subject: rpms/nginx/EL-5 nginx.spec,1.8,1.9
Message-ID: <200709242027.l8OKReeR023064@cvs-int.fedora.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23014

Modified Files:
	nginx.spec 
Log Message:
update to 0.5.32


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nginx.spec	18 Aug 2007 18:34:57 -0000	1.8
+++ nginx.spec	24 Sep 2007 20:27:08 -0000	1.9
@@ -7,8 +7,8 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.31
-Release:        3%{?dist}
+Version:        0.5.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -102,6 +102,14 @@
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 
+# convert to UTF-8 all files that give warnings.
+for textfile in CHANGES
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -149,6 +157,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
+- updated to 0.5.32
+- fixed rpmlint UTF-8 complaints.
+
 * Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-3
 - added --with-http_stub_status_module build option.
 - added --with-http_sub_module build option.



From fedora-extras-commits at redhat.com  Mon Sep 24 20:30:00 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 24 Sep 2007 16:30:00 -0400
Subject: rpms/sugar/OLPC-2 sources,1.60,1.61 sugar.spec,1.71,1.72
Message-ID: <200709242030.l8OKU0tK023422@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216

Modified Files:
	sources sugar.spec 
Log Message:
* Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	22 Sep 2007 13:13:24 -0000	1.60
+++ sources	24 Sep 2007 20:29:28 -0000	1.61
@@ -1 +1 @@
-8b23af473577511c6f1940e7c3918bf4  sugar-0.65-git5a595ea04e.tar.bz2
+a6fcc8a52918b882cd499d94e9521e39  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sugar.spec	22 Sep 2007 13:13:24 -0000	1.71
+++ sugar.spec	24 Sep 2007 20:29:28 -0000	1.72
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070922git
+%define alphatag 20070924git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.56.%{alphatag}5a595ea04e
+Release: 0.57.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
+- New snapshot
+
 * Sat Sep 22 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.56.20070922git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:32:15 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 16:32:15 -0400
Subject: rpms/fmtools/devel fmtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242032.l8OKWFhf023619@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:33:40 -0000	1.1
+++ .cvsignore	24 Sep 2007 20:31:43 -0000	1.2
@@ -0,0 +1,2 @@
+fmcontrol.tar.gz
+fmtools-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	24 Sep 2007 20:31:43 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:34:59 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 24 Sep 2007 16:34:59 -0400
Subject: rpms/eclipse-egit/devel .cvsignore, 1.4, 1.5 eclipse-egit.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709242034.l8OKYx25023864@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23785

Modified Files:
	.cvsignore eclipse-egit.spec sources 
Log Message:
* Mon Sep 24 2007 Ben Konrath <bkonrath at redhat.com> 0.3.0.fc8
- 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2007 19:31:56 -0000	1.4
+++ .cvsignore	24 Sep 2007 20:34:27 -0000	1.5
@@ -1 +1 @@
-egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-egit.spec	19 Sep 2007 19:34:14 -0000	1.7
+++ eclipse-egit.spec	24 Sep 2007 20:34:27 -0000	1.8
@@ -3,13 +3,13 @@
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.2.99
-Release:          0.git20070919%{?dist}
+Version:          0.3.0
+Release:          1%{?dist}
 License:          EPL GPLv2 LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
 
-# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=d4ad2f979b8a269612e816f63573cc76b7a067eb;sf=tgz
+# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=31185033bceae1c77b0f6a4182dea3fc56f882ba;sf=tgz
 Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
@@ -95,6 +95,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Ben Konrath <bkonrath at redhat.com> 0.3.0.fc8
+- 0.3.0
+
 * Wed Sep 19 2007 Ben Konrath <bkonrath at redhat.com> 0.2.99-0.git20070919.fc8
 - 0.2.99 git20070919
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2007 19:31:56 -0000	1.4
+++ sources	24 Sep 2007 20:34:27 -0000	1.5
@@ -1 +1 @@
-df080e37ee5d1154f0f8d49e9f7cbd8f  egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+c648dad399d82e2d72ba5d9e0b0782de  egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 20:35:45 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 16:35:45 -0400
Subject: rpms/frysk/devel frysk.spec,1.115,1.116
Message-ID: <200709242035.l8OKZjhn023946@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23779

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Fix touch paths to allow for build sub-directory.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- frysk.spec	24 Sep 2007 20:11:51 -0000	1.115
+++ frysk.spec	24 Sep 2007 20:35:13 -0000	1.116
@@ -167,7 +167,7 @@
 
 # Fix timestamp of a generated script:
 touch -r \
-      ../frysk-gui/frysk-gui/frysk/gui/FryskGui.javain \
+      ../frysk-gui/frysk/gui/FryskGui.javain \
       $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
 for f in test2866.py test2985.py test3380.py; do
@@ -246,6 +246,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.
 - Remove frysk-20060922-a-cast.patch
 - Remove frysk-xfail-2130.patch.



From fedora-extras-commits at redhat.com  Mon Sep 24 20:38:40 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:38:40 -0400
Subject: rpms/blobAndConquer/devel blobAndConquer.spec,1.6,1.7
Message-ID: <200709242038.l8OKceDL024261@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24074

Modified Files:
	blobAndConquer.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blobAndConquer.spec	21 Aug 2007 20:41:34 -0000	1.6
+++ blobAndConquer.spec	24 Sep 2007 20:38:08 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name:           blobAndConquer
 Version:        0.91
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+
@@ -19,7 +19,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 With the apparent defeat of Galdov and the reclaiming of the Fire, Time, Space
@@ -39,6 +39,8 @@
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
+sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
+  icons/blobAndConquer.desktop
 
 
 %build
@@ -56,6 +58,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
   ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 mkdir installed-docs
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
 
@@ -86,7 +89,7 @@
 %files
 %defattr(-,root,root,-)
 %doc installed-docs/*
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-3
 - Rebuild for buildId
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:39:07 2007
From: fedora-extras-commits at redhat.com (Ben Konrath (bkonrath))
Date: Mon, 24 Sep 2007 16:39:07 -0400
Subject: rpms/eclipse-egit/devel eclipse-egit.spec,1.8,1.9
Message-ID: <200709242039.l8OKd7Z5024477@cvs-int.fedora.redhat.com>

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24243

Modified Files:
	eclipse-egit.spec 
Log Message:
 fix source listing


Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-egit.spec	24 Sep 2007 20:34:27 -0000	1.8
+++ eclipse-egit.spec	24 Sep 2007 20:38:35 -0000	1.9
@@ -10,7 +10,7 @@
 Group:            Development/Tools
 
 # retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=31185033bceae1c77b0f6a4182dea3fc56f882ba;sf=tgz
-Source0:          egit-d4ad2f979b8a269612e816f63573cc76b7a067eb.tar.gz
+Source0:          egit-31185033bceae1c77b0f6a4182dea3fc56f882ba.tar.gz
 
 Requires:         eclipse-platform >= 1:3.2.1
 Requires:         git



From fedora-extras-commits at redhat.com  Mon Sep 24 20:39:21 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 24 Sep 2007 16:39:21 -0400
Subject: rpms/sugar/OLPC-2 sugar-0.65-jabberserver.patch,1.1,1.2
Message-ID: <200709242039.l8OKdLnh024550@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24312

Modified Files:
	sugar-0.65-jabberserver.patch 
Log Message:
update patch

sugar-0.65-jabberserver.patch:

Index: sugar-0.65-jabberserver.patch
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar-0.65-jabberserver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sugar-0.65-jabberserver.patch	17 Sep 2007 23:10:35 -0000	1.1
+++ sugar-0.65-jabberserver.patch	24 Sep 2007 20:38:48 -0000	1.2
@@ -1,11 +1,11 @@
---- sugar-0.65/sugar/profile.py.bak	2007-09-18 01:05:53.000000000 +0200
-+++ sugar-0.65/sugar/profile.py	2007-09-18 01:06:06.000000000 +0200
+--- sugar-0.65/sugar/profile.py.old	2007-09-24 22:35:48.000000000 +0200
++++ sugar-0.65/sugar/profile.py	2007-09-24 22:36:05.000000000 +0200
 @@ -24,7 +24,7 @@
  from sugar import util
  from sugar.graphics.xocolor import XoColor
  
 -DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
 +DEFAULT_JABBER_SERVER = 'jabber.laptop.org'
+ DEFAULT_VOLUME = 81
  
  _profile = None
- 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:43:35 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 24 Sep 2007 16:43:35 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.324,
	1.325 policycoreutils.spec, 1.451, 1.452
Message-ID: <200709242043.l8OKhZrU025755@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25684

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
- Show local changes with semanage


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- policycoreutils-rhat.patch	24 Sep 2007 17:45:50 -0000	1.324
+++ policycoreutils-rhat.patch	24 Sep 2007 20:43:32 -0000	1.325
@@ -36,9 +36,151 @@
  	}
  	free(scontext);
  	close(fd);
+diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.26/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2007-08-23 16:52:26.000000000 -0400
++++ policycoreutils-2.0.26/semanage/semanage	2007-09-24 16:41:52.000000000 -0400
+@@ -48,13 +48,14 @@
+ 
+ 	def usage(message = ""):
+ 		print _('\
+-semanage {login|user|port|interface|fcontext|translation} -l [-n] \n\
++semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] \n\
+ semanage login -{a|d|m} [-sr] login_name\n\
+ semanage user -{a|d|m} [-LrRP] selinux_name\n\
+ semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\
+ semanage interface -{a|d|m} [-tr] interface_spec\n\
+ semanage fcontext -{a|d|m} [-frst] file_spec\n\
+ semanage translation -{a|d|m} [-T] level\n\n\
++semanage boolean -{d|m} boolean\n\n\
+ \
+ Primary Options:\n\
+ \
+@@ -62,6 +63,8 @@
+ 	-d, --delete     Delete a OBJECT record NAME\n\
+ 	-m, --modify     Modify a OBJECT record NAME\n\
+ 	-l, --list       List the OBJECTS\n\n\
++	-C, --locallist  List OBJECTS local customizations\n\n\
++	-D, --deleteall  Remove all OBJECTS local customizations\n\
+ \
+ 	-h, --help       Display this message\n\
+ 	-n, --noheading  Do not print heading when listing OBJECTS\n\n\
+@@ -98,7 +101,7 @@
+ 
+ 	def get_options():
+ 		valid_option={}
+-		valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading' ]
++		valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall']
+ 		valid_option["login"] = []
+ 		valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
+ 		valid_option["user"] = []
+@@ -111,6 +114,8 @@
+ 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["translation"] = []
+ 		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
++		valid_option["boolean"] = []
++		valid_option["boolean"] += valid_everyone 
+ 		return valid_option
+ 
+ 	#
+@@ -134,7 +139,9 @@
+ 		add = 0
+ 		modify = 0
+ 		delete = 0
++		deleteall = 0
+ 		list = 0
++		locallist = 0
+ 		if len(sys.argv) < 3:
+ 			usage(_("Requires 2 or more arguments"))
+ 			
+@@ -146,14 +153,16 @@
+ 		args = sys.argv[2:]
+ 
+ 		gopts, cmds = getopt.getopt(args,
+-					    'adf:lhmnp:s:R:L:r:t:T:P:',
++					    'adf:lhmnp:s:CDR:L:r:t:T:P:',
+ 					    ['add',
+ 					     'delete',
++					     'deleteall',
+ 					     'ftype=',
+ 					     'help',
+ 					     'list', 
+ 					     'modify',
+ 					     'noheading',
++					     'localist',
+ 					     'proto=',
+ 					     'seuser=',
+ 					     'range=',
+@@ -177,6 +186,10 @@
+ 				if modify or add:
+ 					usage()
+ 				delete = 1
++			if o == "-D"  or o == "--deleteall":
++				if modify:
++                                       usage()
++				deleteall = 1
+ 			if o == "-f"  or o == "--ftype":
+ 				ftype=a
+ 			if o == "-h" or o == "--help":
+@@ -185,6 +198,9 @@
+ 			if o == "-n" or o == "--noheading":
+ 				heading=0
+ 
++			if o == "-C" or o == "--locallist":
++				locallist=1
++
+ 			if o == "-m"or o == "--modify":
+ 				if delete or add:
+ 					usage()
+@@ -236,17 +252,24 @@
+ 		if object == "fcontext":
+ 			OBJECT = seobject.fcontextRecords()
+ 		
++		if object == "boolean":
++			OBJECT = seobject.booleanRecords()
++		
+ 		if object == "translation":
+ 			OBJECT = seobject.setransRecords()
+ 		
+ 		if list:
+-			OBJECT.list(heading)
++			OBJECT.list(heading, locallist)
++			sys.exit(0);
++			
++		if deleteall:
++			OBJECT.deleteall()
+ 			sys.exit(0);
+ 			
+ 		if len(cmds) != 1:
+ 			usage()
+-
+-		target = cmds[0]
++                        
++                target = cmds[0]
+ 
+ 		if add:
+ 			if object == "login":
+@@ -274,6 +297,9 @@
+ 			sys.exit(0);
+ 			
+ 		if modify:
++			if object == "boolean":
++				OBJECT.modify(target, value)
++
+ 			if object == "login":
+ 				OBJECT.modify(target, seuser, serange)
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.26/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.26/semanage/seobject.py	2007-09-24 16:42:14.000000000 -0400
+@@ -170,7 +170,7 @@
+ 			rec += "%s=%s\n" %  (k, self.ddict[k])
+ 		return rec
+ 	
+-	def list(self,heading = 1):
++	def list(self,heading = 1, locallist = 0):
+ 		if heading:
+ 			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+ 		keys = self.ddict.keys()
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
@@ -47,7 +189,131 @@
                  
  class semanageRecords:
  	def __init__(self):
-@@ -1024,14 +1025,31 @@
+@@ -389,10 +390,12 @@
+ 		mylog.log(1,"delete SELinux user mapping", name);
+ 		semanage_seuser_key_free(k)
+ 
+-		
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ulist) = semanage_seuser_list(self.sh)
++                if locallist:
++                       (rc, self.ulist) = semanage_seuser_list_local(self.sh)
++                else:
++                       (rc, self.ulist) = semanage_seuser_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list login mappings"))
+ 
+@@ -401,8 +404,8 @@
+ 			ddict[name] = (semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u))
+ 		return ddict
+ 
+-	def list(self,heading = 1):
+-		ddict = self.get_all()
++	def list(self,heading = 1, locallist = 0):
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled == 1:
+@@ -601,9 +604,12 @@
+ 		mylog.log(1,"delete SELinux user record", name)
+ 		semanage_user_key_free(k)		
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ulist) = semanage_user_list(self.sh)
++                if locallist:
++                       (rc, self.ulist) = semanage_user_list_local(self.sh)
++                else:
++                       (rc, self.ulist) = semanage_user_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list SELinux users"))
+ 
+@@ -618,8 +624,8 @@
+ 
+ 		return ddict
+ 
+-	def list(self, heading = 1):
+-		ddict = self.get_all()
++	def list(self, heading = 1, locallist = 0):
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled == 1:
+@@ -795,9 +801,12 @@
+ 		
+ 		semanage_port_key_free(k)
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.plist) = semanage_port_list(self.sh)
++                if locallist:
++                       (rc, self.plist) = semanage_port_list_local(self.sh)
++                else:
++                       (rc, self.plist) = semanage_port_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list ports"))
+ 
+@@ -814,9 +823,12 @@
+ 			ddict[(low, high)] = (ctype, proto_str, level)
+ 		return ddict
+ 
+-	def get_all_by_type(self):
++	def get_all_by_type(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.plist) = semanage_port_list(self.sh)
++                if locallist:
++                       (rc, self.plist) = semanage_port_list_local(self.sh)
++                else:
++                       (rc, self.plist) = semanage_port_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list ports"))
+ 
+@@ -837,10 +849,10 @@
+ 				ddict[(ctype,proto_str)].append("%d-%d" % (low, high))
+ 		return ddict
+ 
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number"))
+-		ddict = self.get_all_by_type()
++		ddict = self.get_all_by_type(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		for i in keys:
+@@ -995,9 +1007,12 @@
+ 		
+ 		semanage_iface_key_free(k)
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.ilist) = semanage_iface_list(self.sh)
++                if locallist:
++                       (rc, self.ilist) = semanage_iface_list_local(self.sh)
++                else:
++                       (rc, self.ilist) = semanage_iface_list(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not list interfaces"))
+ 
+@@ -1007,10 +1022,10 @@
+ 
+ 		return ddict
+ 			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %s\n" % (_("SELinux Interface"), _("Context"))
+-		ddict = self.get_all()
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		keys.sort()
+ 		if is_mls_enabled:
+@@ -1024,14 +1039,31 @@
  	def __init__(self):
  		semanageRecords.__init__(self)
  		
@@ -84,14 +350,16 @@
  			
  		if type == "":
  			raise ValueError(_("SELinux Type is required"))
-@@ -1051,33 +1069,23 @@
+@@ -1051,33 +1083,23 @@
  			raise ValueError(_("Could not create file context for %s") % target)
  		
  		rc = semanage_fcontext_set_expr(self.sh, fcontext, target)
 -		(rc, con) = semanage_context_create(self.sh)
 -		if rc < 0:
 -			raise ValueError(_("Could not create context for %s") % target)
--
++                if type != "<<none>>":
++                       con = self.createcon(target, seuser)
+ 
 -		rc = semanage_context_set_user(self.sh, con, seuser)
 -		if rc < 0:
 -			raise ValueError(_("Could not set user in file context for %s") % target)
@@ -103,9 +371,7 @@
 -		rc = semanage_context_set_type(self.sh, con, type)
 -		if rc < 0:
 -			raise ValueError(_("Could not set type in file context for %s") % target)
-+                if type != "<<none>>":
-+                       con = self.createcon(target, seuser)
- 
+-
 -		if serange != "":
 -			rc = semanage_context_set_mls(self.sh, con, serange)
 -			if rc < 0:
@@ -131,7 +397,7 @@
  		rc = semanage_begin_transaction(self.sh)
  		if rc < 0:
  			raise ValueError(_("Could not start semanage transaction"))
-@@ -1090,7 +1098,8 @@
+@@ -1090,7 +1112,8 @@
  		if rc < 0:
  			raise ValueError(_("Could not add file context for %s") % target)
  
@@ -141,7 +407,7 @@
  		semanage_fcontext_key_free(k)
  		semanage_fcontext_free(fcontext)
  
-@@ -1112,16 +1121,29 @@
+@@ -1112,16 +1135,29 @@
  		if rc < 0:
  			raise ValueError(_("Could not query file context for %s") % target)
  
@@ -180,7 +446,96 @@
  		if rc < 0:
  			raise ValueError(_("Could not start semanage transaction"))
  
-@@ -1283,9 +1305,12 @@
+@@ -1167,17 +1203,20 @@
+ 
+ 		semanage_fcontext_key_free(k)		
+ 
+-	def get_all(self):
++	def get_all(self, locallist = 0):
+ 		l = []
+-		(rc, self.flist) = semanage_fcontext_list(self.sh)
+-		if rc < 0:
+-			raise ValueError(_("Could not list file contexts"))
+-
+-		(rc, fclocal) = semanage_fcontext_list_local(self.sh)
+-		if rc < 0:
+-			raise ValueError(_("Could not list local file contexts"))
++                if locallist:
++                       (rc, self.flist) = semanage_fcontext_list_local(self.sh)
++                else:
++                       (rc, self.flist) = semanage_fcontext_list(self.sh)
++                       if rc < 0:
++                              raise ValueError(_("Could not list file contexts"))
++
++                       (rc, fclocal) = semanage_fcontext_list_local(self.sh)
++                       if rc < 0:
++                              raise ValueError(_("Could not list local file contexts"))
+ 
+-		self.flist += fclocal
++                       self.flist += fclocal
+ 
+ 		for fcontext in self.flist:
+ 			expr = semanage_fcontext_get_expr(fcontext)
+@@ -1191,10 +1230,10 @@
+ 
+ 		return l
+ 			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0 ):
+ 		if heading:
+ 			print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+-		fcon_list = self.get_all()
++		fcon_list = self.get_all(locallist)
+ 		for fcon in fcon_list:
+ 			if len(fcon) > 3:
+ 				if is_mls_enabled:
+@@ -1266,34 +1305,62 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not start semanage transaction"))
+ 
+-		rc = semanage_fcontext_del_local(self.sh, k)
++		rc = semanage_bool_del_local(self.sh, k)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not delete boolean %s") % name)
+ 	
+ 		rc = semanage_commit(self.sh)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not delete boolean %s") % name)
+-		
+ 		semanage_bool_key_free(k)
+ 
+-	def get_all(self):
++	def deleteall(self):
++		(rc, self.blist) = semanage_bool_list_local(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not list booleans"))
++
++		rc = semanage_begin_transaction(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not start semanage transaction"))
++
++		for boolean in self.blist:
++                       name = semanage_bool_get_name(boolean)
++                       (rc,k) = semanage_bool_key_create(self.sh, name)
++                       if rc < 0:
++                              raise ValueError(_("Could not create a key for %s") % name)
++
++                       rc = semanage_bool_del_local(self.sh, k)
++                       if rc < 0:
++                              raise ValueError(_("Could not delete boolean %s") % name)
++                       semanage_bool_key_free(k)
++	
++		rc = semanage_commit(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not delete boolean %s") % name)
++	def get_all(self, locallist = 0):
+ 		ddict = {}
+-		(rc, self.blist) = semanage_bool_list(self.sh)
++                if locallist:
++                       (rc, self.blist) = semanage_bool_list_local(self.sh)
++                else:
++                       (rc, self.blist) = semanage_bool_list(self.sh)
+ 		if rc < 0:
  			raise ValueError(_("Could not list booleans"))
  
  		for boolean in self.blist:
@@ -189,13 +544,25 @@
 -			ddict[name] = value
 +                       value = []
 +                       name = semanage_bool_get_name(boolean)
-+                       value[0] = semanage_bool_get_value(boolean)
-+                       value[1] = selinux.security_get_boolean_pending(boolean)
-+                       value[2] = selinux.security_get_boolean_active(boolean)
++                       value.append(semanage_bool_get_value(boolean))
++                       value.append(selinux.security_get_boolean_pending(name))
++                       value.append(selinux.security_get_boolean_active(name))
 +                       ddict[name] = value
  
  		return ddict
  			
+-	def list(self, heading = 1):
++	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+-			print "%-50s %-18s\n" % (_("SELinux boolean"), _("value"))
+-		ddict = self.get_all()
++			print "%-50s %7s %7s %7s\n" % (_("SELinux boolean"), _("value"), _("pending"),  _("active") )
++		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+ 		for k in keys:
+ 			if ddict[k]:
+-				print "%-50s %-18s " % (k[0], ddict[k][0])
++				print "%-50s %7d %7d %7d " % (k, ddict[k][0],ddict[k][1], ddict[k][2])
 diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.26/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2007-07-16 14:20:42.000000000 -0400
 +++ policycoreutils-2.0.26/semodule/semodule.8	2007-09-18 16:40:57.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- policycoreutils.spec	24 Sep 2007 16:22:04 -0000	1.451
+++ policycoreutils.spec	24 Sep 2007 20:43:33 -0000	1.452
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.26
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,9 @@
 fi
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
+- Show local changes with semanage
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-2
 - Fixed spelling mistakes in booleans defs
 - Update po



From fedora-extras-commits at redhat.com  Mon Sep 24 20:45:33 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:45:33 -0400
Subject: rpms/machineball/devel machineball.desktop, 1.1,
	1.2 machineball.spec, 1.2, 1.3
Message-ID: <200709242045.l8OKjX0k027497@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/machineball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26985

Modified Files:
	machineball.desktop machineball.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: machineball.desktop
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- machineball.desktop	12 May 2007 08:27:14 -0000	1.1
+++ machineball.desktop	24 Sep 2007 20:45:01 -0000	1.2
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Name=machineball
 Comment=A futuristic ball game with simple rules
-Exec=machineball
+Exec=machineball-wrapper
 StartupNotify=false
 Terminal=false
 Type=Application


Index: machineball.spec
===================================================================
RCS file: /cvs/extras/rpms/machineball/devel/machineball.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- machineball.spec	15 Aug 2007 07:26:18 -0000	1.2
+++ machineball.spec	24 Sep 2007 20:45:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           machineball
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A futuristic ball game with simple rules
 Group:          Amusements/Games
 License:        GPL+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alleggl-devel libGLU-devel ode-devel dumb-devel allegro-tools
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Machine Ball is a futuristic sport with amazing 3D graphics and realistic
@@ -35,6 +35,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 install -m 755 %{name} $RPM_BUILD_ROOT/usr/bin
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -69,12 +70,15 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:45:37 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 16:45:37 -0400
Subject: rpms/clanbomber/devel clanbomber.desktop, 1.2, 1.3 clanbomber.spec, 
	1.5, 1.6
Message-ID: <200709242045.l8OKjbmv027636@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27020

Modified Files:
	clanbomber.desktop clanbomber.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: clanbomber.desktop
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clanbomber.desktop	10 Mar 2007 10:08:58 -0000	1.2
+++ clanbomber.desktop	24 Sep 2007 20:45:04 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ClanBomber
 Comment=Bomberman-like multiplayer game
-Exec=clanbomber
+Exec=clanbomber-wrapper
 Icon=clanbomber.png
 Terminal=false
 StartupNotify=false


Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clanbomber.spec	6 Aug 2007 08:15:49 -0000	1.5
+++ clanbomber.spec	24 Sep 2007 20:45:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Bomberman-like multiplayer game that uses ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 Patch1:         clanbomber-1.05-namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib06-devel zlib-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib,
@@ -37,6 +37,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -68,13 +69,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog IDEAS QUOTES README
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-5
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Mon Sep 24 20:52:15 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 16:52:15 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch, NONE, 1.1 xen.spec, 1.184, 
	1.185 xen-pvfb-compat.patch, 1.2, NONE xen-pvfb-no-hvm.patch,
	1.1, NONE xen-pvfb-terminate.patch, 1.1, NONE
Message-ID: <200709242052.l8OKqFd3031217@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30613

Modified Files:
	xen.spec 
Added Files:
	xen-pvfb-04-compat.patch 
Removed Files:
	xen-pvfb-compat.patch xen-pvfb-no-hvm.patch 
	xen-pvfb-terminate.patch 
Log Message:
Re-add backcompat support for FC6 era PVFB

xen-pvfb-04-compat.patch:

--- NEW FILE xen-pvfb-04-compat.patch ---
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 13:46:13.000000000 -0400
@@ -0,0 +1,569 @@
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <xenctrl.h>
+#include <xen/io/xenbus.h>
+#include <sys/select.h>
+#include <stdbool.h>
+#include <xen/linux/evtchn.h>
+#include <xen/event_channel.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <xs.h>
+
+#include "xenfb.h"
+#include "oldxenfb.h"
+#include "oldxenkbd.h"
+
+// FIXME defend against malicious frontend?
+
+/* 
+ * NB our back-compat hack relies on these structs being the same size
+ * or smaller than the same named structs in xenfb.c, and having the
+ * same field offsets in both. Do not change this !
+ */
+struct xenfb_device {
+	const char *devicetype;
+	char nodename[64];	/* backend xenstore dir */
+	char otherend[64];	/* frontend xenstore dir */
+	int otherend_id;	/* frontend domid */
+	enum xenbus_state state; /* backend state */
+	void *page;		/* shared page */
+	evtchn_port_t port;
+	struct xenfb_private *xenfb;
+};
+
+struct xenfb_private {
+	struct xenfb pub;
+	int evt_xch;		/* event channel driver handle */
+	int xc;			/* hypervisor interface handle */
+	struct xs_handle *xsh;	/* xs daemon handle */
+	struct xenfb_device fb, kbd;
+	size_t fb_len;		/* size of framebuffer */
+};
+
+static void oldxenfb_detach_dom(struct xenfb_private *);
+static int oldxenfb_fb_event(struct xenfb_private *, union xenfb_in_event *);
+
+static char *oldxenfb_path_in_dom(struct xs_handle *xsh,
+				  char *buf, size_t size,
+				  unsigned domid, const char *fmt, ...)
+{
+	va_list ap;
+	char *domp = xs_get_domain_path(xsh, domid);
+	int n;
+
+        if (domp == NULL)
+		return NULL;
+
+	n = snprintf(buf, size, "%s/", domp);
+	free(domp);
+	if (n >= size)
+		return NULL;
+
+	va_start(ap, fmt);
+	n += vsnprintf(buf + n, size - n, fmt, ap);
+	va_end(ap);
+	if (n >= size)
+		return NULL;
+
+	return buf;
+}
+
+static int oldxenfb_xs_scanf1(struct xs_handle *xsh,
+			      const char *dir, const char *node,
+			      const char *fmt, void *dest)
+{
+	char buf[1024];
+	char *p;
+	int ret;
+
+	if (snprintf(buf, sizeof(buf), "%s/%s", dir, node) >= sizeof(buf)) {
+		errno = ENOENT;
+		return -1;
+        }
+	p = xs_read(xsh, XBT_NULL, buf, NULL);
+	if (!p) {
+		errno = ENOENT;
+		return -1;
+        }
+	ret = sscanf(p, fmt, dest);
+	free(p);
+	if (ret != 1) {
+		errno = EDOM;
+		return -1;
+        }
+	return ret;
+}
+
+static int oldxenfb_xs_printf(struct xs_handle *xsh,
+			      const char *dir, const char *node, char *fmt, ...)
+{
+	va_list ap;
+	char key[1024];
+	char val[1024];
+	int n;
+
+	if (snprintf(key, sizeof(key), "%s/%s", dir, node) >= sizeof(key)) {
+		errno = ENOENT;
+		return -1;
+        }
+
+	va_start(ap, fmt);
+	n = vsnprintf(val, sizeof(val), fmt, ap);
+	va_end(ap);
+	if (n >= sizeof(val)) {
+		errno = ENOSPC; /* close enough */
+		return -1;
+	}
+
+	if (!xs_write(xsh, XBT_NULL, key, val, n))
+		return -1;
+	return 0;
+}
+
+int oldxenfb_device_set_domain(struct xenfb_device *dev, int domid)
+{
+	struct xenfb_private *xenfb = dev->xenfb;
+
+	dev->otherend_id = domid;
+
+	if (!oldxenfb_path_in_dom(xenfb->xsh,
+				  dev->otherend, sizeof(dev->otherend),
+				  domid, "device/%s/0", dev->devicetype)) {
+		errno = ENOENT;
+		return -1;
+	}
+	if (!oldxenfb_path_in_dom(xenfb->xsh,
+				  dev->nodename, sizeof(dev->nodename),
+				  0, "backend/%s/%d/0", dev->devicetype, domid)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	return 0;
+}
+
+
+static enum xenbus_state oldxenfb_read_state(struct xs_handle *xsh,
+					     const char *dir)
+{
+	int ret, state;
+
+	ret = oldxenfb_xs_scanf1(xsh, dir, "state", "%d", &state);
+	if (ret < 0)
+		return XenbusStateUnknown;
+
+	if ((unsigned)state > XenbusStateClosed)
+		state = XenbusStateUnknown;
+	return state;
+}
+
+static int oldxenfb_switch_state(struct xenfb_device *dev,
+				 enum xenbus_state state)
+{
+	struct xs_handle *xsh = dev->xenfb->xsh;
+
+	if (oldxenfb_xs_printf(xsh, dev->nodename, "state", "%d", state) < 0)
+		return -1;
+	dev->state = state;
+	return 0;
+}
+
+
+static int oldxenfb_map_fb(struct xenfb_private *xenfb, int domid)
+{
+	struct xenfb_page *page = xenfb->fb.page;
+	int n_fbmfns;
+	int n_fbdirs;
+	unsigned long *fbmfns;
+
+	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
+	n_fbdirs = n_fbmfns * sizeof(unsigned long);
+	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
+
+	/*
+	 * Bug alert: xc_map_foreign_batch() can fail partly and
+	 * return a non-null value.  This is a design flaw.  When it
+	 * happens, we happily continue here, and later crash on
+	 * access.
+	 */
+	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
+			PROT_READ, page->pd, n_fbdirs);
+	if (fbmfns == NULL)
+		return -1;
+
+	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
+				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
+	if (xenfb->pub.pixels == NULL) {
+		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+		return -1;
+	}
+
+	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+}
+
+static int oldxenfb_bind(struct xenfb_device *dev)
+{
+	struct xenfb_private *xenfb = dev->xenfb;
+	unsigned long mfn;
+	evtchn_port_t evtchn;
+	char buf[64];
+	char *p, **vec;
+	unsigned dummy;
+
+	p = oldxenfb_path_in_dom(xenfb->xsh, buf, sizeof(buf),
+				 dev->otherend_id, dev->devicetype);
+	if (!xs_watch(xenfb->xsh, p, ""))
+		return -1;
+	for (;;) {
+		if (oldxenfb_xs_scanf1(xenfb->xsh, p, "page-ref", "%lu",
+				       &mfn) < 0) {
+			if (errno == ENOENT || errno == EAGAIN)
+				goto wait;
+			return -1;
+		}
+		if (oldxenfb_xs_scanf1(xenfb->xsh, p, "event-channel", "%u",
+				       &evtchn) < 0) {
+			if (errno == ENOENT || errno == EAGAIN)
+				goto wait;
+			return -1;
+		}
+		break;
+
+	wait:
+		printf("Waiting...\n");
+		vec = xs_read_watch(xenfb->xsh, &dummy);
+		if (!vec)
+			return -1;
+		free(vec);
+	}
+
+	dev->port = xc_evtchn_bind_interdomain(xenfb->evt_xch,
+					       dev->otherend_id, evtchn);
+	if (dev->port == -1)
+		return -1;
+
+	dev->page = xc_map_foreign_range(xenfb->xc, dev->otherend_id,
+			XC_PAGE_SIZE, PROT_READ | PROT_WRITE, mfn);
+	if (dev->page == NULL)
+		return -1;
+
+	return 0;
+}
+
+static void oldxenfb_unbind(struct xenfb_device *dev)
+{
+	if (dev->page) {
+		munmap(dev->page, XC_PAGE_SIZE);
+		dev->page = NULL;
+	}
+        if (dev->port >= 0) {
+		xc_evtchn_unbind(dev->xenfb->evt_xch, dev->port);
+		dev->port = -1;
+	}
+}
+
+static void oldxenfb_dev_fatal(struct xenfb_device *dev, int err,
+			       const char *fmt, ...)
+{
+	struct xs_handle *xsh = dev->xenfb->xsh;
+	va_list ap;
+	char errdir[80];
+	char buf[1024];
+	int n;
+
+	fprintf(stderr, "%s ", dev->nodename); /* somewhat crude */
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	if (err)
+		fprintf(stderr, " (%s)", strerror(err));
+	putc('\n', stderr);
+
+	if (!oldxenfb_path_in_dom(xsh, errdir, sizeof(errdir), 0,
+				  "error/%s", dev->nodename))
+		goto out;	/* FIXME complain */
+
+	va_start(ap, fmt);
+	n = snprintf(buf, sizeof(buf), "%d ", err);
+	snprintf(buf + n, sizeof(buf) - n, fmt, ap);
+	va_end(ap);
+
+	if (oldxenfb_xs_printf(xsh, buf, "error", "%s", buf) < 0)
+		goto out;	/* FIXME complain */
+
+ out:
+	oldxenfb_switch_state(dev, XenbusStateClosing);
+}
+
+int oldxenfb_attach_dom(struct xenfb *xenfb_pub, int domid)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	struct xs_handle *xsh = xenfb->xsh;
+	int serrno;
+	struct xenfb_page *fb_page;
+	union xenfb_in_event event;
+
+	if (oldxenfb_bind(&xenfb->fb) < 0)
+		goto error;
+	if (oldxenfb_bind(&xenfb->kbd) < 0)
+		goto error;
+
+	/* TODO check for permitted ranges */
+	fb_page = xenfb->fb.page;
+	xenfb->pub.depth = fb_page->depth;
+	xenfb->pub.width = fb_page->width;
+	xenfb->pub.height = fb_page->height;
+	/* TODO check for consistency with the above */
+	xenfb->fb_len = fb_page->mem_length;
+	xenfb->pub.row_stride = fb_page->line_length;
+
+	if (oldxenfb_map_fb(xenfb, domid) < 0)
+		goto error;
+
+	event.type = XENFB_TYPE_SET_EVENTS;
+	event.set_events.flags = XENFB_FLAG_UPDATE;
+	if (oldxenfb_fb_event(xenfb, &event))
+		goto error;
+
+	fprintf(stderr, "Old protocol attach complete\n");
+	return 0;
+
+ error:
+	fprintf(stderr, "Old protocol attach failed\n");
+	serrno = errno;
+	oldxenfb_detach_dom(xenfb);
+	oldxenfb_dev_fatal(&xenfb->fb, serrno, "on fire");
+	oldxenfb_dev_fatal(&xenfb->kbd, serrno, "on fire");
+        errno = serrno;
+        return -1;
+}
+
+static void oldxenfb_detach_dom(struct xenfb_private *xenfb)
+{
+	oldxenfb_unbind(&xenfb->fb);
+	oldxenfb_unbind(&xenfb->kbd);
+	if (xenfb->pub.pixels) {
+		munmap(xenfb->pub.pixels, xenfb->fb_len);
+		xenfb->pub.pixels = NULL;
+	}
+}
+
+static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
+{
+	uint32_t prod, cons;
+	struct xenfb_page *page = xenfb->fb.page;
+
+	prod = page->out_prod;
+	if (prod == page->out_cons)
+		return;
+	rmb();			/* ensure we see ring contents up to prod */
+	for (cons = page->out_cons; cons != prod; cons++) {
+		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
+
+		switch (event->type) {
+		case XENFB_TYPE_UPDATE:
+                    if (xenfb->pub.update)
+			xenfb->pub.update(&xenfb->pub,
+					  event->update.x, event->update.y,
+					  event->update.width, event->update.height);
+                    break;
+		}
+	}
+	mb();			/* ensure we're done with ring contents */
+	page->out_cons = cons;
+	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+}
+
+static void oldxenfb_on_kbd_event(struct xenfb_private *xenfb)
+{
+	struct xenkbd_info *page = xenfb->kbd.page;
+
+	/* We don't understand any keyboard events, so just ignore them. */
+	if (page->out_prod == page->out_cons)
+		return;
+	page->out_cons = page->out_prod;
+	xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port);
+}
+
+static int oldxenfb_on_state_change(struct xenfb_device *dev)
+{
+	enum xenbus_state state;
+
+	state = oldxenfb_read_state(dev->xenfb->xsh, dev->otherend);
+
+	switch (state) {
+	case XenbusStateUnknown:
+		/* There was an error reading the frontend state.  The
+		   domain has probably gone away; in any case, there's
+		   not much point in us continuing. */
+		return -1;
+	case XenbusStateInitialising:
+	case XenbusStateInitWait:
+	case XenbusStateInitialised:
+	case XenbusStateConnected:
+		break;
+	case XenbusStateClosing:
+		oldxenfb_unbind(dev);
+		oldxenfb_switch_state(dev, state);
+		break;
+	case XenbusStateClosed:
+		oldxenfb_switch_state(dev, state);
+	}
+	return 0;
+}
+
+
+int oldxenfb_dispatch_channel(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	evtchn_port_t port;
+	port = xc_evtchn_pending(xenfb->evt_xch);
+	if (port == -1)
+		return -1;
+
+	if (port == xenfb->fb.port)
+		oldxenfb_on_fb_event(xenfb);
+	else if (port == xenfb->kbd.port)
+		oldxenfb_on_kbd_event(xenfb);
+
+	if (xc_evtchn_unmask(xenfb->evt_xch, port) == -1)
+		return -1;
+
+	return 0;
+}
+
+int oldxenfb_dispatch_store(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	unsigned dummy;
+	char **vec;
+	int r;
+
+	vec = xs_read_watch(xenfb->xsh, &dummy);
+	free(vec);
+	r = oldxenfb_on_state_change(&xenfb->fb);
+	if (r == 0)
+		r = oldxenfb_on_state_change(&xenfb->kbd);
+	if (r == -1)
+		return -2;
+
+	return 0;
+}
+
+
+static int oldxenfb_fb_event(struct xenfb_private *xenfb,
+			     union xenfb_in_event *event)
+{
+	uint32_t prod;
+	struct xenfb_page *page = xenfb->fb.page;
+
+	prod = page->in_prod;
+	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	mb();			/* ensure ring space available */
+	XENFB_IN_RING_REF(page, prod) = *event;
+	wmb();			/* ensure ring contents visible */
+	page->in_prod = prod + 1;
+	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+}
+
+static int oldxenfb_kbd_event(struct xenfb_private *xenfb,
+			      union xenkbd_in_event *event)
+{
+	uint32_t prod;
+	struct xenkbd_info *page = xenfb->kbd.page;
+
+	prod = page->in_prod;
+	if (prod - page->in_cons == XENKBD_IN_RING_LEN) {
+		errno = EAGAIN;
+		return -1;
+	}
+
+	mb();			/* ensure ring space available */
+	XENKBD_IN_RING_REF(page, prod) = *event;
+	wmb();			/* ensure ring contents visible */
+	page->in_prod = prod + 1;
+	return xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port);
+}
+
+int oldxenfb_send_key(struct xenfb *xenfb_pub, bool down, int keycode)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	union xenkbd_in_event event;
+
+	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
+	event.type = XENKBD_TYPE_KEY;
+	event.key.pressed = down ? 1 : 0;
+	event.key.keycode = keycode;
+
+	return oldxenfb_kbd_event(xenfb, &event);
+}
+
+int oldxenfb_send_motion(struct xenfb *xenfb_pub, int rel_x, int rel_y)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+	union xenkbd_in_event event;
+
+	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
+	event.type = XENKBD_TYPE_MOTION;
+	event.motion.rel_x = rel_x;
+	event.motion.rel_y = rel_y;
+
+	return oldxenfb_kbd_event(xenfb, &event);
+}
+
+
+int xenfb_using_old_protocol(struct xenfb *xenfb_pub)
+{
+	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
+        struct xs_handle *xsh = xenfb->xsh;
+        char buf[64];
+        char *p, *v, **vec;
+        enum xenbus_state state;
+        unsigned dummy;
+        int ret;
+
+        p = oldxenfb_path_in_dom(xsh, buf, sizeof(buf),
+				 xenfb->fb.otherend_id, "vfb/page-ref");
+        if (!xs_watch(xsh, p, ""))
+                return -1;
+
+        for (;;) {
+                state = oldxenfb_read_state(xsh, xenfb->fb.otherend);
+                if (state == XenbusStateUnknown) {
+                        ret = -1;
+                        break;
+                }
+                if (state > XenbusStateInitialising) {
+                        ret = 0; /* frontend talks xenbus protocol */
+                        break;
+                }
+
+                v = xs_read(xsh, XBT_NULL, p, NULL);
+                free(v);
+                if (v) {
+                        ret = 1; /* frontend talks old protocol */
+                        break;
+                }
+
+                vec = xs_read_watch(xsh, &dummy);
+                if (!vec) {
+                        ret = -1;
+                        break;
+                }
+                free(vec);
+        }
+
+        xs_unwatch(xsh, p, "");
+        return ret;
+}
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 13:47:01.000000000 -0400
@@ -0,0 +1,106 @@
+/*
+ * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
+ *
+ * Copyright (C) 2005
+ *
+ *      Anthony Liguori <aliguori at us.ibm.com>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License. See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#ifndef _LINUX_XENFB_H
+#define _LINUX_XENFB_H
+
+#include <asm/types.h>
+
+/* out events */
+
+#define XENFB_OUT_EVENT_SIZE 40
+
+#define XENFB_TYPE_MOTION 1
+#define XENFB_TYPE_UPDATE 2
+
+struct xenfb_motion	    /* currently unused */
+{
+	__u8 type;          /* XENFB_TYPE_MOTION */
+	__u16 x;            /* The new x coordinate */
+	__u16 y;            /* The new y coordinate */
+};
+
+struct xenfb_update
+{
+	__u8 type;          /* XENFB_TYPE_UPDATE */
+	__u16 x;            /* source x */
+	__u16 y;            /* source y */
+	__u16 width;        /* rect width */
+	__u16 height;       /* rect height */
+};
+
+union xenfb_out_event
+{
+	__u8 type;
+	struct xenfb_motion motion;
+	struct xenfb_update update;
+	char _[XENFB_OUT_EVENT_SIZE];
+};
+
+/* in events */
+
+#define XENFB_IN_EVENT_SIZE 40
+
+#define XENFB_TYPE_SET_EVENTS 1
+
+#define XENFB_FLAG_MOTION 1
+#define XENFB_FLAG_UPDATE 2
+#define XENFB_FLAG_COPY 4
+#define XENFB_FLAG_FILL 8
+
+struct xenfb_set_events
+{
+	__u8 type;          /* XENFB_TYPE_SET_EVENTS */
+	__u32 flags;        /* combination of XENFB_FLAG_* */
+};
+
+union xenfb_in_event
+{
+	__u8 type;
+	struct xenfb_set_events set_events;
+	char _[XENFB_OUT_EVENT_SIZE];
+};
+
+/* shared page */
+
+#define XENFB_IN_RING_SIZE 1024
+#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE)
+#define XENFB_IN_RING_OFFS 1024
+#define XENFB_IN_RING(page) \
+    ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS))
+#define XENFB_IN_RING_REF(page, idx) \
+    (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN])
+
+#define XENFB_OUT_RING_SIZE 2048
+#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE)
+#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE)
+#define XENFB_OUT_RING(page) \
+    ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS))
+#define XENFB_OUT_RING_REF(page, idx) \
+    (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN])
+
+struct xenfb_page
+{
+	__u16 width;         /* the width of the framebuffer (in pixels) */
+	__u16 height;        /* the height of the framebuffer (in pixels) */
+	__u32 line_length;   /* the length of a row of pixels (in bytes) */
+	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
+	__u8 depth;          /* the depth of a pixel (in bits) */
+
+	unsigned long pd[2];	/* FIXME rename to pgdir? */
+	/* FIXME pd[1] unused at this time, shrink? */
+
+	__u32 in_cons, in_prod;
+	__u32 out_cons, out_prod;
+};
+
+#endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 13:47:01.000000000 -0400
@@ -0,0 +1,92 @@
+/*
+ * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
+ *
+ * Copyright (C) 2005
+ *
+ *      Anthony Liguori <aliguori at us.ibm.com>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License. See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#ifndef _LINUX_XENKBD_H
+#define _LINUX_XENKBD_H
+
+#include <asm/types.h>
+
+/* in events */
+
+#define XENKBD_IN_EVENT_SIZE 40
+
+#define XENKBD_TYPE_MOTION  1     /* mouse movement event */
+#define XENKBD_TYPE_BUTTON  2     /* mouse button event */
+#define XENKBD_TYPE_KEY     3     /* keyboard event */
+
+struct xenkbd_motion
+{
+	__u8 type;         /* XENKBD_TYPE_MOTION */
+	__s16 rel_x;       /* relative X motion */
+	__s16 rel_y;       /* relative Y motion */
+};
+
+struct xenkbd_button
+{
+	__u8 type;         /* XENKBD_TYPE_BUTTON */
+	__u8 pressed;      /* 1 if pressed; 0 otherwise */
+	__u8 button;       /* the button (0, 1, 2 is right, middle, left) */
+};
+
+struct xenkbd_key
+{
+	__u8 type;         /* XENKBD_TYPE_KEY */
+	__u8 pressed;      /* 1 if pressed; 0 otherwise */
+	__u16 keycode;     /* KEY_* from linux/input.h */
+};
+
+union xenkbd_in_event
+{
+	__u8 type;
+	struct xenkbd_motion motion;
+	struct xenkbd_button button;
+	struct xenkbd_key key;
+	char _[XENKBD_IN_EVENT_SIZE];
+};
+
+/* out events */
+
+#define XENKBD_OUT_EVENT_SIZE 40
+
+union xenkbd_out_event
+{
+	__u8 type;
+	char _[XENKBD_OUT_EVENT_SIZE];
+};
+
+/* shared page */
+
+#define XENKBD_IN_RING_SIZE 2048
+#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE)
+#define XENKBD_IN_RING_OFFS 1024
+#define XENKBD_IN_RING(page) \
+    ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS))
+#define XENKBD_IN_RING_REF(page, idx) \
+    (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN])
+
+#define XENKBD_OUT_RING_SIZE 1024
+#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE)
+#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE)
+#define XENKBD_OUT_RING(page) \
+    ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS))
+#define XENKBD_OUT_RING_REF(page, idx) \
+    (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN])
+
+struct xenkbd_info
+{
+	__u32 in_cons, in_prod;
+	__u32 out_cons, out_prod;
+};
+
+void xenkbd_resume(void);
+
+#endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 13:44:38.000000000 -0400
@@ -41,6 +41,7 @@ struct xenfb_private {
 	struct xenfb_device fb, kbd;
 	size_t fb_len;		/* size of framebuffer */
 	char protocol[64];	/* frontend protocol */
+	int oldprotocol;        /* Legacy FC6 compat */
 };
 
 static void xenfb_detach_dom(struct xenfb_private *);
@@ -545,6 +546,15 @@ int xenfb_attach_dom(struct xenfb *xenfb
 	if (!xs_watch(xsh, xenfb->kbd.otherend, ""))
 		goto error;
 
+	/* !!! FC-5/6 guest compatability - not upstream !!! */
+	if (xenfb_using_old_protocol(xenfb_pub)) {
+		fprintf(stderr, "Switching to old protocol\n");
+		xenfb->oldprotocol = 1;
+		return oldxenfb_attach_dom(xenfb_pub, domid);
+	} else {
+		fprintf(stderr, "Sticking to new protocol\n");
+	}
+
 	if (xenfb_wait_for_frontend_initialised(&xenfb->fb) < 0)
 		goto error;
 	if (xenfb_wait_for_frontend_initialised(&xenfb->kbd) < 0)
@@ -680,6 +690,10 @@ int xenfb_dispatch_channel(struct xenfb 
 {
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	evtchn_port_t port;
+
+	if (xenfb->oldprotocol)
+		return oldxenfb_dispatch_channel(xenfb_pub);
+
 	port = xc_evtchn_pending(xenfb->evt_xch);
 	if (port == -1)
 		return -1;
@@ -702,6 +716,9 @@ int xenfb_dispatch_store(struct xenfb *x
 	char **vec;
 	int r;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_dispatch_store(xenfb_pub);
+
 	vec = xs_read_watch(xenfb->xsh, &dummy);
 	free(vec);
 	r = xenfb_on_state_change(&xenfb->fb);
@@ -783,6 +800,9 @@ int xenfb_send_key(struct xenfb *xenfb_p
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_send_key(xenfb_pub, down, keycode);
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_KEY;
 	event.key.pressed = down ? 1 : 0;
@@ -796,6 +816,9 @@ int xenfb_send_motion(struct xenfb *xenf
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return oldxenfb_send_motion(xenfb_pub, rel_x, rel_y);
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_MOTION;
 	event.motion.rel_x = rel_x;
@@ -809,6 +832,9 @@ int xenfb_send_position(struct xenfb *xe
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	union xenkbd_in_event event;
 
+	if (xenfb->oldprotocol)
+		return -1;
+
 	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
 	event.type = XENKBD_TYPE_POS;
 	event.pos.abs_x = abs_x;
diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 13:47:37.000000000 -0400
@@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
 int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
 int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
 
+/* Detect if using old FC5/6 guest protocol */
+int xenfb_using_old_protocol(struct xenfb *xenfb_pub);
+
+/* Pass-through legacy handlers */
+int oldxenfb_attach_dom(struct xenfb *xenfb, int domid);
+
+int oldxenfb_dispatch_store(struct xenfb *xenfb_pub);
+int oldxenfb_dispatch_channel(struct xenfb *xenfb_pub);
+
+int oldxenfb_send_key(struct xenfb *xenfb, bool down, int keycode);
+int oldxenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
+int oldxenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
+
+
 #endif
diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:48:04.000000000 -0400
@@ -371,7 +376,7 @@ VL_OBJS+= xenstore.o
 VL_OBJS+= xen_platform.o
 VL_OBJS+= xen_machine_fv.o
 VL_OBJS+= xen_machine_pv.o
-VL_OBJS+= xenfb.o
+VL_OBJS+= xenfb.o oldxenfb.o
 VL_OBJS+= tpm_tis.o
 DEFINES += -DHAS_AUDIO
 endif
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:48:59.000000000 -0400
@@ -53,7 +53,11 @@ class VfbifController(DevController):
         if self.vm.info.is_hvm():
             # is HVM, so qemu-dm will handle the vfb.
             return
-        
+
+        # old frontend compatibility
+        self.vm._writeDom("console/use_graphics", "1")
+        # /old
+
         args = [ xen.util.auxbin.pathTo("qemu-dm"),
                  "-M", "xenpv",
                  "-d", "%d" % self.vm.getDomid(),
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
--- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-09-24 13:42:20.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 13:49:27.000000000 -0400
@@ -690,7 +690,7 @@ class XendConfig(dict):
         self['vtpm_refs'] = cfg.get('vtpm_refs', [])
 
         # coalesce hvm vnc frame buffer with vfb config
-        if self.is_hvm() and int(self['platform'].get('vnc', 0)) != 0:
+        if int(self['platform'].get('vnc', 0)) != 0:
             # add vfb device if it isn't there already
             has_rfb = False
             for console_uuid in self['console_refs']:
@@ -705,7 +705,7 @@ class XendConfig(dict):
                 dev_config = ['vfb']
                 # copy VNC related params from platform config to vfb dev conf
                 for key in ['vncpasswd', 'vncunused', 'vncdisplay',
-                            'vnclisten']:
+                            'vnclisten', 'keymap']:
                     if key in self['platform']:
                         dev_config.append([key, self['platform'][key]])
 
diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
--- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 13:49:55.000000000 -0400
@@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
             d['type'] = 'sdl'
         for (k,v) in d.iteritems():
             if not k in [ 'vnclisten', 'vncunused', 'vncdisplay', 'display',
-                          'xauthority', 'type', 'vncpasswd' ]:
+                          'xauthority', 'type', 'vncpasswd', 'keymap' ]:
                 err("configuration option %s unknown to vfbs" % k)
             config.append([k,v])
         if not d.has_key("keymap"):


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- xen.spec	19 Sep 2007 20:26:16 -0000	1.184
+++ xen.spec	24 Sep 2007 20:51:43 -0000	1.185
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -34,20 +34,15 @@
 Patch102: xen-3.0.2-config-allow-unix-server.patch
 Patch103: xen-3.0.2-config-disable-reloc.patch
 
-# Hack to support guest kernels using old PVFB protocol
-# from FC5/6 days. Can kill off once FC6 is EOL'd
-Patch150: xen-pvfb-compat.patch
-Patch151: xen-pvfb-terminate.patch
-Patch152: xen-pvfb-no-hvm.patch
-
 Patch160: xen-pvfb-01-qemu-fv-machine.patch
 Patch161: xen-pvfb-02-qemu-pv-machine.patch
 Patch162: xen-pvfb-03-xenfb-remove.patch
+Patch163: xen-pvfb-04-compat.patch
 
-Patch163: xen-qemu-vnc-revert-password.patch
+Patch164: xen-qemu-vnc-revert-password.patch
 
-Patch164: xen-qemu-iohandler-delete.patch
-Patch165: xen-qemu-vnc-authentication.patch
+Patch165: xen-qemu-iohandler-delete.patch
+Patch166: xen-qemu-vnc-authentication.patch
 
 Patch251: pygrub-manykernels.patch
 
@@ -137,23 +132,18 @@
 %patch102 -p1
 %patch103 -p1
 
-# pvfb compat
-# XXX re-instate this somehow ??!?!
-#patch150 -p1
-#patch151 -p1
-#patch152 -p1
-
 # Switch to QEMU for paravirt VNC server
 %patch160 -p1
 %patch161 -p1
 %patch162 -p1
+%patch163 -p1
 
 # Remove old VNC password code
-%patch163 -p1
+%patch164 -p1
 
 # Add new TLS code
-%patch164 -p1
 %patch165 -p1
+%patch166 -p1
 
 # upstream patches
 %patch251 -p1
@@ -281,6 +271,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
+- Re-add support for back-compat FC6 PVFB support
+- Fix handling of explicit port numbers (rhbz #279581)
+
 * Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-6.fc8
 - Don't clobber the VIF type attribute in FV guests (rhbz #296061)
 


--- xen-pvfb-compat.patch DELETED ---


--- xen-pvfb-no-hvm.patch DELETED ---


--- xen-pvfb-terminate.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Sep 24 20:52:28 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Mon, 24 Sep 2007 16:52:28 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.6,
	1.7 java-1.7.0-icedtea.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200709242052.l8OKqS50031334@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30794

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Added JTreg zip as source
- Run JTreg tests after build for smoke testing.
- Added Xvfb as build requirement.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Sep 2007 20:15:25 -0000	1.6
+++ .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
+jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.7.0-icedtea.spec	21 Sep 2007 20:10:50 -0000	1.5
+++ java-1.7.0-icedtea.spec	24 Sep 2007 20:51:55 -0000	1.6
@@ -20,6 +20,7 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
+%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -113,6 +114,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -146,6 +148,8 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
+# jtreg testing requirements.
+BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -264,6 +268,7 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
+%setup -q -n icedtea-%{icedteaver} -T -D -a 8
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -294,10 +299,20 @@
 pushd mauve-%{mauvedate}
   ./configure 
   make
-  echo ====================TESTING========================
+  echo ====================MAUVE TESTING========================
   $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
-  echo ====================TESTING END====================
+  echo ====================MAUVE TESTING END====================
+popd
+pushd jtreg
+  echo ====================JTREG TESTING========================
+  Xvfb :1 -screen 1 1280x1024x24 -ac -terminate &
+  export DISPLAY=:1.1
+  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
+	$(pwd)/../openjdk/j2se/test/ 2>&1
+  killall -9 Xvfb
+  export DISPLAY=:0.0
+  echo ====================JTREG TESTING END====================
 popd
 
 %install
@@ -728,6 +743,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Added JTreg zip as source
+- Run JTreg tests after build for smoke testing.
+- Added Xvfb as build requirement.
+
 * Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2007 20:13:00 -0000	1.5
+++ sources	24 Sep 2007 20:51:55 -0000	1.6
@@ -3,3 +3,4 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:32 -0400
Subject: rpms/quarry/F-7 quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrW1a032284@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/F-7

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/F-7/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:17:55 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:52:59 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:34 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:34 -0400
Subject: rpms/quarry/FC-6 quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrYog032320@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/FC-6

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:17:58 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:53:02 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:53:37 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 16:53:37 -0400
Subject: rpms/quarry/devel quarry.spec,1.7,1.8
Message-ID: <200709242053.l8OKrbJu032366@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514/devel

Modified Files:
	quarry.spec 
Log Message:
Fix invalid desktop file



Index: quarry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quarry.spec	24 Sep 2007 16:18:00 -0000	1.7
+++ quarry.spec	24 Sep 2007 20:53:05 -0000	1.8
@@ -40,7 +40,7 @@
 # desktop file
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
+    --remove-key Version \
     --delete-original \
     $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
@@ -70,6 +70,7 @@
 %changelog
 * Mon Sep 24 2007 Michel Salim <michel.sylvan at gmail.com> - 0.2.0-2
 - License field update
+- Remove invalid version key from desktop file
 
 * Sun Nov 19 2006 Michel Salim <michel.salim at gmail.com> - 0.2.0-1
 - Update to 0.2.0, first stable version



From fedora-extras-commits at redhat.com  Mon Sep 24 20:59:20 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Mon, 24 Sep 2007 16:59:20 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.74, 1.75 setroubleshoot.init,
	1.11, 1.12 setroubleshoot.spec, 1.89, 1.90 sources, 1.85, 1.86
Message-ID: <200709242059.l8OKxKt1001104@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv980/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	8 Sep 2007 21:11:06 -0000	1.74
+++ .cvsignore	24 Sep 2007 20:58:48 -0000	1.75
@@ -1 +1 @@
-setroubleshoot-1.10.4.tar.gz
+setroubleshoot-1.10.5.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setroubleshoot.init	8 Sep 2007 21:11:06 -0000	1.11
+++ setroubleshoot.init	24 Sep 2007 20:58:48 -0000	1.12
@@ -71,6 +71,9 @@
     if test $RETVAL = 0 ; then
         touch /var/lock/subsys/$prog
     fi
+    if test $RETVAL = 3 ; then
+	echo -n $"Cannot start $prog: SELinux not enabled"
+    fi
     return $RETVAL
 }
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- setroubleshoot.spec	8 Sep 2007 21:11:06 -0000	1.89
+++ setroubleshoot.spec	24 Sep 2007 20:58:48 -0000	1.90
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.4
+Version: 1.10.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -25,6 +25,7 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
+Requires: selinux-policy-base >= 3.0.7-10
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -171,6 +172,74 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.5-1
+	- update code for command line log file scanning to work with
+	  new log file scanning code introduced for the browser.
+
+	- update Bulgarian translation (Doncho N. Gunchev (gunchev at gmail.com))
+
+	- update Polish translation (Piotr Dr??g (raven at pmail.pl))
+
+	- Resolves bug #239893: sealert wakes up very often
+	  This was caused by the use of threads and pygtk's thread signal
+	  handling.  The only use of threads in sealert was for log file
+	  scanning so that the UI would remain responsive during a
+	  scan. Threads in sealert have now been completely
+	  removed. Instead the scanning work is performed in a gobject idle
+	  function called from the main loop. The idle function is written
+	  as a python generator function which allows for the function to
+	  perform a small amount of work, save it's execution state and
+	  return. The next time the idle function is called from the main
+	  loop it resumes execution from it's last state until it decides
+	  to yield control again. This way the long running scan/analysis
+	  can be performed in small successive units of work during the
+	  time the application is otherwise idle and it does not interfere
+	  with the rest of the GUI event processing. Everything now occurs
+	  in an event loop, think of it as the applications process/thread
+	  scheduler whose event handlers execute time slices.
+
+	- rewrote parts of the audit input pipeline to use generators
+	  instead of callbacks, thus permitting the logfile scanning code
+	  to yield control with more granularity. Also updated
+	  test_setroubleshootd and audisp_listen to use the new
+	  generator/yield logic.
+
+	- rewrote the dialog used for scanning log files, progress bar
+	  updates are now in the dialog, the scan can be terminated part
+	  way through, errors from the scan are reported in pop-up dialog,
+	  one can only dismiss the dialog with success if the scan had
+	  been successfully run to completion, otherwise the user is only
+	  left with the option to cancel.
+
+	- Relates bug #252035  bug #247469, setroubleshootd and sealert should
+	  exit if SELinux is disabled.
+
+	- add utility functions escape_html() and unescape_html()
+
+	- fix initial sort order in browser, track sort order in browser
+
+	- modify AVC.get_path() to only return a value if the 'path' field is
+	  set, formerly it also considered the fields 'name' & 'file' which were
+	  incorrect. get_path() now also looks to see if the string begins with a
+	  slash for a fully qualified path, if not it looks to see if its a 
+	  pseudo path such as 'pipe[12345]' or 'socket[12345]' and if so strips out
+	  the instance information inside the brackets and returns just the type of 
+	  the pseudo path. This is done because we do not want path information
+	  in the signature to be unique for each instance of the denial.
+
+	- modify the TimeStamp class to hide it's internal datetime member,
+	  remove the cmp() method, the internal __cmp__ will be automatically invoked.
+
+	- require selinux policy version in spec file to allow system dbus use
+	
+	- Resolves bug #256601: audit2allow generates incorrect syntax when comma "," in
+	  denied list
+
+	- update po i18n files
+
+	- Add support for pruning database by age and size
+
+
 * Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
 	- fix init script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	8 Sep 2007 21:11:06 -0000	1.85
+++ sources	24 Sep 2007 20:58:48 -0000	1.86
@@ -1 +1 @@
-68c3d6d05d5273dd042e792f24ef09f2  setroubleshoot-1.10.4.tar.gz
+067293ed2a6bdfdb2bb8e03185736065  setroubleshoot-1.10.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:02:00 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 24 Sep 2007 17:02:00 -0400
Subject: fedora-security/audit fc7,1.119,1.120
Message-ID: <200709242102.l8OL20Yn007507@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1187

Modified Files:
	fc7 
Log Message:
CVE for something, I forgot for what.
Most likely it was for balsa or something like that.



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc7	24 Sep 2007 13:57:58 -0000	1.119
+++ fc7	24 Sep 2007 21:01:58 -0000	1.120
@@ -11,7 +11,7 @@
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
-GENERIC-MAP-NOMATCH VULNERABLE (balsa) #297601
+CVE-2007-5007 VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
 CVE-2007-4974 VULNERABLE (libsndfile) #296221



From fedora-extras-commits at redhat.com  Mon Sep 24 21:04:40 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Mon, 24 Sep 2007 17:04:40 -0400
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.3,
	1.4 setroubleshoot-plugins.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709242104.l8OL4eoq007810@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/devel

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Sep 2007 21:21:59 -0000	1.3
+++ .cvsignore	24 Sep 2007 21:04:08 -0000	1.4
@@ -1 +1 @@
-setroubleshoot-plugins-1.10.2.tar.gz
+setroubleshoot-plugins-1.10.3.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setroubleshoot-plugins.spec	6 Sep 2007 21:21:59 -0000	1.2
+++ setroubleshoot-plugins.spec	24 Sep 2007 21:04:08 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 1.10.2
+Version: 1.10.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -50,6 +50,9 @@
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- Resolves bug #231762: Original PO strings bugs
+
 * Thu Sep  6 2007 Dan Walsh <dwalsh at redhat.com> - 1.10.2-1
 	- Change priority on use_nfs_home_dir to 55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Sep 2007 21:21:59 -0000	1.3
+++ sources	24 Sep 2007 21:04:08 -0000	1.4
@@ -1 +1 @@
-acb5d5e49bbf237916ade9e2f9c91373  setroubleshoot-plugins-1.10.2.tar.gz
+9ed80b21f03e4909ecadc6c6d112ce8d  setroubleshoot-plugins-1.10.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:08:53 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:08:53 -0400
Subject: rpms/kudzu/devel kudzu.spec,1.177,1.178
Message-ID: <200709242108.l8OL8raw008091@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8038

Modified Files:
	kudzu.spec 
Log Message:
* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
- BuildRequires: popt-devel popt-static



Index: kudzu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kudzu.spec	6 Sep 2007 20:56:17 -0000	1.177
+++ kudzu.spec	24 Sep 2007 21:08:20 -0000	1.178
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.75
-Release: 1
+Release: 2
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -11,6 +11,7 @@
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
 BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel
+BuildRequires: popt-devel popt-static
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -72,6 +73,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
+- BuildRequires: popt-devel popt-static
+
 * Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
 - Add pcidom to the exported slot list of pciDevice.
 - Add clog target to Makefile.



From fedora-extras-commits at redhat.com  Mon Sep 24 21:09:05 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Sep 2007 17:09:05 -0400
Subject: rpms/clanbomber/devel clanbomber.desktop, 1.3, 1.4 clanbomber.spec, 
	1.6, 1.7
Message-ID: <200709242109.l8OL95JR008131@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8059

Modified Files:
	clanbomber.desktop clanbomber.spec 
Log Message:
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-7
- Revert last change, clanbomber does not use OpenGL (oops)



Index: clanbomber.desktop
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clanbomber.desktop	24 Sep 2007 20:45:04 -0000	1.3
+++ clanbomber.desktop	24 Sep 2007 21:08:33 -0000	1.4
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=ClanBomber
 Comment=Bomberman-like multiplayer game
-Exec=clanbomber-wrapper
+Exec=clanbomber
 Icon=clanbomber.png
 Terminal=false
 StartupNotify=false


Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clanbomber.spec	24 Sep 2007 20:45:04 -0000	1.6
+++ clanbomber.spec	24 Sep 2007 21:08:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Bomberman-like multiplayer game that uses ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 Patch1:         clanbomber-1.05-namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib06-devel zlib-devel desktop-file-utils
-Requires:       hicolor-icon-theme opengl-games-utils
+Requires:       hicolor-icon-theme
 
 %description
 ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib,
@@ -37,7 +37,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -69,13 +68,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog IDEAS QUOTES README
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-7
+- Revert last change, clanbomber does not use OpenGL (oops)
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.05-6
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:13:19 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 17:13:19 -0400
Subject: rpms/antlr/devel antlr.spec,1.34,1.35
Message-ID: <200709242113.l8OLDJ1g008381@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/antlr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352

Modified Files:
	antlr.spec 
Log Message:

- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC




Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- antlr.spec	29 Aug 2007 18:44:19 -0000	1.34
+++ antlr.spec	24 Sep 2007 21:12:47 -0000	1.35
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.5%{?dist}
+Release:        1jpp.6%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -155,23 +155,7 @@
 cp work/lib/antlr.jar .  # make expects to find it here
 export CLASSPATH=.
 %configure --without-examples
-make
-
-pushd lib/cpp/src/
-    mkdir temp_holder_for_nonpic
-    mv libantlr.a temp_holder_for_nonpic/
-    make clean
-
-    # Compile with PIC
-    make CXXFLAGS="${CXXFLAGS} -fPIC"
-
-    # Move files out
-    mv libantlr.a libantlr-pic.a 
-    mv temp_holder_for_nonpic/libantlr.a .
-
-    # Cleanup temp dir
-    rmdir temp_holder_for_nonpic
-popd
+make CXXFLAGS="${CXXFLAGS} -fPIC"
 
 find . -type f > /tmp/antlr.filelist
 rm antlr.jar             # no longer needed
@@ -203,7 +187,6 @@
 mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
 install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
 install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 
 # javadoc
@@ -299,7 +282,6 @@
 %{_javadir}/%{name}*.jar
 %{headers}
 %{_libdir}/libantlr.a
-%{_libdir}/libantlr-pic.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-config
@@ -327,6 +309,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.6
+- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.7-1jpp.5
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:16:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 14:16:17 -0700
Subject: [pkgdb] libflashsupport was added for wtogami
Message-ID: <200709242116.l8OLGHm7016414@app3.fedora.phx.redhat.com>

Warren Togami (wtogami) has added Package libflashsupport with summary Optional Library Interfaces for Adobe Flash Player
Warren Togami (wtogami) has approved Package libflashsupport
Warren Togami (wtogami) has added a Fedora devel branch for libflashsupport with an owner of wtogami
Warren Togami (wtogami) has approved libflashsupport in Fedora devel
Warren Togami (wtogami) has approved Package libflashsupport
Warren Togami (wtogami) has set commit to Approved for cvsextras on libflashsupport (Fedora devel)
Warren Togami (wtogami) has set build to Approved for cvsextras on libflashsupport (Fedora devel)
Warren Togami (wtogami) has set checkout to Approved for cvsextras on libflashsupport (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libflashsupport



From fedora-extras-commits at redhat.com  Mon Sep 24 21:20:58 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Mon, 24 Sep 2007 17:20:58 -0400
Subject: rpms/antlr/F-7 antlr.spec,1.32,1.33
Message-ID: <200709242120.l8OLKwej009370@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/extras/rpms/antlr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9317

Modified Files:
	antlr.spec 
Log Message:

 - Sync with copy from F8 (only bug fixes):
   - Applied patch to fix conditionals (from skasal at redhat dot com)
   - Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC





Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/F-7/antlr.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- antlr.spec	12 Jun 2007 20:06:30 -0000	1.32
+++ antlr.spec	24 Sep 2007 21:20:26 -0000	1.33
@@ -31,15 +31,15 @@
 %define _with_gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
+%define build_jedit  %{?_with_jedit:1}%{!?_with_jedit:0}
 
 %define section free
-%define native  %{?_with_native:1}%{!?_without_native:0}
+%define native  %{?_with_native:1}%{!?_with_native:0}
 
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.3%{?dist}.1
+Release:        1jpp.3%{?dist}.2
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -155,23 +155,7 @@
 cp work/lib/antlr.jar .  # make expects to find it here
 export CLASSPATH=.
 %configure --without-examples
-make 
-
-pushd lib/cpp/src/
-    mkdir temp_holder_for_nonpic
-    mv libantlr.a temp_holder_for_nonpic/
-    make clean
-
-    # Compile with PIC
-    make CXXFLAGS="${CXXFLAGS} -fPIC"
-
-    # Move files out
-    mv libantlr.a libantlr-pic.a 
-    mv temp_holder_for_nonpic/libantlr.a .
-
-    # Cleanup temp dir
-    rmdir temp_holder_for_nonpic
-popd
+make CXXFLAGS="${CXXFLAGS} -fPIC"
 
 find . -type f > /tmp/antlr.filelist
 rm antlr.jar             # no longer needed
@@ -203,7 +187,6 @@
 mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
 install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
 install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 
 # javadoc
@@ -299,7 +282,6 @@
 %{_javadir}/%{name}*.jar
 %{headers}
 %{_libdir}/libantlr.a
-%{_libdir}/libantlr-pic.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-config
@@ -327,6 +309,11 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.2
+- Sync with copy from F8 (only bug fixes):
+  - Applied patch to fix conditionals (from skasal at redhat dot com)
+  - Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
 * Tue Jun 12 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.1
 - Added a PIC compiled archive (bz# 242305)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:29 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:29 -0400
Subject: rpms/libflashsupport - New directory
Message-ID: <200709242122.l8OLMTXg009620@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport

Log Message:
Directory /cvs/extras/rpms/libflashsupport added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:34 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:34 -0400
Subject: rpms/libflashsupport/devel - New directory
Message-ID: <200709242122.l8OLMYnP009640@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport/devel

Log Message:
Directory /cvs/extras/rpms/libflashsupport/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:36 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:36 -0400
Subject: rpms/libflashsupport Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709242122.l8OLMaAH009665@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport

Added Files:
	Makefile import.log 
Log Message:
Setup of module libflashsupport


--- NEW FILE Makefile ---
# Top level Makefile for module libflashsupport
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Sep 24 21:22:38 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:22:38 -0400
Subject: rpms/libflashsupport/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709242122.l8OLMcHa009681@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvswW9591/rpms/libflashsupport/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libflashsupport


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libflashsupport
# $Id: Makefile,v 1.1 2007/09/24 21:22:36 wtogami Exp $
NAME := libflashsupport
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 fedora-extras-commits at redhat.com  Mon Sep 24 21:32:17 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 24 Sep 2007 17:32:17 -0400
Subject: rpms/libflashsupport/devel libflashsupport.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242132.l8OLWHVl010923@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libflashsupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10705/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libflashsupport.spec 
Log Message:
import




--- NEW FILE libflashsupport.spec ---
Name:		libflashsupport
Summary: 	Optional Library Interfaces for Adobe Flash Player
Version:	000
Release:	0.1.svn20070904
License:	BSD
Group:		Applications/Internet
Source0:	libflashsupport-pulse-000.svn20070904.tar.gz
URL:		http://pulseaudio.org
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtool
BuildRequires:	pulseaudio-lib-devel
BuildRequires:  openssl-devel

%description
Optional Library Interfaces for Adobe Flash Player
- pulseaudio
- OpenSSL

If more interfaces are desired, please suggest patches in Fedora Bugzilla.

%prep
%setup -q -n libflashsupport-pulse-000

%build
%configure --disable-rpath
make LIBTOOL=/usr/bin/libtool

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/libflashsupport.so

%changelog
* Mon Sep 24 2007 Warren Togami <wtogami at redhat.com> 000-0.1.svn20070904
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libflashsupport/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 21:22:36 -0000	1.1
+++ .cvsignore	24 Sep 2007 21:31:44 -0000	1.2
@@ -0,0 +1 @@
+libflashsupport-pulse-000.svn20070904.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libflashsupport/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 21:22:36 -0000	1.1
+++ sources	24 Sep 2007 21:31:44 -0000	1.2
@@ -0,0 +1 @@
+07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:32:47 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 17:32:47 -0400
Subject: rpms/dbus-glib/F-7 dbus-glib-proxy-signals-once.patch, NONE,
	1.1 dbus-glib.spec, 1.15, 1.16
Message-ID: <200709242132.l8OLWlMd011206@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10911

Modified Files:
	dbus-glib.spec 
Added Files:
	dbus-glib-proxy-signals-once.patch 
Log Message:
* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-3
- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)



dbus-glib-proxy-signals-once.patch:

--- NEW FILE dbus-glib-proxy-signals-once.patch ---
diff -up dbus-glib-0.73/dbus/dbus-gproxy.c.foo dbus-glib-0.73/dbus/dbus-gproxy.c
--- dbus-glib-0.73/dbus/dbus-gproxy.c.foo	2007-02-08 20:59:39.000000000 -0500
+++ dbus-glib-0.73/dbus/dbus-gproxy.c	2007-09-24 14:54:39.000000000 -0400
@@ -1232,8 +1235,15 @@ dbus_g_proxy_manager_filter (DBusConnect
 						  dbus_message_get_interface (message));
 
 	      owner_list = g_hash_table_lookup (manager->proxy_lists, tri);
-	      if (owner_list != NULL)
-		full_list = g_slist_concat (full_list, g_slist_copy (owner_list->proxies));
+	      if (owner_list != NULL) {
+	        GSList *elt;
+
+	        /* Ignore duplicates when adding to full_list */
+	        for (elt = owner_list->proxies; elt; elt = g_slist_next (elt)) {
+	          if (!g_slist_find (full_list, elt->data))
+	            full_list = g_slist_append (full_list, elt->data);
+	        }
+	      }
 	      g_free (tri);
 	    }
 	}



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/F-7/dbus-glib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbus-glib.spec	2 Aug 2007 02:33:40 -0000	1.15
+++ dbus-glib.spec	24 Sep 2007 21:32:14 -0000	1.16
@@ -8,11 +8,12 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
 Patch0: broken-xml.patch
+Patch1: dbus-glib-proxy-signals-once.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +60,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .broken-xml
+%patch1 -p1 -b .proxy-signals-once
 
 %build
 
@@ -114,6 +116,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-3
+- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)
+
 * Wed Aug  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-2
 - Fix a problem with introspection (#248150)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:38:05 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 17:38:05 -0400
Subject: rpms/fmtools/F-7 fmtools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709242138.l8OLc5EH012568@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12381

Modified Files:
	sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import for F-7



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	24 Sep 2007 21:37:33 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 21:39:35 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 24 Sep 2007 17:39:35 -0400
Subject: rpms/dbus-glib/devel dbus-glib-proxy-signals-once.patch, NONE,
	1.1 dbus-glib.spec, 1.16, 1.17
Message-ID: <200709242139.l8OLdZXi012962@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12936

Modified Files:
	dbus-glib.spec 
Added Files:
	dbus-glib-proxy-signals-once.patch 
Log Message:
* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-4
- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)



dbus-glib-proxy-signals-once.patch:

--- NEW FILE dbus-glib-proxy-signals-once.patch ---
diff -up dbus-glib-0.73/dbus/dbus-gproxy.c.foo dbus-glib-0.73/dbus/dbus-gproxy.c
--- dbus-glib-0.73/dbus/dbus-gproxy.c.foo	2007-02-08 20:59:39.000000000 -0500
+++ dbus-glib-0.73/dbus/dbus-gproxy.c	2007-09-24 14:54:39.000000000 -0400
@@ -1232,8 +1235,15 @@ dbus_g_proxy_manager_filter (DBusConnect
 						  dbus_message_get_interface (message));
 
 	      owner_list = g_hash_table_lookup (manager->proxy_lists, tri);
-	      if (owner_list != NULL)
-		full_list = g_slist_concat (full_list, g_slist_copy (owner_list->proxies));
+	      if (owner_list != NULL) {
+	        GSList *elt;
+
+	        /* Ignore duplicates when adding to full_list */
+	        for (elt = owner_list->proxies; elt; elt = g_slist_next (elt)) {
+	          if (!g_slist_find (full_list, elt->data))
+	            full_list = g_slist_append (full_list, elt->data);
+	        }
+	      }
 	      g_free (tri);
 	    }
 	}



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dbus-glib.spec	16 Sep 2007 00:52:20 -0000	1.16
+++ dbus-glib.spec	24 Sep 2007 21:39:02 -0000	1.17
@@ -8,11 +8,12 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.73
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
 Patch0: broken-xml.patch
+Patch1: dbus-glib-proxy-signals-once.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +115,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Williams <dcbw at redhat.com> - 0.73-4
+- Dispatch NameOwnerChanged signals to proxies only once (fdo #12505)
+
 * Sat Sep 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-3
 - Rebuild against new expat
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:45:00 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Sep 2007 17:45:00 -0400
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.34,1.35
Message-ID: <200709242145.l8OLj0ZQ014628@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14593

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.7-57.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- em8300-kmod.spec	13 Sep 2007 06:05:09 -0000	1.34
+++ em8300-kmod.spec	24 Sep 2007 21:44:28 -0000	1.35
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-49.fc6}
+%{!?kversion: %define kversion 2.6.22.7-57.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.7-57.fc6.
+
 * Thu Sep 13 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.5-49.fc6.
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:47:23 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:47:23 -0400
Subject: rpms/xorg-x11-drv-voodoo import.log,1.1,1.2
Message-ID: <200709242147.l8OLlNZ6015166@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	import.log 
Log Message:
voodoo 1.1.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 May 2007 00:13:26 -0000	1.1
+++ import.log	24 Sep 2007 21:46:51 -0000	1.2
@@ -0,0 +1 @@
+xorg-x11-drv-voodoo-1_1_1-1_fc8:HEAD:xorg-x11-drv-voodoo-1.1.1-1.fc8.src.rpm:1190669483



From fedora-extras-commits at redhat.com  Mon Sep 24 21:47:27 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 24 Sep 2007 17:47:27 -0400
Subject: rpms/xorg-x11-drv-voodoo/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-voodoo.spec, 1.16, 1.17
Message-ID: <200709242147.l8OLlRLc015173@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-voodoo.spec 
Log Message:
voodoo 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:28:26 -0000	1.7
+++ .cvsignore	24 Sep 2007 21:46:54 -0000	1.8
@@ -1 +1 @@
-xf86-video-voodoo-1.1.0.tar.bz2
+xf86-video-voodoo-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:28:26 -0000	1.7
+++ sources	24 Sep 2007 21:46:54 -0000	1.8
@@ -1 +1 @@
-798c9bf902eff5ea70f047e7e056317b  xf86-video-voodoo-1.1.0.tar.bz2
+bc878e795688b49a595b355482d27174  xf86-video-voodoo-1.1.1.tar.bz2


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-voodoo.spec	23 Aug 2007 18:45:03 -0000	1.16
+++ xorg-x11-drv-voodoo.spec	24 Sep 2007 21:46:54 -0000	1.17
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
-Version:   1.1.0
-Release:   6%{?dist}
+Version:   1.1.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.1-1
+- xf86-video-voodoo 1.1.1
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 1.1.0-6
 - Rebuild for ppc toolchain bug
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:54:11 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 17:54:11 -0400
Subject: rpms/xen/F-7 xen-vmxassist-irqs.patch, NONE, 1.1 xen.spec, 1.182,
	1.183
Message-ID: <200709242154.l8OLsB68015896@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15873

Modified Files:
	xen.spec 
Added Files:
	xen-vmxassist-irqs.patch 
Log Message:
Added dep on xen-hypervisor-abi=3.1. Fix vmxassist bug
Resolves: rhbz #247122

xen-vmxassist-irqs.patch:

--- NEW FILE xen-vmxassist-irqs.patch ---
changeset:   15239:656b8175f4f2
user:        kfraser at localhost.localdomain
date:        Fri Jun 08 11:19:55 2007 +0100
files:       tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vm86.h xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/hvm/vpic.c xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/public/hvm/vmx_assist.h
description:
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>


diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.c	Fri Jun 08 11:19:55 2007 +0100
@@ -927,6 +927,7 @@ load_or_clear_seg(unsigned long sel, uin
 		load_seg(0, base, limit, arbytes);
 }
 
+static unsigned char rm_irqbase[2];
 
 /*
  * Transition to protected mode
@@ -935,6 +936,9 @@ protected_mode(struct regs *regs)
 protected_mode(struct regs *regs)
 {
 	extern char stack_top[];
+
+	oldctx.rm_irqbase[0] = rm_irqbase[0];
+	oldctx.rm_irqbase[1] = rm_irqbase[1];
 
 	regs->eflags &= ~(EFLAGS_TF|EFLAGS_VM);
 
@@ -1187,6 +1191,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[0] = 0;
 			printf("Remapping master: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER);
+			rm_irqbase[0] = al;
 			al = NR_EXCEPTION_HANDLER;
 		}
 		break;
@@ -1200,6 +1205,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[1] = 0;
 			printf("Remapping slave: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER+8);
+			rm_irqbase[1] = al;
 			al = NR_EXCEPTION_HANDLER+8;
 		}
 		break;
diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.h	Fri Jun 08 11:19:55 2007 +0100
@@ -25,10 +25,6 @@
 #endif
 
 #include <xen/hvm/vmx_assist.h>
-
-#define	NR_EXCEPTION_HANDLER	32
-#define	NR_INTERRUPT_HANDLERS	16
-#define	NR_TRAPS		(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 #ifndef __ASSEMBLY__
 
diff -r 345ae2e61ba0 -r 656b8175f4f2 xen/include/public/hvm/vmx_assist.h
--- a/xen/include/public/hvm/vmx_assist.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/xen/include/public/hvm/vmx_assist.h	Fri Jun 08 11:19:55 2007 +0100
@@ -34,6 +34,10 @@
 #define VMXASSIST_OLD_CONTEXT (VMXASSIST_NEW_CONTEXT + 4)
 
 #ifndef __ASSEMBLY__
+
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 union vmcs_arbytes {
     struct arbyte_fields {
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- xen.spec	23 Sep 2007 16:53:56 -0000	1.182
+++ xen.spec	24 Sep 2007 21:53:37 -0000	1.183
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 3%{dist}
+Release: 4%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -24,7 +24,8 @@
 Patch28: xen-keyboard.patch
 Patch29: xen-3.1.0-libxc-native-protocol.patch
 Patch30: xen-3.1.0-dev-native-protocol.patch
-Patch31: xen-clobber-vif-type.patch
+Patch32: xen-clobber-vif-type.patch
+Patch33: xen-vmxassist-irqs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -68,12 +69,15 @@
 Requires: udev >= 059
 Requires: python-virtinst
 Requires: xen-libs = %{version}-%{release}
+# Ensure we at least have a suitable kernel installed, though we can't
+# force user to actually boot it.
+Requires: xen-hypervisor-abi = 3.1
 # Not strictly a dependency, but kpartx is by far the most useful tool right
 # now for accessing domU data from within a dom0 so bring it in when the user
 # installs xen.
 Requires: kpartx
 Prereq: chkconfig
-ExclusiveArch: i386 x86_64 ia64
+ExclusiveArch: i386 i686 x86_64 ia64
 
 %description
 This package contains the Xen hypervisor and Xen tools, needed to
@@ -121,7 +125,9 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
+
+%patch32 -p1
+%patch33 -p1
 
 # config patches
 %patch100 -p1
@@ -270,6 +276,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
+- Fix VMX assist IRQ handling (rhbz #279581)
+
 * Sun Sep 23 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-3.fc7
 - Don't clobber the VIF type attribute in FV guests (rhbz #247122)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:56:00 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 17:56:00 -0400
Subject: rpms/kernel/devel config-generic,1.27,1.28 kernel.spec,1.182,1.183
Message-ID: <200709242156.l8OLu0GL016871@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16495

Modified Files:
	config-generic kernel.spec 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- Disable generic RTC.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config-generic	20 Sep 2007 22:34:44 -0000	1.27
+++ config-generic	24 Sep 2007 21:55:27 -0000	1.28
@@ -1869,8 +1869,7 @@
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
+# CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- kernel.spec	24 Sep 2007 19:20:53 -0000	1.182
+++ kernel.spec	24 Sep 2007 21:55:27 -0000	1.183
@@ -1807,6 +1807,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- Disable generic RTC.
+
 * Mon Sep 24 2007 Chuck Ebbert <cebbert at redhat.com>
 - Fix IDE on ppc Pegasos platform (F7 bz #247602)
 



From fedora-extras-commits at redhat.com  Mon Sep 24 21:56:24 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 17:56:24 -0400
Subject: rpms/xen/devel xen-vmxassist-irqs.patch, NONE, 1.1 xen.spec, 1.185, 
	1.186
Message-ID: <200709242156.l8OLuOAs016874@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16823

Modified Files:
	xen.spec 
Added Files:
	xen-vmxassist-irqs.patch 
Log Message:
Added dep on xen-hypervisor-abi=3.1. Fix vmxassist bug
> Resolves: rhbz #247122

xen-vmxassist-irqs.patch:

--- NEW FILE xen-vmxassist-irqs.patch ---
changeset:   15239:656b8175f4f2
user:        kfraser at localhost.localdomain
date:        Fri Jun 08 11:19:55 2007 +0100
files:       tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vm86.h xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/hvm/vpic.c xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/public/hvm/vmx_assist.h
description:
hvm: Respect irqbase set by protected mode in mode switching with VMXAssist.

RHEL4U4 PAE SMP guest currently crashes, and we found changeset 15214
introduced it. This patch fixes it.

Signed-off-by: Xin Li <xin.b.li at intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>


diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.c	Fri Jun 08 11:19:55 2007 +0100
@@ -927,6 +927,7 @@ load_or_clear_seg(unsigned long sel, uin
 		load_seg(0, base, limit, arbytes);
 }
 
+static unsigned char rm_irqbase[2];
 
 /*
  * Transition to protected mode
@@ -935,6 +936,9 @@ protected_mode(struct regs *regs)
 protected_mode(struct regs *regs)
 {
 	extern char stack_top[];
+
+	oldctx.rm_irqbase[0] = rm_irqbase[0];
+	oldctx.rm_irqbase[1] = rm_irqbase[1];
 
 	regs->eflags &= ~(EFLAGS_TF|EFLAGS_VM);
 
@@ -1187,6 +1191,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[0] = 0;
 			printf("Remapping master: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER);
+			rm_irqbase[0] = al;
 			al = NR_EXCEPTION_HANDLER;
 		}
 		break;
@@ -1200,6 +1205,7 @@ outbyte(struct regs *regs, unsigned pref
 			icw2[1] = 0;
 			printf("Remapping slave: ICW2 0x%x -> 0x%x\n",
 				al, NR_EXCEPTION_HANDLER+8);
+			rm_irqbase[1] = al;
 			al = NR_EXCEPTION_HANDLER+8;
 		}
 		break;
diff -r 345ae2e61ba0 -r 656b8175f4f2 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/tools/firmware/vmxassist/vm86.h	Fri Jun 08 11:19:55 2007 +0100
@@ -25,10 +25,6 @@
 #endif
 
 #include <xen/hvm/vmx_assist.h>
-
-#define	NR_EXCEPTION_HANDLER	32
-#define	NR_INTERRUPT_HANDLERS	16
-#define	NR_TRAPS		(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 #ifndef __ASSEMBLY__
 
diff -r 345ae2e61ba0 -r 656b8175f4f2 xen/include/public/hvm/vmx_assist.h
--- a/xen/include/public/hvm/vmx_assist.h	Thu Jun 07 20:02:27 2007 +0100
+++ b/xen/include/public/hvm/vmx_assist.h	Fri Jun 08 11:19:55 2007 +0100
@@ -34,6 +34,10 @@
 #define VMXASSIST_OLD_CONTEXT (VMXASSIST_NEW_CONTEXT + 4)
 
 #ifndef __ASSEMBLY__
+
+#define NR_EXCEPTION_HANDLER    32
+#define NR_INTERRUPT_HANDLERS   16
+#define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
 
 union vmcs_arbytes {
     struct arbyte_fields {
@@ -98,6 +102,8 @@ struct vmx_assist_context {
     uint32_t  ldtr_limit;
     uint32_t  ldtr_base;
     union vmcs_arbytes ldtr_arbytes;
+
+    unsigned char rm_irqbase[2];
 };
 typedef struct vmx_assist_context vmx_assist_context_t;
 



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- xen.spec	24 Sep 2007 20:51:43 -0000	1.185
+++ xen.spec	24 Sep 2007 21:55:52 -0000	1.186
@@ -28,6 +28,7 @@
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch31: xen-tpm-functions.patch
 Patch32: xen-clobber-vif-type.patch
+Patch33: xen-vmxassist-irqs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -70,6 +71,9 @@
 Requires: udev >= 059
 Requires: python-virtinst
 Requires: xen-libs = %{version}-%{release}
+# Ensure we at least have a suitable kernel installed, though we can't
+# force user to actually boot it.
+Requires: xen-hypervisor-abi = 3.1
 # Not strictly a dependency, but kpartx is by far the most useful tool right
 # now for accessing domU data from within a dom0 so bring it in when the user
 # installs xen.
@@ -126,6 +130,7 @@
 
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 # config patches
 %patch100 -p1



From fedora-extras-commits at redhat.com  Mon Sep 24 22:00:26 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 18:00:26 -0400
Subject: rpms/kernel/devel config-rhel-generic,1.10,1.11
Message-ID: <200709242200.l8OM0Qsk017923@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17789

Modified Files:
	config-rhel-generic 
Log Message:
remove an obvious dupe


Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-rhel-generic	4 Apr 2007 22:19:42 -0000	1.10
+++ config-rhel-generic	24 Sep 2007 21:59:53 -0000	1.11
@@ -157,7 +157,6 @@
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
 # CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
 # CONFIG_AC3200 is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set



From fedora-extras-commits at redhat.com  Mon Sep 24 22:14:34 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 24 Sep 2007 18:14:34 -0400
Subject: rpms/evince/devel evince.spec,1.93,1.94
Message-ID: <200709242214.l8OMEYnt024446@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/evince/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24383

Modified Files:
	evince.spec 
Log Message:
add a missing schema file



Index: evince.spec
===================================================================
RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- evince.spec	17 Sep 2007 18:44:15 -0000	1.93
+++ evince.spec	24 Sep 2007 22:14:00 -0000	1.94
@@ -5,7 +5,7 @@
 
 Name:		evince
 Version:	2.20.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License: 	GPLv2+ and GFDL+
@@ -107,6 +107,7 @@
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/evince.schemas \
      	%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
+     	%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
 	%{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
 		>/dev/null || :
 
@@ -124,6 +125,7 @@
 	gconftool-2 --makefile-uninstall-rule \
       		%{_sysconfdir}/gconf/schemas/evince.schemas \
       		%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
+     		%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
 		%{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
 			>/dev/null || :
 fi
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Add a missing schema file
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Mon Sep 24 22:29:20 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:29:20 -0400
Subject: rpms/moreutils/devel moreutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242229.l8OMTK7t025526@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	moreutils.spec 
Log Message:
new package



--- NEW FILE moreutils.spec ---
Name:           moreutils
Version:        0.24
Release:        2%{?dist}
Summary:        Additional unix utilities
Group:          Applications/System
License:        GPLv2
URL:            http://kitenet.net/~joey/code/moreutils/
Source0:        http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  docbook2X docbook-dtds
Requires:       perl-TimeDate perl-Time-Duration
# These perl modules add functionality to the ts command, as they are added in eval'd code they are not
# picked up automatically by rpm.

%description
 This is a growing collection of the unix tools that nobody thought
 to write thirty years ago.

 So far, it includes the following utilities:
  - isutf8: check if a file or standard input is utf-8
  - sponge: soak up standard input and write to a file
  - ts: timestamp standard input
  - vidir: edit a directory in your text editor
  - vipe: insert a text editor into a pipe
  - combine: combine the lines in two files using boolean operations
  - ifdata: get network interface info without parsing ifconfig output
  - pee: tee standard input to pipes
  - zrun: automatically uncompress arguments to command
  - mispipe: pipe two commands, returning the exit status of the first
  - lckdo: execute a program with a lock held

%prep
%setup -qn %{name}
# the required dtd's are not where this package expects them to be, let's fix that
sed -r -i "s/\/usr\/share\/xml\/docbook\/schema\/dtd\/4.4\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/xml-dtd-4.4-1.0-30.1\/docbookx.dtd/" *.docbook
# the docbook2x-man command is different in fedora, let's fix that too
sed -r -i "s/docbook2x-man/db2x_docbook2man/" Makefile
# a slightly different syntax is required here for the man pages to be built successfully
sed -r -i "s/ rep=\"repeat\"//" *.docbook


%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DSUPPORT_LH7 -DMKSTEMP"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 isutf8 %{buildroot}%{_bindir}
install -m0755 sponge %{buildroot}%{_bindir}
install -m0755 ts %{buildroot}%{_bindir}
install -m0755 vidir %{buildroot}%{_bindir}
install -m0755 vipe %{buildroot}%{_bindir}
install -m0755 combine %{buildroot}%{_bindir}
install -m0755 ifdata %{buildroot}%{_bindir}
install -m0755 pee %{buildroot}%{_bindir}
install -m0755 zrun %{buildroot}%{_bindir}
install -m0755 mispipe %{buildroot}%{_bindir}
install -m0755 lckdo %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -m644 sponge.1 %{buildroot}%{_mandir}/man1/
install -m644 vidir.1 %{buildroot}%{_mandir}/man1/
install -m644 vipe.1 %{buildroot}%{_mandir}/man1/
install -m644 isutf8.1 %{buildroot}%{_mandir}/man1/
install -m644 ts.1 %{buildroot}%{_mandir}/man1/
install -m644 combine.1 %{buildroot}%{_mandir}/man1/
install -m644 ifdata.1 %{buildroot}%{_mandir}/man1/
install -m644 pee.1 %{buildroot}%{_mandir}/man1/
install -m644 zrun.1 %{buildroot}%{_mandir}/man1/
install -m644 mispipe.1 %{buildroot}%{_mandir}/man1/
install -m644 lckdo.1 %{buildroot}%{_mandir}/man1/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc README COPYING
%{_mandir}/man1/*
%{_bindir}/*


%changelog
* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-2%{?dist}
- Added optional perl modules to requirements

* Tue Sep 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-1%{?dist}
- Version update
- Fixed specfile issues

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-3%{?dist}
- Updated license field re new guidelines

* Mon Jun 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-2%{?dist}
- optflags fix and extra doc files

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-1%{?dist}
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:10:22 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:28:47 -0000	1.2
@@ -0,0 +1 @@
+moreutils_0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:10:22 -0000	1.1
+++ sources	24 Sep 2007 22:28:47 -0000	1.2
@@ -0,0 +1 @@
+f0dbbded6a685976102c2884e6c32feb  moreutils_0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:31:21 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:31:21 -0400
Subject: rpms/moreutils/F-7 moreutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709242231.l8OMVLtd025659@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25612/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	moreutils.spec 
Log Message:
new package



--- NEW FILE moreutils.spec ---
Name:           moreutils
Version:        0.24
Release:        2%{?dist}
Summary:        Additional unix utilities
Group:          Applications/System
License:        GPLv2
URL:            http://kitenet.net/~joey/code/moreutils/
Source0:        http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  docbook2X docbook-dtds
Requires:       perl-TimeDate perl-Time-Duration
# These perl modules add functionality to the ts command, as they are added in eval'd code they are not
# picked up automatically by rpm.

%description
 This is a growing collection of the unix tools that nobody thought
 to write thirty years ago.

 So far, it includes the following utilities:
  - isutf8: check if a file or standard input is utf-8
  - sponge: soak up standard input and write to a file
  - ts: timestamp standard input
  - vidir: edit a directory in your text editor
  - vipe: insert a text editor into a pipe
  - combine: combine the lines in two files using boolean operations
  - ifdata: get network interface info without parsing ifconfig output
  - pee: tee standard input to pipes
  - zrun: automatically uncompress arguments to command
  - mispipe: pipe two commands, returning the exit status of the first
  - lckdo: execute a program with a lock held

%prep
%setup -qn %{name}
# the required dtd's are not where this package expects them to be, let's fix that
sed -r -i "s/\/usr\/share\/xml\/docbook\/schema\/dtd\/4.4\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/xml-dtd-4.4-1.0-30.1\/docbookx.dtd/" *.docbook
# the docbook2x-man command is different in fedora, let's fix that too
sed -r -i "s/docbook2x-man/db2x_docbook2man/" Makefile
# a slightly different syntax is required here for the man pages to be built successfully
sed -r -i "s/ rep=\"repeat\"//" *.docbook


%build
make %{?_smp_mflags} CFLAGS="%{optflags} -DSUPPORT_LH7 -DMKSTEMP"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 isutf8 %{buildroot}%{_bindir}
install -m0755 sponge %{buildroot}%{_bindir}
install -m0755 ts %{buildroot}%{_bindir}
install -m0755 vidir %{buildroot}%{_bindir}
install -m0755 vipe %{buildroot}%{_bindir}
install -m0755 combine %{buildroot}%{_bindir}
install -m0755 ifdata %{buildroot}%{_bindir}
install -m0755 pee %{buildroot}%{_bindir}
install -m0755 zrun %{buildroot}%{_bindir}
install -m0755 mispipe %{buildroot}%{_bindir}
install -m0755 lckdo %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -m644 sponge.1 %{buildroot}%{_mandir}/man1/
install -m644 vidir.1 %{buildroot}%{_mandir}/man1/
install -m644 vipe.1 %{buildroot}%{_mandir}/man1/
install -m644 isutf8.1 %{buildroot}%{_mandir}/man1/
install -m644 ts.1 %{buildroot}%{_mandir}/man1/
install -m644 combine.1 %{buildroot}%{_mandir}/man1/
install -m644 ifdata.1 %{buildroot}%{_mandir}/man1/
install -m644 pee.1 %{buildroot}%{_mandir}/man1/
install -m644 zrun.1 %{buildroot}%{_mandir}/man1/
install -m644 mispipe.1 %{buildroot}%{_mandir}/man1/
install -m644 lckdo.1 %{buildroot}%{_mandir}/man1/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc README COPYING
%{_mandir}/man1/*
%{_bindir}/*


%changelog
* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-2%{?dist}
- Added optional perl modules to requirements

* Tue Sep 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.24-1%{?dist}
- Version update
- Fixed specfile issues

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-3%{?dist}
- Updated license field re new guidelines

* Mon Jun 18 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-2%{?dist}
- optflags fix and extra doc files

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.20-1%{?dist}
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:10:22 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:30:49 -0000	1.2
@@ -0,0 +1 @@
+moreutils_0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:10:22 -0000	1.1
+++ sources	24 Sep 2007 22:30:49 -0000	1.2
@@ -0,0 +1 @@
+f0dbbded6a685976102c2884e6c32feb  moreutils_0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:46:59 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:46:59 -0400
Subject: rpms/perl-Time-Duration/devel perl-Time-Duration.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242246.l8OMkx3e000663@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/perl-Time-Duration/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv419/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Time-Duration.spec 
Log Message:
new package



--- NEW FILE perl-Time-Duration.spec ---
Name:           perl-Time-Duration
Summary:        Time-Duration - rounded or exact English expression of durations
Version:        1.06
Release:        2%{?dist}
License:        GPLv2+ or Artistic 2.0
Group:          Development/Libraries
Url:            http://search.cpan.org/dist/Time-Duration/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Source:         http://search.cpan.org//CPAN/authors/id/A/AV/AVIF/Time-Duration-%{version}.tar.gz
BuildRequires:  perl(Test::Pod::Coverage) perl(Test::Pod) perl(ExtUtils::MakeMaker)

%description
This module provides functions for expressing durations in rounded or exact
terms.


%prep
%setup -q -n Time-Duration-%{version} 


%check
make test


%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}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_mandir}/man3/*
%{perl_vendorlib}/Time


%changelog
* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-2
- Tidied build flas

* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-1
- Version update, Licence versions added

* Mon Jul 02 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-4
- Add ChangeLog to docs

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-3
- Specfile cleanup

* Fri Jun 01 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-2
- Specfile cleanup

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-1
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:12:42 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:46:23 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:12:42 -0000	1.1
+++ sources	24 Sep 2007 22:46:23 -0000	1.2
@@ -0,0 +1 @@
+d65108e0e4e8ffb38e28d532f8ddcd12  Time-Duration-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 22:49:37 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 18:49:37 -0400
Subject: rpms/phpTodo/devel phpTodo-0.8.1beta.patch, NONE,
	1.1 phpTodo.httpd.conf, NONE, 1.1 phpTodo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242249.l8OMnbOc000828@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/phpTodo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	phpTodo-0.8.1beta.patch phpTodo.httpd.conf phpTodo.spec 
Log Message:
new package


phpTodo-0.8.1beta.patch:

--- NEW FILE phpTodo-0.8.1beta.patch ---
diff -urN phpTodo-0.8.1beta.orig/doc/sql/todo.sql phpTodo-0.8.1beta/doc/sql/todo.sql
--- phpTodo-0.8.1beta.orig/doc/sql/todo.sql	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/doc/sql/todo.sql	2007-09-22 20:00:22.000000000 +1000
@@ -26,7 +26,7 @@
                           password        CHAR(40)                NOT NULL,
                           admin           TINYINT     UNSIGNED    NOT NULL DEFAULT 0,
                           full_name       CHAR(40),
-                          email           CHAR(320)               NOT NULL,
+                          email           CHAR(255)               NOT NULL,
                           PRIMARY KEY     (id),
                           UNIQUE          (username),
                           INDEX           (password));
@@ -150,4 +150,4 @@
 INSERT INTO user_prefs VALUES (NULL, 1, 0, 0, 0, 0, 0, 0, 'none', 'asc');
 
 # Change the following line to reflect the correct user, host, database name, and password
-GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
+# GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
diff -urN phpTodo-0.8.1beta.orig/feed.php phpTodo-0.8.1beta/feed.php
--- phpTodo-0.8.1beta.orig/feed.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/feed.php	2007-09-20 19:07:45.000000000 +1000
@@ -52,8 +52,19 @@
    if (! $feed_param = feed_authenticate($user_id, $feed_id, $secret)) {
       // Set up the channel with info indicating an invalid feed
       $feed->title = 'Invalid RSS Feed';
-      $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                        $phpTodo_serverpath . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath . $_SERVER['REQUEST_URI'];
+      $feed->link = $location;
+
       $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                         'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -73,8 +84,19 @@
 
    // Set up the channel
    $feed->title = $feed_param->name . ' - phpTodo RSS Feed';
-   $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                     $_SERVER['REQUEST_URI'];
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['SERVER_NAME'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= $_SERVER['REQUEST_URI'];
+   $feed->link = $location;
+
    $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                      'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -161,8 +183,19 @@
       # Take the data and put it into the rss object
       $item = new FeedItem();
       $item->title = "$feedSubject ($priority)";
-      $item->link = 'http://' . $_SERVER['SERVER_NAME'] . $phpTodo_serverpath .
-                    "taskmodify.php?edit=Edit&task_id=$id";
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath ."taskmodify.php?edit=Edit&task_id=$id";
+      $item->link = $location;
+
       $item->description = nl2br("$feedDesc");
       $item->date = "$create_date $itemTZOffset";
       $item->source = '';
diff -urN phpTodo-0.8.1beta.orig/index.php phpTodo-0.8.1beta/index.php
--- phpTodo-0.8.1beta.orig/index.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/index.php	2007-09-20 19:07:45.000000000 +1000
@@ -58,8 +58,19 @@
       if (isset($_SESSION['redirect'])) {
          header('Location: ' . $_SESSION['redirect']);
       } else {
-         header('Location: http://' . $_SERVER['HTTP_HOST'] .
-                dirname($_SERVER['PHP_SELF']) . '/todolist.php');
+
+         // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+         $location = 'http';
+         if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+         $location .= '://'.$_SERVER['HTTP_HOST'];
+         if ( isset($_SERVER['HTTPS'])) {
+            if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         } else {
+            if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         }
+         $location .= dirname($_SERVER['PHP_SELF']) . '/todolist.php';
+         header('Location: ' . $location);
+
       }
       unset($_SESSION['redirect']);
 
diff -urN phpTodo-0.8.1beta.orig/libs/sec_check.php phpTodo-0.8.1beta/libs/sec_check.php
--- phpTodo-0.8.1beta.orig/libs/sec_check.php	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/libs/sec_check.php	2007-09-20 19:07:45.000000000 +1000
@@ -164,15 +164,35 @@
       }
    }
 
-   $_SESSION['redirect'] = 'http://' . $_SERVER['HTTP_HOST'] .
-                           dirname($_SERVER['PHP_SELF']) . '/';
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/';
+   $_SESSION['redirect'] = $location;
 
    if (isset($redirect)) {
        $_SESSION['redirect'] .= $redirect;
    }
 
-   header('Location: http://' . $_SERVER['HTTP_HOST'] .
-          dirname($_SERVER['PHP_SELF']) . '/index.php');
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/index.php';
+   header('Location: ' . $location);
+
 }
 
 ?>
diff -urN phpTodo-0.8.1beta.orig/sample_config.php phpTodo-0.8.1beta/sample_config.php
--- phpTodo-0.8.1beta.orig/sample_config.php	2007-04-07 04:17:12.000000000 +1000
+++ phpTodo-0.8.1beta/sample_config.php	2007-09-20 20:48:51.000000000 +1000
@@ -21,20 +21,35 @@
 // The work directory contains all of the private
 // smarty data.  This directory should be below the
 // httpd root
-$phpTodo_work_dir = '/path/to/private/phptodo';
+$phpTodo_work_dir = '/var/cache/phpTodo';
 
 // The http directory is the first level directory
 // where the phpTodo distribution was uncompressed
-$phpTodo_http_dir = '/path/to/public/phptodo';
+$phpTodo_http_dir = '/usr/share/phpTodo';
 
 // The smarty directory is the location of the Smarty.class.php file
-$phpTodo_smarty_dir = 'smarty/';
+// F7 Smarty builds are in /usr/share/php/Smarty/
+// FC6 and earlier Smarty builds are in /usr/share/Smarty/ instead.
+// We will default to F7 but check for a class file in the FC6 location
+// You may edit this to a single line pointing to the locaton of your Smarty
+// install to save a couple of cycles if you wish.
+$phpTodo_smarty_dir = '/usr/share/php/Smarty/';
+if (file_exists("/usr/share/Smarty/Smarty.class.php"))
+{
+	$phpTodo_smarty_dir = "/usr/share/Smarty/";
+}
 
 // This is the default stylesheet used by phpTodo
 // The location of the stylesheet is relative to
 // the http directory
 $phpTodo_stylesheet = 'css/default.css';
 
+
+// The following line **MUST** be removed from the config file
+// once the database has been setup and configured.
+header("Content-type: text/plain");die("Welcome to phpTodo - Web based todo lists\n\nPlease setup and configure the database and edit the\n/etc/phpTodo/config.php configuration file.\n\nInstructions for setting up the database can be found\nin the ##DOCLOCATION##/INSTALL file.\n\nThe SQL required for setting up the database can be found\nin the ##DOCLOCATION##/sql/ directory.");
+
+
 // This is the name of the phpTodo database
 $phpTodo_dbName = 'phpTodo';
 
@@ -47,6 +62,7 @@
 // This is the password for the database
 $phpTodo_dbPass = 'password';
 
+
 // Default session time (in seconds)
 $phpTodo_sessTime = 600;
 


--- NEW FILE phpTodo.httpd.conf ---
#
# phpTodo is a to do list manager written in PHP.
#

Alias /phpTodo /usr/share/phpTodo


--- NEW FILE phpTodo.spec ---
Summary: PHP todo list manager
Name: phpTodo
Version: 0.8.1
Release: 0.8.beta%{?dist}
License: GPLv2+
URL: http://phptodo.godshell.com/
Group: Applications/Internet
Source0: http://downloads.sourceforge.net/phptodo/%{name}-%{version}beta.tar.gz
Source1: phpTodo.httpd.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: phpTodo-0.8.1beta.patch
BuildArch: noarch
BuildRequires: gettext
Requires: httpd
Requires: php-Smarty
Requires: php-mysql
Requires(post): policycoreutils
Requires(postun): policycoreutils
# to make sure the "apache" group is created before phpTodo is installed

%description
The general idea behind this program is to keep all of your todo lists in
one central location.  I've grown very tired of having lists all over the
place and being unable to reconcile them...

%prep
%setup -qn %{name}-%{version}beta
%patch1 -p1
sed -i -r "s|##DOCLOCATION##|%{_datadir}/doc/%{name}-%{version}|g" sample_config.php
# Rearrange the documentation
cp sample_config.php doc/
chmod 755 doc/selenium
chmod 755 doc/sql
chmod 755 libs
chmod 755 templates
chmod 755 css
chmod 755 images


%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/templates_c
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/cache
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/config
mkdir -p -m0755 %{buildroot}%{_datadir}/phpTodo
mv sample_config.php config.php
install -m 0644 config.php %{buildroot}%{_sysconfdir}/phpTodo/
ln -s ../../../..%{_sysconfdir}/phpTodo/config.php \
    %{buildroot}%{_datadir}/phpTodo/config.php
install -m 0644 index.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 about.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 datetimepicker.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 feed.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 logout.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskedit.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskmodify.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.php %{buildroot}%{_datadir}/phpTodo/
for d in css images libs templates; do
    cp -rp $d %{buildroot}%{_datadir}/phpTodo/
done

mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/phpTodo.conf


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc doc/*
%config %dir %{_sysconfdir}/phpTodo
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/phpTodo/*.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpTodo.conf
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/templates_c
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/cache
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/config
%{_datadir}/phpTodo


%post
# SELinux probably needs work.
# Set SELinux file context in the policy
semanage fcontext -a -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
# Actually change the context
restorecon -R %{_datadir}/phpTodo/ || :
restorecon -R %{_sysconfdir}/phpTodo/ || :
restorecon -R %{_localstatedir}/cache/phpTodo/ || :


%postun
# SELinux support
if [ $1 -eq 0 ]; then  # final removal
  semanage fcontext -d -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
fi


%changelog
* Sat Sep 22 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.8.beta%{?dist}
- SELinux changes
- Improved initial mysql schema

* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.7.beta%{?dist}
- Updated location of Smarty for F7 rpm
- Added more useful message to be displayed when user has not configured
- or setup database before using phpTodo.

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.6.beta%{?dist}
- Updated license field re new guidelines

* Sun Jun 17 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.5.beta
- sourceforge mirror changed to downloads.sourceforge.net

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.4.beta
- SELinux post section added

* Tue May 29 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.3.beta
- Cleanup of SPEC file

* Sat Apr 28 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.2.beta
- Cleanup of SPEC file

* Thu Apr 10 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.1.beta
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:14:45 -0000	1.1
+++ .cvsignore	24 Sep 2007 22:49:02 -0000	1.2
@@ -0,0 +1 @@
+phpTodo-0.8.1beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:14:45 -0000	1.1
+++ sources	24 Sep 2007 22:49:02 -0000	1.2
@@ -0,0 +1 @@
+81293fbc69d691fb897fc007f8502efe  phpTodo-0.8.1beta.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:01:53 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:01:53 -0400
Subject: rpms/odt2txt/EL-4 odt2txt.spec,NONE,1.1
Message-ID: <200709242301.l8ON1rJ5007668@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/EL-4

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:01:57 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:01:57 -0400
Subject: rpms/odt2txt/EL-5 odt2txt.spec,NONE,1.1
Message-ID: <200709242301.l8ON1vTx007684@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/EL-5

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:02:03 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:02:03 -0400
Subject: rpms/odt2txt/F-7 odt2txt.spec,NONE,1.1
Message-ID: <200709242302.l8ON23Oj007701@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/F-7

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:02:06 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:02:06 -0400
Subject: rpms/odt2txt/devel odt2txt.spec,NONE,1.1
Message-ID: <200709242302.l8ON260W007716@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7648/devel

Added Files:
	odt2txt.spec 
Log Message:
Commit forgotten spec file



--- NEW FILE odt2txt.spec ---
Name:           odt2txt
Version:        0.3
Release:        1%{?dist}
Summary:        Converts an OpenDocument to plain text

Group:          Applications/Text
License:        GPLv2
URL:            http://stosberg.net/odt2txt/
Source0:        http://stosberg.net/odt2txt/odt2txt-%{version}.tar.gz
Patch0:         odt2txt-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel
#Requires:       

%description

odt2txt is a command-line tool which extracts the text out of
OpenDocument Texts produced by OpenOffice.org, StarOffice, KOffice and
others.

odt2txt is ...

* small
* supports multiple output encodings
* adopts to your locale
* able to substitute common characters which the output charset does
  not contain with ascii look-a-likes
* written in C, has few dependencies
* portable (runs on Linux, *BSD, Solaris, HP-UX, Windows, Cygwin)


%prep
%setup -q
%patch0 -p0 -b .makefile


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-2
%{_bindir}/odt2txt
%{_mandir}/man*/*


%changelog
* Fri Sep 21 2007 Michel Salim <michel.sylvan at gmail.com> - 0.3-1
- Initial package



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:49 -0400
Subject: rpms/odt2txt/EL-4 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5nsK007836@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/EL-4

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:55 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:55 -0400
Subject: rpms/odt2txt/EL-5 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5tZp007856@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/EL-5

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:05:59 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:05:59 -0400
Subject: rpms/odt2txt/F-7 odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242305.l8ON5xPN007874@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/F-7

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:06:02 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 24 Sep 2007 19:06:02 -0400
Subject: rpms/odt2txt/devel odt2txt-makefile.patch,NONE,1.1
Message-ID: <200709242306.l8ON62Zr007895@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/odt2txt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7821/devel

Added Files:
	odt2txt-makefile.patch 
Log Message:
Add makefile patch

odt2txt-makefile.patch:

--- NEW FILE odt2txt-makefile.patch ---
--- Makefile.orig	2007-05-21 16:50:37.000000000 -0400
+++ Makefile	2007-09-21 14:39:29.000000000 -0400
@@ -82,7 +82,7 @@
 	$(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 	$(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
-	$(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
+	$(INSTALL) -p -m644 $(MAN) $(DESTDIR)$(MAN1DIR)
 
 odt2txt.html: $(MAN)
 	$(GROFF) -Thtml -man $(MAN) > $@



From fedora-extras-commits at redhat.com  Mon Sep 24 23:07:49 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Mon, 24 Sep 2007 19:07:49 -0400
Subject: rpms/frysk/devel frysk.spec,1.116,1.117
Message-ID: <200709242307.l8ON7nnV008112@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8034

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Fix path to dogtail_scripts.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- frysk.spec	24 Sep 2007 20:35:13 -0000	1.116
+++ frysk.spec	24 Sep 2007 23:07:15 -0000	1.117
@@ -173,7 +173,7 @@
 for f in test2866.py test2985.py test3380.py; do
     touch -r \
     	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
-	  $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/$f
 done
 
 # Workaround for #211824:
@@ -246,6 +246,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Fix path to dogtail_scripts.
 - Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.
 - Remove frysk-20060922-a-cast.patch



From fedora-extras-commits at redhat.com  Mon Sep 24 23:08:08 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 19:08:08 -0400
Subject: rpms/phpTodo/F-7 phpTodo-0.8.1beta.patch, NONE,
	1.1 phpTodo.httpd.conf, 
	NONE, 1.1 phpTodo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709242308.l8ON88Dd008121@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/phpTodo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	phpTodo-0.8.1beta.patch phpTodo.httpd.conf phpTodo.spec 
Log Message:
new package


phpTodo-0.8.1beta.patch:

--- NEW FILE phpTodo-0.8.1beta.patch ---
diff -urN phpTodo-0.8.1beta.orig/doc/sql/todo.sql phpTodo-0.8.1beta/doc/sql/todo.sql
--- phpTodo-0.8.1beta.orig/doc/sql/todo.sql	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/doc/sql/todo.sql	2007-09-22 20:00:22.000000000 +1000
@@ -26,7 +26,7 @@
                           password        CHAR(40)                NOT NULL,
                           admin           TINYINT     UNSIGNED    NOT NULL DEFAULT 0,
                           full_name       CHAR(40),
-                          email           CHAR(320)               NOT NULL,
+                          email           CHAR(255)               NOT NULL,
                           PRIMARY KEY     (id),
                           UNIQUE          (username),
                           INDEX           (password));
@@ -150,4 +150,4 @@
 INSERT INTO user_prefs VALUES (NULL, 1, 0, 0, 0, 0, 0, 0, 'none', 'asc');
 
 # Change the following line to reflect the correct user, host, database name, and password
-GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
+# GRANT insert, update, delete, select ON phpTodo.* TO phpTodo at localhost IDENTIFIED BY 'password';
diff -urN phpTodo-0.8.1beta.orig/feed.php phpTodo-0.8.1beta/feed.php
--- phpTodo-0.8.1beta.orig/feed.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/feed.php	2007-09-20 19:07:45.000000000 +1000
@@ -52,8 +52,19 @@
    if (! $feed_param = feed_authenticate($user_id, $feed_id, $secret)) {
       // Set up the channel with info indicating an invalid feed
       $feed->title = 'Invalid RSS Feed';
-      $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                        $phpTodo_serverpath . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath . $_SERVER['REQUEST_URI'];
+      $feed->link = $location;
+
       $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                         'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -73,8 +84,19 @@
 
    // Set up the channel
    $feed->title = $feed_param->name . ' - phpTodo RSS Feed';
-   $feed->link = 'http://' . $_SERVER['SERVER_NAME'] .
-                     $_SERVER['REQUEST_URI'];
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['SERVER_NAME'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= $_SERVER['REQUEST_URI'];
+   $feed->link = $location;
+
    $feed->description = 'phpTodo Version ' . $phpTodo_version . "\n" .
                      'Auto-generated RSS feed' . "\n" . $phpTodo_homepage;
 
@@ -161,8 +183,19 @@
       # Take the data and put it into the rss object
       $item = new FeedItem();
       $item->title = "$feedSubject ($priority)";
-      $item->link = 'http://' . $_SERVER['SERVER_NAME'] . $phpTodo_serverpath .
-                    "taskmodify.php?edit=Edit&task_id=$id";
+
+      // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+      $location = 'http';
+      if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+      $location .= '://'.$_SERVER['SERVER_NAME'];
+      if ( isset($_SERVER['HTTPS'])) {
+         if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      } else {
+         if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+      }
+      $location .= $phpTodo_serverpath ."taskmodify.php?edit=Edit&task_id=$id";
+      $item->link = $location;
+
       $item->description = nl2br("$feedDesc");
       $item->date = "$create_date $itemTZOffset";
       $item->source = '';
diff -urN phpTodo-0.8.1beta.orig/index.php phpTodo-0.8.1beta/index.php
--- phpTodo-0.8.1beta.orig/index.php	2007-04-07 03:54:16.000000000 +1000
+++ phpTodo-0.8.1beta/index.php	2007-09-20 19:07:45.000000000 +1000
@@ -58,8 +58,19 @@
       if (isset($_SESSION['redirect'])) {
          header('Location: ' . $_SESSION['redirect']);
       } else {
-         header('Location: http://' . $_SERVER['HTTP_HOST'] .
-                dirname($_SERVER['PHP_SELF']) . '/todolist.php');
+
+         // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+         $location = 'http';
+         if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+         $location .= '://'.$_SERVER['HTTP_HOST'];
+         if ( isset($_SERVER['HTTPS'])) {
+            if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         } else {
+            if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+         }
+         $location .= dirname($_SERVER['PHP_SELF']) . '/todolist.php';
+         header('Location: ' . $location);
+
       }
       unset($_SESSION['redirect']);
 
diff -urN phpTodo-0.8.1beta.orig/libs/sec_check.php phpTodo-0.8.1beta/libs/sec_check.php
--- phpTodo-0.8.1beta.orig/libs/sec_check.php	2007-03-07 04:58:04.000000000 +1100
+++ phpTodo-0.8.1beta/libs/sec_check.php	2007-09-20 19:07:45.000000000 +1000
@@ -164,15 +164,35 @@
       }
    }
 
-   $_SESSION['redirect'] = 'http://' . $_SERVER['HTTP_HOST'] .
-                           dirname($_SERVER['PHP_SELF']) . '/';
+
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/';
+   $_SESSION['redirect'] = $location;
 
    if (isset($redirect)) {
        $_SESSION['redirect'] .= $redirect;
    }
 
-   header('Location: http://' . $_SERVER['HTTP_HOST'] .
-          dirname($_SERVER['PHP_SELF']) . '/index.php');
+   // bugfix for https and/or non standard ports - Marc Bradshaw <marc at marcbradshaw.co.uk>
+   $location = 'http';
+   if ( isset($_SERVER['HTTPS'])) { $location .= 's'; }
+   $location .= '://'.$_SERVER['HTTP_HOST'];
+   if ( isset($_SERVER['HTTPS'])) {
+      if ( $_SERVER["SERVER_PORT"] != '443' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   } else {
+      if ( $_SERVER["SERVER_PORT"] != '80' ) { $location .= ':' . $_SERVER["SERVER_PORT"]; } 
+   }
+   $location .= dirname($_SERVER['PHP_SELF']) . '/index.php';
+   header('Location: ' . $location);
+
 }
 
 ?>
diff -urN phpTodo-0.8.1beta.orig/sample_config.php phpTodo-0.8.1beta/sample_config.php
--- phpTodo-0.8.1beta.orig/sample_config.php	2007-04-07 04:17:12.000000000 +1000
+++ phpTodo-0.8.1beta/sample_config.php	2007-09-20 20:48:51.000000000 +1000
@@ -21,20 +21,35 @@
 // The work directory contains all of the private
 // smarty data.  This directory should be below the
 // httpd root
-$phpTodo_work_dir = '/path/to/private/phptodo';
+$phpTodo_work_dir = '/var/cache/phpTodo';
 
 // The http directory is the first level directory
 // where the phpTodo distribution was uncompressed
-$phpTodo_http_dir = '/path/to/public/phptodo';
+$phpTodo_http_dir = '/usr/share/phpTodo';
 
 // The smarty directory is the location of the Smarty.class.php file
-$phpTodo_smarty_dir = 'smarty/';
+// F7 Smarty builds are in /usr/share/php/Smarty/
+// FC6 and earlier Smarty builds are in /usr/share/Smarty/ instead.
+// We will default to F7 but check for a class file in the FC6 location
+// You may edit this to a single line pointing to the locaton of your Smarty
+// install to save a couple of cycles if you wish.
+$phpTodo_smarty_dir = '/usr/share/php/Smarty/';
+if (file_exists("/usr/share/Smarty/Smarty.class.php"))
+{
+	$phpTodo_smarty_dir = "/usr/share/Smarty/";
+}
 
 // This is the default stylesheet used by phpTodo
 // The location of the stylesheet is relative to
 // the http directory
 $phpTodo_stylesheet = 'css/default.css';
 
+
+// The following line **MUST** be removed from the config file
+// once the database has been setup and configured.
+header("Content-type: text/plain");die("Welcome to phpTodo - Web based todo lists\n\nPlease setup and configure the database and edit the\n/etc/phpTodo/config.php configuration file.\n\nInstructions for setting up the database can be found\nin the ##DOCLOCATION##/INSTALL file.\n\nThe SQL required for setting up the database can be found\nin the ##DOCLOCATION##/sql/ directory.");
+
+
 // This is the name of the phpTodo database
 $phpTodo_dbName = 'phpTodo';
 
@@ -47,6 +62,7 @@
 // This is the password for the database
 $phpTodo_dbPass = 'password';
 
+
 // Default session time (in seconds)
 $phpTodo_sessTime = 600;
 


--- NEW FILE phpTodo.httpd.conf ---
#
# phpTodo is a to do list manager written in PHP.
#

Alias /phpTodo /usr/share/phpTodo


--- NEW FILE phpTodo.spec ---
Summary: PHP todo list manager
Name: phpTodo
Version: 0.8.1
Release: 0.8.beta%{?dist}
License: GPLv2+
URL: http://phptodo.godshell.com/
Group: Applications/Internet
Source0: http://downloads.sourceforge.net/phptodo/%{name}-%{version}beta.tar.gz
Source1: phpTodo.httpd.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: phpTodo-0.8.1beta.patch
BuildArch: noarch
BuildRequires: gettext
Requires: httpd
Requires: php-Smarty
Requires: php-mysql
Requires(post): policycoreutils
Requires(postun): policycoreutils
# to make sure the "apache" group is created before phpTodo is installed

%description
The general idea behind this program is to keep all of your todo lists in
one central location.  I've grown very tired of having lists all over the
place and being unable to reconcile them...

%prep
%setup -qn %{name}-%{version}beta
%patch1 -p1
sed -i -r "s|##DOCLOCATION##|%{_datadir}/doc/%{name}-%{version}|g" sample_config.php
# Rearrange the documentation
cp sample_config.php doc/
chmod 755 doc/selenium
chmod 755 doc/sql
chmod 755 libs
chmod 755 templates
chmod 755 css
chmod 755 images


%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/templates_c
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/cache
mkdir -p -m0755 %{buildroot}%{_localstatedir}/cache/phpTodo/config
mkdir -p -m0755 %{buildroot}%{_datadir}/phpTodo
mv sample_config.php config.php
install -m 0644 config.php %{buildroot}%{_sysconfdir}/phpTodo/
ln -s ../../../..%{_sysconfdir}/phpTodo/config.php \
    %{buildroot}%{_datadir}/phpTodo/config.php
install -m 0644 index.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 about.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 datetimepicker.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 feed.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 logout.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 prefs.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskedit.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 taskmodify.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 todolist.php %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.js %{buildroot}%{_datadir}/phpTodo/
install -m 0644 users.php %{buildroot}%{_datadir}/phpTodo/
for d in css images libs templates; do
    cp -rp $d %{buildroot}%{_datadir}/phpTodo/
done

mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/phpTodo.conf


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root)
%doc doc/*
%config %dir %{_sysconfdir}/phpTodo
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/phpTodo/*.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpTodo.conf
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/templates_c
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/cache
%attr(0700, apache, apache) %dir %{_localstatedir}/cache/phpTodo/config
%{_datadir}/phpTodo


%post
# SELinux probably needs work.
# Set SELinux file context in the policy
semanage fcontext -a -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
# Actually change the context
restorecon -R %{_datadir}/phpTodo/ || :
restorecon -R %{_sysconfdir}/phpTodo/ || :
restorecon -R %{_localstatedir}/cache/phpTodo/ || :


%postun
# SELinux support
if [ $1 -eq 0 ]; then  # final removal
  semanage fcontext -d -t httpd_sys_content_t '%{_datadir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_sysconfdir}/phpTodo(/.*)?' 2>/dev/null || :
  semanage fcontext -d -t httpd_sys_content_t '%{_localstatedir}/cache/phpTodo(/.*)?' 2>/dev/null || :
fi


%changelog
* Sat Sep 22 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.8.beta%{?dist}
- SELinux changes
- Improved initial mysql schema

* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.7.beta%{?dist}
- Updated location of Smarty for F7 rpm
- Added more useful message to be displayed when user has not configured
- or setup database before using phpTodo.

* Mon Aug 13 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.6.beta%{?dist}
- Updated license field re new guidelines

* Sun Jun 17 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.5.beta
- sourceforge mirror changed to downloads.sourceforge.net

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.4.beta
- SELinux post section added

* Tue May 29 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.3.beta
- Cleanup of SPEC file

* Sat Apr 28 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.2.beta
- Cleanup of SPEC file

* Thu Apr 10 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.8.1-0.1.beta
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:14:45 -0000	1.1
+++ .cvsignore	24 Sep 2007 23:07:35 -0000	1.2
@@ -0,0 +1 @@
+phpTodo-0.8.1beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpTodo/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:14:45 -0000	1.1
+++ sources	24 Sep 2007 23:07:35 -0000	1.2
@@ -0,0 +1 @@
+81293fbc69d691fb897fc007f8502efe  phpTodo-0.8.1beta.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:09:57 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 19:09:57 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch, 1.1, 1.2 xen.spec, 1.186,
	1.187
Message-ID: <200709242309.l8ON9vi8008263@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8166

Modified Files:
	xen-pvfb-04-compat.patch xen.spec 
Log Message:
Make 32-bit FC6 guests work on 64-bit host

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-04-compat.patch	24 Sep 2007 20:51:43 -0000	1.1
+++ xen-pvfb-04-compat.patch	24 Sep 2007 23:09:22 -0000	1.2
@@ -1,7 +1,7 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 13:46:13.000000000 -0400
-@@ -0,0 +1,569 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 18:51:06.000000000 -0400
+@@ -0,0 +1,610 @@
 +#include <stdarg.h>
 +#include <stdlib.h>
 +#include <sys/types.h>
@@ -9,6 +9,7 @@
 +#include <unistd.h>
 +#include <xenctrl.h>
 +#include <xen/io/xenbus.h>
++#include <xen/io/protocols.h>
 +#include <sys/select.h>
 +#include <stdbool.h>
 +#include <xen/linux/evtchn.h>
@@ -49,6 +50,7 @@
 +	struct xs_handle *xsh;	/* xs daemon handle */
 +	struct xenfb_device fb, kbd;
 +	size_t fb_len;		/* size of framebuffer */
++	char protocol[64];	/* frontend protocol */
 +};
 +
 +static void oldxenfb_detach_dom(struct xenfb_private *);
@@ -179,37 +181,72 @@
 +	return 0;
 +}
 +
++static void oldxenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src)
++{
++	uint32_t *src32 = src;
++	uint64_t *src64 = src;
++	int i;
++
++	for (i = 0; i < count; i++)
++		dst[i] = (mode == 32) ? src32[i] : src64[i];
++}
 +
 +static int oldxenfb_map_fb(struct xenfb_private *xenfb, int domid)
 +{
 +	struct xenfb_page *page = xenfb->fb.page;
 +	int n_fbmfns;
 +	int n_fbdirs;
-+	unsigned long *fbmfns;
++	unsigned long *pgmfns = NULL;
++	unsigned long *fbmfns = NULL;
++	void *map;
++	int mode, ret = -1;
++
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return -1;
 +
 +	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
-+	n_fbdirs = n_fbmfns * sizeof(unsigned long);
++	n_fbdirs = n_fbmfns * mode / 8;
 +	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
 +
++	pgmfns = malloc(sizeof(unsigned long) * n_fbdirs);
++	fbmfns = malloc(sizeof(unsigned long) * n_fbmfns);
++	if (!pgmfns || !fbmfns)
++		goto out;
++
 +	/*
 +	 * Bug alert: xc_map_foreign_batch() can fail partly and
 +	 * return a non-null value.  This is a design flaw.  When it
 +	 * happens, we happily continue here, and later crash on
 +	 * access.
 +	 */
-+	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
-+			PROT_READ, page->pd, n_fbdirs);
-+	if (fbmfns == NULL)
-+		return -1;
++	oldxenfb_copy_mfns(mode, n_fbdirs, pgmfns, page->pd);
++	map = xc_map_foreign_batch(xenfb->xc, domid,
++				   PROT_READ, pgmfns, n_fbdirs);
++	if (map == NULL)
++		goto out;
++	oldxenfb_copy_mfns(mode, n_fbmfns, fbmfns, map);
++	munmap(map, n_fbdirs * XC_PAGE_SIZE);
 +
 +	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
 +				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
 +	if (xenfb->pub.pixels == NULL) {
-+		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
-+		return -1;
++		goto out;
 +	}
 +
-+	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
++	ret = 0; /* all is fine */
++
++ out:
++	if (pgmfns)
++		free(pgmfns);
++	if (fbmfns)
++		free(fbmfns);
++	return ret;
 +}
 +
 +static int oldxenfb_bind(struct xenfb_device *dev)
@@ -319,6 +356,10 @@
 +	if (oldxenfb_bind(&xenfb->kbd) < 0)
 +		goto error;
 +
++	if (oldxenfb_xs_scanf1(xsh, xenfb->fb.otherend, "protocol", "%63s",
++			       xenfb->protocol) < 0)
++		xenfb->protocol[0] = '\0';
++
 +	/* TODO check for permitted ranges */
 +	fb_page = xenfb->fb.page;
 +	xenfb->pub.depth = fb_page->depth;
@@ -571,9 +612,9 @@
 +        xs_unwatch(xsh, p, "");
 +        return ret;
 +}
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 13:47:01.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 18:50:44.000000000 -0400
 @@ -0,0 +1,106 @@
 +/*
 + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
@@ -681,9 +722,9 @@
 +};
 +
 +#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 13:47:01.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 18:50:44.000000000 -0400
 @@ -0,0 +1,92 @@
 +/*
 + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
@@ -777,9 +818,9 @@
 +void xenkbd_resume(void);
 +
 +#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 13:44:38.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 18:50:44.000000000 -0400
 @@ -41,6 +41,7 @@ struct xenfb_private {
  	struct xenfb_device fb, kbd;
  	size_t fb_len;		/* size of framebuffer */
@@ -855,9 +896,9 @@
  	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
  	event.type = XENKBD_TYPE_POS;
  	event.pos.abs_x = abs_x;
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 13:47:37.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 18:50:44.000000000 -0400
 @@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
  int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
  int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
@@ -877,10 +918,10 @@
 +
 +
  #endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 13:48:04.000000000 -0400
-@@ -371,7 +376,7 @@ VL_OBJS+= xenstore.o
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 18:50:44.000000000 -0400
+@@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
  VL_OBJS+= xen_machine_fv.o
  VL_OBJS+= xen_machine_pv.o
@@ -889,10 +930,10 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 13:48:59.000000000 -0400
-@@ -53,7 +53,11 @@ class VfbifController(DevController):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:42:25.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:50:44.000000000 -0400
+@@ -50,7 +50,11 @@ class VfbifController(DevController):
          if self.vm.info.is_hvm():
              # is HVM, so qemu-dm will handle the vfb.
              return
@@ -905,10 +946,10 @@
          args = [ xen.util.auxbin.pathTo("qemu-dm"),
                   "-M", "xenpv",
                   "-d", "%d" % self.vm.getDomid(),
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-09-24 13:42:20.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 13:49:27.000000000 -0400
-@@ -690,7 +690,7 @@ class XendConfig(dict):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-05-18 10:45:21.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 18:50:44.000000000 -0400
+@@ -689,7 +689,7 @@ class XendConfig(dict):
          self['vtpm_refs'] = cfg.get('vtpm_refs', [])
  
          # coalesce hvm vnc frame buffer with vfb config
@@ -917,7 +958,7 @@
              # add vfb device if it isn't there already
              has_rfb = False
              for console_uuid in self['console_refs']:
-@@ -705,7 +705,7 @@ class XendConfig(dict):
+@@ -704,7 +704,7 @@ class XendConfig(dict):
                  dev_config = ['vfb']
                  # copy VNC related params from platform config to vfb dev conf
                  for key in ['vncpasswd', 'vncunused', 'vncdisplay',
@@ -926,9 +967,9 @@
                      if key in self['platform']:
                          dev_config.append([key, self['platform'][key]])
  
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
 --- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 13:49:55.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 18:50:44.000000000 -0400
 @@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
              d['type'] = 'sdl'
          for (k,v) in d.iteritems():


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- xen.spec	24 Sep 2007 21:55:52 -0000	1.186
+++ xen.spec	24 Sep 2007 23:09:22 -0000	1.187
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -276,6 +276,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
+- Make 32-bit FC-6 guest PVFB work on x86_64 host 
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
 - Re-add support for back-compat FC6 PVFB support
 - Fix handling of explicit port numbers (rhbz #279581)



From fedora-extras-commits at redhat.com  Mon Sep 24 23:14:37 2007
From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs))
Date: Mon, 24 Sep 2007 19:14:37 -0400
Subject: rpms/perl-Time-Duration/F-7 perl-Time-Duration.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709242314.l8ONEbAU008522@cvs-int.fedora.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/perl-Time-Duration/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8495/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Time-Duration.spec 
Log Message:
new package



--- NEW FILE perl-Time-Duration.spec ---
Name:           perl-Time-Duration
Summary:        Time-Duration - rounded or exact English expression of durations
Version:        1.06
Release:        2%{?dist}
License:        GPLv2+ or Artistic 2.0
Group:          Development/Libraries
Url:            http://search.cpan.org/dist/Time-Duration/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Source:         http://search.cpan.org//CPAN/authors/id/A/AV/AVIF/Time-Duration-%{version}.tar.gz
BuildRequires:  perl(Test::Pod::Coverage) perl(Test::Pod) perl(ExtUtils::MakeMaker)

%description
This module provides functions for expressing durations in rounded or exact
terms.


%prep
%setup -q -n Time-Duration-%{version} 


%check
make test


%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}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_mandir}/man3/*
%{perl_vendorlib}/Time


%changelog
* Thu Sep 20 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-2
- Tidied build flas

* Wed Sep 19 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.06-1
- Version update, Licence versions added

* Mon Jul 02 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-4
- Add ChangeLog to docs

* Tue Jun 05 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-3
- Specfile cleanup

* Fri Jun 01 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-2
- Specfile cleanup

* Thu May 24 2007 Marc Bradshaw <fedora at marcbradshaw.co.uk> 1.04-1
- Initial fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:12:42 -0000	1.1
+++ .cvsignore	24 Sep 2007 23:14:05 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Time-Duration/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:12:42 -0000	1.1
+++ sources	24 Sep 2007 23:14:05 -0000	1.2
@@ -0,0 +1 @@
+d65108e0e4e8ffb38e28d532f8ddcd12  Time-Duration-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Sep 24 23:47:02 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 19:47:02 -0400
Subject: rpms/xen/devel xen-3.1.0-no-xenapi-docs.patch, NONE, 1.1 xen.spec, 
	1.187, 1.188
Message-ID: <200709242347.l8ONl2Bc009968@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935

Modified Files:
	xen.spec 
Added Files:
	xen-3.1.0-no-xenapi-docs.patch 
Log Message:
Fix xm man page

xen-3.1.0-no-xenapi-docs.patch:

--- NEW FILE xen-3.1.0-no-xenapi-docs.patch ---
diff -rup xen-3.1.0-src/docs/Makefile xen-3.1.0-src.new/docs/Makefile
--- xen-3.1.0-src/docs/Makefile	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/docs/Makefile	2007-06-14 16:29:21.000000000 -0400
@@ -22,9 +22,6 @@ all: build
 
 .PHONY: build
 build: ps pdf html man-pages
-	@if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
-	$(MAKE) -C xen-api build ; else                              \
-        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 .PHONY: dev-docs
@@ -67,7 +64,6 @@ man5/%.5: man/%.pod.5 Makefile
 
 .PHONY: clean
 clean:
-	$(MAKE) -C xen-api clean
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
 	rm -rf *.ilg *.log *.ind *.toc *.bak core
 	rm -rf $(GFX) ps pdf html
@@ -83,8 +79,6 @@ install: all
 	rm -rf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
 
-	$(MAKE) -C xen-api install
-
 	cp -dR ps $(DESTDIR)$(pkgdocdir)
 	cp -dR pdf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
Only in xen-3.1.0-src.new/docs: Makefile~


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- xen.spec	24 Sep 2007 23:09:22 -0000	1.187
+++ xen.spec	24 Sep 2007 23:46:30 -0000	1.188
@@ -29,6 +29,7 @@
 Patch31: xen-tpm-functions.patch
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
+Patch34: xen-3.1.0-no-xenapi-docs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -131,6 +132,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 # config patches
 %patch100 -p1
@@ -276,8 +278,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
+- Fix generation of manual pages (rhbz #250791)
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
-- Make 32-bit FC-6 guest PVFB work on x86_64 host 
+- Make 32-bit FC-6 guest PVFB work on x86_64 host
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc8
 - Re-add support for back-compat FC6 PVFB support



From fedora-extras-commits at redhat.com  Mon Sep 24 23:54:38 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 19:54:38 -0400
Subject: comps comps-f8.xml.in,1.120,1.121
Message-ID: <200709242354.l8ONscXf010242@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10213

Modified Files:
	comps-f8.xml.in 
Log Message:
- add baekmuk-ttf-fonts, baekmuk-bdf-fonts, and lohit-fonts



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- comps-f8.xml.in	24 Sep 2007 18:39:16 -0000	1.120
+++ comps-f8.xml.in	24 Sep 2007 23:54:08 -0000	1.121
@@ -308,21 +308,21 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
@@ -355,6 +355,7 @@
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -392,23 +393,26 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-malayalam</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-malayalam</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
@@ -417,6 +421,7 @@
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">gentium-fonts</packagereq>
@@ -446,6 +451,7 @@
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">bitmap-fonts-cjk</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 00:03:57 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Mon, 24 Sep 2007 20:03:57 -0400
Subject: rpms/rsyslog/devel .cvsignore, 1.10, 1.11 rsyslog.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200709250003.l8P03v47016541@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16489

Modified Files:
	.cvsignore rsyslog.spec sources 
Log Message:
upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Aug 2007 12:39:16 -0000	1.10
+++ .cvsignore	25 Sep 2007 00:03:24 -0000	1.11
@@ -1,3 +1,3 @@
 rsyslog.init
 rsyslog.sysconfig
-rsyslog-1.19.2.tar.gz
+rsyslog-1.19.6.tar.gz


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rsyslog.spec	28 Aug 2007 12:39:16 -0000	1.13
+++ rsyslog.spec	25 Sep 2007 00:03:24 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.2
+Version: 1.19.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -10,7 +10,6 @@
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.19.2-invertAppSelect.patch
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .invertAppSelect
 
 %build
 %configure --sbindir=%{sbindir} --disable-static
@@ -119,6 +117,9 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6
+- upstream bugfix release
+
 * Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1
 - upstream bugfix release
 - support for negative app selector, patch from 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Aug 2007 12:39:16 -0000	1.10
+++ sources	25 Sep 2007 00:03:24 -0000	1.11
@@ -1,3 +1,3 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
-d4066f735ce235bc2ef1f1409262ec57  rsyslog-1.19.2.tar.gz
+0aa4ea5d07d3c2ba3080b4a64280ff72  rsyslog-1.19.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 00:08:23 2007
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Mon, 24 Sep 2007 20:08:23 -0400
Subject: rpms/kernel/devel linux-2.6-powerpc-FULL_REGS-on-exec.patch, NONE, 
	1.1 kernel.spec, 1.183, 1.184
Message-ID: <200709250008.l8P08NdU016754@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16733

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-powerpc-FULL_REGS-on-exec.patch 
Log Message:
Fix powerpc oops on ptrace after exec. (#301791)

linux-2.6-powerpc-FULL_REGS-on-exec.patch:

--- NEW FILE linux-2.6-powerpc-FULL_REGS-on-exec.patch ---
>From e3ca2dbae775573ae11243a57bcfd3337ec001a8 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Mon, 24 Sep 2007 16:46:40 -0700
Subject: [PATCH 2/2] powerpc: FULL_REGS on exec

When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at
the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in CHECK_FULL_REGS.
With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at
the (gdb) prompt is sufficient to produce this.  I also have written an
isolated test case, see https://bugzilla.redhat.com/show_bug.cgi?id=301791#c15.

This change fixes the problem by clearing the low bit of pt_regs.trap in
start_thread so that FULL_REGS is true again.  This is correct since all of
the GPRs that "full" refers to are cleared in start_thread.

Signed-off-by: Roland McGrath <roland at redhat.com>
---
 arch/powerpc/kernel/process.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index e477c9d..fd799d2 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -605,6 +605,13 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
 	regs->ccr = 0;
 	regs->gpr[1] = sp;
 
+	/*
+	 * We have just cleared all the nonvolatile GPRs, so make
+	 * FULL_REGS(regs) return true.  This is necessary to allow
+	 * ptrace to examine the thread immediately after exec.
+	 */
+	regs->trap &= ~1UL;
+
 #ifdef CONFIG_PPC32
 	regs->mq = 0;
 	regs->nip = start;
-- 
1.5.2.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- kernel.spec	24 Sep 2007 21:55:27 -0000	1.183
+++ kernel.spec	25 Sep 2007 00:07:50 -0000	1.184
@@ -590,6 +590,7 @@
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch141: linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
@@ -672,7 +673,7 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-Patch1600: linux-2.6-x86-edd-maxdrive.patch 
+Patch1600: linux-2.6-x86-edd-maxdrive.patch
 
 #nouveau
 Patch1800: drm-mm-git.patch
@@ -1037,7 +1038,8 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 # pegasos IDE
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-
+# fix RHBZ#301791
+ApplyPatch linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 # Exec shield
 ApplyPatch linux-2.6-execshield.patch
@@ -1214,7 +1216,7 @@
 # ---------- below all scheduled for 2.6.23 -----------------
 
 # EDD fix
-ApplyPatch linux-2.6-x86-edd-maxdrive.patch 
+ApplyPatch linux-2.6-x86-edd-maxdrive.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1807,6 +1809,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Roland McGrath <roland at redhat.com>
+- Fix powerpc oops on ptrace after exec. (#301791)
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - Disable generic RTC.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 00:16:32 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Mon, 24 Sep 2007 20:16:32 -0400
Subject: comps/po ja.po,1.5,1.6
Message-ID: <200709250016.l8P0GWiq017249@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223/po

Modified Files:
	ja.po 
Log Message:
translation 100% completed


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ja.po	17 Sep 2007 19:22:12 -0000	1.5
+++ ja.po	25 Sep 2007 00:16:02 -0000	1.6
@@ -1,24 +1,23 @@
-# translation of ja-new.po to Japanese
 # translation of ja.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
+#
 # James Hashida <khashida at redhat.com>, 2002.
 # Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007.
 # Hirofumi Saito <hi_saito at yk.rim.or.jp>, 2004, 2005.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-03-01 14:53+1000\n"
+"POT-Creation-Date: 2007-09-20 17:44-0700\n"
+"PO-Revision-Date: 2007-09-24 12:02+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
-"Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
+"Language-Team: Japanese\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-Generator: KBabel 1.11.4\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
@@ -190,8 +189,7 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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) ??????????????????????????????????????????????????????????????????????????????"
 "?????????????????????????????????????????????????????????"
@@ -264,8 +262,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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 ""
 "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 "??????"
@@ -328,8 +325,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -344,14 +340,12 @@
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? Web ???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run an FTP server on the system."
-msgstr ""
-"?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
+msgstr "?????????????????????????????????????????????????????? FTP ???????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
 #: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
@@ -388,8 +382,7 @@
 #: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
 #: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid "This group includes packages to help you manipulate and scan images."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
 #: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59
@@ -411,44 +404,33 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -510,19 +492,16 @@
 msgstr "???????????????????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "???????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "???????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -545,23 +524,20 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -640,9 +616,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -669,9 +644,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -702,16 +676,14 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -734,9 +706,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -747,14 +718,12 @@
 msgstr "??????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????????????????????"
+msgstr "????????????????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -781,9 +750,8 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "????????????????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -806,9 +774,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -843,9 +810,8 @@
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -872,9 +838,8 @@
 msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -905,9 +870,8 @@
 msgstr "????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -926,21 +890,17 @@
 msgstr "Eclipse ???????????????????????????"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
-msgstr ""
-"?????????????????????????????? X Window System ??????????????????????????????????????????????????????"
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "????????????????????????????????????DHCP???Kerberos???NIS ????????? ????????????????????????????????????"
 "?????????????????????????????????"
@@ -992,8 +952,7 @@
 "???????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "?????????????????????????????????????????????????????????????????? DNS ????????????????????? (BIND) ?????????"
 "???????????????"
@@ -1019,14 +978,12 @@
 "?????????????????????"
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "???????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "??????????????????????????????"
+msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1045,18 +1002,16 @@
 msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "??????????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "???????????????????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1084,378 +1039,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "Buildsystem ?????????????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "Eclipse"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse ???????????????????????????"
+msgstr "Eclipse ????????????????????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "????????????????????????"
+msgstr "?????????????????????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "??????????????????????????????"
+msgstr "??????????????????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "British Support"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????????????????? Mozilla ????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "??????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr ""
-#~ "????????????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ????????????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "??????????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ?????????????????????????????? Mozilla ???????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Multilib ???????????????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ??????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "System"
-#~ msgstr "????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ?????????????????????????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "?????????????????????????????????IMAP ??? Postfix ?????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "????????????????????????????????????Red Hat Enterprise Linux ?????????????????????????????????"
-#~ "????????????????????????????????????"
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ??????????????????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ????????????????????????????????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ??????????????????????????????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "??????"
-
-#~ msgid "French"
-#~ msgstr "???????????????"
-
-#~ msgid "German"
-#~ msgstr "????????????"
-
-#~ msgid "Italian"
-#~ msgstr "???????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ??????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????????????????? Red Hat Enterprise Linux ????????????"
-#~ "?????????????????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????????????????"
-#~ "??????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "??????????????????????????????????????? Red Hat Enterprise Linux ?????????????????????????????????"
-#~ "????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid "Japanese"
-#~ msgstr "?????????"
-
-#~ msgid "Korean"
-#~ msgstr "?????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "?????????(??????)"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "???????????????????????????????????? Red Hat Enterprise Linux ????????????????????????????????????"
-#~ "?????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "???????????????????????????????????? Red Hat Enterprise Linux ????????????????????????????????????"
-#~ "?????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????????????????????????????????(??????)??? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????????????????????????????????(??????)??? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "?????????(??????)"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ????????????????????????????????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "???????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "???????????????????????????????????????????????? Red Hat Enterprise Linux ????????????????????????"
-#~ "?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "????????????????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "????????????????????????????????????????????? Red Hat Enterprise Linux ???????????????????????????"
-#~ "??????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????????????????????????????????????????? Red Hat Enterprise Linux ??????????????????????????????"
-#~ "???????????????"
-
-#~ msgid "Cluster Storage"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "?????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "????????????????????? GFS ??????????????????????????????????????????????????????"
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "????????????????????? GFS ???????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "??????????????????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java Runtime Environment ??????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "?????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "Red Hat Enterprise Linux ?????????????????????????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux ???????????????"
-
-#~ msgid "Workstation"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "??????????????????????????????????????????????????????????????????????????????????????????"
-
-#~ msgid "Virtualization Support."
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "?????????????????????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ??????????????????????????????"
+msgstr "????????????????????????????????????????????????????????????????????????"
 
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????????????????????????????????????????????????????????????????????"



From fedora-extras-commits at redhat.com  Tue Sep 25 00:16:39 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Mon, 24 Sep 2007 20:16:39 -0400
Subject: rpms/rsyslog/devel rsyslog-1.19.2-invertAppSelect.patch,1.1,NONE
Message-ID: <200709250016.l8P0GdUK017258@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17243

Removed Files:
	rsyslog-1.19.2-invertAppSelect.patch 
Log Message:



--- rsyslog-1.19.2-invertAppSelect.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 00:18:53 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 24 Sep 2007 20:18:53 -0400
Subject: rpms/xen/F-7 xen-3.1.0-no-xenapi-docs.patch, NONE,
	1.1 xen-pvfb-compat-32-on-64.patch, NONE, 1.1 xen.spec, 1.183, 1.184
Message-ID: <200709250018.l8P0Irn6017335@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17301

Modified Files:
	xen.spec 
Added Files:
	xen-3.1.0-no-xenapi-docs.patch xen-pvfb-compat-32-on-64.patch 
Log Message:
Added patch for FC6 32-on-64 compat. Fixed man page build

xen-3.1.0-no-xenapi-docs.patch:

--- NEW FILE xen-3.1.0-no-xenapi-docs.patch ---
diff -rup xen-3.1.0-src/docs/Makefile xen-3.1.0-src.new/docs/Makefile
--- xen-3.1.0-src/docs/Makefile	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/docs/Makefile	2007-06-14 16:29:21.000000000 -0400
@@ -22,9 +22,6 @@ all: build
 
 .PHONY: build
 build: ps pdf html man-pages
-	@if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
-	$(MAKE) -C xen-api build ; else                              \
-        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 .PHONY: dev-docs
@@ -67,7 +64,6 @@ man5/%.5: man/%.pod.5 Makefile
 
 .PHONY: clean
 clean:
-	$(MAKE) -C xen-api clean
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
 	rm -rf *.ilg *.log *.ind *.toc *.bak core
 	rm -rf $(GFX) ps pdf html
@@ -83,8 +79,6 @@ install: all
 	rm -rf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
 
-	$(MAKE) -C xen-api install
-
 	cp -dR ps $(DESTDIR)$(pkgdocdir)
 	cp -dR pdf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
Only in xen-3.1.0-src.new/docs: Makefile~

xen-pvfb-compat-32-on-64.patch:

--- NEW FILE xen-pvfb-compat-32-on-64.patch ---
diff -rup --exclude '*~' xen-3.1.0-src/tools/xenfb/oldxenfb.c xen-3.1.0-hacked/tools/xenfb/oldxenfb.c
--- xen-3.1.0-src/tools/xenfb/oldxenfb.c	2007-07-24 10:12:10.000000000 +0200
+++ xen-3.1.0-hacked/tools/xenfb/oldxenfb.c	2007-07-24 20:29:47.000000000 +0200
@@ -7,9 +7,9 @@
 #include <xen/io/xenbus.h>
 #include "oldxenfb.h"
 #include "oldxenkbd.h"
+#include <xen/io/protocols.h>
 #include <sys/select.h>
 #include <stdbool.h>
-#include <xen/linux/evtchn.h>
 #include <xen/event_channel.h>
 #include <sys/mman.h>
 #include <errno.h>
@@ -40,6 +40,7 @@ struct xenfb_private {
 	struct xs_handle *xsh;	/* xs daemon handle */
 	struct xenfb_device fb, kbd;
 	size_t fb_len;		/* size of framebuffer */
+	char protocol[64];	/* frontend protocol */
 };
 
 static void xenfb_detach_dom(struct xenfb_private *);
@@ -243,36 +244,71 @@ int xenfb_switch_to_old_protocol(char **
 	abort();
 }
 
+static void xenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src)
+{
+	uint32_t *src32 = src;
+	uint64_t *src64 = src;
+	int i;
+
+	for (i = 0; i < count; i++)
+		dst[i] = (mode == 32) ? src32[i] : src64[i];
+}
+
 static int xenfb_map_fb(struct xenfb_private *xenfb, int domid)
 {
 	struct xenfb_page *page = xenfb->fb.page;
 	int n_fbmfns;
 	int n_fbdirs;
-	unsigned long *fbmfns;
+	unsigned long *pgmfns = NULL;
+	unsigned long *fbmfns = NULL;
+	void *map;
+	int mode, ret = -1;
+
+	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
+	    mode = sizeof(unsigned long) * 8;
+	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
+	    mode = 32;
+	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
+	    mode = 64;
+	else
+	    return -1;
 
 	n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
-	n_fbdirs = n_fbmfns * sizeof(unsigned long);
+	n_fbdirs = n_fbmfns * mode / 8;
 	n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
 
+	pgmfns = malloc(sizeof(unsigned long) * n_fbdirs);
+	fbmfns = malloc(sizeof(unsigned long) * n_fbmfns);
+	if (!pgmfns || !fbmfns)
+		goto out;
+
 	/*
 	 * Bug alert: xc_map_foreign_batch() can fail partly and
 	 * return a non-null value.  This is a design flaw.  When it
 	 * happens, we happily continue here, and later crash on
 	 * access.
 	 */
-	fbmfns = xc_map_foreign_batch(xenfb->xc, domid,
-			PROT_READ, page->pd, n_fbdirs);
-	if (fbmfns == NULL)
-		return -1;
+	xenfb_copy_mfns(mode, n_fbdirs, pgmfns, page->pd);
+	map = xc_map_foreign_batch(xenfb->xc, domid,
+				   PROT_READ, pgmfns, n_fbdirs);
+	if (map == NULL)
+		goto out;
+	xenfb_copy_mfns(mode, n_fbmfns, fbmfns, map);
+	munmap(map, n_fbdirs * XC_PAGE_SIZE);
 
 	xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid,
 				PROT_READ | PROT_WRITE, fbmfns, n_fbmfns);
-	if (xenfb->pub.pixels == NULL) {
-		munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
-		return -1;
-	}
+	if (xenfb->pub.pixels == NULL)
+		goto out;
+
+	ret = 0; /* all is fine */
 
-	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
+ out:
+	if (pgmfns)
+		free(pgmfns);
+	if (fbmfns)
+		free(fbmfns);
+	return ret;
 }
 
 static int xenfb_bind(struct xenfb_device *dev)
@@ -373,7 +409,7 @@ int xenfb_attach_dom(struct xenfb *xenfb
 {
 	struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub;
 	struct xs_handle *xsh = xenfb->xsh;
-	int val, serrno;
+	int serrno;
 	struct xenfb_page *fb_page;
 	union xenfb_in_event event;
 
@@ -392,6 +428,10 @@ int xenfb_attach_dom(struct xenfb *xenfb
 	if (xenfb_bind(&xenfb->kbd) < 0)
 		goto error;
 
+	if (xenfb_xs_scanf1(xsh, xenfb->fb.otherend, "protocol", "%63s",
+			    xenfb->protocol) < 0)
+		xenfb->protocol[0] = '\0';
+
 	/* TODO check for permitted ranges */
 	fb_page = xenfb->fb.page;
 	xenfb->pub.depth = fb_page->depth;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xen.spec	24 Sep 2007 21:53:37 -0000	1.183
+++ xen.spec	25 Sep 2007 00:18:20 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -26,6 +26,7 @@
 Patch30: xen-3.1.0-dev-native-protocol.patch
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
+Patch34: xen-3.1.0-no-xenapi-docs.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -37,6 +38,7 @@
 Patch150: xen-pvfb-compat.patch
 Patch151: xen-pvfb-terminate.patch
 Patch152: xen-pvfb-no-hvm.patch
+Patch153: xen-pvfb-compat-32-on-64.patch
 
 Patch251: pygrub-manykernels.patch
 
@@ -128,6 +130,7 @@
 
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 # config patches
 %patch100 -p1
@@ -138,6 +141,7 @@
 %patch150 -p1
 %patch151 -p1
 %patch152 -p1
+%patch153 -p1
 
 # upstream patches
 %patch251 -p1
@@ -276,6 +280,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
+- Fix generation of manual pages (rhbz #250791)
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
 - Fix VMX assist IRQ handling (rhbz #279581)
 



From fedora-extras-commits at redhat.com  Tue Sep 25 00:21:22 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 20:21:22 -0400
Subject: rpms/avahi/devel avahi-0.6.21-resolv-conf.patch, NONE,
	1.1 avahi.spec, 1.95, 1.96
Message-ID: <200709250021.l8P0LMjo017467@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17413

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.21-resolv-conf.patch 
Log Message:
fix segfault when no domain is defined in resolv.conf

avahi-0.6.21-resolv-conf.patch:

--- NEW FILE avahi-0.6.21-resolv-conf.patch ---
Index: /trunk/avahi-daemon/main.c
===================================================================
--- /trunk/avahi-daemon/main.c (revision 1513)
+++ /trunk/avahi-daemon/main.c (revision 1525)
@@ -317,4 +317,9 @@
     int n;
     char **p;
+
+    if (!resolv_conf_search_domains) {
+        avahi_server_set_browse_domains(avahi_server, NULL);
+        return;
+    }
 
     l = avahi_string_list_copy(config.server_config.browse_domains);


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- avahi.spec	6 Sep 2007 19:05:35 -0000	1.95
+++ avahi.spec	25 Sep 2007 00:20:49 -0000	1.96
@@ -6,10 +6,10 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
-License:        LGPL
+License:        LGPLv2
 URL:            http://avahi.org
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       dbus, expat
@@ -40,6 +40,7 @@
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch3:     avahi-0.6.21-initscript.patch
 Patch4:     avahi-0.6.21-libdns_sd-fix.patch
+Patch5:	    avahi-0.6.21-resolv-conf.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -225,6 +226,7 @@
 %endif
 %patch3 -p0 -b .initscript
 %patch4 -p0 -b .dns_sd
+%patch5 -p2 -b .resolv_conf
 
 %build
 
@@ -485,6 +487,9 @@
 %endif
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-6
+- resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)
+
 * Thu Sep 6 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-5
 - resolves #249044: Update init script to use runlevel 96
 - resolves #251700: Fix assertion in libdns_sd-compat



From fedora-extras-commits at redhat.com  Tue Sep 25 00:26:07 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Mon, 24 Sep 2007 20:26:07 -0400
Subject: rpms/fmtools/FC-6 fmtools.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200709250026.l8P0Q74G017756@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/fmtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17646

Modified Files:
	sources 
Added Files:
	fmtools.spec 
Log Message:
Initial import for FC-6



--- NEW FILE fmtools.spec ---
Summary:	Simple Video for Linux radio card programs
Name:		fmtools
Version:	1.0.2
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Multimedia
URL:		http://www.stanford.edu/~blp/fmtools/
Source0:	http://www.stanford.edu/~blp/%{name}/%{name}-%{version}.tar.gz
Source1:	fmcontrol.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a pair of hopefully useful control programs for Video for Linux
(v4l) radio card drivers.  The focus is on control, so you may find these
programs a bit unfriendly.  Users are encouraged to investigate the source
and create wrappers or new programs based on this design.

 fm	- a simple tuner
 fmscan	- a simple band scanner

The script fmcontrol is something Adrian Lester put together one evening to 
save from himself having to remember frequencies and volumes when using the fm
program from fmtools by Russell Kroll. 

The script does not support any of fm's command line options with the 
exception of volume. 

All that it does is to tune in to a station specified by name at the
frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
or the volume given on the command line.

%prep
%setup0 -q
# include fmcontrol script
tar xzvf %{SOURCE1}
install -pm 0644 fmcontrol/README README.fmcontrol

# Fix Makefile
sed -i -e 's|/usr/local/bin|%{_bindir}|' Makefile
sed -i -e 's|/usr/local/man|%{_mandir}|' Makefile
sed -i -e 's|-Wall -O2|$(RPM_OPT_FLAGS)|' Makefile

# Remove header
rm videodev.h
sed -i.header -e 's|"videodev.h"|<linux/videodev.h>|'g fm.c fmscan.c

# Add shebang to fmcontrol
sed -i '1i#!/bin/sh' fmcontrol/fmcontrol

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 0755 fmcontrol/fmcontrol $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fmcontrol fmcontrol/dot.*
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Fri Sep 21 2007 kwizart <kwizart at gmail.com > - 1.0.2-2
- Fix shebang
- Fix perm on source
- Fix mixed use of spaces and tabs
- Remove internal header to use it from kernel-headers

* Sun Aug 26 2007 kwizart <kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2

* Mon Sep  4 2006 TC Wan <tcwan at cs.usm.my>
- Built Version 1.0 for FC 5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fmtools/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:33:40 -0000	1.1
+++ sources	25 Sep 2007 00:25:34 -0000	1.2
@@ -0,0 +1,2 @@
+fe40296a7515f506c6b46a0ec7f056eb  fmcontrol.tar.gz
+4bae0e5feeb8cbf4cfcb950301e9509d  fmtools-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:23 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:23 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli was added for trasher
Message-ID: <200709250110.l8P1AOJn012522@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package php-pear-MDB2-Driver-mysqli with summary This is the MySQL Improved MDB2 driver
Jason Tibbitts (tibbs) has approved Package php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has added a Fedora devel branch for php-pear-MDB2-Driver-mysqli with an owner of trasher
Jason Tibbitts (tibbs) has approved php-pear-MDB2-Driver-mysqli in Fedora devel
Jason Tibbitts (tibbs) has approved Package php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:35 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:35 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli (Fedora, devel) updated by tibbs
Message-ID: <200709250110.l8P1AapQ001651@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) Approved cvsextras for commit access on php-pear-MDB2-Driver-mysqli (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:10:35 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:10:35 -0700
Subject: [pkgdb] php-pear-MDB2-Driver-mysqli (Fedora, 7) updated by tibbs
Message-ID: <200709250110.l8P1Aa9k001664@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for php-pear-MDB2-Driver-mysqli
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on php-pear-MDB2-Driver-mysqli (Fedora 7)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on php-pear-MDB2-Driver-mysqli (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-MDB2-Driver-mysqli



From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:12 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:12 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli - New directory
Message-ID: <200709250112.l8P1CCm6025032@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli

Log Message:
Directory /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:15 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:15 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel - New directory
Message-ID: <200709250112.l8P1CF1i025046@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:17 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:17 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200709250112.l8P1CHEg025071@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-MDB2-Driver-mysqli


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-MDB2-Driver-mysqli
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:12:19 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:12:19 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200709250112.l8P1CJu1025087@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK25003/rpms/php-pear-MDB2-Driver-mysqli/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-MDB2-Driver-mysqli


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-MDB2-Driver-mysqli
# $Id: Makefile,v 1.1 2007/09/25 01:12:17 tibbs Exp $
NAME := php-pear-MDB2-Driver-mysqli
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:22:20 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:20 -0700
Subject: [pkgdb] python-fedora was added for toshio
Message-ID: <200709250122.l8P1MKYq015967@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package python-fedora with summary Python modules for talking to Fedora Infrastructure Services
Jason Tibbitts (tibbs) has approved Package python-fedora
Jason Tibbitts (tibbs) has added a Fedora devel branch for python-fedora with an owner of toshio
Jason Tibbitts (tibbs) has approved python-fedora in Fedora devel
Jason Tibbitts (tibbs) has approved Package python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:37 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:37 -0700
Subject: [pkgdb] python-fedora (Fedora, devel) updated by tibbs
Message-ID: <200709250122.l8P1Mbhh005012@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora devel) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:37 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:37 -0700
Subject: [pkgdb] python-fedora (Fedora, 6) updated by tibbs
Message-ID: <200709250122.l8P1Mc4c005029@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 6 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora 6)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 6) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:38 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:38 -0700
Subject: [pkgdb] python-fedora (Fedora EPEL, 5) updated by tibbs
Message-ID: <200709250122.l8P1Md8G005050@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora EPEL 5 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora EPEL 5)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora EPEL 5) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:22:38 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:22:38 -0700
Subject: [pkgdb] python-fedora (Fedora, 7) updated by tibbs
Message-ID: <200709250122.l8P1Me48005069@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for python-fedora
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on python-fedora (Fedora 7)
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for lmacken
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for ricky
Jason Tibbitts (tibbs) approved watchbugzilla on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved watchcommits on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved commit on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved build on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved approveacls on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) approved checkout on python-fedora (Fedora 7) for mmcgrath
Jason Tibbitts (tibbs) Approved cvsextras for commit access on python-fedora (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-fedora



From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:23 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:23 -0400
Subject: rpms/python-fedora - New directory
Message-ID: <200709250123.l8P1NNAT025481@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora

Log Message:
Directory /cvs/extras/rpms/python-fedora added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:27 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:27 -0400
Subject: rpms/python-fedora/devel - New directory
Message-ID: <200709250123.l8P1NRK0025494@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora/devel

Log Message:
Directory /cvs/extras/rpms/python-fedora/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:30 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:30 -0400
Subject: rpms/python-fedora Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250123.l8P1NUma025519@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-fedora


--- NEW FILE Makefile ---
# Top level Makefile for module python-fedora
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:23:33 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:23:33 -0400
Subject: rpms/python-fedora/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709250123.l8P1NXTn025535@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY25443/rpms/python-fedora/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-fedora


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-fedora
# $Id: Makefile,v 1.1 2007/09/25 01:23:30 tibbs Exp $
NAME := python-fedora
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:29:04 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 24 Sep 2007 21:29:04 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc8.bz2.sign, NONE, 1.1 .cvsignore, 
	1.693, 1.694 kernel.spec, 1.184,
	1.185 linux-2.6-utrace-core.patch, 1.7,
	1.8 linux-2.6-utrace-ptrace-compat.patch, 1.7,
	1.8 linux-2.6-utrace-regset.patch, 1.7,
	1.8 linux-2.6-utrace-tracehook.patch, 1.12, 1.13 sources, 1.655,
	1.656 upstream, 1.577, 1.578 patch-2.6.23-rc7-git5.bz2.sign, 1.1, NONE
Message-ID: <200709250129.l8P1T40O025902@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25855

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook.patch 
	sources upstream 
Added Files:
	patch-2.6.23-rc8.bz2.sign 
Removed Files:
	patch-2.6.23-rc7-git5.bz2.sign 
Log Message:
* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
- 2.6.23-rc8



--- NEW FILE patch-2.6.23-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+Fw3yGugalF9Dw4RAitGAJ9ZOEPCefAH9up6h2meQHz+ajZ/8ACcDh7X
lwU0krRzk+2tz6gPOpG/3no=
=D1XL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -r1.693 -r1.694
--- .cvsignore	24 Sep 2007 14:37:26 -0000	1.693
+++ .cvsignore	25 Sep 2007 01:28:29 -0000	1.694
@@ -3,5 +3,5 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc7.bz2
+patch-2.6.23-rc8.bz2
 patch-2.6.23-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kernel.spec	25 Sep 2007 00:07:50 -0000	1.184
+++ kernel.spec	25 Sep 2007 01:28:29 -0000	1.185
@@ -45,9 +45,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 7
+%define rcrev 8
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1809,6 +1809,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-rc8
+
 * Mon Sep 24 2007 Roland McGrath <roland at redhat.com>
 - Fix powerpc oops on ptrace after exec. (#301791)
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-core.patch	12 Sep 2007 00:16:26 -0000	1.7
+++ linux-2.6-utrace-core.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -3865,7 +3865,7 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -666,4 +666,24 @@ config STOP_MACHINE
+@@ -667,4 +667,24 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-ptrace-compat.patch	22 Sep 2007 11:45:40 -0000	1.7
+++ linux-2.6-utrace-ptrace-compat.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -204,7 +204,7 @@
 +#endif	/* CONFIG_PTRACE */
 --- linux-2.6/arch/x86_64/ia32/ia32entry.S
 +++ linux-2.6/arch/x86_64/ia32/ia32entry.S
-@@ -422,7 +422,7 @@ ia32_sys_call_table:
+@@ -434,7 +434,7 @@ ia32_sys_call_table:
  	.quad sys_setuid16
  	.quad sys_getuid16
  	.quad compat_sys_stime	/* stime */		/* 25 */
@@ -215,7 +215,7 @@
  	.quad sys_pause
 --- linux-2.6/arch/x86_64/kernel/ptrace.c
 +++ linux-2.6/arch/x86_64/kernel/ptrace.c
-@@ -726,6 +726,52 @@ const struct utrace_regset_view *utrace_
+@@ -722,6 +722,52 @@ const struct utrace_regset_view *utrace_
  }
  
  
@@ -1302,7 +1302,7 @@
  #include <linux/profile.h>
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
-@@ -892,6 +893,8 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -883,6 +884,8 @@ fastcall NORET_TYPE void do_exit(long co
  	tsk->flags |= PF_EXITING;
  	spin_unlock_irq(&tsk->pi_lock);
  
@@ -1311,7 +1311,7 @@
  	if (unlikely(in_atomic()))
  		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
  				current->comm, current->pid,
-@@ -1519,9 +1522,15 @@ check_continued:
+@@ -1510,9 +1513,15 @@ check_continued:
  				break;
  			}
  		}
@@ -3774,7 +3774,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -672,10 +672,21 @@ endmenu
+@@ -673,10 +673,21 @@ endmenu
  
  menu "Process debugging support"
  

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace-regset.patch	22 Sep 2007 11:45:40 -0000	1.7
+++ linux-2.6-utrace-regset.patch	25 Sep 2007 01:28:29 -0000	1.8
@@ -2160,7 +2160,7 @@
  
  /*
   * does not yet catch signals sent when the child dies.
-@@ -237,52 +241,61 @@ static int putreg(struct task_struct *ch
+@@ -233,52 +237,61 @@ static int putreg(struct task_struct *ch
  	unsigned long tmp; 
  	
  	switch (regno) {
@@ -2268,7 +2268,7 @@
  	}
  	put_stack_long(child, regno - sizeof(struct pt_regs), value);
  	return 0;
-@@ -291,287 +304,428 @@ static int putreg(struct task_struct *ch
+@@ -287,287 +300,428 @@ static int putreg(struct task_struct *ch
  static unsigned long getreg(struct task_struct *child, unsigned long regno)
  {
  	unsigned long val;

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-utrace-tracehook.patch	22 Sep 2007 11:45:40 -0000	1.12
+++ linux-2.6-utrace-tracehook.patch	25 Sep 2007 01:28:29 -0000	1.13
@@ -257,7 +257,7 @@
  #include <linux/mount.h>
  #include <linux/security.h>
  #include <linux/syscalls.h>
-@@ -1153,13 +1153,7 @@ EXPORT_SYMBOL(prepare_binprm);
+@@ -1150,13 +1150,7 @@ EXPORT_SYMBOL(prepare_binprm);
  
  static int unsafe_exec(struct task_struct *p)
  {
@@ -272,7 +272,7 @@
  	if (atomic_read(&p->fs->count) > 1 ||
  	    atomic_read(&p->files->count) > 1 ||
  	    atomic_read(&p->sighand->count) > 1)
-@@ -1303,6 +1297,7 @@ int search_binary_handler(struct linux_b
+@@ -1300,6 +1294,7 @@ int search_binary_handler(struct linux_b
  				bprm->file = NULL;
  				current->did_exec = 1;
  				proc_exec_connector(current);
@@ -330,7 +330,7 @@
  	task->security = tsec;
  
  	return 0;
-@@ -1369,19 +1369,13 @@ static inline u32 file_to_av(struct file
+@@ -1371,19 +1371,13 @@ static inline u32 file_to_av(struct file
  
  static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
  {
@@ -351,7 +351,7 @@
  }
  
  static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
-@@ -1851,12 +1845,24 @@ static void selinux_bprm_apply_creds(str
+@@ -1853,12 +1847,24 @@ static void selinux_bprm_apply_creds(str
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and kill. */
  		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
@@ -382,7 +382,7 @@
  			}
  		}
  		tsec->sid = sid;
-@@ -2757,11 +2763,6 @@ static int selinux_task_alloc_security(s
+@@ -2759,11 +2765,6 @@ static int selinux_task_alloc_security(s
  	tsec2->keycreate_sid = tsec1->keycreate_sid;
  	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
  
@@ -394,7 +394,7 @@
  	return 0;
  }
  
-@@ -4544,6 +4545,7 @@ static int selinux_setprocattr(struct ta
+@@ -4546,6 +4547,7 @@ static int selinux_setprocattr(struct ta
  			       char *name, void *value, size_t size)
  {
  	struct task_security_struct *tsec;
@@ -402,7 +402,7 @@
  	u32 sid = 0;
  	int error;
  	char *str = value;
-@@ -4632,18 +4634,24 @@ static int selinux_setprocattr(struct ta
+@@ -4634,18 +4636,24 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -914,7 +914,7 @@
  	printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",
 --- linux-2.6/arch/x86_64/ia32/ia32entry.S
 +++ linux-2.6/arch/x86_64/ia32/ia32entry.S
-@@ -321,7 +321,7 @@ ENTRY(ia32_syscall)
+@@ -333,7 +333,7 @@ ENTRY(ia32_syscall)
  	jnz ia32_tracesys
  ia32_do_syscall:	
  	cmpl $(IA32_NR_syscalls-1),%eax
@@ -923,7 +923,7 @@
  	IA32_ARG_FIXUP
  	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
  ia32_sysret:
-@@ -331,7 +331,7 @@ ia32_sysret:
+@@ -343,7 +343,7 @@ ia32_sysret:
  ia32_tracesys:			 
  	SAVE_REST
  	CLEAR_RREGS
@@ -931,7 +931,7 @@
 +	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
  	movq %rsp,%rdi        /* &pt_regs -> arg1 */
  	call syscall_trace_enter
- 	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
 --- linux-2.6/arch/x86_64/kernel/traps.c
 +++ linux-2.6/arch/x86_64/kernel/traps.c
 @@ -878,14 +878,6 @@ asmlinkage void __kprobes do_debug(struc
@@ -1000,7 +1000,7 @@
  }
  
  static int putreg(struct task_struct *child,
-@@ -442,7 +442,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -438,7 +438,7 @@ long arch_ptrace(struct task_struct *chi
  		clear_tsk_thread_flag(child, TIF_SINGLESTEP);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -1009,7 +1009,7 @@
  		wake_up_process(child);
  		ret = 0;
  		break;
-@@ -489,7 +489,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -485,7 +485,7 @@ long arch_ptrace(struct task_struct *chi
  		clear_tsk_thread_flag(child, TIF_SINGLESTEP);
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -1018,7 +1018,7 @@
  		wake_up_process(child);
  		break;
  
-@@ -498,7 +498,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -494,7 +494,7 @@ long arch_ptrace(struct task_struct *chi
  		if (!valid_signal(data))
  			break;
  		clear_tsk_thread_flag(child,TIF_SYSCALL_TRACE);
@@ -1027,7 +1027,7 @@
  		child->exit_code = data;
  		/* give it a chance to run. */
  		wake_up_process(child);
-@@ -572,37 +572,13 @@ long arch_ptrace(struct task_struct *chi
+@@ -568,37 +568,13 @@ long arch_ptrace(struct task_struct *chi
  	return ret;
  }
  
@@ -1067,7 +1067,7 @@
  
  	if (unlikely(current->audit_context)) {
  		if (test_thread_flag(TIF_IA32)) {
-@@ -624,8 +600,11 @@ asmlinkage void syscall_trace_leave(stru
+@@ -620,8 +596,11 @@ asmlinkage void syscall_trace_leave(stru
  	if (unlikely(current->audit_context))
  		audit_syscall_exit(AUDITSC_RESULT(regs->rax), regs->rax);
  
@@ -1144,7 +1144,7 @@
  	return ret;
 --- linux-2.6/arch/x86_64/kernel/process.c
 +++ linux-2.6/arch/x86_64/kernel/process.c
-@@ -700,11 +700,6 @@ long sys_execve(char __user *name, char 
+@@ -699,11 +699,6 @@ long sys_execve(char __user *name, char 
  	if (IS_ERR(filename)) 
  		return error;
  	error = do_execve(filename, argv, envp, &regs); 
@@ -1654,7 +1654,7 @@
  #include <linux/profile.h>
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
-@@ -156,11 +156,12 @@ void release_task(struct task_struct * p
+@@ -147,11 +147,12 @@ void release_task(struct task_struct * p
  {
  	struct task_struct *leader;
  	int zap_leader;
@@ -1669,7 +1669,7 @@
  	__exit_signal(p);
  
  	/*
-@@ -169,10 +170,14 @@ repeat:
+@@ -160,10 +161,14 @@ repeat:
  	 * group leader's parent process. (if it wants notification.)
  	 */
  	zap_leader = 0;
@@ -1685,7 +1685,7 @@
  		/*
  		 * If we were the last child thread and the leader has
  		 * exited already, and the leader's parent ignores SIGCHLD,
-@@ -182,6 +187,14 @@ repeat:
+@@ -173,6 +178,14 @@ repeat:
  		 * that case.
  		 */
  		zap_leader = (leader->exit_signal == -1);
@@ -1700,7 +1700,7 @@
  	}
  
  	write_unlock_irq(&tasklist_lock);
-@@ -192,6 +205,13 @@ repeat:
+@@ -183,6 +196,13 @@ repeat:
  	p = leader;
  	if (unlikely(zap_leader))
  		goto repeat;
@@ -1714,7 +1714,7 @@
  }
  
  /*
-@@ -231,10 +251,10 @@ static int will_become_orphaned_pgrp(str
+@@ -222,10 +242,10 @@ static int will_become_orphaned_pgrp(str
  	do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
  		if (p == ignored_task
  				|| p->exit_state
@@ -1728,7 +1728,7 @@
  			ret = 0;
  			break;
  		}
-@@ -283,10 +303,9 @@ static void reparent_to_kthreadd(void)
+@@ -274,10 +294,9 @@ static void reparent_to_kthreadd(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -1740,7 +1740,7 @@
  	add_parent(current);
  
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
-@@ -609,45 +628,23 @@ choose_new_parent(struct task_struct *p,
+@@ -600,45 +619,23 @@ choose_new_parent(struct task_struct *p,
  	 * the parent is not a zombie.
  	 */
  	BUG_ON(p == reaper || reaper->exit_state);
@@ -1790,7 +1790,7 @@
  		return;
  
  	/* We don't want people slaying init.  */
-@@ -657,7 +654,8 @@ reparent_thread(struct task_struct *p, s
+@@ -648,7 +645,8 @@ reparent_thread(struct task_struct *p, s
  	/* If we'd notified the old parent about this child's death,
  	 * also notify the new parent.
  	 */
@@ -1800,7 +1800,7 @@
  	    p->exit_signal != -1 && thread_group_empty(p))
  		do_notify_parent(p, p->exit_signal);
  
-@@ -687,7 +685,7 @@ reparent_thread(struct task_struct *p, s
+@@ -678,7 +676,7 @@ reparent_thread(struct task_struct *p, s
   * space.
   */
  static void
@@ -1809,7 +1809,7 @@
  {
  	struct task_struct *p, *reaper = father;
  	struct list_head *_p, *_n;
-@@ -700,48 +698,10 @@ forget_original_parent(struct task_struc
+@@ -691,48 +689,10 @@ forget_original_parent(struct task_struc
  		}
  	} while (reaper->exit_state);
  
@@ -1859,7 +1859,7 @@
  	}
  }
  
-@@ -753,8 +713,9 @@ static void exit_notify(struct task_stru
+@@ -744,8 +704,9 @@ static void exit_notify(struct task_stru
  {
  	int state;
  	struct task_struct *t;
@@ -1870,7 +1870,7 @@
  
  	if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT)
  	    && !thread_group_empty(tsk)) {
-@@ -787,10 +748,8 @@ static void exit_notify(struct task_stru
+@@ -778,10 +739,8 @@ static void exit_notify(struct task_stru
  	 *	jobs, send them a SIGHUP and then a SIGCONT.  (POSIX 3.2.2.2)
  	 */
  
@@ -1882,7 +1882,7 @@
  
  	/*
  	 * Check to see if any process groups have become orphaned
-@@ -802,7 +761,7 @@ static void exit_notify(struct task_stru
+@@ -793,7 +752,7 @@ static void exit_notify(struct task_stru
  	 * is about to become orphaned.
  	 */
  	 
@@ -1891,7 +1891,7 @@
  	
  	pgrp = task_pgrp(tsk);
  	if ((task_pgrp(t) != pgrp) &&
-@@ -833,30 +792,18 @@ static void exit_notify(struct task_stru
+@@ -824,30 +783,18 @@ static void exit_notify(struct task_stru
  	    && !capable(CAP_KILL))
  		tsk->exit_signal = SIGCHLD;
  
@@ -1927,7 +1927,7 @@
  
  	/* If the process is dead, release it - nobody will wait for it */
  	if (state == EXIT_DEAD)
-@@ -912,10 +859,7 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -903,10 +850,7 @@ fastcall NORET_TYPE void do_exit(long co
  	}
  
  
@@ -1939,7 +1939,7 @@
  
  	/*
  	 * We're taking recursive faults here in do_exit. Safest is to just
-@@ -1112,10 +1056,9 @@ static int eligible_child(pid_t pid, int
+@@ -1103,10 +1047,9 @@ static int eligible_child(pid_t pid, int
  	}
  
  	/*
@@ -1952,7 +1952,7 @@
  		return 0;
  
  	/* Wait for all children (clone and not) if __WALL is set;
-@@ -1187,7 +1130,7 @@ static int wait_task_zombie(struct task_
+@@ -1178,7 +1121,7 @@ static int wait_task_zombie(struct task_
  
  		if (unlikely(p->exit_state != EXIT_ZOMBIE))
  			return 0;
@@ -1961,7 +1961,7 @@
  			return 0;
  		get_task_struct(p);
  		read_unlock(&tasklist_lock);
-@@ -1211,15 +1154,9 @@ static int wait_task_zombie(struct task_
+@@ -1202,15 +1145,9 @@ static int wait_task_zombie(struct task_
  		BUG_ON(state != EXIT_DEAD);
  		return 0;
  	}
@@ -1979,7 +1979,7 @@
  		struct signal_struct *psig;
  		struct signal_struct *sig;
  
-@@ -1307,28 +1244,8 @@ static int wait_task_zombie(struct task_
+@@ -1298,28 +1235,8 @@ static int wait_task_zombie(struct task_
  		return retval;
  	}
  	retval = p->pid;
@@ -2010,7 +2010,7 @@
  	BUG_ON(!retval);
  	return retval;
  }
-@@ -1347,7 +1264,7 @@ static int wait_task_stopped(struct task
+@@ -1338,7 +1255,7 @@ static int wait_task_stopped(struct task
  
  	if (!p->exit_code)
  		return 0;
@@ -2019,7 +2019,7 @@
  	    p->signal && p->signal->group_stop_count > 0)
  		/*
  		 * A group stop is in progress and this is the group leader.
-@@ -1368,14 +1285,13 @@ static int wait_task_stopped(struct task
+@@ -1359,14 +1276,13 @@ static int wait_task_stopped(struct task
  	if (unlikely(noreap)) {
  		pid_t pid = p->pid;
  		uid_t uid = p->uid;
@@ -2036,7 +2036,7 @@
  					   infop, ru);
  	}
  
-@@ -1431,9 +1347,7 @@ bail_ref:
+@@ -1422,9 +1338,7 @@ bail_ref:
  	if (!retval && infop)
  		retval = put_user(0, &infop->si_errno);
  	if (!retval && infop)
@@ -2047,7 +2047,7 @@
  	if (!retval && infop)
  		retval = put_user(exit_code, &infop->si_status);
  	if (!retval && infop)
-@@ -1501,22 +1415,6 @@ static int wait_task_continued(struct ta
+@@ -1492,22 +1406,6 @@ static int wait_task_continued(struct ta
  }
  
  
@@ -2070,7 +2070,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1556,26 +1454,17 @@ repeat:
+@@ -1547,26 +1445,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -2101,7 +2101,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1600,6 +1489,10 @@ repeat:
+@@ -1591,6 +1480,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -2112,7 +2112,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1616,6 +1509,8 @@ check_continued:
+@@ -1607,6 +1500,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -2121,7 +2121,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1625,14 +1520,7 @@ check_continued:
+@@ -1616,14 +1511,7 @@ check_continued:
  			}
  		}
  		if (!flag) {
@@ -2137,7 +2137,7 @@
  		}
  		if (options & __WNOTHREAD)
  			break;
-@@ -1659,7 +1547,7 @@ end:
+@@ -1650,7 +1538,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -2602,7 +2602,7 @@
  		return 0;
  	return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) ||
  		(tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL);
-@@ -549,8 +548,6 @@ static int check_kill_permission(int sig
+@@ -547,8 +546,6 @@ static int check_kill_permission(int sig
  	return security_task_kill(t, info, sig, 0);
  }
  
@@ -2611,7 +2611,7 @@
  
  /*
   * Handle magic process-wide effects of stop/continue signals.
-@@ -893,7 +890,7 @@ __group_complete_signal(int sig, struct 
+@@ -891,7 +888,7 @@ __group_complete_signal(int sig, struct 
  	 */
  	if (sig_fatal(p, sig) && !(p->signal->flags & SIGNAL_GROUP_EXIT) &&
  	    !sigismember(&t->real_blocked, sig) &&
@@ -2620,7 +2620,7 @@
  		/*
  		 * This signal will be fatal to the whole group.
  		 */
-@@ -1447,8 +1444,7 @@ void do_notify_parent(struct task_struct
+@@ -1445,8 +1442,7 @@ void do_notify_parent(struct task_struct
   	/* do_notify_parent_cldstop should have been called instead.  */
   	BUG_ON(tsk->state & (TASK_STOPPED|TASK_TRACED));
  
@@ -2630,7 +2630,7 @@
  
  	info.si_signo = sig;
  	info.si_errno = 0;
-@@ -1473,7 +1469,7 @@ void do_notify_parent(struct task_struct
+@@ -1471,7 +1467,7 @@ void do_notify_parent(struct task_struct
  
  	psig = tsk->parent->sighand;
  	spin_lock_irqsave(&psig->siglock, flags);
@@ -2639,7 +2639,7 @@
  	    (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
  	     (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
  		/*
-@@ -1501,20 +1497,13 @@ void do_notify_parent(struct task_struct
+@@ -1499,20 +1495,13 @@ void do_notify_parent(struct task_struct
  	spin_unlock_irqrestore(&psig->siglock, flags);
  }
  
@@ -2661,7 +2661,7 @@
  	info.si_signo = SIGCHLD;
  	info.si_errno = 0;
  	info.si_pid = tsk->pid;
-@@ -1539,6 +1528,15 @@ static void do_notify_parent_cldstop(str
+@@ -1537,6 +1526,15 @@ static void do_notify_parent_cldstop(str
   		BUG();
   	}
  
@@ -2677,7 +2677,7 @@
  	sighand = parent->sighand;
  	spin_lock_irqsave(&sighand->siglock, flags);
  	if (sighand->action[SIGCHLD-1].sa.sa_handler != SIG_IGN &&
-@@ -1551,107 +1549,6 @@ static void do_notify_parent_cldstop(str
+@@ -1549,107 +1547,6 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2785,7 +2785,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1660,7 +1557,7 @@ finish_stop(int stop_count)
+@@ -1658,7 +1555,7 @@ finish_stop(int stop_count)
  	 * a group stop in progress and we are the last to stop,
  	 * report to the parent.  When ptraced, every thread reports itself.
  	 */
@@ -2794,7 +2794,7 @@
  		read_lock(&tasklist_lock);
  		do_notify_parent_cldstop(current, CLD_STOPPED);
  		read_unlock(&tasklist_lock);
-@@ -1787,44 +1684,24 @@ relock:
+@@ -1785,44 +1682,24 @@ relock:
  		    handle_group_stop())
  			goto relock;
  
@@ -2855,7 +2855,7 @@
  		if (ka->sa.sa_handler == SIG_IGN) /* Do nothing.  */
  			continue;
  		if (ka->sa.sa_handler != SIG_DFL) {
-@@ -1873,7 +1750,7 @@ relock:
+@@ -1871,7 +1748,7 @@ relock:
  				spin_lock_irq(&current->sighand->siglock);
  			}
  
@@ -2864,7 +2864,7 @@
  				/* It released the siglock.  */
  				goto relock;
  			}
-@@ -1902,13 +1779,13 @@ relock:
+@@ -1900,13 +1777,13 @@ relock:
  			 * first and our do_group_exit call below will use
  			 * that value and ignore the one we pass it.
  			 */
@@ -2880,7 +2880,7 @@
  		/* NOTREACHED */
  	}
  	spin_unlock_irq(&current->sighand->siglock);
-@@ -1920,7 +1797,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
+@@ -1918,7 +1795,6 @@ EXPORT_SYMBOL_GPL(dequeue_signal);
  EXPORT_SYMBOL(flush_signals);
  EXPORT_SYMBOL(force_sig);
  EXPORT_SYMBOL(kill_proc);
@@ -3147,7 +3147,7 @@
  /*
   * current io wait handle: wait queue entry to use for io waits
   * If this thread is processing aio, this points at the waitqueue
-@@ -1526,6 +1515,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1528,6 +1517,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern void do_notify_parent(struct task_struct *, int);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -r1.655 -r1.656
--- sources	24 Sep 2007 14:37:26 -0000	1.655
+++ sources	25 Sep 2007 01:28:29 -0000	1.656
@@ -1,3 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-828dd9bfc7271e2c9da6acaf31612983  patch-2.6.23-rc7.bz2
-b9a6cb6a35b2ae0a25c357c59e7cdfc8  patch-2.6.23-rc7-git5.bz2
+114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- upstream	24 Sep 2007 14:37:26 -0000	1.577
+++ upstream	25 Sep 2007 01:28:29 -0000	1.578
@@ -1,3 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.23-rc7.bz2
-patch-2.6.23-rc7-git5.bz2
+patch-2.6.23-rc8.bz2


--- patch-2.6.23-rc7-git5.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:31:42 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:31:42 -0700
Subject: [pkgdb] generic-logos was added for notting
Message-ID: <200709250131.l8P1VhnL018374@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package generic-logos with summary Icons and pictures
Jason Tibbitts (tibbs) has approved Package generic-logos
Jason Tibbitts (tibbs) has added a Fedora devel branch for generic-logos with an owner of notting
Jason Tibbitts (tibbs) has approved generic-logos in Fedora devel
Jason Tibbitts (tibbs) has approved Package generic-logos
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on generic-logos (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on generic-logos (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on generic-logos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/generic-logos



From fedora-extras-commits at redhat.com  Tue Sep 25 01:32:50 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:32:50 -0700
Subject: [pkgdb] SteGUI was added for pingou
Message-ID: <200709250132.l8P1WpZq007688@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) has added Package SteGUI with summary SteGUI is a graphical front-end to Steghide
Jason Tibbitts (tibbs) has approved Package SteGUI
Jason Tibbitts (tibbs) has added a Fedora devel branch for SteGUI with an owner of pingou
Jason Tibbitts (tibbs) has approved SteGUI in Fedora devel
Jason Tibbitts (tibbs) has approved Package SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora devel)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora devel)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, 6) updated by tibbs
Message-ID: <200709250133.l8P1X9cb018788@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 6 branch for SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora 6)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, 7) updated by tibbs
Message-ID: <200709250133.l8P1XAud018800@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for SteGUI
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on SteGUI (Fedora 7)
Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:08 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:33:08 -0700
Subject: [pkgdb] SteGUI (Fedora, devel) updated by tibbs
Message-ID: <200709250133.l8P1XA7s018811@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) Approved cvsextras for commit access on SteGUI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SteGUI



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:22 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:22 -0400
Subject: rpms/SteGUI - New directory
Message-ID: <200709250133.l8P1XMDs026166@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI

Log Message:
Directory /cvs/extras/rpms/SteGUI added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:28 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:28 -0400
Subject: rpms/SteGUI/devel - New directory
Message-ID: <200709250133.l8P1XSsA026180@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI/devel

Log Message:
Directory /cvs/extras/rpms/SteGUI/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:31 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:31 -0400
Subject: rpms/SteGUI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250133.l8P1XVDN026205@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI

Added Files:
	Makefile import.log 
Log Message:
Setup of module SteGUI


--- NEW FILE Makefile ---
# Top level Makefile for module SteGUI
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:33:34 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:33:34 -0400
Subject: rpms/SteGUI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709250133.l8P1XYix026221@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN26135/rpms/SteGUI/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SteGUI


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: SteGUI
# $Id: Makefile,v 1.1 2007/09/25 01:33:31 tibbs Exp $
NAME := SteGUI
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:34:05 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:05 -0400
Subject: rpms/generic-logos - New directory
Message-ID: <200709250134.l8P1Y5nB026428@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos

Log Message:
Directory /cvs/extras/rpms/generic-logos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:11 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:11 -0400
Subject: rpms/generic-logos/devel - New directory
Message-ID: <200709250134.l8P1YB5G026442@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos/devel

Log Message:
Directory /cvs/extras/rpms/generic-logos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:13 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:13 -0400
Subject: rpms/generic-logos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709250134.l8P1YDWd026467@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos

Added Files:
	Makefile import.log 
Log Message:
Setup of module generic-logos


--- NEW FILE Makefile ---
# Top level Makefile for module generic-logos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 01:34:15 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 21:34:15 -0400
Subject: rpms/generic-logos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709250134.l8P1YF6l026483@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsn26393/rpms/generic-logos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module generic-logos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: generic-logos
# $Id: Makefile,v 1.1 2007/09/25 01:34:13 tibbs Exp $
NAME := generic-logos
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 fedora-extras-commits at redhat.com  Tue Sep 25 01:38:09 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:38:09 -0700
Subject: [pkgdb] libxcb (Fedora, 7) updated by tibbs
Message-ID: <200709250138.l8P1cAlu020117@app3.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora 7 branch for libxcb
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on libxcb (Fedora 7)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on libxcb (Fedora 7)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on libxcb (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libxcb



From fedora-extras-commits at redhat.com  Tue Sep 25 01:39:44 2007
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 24 Sep 2007 18:39:44 -0700
Subject: [pkgdb] optipng (Fedora EPEL, 5) updated by tibbs
Message-ID: <200709250139.l8P1dj6Y009462@app4.fedora.phx.redhat.com>

Jason Tibbitts (tibbs) added a Fedora EPEL 5 branch for optipng
Jason Tibbitts (tibbs) has set commit to Approved for cvsextras on optipng (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set build to Approved for cvsextras on optipng (Fedora EPEL 5)
Jason Tibbitts (tibbs) has set checkout to Approved for cvsextras on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 01:40:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 24 Sep 2007 21:40:52 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.167,1.168
Message-ID: <200709250140.l8P1eqIB026782@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26693

Modified Files:
	gnome-screensaver.spec 
Log Message:
Fix up requires



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-screensaver.spec	21 Sep 2007 23:56:23 -0000	1.167
+++ gnome-screensaver.spec	25 Sep 2007 01:40:19 -0000	1.168
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -55,7 +55,9 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libglade2 >= %{libglade2_version}
 Requires: libxml2 >= %{libxml2_version}
-Requires: GConf2 >= %{gconf2_version}
+Requires(pre): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
+Requires(post): GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
@@ -136,7 +138,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
-* Fri Sep 21 2007 Matthisa Clasen <mclasen at redhat.com> - 2.20.0-4
+* Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Fix up GConf requires (#220547)
+
+* Fri Sep 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-4
 - Add %%pre scriptlet
 
 * Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3



From fedora-extras-commits at redhat.com  Tue Sep 25 01:45:29 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Mon, 24 Sep 2007 21:45:29 -0400
Subject: rpms/nhpf/devel nhpf.spec,1.13,1.14
Message-ID: <200709250145.l8P1jTW6026943@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/nhpf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26880

Modified Files:
	nhpf.spec 
Log Message:
Bug 249975 Processed: nhpf not built with $RPM_OPT_FLAGS.



Index: nhpf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nhpf/devel/nhpf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nhpf.spec	12 Jul 2006 07:28:44 -0000	1.13
+++ nhpf.spec	25 Sep 2007 01:44:56 -0000	1.14
@@ -1,12 +1,12 @@
-Summary:	Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
-Name:		nhpf
-Version:	1.42
-Release: 9.2.2
-License:	Distributable
-Group:		Applications/Text
-Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
-URL:		http://cglab.snu.ac.kr/~yjlee/n3f/applications/nhpf.html
-Buildroot: 	%{_tmppath}/%{name}-%{version}-buildroot
+Name:         nhpf
+Summary:      Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
+Version:      1.42
+Release:      10
+License:      Distributable
+URL:          http://cglab.snu.ac.kr/~yjlee/n3f/applications/nhpf.html
+Group:        Applications/Text
+Buildroot:    %{_tmppath}/%{name}-%{version}-buildroot
+Source0:      ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
 
 %description
 The filtered PS file is self-contained, because this program appends
@@ -18,7 +18,7 @@
 %setup -q -n %{name}-%{version}
 
 %build
-make
+make CFLAG="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,6 +36,10 @@
 %attr(755,root,root)/usr/bin/nhpf
 
 %changelog
+* Tue Sep 26 2007 Caius Chance  <cchance at redhat.com> - 1.42-10
+- Resolves: rhbz#249975 (nhpf not built with $RPM_OPT_FLAGS.)
+  <<< Fixed CFLAGS in Makefile for more meaningful debuginfo.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2.2
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:05:35 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:05:35 -0400
Subject: rpms/padevchooser/devel .cvsignore, 1.3, 1.4 padevchooser.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200709250205.l8P25ZCr001278@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/padevchooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1243

Modified Files:
	.cvsignore padevchooser.spec sources 
Log Message:
update from svn


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 01:44:54 -0000	1.3
+++ .cvsignore	25 Sep 2007 02:05:02 -0000	1.4
@@ -1 +1 @@
-padevchooser-0.9.4.svn20070816.tar.gz
+padevchooser-0.9.4.svn20070925.tar.gz


Index: padevchooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/padevchooser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- padevchooser.spec	16 Aug 2007 02:02:20 -0000	1.3
+++ padevchooser.spec	25 Sep 2007 02:05:02 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           padevchooser
 Version:        0.9.4
-Release:        0.2.svn20070816%{?dist}
+Release:        0.3.svn20070925%{?dist}
 Summary:        Control applet for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://0pointer.de/lennart/projects/padevchooser
-Source0:	padevchooser-0.9.4.svn20070816.tar.gz
+Source0:	padevchooser-0.9.4.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/padevchooser/padevchooser-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +27,6 @@
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -51,6 +50,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.4-0.3.svn20070825
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.4-0.2.svn20070816
 - Add gnome-desktop-devel and libgnomeui-devel to the deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 01:44:54 -0000	1.3
+++ sources	25 Sep 2007 02:05:02 -0000	1.4
@@ -1 +1 @@
-8439983f1c266ede15b6e9ee128edaa8  padevchooser-0.9.4.svn20070816.tar.gz
+164cc955445b3165d49f3de48e9551cf  padevchooser-0.9.4.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:08:44 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:08:44 -0400
Subject: rpms/pavumeter/devel .cvsignore, 1.3, 1.4 pavumeter.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200709250208.l8P28i8M002617@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavumeter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2146

Modified Files:
	.cvsignore pavumeter.spec sources 
Log Message:
update from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2007 10:33:07 -0000	1.3
+++ .cvsignore	25 Sep 2007 02:08:11 -0000	1.4
@@ -1 +1 @@
-pavumeter-0.9.3.svn20070816.tar.gz
+pavumeter-0.9.3.svn20070925.tar.gz


Index: pavumeter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/pavumeter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pavumeter.spec	16 Aug 2007 10:33:07 -0000	1.2
+++ pavumeter.spec	25 Sep 2007 02:08:11 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           pavumeter
 Version:        0.9.3
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070925%{?dist}
 Summary:        Volume meter for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://0pointer.de/lennart/projects/pavumeter
-Source0:	pavumeter-0.9.3.svn20070816.tar.gz
+Source0:	pavumeter-0.9.3.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavumeter/pavumeter-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +49,10 @@
 
 
 %changelog
-* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.6.svn20070816
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.2.svn20070925
+- Update from SVN snapshot
+
+* Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.3-0.1.svn20070816
 - Update from SVN snapshot
 
 * Sat Sep  9 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavumeter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2007 10:33:07 -0000	1.3
+++ sources	25 Sep 2007 02:08:11 -0000	1.4
@@ -1 +1 @@
-674357e03893c9e69a64e44366bee00e  pavumeter-0.9.3.svn20070816.tar.gz
+e5f6657e3b68d7fe2d586f91d9f797c4  pavumeter-0.9.3.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:14:32 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 22:14:32 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec,1.1,1.2
Message-ID: <200709250214.l8P2EWvR003733@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3710

Modified Files:
	baekmuk-bdf-fonts.spec 
Log Message:
fix name of fonts.alias file



Index: baekmuk-bdf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel/baekmuk-bdf-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baekmuk-bdf-fonts.spec	24 Sep 2007 12:15:20 -0000	1.1
+++ baekmuk-bdf-fonts.spec	25 Sep 2007 02:14:00 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           %{upstreamname}-fonts
 Version:        2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Korean bitmap fonts
 
 Group:          User Interface/X
@@ -36,7 +36,7 @@
 
 # for bmp font
 install -m 0644 bdf/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/
-install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/ttfonts-ko.alias
+install -m 0444 bdf/fonts.alias $RPM_BUILD_ROOT%{fontdir}/
 
 # for catalogue
 install -d $RPM_BUILD_ROOT%{catalogue}
@@ -72,6 +72,9 @@
 %{catalogue}/%{name}
 
 %changelog
+* Tue Sep 25 2007 Jens Petersen <petersen at redhat.com> - 2.2-4
+- fix name of fonts.alias file
+
 * Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 2.2-3
 - conflict with fonts-korean < 2.2-5
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:17:40 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:17:40 -0400
Subject: rpms/pavucontrol/devel .cvsignore, 1.4, 1.5 pavucontrol.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200709250217.l8P2HeUU003844@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3817

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
new snapshot from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Sep 2007 00:30:52 -0000	1.4
+++ .cvsignore	25 Sep 2007 02:17:08 -0000	1.5
@@ -1 +1 @@
-pavucontrol-0.9.5.svn20070905.tar.gz
+pavucontrol-0.9.5.svn20070925.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pavucontrol.spec	5 Sep 2007 12:42:39 -0000	1.5
+++ pavucontrol.spec	25 Sep 2007 02:17:08 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           pavucontrol
 Version:        0.9.5
-Release:        0.3.svn20070905%{?dist}
+Release:        0.4.svn20070925%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:	pavucontrol-0.9.5.svn20070905.tar.gz
+Source0:	pavucontrol-0.9.5.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.4.svn20070925
+- Update from SVN
+
 * Wed Sep 5 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.5-0.3.svn20070905
 - Add versioned dependency on pulseaudio-libs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Sep 2007 00:30:52 -0000	1.4
+++ sources	25 Sep 2007 02:17:08 -0000	1.5
@@ -1 +1 @@
-a04b6fd8abe33c2a3447bbfa85a8067c  pavucontrol-0.9.5.svn20070905.tar.gz
+33c034fbcc0472c81912c097e9dbd6ff  pavucontrol-0.9.5.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:23:14 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Sep 2007 22:23:14 -0400
Subject: rpms/baekmuk-bdf-fonts/devel baekmuk-bdf-fonts.spec,1.2,1.3
Message-ID: <200709250223.l8P2NEn1004420@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392

Modified Files:
	baekmuk-bdf-fonts.spec 
Log Message:
update filelist for fonts.alias



Index: baekmuk-bdf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-bdf-fonts/devel/baekmuk-bdf-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- baekmuk-bdf-fonts.spec	25 Sep 2007 02:14:00 -0000	1.2
+++ baekmuk-bdf-fonts.spec	25 Sep 2007 02:22:42 -0000	1.3
@@ -67,7 +67,7 @@
 %doc COPYRIGHT COPYRIGHT.ko README
 %dir %{fontdir}
 %{fontdir}/*.gz
-%{fontdir}/ttfonts-ko.alias
+%{fontdir}/fonts.alias
 %verify(not md5 size mtime) %{fontdir}/fonts.dir
 %{catalogue}/%{name}
 



From fedora-extras-commits at redhat.com  Tue Sep 25 02:25:12 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 22:25:12 -0400
Subject: rpms/paprefs/devel paprefs.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200709250225.l8P2PC49004516@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496

Modified Files:
	paprefs.spec sources 
Log Message:
update from SVN


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paprefs.spec	16 Aug 2007 10:30:19 -0000	1.3
+++ paprefs.spec	25 Sep 2007 02:24:39 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           paprefs
 Version:        0.9.6
-Release:        0.1.svn20070816%{?dist}
+Release:        0.2.svn20070925%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
-Source0:        paprefs-0.9.6.svn20070816.tar.gz
+Source0:        paprefs-0.9.6.svn20070925.tar.gz
 #http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
@@ -51,6 +51,9 @@
 %{_datadir}/locale/*
 
 %changelog
+* Thu Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.6-0.2.svn20070925
+- Update SVN snapshot
+
 * Thu Aug 16 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.6-0.1.svn20070816
 - Get snapshot from SVN
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Aug 2007 10:30:19 -0000	1.2
+++ sources	25 Sep 2007 02:24:39 -0000	1.3
@@ -1 +1 @@
-4b5358e60cae8663b706b1fecf342715  paprefs-0.9.6.svn20070816.tar.gz
+cef2d943fcf28b9d5d38ec66b727c0c9  paprefs-0.9.6.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 02:49:39 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 24 Sep 2007 22:49:39 -0400
Subject: rpms/kcc/devel kcc.spec,1.19,1.20
Message-ID: <200709250249.l8P2ndt5005272@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5254

Modified Files:
	kcc.spec 
Log Message:
more clean up


Index: kcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kcc.spec	21 Sep 2007 06:43:56 -0000	1.19
+++ kcc.spec	25 Sep 2007 02:49:07 -0000	1.20
@@ -45,7 +45,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README 
 %{_bindir}/kcc
 %lang(ja) %{_mandir}/ja/man1/kcc.1*



From fedora-extras-commits at redhat.com  Tue Sep 25 02:49:54 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 19:49:54 -0700
Subject: [pkgdb] eclipse-cdt: overholt has requested commit
Message-ID: <200709250249.l8P2ntrq029410@app4.fedora.phx.redhat.com>

Andrew Overholt (overholt) has requested the commit acl on eclipse-cdt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From fedora-extras-commits at redhat.com  Tue Sep 25 02:54:34 2007
From: fedora-extras-commits at redhat.com (Jeff Johnston (jjohnstn))
Date: Mon, 24 Sep 2007 19:54:34 -0700
Subject: [pkgdb] eclipse-cdt had acl change status
Message-ID: <200709250254.l8P2sYdg030722@app4.fedora.phx.redhat.com>

Jeff Johnston (jjohnstn) has set the commit acl on eclipse-cdt (Fedora devel) to Approved for Andrew Overholt (overholt)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From fedora-extras-commits at redhat.com  Tue Sep 25 03:05:19 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Mon, 24 Sep 2007 23:05:19 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.10, 1.11 pulseaudio.spec, 1.18, 
	1.19 sources, 1.12, 1.13
Message-ID: <200709250305.l8P35JD0011732@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11706

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
update from SVN


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2007 23:54:15 -0000	1.10
+++ .cvsignore	25 Sep 2007 03:04:46 -0000	1.11
@@ -1,2 +1 @@
-pulseaudio-0.9.7.svn20070907.tar.gz
-libflashsupport-pulse-000.svn20070904.tar.gz
+pulseaudio-0.9.7.svn20070925.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pulseaudio.spec	6 Sep 2007 23:54:15 -0000	1.18
+++ pulseaudio.spec	25 Sep 2007 03:04:46 -0000	1.19
@@ -3,12 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.11.svn20070907%{?dist}
+Release:	0.12.svn20070925%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070907.tar.gz
-Source1:	libflashsupport-pulse-000.svn20070904.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070925.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -35,7 +34,7 @@
 Summary:	PulseAudio EsounD daemon compatibility script
 Group:		System Environment/Daemons
 Requires:	%{name} = %{version}-%{release}
-Conflicts:	esound
+Provides:	esound
 Obsoletes:      esound
 
 %description esound-compat
@@ -82,43 +81,51 @@
 %description module-gconf
 GConf configuration backend for the PulseAudio sound server.
 
-%package lib
+%package libs
 Summary:	Libraries for PulseAudio clients
 License:	LGPLv2+
 Group:		System Environment/Libraries
+Provides:	pulseaudio-lib
+Obsoletes:      pulseaudio-lib
 
-%description lib
+%description libs
 This package contains the runtime libraries for any application that wishes
 to interface with a PulseAudio sound server.
 
-%package lib-glib2
+%package libs-glib2
 Summary:	GLIB 2.x bindings for PulseAudio clients
 License:	LGPLv2+
 Group:		System Environment/Libraries
+Provides:	pulseaudio-lib-glib2
+Obsoletes:      pulseaudio-lib-glib2
 
-%description lib-glib2
+%description libs-glib2
 This package contains bindings to integrate the PulseAudio client library with
 a GLIB 2.x based application.
 
-%package lib-zeroconf
+%package libs-zeroconf
 Summary:    Zeroconf support for PulseAudio clients
 License:	LGPLv2+
 Group:      System Environment/Libraries
+Provides:	pulseaudio-lib-zeroconf
+Obsoletes:      pulseaudio-lib-zeroconf
 
-%description lib-zeroconf
+%description libs-zeroconf
 This package contains the runtime libraries and tools that allow PulseAudio
 clients to automatically detect PulseAudio servers using Zeroconf.
 
-%package lib-devel
+%package libs-devel
 Summary:	Headers and libraries for PulseAudio client development
 License:	LGPLv2+
 Group:		Development/Libraries
-Requires:	%{name}-lib = %{version}-%{release}
-Requires:	%{name}-lib-glib2 = %{version}-%{release}
-Requires:	%{name}-lib-zeroconf = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs-glib2 = %{version}-%{release}
+Requires:	%{name}-libs-zeroconf = %{version}-%{release}
 Requires:   pkgconfig glib2-devel
+Provides:	pulseaudio-lib-devel
+Obsoletes:      pulseaudio-lib-devel
 
-%description lib-devel
+%description libs-devel
 Headers and libraries for developing applications that can communicate with
 a PulseAudio sound server.
 
@@ -126,13 +133,12 @@
 Summary:	PulseAudio sound server utilities
 License:	LGPLv2+
 Group:		Applications/Multimedia
-Requires:	%{name}-lib = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description utils
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b1 -n libflashsupport-pulse-000
 %setup -q -T -b0
 %patch1 -p1
 
@@ -140,18 +146,10 @@
 %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
 make LIBTOOL=/usr/bin/libtool
 make doxygen
-export PULSEAUDIO_SOURCES=`pwd`
-pushd ../libflashsupport-pulse-000
-%configure --disable-rpath
-make LIBTOOL=/usr/bin/libtool
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-pushd ../libflashsupport-pulse-000
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la
 # configure --disable-static had no effect; delete manually.
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -179,14 +177,14 @@
     groupdel pulse-access &>/dev/null || :
 fi
 
-%post lib -p /sbin/ldconfig
-%postun lib -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
-%post lib-glib2 -p /sbin/ldconfig
-%postun lib-glib2 -p /sbin/ldconfig
+%post libs-glib2 -p /sbin/ldconfig
+%postun libs-glib2 -p /sbin/ldconfig
 
-%post lib-zeroconf -p /sbin/ldconfig
-%postun lib-zeroconf -p /sbin/ldconfig
+%post libs-zeroconf -p /sbin/ldconfig
+%postun libs-zeroconf -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -248,8 +246,8 @@
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so
 %{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so
-#%{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
-#%{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
+%{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
+%{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
 %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so
 %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so
 %{_libdir}/pulse-%{drvver}/modules/module-sine.so
@@ -258,6 +256,8 @@
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
 %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
+%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so
+%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
 
 %files esound-compat
 %defattr(-,root,root)
@@ -292,25 +292,24 @@
 %{_libdir}/pulse-%{drvver}/modules/module-gconf.so
 %{_libexecdir}/pulse/gconf-helper
 
-%files lib
+%files libs
 %defattr(-,root,root)
 %doc README LICENSE GPL LGPL
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.*
 %{_libdir}/libpulse-simple.so.*
-%{_libdir}/libflashsupport.so
 
-%files lib-glib2
+%files libs-glib2
 %defattr(-,root,root)
 %{_libdir}/libpulse-mainloop-glib.so.*
 
-%files lib-zeroconf
+%files libs-zeroconf
 %defattr(-,root,root)
 %{_bindir}/pabrowse
 %{_libdir}/libpulse-browse.so.*
 
-%files lib-devel
+%files libs-devel
 %defattr(-,root,root)
 %doc doxygen/html
 %{_includedir}/pulse/
@@ -334,6 +333,12 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.12.svn20070925
+- New SVN snapshot
+- Split off libflashsupport again
+- Rename "-lib" packages to "-libs", like all other packages do it.
+- Provide esound
+
 * Fri Sep 7 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.11.svn20070907
 - Update SVN snapshot, don't link libpulsecore.so statically anymore
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2007 23:54:15 -0000	1.12
+++ sources	25 Sep 2007 03:04:46 -0000	1.13
@@ -1,2 +1 @@
-2cf935e7b91fb0cffca558c511df8213  pulseaudio-0.9.7.svn20070907.tar.gz
-07cd06aa500f7e368af723b27f3e2621  libflashsupport-pulse-000.svn20070904.tar.gz
+2503ce94200e8c79b1f1e77fd922b0e3  pulseaudio-0.9.7.svn20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 03:26:22 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 23:26:22 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.32, 1.33 eclipse-cdt.spec, 1.85,
	1.86 sources, 1.40, 1.41
Message-ID: <200709250326.l8P3QMI0012192@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12163

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

Update fetched CDT tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	10 Sep 2007 22:12:19 -0000	1.32
+++ .cvsignore	25 Sep 2007 03:25:50 -0000	1.33
@@ -5,3 +5,5 @@
 eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+eclipse-cdt-fetched-src-v200709241202.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- eclipse-cdt.spec	13 Sep 2007 22:52:28 -0000	1.85
+++ eclipse-cdt.spec	25 Sep 2007 03:25:50 -0000	1.86
@@ -4,7 +4,7 @@
 %define major                   4
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_datadir}/eclipse
 %define eclipse_lib_base        %{_libdir}/eclipse
 
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        0.1.v200709241202cvs%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -31,19 +31,19 @@
 # mkdir -p temp && cd temp
 # mkdir -p home
 # rm -rf org.eclipse.cdt-releng
-# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_0 org.eclipse.cdt-releng/org.eclipse.cdt.releng
+# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r v200709241202 org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
 # sed --in-place 's/home/cvsroot/' maps/cdt.map
 # sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
 # sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-# sed --in-place -e'124,126d' build.xml
+# sed --in-place -e'123,126d' build.xml
 # eclipse -nosplash -Duser.home=../../home \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
-#   -DcdtTag=CDT_4_0_0 \
+#   -DcdtTag=v200709241202 \
 #   -DdontUnzip=true fetch
 # find . -name net.*.jar -exec rm {} \;
 # pushd results/features
@@ -58,11 +58,11 @@
 # sed --in-place -e "44,47d" feature.xml
 # sed --in-place -e "24,31d" feature.xml
 # popd
-# cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-v200709241202.tar.bz2 org.eclipse.cdt.releng
 
-Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
+Source0: %{name}-fetched-src-v200709241202.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -355,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
+- 4.0.1 RC.
+- Update autotools for Binaries fix.
+
 * Thu Sep 13 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-7
 - Resolves #288711
 - Ensure that all features are unpacked.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	10 Sep 2007 22:12:19 -0000	1.40
+++ sources	25 Sep 2007 03:25:50 -0000	1.41
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-089752c5437767e4756b893da17a7574  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-19ec953175bc545859ed0da61c1d3535  eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+131b053e65febfca5891d46448c986ae  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+0d981af2ad657299d1fe4894401995b5  eclipse-cdt-fetched-src-v200709241202.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 03:36:56 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Mon, 24 Sep 2007 23:36:56 -0400
Subject: rpms/firefox/devel firefox-2.0-startup-notify.patch, NONE,
	1.1 firefox-redhat-default-prefs.js, 1.9, 1.10 firefox.spec,
	1.196, 1.197
Message-ID: <200709250336.l8P3auOo012417@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379

Modified Files:
	firefox-redhat-default-prefs.js firefox.spec 
Added Files:
	firefox-2.0-startup-notify.patch 
Log Message:
* Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
- Startup notification support


firefox-2.0-startup-notify.patch:

--- NEW FILE firefox-2.0-startup-notify.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=223492

--- config/autoconf.mk.in	2006-09-14 14:07:03.000000000 -0400
+++ config/autoconf.mk.in	2007-07-03 18:01:36.000000000 -0400
@@ -223,6 +223,10 @@
 MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
 MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@
 
+MOZ_ENABLE_STARTUP_NOTIFICATION = @MOZ_ENABLE_STARTUP_NOTIFICATION@
+MOZ_STARTUP_NOTIFICATION_CFLAGS = @MOZ_STARTUP_NOTIFICATION_CFLAGS@
+MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STARTUP_NOTIFICATION_LIBS@
+
 MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@
 MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@
 
--- toolkit/components/remote/nsGTKRemoteService.cpp	2006-01-05 22:19:20.000000000 -0500
+++ toolkit/components/remote/nsGTKRemoteService.cpp	2007-07-05 17:34:41.000000000 -0400
@@ -50,7 +50,9 @@
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
+#include "nsIDocument.h"
 #include "nsIDOMWindow.h"
+#include "nsPIDOMWindow.h"
 #include "nsIGenericFactory.h"
 #include "nsILocalFile.h"
 #include "nsIObserverService.h"
@@ -58,6 +60,8 @@
 #include "nsIServiceManager.h"
 #include "nsIWeakReference.h"
 #include "nsIWidget.h"
+#include "nsIAppShellService.h"
+#include "nsAppShellCID.h"
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
@@ -65,6 +69,10 @@
 #include "prenv.h"
 #include "nsCRT.h"
 
+#ifdef MOZ_WIDGET_GTK2
+#include "nsGTKToolkit.h"
+#endif
+
 #ifdef MOZ_XUL_APP
 #include "nsICommandLineRunner.h"
 #include "nsXULAppAPI.h"
@@ -155,20 +163,46 @@
   return PL_DHASH_NEXT;
 }
 
+static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow)
+{
+  // get the native window for this instance
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, nsnull);
+  nsCOMPtr<nsIDocument> doc(do_QueryInterface(window->GetExtantDocument()));
+  NS_ENSURE_TRUE(doc, nsnull);
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(container));
+  NS_ENSURE_TRUE(baseWindow, nsnull);
+ 
+   nsCOMPtr<nsIWidget> mainWidget;
+   baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  return mainWidget;
+}
+
+static nsGTKToolkit* GetGTKToolkit()
+{
+  nsCOMPtr<nsIAppShellService> svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID);
+  if (!svc)
+    return nsnull;
+  nsCOMPtr<nsIDOMWindowInternal> window;
+  svc->GetHiddenDOMWindow(getter_AddRefs(window));
+  if (!window)
+    return nsnull;
+  nsIWidget* widget = GetMainWidget(window);
+  if (!widget)
+    return nsnull;
+  nsIToolkit* toolkit = widget->GetToolkit();
+  if (!toolkit)
+    return nsnull;
+ return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+}
+
+
 NS_IMETHODIMP
 nsGTKRemoteService::RegisterWindow(nsIDOMWindow* aWindow)
 {
   // get the native window for this instance
-  nsCOMPtr<nsIScriptGlobalObject> scriptObject
-    (do_QueryInterface(aWindow));
-  NS_ENSURE_TRUE(scriptObject, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIBaseWindow> baseWindow
-    (do_QueryInterface(scriptObject->GetDocShell()));
-  NS_ENSURE_TRUE(baseWindow, NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIWidget> mainWidget;
-  baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  nsIWidget* mainWidget = GetMainWidget(aWindow);
   NS_ENSURE_TRUE(mainWidget, NS_ERROR_FAILURE);
 
   // walk up the widget tree and find the toplevel window in the
@@ -201,7 +235,6 @@
 
   return NS_OK;
 }
-
 NS_IMETHODIMP
 nsGTKRemoteService::Shutdown()
 {
@@ -260,7 +293,7 @@
 
 #ifndef MOZ_XUL_APP
 const char*
-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow, PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -283,8 +316,60 @@
 }
 
 #else //MOZ_XUL_APP
+
+// Set desktop startup ID to the passed ID, if there is one, so that any created
+// windows get created with the right window manager metadata, and any windows
+// that get new tabs and are activated also get the right WM metadata.
+// If there is no desktop startup ID, then use the X event's timestamp
+// for _NET_ACTIVE_WINDOW when the window gets focused or shown.
+static void
+SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
+                               PRUint32 aTimestamp) {
+#ifdef MOZ_WIDGET_GTK2
+  nsGTKToolkit* toolkit = GetGTKToolkit();
+  if (!toolkit)
+    return;
+  if (!aDesktopStartupID.IsEmpty()) {
+    toolkit->SetDesktopStartupID(aDesktopStartupID);
+  } else {
+    toolkit->SetFocusTimestamp(aTimestamp);
+  }
+#endif
+}
+
+static PRBool
+FindExtensionParameterInCommand(const char* aParameterName,
+                                const nsACString& aCommand,
+                                char aSeparator,
+                                nsACString* aValue)
+{
+  nsCAutoString searchFor;
+  searchFor.Append(aSeparator);
+  searchFor.Append(aParameterName);
+  searchFor.Append('=');
+
+  nsACString::const_iterator start, end;
+  aCommand.BeginReading(start);
+  aCommand.EndReading(end);
+  if (!FindInReadable(searchFor, start, end))
+    return PR_FALSE;
+
+  nsACString::const_iterator charStart, charEnd;
+  charStart = end;
+  aCommand.EndReading(charEnd);
+  nsACString::const_iterator idStart = charStart, idEnd;
+  if (FindCharInReadable(aSeparator, charStart, charEnd)) {
+    idEnd = charStart;
+  } else {
+    idEnd = charEnd;
+  }
+  *aValue = nsDependentCSubstring(idStart, idEnd);
+  return PR_TRUE;
+}
+
 const char*
-nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
+                                  PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -314,6 +399,12 @@
 #endif
 
   if (!command.EqualsLiteral("ping")) {
+    nsCAutoString desktopStartupID;
+    nsDependentCString cmd(aCommand);
+    FindExtensionParameterInCommand("DESKTOP_STARTUP_ID",
+                                    cmd, '\n',
+                                    &desktopStartupID);
+
     char* argv[3] = {"dummyappname", "-remote", aCommand};
     rv = cmdline->Init(3, argv, nsnull, nsICommandLine::STATE_REMOTE_EXPLICIT);
     if (NS_FAILED(rv))
@@ -322,6 +413,8 @@
     if (aWindow)
       cmdline->SetWindowContext(aWindow);
 
+    SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp);
+
     rv = cmdline->Run();
     if (NS_ERROR_ABORT == rv)
       return "500 command not parseable";
@@ -333,7 +426,8 @@
 }
 
 const char*
-nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow)
+nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
+                                      PRUint32 aTimestamp)
 {
   nsresult rv;
 
@@ -364,6 +458,8 @@
   if (NS_FAILED(rv))
     return "509 internal error";
 
+  nsCAutoString desktopStartupID;
+
   char **argv = (char**) malloc(sizeof(char*) * argc);
   if (!argv) return "509 internal error";
 
@@ -372,6 +468,12 @@
   for (int i = 0; i < argc; ++i) {
     argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
 
+    if (i == 0) {
+      nsDependentCString cmd(argv[0]);
+      FindExtensionParameterInCommand("DESKTOP_STARTUP_ID",
+                                      cmd, ' ',
+                                      &desktopStartupID);
+    }
 #ifdef DEBUG_bsmedberg
     printf("  argv[%i]:\t%s\n", i, argv[i]);
 #endif
@@ -386,7 +488,10 @@
   if (aWindow)
     cmdline->SetWindowContext(aWindow);
 
+  SetDesktopStartupIDOrTimestamp(desktopStartupID, aTimestamp);
+
   rv = cmdline->Run();
+  
   if (NS_ERROR_ABORT == rv)
     return "500 command not parseable";
   
@@ -486,7 +591,7 @@
       return FALSE;
 
     // cool, we got the property data.
-    const char *response = HandleCommand(data, window);
+    const char *response = HandleCommand(data, window, pevent->time);
 
     // put the property onto the window as the response
     XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
@@ -531,7 +636,7 @@
       return FALSE;
 
     // cool, we got the property data.
-    const char *response = HandleCommandLine(data, window);
+    const char *response = HandleCommandLine(data, window, pevent->time);
 
     // put the property onto the window as the response
     XChangeProperty (GDK_DISPLAY(), GDK_WINDOW_XWINDOW(pevent->window),
--- toolkit/components/remote/nsGTKRemoteService.h	2005-04-04 19:11:42.000000000 -0400
+++ toolkit/components/remote/nsGTKRemoteService.h	2007-07-03 18:01:36.000000000 -0400
@@ -80,10 +80,12 @@
                                         nsIWeakReference* aData,
                                         void* aClosure);
 
-  static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow);
+  static const char* HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
+                                  PRUint32 aTimestamp);
 
 #ifdef MOZ_XUL_APP
-  static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow);
+  static const char* HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
+                                      PRUint32 aTimestamp);
 #endif
 
   static gboolean HandlePropertyChange(GtkWidget *widget,
--- toolkit/components/remote/Makefile.in	2005-04-08 00:59:36.000000000 -0400
+++ toolkit/components/remote/Makefile.in	2007-07-05 17:45:55.000000000 -0400
@@ -56,7 +56,9 @@
 	string \
 	appcomps \
 	toolkitcomps \
-	appcomps \
+	appshell \
+	layout \
+	content \
 	xulapp \
 	widget \
 	gfx \
--- toolkit/library/Makefile.in	2007-04-03 10:32:27.000000000 -0400
+++ toolkit/library/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -357,6 +357,10 @@
 EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
 endif
 
+ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
+endif
+
 ifdef MOZ_ENABLE_PANGO
 EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
 endif
--- toolkit/xre/nsAppRunner.cpp	2007-04-30 13:26:58.000000000 -0400
+++ toolkit/xre/nsAppRunner.cpp	2007-07-05 17:48:51.000000000 -0400
@@ -72,6 +72,7 @@
 #include "nsIComponentRegistrar.h"
 #include "nsIContentHandler.h"
 #include "nsIDialogParamBlock.h"
+#include "nsIDocument.h"
 #include "nsIDOMWindow.h"
 #include "nsIEventQueueService.h"
 #include "nsIExtensionManager.h"
@@ -99,6 +100,11 @@
 #ifdef XP_WIN
 #include "nsIWinAppHelper.h"
 #endif
+#include "nsPIDOMWindow.h"
+#include "nsIBaseWindow.h"
+#include "nsIWidget.h"
+#include "nsIDocShell.h"
+#include "nsAppShellCID.h"
 
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
@@ -262,6 +268,9 @@
 #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
 #include <gtk/gtk.h>
 #endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2
+#if defined(MOZ_WIDGET_GTK2)
+#include "nsGTKToolkit.h"
+#endif
 
 #if defined(MOZ_WIDGET_QT)
 #include <qapplication.h>
@@ -1105,7 +1114,7 @@
 // use int here instead of a PR type since it will be returned
 // from main - just to keep types consistent
 static int
-HandleRemoteArgument(const char* remote)
+HandleRemoteArgument(const char* remote, const char* aDesktopStartupID)
 {
   nsresult rv;
   ArgResult ar;
@@ -1146,7 +1155,7 @@
   nsXPIDLCString response;
   PRBool success = PR_FALSE;
   rv = client.SendCommand(program.get(), username, profile, remote,
-                           getter_Copies(response), &success);
+                          aDesktopStartupID, getter_Copies(response), &success);
   // did the command fail?
   if (NS_FAILED(rv)) {
     PR_fprintf(PR_STDERR, "Error: Failed to send command: %s\n",
@@ -1163,7 +1172,7 @@
 }
 
 static PRBool
-RemoteCommandLine()
+RemoteCommandLine(const char* aDesktopStartupID)
 {
   nsresult rv;
   ArgResult ar;
@@ -1195,7 +1204,7 @@
   nsXPIDLCString response;
   PRBool success = PR_FALSE;
   rv = client.SendCommandLine(program.get(), username, nsnull,
-                              gArgc, gArgv,
+                              gArgc, gArgv, aDesktopStartupID,
                               getter_Copies(response), &success);
   // did the command fail?
   if (NS_FAILED(rv) || !success)
@@ -2059,6 +2068,53 @@
 #ifdef MOZ_WIDGET_GTK2
 #include "prlink.h"
 typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+typedef void (*_gtk_window_set_auto_startup_notification_fn)(gboolean setting);
+
+static PRFuncPtr FindFunction(const char* aName)
+{
+  PRLibrary *lib = nsnull;
+  PRFuncPtr result = PR_FindFunctionSymbolAndLibrary(aName, &lib);
+  // Since the library was already loaded, we can safely unload it here.
+  if (lib) {
+    PR_UnloadLibrary(lib);
+  }
+  return result;
+}
+
+static nsIWidget* GetMainWidget(nsIDOMWindow* aWindow)
+{
+  // get the native window for this instance
+  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(aWindow));
+  NS_ENSURE_TRUE(window, nsnull);
+  nsCOMPtr<nsIDocument> doc(do_QueryInterface(window->GetExtantDocument()));
+  NS_ENSURE_TRUE(doc, nsnull);
+  nsCOMPtr<nsISupports> container = doc->GetContainer();
+  nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(container));
+  NS_ENSURE_TRUE(baseWindow, nsnull);
+
+  nsCOMPtr<nsIWidget> mainWidget;
+  baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
+  return mainWidget;
+}
+
+static nsGTKToolkit* GetGTKToolkit()
+{
+  nsCOMPtr<nsIAppShellService> svc = do_GetService(NS_APPSHELLSERVICE_CONTRACTID);
+  if (!svc)
+    return nsnull;
+  nsCOMPtr<nsIDOMWindowInternal> window;
+  svc->GetHiddenDOMWindow(getter_AddRefs(window));
+  if (!window)
+    return nsnull;
+  nsIWidget* widget = GetMainWidget(window);
+  if (!widget)
+    return nsnull;
+  nsIToolkit* toolkit = widget->GetToolkit();
+  if (!toolkit)
+    return nsnull;
+  return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+}
+
 #endif
 
 int
@@ -2235,6 +2291,16 @@
   if (CheckArg("install"))
     gdk_rgb_set_install(TRUE);
 
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE)
+  // Stash DESKTOP_STARTUP_ID in malloc'ed memory becaus gtk_init will clear it.
+#define HAVE_DESKTOP_STARTUP_ID
+    const char* desktopStartupIDEnv = PR_GetEnv("DESKTOP_STARTUP_ID");
+    nsCAutoString desktopStartupID;
+    if (desktopStartupIDEnv) {
+      desktopStartupID.Assign(desktopStartupIDEnv);
+    }
+#endif
+
   // Initialize GTK+1/2 here for splash
 #if defined(MOZ_WIDGET_GTK)
   gtk_set_locale();
@@ -2243,15 +2309,15 @@
 
 #if defined(MOZ_WIDGET_GTK2)
   // g_set_application_name () is only defined in glib2.2 and higher.
-  PRLibrary *glib2 = nsnull;
-  _g_set_application_name_fn _g_set_application_name =
-      (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+  _g_set_application_name_fn _g_set_application_name = 
+    (_g_set_application_name_fn)FindFunction("g_set_application_name");
   if (_g_set_application_name) {
     _g_set_application_name(gAppData->name);
   }
-  if (glib2) {
-    PR_UnloadLibrary(glib2);
-  }
+  _gtk_window_set_auto_startup_notification_fn _gtk_window_set_auto_startup_notification =
+    (_gtk_window_set_auto_startup_notification_fn)FindFunction("gtk_window_set_auto_startup_notification");
+  if (_gtk_window_set_auto_startup_notification) 
+    _gtk_window_set_auto_startup_notification(PR_FALSE);
 #endif
 
   gtk_widget_set_default_visual(gdk_rgb_get_visual());
@@ -2315,13 +2381,15 @@
     PR_fprintf(PR_STDERR, "Error: -remote requires an argument\n");
     return 1;
   }
+  const char* desktopStartupIDPtr =
+    desktopStartupID.IsEmpty() ? nsnull : desktopStartupID.get();
   if (ar) {
-    return HandleRemoteArgument(xremotearg);
+    return HandleRemoteArgument(xremotearg, desktopStartupIDPtr);
   }
 
   if (!PR_GetEnv("MOZ_NO_REMOTE")) {
     // Try to remote the entire command line. If this fails, start up normally.
-    if (RemoteCommandLine())
+    if (RemoteCommandLine(desktopStartupIDPtr))
       return 0;
   }
 #endif
@@ -2533,6 +2601,13 @@
       NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
       NS_ENSURE_SUCCESS(rv, 1);
 
+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
+        nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
+        if (toolkit && !desktopStartupID.IsEmpty()) {
+          toolkit->SetDesktopStartupID(desktopStartupID);
+        }
+#endif
+
       // Extension Compatibility Checking and Startup
       if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
         nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
@@ -2713,6 +2788,21 @@
     }
 #endif
 
+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
+      nsGTKToolkit* toolkit = GetGTKToolkit();
+      if (toolkit) {
+        nsCAutoString currentDesktopStartupID;
+        toolkit->GetDesktopStartupID(&currentDesktopStartupID);
+        if (!currentDesktopStartupID.IsEmpty()) {
+          nsCAutoString desktopStartupEnv;
+          desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
+          desktopStartupEnv.Append(currentDesktopStartupID);
+          // Leak it with extreme prejudice!
+          PR_SetEnv(ToNewCString(desktopStartupEnv));
+        }
+      }
+#endif
+
     rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0);
     return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1;
   }
--- toolkit/xre/Makefile.in	2007-02-06 02:13:20.000000000 -0500
+++ toolkit/xre/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -69,6 +69,7 @@
 	shellservice \
 	string \
 	uriloader \
+	layout \
 	widget \
 	windowwatcher \
 	xpcom \
--- configure.in	2007-04-03 11:40:02.000000000 -0400
+++ configure.in	2007-07-03 18:01:36.000000000 -0400
@@ -125,6 +125,7 @@
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 LIBGNOME_VERSION=2.0
+STARTUP_NOTIFICATION_VERSION=0.8
 
 dnl Set various checks
 dnl ========================================================
@@ -4156,6 +4157,41 @@
 
 AC_SUBST(MOZ_DEFAULT_TOOLKIT)
 
+dnl ========================================================
+dnl = startup-notification support module
+dnl ========================================================
+
+if test "$MOZ_ENABLE_GTK2"
+then
+    MOZ_ENABLE_STARTUP_NOTIFICATION=
+
+    MOZ_ARG_ENABLE_BOOL(startup-notification,
+    [  --enable-startup-notification       Enable startup-notification support (default: disabled) ],
+        MOZ_ENABLE_STARTUP_NOTIFICATION=force,
+        MOZ_ENABLE_STARTUP_NOTIFICATION=)
+    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
+    then
+        PKG_CHECK_MODULES(MOZ_STARTUP_NOTIFICATION,
+                          libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION,
+        [MOZ_ENABLE_STARTUP_NOTIFICATION=1], [
+            if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
+            then
+                AC_MSG_ERROR([* * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION])
+            fi
+            MOZ_ENABLE_STARTUP_NOTIFICATION=
+        ])
+    fi
+
+    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
+        AC_DEFINE(MOZ_ENABLE_STARTUP_NOTIFICATION)
+    fi
+
+    TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
+fi
+AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION)
+AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS)
+
 AC_SUBST(GTK_CONFIG)
 AC_SUBST(TK_CFLAGS)
 AC_SUBST(TK_LIBS)
--- widget/src/gtk2/nsWindow.cpp	2007-04-19 14:46:03.000000000 -0400
+++ widget/src/gtk2/nsWindow.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -40,7 +40,7 @@
 #include "prlink.h"
 
 #include "nsWindow.h"
-#include "nsToolkit.h"
+#include "nsGTKToolkit.h"
 #include "nsIRenderingContext.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
@@ -58,6 +58,11 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 
+#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+#define SN_API_NOT_YET_FROZEN
+#include <startup-notification-1.0/libsn/sn.h>
+#endif
+
 #include "gtk2xtbin.h"
 
 #include "nsIPrefService.h"
@@ -660,6 +665,75 @@
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+typedef void (* SetUserTimeFunc)(GdkWindow* aWindow, guint32 aTimestamp);
+
+// This will become obsolete when new GTK APIs are widely supported,
+// as described here: http://bugzilla.gnome.org/show_bug.cgi?id=347375
+static void
+SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
+{
+    nsCOMPtr<nsIToolkit> toolkit;
+    NS_GetCurrentToolkit(getter_AddRefs(toolkit));
+    if (!toolkit)
+        return;
+
+    nsGTKToolkit* GTKToolkit = NS_STATIC_CAST(nsGTKToolkit*,
+        NS_STATIC_CAST(nsIToolkit*, toolkit));
+    nsCAutoString desktopStartupID;
+    GTKToolkit->GetDesktopStartupID(&desktopStartupID);
+    if (desktopStartupID.IsEmpty()) {
+        // We don't have the data we need. Fall back to an
+        // approximation ... using the timestamp of the remote command
+        // being received as a guess for the timestamp of the user event
+        // that triggered it.
+        PRUint32 timestamp = GTKToolkit->GetFocusTimestamp();
+        if (timestamp) {
+            gdk_window_focus(aWindow->window, timestamp);
+            GTKToolkit->SetFocusTimestamp(0);
+        }
+        return;
+    }
+
+#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
+    GdkDrawable* drawable = GDK_DRAWABLE(aWindow->window);
+    GtkWindow* win = GTK_WINDOW(aWindow);
+    if (!win) {
+        NS_WARNING("Passed in widget was not a GdkWindow!");
+        return;
+    }
+    GdkScreen* screen = gtk_window_get_screen(win);
+    SnDisplay* snd =
+        sn_display_new(gdk_x11_drawable_get_xdisplay(drawable), nsnull, nsnull);
+    if (!snd)
+        return;
+    SnLauncheeContext* ctx =
+        sn_launchee_context_new(snd, gdk_screen_get_number(screen),
+                                desktopStartupID.get());
+    if (!ctx) {
+        sn_display_unref(snd);
+        return;
+    }
+
+    if (sn_launchee_context_get_id_has_timestamp(ctx)) {
+        PRLibrary* gtkLibrary;
+        SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
+            PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", &gtkLibrary);
+        if (setUserTimeFunc) {
+            setUserTimeFunc(aWindow->window, sn_launchee_context_get_timestamp(ctx));
+            PR_UnloadLibrary(gtkLibrary);
+        }
+    }
+
+    sn_launchee_context_setup_window(ctx, gdk_x11_drawable_get_xid(drawable));
+    sn_launchee_context_complete(ctx);
+
+    sn_launchee_context_unref(ctx);
+    sn_display_unref(snd);
+#endif
+
+    GTKToolkit->SetDesktopStartupID(EmptyCString());
+}
+
 NS_IMETHODIMP
 nsWindow::SetFocus(PRBool aRaise)
 {
@@ -680,6 +754,10 @@
     // set properly.
     GtkWidget *toplevelWidget = gtk_widget_get_toplevel(owningWidget);
 
+    if (toplevelWidget && aRaise) {
+        SetUserTimeAndStartupIDForActivatedWindow(toplevelWidget);
+    }
+
     if (gRaiseWindows && aRaise && toplevelWidget &&
         !GTK_WIDGET_HAS_FOCUS(owningWidget) &&
         !GTK_WIDGET_HAS_FOCUS(toplevelWidget)) {
@@ -1167,7 +1245,7 @@
 
     case NS_NATIVE_GRAPHIC: {
         NS_ASSERTION(nsnull != mToolkit, "NULL toolkit, unable to get a GC");
-        return (void *)NS_STATIC_CAST(nsToolkit *, mToolkit)->GetSharedGC();
+        return (void *)NS_STATIC_CAST(nsGTKToolkit *, mToolkit)->GetSharedGC();
         break;
     }
 
@@ -2802,13 +2880,18 @@
         // is shown.
         // XXX that may or may not be true for GTK+ 2.x
         if (mTransparencyBitmap) {
-          ApplyTransparencyBitmap();
+            ApplyTransparencyBitmap();
         }
 
         // unset our flag now that our window has been shown
         mNeedsShow = PR_FALSE;
 
         if (mIsTopLevel) {
+            // Set up usertime/startupID metadata for the created window.
+            if (mWindowType != eWindowType_invisible) {
+                SetUserTimeAndStartupIDForActivatedWindow(mShell);
+            }
+
             moz_drawingarea_set_visibility(mDrawingarea, aAction);
             gtk_widget_show(GTK_WIDGET(mContainer));
             gtk_widget_show(mShell);
--- widget/src/gtk2/Makefile.in	2006-06-17 11:16:14.000000000 -0400
+++ widget/src/gtk2/Makefile.in	2007-07-03 18:01:36.000000000 -0400
@@ -97,6 +97,7 @@
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		-lgtkxtbin \
+		$(MOZ_STARTUP_NOTIFICATION_LIBS) \
 		$(XLDFLAGS) \
 		$(XLIBS) \
 		$(MOZ_GTK2_LIBS)
@@ -107,14 +108,15 @@
 
 EXPORTS		= \
                 nsIGdkPixbufImage.h \
+                nsGTKToolkit.h \
 		mozdrawingarea.h \
 		mozcontainer.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS		+= $(MOZ_GTK2_CFLAGS)
-CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
+CFLAGS          += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+CXXFLAGS        += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
 
 DEFINES         += -DUSE_XIM
 
--- widget/src/gtk2/nsToolkit.cpp	2004-04-18 18:00:17.000000000 -0400
+++ widget/src/gtk2/nsToolkit.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nscore.h"  // needed for 'nsnull'
-#include "nsToolkit.h"
+#include "nsGTKToolkit.h"
 
 //
 // Static thread local storage index of the Toolkit 
@@ -51,9 +51,10 @@
 // constructor
 //
 //-------------------------------------------------------------------------
-nsToolkit::nsToolkit()
+nsGTKToolkit::nsGTKToolkit()
 {
     mSharedGC = nsnull;
+    mFocusTimestamp = 0;
 }
 
 //-------------------------------------------------------------------------
@@ -61,7 +62,7 @@
 // destructor
 //
 //-------------------------------------------------------------------------
-nsToolkit::~nsToolkit()
+nsGTKToolkit::~nsGTKToolkit()
 {
     if (mSharedGC) {
         gdk_gc_unref(mSharedGC);
@@ -77,9 +78,9 @@
 //
 //-------------------------------------------------------------------------
 
-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
+NS_IMPL_ISUPPORTS1(nsGTKToolkit, nsIToolkit)
 
-void nsToolkit::CreateSharedGC(void)
+void nsGTKToolkit::CreateSharedGC(void)
 {
     GdkPixmap *pixmap;
 
@@ -91,7 +92,7 @@
     gdk_pixmap_unref(pixmap);
 }
 
-GdkGC *nsToolkit::GetSharedGC(void)
+GdkGC *nsGTKToolkit::GetSharedGC(void)
 {
     return gdk_gc_ref(mSharedGC);
 }
@@ -100,7 +101,7 @@
 //
 //
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsToolkit::Init(PRThread *aThread)
+NS_IMETHODIMP nsGTKToolkit::Init(PRThread *aThread)
 {
     CreateSharedGC();
 
@@ -135,7 +136,7 @@
         // Create a new toolkit for this thread...
         //
         if (!toolkit) {
-            toolkit = new nsToolkit();
+            toolkit = new nsGTKToolkit();
 
             if (!toolkit) {
                 rv = NS_ERROR_OUT_OF_MEMORY;
--- widget/src/xremoteclient/mozilla-xremote-client.cpp	2005-04-04 15:08:51.000000000 -0400
+++ widget/src/xremoteclient/mozilla-xremote-client.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <plgetopt.h>
+#include <prenv.h>
 #ifdef MOZ_WIDGET_PHOTON
 #include "PhRemoteClient.h"
 #else
@@ -99,7 +100,7 @@
   // send the command - it doesn't get any easier than this
   PRBool success = PR_FALSE;
   char *error = 0;
-  rv = client.SendCommand(browser, username, profile, command,
+  rv = client.SendCommand(browser, username, profile, command, nsnull,
                           &error, &success);
 
   // failed to send command
--- widget/src/xremoteclient/XRemoteClient.cpp	2006-03-30 03:01:13.000000000 -0500
+++ widget/src/xremoteclient/XRemoteClient.cpp	2007-07-03 18:01:36.000000000 -0400
@@ -173,6 +173,7 @@
 nsresult
 XRemoteClient::SendCommand (const char *aProgram, const char *aUsername,
                             const char *aProfile, const char *aCommand,
+                            const char* aDesktopStartupID,
                             char **aResponse, PRBool *aWindowFound)
 {
   PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommand"));
@@ -198,7 +199,7 @@
 
     if (NS_SUCCEEDED(rv)) {
       // send our command
-      rv = DoSendCommand(w, aCommand, aResponse, &destroyed);
+      rv = DoSendCommand(w, aCommand, aDesktopStartupID, aResponse, &destroyed);
 
       // if the window was destroyed, don't bother trying to free the
       // lock.
@@ -217,6 +218,7 @@
 XRemoteClient::SendCommandLine (const char *aProgram, const char *aUsername,
                                 const char *aProfile,
                                 PRInt32 argc, char **argv,
+                                const char* aDesktopStartupID,
                                 char **aResponse, PRBool *aWindowFound)
 {
   PR_LOG(sRemoteLm, PR_LOG_DEBUG, ("XRemoteClient::SendCommandLine"));
@@ -242,7 +244,7 @@
 
     if (NS_SUCCEEDED(rv)) {
       // send our command
-      rv = DoSendCommandLine(w, argc, argv, aResponse, &destroyed);
+      rv = DoSendCommandLine(w, argc, argv, aDesktopStartupID, aResponse, &destroyed);
 
       // if the window was destroyed, don't bother trying to free the
       // lock.
@@ -643,6 +645,7 @@
 
 nsresult
 XRemoteClient::DoSendCommand(Window aWindow, const char *aCommand,
+                             const char* aDesktopStartupID,
                              char **aResponse, PRBool *aDestroyed)
 {
   *aDestroyed = PR_FALSE;
@@ -651,9 +654,28 @@
      ("(writing " MOZILLA_COMMAND_PROP " \"%s\" to 0x%x)\n",
       aCommand, (unsigned int) aWindow));
 
+  // We add the DESKTOP_STARTUP_ID setting as an extra line of
+  // the command string. Firefox ignores all lines but the first.
+  static char desktopStartupPrefix[] = "\nDESKTOP_STARTUP_ID=";
+
+  PRInt32 len = strlen(aCommand);
+  if (aDesktopStartupID) {
+    len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID);
+  }
+  char* buffer = (char*)malloc(len + 1);
+  if (!buffer)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  strcpy(buffer, aCommand);
+  if (aDesktopStartupID) {
+    strcat(buffer, desktopStartupPrefix);
+    strcat(buffer, aDesktopStartupID);
+  }
+
   XChangeProperty (mDisplay, aWindow, mMozCommandAtom, XA_STRING, 8,
-           PropModeReplace, (unsigned char *)aCommand,
-           strlen(aCommand));
+           PropModeReplace, (unsigned char *)buffer, len);
+
+  free(buffer);
 
   if (!WaitForResponse(aWindow, aResponse, aDestroyed, mMozCommandAtom))
     return NS_ERROR_FAILURE;
@@ -663,7 +685,7 @@
 
 /* like strcpy, but return the char after the final null */
 static char*
-estrcpy(char* s, char* d)
+estrcpy(const char* s, char* d)
 {
   while (*s)
     *d++ = *s++;
@@ -674,6 +696,7 @@
 
 nsresult
 XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv,
+                                 const char* aDesktopStartupID,
                                  char **aResponse, PRBool *aDestroyed)
 {
   int i;
@@ -690,9 +713,16 @@
   // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
   // (offset is from the beginning of the buffer)
 
+  static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID=";
+
   PRInt32 argvlen = strlen(cwdbuf);
-  for (i = 0; i < argc; ++i)
-    argvlen += strlen(argv[i]);
+  for (i = 0; i < argc; ++i) {
+    PRInt32 len = strlen(argv[i]);
+    if (i == 0 && aDesktopStartupID) {
+      len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID);
+    }
+    argvlen += len;
+  }
 
   PRInt32* buffer = (PRInt32*) malloc(argvlen + argc + 1 +
                                       sizeof(PRInt32) * (argc + 1));
@@ -708,6 +738,10 @@
   for (int i = 0; i < argc; ++i) {
     buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer));
     bufend = estrcpy(argv[i], bufend);
+    if (i == 0 && aDesktopStartupID) {
+      bufend = estrcpy(desktopStartupPrefix, bufend - 1);
+      bufend = estrcpy(aDesktopStartupID, bufend - 1);
+    }
   }
 
 #ifdef DEBUG_bsmedberg
--- widget/src/xremoteclient/nsRemoteClient.h	2005-04-04 15:08:51.000000000 -0400
+++ widget/src/xremoteclient/nsRemoteClient.h	2007-07-03 18:01:36.000000000 -0400
@@ -76,6 +76,10 @@
    * @param aCommand This is the command that is passed to the server.
    * Please see the additional information located at:
    * http://www.mozilla.org/unix/remote.html
+   * 
+   * @param aDesktopStartupID the contents of the DESKTOP_STARTUP_ID environment
+   * variable defined by the Startup Notification specification
+   * http://standards.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt
    *
    * @param aResponse If there is a response, it will be here.  This
    * includes error messages.  The string is allocated using stdlib
@@ -85,11 +89,16 @@
    */
   virtual nsresult SendCommand(const char *aProgram, const char *aUsername,
                                const char *aProfile, const char *aCommand,
+                               const char* aDesktopStartupID,
                                char **aResponse, PRBool *aSucceeded) = 0;
 
   /**
    * Send a complete command line to a running instance.
    *
+   * @param aDesktopStartupID the contents of the DESKTOP_STARTUP_ID environment
+   * variable defined by the Startup Notification specification
+   * http://standards.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt
+   *   
    * @see sendCommand
    * @param argc The number of command-line arguments.
    * 
@@ -97,6 +106,7 @@
   virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername,
                                    const char *aProfile,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse, PRBool *aSucceeded) = 0;
 };
 
--- widget/src/xremoteclient/XRemoteClient.h	2006-03-30 03:01:13.000000000 -0500
+++ widget/src/xremoteclient/XRemoteClient.h	2007-07-03 18:01:36.000000000 -0400
@@ -48,10 +48,12 @@
   virtual nsresult Init();
   virtual nsresult SendCommand(const char *aProgram, const char *aUsername,
                                const char *aProfile, const char *aCommand,
+                               const char* aDesktopStartupID,
                                char **aResponse, PRBool *aSucceeded);
   virtual nsresult SendCommandLine(const char *aProgram, const char *aUsername,
                                    const char *aProfile,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse, PRBool *aSucceeded);
   void Shutdown();
 
@@ -67,10 +69,12 @@
                                    PRBool aSupportsCommandLine);
   nsresult       DoSendCommand    (Window aWindow,
                                    const char *aCommand,
+                                   const char* aDesktopStartupID,
                                    char **aResponse,
                                    PRBool *aDestroyed);
   nsresult       DoSendCommandLine(Window aWindow,
                                    PRInt32 argc, char **argv,
+                                   const char* aDesktopStartupID,
                                    char **aResponse,
                                    PRBool *aDestroyed);
   PRBool         WaitForResponse  (Window aWindow, char **aResponse,
--- /dev/null	2007-07-05 17:03:04.116204904 -0400
+++ widget/src/gtk2/nsGTKToolkit.h	2007-07-03 18:01:36.000000000 -0400
@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.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.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef GTKTOOLKIT_H      
+#define GTKTOOLKIT_H
+
+#include "nsIToolkit.h"
+#include "nsString.h"
+#include <gtk/gtk.h>
+
+/**
+ * Wrapper around the thread running the message pump.
+ * The toolkit abstraction is necessary because the message pump must
+ * execute within the same thread that created the widget under Win32.
+ */ 
+
+class nsGTKToolkit : public nsIToolkit
+{
+public:
+    nsGTKToolkit();
+    virtual ~nsGTKToolkit();
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD    Init(PRThread *aThread);
+
+    void          CreateSharedGC(void);
+    GdkGC         *GetSharedGC(void);
+    
+    /**
+     * Get/set our value of DESKTOP_STARTUP_ID. When non-empty, this is applied
+     * to the next toplevel window to be shown or focused (and then immediately
+     * cleared).
+     */ 
+    void SetDesktopStartupID(const nsACString& aID) { mDesktopStartupID = aID; }
+    void GetDesktopStartupID(nsACString* aID) { *aID = mDesktopStartupID; }
+
+    /**
+     * Get/set the timestamp value to be used, if non-zero, to focus the
+     * next top-level window to be shown or focused (upon which it is cleared).
+     */
+    void SetFocusTimestamp(PRUint32 aTimestamp) { mFocusTimestamp = aTimestamp; }
+    PRUint32 GetFocusTimestamp() { return mFocusTimestamp; }
+
+private:
+    GdkGC         *mSharedGC;
+    nsCString      mDesktopStartupID;
+    PRUint32       mFocusTimestamp;
+};
+
+#endif  // GTKTOOLKIT_H


Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- firefox-redhat-default-prefs.js	6 Sep 2007 14:30:01 -0000	1.9
+++ firefox-redhat-default-prefs.js	25 Sep 2007 03:36:23 -0000	1.10
@@ -6,3 +6,6 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
 pref("intl.locale.matchOS", true);
+pref("browser.startup.homepage", "http://start.fedoraproject.org/");
+pref("startup.homepage_override_url", "http://start.fedoraproject.org/");
+pref("startup.homepage_welcome_url", "http://start.fedoraproject.org/");


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- firefox.spec	11 Sep 2007 18:55:30 -0000	1.196
+++ firefox.spec	25 Sep 2007 03:36:23 -0000	1.197
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -72,6 +72,7 @@
 Patch104:       firefox-1.5-ppc64.patch
 Patch105:       firefox-2.0-dnd.patch
 Patch106:       firefox-2.0-indicator-crash.patch
+Patch110:       firefox-2.0-startup-notify.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -174,6 +175,7 @@
 %patch104 -p1 -b .ppc64
 %patch105 -p0 -b .dnd
 %patch106 -p1 -b .indicator-crash
+%patch110 -p0 -b .startup-notify
 
 # For branding specific patches.
 
@@ -440,6 +442,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
+- Startup notification support
+
 * Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-8
 - Fix crashes when using GTK+ themes containing a gtkrc which specify 
   GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing



From fedora-extras-commits at redhat.com  Tue Sep 25 03:41:12 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 24 Sep 2007 23:41:12 -0400
Subject: rpms/eclipse-cdt/devel sources,1.41,1.42
Message-ID: <200709250341.l8P3fCuO012562@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12540

Modified Files:
	sources 
Log Message:
* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
- 4.0.1 RC.
- Update autotools for Binaries fix.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Sep 2007 03:25:50 -0000	1.41
+++ sources	25 Sep 2007 03:40:40 -0000	1.42
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-131b053e65febfca5891d46448c986ae  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
 0d981af2ad657299d1fe4894401995b5  eclipse-cdt-fetched-src-v200709241202.tar.bz2
+83f650ae4da2cf63d8cb3323c4662afd  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:02:38 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:02:38 -0400
Subject: rpms/firefox/devel firefox-redhat-default-prefs.js,1.10,1.11
Message-ID: <200709250402.l8P42ceu019160@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12979

Modified Files:
	firefox-redhat-default-prefs.js 
Log Message:
not sure how these ended up in here



Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firefox-redhat-default-prefs.js	25 Sep 2007 03:36:23 -0000	1.10
+++ firefox-redhat-default-prefs.js	25 Sep 2007 04:02:03 -0000	1.11
@@ -6,6 +6,3 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
 pref("intl.locale.matchOS", true);
-pref("browser.startup.homepage", "http://start.fedoraproject.org/");
-pref("startup.homepage_override_url", "http://start.fedoraproject.org/");
-pref("startup.homepage_welcome_url", "http://start.fedoraproject.org/");



From fedora-extras-commits at redhat.com  Tue Sep 25 04:04:27 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:04:27 -0400
Subject: rpms/firefox/devel firefox.spec,1.197,1.198
Message-ID: <200709250404.l8P44RkO019205@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186

Modified Files:
	firefox.spec 
Log Message:
BR startup-notification-devel



Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- firefox.spec	25 Sep 2007 03:36:23 -0000	1.197
+++ firefox.spec	25 Sep 2007 04:03:53 -0000	1.198
@@ -104,6 +104,7 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  system-bookmarks
+BuildRequires:  startup-notification-devel
 
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}



From fedora-extras-commits at redhat.com  Tue Sep 25 04:38:41 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Tue, 25 Sep 2007 00:38:41 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/devel
	php-pear-MDB2-Driver-mysqli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709250438.l8P4cfHb019961@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19930/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-MDB2-Driver-mysqli.spec 
Log Message:
Initial import



--- NEW FILE php-pear-MDB2-Driver-mysqli.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name MDB2_Driver_mysqli

Name:           php-pear-MDB2-Driver-mysqli
Version:        1.4.1
Release:        2%{?dist}
Summary:        MySQL Improved MDB2 driver

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/MDB2_Driver_mysqli
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR)
Requires:       php-pear(MDB2) >= 2.4.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is the MySQL Improved MDB2 driver.


%prep
%setup -qc
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_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 $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/MDB2/Driver/*/mysqli.php
%{pear_phpdir}/MDB2/Driver/mysqli.php


%changelog
* Sat Sep 22 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-2
- Requires MDB2 2.4.1 or newer
* Sun Sep 02 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:12:17 -0000	1.1
+++ .cvsignore	25 Sep 2007 04:38:09 -0000	1.2
@@ -0,0 +1 @@
+MDB2_Driver_mysqli-1.4.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:12:17 -0000	1.1
+++ sources	25 Sep 2007 04:38:09 -0000	1.2
@@ -0,0 +1 @@
+eb93eb4687da1a1018c832622da42f6f  MDB2_Driver_mysqli-1.4.1.tgz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:40:22 2007
From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher))
Date: Tue, 25 Sep 2007 00:40:22 -0400
Subject: rpms/php-pear-MDB2-Driver-mysqli/F-7
	php-pear-MDB2-Driver-mysqli.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709250440.l8P4eMtb020117@cvs-int.fedora.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20072/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-MDB2-Driver-mysqli.spec 
Log Message:
Initial import



--- NEW FILE php-pear-MDB2-Driver-mysqli.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name MDB2_Driver_mysqli

Name:           php-pear-MDB2-Driver-mysqli
Version:        1.4.1
Release:        2%{?dist}
Summary:        MySQL Improved MDB2 driver

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/MDB2_Driver_mysqli
Source0:        http://pear.php.net/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
Requires:       php-pear(PEAR)
Requires:       php-pear(MDB2) >= 2.4.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is the MySQL Improved MDB2 driver.


%prep
%setup -qc
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_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 $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/MDB2/Driver/*/mysqli.php
%{pear_phpdir}/MDB2/Driver/mysqli.php


%changelog
* Sat Sep 22 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-2
- Requires MDB2 2.4.1 or newer
* Sun Sep 02 2007 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:12:17 -0000	1.1
+++ .cvsignore	25 Sep 2007 04:39:50 -0000	1.2
@@ -0,0 +1 @@
+MDB2_Driver_mysqli-1.4.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysqli/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:12:17 -0000	1.1
+++ sources	25 Sep 2007 04:39:50 -0000	1.2
@@ -0,0 +1 @@
+eb93eb4687da1a1018c832622da42f6f  MDB2_Driver_mysqli-1.4.1.tgz



From fedora-extras-commits at redhat.com  Tue Sep 25 04:49:55 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 00:49:55 -0400
Subject: rpms/firefox/devel firefox.spec, 1.198,
	1.199 firefox-1.0-system-nspr-ldap.patch, 1.1,
	NONE firefox-1.1-nss-system-nspr.patch, 1.2,
	NONE firefox-1.5-with-system-nss.patch, 1.1,
	NONE firefox-2.0-visibility.patch, 1.3,
	NONE firefox-RC1-stock-icons-be.patch, 1.1,
	NONE firefox-RC1-stock-icons-fe.patch, 1.1,
	NONE firefox-RC1-stock-icons-gnomestripe.patch, 1.1,
	NONE firefox-gnomestripe-0.1-livemarks.patch, 1.1, NONE
Message-ID: <200709250449.l8P4nts3020417@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20389

Modified Files:
	firefox.spec 
Removed Files:
	firefox-1.0-system-nspr-ldap.patch 
	firefox-1.1-nss-system-nspr.patch 
	firefox-1.5-with-system-nss.patch firefox-2.0-visibility.patch 
	firefox-RC1-stock-icons-be.patch 
	firefox-RC1-stock-icons-fe.patch 
	firefox-RC1-stock-icons-gnomestripe.patch 
	firefox-gnomestripe-0.1-livemarks.patch 
Log Message:
remove some no longer used patches


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- firefox.spec	25 Sep 2007 04:03:53 -0000	1.198
+++ firefox.spec	25 Sep 2007 04:49:20 -0000	1.199
@@ -36,19 +36,12 @@
 
 # build patches
 Patch1:         firefox-2.0-link-layout.patch
-Patch3:         firefox-1.1-nss-system-nspr.patch
-Patch4:         firefox-1.5-with-system-nss.patch
-Patch5:         firefox-2.0-visibility.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
 Patch21:        firefox-0.7.3-psfonts.patch
 Patch22:        firefox-1.1-default-applications.patch
 Patch23:        firefox-1.1-software-update.patch
-Patch24:        firefox-RC1-stock-icons-be.patch
-Patch25:        firefox-RC1-stock-icons-fe.patch
-Patch26:        firefox-RC1-stock-icons-gnomestripe.patch
-Patch27:        firefox-gnomestripe-0.1-livemarks.patch
 
 # local bugfixes
 Patch40:        firefox-1.5-bullet-bill.patch
@@ -147,18 +140,11 @@
 %prep
 %setup -q -n mozilla
 %patch1   -p1 -b .link-layout
-#%patch3  -p1
-#%patch4  -p1
-#%patch5  -p1 -b .visibility
 
 #%patch20 -p0
 %patch21 -p1 -b .psfonts
 %patch22 -p0 -b .default-applications
 #%patch23 -p0
-#%patch24 -p0
-#%patch25 -p0
-#%patch26 -p0
-#%patch27 -p1
 %patch40 -p1 -b .bullet-bill
 %patch41 -p1 -b .undo-uriloader
 %patch42 -p0 -b .uriloader


--- firefox-1.0-system-nspr-ldap.patch DELETED ---


--- firefox-1.1-nss-system-nspr.patch DELETED ---


--- firefox-1.5-with-system-nss.patch DELETED ---


--- firefox-2.0-visibility.patch DELETED ---


--- firefox-RC1-stock-icons-be.patch DELETED ---


--- firefox-RC1-stock-icons-fe.patch DELETED ---


--- firefox-RC1-stock-icons-gnomestripe.patch DELETED ---


--- firefox-gnomestripe-0.1-livemarks.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 04:57:09 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:57:09 -0400
Subject: rpms/xen/F-7 xen-pvfb-compat-32-on-64.patch, 1.1, 1.2 xen.spec,
	1.184, 1.185
Message-ID: <200709250457.l8P4v9YJ020621@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593

Modified Files:
	xen-pvfb-compat-32-on-64.patch xen.spec 
Log Message:
Really fix 32-on-64 FC6 guests this time

xen-pvfb-compat-32-on-64.patch:

Index: xen-pvfb-compat-32-on-64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen-pvfb-compat-32-on-64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-compat-32-on-64.patch	25 Sep 2007 00:18:20 -0000	1.1
+++ xen-pvfb-compat-32-on-64.patch	25 Sep 2007 04:57:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -rup --exclude '*~' xen-3.1.0-src/tools/xenfb/oldxenfb.c xen-3.1.0-hacked/tools/xenfb/oldxenfb.c
---- xen-3.1.0-src/tools/xenfb/oldxenfb.c	2007-07-24 10:12:10.000000000 +0200
-+++ xen-3.1.0-hacked/tools/xenfb/oldxenfb.c	2007-07-24 20:29:47.000000000 +0200
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/oldxenfb.c xen-3.1.0-src.new/tools/xenfb/oldxenfb.c
+--- xen-3.1.0-src.orig/tools/xenfb/oldxenfb.c	2007-09-25 00:40:35.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/oldxenfb.c	2007-09-25 00:45:47.000000000 -0400
 @@ -7,9 +7,9 @@
  #include <xen/io/xenbus.h>
  #include "oldxenfb.h"
@@ -90,10 +90,10 @@
 -	}
 +	if (xenfb->pub.pixels == NULL)
 +		goto out;
-+
-+	ret = 0; /* all is fine */
  
 -	return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE);
++	ret = 0; /* all is fine */
++
 + out:
 +	if (pgmfns)
 +		free(pgmfns);
@@ -123,3 +123,163 @@
  	/* TODO check for permitted ranges */
  	fb_page = xenfb->fb.page;
  	xenfb->pub.depth = fb_page->depth;
+@@ -430,10 +470,10 @@ static void xenfb_detach_dom(struct xenf
+ 	}
+ }
+ 
+-static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++static void xenfb_on_fb_event32(struct xenfb_private *xenfb)
+ {
+ 	uint32_t prod, cons;
+-	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
+ 
+ 	prod = page->out_prod;
+ 	if (prod == page->out_cons)
+@@ -456,6 +496,50 @@ static void xenfb_on_fb_event(struct xen
+ 	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+ }
+ 
++static void xenfb_on_fb_event64(struct xenfb_private *xenfb)
++{
++	uint32_t prod, cons;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->out_prod;
++	if (prod == page->out_cons)
++		return;
++	rmb();			/* ensure we see ring contents up to prod */
++	for (cons = page->out_cons; cons != prod; cons++) {
++		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
++
++		switch (event->type) {
++		case XENFB_TYPE_UPDATE:
++                    if (xenfb->pub.update)
++			xenfb->pub.update(&xenfb->pub,
++					  event->update.x, event->update.y,
++					  event->update.width, event->update.height);
++                    break;
++		}
++	}
++	mb();			/* ensure we're done with ring contents */
++	page->out_cons = cons;
++	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++{
++	int mode;
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return;
++
++	if (mode == 32)
++		xenfb_on_fb_event32(xenfb);
++	else
++		xenfb_on_fb_event64(xenfb);
++}
++
+ static void xenfb_on_kbd_event(struct xenfb_private *xenfb)
+ {
+ 	struct xenkbd_info *page = xenfb->kbd.page;
+@@ -541,11 +625,11 @@ int xenfb_select_fds(struct xenfb *xenfb
+ 	return fd1 > fd2 ? fd1 + 1 : fd2 + 1;
+ }
+ 
+-static int xenfb_fb_event(struct xenfb_private *xenfb,
+-			  union xenfb_in_event *event)
++static int xenfb_fb_event32(struct xenfb_private *xenfb,
++			    union xenfb_in_event *event)
+ {
+ 	uint32_t prod;
+-	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
+ 
+ 	prod = page->in_prod;
+ 	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
+@@ -560,6 +644,44 @@ static int xenfb_fb_event(struct xenfb_p
+ 	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
+ }
+ 
++static int xenfb_fb_event64(struct xenfb_private *xenfb,
++			    union xenfb_in_event *event)
++{
++	uint32_t prod;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->in_prod;
++	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
++		errno = EAGAIN;
++		return -1;
++	}
++
++	mb();			/* ensure ring space available */
++	XENFB_IN_RING_REF(page, prod) = *event;
++	wmb();			/* ensure ring contents visible */
++	page->in_prod = prod + 1;
++	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static int xenfb_fb_event(struct xenfb_private *xenfb,
++			   union xenfb_in_event *event)
++{
++	int mode;
++	if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++	    mode = sizeof(unsigned long) * 8;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++	    mode = 32;
++	else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++	    mode = 64;
++	else
++	    return -1;
++
++	if (mode == 32)
++		return xenfb_fb_event32(xenfb, event);
++	else
++		return xenfb_fb_event64(xenfb, event);
++}
++
+ static int xenfb_kbd_event(struct xenfb_private *xenfb,
+ 			   union xenkbd_in_event *event)
+ {
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/oldxenfb.h xen-3.1.0-src.new/tools/xenfb/oldxenfb.h
+--- xen-3.1.0-src.orig/tools/xenfb/oldxenfb.h	2007-09-25 00:40:35.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/oldxenfb.h	2007-09-25 00:38:30.000000000 -0400
+@@ -98,6 +98,32 @@ struct xenfb_page
+ 
+ 	unsigned long pd[2];	/* FIXME rename to pgdir? */
+ 	/* FIXME pd[1] unused at this time, shrink? */
++};
++struct xenfb_page32
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++        __u32 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
++
++	__u32 in_cons, in_prod;
++	__u32 out_cons, out_prod;
++};
++
++struct xenfb_page64
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u64 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
+ 
+ 	__u32 in_cons, in_prod;
+ 	__u32 out_cons, out_prod;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- xen.spec	25 Sep 2007 00:18:20 -0000	1.184
+++ xen.spec	25 Sep 2007 04:57:02 -0000	1.185
@@ -282,6 +282,7 @@
 %changelog
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
 - Fix generation of manual pages (rhbz #250791)
+- Fix 32-on-64 PVFB for FC6 legacy guests
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-4.fc7
 - Fix VMX assist IRQ handling (rhbz #279581)



From fedora-extras-commits at redhat.com  Tue Sep 25 04:57:38 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:57:38 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch,1.2,1.3
Message-ID: <200709250457.l8P4vcYx020689@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20664

Modified Files:
	xen-pvfb-04-compat.patch 
Log Message:
Really fix 32-on-64 fc6 guests this time

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-pvfb-04-compat.patch	24 Sep 2007 23:09:22 -0000	1.2
+++ xen-pvfb-04-compat.patch	25 Sep 2007 04:57:36 -0000	1.3
@@ -1,7 +1,7 @@
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-24 18:51:06.000000000 -0400
-@@ -0,0 +1,610 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c	2007-09-25 00:46:38.000000000 -0400
+@@ -0,0 +1,693 @@
 +#include <stdarg.h>
 +#include <stdlib.h>
 +#include <sys/types.h>
@@ -400,10 +400,10 @@
 +	}
 +}
 +
-+static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
++static void oldxenfb_on_fb_event32(struct xenfb_private *xenfb)
 +{
 +	uint32_t prod, cons;
-+	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
 +
 +	prod = page->out_prod;
 +	if (prod == page->out_cons)
@@ -426,6 +426,50 @@
 +	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
++static void oldxenfb_on_fb_event64(struct xenfb_private *xenfb)
++{
++	uint32_t prod, cons;
++	struct xenfb_page64 *page = xenfb->fb.page;
++
++	prod = page->out_prod;
++	if (prod == page->out_cons)
++		return;
++	rmb();			/* ensure we see ring contents up to prod */
++	for (cons = page->out_cons; cons != prod; cons++) {
++		union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons);
++
++		switch (event->type) {
++		case XENFB_TYPE_UPDATE:
++                    if (xenfb->pub.update)
++			xenfb->pub.update(&xenfb->pub,
++					  event->update.x, event->update.y,
++					  event->update.width, event->update.height);
++                    break;
++		}
++	}
++	mb();			/* ensure we're done with ring contents */
++	page->out_cons = cons;
++	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++{
++  int mode;
++  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++    mode = sizeof(unsigned long) * 8;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++    mode = 32;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++    mode = 64;
++  else
++    return;
++
++  if (mode == 32)
++    oldxenfb_on_fb_event32(xenfb);
++  else
++    oldxenfb_on_fb_event64(xenfb);
++}
++
 +static void oldxenfb_on_kbd_event(struct xenfb_private *xenfb)
 +{
 +	struct xenkbd_info *page = xenfb->kbd.page;
@@ -503,11 +547,30 @@
 +}
 +
 +
-+static int oldxenfb_fb_event(struct xenfb_private *xenfb,
-+			     union xenfb_in_event *event)
++static int oldxenfb_fb_event32(struct xenfb_private *xenfb,
++			       union xenfb_in_event *event)
 +{
 +	uint32_t prod;
-+	struct xenfb_page *page = xenfb->fb.page;
++	struct xenfb_page32 *page = xenfb->fb.page;
++
++	prod = page->in_prod;
++	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
++		errno = EAGAIN;
++		return -1;
++	}
++
++	mb();			/* ensure ring space available */
++	XENFB_IN_RING_REF(page, prod) = *event;
++	wmb();			/* ensure ring contents visible */
++	page->in_prod = prod + 1;
++	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
++}
++
++static int oldxenfb_fb_event64(struct xenfb_private *xenfb,
++			       union xenfb_in_event *event)
++{
++	uint32_t prod;
++	struct xenfb_page64 *page = xenfb->fb.page;
 +
 +	prod = page->in_prod;
 +	if (prod - page->in_cons == XENFB_IN_RING_LEN) {
@@ -522,6 +585,26 @@
 +	return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
++static int oldxenfb_fb_event(struct xenfb_private *xenfb,
++                             union xenfb_in_event *event)
++{
++  int mode;
++  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))
++    mode = sizeof(unsigned long) * 8;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_32))
++    mode = 32;
++  else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64))
++    mode = 64;
++  else
++    return -1;
++
++  if (mode == 32)
++    return oldxenfb_fb_event32(xenfb, event);
++  else
++    return oldxenfb_fb_event64(xenfb, event);
++}
++
++
 +static int oldxenfb_kbd_event(struct xenfb_private *xenfb,
 +			      union xenkbd_in_event *event)
 +{
@@ -612,10 +695,10 @@
 +        xs_unwatch(xsh, p, "");
 +        return ret;
 +}
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-24 18:50:44.000000000 -0400
-@@ -0,0 +1,106 @@
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h	2007-09-25 00:44:17.000000000 -0400
+@@ -0,0 +1,133 @@
 +/*
 + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
 + *
@@ -716,15 +799,42 @@
 +
 +	unsigned long pd[2];	/* FIXME rename to pgdir? */
 +	/* FIXME pd[1] unused at this time, shrink? */
++};
++
++struct xenfb_page32
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u32 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
++
++	__u32 in_cons, in_prod;
++	__u32 out_cons, out_prod;
++};
++
++struct xenfb_page64
++{
++	__u16 width;         /* the width of the framebuffer (in pixels) */
++	__u16 height;        /* the height of the framebuffer (in pixels) */
++	__u32 line_length;   /* the length of a row of pixels (in bytes) */
++	__u32 mem_length;    /* the length of the framebuffer (in bytes) */
++	__u8 depth;          /* the depth of a pixel (in bits) */
++
++	__u64 pd[2];	/* FIXME rename to pgdir? */
++	/* FIXME pd[1] unused at this time, shrink? */
 +
 +	__u32 in_cons, in_prod;
 +	__u32 out_cons, out_prod;
 +};
 +
 +#endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
 --- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h	1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h	2007-09-25 00:42:39.000000000 -0400
 @@ -0,0 +1,92 @@
 +/*
 + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
@@ -818,9 +928,9 @@
 +void xenkbd_resume(void);
 +
 +#endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c	2007-09-25 00:42:39.000000000 -0400
 @@ -41,6 +41,7 @@ struct xenfb_private {
  	struct xenfb_device fb, kbd;
  	size_t fb_len;		/* size of framebuffer */
@@ -896,9 +1006,9 @@
  	memset(&event, 0, XENKBD_IN_EVENT_SIZE);
  	event.type = XENKBD_TYPE_POS;
  	event.pos.abs_x = abs_x;
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h	2007-09-25 00:42:39.000000000 -0400
 @@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb, 
  int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
  int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
@@ -918,9 +1028,9 @@
 +
 +
  #endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target	2007-09-25 00:42:39.000000000 -0400
 @@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
  VL_OBJS+= xen_platform.o
  VL_OBJS+= xen_machine_fv.o
@@ -930,9 +1040,9 @@
  VL_OBJS+= tpm_tis.o
  DEFINES += -DHAS_AUDIO
  endif
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:42:25.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-24 18:50:44.000000000 -0400
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py	2007-09-25 00:39:46.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py	2007-09-25 00:42:39.000000000 -0400
 @@ -50,7 +50,11 @@ class VfbifController(DevController):
          if self.vm.info.is_hvm():
              # is HVM, so qemu-dm will handle the vfb.
@@ -946,9 +1056,9 @@
          args = [ xen.util.auxbin.pathTo("qemu-dm"),
                   "-M", "xenpv",
                   "-d", "%d" % self.vm.getDomid(),
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
 --- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py	2007-09-25 00:42:39.000000000 -0400
 @@ -689,7 +689,7 @@ class XendConfig(dict):
          self['vtpm_refs'] = cfg.get('vtpm_refs', [])
  
@@ -967,9 +1077,9 @@
                      if key in self['platform']:
                          dev_config.append([key, self['platform'][key]])
  
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
+diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
 --- xen-3.1.0-src.orig/tools/python/xen/xm/create.py	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-24 18:50:44.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xm/create.py	2007-09-25 00:42:39.000000000 -0400
 @@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
              d['type'] = 'sdl'
          for (k,v) in d.iteritems():



From fedora-extras-commits at redhat.com  Tue Sep 25 04:59:16 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 00:59:16 -0400
Subject: rpms/xen/devel xen.spec,1.188,1.189
Message-ID: <200709250459.l8P4xG6u020736@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715

Modified Files:
	xen.spec 
Log Message:
Really fix 32-on-64 fc6 guests this time


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- xen.spec	24 Sep 2007 23:46:30 -0000	1.188
+++ xen.spec	25 Sep 2007 04:58:43 -0000	1.189
@@ -280,6 +280,7 @@
 %changelog
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
 - Fix generation of manual pages (rhbz #250791)
+- Really fix FC-6 32-on-64 guests
 
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-8.fc8
 - Make 32-bit FC-6 guest PVFB work on x86_64 host



From fedora-extras-commits at redhat.com  Tue Sep 25 05:00:50 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 01:00:50 -0400
Subject: rpms/xen/devel xen.spec,1.189,1.190
Message-ID: <200709250500.l8P50obe020849@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20826

Modified Files:
	xen.spec 
Log Message:
Really fix 32-on-64 fc6 guests this time


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- xen.spec	25 Sep 2007 04:58:43 -0000	1.189
+++ xen.spec	25 Sep 2007 05:00:17 -0000	1.190
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html



From fedora-extras-commits at redhat.com  Tue Sep 25 05:18:40 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 01:18:40 -0400
Subject: rpms/firefox/devel firefox-2.0-startup-notify.patch,1.1,1.2
Message-ID: <200709250518.l8P5Ieww027297@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27272

Modified Files:
	firefox-2.0-startup-notify.patch 
Log Message:
Include the re-generated configure script in the patch

firefox-2.0-startup-notify.patch:

Index: firefox-2.0-startup-notify.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-2.0-startup-notify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-2.0-startup-notify.patch	25 Sep 2007 03:36:23 -0000	1.1
+++ firefox-2.0-startup-notify.patch	25 Sep 2007 05:18:33 -0000	1.2
@@ -1,5 +1,178 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=223492
 
+
+Index: configure
+===================================================================
+RCS file: /cvsroot/mozilla/configure,v
+retrieving revision 1.1492.2.121
+diff -d -u -p -r1.1492.2.121 configure
+--- configure	11 Jul 2007 16:44:47 -0000	1.1492.2.121
++++ configure	25 Sep 2007 05:12:51 -0000
+@@ -83,6 +83,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --with-qtdir=\$dir       Specify Qt directory "
+ ac_help="$ac_help
++  --enable-startup-notification       Enable startup-notification support (default: disabled) "
++ac_help="$ac_help
+   --enable-application=APP
+                           Options include:
+                             suite
+@@ -1067,6 +1069,7 @@ GNOMEVFS_VERSION=2.0
+ GNOMEUI_VERSION=2.2.0
+ GCONF_VERSION=1.2.1
+ LIBGNOME_VERSION=2.0
++STARTUP_NOTIFICATION_VERSION=0.8
+ 
+ MISSING_X=
+ for ac_prog in gawk mawk nawk awk
+@@ -12906,6 +12909,137 @@ fi # COMPILE_ENVIRONMENT
+ 
+ 
+ 
++if test "$MOZ_ENABLE_GTK2"
++then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++
++    # Check whether --enable-startup-notification or --disable-startup-notification was given.
++if test "${enable_startup_notification+set}" = set; then
++  enableval="$enable_startup_notification"
++  if test "$enableval" = "yes"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=force
++  elif test "$enableval" = "no"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++  else
++    { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
++    then
++        
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:12938: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
++echo "configure:12982: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
++
++        if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
++echo "configure:12989: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
++echo "configure:12994: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`"
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
++        else
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=""
++            MOZ_STARTUP_NOTIFICATION_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     MOZ_ENABLE_STARTUP_NOTIFICATION=1
++  else
++     
++            if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
++            then
++                { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; }
++            fi
++            MOZ_ENABLE_STARTUP_NOTIFICATION=
++        
++  fi
++
++    fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
++        cat >> confdefs.h <<\EOF
++#define MOZ_ENABLE_STARTUP_NOTIFICATION 1
++EOF
++
++    fi
++
++    TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
++fi
++
++
++
++
++
+ 
+ 
+ 
+@@ -20426,6 +20560,9 @@ s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
+ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
+ s%@HOST_MOC@%$HOST_MOC%g
+ s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
++s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g
++s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g
++s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g
+ s%@TK_CFLAGS@%$TK_CFLAGS%g
+ s%@TK_LIBS@%$TK_LIBS%g
+ s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g
 --- config/autoconf.mk.in	2006-09-14 14:07:03.000000000 -0400
 +++ config/autoconf.mk.in	2007-07-03 18:01:36.000000000 -0400
 @@ -223,6 +223,10 @@



From fedora-extras-commits at redhat.com  Tue Sep 25 06:33:15 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:33:15 -0400
Subject: rpms/python-iniparse/devel .cvsignore, 1.4, 1.5 python-iniparse.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709250633.l8P6XFJ1007800@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7773

Modified Files:
	.cvsignore python-iniparse.spec sources 
Log Message:
updated to release 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2007 10:38:07 -0000	1.4
+++ .cvsignore	25 Sep 2007 06:32:38 -0000	1.5
@@ -1,2 +1 @@
-iniparse-0.2.1.tar.gz
-iniparse-comment.patch
+iniparse-0.2.2.tar.gz


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/python-iniparse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-iniparse.spec	12 Sep 2007 09:48:37 -0000	1.6
+++ python-iniparse.spec	25 Sep 2007 06:32:38 -0000	1.7
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-iniparse
-Version:        0.2.1
-Release:        4%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
-Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 8
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -53,6 +51,9 @@
 
 %changelog
 
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
 * Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
 - Added some logic to get the right python-setuptools buildrequeres
 - based on the fedora version, to make the same spec file useful in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2007 10:38:07 -0000	1.4
+++ sources	25 Sep 2007 06:32:39 -0000	1.5
@@ -1,2 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
-3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:37:26 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:37:26 -0400
Subject: rpms/python-iniparse/F-7 python-iniparse.spec, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <200709250637.l8P6bQ77008010@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7977

Modified Files:
	python-iniparse.spec sources 
Log Message:
updated to released 0.2.2


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/python-iniparse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-iniparse.spec	12 Sep 2007 09:50:34 -0000	1.4
+++ python-iniparse.spec	25 Sep 2007 06:36:51 -0000	1.5
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-iniparse
-Version:        0.2.1
-Release:        4%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
-Patch0:		iniparse-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 8
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q -n iniparse-%{version}
-%patch0 -p0 
 
 %build
 %{__python} setup.py build
@@ -53,6 +51,9 @@
 
 %changelog
 
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
 * Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
 - Added some logic to get the right python-setuptools buildrequeres
 - based on the fedora version, to make the same spec file useful in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2007 10:54:41 -0000	1.4
+++ sources	25 Sep 2007 06:36:51 -0000	1.5
@@ -1,2 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
-3da7ab88e8a20be98184801d6516e16d  iniparse-comment.patch
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:41:36 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:41:36 -0400
Subject: rpms/python-iniparse/FC-6 python-iniparse.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709250641.l8P6fa3n008128@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8093

Modified Files:
	python-iniparse.spec sources 
Log Message:
Updated to release 0.2.2-1


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/FC-6/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:43:22 -0000	1.2
+++ python-iniparse.spec	25 Sep 2007 06:41:02 -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:           python-iniparse
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
@@ -10,7 +10,11 @@
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -24,7 +28,6 @@
 %prep
 %setup -q -n iniparse-%{version}
 
-
 %build
 %{__python} setup.py build
 
@@ -47,6 +50,18 @@
 
 
 %changelog
+
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:43:22 -0000	1.3
+++ sources	25 Sep 2007 06:41:02 -0000	1.4
@@ -1 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:43:11 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 25 Sep 2007 02:43:11 -0400
Subject: rpms/python-iniparse/EL-5 python-iniparse.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200709250643.l8P6hBYt008208@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/python-iniparse/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8184

Modified Files:
	python-iniparse.spec sources 
Log Message:
Updated to release 0.2.2-1


Index: python-iniparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/EL-5/python-iniparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-iniparse.spec	11 Aug 2007 11:44:49 -0000	1.2
+++ python-iniparse.spec	25 Sep 2007 06:42:38 -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:           python-iniparse
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
@@ -10,7 +10,11 @@
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
 BuildRequires: python-setuptools
+%endif
 
 BuildArch: noarch
 
@@ -24,7 +28,6 @@
 %prep
 %setup -q -n iniparse-%{version}
 
-
 %build
 %{__python} setup.py build
 
@@ -47,6 +50,18 @@
 
 
 %changelog
+
+* Tue Sep 25 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.2-1
+- Updated to release 0.2.2
+- removed patch to to fix problems with out commented lines, included in upstream source
+* Wed Sep 12 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-4
+- Added some logic to get the right python-setuptools buildrequeres
+- based on the fedora version, to make the same spec file useful in
+- all fedora releases.
+* Mon Sep 10 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-3
+- Added patch from upstream svn to fix problems with out commented lines.
+* Tue Aug 28 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2.1-2
+- Changed BuildRequires python-setuptools to python-setuptools-devel
 * Tue Aug 7 2007 Paramjit Oberoi <param at cs.wisc.edu> - 0.2.1-1
 - Release 0.2.1
 * Fri Jul 27 2007 Tim Lauridsen <timlau at fedoraproject.org> - 0.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-iniparse/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Aug 2007 11:44:49 -0000	1.3
+++ sources	25 Sep 2007 06:42:38 -0000	1.4
@@ -1 +1 @@
-0d8346528f7d86be4fa713754f8e9b36  iniparse-0.2.1.tar.gz
+5fbd507ab70f20461dd874716ca65604  iniparse-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 06:57:26 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Tue, 25 Sep 2007 02:57:26 -0400
Subject: rpms/syck/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 syck.spec, 1.14,
	1.15
Message-ID: <200709250657.l8P6vQA7008681@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/syck/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8608

Modified Files:
	.cvsignore sources syck.spec 
Log Message:

* Devel spec to F-7
* Update for F-7 (0.55 -> 0.61*)
* Rebuild against new PHP to solve bug #304351



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 08:15:11 -0000	1.2
+++ .cvsignore	25 Sep 2007 06:56:53 -0000	1.3
@@ -1 +1 @@
-syck-0.55.tar.gz
+syck-0.61+svn231+patches.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 08:15:11 -0000	1.2
+++ sources	25 Sep 2007 06:56:53 -0000	1.3
@@ -1 +1 @@
-a57b7c46d81170b9318e2f384f77910c  syck-0.55.tar.gz
+66513c7b458bdadf12c97899eb33be67  syck-0.61+svn231+patches.tar.gz


Index: syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syck/F-7/syck.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- syck.spec	1 Aug 2007 10:46:04 -0000	1.14
+++ syck.spec	25 Sep 2007 06:56:53 -0000	1.15
@@ -1,23 +1,21 @@
-# $Id$
-
 %define			php_extdir %(php-config --extension-dir || echo %{_libdir}/php)
 %{!?php_version:%define php_version %(php-config --version || echo bad)}
 
-Name:			syck
-Summary:		YAML for C, Python, and PHP
+Name:		syck
+Summary:	YAML for C, Python, and PHP
 
-Version:		0.55
-Release:		17%{?dist}
+Version:	0.61
+Release:	2%{?dist}
 
-License:		BSD
-Group:			System Environment/Libraries
-URL:			http://whytheluckystiff.net/syck/
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://whytheluckystiff.net/syck/
 
-Source0:		http://rubyforge.org/frs/download.php/4492/%{name}-%{version}.tar.gz
+Source0:	http://pyyaml.org/download/pysyck/syck-%{version}+svn231+patches.tar.gz
 
-Patch0:			syck-0.55-libtool.patch
+Patch0:		syck-0.55-libtool.patch
 
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk bison flex libtool
 BuildRequires:	php-devel
 BuildRequires:	python-devel
@@ -36,10 +34,10 @@
 serialization, configuration settings, log files, Internet messaging and
 filtering. 
 
-%package		php
-Summary:		YAML module for php
-Group:			Development/Languages
-Requires:		php = %{php_version}
+%package	php
+Summary:	YAML module for php
+Group:		Development/Languages
+Requires:	php = %{php_version}
 
 %description	php
 Syck is an extension for reading and writing YAML swiftly in popular scripting
@@ -57,11 +55,9 @@
 
 The %{name}-php package contains the syck php extension.
 
-%package		python
-Summary:		YAML module for python
-Group:			Development/Languages
-#Requires:		python
-#Requires:		python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
+%package	python
+Summary:	YAML module for python
+Group:		Development/Languages
 
 %description	python
 Syck is an extension for reading and writing YAML swiftly in popular scripting
@@ -79,11 +75,11 @@
 
 The %{name}-python package contains the syck php extension.
 
-%package devel
+%package	devel
 Summary:	Static libraries and headers for developing with Syck
 Group:		Development/Libraries
 Requires:	syck = %{version}-%{release}
-%description devel
+%description	devel
 Syck is an extension for reading and writing YAML swiftly in popular scripting
 languages. As Syck loads the YAML, it stores the data directly in your
 language's symbol table. This means speed. This means power. This means Do not
@@ -101,7 +97,7 @@
 Syck.
 
 %prep
-%setup -q
+%setup -q -n syck-0.61+svn231+patches
 %patch0 -p1
 
 %build
@@ -185,9 +181,17 @@
 %{php_extdir}/*.so
 
 %changelog
-* Wed Aug 01 2007 Oliver Falk <oliver at linux-kernel.at>     - 0.55-17
+* Thu Sep 20 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-2
 - Rebuild against new PHP
 
+* Tue Aug 21 2007 Oliver Falk <oliver at linux-kernel.at>	- 0.61-1
+- Update
+- Clean up spec a bit
+- Rebuild to make Jesse happy
+
+* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> - 0.55-17
+- Rebuild against new PHP, again.
+
 * Thu May 24 2007 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.55-16
 - Rebuild against new PHP
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:07:54 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:07:54 -0400
Subject: rpms/stormbaancoureur/devel stormbaancoureur.desktop, 1.1,
	1.2 stormbaancoureur.spec, 1.3, 1.4
Message-ID: <200709250707.l8P77sNj015036@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/stormbaancoureur/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14966

Modified Files:
	stormbaancoureur.desktop stormbaancoureur.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-2
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: stormbaancoureur.desktop
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stormbaancoureur.desktop	7 Aug 2007 13:46:00 -0000	1.1
+++ stormbaancoureur.desktop	25 Sep 2007 07:07:22 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Stormbaan Coureur
 Comment=Simulated obstacle course for automobiles
-Exec=stormbaancoureur
+Exec=stormbaancoureur-wrapper
 Icon=stormbaancoureur.png
 Terminal=false
 StartupNotify=false


Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stormbaancoureur.spec	16 Aug 2007 21:57:26 -0000	1.3
+++ stormbaancoureur.spec	25 Sep 2007 07:07:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           stormbaancoureur
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  plib-devel ode-devel freeglut-devel desktop-file-utils
 BuildRequires:  alsa-lib-devel
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 Provides:       sturmbahnfahrer = %{version}-%{release}
 Obsoletes:      sturmbahnfahrer < %{version}-%{release}
 
@@ -48,6 +48,7 @@
 # move the binary from /usr/games to /usr/bin
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -81,13 +82,16 @@
 %doc src-%{name}/JOYSTICKS src-%{name}/LICENCE src-%{name}/README
 %doc src-%{name}/TODO src-%{name}/%{name}.keys.example
 %doc src-%{name}/debian/changelog
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-2
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Thu Aug 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5.1-1
 - New upstream bugfix release 1.5.1
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:07:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:07:59 -0400
Subject: rpms/trackballs/devel trackballs.desktop, 1.2, 1.3 trackballs.spec, 
	1.5, 1.6
Message-ID: <200709250707.l8P77x5e015043@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/trackballs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14998

Modified Files:
	trackballs.desktop trackballs.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: trackballs.desktop
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trackballs.desktop	10 Mar 2007 09:49:36 -0000	1.2
+++ trackballs.desktop	25 Sep 2007 07:07:27 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Trackballs
 Comment=Steer a marble ball through a labyrinth
-Exec=trackballs
+Exec=trackballs-wrapper
 Icon=trackballs.png
 Terminal=false
 Type=Application


Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trackballs.spec	15 Aug 2007 13:25:15 -0000	1.5
+++ trackballs.spec	25 Sep 2007 07:07:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           trackballs
 Version:        1.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Trackballs is a game in which you steer a marble ball through tracks of varying
@@ -39,6 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # we use the ALT (homedir based) highscore location
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/highScores
 %find_lang %{name}
@@ -70,7 +71,7 @@
 %files -f %{name}.lang
 %doc AUTHORS COPYING ChangeLog FAQ README TODO
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -78,6 +79,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:08:02 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:08:02 -0400
Subject: rpms/duel3/devel duel3.desktop,1.2,1.3 duel3.spec,1.3,1.4
Message-ID: <200709250708.l8P782xW015078@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/duel3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14978

Modified Files:
	duel3.desktop duel3.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.4.20060225
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: duel3.desktop
===================================================================
RCS file: /cvs/extras/rpms/duel3/devel/duel3.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- duel3.desktop	10 Mar 2007 10:10:42 -0000	1.2
+++ duel3.desktop	25 Sep 2007 07:07:24 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Duel 3
 Comment=One on one spaceship duel in a 2D arena
-Exec=duel3
+Exec=duel3-wrapper
 Icon=duel3.png
 Terminal=false
 StartupNotify=false


Index: duel3.spec
===================================================================
RCS file: /cvs/extras/rpms/duel3/devel/duel3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- duel3.spec	6 Aug 2007 11:44:51 -0000	1.3
+++ duel3.spec	25 Sep 2007 07:07:24 -0000	1.4
@@ -1,20 +1,20 @@
 %define snapshot 20060225
 Name:           duel3
 Version:        0.1
-Release:        0.3.%{snapshot}%{?dist}
+Release:        0.4.%{snapshot}%{?dist}
 Summary:        One on one spaceship duel in a 2D arena
 Group:          Amusements/Games
 License:        BSD
 URL:            http://ts-games.com/duel3.php
-Source0:        http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_src.zip
-Source1:        http://dl.sf.net/sourceforge/%{name}/Duel3_%{snapshot}_bin.zip
+Source0:        http://downloads.sourceforge.net/%{name}/Duel3_%{snapshot}_src.zip
+Source1:        http://downloads.sourceforge.net/%{name}/Duel3_%{snapshot}_bin.zip
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 Source4:        music-credits.txt
 Patch0:         Duel3_20060225-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alleggl-devel dumb-devel libGLU-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 The sudden attack from the Martain Rim miners caught the Earth by suprise,
@@ -57,6 +57,7 @@
 pushd Source
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 popd
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -88,13 +89,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Source/readme.txt license.txt music-credits.txt
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.4.20060225
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1-0.3.20060225
 - Fixup .desktop file categories for games-menus usage
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:21:12 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:21:12 -0400
Subject: rpms/ballbuster/devel ballbuster.desktop, 1.2, 1.3 ballbuster.spec, 
	1.2, 1.3
Message-ID: <200709250721.l8P7LCru015403@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ballbuster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15361

Modified Files:
	ballbuster.desktop ballbuster.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: ballbuster.desktop
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/ballbuster.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ballbuster.desktop	5 Aug 2007 18:39:36 -0000	1.2
+++ ballbuster.desktop	25 Sep 2007 07:20:40 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Ball: Buster
 Comment=Move the paddle to bounce the ball and break all the bricks
-Exec=ballbuster
+Exec=ballbuster-wrapper
 Icon=ballbuster.png
 Terminal=false
 StartupNotify=false


Index: ballbuster.spec
===================================================================
RCS file: /cvs/extras/rpms/ballbuster/devel/ballbuster.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ballbuster.spec	5 Aug 2007 18:39:36 -0000	1.2
+++ ballbuster.spec	25 Sep 2007 07:20:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ballbuster
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Move the paddle to bounce the ball and break all the bricks
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,7 +10,7 @@
 Patch0:         ballbuster-unix.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib-devel desktop-file-utils ImageMagick
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Game inspired by one of the great classics. The purpose of the game is to
@@ -35,6 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -66,13 +67,16 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING credits.txt ExtremeUpdates.txt manual.html html
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Sun Aug  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:21:17 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Sep 2007 03:21:17 -0400
Subject: rpms/methane/devel methane.desktop,1.1,1.2 methane.spec,1.2,1.3
Message-ID: <200709250721.l8P7LHB8015410@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/methane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15383

Modified Files:
	methane.desktop methane.spec 
Log Message:
* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
- Use opengl-games-utils wrapper to show error dialog when DRI is missing



Index: methane.desktop
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- methane.desktop	14 Feb 2007 07:57:12 -0000	1.1
+++ methane.desktop	25 Sep 2007 07:20:44 -0000	1.2
@@ -72,7 +72,7 @@
 GenericName[zh_TW]=????????????
 GenericName[zu]=Umdlalo womhhume
 Comment=Converted from the Amiga by its original author
-Exec=methane
+Exec=methane-wrapper
 Icon=methane
 Terminal=false
 StartupNotify=false


Index: methane.spec
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- methane.spec	15 Aug 2007 07:30:07 -0000	1.2
+++ methane.spec	25 Sep 2007 07:20:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           methane
 Version:        1.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Super Methane Brothers
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,7 +15,7 @@
 Patch2:         methane-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib-devel mikmod-devel desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 Super Methane Brothers is a platform game converted from the Amiga by
@@ -45,9 +45,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_var}/games
 install -m 755 source/linux/%{name} $RPM_BUILD_ROOT%{_bindir}
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 touch $RPM_BUILD_ROOT%{_var}/games/%{name}scores
 
-
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -82,6 +82,7 @@
 %defattr(-,root,root,-)
 %doc authors copying docs history i_linux readme todo
 %attr(2755,root,games) %{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
 %verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_var}/games/%{name}scores
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/applications/fedora-%{name}-help.desktop
@@ -90,6 +91,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-2
 - Update License tag for new Licensing Guidelines compliance
 



From fedora-extras-commits at redhat.com  Tue Sep 25 07:33:51 2007
From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova))
Date: Tue, 25 Sep 2007 03:33:51 -0400
Subject: rpms/aspell-fo/devel aspell-fo.spec,1.12,1.13
Message-ID: <200709250733.l8P7XpEO015682@cvs-int.fedora.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell-fo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15651

Modified Files:
	aspell-fo.spec 
Log Message:
increase epoch



Index: aspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aspell-fo.spec	17 Sep 2007 09:21:50 -0000	1.12
+++ aspell-fo.spec	25 Sep 2007 07:33:18 -0000	1.13
@@ -3,9 +3,9 @@
 %define aspellversion 5
 Summary: Faeroese dictionaries for Aspell
 Name: aspell-%{lang}
-Epoch: 50
+Epoch: 51
 Version: 0.2.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Applications/Text
 URL: http://aspell.net/
@@ -39,7 +39,10 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
-* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-1
+* Tue Sep 25 2007 Ivana Varekova <varekova at redhat.com> - 51:0.2.16-7
+- increase epoch
+
+* Mon Sep 17 2007 Ivana Varekova <varekova at redhat.com> - 50:0.2.16-6
 - update to 0.2.16
 
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:0.51-6



From fedora-extras-commits at redhat.com  Tue Sep 25 08:25:49 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 25 Sep 2007 04:25:49 -0400
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.32,1.33
Message-ID: <200709250825.l8P8Pn4i023403@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.7-57.fc6


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sysprof-kmod.spec	12 Sep 2007 22:48:11 -0000	1.32
+++ sysprof-kmod.spec	25 Sep 2007 08:25:14 -0000	1.33
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-49.fc6}
+%{!?kversion: %define kversion 2.6.22.7-57.fc6}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Tue Sep 25 08:34:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 25 Sep 2007 04:34:30 -0400
Subject: rpms/crontabs/devel crontabs.spec,1.21,1.22 run-parts,1.5,1.6
Message-ID: <200709250834.l8P8YUWJ023735@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23710

Modified Files:
	crontabs.spec run-parts 
Log Message:
Fix problem - cron.hourly, daily not running.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- crontabs.spec	30 Aug 2007 12:32:56 -0000	1.21
+++ crontabs.spec	25 Sep 2007 08:33:58 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
@@ -50,6 +50,10 @@
 %config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Tue Sep 25 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-18
+- cron.{hourly, daily,...} run ok
+- rhbz#296741
+
 * Thu Aug 30 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-17
 - better solution of configuration script
 


Index: run-parts
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/run-parts,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- run-parts	27 Aug 2007 06:36:22 -0000	1.5
+++ run-parts	25 Sep 2007 08:33:58 -0000	1.6
@@ -1,9 +1,4 @@
 #!/bin/bash
-# if cron.daily was run today
-AUX1=`cat /var/spool/anacron/cron.daily`
-AUX2=`date +%Y%m%d`
-[ "$AUX1" == $AUX2 ] || exit 0
-
 # run-parts - concept taken from Debian
 
 # keep going when something fails



From fedora-extras-commits at redhat.com  Tue Sep 25 08:55:08 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Tue, 25 Sep 2007 04:55:08 -0400
Subject: rpms/anacron/devel anacron.spec,1.41,1.42
Message-ID: <200709250855.l8P8t8rv024234@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24206

Modified Files:
	anacron.spec 
Log Message:
- cron.{hourly,daily} work correct -> remove checking whether
  cron.daily has been run
- persist: run pc between midnight and 4:02 -> cron.daily run twice.
- rhbz#296741




Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- anacron.spec	31 Aug 2007 07:27:32 -0000	1.41
+++ anacron.spec	25 Sep 2007 08:54:37 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -13,7 +13,6 @@
 Patch2: anacron-2.3-fdclose.patch
 Patch3: anacron-2.3-pic.patch
 Patch4: anacron-2.3-memleaking.patch
-Patch5: anacron-script.patch
 
 Requires: crontabs
 Requires: initscripts
@@ -45,7 +44,6 @@
 %patch2 -p1 -b .fdclose
 %patch3 -p1 -b .pic
 %patch4 -p1 -b .memleaking
-%patch5 -p1 -b .script
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -97,7 +95,6 @@
 %doc COPYING README
 %config(noreplace) /etc/anacrontab
 %dir /var/spool/anacron/
-#%config(noreplace) /etc/rc.d/init.d/*
 %dir /etc/rc.d/init.d/*
 /%{_mandir}/man5/*
 /%{_mandir}/man8/*
@@ -107,6 +104,12 @@
 %attr(755,root,root) %dir /etc/cron.weekly/0anacron
 
 %changelog
+* Tue Sep 25 2007 Marcela Maslanova <mmaslano at redhat.com> 2.3-56
+- cron.{hourly,daily} work correct -> remove checking whether
+  cron.daily has been run
+- persist: run pc between midnight and 4:02 -> cron.daily run twice.
+- rhbz#296741
+
 * Fri Aug 31 2007 Marcela Maslanova <mmaslano at redhat.com> 2.3-55
 - change chkconfig --add, because it wasn't running after 
     fresh install #267801



From fedora-extras-commits at redhat.com  Tue Sep 25 09:01:58 2007
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Sep 2007 05:01:58 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.61,1.62
Message-ID: <200709250901.l8P91wZl030565@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/alsa-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24487

Modified Files:
	alsa-utils.spec 
Log Message:
Cosmetic cleanups only : Indentation and consistency.



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- alsa-utils.spec	24 Sep 2007 15:06:48 -0000	1.61
+++ alsa-utils.spec	25 Sep 2007 09:01:22 -0000	1.62
@@ -1,25 +1,25 @@
-%define 	prever		rc1
-%define 	prever_dot	.rc1
+%define  prever         rc1
+%define  prever_dot     .rc1
 
-Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
-Name: 		alsa-utils
-Version: 	1.0.15
-Release: 	0.3%{?prever_dot}%{?dist}
-License: 	GPLv2+
-Group: 		Applications/Multimedia
-URL: 		http://www.alsa-project.org/
-Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
-Source2:	salsa.c
-Source3: 	alsacard.c
-Source4: 	alsaunmute.c
-Source10:	alsa.rules
-Patch:		alsa-utils-1.0.14-alsaconf.patch
-Patch1:         alsa-utils-1.0.14-statedir.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	alsa-lib-devel >= %{version}
-BuildRequires:	ncurses-devel
-BuildRequires:	gettext-devel
-Conflicts:	udev < 062
+Summary: Advanced Linux Sound Architecture (ALSA) utilities
+Name:    alsa-utils
+Version: 1.0.15
+Release: 0.3%{?prever_dot}%{?dist}
+License: GPLv2+
+Group:   Applications/Multimedia
+URL:     http://www.alsa-project.org/
+Source:  ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
+Source2: salsa.c
+Source3: alsacard.c
+Source4: alsaunmute.c
+Source10: alsa.rules
+Patch0:  alsa-utils-1.0.14-alsaconf.patch
+Patch1:  alsa-utils-1.0.14-statedir.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: alsa-lib-devel >= %{version}
+BuildRequires: ncurses-devel
+BuildRequires: gettext-devel
+Conflicts: udev < 062
 
 %description
 This package contains command line utilities for the Advanced Linux Sound
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch 	-p1
+%patch0 -p1
 %patch1 -p1 -b .statedir
 
 %build
@@ -38,7 +38,7 @@
 %{__cc} $RPM_OPT_FLAGS -o alsaunmute %{SOURCE4} -lasound
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -73,7 +73,7 @@
 %{_datadir}/alsa/
 %{_datadir}/sounds/
 %{_mandir}/man?/*
-%dir /var/lib/alsa
+%dir /var/lib/alsa/
 %ghost /var/lib/alsa/asound.state
 
 



From fedora-extras-commits at redhat.com  Tue Sep 25 09:15:50 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 05:15:50 -0400
Subject: comps/po gu.po,1.5,1.6
Message-ID: <200709250915.l8P9Foqb030817@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30795/po

Modified Files:
	gu.po 
Log Message:
Updated Gujarati Translation


Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gu.po	17 Sep 2007 19:22:12 -0000	1.5
+++ gu.po	25 Sep 2007 09:15:20 -0000	1.6
@@ -1,24 +1,23 @@
-# translation of gu1.po to Gujarati
-# translation of gu.po to Gujarati
+# translation of comps.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.
+#
 # Automatically generated, 2004.
 # Ankit Patel <ankit at redhat.com>, 2004, 2005, 2006, 2007.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: gu\n"
+"Project-Id-Version: comps.gu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-02-26 11:10+0530\n"
+"PO-Revision-Date: 2007-09-19 13:01+0530\n"
 "Last-Translator: Ankit Patel <ankit at redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu 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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -192,10 +191,8 @@
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
@@ -265,8 +262,7 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-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-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
@@ -325,8 +321,7 @@
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53
@@ -401,41 +396,32 @@
 
 #: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "??? ????????? ??? ??????????????? ???????????????????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????? ??????."
+msgstr "?????????????????? ??????????????? ???????????? ??? ????????? ??? ????????????????????? ???????????????????????? ???????????? ??????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
-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-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
-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-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
-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-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
@@ -498,19 +484,16 @@
 msgstr "????????? ????????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
-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 "????????? ??????????????????????????? ???????????? ??? ????????? ??? ??????????????? ????????? ???????????????????????? ???????????? ??????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -533,23 +516,20 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
@@ -628,9 +608,8 @@
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
@@ -657,9 +636,8 @@
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "??????????????? ????????????"
+msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
@@ -690,16 +668,14 @@
 msgstr "???????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "???????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
@@ -722,9 +698,8 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
@@ -735,14 +710,12 @@
 msgstr "???????????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "????????? ????????????"
+msgstr "????????? ????????????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
@@ -769,9 +742,8 @@
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -794,9 +766,8 @@
 msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "???????????????????????? ????????????"
+msgstr "???????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
@@ -831,9 +802,8 @@
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
@@ -860,9 +830,8 @@
 msgstr "????????????????????? ???????????? ???????????? ?????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 msgid ""
@@ -893,9 +862,8 @@
 msgstr "????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "???????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -914,18 +882,15 @@
 msgstr "Eclipse Integrated Development Environment."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+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
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+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
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??? ?????????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????? DHCP, ????????????????????? ????????? NIS ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
@@ -969,8 +934,7 @@
 "?????????????????? ??????, ?????????????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "??? ???????????????????????? ????????? ???????????? ?????????????????? ?????? DNS ????????? ???????????? (BIND) ???????????????????????? ????????????????????? ????????? ??????."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
@@ -988,14 +952,12 @@
 msgstr "??? ??????????????? ????????? Postgresql ???????????? ?????????????????? ?????????????????? ??????????????? ??????."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "??????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1014,18 +976,16 @@
 msgstr "????????????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "???????????? ????????????"
+msgstr "??????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "??????????????? ????????????"
+msgstr "??????????????????????????? ????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1053,346 +1013,41 @@
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "????????????????????????????????? ???????????????????????? ?????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "???????????????"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "???????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????????????????? ?????? ???????????? ?????????????????? ???????????? ?????????????????? ??????????????? ??????????????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "Eclipse Integrated Development Environment."
+msgstr "Eclipse ?????????????????? Integrated Development Environments."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "??????????????? ???????????????"
 
 #: ../comps-f8.xml.in.h:99
-#, fuzzy
 msgid "Low Saxon Support"
-msgstr "????????? ????????????"
+msgstr "???????????? ?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????????????????? ????????????"
+msgstr "?????????????????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????????? ????????????"
+msgstr "?????????????????? ????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ????????????"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "British Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "??????????????????????????????????????? ????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????????????????? ??????????????????????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "??????????????????????????????????????? ???????????? ???????????? ????????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "??????????????????????????? ????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "???????????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "ISO8859-14 ????????????"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "ISO8859-15 ????????????"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "ISO8859-2 ????????????"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "ISO8859-9 ????????????"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "??????????????? ??????????????? ????????????????????? ???????????? ???????????? ??? ?????????????????? ????????????????????? ?????????."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ???????????????????????? ????????????????????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "??????????????? ???????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "????????????????????? ???????????????????????? ??????????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "x86 ?????????????????????????????? ???????????? ???????????????????????? ??????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????????????????? ????????????????????? ??????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ?????????????????????"
-
-#~ msgid "Server"
-#~ msgstr "???????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????-???????????????????????? ?????????????????? ???????????? ?????????????????? ?????????????????????????????? ????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "????????????????????? ????????????"
-
-#~ msgid "System"
-#~ msgstr "??????????????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ???????????? ??????????????????."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "??? ?????????????????? ???????????? IMAP ???????????? ?????????????????????????????? ???????????? ??????????????? ????????????????????????????????? ???????????? ???????????? ????????????????????? ????????? ??????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr "??? ?????????????????? Red Hat Enterprise Linux ?????? ???????????? ????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ??????."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "??????????????????????????? ????????????????????? ??????????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "????????????????????? ??????????????????????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc64 ???????????????????????? ??????????????????????????????????????? ????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "x86 ?????????????????? ??????????????????????????????????????? ????????????????????? ???????????? ????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ?????????????????? ??????????????????????????????????????? ????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "????????????????????????????????? ??????????????????????????????"
-
-#~ msgid "English"
-#~ msgstr "????????????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????????"
-
-#~ msgid "German"
-#~ msgstr "???????????????"
-
-#~ msgid "Italian"
-#~ msgstr "????????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ????????????????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "?????????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????????????????? ??????????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????????"
-
-#~ msgid "Korean"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "????????? ????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????????????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "???????????????????????? ????????????"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "ppc64 ?????????????????? ??????????????????????????????????????? ????????????????????? ????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "???????????????"
-
-#~ 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."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ?????????????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr "??? ????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????? ????????????????????? ??????????????? ??????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????????????????? ????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "?????????????????? ?????? ?????? ????????????????????? ?????????????????? ???????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "?????????????????? ?????? ?????? ??????-????????? GFS ???????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "?????? ????????? GFS ????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "??? ?????????????????? ???????????????????????? ???????????????????????? ???????????? ???????????????????????? ???????????? ???????????? ???????????? ??????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Java ?????????????????? ??????????????????????????? ????????? ??????????????? ?????????"
-
-#~ msgid "Misc"
-#~ msgstr "?????????????????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "????????????????????? ??????????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "?????????????????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "????????????????????????????????? ??????????????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr "?????????????????? ?????? ?????? Red Hat Enterprise Linux ???????????? ????????????????????? ?????????????????? ???????????? ???????????? ??????"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "??????????????????????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "?????????????????????????????? ?????????????????????????????? ????????? ???????????????????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "????????????????????????????????????????????? ????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????????? ?????????????????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????????? ????????????????????????????????? ??????????????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Multilib ??????????????????????????? ??????????????????"
+msgstr "???????????? ?????????????????? ????????? ?????????????????? ??????????????? ??????????????????"
 
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "?????????????????? ?????? ?????? ???????????????????????? ????????????????????????????????? ???????????? ??????????????? ??????????????? ???????????? ??????."



From fedora-extras-commits at redhat.com  Tue Sep 25 09:17:32 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 05:17:32 -0400
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.9-getgrouplist.patch, NONE, 
	1.1 cyrus-imapd-2.3.9-implicitdecl.patch, NONE,
	1.1 cyrus-imapd-2.3.9-myfatal.patch, NONE, 1.1 cyrus-imapd.spec,
	1.31, 1.32 cyrus-imapd-2.3.8-getgrouplist.patch, 1.2, NONE
Message-ID: <200709250917.l8P9HW2E030872@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30841

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.9-getgrouplist.patch 
	cyrus-imapd-2.3.9-implicitdecl.patch 
	cyrus-imapd-2.3.9-myfatal.patch 
Removed Files:
	cyrus-imapd-2.3.8-getgrouplist.patch 
Log Message:
* Sun Sep 23 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-7
- updated the getgrouplist patch
- fixed a few undeclared functions (and int to pointer conversions)


cyrus-imapd-2.3.9-getgrouplist.patch:

--- NEW FILE cyrus-imapd-2.3.9-getgrouplist.patch ---
--- cyrus/lib/auth_unix.c	2007/02/13 16:42:49	1.41
+++ cyrus/lib/auth_unix.c	2007/09/17 14:36:40	1.45
@@ -41,7 +41,7 @@
  */
 
 /*
- * $Id: auth_unix.c,v 1.41 2007/02/13 16:42:49 murch Exp $
+ * $Id: auth_unix.c,v 1.45 2007/09/17 14:36:40 murch Exp $
  */
 
 #include <config.h>
@@ -224,6 +224,10 @@ static struct auth_state *mynewstate(con
     struct passwd *pwd;
     struct group *grp;
     char **mem;
+#ifdef HAVE_GETGROUPLIST
+    gid_t gid, *groupids = NULL;
+    int ret, ngroups = 0;
+#endif
 
     identifier = mycanonifyid(identifier, 0);
     if (!identifier) return 0;
@@ -239,7 +243,48 @@ static struct auth_state *mynewstate(con
 	return newstate;
 
     pwd = getpwnam(identifier);
-	
+
+#ifdef HAVE_GETGROUPLIST
+    gid = pwd ? pwd->pw_gid : (gid_t) -1;
+
+    /* get number of groups user is member of into ngroups */
+    getgrouplist(identifier, gid, NULL, &ngroups);
+
+    /* get the actual group ids */
+    do {
+	groupids = (gid_t *)xrealloc((gid_t *)groupids,
+				     ngroups * sizeof(gid_t));
+
+	newstate->ngroups = ngroups; /* copy of ngroups for comparision */
+	ret = getgrouplist(identifier, gid, groupids, &ngroups);
+	/*
+	 * This is tricky. We do this as long as getgrouplist tells us to
+	 * realloc _and_ the number of groups changes. It tells us to realloc
+	 * also in the case of failure...
+	 */
+    } while (ret != -1 && ngroups != newstate->ngroups);
+
+    if (ret == -1) {
+	newstate->ngroups = 0;
+	newstate->group = NULL;
+	goto err;
+    }
+
+    newstate->ngroups = 0;
+    newstate->group = (char **)xmalloc(ngroups * sizeof(char *));
+    while (ngroups--) {
+	if (pwd || groupids[ngroups] != gid) {
+	    if ((grp = getgrgid(groupids[ngroups]))) {
+		newstate->ngroups++;
+		newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+	    }
+	}
+    }
+
+err:
+    if (groupids) free(groupids);
+
+#else /* !HAVE_GETGROUPLIST */
     setgrent();
     while ((grp = getgrent())) {
 	for (mem = grp->gr_mem; *mem; mem++) {
@@ -254,6 +299,8 @@ static struct auth_state *mynewstate(con
 	}
     }
     endgrent();
+#endif /* HAVE_GETGROUPLIST */
+
     return newstate;
 }
 

cyrus-imapd-2.3.9-implicitdecl.patch:

--- NEW FILE cyrus-imapd-2.3.9-implicitdecl.patch ---
--- cyrus-imapd-2.3.9/imap/tls_prune.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/tls_prune.c	2007-09-18 15:48:46.000000000 +0200
@@ -49,6 +49,7 @@
 
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "tls.h"
 #include "xmalloc.h"
 
--- cyrus-imapd-2.3.9/imap/sync_client.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_client.c	2007-09-18 15:39:44.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/protocol.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/protocol.c	2007-09-18 15:39:09.000000000 +0200
@@ -49,6 +49,8 @@
 
 #include "protocol.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 static char *imap_parsemechlist(const char *str, struct protocol_t *prot)
 {
--- cyrus-imapd-2.3.9/imap/ipurge.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ipurge.c	2007-09-18 15:48:26.000000000 +0200
@@ -61,6 +61,7 @@
 
 /* cyrus includes */
 #include "global.h"
+#include "util.h"
 #include "sysexits.h"
 #include "exitcodes.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/cyrdump.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/cyrdump.c	2007-09-18 15:48:30.000000000 +0200
@@ -54,6 +54,7 @@
 #include "assert.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "imapd.h"
 #include "imap_err.h"
 #include "imapurl.h"
--- cyrus-imapd-2.3.9/imap/fetchnews.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/fetchnews.c	2007-09-18 15:48:50.000000000 +0200
@@ -60,10 +60,13 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "gmtoff.h"
 #include "lock.h"
 #include "prot.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* global state */
 const int config_need_data = 0;
--- cyrus-imapd-2.3.9/imap/sync_server.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_server.c	2007-09-18 15:40:02.000000000 +0200
@@ -94,6 +94,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sync_support.h"
 #include "sync_commit.h"
--- cyrus-imapd-2.3.9/imap/ctl_mboxlist.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/ctl_mboxlist.c	2007-09-18 15:48:35.000000000 +0200
@@ -77,6 +77,7 @@
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "global.h"
+#include "util.h"
 #include "libcyr_cfg.h"
 #include "mboxlist.h"
 #include "mupdate.h"
--- cyrus-imapd-2.3.9/imap/sync_support.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_support.c	2007-09-18 15:39:55.000000000 +0200
@@ -71,6 +71,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/squatter.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/squatter.c	2007-09-18 15:48:39.000000000 +0200
@@ -84,6 +84,7 @@
 #include "assert.h"
 #include "mboxlist.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "imap_err.h"
 #include "mailbox.h"
--- cyrus-imapd-2.3.9/imap/autosieve.c.implicitdecl	2007-09-18 15:42:01.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-18 15:39:14.000000000 +0200
@@ -19,6 +19,9 @@
 
 #include "global.h"
 #include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/imap/arbitron.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/arbitron.c	2007-09-18 15:48:43.000000000 +0200
@@ -59,6 +59,7 @@
 
 #include "assert.h"
 #include "global.h"
+#include "util.h"
 #include "exitcodes.h"
 #include "hash.h"
 #include "imap_err.h"
--- cyrus-imapd-2.3.9/imap/mupdate.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/mupdate.c	2007-09-18 15:39:34.000000000 +0200
@@ -87,6 +87,8 @@
 #include "util.h"
 #include "version.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* Sent to clients that we can't accept a connection for. */
 static const char SERVER_UNABLE_STRING[] = "* BYE \"Server Unable\"\r\n";
--- cyrus-imapd-2.3.9/imap/make_md5.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/make_md5.c	2007-09-18 15:48:54.000000000 +0200
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "global.h"
+#include "util.h"
 #include "assert.h"
 #include "mboxlist.h"
 #include "exitcodes.h"
--- cyrus-imapd-2.3.9/imap/sync_commit.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/sync_commit.c	2007-09-18 15:40:08.000000000 +0200
@@ -69,6 +69,8 @@
 #include "mailbox.h"
 #include "quota.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "acl.h"
 #include "seen.h"
 #include "mboxname.h"
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.implicitdecl	2007-09-18 15:27:37.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-18 15:27:48.000000000 +0200
@@ -20,6 +20,7 @@
 #include "global.h"
 
 #include "util.h"
+#include "xmalloc.h"
 #include "mailbox.h"
 #include "imap_err.h"
 #include "sieve_interface.h"
--- cyrus-imapd-2.3.9/timsieved/timsieved.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/timsieved.c	2007-09-18 15:40:35.000000000 +0200
@@ -73,6 +73,8 @@
 #include "prot.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "exitcodes.h"
 #include "iptostring.h"
 #include "global.h"
--- cyrus-imapd-2.3.9/timsieved/actions.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/actions.c	2007-09-18 15:40:25.000000000 +0200
@@ -69,6 +69,8 @@
 #include "global.h"
 #include "libconfig.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "sieve_interface.h"
 
 #include "codes.h"
--- cyrus-imapd-2.3.9/timsieved/parser.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/timsieved/parser.c	2007-09-18 15:40:41.000000000 +0200
@@ -64,6 +64,8 @@
 #include "mboxname.h"
 #include "mboxlist.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 #include "prot.h"
 #include "tls.h"
 #include "lex.h"
--- cyrus-imapd-2.3.9/master/cyrusMasterMIB.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/master/cyrusMasterMIB.c	2007-09-18 15:39:06.000000000 +0200
@@ -52,6 +52,8 @@
 
 #include "master.h"
 #include "../imap/version.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* 
  * cyrusMasterMIB_variables_oid:
--- cyrus-imapd-2.3.9/sieve/interp.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/interp.c	2007-09-18 15:38:40.000000000 +0200
@@ -33,6 +33,8 @@
 #include <string.h>
 
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #include "sieve_interface.h"
 #include "interp.h"
--- cyrus-imapd-2.3.9/sieve/addr.y.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/sieve/addr.y	2007-09-18 15:38:45.000000000 +0200
@@ -37,6 +37,8 @@
 #include "addr.h"
 #include "script.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
     
 int yyerror(char *msg);
 extern int yylex(void);
--- cyrus-imapd-2.3.9/imtest/imtest.c.implicitdecl	2007-09-18 15:36:52.000000000 +0200
+++ cyrus-imapd-2.3.9/imtest/imtest.c	2007-09-18 15:40:14.000000000 +0200
@@ -82,6 +82,8 @@
 #include "imparse.h"
 #include "iptostring.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
--- cyrus-imapd-2.3.9/ptclient/ptexpire.c.implicitdecl	2007-09-18 15:47:55.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ptexpire.c	2007-09-18 15:48:57.000000000 +0200
@@ -65,6 +65,7 @@
 #include "cyrusdb.h"
 #include "exitcodes.h"
 #include "global.h"
+#include "util.h"
 #include "libconfig.h"
 #include "lock.h"
 #include "xmalloc.h"
--- cyrus-imapd-2.3.9/ptclient/ldap.c.implicitdecl	2007-09-18 15:49:48.000000000 +0200
+++ cyrus-imapd-2.3.9/ptclient/ldap.c	2007-09-18 15:40:19.000000000 +0200
@@ -61,6 +61,9 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 
+/* Functions like ldap_bind() have been deprecated in OpenLDAP 2.3 */
+#define LDAP_DEPRECATED 1
+
 #include <ldap.h>
 #include <lber.h>
 
@@ -74,6 +77,8 @@
 #include "auth_pts.h"
 #include "strhash.h"
 #include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
 
 /* xxx this just uses the UNIX canonicalization semantics, which is
  * most likely wrong */

cyrus-imapd-2.3.9-myfatal.patch:

--- NEW FILE cyrus-imapd-2.3.9-myfatal.patch ---
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-23 16:54:54.000000000 +0200
@@ -37,7 +37,7 @@
 
 static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
 
@@ -68,7 +68,7 @@
     extern char *optarg;
     char sieve_tmpname[MAX_MAILBOX_NAME+1];
 
-    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+    if (geteuid() == 0) my_fatal("must run as the Cyrus user", EC_USAGE);
 
     while((opt = getopt(argc, argv, "C:i:o:")) != EOF) {
         switch (opt) {
@@ -218,7 +218,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 extern sieve_vacation_t vacation2;/* = {
@@ -234,7 +234,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }
 
--- cyrus-imapd-2.3.9/imap/autosieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-23 16:37:27.000000000 +0200
@@ -35,7 +35,7 @@
 static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
 int autoadd_sieve(char *userid, const char *source_script);
 
-static void fatal(const char *s, int code);
+static void my_fatal(const char *s, int code);
 static void foo(void);
 static int sieve_notify(void *ac __attribute__((unused)),
                         void *interp_context __attribute__((unused)),
@@ -441,7 +441,7 @@
     return 0;
 }
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
     exit(1);
@@ -450,7 +450,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 static int sieve_notify(void *ac __attribute__((unused)),
@@ -459,7 +459,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }
 


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cyrus-imapd.spec	28 Aug 2007 11:09:51 -0000	1.31
+++ cyrus-imapd.spec	25 Sep 2007 09:17:00 -0000	1.32
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.9
 Name: cyrus-imapd
 Version: 2.3.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -147,11 +147,13 @@
 Patch16: cyrus-imapd-2.3.7-db4.5.patch
 Patch17: cyrus-imapd-2.3.7-makeinstallfix.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-Patch20: cyrus-imapd-2.3.8-getgrouplist.patch
+Patch19: cyrus-imapd-2.3.9-implicitdecl.patch
+Patch20: cyrus-imapd-2.3.9-myfatal.patch
 # Patches >= 100 are / will be fixed in CVS
 Patch100: cyrus-imapd-2.3.1-make_md5.patch
 Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
 Patch102: cyrus-imapd-2.3.1-replication_policycheck.patch
+Patch103: cyrus-imapd-2.3.9-getgrouplist.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl, perl-devel, tcp_wrappers
@@ -256,7 +258,9 @@
 #%patch16 -p1 -b .db4.5
 #%patch17 -p1 -b .makeinstallfix
 %patch18 -p1 -b .krb4
-%patch20 -p1 -b .getgrouplist
+%patch19 -p1 -b .implicitdecl
+%patch20 -p1 -b .myfatal
+%patch103 -p1 -b .getgrouplist
 # fixed upstream
 #%patch100 -p1 -b .make_md5
 # fixed upstream
@@ -272,6 +276,7 @@
 autoconf -f
 
 %build
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration"
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl; then
@@ -798,6 +803,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-7
+- updated the getgrouplist patch
+- fixed a few undeclared functions (and int to pointer conversions)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-6
 - update to latest upstream
 - updated all patches from uoa and reenabled rmquota+deletemailbox


--- cyrus-imapd-2.3.8-getgrouplist.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 09:24:10 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 05:24:10 -0400
Subject: rpms/dovecot/devel dovecot-1.1.alpha3-wakeup.patch, NONE,
	1.1.2.1 dovecot.spec, 1.90, 1.90.2.1
Message-ID: <200709250924.l8P9OAnW031050@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030

Modified Files:
      Tag: private-1_1-branch
	dovecot.spec 
Added Files:
      Tag: private-1_1-branch
	dovecot-1.1.alpha3-wakeup.patch 
Log Message:
* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
- wakeup work (252140)


dovecot-1.1.alpha3-wakeup.patch:

--- NEW FILE dovecot-1.1.alpha3-wakeup.patch ---
--- dovecot-1.1.alpha3/src/master/auth-process.c.wakeup	2007-08-13 14:02:27.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/auth-process.c	2007-08-16 15:33:41.000000000 +0200
@@ -372,6 +372,9 @@
 	if (close(p->fd) < 0)
 		i_error("close(auth) failed: %m");
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		auth_processes_start_missing(NULL);
 }
 
 static void
@@ -755,7 +758,7 @@
 		"slowing down for now");
 	auth_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, auth_processes_start_missing, NULL);
 }
 
@@ -787,20 +790,22 @@
 
 		auth_stalled = FALSE;
 		timeout_remove(&to);
-		to = timeout_add(1000, auth_processes_start_missing, NULL);
+		/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
 	}
 }
 
 void auth_processes_init(void)
 {
 	process_groups = NULL;
-	to = timeout_add(1000, auth_processes_start_missing, NULL);
+	/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
+	to = NULL;
 
 	auth_processes_start_missing(NULL);
 }
 
 void auth_processes_deinit(void)
 {
-	timeout_remove(&to);
+	if (to != NULL)
+		timeout_remove(&to);
 	auth_processes_destroy_all();
 }
--- dovecot-1.1.alpha3/src/master/login-process.c.wakeup	2007-08-02 17:38:14.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/login-process.c	2007-08-16 15:53:40.000000000 +0200
@@ -503,6 +503,9 @@
 
 	o_stream_unref(&p->output);
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		login_processes_start_missing(NULL);
 }
 
 static void login_process_init_env(struct login_group *group, pid_t pid)
@@ -806,7 +809,7 @@
 		"slowing down for now");
 	logins_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, login_processes_start_missing, NULL);
 }
 
@@ -815,12 +818,6 @@
 {
 	struct login_group *group;
 
-	if (!have_initialized_auth_processes) {
-		/* don't create login processes before at least one auth
-		   process has finished initializing */
-		return;
-	}
-
 	if (login_groups == NULL)
 		login_process_groups_create();
 
@@ -832,6 +829,19 @@
 	}
 }
 
+static void
+login_processes_start(void *context __attr_unused__)
+{
+	if (!have_initialized_auth_processes) {
+		/* don't create login processes before at least one auth
+		   process has finished initializing */
+		return;
+	}
+
+	timeout_remove(&to);
+	login_processes_start_missing(NULL);
+}
+
 static int login_process_send_env(struct login_process *p)
 {
 	extern char **environ;
@@ -912,7 +922,7 @@
 					   login_process_destroyed);
 
 	if (!IS_INETD()) {
-		to = timeout_add(1000, login_processes_start_missing, NULL);
+		to = timeout_add(1000, login_processes_start, NULL);
 		io_listen = NULL;
 	} else {
 		to = NULL;


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- dovecot.spec	22 Aug 2007 12:45:08 -0000	1.90
+++ dovecot.spec	25 Sep 2007 09:23:38 -0000	1.90.2.1
@@ -3,7 +3,7 @@
 %define upstream 1.1.alpha3
 %define sieve_upstream 1.1-%{sieve_hg}
 %define pkg_version 1.1
-%define my_release 16.1
+%define my_release 16.2
 %define pkg_release %{my_release}.alpha3%{?dist}
 %define pkg_sieve_version 1.1
 %define pkg_sieve_release %{my_release}.hg.%{sieve_hg}%{?dist}
@@ -38,6 +38,7 @@
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
 Patch107: dovecot-1.1-unicodedata.patch
+Patch108: dovecot-1.1.alpha3-wakeup.patch
 #Patch200: dovecot-%{dovecot_hg}.patch
 
 # XXX this patch needs review and forward porting
@@ -171,6 +172,7 @@
 %patch103 -p1 -b .mkcert-permissions
 %patch105 -p1 -b .mkcert-paths
 %patch107 -p1 -b .unicodedata
+%patch108 -p1 -b .wakeup
 #%patch200 -p1 -b .%{dovecot_hg}
 
 %if %{build_sieve}
@@ -399,6 +401,9 @@
 %endif
 
 %changelog
+* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
+- wakeup work (252140)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.1.alpha3
 - updated license tags
 



From fedora-extras-commits at redhat.com  Tue Sep 25 09:39:22 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Tue, 25 Sep 2007 05:39:22 -0400
Subject: fedora-security/audit fc7,1.120,1.121
Message-ID: <200709250939.l8P9dMZn031536@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31518/audit

Modified Files:
	fc7 
Log Message:
Forgot to commit note for bugzilla yesterday.



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc7	24 Sep 2007 21:01:58 -0000	1.120
+++ fc7	25 Sep 2007 09:39:20 -0000	1.121
@@ -9,6 +9,7 @@
 # Up to date FC7 as of 20070916
 
 GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
+CVE-2007-5038 VULNERABLE (bugzilla, fixed 3.0.2, 3.1.2) #299981
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
 CVE-2007-5034 VULNERABLE (elinks) #297981
 CVE-2007-5007 VULNERABLE (balsa) #297601



From fedora-extras-commits at redhat.com  Tue Sep 25 09:53:01 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 05:53:01 -0400
Subject: rpms/NetworkManager/devel
	nm-applet-0.7.0-no-connection-editor.patch, 
	NONE, 1.1 .cvsignore, 1.47,
	1.48 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.5,
	1.6 NetworkManager.spec, 1.169, 1.170 sources, 1.66, 1.67
Message-ID: <200709250953.l8P9r1Vr031933@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31903

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec sources 
Added Files:
	nm-applet-0.7.0-no-connection-editor.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
- New snapshot
	- Fix applet icon sizing on start (mclasen)
	- Fix nm-tool installation (mclasen)
	- Fix 'state' method call return (#303271)
	- Fix 40-bit WEP keys (again)
	- Fix loop when secrets were wrong/invalid
	- Fix applet crash when clicking Cancel in the password dialog
	- Ensure NM doesn't get stuck waiting for the supplicant to re-appear
		if it crashes or goes away
	- Make VPN properties applet work again
	- Increase timeout for network password entry



nm-applet-0.7.0-no-connection-editor.patch:

--- NEW FILE nm-applet-0.7.0-no-connection-editor.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor	2007-09-25 05:18:05.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 05:18:41.000000000 -0400
@@ -1781,6 +1781,7 @@ static GtkWidget *nma_context_menu_creat
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
 	gtk_menu_shell_append (menu, applet->info_menu_item);
 
+#if 0
 	/* 'Edit Connections...' item */
 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
 	g_signal_connect (applet->connections_menu_item,
@@ -1788,6 +1789,7 @@ static GtkWidget *nma_context_menu_creat
 				   G_CALLBACK (nma_edit_connections_cb),
 				   applet);
 	gtk_menu_shell_append (menu, applet->connections_menu_item);
+#endif
 
 	/* Separator */
 	nma_menu_add_separator_item (menu);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	22 Sep 2007 03:34:03 -0000	1.47
+++ .cvsignore	25 Sep 2007 09:52:27 -0000	1.48
@@ -9,3 +9,5 @@
 NetworkManager-0.7.0.svn2849.tar.gz
 NetworkManager-0.7.0.svn2852.tar.gz
 nm-applet-0.7.0.svn191.tar.gz
+NetworkManager-0.7.0.svn2880.tar.gz
+nm-applet-0.7.0.svn199.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	20 Sep 2007 14:06:41 -0000	1.5
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	25 Sep 2007 09:52:27 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-19 22:10:17.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-20 08:11:45.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-09-24 11:02:11.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-09-25 03:27:22.000000000 -0400
 @@ -18,10 +18,10 @@ dnl
  dnl This doesn't depend on gnome support, only on gnome-common, autogen already
  dnl uses gnome-autogen
@@ -25,9 +25,34 @@
  		 gtk+-2.0 >= 2.6
  		 libglade-2.0
  		 gconf-2.0
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix	2007-09-25 03:33:31.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am	2007-09-25 03:34:10.000000000 -0400
+@@ -1,6 +1,10 @@
+ 
+ bin_PROGRAMS = nm-vpn-properties
+ 
++INCLUDES = -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
++
+ nm_vpn_propertiesdir=$(includedir)/NetworkManager
+ 
+ nm_vpn_properties_HEADERS = 					\
+@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \
+ 
+ nm_vpn_properties_LDADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
++	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
+ 
+ CLEANFILES = $(server_DATA) *.bak *.gladep *~
+ 
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2007-09-19 22:53:14.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-20 08:15:42.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -1,8 +1,15 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -47,7 +72,7 @@
  
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2007-09-20 07:40:37.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-20 08:16:10.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -72,7 +97,7 @@
  glade_DATA = nm-connection-editor.glade
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-09-20 07:43:02.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-20 08:11:45.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-09-25 03:27:22.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- NetworkManager.spec	22 Sep 2007 03:40:16 -0000	1.169
+++ NetworkManager.spec	25 Sep 2007 09:52:27 -0000	1.170
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2852
+%define snapshot svn2880
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,8 +18,9 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn191.tar.gz
+Source1: nm-applet-%{version}.svn199.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
+Patch2: nm-applet-0.7.0-no-connection-editor.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -122,6 +123,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
+%patch2 -p1 -b .no-connection-editor
 
 %build
 # Even though we don't require named, we still build with it
@@ -257,6 +259,19 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
+- New snapshot
+	- Fix applet icon sizing on start (mclasen)
+	- Fix nm-tool installation (mclasen)
+	- Fix 'state' method call return (#303271)
+	- Fix 40-bit WEP keys (again)
+	- Fix loop when secrets were wrong/invalid
+	- Fix applet crash when clicking Cancel in the password dialog
+	- Ensure NM doesn't get stuck waiting for the supplicant to re-appear
+		if it crashes or goes away
+	- Make VPN properties applet work again
+	- Increase timeout for network password entry
+
 * Fri Sep 21 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2852
 - New snapshot (fix unencrypted & 40 bit WEP)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	22 Sep 2007 03:34:03 -0000	1.66
+++ sources	25 Sep 2007 09:52:27 -0000	1.67
@@ -1,2 +1,2 @@
-ca377699ea19f3114bd5f0d71cd131ea  NetworkManager-0.7.0.svn2852.tar.gz
-9e8b0d741f2fca69bbbbdcfafc6677ab  nm-applet-0.7.0.svn191.tar.gz
+25115a3500c97b6ee308852d350760ef  NetworkManager-0.7.0.svn2880.tar.gz
+ec90ed799aa6c9c1c5378f8ab31c6f5c  nm-applet-0.7.0.svn199.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 09:59:59 2007
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Tue, 25 Sep 2007 05:59:59 -0400
Subject: rpms/minicom/devel minicom-2.2-capture.patch, NONE, 1.1 minicom.spec,
	1.27, 1.28
Message-ID: <200709250959.l8P9xx16032189@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/minicom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32158

Modified Files:
	minicom.spec 
Added Files:
	minicom-2.2-capture.patch 
Log Message:
- Fix capture file handling (#302081)


minicom-2.2-capture.patch:

--- NEW FILE minicom-2.2-capture.patch ---
Patch for #302081

This removes unncessary duplicate variable vt_capfp and fixes handling
of capture file descriptors so that minicom doesn't crash after the
capture file was closed.

Lubomir Kundrak <lkundrak at redhat.com>

diff -Nurp minicom-2.2/src/dial.c minicom-2.2.capture/src/dial.c
--- minicom-2.2/src/dial.c	2005-10-31 13:13:51.000000000 +0100
+++ minicom-2.2.capture/src/dial.c	2007-09-23 10:07:46.000000000 +0200
@@ -1355,7 +1355,7 @@ static void dial_entry(struct dialent *d
     mode_status();
   }
   newtype = d->term;
-  vt_set(-1, d->flags & FL_WRAP, NULL, -1, -1, d->flags & FL_ECHO, -1, -1);
+  vt_set(-1, d->flags & FL_WRAP, -1, -1, d->flags & FL_ECHO, -1, -1);
   local_echo = d->flags & FL_ECHO;
   if (newtype != terminal)
     init_emul(newtype, 1);
diff -Nurp minicom-2.2/src/ipc.c minicom-2.2.capture/src/ipc.c
--- minicom-2.2/src/ipc.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/ipc.c	2007-09-23 10:08:03.000000000 +0200
@@ -87,13 +87,13 @@ int keyboard(int cmd, int arg)
       escape = arg;
       break;
     case KSETBS:
-      vt_set(-1, -1, NULL, -1, arg, -1, -1, -1);
+      vt_set(-1, -1, -1, arg, -1, -1, -1);
       break;
     case KCURST:
-      vt_set(-1, -1, NULL, -1, -1, -1, NORMAL, -1);
+      vt_set(-1, -1, -1, -1, -1, NORMAL, -1);
       break;
     case KCURAPP:
-      vt_set(-1, -1, NULL, -1, -1, -1, APPL, -1);
+      vt_set(-1, -1, -1, -1, -1, APPL, -1);
       break;
     default:
       /* The rest is only meaningful if a keyserv runs. */
diff -Nurp minicom-2.2/src/minicom.c minicom-2.2.capture/src/minicom.c
--- minicom-2.2/src/minicom.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/minicom.c	2007-09-23 10:08:39.000000000 +0200
@@ -873,14 +873,14 @@ static void helpthem(void)
 void toggle_addlf(void)
 {
   addlf = !addlf;
-  vt_set(addlf, -1, NULL, -1, -1, -1, -1, -1);
+  vt_set(addlf, -1, -1, -1, -1, -1, -1);
 }
 
 /* Toggle local echo.  Can be called through the menu, or by a macro. */
 void toggle_local_echo(void)
 {
   local_echo = !local_echo;
-  vt_set(-1, -1, NULL, -1, -1, local_echo, -1 ,-1);
+  vt_set(-1, -1, -1, -1, local_echo, -1 ,-1);
 }
 
 int main(int argc, char **argv)
@@ -1137,7 +1137,7 @@ int main(int argc, char **argv)
             exit(1);
           }
           docap = 1;
-          vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1);
+          vt_set(addlf, -1, docap, -1, -1, -1, -1);
           seteuid(eff_uid);
           setegid(eff_gid);
           break;
@@ -1170,7 +1170,7 @@ int main(int argc, char **argv)
 
   if (screen_iso && screen_ibmpc)
     /* init VT */
-    vt_set(-1, -1, (FILE*)NULL, -1, -1, -1, -1, 1);
+    vt_set(-1, -1, -1, -1, -1, -1, 1);
 
 
 
@@ -1464,7 +1464,7 @@ dirty_goto:
           if (c == 1)
             docap = 0;
         }
-        vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1);
+        vt_set(addlf, -1, docap, -1, -1, -1, -1);
         break;
       case 'p': /* Set parameters */
         get_bbp(P_BAUDRATE, P_BITS, P_PARITY, P_STOPB, 0);
@@ -1489,7 +1489,7 @@ dirty_goto:
         break;
       case 'w': /* Line wrap on-off */
         c = (!us->wrap);
-        vt_set(addlf, c, capfp, docap, -1, -1, -1, -1);
+        vt_set(addlf, c, docap, -1, -1, -1, -1);
         s = c ? _("Linewrap ON") : _("Linewrap OFF");
         werror("%s", s);
         break;
diff -Nurp minicom-2.2/src/vt100.c minicom-2.2.capture/src/vt100.c
--- minicom-2.2/src/vt100.c	2007-09-23 10:10:00.000000000 +0200
+++ minicom-2.2.capture/src/vt100.c	2007-09-23 10:08:51.000000000 +0200
@@ -175,7 +175,6 @@ static int vt_crlf = 0;		/* Return sends
 static int vt_om;		/* Origin mode. */
 WIN *vt_win          = NULL;	/* Output window. */
 static int vt_docap;		/* Capture on/off. */
-static FILE *vt_capfp;		/* Capture file. */
 static void (*vt_keyb)(int, int);/* Gets called for NORMAL/APPL switch. */
 static void (*termout)(const char *, int);/* Gets called to output a string. */
 
@@ -273,15 +272,13 @@ void vt_init(int type, int fg, int bg, i
 }
 
 /* Change some things on the fly. */
-void vt_set(int addlf, int wrap, FILE *capfp, int docap, int bscode,
+void vt_set(int addlf, int wrap, int docap, int bscode,
             int echo, int cursor, int asis)
 {
   if (addlf >= 0)
     vt_addlf = addlf;
   if (wrap >= 0)
     vt_win->wrap = vt_wrap = wrap;
-  if (capfp != NULL)
-    vt_capfp = capfp;
   if (docap >= 0)
     vt_docap = docap;
   if (bscode >= 0)
@@ -961,7 +958,7 @@ void vt_out(int ch)
   c = (unsigned char)ch;
 
   if (vt_docap == 2) /* Literal. */
-    fputc(c, vt_capfp);
+    fputc(c, capfp);
 
   /* Process <31 chars first, even in an escape sequence. */
   switch (c) {
@@ -977,7 +974,7 @@ void vt_out(int ch)
       if (vt_addlf) {
         wputc(vt_win, '\n');
         if (vt_docap == 1)
-          fputc('\n', vt_capfp);
+          fputc('\n', capfp);
       }
       break;
     case '\t': /* Non - destructive TAB */
@@ -989,7 +986,7 @@ void vt_out(int ch)
         f = vt_win->xs - 1;
       wlocate(vt_win, f, vt_win->cury);
       if (vt_docap == 1)
-        fputc(c, vt_capfp);
+        fputc(c, capfp);
       break;
     case 013: /* Old Minix: CTRL-K = up */
       wlocate(vt_win, vt_win->curx, vt_win->cury - 1);
@@ -1025,7 +1022,7 @@ void vt_out(int ch)
     case 7: /* Bell */
       wputc(vt_win, c);
       if (vt_docap == 1)
-        fputc(c, vt_capfp);
+        fputc(c, capfp);
       break;
     default:
       go_on = 1;
@@ -1038,7 +1035,7 @@ void vt_out(int ch)
   switch (esc_s) {
     case 0: /* Normal character */
       if (vt_docap == 1)
-        fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, vt_capfp);
+        fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, capfp);
       c = vt_inmap[c];    /* conversion 04.09.97 / jl */
 #if TRANSLATE
       if (vt_type == VT100 && vt_trans[vt_charset] && vt_asis == 0)
@@ -1080,8 +1077,8 @@ void vt_out(int ch)
 
   /* Flush output to capture file so that all output is visible there
    * immediately. Causes a write syscall for every call though. */
-  if (vt_capfp)
-    fflush(vt_capfp);
+  if (capfp)
+    fflush(capfp);
 }
 
 /* Translate keycode to escape sequence. */
diff -Nurp minicom-2.2/src/vt100.h minicom-2.2.capture/src/vt100.h
--- minicom-2.2/src/vt100.h	2005-08-04 22:33:34.000000000 +0200
+++ minicom-2.2.capture/src/vt100.h	2007-09-23 10:07:37.000000000 +0200
@@ -29,7 +29,7 @@ extern int vt_nl_delay;		/* Delay after 
 void vt_install(void(*)(const char *, int), void (*)(int, int), WIN *);
 void vt_init(int, int, int, int, int);
 void vt_pinit(WIN *, int, int);
-void vt_set(int, int, FILE *, int, int, int, int, int);
+void vt_set(int, int, int, int, int, int, int);
 void vt_out(int);
 void vt_send(int ch);
 


Index: minicom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- minicom.spec	22 Aug 2007 09:32:46 -0000	1.27
+++ minicom.spec	25 Sep 2007 09:59:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPLv2+
 Group: Applications/Communications
@@ -24,6 +24,7 @@
 Patch10: minicom-2.2-staticbuf.patch
 Patch11: minicom-2.2-sigs.patch
 Patch12: minicom-2.2-ttyerror.patch
+Patch13: minicom-2.2-capture.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -45,6 +46,7 @@
 %patch10 -p1 -b .staticbuf
 %patch11 -p1 -b .sigs
 %patch12 -p1 -b .ttyerror
+%patch13 -p1 -b .capture
 
 %build
 %configure
@@ -73,6 +75,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 23 2007 Lubomir Kundrak <lkundrak at redhat.com> 2.2-5
+- Fix capture file handling (#302081)
+
 * Wed Aug 22 2007 Miroslav Lichvar <mlichvar at redhat.com> 2.2-4
 - update license tag
 



From fedora-extras-commits at redhat.com  Tue Sep 25 10:18:42 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 25 Sep 2007 06:18:42 -0400
Subject: rpms/xmoto/F-7 xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.20, 1.21
Message-ID: <200709251018.l8PAIg9A006744@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6706

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-7/xmoto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmoto.spec	29 Aug 2007 17:35:47 -0000	1.20
+++ xmoto.spec	25 Sep 2007 10:18:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Tue Sep 25 10:24:54 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 06:24:54 -0400
Subject: rpms/cups/devel cups-foomatic-recommended.patch, NONE, 1.1 cups.spec,
	1.363, 1.364
Message-ID: <200709251024.l8PAOsZC007147@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7110

Modified Files:
	cups.spec 
Added Files:
	cups-foomatic-recommended.patch 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
- Don't strip foomatic recommended strings from make/model names.


cups-foomatic-recommended.patch:

--- NEW FILE cups-foomatic-recommended.patch ---
diff -up cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended cups-1.3.2/scheduler/cups-driverd.c
--- cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended	2007-09-25 10:33:29.000000000 +0100
+++ cups-1.3.2/scheduler/cups-driverd.c	2007-09-25 10:34:03.000000000 +0100
@@ -180,7 +180,6 @@ add_ppd(const char *name,		/* I - PPD na
 	int        type)		/* I - Driver type */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -238,15 +237,6 @@ add_ppd(const char *name,		/* I - PPD na
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
 
  /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
- /*
   * Return the new PPD pointer...
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- cups.spec	21 Sep 2007 12:48:18 -0000	1.363
+++ cups.spec	25 Sep 2007 10:24:22 -0000	1.364
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch14: cups-lpr-help.patch
 Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
+Patch17: cups-foomatic-recommended.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -150,6 +151,7 @@
 %patch14 -p1 -b .lpr-help
 %patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
+%patch17 -p1 -b .foomatic-recommended
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -445,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
+- Don't strip foomatic recommended strings from make/model names.
+
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
 - Write printcap when remote printers have timed out (bug #290831).
 



From fedora-extras-commits at redhat.com  Tue Sep 25 10:25:43 2007
From: fedora-extras-commits at redhat.com (Tomas Heinrich (theinric))
Date: Tue, 25 Sep 2007 06:25:43 -0400
Subject: rpms/rsyslog/devel .cvsignore, 1.11, 1.12 rsyslog.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200709251025.l8PAPhM0007234@cvs-int.fedora.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7062

Modified Files:
	.cvsignore rsyslog.spec sources 
Log Message:
bug 303341 - fix message suppression



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Sep 2007 00:03:24 -0000	1.11
+++ .cvsignore	25 Sep 2007 10:25:10 -0000	1.12
@@ -1,3 +1,4 @@
 rsyslog.init
 rsyslog.sysconfig
 rsyslog-1.19.6.tar.gz
+rsyslog-1.19.6-repmsg.patch


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rsyslog.spec	25 Sep 2007 00:03:24 -0000	1.14
+++ rsyslog.spec	25 Sep 2007 10:25:10 -0000	1.15
@@ -3,13 +3,14 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 1.19.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
+Patch1: rsyslog-1.19.6-repmsg.patch
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .repmsg
 
 %build
 %configure --sbindir=%{sbindir} --disable-static
@@ -117,7 +119,10 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
-* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-2
+- fix message suppression (303341)
+
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-1
 - upstream bugfix release
 
 * Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Sep 2007 00:03:24 -0000	1.11
+++ sources	25 Sep 2007 10:25:10 -0000	1.12
@@ -1,3 +1,4 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
 0aa4ea5d07d3c2ba3080b4a64280ff72  rsyslog-1.19.6.tar.gz
+8687f4cb4dbc28106890a00eabf2c6f7  rsyslog-1.19.6-repmsg.patch



From fedora-extras-commits at redhat.com  Tue Sep 25 10:29:55 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 25 Sep 2007 06:29:55 -0400
Subject: rpms/neon/devel neon-0.27.2.tar.gz.asc, NONE, 1.1 .cvsignore, 1.10, 
	1.11 neon.spec, 1.35, 1.36 sources, 1.9, 1.10 upstream, 1.3,
	1.4 neon-0.25.5-multilib.patch, 1.1,
	NONE neon-0.27.0-gssapi.patch, 1.1, NONE
Message-ID: <200709251029.l8PATt4m007504@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459

Modified Files:
	.cvsignore neon.spec sources upstream 
Added Files:
	neon-0.27.2.tar.gz.asc 
Removed Files:
	neon-0.25.5-multilib.patch neon-0.27.0-gssapi.patch 
Log Message:
* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 0.27.2-2
- update to 0.27.2



--- NEW FILE neon-0.27.2.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQBG+NOHR/aWnQ5EzwwRAozbAJ4tHBvC9xCrIR9cO1NhsWUN1PKDsgCeM+je
gLmyed59MoXOAqFiDWVXtYs=
=blpK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Aug 2007 07:50:00 -0000	1.10
+++ .cvsignore	25 Sep 2007 10:29:23 -0000	1.11
@@ -1 +1 @@
-neon-0.27.0.tar.gz
+neon-0.27.2.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- neon.spec	20 Sep 2007 15:21:20 -0000	1.35
+++ neon.spec	25 Sep 2007 10:29:23 -0000	1.36
@@ -1,13 +1,12 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.27.0
-Release: 3
+Version: 0.27.2
+Release: 2
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
-Patch1: neon-0.27.0-gssapi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
@@ -33,7 +32,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .gssapi
 
 %build
 export CC="%{__cc} -pthread"
@@ -70,6 +68,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 0.27.2-2
+- update to 0.27.2
+
 * Thu Sep 20 2007 Joe Orton <jorton at redhat.com> 0.27.0-3
 - fix Negotiate response verification
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2007 07:50:00 -0000	1.9
+++ sources	25 Sep 2007 10:29:23 -0000	1.10
@@ -1 +1 @@
-29a0467b5d84d3f1d78bb79c7c0e02d4  neon-0.27.0.tar.gz
+24d434a4d5d4b6ce8f076039688f60ce  neon-0.27.2.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream	23 Aug 2007 07:50:00 -0000	1.3
+++ upstream	25 Sep 2007 10:29:23 -0000	1.4
@@ -1 +1 @@
-neon-0.27.0.tar.gz
+neon-0.27.2.tar.gz


--- neon-0.25.5-multilib.patch DELETED ---


--- neon-0.27.0-gssapi.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 10:43:02 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 25 Sep 2007 06:43:02 -0400
Subject: rpms/hamlib/devel .cvsignore, 1.4, 1.5 hamlib.spec, 1.23,
	1.24 sources, 1.4, 1.5
Message-ID: <200709251043.l8PAh2f4007888@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7858

Modified Files:
	.cvsignore hamlib.spec sources 
Log Message:
- Update to new upstream 1.2.6.2
- Added rigsmtr binary



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Sep 2006 18:46:32 -0000	1.4
+++ .cvsignore	25 Sep 2007 10:42:29 -0000	1.5
@@ -1 +1 @@
-hamlib-1.2.5.tar.gz
+hamlib-1.2.6.2.tar.gz


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hamlib.spec	4 Sep 2007 10:47:46 -0000	1.23
+++ hamlib.spec	25 Sep 2007 10:42:29 -0000	1.24
@@ -3,8 +3,8 @@
 
 
 Name:           hamlib
-Version:        1.2.5
-Release:        6%{?dist}
+Version:        1.2.6.2
+Release:        1%{?dist}
 
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
@@ -152,23 +152,25 @@
 %doc COPYING.LIB
 %{_bindir}/rigctl
 %{_bindir}/rigmem
+%{_bindir}/rigsmtr
 %{_bindir}/rigswr
 %{_bindir}/rotctl
 %{_sbindir}/rpc.rigd
 %{_sbindir}/rpc.rotd
-%{_libdir}/libhamlib-%{version}.so.*
+%{_libdir}/libhamlib.so.*
 %{_libdir}/hamlib-*.so
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
 %{_mandir}/man1/rigmem.1.gz
+%{_mandir}/man1/rigsmtr.1.gz
 %{_mandir}/man1/rigswr.1.gz
 %{_mandir}/man1/rotctl.1.gz
 
 %files c++
 %defattr(-, root, root)
 %doc COPYING.LIB
-%{_libdir}/libhamlib++-%{version}.so.*
+%{_libdir}/libhamlib++.so.*
 
 %files c++-devel
 %defattr(-, root, root)
@@ -206,6 +208,10 @@
 
 
 %changelog
+* Tue Sep 25 2007 Denis Leroy <denis at poolshark.org> - 1.2.6.2-1
+- Update to new upstream 1.2.6.2
+- Added rigsmtr binary
+
 * Mon Sep  3 2007 Denis Leroy <denis at poolshark.org> - 1.2.5-6
 - Rebuild, License tag update
 - Added net-tools BR


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Sep 2006 18:46:32 -0000	1.4
+++ sources	25 Sep 2007 10:42:29 -0000	1.5
@@ -1 +1 @@
-9725a6ae60c1c8ead8669e42a67cc5e8  hamlib-1.2.5.tar.gz
+c3d0030915101c9d9d6131b15abb63f5  hamlib-1.2.6.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 11:27:44 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Tue, 25 Sep 2007 07:27:44 -0400
Subject: rpms/solarwolf/FC-6 solarwolf-path.patch, NONE,
	1.1 solarwolf.desktop, 
	NONE, 1.1 solarwolf.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709251127.l8PBRiq7015073@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/solarwolf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15005

Modified Files:
	sources 
Added Files:
	solarwolf-path.patch solarwolf.desktop solarwolf.spec 
Log Message:
Initial import.


solarwolf-path.patch:

--- NEW FILE solarwolf-path.patch ---
--- solarwolf.py	2007-09-14 13:27:57.000000000 -0500
+++ solarwolf.py	2007-09-14 13:27:57.000000000 -0500
@@ -13,8 +13,8 @@
     DATADIR = "C:\\Program Files\\Solarwolf"
     CODEDIR = "C:\\Program Files\\Solarwolf\\code"
 else:
-    DATADIR = "/usr/share/games/solarwolf"
-    CODEDIR = "/usr/lib/games/solarwolf"
+    DATADIR = "/usr/share/solarwolf"
+    CODEDIR = "/usr/share/solarwolf/code"
 
 
 


--- NEW FILE solarwolf.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=SolarWolf
Exec=solarwolf
Comment=A Python port of SolarFox
Icon=solarwolf.png
Terminal=false
Categories=Game;ActionGame;
StartupNotify=false


--- NEW FILE solarwolf.spec ---
Name: solarwolf
Version:  1.5
Release:  2%{?dist}
Summary: A Python port of SolarFox

Group: Amusements/Games 
License: LGPLv2+
URL: http://pygame.org/shredwheat/solarwolf
Source0: http://pygame.org/shredwheat/solarwolf/solarwolf-%{version}.tar.gz
Source1: solarwolf.desktop
Patch0: solarwolf-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme, python, pygame

%description
The point of the game is to scramble through 60 levels
collecting space boxes. Each level gets is harder than
the previous. Obstacles like bullets, mines, and asteroids
cover your every move. Beat the Skip timer and grab the
powerups for your only chance.

%prep
%setup -q
chmod 755 data/music
chmod 644 data/music/*
chmod 755 data/audio
chmod 644 data/audio/*

%patch0 -p0

%build

%install
rm -rf %{buildroot}

mkdir -p  %{buildroot}%{_bindir}
install -p -m 755 solarwolf.py %{buildroot}%{_bindir}/solarwolf

mkdir -p  %{buildroot}%{_datadir}/solarwolf
mkdir -p  %{buildroot}%{_datadir}/solarwolf/data
cp -ra data/* %{buildroot}%{_datadir}/solarwolf/data

mkdir -p  %{buildroot}%{_datadir}/solarwolf/code
install -p -m 644 code/* %{buildroot}%{_datadir}/solarwolf/code

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 dist/solarwolf.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps

%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
  
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/solarwolf
%{_datadir}/solarwolf/
%doc readme.txt lgpl.txt
%{_datadir}/applications/fedora-solarwolf.desktop
%{_datadir}/icons/hicolor/64x64/apps/solarwolf.png

%changelog
* Thu Sep 21 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-2
- Fixed Source URL.
- Switched from mv to cp for timestamps.
- Moved permission correction to prep.

* Fri Sep 14 2007 Jon Ciesla <limb at jcomserv.net> - 1.5-1
- create.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solarwolf/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 16:16:33 -0000	1.1
+++ sources	25 Sep 2007 11:27:12 -0000	1.2
@@ -0,0 +1 @@
+52fbed0a33c3c4c08d9dc0e533f90f8c  solarwolf-1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 11:36:38 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Tue, 25 Sep 2007 07:36:38 -0400
Subject: rpms/tzdata/devel javazic-fixup.patch, NONE, 1.1 tzdata.spec, 1.50,
	1.51
Message-ID: <200709251136.l8PBacm2015310@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274

Modified Files:
	tzdata.spec 
Added Files:
	javazic-fixup.patch 
Log Message:
- Add support for building java's zoneinfo files in new
  tzdata-java RPM.


javazic-fixup.patch:

--- NEW FILE javazic-fixup.patch ---
--- sun/util/calendar/LocalGregorianCalendar.java.keiths	2007-09-07 14:48:19.000000000 -0700
+++ sun/util/calendar/LocalGregorianCalendar.java	2007-09-07 14:52:58.000000000 -0700
@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
     static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
 	Properties calendarProps = null;
 	try {
-	    String homeDir = (String) AccessController.doPrivileged(
-				new sun.security.action.GetPropertyAction("java.home"));
+  	    String homeDir = (String) System.getProperty("java.home");
 	    final String fname = homeDir + File.separator + "lib" + File.separator
 				 + "calendars.properties";
 	    calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
--- sun/util/calendar/ZoneInfoFile.java.keiths	2007-09-07 14:54:58.000000000 -0700
+++ sun/util/calendar/ZoneInfoFile.java	2007-09-07 14:55:36.000000000 -0700
@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
 	byte[] buffer = null;
 
 	try {
-	    String zi_dir = (String) AccessController.doPrivileged(
-			        new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
+	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
 	    File dir = null;
 	    if (zi_dir != null)
 	      dir = new File(zi_dir);
@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
 	    }
 
 	    if (dir == null) {
-	      String homeDir = (String) AccessController.doPrivileged(
-				new sun.security.action.GetPropertyAction("java.home"));
+	      String homeDir = (String) System.getProperty("java.home");
 	      zi_dir = homeDir + File.separator + "lib" + File.separator
 		+ "zi";
 	    }


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- tzdata.spec	22 Aug 2007 16:06:54 -0000	1.50
+++ tzdata.spec	25 Sep 2007 11:36:06 -0000	1.51
@@ -3,7 +3,7 @@
 Version: 2007g
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain, LGPLv2+
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -20,6 +20,18 @@
 This package contains data files with rules for various timezones around
 the world.
 
+%package java
+Summary: Timzeone data for Java
+Group: System Environment/Base
+Source3: javazic.tar.gz
+BuildArchitectures: noarch
+BuildRequires: java-devel
+Patch0: javazic-fixup.patch
+
+%description java
+This package contains timezone information for use by Java runtimes.
+
+
 %prep
 %setup -q -n tzdata
 mkdir tzdata%{tzdata_version}
@@ -30,15 +42,46 @@
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 
+mkdir javazic
+tar zxf %{SOURCE3} -C javazic
+pushd javazic
+%patch0
+
+# Hack alert! sun.tools may be defined and installed in the
+# VM. In order to guarantee that we are using IcedTea/OpenJDK
+# for creating the zoneinfo files, rebase all the packages
+# from "sun." to "rht.". Unfortunately, gcj does not support
+# any of the -Xclasspath options, so we must go this route
+# to ensure the greatest compatibility.
+mv sun rht
+for f in `find . -name '*.java'`; do
+	sed -i -e 's:sun\.tools\.:rht.tools.:g'\
+	       -e 's:sun\.util\.:rht.util.:g' $f
+done
+popd
+
 %build
 make
 grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
 
+pushd javazic
+javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
+popd
+pushd tzdata%{tzcode_version}
+java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
+  -d ../zoneinfo/java \
+  africa antarctica asia australasia europe northamerica pacificnew \
+  southamerica backward etcetera solar87 solar88 solar89 systemv \
+  ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
+popd
+
 %install
 rm -fr $RPM_BUILD_ROOT
 sed -i 's|@install_root@|%{buildroot}|' Makeconfig
 make install
 
+cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
+
 %check
 echo ====================TESTING=========================
 make check
@@ -54,7 +97,15 @@
 %doc tzcode%{tzcode_version}/Theory
 %doc tzcode%{tzcode_version}/tz-link.html
 
+%files java
+%defattr(-,root,root)
+%{_datadir}/javazi
+
 %changelog
+* Thu Sep 25 2007 Keith Seitz <keiths at redhat.com> - 2007g-2
+- Add support for building java's zoneinfo files in new
+  tzdata-java RPM.
+
 * Wed Aug 22 2007 Petr Machata <pmachata at redhat.com> - 2007g-1
 - Fix licensing tag.
 - Upstream 2007g



From fedora-extras-commits at redhat.com  Tue Sep 25 11:41:08 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 07:41:08 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.x.patch, 
	1.1, 1.2 system-config-printer.spec, 1.132, 1.133
Message-ID: <200709251141.l8PBf8ev015483@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460

Modified Files:
	system-config-printer-0.7.74.x.patch 
	system-config-printer.spec 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
- Pull in SVN patch from stable branch for foomatic recommended
  drivers (bug #292021).


system-config-printer-0.7.74.x.patch:

Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-0.7.74.x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-printer-0.7.74.x.patch	21 Sep 2007 17:45:28 -0000	1.1
+++ system-config-printer-0.7.74.x.patch	25 Sep 2007 11:41:06 -0000	1.2
@@ -124,8 +124,8 @@
 ===================================================================
 Index: system-config-printer.glade
 ===================================================================
---- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1571)
-+++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1571)
+--- system-config-printer.glade	(.../tags/0.7.74.2)	(revision 1574)
++++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1574)
 @@ -432,6 +432,40 @@
  			      </child>
  
@@ -169,9 +169,17 @@
  				  <property name="can_focus">True</property>
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/0.7.74.2)	(revision 1571)
-+++ ChangeLog	(.../branches/0.7.74.x)	(revision 1571)
-@@ -1,3 +1,18 @@
+--- ChangeLog	(.../tags/0.7.74.2)	(revision 1574)
++++ ChangeLog	(.../branches/0.7.74.x)	(revision 1574)
+@@ -1,3 +1,26 @@
++2007-09-25  Tim Waugh  <twaugh at redhat.com>
++
++	* ppds.py (getDriverType): Fix foomatic recommended driver
++	discovery (requires CUPS patch to prevent '(recommended)' string
++	getting stripped).
++	(PPDs.getDriverTypeWithBias): Let getDriverType have access to the
++	PPDs object.
++
 +2007-09-04  Tim Waugh  <twaugh at redhat.com>
 +
 +	* system-config-printer.py (GUI.setConnected): Set sensitivity for
@@ -190,10 +198,43 @@
  2007-09-19  Tim Waugh  <twaugh at redhat.com>
  
  	* configure.in: Version 0.7.74.2.
+Index: ppds.py
+===================================================================
+--- ppds.py	(.../tags/0.7.74.2)	(revision 1574)
++++ ppds.py	(.../branches/0.7.74.x)	(revision 1574)
+@@ -112,7 +112,7 @@
+ DRIVER_TYPE_CUPS = 80
+ DRIVER_TYPE_FOOMATIC_GENERIC = 90
+ DRIVER_DOES_NOT_WORK = 999
+-def getDriverType (ppdname):
++def getDriverType (ppdname, ppds=None):
+     """Decides which of the above types ppdname is."""
+     if ppdname.startswith ("gutenprint"):
+         if ppdname.find ("/simple/") != -1:
+@@ -128,7 +128,9 @@
+         # Foomatic (generated) -- but which driver?
+         if ppdname.find ("Generic")!= -1:
+             return DRIVER_TYPE_FOOMATIC_GENERIC
+-        if ppdname.find ("(recommended)")!= -1:
++        if (ppds != None and
++            ppds.getInfoFromPPDName (ppdname).\
++            get ('ppd-make-and-model', '').find ("(recommended)") != -1):
+             return DRIVER_TYPE_FOOMATIC_RECOMMENDED
+         if ppdname.find ("-Postscript")!= -1:
+             return DRIVER_TYPE_FOOMATIC_PS
+@@ -234,7 +236,7 @@
+         make_model = dict['ppd-make-and-model']
+         mfg, mdl = ppdMakeModelSplit (make_model)
+         def getDriverTypeWithBias (x, mfg):
+-            t = getDriverType (x)
++            t = getDriverType (x, ppds=self)
+             if mfg == "HP":
+                 if t == DRIVER_TYPE_FOOMATIC_HPIJS:
+                     # Prefer HPIJS for HP devices.
 Index: system-config-printer.py
 ===================================================================
---- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1571)
-+++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1571)
+--- system-config-printer.py	(.../tags/0.7.74.2)	(revision 1574)
++++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1574)
 @@ -74,6 +74,12 @@
  ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
  ellipsis = unichr(0x2026)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- system-config-printer.spec	21 Sep 2007 17:45:28 -0000	1.132
+++ system-config-printer.spec	25 Sep 2007 11:41:06 -0000	1.133
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -130,6 +130,10 @@
 fi
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
+- Pull in SVN patch from stable branch for foomatic recommended
+  drivers (bug #292021).
+
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-2
 - Pull in SVN patch from stable branch for 'Allow printing from
   the Internet' check-box (bug #221003).



From fedora-extras-commits at redhat.com  Tue Sep 25 11:46:19 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue, 25 Sep 2007 07:46:19 -0400
Subject: rpms/gnome-applets/devel
	gnome-applets-2.20.0-mixer-out-of-sync.patch, 
	1.1, 1.2 gnome-applets.spec, 1.244, 1.245
Message-ID: <200709251146.l8PBkJY9015653@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15630

Modified Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
	gnome-applets.spec 
Log Message:
* Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
- Fix possible crasher in the mixer messages when we receive an
  unhandled message (#302881)


gnome-applets-2.20.0-mixer-out-of-sync.patch:

Index: gnome-applets-2.20.0-mixer-out-of-sync.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-2.20.0-mixer-out-of-sync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.20.0-mixer-out-of-sync.patch	20 Sep 2007 00:02:46 -0000	1.1
+++ gnome-applets-2.20.0-mixer-out-of-sync.patch	25 Sep 2007 11:46:16 -0000	1.2
@@ -212,7 +212,7 @@
      tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
    } else {
      /* Translator comment: I'm not all too sure if this makes sense
-@@ -1152,10 +1207,53 @@
+@@ -1152,10 +1207,56 @@
  				"state", mute ? "1" : "0", NULL);
  }
  
@@ -244,7 +244,7 @@
 +    gst_mixer_message_parse_mute_toggled (message, &track, &muted);
 +    mute = muted ? 1 : 0;
 +  }
-+  else {
++  else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
 +    gint n, num_channels, *vols;
 +    volume = 0.0;
 +
@@ -253,6 +253,9 @@
 +      volume += vols[n];
 +    volume /= track->num_channels;
 +    volume = 100 * volume / (track->max_volume - track->min_volume);
++  } else
++  {
++    return;
 +  }
 +
 +  if (first_track == track)
@@ -267,7 +270,7 @@
  
    return TRUE;
  }
-@@ -1214,6 +1312,8 @@
+@@ -1214,6 +1315,8 @@
              /* save */
              gst_object_replace ((GstObject **) &applet->mixer, item->data);
              gst_element_set_state (old_element, GST_STATE_NULL);
@@ -276,7 +279,7 @@
              newdevice = TRUE;
            }
            break;
-@@ -1374,7 +1474,7 @@
+@@ -1374,7 +1477,7 @@
    GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
  
    init_pixbufs (applet);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
+++ gnome-applets.spec	25 Sep 2007 11:46:16 -0000	1.245
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -357,6 +357,10 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
+- Fix possible crasher in the mixer messages when we receive an
+  unhandled message (#302881)
+
 * Sat Sep 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.2.20.0-4
 - Build modemlights applet again (#301601)
 



From fedora-extras-commits at redhat.com  Tue Sep 25 11:47:46 2007
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Tue, 25 Sep 2007 07:47:46 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.19,1.20
Message-ID: <200709251147.l8PBlk01015729@cvs-int.fedora.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_kerb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15709

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 5.3-6
- fix configure invocation (#301181)



Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_auth_kerb.spec	2 Sep 2007 14:06:19 -0000	1.19
+++ mod_auth_kerb.spec	25 Sep 2007 11:47:12 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.3
-Release: 5
+Release: 6
 License: BSD and MIT
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -30,7 +30,8 @@
 %patch8 -p1 -b .fixes
 
 %build
-%configure --without-krb4 --with-krb5=/usr/kerberos --with-apxs=/usr
+%configure --without-krb4 --with-krb5=/usr/kerberos \
+        --with-apache=%{_prefix}
 make %{?_smp_mflags} 
 
 %install
@@ -52,6 +53,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Tue Sep 25 2007 Joe Orton <jorton at redhat.com> 5.3-6
+- fix configure invocation (#301181)
+
 * Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 5.3-5
 - rebuild for fixed 32-bit APR
 



From fedora-extras-commits at redhat.com  Tue Sep 25 11:53:00 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 25 Sep 2007 07:53:00 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.86,1.87
Message-ID: <200709251153.l8PBr03B015899@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15881

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.2.v200709241202cvs
- Fix moving of arch-specific plugins that haven't been updated to new
  version.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- eclipse-cdt.spec	25 Sep 2007 03:25:50 -0000	1.86
+++ eclipse-cdt.spec	25 Sep 2007 11:52:28 -0000	1.87
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.1.v200709241202cvs%{?dist}
+Release:        0.2.v200709241202cvs%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -287,7 +287,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse
 pushd ${RPM_BUILD_ROOT}
 mkdir -p .%{_libdir}/eclipse/plugins
-for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do
+for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{majmin}\*); do
   mv $archplugin .%{_libdir}/eclipse/plugins
   chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin)
 done
@@ -355,6 +355,10 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.2.v200709241202cvs
+- Fix moving of arch-specific plugins that haven't been updated to new
+  version.
+
 * Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 4.0.1-0.1.v200709241202cvs
 - 4.0.1 RC.
 - Update autotools for Binaries fix.



From fedora-extras-commits at redhat.com  Tue Sep 25 12:07:53 2007
From: fedora-extras-commits at redhat.com (Adam Tkac (atkac))
Date: Tue, 25 Sep 2007 08:07:53 -0400
Subject: rpms/telnet/devel netkit-telnet-0.17-nodns.patch, 1.1,
	1.2 telnet.spec, 1.31, 1.32
Message-ID: <200709251207.l8PC7rE6022426@cvs-int.fedora.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22403

Modified Files:
	netkit-telnet-0.17-nodns.patch telnet.spec 
Log Message:
- rebased "nodns" patch with patch from Bryn M. Reeves


netkit-telnet-0.17-nodns.patch:

Index: netkit-telnet-0.17-nodns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/netkit-telnet-0.17-nodns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netkit-telnet-0.17-nodns.patch	13 Apr 2007 12:29:34 -0000	1.1
+++ netkit-telnet-0.17-nodns.patch	25 Sep 2007 12:07:51 -0000	1.2
@@ -1,63 +1,43 @@
---- netkit-telnet-0.17/telnetd/telnetd.8.nodns	2000-07-31 01:57:10.000000000 +0200
-+++ netkit-telnet-0.17/telnetd/telnetd.8	2007-04-13 10:58:27.000000000 +0200
-@@ -123,6 +123,8 @@
- .Xr login 1
- program.
- .El
-+.It Fl c
-+This option disables reverse dns checking. Of course that security is lower with this option
- .It Fl D Ar debugmode
- This option may be used for debugging purposes.  This allows
- .Nm telnetd
---- netkit-telnet-0.17/telnetd/telnetd.c.nodns	2007-04-13 10:49:57.000000000 +0200
-+++ netkit-telnet-0.17/telnetd/telnetd.c	2007-04-13 10:49:57.000000000 +0200
-@@ -83,6 +83,7 @@
- 
- int debug = 0;
- int keepalive = 1;
-+int nodns = 0;
- char *loginprg = _PATH_LOGIN;
- char *progname;
- 
-@@ -111,7 +112,7 @@
- 
- 	progname = *argv;
- 
--	while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
-+	while ((ch = getopt(argc, argv, "cd:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
- 		switch(ch) {
- 
- #ifdef	AUTHENTICATE
-@@ -147,7 +148,9 @@
- 			bftpd++;
- 			break;
- #endif /* BFTPDAEMON */
--
-+		case 'c':
-+			nodns++;
-+			break;
- 		case 'd':
- 			if (strcmp(optarg, "ebug") == 0) {
- 				debug++;
-@@ -652,6 +655,9 @@
- 	char namebuf[255];
+--- netkit-telnet-0.17.orig/telnetd/telnetd.c	2007-03-13 16:31:20.000000000 +0000
++++ netkit-telnet-0.17.orig/telnetd/telnetd.c	2007-03-13 16:31:26.000000000 +0000
+@@ -653,6 +653,11 @@ doit(struct sockaddr *who, socklen_t who
  
  	error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
-+
-+	if ((error == EAI_AGAIN) && nodns)
-+		error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
  	
++	/* if we can't get a hostname now, settle for an address */	
++	if(error == EAI_AGAIN)
++		error = getnameinfo(who, wholen, namebuf, sizeof(namebuf),
++				NULL, 0, NI_NUMERICHOST);
++		
  	if (error) {
  		perror("getnameinfo: localhost");
-@@ -688,7 +694,10 @@
- 		hints.ai_socktype = SOCK_STREAM;
- 		hints.ai_flags = AI_ADDRCONFIG;
+ 		perror(gai_strerror(error));
+@@ -681,7 +686,7 @@ doit(struct sockaddr *who, socklen_t who
+ 	/* Get local host name */
+ 	{
+ 		struct addrinfo hints;
+-		struct addrinfo *res;
++		struct addrinfo *res = 0;
+ 		int e;
+ 
+ 		memset(&hints, '\0', sizeof(hints));
+@@ -690,11 +695,14 @@ doit(struct sockaddr *who, socklen_t who
  
--		gethostname(host_name, sizeof(host_name));
-+		if(nodns)
-+			sprintf(host_name, "localhost", sizeof(host_name));
-+		else
-+			gethostname(host_name, sizeof(host_name));
+ 		gethostname(host_name, sizeof(host_name));
  		if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
- 			perror("getaddrinfo: localhost");
- 			perror(gai_strerror(e));
+-			perror("getaddrinfo: localhost");
+-			perror(gai_strerror(e));
+-			exit(1);
++			if(e != EAI_AGAIN) {
++				fprintf(stderr, "getaddrinfo: localhost %s\n", 
++				        gai_strerror(e));
++				exit(1);
++			}
+ 		}
+-		freeaddrinfo(res);
++		if(res)
++			freeaddrinfo(res);
+ 	}
+ 
+ #if	defined(AUTHENTICATE) || defined(ENCRYPT)
+


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- telnet.spec	20 Sep 2007 09:19:07 -0000	1.31
+++ telnet.spec	25 Sep 2007 12:07:51 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 40%{?dist}
+Release: 41%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Tue Sep 25 2007 Adam Tkac <atkac redhat com> 1:0.17-41
+- rebased "nodns" patch with patch from Bryn M. Reeves
+
 * Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
 - improved patch to #274991
 



From fedora-extras-commits at redhat.com  Tue Sep 25 12:26:22 2007
From: fedora-extras-commits at redhat.com (Martin Bacovsky (mbacovsk))
Date: Tue, 25 Sep 2007 08:26:22 -0400
Subject: rpms/squid/devel squid-2.6.STABLE16-fd.patch, NONE, 1.1 squid.spec, 
	1.88, 1.89
Message-ID: <200709251226.l8PCQMmm022749@cvs-int.fedora.redhat.com>

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22728

Modified Files:
	squid.spec 
Added Files:
	squid-2.6.STABLE16-fd.patch 
Log Message:
* Tue Sep 25 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-2
- our fd_config patch was replaced by upstream's version 
- Source1 (FAQ.sgml) points to local source (upstream's moved to wiki)


squid-2.6.STABLE16-fd.patch:

--- NEW FILE squid-2.6.STABLE16-fd.patch ---
diff -up squid-2.6.STABLE16/src/tools.c.fd squid-2.6.STABLE16/src/tools.c
--- squid-2.6.STABLE16/src/tools.c.fd	2007-09-01 22:09:50.000000000 +0200
+++ squid-2.6.STABLE16/src/tools.c	2007-09-21 15:01:32.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.c,v 1.250.2.3 2007/09/01 20:09:50 hno Exp $
+ * $Id: tools.c,v 1.255 2007/06/29 00:08:18 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -735,46 +735,62 @@ readPidFile(void)
 }
 
 
+/* A little piece of glue for odd systems */
+#ifndef RLIMIT_NOFILE
+#ifdef RLIMIT_OFILE
+#define RLIMIT_NOFILE RLIMIT_OFILE
+#endif
+#endif
+
+/* Figure out the number of supported filedescriptors */
 void
 setMaxFD(void)
 {
-#if HAVE_SETRLIMIT
-    /* try to use as many file descriptors as possible */
-    /* System V uses RLIMIT_NOFILE and BSD uses RLIMIT_OFILE */
+#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)
     struct rlimit rl;
-#if !defined(_SQUID_CYGWIN_)
-#if defined(RLIMIT_NOFILE)
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
-	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
-    } else {
-	rl.rlim_cur = Squid_MaxFD;
-	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
-	if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
-	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
-		"setrlimit: RLIMIT_NOFILE: %s", xstrerror());
-	    fatal_dump(tmp_error_buf);
-	}
+	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    } else if (Config.max_filedescriptors > 0) {
+	    rl.rlim_cur = Config.max_filedescriptors;
+	    if (rl.rlim_cur > rl.rlim_max)
+	        rl.rlim_max = rl.rlim_cur;
+	    if (setrlimit(RLIMIT_NOFILE, &rl)) {
+  	        debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+	        getrlimit(RLIMIT_NOFILE, &rl);
+	        rl.rlim_cur = rl.rlim_max;
+	        if (setrlimit(RLIMIT_NOFILE, &rl)) {
+		        debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+	        }
+	    }
     }
-#elif defined(RLIMIT_OFILE)
-    if (getrlimit(RLIMIT_OFILE, &rl) < 0) {
-	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
     } else {
-	rl.rlim_cur = Squid_MaxFD;
-	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
-	if (setrlimit(RLIMIT_OFILE, &rl) < 0) {
-	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
-		"setrlimit: RLIMIT_OFILE: %s", xstrerror());
-	    fatal_dump(tmp_error_buf);
-	}
+	    Squid_MaxFD = rl.rlim_cur;
     }
-#endif
-#endif
-#else /* HAVE_SETRLIMIT */
-    debug(21, 1) ("setMaxFD: Cannot increase: setrlimit() not supported on this system\n");
 #endif /* HAVE_SETRLIMIT */
+}
 
+void
+setSystemLimits(void)
+{
+#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE) && !defined(_SQUID_CYGWIN_)
+    /* limit system filedescriptors to our own limit */
+    struct rlimit rl;
+    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	    debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
+    } else {
+  	    rl.rlim_cur = Squid_MaxFD;
+	    if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
+  	        snprintf(tmp_error_buf, ERROR_BUF_SZ,
+		        "setrlimit: RLIMIT_NOFILE: %s", xstrerror());
+  	        fatal_dump(tmp_error_buf);
+  	    }
+    }
+  #endif /* HAVE_SETRLIMIT */
+    if (Config.max_filedescriptors > Squid_MaxFD) {
+	    debug(50, 1) ("NOTICE: Could not increase the number of filedescriptors\n");
+    }
 #if HAVE_SETRLIMIT && defined(RLIMIT_DATA)
     if (getrlimit(RLIMIT_DATA, &rl) < 0) {
 	debug(50, 0) ("getrlimit: RLIMIT_DATA: %s\n", xstrerror());
diff -up squid-2.6.STABLE16/src/cf.data.pre.fd squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.fd	2007-09-21 12:52:28.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-21 15:07:15.000000000 +0200
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.382.2.14 2007/09/05 21:50:15 hno Exp $
+# $Id: cf.data.pre,v 1.424 2007/09/19 11:50:39 hno Exp $
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -5216,4 +5216,16 @@ DOC_START
 	rounded to 1000.
 DOC_END
 
+NAME: max_filedescriptors max_filedesc
+TYPE: int
+DEFAULT: 0
+LOC: Config.max_filedescriptors
+DOC_START
+	The maximum number of filedescriptors supported.
+
+	The default "0" means Squid inherits the current ulimit setting.
+
+	Note: Changing this requires a restart of Squid. Also
+	not all comm loops supports values larger than --with-maxfd.
+DOC_END
 EOF
diff -up squid-2.6.STABLE16/src/protos.h.fd squid-2.6.STABLE16/src/protos.h
--- squid-2.6.STABLE16/src/protos.h.fd	2007-07-15 11:52:17.000000000 +0200
+++ squid-2.6.STABLE16/src/protos.h	2007-09-21 15:03:14.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.520.2.3 2007/07/15 09:52:17 hno Exp $
+ * $Id: protos.h,v 1.531 2007/06/29 00:08:18 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1102,6 +1102,7 @@ extern void no_suid(void);
 extern void writePidFile(void);
 extern void setSocketShutdownLifetimes(int);
 extern void setMaxFD(void);
+extern void setSystemLimits(void);
 extern time_t getCurrentTime(void);
 extern int percent(int, int);
 extern double dpercent(double, double);
diff -up squid-2.6.STABLE16/src/main.c.fd squid-2.6.STABLE16/src/main.c
--- squid-2.6.STABLE16/src/main.c.fd	2007-08-31 15:52:10.000000000 +0200
+++ squid-2.6.STABLE16/src/main.c	2007-09-21 15:04:01.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.393.2.4 2007/08/31 13:52:10 hno Exp $
+ * $Id: main.c,v 1.397 2007/06/29 00:08:18 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -552,6 +552,7 @@ mainInitialize(void)
 	debug(1, 0) ("Running on %s\n", WIN32_OS_string);
 #endif
     debug(1, 1) ("Process ID %d\n", (int) getpid());
+    setSystemLimits();
     debug(1, 1) ("With %d file descriptors available\n", Squid_MaxFD);
 #ifdef _SQUID_MSWIN_
     debug(1, 1) ("With %d CRT stdio descriptors available\n", _getmaxstdio());
diff -up squid-2.6.STABLE16/src/structs.h.fd squid-2.6.STABLE16/src/structs.h
--- squid-2.6.STABLE16/src/structs.h.fd	2007-09-05 23:28:34.000000000 +0200
+++ squid-2.6.STABLE16/src/structs.h	2007-09-21 15:04:49.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.507.2.8 2007/09/05 21:28:34 hno Exp $
+ * $Id: structs.h,v 1.517 2007/06/28 23:22:01 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -810,6 +810,7 @@ struct _SquidConfig {
 #endif
     time_t refresh_stale_window;
     int umask;
+    int max_filedescriptors;
 };
 
 struct _SquidConfig2 {


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- squid.spec	14 Sep 2007 06:18:59 -0000	1.88
+++ squid.spec	25 Sep 2007 12:25:50 -0000	1.89
@@ -5,13 +5,13 @@
 Summary:  The Squid proxy caching server
 Name:     squid
 Version:  2.6.STABLE16
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
 Source:   http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2
-Source1:  http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
+Source1:  FAQ.sgml
 Source2:  squid.init
 Source3:  squid.logrotate
 Source4:  squid.sysconfig
@@ -31,7 +31,8 @@
 Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE12-smb-path.patch
-Patch206: squid-2.6.STABLE5-fd-config.patch
+#Patch206: squid-2.6.STABLE5-fd-config.patch
+Patch206: squid-2.6.STABLE16-fd.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -326,6 +327,10 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 25 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-2
+- our fd_config patch was replaced by upstream's version 
+- Source1 (FAQ.sgml) points to local source (upstream's moved to wiki)
+
 * Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
 - upgrade to latest upstream 2.6.STABLE16
 



From fedora-extras-commits at redhat.com  Tue Sep 25 12:40:07 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:40:07 -0400
Subject: rpms/kdelibs/devel kdelibs.spec,1.233,1.234
Message-ID: <200709251240.l8PCe7QO023204@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23157

Modified Files:
	kdelibs.spec 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- kdelibs.spec	1 Sep 2007 17:40:35 -0000	1.233
+++ kdelibs.spec	25 Sep 2007 12:39:34 -0000	1.234
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -60,6 +60,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
+Patch45: kdelibs-3.5.7-autostart.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -78,7 +79,7 @@
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
 # vcard30 patch, http://bugs.kde.org/115219
-Patch115219: kdelibs-3.5.7-kde#115219.patch
+Patch503: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,6 +230,7 @@
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
+%patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -238,7 +240,7 @@
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
-%patch115219 -p1 -b .kde#115219
+%patch503 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -521,6 +523,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-23
+- fix rh#243611, autostart from XDG_CONFIG_DIRS
+
 * Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
 - Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
   (allows using the old /opt/kde4 versions for now)



From fedora-extras-commits at redhat.com  Tue Sep 25 12:46:39 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:46:39 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.7-autostart.patch,NONE,1.1
Message-ID: <200709251246.l8PCkda0023518@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23509

Added Files:
	kdelibs-3.5.7-autostart.patch 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
+++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+	  xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
+	  KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
 }
 
 AutoStart::~AutoStart()



From fedora-extras-commits at redhat.com  Tue Sep 25 12:55:27 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Tue, 25 Sep 2007 08:55:27 -0400
Subject: rpms/kdelibs/F-7 kdelibs-3.5.7-autostart.patch, NONE,
	1.1 kdelibs.spec, 1.220, 1.221
Message-ID: <200709251255.l8PCtRpw023807@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.7-autostart.patch 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
+++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+	  xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
+	  KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
 }
 
 AutoStart::~AutoStart()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kdelibs.spec	1 Sep 2007 17:40:32 -0000	1.220
+++ kdelibs.spec	25 Sep 2007 12:54:55 -0000	1.221
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 22%{?dist}
+Release: 22.1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -60,6 +60,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
+Patch45: kdelibs-3.5.7-autostart.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -78,7 +79,7 @@
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
 # vcard30 patch, http://bugs.kde.org/115219
-Patch115219: kdelibs-3.5.7-kde#115219.patch
+Patch503: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,6 +230,7 @@
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
+%patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -238,7 +240,7 @@
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
-%patch115219 -p1 -b .kde#115219
+%patch503 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -521,6 +523,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-22.1
+- fix rh#243611, autostart from XDG_CONFIG_DIRS
+
 * Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
 - Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
   (allows using the old /opt/kde4 versions for now)



From fedora-extras-commits at redhat.com  Tue Sep 25 13:06:02 2007
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Tue, 25 Sep 2007 09:06:02 -0400
Subject: rpms/dovecot/devel dovecot-1.0.rc15-default-settings.patch, 1.2,
	1.3 dovecot-1.0.rc27-quota-warning.patch, NONE,
	1.1 dovecot-1.0.rc32-split.patch, 1.3, 1.4 .cvsignore, 1.31,
	1.32 dovecot.spec, 1.90, 1.91 sources, 1.34, 1.35
Message-ID: <200709251306.l8PD62u1030243@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-1.0.rc15-default-settings.patch 
	dovecot-1.0.rc27-quota-warning.patch 
	dovecot-1.0.rc32-split.patch 
Log Message:
* Tue Sep 25 2007 Tomas Janousek <tjanouse at redhat.com> - 1:1.0.5-1
- downgraded to lastest upstream stable (1.0.5)


dovecot-1.0.rc15-default-settings.patch:

Index: dovecot-1.0.rc15-default-settings.patch
===================================================================
RCS file: dovecot-1.0.rc15-default-settings.patch
diff -N dovecot-1.0.rc15-default-settings.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dovecot-1.0.rc15-default-settings.patch	25 Sep 2007 13:05:58 -0000	1.3
@@ -0,0 +1,107 @@
+--- dovecot-1.0.rc15/src/master/master-settings.c.default-settings	2006-11-12 18:56:07.000000000 +0100
++++ dovecot-1.0.rc15/src/master/master-settings.c	2006-11-21 09:47:40.000000000 +0100
+@@ -269,8 +269,8 @@
+ 	MEMBER(syslog_facility) "mail",
+ 
+ 	/* general */
+-	MEMBER(protocols) "imap imaps",
+-	MEMBER(listen) "*",
++	MEMBER(protocols) "imap imaps pop3 pop3s",
++	MEMBER(listen) "[::]",
+ 	MEMBER(ssl_listen) "",
+ 
+ 	MEMBER(ssl_disable) FALSE,
+@@ -281,7 +281,7 @@
+ 	MEMBER(ssl_parameters_regenerate) 168,
+ 	MEMBER(ssl_cipher_list) "",
+ 	MEMBER(ssl_verify_client_cert) FALSE,
+-	MEMBER(disable_plaintext_auth) TRUE,
++	MEMBER(disable_plaintext_auth) FALSE,
+ 	MEMBER(verbose_ssl) FALSE,
+ 	MEMBER(shutdown_clients) TRUE,
+ 	MEMBER(nfs_check) TRUE,
+@@ -337,7 +337,7 @@
+ 	MEMBER(maildir_stat_dirs) FALSE,
+ 	MEMBER(maildir_copy_with_hardlinks) FALSE,
+ 	MEMBER(mbox_read_locks) "fcntl",
+-	MEMBER(mbox_write_locks) "dotlock fcntl",
++	MEMBER(mbox_write_locks) "fcntl",
+ 	MEMBER(mbox_lock_timeout) 300,
+ 	MEMBER(mbox_dotlock_change_timeout) 120,
+ 	MEMBER(mbox_min_index_size) 0,
+@@ -366,7 +366,7 @@
+ 	MEMBER(pop3_enable_last) FALSE,
+ 	MEMBER(pop3_reuse_xuidl) FALSE,
+ 	MEMBER(pop3_lock_session) FALSE,
+-	MEMBER(pop3_uidl_format) "",
++	MEMBER(pop3_uidl_format) "%08Xu%08Xv",
+ 	MEMBER(pop3_client_workarounds) "",
+ 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
+ 
+--- dovecot-1.0.rc15/dovecot-example.conf.default-settings	2006-11-05 18:14:37.000000000 +0100
++++ dovecot-1.0.rc15/dovecot-example.conf	2006-11-21 09:49:06.000000000 +0100
+@@ -7,17 +7,14 @@
+ # value inside quotes, eg.: key = "# char and trailing whitespace  "
+ 
+ # Default values are shown for each setting, it's not required to uncomment
+-# any of the lines. Exception to this are paths, they're just examples with
+-# the real defaults being based on configure options. The paths listed here
+-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+-# --with-ssldir=/etc/ssl
++# any of the lines.
+ 
+ # Base directory where to store runtime data.
+ #base_dir = /var/run/dovecot/
+ 
+ # Protocols we want to be serving: imap imaps pop3 pop3s
+ # If you only want to use dovecot-auth, you can set this to "none".
+-#protocols = imap imaps
++#protocols = imap imaps pop3 pop3s
+ 
+ # IP or host address where to listen in for connections. It's not currently
+ # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
+@@ -36,13 +33,13 @@
+ #     listen = *:10100
+ #     ..
+ #   }
+-#listen = *
++#listen = [::]
+ 
+ # Disable LOGIN command and all other plaintext authentications unless
+ # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+ # matches the local IP (ie. you're connecting from the same computer), the
+ # connection is considered secure and plaintext authentication is allowed.
+-#disable_plaintext_auth = yes
++#disable_plaintext_auth = no
+ 
+ # Should all IMAP and POP3 processes be killed when Dovecot master process
+ # shuts down. Setting this to "no" means that Dovecot can be upgraded without
+@@ -87,8 +84,8 @@
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root. Included doc/mkcert.sh can be used to easily generate self-signed
+ # certificate, just make sure to update the domains in dovecot-openssl.cnf
+-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+-#ssl_key_file = /etc/ssl/private/dovecot.pem
++#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
++#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
+ 
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter.
+@@ -425,7 +422,7 @@
+ # locking methods as well. Some operating systems don't allow using some of
+ # them simultaneously.
+ #mbox_read_locks = fcntl
+-#mbox_write_locks = dotlock fcntl
++#mbox_write_locks = fcntl
+ 
+ # Maximum time in seconds to wait for lock (all of them) before aborting.
+ #mbox_lock_timeout = 300
+@@ -593,7 +590,7 @@
+   # installations. %08Xu%08Xv will be the new default, so use it for new
+   # installations.
+   #
+-  #pop3_uidl_format = 
++  #pop3_uidl_format = %08Xu%08Xv
+ 
+   # POP3 logout format string:
+   #  %t - number of TOP commands

dovecot-1.0.rc27-quota-warning.patch:

--- NEW FILE dovecot-1.0.rc27-quota-warning.patch ---
http://dovecot.org/list/dovecot/2007-April/021429.html

diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota-plugin.c dovecot-1.0.rc27/src/plugins/quota/quota-plugin.c
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota-plugin.c	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota-plugin.c	2007-03-31 22:18:55.000000000 +0200
@@ -21,9 +21,24 @@
 
 	env = getenv("QUOTA");
 	if (env != NULL) {
+		struct quota_setup *setup;
+		const char *name;
+		unsigned int i;
 		quota_set = quota_init();
 		/* Currently we support only one quota setup */
-		(void)quota_setup_init(quota_set, env, TRUE);
+		setup = quota_setup_init(quota_set, env, TRUE);
+
+		name = "QUOTA_WARNING";
+		env = getenv(name);
+		i = 1;
+		t_push();
+		while (env != NULL) {
+			(void)quota_warning_init(setup, env);
+
+			name = t_strdup_printf("QUOTA_WARNING%u", ++i);
+			env = getenv(name);
+		}
+		t_pop();
 
 		quota_next_hook_mail_storage_created =
 			hook_mail_storage_created;
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota-private.h dovecot-1.0.rc27/src/plugins/quota/quota-private.h
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota-private.h	2007-03-12 21:34:50.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota-private.h	2007-03-17 00:06:23.000000000 +0100
@@ -22,6 +22,9 @@
 	/* List of quota roots. It's array because there shouldn't be many. */
 	array_t ARRAY_DEFINE(roots, struct quota_root *);
 
+	/* List of quota warnings. There should probably be few. */
+	array_t ARRAY_DEFINE(warnings, struct quota_warning *);
+
 	unsigned int user_root:1;
 };
 
@@ -86,6 +89,21 @@
 	unsigned int idx;
 };
 
+enum quota_warning_limit_kind {
+	QUOTA_WARNING_NO_LIMIT,
+	QUOTA_WARNING_PERCENT_LIMIT,
+	QUOTA_WARNING_ABSOLUTE_LIMIT
+};
+
+struct quota_warning {
+	struct quota_setup *setup;
+	uint64_t storage_limit;
+	unsigned int count_limit;
+	enum quota_warning_limit_kind storage_limit_kind:2;
+	enum quota_warning_limit_kind count_limit_kind:2;
+	char *command;
+};
+
 struct quota_transaction_context {
 	array_t ARRAY_DEFINE(root_transactions,
 			     struct quota_root_transaction_context *);
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota.c dovecot-1.0.rc27/src/plugins/quota/quota.c
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota.c	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota.c	2007-03-31 22:35:22.000000000 +0200
@@ -6,6 +6,8 @@
 #include "quota-private.h"
 #include "quota-fs.h"
 
+#include <stdlib.h>
+
 unsigned int quota_module_id = 0;
 
 extern struct quota_backend quota_backend_dict;
@@ -59,6 +61,7 @@
 	setup->data = i_strdup(data);
 	setup->user_root = user_root;
 	ARRAY_CREATE(&setup->roots, default_pool, struct quota_root *, 4);
+	ARRAY_CREATE(&setup->warnings, default_pool, struct quota_warning *, 4);
 
 	t_push();
 	p = strchr(setup->data, ':');
@@ -107,6 +110,16 @@
 	}
 
 	array_free(&setup->roots);
+
+	while (array_count(&setup->warnings) > 0) {
+		struct quota_warning *const *warning;
+
+		warning = array_idx(&setup->warnings, 0);
+		quota_warning_deinit(*warning);
+	}
+
+	array_free(&setup->warnings);
+
 	i_free(setup->data);
 	i_free(setup);
 }
@@ -157,6 +170,82 @@
 	array_free(&module_contexts);
 }
 
+struct quota_warning *
+quota_warning_init(struct quota_setup *setup, const char *data)
+{
+	const char *p;
+	char *q;
+	const char *const *args;
+	unsigned long long val;
+	struct quota_warning *warning;
+
+	warning = i_new(struct quota_warning, 1);
+	warning->setup = setup;
+
+	p = strchr(data, ' ');
+	if (p == NULL)
+		i_fatal("quota warning: No command specified: %s", data);
+	warning->command = i_strdup(p+1);
+
+	t_push();
+
+	args = t_strsplit(t_strdup_until(data, p), ":");
+	for (; *args != '\0'; args++) {
+		if (strncmp(*args, "storage=", 8) == 0) {
+			val = strtoull(*args + 8, &q, 10);
+			if (q && (strcmp(q, "%") == 0)) {
+				warning->storage_limit = val;
+				warning->storage_limit_kind =
+					QUOTA_WARNING_PERCENT_LIMIT;
+			} else if (q && (strcmp(q, "k") == 0)) {
+				warning->storage_limit = val * 1024;
+				warning->storage_limit_kind =
+					QUOTA_WARNING_ABSOLUTE_LIMIT;
+			} else
+				i_error("quota warning: Malformed setting: %s", *args);
+		} else if (strncmp(*args, "messages=", 9) == 0) {
+			val = strtoull(*args + 8, &q, 10);
+			if (q && (strcmp(q, "%") == 0)) {
+				warning->count_limit = val;
+				warning->count_limit_kind =
+					QUOTA_WARNING_PERCENT_LIMIT;
+			} else if (q && (strcmp(q, "") == 0)) {
+				warning->count_limit = val;
+				warning->count_limit_kind =
+					QUOTA_WARNING_ABSOLUTE_LIMIT;
+			} else
+				i_error("quota warning: Malformed setting: %s", *args);
+		} else {
+			i_error("quota warning: Unknown setting: %s", *args);
+		}
+	}
+
+	t_pop();
+
+	array_append(&setup->warnings, &warning, 1);
+
+	return warning;
+}
+
+void quota_warning_deinit(struct quota_warning *warning)
+{
+	struct quota_warning *const *warnings;
+	unsigned int i, count;
+
+	/* remove from setup */
+	warnings = array_get(&warning->setup->warnings, &count);
+	for (i = 0; i < count; i++) {
+		if (warnings[i] == warning) {
+			array_delete(&warning->setup->warnings, i, 1);
+			break;
+		}
+	}
+	i_assert(i != count);
+
+	i_free(warning->command);
+	i_free(warning);
+}
+
 void quota_add_user_storage(struct quota *quota, struct mail_storage *storage)
 {
 	struct quota_setup *const *setups;
@@ -388,15 +477,62 @@
 	i_free(ctx);
 }
 
+#define CHECK_PERCENT(val, cur, diff, limit) \
+	(100 * ((limit) - (cur) - (diff)) > (val) * (limit))
+#define CHECK_ABSOLUTE(val, cur, diff, limit) \
+	((limit) - (cur) - (diff) > (val))
+
+#define CHECK2_PERCENT(val, cur, diff, size, limit) \
+	(CHECK_PERCENT(val, cur, diff, limit) \
+	 && !CHECK_PERCENT(val, cur, (diff)+(size), limit))
+#define CHECK2_ABSOLUTE(val, cur, diff, size, limit) \
+	(CHECK_ABSOLUTE(val, cur, diff, limit) \
+	 && !CHECK_ABSOLUTE(val, cur, (diff)+(size), limit))
+
+#define CHECK(kind, val, cur, diff, size, limit) \
+	((((kind) == QUOTA_WARNING_PERCENT_LIMIT) \
+	  && (CHECK2_PERCENT(val, cur, diff, size, limit))) \
+	 || (((kind) == QUOTA_WARNING_ABSOLUTE_LIMIT) \
+	     && (CHECK2_ABSOLUTE(val, cur, diff, size, limit))))
+
 int quota_default_try_alloc_bytes(struct quota_root_transaction_context *ctx,
 				  uoff_t size, bool *too_large_r)
 {
+	struct quota_warning *const * warnings;
+	unsigned int i, count;
 	int ret;
 
 	ret = quota_default_test_alloc_bytes(ctx, size, too_large_r);
 	if (ret <= 0 || ctx->disabled)
 		return ret;
 
+	warnings = array_get(&ctx->root->setup->warnings, &count);
+
+	for (i = 0; i < count; i++) {
+		struct quota_warning *warning = warnings[i];
+		bool run_command = FALSE;
+
+		if (CHECK(warning->storage_limit_kind,
+			  warning->storage_limit,
+			  ctx->bytes_current,
+			  ctx->bytes_diff,
+			  size,
+			  ctx->bytes_limit))
+			run_command = TRUE;
+
+		if (CHECK(warning->count_limit_kind,
+			  warning->count_limit,
+			  ctx->count_current,
+			  ctx->count_diff,
+			  1,
+			  ctx->count_limit))
+			run_command = TRUE;
+
+		if (run_command)
+			system(warning->command);
+
+	}
+
 	ctx->count_diff++;
 	ctx->bytes_diff += size;
 	return 1;
diff -ru dovecot-1.0.rc27.orig/src/plugins/quota/quota.h dovecot-1.0.rc27/src/plugins/quota/quota.h
--- dovecot-1.0.rc27.orig/src/plugins/quota/quota.h	2007-03-06 17:34:47.000000000 +0100
+++ dovecot-1.0.rc27/src/plugins/quota/quota.h	2007-03-16 23:21:33.000000000 +0100
@@ -31,6 +31,10 @@
 quota_root_init(struct quota_setup *setup, const char *name);
 void quota_root_deinit(struct quota_root *root);
 
+struct quota_warning *
+quota_warning_init(struct quota_setup *setup, const char *data);
+void quota_warning_deinit(struct quota_warning *warning);
+
 /* List all quota roots. Returned quota roots are freed by quota_deinit(). */
 struct quota_root_iter *quota_root_iter_init(struct mailbox *box);
 struct quota_root *quota_root_iter_next(struct quota_root_iter *iter);

dovecot-1.0.rc32-split.patch:

Index: dovecot-1.0.rc32-split.patch
===================================================================
RCS file: dovecot-1.0.rc32-split.patch
diff -N dovecot-1.0.rc32-split.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dovecot-1.0.rc32-split.patch	25 Sep 2007 13:05:58 -0000	1.4
@@ -0,0 +1,311 @@
+--- dovecot-1.0.rc32/src/dict/main.c.split	2007-02-22 15:32:11.000000000 +0100
++++ dovecot-1.0.rc32/src/dict/main.c	2007-04-13 13:56:55.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ static struct io *log_io;
+ static struct module *modules;
++static struct module *sql_modules;
+ static struct dict_server *dict_server;
+ 
+ static void sig_die(int signo, void *context __attr_unused__)
+@@ -50,6 +51,8 @@
+ 	/* Load built-in SQL drivers (if any) */
+ 	sql_drivers_init();
+ 	sql_drivers_register_all();
++	sql_modules = sql_drivers_modules_load();
++	module_dir_init(sql_modules);
+ 
+ 	restrict_access_by_env(FALSE);
+ }
+@@ -100,6 +103,7 @@
+ 	dict_sql_unregister();
+ 	dict_client_unregister();
+ 
++	module_dir_unload(&sql_modules);
+ 	sql_drivers_deinit();
+ 	random_deinit();
+ 	lib_signals_deinit();
+--- dovecot-1.0.rc32/src/lib-sql/Makefile.am.split	2007-02-22 22:09:16.000000000 +0100
++++ dovecot-1.0.rc32/src/lib-sql/Makefile.am	2007-04-13 15:11:18.000000000 +0200
+@@ -1,21 +1,66 @@
+ noinst_LIBRARIES = libsql.a
+ 
++if DYNAMIC_SQL
++if BUILD_MYSQL
++MYSQL_LIB=libdriver_mysql.la
++endif
++if BUILD_PGSQL
++PGSQL_LIB=libdriver_pgsql.la
++endif
++if BUILD_SQLITE
++SQLITE_LIB=libdriver_sqlite.la
++endif
++
++sql_module_LTLIBRARIES = \
++	$(MYSQL_LIB) \
++	$(PGSQL_LIB) \
++	$(SQLITE_LIB)
++
++sql_moduledir = $(moduledir)/sql
++endif
++
+ sql_drivers = @sql_drivers@
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/lib \
++	-DMODULEDIR=\""$(moduledir)"\" \
+ 	$(SQL_CFLAGS)
+ 
+ dist_sources = \
++	sql-api.c
++
++if ! DYNAMIC_SQL
++driver_sources = \
+ 	driver-mysql.c \
+ 	driver-pgsql.c \
+-	driver-sqlite.c \
+-	sql-api.c
++	driver-sqlite.c
++endif
+ 
+ libsql_a_SOURCES = \
+ 	$(dist_sources) \
++	$(driver_sources) \
+ 	sql-drivers-register.c
+ 
++if DYNAMIC_SQL
++libdriver_mysql_la_LDFLAGS = -module -avoid-version
++libdriver_mysql_la_LIBADD = $(MYSQL_LIBS)
++libdriver_mysql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(MYSQL_CFLAGS)
++libdriver_mysql_la_SOURCES = \
++	driver-mysql.c
++
++libdriver_pgsql_la_LDFLAGS = -module -avoid-version
++libdriver_pgsql_la_LIBADD = $(PGSQL_LIBS)
++libdriver_pgsql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(PGSQL_CFLAGS)
++libdriver_pgsql_la_SOURCES = \
++	driver-pgsql.c
++
++libdriver_sqlite_la_LDFLAGS = -module -avoid-version
++libdriver_sqlite_la_LIBADD = $(SQLITE_LIBS)
++libdriver_sqlite_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(SQLITE_CFLAGS)
++libdriver_sqlite_la_SOURCES = \
++	driver-sqlite.c
++endif
++
+ headers = \
+ 	sql-api.h \
+ 	sql-api-private.h
+@@ -32,17 +77,21 @@
+ 	echo '/* this file automatically generated by Makefile */' >$@
+ 	echo '#include "lib.h"' >>$@
+ 	echo '#include "sql-api.h"' >>$@
++if ! DYNAMIC_SQL
+ 	for i in $(sql_drivers) null; do \
+ 	  if [ "$${i}" != "null" ]; then \
+ 	        echo "extern struct sql_db driver_$${i}_db;" >>$@ ; \
+ 	  fi \
+ 	done
++endif
+ 	echo 'void sql_drivers_register_all(void) {' >>$@
++if ! DYNAMIC_SQL
+ 	for i in $(sql_drivers) null; do \
+ 	  if [ "$${i}" != "null" ]; then \
+ 	        echo "sql_driver_register(&driver_$${i}_db);" >>$@ ; \
+ 	  fi \
+ 	done
++endif
+ 	echo '}' >>$@
+ 
+ DISTFILES = $(DIST_COMMON) $(dist_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+--- dovecot-1.0.rc32/src/lib-sql/sql-api.h.split	2006-07-01 19:23:52.000000000 +0200
++++ dovecot-1.0.rc32/src/lib-sql/sql-api.h	2007-04-13 13:56:55.000000000 +0200
+@@ -20,6 +20,8 @@
+ 
+ /* register all built-in SQL drivers */
+ void sql_drivers_register_all(void);
++struct module;
++struct module *sql_drivers_modules_load(void);
+ 
+ void sql_driver_register(const struct sql_db *driver);
+ void sql_driver_unregister(const struct sql_db *driver);
+--- dovecot-1.0.rc32/src/lib-sql/sql-api.c.split	2006-07-01 19:23:52.000000000 +0200
++++ dovecot-1.0.rc32/src/lib-sql/sql-api.c	2007-04-13 13:56:55.000000000 +0200
+@@ -2,6 +2,7 @@
+ 
+ #include "lib.h"
+ #include "array.h"
++#include "module-dir.h"
+ #include "sql-api-private.h"
+ 
+ array_t ARRAY_DEFINE(sql_drivers, const struct sql_db *);
+@@ -16,6 +17,12 @@
+ 	array_free(&sql_drivers);
+ }
+ 
++struct module *sql_drivers_modules_load(void)
++{
++	return module_dir_load(MODULEDIR"/sql",
++			NULL, TRUE, PACKAGE_VERSION);
++}
++
+ void sql_driver_register(const struct sql_db *driver)
+ {
+ 	array_append(&sql_drivers, &driver, 1);
+--- dovecot-1.0.rc32/src/auth/main.c.split	2007-03-15 16:48:13.000000000 +0100
++++ dovecot-1.0.rc32/src/auth/main.c	2007-04-13 13:56:55.000000000 +0200
+@@ -10,6 +10,7 @@
+ #include "sql-api.h"
+ #include "randgen.h"
+ #include "password-scheme.h"
++#include "module-dir.h"
+ #include "mech.h"
+ #include "auth.h"
+ #include "auth-request-handler.h"
+@@ -35,6 +36,8 @@
+ static struct auth *auth;
+ static struct auth_worker_client *worker_client;
+ 
++static struct module *sql_modules;
++
+ static void sig_die(int signo, void *context __attr_unused__)
+ {
+ 	/* warn about being killed because of some signal, except SIGINT (^C)
+@@ -189,6 +192,8 @@
+ 	/* Load built-in SQL drivers (if any) */
+ 	sql_drivers_init();
+ 	sql_drivers_register_all();
++	sql_modules = sql_drivers_modules_load();
++	module_dir_init(sql_modules);
+ 
+ 	/* Initialize databases so their configuration files can be readable
+ 	   only by root. Also load all modules here. */
+@@ -287,6 +292,7 @@
+ 	mech_deinit();
+ 
+         password_schemes_deinit();
++	module_dir_unload(&sql_modules);
+ 	sql_drivers_deinit();
+ 	random_deinit();
+ 
+--- dovecot-1.0.rc32/configure.in.split	2007-04-12 19:16:36.000000000 +0200
++++ dovecot-1.0.rc32/configure.in	2007-04-13 13:56:55.000000000 +0200
+@@ -225,6 +225,15 @@
+ 	fi,
+ 	want_sqlite=no)
+ 
++AC_ARG_WITH(dynamic-sql,
++[  --with-dynamic-sql    Build SQL modules as shared libs],
++	if test x$withval = xno; then
++		want_dynamic_sql=no
++	else
++		want_dynamic_sql=yes
++	fi,
++	want_dynamic_sql=no)
++
+ AC_ARG_WITH(ssl,
+ [  --with-ssl=[gnutls|openssl] Build with GNUTLS or OpenSSL (default)],
+ 	if test x$withval = xno; then
+@@ -1559,12 +1568,12 @@
+ 		fi
+ 		AC_CHECK_HEADER(libpq-fe.h, [
+ 			if test "$PGSQL_INCLUDE" != ""; then
+-				SQL_CFLAGS="$SQL_CFLAGS -I$PGSQL_INCLUDE"
++				PGSQL_CFLAGS="$PGSQL_CFLAGS -I$PGSQL_INCLUDE"
+ 			fi
+ 			if test "$PGSQL_LIBDIR" != ""; then
+-				SQL_LIBS="$SQL_LIBS -L$PGSQL_LIBDIR"
++				PGSQL_LIBS="$PGSQL_LIBS -L$PGSQL_LIBDIR"
+ 			fi
+-			SQL_LIBS="$SQL_LIBS -lpq"
++			PGSQL_LIBS="$PGSQL_LIBS -lpq"
+ 			AC_DEFINE(HAVE_PGSQL,, Build with PostgreSQL support)
+ 			found_sql_drivers="$found_sql_drivers pgsql"
+ 
+@@ -1610,12 +1619,12 @@
+ 		fi
+ 		AC_CHECK_HEADER(mysql.h, [
+ 			if test "$MYSQL_INCLUDE" != ""; then
+-				SQL_CFLAGS="$SQL_CFLAGS -I$MYSQL_INCLUDE"
++				MYSQL_CFLAGS="$MYSQL_CFLAGS -I$MYSQL_INCLUDE"
+ 			fi
+ 			if test "$MYSQL_LIBDIR" != ""; then
+-				SQL_LIBS="$SQL_LIBS -L$MYSQL_LIBDIR"
++				MYSQL_LIBS="$MYSQL_LIBS -L$MYSQL_LIBDIR"
+ 			fi
+-			SQL_LIBS="$SQL_LIBS $mysql_lib"
++			MYSQL_LIBS="$MYSQL_LIBS $mysql_lib"
+ 
+ 			AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
+ 				AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
+@@ -1646,13 +1655,18 @@
+ if test $want_sqlite = yes; then
+ 	AC_CHECK_LIB(sqlite3, sqlite3_open, [
+ 		AC_CHECK_HEADER(sqlite3.h, [
+-			SQL_LIBS="$SQL_LIBS -lsqlite3 -lz"
++			SQLITE_LIBS="$SQLITE_LIBS -lsqlite3 -lz"
+ 
+ 			AC_DEFINE(HAVE_SQLITE,, Build with SQLite3 support)
+ 			found_sql_drivers="$found_sql_drivers sqlite"
+ 		])
+ 	])
+ fi
++	
++SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS $SQLITE_CFLAGS"
++if test "$want_dynamic_sql" = "no"; then
++	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS"
++fi
+ 
+ if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then
+ 	if test "$all_sql_drivers" = "yes"; then
+@@ -1716,6 +1730,12 @@
+ AC_SUBST(AUTH_LIBS)
+ AC_SUBST(SQL_CFLAGS)
+ AC_SUBST(SQL_LIBS)
++AC_SUBST(MYSQL_CFLAGS)
++AC_SUBST(MYSQL_LIBS)
++AC_SUBST(PGSQL_CFLAGS)
++AC_SUBST(PGSQL_LIBS)
++AC_SUBST(SQLITE_CFLAGS)
++AC_SUBST(SQLITE_LIBS)
+ 
+ dnl **
+ dnl ** Index file compatibility flags
+@@ -1783,17 +1803,27 @@
+ dnl ** SQL drivers
+ dnl **
+ 
++build_pgsql=no
++build_mysql=no
++build_sqlite=no
+ for driver in $sql_drivers; do
+   if test "$driver" = "pgsql"; then
+     AC_DEFINE(BUILD_PGSQL,, Built-in PostgreSQL support)
++    build_pgsql=yes
+   elif test "$driver" = "mysql"; then
+     AC_DEFINE(BUILD_MYSQL,, Built-in MySQL support)
++    build_mysql=yes
+   elif test "$driver" = "sqlite"; then
+     AC_DEFINE(BUILD_SQLITE,, Built-in SQLite support)
++    build_sqlite=yes
+   fi
+ done
+ 
+ AC_SUBST(sql_drivers)
++AM_CONDITIONAL(BUILD_PGSQL, test "$build_pgsql" = "yes")
++AM_CONDITIONAL(BUILD_MYSQL, test "$build_mysql" = "yes")
++AM_CONDITIONAL(BUILD_SQLITE, test "$build_sqlite" = "yes")
++AM_CONDITIONAL(DYNAMIC_SQL, test "$want_dynamic_sql" = "yes")
+ 
+ dnl **
+ dnl ** Plugins
+@@ -1873,4 +1903,8 @@
+ echo "Building with GSSAPI support ........ : $have_gssapi"
+ echo "Building with user database modules . :$userdb"
+ echo "Building with password lookup modules :$passdb"
+-echo "Building with SQL drivers ............:$sql_drivers"
++if test "$want_dynamic_sql" = "yes"; then
++	echo "Building with SQL drivers ............:$sql_drivers (dynamic)"
++else
++	echo "Building with SQL drivers ............:$sql_drivers"
++fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Aug 2007 14:58:08 -0000	1.31
+++ .cvsignore	25 Sep 2007 13:05:58 -0000	1.32
@@ -1,3 +1,4 @@
-dovecot-1.1.alpha3.tar.gz
-dovecot-1.1.alpha3.tar.gz.sig
-dovecot-sieve-1.1-0367450c9382.tar.gz
+dovecot-1.0.5.tar.gz
+dovecot-1.0.5.tar.gz.sig
+dovecot-sieve-1.0.2.tar.gz
+dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- dovecot.spec	22 Aug 2007 12:45:08 -0000	1.90
+++ dovecot.spec	25 Sep 2007 13:05:58 -0000	1.91
@@ -1,15 +1,16 @@
 #%define dovecot_hg a744ae38a9e1
-%define sieve_hg 0367450c9382
-%define upstream 1.1.alpha3
-%define sieve_upstream 1.1-%{sieve_hg}
-%define pkg_version 1.1
-%define my_release 16.1
-%define pkg_release %{my_release}.alpha3%{?dist}
-%define pkg_sieve_version 1.1
-%define pkg_sieve_release %{my_release}.hg.%{sieve_hg}%{?dist}
+#%define sieve_hg 0367450c9382
+%define upstream 1.0.5
+%define sieve_upstream 1.0.2
+%define pkg_version 1.0.5
+%define my_release 1
+%define pkg_release %{my_release}%{?dist}
+%define pkg_sieve_version 1.0.2
+%define pkg_sieve_release %{my_release}%{?dist}
 
 Summary: Dovecot Secure imap server
 Name: dovecot
+Epoch: 1
 Version: %{pkg_version}
 Release: %{pkg_release}
 License: MIT and LGPLv2 and BSD with advertising
@@ -33,12 +34,14 @@
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
-Patch100: dovecot-1.1.alpha1-default-settings.patch
+Patch100: dovecot-1.0.rc15-default-settings.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
-Patch107: dovecot-1.1-unicodedata.patch
+Patch106: dovecot-1.0.rc27-quota-warning.patch
+#Patch107: dovecot-1.1-unicodedata.patch
 #Patch200: dovecot-%{dovecot_hg}.patch
+Patch200: dovecot-1.0.rc32-split.patch
 
 # XXX this patch needs review and forward porting
 #Patch105: dovecot-auth-log.patch
@@ -100,7 +103,7 @@
 
 %if %{build_sieve}
 %package sieve
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: CMU Sieve plugin for dovecot LDA
 Group: System Environment/Daemons
 Version: %{pkg_sieve_version}
@@ -118,7 +121,7 @@
 
 %if %{build_postgres}
 %package pgsql
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: Postgres SQL backend for dovecot
 Group: System Environment/Daemons
 %description pgsql
@@ -127,7 +130,7 @@
 
 %if %{build_mysql}
 %package mysql
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: MySQL backend for dovecot
 Group: System Environment/Daemons
 %description mysql
@@ -136,30 +139,30 @@
 
 %if %{build_sqlite}
 %package sqlite
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Summary: SQLite backend for dovecot
 Group: System Environment/Daemons
 %description sqlite
 This package provides the SQLite backend for dovecot-auth etc.
 %endif
 
-%if %{build_ldap}
-%package ldap
-Requires: %{name} = %{version}-%{release}
-Summary: LDAP auth plugin for dovecot
-Group: System Environment/Daemons
-%description ldap
-This package provides the LDAP auth plugin for dovecot-auth etc.
-%endif
-
-%if %{build_gssapi}
-%package gssapi
-Requires: %{name} = %{version}-%{release}
-Summary: GSSAPI auth mechanism plugin for dovecot
-Group: System Environment/Daemons
-%description gssapi
-This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc.
-%endif
+#%if %{build_ldap}
+#%package ldap
+#Requires: %{name} = %{epoch}:%{version}-%{release}
+#Summary: LDAP auth plugin for dovecot
+#Group: System Environment/Daemons
+#%description ldap
+#This package provides the LDAP auth plugin for dovecot-auth etc.
+#%endif
+
+#%if %{build_gssapi}
+#%package gssapi
+#Requires: %{name} = %{epoch}:%{version}-%{release}
+#Summary: GSSAPI auth mechanism plugin for dovecot
+#Group: System Environment/Daemons
+#%description gssapi
+#This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc.
+#%endif
 
 
 %prep
@@ -170,7 +173,9 @@
 %patch102 -p1 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
 %patch105 -p1 -b .mkcert-paths
-%patch107 -p1 -b .unicodedata
+#%patch107 -p1 -b .unicodedata
+%patch106 -p1 -b .quota-warning
+%patch200 -p1 -b .split
 #%patch200 -p1 -b .%{dovecot_hg}
 
 %if %{build_sieve}
@@ -193,16 +198,23 @@
 %if %{build_sqlite}
     --with-sqlite                \
 %endif
-    --with-sql=plugin            \
+    --with-dynamic-sql           \
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
+    --with-inotify               \
 %if %{build_ldap}
-    --with-ldap=plugin           \
+    --with-ldap                  \
 %endif
-    --with-inotify               \
 %if %{build_gssapi}
-    --with-gssapi=plugin
+    --with-gssapi                \
 %endif
+#    --with-sql=plugin            \
+#%if %{build_ldap}
+#    --with-ldap=plugin           \
+#%endif
+#%if %{build_gssapi}
+#    --with-gssapi=plugin
+#%endif
 
 make
 
@@ -370,35 +382,38 @@
 %if %{build_mysql}
 %files mysql
 %{_libdir}/%{name}/sql/libdriver_mysql.so
-%{_libdir}/%{name}/auth/libdriver_mysql.so
-%{_libdir}/%{name}/dict/libdriver_mysql.so
+#%{_libdir}/%{name}/auth/libdriver_mysql.so
+#%{_libdir}/%{name}/dict/libdriver_mysql.so
 %endif
 
 %if %{build_postgres}
 %files pgsql
 %{_libdir}/%{name}/sql/libdriver_pgsql.so
-%{_libdir}/%{name}/auth/libdriver_pgsql.so
-%{_libdir}/%{name}/dict/libdriver_pgsql.so
+#%{_libdir}/%{name}/auth/libdriver_pgsql.so
+#%{_libdir}/%{name}/dict/libdriver_pgsql.so
 %endif
 
 %if %{build_sqlite}
 %files sqlite
 %{_libdir}/%{name}/sql/libdriver_sqlite.so
-%{_libdir}/%{name}/auth/libdriver_sqlite.so
-%{_libdir}/%{name}/dict/libdriver_sqlite.so
+#%{_libdir}/%{name}/auth/libdriver_sqlite.so
+#%{_libdir}/%{name}/dict/libdriver_sqlite.so
 %endif
 
-%if %{build_ldap}
-%files ldap
-%{_libdir}/%{name}/auth/libauthdb_ldap.so
-%endif
-
-%if %{build_gssapi}
-%files gssapi
-%{_libdir}/%{name}/auth/libmech_gssapi.so
-%endif
+#%if %{build_ldap}
+#%files ldap
+#%{_libdir}/%{name}/auth/libauthdb_ldap.so
+#%endif
+
+#%if %{build_gssapi}
+#%files gssapi
+#%{_libdir}/%{name}/auth/libmech_gssapi.so
+#%endif
 
 %changelog
+* Tue Sep 25 2007 Tomas Janousek <tjanouse at redhat.com> - 1:1.0.5-1
+- downgraded to lastest upstream stable (1.0.5)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.1.alpha3
 - updated license tags
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	13 Aug 2007 14:58:08 -0000	1.34
+++ sources	25 Sep 2007 13:05:58 -0000	1.35
@@ -1,3 +1,4 @@
-379894a74d6531e15b573250273f081b  dovecot-1.1.alpha3.tar.gz
-32e848aba1fa8c276918ea369b1d73f8  dovecot-1.1.alpha3.tar.gz.sig
-14adc693f950696391b31d25d8e809dc  dovecot-sieve-1.1-0367450c9382.tar.gz
+94b7d29cf44f63f89d538361afa05c40  dovecot-1.0.5.tar.gz
+eacaec9e3502e9e0544e73846c3e9a09  dovecot-1.0.5.tar.gz.sig
+508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
+fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Tue Sep 25 13:15:57 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:15:57 -0400
Subject: devel/vim 7.1.117,NONE,1.1
Message-ID: <200709251315.l8PDFvIo030540@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30533

Added Files:
	7.1.117 
Log Message:
- patchlevel 117


--- NEW FILE 7.1.117 ---
To: vim-dev at vim.org
Subject: patch 7.1.117
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.117
Problem:    Can't check wether Vim was compiled with Gnome. (Tony Mechelynck)
Solution:   Add gui_gnome to the has() list.
Files:	    src/eval.c


*** ../vim-7.1.116/src/eval.c	Mon Sep 17 22:19:43 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 10879,10884 ****
--- 10883,10891 ----
  	"gui_gtk2",
  # endif
  #endif
+ #ifdef FEAT_GUI_GNOME
+ 	"gui_gnome",
+ #endif
  #ifdef FEAT_GUI_MAC
  	"gui_mac",
  #endif
*** ../vim-7.1.116/src/version.c	Mon Sep 17 22:38:49 2007
--- src/version.c	Tue Sep 25 12:48:59 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     117,
  /**/

-- 
ARTHUR:  No, hang on!  Just answer the five questions ...
GALAHAD: Three questions ...
ARTHUR:  Three questions ...  And we shall watch ... and pray.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:16:03 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:16:03 -0400
Subject: devel/vim 7.1.118,NONE,1.1
Message-ID: <200709251316.l8PDG3xm030563@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30556

Added Files:
	7.1.118 
Log Message:
- patchlevel 118


--- NEW FILE 7.1.118 ---
To: vim-dev at vim.org
Subject: patch 7.1.118
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.118 (after 7.1.107)
Problem:    Compiler warning for Visual C compiler.
Solution:   Add typecast. (Mike Williams)
Files:	    src/ops.c


*** ../vim-7.1.117/src/ops.c	Thu Sep 13 22:40:47 2007
--- src/ops.c	Mon Sep 24 18:30:09 2007
***************
*** 2605,2611 ****
  	/* Auto-indenting may have changed the indent.  If the cursor was past
  	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > pre_indent)
  	{
  	    long new_indent = (long)(skipwhite(firstline) - firstline);
  
--- 2605,2611 ----
  	/* Auto-indenting may have changed the indent.  If the cursor was past
  	 * the indent, exclude that indent change from the inserted text. */
  	firstline = ml_get(oap->start.lnum);
! 	if (bd.textcol > (colnr_T)pre_indent)
  	{
  	    long new_indent = (long)(skipwhite(firstline) - firstline);
  
*** ../vim-7.1.117/src/version.c	Tue Sep 25 12:50:00 2007
--- src/version.c	Tue Sep 25 14:18:37 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     118,
  /**/

-- 
BRIDGEKEEPER: What is your favorite editor?
GAWAIN:       Emacs ...  No, Viiiiiiiiiiimmmmmmm!
           "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:16:09 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:16:09 -0400
Subject: devel/vim 7.1.119,NONE,1.1
Message-ID: <200709251316.l8PDG9Xv030586@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30579

Added Files:
	7.1.119 
Log Message:
- patchlevel 119


--- NEW FILE 7.1.119 ---
To: vim-dev at vim.org
Subject: patch 7.1.119
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.119
Problem:    Crash when 'cmdheight' set to very large value. (A.Politz)
Solution:   Limit 'cmdheight' to 'lines' minus one.  Store right value of
	    'cmdheight' when running out of room.
Files:	    src/option.c, src/window.c


*** ../vim-7.1.118/src/option.c	Thu Sep  6 16:33:47 2007
--- src/option.c	Tue Sep 25 12:17:35 2007
***************
*** 7824,7829 ****
--- 7824,7831 ----
  	    errmsg = e_positive;
  	    p_ch = 1;
  	}
+ 	if (p_ch > Rows - min_rows() + 1)
+ 	    p_ch = Rows - min_rows() + 1;
  
  	/* Only compute the new window layout when startup has been
  	 * completed. Otherwise the frame sizes may be wrong. */
*** ../vim-7.1.118/src/window.c	Thu Sep 13 18:25:08 2007
--- src/window.c	Tue Sep 25 12:13:56 2007
***************
*** 5523,5528 ****
--- 5523,5529 ----
  		{
  		    EMSG(_(e_noroom));
  		    p_ch = old_p_ch;
+ 		    curtab->tp_ch_used = p_ch;
  		    cmdline_row = Rows - p_ch;
  		    break;
  		}
*** ../vim-7.1.118/src/version.c	Tue Sep 25 14:19:35 2007
--- src/version.c	Tue Sep 25 14:48:14 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     119,
  /**/

-- 
Q: Why does /dev/null accept only integers?
A: You can't sink a float.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Tue Sep 25 13:17:01 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Tue, 25 Sep 2007 09:17:01 -0400
Subject: devel/vim README.patches,1.84,1.85 vim.spec,1.176,1.177
Message-ID: <200709251317.l8PDH1s5030637@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30612

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 119


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- README.patches	24 Sep 2007 14:45:47 -0000	1.84
+++ README.patches	25 Sep 2007 13:16:28 -0000	1.85
@@ -145,3 +145,6 @@
   1386  7.1.114  memory leak in getmatches()
   1472  7.1.115  (after 7.1.105) compiler warning for uninitialized variable
   3137  7.1.116  can't display characters above 0x10000
+  1414  7.1.117  can't check wether Vim was compiled with Gnome
+  1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
+  1761  7.1.119  crash after setting 'cmdheight' to huge value


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- vim.spec	24 Sep 2007 14:45:47 -0000	1.176
+++ vim.spec	25 Sep 2007 13:16:28 -0000	1.177
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 116
+%define patchlevel 119
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -176,6 +176,9 @@
 Patch114: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.114
 Patch115: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.115
 Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
+Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
+Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
+Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -436,6 +439,9 @@
 %patch114 -p0 
 %patch115 -p0 
 %patch116 -p0 
+%patch117 -p0 
+%patch118 -p0 
+%patch119 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -821,7 +827,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.%{nil}116-1
+* Tue Sep 25 2007 Karsten Hopp <karsten at redhat.com> 7.1.119-1
+- patchlevel 119
+
+* Mon Sep 24 2007 Karsten Hopp <karsten at redhat.com> 7.1.116-1
 - patchlevel 116
 
 * Fri Sep 07 2007 Karsten Hopp <karsten at redhat.com> 7.1.100-1



From fedora-extras-commits at redhat.com  Tue Sep 25 13:28:04 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 09:28:04 -0400
Subject: rpms/frysk/devel frysk.spec,1.117,1.118
Message-ID: <200709251328.l8PDS4K3031310@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30929

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Update files list.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- frysk.spec	24 Sep 2007 23:07:15 -0000	1.117
+++ frysk.spec	25 Sep 2007 13:27:32 -0000	1.118
@@ -191,6 +191,10 @@
 %files
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
+%{_bindir}/fdebuginfo
+%{_bindir}/fdebugrpm
+%{_bindir}/fexe
+%{_bindir}/fltrace
 %{_bindir}/ftrace
 %{_bindir}/fstack
 %{_bindir}/fcore
@@ -202,7 +206,7 @@
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-imports.so
+%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
 %dir %{_datadir}/%{name}
@@ -215,12 +219,17 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/funit*
 %{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/hpd-c
+%{_libdir}/%{name}/test1
 %{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/sys-tests
 %{_libdir}/%{name}/test_main_looper
+%{_datadir}/%{name}/ChangeLog
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test-core
 %{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/test-core-*
+%{_datadir}/%{name}/test-exe-*
 # Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
@@ -246,6 +255,7 @@
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Update files list.
 - Fix path to dogtail_scripts.
 - Fix touch paths to allow for build sub-directory.
 - Import frysk-0.0.1.2007.09.24.tar.bz2.



From fedora-extras-commits at redhat.com  Tue Sep 25 13:29:32 2007
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 25 Sep 2007 09:29:32 -0400
Subject: rpms/grig/devel grig.spec,1.2,1.3
Message-ID: <200709251329.l8PDTWBm031443@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/grig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31369

Modified Files:
	grig.spec 
Log Message:
Rebuild for new hamlib libraries


Index: grig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grig/devel/grig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grig.spec	20 Aug 2007 13:01:05 -0000	1.2
+++ grig.spec	25 Sep 2007 13:29:00 -0000	1.3
@@ -1,7 +1,7 @@
 
 Name:           grig
 Version:        0.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Ham Radio Control graphical user interface
 
 Group:          Applications/Communications
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Denis Leroy <denis at poolshark.org> - 0.7.2-3
+- Rebuild for new hamlib libraries
+
 * Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 0.7.2-2
 - Updated License tag
 - Added patch for new GtkTooltip interface



From fedora-extras-commits at redhat.com  Tue Sep 25 13:30:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 09:30:41 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.72,
	1.73 selinux-policy.spec, 1.533, 1.534
Message-ID: <200709251330.l8PDUfO5031547@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31510

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-12
- Allow nsswitch apps to read samba_var_t


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- policy-20070703.patch	24 Sep 2007 20:26:11 -0000	1.72
+++ policy-20070703.patch	25 Sep 2007 13:30:08 -0000	1.73
@@ -2658,11 +2658,13 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.0.8/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2007-09-12 10:34:49.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-18 20:56:27.000000000 -0400
-@@ -210,6 +210,7 @@
++++ serefpolicy-3.0.8/policy/modules/kernel/files.fc	2007-09-25 09:00:58.000000000 -0400
+@@ -209,7 +209,8 @@
+ /usr/lost\+found		-d	gen_context(system_u:object_r:lost_found_t,mls_systemhigh)
  /usr/lost\+found/.*		<<none>>
  
- /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+-/usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
++#/usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 +/usr/share/doc(/.*)?/README.*	gen_context(system_u:object_r:usr_t,s0)
  
  /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
@@ -8514,8 +8516,34 @@
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.8/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/samba.if	2007-09-17 16:20:18.000000000 -0400
-@@ -349,6 +349,7 @@
++++ serefpolicy-3.0.8/policy/modules/services/samba.if	2007-09-24 17:17:53.000000000 -0400
+@@ -332,6 +332,25 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit the specified domain to
++##	write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_dontaudit_write_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	dontaudit $1 samba_var_t:file write;
++')
++
++########################################
++## <summary>
+ ##	Allow the specified domain to
+ ##	read and write samba /var files.
+ ## </summary>
+@@ -349,6 +368,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
  	manage_files_pattern($1,samba_var_t,samba_var_t)
@@ -8523,7 +8551,7 @@
  ')
  
  ########################################
-@@ -493,3 +494,102 @@
+@@ -493,3 +513,102 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -10428,7 +10456,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 10:44:04.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-24 17:17:30.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10620,7 +10648,16 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1381,3 +1453,163 @@
+@@ -1347,6 +1419,8 @@
+ 
+ 	optional_policy(`
+ 		samba_stream_connect_winbind($1)
++		samba_read_var_files($1)
++		samba_dontaudit_write_var_files($1)
+ 	')
+ ')
+ 
+@@ -1381,3 +1455,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -13644,8 +13681,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.8/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-21 06:44:58.000000000 -0400
-@@ -5,28 +5,36 @@
++++ serefpolicy-3.0.8/policy/modules/system/unconfined.te	2007-09-24 17:02:03.000000000 -0400
+@@ -5,28 +5,38 @@
  #
  # Declarations
  #
@@ -13683,13 +13720,15 @@
  # Local policy
  #
  
++dontaudit unconfined_t self:dir write;
++
 +allow unconfined_t self:system syslog_read;
 +dontaudit unconfined_t self:capability sys_module;
 +
  domtrans_pattern(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
  
  files_create_boot_flag(unconfined_t)
-@@ -35,6 +43,7 @@
+@@ -35,6 +45,7 @@
  mcs_ptrace_all(unconfined_t)
  
  init_run_daemon(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13697,7 +13736,7 @@
  
  libs_run_ldconfig(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  
-@@ -42,37 +51,30 @@
+@@ -42,37 +53,30 @@
  logging_run_auditctl(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  
  mount_run_unconfined(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13715,17 +13754,17 @@
  
  optional_policy(`
 -	ada_domtrans(unconfined_t)
--')
--
--optional_policy(`
--	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
--	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
--	# this is disallowed usage:
--	unconfined_domain(httpd_unconfined_script_t)
 +	ada_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
  
  optional_policy(`
+-	apache_run_helper(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
+-	apache_per_role_template(unconfined,unconfined_t,unconfined_r)
+-	# this is disallowed usage:
+-	unconfined_domain(httpd_unconfined_script_t)
+-')
+-
+-optional_policy(`
 -	bind_run_ndc(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
 +	bootloader_run(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
  ')
@@ -13743,7 +13782,7 @@
  ')
  
  optional_policy(`
-@@ -118,11 +120,11 @@
+@@ -118,11 +122,11 @@
  ')
  
  optional_policy(`
@@ -13757,7 +13796,7 @@
  ')
  
  optional_policy(`
-@@ -134,11 +136,7 @@
+@@ -134,11 +138,7 @@
  ')
  
  optional_policy(`
@@ -13770,7 +13809,7 @@
  ')
  
  optional_policy(`
-@@ -155,32 +153,23 @@
+@@ -155,32 +155,23 @@
  
  optional_policy(`
  	postfix_run_map(unconfined_t,unconfined_r,{ unconfined_devpts_t unconfined_tty_device_t })
@@ -13807,7 +13846,7 @@
  ')
  
  optional_policy(`
-@@ -205,11 +194,18 @@
+@@ -205,11 +196,18 @@
  ')
  
  optional_policy(`
@@ -13828,7 +13867,7 @@
  ')
  
  ########################################
-@@ -225,8 +221,20 @@
+@@ -225,8 +223,20 @@
  
  	init_dbus_chat_script(unconfined_execmem_t)
  	unconfined_dbus_chat(unconfined_execmem_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- selinux-policy.spec	24 Sep 2007 20:26:12 -0000	1.533
+++ selinux-policy.spec	25 Sep 2007 13:30:08 -0000	1.534
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -272,6 +272,7 @@
 %if %{BUILD_TARGETED}
 %package targeted
 Summary: SELinux targeted base policy
+Provides: selinux-policy-base
 Group: System Environment/Base
 Obsoletes: selinux-policy-targeted-sources < 2
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
@@ -315,6 +316,7 @@
 %package olpc 
 Summary: SELinux olpc base policy
 Group: System Environment/Base
+Provides: selinux-policy-base
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): coreutils
 Requires(pre): selinux-policy = %{version}-%{release}
@@ -339,6 +341,7 @@
 %package mls 
 Summary: SELinux mls base policy
 Group: System Environment/Base
+Provides: selinux-policy-base
 Obsoletes: selinux-policy-mls-sources < 2
 Requires: policycoreutils-newrole >= %{POLICYCOREUTILSVER} setransd
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER}
@@ -362,6 +365,9 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-12
+- Allow nsswitch apps to read samba_var_t
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-11
 - Fix maxima
 



From fedora-extras-commits at redhat.com  Tue Sep 25 13:34:13 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Sep 2007 09:34:13 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.156, 1.157 mkinitrd.spec, 1.221, 
	1.222 sources, 1.199, 1.200
Message-ID: <200709251334.l8PDYD8U031723@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31681

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.18-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	19 Sep 2007 21:26:40 -0000	1.156
+++ .cvsignore	25 Sep 2007 13:33:41 -0000	1.157
@@ -1 +1 @@
-mkinitrd-6.0.17.tar.bz2
+mkinitrd-6.0.18.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- mkinitrd.spec	19 Sep 2007 21:26:40 -0000	1.221
+++ mkinitrd.spec	25 Sep 2007 13:33:41 -0000	1.222
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.17
+Version: 6.0.18
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Tue Sep 25 2007 Peter Jones <pjones at redhat.com> - 6.0.18-1
+- Fix segfault on x86_64 paravirt (#304731, patch from Harald Hoyer)
+
 * Wed Sep 19 2007 Peter Jones <pjones at redhat.com> - 6.0.17-1
 - Fix missing quotes causing failure to detect erroneous "--with" command line
   arguments (#249163)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- sources	19 Sep 2007 21:26:40 -0000	1.199
+++ sources	25 Sep 2007 13:33:41 -0000	1.200
@@ -1 +1 @@
-4c0e08dbdd1f6af4606676de1817863a  mkinitrd-6.0.17.tar.bz2
+28d075b5b918ebf32ac5517606d38a22  mkinitrd-6.0.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 14:21:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 10:21:58 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.73,
	1.74 selinux-policy.spec, 1.534, 1.535
Message-ID: <200709251421.l8PELwIh007474@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:






From fedora-extras-commits at redhat.com  Tue Sep 25 14:24:13 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 10:24:13 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.62, 1.63 authconfig.spec, 1.89, 
	1.90 sources, 1.70, 1.71
Message-ID: <200709251424.l8PEODsO007594@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7572

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.18-1
- improve krb5.conf handling (#238766)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	24 Aug 2007 12:56:13 -0000	1.62
+++ .cvsignore	25 Sep 2007 14:23:40 -0000	1.63
@@ -1 +1 @@
-authconfig-5.3.17.tar.bz2
+authconfig-5.3.18.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- authconfig.spec	24 Aug 2007 12:56:13 -0000	1.89
+++ authconfig.spec	25 Sep 2007 14:23:40 -0000	1.90
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.17
+Version: 5.3.18
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1%{?dist}
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.18-1
+- improve krb5.conf handling (#238766)
+
 * Fri Aug 24 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.17-1
 - remove obsolete pam_krb5afs support (#250704)
 - add support for pam_access (#251360)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	24 Aug 2007 12:56:13 -0000	1.70
+++ sources	25 Sep 2007 14:23:40 -0000	1.71
@@ -1 +1 @@
-adf101dab83a35b92dff865da5c12213  authconfig-5.3.17.tar.bz2
+1ab30770d66d59c704fd91957edad274  authconfig-5.3.18.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 14:28:45 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Tue, 25 Sep 2007 10:28:45 -0400
Subject: rpms/cdrkit/devel cdrkit.spec,1.7,1.8
Message-ID: <200709251428.l8PESjRw007745@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7719

Modified Files:
	cdrkit.spec 
Log Message:
* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
- fixed readcd man page symlink



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cdrkit.spec	21 Sep 2007 09:24:38 -0000	1.7
+++ cdrkit.spec	25 Sep 2007 14:28:12 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -121,7 +121,7 @@
 		%{_mandir}/man1/wodim.1.gz \
 	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
 	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
-		%{_mandir}/man1/readcd.1.gz 
+		%{_mandir}/man1/readom.1.gz 
 
 %preun -n wodim
 if [ $1 = 0 ]; then
@@ -209,6 +209,9 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
+- fixed readcd man page symlink
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
 - fixed rhbz#255001 - icedax --devices segfaults
 - fixed rhbz#249357 - Typo in wodim output



From fedora-extras-commits at redhat.com  Tue Sep 25 14:47:55 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 10:47:55 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.74,1.75
Message-ID: <200709251447.l8PElt8Z008475@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8446

Modified Files:
	policy-20070703.patch 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- policy-20070703.patch	25 Sep 2007 14:20:38 -0000	1.74
+++ policy-20070703.patch	25 Sep 2007 14:47:50 -0000	1.75
@@ -6440,7 +6440,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-22 07:42:39.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 10:30:36.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -10456,7 +10456,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:18:40.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:32:38.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -10562,15 +10562,16 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,chkpwd_exec_t,system_chkpwd_t)
  
-@@ -329,6 +356,7 @@
+@@ -329,6 +356,8 @@
  
  	optional_policy(`
  		kerberos_use($1)
 +		kerberos_read_keytab($1)
++		kerberos_524_connect($1)
  	')
  
  	optional_policy(`
-@@ -347,6 +375,37 @@
+@@ -347,6 +376,37 @@
  
  ########################################
  ## <summary>
@@ -10608,7 +10609,7 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -695,6 +754,24 @@
+@@ -695,6 +755,24 @@
  
  ########################################
  ## <summary>
@@ -10633,7 +10634,7 @@
  ##	Execute pam programs in the PAM domain.
  ## </summary>
  ## <param name="domain">
-@@ -1318,14 +1395,9 @@
+@@ -1318,14 +1396,9 @@
  ## </param>
  #
  interface(`auth_use_nsswitch',`
@@ -10648,7 +10649,7 @@
  	files_list_var_lib($1)
  
  	miscfiles_read_certs($1)
-@@ -1347,6 +1419,8 @@
+@@ -1347,6 +1420,8 @@
  
  	optional_policy(`
  		samba_stream_connect_winbind($1)
@@ -10657,7 +10658,7 @@
  	')
  ')
  
-@@ -1381,3 +1455,163 @@
+@@ -1381,3 +1456,163 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')



From fedora-extras-commits at redhat.com  Tue Sep 25 14:49:29 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 10:49:29 -0400
Subject: rpms/hplip/devel hplip-no-root-config.patch, 1.5, 1.6 hplip.spec,
	1.158, 1.159
Message-ID: <200709251449.l8PEnTVS008608@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8585

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-5
- Prevent hpfax trying to load configuration files as user lp.


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hplip-no-root-config.patch	9 Jul 2007 14:22:52 -0000	1.5
+++ hplip-no-root-config.patch	25 Sep 2007 14:49:26 -0000	1.6
@@ -1,17 +1,18 @@
---- hplip-2.7.6/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
-+++ hplip-2.7.6/base/g.py	2007-06-29 17:58:29.000000000 +0100
-@@ -105,6 +105,10 @@
+diff -up hplip-2.7.7/base/g.py.no-root-config hplip-2.7.7/base/g.py
+--- hplip-2.7.7/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
++++ hplip-2.7.7/base/g.py	2007-09-25 15:23:23.000000000 +0100
+@@ -105,6 +105,10 @@ class Config(dict):
  
          log.debug("Reading config file %s" % filename)
  
-+        if filename.startswith ("/root/"):
++        if filename.startswith ("/root/") or filename.startswith ("/var/"):
 +            # Don't try opening a file in root's home directory.
 +            return
 +
          try:
              f = file(filename, 'r')
              self.config_obj.readfp(f)
-@@ -134,23 +138,24 @@
+@@ -134,23 +138,25 @@ class Config(dict):
  # Config file: directories and ports
  prop.sys_config_file = '/etc/hp/hplip.conf'
  prop.user_dir = os.path.expanduser('~/.hplip')
@@ -26,7 +27,8 @@
  prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf')
  
 -if not os.path.exists(prop.user_config_file):
-+if (not prop.user_config_file.startswith ("/root/") and
++if (not (prop.user_config_file.startswith ("/root/") or
++         prop.user_config_file.startswith ("/var/")) and
 +    not os.getuid () == 0):
 +    os.umask(0037)
      try:


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- hplip.spec	6 Sep 2007 12:19:39 -0000	1.158
+++ hplip.spec	25 Sep 2007 14:49:26 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -278,6 +278,9 @@
 exit 0
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-5
+- Prevent hpfax trying to load configuration files as user lp.
+
 * Thu Sep  6 2007 Tim Waugh <twaugh at redhat.com> 2.7.7-4
 - Reverted udev rules change.
 - Ship a HAL FDI file to get correct access control on the USB device



From fedora-extras-commits at redhat.com  Tue Sep 25 15:03:30 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 11:03:30 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch,1.75,1.76
Message-ID: <200709251503.l8PF3UiT017109@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16852

Modified Files:
	policy-20070703.patch 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
- Allow login programs to set ioctl on /proc


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- policy-20070703.patch	25 Sep 2007 14:47:50 -0000	1.75
+++ policy-20070703.patch	25 Sep 2007 15:03:25 -0000	1.76
@@ -3112,8 +3112,33 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.8/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/kernel.if	2007-09-17 16:20:18.000000000 -0400
-@@ -1867,6 +1867,27 @@
++++ serefpolicy-3.0.8/policy/modules/kernel/kernel.if	2007-09-25 11:01:00.000000000 -0400
+@@ -352,6 +352,24 @@
+ 
+ ########################################
+ ## <summary>
++##	dontaudit search the kernel key ring.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_dontaudit_search_key',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	dontaudit $1 kernel_t:key search;
++')
++
++########################################
++## <summary>
+ ##	Allow link to the kernel key ring.
+ ## </summary>
+ ## <param name="domain">
+@@ -1867,6 +1885,27 @@
  
  ########################################
  ## <summary>
@@ -6440,7 +6465,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 10:30:36.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 11:00:13.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6452,7 +6477,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,26 @@
+@@ -172,3 +176,47 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6479,6 +6504,27 @@
 +	seutil_read_file_contexts($1)
 +	allow $1 krb5_host_rcache_t:file manage_file_perms;
 +')
++
++########################################
++## <summary>
++##	Connect to krb524 service
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kerberos_524_connect',`
++	tunable_policy(`allow_kerberos',`
++		allow $1 self:udp_socket create_socket_perms;
++		corenet_non_ipsec_sendrecv($1)
++		corenet_udp_sendrecv_all_if($1)
++		corenet_udp_sendrecv_all_nodes($1)
++		corenet_udp_sendrecv_kerberos_master_port($1)
++		corenet_udp_bind_all_nodes($1)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.8/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/services/kerberos.te	2007-09-17 16:20:18.000000000 -0400
@@ -10456,7 +10502,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.8/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:32:38.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/authlogin.if	2007-09-25 10:59:20.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -13900,7 +13946,7 @@
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.8/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-21 19:20:56.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/userdomain.if	2007-09-25 10:59:50.000000000 -0400
 @@ -29,8 +29,9 @@
  	')
  
@@ -14494,7 +14540,7 @@
  		samba_stream_connect_winbind($1_t)
  	')
  
-@@ -954,21 +882,164 @@
+@@ -954,21 +882,165 @@
  ##	</summary>
  ## </param>
  #
@@ -14617,6 +14663,7 @@
 +
 +	optional_policy(`
 +		kerberos_use($1_usertype)
++		kerberos_524_connect($1_usertype)
 +	')
 +
 +	optional_policy(`
@@ -14665,7 +14712,7 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
-@@ -977,23 +1048,51 @@
+@@ -977,23 +1049,51 @@
  	typeattribute $1_tmp_t user_tmpfile;
  	typeattribute $1_tty_device_t user_ttynode;
  
@@ -14728,7 +14775,7 @@
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
  	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
-@@ -1029,15 +1128,7 @@
+@@ -1029,15 +1129,7 @@
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
  		corenet_tcp_bind_all_nodes($1_t)
@@ -14745,7 +14792,7 @@
  	')
  
  	optional_policy(`
-@@ -1054,17 +1145,6 @@
+@@ -1054,17 +1146,6 @@
  		setroubleshoot_stream_connect($1_t)
  	')
  
@@ -14763,7 +14810,7 @@
  ')
  
  #######################################
-@@ -1102,6 +1182,8 @@
+@@ -1102,6 +1183,8 @@
  		class passwd { passwd chfn chsh rootok crontab };
  	')
  
@@ -14772,7 +14819,7 @@
  	##############################
  	#
  	# Declarations
-@@ -1127,7 +1209,7 @@
+@@ -1127,7 +1210,7 @@
  	# $1_t local policy
  	#
  
@@ -14781,7 +14828,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1139,7 +1221,11 @@
+@@ -1139,7 +1222,11 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -14794,7 +14841,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1642,9 +1728,11 @@
+@@ -1642,9 +1729,11 @@
  template(`userdom_user_home_content',`
  	gen_require(`
  		attribute $1_file_type;
@@ -14806,7 +14853,7 @@
  	files_type($2)
  ')
  
-@@ -1894,10 +1982,46 @@
+@@ -1894,10 +1983,46 @@
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
  		type $1_home_dir_t, $1_home_t;
@@ -14854,7 +14901,7 @@
  ')
  
  ########################################
-@@ -3078,7 +3202,7 @@
+@@ -3078,7 +3203,7 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -14863,7 +14910,7 @@
  	')
  
  	files_tmp_filetrans($2,$1_tmp_t,$3)
-@@ -4615,6 +4739,24 @@
+@@ -4615,6 +4740,24 @@
  	files_list_home($1)
  	allow $1 home_dir_type:dir search_dir_perms;
  ')
@@ -14888,7 +14935,7 @@
  
  ########################################
  ## <summary>
-@@ -4633,6 +4775,14 @@
+@@ -4633,6 +4776,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -14903,7 +14950,7 @@
  ')
  
  ########################################
-@@ -5323,7 +5473,7 @@
+@@ -5323,7 +5474,7 @@
  		attribute user_tmpfile;
  	')
  
@@ -14912,7 +14959,7 @@
  ')
  
  ########################################
-@@ -5559,3 +5709,376 @@
+@@ -5559,3 +5710,376 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')



From fedora-extras-commits at redhat.com  Tue Sep 25 15:18:27 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 08:18:27 -0700
Subject: [pkgdb] qa-assistant: toshio has requested watchbugzilla
Message-ID: <200709251518.l8PFIWSk009330@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has requested the watchbugzilla acl on qa-assistant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 15:19:17 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 08:19:17 -0700
Subject: [pkgdb] qa-assistant: toshio has given up watchbugzilla
Message-ID: <200709251519.l8PFIWSm009330@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has given up the watchbugzilla acl on qa-assistant (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 15:20:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 25 Sep 2007 11:20:17 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.6-reset.patch, NONE,
	1.1 system-config-soundcard-2.0.6-update.patch, 1.2,
	1.3 system-config-soundcard.spec, 1.59, 1.60
Message-ID: <200709251520.l8PFKHVH017963@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/system-config-soundcard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17937

Modified Files:
	system-config-soundcard-2.0.6-update.patch 
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-reset.patch 
Log Message:
* Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
- fixed #291691 - Sound card not working gives a window with 
  invalid instructions on first boot
- rewritting configuration file option splitted to config restore 
  and config reset
- used plughw device in the hardware configuration instead of the hw



system-config-soundcard-2.0.6-reset.patch:

--- NEW FILE system-config-soundcard-2.0.6-reset.patch ---
diff -up system-config-soundcard-2.0.6/src/soundcard.py.res system-config-soundcard-2.0.6/src/soundcard.py
--- system-config-soundcard-2.0.6/src/soundcard.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcard.py	2007-09-25 17:06:40.000000000 +0200
@@ -235,7 +235,7 @@ class childWindow:
            #Oh well, they couldn't hear the sound.  Notify the user and then quit.  We did our best
            self.showErrorDialog(_("Automatic detection of the sound card did not work.  " \
                                   "This audio device will not be available on the system.\n\n"  \
-                                  "You can create %s, %s on the System tab and " \
+                                  "You can find log files %s, %s and " \
                                   "file a new bug\nat http://bugzilla.redhat.com.\n\nPlease click " \
                                   "OK to continue.") % ("/root/scsconfig.log", "/root/scsrun.log"))
 
@@ -726,11 +726,18 @@ class childWindow:
         return settingsBox
 
     def create_system_page_modules_reload(self, widget):
-        self.soundcardBackend.reloadModules()
+        ret = self.soundcardBackend.reloadModules()
+	if ret:
+		self.reset_notebook()
         
     def create_system_page_rewrite_files(self,  widget):
         self.soundcardBackend.rewriteConfigFiles()
 
+    def create_system_page_reset_files(self,  widget):
+        ret = self.soundcardBackend.resetConfigFiles()
+	if ret:
+		self.reset_notebook()
+
     def create_system_page(self):
     
         table = gtk.Table(2, 3)
@@ -796,24 +803,34 @@ class childWindow:
 
         infoBox.pack_start(detectionBox, False, False)
 
-        rewrite_button = gtk.Button(_("Rewrite configuration files"))
+        rewrite_button = gtk.Button(_("Restore configuration files"))
         rewrite_button.connect("clicked", self.create_system_page_rewrite_files)
 
-        rewriteBox = gtk.HBox(False, 8)
+        reset_button = gtk.Button(_("Reset configuration files"))
+        reset_button.connect("clicked", self.create_system_page_reset_files)
+
+        rewriteBox = gtk.VBox(False, 8)
         rewriteBox.pack_start(rewrite_button, True, True)
+        rewriteBox.pack_start(reset_button, True, True)
         rewriteBox = self.create_frame(self.create_frame(rewriteBox,8),0,_("Configuration files"),gtk.SHADOW_ETCHED_IN)
 
-        infoBox.pack_start(rewriteBox, False, False)
+        infoBox.pack_start(rewriteBox, False, False)        
 
         return infoBox
 
     def refresh_notebook(self):
         self.notebook.remove_page(0)
         self.notebook.remove_page(0)
-        self.notebook.prepend_page(self.create_frame(self.create_settings_page()), gtk.Label(_("Settings")))
-        self.notebook.prepend_page(self.create_frame(self.create_test_page()), gtk.Label(_("Sound test")))
+        self.notebook.remove_page(0)
+        self.notebook.append_page(self.create_frame(self.create_test_page()), gtk.Label(_("Sound test")))
+        self.notebook.append_page(self.create_frame(self.create_settings_page()), gtk.Label(_("Settings")))
+        self.notebook.append_page(self.create_frame(self.create_system_page()), gtk.Label(_("System")))
         self.notebook.show_all()
 
+    def reset_notebook(self):
+	self.soundcardBackend.reset()
+	self.refresh_notebook()
+
     def launch(self):
     
         print "Running from first-boot..."           
@@ -839,7 +856,7 @@ class childWindow:
         print "Running from command-line..."
         
         self.firstBoot = False
-        
+ 
         self.mainWindow = gtk.Dialog()
         self.mainWindow.vbox.set_spacing(5)
         self.mainWindow.connect("destroy", self.destroy)
diff -up system-config-soundcard-2.0.6/src/soundcardBackend.py.res system-config-soundcard-2.0.6/src/soundcardBackend.py
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-09-25 17:06:40.000000000 +0200
@@ -66,6 +66,21 @@ def errorDialog(text):
     return
 
 ##
+## Info message
+##
+def infoDialog(text):
+    dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, text)
+
+    dlg.set_title(_("Note"))
+    dlg.set_default_size(100, 100)
+    dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT)
+    dlg.set_border_width(2)
+    dlg.set_modal(True)
+    rc = dlg.run()
+    dlg.destroy()
+    return
+
+##
 ## Get position
 ##
 def position(list, name):
@@ -127,10 +142,7 @@ def soundCardDevice_sort(device1, device
 
 
 class soundConfiguration:
-    def __init__(self):
-    
-        self.doDebug = False
-    
+    def reset(self):
         # coundcard configuration
         self.default_card = 0
         self.default_device = 0
@@ -148,6 +160,12 @@ class soundConfiguration:
 	self.usb_cards_hack = True
 	self.usb_cards_hack_position = USB_AUDIO_POSITION
 
+
+    def __init__(self):
+    
+        self.doDebug = False
+	self.reset()    
+
     def dump(self):
         print " ----------- soundConfiguration -----------"        
         print "default_card %d" % self.default_card
@@ -201,22 +219,47 @@ class soundConfiguration:
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("pcm.!default { type hw card %d device %d } \n" % (index, device))
-                lines.append("ctl.!default { type hw card %d }\n" % index)
+                lines.append("pcm.!default { type plughw card %d device %d }\n" % (index, device))
+                lines.append("ctl.!default { type plughw card %d }\n" % index)
             else:
                 lines.append("#SWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("defaults.pcm.card %d \n" %   index)
-                lines.append("defaults.pcm.device %d \n" % device)
-                lines.append("defaults.ctl.card %d \n" %   index)
-
-	    fd = open('/etc/asound.conf', 'w')
-	    for line in lines:
-	        fd.write(line)
-	    fd.close()
+                lines.append("defaults.pcm.card %d\n" %   index)
+                lines.append("defaults.pcm.device %d\n" % device)
+                lines.append("defaults.ctl.card %d\n" %   index)
+
+	    try:
+		fd = open('/etc/asound.conf', 'w')
+	    	for line in lines:
+	        	fd.write(line)
+    		fd.close()
+	    except:
+		return False
 
         return True
 
+    def resetAlsaConfig(self):
+
+	lines = []
+	lines.append("#Generated by system-config-soundcard\n")
+	lines.append("#If you edit this file, don't run system-config-soundcard,\n")
+	lines.append("#all your changes here could be lost.\n")
+	lines.append("#SWCONF\n")
+	lines.append("#DEV 0\n")
+	lines.append("defaults.pcm.card 0\n")
+	lines.append("defaults.pcm.device 0\n")
+	lines.append("defaults.ctl.card 0\n")
+
+	try:
+		fd = open('/etc/asound.conf', 'w')
+		for line in lines:
+			fd.write(line)
+		fd.close()
+	except:
+		return False
+
+	return True
+
     def cardIndexChanged(self):
         self.card_index_changed = True
         self.card_default_changed = True
@@ -288,7 +331,7 @@ class soundConfiguration:
         except:
             return False
 
-	self.readUSBDevicePosition(list)
+        self.readUSBDevicePosition(list)
 
         sound_lines = []
         modprobe = []
@@ -345,6 +388,56 @@ class soundConfiguration:
 
         return True
 
+    def resetModprobe(self):
+        
+        try:
+            fd = open('/etc/modprobe.conf', 'r')
+            list = fd.readlines()
+            fd.close()
+        except:
+            return False
+       
+	modprobe = [] 
+        for whole_line in list:
+            line = string.strip(whole_line)
+            if line == []:
+               modprobe.append(whole_line)
+               continue;
+                
+            tmp = line.split()
+            if tmp == [] or tmp[0] == [] or tmp[0][0] == '#'\
+               or tmp[1] == [] or tmp[2] == [] :
+                modprobe.append(whole_line)                
+                continue
+                
+            if tmp[0] == "install" or tmp[0] == "remove":
+                modprobe.append(whole_line)                
+                continue
+    
+            if tmp[0] != "alias" and tmp[1][:3] != "snd" and\
+               tmp[2][:9] != "snd-card-":
+                modprobe.append(whole_line)                
+                continue                
+            
+            if tmp[0] != "options" and tmp[1][:3] != "snd" and\
+               tmp[2][:5] != "index" and tmp[2][:11] != "cards_limit":
+                modprobe.append(whole_line)                
+                continue
+
+	modprobe.append("options snd cards_limit=8\n")
+	modprobe.append("alias snd-card-%d %s\n" % (self.usb_cards_hack_position, USB_AUDIO_DRIVER))
+	modprobe.append("options %s index=%d\n" % (USB_AUDIO_DRIVER, self.usb_cards_hack_position))
+
+        try:
+            os.rename('/etc/modprobe.conf', '/etc/modprobe.conf.scs')
+            fd = open('/etc/modprobe.conf', 'w')
+            fd.writelines(modprobe)
+            fd.close()
+        except:
+            return False
+
+        return True
+
     # ------------------------------------------------------------------------
     # Configuring routines - sound modules reloading
     # ------------------------------------------------------------------------
@@ -402,6 +495,9 @@ class soundConfiguration:
         
         if self.unloadModule("snd", module_list):
             errorDialog(_("Unable to remove kernel modules. You need to reboot your box for the changes to take effect."))
+	    return False
+
+	return True
         
     def loadModules(self, cardArray):
     
@@ -410,12 +506,16 @@ class soundConfiguration:
                 print card.driver
                 ret = os.spawnv(os.P_WAIT, "/sbin/modprobe", ["/sbin/modprobe", card.driver])
                 if ret:
-                    errorDialog(_("Unable to load kernel module %s. You need to reboot your box for the changes to take effect.") % card.driver)
+			errorDialog(_("Unable to load kernel module %s. You need to reboot your box for the changes to take effect.") % card.driver)
+			return False
+	return True
 
     def reloadModules(self, cardArray):
-        self.unloadModules()
-        self.loadModules(cardArray)
-        self.card_index_changed = False
+        ret = self.unloadModules()
+	if not ret:
+		return False
+        ret = self.loadModules(cardArray)
+	return ret
 
     def writeConfig(self, cardArray):
         ret_alsa = ret_mod = True
@@ -433,12 +533,22 @@ class soundConfiguration:
             if ret_alsa:
                 self.card_default_changed = False
             else:
-                errorDialog(_("Unable to write ALSA configuration files!"))
+                errorDialog(_("Unable to write ALSA configuration file %s!") % "/etc/asound.conf")
 
         return ret_mod and ret_alsa
         
 
 class soundcardBackend:
+    def reset(self):
+        # Load general configuration
+        self.soundConfig = soundConfiguration()
+
+	self.cardArray = []
+
+        # Detect cards
+        self.detectCards()
+	return	
+
     def __init__(self):
     
         self.doDebug = True        
@@ -446,12 +556,9 @@ class soundcardBackend:
         self.soundcardBackendKudzu = soundcardBackendKudzu.soundcardBackendKudzu()
         self.soundcardBackendProc = soundcardBackendProc.soundcardBackendProc()
         self.soundcardBackendHal = soundcardBackendHal.soundcardBackendHal()
-        
-        # Load general configuration
-        self.soundConfig = soundConfiguration()
-        
-        # Detect cards
-        self.detectCards()
+
+	self.reset()
+	return        
 
     def destroy(self, args):
         return        
@@ -464,6 +571,7 @@ class soundcardBackend:
         return original_array
 
     def detectCards(self):
+
         # List of all cards in system
         self.cardArray = self.mergeCards(self.probeCards(DETECTION_HAL),\
                                          self.probeCards(DETECTION_KUDZU))
@@ -491,14 +599,18 @@ class soundcardBackend:
         card_max = self.soundConfig.card_max_index + 1
         
         if method == DETECTION_KUDZU:
-            return self.soundcardBackendKudzu.probeCards(default_card,\
+            ret = self.soundcardBackendKudzu.probeCards(default_card,\
                    default_device, card_list, card_max)
         elif method == DETECTION_PROC:
-            return self.soundcardBackendProc.probeCards(default_card,\
+            ret = self.soundcardBackendProc.probeCards(default_card,\
                    default_device, card_list, card_max)
         elif method == DETECTION_HAL:
-            return self.soundcardBackendHal.probeCards(default_card,\
+            ret = self.soundcardBackendHal.probeCards(default_card,\
                    default_device, card_list, card_max)
+
+	print "ProbeCards, method = ", method
+	self.dumpCardList(ret)
+	return ret
                    
         
     # ------------------------------------------------------------------------
@@ -644,12 +756,32 @@ class soundcardBackend:
         self.soundConfig.writeConfig(self.cardArray)
     
     def reloadModules(self, *args):
-        self.soundConfig.reloadModules(self.cardArray)
+        ret = self.soundConfig.reloadModules(self.cardArray)
+        if ret:
+                infoDialog(_("Modules reload was successful."));
+	return ret
 
     def rewriteConfigFiles(self):
         self.soundConfig.rewriteModprobe(self.cardArray)
         self.soundConfig.writeAlsaConfig(self.cardArray)
 
+    def resetConfigFiles(self):
+	ret = self.soundConfig.resetModprobe()
+	if not ret:
+		errorDialog(_("Unable to reset configuration in %s") % "/etc/modprobe.conf");
+		return False
+		
+	ret = self.soundConfig.resetAlsaConfig()
+	if not ret:
+		errorDialog(_("Unable to reset configuration in %s") % "/etc/alsa/alsa.conf");
+		return False
+		
+	ret = self.soundConfig.reloadModules(self.cardArray)
+	if ret:
+		infoDialog(_("Configuration reset was successful."));
+		
+	return ret
+
     # ------------------------------------------------------------------------
     # Info routines
     # ------------------------------------------------------------------------
@@ -690,8 +822,8 @@ class soundcardBackend:
         except:
             return ""
 
-    def dumpCards(self, active_only = 0):
-        for card in self.cardArray:
+    def dumpCardList(self, list, active_only = 0):
+        for card in list:
             print "--------- Card %d --------" % card.index
             
             if active_only and not card.active:
@@ -710,3 +842,7 @@ class soundcardBackend:
             print card.device_list
 
             print "Test device %d" % card.test_sound_device
+
+    def dumpCards(self, active_only = 0):
+        self.dumpCardList(self.cardArray, active_only)
+
diff -up system-config-soundcard-2.0.6/src/soundcardBackendHal.py.res system-config-soundcard-2.0.6/src/soundcardBackendHal.py
--- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.res	2007-09-25 17:06:40.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py	2007-09-25 17:10:28.000000000 +0200
@@ -38,12 +38,14 @@ ALLOWED_TYPE = "playback"
 import soundcardBackendSoundCard
 
 class soundcardBackendHal:
+    def reset(self):
+        self.driverList = self.read_driver_list()
+        self.cards = {}
+
     def __init__(self):
     
         self.doDebug = True
-
-        self.driverList = self.read_driver_list()
-                
+               
 	try:
             self._dbusBus = dbus.SystemBus()
             self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager")
@@ -53,9 +55,7 @@ class soundcardBackendHal:
             self.halManagerObj = []
             self.halManager = []
             self.driverList = []
-            print _("Unable to initialize D-BUS/HAL!")
-       
-        self.cards = {}
+            print _("Unable to initialize D-BUS/HAL!")      
 
     def destroy(self, args):
         return
@@ -186,6 +186,8 @@ class soundcardBackendHal:
     # Same with Mac sound devices
     #if card.bus() == "macio" and card.driver() != "snd-powermac":
     def probeCards(self, default_card, default_device, card_list, card_max):
+	
+	self.reset()
 
 	if self.halManager != []:
             udiList = self.halManager.FindDeviceByCapability("alsa")        

system-config-soundcard-2.0.6-update.patch:

Index: system-config-soundcard-2.0.6-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard-2.0.6-update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-soundcard-2.0.6-update.patch	28 May 2007 13:17:54 -0000	1.2
+++ system-config-soundcard-2.0.6-update.patch	25 Sep 2007 15:20:15 -0000	1.3
@@ -15,32 +15,6 @@
          self.mainWindow = None
  
          self.card_list = None
-@@ -246,6 +250,25 @@
-         else:
-             self.soundcardBackend.setVolume()
- 
-+    # we need to shrink/cut every too long line
-+    def wrapLine(self, line, max_len = 30, cut = False):
-+        lines = string.split(line)
-+        
-+        lines_new = []
-+        ln = 0        
-+        
-+        for l in lines:
-+          ln = ln + len(l)
-+          if ln > max_len:
-+            if not cut:
-+              l = '\n' + l[0:]
-+              ln = len(l)
-+            else:
-+              break              
-+          lines_new.append(l)
-+          
-+        return string.join(lines_new)
-+
-     def create_frame(self, widget, border = 5, label = None, shadow = gtk.SHADOW_NONE):
-         frame = gtk.Frame(label)
-         frame.set_border_width(border)
 @@ -272,26 +295,43 @@
          maker_label2 = gtk.Label("")
  


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- system-config-soundcard.spec	25 Jul 2007 10:31:24 -0000	1.59
+++ system-config-soundcard.spec	25 Sep 2007 15:20:15 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 8%{dist}
+Release: 9%{dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/soundcard
 License: GPL
 ExclusiveOS: Linux
@@ -14,6 +14,7 @@
 Patch2: system-config-soundcard-no-vendor.patch
 Patch3: system-config-soundcard-2.0.6-usb-hack.patch
 Patch4: system-config-soundcard-2.0.6-desktop.patch
+Patch5: system-config-soundcard-2.0.6-reset.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -39,8 +40,9 @@
 %patch  -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .usb
+%patch3 -p1
 %patch4 -p1
+%patch5 -p1 -b .res
 
 %build
 make
@@ -90,6 +92,13 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
+- fixed #291691 - Sound card not working gives a window with 
+  invalid instructions on first boot
+- rewritting configuration file option splitted to config restore 
+  and config reset
+- used plughw device in the hardware configuration instead of the hw
+
 * Wed Jul 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-8
 - fixed #245875 - desktop file categories
 



From fedora-extras-commits at redhat.com  Tue Sep 25 15:20:33 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 11:20:33 -0400
Subject: rpms/python-virtinst/devel .cvsignore, 1.11,
	1.12 python-virtinst.spec, 1.26, 1.27 sources, 1.11,
	1.12 python-virtinst-0.200.0-default-arch.patch, 1.1,
	NONE python-virtinst-0.300.0-fedora8-distro.patch, 1.1,
	NONE python-virtinst-0.300.0-transient-qemu.patch, 1.1, NONE
Message-ID: <200709251520.l8PFKXrx018002@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17911

Modified Files:
	.cvsignore python-virtinst.spec sources 
Removed Files:
	python-virtinst-0.200.0-default-arch.patch 
	python-virtinst-0.300.0-fedora8-distro.patch 
	python-virtinst-0.300.0-transient-qemu.patch 
Log Message:
Update to 0.300.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2007 22:38:15 -0000	1.11
+++ .cvsignore	25 Sep 2007 15:20:00 -0000	1.12
@@ -1 +1,3 @@
-virtinst-0.300.0.tar.gz
+virtinst-0.300.1.tar.gz
+.build*.log
+*.rpm


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-virtinst.spec	19 Sep 2007 19:22:03 -0000	1.26
+++ python-virtinst.spec	25 Sep 2007 15:20:00 -0000	1.27
@@ -10,12 +10,9 @@
 
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
-Version: 0.300.0
-Release: 4%{_extra_release}
+Version: 0.300.1
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{name}-%{version}-fedora8-distro.patch
-Patch2: %{name}-0.200.0-default-arch.patch
-Patch3: %{name}-%{version}-transient-qemu.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,9 +35,6 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 python setup.py build
@@ -70,6 +64,10 @@
 %{_bindir}/virt-image
 
 %changelog
+* Tue Sep 25 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.1-1.fc8
+- Update to 0.300.1 release
+- Added PXE support
+
 * Wed Sep 19 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-4.fc8
 - Fix post install CDROM config for KVM guests
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Aug 2007 22:38:15 -0000	1.11
+++ sources	25 Sep 2007 15:20:00 -0000	1.12
@@ -1 +1 @@
-860171421b1eef4f5311366de1120b2a  virtinst-0.300.0.tar.gz
+0424cdd829fda57b7117782f367d4aec  virtinst-0.300.1.tar.gz


--- python-virtinst-0.200.0-default-arch.patch DELETED ---


--- python-virtinst-0.300.0-fedora8-distro.patch DELETED ---


--- python-virtinst-0.300.0-transient-qemu.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 15:31:44 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Tue, 25 Sep 2007 11:31:44 -0400
Subject: rpms/system-config-firewall/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 system-config-firewall.spec, 1.7, 1.8
Message-ID: <200709251531.l8PFVimM018377@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18341

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
new version 1.0.7 with lots of fixes and more translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Aug 2007 15:43:19 -0000	1.4
+++ .cvsignore	25 Sep 2007 15:31:12 -0000	1.5
@@ -1,3 +1,4 @@
 system-config-firewall-1.0.3.tar.bz2
 system-config-firewall-1.0.4.tar.bz2
 system-config-firewall-1.0.5.tar.bz2
+system-config-firewall-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Sep 2007 09:42:35 -0000	1.5
+++ sources	25 Sep 2007 15:31:12 -0000	1.6
@@ -1 +1 @@
-cc6ea00488c648fc3478d260670f0d28  system-config-firewall-1.0.6.tar.bz2
+cbe5ca2c7b6d7036084788d0681516b5  system-config-firewall-1.0.7.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-config-firewall.spec	12 Sep 2007 09:42:35 -0000	1.7
+++ system-config-firewall.spec	25 Sep 2007 15:31:12 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.0.6
+Version: 1.0.7
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPLv2+
@@ -119,6 +119,23 @@
 %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-securitylevel
 
 %changelog
+* Tue Sep 25 2007 Thomas Woerner <twoerner at redhat.com> 1.0.7-1
+- new translations
+- added openvpn to services (rhbz#)
+- fixed typo in description text for ipsec
+- using port numbers instead of port names for services
+- renamed some variables to be consistent
+- make tolltip better: bigger text, helper modules
+- dropped unused code: inconsistent handling
+- make port check button inactive in add_port_cb
+- new function _addDevice: code cleanup
+- allow to set variables in ipXtablesConfig, which were not set before
+- fixed os.system calls in ipXtablesClass to return proper return values
+- fixed status funciton in ipXtablesClass
+- new _append_unique function in fw_parser to prevent duplicates
+- added warning dialog for missing or unusable /etc/sysconfig/ip*tables files
+- fixed expand of the warning label in the startup dialog
+
 * Wed Sep 12 2007 Thomas Woerner <twoerner at redhat.com> 1.0.6-1
 - dropped --stop option from fw_gui::genArgs
 - new translations



From fedora-extras-commits at redhat.com  Tue Sep 25 15:37:04 2007
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Tue, 25 Sep 2007 11:37:04 -0400
Subject: rpms/slang/devel slang-2.1.2-hashborder.patch, NONE,
	1.1 slang-2.1.2-slerr.patch, NONE, 1.1 slang.spec, 1.47, 1.48
Message-ID: <200709251537.l8PFb4Rf018705@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527

Modified Files:
	slang.spec 
Added Files:
	slang-2.1.2-hashborder.patch slang-2.1.2-slerr.patch 
Log Message:
- fix integer underflow in compute_hash (#302181)
- fix SLang_set_error when called from signal handler (#297661)


slang-2.1.2-hashborder.patch:

--- NEW FILE slang-2.1.2-hashborder.patch ---
diff -up slang-2.1.2/src/slsmg.c.hashborder slang-2.1.2/src/slsmg.c
--- slang-2.1.2/src/slsmg.c.hashborder	2007-09-17 19:17:24.000000000 +0200
+++ slang-2.1.2/src/slsmg.c	2007-09-24 17:23:29.000000000 +0200
@@ -993,7 +993,7 @@ static unsigned long compute_hash (SLsmg
 
    c += SLsmg_Scroll_Hash_Border;
    csave = c;
-   cmax = c + (n - SLsmg_Scroll_Hash_Border);
+   cmax = c + ((int)n - SLsmg_Scroll_Hash_Border);
 
    while ((c < cmax) && is_blank)
      {

slang-2.1.2-slerr.patch:

--- NEW FILE slang-2.1.2-slerr.patch ---
Index: slang/src/slerr.c
===================================================================
--- slang/src/slerr.c	(revision 199)
+++ slang/src/slerr.c	(revision 200)
@@ -384,6 +384,8 @@
 }
 Error_Message_Type;
 
+static char *Static_Error_Message = NULL;
+
 struct _pSLerr_Error_Queue_Type
 {
    Error_Message_Type *head;
@@ -531,12 +533,11 @@
 	
 	free_queued_messages (q);
      }
-#if 0
-   if (_pSLang_Error != SL_Usage_Error)
+   if (Static_Error_Message != NULL)
      {
-	print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error));
+	print_error (_SLERR_MSG_ERROR, Static_Error_Message);
+	Static_Error_Message = NULL;
      }
-#endif
 }
 
 /* This function returns a pointer to the first error message in the queue.
@@ -615,6 +616,7 @@
 
 void _pSLerr_free_queued_messages (void)
 {
+   Static_Error_Message = NULL;
    free_queued_messages (Active_Error_Queue);
 }
 
@@ -626,7 +628,10 @@
     */
    if ((error == 0)
        || (_pSLang_Error == 0))
-     _pSLang_Error = error;
+     {
+	Static_Error_Message = NULL;
+	_pSLang_Error = error;
+     }
 
    if (_pSLinterpreter_Error_Hook != NULL)
      (*_pSLinterpreter_Error_Hook) (_pSLang_Error);
@@ -707,9 +712,19 @@
 {
    set_error (error);
 
-   if (_pSLang_Error == 0)
+   if (error == 0)
      return 0;
 
+   if (error == SL_UserBreak_Error)
+     {
+	/* This function may be called from a SIGINT handler, in which case the 
+	 * error code will be SL_Usage_Error.
+	 */
+	/* print_error (_SLERR_MSG_ERROR, SLerr_strerror (_pSLang_Error)); */
+	Static_Error_Message = SLerr_strerror (error);
+	return 0;
+     }	
+   
    /* If a string is not in the message queue, then add one. */
    if (Active_Error_Queue != NULL)
      {
@@ -806,5 +821,6 @@
    Suspend_Error_Messages = 0;
    Default_Error_Queue = NULL;
    Active_Error_Queue = NULL;
+   Static_Error_Message = NULL;
 }
 


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- slang.spec	17 Sep 2007 17:27:03 -0000	1.47
+++ slang.spec	25 Sep 2007 15:36:31 -0000	1.48
@@ -1,13 +1,15 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
 Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
 Patch1: slang-2.1.2-makefile.patch
 Patch2: slang-nointerlibc2.patch
 Patch3: slang-LANG.patch
+Patch4: slang-2.1.2-hashborder.patch
+Patch5: slang-2.1.2-slerr.patch
 URL: http://www.jedsoft.org/slang/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpng-devel pcre-devel gawk
@@ -60,6 +62,8 @@
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .nointerlibc2
 %patch3 -p1 -b .LANG
+%patch4 -p1 -b .hashborder
+%patch5 -p1 -b .slerr
 
 %build
 %configure --includedir=%{_includedir}/slang
@@ -103,6 +107,10 @@
 %{_libdir}/libslang*.a
 
 %changelog
+* Tue Sep 25 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-2
+- fix integer underflow in compute_hash (#302181)
+- fix SLang_set_error when called from signal handler (#297661)
+
 * Mon Sep 17 2007 Miroslav Lichvar <mlichvar at redhat.com> - 2.1.2-1
 - update to 2.1.2
 



From fedora-extras-commits at redhat.com  Tue Sep 25 15:49:25 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 11:49:25 -0400
Subject: rpms/generic-logos/devel generic-logos.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709251549.l8PFnPBg019278@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246

Modified Files:
	.cvsignore sources 
Added Files:
	generic-logos.spec 
Log Message:
initial import



--- NEW FILE generic-logos.spec ---
Name: generic-logos
Summary: Icons and pictures
Version: 7.92.1
Release: 1%{?dist}
Group: System Environment/Base
Source0: generic-logos-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Obsoletes: redhat-logos
Provides: redhat-logos = %{version}-%{release}
Provides: system-logos = %{version}-%{release}
Conflicts: fedora-logos
Conflicts: kdebase <= 3.1.5
Conflicts: anaconda-images <= 10
Conflicts: redhat-artwork <= 5.0.5

%description
The generic-logos package contains various image files which can be
used by the bootloader, anaconda, and other related tools. It can
be used as a replacement for the fedora-logos package, if you are
unable for any reason to abide by the trademark restrictions on the
fedora-logos package.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT

# should be ifarch i386
mkdir -p $RPM_BUILD_ROOT/boot/grub
install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
# end i386 bits

mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
for i in firstboot/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/pixmaps
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/rhgb
for i in rhgb/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/rhgb
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
for i in gnome-splash/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
done

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
for i in pixmaps/* ; do
  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
done

(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc COPYING
%{_datadir}/firstboot/*
%{_datadir}/rhgb/*
%{_datadir}/anaconda/pixmaps/*
%{_datadir}/pixmaps/*
/usr/lib/anaconda-runtime/*.jpg
# should be ifarch i386
/boot/grub/splash.xpm.gz
# end i386 bits

%changelog
* Thu Sep 13 2007 Bill Nottingham <notting at redhat.com> - 7.92.1-1
- add powered-by logo (#250676)
- updated rhgb logo (<duffy at redhat.com>)

* Tue Sep 11 2007 Bill Nottinghan <notting at redhat.com> - 7.92.0-1
- initial packaging. Forked from fedora-logos, adapted from the Fedora
  Art project's Infinity theme


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:34:13 -0000	1.1
+++ .cvsignore	25 Sep 2007 15:48:53 -0000	1.2
@@ -0,0 +1 @@
+generic-logos-7.92.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:34:13 -0000	1.1
+++ sources	25 Sep 2007 15:48:53 -0000	1.2
@@ -0,0 +1 @@
+de79666bc82ecce1ac46f25569e156df  generic-logos-7.92.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 15:55:56 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Tue, 25 Sep 2007 11:55:56 -0400
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.19,1.20
Message-ID: <200709251555.l8PFtutW019570@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19484

Modified Files:
	pulseaudio.spec 
Log Message:
Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pulseaudio.spec	25 Sep 2007 03:04:46 -0000	1.19
+++ pulseaudio.spec	25 Sep 2007 15:55:23 -0000	1.20
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.12.svn20070925%{?dist}
+Release:	0.13.svn20070925%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -155,7 +155,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
 ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
-
+rm $RPM_BUILD_ROOT/%{_libdir}/libpulsecore.so
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -314,7 +314,6 @@
 %doc doxygen/html
 %{_includedir}/pulse/
 %{_libdir}/libpulse.so
-%{_libdir}/libpulsecore.so
 %{_libdir}/libpulse-mainloop-glib.so
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
@@ -333,6 +332,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.13.svn20070925
+- Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.12.svn20070925
 - New SVN snapshot
 - Split off libflashsupport again



From fedora-extras-commits at redhat.com  Tue Sep 25 15:57:06 2007
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Tue, 25 Sep 2007 11:57:06 -0400
Subject: rpms/audit/devel .cvsignore, 1.82, 1.83 audit.spec, 1.146,
	1.147 sources, 1.102, 1.103 audit-1.6.1-event-host.patch, 1.1, NONE
Message-ID: <200709251557.l8PFv693019675@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19625

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.6.1-event-host.patch 
Log Message:
* Tue Sep 25 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-1
- Add support for searching by posix regular expressions in auparse
- Route DEAMON events into rt interface
- If event pipe is full, try again after doing local logging
- Optionally add node/machine name to records in audit daemon
- Update ausearch/aureport to specify nodes to search on
- Fix segfault interpretting saddr fields in avcs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	2 Sep 2007 16:49:22 -0000	1.82
+++ .cvsignore	25 Sep 2007 15:56:34 -0000	1.83
@@ -79,3 +79,4 @@
 audit-1.5.6.tar.gz
 audit-1.6.tar.gz
 audit-1.6.1.tar.gz
+audit-1.6.2.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- audit.spec	6 Sep 2007 18:16:57 -0000	1.146
+++ audit.spec	25 Sep 2007 15:56:34 -0000	1.147
@@ -1,15 +1,14 @@
 %define sca_version 0.4.3
-%define sca_release 4
+%define sca_release 5
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6.1
-Release: 2%{?dist}
+Version: 1.6.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch1: audit-1.6.1-event-host.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -68,7 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -112,6 +110,11 @@
 
 %find_lang system-config-audit
 
+# Remove the plugin stuff for now
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/au-ids.conf
+rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/remote.conf
+rm -f $RPM_BUILD_ROOT/sbin/audisp-ids
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -174,7 +177,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
+%doc  README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules init.d/auditd.cron
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(750,root,root) /sbin/auditctl
@@ -193,7 +196,8 @@
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-%attr(640,root,root) /etc/audisp/plugins.d/*
+%attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 
 %files -n system-config-audit -f system-config-audit.lang
 %defattr(-,root,root,-)
@@ -211,6 +215,14 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Sep 25 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-1
+- Add support for searching by posix regular expressions in auparse
+- Route DEAMON events into rt interface
+- If event pipe is full, try again after doing local logging
+- Optionally add node/machine name to records in audit daemon
+- Update ausearch/aureport to specify nodes to search on
+- Fix segfault interpretting saddr fields in avcs
+
 * Thu Sep 6 2007 Steve Grubb <sgrubb at redhat.com> 1.6.1-2
 - Fix uninitialized variable in auparse (John Dennis)
 
@@ -376,170 +388,3 @@
 - Remove watches from aureport since FS_WATCH is deprecated
 - Add audit_log_avc back temporarily (#208152)
  
-* Mon Sep 18 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-2
-- Fix logging messages to use addr if passed.
-- Apply patches from Tony Jones correcting no kernel support messages
-- Updated syscall tables for 2.6.18 kernel
-- Remove deprecated functions: audit_log, audit_log_avc, audit_log_if_enabled
-- Disallow syscall auditing on exclude list
-- Improve time handling in ausearch and aureport (#191394)
-- Attempt to reconstruct full path from relative for searching
-
-* Wed Aug 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-3
-- Rename audit event socket
-
-* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
-- Another minor update to auditctl -p option
-
-* Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
-- Apply updates to dispatcher
-- Fix a couple bugs regarding MLS labels
-- Resurrect -p option
-- Tighten rules with exclude filter
-- Fix parsing issue which lead to segfault in some cases
-- Fix option parsing to ignore malformed lines
-
-* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 1.2.5-8
-- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
-  (#203001)
-
-* Wed Aug 8 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-7
-- Remove debug lines from dispatcher
-
-* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-6
-- Change audisp to use a named pipe
-
-* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
-- Fix dispatcher to handle sigchld
-- Fix library location for 64 bit
-- Add Prereq
-
-* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
-- Eliminate avc package from audisp
-
-* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-3
-- More fixes for setroubleshoot to handle failing plugin
-
-* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
-- Fixes for setroubleshoot
-
-* Thu Jul 13 2006 Steve Grubb <sgrubb at redhat.com> 1.2.5-1
-- Switch out dispatcher
-- Fix bug upgrading rule types
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.1
-- rebuild
-
-* Fri Jun 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.4-1
-- Add support for the new filter key
-- Update syscall tables for 2.6.17
-- Add audit failure query function
-- Switch out gethostbyname call with getaddrinfo
-- Add audit by obj capability for 2.6.18 kernel
-- Ausearch & aureport now fail if no args to -te
-- New auditd.conf option to choose blocking/non-blocking dispatcher comm
-- Ausearch improved search by label
-
-* Fri May 25 2006 Steve Grubb <sgrubb at redhat.com> 1.2.3-1
-- Apply patch to ensure watches only associate with exit filter
-- Apply patch to correctly show new operators when new listing format is used
-- Apply patch to pull kernel's audit.h into python bindings
-- Collect signal sender's context
-
-* Tue May 16 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.2-2
-- Require kernel-headers, not glibc-kernheaders. Again.
-
-* Fri May 12 2006 Steve Grubb <sgrubb at redhat.com> 1.2.2-1
-- Updates for new glibc-kernheaders
-- Change auditctl to collect list of rules then delete them on -D
-- Update capp.rules and lspp.rules to comment out rules for the possible list
-- Add new message types
-- Support sigusr1 sender identity of newer kernels
-- Add support for ppid in auditctl and ausearch
-- fix auditctl to trim the '/' from watches
-- Move audit daemon config files to /etc/audit for better SE Linux protection
-
-* Wed Apr 25 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.1-2
-- Require kernel-headers, not glibc-kernheaders
-- Fix redefinition of audit_rule_data with new kernel headers
-- Remove abuse of __KERNEL__ in lookup_table.c
-
-* Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
-- New message type for trusted apps
-- Add new keywords today, yesterday, now for ausearch and aureport
-- Make audit_log_user_avc_message really send to syslog on error
-- Updated syscall tables in auditctl
-- Deprecated the 'possible' action for syscall rules in auditctl
-- Update watch code to use file syscalls instead of 'all' in auditctl
-
-* Fri Apr 7 2006 Steve Grubb <sgrubb at redhat.com> 1.2-1
-- Add support for new file system auditing kernel subsystem
-
-* Thu Apr 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.6-1
-- New message types
-- Support new rule format found in 2.6.17 and later kernels
-- Add support for audit by role, clearance, type, sensitivity
-
-* Wed Mar 6 2006 Steve Grubb <sgrubb at redhat.com> 1.1.5-1
-- Changed audit_log_semanage_message to take new params
-- In aureport, add class between syscall and permission in avc report
-- Fix bug where fsync is called in debug mode
-- Add optional support for tty in SYSCALL records for ausearch/aureport
-- Reinstate legacy rule operator support
-- Add man pages
-- Auditd ignore most signals
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.4-5.1
-- bump again for double-long bug on ppc(64)
-
-* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-5
-- Change audit_log_semanage_message to check strlen as well as NULL.
-
-* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
-- Change audit_log_semanage_message to take new params.
-
-* Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1
-- Fix bug in autrace where it didn't run on kernels without file watch support
-- Add syslog message to auditd saying what program was started for dispatcher
-- Remove audit_send_user from public api
-- Fix bug in USER_LOGIN messages where ausearch does not translate
-  msg='uid=500: into acct name (#178102).
-- Change comm with dispatcher to socketpair from pipe
-- Change auditd to use custom daemonize to avoid race in init scripts
-- Update error message when deleting a rule that doesn't exist (#176239)
-- Call shutdown_dispatcher when auditd stops
-- Add new logging function audit_log_semanage_message
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan 5 2006 Steve Grubb <sgrubb at redhat.com> 1.1.3-1
-- Add timestamp to daemon_config messages (#174865)
-- Add error checking of year for aureport & ausearch
-- Treat af_unix sockets as files for searching and reporting
-- Update capp & lspp rules to combine syscalls for higher performance
-- Adjusted the chkconfig line for auditd to start a little earlier
-- Added skeleton program to docs for people to write their own dispatcher with
-- Apply patch from Ulrich Drepper that optimizes resource utilization
-- Change ausearch and aureport to unlocked IO
-
-* Thu Dec 5 2005 Steve Grubb <sgrubb at redhat.com> 1.1.2-1
-- Add more message types
-
-* Wed Nov 30 2005 Steve Grubb <sgrubb at redhat.com> 1.1.1-1
-- Add support for alpha processors
-- Update the audisp code
-- Add locale code in ausearch and aureport
-- Add new rule operator patch
-- Add exclude filter patch
-- Cleanup make files
-- Add python bindings
-
-* Wed Nov 9 2005 Steve Grubb <sgrubb at redhat.com> 1.1-1
-- Add initial version of audisp. Just a placeholder at this point
-- Remove -t from auditctl
-
-* Mon Nov 7 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-1
-- Add 2 more summary reports
-- Add 2 more message types
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	2 Sep 2007 16:49:22 -0000	1.102
+++ sources	25 Sep 2007 15:56:34 -0000	1.103
@@ -1 +1 @@
-ce393ed76e25dd95f2d54ae27e7a25be  audit-1.6.1.tar.gz
+a95dbfa22e65669e4449f3accbe84aef  audit-1.6.2.tar.gz


--- audit-1.6.1-event-host.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 15:57:14 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 11:57:14 -0400
Subject: rpms/python-fedora/devel python-fedora.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709251557.l8PFvEMe019724@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592

Modified Files:
	.cvsignore sources 
Added Files:
	python-fedora.spec 
Log Message:
* Initial import of reviewed python-fedora.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.18
Release:        3%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 15:56:41 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 15:56:41 -0000	1.2
@@ -0,0 +1 @@
+b0021a9eff35c4dd6c87f1da8e364ca0  python-fedora-0.2.90.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:09:37 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 25 Sep 2007 12:09:37 -0400
Subject: rpms/gcc/devel gcc41-artificial-attrib.patch, NONE,
	1.1 gcc41-error-attrib.patch, NONE, 1.1 gcc41-jdwp.patch, NONE,
	1.1 gcc41-pr20880.patch, NONE, 1.1 gcc41-pr32694.patch, NONE,
	1.1 .cvsignore, 1.212, 1.213 gcc41-pr28755.patch, 1.1,
	1.2 gcc41.spec, 1.176, 1.177 sources, 1.214,
	1.215 gcc41-builtin-chk-anticipated.patch, 1.1,
	NONE gcc41-builtin-throw.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack-len.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack.patch, 1.2,
	NONE gcc41-c++-gnu_inline.patch, 1.1,
	NONE gcc41-makeinfo-ver.patch, 1.4,
	NONE gcc41-ppc-sync-qihi.patch, 1.1, NONE gcc41-ppc-tramp.patch,
	1.1, NONE gcc41-pr22244.patch, 1.1, NONE gcc41-pr27954.patch,
	1.1, NONE gcc41-pr32678.patch, 1.1, NONE gcc41-pr32912.patch,
	1.2, NONE gcc41-pr33423.patch, 1.1, NONE gcc41-rh253102.patch,
	1.1, NONE gcc41-scanf-fmt-check.patch, 1.1,
	NONE gcc41-sparc-niagara.patch, 1.1, NONE
Message-ID: <200709251609.l8PG9bvd026385@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26325

Modified Files:
	.cvsignore gcc41-pr28755.patch gcc41.spec sources 
Added Files:
	gcc41-artificial-attrib.patch gcc41-error-attrib.patch 
	gcc41-jdwp.patch gcc41-pr20880.patch gcc41-pr32694.patch 
Removed Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack-len.patch 
	gcc41-builtin-va-arg-pack.patch gcc41-c++-gnu_inline.patch 
	gcc41-makeinfo-ver.patch gcc41-ppc-sync-qihi.patch 
	gcc41-ppc-tramp.patch gcc41-pr22244.patch gcc41-pr27954.patch 
	gcc41-pr32678.patch gcc41-pr32912.patch gcc41-pr33423.patch 
	gcc41-rh253102.patch gcc41-scanf-fmt-check.patch 
	gcc41-sparc-niagara.patch 
Log Message:
4.1.2-28

gcc41-artificial-attrib.patch:

--- NEW FILE gcc41-artificial-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* tree.h (block_nonartificial_location): New prototype.
	* tree.c (block_nonartificial_location): New function.
	* dwarf2out.c (gen_subprogram_die): Add DW_AT_artificial
	if artificial attribute is present on abstract inline decl.
	* c-common.c (handle_artificial_attribute): New function.
	(c_common_attribute_table): Add artificial attribute.
	* final.c (override_filename, override_linenum): New variables.
	(final_scan_insn): For DBX_DEBUG or SDB_DEBUG, set override_filename
	and override_linenum if inside of a block inlined from
	__attribute__((__artificial__)) function.
	(notice_source_line): Honor override_filename and override_linenum.
	* doc/extend.texi: Document __attribute__((__artificial__)).
	* config/i386/emmintrin.h: Add __artificial__ attribute to
	all __always_inline__ functions.
	* config/i386/mmintrin.h: Likewise.
	* config/i386/mm3dnow.h: Likewise.
	* config/i386/pmmintrin.h: Likewise.
	* config/i386/ammintrin.h: Likewise.
	* config/i386/xmmintrin.h: Likewise.

--- gcc/doc/extend.texi.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:04:15.000000000 +0200
@@ -1589,7 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline} and @code{externally_visible}.  Several other
+ at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
+Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1671,6 +1672,14 @@ In C++, this attribute does not depend o
 but it still requires the @code{inline} keyword to enable its special
 behavior.
 
+ at cindex @code{artificial} function attribute
+ at item artificial
+This attribute is useful for small inline wrappers which if possible
+should appear during debugging as a unit, depending on the debug
+info format it will either mean marking the function as artificial
+or using the caller location for all instructions within the inlined
+body.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/tree.c.jj	2007-04-03 13:18:26.000000000 +0200
+++ gcc/tree.c	2007-09-25 15:01:49.000000000 +0200
@@ -7638,4 +7638,40 @@ empty_body_p (tree stmt)
   return true;
 }
 
+/* If BLOCK is inlined from an __attribute__((__artificial__))
+   routine, return pointer to location from where it has been
+   called.  */
+location_t *
+block_nonartificial_location (tree block)
+{
+  location_t *ret = NULL;
+
+  while (block && TREE_CODE (block) == BLOCK
+	 && BLOCK_ABSTRACT_ORIGIN (block))
+    {
+      tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+	ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+      if (TREE_CODE (ao) == FUNCTION_DECL)
+	{
+	  /* If AO is an artificial inline, point RET to the
+	     call site locus at which it has been inlined and continue
+	     the loop, in case AO's caller is also an artificial
+	     inline.  */
+	  if (DECL_DECLARED_INLINE_P (ao)
+	      && lookup_attribute ("artificial", DECL_ATTRIBUTES (ao)))
+	    ret = &BLOCK_SOURCE_LOCATION (block);
+	  else
+	    break;
+	}
+      else if (TREE_CODE (ao) != BLOCK)
+	break;
+
+      block = BLOCK_SUPERCONTEXT (block);
+    }
+  return ret;
+}
+
 #include "gt-tree.h"
--- gcc/tree.h.jj	2007-09-25 12:20:12.000000000 +0200
+++ gcc/tree.h	2007-09-25 15:02:37.000000000 +0200
@@ -4270,6 +4270,8 @@ extern tree build_addr (tree, tree);
 extern bool fields_compatible_p (tree, tree);
 extern tree find_compatible_field (tree, tree);
 
+extern location_t *block_nonartificial_location (tree);
+
 /* In function.c */
 extern void expand_main_function (void);
 extern void init_dummy_function_start (void);
--- gcc/final.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/final.c	2007-09-25 15:01:49.000000000 +0200
@@ -141,6 +141,10 @@ static int high_function_linenum;
 /* Filename of last NOTE.  */
 static const char *last_filename;
 
+/* Override filename and line number.  */
+static const char *override_filename;
+static int override_linenum;
+
 /* Whether to force emission of a line note before the next insn.  */
 static bool force_source_line = false;
   
@@ -1822,6 +1826,18 @@ final_scan_insn (rtx insn, FILE *file, i
 	      /* Mark this block as output.  */
 	      TREE_ASM_WRITTEN (NOTE_BLOCK (insn)) = 1;
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      location_t *locus_ptr
+		= block_nonartificial_location (NOTE_BLOCK (insn));
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_BLOCK_END:
@@ -1841,6 +1857,24 @@ final_scan_insn (rtx insn, FILE *file, i
 
 	      (*debug_hooks->end_block) (high_block_linenum, n);
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      tree outer_block = BLOCK_SUPERCONTEXT (NOTE_BLOCK (insn));
+	      location_t *locus_ptr
+		= block_nonartificial_location (outer_block);
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	      else
+		{
+		  override_filename = NULL;
+		  override_linenum = 0;
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_DELETED_LABEL:
@@ -2521,8 +2555,19 @@ final_scan_insn (rtx insn, FILE *file, i
 static bool
 notice_source_line (rtx insn)
 {
-  const char *filename = insn_file (insn);
-  int linenum = insn_line (insn);
+  const char *filename;
+  int linenum;
+
+  if (override_filename)
+    {
+      filename = override_filename;
+      linenum = override_linenum;
+    }
+  else
+    {
+      filename = insn_file (insn);
+      linenum = insn_line (insn);
+    }
 
   if (filename
       && (force_source_line
--- gcc/dwarf2out.c.jj	2007-04-03 13:13:27.000000000 +0200
+++ gcc/dwarf2out.c	2007-09-25 15:01:49.000000000 +0200
@@ -11667,6 +11667,10 @@ gen_subprogram_die (tree decl, dw_die_re
             add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_not_inlined);
 	}
 
+      if (DECL_DECLARED_INLINE_P (decl)
+	  && lookup_attribute ("artificial", DECL_ATTRIBUTES (decl)))
+	add_AT_flag (subr_die, DW_AT_artificial, 1);
+
       equate_decl_number_to_die (decl, subr_die);
     }
   else if (!DECL_EXTERNAL (decl))
--- gcc/c-common.c.jj	2007-03-27 15:40:15.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:01:49.000000000 +0200
@@ -505,8 +505,8 @@ static tree handle_noreturn_attribute (t
 static tree handle_noinline_attribute (tree *, tree, tree, int, bool *);
[...3799 lines suppressed...]
   return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__A, (__v4si)__B);
 }
 
 #if 0
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_extract_epi16 (__m128i const __A, int const __N)
 {
   return __builtin_ia32_vec_ext_v8hi ((__v8hi)__A, __N);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_insert_epi16 (__m128i const __A, int const __D, int const __N)
 {
   return (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)__A, __D, __N);
@@ -1341,37 +1341,37 @@ _mm_insert_epi16 (__m128i const __A, int
   ((__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)(A), (D), (N)))
 #endif
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_movemask_epi8 (__m128i __A)
 {
   return __builtin_ia32_pmovmskb128 ((__v16qi)__A);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_mulhi_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmulhuw128 ((__v8hi)__A, (__v8hi)__B);
@@ -1381,67 +1381,67 @@ _mm_mulhi_epu16 (__m128i __A, __m128i __
 #define _mm_shufflelo_epi16(__A, __B) ((__m128i)__builtin_ia32_pshuflw ((__v8hi)__A, __B))
 #define _mm_shuffle_epi32(__A, __B) ((__m128i)__builtin_ia32_pshufd ((__v4si)__A, __B))
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_maskmoveu_si128 (__m128i __A, __m128i __B, char *__C)
 {
   __builtin_ia32_maskmovdqu ((__v16qi)__A, (__v16qi)__B, __C);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgb128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_sad_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_psadbw128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si32 (int *__A, int __B)
 {
   __builtin_ia32_movnti (__A, __B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si128 (__m128i *__A, __m128i __B)
 {
   __builtin_ia32_movntdq ((__v2di *)__A, (__v2di)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_pd (double *__A, __m128d __B)
 {
   __builtin_ia32_movntpd (__A, (__v2df)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_clflush (void const *__A)
 {
   __builtin_ia32_clflush (__A);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_lfence (void)
 {
   __builtin_ia32_lfence ();
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_mfence (void)
 {
   __builtin_ia32_mfence ();
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi32_si128 (int __A)
 {
   return _mm_set_epi32 (0, 0, 0, __A);
@@ -1449,14 +1449,14 @@ _mm_cvtsi32_si128 (int __A)
 
 #ifdef __x86_64__
 /* Intel intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
 }
 
 /* Microsoft intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64x_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
@@ -1465,37 +1465,37 @@ _mm_cvtsi64x_si128 (long long __A)
 
 /* Casts between various SP, DP, INT vector types.  Note that these do no
    conversion of values, they just change the type.  */
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castpd_ps(__m128d __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castpd_si128(__m128d __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castps_pd(__m128 __A)
 {
   return (__m128d) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castps_si128(__m128 __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_ps(__m128i __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_pd(__m128i __A)
 {
   return (__m128d) __A;

gcc41-error-attrib.patch:

--- NEW FILE gcc41-error-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* expr.c (expand_expr_real_1) <case CALL_EXPR>: Use get_callee_fndecl
	instead of checking CALL_EXPR_FN directly to test for builtins.
	If error or warning attributes are present, print
	error resp. warning.
	* c-common.c (handle_error_attribute): New function.
	(c_common_attribute_table): Add error and warning
	attributes.
	* doc/extend.texi: Document error and warning attributes.

	* gcc.dg/va-arg-pack-len-1.c: Use error and warning
	attributes.
	* gcc.dg/va-arg-pack-len-2.c: New test.
	* g++.dg/ext/va-arg-pack-len-1.C: Use error and warning
	attributes.
	* g++.dg/ext/va-arg-pack-len-2.C: New test.

--- gcc/doc/extend.texi.jj	2007-09-25 15:04:15.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:32:22.000000000 +0200
@@ -1589,8 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
-Several other
+ at code{gnu_inline}, @code{externally_visible}, @code{artificial},
+ at code{error} and @code{warning}.  Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1688,6 +1688,30 @@ Whether the function itself is considere
 the current inlining parameters.  The @code{flatten} attribute only works
 reliably in unit-at-a-time mode.
 
+ at item error ("@var{message}")
+ at cindex @code{error} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, an error
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions where checking the inline function arguments is not
+possible through @code{extern char [(condition) ? 1 : -1];} tricks.
+While it is possible to leave the function undefined and thus invoke
+a link failure, when using this attribute the problem will be diagnosed
+earlier and with exact location of the call even in presence of inline
+functions or when not emitting debugging information.
+
+ at item warning ("@var{message}")
+ at cindex @code{warning} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, a warning
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions.  While it is possible to define the function with
+a message in @code{.gnu.warning*} section, when using this attribute the problem
+will be diagnosed earlier and with exact location of the call even in presence
+of inline functions or when not emitting debugging information.
+
 @item cdecl
 @cindex functions that do pop the argument stack on the 386
 @opindex mrtd
--- gcc/expr.c.jj	2007-09-25 14:58:40.000000000 +0200
+++ gcc/expr.c	2007-09-25 15:19:15.000000000 +0200
@@ -7513,19 +7513,31 @@ expand_expr_real_1 (tree exp, rtx target
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
 	error ("invalid use of %<__builtin_va_arg_pack ()%>");
-      /* Check for a built-in function.  */
-      if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
-	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == FUNCTION_DECL)
-	  && DECL_BUILT_IN (TREE_OPERAND (TREE_OPERAND (exp, 0), 0)))
-	{
-	  if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == BUILT_IN_FRONTEND)
-	    return lang_hooks.expand_expr (exp, original_target,
-					   tmode, modifier,
-					   alt_rtl);
-	  else
-	    return expand_builtin (exp, target, subtarget, tmode, ignore);
+      {
+	tree fndecl = get_callee_fndecl (exp), attr;
+
+	if (fndecl
+	    && (attr = lookup_attribute ("error",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  error ("call to %qs declared with attribute error: %s",
+		 lang_hooks.decl_printable_name (fndecl, 1),
+		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+	if (fndecl
+	    && (attr = lookup_attribute ("warning",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  warning (0, "call to %qs declared with attribute warning: %s",
+		   lang_hooks.decl_printable_name (fndecl, 1),
+		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+
+	/* Check for a built-in function.  */
+	if (fndecl && DECL_BUILT_IN (fndecl))
+	  {
+	    if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_FRONTEND)
+	      return lang_hooks.expand_expr (exp, original_target,
+					     tmode, modifier, alt_rtl);
+	    else
+	      return expand_builtin (exp, target, subtarget, tmode, ignore);
+	  }
 	}
 
       return expand_call (exp, target, ignore);
--- gcc/c-common.c.jj	2007-09-25 15:01:49.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:24:34.000000000 +0200
@@ -508,6 +508,7 @@ static tree handle_always_inline_attribu
 static tree handle_gnu_inline_attribute (tree *, tree, tree, int, bool *);
 static tree handle_artificial_attribute (tree *, tree, tree, int, bool *);
 static tree handle_flatten_attribute (tree *, tree, tree, int, bool *);
+static tree handle_error_attribute (tree *, tree, tree, int, bool *);
 static tree handle_used_attribute (tree *, tree, tree, int, bool *);
 static tree handle_unused_attribute (tree *, tree, tree, int, bool *);
 static tree handle_externally_visible_attribute (tree *, tree, tree, int,
@@ -641,6 +642,10 @@ const struct attribute_spec c_common_att
 			      handle_warn_unused_result_attribute },
   { "sentinel",               0, 1, false, true, true,
 			      handle_sentinel_attribute },
+  { "warning",		      1, 1, true,  false, false,
+			      handle_error_attribute },
+  { "error",		      1, 1, true,  false, false,
+			      handle_error_attribute },
   { NULL,                     0, 0, false, false, false, NULL }
 };
 
@@ -4226,6 +4231,26 @@ handle_flatten_attribute (tree *node, tr
   return NULL_TREE;
 }
 
+/* Handle a "warning" or "error" attribute; arguments as in
+   struct attribute_spec.handler.  */
+
+static tree
+handle_error_attribute (tree *node, tree name, tree args,
+			int ARG_UNUSED (flags), bool *no_add_attrs)
+{
+  if (TREE_CODE (*node) == FUNCTION_DECL
+      || TREE_CODE (TREE_VALUE (args)) == STRING_CST)
+    /* Do nothing else, just set the attribute.  We'll get at
+       it later with lookup_attribute.  */
+    ;
+  else
+    {
+      warning (OPT_Wattributes, "%qE attribute ignored", name);
+      *no_add_attrs = true;
+    }
+
+  return NULL_TREE;
+}
 
 /* Handle a "used" attribute; arguments as in
    struct attribute_spec.handler.  */
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern int warn_open_missing_mode (void);
-extern int warn_open_too_many_arguments (void);
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/gcc.dg/va-arg-pack-len-2.c.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-2.c	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	/* { dg-warning "called with more than 3" } */
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	/* { dg-error "needs 3 arguments, only 2 were given" } */
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern "C" int warn_open_missing_mode (void);
-extern "C" int warn_open_too_many_arguments (void);
+extern "C" int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern "C" int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern "C" void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	// { dg-warning "called with more than 3" }
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	// { dg-error "needs 3 arguments, only 2 were given" }
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}

gcc41-jdwp.patch:

--- NEW FILE gcc41-jdwp.patch ---
2007-09-24  Keith Seitz  <keiths at redhat.com>

	* include/jvm.h (struct natThread): Add new field 'frame'.
	* include/java-interp.h (_Jv_Frame): Use _Jv_ThreadStackPeek,
	_Jv_ThreadStackPop, and _Jv_ThreadStackPush instead of
	java.lang.Thread.frame.
	(~_Jv_Frame): Use _Jv_ThreadStackPop.
	* java/lang/natThread.cc (_Jv_ThreadStackPeek): New function.
	(_Jv_ThreadStackPush): New function.
	(_Jv_ThreadStackPop): New function.
	* java/lang/Thread.java (frame): Remove field to restore
	C++ ABI compatibility.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrames): Use
	_Jv_ThreadStackPeek.
	(getFrame): Likewise.
	* gnu/classpath/jdwp/natVMFrame.cc (getFrameDepth): Likewise.
	* jvmti.cc (getLocalFrame): Likewise.
	(_Jv_JVMTI_GetFrameCount): Likewise.
	(_Jv_JVMTI_GetThreadState): Likewise.
	(_Jv_JVMTI_GetStackTrace): Likewise.
	* interpret.cc (_Jv_ReportJVMTIExceptionThrow): Likewise.
	* headers.txt (java/lang/Thread.h): Prepend declarations
	for _Jv_ThreadStackPeek, _Jv_ThreadStackPush, and _Jv_ThreadStackPop.
	Add as friend functions.
	* jni.cc (_Jv_JNIMethod::call): Push a frame onto the stack when
	calling a JNI method.

--- libjava/interpret.cc	(revision 128603)
+++ libjava/interpret.cc	(working copy)
@@ -1709,7 +1709,7 @@
 _Jv_ReportJVMTIExceptionThrow (jthrowable ex)
 {
   jthread thread = ::java::lang::Thread::currentThread ();
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   jmethodID throw_meth = frame->self->get_method ();
   jlocation throw_loc = -1;
   if (frame->frame_type == frame_interpreter)
--- libjava/include/java-interp.h	(revision 128603)
+++ libjava/include/java-interp.h	(working copy)
@@ -391,14 +391,14 @@
   {
     self = s;
     frame_type = type;
-    next = (_Jv_Frame *) thr->frame;
-    thr->frame = (gnu::gcj::RawData *) this;
+    next = _Jv_ThreadStackPeek (thr);
+    _Jv_ThreadStackPush (thr, this);
     thread = thr;
   }
 
   ~_Jv_Frame ()
   {
-    thread->frame = (gnu::gcj::RawData *) next;
+    _Jv_ThreadStackPop (thread);
   }
 
   int depth ()
--- libjava/include/jvm.h	(revision 128603)
+++ libjava/include/jvm.h	(working copy)
@@ -34,6 +34,8 @@
 
 #include <sysdep/locks.h>
 
+class _Jv_Frame;
+
 /* Macro for possible unused arguments.  */
 #define MAYBE_UNUSED __attribute__((__unused__))
 
@@ -767,6 +769,12 @@
 
   // Each thread has its own JNI object.
   _Jv_JNIEnv *jni_env;
+
+  // Describes the topmost frame in the thread's composite
+  // (interp + JNI) stack. Added here to maintain C++ ABI
+  // compatibility with previous versions. Newer versions
+  // of gcj put this in java/lang/Thread.java.
+  _Jv_Frame *frame;
 };
 
 #endif /* __JAVA_JVM_H__ */
--- libjava/jni.cc	(revision 128603)
+++ libjava/jni.cc	(working copy)
@@ -2343,6 +2343,10 @@
   // Copy over passed-in arguments.
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
+  // Add a frame to the composite (interpreted + JNI) call stack
+  java::lang::Thread *thread = java::lang::Thread::currentThread ();
+  _Jv_NativeFrame nat_frame (_this, thread);
+
   // The actual call to the JNI function.
 #if FFI_NATIVE_RAW_API
   ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
--- libjava/jvmti.cc	(revision 128603)
+++ libjava/jvmti.cc	(working copy)
@@ -228,7 +228,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   
   for (int i = 0; i < depth; i++)
     {    
@@ -516,7 +516,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
    
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   (*frame_count) = frame->depth ();
   return JVMTI_ERROR_NONE;
 }
@@ -543,7 +543,7 @@
       if (thread->isInterrupted ())
 	state |= JVMTI_THREAD_STATE_INTERRUPTED;
 
-      _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+      _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
       if (frame != NULL && frame->frame_type == frame_native)
 	state |= JVMTI_THREAD_STATE_IN_NATIVE;
 
@@ -1273,7 +1273,7 @@
   ILLEGAL_ARGUMENT (start_depth >= (*frame_count));
   ILLEGAL_ARGUMENT (start_depth < (-(*frame_count)));
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
 
   // If start_depth is negative use this to determine at what depth to start
   // the trace by adding it to the length of the call stack.  This allows the
--- libjava/headers.txt	(revision 128603)
+++ libjava/headers.txt	(working copy)
@@ -6,6 +6,7 @@
 
 class java/lang/Thread
 prepend class _Jv_JNIEnv;
+prepend class _Jv_Frame;
 prepend #define _JV_NOT_OWNER 1
 prepend #define _JV_INTERRUPTED 2
 prepend _Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();
@@ -17,6 +18,9 @@
 prepend jint _Jv_DetachCurrentThread ();
 prepend struct _Jv_Thread_t;
 prepend _Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);
+prepend _Jv_Frame *_Jv_ThreadStackPeek (java::lang::Thread *thread);
+prepend void _Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+prepend void _Jv_ThreadStackPop (java::lang::Thread *thread);
 friend _Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();
 friend void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
 friend void ::_Jv_ThreadRun (java::lang::Thread* thread);
@@ -24,6 +28,9 @@
 friend java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
 friend java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
 friend jint (::_Jv_DetachCurrentThread) ();
+friend _Jv_Frame *::_Jv_ThreadStackPeek (java::lang::Thread *thread);
+friend void ::_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+friend void ::_Jv_ThreadStackPop (java::lang::Thread *thread);
 
 class java/lang/String
 prepend jchar* _Jv_GetStringChars (jstring str);
--- libjava/gnu/classpath/jdwp/natVMFrame.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMFrame.cc	(working copy)
@@ -181,7 +181,7 @@
 getFrameDepth (_Jv_Frame *frame)
 {
   jint depth = 0;
-  _Jv_Frame *top_frame = (_Jv_Frame *) frame->thread->frame;
+  _Jv_Frame *top_frame = _Jv_ThreadStackPeek (frame->thread);
   jint num_frames = VMVirtualMachine::getFrameCount (frame->thread);
   
   while (frame != top_frame)
--- libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(working copy)
@@ -553,7 +553,7 @@
      
   frame_list = new ::java::util::ArrayList (num_frames);
   
-  _Jv_Frame *vm_frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   
   // Take start frames off the top of the stack
   while (vm_frame != NULL && start > 0)
@@ -584,7 +584,7 @@
 {
   using namespace gnu::classpath::jdwp::exception;
   
-  _Jv_Frame *vm_frame = (_Jv_Frame *) thread->frame;
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   jint depth = 0;
   _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (frameID); 
   
--- libjava/java/lang/Thread.java	(revision 128603)
+++ libjava/java/lang/Thread.java	(working copy)
@@ -186,9 +186,6 @@
   // This describes the top-most interpreter frame for this thread.
   RawData interp_frame;
   
-  // This describes the top most frame in the composite (interp + JNI) stack
-  RawData frame;
-
   // Current state.
   volatile int state;
 
--- libjava/java/lang/natThread.cc	(revision 128603)
+++ libjava/java/lang/natThread.cc	(working copy)
@@ -15,6 +15,7 @@
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-threads.h>
+#include <java-interp.h>
 
 #include <gnu/gcj/RawDataManaged.h>
 #include <java/lang/Thread.h>
@@ -525,3 +526,25 @@
 
   return 0;
 }
+
+_Jv_Frame *
+_Jv_ThreadStackPeek (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  return nt->frame;
+}
+
+void
+_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  nt->frame = frame;
+}
+
+void
+_Jv_ThreadStackPop (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  _Jv_Frame *next = nt->frame->next;
+  nt->frame = next;
+}

gcc41-pr20880.patch:

--- NEW FILE gcc41-pr20880.patch ---
2006-11-24  Paul Thomas  <pault at gcc.gnu.org>

	PR fortran/20880
	* parse.c (parse_interface): Error if procedure name is that of
	encompassing scope.

	* gfortran.dg/interface_3a.f90: New test.

--- gcc/fortran/parse.c	(revision 119172)
+++ gcc/fortran/parse.c	(revision 119173)
@@ -1694,6 +1694,7 @@ parse_interface (void)
   gfc_interface_info save;
   gfc_state_data s1, s2;
   gfc_statement st;
+  locus proc_locus;
 
   accept_statement (ST_INTERFACE);
 
@@ -1781,6 +1782,7 @@ loop:
   accept_statement (st);
   prog_unit = gfc_new_block;
   prog_unit->formal_ns = gfc_current_ns;
+  proc_locus = gfc_current_locus;
 
 decl:
   /* Read data declaration statements.  */
@@ -1796,8 +1798,15 @@ decl:
 
   current_interface = save;
   gfc_add_interface (prog_unit);
-
   pop_state ();
+
+  if (current_interface.ns
+	&& current_interface.ns->proc_name
+	&& strcmp (current_interface.ns->proc_name->name,
+		   prog_unit->name) == 0)
+    gfc_error ("INTERFACE procedure '%s' at %L has the same name as the "
+	       "enclosing procedure", prog_unit->name, &proc_locus);
+
   goto loop;
 
 done:
--- gcc/testsuite/gfortran.dg/interface_3a.f90
+++ gcc/testsuite/gfortran.dg/interface_3a.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! Contributed by Joost VandeVondele  <jv244 at cam.ac.uk>
+!
+! This was found whilst investigating => segfault
+subroutine thy_sub (a)
+  interface 
+    subroutine thy_sub (a) ! { dg-error "enclosing procedure" }
+      real a
+    end subroutine
+  end interface
+  real a
+  print *, a
+end subroutine

gcc41-pr32694.patch:

--- NEW FILE gcc41-pr32694.patch ---
2007-09-25  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/32694
	2006-11-08  Roger Sayle  <roger at eyesopen.com>
	* tree-ssa-propagate.c (set_rhs): Verify tcc_comparison the same way
	as tcc_binary.

	* gcc.c-torture/compile/20070925-1.c: New test.

--- gcc/tree-ssa-propagate.c.jj	2007-09-23 19:43:36.000000000 +0200
+++ gcc/tree-ssa-propagate.c	2007-09-25 09:30:50.000000000 +0200
@@ -570,7 +570,8 @@ set_rhs (tree *stmt_p, tree expr)
   ssa_op_iter iter;
 
   /* Verify the constant folded result is valid gimple.  */
-  if (TREE_CODE_CLASS (code) == tcc_binary)
+  if (TREE_CODE_CLASS (code) == tcc_binary
+      || TREE_CODE_CLASS (code) == tcc_comparison)
     {
       if (!is_gimple_val (TREE_OPERAND (expr, 0))
 	  || !is_gimple_val (TREE_OPERAND (expr, 1)))
--- gcc/testsuite/gcc.c-torture/compile/20070925-1.c.jj	2007-09-25 09:28:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070925-1.c	2007-09-25 09:29:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* PR tree-optimization/32694 */
+
+typedef signed long long int WordS64;
+typedef unsigned long long int Word64;
+
+int
+foo (Word64 * p)
+{
+  while (1)
+    {
+      WordS64 c = 0x1llu;
+      WordS64 x = *p;
+      if (c >= 0)
+	{
+	  if (x > (WordS64) 0x7FFFFFFFFFFFFFFFll - c)
+	    return 6;
+	}
+      else if (x < (WordS64) 0x8000000000000000ll - c)
+	return 7;
+      p++;
+    }
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- .cvsignore	21 Aug 2007 19:33:58 -0000	1.212
+++ .cvsignore	25 Sep 2007 16:09:05 -0000	1.213
@@ -1 +1 @@
-gcc-4.1.2-20070821.tar.bz2
+gcc-4.1.2-20070925.tar.bz2

gcc41-pr28755.patch:

Index: gcc41-pr28755.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-pr28755.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr28755.patch	18 Aug 2006 07:38:36 -0000	1.1
+++ gcc41-pr28755.patch	25 Sep 2007 16:09:05 -0000	1.2
@@ -1,44 +1,210 @@
-2006-08-17  Jakub Jelinek  <jakub at redhat.com>
+2007-09-23  Jakub Jelinek  <jakub at redhat.com>
 
 	PR middle-end/28755
-	* expr.c (expand_expr_real_1) <case ARRAY_REF>: Make sure
-	the const array field optimization doesn't create an extra constant
-	MEM.
+	* expr.c (expand_constructor): New function.
+	(expand_expr_real_1) <case CONSTRUCTOR>: Call it.
+	(expand_expr_real_1) <case ARRAY_REF>: Call it if VALUE is
+	CONSTRUCTOR.
 
 	* gcc.dg/pr28755.c: New test.
 
---- gcc/expr.c.jj	2006-08-09 17:54:03.000000000 +0200
-+++ gcc/expr.c	2006-08-17 13:00:33.000000000 +0200
-@@ -7105,13 +7105,25 @@ expand_expr_real_1 (tree exp, rtx target
+--- gcc/expr.c	(revision 128684)
++++ gcc/expr.c	(revision 128685)
+@@ -6435,6 +6435,89 @@ expand_expr_addr_expr (tree exp, rtx tar
+   return result;
+ }
+ 
++/* Generate code for computing CONSTRUCTOR EXP.
++   An rtx for the computed value is returned.  If AVOID_TEMP_MEM
++   is TRUE, instead of creating a temporary variable in memory
++   NULL is returned and the caller needs to handle it differently.  */
++
++static rtx
++expand_constructor (tree exp, rtx target, enum expand_modifier modifier,
++		    bool avoid_temp_mem)
++{
++  tree type = TREE_TYPE (exp);
++  enum machine_mode mode = TYPE_MODE (type);
++
++  /* Try to avoid creating a temporary at all.  This is possible
++     if all of the initializer is zero.
++     FIXME: try to handle all [0..255] initializers we can handle
++     with memset.  */
++  if (TREE_STATIC (exp)
++      && !TREE_ADDRESSABLE (exp)
++      && target != 0 && mode == BLKmode
++      && all_zeros_p (exp))
++    {
++      clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL);
++      return target;
++    }
++
++  /* All elts simple constants => refer to a constant in memory.  But
++     if this is a non-BLKmode mode, let it store a field at a time
++     since that should make a CONST_INT or CONST_DOUBLE when we
++     fold.  Likewise, if we have a target we can use, it is best to
++     store directly into the target unless the type is large enough
++     that memcpy will be used.  If we are making an initializer and
++     all operands are constant, put it in memory as well.
++
++     FIXME: Avoid trying to fill vector constructors piece-meal.
++     Output them with output_constant_def below unless we're sure
++     they're zeros.  This should go away when vector initializers
++     are treated like VECTOR_CST instead of arrays.  */
++  if ((TREE_STATIC (exp)
++       && ((mode == BLKmode
++	    && ! (target != 0 && safe_from_p (target, exp, 1)))
++		  || TREE_ADDRESSABLE (exp)
++		  || (host_integerp (TYPE_SIZE_UNIT (type), 1)
++		      && (! MOVE_BY_PIECES_P
++				     (tree_low_cst (TYPE_SIZE_UNIT (type), 1),
++				      TYPE_ALIGN (type)))
++		      && ! mostly_zeros_p (exp))))
++      || ((modifier == EXPAND_INITIALIZER || modifier == EXPAND_CONST_ADDRESS)
++	  && TREE_CONSTANT (exp)))
++    {
++      rtx constructor;
++
++      if (avoid_temp_mem)
++	return NULL_RTX;
++
++      constructor = output_constant_def (exp, 1);
++
++      if (modifier != EXPAND_CONST_ADDRESS
++	  && modifier != EXPAND_INITIALIZER
++	  && modifier != EXPAND_SUM)
++	constructor = validize_mem (constructor);
++
++      return constructor;
++    }
++
++  /* Handle calls that pass values in multiple non-contiguous
++     locations.  The Irix 6 ABI has examples of this.  */
++  if (target == 0 || ! safe_from_p (target, exp, 1)
++      || GET_CODE (target) == PARALLEL || modifier == EXPAND_STACK_PARM)
++    {
++      if (avoid_temp_mem)
++	return NULL_RTX;
++
++      target
++	= assign_temp (build_qualified_type (type, (TYPE_QUALS (type)
++						    | (TREE_READONLY (exp)
++						       * TYPE_QUAL_CONST))),
++		       0, TREE_ADDRESSABLE (exp), 1);
++    }
++
++  store_constructor (exp, target, 0, int_expr_size (exp));
++  return target;
++}
++
+ 
+ /* expand_expr: generate code for computing expression EXP.
+    An rtx for the computed value is returned.  The value is never null.
+@@ -6899,71 +6982,7 @@ expand_expr_real_1 (tree exp, rtx target
+ 	  return const0_rtx;
+ 	}
+ 
+-      /* Try to avoid creating a temporary at all.  This is possible
+-	 if all of the initializer is zero.
+-	 FIXME: try to handle all [0..255] initializers we can handle
+-	 with memset.  */
+-      else if (TREE_STATIC (exp)
+-	       && !TREE_ADDRESSABLE (exp)
+-	       && target != 0 && mode == BLKmode
+-	       && all_zeros_p (exp))
+-	{
+-	  clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL);
+-	  return target;
+-	}
+-
+-      /* All elts simple constants => refer to a constant in memory.  But
+-	 if this is a non-BLKmode mode, let it store a field at a time
+-	 since that should make a CONST_INT or CONST_DOUBLE when we
+-	 fold.  Likewise, if we have a target we can use, it is best to
+-	 store directly into the target unless the type is large enough
+-	 that memcpy will be used.  If we are making an initializer and
+-	 all operands are constant, put it in memory as well.
+-
+-	FIXME: Avoid trying to fill vector constructors piece-meal.
+-	Output them with output_constant_def below unless we're sure
+-	they're zeros.  This should go away when vector initializers
+-	are treated like VECTOR_CST instead of arrays.
+-      */
+-      else if ((TREE_STATIC (exp)
+-		&& ((mode == BLKmode
+-		     && ! (target != 0 && safe_from_p (target, exp, 1)))
+-		    || TREE_ADDRESSABLE (exp)
+-		    || (host_integerp (TYPE_SIZE_UNIT (type), 1)
+-			&& (! MOVE_BY_PIECES_P
+-			    (tree_low_cst (TYPE_SIZE_UNIT (type), 1),
+-			     TYPE_ALIGN (type)))
+-			&& ! mostly_zeros_p (exp))))
+-	       || ((modifier == EXPAND_INITIALIZER
+-		    || modifier == EXPAND_CONST_ADDRESS)
+-		   && TREE_CONSTANT (exp)))
+-	{
+-	  rtx constructor = output_constant_def (exp, 1);
+-
+-	  if (modifier != EXPAND_CONST_ADDRESS
+-	      && modifier != EXPAND_INITIALIZER
+-	      && modifier != EXPAND_SUM)
+-	    constructor = validize_mem (constructor);
+-
+-	  return constructor;
+-	}
+-      else
+-	{
+-	  /* Handle calls that pass values in multiple non-contiguous
+-	     locations.  The Irix 6 ABI has examples of this.  */
+-	  if (target == 0 || ! safe_from_p (target, exp, 1)
+-	      || GET_CODE (target) == PARALLEL
+-	      || modifier == EXPAND_STACK_PARM)
+-	    target
+-	      = assign_temp (build_qualified_type (type,
+-						   (TYPE_QUALS (type)
+-						    | (TREE_READONLY (exp)
+-						       * TYPE_QUAL_CONST))),
+-			     0, TREE_ADDRESSABLE (exp), 1);
+-
+-	  store_constructor (exp, target, 0, int_expr_size (exp));
+-	  return target;
+-	}
++      return expand_constructor (exp, target, modifier, false);
+ 
+     case MISALIGNED_INDIRECT_REF:
+     case ALIGN_INDIRECT_REF:
+@@ -7105,10 +7124,25 @@ expand_expr_real_1 (tree exp, rtx target
  					      field, value)
  		      if (tree_int_cst_equal (field, index))
  			{
 -			  if (!TREE_SIDE_EFFECTS (value))
+-			    return expand_expr (fold (value), target, tmode,
+-						modifier);
+-			  break;
 +			  if (TREE_SIDE_EFFECTS (value))
 +			    break;
 +
-+			  if (TREE_CODE (value) != CONSTRUCTOR)
- 			    return expand_expr (fold (value), target, tmode,
- 						modifier);
-+
-+			  /* For CONSTRUCTOR this optimization is not always
-+			     a win - if expand_expr creates a temporary
-+			     constant, we just waste unnecessarily rodata
-+			     space.  */
-+			  temp = expand_expr (value, target, tmode, modifier);
-+			  if (temp == target
-+			      || (temp && GET_CODE (temp) != MEM))
-+			    return temp;
- 			  break;
++			  if (TREE_CODE (value) == CONSTRUCTOR)
++			    {
++			      /* If VALUE is a CONSTRUCTOR, this
++				 optimization is only useful if
++				 this doesn't store the CONSTRUCTOR
++				 into memory.  If it does, it is more
++				 efficient to just load the data from
++				 the array directly.  */
++			      rtx ret = expand_constructor (value, target,
++							    modifier, true);
++			      if (ret == NULL_RTX)
++				break;
++			    }
++
++			  return expand_expr (fold (value), target, tmode,
++					      modifier);
  			}
  		  }
--		else if(TREE_CODE (init) == STRING_CST)
-+		else if (TREE_CODE (init) == STRING_CST)
- 		  {
- 		    tree index1 = index;
- 		    tree low_bound = array_ref_low_bound (exp);
---- gcc/testsuite/gcc.dg/pr28755.c.jj	2006-08-17 12:59:57.000000000 +0200
-+++ gcc/testsuite/gcc.dg/pr28755.c	2006-08-17 12:59:57.000000000 +0200
+ 		else if(TREE_CODE (init) == STRING_CST)
+--- gcc/testsuite/gcc.dg/pr28755.c	(revision 0)
++++ gcc/testsuite/gcc.dg/pr28755.c	(revision 128685)
 @@ -0,0 +1,22 @@
 +/* PR middle-end/28755 */
 +/* { dg-do compile } */


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gcc41.spec	22 Sep 2007 12:45:46 -0000	1.176
+++ gcc41.spec	25 Sep 2007 16:09:05 -0000	1.177
@@ -1,6 +1,6 @@
-%define DATE 20070821
+%define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 26
+%define gcc_release 28
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -138,24 +138,13 @@
 Patch22: gcc41-build-id.patch
 Patch23: gcc41-pr28690.patch
 Patch24: gcc41-rh247256.patch
-Patch25: gcc41-pr22244.patch
-Patch26: gcc41-pr32678.patch
-Patch27: gcc41-pr32912.patch
-Patch28: gcc41-sparc-niagara.patch
-Patch29: gcc41-ppc-tramp.patch
-Patch30: gcc41-rh253102.patch
-Patch31: gcc41-c++-gnu_inline.patch
-Patch32: gcc41-ppc-sync-qihi.patch
-Patch33: gcc41-ppc64-ia64-GNU-stack.patch
-Patch34: gcc41-builtin-chk-anticipated.patch
-Patch35: gcc41-builtin-throw.patch
-Patch36: gcc41-builtin-va-arg-pack.patch
-Patch37: gcc41-builtin-va-arg-pack-len.patch
-Patch38: gcc41-pr27954.patch
-Patch39: gcc41-pr33423.patch
-Patch40: gcc41-scanf-fmt-check.patch
-Patch41: gcc41-pr33506.patch
-Patch42: gcc41-makeinfo-ver.patch
+Patch25: gcc41-ppc64-ia64-GNU-stack.patch
+Patch26: gcc41-pr33506.patch
+Patch27: gcc41-artificial-attrib.patch
+Patch28: gcc41-error-attrib.patch
+Patch29: gcc41-jdwp.patch
+Patch30: gcc41-pr20880.patch
+Patch31: gcc41-pr32694.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -463,24 +452,13 @@
 %patch22 -p0 -b .build-id~
 %patch23 -p0 -b .pr28690~
 %patch24 -p0 -b .rh247256~
-%patch25 -p0 -b .pr22244~
-%patch26 -p0 -b .pr32678~
-%patch27 -p0 -b .pr32912~
-%patch28 -p0 -b .sparc-niagara~
-%patch29 -p0 -b .ppc-tramp~
-%patch30 -p0 -b .rh253102~
-%patch31 -p0 -b .c++-gnu_inline~
-%patch32 -p0 -b .ppc-sync-qihi~
-%patch33 -p0 -b .ppc64-ia64-GNU-stack~
-%patch34 -p0 -b .builtin-chk-anticipated~
-%patch35 -p0 -b .builtin-throw~
-%patch36 -p0 -b .builtin-va-arg-pack~
-%patch37 -p0 -b .builtin-va-arg-pack-len~
-%patch38 -p0 -b .pr27954~
-%patch39 -p0 -b .pr33423~
-%patch40 -p0 -b .scanf-fmt-check~
-%patch41 -p0 -b .pr33506~
-%patch42 -p0 -b .makeinfo-ver~
+%patch25 -p0 -b .ppc64-ia64-GNU-stack~
+%patch26 -p0 -b .pr33506~
+%patch27 -p0 -b .artificial-attrib~
+%patch28 -p0 -b .error-attrib~
+%patch29 -p0 -b .jdwp~
+%patch30 -p0 -b .pr20880~
+%patch31 -p0 -b .pr32694~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1635,6 +1613,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-28
+- update from gcc-4_1-branch (-r127672:128736)
+  - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,
+	tree-optimization/33142
+- add support for artificial, error and warning attributes
+- restore Java CNI ABI compatibility broken by JDWP changes (Keith Seitz)
+- fix ICE with set_rhs allowing non-gimple (Roger Sayle, #247407,
+  PR tree-optimization/32694)
+- fix ICE on Fortran interface-body declaring current subroutine name
+  (Paul Thomas, #300851, PR fortran/20880)
+
 * Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
 - don't ignore throw specification of function types in type hashing
   (PR c++/33506)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- sources	21 Aug 2007 19:33:58 -0000	1.214
+++ sources	25 Sep 2007 16:09:05 -0000	1.215
@@ -1 +1 @@
-65778706d6b9c029a06fca968a45ab7f  gcc-4.1.2-20070821.tar.bz2
+562ab2446c60a9145da385ac56cf7715  gcc-4.1.2-20070925.tar.bz2


--- gcc41-builtin-chk-anticipated.patch DELETED ---


--- gcc41-builtin-throw.patch DELETED ---


--- gcc41-builtin-va-arg-pack-len.patch DELETED ---


--- gcc41-builtin-va-arg-pack.patch DELETED ---


--- gcc41-c++-gnu_inline.patch DELETED ---


--- gcc41-makeinfo-ver.patch DELETED ---


--- gcc41-ppc-sync-qihi.patch DELETED ---


--- gcc41-ppc-tramp.patch DELETED ---


--- gcc41-pr22244.patch DELETED ---


--- gcc41-pr27954.patch DELETED ---


--- gcc41-pr32678.patch DELETED ---


--- gcc41-pr32912.patch DELETED ---


--- gcc41-pr33423.patch DELETED ---


--- gcc41-rh253102.patch DELETED ---


--- gcc41-scanf-fmt-check.patch DELETED ---


--- gcc41-sparc-niagara.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 16:09:54 2007
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Tue, 25 Sep 2007 12:09:54 -0400
Subject: rpms/cvsweb/EL-4 cvsweb.spec,1.7,1.8
Message-ID: <200709251609.l8PG9s4Z026388@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cvsweb/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26253

Modified Files:
	cvsweb.spec 
Log Message:
Plague, plague, plague! Hopefully the problem is fixed and my build will be successful.



Index: cvsweb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsweb/EL-4/cvsweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsweb.spec	20 Aug 2007 19:59:43 -0000	1.7
+++ cvsweb.spec	25 Sep 2007 16:09:20 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           cvsweb
 Version:        3.0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Web interface for CVS repositories
 
@@ -59,7 +59,7 @@
 
 
 %changelog
-* Sat Aug 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0:3.0.5-2
+* Sat Aug 18 2007 Marek Mahut <mmahut fedoraproject.org> - 0:3.0.5-5
 - Rebuild
 
 * Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.0.5-1



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:50 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:50 -0700
Subject: [pkgdb] optipng: scop has requested watchbugzilla
Message-ID: <200709251615.l8PGFtQM012107@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:51 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:51 -0700
Subject: [pkgdb] optipng: scop has requested commit
Message-ID: <200709251615.l8PGFu5M012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on optipng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:56 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:56 -0700
Subject: [pkgdb] optipng: scop has requested watchbugzilla
Message-ID: <200709251615.l8PGFu5P012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchbugzilla acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:58 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:58 -0700
Subject: [pkgdb] optipng: scop has requested watchcommits
Message-ID: <200709251615.l8PGFtQP012107@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the watchcommits acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:15:59 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:15:59 -0700
Subject: [pkgdb] optipng: scop has requested commit
Message-ID: <200709251615.l8PGFu5S012108@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has requested the commit acl on optipng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 16:20:08 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 25 Sep 2007 12:20:08 -0400
Subject: comps comps-f8.xml.in,1.121,1.122
Message-ID: <200709251620.l8PGK8ah026654@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26595

Modified Files:
	comps-f8.xml.in 
Log Message:
kde-desktop: +ktorrent



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- comps-f8.xml.in	24 Sep 2007 23:54:08 -0000	1.121
+++ comps-f8.xml.in	25 Sep 2007 16:19:38 -0000	1.122
@@ -2372,6 +2372,7 @@
       <packagereq type="default">knetworkmanager</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpowersave</packagereq>
+      <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">redhat-artwork-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -2420,7 +2421,6 @@
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksynaptics</packagereq>
-      <packagereq type="optional">ktorrent</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">lineak-kdeplugins</packagereq>
       <packagereq type="optional">marble</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 16:20:34 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:20:34 -0400
Subject: rpms/chkconfig/devel .cvsignore, 1.37, 1.38 chkconfig.spec, 1.46,
	1.47 sources, 1.38, 1.39
Message-ID: <200709251620.l8PGKYEm026728@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/chkconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26631

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.36-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	3 Aug 2007 18:07:02 -0000	1.37
+++ .cvsignore	25 Sep 2007 16:20:01 -0000	1.38
@@ -1 +1 @@
-chkconfig-1.3.35.tar.gz
+chkconfig-1.3.36.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- chkconfig.spec	3 Aug 2007 18:07:02 -0000	1.46
+++ chkconfig.spec	25 Sep 2007 16:20:01 -0000	1.47
@@ -1,12 +1,12 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.35
+Version: 1.3.36
 Release: 1
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: newt-devel gettext
+BuildRequires: newt-devel gettext popt-devel
 Conflicts: initscripts <= 5.30-1
 
 %description
@@ -72,6 +72,10 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 1.3.36-1
+- buildreq popt-devel, link it dynamically (#279531)
+- translation updates: kn, ko, mr, ro
+
 * Fri Aug  3 2007 Bill Nottingham <notting at redhat.com> 1.3.35-1
 - clarify licensing
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	3 Aug 2007 18:07:02 -0000	1.38
+++ sources	25 Sep 2007 16:20:01 -0000	1.39
@@ -1 +1 @@
-0c80a41f0855bd5dd7dbd6c7c8558978  chkconfig-1.3.35.tar.gz
+099c3554fe699d5399f7894a3a57d3de  chkconfig-1.3.36.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:17 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:17 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDA012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the approveacls acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:20 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:20 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDD012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchcommits acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:26 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 25 Sep 2007 12:23:26 -0400
Subject: comps comps-f8.xml.in,1.122,1.123
Message-ID: <200709251623.l8PGNQkJ026862@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26799

Modified Files:
	comps-f8.xml.in 
Log Message:
s/dolphin/d3lphin/



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- comps-f8.xml.in	25 Sep 2007 16:19:38 -0000	1.122
+++ comps-f8.xml.in	25 Sep 2007 16:22:56 -0000	1.123
@@ -2384,7 +2384,7 @@
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
-      <packagereq type="optional">dolphin</packagereq>
+      <packagereq type="optional">d3lphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
       <packagereq type="optional">im-chooser</packagereq>
       <packagereq type="optional">kasablanca</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:23 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:23 -0700
Subject: [pkgdb] boost had groupAcl changed
Message-ID: <200709251623.l8PGNS0t012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora devel) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:39 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:39 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNMDG012424@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchbugzilla acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:52 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:52 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNS0w012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchbugzilla acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:59 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:59 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNS11012469@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:23:54 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:23:54 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251623.l8PGNxZK012570@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the watchcommits acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:24:01 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:24:01 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251624.l8PGNxZN012570@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the approveacls acl on boost (Fedora 7) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:24:24 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:24:24 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.156, 1.157 kudzu.spec, 1.178,
	1.179 sources, 1.175, 1.176
Message-ID: <200709251624.l8PGOOtt026906@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kudzu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26882

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
1.2.76-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	6 Sep 2007 20:56:17 -0000	1.156
+++ .cvsignore	25 Sep 2007 16:23:52 -0000	1.157
@@ -1 +1 @@
-kudzu-1.2.75.tar.gz
+kudzu-1.2.76.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- kudzu.spec	24 Sep 2007 21:08:20 -0000	1.178
+++ kudzu.spec	25 Sep 2007 16:23:52 -0000	1.179
@@ -1,17 +1,15 @@
 Name: kudzu
-Version: 1.2.75
-Release: 2
+Version: 1.2.76
+Release: 1
 License: GPLv2
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
 Source: kudzu-%{PACKAGE_VERSION}.tar.gz
 Obsoletes: rhs-hwdiag setconsole
-Prereq: chkconfig, modutils >= 2.3.11-5, /etc/init.d
-Requires: pam >= 0.74-17
+Prereq: /sbin/chkconfig
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
-BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel
-BuildRequires: popt-devel popt-static
+BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel popt-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -73,8 +71,10 @@
 %{_includedir}/kudzu
 
 %changelog
-* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.2.75-2
-- BuildRequires: popt-devel popt-static
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 1.2.76-1
+- scsi: minor fix to pull *a* tape device name
+- translation updates: kn
+- buildrequire popt-devel, link it statically (#279451)
 
 * Wed Sep 05 2007 Adam Jackson <ajax at redhat.com> 1.2.75-1
 - Add pcidom to the exported slot list of pciDevice.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kudzu/devel/sources,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- sources	6 Sep 2007 20:56:17 -0000	1.175
+++ sources	25 Sep 2007 16:23:52 -0000	1.176
@@ -1 +1 @@
-1ca8fbb5ac6c829978501cd8a7aa3ad0  kudzu-1.2.75.tar.gz
+23db4f0aa5580bcfe8e8d37b97489cc0  kudzu-1.2.76.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:02 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:02 -0700
Subject: [pkgdb] boost had acl change status
Message-ID: <200709251625.l8PGP7vm012682@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora devel) to Approved for Petr Machata (pmachata)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:45 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:45 -0700
Subject: [pkgdb] boost ownership updated
Message-ID: <200709251625.l8PGP7vp012682@bastion.fedora.phx.redhat.com>

Package boost in Fedora devel was orphaned by Benjamin Kosnik (bkoz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:25:53 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:25:53 -0700
Subject: [pkgdb] boost ownership updated
Message-ID: <200709251625.l8PGPwxn012747@bastion.fedora.phx.redhat.com>

Package boost in Fedora devel is now owned by Benjamin Kosnik (bkoz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:28:32 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 09:28:32 -0700
Subject: [pkgdb] boost had groupAcl changed
Message-ID: <200709251628.l8PGSbVA012812@bastion.fedora.phx.redhat.com>

Benjamin Kosnik (bkoz) has set the commit acl on boost (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/boost



From fedora-extras-commits at redhat.com  Tue Sep 25 16:30:39 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Tue, 25 Sep 2007 12:30:39 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.6,1.7
Message-ID: <200709251630.l8PGUdri027164@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27111

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Fixed running of Xvfb so it does not terminate after a successful test.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- java-1.7.0-icedtea.spec	24 Sep 2007 20:51:55 -0000	1.6
+++ java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
@@ -306,8 +306,8 @@
 popd
 pushd jtreg
   echo ====================JTREG TESTING========================
-  Xvfb :1 -screen 1 1280x1024x24 -ac -terminate &
-  export DISPLAY=:1.1
+  Xvfb :1 &
+  export DISPLAY=:1.0
   ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
 	$(pwd)/../openjdk/j2se/test/ 2>&1
   killall -9 Xvfb
@@ -743,6 +743,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Fixed running of Xvfb so it does not terminate after a successful test.
+
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added JTreg zip as source
 - Run JTreg tests after build for smoke testing.



From fedora-extras-commits at redhat.com  Tue Sep 25 16:45:02 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 12:45:02 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.126, 1.127 initscripts.spec,
	1.148, 1.149 sources, 1.141, 1.142
Message-ID: <200709251645.l8PGj2EN027757@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27712

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update to 8.57-1

Resolves: bug #220887, bug #288151, bug #271201



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- .cvsignore	29 Aug 2007 20:09:11 -0000	1.126
+++ .cvsignore	25 Sep 2007 16:44:29 -0000	1.127
@@ -1 +1 @@
-initscripts-8.56.tar.bz2
+initscripts-8.57.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- initscripts.spec	30 Aug 2007 01:46:58 -0000	1.148
+++ initscripts.spec	25 Sep 2007 16:44:29 -0000	1.149
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.56
+Version: 8.57
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -18,7 +18,7 @@
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 078-1
 Requires: popt >= 1.12-2
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12
+Conflicts: mkinitrd < 4.0, kernel < 2.6.23
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -208,6 +208,16 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> - 8.57-1
+- work around upstream bash changes (#220887, modified from <nvigier at mandriva.com>)
+- init.d/network: add Should-Start for firewall services
+- ifup-eth: handle arp_ip_target separately (#288151, <agospoda at redhat.com>)
+- rc.sysinit: remove rc.serial support - should be udev rules
+- rc.sysinit: remove acpi module loading - now supported by the kernel automatically
+- fix en_GB translation (#271201)
+- translation updates: as, bn_IN, bg, ca, cs, de, el, es, fi, gu, hi, it, ja, ko, kn, ml,
+  mr, nb, nl, pa, pl, pt, pt_BR, ro, sl, sr, sr at Latn, sv, ta, te, zh_CN
+
 * Wed Aug 29 2007 Bill Nottingham <notting at redhat.com> - 8.56-1 
 - rename_device: fix open() call
 - rc.sysinit: optimize out some excess greps (<harald at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	30 Aug 2007 01:59:33 -0000	1.141
+++ sources	25 Sep 2007 16:44:29 -0000	1.142
@@ -1 +1 @@
-a63927b2be56f595d73bc8a30949542b  initscripts-8.56.tar.bz2
+d8191627179b30e2f02d21874f5fdfc8  initscripts-8.57.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 16:53:37 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 12:53:37 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.42,1.43
Message-ID: <200709251653.l8PGrbWc028041@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28003

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.7-85.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- em8300-kmod.spec	12 Sep 2007 19:20:13 -0000	1.42
+++ em8300-kmod.spec	25 Sep 2007 16:53:03 -0000	1.43
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-76.fc7}
+%{!?kversion: %define kversion 2.6.22.7-85.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.7-85.fc7.
+
 * Wed Sep 12 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.5-76.fc7.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:07 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:07 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0CjU013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:10 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:10 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0CjX013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:12 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:12 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0Cja013553@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the commit acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:07 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:07 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0H4m013555@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchbugzilla acl on optipng (Fedora devel) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:16 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:16 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0H4o013555@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchbugzilla acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:18 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 13:00:18 -0400
Subject: rpms/a2ps/devel a2ps-iso5-minus.patch,NONE,1.1 a2ps.spec,1.75,1.76
Message-ID: <200709251700.l8PH0IG9028453@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28422

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-iso5-minus.patch 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
- Make minus sign work in ISO-8859-5 (bug #252314).


a2ps-iso5-minus.patch:

--- NEW FILE a2ps-iso5-minus.patch ---
diff -up a2ps-4.13/encoding/iso5.edf.iso5-minus a2ps-4.13/encoding/iso5.edf
--- a2ps-4.13/encoding/iso5.edf.iso5-minus	2007-09-25 17:57:32.000000000 +0100
+++ a2ps-4.13/encoding/iso5.edf	2007-09-25 17:57:55.000000000 +0100
@@ -69,7 +69,7 @@ Vector:
 .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
 .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef space
 exclam quotedbl numbersign dollar percent ampersand quoteright
-parenleft parenright asterisk plus comma minus period slash zero one
+parenleft parenright asterisk plus comma hyphen period slash zero one
 two three four five six seven eight nine colon semicolon less equal
 greater question at A B C D E F G H I J K L M N O P Q R S T U V W X Y
 Z bracketleft backslash bracketright asciicircum underscore quoteleft


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- a2ps.spec	23 Aug 2007 11:58:09 -0000	1.75
+++ a2ps.spec	25 Sep 2007 16:59:45 -0000	1.76
@@ -21,6 +21,7 @@
 Patch5: a2ps-4.13-varargs.patch
 Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
+Patch8: a2ps-iso5-minus.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -83,6 +84,7 @@
 %patch5 -p1
 %patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
+%patch8 -p1 -b .iso5-minus
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -265,6 +267,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
+- Make minus sign work in ISO-8859-5 (bug #252314).
+
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 4.13b-67
 - More specific license tag.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 17:00:33 2007
From: fedora-extras-commits at redhat.com (pkgdb))
Date: Tue, 25 Sep 2007 10:00:33 -0700
Subject: [pkgdb] optipng had acl change status
Message-ID: <200709251700.l8PH0cP7013690@bastion.fedora.phx.redhat.com>

Till Maas (till) has set the watchcommits acl on optipng (Fedora EPEL 5) to Approved for Ville Skytta (scop)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/optipng



From fedora-extras-commits at redhat.com  Tue Sep 25 17:10:10 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 25 Sep 2007 13:10:10 -0400
Subject: comps comps-f8.xml.in,1.123,1.124
Message-ID: <200709251710.l8PHAAHB002324@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2286

Modified Files:
	comps-f8.xml.in 
Log Message:
libflashsupport was split out from pulseaudio



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- comps-f8.xml.in	25 Sep 2007 16:22:56 -0000	1.123
+++ comps-f8.xml.in	25 Sep 2007 17:09:40 -0000	1.124
@@ -3207,6 +3207,7 @@
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
       <packagereq type="default">alsa-plugins-pulseaudio</packagereq>
+      <packagereq type="default">libflashsupport</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 17:12:40 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Tue, 25 Sep 2007 13:12:40 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.76,1.77
Message-ID: <200709251712.l8PHCers002429@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	a2ps.spec 
Log Message:
4.13b-68


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- a2ps.spec	25 Sep 2007 16:59:45 -0000	1.76
+++ a2ps.spec	25 Sep 2007 17:12:06 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.13b
-Release: 67%{?dist}
+Release: 68%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 #Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -267,7 +267,7 @@
 %dir %{_datadir}/a2ps
 
 %changelog
-* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com>
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 4.13b-68
 - Make minus sign work in ISO-8859-5 (bug #252314).
 
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 4.13b-67



From fedora-extras-commits at redhat.com  Tue Sep 25 17:30:09 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 13:30:09 -0400
Subject: rpms/frysk/devel frysk.spec,1.118,1.119
Message-ID: <200709251730.l8PHU9iY003088@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3033

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
- Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- frysk.spec	25 Sep 2007 13:27:32 -0000	1.118
+++ frysk.spec	25 Sep 2007 17:29:36 -0000	1.119
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
 Version:	0.0.1.2007.09.24
-Release:	1%{?dist}
+Release:	2%{?dist}
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # cdtparser is EPL
 # getopt is GPLv2 with exception
@@ -59,8 +59,8 @@
 Buildrequires:	metacity
 %endif
 
-#ExclusiveArch: %{ix86} x86_64 ppc64
-ExclusiveArch: %{ix86} x86_64
+# Build problems with libunwind; bug 305611.
+ExcludeArch: ppc ppc64
 
 # We do not want to build a ``cross-debugging version'' i686->i386;
 # libunwind build would get confused by this.  Override the cmd-line
@@ -254,6 +254,9 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
+- Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.
+
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
 - Update files list.
 - Fix path to dogtail_scripts.



From fedora-extras-commits at redhat.com  Tue Sep 25 17:31:21 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 13:31:21 -0400
Subject: rpms/frysk/devel frysk-20060922-a-cast.patch, 1.2,
	NONE frysk-no-dejagnu.patch, 1.1, NONE frysk-xfail-2130.patch,
	1.4, NONE
Message-ID: <200709251731.l8PHVLuD003133@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3113

Removed Files:
	frysk-20060922-a-cast.patch frysk-no-dejagnu.patch 
	frysk-xfail-2130.patch 
Log Message:
Remove stray patch files; frysk.spec had them removed some time ago.



--- frysk-20060922-a-cast.patch DELETED ---


--- frysk-no-dejagnu.patch DELETED ---


--- frysk-xfail-2130.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 17:57:13 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 10:57:13 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709251757.l8PHvIqZ018296@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Awaiting Review for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 17:57:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 10:57:20 -0700
Subject: [pkgdb] qa-assistant had acl change status
Message-ID: <200709251757.l8PHvPS9018317@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) has set the watchbugzilla acl on qa-assistant (Fedora devel) to Obsolete for Toshio Ernie Kuratomi (toshio)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qa-assistant



From fedora-extras-commits at redhat.com  Tue Sep 25 18:01:10 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Tue, 25 Sep 2007 14:01:10 -0400
Subject: rpms/firefox/devel firefox-path.patch, NONE, 1.1 firefox.spec, 1.199,
	1.200
Message-ID: <200709251801.l8PI1AkG009845@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891

Modified Files:
	firefox.spec 
Added Files:
	firefox-path.patch 
Log Message:
* Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros



firefox-path.patch:

--- NEW FILE firefox-path.patch ---
--- mozilla/toolkit/xre/nsAppRunner.h.old	2007-09-25 18:01:56.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.h	2007-09-25 18:02:23.000000000 +0200
@@ -48,7 +48,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old	2007-09-25 18:00:26.000000000 +0200
+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp	2007-09-25 18:00:53.000000000 +0200
@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv);
 # elif defined(CCHMAXPATH)
 #  define MAXPATHLEN CCHMAXPATH
 # else
-#  define MAXPATHLEN 1024
+#  include <limits.h>
+#  define MAXPATHLEN PATH_MAX
 # endif
 #endif
 
diff -up mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp
--- mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old	2007-09-25 17:58:43.000000000 +0200
+++ mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp	2007-09-25 17:59:22.000000000 +0200
@@ -70,7 +70,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old	2007-09-25 18:04:25.000000000 +0200
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp	2007-09-25 18:04:48.000000000 +0200
@@ -109,7 +109,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old	2006-11-28 01:18:37.000000000 +0100
+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp	2007-09-25 18:05:49.000000000 +0200
@@ -79,7 +79,8 @@
 #endif
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN	PATH_MAX  /* Guessing this is okay.  Works for SCO. */
 #endif
  
 #if defined(__QNX__)
diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h
--- mozilla/xpcom/build/nsXPCOMPrivate.h.old	2007-09-25 18:02:58.000000000 +0200
+++ mozilla/xpcom/build/nsXPCOMPrivate.h	2007-09-25 18:03:15.000000000 +0200
@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h
--- mozilla/dbm/include/mcom_db.h.old	2007-09-25 17:57:09.000000000 +0200
+++ mozilla/dbm/include/mcom_db.h	2007-09-25 17:57:49.000000000 +0200
@@ -214,7 +214,8 @@
 #endif  /* __DBINTERFACE_PRIVATE */
 
 #ifdef SCO
-#define MAXPATHLEN 	1024              
+#include <limits.h>
+#define MAXPATHLEN 	PATH_MAX     
 #endif
 
 #include <fcntl.h>
diff -up mozilla/browser/components/migration/src/nsProfileMigrator.cpp.old mozilla/browser/components/migration/src/nsProfileMigrator.cpp
--- mozilla/browser/components/migration/src/nsProfileMigrator.cpp.old	2007-09-25 17:55:11.000000000 +0200
+++ mozilla/browser/components/migration/src/nsProfileMigrator.cpp	2007-09-25 18:07:56.000000000 +0200
@@ -73,7 +73,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp.old mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp
--- mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp.old	2007-09-25 17:53:36.000000000 +0200
+++ mozilla/browser/components/migration/src/nsDogbertProfileMigrator.cpp	2007-09-25 18:07:37.000000000 +0200
@@ -35,6 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsBrowserProfileMigratorUtils.h"
 #include "nsCRT.h"
@@ -66,7 +67,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/nsprpub/config/nsinstall.c.old mozilla/nsprpub/config/nsinstall.c
diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c
--- mozilla/js/src/jsfile.c.old	2006-07-26 20:55:08.000000000 +0200
+++ mozilla/js/src/jsfile.c	2007-09-25 18:22:52.000000000 +0200
@@ -105,7 +105,8 @@
 #define utfstring               "binary"
 #define unicodestring           "unicode"
 
-#define MAX_PATH_LENGTH         1024
+#include <limits.h>
+#define MAX_PATH_LENGTH         PATH_MAX
 #define MODE_SIZE               256
 #define NUMBER_SIZE             32
 #define MAX_LINE_LENGTH         256
diff -up mozilla/webshell/tests/viewer/nsViewerApp.cpp.old mozilla/webshell/tests/viewer/nsViewerApp.cpp
--- mozilla/webshell/tests/viewer/nsViewerApp.cpp.old	2007-09-25 18:34:51.000000000 +0200
+++ mozilla/webshell/tests/viewer/nsViewerApp.cpp	2007-09-25 18:35:33.000000000 +0200
@@ -692,7 +692,8 @@ nsViewerApp::OpenWindow(PRUint32 aNewChr
 
 #if !defined(XP_WIN) && !defined(XP_OS2)
 #ifndef XP_MAC
-#define _MAX_PATH 512
+#include <limits.h>
+#define _MAX_PATH PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old	2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c	2007-09-25 18:39:17.000000000 +0200
@@ -44,6 +44,7 @@
 #include "xpidl.h"
 #include <ctype.h>
 #include <glib.h>
+#include <limits.h>
 
 #ifdef XP_WIN
 #include <windef.h>
diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old	2007-09-25 18:14:08.000000000 +0200
+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp	2007-09-25 18:36:55.000000000 +0200
@@ -76,7 +76,8 @@
 #endif
     
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 
 #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c
--- mozilla/modules/libreg/src/reg.c.old	2007-09-25 18:25:02.000000000 +0200
+++ mozilla/modules/libreg/src/reg.c	2007-09-25 18:27:46.000000000 +0200
@@ -96,7 +96,8 @@
 #define MAX_PATH PATH_MAX
 #elif defined(XP_UNIX)
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #elif defined(XP_OS2)
 #ifndef MAX_PATH
diff -up mozilla/directory/c-sdk/config/pathsub.h.old mozilla/directory/c-sdk/config/pathsub.h
--- mozilla/directory/c-sdk/config/pathsub.h.old	2006-02-03 15:41:18.000000000 +0100
+++ mozilla/directory/c-sdk/config/pathsub.h	2007-09-25 18:48:58.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h
--- mozilla/config/pathsub.h.old	2004-04-18 16:17:25.000000000 +0200
+++ mozilla/config/pathsub.h	2007-09-25 18:48:13.000000000 +0200
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp
--- mozilla/modules/libjar/nsZipArchive.cpp.old	2006-09-13 20:32:37.000000000 +0200
+++ mozilla/modules/libjar/nsZipArchive.cpp	2007-09-25 18:51:00.000000000 +0200
@@ -121,7 +121,7 @@ char * strdup(const char *src)
 #    define S_IFLNK  0120000
 #  endif
 #  ifndef PATH_MAX
-#    define PATH_MAX 1024
+#    include <limits.h>
 #  endif
 #endif  /* XP_UNIX */
 
diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h
--- mozilla/nsprpub/config/pathsub.h.old	2004-04-25 17:00:34.000000000 +0200
+++ mozilla/nsprpub/config/pathsub.h	2007-09-25 18:57:51.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/gfx/src/gtk/nsPrintdGTK.h.old mozilla/gfx/src/gtk/nsPrintdGTK.h
--- mozilla/gfx/src/gtk/nsPrintdGTK.h.old	2004-04-17 23:52:29.000000000 +0200
+++ mozilla/gfx/src/gtk/nsPrintdGTK.h	2007-09-25 18:56:48.000000000 +0200
@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C
 #ifdef _POSIX_PATH_MAX
 #define PATH_MAX	_POSIX_PATH_MAX
 #else
-#define PATH_MAX	256
+#error "PATH_MAX is not defined!"
 #endif
 #endif
 
diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h
--- mozilla/security/coreconf/nsinstall/pathsub.h.old	2004-04-25 17:02:18.000000000 +0200
+++ mozilla/security/coreconf/nsinstall/pathsub.h	2007-09-25 19:00:35.000000000 +0200
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- firefox.spec	25 Sep 2007 04:49:20 -0000	1.199
+++ firefox.spec	25 Sep 2007 18:00:36 -0000	1.200
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -66,6 +66,7 @@
 Patch105:       firefox-2.0-dnd.patch
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch110:       firefox-2.0-startup-notify.patch
+Patch111:       firefox-path.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -163,6 +164,7 @@
 %patch105 -p0 -b .dnd
 %patch106 -p1 -b .indicator-crash
 %patch110 -p0 -b .startup-notify
+%patch111 -p1 -b .path
 
 # For branding specific patches.
 
@@ -429,6 +431,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
+- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
+
 * Mon Sep 24 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-9
 - Startup notification support
 



From fedora-extras-commits at redhat.com  Tue Sep 25 18:05:12 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:05:12 -0400
Subject: rpms/python-fedora/devel .cvsignore, 1.2, 1.3 python-fedora.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200709251805.l8PI5CmX010126@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10093

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Sep 2007 15:56:41 -0000	1.2
+++ .cvsignore	25 Sep 2007 18:04:40 -0000	1.3
@@ -1 +1 @@
-python-fedora-0.2.90.18.tar.gz
+python-fedora-0.2.90.19.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-fedora.spec	25 Sep 2007 15:56:41 -0000	1.1
+++ python-fedora.spec	25 Sep 2007 18:04:40 -0000	1.2
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-fedora
-Version:        0.2.90.18
-Release:        3%{?dist}
+Version:        0.2.90.19
+Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -72,6 +72,9 @@
 %{python_sitelib}/fedora/tg/visit/
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2007 15:56:41 -0000	1.2
+++ sources	25 Sep 2007 18:04:40 -0000	1.3
@@ -1 +1 @@
-b0021a9eff35c4dd6c87f1da8e364ca0  python-fedora-0.2.90.18.tar.gz
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch (Fedora, 7) updated by kevin
Message-ID: <200709251812.l8PIC6iv018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for whowatch
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on whowatch (Fedora 7)
Kevin Fenzi (kevin) changed owner of whowatch in Fedora 7 to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on whowatch (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch (Fedora, devel) updated by kevin
Message-ID: <200709251812.l8PIC6j0018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) changed owner of whowatch in Fedora devel to subhodip
Kevin Fenzi (kevin) Approved cvsextras for commit access on whowatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:12:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:12:01 -0700
Subject: [pkgdb] whowatch summary updated by kevin
Message-ID: <200709251812.l8PIC6is018771@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) set package whowatch summary to Display information about users currently logged on users

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/whowatch



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:03 -0700
Subject: [pkgdb] jisksp16-1990-fonts was added for tagoh
Message-ID: <200709251815.l8PIF8U2018893@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package jisksp16-1990-fonts with summary 16x16 JIS X 0212:1990 Bitmap font
Kevin Fenzi (kevin) has approved Package jisksp16-1990-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for jisksp16-1990-fonts with an owner of tagoh
Kevin Fenzi (kevin) has approved jisksp16-1990-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package jisksp16-1990-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on jisksp16-1990-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jisksp16-1990-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:04 -0700
Subject: [pkgdb] jisksp16-1990-fonts (Fedora, devel) updated by kevin
Message-ID: <200709251815.l8PIF8U5018893@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on jisksp16-1990-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jisksp16-1990-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:18 -0400
Subject: rpms/jisksp16-1990-fonts - New directory
Message-ID: <200709251815.l8PIFIUR010659@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts

Log Message:
Directory /cvs/extras/rpms/jisksp16-1990-fonts added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:26 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:26 -0400
Subject: rpms/jisksp16-1990-fonts/devel - New directory
Message-ID: <200709251815.l8PIFQhX010678@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts/devel

Log Message:
Directory /cvs/extras/rpms/jisksp16-1990-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:27 -0700
Subject: [pkgdb] libvirt: berrange has requested watchbugzilla
Message-ID: <200709251815.l8PIF8U7018893@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:28 -0400
Subject: rpms/jisksp16-1990-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251815.l8PIFSfp010708@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module jisksp16-1990-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module jisksp16-1990-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:15:30 -0400
Subject: rpms/jisksp16-1990-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709251815.l8PIFUdY010724@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10628/rpms/jisksp16-1990-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jisksp16-1990-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jisksp16-1990-fonts
# $Id: Makefile,v 1.1 2007/09/25 18:15:28 kevin Exp $
NAME := jisksp16-1990-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 fedora-extras-commits at redhat.com  Tue Sep 25 18:15:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:28 -0700
Subject: [pkgdb] libvirt: berrange has requested watchcommits
Message-ID: <200709251815.l8PIFXoY018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:39 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:39 -0700
Subject: [pkgdb] libvirt: berrange has requested watchcommits
Message-ID: <200709251815.l8PIFXob018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:40 -0700
Subject: [pkgdb] libvirt: berrange has requested commit
Message-ID: <200709251815.l8PIFXoe018998@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the commit acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:36 -0700
Subject: [pkgdb] libvirt: berrange has requested commit
Message-ID: <200709251815.l8PIFfsX019065@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the commit acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:15:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:15:38 -0700
Subject: [pkgdb] libvirt: berrange has requested watchbugzilla
Message-ID: <200709251815.l8PIFfsa019065@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:11 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 14:16:11 -0400
Subject: fedora-rpmdevtools configure.ac, 1.12, 1.13 rpmdevtools.spec, 1.42,
	1.43
Message-ID: <200709251816.l8PIGBl9010847@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10823

Modified Files:
	configure.ac rpmdevtools.spec 
Log Message:
6.2


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac	10 Aug 2007 19:03:46 -0000	1.12
+++ configure.ac	25 Sep 2007 18:16:08 -0000	1.13
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 6.1)
+AC_INIT(rpmdevtools, 6.2)
 AM_INIT_AUTOMAKE
 AC_PATH_PROG([HELP2MAN], [help2man], [/bin/false])
 AC_PATH_PROG([WGET], [wget], [/bin/false])


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rpmdevtools.spec	8 Sep 2007 09:44:35 -0000	1.42
+++ rpmdevtools.spec	25 Sep 2007 18:16:08 -0000	1.43
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -123,7 +123,7 @@
 
 
 %changelog
-* Sat Sep  8 2007 Ville Skytt?? <ville.skytta at iki.fi>
+* 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>



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:54 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:16:54 -0700
Subject: [pkgdb] knm_new-fonts was added for tagoh
Message-ID: <200709251816.l8PIGxan019247@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package knm_new-fonts with summary 12x12 JIS X 0208 Bitmap font
Kevin Fenzi (kevin) has approved Package knm_new-fonts
Kevin Fenzi (kevin) has added a Fedora devel branch for knm_new-fonts with an owner of tagoh
Kevin Fenzi (kevin) has approved knm_new-fonts in Fedora devel
Kevin Fenzi (kevin) has approved Package knm_new-fonts
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on knm_new-fonts (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on knm_new-fonts (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on knm_new-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knm_new-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:16:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:16:55 -0700
Subject: [pkgdb] knm_new-fonts (Fedora, devel) updated by kevin
Message-ID: <200709251817.l8PIH0Is019249@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on knm_new-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/knm_new-fonts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:09 -0400
Subject: rpms/knm_new-fonts - New directory
Message-ID: <200709251817.l8PIH9t4011017@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts

Log Message:
Directory /cvs/extras/rpms/knm_new-fonts added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:13 -0400
Subject: rpms/knm_new-fonts/devel - New directory
Message-ID: <200709251817.l8PIHD7A011026@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts/devel

Log Message:
Directory /cvs/extras/rpms/knm_new-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:16 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:16 -0400
Subject: rpms/knm_new-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251817.l8PIHGx9011056@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts

Added Files:
	Makefile import.log 
Log Message:
Setup of module knm_new-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module knm_new-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:17:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:17:18 -0400
Subject: rpms/knm_new-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709251817.l8PIHIdv011072@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10986/rpms/knm_new-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module knm_new-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: knm_new-fonts
# $Id: Makefile,v 1.1 2007/09/25 18:17:16 kevin Exp $
NAME := knm_new-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 fedora-extras-commits at redhat.com  Tue Sep 25 18:19:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 14:19:45 -0400
Subject: rpms/rpmdevtools/devel .cvsignore, 1.7, 1.8 rpmdevtools.spec, 1.7, 
	1.8 sources, 1.8, 1.9
Message-ID: <200709251819.l8PIJj0E011256@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11208

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Aug 2007 19:10:17 -0000	1.7
+++ .cvsignore	25 Sep 2007 18:19:13 -0000	1.8
@@ -1,2 +1,2 @@
 spectool-1.0.9.tar.bz2
-rpmdevtools-6.1.tar.bz2
+rpmdevtools-6.2.tar.bz2


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmdevtools.spec	10 Aug 2007 19:10:17 -0000	1.7
+++ rpmdevtools.spec	25 Sep 2007 18:19:13 -0000	1.8
@@ -3,7 +3,7 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -18,26 +18,38 @@
 BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
-Requires:       fakeroot
 # Minimal RPM build requirements
-Requires:       rpm-build >= 4.4.2.1
+Requires:       bash
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
+Requires:       diffutils
+Requires:       findutils
+Requires:       gawk
 Requires:       gcc
 Requires:       gcc-c++
-Requires:       redhat-rpm-config
+Requires:       grep
+Requires:       gzip
+Requires:       info
 Requires:       make
+Requires:       patch
+Requires:       redhat-release
+Requires:       redhat-rpm-config
+Requires:       rpm-build >= 4.4.2.1
+Requires:       sed
 Requires:       tar
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
 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
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -111,6 +123,15 @@
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Aug 2007 19:10:17 -0000	1.8
+++ sources	25 Sep 2007 18:19:13 -0000	1.9
@@ -1,2 +1,2 @@
 b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
-3d5e2747d1955bb902127b4d9ded30a0  rpmdevtools-6.1.tar.bz2
+89bc0d3b1012c9fc3bd8602ff15d033d  rpmdevtools-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 18:22:34 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Tue, 25 Sep 2007 14:22:34 -0400
Subject: rpms/virt-manager/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 virt-manager.spec, 1.26, 1.27
Message-ID: <200709251822.l8PIMYYd011439@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390

Modified Files:
	.cvsignore sources virt-manager.spec 
Log Message:
Updated to 0.5.1 release of virt-manager


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Aug 2007 21:31:59 -0000	1.15
+++ .cvsignore	25 Sep 2007 18:22:02 -0000	1.16
@@ -1,2 +1,3 @@
 *.src.rpm
-virt-manager-0.5.0.tar.gz
+.build*.log
+virt-manager-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Aug 2007 21:31:59 -0000	1.15
+++ sources	25 Sep 2007 18:22:02 -0000	1.16
@@ -1 +1 @@
-cef77479168eb34a13e1792e7cffda28  virt-manager-0.5.0.tar.gz
+e5022314bbe13881e2cc28d93f4994dd  virt-manager-0.5.1.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- virt-manager.spec	29 Aug 2007 21:31:59 -0000	1.26
+++ virt-manager.spec	25 Sep 2007 18:22:02 -0000	1.27
@@ -7,7 +7,7 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.5.0
+Version: 0.5.1
 Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
@@ -36,7 +36,7 @@
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen guests
-Requires: python-virtinst >= 0.103.0
+Requires: python-virtinst >= 0.300.1
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -158,6 +158,14 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Sep 25 2007 Daniel P. Berrange <berrange at redhat.com> - 0.5.1-1.fc8
+- Updated to 0.5.1 release
+- Open connections in background
+- Make VNC connection retries more robust
+- Allow changing of CDROM media on the fly
+- Add PXE boot installation of HVM guests
+- Allow tunnelling VNC over SSH
+
 * Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.5.0-1.fc8
 - Updated to 0.5.0 release
 - Support for managing remote hosts



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:30 -0700
Subject: [pkgdb] alex was added for bos
Message-ID: <200709251823.l8PINZPE019624@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package alex with summary A tool for generating lexical analysers in Haskell
Kevin Fenzi (kevin) has approved Package alex
Kevin Fenzi (kevin) has added a Fedora devel branch for alex with an owner of bos
Kevin Fenzi (kevin) has approved alex in Fedora devel
Kevin Fenzi (kevin) has approved Package alex
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alex (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alex (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:40 -0700
Subject: [pkgdb] alex (Fedora, devel) updated by kevin
Message-ID: <200709251823.l8PINjQ1019648@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved watchcommits on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved commit on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved build on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved approveacls on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) approved checkout on alex (Fedora devel) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on alex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:23:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 11:23:40 -0700
Subject: [pkgdb] alex (Fedora, 7) updated by kevin
Message-ID: <200709251823.l8PINjQ5019648@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for alex
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on alex (Fedora 7)
Kevin Fenzi (kevin) approved watchbugzilla on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved watchcommits on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved commit on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved build on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved approveacls on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) approved checkout on alex (Fedora 7) for petersen
Kevin Fenzi (kevin) Approved cvsextras for commit access on alex (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/alex



From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:13 -0400
Subject: rpms/alex - New directory
Message-ID: <200709251824.l8PIODOG011573@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex

Log Message:
Directory /cvs/extras/rpms/alex added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:18 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:18 -0400
Subject: rpms/alex/devel - New directory
Message-ID: <200709251824.l8PIOINQ011583@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex/devel

Log Message:
Directory /cvs/extras/rpms/alex/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:22 -0400
Subject: rpms/alex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709251824.l8PIOMMU011612@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex

Added Files:
	Makefile import.log 
Log Message:
Setup of module alex


--- NEW FILE Makefile ---
# Top level Makefile for module alex
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 18:24:24 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 14:24:24 -0400
Subject: rpms/alex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709251824.l8PIOOII011628@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB11544/rpms/alex/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alex


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alex
# $Id: Makefile,v 1.1 2007/09/25 18:24:22 kevin Exp $
NAME := alex
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 fedora-extras-commits at redhat.com  Tue Sep 25 18:27:16 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:16 -0400
Subject: rpms/python-fedora/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRGro011878@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/EL-5

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:44 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:44 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:27:19 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:19 -0400
Subject: rpms/python-fedora/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRJpP011882@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/F-7

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:47 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:47 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:27:22 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:27:22 -0400
Subject: rpms/python-fedora/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709251827.l8PIRMBj011886@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Sep 25 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2.90.19-1
- New upstream release with a FAS2 unicode fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:23:30 -0000	1.1
+++ .cvsignore	25 Sep 2007 18:26:49 -0000	1.2
@@ -0,0 +1 @@
+python-fedora-0.2.90.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:23:30 -0000	1.1
+++ sources	25 Sep 2007 18:26:49 -0000	1.2
@@ -0,0 +1 @@
+f6e8e786d08876c8833f44444a74af02  python-fedora-0.2.90.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:10 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:10 -0400
Subject: rpms/python-fedora/EL-5 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUAcp012031@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/EL-5

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:13 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:13 -0400
Subject: rpms/python-fedora/F-7 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUD6v012047@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/F-7

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:15 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 25 Sep 2007 14:30:15 -0400
Subject: rpms/python-fedora/FC-6 python-fedora.spec,NONE,1.1
Message-ID: <200709251830.l8PIUFr4012063@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12013/FC-6

Added Files:
	python-fedora.spec 
Log Message:
* And cvs add the spec file for the new branches.



--- NEW FILE python-fedora.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-fedora
Version:        0.2.90.19
Release:        1%{?dist}
Summary:        Python modules for talking to Fedora Infrastructure Services

Group:          Development/Languages
License:        GPLv2
URL:            http://hosted.fedoraproject.org/projects/python-fedora/
Source0:        http://toshio.fedorapeople.org/fedora/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
%if 0%{?fedora} >= 8
BuildRequires:  python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
Requires: python-simplejson

%description
Python modules that handle communication with Fedora Infrastructure services.
This set of modules helps with building clients that talk to Fedora
Infrastructure's  TurboGears based services such as Bodhi, PackageDB,
MirrorManager, and FAS2.

%package infrastructure
Summary: Python modules for building Fedora Infrastructure Services
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: python-psycopg2
Requires: python-sqlalchemy

%description infrastructure
Additional python modules that can be used on Fedora Infrastructure Servers to
help build new services.  This includes the server's authentication providers.

%prep
%setup -q


%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 README COPYING AUTHORS ChangeLog
%dir %{python_sitelib}/fedora
%dir %{python_sitelib}/fedora/tg
%{python_sitelib}/fedora/__init__.py*
%{python_sitelib}/fedora/tg/__init__.py*
%{python_sitelib}/fedora/tg/client.py*
%{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info

%files infrastructure
%defattr(-,root,root,-)
%{python_sitelib}/fedora/accounts/
%{python_sitelib}/fedora/tg/identity/
%{python_sitelib}/fedora/tg/visit/

%changelog
* 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.

* Tue Apr 3 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.5-1
- Update to latest fasLDAP.py.
- Return bugzilla email address.
- Add a method to lookup by email address.  This includes bugzilla email
  addresses given in owners.list.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.4-1
- Fix a bug with get_group_info().
- Fix a bug in exception handling in the turbogears identity handler.

* Wed Mar 14 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.3-1
- Fix a bug in exception handling.
- Fix a bug where we were not seeing updates to the FAS.
  + In order to do this efficiently we also introduce a dependency on
    sqlalchemy (for database connection pooling).

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.90.2-1
- Experimental fas2 support.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2.1-1
- Fix a brown paper bag issue.

* Fri Feb 9 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.2-1
- Bug fix for tg sessions.

* Thu Jan 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-1
- Initial RPM Package.



From fedora-extras-commits at redhat.com  Tue Sep 25 18:30:47 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 14:30:47 -0400
Subject: comps comps-f8.xml.in,1.124,1.125
Message-ID: <200709251830.l8PIUlpE012128@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Modified Files:
	comps-f8.xml.in 
Log Message:
don't install xen by default with the virt group



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- comps-f8.xml.in	25 Sep 2007 17:09:40 -0000	1.124
+++ comps-f8.xml.in	25 Sep 2007 18:30:17 -0000	1.125
@@ -3801,11 +3801,11 @@
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
       <packagereq type="default">gnome-applet-vm</packagereq>
-      <packagereq type="default">kernel-xen</packagereq>
+      <packagereq type="optional">kernel-xen</packagereq>
       <packagereq type="default">kvm</packagereq>
       <packagereq type="default">qemu</packagereq>
       <packagereq type="default">virt-manager</packagereq>
-      <packagereq type="default">xen</packagereq>
+      <packagereq type="optional">xen</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Tue Sep 25 18:35:35 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 14:35:35 -0400
Subject: comps comps-f8.xml.in,1.125,1.126
Message-ID: <200709251835.l8PIZZls012287@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245

Modified Files:
	comps-f8.xml.in 
Log Message:
gnome-applet-vm links against xen stuff directly



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- comps-f8.xml.in	25 Sep 2007 18:30:17 -0000	1.125
+++ comps-f8.xml.in	25 Sep 2007 18:35:05 -0000	1.126
@@ -3800,7 +3800,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
-      <packagereq type="default">gnome-applet-vm</packagereq>
+      <packagereq type="optional">gnome-applet-vm</packagereq>
       <packagereq type="optional">kernel-xen</packagereq>
       <packagereq type="default">kvm</packagereq>
       <packagereq type="default">qemu</packagereq>



From fedora-extras-commits at redhat.com  Tue Sep 25 19:09:12 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 25 Sep 2007 15:09:12 -0400
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.36,1.37
Message-ID: <200709251909.l8PJ9CWP019351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19274

Modified Files:
	em8300-kmod.spec 
Log Message:
* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.23-0.202.rc8.fc8.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- em8300-kmod.spec	19 Sep 2007 18:30:19 -0000	1.36
+++ em8300-kmod.spec	25 Sep 2007 19:08:39 -0000	1.37
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.187.rc6.git7.fc8}
+%{!?kversion: %define kversion 2.6.23-0.202.rc8.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.23-0.202.rc8.fc8.
+
 * Wed Sep 19 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23-0.187.rc6.git7.fc8.
 



From fedora-extras-commits at redhat.com  Tue Sep 25 19:38:04 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 25 Sep 2007 15:38:04 -0400
Subject: rpms/mash/devel .cvsignore, 1.19, 1.20 mash.spec, 1.17, 1.18 sources,
	1.20, 1.21
Message-ID: <200709251938.l8PJc49n020290@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20204

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
update to 0.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Sep 2007 19:39:08 -0000	1.19
+++ .cvsignore	25 Sep 2007 19:37:31 -0000	1.20
@@ -1 +1 @@
-mash-0.2.7.tar.gz
+mash-0.2.8.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mash.spec	21 Sep 2007 19:39:08 -0000	1.17
+++ mash.spec	25 Sep 2007 19:37:31 -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:           mash
-Version:        0.2.7
+Version:        0.2.8
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 %{_datadir}/mash
 
 %changelog
+* Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> 0.2.8-1
+- libflashsupport (#305541)
+
 * Fri Sep 21 2007 Bill Nottingham <notting at redhat.com> 0.2.7-1
 - disable repoview for now
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Sep 2007 19:39:08 -0000	1.20
+++ sources	25 Sep 2007 19:37:31 -0000	1.21
@@ -1 +1 @@
-7b8640077626921acb95603f9a6a5f68  mash-0.2.7.tar.gz
+263c51784c93d9d47060c577a3f1c23f  mash-0.2.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 19:42:05 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 15:42:05 -0400
Subject: rpms/NetworkManager/devel nm-applet-0.7.0-disable-stuff.patch, NONE,
	1.1 .cvsignore, 1.48, 1.49 NetworkManager.spec, 1.170,
	1.171 sources, 1.67,
	1.68 nm-applet-0.7.0-no-connection-editor.patch, 1.1, NONE
Message-ID: <200709251942.l8PJg5s5020606@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20572

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	nm-applet-0.7.0-disable-stuff.patch 
Removed Files:
	nm-applet-0.7.0-no-connection-editor.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
- New snapshot
	- Make wired device carrier state work in the applet
	- Fix handling of errors with unencrypted APs
	- Fix "frozen" applet icon by reporting NM state better
	- Fix output of AP frequency in nm-tool



nm-applet-0.7.0-disable-stuff.patch:

--- NEW FILE nm-applet-0.7.0-disable-stuff.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor	2007-09-25 13:01:18.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 14:43:31.000000000 -0400
@@ -1146,6 +1146,7 @@ static void nma_menu_add_custom_essid_it
 	label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network..."));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_container_add (GTK_CONTAINER (menu_item), label);
+	gtk_widget_set_sensitive (menu_item, FALSE);
 	gtk_widget_show_all (menu_item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	g_signal_connect (menu_item, "activate", G_CALLBACK (custom_essid_item_selected), applet);
@@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid
 	label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network..."));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_container_add (GTK_CONTAINER (menu_item), label);
+	gtk_widget_set_sensitive (menu_item, FALSE);
 	gtk_widget_show_all (menu_item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	g_signal_connect (menu_item, "activate", G_CALLBACK (new_network_item_selected), applet);
@@ -1781,6 +1783,7 @@ static GtkWidget *nma_context_menu_creat
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
 	gtk_menu_shell_append (menu, applet->info_menu_item);
 
+#if 0
 	/* 'Edit Connections...' item */
 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
 	g_signal_connect (applet->connections_menu_item,
@@ -1788,6 +1791,7 @@ static GtkWidget *nma_context_menu_creat
 				   G_CALLBACK (nma_edit_connections_cb),
 				   applet);
 	gtk_menu_shell_append (menu, applet->connections_menu_item);
+#endif
 
 	/* Separator */
 	nma_menu_add_separator_item (menu);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	25 Sep 2007 09:52:27 -0000	1.48
+++ .cvsignore	25 Sep 2007 19:41:28 -0000	1.49
@@ -11,3 +11,6 @@
 nm-applet-0.7.0.svn191.tar.gz
 NetworkManager-0.7.0.svn2880.tar.gz
 nm-applet-0.7.0.svn199.tar.gz
+NetworkManager-0.7.0.svn2884.tar.gz
+nm-applet-0.7.0.svn200.tar.gz
+NetworkManager-0.7.0.svn2886.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- NetworkManager.spec	25 Sep 2007 09:52:27 -0000	1.170
+++ NetworkManager.spec	25 Sep 2007 19:41:28 -0000	1.171
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2880
+%define snapshot svn2886
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,9 +18,9 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn199.tar.gz
+Source1: nm-applet-%{version}.svn200.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: nm-applet-0.7.0-no-connection-editor.patch
+Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -123,7 +123,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch2 -p1 -b .no-connection-editor
+%patch2 -p1 -b .disable-stuff
 
 %build
 # Even though we don't require named, we still build with it
@@ -259,6 +259,13 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
+- New snapshot
+	- Make wired device carrier state work in the applet
+	- Fix handling of errors with unencrypted APs
+	- Fix "frozen" applet icon by reporting NM state better
+	- Fix output of AP frequency in nm-tool
+
 * Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2880
 - New snapshot
 	- Fix applet icon sizing on start (mclasen)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	25 Sep 2007 09:52:27 -0000	1.67
+++ sources	25 Sep 2007 19:41:28 -0000	1.68
@@ -1,2 +1,2 @@
-25115a3500c97b6ee308852d350760ef  NetworkManager-0.7.0.svn2880.tar.gz
-ec90ed799aa6c9c1c5378f8ab31c6f5c  nm-applet-0.7.0.svn199.tar.gz
+8edfd5854389ea6a6b4eb1f507b46c38  nm-applet-0.7.0.svn200.tar.gz
+fe78cab7288beef5e69dcf897a76d16b  NetworkManager-0.7.0.svn2886.tar.gz


--- nm-applet-0.7.0-no-connection-editor.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 19:51:37 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 15:51:37 -0400
Subject: rpms/kernel/devel linux-2.6-x86-disable-local-apic-amd-c1e.patch,
	NONE, 1.1 kernel.spec, 1.185, 1.186
Message-ID: <200709251951.l8PJpbQB020899@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20849

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
- x86-64: Disable local APIC timer use on AMD systems with C1E.


linux-2.6-x86-disable-local-apic-amd-c1e.patch:

--- NEW FILE linux-2.6-x86-disable-local-apic-amd-c1e.patch ---
>From davej  Tue Sep 25 15:44:00 2007
Return-Path: <tglx at linutronix.de>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,
	UNPARSEABLE_RELAY autolearn=ham version=3.2.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
	for <davej at localhost> (single-drop); Tue, 25 Sep 2007 15:44:00 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
	 Tue, 25 Sep 2007 15:37:08 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb8qa020820
	for <davej at pobox.devel.redhat.com>; Tue, 25 Sep 2007 15:37:08 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb7X2009192;
	Tue, 25 Sep 2007 15:37:07 -0400
Received: from mail.tglx.de (www.osadl.org [213.239.205.134])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id l8PJb5GW020058;
	Tue, 25 Sep 2007 15:37:06 -0400
Received: from [127.0.0.1] (debian [213.239.205.147])
	by mail.tglx.de (Postfix) with ESMTP id 32A6265C003;
	Tue, 25 Sep 2007 21:37:04 +0200 (CEST)
Subject: [PATCH] x86-64: Disable local APIC timer use on AMD systems with
	C1E
From: Thomas Gleixner <tglx at linutronix.de>
To: LKML <linux-kernel at vger.kernel.org>
Cc: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>,
        Andi Kleen <ak at suse.de>, Chuck Ebbert <cebbert at redhat.com>,
        Dave Jones <davej at redhat.com>, Ingo Molnar <mingo at elte.hu>,
        "Rafael J. Wysocki" <rjw at sisk.pl>, Len Brown <lenb at kernel.org>,
        "Langsdorf, Mark" <mark.langsdorf at amd.com>
Content-Type: text/plain
Date: Tue, 25 Sep 2007 21:37:01 +0200
Message-Id: <1190749021.17409.35.camel at chaos>
Mime-Version: 1.0
X-Mailer: Evolution 2.12.0 (2.12.0-3.fc8) 
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-Scanned-By: MIMEDefang 2.58 on 172.16.48.32
Status: RO
Content-Length: 2997
Lines: 96

commit 3556ddfa9284a86a59a9b78fe5894430f6ab4eef titled

 [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E

solves a problem with AMD dual core laptops e.g. HP nx6325 (Turion 64
X2) with C1E enabled:

When both cores go into idle at the same time, then the system switches
into C1E state, which is basically the same as C3. This stops the local
apic timer.

This was debugged right after the dyntick merge on i386 and despite the
patch title it fixes only the 32 bit path.

x86_64 is still missing this fix. It seems that mainline is not really
affected by this issue, as the PIT is running and keeps jiffies
incrementing, but that's just waiting for trouble. 

-mm suffers from this problem due to the x86_64 high resolution timer
patches.

This is a quick and dirty port of the i386 code to x86_64. 

I spent quite a time with Rafael to debug the -mm / hrt wreckage until
someone pointed us to this. I really had forgotten that we debugged this
half a year ago already. 

Sigh, is it just me or is there something yelling arch/x86 into my ear?

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index af838f6..32054bf 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define ENABLE_C1E_MASK		0x18000000
+#define CPUID_PROCESSOR_SIGNATURE	1
+#define CPUID_XFAM		0x0ff00000
+#define CPUID_XFAM_K8		0x00000000
+#define CPUID_XFAM_10H		0x00100000
+#define CPUID_XFAM_11H		0x00200000
+#define CPUID_XMOD		0x000f0000
+#define CPUID_XMOD_REV_F	0x00040000
+
+/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
+static __cpuinit int amd_apic_timer_broken(void)
+{
+	u32 lo, hi;
+	u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
+	switch (eax & CPUID_XFAM) {
+	case CPUID_XFAM_K8:
+		if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
+			break;
+	case CPUID_XFAM_10H:
+	case CPUID_XFAM_11H:
+		rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
+		if (lo & ENABLE_C1E_MASK)
+			return 1;
+		break;
+	default:
+		/* err on the side of caution */
+		return 1;
+	}
+	return 0;
+}
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
 	unsigned level;
@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 	/* Family 10 doesn't support C states in MWAIT so don't use it */
 	if (c->x86 == 0x10 && !force_mwait)
 		clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
+
+	if (amd_apic_timer_broken())
+		disable_apic_timer = 1;
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
--- linux-2.6.22.noarch/include/asm-x86_64/apic.h~	2007-09-25 15:47:01.000000000 -0400
+++ linux-2.6.22.noarch/include/asm-x86_64/apic.h	2007-09-25 15:47:23.000000000 -0400
@@ -19,6 +19,7 @@
 extern int apic_verbosity;
 extern int apic_runs_main_timer;
 extern int ioapic_force;
+extern int disable_apic_timer;
 
 /*
  * Define the default level of output to be very little


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- kernel.spec	25 Sep 2007 01:28:29 -0000	1.185
+++ kernel.spec	25 Sep 2007 19:51:00 -0000	1.186
@@ -555,7 +555,8 @@
 
 %if !%{nopatches}
 
-Patch20: linux-2.6-highres-timers.patch
+Patch19: linux-2.6-highres-timers.patch
+Patch20: linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -968,6 +969,7 @@
 
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
+ApplyPatch linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -1809,6 +1811,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
+- x86-64: Disable local APIC timer use on AMD systems with C1E.
+
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-rc8
 



From fedora-extras-commits at redhat.com  Tue Sep 25 19:53:21 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 15:53:21 -0400
Subject: rpms/firefox/devel firefox-1.0-imgloader-comarray.patch, 1.1,
	NONE firefox-1.0-locales-no-searchplugins.patch, 1.1,
	NONE firefox-1.0-nspr-config.patch, 1.1,
	NONE firefox-1.0-nspr-s390.patch, 1.1,
	NONE firefox-1.0-nss-system-nspr.patch, 1.1,
	NONE firefox-1.0-use-system-colors.patch, 1.1,
	NONE firefox-1.0-xptcall-s390.patch, 1.1,
	NONE firefox-1.1-ppc64.patch, 1.1,
	NONE firefox-1.5-thread-cleanup.patch, 1.1,
	NONE mozilla-1.7.3-xptcall-s390.patch, 1.1, NONE
Message-ID: <200709251953.l8PJrL9V023132@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23122

Removed Files:
	firefox-1.0-imgloader-comarray.patch 
	firefox-1.0-locales-no-searchplugins.patch 
	firefox-1.0-nspr-config.patch firefox-1.0-nspr-s390.patch 
	firefox-1.0-nss-system-nspr.patch 
	firefox-1.0-use-system-colors.patch 
	firefox-1.0-xptcall-s390.patch firefox-1.1-ppc64.patch 
	firefox-1.5-thread-cleanup.patch 
	mozilla-1.7.3-xptcall-s390.patch 
Log Message:
Killing some more dead patches



--- firefox-1.0-imgloader-comarray.patch DELETED ---


--- firefox-1.0-locales-no-searchplugins.patch DELETED ---


--- firefox-1.0-nspr-config.patch DELETED ---


--- firefox-1.0-nspr-s390.patch DELETED ---


--- firefox-1.0-nss-system-nspr.patch DELETED ---


--- firefox-1.0-use-system-colors.patch DELETED ---


--- firefox-1.0-xptcall-s390.patch DELETED ---


--- firefox-1.1-ppc64.patch DELETED ---


--- firefox-1.5-thread-cleanup.patch DELETED ---


--- mozilla-1.7.3-xptcall-s390.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 19:55:31 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Tue, 25 Sep 2007 15:55:31 -0400
Subject: rpms/sugar/OLPC-2 sources,1.61,1.62 sugar.spec,1.72,1.73
Message-ID: <200709251955.l8PJtVII023260@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23199

Modified Files:
	sources sugar.spec 
Log Message:
* Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	24 Sep 2007 20:29:28 -0000	1.61
+++ sources	25 Sep 2007 19:54:59 -0000	1.62
@@ -1 +1 @@
-a6fcc8a52918b882cd499d94e9521e39  sugar-0.65-git5a595ea04e.tar.bz2
+338ebbbda341a2bddb416e60c5b9a5b5  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sugar.spec	24 Sep 2007 20:29:28 -0000	1.72
+++ sugar.spec	25 Sep 2007 19:54:59 -0000	1.73
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070924git
+%define alphatag 20070925git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.57.%{alphatag}5a595ea04e
+Release: 0.58.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
+- New snapshot
+
 * Mon Sep 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.57.20070924git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Tue Sep 25 20:14:24 2007
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 25 Sep 2007 16:14:24 -0400
Subject: rpms/thunderbird/devel thunderbird-path.patch, NONE,
	1.1 thunderbird.spec, 1.104, 1.105
Message-ID: <200709252014.l8PKEOWf029811@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-path.patch 
Log Message:
* Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros


thunderbird-path.patch:

--- NEW FILE thunderbird-path.patch ---
--- mozilla/toolkit/xre/nsAppRunner.h.old	2007-09-25 18:01:56.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.h	2007-09-25 18:02:23.000000000 +0200
@@ -48,7 +48,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old	2007-09-25 18:00:26.000000000 +0200
+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp	2007-09-25 18:00:53.000000000 +0200
@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv);
 # elif defined(CCHMAXPATH)
 #  define MAXPATHLEN CCHMAXPATH
 # else
-#  define MAXPATHLEN 1024
+#  include <limits.h>
+#  define MAXPATHLEN PATH_MAX
 # endif
 #endif
 
diff -up mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp
--- mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp.old	2007-09-25 17:58:43.000000000 +0200
+++ mozilla/mailnews/import/comm4x/src/nsComm4xProfile.cpp	2007-09-25 17:59:22.000000000 +0200
@@ -70,7 +70,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old	2007-09-25 18:04:25.000000000 +0200
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp	2007-09-25 18:04:48.000000000 +0200
@@ -109,7 +109,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old	2006-11-28 01:18:37.000000000 +0100
+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp	2007-09-25 18:05:49.000000000 +0200
@@ -79,7 +79,8 @@
 #endif
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN	PATH_MAX  /* Guessing this is okay.  Works for SCO. */
 #endif
  
 #if defined(__QNX__)
diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h
--- mozilla/xpcom/build/nsXPCOMPrivate.h.old	2007-09-25 18:02:58.000000000 +0200
+++ mozilla/xpcom/build/nsXPCOMPrivate.h	2007-09-25 18:03:15.000000000 +0200
@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h
--- mozilla/dbm/include/mcom_db.h.old	2007-09-25 17:57:09.000000000 +0200
+++ mozilla/dbm/include/mcom_db.h	2007-09-25 17:57:49.000000000 +0200
@@ -214,7 +214,8 @@
 #endif  /* __DBINTERFACE_PRIVATE */
 
 #ifdef SCO
-#define MAXPATHLEN 	1024              
+#include <limits.h>
+#define MAXPATHLEN 	PATH_MAX     
 #endif
 
 #include <fcntl.h>
diff -up mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old mozilla/mail/components/migration/src/nsProfileMigrator.cpp
--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp.old	2007-09-25 17:55:11.000000000 +0200
+++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp	2007-09-25 18:07:56.000000000 +0200
@@ -73,7 +73,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -up mozilla/nsprpub/config/nsinstall.c.old mozilla/nsprpub/config/nsinstall.c
diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c
--- mozilla/js/src/jsfile.c.old	2006-07-26 20:55:08.000000000 +0200
+++ mozilla/js/src/jsfile.c	2007-09-25 18:22:52.000000000 +0200
@@ -105,7 +105,8 @@
 #define utfstring               "binary"
 #define unicodestring           "unicode"
 
-#define MAX_PATH_LENGTH         1024
+#include <limits.h>
+#define MAX_PATH_LENGTH         PATH_MAX
 #define MODE_SIZE               256
 #define NUMBER_SIZE             32
 #define MAX_LINE_LENGTH         256
diff -up mozilla/webshell/tests/viewer/nsViewerApp.cpp.old mozilla/webshell/tests/viewer/nsViewerApp.cpp
--- mozilla/webshell/tests/viewer/nsViewerApp.cpp.old	2007-09-25 18:34:51.000000000 +0200
+++ mozilla/webshell/tests/viewer/nsViewerApp.cpp	2007-09-25 18:35:33.000000000 +0200
@@ -692,7 +692,8 @@ nsViewerApp::OpenWindow(PRUint32 aNewChr
 
 #if !defined(XP_WIN) && !defined(XP_OS2)
 #ifndef XP_MAC
-#define _MAX_PATH 512
+#include <limits.h>
+#define _MAX_PATH PATH_MAX
 #endif
 #endif
 
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old	2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c	2007-09-25 18:39:17.000000000 +0200
@@ -44,6 +44,7 @@
 #include "xpidl.h"
 #include <ctype.h>
 #include <glib.h>
+#include <limits.h>
 
 #ifdef XP_WIN
 #include <windef.h>
diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old	2007-09-25 18:14:08.000000000 +0200
+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp	2007-09-25 18:36:55.000000000 +0200
@@ -76,7 +76,8 @@
 #endif
     
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 
 #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0]))
diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c
--- mozilla/modules/libreg/src/reg.c.old	2007-09-25 18:25:02.000000000 +0200
+++ mozilla/modules/libreg/src/reg.c	2007-09-25 18:27:46.000000000 +0200
@@ -96,7 +96,8 @@
 #define MAX_PATH PATH_MAX
 #elif defined(XP_UNIX)
 #ifndef MAX_PATH
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #elif defined(XP_OS2)
 #ifndef MAX_PATH
diff -up mozilla/directory/c-sdk/config/pathsub.h.old mozilla/directory/c-sdk/config/pathsub.h
--- mozilla/directory/c-sdk/config/pathsub.h.old	2006-02-03 15:41:18.000000000 +0100
+++ mozilla/directory/c-sdk/config/pathsub.h	2007-09-25 18:48:58.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h
--- mozilla/config/pathsub.h.old	2004-04-18 16:17:25.000000000 +0200
+++ mozilla/config/pathsub.h	2007-09-25 18:48:13.000000000 +0200
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp
--- mozilla/modules/libjar/nsZipArchive.cpp.old	2006-09-13 20:32:37.000000000 +0200
+++ mozilla/modules/libjar/nsZipArchive.cpp	2007-09-25 18:51:00.000000000 +0200
@@ -121,7 +121,7 @@ char * strdup(const char *src)
 #    define S_IFLNK  0120000
 #  endif
 #  ifndef PATH_MAX
-#    define PATH_MAX 1024
+#    include <limits.h>
 #  endif
 #endif  /* XP_UNIX */
 
diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h
--- mozilla/nsprpub/config/pathsub.h.old	2004-04-25 17:00:34.000000000 +0200
+++ mozilla/nsprpub/config/pathsub.h	2007-09-25 18:57:51.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -up mozilla/gfx/src/gtk/nsPrintdGTK.h.old mozilla/gfx/src/gtk/nsPrintdGTK.h
--- mozilla/gfx/src/gtk/nsPrintdGTK.h.old	2004-04-17 23:52:29.000000000 +0200
+++ mozilla/gfx/src/gtk/nsPrintdGTK.h	2007-09-25 18:56:48.000000000 +0200
@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C
 #ifdef _POSIX_PATH_MAX
 #define PATH_MAX	_POSIX_PATH_MAX
 #else
-#define PATH_MAX	256
+#error "PATH_MAX is not defined!"
 #endif
 #endif
 
diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h
--- mozilla/security/coreconf/nsinstall/pathsub.h.old	2004-04-25 17:02:18.000000000 +0200
+++ mozilla/security/coreconf/nsinstall/pathsub.h	2007-09-25 19:00:35.000000000 +0200
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- thunderbird.spec	11 Sep 2007 18:58:30 -0000	1.104
+++ thunderbird.spec	25 Sep 2007 20:13:47 -0000	1.105
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -63,6 +63,7 @@
 Patch103:       thunderbird-1.5-profile-migrator.patch
 Patch104:       firefox-1.5-dnd-nograb.patch
 Patch106:       firefox-2.0-indicator-crash.patch
+Patch111:       thunderbird-path.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -145,6 +146,7 @@
 %patch103 -p1 -b .profile-migrator
 #%patch104 -p1 -b .dnd-nograb
 %patch106 -p1 -b .indicator-crash
+%patch111 -p1 -b .path
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -316,6 +318,9 @@
 #===============================================================================
 
 %changelog
+* Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
+- Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
+
 * Tue Sep 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-4
 - Fix crashes when using GTK+ themes containing a gtkrc which specify 
   GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing



From fedora-extras-commits at redhat.com  Tue Sep 25 20:16:17 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 16:16:17 -0400
Subject: rpms/pam/devel .cvsignore, 1.44, 1.45 pam.spec, 1.159, 1.160 sources,
	1.46, 1.47
Message-ID: <200709252016.l8PKGHe8029945@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920

Modified Files:
	.cvsignore pam.spec sources 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-10
- update db4 to 4.6.19 (#274661)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Aug 2007 12:31:50 -0000	1.44
+++ .cvsignore	25 Sep 2007 20:15:45 -0000	1.45
@@ -2,4 +2,4 @@
 *.tar.bz2
 pam-redhat-0.99.8-1.tar.bz2
 Linux-PAM-0.99.8.1.tar.bz2
-db-4.6.18.tar.gz
+db-4.6.19.tar.gz


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- pam.spec	21 Sep 2007 14:08:14 -0000	1.159
+++ pam.spec	25 Sep 2007 20:15:45 -0000	1.160
@@ -4,14 +4,14 @@
 %define _sysconfdir /etc
 
 %define pwdb_version 0.62
-%define db_version 4.6.18
+%define db_version 4.6.19
 %define db_conflicting_version 4.7.0
 %define pam_redhat_version 0.99.8-1
 
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.8.1
-Release: 9%{?dist}
+Release: 10%{?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
@@ -405,6 +405,9 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-10
+- update db4 to 4.6.19 (#274661)
+
 * Fri Sep 21 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-9
 - do not preserve contexts when copying skel and other namespace.init
   fixes (#298941)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	6 Aug 2007 12:31:50 -0000	1.46
+++ sources	25 Sep 2007 20:15:45 -0000	1.47
@@ -1,3 +1,3 @@
 2a23dc703b550223206021ff03b1e434  pam-redhat-0.99.8-1.tar.bz2
 a6472db4afe13850cb401922211bba4e  Linux-PAM-0.99.8.1.tar.bz2
-95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+89c7390ff120d5ebf3eccc5f97249e79  db-4.6.19.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 20:27:01 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 16:27:01 -0400
Subject: rpms/pam/devel pam.spec,1.160,1.161
Message-ID: <200709252027.l8PKR15k032415@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32383

Modified Files:
	pam.spec 
Log Message:
- apply db4 patch correctly


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- pam.spec	25 Sep 2007 20:15:45 -0000	1.160
+++ pam.spec	25 Sep 2007 20:26:29 -0000	1.161
@@ -97,7 +97,9 @@
 cp %{SOURCE7} .
 
 %patch1 -p1 -b .redhat-modules
-%patch2 -p0 -b .db4-glibc
+pushd db-%{db_version}
+%patch2 -p1 -b .db4-glibc
+popd
 %patch4 -p1 -b .dbpam
 %patch5 -p1 -b .no-log
 %patch24 -p1 -b .update-helper



From fedora-extras-commits at redhat.com  Tue Sep 25 20:37:01 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Tue, 25 Sep 2007 16:37:01 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.7,1.8
Message-ID: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32683

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Fixed running of Xvfb so it does not terminate after a successful test.
- Fixed mauve and jtreg test runs to not break the build when an error is thrown





Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
+++ java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
@@ -300,16 +300,20 @@
   ./configure 
   make
   echo ====================MAUVE TESTING========================
-  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+  %{expand: 
+     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
+   } || :
   echo ====================MAUVE TESTING END====================
 popd
 pushd jtreg
   echo ====================JTREG TESTING========================
   Xvfb :1 &
   export DISPLAY=:1.0
-  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1
+  %{expand: 
+     ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
+	$(pwd)/../openjdk/j2se/test/ 2>&1 
+  } || :
   killall -9 Xvfb
   export DISPLAY=:0.0
   echo ====================JTREG TESTING END====================
@@ -745,6 +749,7 @@
 %changelog
 * Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
+- Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added JTreg zip as source



From fedora-extras-commits at redhat.com  Tue Sep 25 20:44:31 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 25 Sep 2007 16:44:31 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-0.5.7-always-scan.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.29, 1.30
Message-ID: <200709252044.l8PKiV17000676@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv655

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.5.7-always-scan.patch 
Log Message:
* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-9
- Always allow explicit wireless scans triggered from a control interface



wpa_supplicant-0.5.7-always-scan.patch:

--- NEW FILE wpa_supplicant-0.5.7-always-scan.patch ---
diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
--- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan	2007-09-25 15:51:35.000000000 -0400
+++ wpa_supplicant-0.5.7/wpa_supplicant.c	2007-09-25 16:31:27.000000000 -0400
@@ -972,7 +972,7 @@ static void wpa_supplicant_scan(void *el
 	struct wpa_ssid *ssid;
 	int enabled, scan_req = 0, ret;
 
-	if (wpa_s->disconnected)
+	if (wpa_s->disconnected && !wpa_s->scan_req)
 		return;
 
 	enabled = 0;


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wpa_supplicant.spec	21 Sep 2007 00:37:14 -0000	1.29
+++ wpa_supplicant.spec	25 Sep 2007 20:43:59 -0000	1.30
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch5: wpa_supplicant-0.5.7-qmake-location.patch
 Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch
 Patch7: wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch
+Patch8: wpa_supplicant-0.5.7-always-scan.patch
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +56,7 @@
 %patch5 -p1 -b .qmake-location
 %patch6 -p1 -b .flush-debug-output
 %patch7 -p1 -b .sigusr1-changes-debuglevel
+%patch8 -p1 -b .always-scan
 
 %build
 cp %{SOURCE1} ./.config
@@ -140,6 +142,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-9
+- Always allow explicit wireless scans triggered from a control interface
+
 * Thu Sep 20 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-8
 - Change system bus activation file name to work around D-Bus bug that fails
     to launch services unless their .service file is named the same as the



From fedora-extras-commits at redhat.com  Tue Sep 25 20:54:25 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 16:54:25 -0400
Subject: devel/anaconda .cvsignore, 1.447, 1.448 anaconda.spec, 1.583,
	1.584 sources, 1.576, 1.577
Message-ID: <200709252054.l8PKsPWT000898@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
- A few upgrade fixes; look for packages in 
  /var/cache/yum/anaconda-upgrade/packages so that you can predownload them
- Point to the mirror list for the "Additional Fedora Software"
- Font movement (#304271)
- Fix where firmware is looked for



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- .cvsignore	24 Sep 2007 20:20:08 -0000	1.447
+++ .cvsignore	25 Sep 2007 20:53:53 -0000	1.448
@@ -1 +1 @@
-anaconda-11.3.0.33.tar.bz2
+anaconda-11.3.0.34.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- anaconda.spec	24 Sep 2007 20:20:08 -0000	1.583
+++ anaconda.spec	25 Sep 2007 20:53:53 -0000	1.584
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.33
+Version: 11.3.0.34
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
+- A few upgrade fixes; look for packages in 
+  /var/cache/yum/anaconda-upgrade/packages so that you can predownload them
+- Point to the mirror list for the "Additional Fedora Software"
+- Font movement (#304271)
+- Fix where firmware is looked for
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.33-1
 - Blacklist some modules to try to avoid #299351
 - Copy over media.repo if it exists


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- sources	24 Sep 2007 20:20:08 -0000	1.576
+++ sources	25 Sep 2007 20:53:53 -0000	1.577
@@ -1 +1 @@
-43d84848afcbecc848acdb8546aaf486  anaconda-11.3.0.33.tar.bz2
+068dbe6d893b21eaba209e97e12aeefc  anaconda-11.3.0.34.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:01:27 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 25 Sep 2007 17:01:27 -0400
Subject: rpms/octave/devel octave-2.9.14-pkg.patch, NONE, 1.1 octave.spec,
	1.58, 1.59
Message-ID: <200709252101.l8PL1RGV007286@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1187

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.14-pkg.patch 
Log Message:
* Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
- Add /usr/share/octave/packages for add on packages and %ghost 
  /usr/share/octave/packages/octave_packages
- Add patch for octave package manager that will be going upstream


octave-2.9.14-pkg.patch:

--- NEW FILE octave-2.9.14-pkg.patch ---
*** ./scripts/pkg/pkg.m.orig2	2007-08-23 18:14:51.000000000 +0200
--- ./scripts/pkg/pkg.m	2007-09-22 02:36:01.022097578 +0200
***************
*** 116,121 ****
--- 116,128 ----
  ## @example
  ## p = pkg prefix
  ## @end example
+ ##
+ ## The location in which to install the architecture dependent files can be
+ ## independent specified with an addition argument. For example
+ ##
+ ## @example
+ ## pkg prefix ~/my_octave_packages ~/my_octave_packages_for_my_pc
+ ## @end example
  ## @item local_list
  ## Set the file in which to look for information on the locally
  ## installed packages. Locally installed packages are those that are
***************
*** 173,196 ****
    ## Installation prefix (XXX: what should these be on windows?)
    persistent user_prefix = false;
    persistent prefix = -1;
    persistent local_list = tilde_expand (fullfile("~", ".octave_packages"));
    persistent global_list = fullfile (OCTAVE_HOME (), "share", "octave",
  				     "octave_packages");
    mlock ();
  
!   if (ispc () && ! isunix ())
!     global_install = 1;
!   else
!     global_install = (geteuid() == 0);
!   endif
  
    if (prefix == -1)
      if (global_install)
        prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
      else
        prefix = fullfile ("~", "octave");
      endif
      prefix = tilde_expand (prefix);
    endif
  
    ## Handle input
--- 180,203 ----
    ## Installation prefix (XXX: what should these be on windows?)
    persistent user_prefix = false;
    persistent prefix = -1;
+   persistent archprefix = -1;
    persistent local_list = tilde_expand (fullfile("~", ".octave_packages"));
    persistent global_list = fullfile (OCTAVE_HOME (), "share", "octave",
  				     "octave_packages");
    mlock ();
  
!   global_install = issuperuser ();
  
    if (prefix == -1)
      if (global_install)
        prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
+       archprefix = fullfile (OCTAVE_HOME (), "libexec", "octave", "packages");
      else
        prefix = fullfile ("~", "octave");
+       archprefix = prefix;
      endif
      prefix = tilde_expand (prefix);
+     archprefix = tilde_expand (archprefix);
    endif
  
    ## Handle input
***************
*** 222,230 ****
  	if (! user_prefix)
  	  prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
  	endif
!       case {"list", "install", "uninstall", "load", "unload", ...
! 	    "prefix", "local_list", "global_list", "rebuild", "build"}
! 	if (strcmp (action,"none"))
  	  action = varargin{i};
  	else
  	  error ("more than one action specified");
--- 229,237 ----
  	if (! user_prefix)
  	  prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
  	endif
!       case {"list", "install", "uninstall", "load", "unload", "prefix", ...
! 	    "local_list", "global_list", "rebuild", "build"}
! 	if (strcmp (action, "none"))
  	  action = varargin{i};
  	else
  	  error ("more than one action specified");
***************
*** 252,258 ****
        if (length (files) == 0)
  	error ("you must specify at least one filename when calling 'pkg install'");
        endif
!       install (files, deps, auto, prefix, verbose, local_list, 
  	       global_list, global_install);
  
      case "uninstall"
--- 259,265 ----
        if (length (files) == 0)
  	error ("you must specify at least one filename when calling 'pkg install'");
        endif
!       install (files, deps, auto, prefix, archprefix, verbose, local_list, 
  	       global_list, global_install);
  
      case "uninstall"
***************
*** 276,292 ****
  
      case "prefix"
        if (length (files) == 0 && nargout == 0)
! 	disp (prefix);
!       elseif (length (files) == 0 && nargout == 1)
  	local_packages = prefix;
!       elseif (length (files) == 1 && nargout <= 1 && ischar (files{1}))
  	prefix = files{1};
- 	## if (!strcmp(prefix(end), filesep))
- 	##   prefix(end+1) = filesep;
- 	## endif
  	prefix = absolute_pathname (prefix);
  	local_packages = prefix;
  	user_prefix = true;
        else
  	error ("you must specify a prefix directory, or request an output argument");
        endif
--- 283,309 ----
  
      case "prefix"
        if (length (files) == 0 && nargout == 0)
! 	printf ("Installation prefix:             %s\n", prefix);
! 	printf ("Architecture dependent prefix:   %s\n", archprefix);
!       elseif (length (files) == 0 && nargout >= 1)
  	local_packages = prefix;
! 	global_packages = archprefix;
!       elseif (length (files) >= 1 && nargout <= 2 && ischar (files{1}))
  	prefix = files{1};
  	prefix = absolute_pathname (prefix);
  	local_packages = prefix;
  	user_prefix = true;
+ 	if (length (files) >= 2 && ischar (files{2}))
+ 	  archprefix = files{2};
+ 	  try
+ 	    archprefix = absolute_pathname (archprefix);
+           catch
+ 	    mkdir (archprefix);
+ 	    warning ("creating the directory %s\n", archprefix);
+ 	    archprefix = absolute_pathname (archprefix);
+ 	  end_try_catch
+ 	  global_packages = archprefix;
+ 	endif
        else
  	error ("you must specify a prefix directory, or request an output argument");
        endif
***************
*** 327,340 ****
  
      case "rebuild"
        if (global_install)
! 	global_packages = rebuild (prefix, global_list, files, auto, verbose);
  	global_packages = save_order (global_packages);
  	save (global_list, "global_packages");
  	if (nargout > 0)
  	  local_packages = global_packages;
  	endif
        else
! 	local_packages = rebuild (prefix, local_list, files, auto, verbose);
  	local_packages = save_order (local_packages);
  	save (local_list, "local_packages");
  	if (nargout == 0)
--- 344,359 ----
  
      case "rebuild"
        if (global_install)
! 	global_packages = rebuild (prefix, archprefix, global_list, files, 
! 				   auto, verbose);
  	global_packages = save_order (global_packages);
  	save (global_list, "global_packages");
  	if (nargout > 0)
  	  local_packages = global_packages;
  	endif
        else
! 	local_packages = rebuild (prefix, archprefix, local_list, files, auto, 
! 				  verbose);
  	local_packages = save_order (local_packages);
  	save (local_list, "local_packages");
  	if (nargout == 0)
***************
*** 353,359 ****
    endswitch
  endfunction
  
! function descriptions = rebuild (prefix, list, files, auto, verbose)
    if (isempty (files))
      [dirlist, err, msg] = readdir (prefix);
      if (err)
--- 372,378 ----
    endswitch
  endfunction
  
! function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose)
    if (isempty (files))
      [dirlist, err, msg] = readdir (prefix);
      if (err)
***************
*** 380,385 ****
--- 399,406 ----
      if (exist (descfile, "file"))
        desc = get_description (descfile);
        desc.dir = fullfile (prefix, dirlist{k});
+       desc.archprefix = fullfile (archprefix, strcat (desc.name, "-",
+ 				  desc.version));
        if (auto != 0)
  	if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file"))
  	  unlink (fullfile (desc.dir, "packinfo", ".autoload"));
***************
*** 450,456 ****
    endif
    files(1) = [];
    buildlist = fullfile (builddir, "octave_packages");
!   install (files, handle_deps, autoload, installdir, verbose, 
  	   buildlist, "", false);
    unwind_protect
      repackage (builddir, buildlist);
--- 471,477 ----
    endif
    files(1) = [];
    buildlist = fullfile (builddir, "octave_packages");
!   install (files, handle_deps, autoload, installdir, installdir, verbose, 
  	   buildlist, "", false);
    unwind_protect
      repackage (builddir, buildlist);
***************
*** 465,471 ****
    end_unwind_protect
  endfunction
  
! function install (files, handle_deps, autoload, prefix, verbose, local_list, global_list, global_install)
  
    # Check that the directory in prefix exist. If it doesn't: create it!
    if (! exist (prefix, "dir"))
--- 486,493 ----
    end_unwind_protect
  endfunction
  
! function install (files, handle_deps, autoload, prefix, archprefix, verbose, 
! 		  local_list, global_list, global_install)
  
    # Check that the directory in prefix exist. If it doesn't: create it!
    if (! exist (prefix, "dir"))
***************
*** 491,497 ****
    ## Uncompress the packages and read the DESCRIPTION files
    tmpdirs = packdirs = descriptions = {};
    try
- 
      ## Warn about non existent files 
      for i = 1:length (files)
        if (isempty (glob(files{i}))) 
--- 513,518 ----
***************
*** 549,560 ****
  	  [dummy, nm] = fileparts (tgz); 
  	  if ((length (nm) >= length (desc.name))
  	      && ! strcmp (desc.name, nm(1:length(desc.name))))
! 	    error ("package name '%s' doesn't correspond to its filename '%s'", desc.name, nm);
  	  endif
  
  	  ## Set default installation directory
  	  desc.dir = fullfile (prefix, strcat (desc.name, "-", desc.version));
  
  	  ## Save desc
  	  descriptions{end+1} = desc;
  
--- 570,586 ----
  	  [dummy, nm] = fileparts (tgz); 
  	  if ((length (nm) >= length (desc.name))
  	      && ! strcmp (desc.name, nm(1:length(desc.name))))
! 	    error ("package name '%s' doesn't correspond to its filename '%s'", 
! 		   desc.name, nm);
  	  endif
  
  	  ## Set default installation directory
  	  desc.dir = fullfile (prefix, strcat (desc.name, "-", desc.version));
  
+ 	  ## Set default architectire dependent installation directory
+ 	  desc.archprefix = fullfile (archprefix, strcat (desc.name, "-",
+ 							  desc.version));
+ 
  	  ## Save desc
  	  descriptions{end+1} = desc;
  
***************
*** 656,665 ****
      for i = 1:length (descriptions)
        desc = descriptions{i};
        pdir = packdirs{i};
!       copy_files (desc, pdir);
!       create_pkgadddel (desc, pdir, "PKG_ADD");
!       create_pkgadddel (desc, pdir, "PKG_DEL");
!       finish_installation (desc, pdir)
      endfor
    catch
      ## Something went wrong, delete tmpdirs
--- 682,691 ----
      for i = 1:length (descriptions)
        desc = descriptions{i};
        pdir = packdirs{i};
!       copy_files (desc, pdir, global_install);
!       create_pkgadddel (desc, pdir, "PKG_ADD", global_install);
!       create_pkgadddel (desc, pdir, "PKG_DEL", global_install);
!       finish_installation (desc, pdir, global_install)
      endfor
    catch
      ## Something went wrong, delete tmpdirs
***************
*** 668,673 ****
--- 694,700 ----
      endfor
      for i = 1:length (descriptions)
        rm_rf (descriptions{i}.dir);
+       rm_rf (getarchdir (descriptions{i}));
      endfor
      rethrow (lasterror ());
    end_try_catch
***************
*** 675,683 ****
    ## Check if the installed directory is empty. If it is remove it
    ## from the list
    for i = length (descriptions):-1:1
!     if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}))
        warning ("package %s is empty\n", descriptions{i}.name);
        rm_rf (descriptions{i}.dir);
        descriptions(i) = [];
      endif
    endfor
--- 702,712 ----
    ## Check if the installed directory is empty. If it is remove it
    ## from the list
    for i = length (descriptions):-1:1
!     if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) &&
! 	dirempty (getarchdir (descriptions{i})))
        warning ("package %s is empty\n", descriptions{i}.name);
        rm_rf (descriptions{i}.dir);
+       rm_rf (getarchdir (descriptions{i}));
        descriptions(i) = [];
      endif
    endfor
***************
*** 738,744 ****
  	idx (end + 1) = i;
        endif
      endfor
!     load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst);
    endif
  endfunction
  
--- 767,774 ----
  	idx (end + 1) = i;
        endif
      endfor
!     load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst,
! 				    global_install);
    endif
  endfunction
  
***************
*** 826,833 ****
      ## Do the actual deletion
      if (desc.loaded)
        rmpath (desc.dir);
!       if (exist (fullfile (desc.dir, getarch()), "dir"))
! 	rmpath (fullfile (desc.dir, getarch ()));
        endif
      endif
      if (exist (desc.dir, "dir"))
--- 856,863 ----
      ## Do the actual deletion
      if (desc.loaded)
        rmpath (desc.dir);
!       if (exist (getarchdir (desc)))
! 	rmpath (getarchdir (desc));
        endif
      endif
      if (exist (desc.dir, "dir"))
***************
*** 835,840 ****
--- 865,877 ----
        if (status != 1)
  	error ("couldn't delete directory %s: %s", desc.dir, msg);
        endif
+       [status, msg] = rm_rf (getarchdir (desc));
+       if (status != 1)
+ 	error ("couldn't delete directory %s: %s", getarchdir (desc), msg);
+       endif
+       if (dirempty (desc.archprefix))
+ 	rm_rf (desc.archprefix);
+       endif
      else
        warning ("directory %s previously lost", desc.dir);
      endif
***************
*** 894,900 ****
        if (exist (fullfile (pack.name, "inst", "bin"), "dir"))
  	movefile (fullfile (pack.name, "inst", "bin"), pack.name);
        endif
!       archdir = fullfile (pack.name, "inst", getarch ());
        if (exist (archdir, "dir"))
  	if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file"))
  	  unlink (fullfile (pack.name, "inst", "PKG_ADD"));
--- 931,938 ----
        if (exist (fullfile (pack.name, "inst", "bin"), "dir"))
  	movefile (fullfile (pack.name, "inst", "bin"), pack.name);
        endif
!       archdir = fullfile (pack.archprefix, strcat (pack.name, "-",
! 			  pack.version), getarch ());
        if (exist (archdir, "dir"))
  	if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file"))
  	  unlink (fullfile (pack.name, "inst", "PKG_ADD"));
***************
*** 1123,1138 ****
    endif
  endfunction
  
! function create_pkgadddel (desc, packdir, nm)
    instpkg = fullfile (desc.dir, nm);
    instfid = fopen (instpkg, "wt");
    ## If it is exists, most of the  PKG_* file should go into the 
    ## architecture dependent directory so that the autoload/mfilename 
    ## commands work as expected. The only part that doesn't is the
    ## part in the main directory.
!   if (exist (fullfile (desc.dir, getarch ()), "dir"))
!     archpkg = fullfile (desc.dir, getarch (), nm);
!     archfid = fopen (archpkg, "wt");
    else
      archpkg = instpkg;
      archfid = instfid;
--- 1161,1178 ----
    endif
  endfunction
  
! function create_pkgadddel (desc, packdir, nm, global_install)
    instpkg = fullfile (desc.dir, nm);
    instfid = fopen (instpkg, "wt");
    ## If it is exists, most of the  PKG_* file should go into the 
    ## architecture dependent directory so that the autoload/mfilename 
    ## commands work as expected. The only part that doesn't is the
    ## part in the main directory.
!   archdir = fullfile (getarchprefix (desc), strcat (desc.name, "-",
! 		      desc.version), getarch ());
!   if (exist (getarchdir (desc, global_install), "dir"))
!     archpkg = fullfile (getarchdir (desc, global_install), nm);
!     archfid = fopen (archpkg, "at");
    else
      archpkg = instpkg;
      archfid = instfid;
***************
*** 1186,1192 ****
    endif
  endfunction
  
! function copy_files (desc, packdir, bindir)
    ## Create the installation directory
    if (! exist (desc.dir, "dir"))
      [status, output] = mkdir (desc.dir);
--- 1226,1232 ----
    endif
  endfunction
  
! function copy_files (desc, packdir, global_install)
    ## Create the installation directory
    if (! exist (desc.dir, "dir"))
      [status, output] = mkdir (desc.dir);
***************
*** 1196,1201 ****
--- 1236,1243 ----
      endif
    endif
  
+   octfiledir = getarchdir (desc);
+ 
    ## Copy the files from "inst" to installdir
    instdir = fullfile (packdir, "inst");
    if (! dirempty (instdir))
***************
*** 1204,1209 ****
--- 1246,1300 ----
        rm_rf (desc.dir);
        error ("couldn't copy files to the installation directory");
      endif
+     if (exist (fullfile (desc.dir, getarch ()), "dir") &&
+ 	! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
+       if (! exist (octfiledir, "dir"))
+         ## Can be required to create upto three levels of dirs
+         octm1 = fileparts (octfiledir);
+         if (! exist (octm1, "dir"))
+           octm2 = fileparts (octm1);
+           if (! exist (octm2, "dir"))
+             octm3 = fileparts (octm2);
+             if (! exist (octm3, "dir"))
+               [status, output] = mkdir (octm3);
+               if (status != 1)
+                 rm_rf (desc.dir);
+                 error ("couldn't create installation directory %s : %s", 
+                        octm3, output);
+               endif
+             endif
+             [status, output] = mkdir (octm2);
+             if (status != 1)
+               rm_rf (desc.dir);
+               error ("couldn't create installation directory %s : %s", 
+                      octm2, output);
+             endif
+           endif
+           [status, output] = mkdir (octm1);
+           if (status != 1)
+             rm_rf (desc.dir);
+             error ("couldn't create installation directory %s : %s", 
+                    octm1, output);
+           endif
+         endif
+         [status, output] = mkdir (octfiledir);
+         if (status != 1)
+           rm_rf (desc.dir);
+           error ("couldn't create installation directory %s : %s", 
+           octfiledir, output);
+         endif
+       endif
+       [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), 
+ 				   octfiledir);
+       rm_rf (fullfile (desc.dir, getarch ()));
+ 
+       if (status != 1)
+         rm_rf (desc.dir);
+         rm_rf (octfiledir);
+         error ("couldn't copy files to the installation directory");
+       endif
+     endif
+ 
    endif
  
    ## Create the "packinfo" directory
***************
*** 1211,1231 ****
    [status, msg] = mkdir (packinfo);
    if (status != 1)
      rm_rf (desc.dir);
      error ("couldn't create packinfo directory: %s", msg);
    endif
  
    ## Copy DESCRIPTION
    [status, output] = copyfile (fullfile (packdir, "DESCRIPTION"), packinfo);
    if (status != 1)
!    rm_rf (desc.dir);
!    error ("couldn't copy DESCRIPTION: %s", output);
    endif
  
    ## Copy COPYING
    [status, output] = copyfile (fullfile (packdir, "COPYING"), packinfo);
    if (status != 1)
!    rm_rf (desc.dir);
!    error ("couldn't copy COPYING: %s", output);
    endif
  
    ## If the file ChangeLog exists, copy it
--- 1302,1325 ----
    [status, msg] = mkdir (packinfo);
    if (status != 1)
      rm_rf (desc.dir);
+     rm_rf (octfiledir);
      error ("couldn't create packinfo directory: %s", msg);
    endif
  
    ## Copy DESCRIPTION
    [status, output] = copyfile (fullfile (packdir, "DESCRIPTION"), packinfo);
    if (status != 1)
!     rm_rf (desc.dir);
!     rm_rf (octfiledir);
!     error ("couldn't copy DESCRIPTION: %s", output);
    endif
  
    ## Copy COPYING
    [status, output] = copyfile (fullfile (packdir, "COPYING"), packinfo);
    if (status != 1)
!     rm_rf (desc.dir);
!     rm_rf (octfiledir);
!     error ("couldn't copy COPYING: %s", output);
    endif
  
    ## If the file ChangeLog exists, copy it
***************
*** 1234,1239 ****
--- 1328,1334 ----
      [status, output] = copyfile (fChangeLog, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy ChangeLog file: %s", output);
      endif
    endif
***************
*** 1244,1257 ****
      [status, output] = copyfile (fINDEX, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
        error ("couldn't copy INDEX file: %s", output);
      endif
    else
      try
        write_INDEX (desc, fullfile (packdir, "inst"),
! 		   fullfile (packinfo, "INDEX"));
      catch
        rm_rf (desc.dir);
        rethrow (lasterror ());
      end_try_catch
    endif
--- 1339,1354 ----
      [status, output] = copyfile (fINDEX, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy INDEX file: %s", output);
      endif
    else
      try
        write_INDEX (desc, fullfile (packdir, "inst"),
! 		   fullfile (packinfo, "INDEX"), global_install);
      catch
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        rethrow (lasterror ());
      end_try_catch
    endif
***************
*** 1262,1267 ****
--- 1359,1365 ----
      [status, output] = copyfile (fon_uninstall, packinfo);
      if (status != 1)
        rm_rf (desc.dir);
+       rm_rf (octfiledir);
        error ("couldn't copy on_uninstall.m: %s", output);
      endif
    endif
***************
*** 1269,1285 ****
    ## Is there a doc/ directory that needs to be installed
    docdir = fullfile (packdir, "doc");
    if (exist (docdir, "dir") && ! dirempty (docdir))
!    [status, output] = copyfile (docdir, desc.dir);
    endif
  
    ## Is there a bin/ directory that needs to be installed
    bindir = fullfile (packdir, "bin");
    if (exist (bindir, "dir") && ! dirempty (bindir))
!    [status, output] = copyfile (bindir, desc.dir);
    endif
  endfunction
  
! function finish_installation (desc, packdir)
    ## Is there a post-install to call?
    if (exist (fullfile (packdir, "post_install.m"), "file"))
      wd = pwd ();
--- 1367,1383 ----
    ## Is there a doc/ directory that needs to be installed
    docdir = fullfile (packdir, "doc");
    if (exist (docdir, "dir") && ! dirempty (docdir))
!     [status, output] = copyfile (docdir, desc.dir);
    endif
  
    ## Is there a bin/ directory that needs to be installed
    bindir = fullfile (packdir, "bin");
    if (exist (bindir, "dir") && ! dirempty (bindir))
!     [status, output] = copyfile (bindir, desc.dir);
    endif
  endfunction
  
! function finish_installation (desc, packdir, global_install)
    ## Is there a post-install to call?
    if (exist (fullfile (packdir, "post_install.m"), "file"))
      wd = pwd ();
***************
*** 1290,1295 ****
--- 1388,1394 ----
      catch
        cd (wd);
        rm_rf (desc.dir);
+       rm_rf (getarchdir (desc), global_install);
        rethrow (lasterror ());
      end_try_catch
    endif
***************
*** 1470,1476 ****
  ##   'desc'  describes the package.
  ##   'dir'   is the 'inst' direcotyr in temporary directory.
  ##   'INDEX' is the name (including path) of resulting INDEX file.
! function write_INDEX (desc, dir, INDEX)
    ## Get names of functions in dir
    [files, err, msg] = readdir (dir);
    if (err)
--- 1569,1575 ----
  ##   'desc'  describes the package.
  ##   'dir'   is the 'inst' direcotyr in temporary directory.
  ##   'INDEX' is the name (including path) of resulting INDEX file.
! function write_INDEX (desc, dir, INDEX, global_install)
    ## Get names of functions in dir
    [files, err, msg] = readdir (dir);
    if (err)
***************
*** 1478,1485 ****
    endif
  
    ## Check for architecture dependent files
!   arch = getarch();
!   tmpdir = fullfile (dir, arch);
    if (exist (tmpdir, "dir"))
      [files2, err, msg] = readdir (tmpdir);
      if (err)
--- 1577,1583 ----
    endif
  
    ## Check for architecture dependent files
!   tmpdir = getarchdir (desc);
    if (exist (tmpdir, "dir"))
      [files2, err, msg] = readdir (tmpdir);
      if (err)
***************
*** 1718,1724 ****
    endif
  
    ## Load the packages, but take care of the ordering of dependencies
!   load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst);
  endfunction
  
  function unload_packages (files, handle_deps, local_list, global_list)
--- 1816,1822 ----
    endif
  
    ## Load the packages, but take care of the ordering of dependencies
!   load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst, true);
  endfunction
  
  function unload_packages (files, handle_deps, local_list, global_list)
***************
*** 1739,1773 ****
    ## unload all
    if (length (files) == 1 && strcmp (files{1}, "all"))
        dirs = pdirs;
    ## unload package_name1 ...
    else
      dirs = {};
      for i = 1:length (files)
!       idx = strcmp (pnames, files{i});
        if (! any (idx))
  	error ("package %s is not installed", files{i});
        endif
! 	dirs{end+1} = pdirs{idx};
        endfor
    endif
  
    ## Check for architecture dependent directories
-   arch = getarch();
    archdirs = {};
    for i = 1:length (dirs)
!     tmpdir = fullfile (dirs{i}, arch);
      if (exist (tmpdir, "dir"))
        archdirs{end + 1} = dirs{i};
        archdirs{end + 1} = tmpdir;
      endif
    endfor
-   if (length (archdirs) > 0)
-     dirs = archdirs;
-   endif
  
    ## Unload the packages
!   for i = 1:length (dirs)
!     d = dirs{i};
      idx = strcmp (p, d);
      if (any (idx))
        rmpath (d);
--- 1837,1872 ----
    ## unload all
    if (length (files) == 1 && strcmp (files{1}, "all"))
        dirs = pdirs;
+       desc = installed_pkgs_lst;
    ## unload package_name1 ...
    else
      dirs = {};
+     desc = {};
      for i = 1:length (files)
!       idx = strcmp (pnames, files {i});
        if (! any (idx))
  	error ("package %s is not installed", files{i});
        endif
! 	dirs {end + 1} = pdirs {idx};
!         desc {end + 1} = installed_pkgs_lst {idx};
        endfor
    endif
  
    ## Check for architecture dependent directories
    archdirs = {};
    for i = 1:length (dirs)
!     tmpdir = getarchdir (desc {i});
      if (exist (tmpdir, "dir"))
        archdirs{end + 1} = dirs{i};
        archdirs{end + 1} = tmpdir;
+     else
+       archdirs{end+ 1} = dirs {i};
      endif
    endfor
  
    ## Unload the packages
!   for i = 1:length (archdirs)
!     d = archdirs{i};
      idx = strcmp (p, d);
      if (any (idx))
        rmpath (d);
***************
*** 1777,1789 ****
  endfunction
  
  function [status_out, msg_out] = rm_rf (dir)
!   crr = confirm_recursive_rmdir ();
!   unwind_protect
!     confirm_recursive_rmdir (false);
!     [status, msg] = rmdir (dir, "s");
!   unwind_protect_cleanup
!     confirm_recursive_rmdir (crr);
!   end_unwind_protect
    if (nargout > 0)
      status_out = status;
    endif
--- 1876,1893 ----
  endfunction
  
  function [status_out, msg_out] = rm_rf (dir)
!   if (exist (dir))
!     crr = confirm_recursive_rmdir ();
!     unwind_protect
!       confirm_recursive_rmdir (false);
!       [status, msg] = rmdir (dir, "s");
!     unwind_protect_cleanup
!       confirm_recursive_rmdir (crr);
!     end_unwind_protect
!   else
!     status = 1;
!     msg = "";
!   endif
    if (nargout > 0)
      status_out = status;
    endif
***************
*** 1793,1818 ****
  endfunction
  
  function emp = dirempty (nm, ign)
!   if (nargin < 2)
!     ign = {".", ".."};
!   else
!     ign = [{".", ".."}, ign];
!   endif
!   l = dir (nm);
!   for i = 1:length (l)
!     found = false;
!     for j = 1:length (ign)
!       if (strcmp (l(i).name, ign{j}))
!         found = true;
!         break;
        endif
      endfor
!     if (! found)
!       emp = false;
!       return
!     endif
!   endfor
!   emp = true;
  endfunction
  
  function arch = getarch ()
--- 1897,1926 ----
  endfunction
  
  function emp = dirempty (nm, ign)
!   if (exist (nm, "dir"))
!     if (nargin < 2)
!       ign = {".", ".."};
!     else
!       ign = [{".", ".."}, ign];
!     endif
!     l = dir (nm);
!     for i = 1:length (l)
!       found = false;
!       for j = 1:length (ign)
!         if (strcmp (l(i).name, ign{j}))
!           found = true;
!           break;
!         endif
!       endfor
!       if (! found)
!         emp = false;
!         return
        endif
      endfor
!     emp = true;
!   else
!     emp = true;
!   endif
  endfunction
  
  function arch = getarch ()
***************
*** 1821,1826 ****
--- 1929,1955 ----
    arch = _arch;
  endfunction
  
+ function archprefix = getarchprefix (desc, global_install)
+   if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ()))
+     archprefix = fullfile (octave_config_info ("libexecdir"), "octave", 
+ 			   "packages", strcat(desc.name, "-", desc.version));
+   else
+     archprefix = desc.dir;
+   endif
+ endfunction
+ 
+ function archdir = getarchdir (desc)
+   archdir = fullfile (desc.archprefix, getarch());
+ endfunction
+ 
+ function s = issuperuser ()
+   if ((ispc () && ! isunix ()) || (geteuid() == 0))
+     s = true;
+   else
+     s = false;
+   endif
+ endfunction
+ 
  function [status, output] = shell (cmd)
    persistent have_sh;
  
***************
*** 1879,1887 ****
    newdesc(idx) = [];
  endfunction
  
! function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst)
    idx = load_package_dirs (idx, [], handle_deps, installed_pkgs_lst);
-   arch = getarch ();
    dirs = {};
    execpath = EXEC_PATH ();
    for i = idx;
--- 2008,2016 ----
    newdesc(idx) = [];
  endfunction
  
! function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst,
! 					 global_install)
    idx = load_package_dirs (idx, [], handle_deps, installed_pkgs_lst);
    dirs = {};
    execpath = EXEC_PATH ();
    for i = idx;
***************
*** 1890,1896 ****
      if (exist (fullfile (dirs{end}, "bin"), "dir"))
        execpath = strcat (fullfile(dirs{end}, "bin"), ":", execpath);
      endif
!     tmpdir = fullfile (ndir, arch);
      if (exist (tmpdir, "dir"))
        dirs{end + 1} = tmpdir;
      endif
--- 2019,2025 ----
      if (exist (fullfile (dirs{end}, "bin"), "dir"))
        execpath = strcat (fullfile(dirs{end}, "bin"), ":", execpath);
      endif
!     tmpdir = getarchdir (installed_pkgs_lst {i});
      if (exist (tmpdir, "dir"))
        dirs{end + 1} = tmpdir;
      endif


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- octave.spec	18 Sep 2007 16:20:31 -0000	1.58
+++ octave.spec	25 Sep 2007 21:00:54 -0000	1.59
@@ -3,13 +3,14 @@
 
 Name:           octave
 Version:        2.9.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv2+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.9.14-pkg.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .pkg
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -96,6 +98,7 @@
 HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
 
 
 %clean
@@ -123,6 +126,7 @@
 %config(noreplace) /etc/ld.so.conf.d/*
 %{_libdir}/octave*
 %{_datadir}/octave
+%ghost %{_datadir}/octave/octave_packages
 %{_libexecdir}/octave
 %{_mandir}/man*/octave*
 %{_infodir}/octave.info*
@@ -137,6 +141,11 @@
 
 
 %changelog
+* Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
+- Add /usr/share/octave/packages for add on packages and %%ghost 
+  /usr/share/octave/packages/octave_packages
+- Add patch for octave package manager that will be going upstream
+
 * Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1
 - New release.
 - Remove redundant menu category in desktop file (bug 274431).



From fedora-extras-commits at redhat.com  Tue Sep 25 21:08:07 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 17:08:07 -0400
Subject: rpms/frysk/F-7 .cvsignore, 1.46, 1.47 frysk.spec, 1.114,
	1.115 sources, 1.46, 1.47
Message-ID: <200709252108.l8PL87Yn007675@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7631

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
- Update files list.
- Fix path to dogtail_scripts.
- Fix touch paths to allow for build sub-directory.
- Import frysk-0.0.1.2007.09.24.tar.bz2.
- Remove frysk-20060922-a-cast.patch
- Remove frysk-xfail-2130.patch.
- Run bootstrap.sh over source tree.
- Add autoconf, automake, and libtool to BuildRequires.
- Remove binutils-devel from BuildRequires.
- Build in separate sub-directory.
- Do not force JV_SCAN into the build environment.
- Update Licence.
- Change BuildRoot to prefered fedora format.
- Expand Summary to mention debugging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2007 16:03:08 -0000	1.46
+++ .cvsignore	25 Sep 2007 21:07:35 -0000	1.47
@@ -1 +1 @@
-frysk-0.0.1.2007.03.13.rh1.tar.bz2
+frysk-0.0.1.2007.09.24.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/frysk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- frysk.spec	13 Mar 2007 16:40:08 -0000	1.114
+++ frysk.spec	25 Sep 2007 21:07:35 -0000	1.115
@@ -1,23 +1,29 @@
-Summary:	Frysk execution analysis tool
+Summary:	Frysk execution analysis and debugging tools
 Name:		frysk
-Version:	0.0.1.2007.03.13.rh1
+Version:	0.0.1.2007.09.24
 Release:	1%{?dist}
-License:	GPL
+# antlrv2 is Public Domain; antlrv3 is BSD.
+# cdtparser is EPL
+# getopt is GPLv2 with exception
+# elfutils is GPLv2 with exception
+# frysk is GPLv2 with exception
+# junit licence is CPL (according to the junit rpm)
+# jline licence is BSD
+# libunwind is BSD
+License:	GPLv2 with exceptions and BSD and CPL and Public Domain and EPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands, which brand the file with the contents of version.in,
+# to generate the tarball:
+#  cvs -d:pserver:anoncvs at sourceware.org:/cvs/frysk export -D YYYY-MM-DD-gmt
+#  mv frysk frysk-`cat frysk/common/version.in`
+#  tar cf - frysk-`cat frysk/common/version.in` | bzip2 -9 > frysk-`cat frysk/common/version.in`.tar.bz2
 Source:		%{name}-%{version}.tar.bz2
 
 %define run_make_check 0
 
-%if %{run_make_check}
-# Disable the test which fails when building on older kernel.
-Patch0:		frysk-xfail-2130.patch
-%endif
-
-# Prevent a warning from a new g++:
-Patch1:		frysk-20060922-a-cast.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	glib-java >= 0.2.6
 
@@ -39,17 +45,16 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	gnome-python2-gconf
 BuildRequires:	audit-libs-devel
-
-# Fedora Core >= 6 and RHEL:
-%if "%{?fedora}" != "5"
-BuildRequires:	binutils-devel
-BuildRequires:	dogtail >= 0.5.2
+BuildRequires:	autoconf automake libtool
 
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 
+# Fedora Core >= 6 and RHEL:
+%if "%{?fedora}" != "5"
+BuildRequires:	dogtail >= 0.5.2
 # Needed by "dogtail-run-headless -n":
 Buildrequires:	metacity
 %endif
@@ -65,12 +70,13 @@
 %endif
 
 %description
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 %package devel
 Summary:        The development part of Frysk.
@@ -78,8 +84,8 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
-Frysk is an execution-analysis technology implemented using native Java and C++.
-This package contains the development part of Frysk.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
 Summary:        The GUI frontend of Frysk.
@@ -90,21 +96,19 @@
 Requires: 	libvte-java >= 0.12.0
 
 %description gnome
-Frysk is an execution-analysis technology implemented using native Java and C++.
-It is aimed at providing developers and sysadmins with the ability to both
-examine and analyze running multi-host, multi-process, multi-threaded systems.
-Frysk allows the monitoring of running processes and threads, of locking
-primitives and will also expose deadlocks, gather data and debug any given
-process in the system.
+Frysk is an execution-analysis technology implemented using native
+Java and C++.  It is aimed at providing developers and sysadmins with
+the ability to both examine and analyze running multi-host,
+multi-process, multi-threaded systems.  Frysk allows the monitoring of
+running processes and threads, of locking primitives and will also
+expose deadlocks, gather data and debug any given process in the
+system.
 
 This package contains the GUI front end for Frysk.
 
 %prep
 %setup -q -n %{name}-%{version}
-%if %{run_make_check}
-%patch0
-%endif
-%patch1
+./bootstrap.sh
 
 %build 
 
@@ -119,22 +123,31 @@
 export CC=${CC:-/usr/bin/gcc}
 export CXX=${CXX:-/usr/bin/g++}
 export JAVA=${JAVA:-/usr/bin/gij}
-export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
 
 uname -a
 gcc --version
+pwd
+mkdir -p build
+cd build
+
+# Capture the configure line
+rm -f configure
+echo '#!/bin/sh -x'		>> configure
+echo 'exec ../configure "$@"'	>> configure
+chmod a+x configure
 
 # FIXME: Warnings should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
-	--disable-arch32-tests --disable-werror
-
+	--disable-arch32-tests
 
 # Build system can end up with corrupt xmllint files:
 touch frysk-gui/glade.catalog
 touch frysk-gui/checked-glade-xml
 
-make %{?_smp_mflags}
+# in frysk-sys; make is building .o files before all BUILT_FILES are
+# created.
+make # %{?_smp_mflags}
 
 %if %{run_make_check}
 %check
@@ -148,22 +161,26 @@
 # Workaround for bug #??:
 mkdir -p $RPM_BUILD_ROOT/usr/share/frysk
 
+pwd
+cd build
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Fix timestamp of a generated script:
-touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
+touch -r \
+      ../frysk-gui/frysk/gui/FryskGui.javain \
+      $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py
 # ...and a few other ones:
-# ... well, these are not installed by current tarball...
-#for f in test2866.py test2985.py test3380.py; do
-#  touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f
-#done
+for f in test2866.py test2985.py test3380.py; do
+    touch -r \
+    	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
+	  $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/$f
+done
 
 # Workaround for #211824:
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop .
-
+mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -174,6 +191,10 @@
 %files
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
+%{_bindir}/fdebuginfo
+%{_bindir}/fdebugrpm
+%{_bindir}/fexe
+%{_bindir}/fltrace
 %{_bindir}/ftrace
 %{_bindir}/fstack
 %{_bindir}/fcore
@@ -185,7 +206,7 @@
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-imports.so
+%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
 %dir %{_datadir}/%{name}
@@ -196,9 +217,20 @@
 %defattr(-,root,root)
 %{_libdir}/libfrysk-junit.so
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
+%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/hpd-c
+%{_libdir}/%{name}/test1
+%{_libdir}/%{name}/fsystest
+%{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test_main_looper
+%{_datadir}/%{name}/ChangeLog
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test?*
+%{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/test-core-*
+%{_datadir}/%{name}/test-exe-*
+# Not installed by current taralls.
 #%dir %{_datadir}/%{name}/test
 #%{_datadir}/%{name}/test/test*
 %{_datadir}/%{name}/dogtail_scripts
@@ -222,6 +254,22 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1
+- Update files list.
+- Fix path to dogtail_scripts.
+- Fix touch paths to allow for build sub-directory.
+- Import frysk-0.0.1.2007.09.24.tar.bz2.
+- Remove frysk-20060922-a-cast.patch
+- Remove frysk-xfail-2130.patch.
+- Run bootstrap.sh over source tree.
+- Add autoconf, automake, and libtool to BuildRequires.
+- Remove binutils-devel from BuildRequires.
+- Build in separate sub-directory.
+- Do not force JV_SCAN into the build environment.
+- Update Licence.
+- Change BuildRoot to prefered fedora format.
+- Expand Summary to mention debugging.
+
 * Tue Mar 13 2007 Stepan Kasal <skasal at redhat.com> - 0.0.1.2007.03.13.rh1-1
 - New upstream version, adapt the file list.
 - Remove frysk-no-dejagnu.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-7/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2007 16:03:08 -0000	1.46
+++ sources	25 Sep 2007 21:07:35 -0000	1.47
@@ -1 +1 @@
-b87ee4af3553a31b12e0b430de1225d1  frysk-0.0.1.2007.03.13.rh1.tar.bz2
+34b8a93e1b7b9e4f97d3ae4c57f25d57  frysk-0.0.1.2007.09.24.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:25:50 2007
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 25 Sep 2007 17:25:50 -0400
Subject: rpms/passwd/devel passwd.spec,1.32,1.33
Message-ID: <200709252125.l8PLPo7U008653@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/passwd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592

Modified Files:
	passwd.spec 
Log Message:
* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.74-5
- buildrequires popt-devel



Index: passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- passwd.spec	23 Aug 2007 23:22:45 -0000	1.32
+++ passwd.spec	25 Sep 2007 21:25:17 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
 Version: 0.74
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -58,6 +58,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Tue Sep 25 2007 Tomas Mraz <tmraz at redhat.com> 0.74-5
+- buildrequires popt-devel
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> 0.74-4
 - spec file cleanups
 



From fedora-extras-commits at redhat.com  Tue Sep 25 21:37:58 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Tue, 25 Sep 2007 17:37:58 -0400
Subject: rpms/libselinux/F-7 libselinux-swig.patch, 1.1, 1.2 libselinux.spec,
	1.270, 1.271
Message-ID: <200709252137.l8PLbwXV008973@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8950

Modified Files:
	libselinux-swig.patch libselinux.spec 
Log Message:
* Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
- Fix swig use of fsetfilecon_raw


libselinux-swig.patch:

Index: libselinux-swig.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-swig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libselinux-swig.patch	13 Sep 2007 13:19:04 -0000	1.1
+++ libselinux-swig.patch	25 Sep 2007 21:37:26 -0000	1.2
@@ -1,5 +1,18 @@
---- libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:13:49.000000000 -0400
-+++ libselinux-2.0.14.new/src/selinuxswig.i	2007-09-13 09:07:20.000000000 -0400
+diff -up libselinux-2.0.14/src/fsetfilecon.c.swig libselinux-2.0.14/src/fsetfilecon.c
+--- libselinux-2.0.14/src/fsetfilecon.c.swig	2007-09-25 17:34:07.000000000 -0400
++++ libselinux-2.0.14/src/fsetfilecon.c	2007-09-25 17:35:17.000000000 -0400
+@@ -13,7 +13,7 @@ int fsetfilecon_raw(int fd, security_con
+ 			 0);
+ }
+ 
+-hidden_def(setfilecon_raw)
++hidden_def(fsetfilecon_raw)
+ 
+ int fsetfilecon(int fd, security_context_t context)
+ {
+diff -up libselinux-2.0.14/src/selinuxswig.i.swig libselinux-2.0.14/src/selinuxswig.i
+--- libselinux-2.0.14/src/selinuxswig.i.swig	2007-09-13 09:17:31.000000000 -0400
++++ libselinux-2.0.14/src/selinuxswig.i	2007-09-13 09:17:31.000000000 -0400
 @@ -1,7 +1,9 @@
 -/* Author: Dan Walsh
 +/* Authors: Dan Walsh
@@ -245,8 +258,9 @@
 +%include "../include/selinux/selinux.h"
 +%include "../include/selinux/get_default_type.h"
 +%include "../include/selinux/get_context_list.h"
---- libselinux-2.0.14/src/selinuxswig_python.i	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.14.new/src/selinuxswig_python.i	2007-09-13 09:07:28.000000000 -0400
+diff -up /dev/null libselinux-2.0.14/src/selinuxswig_python.i
+--- /dev/null	2007-09-21 05:53:11.538007738 -0400
++++ libselinux-2.0.14/src/selinuxswig_python.i	2007-09-13 09:17:31.000000000 -0400
 @@ -0,0 +1,138 @@
 +/* Author: James Athey
 + *
@@ -386,9 +400,10 @@
 +}
 +
 +%include "selinuxswig.i"
---- libselinux-2.0.14/Makefile	2007-09-13 09:13:49.000000000 -0400
-+++ libselinux-2.0.14.new/Makefile	2007-09-13 09:08:20.000000000 -0400
-@@ -2,7 +2,7 @@
+diff -up libselinux-2.0.14/Makefile.swig libselinux-2.0.14/Makefile
+--- libselinux-2.0.14/Makefile.swig	2007-09-13 09:17:31.000000000 -0400
++++ libselinux-2.0.14/Makefile	2007-09-13 09:17:31.000000000 -0400
+@@ -2,7 +2,7 @@ all: 
  	$(MAKE) -C src 
  	$(MAKE) -C utils
  


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- libselinux.spec	13 Sep 2007 13:19:04 -0000	1.270
+++ libselinux.spec	25 Sep 2007 21:37:26 -0000	1.271
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -126,6 +126,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
+- Fix swig use of fsetfilecon_raw
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-7
 - Update swig bindings
 - Fix getfilecon return codes



From fedora-extras-commits at redhat.com  Tue Sep 25 21:42:10 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue, 25 Sep 2007 17:42:10 -0400
Subject: devel/livecd-tools .cvsignore, 1.11, 1.12 livecd-tools.spec, 1.11, 
	1.12 sources, 1.11, 1.12
Message-ID: <200709252142.l8PLgATk009282@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/livecd-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9253

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 012-1
- Allow %post --nochroot to work for putting files in the root of the iso
- Set environment variables for when %post is run
- Add progress for downloads (Colin Walters)
- Add cachedir option (Colin Walters)
- Fixes for ppc/ppc64 to work again
- Clean up bootloader config a little
- Enable swaps in the default desktop config
- Ensure all configs are installed (#281911)
- Convert method line to a repo for easier config reuse (jkeating)
- Kill the modprobe FATAL warnings (#240585)
- Verify isos with iso-to-disk script
- Allow passing xdriver for setting the xdriver (#291281)
- Add turboliveinst patch (Douglas McClendon)
- Make iso-to-disk support --resetmbr (#294041)
- Clean up filesystem layout (Douglas McClendon)
- Manifest tweaks for most configs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Aug 2007 23:53:30 -0000	1.11
+++ .cvsignore	25 Sep 2007 21:41:38 -0000	1.12
@@ -1 +1 @@
-livecd-tools-011.tar.bz2
+livecd-tools-012.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/livecd-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- livecd-tools.spec	28 Aug 2007 21:25:34 -0000	1.11
+++ livecd-tools.spec	25 Sep 2007 21:41:38 -0000	1.12
@@ -1,6 +1,8 @@
+%define debug_package %{nil}
+
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 011
+Version: 012
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -15,6 +17,7 @@
 Requires: squashfs-tools
 Requires: pykickstart
 Requires: dosfstools >= 2.11-8
+Requires: isomd5sum
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -52,6 +55,24 @@
 %{_datadir}/livecd-tools/*
 
 %changelog
+* Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 012-1
+- Allow %%post --nochroot to work for putting files in the root of the iso
+- Set environment variables for when %%post is run
+- Add progress for downloads (Colin Walters)
+- Add cachedir option (Colin Walters)
+- Fixes for ppc/ppc64 to work again
+- Clean up bootloader config a little
+- Enable swaps in the default desktop config
+- Ensure all configs are installed (#281911)
+- Convert method line to a repo for easier config reuse (jkeating)
+- Kill the modprobe FATAL warnings (#240585)
+- Verify isos with iso-to-disk script
+- Allow passing xdriver for setting the xdriver (#291281)
+- Add turboliveinst patch (Douglas McClendon)
+- Make iso-to-disk support --resetmbr (#294041)
+- Clean up filesystem layout (Douglas McClendon)
+- Manifest tweaks for most configs
+
 * Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 011-1
 - Many config updates for Fedora 8
 - Support $basearch in repo line of configs; use it


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/livecd-tools/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Aug 2007 23:53:30 -0000	1.11
+++ sources	25 Sep 2007 21:41:38 -0000	1.12
@@ -1 +1 @@
-303b0ab614b0dd4aa14f129153afe242  livecd-tools-011.tar.bz2
+12465bf127b9b390bbb7534b84407f93  livecd-tools-012.tar.bz2



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:37 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:37 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLoglu025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchbugzilla acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:39 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:39 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLoglx025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchcommits acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:41 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLogm2025182@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the commit acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:46 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8H025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchbugzilla acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:48 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:48 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8K025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the watchcommits acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:50:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:50:50 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252150.l8PLop8N025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the commit acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:13 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:13 -0700
Subject: [pkgdb] libvirt: veillard has requested watchbugzilla
Message-ID: <200709252151.l8PLop8P025254@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:14 -0700
Subject: [pkgdb] libvirt: veillard has requested watchcommits
Message-ID: <200709252151.l8PLpJ4e025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:21 -0700
Subject: [pkgdb] libvirt: veillard has requested watchbugzilla
Message-ID: <200709252151.l8PLpMnP025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchbugzilla acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:17 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:17 -0700
Subject: [pkgdb] libvirt: veillard has requested commit
Message-ID: <200709252151.l8PLpMnN025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the commit acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:23 -0700
Subject: [pkgdb] libvirt: veillard has requested watchcommits
Message-ID: <200709252151.l8PLpJ4g025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the watchcommits acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:24 -0700
Subject: [pkgdb] libvirt: veillard has requested commit
Message-ID: <200709252151.l8PLpMnR025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the commit acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:29 -0700
Subject: [pkgdb] libvirt: veillard has requested approveacls
Message-ID: <200709252151.l8PLpJ4i025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the approveacls acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:51:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:51:30 -0700
Subject: [pkgdb] libvirt: veillard has requested approveacls
Message-ID: <200709252151.l8PLpMnT025384@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has requested the approveacls acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:15 2007
From: fedora-extras-commits at redhat.com (Andrew Cagney (cagney))
Date: Tue, 25 Sep 2007 17:52:15 -0400
Subject: rpms/frysk/devel frysk.spec,1.119,1.120
Message-ID: <200709252152.l8PLqFQw009812@cvs-int.fedora.redhat.com>

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9769

Modified Files:
	frysk.spec 
Log Message:
* Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
- Install frysk.desktop; but with Hidden=true.
- Sort files list.
- Remove trailing period from summaries.



Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- frysk.spec	25 Sep 2007 17:29:36 -0000	1.119
+++ frysk.spec	25 Sep 2007 21:51:42 -0000	1.120
@@ -79,7 +79,7 @@
 system.
 
 %package devel
-Summary:        The development part of Frysk.
+Summary:        The development part of Frysk
 Group:		Development/System
 Requires:       %{name} = %{version}-%{release}
 
@@ -88,7 +88,7 @@
 Java and C++.  This package contains the development part of Frysk.
 
 %package gnome
-Summary:        The GUI frontend of Frysk.
+Summary:        The GNOME front-end of Frysk
 Requires:       %{name} = %{version}-%{release}
 Group:		Development/System
 Requires:   	libgconf-java
@@ -180,7 +180,7 @@
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # We are not yet ready to be in the menu:
-mv $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop ..
+echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -189,72 +189,87 @@
 rm -rf %{buildroot}
 
 %files
+
 %defattr(-,root,root)
+
 %doc COPYING frysk-imports/common/EXCEPTION
+
+%{_bindir}/fcatch
+%{_bindir}/fcore
 %{_bindir}/fdebuginfo
 %{_bindir}/fdebugrpm
 %{_bindir}/fexe
+%{_bindir}/fhpd
 %{_bindir}/fltrace
-%{_bindir}/ftrace
-%{_bindir}/fstack
-%{_bindir}/fcore
 %{_bindir}/fparser
+%{_bindir}/fstack
 %{_bindir}/fstep
-%{_bindir}/fcatch
-%{_bindir}/fhpd
+%{_bindir}/ftrace
+
 %{_libdir}/libfrysk-antlr.so
 %{_libdir}/libfrysk-cdtparser.so
 %{_libdir}/libfrysk-core.so
 %{_libdir}/libfrysk-getopt.so
-%{_libdir}/libfrysk-sys.so
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
+%{_libdir}/libfrysk-sys.so
+
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/messages.properties
+
 %{_mandir}/man1/*
 
 %files devel
+
 %defattr(-,root,root)
+
 %{_libdir}/libfrysk-junit.so
+
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/funit*
+%{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/ftail
+%{_libdir}/%{name}/funit*
 %{_libdir}/%{name}/hpd-c
-%{_libdir}/%{name}/test1
-%{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/sys-tests
+%{_libdir}/%{name}/test1
 %{_libdir}/%{name}/test_main_looper
+
 %{_datadir}/%{name}/ChangeLog
-%{_datadir}/%{name}/libtest.so
+%{_datadir}/%{name}/dogtail_scripts
 %{_datadir}/%{name}/helloworld.o
-%{_datadir}/%{name}/test_looper.xml
+%{_datadir}/%{name}/libtest.so
 %{_datadir}/%{name}/test-core-*
 %{_datadir}/%{name}/test-exe-*
-# Not installed by current taralls.
-#%dir %{_datadir}/%{name}/test
-#%{_datadir}/%{name}/test/test*
-%{_datadir}/%{name}/dogtail_scripts
+%{_datadir}/%{name}/test_looper.xml
+
 %{_mandir}/man8/*
 
 %files gnome
+
 %defattr(-,root,root)
+
 %{_bindir}/frysk
+
 %{_libdir}/libEggTrayIcon.so
 %{_libdir}/libfrysk-ftk.so
 %{_libdir}/libfrysk-gtk.so
 %{_libdir}/libfrysk-gui.so
 %{_libdir}/libftk*.so
+
 %{_datadir}/%{name}/glade
 %{_datadir}/%{name}/images
-# Move frysk.desktop to docdir.
-#%{_datadir}/applications/frysk.desktop
-%doc frysk.desktop
+
+%{_datadir}/applications/frysk.desktop
+
 %dir %{_datadir}/gnome/help/%{name}
 %{_datadir}/gnome/help/%{name}/*
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-2
+- Install frysk.desktop; but with Hidden=true.
+- Sort files list.
+- Remove trailing period from summaries.
 - Replace ExclusiveArch with ExcludeArch of ppc and ppc64; bug 305611.
 
 * Mon Sep 24 2007 Andrew Cagney <cagney at redhat.com> - 0.0.1.2007.09.24-1



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:15 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:52:15 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252152.l8PLpJ4l025378@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the approveacls acl on libvirt (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:52:17 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 14:52:17 -0700
Subject: [pkgdb] libvirt had acl change status
Message-ID: <200709252152.l8PLqME6025575@bastion.fedora.phx.redhat.com>

Daniel Veillard (veillard) has set the approveacls acl on libvirt (Fedora 7) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From fedora-extras-commits at redhat.com  Tue Sep 25 21:54:05 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Tue, 25 Sep 2007 17:54:05 -0400
Subject: rpms/kernel/devel .cvsignore, 1.694, 1.695 patch-2.6.23-rc7.bz2.sign,
	1.1, NONE
Message-ID: <200709252154.l8PLs5Y0009853@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	.cvsignore 
Removed Files:
	patch-2.6.23-rc7.bz2.sign 
Log Message:
cleanup traces of rc7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- .cvsignore	25 Sep 2007 01:28:29 -0000	1.694
+++ .cvsignore	25 Sep 2007 21:53:32 -0000	1.695
@@ -4,4 +4,3 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc7-git5.bz2


--- patch-2.6.23-rc7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 22:02:05 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:02:05 -0400
Subject: rpms/alex/devel alex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709252202.l8PM25Z7016178@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16139/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alex.spec 
Log Message:
Initial commit



--- NEW FILE alex.spec ---
Name:           alex
Version:        2.1.0
Release:        3%{?dist}
Summary:        The lexer generator for Haskell

Group:          Development/Tools
License:        BSD-like
URL:            http://haskell.org/alex/
Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ghc docbook-style-xsl libxslt

%description
Alex is a tool for generating lexical analysers in Haskell, given a
description of the tokens to be recognised in the form of regular
expressions.  It is similar to the tool lex or flex for C/C++.


%prep
%setup -q


%build
runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
runhaskell Setup.lhs build
cd doc
autoreconf
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make html


%install
rm -rf ${RPM_BUILD_ROOT}
runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc ANNOUNCE LICENSE README TODO doc/alex examples
%{_bindir}/alex
%{_datadir}/alex-%{version}


%changelog
* Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
- apply a few cleanups from Jens Petersen

* Tue Apr 26 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-2
- fix a few style issues

* Fri Jan 19 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-1
- update to 2.1.0
- fix rpmlint errors

* Fri May  6 2005 Jens Petersen <petersen at redhat.com> - 2.0.1-1
- initial packaging for Fedora Haskell based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:24:22 -0000	1.1
+++ .cvsignore	25 Sep 2007 22:01:32 -0000	1.2
@@ -0,0 +1 @@
+alex-2.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:24:22 -0000	1.1
+++ sources	25 Sep 2007 22:01:32 -0000	1.2
@@ -0,0 +1 @@
+17e80d39cc3f1aba28dcea0e358c81e9  alex-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 22:03:35 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:03:35 -0400
Subject: rpms/alex/F-7 alex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200709252203.l8PM3Zc2016332@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16263/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	alex.spec 
Log Message:
Initial commit



--- NEW FILE alex.spec ---
Name:           alex
Version:        2.1.0
Release:        3%{?dist}
Summary:        The lexer generator for Haskell

Group:          Development/Tools
License:        BSD-like
URL:            http://haskell.org/alex/
Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ghc docbook-style-xsl libxslt

%description
Alex is a tool for generating lexical analysers in Haskell, given a
description of the tokens to be recognised in the form of regular
expressions.  It is similar to the tool lex or flex for C/C++.


%prep
%setup -q


%build
runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
runhaskell Setup.lhs build
cd doc
autoreconf
./configure --prefix=%{_prefix} --libdir=%{_libdir}
make html


%install
rm -rf ${RPM_BUILD_ROOT}
runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc ANNOUNCE LICENSE README TODO doc/alex examples
%{_bindir}/alex
%{_datadir}/alex-%{version}


%changelog
* Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
- apply a few cleanups from Jens Petersen

* Tue Apr 26 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-2
- fix a few style issues

* Fri Jan 19 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-1
- update to 2.1.0
- fix rpmlint errors

* Fri May  6 2005 Jens Petersen <petersen at redhat.com> - 2.0.1-1
- initial packaging for Fedora Haskell based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:24:22 -0000	1.1
+++ .cvsignore	25 Sep 2007 22:03:03 -0000	1.2
@@ -0,0 +1 @@
+alex-2.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:24:22 -0000	1.1
+++ sources	25 Sep 2007 22:03:03 -0000	1.2
@@ -0,0 +1 @@
+17e80d39cc3f1aba28dcea0e358c81e9  alex-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 22:10:55 2007
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 25 Sep 2007 18:10:55 -0400
Subject: rpms/octave/devel octave.spec,1.59,1.60
Message-ID: <200709252210.l8PMAtsX016689@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16652

Modified Files:
	octave.spec 
Log Message:
It's /usr/share/octave/octave_packages, and it needs to exist for %ghost



Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- octave.spec	25 Sep 2007 21:00:54 -0000	1.59
+++ octave.spec	25 Sep 2007 22:10:22 -0000	1.60
@@ -99,6 +99,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
+touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
 
 
 %clean
@@ -143,7 +144,7 @@
 %changelog
 * Tue Sep 25 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.14-2
 - Add /usr/share/octave/packages for add on packages and %%ghost 
-  /usr/share/octave/packages/octave_packages
+  /usr/share/octave/octave_packages
 - Add patch for octave package manager that will be going upstream
 
 * Tue Sep 18 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.14-1



From fedora-extras-commits at redhat.com  Tue Sep 25 22:13:58 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:13:58 -0400
Subject: rpms/alex/devel alex.spec,1.1,1.2
Message-ID: <200709252213.l8PMDwMj016806@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16784

Modified Files:
	alex.spec 
Log Message:
Build requires autoconf



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex.spec	25 Sep 2007 22:01:32 -0000	1.1
+++ alex.spec	25 Sep 2007 22:13:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc docbook-style-xsl libxslt
+BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
 %description
 Alex is a tool for generating lexical analysers in Haskell, given a
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
+- build requires autoconf
+
 * Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
 - apply a few cleanups from Jens Petersen
 



From fedora-extras-commits at redhat.com  Tue Sep 25 22:26:05 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 18:26:05 -0400
Subject: rpms/alex/F-7 alex.spec,1.1,1.2
Message-ID: <200709252226.l8PMQ5g8017697@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637

Modified Files:
	alex.spec 
Log Message:
Update to match devel



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/alex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alex.spec	25 Sep 2007 22:03:03 -0000	1.1
+++ alex.spec	25 Sep 2007 22:25:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc docbook-style-xsl libxslt
+BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
 %description
 Alex is a tool for generating lexical analysers in Haskell, given a
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
+- build requires autoconf
+
 * Sun Jul 22 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-3
 - apply a few cleanups from Jens Petersen
 



From fedora-extras-commits at redhat.com  Tue Sep 25 22:59:02 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 18:59:02 -0400
Subject: rpms/hal/devel .cvsignore, 1.49, 1.50 hal.spec, 1.136, 1.137 sources,
	1.51, 1.52
Message-ID: <200709252259.l8PMx2vT020752@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Tue Sep 25 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	31 Aug 2007 21:38:21 -0000	1.49
+++ .cvsignore	25 Sep 2007 22:58:25 -0000	1.50
@@ -42,3 +42,4 @@
 hal-info-20070402.tar.gz
 hal-0.5.10rc1.tar.gz
 hal-0.5.10rc2.tar.gz
+hal-0.5.10.git20070925.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- hal.spec	31 Aug 2007 21:38:22 -0000	1.136
+++ hal.spec	25 Sep 2007 22:58:25 -0000	1.137
@@ -26,9 +26,9 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 0.git20070831%{?dist}
+Release: 0.git20070925%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc2.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20070925.tar.gz
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -232,6 +232,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Sep 25 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070925%{?dist}
+- Update to git snapshot
+
 * Fri Aug 31 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070831%{?dist}
 - Update to upstream 0.5.10rc2 release
 - Drop patches that are upstream already


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	31 Aug 2007 21:38:22 -0000	1.51
+++ sources	25 Sep 2007 22:58:25 -0000	1.52
@@ -1 +1 @@
-fd7770348b4fc52d4df0670f1eeaf806  hal-0.5.10rc2.tar.gz
+65be5918bac6860c931821ffab3b94ec  hal-0.5.10.git20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:02:05 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:02:05 -0400
Subject: rpms/hal-info/devel .cvsignore, 1.5, 1.6 hal-info.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200709252302.l8PN254T026960@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26928

Modified Files:
	.cvsignore hal-info.spec sources 
Log Message:
* Fri Sep 25 2007 David Zeuthen <davidz at redhat.com> - 20070925-1%{?dist}
- Update to latest release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2007 21:37:31 -0000	1.5
+++ .cvsignore	25 Sep 2007 23:01:32 -0000	1.6
@@ -1,3 +1,4 @@
 hal-info-20070516.tar.gz
 hal-info-20070725.tar.gz
 hal-info-20070831.tar.gz
+hal-info-20070925.tar.gz


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hal-info.spec	31 Aug 2007 21:37:31 -0000	1.7
+++ hal-info.spec	25 Sep 2007 23:01:32 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Device information files for HAL
 Name: hal-info
-Version: 20070831
+Version: 20070925
 Release: 1%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -35,6 +35,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Fri Sep 25 2007 David Zeuthen <davidz at redhat.com> - 20070925-1%{?dist}
+- Update to latest release.
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 20070831-1%{?dist}
 - Update to latest release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Aug 2007 21:37:31 -0000	1.5
+++ sources	25 Sep 2007 23:01:32 -0000	1.6
@@ -1 +1 @@
-4e09c4a4a3f7e01d8b592eb75eca9006  hal-info-20070831.tar.gz
+df026b02f47957a7e47055a649930cff  hal-info-20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:06:09 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 25 Sep 2007 19:06:09 -0400
Subject: rpms/gwget/devel gwget-0.99-epiphany220.patch, NONE, 1.1 gwget.spec,
	1.21, 1.22 gwget-0.99-epiphany219.patch, 1.1, NONE
Message-ID: <200709252306.l8PN694P027313@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207

Modified Files:
	gwget.spec 
Added Files:
	gwget-0.99-epiphany220.patch 
Removed Files:
	gwget-0.99-epiphany219.patch 
Log Message:
* Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
- Build against epiphany 2.20


gwget-0.99-epiphany220.patch:

--- NEW FILE gwget-0.99-epiphany220.patch ---
--- gwget-0.99/configure.in.orig	2007-06-09 20:51:03.000000000 +0200
+++ gwget-0.99/configure.in	2007-06-09 20:56:14.000000000 +0200
@@ -97,14 +97,18 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18 or 2.19 or 2.20
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
-	EPHY_VER=2.18
+if pkg-config --exists epiphany-2.20; then
+	EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+        EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+        EPHY_VER=2.18
 elif pkg-config --exists epiphany-2.17; then
         EPHY_VER=2.17
 elif pkg-config --exists epiphany-2.16; then
@@ -170,13 +174,21 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.18
           EPIPHANY_REQUIRED=2.18
 	  EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.19
+          EPIPHANY_REQUIRED=2.19
+	  EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.20
+          EPIPHANY_REQUIRED=2.20
+	  EPIPHANY_SHORTVER=220
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219 or 220)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwget.spec	26 Aug 2007 22:20:20 -0000	1.21
+++ gwget.spec	25 Sep 2007 23:05:33 -0000	1.22
@@ -1,8 +1,8 @@
-%define epimajor 2.19
+%define epimajor 2.20
 
 Name:		gwget
 Version:	0.99
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
@@ -100,42 +100,45 @@
 
 
 %changelog
-* Sat Aug 25 2007 Christoph Wickert <fedora at christoph-wickert de> - 0.99-2
+* Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
+- Build against epiphany 2.20
+
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-2
 - Run intltoolize to get locales installed properly with intltool 0.36.1
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora at christoph-wickert de> 0.99-1
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-1
 - Update to 0.99
 - Add support for epiphany 2.19
 - Update desktop file
 
-* Thu May 17 2007 Christoph Wickert <fedora at christoph-wickert de> 0.98.2-2
+* Thu May 17 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-2
 - Rebuild for Fedora 7
 - Add support for epiphany 2.18
 
-* Sat Nov 11 2006 Christoph Wickert <fedora at christoph-wickert de> 0.98.2-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-1
 - Update to 0.98.2.
 - Don't crash notification area (#213480).
 - Add support for epiphany 2.17.
 
-* Fri Sep 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.98.1-1
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.1-1
 - Update to 0.98.1.
 - BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
 
-* Fri Sep 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-7
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.16.
 - disable-static instead of removing .a files.
 - BuildRequire intltool instead of perl(XML::Parser).
 
-* Sat Jul 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-6
+* Sat Jul 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-6
 - Fix BR to build in minimal build environment (#198919).
 - Add patch to build against epiphany 2.15.
 
-* Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-5
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-5
 - bump release to fix broken upgrade path FE5 -> FE6.
 
-* Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-4
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-4
 - fix %%defattr.
 - fix summary and description of epiphany-extension subpackage.
 - fix BR of epiphany-extension subpackage.


--- gwget-0.99-epiphany219.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:06:16 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:06:16 -0400
Subject: rpms/PolicyKit/devel .cvsignore, 1.3, 1.4 PolicyKit.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200709252306.l8PN6GtE027325@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	.cvsignore PolicyKit.spec sources 
Log Message:
* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2007 20:43:37 -0000	1.3
+++ .cvsignore	25 Sep 2007 23:05:44 -0000	1.4
@@ -1,2 +1,3 @@
 PolicyKit-0.5.git20070731.tar.gz
 PolicyKit-0.5.tar.gz
+PolicyKit-0.6.git20070925.tar.gz


Index: PolicyKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/PolicyKit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PolicyKit.spec	1 Sep 2007 02:13:04 -0000	1.4
+++ PolicyKit.spec	25 Sep 2007 23:05:44 -0000	1.5
@@ -13,12 +13,12 @@
 
 Summary: Toolkit for privilege control
 Name: PolicyKit
-Version: 0.5
-Release: 3%{?dist}
+Version: 0.6
+Release: 0.git20070925%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20070925.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -141,6 +141,9 @@
 %{_datadir}/gtk-doc/html/polkit/*
 
 %changelog
+* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
+- Update to git snapshot
+
 * Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2007 20:43:37 -0000	1.3
+++ sources	25 Sep 2007 23:05:44 -0000	1.4
@@ -1 +1 @@
-e5632c984df948edffb49659e76b6e96  PolicyKit-0.5.tar.gz
+b9678c3ec3f85e6dec46560820a3552c  PolicyKit-0.6.git20070925.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:07:21 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 19:07:21 -0400
Subject: rpms/kernel/devel config-generic,1.28,1.29 kernel.spec,1.186,1.187
Message-ID: <200709252307.l8PN7La8027531@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27402

Modified Files:
	config-generic kernel.spec 
Log Message:
* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
- Disable RTC_HCTOSYS. The initscripts already do this for us.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-generic	24 Sep 2007 21:55:27 -0000	1.28
+++ config-generic	25 Sep 2007 23:06:48 -0000	1.29
@@ -1871,7 +1871,7 @@
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
+# CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kernel.spec	25 Sep 2007 19:51:00 -0000	1.186
+++ kernel.spec	25 Sep 2007 23:06:48 -0000	1.187
@@ -1812,6 +1812,9 @@
 
 %changelog
 * Tue Sep 25 2007 Dave Jones <davej at redhat.com>
+- Disable RTC_HCTOSYS. The initscripts already do this for us.
+
+* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
 - x86-64: Disable local APIC timer use on AMD systems with C1E.
 
 * Mon Sep 24 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Tue Sep 25 23:09:50 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:09:50 -0400
Subject: rpms/PolicyKit-gnome/devel .cvsignore, 1.3, 1.4 PolicyKit-gnome.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200709252309.l8PN9oiu027656@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631

Modified Files:
	.cvsignore PolicyKit-gnome.spec sources 
Log Message:
* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2007 20:46:49 -0000	1.3
+++ .cvsignore	25 Sep 2007 23:09:17 -0000	1.4
@@ -1,2 +1,3 @@
 PolicyKit-gnome-0.5.git20070731.tar.bz2
 PolicyKit-gnome-0.5.tar.bz2
+PolicyKit-gnome-0.6.git20070925.tar.bz2







From fedora-extras-commits at redhat.com  Tue Sep 25 23:10:25 2007
From: fedora-extras-commits at redhat.com (David Zeuthen (davidz))
Date: Tue, 25 Sep 2007 19:10:25 -0400
Subject: rpms/PolicyKit-gnome/devel PolicyKit-gnome.spec,1.10,1.11
Message-ID: <200709252310.l8PNAPWw027682@cvs-int.fedora.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27657

Modified Files:
	PolicyKit-gnome.spec 
Log Message:
* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
- Update to git snapshot




Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PolicyKit-gnome.spec	25 Sep 2007 23:09:17 -0000	1.10
+++ PolicyKit-gnome.spec	25 Sep 2007 23:09:53 -0000	1.11
@@ -80,7 +80,7 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
-* Fri Aug 31 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
+* Tue Sep 25 2007 David Zeuthen <davidz at redhat.com> - 0.6-0.git20070925%{?dist}
 - Update to git snapshot
 
 * Mon Sep  3 2007 Matthias Clasen <mclasen at redhat.com> - 0.5-4



From fedora-extras-commits at redhat.com  Tue Sep 25 23:11:17 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 25 Sep 2007 19:11:17 -0400
Subject: rpms/python-turbokid/F-7 .cvsignore, 1.4, 1.5 python-turbokid.spec, 
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200709252311.l8PNBHaJ027800@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-turbokid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27704

Modified Files:
	.cvsignore python-turbokid.spec sources 
Log Message:
1.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 May 2007 07:47:14 -0000	1.4
+++ .cvsignore	25 Sep 2007 23:10:43 -0000	1.5
@@ -1 +1 @@
-TurboKid-1.0.1.tar.gz
+TurboKid-1.0.3.tar.gz


Index: python-turbokid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/python-turbokid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-turbokid.spec	5 May 2007 07:47:14 -0000	1.6
+++ python-turbokid.spec	25 Sep 2007 23:10:43 -0000	1.7
@@ -4,7 +4,7 @@
 %define module turbokid
 
 Name:           python-turbokid
-Version:        1.0.1
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Python template plugin that supports Kid templates
 
@@ -15,8 +15,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-setuptools python-devel
-Requires:       python-kid >= 0.9.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires:       python-kid >= 0.9.6
 
 %description
 This package provides a template engine plugin, allowing you
@@ -49,6 +54,15 @@
 
 
 %changelog
+* Sat Sep 22 2007 Luke Macken <lmacken at redhat.com> - 1.0.3-1
+- 1.0.3
+
+* Sun Sep  2 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-2
+- Update for python-setuptools changes in rawhide
+
+* Sat Aug 18 2007 Luke Macken <lmacken at redhat.com> - 1.0.2-1
+- 1.0.2
+
 * Thu May  3 2007 Luke Macken <lmacken at redhat.com> - 1.0.1-1
 - 1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-turbokid/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 May 2007 07:47:14 -0000	1.4
+++ sources	25 Sep 2007 23:10:43 -0000	1.5
@@ -1 +1 @@
-8c63833c66990379d3f05bece0687b12  TurboKid-1.0.1.tar.gz
+405376c3b16091b76fb6554a5506bc0b  TurboKid-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:11 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:11 -0700
Subject: [pkgdb] makehuman was added for kwizart
Message-ID: <200709252313.l8PNDGIA027627@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package makehuman with summary Modeling of three-dimensional humanoid characters
Kevin Fenzi (kevin) has approved Package makehuman
Kevin Fenzi (kevin) has added a Fedora devel branch for makehuman with an owner of kwizart
Kevin Fenzi (kevin) has approved makehuman in Fedora devel
Kevin Fenzi (kevin) has approved Package makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, devel) updated by kevin
Message-ID: <200709252313.l8PNDaDs027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, 6) updated by kevin
Message-ID: <200709252313.l8PNDaIl027659@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora, 7) updated by kevin
Message-ID: <200709252313.l8PNDaDv027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora EPEL, 4) updated by kevin
Message-ID: <200709252313.l8PNDaIo027659@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora EPEL 4)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:13:31 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:13:31 -0700
Subject: [pkgdb] makehuman (Fedora EPEL, 5) updated by kevin
Message-ID: <200709252313.l8PNDaE0027658@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for makehuman
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on makehuman (Fedora EPEL 5)
Kevin Fenzi (kevin) Approved cvsextras for commit access on makehuman (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/makehuman



From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:03 -0400
Subject: rpms/makehuman - New directory
Message-ID: <200709252314.l8PNE3wn027913@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman

Log Message:
Directory /cvs/extras/rpms/makehuman added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:06 -0400
Subject: rpms/makehuman/devel - New directory
Message-ID: <200709252314.l8PNE6ZF027927@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman/devel

Log Message:
Directory /cvs/extras/rpms/makehuman/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:09 -0400
Subject: rpms/makehuman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709252314.l8PNE9Jg027954@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman

Added Files:
	Makefile import.log 
Log Message:
Setup of module makehuman


--- NEW FILE Makefile ---
# Top level Makefile for module makehuman
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:14:11 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:14:11 -0400
Subject: rpms/makehuman/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709252314.l8PNEBct027973@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy27881/rpms/makehuman/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module makehuman


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: makehuman
# $Id: Makefile,v 1.1 2007/09/25 23:14:09 kevin Exp $
NAME := makehuman
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 fedora-extras-commits at redhat.com  Tue Sep 25 23:15:31 2007
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Tue, 25 Sep 2007 19:15:31 -0400
Subject: rpms/gdb/devel gdb-6.3-ctorline-20050120.patch, 1.3,
	1.4 gdb-6.3-test-dtorfix-20050121.patch, 1.2,
	1.3 gdb-6.6-buildid-locate.patch, 1.1, 1.2 gdb.spec, 1.246, 1.247
Message-ID: <200709252315.l8PNFVJY028446@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28310

Modified Files:
	gdb-6.3-ctorline-20050120.patch 
	gdb-6.3-test-dtorfix-20050121.patch 
	gdb-6.6-buildid-locate.patch gdb.spec 
Log Message:
* Tue Sep 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-30
- Fix re-setting of the ctors/dtors breakpoints with multiple PCs (BZ 301701).
- Avoid one useless user question in the core files locator (build-id).


gdb-6.3-ctorline-20050120.patch:

Index: gdb-6.3-ctorline-20050120.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ctorline-20050120.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-ctorline-20050120.patch	22 Sep 2007 15:56:10 -0000	1.3
+++ gdb-6.3-ctorline-20050120.patch	25 Sep 2007 23:14:54 -0000	1.4
@@ -29,6 +29,13 @@
 	* breakpoint.c (breakpoint_sals_to_pc): Support more than two returned
 	PC values.
 
+2007-09-25  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* breakpoint.c (breakpoint_sals_to_pc): New parameter ADDR_STRING_P.
+	Expand also *ADDR_STRING_P if multiple PCs were found.
+	(break_command_1, do_captured_breakpoint): Pass also the ADDR_STRING
+	variable to be updated.
+
 Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
 ===================================================================
 --- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 01:30:43.000000000 -0300
@@ -472,9 +479,12 @@
 ===================================================================
 --- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 01:30:53.000000000 -0300
 +++ gdb-6.5/gdb/breakpoint.c	2006-07-11 01:39:20.000000000 -0300
-@@ -5268,10 +5268,44 @@ static void
+@@ -5268,12 +5268,69 @@ static void
+ 
+ static void
  breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
- 		       char *address)
+-		       char *address)
++		       char *address, char ***addr_string_p)
  {    
 -  int i;
 -  for (i = 0; i < sals->nelts; i++)
@@ -498,6 +508,9 @@
 +          struct symtab_and_line *new_sals = 
 +            xmalloc ((sals->nelts + num_pc_values - 1) 
 +                     * sizeof (struct symtab_and_line));
++          char **new_addr_string;
++
++          /* Expand the SALS array.  */
 +          memcpy (new_sals, sals->sals, (i + 1) 
 +                  * sizeof (struct symtab_and_line));
 +	  /* The one returned SALS entry is copied for all the PCs.  */
@@ -513,6 +526,26 @@
 +            {
 +              sals->sals[i + j].pc = pc_list[j];
 +            }
++
++          /* Expand the *ADDR_STRING_P array.  */
++          new_addr_string = xmalloc ((sals->nelts + num_pc_values - 1)
++                                     * sizeof *new_addr_string);
++          memcpy (new_addr_string, *addr_string_p,
++                  (i + 1) * sizeof *new_addr_string);
++          /* The existing *ADDR_STRING_P entry must be deleted for all the
++             multiple PCs as BREAKPOINT_RE_SET currently does not set all the
++             PCs for a sinle line back again.  For NULL values "*0x%x" direct
++             address will be provided by CREATE_BREAKPOINTS.  */
++          xfree ((*addr_string_p)[i]);
++           for (j = 0; j < num_pc_values; ++j)
++             {
++              new_addr_string[i + j] = NULL;
++            }
++          memcpy (&new_addr_string[i + num_pc_values], &(*addr_string_p)[i + 1],
++                  (sals->nelts - (i + num_pc_values)) * sizeof *new_addr_string);
++          xfree (*addr_string_p);
++          *addr_string_p = new_addr_string;
++
 +          incr = num_pc_values;
 +        }
 +
@@ -527,7 +560,7 @@
      {
 +      /* Resolve all line numbers to PC's and verify that the addresses
 +         are ok for the target.  */
-+      breakpoint_sals_to_pc (&sals, addr_start);
++      breakpoint_sals_to_pc (&sals, addr_start, &addr_string);
 +
        /* Make sure that all storage allocated to SALS gets freed.  */
        make_cleanup (xfree, sals.sals);
@@ -544,6 +577,15 @@
    /* Verify that condition can be parsed, before setting any
       breakpoints.  Allocate a separate condition expression for each
       breakpoint. */
+@@ -5665,7 +5688,7 @@ do_captured_breakpoint (struct ui_out *u
+     error (_("Garbage %s following breakpoint address"), address_end);
+ 
+   /* Resolve all line numbers to PC's.  */
+-  breakpoint_sals_to_pc (&sals, args->address);
++  breakpoint_sals_to_pc (&sals, args->address, &addr_string);
+ 
+   /* Verify that conditions can be parsed, before setting any
+      breakpoints.  */
 @@ -5670,14 +5699,16 @@ gdb_breakpoint (char *address, char *con
  void
  resolve_sal_pc (struct symtab_and_line *sal)

gdb-6.3-test-dtorfix-20050121.patch:

Index: gdb-6.3-test-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-dtorfix-20050121.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-test-dtorfix-20050121.patch	22 Sep 2007 15:56:10 -0000	1.2
+++ gdb-6.3-test-dtorfix-20050121.patch	25 Sep 2007 23:14:55 -0000	1.3
@@ -10,6 +10,11 @@
 	* gdb.cp/constructortest.exp, gdb.cp/constructortest.cc: Test also the
 	`$delete' destructor variant.
 
+2007-09-25  Jan Kratochvil <jan.kratochvil at redhat.com>
+
+	* gdb.cp/constructortest.exp: Delete the FIXME workaround of restarting
+	the whole GDB.
+
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc.fix	Fri Jan 21 17:06:56 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.cc	Fri Jan 21 17:05:18 2005
 @@ -0,0 +1,99 @@
@@ -114,7 +119,7 @@
 +}
 --- gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp.fix	Fri Jan 21 17:07:02 2005
 +++ gdb-6.3/gdb/testsuite/gdb.cp/constructortest.exp	Fri Jan 21 17:05:29 2005
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,127 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005, 2007 Free Software Foundation, Inc.
@@ -216,10 +221,6 @@
 +
 +# Test now the $delete destructors.
 +
-+# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
 +runto_main
 +
@@ -240,10 +241,6 @@
 +# Verify that we can break by line number in a destructor and find
 +# the $delete occurence
 +
-+# FIXME: Without the full GDB restart we would hit a GDB memory corruption.
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
 +gdb_load ${binfile}
 +runto_main
 +

gdb-6.6-buildid-locate.patch:

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.6-buildid-locate.patch	28 Aug 2007 14:46:38 -0000	1.1
+++ gdb-6.6-buildid-locate.patch	25 Sep 2007 23:14:55 -0000	1.2
@@ -35,7 +35,7 @@
  
  
  #ifndef O_LARGEFILE
-@@ -253,6 +257,70 @@ add_to_thread_list (bfd *abfd, asection 
+@@ -253,6 +257,63 @@ add_to_thread_list (bfd *abfd, asection 
      inferior_ptid = pid_to_ptid (thread_id);	/* Yes, make it current */
  }
  
@@ -93,30 +93,28 @@
 +
 +  xfree (exec_filename);
 +
-+  if (exec_filename != NULL)
-+    {
-+#ifdef SOLIB_ADD
-+      SOLIB_ADD (NULL, 0, &current_target, auto_solib_add);
-+#else
-+      solib_add (NULL, 0, &current_target, auto_solib_add);
-+#endif
-+    }
++  /* No automatic SOLIB_ADD as the libraries would get read twice.  */
 +}
 +
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -377,6 +445,10 @@ core_open (char *filename, int from_tty)
-       /* Fetch all registers from core file.  */
-       target_fetch_registers (-1);
- 
-+      /* Find build_id identifiers.  */
+@@ -417,6 +420,15 @@ core_open (char *filename, int from_tty)
+   ontop = !push_target (&core_ops);
+   discard_cleanups (old_chain);
+ 
++  if (ontop)
++    {
++      /* Find the build_id identifiers.  If it gets executed after
++         POST_CREATE_INFERIOR we would clash with asking to discard the already
++         loaded VDSO symbols.  */
 +      if (build_id_core_loads != 0)
 +        build_id_locate_exec (from_tty);
++    }
 +
-       /* Now, set up the frame cache, and print the top of stack.  */
-       flush_cached_frames ();
-       select_frame (get_current_frame ());
+   /* This is done first, before anything has a chance to query the
+      inferior for information such as symbols.  */
+   post_create_inferior (&core_ops, from_tty);
 @@ -662,4 +734,13 @@ _initialize_corelow (void)
  
    if (!coreops_suppress_target)


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- gdb.spec	23 Sep 2007 15:42:37 -0000	1.246
+++ gdb.spec	25 Sep 2007 23:14:55 -0000	1.247
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 29%{?dist}
+Release: 30%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -687,6 +687,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Sep 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-30
+- Fix re-setting of the ctors/dtors breakpoints with multiple PCs (BZ 301701).
+- Avoid one useless user question in the core files locator (build-id).
+
 * Sun Sep 23 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-29
 - Fixed the kernel VDSO loading (`warning: no loadable sections found in ...').
 - Fix the testcase for pending signals (from BZ 233852).



From fedora-extras-commits at redhat.com  Tue Sep 25 23:16:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:16:28 -0700
Subject: [pkgdb] eclipse-demos was added for overholt
Message-ID: <200709252316.l8PNGYWB027984@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package eclipse-demos with summary Eclipse screencasts
Kevin Fenzi (kevin) has approved Package eclipse-demos
Kevin Fenzi (kevin) has added a Fedora devel branch for eclipse-demos with an owner of overholt
Kevin Fenzi (kevin) has approved eclipse-demos in Fedora devel
Kevin Fenzi (kevin) has approved Package eclipse-demos
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on eclipse-demos (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on eclipse-demos (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on eclipse-demos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-demos



From fedora-extras-commits at redhat.com  Tue Sep 25 23:16:30 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Tue, 25 Sep 2007 16:16:30 -0700
Subject: [pkgdb] eclipse-demos (Fedora, devel) updated by kevin
Message-ID: <200709252316.l8PNGYWF027984@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) approved watchbugzilla on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved watchcommits on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved commit on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved build on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved approveacls on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) approved checkout on eclipse-demos (Fedora devel) for jjohnstn
Kevin Fenzi (kevin) Approved cvsextras for commit access on eclipse-demos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-demos



From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:09 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:09 -0400
Subject: rpms/eclipse-demos - New directory
Message-ID: <200709252317.l8PNH969028542@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos

Log Message:
Directory /cvs/extras/rpms/eclipse-demos added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:17 -0400
Subject: rpms/eclipse-demos/devel - New directory
Message-ID: <200709252317.l8PNHHcA028596@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos/devel

Log Message:
Directory /cvs/extras/rpms/eclipse-demos/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:19 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:19 -0400
Subject: rpms/eclipse-demos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709252317.l8PNHJ3S028621@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos

Added Files:
	Makefile import.log 
Log Message:
Setup of module eclipse-demos


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-demos
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:17:21 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 25 Sep 2007 19:17:21 -0400
Subject: rpms/eclipse-demos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709252317.l8PNHLM9028637@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28511/rpms/eclipse-demos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-demos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-demos
# $Id: Makefile,v 1.1 2007/09/25 23:17:19 kevin Exp $
NAME := eclipse-demos
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 fedora-extras-commits at redhat.com  Tue Sep 25 23:17:44 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Tue, 25 Sep 2007 19:17:44 -0400
Subject: rpms/gcc/F-7 gcc41-artificial-attrib.patch, NONE,
	1.1 gcc41-error-attrib.patch, NONE, 1.1 gcc41-jdwp.patch, NONE,
	1.1 gcc41-pr20880.patch, NONE, 1.1 gcc41-pr32694.patch, NONE,
	1.1 gcc41-pr33506.patch, NONE, 1.1 .cvsignore, 1.207,
	1.208 gcc41.spec, 1.166, 1.167 sources, 1.209,
	1.210 gcc41-builtin-chk-anticipated.patch, 1.1,
	NONE gcc41-builtin-throw.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack-len.patch, 1.1,
	NONE gcc41-builtin-va-arg-pack.patch, 1.2,
	NONE gcc41-c++-gnu_inline.patch, 1.1,
	NONE gcc41-ppc-sync-qihi.patch, 1.1, NONE gcc41-ppc-tramp.patch,
	1.1, NONE gcc41-pr22244.patch, 1.1, NONE gcc41-pr27954.patch,
	1.1, NONE gcc41-pr32678.patch, 1.1, NONE gcc41-pr32912.patch,
	1.1, NONE gcc41-pr33423.patch, 1.1, NONE gcc41-rh253102.patch,
	1.1, NONE gcc41-scanf-fmt-check.patch, 1.1,
	NONE gcc41-sparc-niagara.patch, 1.1, NONE
Message-ID: <200709252317.l8PNHixB028701@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28547

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-artificial-attrib.patch gcc41-error-attrib.patch 
	gcc41-jdwp.patch gcc41-pr20880.patch gcc41-pr32694.patch 
	gcc41-pr33506.patch 
Removed Files:
	gcc41-builtin-chk-anticipated.patch gcc41-builtin-throw.patch 
	gcc41-builtin-va-arg-pack-len.patch 
	gcc41-builtin-va-arg-pack.patch gcc41-c++-gnu_inline.patch 
	gcc41-ppc-sync-qihi.patch gcc41-ppc-tramp.patch 
	gcc41-pr22244.patch gcc41-pr27954.patch gcc41-pr32678.patch 
	gcc41-pr32912.patch gcc41-pr33423.patch gcc41-rh253102.patch 
	gcc41-scanf-fmt-check.patch gcc41-sparc-niagara.patch 
Log Message:
4.1.2-27.fc7

gcc41-artificial-attrib.patch:

--- NEW FILE gcc41-artificial-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* tree.h (block_nonartificial_location): New prototype.
	* tree.c (block_nonartificial_location): New function.
	* dwarf2out.c (gen_subprogram_die): Add DW_AT_artificial
	if artificial attribute is present on abstract inline decl.
	* c-common.c (handle_artificial_attribute): New function.
	(c_common_attribute_table): Add artificial attribute.
	* final.c (override_filename, override_linenum): New variables.
	(final_scan_insn): For DBX_DEBUG or SDB_DEBUG, set override_filename
	and override_linenum if inside of a block inlined from
	__attribute__((__artificial__)) function.
	(notice_source_line): Honor override_filename and override_linenum.
	* doc/extend.texi: Document __attribute__((__artificial__)).
	* config/i386/emmintrin.h: Add __artificial__ attribute to
	all __always_inline__ functions.
	* config/i386/mmintrin.h: Likewise.
	* config/i386/mm3dnow.h: Likewise.
	* config/i386/pmmintrin.h: Likewise.
	* config/i386/ammintrin.h: Likewise.
	* config/i386/xmmintrin.h: Likewise.

--- gcc/doc/extend.texi.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:04:15.000000000 +0200
@@ -1589,7 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline} and @code{externally_visible}.  Several other
+ at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
+Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1671,6 +1672,14 @@ In C++, this attribute does not depend o
 but it still requires the @code{inline} keyword to enable its special
 behavior.
 
+ at cindex @code{artificial} function attribute
+ at item artificial
+This attribute is useful for small inline wrappers which if possible
+should appear during debugging as a unit, depending on the debug
+info format it will either mean marking the function as artificial
+or using the caller location for all instructions within the inlined
+body.
+
 @cindex @code{flatten} function attribute
 @item flatten
 Generally, inlining into a function is limited.  For a function marked with
--- gcc/tree.c.jj	2007-04-03 13:18:26.000000000 +0200
+++ gcc/tree.c	2007-09-25 15:01:49.000000000 +0200
@@ -7638,4 +7638,40 @@ empty_body_p (tree stmt)
   return true;
 }
 
+/* If BLOCK is inlined from an __attribute__((__artificial__))
+   routine, return pointer to location from where it has been
+   called.  */
+location_t *
+block_nonartificial_location (tree block)
+{
+  location_t *ret = NULL;
+
+  while (block && TREE_CODE (block) == BLOCK
+	 && BLOCK_ABSTRACT_ORIGIN (block))
+    {
+      tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+	ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+      if (TREE_CODE (ao) == FUNCTION_DECL)
+	{
+	  /* If AO is an artificial inline, point RET to the
+	     call site locus at which it has been inlined and continue
+	     the loop, in case AO's caller is also an artificial
+	     inline.  */
+	  if (DECL_DECLARED_INLINE_P (ao)
+	      && lookup_attribute ("artificial", DECL_ATTRIBUTES (ao)))
+	    ret = &BLOCK_SOURCE_LOCATION (block);
+	  else
+	    break;
+	}
+      else if (TREE_CODE (ao) != BLOCK)
+	break;
+
+      block = BLOCK_SUPERCONTEXT (block);
+    }
+  return ret;
+}
+
 #include "gt-tree.h"
--- gcc/tree.h.jj	2007-09-25 12:20:12.000000000 +0200
+++ gcc/tree.h	2007-09-25 15:02:37.000000000 +0200
@@ -4270,6 +4270,8 @@ extern tree build_addr (tree, tree);
 extern bool fields_compatible_p (tree, tree);
 extern tree find_compatible_field (tree, tree);
 
+extern location_t *block_nonartificial_location (tree);
+
 /* In function.c */
 extern void expand_main_function (void);
 extern void init_dummy_function_start (void);
--- gcc/final.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/final.c	2007-09-25 15:01:49.000000000 +0200
@@ -141,6 +141,10 @@ static int high_function_linenum;
 /* Filename of last NOTE.  */
 static const char *last_filename;
 
+/* Override filename and line number.  */
+static const char *override_filename;
+static int override_linenum;
+
 /* Whether to force emission of a line note before the next insn.  */
 static bool force_source_line = false;
   
@@ -1822,6 +1826,18 @@ final_scan_insn (rtx insn, FILE *file, i
 	      /* Mark this block as output.  */
 	      TREE_ASM_WRITTEN (NOTE_BLOCK (insn)) = 1;
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      location_t *locus_ptr
+		= block_nonartificial_location (NOTE_BLOCK (insn));
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_BLOCK_END:
@@ -1841,6 +1857,24 @@ final_scan_insn (rtx insn, FILE *file, i
 
 	      (*debug_hooks->end_block) (high_block_linenum, n);
 	    }
+	  if (write_symbols == DBX_DEBUG
+	      || write_symbols == SDB_DEBUG)
+	    {
+	      tree outer_block = BLOCK_SUPERCONTEXT (NOTE_BLOCK (insn));
+	      location_t *locus_ptr
+		= block_nonartificial_location (outer_block);
+
+	      if (locus_ptr != NULL)
+		{
+		  override_filename = LOCATION_FILE (*locus_ptr);
+		  override_linenum = LOCATION_LINE (*locus_ptr);
+		}
+	      else
+		{
+		  override_filename = NULL;
+		  override_linenum = 0;
+		}
+	    }
 	  break;
 
 	case NOTE_INSN_DELETED_LABEL:
@@ -2521,8 +2555,19 @@ final_scan_insn (rtx insn, FILE *file, i
 static bool
 notice_source_line (rtx insn)
 {
-  const char *filename = insn_file (insn);
-  int linenum = insn_line (insn);
+  const char *filename;
+  int linenum;
+
+  if (override_filename)
+    {
+      filename = override_filename;
+      linenum = override_linenum;
+    }
+  else
+    {
+      filename = insn_file (insn);
+      linenum = insn_line (insn);
+    }
 
   if (filename
       && (force_source_line
--- gcc/dwarf2out.c.jj	2007-04-03 13:13:27.000000000 +0200
+++ gcc/dwarf2out.c	2007-09-25 15:01:49.000000000 +0200
@@ -11667,6 +11667,10 @@ gen_subprogram_die (tree decl, dw_die_re
             add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_not_inlined);
 	}
 
+      if (DECL_DECLARED_INLINE_P (decl)
+	  && lookup_attribute ("artificial", DECL_ATTRIBUTES (decl)))
+	add_AT_flag (subr_die, DW_AT_artificial, 1);
+
       equate_decl_number_to_die (decl, subr_die);
     }
   else if (!DECL_EXTERNAL (decl))
--- gcc/c-common.c.jj	2007-03-27 15:40:15.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:01:49.000000000 +0200
@@ -505,8 +505,8 @@ static tree handle_noreturn_attribute (t
 static tree handle_noinline_attribute (tree *, tree, tree, int, bool *);
[...3799 lines suppressed...]
   return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__A, (__v4si)__B);
 }
 
 #if 0
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_extract_epi16 (__m128i const __A, int const __N)
 {
   return __builtin_ia32_vec_ext_v8hi ((__v8hi)__A, __N);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_insert_epi16 (__m128i const __A, int const __D, int const __N)
 {
   return (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)__A, __D, __N);
@@ -1341,37 +1341,37 @@ _mm_insert_epi16 (__m128i const __A, int
   ((__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)(A), (D), (N)))
 #endif
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_max_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmaxub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epi16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminsw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_min_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pminub128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline int __attribute__((__always_inline__))
+static __inline int __attribute__((__always_inline__, __artificial__))
 _mm_movemask_epi8 (__m128i __A)
 {
   return __builtin_ia32_pmovmskb128 ((__v16qi)__A);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_mulhi_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pmulhuw128 ((__v8hi)__A, (__v8hi)__B);
@@ -1381,67 +1381,67 @@ _mm_mulhi_epu16 (__m128i __A, __m128i __
 #define _mm_shufflelo_epi16(__A, __B) ((__m128i)__builtin_ia32_pshuflw ((__v8hi)__A, __B))
 #define _mm_shuffle_epi32(__A, __B) ((__m128i)__builtin_ia32_pshufd ((__v4si)__A, __B))
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_maskmoveu_si128 (__m128i __A, __m128i __B, char *__C)
 {
   __builtin_ia32_maskmovdqu ((__v16qi)__A, (__v16qi)__B, __C);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgb128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_avg_epu16 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_pavgw128 ((__v8hi)__A, (__v8hi)__B);
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_sad_epu8 (__m128i __A, __m128i __B)
 {
   return (__m128i)__builtin_ia32_psadbw128 ((__v16qi)__A, (__v16qi)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si32 (int *__A, int __B)
 {
   __builtin_ia32_movnti (__A, __B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_si128 (__m128i *__A, __m128i __B)
 {
   __builtin_ia32_movntdq ((__v2di *)__A, (__v2di)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_stream_pd (double *__A, __m128d __B)
 {
   __builtin_ia32_movntpd (__A, (__v2df)__B);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_clflush (void const *__A)
 {
   __builtin_ia32_clflush (__A);
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_lfence (void)
 {
   __builtin_ia32_lfence ();
 }
 
-static __inline void __attribute__((__always_inline__))
+static __inline void __attribute__((__always_inline__, __artificial__))
 _mm_mfence (void)
 {
   __builtin_ia32_mfence ();
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi32_si128 (int __A)
 {
   return _mm_set_epi32 (0, 0, 0, __A);
@@ -1449,14 +1449,14 @@ _mm_cvtsi32_si128 (int __A)
 
 #ifdef __x86_64__
 /* Intel intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
 }
 
 /* Microsoft intrinsic.  */
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_cvtsi64x_si128 (long long __A)
 {
   return _mm_set_epi64x (0, __A);
@@ -1465,37 +1465,37 @@ _mm_cvtsi64x_si128 (long long __A)
 
 /* Casts between various SP, DP, INT vector types.  Note that these do no
    conversion of values, they just change the type.  */
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castpd_ps(__m128d __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castpd_si128(__m128d __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castps_pd(__m128 __A)
 {
   return (__m128d) __A;
 }
 
-static __inline __m128i __attribute__((__always_inline__))
+static __inline __m128i __attribute__((__always_inline__, __artificial__))
 _mm_castps_si128(__m128 __A)
 {
   return (__m128i) __A;
 }
 
-static __inline __m128 __attribute__((__always_inline__))
+static __inline __m128 __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_ps(__m128i __A)
 {
   return (__m128) __A;
 }
 
-static __inline __m128d __attribute__((__always_inline__))
+static __inline __m128d __attribute__((__always_inline__, __artificial__))
 _mm_castsi128_pd(__m128i __A)
 {
   return (__m128d) __A;

gcc41-error-attrib.patch:

--- NEW FILE gcc41-error-attrib.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

	* expr.c (expand_expr_real_1) <case CALL_EXPR>: Use get_callee_fndecl
	instead of checking CALL_EXPR_FN directly to test for builtins.
	If error or warning attributes are present, print
	error resp. warning.
	* c-common.c (handle_error_attribute): New function.
	(c_common_attribute_table): Add error and warning
	attributes.
	* doc/extend.texi: Document error and warning attributes.

	* gcc.dg/va-arg-pack-len-1.c: Use error and warning
	attributes.
	* gcc.dg/va-arg-pack-len-2.c: New test.
	* g++.dg/ext/va-arg-pack-len-1.C: Use error and warning
	attributes.
	* g++.dg/ext/va-arg-pack-len-2.C: New test.

--- gcc/doc/extend.texi.jj	2007-09-25 15:04:15.000000000 +0200
+++ gcc/doc/extend.texi	2007-09-25 15:32:22.000000000 +0200
@@ -1589,8 +1589,8 @@ attributes are currently defined for fun
 @code{section}, @code{constructor}, @code{destructor}, @code{used},
 @code{unused}, @code{deprecated}, @code{weak}, @code{malloc},
 @code{alias}, @code{warn_unused_result}, @code{nonnull},
- at code{gnu_inline}, @code{externally_visible} and @code{artificial}.
-Several other
+ at code{gnu_inline}, @code{externally_visible}, @code{artificial},
+ at code{error} and @code{warning}.  Several other
 attributes are defined for functions on particular target systems.  Other
 attributes, including @code{section} are supported for variables declarations
 (@pxref{Variable Attributes}) and for types (@pxref{Type Attributes}).
@@ -1688,6 +1688,30 @@ Whether the function itself is considere
 the current inlining parameters.  The @code{flatten} attribute only works
 reliably in unit-at-a-time mode.
 
+ at item error ("@var{message}")
+ at cindex @code{error} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, an error
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions where checking the inline function arguments is not
+possible through @code{extern char [(condition) ? 1 : -1];} tricks.
+While it is possible to leave the function undefined and thus invoke
+a link failure, when using this attribute the problem will be diagnosed
+earlier and with exact location of the call even in presence of inline
+functions or when not emitting debugging information.
+
+ at item warning ("@var{message}")
+ at cindex @code{warning} function attribute
+If this attribute is used on a function declaration and a call to such a function
+is not eliminated through dead code elimination or other optimizations, a warning
+which will include @var{message} will be diagnosed.  This is useful
+for compile time checking, especially together with @code{__builtin_constant_p}
+and inline functions.  While it is possible to define the function with
+a message in @code{.gnu.warning*} section, when using this attribute the problem
+will be diagnosed earlier and with exact location of the call even in presence
+of inline functions or when not emitting debugging information.
+
 @item cdecl
 @cindex functions that do pop the argument stack on the 386
 @opindex mrtd
--- gcc/expr.c.jj	2007-09-25 14:58:40.000000000 +0200
+++ gcc/expr.c	2007-09-25 15:19:15.000000000 +0200
@@ -7513,19 +7513,31 @@ expand_expr_real_1 (tree exp, rtx target
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
 	error ("invalid use of %<__builtin_va_arg_pack ()%>");
-      /* Check for a built-in function.  */
-      if (TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR
-	  && (TREE_CODE (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == FUNCTION_DECL)
-	  && DECL_BUILT_IN (TREE_OPERAND (TREE_OPERAND (exp, 0), 0)))
-	{
-	  if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
-	      == BUILT_IN_FRONTEND)
-	    return lang_hooks.expand_expr (exp, original_target,
-					   tmode, modifier,
-					   alt_rtl);
-	  else
-	    return expand_builtin (exp, target, subtarget, tmode, ignore);
+      {
+	tree fndecl = get_callee_fndecl (exp), attr;
+
+	if (fndecl
+	    && (attr = lookup_attribute ("error",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  error ("call to %qs declared with attribute error: %s",
+		 lang_hooks.decl_printable_name (fndecl, 1),
+		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+	if (fndecl
+	    && (attr = lookup_attribute ("warning",
+					 DECL_ATTRIBUTES (fndecl))) != NULL)
+	  warning (0, "call to %qs declared with attribute warning: %s",
+		   lang_hooks.decl_printable_name (fndecl, 1),
+		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
+
+	/* Check for a built-in function.  */
+	if (fndecl && DECL_BUILT_IN (fndecl))
+	  {
+	    if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_FRONTEND)
+	      return lang_hooks.expand_expr (exp, original_target,
+					     tmode, modifier, alt_rtl);
+	    else
+	      return expand_builtin (exp, target, subtarget, tmode, ignore);
+	  }
 	}
 
       return expand_call (exp, target, ignore);
--- gcc/c-common.c.jj	2007-09-25 15:01:49.000000000 +0200
+++ gcc/c-common.c	2007-09-25 15:24:34.000000000 +0200
@@ -508,6 +508,7 @@ static tree handle_always_inline_attribu
 static tree handle_gnu_inline_attribute (tree *, tree, tree, int, bool *);
 static tree handle_artificial_attribute (tree *, tree, tree, int, bool *);
 static tree handle_flatten_attribute (tree *, tree, tree, int, bool *);
+static tree handle_error_attribute (tree *, tree, tree, int, bool *);
 static tree handle_used_attribute (tree *, tree, tree, int, bool *);
 static tree handle_unused_attribute (tree *, tree, tree, int, bool *);
 static tree handle_externally_visible_attribute (tree *, tree, tree, int,
@@ -641,6 +642,10 @@ const struct attribute_spec c_common_att
 			      handle_warn_unused_result_attribute },
   { "sentinel",               0, 1, false, true, true,
 			      handle_sentinel_attribute },
+  { "warning",		      1, 1, true,  false, false,
+			      handle_error_attribute },
+  { "error",		      1, 1, true,  false, false,
+			      handle_error_attribute },
   { NULL,                     0, 0, false, false, false, NULL }
 };
 
@@ -4226,6 +4231,26 @@ handle_flatten_attribute (tree *node, tr
   return NULL_TREE;
 }
 
+/* Handle a "warning" or "error" attribute; arguments as in
+   struct attribute_spec.handler.  */
+
+static tree
+handle_error_attribute (tree *node, tree name, tree args,
+			int ARG_UNUSED (flags), bool *no_add_attrs)
+{
+  if (TREE_CODE (*node) == FUNCTION_DECL
+      || TREE_CODE (TREE_VALUE (args)) == STRING_CST)
+    /* Do nothing else, just set the attribute.  We'll get at
+       it later with lookup_attribute.  */
+    ;
+  else
+    {
+      warning (OPT_Wattributes, "%qE attribute ignored", name);
+      *no_add_attrs = true;
+    }
+
+  return NULL_TREE;
+}
 
 /* Handle a "used" attribute; arguments as in
    struct attribute_spec.handler.  */
--- gcc/testsuite/gcc.dg/va-arg-pack-len-1.c.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-1.c	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern int warn_open_missing_mode (void);
-extern int warn_open_too_many_arguments (void);
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/gcc.dg/va-arg-pack-len-2.c.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/gcc.dg/va-arg-pack-len-2.c	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	/* { dg-warning "called with more than 3" } */
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	/* { dg-error "needs 3 arguments, only 2 were given" } */
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C.jj	2007-09-25 12:23:05.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-1.C	2007-09-25 15:16:03.000000000 +0200
@@ -3,8 +3,10 @@
 
 #include <stdarg.h>
 
-extern "C" int warn_open_missing_mode (void);
-extern "C" int warn_open_too_many_arguments (void);
+extern "C" int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern "C" int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
 extern "C" void abort (void);
 
 char expected_char;
@@ -83,7 +85,7 @@ myopen (const char *path, int oflag, ...
     {
       if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
 	{
-	  warn_open_missing_mode ();
+	  error_open_missing_mode ();
 	  return myopen2 (path, oflag);
 	}
       return myopenva (path, oflag, __builtin_va_arg_pack ());
--- gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C.jj	2007-09-25 15:16:03.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/va-arg-pack-len-2.C	2007-09-25 15:16:03.000000000 +0200
@@ -0,0 +1,42 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
+#include <stdarg.h>
+
+extern int error_open_missing_mode (void)
+  __attribute__((__error__ ("open with O_CREAT needs 3 arguments, only 2 were given")));
+extern int warn_open_too_many_arguments (void)
+  __attribute__((__warning__ ("open called with more than 3 arguments")));
+
+extern int myopen2 (const char *path, int oflag);
+extern int myopenva (const char *path, int oflag, ...);
+
+extern inline __attribute__((always_inline, gnu_inline)) int
+myopen (const char *path, int oflag, ...)
+{
+  if (__builtin_va_arg_pack_len () > 1)
+    warn_open_too_many_arguments ();	// { dg-warning "called with more than 3" }
+
+  if (__builtin_constant_p (oflag))
+    {
+      if ((oflag & 0x40) != 0 && __builtin_va_arg_pack_len () < 1)
+	{
+	  error_open_missing_mode ();	// { dg-error "needs 3 arguments, only 2 were given" }
+	  return myopen2 (path, oflag);
+	}
+      return myopenva (path, oflag, __builtin_va_arg_pack ());
+    }
+
+  if (__builtin_va_arg_pack_len () < 1)
+    return myopen2 (path, oflag);
+
+  return myopenva (path, oflag, __builtin_va_arg_pack ());
+}
+
+int
+main (void)
+{
+  myopen ("h", 0x43);
+  myopen ("i", 0x43, 0644, 0655);
+  return 0;
+}

gcc41-jdwp.patch:

--- NEW FILE gcc41-jdwp.patch ---
2007-09-24  Keith Seitz  <keiths at redhat.com>

	* include/jvm.h (struct natThread): Add new field 'frame'.
	* include/java-interp.h (_Jv_Frame): Use _Jv_ThreadStackPeek,
	_Jv_ThreadStackPop, and _Jv_ThreadStackPush instead of
	java.lang.Thread.frame.
	(~_Jv_Frame): Use _Jv_ThreadStackPop.
	* java/lang/natThread.cc (_Jv_ThreadStackPeek): New function.
	(_Jv_ThreadStackPush): New function.
	(_Jv_ThreadStackPop): New function.
	* java/lang/Thread.java (frame): Remove field to restore
	C++ ABI compatibility.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrames): Use
	_Jv_ThreadStackPeek.
	(getFrame): Likewise.
	* gnu/classpath/jdwp/natVMFrame.cc (getFrameDepth): Likewise.
	* jvmti.cc (getLocalFrame): Likewise.
	(_Jv_JVMTI_GetFrameCount): Likewise.
	(_Jv_JVMTI_GetThreadState): Likewise.
	(_Jv_JVMTI_GetStackTrace): Likewise.
	* interpret.cc (_Jv_ReportJVMTIExceptionThrow): Likewise.
	* headers.txt (java/lang/Thread.h): Prepend declarations
	for _Jv_ThreadStackPeek, _Jv_ThreadStackPush, and _Jv_ThreadStackPop.
	Add as friend functions.
	* jni.cc (_Jv_JNIMethod::call): Push a frame onto the stack when
	calling a JNI method.

--- libjava/interpret.cc	(revision 128603)
+++ libjava/interpret.cc	(working copy)
@@ -1709,7 +1709,7 @@
 _Jv_ReportJVMTIExceptionThrow (jthrowable ex)
 {
   jthread thread = ::java::lang::Thread::currentThread ();
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   jmethodID throw_meth = frame->self->get_method ();
   jlocation throw_loc = -1;
   if (frame->frame_type == frame_interpreter)
--- libjava/include/java-interp.h	(revision 128603)
+++ libjava/include/java-interp.h	(working copy)
@@ -391,14 +391,14 @@
   {
     self = s;
     frame_type = type;
-    next = (_Jv_Frame *) thr->frame;
-    thr->frame = (gnu::gcj::RawData *) this;
+    next = _Jv_ThreadStackPeek (thr);
+    _Jv_ThreadStackPush (thr, this);
     thread = thr;
   }
 
   ~_Jv_Frame ()
   {
-    thread->frame = (gnu::gcj::RawData *) next;
+    _Jv_ThreadStackPop (thread);
   }
 
   int depth ()
--- libjava/include/jvm.h	(revision 128603)
+++ libjava/include/jvm.h	(working copy)
@@ -34,6 +34,8 @@
 
 #include <sysdep/locks.h>
 
+class _Jv_Frame;
+
 /* Macro for possible unused arguments.  */
 #define MAYBE_UNUSED __attribute__((__unused__))
 
@@ -767,6 +769,12 @@
 
   // Each thread has its own JNI object.
   _Jv_JNIEnv *jni_env;
+
+  // Describes the topmost frame in the thread's composite
+  // (interp + JNI) stack. Added here to maintain C++ ABI
+  // compatibility with previous versions. Newer versions
+  // of gcj put this in java/lang/Thread.java.
+  _Jv_Frame *frame;
 };
 
 #endif /* __JAVA_JVM_H__ */
--- libjava/jni.cc	(revision 128603)
+++ libjava/jni.cc	(working copy)
@@ -2343,6 +2343,10 @@
   // Copy over passed-in arguments.
   memcpy (&real_args[offset], args, _this->args_raw_size);
 
+  // Add a frame to the composite (interpreted + JNI) call stack
+  java::lang::Thread *thread = java::lang::Thread::currentThread ();
+  _Jv_NativeFrame nat_frame (_this, thread);
+
   // The actual call to the JNI function.
 #if FFI_NATIVE_RAW_API
   ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
--- libjava/jvmti.cc	(revision 128603)
+++ libjava/jvmti.cc	(working copy)
@@ -228,7 +228,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   
   for (int i = 0; i < depth; i++)
     {    
@@ -516,7 +516,7 @@
   THREAD_CHECK_VALID (thread);
   THREAD_CHECK_IS_ALIVE (thread);
    
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
   (*frame_count) = frame->depth ();
   return JVMTI_ERROR_NONE;
 }
@@ -543,7 +543,7 @@
       if (thread->isInterrupted ())
 	state |= JVMTI_THREAD_STATE_INTERRUPTED;
 
-      _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+      _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
       if (frame != NULL && frame->frame_type == frame_native)
 	state |= JVMTI_THREAD_STATE_IN_NATIVE;
 
@@ -1273,7 +1273,7 @@
   ILLEGAL_ARGUMENT (start_depth >= (*frame_count));
   ILLEGAL_ARGUMENT (start_depth < (-(*frame_count)));
   
-  _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *frame = _Jv_ThreadStackPeek (thread);
 
   // If start_depth is negative use this to determine at what depth to start
   // the trace by adding it to the length of the call stack.  This allows the
--- libjava/headers.txt	(revision 128603)
+++ libjava/headers.txt	(working copy)
@@ -6,6 +6,7 @@
 
 class java/lang/Thread
 prepend class _Jv_JNIEnv;
+prepend class _Jv_Frame;
 prepend #define _JV_NOT_OWNER 1
 prepend #define _JV_INTERRUPTED 2
 prepend _Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();
@@ -17,6 +18,9 @@
 prepend jint _Jv_DetachCurrentThread ();
 prepend struct _Jv_Thread_t;
 prepend _Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);
+prepend _Jv_Frame *_Jv_ThreadStackPeek (java::lang::Thread *thread);
+prepend void _Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+prepend void _Jv_ThreadStackPop (java::lang::Thread *thread);
 friend _Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();
 friend void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
 friend void ::_Jv_ThreadRun (java::lang::Thread* thread);
@@ -24,6 +28,9 @@
 friend java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
 friend java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
 friend jint (::_Jv_DetachCurrentThread) ();
+friend _Jv_Frame *::_Jv_ThreadStackPeek (java::lang::Thread *thread);
+friend void ::_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame);
+friend void ::_Jv_ThreadStackPop (java::lang::Thread *thread);
 
 class java/lang/String
 prepend jchar* _Jv_GetStringChars (jstring str);
--- libjava/gnu/classpath/jdwp/natVMFrame.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMFrame.cc	(working copy)
@@ -181,7 +181,7 @@
 getFrameDepth (_Jv_Frame *frame)
 {
   jint depth = 0;
-  _Jv_Frame *top_frame = (_Jv_Frame *) frame->thread->frame;
+  _Jv_Frame *top_frame = _Jv_ThreadStackPeek (frame->thread);
   jint num_frames = VMVirtualMachine::getFrameCount (frame->thread);
   
   while (frame != top_frame)
--- libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(revision 128603)
+++ libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc	(working copy)
@@ -553,7 +553,7 @@
      
   frame_list = new ::java::util::ArrayList (num_frames);
   
-  _Jv_Frame *vm_frame = reinterpret_cast<_Jv_Frame *> (thread->frame);
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   
   // Take start frames off the top of the stack
   while (vm_frame != NULL && start > 0)
@@ -584,7 +584,7 @@
 {
   using namespace gnu::classpath::jdwp::exception;
   
-  _Jv_Frame *vm_frame = (_Jv_Frame *) thread->frame;
+  _Jv_Frame *vm_frame = _Jv_ThreadStackPeek (thread);
   jint depth = 0;
   _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (frameID); 
   
--- libjava/java/lang/Thread.java	(revision 128603)
+++ libjava/java/lang/Thread.java	(working copy)
@@ -186,9 +186,6 @@
   // This describes the top-most interpreter frame for this thread.
   RawData interp_frame;
   
-  // This describes the top most frame in the composite (interp + JNI) stack
-  RawData frame;
-
   // Current state.
   volatile int state;
 
--- libjava/java/lang/natThread.cc	(revision 128603)
+++ libjava/java/lang/natThread.cc	(working copy)
@@ -15,6 +15,7 @@
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-threads.h>
+#include <java-interp.h>
 
 #include <gnu/gcj/RawDataManaged.h>
 #include <java/lang/Thread.h>
@@ -525,3 +526,25 @@
 
   return 0;
 }
+
+_Jv_Frame *
+_Jv_ThreadStackPeek (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  return nt->frame;
+}
+
+void
+_Jv_ThreadStackPush (java::lang::Thread *thread, _Jv_Frame *frame)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  nt->frame = frame;
+}
+
+void
+_Jv_ThreadStackPop (java::lang::Thread *thread)
+{
+  struct natThread *nt = (natThread *) thread->data;
+  _Jv_Frame *next = nt->frame->next;
+  nt->frame = next;
+}

gcc41-pr20880.patch:

--- NEW FILE gcc41-pr20880.patch ---
2006-11-24  Paul Thomas  <pault at gcc.gnu.org>

	PR fortran/20880
	* parse.c (parse_interface): Error if procedure name is that of
	encompassing scope.

	* gfortran.dg/interface_3a.f90: New test.

--- gcc/fortran/parse.c	(revision 119172)
+++ gcc/fortran/parse.c	(revision 119173)
@@ -1694,6 +1694,7 @@ parse_interface (void)
   gfc_interface_info save;
   gfc_state_data s1, s2;
   gfc_statement st;
+  locus proc_locus;
 
   accept_statement (ST_INTERFACE);
 
@@ -1781,6 +1782,7 @@ loop:
   accept_statement (st);
   prog_unit = gfc_new_block;
   prog_unit->formal_ns = gfc_current_ns;
+  proc_locus = gfc_current_locus;
 
 decl:
   /* Read data declaration statements.  */
@@ -1796,8 +1798,15 @@ decl:
 
   current_interface = save;
   gfc_add_interface (prog_unit);
-
   pop_state ();
+
+  if (current_interface.ns
+	&& current_interface.ns->proc_name
+	&& strcmp (current_interface.ns->proc_name->name,
+		   prog_unit->name) == 0)
+    gfc_error ("INTERFACE procedure '%s' at %L has the same name as the "
+	       "enclosing procedure", prog_unit->name, &proc_locus);
+
   goto loop;
 
 done:
--- gcc/testsuite/gfortran.dg/interface_3a.f90
+++ gcc/testsuite/gfortran.dg/interface_3a.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! Contributed by Joost VandeVondele  <jv244 at cam.ac.uk>
+!
+! This was found whilst investigating => segfault
+subroutine thy_sub (a)
+  interface 
+    subroutine thy_sub (a) ! { dg-error "enclosing procedure" }
+      real a
+    end subroutine
+  end interface
+  real a
+  print *, a
+end subroutine

gcc41-pr32694.patch:

--- NEW FILE gcc41-pr32694.patch ---
2007-09-25  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/32694
	2006-11-08  Roger Sayle  <roger at eyesopen.com>
	* tree-ssa-propagate.c (set_rhs): Verify tcc_comparison the same way
	as tcc_binary.

	* gcc.c-torture/compile/20070925-1.c: New test.

--- gcc/tree-ssa-propagate.c.jj	2007-09-23 19:43:36.000000000 +0200
+++ gcc/tree-ssa-propagate.c	2007-09-25 09:30:50.000000000 +0200
@@ -570,7 +570,8 @@ set_rhs (tree *stmt_p, tree expr)
   ssa_op_iter iter;
 
   /* Verify the constant folded result is valid gimple.  */
-  if (TREE_CODE_CLASS (code) == tcc_binary)
+  if (TREE_CODE_CLASS (code) == tcc_binary
+      || TREE_CODE_CLASS (code) == tcc_comparison)
     {
       if (!is_gimple_val (TREE_OPERAND (expr, 0))
 	  || !is_gimple_val (TREE_OPERAND (expr, 1)))
--- gcc/testsuite/gcc.c-torture/compile/20070925-1.c.jj	2007-09-25 09:28:37.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070925-1.c	2007-09-25 09:29:41.000000000 +0200
@@ -0,0 +1,22 @@
+/* PR tree-optimization/32694 */
+
+typedef signed long long int WordS64;
+typedef unsigned long long int Word64;
+
+int
+foo (Word64 * p)
+{
+  while (1)
+    {
+      WordS64 c = 0x1llu;
+      WordS64 x = *p;
+      if (c >= 0)
+	{
+	  if (x > (WordS64) 0x7FFFFFFFFFFFFFFFll - c)
+	    return 6;
+	}
+      else if (x < (WordS64) 0x8000000000000000ll - c)
+	return 7;
+      p++;
+    }
+}

gcc41-pr33506.patch:

--- NEW FILE gcc41-pr33506.patch ---
2007-09-21  Jakub Jelinek  <jakub at redhat.com>

	PR c++/33506
	* langhooks.h (struct lang_hooks_for_types): Add type_hash_eq
	field.
	* langhooks.c (lhd_type_hash_eq): New function.
	* langhooks-def.h (lhd_type_hash_eq): New prototype.
	(LANG_HOOKS_TYPE_HASH_EQ): Define.
	(LANG_HOOKS_FOR_TYPES_INITIALIZER): Add LANG_HOOKS_TYPE_HASH_EQ.
	* tree.c (type_hash_eq): For FUNCTION_TYPE use
	lang_hooks.type.type_hash_eq in addition to generic tests.

	* cp-tree.h (cxx_type_hash_eq): New prototype.
	* cp-objcp-common.h (LANG_HOOKS_TYPE_HASH_EQ): Redefine.
	* tree.c (cxx_type_hash_eq): New function.

	* g++.dg/ext/attrib29.C: New test.

--- gcc/langhooks.h.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.h	2007-09-22 03:46:10.000000000 -0400
@@ -148,6 +148,10 @@ struct lang_hooks_for_types
      firstprivate variables.  */
   void (*omp_firstprivatize_type_sizes) (struct gimplify_omp_ctx *, tree);
 
+  /* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+     Called only after doing all language independent checks.  */
+  bool (*type_hash_eq) (tree, tree);
+
   /* Nonzero if types that are identical are to be hashed so that only
      one copy is kept.  If a language requires unique types for each
      user-specified type, such as Ada, this should be set to TRUE.  */
--- gcc/langhooks.c.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/langhooks.c	2007-09-22 03:46:10.000000000 -0400
@@ -411,6 +411,16 @@ lhd_tree_dump_type_quals (tree t)
 /* lang_hooks.expr_size: Determine the size of the value of an expression T
    in a language-specific way.  Returns a tree for the size in bytes.  */
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  */
+
+bool
+lhd_type_hash_eq (tree typea ATTRIBUTE_UNUSED,
+		  tree typeb ATTRIBUTE_UNUSED)
+{
+  return true;
+}
+
 tree
 lhd_expr_size (tree exp)
 {
--- gcc/langhooks-def.h.jj	2007-02-20 16:39:13.000000000 -0500
+++ gcc/langhooks-def.h	2007-09-22 03:46:56.000000000 -0400
@@ -70,6 +70,7 @@ extern tree lhd_expr_size (tree);
 extern size_t lhd_tree_size (enum tree_code);
 extern HOST_WIDE_INT lhd_to_target_charset (HOST_WIDE_INT);
 extern tree lhd_expr_to_decl (tree, bool *, bool *, bool *);
+extern bool lhd_type_hash_eq (tree, tree);
 
 /* Declarations of default tree inlining hooks.  */
 extern tree lhd_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
@@ -220,6 +221,7 @@ extern tree lhd_make_node (enum tree_cod
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
 #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \
   lhd_omp_firstprivatize_type_sizes
+#define LANG_HOOKS_TYPE_HASH_EQ		lhd_type_hash_eq
 #define LANG_HOOKS_HASH_TYPES		true
 
 #define LANG_HOOKS_FOR_TYPES_INITIALIZER { \
@@ -234,6 +236,7 @@ extern tree lhd_make_node (enum tree_cod
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
   LANG_HOOKS_TYPE_MAX_SIZE, \
   LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES, \
+  LANG_HOOKS_TYPE_HASH_EQ, \
   LANG_HOOKS_HASH_TYPES \
 }
 
--- gcc/tree.c.jj	2007-04-03 07:18:26.000000000 -0400
+++ gcc/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -4168,17 +4168,21 @@ type_hash_eq (const void *va, const void
 				      TYPE_FIELDS (b->type))));
 
     case FUNCTION_TYPE:
-      return (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
-	      || (TYPE_ARG_TYPES (a->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
-		  && TYPE_ARG_TYPES (b->type)
-		  && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
-		  && type_list_equal (TYPE_ARG_TYPES (a->type),
-				      TYPE_ARG_TYPES (b->type))));
+      if (TYPE_ARG_TYPES (a->type) == TYPE_ARG_TYPES (b->type)
+	  || (TYPE_ARG_TYPES (a->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (a->type)) == TREE_LIST
+	      && TYPE_ARG_TYPES (b->type)
+	      && TREE_CODE (TYPE_ARG_TYPES (b->type)) == TREE_LIST
+	      && type_list_equal (TYPE_ARG_TYPES (a->type),
+				  TYPE_ARG_TYPES (b->type))))
+	break;
+      return 0;
 
     default:
       return 0;
     }
+
+  return lang_hooks.types.type_hash_eq (a->type, b->type);
 }
 
 /* Return the cached hash value.  */
--- gcc/cp/cp-tree.h.jj	2007-06-26 07:57:09.000000000 -0400
+++ gcc/cp/cp-tree.h	2007-09-22 03:50:22.000000000 -0400
@@ -4421,7 +4421,8 @@ extern tree cp_add_pending_fn_decls		(vo
 extern int cp_auto_var_in_fn_p			(tree,tree);
 extern tree fold_if_not_in_template		(tree);
 extern tree rvalue                              (tree);
-   
+extern bool cxx_type_hash_eq			(tree, tree);
+
 /* in typeck.c */
 extern int string_conv_p			(tree, tree, int);
 extern tree cp_truthvalue_conversion		(tree);
--- gcc/cp/cp-objcp-common.h.jj	2007-02-20 16:37:34.000000000 -0500
+++ gcc/cp/cp-objcp-common.h	2007-09-22 03:49:38.000000000 -0400
@@ -85,6 +85,8 @@ extern tree objcp_tsubst_copy_and_build 
 #define LANG_HOOKS_WRITE_GLOBALS lhd_do_nothing
 #undef LANG_HOOKS_COMDAT_GROUP
 #define LANG_HOOKS_COMDAT_GROUP cxx_comdat_group
+#undef LANG_HOOKS_TYPE_HASH_EQ                                                                                          
+#define LANG_HOOKS_TYPE_HASH_EQ cxx_type_hash_eq
 
 #undef LANG_HOOKS_FUNCTION_INIT
 #define LANG_HOOKS_FUNCTION_INIT cxx_push_function_context
--- gcc/cp/tree.c.jj	2007-03-12 03:28:01.000000000 -0400
+++ gcc/cp/tree.c	2007-09-22 03:46:10.000000000 -0400
@@ -1959,6 +1959,22 @@ cp_build_type_attribute_variant (tree ty
   return new_type;
 }
 
+/* Return TRUE if TYPE1 and TYPE2 are identical for type hashing purposes.
+   Called only after doing all language independent checks.  Only
+   to check TYPE_RAISES_EXCEPTIONS for FUNCTION_TYPE, the rest is already
+   compared in type_hash_eq.  */
+
+bool
+cxx_type_hash_eq (tree typea, tree typeb)
+{
+  if (TREE_CODE (typea) != FUNCTION_TYPE
+      || TYPE_RAISES_EXCEPTIONS (typea) == TYPE_RAISES_EXCEPTIONS (typeb))
+    return true;
+
+  return comp_except_specs (TYPE_RAISES_EXCEPTIONS (typea),
+			    TYPE_RAISES_EXCEPTIONS (typeb), 1);
+}
+
 /* Apply FUNC to all language-specific sub-trees of TP in a pre-order
    traversal.  Called from walk_tree.  */
 
--- gcc/testsuite/g++.dg/ext/attrib29.C.jj	2007-09-22 03:46:10.000000000 -0400
+++ gcc/testsuite/g++.dg/ext/attrib29.C	2007-09-22 03:46:10.000000000 -0400
@@ -0,0 +1,10 @@
+// PR c++/33506
+// { dg-do compile }
+
+extern int f1 (char *) __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw () __attribute__ ((warn_unused_result));
+extern int f2 (char *) throw ();
+
+extern int f3 (char *) __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw () __attribute__ ((nonnull (1)));
+extern int f4 (char *) throw ();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/.cvsignore,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- .cvsignore	27 Aug 2007 11:08:53 -0000	1.207
+++ .cvsignore	25 Sep 2007 23:17:10 -0000	1.208
@@ -1 +1 @@
-gcc-4.1.2-20070821.tar.bz2
+gcc-4.1.2-20070925.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/gcc41.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gcc41.spec	17 Sep 2007 22:10:17 -0000	1.166
+++ gcc41.spec	25 Sep 2007 23:17:11 -0000	1.167
@@ -1,6 +1,6 @@
-%define DATE 20070821
+%define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 24
+%define gcc_release 27
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -136,22 +136,13 @@
 Patch22: gcc41-build-id.patch
 Patch23: gcc41-pr28690.patch
 Patch24: gcc41-rh247256.patch
-Patch25: gcc41-pr22244.patch
-Patch26: gcc41-pr32678.patch
-Patch27: gcc41-pr32912.patch
-Patch28: gcc41-sparc-niagara.patch
-Patch29: gcc41-ppc-tramp.patch
-Patch30: gcc41-rh253102.patch
-Patch31: gcc41-c++-gnu_inline.patch
-Patch32: gcc41-ppc-sync-qihi.patch
-Patch33: gcc41-ppc64-ia64-GNU-stack.patch
-Patch34: gcc41-builtin-chk-anticipated.patch
-Patch35: gcc41-builtin-throw.patch
-Patch36: gcc41-builtin-va-arg-pack.patch
-Patch37: gcc41-builtin-va-arg-pack-len.patch
-Patch38: gcc41-pr27954.patch
-Patch39: gcc41-pr33423.patch
-Patch40: gcc41-scanf-fmt-check.patch
+Patch25: gcc41-ppc64-ia64-GNU-stack.patch
+Patch26: gcc41-pr33506.patch
+Patch27: gcc41-artificial-attrib.patch
+Patch28: gcc41-error-attrib.patch
+Patch29: gcc41-jdwp.patch
+Patch30: gcc41-pr20880.patch
+Patch31: gcc41-pr32694.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -459,22 +450,13 @@
 #%patch22 -p0 -b .build-id~
 %patch23 -p0 -b .pr28690~
 %patch24 -p0 -b .rh247256~
-%patch25 -p0 -b .pr22244~
-%patch26 -p0 -b .pr32678~
-%patch27 -p0 -b .pr32912~
-%patch28 -p0 -b .sparc-niagara~
-%patch29 -p0 -b .ppc-tramp~
-%patch30 -p0 -b .rh253102~
-%patch31 -p0 -b .c++-gnu_inline~
-%patch32 -p0 -b .ppc-sync-qihi~
-%patch33 -p0 -b .ppc64-ia64-GNU-stack~
-%patch34 -p0 -b .builtin-chk-anticipated~
-%patch35 -p0 -b .builtin-throw~
-%patch36 -p0 -b .builtin-va-arg-pack~
-%patch37 -p0 -b .builtin-va-arg-pack-len~
-%patch38 -p0 -b .pr27954~
-%patch39 -p0 -b .pr33423~
-%patch40 -p0 -b .scanf-fmt-check~
+%patch25 -p0 -b .ppc64-ia64-GNU-stack~
+%patch26 -p0 -b .pr33506~
+%patch27 -p0 -b .artificial-attrib~
+%patch28 -p0 -b .error-attrib~
+%patch29 -p0 -b .jdwp~
+%patch30 -p0 -b .pr20880~
+%patch31 -p0 -b .pr32694~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1629,6 +1611,20 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-27.fc7
+- update from gcc-4_1-branch (-r127672:128736)
+  - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,
+	tree-optimization/33142
+- add support for artificial, error and warning attributes
+- restore Java CNI ABI compatibility broken by JDWP changes (Keith Seitz)
+- fix ICE with set_rhs allowing non-gimple (Roger Sayle, #247407,
+  PR tree-optimization/32694)
+- fix ICE on Fortran interface-body declaring current subroutine name
+  (Paul Thomas, #300851, PR fortran/20880)
+- don't ignore throw specification of function types in type hashing
+  (PR c++/33506)
+- handle makeinfo version >= 4.10 in gcc configury
+
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-24.fc7
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until
   expand time and at that point it can avoid a call (PR middle-end/33423)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-7/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- sources	27 Aug 2007 11:08:53 -0000	1.209
+++ sources	25 Sep 2007 23:17:11 -0000	1.210
@@ -1 +1 @@
-65778706d6b9c029a06fca968a45ab7f  gcc-4.1.2-20070821.tar.bz2
+562ab2446c60a9145da385ac56cf7715  gcc-4.1.2-20070925.tar.bz2


--- gcc41-builtin-chk-anticipated.patch DELETED ---


--- gcc41-builtin-throw.patch DELETED ---


--- gcc41-builtin-va-arg-pack-len.patch DELETED ---


--- gcc41-builtin-va-arg-pack.patch DELETED ---


--- gcc41-c++-gnu_inline.patch DELETED ---


--- gcc41-ppc-sync-qihi.patch DELETED ---


--- gcc41-ppc-tramp.patch DELETED ---


--- gcc41-pr22244.patch DELETED ---


--- gcc41-pr27954.patch DELETED ---


--- gcc41-pr32678.patch DELETED ---


--- gcc41-pr32912.patch DELETED ---


--- gcc41-pr33423.patch DELETED ---


--- gcc41-rh253102.patch DELETED ---


--- gcc41-scanf-fmt-check.patch DELETED ---


--- gcc41-sparc-niagara.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:24:18 2007
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 25 Sep 2007 19:24:18 -0400
Subject: rpms/gwget/devel gwget-0.99-epiphany.patch, NONE, 1.1 gwget.spec,
	1.22, 1.23 gwget-0.99-epiphany220.patch, 1.1, NONE
Message-ID: <200709252324.l8PNOI0H029136@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29056

Modified Files:
	gwget.spec 
Added Files:
	gwget-0.99-epiphany.patch 
Removed Files:
	gwget-0.99-epiphany220.patch 
Log Message:
rename patch

gwget-0.99-epiphany.patch:

--- NEW FILE gwget-0.99-epiphany.patch ---
--- gwget-0.99/configure.in.orig	2007-06-09 20:51:03.000000000 +0200
+++ gwget-0.99/configure.in	2007-06-09 20:56:14.000000000 +0200
@@ -97,14 +97,18 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18 or 2.19 or 2.20
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
-	EPHY_VER=2.18
+if pkg-config --exists epiphany-2.20; then
+	EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+        EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+        EPHY_VER=2.18
 elif pkg-config --exists epiphany-2.17; then
         EPHY_VER=2.17
 elif pkg-config --exists epiphany-2.16; then
@@ -170,13 +174,21 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.18
           EPIPHANY_REQUIRED=2.18
 	  EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.19
+          EPIPHANY_REQUIRED=2.19
+	  EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.20
+          EPIPHANY_REQUIRED=2.20
+	  EPIPHANY_SHORTVER=220
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219 or 220)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gwget.spec	25 Sep 2007 23:05:33 -0000	1.22
+++ gwget.spec	25 Sep 2007 23:23:45 -0000	1.23
@@ -10,7 +10,7 @@
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.99/gwget-0.99.tar.bz2
 Source1:	gwget.desktop
-Patch0:		gwget-0.99-epiphany219.patch
+Patch0:		gwget-0.99-epiphany.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0


--- gwget-0.99-epiphany220.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Sep 25 23:32:53 2007
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Sep 2007 19:32:53 -0400
Subject: rpms/cgi-util/devel cgi-util.spec, 1.3,
	1.4 cgi-util-2.2.1-autotools.patch, 1.1, NONE
Message-ID: <200709252332.l8PNWr5T029454@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413/devel

Modified Files:
	cgi-util.spec 
Removed Files:
	cgi-util-2.2.1-autotools.patch 
Log Message:
Resume maintainership.



Index: cgi-util.spec
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/cgi-util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cgi-util.spec	11 Dec 2006 16:36:30 -0000	1.3
+++ cgi-util.spec	25 Sep 2007 23:32:21 -0000	1.4
@@ -1,11 +1,10 @@
 Summary: A C library for creating Common Gateway Interface ("CGI") programs
 Name: cgi-util
 Version: 2.2.1
-Release: 8
-License: LGPL
+Release: 15%{?dist}
+License: LGPLv2+
 Group: System Environment/Libraries
-Source: ftp://ftp.billsgames.com/unix/www/%name/%{name}-%{version}.tar.gz
-Patch0: cgi-util-2.2.1-autotools.patch
+Source: ftp://ftp.billsgames.com/unix/www/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.newbreedsoftware.com/cgi-util/
 
@@ -25,26 +24,18 @@
 needed for developing applications using the cgi-util library.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
-%setup
-%patch0 -p1
-chmod +x configure
+%setup -q
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%{__cc} %{__global_cflags} -Wall -ansi -pedantic -fPIC cgi-util.c -c -o libcgi-util.o
+%{__cc} %{__global_cflags} -shared -Wl,-soname=libcgi-util.so.2 libcgi-util.o -o libcgi-util.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libcgi-util.la
-rm -f ${RPM_BUILD_ROOT}/%{_bindir}/*.cgi
+%{__install} -p -D -m 0755  libcgi-util.so %{buildroot}%{_libdir}/libcgi-util.so.%{version}
+%{__install} -p -D -m 0644  cgi-util.h %{buildroot}%{_includedir}/cgi-util.h
+%{__ln_s} libcgi-util.so.%{version} %{buildroot}%{_libdir}/libcgi-util.so
+%{__ln_s} libcgi-util.so.%{version} %{buildroot}%{_libdir}/libcgi-util.so.2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,16 +45,42 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_libdir}/lib*.so.*
-%doc ChangeLog COPYING INSTALL TODO test.cgi filetest.cgi test.html filetest.html
+%doc CHANGES.txt COPYING.txt TODO.txt
 
 %files devel
 %{_libdir}/lib*.so
 %{_includedir}/cgi-util.h
-%doc README test.c filetest.c
+%doc README.txt test.c filetest.c
 
 %changelog
+* Sun Sep 23 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-15
+   - Use install -p.
+   - Ensure libcgi-util.so.2 is owned by package.
+
+* Sat Sep 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-14
+   - Don't run linker directly.
+
+* Sat Sep 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-13
+   - Write soname to library.
+   - Fix permissions of library.
+   - Library symlink is now relative.
+   - Build using Fedora compilation flags.
+
+* Fri Sep 21 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-12
+   - Don't use autotools patch -- wait for it upstream.
+   - Don't install compiled examples.
+
+* Thu Aug 23 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-10
+   - Modify autotools patch to streamline build.
+
+* Wed Aug 22 2007 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-9
+   - Do not install INSTALL.
+   - Use %%setup -q.
+   - Use %%defattr(-,root,root,-).
+   - Do not use %%makeinstall.
+
 * Thu Sep 07 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-8
    - Rebuild for FC6.
 
@@ -71,8 +88,8 @@
    - Remove *.cgi from bindir.
 
 * Thu Mar 09 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-6
-   - Move test.cgi and filetest.cgi to %doc.
-   - Move README to -devel %doc and add test.c and filetest.c.
+   - Move test.cgi and filetest.cgi to %%doc.
+   - Move README to -devel %%doc and add test.c and filetest.c.
    - Pass --disable-static to configure.
 
 * Thu Feb 23 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-5


--- cgi-util-2.2.1-autotools.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 00:54:14 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 20:54:14 -0400
Subject: comps/po it.po,1.5,1.6
Message-ID: <200709260054.l8Q0sEXs004810@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4784/po

Modified Files:
	it.po 
Log Message:
2007-09-25  Francesco Valente <fvalen at redhat.com> (via fvalen at fedoraproject.org)

  * po/it.po: Updated




Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- it.po	17 Sep 2007 19:22:12 -0000	1.5
+++ it.po	26 Sep 2007 00:53:44 -0000	1.6
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
+"POT-Creation-Date: 2007-09-25 17:44-0700\n"
 "PO-Revision-Date: 2007-03-05 00:33+0100\n"
 "Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
 "Language-Team: italiano <fedora-trans-it at redhat.com>\n"



From fedora-extras-commits at redhat.com  Wed Sep 26 01:06:11 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Tue, 25 Sep 2007 21:06:11 -0400
Subject: comps/po it.po,1.6,1.7
Message-ID: <200709260106.l8Q16BpJ011420@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11403/po

Modified Files:
	it.po 
Log Message:
2007-09-25  Francesco Valente <fvalen at redhat.com> (via fvalen at fedoraproject.org)

  * po/it.po: Updated




Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- it.po	26 Sep 2007 00:53:44 -0000	1.6
+++ it.po	26 Sep 2007 01:05:41 -0000	1.7
@@ -1,3 +1,4 @@
+# translation of it.po to 
 # translation of it.po to italiano
 # translation of it.po to
 # translation of it.po to
@@ -6,29 +7,28 @@
 # translation of it.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
 # Francesco Valente <fvalen at redhat.com>, 2002, 2003, 2004.
 # Lorenzo Stobbione <lorenzo.stobbione at clsengineering.it>, 2004, 2005.
 # Francesco Tombolini <tombo at adamantio.net>, 2006, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-25 17:44-0700\n"
-"PO-Revision-Date: 2007-03-05 00:33+0100\n"
-"Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
-"Language-Team: italiano <fedora-trans-it at redhat.com>\n"
+"PO-Revision-Date: 2007-09-26 03:04+0200\n"
+"Last-Translator: \n"
+"Language-Team:  <it 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"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Un ambiente desktop leggero che funziona bene con macchine di basso livello."
+msgstr "Un ambiente desktop leggero che funziona bene con macchine di basso livello."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -190,13 +190,11 @@
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
 #: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
+msgstr "Installare questi pacchetti per sviluppare le applicazioni grafiche QT e KDE."
 
 #: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74
 #: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30
-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 ""
 "Installare questo gruppo di pacchetti per usare l'interfaccia utente grafica "
 "(X) di base."
@@ -271,10 +269,8 @@
 
 #: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120
 #: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
-msgstr ""
-"Semplici window managers che non sono parte di grandi ambienti desktop."
+msgid "Simple window managers that aren't part of a larger desktop environment."
+msgstr "Semplici window managers che non sono parte di grandi ambienti desktop."
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -298,8 +294,7 @@
 #: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
 #: ../comps-el4.xml.in.h:45
 msgid "Support for developing programs in the Java programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Java."
+msgstr "Supporto per sviluppare programmi nel linguaggio di programmazione Java."
 
 #: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
 #: ../comps-el4.xml.in.h:46
@@ -333,13 +328,11 @@
 #: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
 #: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr ""
-"Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
+msgstr "Questi pacchetti consentono di configurare un server di posta IMAP o SMTP."
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
-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 ""
 "Questi pacchetti sono d'aiuto quando si sviluppano applicazioni web o pagine "
 "web."
@@ -428,16 +421,14 @@
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -445,8 +436,7 @@
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -454,16 +444,14 @@
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-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 ""
 "Questo gruppo ?? una collezione di strumenti per varie utilit?? specifiche "
 "hardware."
@@ -530,8 +518,7 @@
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
 #, fuzzy
-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 ""
 "Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
 "armeni."
@@ -723,8 +710,7 @@
 msgstr "Supporto per l'indonesiano"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr ""
 "Installare questi strumenti per permettere al sistema di stampare o fungere "
 "da server di stampa."
@@ -947,22 +933,19 @@
 msgstr "L'ambiente di sviluppo integrato Eclipse"
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr ""
 "I pacchetti di questo gruppo sono le principali librerie di sviluppo delle "
 "applicazioni."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr ""
 "Questi pacchetti consentono di sviluppare applicazioni per il sistema X "
 "Window."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "Questi pacchetti includono server basati sulla rete come ad esempio DHCP, "
 "Kerberos e NIS."
@@ -981,8 +964,7 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
+msgstr "Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
@@ -1015,8 +997,7 @@
 "di piccoli router/firewall, per esempio."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "Questo gruppo di pacchetti consente di eseguire un server dei nomi DNS "
 "(BIND) sul sistema."
@@ -1146,341 +1127,3 @@
 msgid "Older bitmap and vector fonts packages"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "Supporto per lo Swati"
-
-#~ msgid "Brazilian Support"
-#~ msgstr "Supporto per il brasiliano"
-
-#~ msgid "British Support"
-#~ msgstr "Supporto per l'inglese britannico"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "Supporto compatibilit?? sviluppo fra architetture"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "Supporto compatibilit?? architetture di Mozilla"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? fra architetture"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "Supporto per il cirillico"
-
-#~ msgid "Desktops"
-#~ msgstr "Desktops"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "Supporto ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "Supporto ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "Supporto ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "Supporto ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "Installare questi pacchetti per ricompilare il Kernel."
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "Ambiente desktop KDE"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Sviluppo del kernel"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "Pacchetti vari inclusi"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "Pacchetti di Mozilla per la piattaforma x86"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "Pacchetti di supporto Multilib"
-
-#~ msgid "SQL Database"
-#~ msgstr "Database SQL"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr ""
-#~ "Supporto per lo sviluppo di pacchetti per l'architettura non-primaria"
-
-#~ msgid "Syriac Support"
-#~ msgstr "Supporto per il siriaco"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "Editor di testo GNU Emacs."
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr ""
-#~ "Questi pacchetti consentono di configurare un server di posta IMAP o "
-#~ "Postfix."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "Questi pacchetti forniscono un supporto per la compatibilit?? delle "
-#~ "versioni precedenti di Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "Librerie di sviluppo non supportate"
-
-#~ msgid "Workstation Common"
-#~ msgstr "Workstation Common"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? architettura ppc64"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "Supporto sviluppo compatibilit?? architettura x86"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "Supporto compatibilit?? architettura x86"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "Portoghese Brasiliano"
-
-#~ msgid "English"
-#~ msgstr "Inglese"
-
-#~ msgid "French"
-#~ msgstr "Francese"
-
-#~ msgid "German"
-#~ msgstr "Tedesco"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Documentazione di Red Hat Enterprise Linux 3"
-
-#~ msgid "Spanish"
-#~ msgstr "Spagnolo"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "Portoghese Brasiliano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "inglese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "francese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "tedesco."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "italiano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "spagnolo."
-
-#~ msgid "Japanese"
-#~ msgstr "Giapponese"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "Cinese Semplificato"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "giapponese."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "coreano."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "cinese semplificato."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux in "
-#~ "cinese tradizionale."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "Cinese Tradizionale"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "Supporto sviluppo compatibilit?? architettura ppc64"
-
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
-
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
-
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Red Hat Enterprise Linux 4 Documentation"
-#~ msgstr "Documentazione di Red Hat Enterprise Linux 4"
-
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Bengali language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua bengali."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Gujarati."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Hindi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Punjabi."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "Questo gruppo contiene la documentazione Red Hat Enterprise Linux nella "
-#~ "lingua Tamil."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "Cluster Storage"
-
-#~ msgid "Clustering Support."
-#~ msgstr "Supporto clustering."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "Pacchetti che forniscono supporto per il cluster storage."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "Pacchetti che forniscono supporto per il GFS in nodo singolo."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "Supporto per il GFS a nodo singolo"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr ""
-#~ "Questi pacchetti forniscono supporto per la compatibilit?? verso le "
-#~ "versioni precedenti."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "Ambienti Java runtime e kits di sviluppo"
-
-#~ msgid "Misc"
-#~ msgstr "Miscellanea"
-
-#~ msgid "Misc packages"
-#~ msgstr "Pacchetti miscellanei"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "Applicazioni multimediali"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "Pacchetti che forniscono funzionalit?? aggiuntive per Red Hat Enterprise "
-#~ "Linux."
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "Red Hat Enterprise Linux Extras"
-
-#~ msgid "Workstation"
-#~ msgstr "Workstation"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "Applicazioni ed utilit?? workstation."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "Supporto per la virtualizzazione."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "Compatibilit?? fra architetture"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "Librerie di compatibilit?? fra architetture"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "Pacchetti di libreria Multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr ""
-#~ "Pacchetti che forniscono funzionalit?? per la compatibilit?? fra "
-#~ "architetture."



From fedora-extras-commits at redhat.com  Wed Sep 26 01:08:43 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Tue, 25 Sep 2007 21:08:43 -0400
Subject: rpms/kernel/devel linux-2.6-x86-disable-local-apic-amd-c1e.patch,
	1.1, 1.2
Message-ID: <200709260108.l8Q18hk3011485@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11464

Modified Files:
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
buildfix

linux-2.6-x86-disable-local-apic-amd-c1e.patch:




From fedora-extras-commits at redhat.com  Wed Sep 26 01:29:30 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Tue, 25 Sep 2007 21:29:30 -0400
Subject: rpms/gtk2/devel simple-search-crash.patch, NONE, 1.1 gtk2.spec,
	1.258, 1.259
Message-ID: <200709260129.l8Q1TUlt012850@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12817

Modified Files:
	gtk2.spec 
Added Files:
	simple-search-crash.patch 
Log Message:
fix a simple search crash


simple-search-crash.patch:

--- NEW FILE simple-search-crash.patch ---
Index: gtk/gtksearchenginesimple.c
===================================================================
--- gtk/gtksearchenginesimple.c	(revision 18864)
+++ gtk/gtksearchenginesimple.c	(working copy)
@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate 
 G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
 
 static void
-finalize (GObject *object)
+gtk_search_engine_simple_dispose (GObject *object)
 {
   GtkSearchEngineSimple *simple;
+  GtkSearchEngineSimplePrivate *priv;
   
   simple = GTK_SEARCH_ENGINE_SIMPLE (object);
+  priv = simple->priv;
   
-  if (simple->priv->query) 
+  if (priv->query) 
+    {
+      g_object_unref (priv->query);
+      priv->query = NULL;
+    }
+
+  if (priv->active_search)
     {
-      g_object_unref (simple->priv->query);
-      simple->priv->query = NULL;
+      priv->active_search->cancelled = TRUE;
+      priv->active_search = NULL;
     }
   
-  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
+  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
 }
 
 static SearchThreadData *
@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
 
   data = user_data;
   
-  if (!data->cancelled) 
-    {
-      _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-      data->engine->priv->active_search = NULL;
-    }
-  
+  if (!data->cancelled)
+    _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
+     
+  data->engine->priv->active_search = NULL;
   search_thread_data_free (data);
   
   return FALSE;
@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
       hits = g_new (SearchHits, 1);
       hits->uris = data->uri_hits;
       hits->thread_data = data;
+      
       gdk_threads_add_idle (search_thread_add_hits_idle, hits);
     }
   data->uri_hits = NULL;
@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
   GtkSearchEngineClass *engine_class;
   
   gobject_class = G_OBJECT_CLASS (class);
-  gobject_class->finalize = finalize;
+  gobject_class->dispose = gtk_search_engine_simple_dispose;
   
   engine_class = GTK_SEARCH_ENGINE_CLASS (class);
   engine_class->set_query = gtk_search_engine_simple_set_query;
Index: gtk/gtkfilechooserdefault.c
===================================================================
--- gtk/gtkfilechooserdefault.c	(revision 18864)
+++ gtk/gtkfilechooserdefault.c	(working copy)
@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
   
   if (impl->search_engine)
     {
+      _gtk_search_engine_stop (impl->search_engine);
+      
       g_object_unref (impl->search_engine);
       impl->search_engine = NULL;
     }


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- gtk2.spec	20 Sep 2007 19:51:00 -0000	1.258
+++ gtk2.spec	26 Sep 2007 01:28:57 -0000	1.259
@@ -16,7 +16,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.11/gtk+-%{version}.tar.bz2
@@ -33,8 +33,8 @@
 # fixed in upstream svn
 Patch3: novalidate.patch
 Patch4: libtracker.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=460194
 Patch5: swt-tooltips.patch
+Patch6: simple-search-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -53,12 +53,8 @@
 BuildRequires: libXcursor-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
-# for patch 2
-#BuildRequires: gamin-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: gtk+-gtkbeta
-Obsoletes: Inti
 
 # Conflicts with packages containing theme engines
 # built against the 2.4.0 ABI
@@ -105,11 +101,6 @@
 Requires: automake
 # for /usr/share/gtk-doc/html
 Requires: gtk-doc
-Obsoletes: gtk+-gtkbeta-devel
-Obsoletes: Inti-devel
-## avoid header collisions
-Conflicts: gtk+-devel <= 1.2.8
-Conflicts: gdk-pixbuf-devel <= 0.11
 
 %description devel
 The gtk+-devel package contains the header files and developer
@@ -124,6 +115,7 @@
 %patch3 -p1 -b .novalidate
 %patch4 -p1 -b .libtracker
 %patch5 -p1 -b .swt-tooltips
+%patch6 -p0 -b .simple-search-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -306,6 +298,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Sep 25 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-4
+- Fix a crash in simple search
+- Drop obsolete Obsoletes and Conflicts 
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-3
 - Fix a problem with swt and tooltips 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 01:35:45 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 25 Sep 2007 21:35:45 -0400
Subject: rpms/pungi/devel .cvsignore, 1.26, 1.27 pungi.spec, 1.28,
	1.29 sources, 1.27, 1.28
Message-ID: <200709260135.l8Q1Zjmo013206@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13130/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
- Fix location of media.repo file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Sep 2007 20:45:07 -0000	1.26
+++ .cvsignore	26 Sep 2007 01:35:13 -0000	1.27
@@ -1 +1 @@
-pungi-1.1.1.tar.gz
+pungi-1.1.2.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pungi.spec	18 Sep 2007 20:45:07 -0000	1.28
+++ pungi.spec	26 Sep 2007 01:35:13 -0000	1.29
@@ -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:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Jesse Keating <jkeating at redhat.com> - 1.1.2-1
+- Fix location of media.repo file.
+
 * Tue Sep 18 2007 Jesse Keating <jkeating at redhat.com> - 1.1.1-1
 - Create a media.repo file on the first iso
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	18 Sep 2007 20:45:07 -0000	1.27
+++ sources	26 Sep 2007 01:35:13 -0000	1.28
@@ -1 +1 @@
-60e42213c8e0fc5d8306f6b32d468397  pungi-1.1.1.tar.gz
+f4720af1b95ba064ee63ebcafdf29d74  pungi-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 01:45:57 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 21:45:57 -0400
Subject: rpms/alex/devel alex.spec,1.2,1.3
Message-ID: <200709260145.l8Q1jvbS013698@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671

Modified Files:
	alex.spec 
Log Message:
ExcludeArch ppc64



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/devel/alex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alex.spec	25 Sep 2007 22:13:26 -0000	1.2
+++ alex.spec	26 Sep 2007 01:45:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://haskell.org/alex/
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
 
 BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
@@ -47,6 +48,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-5
+- don't try to build on ppc64
+
 * Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
 - build requires autoconf
 



From fedora-extras-commits at redhat.com  Wed Sep 26 01:55:17 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Tue, 25 Sep 2007 21:55:17 -0400
Subject: rpms/alex/F-7 alex.spec,1.2,1.3
Message-ID: <200709260155.l8Q1tH21014086@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/alex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14064

Modified Files:
	alex.spec 
Log Message:
Sync with devel.



Index: alex.spec
===================================================================
RCS file: /cvs/extras/rpms/alex/F-7/alex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alex.spec	25 Sep 2007 22:25:33 -0000	1.2
+++ alex.spec	26 Sep 2007 01:54:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           alex
 Version:        2.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The lexer generator for Haskell
 
 Group:          Development/Tools
@@ -8,6 +8,7 @@
 URL:            http://haskell.org/alex/
 Source:         http://haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    ppc64
 
 BuildRequires:  autoconf ghc docbook-style-xsl libxslt
 
@@ -47,6 +48,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-5
+- don't try to build on ppc64
+
 * Tue Sep 25 2007 Bryan O'Sullivan <bos at serpentine.com> - 2.1.0-4
 - build requires autoconf
 



From fedora-extras-commits at redhat.com  Wed Sep 26 02:37:06 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:37:06 -0400
Subject: rpms/fedora-release-notes/devel sources, 1.20, 1.21 .cvsignore, 1.11,
	1.12
Message-ID: <200709260237.l8Q2b6If024085@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	sources .cvsignore 
Log Message:
New 7.92 tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Aug 2007 04:07:28 -0000	1.20
+++ sources	26 Sep 2007 02:36:28 -0000	1.21
@@ -1,5 +1 @@
-585fc308a6276cb6465ba494ac50ced6  about-fedora-7.90.tar.gz
-e5cf0a9175bb7e5b45385cb599f5c88b  fedora-release-notes-7.90.tar.gz
-67b404e379bd610fb7a0bea559bcf498  homepage-7.90.tar.gz
-86cc9aa7a9349f742421f1b9e90f275b  README-7.90.tar.gz
-f225f59e18aa0d6426750ec0c068d1d1  README-BURNING-ISOS-7.90.tar.gz
+86ad7ce1207b1f7679bf717f83c25d24  fedora-release-notes-7.92.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Aug 2007 04:07:28 -0000	1.11
+++ .cvsignore	26 Sep 2007 02:36:28 -0000	1.12
@@ -1,5 +1 @@
-about-fedora-7.90.tar.gz
-fedora-release-notes-7.90.tar.gz
-homepage-7.90.tar.gz
-README-7.90.tar.gz
-README-BURNING-ISOS-7.90.tar.gz
+fedora-release-notes-7.92.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 02:41:12 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:41:12 -0400
Subject: rpms/fedora-release-notes/devel sources, 1.21, 1.22 .cvsignore, 1.12,
	1.13
Message-ID: <200709260241.l8Q2fCCD024208@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24184

Modified Files:
	sources .cvsignore 
Log Message:
New 7.92 tarballs, including all sources this time. :-)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Sep 2007 02:36:28 -0000	1.21
+++ sources	26 Sep 2007 02:40:18 -0000	1.22
@@ -1 +1,6 @@
+ef479462c83b16073588e73157edea4f  README-7.92.tar.gz
+c658c457cdba808a870246eb3c670f81  README-BURNING-ISOS-7.92.tar.gz
+8b6f66f32e28a22ebdf2581ac7a73ca6  about-fedora-7.92.tar.gz
 86ad7ce1207b1f7679bf717f83c25d24  fedora-release-notes-7.92.tar.gz
+0c372d62fbef5995e3de58d9ce7fdcd5  homepage-7.92.tar.gz
+779c021ce2588377329eab34ab968ef6  readme-live-image-7.92.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Sep 2007 02:36:28 -0000	1.12
+++ .cvsignore	26 Sep 2007 02:40:18 -0000	1.13
@@ -1 +1,6 @@
+README-7.92.tar.gz
+README-BURNING-ISOS-7.92.tar.gz
+about-fedora-7.92.tar.gz
 fedora-release-notes-7.92.tar.gz
+homepage-7.92.tar.gz
+readme-live-image-7.92.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 02:43:34 2007
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 25 Sep 2007 22:43:34 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.21,
	1.22
Message-ID: <200709260243.l8Q2hYkD024261@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239

Modified Files:
	fedora-release-notes.spec 
Log Message:
New 7.92-1 spec, includes startpage content, readme-live-image, and new content for F8 test3


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fedora-release-notes.spec	24 Aug 2007 04:06:35 -0000	1.21
+++ fedora-release-notes.spec	26 Sep 2007 02:43:01 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		fedora-release-notes
-Version:	7.90
+Version:	7.92
 Release:	1
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
@@ -11,10 +11,14 @@
 Source2:	about-fedora-%{version}.tar.gz
 Source3:	README-%{version}.tar.gz
 Source4:	README-BURNING-ISOS-%{version}.tar.gz
+Source5:	readme-live-image-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
 BuildRequires:	desktop-file-utils
+# 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.
 Provides:	indexhtml = %{version}-%{release}
 Obsoletes:	indexhtml < 9-3
 
@@ -31,6 +35,7 @@
 %setup -D -q -a 2
 %setup -D -q -a 3
 %setup -D -q -a 4
+%setup -D -q -a 5
 
 
 %build
@@ -46,17 +51,17 @@
 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 css img stylesheet-images ; do
+for DIR in css 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}
-  install -m 644 -D fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/fedora.css
-  for D in css img stylesheet-images ; do
-    install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D}
-    find $D -type f -exec install -m 644 '{}' $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/${D} \;
+  ln -s ../../fedora.css $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
+  for D in css stylesheet-images ; do
+    ln -s ../../${D} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
   done 
 done
 pushd README-BURNING-ISOS-%{version}/
@@ -65,9 +70,17 @@
   install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-burning-isos/${L}/${F}
 done
 popd
+pushd readme-live-image-%{version}/
+for F in readme-live-image-*.txt; do
+  L=`echo ${F} | %{__sed} 's/readme-live-image-\(.*\)\.txt/\1/'`
+  install -m 644 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/readme-live-image/${L}/${F}
+done
+popd
 pushd homepage-%{version}
 install -m 644 homepage/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML
 install -m 644 homepage/index-en_US.html $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/index.html
+install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
+install -m 644 images/* $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/images
 popd
 pushd about-fedora-%{version}
 find about-fedora/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_datadir}/gnome/help/{} \;
@@ -106,6 +119,17 @@
 
 
 %changelog
+* Sun Sep 16 2007 Paul W. Frields <stickster at gmail.com> - 7.92-1
+- Include new start page
+- Push new content for F8 test3
+
+* Wed Sep 12 2007 Paul W. Frields <stickster at gmail.com> - 7.91-1
+- Link stylesheet resources to save space
+
+* Mon Aug 27 2007 Paul W. Frields <stickster at gmail.com> - 7.90-2
+- Remove superfluous PNG files
+- Bump release for rebranding change in homepage
+
 * Tue Aug 21 2007 Paul W. Frields <stickster at gmail.com> - 7.90-1
 - Resituate HTML documentation for release spins
 



From fedora-extras-commits at redhat.com  Wed Sep 26 03:05:44 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 25 Sep 2007 23:05:44 -0400
Subject: rpms/sword/devel sword-open.patch,NONE,1.1 sword.spec,1.18,1.19
Message-ID: <200709260305.l8Q35i8G030954@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30906

Modified Files:
	sword.spec 
Added Files:
	sword-open.patch 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-7
- Fix the build failure due to glibc open() check


sword-open.patch:

--- NEW FILE sword-open.patch ---
--- utilities/cipherraw.cpp	2005-05-02 23:49:04.000000000 -0400
+++ utilities/cipherraw.cpp.new	2007-09-25 18:14:16.000000000 -0400
@@ -45,13 +45,13 @@
 
 	tmpbuf = new char [ strlen(argv[1]) + 11 ];
 	sprintf(tmpbuf, "%sot.zzz", argv[1]);
-	ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%sot.zzz.vss", argv[1]);
-	oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%snt.zzz", argv[1]);
-	ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 	sprintf(tmpbuf, "%snt.zzz.vss", argv[1]);
-	oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT);
+	oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600);
 
 	delete [] tmpbuf;

--- utilities/gbfidx.cpp	2007-09-25 18:12:44.000000000 -0400
+++ utilities/gbfidx.cpp.new	2007-09-25 18:13:04.000000000 -0400
@@ -258,25 +258,25 @@
 #endif				// don't need it.
 	char buf[255];
 
-	if ((fp = open(fname, O_RDONLY|O_BINARY)) == -1) {
+	if ((fp = open(fname, O_RDONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", fname);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.vss", fname);
-	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.cps", fname);
-	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	}
 
 	sprintf(buf, "%s.bks", fname);
-	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) {
+	if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) {
 		fprintf(stderr, "Couldn't open file: %s\n", buf);
 		exit(1);
 	} 


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sword.spec	25 Aug 2007 12:42:04 -0000	1.18
+++ sword.spec	26 Sep 2007 03:05:10 -0000	1.19
@@ -1,12 +1,13 @@
 Name:           sword           
 Version:        1.5.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
+Patch0:		sword-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .open
 
 %build
 %configure --disable-static --with-icu --with-lucene
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-7
+- Fix the build failure due to glibc open() check
+
 * Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 03:07:18 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Tue, 25 Sep 2007 23:07:18 -0400
Subject: rpms/libsvm/devel libsvm-2.84-5.patch, NONE, 1.1 libsvm.spec, 1.5, 
	1.6 libsvm-2.84-4.patch, 1.1, NONE
Message-ID: <200709260307.l8Q37IGM031030@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30965/devel

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-5.patch 
Removed Files:
	libsvm-2.84-4.patch 
Log Message:
1. Split libsvm-java out of libsvm package
2. Make libsvm.so


libsvm-2.84-5.patch:

--- NEW FILE libsvm-2.84-5.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-25 14:30:10.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,53 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src
+	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
+	cp -R java ${INSTDIR}/share/libsvm/src
+	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsvm.spec	30 Aug 2007 06:09:57 -0000	1.5
+++ libsvm.spec	26 Sep 2007 03:06:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-4.patch
+Patch0:         libsvm-2.84-5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -45,6 +45,19 @@
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%package java
+Summary:    Java tools and interfaces for libsvm.
+Group:      Development/Libraries
+BuildRequires:  eclipse-ecj >= 3, libgcj >= 4
+Requires:       eclipse-ecj >= 3
+Requires:       %{name} = %{version}-%{release}
+
+%description java
+Java tools and interfaces for libsvm.
+Install this package if you want to develop 
+programs with libsvm in Java.
+
+
 %prep
 %setup -q
 %patch0 -p0 -b .bak 
@@ -58,13 +71,14 @@
 dos2unix -o %{_builddir}/%{name}-%{version}/FAQ.html
 mv %{_builddir}/%{name}-%{version}/python/README %{_builddir}/%{name}-%{version}/python/README-Python
 mv %{_builddir}/%{name}-%{version}/tools/README %{_builddir}/%{name}-%{version}/tools/README-Tools
+cp %{_builddir}/%{name}-%{version}/README %{_builddir}/%{name}-%{version}/java/README-Java
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,8 +100,17 @@
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%files java
+%doc java/README-Java
+#%{_libdir}/java/libsvm/docs
+%{_libdir}/java/libsvm/libsvm.jar
+%{_libdir}/java/libsvm/test_applet.html
 
 %changelog
+* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+- Split out libsvm-java
+- Add libsvm.so
+
 * Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-4
 - Refined description.
 - Fix the /tmp/python.ver problem


--- libsvm-2.84-4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 03:34:59 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Tue, 25 Sep 2007 23:34:59 -0400
Subject: rpms/libsvm/F-7 libsvm-2.84-5.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 libsvm.spec, 1.2, 1.3 libsvm-2.84-4.patch, 1.1, NONE
Message-ID: <200709260334.l8Q3Yx1f031855@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31823/F-7

Modified Files:
	.cvsignore libsvm.spec 
Added Files:
	libsvm-2.84-5.patch 
Removed Files:
	libsvm-2.84-4.patch 
Log Message:
1. Split libsvm-java out of main packagge
2. Make libsvm.so


libsvm-2.84-5.patch:

--- NEW FILE libsvm-2.84-5.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-25 14:30:10.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,53 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	mkdir -p ${INSTDIR}/include/libsvm
+	install -m 644 svm.h ${INSTDIR}/include/libsvm
+	mkdir -p ${INSTDIR}/share/libsvm/src
+	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
+	cp -R java ${INSTDIR}/share/libsvm/src
+	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Aug 2007 01:27:43 -0000	1.1
+++ .cvsignore	26 Sep 2007 03:34:26 -0000	1.2
@@ -0,0 +1 @@
+libsvm-2.84.tar.gz


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsvm.spec	30 Aug 2007 06:31:05 -0000	1.2
+++ libsvm.spec	26 Sep 2007 03:34:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-4.patch
+Patch0:         libsvm-2.84-5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -45,6 +45,19 @@
 Install this package if you want to develop 
 programs with libsvm in Python.
 
+%package java
+Summary:    Java tools and interfaces for libsvm.
+Group:      Development/Libraries
+BuildRequires:  eclipse-ecj >= 3, libgcj >= 4
+Requires:       eclipse-ecj >= 3
+Requires:       %{name} = %{version}-%{release}
+
+%description java
+Java tools and interfaces for libsvm.
+Install this package if you want to develop 
+programs with libsvm in Java.
+
+
 %prep
 %setup -q
 %patch0 -p0 -b .bak 
@@ -58,13 +71,14 @@
 dos2unix -o %{_builddir}/%{name}-%{version}/FAQ.html
 mv %{_builddir}/%{name}-%{version}/python/README %{_builddir}/%{name}-%{version}/python/README-Python
 mv %{_builddir}/%{name}-%{version}/tools/README %{_builddir}/%{name}-%{version}/tools/README-Tools
+cp %{_builddir}/%{name}-%{version}/README %{_builddir}/%{name}-%{version}/java/README-Java
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,8 +100,17 @@
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
+%files java
+%doc java/README-Java
+#%{_libdir}/java/libsvm/docs
+%{_libdir}/java/libsvm/libsvm.jar
+%{_libdir}/java/libsvm/test_applet.html
 
 %changelog
+* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+- Split out libsvm-java
+- Add libsvm.so
+
 * Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-4
 - Refined description.
 - Fix the /tmp/python.ver problem


--- libsvm-2.84-4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 03:45:36 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 25 Sep 2007 23:45:36 -0400
Subject: rpms/tracker/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tracker.spec, 1.21, 1.22
Message-ID: <200709260345.l8Q3jas5032312@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32290

Modified Files:
	.cvsignore sources tracker.spec 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
- Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2007 00:31:22 -0000	1.8
+++ .cvsignore	26 Sep 2007 03:45:04 -0000	1.9
@@ -1 +1 @@
-tracker-0.6.2.tar.bz2
+tracker-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2007 00:31:22 -0000	1.8
+++ sources	26 Sep 2007 03:45:04 -0000	1.9
@@ -1 +1 @@
-d4d66cd73e6c59ac392565be622370f2  tracker-0.6.2.tar.bz2
+f718aa38b7527229f5567834ae247a38  tracker-0.6.3.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tracker.spec	11 Sep 2007 19:52:50 -0000	1.21
+++ tracker.spec	26 Sep 2007 03:45:04 -0000	1.22
@@ -1,18 +1,17 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.2
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
 Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
-Patch0:		trackerd-getenv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
 BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-BuildRequires:	sqlite-devel, pygtk2-devel
+BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -34,7 +33,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	dbus-glib-devel
+Requires:	dbus-glib-devel gtk2-devel
 
 %description devel
 This package contains the static libraries and header files needed for
@@ -51,16 +50,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .getenv
 %define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
-
-%build
-%configure --disable-static --enable-deskbar-applet=auto	\
 %if "%deskbar_applet_ver" >= "2.19"
-	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/modules
+ %define deskbar_applet_dir %(pkg-config --variable modulesdir deskbar-applet)
 %else
-	--with-deskbar-applet-dir=%{_libdir}/deskbar-applet/handlers
+ %define deskbar_applet_dir %(pkg-config --variable handlersdir deskbar-applet)
 %endif
+
+%build
+%configure --disable-static --enable-deskbar-applet=auto	\
+		--enable-external-qdbm
 # 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
@@ -118,16 +117,15 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
-%if "%deskbar_applet_ver" >= "2.19"
-%{_libdir}/deskbar-applet/modules/tracker*.py*
-%else
-%{_libdir}/deskbar-applet/handlers/*.py*
-%endif
+%{deskbar_applet_dir}/tracker*.py*
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
+- Version 0.6.3
+
 * Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
 - Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 04:38:52 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 00:38:52 -0400
Subject: rpms/xkeyboard-config/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xkeyboard-config.spec, 1.10, 1.11
Message-ID: <200709260438.l8Q4cqIm009871@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9849

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Log Message:
1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2007 22:36:39 -0000	1.3
+++ .cvsignore	26 Sep 2007 04:38:14 -0000	1.4
@@ -1 +1 @@
-xkeyboard-config-1.0.tar.bz2
+xkeyboard-config-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2007 22:36:39 -0000	1.3
+++ sources	26 Sep 2007 04:38:14 -0000	1.4
@@ -1 +1 @@
-bcf08a6bf76bd5661f730d36a1d66517  xkeyboard-config-1.0.tar.bz2
+deef7884b9d9cc280f0d2ef4b60e4d98  xkeyboard-config-1.1.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xkeyboard-config.spec	5 Sep 2007 22:36:39 -0000	1.10
+++ xkeyboard-config.spec	26 Sep 2007 04:38:14 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 1.0
+Version: 1.1
 Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
@@ -12,11 +12,6 @@
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=7991
-Patch0: kinesis.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=7992
-Patch1: dellm65.patch
-
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -46,9 +41,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .kinesis
-%patch1 -p1 -b .dellm65
-
 %build
 %configure \
     --enable-compat-rules \
@@ -84,6 +76,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-1
+- Update to 1.1
+- Drop upstreamed patches
+
 * Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 1.0-1
 - Update to 1.0
 - Drop upstreamed patches



From fedora-extras-commits at redhat.com  Wed Sep 26 04:55:28 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 00:55:28 -0400
Subject: rpms/knm_new-fonts/devel knm_new-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709260455.l8Q4tS67010359@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10338/devel

Modified Files:
	.cvsignore sources 
Added Files:
	knm_new-fonts.spec 
Log Message:
initial commit



--- NEW FILE knm_new-fonts.spec ---
%define	fontdir		%{_datadir}/fonts/%{name}
%define	catalogue	%{_sysconfdir}/X11/fontpath.d

Name:		knm_new-fonts
Version:	1.1
Release:	2%{?dist}
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	mkfontdir
## the following upstream URL is a dead link anymore.
URL:		http://www.din.or.jp/~storm/fonts/
Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz


Summary:	12x12 JIS X 0208 Bitmap font
License:	GPL+
Group:		User Interface/X
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Provides:	knm_new = 1.1-16
Obsoletes:	knm_new <= 1.1-16

%description
This package provides 12x12 Japanese bitmap font for JIS X 0208.
JIS X 0208 is a character set that contains Kanji characters mostly
often used.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}
install -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{fontdir}/

%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir}

# Install catalogue symlink
%{__ln_s} -f %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%dir %{fontdir}
%{fontdir}/*.pcf.gz
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm_new-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:17:16 -0000	1.1
+++ .cvsignore	26 Sep 2007 04:54:54 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm_new-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:17:16 -0000	1.1
+++ sources	26 Sep 2007 04:54:54 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 05:00:53 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 01:00:53 -0400
Subject: rpms/jisksp16-1990-fonts/devel jisksp16-1990-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709260500.l8Q50rB4010706@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/jisksp16-1990-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10636/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jisksp16-1990-fonts.spec 
Log Message:
initial commit



--- NEW FILE jisksp16-1990-fonts.spec ---
%define	fontdir		%{_datadir}/fonts/%{name}
%define	catalogue	%{_sysconfdir}/X11/fontpath.d

Name:		jisksp16-1990-fonts
Version:	0.983
Release:	2%{?dist}
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gzip mkfontdir xorg-x11-font-utils
URL:		http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/
Source0:	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jisksp16-1990.bdf.Z


Summary:	16x16 JIS X 0212:1990 Bitmap font
License:	Public Domain
Group:		User Interface/X
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Provides:	jisksp16-1990 = 0.1-16
Obsoletes:	jisksp16-1990 <= 0.1-16

%description
This package provides 16x16 Japanese bitmap font for JIS X 0212:1990.
JIS X 0212:1990 is a character sets that contains the auxiliary kanji
characters.


%prep
%setup -c -T
gunzip -c %{SOURCE0} > jisksp16-1990.bdf

%build
%{_bindir}/bdftopcf jisksp16-1990.bdf | gzip -9c > jisksp16-1990.pcf.gz

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{fontdir}
install -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p jisksp16-1990.pcf.gz $RPM_BUILD_ROOT%{fontdir}/

%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir}

# Install catalogue symlink
ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%dir %{fontdir}
%{fontdir}/jisksp16-1990.pcf.gz
%verify(not md5 size mtime) %{fontdir}/fonts.dir
%{catalogue}/*

%changelog
* Mon Sep 24 2007 Akira TAGOH <tagoh at redhat.com> - 0.983-2
- Use %%setup.

* Fri Aug 17 2007 Akira TAGOH <tagoh at redhat.com> - 0.983-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jisksp16-1990-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 18:15:28 -0000	1.1
+++ .cvsignore	26 Sep 2007 05:00:19 -0000	1.2
@@ -0,0 +1 @@
+jisksp16-1990.bdf.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jisksp16-1990-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 18:15:28 -0000	1.1
+++ sources	26 Sep 2007 05:00:19 -0000	1.2
@@ -0,0 +1 @@
+c4ebfb1328a0d9a738ce7621094e40aa  jisksp16-1990.bdf.Z



From fedora-extras-commits at redhat.com  Wed Sep 26 07:23:04 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 26 Sep 2007 03:23:04 -0400
Subject: rpms/nagios/devel nagios.spec,1.34,1.35
Message-ID: <200709260723.l8Q7N4jM004338@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4135

Modified Files:
	nagios.spec 
Log Message:
rebuild for koji


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nagios.spec	9 Sep 2007 02:30:00 -0000	1.34
+++ nagios.spec	26 Sep 2007 07:22:32 -0000	1.35
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -163,6 +163,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Wed Sep 26 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-5
+- rebuild for koji test
+
 * Sat Sep 08 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 07:27:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Wed, 26 Sep 2007 03:27:24 -0400
Subject: rpms/tcl/devel tcl-8.4.7-path.patch,1.1,1.2 tcl.spec,1.62,1.63
Message-ID: <200709260727.l8Q7ROsQ004755@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4725

Modified Files:
	tcl-8.4.7-path.patch tcl.spec 
Log Message:
Add forgotten else into patch - auto_path fully functional.


tcl-8.4.7-path.patch:

Index: tcl-8.4.7-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl-8.4.7-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-8.4.7-path.patch	24 Aug 2007 09:46:53 -0000	1.1
+++ tcl-8.4.7-path.patch	26 Sep 2007 07:27:21 -0000	1.2
@@ -12,13 +12,13 @@
 -    }
 +if {[info exists env(TCLLIBPATH)]} {
 +    set auto_path $env(TCLLIBPATH)
-+} 
-+
++} else {
 +if {[file exists "/usr/lib64/tclX8.3"]} {
 +    set auto_path "/usr/share/tcl8.4 /usr/share /usr/lib64 /usr/lib"
 +} else {
 +    set auto_path ""
  }
++}
 +
 +
  namespace eval tcl {


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- tcl.spec	24 Aug 2007 09:46:53 -0000	1.62
+++ tcl.spec	26 Sep 2007 07:27:21 -0000	1.63
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1 
 License: TCL
 Group: Development/Languages
@@ -142,6 +142,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Wed Sep 26 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-5
+- fix of patch - set auto_path was broken
+- Resolves: rhbz#306321
+
 * Fri Aug 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-4
 - rebuild for mass rebuild
 - check license & path for 32b/64b fix



From fedora-extras-commits at redhat.com  Wed Sep 26 07:34:28 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Wed, 26 Sep 2007 03:34:28 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-honor-displaysize.patch,
	NONE, 1.1 xserver-1.3.0-randr-updates.patch, NONE,
	1.1 xorg-x11-server.spec, 1.250,
	1.251 xserver-1.3.0-randr12-config-hack.patch, 1.1,
	1.2 xorg-x11-server-1.2.0-maxpixclock-option.patch, 1.1,
	NONE xserver-1.2.0-honor-displaysize.patch, 1.1,
	NONE xserver-1.3.0-edid-quirk-backports.patch, 1.2,
	NONE xserver-1.3.0-less-randr-fakerama.patch, 1.1, NONE
Message-ID: <200709260734.l8Q7YS3s005195@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5128

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-randr12-config-hack.patch 
Added Files:
	xserver-1.3.0-honor-displaysize.patch 
	xserver-1.3.0-randr-updates.patch 
Removed Files:
	xorg-x11-server-1.2.0-maxpixclock-option.patch 
	xserver-1.2.0-honor-displaysize.patch 
	xserver-1.3.0-edid-quirk-backports.patch 
	xserver-1.3.0-less-randr-fakerama.patch 
Log Message:
* Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
- xserver-1.3.0-randr-updates.patch: Backport randr from server git
  This contains a lot of fixes since 1.3.0 went out, and saves
  us backporting each fix individually
- xserver-1.3.0-less-randr-fakerama.patch - dropped
- xorg-x11-server-1.2.0-maxpixclock-option.patch - dropped
- xserver-1.3.0-edid-quirk-backports.patch - dropped
- xserver-1.2.0-honor-displaysize.patch - dropped
- xserver-1.3.0-honor-displaysize.patch - reapply to new code layout
- xserver-1.3.0-randr12-config-hack.patch - rebased


xserver-1.3.0-honor-displaysize.patch:

--- NEW FILE xserver-1.3.0-honor-displaysize.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da	2007-09-26 17:04:02.000000000 +1000
+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-09-26 17:04:27.000000000 +1000
@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 
 
     Monitor->DDC = DDC;
 
-    Monitor->widthmm = 10 * DDC->features.hsize;
-    Monitor->heightmm = 10 * DDC->features.vsize;
+    if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {
+        Monitor->widthmm = 10 * DDC->features.hsize;
+        Monitor->heightmm = 10 * DDC->features.vsize;
+    }
 
     /* If this is a digital display, then we can use reduced blanking */
     if (DDC->features.input_type)

xserver-1.3.0-randr-updates.patch:

--- NEW FILE xserver-1.3.0-randr-updates.patch ---
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 0841a6d..1f82068 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -26,4 +26,4 @@ sdk_HEADERS = \
 	xf86RandR12.h \
 	xf86Rename.h
 
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 2d8a7ad..064ff16 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -45,13 +45,15 @@
 #include "picturestr.h"
 #endif
 
+#include "xf86xv.h"
+
 /*
  * Initialize xf86CrtcConfig structure
  */
 
 int xf86CrtcConfigPrivateIndex = -1;
 
-void
+_X_EXPORT void
 xf86CrtcConfigInit (ScrnInfoPtr scrn,
 		    const xf86CrtcConfigFuncsRec *funcs)
 {
@@ -66,7 +68,7 @@ xf86CrtcConfigInit (ScrnInfoPtr scrn,
     scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
 }
  
-void
+_X_EXPORT void
 xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
 		      int minWidth, int minHeight,
 		      int maxWidth, int maxHeight)
@@ -82,7 +84,7 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
 /*
  * Crtc functions
  */
-xf86CrtcPtr
+_X_EXPORT xf86CrtcPtr
 xf86CrtcCreate (ScrnInfoPtr		scrn,
 		const xf86CrtcFuncsRec	*funcs)
 {
@@ -114,7 +116,7 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     return crtc;
 }
 
-void
+_X_EXPORT void
 xf86CrtcDestroy (xf86CrtcPtr crtc)
 {
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
@@ -126,7 +128,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc)
 	{
 	    memmove (&xf86_config->crtc[c],
 		     &xf86_config->crtc[c+1],
-		     xf86_config->num_crtc - (c + 1));
+		     ((xf86_config->num_crtc - (c + 1)) * sizeof(void*)));
 	    xf86_config->num_crtc--;
 	    break;
 	}
@@ -138,7 +140,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc)
  * Return whether any outputs are connected to the specified pipe
  */
 
-Bool
+_X_EXPORT Bool
 xf86CrtcInUse (xf86CrtcPtr crtc)
 {
     ScrnInfoPtr		pScrn = crtc->scrn;
@@ -151,7 +153,7 @@ xf86CrtcInUse (xf86CrtcPtr crtc)
     return FALSE;
 }
 
-void
+_X_EXPORT void
 xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 {
 #ifdef RENDER
@@ -219,7 +221,7 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 /**
  * Sets the given video mode on the given crtc
  */
-Bool
+_X_EXPORT Bool
 xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 		 int x, int y)
 {
@@ -377,6 +379,15 @@ static OptionInfoRec xf86OutputOptions[] = {
     {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
 };
 
+enum {
+    OPTION_MODEDEBUG,
+};
+
+static OptionInfoRec xf86DeviceOptions[] = {
+    {OPTION_MODEDEBUG,	    "ModeDebug",	OPTV_STRING,  {0}, FALSE },
+    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+};
+
 static void
 xf86OutputSetMonitor (xf86OutputPtr output)
 {
@@ -481,7 +492,7 @@ xf86OutputInitialRotation (xf86OutputPtr output)
     return RR_Rotate_0;
 }
 
-xf86OutputPtr
+_X_EXPORT xf86OutputPtr
 xf86OutputCreate (ScrnInfoPtr		    scrn,
 		  const xf86OutputFuncsRec  *funcs,
 		  const char		    *name)
@@ -541,7 +552,7 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
     return output;
 }
 
-Bool
+_X_EXPORT Bool
 xf86OutputRename (xf86OutputPtr output, const char *name)
 {
     int	    len = strlen(name) + 1;
@@ -560,7 +571,7 @@ xf86OutputRename (xf86OutputPtr output, const char *name)
     return TRUE;
 }
 
-void
+_X_EXPORT void
 xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
 {
     if (use_screen_monitor != output->use_screen_monitor)
@@ -570,7 +581,7 @@ xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
     }
 }
 
-void
+_X_EXPORT void
 xf86OutputDestroy (xf86OutputPtr output)
 {
     ScrnInfoPtr		scrn = output->scrn;
@@ -585,7 +596,7 @@ xf86OutputDestroy (xf86OutputPtr output)
 	{
 	    memmove (&xf86_config->output[o],
 		     &xf86_config->output[o+1],
-		     xf86_config->num_output - (o + 1));
+		     ((xf86_config->num_output - (o + 1)) * sizeof(void*)));
 	    xf86_config->num_output--;
 	    break;
 	}
@@ -646,7 +657,7 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
 /*
  * Called at ScreenInit time to set up
  */
-Bool
+_X_EXPORT Bool
 xf86CrtcScreenInit (ScreenPtr screen)
 {
     ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
@@ -667,7 +678,8 @@ xf86CrtcScreenInit (ScreenPtr screen)
     }
     if (c == config->num_crtc)
 	xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 |
-				 RR_Rotate_180 | RR_Rotate_270);
+				 RR_Rotate_180 | RR_Rotate_270 |
+				 RR_Reflect_X | RR_Reflect_Y);
     else
 	xf86RandR12SetRotations (screen, RR_Rotate_0);
     
@@ -1202,16 +1214,21 @@ xf86SortModes (DisplayModePtr input)
     return output;
 }
 
-#define DEBUG_REPROBE 1
-
-void
+_X_EXPORT void
 xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 {
     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
     int			o;
 
-    if (maxX == 0 || maxY == 0)
-	xf86RandR12GetOriginalVirtualSize (scrn, &maxX, &maxY);
+    /* When canGrow was TRUE in the initial configuration we have to
+     * compare against the maximum values so that we don't drop modes.
+     * When canGrow was FALSE, the maximum values would have been clamped
+     * anyway.
+     */
+    if (maxX == 0 || maxY == 0) {
+	maxX = config->maxWidth;
+	maxY = config->maxHeight;
+    }
 
[...3327 lines suppressed...]
-	    if (rotation == RR_Rotate_90 || rotation == RR_Rotate_270)
+	    if ((rotation & 0xf) == RR_Rotate_90 || (rotation & 0xf) == RR_Rotate_270)
 	    {
 		source_width = mode->mode.height;
 		source_height = mode->mode.width;
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 6b61b9c..5525427 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -22,6 +22,9 @@
 
 #include "randrstr.h"
 
+#define SERVER_RANDR_MAJOR	1
+#define SERVER_RANDR_MINOR	2
+
 Bool
 RRClientKnowsRates (ClientPtr	pClient)
 {
@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
      * Report the current version; the current
      * spec says they're all compatible after 1.0
      */
-    rep.majorVersion = RANDR_MAJOR;
-    rep.minorVersion = RANDR_MINOR;
+    rep.majorVersion = SERVER_RANDR_MAJOR;
+    rep.minorVersion = SERVER_RANDR_MINOR;
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
     	swapl(&rep.length, n);
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 5ef1a6b..7e77d39 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,17 +98,18 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
 	if (!output)
 	    return;
 	RROutputSetCrtcs (output, &crtc, 1);
-	RROutputSetCrtc (output, crtc);
 	RROutputSetConnection (output, RR_Connected);
 #ifdef RENDER
 	RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
 #endif
     }
 
-    output = RRFirstOutput (pScreen);
+    output = pScrPriv->outputs[0];
     if (!output)
 	return;
-    crtc = output->crtc;
+    crtc = pScrPriv->crtcs[0];
+    if (!crtc)
+	return;
 
     /* check rotations */
     if (rotations != crtc->rotations)
@@ -168,7 +169,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
 
     /* notice current mode */
     if (newMode)
-	RRCrtcNotify (output->crtc, newMode, 0, 0, pScrPriv->rotation,
+	RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,
 		      1, &output);
 }
 #endif
diff --git a/randr/rroutput.c b/randr/rroutput.c
index c773279..a67e493 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -249,6 +249,7 @@ RROutputDeleteUserMode (RROutputPtr output,
 
     memmove (output->userModes + m, output->userModes + m + 1,
 	     (output->numUserModes - m - 1) * sizeof (RRModePtr));
+    output->numUserModes--;
     RRModeDestroy (mode);
     return Success;
 }
@@ -286,15 +287,6 @@ RROutputSetCrtcs (RROutputPtr	output,
     return TRUE;
 }
 
-void
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc)
-{
-    if (output->crtc == crtc)
-	return;
-    output->crtc = crtc;
-    RROutputChanged (output, FALSE);
-}
-
 Bool
 RROutputSetConnection (RROutputPtr  output,
 		       CARD8	    connection)
@@ -438,7 +430,7 @@ RROutputInit (void)
 int
 ProcRRGetOutputInfo (ClientPtr client)
 {
-    REQUEST(xRRGetOutputInfoReq);;
+    REQUEST(xRRGetOutputInfoReq);
     xRRGetOutputInfoReply	rep;
     RROutputPtr			output;
     CARD8			*extra;
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index 802dcb2..c88a0f8 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -103,7 +103,7 @@ void
 RRPointerMoved (ScreenPtr pScreen, int x, int y)
 {
     rrScrPriv (pScreen);
-    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;;
+    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;
     int	c;
 
     /* Check last known CRTC */
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index f2981b0..8798b42 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
 
     se.sequenceNumber = client->sequence;
     se.sizeID = RR10CurrentSizeID (pScreen);
-    
-    se.widthInPixels = pScreen->width;
-    se.heightInPixels = pScreen->height;
-    se.widthInMillimeters = pScreen->mmWidth;
-    se.heightInMillimeters = pScreen->mmHeight;
+
+    if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+	se.widthInPixels = pScreen->height;
+	se.heightInPixels = pScreen->width;
+	se.widthInMillimeters = pScreen->mmHeight;
+	se.heightInMillimeters = pScreen->mmWidth;
+    } else {
+	se.widthInPixels = pScreen->width;
+	se.heightInPixels = pScreen->height;
+	se.widthInMillimeters = pScreen->mmWidth;
+	se.heightInMillimeters = pScreen->mmHeight;
+    }
+
     WriteEventsToClient (client, 1, (xEvent *) &se);
 }
 
@@ -738,6 +738,7 @@ ProcRRSetScreenConfig (ClientPtr client)
     int			    rate;
     Bool		    has_rate;
     RROutputPtr		    output;
+    RRCrtcPtr		    crtc;
     RRModePtr		    mode;
     RR10DataPtr		    pData = NULL;
     RRScreenSizePtr    	    pSize;
@@ -782,7 +784,9 @@ ProcRRSetScreenConfig (ClientPtr client)
 	rep.status = RRSetConfigFailed;
 	goto sendReply;
     }
-    
+
+    crtc = output->crtc;
+
     /*
      * if the client's config timestamp is not the same as the last config
      * timestamp, then the config information isn't up-to-date and
@@ -830,7 +834,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	return BadValue;
     }
 
-    if ((~output->crtc->rotations) & rotation)
+    if ((~crtc->rotations) & rotation)
     {
 	/*
 	 * requested rotation or reflection not supported by screen
@@ -913,7 +917,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	}
     }
 
-    if (!RRCrtcSet (output->crtc, mode, 0, 0, stuff->rotation, 1, &output))
+    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
 	rep.status = RRSetConfigFailed;
     else
 	rep.status = RRSetConfigSuccess;
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 63a34b5..2a57e4e 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -425,6 +428,14 @@ RRXineramaExtensionInit(void)
 	return;
 #endif
 
+    /*
+     * Xinerama isn't capable enough to have multiple protocol screens each
+     * with their own output geometry.  So if there's more than one protocol
+     * screen, just don't even try.
+     */
+    if (screenInfo.numScreens > 1)
+	return;
+
     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
 			ProcRRXineramaDispatch,
 			SProcRRXineramaDispatch,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- xorg-x11-server.spec	17 Sep 2007 21:47:33 -0000	1.250
+++ xorg-x11-server.spec	26 Sep 2007 07:33:55 -0000	1.251
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   24%{?dist}
+Release:   25%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -52,24 +52,22 @@
 Patch1006:  xorg-x11-server-1.1.1-no-scanpci.patch
 Patch1007:  xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
 Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
-Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 Patch1011:  xserver-1.3.0-composite-version.patch
 Patch1012:  xserver-1.3.0-mesa7.patch
 Patch1013:  xserver-1.3.0-exaupgrade.patch
 Patch1014:  xserver-1.3.0-newglx-offscreen-pixmaps.patch
+Patch1015:  xserver-1.3.0-randr-updates.patch
 Patch1022:  xserver-1.3.0-default-dpi.patch
 
 Patch2001:  xserver-1.2.0-geode-mmx.patch
 Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
 Patch2003:  xserver-1.2.0-vfprintf.patch
-Patch2004:  xserver-1.2.0-honor-displaysize.patch
-Patch2006:  xserver-1.3.0-less-randr-fakerama.patch
+Patch2004:  xserver-1.3.0-honor-displaysize.patch
 Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2008:  xserver-1.3.0-randrama-no-zero-screens.patch
 Patch2009:  xserver-1.3.0-arm-iopl.patch
 Patch2010:  xserver-1.3.0-idletime.patch
-Patch2011:  xserver-1.3.0-edid-quirk-backports.patch
 Patch2012:  xserver-1.3.0-add-really-slow-bcopy.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
 
@@ -313,24 +311,22 @@
 %patch1006 -p1 -b .no-scanpci
 %patch1007 -p1 -b .xf1bpp
 %patch1008 -p1 -b .comment-less
-%patch1009 -p1 -b .maxpixclock
 %patch1010 -p1 -b .prerelease-warning
 %patch1011 -p1 -b .composite-version
 %patch1012 -p1 -b .newmesa
 %patch1013 -p1 -b .newexa
 %patch1014 -p1 -b .offscreen-pixmaps
+%patch1015 -p1 -b .randr-update
 %patch1022 -p1 -b .dpi
 
 %patch2001 -p1 -b .geode-mmx
 %patch2002 -p1 -b .xephyr-keysym
 %patch2003 -p1 -b .vfprintf
 %patch2004 -p1 -b .displaysize
-%patch2006 -p1 -b .fakerama
 %patch2007 -p1 -b .randrconfig
 %patch2008 -p1 -b .randrama-zero-screens
 %patch2009 -p1 -b .arm
 %patch2010 -p1 -b .idletime
-%patch2011 -p1 -b .edid-quirks
 %patch2012 -p1 -b .slow-bcopy
 %patch2013 -p1 -b .fontpath-doc
 
@@ -608,6 +604,17 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
+- xserver-1.3.0-randr-updates.patch: Backport randr from server git
+  This contains a lot of fixes since 1.3.0 went out, and saves
+  us backporting each fix individually
+- xserver-1.3.0-less-randr-fakerama.patch - dropped
+- xorg-x11-server-1.2.0-maxpixclock-option.patch - dropped
+- xserver-1.3.0-edid-quirk-backports.patch - dropped
+- xserver-1.2.0-honor-displaysize.patch - dropped
+- xserver-1.3.0-honor-displaysize.patch - reapply to new code layout
+- xserver-1.3.0-randr12-config-hack.patch - rebased
+
 * Mon Sep 17 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-24
 - xserver-1.3.0-edid-quirk-backports.patch: Update the EDID quirks code
   to match current git.

xserver-1.3.0-randr12-config-hack.patch:

Index: xserver-1.3.0-randr12-config-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-randr12-config-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-randr12-config-hack.patch	7 May 2007 18:18:16 -0000	1.1
+++ xserver-1.3.0-randr12-config-hack.patch	26 Sep 2007 07:33:55 -0000	1.2
@@ -1,6 +1,7 @@
---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx	2007-04-16 12:53:50.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c	2007-05-02 14:03:28.000000000 -0400
-@@ -1202,6 +1202,23 @@
+diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.da	2007-09-26 17:12:44.000000000 +1000
++++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c	2007-09-26 17:14:44.000000000 +1000
+@@ -1214,6 +1214,23 @@ xf86SortModes (DisplayModePtr input)
      return output;
  }
  
@@ -21,10 +22,10 @@
 +    return preferred_mode;
 +}
 +
- #define DEBUG_REPROBE 1
- 
- void
-@@ -1377,8 +1394,7 @@
+ _X_EXPORT void
+ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ {
+@@ -1395,8 +1412,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, 
  	output->probed_modes = xf86SortModes (output->probed_modes);
  	
  	/* Check for a configured preference for a particular mode */


--- xorg-x11-server-1.2.0-maxpixclock-option.patch DELETED ---


--- xserver-1.2.0-honor-displaysize.patch DELETED ---


--- xserver-1.3.0-edid-quirk-backports.patch DELETED ---


--- xserver-1.3.0-less-randr-fakerama.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 07:36:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 26 Sep 2007 03:36:00 -0400
Subject: rpms/cacti/devel cacti.spec,1.14,1.15
Message-ID: <200709260736.l8Q7a0Fm005347@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208

Modified Files:
	cacti.spec 
Log Message:
Rebuild for koji test


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cacti.spec	21 Sep 2007 14:57:08 -0000	1.14
+++ cacti.spec	26 Sep 2007 07:35:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6j
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -115,6 +115,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Wed Sep 26 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-10
+- Rebuild for koji test
+
 * Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> - 0.8.6j-9
 - Added rest of official patches
 



From fedora-extras-commits at redhat.com  Wed Sep 26 08:10:45 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 04:10:45 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.6-hwdevice.patch, NONE,
	1.1 system-config-soundcard.spec, 1.60, 1.61
Message-ID: <200709260810.l8Q8AjWk015887@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/system-config-soundcard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-hwdevice.patch 
Log Message:
fixed hardware device configuration

system-config-soundcard-2.0.6-hwdevice.patch:

--- NEW FILE system-config-soundcard-2.0.6-hwdevice.patch ---
diff -up system-config-soundcard-2.0.6/src/soundcardBackend.py.old system-config-soundcard-2.0.6/src/soundcardBackend.py
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.old	2007-09-26 09:56:42.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-09-26 10:00:44.000000000 +0200
@@ -219,8 +219,8 @@ class soundConfiguration:
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("pcm.!default { type plughw card %d device %d }\n" % (index, device))
-                lines.append("ctl.!default { type plughw card %d }\n" % index)
+                lines.append("pcm.!default { type plug slave {  pcm \"hw:%d,%d\" }}\n" % (index, device))
+                lines.append("ctl.!default { type hw card %d }\n" % index)
             else:
                 lines.append("#SWCONF\n")
                 lines.append("#DEV %d\n" % device)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-soundcard.spec	25 Sep 2007 15:20:15 -0000	1.60
+++ system-config-soundcard.spec	26 Sep 2007 08:10:13 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 9%{dist}
+Release: 10%{dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/soundcard
 License: GPL
 ExclusiveOS: Linux
@@ -15,6 +15,7 @@
 Patch3: system-config-soundcard-2.0.6-usb-hack.patch
 Patch4: system-config-soundcard-2.0.6-desktop.patch
 Patch5: system-config-soundcard-2.0.6-reset.patch
+Patch6: system-config-soundcard-2.0.6-hwdevice.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -42,7 +43,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1 -b .res
+%patch5 -p1
+%patch6 -p1 -b .hw
 
 %build
 make
@@ -92,6 +94,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Sep 26 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-10
+- fixed hardware device configuration
+
 * Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
 - fixed #291691 - Sound card not working gives a window with 
   invalid instructions on first boot



From fedora-extras-commits at redhat.com  Wed Sep 26 08:26:02 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 26 Sep 2007 04:26:02 -0400
Subject: rpms/xchat/devel xc284-improvescrollback.diff, NONE, 1.1 xchat.spec,
	1.78, 1.79
Message-ID: <200709260826.l8Q8Q2mf016456@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16428/devel

Modified Files:
	xchat.spec 
Added Files:
	xc284-improvescrollback.diff 
Log Message:
apply xc284-improvescrollback.diff from upstream

xc284-improvescrollback.diff:

--- NEW FILE xc284-improvescrollback.diff ---
#
# 1) Stops scrollback files growing too large by fixing the file-shrink code.
# 2) Puts a "Display scrollback from previous session" into the Setup GUI
#    (logging section) so people can turn this off without typing commands.
#
--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
+++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
@@ -285,6 +285,8 @@
 		}
 	}
 
+	sess->scrollwritten = lines;
+
 	if (lines)
 	{
 		text = ctime (&stamp);
--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
+++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
@@ -382,7 +382,8 @@
 static const setting logging_settings[] =
 {
 	{ST_HEADER,	N_("Logging"),0,0,0},
-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
+	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xchat.spec	23 Aug 2007 15:21:43 -0000	1.78
+++ xchat.spec	26 Sep 2007 08:25:28 -0000	1.79
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   4%{?dist}.1
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@
 # Patches 0-9 reserved for official xchat.org patches
 # Fix creation of ~/.xchat2/scrollback/ paths.
 Patch0: xc284-scrollbmkdir.diff
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+Patch1: xc284-improvescrollback.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -62,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,6 +162,9 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
 * Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> - 1:2.8.4-4.fc8.1
 - F-8 rebuild (BuildID)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 08:29:46 2007
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Wed, 26 Sep 2007 04:29:46 -0400
Subject: rpms/xchat/F-7 xc284-improvescrollback.diff, NONE, 1.1 xchat.spec, 
	1.73, 1.74
Message-ID: <200709260829.l8Q8Tkom016652@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16534/F-7

Modified Files:
	xchat.spec 
Added Files:
	xc284-improvescrollback.diff 
Log Message:
Sync from devel:
- add missing BR perl(ExtUtils::Embed)
- apply xc284-improvescrollback.diff from upstream

xc284-improvescrollback.diff:

--- NEW FILE xc284-improvescrollback.diff ---
#
# 1) Stops scrollback files growing too large by fixing the file-shrink code.
# 2) Puts a "Display scrollback from previous session" into the Setup GUI
#    (logging section) so people can turn this off without typing commands.
#
--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
+++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
@@ -285,6 +285,8 @@
 		}
 	}
 
+	sess->scrollwritten = lines;
+
 	if (lines)
 	{
 		text = ctime (&stamp);
--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
+++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
@@ -382,7 +382,8 @@
 static const setting logging_settings[] =
 {
 	{ST_HEADER,	N_("Logging"),0,0,0},
-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
+	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/xchat.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xchat.spec	3 Aug 2007 01:16:16 -0000	1.73
+++ xchat.spec	26 Sep 2007 08:29:12 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   3%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@
 # Patches 0-9 reserved for official xchat.org patches
 # Fix creation of ~/.xchat2/scrollback/ paths.
 Patch0: xc284-scrollbmkdir.diff
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+Patch1: xc284-improvescrollback.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -24,7 +28,7 @@
 # see #241923
 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 
-BuildRequires: perl python-devel openssl-devel pkgconfig, tcl-devel
+BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
@@ -62,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,8 +162,17 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
+* Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> - 1:2.8.4-4.fc8.1
+- F-8 rebuild (BuildID)
+
+* Sat Aug 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-4
+- add missing BR perl(ExtUtils::Embed)
+
 * Fri Aug  3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-3
-- Specify GPL version in License tag.
+- specify GPL version in License tag
 
 * Tue Jul 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-2
 - apply xc284-scrollbmkdir.diff from upstream



From fedora-extras-commits at redhat.com  Wed Sep 26 08:46:14 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Wed, 26 Sep 2007 04:46:14 -0400
Subject: rpms/ice/F-7 ice.spec,1.4,1.5
Message-ID: <200709260846.l8Q8kEec019730@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19436

Modified Files:
	ice.spec 
Log Message:
Move ant classes to a jar file
Include patches from ZeroC



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ice.spec	7 Sep 2007 08:37:18 -0000	1.4
+++ ice.spec	26 Sep 2007 08:45:42 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -36,6 +36,9 @@
 Patch6:         Ice-3.2.0-dont-build-test.patch
 Patch7:         IceCS-3.2.1-dont-build-test.patch
 Patch8:         IceCS-3.2.1-use-gac.patch
+Patch9:         http://www.zeroc.com/forums/attachments/patches/527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt
+Patch10:        http://www.zeroc.com/forums/attachments/patches/530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt
+Patch11:        http://www.zeroc.com/forums/attachments/patches/531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -181,6 +184,9 @@
 %prep
 %setup -n Ice-%{version} -q
 %patch6 -p1
+%patch9 -p2
+%patch10 -p2
+%patch11 -p2
 
 # Fix some permission issues/
 chmod a-x config/*.py
@@ -231,6 +237,7 @@
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5/ant
 rm *.class
 javac -d . -source 1.4 -target 1.4 *.java
+jar cvf ant-ice-%{version}.jar *.class
 
 # Build the Java stuff
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5
@@ -373,8 +380,9 @@
 mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE
 
 # Copy the Ant task files into the right place
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
-cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
+cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ant-ice-%{version}.jar ${RPM_BUILD_ROOT}%{_javadir}
+ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -522,6 +530,8 @@
 %{_bindir}/slice2java
 %{_bindir}/slice2freezej
 %{_datadir}/Ice-%{version}/ant
+%{_javadir}/ant-ice-%{version}.jar
+%{_javadir}/ant-ice.jar
 
 %files csharp
 %defattr(-,root,root,-)
@@ -581,6 +591,10 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Wed Sep 26 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-12
+- Put the slice2java classes into a .jar file instead of as bare classes
+- Incorporate patches from ZeroC
+
 * Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
 - Fix bad date in changelog



From fedora-extras-commits at redhat.com  Wed Sep 26 08:51:29 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 26 Sep 2007 04:51:29 -0400
Subject: rpms/makehuman/devel makehuman.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709260851.l8Q8pTcj020095@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/makehuman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20049/devel

Modified Files:
	.cvsignore sources 
Added Files:
	makehuman.spec 
Log Message:
Initial import



--- NEW FILE makehuman.spec ---
Name:           makehuman
Version:        0.9
Release:        3%{?dist}
Summary:        Modeling of three-dimensional humanoid characters

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/makehuman-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mhgui-devel
BuildRequires:  desktop-file-utils


%description
MakeHuman(C) is an open-source, open graphics library, stand-alone,
multi-platform, software program, which is completely written in 
C++ language. Its purpose is to provide a versatile, professional
and extremely specialized application for parametrical modeling of
three-dimensional humanoid characters.


%prep
%setup -q
chmod 0644 src/*

sed -i.timestamp -e 's|cp -R|cp -pR|g' {data,pixmaps}/Makefile.{am,in}

%build
%configure --disable-static
sed -i -e 's|-L/usr/lib|-L%{_libdir}|' Makefile
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

# Symlink for pixmap
ln -s %{name}/ui/mybs.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=MakeHuman
Comment=Design characters
Comment[fr]=Mod??liser des personnages
Exec=makehuman
Terminal=false
Icon=makehuman
Type=Application
Categories=Graphics;
EOF

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora                    \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
  %{name}.desktop

# Remove zero-length files
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_tongue/tongue_camaleon.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_teeth/teeth_gengivite.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/l_ear2/l_ear_incisura_intertragica_down.target
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/targets/ns_abdomen/abdomen_twist.target

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README.txt TODO
%{_bindir}/makehuman
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/pixmaps/%{name}/
%{_datadir}/applications/*.desktop


%changelog
* Fri Sep 21 2007 kwizart < kwizart at gmail.com > - 0.9-3
- Add pixmap for .desktop
- Remove Category Application
- License is GPLv2+

* Thu Sep 20 2007 kwizart < kwizart at gmail.com > - 0.9-2
- Fix timestamp
- Drop update-desktop-database
- Remove zero-length files

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.9-1
- Initial spec file for Fedora 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/makehuman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 23:14:09 -0000	1.1
+++ .cvsignore	26 Sep 2007 08:50:57 -0000	1.2
@@ -0,0 +1 @@
+makehuman-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/makehuman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 23:14:09 -0000	1.1
+++ sources	26 Sep 2007 08:50:57 -0000	1.2
@@ -0,0 +1 @@
+c544e01b253fe20916bbd632b3c47b35  makehuman-0.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 08:56:12 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Wed, 26 Sep 2007 04:56:12 -0400
Subject: rpms/libsvm/devel libsvm-2.84-6.patch, NONE, 1.1 libsvm.spec, 1.6, 
	1.7 libsvm-2.84-5.patch, 1.1, NONE
Message-ID: <200709260856.l8Q8uCrE020246@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20212/devel

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-6.patch 
Removed Files:
	libsvm-2.84-5.patch 
Log Message:
- Add defattr to each subpackage
- Move libsvm.so to libsvm


libsvm-2.84-6.patch:

--- NEW FILE libsvm-2.84-6.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-26 17:07:55.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,57 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	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
+#	cp -R java ${INSTDIR}/share/libsvm/src
+#	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsvm.spec	26 Sep 2007 03:06:45 -0000	1.6
+++ libsvm.spec	26 Sep 2007 08:55:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-5.patch
+Patch0:         libsvm-2.84-6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -79,6 +79,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,25 +92,34 @@
 %{_bindir}/svm-scale
 %{_bindir}/svm-train
 %{_datadir}/libsvm/examples
+%{_libdir}/libsvm/libsvm.so
+%{_libdir}/libsvm/libsvm.so.2.84
 
 %files devel
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/libsvm
 %{_includedir}/libsvm
 %{_datadir}/libsvm/src
 
 %files python
+%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
 %files java
+%defattr(-,root,root,-)
 %doc java/README-Java
 #%{_libdir}/java/libsvm/docs
 %{_libdir}/java/libsvm/libsvm.jar
 %{_libdir}/java/libsvm/test_applet.html
 
 %changelog
-* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+* Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
+- Add defattr to each subpackage
+- Move libsvm.so to libsvm
+
+* Thu Sep 24 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so
 


--- libsvm-2.84-5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 08:56:25 2007
From: fedora-extras-commits at redhat.com (Mary Ellen Foster (mef))
Date: Wed, 26 Sep 2007 04:56:25 -0400
Subject: rpms/ice/F-7 527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt, 
	NONE, 1.1
	530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt,
	NONE, 1.1
	531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt,
	NONE, 1.1
Message-ID: <200709260856.l8Q8uPDw020289@cvs-int.fedora.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/ice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20245

Added Files:
	527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt 
	530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt 
	531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt 
Log Message:
Added patch files directly; I guess you can't download them while building.



--- NEW FILE 527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt ---
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 78d234d..37b695e 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -2054,7 +2054,8 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << sb;
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                _out << nl << "this." << fixId((*q)->name()) << " = " << fixId((*q)->name()) << ';';
+                string name = fixId((*q)->name(), DotNet::ApplicationException, false);
+                _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';';
             }
             _out << eb;
         }


--- NEW FILE 530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt ---
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index c41aa5c..1368294 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1195,19 +1195,20 @@ ServiceHelper::ServiceHelper(const ServiceDescriptorPtr& descriptor) :
 }
 
 bool 
-ServiceHelper::operator==(const ServiceHelper& helper) const
+ServiceHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!CommunicatorHelper::operator==(helper))
+    const ServiceHelper* helper = dynamic_cast<const ServiceHelper*>(&h);
+    if(!helper || !CommunicatorHelper::operator==(h))
     {
         return false;
     }
 
-    if(_desc->name != helper._desc->name)
+    if(_desc->name != helper->_desc->name)
     {
         return false;
     }
 
-    if(_desc->entry != helper._desc->entry)
+    if(_desc->entry != helper->_desc->entry)
     {
         return false;
     }
@@ -1216,7 +1217,7 @@ ServiceHelper::operator==(const ServiceHelper& helper) const
 }
 
 bool
-ServiceHelper::operator!=(const ServiceHelper& helper) const
+ServiceHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
@@ -1272,66 +1273,67 @@ ServerHelper::ServerHelper(const ServerDescriptorPtr& descriptor) :
 }
 
 bool 
-ServerHelper::operator==(const ServerHelper& helper) const
+ServerHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!CommunicatorHelper::operator==(helper))
+    const ServerHelper* helper = dynamic_cast<const ServerHelper*>(&h);
+    if(!helper || !CommunicatorHelper::operator==(h))
     {
         return false;
     }
 
-    if(_desc->id != helper._desc->id)
+    if(_desc->id != helper->_desc->id)
     {
         return false;
     }
 
-    if(_desc->exe != helper._desc->exe)
+    if(_desc->exe != helper->_desc->exe)
     {
         return false;
     }
 
-    if(_desc->pwd != helper._desc->pwd)
+    if(_desc->pwd != helper->_desc->pwd)
     {
         return false;
     }
 
     if(set<string>(_desc->options.begin(), _desc->options.end()) != 
-       set<string>(helper._desc->options.begin(), helper._desc->options.end()))
+       set<string>(helper->_desc->options.begin(), helper->_desc->options.end()))
     {
         return false;
     }
 
     if(set<string>(_desc->envs.begin(), _desc->envs.end()) != 
-       set<string>(helper._desc->envs.begin(), helper._desc->envs.end()))
+       set<string>(helper->_desc->envs.begin(), helper->_desc->envs.end()))
     {
         return false;
     }
 
-    if(_desc->activation != helper._desc->activation)
+    if(_desc->activation != helper->_desc->activation)
     {
         return false;
     }
 
-    if(_desc->activationTimeout != helper._desc->activationTimeout)
+    if(_desc->activationTimeout != helper->_desc->activationTimeout)
     {
         return false;
     }
 
-    if(_desc->deactivationTimeout != helper._desc->deactivationTimeout)
+    if(_desc->deactivationTimeout != helper->_desc->deactivationTimeout)
     {
         return false;
     }
 
-    if(_desc->distrib != helper._desc->distrib)
+    if(_desc->distrib != helper->_desc->distrib)
     {
         return false;
     }
 
-    if(_desc->allocatable != helper._desc->allocatable)
+    if(_desc->allocatable != helper->_desc->allocatable)
     {
         return false;
     }
 
-    if(_desc->user != helper._desc->user)
+    if(_desc->user != helper->_desc->user)
     {
         return false;
     }
@@ -1340,7 +1342,7 @@ ServerHelper::operator==(const ServerHelper& helper) const
 }
 
 bool
-ServerHelper::operator!=(const ServerHelper& helper) const
+ServerHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
@@ -1483,14 +1485,15 @@ IceBoxHelper::IceBoxHelper(const IceBoxDescriptorPtr& descriptor) :
 }
 
 bool 
-IceBoxHelper::operator==(const IceBoxHelper& helper) const
+IceBoxHelper::operator==(const CommunicatorHelper& h) const
 {
-    if(!ServerHelper::operator==(helper))
+    const IceBoxHelper* helper = dynamic_cast<const IceBoxHelper*>(&h);
+    if(!helper || !ServerHelper::operator==(h))
     {
         return false;
     }
-        
-    if(_services != helper._services)
+
+    if(_services != helper->_services)
     {
         return false;
     }
@@ -1499,7 +1502,7 @@ IceBoxHelper::operator==(const IceBoxHelper& helper) const
 }
 
 bool
-IceBoxHelper::operator!=(const IceBoxHelper& helper) const
+IceBoxHelper::operator!=(const CommunicatorHelper& helper) const
 {
     return !operator==(helper);
 }
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index e222940..f16d50a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -86,8 +86,8 @@ public:
     CommunicatorHelper() { }
     virtual ~CommunicatorHelper() { }
 
-    bool operator==(const CommunicatorHelper&) const;
-    bool operator!=(const CommunicatorHelper&) const;
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;
 
     virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
     virtual void getReplicaGroups(std::set<std::string>&) const;
@@ -115,8 +115,8 @@ public:
     ServiceHelper(const ServiceDescriptorPtr&);
     ServiceHelper() { }
 
-    bool operator==(const ServiceHelper&) const;
-    bool operator!=(const ServiceHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     ServiceDescriptorPtr getDescriptor() const;
     ServiceDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
@@ -141,8 +141,8 @@ public:
     ServerHelper(const ServerDescriptorPtr&);
     ServerHelper() { }
 
-    bool operator==(const ServerHelper&) const;
-    bool operator!=(const ServerHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     ServerDescriptorPtr getDescriptor() const;
     virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&,
@@ -203,8 +203,8 @@ public:
     IceBoxHelper(const IceBoxDescriptorPtr&);
     IceBoxHelper() { }
 
-    bool operator==(const IceBoxHelper&) const;
-    bool operator!=(const IceBoxHelper&) const;    
+    virtual bool operator==(const CommunicatorHelper&) const;
+    virtual bool operator!=(const CommunicatorHelper&) const;    
 
     virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
                                             const PropertySetDescriptorDict&) const;
@@ -267,8 +267,8 @@ public:
     NodeHelper(const std::string&, const NodeDescriptor&, const Resolver&, bool);
     virtual ~NodeHelper() { }
 
-    bool operator==(const NodeHelper&) const;
-    bool operator!=(const NodeHelper&) const;
+    virtual bool operator==(const NodeHelper&) const;
+    virtual bool operator!=(const NodeHelper&) const;
 
     NodeUpdateDescriptor diff(const NodeHelper&) const;
     NodeDescriptor update(const NodeUpdateDescriptor&, const Resolver&) const;


--- NEW FILE 531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt ---
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index 28c8b57..ca935b3 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -34,6 +34,7 @@ public:
 
 protected:
     static std::string fixId(const std::string&, int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
     static std::string typeToString(const TypePtr&);
     static bool isValueType(const TypePtr&);
 
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index 061033b..387de74 100755
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -130,6 +130,21 @@ Slice::CsGenerator::fixId(const string& name, int baseTypes, bool mangleCasts)
 }
 
 string
+Slice::CsGenerator::fixId(const ContainedPtr& cont, int baseTypes, bool mangleCasts)
+{
+    ContainerPtr container = cont->container();
+    ContainedPtr contained = ContainedPtr::dynamicCast(container);
+    if(contained && contained->hasMetaData("clr:property"))
+    {
+        return cont->name() + "_prop";
+    }
+    else
+    {
+        return fixId(cont->name(), baseTypes, mangleCasts);
+    }
+}
+
+string
 Slice::CsGenerator::typeToString(const TypePtr& type)
 {
     if(!type)
@@ -476,7 +491,10 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
         else
         {
             string typeS = typeToString(type);
-            out << nl << param << " = new " << typeS << "();";
+            if(param.size() < 6 || param.substr(param.size() - 5) != "_prop")
+            {
+                out << nl << param << " = new " << typeS << "();";
+            }
             if(streamingAPI)
             {
                 out << nl << param << ".ice_read(" << stream << ");";
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 5f83f8f..80c096b 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -728,8 +728,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     _out << nl << "os__.startWriteSlice();";
     for(d = members.begin(); d != members.end(); ++d)
     {
-        writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                  fixId((*d)->name(), DotNet::ICloneable, true),
+        writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                   true, false, false);
     }
     _out << nl << "os__.endWriteSlice();";
@@ -831,8 +830,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                 patchParams << ", " << classMemberCount++;
             }
         }
-        writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                  fixId((*d)->name(), DotNet::ICloneable, true),
+        writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                   false, false, false, patchParams.str());
     }
     _out << nl << "is__.endReadSlice();";
@@ -850,8 +848,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << nl << "outS__.startSlice();";
         for(d = members.begin(); d != members.end(); ++d)
         {
-            writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                      fixId((*d)->name(), DotNet::ICloneable, true),
+            writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                       true, true, false);
         }
         _out << nl << "outS__.endSlice();";
@@ -877,8 +874,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*d)->type(),
-                                      fixId((*d)->name(), DotNet::ICloneable, true),
+            writeMarshalUnmarshalCode(_out, (*d)->type(), fixId(*d, DotNet::ICloneable, true),
                                       false, true, false, patchParams.str());
         }
         _out << nl << "inS__.endSlice();";
@@ -2187,8 +2183,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         _out << nl << "os__.startWriteSlice();";
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), DotNet::ApplicationException),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, DotNet::ApplicationException),
                                       true, false, false);
         }
         _out << nl << "os__.endWriteSlice();";
@@ -2295,8 +2290,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), DotNet::ApplicationException),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                       false, false, false, patchParams.str());
         }
         _out << nl << "is__.endReadSlice();";
@@ -2314,8 +2308,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << nl << "outS__.startSlice();";
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), DotNet::ApplicationException),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                           true, true, false);
             }
             _out << nl << "outS__.endSlice();";
@@ -2345,8 +2338,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                         patchParams << ", " << classMemberCount++;
                     }
                 }
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), DotNet::ApplicationException),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId((*q)->name(), DotNet::ApplicationException),
                                           false, true, false, patchParams.str());
             }
             _out << nl << "inS__.endSlice();";
@@ -2457,6 +2449,8 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         _out << eb;
     }
 
+    bool propertyMapping = p->hasMetaData("clr:property");
+
     _out << sp << nl << "public " << name << spar;
     vector<string> paramDecl;
     vector<string> paramNames;
@@ -2471,7 +2465,12 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     _out << sb;
     for(vector<string>::const_iterator i = paramNames.begin(); i != paramNames.end(); ++i)
     {
-        _out << nl << "this." << *i << " = " << *i << ';';
+        _out << nl << "this." << *i;
+        if(propertyMapping)
+        {
+            _out << "_prop";
+        }
+        _out << " = " << *i << ';';
     }
     _out << eb;
 
@@ -2595,8 +2594,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         _out << sb;
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), isClass ? DotNet::ICloneable : 0),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0),
                                       true, false, false);
         }
         _out << eb;
@@ -2688,8 +2686,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                     patchParams << ", " << classMemberCount++;
                 }
             }
-            writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                      fixId((*q)->name(), isClass ? DotNet::ICloneable : 0 ),
+            writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0 ),
                                       false, false, false, patchParams.str());
         }
         _out << eb;
@@ -2700,8 +2697,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             _out << sb;
             for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), isClass ? DotNet::ICloneable : 0),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0),
                                           true, true, false);
             }
             _out << eb;
@@ -2721,8 +2717,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                         patchParams << ", " << classMemberCount++;
                     }
                 }
-                writeMarshalUnmarshalCode(_out, (*q)->type(),
-                                          fixId((*q)->name(), isClass ? DotNet::ICloneable : 0 ),
+                writeMarshalUnmarshalCode(_out, (*q)->type(), fixId(*q, isClass ? DotNet::ICloneable : 0 ),
                                           false, true, false, patchParams.str());
             }
             _out << eb;



From fedora-extras-commits at redhat.com  Wed Sep 26 09:23:51 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 05:23:51 -0400
Subject: rpms/tinyerp/devel tinyerp.desktop,1.4,1.5 tinyerp.spec,1.27,1.28
Message-ID: <200709260923.l8Q9Np5V027327@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27307

Modified Files:
	tinyerp.desktop tinyerp.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
- update the desktop file to the current standards



Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.desktop	24 Jul 2006 16:49:01 -0000	1.4
+++ tinyerp.desktop	26 Sep 2007 09:23:18 -0000	1.5
@@ -8,6 +8,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Office;X-Fedora;
-Version=3.0.1
-X-Desktop-File-Install-Version=0.4
+Categories=Office;Finance;
+Version=1.0


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tinyerp.spec	10 Aug 2007 18:20:40 -0000	1.27
+++ tinyerp.spec	26 Sep 2007 09:23:18 -0000	1.28
@@ -21,7 +21,7 @@
 
 Name:		tinyerp
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -171,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
+- update the desktop file to the current standards
+- update the license tag
+
 * Thu Mar 29 2007 Dan Horak <dan[at]danny.cz> 4.0.3-1
 - update to upstream version 4.0.3
 



From fedora-extras-commits at redhat.com  Wed Sep 26 09:26:08 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 05:26:08 -0400
Subject: rpms/tinyerp/F-7 tinyerp.desktop,1.4,1.5 tinyerp.spec,1.27,1.28
Message-ID: <200709260926.l8Q9Q8sR027524@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27381

Modified Files:
	tinyerp.desktop tinyerp.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
- update the desktop file to the current standards



Index: tinyerp.desktop
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-7/tinyerp.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.desktop	24 Jul 2006 16:49:01 -0000	1.4
+++ tinyerp.desktop	26 Sep 2007 09:25:35 -0000	1.5
@@ -8,6 +8,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Office;X-Fedora;
-Version=3.0.1
-X-Desktop-File-Install-Version=0.4
+Categories=Office;Finance;
+Version=1.0


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/F-7/tinyerp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tinyerp.spec	10 Aug 2007 18:20:32 -0000	1.27
+++ tinyerp.spec	26 Sep 2007 09:25:35 -0000	1.28
@@ -21,7 +21,7 @@
 
 Name:		tinyerp
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -171,6 +171,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 4.0.3-2
+- update the desktop file to the current standards
+- update the license tag
+
 * Thu Mar 29 2007 Dan Horak <dan[at]danny.cz> 4.0.3-1
 - update to upstream version 4.0.3
 



From fedora-extras-commits at redhat.com  Wed Sep 26 09:49:49 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Wed, 26 Sep 2007 05:49:49 -0400
Subject: rpms/a2ps/devel a2ps-perl.patch,NONE,1.1 a2ps.spec,1.77,1.78
Message-ID: <200709260949.l8Q9nnui028124@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28101

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-perl.patch 
Log Message:
* Wed Sep 26 2007 Tim Waugh <twaugh at redhat.com> 4.13b-69
- Try out a perl stylesheet speed improvement (bug #252183).


a2ps-perl.patch:

--- NEW FILE a2ps-perl.patch ---
diff -up a2ps-4.13/sheets/perl.ssh.perl a2ps-4.13/sheets/perl.ssh
--- a2ps-4.13/sheets/perl.ssh.perl	2007-09-26 10:30:43.000000000 +0100
+++ a2ps-4.13/sheets/perl.ssh	2007-09-26 10:47:47.000000000 +0100
@@ -106,9 +106,9 @@ operators are
     (/(s|tr)/			# 1. The command: `tr' or `s'
      /(([[:punct:]])/		# 2. The delimiter
      /(/			# 3. The *two* regexps
-     /(.|\\\\.)*/		#   First regexp
+     /(\\\\.)*/			#   First regexp
      /\\3/			#   Separator
-     /(.|\\\\.)*/		#   Second Regexp
+     /(\\\\.)*/			#   Second Regexp
      /)/			#
      /\\3)/			# Closer
      \1 Keyword_strong, \2 Plain),


Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- a2ps.spec	25 Sep 2007 17:12:06 -0000	1.77
+++ a2ps.spec	26 Sep 2007 09:49:17 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
 Version: 4.13b
-Release: 68%{?dist}
+Release: 69%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 #Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -22,6 +22,7 @@
 Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
 Patch8: a2ps-iso5-minus.patch
+Patch9: a2ps-perl.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -85,6 +86,7 @@
 %patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
 %patch8 -p1 -b .iso5-minus
+%patch9 -p1 -b .perl
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -267,6 +269,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Sep 26 2007 Tim Waugh <twaugh at redhat.com> 4.13b-69
+- Try out a perl stylesheet speed improvement (bug #252183).
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 4.13b-68
 - Make minus sign work in ISO-8859-5 (bug #252314).
 



From fedora-extras-commits at redhat.com  Wed Sep 26 11:18:51 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 26 Sep 2007 07:18:51 -0400
Subject: rpms/texinfo/F-7 texinfo-4.11-zlib.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 sources, 1.10, 1.11 texinfo.spec, 1.41,
	1.42 texinfo-4.8-0xA0.patch, 1.1,
	NONE texinfo-4.8-texindex.patch, 1.1,
	NONE texinfo-4.8-zlib.patch, 1.1, NONE
Message-ID: <200709261118.l8QBIprr010487@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10459

Modified Files:
	.cvsignore sources texinfo.spec 
Added Files:
	texinfo-4.11-zlib.patch 
Removed Files:
	texinfo-4.8-0xA0.patch texinfo-4.8-texindex.patch 
	texinfo-4.8-zlib.patch 
Log Message:
Rebase to upstream texinfo-4.11, Fix license

texinfo-4.11-zlib.patch:

--- NEW FILE texinfo-4.11-zlib.patch ---
--- texinfo-4.11/util/Makefile.in_old	2007-09-10 02:37:45.000000000 +0200
+++ texinfo-4.11/util/Makefile.in	2007-09-19 10:29:06.000000000 +0200
@@ -110,7 +110,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
-ginstall_info_LDADD = $(LDADD)
+ginstall_info_LDADD = $(LDADD) -lz
 am__DEPENDENCIES_1 =
 ginstall_info_DEPENDENCIES = ../lib/libtxi.a \
 	$(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
--- texinfo-4.11/util/install-info.c_old	2007-07-01 23:20:33.000000000 +0200
+++ texinfo-4.11/util/install-info.c	2007-09-19 10:40:02.000000000 +0200
@@ -20,6 +20,7 @@
 #include "system.h"
 #include <getopt.h>
 #include <regex.h>
+#include <zlib.h>
 
 static char *progname = "install-info";
 
@@ -559,7 +560,7 @@
    COMPRESSION_PROGRAM.  The compression program is determined by the
    magic number, not the filename.  */
 
-FILE *
+void *
 open_possibly_compressed_file (char *filename,
     void (*create_callback) (char *),
     char **opened_filename, char **compression_program, int *is_pipe) 
@@ -567,7 +568,7 @@
   char *local_opened_filename, *local_compression_program;
   int nread;
   char data[4];
-  FILE *f;
+  gzFile *f;
 
   /* We let them pass NULL if they don't want this info, but it's easier
      to always determine it.  */
@@ -575,16 +576,16 @@
     opened_filename = &local_opened_filename;
 
   *opened_filename = filename;
-  f = fopen (*opened_filename, FOPEN_RBIN);
+  f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       *opened_filename = concat (filename, ".gz", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
       free (*opened_filename);
       *opened_filename = concat (filename, ".bz2", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
+      f = gzopen (*opened_filename, FOPEN_RBIN);
     }
 
 #ifdef __MSDOS__
@@ -592,13 +593,13 @@
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".igz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
       if (!f)
         {
           free (*opened_filename);
           *opened_filename = concat (filename, ".inz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
+          f = gzopen (*opened_filename, FOPEN_RBIN);
         }
 #endif
       if (!f)
@@ -610,7 +611,7 @@
               /* And try opening it again.  */
               free (*opened_filename);
               *opened_filename = filename;
-              f = fopen (*opened_filename, FOPEN_RBIN);
+              f = gzopen (*opened_filename, FOPEN_RBIN);
               if (!f)
                 pfatal_with_name (filename);
             }
@@ -621,12 +622,12 @@
 
   /* Read first few bytes of file rather than relying on the filename.
      If the file is shorter than this it can't be usable anyway.  */
-  nread = fread (data, sizeof (data), 1, f);
-  if (nread != 1)
+  nread = gzread (f, data, sizeof (data));
+  if (nread != sizeof (data))
     {
       /* Empty files don't set errno, so we get something like
          "install-info: No error for foo", which is confusing.  */
-      if (nread == 0)
+      if (nread >= 0)
         fatal (_("%s: empty file"), *opened_filename, 0);
       pfatal_with_name (*opened_filename);
     }
@@ -659,20 +660,22 @@
 
   if (*compression_program)
     { /* It's compressed, so fclose the file and then open a pipe.  */
+      FILE *p;
       char *command = concat (*compression_program," -cd <", *opened_filename);
-      if (fclose (f) < 0)
+      if (gzclose (f) < 0)
         pfatal_with_name (*opened_filename);
-      f = popen (command, "r");
-      if (f)
+      p = popen (command, "r");
+      if (p)
         *is_pipe = 1;
       else
         pfatal_with_name (command);
+      return p;
     }
   else
     { /* It's a plain file, seek back over the magic bytes.  */
-      if (fseek (f, 0, 0) < 0)
+      if (gzseek (f, 0, SEEK_SET) < 0)
         pfatal_with_name (*opened_filename);
-#if O_BINARY
+#if 0 && O_BINARY
       /* Since this is a text file, and we opened it in binary mode,
          switch back to text mode.  */
       f = freopen (*opened_filename, "r", f);
@@ -697,7 +700,7 @@
     char **compression_program)
 {
   char *real_name;
-  FILE *f;
+  void *f;
   int pipe_p;
   int filled = 0;
   int data_size = 8192;
@@ -711,7 +714,12 @@
 
   for (;;)
     {
-      int nread = fread (data + filled, 1, data_size - filled, f);
+      int nread;
+      
+      if (pipe_p)
+       nread = fread (data + filled, 1, data_size - filled, f);
+      else
+       nread = gzread (f, data + filled, data_size - filled);
       if (nread < 0)
         pfatal_with_name (real_name);
       if (nread == 0)
@@ -733,7 +741,7 @@
   if (pipe_p)
     pclose (f);
   else
-    fclose (f);
+    gzclose (f);
 
   *sizep = filled;
   return data;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Feb 2005 17:09:24 -0000	1.10
+++ .cvsignore	26 Sep 2007 11:18:18 -0000	1.11
@@ -1,2 +1,3 @@
 texinfo-4.7.tar.bz2
 texinfo-4.8.tar.bz2
+texinfo-4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2005 17:09:24 -0000	1.10
+++ sources	26 Sep 2007 11:18:18 -0000	1.11
@@ -1 +1 @@
-6ba369bbfe4afaa56122e65b3ee3a68c  texinfo-4.8.tar.bz2
+c6bf13df4fbeff8ce874aacd6a51e814  texinfo-4.11.tar.bz2


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/texinfo.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- texinfo.spec	4 Dec 2006 21:42:24 -0000	1.41
+++ texinfo.spec	26 Sep 2007 11:18:18 -0000	1.42
@@ -1,16 +1,14 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 4.8
-Release: 15
-License: GPL
+Version: 4.11
+Release: 1
+License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
 Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2
 Source1: info-dir
 Source2: texi2pdf.man
-Patch0: texinfo-4.8-zlib.patch
-Patch1: texinfo-4.8-texindex.patch
-Patch2: texinfo-4.8-0xA0.patch
+Patch0: texinfo-4.11-zlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -61,8 +59,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .zlib
-%patch1 -p1 -b .texindex
-%patch2 -p1 -b .0xA0
 
 %build
 
@@ -135,11 +131,18 @@
 %{_bindir}/texindex
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
+%{_bindir}/pdftexi2dvi
 %{_mandir}/man1/texindex.1*
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Wed Sep 26 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
+- Rebase to upstream texinfo-4.11 (update zlib.patch, drop
+  texindex.patch and 0xA0.patch -- both included in upstream)
+- Fix license
+  Resolves: #304531
+
 * Mon Dec  4 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-15
 - Don't replace 0xA0 by a space in makeinfo
   Related: #208511


--- texinfo-4.8-0xA0.patch DELETED ---


--- texinfo-4.8-texindex.patch DELETED ---


--- texinfo-4.8-zlib.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 11:21:05 2007
From: fedora-extras-commits at redhat.com (Vitezslav Crhonek (vcrhonek))
Date: Wed, 26 Sep 2007 07:21:05 -0400
Subject: rpms/texinfo/F-7 texinfo.spec,1.42,1.43
Message-ID: <200709261121.l8QBL5gS010726@cvs-int.fedora.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10690

Modified Files:
	texinfo.spec 
Log Message:
add dist


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-7/texinfo.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- texinfo.spec	26 Sep 2007 11:18:18 -0000	1.42
+++ texinfo.spec	26 Sep 2007 11:20:33 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.11
-Release: 1
+Release: 1%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/



From fedora-extras-commits at redhat.com  Wed Sep 26 11:38:36 2007
From: fedora-extras-commits at redhat.com (Petr Machata (pmachata))
Date: Wed, 26 Sep 2007 07:38:36 -0400
Subject: rpms/tzdata/devel .cvsignore,1.37,1.38 sources,1.39,1.40
Message-ID: <200709261138.l8QBcaJa011350@cvs-int.fedora.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11316

Modified Files:
	.cvsignore sources 
Log Message:
Add javazic source.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Aug 2007 16:06:54 -0000	1.37
+++ .cvsignore	26 Sep 2007 11:38:04 -0000	1.38
@@ -1,3 +1,4 @@
-tzcode2007g.tar.gz
 tzdata2007g.tar.gz
+tzcode2007g.tar.gz
 tzdata-base-0.tar.bz2
+javazic.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	22 Aug 2007 16:06:54 -0000	1.39
+++ sources	26 Sep 2007 11:38:04 -0000	1.40
@@ -1,3 +1,4 @@
-a5da1f7650c541fa61f9ddd0c10b5332  tzcode2007g.tar.gz
 04152531a69c07b6cb08bacfd425aae1  tzdata2007g.tar.gz
+a5da1f7650c541fa61f9ddd0c10b5332  tzcode2007g.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2
+6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:10:31 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 08:10:31 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec, 1.36, 1.37 sources,
	1.8, 1.9
Message-ID: <200709261210.l8QCAVMF018285@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/fonts-japanese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18262

Modified Files:
	fonts-japanese.spec sources 
Log Message:
* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
- clean up the spec file.


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fonts-japanese.spec	31 Aug 2007 01:37:15 -0000	1.36
+++ fonts-japanese.spec	26 Sep 2007 12:09:58 -0000	1.37
@@ -16,8 +16,8 @@
 
 Name:           fonts-japanese
 Version:        0.20061016
-Release:        11%{?dist}
-License:        Public Domain and GPL+ and BSD and mplus
+Release:        12%{?dist}
+License:        Public Domain and BSD and mplus
 Group:          User Interface/X
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,13 +30,7 @@
 ## files in jisksp14
 ### Licensed under Public Domain
 Source10:       jisksp14.bdf.gz
-## files in jisksp16-1990
-### Licensed under Public Domain
-Source20:       jisksp16-1990.bdf.gz
-## files in kappa20
-## files in knm_new
-### Licensed under GPL+
-Source40:       http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
+## files in kaname
 ### Licensed under Public Domain
 Source41:       ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz
 ## files in fonts-ja
@@ -96,8 +90,8 @@
 
 Summary:        Free Japanese Bitmap fonts
 
-Provides:	jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16
-Obsoletes:	jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16
+Provides:	jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16
+Obsoletes:	jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16
 Requires:       sazanami-fonts-gothic sazanami-fonts-mincho
 
 %description
@@ -106,14 +100,11 @@
 
 %prep
 #%%setup -q -T -c -a 5 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
-%setup -q -T -c -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
+%setup -q -T -c -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
 ## ttfonts-ja
 ## jisksp14
 gunzip -c %{SOURCE10} > jisksp14.bdf
-## jisksp16-1990
-gunzip -c %{SOURCE20} > jisksp16-1990.bdf
 ## kappa20
-## knm_new
 ## fonts-ja
 gunzip -c %{SOURCE55} > jiskan16-1990.bdf
 gunzip -c %{SOURCE56} > jiskano16-1997.bdf
@@ -132,10 +123,7 @@
 %build
 ## jisksp14
 bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz
-## jisksp16-1990
-bdftopcf jisksp16-1990.bdf | gzip -9 > jisksp16-1990.pcf.gz
 ## kappa20
-## knm_new
 ## fonts-ja
 pushd %{shinonome}-src
 %configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir}
@@ -303,10 +291,7 @@
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## jisksp14
-install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
-
-## jisksp16-1990
-install -m 0644 jisksp16-1990.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
 
 ## kappa20
 
@@ -319,13 +304,13 @@
 ### remove an unnecessary file
 rm -f fonts-ja/mplus_cursors.pcf.gz
 for i in fonts-ja/*.pcf.gz; do
-    install -m 0644 $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
+    install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
 done
 
 # for ghostscript
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # Create fonts.scale and fonts.dir
 /usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
@@ -334,7 +319,7 @@
 touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
 
-install -m 0644 fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
 
 # Install catalogue symlink
 install -d $RPM_BUILD_ROOT%{catalogue}
@@ -358,7 +343,7 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{basefontdir}
@@ -376,6 +361,10 @@
 %{catalogue}/*
 
 %changelog
+* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
+- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
+- clean up the spec file.
+
 * Fri Aug 31 2007 Akira TAGOH <tagoh at redhat.com>
 - Add jiskan24-2000-{1,2} and jiskan24-2003-1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Aug 2007 01:37:15 -0000	1.8
+++ sources	26 Sep 2007 12:09:58 -0000	1.9
@@ -3,10 +3,8 @@
 77d997789026b1829bb4a33f65a0ce78  jiskan16-1990.bdf.Z
 c9fd21064b4ad6f1af0bcdb40a4222ee  jiskano16-1997.bdf.Z
 e8a452c07cd5d1d31d3a6f32c2b74265  jisksp14.bdf.gz
-d0d24d605ee62833234b711d6766e16c  jisksp16-1990.bdf.gz
 c59fc33f4319a291c1f3f7d58d896b9c  k14-oldkanji.tar.gz
 e0a103ceeffe0aa1c5670458f47452b3  kaname_k12_bdf.tar.gz
-065920714d022cfd225feb6d80b03238  knm_new.tar.gz
 a412bc6920d29be2689b3c3192bcdbd2  marumoji.tgz
 38ce9221d128383a3f9f50eb641da424  shinonome-0.9.11-src.tar.bz2
 c6b7771e4f00e310fe807b3245fd316e  vine-fonttools-0.1.tgz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:49:00 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 08:49:00 -0400
Subject: rpms/pirut/devel .cvsignore, 1.70, 1.71 pirut.spec, 1.73,
	1.74 sources, 1.72, 1.73
Message-ID: <200709261249.l8QCn0PG021858@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/pirut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21829

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
- Fix hang with multiple searches (#296521)
- Catch a couple more error cases (#302161)
- Update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	18 Sep 2007 19:23:19 -0000	1.70
+++ .cvsignore	26 Sep 2007 12:48:26 -0000	1.71
@@ -1 +1 @@
-pirut-1.3.19.tar.gz
+pirut-1.3.20.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pirut.spec	18 Sep 2007 19:23:19 -0000	1.73
+++ pirut.spec	26 Sep 2007 12:48:26 -0000	1.74
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.19
+Version: 1.3.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -76,6 +76,11 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
+- Fix hang with multiple searches (#296521)
+- Catch a couple more error cases (#302161)
+- Update translations
+
 * Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
 - Make reboot vs warnings clearer (#292011)
 - Select on row activation in lists (#292261)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	18 Sep 2007 19:23:19 -0000	1.72
+++ sources	26 Sep 2007 12:48:26 -0000	1.73
@@ -1 +1 @@
-f2b2b5821814c6d78ce0ee92ccc5226e  pirut-1.3.19.tar.gz
+31650615efc0f30b05ad005fe7f7383a  pirut-1.3.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:50:13 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 08:50:13 -0400
Subject: rpms/pirut/F-7 pirut.spec,1.62,1.63 sources,1.60,1.61
Message-ID: <200709261250.l8QCoDIH021964@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/pirut/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21941

Modified Files:
	pirut.spec sources 
Log Message:
* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
- Fix hang with multiple searches (#296521)
- Catch a couple more error cases (#302161)
- Update translations



Index: pirut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/F-7/pirut.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- pirut.spec	23 Jul 2007 14:46:14 -0000	1.62
+++ pirut.spec	26 Sep 2007 12:49:40 -0000	1.63
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.3.9
+Version: 1.3.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -10,7 +10,9 @@
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pygtk2 >= 2.9.2
-Requires: pygtk2-libglade, yum >= 2.9.5, comps-extras, rhpl
+Requires: pygtk2-libglade, comps-extras, rhpl
+Requires: yum >= 3.2.5-2
+Requires: python-iniparse
 Requires: gnome-python2-gconf, notify-python
 Requires: usermode
 Requires: dbus-python
@@ -66,7 +68,6 @@
 %{_datadir}/pirut/ui/*.glade
 %dir %{_datadir}/pirut/pixmaps
 %{_datadir}/pirut/pixmaps/*.png
-%{_datadir}/pixmaps/*png
 
 %{_mandir}/man8/pirut.8*
 %{_mandir}/man8/pup.8*
@@ -75,6 +76,70 @@
 %{_mandir}/man8/system-install-packages.8*
 
 %changelog
+* Wed Sep 26 2007 Jeremy Katz <katzj at redhat.com> - 1.3.20-1
+- Fix hang with multiple searches (#296521)
+- Catch a couple more error cases (#302161)
+- Update translations
+
+* Tue Sep 18 2007 Jeremy Katz <katzj at redhat.com> - 1.3.19-1
+- Make reboot vs warnings clearer (#292011)
+- Select on row activation in lists (#292261)
+- Don't show the (truncated) URL being downloaded (#292271)
+- Fix handling of already mounted volumes
+- Search improvements (skvidal)
+
+* Wed Sep 12 2007 Jeremy Katz <katzj at redhat.com> - 1.3.18-1
+- Add multiple selection in package view (#266141)
+- Make things like rpmnew/rpmsave more obvious to the user rather 
+  than hidden (#229671)
+- Use yum's transaction callback mechanism
+- Show details on package list (#227362)
+- Follow icon naming standard (#208698)
+- Improve display of what's being downloaded with progress bar (#284301)
+- Fix applying updates from puplet (#268141)
+
+* Fri Sep  7 2007 Jeremy Katz <katzj at redhat.com> - 1.3.17-1
+- Catch another downloading error (#270201)
+- Handle errors a little better in puplet
+- Fix repo refreshing after adding/removing repos
+
+* Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.16-1
+- another repo editor fix from Debarshi Ray
+- fix image display
+
+* Thu Aug 30 2007 Jeremy Katz <katzj at redhat.com> - 1.3.15-1
+- actually include repo editing bits in the tarball
+
+* Wed Aug 29 2007 Jeremy Katz <katzj at redhat.com> - 1.3.14-1
+- Improved and more complete repo editing code
+
+* Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 1.3.13-1
+- Add repo editing (some bits from Debarshi Ray)
+- Fix puplet traceback
+
+* Tue Aug 21 2007 Jeremy Katz <katzj at redhat.com> - 1.3.12-1
+- Fix a traceback (#252328)
+- Avoid tracebacks/segfaults with non-UTF8 encoded package strings (#240191)
+- Fix more progress bar updating
+
+* Tue Aug 14 2007 Jeremy Katz <katzj at redhat.com> - 1.3.11-1
+- Translation infrastructure updates (#217153)
+- Allow retrying if the yum lock is held (#228942)
+- Fix a potential traceback case (#242820)
+- Catch another error on repo refresh (#245209)
+- Fix error display
+- Add support for cancelling during downloads (#247344)
+- Fix progress bar updating again
+- Ensure we're passing unicode (#240191)
+
+* Fri Aug 10 2007 Jeremy Katz <katzj at redhat.com> - 1.3.10-1
+- Fix error display (#249369)
+- Don't traceback on %%pretrans breaking assumptions about how the rpm 
+  callback works 
+- Give a nice message when not running as root (#250728)
+- Don't unlock unless we had the lock to begin with (#251651)
+- Show translated summary + description if available (#251662)
+
 * Thu Jul 19 2007 Jeremy Katz <katzj at redhat.com> - 1.3.9-1
 - Fix cd installer (#242857)
 - Drop legacy symlink (#238118)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pirut/F-7/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	23 Jul 2007 14:46:14 -0000	1.60
+++ sources	26 Sep 2007 12:49:40 -0000	1.61
@@ -1 +1 @@
-2a47de72e0caf598e55fe0dea8600f8c  pirut-1.3.9.tar.gz
+31650615efc0f30b05ad005fe7f7383a  pirut-1.3.20.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 12:53:28 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 08:53:28 -0400
Subject: rpms/eclipse-demos/devel eclipse-demos.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261253.l8QCrS6Q022063@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-demos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22040/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-demos.spec 
Log Message:
Initial import.



--- NEW FILE eclipse-demos.spec ---
Name:           eclipse-demos
Version:        0.0.1
Release:        2%{?dist}
Summary:        Eclipse demonstration screencasts

Group:          Documentation
License:        Open Publication
URL:            http://sources.redhat.com/eclipse
Source0:        http://overholt.fedorapeople.org/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

%description
Screencasts demonstrating various features of Eclipse.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}
cp -p * $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}-%{version}
%doc %{_datadir}/%{name}-%{version}/openpub.html
%{_datadir}/%{name}-%{version}/*.ogg

%changelog
* Tue Sep 25 2007 Andrew Overholt <overholt at redhat.com> 0.0.1-2
- Drop totem requirement (one can use any number of players).
- Fix license to be "Open Publication".

* Mon Sep 24 2007 Andrew Overholt <overholt at redhat.com> 0.0.1-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-demos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 23:17:19 -0000	1.1
+++ .cvsignore	26 Sep 2007 12:52:56 -0000	1.2
@@ -0,0 +1 @@
+eclipse-demos-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-demos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 23:17:19 -0000	1.1
+++ sources	26 Sep 2007 12:52:56 -0000	1.2
@@ -0,0 +1 @@
+f7dd686b7b60d8996eb82491a678b9aa  eclipse-demos-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 13:08:43 2007
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Wed, 26 Sep 2007 09:08:43 -0400
Subject: rpms/pybliographer/devel .cvsignore, 1.8, 1.9 pybliographer.spec,
	1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200709261308.l8QD8hfw028630@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555

Modified Files:
	.cvsignore pybliographer.spec sources 
Log Message:
Update to 1.2.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Jan 2007 11:22:51 -0000	1.8
+++ .cvsignore	26 Sep 2007 13:08:11 -0000	1.9
@@ -1 +1 @@
-pybliographer-1.2.10.tar.gz
+pybliographer-1.2.11.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pybliographer.spec	22 Aug 2007 13:46:00 -0000	1.17
+++ pybliographer.spec	26 Sep 2007 13:08:11 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.10.tar.gz
+Source: http://downloads.sourceforge.net/pybliographer/pybliographer-1.2.11.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -97,7 +97,6 @@
 %dir %{_datadir}/pybliographer
 %{_datadir}/pybliographer/Pyblio
 %{_datadir}/pybliographer/Styles
-%{_datadir}/pybliographer/glade
 %{_datadir}/pybliographer/pybcheck.py*
 %{_datadir}/pybliographer/pybcompact.py*
 %{_datadir}/pybliographer/pybconvert.py*
@@ -109,6 +108,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Zoltan Kota <z.kota at gmx.net> - 1.2.11-1
+- update to 1.2.11
+
 * Mon Jan 22 2007 Zoltan Kota <z.kota at gmx.net> - 1.2.10-1
 - update to 1.2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2007 11:22:51 -0000	1.8
+++ sources	26 Sep 2007 13:08:11 -0000	1.9
@@ -1 +1 @@
-762e01058fc5ff81716c75699c7a5acd  pybliographer-1.2.10.tar.gz
+526048083f0227dae81e8a2f0a0e0daf  pybliographer-1.2.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 13:47:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 09:47:44 -0400
Subject: rpms/desktop-backgrounds/devel .cvsignore, 1.15,
	1.16 desktop-backgrounds.spec, 1.47, 1.48 sources, 1.20, 1.21
Message-ID: <200709261347.l8QDliK6031821@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31670

Modified Files:
	.cvsignore desktop-backgrounds.spec sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Aug 2007 00:53:52 -0000	1.15
+++ .cvsignore	26 Sep 2007 13:47:10 -0000	1.16
@@ -1,3 +1,3 @@
 Propaganda-1.0.0.tar.gz
 redhat-backgrounds-14.tar.bz2
-desktop-backgrounds-infinity-0.0.1.tar.gz
+desktop-backgrounds-infinity-0.0.2.tar.gz


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- desktop-backgrounds.spec	20 Sep 2007 14:41:01 -0000	1.47
+++ desktop-backgrounds.spec	26 Sep 2007 13:47:10 -0000	1.48
@@ -1,17 +1,16 @@
 %define rh_backgrounds_version 14
-%define infinity_version 0.0.1
+%define infinity_version 0.0.2
 
 Summary: Desktop backgrounds
 Name: desktop-backgrounds
 Version: 7.92
-Release: 5
+Release: 6
 License: LGPLv2
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
 Source2: Propaganda-1.0.0.tar.gz
 Source3: README.Propaganda
 Source4: desktop-backgrounds-infinity-%{infinity_version}.tar.gz
-Source5: infinity.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
@@ -73,12 +72,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
 cp -a $RPM_BUILD_DIR/redhat-backgrounds-%{rh_backgrounds_version}/desktop-backgrounds-basic.xml $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
 cp -a $RPM_BUILD_DIR/redhat-backgrounds-%{rh_backgrounds_version}/desktop-backgrounds-infinity-%{infinity_version}/desktop-backgrounds-infinity.xml $RPM_BUILD_ROOT%{_prefix}/share/gnome-background-properties
-# we need to save some space, so let's go to less images for now...
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/infinity.xml
-for i in 01 02 03 04 05 07 08 09 10 11 ; do 
-  rm -f $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/am$i.png
-  rm -f $RPM_BUILD_ROOT%{_prefix}/share/backgrounds/infinity/pm$i.png
-done
 
 bgdir=$RPM_BUILD_ROOT%{_prefix}/share/backgrounds
 for I in tiles/Propaganda images/dewdop_leaf.jpg images/dragonfly.jpg images/frosty_pipes.jpg images/in_flight.jpg images/leaf_veins.jpg \
@@ -89,10 +82,10 @@
 
 # create links until artwork shows up
 (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
- ln -sf ../infinity/am00.png default.jpg;
- ln -sf ../infinity/am00.png default.png;
- ln -sf ../infinity/am00.png default-wide.png;
- ln -sf ../infinity/am00.png default-5_4.png)
+ ln -sf ../infinity/2-infinity-day.png default.jpg;
+ ln -sf ../infinity/2-infinity-day.png default.png;
+ ln -sf ../infinity/2-infinity-day.png default-wide.png;
+ ln -sf ../infinity/2-infinity-day.png default-5_4.png)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,6 +128,11 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Wed Sep 26 2007 M??ir??n Duffy <duffy at redhat.com> - 7.92-6
+- wallpapers redone so there is no more banding
+- wallpapers renamed
+- infinity animated file bugs fixed (hopefully)
+
 * Thu Sep 20 2007 Ray Strode <rstrode at redhat.com> - 7.92-5
 - fix symlinks again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Aug 2007 00:53:52 -0000	1.20
+++ sources	26 Sep 2007 13:47:10 -0000	1.21
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-f058c23fbc6e4ee8c05c2535114756a3  desktop-backgrounds-infinity-0.0.1.tar.gz
+6bc90483d41c4cc3e13abf80da686419  desktop-backgrounds-infinity-0.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:23 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:23 -0400
Subject: devel/vim 7.1.120,NONE,1.1
Message-ID: <200709261348.l8QDmNcO001329@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1110

Added Files:
	7.1.120 
Log Message:
- patchlevel 120


--- NEW FILE 7.1.120 ---
To: vim-dev at vim.org
Subject: patch 7.1.120
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.120
Problem:    Can't properly check memory leaks while running tests.
Solution:   Add an argument to garbagecollect().  Delete functions and
	    variables in the test scripts.
Files:	    runtime/doc/eval.txt, src/eval.c, src/globals.h, src/main.c,
	    src/testdir/Makefile, src/testdir/test14.in,
	    src/testdir/test26.in, src/testdir/test34.in,
	    src/testdir/test45.in, src/testdir/test47.in,
	    src/testdir/test49.in, src/testdir/test55.in,
	    src/testdir/test56.in, src/testdir/test58.in,
	    src/testdir/test59.in, src/testdir/test60.in,
	    src/testdir/test60.vim, src/testdir/test62.in,
	    src/testdir/test63.in, src/testdir/test64.in


*** ../vim-7.1.119/runtime/doc/eval.txt	Thu Jul 26 22:55:11 2007
--- runtime/doc/eval.txt	Tue Sep 25 17:40:30 2007
***************
*** 1,4 ****
! *eval.txt*      For Vim version 7.1.  Last change: 2007 Jul 25
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *eval.txt*      For Vim version 7.1.  Last change: 2007 Sep 25
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 1603,1609 ****
  foldtextresult( {lnum})		String	text for closed fold at {lnum}
  foreground( )			Number	bring the Vim window to the foreground
  function( {name})		Funcref reference to function {name}
! garbagecollect()		none	free memory, breaking cyclic references
  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
  getbufline( {expr}, {lnum} [, {end}])
--- 1603,1609 ----
  foldtextresult( {lnum})		String	text for closed fold at {lnum}
  foreground( )			Number	bring the Vim window to the foreground
  function( {name})		Funcref reference to function {name}
! garbagecollect( [at_exit])	none	free memory, breaking cyclic references
  get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
  get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
  getbufline( {expr}, {lnum} [, {end}])
***************
*** 2673,2679 ****
  		{name} can be a user defined function or an internal function.
  
  
! garbagecollect()					*garbagecollect()*
  		Cleanup unused |Lists| and |Dictionaries| that have circular
  		references.  There is hardly ever a need to invoke this
  		function, as it is automatically done when Vim runs out of
--- 2673,2679 ----
  		{name} can be a user defined function or an internal function.
  
  
! garbagecollect([at_exit])				*garbagecollect()*
  		Cleanup unused |Lists| and |Dictionaries| that have circular
  		references.  There is hardly ever a need to invoke this
  		function, as it is automatically done when Vim runs out of
***************
*** 2683,2688 ****
--- 2683,2691 ----
  		This is useful if you have deleted a very big |List| and/or
  		|Dictionary| with circular references in a script that runs
  		for a long time.
+ 		When the optional "at_exit" argument is one, garbage
+ 		collection will also be done when exiting Vim, if it wasn't
+ 		done before.  This is useful when checking for memory leaks.
  
  get({list}, {idx} [, {default}])			*get()*
  		Get item {idx} from |List| {list}.  When this item is not
*** ../vim-7.1.119/src/eval.c	Tue Sep 25 12:50:00 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 6128,6133 ****
--- 6128,6134 ----
      /* Only do this once. */
      want_garbage_collect = FALSE;
      may_garbage_collect = FALSE;
+     garbage_collect_at_exit = FALSE;
  
      /*
       * 1. Go through all accessible variables and mark all lists and dicts
***************
*** 7110,7116 ****
      {"foldtextresult",	1, 1, f_foldtextresult},
      {"foreground",	0, 0, f_foreground},
      {"function",	1, 1, f_function},
!     {"garbagecollect",	0, 0, f_garbagecollect},
      {"get",		2, 3, f_get},
      {"getbufline",	2, 3, f_getbufline},
      {"getbufvar",	2, 2, f_getbufvar},
--- 7111,7117 ----
      {"foldtextresult",	1, 1, f_foldtextresult},
      {"foreground",	0, 0, f_foreground},
      {"function",	1, 1, f_function},
!     {"garbagecollect",	0, 1, f_garbagecollect},
      {"get",		2, 3, f_get},
      {"getbufline",	2, 3, f_getbufline},
      {"getbufvar",	2, 2, f_getbufvar},
***************
*** 9719,9724 ****
--- 9720,9728 ----
      /* This is postponed until we are back at the toplevel, because we may be
       * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
      want_garbage_collect = TRUE;
+ 
+     if (argvars[0].v_type != VAR_UNKNOWN && get_tv_number(&argvars[0]) == 1)
+ 	garbage_collect_at_exit = TRUE;
  }
  
  /*
*** ../vim-7.1.119/src/globals.h	Thu Aug 30 13:51:52 2007
--- src/globals.h	Sun Sep 16 18:42:41 2007
***************
*** 301,313 ****
  #endif
  
  #ifdef FEAT_EVAL
! /* Garbage collection can only take place when we are sure there are no Lists
   * or Dictionaries being used internally.  This is flagged with
   * "may_garbage_collect" when we are at the toplevel.
   * "want_garbage_collect" is set by the garbagecollect() function, which means
!  * we do garbage collection before waiting for a char at the toplevel. */
  EXTERN int	may_garbage_collect INIT(= FALSE);
  EXTERN int	want_garbage_collect INIT(= FALSE);
  
  /* ID of script being sourced or was sourced to define the current function. */
  EXTERN scid_T	current_SID INIT(= 0);
--- 301,317 ----
  #endif
  
  #ifdef FEAT_EVAL
! /*
!  * Garbage collection can only take place when we are sure there are no Lists
   * or Dictionaries being used internally.  This is flagged with
   * "may_garbage_collect" when we are at the toplevel.
   * "want_garbage_collect" is set by the garbagecollect() function, which means
!  * we do garbage collection before waiting for a char at the toplevel.
!  * "garbage_collect_at_exit" indicates garbagecollect(1) was called.
!  */
  EXTERN int	may_garbage_collect INIT(= FALSE);
  EXTERN int	want_garbage_collect INIT(= FALSE);
+ EXTERN int	garbage_collect_at_exit INIT(= FALSE);
  
  /* ID of script being sourced or was sourced to define the current function. */
  EXTERN scid_T	current_SID INIT(= 0);
*** ../vim-7.1.119/src/main.c	Thu Sep  6 17:38:06 2007
--- src/main.c	Sun Sep 16 18:44:54 2007
***************
*** 1334,1339 ****
--- 1334,1343 ----
  #ifdef FEAT_CSCOPE
      cs_end();
  #endif
+ #ifdef FEAT_EVAL
+     if (garbage_collect_at_exit)
+ 	garbage_collect();
+ #endif
  
      mch_exit(exitval);
  }
*** ../vim-7.1.119/src/testdir/Makefile	Tue Aug 14 17:28:14 2007
--- src/testdir/Makefile	Mon Sep 17 20:04:13 2007
***************
*** 6,12 ****
  
  # Uncomment this line for using valgrind.
  # The output goes into a file "valgrind.$PID" (sorry, no test number).
! # VALGRIND = valgrind --tool=memcheck --num-callers=15 --logfile=valgrind
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
--- 6,12 ----
  
  # Uncomment this line for using valgrind.
  # The output goes into a file "valgrind.$PID" (sorry, no test number).
! # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
  
  SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
  		test7.out test8.out test9.out test10.out test11.out \
***************
*** 39,45 ****
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
  clean:
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* viminfo
  
  test1.out: test1.in
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
--- 39,45 ----
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
  clean:
! 	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* valgrind.pid* viminfo
  
  test1.out: test1.in
  	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
***************
*** 65,70 ****
--- 65,74 ----
  		else echo $* NO OUTPUT >>test.log; \
  		fi"
  	-rm -rf X* test.ok viminfo
+ 
+ test49.out: test49.vim
+ 
+ test60.out: test60.vim
  
  nolog:
  	-echo Test results: >test.log
*** ../vim-7.1.119/src/testdir/test14.in	Sun Jun 13 20:24:08 2004
--- src/testdir/test14.in	Sun Sep 16 15:57:54 2007
***************
*** 18,23 ****
--- 18,24 ----
  : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>"
  :endif
  :exe "normal " . tt
+ :unlet tt
  :.w >>test.out
  :set vb
  /^Piece
*** ../vim-7.1.119/src/testdir/test26.in	Sun Jun 13 17:05:48 2004
--- src/testdir/test26.in	Sun Sep 16 16:54:19 2007
***************
*** 37,42 ****
--- 37,43 ----
  :    endif
  :  endif
  :endwhile
+ :unlet i j
  :'t,$w! test.out
  :qa!
  ENDTEST
*** ../vim-7.1.119/src/testdir/test34.in	Sun Apr 30 20:46:14 2006
--- src/testdir/test34.in	Sun Sep 16 21:25:47 2007
***************
*** 52,58 ****
  ---*---
  (one
  (two
! [(one again:$-5,$wq! test.out
  ENDTEST
  
  here
--- 52,66 ----
  ---*---
  (one
  (two
! [(one again:$-5,$w! test.out
! :delfunc Table
! :delfunc Compute
! :delfunc Expr1
! :delfunc Expr2
! :delfunc ListItem
! :delfunc ListReset
! :unlet retval counter
! :q!
  ENDTEST
  
  here
*** ../vim-7.1.119/src/testdir/test45.in	Sun Jun 13 19:57:02 2004
--- src/testdir/test45.in	Sun Sep 16 18:27:20 2007
***************
*** 55,60 ****
--- 55,61 ----
  /kk$
  :call append("$", foldlevel("."))
  :/^last/+1,$w! test.out
+ :delfun Flvl
  :qa!
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test47.in	Sun Jun 13 18:40:29 2004
--- src/testdir/test47.in	Sun Sep 16 18:32:03 2007
***************
*** 34,39 ****
--- 34,40 ----
  :call append("$", two)
  :call append("$", three)
  :$-2,$w! test.out
+ :unlet one two three
  :qa!
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test49.in	Sun Jun 13 18:10:00 2004
--- src/testdir/test49.in	Sun Sep 16 23:30:35 2007
***************
*** 1,13 ****
  This is a test of the script language.
  
  If after adding a new test, the test output doesn't appear properly in
! test49.failed, try to add one ore more "G"s at the line before ENDTEST.
  
  STARTTEST
  :so small.vim
  :se nocp nomore viminfo+=nviminfo
  :so test49.vim
! GGGGGGGGGG"rp:.-,$wq! test.out
  ENDTEST
  
  Results of test49.vim:
--- 1,29 ----
  This is a test of the script language.
  
  If after adding a new test, the test output doesn't appear properly in
! test49.failed, try to add one ore more "G"s at the line ending in "test.out"
  
  STARTTEST
  :so small.vim
  :se nocp nomore viminfo+=nviminfo
  :so test49.vim
! GGGGGGGGGGGGGG"rp:.-,$w! test.out
! :"
! :" make valgrind happy
! :redir => funclist
! :silent func
! :redir END
! :for line in split(funclist, "\n")
! :  let name = matchstr(line, 'function \zs[A-Z]\w*\ze(')
! :  if name != ''
! :    exe "delfunc " . name
! :  endif
! :endfor
! :for v in keys(g:)
! :  silent! exe "unlet " . v
! :endfor
! :unlet v
! :qa!
  ENDTEST
  
  Results of test49.vim:
*** ../vim-7.1.119/src/testdir/test55.in	Sat May  5 20:03:56 2007
--- src/testdir/test55.in	Mon Sep 17 19:53:48 2007
***************
*** 345,350 ****
--- 345,354 ----
  :endfun
  :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
  :"
+ :delfunc Test
+ :unlet dict
+ :call garbagecollect(1)
+ :"
  :/^start:/,$wq! test.out
  ENDTEST
  
*** ../vim-7.1.119/src/testdir/test56.in	Tue Sep  5 13:36:02 2006
--- src/testdir/test56.in	Sun Sep 16 17:54:20 2007
***************
*** 17,21 ****
  fun s:DoNothing()
    call append(line('$'), "nothing line")
  endfun
! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<cr>
  end:
--- 17,21 ----
  fun s:DoNothing()
    call append(line('$'), "nothing line")
  endfun
! nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
  end:
*** ../vim-7.1.119/src/testdir/test58.in	Wed Apr  5 22:38:56 2006
--- src/testdir/test58.in	Sun Sep 16 18:17:03 2007
***************
*** 86,91 ****
--- 86,92 ----
  :$put =str
  `m]s:let [str, a] = spellbadword()
  :$put =str
+ :unlet str a
  :"
  :" Postponed prefixes
  :call TestOne('2', '1')
***************
*** 99,104 ****
--- 100,109 ----
  :"
  :" NOSLITSUGS
  :call TestOne('8', '8')
+ :"
+ :" clean up for valgrind
+ :delfunc TestOne
+ :set spl= enc=latin1
  :"
  gg:/^test output:/,$wq! test.out
  ENDTEST
*** ../vim-7.1.119/src/testdir/test59.in	Wed Apr  5 22:27:11 2006
--- src/testdir/test59.in	Sun Sep 16 18:17:23 2007
***************
*** 90,95 ****
--- 90,96 ----
  :$put =str
  `m]s:let [str, a] = spellbadword()
  :$put =str
+ :unlet str a
  :"
  :" Postponed prefixes
  :call TestOne('2', '1')
***************
*** 100,105 ****
--- 101,110 ----
  :call TestOne('5', '5')
  :call TestOne('6', '6')
  :call TestOne('7', '7')
+ :"
+ :" clean up for valgrind
+ :delfunc TestOne
+ :set spl= enc=latin1
  :"
  gg:/^test output:/,$wq! test.out
  ENDTEST
*** ../vim-7.1.119/src/testdir/test60.in	Fri May  5 23:11:11 2006
--- src/testdir/test60.in	Mon Sep 17 19:58:43 2007
***************
*** 569,574 ****
--- 569,577 ----
      redir END
  endfunction
  :call TestExists()
+ :delfunc TestExists
+ :delfunc RunTest
+ :delfunc TestFuncArg
  :edit! test.out
  :set ff=unix
  :w
*** ../vim-7.1.119/src/testdir/test60.vim	Fri Jan 13 00:14:55 2006
--- src/testdir/test60.vim	Mon Sep 17 19:56:02 2007
***************
*** 94,97 ****
--- 94,98 ----
  else
      echo "FAILED"
  endif
+ unlet str
  
*** ../vim-7.1.119/src/testdir/test62.in	Sun Apr 30 20:28:14 2006
--- src/testdir/test62.in	Sun Sep 16 17:24:04 2007
***************
*** 7,12 ****
--- 7,13 ----
  :let nr = tabpagenr()
  :q
  :call append(line('$'), 'tab page ' . nr)
+ :unlet nr
  :"
  :" Open three tab pages and use ":tabdo"
  :0tabnew
***************
*** 23,28 ****
--- 24,30 ----
  :q!
  :call append(line('$'), line1)
  :call append(line('$'), line2)
+ :unlet line1 line2
  :"
  :"
  :/^Results/,$w! test.out
*** ../vim-7.1.119/src/testdir/test63.in	Thu Jul 26 22:55:11 2007
--- src/testdir/test63.in	Sun Sep 16 17:11:07 2007
***************
*** 60,66 ****
  :else
  :  let @r .= "FAILED\n"
  :endif
! :" --- Check that "matchdelete()" returns 0 if succesfull and otherwise -1.
  :let @r .= "*** Test 6: "
  :let m = matchadd("MyGroup1", "TODO")
  :let r1 = matchdelete(m)
--- 60,66 ----
  :else
  :  let @r .= "FAILED\n"
  :endif
! :" --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
  :let @r .= "*** Test 6: "
  :let m = matchadd("MyGroup1", "TODO")
  :let r1 = matchdelete(m)
***************
*** 117,123 ****
  :" --- Check that "setmatches()" will not add two matches with the same ID. The
  :" --- expected behaviour (for now) is to add the first match but not the
  :" --- second and to return 0 (even though it is a matter of debate whether
! :" --- this can be considered succesfull behaviour).
  :let @r .= "*** Test 9: "
  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
--- 117,123 ----
  :" --- Check that "setmatches()" will not add two matches with the same ID. The
  :" --- expected behaviour (for now) is to add the first match but not the
  :" --- second and to return 0 (even though it is a matter of debate whether
! :" --- this can be considered successful behaviour).
  :let @r .= "*** Test 9: "
  :let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
  :if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
***************
*** 127,133 ****
  :endif
  :call clearmatches()
  :unlet r1
! :" --- Check that "setmatches()" returns 0 if succesfull and otherwise -1.
  :" --- (A range of valid and invalid input values are tried out to generate the
  :" --- return values.)
  :let @r .= "*** Test 10: "
--- 127,133 ----
  :endif
  :call clearmatches()
  :unlet r1
! :" --- Check that "setmatches()" returns 0 if successful and otherwise -1.
  :" --- (A range of valid and invalid input values are tried out to generate the
  :" --- return values.)
  :let @r .= "*** Test 10: "
*** ../vim-7.1.119/src/testdir/test64.in	Tue Aug 14 17:28:14 2007
--- src/testdir/test64.in	Sun Sep 16 17:43:03 2007
***************
*** 44,51 ****
--- 44,53 ----
  :        $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
  :      endif
  :    endfor
+ :    unlet i
  :  endif
  :endfor
+ :unlet t tl e l
  :/^Results/,$wq! test.out
  ENDTEST
  
*** ../vim-7.1.119/src/version.c	Tue Sep 25 14:50:19 2007
--- src/version.c	Tue Sep 25 17:36:22 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     120,
  /**/

-- 
BEDEVERE: How do you know so much about swallows?
ARTHUR:   Well you have to know these things when you're a king, you know.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:31 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:31 -0400
Subject: devel/vim 7.1.121,NONE,1.1
Message-ID: <200709261348.l8QDmVL0001542@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1504

Added Files:
	7.1.121 
Log Message:
- patchlevel 121


--- NEW FILE 7.1.121 ---
To: vim-dev at vim.org
Subject: patch 7.1.121
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.121
Problem:    Using ":cd %:h" when editing a file in the current directory
	    results in an error message for using an empty string.
Solution:   When "%:h" results in an empty string use ".".
Files:	    src/eval.c


*** ../vim-7.1.120/src/eval.c	Tue Sep 25 17:54:41 2007
--- src/eval.c	Sun Sep 16 19:24:49 2007
***************
*** 21308,21321 ****
  	*usedlen += 2;
  	s = get_past_head(*fnamep);
  	while (tail > s && after_pathsep(s, tail))
! 	    --tail;
  	*fnamelen = (int)(tail - *fnamep);
  #ifdef VMS
  	if (*fnamelen > 0)
  	    *fnamelen += 1; /* the path separator is part of the path */
  #endif
! 	while (tail > s && !after_pathsep(s, tail))
! 	    mb_ptr_back(*fnamep, tail);
      }
  
      /* ":8" - shortname  */
--- 21308,21334 ----
  	*usedlen += 2;
  	s = get_past_head(*fnamep);
  	while (tail > s && after_pathsep(s, tail))
! 	    mb_ptr_back(*fnamep, tail);
  	*fnamelen = (int)(tail - *fnamep);
  #ifdef VMS
  	if (*fnamelen > 0)
  	    *fnamelen += 1; /* the path separator is part of the path */
  #endif
! 	if (*fnamelen == 0)
! 	{
! 	    /* Result is empty.  Turn it into "." to make ":cd %:h" work. */
! 	    p = vim_strsave((char_u *)".");
! 	    if (p == NULL)
! 		return -1;
! 	    vim_free(*bufp);
! 	    *bufp = *fnamep = tail = p;
! 	    *fnamelen = 1;
! 	}
! 	else
! 	{
! 	    while (tail > s && !after_pathsep(s, tail))
! 		mb_ptr_back(*fnamep, tail);
! 	}
      }
  
      /* ":8" - shortname  */
*** ../vim-7.1.120/src/version.c	Tue Sep 25 17:54:41 2007
--- src/version.c	Tue Sep 25 20:38:08 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     121,
  /**/

-- 
It is illegal for anyone to try and stop a child from playfully jumping over
puddles of water.
		[real standing law in California, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:48:37 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 09:48:37 -0400
Subject: devel/vim 7.1.122,NONE,1.1
Message-ID: <200709261348.l8QDmb0j001601@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1590

Added Files:
	7.1.122 
Log Message:
- patchlevel 122


--- NEW FILE 7.1.122 ---
To: vim-dev at vim.org
Subject: patch 7.1.122
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.122
Problem:    Mac: building Vim.app fails.  Using wrong architecture.
Solution:   Use line continuation for the gui_bundle dependency.  Detect the
	    system architecture with "uname -a".
Files:	    src/main.aap


*** ../vim-7.1.121/src/main.aap	Thu May 10 18:48:19 2007
--- src/main.aap	Tue Sep 25 21:26:03 2007
***************
*** 56,64 ****
      config {virtual} auto/config.h auto/config.aap :
                           auto/configure.aap configure.aap
                           config.arg config.h.in config.aap.in
          :sys CONFIG_STATUS=auto/config.status
                  ./configure.aap `file2string("config.arg")`
!                     --with-mac-arch=ppc
                      --cache-file=auto/config.cache
  
      # Configure arguments: create an empty "config.arg" file when its missing
--- 56,71 ----
      config {virtual} auto/config.h auto/config.aap :
                           auto/configure.aap configure.aap
                           config.arg config.h.in config.aap.in
+         # Use "uname -a" to detect the architecture of the system.
+         @ok, uname = redir_system('uname -a', 0)
+         @if string.find(uname, "i386") >= 0:
+         @   arch = "i386"
+         @else:
+         @   arch = "ppc"
+         :print Building for $arch system
          :sys CONFIG_STATUS=auto/config.status
                  ./configure.aap `file2string("config.arg")`
!                     --with-mac-arch=$arch
                      --cache-file=auto/config.cache
  
      # Configure arguments: create an empty "config.arg" file when its missing
***************
*** 1167,1173 ****
          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
  # TODO: Create the vimtutor application.
  
! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
                          bundle-resource bundle-language
  
  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
--- 1174,1180 ----
          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
  # TODO: Create the vimtutor application.
  
! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
                          bundle-resource bundle-language
  
  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
***************
*** 1187,1193 ****
          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
  
  bundle-resource {virtual}: bundle-dir bundle-rsrc
!     :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
  
  ### Classic resources
  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
--- 1194,1200 ----
          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
  
  bundle-resource {virtual}: bundle-dir bundle-rsrc
!         :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
  
  ### Classic resources
  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
*** ../vim-7.1.121/src/version.c	Tue Sep 25 20:39:14 2007
--- src/version.c	Tue Sep 25 22:12:16 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     122,
  /**/

-- 
Men may not be seen publicly in any kind of strapless gown.
		[real standing law in Florida, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Wed Sep 26 13:50:14 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Wed, 26 Sep 2007 09:50:14 -0400
Subject: rpms/acpid/devel acpid-1.0.6-fd.patch, NONE, 1.1 acpid.init, 1.3,
	1.4 acpid.spec, 1.22, 1.23
Message-ID: <200709261350.l8QDoErX001711@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1631

Modified Files:
	acpid.init acpid.spec 
Added Files:
	acpid-1.0.6-fd.patch 
Log Message:
Fixed leak of a file descriptor
Resolves: #304761


acpid-1.0.6-fd.patch:

--- NEW FILE acpid-1.0.6-fd.patch ---
--- acpid-1.0.6.orig/acpid.c	2007-09-24 18:49:02.000000000 -0400
+++ acpid-1.0.6/acpid.c	2007-09-24 18:52:44.000000000 -0400
@@ -397,7 +397,7 @@ open_log(void)
 	int log_opts;
 
 	/* open /dev/null */
-	nullfd = open("/dev/null", O_RDONLY, 0640);
+	nullfd = open("/dev/null", O_RDONLY);
 	if (nullfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			"/dev/null", strerror(errno));
diff -urp acpid-1.0.6.orig/event.c acpid-1.0.6/event.c
--- acpid-1.0.6.orig/event.c	2007-09-24 18:49:02.000000000 -0400
+++ acpid-1.0.6/event.c	2007-09-24 18:55:10.000000000 -0400
@@ -318,6 +318,7 @@ parse_file(const char *file)
 			    file);
 		}
 		free_rule(r);
+		fclose(fp);
 		return NULL;
 	}
 	fclose(fp);
@@ -667,7 +668,7 @@ parse_cmd(const char *cmd, const char *e
 	i = 0;
 
 	memset(buf, 0, sizeof(buf));
-	while (i < (sizeof(buf)-1)) {
+	while ((size_t)i < (sizeof(buf)-1)) {
 		if (*p == '%') {
 			p++;
 			if (*p == 'e') {



Index: acpid.init
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acpid.init	25 Jul 2007 08:59:47 -0000	1.3
+++ acpid.init	26 Sep 2007 13:49:40 -0000	1.4
@@ -10,10 +10,10 @@
 
 ### BEGIN INIT INFO
 # Provides: acpid
-# Required-Start: $syslog
-# Required-Stop: $syslog
-# Default-Start:  3 4 5
-# Default-Stop: 0 1 2 6
+# Required-Start: $syslog $local_fs
+# Required-Stop: $syslog $local_fs
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
 # Short-Description: start and stop acpid
 # Description: Listen and dispatch ACPI events from the kernel
 ### END INIT INFO
@@ -35,7 +35,7 @@
 	fi
 	# Check for kernel support
 	if [ ! -f /proc/acpi/event ]; then
-		echo "$0: need ACPI support in kernel."
+		echo "$0: need ACPI_PROC_EVENT support in kernel."  //zmena podle 260181
 		exit 1
 	fi
 	# Check if it is already running


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- acpid.spec	10 Aug 2007 06:49:39 -0000	1.22
+++ acpid.spec	26 Sep 2007 13:49:40 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source4: acpid.power.conf
 Patch1: acpid-1.0.6-makefile.patch
 Patch2: acpid-1.0.6-return.patch
+Patch3: acpid-1.0.6-fd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -27,6 +28,7 @@
 %setup -q
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .return
+%patch3 -p1 -b .fd
 
 %build
 make %{?_smp_mflags}
@@ -85,6 +87,10 @@
 fi
 
 %changelog
+* Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-2.fc8
+- Fixed leak of a file descriptor
+- Resolves: #304761
+
 * Tue Aug 07 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-1.fc8
 - Updated to version 1.0.6
 



From fedora-extras-commits at redhat.com  Wed Sep 26 13:57:42 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 09:57:42 -0400
Subject: rpms/gnome-desktop/devel leak.patch, NONE, 1.1 gnome-desktop.spec, 
	1.99, 1.100
Message-ID: <200709261357.l8QDvgOH001956@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1930

Modified Files:
	gnome-desktop.spec 
Added Files:
	leak.patch 
Log Message:
fix a leak


leak.patch:

--- NEW FILE leak.patch ---
diff -up gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c.decoder gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c
--- gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c.decoder	2007-09-26 09:50:53.000000000 -0400
+++ gnome-desktop-2.20.0/libgnome-desktop/gnome-desktop-item.c	2007-09-26 09:48:08.000000000 -0400
@@ -1722,7 +1722,7 @@ make_environment_for_screen (GdkScreen  
 	g_assert (i == env_len);
 
 	g_free (display_name);
-	g_free (freeme);
+	g_strfreev (freeme);
 
 	return retval;
 }


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome-desktop.spec	18 Sep 2007 02:56:28 -0000	1.99
+++ gnome-desktop.spec	26 Sep 2007 13:57:09 -0000	1.100
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -22,6 +22,8 @@
 Patch1:   gnome-desktop-2.1.90-kdetheme.patch
 Patch2:   gnome-desktop-2.9.91-desktop.patch
 Patch3:   gnome-desktop-2.19.90-gnome-bg.patch
+# fixed in upstream svn
+Patch4:	  leak.patch
 
 Requires: redhat-artwork
 Requires: redhat-menus
@@ -77,6 +79,7 @@
 %patch1 -p1 -b .kdetheme
 %patch2 -p1 -b .menu
 %patch3 -p1 -b .gnome-bg
+%patch4 -p1 -b .leak
 
 %build
 
@@ -125,6 +128,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Fix a memory leak
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Wed Sep 26 13:59:47 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 09:59:47 -0400
Subject: rpms/firefox/devel firefox-2.0-enable-debug.patch, NONE,
	1.1 firefox.sh.in, 1.22, 1.23 firefox.spec, 1.200, 1.201
Message-ID: <200709261359.l8QDxljx002122@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2074

Modified Files:
	firefox.sh.in firefox.spec 
Added Files:
	firefox-2.0-enable-debug.patch 
Log Message:
* Mon Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-11
- Fixed #242657 - firefox -g doesn't work



firefox-2.0-enable-debug.patch:

--- NEW FILE firefox-2.0-enable-debug.patch ---
diff -up mozilla/browser/app/Makefile.in.old mozilla/browser/app/Makefile.in
--- mozilla/browser/app/Makefile.in.old	2006-08-29 04:03:07.000000000 +0200
+++ mozilla/browser/app/Makefile.in	2007-09-26 15:08:35.000000000 +0200
@@ -238,7 +238,7 @@ libs:: firefox
 	$(INSTALL) $< $(DIST)/bin
 
 install:: firefox
-	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+	$(SYSINSTALL) $< $(DESTDIR)$(mozappdir)
 
 GARBAGE += firefox
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- firefox.sh.in	7 Aug 2007 08:30:38 -0000	1.22
+++ firefox.sh.in	26 Sep 2007 13:59:13 -0000	1.23
@@ -60,7 +60,7 @@
 fi
 MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
 MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
-MOZ_PROGRAM="$MOZ_DIST_BIN/firefox-bin"
+MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
 MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client"
 MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
 


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- firefox.spec	25 Sep 2007 18:00:36 -0000	1.200
+++ firefox.spec	26 Sep 2007 13:59:13 -0000	1.201
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -67,6 +67,7 @@
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch110:       firefox-2.0-startup-notify.patch
 Patch111:       firefox-path.patch
+Patch112:       firefox-2.0-enable-debug.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -165,6 +166,7 @@
 %patch106 -p1 -b .indicator-crash
 %patch110 -p0 -b .startup-notify
 %patch111 -p1 -b .path
+%patch112 -p1 -b .debug
 
 # For branding specific patches.
 
@@ -401,6 +403,7 @@
 %{mozappdir}/res
 %{mozappdir}/searchplugins
 %{mozappdir}/*.so
+%{mozappdir}/firefox
 %{mozappdir}/firefox-bin
 %{mozappdir}/firefox-xremote-client
 %{mozappdir}/mozilla-xremote-client
@@ -431,6 +434,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-11
+- Fixed #242657 - firefox -g doesn't work
+
 * Mon Sep 25 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-10
 - Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
 



From fedora-extras-commits at redhat.com  Wed Sep 26 14:00:04 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 10:00:04 -0400
Subject: comps comps-f8.xml.in,1.126,1.127
Message-ID: <200709261400.l8QE04LV002164@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2104

Modified Files:
	comps-f8.xml.in 
Log Message:
add atmel firmware



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- comps-f8.xml.in	25 Sep 2007 18:35:05 -0000	1.126
+++ comps-f8.xml.in	26 Sep 2007 13:59:34 -0000	1.127
@@ -1992,6 +1992,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 26 14:09:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:09:24 -0400
Subject: rpms/desktop-backgrounds/devel sources,1.21,1.22
Message-ID: <200709261409.l8QE9Ob1008669@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8512

Modified Files:
	sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Sep 2007 13:47:10 -0000	1.21
+++ sources	26 Sep 2007 14:08:51 -0000	1.22
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-6bc90483d41c4cc3e13abf80da686419  desktop-backgrounds-infinity-0.0.2.tar.gz
+84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 14:13:54 2007
From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl))
Date: Wed, 26 Sep 2007 10:13:54 -0400
Subject: rpms/acpid/F-7 acpid-1.0.4-fd.patch,NONE,1.1 acpid.spec,1.19,1.20
Message-ID: <200709261413.l8QEDsFR008817@cvs-int.fedora.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/acpid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8782

Modified Files:
	acpid.spec 
Added Files:
	acpid-1.0.4-fd.patch 
Log Message:
Fixed leak of a file descriptor (#304761)


acpid-1.0.4-fd.patch:

--- NEW FILE acpid-1.0.4-fd.patch ---
--- acpid-1.0.4.orig/acpid.c	2007-09-24 17:05:07.000000000 -0400
+++ acpid-1.0.4/acpid.c	2007-09-24 17:12:19.000000000 -0400
@@ -396,13 +396,13 @@ open_logs(void)
 	int nullfd;
 
 	/* set up stdout, stderr to log and stdin to /dev/null */
-	nullfd = open("/dev/null", O_RDONLY, 0640);
+	nullfd = open("/dev/null", O_RDONLY);
 	if (nullfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			"/dev/null", strerror(errno));
 		return -1;
 	}
-	logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND);
+	logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0640);
 	if (logfd < 0) {
 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
 			logfile, strerror(errno));
diff -urp acpid-1.0.4.orig/event.c acpid-1.0.4/event.c
--- acpid-1.0.4.orig/event.c	2007-09-24 17:05:07.000000000 -0400
+++ acpid-1.0.4/event.c	2007-09-24 17:33:56.000000000 -0400
@@ -302,6 +302,7 @@ parse_file(const char *file)
 			acpid_log("DBG: skipping incomplete file %s\n", file);
 		}
 		free_rule(r);
+		fclose(fp);
 		return NULL;
 	}
 	fclose(fp);
@@ -641,7 +642,7 @@ parse_cmd(const char *cmd, const char *e
 	i = 0;
 
 	memset(buf, 0, sizeof(buf));
-	while (i < (sizeof(buf)-1)) {
+	while ((size_t)i < (sizeof(buf)-1)) {
 		if (*p == '%') {
 			p++;
 			if (*p == 'e') {



Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/acpid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- acpid.spec	14 Feb 2007 13:01:46 -0000	1.19
+++ acpid.spec	26 Sep 2007 14:13:22 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch1: acpid-1.0.3-makefile.patch
 Patch2: acpid-1.0.4-warning.patch
 Patch3: acpid-1.0.4-pie.patch
+Patch4: acpid-1.0.4-fd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .makefile
 %patch2 -p1 -b .warning
 %patch3 -p1 -b .pie
+%patch4 -p1 -b .fd
 
 %build
 make %{?_smp_mflags}
@@ -87,6 +89,9 @@
 fi
 
 %changelog
+* Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.4-8.fc7
+- Fixed leak of a file descriptor (#304761)
+
 * Wed Feb 14 2007 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-7.fc7
 - Dropped /var/log/acpid ownership as per review (225237)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 14:24:52 2007
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Wed, 26 Sep 2007 10:24:52 -0400
Subject: rpms/nss_compat_ossl/devel .cvsignore, 1.3, 1.4 nss_compat_ossl.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200709261424.l8QEOq8e009239@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/nss_compat_ossl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9211

Modified Files:
	.cvsignore nss_compat_ossl.spec sources 
Log Message:
Resolves 306711

Need to revert patch introduced in 0.9.2:

define CERT_NewTempCertificate __CERT_NewTempCertificate



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Sep 2007 17:53:14 -0000	1.3
+++ .cvsignore	26 Sep 2007 14:24:19 -0000	1.4
@@ -1 +1,2 @@
 nss_compat_ossl-0.9.2.tar.gz
+nss_compat_ossl-symbol.patch


Index: nss_compat_ossl.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/nss_compat_ossl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nss_compat_ossl.spec	20 Sep 2007 17:53:15 -0000	1.4
+++ nss_compat_ossl.spec	26 Sep 2007 14:24:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nss_compat_ossl
 Version:        0.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Source-level compatibility library for OpenSSL to NSS porting
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://rcritten.fedorapeople.org/nss_compat_ossl.html
 Source0:        http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         nss_compat_ossl-symbol.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,7 +28,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .symbol
 
 %build
 
@@ -65,6 +66,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 26 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-2
+- Bugzilla #306711, need to define CERT_NewTempCertificate
+
 * Wed Sep 20 2007 Rob Crittenden <rcritten at redhat.com> 0.9.2-1
 - update to 0.9.2
 - Enable loading the NSS PKCS#11 pem module


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_compat_ossl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Sep 2007 17:53:15 -0000	1.3
+++ sources	26 Sep 2007 14:24:19 -0000	1.4
@@ -1 +1,2 @@
 84ceb6df62872f8c6df3f2f5657425e6  nss_compat_ossl-0.9.2.tar.gz
+325fcb35ab1475f1d5e40b7ecaf27b60  nss_compat_ossl-symbol.patch



From fedora-extras-commits at redhat.com  Wed Sep 26 14:34:12 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:34:12 -0400
Subject: rpms/desktop-backgrounds/devel sources,1.22,1.23
Message-ID: <200709261434.l8QEYCLC009629@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573

Modified Files:
	sources 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	26 Sep 2007 14:08:51 -0000	1.22
+++ sources	26 Sep 2007 14:33:39 -0000	1.23
@@ -1,3 +1,3 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 f19c55f6c248760c00cd840e2e372ce2  redhat-backgrounds-14.tar.bz2
-84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.1.tar.gz
+84a003eb339a7cb0e7d16fc106982395  desktop-backgrounds-infinity-0.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 14:42:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 10:42:02 -0400
Subject: rpms/desktop-backgrounds/devel infinity.xml,1.2,NONE
Message-ID: <200709261442.l8QEg2UR009766@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9759

Removed Files:
	infinity.xml 
Log Message:
remove old file



--- infinity.xml DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 14:48:15 2007
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 26 Sep 2007 10:48:15 -0400
Subject: devel/vim README.patches,1.85,1.86 vim.spec,1.177,1.178
Message-ID: <200709261448.l8QEmFFB009882@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9862

Modified Files:
	README.patches vim.spec 
Log Message:
- patchlevel 122


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- README.patches	25 Sep 2007 13:16:28 -0000	1.85
+++ README.patches	26 Sep 2007 14:47:43 -0000	1.86
@@ -148,3 +148,6 @@
   1414  7.1.117  can't check wether Vim was compiled with Gnome
   1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
   1761  7.1.119  crash after setting 'cmdheight' to huge value
+ 17416  7.1.120  can't use valgrind with "make test" to test for memory leaks
+  2350  7.1.121  ":cd %:h" fails when editing file in current directory
+  3732  7.1.122  Mac: building with Aap doesn't work properly


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- vim.spec	25 Sep 2007 13:16:28 -0000	1.177
+++ vim.spec	26 Sep 2007 14:47:43 -0000	1.178
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 119
+%define patchlevel 122
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -179,6 +179,9 @@
 Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
 Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
 Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
+Patch120: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.120
+Patch121: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.121
+Patch122: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.122
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -442,6 +445,9 @@
 %patch117 -p0 
 %patch118 -p0 
 %patch119 -p0 
+%patch120 -p0 
+%patch121 -p0 
+%patch122 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -827,6 +833,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Sep 26 2007 Karsten Hopp <karsten at redhat.com> 7.1.122-1
+- patchlevel 122
+
 * Tue Sep 25 2007 Karsten Hopp <karsten at redhat.com> 7.1.119-1
 - patchlevel 119
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:06:04 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 26 Sep 2007 11:06:04 -0400
Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.4-config.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 smbldap-tools.spec, 1.5, 1.6 sources,
	1.3, 1.4 smbldap-tools-0.9.2-config.patch, 1.2, NONE
Message-ID: <200709261506.l8QF64Dv018690@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/smbldap-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18621

Modified Files:
	.cvsignore smbldap-tools.spec sources 
Added Files:
	smbldap-tools-0.9.4-config.patch 
Removed Files:
	smbldap-tools-0.9.2-config.patch 
Log Message:
- update to 0.9.4
- new upstream, new URLs
- drop useradd_option-o enhancement patch, new included upstream
- update config patch
- new script smbldap-userlist included
- convert docs to UTF-8
- HTML docs no longer included with upstream source
- make and include manpages


smbldap-tools-0.9.4-config.patch:

--- NEW FILE smbldap-tools-0.9.4-config.patch ---
--- smbldap.conf	2007-09-26 11:49:23.000000000 +0100
+++ smbldap.conf	2007-09-26 12:11:44.000000000 +0100
@@ -34,12 +34,12 @@
 
 # Put your own SID. To obtain this number do: "net getlocalsid".
 # If not defined, parameter is taking from "net getlocalsid" return
-SID="S-1-5-21-2252255531-4061614174-2474224977"
+#SID="S-1-5-21-2252255531-4061614174-2474224977"
 
 # Domain name the Samba server is in charged.
 # If not defined, parameter is taking from smb.conf configuration file
 # Ex: sambaDomain="IDEALX-NT"
-sambaDomain="DOMSMB"
+#sambaDomain="DOMSMB"
 
 ##############################################################################
 #
@@ -85,15 +85,15 @@
 
 # CA certificate
 # see "man Net::LDAP" in start_tls section for more details
-cafile="/etc/smbldap-tools/ca.pem"
+cafile="/etc/pki/tls/certs/ldapserverca.pem"
 
 # certificate to use to connect to the ldap server
 # see "man Net::LDAP" in start_tls section for more details
-clientcert="/etc/smbldap-tools/smbldap-tools.pem"
+clientcert="/etc/pki/tls/certs/ldapclient.pem"
 
 # key certificate to use to connect to the ldap server
 # see "man Net::LDAP" in start_tls section for more details
-clientkey="/etc/smbldap-tools/smbldap-tools.key"
+clientkey="/etc/pki/tls/certs/ldapclientkey.pem"
 
 # LDAP Suffix
 # Ex: suffix=dc=IDEALX,dc=ORG
@@ -102,7 +102,7 @@
 # Where are stored Users
 # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for usersdn
-usersdn="ou=Users,${suffix}"
+usersdn="ou=People,${suffix}"
 
 # Where are stored Computers
 # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
@@ -112,10 +112,10 @@
 # Where are stored Groups
 # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
-groupsdn="ou=Groups,${suffix}"
+groupsdn="ou=Group,${suffix}"
 
 # Where are stored Idmap entries (used if samba is a domain member server)
-# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
+# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
 # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
 idmapdn="ou=Idmap,${suffix}"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Aug 2007 15:18:40 -0000	1.3
+++ .cvsignore	26 Sep 2007 15:05:32 -0000	1.4
@@ -1,2 +1 @@
-smbldap-tools-0.9.2a.tgz
-smbldap-useradd_option-o_version2.tar.gz
+smbldap-tools-0.9.4.tgz


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smbldap-tools.spec	23 Aug 2007 15:18:40 -0000	1.5
+++ smbldap-tools.spec	26 Sep 2007 15:05:32 -0000	1.6
@@ -1,13 +1,12 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.2a
+Version:	0.9.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
-URL:		http://sourceforge.net/projects/smbldap-tools/
-Source0:	http://downloads.sf.net/smbldap-tools/smbldap-tools-%{version}.tgz
-Source1:	http://downloads.sf.net/smbldap-tools/smbldap-useradd_option-o_version2.tar.gz
-Patch0:		smbldap-tools-0.9.2-config.patch
+URL:		https://gna.org/projects/smbldap-tools/
+Source0:	http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz
+Patch0:		smbldap-tools-0.9.4-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	openldap-clients, samba, perl(IO::Socket::SSL)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -21,19 +20,26 @@
 groups and passwords.
 
 %prep
-%setup -q -n smbldap-tools-0.9.2 -a 1
-%{__patch} -p0 < smbldap-useradd_option-o_version1.patch
+%setup -q
 %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g;
 		  s|/opt/IDEALX||g;' \
-	Makefile smb.conf smbldap.conf \
-	smbldap-populate smbldap_tools.pm configure.pl \
-	doc/html/*.html
+	smbldap_tools.pm configure.pl
 %patch0 -p0
 
 # Don't want these in %{_sbindir}...
 %{__mv} smbldap-tools.spec original-smbldap-tools.spec
-%{__mv} smbldap-useradd_option-o_version1.txt useradd-patch.txt
-%{__rm} smbldap-useradd_option-o_version1.patch
+
+# Convert docs to UTF-8 where needed
+for f in CONTRIBUTORS README; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf8
+	%{__mv} -f ${f}.utf8 ${f}
+done
+
+# Generate manpages
+%{__mkdir} manpages
+for i in smbldap-*; do
+	/usr/bin/pod2man --section=8 ${i} > manpages/${i}.8
+done
 
 # Figure out where ssl stuff goes
 %define use_pki %(if [ -f %{_sysconfdir}/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
@@ -45,10 +51,12 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
-%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -d -m0755 %{buildroot}%{_sbindir}/
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man8/
+%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}/
+%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}/
+%{__install} -p -m0644 manpages/* %{buildroot}%{_mandir}/man8/
+%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}/
 %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
 %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
@@ -58,7 +66,7 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
-%doc configure.pl *.conf doc/* useradd-patch.txt
+%doc configure.pl *.conf doc/*.conf doc/migration_scripts/ doc/*.pdf
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
@@ -70,12 +78,24 @@
 %{_sbindir}/smbldap-populate
 %{_sbindir}/smbldap-useradd
 %{_sbindir}/smbldap-userdel
+%{_sbindir}/smbldap-userlist
 %{_sbindir}/smbldap-usermod
 %{_sbindir}/smbldap-userinfo
 %{_sbindir}/smbldap-usershow
 %{perl_vendorlib}/smbldap_tools.pm
+%{_mandir}/man8/*
 
 %changelog
+* Wed Sep 26 2007 Paul Howarth <paul at city-fan.org> 0.9.4-1
+- update to 0.9.4
+- new upstream, new URLs
+- drop useradd_option-o enhancement patch, new included upstream
+- update config patch
+- new script smbldap-userlist included
+- convert docs to UTF-8
+- HTML docs no longer included with upstream source
+- make and include manpages
+
 * Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 0.9.2a-1
 - update URLs, as original upstream source is now dead
 - apply useradd_option-o enhancement patch from upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Aug 2007 15:18:40 -0000	1.3
+++ sources	26 Sep 2007 15:05:32 -0000	1.4
@@ -1,2 +1 @@
-bb8eb44adb4e7946de5b486acf480c24  smbldap-tools-0.9.2a.tgz
-eb0ffa04c9ddfc8205524b298309141f  smbldap-useradd_option-o_version2.tar.gz
+5c9a71336fcb1af06c5766ab88e50a03  smbldap-tools-0.9.4.tgz


--- smbldap-tools-0.9.2-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 15:09:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?b?TcOhaXLDrW4gRHVmZnk=?= (duffy))
Date: Wed, 26 Sep 2007 11:09:07 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.48,1.49
Message-ID: <200709261509.l8QF97Gl018896@cvs-int.fedora.redhat.com>

Author: duffy

Update of /cvs/pkgs/rpms/desktop-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18859

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- desktop-backgrounds.spec	26 Sep 2007 13:47:10 -0000	1.48
+++ desktop-backgrounds.spec	26 Sep 2007 15:08:35 -0000	1.49
@@ -105,6 +105,7 @@
 %{_datadir}/backgrounds/images/flowers_and_leaves.jpg
 %{_datadir}/backgrounds/images/earth_from_space.jpg
 %{_datadir}/backgrounds/images/*.png
+%{_datadir}/backgrounds/images/*.jpg
 %{_datadir}/backgrounds/infinity/*.png
 %{_datadir}/backgrounds/infinity/infinity.xml
 %dir %{_datadir}/gnome-background-properties



From fedora-extras-commits at redhat.com  Wed Sep 26 15:18:07 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 26 Sep 2007 11:18:07 -0400
Subject: rpms/stellarium/devel stellarium.desktop, 1.2, 1.3 stellarium.spec, 
	1.32, 1.33
Message-ID: <200709261518.l8QFI7Tv019252@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19202

Modified Files:
	stellarium.desktop stellarium.spec 
Log Message:
Add opengl-game-wrapper support


Index: stellarium.desktop
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stellarium.desktop	27 Jun 2007 15:26:54 -0000	1.2
+++ stellarium.desktop	26 Sep 2007 15:17:31 -0000	1.3
@@ -4,7 +4,7 @@
 Comment=A real-time nightsky renderer
 Categories=Education;Science;Astronomy;
 Icon=stellarium.png
-Exec=stellarium
+Exec=stellarium-wrapper
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- stellarium.spec	9 Aug 2007 19:37:52 -0000	1.32
+++ stellarium.spec	26 Sep 2007 15:17:31 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -24,6 +24,8 @@
 BuildRequires:	gettext-devel
 BuildRequires:	boost-devel
 
+Requires:	opengl-games-utils
+
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
@@ -65,6 +67,8 @@
 rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico}
 cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
+ln -s opengl-game-wrapper $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
+
 %find_lang %{name}
 
 %clean
@@ -74,6 +78,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/stellarium
+%{_bindir}/stellarium-wrapper
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
@@ -83,11 +88,14 @@
 %doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
+* Wed Sep 26 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-5
+- Add usage of opengl-game-wrapper (BZ #304851)
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-4
-- Brbuild
+- Rebuild
 
 * Tue Aug  7 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
-- Solve wekkday displaying issue (#250621)
+- Solve weakday displaying issue (#250621)
 
 * Wed Jun 27 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
 - Change category of the desktop entry (#241440)



From fedora-extras-commits at redhat.com  Wed Sep 26 15:18:10 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 11:18:10 -0400
Subject: rpms/control-center/devel .cvsignore, 1.63, 1.64 control-center.spec,
	1.302, 1.303 sources, 1.66, 1.67
Message-ID: <200709261518.l8QFIARA019259@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19211

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.20.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	17 Sep 2007 19:40:42 -0000	1.63
+++ .cvsignore	26 Sep 2007 15:17:38 -0000	1.64
@@ -1 +1 @@
-gnome-control-center-2.20.0.tar.bz2
+gnome-control-center-2.20.0.1.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- control-center.spec	17 Sep 2007 19:40:42 -0000	1.302
+++ control-center.spec	26 Sep 2007 15:17:38 -0000	1.303
@@ -21,7 +21,7 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.20.0
+Version: 2.20.0.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
@@ -73,6 +73,12 @@
 # change default preferred apps to programs we ship
 Patch99: control-center-2.19.91-default-apps.patch
 
+Patch200: 26_add_touchpad_to_mouse_settings.patch
+Patch201: 27_add_touchpad_to_settings_daemon.patch
+Patch202: 28_fixup_touchpad_config.patch
+Patch203: 95_desktop-effects-integration.patch
+Patch204: composite.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -203,6 +209,12 @@
 #%patch98 -p1 -b .filesel
 %patch99 -p1 -b .default-apps
 
+%patch200 -p1 -b .touchpad-mouse-settings
+%patch201 -p1 -b .touchpad-settings-daemon
+%patch202 -p1 -b .touchpad-fixup
+%patch203 -p1 -b .desktop-effects-integration
+%patch204 -p1 -b .composite
+
 %build
 
 autoreconf
@@ -386,6 +398,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1 (small bug fixes)
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	17 Sep 2007 19:40:42 -0000	1.66
+++ sources	26 Sep 2007 15:17:38 -0000	1.67
@@ -1 +1 @@
-a3d5f41cd9e30e8f777c5ae43070557b  gnome-control-center-2.20.0.tar.bz2
+2c14dab486227fe15451468780f11b74  gnome-control-center-2.20.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 15:20:36 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 11:20:36 -0400
Subject: rpms/selinux-policy/F-7 policy-20070501.patch, 1.60,
	1.61 selinux-policy.spec, 1.495, 1.496
Message-ID: <200709261520.l8QFKaMl019552@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19370

Modified Files:
	policy-20070501.patch selinux-policy.spec 
Log Message:
* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-45
- Allow nsswitch apps to read samba_var_t
- Changes to allow setroubleshoot to run


policy-20070501.patch:

Index: policy-20070501.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/policy-20070501.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policy-20070501.patch	22 Sep 2007 12:17:31 -0000	1.60
+++ policy-20070501.patch	26 Sep 2007 15:20:00 -0000	1.61
@@ -7550,7 +7550,7 @@
  /usr/libexec/postfix/(n)?qmgr -- gen_context(system_u:object_r:postfix_qmgr_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.6.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/postfix.if	2007-09-26 11:18:04.000000000 -0400
 @@ -41,6 +41,7 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -7559,7 +7559,16 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
  	read_files_pattern(postfix_$1_t,postfix_etc_t,postfix_etc_t)
-@@ -66,6 +67,7 @@
+@@ -56,6 +57,8 @@
+ 	allow postfix_$1_t postfix_var_run_t:file manage_file_perms;
+ 	files_pid_filetrans(postfix_$1_t,postfix_var_run_t,file)
+ 
++	auth_use_nsswitch(postfix_$1_t)
++
+ 	kernel_read_system_state(postfix_$1_t)
+ 	kernel_read_network_state(postfix_$1_t)
+ 	kernel_read_all_sysctls(postfix_$1_t)
+@@ -66,6 +69,7 @@
  
  	fs_search_auto_mountpoints(postfix_$1_t)
  	fs_getattr_xattr_fs(postfix_$1_t)
@@ -7567,19 +7576,19 @@
  
  	term_dontaudit_use_console(postfix_$1_t)
  
-@@ -137,10 +139,8 @@
+@@ -137,11 +141,6 @@
  	corenet_tcp_connect_all_ports(postfix_$1_t)
  	corenet_sendrecv_all_client_packets(postfix_$1_t)
  
 -	sysnet_read_config(postfix_$1_t)
 -
- 	optional_policy(`
+-	optional_policy(`
 -		nis_use_ypbind(postfix_$1_t)
-+		auth_use_nsswitch(postfix_$1_t)
- 	')
+-	')
  ')
  
-@@ -274,6 +274,42 @@
+ ########################################
+@@ -274,6 +273,42 @@
  
  ########################################
  ## <summary>
@@ -7622,7 +7631,7 @@
  ##	Do not audit attempts to use
  ##	postfix master process file
  ##	file descriptors.
-@@ -439,6 +475,25 @@
+@@ -439,6 +474,25 @@
  
  ########################################
  ## <summary>
@@ -7648,7 +7657,7 @@
  ##	Execute postfix user mail programs
  ##	in their respective domains.
  ## </summary>
-@@ -455,3 +510,22 @@
+@@ -455,3 +509,22 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -8588,7 +8597,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.6.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-18 08:18:51.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.if	2007-09-24 17:17:58.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -8625,7 +8634,7 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  ')
  
-@@ -250,11 +272,55 @@
+@@ -250,11 +272,74 @@
  	')
  
  	files_search_var($1)
@@ -8678,10 +8687,29 @@
 +
 +########################################
 +## <summary>
++##	dontaudit the specified domain to
++##	write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_dontaudit_write_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	dontaudit $1 samba_var_t:file write;
++')
++
++########################################
++## <summary>
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +443,121 @@
+@@ -377,3 +462,121 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -8805,7 +8833,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.6.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-05-07 14:50:57.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-18 08:17:55.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/samba.te	2007-09-25 17:10:56.000000000 -0400
 @@ -16,6 +16,14 @@
  
  ## <desc>
@@ -8950,7 +8978,7 @@
  
  files_list_var_lib(smbd_t)
  files_read_etc_files(smbd_t)
-@@ -290,12 +324,16 @@
+@@ -290,8 +324,6 @@
  miscfiles_read_localization(smbd_t)
  miscfiles_read_public_files(smbd_t)
  
@@ -8959,6 +8987,9 @@
  userdom_dontaudit_search_sysadm_home_dirs(smbd_t)
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
+@@ -312,6 +344,12 @@
+ 	miscfiles_manage_public_files(smbd_t)
+ ') 
  
 +tunable_policy(`samba_domain_controller',`
 +	usermanage_domtrans_passwd(smbd_t)
@@ -8966,9 +8997,9 @@
 +	usermanage_domtrans_groupadd(smbd_t)
 +')
 +
- ifdef(`hide_broken_symptoms', `
- 	files_dontaudit_getattr_default_dirs(smbd_t)
- 	files_dontaudit_getattr_boot_dirs(smbd_t)
+ # Support Samba sharing of NFS mount points
+ tunable_policy(`samba_share_nfs',`
+ 	fs_manage_nfs_dirs(smbd_t)
 @@ -319,6 +357,14 @@
  ')
  
@@ -9105,7 +9136,7 @@
  ')
  
  ########################################
-@@ -530,22 +590,30 @@
+@@ -530,22 +590,36 @@
  # SWAT Local policy
  #
  
@@ -9125,12 +9156,19 @@
 +allow swat_t nmbd_port_t:udp_socket name_bind;
 +allow swat_t nmbd_t:process { signal signull };
 +allow swat_t nmbd_var_run_t:file { lock read unlink };
- 
- rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
- 
++
 +init_read_utmp(swat_t)
 +init_dontaudit_write_utmp(swat_t)
 +
++manage_dirs_pattern(swat_t,samba_log_t,samba_log_t)
++create_files_pattern(swat_t,samba_log_t,samba_log_t)
+ 
+-rw_files_pattern(swat_t,samba_etc_t,samba_etc_t)
++manage_files_pattern(swat_t,samba_etc_t,samba_etc_t)
++
++manage_files_pattern(swat_t,samba_var_t,samba_var_t)
++files_list_var_lib(swat_t)
+ 
  append_files_pattern(swat_t,samba_log_t,samba_log_t)
  
 -allow swat_t smbd_exec_t:file execute ;
@@ -9142,7 +9180,7 @@
  
  allow swat_t smbd_t:process signull;
  
-@@ -558,7 +626,11 @@
+@@ -558,7 +632,11 @@
  manage_files_pattern(swat_t,swat_var_run_t,swat_var_run_t)
  files_pid_filetrans(swat_t,swat_var_run_t,file)
  
@@ -9155,7 +9193,7 @@
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -582,23 +654,24 @@
+@@ -582,23 +660,24 @@
  
  dev_read_urand(swat_t)
  
@@ -9182,7 +9220,7 @@
  optional_policy(`
  	cups_read_rw_config(swat_t)
  	cups_stream_connect(swat_t)
-@@ -612,32 +685,30 @@
+@@ -612,32 +691,30 @@
  	kerberos_use(swat_t)
  ')
  
@@ -9222,7 +9260,7 @@
  manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
  filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
  
-@@ -645,6 +716,8 @@
+@@ -645,6 +722,8 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -9231,7 +9269,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -682,7 +755,9 @@
+@@ -682,7 +761,9 @@
  fs_getattr_all_fs(winbind_t)
  fs_search_auto_mountpoints(winbind_t)
  
@@ -9241,7 +9279,7 @@
  
  domain_use_interactive_fds(winbind_t)
  
-@@ -695,9 +770,6 @@
+@@ -695,9 +776,6 @@
  
  miscfiles_read_localization(winbind_t)
  
@@ -9251,7 +9289,7 @@
  userdom_dontaudit_use_unpriv_user_fds(winbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(winbind_t)
  userdom_priveleged_home_dir_manager(winbind_t)
-@@ -713,10 +785,6 @@
+@@ -713,10 +791,6 @@
  ')
  
  optional_policy(`
@@ -9262,7 +9300,7 @@
  	seutil_sigchld_newrole(winbind_t)
  ')
  
-@@ -736,6 +804,7 @@
+@@ -736,6 +810,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -9270,7 +9308,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -763,4 +832,64 @@
+@@ -763,4 +838,64 @@
  optional_policy(`
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
@@ -9417,7 +9455,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/services/setroubleshoot.te	2007-09-26 11:13:13.000000000 -0400
 @@ -28,12 +28,11 @@
  #
  
@@ -9432,23 +9470,41 @@
  
  # database files
  allow setroubleshootd_t setroubleshoot_var_lib_t:dir setattr;
-@@ -51,6 +50,8 @@
- manage_sock_files_pattern(setroubleshootd_t,setroubleshoot_var_run_t,setroubleshoot_var_run_t)
- files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
+@@ -67,6 +66,7 @@
+ corenet_sendrecv_smtp_client_packets(setroubleshootd_t)
+ 
+ dev_read_urand(setroubleshootd_t)
++dev_read_sysfs(setroubleshootd_t)
+ 
+ domain_dontaudit_search_all_domains_state(setroubleshootd_t)
+ 
+@@ -75,12 +75,17 @@
+ files_getattr_all_dirs(setroubleshootd_t)
+ files_getattr_all_files(setroubleshootd_t)
+ 
++fs_getattr_all_dirs(setroubleshootd_t)
++fs_getattr_all_files(setroubleshootd_t)
++
+ selinux_get_enforce_mode(setroubleshootd_t)
+ selinux_validate_context(setroubleshootd_t)
+ 
+ term_dontaudit_use_all_user_ptys(setroubleshootd_t)
+ term_dontaudit_use_all_user_ttys(setroubleshootd_t)
  
 +auth_use_nsswitch(setroubleshootd_t)
 +
- kernel_read_kernel_sysctls(setroubleshootd_t)
- kernel_read_system_state(setroubleshootd_t)
- kernel_read_network_state(setroubleshootd_t)
-@@ -111,7 +112,3 @@
- 	rpm_dontaudit_manage_db(setroubleshootd_t)
-         rpm_use_script_fds(setroubleshootd_t)
+ init_read_utmp(setroubleshootd_t)
+ init_dontaudit_write_utmp(setroubleshootd_t)
+ 
+@@ -113,5 +118,7 @@
  ')
--
--optional_policy(`
+ 
+ optional_policy(`
 -	nis_use_ypbind(setroubleshootd_t)
--')
++	dbus_system_bus_client_template(setroubleshootd, setroubleshootd_t)
++	dbus_send_system_bus(setroubleshootd_t)
++	dbus_connect_system_bus(setroubleshootd_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.6.4/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-05-07 14:51:01.000000000 -0400
 +++ serefpolicy-2.6.4/policy/modules/services/smartmon.te	2007-08-07 09:42:35.000000000 -0400
@@ -10154,7 +10210,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.6.4/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-05-07 14:51:01.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-08-07 09:42:35.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/authlogin.if	2007-09-24 17:17:32.000000000 -0400
 @@ -27,11 +27,9 @@
  	domain_type($1_chkpwd_t)
  	domain_entry_file($1_chkpwd_t,chkpwd_exec_t)
@@ -10324,7 +10380,16 @@
  ##	Get the attributes of the shadow passwords file.
  ## </summary>
  ## <param name="domain">
-@@ -1391,3 +1425,114 @@
+@@ -1357,6 +1391,8 @@
+ 
+ 	optional_policy(`
+ 		samba_stream_connect_winbind($1)
++		samba_read_var_files($1)
++		samba_dontaudit_write_var_files($1)
+ 	')
+ ')
+ 
+@@ -1391,3 +1427,114 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -12775,7 +12840,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-05-07 14:51:02.000000000 -0400
-+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-18 08:18:22.000000000 -0400
++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te	2007-09-24 17:20:49.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -12792,7 +12857,15 @@
  type unconfined_t;
  type unconfined_exec_t;
  init_system_domain(unconfined_t,unconfined_exec_t)
-@@ -50,6 +59,8 @@
+@@ -28,6 +37,7 @@
+ ifdef(`targeted_policy',`
+ 	allow unconfined_t self:system syslog_read;
+ 	dontaudit unconfined_t self:capability sys_module;
++	dontaudit unconfined_t self:dir write;
+ 
+ 	domain_auto_trans(unconfined_t,unconfined_execmem_exec_t,unconfined_execmem_t)
+ 
+@@ -50,6 +60,8 @@
  	userdom_unconfined(unconfined_t)
  	userdom_priveleged_home_dir_manager(unconfined_t)
  
@@ -12801,7 +12874,7 @@
  	optional_policy(`
  		ada_domtrans(unconfined_t)
  	')
-@@ -63,10 +74,6 @@
+@@ -63,10 +75,6 @@
  	')
  
  	optional_policy(`
@@ -12812,7 +12885,7 @@
  		init_dbus_chat_script(unconfined_t)
  
  		dbus_stub(unconfined_t)
-@@ -93,6 +100,7 @@
+@@ -93,6 +101,7 @@
  
  		optional_policy(`
  			networkmanager_dbus_chat(unconfined_t)
@@ -12820,7 +12893,7 @@
  		')
  
  		optional_policy(`
-@@ -153,11 +161,14 @@
+@@ -153,11 +162,14 @@
  
  	optional_policy(`
  		rpm_domtrans(unconfined_t)
@@ -12835,7 +12908,7 @@
  	')
  
  	optional_policy(`
-@@ -192,6 +203,9 @@
+@@ -192,6 +204,9 @@
  	optional_policy(`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
@@ -12845,7 +12918,7 @@
  ')
  
  ########################################
-@@ -200,10 +214,18 @@
+@@ -200,10 +215,18 @@
  #
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-7/selinux-policy.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- selinux-policy.spec	22 Sep 2007 12:17:31 -0000	1.495
+++ selinux-policy.spec	26 Sep 2007 15:20:00 -0000	1.496
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.4
-Release: 44%{?dist}
+Release: 45%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -361,6 +361,10 @@
 %endif
 
 %changelog
+* Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-45
+- Allow nsswitch apps to read samba_var_t
+- Changes to allow setroubleshoot to run
+
 * Sat Sep 22 2007 Dan Walsh <dwalsh at redhat.com> 2.6.4-44
 - Fix /dev/input/uinput 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:20:50 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 11:20:50 -0400
Subject: rpms/xen/devel xen-pvfb-04-compat.patch,1.3,1.4
Message-ID: <200709261520.l8QFKo89019599@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	xen-pvfb-04-compat.patch 
Log Message:
Fixed typo in method name

xen-pvfb-04-compat.patch:

Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-pvfb-04-compat.patch	25 Sep 2007 04:57:36 -0000	1.3
+++ xen-pvfb-04-compat.patch	26 Sep 2007 15:20:15 -0000	1.4
@@ -452,7 +452,7 @@
 +	xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port);
 +}
 +
-+static void xenfb_on_fb_event(struct xenfb_private *xenfb)
++static void oldxenfb_on_fb_event(struct xenfb_private *xenfb)
 +{
 +  int mode;
 +  if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_NATIVE))



From fedora-extras-commits at redhat.com  Wed Sep 26 15:32:49 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Wed, 26 Sep 2007 11:32:49 -0400
Subject: rpms/sugar/OLPC-2 sources,1.62,1.63 sugar.spec,1.73,1.74
Message-ID: <200709261532.l8QFWn0M020031@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977

Modified Files:
	sources sugar.spec 
Log Message:
* Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
- New snapshot



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	25 Sep 2007 19:54:59 -0000	1.62
+++ sources	26 Sep 2007 15:32:16 -0000	1.63
@@ -1 +1 @@
-338ebbbda341a2bddb416e60c5b9a5b5  sugar-0.65-git5a595ea04e.tar.bz2
+de11dc9d6a1bb99b36f7beeea453e210  sugar-0.65-git5a595ea04e.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sugar.spec	25 Sep 2007 19:54:59 -0000	1.73
+++ sugar.spec	26 Sep 2007 15:32:16 -0000	1.74
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070925git
+%define alphatag 20070926git
 %define commitid 5a595ea04e
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.58.%{alphatag}5a595ea04e
+Release: 0.59.%{alphatag}5a595ea04e
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
+- New snapshot
+
 * Tue Sep 25 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.58.20070925git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:33:17 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 11:33:17 -0400
Subject: rpms/thunderbird/devel thunderbird-2.0-enable-debug.patch, NONE,
	1.1 thunderbird.sh.in, 1.7, 1.8 thunderbird.spec, 1.105, 1.106
Message-ID: <200709261533.l8QFXHu9020072@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20008

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Added Files:
	thunderbird-2.0-enable-debug.patch 
Log Message:
Fixed #242657 - firefox -g doesn't work

thunderbird-2.0-enable-debug.patch:

--- NEW FILE thunderbird-2.0-enable-debug.patch ---
diff -up mozilla/mail/app/Makefile.in.old mozilla/mail/app/Makefile.in
--- mozilla/mail/app/Makefile.in.old	2007-02-28 07:52:59.000000000 +0100
+++ mozilla/mail/app/Makefile.in	2007-09-26 16:53:51.000000000 +0200
@@ -257,7 +257,7 @@ libs:: thunderbird
 	$(INSTALL) $< $(DIST)/bin
 
 install:: thunderbird
-	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+	$(SYSINSTALL) $< $(DESTDIR)$(mozappdir)
 
 GARBAGE += thunderbird
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)


Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird.sh.in	12 Apr 2007 20:32:40 -0000	1.7
+++ thunderbird.sh.in	26 Sep 2007 15:32:44 -0000	1.8
@@ -14,7 +14,7 @@
 MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
 export MOZILLA_FIVE_HOME MRE_HOME
 
-MOZ_PROGRAM=$MRE_HOME/thunderbird-bin
+MOZ_PROGRAM=$MRE_HOME/thunderbird
 #MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird"
 MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote" 
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- thunderbird.spec	25 Sep 2007 20:13:47 -0000	1.105
+++ thunderbird.spec	26 Sep 2007 15:32:44 -0000	1.106
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Applications/Internet
@@ -64,6 +64,7 @@
 Patch104:       firefox-1.5-dnd-nograb.patch
 Patch106:       firefox-2.0-indicator-crash.patch
 Patch111:       thunderbird-path.patch
+Patch112:       thunderbird-2.0-enable-debug.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -147,6 +148,7 @@
 #%patch104 -p1 -b .dnd-nograb
 %patch106 -p1 -b .indicator-crash
 %patch111 -p1 -b .path
+%patch112 -p1 -b .debug
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -302,6 +304,7 @@
 %{mozappdir}/res
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/thunderbird-bin
+%{mozappdir}/thunderbird
 %{mozappdir}/updater
 %{mozappdir}/*.so
 
@@ -318,6 +321,9 @@
 #===============================================================================
 
 %changelog
+* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+- Fixed #242657 - firefox -g doesn't work
+
 * Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5
 - Removed hardcoded MAX_PATH, PATH_MAX and MAXPATHLEN macros
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:34:42 2007
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Wed, 26 Sep 2007 11:34:42 -0400
Subject: rpms/thunderbird/devel thunderbird.spec,1.106,1.107
Message-ID: <200709261534.l8QFYg5T020199@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082

Modified Files:
	thunderbird.spec 
Log Message:
fixed release


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- thunderbird.spec	26 Sep 2007 15:32:44 -0000	1.106
+++ thunderbird.spec	26 Sep 2007 15:34:07 -0000	1.107
@@ -321,7 +321,7 @@
 #===============================================================================
 
 %changelog
-* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-3
+* Wed Sep 26 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-6
 - Fixed #242657 - firefox -g doesn't work
 
 * Tue Sep 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-5



From fedora-extras-commits at redhat.com  Wed Sep 26 15:44:02 2007
From: fedora-extras-commits at redhat.com (Chris Lalancette (clalance))
Date: Wed, 26 Sep 2007 11:44:02 -0400
Subject: rpms/xen/devel pygrub-dont-exec.patch, NONE,
	1.1 xen-qemu-ne2000-CVE-2007-1321.patch, NONE, 1.1 xen.spec,
	1.190, 1.191
Message-ID: <200709261544.l8QFi2Hc020696@cvs-int.fedora.redhat.com>

Author: clalance

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20672

Modified Files:
	xen.spec 
Added Files:
	pygrub-dont-exec.patch xen-qemu-ne2000-CVE-2007-1321.patch 
Log Message:
- Fixes for CVE-2007-1321, CVE-2007-4993



pygrub-dont-exec.patch:

--- NEW FILE pygrub-dont-exec.patch ---
diff -up xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec xen-3.1.0-src/tools/pygrub/src/GrubConf.py
--- xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec	2007-09-25 15:20:14.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-25 15:20:25.000000000 -0400
@@ -101,7 +101,7 @@ class GrubImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -142,11 +142,11 @@ class GrubImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "title": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "kernel": "self.kernel",
-                 "initrd": "self.initrd",
+    commands = { "title": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "kernel": "kernel",
+                 "initrd": "initrd",
                  "chainloader": None,
                  "module": None}
         
@@ -195,7 +195,7 @@ class GrubConfigFile(object):
             (com, arg) = grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:
@@ -208,7 +208,7 @@ class GrubConfigFile(object):
         (com, arg) = grub_exact_split(line, 2)
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored directive %s" %(com,))
         else:
@@ -236,12 +236,12 @@ class GrubConfigFile(object):
     splash = property(get_splash, set_splash)
 
     # set up command handlers
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
-                 "fallback": "self.fallback",
-                 "hiddenmenu": "self.hiddenmenu",
-                 "splashimage": "self.splash",
-                 "password": "self.password" }
+    commands = { "default": "default",
+                 "timeout": "timeout",
+                 "fallback": "fallback",
+                 "hiddenmenu": "hiddenmenu",
+                 "splashimage": "splash",
+                 "password": "password" }
     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
               "pager", "partnew", "parttype", "rarp", "serial",
               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff -up xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec xen-3.1.0-src/tools/pygrub/src/LiloConf.py
--- xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec	2007-09-25 15:20:18.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-25 15:20:23.000000000 -0400
@@ -30,7 +30,7 @@ class LiloImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -56,12 +56,12 @@ class LiloImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "label": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "image": "self.kernel",
-                 "initrd": "self.initrd",
-                 "append": "self.args",
+    commands = { "label": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "image": "kernel",
+                 "initrd": "initrd",
+                 "append": "args",
                  "read-only": None,
                  "chainloader": None,
                  "module": None}
@@ -111,7 +111,7 @@ class LiloConfigFile(object):
             (com, arg) = GrubConf.grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:

xen-qemu-ne2000-CVE-2007-1321.patch:

--- NEW FILE xen-qemu-ne2000-CVE-2007-1321.patch ---
diff -up xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c
--- xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve	2007-09-25 10:27:44.000000000 -0400
+++ xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c	2007-09-25 10:27:47.000000000 -0400
@@ -252,7 +252,7 @@ static void ne2000_receive(void *opaque,
 {
     NE2000State *s = opaque;
     uint8_t *p;
-    int total_len, next, avail, len, index, mcast_idx;
+    unsigned int total_len, next, avail, len, index, mcast_idx;
     uint8_t buf1[60];
     static const uint8_t broadcast_macaddr[6] = 
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -327,7 +327,10 @@ static void ne2000_receive(void *opaque,
 
     /* write packet data */
     while (size > 0) {
-        avail = s->stop - index;
+        if (index <= s->stop)
+            avail = s->stop - index;
+        else
+            avail = 0;
         len = size;
         if (len > avail)
             len = avail;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- xen.spec	25 Sep 2007 05:00:17 -0000	1.190
+++ xen.spec	26 Sep 2007 15:43:29 -0000	1.191
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -51,6 +51,11 @@
 # Performance fix for listing domains
 Patch280: xen-xs-transactions.patch
 
+# CVE-2007-1321
+Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
+# CVE-2007-4993
+Patch601: pygrub-dont-exec.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -158,6 +163,10 @@
 # performance patch
 %patch280 -p1
 
+# CVE patches
+%patch600 -p1
+%patch601 -p1
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
 
@@ -278,6 +287,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-10.fc8
+- QEmu NE2000 overflow check - CVE-2007-1321
+- Pygrub guest escape - CVE-2007-4993
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-9.fc8
 - Fix generation of manual pages (rhbz #250791)
 - Really fix FC-6 32-on-64 guests



From fedora-extras-commits at redhat.com  Wed Sep 26 15:53:50 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 11:53:50 -0400
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.5,1.6
Message-ID: <200709261553.l8QFrohV021014@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20996

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
add missing buildreq



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Finance-Quote.spec	18 Sep 2007 14:50:13 -0000	1.5
+++ perl-Finance-Quote.spec	26 Sep 2007 15:53:18 -0000	1.6
@@ -9,7 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:	perl(HTML::TableExtract)
+BuildRequires:	perl(HTML::TableExtract) perl(ExtUtils::MakeMaker)
 
 %description
 This module retrieves stock and mutual fund quotes from various exchanges
@@ -44,6 +44,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Sep 26 2007 Bill Nottingham <notting at redhat.com>
+- add perl(ExtUtils::MakeMaker) buildreq
+
 * Tue Sep 18 2007 Bill Nottingham <notting at redhat.com>
 - fix source download URL
 



From fedora-extras-commits at redhat.com  Wed Sep 26 15:57:25 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Wed, 26 Sep 2007 11:57:25 -0400
Subject: fedora-security/audit fc7,1.121,1.122
Message-ID: <200709261557.l8QFvPem021085@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067/audit

Modified Files:
	fc7 
Log Message:
php non-issue



Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc7	25 Sep 2007 09:39:20 -0000	1.121
+++ fc7	26 Sep 2007 15:57:23 -0000	1.122
@@ -151,6 +151,7 @@
 CVE-2007-3378 ignore (php) safe mode escape
 CVE-2007-3377 version (perl-Net-DNS, fixed 0.60) #245612 [since FEDORA-2007-0668]
 CVE-2007-3304 backport (httpd) #244665 [since FEDORA-2007-0704]
+CVE-2007-3294 ignore (php-extras) win only
 CVE-2007-3257 backport (evolution) #244283 [since FEDORA-2007-0464]
 CVE-2007-3241 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]
 CVE-2007-3240 version (wordpress, fixed 2.2.1) #245211 [since FEDORA-2007-0894]



From fedora-extras-commits at redhat.com  Wed Sep 26 16:00:30 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 26 Sep 2007 12:00:30 -0400
Subject: rpms/iptables/devel iptables.init, 1.16, 1.17 iptables.spec, 1.53,
	1.54
Message-ID: <200709261600.l8QG0Uub021263@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21176

Modified Files:
	iptables.init iptables.spec 
Log Message:
- do not start ip6tables if ipv6 is blacklisted (rhbz#236888)
- use simpler fix for (rhbz#295611)
  Thanks to Linus Torvalds for the patch.




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- iptables.init	24 Sep 2007 16:03:24 -0000	1.16
+++ iptables.init	26 Sep 2007 15:59:58 -0000	1.17
@@ -32,6 +32,12 @@
     exit 5
 fi
 
+if [ "${IPV}" = "ip6" ] \
+    && grep -qIs "^blacklist\W${_IPV}" /etc/modprobe.conf /etc/modprobe.d/* ; then
+    echo $"$0: ${_IPV} is blacklisted."
+    exit 0
+fi
+
 # Old or new modutils
 /sbin/modprobe --version 2>&1 | grep -q module-init-tools \
     && NEW_MODUTILS=1 \
@@ -52,26 +58,9 @@
 NF_MODULES=(${IPV}_tables nf_conntrack_${_IPV})
 NF_MODULES_COMMON=(x_tables nf_conntrack) # Used by netfilter v4 and v6
 
-# Are netfilter modules loaded?
-MODULES_LOADED=0
-for mod in ${NF_MODULES[*]} ${NF_MODULES_COMMON[*]}; do
-    $(lsmod | grep -q ^${mod} | awk '{print $1}')
-    if [ $? -eq 0 ]; then
-	MODULES_LOADED=1
-	break
-    fi
-done
-
 # Get active tables
 NF_TABLES=$(cat "$PROC_IPTABLES_NAMES" 2>/dev/null)
 
-# Is netfilter compiled into the kernel?
-[ $MODULES_LOADED -eq 0 -a -n "$NF_TABLES" ] && COMPILED_IN=1 || COMPILED_IN=0
-
-# Get status (quicker than status function and honour lock file)
-[ ! -f "$VAR_SUBSYS_IPTABLES" -o ! -e "$PROC_IPTABLES_NAMES" \
-    -o -z "$NF_TABLES" ] && running=0 || running=1
-
 
 rmmod_r() {
     # Unload module with all referring modules.
@@ -324,13 +313,11 @@
 
 case "$1" in
     start)
-	[ $running -eq 1 -a $COMPILED_IN -eq 0 ] && exit 0
+	[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0
 	start
 	RETVAL=$?
 	;;
     stop)
-	# stop firewall, even if manually configured
-	[ $running -eq 1 -o $MODULES_LOADED -eq 1 ] || exit 0
 	[ "x$IPTABLES_SAVE_ON_STOP" = "xyes" ] && save
 	stop
 	RETVAL=$?
@@ -340,7 +327,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ $running -eq 1 ] || exit 0
+	[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0
 	restart
 	RETVAL=$?
 	;;


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- iptables.spec	24 Sep 2007 16:03:24 -0000	1.53
+++ iptables.spec	26 Sep 2007 15:59:58 -0000	1.54
@@ -153,6 +153,11 @@
 %endif
 
 %changelog
+* Wed Sep 26 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4.1
+- do not start ip6tables if ipv6 is blacklisted (rhbz#236888)
+- use simpler fix for (rhbz#295611)
+  Thanks to Linus Torvalds for the patch.
+
 * Mon Sep 24 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-4
 - fixed IPv6 reject type (rhbz#295181)
 - fixed init script: start, stop and status



From fedora-extras-commits at redhat.com  Wed Sep 26 16:01:30 2007
From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner))
Date: Wed, 26 Sep 2007 12:01:30 -0400
Subject: rpms/iptables/devel iptables.spec,1.54,1.55
Message-ID: <200709261601.l8QG1UCu027408@cvs-int.fedora.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21324

Modified Files:
	iptables.spec 
Log Message:
- new release 4.1



Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- iptables.spec	26 Sep 2007 15:59:58 -0000	1.54
+++ iptables.spec	26 Sep 2007 16:00:58 -0000	1.55
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 4%{?dist}
+Release: 4.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config



From fedora-extras-commits at redhat.com  Wed Sep 26 16:07:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 12:07:32 -0400
Subject: rpms/akode/devel akode.spec,1.12,1.13
Message-ID: <200709261607.l8QG7WgY027666@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27648

Modified Files:
	akode.spec 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
- BR: pulseaudio-libs-devel



Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/devel/akode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- akode.spec	21 Aug 2007 20:28:17 -0000	1.12
+++ akode.spec	26 Sep 2007 16:06:59 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -33,7 +33,7 @@
 BuildRequires: libvorbis-devel
 BuildRequires: libtool
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
-%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
 
 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
+- BR: pulseaudio-libs-devel
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8
 - -libsamplerate: License: GPLv2+
 - omit oss_sink



From fedora-extras-commits at redhat.com  Wed Sep 26 16:11:49 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 12:11:49 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.8.bz2.sign, NONE, 1.1 .cvsignore, 1.633,
	1.634 kernel-2.6.spec, 1.3345, 1.3346 sources, 1.596,
	1.597 upstream, 1.520, 1.521 patch-2.6.22.7.bz2.sign, 1.1, NONE
Message-ID: <200709261611.l8QGBnxG027863@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27838

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.22.8.bz2.sign 
Removed Files:
	patch-2.6.22.7.bz2.sign 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.8



--- NEW FILE patch-2.6.22.8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+KYdyGugalF9Dw4RAsbRAJ9c2aBbDRo/TePDZfUzM+j/nJMzRgCfcBdc
BzNSm1llvEs6z0WgGyMZqvg=
=llTN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- .cvsignore	21 Sep 2007 23:16:31 -0000	1.633
+++ .cvsignore	26 Sep 2007 16:11:16 -0000	1.634
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.7.bz2
+patch-2.6.22.8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3345
retrieving revision 1.3346
diff -u -r1.3345 -r1.3346
--- kernel-2.6.spec	21 Sep 2007 23:16:31 -0000	1.3345
+++ kernel-2.6.spec	26 Sep 2007 16:11:16 -0000	1.3346
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 7
+%define stable_update 8
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1093,14 +1093,14 @@
 
 %endif
 
+# -stable RC
+# ApplyPatch patch-2.6.22.9-rc1.patch
+
 # 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
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
-# -stable RC
-# ApplyPatch patch-2.6.22.6-rc1.patch
-
 %if !%{nopatches}
 
 # Revert -stable pieces we get from elsewhere
@@ -2348,6 +2348,9 @@
 %endif
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.8
+
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- sources	21 Sep 2007 23:16:31 -0000	1.596
+++ sources	26 Sep 2007 16:11:16 -0000	1.597
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-11d56c9918810694f32a172ba4788a83  patch-2.6.22.7.bz2
+957192637e6830ba43bad2d9f9ba8324  patch-2.6.22.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- upstream	21 Sep 2007 23:16:31 -0000	1.520
+++ upstream	26 Sep 2007 16:11:16 -0000	1.521
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.7.bz2
+patch-2.6.22.8.bz2


--- patch-2.6.22.7.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:36 -0700
Subject: [pkgdb] php-channel-phpdb was added for akahl
Message-ID: <200709261636.l8QGafm0018247@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-channel-phpdb with summary Adds phpdb channel to PEAR
Kevin Fenzi (kevin) has approved Package php-channel-phpdb
Kevin Fenzi (kevin) has added a Fedora devel branch for php-channel-phpdb with an owner of akahl
Kevin Fenzi (kevin) has approved php-channel-phpdb in Fedora devel
Kevin Fenzi (kevin) has approved Package php-channel-phpdb
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phpdb (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phpdb (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phpdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:47 -0700
Subject: [pkgdb] php-channel-phpdb (Fedora, devel) updated by kevin
Message-ID: <200709261636.l8QGaq63018272@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phpdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:36:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:36:47 -0700
Subject: [pkgdb] php-channel-phpdb (Fedora, 7) updated by kevin
Message-ID: <200709261636.l8QGaq66018272@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-channel-phpdb
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phpdb (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phpdb (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phpdb



From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:52 -0400
Subject: rpms/php-channel-phpdb - New directory
Message-ID: <200709261637.l8QGbqwE028641@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb

Log Message:
Directory /cvs/extras/rpms/php-channel-phpdb added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:54 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:54 -0400
Subject: rpms/php-channel-phpdb/devel - New directory
Message-ID: <200709261637.l8QGbsva028655@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb/devel

Log Message:
Directory /cvs/extras/rpms/php-channel-phpdb/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:57 -0400
Subject: rpms/php-channel-phpdb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261637.l8QGbvgO028680@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-channel-phpdb


--- NEW FILE Makefile ---
# Top level Makefile for module php-channel-phpdb
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:37:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:37:59 -0400
Subject: rpms/php-channel-phpdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709261637.l8QGbxC6028696@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst28601/rpms/php-channel-phpdb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-channel-phpdb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-channel-phpdb
# $Id: Makefile,v 1.1 2007/09/26 16:37:57 kevin Exp $
NAME := php-channel-phpdb
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:39:18 2007
From: fedora-extras-commits at redhat.com (Chris Lalancette (clalance))
Date: Wed, 26 Sep 2007 12:39:18 -0400
Subject: rpms/xen/F-7 pygrub-dont-exec.patch, NONE,
	1.1 xen-qemu-ne2000-CVE-2007-1321.patch, NONE, 1.1 xen.spec,
	1.185, 1.186
Message-ID: <200709261639.l8QGdIaQ028843@cvs-int.fedora.redhat.com>

Author: clalance

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28794

Modified Files:
	xen.spec 
Added Files:
	pygrub-dont-exec.patch xen-qemu-ne2000-CVE-2007-1321.patch 
Log Message:
- Fixes for CVE-2007-1321, CVE-2007-4993



pygrub-dont-exec.patch:

--- NEW FILE pygrub-dont-exec.patch ---
diff -up xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec xen-3.1.0-src/tools/pygrub/src/GrubConf.py
--- xen-3.1.0-src/tools/pygrub/src/GrubConf.py.noexec	2007-09-25 15:20:14.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-25 15:20:25.000000000 -0400
@@ -101,7 +101,7 @@ class GrubImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -142,11 +142,11 @@ class GrubImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "title": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "kernel": "self.kernel",
-                 "initrd": "self.initrd",
+    commands = { "title": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "kernel": "kernel",
+                 "initrd": "initrd",
                  "chainloader": None,
                  "module": None}
         
@@ -195,7 +195,7 @@ class GrubConfigFile(object):
             (com, arg) = grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:
@@ -208,7 +208,7 @@ class GrubConfigFile(object):
         (com, arg) = grub_exact_split(line, 2)
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                setattr(self, self.commands[com], arg.strip())
             else:
                 logging.info("Ignored directive %s" %(com,))
         else:
@@ -236,12 +236,12 @@ class GrubConfigFile(object):
     splash = property(get_splash, set_splash)
 
     # set up command handlers
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
-                 "fallback": "self.fallback",
-                 "hiddenmenu": "self.hiddenmenu",
-                 "splashimage": "self.splash",
-                 "password": "self.password" }
+    commands = { "default": "default",
+                 "timeout": "timeout",
+                 "fallback": "fallback",
+                 "hiddenmenu": "hiddenmenu",
+                 "splashimage": "splash",
+                 "password": "password" }
     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
               "pager", "partnew", "parttype", "rarp", "serial",
               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff -up xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec xen-3.1.0-src/tools/pygrub/src/LiloConf.py
--- xen-3.1.0-src/tools/pygrub/src/LiloConf.py.noexec	2007-09-25 15:20:18.000000000 -0400
+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-25 15:20:23.000000000 -0400
@@ -30,7 +30,7 @@ class LiloImage(object):
 
         if self.commands.has_key(com):
             if self.commands[com] is not None:
-                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
             else:
                 logging.info("Ignored image directive %s" %(com,))
         else:
@@ -56,12 +56,12 @@ class LiloImage(object):
     initrd = property(get_initrd, set_initrd)
 
     # set up command handlers
-    commands = { "label": "self.title",
-                 "root": "self.root",
-                 "rootnoverify": "self.root",
-                 "image": "self.kernel",
-                 "initrd": "self.initrd",
-                 "append": "self.args",
+    commands = { "label": "title",
+                 "root": "root",
+                 "rootnoverify": "root",
+                 "image": "kernel",
+                 "initrd": "initrd",
+                 "append": "args",
                  "read-only": None,
                  "chainloader": None,
                  "module": None}
@@ -111,7 +111,7 @@ class LiloConfigFile(object):
             (com, arg) = GrubConf.grub_exact_split(l, 2)
             if self.commands.has_key(com):
                 if self.commands[com] is not None:
-                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
+                    setattr(self, self.commands[com], arg.strip())
                 else:
                     logging.info("Ignored directive %s" %(com,))
             else:

xen-qemu-ne2000-CVE-2007-1321.patch:

--- NEW FILE xen-qemu-ne2000-CVE-2007-1321.patch ---
diff -up xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c
--- xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c.cve	2007-09-25 10:27:44.000000000 -0400
+++ xen-3.0.3_0-src/tools/ioemu/hw/ne2000.c	2007-09-25 10:27:47.000000000 -0400
@@ -252,7 +252,7 @@ static void ne2000_receive(void *opaque,
 {
     NE2000State *s = opaque;
     uint8_t *p;
-    int total_len, next, avail, len, index, mcast_idx;
+    unsigned int total_len, next, avail, len, index, mcast_idx;
     uint8_t buf1[60];
     static const uint8_t broadcast_macaddr[6] = 
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -327,7 +327,10 @@ static void ne2000_receive(void *opaque,
 
     /* write packet data */
     while (size > 0) {
-        avail = s->stop - index;
+        if (index <= s->stop)
+            avail = s->stop - index;
+        else
+            avail = 0;
         len = size;
         if (len > avail)
             len = avail;


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- xen.spec	25 Sep 2007 04:57:02 -0000	1.185
+++ xen.spec	26 Sep 2007 16:38:46 -0000	1.186
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 5%{dist}
+Release: 6%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -52,6 +52,11 @@
 Patch303: vnc-client-iterator.patch
 Patch304: vnc-double-cleanup.patch
 
+# CVE-2007-1321
+Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
+# CVE-2007-4993
+Patch601: pygrub-dont-exec.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -163,6 +168,10 @@
 %patch304 -p2
 popd
 
+# CVE patches
+%patch600 -p1
+%patch601 -p1
+
 %build
 # libvncserver first
 pushd LibVNCServer-0.8.2
@@ -280,6 +289,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-6.fc7
+- QEmu NE2000 overflow check - CVE-2007-1321
+- Pygrub guest escape - CVE-2007-4993
+
 * Mon Sep 24 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-5.fc7
 - Fix generation of manual pages (rhbz #250791)
 - Fix 32-on-64 PVFB for FC6 legacy guests



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:19 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:19 -0700
Subject: [pkgdb] php-channel-phing was added for akahl
Message-ID: <200709261639.l8QGdO5q018508@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package php-channel-phing with summary Adds phing channel to PEAR
Kevin Fenzi (kevin) has approved Package php-channel-phing
Kevin Fenzi (kevin) has added a Fedora devel branch for php-channel-phing with an owner of akahl
Kevin Fenzi (kevin) has approved php-channel-phing in Fedora devel
Kevin Fenzi (kevin) has approved Package php-channel-phing
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phing (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phing (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:28 -0700
Subject: [pkgdb] php-channel-phing (Fedora, devel) updated by kevin
Message-ID: <200709261639.l8QGdYmr018543@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phing (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:39:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:39:28 -0700
Subject: [pkgdb] php-channel-phing (Fedora, 7) updated by kevin
Message-ID: <200709261639.l8QGdYmu018543@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for php-channel-phing
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on php-channel-phing (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on php-channel-phing (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-phing



From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:08 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:08 -0400
Subject: rpms/php-channel-phing - New directory
Message-ID: <200709261640.l8QGe8gR028969@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing

Log Message:
Directory /cvs/extras/rpms/php-channel-phing added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:12 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:12 -0400
Subject: rpms/php-channel-phing/devel - New directory
Message-ID: <200709261640.l8QGeCmJ028989@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing/devel

Log Message:
Directory /cvs/extras/rpms/php-channel-phing/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:15 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:15 -0400
Subject: rpms/php-channel-phing Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261640.l8QGeFs8029014@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-channel-phing


--- NEW FILE Makefile ---
# Top level Makefile for module php-channel-phing
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:40:17 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:40:17 -0400
Subject: rpms/php-channel-phing/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200709261640.l8QGeHEC029037@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ28898/rpms/php-channel-phing/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-channel-phing


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-channel-phing
# $Id: Makefile,v 1.1 2007/09/26 16:40:15 kevin Exp $
NAME := php-channel-phing
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:41:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:49 -0700
Subject: [pkgdb] rt73usb-firmware was added for kwizart
Message-ID: <200709261641.l8QGfsGQ018795@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package rt73usb-firmware with summary Firmware for Ralink? RT2571W/RT2671 A/B/G network adaptors
Kevin Fenzi (kevin) has approved Package rt73usb-firmware
Kevin Fenzi (kevin) has added a Fedora devel branch for rt73usb-firmware with an owner of kwizart
Kevin Fenzi (kevin) has approved rt73usb-firmware in Fedora devel
Kevin Fenzi (kevin) has approved Package rt73usb-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt73usb-firmware (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt73usb-firmware (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt73usb-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:41:58 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:58 -0700
Subject: [pkgdb] rt73usb-firmware (Fedora, devel) updated by kevin
Message-ID: <200709261642.l8QGg3aE018818@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on rt73usb-firmware (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:41:58 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:41:58 -0700
Subject: [pkgdb] rt73usb-firmware (Fedora, 7) updated by kevin
Message-ID: <200709261642.l8QGg3aH018818@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for rt73usb-firmware
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rt73usb-firmware (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on rt73usb-firmware (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rt73usb-firmware



From fedora-extras-commits at redhat.com  Wed Sep 26 16:42:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:42:55 -0400
Subject: rpms/rt73usb-firmware - New directory
Message-ID: <200709261642.l8QGgtDc029218@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware

Log Message:
Directory /cvs/extras/rpms/rt73usb-firmware added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:01 -0400
Subject: rpms/rt73usb-firmware/devel - New directory
Message-ID: <200709261643.l8QGh14b029232@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware/devel

Log Message:
Directory /cvs/extras/rpms/rt73usb-firmware/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:03 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:03 -0400
Subject: rpms/rt73usb-firmware Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261643.l8QGh3Hf029257@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware

Added Files:
	Makefile import.log 
Log Message:
Setup of module rt73usb-firmware


--- NEW FILE Makefile ---
# Top level Makefile for module rt73usb-firmware
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 16:43:06 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:43:06 -0400
Subject: rpms/rt73usb-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709261643.l8QGh6Yx029273@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rt73usb-firmware/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd29182/rpms/rt73usb-firmware/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rt73usb-firmware


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rt73usb-firmware
# $Id: Makefile,v 1.1 2007/09/26 16:43:04 kevin Exp $
NAME := rt73usb-firmware
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:44:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:23 -0700
Subject: [pkgdb] cdcollect was added for sharkcz
Message-ID: <200709261644.l8QGiTUC018971@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package cdcollect with summary Simple CD/DVD catalog for GNOME
Kevin Fenzi (kevin) has approved Package cdcollect
Kevin Fenzi (kevin) has added a Fedora devel branch for cdcollect with an owner of sharkcz
Kevin Fenzi (kevin) has approved cdcollect in Fedora devel
Kevin Fenzi (kevin) has approved Package cdcollect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cdcollect (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cdcollect (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cdcollect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:32 -0700
Subject: [pkgdb] cdcollect (Fedora, devel) updated by kevin
Message-ID: <200709261644.l8QGibTN018991@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on cdcollect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 09:44:32 -0700
Subject: [pkgdb] cdcollect (Fedora, 7) updated by kevin
Message-ID: <200709261644.l8QGibTQ018991@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for cdcollect
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cdcollect (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on cdcollect (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdcollect



From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:45 -0400
Subject: rpms/cdcollect - New directory
Message-ID: <200709261644.l8QGijvi029474@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect

Log Message:
Directory /cvs/extras/rpms/cdcollect added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:50 -0400
Subject: rpms/cdcollect/devel - New directory
Message-ID: <200709261644.l8QGio0d029488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect/devel

Log Message:
Directory /cvs/extras/rpms/cdcollect/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Sep 26 16:44:59 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:59 -0400
Subject: rpms/cdcollect/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709261644.l8QGixJF029531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cdcollect


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cdcollect
# $Id: Makefile,v 1.1 2007/09/26 16:44:56 kevin Exp $
NAME := cdcollect
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 fedora-extras-commits at redhat.com  Wed Sep 26 16:44:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 26 Sep 2007 12:44:56 -0400
Subject: rpms/cdcollect Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709261644.l8QGiuWc029514@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cdcollect
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ29443/rpms/cdcollect

Added Files:
	Makefile import.log 
Log Message:
Setup of module cdcollect


--- NEW FILE Makefile ---
# Top level Makefile for module cdcollect
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Sep 26 17:03:22 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Wed, 26 Sep 2007 13:03:22 -0400
Subject: rpms/rt73usb-firmware/F-7 rt73usb-firmware.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261703.l8QH3MiB003846@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/rt73usb-firmware/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3812/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	rt73usb-firmware.spec 
Log Message:
Intial import



--- NEW FILE rt73usb-firmware.spec ---
Name:		rt73usb-firmware
Version:	1.8
Release:	4
Summary:	Firmware for Ralink?? RT2571W/RT2671 A/B/G network adaptors
Group:		System Environment/Kernel
License:	Redistributable, no modification permitted
URL:		http://www.ralinktech.com
Source0:	http://www.ralinktech.com.tw/data/RT71W_Firmware_V%{version}.zip
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Obsoletes: rt71w-firmware < %{version}-%{release}
Provides: rt71w-firmware = %{version}-%{release}


%description
This package contains the firmware required by the rt73usb driver for Linux.
Usage of the firmware is subject to the terms and conditions contained
inside the provided LICENSE.ralink-firmware.txt file.
Please read it carefully.


%prep
%setup -q -n RT71W_Firmware_V%{version}
sed -i 's/\r//' LICENSE.ralink-firmware.txt

%build
# Nothing to build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/lib/firmware
install -pm 0644 *.bin $RPM_BUILD_ROOT/lib/firmware

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.ralink-firmware.txt
/lib/firmware/*


%changelog
* Mon Sep 17 2007 kwizart < kwizart at gmail.com > - 1.8-4
- Disable dist tag
- Preserve timestamp
- Add license from Ralink
- Improved summary and description

* Mon Mar 19 2007 kwizart < kwizart at gmail.com > - 1.8-3
- Update Source url (uses .com.tw instead of .com)
- Fix License field

* Mon Feb 26 2007 kwizart < kwizat at gmail.com > - 1.8-2
- Update the download link

* Tue Sep 13 2006 kwizart < kwizart at gmail.com > - 1.8-1_FC5
- inital release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt73usb-firmware/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:43:04 -0000	1.1
+++ .cvsignore	26 Sep 2007 17:02:50 -0000	1.2
@@ -0,0 +1 @@
+RT71W_Firmware_V1.8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt73usb-firmware/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:43:04 -0000	1.1
+++ sources	26 Sep 2007 17:02:50 -0000	1.2
@@ -0,0 +1 @@
+1e7a5dc574e0268574fcda3fd5cf52f7  RT71W_Firmware_V1.8.zip



From fedora-extras-commits at redhat.com  Wed Sep 26 17:07:38 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 13:07:38 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.22,
	1.23
Message-ID: <200709261707.l8QH7cqr005784@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/fedora-release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4786

Modified Files:
	fedora-release-notes.spec 
Log Message:
fix symlinking - symlink the files, not the dirs (#306781)
set license tag



Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fedora-release-notes.spec	26 Sep 2007 02:43:01 -0000	1.22
+++ fedora-release-notes.spec	26 Sep 2007 17:07:05 -0000	1.23
@@ -1,11 +1,11 @@
 Name:		fedora-release-notes
 Version:	7.92
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
-License:	Distributable
+License:	Open Publication
 Source0:	fedora-release-notes-%{version}.tar.gz
 Source1:	homepage-%{version}.tar.gz
 Source2:	about-fedora-%{version}.tar.gz
@@ -61,7 +61,8 @@
   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 css stylesheet-images ; do
-    ln -s ../../${D} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/release-notes/${L}/
+    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 
 done
 pushd README-BURNING-ISOS-%{version}/
@@ -119,6 +120,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Bill Nottingham <notting at redhat.com> - 7.92-2
+- fix symlinking (#306781)
+- set license tag -> Open Publication
+
 * Sun Sep 16 2007 Paul W. Frields <stickster at gmail.com> - 7.92-1
 - Include new start page
 - Push new content for F8 test3



From fedora-extras-commits at redhat.com  Wed Sep 26 17:10:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 13:10:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-clean-up-oops-bug-reports.patch,
	NONE, 
	1.1 kernel.spec, 1.187, 1.188 linux-2.6-x86-debug-edd.patch, 1.2, NONE
Message-ID: <200709261710.l8QHAKuO006284@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6258

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-clean-up-oops-bug-reports.patch 
Removed Files:
	linux-2.6-x86-debug-edd.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Remove extended EDD boot debugging.
- Shorten i386 oops reports by three lines.


linux-2.6-x86-clean-up-oops-bug-reports.patch:

--- NEW FILE linux-2.6-x86-clean-up-oops-bug-reports.patch ---
i386: clean up oops/bug reports

From: Pavel Emelyanov <xemul at openvz.org>

Typically the oops first lines look like this:

BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
 printing eip:
c049dfbd
*pde = 00000000
Oops: 0002 [#1]
PREEMPT SMP
...

Such output is gained with some ugly if (!nl) printk("\n"); code and
besides being a waste of lines, this is also annoying to read. The
following output looks better (and it is how it looks on x86_64):

BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
printing eip: c049dfbd *pde = 00000000
Oops: 0002 [#1] PREEMPT SMP
...

Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Andi Kleen <ak at suse.de>

---

 arch/i386/kernel/traps.c |   16 ++++------------
 arch/i386/mm/fault.c     |   13 +++++++------
 2 files changed, 11 insertions(+), 18 deletions(-)

Index: linux/arch/i386/kernel/traps.c
===================================================================
--- linux.orig/arch/i386/kernel/traps.c
+++ linux/arch/i386/kernel/traps.c
@@ -444,31 +444,23 @@ void die(const char * str, struct pt_reg
 		local_save_flags(flags);
 
 	if (++die.lock_owner_depth < 3) {
-		int nl = 0;
 		unsigned long esp;
 		unsigned short ss;
 
 		report_bug(regs->eip, regs);
 
-		printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+		printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
-		printk(KERN_EMERG "PREEMPT ");
-		nl = 1;
+		printk("PREEMPT ");
 #endif
 #ifdef CONFIG_SMP
-		if (!nl)
-			printk(KERN_EMERG);
 		printk("SMP ");
-		nl = 1;
 #endif
 #ifdef CONFIG_DEBUG_PAGEALLOC
-		if (!nl)
-			printk(KERN_EMERG);
 		printk("DEBUG_PAGEALLOC");
-		nl = 1;
 #endif
-		if (nl)
-			printk("\n");
+		printk("\n");
+
 		if (notify_die(DIE_OOPS, str, regs, err,
 					current->thread.trap_no, SIGSEGV) !=
 				NOTIFY_STOP) {
Index: linux/arch/i386/mm/fault.c
===================================================================
--- linux.orig/arch/i386/mm/fault.c
+++ linux/arch/i386/mm/fault.c
@@ -544,23 +544,22 @@ no_context:
 			printk(KERN_ALERT "BUG: unable to handle kernel paging"
 					" request");
 		printk(" at virtual address %08lx\n",address);
-		printk(KERN_ALERT " printing eip:\n");
-		printk("%08lx\n", regs->eip);
+		printk(KERN_ALERT "printing eip: %08lx ", regs->eip);
 
 		page = read_cr3();
 		page = ((__typeof__(page) *) __va(page))[address >> PGDIR_SHIFT];
 #ifdef CONFIG_X86_PAE
-		printk(KERN_ALERT "*pdpt = %016Lx\n", page);
+		printk("*pdpt = %016Lx ", page);
 		if ((page >> PAGE_SHIFT) < max_low_pfn
 		    && page & _PAGE_PRESENT) {
 			page &= PAGE_MASK;
 			page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)
 			                                         & (PTRS_PER_PMD - 1)];
-			printk(KERN_ALERT "*pde = %016Lx\n", page);
+			printk(KERN_ALERT "*pde = %016Lx ", page);
 			page &= ~_PAGE_NX;
 		}
 #else
-		printk(KERN_ALERT "*pde = %08lx\n", page);
+		printk("*pde = %08lx ", page);
 #endif
 
 		/*
@@ -574,8 +573,10 @@ no_context:
 			page &= PAGE_MASK;
 			page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT)
 			                                         & (PTRS_PER_PTE - 1)];
-			printk(KERN_ALERT "*pte = %0*Lx\n", sizeof(page)*2, (u64)page);
+			printk("*pte = %0*Lx ", sizeof(page)*2, (u64)page);
 		}
+
+		printk("\n");
 	}
 
 	tsk->thread.cr2 = address;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- kernel.spec	25 Sep 2007 23:06:48 -0000	1.187
+++ kernel.spec	26 Sep 2007 17:09:47 -0000	1.188
@@ -580,7 +580,7 @@
 Patch42: linux-2.6-x86-tune-generic.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
-Patch76: linux-2.6-x86-debug-edd.patch
+Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -1015,7 +1015,8 @@
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # debug early boot
 ApplyPatch linux-2.6-x86-debug-boot.patch
-ApplyPatch linux-2.6-x86-debug-edd.patch
+# shorter i386 oops reports (scheduled for 2.6.24)
+ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
 
 #
 # PowerPC
@@ -1811,6 +1812,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Remove extended EDD boot debugging.
+- Shorten i386 oops reports by three lines.
+
 * Tue Sep 25 2007 Dave Jones <davej at redhat.com>
 - Disable RTC_HCTOSYS. The initscripts already do this for us.
 


--- linux-2.6-x86-debug-edd.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 17:24:55 2007
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 26 Sep 2007 13:24:55 -0400
Subject: comps comps-f7.xml.in,1.256,1.257 comps-f8.xml.in,1.127,1.128
Message-ID: <200709261724.l8QHOtgI006788@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6713

Modified Files:
	comps-f7.xml.in comps-f8.xml.in 
Log Message:
more firmware



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f7.xml.in,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- comps-f7.xml.in	19 Sep 2007 22:47:04 -0000	1.256
+++ comps-f7.xml.in	26 Sep 2007 17:24:25 -0000	1.257
@@ -1829,9 +1829,13 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
-      <packagereq type="default">iwlwifi-firmware</packagereq>
+      <packagereq type="default">iwl3945-firmware</packagereq>
+      <packagereq type="default">iwl4965-firmware</packagereq>
+      <packagereq type="default">rt61pci-firmware</packagereq>
+      <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- comps-f8.xml.in	26 Sep 2007 13:59:34 -0000	1.127
+++ comps-f8.xml.in	26 Sep 2007 17:24:25 -0000	1.128
@@ -1997,6 +1997,8 @@
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
+      <packagereq type="default">rt61pci-firmware</packagereq>
+      <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>



From fedora-extras-commits at redhat.com  Wed Sep 26 17:30:32 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 13:30:32 -0400
Subject: rpms/kde-settings/devel .cvsignore, 1.9, 1.10 kde-settings.spec,
	1.11, 1.12 sources, 1.9, 1.10
Message-ID: <200709261730.l8QHUWN9007122@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7079

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-31
- kdesktoprc: [Desktop0] Wallpaper=/usr/share/backgrounds/images/default.png
  (#290571)
- kopeterc: [ContactList] SmoothScrolling=false



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Jul 2007 21:59:45 -0000	1.9
+++ .cvsignore	26 Sep 2007 17:29:59 -0000	1.10
@@ -1,8 +1,4 @@
 etc/
 usr/
-kde-settings-3.5-25.tar.gz
-kde-settings-3.5-26.tar.gz
-kde-settings-3.5-27.tar.gz
-kde-settings-3.5-28.tar.bz2
-kde-settings-3.5-29.tar.bz2
 kde-settings-3.5-30.tar.bz2
+kde-settings-3.5-31.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kde-settings.spec	24 Jul 2007 21:59:45 -0000	1.11
+++ kde-settings.spec	26 Sep 2007 17:29:59 -0000	1.12
@@ -1,5 +1,5 @@
 
-%define rel 30
+%define rel 31
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Requires: kdelibs >= %{version}
+Requires: kdelibs3
 Requires: xdg-user-dirs
 
 Obsoletes: kde-config < %{version}-%{release}
@@ -102,6 +102,11 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-31
+- kdesktoprc: [Desktop0] Wallpaper=/usr/share/backgrounds/images/default.png
+  (#290571)
+- kopeterc: [ContactList] SmoothScrolling=false
+
 * Mon Jul 02 2007 Than Ngo <than at redhat.com> -  3.5-30
 - fix bz#245100
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Jul 2007 21:59:45 -0000	1.9
+++ sources	26 Sep 2007 17:29:59 -0000	1.10
@@ -1 +1 @@
-3591c492cebe4654f74cfb3b32b499e3  kde-settings-3.5-30.tar.bz2
+007b2d8ca128a5db76aa72257265c0ed  kde-settings-3.5-31.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 17:36:09 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 13:36:09 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.4,
	1.5 kernel-xen.spec, 1.48, 1.49
Message-ID: <200709261736.l8QHa90f007374@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7334

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-xen.spec 
Log Message:
Disabled Firewire stack on i686 also.

It is not supported by current Xen swiotlb implementation (bug #302471)



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.20-i686-xen.config	12 Sep 2007 20:39:00 -0000	1.4
+++ kernel-2.6.20-i686-xen.config	26 Sep 2007 17:35:35 -0000	1.5
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kernel-xen.spec	21 Sep 2007 15:13:42 -0000	1.48
+++ kernel-xen.spec	26 Sep 2007 17:35:35 -0000	1.49
@@ -2072,6 +2072,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disabled Firewire stack on i686 also. It is not supported
+  by current Xen swiotlb implementation (bug #302471)
+
 * Fri Sep 21 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add fix for bug #294011 (floating point corruption)
   (changeset 8c24767501ff from Xen 3.1.1)



From fedora-extras-commits at redhat.com  Wed Sep 26 17:42:55 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 13:42:55 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.16,1.17
Message-ID: <200709261742.l8QHgtkY007696@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/notification-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7631

Modified Files:
	notification-daemon.spec 
Log Message:
Fix the build



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- notification-daemon.spec	8 Aug 2007 04:22:15 -0000	1.16
+++ notification-daemon.spec	26 Sep 2007 17:42:21 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPLv2+
 Group: System Environment/Libraries
@@ -47,6 +47,7 @@
 %build
 autoreconf
 automake
+intltoolize --force
 %configure --disable-static 
 make
 
@@ -94,6 +95,9 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-6
+- Make it build with the latest intltool
+
 * Wed Aug  8 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.7-5
 - Update the license field
 



From fedora-extras-commits at redhat.com  Wed Sep 26 17:43:47 2007
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Wed, 26 Sep 2007 13:43:47 -0400
Subject: rpms/kernel/devel config-generic,1.29,1.30 kernel.spec,1.188,1.189
Message-ID: <200709261743.l8QHhlq5007731@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7704

Modified Files:
	config-generic kernel.spec 
Log Message:
* Wed Sep 26 2007 Dave Jones <davej at redhat.com>
- Switch back to ye olde RTC driver. At least it worked.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-generic	25 Sep 2007 23:06:48 -0000	1.29
+++ config-generic	26 Sep 2007 17:43:15 -0000	1.30
@@ -1867,10 +1867,10 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
+CONFIG_RTC=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
-CONFIG_RTC_CLASS=y
+# CONFIG_RTC_CLASS is not set
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kernel.spec	26 Sep 2007 17:09:47 -0000	1.188
+++ kernel.spec	26 Sep 2007 17:43:15 -0000	1.189
@@ -1812,6 +1812,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dave Jones <davej at redhat.com>
+- Switch back to ye olde RTC driver. At least it worked.
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Remove extended EDD boot debugging.
 - Shorten i386 oops reports by three lines.



From fedora-extras-commits at redhat.com  Wed Sep 26 17:50:14 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Wed, 26 Sep 2007 13:50:14 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.59,1.60
Message-ID: <200709261750.l8QHoEgx008788@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-pilot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8739

Modified Files:
	gnome-pilot.spec 
Log Message:
fix the build



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-pilot.spec	24 Apr 2007 14:11:11 -0000	1.59
+++ gnome-pilot.spec	26 Sep 2007 17:49:40 -0000	1.60
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -73,6 +73,7 @@
 
 %build
 autoreconf --force
+intltoolize --force
 %configure --disable-static
 cp %{_bindir}/libtool .
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
@@ -155,6 +156,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-9
+- Fix the build with new intltool
+
 * Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-8.fc7
 - One more revision of the patch to close RH bug #198211.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 17:50:38 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 26 Sep 2007 13:50:38 -0400
Subject: rpms/libsilc/devel libsilc-filter-provides.sh, NONE,
	1.1 libsilc.spec, 1.14, 1.15
Message-ID: <200709261750.l8QHocq7008793@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8765

Modified Files:
	libsilc.spec 
Added Files:
	libsilc-filter-provides.sh 
Log Message:
- filter out libsilc module SONAME Provides (#245323)
- add a check section with a test that fails when the modules move



--- NEW FILE libsilc-filter-provides.sh ---
#!/bin/sh

if [ -x /usr/lib/rpm/redhat/find-provides ] ; then
   FINDPROV=/usr/lib/rpm/redhat/find-provides
else
   FINDPROV=/usr/lib/rpm/find-provides
fi

sed '\,/silc/modules/,d' | $FINDPROV "$@"


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsilc.spec	21 Aug 2007 14:45:40 -0000	1.14
+++ libsilc.spec	26 Sep 2007 17:50:06 -0000	1.15
@@ -1,11 +1,14 @@
 Summary: SILC Client Library
 Name: libsilc
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
 Source0: silc-toolkit-%{version}.tar.bz2
+Source1: libsilc-filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE1}
 Patch0: silc-toolkit-1.0.2-libs.patch
 Patch1: silc-toolkit-1.0.2-wordsize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -55,6 +58,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
+%check
+# If this fails, the filter-provides script needs an update.
+[ -d $RPM_BUILD_ROOT%{_libdir}/silc/modules ]
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -86,6 +93,10 @@
 %{_includedir}/silc/*.h
 
 %changelog
+* Mon Sep 24 2007 Michael Schwendt <mschwendt at users.sf.net> 1.0.2-4
+- filter out libsilc module SONAME Provides (#245323)
+- add a check section with a test that fails when the modules move
+
 * Tue Aug 21 2007 Warren Togami <wtogami at redhat.com> 1.0.2-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:14:45 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Wed, 26 Sep 2007 14:14:45 -0400
Subject: rpms/libsilc/devel libsilc.spec,1.15,1.16
Message-ID: <200709261814.l8QIEje7016006@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15986

Modified Files:
	libsilc.spec 
Log Message:
Ensure that libsilc-filter-provides.sh is executable



Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libsilc.spec	26 Sep 2007 17:50:06 -0000	1.15
+++ libsilc.spec	26 Sep 2007 18:14:13 -0000	1.16
@@ -58,6 +58,9 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsilcclient.la
 
+# Ensure that libsilc-filter-provides.sh is executable
+chmod 755 %{SOURCE1}
+
 %check
 # If this fails, the filter-provides script needs an update.
 [ -d $RPM_BUILD_ROOT%{_libdir}/silc/modules ]



From fedora-extras-commits at redhat.com  Wed Sep 26 18:15:21 2007
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 26 Sep 2007 14:15:21 -0400
Subject: rpms/blender/F-7 blender.spec,1.60,1.61
Message-ID: <200709261815.l8QIFL8H016075@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16010

Modified Files:
	blender.spec 
Log Message:
Remove broken python-abi dep


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- blender.spec	23 Sep 2007 20:12:41 -0000	1.60
+++ blender.spec	26 Sep 2007 18:14:48 -0000	1.61
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -52,8 +52,6 @@
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 
-Requires: python-abi = %{pyver}
-
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -172,6 +170,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Sep 26 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2.1
+- Remove broken python-abi dep
+
 * Sun Sep 23 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-2
 - Change method how to determinate python version
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:52:44 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 14:52:44 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.3,
	1.4 kernel-xen.spec, 1.58, 1.59
Message-ID: <200709261852.l8QIqiQx019400@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19337

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-xen.spec 
Log Message:
Disable Firewire on i686

It is not supported by the current Xen swiotlb implementation (bug
#307461)



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel-2.6.21-i686-xen.config	12 Sep 2007 20:21:05 -0000	1.3
+++ kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
@@ -1315,9 +1315,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kernel-xen.spec	20 Sep 2007 21:38:43 -0000	1.58
+++ kernel-xen.spec	26 Sep 2007 18:52:12 -0000	1.59
@@ -2381,6 +2381,10 @@
 #  - tux.
 
 %changelog
+* Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Disable Firewire on i686. It is not supported by the current
+  Xen swiotlb implementation (bug #307461)
+
 * Thu Sep 20 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Fix sleazy-fpu implementation to actually avoid on fpu-intensive
   programs



From fedora-extras-commits at redhat.com  Wed Sep 26 18:53:08 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 14:53:08 -0400
Subject: devel/yum .cvsignore, 1.60, 1.61 sources, 1.63, 1.64 yum.spec, 1.179,
	1.180
Message-ID: <200709261853.l8QIr8f7019414@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19375

Modified Files:
	.cvsignore sources yum.spec 
Log Message:
* Wed Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-4
- pull in fixes from upstream for media handling, pkgid (#291471), and 
  a potential depsolving bug



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/yum/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	10 Sep 2007 16:07:13 -0000	1.60
+++ .cvsignore	26 Sep 2007 18:52:35 -0000	1.61
@@ -1,3 +1 @@
-yum-3.2.3.tar.gz
-yum-3.2.4.tar.gz
 yum-3.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	10 Sep 2007 16:07:14 -0000	1.63
+++ sources	26 Sep 2007 18:52:35 -0000	1.64
@@ -1,2 +1 @@
-f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
 f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- yum.spec	17 Sep 2007 14:51:39 -0000	1.179
+++ yum.spec	26 Sep 2007 18:52:35 -0000	1.180
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch1: yum-showasdep.patch
 Patch2: yum-trans-display-object.patch
 Patch3: yum-3.2.5-close.patch
+Patch4: yum-misc-fixes.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -52,6 +53,7 @@
 %patch1 -p1 -b .showdep
 %patch2 -p1 -b .transdisp
 %patch3 -p1 -b .close
+%patch4 -p1 
 
 %build
 make
@@ -97,6 +99,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 25 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-4
+- pull in fixes from upstream for media handling, pkgid (#291471), and 
+  a potential depsolving bug
+
 * Mon Sep 17 2007 Jeremy Katz <katzj at redhat.com> - 3.2.5-3
 - fix traceback with closing repos 
 



From fedora-extras-commits at redhat.com  Wed Sep 26 18:54:39 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 26 Sep 2007 14:54:39 -0400
Subject: devel/yum yum-misc-fixes.patch,1.9,1.10
Message-ID: <200709261854.l8QIsdfm019532@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19508

Added Files:
	yum-misc-fixes.patch 
Log Message:
add the patch

yum-misc-fixes.patch:

Index: yum-misc-fixes.patch
===================================================================
RCS file: yum-misc-fixes.patch
diff -N yum-misc-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ yum-misc-fixes.patch	26 Sep 2007 18:54:34 -0000	1.10
@@ -0,0 +1,152 @@
+diff --git a/cli.py b/cli.py
+index 1fc0594..07a93c5 100644
+--- a/cli.py
++++ b/cli.py
+@@ -467,7 +467,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+                     my_inst_pkgs = []
+ 
+                 if my_inst_pkgs:
+-                    self.verbose_logger.log(yum.logginglevels.DEBUG_3,
++                    self.verbose_logger.log(yum.logginglevels.INFO_2,
+                         'Requested dep: %s is provided by installed package', str(arg))
+                     
+                     continue # we don't need to look, we have it
+@@ -490,6 +490,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+                         
+             installable = yum.misc.unique(exactmatch + matched)
+             exactarchlist = self.conf.exactarchlist
++
++            if len(installable) == 0:
++                self.verbose_logger.log(yum.logginglevels.INFO_2,
++                                        'No package %s available.', arg)
+             
+             # we look through each returned possibility and rule out the
+             # ones that we obviously can't use
+diff --git a/output.py b/output.py
+index 0f5eb5a..8aff587 100644
+--- a/output.py
++++ b/output.py
+@@ -21,6 +21,8 @@ import sys
+ import time
+ import logging
+ import types
++import gettext
++import rpm
+ from i18n import _
+ 
+ from urlgrabber.progress import TextMeter
+@@ -42,6 +44,10 @@ class YumOutput:
+     def __init__(self):
+         self.logger = logging.getLogger("yum.cli")
+         self.verbose_logger = logging.getLogger("yum.verbose.cli")
++        if hasattr(rpm, "expandMacro"):
++            self.i18ndomains = rpm.expandMacro("%_i18ndomains").split(":")
++        else:
++            self.i18ndomains = ["redhat-dist"]
+     
+     def printtime(self):
+         months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+@@ -71,11 +77,16 @@ class YumOutput:
+         
+     def infoOutput(self, pkg):
+         def enc(s):
+-            # this sucks.  what we get back from the rpmdb
+-            # are strings, but they may actually have unicode so we
+-            # can't encode them
++            """Get the translated version from specspo and ensure that
++            it's actually encoded in UTF-8."""
+             if type(s) == unicode:
+-                return s.encode("UTF-8")
++                s = s.encode("UTF-8")
++            if len(s) > 0:
++                for d in self.i18ndomains:
++                    t = gettext.dgettext(d, s)
++                    if t != s:
++                        s = t
++                        break
+             return s
+         print _("Name   : %s") % pkg.name
+         print _("Arch   : %s") % pkg.arch
+@@ -495,7 +506,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
+                 self.lastmsg = msg
+             if te_current == te_total:
+                 print " "
+-        
++
+     def _makefmt(self, percent, ts_current, ts_total, progress = True):
+         l = len(str(ts_total))
+         size = "%s.%s" % (l, l)
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 39121e2..ee31ae1 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -365,7 +365,7 @@ class YumBase(depsolve.Depsolve):
+             return self._pkgSack
+         
+         if thisrepo is None:
+-            repos = self.repos.listEnabled()
++            repos = 'enabled'
+         else:
+             repos = self.repos.findRepos(thisrepo)
+         
+@@ -385,7 +385,8 @@ class YumBase(depsolve.Depsolve):
+         self.excludePackages()
+         self._pkgSack.excludeArchs(archlist)
+         
+-        #FIXME - this could be faster, too.
++        if repos == 'enabled':
++            repos = self.repos.listEnabled()
+         for repo in repos:
+             self.excludePackages(repo)
+             self.includePackages(repo)
+diff --git a/yum/depsolve.py b/yum/depsolve.py
+index 4075116..08693eb 100644
+--- a/yum/depsolve.py
++++ b/yum/depsolve.py
+@@ -707,7 +707,7 @@ class Depsolve(object):
+             while CheckDeps:
+                 self.cheaterlookup = {}
+                 if self.dsCallback: self.dsCallback.tscheck()
+-                CheckDeps, checkremoves, checkinstalls, missing = self._resolveRequires(errors)
++                CheckDeps, checkinstalls, checkremoves, missing = self._resolveRequires(errors)
+                 CheckInstalls |= checkinstalls
+                 CheckRemoves |= checkremoves
+ 
+diff --git a/yum/packages.py b/yum/packages.py
+index d11816e..5be3722 100644
+--- a/yum/packages.py
++++ b/yum/packages.py
+@@ -628,7 +628,7 @@ class YumHeaderPackage(YumAvailablePackage):
+         self.description = self.hdr['description']
+         self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER]
+         if not self.pkgid:
+-            self.pkgid = self.hdr[rpm.RPMTAG_SIGMD5]
++            self.pkgid = "%s.%s" %(self.hdr['name'], self.hdr['buildtime'])
+         self.packagesize = self.hdr['size']
+         self.__mode_cache = {}
+         self.__prcoPopulated = False
+diff --git a/yum/yumRepo.py b/yum/yumRepo.py
+index 48ec521..8b8793f 100644
+--- a/yum/yumRepo.py
++++ b/yum/yumRepo.py
+@@ -665,6 +665,9 @@ class YumRepository(Repository, config.RepoConf):
+            file. If any of them are newer then invalidate the cache
+            """
+ 
++        # -1 is special and should never get refreshed
++        if expiration_time == -1 and os.path.exists(myfile):
++            return True
+         val = False
+         if os.path.exists(myfile):
+             cookie_info = os.stat(myfile)
+@@ -701,7 +704,9 @@ class YumRepository(Repository, config.RepoConf):
+             self.dirSetup()
+         except Errors.RepoError, e:
+             raise
+-
++        if not self.mediafunc and self.mediaid and not self.mirrorlist and not self.baseurl:
++            verbose_logger.log(logginglevels.DEBUG_2, "Disabling media repo for non-media-aware frontend")
++            self.enabled = False
+ 
+     def _loadRepoXML(self, text=None):
+         """retrieve/check/read in repomd.xml from the repository"""



From fedora-extras-commits at redhat.com  Wed Sep 26 18:59:08 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 14:59:08 -0400
Subject: rpms/kernel/F-7 patch-2.6.22.9.bz2.sign, NONE, 1.1 .cvsignore, 1.634,
	1.635 kernel-2.6.spec, 1.3346,
	1.3347 linux-2.6-build-nonintconfig.patch, 1.7,
	1.8 linux-2.6-utrace-tracehook.patch, 1.3,
	1.4 linux-2.6-wireless.patch, 1.10, 1.11 sources, 1.597,
	1.598 upstream, 1.521, 1.522 linux-2.6-futex-fix-traversal.patch,
	1.1, NONE linux-2.6-netdev-forcedeth-realtek-oui.patch, 1.1,
	NONE linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch, 1.1,
	NONE linux-2.6-skb_copy_and_csum_datagram_iovec.patch, 1.1,
	NONE linux-2.6-usb-linked-list-insertion.patch, 1.1,
	NONE linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch, 1.1,
	NONE patch-2.6.22.8.bz2.sign, 1.1, NONE
Message-ID: <200709261859.l8QIx8VH019671@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
	linux-2.6-utrace-tracehook.patch linux-2.6-wireless.patch 
	sources upstream 
Added Files:
	patch-2.6.22.9.bz2.sign 
Removed Files:
	linux-2.6-futex-fix-traversal.patch 
	linux-2.6-netdev-forcedeth-realtek-oui.patch 
	linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch 
	linux-2.6-skb_copy_and_csum_datagram_iovec.patch 
	linux-2.6-usb-linked-list-insertion.patch 
	linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch 
	patch-2.6.22.8.bz2.sign 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.22.9



--- NEW FILE patch-2.6.22.9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+qIQyGugalF9Dw4RAjugAJ9oe3fhxNgJS23LCxKMdgHrqBZUjwCgkVe1
5NysGkmoYh5Q5buNL99NXck=
=ysvo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- .cvsignore	26 Sep 2007 16:11:16 -0000	1.634
+++ .cvsignore	26 Sep 2007 18:58:34 -0000	1.635
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.8.bz2
+patch-2.6.22.9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3346
retrieving revision 1.3347
diff -u -r1.3346 -r1.3347
--- kernel-2.6.spec	26 Sep 2007 16:11:16 -0000	1.3346
+++ kernel-2.6.spec	26 Sep 2007 18:58:34 -0000	1.3347
@@ -30,7 +30,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.x.y update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -569,7 +569,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-aacraid-ioctl-security.patch
 Patch402: linux-2.6-scsi-async-scanning.patch
-Patch403: linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
 Patch404: linux-2.6-scsi-mpt-vmware-fix.patch
 
 Patch420: linux-2.6-squashfs.patch
@@ -577,7 +576,6 @@
 Patch423: linux-2.6-gfs-locking-exports.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch435: linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -616,7 +614,6 @@
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
-Patch711: linux-2.6-netdev-forcedeth-realtek-oui.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 Patch715: linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
@@ -625,14 +622,11 @@
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
-Patch760: linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
-Patch771: linux-2.6-futex-fix-traversal.patch
 
 Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
 Patch781: linux-2.6-usb-allow-1-byte-replies.patch
 Patch782: linux-2.6-usb-fixup-interval-lengths.patch
-Patch783: linux-2.6-usb-linked-list-insertion.patch
 
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
@@ -1254,8 +1248,6 @@
 ApplyPatch linux-2.6-aacraid-ioctl-security.patch
 # fix locking problems w/ async scsi scan
 ApplyPatch linux-2.6-scsi-async-scanning.patch
-# fix 3ware 9000 DMA fallback
-ApplyPatch linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch
 # fix vmware's broken emulation of SCSI controller
 ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
@@ -1270,8 +1262,6 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# fix oops when skb has zero length
-ApplyPatch linux-2.6-skb_copy_and_csum_datagram_iovec.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1353,8 +1343,6 @@
 
 # add patch from markmc so that e1000 supports ICH9
 ApplyPatch linux-2.6-e1000-ich9.patch
-# fix wrong oui in forcedeth
-ApplyPatch linux-2.6-netdev-forcedeth-realtek-oui.patch
 
 # atl1 DMA bugs
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
@@ -1377,12 +1365,8 @@
 ApplyPatch linux-2.6-sdhci-fix-interrupt-mask.patch
 # fix the interrupt mask fix
 ApplyPatch linux-2.6-sdhci-clear-error-interrupt.patch
-# v4l/dvb: fix airstar hd5000 tuner
-ApplyPatch linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
-# futex: fix compat list traveral
-ApplyPatch linux-2.6-futex-fix-traversal.patch
 
 # USB
 #
@@ -1391,8 +1375,6 @@
 # trivial USB fixes
 ApplyPatch linux-2.6-usb-allow-1-byte-replies.patch
 ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
-ApplyPatch linux-2.6-usb-linked-list-insertion.patch
-
 
 # ACPI patches
 
@@ -2349,6 +2331,9 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.22.9
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.8
 
 * Fri Sep 21 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-build-nonintconfig.patch	10 Jul 2007 16:14:59 -0000	1.7
+++ linux-2.6-build-nonintconfig.patch	26 Sep 2007 18:58:34 -0000	1.8
@@ -32,10 +32,10 @@
  static void strip(char *str)
  {
  	char *p = str;
-@@ -103,6 +107,14 @@ static void conf_askvalue(struct symbol 
+@@ -103,6 +107,16 @@ static void conf_askvalue(struct symbol 
  		fflush(stdout);
  		fgets(line, 128, stdin);
- 		return;
+ 		return 1;
 +	case dont_ask:
 +		if (!sym_has_value(sym)) {
 +			fprintf(stderr,"CONFIG_%s\n",sym->name);
@@ -43,10 +43,12 @@
 +		}
 +		/*FALLTHROUGH*/
 +	case dont_ask_dont_tell:
-+		return;
++		if (sym_has_value(sym))
++			return 0;
++		return 1;
  	case set_default:
  		printf("%s\n", def);
- 		return;
+ 		return 1;
 @@ -346,6 +358,11 @@ static int conf_choice(struct menu *menu
  			printf("?");
  		printf("]: ");

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook.patch	20 Jul 2007 18:48:03 -0000	1.3
+++ linux-2.6-utrace-tracehook.patch	26 Sep 2007 18:58:34 -0000	1.4
@@ -3157,8 +3157,8 @@
  	if (!thread_group_leader(p))
  		goto out;
  
--	if (p->real_parent == group_leader) {
-+	if (p->parent == group_leader) {
+-	if (p->real_parent->tgid == group_leader->tgid) {
++	if (p->parent->tgid == group_leader->tgid) {
  		err = -EPERM;
  		if (task_session(p) != task_session(group_leader))
  			goto out;

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-wireless.patch	18 Sep 2007 15:08:25 -0000	1.10
+++ linux-2.6-wireless.patch	26 Sep 2007 18:58:34 -0000	1.11
@@ -4725,108 +4725,6 @@
  		wl3501_receive(this, skb->data, pkt_len);
  		skb_put(skb, pkt_len);
  		skb->protocol	= eth_type_trans(skb, dev);
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-09-18 10:25:25.000000000 -0400
-@@ -3183,6 +3183,9 @@ static void bcm43xx_periodic_work_handle
- 	unsigned long orig_trans_start = 0;
- 
- 	mutex_lock(&bcm->mutex);
-+	/* keep from doing and rearming periodic work if shutting down */
-+	if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
-+		goto unlock_mutex;
- 	if (unlikely(bcm->periodic_state % 60 == 0)) {
- 		/* Periodic work will take a long time, so we want it to
- 		 * be preemtible.
-@@ -3228,14 +3231,10 @@ static void bcm43xx_periodic_work_handle
- 	mmiowb();
- 	bcm->periodic_state++;
- 	spin_unlock_irqrestore(&bcm->irq_lock, flags);
-+unlock_mutex:
- 	mutex_unlock(&bcm->mutex);
- }
- 
--void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
--{
--	cancel_rearming_delayed_work(&bcm->periodic_work);
--}
--
- void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
- {
- 	struct delayed_work *work = &bcm->periodic_work;
-@@ -3285,6 +3284,14 @@ static int bcm43xx_rng_init(struct bcm43
- 	return err;
- }
- 
-+void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
-+{
-+	/* The system must be unlocked when this routine is entered.
-+	 * If not, the next 2 steps may deadlock */
-+	cancel_work_sync(&bcm->restart_work);
-+	cancel_rearming_delayed_work(&bcm->periodic_work);
-+}
-+
- static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
- {
- 	int ret = 0;
-@@ -3321,7 +3328,12 @@ static void bcm43xx_free_board(struct bc
- {
- 	bcm43xx_rng_exit(bcm);
- 	bcm43xx_sysfs_unregister(bcm);
--	bcm43xx_periodic_tasks_delete(bcm);
-+
-+	mutex_lock(&(bcm)->mutex);
-+	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
-+	mutex_unlock(&(bcm)->mutex);
-+
-+	bcm43xx_cancel_work(bcm);
- 
- 	mutex_lock(&(bcm)->mutex);
- 	bcm43xx_shutdown_all_wireless_cores(bcm);
-@@ -4018,7 +4030,7 @@ static int bcm43xx_net_stop(struct net_d
- 	err = bcm43xx_disable_interrupts_sync(bcm);
- 	assert(!err);
- 	bcm43xx_free_board(bcm);
--	flush_scheduled_work();
-+	bcm43xx_cancel_work(bcm);
- 
- 	return 0;
- }
-@@ -4150,9 +4162,9 @@ static void bcm43xx_chip_reset(struct wo
- 	struct bcm43xx_phyinfo *phy;
- 	int err = -ENODEV;
- 
-+	bcm43xx_cancel_work(bcm);
- 	mutex_lock(&(bcm)->mutex);
- 	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
--		bcm43xx_periodic_tasks_delete(bcm);
- 		phy = bcm43xx_current_phy(bcm);
- 		err = bcm43xx_select_wireless_core(bcm, phy->type);
- 		if (!err)
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c	2007-09-18 10:11:13.000000000 -0400
-@@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_stor
- 		goto out;
- 	}
- 
--	bcm43xx_periodic_tasks_delete(bcm);
-+	bcm43xx_cancel_work(bcm);
- 	mutex_lock(&(bcm)->mutex);
- 	err = bcm43xx_select_wireless_core(bcm, phytype);
- 	if (!err)
-diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.h	2007-09-18 10:11:13.000000000 -0400
-@@ -122,7 +122,7 @@ void bcm43xx_wireless_core_reset(struct 
- void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
- void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
- 
--void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm);
-+void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
- void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
- 
- void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
 +++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- sources	26 Sep 2007 16:11:16 -0000	1.597
+++ sources	26 Sep 2007 18:58:34 -0000	1.598
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-957192637e6830ba43bad2d9f9ba8324  patch-2.6.22.8.bz2
+6e2e5112d69af5c8d78cff0479c700cd  patch-2.6.22.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- upstream	26 Sep 2007 16:11:16 -0000	1.521
+++ upstream	26 Sep 2007 18:58:34 -0000	1.522
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.8.bz2
+patch-2.6.22.9.bz2


--- linux-2.6-futex-fix-traversal.patch DELETED ---


--- linux-2.6-netdev-forcedeth-realtek-oui.patch DELETED ---


--- linux-2.6-scsi-3w_9xxx-fix-dma-mask.patch DELETED ---


--- linux-2.6-skb_copy_and_csum_datagram_iovec.patch DELETED ---


--- linux-2.6-usb-linked-list-insertion.patch DELETED ---


--- linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch DELETED ---


--- patch-2.6.22.8.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 19:09:34 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:09:34 -0400
Subject: rpms/cdcollect/devel cdcollect-0.6.0.patch, NONE,
	1.1 cdcollect-libdir.patch, NONE, 1.1 cdcollect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261909.l8QJ9YtL026156@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26086

Modified Files:
	.cvsignore sources 
Added Files:
	cdcollect-0.6.0.patch cdcollect-libdir.patch cdcollect.spec 
Log Message:
 - initial import

cdcollect-0.6.0.patch:

--- NEW FILE cdcollect-0.6.0.patch ---
diff -Nru cdcollect-0.6.0-orig/resources/glade/gui.glade cdcollect-0.6.0/resources/glade/gui.glade
--- cdcollect-0.6.0-orig/resources/glade/gui.glade	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/resources/glade/gui.glade	2007-07-16 21:30:02.000000000 +0200
@@ -1143,7 +1143,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label10">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mount Point:</property>
+	      <property name="label" translatable="yes">Device:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1169,7 +1169,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="entry_mount">
+	    <widget class="GtkEntry" id="entry_device">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Mount directory for CDs (CD must already be mounted)</property>
 	      <property name="can_focus">True</property>
diff -Nru cdcollect-0.6.0-orig/src/Conf.cs cdcollect-0.6.0/src/Conf.cs
--- cdcollect-0.6.0-orig/src/Conf.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Conf.cs	2007-07-16 21:48:45.000000000 +0200
@@ -35,7 +35,6 @@
 
 	
 	public string default_cd_device;
-	public string default_cd_mount;
 		
 	public Conf ()
 	{
@@ -61,9 +60,6 @@
 		/* Get the CD device */
 		default_cd_device = "/dev/hdc";
 
-		/* Get the mount point for */
-		default_cd_mount = "/media/cdrom";
-		
 		/* create home dirs if they not exists */
 		create_home_dirs ();
 	}
diff -Nru cdcollect-0.6.0-orig/src/ImportCDWindow.cs cdcollect-0.6.0/src/ImportCDWindow.cs
--- cdcollect-0.6.0-orig/src/ImportCDWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/ImportCDWindow.cs	2007-07-16 22:45:47.000000000 +0200
@@ -50,6 +50,7 @@
 	// Private variables
 	private static Glade.XML gxml;
 	private string mount;
+	private string device;
 	
 	private bool use_infoplugins, use_compplugins, compplugins_recursive, use_thumbs;
 	private int key = -10;
@@ -67,7 +68,7 @@
 	
     
     // Methods        
-	public ImportCDWindow (string mount_point, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public ImportCDWindow (string default_device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		/* Show Main Dialog using glade */
  		gxml = new Glade.XML (null, "gui.glade", "win_importcd", null);
@@ -80,7 +81,8 @@
 		/* Prepare gui */
 		prepare_gui ();		
 		
-		mount = mount_point;
+		device = default_device;
+		mount = get_mount();
 		use_infoplugins = info;
 		use_compplugins = comp;
 		compplugins_recursive = recursive;
@@ -330,10 +332,10 @@
 	
 		/* Open the device */
 		try {
-			fdev = new FileStream (CDCollect.conf.default_cd_device, 
+			fdev = new FileStream (device, 
 				System.IO.FileMode.Open, System.IO.FileAccess.Read);
 		} catch {
-			Console.WriteLine ("Can not open device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not open device " + device);
 			return("Unknown");
 		}	
 		
@@ -343,7 +345,7 @@
 			fdev.Seek (32808, SeekOrigin.Begin);
 			r = fdev.Read (buf, 0, 32);
 		} catch (System.Exception e) {
-			Console.WriteLine ("Can not read device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not read device " + device);
 			return ("Unknown");
 		}
 		
@@ -373,6 +375,33 @@
 		}
 		
 	}
+	
+	private string get_mount ()
+	{
+		TextReader f;
+		string line;
+		string mount = "none";
+		string [] fields;
+	
+		/* Open the /etc/mtab */
+		try {
+			f = new StreamReader("/etc/mtab"); 
+		} catch {
+			Console.WriteLine ("Can not open /etc/mtab");
+			return(mount);
+		}	
 		
+		/* Read all line, check whether it contains our device and filesystem type is iso9660 */
+		while ((line = f.ReadLine()) != null) {
+			fields = line.Split(' ');
+			if ((fields[0] == device) && (fields[2] == "iso9660")) {
+				mount = fields[1];
+			}
+		}
+		
+		f.Close();
+
+		return (mount);
+	}	
 }
 
diff -Nru cdcollect-0.6.0-orig/src/Main.cs cdcollect-0.6.0/src/Main.cs
--- cdcollect-0.6.0-orig/src/Main.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Main.cs	2007-07-16 21:48:14.000000000 +0200
@@ -572,7 +572,7 @@
 	{
 		/* Create import window */
 		ImportCDWindow win_importcd = new ImportCDWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
@@ -591,8 +591,8 @@
 		/* Check if CD has been read */
 		if (key==-1) {
 			new ErrorDialog (String.Format (Catalog.GetString (
-				"Directory <b>{0}</b> not found.\nPlease change the CD mount point in the Preferences window."), 
-				(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount)), win_main);
+				"Directory <b>{0}</b> not found.\nPlease change the CD device in the Preferences window."), 
+				(string) conf.getkey ("prefs/device",conf.default_cd_device)), win_main);
 		} else if (key==-2) {
 			new ErrorDialog (Catalog.GetString ("The mount directory is empty. Please make sure the CD is mounted."), win_main);	
 		} else if (key==-3) {
@@ -637,7 +637,7 @@
 	{
 		/* Create Preferences window */
 		new PreferencesWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
diff -Nru cdcollect-0.6.0-orig/src/PreferencesWindow.cs cdcollect-0.6.0/src/PreferencesWindow.cs
--- cdcollect-0.6.0-orig/src/PreferencesWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/PreferencesWindow.cs	2007-07-16 21:45:51.000000000 +0200
@@ -37,7 +37,7 @@
 	[Glade.Widget] public Gtk.Window win_prefs;
 	[Glade.Widget] public Gtk.Button btn_ok;
 	[Glade.Widget] public Gtk.Button btn_cancel;
-	[Glade.Widget] public Gtk.Entry  entry_mount;
+	[Glade.Widget] public Gtk.Entry  entry_device;
     
     [Glade.Widget] public Gtk.CheckButton cbtn_info;
 	[Glade.Widget] public Gtk.CheckButton cbtn_comp;
@@ -50,7 +50,7 @@
 	private static Glade.XML gxml;
 	
     // Methods        
-	public PreferencesWindow (string mount, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public PreferencesWindow (string device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		// Show Main Dialog using glade
  		gxml = new Glade.XML (null, "gui.glade", "win_prefs", null);
@@ -65,7 +65,7 @@
 		win_prefs.Title = Catalog.GetString ("CDCollect: Preferences");
 
 		// Fill preferences
-		entry_mount.Text = mount;
+		entry_device.Text = device;
 		cbtn_info.Active = info;
 		cbtn_comp.Active = comp;
 		cbtn_recursive.Active = recursive;
@@ -79,7 +79,7 @@
 		win_prefs.ShowAll ();
            				
 		// Select focus          											    																		    											
-        entry_mount.GrabFocus();
+        entry_device.GrabFocus();
         
 	}
 
@@ -94,7 +94,7 @@
 
 	public void on_ok_clicked (object o, EventArgs args)
 	{
-		CDCollect.conf.setkey ("prefs/mount_point", entry_mount.Text);
+		CDCollect.conf.setkey ("prefs/device", entry_device.Text);
 		CDCollect.conf.setkey ("prefs/use_information_plugins", cbtn_info.Active);
 		CDCollect.conf.setkey ("prefs/use_compression_plugins", cbtn_comp.Active);
 		CDCollect.conf.setkey ("prefs/compression_plugins_recursive", cbtn_recursive.Active);

cdcollect-libdir.patch:

--- NEW FILE cdcollect-libdir.patch ---
diff -Nru cdcollect-0.6.0-orig/src/cdcollect.in cdcollect-0.6.0/src/cdcollect.in
--- cdcollect-0.6.0-orig/src/cdcollect.in	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/cdcollect.in	2007-07-17 18:08:13.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH="@prefix@/lib/cdcollect:$LD_LIBRARY_PATH"
+LD_LIBRARY_PATH="@libdir@/cdcollect:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-mono @prefix@/lib/cdcollect/cdcollect.exe $@
+mono @libdir@/cdcollect/cdcollect.exe $@
diff -Nru cdcollect-0.6.0-orig/src/Makefile.am cdcollect-0.6.0/src/Makefile.am
--- cdcollect-0.6.0-orig/src/Makefile.am	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.am	2007-07-17 18:06:59.000000000 +0200
@@ -63,7 +63,7 @@
 
 all: cdcollect.exe
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 
 install-data-local: cdcollect.exe
 	$(mkinstalldirs) $(DESTDIR)$(cdcollectlibdir)
@@ -72,7 +72,7 @@
 bin_SCRIPTS = cdcollect
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 
 EXTRA_DIST =				\
diff -Nru cdcollect-0.6.0-orig/src/Makefile.in cdcollect-0.6.0/src/Makefile.in
--- cdcollect-0.6.0-orig/src/Makefile.in	2006-11-24 18:12:36.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.in	2007-07-17 18:07:51.000000000 +0200
@@ -270,7 +270,7 @@
 	-resource:$(top_srcdir)/resources/icons/cdcollect_small.png,cdcollect_small.png \
 	-resource:$(top_srcdir)/resources/icons/cdmovie.png,cdmovie.png
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 bin_SCRIPTS = cdcollect
 EXTRA_DIST = \
 	$(CDCOLLECT_CSFILES)	\
@@ -485,7 +485,7 @@
 	$(INSTALL_DATA) cdcollect.exe $(DESTDIR)$(cdcollectlibdir)/cdcollect.exe	
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 # 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.


--- NEW FILE cdcollect.spec ---
# rpmbuild creates an empty debuginfo package, this is a Mono application
#%define debug_package %{nil}

Name:		cdcollect
Version:	0.6.0
Release:	3%{?dist}
Summary:	Simple CD/DVD catalog for GNOME

Group:		Applications/Productivity
License:	GPLv2+
URL:		http://cdcollect.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		cdcollect-libdir.patch
Patch1:		cdcollect-0.6.0.patch

BuildRequires:	mono-devel >= 1.1.17, gtk-sharp2-devel >= 2.8.0, gnome-sharp-devel
BuildRequires:	glib2-devel, sqlite-devel >= 3.3.5, mono-data-sqlite, gettext
BuildRequires:	perl(XML::Parser), desktop-file-utils

Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
Requires:	sqlite >= 3.3.5, mono-data-sqlite

Requires(pre):	GConf2
Requires(post):	GConf2
Requires(preun):	GConf2


%description
CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
and GTK#. All data are stored in a sqlite database.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora \
	--remove-category="Application" \
	--delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO 
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
- fixed URLs
- removed unneeded BR: pkgconfig

* Mon Sep 24 2007 Dan Horak <dan[at]danny.cz> 0.6.0-2
- update license tag
- fix desktop file installation

* Tue Jul 17 2007 Dan Horak <dan[at]danny.cz> 0.6.0-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:44:56 -0000	1.1
+++ .cvsignore	26 Sep 2007 19:09:02 -0000	1.2
@@ -0,0 +1 @@
+cdcollect-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:44:56 -0000	1.1
+++ sources	26 Sep 2007 19:09:02 -0000	1.2
@@ -0,0 +1 @@
+33f71604b9dfb84497b4bc2fce69e89b  cdcollect-0.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:09:50 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Sep 2007 15:09:50 -0400
Subject: rpms/pungi/devel .cvsignore, 1.27, 1.28 pungi.spec, 1.29,
	1.30 sources, 1.28, 1.29
Message-ID: <200709261909.l8QJ9otm026161@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26110/devel

Modified Files:
	.cvsignore pungi.spec sources 
Log Message:
New build to fix the media.repo, and to pull in all the virt packages



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Sep 2007 01:35:13 -0000	1.27
+++ .cvsignore	26 Sep 2007 19:09:17 -0000	1.28
@@ -1 +1 @@
-pungi-1.1.2.tar.gz
+pungi-1.1.3.tar.gz


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pungi.spec	26 Sep 2007 01:35:13 -0000	1.29
+++ pungi.spec	26 Sep 2007 19:09:17 -0000	1.30
@@ -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:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -51,6 +51,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Jesse Keating <jkeating at redhat.com> - 1.1.3-1
+- Pull in all the optional Virt stuff
+- Don't expire the metadata from Media repo.
+
 * Tue Sep 25 2007 Jesse Keating <jkeating at redhat.com> - 1.1.2-1
 - Fix location of media.repo file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Sep 2007 01:35:13 -0000	1.28
+++ sources	26 Sep 2007 19:09:17 -0000	1.29
@@ -1 +1 @@
-f4720af1b95ba064ee63ebcafdf29d74  pungi-1.1.2.tar.gz
+5f128f8362c6306612338a1a905a36a9  pungi-1.1.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 19:12:59 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:12:59 -0400
Subject: rpms/cdcollect/F-7 cdcollect-0.6.0.patch, NONE,
	1.1 cdcollect-libdir.patch, NONE, 1.1 cdcollect.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709261912.l8QJCxve026390@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328

Modified Files:
	.cvsignore sources 
Added Files:
	cdcollect-0.6.0.patch cdcollect-libdir.patch cdcollect.spec 
Log Message:
 - initial import

cdcollect-0.6.0.patch:

--- NEW FILE cdcollect-0.6.0.patch ---
diff -Nru cdcollect-0.6.0-orig/resources/glade/gui.glade cdcollect-0.6.0/resources/glade/gui.glade
--- cdcollect-0.6.0-orig/resources/glade/gui.glade	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/resources/glade/gui.glade	2007-07-16 21:30:02.000000000 +0200
@@ -1143,7 +1143,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label10">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Mount Point:</property>
+	      <property name="label" translatable="yes">Device:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1169,7 +1169,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="entry_mount">
+	    <widget class="GtkEntry" id="entry_device">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Mount directory for CDs (CD must already be mounted)</property>
 	      <property name="can_focus">True</property>
diff -Nru cdcollect-0.6.0-orig/src/Conf.cs cdcollect-0.6.0/src/Conf.cs
--- cdcollect-0.6.0-orig/src/Conf.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Conf.cs	2007-07-16 21:48:45.000000000 +0200
@@ -35,7 +35,6 @@
 
 	
 	public string default_cd_device;
-	public string default_cd_mount;
 		
 	public Conf ()
 	{
@@ -61,9 +60,6 @@
 		/* Get the CD device */
 		default_cd_device = "/dev/hdc";
 
-		/* Get the mount point for */
-		default_cd_mount = "/media/cdrom";
-		
 		/* create home dirs if they not exists */
 		create_home_dirs ();
 	}
diff -Nru cdcollect-0.6.0-orig/src/ImportCDWindow.cs cdcollect-0.6.0/src/ImportCDWindow.cs
--- cdcollect-0.6.0-orig/src/ImportCDWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/ImportCDWindow.cs	2007-07-16 22:45:47.000000000 +0200
@@ -50,6 +50,7 @@
 	// Private variables
 	private static Glade.XML gxml;
 	private string mount;
+	private string device;
 	
 	private bool use_infoplugins, use_compplugins, compplugins_recursive, use_thumbs;
 	private int key = -10;
@@ -67,7 +68,7 @@
 	
     
     // Methods        
-	public ImportCDWindow (string mount_point, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public ImportCDWindow (string default_device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		/* Show Main Dialog using glade */
  		gxml = new Glade.XML (null, "gui.glade", "win_importcd", null);
@@ -80,7 +81,8 @@
 		/* Prepare gui */
 		prepare_gui ();		
 		
-		mount = mount_point;
+		device = default_device;
+		mount = get_mount();
 		use_infoplugins = info;
 		use_compplugins = comp;
 		compplugins_recursive = recursive;
@@ -330,10 +332,10 @@
 	
 		/* Open the device */
 		try {
-			fdev = new FileStream (CDCollect.conf.default_cd_device, 
+			fdev = new FileStream (device, 
 				System.IO.FileMode.Open, System.IO.FileAccess.Read);
 		} catch {
-			Console.WriteLine ("Can not open device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not open device " + device);
 			return("Unknown");
 		}	
 		
@@ -343,7 +345,7 @@
 			fdev.Seek (32808, SeekOrigin.Begin);
 			r = fdev.Read (buf, 0, 32);
 		} catch (System.Exception e) {
-			Console.WriteLine ("Can not read device " + CDCollect.conf.default_cd_device);
+			Console.WriteLine ("Can not read device " + device);
 			return ("Unknown");
 		}
 		
@@ -373,6 +375,33 @@
 		}
 		
 	}
+	
+	private string get_mount ()
+	{
+		TextReader f;
+		string line;
+		string mount = "none";
+		string [] fields;
+	
+		/* Open the /etc/mtab */
+		try {
+			f = new StreamReader("/etc/mtab"); 
+		} catch {
+			Console.WriteLine ("Can not open /etc/mtab");
+			return(mount);
+		}	
 		
+		/* Read all line, check whether it contains our device and filesystem type is iso9660 */
+		while ((line = f.ReadLine()) != null) {
+			fields = line.Split(' ');
+			if ((fields[0] == device) && (fields[2] == "iso9660")) {
+				mount = fields[1];
+			}
+		}
+		
+		f.Close();
+
+		return (mount);
+	}	
 }
 
diff -Nru cdcollect-0.6.0-orig/src/Main.cs cdcollect-0.6.0/src/Main.cs
--- cdcollect-0.6.0-orig/src/Main.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Main.cs	2007-07-16 21:48:14.000000000 +0200
@@ -572,7 +572,7 @@
 	{
 		/* Create import window */
 		ImportCDWindow win_importcd = new ImportCDWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
@@ -591,8 +591,8 @@
 		/* Check if CD has been read */
 		if (key==-1) {
 			new ErrorDialog (String.Format (Catalog.GetString (
-				"Directory <b>{0}</b> not found.\nPlease change the CD mount point in the Preferences window."), 
-				(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount)), win_main);
+				"Directory <b>{0}</b> not found.\nPlease change the CD device in the Preferences window."), 
+				(string) conf.getkey ("prefs/device",conf.default_cd_device)), win_main);
 		} else if (key==-2) {
 			new ErrorDialog (Catalog.GetString ("The mount directory is empty. Please make sure the CD is mounted."), win_main);	
 		} else if (key==-3) {
@@ -637,7 +637,7 @@
 	{
 		/* Create Preferences window */
 		new PreferencesWindow(
-			(string) conf.getkey ("prefs/mount_point",conf.default_cd_mount),
+			(string) conf.getkey ("prefs/device",conf.default_cd_device),
 			(bool)   conf.getkey ("prefs/use_information_plugins",true),
 			(bool)   conf.getkey ("prefs/use_compression_plugins",true),
 			(bool)   conf.getkey ("prefs/compression_plugins_recursive",true),
diff -Nru cdcollect-0.6.0-orig/src/PreferencesWindow.cs cdcollect-0.6.0/src/PreferencesWindow.cs
--- cdcollect-0.6.0-orig/src/PreferencesWindow.cs	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/PreferencesWindow.cs	2007-07-16 21:45:51.000000000 +0200
@@ -37,7 +37,7 @@
 	[Glade.Widget] public Gtk.Window win_prefs;
 	[Glade.Widget] public Gtk.Button btn_ok;
 	[Glade.Widget] public Gtk.Button btn_cancel;
-	[Glade.Widget] public Gtk.Entry  entry_mount;
+	[Glade.Widget] public Gtk.Entry  entry_device;
     
     [Glade.Widget] public Gtk.CheckButton cbtn_info;
 	[Glade.Widget] public Gtk.CheckButton cbtn_comp;
@@ -50,7 +50,7 @@
 	private static Glade.XML gxml;
 	
     // Methods        
-	public PreferencesWindow (string mount, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
+	public PreferencesWindow (string device, bool info, bool comp, bool recursive, bool thumbs, Gtk.Window parent) : base (IntPtr.Zero) 
 	{
 		// Show Main Dialog using glade
  		gxml = new Glade.XML (null, "gui.glade", "win_prefs", null);
@@ -65,7 +65,7 @@
 		win_prefs.Title = Catalog.GetString ("CDCollect: Preferences");
 
 		// Fill preferences
-		entry_mount.Text = mount;
+		entry_device.Text = device;
 		cbtn_info.Active = info;
 		cbtn_comp.Active = comp;
 		cbtn_recursive.Active = recursive;
@@ -79,7 +79,7 @@
 		win_prefs.ShowAll ();
            				
 		// Select focus          											    																		    											
-        entry_mount.GrabFocus();
+        entry_device.GrabFocus();
         
 	}
 
@@ -94,7 +94,7 @@
 
 	public void on_ok_clicked (object o, EventArgs args)
 	{
-		CDCollect.conf.setkey ("prefs/mount_point", entry_mount.Text);
+		CDCollect.conf.setkey ("prefs/device", entry_device.Text);
 		CDCollect.conf.setkey ("prefs/use_information_plugins", cbtn_info.Active);
 		CDCollect.conf.setkey ("prefs/use_compression_plugins", cbtn_comp.Active);
 		CDCollect.conf.setkey ("prefs/compression_plugins_recursive", cbtn_recursive.Active);

cdcollect-libdir.patch:

--- NEW FILE cdcollect-libdir.patch ---
diff -Nru cdcollect-0.6.0-orig/src/cdcollect.in cdcollect-0.6.0/src/cdcollect.in
--- cdcollect-0.6.0-orig/src/cdcollect.in	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/cdcollect.in	2007-07-17 18:08:13.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH="@prefix@/lib/cdcollect:$LD_LIBRARY_PATH"
+LD_LIBRARY_PATH="@libdir@/cdcollect:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-mono @prefix@/lib/cdcollect/cdcollect.exe $@
+mono @libdir@/cdcollect/cdcollect.exe $@
diff -Nru cdcollect-0.6.0-orig/src/Makefile.am cdcollect-0.6.0/src/Makefile.am
--- cdcollect-0.6.0-orig/src/Makefile.am	2006-11-24 18:12:13.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.am	2007-07-17 18:06:59.000000000 +0200
@@ -63,7 +63,7 @@
 
 all: cdcollect.exe
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 
 install-data-local: cdcollect.exe
 	$(mkinstalldirs) $(DESTDIR)$(cdcollectlibdir)
@@ -72,7 +72,7 @@
 bin_SCRIPTS = cdcollect
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 
 EXTRA_DIST =				\
diff -Nru cdcollect-0.6.0-orig/src/Makefile.in cdcollect-0.6.0/src/Makefile.in
--- cdcollect-0.6.0-orig/src/Makefile.in	2006-11-24 18:12:36.000000000 +0100
+++ cdcollect-0.6.0/src/Makefile.in	2007-07-17 18:07:51.000000000 +0200
@@ -270,7 +270,7 @@
 	-resource:$(top_srcdir)/resources/icons/cdcollect_small.png,cdcollect_small.png \
 	-resource:$(top_srcdir)/resources/icons/cdmovie.png,cdmovie.png
 
-cdcollectlibdir = $(prefix)/lib/cdcollect
+cdcollectlibdir = $(libdir)/cdcollect
 bin_SCRIPTS = cdcollect
 EXTRA_DIST = \
 	$(CDCOLLECT_CSFILES)	\
@@ -485,7 +485,7 @@
 	$(INSTALL_DATA) cdcollect.exe $(DESTDIR)$(cdcollectlibdir)/cdcollect.exe	
 
 cdcollect: cdcollect.in
-	sed -e "s|\@prefix\@|$(prefix)|" < $(srcdir)/cdcollect.in > cdcollect
+	sed -e "s|\@libdir\@|$(libdir)|" < $(srcdir)/cdcollect.in > cdcollect
 	chmod +x cdcollect 
 # 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.


--- NEW FILE cdcollect.spec ---
# rpmbuild creates an empty debuginfo package, this is a Mono application
#%define debug_package %{nil}

Name:		cdcollect
Version:	0.6.0
Release:	3%{?dist}
Summary:	Simple CD/DVD catalog for GNOME

Group:		Applications/Productivity
License:	GPLv2+
URL:		http://cdcollect.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		cdcollect-libdir.patch
Patch1:		cdcollect-0.6.0.patch

BuildRequires:	mono-devel >= 1.1.17, gtk-sharp2-devel >= 2.8.0, gnome-sharp-devel
BuildRequires:	glib2-devel, sqlite-devel >= 3.3.5, mono-data-sqlite, gettext
BuildRequires:	perl(XML::Parser), desktop-file-utils

Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
Requires:	sqlite >= 3.3.5, mono-data-sqlite

Requires(pre):	GConf2
Requires(post):	GConf2
Requires(preun):	GConf2


%description
CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
and GTK#. All data are stored in a sqlite database.


%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora \
	--remove-category="Application" \
	--delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%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


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO 
%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png


%changelog
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
- fixed URLs
- removed unneeded BR: pkgconfig

* Mon Sep 24 2007 Dan Horak <dan[at]danny.cz> 0.6.0-2
- update license tag
- fix desktop file installation

* Tue Jul 17 2007 Dan Horak <dan[at]danny.cz> 0.6.0-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Sep 2007 16:44:56 -0000	1.1
+++ .cvsignore	26 Sep 2007 19:12:27 -0000	1.2
@@ -0,0 +1 @@
+cdcollect-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Sep 2007 16:44:56 -0000	1.1
+++ sources	26 Sep 2007 19:12:27 -0000	1.2
@@ -0,0 +1 @@
+33f71604b9dfb84497b4bc2fce69e89b  cdcollect-0.6.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:13:25 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 26 Sep 2007 15:13:25 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-intel-by-default.patch,
	NONE, 1.1 xorg-x11-server-1.0.1-fpic-libxf86config.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.251,
	1.252 xserver-1.3.0-randr-updates.patch, 1.1, 1.2
Message-ID: <200709261913.l8QJDPrF026400@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26359

Modified Files:
	xorg-x11-server-1.0.1-fpic-libxf86config.patch 
	xorg-x11-server.spec xserver-1.3.0-randr-updates.patch 
Added Files:
	xserver-1.3.0-intel-by-default.patch 
Log Message:
* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-26
- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
  have too much information than too little.
- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
  with hidden symbols to shrink pyf86config a bit.
- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
  without a config file.
- Enable maintainer mode when building so I swear at autotools less.


xserver-1.3.0-intel-by-default.patch:

--- NEW FILE xserver-1.3.0-intel-by-default.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c
--- xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx	2006-11-16 13:01:24.000000000 -0500
+++ xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c	2007-09-26 10:08:20.000000000 -0400
@@ -175,7 +175,7 @@ videoPtrToDriverName(pciVideoPtr info)
 	case 0x8086:
 	    if ((info->chipType == 0x00d1) || (info->chipType == 0x7800))
 		return "i740";
-	    else return "i810";
+	    else return "intel";
 	case 0x102b:		    return "mga";
 	case 0x10c8:		    return "neomagic";
 	case 0x105d:		    return "i128";

xorg-x11-server-1.0.1-fpic-libxf86config.patch:

Index: xorg-x11-server-1.0.1-fpic-libxf86config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-fpic-libxf86config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.0.1-fpic-libxf86config.patch	14 Jun 2006 02:34:13 -0000	1.3
+++ xorg-x11-server-1.0.1-fpic-libxf86config.patch	26 Sep 2007 19:12:51 -0000	1.4
@@ -5,7 +5,7 @@
  	Extensions.c
  
 -AM_CFLAGS = $(XORG_CFLAGS)
-+AM_CFLAGS = $(XORG_CFLAGS) -fPIC
++AM_CFLAGS = $(XORG_CFLAGS) -fPIC -fvisibility=hidden
  
  EXTRA_DIST = \
  	Configint.h \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- xorg-x11-server.spec	26 Sep 2007 07:33:55 -0000	1.251
+++ xorg-x11-server.spec	26 Sep 2007 19:12:51 -0000	1.252
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   25%{?dist}
+Release:   26%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -70,6 +70,7 @@
 Patch2010:  xserver-1.3.0-idletime.patch
 Patch2012:  xserver-1.3.0-add-really-slow-bcopy.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
+Patch2014:  xserver-1.3.0-intel-by-default.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -329,6 +330,7 @@
 %patch2010 -p1 -b .idletime
 %patch2012 -p1 -b .slow-bcopy
 %patch2013 -p1 -b .fontpath-doc
+%patch2014 -p1 -b .intel
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -348,7 +350,7 @@
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
 aclocal ; automake -a ; autoconf
-%configure \
+%configure --enable-maintainer-mode \
 	%{enable_xorg} \
 	--disable-xprint --enable-xvfb --enable-xnest --enable-dmx \
 	--enable-kdrive --enable-xephyr \
@@ -604,6 +606,15 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-26
+- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
+  have too much information than too little.
+- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
+  with hidden symbols to shrink pyf86config a bit.
+- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
+  without a config file.
+- Enable maintainer mode when building so I swear at autotools less.
+
 * Wed Sep 26 2007 Dave Airlie <airlied at redhat.com> 1.3.0.0-25
 - xserver-1.3.0-randr-updates.patch: Backport randr from server git
   This contains a lot of fixes since 1.3.0 went out, and saves

xserver-1.3.0-randr-updates.patch:

Index: xserver-1.3.0-randr-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.3.0-randr-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-randr-updates.patch	26 Sep 2007 07:33:55 -0000	1.1
+++ xserver-1.3.0-randr-updates.patch	26 Sep 2007 19:12:51 -0000	1.2
@@ -300,7 +300,7 @@
 +			scrn->options,
 +			config->options);
 +    config->debug_modes = xf86ReturnOptValBool (config->options,
-+						OPTION_MODEDEBUG, FALSE);
++						OPTION_MODEDEBUG, TRUE);
 +
      if (scrn->display->virtualX)
  	width = scrn->display->virtualX;



From fedora-extras-commits at redhat.com  Wed Sep 26 19:20:10 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Wed, 26 Sep 2007 15:20:10 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.7,
	1.8 java-1.7.0-icedtea.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200709261920.l8QJKALa026669@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26629

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg. Does not adhere to Fedora guidelines.






Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
+++ .cvsignore	26 Sep 2007 19:19:37 -0000	1.8
@@ -2,4 +2,3 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
-jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
+++ java-1.7.0-icedtea.spec	26 Sep 2007 19:19:37 -0000	1.9
@@ -20,7 +20,6 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
-%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -114,7 +113,6 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -148,8 +146,6 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-# jtreg testing requirements.
-BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -302,22 +298,10 @@
   echo ====================MAUVE TESTING========================
   %{expand: 
      $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-	 -showpasses -debug -timeout 30000 2>&1
-   } || :
+	 -showpasses -debug -timeout 30000 2>&1 || :
+   }
   echo ====================MAUVE TESTING END====================
 popd
-pushd jtreg
-  echo ====================JTREG TESTING========================
-  Xvfb :1 &
-  export DISPLAY=:1.0
-  %{expand: 
-     ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1 
-  } || :
-  killall -9 Xvfb
-  export DISPLAY=:0.0
-  echo ====================JTREG TESTING END====================
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -747,16 +731,19 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+- Removed jtreg. Does not adhere to Fedora guidelines.
+
+* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
 - Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
-* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added JTreg zip as source
 - Run JTreg tests after build for smoke testing.
 - Added Xvfb as build requirement.
 
-* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.
 - Run Mauve after build for regression testing.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Sep 2007 20:51:55 -0000	1.6
+++ sources	26 Sep 2007 19:19:37 -0000	1.7
@@ -3,4 +3,3 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip



From fedora-extras-commits at redhat.com  Wed Sep 26 19:21:20 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 26 Sep 2007 15:21:20 -0400
Subject: rpms/dhcp/devel dhcp.spec, 1.170, 1.171 dhcpd.init, 1.16,
	1.17 dhcrelay.init, 1.3, 1.4
Message-ID: <200709261921.l8QJLKDk026836@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26797

Modified Files:
	dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
- Init script fixes for dhcpd and dhcrelay (#278601)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- dhcp.spec	10 Sep 2007 15:06:40 -0000	1.170
+++ dhcp.spec	26 Sep 2007 19:20:47 -0000	1.171
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  5%{?dist}
+Release:  6%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
+- Init script fixes for dhcpd and dhcrelay (#278601)
+
 * Mon Sep 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-5
 - Fix typos in ldap.c and correct LDAP macros (#283391)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dhcpd.init	10 Jul 2007 18:59:53 -0000	1.16
+++ dhcpd.init	26 Sep 2007 19:20:47 -0000	1.17
@@ -1,37 +1,54 @@
-#!/bin/bash
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: dhcpd
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start:
+# Required-Start: $network
+# Required-Stop:
+# Short-Description: Start and stop the DHCP server
+# Description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP)
+#              server.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
 #
 # chkconfig: - 65 35
-# description: dhcpd provide access to Dynamic Host Control Protocol.
+# description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
+#              server
+# processname: dhcpd
+# config: /etc/dhcpd.conf
+# config: /var/lib/dhcpd/dhcpd.leases
+# pidfile: /var/run/dhcpd.pid
 
-# Source function library.
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcpd
 dhcpd=/usr/sbin/dhcpd
 lockfile=/var/lock/subsys/dhcpd
+pidfile=/var/run/dhcpd.pid
 
-. /etc/sysconfig/dhcpd
+[ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
-cfOption() {
-    let i=0
-    for a in $* ; do
-        ((++i))
-        if [ $a = -cf ]; then
-            ((++i))
-            eval 'echo $'$i
-        elif [[ $a = -cf* ]]; then
-            echo ${a#-cf}
+# if the user specified a different config file, make sure we reference it
+findConfig() {
+    for arg in $DHCPDARGS ; do
+        if [ $found = 1 ]; then
+            [ -f "$arg" ] && echo "$arg"
+            return
+        fi
+        if [ "$arg" = "-cf" ]; then
+            found=1
+            continue
         fi
     done
+    echo "/etc/dhcpd.conf"
 }
 
-CF=`cfOption $DHCPDARGS`
-if [ -z "$CF" ]; then
-    CF='/etc/dhcpd.conf'
-fi
-
-[ -f "$CF" ] || exit 0
+conf="$(findConfig "$DHCPDARGS")"
 
 if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
     mkdir -p /var/lib/dhcpd
@@ -41,15 +58,20 @@
 
 configtest() {
     [ -x $dhcpd ] || return 5
-    [ -f $CF ] || return 6
-    $dhcpd -q -t -cf $CF
+    [ -f $conf ] || return 6
+    $dhcpd -q -t -cf $conf
     RETVAL=$?
     return $RETVAL
 }
 
 start() {
     [ -x $dhcpd ] || return 5
-    [ -f $CF ] || return 6
+    [ -f $conf ] || return 6
+
+    pidofproc $prog >/dev/null 2>&1
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && return $RETVAL
+
     echo -n $"Starting $prog: "
     daemon $dhcpd $DHCPDARGS 2>/dev/null
     RETVAL=$?
@@ -59,42 +81,60 @@
 }
 
 stop() {
+    pidofproc $prog >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        RETVAL=7
+        return $RETVAL
+    fi
+
     echo -n $"Shutting down $prog: "
     killproc $prog
     RETVAL=$?
+
+    [ $RETVAL = 0 ] && success || failure
     echo
     [ $RETVAL = 0 ] && rm -f $lockfile
     return $RETVAL
 }
 
-# See how we were called.
+if [ ! -x $dhcdbd ]; then
+    RETVAL=5
+    exit $RETVAL
+fi
+
+if [ $# -gt 1 ]; then
+    RETVAL=2
+    exit $RETVAL
+fi
+
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    reload)
-        RETVAL=3
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    restart)
-        configtest || exit $?
-        stop
-        start
+    try-restart|reload)
+        RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
+            RETVAL=$?
         fi
         ;;
-    configtest|check|testconfig|test)
+    configtest)
         configtest
         RETVAL=$?
         ;;
     status)
-        status $prog
+        status $dhcpd
         RETVAL=$?
         ;;
     *)


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcrelay.init	26 Apr 2007 19:01:43 -0000	1.3
+++ dhcrelay.init	26 Sep 2007 19:20:47 -0000	1.4
@@ -1,23 +1,58 @@
-#!/bin/bash
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: dhcrelay
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Should-Start:
+# Required-Start: $network
+# Required-Stop:
+# Short-Description: Start and stop the DHCP relay server
+# Description: dhcrelay provides the Dynamic Host Configuration Protocol (DHCP)
+#              relay server.  This is required when your DHCP server is on
+#              another network segment from the clients.
+### END INIT INFO
+#
+# The fields below are left around for legacy tools (will remove later).
 #
 # chkconfig: - 66 34
 # description: dhcrelay provides a relay for Dynamic Host Control Protocol.
+# processname: dhcrelay
+# # pidfile: /var/run/dhcrelay.pid
 
-# Source function library
 . /etc/init.d/functions
 
 RETVAL=0
+
 prog=dhcrelay
 dhcrelay=/usr/sbin/dhcrelay
 lockfile=/var/lock/subsys/dhcrelay
+pidfile=/var/run/dhcrelay.pid
+conf=/etc/sysconfig/dhcrelay
 
-start() {
+# The dhcrelay daemon uses the sysconfig file for configuration information.
+# There is no native configuration file for this program and you must specify
+# its settings on the command line.
+[ -f /etc/sysconfig/dhcrelay ] && . /etc/sysconfig/dhcrelay
+
+configtest() {
     [ -x $dhcrelay ] || exit 5
-    [ -f /etc/sysconfig/dhcrelay ] || exit 6
-    . /etc/sysconfig/dhcrelay
+    [ -f $conf ] || exit 6
     [ -z "$DHCPSERVERS" ] && exit 6
+    RETVAL=0
+    return $RETVAL
+}
+
+start() {
+    [ -x $dhcrelay ] || exit 5
+    [ -f $conf ] || exit 6
+
+    pidofproc $prog >/dev/null 2>&1
+    RETVAL=$?
+    [ $RETVAL -eq 0 ] && return $RETVAL
+
     echo -n $"Starting $prog: "
-    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS
+    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch $lockfile
@@ -25,41 +60,64 @@
 }
 
 stop() {
+    pidofproc $prog >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        RETVAL=7
+        return $RETVAL
+    fi
+
     echo -n $"Shutting down $prog: "
     killproc $prog -TERM
     RETVAL=$?
+
+    [ $RETVAL = 0 ] && success || failure
     echo
-    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    [ $RETVAL = 0 ] && rm -f $lockfile
     return $RETVAL
 }
 
-# See how we were called.
+if [ ! -x $dhcrelay ]; then
+    RETVAL=5
+    exit $RETVAL
+fi
+
+if [ $# -gt 1 ]; then
+    RETVAL=2
+    exit $RETVAL
+fi
+
 case "$1" in
     start)
         start
+        RETVAL=$?
         ;;
     stop)
         stop
+        RETVAL=$?
         ;;
-    reload)
-        RETVAL=3
+    restart|force-reload)
+        stop && start
+        RETVAL=$?
         ;;
-    restart)
-        stop
-        start
+    try-restart|reload)
+        RETVAL=3
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop
-            start
+            stop && start
+            RETVAL=$?
         fi
         ;;
+    configtest)
+        configtest
+        RETVAL=$?
+        ;;
     status)
         status $prog
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
         RETVAL=3
         ;;
 esac



From fedora-extras-commits at redhat.com  Wed Sep 26 19:21:35 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Wed, 26 Sep 2007 15:21:35 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.59,1.60
Message-ID: <200709261921.l8QJLZIV026874@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26676

Modified Files:
	kernel-xen.spec 
Log Message:
Remove reference to unused patch files on spec




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kernel-xen.spec	26 Sep 2007 18:52:12 -0000	1.59
+++ kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
@@ -326,7 +326,6 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21.7.bz2
-Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch11: nouveau-drm.patch
@@ -458,15 +457,11 @@
 Patch905: linux-2.6-modsign-core.patch
 Patch906: linux-2.6-modsign-script.patch
 
-# Tux http accelerator.
-Patch910: linux-2.6-tux.patch
-
 # 950 - 999 Xen
 # linux-2.6.21.7-xen-3.1.0.patch patch generated by
 # 'hg diff -rd91e11100fb0 -rd610071e6045 -X .hgtags' on
 # http://hg.et.redhat.com/kernel-dev/ehabkost/linux-2.6.21.y-xen-3.1.0
 Patch950: linux-2.6.21.7-xen-3.1.0.patch.bz2
-Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch960: linux-2.6-xen-blkfront-wait-add.patch
 Patch961: linux-2.6-xen-backwards-time.patch
 Patch962: linux-2.6-xen-irq_vector-uninitialize.patch
@@ -503,9 +498,6 @@
 Patch1100: linux-2.6-scsi-bounce-isa.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
 
-# NFS bits.
-Patch1200: linux-2.6-NFSD-ctlbits.patch
-
 # NIC driver fixes
 Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
 
@@ -566,13 +558,11 @@
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-fat-utf8.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
-Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
 Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch
 Patch2107: linux-2.6-usb-autosuspend-default-disable.patch
 
 # SATA Bits
-Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
 Patch2203: linux-2.6-libata-ali-atapi-dma.patch
@@ -1133,9 +1123,6 @@
 %patch906 -p1
 
 
-# Tux
-#%patch910 -p1
-
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -1184,8 +1171,6 @@
 #
 # Various NFS/NFSD fixes.
 #
-# kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports
-#%patch1200 -p1
 
 # NIC driver fixes
 # Don't print warnings about MSI failures on e1000
@@ -1294,8 +1279,6 @@
 
 # Use unicode VT's by default.
 %patch2103 -p1
-# Disable split page table lock
-#%patch2104 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
 # Disable MMCONFIG & MSI by default.
@@ -1303,8 +1286,6 @@
 # Disable USB autosuspend by default.
 %patch2107 -p1
 
-# Enable PATA ports on Promise SATA.
-#%patch2200 -p1
 # HPA support for libata.
 %patch2201 -p1
 # sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands



From fedora-extras-commits at redhat.com  Wed Sep 26 19:22:37 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Wed, 26 Sep 2007 15:22:37 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.9,1.10
Message-ID: <200709261922.l8QJMbVM027022@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26929

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
Fixed changelog dates




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-1.7.0-icedtea.spec	26 Sep 2007 19:19:37 -0000	1.9
+++ java-1.7.0-icedtea.spec	26 Sep 2007 19:22:05 -0000	1.10
@@ -731,10 +731,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+* Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg. Does not adhere to Fedora guidelines.
 
-* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+* Tue Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
 - Fixed mauve and jtreg test runs to not break the build when an error is thrown
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:35:10 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Wed, 26 Sep 2007 15:35:10 -0400
Subject: rpms/gedit/devel .cvsignore, 1.67, 1.68 gedit.spec, 1.141,
	1.142 sources, 1.69, 1.70
Message-ID: <200709261935.l8QJZA9s027764@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27725

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
- Update to 2.20.1 at the request of upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	18 Sep 2007 02:23:42 -0000	1.67
+++ .cvsignore	26 Sep 2007 19:34:37 -0000	1.68
@@ -1 +1 @@
-gedit-2.20.0.tar.bz2
+gedit-2.20.1.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gedit.spec	18 Sep 2007 03:06:03 -0000	1.141
+++ gedit.spec	26 Sep 2007 19:34:37 -0000	1.142
@@ -18,7 +18,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.20.0
+Version: 	2.20.1
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL+
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.1-1
+- Update to 2.20.1 at the request of upstream
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	18 Sep 2007 02:23:42 -0000	1.69
+++ sources	26 Sep 2007 19:34:37 -0000	1.70
@@ -1 +1 @@
-6c14d4f3583c921bdd551df6cd822289  gedit-2.20.0.tar.bz2
+866757ca52dd402bfc2d7a88642b9767  gedit-2.20.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 19:36:42 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Sep 2007 15:36:42 -0400
Subject: rpms/kdepim/devel kdepim-enterprise-svn_checkout.sh, NONE,
	1.1 .cvsignore, 1.35, 1.36 kdepim.spec, 1.131, 1.132 sources,
	1.40, 1.41 cr16-app-kandy.png, 1.1, NONE cr32-app-kandy.png, 1.1,
	NONE cr48-app-kandy.png, 1.1, NONE kdepim-3.4.0-s390.patch, 1.1,
	NONE kdepim-3.4.92-libz.patch, 1.1,
	NONE kdepim-3.5.7-kde#140549.patch, 1.1, NONE
Message-ID: <200709261936.l8QJag0u027932@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27878

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-enterprise-svn_checkout.sh 
Removed Files:
	cr16-app-kandy.png cr32-app-kandy.png cr48-app-kandy.png 
	kdepim-3.4.0-s390.patch kdepim-3.4.92-libz.patch 
	kdepim-3.5.7-kde#140549.patch 
Log Message:
* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
- kdepim-enterprise branch 20070926 snapshot (r717374)

* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
- kdepim-enterprise branch 20070920 snapshot (r714749)




--- NEW FILE kdepim-enterprise-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=kdepim

set -x
rm -rf $EXPORT_DIR

# app
svn export  svn://anonsvn.kde.org/home/kde/branches/kdepim/enterprise/kdepim $EXPORT_DIR/

# auto*/configure bits
# svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/

tar cjf kdepim-enterprise-svn${DATE}.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	16 Jun 2007 19:14:32 -0000	1.35
+++ .cvsignore	26 Sep 2007 19:36:09 -0000	1.36
@@ -1,16 +1,5 @@
-kdepim-3.3.0.tar.bz2
-kdepim-3.3.1.tar.bz2
-kdepim-3.3.2.tar.bz2
-kdepim-3.4.0-rc1.tar.bz2
-kdepim-3.4.0.tar.bz2
-kdepim-3.4.1.tar.bz2
-kdepim-3.4.2.tar.bz2
-kdepim-3.4.91.tar.bz2
-kdepim-3.4.92.tar.bz2
-kdepim-3.5.0.tar.bz2
-kdepim-3.5.1.tar.bz2
-kdepim-3.5.2.tar.bz2
-kdepim-3.5.3.tar.bz2
-kdepim-3.5.4.tar.bz2
-timezone-update.diff.bz2
 kdepim-3.5.7.tar.bz2
+cr16-app-kandy.png
+cr32-app-kandy.png
+cr48-app-kandy.png
+kdepim-enterprise-svn20070926.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdepim.spec	12 Sep 2007 15:47:56 -0000	1.131
+++ kdepim.spec	26 Sep 2007 19:36:09 -0000	1.132
@@ -1,7 +1,12 @@
 
-%define debug 0
-# --enable-final requires > 1GB VM, sometimes kills our builders 
-%define final 0
+
+# enterprise branch
+%define ent_date 20070926
+%define ent_rev 714749
+
+#define debug 1 
+## --enable-final requires > 1GB VM, sometimes kills fedora's builders 
+#define final 1 
 
 %define make_cvs 1
 
@@ -12,23 +17,24 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.7
-Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
+%if 0%{?ent_date} > 0
+Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2
+Release: 9.svn%{ent_date}.ent%{?dist}
+%else
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%endif
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
 
-Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
-Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -49,7 +55,7 @@
 BuildRequires: lockdev-devel
 BuildRequires: python-devel
 %ifnarch s390 s390x
-%if 0%{?fedora} > 6
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 %define _with_pilot_link --with-pilot-link
 BuildRequires: pilot-link-devel >= 0.12
 # AvantGo support via libmal
@@ -58,7 +64,6 @@
 %endif
 %{?_with_gnokii:BuildRequires: gnokii-devel}
 ## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html
-# may have to drop this when/if gpgme becomes LGPLv3
 BuildRequires: gpgme-devel
 %if 0%{?fedora} > 4  || 0%{?rhel} > 4
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -106,39 +111,26 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
-
-%ifarch s390 s390x
-%patch2 -p1 -b .s390
-rm -rf kpilot
-%endif
+%setup -q %{?ent_date: -n %{name}}
 
+install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+%if %{make_cvs}
+   make -f admin/Makefile.common cvs
+%endif
+
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
-
-%if %{make_cvs}
-   make -f admin/Makefile.common cvs
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
+   %{!?debug:--disable-debug --disable-warnings} \
+   %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
    --with-gpgsm=%{_bindir}/gpgsm \
@@ -167,18 +159,6 @@
 done
 popd
 
-
-## FIXME.  *ALL* of these?  Surely, non-kde users should get to see
-## some of these gems.  -- Rex
-%if 0
-for i in konsolekalendar knotes kpilotdaemon kpilot KMail KNode Kontact \
-   KOrn akregator kalarm groupwarewizard kpalmdoc ktnef multisynk ; do
-   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
-   fi
-done
-%endif
-
 ## remove references to extraneous/optional libraries in .la files (#170602)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
@@ -247,6 +227,12 @@
 
 
 %changelog
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9.20070926.ent
+- kdepim-enterprise branch 20070926 snapshot (r717374)
+
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8.20070920.714749.ent
+- kdepim-enterprise branch 20070920 snapshot (r714749)
+
 * Mon Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
 - drop OnlyShowIn=KDE munging
 - update %%description


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Jun 2007 19:14:32 -0000	1.40
+++ sources	26 Sep 2007 19:36:09 -0000	1.41
@@ -1 +1,4 @@
-8571db6dcf4168614c96bb72c493f931  kdepim-3.5.7.tar.bz2
+024ab01d199f9e93c43df1ef0a03510c  cr16-app-kandy.png
+496c7bfc6247df2cf03aec342094ffd6  cr32-app-kandy.png
+fef385691270bad1e58e6eb5ed0ad6d6  cr48-app-kandy.png
+0d1f3d94721fbc40367aacbac91d6d34  kdepim-enterprise-svn20070926.tar.bz2


--- kdepim-3.4.0-s390.patch DELETED ---


--- kdepim-3.4.92-libz.patch DELETED ---


--- kdepim-3.5.7-kde#140549.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 19:38:21 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 15:38:21 -0400
Subject: rpms/mlton/devel mlton.spec,1.15,1.16
Message-ID: <200709261938.l8QJcLWo028069@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28049

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
- Build on ppc now that #247407 is fixed



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlton.spec	14 Sep 2007 01:35:04 -0000	1.15
+++ mlton.spec	26 Sep 2007 19:37:49 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -27,8 +27,8 @@
 
 Requires:	gmp-devel gcc
 
-# triggers GCC ICE on ppc (#268281)
-ExcludeArch:	ppc ppc64
+# need to bootstrap ppc64 still
+ExcludeArch:	ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
+- Build on ppc now that #247407 is fixed
+
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
 - Do not condition bootstrap source tag
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:40:01 2007
From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel))
Date: Wed, 26 Sep 2007 15:40:01 -0400
Subject: rpms/dhcp/devel dhcp-3.0.6-manpages.patch, 1.1, 1.2 dhcp.spec, 1.171,
	1.172
Message-ID: <200709261940.l8QJe1E3028201@cvs-int.fedora.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28169

Modified Files:
	dhcp-3.0.6-manpages.patch dhcp.spec 
Log Message:
* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-7
- In dhcp.conf.5, explain that if no next-server statement applies to the
  requesting client, the address 0.0.0.0 is used (#184484).


dhcp-3.0.6-manpages.patch:

Index: dhcp-3.0.6-manpages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-3.0.6-manpages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.6-manpages.patch	16 Aug 2007 18:33:06 -0000	1.1
+++ dhcp-3.0.6-manpages.patch	26 Sep 2007 19:39:59 -0000	1.2
@@ -1,6 +1,194 @@
+diff -up dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages dhcp-3.0.6/dhcpctl/dhcpctl.3
+--- dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
++++ dhcp-3.0.6/dhcpctl/dhcpctl.3	2007-09-26 15:22:12.000000000 -0400
+@@ -43,7 +43,7 @@
+ .\"
+ .\"
+ .Sh SYNOPSIS
+-.Fd #include <dhcpctl/dhcpctl.h>
++.Fd #include <dhcpctl.h>
+ .Ft dhcpctl_status
+ .Fo dhcpctl_initialize
+ .Fa void
+@@ -426,7 +426,7 @@ that most error checking has been ommitt
+ #include <netinet/in.h>
+ 
+ #include <isc/result.h>
+-#include <dhcpctl/dhcpctl.h>
++#include <dhcpctl.h>
+ 
+ int main (int argc, char **argv) {
+ 	dhcpctl_data_string ipaddrstring = NULL;
+diff -up dhcp-3.0.6/server/dhcpd.conf.5.manpages dhcp-3.0.6/server/dhcpd.conf.5
+--- dhcp-3.0.6/server/dhcpd.conf.5.manpages	2007-05-01 16:42:56.000000000 -0400
++++ dhcp-3.0.6/server/dhcpd.conf.5	2007-09-26 15:24:18.000000000 -0400
+@@ -531,9 +531,9 @@ primary server might look like this:
+ failover peer "foo" {
+   primary;
+   address anthrax.rc.vix.com;
+-  port 519;
++  port 647;
+   peer address trantor.rc.vix.com;
+-  peer port 520;
++  peer port 847;
+   max-response-delay 60;
+   max-unacked-updates 10;
+   mclt 3600;
+@@ -592,9 +592,7 @@ statement
+ .B port \fIport-number\fR\fB;\fR
+ .PP
+ The \fBport\fR statement declares the TCP port on which the server
+-should listen for connections from its failover peer.   This statement
+-may not currently be omitted, because the failover protocol does not
+-yet have a reserved TCP port number.
++should listen for connections from its failover peer.
+ .RE
+ .PP
+ The 
+@@ -606,10 +604,8 @@ statement
+ .PP
+ The \fBpeer port\fR statement declares the TCP port to which the
+ server should connect to reach its failover peer for failover
+-messages.   This statement may not be omitted because the failover
+-protocol does not yet have a reserved TCP port number.   The port
+-number declared in the \fBpeer port\fR statement may be the same as
+-the port number declared in the \fBport\fR statement.
++messages. The port number declared in the \fBpeer port\fR statement
++may be the same as the port number declared in the \fBport\fR statement.
+ .RE
+ .PP
+ The 
+@@ -1133,7 +1129,7 @@ the zone containing PTR records - for IS
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -1156,7 +1152,7 @@ dhcpd.conf file:
+ .PP
+ .nf
+ key DHCP_UPDATER {
+-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
++  algorithm hmac-md5;
+   secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+ 
+@@ -2114,7 +2110,8 @@ statement
+ The \fInext-server\fR statement is used to specify the host address of
+ the server from which the initial boot file (specified in the
+ \fIfilename\fR statement) is to be loaded.   \fIServer-name\fR should
+-be a numeric IP address or a domain name.
++be a numeric IP address or a domain name.  If no \fInext-server\fR statement
++applies to a given client, the address 0.0.0.0 is used.
+ .RE
+ .PP
+ The
+diff -up dhcp-3.0.6/common/dhcp-options.5.manpages dhcp-3.0.6/common/dhcp-options.5
+--- dhcp-3.0.6/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
++++ dhcp-3.0.6/common/dhcp-options.5	2007-09-26 15:22:12.000000000 -0400
+@@ -834,6 +834,24 @@ classless IP routing - it does not inclu
+ classless IP routing is now the most widely deployed routing standard,
+ this option is virtually useless, and is not implemented by any of the
+ popular DHCP clients, for example the Microsoft DHCP client.
++.PP
++NOTE to Red Hat dhclient users:
++.br
++The RedHat dhclient-script interprets trailing 0 octets of the target
++as indicating the subnet class of the route - so for this
++static-routes value:
++.br
++        option static-routes 172.0.0.0 172.16.2.254,
++.br
++                             192.168.0.0 192.168.2.254;
++.br
++the Red Hat dhclient-script will create routes:
++.br
++        172/8 via 172.16.2.254 dev $interface
++.br
++        192.168/16 via 192.168.2.254 dev $interface
++.br
++which slightly increases the usefulness of the static-routes option.
+ .RE
+ .PP
+ .nf
+diff -up dhcp-3.0.6/client/dhclient-script.8.manpages dhcp-3.0.6/client/dhclient-script.8
+--- dhcp-3.0.6/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
++++ dhcp-3.0.6/client/dhclient-script.8	2007-09-26 15:22:12.000000000 -0400
+@@ -47,7 +47,7 @@ customizations are needed, they should b
+ exit hooks provided (see HOOKS for details).   These hooks will allow the
+ user to override the default behaviour of the client in creating a
+ .B /etc/resolv.conf
+-file.
++file, and to handle DHCP options not handled by default.
+ .PP
+ No standard client script exists for some operating systems, even though
+ the actual client may work, so a pioneering user may well need to create
+@@ -91,6 +91,27 @@ present.   The
+ .B ETCDIR/dhclient-exit-hooks
+ script can modify the valid of exit_status to change the exit status
+ of dhclient-script.
++.PP
++Immediately after dhclient brings an interface UP with a new IP address,
++subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
++existence of an executable
++.B ETCDIR/dhclient-up-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface.
++.B ETCDIR/dhclient-${IF}-up-hooks
++script will override the generic script and be sourced when interface
++$IF has been brought up.
++.PP
++Immediately before dhclient brings an interface DOWN, removing its IP
++address, subnet mask, and routes, in the STOP/RELEASE  states, it will
++check for the existence of an executable
++.B ETCDIR/dhclient-down-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface
++.B ETCDIR/dhclient-${IF}-down-hooks
++script will override the generic script and be sourced when interface
++$IF is about to be brought down.
++
+ .SH OPERATION
+ When dhclient needs to invoke the client configuration script, it
+ defines a set of variables in the environment, and then invokes
+diff -up dhcp-3.0.6/client/dhclient.conf.5.manpages dhcp-3.0.6/client/dhclient.conf.5
+--- dhcp-3.0.6/client/dhclient.conf.5.manpages	2007-05-01 16:42:55.000000000 -0400
++++ dhcp-3.0.6/client/dhclient.conf.5	2007-09-26 15:22:12.000000000 -0400
+@@ -185,7 +185,8 @@ responding to the client send the client
+ options.   Only the option names should be specified in the request
+ statement - not option parameters.   By default, the DHCP server
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options. 
++domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
++and ntp-servers options.
+ .PP
+ In some cases, it may be desirable to send no parameter request list
+ at all.   To do this, simply write the request statement but specify
+@@ -581,6 +582,18 @@ database and will record the media type 
+ Whenever the client tries to renew the lease, it will use that same
+ media type.   The lease must expire before the client will go back to
+ cycling through media types.
++.PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as a Red Hat extension to enable dhclient to work
++on IBM zSeries z/OS Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file is used on a laptop running NetBSD
+ 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
 diff -up dhcp-3.0.6/client/dhclient.8.manpages dhcp-3.0.6/client/dhclient.8
 --- dhcp-3.0.6/client/dhclient.8.manpages	2007-05-01 16:42:55.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient.8	2007-08-15 12:08:48.000000000 -0400
++++ dhcp-3.0.6/client/dhclient.8	2007-09-26 15:22:12.000000000 -0400
 @@ -82,6 +82,28 @@ relay
  .B -w
  ]
@@ -141,181 +329,3 @@
  .SH CONFIGURATION
  The syntax of the dhclient.conf(5) file is discussed separately.
  .SH OMAPI
-diff -up dhcp-3.0.6/client/dhclient-script.8.manpages dhcp-3.0.6/client/dhclient-script.8
---- dhcp-3.0.6/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient-script.8	2007-08-15 11:55:11.000000000 -0400
-@@ -47,7 +47,7 @@ customizations are needed, they should b
- exit hooks provided (see HOOKS for details).   These hooks will allow the
- user to override the default behaviour of the client in creating a
- .B /etc/resolv.conf
--file.
-+file, and to handle DHCP options not handled by default.
- .PP
- No standard client script exists for some operating systems, even though
- the actual client may work, so a pioneering user may well need to create
-@@ -91,6 +91,27 @@ present.   The
- .B ETCDIR/dhclient-exit-hooks
- script can modify the valid of exit_status to change the exit status
- of dhclient-script.
-+.PP
-+Immediately after dhclient brings an interface UP with a new IP address,
-+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
-+existence of an executable
-+.B ETCDIR/dhclient-up-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface.
-+.B ETCDIR/dhclient-${IF}-up-hooks
-+script will override the generic script and be sourced when interface
-+$IF has been brought up.
-+.PP
-+Immediately before dhclient brings an interface DOWN, removing its IP
-+address, subnet mask, and routes, in the STOP/RELEASE  states, it will
-+check for the existence of an executable
-+.B ETCDIR/dhclient-down-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface
-+.B ETCDIR/dhclient-${IF}-down-hooks
-+script will override the generic script and be sourced when interface
-+$IF is about to be brought down.
-+
- .SH OPERATION
- When dhclient needs to invoke the client configuration script, it
- defines a set of variables in the environment, and then invokes
-diff -up dhcp-3.0.6/client/dhclient.conf.5.manpages dhcp-3.0.6/client/dhclient.conf.5
---- dhcp-3.0.6/client/dhclient.conf.5.manpages	2007-05-01 16:42:55.000000000 -0400
-+++ dhcp-3.0.6/client/dhclient.conf.5	2007-08-15 11:56:40.000000000 -0400
-@@ -185,7 +185,8 @@ responding to the client send the client
- options.   Only the option names should be specified in the request
- statement - not option parameters.   By default, the DHCP server
- requests the subnet-mask, broadcast-address, time-offset, routers,
--domain-name, domain-name-servers and host-name options. 
-+domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
-+and ntp-servers options.
- .PP
- In some cases, it may be desirable to send no parameter request list
- at all.   To do this, simply write the request statement but specify
-@@ -581,6 +582,18 @@ database and will record the media type 
- Whenever the client tries to renew the lease, it will use that same
- media type.   The lease must expire before the client will go back to
- cycling through media types.
-+.PP
-+ \fBbootp-broadcast-always;\fR
-+.PP
-+The
-+.B bootp-broadcast-always
-+statement instructs dhclient to always set the bootp broadcast flag in
-+request packets, so that servers will always broadcast replies.
-+This is equivalent to supplying the dhclient -B argument, and has
-+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
-+This option is provided as a Red Hat extension to enable dhclient to work
-+on IBM zSeries z/OS Linux guests.
-+.PP
- .SH SAMPLE
- The following configuration file is used on a laptop running NetBSD
- 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
-diff -up dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages dhcp-3.0.6/dhcpctl/dhcpctl.3
---- dhcp-3.0.6/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
-+++ dhcp-3.0.6/dhcpctl/dhcpctl.3	2007-08-15 12:59:06.000000000 -0400
-@@ -43,7 +43,7 @@
- .\"
- .\"
- .Sh SYNOPSIS
--.Fd #include <dhcpctl/dhcpctl.h>
-+.Fd #include <dhcpctl.h>
- .Ft dhcpctl_status
- .Fo dhcpctl_initialize
- .Fa void
-@@ -426,7 +426,7 @@ that most error checking has been ommitt
- #include <netinet/in.h>
- 
- #include <isc/result.h>
--#include <dhcpctl/dhcpctl.h>
-+#include <dhcpctl.h>
- 
- int main (int argc, char **argv) {
- 	dhcpctl_data_string ipaddrstring = NULL;
-diff -up dhcp-3.0.6/server/dhcpd.conf.5.manpages dhcp-3.0.6/server/dhcpd.conf.5
---- dhcp-3.0.6/server/dhcpd.conf.5.manpages	2007-05-01 16:42:56.000000000 -0400
-+++ dhcp-3.0.6/server/dhcpd.conf.5	2007-08-15 13:00:35.000000000 -0400
-@@ -531,9 +531,9 @@ primary server might look like this:
- failover peer "foo" {
-   primary;
-   address anthrax.rc.vix.com;
--  port 519;
-+  port 647;
-   peer address trantor.rc.vix.com;
--  peer port 520;
-+  peer port 847;
-   max-response-delay 60;
-   max-unacked-updates 10;
-   mclt 3600;
-@@ -592,9 +592,7 @@ statement
- .B port \fIport-number\fR\fB;\fR
- .PP
- The \fBport\fR statement declares the TCP port on which the server
--should listen for connections from its failover peer.   This statement
--may not currently be omitted, because the failover protocol does not
--yet have a reserved TCP port number.
-+should listen for connections from its failover peer.
- .RE
- .PP
- The 
-@@ -606,10 +604,8 @@ statement
- .PP
- The \fBpeer port\fR statement declares the TCP port to which the
- server should connect to reach its failover peer for failover
--messages.   This statement may not be omitted because the failover
--protocol does not yet have a reserved TCP port number.   The port
--number declared in the \fBpeer port\fR statement may be the same as
--the port number declared in the \fBport\fR statement.
-+messages. The port number declared in the \fBpeer port\fR statement
-+may be the same as the port number declared in the \fBport\fR statement.
- .RE
- .PP
- The 
-@@ -1133,7 +1129,7 @@ the zone containing PTR records - for IS
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-@@ -1156,7 +1152,7 @@ dhcpd.conf file:
- .PP
- .nf
- key DHCP_UPDATER {
--  algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+  algorithm hmac-md5;
-   secret pRP5FapFoJ95JEL06sv4PQ==;
- };
- 
-diff -up dhcp-3.0.6/common/dhcp-options.5.manpages dhcp-3.0.6/common/dhcp-options.5
---- dhcp-3.0.6/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
-+++ dhcp-3.0.6/common/dhcp-options.5	2007-08-15 12:10:12.000000000 -0400
-@@ -834,6 +834,24 @@ classless IP routing - it does not inclu
- classless IP routing is now the most widely deployed routing standard,
- this option is virtually useless, and is not implemented by any of the
- popular DHCP clients, for example the Microsoft DHCP client.
-+.PP
-+NOTE to Red Hat dhclient users:
-+.br
-+The RedHat dhclient-script interprets trailing 0 octets of the target
-+as indicating the subnet class of the route - so for this
-+static-routes value:
-+.br
-+        option static-routes 172.0.0.0 172.16.2.254,
-+.br
-+                             192.168.0.0 192.168.2.254;
-+.br
-+the Red Hat dhclient-script will create routes:
-+.br
-+        172/8 via 172.16.2.254 dev $interface
-+.br
-+        192.168/16 via 192.168.2.254 dev $interface
-+.br
-+which slightly increases the usefulness of the static-routes option.
- .RE
- .PP
- .nf


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- dhcp.spec	26 Sep 2007 19:20:47 -0000	1.171
+++ dhcp.spec	26 Sep 2007 19:39:59 -0000	1.172
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  6%{?dist}
+Release:  7%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-7
+- In dhcp.conf.5, explain that if no next-server statement applies to the
+  requesting client, the address 0.0.0.0 is used (#184484).
+
 * Wed Sep 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-6
 - Init script fixes for dhcpd and dhcrelay (#278601)
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:41:22 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 15:41:22 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.487,1.488
Message-ID: <200709261941.l8QJfMEb028238@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215

Modified Files:
	eclipse.spec 
Log Message:
* 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.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- eclipse.spec	18 Sep 2007 16:04:08 -0000	1.487
+++ eclipse.spec	26 Sep 2007 19:40:49 -0000	1.488
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist} 
+Release:        21%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -71,6 +71,9 @@
 Patch25: 	%{name}-launcher-double-free-bug.patch
 #FIXME: file a bug upstream
 Patch26:        %{name}-launcher-fix-java-home.patch
+# On a 1.7 VM, generate 1.6-level bytecode
+# https://bugzilla.redhat.com/show_bug.cgi?id=288991
+Patch27:        %{name}-17vmgenerate16bytecode.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -350,6 +353,10 @@
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 popd
 
+pushd plugins/org.eclipse.jdt.core
+%patch27
+popd
+
 # use our system-installed javadocs
 sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
    plugins/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -1556,6 +1563,11 @@
 %endif
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 19:46:01 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:46:01 -0400
Subject: rpms/cdcollect/devel cdcollect.spec,1.1,1.2
Message-ID: <200709261946.l8QJk1CH028659@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28632

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
- set ExcludeArch: ppc64 as Mono doesn't exist there



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/cdcollect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdcollect.spec	26 Sep 2007 19:09:02 -0000	1.1
+++ cdcollect.spec	26 Sep 2007 19:45:28 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,6 +11,7 @@
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
+- set ExcludeArch: ppc64 as Mono doesn't exist there
+
 * Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
 - fixed URLs
 - removed unneeded BR: pkgconfig



From fedora-extras-commits at redhat.com  Wed Sep 26 19:48:23 2007
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 26 Sep 2007 15:48:23 -0400
Subject: rpms/cdcollect/F-7 cdcollect.spec,1.1,1.2
Message-ID: <200709261948.l8QJmNdo028787@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/cdcollect/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28755

Modified Files:
	cdcollect.spec 
Log Message:
* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
- set ExcludeArch: ppc64 as Mono doesn't exist there



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-7/cdcollect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdcollect.spec	26 Sep 2007 19:12:27 -0000	1.1
+++ cdcollect.spec	26 Sep 2007 19:47:52 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -11,6 +11,7 @@
 URL:		http://cdcollect.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:	ppc64
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
 
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-4
+- set ExcludeArch: ppc64 as Mono doesn't exist there
+
 * Wed Sep 26 2007 Dan Horak <dan[at]danny.cz> 0.6.0-3
 - fixed URLs
 - removed unneeded BR: pkgconfig



From fedora-extras-commits at redhat.com  Wed Sep 26 19:50:45 2007
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 26 Sep 2007 15:50:45 -0400
Subject: rpms/eclipse/devel eclipse-17vmgenerate16bytecode.patch, NONE,
	1.1 eclipse.spec, 1.488, 1.489
Message-ID: <200709261950.l8QJojj0028903@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-17vmgenerate16bytecode.patch 
Log Message:
Add patch, bump release.

eclipse-17vmgenerate16bytecode.patch:

--- NEW FILE eclipse-17vmgenerate16bytecode.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/core/JavaCore.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
retrieving revision 1.577
diff -u -r1.577 JavaCore.java
--- model/org/eclipse/jdt/core/JavaCore.java	1 Jun 2007 13:52:19 -0000	1.577
+++ model/org/eclipse/jdt/core/JavaCore.java	26 Sep 2007 19:30:44 -0000
@@ -4662,7 +4662,7 @@
 			case ClassFileConstants.MAJOR_VERSION_1_7:
 				options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_7);
 				options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_7);
-				options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_7);
+				options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_6);
 				options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
 				options.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR);
 				options.put(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE, JavaCore.ENABLED);


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- eclipse.spec	26 Sep 2007 19:40:49 -0000	1.488
+++ eclipse.spec	26 Sep 2007 19:50:13 -0000	1.489
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        21%{?dist} 
+Release:        22%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/



From fedora-extras-commits at redhat.com  Wed Sep 26 20:07:04 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 16:07:04 -0400
Subject: rpms/gtk-vnc/devel gtk-vnc-0.2.0-execmem.patch, NONE,
	1.1 gtk-vnc.spec, 1.4, 1.5
Message-ID: <200709262007.l8QK74KV003505@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3472

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.2.0-execmem.patch 
Log Message:
Remove use of PROT_EXEC
Resolves: rhbz #307531

gtk-vnc-0.2.0-execmem.patch:

--- NEW FILE gtk-vnc-0.2.0-execmem.patch ---
diff -rup gtk-vnc-0.2.0.orig/src/coroutine.c gtk-vnc-0.2.0.new/src/coroutine.c
--- gtk-vnc-0.2.0.orig/src/coroutine.c	2007-09-13 17:11:29.000000000 -0400
+++ gtk-vnc-0.2.0.new/src/coroutine.c	2007-09-26 15:48:23.000000000 -0400
@@ -44,8 +44,8 @@ int coroutine_init(struct coroutine *co)
 
 	co->cc.stack_size = co->stack_size;
 	co->cc.stack = mmap(0, co->stack_size,
-			    PROT_READ | PROT_WRITE | PROT_EXEC,
-			    MAP_SHARED | MAP_ANONYMOUS | MAP_GROWSDOWN,
+			    PROT_READ | PROT_WRITE,
+			    MAP_PRIVATE | MAP_ANONYMOUS,
 			    -1, 0);
 	if (co->cc.stack == MAP_FAILED)
 		return -1;


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-vnc.spec	14 Sep 2007 04:30:57 -0000	1.4
+++ gtk-vnc.spec	26 Sep 2007 20:06:31 -0000	1.5
@@ -3,10 +3,11 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-execmem.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
 BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -80,6 +82,9 @@
 %{_libdir}/python*/site-packages/gtkvnc.so
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-2.fc8
+- Remove use of PROT_EXEC for coroutine stack (rhbz #307531 )
+
 * Thu Sep 13 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-1.fc8
 - Update to 0.2.0 release
 



From fedora-extras-commits at redhat.com  Wed Sep 26 20:23:51 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Wed, 26 Sep 2007 16:23:51 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.23, 1.24 pyxf86config.spec,
	1.44, 1.45 sources, 1.23, 1.24
Message-ID: <200709262023.l8QKNppr004240@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/pyxf86config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4212/devel

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
pyxf86config 0.3.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Mar 2007 20:12:21 -0000	1.23
+++ .cvsignore	26 Sep 2007 20:23:18 -0000	1.24
@@ -1 +1 @@
-pyxf86config-0.3.33.tar.bz2
+pyxf86config-0.3.34.tar.bz2


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pyxf86config.spec	21 Aug 2007 18:45:44 -0000	1.44
+++ pyxf86config.spec	26 Sep 2007 20:23:18 -0000	1.45
@@ -1,17 +1,17 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.33
-Release: 2%{?dist}
-URL: http://www.redhat.com/
-Source0: %{name}-%{version}.tar.bz2
-License: GPL
+Version: 0.3.34
+Release: 1%{?dist}
+URL: http://fedoraproject.org/wiki/pyxf86config
+Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
+License: GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: glib2
 BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 BuildRequires: python-devel
-BuildRequires: libxf86config-devel >= 1.1.1-52
+BuildRequires: libxf86config-devel >= 1.3.0.0-26
 
 ExcludeArch: s390 s390x
 
@@ -37,12 +37,17 @@
 
 %files
 %defattr(-,root,root)
-%doc README NEWS AUTHORS COPYING ChangeLog
+%doc README NEWS AUTHORS COPYING
 %{_libdir}/python?.?/site-packages/ixf86configmodule.so
 %{_libdir}/python?.?/site-packages/xf86config.py*
 
 
 %changelog
+* Wed Sep 26 2007 Adam Jackson <ajax at redhat.com> 0.3.34-1
+- pyxf86config 0.3.34
+- License is GPLv2
+- Bump libxf86config-devel buildreq to pick up symbol visibility tweak
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 0.3.33-2
 - Rebuild for build id
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Mar 2007 20:12:21 -0000	1.23
+++ sources	26 Sep 2007 20:23:18 -0000	1.24
@@ -1 +1 @@
-f76373f8b7a60e0f983bed177ee6dc89  pyxf86config-0.3.33.tar.bz2
+9299e5e91f457f036139a1f6c35a8bf2  pyxf86config-0.3.34.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 20:51:45 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 16:51:45 -0400
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.25,
	1.26 libsemanage.spec, 1.133, 1.134
Message-ID: <200709262051.l8QKpjma005144@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5120

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
- Fix genhomedircon code to only generate valid context
- Fixes autorelabel problem


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libsemanage-rhat.patch	6 Sep 2007 02:48:04 -0000	1.25
+++ libsemanage-rhat.patch	26 Sep 2007 20:51:42 -0000	1.26
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.3/include/semanage/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.6/include/semanage/handle.h
 --- nsalibsemanage/include/semanage/handle.h	2007-08-20 19:15:36.000000000 -0400
-+++ libsemanage-2.0.3/include/semanage/handle.h	2007-08-11 06:41:11.000000000 -0400
++++ libsemanage-2.0.6/include/semanage/handle.h	2007-09-26 16:22:02.000000000 -0400
 @@ -69,6 +69,10 @@
   * 1 for yes, 0 for no (default) */
  void semanage_set_create_store(semanage_handle_t * handle, int create_store);
@@ -12,9 +12,9 @@
  /* Set whether or not to disable dontaudits upon commit */
  void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.3/Makefile
+diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.6/Makefile
 --- nsalibsemanage/Makefile	2007-07-16 14:20:39.000000000 -0400
-+++ libsemanage-2.0.3/Makefile	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/Makefile	2007-09-26 16:22:02.000000000 -0400
 @@ -1,6 +1,9 @@
  all: 
  	$(MAKE) -C src all
@@ -25,9 +25,255 @@
  pywrap: 
  	$(MAKE) -C src pywrap
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.3/src/handle.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.6/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2007-07-16 14:20:38.000000000 -0400
++++ libsemanage-2.0.6/src/direct_api.c	2007-09-26 16:22:31.000000000 -0400
+@@ -700,7 +700,7 @@
+ 		goto cleanup;
+ 
+ 	if (sh->do_rebuild || modified) {
+-		retval = semanage_install_sandbox(sh);
++		retval = semanage_install_sandbox(sh, out);
+ 	}
+ 
+       cleanup:
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.6/src/genhomedircon.c
+--- nsalibsemanage/src/genhomedircon.c	2007-09-13 08:21:11.000000000 -0400
++++ libsemanage-2.0.6/src/genhomedircon.c	2007-09-26 16:39:40.000000000 -0400
+@@ -1,5 +1,6 @@
+-/* Author: Mark Goldman   <mgoldman at tresys.com>
+- * 			Paul Rosenfeld	<prosenfeld at tresys.com>
++/* Author: Mark Goldman	  <mgoldman at tresys.com>
++ * 	   Paul Rosenfeld <prosenfeld at tresys.com>
++ * 	   Todd C. Miller <tmiller at tresys.com>
+  *
+  * Copyright (C) 2007 Tresys Technology, LLC
+  *
+@@ -23,6 +24,8 @@
+ #include <semanage/seusers_policy.h>
+ #include <semanage/users_policy.h>
+ #include <semanage/user_record.h>
++#include <sepol/context.h>
++#include <sepol/context_record.h>
+ #include "semanage_store.h"
+ #include "seuser_internal.h"
+ #include "debug.h"
+@@ -80,6 +83,7 @@
+ 	int usepasswd;
+ 	const char *homedir_template_path;
+ 	semanage_handle_t *h_semanage;
++	sepol_policydb_t *policydb;
+ } genhomedircon_settings_t;
+ 
+ typedef struct user_entry {
+@@ -352,9 +356,48 @@
+ 	return retval;
+ }
+ 
+-static int write_home_dir_context(FILE * out, semanage_list_t * tpl,
+-				  const char *user, const char *seuser,
+-				  const char *home, const char *role_prefix)
++static const char * extract_context(Ustr *line)
++{
++	const char whitespace[] = " \t\n";
++	size_t off, len;
++
++	/* check for trailing whitespace */
++	off = ustr_spn_chrs_rev(line, 0, whitespace, strlen(whitespace));
++
++	/* find the length of the last field in line */
++	len = ustr_cspn_chrs_rev(line, off, whitespace, strlen(whitespace));
++
++	if (len == 0)
++		return NULL;
++	return ustr_cstr(line) + ustr_len(line) - (len + off);
++}
++
++static int check_line(genhomedircon_settings_t * s, Ustr *line)
++{
++	sepol_context_t *ctx_record = NULL;
++	const char *ctx_str;
++	int result;
++
++	ctx_str = extract_context(line);
++	if (!ctx_str)
++		return STATUS_ERR;
++
++	result = sepol_context_from_string(s->h_semanage->sepolh,
++					   ctx_str, &ctx_record);
++	if (result == STATUS_SUCCESS && ctx_record != NULL) {
++		sepol_msg_set_callback(s->h_semanage->sepolh, NULL, NULL);
++		result = sepol_context_check(s->h_semanage->sepolh,
++					     s->policydb, ctx_record);
++		sepol_msg_set_callback(s->h_semanage->sepolh, semanage_msg_relay_handler, NULL);		
++		sepol_context_free(ctx_record);
++	}
++	return result;
++}
++
++static int write_home_dir_context(genhomedircon_settings_t * s, FILE * out,
++				  semanage_list_t * tpl, const char *user,
++				  const char *seuser, const char *home,
++				  const char *role_prefix)
+ {
+ 	replacement_pair_t repl[] = {
+ 		{.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
+@@ -369,8 +412,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -380,8 +427,8 @@
+ 	return STATUS_ERR;
+ }
+ 
+-static int write_home_root_context(FILE * out, semanage_list_t * tpl,
+-				   char *homedir)
++static int write_home_root_context(genhomedircon_settings_t * s, FILE * out,
++				   semanage_list_t * tpl, char *homedir)
+ {
+ 	replacement_pair_t repl[] = {
+ 		{.search_for = TEMPLATE_HOME_ROOT,.replace_with = homedir},
+@@ -391,8 +438,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -402,7 +453,8 @@
+ 	return STATUS_ERR;
+ }
+ 
+-static int write_user_context(FILE * out, semanage_list_t * tpl, char *user,
++static int write_user_context(genhomedircon_settings_t * s, FILE * out,
++			      semanage_list_t * tpl, char *user,
+ 			      char *seuser, char *role_prefix)
+ {
+ 	replacement_pair_t repl[] = {
+@@ -415,8 +467,12 @@
+ 
+ 	for (; tpl; tpl = tpl->next) {
+ 		line = replace_all(tpl->data, repl);
+-		if (!line || !ustr_io_putfileline(&line, out))
++		if (!line)
+ 			goto fail;
++		if (check_line(s, line) == STATUS_SUCCESS) {
++			if (!ustr_io_putfileline(&line, out))
++				goto fail;
++		}
+ 		ustr_sc_free(&line);
+ 	}
+ 	return STATUS_SUCCESS;
+@@ -602,7 +658,7 @@
+ 	return head;
+ }
+ 
+-static int write_gen_home_dir_context(FILE * out, genhomedircon_settings_t * s,
++static int write_gen_home_dir_context(genhomedircon_settings_t * s, FILE * out,
+ 				      semanage_list_t * user_context_tpl,
+ 				      semanage_list_t * homedir_context_tpl)
+ {
+@@ -615,13 +671,13 @@
+ 	}
+ 
+ 	for (; users; pop_user_entry(&users)) {
+-		if (write_home_dir_context(out, homedir_context_tpl,
++		if (write_home_dir_context(s, out, homedir_context_tpl,
+ 					   users->name,
+ 					   users->sename, users->home,
+ 					   users->prefix)) {
+ 			return STATUS_ERR;
+ 		}
+-		if (write_user_context(out, user_context_tpl, users->name,
++		if (write_user_context(s, out, user_context_tpl, users->name,
+ 				       users->sename, users->prefix)) {
+ 			return STATUS_ERR;
+ 		}
+@@ -671,7 +727,7 @@
+ 			goto done;
+ 		}
+ 
+-		if (write_home_dir_context(out,
++		if (write_home_dir_context(s, out,
+ 					   homedir_context_tpl, FALLBACK_USER,
+ 					   FALLBACK_USER, ustr_cstr(temp),
+ 					   FALLBACK_USER_PREFIX) !=
+@@ -680,7 +736,7 @@
+ 			retval = STATUS_ERR;
+ 			goto done;
+ 		}
+-		if (write_home_root_context(out,
++		if (write_home_root_context(s, out,
+ 					    homeroot_context_tpl,
+ 					    h->data) != STATUS_SUCCESS) {
+ 			ustr_sc_free(&temp);
+@@ -690,13 +746,13 @@
+ 
+ 		ustr_sc_free(&temp);
+ 	}
+-	if (write_user_context(out, user_context_tpl,
++	if (write_user_context(s, out, user_context_tpl,
+ 			       ".*", FALLBACK_USER,
+ 			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
+ 		retval = STATUS_ERR;
+ 		goto done;
+ 	}
+-	if (write_gen_home_dir_context(out, s, user_context_tpl,
++	if (write_gen_home_dir_context(s, out, user_context_tpl,
+ 				       homedir_context_tpl) != STATUS_SUCCESS) {
+ 		retval = STATUS_ERR;
+ 	}
+@@ -711,7 +767,9 @@
+ 	return retval;
+ }
+ 
+-int semanage_genhomedircon(semanage_handle_t * sh, int usepasswd)
++int semanage_genhomedircon(semanage_handle_t * sh,
++			   sepol_policydb_t * policydb,
++			   int usepasswd)
+ {
+ 	genhomedircon_settings_t s;
+ 	FILE *out = NULL;
+@@ -725,6 +783,7 @@
+ 
+ 	s.usepasswd = usepasswd;
+ 	s.h_semanage = sh;
++	s.policydb = policydb;
+ 
+ 	if (!(out = fopen(s.fcfilepath, "w"))) {
+ 		/* couldn't open output file */
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.6/src/genhomedircon.h
+--- nsalibsemanage/src/genhomedircon.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.6/src/genhomedircon.h	2007-09-26 16:22:31.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ #include "utilities.h"
+ 
+-int semanage_genhomedircon(semanage_handle_t * sh, int usepasswd);
++int semanage_genhomedircon(semanage_handle_t * sh,
++			   sepol_policydb_t * policydb, int usepasswd);
+ 
+ #endif
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.6/src/handle.c
 --- nsalibsemanage/src/handle.c	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.3/src/handle.c	2007-08-11 06:41:31.000000000 -0400
++++ libsemanage-2.0.6/src/handle.c	2007-09-26 16:22:02.000000000 -0400
 @@ -68,6 +68,7 @@
  	/* By default do not create store */
  	sh->create_store = 0;
@@ -52,9 +298,9 @@
  void semanage_set_create_store(semanage_handle_t * sh, int create_store)
  {
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.3/src/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.6/src/handle.h
 --- nsalibsemanage/src/handle.h	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.3/src/handle.h	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/src/handle.h	2007-09-26 16:22:02.000000000 -0400
 @@ -58,6 +58,7 @@
  	int is_connected;
  	int is_in_transaction;
@@ -63,9 +309,9 @@
  	int do_rebuild;		/* whether to rebuild policy if there were no changes */
  	int modules_modified;
  	int create_store;	/* whether to create the store if it does not exist
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.3/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.6/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.3/src/libsemanage.map	2007-08-11 06:40:28.000000000 -0400
++++ libsemanage-2.0.6/src/libsemanage.map	2007-09-26 16:22:02.000000000 -0400
 @@ -9,6 +9,7 @@
  	  semanage_module_list_nth; semanage_module_get_name;
  	  semanage_module_get_version; semanage_select_store;
@@ -74,10 +320,10 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.6/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1130,7 +1120,7 @@
++++ libsemanage-2.0.6/src/semanage_store.c	2007-09-26 16:22:31.000000000 -0400
+@@ -1130,7 +1130,7 @@
  
        skip_reload:
  
@@ -86,3 +332,44 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
+@@ -1257,7 +1257,8 @@
+  * should be placed within a mutex lock to ensure that it runs
+  * atomically.	Returns commit number on success, -1 on error.
+  */
+-int semanage_install_sandbox(semanage_handle_t * sh)
++int semanage_install_sandbox(semanage_handle_t * sh,
++			     sepol_policydb_t * policydb)
+ {
+ 	int retval = -1, commit_num = -1;
+ 
+@@ -1272,7 +1273,7 @@
+ 	}
+ 	if (!sh->conf->disable_genhomedircon) {
+ 		if ((retval =
+-		     semanage_genhomedircon(sh, TRUE)) != 0) {
++		     semanage_genhomedircon(sh, policydb, TRUE)) != 0) {
+ 			ERR(sh, "semanage_genhomedircon returned error code %d.",
+ 			    retval);
+ 			goto cleanup;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.6/src/semanage_store.h
+--- nsalibsemanage/src/semanage_store.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.6/src/semanage_store.h	2007-09-26 16:22:31.000000000 -0400
+@@ -83,8 +83,6 @@
+ int semanage_get_modules_names(semanage_handle_t * sh,
+ 			       char ***filenames, int *len);
+ 
+-int semanage_install_sandbox(semanage_handle_t * sh);
+-
+ /* lock file routines */
+ int semanage_get_trans_lock(semanage_handle_t * sh);
+ int semanage_get_active_lock(semanage_handle_t * sh);
+@@ -102,7 +100,8 @@
+ int semanage_write_policydb(semanage_handle_t * sh,
+ 			    sepol_policydb_t * policydb);
+ 
+-int semanage_install_sandbox(semanage_handle_t * sh);
++int semanage_install_sandbox(semanage_handle_t * sh,
++			     sepol_policydb_t * policydb);
+ 
+ int semanage_verify_modules(semanage_handle_t * sh,
+ 			    char **module_filenames, int num_modules);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- libsemanage.spec	13 Sep 2007 12:29:42 -0000	1.133
+++ libsemanage.spec	26 Sep 2007 20:51:43 -0000	1.134
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
+- Fix genhomedircon code to only generate valid context
+- Fixes autorelabel problem
+
 * Thu Sep 13 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-1
 - Upgrade to latest from NSA
 	* Change to use getpw* function calls to the _r versions from Todd Miller.



From fedora-extras-commits at redhat.com  Wed Sep 26 21:04:14 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 17:04:14 -0400
Subject: rpms/kernel/devel patch-2.6.23-rc8-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.695, 1.696 kernel.spec, 1.189,
	1.190 linux-2.6-highres-timers.patch, 1.12, 1.13 sources, 1.656,
	1.657 upstream, 1.578,
	1.579 linux-2.6-powerpc-FULL_REGS-on-exec.patch, 1.1,
	NONE linux-2.6-wireless.patch, 1.7,
	NONE linux-2.6-x86-disable-local-apic-amd-c1e.patch, 1.2, NONE
Message-ID: <200709262104.l8QL4E7I011781@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11690

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	patch-2.6.23-rc8-git1.bz2.sign 
Removed Files:
	linux-2.6-powerpc-FULL_REGS-on-exec.patch 
	linux-2.6-wireless.patch 
	linux-2.6-x86-disable-local-apic-amd-c1e.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc8-git1



--- NEW FILE patch-2.6.23-rc8-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+q0oyGugalF9Dw4RAmKyAJ48DYCA2LMGCSLzV/kF5Nv53nNQLgCgjU5l
g14NA3U8DJNMxxasrY9YAhg=
=C0xL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- .cvsignore	25 Sep 2007 21:53:32 -0000	1.695
+++ .cvsignore	26 Sep 2007 21:03:40 -0000	1.696
@@ -4,3 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
+patch-2.6.23-rc8-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- kernel.spec	26 Sep 2007 17:43:15 -0000	1.189
+++ kernel.spec	26 Sep 2007 21:03:40 -0000	1.190
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -556,7 +556,6 @@
 %if !%{nopatches}
 
 Patch19: linux-2.6-highres-timers.patch
-Patch20: linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
 Patch22: linux-2.6-utrace-tracehook-ia64.patch
@@ -591,7 +590,6 @@
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-Patch141: linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
@@ -632,7 +630,6 @@
 Patch661: linux-2.6-libata-acpi-enable.patch
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
-Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch690: git-wireless-dev.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
@@ -969,7 +966,6 @@
 
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
-ApplyPatch linux-2.6-x86-disable-local-apic-amd-c1e.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
@@ -1041,8 +1037,6 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 # pegasos IDE
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
-# fix RHBZ#301791
-ApplyPatch linux-2.6-powerpc-FULL_REGS-on-exec.patch
 
 # Exec shield
 ApplyPatch linux-2.6-execshield.patch
@@ -1143,7 +1137,6 @@
 ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
-ApplyPatch linux-2.6-wireless.patch
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
 # Add the wireless stack updates and drivers from wireless-dev
@@ -1812,6 +1805,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc8-git1
+
 * Wed Sep 26 2007 Dave Jones <davej at redhat.com>
 - Switch back to ye olde RTC driver. At least it worked.
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-highres-timers.patch	24 Sep 2007 18:17:29 -0000	1.12
+++ linux-2.6-highres-timers.patch	26 Sep 2007 21:03:40 -0000	1.13
@@ -5930,9 +5930,9 @@
  extern int apic_runs_main_timer;
  extern int ioapic_force;
 -extern int apic_mapped;
+ extern int disable_apic_timer;
  
  /*
-  * Define the default level of output to be very little
 @@ -79,8 +78,6 @@ extern void smp_local_timer_interrupt (v
  extern void setup_boot_APIC_clock (void);
  extern void setup_secondary_APIC_clock (void);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- sources	25 Sep 2007 01:28:29 -0000	1.656
+++ sources	26 Sep 2007 21:03:40 -0000	1.657
@@ -1,2 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2
+22a7616e220e358cee563d6626fe50df  patch-2.6.23-rc8-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- upstream	25 Sep 2007 01:28:29 -0000	1.578
+++ upstream	26 Sep 2007 21:03:40 -0000	1.579
@@ -1,2 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
+patch-2.6.23-rc8-git1.bz2


--- linux-2.6-powerpc-FULL_REGS-on-exec.patch DELETED ---


--- linux-2.6-wireless.patch DELETED ---


--- linux-2.6-x86-disable-local-apic-amd-c1e.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Sep 26 21:07:52 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 26 Sep 2007 17:07:52 -0400
Subject: rpms/tremulous/devel tremulous-1.1.0-syslibs.patch, 1.1,
	1.2 tremulous.spec, 1.3, 1.4
Message-ID: <200709262107.l8QL7q7D011888@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/tremulous/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11864

Modified Files:
	tremulous-1.1.0-syslibs.patch tremulous.spec 
Log Message:
* Wed Sep 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-5
- Update syslibs patch to make the system libjpeg use tremulous' Malloc and
  Free functions, instead of the libc ones


tremulous-1.1.0-syslibs.patch:

Index: tremulous-1.1.0-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous-1.1.0-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tremulous-1.1.0-syslibs.patch	5 Sep 2006 11:34:55 -0000	1.1
+++ tremulous-1.1.0-syslibs.patch	26 Sep 2007 21:07:49 -0000	1.2
@@ -1,164 +1,116 @@
---- tremulous/tremulous-1.1.0-src/Makefile.syslibs	2006-03-21 23:28:25.000000000 +0100
-+++ tremulous/tremulous-1.1.0-src/Makefile	2006-08-25 11:51:03.000000000 +0200
-@@ -97,6 +97,10 @@
- USE_OPENAL=1
- endif
- 
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
+diff -up /dev/null tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h
+--- /dev/null	2007-09-26 21:33:53.271006802 +0200
++++ tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h	2007-09-26 22:46:39.000000000 +0200
+@@ -0,0 +1,5 @@
++#include <stdio.h>
++#include <jpeglib.h>
 +
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -178,7 +182,7 @@
-   endif
-   endif
++void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++  size_t bufsize);
+diff -up tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs tremulous-1.1.0-src/src/renderer/tr_image.c
+--- tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs	2006-01-05 05:00:54.000000000 +0100
++++ tremulous-1.1.0-src/src/renderer/tr_image.c	2007-09-26 22:46:39.000000000 +0200
+@@ -31,9 +31,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
+  * You may also wish to include "jerror.h".
+  */
  
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
++#ifdef USE_SYSTEM_JPEG
++#include <jpeglib.h>
++#include "jpeg_memsrc.h"
++#else
+ #define JPEG_INTERNALS
+ #include "../jpeg-6/jpeglib.h"
+-
++#endif
  
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -191,6 +195,10 @@
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   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 );
+@@ -1399,6 +1403,11 @@ static void LoadJPG( const char *filenam
+   unsigned char *out;
+   byte	*fbuffer;
+   byte  *buf;
++  size_t bufsize;
++#ifdef USE_SYSTEM_JPEG
++  int i,j;
++  byte *inptr, *outptr;
++#endif
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+  endif
-+
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-     GL_CFLAGS =
-@@ -253,6 +261,10 @@
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-   endif
+   /* 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.
+@@ -1406,7 +1415,7 @@ static void LoadJPG( const char *filenam
+    * requires it in order to read binary files.
+    */
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),x86)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -842,41 +854,6 @@
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
--  $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
--  \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
-   $(B)/client/tr_bsp.o \
-@@ -899,7 +876,47 @@
-   $(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
+-  ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
++  bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
+   if (!fbuffer) {
+ 	return;
+   }
+@@ -1424,8 +1433,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() */
+ 
+@@ -1468,7 +1480,7 @@ static void LoadJPG( const char *filenam
+   }
+ 
+   memcount = pixelcount * 4;
+-  row_stride = cinfo.output_width * cinfo.output_components;
++  row_stride = cinfo.output_width * 4;
+ 
+   out = ri.Malloc(memcount);
+ 
+@@ -1489,6 +1501,21 @@ static void LoadJPG( const char *filenam
+ 	buf = ((out+(row_stride*cinfo.output_scanline)));
+ 	buffer = &buf;
+     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
++#ifdef USE_SYSTEM_JPEG
++    /* we have RGB data, we need to expand this out to ARGB */
++    inptr = buf + cinfo.output_width * 3 - 1;
++    outptr = buf + row_stride - 1;
 +
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+  Q3OBJ += \
-+    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
-+    $(B)/client/jccoefct.o  \
-+    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
-+    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
-+    $(B)/client/jcmainct.o \
-+    $(B)/client/jcmarker.o \
-+    $(B)/client/jcmaster.o \
-+    $(B)/client/jcomapi.o \
-+    $(B)/client/jcparam.o \
-+    $(B)/client/jcprepct.o \
-+    $(B)/client/jcsample.o \
-+    $(B)/client/jdapimin.o \
-+    $(B)/client/jdapistd.o \
-+    $(B)/client/jdatasrc.o \
-+    $(B)/client/jdcoefct.o \
-+    $(B)/client/jdcolor.o \
-+    $(B)/client/jddctmgr.o \
-+    $(B)/client/jdhuff.o \
-+    $(B)/client/jdinput.o \
-+    $(B)/client/jdmainct.o \
-+    $(B)/client/jdmarker.o \
-+    $(B)/client/jdmaster.o \
-+    $(B)/client/jdpostct.o \
-+    $(B)/client/jdsample.o \
-+    $(B)/client/jdtrans.o \
-+    $(B)/client/jerror.o \
-+    $(B)/client/jidctflt.o \
-+    $(B)/client/jmemmgr.o \
-+    $(B)/client/jmemnobs.o \
-+    $(B)/client/jutils.o
-+else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
++    for (i = 0; i < cinfo.output_width; i++) {
++      /* endian dependent? maybe for big endian this must be done after the
++         color/pixel copy? */
++      *outptr-- = 255;
++      for (j = 0; j < 3; j++) {
++        JOCTET color = *inptr--;
++        *outptr-- = color;
++      }
++    }
++#endif
+   }
+   
+   buf = out;
+@@ -1608,6 +1635,8 @@ boolean empty_output_buffer (j_compress_
+ }
  
- ifeq ($(ARCH),x86)
-   Q3OBJ += $(B)/client/vm_x86.o
-@@ -1056,6 +1073,7 @@
- $(B)/client/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC)
- $(B)/client/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC)
  
-+ifneq ($(USE_SYSTEM_JPEG),1)
- $(B)/client/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC)
- $(B)/client/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC)
- $(B)/client/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC)
-@@ -1091,6 +1109,7 @@
- $(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC)
- $(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
- $(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC)
-+endif
++#ifndef USE_SYSTEM_JPEG
++
+ /*
+  * Compression initialization.
+  * Before calling this, all parameters and a data destination must be set up.
+@@ -1699,6 +1728,8 @@ jpeg_write_scanlines (j_compress_ptr cin
+   return row_ctr;
+ }
  
- $(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC)  $(GL_CFLAGS)
-@@ -1100,6 +1119,7 @@
- $(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS)
- $(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) $(MINGW_CFLAGS)
-+$(B)/client/jpeg_memsrc.o : $(RDIR)/jpeg_memsrc.c; $(DO_CC)   $(GL_CFLAGS)
- $(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS)
- $(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS)
- $(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS)
---- /dev/null	2006-08-25 12:00:12.687785000 +0200
-+++ tremulous/tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c	2006-08-25 11:51:03.000000000 +0200
++#endif
++
+ /*
+  * Terminate destination --- called by jpeg_finish_compress
+  * after all data has been written.  Usually needs to flush buffer.
+diff -up /dev/null tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c
+--- /dev/null	2007-09-26 21:33:53.271006802 +0200
++++ tremulous-1.1.0-src/src/renderer/jpeg_memsrc.c	2007-09-26 22:46:39.000000000 +0200
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -323,111 +275,205 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
---- /dev/null	2006-08-25 12:00:12.687785000 +0200
-+++ tremulous/tremulous-1.1.0-src/src/renderer/jpeg_memsrc.h	2006-08-25 11:51:03.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+  size_t bufsize);
---- tremulous/tremulous-1.1.0-src/src/renderer/tr_image.c.syslibs	2006-01-05 05:00:54.000000000 +0100
-+++ tremulous/tremulous-1.1.0-src/src/renderer/tr_image.c	2006-08-25 14:31:12.000000000 +0200
-@@ -31,9 +31,13 @@
-  * You may also wish to include "jerror.h".
+diff -up tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c.syslibs tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c
+--- tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c.syslibs	2007-09-26 22:47:34.000000000 +0200
++++ tremulous-1.1.0-src/src/jpeg-6/jmemnobs.c	2007-09-26 22:47:47.000000000 +0200
+@@ -15,10 +15,23 @@
+  * Note that the max_memory_to_use option is ignored by this implementation.
   */
  
 +#ifdef USE_SYSTEM_JPEG
++#include <stdio.h>
++#include <stdlib.h>
 +#include <jpeglib.h>
-+#include "jpeg_memsrc.h"
++
++#undef GLOBAL
++#define GLOBAL
++#define FAR
++
++typedef void * backing_store_ptr;
++
 +#else
  #define JPEG_INTERNALS
- #include "../jpeg-6/jpeglib.h"
--
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"		/* import the system-dependent declarations */
 +#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 );
-@@ -1399,6 +1403,11 @@
-   unsigned char *out;
-   byte	*fbuffer;
-   byte  *buf;
-+  size_t bufsize;
+ #include "../renderer/tr_local.h"
+ 
+@@ -83,7 +96,13 @@ GLOBAL void
+ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+ 			 long total_bytes_needed)
+ {
 +#ifdef USE_SYSTEM_JPEG
-+  int i,j;
-+  byte *inptr, *outptr;
++  fprintf(stderr,
++    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
++  exit(1);
++#else
+   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
 +#endif
+ }
  
-   /* 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.
-@@ -1406,7 +1415,7 @@
-    * 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;
-   }
-@@ -1424,8 +1433,11 @@
-   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
+diff -up tremulous-1.1.0-src/Makefile.syslibs tremulous-1.1.0-src/Makefile
+--- tremulous-1.1.0-src/Makefile.syslibs	2006-03-21 23:28:25.000000000 +0100
++++ tremulous-1.1.0-src/Makefile	2007-09-26 22:50:38.000000000 +0200
+@@ -97,6 +97,10 @@ ifndef USE_OPENAL
+ USE_OPENAL=1
+ endif
  
-   /* Step 3: read file parameters with jpeg_read_header() */
++ifndef USE_SYSTEM_JPEG
++USE_SYSTEM_JPEG=1
++endif
++
+ ifndef USE_OPENAL_DLOPEN
+ USE_OPENAL_DLOPEN=0
+ endif
+@@ -178,7 +182,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
  
-@@ -1468,7 +1480,7 @@
-   }
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = 
  
-   memcount = pixelcount * 4;
--  row_stride = cinfo.output_width * cinfo.output_components;
-+  row_stride = cinfo.output_width * 4;
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -191,6 +195,10 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
  
-   out = ri.Malloc(memcount);
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
++
+   ifeq ($(USE_SDL),1)
+     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+     GL_CFLAGS =
+@@ -253,6 +261,10 @@ ifeq ($(PLATFORM),linux)
+     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+   endif
  
-@@ -1489,6 +1501,21 @@
- 	buf = ((out+(row_stride*cinfo.output_scanline)));
- 	buffer = &buf;
-     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
-+#ifdef USE_SYSTEM_JPEG
-+    /* we have RGB data, we need to expand this out to ARGB */
-+    inptr = buf + cinfo.output_width * 3 - 1;
-+    outptr = buf + row_stride - 1;
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    CLIENT_LDFLAGS += -ljpeg
++  endif
 +
-+    for (i = 0; i < cinfo.output_width; i++) {
-+      /* endian dependent? maybe for big endian this must be done after the
-+         color/pixel copy? */
-+      *outptr-- = 255;
-+      for (j = 0; j < 3; j++) {
-+        JOCTET color = *inptr--;
-+        *outptr-- = color;
-+      }
-+    }
-+#endif
-   }
-   
-   buf = out;
-@@ -1608,6 +1635,8 @@
- }
+   ifeq ($(ARCH),x86)
+     # linux32 make ...
+     BASE_CFLAGS += -m32
+@@ -842,40 +854,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/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+   $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+   \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+@@ -899,7 +878,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
++
++ifneq ($(USE_SYSTEM_JPEG),1)
++  Q3OBJ += \
++    $(B)/client/jcapimin.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
++    $(B)/client/jccoefct.o  \
++    $(B)/client/jccolor.o \
++    $(B)/client/jfdctflt.o \
++    $(B)/client/jcdctmgr.o \
++    $(B)/client/jcphuff.o \
++    $(B)/client/jcmainct.o \
++    $(B)/client/jcmarker.o \
++    $(B)/client/jcmaster.o \
++    $(B)/client/jcomapi.o \
++    $(B)/client/jcparam.o \
++    $(B)/client/jcprepct.o \
++    $(B)/client/jcsample.o \
++    $(B)/client/jdapimin.o \
++    $(B)/client/jdapistd.o \
++    $(B)/client/jdatasrc.o \
++    $(B)/client/jdcoefct.o \
++    $(B)/client/jdcolor.o \
++    $(B)/client/jddctmgr.o \
++    $(B)/client/jdhuff.o \
++    $(B)/client/jdinput.o \
++    $(B)/client/jdmainct.o \
++    $(B)/client/jdmarker.o \
++    $(B)/client/jdmaster.o \
++    $(B)/client/jdpostct.o \
++    $(B)/client/jdsample.o \
++    $(B)/client/jdtrans.o \
++    $(B)/client/jerror.o \
++    $(B)/client/jidctflt.o \
++    $(B)/client/jmemmgr.o \
++    $(B)/client/jutils.o
++else
++Q3OBJ += $(B)/client/jpeg_memsrc.o
++endif
  
+ ifeq ($(ARCH),x86)
+   Q3OBJ += $(B)/client/vm_x86.o
+@@ -1056,6 +1074,7 @@ $(B)/client/l_precomp.o : $(BLIBDIR)/l_p
+ $(B)/client/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC)
+ $(B)/client/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC)
  
-+#ifndef USE_SYSTEM_JPEG
-+
- /*
-  * Compression initialization.
-  * Before calling this, all parameters and a data destination must be set up.
-@@ -1699,6 +1728,8 @@
-   return row_ctr;
- }
++ifneq ($(USE_SYSTEM_JPEG),1)
+ $(B)/client/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC)
+ $(B)/client/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC)
+ $(B)/client/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC)
+@@ -1089,8 +1108,9 @@ $(B)/client/jdtrans.o : $(JPDIR)/jdtrans
+ $(B)/client/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) $(GL_CFLAGS) $(MINGW_CFLAGS)
+ $(B)/client/jidctflt.o : $(JPDIR)/jidctflt.c; $(DO_CC)
+ $(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC)
+-$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
+ $(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC)
++endif
++$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) $(MINGW_CFLAGS)
  
-+#endif
-+
- /*
-  * Terminate destination --- called by jpeg_finish_compress
-  * after all data has been written.  Usually needs to flush buffer.
+ $(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC)  $(GL_CFLAGS)
+@@ -1100,6 +1120,7 @@ $(B)/client/tr_curve.o : $(RDIR)/tr_curv
+ $(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS)
+ $(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) $(MINGW_CFLAGS)
++$(B)/client/jpeg_memsrc.o : $(RDIR)/jpeg_memsrc.c; $(DO_CC)   $(GL_CFLAGS)
+ $(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS)
+ $(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS)
+ $(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS)


Index: tremulous.spec
===================================================================
RCS file: /cvs/extras/rpms/tremulous/devel/tremulous.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tremulous.spec	24 Sep 2007 20:18:58 -0000	1.3
+++ tremulous.spec	26 Sep 2007 21:07:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           tremulous
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
@@ -43,11 +43,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch -p2 -z .syslibs
+%patch -p1 -z .syslibs
 
 # Rip out the jpeg sources and the SDL and freealut headers and use the
 # system versions instead
-rm -rf src/jpeg-6 src/SDL12 src/AL
+mv src/jpeg-6/jmemnobs.c .; rm src/jpeg-6/*; mv jmemnobs.c src/jpeg-6
+rm -r src/SDL12 src/AL
 
 
 %build
@@ -56,7 +57,8 @@
 make %{?_smp_mflags} \
     OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing -ffast-math" \
     DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
-    BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 CROSS_COMPILING=1
+    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
+    CROSS_COMPILING=1
 
 
 %install
@@ -104,6 +106,10 @@
 
 
 %changelog
+* Wed Sep 26 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-5
+- Update syslibs patch to make the system libjpeg use tremulous' Malloc and
+  Free functions, instead of the libc ones
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.0-4
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:35 -0700
Subject: [pkgdb] initscripts: johnp has requested watchbugzilla
Message-ID: <200709262110.l8QLAeXS027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:44 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:44 -0700
Subject: [pkgdb] initscripts: johnp has given up watchbugzilla
Message-ID: <200709262110.l8QLAeXV027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has given up the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:49 -0700
Subject: [pkgdb] initscripts: johnp has requested commit
Message-ID: <200709262110.l8QLAsse027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the commit acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:50 -0700
Subject: [pkgdb] initscripts: johnp has requested approveacls
Message-ID: <200709262110.l8QLAssh027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the approveacls acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:10:59 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:10:59 -0700
Subject: [pkgdb] initscripts: johnp has requested watchcommits
Message-ID: <200709262110.l8QLAssk027811@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchcommits acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:11:00 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:11:00 -0700
Subject: [pkgdb] initscripts: johnp has requested watchbugzilla
Message-ID: <200709262111.l8QLAeXY027768@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:21 -0700
Subject: [pkgdb] initscripts: cscott has requested watchbugzilla
Message-ID: <200709262112.l8QLCQKm027922@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the watchbugzilla acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:27 -0700
Subject: [pkgdb] initscripts: cscott has requested approveacls
Message-ID: <200709262112.l8QLCQKp027922@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the approveacls acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:24 -0700
Subject: [pkgdb] initscripts: cscott has requested watchcommits
Message-ID: <200709262112.l8QLCTrH027923@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the watchcommits acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:12:26 -0700
Subject: [pkgdb] initscripts: cscott has requested commit
Message-ID: <200709262112.l8QLCTrK027923@bastion.fedora.phx.redhat.com>

C. Scott Ananian (cscott) has requested the commit acl on initscripts (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Wed Sep 26 21:12:38 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Wed, 26 Sep 2007 17:12:38 -0400
Subject: rpms/xmoto/FC-6 xmoto-GameInit1685.patch, NONE,
	1.1 xmoto-GameInit1720.patch, NONE, 1.1 xmoto.spec, 1.13, 1.14
Message-ID: <200709262112.l8QLCcLo012151@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12043

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-GameInit1685.patch xmoto-GameInit1720.patch 
Log Message:
Patches from upstream to correct BZ 295981.


xmoto-GameInit1685.patch:

--- NEW FILE xmoto-GameInit1685.patch ---
--- src/GameInit.cpp	(revision 1684)
+++ src/GameInit.cpp	(revision 1685)
@@ -513,6 +513,7 @@
       m_pCursor = NULL;
 
       /* Fetch highscores from web? */
+      m_pWebRooms = new WebRooms(&m_ProxySettings);
       m_pWebHighscores = new WebRoom(&m_ProxySettings);      
       m_pWebHighscores->setWebsiteInfos(m_WebHighscoresIdRoom,
 					m_WebHighscoresURL);

xmoto-GameInit1720.patch:

--- NEW FILE xmoto-GameInit1720.patch ---
--- src/GameInit.cpp	(revision 1719)
+++ src/GameInit.cpp	(revision 1720)
@@ -610,6 +610,9 @@
       }
     }
 
+    /* build handler */
+    m_InputHandler.init(&m_Config); // must be initialized before call to drawFrame
+
     /* final initialisation */
     Logger::Log("UserPreInit ended at %.3f", GameApp::getXMTime());
     /* display what must be displayed */
@@ -630,9 +633,6 @@
     
     /* load levels lists */
     _UpdateLevelsLists();
-    
-    /* build handler */
-    m_InputHandler.init(&m_Config);
 
     /* load cursor */
     pSprite = m_theme.getSprite(SPRITE_TYPE_UI, "Cursor");


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmoto.spec	30 Aug 2007 11:16:14 -0000	1.13
+++ xmoto.spec	26 Sep 2007 21:12:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -10,6 +10,9 @@
 Source1:	xmoto.desktop
 Source2:	xmoto.png
 Patch0:		xmoto-man.patch
+Patch1:		xmoto-GameInit1685.patch
+Patch2:		xmoto-GameInit1720.patch
+#patches 1 and 2 should be fixed in 0.3.4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -37,6 +40,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
 sed -i 's/\r//' src/xmscene/Camera.h
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-2
+- Patches from upstream to correct BZ 295981.
+
 * Wed Aug 29 2007 Jon Ciesla <limb at jcomserv.net> 0.3.3-1
 - Bumped to upstream.
 - Fixed URL.



From fedora-extras-commits at redhat.com  Wed Sep 26 21:13:49 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:13:49 -0400
Subject: rpms/bzr/devel .cvsignore, 1.16, 1.17 bzr.spec, 1.23, 1.24 sources, 
	1.16, 1.17
Message-ID: <200709262113.l8QLDnK0012232@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12201

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 10:17:01 -0000	1.16
+++ .cvsignore	26 Sep 2007 21:13:16 -0000	1.17
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bzr.spec	30 Aug 2007 22:56:29 -0000	1.23
+++ bzr.spec	26 Sep 2007 21:13:17 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 10:17:01 -0000	1.16
+++ sources	26 Sep 2007 21:13:17 -0000	1.17
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:14:50 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:14:50 -0400
Subject: rpms/bzrtools/devel .cvsignore, 1.13, 1.14 bzrtools.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <200709262114.l8QLEojg012260@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12238

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2007 10:17:16 -0000	1.13
+++ .cvsignore	26 Sep 2007 21:14:16 -0000	1.14
@@ -1 +1 @@
-bzrtools-0.90.0.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bzrtools.spec	30 Aug 2007 22:47:24 -0000	1.21
+++ bzrtools.spec	26 Sep 2007 21:14:16 -0000	1.22
@@ -5,12 +5,12 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 0.90
-%define bzrnextver 0.91
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -72,6 +72,9 @@
 %{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
 * Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
 - Move plugin manually since setuptools has no way of knowing that bzr is
   arch specific.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2007 10:17:16 -0000	1.13
+++ sources	26 Sep 2007 21:14:16 -0000	1.14
@@ -1 +1 @@
-da7e97a4fd02a6b95cabfe5e187687ca  bzrtools-0.90.0.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:25:37 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:25:37 -0400
Subject: rpms/bzr-gtk/devel .cvsignore, 1.10, 1.11 bzr-gtk.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200709262125.l8QLPbUh012736@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Aug 2007 10:17:22 -0000	1.10
+++ .cvsignore	26 Sep 2007 21:25:04 -0000	1.11
@@ -1 +1 @@
-bzr-gtk-0.90.0.tar.gz
+bzr-gtk-0.91.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bzr-gtk.spec	30 Aug 2007 10:17:22 -0000	1.11
+++ bzr-gtk.spec	26 Sep 2007 21:25:04 -0000	1.12
@@ -1,14 +1,20 @@
+%{!?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)")}
 
+
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
 Name:           bzr-gtk
-Version:        0.90.0
+Version:        0.91.0
 Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
-Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0:        https://launchpad.net/bzr-gtk/0.91/%{version}/+download/bzr-gtk-%{version}.tar.gz
 # We can't use the notifier functionality without a bzr-dbus-package.
 Patch0:         bzr-gtk-disable-notifier.patch
 # Fix some bugs in the nautilus integration.  Submitted upstream
@@ -66,9 +72,20 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+fi
+
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
 mv $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
 
+# No translations yet
+#%find_lang olive
+
+# This won't do anything until after we add bzr-dbus.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,19 +94,28 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{python_sitearch}/bzrlib/plugins/gtk/
+%{_datadir}/applications/bazaar-properties.desktop
 
+#%files -n olive -f olive.lang
 %files -n olive
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{python_sitearch}/olive
+%{python_sitearch}/olive/
 %{_datadir}/olive/
 %{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/olive-gtk.desktop
 
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move the plugins manually as distutils doesn't know that bzr is arch
+  specific.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
 - Update to 0.90.0.
 - Update license tag to the new Licensing Guidelines.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Aug 2007 10:17:22 -0000	1.10
+++ sources	26 Sep 2007 21:25:04 -0000	1.11
@@ -1 +1 @@
-2fd76f9e3d9d8f56f1bb112cb0277634  bzr-gtk-0.90.0.tar.gz
+3b5d9c517494988a83d7ccaae8a18e2f  bzr-gtk-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 21:26:18 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 17:26:18 -0400
Subject: rpms/kernel/devel linux-2.6-highres-timers.patch,1.13,1.14
Message-ID: <200709262126.l8QLQIWY012896@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811

Modified Files:
	linux-2.6-highres-timers.patch 
Log Message:
fix build


linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-highres-timers.patch	26 Sep 2007 21:03:40 -0000	1.13
+++ linux-2.6-highres-timers.patch	26 Sep 2007 21:26:15 -0000	1.14
@@ -5309,7 +5309,7 @@
 -int disable_apic_timer __initdata;
 +static int apic_mapped;
 +static int apic_calibrate_pmtmr __initdata;
-+static int disable_apic_timer __initdata;
++int disable_apic_timer __initdata;
  
  /* Local APIC timer works in C2? */
  int local_apic_timer_c2_ok;



From fedora-extras-commits at redhat.com  Wed Sep 26 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:29:34 -0700
Subject: [pkgdb] vinagre: berrange has requested watchbugzilla
Message-ID: <200709262129.l8QLTd1S028580@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchbugzilla acl on vinagre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:29:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:29:36 -0700
Subject: [pkgdb] vinagre: berrange has requested watchcommits
Message-ID: <200709262129.l8QLTfZ0028581@bastion.fedora.phx.redhat.com>

Daniel P. Berrange (berrange) has requested the watchcommits acl on vinagre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:53 2007
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 26 Sep 2007 17:34:53 -0400
Subject: rpms/echo-icon-theme/F-7 .cvsignore, 1.7, 1.8 echo-icon-theme.spec, 
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200709262134.l8QLYrOS013330@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/echo-icon-theme/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13296

Modified Files:
	.cvsignore echo-icon-theme.spec sources 
Log Message:
updated license to cc-by-sa 3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Apr 2007 01:22:29 -0000	1.7
+++ .cvsignore	26 Sep 2007 21:34:21 -0000	1.8
@@ -1 +1 @@
-echo-icon-theme-0.2-20070419wiki.tar.bz2
+echo-icon-theme-0.2-20070427wiki.tar.bz2


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/echo-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- echo-icon-theme.spec	20 Apr 2007 01:22:29 -0000	1.9
+++ echo-icon-theme.spec	26 Sep 2007 21:34:21 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           echo-icon-theme
 Version:        0.2
-Release:        2.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.5.20070427wiki
+- Updated license to cc-by-sa 3.0
+
 * Thu Apr 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.2.20070419wiki
 - Drop scalable images again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Apr 2007 01:22:29 -0000	1.8
+++ sources	26 Sep 2007 21:34:21 -0000	1.9
@@ -1 +1 @@
-2bb2b93f0dda729eb1720eab7df04def  echo-icon-theme-0.2-20070419wiki.tar.bz2
+13cb964663615bc106ea89b4a7b9cf4c  echo-icon-theme-0.2-20070427wiki.tar.bz2



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:34:55 -0700
Subject: [pkgdb] vinagre had acl change status
Message-ID: <200709262135.l8QLZ05p028798@bastion.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchbugzilla acl on vinagre (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:34:56 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 14:34:56 -0700
Subject: [pkgdb] vinagre had acl change status
Message-ID: <200709262135.l8QLZ05s028798@bastion.fedora.phx.redhat.com>

Bastien Nocera (hadess) has set the watchcommits acl on vinagre (Fedora devel) to Approved for Daniel P. Berrange (berrange)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vinagre



From fedora-extras-commits at redhat.com  Wed Sep 26 21:41:17 2007
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 26 Sep 2007 17:41:17 -0400
Subject: rpms/echo-icon-theme/devel echo-icon-theme.spec,1.11,1.12
Message-ID: <200709262141.l8QLfHC8013639@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/echo-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13617

Modified Files:
	echo-icon-theme.spec 
Log Message:
updated license to cc-by-sa 3.0


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- echo-icon-theme.spec	4 Jun 2007 20:41:50 -0000	1.11
+++ echo-icon-theme.spec	26 Sep 2007 21:40:44 -0000	1.12
@@ -2,11 +2,11 @@
 
 Name:           echo-icon-theme
 Version:        0.2
-Release:        4.%{alphatag}%{?dist}
+Release:        5.%{alphatag}%{?dist}
 Summary:        Echo icon theme
 
 Group:          User Interface/Desktops
-License:        Creative Commons Attribution-ShareAlike 2.5
+License:        Creative Commons Attribution-ShareAlike 3.0
 URL:            http://fedoraproject.org/wiki/Artwork/EchoDevelopment
 Source0:        %{name}-%{version}-%{alphatag}.tar.bz2
 Patch0:		contexts.patch
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.5.20070427wiki
+- Updated license to cc-by-sa 3.0
+
 * Mon Jun 04 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.2.4.20070427wiki
 - New snapshot
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:53:04 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 17:53:04 -0400
Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.12,1.13
Message-ID: <200709262153.l8QLr4O3014278@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207

Modified Files:
	bzr-gtk.spec 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
- Olive must be moved to an arch specific directory as well for now.
  If rpm could have noarch subpackages, this would be fine to leave in
  python_sitelib.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bzr-gtk.spec	26 Sep 2007 21:25:04 -0000	1.12
+++ bzr-gtk.spec	26 Sep 2007 21:52:31 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.91.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -75,6 +75,7 @@
 if test "%{python_sitelib}" != "%{python_sitearch}" ; then
     install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
     mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+    mv $RPM_BUILD_ROOT%{python_sitelib}/olive $RPM_BUILD_ROOT%{python_sitearch}
 fi
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
@@ -109,6 +110,11 @@
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
+- Olive must be moved to an arch specific directory as well for now.
+  If rpm could have noarch subpackages, this would be fine to leave in
+  python_sitelib.
+
 * Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
 - Update to 0.91.0.
 



From fedora-extras-commits at redhat.com  Wed Sep 26 21:58:26 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Wed, 26 Sep 2007 17:58:26 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.7,1.8
In-Reply-To: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>
References: <200709252037.l8PKb1CH032712@cvs-int.fedora.redhat.com>
Message-ID: <46FAD602.5010305@redhat.com>

Lillian Angel wrote:
> Author: langel
> 
> Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32683
> 
> Modified Files:
> 	java-1.7.0-icedtea.spec 
> Log Message:
> * Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
> - Fixed running of Xvfb so it does not terminate after a successful test.
> - Fixed mauve and jtreg test runs to not break the build when an error is thrown
> 
> 
> 
> 
> 
> Index: java-1.7.0-icedtea.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
> +++ java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
> @@ -300,16 +300,20 @@
>    ./configure 
>    make
>    echo ====================MAUVE TESTING========================
> -  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
> +  %{expand: 

What's "%{expand:" ?

Tom



From fedora-extras-commits at redhat.com  Wed Sep 26 22:01:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 18:01:31 -0400
Subject: rpms/selinux-policy/devel policy-20070703.patch, 1.76,
	1.77 selinux-policy.spec, 1.535, 1.536
Message-ID: <200709262201.l8QM1VK1021811@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21782

Modified Files:
	policy-20070703.patch selinux-policy.spec 
Log Message:
* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-14
- Allow xdm to talk to input device (fingerprint reader)
- Allow octave to run as java


policy-20070703.patch:

Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- policy-20070703.patch	25 Sep 2007 15:03:25 -0000	1.76
+++ policy-20070703.patch	26 Sep 2007 22:01:27 -0000	1.77
@@ -314,7 +314,7 @@
 +/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-3.0.8/policy/modules/admin/alsa.if
 --- nsaserefpolicy/policy/modules/admin/alsa.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-22 06:43:02.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/admin/alsa.if	2007-09-25 15:03:17.000000000 -0400
 @@ -74,3 +74,39 @@
  	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
  	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
@@ -1508,7 +1508,7 @@
  application_executable_file(gconfd_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.8/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-20 18:08:22.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/apps/java.fc	2007-09-25 17:13:09.000000000 -0400
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1528,7 +1528,7 @@
 +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
 +/usr/lib(64)?/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0)
-+
++/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
 +++ serefpolicy-3.0.8/policy/modules/apps/java.if	2007-09-20 18:26:14.000000000 -0400
@@ -2565,7 +2565,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.8/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/kernel/domain.if	2007-09-25 12:10:32.000000000 -0400
 @@ -45,6 +45,11 @@
  	# start with basic domain
  	domain_base_type($1)
@@ -5117,7 +5117,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.8/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-24 14:34:13.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/cups.te	2007-09-25 15:01:58.000000000 -0400
 @@ -48,9 +48,7 @@
  type hplip_t;
  type hplip_exec_t;
@@ -5280,15 +5280,7 @@
  	seutil_sigchld_newrole(cupsd_t)
  ')
  
-@@ -331,6 +355,7 @@
- dev_read_sysfs(cupsd_config_t)
- dev_read_urand(cupsd_config_t)
- dev_read_rand(cupsd_config_t)
-+dev_rw_generic_usb_dev(cupsd_config_t)
- 
- fs_getattr_all_fs(cupsd_config_t)
- fs_search_auto_mountpoints(cupsd_config_t)
-@@ -377,6 +402,14 @@
+@@ -377,6 +401,14 @@
  ')
  
  optional_policy(`
@@ -5303,19 +5295,22 @@
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -526,11 +559,6 @@
+@@ -525,11 +557,9 @@
+ allow hplip_t cupsd_etc_t:dir search;
  
  cups_stream_connect(hplip_t)
- 
+-
 -allow hplip_t hplip_etc_t:dir list_dir_perms;
 -read_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
 -read_lnk_files_pattern(hplip_t,hplip_etc_t,hplip_etc_t)
 -files_search_etc(hplip_t)
--
++# For CUPS to run as a backend
++allow cupsd_t hplip_t:process signal;
++allow hplip_t cupsd_t:unix_stream_socket connected_stream_socket_perms;
+ 
  manage_files_pattern(hplip_t,hplip_var_run_t,hplip_var_run_t)
  files_pid_filetrans(hplip_t,hplip_var_run_t,file)
- 
-@@ -560,7 +588,7 @@
+@@ -560,7 +590,7 @@
  dev_read_urand(hplip_t)
  dev_read_rand(hplip_t)
  dev_rw_generic_usb_dev(hplip_t)
@@ -5324,7 +5319,7 @@
  
  fs_getattr_all_fs(hplip_t)
  fs_search_auto_mountpoints(hplip_t)
-@@ -587,8 +615,6 @@
+@@ -587,8 +617,6 @@
  userdom_dontaudit_search_sysadm_home_dirs(hplip_t)
  userdom_dontaudit_search_all_users_home_content(hplip_t)
  
@@ -6465,7 +6460,7 @@
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.8/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 11:00:13.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/kerberos.if	2007-09-25 13:08:41.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -6477,7 +6472,7 @@
  
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
-@@ -172,3 +176,47 @@
+@@ -172,3 +176,51 @@
  	allow $1 krb5kdc_conf_t:file read_file_perms;
  
  ')
@@ -6498,11 +6493,15 @@
 +		type krb5_host_rcache_t;
 +	')
 +
-+	files_search_tmp($1)
-+	allow $1 self:process setfscreate;
-+	selinux_validate_context($1)
-+	seutil_read_file_contexts($1)
-+	allow $1 krb5_host_rcache_t:file manage_file_perms;
++	tunable_policy(`allow_kerberos',`
++		files_search_tmp($1)
++		allow $1 self:process setfscreate;
++		selinux_validate_context($1)
++		seutil_read_file_contexts($1)
++		allow $1 krb5_host_rcache_t:file manage_file_perms;
++	')
++	# creates files as system_u no matter what the selinux user
++	domain_obj_id_change_exemption($1)
 +')
 +
 +########################################
@@ -7649,7 +7648,7 @@
  /usr/lib/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.0.8/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/postfix.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/postfix.if	2007-09-26 10:26:56.000000000 -0400
 @@ -41,6 +41,8 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -7659,7 +7658,16 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
  	read_files_pattern(postfix_$1_t,postfix_etc_t,postfix_etc_t)
-@@ -66,6 +68,7 @@
+@@ -56,6 +58,8 @@
+ 	allow postfix_$1_t postfix_var_run_t:file manage_file_perms;
+ 	files_pid_filetrans(postfix_$1_t,postfix_var_run_t,file)
+ 
++	auth_use_nsswitch(postfix_$1_t)
++
+ 	kernel_read_system_state(postfix_$1_t)
+ 	kernel_read_network_state(postfix_$1_t)
+ 	kernel_read_all_sysctls(postfix_$1_t)
+@@ -66,6 +70,7 @@
  
  	fs_search_auto_mountpoints(postfix_$1_t)
  	fs_getattr_xattr_fs(postfix_$1_t)
@@ -7667,19 +7675,19 @@
  
  	term_dontaudit_use_console(postfix_$1_t)
  
-@@ -132,10 +135,8 @@
+@@ -132,11 +137,6 @@
  	corenet_tcp_connect_all_ports(postfix_$1_t)
  	corenet_sendrecv_all_client_packets(postfix_$1_t)
  
 -	sysnet_read_config(postfix_$1_t)
 -
- 	optional_policy(`
+-	optional_policy(`
 -		nis_use_ypbind(postfix_$1_t)
-+		auth_use_nsswitch(postfix_$1_t)
- 	')
+-	')
  ')
  
-@@ -269,6 +270,42 @@
+ ########################################
+@@ -269,6 +269,42 @@
  
  ########################################
  ## <summary>
@@ -7722,7 +7730,7 @@
  ##	Do not audit attempts to use
  ##	postfix master process file
  ##	file descriptors.
-@@ -434,6 +471,25 @@
+@@ -434,6 +470,25 @@
  
  ########################################
  ## <summary>
@@ -7748,7 +7756,7 @@
  ##	Execute postfix user mail programs
  ##	in their respective domains.
  ## </summary>
-@@ -450,3 +506,22 @@
+@@ -450,3 +505,22 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -7773,7 +7781,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.0.8/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/postfix.te	2007-09-25 10:06:53.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/postfix.te	2007-09-26 10:27:53.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -7813,37 +7821,32 @@
  ########################################
  #
  # Postfix master process local policy
-@@ -168,6 +186,11 @@
+@@ -164,10 +182,9 @@
+ # postfix does a "find" on startup for some reason - keep it quiet
+ seutil_dontaudit_search_config(postfix_master_t)
  
+-sysnet_read_config(postfix_master_t)
+-
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
 +term_dontaudit_search_ptys(postfix_master_t)
-+
-+optional_policy(`
-+	auth_use_nsswitch(postfix_master_t)
-+')
  
  optional_policy(`
  	cyrus_stream_connect(postfix_master_t)
-@@ -179,9 +202,17 @@
+@@ -179,7 +196,11 @@
  ')
  
  optional_policy(`
+-	nis_use_ypbind(postfix_master_t)
 +	mysql_stream_connect(postfix_master_t)
 +')
 +
 +optional_policy(`
- 	nis_use_ypbind(postfix_master_t)
++	sendmail_signal(postfix_master_t)
  ')
  
-+optional_policy(`
-+	sendmail_signal(postfix_master_t)
-+')
-+
  ###########################################################
- #
- # Partially converted rules.  THESE ARE ONLY TEMPORARY
-@@ -263,6 +294,8 @@
+@@ -263,6 +284,8 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -7852,7 +7855,16 @@
  mta_read_aliases(postfix_local_t)
  mta_delete_spool(postfix_local_t)
  # For reading spamassasin
-@@ -377,7 +410,7 @@
+@@ -336,8 +359,6 @@
+ 
+ seutil_read_config(postfix_map_t)
+ 
+-sysnet_read_config(postfix_map_t)
+-
+ tunable_policy(`read_default_t',`
+ 	files_list_default(postfix_map_t)
+ 	files_read_default_files(postfix_map_t)
+@@ -377,7 +398,7 @@
  # Postfix pipe local policy
  #
  
@@ -7861,7 +7873,7 @@
  
  write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
  
-@@ -386,6 +419,10 @@
+@@ -386,6 +407,10 @@
  rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
  
  optional_policy(`
@@ -7872,7 +7884,15 @@
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -426,6 +463,11 @@
+@@ -418,14 +443,17 @@
+ term_dontaudit_use_all_user_ptys(postfix_postdrop_t)
+ term_dontaudit_use_all_user_ttys(postfix_postdrop_t)
+ 
+-sysnet_dns_name_resolve(postfix_postdrop_t)
+-
+ mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
+ 
+ optional_policy(`
  	cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
  ')
  
@@ -7884,7 +7904,23 @@
  optional_policy(`
  	ppp_use_fds(postfix_postqueue_t)
  	ppp_sigchld(postfix_postqueue_t)
-@@ -505,8 +547,6 @@
+@@ -454,8 +482,6 @@
+ init_sigchld_script(postfix_postqueue_t)
+ init_use_script_fds(postfix_postqueue_t)
+ 
+-sysnet_dontaudit_read_config(postfix_postqueue_t)
+-
+ ########################################
+ #
+ # Postfix qmgr local policy
+@@ -498,15 +524,11 @@
+ term_use_all_user_ptys(postfix_showq_t)
+ term_use_all_user_ttys(postfix_showq_t)
+ 
+-sysnet_dns_name_resolve(postfix_showq_t)
+-
+ ########################################
+ #
  # Postfix smtp delivery local policy
  #
  
@@ -7893,7 +7929,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -514,6 +554,8 @@
+@@ -514,6 +536,8 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -7902,7 +7938,7 @@
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
  ')
-@@ -538,9 +580,45 @@
+@@ -538,9 +562,45 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -8265,8 +8301,17 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.8/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-22 07:43:42.000000000 -0400
-@@ -64,9 +64,10 @@
++++ serefpolicy-3.0.8/policy/modules/services/rlogin.te	2007-09-25 11:50:50.000000000 -0400
+@@ -36,6 +36,8 @@
+ allow rlogind_t rlogind_devpts_t:chr_file { rw_chr_file_perms setattr };
+ term_create_pty(rlogind_t,rlogind_devpts_t)
+ 
++domain_interactive_fd(rlogind_t)
++
+ # for /usr/lib/telnetlogin
+ can_exec(rlogind_t, rlogind_exec_t)
+ 
+@@ -64,9 +66,10 @@
  fs_getattr_xattr_fs(rlogind_t)
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -8278,7 +8323,7 @@
  
  files_read_etc_files(rlogind_t)
  files_read_etc_runtime_files(rlogind_t)
-@@ -82,21 +83,17 @@
+@@ -82,21 +85,17 @@
  
  miscfiles_read_localization(rlogind_t)
  
@@ -8702,7 +8747,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.8/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/samba.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/samba.te	2007-09-25 17:09:36.000000000 -0400
 @@ -137,6 +137,11 @@
  type winbind_var_run_t;
  files_pid_file(winbind_var_run_t)
@@ -9302,7 +9347,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-09-12 10:34:50.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te	2007-09-26 11:12:03.000000000 -0400
 @@ -67,6 +67,7 @@
  corenet_sendrecv_smtp_client_packets(setroubleshootd_t)
  
@@ -9618,7 +9663,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.8/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/ssh.if	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/ssh.if	2007-09-25 12:18:11.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -9743,8 +9788,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.0.8/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-22 07:45:00.000000000 -0400
-@@ -32,7 +32,6 @@
++++ serefpolicy-3.0.8/policy/modules/services/telnet.te	2007-09-25 11:50:42.000000000 -0400
+@@ -32,12 +32,13 @@
  allow telnetd_t self:udp_socket create_socket_perms;
  # for identd; cjp: this should probably only be inetd_child rules?
  allow telnetd_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
@@ -9752,7 +9797,14 @@
  allow telnetd_t self:capability { setuid setgid };
  
  allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr };
-@@ -62,10 +61,12 @@
+ term_create_pty(telnetd_t,telnetd_devpts_t)
+ 
++domain_interactive_fd(telnetd_t)
++
+ manage_dirs_pattern(telnetd_t,telnetd_tmp_t,telnetd_tmp_t)
+ manage_files_pattern(telnetd_t,telnetd_tmp_t,telnetd_tmp_t)
+ files_tmp_filetrans(telnetd_t, telnetd_tmp_t, { file dir })
+@@ -62,10 +63,12 @@
  
  fs_getattr_xattr_fs(telnetd_t)
  
@@ -9765,7 +9817,7 @@
  files_read_etc_files(telnetd_t)
  files_read_etc_runtime_files(telnetd_t)
  # for identd; cjp: this should probably only be inetd_child rules?
-@@ -80,27 +81,26 @@
+@@ -80,27 +83,26 @@
  
  miscfiles_read_localization(telnetd_t)
  
@@ -10272,7 +10324,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-21 19:21:31.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/services/xserver.te	2007-09-26 09:40:50.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -10317,7 +10369,15 @@
  corenet_tcp_connect_all_ports(xdm_t)
  corenet_sendrecv_all_client_packets(xdm_t)
  # xdm tries to bind to biff_port_t
-@@ -246,6 +259,7 @@
+@@ -197,6 +210,7 @@
+ dev_getattr_mouse_dev(xdm_t)
+ dev_setattr_mouse_dev(xdm_t)
+ dev_rw_apm_bios(xdm_t)
++dev_rw_input_dev(xdm_t)
+ dev_setattr_apm_bios_dev(xdm_t)
+ dev_rw_dri(xdm_t)
+ dev_rw_agp(xdm_t)
+@@ -246,6 +260,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -10325,7 +10385,7 @@
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -257,6 +271,7 @@
+@@ -257,6 +272,7 @@
  libs_exec_lib_files(xdm_t)
  
  logging_read_generic_logs(xdm_t)
@@ -10333,7 +10393,7 @@
  
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
-@@ -268,9 +283,14 @@
+@@ -268,9 +284,14 @@
  userdom_create_all_users_keys(xdm_t)
  # for .dmrc
  userdom_read_unpriv_users_home_content_files(xdm_t)
@@ -10348,7 +10408,7 @@
  
  xserver_rw_session_template(xdm,xdm_t,xdm_tmpfs_t)
  
-@@ -306,6 +326,11 @@
+@@ -306,6 +327,11 @@
  
  optional_policy(`
  	consolekit_dbus_chat(xdm_t)
@@ -10360,7 +10420,7 @@
  ')
  
  optional_policy(`
-@@ -348,12 +373,8 @@
+@@ -348,12 +374,8 @@
  ')
  
  optional_policy(`
@@ -10374,7 +10434,7 @@
  
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
-@@ -385,7 +406,7 @@
+@@ -385,7 +407,7 @@
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
@@ -10383,7 +10443,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t)
-@@ -425,6 +446,10 @@
+@@ -425,6 +447,10 @@
  ')
  
  optional_policy(`
@@ -10394,7 +10454,7 @@
  	resmgr_stream_connect(xdm_t)
  ')
  
-@@ -434,47 +459,20 @@
+@@ -434,47 +460,20 @@
  ')
  
  optional_policy(`
@@ -13472,12 +13532,13 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.8/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-09-12 10:34:51.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-22 06:43:22.000000000 -0400
-@@ -184,6 +184,10 @@
++++ serefpolicy-3.0.8/policy/modules/system/udev.te	2007-09-25 15:03:25.000000000 -0400
+@@ -184,6 +184,11 @@
  ')
  
  optional_policy(`
 +	alsa_search_lib(udev_t)
++	alsa_read_lib(udev_t)
 +')
 +
 +optional_policy(`
@@ -15559,7 +15620,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.8/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.8/policy/modules/system/xen.te	2007-09-17 16:20:18.000000000 -0400
++++ serefpolicy-3.0.8/policy/modules/system/xen.te	2007-09-25 15:21:46.000000000 -0400
 @@ -45,9 +45,7 @@
  
  type xenstored_t;
@@ -15679,15 +15740,24 @@
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -353,6 +355,7 @@
+@@ -351,8 +353,11 @@
+ 
+ storage_raw_read_fixed_disk(xm_t)
  
++fs_getattr_all_fs(xm_t)
++
  term_use_all_terms(xm_t)
  
 +init_stream_connect_script(xm_t)
  init_rw_script_stream_sockets(xm_t)
  init_use_fds(xm_t)
  
-@@ -366,3 +369,14 @@
+@@ -363,6 +368,19 @@
+ 
+ sysnet_read_config(xm_t)
+ 
++userdom_dontaudit_search_sysadm_home_dirs(xm_t)
++
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- selinux-policy.spec	25 Sep 2007 14:20:38 -0000	1.535
+++ selinux-policy.spec	26 Sep 2007 22:01:27 -0000	1.536
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.8
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -365,6 +365,10 @@
 %endif
 
 %changelog
+* Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-14
+- Allow xdm to talk to input device (fingerprint reader)
+- Allow octave to run as java
+
 * Tue Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.8-13
 - Allow login programs to set ioctl on /proc
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:08:41 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:08:41 -0400
Subject: rpms/setroubleshoot/F-7 .cvsignore, 1.73, 1.74 setroubleshoot.init, 
	1.9, 1.10 setroubleshoot.spec, 1.88, 1.89 sources, 1.84, 1.85
Message-ID: <200709262208.l8QM8f5Q022728@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22641/F-7

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
update to latest upstream, fix requires for selinux-policy



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Aug 2007 19:36:55 -0000	1.73
+++ .cvsignore	26 Sep 2007 22:08:09 -0000	1.74
@@ -1 +1 @@
-setroubleshoot-1.10.1.tar.gz
+setroubleshoot-1.10.6.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setroubleshoot.init	15 Sep 2006 20:52:45 -0000	1.9
+++ setroubleshoot.init	26 Sep 2007 22:08:09 -0000	1.10
@@ -9,22 +9,49 @@
 # config: /etc/setroubleshoot/setroubleshoot.cfg
 # pidfile: /var/run/setroubleshoot.pid
 #
+
+### BEGIN INIT INFO
+# Provides: lsb-setroubleshootd
+# Required-Start: $local_fs $syslog $network $named
+# Required-Stop: $local_fs $syslog $network $named
+# Default-Start:  3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop SELinux Troubleshooting Daemon
+# Description: controls operation of the SELinux Troubleshooting Daemon
+#	(setroubleshootd) which listens for SELinux AVC denial messages
+#	analyzes it and provides a friendly interpretation.
+### END INIT INFO
+
 # Return values according to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - insufficient privilege
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
+# 0	success
+# 1	generic or unspecified error (current practice)
+# 2	invalid or excess argument(s)
+# 3	unimplemented feature (for example, "reload")
+# 4	user had insufficient privilege
+# 5	program is not installed
+# 6	program is not configured
+# 7	program is not running
+
+# Command argument
+# start		start the service
+# stop		stop the service
+# restart	stop and restart the service if the service is already running, otherwise start the service
+# try-restart	restart the service if the service is already running
+# reload	cause the configuration of the service to be reloaded without actually stopping and restarting the service
+# force-reload	cause the configuration to be reloaded if the service supports this, otherwise restart the service if it is running
+# status	print the current status of the service
+
+# start, stop, restart, force-reload, and status actions must be supported
+# reload and the try-restart actions are optional.
+# the init script.
+
+
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 # Source function library.
 . /etc/init.d/functions
 
-
 # Silently exit is SELinux is not enabled
 [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
@@ -44,6 +71,9 @@
     if test $RETVAL = 0 ; then
         touch /var/lock/subsys/$prog
     fi
+    if test $RETVAL = 3 ; then
+	echo -n $"Cannot start $prog: SELinux not enabled"
+    fi
     return $RETVAL
 }
 
@@ -99,17 +129,17 @@
     restart)
 	restart
 	;;
-    reload)
+    force-reload|reload)
 	reload
 	;;
-    condrestart)
+    try-restart|condrestart)
 	condrestart
 	;;
     cleardb)
 	cleardb
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|cleardb}"
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|reload|force-reload|cleardb}"
 	RETVAL=3
 esac
 


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- setroubleshoot.spec	23 Aug 2007 19:36:55 -0000	1.88
+++ setroubleshoot.spec	26 Sep 2007 22:08:09 -0000	1.89
@@ -1,8 +1,8 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.10.1
+Version: 1.10.6
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
@@ -25,6 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
+%{?fc7: Requires: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -146,8 +148,8 @@
 %{pkgpythondir}/__init__.py*
 %{pkgpythondir}/access_control.py*
 %{pkgpythondir}/analyze.py*
+%{pkgpythondir}/audit_data.py*
 %{pkgpythondir}/avc_audit.py*
-%{pkgpythondir}/avc_auparse.py*
 %{pkgpythondir}/config.py*
 %{pkgpythondir}/email_alert.py*
 %{pkgpythondir}/errcode.py*
@@ -171,6 +173,133 @@
 %attr(0755,root,root) /etc/rc.d/init.d/%{name}
 
 %changelog
+* Wed Sep 26 2007 John Dennis <jdennis at redhat.com> - 1.10.6-1
+	- make selinx-policy requires in spec file specific to dist tag
+
+* Mon Sep 24 2007 John Dennis <jdennis at redhat.com> - 1.10.5-1
+	- update code for command line log file scanning to work with
+	  new log file scanning code introduced for the browser.
+
+	- update Bulgarian translation (Doncho N. Gunchev (gunchev at gmail.com))
+
+	- update Polish translation (Piotr Dr??g (raven at pmail.pl))
+
+	- Resolves bug #239893: sealert wakes up very often
+	  This was caused by the use of threads and pygtk's thread signal
+	  handling.  The only use of threads in sealert was for log file
+	  scanning so that the UI would remain responsive during a
+	  scan. Threads in sealert have now been completely
+	  removed. Instead the scanning work is performed in a gobject idle
+	  function called from the main loop. The idle function is written
+	  as a python generator function which allows for the function to
+	  perform a small amount of work, save it's execution state and
+	  return. The next time the idle function is called from the main
+	  loop it resumes execution from it's last state until it decides
+	  to yield control again. This way the long running scan/analysis
+	  can be performed in small successive units of work during the
+	  time the application is otherwise idle and it does not interfere
+	  with the rest of the GUI event processing. Everything now occurs
+	  in an event loop, think of it as the applications process/thread
+	  scheduler whose event handlers execute time slices.
+
+	- rewrote parts of the audit input pipeline to use generators
+	  instead of callbacks, thus permitting the logfile scanning code
+	  to yield control with more granularity. Also updated
+	  test_setroubleshootd and audisp_listen to use the new
+	  generator/yield logic.
+
+	- rewrote the dialog used for scanning log files, progress bar
+	  updates are now in the dialog, the scan can be terminated part
+	  way through, errors from the scan are reported in pop-up dialog,
+	  one can only dismiss the dialog with success if the scan had
+	  been successfully run to completion, otherwise the user is only
+	  left with the option to cancel.
+
+	- Relates bug #252035  bug #247469, setroubleshootd and sealert should
+	  exit if SELinux is disabled.
+
+	- add utility functions escape_html() and unescape_html()
+
+	- fix initial sort order in browser, track sort order in browser
+
+	- modify AVC.get_path() to only return a value if the 'path' field is
+	  set, formerly it also considered the fields 'name' & 'file' which were
+	  incorrect. get_path() now also looks to see if the string begins with a
+	  slash for a fully qualified path, if not it looks to see if its a 
+	  pseudo path such as 'pipe[12345]' or 'socket[12345]' and if so strips out
+	  the instance information inside the brackets and returns just the type of 
+	  the pseudo path. This is done because we do not want path information
+	  in the signature to be unique for each instance of the denial.
+
+	- modify the TimeStamp class to hide it's internal datetime member,
+	  remove the cmp() method, the internal __cmp__ will be automatically invoked.
+
+	- require selinux policy version in spec file to allow system dbus use
+	
+	- Resolves bug #256601: audit2allow generates incorrect syntax when comma "," in
+	  denied list
+
+	- update po i18n files
+
+	- Add support for pruning database by age and size
+
+
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.4-1
+	- fix init script
+
+* Sat Sep  8 2007 John Dennis <jdennis at redhat.com> - 1.10.3-1
+	- modify avc_audit.py to use new audit_data.py implementation
+
+	- can listen for audit events on either /var/run/audit_events
+	  in bindary protocol mode or /var/run/audisp_events in
+	  text protocol mode
+
+* Thu Sep  6 2007 John Dennis <jdennis at redhat.com> - 1.10.2-1
+	- remove all copied code from test_setroubleshootd, now we import
+	  from setroubleshoot
+	
+	- export ClientConnectionHandler from rpc.py as a base class.
+	  Derive SetroubleshootdClientConnectionHandler and
+	  AuditClientConnectionHandler from ClientConnectionHandler.
+
+	- add audisp_listen as test program
+
+	- create setroubleshoot sym link in top devel directory pointing
+	  to src so import setroubleshoot.foo if PYTHONPATH=topdir
+
+	- add get_option, convert_cfg_type to config.py.in so that one
+	  can pass optional dict to override config file settings
+
+	- rewrite log_init() so it's easier for other programs to use it,
+	  fix the import logic concering log & config
+
+	- remove log code from test_setroubleshoot, now just does import
+	  from setroubleshoot.
+	
+	- test_setroubleshootd can now handle audit records in both text
+	  and binary formats, can be selected by command line arg. It can now
+	  either output to clients connecting on a socket or to stdout. Can
+	  now optionally exit after N socket client connections.
+
+	- remove non audit record lines from test data
+
+	- remove config_init() and log_init() from package __init__.py
+	  It was the wrong place to call them, now call them when the
+	  process initializes before the first setroubleshoot imports
+
+	- add parse_config_setting() and set_config() to config module
+	- setroubleshootd now accepts -c --config command line arg
+	- test_sectroubleshoot: add err defines & program_error exception
+	  add is_valid() tests to assure we read a valid audit record
+	  log the unrecognized line if not valid, clean up socket close()
+
+	- Relates Bug #247056, update initscript to LSB standards
+	  Note: LSB initscripts in Fedora is not yet a resolved issue,
+	  the changes implemented were to add an LSB block and support
+	  the new LSB try-restart and force-reload commands. However
+	  the new /lib/lsb/init-functions are NOT currently used as this
+	  is the unstable part.
+
 * Thu Aug 23 2007 John Dennis <jdennis at redhat.com> - 1.10.1-1
 	- add BuildRequires perl-XML-Parser
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	23 Aug 2007 19:36:55 -0000	1.84
+++ sources	26 Sep 2007 22:08:09 -0000	1.85
@@ -1 +1 @@
-a1a0c6f42c966485a10170cc7fcf6014  setroubleshoot-1.10.1.tar.gz
+3189248dedf6ff67a4a79ce61172b56b  setroubleshoot-1.10.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:11 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:11 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLGf6030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:16 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLGf9030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:23 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLGfC030017@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:22 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:22 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLRaa030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:26 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchbugzilla
Message-ID: <200709262221.l8QMLRad030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchbugzilla acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:27 -0700
Subject: [pkgdb] mailgraph: mfleming has requested watchcommits
Message-ID: <200709262221.l8QMLWZo030080@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the watchcommits acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:33 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:33 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLRag030056@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:38 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLWZr030080@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:21:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 15:21:41 -0700
Subject: [pkgdb] mailgraph: mfleming has requested commit
Message-ID: <200709262221.l8QMLkvm030180@bastion.fedora.phx.redhat.com>

Michael G. Fleming (mfleming) has requested the commit acl on mailgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Wed Sep 26 22:37:21 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:37:21 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.89,1.90
Message-ID: <200709262237.l8QMbLCh024101@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24064

Modified Files:
	setroubleshoot.spec 
Log Message:
fix duplicate requires keyword



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- setroubleshoot.spec	26 Sep 2007 22:08:09 -0000	1.89
+++ setroubleshoot.spec	26 Sep 2007 22:36:49 -0000	1.90
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:39:03 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 18:39:03 -0400
Subject: rpms/kernel/devel
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch,
	NONE, 1.1 kernel.spec, 1.190, 1.191
Message-ID: <200709262239.l8QMd3sW024211@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24168

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- x86 e820 bugfix


linux-2.6-x86-setup-handle-improperly-terminated-E820.patch:

--- NEW FILE linux-2.6-x86-setup-handle-improperly-terminated-E820.patch ---
commit 2efa33f81ef56e7700c09a3d8a881c96692149e5
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Wed Sep 26 14:11:43 2007 -0700

    [x86 setup] Handle case of improperly terminated E820 chain
    
    At least one system (a Geode system with a Digital Logic BIOS) has
    been found which suddenly stops reporting the SMAP signature when
    reading the E820 memory chain.  We can't know what, exactly, broke in
    the BIOS, so if we detect this situation, declare the E820 data
    unusable and fall back to E801.
    
    Also, revert to original behavior of always probing all memory
    methods; that way all the memory information is available to the
    kernel.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Jordan Crouse <jordan.crouse at amd.com>
    Cc: Joerg Pommnitz <pommnitz at yahoo.com>

diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index 1a2e62d..bccaa1c 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -20,6 +20,7 @@
 
 static int detect_memory_e820(void)
 {
+	int count = 0;
 	u32 next = 0;
 	u32 size, id;
 	u8 err;
@@ -33,14 +34,24 @@ static int detect_memory_e820(void)
 		      "=m" (*desc)
 		    : "D" (desc), "a" (0xe820));
 
-		if (err || id != SMAP)
+		/* Some BIOSes stop returning SMAP in the middle of
+		   the search loop.  We don't know exactly how the BIOS
+		   screwed up the map at that point, we might have a
+		   partial map, the full map, or complete garbage, so
+		   just return failure. */
+		if (id != SMAP) {
+			count = 0;
 			break;
+		}
 
-		boot_params.e820_entries++;
+		if (err)
+			break;
+
+		count++;
 		desc++;
-	} while (next && boot_params.e820_entries < E820MAX);
+	} while (next && count < E820MAX);
 
-	return boot_params.e820_entries;
+	return boot_params.e820_entries = count;
 }
 
 static int detect_memory_e801(void)
@@ -89,11 +100,16 @@ static int detect_memory_88(void)
 
 int detect_memory(void)
 {
+	int err = -1;
+
 	if (detect_memory_e820() > 0)
-		return 0;
+		err = 0;
 
 	if (!detect_memory_e801())
-		return 0;
+		err = 0;
+
+	if (!detect_memory_88())
+		err = 0;
 
-	return detect_memory_88();
+	return err;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kernel.spec	26 Sep 2007 21:03:40 -0000	1.190
+++ kernel.spec	26 Sep 2007 22:38:30 -0000	1.191
@@ -672,6 +672,7 @@
 Patch1515: linux-2.6-lirc.patch
 
 Patch1600: linux-2.6-x86-edd-maxdrive.patch
+Patch1610: linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
 
 #nouveau
 Patch1800: drm-mm-git.patch
@@ -1214,6 +1215,9 @@
 # EDD fix
 ApplyPatch linux-2.6-x86-edd-maxdrive.patch
 
+# e820 bugfix
+ApplyPatch linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1806,6 +1810,9 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86 e820 bugfix
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc8-git1
 
 * Wed Sep 26 2007 Dave Jones <davej at redhat.com>



From fedora-extras-commits at redhat.com  Wed Sep 26 22:42:26 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:42:26 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.90,1.91
Message-ID: <200709262242.l8QMgQ78024378@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24275

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requres conditional



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- setroubleshoot.spec	26 Sep 2007 22:36:49 -0000	1.90
+++ setroubleshoot.spec	26 Sep 2007 22:41:54 -0000	1.91
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7 Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8 Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 22:51:26 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 18:51:26 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.91,1.92
Message-ID: <200709262251.l8QMpQbR024780@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24754

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requires



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- setroubleshoot.spec	26 Sep 2007 22:41:54 -0000	1.91
+++ setroubleshoot.spec	26 Sep 2007 22:50:52 -0000	1.92
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7 Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8 Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
+%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:18:44 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 19:18:44 -0400
Subject: rpms/kernel/F-7 linux-2.6-acpi-disable-cstates-in-suspend.patch,
	NONE, 1.1 linux-2.6-acpi-kill-dmesg-spam.patch, NONE,
	1.1 linux-2.6-libata-pata_sis-dma-add-missing-entry.patch, NONE,
	1.1 linux-2.6-libata-pata_sis-fix-dma-timing.patch, NONE,
	1.1 linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch, NONE,
	1.1 linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch, 
	NONE, 1.1
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,
	NONE, 1.1 linux-2.6-net-sfq-fix-oops-with-2.patch, NONE,
	1.1 kernel-2.6.spec, 1.3347, 1.3348
Message-ID: <200709262318.l8QNIi1T031834@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31745

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-acpi-disable-cstates-in-suspend.patch 
	linux-2.6-acpi-kill-dmesg-spam.patch 
	linux-2.6-libata-pata_sis-dma-add-missing-entry.patch 
	linux-2.6-libata-pata_sis-fix-dma-timing.patch 
	linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch 
	linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch 
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch 
	linux-2.6-net-sfq-fix-oops-with-2.patch 
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- libata pata_sis: DMA fixes (#202291)
- libata sata_sil24: IRQ clearing race fixes
- net driver r8169: fix hanging (#252955, #292161)
- qdisc sfq: fix oops with 2 packet queue (#219895)
- ACPI: disable processor C-states suring suspend
- ACPI: silence noisy message


linux-2.6-acpi-disable-cstates-in-suspend.patch:

--- NEW FILE linux-2.6-acpi-disable-cstates-in-suspend.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b04e7bdb984e3b7f62fb7f44146a529f88cc7639
Commit:     b04e7bdb984e3b7f62fb7f44146a529f88cc7639
Parent:     1f0cff6e4d579ab0fe671c02fcd842694e46b90f
Author:     Thomas Gleixner <tglx at linutronix.de>
AuthorDate: Sat Sep 22 22:29:05 2007 +0000
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Sat Sep 22 17:15:34 2007 -0700

    ACPI: disable lower idle C-states across suspend/resume
    
    device_suspend() calls ACPI suspend functions, which seems to have undesired
    side effects on lower idle C-states. It took me some time to realize that
    especially the VAIO BIOSes (both Andrews jinxed UP and my elfstruck SMP one)
    show this effect. I'm quite sure that other bug reports against suspend/resume
    about turning the system into a brick have the same root cause.
    
    After fishing in the dark for quite some time, I realized that removing the ACPI
    processor module before suspend (this removes the lower C-state functionality)
    made the problem disappear. Interestingly enough the propability of having a
    bricked box is influenced by various factors (interrupts, size of the ram image,
    ...). Even adding a bunch of printks in the wrong places made the problem go
    away. The previous periodic tick implementation simply pampered over the
    problem, which explains why the dyntick / clockevents changes made this more
    prominent.
    
    We avoid complex functionality during the boot process and we have to do the
    same during suspend/resume. It is a similar scenario and equaly fragile.
    
    Add suspend / resume functions to the ACPI processor code and disable the lower
    idle C-states across suspend/resume. Fall back to the default idle
    implementation (halt) instead.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Tested-by: Andrew Morton <akpm at linux-foundation.org>
    Cc: Len Brown <lenb at kernel.org>
    Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Cc: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/acpi/processor_core.c |    2 ++
 drivers/acpi/processor_idle.c |   19 ++++++++++++++++++-
 include/acpi/processor.h      |    2 ++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 2afb3d2..9f11dc2 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -102,6 +102,8 @@ static struct acpi_driver acpi_processor_driver = {
 		.add = acpi_processor_add,
 		.remove = acpi_processor_remove,
 		.start = acpi_processor_start,
+		.suspend = acpi_processor_suspend,
+		.resume = acpi_processor_resume,
 		},
 };
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d9b8af7..f182613 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -325,6 +325,23 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr,
 
 #endif
 
+/*
+ * Suspend / resume control
+ */
+static int acpi_idle_suspend;
+
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+{
+	acpi_idle_suspend = 1;
+	return 0;
+}
+
+int acpi_processor_resume(struct acpi_device * device)
+{
+	acpi_idle_suspend = 0;
+	return 0;
+}
+
 static void acpi_processor_idle(void)
 {
 	struct acpi_processor *pr = NULL;
@@ -355,7 +372,7 @@ static void acpi_processor_idle(void)
 	}
 
 	cx = pr->power.state;
-	if (!cx) {
+	if (!cx || acpi_idle_suspend) {
 		if (pm_idle_save)
 			pm_idle_save();
 		else
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ec3ffda..99934a9 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -320,6 +320,8 @@ int acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr,
 			      struct acpi_device *device);
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
+int acpi_processor_resume(struct acpi_device * device);
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);

linux-2.6-acpi-kill-dmesg-spam.patch:

--- NEW FILE linux-2.6-acpi-kill-dmesg-spam.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7f10cc4e838c2b2d7272031954c56c407569d497
Commit:     7f10cc4e838c2b2d7272031954c56c407569d497
Parent:     a21101c46ca5b4320e31408853cdcbf7cb1ce4ed
Author:     Maik Broemme <mbroemme at plusserver.de>
AuthorDate: Fri Sep 14 22:12:34 2007 +0200
Committer:  Len Brown <len.brown at intel.com>
CommitDate: Tue Sep 18 13:45:20 2007 -0400

    ACPI: video: remove dmesg spam
    
    i am actually heavily using the ACPI video extension for my Thinkpad X61
    Tablet. I have bound the input events triggered by the brightness
    up/down keys to a simple
    
    echo <value> > /sys/class/backlight/acpi_video1/brightness
    
    but everytime the event is triggered and acpi_video_device_lcd_set_level()
    is called i got a notificication in my kernel log like:
    
    set_level status: 0
    set_level status: 0
    set_level status: 0
    set_level status: 0
    ...
    
    Signed-off-by: Maik Broemme <mbroemme at plusserver.de>
    Signed-off-by: Len Brown <len.brown at intel.com>
---
 drivers/acpi/video.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6cb3e7b..d05891f 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -417,7 +417,6 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
 	arg0.integer.value = level;
 	status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
-	printk(KERN_DEBUG "set_level status: %x\n", status);
 	return status;
 }
 

linux-2.6-libata-pata_sis-dma-add-missing-entry.patch:

--- NEW FILE linux-2.6-libata-pata_sis-dma-add-missing-entry.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=edeb614c1c8388b354d93ff7790317cc5d6a38ec
Commit:     edeb614c1c8388b354d93ff7790317cc5d6a38ec
Parent:     228f47b959a0cf2e24c9696757c7e6510334e499
Author:     Tejun Heo <htejun at gmail.com>
AuthorDate: Fri Sep 21 16:29:05 2007 +0900
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Sep 25 21:30:56 2007 -0400

    pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode()
    
    sis_66_set_dmamode() also handles early UDMA100 (SIS630 ET) but is
    missing udma timing value for UDMA100.  According to sis5513, this
    should be 0x8000.  This caused UDMA100 device to fail on pata_sis till
    it downgrades to UDMA66 while it works fine on sis5513 at UDMA100.
    
    Reported by Adam Blech.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Cc: Adam Blech <desaster.area at addcom.de>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>

bz 202291

---
 drivers/ata/pata_sis.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 2bd7645..cce2834 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -375,8 +375,9 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
+	/* MWDMA 0-2 and UDMA 0-5 */
 	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
-	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
+	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000, 0x8000 };
 
 	pci_read_config_word(pdev, drive_pci, &timing);
 

linux-2.6-libata-pata_sis-fix-dma-timing.patch:

--- NEW FILE linux-2.6-libata-pata_sis-fix-dma-timing.patch ---

# HG changeset patch
# User Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
# Date 1185976856 14400
# Node ID f5e5b307727d7fb820ccc9d77de29c837dd90e95
# Parent 1130c2b7409a2eb135ebc61dfd3c784d1cea7eda
pata_sis: fix MWDMA for <= UDMA66 chipsets and UDMA for UDMA33 chipsets

* Fix MWDMA timings setup in sis_old_set_dmamode() and sis_66_set_dmamode().

  The old timings were overclocked (even worse behavior than sis5513 IDE driver
  which depends on BIOS to program correct timings), the new timings are taken
  from the datasheet (they match timings from ATA spec).

* Fix UDMA timings setup in sis_old_set_dmamode().

  Misplaced pci_write_config_word() call resulted in UDMA timings never
  being set.

* Fix comments for sis_133_early_set_dmamode() and sis_133_set_dmamode():
  - only the former function handles early SiS 961 bridges
  - both functions lack MWDMA timings setup

* Fix typos in sis_100_set_piomode() and sis_133_set_piomode() comments.

* Bump driver version.

Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>

committer: Jeff Garzik <jeff at garzik.org>

--- a/drivers/ata/pata_sis.c	Wed Aug 01 10:00:56 2007 -0400
+++ b/drivers/ata/pata_sis.c	Wed Aug 01 10:00:56 2007 -0400
@@ -2,6 +2,7 @@
  *    pata_sis.c - SiS ATA driver
  *
  *	(C) 2005 Red Hat <alan at redhat.com>
+ *	(C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c
  * Copyright (C) 1999-2000	Andre Hedrick <andre at linux-ide.org>
@@ -35,7 +36,7 @@
 #include "sis.h"
 
 #define DRV_NAME	"pata_sis"
-#define DRV_VERSION	"0.5.1"
+#define DRV_VERSION	"0.5.2"
 
 struct sis_chipset {
 	u16 device;				/* PCI host ID */
@@ -237,7 +238,7 @@ static void sis_old_set_piomode (struct 
 }
 
 /**
- *	sis_100_set_pioode - Initialize host controller PATA PIO timings
+ *	sis_100_set_piomode - Initialize host controller PATA PIO timings
  *	@ap: Port whose timings we are configuring
  *	@adev: Device we are configuring for.
  *
@@ -262,7 +263,7 @@ static void sis_100_set_piomode (struct 
 }
 
 /**
- *	sis_133_set_pioode - Initialize host controller PATA PIO timings
+ *	sis_133_set_piomode - Initialize host controller PATA PIO timings
  *	@ap: Port whose timings we are configuring
  *	@adev: Device we are configuring for.
  *
@@ -334,7 +335,7 @@ static void sis_old_set_dmamode (struct 
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
-	const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
 	const u16 udma_bits[]  = { 0xE000, 0xC000, 0xA000 };
 
 	pci_read_config_word(pdev, drive_pci, &timing);
@@ -342,15 +343,15 @@ static void sis_old_set_dmamode (struct 
 	if (adev->dma_mode < XFER_UDMA_0) {
 		/* bits 3-0 hold recovery timing bits 8-10 active timing and
 		   the higer bits are dependant on the device */
-		timing &= ~ 0x870F;
+		timing &= ~0x870F;
 		timing |= mwdma_bits[speed];
-		pci_write_config_word(pdev, drive_pci, timing);
 	} else {
 		/* Bit 15 is UDMA on/off, bit 13-14 are cycle time */
 		speed = adev->dma_mode - XFER_UDMA_0;
 		timing &= ~0x6000;
 		timing |= udma_bits[speed];
 	}
+	pci_write_config_word(pdev, drive_pci, timing);
 }
 
 /**
@@ -373,7 +374,7 @@ static void sis_66_set_dmamode (struct a
 	int drive_pci = sis_old_port_base(adev);
 	u16 timing;
 
-	const u16 mwdma_bits[] = { 0x707, 0x202, 0x202 };
+	const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
 	const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
 
 	pci_read_config_word(pdev, drive_pci, &timing);
@@ -432,8 +433,7 @@ static void sis_100_set_dmamode (struct 
  *	@adev: Device to program
  *
  *	Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *	Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *	the old ide/pci driver.
+ *	Handles early SiS 961 bridges.
  *
  *	LOCKING:
  *	None (inherited from caller).
@@ -467,8 +467,6 @@ static void sis_133_early_set_dmamode (s
  *	@adev: Device to program
  *
  *	Set UDMA/MWDMA mode for device, in host controller PCI config space.
- *	Handles early SiS 961 bridges. Supports MWDMA as well unlike
- *	the old ide/pci driver.
  *
  *	LOCKING:
  *	None (inherited from caller).


linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch:

--- NEW FILE linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=228f47b959a0cf2e24c9696757c7e6510334e499
Commit:     228f47b959a0cf2e24c9696757c7e6510334e499
Parent:     4942de4a0e914f205d351a81873f4f63986bcc3c
Author:     Tejun Heo <htejun at gmail.com>
AuthorDate: Sun Sep 23 12:37:05 2007 +0900
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Sep 25 21:30:56 2007 -0400

    sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used
    
    When PCIX_IRQ_WOC is used, sil24 has an inherent race condition
    between clearing IRQ pending and reading IRQ status.  If IRQ pending
    is cleared after reading IRQ status, there's possibility of lost IRQ.
    If IRQ pending is cleared before reading IRQ status, spurious IRQs
    will occur.
    
    sata_sil24 till now cleared IRQ pending after reading IRQ status thus
    losing IRQs on machines where PCIX_IRQ_WOC was used.  Reverse the
    order and ignore spurious IRQs if PCIX_IRQ_WOC.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/sata_sil24.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index ef83e6b..233e886 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -888,6 +888,16 @@ static inline void sil24_host_intr(struct ata_port *ap)
 	u32 slot_stat, qc_active;
 	int rc;
 
+	/* If PCIX_IRQ_WOC, there's an inherent race window between
+	 * clearing IRQ pending status and reading PORT_SLOT_STAT
+	 * which may cause spurious interrupts afterwards.  This is
+	 * unavoidable and much better than losing interrupts which
+	 * happens if IRQ pending is cleared after reading
+	 * PORT_SLOT_STAT.
+	 */
+	if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
+		writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
+
 	slot_stat = readl(port + PORT_SLOT_STAT);
 
 	if (unlikely(slot_stat & HOST_SSTAT_ATTN)) {
@@ -895,9 +905,6 @@ static inline void sil24_host_intr(struct ata_port *ap)
 		return;
 	}
 
-	if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
-		writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
-
 	qc_active = slot_stat & ~HOST_SSTAT_ATTN;
 	rc = ata_qc_complete_multiple(ap, qc_active, sil24_finish_qc);
 	if (rc > 0)
@@ -910,7 +917,8 @@ static inline void sil24_host_intr(struct ata_port *ap)
 		return;
 	}
 
-	if (ata_ratelimit())
+	/* spurious interrupts are expected if PCIX_IRQ_WOC */
+	if (!(ap->flags & SIL24_FLAG_PCIX_IRQ_WOC) && ata_ratelimit())
 		ata_port_printk(ap, KERN_INFO, "spurious interrupt "
 			"(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
 			slot_stat, ap->active_tag, ap->sactive);

linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch:

--- NEW FILE linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=65d916d95314566f426cc40ff0f17b754a773b0b
Commit:     65d916d95314566f426cc40ff0f17b754a773b0b
Parent:     a88a8eff1e6e32d3288986a9d36c6a449c032d3a
Author:     Edward Hsu <edward_hsu at realtek.com.tw>
AuthorDate: Fri Aug 17 10:14:36 2007 +0200
Committer:  Francois Romieu <romieu at electric-eye.fr.zoreil.com>
CommitDate: Wed Sep 19 21:52:18 2007 +0200

    r8169: correct phy parameters for the 8110SC
    
    The phys of the 8110SC (RTL_GIGA_MAC_VER_{05/06}) act abnormally in
    gigabit mode if they are applied the parameters in rtl8169_hw_phy_config
    which actually aim the 8110S/SB.
    
    It is ok to return early from rtl8169_hw_phy_config as it does not
    apply to the 8101 and 8168 families.
    
    Signed-off-by: Edward Hsu <edward_hsu at realtek.com.tw>
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
---
 drivers/net/r8169.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b85ab4a..d9bb51b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1228,7 +1228,10 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
 		return;
 	}
 
-	/* phy config for RTL8169s mac_version C chip */
+	if ((tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+	    (tp->mac_version != RTL_GIGA_MAC_VER_03))
+		return;
+
 	mdio_write(ioaddr, 31, 0x0001);			//w 31 2 0 1
 	mdio_write(ioaddr, 21, 0x1000);			//w 21 15 0 1000
 	mdio_write(ioaddr, 24, 0x65c7);			//w 24 15 0 65c7

linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch:

--- NEW FILE linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d78ae2dcc2acebb9a1048278f47f762c069db75c
Commit:     d78ae2dcc2acebb9a1048278f47f762c069db75c
Parent:     65d916d95314566f426cc40ff0f17b754a773b0b
Author:     Francois Romieu <romieu at fr.zoreil.com>
AuthorDate: Sun Aug 26 20:08:19 2007 +0200
Committer:  Francois Romieu <romieu at electric-eye.fr.zoreil.com>
CommitDate: Wed Sep 19 21:52:18 2007 +0200

    r8169: workaround against ignored TxPoll writes (8168)
    
    The 8168 ignores the requests to fetch the Tx descriptors when
    the relevant TxPoll bit is already set. It easily kills the
    performances of the 8168. David Gundersen has noticed that it
    is enough to wait for the completion of the DMA transfer (NPQ
    bit is cleared) before writing the TxPoll register again.
    
    The extra IO traffic added by the proposed workaround could be
    minimalized but it is not a high-priority task.
    
    Fix for:
    http://bugzilla.kernel.org/show_bug.cgi?id=7924
    http://bugzilla.kernel.org/show_bug.cgi?id=8688
    (http://bugzilla.kernel.org/show_bug.cgi?id=7555 ?)
    
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
    Cc: David Gundersen <gundy at iinet.net.au>
    Cc: Edward Hsu <edward_hsu at realtek.com.tw>

bz 252955, 292161

---
 drivers/net/r8169.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index d9bb51b..c921ec3 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2570,6 +2570,15 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 		    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
 			netif_wake_queue(dev);
 		}
+		/*
+		 * 8168 hack: TxPoll requests are lost when the Tx packets are
+		 * too close. Let's kick an extra TxPoll request when a burst
+		 * of start_xmit activity is detected (if it is not detected,
+		 * it is slow enough). -- FR
+		 */
+		smp_rmb();
+		if (tp->cur_tx != dirty_tx)
+			RTL_W8(TxPoll, NPQ);
 	}
 }
 

linux-2.6-net-sfq-fix-oops-with-2.patch:

--- NEW FILE linux-2.6-net-sfq-fix-oops-with-2.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5588b40d7c2bff75ee573ed42d1738c73ce24492
Commit:     5588b40d7c2bff75ee573ed42d1738c73ce24492
Parent:     1a03b81db96aeaac0276224f25c0701a1ba37318
Author:     Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
AuthorDate: Wed Sep 19 10:42:03 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Thu Sep 20 12:14:08 2007 -0700

    [PKT_SCHED]: Fix 'SFQ qdisc crashes with limit of 2 packets'
    
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

bz 219895

---
 net/sched/sch_sfq.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 9579573..3a23e30 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -270,7 +270,7 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
 			q->tail = x;
 		}
 	}
-	if (++sch->q.qlen < q->limit-1) {
+	if (++sch->q.qlen <= q->limit) {
 		sch->bstats.bytes += skb->len;
 		sch->bstats.packets++;
 		return 0;
@@ -306,7 +306,7 @@ sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
 			q->tail = x;
 		}
 	}
-	if (++sch->q.qlen < q->limit - 1) {
+	if (++sch->q.qlen <= q->limit) {
 		sch->qstats.requeues++;
 		return 0;
 	}
@@ -391,10 +391,10 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
 	q->quantum = ctl->quantum ? : psched_mtu(sch->dev);
 	q->perturb_period = ctl->perturb_period*HZ;
 	if (ctl->limit)
-		q->limit = min_t(u32, ctl->limit, SFQ_DEPTH);
+		q->limit = min_t(u32, ctl->limit, SFQ_DEPTH - 2);
 
 	qlen = sch->q.qlen;
-	while (sch->q.qlen >= q->limit-1)
+	while (sch->q.qlen > q->limit)
 		sfq_drop(sch);
 	qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen);
 
@@ -423,7 +423,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
 		q->dep[i+SFQ_DEPTH].next = i+SFQ_DEPTH;
 		q->dep[i+SFQ_DEPTH].prev = i+SFQ_DEPTH;
 	}
-	q->limit = SFQ_DEPTH;
+	q->limit = SFQ_DEPTH - 2;
 	q->max_depth = 0;
 	q->tail = SFQ_DEPTH;
 	if (opt == NULL) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3347
retrieving revision 1.3348
diff -u -r1.3347 -r1.3348
--- kernel-2.6.spec	26 Sep 2007 18:58:34 -0000	1.3347
+++ kernel-2.6.spec	26 Sep 2007 23:18:11 -0000	1.3348
@@ -576,6 +576,7 @@
 Patch423: linux-2.6-gfs-locking-exports.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
+Patch431: linux-2.6-net-sfq-fix-oops-with-2.patch
 
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -605,6 +606,9 @@
 Patch674: linux-2.6-libata-pata_via-cable-detect.patch
 Patch675: linux-2.6-libata-simplify-init.patch
 Patch676: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+Patch677: linux-2.6-libata-pata_sis-fix-dma-timing.patch
+Patch678: linux-2.6-libata-pata_sis-dma-add-missing-entry.patch
+Patch679: linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch
 
 Patch680: linux-2.6-rtl8187.patch
 Patch681: linux-2.6-wireless.patch
@@ -617,6 +621,9 @@
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 Patch715: linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
+Patch716: linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch 
+Patch717: linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
+
 Patch730: linux-2.6-snd-ad1988-fix-spdif-output.patch
 Patch731: linux-2.6-snd-hda-stac92xx-fixes.patch
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
@@ -628,6 +635,9 @@
 Patch781: linux-2.6-usb-allow-1-byte-replies.patch
 Patch782: linux-2.6-usb-fixup-interval-lengths.patch
 
+Patch790: linux-2.6-acpi-disable-cstates-in-suspend.patch
+Patch791: linux-2.6-acpi-kill-dmesg-spam.patch
+
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs-v2.6.22.5-v20.5.patch
@@ -1262,6 +1272,8 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
+# fix oops in sfq
+ApplyPatch linux-2.6-net-sfq-fix-oops-with-2.patch
 
 # Misc fixes
 # Fix SHA1 alignment problem on ia64
@@ -1324,6 +1336,11 @@
 # fix Pegasos libata glitches
 ApplyPatch linux-2.6-libata-simplify-init.patch
 ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
+# pata_sis DMA fixes
+ApplyPatch linux-2.6-libata-pata_sis-fix-dma-timing.patch
+ApplyPatch linux-2.6-libata-pata_sis-dma-add-missing-entry.patch
+# sata_sil24 irq race fix
+ApplyPatch linux-2.6-libata-sata_sil24-fix-irq-clearing-race.patch
 
 # Add the rtl8187 driver from upstream
 ApplyPatch linux-2.6-rtl8187.patch
@@ -1349,6 +1366,10 @@
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
 ApplyPatch linux-2.6-netdev-atl1-disable-broken-64-bit-dma.patch
 
+# r8169
+ApplyPatch linux-2.6-net-r8169-correct-phy-parameters-for-the-8110SC.patch
+ApplyPatch linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
+
 # ALSA
 #
 # fix spdif output on ad1988
@@ -1377,6 +1398,10 @@
 ApplyPatch linux-2.6-usb-fixup-interval-lengths.patch
 
 # ACPI patches
+# fix some suspend bugssuspend
+ApplyPatch linux-2.6-acpi-disable-cstates-in-suspend.patch
+# silence noisy message
+ApplyPatch linux-2.6-acpi-kill-dmesg-spam.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -2331,6 +2356,14 @@
 
 %changelog
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- libata pata_sis: DMA fixes (#202291)
+- libata sata_sil24: IRQ clearing race fixes
+- net driver r8169: fix hanging (#252955, #292161)
+- qdisc sfq: fix oops with 2 packet queue (#219895)
+- ACPI: disable processor C-states suring suspend
+- ACPI: silence noisy message
+
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.22.9
 
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>



From fedora-extras-commits at redhat.com  Wed Sep 26 23:29:26 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:29:26 -0400
Subject: rpms/mlton/devel mlton.spec,1.16,1.17
Message-ID: <200709262329.l8QNTQIi032449@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
- Work around strange SRPM problem in conditionals



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mlton.spec	26 Sep 2007 19:37:49 -0000	1.16
+++ mlton.spec	26 Sep 2007 23:28:54 -0000	1.17
@@ -5,7 +5,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -47,7 +47,7 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%setup -T -D -q -a 1
+#%setup -T -D -q -a 1
 sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
 	usr/bin/mlton
 %endif
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+- Work around strange SRPM problem in conditionals
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
 - Build on ppc now that #247407 is fixed
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:33:40 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:33:40 -0400
Subject: rpms/mlton/devel mlton.spec,1.17,1.18
Message-ID: <200709262333.l8QNXeDv000335@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32679

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
- Work around strange SRPM problem in conditionals
- Fix changelog (forgot release 5?)



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mlton.spec	26 Sep 2007 23:28:54 -0000	1.17
+++ mlton.spec	26 Sep 2007 23:33:08 -0000	1.18
@@ -101,10 +101,11 @@
 
 
 %changelog
-* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
 - Work around strange SRPM problem in conditionals
+- Fix changelog (forgot release 5?)
 
-* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-5
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
 - Build on ppc now that #247407 is fixed
 
 * Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4



From fedora-extras-commits at redhat.com  Wed Sep 26 23:46:50 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Wed, 26 Sep 2007 19:46:50 -0400
Subject: rpms/kernel/F-7
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,
	1.1, 1.2
Message-ID: <200709262346.l8QNkoer000883@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv836

Modified Files:
	linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch 
Log Message:
build fix


linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch:

Index: linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch	26 Sep 2007 23:18:11 -0000	1.1
+++ linux-2.6-net-r8169-workaround-against-ignored-TxPoll-writes-8168.patch	26 Sep 2007 23:46:16 -0000	1.2
@@ -28,6 +28,8 @@
 
 bz 252955, 292161
 
+   <cebbert at redhat.com>: fix for 2.6.22
+
 ---
  drivers/net/r8169.c |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
@@ -48,7 +50,7 @@
 +		 */
 +		smp_rmb();
 +		if (tp->cur_tx != dirty_tx)
-+			RTL_W8(TxPoll, NPQ);
++			RTL_W8(TxPoll, 0x40);
  	}
  }
  



From fedora-extras-commits at redhat.com  Wed Sep 26 23:47:14 2007
From: fedora-extras-commits at redhat.com (John Dennis (jdennis))
Date: Wed, 26 Sep 2007 19:47:14 -0400
Subject: rpms/setroubleshoot/F-7 setroubleshoot.spec,1.92,1.93
Message-ID: <200709262347.l8QNlEDS000944@cvs-int.fedora.redhat.com>

Author: jdennis

Update of /cvs/pkgs/rpms/setroubleshoot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865

Modified Files:
	setroubleshoot.spec 
Log Message:
fix requires tag



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setroubleshoot/F-7/setroubleshoot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- setroubleshoot.spec	26 Sep 2007 22:50:52 -0000	1.92
+++ setroubleshoot.spec	26 Sep 2007 23:46:43 -0000	1.93
@@ -25,8 +25,8 @@
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7: Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8: Requires: selinux-policy-base >= 3.0.7-10}
+%{?fc7:Requires: selinux-policy-base >= 2.6.4-45 }
+%{?fc8:Requires: selinux-policy-base >= 3.0.7-10 }
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-extras-commits at redhat.com  Wed Sep 26 23:52:18 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 26 Sep 2007 19:52:18 -0400
Subject: rpms/mlton/devel mlton.spec,1.18,1.19
Message-ID: <200709262352.l8QNqILO001070@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1045

Modified Files:
	mlton.spec 
Log Message:
* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
- Really fix SRPM conditionals



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mlton.spec	26 Sep 2007 23:33:08 -0000	1.18
+++ mlton.spec	26 Sep 2007 23:51:46 -0000	1.19
@@ -1,11 +1,8 @@
 %define mlton_bootstrap 0
-#%ifarch x86_64
-#%define mlton_bootstrap 1
-#%endif
 
 Name:		mlton
 Version:	20070826
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -47,7 +44,7 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-#%setup -T -D -q -a 1
+%setup -T -D -q -a 1
 sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
 	usr/bin/mlton
 %endif
@@ -101,6 +98,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
+- Really fix SRPM conditionals
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
 - Work around strange SRPM problem in conditionals
 - Fix changelog (forgot release 5?)



From fedora-extras-commits at redhat.com  Thu Sep 27 00:07:46 2007
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Wed, 26 Sep 2007 20:07:46 -0400
Subject: rpms/libsvm/F-7 libsvm-2.84-6.patch, NONE, 1.1 libsvm.spec, 1.3,
	1.4 libsvm-2.84-5.patch, 1.1, NONE
Message-ID: <200709270007.l8R07kQ8007762@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720/F-7

Modified Files:
	libsvm.spec 
Added Files:
	libsvm-2.84-6.patch 
Removed Files:
	libsvm-2.84-5.patch 
Log Message:
- Add defattr to each subpackage
- Move libsvm.so to libsvm


libsvm-2.84-6.patch:

--- NEW FILE libsvm-2.84-6.patch ---
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
+++ ./Makefile	2007-09-26 17:07:55.000000000 +1000
@@ -1,8 +1,39 @@
 CXXC = g++
 CFLAGS = -Wall -O3 
+MAKE = make
+LIBSVM_VER =2.84
+export LIBSVM_VER 
 
-all: svm-train svm-predict svm-scale
+ifndef DESTDIR
+INSTDIR=/usr
+else
+INSTDIR=${DESTDIR}/usr
+endif
 
+export INSTDIR
+
+PROCESSOR=$(shell /bin/uname -p)
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+
+ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
+else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif
+
+export LIB_INSTDIR
+
+all: svm-train svm-predict svm-scale svm-python svm-java svm-lib
+
+svm-lib: svm-share.o
+	$(CXXC) -shared -Wl,-soname,libsvm.so \
+    -o libsvm.so.${LIBSVM_VER} svm-share.o -lm
+svm-share.o: svm.cpp svm.h
+	$(CXXC) -g -fPIC $(CFLAGS) -c svm.cpp -o svm-share.o
 svm-predict: svm-predict.c svm.o
 	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 svm-train: svm-train.c svm.o
@@ -11,5 +42,57 @@ svm-scale: svm-scale.c
 	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
 svm.o: svm.cpp svm.h
 	$(CXXC) $(CFLAGS) -c svm.cpp
+svm-python:
+	${MAKE} -C python
+svm-java:
+	${MAKE} -C java
+
+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}/libsvm
+	install -m 644 libsvm.so.2.84 ${LIB_INSTDIR}/libsvm
+	cd ${LIB_INSTDIR}/libsvm; ln -s libsvm.so.${LIBSVM_VER} libsvm.so
+	ldconfig -n ${LIB_INSTDIR}/libsvm
+# install package libsvm-devel
+	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
+	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
+#	cp -R java ${INSTDIR}/share/libsvm/src
+#	cp -R svm-toy ${INSTDIR}/share/libsvm/src
+#	cp -R tools ${INSTDIR}/share/libsvm/src
+#	cp -R windows ${INSTDIR}/share/libsvm/src
+	mkdir -p ${INSTDIR}/share/libsvm/examples
+	install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
+# install package libsvm-python
+	${MAKE} -C python install
+	${MAKE} -C java install
+
+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
+
 clean:
 	rm -f *~ svm.o svm-train svm-predict svm-scale
+	${MAKE} -C python clean
+	${MAKE} -C java clean
+
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig	2007-09-26 10:19:43.000000000 +1000
+++ ./java/libsvm/svm_model.java	2007-09-26 10:27:36.000000000 +1000
@@ -4,6 +4,7 @@
 package libsvm;
 public class svm_model implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	svm_parameter param;	// parameter
 	int nr_class;		// number of classes, = 2 in regression/one class svm
 	int l;			// total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig	2007-09-26 10:19:51.000000000 +1000
+++ ./java/libsvm/svm_node.java	2007-09-26 10:27:25.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_node implements java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	public int index;
 	public double value;
 }
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig	2007-09-26 10:20:42.000000000 +1000
+++ ./java/libsvm/svm_problem.java	2007-09-26 10:26:05.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_problem implements java.io.Serializable
 {
+	static final long serialVersionUID = -4451389443706847272L;
 	public int l;
 	public double[] y;
 	public svm_node[][] x;
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig	2007-09-26 10:20:23.000000000 +1000
+++ ./java/libsvm/svm_parameter.java	2007-09-26 10:25:14.000000000 +1000
@@ -1,6 +1,7 @@
 package libsvm;
 public class svm_parameter implements Cloneable,java.io.Serializable
 {
+	static final long serialVersionUID = 2709444323471798245L;
 	/* svm_type */
 	public static final int C_SVC = 0;
 	public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig	2007-09-25 11:10:21.000000000 +1000
+++ ./java/Makefile	2007-09-26 12:42:50.000000000 +1000
@@ -1,15 +1,17 @@
 .SUFFIXES: .class .java
-FILES =	libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
-	libsvm/svm_parameter.class libsvm/svm_problem.class \
+FILES =	libsvm/svm_node.class libsvm/svm_parameter.class \
+	 libsvm/svm_model.class libsvm/svm_problem.class libsvm/svm.class\
 	svm_train.class svm_predict.class svm_toy.class
 
-#JAVAC = jikes
-#JAVAC_FLAGS = -target 1.1 -source 1.3
-JAVAC = javac
-JAVAC_FLAGS =
+JAVA_TARGETDIR=${LIB_INSTDIR}/java/libsvm
+JAVAC = ecj
+#JAVAC_FLAGS = -target 1.3 -source 1.3
+CLASSPATH = .
+#JAVAC_FLAGS = --classpath=${CLASSPATH}
+JAVAC_FLAGS = -classpath ${CLASSPATH}
 
 all: $(FILES)
-	jar cvf libsvm.jar *.class libsvm/*.class
+	gjar cvf libsvm.jar *.class libsvm/*.class
 
 .java.class:
 	$(JAVAC) $(JAVAC_FLAGS) $<
@@ -17,8 +19,20 @@ all: $(FILES)
 libsvm/svm.java: libsvm/svm.m4
 	m4 libsvm/svm.m4 > libsvm/svm.java
 
+javadoc:
+	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}
+#	cp -R docs ${JAVA_TARGETDIR}
+uninstall:
+	rm -fr ${JAVA_TARGETDIR}
+
 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.orig ./java/test_applet.html
--- ./java/test_applet.html.orig	2007-09-25 11:08:29.000000000 +1000
+++ ./java/test_applet.html	2007-09-25 11:42:29.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 ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig	2007-09-25 10:07:34.000000000 +1000
+++ ./python/Makefile	2007-09-25 11:10:43.000000000 +1000
@@ -2,7 +2,14 @@ CC = g++
 SWIG ?= swig
 
 #Windows: see ../README ../Makefile.win
-PYTHON_INCLUDEDIR ?= /usr/include/python2.4
+PYTHON_TEMP:=${shell mktemp}
+PYTHON_VERSION:=${shell python -V 2> ${PYTHON_TEMP} ; cat ${PYTHON_TEMP} | awk 'BEGIN {FS= "[ .]"} {printf("%s.%s",$$2,$$3)}'; rm -f ${PYTHON_TEMP}}
+ifndef PYTHON_INCLUDEDIR
+
+PYTHON_INCLUDEDIR?= /usr/include/python${PYTHON_VERSION}
+
+endif
+PYTHON_TARGETDIR=${LIB_INSTDIR}/python${PYTHON_VERSION}/site-packages/libsvm
 
 CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
 LDFLAGS = -shared
@@ -28,3 +35,19 @@ clean:
 
 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
+
+
+


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsvm.spec	26 Sep 2007 03:34:26 -0000	1.3
+++ libsvm.spec	27 Sep 2007 00:07:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-5.patch
+Patch0:         libsvm-2.84-6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -79,6 +79,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,25 +92,34 @@
 %{_bindir}/svm-scale
 %{_bindir}/svm-train
 %{_datadir}/libsvm/examples
+%{_libdir}/libsvm/libsvm.so
+%{_libdir}/libsvm/libsvm.so.2.84
 
 %files devel
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/libsvm
 %{_includedir}/libsvm
 %{_datadir}/libsvm/src
 
 %files python
+%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
 %files java
+%defattr(-,root,root,-)
 %doc java/README-Java
 #%{_libdir}/java/libsvm/docs
 %{_libdir}/java/libsvm/libsvm.jar
 %{_libdir}/java/libsvm/test_applet.html
 
 %changelog
-* Thu Aug 30 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
+* Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
+- Add defattr to each subpackage
+- Move libsvm.so to libsvm
+
+* Thu Sep 24 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so
 


--- libsvm-2.84-5.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 00:20:41 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 20:20:41 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.79, 1.80 libsemanage-rhat.patch,
	1.26, 1.27 libsemanage.spec, 1.134, 1.135 sources, 1.81, 1.82
Message-ID: <200709270020.l8R0Kfbc008290@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8118

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
- Upgrade to latest from NSA
	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
	* Clear errno on non-fatal errors to avoid reporting them upon a
	  later error that does not set errno.
	* Improve reporting of system errors, e.g. full filesystem or read-only filesystem from Stephen Smalley.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	13 Sep 2007 12:29:42 -0000	1.79
+++ .cvsignore	27 Sep 2007 00:20:08 -0000	1.80
@@ -85,3 +85,4 @@
 libsemanage-2.0.4.tgz
 libsemanage-2.0.5.tgz
 libsemanage-2.0.6.tgz
+libsemanage-2.0.9.tgz

libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libsemanage-rhat.patch	26 Sep 2007 20:51:42 -0000	1.26
+++ libsemanage-rhat.patch	27 Sep 2007 00:20:08 -0000	1.27
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.6/include/semanage/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/handle.h libsemanage-2.0.9/include/semanage/handle.h
 --- nsalibsemanage/include/semanage/handle.h	2007-08-20 19:15:36.000000000 -0400
-+++ libsemanage-2.0.6/include/semanage/handle.h	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/include/semanage/handle.h	2007-09-26 19:49:09.000000000 -0400
 @@ -69,6 +69,10 @@
   * 1 for yes, 0 for no (default) */
  void semanage_set_create_store(semanage_handle_t * handle, int create_store);
@@ -12,9 +12,9 @@
  /* Set whether or not to disable dontaudits upon commit */
  void semanage_set_disable_dontaudit(semanage_handle_t * handle, int disable_dontaudit);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.6/Makefile
+diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-2.0.9/Makefile
 --- nsalibsemanage/Makefile	2007-07-16 14:20:39.000000000 -0400
-+++ libsemanage-2.0.6/Makefile	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/Makefile	2007-09-26 19:49:09.000000000 -0400
 @@ -1,6 +1,9 @@
  all: 
  	$(MAKE) -C src all
@@ -25,10 +25,10 @@
  pywrap: 
  	$(MAKE) -C src pywrap
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.6/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.6/src/direct_api.c	2007-09-26 16:22:31.000000000 -0400
-@@ -700,7 +700,7 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.9/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2007-09-26 19:37:44.000000000 -0400
++++ libsemanage-2.0.9/src/direct_api.c	2007-09-26 19:49:09.000000000 -0400
+@@ -702,7 +702,7 @@
  		goto cleanup;
  
  	if (sh->do_rebuild || modified) {
@@ -37,9 +37,9 @@
  	}
  
        cleanup:
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.6/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.9/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2007-09-13 08:21:11.000000000 -0400
-+++ libsemanage-2.0.6/src/genhomedircon.c	2007-09-26 16:39:40.000000000 -0400
++++ libsemanage-2.0.9/src/genhomedircon.c	2007-09-26 19:49:09.000000000 -0400
 @@ -1,5 +1,6 @@
 -/* Author: Mark Goldman   <mgoldman at tresys.com>
 - * 			Paul Rosenfeld	<prosenfeld at tresys.com>
@@ -181,7 +181,93 @@
  		ustr_sc_free(&line);
  	}
  	return STATUS_SUCCESS;
-@@ -602,7 +658,7 @@
+@@ -496,6 +552,32 @@
+ 	free(temp);
+ }
+ 
++static char *global_fallback_user=NULL;
++static char *global_fallback_user_prefix=NULL;
++
++static int set_fallback_user(const char *user, const char *prefix) {
++	free(global_fallback_user);
++	free(global_fallback_user_prefix);
++	global_fallback_user = strdup(user);
++	global_fallback_user_prefix = strdup(prefix);
++	if (!global_fallback_user || !global_fallback_user_prefix)
++		return -1;
++	return 0;
++}
++
++static char *get_fallback_user(void) {
++	return global_fallback_user;
++}
++
++static char *get_fallback_user_prefix(void) {
++	return global_fallback_user_prefix;
++}
++
++static void free_fallback_user(void) {
++	free(global_fallback_user);
++	free(global_fallback_user_prefix);
++}
++
+ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s,
+ 					     int *errors)
+ {
+@@ -538,13 +620,39 @@
+ 
+ 	for (i = 0; i < nseusers; i++) {
+ 		name = semanage_seuser_get_name(seuser_list[i]);
++		if (strcmp(name, DEFAULT_LOGIN) == 0) {
++			seuname = semanage_seuser_get_sename(seuser_list[i]);
++
++			/* find the user structure given the name */
++			u = bsearch(seuname, user_list, nusers, sizeof(semanage_user_t *),
++				    (int (*)(const void *, const void *))
++				    &name_user_cmp);
++			if (u) {
++				prefix = semanage_user_get_prefix(*u);
++			} else {
++				prefix = name;
++			}
++
++			if (set_fallback_user(seuname, prefix) != 0) {
++				*errors = STATUS_ERR;
++				goto cleanup;
++			}
++			break;
++		}
++	}
++	char *fallback_user = get_fallback_user();
++			
++	for (i = 0; i < nseusers; i++) {
++		name = semanage_seuser_get_name(seuser_list[i]);
+ 		seuname = semanage_seuser_get_sename(seuser_list[i]);
+ 
+-		if (strcmp(seuname, FALLBACK_USER) == 0)
++		if (strcmp(seuname, fallback_user) == 0)
+ 			continue;
+-		if (strcmp(seuname, DEFAULT_LOGIN) == 0)
++
++		if (strcmp(name, DEFAULT_LOGIN) == 0)
+ 			continue;
+-		if (strcmp(seuname, TEMPLATE_SEUSER) == 0)
++		
++		if (strcmp(name, TEMPLATE_SEUSER) == 0)
+ 			continue;
+ 
+ 		/* find the user structure given the name */
+@@ -563,6 +671,9 @@
+ 				*errors = STATUS_ERR;
+ 				goto cleanup;
+ 			}
++		}
++
++		if (!pwent) {
+ 			WARN(s->h_semanage,
+ 			     "user %s not in password file", name);
+ 			continue;
+@@ -602,7 +713,7 @@
  	return head;
  }
  
@@ -190,7 +276,7 @@
  				      semanage_list_t * user_context_tpl,
  				      semanage_list_t * homedir_context_tpl)
  {
-@@ -615,13 +671,13 @@
+@@ -615,13 +726,13 @@
  	}
  
  	for (; users; pop_user_entry(&users)) {
@@ -206,16 +292,35 @@
  				       users->sename, users->prefix)) {
  			return STATUS_ERR;
  		}
-@@ -671,7 +727,7 @@
+@@ -662,6 +773,14 @@
+ 		goto done;
+ 	}
+ 
++	if (write_gen_home_dir_context(s, out, user_context_tpl,
++				       homedir_context_tpl) != STATUS_SUCCESS) {
++		retval = STATUS_ERR;
++	}
++
++	char *fallback_user = get_fallback_user();
++	char *fallback_user_prefix = get_fallback_user_prefix();
++
+ 	for (h = homedirs; h; h = h->next) {
+ 		Ustr *temp = ustr_dup_cstr(h->data);
+ 
+@@ -671,16 +790,16 @@
  			goto done;
  		}
  
 -		if (write_home_dir_context(out,
+-					   homedir_context_tpl, FALLBACK_USER,
+-					   FALLBACK_USER, ustr_cstr(temp),
+-					   FALLBACK_USER_PREFIX) !=
 +		if (write_home_dir_context(s, out,
- 					   homedir_context_tpl, FALLBACK_USER,
- 					   FALLBACK_USER, ustr_cstr(temp),
- 					   FALLBACK_USER_PREFIX) !=
-@@ -680,7 +736,7 @@
++					   homedir_context_tpl, fallback_user,
++					   fallback_user, ustr_cstr(temp),
++					   fallback_user_prefix) !=
+ 		    STATUS_SUCCESS) {
+ 			ustr_sc_free(&temp);
  			retval = STATUS_ERR;
  			goto done;
  		}
@@ -224,23 +329,27 @@
  					    homeroot_context_tpl,
  					    h->data) != STATUS_SUCCESS) {
  			ustr_sc_free(&temp);
-@@ -690,13 +746,13 @@
+@@ -690,16 +809,12 @@
  
  		ustr_sc_free(&temp);
  	}
 -	if (write_user_context(out, user_context_tpl,
+-			       ".*", FALLBACK_USER,
+-			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
 +	if (write_user_context(s, out, user_context_tpl,
- 			       ".*", FALLBACK_USER,
- 			       FALLBACK_USER_PREFIX) != STATUS_SUCCESS) {
++			       ".*", fallback_user,
++			       fallback_user_prefix) != STATUS_SUCCESS) {
  		retval = STATUS_ERR;
  		goto done;
  	}
 -	if (write_gen_home_dir_context(out, s, user_context_tpl,
-+	if (write_gen_home_dir_context(s, out, user_context_tpl,
- 				       homedir_context_tpl) != STATUS_SUCCESS) {
- 		retval = STATUS_ERR;
- 	}
-@@ -711,7 +767,9 @@
+-				       homedir_context_tpl) != STATUS_SUCCESS) {
+-		retval = STATUS_ERR;
+-	}
+ 
+       done:
+ 	/* Cleanup */
+@@ -711,7 +826,9 @@
  	return retval;
  }
  
@@ -251,7 +360,15 @@
  {
  	genhomedircon_settings_t s;
  	FILE *out = NULL;
-@@ -725,6 +783,7 @@
+@@ -719,12 +836,15 @@
+ 
+ 	assert(sh);
+ 
++	set_fallback_user(FALLBACK_USER, FALLBACK_USER_PREFIX);
++
+ 	s.homedir_template_path =
+ 	    semanage_path(SEMANAGE_TMP, SEMANAGE_HOMEDIR_TMPL);
+ 	s.fcfilepath = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_HOMEDIRS);
  
  	s.usepasswd = usepasswd;
  	s.h_semanage = sh;
@@ -259,9 +376,18 @@
  
  	if (!(out = fopen(s.fcfilepath, "w"))) {
  		/* couldn't open output file */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.6/src/genhomedircon.h
+@@ -735,5 +855,8 @@
+ 	retval = write_context_file(&s, out);
+ 
+ 	fclose(out);
++
++	free_fallback_user();
++
+ 	return retval;
+ }
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.h libsemanage-2.0.9/src/genhomedircon.h
 --- nsalibsemanage/src/genhomedircon.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/genhomedircon.h	2007-09-26 16:22:31.000000000 -0400
++++ libsemanage-2.0.9/src/genhomedircon.h	2007-09-26 19:49:09.000000000 -0400
 @@ -22,6 +22,7 @@
  
  #include "utilities.h"
@@ -271,9 +397,9 @@
 +			   sepol_policydb_t * policydb, int usepasswd);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.6/src/handle.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.9/src/handle.c
 --- nsalibsemanage/src/handle.c	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.6/src/handle.c	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/handle.c	2007-09-26 19:49:09.000000000 -0400
 @@ -68,6 +68,7 @@
  	/* By default do not create store */
  	sh->create_store = 0;
@@ -298,9 +424,9 @@
  void semanage_set_create_store(semanage_handle_t * sh, int create_store)
  {
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.6/src/handle.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.h libsemanage-2.0.9/src/handle.h
 --- nsalibsemanage/src/handle.h	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.6/src/handle.h	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/handle.h	2007-09-26 19:49:09.000000000 -0400
 @@ -58,6 +58,7 @@
  	int is_connected;
  	int is_in_transaction;
@@ -309,9 +435,9 @@
  	int do_rebuild;		/* whether to rebuild policy if there were no changes */
  	int modules_modified;
  	int create_store;	/* whether to create the store if it does not exist
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.6/src/libsemanage.map
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.9/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2007-08-20 19:15:37.000000000 -0400
-+++ libsemanage-2.0.6/src/libsemanage.map	2007-09-26 16:22:02.000000000 -0400
++++ libsemanage-2.0.9/src/libsemanage.map	2007-09-26 19:49:09.000000000 -0400
 @@ -9,6 +9,7 @@
  	  semanage_module_list_nth; semanage_module_get_name;
  	  semanage_module_get_version; semanage_select_store;
@@ -320,10 +446,10 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.6/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/semanage_store.c	2007-09-26 16:22:31.000000000 -0400
-@@ -1130,7 +1130,7 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.9/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2007-09-26 19:37:44.000000000 -0400
++++ libsemanage-2.0.9/src/semanage_store.c	2007-09-26 19:49:09.000000000 -0400
+@@ -1148,7 +1148,7 @@
  
        skip_reload:
  
@@ -332,7 +458,7 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1257,7 +1257,8 @@
+@@ -1279,7 +1279,8 @@
   * should be placed within a mutex lock to ensure that it runs
   * atomically.	Returns commit number on success, -1 on error.
   */
@@ -342,7 +468,7 @@
  {
  	int retval = -1, commit_num = -1;
  
-@@ -1272,7 +1273,7 @@
+@@ -1294,7 +1295,7 @@
  	}
  	if (!sh->conf->disable_genhomedircon) {
  		if ((retval =
@@ -351,9 +477,9 @@
  			ERR(sh, "semanage_genhomedircon returned error code %d.",
  			    retval);
  			goto cleanup;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.6/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.9/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2007-08-23 16:52:25.000000000 -0400
-+++ libsemanage-2.0.6/src/semanage_store.h	2007-09-26 16:22:31.000000000 -0400
++++ libsemanage-2.0.9/src/semanage_store.h	2007-09-26 20:10:59.000000000 -0400
 @@ -83,8 +83,6 @@
  int semanage_get_modules_names(semanage_handle_t * sh,
  			       char ***filenames, int *len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- libsemanage.spec	26 Sep 2007 20:51:43 -0000	1.134
+++ libsemanage.spec	27 Sep 2007 00:20:09 -0000	1.135
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.6
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
+- Upgrade to latest from NSA
+	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
+	* Clear errno on non-fatal errors to avoid reporting them upon a
+	  later error that does not set errno.
+	* Improve reporting of system errors, e.g. full filesystem or read-only filesystem from Stephen Smalley.
+
+- Fix segfault in genhomedircon when using bad user names
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.6-2
 - Fix genhomedircon code to only generate valid context
 - Fixes autorelabel problem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	13 Sep 2007 12:29:42 -0000	1.81
+++ sources	27 Sep 2007 00:20:09 -0000	1.82
@@ -1 +1 @@
-ee1ccbd5cb4f0a08f85dd92a861283f8  libsemanage-2.0.6.tgz
+c241e659ddab751e036c3e770583e95c  libsemanage-2.0.9.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:24:08 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Wed, 26 Sep 2007 20:24:08 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.123, 1.124 libsepol.spec, 1.165, 
	1.166 sources, 1.124, 1.125
Message-ID: <200709270024.l8R0O8j3008521@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.11-1
	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	18 Sep 2007 20:29:51 -0000	1.123
+++ .cvsignore	27 Sep 2007 00:23:36 -0000	1.124
@@ -123,3 +123,4 @@
 libsepol-2.0.7.tgz
 libsepol-2.0.9.tgz
 libsepol-2.0.10.tgz
+libsepol-2.0.11.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- libsepol.spec	18 Sep 2007 20:29:51 -0000	1.165
+++ libsepol.spec	27 Sep 2007 00:23:36 -0000	1.166
@@ -1,7 +1,7 @@
 
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.10
+Version: 2.0.11
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -86,6 +86,9 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.11-1
+	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.
+
 * Tue Sep 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
 - Upgrade to latest from NSA
 	* Merged support for the handle_unknown policydb flag from Eric Paris.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- sources	18 Sep 2007 20:29:51 -0000	1.124
+++ sources	27 Sep 2007 00:23:36 -0000	1.125
@@ -1 +1 @@
-0183e0fed49daa76c059d11fa2949ff6  libsepol-2.0.10.tgz
+e18a93af3185a57c354b880f5bab9f46  libsepol-2.0.11.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:44:08 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Wed, 26 Sep 2007 20:44:08 -0400
Subject: rpms/kernel/devel linux-2.6-at76.patch, NONE,
	1.1 linux-2.6-ath5k.patch, NONE,
	1.1 linux-2.6-mac80211-extras.patch, NONE,
	1.1 linux-2.6-zd1211rw-mac80211.patch, NONE, 1.1 kernel.spec,
	1.191, 1.192 linux-2.6-wireless-pending.patch, 1.4,
	1.5 git-wireless-dev.patch, 1.36, NONE
Message-ID: <200709270044.l8R0i84V009142@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9101

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
Added Files:
	linux-2.6-at76.patch linux-2.6-ath5k.patch 
	linux-2.6-mac80211-extras.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Removed Files:
	git-wireless-dev.patch 
Log Message:
Update and restructure wireless patches

linux-2.6-at76.patch:

--- NEW FILE linux-2.6-at76.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:57:31.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 19:59:33.000000000 -0400
@@ -685,6 +685,15 @@ W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
 S:	Maintained
 
+ATMEL USB WIRELESS DRIVER
+P:	Pavel Roskin
+M:	proski at gnu.org
+L:	linux-wireless at vger.kernel.org
+L:	at76c503a-user at lists.berlios.de
+L:	at76c503a-develop at lists.berlios.de
+W:	http://at76c503a.berlios.de/
+S:	Maintained
+
 AUDIT SUBSYSTEM
 P:	David Woodhouse
 M:	dwmw2 at infradead.org
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h	2007-09-26 19:59:33.000000000 -0400
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) 2002,2003 Oliver Kurth
+ *	     (c) 2003,2004 Joerg Albert <joerg.albert at gmx.de>
+ *	     (c) 2007 Guido Guenther <agx at sigxcpu.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 driver was based on information from the Sourceforge driver
+ * released and maintained by Atmel:
+ *
+ *  http://sourceforge.net/projects/atmelwlandriver/
+ *
+ * Although the code was completely re-written,
+ * it would have been impossible without Atmel's decision to
+ * release an Open Source driver (unfortunately the firmware was
+ * kept binary only). Thanks for that decision to Atmel!
+ */
+
+#ifndef _AT76_USB_H
+#define _AT76_USB_H
+
+#include <net/ieee80211.h>
+
+/* current driver version */
+#define DRIVER_VERSION	"0.16"
+
+/* Board types */
+enum board_type {
+	BOARD_503_ISL3861 = 1,
+	BOARD_503_ISL3863 = 2,
+	BOARD_503 = 3,
+	BOARD_503_ACC = 4,
+	BOARD_505 = 5,
+	BOARD_505_2958 = 6,
+	BOARD_505A = 7,
+	BOARD_505AMX = 8
+};
+
+/* our private ioctl's */
+/* preamble length (0 - long, 1 - short, 2 - auto) */
+#define AT76_SET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 0)
+#define AT76_GET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 1)
+/* which debug channels are enabled */
+#define AT76_SET_DEBUG			(SIOCIWFIRSTPRIV + 2)
+#define AT76_GET_DEBUG			(SIOCIWFIRSTPRIV + 3)
+/* power save mode (incl. the Atmel proprietary smart save mode) */
+#define AT76_SET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 4)
+#define AT76_GET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 5)
+/* min and max channel times for scan */
+#define AT76_SET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 6)
+#define AT76_GET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 7)
+/* scan mode (0 - active, 1 - passive) */
+#define AT76_SET_SCAN_MODE		(SIOCIWFIRSTPRIV + 8)
+#define AT76_GET_SCAN_MODE		(SIOCIWFIRSTPRIV + 9)
+
+#define CMD_STATUS_IDLE				0x00
+#define CMD_STATUS_COMPLETE			0x01
+#define CMD_STATUS_UNKNOWN			0x02
+#define CMD_STATUS_INVALID_PARAMETER		0x03
+#define CMD_STATUS_FUNCTION_NOT_SUPPORTED	0x04
+#define CMD_STATUS_TIME_OUT			0x07
+#define CMD_STATUS_IN_PROGRESS			0x08
+#define CMD_STATUS_HOST_FAILURE			0xff
+#define CMD_STATUS_SCAN_FAILED			0xf0
+
+/* answers to get op mode */
+#define OPMODE_NONE				0x00
+#define OPMODE_NORMAL_NIC_WITH_FLASH		0x01
+#define OPMODE_HW_CONFIG_MODE			0x02
+#define OPMODE_DFU_MODE_WITH_FLASH		0x03
+#define OPMODE_NORMAL_NIC_WITHOUT_FLASH		0x04
+
+#define CMD_SET_MIB		0x01
+#define CMD_GET_MIB		0x02
+#define CMD_SCAN		0x03
+#define CMD_JOIN		0x04
+#define CMD_START_IBSS		0x05
+#define CMD_RADIO		0x06
+#define CMD_STARTUP		0x0B
+#define CMD_GETOPMODE		0x33
+
+#define MIB_LOCAL		0x01
+#define MIB_MAC_ADDR		0x02
+#define MIB_MAC			0x03
+#define MIB_MAC_MGMT		0x05
+#define MIB_MAC_WEP		0x06
+#define MIB_PHY			0x07
+#define MIB_FW_VERSION		0x08
+#define MIB_MDOMAIN		0x09
+
+#define ADHOC_MODE		1
+#define INFRASTRUCTURE_MODE	2
+
+/* values for struct mib_local, field preamble_type */
+#define PREAMBLE_TYPE_LONG	0
+#define PREAMBLE_TYPE_SHORT	1
+#define PREAMBLE_TYPE_AUTO	2
+
+/* values for tx_rate */
+#define TX_RATE_1MBIT		0
+#define TX_RATE_2MBIT		1
+#define TX_RATE_5_5MBIT 	2
+#define TX_RATE_11MBIT		3
+#define TX_RATE_AUTO		4
+
+/* power management modes */
+#define AT76_PM_OFF		1
+#define AT76_PM_ON		2
+#define AT76_PM_SMART		3
+
+struct hwcfg_r505 {
+	u8 cr39_values[14];
+	u8 reserved1[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 reserved2[14];
+	u8 cr15_values[14];
+	u8 reserved3[3];
+} __attribute__((packed));
+
+struct hwcfg_rfmd {
+	u8 cr20_values[14];
+	u8 cr21_values[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 low_power_values[14];
+	u8 normal_power_values[14];
+	u8 reserved1[3];
+} __attribute__((packed));
+
+struct hwcfg_intersil {
+	u8 mac_addr[ETH_ALEN];
+	u8 cr31_values[14];
+	u8 cr58_values[14];
+	u8 pidvid[4];
+	u8 regulatory_domain;
+	u8 reserved[1];
+} __attribute__((packed));
+
+union at76_hwcfg {
+	struct hwcfg_intersil i;
+	struct hwcfg_rfmd r3;
+	struct hwcfg_r505 r5;
+};
+
+#define WEP_SMALL_KEY_LEN	(40 / 8)
+#define WEP_LARGE_KEY_LEN	(104 / 8)
+
+struct at76_card_config {
+	u8 exclude_unencrypted;
+	u8 promiscuous_mode;
+	u8 short_retry_limit;
+	u8 encryption_type;
+	__le16 rts_threshold;
+	__le16 fragmentation_threshold;	/* 256..2346 */
+	u8 basic_rate_set[4];
+	u8 auto_rate_fallback;	/* 0,1 */
+	u8 channel;
+	u8 privacy_invoked;
+	u8 wep_default_key_id;	/* 0..3 */
+	u8 current_ssid[32];
+	u8 wep_default_key_value[4][WEP_KEY_LEN];
+	u8 ssid_len;
+	u8 short_preamble;
+	__le16 beacon_period;
+} __attribute__((packed));
+
+struct at76_command {
+	u8 cmd;
[...5873 lines suppressed...]
+{
+	int ret;
+	struct at76_priv *priv;
+	struct fwentry *fwe;
+	struct usb_device *udev;
+	int op_mode;
+	int need_ext_fw = 0;
+	struct mib_fw_version fwv;
+	int board_type = (int)id->driver_info;
+
+	udev = usb_get_dev(interface_to_usbdev(interface));
+
+	/* Load firmware into kernel memory */
+	fwe = at76_load_firmware(udev, board_type);
+	if (!fwe) {
+		ret = -ENOENT;
+		goto error;
+	}
+
+	op_mode = at76_get_op_mode(udev);
+
+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
+
+	/* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ???
+	   we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */
+
+	if (op_mode == OPMODE_HW_CONFIG_MODE) {
+		err("cannot handle a device in HW_CONFIG_MODE (opmode %d)",
+		    op_mode);
+		ret = -EBUSY;
+		goto error;
+	}
+
+	if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH
+	    && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
+		/* download internal firmware part */
+		at76_dbg(DBG_DEVSTART, "downloading internal firmware");
+		ret = at76_load_internal_fw(udev, fwe);
+		if (ret < 0) {
+			err("error %d downloading internal firmware", ret);
+			goto error;
+		}
+		usb_put_dev(udev);
+		return ret;
+	}
+
+	/* Internal firmware already inside the device.  Get firmware
+	 * version to test if external firmware is loaded.
+	 * This works only for newer firmware, e.g. the Intersil 0.90.x
+	 * says "control timeout on ep0in" and subsequent
+	 * at76_get_op_mode() fail too :-( */
+
+	/* if version >= 0.100.x.y or device with built-in flash we can
+	 * query the device for the fw version */
+	if ((fwe->fw_version.major > 0 || fwe->fw_version.minor >= 100)
+	    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0 || (fwv.major | fwv.minor) == 0)
+			need_ext_fw = 1;
+	} else
+		/* No way to check firmware version, reload to be sure */
+		need_ext_fw = 1;
+
+	if (need_ext_fw) {
+		at76_dbg(DBG_DEVSTART, "downloading external firmware");
+
+		ret = at76_load_external_fw(udev, fwe);
+		if (ret)
+			goto error;
+
+		/* Re-check firmware version */
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0) {
+			err("error %d getting firmware version", ret);
+			goto error;
+		}
+
+		/* Major and minor version must match */
+		if (fwv.major != fwe->fw_version.major
+		    || fwv.minor != fwe->fw_version.minor) {
+			printk(KERN_ERR DRIVER_NAME
+			       ": wrong firmware version, loaded %d.%d.%d-%d, "
+			       "read back %d.%d.%d-%d\n",
+			       fwe->fw_version.major, fwe->fw_version.minor,
+			       fwe->fw_version.patch, fwe->fw_version.build,
+			       fwv.major, fwv.minor, fwv.patch, fwv.build);
+			ret = -EBUSY;
+			goto error;
+		}
+	}
+
+	priv = at76_alloc_new_device(udev);
+	if (!priv) {
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	SET_NETDEV_DEV(priv->netdev, &interface->dev);
+	usb_set_intfdata(interface, priv);
+
+	memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
+	priv->board_type = board_type;
+
+	ret = at76_init_new_device(priv, interface);
+	if (ret < 0)
+		at76_delete_device(priv);
+
+	return ret;
+
+error:
+	usb_put_dev(udev);
+	return ret;
+}
+
+static void at76_disconnect(struct usb_interface *interface)
+{
+	struct at76_priv *priv;
+
+	priv = usb_get_intfdata(interface);
+	usb_set_intfdata(interface, NULL);
+
+	/* Disconnect after loading internal firmware */
+	if (!priv)
+		return;
+
+	printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
+	at76_delete_device(priv);
+	printk(KERN_INFO DRIVER_NAME ": disconnected\n");
+}
+
+/* Structure for registering this driver with the USB subsystem */
+static struct usb_driver at76_driver = {
+	.name = DRIVER_NAME,
+	.probe = at76_probe,
+	.disconnect = at76_disconnect,
+	.id_table = dev_table,
+};
+
+static int __init at76_mod_init(void)
+{
+	int result;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");
+
+	mutex_init(&fw_mutex);
+
+	/* register this driver with the USB subsystem */
+	result = usb_register(&at76_driver);
+	if (result < 0)
+		err("usb_register failed (status %d)", result);
+
+	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
+	return result;
+}
+
+static void __exit at76_mod_exit(void)
+{
+	int i;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
+	usb_deregister(&at76_driver);
+	for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
+		if (firmwares[i].fw)
+			release_firmware(firmwares[i].fw);
+	}
+	led_trigger_unregister_simple(ledtrig_tx);
+}
+
+module_param_named(debug, at76_debug, int, 0600);
+MODULE_PARM_DESC(debug, "Debugging level");
+
+module_init(at76_mod_init);
+module_exit(at76_mod_exit);
+
+MODULE_AUTHOR("Oliver Kurth <oku at masqmail.cx>");
+MODULE_AUTHOR("Joerg Albert <joerg.albert at gmx.de>");
+MODULE_AUTHOR("Alex <alex at foogod.com>");
+MODULE_AUTHOR("Nick Jones");
+MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453 at hotmail.com>");
+MODULE_AUTHOR("Pavel Roskin <proski at gnu.org>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 19:57:31.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 19:59:33.000000000 -0400
@@ -381,6 +381,14 @@ config PCI_HERMES
 	  common.  Some of the built-in wireless adaptors in laptops are of
 	  this variety.
 
+config USB_ATMEL
+	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
+	depends on WLAN_80211 && USB
+	select FW_LOADER
+	---help---
+	  Enable support for USB Wireless devices using Atmel at76c503,
+	  at76c505 or at76c505a chips.
+
 config PCMCIA_HERMES
 	tristate "Hermes PCMCIA card support"
 	depends on PCMCIA && HERMES

linux-2.6-ath5k.patch:

--- NEW FILE linux-2.6-ath5k.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:59:33.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:00:12.000000000 -0400
@@ -642,6 +642,14 @@ M:	ecashin at coraid.com
 W:	http://www.coraid.com/support/linux
 S:	Supported
 
+ATHEROS ATH5K WIRELESS DRIVER
+P:	Jiri Slaby
+M:	jirislaby at gmail.com
+P:	Luis R. Rodriguez
+M:	mcgrof at gmail.com
+L:	linux-wireless at vger.kernel.org
+S:	Maintained
+
 ATL1 ETHERNET DRIVER
 P:	Jay Cliburn
 M:	jcliburn at gmail.com
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-26 20:00:12.000000000 -0400
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
+ *
+ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _ATH5K_H
+#define _ATH5K_H
+
+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
+ * long and results timeouts). It's also illegal to tune to some of the
+ * supported frequencies in some countries, so use this at your own risk,
+ * you've been warned. */
+#define CHAN_DEBUG	0
+
+/* Uncomment this for debuging (warning that it results in TOO much output) */
+/*#define AR5K_DEBUG	1 */
+
+#include <linux/types.h>
+#include <net/mac80211.h>
+
+#include "ath5k_hw.h"
+#include "ath5k_regdom.h"
+
+/* PCI IDs */
+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
+
+/****************************\
+  GENERIC DRIVER DEFINITIONS
+\****************************/
+
+#define AR5K_PRINTF(fmt, ...)   printk("%s: " fmt, __func__, ##__VA_ARGS__)
+#define AR5K_PRINT(fmt)         printk("%s: " fmt, __func__)
+#ifdef AR5K_DEBUG
+#define AR5K_TRACE              printk(KERN_DEBUG "%s:%d\n", __func__, __LINE__)
+#else
+#define AR5K_TRACE
+#endif
+
+/*
+ * Some tuneable values (these should be changeable by the user)
+ */
+#define AR5K_TUNE_DMA_BEACON_RESP		2
+#define AR5K_TUNE_SW_BEACON_RESP		10
+#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0
+#define AR5K_TUNE_RADAR_ALERT			false
+#define AR5K_TUNE_MIN_TX_FIFO_THRES		1
+#define AR5K_TUNE_MAX_TX_FIFO_THRES		((IEEE80211_MAX_LEN / 64) + 1)
+#define AR5K_TUNE_RSSI_THRES			1792
+#define AR5K_TUNE_REGISTER_TIMEOUT		20000
+#define AR5K_TUNE_REGISTER_DWELL_TIME		20000
+#define AR5K_TUNE_BEACON_INTERVAL		100
+#define AR5K_TUNE_AIFS				2
+#define AR5K_TUNE_AIFS_11B			2
+#define AR5K_TUNE_AIFS_XR			0
+#define AR5K_TUNE_CWMIN				15
+#define AR5K_TUNE_CWMIN_11B			31
+#define AR5K_TUNE_CWMIN_XR			3
+#define AR5K_TUNE_CWMAX				1023
+#define AR5K_TUNE_CWMAX_11B			1023
+#define AR5K_TUNE_CWMAX_XR			7
+#define AR5K_TUNE_NOISE_FLOOR			-72
+#define AR5K_TUNE_MAX_TXPOWER			60
+#define AR5K_TUNE_DEFAULT_TXPOWER		30
+#define AR5K_TUNE_TPC_TXPOWER			true
+#define AR5K_TUNE_ANT_DIVERSITY			true
+#define AR5K_TUNE_HWTXTRIES			4
+
+/* token to use for aifs, cwmin, cwmax in MadWiFi */
+#define	AR5K_TXQ_USEDEFAULT	((u32) -1)
+
+/* GENERIC CHIPSET DEFINITIONS */
+
+/* MAC Chips */
+enum ath5k_version {
+	AR5K_AR5210	= 0,
+	AR5K_AR5211	= 1,
+	AR5K_AR5212	= 2,
+};
+
+/* PHY Chips */
+enum ath5k_radio {
+	AR5K_RF5110	= 0,
+	AR5K_RF5111	= 1,
+	AR5K_RF5112	= 2,
+};
+
+/*
+ * Common silicon revision/version values
+ */
+enum ath5k_srev_type {
+	AR5K_VERSION_VER,
+	AR5K_VERSION_REV,
+	AR5K_VERSION_RAD,
+	AR5K_VERSION_DEV
+};
+
+struct ath5k_srev_name {
+	const char		*sr_name;
+	enum ath5k_srev_type	sr_type;
+	u_int			sr_val;
+};
+
+#define AR5K_SREV_NAME	{						\
+	{ "5210",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5210 },	\
+	{ "5311",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311 },	\
+	{ "5311a",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311A },\
+	{ "5311b",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311B },\
+	{ "5211",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5211 },	\
+	{ "5212",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5212 },	\
+	{ "5213",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213 },	\
+	{ "xxxx",	AR5K_VERSION_VER,	AR5K_SREV_UNKNOWN },	\
+	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },	\
+	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },	\
+	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },	\
+	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },	\
+	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\
+	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },	\
+	{ "2112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },	\
+	{ "xxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },	\
+	{ "2413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR2413 },\
+	{ "5413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5413 },\
+	{ "5424",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5424 },\
+	{ "xxxx",	AR5K_VERSION_DEV,	AR5K_SREV_UNKNOWN }	\
+}
+
+#define AR5K_SREV_UNKNOWN	0xffff
+
+#define AR5K_SREV_VER_AR5210	0x00
+#define AR5K_SREV_VER_AR5311	0x10
+#define AR5K_SREV_VER_AR5311A	0x20
+#define AR5K_SREV_VER_AR5311B	0x30
+#define AR5K_SREV_VER_AR5211	0x40
+#define AR5K_SREV_VER_AR5212	0x50
+#define AR5K_SREV_VER_AR5213	0x55
+#define AR5K_SREV_VER_UNSUPP	0x60
+
+#define AR5K_SREV_RAD_5110	0x00
+#define AR5K_SREV_RAD_5111	0x10
+#define AR5K_SREV_RAD_5111A	0x15
[...13868 lines suppressed...]
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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 NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.20 2005/01/24 20:31:24 sam Exp $
+ */
+
+/*
+ * Defintions for the Atheros Wireless LAN controller driver.
+ */
+#ifndef _DEV_ATH_ATHVAR_H
+#define _DEV_ATH_ATHVAR_H
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/wireless.h>
+#include <linux/if_ether.h>
+
+#include "ath5k.h"
+
+#define	ATH_TIMEOUT		1000
+
+#define ATH_LONG_CALIB		30 /* seconds */
+#define ATH_SHORT_CALIB		1
+
+/*
+ * Maximum acceptable MTU
+ * MAXFRAMEBODY - WEP - QOS - RSN/WPA:
+ * 2312 - 8 - 2 - 12 = 2290
+ */
+#define ATH_MAX_MTU	2290
+#define ATH_MIN_MTU	32
+
+#define	ATH_RXBUF	40		/* number of RX buffers */
+#define	ATH_TXBUF	200		/* number of TX buffers */
+#define	ATH_TXDESC	1		/* number of descriptors per buffer */
+#define ATH_BCBUF	1		/* number of beacon buffers */
+#define	ATH_TXMAXTRY	11		/* max number of transmit attempts */
+#define	ATH_TXINTR_PERIOD 5		/* max number of batched tx descriptors */
+
+#define ATH_BEACON_AIFS_DEFAULT  0	/* default aifs for ap beacon q */
+#define ATH_BEACON_CWMIN_DEFAULT 0	/* default cwmin for ap beacon q */
+#define ATH_BEACON_CWMAX_DEFAULT 0	/* default cwmax for ap beacon q */
+
+#define ATH_RSSI_LPF_LEN	10
+#define ATH_RSSI_DUMMY_MARKER	0x127
+#define ATH_EP_MUL(x, mul)	((x) * (mul))
+#define ATH_RSSI_IN(x)		(ATH_EP_MUL((x), AR5K_RSSI_EP_MULTIPLIER))
+#define ATH_LPF_RSSI(x, y, len) \
+    ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
+#define ATH_RSSI_LPF(x, y) do {						\
+	if ((y) >= -20)							\
+		x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
+} while (0)
+
+struct ath_buf {
+	struct list_head	list;
+	unsigned int		flags;	/* tx descriptor flags */
+	struct ath_desc		*desc;	/* virtual addr of desc */
+	dma_addr_t		daddr;	/* physical addr of desc */
+	struct sk_buff		*skb;	/* skbuff for buf */
+	dma_addr_t		skbaddr;/* physical addr of skb data */
+	struct ieee80211_tx_control ctl;
+};
+
+/*
+ * Data transmit queue state.  One of these exists for each
+ * hardware transmit queue.  Packets sent to us from above
+ * are assigned to queues based on their priority.  Not all
+ * devices support a complete set of hardware transmit queues.
+ * For those devices the array sc_ac2q will map multiple
+ * priorities to fewer hardware queues (typically all to one
+ * hardware queue).
+ */
+struct ath_txq {
+	unsigned int	qnum;		/* hardware q number */
+	u32		*link;		/* link ptr in last TX desc */
+	struct list_head q;		/* transmit queue */
+	spinlock_t	lock;		/* lock on q and link */
+	bool		setup;
+};
+
+#if CHAN_DEBUG
+#define ATH_CHAN_MAX	(26+26+26+200+200)
+#else
+#define ATH_CHAN_MAX	(14+14+14+252+20)	/* XXX what's the max? */
+#endif
+
+struct ath_softc {
+	struct pci_dev		*pdev;		/* for dma mapping */
+	void __iomem		*iobase;	/* address of the device */
+	struct mutex		lock;		/* dev-level lock */
+	struct ieee80211_tx_queue_stats tx_stats;
+	struct ieee80211_low_level_stats ll_stats;
+	struct ieee80211_hw	*hw;		/* IEEE 802.11 common */
+	struct ieee80211_hw_mode modes[NUM_IEEE80211_MODES];
+	struct ieee80211_channel channels[ATH_CHAN_MAX];
+	struct ieee80211_rate	rates[AR5K_MAX_RATES * NUM_IEEE80211_MODES];
+	enum ieee80211_if_types	opmode;
+	struct ath_hw		*ah;		/* Atheros HW */
+
+	int			debug;
+
+	struct ath_buf		*bufptr;	/* allocated buffer ptr */
+	struct ath_desc		*desc;		/* TX/RX descriptors */
+	dma_addr_t		desc_daddr;	/* DMA (physical) address */
+	size_t			desc_len;	/* size of TX/RX descriptors */
+	u16			cachelsz;	/* cache line size */
+
+	DECLARE_BITMAP(status, 6);
+#define ATH_STAT_INVALID	0		/* disable hardware accesses */
+#define ATH_STAT_MRRETRY	1		/* multi-rate retry support */
+#define ATH_STAT_PROMISC	2
+#define ATH_STAT_LEDBLINKING	3		/* LED blink operation active */
+#define ATH_STAT_LEDENDBLINK	4		/* finish LED blink operation */
+#define ATH_STAT_LEDSOFT	5		/* enable LED gpio status */
+
+	unsigned int		curmode;	/* current phy mode */
+	struct ieee80211_channel *curchan;	/* current h/w channel */
+
+	int 			iface_id;	/* add/remove_interface id */
+
+	struct {
+		u8	rxflags;	/* radiotap rx flags */
+		u8	txflags;	/* radiotap tx flags */
+		u16	ledon;		/* softled on time */
+		u16	ledoff;		/* softled off time */
+	} hwmap[32];				/* h/w rate ix mappings */
+
+	enum ath5k_int		imask;		/* interrupt mask copy */
+
+	DECLARE_BITMAP(keymap, AR5K_KEYCACHE_SIZE); /* key use bit map */
+
+	u8			bssidmask[ETH_ALEN];
+
+	unsigned int		led_pin,	/* GPIO pin for driving LED */
+				led_on,		/* pin setting for LED on */
+				led_off;	/* off time for current blink */
+	struct timer_list	led_tim;	/* led off timer */
+	u8			led_rxrate;	/* current rx rate for LED */
+	u8			led_txrate;	/* current tx rate for LED */
+
+	struct tasklet_struct	restq;		/* reset tasklet */
+
+	unsigned int		rxbufsize;	/* rx size based on mtu */
+	struct list_head	rxbuf;		/* receive buffer */
+	spinlock_t		rxbuflock;
+	u32			*rxlink;	/* link ptr in last RX desc */
+	struct tasklet_struct	rxtq;		/* rx intr tasklet */
+
+	struct list_head	txbuf;		/* transmit buffer */
+	spinlock_t		txbuflock;
+	unsigned int		txbuf_len;	/* buf count in txbuf list */
+	struct ath_txq		txqs[2];	/* beacon and tx */
+
+	struct ath_txq		*txq;		/* beacon and tx*/
+	struct tasklet_struct	txtq;		/* tx intr tasklet */
+
+	struct ath_buf		*bbuf;		/* beacon buffer */
+	unsigned int		bhalq,		/* HAL q for outgoing beacons */
+				bmisscount,	/* missed beacon transmits */
+				bintval,	/* beacon interval */
+				bsent;
+
+	struct timer_list	calib_tim;	/* calibration timer */
+};
+
+#define ath5k_hw_hasbssidmask(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_BSSIDMASK, 0, NULL) == 0)
+#define ath5k_hw_hasveol(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
+
+#endif

linux-2.6-mac80211-extras.patch:

--- NEW FILE linux-2.6-mac80211-extras.patch ---
diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-26 20:24:17.000000000 -0400
+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-26 20:24:22.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
 } __attribute__ ((packed));
 
 
+struct ieee80211_ht_capability {
+	__le16 capabilities_info;
+	u8 mac_ht_params_info;
+	u8 supported_mcs_set[16];
+	__le16 extended_ht_capability_info;
+	__le32 tx_BF_capability_info;
+	u8 antenna_selection_info;
+}__attribute__ ((packed));
+
+struct ieee80211_ht_additional_info {
+	u8 control_chan;
+	u8 ht_param;
+	__le16 operation_mode;
+	__le16 stbc_param;
+	u8 basic_set[16];
+}__attribute__ ((packed));
+
+
+#define IEEE80211_TSINFO_TYPE(a)	((a.byte1 & 0x01) >> 0)
+#define IEEE80211_TSINFO_TSID(a)	((a.byte1 & 0x1E) >> 1)
+#define IEEE80211_TSINFO_DIR(a)		((a.byte1 & 0x60) >> 5)
+#define IEEE80211_TSINFO_POLICY(a)	((a.byte1 & 0x80) >> 7 + \
+					 (a.byte2 & 0x01) << 1)
+#define IEEE80211_TSINFO_AGG(a)		((a.byte2 & 0x02) >> 1)
+#define IEEE80211_TSINFO_APSD(a)	((a.byte2 & 0x04) >> 2)
+#define IEEE80211_TSINFO_UP(a)		((a.byte2 & 0x38) >> 3)
+#define IEEE80211_TSINFO_ACK(a)		((a.byte2 & 0xC0) >> 6)
+#define IEEE80211_TSINFO_SCHEDULE(a)	((a.byte3 & 0x01) >> 0)
+
+#define IEEE80211_SET_TSINFO_TYPE(i, d)		(i.byte1 |= (d << 0) & 0x01)
+#define IEEE80211_SET_TSINFO_TSID(i, d)		(i.byte1 |= (d << 1) & 0x1E)
+#define IEEE80211_SET_TSINFO_DIR(i, d)		(i.byte1 |= (d << 5) & 0x60)
+#define IEEE80211_SET_TSINFO_POLICY(i, d)	\
+do {						\
+						i.byte1 |= (d & 0x01) << 7; \
+						i.byte2 |= (d & 0x02) >> 1; \
+} while(0)
+#define IEEE80211_SET_TSINFO_AGG(i, d)		(i.byte2 |= (d << 1) & 0x02)
+#define IEEE80211_SET_TSINFO_APSD(i, d)		(i.byte2 |= (d << 2) & 0x04)
+#define IEEE80211_SET_TSINFO_UP(i, d)		(i.byte2 |= (d << 3) & 0x38)
+#define IEEE80211_SET_TSINFO_ACK(i, d)		(i.byte2 |= (d << 6) & 0xC0)
+#define IEEE80211_SET_TSINFO_SCHEDULE(i, d)	(i.byte3 |= (d << 0) & 0x01)
+
+struct ieee80211_ts_info {
+	u8 byte1;
+	u8 byte2;
+	u8 byte3;
+} __attribute__ ((packed));
+
+struct ieee80211_elem_tspec {
+	struct ieee80211_ts_info ts_info;
+	__le16 nominal_msdu_size;
+	__le16 max_msdu_size;
+	__le32 min_service_interval;
+	__le32 max_service_interval;
+	__le32 inactivity_interval;
+	__le32 suspension_interval;
+	__le32 service_start_time;
+	__le32 min_data_rate;
+	__le32 mean_data_rate;
+	__le32 peak_data_rate;
+	__le32 burst_size;
+	__le32 delay_bound;
+	__le32 min_phy_rate;
+	__le16 surplus_band_allow;
+	__le16 medium_time;
+} __attribute__ ((packed));
+
+
 struct ieee80211_mgmt {
 	__le16 frame_control;
 	__le16 duration;
@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
 				struct {
 					u8 action_code;
 					u8 dialog_token;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_req;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status_code;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_resp;
+				struct {
+					u8 action_code;
+					struct ieee80211_ts_info ts_info;
+					__le16 reason_code;
+				} __attribute__ ((packed)) delts;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
 					u8 status_code;
 					u8 variable[0];
 				} __attribute__ ((packed)) wme_action;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 capab_info;
+					__le16 timeout;
+					/* Followed by Supported Rates and
+					 * Extended Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_req;
+				struct {
+					u8 action_code;
+					__le16 status_code;
+					u8 dest[6];
+					u8 src[6];
+					/* Followed by Capability Information,
+					 * Supported Rates and Extended
+					 * Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_resp;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 reason_code;
+				} __attribute__ ((packed)) dls_teardown;
 				struct{
 					u8 action_code;
 					u8 element_id;
@@ -184,6 +295,25 @@ struct ieee80211_mgmt {
 					u8 new_chan;
 					u8 switch_count;
 				} __attribute__((packed)) chan_switch;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 capab;
+					__le16 timeout;
+					__le16 start_seq_num;
+				} __attribute__((packed)) addba_req;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status;
+					__le16 capab;
+					__le16 timeout;
+				} __attribute__((packed)) addba_resp;
+				struct{
+					u8 action_code;
+					__le16 params;
+					__le16 reason_code;
+				}__attribute__((packed)) delba;
 			} u;
 		} __attribute__ ((packed)) action;
 	} u;
@@ -270,6 +400,18 @@ enum ieee80211_statuscode {
 	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
 	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
 	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
+	/* 802.11e */
+	WLAN_STATUS_UNSPECIFIED_QOS = 32,
+	WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
+	WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
+	WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
+	WLAN_STATUS_REQUEST_DECLINED = 37,
+	WLAN_STATUS_INVALID_QOS_PARAM = 38,
+	WLAN_STATUS_CHANGE_TSPEC = 39,
+	WLAN_STATUS_WAIT_TS_DELAY = 47,
+	WLAN_STATUS_NO_DIRECT_LINK = 48,
+	WLAN_STATUS_STA_NOT_PRESENT = 49,
+	WLAN_STATUS_STA_NOT_QSTA = 50,
 };
 
 
@@ -300,9 +442,50 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
 	WLAN_REASON_IEEE8021X_FAILED = 23,
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+	/* 802.11e */
+	WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
+	WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
+	WLAN_REASON_DISASSOC_LOW_ACK = 34,
+	WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
+	WLAN_REASON_QSTA_LEAVE_QBSS = 36,
+	WLAN_REASON_QSTA_NOT_USE = 37,
+	WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
+	WLAN_REASON_QSTA_TIMEOUT = 39,
+	WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
 };
 
 
+/* Category Code */
+enum ieee80211_category {
+	WLAN_CATEGORY_SPECTRUM_MGMT = 0,
+	WLAN_CATEGORY_QOS = 1,
+	WLAN_CATEGORY_DLS = 2,
+	WLAN_CATEGORY_BACK = 3,
[...3755 lines suppressed...]
+			printk(" %02x", mic[i]);
+		printk("\n");
+		printk(KERN_DEBUG "   SA=" MAC_FMT " DA=" MAC_FMT " key",
+		       MAC_ARG(sa), MAC_ARG(da));
+		for (i = 0; i < 8; i++)
+			printk(" %02x", key[i]);
+		printk(" (%d)\n", authenticator);
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 
 		mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
 						(void *) skb->data);
@@ -208,12 +271,30 @@ static int tkip_encrypt_skb(struct ieee8
 	memmove(pos, pos + TKIP_IV_LEN, hdrlen);
 	pos += hdrlen;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_iv_inc;
+iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	/* Increase IV for the frame */
 	key->u.tkip.iv16++;
 	if (key->u.tkip.iv16 == 0)
 		key->u.tkip.iv32++;
 
-	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto iv_inc;
+	}
+skip_iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
+	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	    && !tx->wpa_test
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+		) {
 		hdr = (struct ieee80211_hdr *)skb->data;
 
 		/* hwaccel - with preallocated room for IV */
@@ -255,6 +336,37 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 	tx->u.tx.control->iv_len = TKIP_IV_LEN;
 	ieee80211_tx_set_iswep(tx);
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if ((tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) ||
+	    (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+	     tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV)) {
+		wpa_test = 1;
+	}
+
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - TKIP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
 	    !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
 	    !wpa_test) {
@@ -268,6 +380,10 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)
@@ -275,6 +391,23 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 		}
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       tx->dev->name, MAC_ARG(tx->sta->addr));
+		tx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	} else if (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+		   tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for Group Key\n",
+		       tx->dev->name);
+		tx->local->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	return TXRX_CONTINUE;
 }
 
@@ -299,6 +432,17 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
 	if (!rx->sta || skb->len - hdrlen < 12)
 		return TXRX_DROP;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (rx->sta && rx->sta->wpa_trigger & WPA_TRIGGER_FAIL_RX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting RX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       rx->dev->name, MAC_ARG(rx->sta->addr));
+		rx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_RX_ICV;
+		skb->data[skb->len - 1]++;
+		wpa_test = 1;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) {
 		if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) {
 			/*
@@ -467,12 +611,26 @@ static int ccmp_encrypt_skb(struct ieee8
 	/* PN = PN + 1 */
 	pn = key->u.ccmp.tx_pn;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_pn_inc;
+pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
 		pn[i]++;
 		if (pn[i])
 			break;
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto pn_inc;
+	}
+skip_pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	ccmp_pn2hdr(pos, pn, key->conf.keyidx);
 
 	if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
@@ -504,6 +662,27 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 	if (!key || key->conf.alg != ALG_CCMP || !WLAN_FC_DATA_PRESENT(fc))
 		return TXRX_CONTINUE;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger = 0;
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger = 0;
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - CCMP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	tx->u.tx.control->icv_len = CCMP_MIC_LEN;
 	tx->u.tx.control->iv_len = CCMP_HDR_LEN;
 	ieee80211_tx_set_iswep(tx);
@@ -521,6 +700,10 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)

linux-2.6-zd1211rw-mac80211.patch:

--- NEW FILE linux-2.6-zd1211rw-mac80211.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 20:00:12.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:03:54.000000000 -0400
@@ -4287,6 +4287,16 @@ W:	http://www.qsl.net/dl1bke/
 L:	linux-hams at vger.kernel.org
 S:	Maintained
 
+Z1211 WIRELESS DRIVER
+P:	Daniel Drake
+M:	dsd at gentoo.org
+P:	Ulrich Kunitz
+M:	kune at deine-taler.de
+W:	http://zd1211.ath.cx/wiki/DriverRewrite
+L:	linux-wireless at vger.kernel.org
+L:	zd1211-devs at lists.sourceforge.net (subscribers-only)
+S:	Maintained
+
 ZD1211RW WIRELESS DRIVER
 P:	Daniel Drake
 M:	dsd at gentoo.org
diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-26 20:00:32.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-26 20:03:54.000000000 -0400
@@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+obj-$(CONFIG_Z1211)		+= zd1211rw-mac80211/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
--- /dev/null	2007-09-25 08:26:55.562976333 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-26 20:03:54.000000000 -0400
@@ -0,0 +1,1620 @@
+/* zd_chip.c
+ *
+ * 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
+ */
+
+/* This file implements all the hardware specific functions for the ZD1211
+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy
+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+
+void zd_chip_init(struct zd_chip *chip,
+	         struct ieee80211_hw *hw,
+		 struct usb_interface *intf)
+{
+	memset(chip, 0, sizeof(*chip));
+	mutex_init(&chip->mutex);
+	zd_usb_init(&chip->usb, hw, intf);
+	zd_rf_init(&chip->rf);
+}
+
+void zd_chip_clear(struct zd_chip *chip)
+{
+	ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+	zd_usb_clear(&chip->usb);
+	zd_rf_clear(&chip->rf);
+	mutex_destroy(&chip->mutex);
+	ZD_MEMCLEAR(chip, sizeof(*chip));
+}
+
+static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
+{
+	u8 *addr = zd_chip_to_mac(chip)->hwaddr;
+	return scnprintf(buffer, size, "%02x-%02x-%02x",
+		         addr[0], addr[1], addr[2]);
+}
+
+/* Prints an identifier line, which will support debugging. */
+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
+{
+	int i = 0;
+
+	i = scnprintf(buffer, size, "zd1211%s chip ",
+		      zd_chip_is_zd1211b(chip) ? "b" : "");
+	i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += scnprint_mac_oui(chip, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
+		chip->patch_cck_gain ? 'g' : '-',
+		chip->patch_cr157 ? '7' : '-',
+		chip->patch_6m_band_edge ? '6' : '-',
+		chip->new_phy_layout ? 'N' : '-',
+		chip->al2230s_bit ? 'S' : '-');
+	return i;
+}
+
+static void print_id(struct zd_chip *chip)
+{
+	char buffer[80];
+
+	scnprint_id(chip, buffer, sizeof(buffer));
+	buffer[sizeof(buffer)-1] = 0;
+	dev_info(zd_chip_dev(chip), "%s\n", buffer);
+}
+
+static zd_addr_t inc_addr(zd_addr_t addr)
+{
+	u16 a = (u16)addr;
+	/* Control registers use byte addressing, but everything else uses word
+	 * addressing. */
+	if ((a & 0xf000) == CR_START)
+		a += 2;
+	else
+		a += 1;
+	return (zd_addr_t)a;
+}
+
+/* Read a variable number of 32-bit values. Parameter count is not allowed to
+ * exceed USB_MAX_IOREAD32_COUNT.
+ */
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+		 unsigned int count)
+{
+	int r;
+	int i;
+	zd_addr_t *a16 = (zd_addr_t *)NULL;
+	u16 *v16;
+	unsigned int count16;
+
+	if (count > USB_MAX_IOREAD32_COUNT)
+		return -EINVAL;
+
+	/* Allocate a single memory block for values and addresses. */
+	count16 = 2*count;
+	a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+		                   GFP_KERNEL);
+	if (!a16) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error ENOMEM in allocation of a16\n");
+		r = -ENOMEM;
+		goto out;
+	}
+	v16 = (u16 *)(a16 + count16);
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		/* We read the high word always first. */
+		a16[j] = inc_addr(addr[i]);
+		a16[j+1] = addr[i];
+	}
+
+	r = zd_ioread16v_locked(chip, v16, a16, count16);
+	if (r) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error: zd_ioread16v_locked. Error number %d\n", r);
+		goto out;
+	}
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		values[i] = (v16[j] << 16) | v16[j+1];
+	}
+
+out:
+	kfree((void *)a16);
+	return r;
+}
+
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+	           unsigned int count)
+{
+	int i, j, r;
+	struct zd_ioreq16 *ioreqs16;
+	unsigned int count16;
+
+	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+
+	if (count == 0)
+		return 0;
+	if (count > USB_MAX_IOWRITE32_COUNT)
+		return -EINVAL;
[...7630 lines suppressed...]
+	spin_unlock_irq(&mac->lock);
+
+	zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+
+static void zd_op_set_multicast_list(struct ieee80211_hw *hw,
+				      unsigned short dev_flags, int mc_count)
+{
+	struct zd_mc_hash hash;
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	if ((dev_flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
+	     has_monitor_interfaces(mac))
+	{
+		zd_mc_add_all(&hash);
+	} else {
+		struct dev_mc_list *mc = NULL;
+		void *tmp = NULL;
+		DECLARE_MAC_BUF(macbuf);
+
+		zd_mc_clear(&hash);
+		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
+			dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
+				  print_mac(macbuf, mc->dmi_addr));
+			zd_mc_add_addr(&hash, mc->dmi_addr);
+		}
+	}
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->multicast_hash = hash;
+	spin_unlock_irqrestore(&mac->lock, flags);
+	queue_work(zd_workqueue, &mac->set_multicast_hash_work);
+}
+
+static void set_rts_cts_work(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, set_rts_cts_work);
+	unsigned long flags;
+	unsigned int short_preamble;
+
+	mutex_lock(&mac->chip.mutex);
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->updating_rts_rate = 0;
+	short_preamble = mac->short_preamble;
+	spin_unlock_irqrestore(&mac->lock, flags);
+
+	zd_chip_set_rts_cts_rate_locked(&mac->chip, short_preamble);
+	mutex_unlock(&mac->chip.mutex);
+}
+
+static void zd_op_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
+				 int cts_protection, int preamble)
+{
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
+
+	if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
+		spin_lock_irqsave(&mac->lock, flags);
+		mac->short_preamble = !preamble;
+		if (!mac->updating_rts_rate) {
+			mac->updating_rts_rate = 1;
+			/* FIXME: should disable TX here, until work has
+			 * completed and RTS_CTS reg is updated */
+			queue_work(zd_workqueue, &mac->set_rts_cts_work);
+		}
+		spin_unlock_irqrestore(&mac->lock, flags);
+	}
+}
+
+static const struct ieee80211_ops zd_ops = {
+	.tx			= zd_op_tx,
+	.open			= zd_op_open,
+	.stop			= zd_op_stop,
+	.add_interface		= zd_op_add_interface,
+	.remove_interface	= zd_op_remove_interface,
+	.config			= zd_op_config,
+	.config_interface	= zd_op_config_interface,
+	.set_multicast_list	= zd_op_set_multicast_list,
+	.erp_ie_changed		= zd_op_erp_ie_changed,
+};
+
+struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
+{
+	struct zd_mac *mac;
+	struct ieee80211_hw *hw;
+	int i;
+
+	hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops);
+	if (!hw) {
+		dev_dbg_f(&intf->dev, "out of memory\n");
+		return NULL;
+	}
+
+	mac = zd_hw_mac(hw);
+
+	memset(mac, 0, sizeof(*mac));
+	spin_lock_init(&mac->lock);
+	mac->hw = hw;
+
+	mac->type = IEEE80211_IF_TYPE_MGMT;
+	mac->hwaddr = hw->wiphy->perm_addr;
+
+	memcpy(mac->channels, zd_channels, sizeof(zd_channels));
+	memcpy(mac->rates, zd_rates, sizeof(zd_rates));
+	mac->modes[0].mode = MODE_IEEE80211G;
+	mac->modes[0].num_rates = ARRAY_SIZE(zd_rates);
+	mac->modes[0].rates = mac->rates;
+	mac->modes[0].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[0].channels = mac->channels;
+	mac->modes[1].mode = MODE_IEEE80211B;
+	mac->modes[1].num_rates = 4;
+	mac->modes[1].rates = mac->rates;
+	mac->modes[1].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[1].channels = mac->channels;
+
+	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+		     IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
+	hw->max_rssi = 100;
+	hw->max_signal = 100;
+
+	hw->queues = 1;
+	hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
+
+	skb_queue_head_init(&mac->ack_wait_queue);
+
+	for (i = 0; i < 2; i++) {
+		if (ieee80211_register_hwmode(hw, &mac->modes[i])) {
+			dev_dbg_f(&intf->dev, "cannot register hwmode\n");
+			ieee80211_free_hw(hw);
+			return NULL;
+		}
+	}
+
+	zd_chip_init(&mac->chip, hw, intf);
+	housekeeping_init(mac);
+	INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
+	INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
+
+	SET_IEEE80211_DEV(hw, &intf->dev);
+	return hw;
+}
+
+#define LINK_LED_WORK_DELAY HZ
+
+static void link_led_handler(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, housekeeping.link_led_work.work);
+	struct zd_chip *chip = &mac->chip;
+	int is_associated;
+	int r;
+
+	spin_lock_irq(&mac->lock);
+	is_associated = mac->associated;
+	spin_unlock_irq(&mac->lock);
+
+	r = zd_chip_control_leds(chip,
+		                 is_associated ? LED_ASSOCIATED : LED_SCANNING);
+	if (r)
+		dev_err(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r);
+
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+		           LINK_LED_WORK_DELAY);
+}
+
+static void housekeeping_init(struct zd_mac *mac)
+{
+	INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler);
+}
+
+static void housekeeping_enable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+			   0);
+}
+
+static void housekeeping_disable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	cancel_rearming_delayed_workqueue(zd_workqueue,
+		&mac->housekeeping.link_led_work);
+	zd_chip_control_leds(&mac->chip, LED_OFF);
+}
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 20:00:12.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 20:04:18.000000000 -0400
@@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 
 endmenu


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- kernel.spec	26 Sep 2007 22:38:30 -0000	1.191
+++ kernel.spec	27 Sep 2007 00:43:33 -0000	1.192
@@ -631,7 +631,10 @@
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch681: linux-2.6-wireless-pending.patch
-Patch690: git-wireless-dev.patch
+Patch690: linux-2.6-at76.patch
+Patch691: linux-2.6-ath5k.patch
+Patch692: linux-2.6-zd1211rw-mac80211.patch
+Patch693: linux-2.6-mac80211-extras.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1140,8 +1143,11 @@
 # wireless patches headed for 2.6.23
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
-# Add the wireless stack updates and drivers from wireless-dev
-ApplyPatch git-wireless-dev.patch
+# Add misc wireless bits from upstream wireless tree
+ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-ath5k.patch
+ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+ApplyPatch linux-2.6-mac80211-extras.patch
 
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1809,6 +1815,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 John W. Linville <linville at redhat.com>
+- Update and restructure wireless patches
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - x86 e820 bugfix
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-wireless-pending.patch	18 Sep 2007 14:01:35 -0000	1.4
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 00:43:34 -0000	1.5
@@ -1,6 +1,1753 @@
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-09-26 19:41:26.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-26 19:49:37.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
+ S: (ask for current address)
+ S: USA
+ 
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
++
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+ 
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
++
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -833,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+ 
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
++
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3517,6 +3533,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+ 
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
++
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3651,6 +3673,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+ 
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
++
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-26 19:49:38.000000000 -0400
+@@ -7,7 +7,97 @@
+  */
+ 
+ /**
++ * enum nl80211_commands - supported nl80211 commands
++ *
++ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
++ *
++ * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
++ *	to get a list of all present wiphys.
++ * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
++ *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
++ *
++ * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
++ *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
++ *	on an %NL80211_ATTR_IFINDEX is supported.
++ * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
++ 	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
++ * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
++ *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
++ *	be sent from userspace to request creation of a new virtual interface,
++ *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
++ *	%NL80211_ATTR_IFNAME.
++ * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
++ *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
++ *	userspace to request deletion of a virtual interface, then requires
++ *	attribute %NL80211_ATTR_IFINDEX.
++ *
++ * @NL80211_CMD_MAX: highest used command number
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++enum nl80211_commands {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_CMD_UNSPEC,
++
++	NL80211_CMD_GET_WIPHY,		/* can dump */
++	NL80211_CMD_SET_WIPHY,
++	NL80211_CMD_NEW_WIPHY,
++	NL80211_CMD_DEL_WIPHY,
++
++	NL80211_CMD_GET_INTERFACE,	/* can dump */
++	NL80211_CMD_SET_INTERFACE,
++	NL80211_CMD_NEW_INTERFACE,
++	NL80211_CMD_DEL_INTERFACE,
++
++	/* add commands here */
++
++	/* used to define NL80211_CMD_MAX below */
++	__NL80211_CMD_AFTER_LAST,
++	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
++};
++
++
++/**
++ * enum nl80211_attrs - nl80211 netlink attributes
++ *
++ * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
++ *
++ * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
++ *	/sys/class/ieee80211/<phyname>/index
++ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
++ *
++ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
++ * @NL80211_ATTR_IFNAME: network interface name
++ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
++ *
++ * @NL80211_ATTR_MAX: highest attribute number currently defined
++ * @__NL80211_ATTR_AFTER_LAST: internal use
++ */
++enum nl80211_attrs {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_ATTR_UNSPEC,
++
++	NL80211_ATTR_WIPHY,
++	NL80211_ATTR_WIPHY_NAME,
++
++	NL80211_ATTR_IFINDEX,
++	NL80211_ATTR_IFNAME,
++	NL80211_ATTR_IFTYPE,
++
++	/* add attributes here, update the policy in nl80211.c */
++
++	__NL80211_ATTR_AFTER_LAST,
++	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
++};
++
++/**
+  * enum nl80211_iftype - (virtual) interface types
++ *
+  * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
+  * @NL80211_IFTYPE_ADHOC: independent BSS member
+  * @NL80211_IFTYPE_STATION: managed BSS member
+@@ -15,9 +105,10 @@
+  * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
+  * @NL80211_IFTYPE_WDS: wireless distribution interface
+  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
++ * @NL80211_IFTYPE_MAX: highest interface type number currently defined
+  * @__NL80211_IFTYPE_AFTER_LAST: internal use
+  *
+- * These values are used with the NL80211_ATTR_IFTYPE
++ * These values are used with the %NL80211_ATTR_IFTYPE
+  * to set the type of an interface.
+  *
+  */
+@@ -31,8 +122,8 @@ enum nl80211_iftype {
+ 	NL80211_IFTYPE_MONITOR,
+ 
+ 	/* keep last */
+-	__NL80211_IFTYPE_AFTER_LAST
++	__NL80211_IFTYPE_AFTER_LAST,
++	NL80211_IFTYPE_MAX = __NL80211_IFTYPE_AFTER_LAST - 1
+ };
+-#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
[...131489 lines suppressed...]
++		return 0;
++
++	return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++}
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++
++
++/**************************************************
++ * Generic and Clientmode operation code.
++ **************************************************/
++
++static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
++{
++	/* Disable PCI interrupts. */
++	ssb_write32(pc->dev, SSB_INTVEC, 0);
++}
++
++void ssb_pcicore_init(struct ssb_pcicore *pc)
++{
++	struct ssb_device *dev = pc->dev;
++	struct ssb_bus *bus;
++
++	if (!dev)
++		return;
++	bus = dev->bus;
++	if (!ssb_device_is_enabled(dev))
++		ssb_device_enable(dev, 0);
++
++#ifdef CONFIG_SSB_PCICORE_HOSTMODE
++	pc->hostmode = pcicore_is_in_hostmode(pc);
++	if (pc->hostmode)
++		ssb_pcicore_init_hostmode(pc);
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++	if (!pc->hostmode)
++		ssb_pcicore_init_clientmode(pc);
++}
++
++static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address)
++{
++	pcicore_write32(pc, 0x130, address);
++	return pcicore_read32(pc, 0x134);
++}
++
++static void ssb_pcie_write(struct ssb_pcicore *pc, u32 address, u32 data)
++{
++	pcicore_write32(pc, 0x130, address);
++	pcicore_write32(pc, 0x134, data);
++}
++
++static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
++				u8 address, u16 data)
++{
++	const u16 mdio_control = 0x128;
++	const u16 mdio_data = 0x12C;
++	u32 v;
++	int i;
++
++	v = 0x80; /* Enable Preamble Sequence */
++	v |= 0x2; /* MDIO Clock Divisor */
++	pcicore_write32(pc, mdio_control, v);
++
++	v = (1 << 30); /* Start of Transaction */
++	v |= (1 << 28); /* Write Transaction */
++	v |= (1 << 17); /* Turnaround */
++	v |= (u32)device << 22;
++	v |= (u32)address << 18;
++	v |= data;
++	pcicore_write32(pc, mdio_data, v);
++	/* Wait for the device to complete the transaction */
++	udelay(10);
++	for (i = 0; i < 10; i++) {
++		v = pcicore_read32(pc, mdio_control);
++		if (v & 0x100 /* Trans complete */)
++			break;
++		msleep(1);
++	}
++	pcicore_write32(pc, mdio_control, 0);
++}
++
++static void ssb_broadcast_value(struct ssb_device *dev,
++				u32 address, u32 data)
++{
++	/* This is used for both, PCI and ChipCommon core, so be careful. */
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
++
++	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
++	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
++	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
++	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
++}
++
++static void ssb_commit_settings(struct ssb_bus *bus)
++{
++	struct ssb_device *dev;
++
++	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
++	if (WARN_ON(!dev))
++		return;
++	/* This forces an update of the cached registers. */
++	ssb_broadcast_value(dev, 0xFD8, 0);
++}
++
++int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
++				   struct ssb_device *dev)
++{
++	struct ssb_device *pdev = pc->dev;
++	struct ssb_bus *bus;
++	int err = 0;
++	u32 tmp;
++
++	might_sleep();
++
++	if (!pdev)
++		goto out;
++	bus = pdev->bus;
++
++	/* Enable interrupts for this device. */
++	if (bus->host_pci &&
++	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++		u32 coremask;
++
++		/* Calculate the "coremask" for the device. */
++		coremask = (1 << dev->core_index);
++
++		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
++		if (err)
++			goto out;
++		tmp |= coremask << 8;
++		err = pci_write_config_dword(bus->host_pci, SSB_PCI_IRQMASK, tmp);
++		if (err)
++			goto out;
++	} else {
++		u32 intvec;
++
++		intvec = ssb_read32(pdev, SSB_INTVEC);
++		if ((bus->chip_id & 0xFF00) == 0x4400) {
++			/* Workaround: On the BCM44XX the BPFLAG routing
++			 * bit is wrong. Use a hardcoded constant. */
++			intvec |= 0x00000002;
++		} else {
++			tmp = ssb_read32(dev, SSB_TPSFLAG);
++			tmp &= SSB_TPSFLAG_BPFLAG;
++			intvec |= tmp;
++		}
++		ssb_write32(pdev, SSB_INTVEC, intvec);
++	}
++
++	/* Setup PCIcore operation. */
++	if (pc->setup_done)
++		goto out;
++	if (pdev->id.coreid == SSB_DEV_PCI) {
++		tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++		tmp |= SSB_PCICORE_SBTOPCI_PREF;
++		tmp |= SSB_PCICORE_SBTOPCI_BURST;
++		pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++
++		if (pdev->id.revision < 5) {
++			tmp = ssb_read32(pdev, SSB_IMCFGLO);
++			tmp &= ~SSB_IMCFGLO_SERTO;
++			tmp |= 2;
++			tmp &= ~SSB_IMCFGLO_REQTO;
++			tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
++			ssb_write32(pdev, SSB_IMCFGLO, tmp);
++			ssb_commit_settings(bus);
++		} else if (pdev->id.revision >= 11) {
++			tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++			tmp |= SSB_PCICORE_SBTOPCI_MRM;
++			pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++		}
++	} else {
++		WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
++		//TODO: Better make defines for all these magic PCIE values.
++		if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
++			/* TLP Workaround register. */
++			tmp = ssb_pcie_read(pc, 0x4);
++			tmp |= 0x8;
++			ssb_pcie_write(pc, 0x4, tmp);
++		}
++		if (pdev->id.revision == 0) {
++			const u8 serdes_rx_device = 0x1F;
++
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    2 /* Timer */, 0x8128);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    6 /* CDR */, 0x0100);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    7 /* CDR BW */, 0x1466);
++		} else if (pdev->id.revision == 1) {
++			/* DLLP Link Control register. */
++			tmp = ssb_pcie_read(pc, 0x100);
++			tmp |= 0x40;
++			ssb_pcie_write(pc, 0x100, tmp);
++		}
++	}
++	pc->setup_done = 1;
++out:
++	return err;
++}
++EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);


--- git-wireless-dev.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 00:46:41 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:46:41 -0400
Subject: rpms/bzr/F-7 .cvsignore, 1.15, 1.16 bzr.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <200709270046.l8R0kfKp009310@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9232

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 22:56:24 -0000	1.15
+++ .cvsignore	27 Sep 2007 00:46:08 -0000	1.16
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/bzr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bzr.spec	30 Aug 2007 22:56:24 -0000	1.20
+++ bzr.spec	27 Sep 2007 00:46:08 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Aug 2007 22:56:24 -0000	1.15
+++ sources	27 Sep 2007 00:46:08 -0000	1.16
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:46:54 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:46:54 -0400
Subject: rpms/bzrtools/F-7 .cvsignore, 1.12, 1.13 bzrtools.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200709270046.l8R0ks28009353@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Jul 2007 22:33:03 -0000	1.12
+++ .cvsignore	27 Sep 2007 00:46:21 -0000	1.13
@@ -1 +1 @@
-bzrtools-0.18.0.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/bzrtools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzrtools.spec	25 Jul 2007 22:33:03 -0000	1.19
+++ bzrtools.spec	27 Sep 2007 00:46:21 -0000	1.20
@@ -1,7 +1,12 @@
 %{!?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 bzrver 0.18
-%define bzrnextver 0.19
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -9,12 +14,11 @@
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
 Source0:        http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
 # Bzrtools is meant to work with a version of bzr that is the same major
 # version.  In addition to being incompatible with older bzr versions, it is 
@@ -45,9 +49,14 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins
+fi
+
 # remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
+sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,13 +65,26 @@
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
-%dir %{python_sitelib}/bzrlib/plugins/bzrtools
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
-%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
+%dir %{python_sitearch}/bzrlib/plugins/bzrtools
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyc
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move plugin manually since setuptools has no way of knowing that bzr is
+  arch specific.
+- Disable debuginfo packages.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Fix License tag to conform to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
 * Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
 - Update to 0.18.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 Jul 2007 22:33:03 -0000	1.12
+++ sources	27 Sep 2007 00:46:21 -0000	1.13
@@ -1 +1 @@
-557bfa1aeb3f0090fdac1651f5271bce  bzrtools-0.18.0.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 00:47:08 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Wed, 26 Sep 2007 20:47:08 -0400
Subject: rpms/bzr-gtk/F-7 .cvsignore, 1.8, 1.9 bzr-gtk.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200709270047.l8R0l8DS009363@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9284

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
- Olive must be moved to an arch specific directory as well for now.
  If rpm could have noarch subpackages, this would be fine to leave in
  python_sitelib.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jul 2007 22:22:37 -0000	1.8
+++ .cvsignore	27 Sep 2007 00:46:36 -0000	1.9
@@ -1 +1 @@
-bzr-gtk-0.18.0.tar.gz
+bzr-gtk-0.91.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/bzr-gtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr-gtk.spec	25 Jul 2007 22:22:37 -0000	1.9
+++ bzr-gtk.spec	27 Sep 2007 00:46:36 -0000	1.10
@@ -1,26 +1,31 @@
 %{!?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)")}
+
+
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.18.0
-Release:        1%{?dist}
+Version:        0.91.0
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
-Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0:        https://launchpad.net/bzr-gtk/0.91/%{version}/+download/bzr-gtk-%{version}.tar.gz
 # We can't use the notifier functionality without a bzr-dbus-package.
 Patch0:         bzr-gtk-disable-notifier.patch
 # Fix some bugs in the nautilus integration.  Submitted upstream
 Patch1:         bzr-gtk-nautilus.patch
-Patch2:		bzr-gtk-nautilus-protocol.patch
+Patch2:         bzr-gtk-nautilus-protocol.patch
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
 Patch3:         bzr-gtk-disable-nautilus-pull.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  bzr
 BuildRequires:  gettext
@@ -66,9 +71,21 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins
+    mv $RPM_BUILD_ROOT%{python_sitelib}/olive $RPM_BUILD_ROOT%{python_sitearch}
+fi
+
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
-mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
+mv $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
+
+# No translations yet
+#%find_lang olive
+
+# This won't do anything until after we add bzr-dbus.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,20 +94,39 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{python_sitelib}/bzrlib/plugins/gtk/
+%{python_sitearch}/bzrlib/plugins/gtk/
+%{_datadir}/applications/bazaar-properties.desktop
 
+#%files -n olive -f olive.lang
 %files -n olive
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{python_sitelib}/olive
+%{python_sitearch}/olive/
 %{_datadir}/olive/
 %{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/olive-gtk.desktop
 
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
+- Olive must be moved to an arch specific directory as well for now.
+  If rpm could have noarch subpackages, this would be fine to leave in
+  python_sitelib.
+
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move the plugins manually as distutils doesn't know that bzr is arch
+  specific.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Update license tag to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
 * Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
 - Update to 0.18.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jul 2007 22:22:37 -0000	1.8
+++ sources	27 Sep 2007 00:46:36 -0000	1.9
@@ -1 +1 @@
-4be297c58fc6aeb79e660d77770f24fd  bzr-gtk-0.18.0.tar.gz
+3b5d9c517494988a83d7ccaae8a18e2f  bzr-gtk-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 01:06:42 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:06:42 -0400
Subject: rpms/php-channel-phing/devel channel.xml, NONE,
	1.1 php-channel-phing.spec, NONE, 1.1
Message-ID: <200709270106.l8R16gKe015911@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15902/devel

Added Files:
	channel.xml php-channel-phing.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phing.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phing
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phing channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://phing.info/
Source0:	http://pear.phing.info/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phing.info)

%description
This package adds the phing channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phing.info.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phing.info.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phing.info.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phing.info > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable
- added post/postun requires for pear
- removed redundant version number requirement for php-cli

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:08:27 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:08:27 -0400
Subject: rpms/php-channel-phing/F-7 channel.xml, NONE,
	1.1 php-channel-phing.spec, NONE, 1.1
Message-ID: <200709270108.l8R18Rq8016030@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phing/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16023/F-7

Added Files:
	channel.xml php-channel-phing.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phing.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phing
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phing channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://phing.info/
Source0:	http://pear.phing.info/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phing.info)

%description
This package adds the phing channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phing.info.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phing.info.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phing.info.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phing.info > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable
- added post/postun requires for pear
- removed redundant version number requirement for php-cli

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:28:29 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:28:29 -0400
Subject: rpms/php-channel-phpdb/devel channel.xml, NONE,
	1.1 php-channel-phpdb.spec, NONE, 1.1
Message-ID: <200709270128.l8R1ST5a016679@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phpdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16672/devel

Added Files:
	channel.xml php-channel-phpdb.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phpdb.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phpdb
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phpdb channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://pear.phpdb.org/
Source0:	http://pear.phpdb.org/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli 
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phpdb.org)

%description
This package adds the phpdb channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpdb.org.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phpdb.org.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phpdb.org.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phpdb.org > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:29:42 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Wed, 26 Sep 2007 21:29:42 -0400
Subject: rpms/php-channel-phpdb/F-7 channel.xml, NONE,
	1.1 php-channel-phpdb.spec, NONE, 1.1
Message-ID: <200709270129.l8R1TgR1016774@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-channel-phpdb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16760/F-7

Added Files:
	channel.xml php-channel-phpdb.spec 
Log Message:
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdb.org</name>
 <summary>Channel for Propel and Creole releases</summary>
 <suggestedalias>phpdb</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdb.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>


--- NEW FILE php-channel-phpdb.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-phpdb
Version:	1.0.0
Release:	4%{?dist}
Summary:	Adds phpdb channel to PEAR

Group:		Development/Languages
License:	LGPLv2
URL:		http://pear.phpdb.org/
Source0:	http://pear.phpdb.org/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli 
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.phpdb.org)

%description
This package adds the phpdb channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpdb.org.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.phpdb.org.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.phpdb.org.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.phpdb.org > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-4
- removed version number in virtual provides
- replaced static commands with macros wherever applicable

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-3
- Added valid license.

* Tue Aug 21 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-2
- Fedora channel naming adaption.

* Thu Jun 28 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-1
- Fedora 7 version bump

* Fri May 25 2007 Alexander Kahl <akahl at iconmobile.com> - 1.0.0-0
- Initial RPM release.



From fedora-extras-commits at redhat.com  Thu Sep 27 01:35:18 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Wed, 26 Sep 2007 21:35:18 -0400
Subject: rpms/git/devel .cvsignore, 1.44, 1.45 git.spec, 1.39, 1.40 sources, 
	1.44, 1.45
Message-ID: <200709270135.l8R1ZIQe016906@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16884

Modified Files:
	.cvsignore git.spec sources 
Log Message:
git-1.5.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Sep 2007 15:48:06 -0000	1.44
+++ .cvsignore	27 Sep 2007 01:34:46 -0000	1.45
@@ -1 +1 @@
-git-1.5.3.1.tar.gz
+git-1.5.3.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- git.spec	6 Sep 2007 17:35:42 -0000	1.39
+++ git.spec	27 Sep 2007 01:34:46 -0000	1.40
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.3.1
-Release: 	2%{?dist}
+Version: 	1.5.3.2
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Wed Sep 26 2007 James Bowes <jbowes at redhat.com> 1.5.3.2-1
+- git-1.5.3.2
+
 * Thu Sep 06 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 1.5.3.1-2
 - Include git-gui and git-citool docs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Sep 2007 15:48:06 -0000	1.44
+++ sources	27 Sep 2007 01:34:46 -0000	1.45
@@ -1 +1 @@
-afef243b2d271004d13b0381ac2ee580  git-1.5.3.1.tar.gz
+9930f19e22c121b8a803337cbda1e661  git-1.5.3.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 03:05:00 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:05:00 -0400
Subject: rpms/kvm/devel kvm-rtl8139-checksum.patch, NONE, 1.1 kvm.spec, 1.26,
	1.27
Message-ID: <200709270305.l8R350bw000771@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv740

Modified Files:
	kvm.spec 
Added Files:
	kvm-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

kvm-rtl8139-checksum.patch:

--- NEW FILE kvm-rtl8139-checksum.patch ---
diff -rup kvm-35.orig/qemu/hw/rtl8139.c kvm-35.new/qemu/hw/rtl8139.c
--- kvm-35.orig/qemu/hw/rtl8139.c	2007-09-26 19:49:44.000000000 -0400
+++ kvm-35.new/qemu/hw/rtl8139.c	2007-09-26 19:50:08.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kvm.spec	24 Sep 2007 18:21:27 -0000	1.26
+++ kvm.spec	27 Sep 2007 03:04:28 -0000	1.27
@@ -1,8 +1,8 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 5%{?dist}
-License: GPLv2 and LGPLv2
+Release: 6%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
 Patch103: qemu-0.9.0-vnc-authentication.patch
+Patch104: kvm-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # to build the bios
@@ -48,6 +49,7 @@
 %patch101 -p1
 %patch102 -p0
 %patch103 -p1 -b .vnc
+%patch104 -p1
 
 %build
 LDFLAGS=-Wl,--build-id ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -95,6 +97,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 36-6.fc8
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Mon Sep 24 2007 Jeremy Katz <katzj at redhat.com> - 36-5
 - fix build on x86_64
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:06:04 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:06:04 -0400
Subject: rpms/kvm/F-7 kvm-rtl8139-checksum.patch, NONE, 1.1 kvm.spec, 1.14, 
	1.15 qemu-0.9.0-load-initrd.patch, 1.1, NONE
Message-ID: <200709270306.l8R364YW000855@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/kvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv815

Modified Files:
	kvm.spec 
Added Files:
	kvm-rtl8139-checksum.patch 
Removed Files:
	qemu-0.9.0-load-initrd.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

kvm-rtl8139-checksum.patch:

--- NEW FILE kvm-rtl8139-checksum.patch ---
diff -rup kvm-35.orig/qemu/hw/rtl8139.c kvm-35.new/qemu/hw/rtl8139.c
--- kvm-35.orig/qemu/hw/rtl8139.c	2007-09-26 19:49:44.000000000 -0400
+++ kvm-35.new/qemu/hw/rtl8139.c	2007-09-26 19:50:08.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-7/kvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kvm.spec	21 Aug 2007 17:23:49 -0000	1.14
+++ kvm.spec	27 Sep 2007 03:05:30 -0000	1.15
@@ -1,8 +1,8 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 35
-Release: 2%{?dist}
-License: GPLv2 and LGPLv2
+Release: 3%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
@@ -12,6 +12,7 @@
 # patches from upstream qemu
 Patch101: kvm-rtl8139-mmio-regions.patch
 Patch102: qemu-atapi-hsm.patch
+Patch103: kvm-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -39,6 +40,7 @@
 
 %patch101 -p1
 %patch102 -p0
+%patch103 -p1
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -83,6 +85,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 35-3.fc7
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Mon Aug 20 2007 Jeremy Katz <katzj at redhat.com> - 35-2
 - add fix for ATAPI from upstream qemu
 


--- qemu-0.9.0-load-initrd.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 03:26:16 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Wed, 26 Sep 2007 23:26:16 -0400
Subject: rpms/thinkfinger/F-7 thinkfinger-0.3-hal.patch, 1.1,
	1.2 thinkfinger.spec, 1.3, 1.4
Message-ID: <200709270326.l8R3QGJM001463@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1438

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Log Message:
put fdi file in policy/ directory

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/F-7/thinkfinger-0.3-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkfinger-0.3-hal.patch	22 Sep 2007 11:18:49 -0000	1.1
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 03:26:13 -0000	1.2
@@ -1,5 +1,5 @@
---- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
-+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
+--- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
++++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
@@ -25,11 +25,11 @@
  consoleperms_DATA = 60-thinkfinger.perms
  endif
 + 
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
  
 -EXTRA_DIST = 60-thinkfinger.perms
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
 --- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
 +++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
 @@ -49,9 +49,11 @@
@@ -51,9 +51,9 @@
  @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
  @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 -EXTRA_DIST = 60-thinkfinger.perms
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
  all: all-am
  
  .SUFFIXES:


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/F-7/thinkfinger.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thinkfinger.spec	22 Sep 2007 11:18:49 -0000	1.3
+++ thinkfinger.spec	27 Sep 2007 03:26:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -115,7 +115,7 @@
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
-%{_datadir}/hal/fdi/information/20thirdparty/*
+%{_datadir}/hal/fdi/policy/10osvendor/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
+- put fdi file in policy/ directory
+
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:26:51 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:26:51 -0400
Subject: rpms/qemu/devel qemu-0.9.0-rtl8139-checksum.patch, NONE,
	1.1 qemu.spec, 1.28, 1.29
Message-ID: <200709270326.l8R3QpIg001535@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1467

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.0-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

qemu-0.9.0-rtl8139-checksum.patch:

--- NEW FILE qemu-0.9.0-rtl8139-checksum.patch ---
Index: hw/rtl8139.c
===================================================================
RCS file: /sources/qemu/qemu/hw/rtl8139.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hw/rtl8139.c	11 Jul 2007 22:48:58 -0000	1.10
+++ hw/rtl8139.c	1 Aug 2007 13:10:29 -0000	1.11
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -747,7 +746,7 @@
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1023,7 +1022,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1129,7 +1128,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qemu.spec	28 Aug 2007 17:45:53 -0000	1.28
+++ qemu.spec	27 Sep 2007 03:26:18 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -23,7 +23,10 @@
 Patch4: qemu-0.9.0-vnc-authentication.patch
 # Fix RTL8139 MMIO regions. Remove at next upgrade
 Patch5: qemu-0.9.0-rtl8139-mmio-regions.patch
+# Fix Atapi errors with latest kernel
 Patch6: qemu-0.9.0-atapi-hsm.patch
+# Fix RTL8139 checksum calculations for Vista
+Patch7: qemu-0.9.0-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
@@ -53,6 +56,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 %build
 ./configure \
@@ -104,6 +108,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-5.fc8
+- Fix rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Tue Aug 28 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-4.fc8
 - Fix debuginfo by passing -Wl,--build-id to linker
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:27:49 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:27:49 -0400
Subject: rpms/qemu/F-7 qemu-0.9.0-atapi-hsm.patch, NONE,
	1.1 qemu-0.9.0-rtl8139-checksum.patch, NONE,
	1.1 qemu-0.9.0-rtl8139-mmio-regions.patch, NONE, 1.1 qemu.spec,
	1.25, 1.26
Message-ID: <200709270327.l8R3RnJA001617@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/extras/rpms/qemu/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.0-atapi-hsm.patch qemu-0.9.0-rtl8139-checksum.patch 
	qemu-0.9.0-rtl8139-mmio-regions.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
Fixed rtl8139 mmio region mappings
Fix ATAPI CDROM emulation  (rhbz #253542)

qemu-0.9.0-atapi-hsm.patch:

--- NEW FILE qemu-0.9.0-atapi-hsm.patch ---
From: Brandon Philips <brandon at ifup.org>
Newsgroups: gmane.comp.emulators.qemu
Subject: [PATCH][RFC] Fix bugs in the ATAPI cdrom driver
Date: Fri, 17 Aug 2007 16:43:04 -0700
Message-ID: <20070817234304.GB10490 at ifup.org>
Reply-To: qemu-devel at nongnu.org

The new libata-eh in the Linux kernel is throwing a fit over the QEMU
cdrom device for two reasons:

1) DRQ can be set with ERR_STAT set.  This is a violation of the ATAPI
state machine.

2) After a TEST_UNIT_READY ATAPI command is sent ERR_STAT is getting set
which is correct.  But, when the OS issues another ATAPI command
ERR_STAT is still set.  Which is bad since the next expected command
from the OS is REQUEST_SENSE to find out why ERR_STAT is set.

bug this fixes: https://bugzilla.novell.com/show_bug.cgi?id=291775

Signed-off-by: Brandon Philips <bphilips at suse.de>

---
 hw/ide.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: qemu-0.9.0/hw/ide.c
===================================================================
--- qemu-0.9.0.orig/hw/ide.c
+++ qemu-0.9.0/hw/ide.c
@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
     s->end_transfer_func = end_transfer_func;
     s->data_ptr = buf;
     s->data_end = buf + size;
-    s->status |= DRQ_STAT;
+    /* don't violate the HSM */
+    if (!(s->status & ERR_STAT))
+        s->status |= DRQ_STAT;
 }
 
 static void ide_transfer_stop(IDEState *s)
@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
             /* overlapping commands not supported */
             if (s->feature & 0x02)
                 goto abort_cmd;
+            s->status = READY_STAT;
             s->atapi_dma = s->feature & 1;
             s->nsector = 1;
             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 




qemu-0.9.0-rtl8139-checksum.patch:

--- NEW FILE qemu-0.9.0-rtl8139-checksum.patch ---
Index: hw/rtl8139.c
===================================================================
RCS file: /sources/qemu/qemu/hw/rtl8139.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hw/rtl8139.c	11 Jul 2007 22:48:58 -0000	1.10
+++ hw/rtl8139.c	1 Aug 2007 13:10:29 -0000	1.11
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -747,7 +746,7 @@
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1023,7 +1022,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1129,7 +1128,7 @@
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif

qemu-0.9.0-rtl8139-mmio-regions.patch:

--- NEW FILE qemu-0.9.0-rtl8139-mmio-regions.patch ---
diff -rup qemu-0.9.0.orig/hw/rtl8139.c qemu-0.9.0.new/hw/rtl8139.c
--- qemu-0.9.0.orig/hw/rtl8139.c	2007-02-05 18:01:54.000000000 -0500
+++ qemu-0.9.0.new/hw/rtl8139.c	2007-08-28 11:37:29.000000000 -0400
@@ -3325,7 +3325,7 @@ static void rtl8139_mmio_map(PCIDevice *
     PCIRTL8139State *d = (PCIRTL8139State *)pci_dev;
     RTL8139State *s = &d->rtl8139;
 
-    cpu_register_physical_memory(addr + 0, 0x100, s->rtl8139_mmio_io_addr);
+    cpu_register_physical_memory(addr + 0, 0x1000, s->rtl8139_mmio_io_addr);
 }
 
 static void rtl8139_ioport_map(PCIDevice *pci_dev, int region_num, 
@@ -3438,10 +3438,10 @@ void pci_rtl8139_init(PCIBus *bus, NICIn
     s->rtl8139_mmio_io_addr =
     cpu_register_io_memory(0, rtl8139_mmio_read, rtl8139_mmio_write, s);
 
-    pci_register_io_region(&d->dev, 0, 0x100, 
+    pci_register_io_region(&d->dev, 0, 0x1000, 
                            PCI_ADDRESS_SPACE_IO,  rtl8139_ioport_map);
 
-    pci_register_io_region(&d->dev, 1, 0x100, 
+    pci_register_io_region(&d->dev, 1, 0x1000, 
                            PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
 
     s->irq = 16; /* PCI interrupt */


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/F-7/qemu.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qemu.spec	1 Apr 2007 19:05:10 -0000	1.25
+++ qemu.spec	27 Sep 2007 03:27:17 -0000	1.26
@@ -8,8 +8,8 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.0
-Release: 2%{?dist}
-License: GPL/LGPL
+Release: 3%{?dist}
+License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
@@ -17,6 +17,12 @@
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
 Patch2: qemu-0.9.0-load-initrd.patch
+# Fix RTL8139 MMIO regions. Remove at next upgrade
+Patch5: qemu-0.9.0-rtl8139-mmio-regions.patch
+# Fix Atapi errors with latest kernel
+Patch6: qemu-0.9.0-atapi-hsm.patch
+# Fix RTL8139 checksum calculations for Vista
+Patch7: qemu-0.9.0-rtl8139-checksum.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html
 Requires(post): /sbin/chkconfig
@@ -42,6 +48,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch5 -p1
+%patch6 -p1
+%patch7 -p0
 
 %build
 ./configure \
@@ -92,6 +101,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.9.0-3.fc7
+- Update licence
+- Fix CDROM emulation (rhbz #253542)
+- Fix rtl8139 mmio region mappings with multiple NICs
+- Fix rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Sun Apr  1 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-2
 - Fix direct loading of a linux kernel with -kernel & -initrd (bz 234681)
 - Remove spurious execute bits from manpages (bz 222573)



From fedora-extras-commits at redhat.com  Thu Sep 27 03:29:14 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 26 Sep 2007 23:29:14 -0400
Subject: rpms/eruby/devel eruby.spec,1.21,1.22
Message-ID: <200709270329.l8R3TEkM001762@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/eruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1678

Modified Files:
	eruby.spec 
Log Message:
* Tue Sep 25 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-10
- clean up the spec file.


Index: eruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eruby/devel/eruby.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- eruby.spec	23 Aug 2007 10:52:20 -0000	1.21
+++ eruby.spec	27 Sep 2007 03:28:42 -0000	1.22
@@ -1,13 +1,17 @@
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%define ruby_archdir %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
+
 Name:		eruby
 Version:	1.0.5
-Release:	9
+Release:	10
 # eruby is GPLv2+
 # liberuby is LGPLv2+
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.modruby.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildPrereq:	ruby
-BuildPreReq:	ruby-devel >= 1.8.0
+BuildRequires:	ruby
+BuildRequires:	ruby-devel >= 1.8.0
 
 Source0:	http://www.modruby.net/archive/%{name}-%{version}.tar.gz
 
@@ -23,92 +27,85 @@
 %package libs
 Summary:	Library for eRuby
 Group:		Development/Languages
-Requires:	ruby-libs >= 1.8.0
+Requires:	ruby(abi) = 1.8
+Provides:	ruby(eruby) = %{version}
 
 %description libs
 This package contains a library for eRuby.
 
 
 %package devel
-Summary:	Development files for eRuby.
+Summary:	Development files for eRuby
 Group:		Development/Languages
-Requires:	%{name}-libs = %{version}
+Requires:	ruby(eruby) = %{version}
 
 %description devel
 This package contains the header files and libraries for an application
 embedded eRuby.
 
 %prep
-
-%setup -q -c
+%setup -q
 
 %build
-pushd %{name}-%{version}
 ruby configure.rb --enable-shared
 make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%__mkdir_p $RPM_BUILD_ROOT%{_bindir}
-%__mkdir_p $RPM_BUILD_ROOT%{_libdir}
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}
-%__mkdir_p $RPM_BUILD_ROOT%{_includedir}
-%__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
 
 # installing binaries ...
-pushd %{name}-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
-# change permissions
-chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
-
-# listing all files in ruby-all.files
-(find \
-	$RPM_BUILD_ROOT%{_bindir} \
-	$RPM_BUILD_ROOT%{_libdir} \
-	$RPM_BUILD_ROOT%{_mandir} \
-	$RPM_BUILD_ROOT%{_includedir} \
-	-type f -o -type l) |
-	sort | sed -e "s,^$RPM_BUILD_ROOT,," \
-		   -e "s,\(/man/man./.*\)$,\1*," > eruby-all.files
-
-# for eruby-libs
-egrep '\.so\..*$' eruby-all.files > eruby-libs.files
-egrep '%{_libdir}/ruby' eruby-all.files >> eruby-libs.files
 
-# for eruby-devel
-egrep '\.([ah]|so)$' eruby-all.files | grep -v %{_libdir}/ruby > eruby-devel.files
+# remove the unnecessary files
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
-# for eruby
-sort eruby-all.files eruby-libs.files eruby-devel.files | uniq -u > eruby.files
+# change permissions
+find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' | xargs chmod 0755
 
+# workaround for not working site-install properly
+mv $RPM_BUILD_ROOT%{ruby_archdir}/eruby.so $RPM_BUILD_ROOT%{ruby_sitearch}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-rm -f *.files
 
 %post -p /sbin/ldconfig libs
 
 %postun -p /sbin/ldconfig libs
 
-%files -f eruby.files
-%defattr (-, root, root)
-%doc %{name}-%{version}/README.*
-%doc %{name}-%{version}/ChangeLog
-%doc %{name}-%{version}/examples
-
-%files -f eruby-libs.files libs
-%defattr (-, root, root)
-
-%files -f eruby-devel.files devel
-%defattr (-, root, root)
+%files
+%defattr (-, root, root, -)
+%doc COPYING GPL README.en ChangeLog examples
+%lang(ja) %doc README.ja
+%{_bindir}/eruby
+%{_mandir}/man1/eruby.1*
+
+%files libs
+%defattr (-, root, root, -)
+%doc COPYING LGPL README.en
+%lang(ja) %doc README.ja
+%{_libdir}/liberuby.so.*
+%{ruby_sitearch}/eruby.so
+
+%files devel
+%defattr (-, root, root, -)
+%doc COPYING LGPL README.en
+%lang(ja) %doc README.ja
+%{_includedir}/eruby.h
+%{_libdir}/liberuby.so
 
 
 %changelog
+* Tue Sep 25 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-10
+- clean up the spec file.
+
 * Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 1.0.5-9
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:37:16 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Wed, 26 Sep 2007 23:37:16 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-hal.patch, 1.1,
	1.2 thinkfinger.spec, 1.4, 1.5
Message-ID: <200709270337.l8R3bGbM002045@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2012

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Log Message:
put fdi file in policy/ directory

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkfinger-0.3-hal.patch	22 Sep 2007 11:13:55 -0000	1.1
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
@@ -1,5 +1,5 @@
---- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
-+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
+--- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
++++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
@@ -25,11 +25,11 @@
  consoleperms_DATA = 60-thinkfinger.perms
  endif
 + 
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
  
 -EXTRA_DIST = 60-thinkfinger.perms
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
 --- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
 +++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
 @@ -49,9 +49,11 @@
@@ -51,9 +51,9 @@
  @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
  @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 -EXTRA_DIST = 60-thinkfinger.perms
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
  all: all-am
  
  .SUFFIXES:


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thinkfinger.spec	22 Sep 2007 11:13:55 -0000	1.4
+++ thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -115,7 +115,7 @@
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
-%{_datadir}/hal/fdi/information/20thirdparty/*
+%{_datadir}/hal/fdi/policy/10osvendor/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
+- put fdi file in policy/ directory
+
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 03:38:24 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:38:24 -0400
Subject: rpms/xen/F-7 xen-qemu-rtl8139-checksum.patch, NONE, 1.1 xen.spec,
	1.186, 1.187
Message-ID: <200709270338.l8R3cOTF002112@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2067

Modified Files:
	xen.spec 
Added Files:
	xen-qemu-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

xen-qemu-rtl8139-checksum.patch:

--- NEW FILE xen-qemu-rtl8139-checksum.patch ---
diff -rup xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c	2007-09-26 23:25:22.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- xen.spec	26 Sep 2007 16:38:46 -0000	1.186
+++ xen.spec	27 Sep 2007 03:37:52 -0000	1.187
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 6%{dist}
+Release: 7%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -27,6 +27,7 @@
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
 Patch34: xen-3.1.0-no-xenapi-docs.patch
+Patch35: xen-qemu-rtl8139-checksum.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -136,6 +137,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # config patches
 %patch100 -p1
@@ -289,6 +291,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-7.fc7
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-6.fc7
 - QEmu NE2000 overflow check - CVE-2007-1321
 - Pygrub guest escape - CVE-2007-4993



From fedora-extras-commits at redhat.com  Thu Sep 27 03:38:28 2007
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Wed, 26 Sep 2007 23:38:28 -0400
Subject: rpms/xen/devel xen-qemu-rtl8139-checksum.patch, NONE, 1.1 xen.spec, 
	1.191, 1.192
Message-ID: <200709270338.l8R3cSX3002115@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2091

Modified Files:
	xen.spec 
Added Files:
	xen-qemu-rtl8139-checksum.patch 
Log Message:
Fixed rtl8139 checksum calculation for Vista (rhbz #308201)

xen-qemu-rtl8139-checksum.patch:

--- NEW FILE xen-qemu-rtl8139-checksum.patch ---
diff -rup xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/rtl8139.c	2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/hw/rtl8139.c	2007-09-26 23:25:22.000000000 -0400
@@ -53,9 +53,8 @@
 /* debug RTL8139 card C+ mode only */
 //#define DEBUG_RTL8139CP 1
 
-/* RTL8139 provides frame CRC with received packet, this feature seems to be
-   ignored by most drivers, disabled by default */
-//#define RTL8139_CALCULATE_RXCRC 1
+/* Calculate CRCs properly on Rx packets */
+#define RTL8139_CALCULATE_RXCRC 1
 
 /* Uncomment to enable on-board timer interrupts */
 //#define RTL8139_ONBOARD_TIMER 1
@@ -754,7 +753,7 @@ static void rtl8139_write_buffer(RTL8139
         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
 
         /* write packet data */
-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))
+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))
         {
             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));
 
@@ -1030,7 +1029,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif
@@ -1136,7 +1135,7 @@ static void rtl8139_do_receive(void *opa
 
         /* write checksum */
 #if defined (RTL8139_CALCULATE_RXCRC)
-        val = cpu_to_le32(crc32(~0, buf, size));
+        val = cpu_to_le32(crc32(0, buf, size));
 #else
         val = 0;
 #endif


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- xen.spec	26 Sep 2007 15:43:29 -0000	1.191
+++ xen.spec	27 Sep 2007 03:37:56 -0000	1.192
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -30,6 +30,7 @@
 Patch32: xen-clobber-vif-type.patch
 Patch33: xen-vmxassist-irqs.patch
 Patch34: xen-3.1.0-no-xenapi-docs.patch
+Patch35: xen-qemu-rtl8139-checksum.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -138,6 +139,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # config patches
 %patch100 -p1
@@ -287,6 +289,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Sep 26 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-11.fc8
+- Fixed rtl8139 checksum calculation for Vista (rhbz #308201)
+
 * Wed Sep 26 2007 Chris Lalancette <clalance at redhat.com> - 3.1.0-10.fc8
 - QEmu NE2000 overflow check - CVE-2007-1321
 - Pygrub guest escape - CVE-2007-4993



From fedora-extras-commits at redhat.com  Thu Sep 27 03:59:07 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Wed, 26 Sep 2007 23:59:07 -0400
Subject: rpms/gpp/devel .cvsignore, 1.3, 1.4 gnome-photo-printer.desktop, 1.1,
	1.2 gpp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709270359.l8R3x7aH002818@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2783

Modified Files:
	.cvsignore gnome-photo-printer.desktop gpp.spec sources 
Log Message:
update to latest upstream, fix .desktop, close #242195 and #198150


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2006 15:49:49 -0000	1.3
+++ .cvsignore	27 Sep 2007 03:58:34 -0000	1.4
@@ -1 +1 @@
-gpp-0.6.6.tar.gz
+gpp-0.7.0.tar.gz


Index: gnome-photo-printer.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gnome-photo-printer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-photo-printer.desktop	10 Nov 2005 19:11:48 -0000	1.1
+++ gnome-photo-printer.desktop	27 Sep 2007 03:58:34 -0000	1.2
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Photo Printer
-#GenericName=Photo Printer
-Comment=Prints photos from GNOME
+Name=GNOME Photo Printer
+GenericName=Photo Printer
+Comment=Prints photographs to a printer
 Exec=gnome-photo-printer
 Icon=printer.png
 StartupNotify=true
 Terminal=false
 Type=Application
 Categories=Application;Graphics;
-Version=0.6.5
+Version=1.0


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
+++ gpp.spec	27 Sep 2007 03:58:34 -0000	1.6
@@ -2,15 +2,15 @@
 
 Summary:	GNOME Photo Printer
 Name:           gpp
-Version:	0.6.6
-Release:	3%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
 License:	GPL
 Group:		Applications/Publishing
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils
+BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils perl(XML::Parser) gettext
 
 %description
 Gnome Photo Printer is intended for printing photos in an easy way.
@@ -30,24 +30,30 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 cp %SOURCE1 ${RPM_BUILD_ROOT}
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}/%{longname}.desktop
+%find_lang %{longname}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%files
+%files -f %{longname}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README COPYRIGHT
 %{_bindir}/*
 %{_datadir}/%{longname}
-%{_datadir}/applications/fedora-%{longname}.desktop
+%{_datadir}/applications/%{longname}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{longname}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{longname}.svg
 
 
 %changelog
+* Wed Sep 26 2007 Matt Domsch <matt at domsch.com> 0.7.0-1
+- update to latest upstream, fixes #242195 and #198150
+- fix .desktop file Version 
+
 * Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jul 2006 15:49:49 -0000	1.3
+++ sources	27 Sep 2007 03:58:34 -0000	1.4
@@ -1 +1 @@
-82fbfc0da760c432697433f31b3a2b5d  gpp-0.6.6.tar.gz
+ff8fdd9a8f741b346a8d87045d1d02e3  gpp-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 04:10:08 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 00:10:08 -0400
Subject: rpms/gpp/F-7 .cvsignore, 1.3, 1.4 gnome-photo-printer.desktop, 1.1, 
	1.2 gpp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200709270410.l8R4A8XU009105@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9078

Modified Files:
	.cvsignore gnome-photo-printer.desktop gpp.spec sources 
Log Message:
update to latest upstream, fix .desktop, close #242195 and #198150


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jul 2006 15:49:49 -0000	1.3
+++ .cvsignore	27 Sep 2007 04:09:35 -0000	1.4
@@ -1 +1 @@
-gpp-0.6.6.tar.gz
+gpp-0.7.0.tar.gz


Index: gnome-photo-printer.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/gnome-photo-printer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-photo-printer.desktop	10 Nov 2005 19:11:48 -0000	1.1
+++ gnome-photo-printer.desktop	27 Sep 2007 04:09:35 -0000	1.2
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Photo Printer
-#GenericName=Photo Printer
-Comment=Prints photos from GNOME
+Name=GNOME Photo Printer
+GenericName=Photo Printer
+Comment=Prints photographs to a printer
 Exec=gnome-photo-printer
 Icon=printer.png
 StartupNotify=true
 Terminal=false
 Type=Application
 Categories=Application;Graphics;
-Version=0.6.5
+Version=1.0


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/gpp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpp.spec	2 Oct 2006 20:42:05 -0000	1.5
+++ gpp.spec	27 Sep 2007 04:09:35 -0000	1.6
@@ -2,15 +2,15 @@
 
 Summary:	GNOME Photo Printer
 Name:           gpp
-Version:	0.6.6
-Release:	3%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
 License:	GPL
 Group:		Applications/Publishing
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils
+BuildRequires:	libgnomeui-devel libgnomeprintui22-devel libglade2-devel desktop-file-utils perl(XML::Parser) gettext
 
 %description
 Gnome Photo Printer is intended for printing photos in an easy way.
@@ -30,24 +30,30 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 cp %SOURCE1 ${RPM_BUILD_ROOT}
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}/%{longname}.desktop
+%find_lang %{longname}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%files
+%files -f %{longname}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README COPYRIGHT
 %{_bindir}/*
 %{_datadir}/%{longname}
-%{_datadir}/applications/fedora-%{longname}.desktop
+%{_datadir}/applications/%{longname}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{longname}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{longname}.svg
 
 
 %changelog
+* Wed Sep 26 2007 Matt Domsch <matt at domsch.com> 0.7.0-1
+- update to latest upstream, fixes #242195 and #198150
+- fix .desktop file Version 
+
 * Mon Oct 02 2006 Matt Domsch <matt at domsch.com> 0.6.6-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpp/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jul 2006 15:49:49 -0000	1.3
+++ sources	27 Sep 2007 04:09:35 -0000	1.4
@@ -1 +1 @@
-82fbfc0da760c432697433f31b3a2b5d  gpp-0.6.6.tar.gz
+ff8fdd9a8f741b346a8d87045d1d02e3  gpp-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 04:55:20 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Thu, 27 Sep 2007 00:55:20 -0400
Subject: rpms/gnome-applets/devel mixer-preferences-leak.patch, NONE,
	1.1 gnome-applets.spec, 1.245, 1.246
Message-ID: <200709270455.l8R4tKWo010370@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10346

Modified Files:
	gnome-applets.spec 
Added Files:
	mixer-preferences-leak.patch 
Log Message:
Fix a memory leak


mixer-preferences-leak.patch:

--- NEW FILE mixer-preferences-leak.patch ---
diff -up gnome-applets-2.20.0/mixer/preferences.c.leak gnome-applets-2.20.0/mixer/preferences.c
--- gnome-applets-2.20.0/mixer/preferences.c.leak	2007-09-27 00:49:39.000000000 -0400
+++ gnome-applets-2.20.0/mixer/preferences.c	2007-09-27 00:50:50.000000000 -0400
@@ -445,6 +445,8 @@ cb_track_select (GtkTreeSelection *selec
 	}
       }
     }
+    g_list_foreach (lst, (GFunc)gtk_tree_path_free, NULL);
+    g_list_free (lst);
   }
 
   /* add the one just selected and adjust its volume if it's not the only one


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gnome-applets.spec	25 Sep 2007 11:46:16 -0000	1.245
+++ gnome-applets.spec	27 Sep 2007 04:54:44 -0000	1.246
@@ -34,7 +34,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -70,6 +70,9 @@
 
 Patch34:        ppp-includes.patch
 
+# fixed in upstream svn
+Patch38:	mixer-preferences-leak.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -171,6 +174,7 @@
 %patch35 -p0 -b .mixer-sync
 popd
 %patch36 -p1 -b .gweather-pc
+%patch38 -p1 -b .mixer-preferences-leak
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -357,6 +361,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Thu Sep 27 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-6
+- Fix a memory leak in the mixer preferences
+
 * Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
 - Fix possible crasher in the mixer messages when we receive an
   unhandled message (#302881)



From fedora-extras-commits at redhat.com  Thu Sep 27 05:54:06 2007
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Thu, 27 Sep 2007 01:54:06 -0400
Subject: rpms/thinkfinger/devel thinkfinger-0.3-policykit.patch, NONE,
	1.1 thinkfinger-0.3-hal.patch, 1.2, 1.3 thinkfinger.spec, 1.5, 1.6
Message-ID: <200709270554.l8R5s6cs019816@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19787

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Added Files:
	thinkfinger-0.3-policykit.patch 
Log Message:
use PolicyKit to manage fingerprint reader access

thinkfinger-0.3-policykit.patch:

--- NEW FILE thinkfinger-0.3-policykit.patch ---
diff -uNr thinkfinger-0.3.orig/data/Makefile.am thinkfinger-0.3/data/Makefile.am
--- thinkfinger-0.3.orig/data/Makefile.am	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.am	2007-09-27 01:36:58.000000000 -0400
@@ -8,4 +8,7 @@
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
diff -uNr thinkfinger-0.3.orig/data/Makefile.in thinkfinger-0.3/data/Makefile.in
--- thinkfinger-0.3.orig/data/Makefile.in	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -50,10 +50,11 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
-	"$(DESTDIR)$(halpolicydir)"
+	"$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
 halpolicyDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA) $(halpolicy_DATA)
+policykitDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA) $(policykit_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -178,7 +179,9 @@
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
 all: all-am
 
 .SUFFIXES:
@@ -251,6 +254,23 @@
 	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
 	done
+install-policykitDATA: $(policykit_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(policykitdir)" || $(MKDIR_P) "$(DESTDIR)$(policykitdir)"
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(policykitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  $(policykitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
+
+uninstall-policykitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -288,7 +308,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -333,7 +353,8 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA install-halpolicyDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA \
+	install-policykitDATA
 
 install-dvi: install-dvi-am
 
@@ -367,7 +388,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA \
+	uninstall-policykitDATA
 
 .MAKE: install-am install-strip
 
@@ -378,11 +400,12 @@
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-halpolicyDATA install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-consolepermsDATA uninstall-halpolicyDATA
+	install-pdf-am install-policykitDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-consolepermsDATA \
+	uninstall-halpolicyDATA uninstall-policykitDATA
 
 # 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.
diff -uNr thinkfinger-0.3.orig/data/thinkfinger.policy thinkfinger-0.3/data/thinkfinger.policy
--- thinkfinger-0.3.orig/data/thinkfinger.policy	1969-12-31 19:00:00.000000000 -0500
+++ thinkfinger-0.3/data/thinkfinger.policy	2007-09-27 01:35:27.000000000 -0400
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+  <action id="org.freedesktop.hal.device-access.thinkfinger">
+    <description>Directly access the fingerprint reader</description>
+    <message>System policy prevents access to the fingerprint reader</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+</policyconfig>
diff -uNr thinkfinger-0.3.orig/docs/Makefile.in thinkfinger-0.3/docs/Makefile.in
--- thinkfinger-0.3.orig/docs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -61,6 +61,7 @@
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/docs/autodocs/Makefile.in thinkfinger-0.3/docs/autodocs/Makefile.in
--- thinkfinger-0.3.orig/docs/autodocs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/autodocs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -44,6 +44,7 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/libthinkfinger/Makefile.in thinkfinger-0.3/libthinkfinger/Makefile.in
--- thinkfinger-0.3.orig/libthinkfinger/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/libthinkfinger/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -85,6 +85,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/pam/Makefile.in thinkfinger-0.3/pam/Makefile.in
--- thinkfinger-0.3.orig/pam/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/pam/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -80,6 +80,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 05:53:33 -0000	1.3
@@ -1,6 +1,6 @@
 --- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
 +++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
 +  <device>
@@ -13,6 +13,7 @@
 +      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
 +        <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">thinkfinger</merge>
 +      </match>
 +    </match>
 +


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
+++ thinkfinger.spec	27 Sep 2007 05:53:33 -0000	1.6
@@ -11,12 +11,14 @@
 Patch1:         thinkfinger-0.3-acl.patch
 Patch2:         thinkfinger-0.3-has-device.patch
 Patch3:         thinkfinger-0.3-hal.patch
+Patch4:         thinkfinger-0.3-policykit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
 BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
 Requires:       hal
+Requires:       PolicyKit
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -68,6 +70,7 @@
 touch -r configure.in.stamp configure.in
 %patch2 -p1 -b .has-device
 %patch3 -p1 -b .hal
+%patch4 -p1 -b .policykit
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
@@ -116,6 +119,7 @@
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
 %{_datadir}/hal/fdi/policy/10osvendor/*
+%{_datadir}/PolicyKit/policy/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -130,6 +134,7 @@
 %changelog
 * Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
 - put fdi file in policy/ directory
+- use PolicyKit to manage fingerprint reader access
 
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)



From fedora-extras-commits at redhat.com  Thu Sep 27 05:54:48 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Thu, 27 Sep 2007 01:54:48 -0400
Subject: comps/po ja.po,1.6,1.7
Message-ID: <200709270554.l8R5sm5d019874@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19829/po

Modified Files:
	ja.po 
Log Message:
2007-09-26  Noriko Mizumoto <noriko at redhat.com> (via noriko at fedoraproject.org)

  * po/ja.po: commit test for tqsg




Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ja.po	25 Sep 2007 00:16:02 -0000	1.6
+++ ja.po	27 Sep 2007 05:54:18 -0000	1.7
@@ -11,7 +11,7 @@
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-20 17:44-0700\n"
-"PO-Revision-Date: 2007-09-24 12:02+1000\n"
+"PO-Revision-Date: 2007-09-27 15:50+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"



From fedora-extras-commits at redhat.com  Thu Sep 27 06:26:34 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Thu, 27 Sep 2007 02:26:34 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.65,1.66
Message-ID: <200709270626.l8R6QYAO029104@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/logrotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29084

Modified Files:
	logrotate.spec 
Log Message:
* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
- add missing dependencies to spec file



Index: logrotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- logrotate.spec	23 Aug 2007 06:20:23 -0000	1.65
+++ logrotate.spec	27 Sep 2007 06:26:01 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.6
-Release: 1.1%{?dist}
+Release: 1.2%{?dist}
 License: GPL+
 Group: System Environment/Base
 # The source for this package was pulled from cvs.
@@ -12,8 +12,8 @@
 #  cd logrotate
 #  make create-archive
 Source: logrotate-%{version}.tar.gz
-Requires: coreutils >= 5.92
-BuildRequires: libselinux-devel
+Requires: coreutils >= 5.92 libsepol libselinux popt
+BuildRequires: libselinux-devel popt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -58,6 +58,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
+- add missing dependencies to spec file
+
 * Thu Aug 23 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.1
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 06:54:46 2007
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Thu, 27 Sep 2007 02:54:46 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.66,1.67
Message-ID: <200709270654.l8R6skKj029740@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/logrotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29672

Modified Files:
	logrotate.spec 
Log Message:
* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.3
- popt-devel dependency was still missing



Index: logrotate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- logrotate.spec	27 Sep 2007 06:26:01 -0000	1.66
+++ logrotate.spec	27 Sep 2007 06:54:13 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.6
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
 License: GPL+
 Group: System Environment/Base
 # The source for this package was pulled from cvs.
@@ -13,7 +13,7 @@
 #  make create-archive
 Source: logrotate-%{version}.tar.gz
 Requires: coreutils >= 5.92 libsepol libselinux popt
-BuildRequires: libselinux-devel popt
+BuildRequires: libselinux-devel popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -58,6 +58,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.3
+- popt-devel dependency was still missing
+
 * Thu Sep 27 2007 Tomas Smetana <tsmetana at redhat.com> 3.7.6-1.2
 - add missing dependencies to spec file
 



From fedora-extras-commits at redhat.com  Thu Sep 27 06:55:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Wed, 26 Sep 2007 23:55:21 -0700
Subject: [pkgdb] csync2 ownership updated
Message-ID: <200709270655.l8R6tRiH006930@bastion.fedora.phx.redhat.com>

Package csync2 in Fedora devel was orphaned by Ruben Kerkhof (ruben)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/csync2



From fedora-extras-commits at redhat.com  Thu Sep 27 08:03:41 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 04:03:41 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.34, 1.35 hwbrowser.spec, 1.48,
	1.49 sources, 1.42, 1.43
Message-ID: <200709270803.l8R83fXa016054@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/hwbrowser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
hide notebook tabs (#308301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	11 Sep 2007 08:58:11 -0000	1.34
+++ .cvsignore	27 Sep 2007 08:03:08 -0000	1.35
@@ -1 +1 @@
-hwbrowser-0.36.tar.bz2
+hwbrowser-0.37.tar.bz2


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- hwbrowser.spec	14 Sep 2007 12:46:29 -0000	1.48
+++ hwbrowser.spec	27 Sep 2007 08:03:08 -0000	1.49
@@ -1,6 +1,6 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.36
+Version: 0.37
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -52,6 +52,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 0.37-1
+- hide notebook tabs (#308301)
+
 * Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> - 0.36-1
 - make "hwbrowser" executable (#285171)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hwbrowser/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	14 Sep 2007 12:46:29 -0000	1.42
+++ sources	27 Sep 2007 08:03:08 -0000	1.43
@@ -1 +1 @@
-a51bf81470d82846a0cf6f185f44bc3a  hwbrowser-0.36.tar.bz2
+fd6edb9aff966fc6eb24bbe26936056e  hwbrowser-0.37.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 09:17:18 2007
From: fedora-extras-commits at redhat.com (Harald Hoyer (harald))
Date: Thu, 27 Sep 2007 05:17:18 -0400
Subject: rpms/cdrkit/F-7 cdrkit.spec,1.8,1.9
Message-ID: <200709270917.l8R9HIJN026577@cvs-int.fedora.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26555

Modified Files:
	cdrkit.spec 
Log Message:
* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
- fixed readcd man page symlink



Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/F-7/cdrkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cdrkit.spec	21 Sep 2007 08:53:01 -0000	1.8
+++ cdrkit.spec	27 Sep 2007 09:16:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -121,7 +121,7 @@
 		%{_mandir}/man1/wodim.1.gz \
 	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
 	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
-		%{_mandir}/man1/readcd.1.gz 
+		%{_mandir}/man1/readom.1.gz 
 
 %preun -n wodim
 if [ $1 = 0 ]; then
@@ -209,6 +209,9 @@
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Tue Sep 25 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-6
+- fixed readcd man page symlink
+
 * Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
 - fixed rhbz#255001 - icedax --devices segfaults
 - fixed rhbz#249357 - Typo in wodim output



From fedora-extras-commits at redhat.com  Thu Sep 27 09:36:32 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 27 Sep 2007 05:36:32 -0400
Subject: rpms/OpenSceneGraph/F-7 OpenSceneGraph.spec,1.22,1.23
Message-ID: <200709270936.l8R9aWOh027283@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27258

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Fri Sep 14 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-5
- Split out OpenSceneGraph-libs.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-7/OpenSceneGraph.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OpenSceneGraph.spec	22 Jun 2007 03:40:31 -0000	1.22
+++ OpenSceneGraph.spec	27 Sep 2007 09:35:59 -0000	1.23
@@ -11,7 +11,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -180,10 +180,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -193,13 +189,28 @@
 %{_bindir}/osgversion
 %{_bindir}/osgviewer
 %{?_with_gdal:%{_bindir}/osgdem}
+
+%package libs
+Summary: 	OpenSceneGraph Libraries
+Group:		Applications/Multimedia
+
+%description libs
+OpenSceneGraph Libraries.
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files libs
+%defattr(-,root,root,-)
 %{_libdir}/osgPlugins
 %{_libdir}/libosg*.so.*
 
 %package devel
 Summary: 	Devel files for OpenSceneGraph
 Group:		Applications/Multimedia
-Requires:	%name = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	Producer-devel = %{version}-%{release}
 
 %description devel
@@ -395,6 +406,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Fri Sep 14 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-5
+- Split out OpenSceneGraph-libs.
+
 * Thu Jun 21 2007 Ralf Cors??pius <rc040203 at freenet.de> - 1.2-4
 - ExcludeArch: ppc64 (BZ 245192, 245196).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 11:06:06 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 07:06:06 -0400
Subject: rpms/ghostscript/devel ghostscript-mkstemp64.patch, NONE,
	1.1 ghostscript.spec, 1.142, 1.143
Message-ID: <200709271106.l8RB66ke010136@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10098

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-mkstemp64.patch 
Log Message:
* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 8.60-3
- Back-ported mkstemp64 patch (bug #308211).


ghostscript-mkstemp64.patch:

--- NEW FILE ghostscript-mkstemp64.patch ---
From: alexcher <alexcher at a1074d23-0009-0410-80fe-cf8c14f379e6>
Date: Sat, 8 Sep 2007 22:31:20 +0000 (+0000)
Subject: Declare Ghostscript as _LARGEFILE64_SOURCE program, i.e. request transitional
X-Git-Url: http://git.infradead.org/?p=ghostscript.git;a=commitdiff_plain;h=0513d1b9542d37e7134d36e49222b12ef469b722

Declare Ghostscript as _LARGEFILE64_SOURCE program, i.e. request transitional
interface to large file support. Check for mkstemp64() availability specially.


git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs at 8232 a1074d23-0009-0410-80fe-cf8c14f379e6
---

diff --git a/src/Makefile.in b/src/Makefile.in
index c1e3c3b..5590f9a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -120,8 +120,11 @@ GENOPT=
 #
 # -DHAVE_FILE64
 #	use marked versions of the stdio FILE calls, fopen64() et al.
+#
+# -DHAVE_MKSTEMP64
+#	use non-standard function mkstemp64()
 
-CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_FONTCONFIG@
+CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@
 
 # Define the name of the executable file.
 
diff --git a/src/configure.ac b/src/configure.ac
index 10658c5..ffde250 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -924,6 +924,9 @@ AC_SUBST(HAVE_HYPOT)
 AC_CHECK_FUNCS([fopen64], [HAVE_FILE64=-DHAVE_FILE64])
 AC_SUBST(HAVE_FILE64)
 
+AC_CHECK_FUNCS([mkstemp64], [HAVE_MKSTEMP64=-DHAVE_MKSTEMP64])
+AC_SUBST(HAVE_MKSTEMP64)
+
 AC_PROG_GCC_TRADITIONAL
 
 dnl NB: We don't actually provide autoconf-switched fallbacks for any
diff --git a/src/gp_unifs.c b/src/gp_unifs.c
index 6b6a85c..ac555b5 100644
--- a/src/gp_unifs.c
+++ b/src/gp_unifs.c
@@ -88,18 +88,22 @@ gp_open_scratch_file_generic(const char *prefix, char fname[gp_file_name_sizeof]
 
 	/* save the old filename template in case mkstemp fails */
 	memcpy(ofname, fname, gp_file_name_sizeof);
-#if defined(HAVE_FILE64) && !defined(_LARGEFILE64_SOURCE)
-	if (b64)
-	    file = mkstemp64(fname);
-	else
+#ifdef HAVE_MKSTEMP64
+	file = (b64 ? mkstemp64 : mkstemp)(fname);
+#else
+        file = mkstemp(fname);
 #endif
-	    file = mkstemp(fname);
-
-	/* Fixme : what to do with b64 and 32-bit mkstemp? Unimplemented. */
 	if (file < -1) {
 	    eprintf1("**** Could not open temporary file %s\n", ofname);
 	    return NULL;
 	}
+#if defined(O_LARGEFILE) && defined(__hpux)
+        if (b64)
+            fcntl(file, F_SETFD, fcntl(file, F_GETFD) | O_LARGEFILE);
+#else
+	/* Fixme : what to do with b64 and 32-bit mkstemp? Unimplemented. */
+#endif
+
 	fp = fdopen(file, mode);
 	if (fp == NULL)
 	    close(file);
@@ -479,10 +483,10 @@ gp_enumerate_files_close(file_enum * pfen)
 
 FILE *gp_fopen_64(const char *filename, const char *mode)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
-    return fopen(filename, mode);
-#else
+#if defined(HAVE_FILE64)
     return fopen64(filename, mode);
+#else
+    return fopen(filename, mode);
 #endif
 }
 
@@ -497,22 +501,22 @@ FILE *gp_open_scratch_file_64(const char *prefix,
 
 int64_t gp_ftell_64(FILE *strm)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
-    return ftello(strm);
-#else
+#if defined(HAVE_FILE64)
     return ftello64(strm);
+#else
+    return ftello(strm);
 #endif
 }
 
 int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
-#if defined(_LARGEFILE64_SOURCE) || !defined(HAVE_FILE64)
+#if defined(HAVE_FILE64)
+    return fseeko64(strm, offset, origin);
+#else
     off_t offset1 = (off_t)offset;
     
     if (offset != offset1)
 	return -1;
     return fseeko(strm, offset1, origin);
-#else
-    return fseeko64(strm, offset, origin);
 #endif
 }
diff --git a/src/stdpre.h b/src/stdpre.h
index acb61c1..c17cdbf 100644
--- a/src/stdpre.h
+++ b/src/stdpre.h
@@ -17,6 +17,9 @@
 #ifndef stdpre_INCLUDED
 #  define stdpre_INCLUDED
 
+/* Ghostscript uses transitional LFS functions. */
+#define _LARGEFILE64_SOURCE 1
+
 /*
  * Here we deal with the vagaries of various C compilers.  We assume that:
  *      ANSI-standard Unix compilers define __STDC__.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ghostscript.spec	23 Aug 2007 16:14:00 -0000	1.142
+++ ghostscript.spec	27 Sep 2007 11:05:26 -0000	1.143
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -20,6 +20,7 @@
 Patch3: ghostscript-noopt.patch
 Patch4: ghostscript-fPIC.patch
 Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch
+Patch6: ghostscript-mkstemp64.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -88,6 +89,8 @@
 # IJS KRGB patch.
 %patch5 -p1 -b .ijs-krgb
 
+%patch6 -p1 -b .mkstemp64
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -265,6 +268,9 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 8.60-3
+- Back-ported mkstemp64 patch (bug #308211).
+
 * Thu Aug 23 2007 Tim Waugh <twaugh at redhat.com> 8.60-2
 - More specific license tag.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 11:24:00 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 07:24:00 -0400
Subject: rpms/ghostscript/devel ghostscript-mkstemp64.patch,1.1,1.2
Message-ID: <200709271124.l8RBO0KX010793@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10772

Modified Files:
	ghostscript-mkstemp64.patch 
Log Message:
Include missing piece.

ghostscript-mkstemp64.patch:

Index: ghostscript-mkstemp64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript-mkstemp64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-mkstemp64.patch	27 Sep 2007 11:05:26 -0000	1.1
+++ ghostscript-mkstemp64.patch	27 Sep 2007 11:23:56 -0000	1.2
@@ -132,3 +132,35 @@
  /*
   * Here we deal with the vagaries of various C compilers.  We assume that:
   *      ANSI-standard Unix compilers define __STDC__.
+From: alexcher <alexcher at a1074d23-0009-0410-80fe-cf8c14f379e6>
+Date: Wed, 5 Sep 2007 19:21:05 +0000 (+0000)
+Subject: Replace non-standard function call fdopen64() with fdopen(). The former
+X-Git-Url: http://git.infradead.org/?p=ghostscript.git;a=commitdiff_plain;h=dc01761c07d210974d829c35c33a8886c33b0488
+
+Replace non-standard function call fdopen64() with fdopen(). The former
+is not available on most platforms and not needed anyway because O_LARGEFILE
+flag is set earlier in the code. Bug 689175.
+
+DIFFERENCES:
+None
+
+
+git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs at 8229 a1074d23-0009-0410-80fe-cf8c14f379e6
+---
+
+diff --git a/src/gpmisc.c b/src/gpmisc.c
+index f963d82..303fac2 100644
+--- a/src/gpmisc.c
++++ b/src/gpmisc.c
+@@ -93,11 +93,7 @@ gp_fopentemp_generic(const char *fname, const char *mode, bool b64)
+      * fdopen as (char *), rather than following the POSIX.1 standard,
+      * which defines it as (const char *).  Patch this here.
+      */
+-#if defined (O_LARGEFILE)
+-    file = (b64 ? fdopen64 : fdopen)(fildes, (char *)mode); /* still really const */
+-#else
+     file = fdopen(fildes, (char *)mode); /* still really const */
+-#endif
+     if (file == 0)
+ 	close(fildes);
+     return file;



From fedora-extras-commits at redhat.com  Thu Sep 27 11:53:15 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 07:53:15 -0400
Subject: rpms/kdebase/devel kdebase-3.5.7-konsolesu.patch, NONE,
	1.1 kdebase.spec, 1.265, 1.266
Message-ID: <200709271153.l8RBrF0L011675@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11654

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.7-konsolesu.patch 
Log Message:
rh#301841, "Root Shell" sessions will not close


kdebase-3.5.7-konsolesu.patch:

--- NEW FILE kdebase-3.5.7-konsolesu.patch ---
--- kdebase-3.5.7/konsole/konsolesu.desktop.orig	2007-09-27 13:47:40.000000000 +0200
+++ kdebase-3.5.7/konsole/konsolesu.desktop	2007-09-27 13:49:40.000000000 +0200
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Exec=konsole --type su
+Exec=kdesu konsole
 Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- kdebase.spec	30 Aug 2007 13:31:10 -0000	1.265
+++ kdebase.spec	27 Sep 2007 11:52:42 -0000	1.266
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 # a lot(most/all?) of files are +, but we'll be conservative, for now. -- Rex
@@ -70,6 +70,7 @@
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
 Patch29: kdebase-3.5.7-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
+Patch31: kdebase-3.5.7-konsolesu.patch
 
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
@@ -231,6 +232,7 @@
 %patch28 -p1 -b .kdm-alternatebackground
 %patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
+%patch31 -p1 -b .konsolesu-kdesu
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
@@ -644,6 +646,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> - 6:3.5.7-15
+- rh#301841, "Root Shell" sessions will not close
+
 * Thu Aug 30 2007 Than Ngo <than at redhat.com> - 6:3.5.7-14
 - fix bz#265801, fuser command not found by kio_media_mounthelper
 



From fedora-extras-commits at redhat.com  Thu Sep 27 12:10:36 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 27 Sep 2007 08:10:36 -0400
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff, 1.4,
	1.5 OpenSceneGraph.spec, 1.27, 1.28
Message-ID: <200709271210.l8RCAa5n018205@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18179

Modified Files:
	OpenSceneGraph-2.0.diff OpenSceneGraph.spec 
Log Message:
* Thu Sep 27 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-7
- Let OpenSceneGraph-libs Obsoletes: Producer
- Let OpenSceneGraph-devel Obsoletes: Producer-devel.

* Wed Sep 26 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-6
- By public demand, add upstream's *.pcs.
- Add hacks to work around the worst bugs in *.pcs.
- Add OpenSceneGraph2-devel.
- Move ldconfig to *-libs.
- Abandon OpenThreads2.
- Remove obsolete applications.



OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSceneGraph-2.0.diff	14 Sep 2007 05:13:08 -0000	1.4
+++ OpenSceneGraph-2.0.diff	27 Sep 2007 12:10:33 -0000	1.5
@@ -1,6 +1,6 @@
 diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-26 10:18:50.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
  
 diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 --- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
-+++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-26 10:18:50.000000000 +0200
 @@ -30,7 +30,7 @@
  # If a relative path is entered, it will be relative to the location 
  # where doxygen was started. If left blank the current directory will be used.
@@ -33,7 +33,7 @@
  # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
 --- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-26 10:18:50.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -43,9 +43,9 @@
      ADD_SUBDIRECTORY(osgtext)
      ADD_SUBDIRECTORY(osgtexture1D)
      ADD_SUBDIRECTORY(osgtexture2D)
-diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc OpenSceneGraph/pkgconfig/openscenegraph-2.pc
---- OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -54,16 +54,16 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openscenegraph-2
++Name: openscenegraph
 +Description: 3D scenegraph
-+Version: 2.0
++Version: 2.1.12
 +Requires: openthreads
 +Conflicts:
-+Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
++Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer
 +Cflags: -I${includedir}
-diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
---- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openthreads.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -74,7 +74,7 @@
 +
 +Name: openthreads
 +Description: Object-Oriented (OO) thread interface for C++ programmers
-+Version: 2.0
++Version: 1.9.6
 +Requires:
 +Conflicts:
 +Libs: -L${libdir} -lOpenThreads


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- OpenSceneGraph.spec	22 Aug 2007 05:04:57 -0000	1.27
+++ OpenSceneGraph.spec	27 Sep 2007 12:10:33 -0000	1.28
@@ -7,15 +7,15 @@
 %define apivers 2.0
 %define srcvers 2.0
 
-# pkgconfig support has been abandoned pkgconfig support
-%define _with_pkgconfig 0
+# HACK: Work around to yum not being able to remove packages
+%define _obsolete_Producer 1
 
-# The latest rpm "version-release" of OSG1's Producer in Fedora.
-%define OSG1_Producer 1.2-4%{?dist}
+# Force pushing out OSG1's Producer
+%define OSG1_Producer 1:1.2-0
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -26,8 +26,6 @@
 Patch0:         OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# BZ: 245192, 245196
-# ExcludeArch:    ppc64
 
 BuildRequires:  libGL-devel
 BuildRequires:  libGLU-devel
@@ -42,11 +40,10 @@
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
-# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
-# Required to let yum remove Producer (from OSG-1)
-Obsoletes:	Producer <= %{OSG1_Producer}
 
+%if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
+%endif
 
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
@@ -73,6 +70,18 @@
 OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 popd
 
+# HACK: Upstream stuff lacks cmake support and is broken
+sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
+  -e 's,^libdir=.*$,libdir=%{_libdir},' \
+  -e 's,^includedir=.*$,includedir=%{_includedir},' \
+  -e '/^Conflicts.*$/d' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+sed -i -e 's,Version:.*,Version: 2.0.0,' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+sed -i -e 's,Version:.*,Version: 1.9.5,' \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -80,21 +89,18 @@
 
 # Supposed to take OpenSceneGraph data
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
-
-%if %{?_with_pkgconfig}
-# Abandoned by upstream, re-added by patch
-# FIXME: Don't ship for now. Consider to re-activate
-install -m 644 -D pkgconfig/openthreads-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads-2.pc
-install -m 644 -D pkgconfig/openscenegraph-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif 
 popd
 
+# Abandoned w/ 2.0 by upstream, re-added to 2.1.*
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openthreads.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 
 %files
@@ -108,11 +114,23 @@
 %package libs
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
 Provides:	OpenSceneGraph2-libs = %{version}-%{release}
+%endif
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
+Obsoletes:	Producer <= %{OSG1_Producer}
+%endif
+
 
 %description libs
 Runtime libraries files for OpenSceneGraph.
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/osgPlugins-2.0.*
@@ -121,12 +139,18 @@
 %package devel
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:	OpenSceneGraph2-devel = %{version}-%{release}
+%endif
 Requires:	OpenSceneGraph2-libs = %{version}-%{release}
-%if %{?_with_pkgconfig}
 Requires:	pkgconfig
-%endif
-Requires:	OpenThreads2-devel
+Requires:	OpenThreads-devel
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
 Obsoletes:	Producer-devel <= %{OSG1_Producer}
+%endif
+
 
 %description devel
 Development files for OpenSceneGraph.
@@ -135,15 +159,16 @@
 %defattr(-,root,root,-)
 %doc BUILD/doc/html
 %{_includedir}/osg*
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif
+%{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
 
 # OpenSceneGraph-examples
 %package examples
 Summary:        Sample applications for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:       OpenSceneGraph2-examples = %{version}-%{release}
+%endif
 
 %description examples
 Sample applications for OpenSceneGraph
@@ -157,9 +182,6 @@
 %{_bindir}/osgcallback
 %{_bindir}/osgcamera
 %{_bindir}/osgcatch
-%if "%{version}" < "2.0"
-%{_bindir}/osgcameragroup
-%endif
 %{_bindir}/osgclip
 %if "%{version}" < "2.0"
 # doesn't build w/ 2.0
@@ -172,9 +194,6 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
-%if "%{version}" < "1.2"
-%{_bindir}/osgfbo
-%endif
 %{_bindir}/osgfadetext
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
@@ -195,9 +214,6 @@
 %{_bindir}/osgmanipulator
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
-%if "%{version}" < "2.0"
-%{_bindir}/osgmultiplecameras
-%endif
 %{_bindir}/osgmultitexture
 %{_bindir}/osgoccluder
 %{_bindir}/osgpagedlod
@@ -220,10 +236,6 @@
 %{_bindir}/osgshadow
 %{_bindir}/osgshadowtexture
 %{_bindir}/osgshape
-%if "%{version}" < "2.0"
-%{_bindir}/osgsimple
-%{_bindir}/osgsimplepager
-%endif
 %{_bindir}/osgsimplifier
 %{_bindir}/osgslice
 %{_bindir}/osgspacewarp
@@ -256,7 +268,6 @@
 Summary:        OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2 = %{version}-%{release}
 
 %description -n OpenThreads
 OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
@@ -279,25 +290,31 @@
 Summary:        Devel files for OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2-devel = %{version}-%{release}
-Requires:       OpenThreads2 = %{version}-%{release}
-%if %{?_with_pkgconfig}
+Requires:       OpenThreads = %{version}-%{release}
 Requires:	pkgconfig
-%endif
 
 %description -n OpenThreads-devel
 Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openthreads-2.pc
-%endif
+%{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
-
 %changelog
+* Thu Sep 27 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-7
+- Let OpenSceneGraph-libs Obsoletes: Producer
+- Let OpenSceneGraph-devel Obsoletes: Producer-devel.
+
+* Wed Sep 26 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-6
+- By public demand, add upstream's *.pcs.
+- Add hacks to work around the worst bugs in *.pcs.
+- Add OpenSceneGraph2-devel.
+- Move ldconfig to *-libs.
+- Abandon OpenThreads2.
+- Remove obsolete applications.
+
 * Wed Aug 22 2007 Ralf Cors??pius <rc040203 at freenet.de> - 2.0-5
 - Prepare renaming package into OpenSceneGraph2.
 - Split out run-time libs into *-libs subpackage.



From fedora-extras-commits at redhat.com  Thu Sep 27 12:28:33 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Thu, 27 Sep 2007 08:28:33 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.10,1.11
Message-ID: <200709271228.l8RCSXWN019127@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19050

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg setup line.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- java-1.7.0-icedtea.spec	26 Sep 2007 19:22:05 -0000	1.10
+++ java-1.7.0-icedtea.spec	27 Sep 2007 12:28:00 -0000	1.11
@@ -264,7 +264,6 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
-%setup -q -n icedtea-%{icedteaver} -T -D -a 8
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -731,6 +730,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+- Removed jtreg setup line.
+
 * Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg. Does not adhere to Fedora guidelines.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 12:28:36 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 08:28:36 -0400
Subject: rpms/xsane/devel xsane.desktop,1.1,1.2 xsane.spec,1.50,1.51
Message-ID: <200709271228.l8RCSanx019133@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19061

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
fix "Name" (#293871) and "Category" entries in desktop file



Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsane.desktop	8 Jun 2006 08:19:07 -0000	1.1
+++ xsane.desktop	27 Sep 2007 12:28:03 -0000	1.2
@@ -2,13 +2,12 @@
 Version=1.0
 Encoding=UTF-8
 Type=Application
-#Name=XSane
-Name=Scanner Tool
+Name=XSane
 GenericName=Scanner Tool
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane
 TryExec=xsane
 Icon=/usr/share/sane/xsane/xsane-logo.xpm
 Terminal=false
-Categories=Application;Graphics;2DGraphics;RasterGraphics;GTK;
+Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xsane.spec	5 Sep 2007 15:27:57 -0000	1.50
+++ xsane.spec	27 Sep 2007 12:28:03 -0000	1.51
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.994
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -72,9 +72,6 @@
 mkdir %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
-    --add-category X-Red-Hat-Base                       \
-    --add-category X-Fedora                             \
-    --add-category Graphics                             \
     %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
@@ -118,6 +115,9 @@
 
 %changelog
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
+- fix "Name" (#293871) and "Category" entries in desktop file
+
+* Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license to GPLv2+
 
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3



From fedora-extras-commits at redhat.com  Thu Sep 27 12:55:42 2007
From: fedora-extras-commits at redhat.com (Tomas Hoger (thoger))
Date: Thu, 27 Sep 2007 08:55:42 -0400
Subject: fedora-security/audit fc6,1.267,1.268 fc7,1.122,1.123
Message-ID: <200709271255.l8RCtgYe019842@cvs-int.fedora.redhat.com>

Author: thoger

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819/audit

Modified Files:
	fc6 fc7 
Log Message:
proccess large pile of fedora updates



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- fc6	21 Sep 2007 21:28:10 -0000	1.267
+++ fc6	27 Sep 2007 12:55:40 -0000	1.268
@@ -5,7 +5,7 @@
 # (mozilla) = (firefox, seamonkey, thunderbird, yelp, devhelp, galeon, liferea. epiphany)
 
 # Up to date CVE as of CVE email 20070914
-# Up to date FC6 as of 20070916
+# Up to date FC6 as of 20070926
 
 CVE-2007-5034 VULNERABLE (elinks) #297611
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
@@ -17,17 +17,19 @@
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-694]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286061
 CVE-2007-4721 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-4670 backport (php) [since FEDORA-2007-709]
 CVE-2007-4663 ignore (php, fixed 5.2.4) #277991 safe_mode
 CVE-2007-4662 ignore (php, fixed 5.2.4) #278101 triggerable only by modification to openssl.conf
 CVE-2007-4661 ignore (php, fixed 5.2.4) 5.2.3, incomplete CVE-2007-2872 fix
 CVE-2007-4660 VULNERABLE (php, fixed 5.2.4) 
 CVE-2007-4659 ignore (php, fixed 5.2.4) #276531 (FC7/php-5.2 only)
-CVE-2007-4658 VULNERABLE (php, fixed 5.2.4) #278011
+CVE-2007-4658 backport (php, fixed 5.2.4) #278011 [since FEDORA-2007-709]
 CVE-2007-4657 VULNERABLE (php, fixed 5.2.4)
 CVE-2007-4569 VULNERABLE (kdebase) #299741
 CVE-2007-4565 backport (fetchmail) #260881 [since FEDORA-2007-689]
 CVE-2007-4559 VULNERABLE (python) tarfile module - directory traversal
 CVE-2007-4558 ignore (star, fixed 1.5a84) duplicate of CVE-2007-4134
+CVE-2007-4465 version (httpd) [since FEDORA-2007-707]
 CVE-2007-4357 ignore (firefox) status bar can be overwrittten
 CVE-2007-4255 ignore (php) msql extension not shipped
 CVE-2007-4251 ignore (openoffice.org) just a crash
@@ -35,7 +37,7 @@
 CVE-2007-4225 ignore (kdebase) caused by fix to CVE-2007-3820 which we never shipped
 CVE-2007-4224 ignore (kdebase) too obvious -- mouse pointer indicates script activity
 CVE-2007-4211 version (dovecot, fixed 1.0.3) #251009 [since FEDORA-2007-664]
-CVE-2007-4137 VULNERABLE (qt) #292951
+CVE-2007-4137 backport (qt) #292951 [since FEDORA-2007-703]
 CVE-2007-4134 VULNERABLE (star, fixed 1.5a84) #254129
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-683]
 CVE-2007-4029 backport (libvorbis) #250600 [since FEDORA-2007-677]
@@ -44,17 +46,19 @@
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-690]
 CVE-2007-3999 VULNERABLE (nfs-utils-lib) #294911
 CVE-2007-3999 VULNERABLE (libtirpc) #294931
+CVE-2007-3998 backport (php) [since FEDORA-2007-709]
+CVE-2007-3996 backport (php) [since FEDORA-2007-709]
 CVE-2007-3962 ignore (gftp) multiple buffer overflows in fsplib, not on Linux
 CVE-2007-3961 ignore (gftp) off-by-one error in fsplib
 CVE-2007-3852 backport (sysstat) #252296 [since FEDORA-2007-675]
 CVE-2007-3848 version (kernel) [since FEDORA-2007-679]
-CVE-2007-3847 VULNERABLE (httpd) #250756
+CVE-2007-3847 version (httpd) #250756 [since FEDORA-2007-707]
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
 CVE-2007-3843 VULNERABLE (kernel) #246595
 CVE-2007-3841 ignore (pidgin) ethically disclosed
 CVE-2007-3820 ** (kdebase) #248537
-CVE-2007-3799 ** (php)
+CVE-2007-3799 backport (php) [since FEDORA-2007-709]
 CVE-2007-3798 version (tcpdump, fixed 3.9.7) #250290 [since FEDORA-2007-654]
 CVE-2007-3782 VULNERABLE (mysql, fixed 5.0.44)
 CVE-2007-3781 VULNERABLE (mysql, fixed 5.0.44)
@@ -62,19 +66,20 @@
 CVE-2007-3642 version (kernel, fixed 2.6.22) [since FEDORA-2007-655]
 CVE-2007-3508 ignore (glibc) not an issue
 CVE-2007-3506 backport (freetype, fixed 2.3.4) #235479 [since FEDORA-2007-561]
-CVE-2007-3478 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3477 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3476 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3475 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3474 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3473 VULNERABLE (gd, fixed 2.0.35) #277421
-CVE-2007-3472 VULNERABLE (gd, fixed 2.0.35) #277421
+CVE-2007-3478 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3477 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3476 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3475 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3474 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3473 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
+CVE-2007-3472 version (gd, fixed 2.0.35) #277421 [since FEDORA-2007-692]
 CVE-2007-3409 version (perl-Net-DNS, fixed 0.60) #245809
 CVE-2007-3393 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3392 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3391 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3390 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-628]
+CVE-2007-3388 backport (qt) [since FEDORA-2007-703]
 CVE-2007-3387 VULNERABLE (poppler) #251513
 CVE-2007-3387 backport (tetex) #251515 [since FEDORA-2007-669]
 CVE-2007-3387 backport (kdegraphics) #251511 [since FEDORA-2007-685]
@@ -94,14 +99,16 @@
 CVE-2007-2875 version (kernel) [since FEDORA-2007-600]
 *CVE-2007-2874 (wpa_supplicant) #242455
 CVE-2007-2873 version (spamassassin, fixed 3.1.9) [since FEDORA-2007-582]
+CVE-2007-2872 backport (php) [since FEDORA-2007-709]
 CVE-2007-2871 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2870 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2869 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2868 version (mozilla) #241840 [since FEDORA-2007-549]
 CVE-2007-2867 version (mozilla) #241840 [since FEDORA-2007-549]
-CVE-2007-2834 VULNERABLE (openoffice.org, fixed 2.3) #293371
+CVE-2007-2834 backport (openoffice.org, fixed 2.3) #293371 [since FEDORA-2007-700]
 CVE-2007-2799 version (file, fixed 4.21) #241034 [since FEDORA-2007-538]
 CVE-2007-2797 version (xterm)
+CVE-2007-2756 backport (php) [since FEDORA-2007-709]
 CVE-2007-2453 version (kernel) [since FEDORA-2007-600]
 CVE-2007-2451 version (kernel, fixed 2.6.21.4) [since FEDORA-2007-600]
 CVE-2007-2445 backport (libpng) #239542 [since FEDORA-2007-529]
@@ -162,6 +169,7 @@
 CVE-2007-0451 version (spamassassin, fixed 3.1.8) [since FEDORA-2007-241]
 CVE-2007-0248 version (squid, fixed 2.6.STABLE7) [since FEDORA-2007-073]
 CVE-2007-0247 version (squid, fixed 2.6.STABLE7) #222883 [since FEDORA-2007-073]
+CVE-2007-0242 backport (qt) [since FEDORA-2007-703]
 CVE-2007-0235 version (libgtop2, fixed 2.14.9) #222637 [since FEDORA-2007-657]
 CVE-2007-0104 ignore (poppler) only client DoS
 CVE-2007-0104 ignore (kdegraphics) only client DoS


Index: fc7
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc7,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc7	26 Sep 2007 15:57:23 -0000	1.122
+++ fc7	27 Sep 2007 12:55:40 -0000	1.123
@@ -6,16 +6,17 @@
 # A couple of first F7 updates were marked as FEDORA-2007-0001
 
 # Up to date CVE as of CVE email 20070914
-# Up to date FC7 as of 20070916
+# Up to date FC7 as of 20070926
 
-GENERIC-MAP-NOMATCH VULNERABLE (t1lib) #303021
-CVE-2007-5038 VULNERABLE (bugzilla, fixed 3.0.2, 3.1.2) #299981
+CVE-2007-5106 version (wordpress) affects old 2.0.x versions
+CVE-2007-5105 version (wordpress) affects old 2.0.x versions
+CVE-2007-5038 version (bugzilla, fixed 3.0.2, 3.1.2) #299981 [since FEDORA-2007-2299]
 CVE-2007-5037 VULNERABLE (inotify-tools) #299771
-CVE-2007-5034 VULNERABLE (elinks) #297981
+CVE-2007-5034 version (elinks) #297981 [since FEDORA-2007-2224]
 CVE-2007-5007 VULNERABLE (balsa) #297601
 GENERIC-MAP-NOMATCH VULNERABLE (duplicity) #293081
 GENERIC-MAP-NOMATCH VULNERABLE (nx) #293031
-CVE-2007-4974 VULNERABLE (libsndfile) #296221
+CVE-2007-4974 backport (libsndfile) #296221 [since FEDORA-2007-2236]
 CVE-2007-4965 VULNERABLE (python) imageop module heap overflow
 CVE-2007-4924 VULNERABLE (ekiga, version 2.0.10) really opal 2.2.10 #297551
 CVE-2007-4897 version (ekiga, version 2.0.9) really opal 2.2.8
@@ -24,8 +25,8 @@
 CVE-2007-4841 ignore (mozilla suite) Windows only
 CVE-2007-4840 ignore (php)
 CVE-2007-4829 VULNERABLE (perl-Archive-Tar)
-CVE-2007-4828 (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881
-CVE-2007-4826 VULNERABLE (quagga, fixed 0.99.9) in updates-testing
+CVE-2007-4828 version (mediawiki, fixed 1.11.0, 1.10.2, 1.9.4) #287881 [since FEDORA-2007-2189]
+CVE-2007-4826 version (quagga, fixed 0.99.9) [since FEDORA-2007-2196]
 CVE-2007-4752 VULNERABLE (openssh) #280461
 CVE-2007-4743 backport (krb5) incomplete CVE-2007-3999 fix [since FEDORA-2007-2066]
 CVE-2007-4730 VULNERABLE (xorg-x11) #286051
@@ -41,6 +42,7 @@
 CVE-2007-4650 version (gallery2) #267421 [since FEDORA-2007-2020]
 CVE-2007-4629 version (mapserver, fixed 4.10.3) #272081 [since FEDORA-2007-2018]
 CVE-2007-4631 version (qgit) #268381 [since FEDORA-2007-2108]
+CVE-2007-4573 version (kernel) [since FEDORA-2007-2298]
 CVE-2007-4569 VULNERABLE (kdebase) #299731
 CVE-2007-4565 backport (fetchmail) #260861 [since FEDORA-2007-1983]
 CVE-2007-4560 version (clamav) #260583 [since FEDORA-2007-2050]
@@ -54,6 +56,7 @@
 CVE-2007-4533 backport (vavoom) #256621 [since FEDORA-2007-1977]
 CVE-2007-4532 backport (vavoom) #256621 [since FEDORA-2007-1977]
 CVE-2007-4510 version (clamav, fixed 0.91.2) #253780 [since FEDORA-2007-2050]
+CVE-2007-4465 version (httpd) [since FEDORA-2007-2214]
 CVE-2007-4462 version (po4a) #253541 [since FEDORA-2007-1763]
 CVE-2007-4460 backport (id3lib) #253553 [since FEDORA-2007-1774]
 CVE-2007-4400 VULNERABLE (konversation) #253545
@@ -75,11 +78,12 @@
 CVE-2007-4154 ignore (wordpress) "remote authenticated administrators"
 CVE-2007-4139 version (wordpress) #250751 [since FEDORA-2007-1885]
 CVE-2007-4138 version (samba, fixed 3.0.26) #286311 [since FEDORA-2007-2145]
-CVE-2007-4137 VULNERABLE (qt) #292941
+CVE-2007-4137 backport (qt) #292941 [since FEDORA-2007-2216]
 CVE-2007-4134 version (star, fixed 1.5a84) #254128 [since FEDORA-2007-1852]
 CVE-2007-4131 backport (tar) #253684 [since FEDORA-2007-1890]
 CVE-2007-4066 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4065 backport (libvorbis) #245991 [since FEDORA-2007-1765]
+CVE-2007-4033 VULNERABLE (t1lib) #303021
 CVE-2007-4029 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-4000 backport (krb5) [since FEDORA-2007-2017]
 CVE-2007-3999 backport (krb5) [since FEDORA-2007-2017]
@@ -94,7 +98,7 @@
 CVE-2007-3947 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
 CVE-2007-3946 version (lighttpd, fixed 1.4.16) #249162 [since FEDORA-2007-1299]
 CVE-2007-3848 version (kernel) [since FEDORA-2007-1785]
-CVE-2007-3847 VULNERABLE (httpd) #250755
+CVE-2007-3847 version (httpd) #250755 [since FEDORA-2007-2214]
 CVE-2007-3845 ignore (firefox) windows specific
 CVE-2007-3844 VULNERABLE (firefox) #250648 "fixed on next update"
 CVE-2007-3843 VULNERABLE (kernel) #246595
@@ -138,7 +142,7 @@
 CVE-2007-3391 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-3390 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
 CVE-2007-3389 version (wireshark, fixed 0.99.6) [since FEDORA-2007-0982]
-CVE-2007-3388 VULNERABLE (qt, fixed qt-3.3.8-20070727) patch available: 170529.diff
+CVE-2007-3388 backport (qt, fixed qt-3.3.8-20070727) patch available: 170529.diff [since FEDORA-2007-2216]
 CVE-2007-3387 version (xpdf, fixed 3.02pl1) [since FEDORA-2007-1383]
 CVE-2007-3387 backport (tetex) #251514 [since FEDORA-2007-1547]
 CVE-2007-3387 VULNERABLE (poppler) #251512
@@ -168,8 +172,8 @@
 CVE-2007-3123 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3122 version (clamav, fixed 0.90.3) #245219 [since FEDORA-2007-2050]
 CVE-2007-3121 version (zvbi, fixed 0.2.25) [since FEDORA-2007-0175]
-*CVE-2007-3113 VULNERABLE (cacti) #243592
-*CVE-2007-3112 VULNERABLE (cacti) #243592
+CVE-2007-3113 backport (cacti) #243592 [since FEDORA-2007-2199]
+CVE-2007-3112 backport (cacti) #243592 [since FEDORA-2007-2199]
 CVE-2007-3108 backport (openssl) #250574 [since FEDORA-2007-1444]
 CVE-2007-3106 backport (libvorbis) #245991 [since FEDORA-2007-1765]
 CVE-2007-3100 version (iscsi-initiator-utils, fixed 6.2.0.865) [since FEDORA-2007-0543]



From fedora-extras-commits at redhat.com  Thu Sep 27 13:25:35 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 09:25:35 -0400
Subject: rpms/gimp/devel .cvsignore, 1.34, 1.35 gimp.spec, 1.140,
	1.141 sources, 1.34, 1.35
Message-ID: <200709271325.l8RDPZ8G026717@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26695

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.4.0-rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	4 Sep 2007 07:23:20 -0000	1.34
+++ .cvsignore	27 Sep 2007 13:25:02 -0000	1.35
@@ -1 +1 @@
-gimp-2.4.0-rc2.tar.bz2
+gimp-2.4.0-rc3.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gimp.spec	7 Sep 2007 12:39:31 -0000	1.140
+++ gimp.spec	27 Sep 2007 13:25:02 -0000	1.141
@@ -38,14 +38,14 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Version:        2.4.0
-%define rcver rc2
+%define rcver rc3
 %define binver 2.4
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}2%{?dist}
+Release:        %{?rcver:0.%{rcver}.}1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -421,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.1
+- version 2.4.0-rc3
+
 * Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.2
 - rebuild to pick up new version of poppler
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Sep 2007 07:23:20 -0000	1.34
+++ sources	27 Sep 2007 13:25:02 -0000	1.35
@@ -1 +1 @@
-4a17f7d002cfc0ddf13d64181030a71b  gimp-2.4.0-rc2.tar.bz2
+f468ce7c1e3ead678f41b10b28200e60  gimp-2.4.0-rc3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:19 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:19 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVOW4015396@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the approveacls acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:28 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:28 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVXS7015420@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the commit acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:32 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVOW7015396@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the watchcommits acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:31:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:31:34 -0700
Subject: [pkgdb] initscripts had acl change status
Message-ID: <200709271331.l8RDVXSA015420@bastion.fedora.phx.redhat.com>

Bill Nottingham (notting) has set the watchbugzilla acl on initscripts (Fedora OLPC 2) to Approved for John (J5) Palmieri (johnp)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/initscripts



From fedora-extras-commits at redhat.com  Thu Sep 27 13:46:49 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 09:46:49 -0400
Subject: rpms/xsane/devel xsane.desktop,1.2,1.3 xsane.spec,1.51,1.52
Message-ID: <200709271346.l8RDknY2027383@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26819

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
revert changing Name entry in the desktop file (#293871)



Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsane.desktop	27 Sep 2007 12:28:03 -0000	1.2
+++ xsane.desktop	27 Sep 2007 13:46:17 -0000	1.3
@@ -2,7 +2,8 @@
 Version=1.0
 Encoding=UTF-8
 Type=Application
-Name=XSane
+#Name=XSane
+Name=Scanner Tool
 GenericName=Scanner Tool
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xsane.spec	27 Sep 2007 12:28:03 -0000	1.51
+++ xsane.spec	27 Sep 2007 13:46:17 -0000	1.52
@@ -115,7 +115,7 @@
 
 %changelog
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-4
-- fix "Name" (#293871) and "Category" entries in desktop file
+- fix "Category" entries in desktop file
 
 * Wed Sep 05 2007 Nils Philippsen <nphilipp at redhat.com>
 - change license to GPLv2+



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:01 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:01 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6EL016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the watchbugzilla acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:03 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6EO016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the watchcommits acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:06 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:06 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDwBvW016244@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:12 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:12 -0700
Subject: [pkgdb] ctags had acl change status
Message-ID: <200709271358.l8RDw6ER016222@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the approveacls acl on ctags (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:37 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:37 -0700
Subject: [pkgdb] ctags had groupAcl changed
Message-ID: <200709271358.l8RDwBvY016244@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora 7) to Denied for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:32 -0700
Subject: [pkgdb] ctags had groupAcl changed
Message-ID: <200709271358.l8RDwcZr016328@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on ctags (Fedora 7) to Approved for cvsextras

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:41 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:41 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwBva016244@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 was orphaned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:43 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwBvc016244@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 is now owned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:46 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwcZt016328@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 was orphaned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 13:58:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 06:58:47 -0700
Subject: [pkgdb] ctags ownership updated
Message-ID: <200709271358.l8RDwrIl016419@bastion.fedora.phx.redhat.com>

Package ctags in Fedora 7 is now owned by Than Ngo (than)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctags



From fedora-extras-commits at redhat.com  Thu Sep 27 14:05:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 07:05:47 -0700
Subject: [pkgdb] doxygen had acl change status
Message-ID: <200709271405.l8RE5qeg016731@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on doxygen (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/doxygen



From fedora-extras-commits at redhat.com  Thu Sep 27 14:06:09 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 07:06:09 -0700
Subject: [pkgdb] efax had acl change status
Message-ID: <200709271406.l8RE6EXm016772@bastion.fedora.phx.redhat.com>

Than Ngo (than) has set the commit acl on efax (Fedora devel) to Approved for Karsten Hopp (karsten)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/efax



From fedora-extras-commits at redhat.com  Thu Sep 27 14:09:21 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:09:21 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-swiotlb-bidir.ptach, NONE, 
	1.1.2.1 kernel-xen.spec, 1.60, 1.60.2.1
Message-ID: <200709271409.l8RE9LIp002009@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1919

Modified Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	linux-2.6-xen-swiotlb-bidir.ptach 
Log Message:
Experimental fix to bz#240471




--- NEW FILE linux-2.6-xen-swiotlb-bidir.ptach ---
# HG changeset patch
# User Eduardo Habkost <ehabkost at redhat.com>
# Date 1190901132 10800
# Node ID 724e42a60ed5d891e20b9943ac3a09298349ab5e
# Parent  4b1b115de5debf988f267a1cd1e566a750b391a2
swiotlb: Accept DMA_BIDIRECTIONAL on sync functions

Make swiotlb_sync_{single,sg}_for_{device,cpu}() accept DMA_BIDIRECTIONAL.

Pass DMA_TO_DEVICE or DMA_FROM_DEVICE direction to sync_single() depending
if for_device or for_cpu functions were called.

This should make fw-ohci module work under Xen, as it uses
dma_sync_single_for_device() with dir==DMA_BIDIRECTIONAL.

diff -r 4b1b115de5de -r 724e42a60ed5 arch/i386/kernel/swiotlb.c
--- a/arch/i386/kernel/swiotlb.c	Tue Jun 19 19:16:04 2007 +0200
+++ b/arch/i386/kernel/swiotlb.c	Thu Sep 27 10:52:12 2007 -0300
@@ -529,18 +529,18 @@ swiotlb_sync_single_for_cpu(struct devic
 swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
 			    size_t size, int dir)
 {
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 	if (in_swiotlb_aperture(dev_addr))
-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_FROM_DEVICE);
 }
 
 void
 swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
 			       size_t size, int dir)
 {
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 	if (in_swiotlb_aperture(dev_addr))
-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_TO_DEVICE);
 }
 
 /*
@@ -624,13 +624,13 @@ swiotlb_sync_sg_for_cpu(struct device *h
 {
 	int i;
 
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 
 	for (i = 0; i < nelems; i++, sg++)
 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
 			sync_single(hwdev,
 				    (void *)bus_to_virt(sg->dma_address),
-				    sg->dma_length, dir);
+				    sg->dma_length, DMA_FROM_DEVICE);
 }
 
 void
@@ -640,12 +640,13 @@ swiotlb_sync_sg_for_device(struct device
 	int i;
 
 	BUG_ON(dir == DMA_NONE);
+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
 
 	for (i = 0; i < nelems; i++, sg++)
 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
 			sync_single(hwdev,
 				    (void *)bus_to_virt(sg->dma_address),
-				    sg->dma_length, dir);
+				    sg->dma_length, DMA_TO_DEVICE);
 }
 
 #ifdef CONFIG_HIGHMEM


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -u -r1.60 -r1.60.2.1
--- kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
+++ kernel-xen.spec	27 Sep 2007 14:08:49 -0000	1.60.2.1
@@ -470,6 +470,9 @@
 Patch963: linux-2.6-xen-sleazy-fpu-i386.patch
 Patch964: linux-2.6-xen-sleazy-fpu-x86_64.patch
 
+# Support DMA_BIDIRECTIONAL on swiotlb (bug #240471)
+Patch965: linux-2.6-xen-swiotlb-bidir.ptach
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -959,6 +962,7 @@
 %patch962 -p1
 %patch963 -p1
 %patch964 -p1
+%patch965 -p1
 %endif
 
 
@@ -2362,6 +2366,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Experimental patch to fix fw-ohci under Xen (bug #240471)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:09:36 2007
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu, 27 Sep 2007 10:09:36 -0400
Subject: rpms/smb4k/devel .cvsignore, 1.17, 1.18 smb4k.spec, 1.22,
	1.23 sources, 1.17, 1.18
Message-ID: <200709271409.l8RE9aPo002022@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1958

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Update to 0.8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	3 Aug 2007 10:53:10 -0000	1.17
+++ .cvsignore	27 Sep 2007 14:09:03 -0000	1.18
@@ -1 +1 @@
-smb4k-0.8.4.tar.bz2
+smb4k-0.8.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- smb4k.spec	31 Aug 2007 09:07:53 -0000	1.22
+++ smb4k.spec	27 Sep 2007 14:09:03 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		smb4k
-Version:	0.8.4
-Release:	2%{?dist}
+Version:	0.8.5
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -104,6 +104,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Marcin Garski <mgarski[AT]post.pl> 0.8.5-1
+- Update to 0.8.5
+
 * Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.8.4-2
 - Fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	3 Aug 2007 10:53:10 -0000	1.17
+++ sources	27 Sep 2007 14:09:03 -0000	1.18
@@ -1 +1 @@
-6e13c5c0c2e548187d51bc70072055e0  smb4k-0.8.4.tar.bz2
+4fa4b0d5905ad834c61ca828c247665a  smb4k-0.8.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 14:14:44 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:14:44 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4,
	1.4.2.1 kernel-2.6.21-x86_64-xen.config, 1.5,
	1.5.2.1 kernel-xen.spec, 1.60.2.1, 1.60.2.2
Message-ID: <200709271414.l8REEiVW002651@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2618

Modified Files:
      Tag: private-ehabkost-fw-ohci-test-branch
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenable firewire modules



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 14:14:12 -0000	1.4.2.1
@@ -1315,7 +1315,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- kernel-2.6.21-x86_64-xen.config	27 Aug 2007 17:46:26 -0000	1.5
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:14:12 -0000	1.5.2.1
@@ -1221,7 +1221,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -r1.60.2.1 -r1.60.2.2
--- kernel-xen.spec	27 Sep 2007 14:08:49 -0000	1.60.2.1
+++ kernel-xen.spec	27 Sep 2007 14:14:12 -0000	1.60.2.2
@@ -2368,6 +2368,7 @@
 %changelog
 * Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Experimental patch to fix fw-ohci under Xen (bug #240471)
+- Reenabled Firewire modules
 
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current



From fedora-extras-commits at redhat.com  Thu Sep 27 14:24:36 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:24:36 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.5,
	1.6 kernel-2.6.20-x86_64-xen.config, 1.4, 1.5 kernel-xen.spec,
	1.49, 1.50
Message-ID: <200709271424.l8REOa20003367@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenable Firewire but keep fw-ohci disabled

fw-sbp2 should be working.



Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.20-i686-xen.config	26 Sep 2007 17:35:35 -0000	1.5
+++ kernel-2.6.20-i686-xen.config	27 Sep 2007 14:24:04 -0000	1.6
@@ -583,7 +583,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-# CONFIG_FW is not set
+CONFIG_FW=m
+# CONFIG_FW_OHCI is not set
+CONFIG_FW_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.20-x86_64-xen.config	24 May 2007 16:16:28 -0000	1.4
+++ kernel-2.6.20-x86_64-xen.config	27 Sep 2007 14:24:04 -0000	1.5
@@ -583,7 +583,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-# CONFIG_FW is not set
+CONFIG_FW=m
+# CONFIG_FW_OHCI is not set
+CONFIG_FW_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kernel-xen.spec	26 Sep 2007 17:35:35 -0000	1.49
+++ kernel-xen.spec	27 Sep 2007 14:24:04 -0000	1.50
@@ -2072,6 +2072,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Reenable Firewire but disable fw-ohci module. sbp2 module
+  should be working (bug #302471)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:32:17 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Thu, 27 Sep 2007 10:32:17 -0400
Subject: rpms/straw/devel Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec,
	1.8, 1.9 dead.package, 1.1, NONE
Message-ID: <200709271432.l8REWHuM003928@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/straw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3889/devel

Added Files:
	Makefile sources straw.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	27 Sep 2007 14:31:43 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: straw
+# $Id$
+NAME := straw
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	27 Sep 2007 14:31:44 -0000	1.4
@@ -0,0 +1 @@
+5c64c65158dab096e2077e4f91412b37  straw-0.27.tar.gz


Index: straw.spec
===================================================================
RCS file: straw.spec
diff -N straw.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ straw.spec	27 Sep 2007 14:31:44 -0000	1.9
@@ -0,0 +1,123 @@
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+%define desktop_vendor fedora
+
+Summary:        Desktop news aggregator
+Name:           straw
+Version:        0.27
+Release:        9%{?dist}
+License:        GPLv2+
+Group:          Applications/Internet
+URL:            http://www.gnome.org/projects/straw/
+Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: python >= 2.4
+# fix for python >= 2.5
+%if "%{?fedora}" > "6"
+BuildRequires: python-devel
+%endif
+Requires: gnome-python2-gnomevfs
+Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-libegg
+Requires: gnome-python2-gconf
+Requires: pygtk2-libglade
+Requires: mx
+# Current python-adns makes double free problem (bug 292821)
+Conflicts:python-adns
+Requires: dbus-python
+
+Requires(pre): GConf2
+Requires(post):GConf2
+Requires(preun):GConf2
+
+BuildRequires: dbus-python
+BuildRequires: pygtk2-libglade
+BuildRequires: pygtk2 >= 2.8.0
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-python2-gconf
+BuildRequires: intltool
+
+BuildArch: noarch
+
+%description
+Straw is a desktop news aggregator for the GNOME environment. Its aim
+is to be a faster, easier and more accessible way to read news and
+blogs than the traditional browser.
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
+
+# this is a fix for constants.py to lookup in install dir rather than buildroot
+sed -i -e s@${RPM_BUILD_ROOT}@@ ${RPM_BUILD_ROOT}%{python_sitelib}/%{name}/constants.py
+
+%{__python} -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT%{python_sitelib}/%{name}'")'
+
+%find_lang %{name}
+
+%{__install} -Dp -m0644 data/%{name}.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas
+
+desktop-file-install --vendor %{desktop_vendor} --delete-original \
+                     --dir %{buildroot}%{_datadir}/applications    \
+                     %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%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 %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%{_sysconfdir}/gconf/schemas/straw.schemas
+%doc LICENSE NEWS README TODO ChangeLog AUTHORS
+%{_bindir}/%{name}
+%{python_sitelib}/straw/
+%{_datadir}/straw/
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+
+
+%changelog
+* Sun Sep 23 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-9
+- Fixed dependecies related to pygtk
+* Fri Sep 21 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-8
+- Fixed dependencies related to gnome-python2
+* Mon Sep 17 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-7
+- Fixed redundant dependencies 
+* Sun Sep 16 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-6
+- Fixed usage Gconf.Straw does not support python-adns anymore.
+- So removed it. Fixed Spec file indentation warning.
+* Thu Sep 14 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-5
+- Fixed few major errors and dependencies
+* Tue Sep 11 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-4
+- Fixed failed dependencies
+* Mon Sep 10 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-3
+- Fixed few errors 
+* Sun Sep 9  2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-2
+- Some dependencies fixed 
+* Tue Aug 27 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-1
+- Updated to 0.27


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 14:37:38 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 10:37:38 -0400
Subject: rpms/kernel/devel kernel.spec, 1.192,
	1.193 linux-2.6-wireless-pending.patch, 1.5,
	1.6 linux-2.6-zd1211rw-mac80211.patch, 1.1, 1.2
Message-ID: <200709271437.l8REbcZM004208@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4013

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Log Message:
Fix-up botched wireless patch restructuring...


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- kernel.spec	27 Sep 2007 00:43:33 -0000	1.192
+++ kernel.spec	27 Sep 2007 14:37:05 -0000	1.193
@@ -1815,6 +1815,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- Fix-up botched wireless patch restructuring...
+
 * Wed Sep 26 2007 John W. Linville <linville at redhat.com>
 - Update and restructure wireless patches
 

linux-2.6-wireless-pending.patch:

Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-wireless-pending.patch	27 Sep 2007 00:43:34 -0000	1.5
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 14:37:05 -0000	1.6
@@ -66352,7 +66352,7 @@
  config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on EXPERIMENTAL && PCMCIA && WLAN_80211
-@@ -558,8 +550,51 @@ config RTL8187
+@@ -558,8 +550,52 @@ config RTL8187
  
  	  Thanks to Realtek for their support!
  
@@ -66402,6 +66402,7 @@
 +source "drivers/net/wireless/b43legacy/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
 +source "drivers/net/wireless/rt2x00/Kconfig"
++source "drivers/net/wireless/iwlwifi/Kconfig"
  
  endmenu
 diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c

linux-2.6-zd1211rw-mac80211.patch:

Index: linux-2.6-zd1211rw-mac80211.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-zd1211rw-mac80211.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-zd1211rw-mac80211.patch	27 Sep 2007 00:43:34 -0000	1.1
+++ linux-2.6-zd1211rw-mac80211.patch	27 Sep 2007 14:37:05 -0000	1.2
@@ -1,11 +1,11 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 09:59:55.000000000 -0400
 @@ -4287,6 +4287,16 @@ W:	http://www.qsl.net/dl1bke/
  L:	linux-hams at vger.kernel.org
  S:	Maintained
  
-+Z1211 WIRELESS DRIVER
++ZD1211RW-MAC80211 WIRELESS DRIVER
 +P:	Daniel Drake
 +M:	dsd at gentoo.org
 +P:	Ulrich Kunitz
@@ -19,20 +19,20 @@
  P:	Daniel Drake
  M:	dsd at gentoo.org
 diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-26 20:00:32.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-26 20:03:54.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 09:59:55.000000000 -0400
 @@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
  obj-$(CONFIG_B43)		+= b43/
  obj-$(CONFIG_B43LEGACY)		+= b43legacy/
  obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
-+obj-$(CONFIG_Z1211)		+= zd1211rw-mac80211/
++obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw-mac80211/
  
  # 16-bit wireless PCMCIA client drivers
  obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,1620 @@
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-27 10:00:45.000000000 -0400
+@@ -0,0 +1,1619 @@
 +/* zd_chip.c
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -412,7 +412,6 @@
 +		[0] = { .addr = CR_MAC_ADDR_P1 },
 +		[1] = { .addr = CR_MAC_ADDR_P2 },
 +	};
-+	DECLARE_MAC_BUF(mac);
 +
 +	reqs[0].value = (mac_addr[3] << 24)
 +		      | (mac_addr[2] << 16)
@@ -422,7 +421,7 @@
 +		      |  mac_addr[4];
 +
 +	dev_dbg_f(zd_chip_dev(chip),
-+		"mac addr %s\n", print_mac(mac, mac_addr));
++		"mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
 +
 +	mutex_lock(&chip->mutex);
 +	r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
@@ -1654,8 +1653,8 @@
 +	return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Makefile	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,10 @@
 +obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o
 +
@@ -1668,8 +1667,8 @@
 +EXTRA_CFLAGS += -DDEBUG
 +endif
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_def.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,57 @@
 +/* zd_def.h
 + *
@@ -1729,8 +1728,8 @@
 +
 +#endif /* _ZD_DEF_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,108 @@
 +/* zd_rf.h
 + *
@@ -1841,8 +1840,8 @@
 +
 +#endif /* _ZD_RF_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,921 @@
 +/* zd_chip.h
 + *
@@ -2766,8 +2765,8 @@
 +
 +#endif /* _ZD_CHIP_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al2230.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,439 @@
 +/* zd_rf_al2230.c: Functions for the AL2230 RF controller
 + *
@@ -3209,8 +3208,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,29 @@
 +/* zd_util.h
 + *
@@ -3242,8 +3241,8 @@
 +
 +#endif /* _ZD_UTIL_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_util.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,82 @@
 +/* zd_util.c
 + *
@@ -3328,8 +3327,8 @@
 +	return (u8 *)buffer + (buffer_size - tail_size);
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_rf2959.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,279 @@
 +/* zd_rf_rfmd.c: Functions for the RFMD RF controller
 + *
@@ -3611,8 +3610,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,75 @@
 +#ifndef _ZD_IEEE80211_H
 +#define _ZD_IEEE80211_H
@@ -3690,8 +3689,8 @@
 +
 +#endif /* _ZD_IEEE80211_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/Kconfig	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,18 @@
 +config ZD1211RW_MAC80211
 +	tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)"
@@ -3712,8 +3711,8 @@
 +	  ZD1211 debugging messages. Choosing Y will result in additional debug
 +	  messages being saved to your kernel logs, which may help debug any
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,100 @@
 +/* zd_ieee80211.c
 + *
@@ -3816,8 +3815,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,263 @@
 +/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
 + *
@@ -4083,8 +4082,8 @@
 +
 +#endif /* _ZD_USB_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,178 @@
 +/* zd_rf.c
 + *
@@ -4265,8 +4264,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_uw2453.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -4803,8 +4802,8 @@
 +}
 +
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.h	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,227 @@
 +/* zd_mac.h
 + *
@@ -5034,8 +5033,8 @@
 +
 +#endif /* _ZD_MAC_H */
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_rf_al7230b.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,492 @@
 +/* zd_rf_al7230b.c: Functions for the AL7230B RF controller
 + *
@@ -5530,8 +5529,8 @@
 +	return 0;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c	2007-09-26 20:03:54.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_usb.c	2007-09-27 09:59:55.000000000 -0400
 @@ -0,0 +1,1528 @@
 +/* zd_usb.c
 + *
@@ -7062,9 +7061,9 @@
 +	return r;
 +}
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c	2007-09-26 20:03:54.000000000 -0400
-@@ -0,0 +1,951 @@
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c	2007-09-27 10:01:28.000000000 -0400
+@@ -0,0 +1,950 @@
 +/* zd_mac.c
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -7846,12 +7845,11 @@
 +	} else {
 +		struct dev_mc_list *mc = NULL;
 +		void *tmp = NULL;
-+		DECLARE_MAC_BUF(macbuf);
 +
 +		zd_mc_clear(&hash);
 +		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
-+			dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
-+				  print_mac(macbuf, mc->dmi_addr));
++			dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
++				  MAC_ARG(mc->dmi_addr));
 +			zd_mc_add_addr(&hash, mc->dmi_addr);
 +		}
 +	}
@@ -8017,13 +8015,13 @@
 +	zd_chip_control_leds(&mac->chip, LED_OFF);
 +}
 diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-26 20:00:12.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-26 20:04:18.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 09:59:49.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 09:59:55.000000000 -0400
 @@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
  source "drivers/net/wireless/b43/Kconfig"
  source "drivers/net/wireless/b43legacy/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
 +source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
  source "drivers/net/wireless/rt2x00/Kconfig"
+ source "drivers/net/wireless/iwlwifi/Kconfig"
  
- endmenu



From fedora-extras-commits at redhat.com  Thu Sep 27 14:39:35 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 10:39:35 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.4,
	1.5 kernel-2.6.21-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec,
	1.60, 1.61
Message-ID: <200709271439.l8REdZwN004353@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4280

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Reenabled Firewire but kept fw-ohci disabled (bug #307461)

fw-sbp2 should be working



Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel-2.6.21-i686-xen.config	26 Sep 2007 18:52:12 -0000	1.4
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 14:39:03 -0000	1.5
@@ -1315,7 +1315,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+# CONFIG_FIREWIRE_OHCI is not set
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.21-x86_64-xen.config	27 Aug 2007 17:46:26 -0000	1.5
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:39:03 -0000	1.6
@@ -1221,7 +1221,9 @@
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+# CONFIG_FIREWIRE_OHCI is not set
+CONFIG_FIREWIRE_SBP2=m
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kernel-xen.spec	26 Sep 2007 19:21:01 -0000	1.60
+++ kernel-xen.spec	27 Sep 2007 14:39:03 -0000	1.61
@@ -2362,6 +2362,10 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Reenabled Firewire but kept fw-ohci disabled (bug #307461).
+  fw-sbp2 should be working
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 14:42:15 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 10:42:15 -0400
Subject: rpms/libselinux/F-7 libselinux-swig.patch, 1.2, 1.3 libselinux.spec,
	1.271, 1.272
Message-ID: <200709271442.l8REgFLl004487@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4464

Modified Files:
	libselinux-swig.patch libselinux.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-9
- Fix swig bindings


libselinux-swig.patch:

Index: libselinux-swig.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux-swig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libselinux-swig.patch	25 Sep 2007 21:37:26 -0000	1.2
+++ libselinux-swig.patch	27 Sep 2007 14:42:12 -0000	1.3
@@ -400,6 +400,18 @@
 +}
 +
 +%include "selinuxswig.i"
+diff -up libselinux-2.0.14/src/Makefile.swig libselinux-2.0.14/src/Makefile
+--- libselinux-2.0.14/src/Makefile.swig	2007-09-27 10:33:38.000000000 -0400
++++ libselinux-2.0.14/src/Makefile	2007-09-27 10:30:26.000000000 -0400
+@@ -12,7 +12,7 @@ LIBVERSION = 1
+ 
+ LIBA=libselinux.a 
+ TARGET=libselinux.so
+-SWIGIF= selinuxswig.i
++SWIGIF= selinuxswig_python.i
+ SWIGCOUT= selinuxswig_wrap.c
+ SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) 
+ SWIGSO=_selinux.so
 diff -up libselinux-2.0.14/Makefile.swig libselinux-2.0.14/Makefile
 --- libselinux-2.0.14/Makefile.swig	2007-09-13 09:17:31.000000000 -0400
 +++ libselinux-2.0.14/Makefile	2007-09-13 09:17:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-7/libselinux.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- libselinux.spec	25 Sep 2007 21:37:26 -0000	1.271
+++ libselinux.spec	27 Sep 2007 14:42:12 -0000	1.272
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -126,6 +126,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-9
+- Fix swig bindings
+
 * Tue Sep 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-8
 - Fix swig use of fsetfilecon_raw
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:50:06 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 10:50:06 -0400
Subject: rpms/convmv/devel convmv-1.10-tests.patch, NONE, 1.1 convmv.spec,
	1.8, 1.9
Message-ID: <200709271450.l8REo6qM004881@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/convmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4830

Modified Files:
	convmv.spec 
Added Files:
	convmv-1.10-tests.patch 
Log Message:
don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
change license tag to "GPLv2"


convmv-1.10-tests.patch:

--- NEW FILE convmv-1.10-tests.patch ---
diff -up convmv-1.10/suite/dotests.sh.tests convmv-1.10/suite/dotests.sh
--- convmv-1.10/suite/dotests.sh.tests	2006-06-26 00:01:16.000000000 +0200
+++ convmv-1.10/suite/dotests.sh	2007-09-27 16:44:39.000000000 +0200
@@ -3,62 +3,63 @@
 # you might want to change this to GNU find's full path:
 FIND=find
 FINDEXP="%P -- %l\n"
-for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
+
+for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
 #
 echo smartness-test
 rm -rf test.tmp
 cp -r test test.tmp
 ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
 false
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
 #
 echo double-utf8 test
 ../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
 #
 ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
 #
 echo utf8-to-iso8859-15-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
 #
 echo iso8859-15-to-utf8-test
 rm -r test.tmp
 cp -r test-iso8859-15 test.tmp
 ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
 #
 echo nfc-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
 #
 ../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
 #
 echo escaped-test
 rm -r test.tmp
 cp -r test-escaped test.tmp
 ../convmv --unescape --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
+$FIND test.tmp -printf "$FINDEXP" | sort > out.tmp
 diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
 #
 echo upper-test
 rm -r test.tmp
 cp -r test test.tmp
 ../convmv --upper -f utf8 --notest -r test.tmp
-$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
+$FIND TEST.TMP -printf "$FINDEXP" | sort > out.tmp
 diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
 
 echo All tests successful, cleaning up now ...


Index: convmv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- convmv.spec	28 Aug 2006 13:45:05 -0000	1.8
+++ convmv.spec	27 Sep 2007 14:49:34 -0000	1.9
@@ -1,13 +1,14 @@
 Summary: Convert filename encodings
 Name: convmv
 Version: 1.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: Applications/System
-License: GPL
+License: GPLv2
 URL: http://j3e.de/linux/convmv
-Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
-BuildRequires: /usr/bin/md5sum
+Source0: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz
+Patch0: convmv-1.10-tests.patch
+BuildRequires: coreutils
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,6 +18,8 @@
 
 %prep
 %setup -q
+tar -xf testsuite.tar
+%patch0 -p1 -b .tests
 
 %build
 md5sum -c MD5sums
@@ -37,6 +40,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.10-3
+- don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
+- change license tag to "GPLv2"
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 1.10-2
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:50:23 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 10:50:23 -0400
Subject: rpms/kdeutils/devel kdeutils-3.5.7-glibc-open.patch, NONE,
	1.1 kdeutils.spec, 1.95, 1.96
Message-ID: <200709271450.l8REoNwv004884@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4856

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.7-glibc-open.patch 
Log Message:
fix build issue with new current glibc-2.6.90



kdeutils-3.5.7-glibc-open.patch:

--- NEW FILE kdeutils-3.5.7-glibc-open.patch ---
diff -up kdeutils-3.5.7/ark/compressedfile.cpp.orig kdeutils-3.5.7/ark/compressedfile.cpp
--- kdeutils-3.5.7/ark/compressedfile.cpp.orig	2007-09-27 16:17:26.000000000 +0200
+++ kdeutils-3.5.7/ark/compressedfile.cpp	2007-09-27 16:42:08.000000000 +0200
@@ -365,7 +365,7 @@ void CompressedFile::remove(QStringList 
   // does a reload and finds it no longer exists!
   QFile::remove(m_filename);
 
-  ::close(::open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL));
+  ::close(KDE_open(QFile::encodeName(m_filename), O_WRONLY | O_CREAT | O_EXCL, 0666));
 
   m_tmpfile = "";
   emit sigDelete(true);


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdeutils.spec	29 Aug 2007 19:38:55 -0000	1.95
+++ kdeutils.spec	27 Sep 2007 14:49:51 -0000	1.96
@@ -17,7 +17,7 @@
 Summary: K Desktop Environment - Utilities
 Epoch:   6
 Version: 3.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/System
@@ -33,6 +33,7 @@
 Patch2: kdeutils-3.5.4-bz#205553.patch
 Patch3: kdeutils-3.5.4-suspend.patch
 Patch4: kdeutils-3.5.7-klaptopdaemon_libXss.patch
+Patch5: kdeutils-3.5.7-glibc-open.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -111,6 +112,7 @@
 %patch2 -p1 -b .bz#205553
 %patch3 -p1 -b .suspend
 %patch4 -p1 -b .libXss
+%patch5 -p1 -b .glibc-open
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -377,6 +379,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> -  3.5.7-6
+- fix build issue with new current glibc-2.6.90
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
 - move kcalc back to main pkg
 



From fedora-extras-commits at redhat.com  Thu Sep 27 14:52:33 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 27 Sep 2007 10:52:33 -0400
Subject: rpms/convmv/devel convmv.spec,1.9,1.10
Message-ID: <200709271452.l8REqX3e005180@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/convmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5117

Modified Files:
	convmv.spec 
Log Message:
move "make test" to %check



Index: convmv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/convmv/devel/convmv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- convmv.spec	27 Sep 2007 14:49:34 -0000	1.9
+++ convmv.spec	27 Sep 2007 14:52:01 -0000	1.10
@@ -24,6 +24,8 @@
 %build
 md5sum -c MD5sums
 make
+
+%check
 make test
 
 %install
@@ -41,7 +43,8 @@
 
 %changelog
 * Mon Sep 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.10-3
-- don't expect find output to be sorted (#237687, patch by Giuseppe Bonacci)
+- don't expect find output to be sorted, move "make test" to %%check (#237687,
+  patch by Giuseppe Bonacci)
 - change license tag to "GPLv2"
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 1.10-2



From fedora-extras-commits at redhat.com  Thu Sep 27 14:54:43 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 10:54:43 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.150, 1.151 libselinux-rhat.patch,
	1.130, 1.131 libselinux.spec, 1.288, 1.289 sources, 1.152, 1.153
Message-ID: <200709271454.l8REshNX005280@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5251

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
- Upgrade to upstream
	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.
	* Pass CFLAGS when using gcc for linking from Dennis Gilmore. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- .cvsignore	18 Sep 2007 20:44:47 -0000	1.150
+++ .cvsignore	27 Sep 2007 14:54:10 -0000	1.151
@@ -129,3 +129,4 @@
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
 libselinux-2.0.34.tgz
+libselinux-2.0.35.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- libselinux-rhat.patch	24 Sep 2007 15:56:01 -0000	1.130
+++ libselinux-rhat.patch	27 Sep 2007 14:54:10 -0000	1.131
@@ -1,32 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/avc_internal.c libselinux-2.0.34/src/avc_internal.c
---- nsalibselinux/src/avc_internal.c	2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.34/src/avc_internal.c	2007-09-24 11:37:47.000000000 -0400
-@@ -61,7 +61,8 @@
- 		rc = fd;
- 		goto out;
- 	}
--
-+	
-+	fcntl(fd, F_SETFD, FD_CLOEXEC);
- 	if (!blocking && fcntl(fd, F_SETFL, O_NONBLOCK)) {
- 		close(fd);
- 		rc = -1;
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.34/src/Makefile
---- nsalibselinux/src/Makefile	2007-08-03 16:02:56.000000000 -0400
-+++ libselinux-2.0.34/src/Makefile	2007-09-24 11:51:42.000000000 -0400
-@@ -57,10 +57,10 @@
- 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(SWIGSO): $(SWIGLOBJ)
--	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
- 	ln -sf $@ $(TARGET) 
- 
- %.o:  %.c policy.h
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
 +++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- libselinux.spec	24 Sep 2007 15:56:01 -0000	1.288
+++ libselinux.spec	27 Sep 2007 14:54:10 -0000	1.289
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.34
-Release: 3%{?dist}
+Version: 2.0.35
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -123,6 +123,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
+- Upgrade to upstream
+	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.
+	* Pass CFLAGS when using gcc for linking from Dennis Gilmore. 
 
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.34-3
 - Add sparc patch to from Dennis Gilmore to build on Sparc platform


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources	18 Sep 2007 20:44:47 -0000	1.152
+++ sources	27 Sep 2007 14:54:10 -0000	1.153
@@ -1 +1 @@
-e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz
+3238a38e2e43c39081d13a579744fbdb  libselinux-2.0.35.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:00:21 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 11:00:21 -0400
Subject: rpms/t1lib/devel t1lib-cve-2007-4033.patch, NONE, 1.1 t1lib.spec,
	1.16, 1.17
Message-ID: <200709271500.l8RF0LMo005614@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5574

Modified Files:
	t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- t1lib.spec	28 Aug 2007 18:18:25 -0000	1.16
+++ t1lib.spec	27 Sep 2007 14:59:48 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:09:48 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Thu, 27 Sep 2007 11:09:48 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.74.3.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.143, 1.144 sources, 1.148, 1.149 system-config-printer.spec,
	1.133, 1.134 system-config-printer-0.7.74.2.tar.bz2.sig, 1.1,
	NONE system-config-printer-0.7.74.x.patch, 1.2, NONE
Message-ID: <200709271509.l8RF9mUL012147@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12111

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.74.3.tar.bz2.sig 
Removed Files:
	system-config-printer-0.7.74.2.tar.bz2.sig 
	system-config-printer-0.7.74.x.patch 
Log Message:
* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.3-1
- 0.7.74.3:
  - Updated translations.
  - Other small bug fixes.



--- NEW FILE system-config-printer-0.7.74.3.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- .cvsignore	19 Sep 2007 14:00:40 -0000	1.143
+++ .cvsignore	27 Sep 2007 15:09:15 -0000	1.144
@@ -139,3 +139,4 @@
 pycups-1.9.26.tar.bz2
 pycups-1.9.27.tar.bz2
 system-config-printer-0.7.74.2.tar.bz2
+system-config-printer-0.7.74.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	19 Sep 2007 14:00:40 -0000	1.148
+++ sources	27 Sep 2007 15:09:15 -0000	1.149
@@ -1,2 +1,2 @@
 20b18338b46531b1b28602deb44aa07d  pycups-1.9.27.tar.bz2
-f5f78d97282eab2e33a302025f31f74e  system-config-printer-0.7.74.2.tar.bz2
+d9b51d1f4b8113e8c21ce4e12fe5020b  system-config-printer-0.7.74.3.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- system-config-printer.spec	25 Sep 2007 11:41:06 -0000	1.133
+++ system-config-printer.spec	27 Sep 2007 15:09:15 -0000	1.134
@@ -2,8 +2,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.74.2
-Release: 3%{?dist}
+Version: 0.7.74.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,7 +11,6 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
-Patch0: system-config-printer-0.7.74.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -52,7 +51,6 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p0 -b .0.7.74.x
 
 %build
 %configure
@@ -130,6 +128,11 @@
 fi
 
 %changelog
+* Thu Sep 27 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.3-1
+- 0.7.74.3:
+  - Updated translations.
+  - Other small bug fixes.
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.2-3
 - Pull in SVN patch from stable branch for foomatic recommended
   drivers (bug #292021).


--- system-config-printer-0.7.74.2.tar.bz2.sig DELETED ---


--- system-config-printer-0.7.74.x.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 15:15:59 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:15:59 -0400
Subject: rpms/bigboard/devel bigboard.spec,1.38,1.39
Message-ID: <200709271515.l8RFFx2t012515@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12458

Modified Files:
	bigboard.spec 
Log Message:
new upstream


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bigboard.spec	21 Sep 2007 16:14:33 -0000	1.38
+++ bigboard.spec	27 Sep 2007 15:15:26 -0000	1.39
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.18
+Version:        0.5.19
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -94,6 +94,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.5.19-1
+- new upstream
+
 * Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:16:13 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:16:13 -0400
Subject: rpms/online-desktop/devel online-desktop.spec,1.14,1.15
Message-ID: <200709271516.l8RFGDMU012557@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12487

Modified Files:
	online-desktop.spec 
Log Message:
new upstream


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- online-desktop.spec	21 Sep 2007 16:09:00 -0000	1.14
+++ online-desktop.spec	27 Sep 2007 15:15:41 -0000	1.15
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.16
+Version:        0.2.17
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -186,6 +186,9 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.2.17-1
+- new upstream
+
 * Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
 - new upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:16:47 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 27 Sep 2007 11:16:47 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.16,1.17
Message-ID: <200709271516.l8RFGlEt012634@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/jgroups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12561

Modified Files:
	jgroups.spec 
Log Message:
* Thu Sep 27 2007 Jesse Keating <jkeating at redhat.com> - 2.2.9.2-3jpp.3
- Fix the group typo.



Index: jgroups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jgroups.spec	14 Aug 2006 17:21:17 -0000	1.16
+++ jgroups.spec	27 Sep 2007 15:16:15 -0000	1.17
@@ -43,12 +43,12 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	3jpp.2
+Release:	3jpp.3
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
 URL:		http://www.jgroups.org/
-Group:		Development/LIbraries/Java
+Group:		Development/Libraries/Java
 Source0:	JGroups-2.2.9.2.src-RHCLEAN.tar.gz
 Patch0:		jgroups-2.2.9-build_xml.patch
 Requires:	bsh
@@ -226,6 +226,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Thu Sep 27 2007 Jesse Keating <jkeating at redhat.com> - 2.2.9.2-3jpp.3
+- Fix the group typo.
+
 * Fri Aug 14 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.2
 - Keep ENCRYPTAsymmetricTest since BC now available.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:24:13 2007
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Thu, 27 Sep 2007 11:24:13 -0400
Subject: rpms/gpsim/devel gpsim.spec,1.15,1.16
Message-ID: <200709271524.l8RFODQk013092@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13050

Modified Files:
	gpsim.spec 
Log Message:
Add BR popt-devel


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gpsim.spec	21 Aug 2007 16:51:28 -0000	1.15
+++ gpsim.spec	27 Sep 2007 15:23:41 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -10,7 +10,7 @@
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk+extra-devel, flex, readline-devel
+BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -80,6 +80,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Sep 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-5
+  - Add BR popt-devel
+
 * Tue Aug 21 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-4
   - Licence tag clarification
 



From fedora-extras-commits at redhat.com  Thu Sep 27 15:24:33 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 11:24:33 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.161,
	1.162 policycoreutils-gui.patch, 1.35, 1.36 policycoreutils.spec,
	1.452, 1.453 sources, 1.166, 1.167
Message-ID: <200709271524.l8RFOXhq013146@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13071

Modified Files:
	.cvsignore policycoreutils-gui.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
- Fix bug in building policy with polgengui



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- .cvsignore	19 Sep 2007 02:29:47 -0000	1.161
+++ .cvsignore	27 Sep 2007 15:24:00 -0000	1.162
@@ -159,3 +159,4 @@
 sepolgen-1.0.9.tgz
 sepolgen-1.0.10.tgz
 policycoreutils-2.0.26.tgz
+policycoreutils-2.0.27.tgz

policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policycoreutils-gui.patch	24 Sep 2007 16:22:03 -0000	1.35
+++ policycoreutils-gui.patch	27 Sep 2007 15:24:00 -0000	1.36
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.26/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.27/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/booleansPage.py	2007-09-24 12:20:29.000000000 -0400
++++ policycoreutils-2.0.27/gui/booleansPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,236 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -238,9 +238,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.26/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.27/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/fcontextPage.py	2007-09-24 12:20:52.000000000 -0400
++++ policycoreutils-2.0.27/gui/fcontextPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,209 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -451,9 +451,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.26/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.27/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/loginsPage.py	2007-09-24 12:20:58.000000000 -0400
++++ policycoreutils-2.0.27/gui/loginsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,179 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.26/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.27/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/Makefile	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/Makefile	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -672,9 +672,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.26/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.27/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/mappingsPage.py	2007-09-24 12:21:12.000000000 -0400
++++ policycoreutils-2.0.27/gui/mappingsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -732,9 +732,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.26/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.27/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/modulesPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/modulesPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,181 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -917,9 +917,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.26/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.27/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgen.glade	2007-09-18 20:15:07.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.glade	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,2386 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -3307,9 +3307,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.26/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.27/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgengui.py	2007-09-18 20:09:54.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgengui.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,476 @@
 +#!/usr/bin/python
 +#
@@ -3787,9 +3787,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.26/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/polgen.py	2007-09-18 20:10:02.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 11:21:40.000000000 -0400
 @@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -3900,7 +3900,7 @@
 +                    if p < 1 or p > max_port:
 +                        raise  ValueError
 +                    temp.append(p)
-+                return temp
++        return temp
 +    except ValueError:
 +        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
 +
@@ -4531,9 +4531,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.26/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.27/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/portsPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/portsPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,247 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -4782,9 +4782,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.26/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.27/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/selinux.tbl	2007-09-24 12:14:07.000000000 -0400
++++ policycoreutils-2.0.27/gui/selinux.tbl	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,295 @@
 +! allow_console_login _("Login") _("Allow direct login to the console device. Required for System 390")
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
@@ -5081,9 +5081,9 @@
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.26/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.27/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/semanagePage.py	2007-09-24 12:19:55.000000000 -0400
++++ policycoreutils-2.0.27/gui/semanagePage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,147 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5232,9 +5232,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.26/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.27/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/statusPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/statusPage.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,219 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -5455,9 +5455,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.26/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.27/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/system-config-selinux.glade	2007-09-24 12:19:05.000000000 -0400
++++ policycoreutils-2.0.27/gui/system-config-selinux.glade	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,3393 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -8852,9 +8852,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.26/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.27/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/system-config-selinux.py	2007-09-24 12:19:26.000000000 -0400
++++ policycoreutils-2.0.27/gui/system-config-selinux.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,175 @@
 +#!/usr/bin/python
 +#
@@ -9031,9 +9031,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.26/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.27/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/executable.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/executable.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,278 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9313,9 +9313,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.26/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.27/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/__init__.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/__init__.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -9335,9 +9335,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.26/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.27/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/network.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/network.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -9419,9 +9419,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.26/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.27/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/rw.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/rw.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9551,9 +9551,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.26/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.27/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/script.py	2007-09-18 17:32:55.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/script.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,50 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9605,9 +9605,9 @@
 +users="""\
 +/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.26/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.27/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/semodule.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/semodule.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9650,9 +9650,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.26/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.27/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/tmp.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/tmp.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9751,9 +9751,9 @@
 +	TEMPLATETYPE_manage_tmp($2)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.26/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.27/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/user.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/user.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,139 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -9894,9 +9894,9 @@
 +"""
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.26/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.27/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_lib.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_lib.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,162 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10060,9 +10060,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.26/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.27/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_log.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_log.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,112 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10176,9 +10176,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.26/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.27/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_run.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_run.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,119 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10299,9 +10299,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.26/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.27/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/templates/var_spool.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/templates/var_spool.py	2007-09-27 11:20:32.000000000 -0400
 @@ -0,0 +1,131 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10434,9 +10434,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.26/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.27/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/translationsPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/translationsPage.py	2007-09-27 11:20:33.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10556,9 +10556,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.26/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.27/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.26/gui/usersPage.py	2007-09-18 16:40:57.000000000 -0400
++++ policycoreutils-2.0.27/gui/usersPage.py	2007-09-27 11:20:33.000000000 -0400
 @@ -0,0 +1,172 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- policycoreutils.spec	24 Sep 2007 20:43:33 -0000	1.452
+++ policycoreutils.spec	27 Sep 2007 15:24:00 -0000	1.453
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.10
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.26
-Release: 3%{?dist}
+Version: 2.0.27
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,6 +199,13 @@
 fi
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
+- Fix bug in building policy with polgengui
+
+* Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-1
+- Update to upstream
+	* Improve semodule reporting of system errors from Stephen Smalley.
+
 * Mon Sep 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.26-3
 - Show local changes with semanage
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	19 Sep 2007 02:29:47 -0000	1.166
+++ sources	27 Sep 2007 15:24:00 -0000	1.167
@@ -1,2 +1,2 @@
 eddb3e34fb982d752aa8cbed7b98f3d2  sepolgen-1.0.10.tgz
-109975b307c6992ff721ba644b4fb718  policycoreutils-2.0.26.tgz
+fd43154b636614069dac6f5a408e4e32  policycoreutils-2.0.27.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:33:55 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 11:33:55 -0400
Subject: rpms/kernel/F-7 linux-2.6-at76.patch, NONE,
	1.1 linux-2.6-ath5k.patch, 
	NONE, 1.1 linux-2.6-mac80211-extras.patch, NONE,
	1.1 linux-2.6-zd1211rw-mac80211.patch, NONE, 1.1 kernel-2.6.spec,
	1.3348, 1.3349 linux-2.6-wireless-pending.patch, 1.3,
	1.4 linux-2.6-wireless.patch, 1.11, 1.12 git-wireless-dev.patch,
	1.25, NONE
Message-ID: <200709271533.l8RFXtaE013585@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13399

Modified Files:
	kernel-2.6.spec linux-2.6-wireless-pending.patch 
	linux-2.6-wireless.patch 
Added Files:
	linux-2.6-at76.patch linux-2.6-ath5k.patch 
	linux-2.6-mac80211-extras.patch 
	linux-2.6-zd1211rw-mac80211.patch 
Removed Files:
	git-wireless-dev.patch 
Log Message:
Update and restructure wireless patches

linux-2.6-at76.patch:

--- NEW FILE linux-2.6-at76.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:19:28.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:23:09.000000000 -0400
@@ -690,6 +690,15 @@ W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
 S:	Maintained
 
+ATMEL USB WIRELESS DRIVER
+P:	Pavel Roskin
+M:	proski at gnu.org
+L:	linux-wireless at vger.kernel.org
+L:	at76c503a-user at lists.berlios.de
+L:	at76c503a-develop at lists.berlios.de
+W:	http://at76c503a.berlios.de/
+S:	Maintained
+
 AUDIT SUBSYSTEM
 P:	David Woodhouse
 M:	dwmw2 at infradead.org
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/at76_usb.h	2007-09-27 11:23:09.000000000 -0400
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) 2002,2003 Oliver Kurth
+ *	     (c) 2003,2004 Joerg Albert <joerg.albert at gmx.de>
+ *	     (c) 2007 Guido Guenther <agx at sigxcpu.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 driver was based on information from the Sourceforge driver
+ * released and maintained by Atmel:
+ *
+ *  http://sourceforge.net/projects/atmelwlandriver/
+ *
+ * Although the code was completely re-written,
+ * it would have been impossible without Atmel's decision to
+ * release an Open Source driver (unfortunately the firmware was
+ * kept binary only). Thanks for that decision to Atmel!
+ */
+
+#ifndef _AT76_USB_H
+#define _AT76_USB_H
+
+#include <net/ieee80211.h>
+
+/* current driver version */
+#define DRIVER_VERSION	"0.16"
+
+/* Board types */
+enum board_type {
+	BOARD_503_ISL3861 = 1,
+	BOARD_503_ISL3863 = 2,
+	BOARD_503 = 3,
+	BOARD_503_ACC = 4,
+	BOARD_505 = 5,
+	BOARD_505_2958 = 6,
+	BOARD_505A = 7,
+	BOARD_505AMX = 8
+};
+
+/* our private ioctl's */
+/* preamble length (0 - long, 1 - short, 2 - auto) */
+#define AT76_SET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 0)
+#define AT76_GET_SHORT_PREAMBLE		(SIOCIWFIRSTPRIV + 1)
+/* which debug channels are enabled */
+#define AT76_SET_DEBUG			(SIOCIWFIRSTPRIV + 2)
+#define AT76_GET_DEBUG			(SIOCIWFIRSTPRIV + 3)
+/* power save mode (incl. the Atmel proprietary smart save mode) */
+#define AT76_SET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 4)
+#define AT76_GET_POWERSAVE_MODE		(SIOCIWFIRSTPRIV + 5)
+/* min and max channel times for scan */
+#define AT76_SET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 6)
+#define AT76_GET_SCAN_TIMES		(SIOCIWFIRSTPRIV + 7)
+/* scan mode (0 - active, 1 - passive) */
+#define AT76_SET_SCAN_MODE		(SIOCIWFIRSTPRIV + 8)
+#define AT76_GET_SCAN_MODE		(SIOCIWFIRSTPRIV + 9)
+
+#define CMD_STATUS_IDLE				0x00
+#define CMD_STATUS_COMPLETE			0x01
+#define CMD_STATUS_UNKNOWN			0x02
+#define CMD_STATUS_INVALID_PARAMETER		0x03
+#define CMD_STATUS_FUNCTION_NOT_SUPPORTED	0x04
+#define CMD_STATUS_TIME_OUT			0x07
+#define CMD_STATUS_IN_PROGRESS			0x08
+#define CMD_STATUS_HOST_FAILURE			0xff
+#define CMD_STATUS_SCAN_FAILED			0xf0
+
+/* answers to get op mode */
+#define OPMODE_NONE				0x00
+#define OPMODE_NORMAL_NIC_WITH_FLASH		0x01
+#define OPMODE_HW_CONFIG_MODE			0x02
+#define OPMODE_DFU_MODE_WITH_FLASH		0x03
+#define OPMODE_NORMAL_NIC_WITHOUT_FLASH		0x04
+
+#define CMD_SET_MIB		0x01
+#define CMD_GET_MIB		0x02
+#define CMD_SCAN		0x03
+#define CMD_JOIN		0x04
+#define CMD_START_IBSS		0x05
+#define CMD_RADIO		0x06
+#define CMD_STARTUP		0x0B
+#define CMD_GETOPMODE		0x33
+
+#define MIB_LOCAL		0x01
+#define MIB_MAC_ADDR		0x02
+#define MIB_MAC			0x03
+#define MIB_MAC_MGMT		0x05
+#define MIB_MAC_WEP		0x06
+#define MIB_PHY			0x07
+#define MIB_FW_VERSION		0x08
+#define MIB_MDOMAIN		0x09
+
+#define ADHOC_MODE		1
+#define INFRASTRUCTURE_MODE	2
+
+/* values for struct mib_local, field preamble_type */
+#define PREAMBLE_TYPE_LONG	0
+#define PREAMBLE_TYPE_SHORT	1
+#define PREAMBLE_TYPE_AUTO	2
+
+/* values for tx_rate */
+#define TX_RATE_1MBIT		0
+#define TX_RATE_2MBIT		1
+#define TX_RATE_5_5MBIT 	2
+#define TX_RATE_11MBIT		3
+#define TX_RATE_AUTO		4
+
+/* power management modes */
+#define AT76_PM_OFF		1
+#define AT76_PM_ON		2
+#define AT76_PM_SMART		3
+
+struct hwcfg_r505 {
+	u8 cr39_values[14];
+	u8 reserved1[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 reserved2[14];
+	u8 cr15_values[14];
+	u8 reserved3[3];
+} __attribute__((packed));
+
+struct hwcfg_rfmd {
+	u8 cr20_values[14];
+	u8 cr21_values[14];
+	u8 bb_cr[14];
+	u8 pidvid[4];
+	u8 mac_addr[ETH_ALEN];
+	u8 regulatory_domain;
+	u8 low_power_values[14];
+	u8 normal_power_values[14];
+	u8 reserved1[3];
+} __attribute__((packed));
+
+struct hwcfg_intersil {
+	u8 mac_addr[ETH_ALEN];
+	u8 cr31_values[14];
+	u8 cr58_values[14];
+	u8 pidvid[4];
+	u8 regulatory_domain;
+	u8 reserved[1];
+} __attribute__((packed));
+
+union at76_hwcfg {
+	struct hwcfg_intersil i;
+	struct hwcfg_rfmd r3;
+	struct hwcfg_r505 r5;
+};
+
+#define WEP_SMALL_KEY_LEN	(40 / 8)
+#define WEP_LARGE_KEY_LEN	(104 / 8)
+
+struct at76_card_config {
+	u8 exclude_unencrypted;
+	u8 promiscuous_mode;
+	u8 short_retry_limit;
+	u8 encryption_type;
+	__le16 rts_threshold;
+	__le16 fragmentation_threshold;	/* 256..2346 */
+	u8 basic_rate_set[4];
+	u8 auto_rate_fallback;	/* 0,1 */
+	u8 channel;
+	u8 privacy_invoked;
+	u8 wep_default_key_id;	/* 0..3 */
+	u8 current_ssid[32];
+	u8 wep_default_key_value[4][WEP_KEY_LEN];
+	u8 ssid_len;
+	u8 short_preamble;
+	__le16 beacon_period;
+} __attribute__((packed));
+
+struct at76_command {
+	u8 cmd;
[...5873 lines suppressed...]
+{
+	int ret;
+	struct at76_priv *priv;
+	struct fwentry *fwe;
+	struct usb_device *udev;
+	int op_mode;
+	int need_ext_fw = 0;
+	struct mib_fw_version fwv;
+	int board_type = (int)id->driver_info;
+
+	udev = usb_get_dev(interface_to_usbdev(interface));
+
+	/* Load firmware into kernel memory */
+	fwe = at76_load_firmware(udev, board_type);
+	if (!fwe) {
+		ret = -ENOENT;
+		goto error;
+	}
+
+	op_mode = at76_get_op_mode(udev);
+
+	at76_dbg(DBG_DEVSTART, "opmode %d", op_mode);
+
+	/* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ???
+	   we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */
+
+	if (op_mode == OPMODE_HW_CONFIG_MODE) {
+		err("cannot handle a device in HW_CONFIG_MODE (opmode %d)",
+		    op_mode);
+		ret = -EBUSY;
+		goto error;
+	}
+
+	if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH
+	    && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
+		/* download internal firmware part */
+		at76_dbg(DBG_DEVSTART, "downloading internal firmware");
+		ret = at76_load_internal_fw(udev, fwe);
+		if (ret < 0) {
+			err("error %d downloading internal firmware", ret);
+			goto error;
+		}
+		usb_put_dev(udev);
+		return ret;
+	}
+
+	/* Internal firmware already inside the device.  Get firmware
+	 * version to test if external firmware is loaded.
+	 * This works only for newer firmware, e.g. the Intersil 0.90.x
+	 * says "control timeout on ep0in" and subsequent
+	 * at76_get_op_mode() fail too :-( */
+
+	/* if version >= 0.100.x.y or device with built-in flash we can
+	 * query the device for the fw version */
+	if ((fwe->fw_version.major > 0 || fwe->fw_version.minor >= 100)
+	    || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) {
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0 || (fwv.major | fwv.minor) == 0)
+			need_ext_fw = 1;
+	} else
+		/* No way to check firmware version, reload to be sure */
+		need_ext_fw = 1;
+
+	if (need_ext_fw) {
+		at76_dbg(DBG_DEVSTART, "downloading external firmware");
+
+		ret = at76_load_external_fw(udev, fwe);
+		if (ret)
+			goto error;
+
+		/* Re-check firmware version */
+		ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
+		if (ret < 0) {
+			err("error %d getting firmware version", ret);
+			goto error;
+		}
+
+		/* Major and minor version must match */
+		if (fwv.major != fwe->fw_version.major
+		    || fwv.minor != fwe->fw_version.minor) {
+			printk(KERN_ERR DRIVER_NAME
+			       ": wrong firmware version, loaded %d.%d.%d-%d, "
+			       "read back %d.%d.%d-%d\n",
+			       fwe->fw_version.major, fwe->fw_version.minor,
+			       fwe->fw_version.patch, fwe->fw_version.build,
+			       fwv.major, fwv.minor, fwv.patch, fwv.build);
+			ret = -EBUSY;
+			goto error;
+		}
+	}
+
+	priv = at76_alloc_new_device(udev);
+	if (!priv) {
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	SET_NETDEV_DEV(priv->netdev, &interface->dev);
+	usb_set_intfdata(interface, priv);
+
+	memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
+	priv->board_type = board_type;
+
+	ret = at76_init_new_device(priv, interface);
+	if (ret < 0)
+		at76_delete_device(priv);
+
+	return ret;
+
+error:
+	usb_put_dev(udev);
+	return ret;
+}
+
+static void at76_disconnect(struct usb_interface *interface)
+{
+	struct at76_priv *priv;
+
+	priv = usb_get_intfdata(interface);
+	usb_set_intfdata(interface, NULL);
+
+	/* Disconnect after loading internal firmware */
+	if (!priv)
+		return;
+
+	printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
+	at76_delete_device(priv);
+	printk(KERN_INFO DRIVER_NAME ": disconnected\n");
+}
+
+/* Structure for registering this driver with the USB subsystem */
+static struct usb_driver at76_driver = {
+	.name = DRIVER_NAME,
+	.probe = at76_probe,
+	.disconnect = at76_disconnect,
+	.id_table = dev_table,
+};
+
+static int __init at76_mod_init(void)
+{
+	int result;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");
+
+	mutex_init(&fw_mutex);
+
+	/* register this driver with the USB subsystem */
+	result = usb_register(&at76_driver);
+	if (result < 0)
+		err("usb_register failed (status %d)", result);
+
+	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
+	return result;
+}
+
+static void __exit at76_mod_exit(void)
+{
+	int i;
+
+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
+	usb_deregister(&at76_driver);
+	for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
+		if (firmwares[i].fw)
+			release_firmware(firmwares[i].fw);
+	}
+	led_trigger_unregister_simple(ledtrig_tx);
+}
+
+module_param_named(debug, at76_debug, int, 0600);
+MODULE_PARM_DESC(debug, "Debugging level");
+
+module_init(at76_mod_init);
+module_exit(at76_mod_exit);
+
+MODULE_AUTHOR("Oliver Kurth <oku at masqmail.cx>");
+MODULE_AUTHOR("Joerg Albert <joerg.albert at gmx.de>");
+MODULE_AUTHOR("Alex <alex at foogod.com>");
+MODULE_AUTHOR("Nick Jones");
+MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453 at hotmail.com>");
+MODULE_AUTHOR("Pavel Roskin <proski at gnu.org>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 11:19:26.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 11:23:09.000000000 -0400
@@ -381,6 +381,14 @@ config PCI_HERMES
 	  common.  Some of the built-in wireless adaptors in laptops are of
 	  this variety.
 
+config USB_ATMEL
+	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
+	depends on WLAN_80211 && USB
+	select FW_LOADER
+	---help---
+	  Enable support for USB Wireless devices using Atmel at76c503,
+	  at76c505 or at76c505a chips.
+
 config PCMCIA_HERMES
 	tristate "Hermes PCMCIA card support"
 	depends on PCMCIA && HERMES

linux-2.6-ath5k.patch:

--- NEW FILE linux-2.6-ath5k.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:23:09.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:13.000000000 -0400
@@ -652,6 +652,14 @@ M:	ecashin at coraid.com
 W:	http://www.coraid.com/support/linux
 S:	Supported
 
+ATHEROS ATH5K WIRELESS DRIVER
+P:	Jiri Slaby
+M:	jirislaby at gmail.com
+P:	Luis R. Rodriguez
+M:	mcgrof at gmail.com
+L:	linux-wireless at vger.kernel.org
+S:	Maintained
+
 ATL1 ETHERNET DRIVER
 P:	Jay Cliburn
 M:	jcliburn at gmail.com
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-27 11:24:13.000000000 -0400
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
+ *
+ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _ATH5K_H
+#define _ATH5K_H
+
+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
+ * long and results timeouts). It's also illegal to tune to some of the
+ * supported frequencies in some countries, so use this at your own risk,
+ * you've been warned. */
+#define CHAN_DEBUG	0
+
+/* Uncomment this for debuging (warning that it results in TOO much output) */
+/*#define AR5K_DEBUG	1 */
+
+#include <linux/types.h>
+#include <net/mac80211.h>
+
+#include "ath5k_hw.h"
+#include "ath5k_regdom.h"
+
+/* PCI IDs */
+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
+
+/****************************\
+  GENERIC DRIVER DEFINITIONS
+\****************************/
+
+#define AR5K_PRINTF(fmt, ...)   printk("%s: " fmt, __func__, ##__VA_ARGS__)
+#define AR5K_PRINT(fmt)         printk("%s: " fmt, __func__)
+#ifdef AR5K_DEBUG
+#define AR5K_TRACE              printk(KERN_DEBUG "%s:%d\n", __func__, __LINE__)
+#else
+#define AR5K_TRACE
+#endif
+
+/*
+ * Some tuneable values (these should be changeable by the user)
+ */
+#define AR5K_TUNE_DMA_BEACON_RESP		2
+#define AR5K_TUNE_SW_BEACON_RESP		10
+#define AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF	0
+#define AR5K_TUNE_RADAR_ALERT			false
+#define AR5K_TUNE_MIN_TX_FIFO_THRES		1
+#define AR5K_TUNE_MAX_TX_FIFO_THRES		((IEEE80211_MAX_LEN / 64) + 1)
+#define AR5K_TUNE_RSSI_THRES			1792
+#define AR5K_TUNE_REGISTER_TIMEOUT		20000
+#define AR5K_TUNE_REGISTER_DWELL_TIME		20000
+#define AR5K_TUNE_BEACON_INTERVAL		100
+#define AR5K_TUNE_AIFS				2
+#define AR5K_TUNE_AIFS_11B			2
+#define AR5K_TUNE_AIFS_XR			0
+#define AR5K_TUNE_CWMIN				15
+#define AR5K_TUNE_CWMIN_11B			31
+#define AR5K_TUNE_CWMIN_XR			3
+#define AR5K_TUNE_CWMAX				1023
+#define AR5K_TUNE_CWMAX_11B			1023
+#define AR5K_TUNE_CWMAX_XR			7
+#define AR5K_TUNE_NOISE_FLOOR			-72
+#define AR5K_TUNE_MAX_TXPOWER			60
+#define AR5K_TUNE_DEFAULT_TXPOWER		30
+#define AR5K_TUNE_TPC_TXPOWER			true
+#define AR5K_TUNE_ANT_DIVERSITY			true
+#define AR5K_TUNE_HWTXTRIES			4
+
+/* token to use for aifs, cwmin, cwmax in MadWiFi */
+#define	AR5K_TXQ_USEDEFAULT	((u32) -1)
+
+/* GENERIC CHIPSET DEFINITIONS */
+
+/* MAC Chips */
+enum ath5k_version {
+	AR5K_AR5210	= 0,
+	AR5K_AR5211	= 1,
+	AR5K_AR5212	= 2,
+};
+
+/* PHY Chips */
+enum ath5k_radio {
+	AR5K_RF5110	= 0,
+	AR5K_RF5111	= 1,
+	AR5K_RF5112	= 2,
+};
+
+/*
+ * Common silicon revision/version values
+ */
+enum ath5k_srev_type {
+	AR5K_VERSION_VER,
+	AR5K_VERSION_REV,
+	AR5K_VERSION_RAD,
+	AR5K_VERSION_DEV
+};
+
+struct ath5k_srev_name {
+	const char		*sr_name;
+	enum ath5k_srev_type	sr_type;
+	u_int			sr_val;
+};
+
+#define AR5K_SREV_NAME	{						\
+	{ "5210",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5210 },	\
+	{ "5311",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311 },	\
+	{ "5311a",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311A },\
+	{ "5311b",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5311B },\
+	{ "5211",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5211 },	\
+	{ "5212",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5212 },	\
+	{ "5213",	AR5K_VERSION_VER,	AR5K_SREV_VER_AR5213 },	\
+	{ "xxxx",	AR5K_VERSION_VER,	AR5K_SREV_UNKNOWN },	\
+	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },	\
+	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },	\
+	{ "2111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2111 },	\
+	{ "5112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112 },	\
+	{ "5112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5112A },	\
+	{ "2112",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112 },	\
+	{ "2112a",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2112A },	\
+	{ "xxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },	\
+	{ "2413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR2413 },\
+	{ "5413",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5413 },\
+	{ "5424",	AR5K_VERSION_DEV,	PCI_DEVICE_ID_ATHEROS_AR5424 },\
+	{ "xxxx",	AR5K_VERSION_DEV,	AR5K_SREV_UNKNOWN }	\
+}
+
+#define AR5K_SREV_UNKNOWN	0xffff
+
+#define AR5K_SREV_VER_AR5210	0x00
+#define AR5K_SREV_VER_AR5311	0x10
+#define AR5K_SREV_VER_AR5311A	0x20
+#define AR5K_SREV_VER_AR5311B	0x30
+#define AR5K_SREV_VER_AR5211	0x40
+#define AR5K_SREV_VER_AR5212	0x50
+#define AR5K_SREV_VER_AR5213	0x55
+#define AR5K_SREV_VER_UNSUPP	0x60
+
+#define AR5K_SREV_RAD_5110	0x00
+#define AR5K_SREV_RAD_5111	0x10
+#define AR5K_SREV_RAD_5111A	0x15
[...13868 lines suppressed...]
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * 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 NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.20 2005/01/24 20:31:24 sam Exp $
+ */
+
+/*
+ * Defintions for the Atheros Wireless LAN controller driver.
+ */
+#ifndef _DEV_ATH_ATHVAR_H
+#define _DEV_ATH_ATHVAR_H
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/wireless.h>
+#include <linux/if_ether.h>
+
+#include "ath5k.h"
+
+#define	ATH_TIMEOUT		1000
+
+#define ATH_LONG_CALIB		30 /* seconds */
+#define ATH_SHORT_CALIB		1
+
+/*
+ * Maximum acceptable MTU
+ * MAXFRAMEBODY - WEP - QOS - RSN/WPA:
+ * 2312 - 8 - 2 - 12 = 2290
+ */
+#define ATH_MAX_MTU	2290
+#define ATH_MIN_MTU	32
+
+#define	ATH_RXBUF	40		/* number of RX buffers */
+#define	ATH_TXBUF	200		/* number of TX buffers */
+#define	ATH_TXDESC	1		/* number of descriptors per buffer */
+#define ATH_BCBUF	1		/* number of beacon buffers */
+#define	ATH_TXMAXTRY	11		/* max number of transmit attempts */
+#define	ATH_TXINTR_PERIOD 5		/* max number of batched tx descriptors */
+
+#define ATH_BEACON_AIFS_DEFAULT  0	/* default aifs for ap beacon q */
+#define ATH_BEACON_CWMIN_DEFAULT 0	/* default cwmin for ap beacon q */
+#define ATH_BEACON_CWMAX_DEFAULT 0	/* default cwmax for ap beacon q */
+
+#define ATH_RSSI_LPF_LEN	10
+#define ATH_RSSI_DUMMY_MARKER	0x127
+#define ATH_EP_MUL(x, mul)	((x) * (mul))
+#define ATH_RSSI_IN(x)		(ATH_EP_MUL((x), AR5K_RSSI_EP_MULTIPLIER))
+#define ATH_LPF_RSSI(x, y, len) \
+    ((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
+#define ATH_RSSI_LPF(x, y) do {						\
+	if ((y) >= -20)							\
+		x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
+} while (0)
+
+struct ath_buf {
+	struct list_head	list;
+	unsigned int		flags;	/* tx descriptor flags */
+	struct ath_desc		*desc;	/* virtual addr of desc */
+	dma_addr_t		daddr;	/* physical addr of desc */
+	struct sk_buff		*skb;	/* skbuff for buf */
+	dma_addr_t		skbaddr;/* physical addr of skb data */
+	struct ieee80211_tx_control ctl;
+};
+
+/*
+ * Data transmit queue state.  One of these exists for each
+ * hardware transmit queue.  Packets sent to us from above
+ * are assigned to queues based on their priority.  Not all
+ * devices support a complete set of hardware transmit queues.
+ * For those devices the array sc_ac2q will map multiple
+ * priorities to fewer hardware queues (typically all to one
+ * hardware queue).
+ */
+struct ath_txq {
+	unsigned int	qnum;		/* hardware q number */
+	u32		*link;		/* link ptr in last TX desc */
+	struct list_head q;		/* transmit queue */
+	spinlock_t	lock;		/* lock on q and link */
+	bool		setup;
+};
+
+#if CHAN_DEBUG
+#define ATH_CHAN_MAX	(26+26+26+200+200)
+#else
+#define ATH_CHAN_MAX	(14+14+14+252+20)	/* XXX what's the max? */
+#endif
+
+struct ath_softc {
+	struct pci_dev		*pdev;		/* for dma mapping */
+	void __iomem		*iobase;	/* address of the device */
+	struct mutex		lock;		/* dev-level lock */
+	struct ieee80211_tx_queue_stats tx_stats;
+	struct ieee80211_low_level_stats ll_stats;
+	struct ieee80211_hw	*hw;		/* IEEE 802.11 common */
+	struct ieee80211_hw_mode modes[NUM_IEEE80211_MODES];
+	struct ieee80211_channel channels[ATH_CHAN_MAX];
+	struct ieee80211_rate	rates[AR5K_MAX_RATES * NUM_IEEE80211_MODES];
+	enum ieee80211_if_types	opmode;
+	struct ath_hw		*ah;		/* Atheros HW */
+
+	int			debug;
+
+	struct ath_buf		*bufptr;	/* allocated buffer ptr */
+	struct ath_desc		*desc;		/* TX/RX descriptors */
+	dma_addr_t		desc_daddr;	/* DMA (physical) address */
+	size_t			desc_len;	/* size of TX/RX descriptors */
+	u16			cachelsz;	/* cache line size */
+
+	DECLARE_BITMAP(status, 6);
+#define ATH_STAT_INVALID	0		/* disable hardware accesses */
+#define ATH_STAT_MRRETRY	1		/* multi-rate retry support */
+#define ATH_STAT_PROMISC	2
+#define ATH_STAT_LEDBLINKING	3		/* LED blink operation active */
+#define ATH_STAT_LEDENDBLINK	4		/* finish LED blink operation */
+#define ATH_STAT_LEDSOFT	5		/* enable LED gpio status */
+
+	unsigned int		curmode;	/* current phy mode */
+	struct ieee80211_channel *curchan;	/* current h/w channel */
+
+	int 			iface_id;	/* add/remove_interface id */
+
+	struct {
+		u8	rxflags;	/* radiotap rx flags */
+		u8	txflags;	/* radiotap tx flags */
+		u16	ledon;		/* softled on time */
+		u16	ledoff;		/* softled off time */
+	} hwmap[32];				/* h/w rate ix mappings */
+
+	enum ath5k_int		imask;		/* interrupt mask copy */
+
+	DECLARE_BITMAP(keymap, AR5K_KEYCACHE_SIZE); /* key use bit map */
+
+	u8			bssidmask[ETH_ALEN];
+
+	unsigned int		led_pin,	/* GPIO pin for driving LED */
+				led_on,		/* pin setting for LED on */
+				led_off;	/* off time for current blink */
+	struct timer_list	led_tim;	/* led off timer */
+	u8			led_rxrate;	/* current rx rate for LED */
+	u8			led_txrate;	/* current tx rate for LED */
+
+	struct tasklet_struct	restq;		/* reset tasklet */
+
+	unsigned int		rxbufsize;	/* rx size based on mtu */
+	struct list_head	rxbuf;		/* receive buffer */
+	spinlock_t		rxbuflock;
+	u32			*rxlink;	/* link ptr in last RX desc */
+	struct tasklet_struct	rxtq;		/* rx intr tasklet */
+
+	struct list_head	txbuf;		/* transmit buffer */
+	spinlock_t		txbuflock;
+	unsigned int		txbuf_len;	/* buf count in txbuf list */
+	struct ath_txq		txqs[2];	/* beacon and tx */
+
+	struct ath_txq		*txq;		/* beacon and tx*/
+	struct tasklet_struct	txtq;		/* tx intr tasklet */
+
+	struct ath_buf		*bbuf;		/* beacon buffer */
+	unsigned int		bhalq,		/* HAL q for outgoing beacons */
+				bmisscount,	/* missed beacon transmits */
+				bintval,	/* beacon interval */
+				bsent;
+
+	struct timer_list	calib_tim;	/* calibration timer */
+};
+
+#define ath5k_hw_hasbssidmask(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_BSSIDMASK, 0, NULL) == 0)
+#define ath5k_hw_hasveol(_ah) \
+	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
+
+#endif

linux-2.6-mac80211-extras.patch:

--- NEW FILE linux-2.6-mac80211-extras.patch ---
diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-09-27 11:19:25.000000000 -0400
+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-27 11:25:33.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
 } __attribute__ ((packed));
 
 
+struct ieee80211_ht_capability {
+	__le16 capabilities_info;
+	u8 mac_ht_params_info;
+	u8 supported_mcs_set[16];
+	__le16 extended_ht_capability_info;
+	__le32 tx_BF_capability_info;
+	u8 antenna_selection_info;
+}__attribute__ ((packed));
+
+struct ieee80211_ht_additional_info {
+	u8 control_chan;
+	u8 ht_param;
+	__le16 operation_mode;
+	__le16 stbc_param;
+	u8 basic_set[16];
+}__attribute__ ((packed));
+
+
+#define IEEE80211_TSINFO_TYPE(a)	((a.byte1 & 0x01) >> 0)
+#define IEEE80211_TSINFO_TSID(a)	((a.byte1 & 0x1E) >> 1)
+#define IEEE80211_TSINFO_DIR(a)		((a.byte1 & 0x60) >> 5)
+#define IEEE80211_TSINFO_POLICY(a)	((a.byte1 & 0x80) >> 7 + \
+					 (a.byte2 & 0x01) << 1)
+#define IEEE80211_TSINFO_AGG(a)		((a.byte2 & 0x02) >> 1)
+#define IEEE80211_TSINFO_APSD(a)	((a.byte2 & 0x04) >> 2)
+#define IEEE80211_TSINFO_UP(a)		((a.byte2 & 0x38) >> 3)
+#define IEEE80211_TSINFO_ACK(a)		((a.byte2 & 0xC0) >> 6)
+#define IEEE80211_TSINFO_SCHEDULE(a)	((a.byte3 & 0x01) >> 0)
+
+#define IEEE80211_SET_TSINFO_TYPE(i, d)		(i.byte1 |= (d << 0) & 0x01)
+#define IEEE80211_SET_TSINFO_TSID(i, d)		(i.byte1 |= (d << 1) & 0x1E)
+#define IEEE80211_SET_TSINFO_DIR(i, d)		(i.byte1 |= (d << 5) & 0x60)
+#define IEEE80211_SET_TSINFO_POLICY(i, d)	\
+do {						\
+						i.byte1 |= (d & 0x01) << 7; \
+						i.byte2 |= (d & 0x02) >> 1; \
+} while(0)
+#define IEEE80211_SET_TSINFO_AGG(i, d)		(i.byte2 |= (d << 1) & 0x02)
+#define IEEE80211_SET_TSINFO_APSD(i, d)		(i.byte2 |= (d << 2) & 0x04)
+#define IEEE80211_SET_TSINFO_UP(i, d)		(i.byte2 |= (d << 3) & 0x38)
+#define IEEE80211_SET_TSINFO_ACK(i, d)		(i.byte2 |= (d << 6) & 0xC0)
+#define IEEE80211_SET_TSINFO_SCHEDULE(i, d)	(i.byte3 |= (d << 0) & 0x01)
+
+struct ieee80211_ts_info {
+	u8 byte1;
+	u8 byte2;
+	u8 byte3;
+} __attribute__ ((packed));
+
+struct ieee80211_elem_tspec {
+	struct ieee80211_ts_info ts_info;
+	__le16 nominal_msdu_size;
+	__le16 max_msdu_size;
+	__le32 min_service_interval;
+	__le32 max_service_interval;
+	__le32 inactivity_interval;
+	__le32 suspension_interval;
+	__le32 service_start_time;
+	__le32 min_data_rate;
+	__le32 mean_data_rate;
+	__le32 peak_data_rate;
+	__le32 burst_size;
+	__le32 delay_bound;
+	__le32 min_phy_rate;
+	__le16 surplus_band_allow;
+	__le16 medium_time;
+} __attribute__ ((packed));
+
+
 struct ieee80211_mgmt {
 	__le16 frame_control;
 	__le16 duration;
@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
 				struct {
 					u8 action_code;
 					u8 dialog_token;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_req;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status_code;
+					u8 variable[0];
+				} __attribute__ ((packed)) addts_resp;
+				struct {
+					u8 action_code;
+					struct ieee80211_ts_info ts_info;
+					__le16 reason_code;
+				} __attribute__ ((packed)) delts;
+				struct {
+					u8 action_code;
+					u8 dialog_token;
 					u8 status_code;
 					u8 variable[0];
 				} __attribute__ ((packed)) wme_action;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 capab_info;
+					__le16 timeout;
+					/* Followed by Supported Rates and
+					 * Extended Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_req;
+				struct {
+					u8 action_code;
+					__le16 status_code;
+					u8 dest[6];
+					u8 src[6];
+					/* Followed by Capability Information,
+					 * Supported Rates and Extended
+					 * Supported Rates */
+					u8 variable[0];
+				} __attribute__ ((packed)) dls_resp;
+				struct {
+					u8 action_code;
+					u8 dest[6];
+					u8 src[6];
+					__le16 reason_code;
+				} __attribute__ ((packed)) dls_teardown;
 				struct{
 					u8 action_code;
 					u8 element_id;
@@ -184,6 +295,25 @@ struct ieee80211_mgmt {
 					u8 new_chan;
 					u8 switch_count;
 				} __attribute__((packed)) chan_switch;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 capab;
+					__le16 timeout;
+					__le16 start_seq_num;
+				} __attribute__((packed)) addba_req;
+				struct{
+					u8 action_code;
+					u8 dialog_token;
+					__le16 status;
+					__le16 capab;
+					__le16 timeout;
+				} __attribute__((packed)) addba_resp;
+				struct{
+					u8 action_code;
+					__le16 params;
+					__le16 reason_code;
+				}__attribute__((packed)) delba;
 			} u;
 		} __attribute__ ((packed)) action;
 	} u;
@@ -270,6 +400,18 @@ enum ieee80211_statuscode {
 	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
 	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
 	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
+	/* 802.11e */
+	WLAN_STATUS_UNSPECIFIED_QOS = 32,
+	WLAN_STATUS_ASSOC_DENIED_NOBANDWIDTH = 33,
+	WLAN_STATUS_ASSOC_DENIED_LOWACK = 34,
+	WLAN_STATUS_ASSOC_DENIED_UNSUPP_QOS = 35,
+	WLAN_STATUS_REQUEST_DECLINED = 37,
+	WLAN_STATUS_INVALID_QOS_PARAM = 38,
+	WLAN_STATUS_CHANGE_TSPEC = 39,
+	WLAN_STATUS_WAIT_TS_DELAY = 47,
+	WLAN_STATUS_NO_DIRECT_LINK = 48,
+	WLAN_STATUS_STA_NOT_PRESENT = 49,
+	WLAN_STATUS_STA_NOT_QSTA = 50,
 };
 
 
@@ -300,9 +442,50 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
 	WLAN_REASON_IEEE8021X_FAILED = 23,
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
+	/* 802.11e */
+	WLAN_REASON_DISASSOC_UNSPECIFIED_QOS = 32,
+	WLAN_REASON_DISASSOC_QAP_NO_BANDWIDTH = 33,
+	WLAN_REASON_DISASSOC_LOW_ACK = 34,
+	WLAN_REASON_DISASSOC_QAP_EXCEED_TXOP = 35,
+	WLAN_REASON_QSTA_LEAVE_QBSS = 36,
+	WLAN_REASON_QSTA_NOT_USE = 37,
+	WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
+	WLAN_REASON_QSTA_TIMEOUT = 39,
+	WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
 };
 
 
+/* Category Code */
+enum ieee80211_category {
+	WLAN_CATEGORY_SPECTRUM_MGMT = 0,
+	WLAN_CATEGORY_QOS = 1,
+	WLAN_CATEGORY_DLS = 2,
+	WLAN_CATEGORY_BACK = 3,
[...3755 lines suppressed...]
+			printk(" %02x", mic[i]);
+		printk("\n");
+		printk(KERN_DEBUG "   SA=" MAC_FMT " DA=" MAC_FMT " key",
+		       MAC_ARG(sa), MAC_ARG(da));
+		for (i = 0; i < 8; i++)
+			printk(" %02x", key[i]);
+		printk(" (%d)\n", authenticator);
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 
 		mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
 						(void *) skb->data);
@@ -208,12 +271,30 @@ static int tkip_encrypt_skb(struct ieee8
 	memmove(pos, pos + TKIP_IV_LEN, hdrlen);
 	pos += hdrlen;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_iv_inc;
+iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	/* Increase IV for the frame */
 	key->u.tkip.iv16++;
 	if (key->u.tkip.iv16 == 0)
 		key->u.tkip.iv32++;
 
-	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto iv_inc;
+	}
+skip_iv_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
+	if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	    && !tx->wpa_test
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+		) {
 		hdr = (struct ieee80211_hdr *)skb->data;
 
 		/* hwaccel - with preallocated room for IV */
@@ -255,6 +336,37 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 	tx->u.tx.control->iv_len = TKIP_IV_LEN;
 	ieee80211_tx_set_iswep(tx);
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if ((tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) ||
+	    (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+	     tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV)) {
+		wpa_test = 1;
+	}
+
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger &=
+			~(WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+			  WPA_TRIGGER_TX_SKIP_SEQ);
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - TKIP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if ((tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
 	    !(tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
 	    !wpa_test) {
@@ -268,6 +380,10 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (tkip_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)
@@ -275,6 +391,23 @@ ieee80211_tx_h_tkip_encrypt(struct ieee8
 		}
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta && tx->sta->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       tx->dev->name, MAC_ARG(tx->sta->addr));
+		tx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	} else if (!(tx->flags & IEEE80211_TXRXD_TXUNICAST) &&
+		   tx->local->wpa_trigger & WPA_TRIGGER_FAIL_TX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting TX TKIP ICV "
+		       "for Group Key\n",
+		       tx->dev->name);
+		tx->local->wpa_trigger &= ~WPA_TRIGGER_FAIL_TX_ICV;
+		skb->data[skb->len - 1]++;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	return TXRX_CONTINUE;
 }
 
@@ -299,6 +432,17 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
 	if (!rx->sta || skb->len - hdrlen < 12)
 		return TXRX_DROP;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (rx->sta && rx->sta->wpa_trigger & WPA_TRIGGER_FAIL_RX_ICV) {
+		printk(KERN_INFO "%s: WPA testing - corrupting RX TKIP ICV "
+		       "for STA " MAC_FMT "\n",
+		       rx->dev->name, MAC_ARG(rx->sta->addr));
+		rx->sta->wpa_trigger &= ~WPA_TRIGGER_FAIL_RX_ICV;
+		skb->data[skb->len - 1]++;
+		wpa_test = 1;
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	if (rx->u.rx.status->flag & RX_FLAG_DECRYPTED) {
 		if (rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED) {
 			/*
@@ -467,12 +611,26 @@ static int ccmp_encrypt_skb(struct ieee8
 	/* PN = PN + 1 */
 	pn = key->u.ccmp.tx_pn;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_REPLAY)
+		goto skip_pn_inc;
+pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	for (i = CCMP_PN_LEN - 1; i >= 0; i--) {
 		pn[i]++;
 		if (pn[i])
 			break;
 	}
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (test & WPA_TRIGGER_TX_SKIP_SEQ) {
+		test = 0;
+		goto pn_inc;
+	}
+skip_pn_inc:
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	ccmp_pn2hdr(pos, pn, key->conf.keyidx);
 
 	if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
@@ -504,6 +662,27 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 	if (!key || key->conf.alg != ALG_CCMP || !WLAN_FC_DATA_PRESENT(fc))
 		return TXRX_CONTINUE;
 
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+	if (tx->sta) {
+		test = tx->sta->wpa_trigger;
+		tx->sta->wpa_trigger = 0;
+	} else {
+		test = tx->local->wpa_trigger;
+		tx->local->wpa_trigger = 0;
+	}
+	if (test &
+	    (WPA_TRIGGER_TX_REPLAY | WPA_TRIGGER_TX_REPLAY_FRAG |
+	     WPA_TRIGGER_TX_SKIP_SEQ)) {
+		printk(KERN_INFO "%s: WPA testing - CCMP TX packet number "
+		       "%s%s%s%s\n", tx->dev->name,
+		       tx->sta ? "[UNICAST]" : "[MULTICAST]",
+		       test & WPA_TRIGGER_TX_REPLAY ? "[REPLAY]" : "",
+		       test & WPA_TRIGGER_TX_REPLAY_FRAG ?
+		       "[REPLAY FRAG]" : "",
+		       test & WPA_TRIGGER_TX_SKIP_SEQ ? "[SKIP SEQ]" : "");
+	}
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
+
 	tx->u.tx.control->icv_len = CCMP_MIC_LEN;
 	tx->u.tx.control->iv_len = CCMP_HDR_LEN;
 	ieee80211_tx_set_iswep(tx);
@@ -521,6 +700,10 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee8
 
 	if (tx->u.tx.extra_frag) {
 		int i;
+#ifdef CONFIG_HOSTAPD_WPA_TESTING
+		if (test & WPA_TRIGGER_TX_REPLAY_FRAG)
+			test |= WPA_TRIGGER_TX_REPLAY;
+#endif /* CONFIG_HOSTAPD_WPA_TESTING */
 		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
 			if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
 			    < 0)

linux-2.6-zd1211rw-mac80211.patch:

--- NEW FILE linux-2.6-zd1211rw-mac80211.patch ---
diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:44.000000000 -0400
@@ -4157,6 +4157,16 @@ W:	http://www.qsl.net/dl1bke/
 L:	linux-hams at vger.kernel.org
 S:	Maintained
 
+ZD1211RW-MAC80211 WIRELESS DRIVER
+P:	Daniel Drake
+M:	dsd at gentoo.org
+P:	Ulrich Kunitz
+M:	kune at deine-taler.de
+W:	http://zd1211.ath.cx/wiki/DriverRewrite
+L:	linux-wireless at vger.kernel.org
+L:	zd1211-devs at lists.sourceforge.net (subscribers-only)
+S:	Maintained
+
 ZD1211RW WIRELESS DRIVER
 P:	Daniel Drake
 M:	dsd at gentoo.org
diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 11:24:44.000000000 -0400
@@ -41,6 +41,7 @@ obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw-mac80211/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c
--- /dev/null	2007-09-27 08:31:24.563724082 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw-mac80211/zd_chip.c	2007-09-27 11:24:44.000000000 -0400
@@ -0,0 +1,1619 @@
+/* zd_chip.c
+ *
+ * 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
+ */
+
+/* This file implements all the hardware specific functions for the ZD1211
+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy
+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+
+void zd_chip_init(struct zd_chip *chip,
+	         struct ieee80211_hw *hw,
+		 struct usb_interface *intf)
+{
+	memset(chip, 0, sizeof(*chip));
+	mutex_init(&chip->mutex);
+	zd_usb_init(&chip->usb, hw, intf);
+	zd_rf_init(&chip->rf);
+}
+
+void zd_chip_clear(struct zd_chip *chip)
+{
+	ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+	zd_usb_clear(&chip->usb);
+	zd_rf_clear(&chip->rf);
+	mutex_destroy(&chip->mutex);
+	ZD_MEMCLEAR(chip, sizeof(*chip));
+}
+
+static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
+{
+	u8 *addr = zd_chip_to_mac(chip)->hwaddr;
+	return scnprintf(buffer, size, "%02x-%02x-%02x",
+		         addr[0], addr[1], addr[2]);
+}
+
+/* Prints an identifier line, which will support debugging. */
+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
+{
+	int i = 0;
+
+	i = scnprintf(buffer, size, "zd1211%s chip ",
+		      zd_chip_is_zd1211b(chip) ? "b" : "");
+	i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += scnprint_mac_oui(chip, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " ");
+	i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
+	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
+		chip->patch_cck_gain ? 'g' : '-',
+		chip->patch_cr157 ? '7' : '-',
+		chip->patch_6m_band_edge ? '6' : '-',
+		chip->new_phy_layout ? 'N' : '-',
+		chip->al2230s_bit ? 'S' : '-');
+	return i;
+}
+
+static void print_id(struct zd_chip *chip)
+{
+	char buffer[80];
+
+	scnprint_id(chip, buffer, sizeof(buffer));
+	buffer[sizeof(buffer)-1] = 0;
+	dev_info(zd_chip_dev(chip), "%s\n", buffer);
+}
+
+static zd_addr_t inc_addr(zd_addr_t addr)
+{
+	u16 a = (u16)addr;
+	/* Control registers use byte addressing, but everything else uses word
+	 * addressing. */
+	if ((a & 0xf000) == CR_START)
+		a += 2;
+	else
+		a += 1;
+	return (zd_addr_t)a;
+}
+
+/* Read a variable number of 32-bit values. Parameter count is not allowed to
+ * exceed USB_MAX_IOREAD32_COUNT.
+ */
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+		 unsigned int count)
+{
+	int r;
+	int i;
+	zd_addr_t *a16 = (zd_addr_t *)NULL;
+	u16 *v16;
+	unsigned int count16;
+
+	if (count > USB_MAX_IOREAD32_COUNT)
+		return -EINVAL;
+
+	/* Allocate a single memory block for values and addresses. */
+	count16 = 2*count;
+	a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+		                   GFP_KERNEL);
+	if (!a16) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error ENOMEM in allocation of a16\n");
+		r = -ENOMEM;
+		goto out;
+	}
+	v16 = (u16 *)(a16 + count16);
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		/* We read the high word always first. */
+		a16[j] = inc_addr(addr[i]);
+		a16[j+1] = addr[i];
+	}
+
+	r = zd_ioread16v_locked(chip, v16, a16, count16);
+	if (r) {
+		dev_dbg_f(zd_chip_dev(chip),
+			  "error: zd_ioread16v_locked. Error number %d\n", r);
+		goto out;
+	}
+
+	for (i = 0; i < count; i++) {
+		int j = 2*i;
+		values[i] = (v16[j] << 16) | v16[j+1];
+	}
+
+out:
+	kfree((void *)a16);
+	return r;
+}
+
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+	           unsigned int count)
+{
+	int i, j, r;
+	struct zd_ioreq16 *ioreqs16;
+	unsigned int count16;
+
+	ZD_ASSERT(mutex_is_locked(&chip->mutex));
+
+	if (count == 0)
+		return 0;
+	if (count > USB_MAX_IOWRITE32_COUNT)
+		return -EINVAL;
[...7628 lines suppressed...]
+	hash = mac->multicast_hash;
+	spin_unlock_irq(&mac->lock);
+
+	zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+
+static void zd_op_set_multicast_list(struct ieee80211_hw *hw,
+				      unsigned short dev_flags, int mc_count)
+{
+	struct zd_mc_hash hash;
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	if ((dev_flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
+	     has_monitor_interfaces(mac))
+	{
+		zd_mc_add_all(&hash);
+	} else {
+		struct dev_mc_list *mc = NULL;
+		void *tmp = NULL;
+
+		zd_mc_clear(&hash);
+		while ((mc = ieee80211_get_mc_list_item(hw, mc, &tmp))) {
+			dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
+				  MAC_ARG(mc->dmi_addr));
+			zd_mc_add_addr(&hash, mc->dmi_addr);
+		}
+	}
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->multicast_hash = hash;
+	spin_unlock_irqrestore(&mac->lock, flags);
+	queue_work(zd_workqueue, &mac->set_multicast_hash_work);
+}
+
+static void set_rts_cts_work(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, set_rts_cts_work);
+	unsigned long flags;
+	unsigned int short_preamble;
+
+	mutex_lock(&mac->chip.mutex);
+
+	spin_lock_irqsave(&mac->lock, flags);
+	mac->updating_rts_rate = 0;
+	short_preamble = mac->short_preamble;
+	spin_unlock_irqrestore(&mac->lock, flags);
+
+	zd_chip_set_rts_cts_rate_locked(&mac->chip, short_preamble);
+	mutex_unlock(&mac->chip.mutex);
+}
+
+static void zd_op_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
+				 int cts_protection, int preamble)
+{
+	struct zd_mac *mac = zd_hw_mac(hw);
+	unsigned long flags;
+
+	dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes);
+
+	if (changes & IEEE80211_ERP_CHANGE_PREAMBLE) {
+		spin_lock_irqsave(&mac->lock, flags);
+		mac->short_preamble = !preamble;
+		if (!mac->updating_rts_rate) {
+			mac->updating_rts_rate = 1;
+			/* FIXME: should disable TX here, until work has
+			 * completed and RTS_CTS reg is updated */
+			queue_work(zd_workqueue, &mac->set_rts_cts_work);
+		}
+		spin_unlock_irqrestore(&mac->lock, flags);
+	}
+}
+
+static const struct ieee80211_ops zd_ops = {
+	.tx			= zd_op_tx,
+	.open			= zd_op_open,
+	.stop			= zd_op_stop,
+	.add_interface		= zd_op_add_interface,
+	.remove_interface	= zd_op_remove_interface,
+	.config			= zd_op_config,
+	.config_interface	= zd_op_config_interface,
+	.set_multicast_list	= zd_op_set_multicast_list,
+	.erp_ie_changed		= zd_op_erp_ie_changed,
+};
+
+struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
+{
+	struct zd_mac *mac;
+	struct ieee80211_hw *hw;
+	int i;
+
+	hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops);
+	if (!hw) {
+		dev_dbg_f(&intf->dev, "out of memory\n");
+		return NULL;
+	}
+
+	mac = zd_hw_mac(hw);
+
+	memset(mac, 0, sizeof(*mac));
+	spin_lock_init(&mac->lock);
+	mac->hw = hw;
+
+	mac->type = IEEE80211_IF_TYPE_MGMT;
+	mac->hwaddr = hw->wiphy->perm_addr;
+
+	memcpy(mac->channels, zd_channels, sizeof(zd_channels));
+	memcpy(mac->rates, zd_rates, sizeof(zd_rates));
+	mac->modes[0].mode = MODE_IEEE80211G;
+	mac->modes[0].num_rates = ARRAY_SIZE(zd_rates);
+	mac->modes[0].rates = mac->rates;
+	mac->modes[0].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[0].channels = mac->channels;
+	mac->modes[1].mode = MODE_IEEE80211B;
+	mac->modes[1].num_rates = 4;
+	mac->modes[1].rates = mac->rates;
+	mac->modes[1].num_channels = ARRAY_SIZE(zd_channels);
+	mac->modes[1].channels = mac->channels;
+
+	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+		     IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED;
+	hw->max_rssi = 100;
+	hw->max_signal = 100;
+
+	hw->queues = 1;
+	hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
+
+	skb_queue_head_init(&mac->ack_wait_queue);
+
+	for (i = 0; i < 2; i++) {
+		if (ieee80211_register_hwmode(hw, &mac->modes[i])) {
+			dev_dbg_f(&intf->dev, "cannot register hwmode\n");
+			ieee80211_free_hw(hw);
+			return NULL;
+		}
+	}
+
+	zd_chip_init(&mac->chip, hw, intf);
+	housekeeping_init(mac);
+	INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
+	INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work);
+
+	SET_IEEE80211_DEV(hw, &intf->dev);
+	return hw;
+}
+
+#define LINK_LED_WORK_DELAY HZ
+
+static void link_led_handler(struct work_struct *work)
+{
+	struct zd_mac *mac =
+		container_of(work, struct zd_mac, housekeeping.link_led_work.work);
+	struct zd_chip *chip = &mac->chip;
+	int is_associated;
+	int r;
+
+	spin_lock_irq(&mac->lock);
+	is_associated = mac->associated;
+	spin_unlock_irq(&mac->lock);
+
+	r = zd_chip_control_leds(chip,
+		                 is_associated ? LED_ASSOCIATED : LED_SCANNING);
+	if (r)
+		dev_err(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r);
+
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+		           LINK_LED_WORK_DELAY);
+}
+
+static void housekeeping_init(struct zd_mac *mac)
+{
+	INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler);
+}
+
+static void housekeeping_enable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work,
+			   0);
+}
+
+static void housekeeping_disable(struct zd_mac *mac)
+{
+	dev_dbg_f(zd_mac_dev(mac), "\n");
+	cancel_rearming_delayed_workqueue(zd_workqueue,
+		&mac->housekeeping.link_led_work);
+	zd_chip_control_leds(&mac->chip, LED_OFF);
+}
diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 11:24:13.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 11:24:44.000000000 -0400
@@ -616,6 +616,7 @@ source "drivers/net/wireless/bcm43xx/Kco
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/zd1211rw-mac80211/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3348
retrieving revision 1.3349
diff -u -r1.3348 -r1.3349
--- kernel-2.6.spec	26 Sep 2007 23:18:11 -0000	1.3348
+++ kernel-2.6.spec	27 Sep 2007 15:33:19 -0000	1.3349
@@ -614,7 +614,10 @@
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
-Patch690: git-wireless-dev.patch
+Patch690: linux-2.6-at76.patch
+Patch691: linux-2.6-ath5k.patch
+Patch692: linux-2.6-zd1211rw-mac80211.patch
+Patch693: linux-2.6-mac80211-extras.patch
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
 Patch710: linux-2.6-e1000-ich9.patch
@@ -1349,8 +1352,11 @@
 # pre-2.6.24 wireless patches from upstream
 ApplyPatch linux-2.6-wireless-pending.patch
 
-# Add wireless stack and driver updates from wireless-dev
-ApplyPatch git-wireless-dev.patch
+# Add misc wireless bits from upstream wireless tree
+ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-ath5k.patch
+ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+ApplyPatch linux-2.6-mac80211-extras.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -2355,6 +2361,9 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- Update and restructure wireless patches
+
 * Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
 - libata pata_sis: DMA fixes (#202291)
 - libata sata_sil24: IRQ clearing race fixes

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch	18 Sep 2007 15:08:25 -0000	1.3
+++ linux-2.6-wireless-pending.patch	27 Sep 2007 15:33:19 -0000	1.4
@@ -1,6 +1,1769 @@
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-09-27 11:00:31.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
+ S: (ask for current address)
+ S: USA
+ 
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
++
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+ 
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
++
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -833,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+ 
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
++
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3516,6 +3532,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+ 
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
++
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3650,6 +3672,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+ 
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
++
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-09-27 11:10:41.000000000 -0400
+@@ -7,7 +7,113 @@
+  */
+ 
+ /**
++ * enum nl80211_commands - supported nl80211 commands
++ *
++ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
++ *
++ * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
++ *	to get a list of all present wiphys.
++ * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
++ *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
++ *	%NL80211_ATTR_WIPHY_NAME.
++ * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
++ *
++ * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
++ *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
++ *	on an %NL80211_ATTR_IFINDEX is supported.
++ * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
++ 	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
++ * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
++ *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
++ *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
++ *	be sent from userspace to request creation of a new virtual interface,
++ *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
++ *	%NL80211_ATTR_IFNAME.
++ * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
++ *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
++ *	userspace to request deletion of a virtual interface, then requires
++ *	attribute %NL80211_ATTR_IFINDEX.
++ *
++ * @NL80211_CMD_MAX: highest used command number
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++enum nl80211_commands {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_CMD_UNSPEC,
++
++	NL80211_CMD_GET_WIPHY,		/* can dump */
++	NL80211_CMD_SET_WIPHY,
++	NL80211_CMD_NEW_WIPHY,
++	NL80211_CMD_DEL_WIPHY,
++
++	NL80211_CMD_GET_INTERFACE,	/* can dump */
++	NL80211_CMD_SET_INTERFACE,
++	NL80211_CMD_NEW_INTERFACE,
++	NL80211_CMD_DEL_INTERFACE,
++
++	/* add commands here */
++
++	/* used to define NL80211_CMD_MAX below */
++	__NL80211_CMD_AFTER_LAST,
++	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
++};
++
++/**
++ * enum nl80211_multicast_groups - multicast groups for nl80211
++ * @NL80211_GROUP_CONFIG: members of this group are notified of
++ *	configuration changes
++ */
++enum nl80211_multicast_groups {
++	/* be notified of configuration changes like wiphy renames */
++	NL80211_GROUP_CONFIG,
++
++	/* add groups here */
++
++	/* keep last */
++	__NL80211_GROUP_AFTER_LAST
++};
++#define NL80211_GROUP_MAX (__NL80211_GROUP_AFTER_LAST - 1)
++
++
++/**
++ * enum nl80211_attrs - nl80211 netlink attributes
++ *
++ * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
++ *
++ * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
++ *	/sys/class/ieee80211/<phyname>/index
++ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
++ *
++ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
++ * @NL80211_ATTR_IFNAME: network interface name
++ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
++ *
++ * @NL80211_ATTR_MAX: highest attribute number currently defined
++ * @__NL80211_ATTR_AFTER_LAST: internal use
++ */
++enum nl80211_attrs {
++/* don't change the order or add anything inbetween, this is ABI! */
++	NL80211_ATTR_UNSPEC,
++
++	NL80211_ATTR_WIPHY,
++	NL80211_ATTR_WIPHY_NAME,
++
++	NL80211_ATTR_IFINDEX,
++	NL80211_ATTR_IFNAME,
++	NL80211_ATTR_IFTYPE,
++
++	/* add attributes here, update the policy in nl80211.c */
++
++	__NL80211_ATTR_AFTER_LAST,
++	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
++};
++
++/**
+  * enum nl80211_iftype - (virtual) interface types
++ *
+  * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
+  * @NL80211_IFTYPE_ADHOC: independent BSS member
+  * @NL80211_IFTYPE_STATION: managed BSS member
+@@ -15,9 +121,10 @@
+  * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
+  * @NL80211_IFTYPE_WDS: wireless distribution interface
+  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
++ * @NL80211_IFTYPE_MAX: highest interface type number currently defined
[...130476 lines suppressed...]
++		return 0;
++
++	return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++}
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++
++
++/**************************************************
++ * Generic and Clientmode operation code.
++ **************************************************/
++
++static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
++{
++	/* Disable PCI interrupts. */
++	ssb_write32(pc->dev, SSB_INTVEC, 0);
++}
++
++void ssb_pcicore_init(struct ssb_pcicore *pc)
++{
++	struct ssb_device *dev = pc->dev;
++	struct ssb_bus *bus;
++
++	if (!dev)
++		return;
++	bus = dev->bus;
++	if (!ssb_device_is_enabled(dev))
++		ssb_device_enable(dev, 0);
++
++#ifdef CONFIG_SSB_PCICORE_HOSTMODE
++	pc->hostmode = pcicore_is_in_hostmode(pc);
++	if (pc->hostmode)
++		ssb_pcicore_init_hostmode(pc);
++#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
++	if (!pc->hostmode)
++		ssb_pcicore_init_clientmode(pc);
++}
++
++static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address)
++{
++	pcicore_write32(pc, 0x130, address);
++	return pcicore_read32(pc, 0x134);
++}
++
++static void ssb_pcie_write(struct ssb_pcicore *pc, u32 address, u32 data)
++{
++	pcicore_write32(pc, 0x130, address);
++	pcicore_write32(pc, 0x134, data);
++}
++
++static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
++				u8 address, u16 data)
++{
++	const u16 mdio_control = 0x128;
++	const u16 mdio_data = 0x12C;
++	u32 v;
++	int i;
++
++	v = 0x80; /* Enable Preamble Sequence */
++	v |= 0x2; /* MDIO Clock Divisor */
++	pcicore_write32(pc, mdio_control, v);
++
++	v = (1 << 30); /* Start of Transaction */
++	v |= (1 << 28); /* Write Transaction */
++	v |= (1 << 17); /* Turnaround */
++	v |= (u32)device << 22;
++	v |= (u32)address << 18;
++	v |= data;
++	pcicore_write32(pc, mdio_data, v);
++	/* Wait for the device to complete the transaction */
++	udelay(10);
++	for (i = 0; i < 10; i++) {
++		v = pcicore_read32(pc, mdio_control);
++		if (v & 0x100 /* Trans complete */)
++			break;
++		msleep(1);
++	}
++	pcicore_write32(pc, mdio_control, 0);
++}
++
++static void ssb_broadcast_value(struct ssb_device *dev,
++				u32 address, u32 data)
++{
++	/* This is used for both, PCI and ChipCommon core, so be careful. */
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
++	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
++
++	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
++	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
++	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
++	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
++}
++
++static void ssb_commit_settings(struct ssb_bus *bus)
++{
++	struct ssb_device *dev;
++
++	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
++	if (WARN_ON(!dev))
++		return;
++	/* This forces an update of the cached registers. */
++	ssb_broadcast_value(dev, 0xFD8, 0);
++}
++
++int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
++				   struct ssb_device *dev)
++{
++	struct ssb_device *pdev = pc->dev;
++	struct ssb_bus *bus;
++	int err = 0;
++	u32 tmp;
++
++	might_sleep();
++
++	if (!pdev)
++		goto out;
++	bus = pdev->bus;
++
++	/* Enable interrupts for this device. */
++	if (bus->host_pci &&
++	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++		u32 coremask;
++
++		/* Calculate the "coremask" for the device. */
++		coremask = (1 << dev->core_index);
++
++		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
++		if (err)
++			goto out;
++		tmp |= coremask << 8;
++		err = pci_write_config_dword(bus->host_pci, SSB_PCI_IRQMASK, tmp);
++		if (err)
++			goto out;
++	} else {
++		u32 intvec;
++
++		intvec = ssb_read32(pdev, SSB_INTVEC);
++		if ((bus->chip_id & 0xFF00) == 0x4400) {
++			/* Workaround: On the BCM44XX the BPFLAG routing
++			 * bit is wrong. Use a hardcoded constant. */
++			intvec |= 0x00000002;
++		} else {
++			tmp = ssb_read32(dev, SSB_TPSFLAG);
++			tmp &= SSB_TPSFLAG_BPFLAG;
++			intvec |= tmp;
++		}
++		ssb_write32(pdev, SSB_INTVEC, intvec);
++	}
++
++	/* Setup PCIcore operation. */
++	if (pc->setup_done)
++		goto out;
++	if (pdev->id.coreid == SSB_DEV_PCI) {
++		tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++		tmp |= SSB_PCICORE_SBTOPCI_PREF;
++		tmp |= SSB_PCICORE_SBTOPCI_BURST;
++		pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++
++		if (pdev->id.revision < 5) {
++			tmp = ssb_read32(pdev, SSB_IMCFGLO);
++			tmp &= ~SSB_IMCFGLO_SERTO;
++			tmp |= 2;
++			tmp &= ~SSB_IMCFGLO_REQTO;
++			tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
++			ssb_write32(pdev, SSB_IMCFGLO, tmp);
++			ssb_commit_settings(bus);
++		} else if (pdev->id.revision >= 11) {
++			tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++			tmp |= SSB_PCICORE_SBTOPCI_MRM;
++			pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++		}
++	} else {
++		WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
++		//TODO: Better make defines for all these magic PCIE values.
++		if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
++			/* TLP Workaround register. */
++			tmp = ssb_pcie_read(pc, 0x4);
++			tmp |= 0x8;
++			ssb_pcie_write(pc, 0x4, tmp);
++		}
++		if (pdev->id.revision == 0) {
++			const u8 serdes_rx_device = 0x1F;
++
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    2 /* Timer */, 0x8128);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    6 /* CDR */, 0x0100);
++			ssb_pcie_mdio_write(pc, serdes_rx_device,
++					    7 /* CDR BW */, 0x1466);
++		} else if (pdev->id.revision == 1) {
++			/* DLLP Link Control register. */
++			tmp = ssb_pcie_read(pc, 0x100);
++			tmp |= 0x40;
++			ssb_pcie_write(pc, 0x100, tmp);
++		}
++	}
++	pc->setup_done = 1;
++out:
++	return err;
++}
++EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-wireless.patch	26 Sep 2007 18:58:34 -0000	1.11
+++ linux-2.6-wireless.patch	27 Sep 2007 15:33:19 -0000	1.12
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
 --- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -227,6 +227,17 @@ struct ieee80211_cts {
  #define WLAN_CAPABILITY_SHORT_SLOT_TIME	(1<<10)
  #define WLAN_CAPABILITY_DSSS_OFDM	(1<<13)
@@ -21,7 +21,7 @@
  	WLAN_STATUS_SUCCESS = 0,
 diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
 --- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -11,6 +11,44 @@
   * Copyright 2006 Johannes Berg <johannes at sipsolutions.net>
   */
@@ -69,7 +69,7 @@
  
 diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
 --- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-09-27 10:50:46.000000000 -0400
 @@ -347,9 +347,16 @@ enum ieee80211_if_types {
   * @mac_addr: pointer to MAC address of the interface. This pointer is valid
   *	until the interface is removed (i.e. it cannot be used after
@@ -118,7 +118,7 @@
   * headers). If the data in the sk_buff is too short to contain a valid 802.11
 diff -up linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c
 --- linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/ieee80211_wx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(st
  	}
  
@@ -137,24 +137,104 @@
  
  	/* Add encryption capability */
 diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c
---- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-18 10:09:24.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-18 10:10:25.000000000 -0400
-@@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c.orig	2007-09-27 10:46:59.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-09-27 10:53:45.000000000 -0400
+@@ -271,8 +271,9 @@ ieee80211softmac_assoc_work(struct work_
  			 */
  			dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
  			ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
 -			if (ieee80211softmac_start_scan(mac))
 +			if (ieee80211softmac_start_scan(mac)) {
  				dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
-+				mac->associnfo.associating = 0;
-+				mac->associnfo.associated = 0;
 +			}
  			goto out;
  		} else {
  			mac->associnfo.associating = 0;
+diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c
+--- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2007-09-27 10:46:57.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2007-09-27 10:53:45.000000000 -0400
+@@ -70,44 +70,30 @@ ieee80211softmac_wx_set_essid(struct net
+ 			      char *extra)
+ {
+ 	struct ieee80211softmac_device *sm = ieee80211_priv(net_dev);
+-	struct ieee80211softmac_network *n;
+ 	struct ieee80211softmac_auth_queue_item *authptr;
+ 	int length = 0;
+ 
+ check_assoc_again:
+ 	mutex_lock(&sm->associnfo.mutex);
+-	/* Check if we're already associating to this or another network
+-	 * If it's another network, cancel and start over with our new network
+-	 * If it's our network, ignore the change, we're already doing it!
+-	 */
+ 	if((sm->associnfo.associating || sm->associnfo.associated) &&
+ 	   (data->essid.flags && data->essid.length)) {
+-		/* Get the associating network */
+-		n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid);
+-		if(n && n->essid.len == data->essid.length &&
+-		   !memcmp(n->essid.data, extra, n->essid.len)) {
+-			dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n",
+-				MAC_ARG(sm->associnfo.bssid));
+-			goto out;
+-		} else {
+-			dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
+-			/* Cancel assoc work */
+-			cancel_delayed_work(&sm->associnfo.work);
+-			/* We don't have to do this, but it's a little cleaner */
+-			list_for_each_entry(authptr, &sm->auth_queue, list)
+-				cancel_delayed_work(&authptr->work);
+-			sm->associnfo.bssvalid = 0;
+-			sm->associnfo.bssfixed = 0;
+-			sm->associnfo.associating = 0;
+-			sm->associnfo.associated = 0;
+-			/* We must unlock to avoid deadlocks with the assoc workqueue
+-			 * on the associnfo.mutex */
+-			mutex_unlock(&sm->associnfo.mutex);
+-			flush_scheduled_work();
+-			/* Avoid race! Check assoc status again. Maybe someone started an
+-			 * association while we flushed. */
+-			goto check_assoc_again;
+-		}
++		dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
++		/* Cancel assoc work */
++		cancel_delayed_work(&sm->associnfo.work);
++		/* We don't have to do this, but it's a little cleaner */
++		list_for_each_entry(authptr, &sm->auth_queue, list)
++			cancel_delayed_work(&authptr->work);
++		sm->associnfo.bssvalid = 0;
++		sm->associnfo.bssfixed = 0;
++		sm->associnfo.associating = 0;
++		sm->associnfo.associated = 0;
++		/* We must unlock to avoid deadlocks with the assoc workqueue
++		 * on the associnfo.mutex */
++		mutex_unlock(&sm->associnfo.mutex);
++		flush_scheduled_work();
++		/* Avoid race! Check assoc status again. Maybe someone started an
++		 * association while we flushed. */
++		goto check_assoc_again;
+ 	}
+ 
+ 	sm->associnfo.static_essid = 0;
+@@ -153,13 +139,13 @@ ieee80211softmac_wx_get_essid(struct net
+ 		data->essid.length = sm->associnfo.req_essid.len;
+ 		data->essid.flags = 1;  /* active */
+ 		memcpy(extra, sm->associnfo.req_essid.data, sm->associnfo.req_essid.len);
+-	}
+-
++		dprintk(KERN_INFO PFX "Getting essid from req_essid\n");
++	} else if (sm->associnfo.associated || sm->associnfo.associating) {
+ 	/* If we're associating/associated, return that */
+-	if (sm->associnfo.associated || sm->associnfo.associating) {
+ 		data->essid.length = sm->associnfo.associate_essid.len;
+ 		data->essid.flags = 1;  /* active */
+ 		memcpy(extra, sm->associnfo.associate_essid.data, sm->associnfo.associate_essid.len);
++		dprintk(KERN_INFO PFX "Getting essid from associate_essid\n");
+ 	}
+ 	mutex_unlock(&sm->associnfo.mutex);
+ 
 diff -up linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c
 --- linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/ieee80211/softmac/ieee80211softmac_module.c	2007-09-27 10:50:46.000000000 -0400
 @@ -456,18 +456,13 @@ void
  ieee80211softmac_add_network_locked(struct ieee80211softmac_device *mac,
  	struct ieee80211softmac_network *add_net)
@@ -216,7 +296,7 @@
  			return softmac_net;
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-09-27 10:50:46.000000000 -0400
 @@ -157,6 +157,8 @@ void ieee80211_if_set_type(struct net_de
  	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
  	int oldtype = sdata->type;
@@ -236,7 +316,7 @@
  		printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -27,20 +27,6 @@
  #include "aes_ccm.h"
  #include "debugfs_key.h"
@@ -749,7 +829,7 @@
  	(iw_handler) ieee80211_ioctl_siwfrag,		/* SIOCSIWFRAG */
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_rate.c	2007-09-27 10:50:46.000000000 -0400
 @@ -24,11 +24,10 @@ int ieee80211_rate_control_register(stru
  {
  	struct rate_control_alg *alg;
@@ -765,7 +845,7 @@
  	mutex_lock(&rate_ctrl_mutex);
 diff -up linux-2.6.22.noarch/net/mac80211/Makefile.orig linux-2.6.22.noarch/net/mac80211/Makefile
 --- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -13,6 +13,7 @@ mac80211-objs := \
  	ieee80211_iface.o \
  	ieee80211_rate.o \
@@ -775,8 +855,8 @@
  	aes_ccm.o \
  	wme.o \
 diff -up /dev/null linux-2.6.22.noarch/net/mac80211/regdomain.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/net/mac80211/regdomain.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,158 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -938,7 +1018,7 @@
 +
 diff -up linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h
 --- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-09-27 10:50:46.000000000 -0400
 @@ -26,24 +26,16 @@
   * mess shall be deleted completely. */
  enum {
@@ -966,7 +1046,7 @@
  	PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_common.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_common.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_common.h	2007-09-27 10:50:46.000000000 -0400
 @@ -47,21 +47,16 @@ enum ieee80211_msg_type {
  	ieee80211_msg_normal = 0,
  	ieee80211_msg_tx_callback_ack = 1,
@@ -993,7 +1073,7 @@
  	char ifname[IFNAMSIZ];
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-09-27 10:50:46.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <linux/compiler.h>
  #include <linux/bitmap.h>
@@ -1688,7 +1768,7 @@
  MODULE_DESCRIPTION("IEEE 802.11 subsystem");
 diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
 --- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-09-27 10:50:46.000000000 -0400
 @@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
  		skb_queue_head_init(&q->requeued[i]);
  		q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
@@ -1700,7 +1780,7 @@
  		}
 diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
 --- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c	2007-09-27 10:50:46.000000000 -0400
 @@ -187,9 +187,13 @@ static void rate_control_simple_tx_statu
  		}
  #endif
@@ -1750,7 +1830,7 @@
  MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.22.noarch/net/mac80211/ieee80211_i.h
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-09-27 10:50:46.000000000 -0400
 @@ -99,6 +99,12 @@ struct ieee80211_sta_bss {
  	int probe_resp;
  	unsigned long last_update;
@@ -1835,7 +1915,7 @@
  
 diff -up linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-09-27 10:50:46.000000000 -0400
 @@ -25,7 +25,6 @@
  #include <linux/wireless.h>
  #include <linux/random.h>
@@ -2075,7 +2155,7 @@
  
 diff -up linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c
 --- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-09-27 10:50:46.000000000 -0400
 @@ -118,7 +118,7 @@ static ssize_t ieee80211_if_fmt_flags(
  			 sdata->u.sta.authenticated ? "AUTH\n" : "",
  			 sdata->u.sta.associated ? "ASSOC\n" : "",
@@ -2126,7 +2206,7 @@
  }
 diff -up linux-2.6.22.noarch/net/wireless/Makefile.orig linux-2.6.22.noarch/net/wireless/Makefile
 --- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -1,4 +1,4 @@
  obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -2134,8 +2214,8 @@
 -cfg80211-y += core.o sysfs.o
 +cfg80211-y += core.o sysfs.o radiotap.o
 diff -up /dev/null linux-2.6.22.noarch/net/wireless/radiotap.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/net/wireless/radiotap.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,257 @@
 +/*
 + * Radiotap parser
@@ -2396,7 +2476,7 @@
 +EXPORT_SYMBOL(ieee80211_radiotap_iterator_next);
 diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
 --- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-09-27 10:50:46.000000000 -0400
 @@ -213,7 +213,7 @@ out_fail_notifier:
  out_fail_sysfs:
  	return err;
@@ -2408,7 +2488,7 @@
  {
 diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
 --- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-18 10:11:06.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
  	cfg80211_dev_free(rdev);
  }
@@ -2426,7 +2506,7 @@
  	.name = "ieee80211",
 diff -up linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig linux-2.6.22.noarch/drivers/net/wireless/airo.c
 --- linux-2.6.22.noarch/drivers/net/wireless/airo.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/airo.c	2007-09-27 10:50:46.000000000 -0400
 @@ -52,6 +52,8 @@
  
  #include "airo.h"
@@ -3044,7 +3124,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.c	2007-09-27 10:50:46.000000000 -0400
 @@ -49,8 +49,9 @@ void zd_chip_clear(struct zd_chip *chip)
  	ZD_MEMCLEAR(chip, sizeof(*chip));
  }
@@ -3227,7 +3307,7 @@
  	ZD_ASSERT(mutex_is_locked(&chip->mutex));
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Makefile	2007-09-27 10:50:46.000000000 -0400
 @@ -3,7 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o
  zd1211rw-objs := zd_chip.o zd_ieee80211.o \
  		zd_mac.o zd_netdev.o \
@@ -3239,7 +3319,7 @@
  ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.h	2007-09-27 10:50:46.000000000 -0400
 @@ -26,7 +26,7 @@
  #define AL2210_RF			0x7
  #define MAXIM_NEW_RF			0x8
@@ -3303,7 +3383,7 @@
  #endif /* _ZD_RF_H */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_chip.h	2007-09-27 10:50:46.000000000 -0400
 @@ -608,6 +608,9 @@ enum {
  #define CR_ZD1211B_TXOP			CTL_REG(0x0b20)
  #define CR_ZD1211B_RETRY_MAX		CTL_REG(0x0b28)
@@ -3359,7 +3439,7 @@
  int zd_chip_switch_radio_off(struct zd_chip *chip);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al2230.c	2007-09-27 10:50:46.000000000 -0400
 @@ -21,6 +21,8 @@
  #include "zd_usb.h"
  #include "zd_chip.h"
@@ -3423,7 +3503,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c	2007-09-27 10:50:46.000000000 -0400
 @@ -265,7 +265,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -3435,7 +3515,7 @@
  		       " devices\n");
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.h	2007-09-27 10:50:46.000000000 -0400
 @@ -188,6 +188,7 @@ struct zd_usb {
  	struct zd_usb_rx rx;
  	struct zd_usb_tx tx;
@@ -3455,7 +3535,7 @@
  #endif /* _ZD_USB_H */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf.c	2007-09-27 10:50:46.000000000 -0400
 @@ -34,7 +34,7 @@ static const char * const rfs[] = {
  	[AL2210_RF]	= "AL2210_RF",
  	[MAXIM_NEW_RF]	= "MAXIM_NEW_RF",
@@ -3523,8 +3603,8 @@
  
  	r = zd_chip_lock_phy_regs(chip);
 diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -4062,7 +4142,7 @@
 +
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.h	2007-09-27 10:50:46.000000000 -0400
 @@ -189,7 +189,8 @@ int zd_mac_init(struct zd_mac *mac,
  		struct usb_interface *intf);
  void zd_mac_clear(struct zd_mac *mac);
@@ -4075,7 +4155,7 @@
  int zd_mac_stop(struct net_device *netdev);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c	2007-09-27 10:50:46.000000000 -0400
 @@ -473,7 +473,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
  {
  	struct zd_chip *chip = zd_rf_to_chip(rf);
@@ -4095,7 +4175,7 @@
  	rf->switch_radio_off = al7230b_switch_radio_off;
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_usb.c	2007-09-27 10:50:46.000000000 -0400
 @@ -15,7 +15,6 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
   */
@@ -4309,7 +4389,7 @@
  		         "couldn't initialize mac. Error number %d\n", r);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/zd_mac.c	2007-09-27 10:50:46.000000000 -0400
 @@ -86,38 +86,46 @@ out:
  	return r;
  }
@@ -4433,7 +4513,7 @@
  	/*
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/wext.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1719,9 +1719,6 @@ static int wlan_set_encodeext(struct net
  			pkey->type = KEY_TYPE_ID_TKIP;
  		} else if (alg == IW_ENCODE_ALG_CCMP) {
@@ -4446,7 +4526,7 @@
  		/* If WPA isn't enabled yet, do that now */
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/rx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wl
  	ret = 0;
  
@@ -4457,7 +4537,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/main.c	2007-09-27 10:50:46.000000000 -0400
 @@ -613,6 +613,7 @@ static int wlan_service_main_thread(void
  
  	init_waitqueue_entry(&wait, current);
@@ -4468,7 +4548,7 @@
  		       "currenttxskb=%p dnld_sent=%d\n",
 diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c
 --- linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/cmd.c	2007-09-27 10:50:46.000000000 -0400
 @@ -240,7 +240,7 @@ static int wlan_cmd_802_11_enable_rsn(wl
  		if (*enable)
  			penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
@@ -4480,7 +4560,7 @@
  	lbs_deb_leave(LBS_DEB_CMD);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2100.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1768,7 +1768,8 @@ static int ipw2100_up(struct ipw2100_pri
  
  		if (priv->stop_rf_kill) {
@@ -4544,7 +4624,7 @@
  			timeout = timeout_duration[level - 1] / 1000;
 diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/islpci_hotplug.c	2007-09-27 10:50:46.000000000 -0400
 @@ -87,7 +87,6 @@ static struct pci_driver prism54_driver 
  	.remove = prism54_remove,
  	.suspend = prism54_suspend,
@@ -4555,7 +4635,7 @@
  /******************************************************************************
 diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev,
  	islpci_private *priv = netdev_priv(ndev);
  	struct islpci_acl *acl = &priv->acl;
@@ -4631,7 +4711,7 @@
  }
 diff -up linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c
 --- linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ipw2200.c	2007-09-27 10:50:46.000000000 -0400
 @@ -70,7 +70,7 @@
  #define VQ
  #endif
@@ -4715,7 +4795,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -1011,7 +1011,7 @@ static inline void wl3501_md_ind_interru
  	} else {
  		skb->dev = dev;
@@ -4727,7 +4807,7 @@
  		skb->protocol	= eth_type_trans(skb, dev);
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ap.c	2007-09-27 10:50:46.000000000 -0400
 @@ -326,7 +326,6 @@ static int ap_control_proc_read(char *pa
  	char *p = page;
  	struct ap_data *ap = (struct ap_data *) data;
@@ -4854,7 +4934,7 @@
  	}
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_config.h	2007-09-27 10:50:46.000000000 -0400
 @@ -1,8 +1,6 @@
  #ifndef HOSTAP_CONFIG_H
  #define HOSTAP_CONFIG_H
@@ -4866,7 +4946,7 @@
   * configuration. From now on, support for hostapd is always included and it is
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_pci.c	2007-09-27 10:50:46.000000000 -0400
 @@ -20,7 +20,6 @@
  #include "hostap_wlan.h"
  
@@ -4909,7 +4989,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c	2007-09-27 10:50:46.000000000 -0400
 @@ -22,7 +22,6 @@
  #include "hostap_wlan.h"
  
@@ -4943,7 +5023,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_main.c	2007-09-27 10:50:46.000000000 -0400
 @@ -37,7 +37,6 @@
  MODULE_AUTHOR("Jouni Malinen");
  MODULE_DESCRIPTION("Host AP common routines");
@@ -4954,7 +5034,7 @@
  
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c	2007-09-27 10:50:46.000000000 -0400
 @@ -3893,8 +3893,6 @@ static void prism2_get_drvinfo(struct ne
  	local = iface->local;
  
@@ -4966,7 +5046,7 @@
  		 (local->sta_fw_ver >> 8) & 0xff,
 diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c
 --- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-18 10:10:25.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_plx.c	2007-09-27 10:50:46.000000000 -0400
 @@ -23,7 +23,6 @@
  #include "hostap_wlan.h"
  
@@ -5010,7 +5090,7 @@
  
 diff -up linux-2.6.22.noarch/fs/compat_ioctl.c.orig linux-2.6.22.noarch/fs/compat_ioctl.c
 --- linux-2.6.22.noarch/fs/compat_ioctl.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-18 10:11:13.000000000 -0400
++++ linux-2.6.22.noarch/fs/compat_ioctl.c	2007-09-27 10:53:45.000000000 -0400
 @@ -2306,8 +2306,10 @@ static int do_wireless_ioctl(unsigned in
  	struct iwreq __user *iwr_u;
  	struct iw_point __user *iwp;
@@ -5056,9 +5136,18 @@
  }
  
  /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
+@@ -3174,6 +3188,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY)
+ COMPATIBLE_IOCTL(SIOCGIWRETRY)
+ COMPATIBLE_IOCTL(SIOCSIWPOWER)
+ COMPATIBLE_IOCTL(SIOCGIWPOWER)
++COMPATIBLE_IOCTL(SIOCSIWAUTH)
++COMPATIBLE_IOCTL(SIOCGIWAUTH)
+ /* hiddev */
+ COMPATIBLE_IOCTL(HIDIOCGVERSION)
+ COMPATIBLE_IOCTL(HIDIOCAPPLICATION)
 diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/Documentation/networking/mac80211-injection.txt	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,59 @@
 +How to use packet injection with mac80211
 +=========================================
@@ -5120,8 +5209,8 @@
 +
 +Andy Green <andy at warmcat.com>
 diff -up /dev/null linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt
---- /dev/null	2007-09-18 08:44:28.563724362 -0400
-+++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-18 10:10:25.000000000 -0400
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/Documentation/networking/radiotap-headers.txt	2007-09-27 10:50:46.000000000 -0400
 @@ -0,0 +1,152 @@
 +How to use radiotap headers
 +===========================


--- git-wireless-dev.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 15:35:38 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 11:35:38 -0400
Subject: rpms/lyx/EL-5 lyx.spec,1.51,1.52
Message-ID: <200709271535.l8RFZcdM013696@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13661

Modified Files:
	lyx.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-3
- epel: drop Requires(hint): wv (until wv is available)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- lyx.spec	12 Sep 2007 15:55:13 -0000	1.51
+++ lyx.spec	27 Sep 2007 15:34:58 -0000	1.52
@@ -6,7 +6,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -51,9 +51,9 @@
 # dvipost adds support for lyx's Document->Change Tracking feature
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
-%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
+%endif
 Requires(hint): xdg-utils
 
 %description
@@ -222,9 +222,12 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-3
+- epel: drop Requires(hint): wv (until wv is available)
+
 * Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
 - License: GPLv2+
-- EPEL: drop aiksaurus support (until aiksaurus is available)
+- epel: drop aiksaurus support (until aiksaurus is available)
 
 * Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
 - lyx-1.4.5.1



From fedora-extras-commits at redhat.com  Thu Sep 27 15:46:33 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:46:33 -0400
Subject: rpms/mugshot/devel .cvsignore, 1.14, 1.15 mugshot.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200709271546.l8RFkX8f014000@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930

Modified Files:
	.cvsignore mugshot.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Sep 2007 21:37:11 -0000	1.14
+++ .cvsignore	27 Sep 2007 15:45:59 -0000	1.15
@@ -1 +1 @@
-mugshot-1.1.54.tar.gz
+mugshot-1.1.55.tar.gz


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/mugshot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mugshot.spec	20 Sep 2007 21:37:11 -0000	1.22
+++ mugshot.spec	27 Sep 2007 15:45:59 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.54
+Version:        1.1.55
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 1.1.55-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Sep 2007 21:37:11 -0000	1.15
+++ sources	27 Sep 2007 15:45:59 -0000	1.16
@@ -1 +1 @@
-fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz
+8281a8cbe1ebc7501adaf32f5790b900  mugshot-1.1.55.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:46:36 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:46:36 -0400
Subject: rpms/bigboard/devel .cvsignore,1.28,1.29 sources,1.29,1.30
Message-ID: <200709271546.l8RFka5n014008@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13958

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	21 Sep 2007 16:14:33 -0000	1.28
+++ .cvsignore	27 Sep 2007 15:46:04 -0000	1.29
@@ -1 +1 @@
-bigboard-0.5.18.tar.gz
+bigboard-0.5.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	21 Sep 2007 16:14:33 -0000	1.29
+++ sources	27 Sep 2007 15:46:04 -0000	1.30
@@ -1 +1 @@
-4acfe82aae3056c12809e8f42b87e91f  bigboard-0.5.18.tar.gz
+e162eaefa748b62539282828896ed8b2  bigboard-0.5.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:47:17 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Thu, 27 Sep 2007 11:47:17 -0400
Subject: rpms/online-desktop/devel .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <200709271547.l8RFlH72014065@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13987

Modified Files:
	.cvsignore sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2007 16:09:00 -0000	1.10
+++ .cvsignore	27 Sep 2007 15:46:27 -0000	1.11
@@ -1 +1 @@
-online-desktop-0.2.16.tar.gz
+online-desktop-0.2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Sep 2007 16:09:00 -0000	1.10
+++ sources	27 Sep 2007 15:46:27 -0000	1.11
@@ -1 +1 @@
-f40b27522ead6212aadd28e4e9543395  online-desktop-0.2.16.tar.gz
+a1a052200e2c422053da2fdd0dfda2e1  online-desktop-0.2.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 15:57:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 11:57:38 -0400
Subject: rpms/t1lib/F-7 t1lib-cve-2007-4033.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 t1lib.spec, 1.15,
	1.16 t1lib-5.1.0-destdir.patch, 1.1, NONE
Message-ID: <200709271557.l8RFvci6014371@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14319

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Removed Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
+++ .cvsignore	27 Sep 2007 15:57:05 -0000	1.4
@@ -1 +1 @@
-t1lib-5.1.0.tar.gz
+t1lib-5.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 14:04:18 -0000	1.3
+++ sources	27 Sep 2007 15:57:05 -0000	1.4
@@ -1 +1 @@
-a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz
+b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/F-7/t1lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- t1lib.spec	28 Aug 2007 18:20:35 -0000	1.15
+++ t1lib.spec	27 Sep 2007 15:57:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 


--- t1lib-5.1.0-destdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:00:22 2007
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 27 Sep 2007 12:00:22 -0400
Subject: rpms/repoview/devel .cvsignore, 1.8, 1.9 repoview.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200709271600.l8RG0Ml1014493@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14447

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Upstream 0.6.1, adjust license to GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Aug 2007 16:23:46 -0000	1.8
+++ .cvsignore	27 Sep 2007 15:59:50 -0000	1.9
@@ -1 +1 @@
-repoview-0.6.0.tar.gz
+repoview-0.6.1.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- repoview.spec	6 Aug 2007 16:23:46 -0000	1.8
+++ repoview.spec	27 Sep 2007 15:59:50 -0000	1.9
@@ -1,10 +1,10 @@
 Name:           repoview
-Version:        0.6.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://linux.duke.edu/projects/mini/repoview
 Source0:        http://linux.duke.edu/projects/mini/repoview/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.1-1
+- Upstream 0.6.1
+- Adjust license to GPLv2+
+
 * Thu Jul 19 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.0-1
 - Upstream 0.6.0
 - Drop obsolete patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Aug 2007 16:23:46 -0000	1.8
+++ sources	27 Sep 2007 15:59:50 -0000	1.9
@@ -1 +1 @@
-2513a5be6eccdd303474939e828da79f  repoview-0.6.0.tar.gz
+88edc05aba35e4b2734ad9cc11759438  repoview-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 16:13:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:13:28 -0400
Subject: rpms/t1lib/FC-6 t1lib-cve-2007-4033.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 t1lib.spec, 1.15,
	1.16 t1lib-5.1.0-destdir.patch, 1.1, NONE
Message-ID: <200709271613.l8RGDSaJ021097@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/t1lib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21040

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-cve-2007-4033.patch 
Removed Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
- Apply patch to fix CVE-2007-4033


t1lib-cve-2007-4033.patch:

--- NEW FILE t1lib-cve-2007-4033.patch ---
--- t1lib-5.1.0.orig/lib/t1lib/t1env.c
+++ t1lib-5.1.0/lib/t1lib/t1env.c
@@ -611,6 +611,12 @@
 #endif 
     strcat( pathbuf, DIRECTORY_SEP);
     /* And finally the filename: */
+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
+       let's try next pathbuf */
+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+	i++;
+    	continue;
+    }
     strcat( pathbuf, StrippedName);
     
     /* Check for existence of the path: */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
+++ .cvsignore	27 Sep 2007 16:12:56 -0000	1.4
@@ -1 +1 @@
-t1lib-5.1.0.tar.gz
+t1lib-5.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 14:04:18 -0000	1.3
+++ sources	27 Sep 2007 16:12:56 -0000	1.4
@@ -1 +1 @@
-a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz
+b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1lib/FC-6/t1lib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- t1lib.spec	28 Aug 2007 18:19:56 -0000	1.15
+++ t1lib.spec	27 Sep 2007 16:12:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -12,7 +12,8 @@
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch3:         t1lib-5.0.0-t1libconfig.patch
+Patch4:		t1lib-cve-2007-4033.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -39,7 +40,8 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
+- Apply patch to fix CVE-2007-4033
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.1-2
 - License fix, rebuild for devel (F8).
 


--- t1lib-5.1.0-destdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:21 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 12:16:21 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.5,
	1.6 kernel-2.6.21-x86_64-xen.config, 1.6, 1.7 kernel-xen.spec,
	1.61, 1.62
Message-ID: <200709271616.l8RGGLFo021365@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21167

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Revert last commit

fw-sbp2 module would be useless without fw-ohci. Duh.




Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.21-i686-xen.config	27 Sep 2007 14:39:03 -0000	1.5
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 16:15:49 -0000	1.6
@@ -1315,9 +1315,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:39:03 -0000	1.6
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 16:15:49 -0000	1.7
@@ -1221,9 +1221,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel-xen.spec	27 Sep 2007 14:39:03 -0000	1.61
+++ kernel-xen.spec	27 Sep 2007 16:15:49 -0000	1.62
@@ -2362,10 +2362,6 @@
 #  - tux.
 
 %changelog
-* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
-- Reenabled Firewire but kept fw-ohci disabled (bug #307461).
-  fw-sbp2 should be working
-
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:22 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 12:16:22 -0400
Subject: rpms/kernel-xen-2.6/F-7 kernel-2.6.20-i686-xen.config, 1.6,
	1.7 kernel-2.6.20-x86_64-xen.config, 1.5, 1.6 kernel-xen.spec,
	1.50, 1.51
Message-ID: <200709271616.l8RGGMvn021370@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Revert last commit

fw-sbp2 module would be useless without fw-ohci. Duh.




Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-2.6.20-i686-xen.config	27 Sep 2007 14:24:04 -0000	1.6
+++ kernel-2.6.20-i686-xen.config	27 Sep 2007 16:15:48 -0000	1.7
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-# CONFIG_FW_OHCI is not set
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.20-x86_64-xen.config	27 Sep 2007 14:24:04 -0000	1.5
+++ kernel-2.6.20-x86_64-xen.config	27 Sep 2007 16:15:48 -0000	1.6
@@ -583,9 +583,7 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-# CONFIG_FW_OHCI is not set
-CONFIG_FW_SBP2=m
+# CONFIG_FW is not set
 
 #
 # IEEE 1394 (FireWire) support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	27 Sep 2007 14:24:04 -0000	1.50
+++ kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
@@ -2072,10 +2072,6 @@
 #  - tux.
 
 %changelog
-* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
-- Reenable Firewire but disable fw-ohci module. sbp2 module
-  should be working (bug #302471)
-
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 16:16:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:16:35 -0400
Subject: rpms/grace/devel grace.spec,1.16,1.17
Message-ID: <200709271616.l8RGGZLx021373@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21345

Modified Files:
	grace.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grace.spec	28 Aug 2007 17:40:39 -0000	1.16
+++ grace.spec	27 Sep 2007 16:16:02 -0000	1.17
@@ -1,6 +1,9 @@
+%define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
+
 Name:           grace
 Version:        5.1.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -28,8 +31,6 @@
 
 Requires:	nedit
 Requires:	htmlview
-Requires(post): chkfontpath
-Requires(postun): chkfontpath
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -129,13 +130,14 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -143,7 +145,6 @@
 
 
 %postun
-%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -163,6 +164,7 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
+%{catalogue}/%{name}-type1
 
 
 %files devel
@@ -175,6 +177,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
+- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:38 -0700
Subject: [pkgdb] aldrin was added for akahl
Message-ID: <200709271625.l8RGPhGF021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aldrin with summary Modular music sequencer/tracker
Kevin Fenzi (kevin) has approved Package aldrin
Kevin Fenzi (kevin) has added a Fedora devel branch for aldrin with an owner of akahl
Kevin Fenzi (kevin) has approved aldrin in Fedora devel
Kevin Fenzi (kevin) has approved Package aldrin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aldrin (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aldrin (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aldrin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:46 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:46 -0700
Subject: [pkgdb] aldrin (Fedora, 7) updated by kevin
Message-ID: <200709271625.l8RGPhGI021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for aldrin
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aldrin (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on aldrin (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:25:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:25:47 -0700
Subject: [pkgdb] aldrin (Fedora, devel) updated by kevin
Message-ID: <200709271625.l8RGPhGL021063@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on aldrin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aldrin



From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:39 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:39 -0400
Subject: rpms/aldrin - New directory
Message-ID: <200709271626.l8RGQd3B021957@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin

Log Message:
Directory /cvs/extras/rpms/aldrin added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:41 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:41 -0400
Subject: rpms/aldrin/devel - New directory
Message-ID: <200709271626.l8RGQfs8021971@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin/devel

Log Message:
Directory /cvs/extras/rpms/aldrin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:44 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:44 -0400
Subject: rpms/aldrin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271626.l8RGQi6t021996@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin

Added Files:
	Makefile import.log 
Log Message:
Setup of module aldrin


--- NEW FILE Makefile ---
# Top level Makefile for module aldrin
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:26:46 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:26:46 -0400
Subject: rpms/aldrin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709271626.l8RGQksY022013@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst21919/rpms/aldrin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aldrin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aldrin
# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $
NAME := aldrin
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:28:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:28:03 -0700
Subject: [pkgdb] scim-python was added for phuang
Message-ID: <200709271628.l8RGS8OP021244@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package scim-python with summary Python wrapper for Smart Common Input Method platform
Kevin Fenzi (kevin) has approved Package scim-python
Kevin Fenzi (kevin) has added a Fedora devel branch for scim-python with an owner of phuang
Kevin Fenzi (kevin) has approved scim-python in Fedora devel
Kevin Fenzi (kevin) has approved Package scim-python
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on scim-python (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on scim-python (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on scim-python (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-python



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:05 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:28:05 -0700
Subject: [pkgdb] scim-python (Fedora, devel) updated by kevin
Message-ID: <200709271628.l8RGSA3d021245@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on scim-python (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/scim-python



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:30 -0400
Subject: rpms/scim-python - New directory
Message-ID: <200709271628.l8RGSUVY022228@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python

Log Message:
Directory /cvs/extras/rpms/scim-python added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:33 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:33 -0400
Subject: rpms/scim-python/devel - New directory
Message-ID: <200709271628.l8RGSX4r022247@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python/devel

Log Message:
Directory /cvs/extras/rpms/scim-python/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:35 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:35 -0400
Subject: rpms/scim-python Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271628.l8RGSZQm022272@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-python


--- NEW FILE Makefile ---
# Top level Makefile for module scim-python
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:28:37 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:28:37 -0400
Subject: rpms/scim-python/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709271628.l8RGSbel022291@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm22196/rpms/scim-python/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-python


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: scim-python
# $Id: Makefile,v 1.1 2007/09/27 16:28:35 kevin Exp $
NAME := scim-python
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:29:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:43 -0700
Subject: [pkgdb] libHX was added for till
Message-ID: <200709271629.l8RGTmVt021413@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package libHX with summary General-purpose library
Kevin Fenzi (kevin) has approved Package libHX
Kevin Fenzi (kevin) has added a Fedora devel branch for libHX with an owner of till
Kevin Fenzi (kevin) has approved libHX in Fedora devel
Kevin Fenzi (kevin) has approved Package libHX
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libHX (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libHX (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libHX (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:29:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:53 -0700
Subject: [pkgdb] libHX (Fedora, devel) updated by kevin
Message-ID: <200709271629.l8RGTwdm021432@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on libHX (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:29:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:29:53 -0700
Subject: [pkgdb] libHX (Fedora, 7) updated by kevin
Message-ID: <200709271629.l8RGTwdp021432@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for libHX
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libHX (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on libHX (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libHX



From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:10 -0400
Subject: rpms/libHX - New directory
Message-ID: <200709271630.l8RGUALL022431@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX

Log Message:
Directory /cvs/extras/rpms/libHX added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:14 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:14 -0400
Subject: rpms/libHX/devel - New directory
Message-ID: <200709271630.l8RGUE2j022452@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX/devel

Log Message:
Directory /cvs/extras/rpms/libHX/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:20 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:20 -0400
Subject: rpms/libHX Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271630.l8RGUKtt022477@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX

Added Files:
	Makefile import.log 
Log Message:
Setup of module libHX


--- NEW FILE Makefile ---
# Top level Makefile for module libHX
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:30:23 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:30:23 -0400
Subject: rpms/libHX/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709271630.l8RGUNFa022493@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv22397/rpms/libHX/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libHX


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libHX
# $Id: Makefile,v 1.1 2007/09/27 16:30:21 kevin Exp $
NAME := libHX
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:31:13 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 12:31:13 -0400
Subject: rpms/tellico/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 tellico.spec, 1.13, 1.14
Message-ID: <200709271631.l8RGVDZL022639@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22589

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
- New upstream version (fixes problem with settings not being saved on Fedora).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Aug 2007 08:53:23 -0000	1.10
+++ .cvsignore	27 Sep 2007 16:30:39 -0000	1.11
@@ -1 +1 @@
-tellico-1.2.13.tar.gz
+tellico-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Aug 2007 08:53:23 -0000	1.10
+++ sources	27 Sep 2007 16:30:39 -0000	1.11
@@ -1 +1 @@
-7c0371d1e2b8e97d62fafb3fd5d79e7e  tellico-1.2.13.tar.gz
+38047e27d482757fae977fa49809a784  tellico-1.2.14.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tellico.spec	27 Aug 2007 15:17:15 -0000	1.13
+++ tellico.spec	27 Sep 2007 16:30:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tellico
-Version:        1.2.13
-Release:        2%{?dist}
+Version:        1.2.14
+Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -47,7 +47,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure --disable-rpath
 make %{?_smp_mflags}
@@ -104,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
+- New upstream version (fixes problem with settings not being saved on Fedora).
+
 * Mon Aug 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.13-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:36 -0700
Subject: [pkgdb] higlayout was added for jwrdegoede
Message-ID: <200709271631.l8RGVfkx021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package higlayout with summary Easy to use and powerful layout manager for Java
Kevin Fenzi (kevin) has approved Package higlayout
Kevin Fenzi (kevin) has added a Fedora devel branch for higlayout with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved higlayout in Fedora devel
Kevin Fenzi (kevin) has approved Package higlayout
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on higlayout (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on higlayout (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on higlayout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:45 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:45 -0700
Subject: [pkgdb] higlayout (Fedora, devel) updated by kevin
Message-ID: <200709271631.l8RGVfl2021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on higlayout (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:45 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:31:45 -0700
Subject: [pkgdb] higlayout (Fedora, 7) updated by kevin
Message-ID: <200709271631.l8RGVfl5021662@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for higlayout
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on higlayout (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on higlayout (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/higlayout



From fedora-extras-commits at redhat.com  Thu Sep 27 16:31:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:31:57 -0400
Subject: rpms/higlayout - New directory
Message-ID: <200709271631.l8RGVvHI022805@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout

Log Message:
Directory /cvs/extras/rpms/higlayout added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:02 -0400
Subject: rpms/higlayout/devel - New directory
Message-ID: <200709271632.l8RGW2W7022830@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout/devel

Log Message:
Directory /cvs/extras/rpms/higlayout/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:05 -0400
Subject: rpms/higlayout Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709271632.l8RGW5WK022855@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout

Added Files:
	Makefile import.log 
Log Message:
Setup of module higlayout


--- NEW FILE Makefile ---
# Top level Makefile for module higlayout
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:32:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 27 Sep 2007 12:32:10 -0400
Subject: rpms/higlayout/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709271632.l8RGWA9Q022871@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp22764/rpms/higlayout/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module higlayout


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: higlayout
# $Id: Makefile,v 1.1 2007/09/27 16:32:08 kevin Exp $
NAME := higlayout
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 fedora-extras-commits at redhat.com  Thu Sep 27 16:33:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:33:16 -0700
Subject: [pkgdb] wavpack (Fedora EPEL, 4) updated by kevin
Message-ID: <200709271633.l8RGXLdd021885@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for wavpack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on wavpack (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on wavpack (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on wavpack (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wavpack



From fedora-extras-commits at redhat.com  Thu Sep 27 16:33:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 09:33:16 -0700
Subject: [pkgdb] wavpack (Fedora EPEL, 5) updated by kevin
Message-ID: <200709271633.l8RGXLdg021885@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for wavpack
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on wavpack (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on wavpack (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on wavpack (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wavpack



From fedora-extras-commits at redhat.com  Thu Sep 27 16:33:52 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 12:33:52 -0400
Subject: rpms/kernel/devel linux-2.6-x86-AMD-c1e-disable-apic-timer.patch,
	NONE, 
	1.1 patch-2.6.23-rc8-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.696,
	1.697 kernel.spec, 1.193, 1.194 linux-2.6-highres-timers.patch,
	1.14, 1.15 sources, 1.657, 1.658 upstream, 1.579,
	1.580 linux-2.6-x86-edd-maxdrive.patch, 1.1,
	NONE linux-2.6-x86-setup-handle-improperly-terminated-E820.patch,
	1.1, NONE patch-2.6.23-rc8-git1.bz2.sign, 1.1, NONE
Message-ID: <200709271633.l8RGXq3Q023230@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22979

Modified Files:
	.cvsignore kernel.spec linux-2.6-highres-timers.patch sources 
	upstream 
Added Files:
	linux-2.6-x86-AMD-c1e-disable-apic-timer.patch 
	patch-2.6.23-rc8-git2.bz2.sign 
Removed Files:
	linux-2.6-x86-edd-maxdrive.patch 
	linux-2.6-x86-setup-handle-improperly-terminated-E820.patch 
	patch-2.6.23-rc8-git1.bz2.sign 
Log Message:
* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc8-git2
- Re-add AMD timer fix removed from upstream
- Fix hotplug CPU (broken by AMD timer patch)


linux-2.6-x86-AMD-c1e-disable-apic-timer.patch:

--- NEW FILE linux-2.6-x86-AMD-c1e-disable-apic-timer.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e66485d747505e9d960b864fc6c37f8b2afafaf0
Commit:     e66485d747505e9d960b864fc6c37f8b2afafaf0
Parent:     3dffec45c2742961dd27f55aba426cb9cf3f0dcd
Author:     Thomas Gleixner <tglx at linutronix.de>
AuthorDate: Tue Sep 25 21:37:01 2007 +0200
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Wed Sep 26 09:22:04 2007 -0700

    x86-64: Disable local APIC timer use on AMD systems with C1E
    
    commit 3556ddfa9284a86a59a9b78fe5894430f6ab4eef titled
    
     [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E
    
    solves a problem with AMD dual core laptops e.g. HP nx6325 (Turion 64
    X2) with C1E enabled:
    
    When both cores go into idle at the same time, then the system switches
    into C1E state, which is basically the same as C3. This stops the local
    apic timer.
    
    This was debugged right after the dyntick merge on i386 and despite the
    patch title it fixes only the 32 bit path.
    
    x86_64 is still missing this fix. It seems that mainline is not really
    affected by this issue, as the PIT is running and keeps jiffies
    incrementing, but that's just waiting for trouble.
    
    -mm suffers from this problem due to the x86_64 high resolution timer
    patches.
    
    This is a quick and dirty port of the i386 code to x86_64.
    
    I spent quite a time with Rafael to debug the -mm / hrt wreckage until
    someone pointed us to this. I really had forgotten that we debugged this
    half a year ago already.
    
    Sigh, is it just me or is there something yelling arch/x86 into my ear?
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Tested-by: Rafael J. Wysocki <rjw at sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 arch/x86_64/kernel/setup.c |   34 ++++++++++++++++++++++++++++++++++
 include/asm-x86_64/apic.h  |    1 +
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index af838f6..32054bf 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define ENABLE_C1E_MASK		0x18000000
+#define CPUID_PROCESSOR_SIGNATURE	1
+#define CPUID_XFAM		0x0ff00000
+#define CPUID_XFAM_K8		0x00000000
+#define CPUID_XFAM_10H		0x00100000
+#define CPUID_XFAM_11H		0x00200000
+#define CPUID_XMOD		0x000f0000
+#define CPUID_XMOD_REV_F	0x00040000
+
+/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
+static __cpuinit int amd_apic_timer_broken(void)
+{
+	u32 lo, hi;
+	u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
+	switch (eax & CPUID_XFAM) {
+	case CPUID_XFAM_K8:
+		if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
+			break;
+	case CPUID_XFAM_10H:
+	case CPUID_XFAM_11H:
+		rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
+		if (lo & ENABLE_C1E_MASK)
+			return 1;
+		break;
+	default:
+		/* err on the side of caution */
+		return 1;
+	}
+	return 0;
+}
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
 	unsigned level;
@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 	/* Family 10 doesn't support C states in MWAIT so don't use it */
 	if (c->x86 == 0x10 && !force_mwait)
 		clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
+
+	if (amd_apic_timer_broken())
+		disable_apic_timer = 1;
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h
index 85125ef..e458020 100644
--- a/include/asm-x86_64/apic.h
+++ b/include/asm-x86_64/apic.h
@@ -20,6 +20,7 @@ extern int apic_verbosity;
 extern int apic_runs_main_timer;
 extern int ioapic_force;
 extern int apic_mapped;
+extern int disable_apic_timer;
 
 /*
  * Define the default level of output to be very little
===================================================================
From: Rafael J. Wysocki <rjw at sisk.pl>

Fix CPU hotplug breakage on HP nx6325 and similar boxes caused by a reference
to disable_apic_timer (labeled as __initdata) from the CPU initialization code.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
 arch/x86_64/kernel/apic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.23-rc8-mm2.orig/arch/x86_64/kernel/apic.c
+++ linux-2.6.23-rc8-mm2/arch/x86_64/kernel/apic.c
@@ -42,7 +42,7 @@
 int apic_runs_main_timer;
 int apic_calibrate_pmtmr __initdata;
 
-int disable_apic_timer __initdata;
+int disable_apic_timer __cpuinitdata;
 
 /* Local APIC timer works in C2? */
 int local_apic_timer_c2_ok;


--- NEW FILE patch-2.6.23-rc8-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBG+1WoyGugalF9Dw4RAvvgAJ9rlXz2/rgvz6IRmKqhvnDRkuvx9gCff4pV
2skby1eGQ/b049BH6kUq/iA=
=ByeV
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- .cvsignore	26 Sep 2007 21:03:40 -0000	1.696
+++ .cvsignore	27 Sep 2007 16:33:17 -0000	1.697
@@ -4,4 +4,4 @@
 kernel-2.6.22
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc8-git1.bz2
+patch-2.6.23-rc8-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kernel.spec	27 Sep 2007 14:37:05 -0000	1.193
+++ kernel.spec	27 Sep 2007 16:33:17 -0000	1.194
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -555,6 +555,7 @@
 
 %if !%{nopatches}
 
+Patch18: linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
 Patch19: linux-2.6-highres-timers.patch
 
 Patch21: linux-2.6-utrace-tracehook.patch
@@ -674,9 +675,6 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-Patch1600: linux-2.6-x86-edd-maxdrive.patch
-Patch1610: linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
-
 #nouveau
 Patch1800: drm-mm-git.patch
 Patch1801: nouveau-drm.patch
@@ -968,6 +966,8 @@
 
 %if !%{nopatches}
 
+# fix timer with AMD chips supporting C1e
+ApplyPatch linux-2.6-x86-AMD-c1e-disable-apic-timer.patch
 # patch-2.6.23-rc3-hrt2.patch
 ApplyPatch linux-2.6-highres-timers.patch
 
@@ -1218,12 +1218,6 @@
 
 # ---------- below all scheduled for 2.6.23 -----------------
 
-# EDD fix
-ApplyPatch linux-2.6-x86-edd-maxdrive.patch
-
-# e820 bugfix
-ApplyPatch linux-2.6-x86-setup-handle-improperly-terminated-E820.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1815,6 +1809,11 @@
 
 
 %changelog
+* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23-rc8-git2
+- Re-add AMD timer fix removed from upstream
+- Fix hotplug CPU (broken by AMD timer patch)
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - Fix-up botched wireless patch restructuring...
 

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-highres-timers.patch	26 Sep 2007 21:26:15 -0000	1.14
+++ linux-2.6-highres-timers.patch	27 Sep 2007 16:33:17 -0000	1.15
@@ -5306,10 +5306,10 @@
 -int apic_runs_main_timer;
 -int apic_calibrate_pmtmr __initdata;
 -
--int disable_apic_timer __initdata;
+-int disable_apic_timer __cpuinitdata;
 +static int apic_mapped;
 +static int apic_calibrate_pmtmr __initdata;
-+int disable_apic_timer __initdata;
++int disable_apic_timer __cpuinitdata;
  
  /* Local APIC timer works in C2? */
  int local_apic_timer_c2_ok;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -r1.657 -r1.658
--- sources	26 Sep 2007 21:03:40 -0000	1.657
+++ sources	27 Sep 2007 16:33:17 -0000	1.658
@@ -1,3 +1,3 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
 114ebb5499bbaa352c8ed51faa0a1ba1  patch-2.6.23-rc8.bz2
-22a7616e220e358cee563d6626fe50df  patch-2.6.23-rc8-git1.bz2
+30b939f6baea2e0d842a323cc7bdcbfe  patch-2.6.23-rc8-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- upstream	26 Sep 2007 21:03:40 -0000	1.579
+++ upstream	27 Sep 2007 16:33:17 -0000	1.580
@@ -1,3 +1,3 @@
 linux-2.6.22.tar.bz2
 patch-2.6.23-rc8.bz2
-patch-2.6.23-rc8-git1.bz2
+patch-2.6.23-rc8-git2.bz2


--- linux-2.6-x86-edd-maxdrive.patch DELETED ---


--- linux-2.6-x86-setup-handle-improperly-terminated-E820.patch DELETED ---


--- patch-2.6.23-rc8-git1.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:35:54 2007
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Thu, 27 Sep 2007 12:35:54 -0400
Subject: rpms/libHX/devel libHX.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709271635.l8RGZsJ2023306@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23253/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libHX.spec 
Log Message:
initial upload



--- NEW FILE libHX.spec ---
Name:           libHX
Version:        1.10.1
Release:        2%{?dist}
Summary:        General-purpose library

Group:          System Environment/Libraries
License:        LGPLv2 or LGPLv3
URL:            http://jengelh.hopto.org/f/libHX/
Source0:        http://jengelh.hopto.org/f/libHX/libHX-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl gcc-c++


%description
A library for:
- A+R/B trees to use for lists or maps (associative arrays)
- Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs))
- platform independent opendir-style directory access
- platform independent dlopen-style shared library access
- auto-storage strings with direct access
- command line option (argv) parser
- shell-style config file parser
- platform independent random number generator with transparent
  /dev/urandom support
- various string, memory and zvec ops


%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
cp -a t examples


%build
%configure --disable-static
make %{?_smp_mflags}
rm examples/Makefile*

%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 LICENSE.LGPL2 LICENSE.LGPL3 LICENSE.GPL3
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/* examples
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libHX.pc


%changelog
* Thu Sep 27 2007 Till Maas <opensource till name> - 1.10.1-2
- add tests as examples to devel documentation

* Wed Sep 26 2007 Till Maas <opensource till name> - 1.10.1-1
- initial spec for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:30:21 -0000	1.1
+++ .cvsignore	27 Sep 2007 16:35:21 -0000	1.2
@@ -0,0 +1 @@
+libHX-1.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:30:21 -0000	1.1
+++ sources	27 Sep 2007 16:35:21 -0000	1.2
@@ -0,0 +1 @@
+ae2c7ac182a03e589fd45a7867177a0a  libHX-1.10.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 16:38:59 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Thu, 27 Sep 2007 12:38:59 -0400
Subject: rpms/straw/F-7 Makefile, 1.3, 1.4 sources, 1.3, 1.4 straw.spec, 1.8,
	1.9 dead.package, 1.1, NONE
Message-ID: <200709271639.l8RGcx1a023465@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/straw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23428/F-7

Added Files:
	Makefile sources straw.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	27 Sep 2007 16:38:26 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: straw
+# $Id$
+NAME := straw
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	27 Sep 2007 16:38:26 -0000	1.4
@@ -0,0 +1 @@
+5c64c65158dab096e2077e4f91412b37  straw-0.27.tar.gz


Index: straw.spec
===================================================================
RCS file: straw.spec
diff -N straw.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ straw.spec	27 Sep 2007 16:38:26 -0000	1.9
@@ -0,0 +1,123 @@
+%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+
+%define desktop_vendor fedora
+
+Summary:        Desktop news aggregator
+Name:           straw
+Version:        0.27
+Release:        9%{?dist}
+License:        GPLv2+
+Group:          Applications/Internet
+URL:            http://www.gnome.org/projects/straw/
+Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: python >= 2.4
+# fix for python >= 2.5
+%if "%{?fedora}" > "6"
+BuildRequires: python-devel
+%endif
+Requires: gnome-python2-gnomevfs
+Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-libegg
+Requires: gnome-python2-gconf
+Requires: pygtk2-libglade
+Requires: mx
+# Current python-adns makes double free problem (bug 292821)
+Conflicts:python-adns
+Requires: dbus-python
+
+Requires(pre): GConf2
+Requires(post):GConf2
+Requires(preun):GConf2
+
+BuildRequires: dbus-python
+BuildRequires: pygtk2-libglade
+BuildRequires: pygtk2 >= 2.8.0
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-python2-gconf
+BuildRequires: intltool
+
+BuildArch: noarch
+
+%description
+Straw is a desktop news aggregator for the GNOME environment. Its aim
+is to be a faster, easier and more accessible way to read news and
+blogs than the traditional browser.
+
+%prep
+%setup -q
+
+%build
+%{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"
+
+# this is a fix for constants.py to lookup in install dir rather than buildroot
+sed -i -e s@${RPM_BUILD_ROOT}@@ ${RPM_BUILD_ROOT}%{python_sitelib}/%{name}/constants.py
+
+%{__python} -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT%{python_sitelib}/%{name}'")'
+
+%find_lang %{name}
+
+%{__install} -Dp -m0644 data/%{name}.schemas %{buildroot}%{_sysconfdir}/gconf/schemas/%{name}.schemas
+
+desktop-file-install --vendor %{desktop_vendor} --delete-original \
+                     --dir %{buildroot}%{_datadir}/applications    \
+                     %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%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 %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%{_sysconfdir}/gconf/schemas/straw.schemas
+%doc LICENSE NEWS README TODO ChangeLog AUTHORS
+%{_bindir}/%{name}
+%{python_sitelib}/straw/
+%{_datadir}/straw/
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+
+
+%changelog
+* Sun Sep 23 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-9
+- Fixed dependecies related to pygtk
+* Fri Sep 21 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-8
+- Fixed dependencies related to gnome-python2
+* Mon Sep 17 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-7
+- Fixed redundant dependencies 
+* Sun Sep 16 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-6
+- Fixed usage Gconf.Straw does not support python-adns anymore.
+- So removed it. Fixed Spec file indentation warning.
+* Thu Sep 14 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-5
+- Fixed few major errors and dependencies
+* Tue Sep 11 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-4
+- Fixed failed dependencies
+* Mon Sep 10 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-3
+- Fixed few errors 
+* Sun Sep 9  2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-2
+- Some dependencies fixed 
+* Tue Aug 27 2007 Subhodip Biswas <440volt.tux at gmail.com> - 0.27-1
+- Updated to 0.27


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 16:39:53 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 12:39:53 -0400
Subject: rpms/gdm/devel gdm-2.19.1-security-tokens.patch, 1.6, 1.7 gdm.spec, 
	1.290, 1.291
Message-ID: <200709271639.l8RGdraw023529@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466

Modified Files:
	gdm-2.19.1-security-tokens.patch gdm.spec 
Log Message:
- Fix an apparent typo in the securitytokens.conf config file
  (bug 301031)


gdm-2.19.1-security-tokens.patch:

Index: gdm-2.19.1-security-tokens.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.19.1-security-tokens.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdm-2.19.1-security-tokens.patch	21 May 2007 20:11:54 -0000	1.6
+++ gdm-2.19.1-security-tokens.patch	27 Sep 2007 16:39:14 -0000	1.7
@@ -21,7 +21,7 @@
 +++ gdm-2.19.1/config/securitytokens.conf.in	2007-05-21 16:04:51.000000000 -0400
 @@ -0,0 +1,3 @@
 +[SecurityTokens]
-+Enable=true
++Enabled=true
 +#Driver=@libdir@/pkcs11/libcoolkeypk11.so
 --- gdm-2.19.1/config/Makefile.am.security-tokens	2007-05-13 22:08:25.000000000 -0400
 +++ gdm-2.19.1/config/Makefile.am	2007-05-21 16:04:51.000000000 -0400


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- gdm.spec	20 Sep 2007 18:31:17 -0000	1.290
+++ gdm.spec	27 Sep 2007 16:39:14 -0000	1.291
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-5
+- Fix an apparent typo in the securitytokens.conf config file
+  (bug 301031)
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-4
 - Reenable root login due to popular demand
 



From fedora-extras-commits at redhat.com  Thu Sep 27 16:45:41 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:45:41 -0400
Subject: CVSROOT loginfo,1.12,1.13
Message-ID: <200709271645.l8RGjfxh023823@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	loginfo 
Log Message:
Added loginfo for #162


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- loginfo	4 Jan 2006 20:37:13 -0000	1.12
+++ loginfo	27 Sep 2007 16:45:38 -0000	1.13
@@ -32,3 +32,4 @@
 DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org
+fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 27 16:46:16 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:46:16 -0400
Subject: CVSROOT avail,1.48,1.49
Message-ID: <200709271646.l8RGkGs0023855@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	avail 
Log Message:
Granting permissions


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- avail	9 Aug 2007 15:35:22 -0000	1.48
+++ avail	27 Sep 2007 16:46:14 -0000	1.49
@@ -13,7 +13,7 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers | CVSROOT
+avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers,mmcgrath | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
 avail | kwade | CVSROOT/avail



From fedora-extras-commits at redhat.com  Thu Sep 27 16:54:29 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 12:54:29 -0400
Subject: CVSROOT loginfo,1.13,1.14
Message-ID: <200709271654.l8RGsTEY024235@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/home/fedora/mmcgrath/CVSROOT

Modified Files:
	loginfo 
Log Message:
Added the ^


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- loginfo	27 Sep 2007 16:45:38 -0000	1.13
+++ loginfo	27 Sep 2007 16:54:26 -0000	1.14
@@ -29,7 +29,7 @@
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
 ^idweb $CVSROOT/CVSROOT/syncmail %{sVv} cvs-sysadmin at fedora.redhat.com
 ^web $CVSROOT/CVSROOT/syncmail %{sVv} cvs-web at fedora.redhat.com
+^fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com
 DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org
-fedora-security $CVSROOT/CVSROOT/syncmail %{sVv} fedora-security-commits at redhat.com



From fedora-extras-commits at redhat.com  Thu Sep 27 17:20:59 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 13:20:59 -0400
Subject: rpms/gdm/devel gdm-2.19.1-security-tokens.patch, 1.7, 1.8 gdm.spec, 
	1.291, 1.292
Message-ID: <200709271720.l8RHKxTi003992@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3585

Modified Files:
	gdm-2.19.1-security-tokens.patch gdm.spec 
Log Message:
- The previously mentioned typo didn't matter before because the
  compiled in default matched what the config file was supposed to
  say.  This commit restores matched default behavior (bug 301031)


gdm-2.19.1-security-tokens.patch:

Index: gdm-2.19.1-security-tokens.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.19.1-security-tokens.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdm-2.19.1-security-tokens.patch	27 Sep 2007 16:39:14 -0000	1.7
+++ gdm-2.19.1-security-tokens.patch	27 Sep 2007 17:20:23 -0000	1.8
@@ -189,7 +189,7 @@
 +        goto out;
 +    }
 +
-+    if (!g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
++    if (g_key_file_has_key (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL) && !g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
 +
 +          gdm_debug ("security token support is not enabled");
 +          goto out;


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- gdm.spec	27 Sep 2007 16:39:14 -0000	1.291
+++ gdm.spec	27 Sep 2007 17:20:23 -0000	1.292
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,11 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-6
+- The previously mentioned typo didn't matter before because the
+  compiled in default matched what the config file was supposed to
+  say.  This commit restores matched default behavior (bug 301031)
+
 * Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-5
 - Fix an apparent typo in the securitytokens.conf config file
   (bug 301031)



From fedora-extras-commits at redhat.com  Thu Sep 27 17:28:03 2007
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 27 Sep 2007 13:28:03 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.157, 1.158 mkinitrd.spec, 1.222, 
	1.223 sources, 1.200, 1.201
Message-ID: <200709271728.l8RHS3ec005428@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5406

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	25 Sep 2007 13:33:41 -0000	1.157
+++ .cvsignore	27 Sep 2007 17:27:31 -0000	1.158
@@ -1 +1 @@
-mkinitrd-6.0.18.tar.bz2
+mkinitrd-6.0.19.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- mkinitrd.spec	25 Sep 2007 13:33:41 -0000	1.222
+++ mkinitrd.spec	27 Sep 2007 17:27:31 -0000	1.223
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.18
+Version: 6.0.19
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Thu Sep 27 2007 Peter Jones <pjones at redhat.com> - 6.0.19-1
+- Fix nosegneg library discovery in get_dso_deps() harder (#244730)
+
 * Tue Sep 25 2007 Peter Jones <pjones at redhat.com> - 6.0.18-1
 - Fix segfault on x86_64 paravirt (#304731, patch from Harald Hoyer)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- sources	25 Sep 2007 13:33:41 -0000	1.200
+++ sources	27 Sep 2007 17:27:31 -0000	1.201
@@ -1 +1 @@
-28d075b5b918ebf32ac5517606d38a22  mkinitrd-6.0.18.tar.bz2
+92161ee7487052b9c1796f61014a47a0  mkinitrd-6.0.19.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 17:55:49 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 13:55:49 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.131,
	1.132 libselinux.spec, 1.289, 1.290
Message-ID: <200709271755.l8RHtnNB006882@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6662

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
- Fix segfault on missing file_context file


libselinux-rhat.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.131 -r 1.132 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libselinux-rhat.patch	27 Sep 2007 14:54:10 -0000	1.131
+++ libselinux-rhat.patch	27 Sep 2007 17:55:13 -0000	1.132
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.34/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.35/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
-+++ libselinux-2.0.34/src/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
++++ libselinux-2.0.35/src/matchpathcon.c	2007-09-27 13:50:55.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -18,9 +18,9074 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.34/utils/matchpathcon.c
+@@ -305,8 +306,10 @@
+ 
+ void matchpathcon_fini(void)
+ {
+-	selabel_close(hnd);
+-	hnd = NULL;
++	if (hnd) {
++		selabel_close(hnd);
++		hnd = NULL;
++	}
+ }
+ 
+ int matchpathcon(const char *name, mode_t mode, security_context_t * con)
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.35/src/selinux.py
+--- nsalibselinux/src/selinux.py	2007-09-13 08:21:12.000000000 -0400
++++ libselinux-2.0.35/src/selinux.py	1969-12-31 19:00:00.000000000 -0500
+@@ -1,314 +0,0 @@
+-# This file was automatically generated by SWIG (http://www.swig.org).
+-# Version 1.3.31
+-#
+-# Don't modify this file, modify the SWIG interface instead.
+-# This file is compatible with both classic and new-style classes.
+-
+-import _selinux
+-import new
+-new_instancemethod = new.instancemethod
+-try:
+-    _swig_property = property
+-except NameError:
+-    pass # Python < 2.2 doesn't have 'property'.
+-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+-    if (name == "thisown"): return self.this.own(value)
+-    if (name == "this"):
+-        if type(value).__name__ == 'PySwigObject':
+-            self.__dict__[name] = value
+-            return
+-    method = class_type.__swig_setmethods__.get(name,None)
+-    if method: return method(self,value)
+-    if (not static) or hasattr(self,name):
+-        self.__dict__[name] = value
+-    else:
+-        raise AttributeError("You cannot add attributes to %s" % self)
+-
+-def _swig_setattr(self,class_type,name,value):
+-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+-
+-def _swig_getattr(self,class_type,name):
+-    if (name == "thisown"): return self.this.own()
+-    method = class_type.__swig_getmethods__.get(name,None)
+-    if method: return method(self)
+-    raise AttributeError,name
+-
+-def _swig_repr(self):
+-    try: strthis = "proxy of " + self.this.__repr__()
+-    except: strthis = ""
+-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+-
+-import types
+-try:
+-    _object = types.ObjectType
+-    _newclass = 1
+-except AttributeError:
+-    class _object : pass
+-    _newclass = 0
+-del types
+-
+-
+-is_selinux_enabled = _selinux.is_selinux_enabled
+-is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
+-getcon = _selinux.getcon
+-getcon_raw = _selinux.getcon_raw
+-setcon = _selinux.setcon
+-setcon_raw = _selinux.setcon_raw
+-getpidcon = _selinux.getpidcon
+-getpidcon_raw = _selinux.getpidcon_raw
+-getprevcon = _selinux.getprevcon
+-getprevcon_raw = _selinux.getprevcon_raw
+-getexeccon = _selinux.getexeccon
+-getexeccon_raw = _selinux.getexeccon_raw
+-setexeccon = _selinux.setexeccon
+-setexeccon_raw = _selinux.setexeccon_raw
+-getfscreatecon = _selinux.getfscreatecon
+-getfscreatecon_raw = _selinux.getfscreatecon_raw
+-setfscreatecon = _selinux.setfscreatecon
+-setfscreatecon_raw = _selinux.setfscreatecon_raw
+-getkeycreatecon = _selinux.getkeycreatecon
+-getkeycreatecon_raw = _selinux.getkeycreatecon_raw
+-setkeycreatecon = _selinux.setkeycreatecon
+-setkeycreatecon_raw = _selinux.setkeycreatecon_raw
+-getsockcreatecon = _selinux.getsockcreatecon
+-getsockcreatecon_raw = _selinux.getsockcreatecon_raw
+-setsockcreatecon = _selinux.setsockcreatecon
+-setsockcreatecon_raw = _selinux.setsockcreatecon_raw
+-getfilecon = _selinux.getfilecon
+-getfilecon_raw = _selinux.getfilecon_raw
+-lgetfilecon = _selinux.lgetfilecon
+-lgetfilecon_raw = _selinux.lgetfilecon_raw
+-fgetfilecon = _selinux.fgetfilecon
+-fgetfilecon_raw = _selinux.fgetfilecon_raw
+-setfilecon = _selinux.setfilecon
+-setfilecon_raw = _selinux.setfilecon_raw
+-lsetfilecon = _selinux.lsetfilecon
+-lsetfilecon_raw = _selinux.lsetfilecon_raw
+-fsetfilecon = _selinux.fsetfilecon
+-fsetfilecon_raw = _selinux.fsetfilecon_raw
+-getpeercon = _selinux.getpeercon
+-getpeercon_raw = _selinux.getpeercon_raw
+-class av_decision(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, av_decision, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, av_decision, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["allowed"] = _selinux.av_decision_allowed_set
+-    __swig_getmethods__["allowed"] = _selinux.av_decision_allowed_get
+-    if _newclass:allowed = _swig_property(_selinux.av_decision_allowed_get, _selinux.av_decision_allowed_set)
+-    __swig_setmethods__["decided"] = _selinux.av_decision_decided_set
+-    __swig_getmethods__["decided"] = _selinux.av_decision_decided_get
+-    if _newclass:decided = _swig_property(_selinux.av_decision_decided_get, _selinux.av_decision_decided_set)
+-    __swig_setmethods__["auditallow"] = _selinux.av_decision_auditallow_set
+-    __swig_getmethods__["auditallow"] = _selinux.av_decision_auditallow_get
+-    if _newclass:auditallow = _swig_property(_selinux.av_decision_auditallow_get, _selinux.av_decision_auditallow_set)
+-    __swig_setmethods__["auditdeny"] = _selinux.av_decision_auditdeny_set
+-    __swig_getmethods__["auditdeny"] = _selinux.av_decision_auditdeny_get
+-    if _newclass:auditdeny = _swig_property(_selinux.av_decision_auditdeny_get, _selinux.av_decision_auditdeny_set)
+-    __swig_setmethods__["seqno"] = _selinux.av_decision_seqno_set
+-    __swig_getmethods__["seqno"] = _selinux.av_decision_seqno_get
+-    if _newclass:seqno = _swig_property(_selinux.av_decision_seqno_get, _selinux.av_decision_seqno_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_av_decision(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_av_decision
+-    __del__ = lambda self : None;
+-av_decision_swigregister = _selinux.av_decision_swigregister
+-av_decision_swigregister(av_decision)
+-
+-class selinux_opt(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_opt, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_opt, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["type"] = _selinux.selinux_opt_type_set
+-    __swig_getmethods__["type"] = _selinux.selinux_opt_type_get
+-    if _newclass:type = _swig_property(_selinux.selinux_opt_type_get, _selinux.selinux_opt_type_set)
+-    __swig_setmethods__["value"] = _selinux.selinux_opt_value_set
+-    __swig_getmethods__["value"] = _selinux.selinux_opt_value_get
+-    if _newclass:value = _swig_property(_selinux.selinux_opt_value_get, _selinux.selinux_opt_value_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_opt(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_opt
+-    __del__ = lambda self : None;
+-selinux_opt_swigregister = _selinux.selinux_opt_swigregister
+-selinux_opt_swigregister(selinux_opt)
+-
+-class selinux_callback(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_callback, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_callback, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["func_log"] = _selinux.selinux_callback_func_log_set
+-    __swig_getmethods__["func_log"] = _selinux.selinux_callback_func_log_get
+-    if _newclass:func_log = _swig_property(_selinux.selinux_callback_func_log_get, _selinux.selinux_callback_func_log_set)
+-    __swig_setmethods__["func_audit"] = _selinux.selinux_callback_func_audit_set
+-    __swig_getmethods__["func_audit"] = _selinux.selinux_callback_func_audit_get
+-    if _newclass:func_audit = _swig_property(_selinux.selinux_callback_func_audit_get, _selinux.selinux_callback_func_audit_set)
+-    __swig_setmethods__["func_validate"] = _selinux.selinux_callback_func_validate_set
+-    __swig_getmethods__["func_validate"] = _selinux.selinux_callback_func_validate_get
+-    if _newclass:func_validate = _swig_property(_selinux.selinux_callback_func_validate_get, _selinux.selinux_callback_func_validate_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_callback(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_callback
[...8694 lines suppressed...]
+-    static PyTypeObject varlink_type;
+-    static int type_init = 0;  
+-    if (!type_init) {
+-      const PyTypeObject tmp
+-      = {
+-        PyObject_HEAD_INIT(NULL)
+-        0,                                  /* Number of items in variable part (ob_size) */
+-        (char *)"swigvarlink",              /* Type name (tp_name) */
+-        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+-        0,                                  /* Itemsize (tp_itemsize) */
+-        (destructor) swig_varlink_dealloc,   /* Deallocator (tp_dealloc) */ 
+-        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+-        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+-        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+-        0,                                  /* tp_compare */
+-        (reprfunc) swig_varlink_repr,       /* tp_repr */
+-        0,                                  /* tp_as_number */
+-        0,                                  /* tp_as_sequence */
+-        0,                                  /* tp_as_mapping */
+-        0,                                  /* tp_hash */
+-        0,                                  /* tp_call */
+-        (reprfunc)swig_varlink_str,        /* tp_str */
+-        0,                                  /* tp_getattro */
+-        0,                                  /* tp_setattro */
+-        0,                                  /* tp_as_buffer */
+-        0,                                  /* tp_flags */
+-        varlink__doc__,                     /* tp_doc */
+-        0,                                  /* tp_traverse */
+-        0,                                  /* tp_clear */
+-        0,                                  /* tp_richcompare */
+-        0,                                  /* tp_weaklistoffset */
+-#if PY_VERSION_HEX >= 0x02020000
+-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+-#endif
+-#if PY_VERSION_HEX >= 0x02030000
+-        0,                                  /* tp_del */
+-#endif
+-#ifdef COUNT_ALLOCS
+-        0,0,0,0                             /* tp_alloc -> tp_next */
+-#endif
+-      };
+-      varlink_type = tmp;
+-      varlink_type.ob_type = &PyType_Type;
+-      type_init = 1;
+-    }
+-    return &varlink_type;
+-  }
+-  
+-  /* Create a variable linking object for use later */
+-  SWIGINTERN PyObject *
+-  SWIG_Python_newvarlink(void) {
+-    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+-    if (result) {
+-      result->vars = 0;
+-    }
+-    return ((PyObject*) result);
+-  }
+-  
+-  SWIGINTERN void 
+-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+-    swig_varlinkobject *v = (swig_varlinkobject *) p;
+-    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+-    if (gv) {
+-      size_t size = strlen(name)+1;
+-      gv->name = (char *)malloc(size);
+-      if (gv->name) {
+-        strncpy(gv->name,name,size);
+-        gv->get_attr = get_attr;
+-        gv->set_attr = set_attr;
+-        gv->next = v->vars;
+-      }
+-    }
+-    v->vars = gv;
+-  }
+-  
+-  SWIGINTERN PyObject *
+-  SWIG_globals(void) {
+-    static PyObject *_SWIG_globals = 0; 
+-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+-    return _SWIG_globals;
+-  }
+-  
+-  /* -----------------------------------------------------------------------------
+-   * constants/methods manipulation
+-   * ----------------------------------------------------------------------------- */
+-  
+-  /* Install Constants */
+-  SWIGINTERN void
+-  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+-    PyObject *obj = 0;
+-    size_t i;
+-    for (i = 0; constants[i].type; ++i) {
+-      switch(constants[i].type) {
+-      case SWIG_PY_POINTER:
+-        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+-        break;
+-      case SWIG_PY_BINARY:
+-        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+-        break;
+-      default:
+-        obj = 0;
+-        break;
+-      }
+-      if (obj) {
+-        PyDict_SetItemString(d, constants[i].name, obj);
+-        Py_DECREF(obj);
+-      }
+-    }
+-  }
+-  
+-  /* -----------------------------------------------------------------------------*/
+-  /* Fix SwigMethods to carry the callback ptrs when needed */
+-  /* -----------------------------------------------------------------------------*/
+-  
+-  SWIGINTERN void
+-  SWIG_Python_FixMethods(PyMethodDef *methods,
+-    swig_const_info *const_table,
+-    swig_type_info **types,
+-    swig_type_info **types_initial) {
+-    size_t i;
+-    for (i = 0; methods[i].ml_name; ++i) {
+-      const char *c = methods[i].ml_doc;
+-      if (c && (c = strstr(c, "swig_ptr: "))) {
+-        int j;
+-        swig_const_info *ci = 0;
+-        const char *name = c + 10;
+-        for (j = 0; const_table[j].type; ++j) {
+-          if (strncmp(const_table[j].name, name, 
+-              strlen(const_table[j].name)) == 0) {
+-            ci = &(const_table[j]);
+-            break;
+-          }
+-        }
+-        if (ci) {
+-          size_t shift = (ci->ptype) - types;
+-          swig_type_info *ty = types_initial[shift];
+-          size_t ldoc = (c - methods[i].ml_doc);
+-          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+-          char *ndoc = (char*)malloc(ldoc + lptr + 10);
+-          if (ndoc) {
+-            char *buff = ndoc;
+-            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+-            if (ptr) {
+-              strncpy(buff, methods[i].ml_doc, ldoc);
+-              buff += ldoc;
+-              strncpy(buff, "swig_ptr: ", 10);
+-              buff += 10;
+-              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+-              methods[i].ml_doc = ndoc;
+-            }
+-          }
+-        }
+-      }
+-    }
+-  } 
+-  
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-/* -----------------------------------------------------------------------------*
+- *  Partial Init method
+- * -----------------------------------------------------------------------------*/
+-
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-SWIGEXPORT void SWIG_init(void) {
+-  PyObject *m, *d;
+-  
+-  /* Fix SwigMethods to carry the callback ptrs when needed */
+-  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
+-  
+-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+-  d = PyModule_GetDict(m);
+-  
+-  SWIG_InitializeModule(0);
+-  SWIG_InstallConstants(d,swig_const_table);
+-  
+-  
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_LOG",SWIG_From_int((int)(0)));
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_AUDIT",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "SELINUX_CB_VALIDATE",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "SELINUX_ERROR",SWIG_From_int((int)(0)));
+-  SWIG_Python_SetConstant(d, "SELINUX_WARNING",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "SELINUX_INFO",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "SELINUX_AVC",SWIG_From_int((int)(3)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
+-  SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4)));
+-  SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
+-}
+-
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.35/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
-+++ libselinux-2.0.34/utils/matchpathcon.c	2007-09-18 16:32:31.000000000 -0400
++++ libselinux-2.0.35/utils/matchpathcon.c	2007-09-27 10:22:29.000000000 -0400
 @@ -17,10 +17,24 @@
  	exit(1);
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- libselinux.spec	27 Sep 2007 14:54:10 -0000	1.289
+++ libselinux.spec	27 Sep 2007 17:55:13 -0000	1.290
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.35
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -123,6 +123,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
+- Fix segfault on missing file_context file
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
 - Upgrade to upstream
 	* Make netlink socket close-on-exec to avoid descriptor leakage from Dan Walsh.



From fedora-extras-commits at redhat.com  Thu Sep 27 18:06:31 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:06:31 -0400
Subject: rpms/perl-Jcode/devel perl-Jcode.spec,1.14,1.15
Message-ID: <200709271806.l8RI6Vbp013732@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Jcode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13612

Modified Files:
	perl-Jcode.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-5
- fix license (thanks Tom)



Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Jcode.spec	26 Aug 2007 09:28:42 -0000	1.14
+++ perl-Jcode.spec	27 Sep 2007 18:05:57 -0000	1.15
@@ -1,10 +1,10 @@
 Name:           perl-Jcode
 Version:        2.06
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Perl extension interface for converting Japanese text
 
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Jcode/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.06.tar.gz
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-5
+- fix license (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.06-4
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:08:23 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 14:08:23 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.195,1.196
Message-ID: <200709271808.l8RI8NjW013823@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/redhat-artwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13786

Modified Files:
	redhat-artwork.spec 
Log Message:
- Add Provides to help with artwork split up



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- redhat-artwork.spec	14 Sep 2007 11:27:32 -0000	1.195
+++ redhat-artwork.spec	27 Sep 2007 18:07:44 -0000	1.196
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 7.0.0
-Release: 11%{?dist}.1 
+Release: 12%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -59,6 +59,21 @@
 # for gtk-update-icon-cache
 Requires(post): gtk2 >= 2.9.0
 
+# Add some Provides to ease transition to split up
+Provides: bluecurve-classic-metacity-theme
+Provides: bluecurve-gdm-theme
+Provides: bluecurve-gnome-theme
+Provides: bluecurve-gtk-themes
+Provides: bluecurve-icon-theme
+Provides: bluecurve-metacity-theme
+Provides: bluecurve-xmms-skin
+Provides: fedorabubbles-gdm-theme
+Provides: fedoradna-gdm-theme
+Provides: fedoraflyinghigh-gdm-theme
+Provides: fedora-gnome-theme
+Provides: fedora-icon-theme
+Provides: gtk-bluecurve-engine
+
 %description
 redhat-artwork contains the themes and icons that make up the Red Hat default 
 look and feel.
@@ -67,6 +82,12 @@
 Summary: Artwork specific to KDE
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+Provides: bluecurve-kde-theme
+Provides: bluecurve-kdm-theme
+Provides: bluecurve-kwin-theme
+Provides: bluecurve-qt-engine
+Provides: fedoradna-kdm-theme
+Provides: fedoraflyinghigh-kdm-theme
 
 %description kde
 redhat-artwork-kde contains artwork specific to KDE
@@ -454,6 +475,9 @@
 %{_datadir}/apps/kwin/bluecurve.desktop
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 7.0.0-12
+- Add Provides to help with artwork split up
+
 * Fri Sep 14 2007 Than Ngo <than at redhat.com> - 7.0.0-11.1
 - fix bz276731, KWin theme shows pixel noise for "sticky" icon
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:08:53 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:08:53 -0400
Subject: rpms/perl-Unicode-Map/devel perl-Unicode-Map.spec,1.10,1.11
Message-ID: <200709271808.l8RI8rtK013831@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-Map/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13810

Modified Files:
	perl-Unicode-Map.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-11
- fix license tag (thanks Tom)



Index: perl-Unicode-Map.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-Map/devel/perl-Unicode-Map.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Unicode-Map.spec	26 Aug 2007 09:28:00 -0000	1.10
+++ perl-Unicode-Map.spec	27 Sep 2007 18:08:18 -0000	1.11
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-Map
 Version:        0.112
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Perl module for mapping charsets from and to utf16 unicode
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-11
+- fix license tag (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.112-10
 - rebuild for BuildID
 - fix license tag (like perl itself)



From fedora-extras-commits at redhat.com  Thu Sep 27 18:12:56 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:12:56 -0400
Subject: rpms/qgis/devel lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.9, 1.10 sources, 1.2, 1.3 lib64-suffix.patch,
	1.5, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271812.l8RICuPp014117@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14078

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage


lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:21:11 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:12:23 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qgis.spec	28 Aug 2007 11:14:07 -0000	1.9
+++ qgis.spec	27 Sep 2007 18:12:24 -0000	1.10
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 13%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,14 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
 * Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
 - bump for expat 2.0 rebuild bug#195888
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:21:11 -0000	1.2
+++ sources	27 Sep 2007 18:12:24 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:15:27 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:15:27 -0400
Subject: rpms/qgis/F-7 lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.5, 1.6 sources, 1.2, 1.3 lib64-suffix.patch,
	1.3, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271815.l8RIFR6J014286@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14207

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage


lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:37:14 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:14:54 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	2 Aug 2007 18:37:40 -0000	1.5
+++ qgis.spec	27 Sep 2007 18:14:54 -0000	1.6
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 12%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,17 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
+* Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
+- bump for expat 2.0 rebuild bug#195888
+
 * Thu Aug 02 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-12
 - updated License from GPL to GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:37:14 -0000	1.2
+++ sources	27 Sep 2007 18:14:54 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:16:53 2007
From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed))
Date: Thu, 27 Sep 2007 14:16:53 -0400
Subject: rpms/qgis/FC-6 lib64-suffix-0.9.0.patch, NONE,
	1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 qgis.spec, 1.5, 1.6 sources, 1.2, 1.3 lib64-suffix.patch,
	1.3, NONE man-install-share.patch, 1.1,
	NONE settings-include-workdir.patch, 1.1, NONE
Message-ID: <200709271816.l8RIGrZ4014472@cvs-int.fedora.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14441

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage



lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # common for MAC and UNIX
   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,7 @@
 
 INSTALL(TARGETS qgisgrass
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
        
 INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:35:19 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	2 Aug 2007 18:38:44 -0000	1.5
+++ qgis.spec	27 Sep 2007 18:16:21 -0000	1.6
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 12%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,17 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
+* Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
+- bump for expat 2.0 rebuild bug#195888
+
 * Thu Aug 02 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-12
 - updated License from GPL to GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:35:19 -0000	1.2
+++ sources	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Sep 27 18:20:31 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:20:31 -0400
Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.14,1.15
Message-ID: <200709271820.l8RIKVLL014727@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-Map8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14689

Modified Files:
	perl-Unicode-Map8.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-14
- fix license tag again (thanks Tom)



Index: perl-Unicode-Map8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Unicode-Map8.spec	26 Aug 2007 09:30:22 -0000	1.14
+++ perl-Unicode-Map8.spec	27 Sep 2007 18:19:58 -0000	1.15
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-Map8
 Version:        0.12
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Mapping table between 8-bit chars and Unicode for Perl
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-Map8/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/Unicode-Map8-0.12.tar.gz
 Patch0:         perl-Unicode-Map8-0.12-declaration.patch
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-14
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.12-13
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:22:47 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 14:22:47 -0400
Subject: rpms/i810switch/F-7 i810switch-0.6.5-add-i945.patch, NONE,
	1.1 i810switch.spec, 1.9, 1.10
Message-ID: <200709271822.l8RIMlGr015014@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14968

Modified Files:
	i810switch.spec 
Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 detection, fixes BZ297371

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/F-7/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	27 Sep 2007 18:22:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:23:26 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:23:26 -0400
Subject: rpms/perl-Unicode-MapUTF8/devel perl-Unicode-MapUTF8.spec, 1.12,
	1.13
Message-ID: <200709271823.l8RINQXj015111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-MapUTF8/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15020

Modified Files:
	perl-Unicode-MapUTF8.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-6
- fix license tag again (thanks Tom)



Index: perl-Unicode-MapUTF8.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-MapUTF8/devel/perl-Unicode-MapUTF8.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Unicode-MapUTF8.spec	26 Aug 2007 09:31:25 -0000	1.12
+++ perl-Unicode-MapUTF8.spec	27 Sep 2007 18:22:53 -0000	1.13
@@ -2,12 +2,12 @@
 
 Name:           perl-Unicode-MapUTF8
 Version:        1.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Conversions to and from arbitrary character sets and UTF8
 
 Group:          Development/Libraries
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Unicode-MapUTF8/
 Source0:        http://www.cpan.org/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-6
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.11-5
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:13 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:13 -0400
Subject: rpms/z88dk/F-7 z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISDpZ015416@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/F-7

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/F-7/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:41 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:16 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:16 -0400
Subject: rpms/z88dk/FC-6 z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISGVE015419@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/FC-6

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/FC-6/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:44 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:28:19 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:28:19 -0400
Subject: rpms/z88dk/devel z88dk.spec,1.4,1.5
Message-ID: <200709271828.l8RISJtZ015422@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366/devel

Modified Files:
	z88dk.spec 
Log Message:

License tag correction, Artistic clarified



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z88dk.spec	4 Oct 2006 22:47:02 -0000	1.4
+++ z88dk.spec	27 Sep 2007 18:27:46 -0000	1.5
@@ -1,8 +1,8 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 10%{?dist}
-License: Artistic
+Release: 11%{?dist}
+License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
+- fix license tag (Artistic clarified)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.6-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:36:57 2007
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 27 Sep 2007 14:36:57 -0400
Subject: rpms/z88dk/devel z88dk.spec,1.5,1.6
Message-ID: <200709271836.l8RIav9n015745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15708

Modified Files:
	z88dk.spec 
Log Message:

no ppc64



Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z88dk.spec	27 Sep 2007 18:27:46 -0000	1.5
+++ z88dk.spec	27 Sep 2007 18:36:24 -0000	1.6
@@ -1,14 +1,14 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.6
-Release: 11%{?dist}
+Release: 11%{?dist}.1
 License: Artistic clarified
 Group: Development/Tools
 Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
 Patch: z88make.patch
 URL: http://z88dk.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: x86_64 ia64
+ExcludeArch: x86_64 ia64 ppc64
 
 %description
 z88dk is a Z80 cross compiler capable of generating binary files for a variety
@@ -69,6 +69,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11.1
+- no ppc64
+
 * Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11
 - fix license tag (Artistic clarified)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:45:28 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Thu, 27 Sep 2007 14:45:28 -0400
Subject: rpms/java-1.7.0-icedtea/devel
	java-1.7.0-icedtea-system-tzdata.patch, 
	NONE, 1.1 java-1.7.0-icedtea.spec, 1.11, 1.12
Message-ID: <200709271845.l8RIjSTH016101@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16041

Modified Files:
	java-1.7.0-icedtea.spec 
Added Files:
	java-1.7.0-icedtea-system-tzdata.patch 
Log Message:
* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
- Apply patch to use system tzdata.
- Require tzdata-java.
- Fix mauve shell fragment.



java-1.7.0-icedtea-system-tzdata.patch:

--- NEW FILE java-1.7.0-icedtea-system-tzdata.patch ---
diff -urN Makefile.am ../icedtea-1.4/Makefile.am
--- Makefile.am	2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.am	2007-09-27 14:23:32.000000000 -0400
@@ -158,6 +158,7 @@
 	patches/icedtea-lesstif_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-certbundle.patch \
+	patches/icedtea-system-tzdata.patch \
 	$(FAST_BUILD_PATCH)
 
 stamps/patch.stamp: stamps/extract.stamp
diff -urN Makefile.in ../icedtea-1.4/Makefile.in
--- Makefile.in	2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.in	2007-09-27 14:24:51.000000000 -0400
@@ -287,6 +287,7 @@
 	patches/icedtea-lesstif_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-certbundle.patch \
+	patches/icedtea-system-tzdata.patch \
 	$(FAST_BUILD_PATCH)
 
 
diff -urN patches/icedtea-system-tzdata.patch ../icedtea-1.4/patches/icedtea-system-tzdata.patch
--- patches/icedtea-system-tzdata.patch	1969-12-31 19:00:00.000000000 -0500
+++ ../icedtea-1.4/patches/icedtea-system-tzdata.patch	2007-09-27 14:30:21.000000000 -0400
@@ -0,0 +1,54 @@
+diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-09-27 14:27:03.000000000 -0400
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-09-27 14:29:21.000000000 -0400
+@@ -376,7 +376,6 @@
+     }
+   }
+ 
+-  // Use the system zoneinfo files, if present
+   SystemProperty* sp = Arguments::system_properties();
+   Arguments::PropertyList_add (&sp,
+ 			       "javax.net.ssl.trustStore",
+@@ -391,6 +390,10 @@
+ 			       "javax.net.ssl.trustStorePassword",
+ 			       "");
+ 
++  // Use the system zoneinfo files, if present
++  Arguments::PropertyList_add (&sp,
++                              "user.zoneinfo.dir", "/usr/share/javazi");
++
+ #undef malloc
+ #undef getenv
+ #undef EXTENSIONS_DIR
+diff -urN openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+--- openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-08-30 03:55:53.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2007-09-27 14:29:45.000000000 -0400
+@@ -1021,10 +1021,24 @@
+ 	byte[] buffer = null;
+ 
+ 	try {
+-	    String homeDir = (String) AccessController.doPrivileged(
+-				new sun.security.action.GetPropertyAction("java.home"));
+-	    final String fname = homeDir + File.separator + "lib" + File.separator
+-				 + "zi" + File.separator + fileName;
++	    String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
++	    File dir = null;
++	    if (zi_dir != null)
++	      dir = new File(zi_dir);
++
++	    // Some minimal sanity checking
++	    if (dir != null) {
++	      File f = new File(dir, "ZoneInfoMappings");
++	      if (!f.exists())
++		dir = null;
++	    }
++
++	    if (dir == null) {
++	      String homeDir = (String) System.getProperty("java.home");
++	      zi_dir = homeDir + File.separator + "lib" + File.separator
++		+ "zi";
++	    }
++	    final String fname =  zi_dir + File.separator + fileName;
+ 	    buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ 		public Object run() throws IOException {
+ 		    File file = new File(fname);


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.7.0-icedtea.spec	27 Sep 2007 12:28:00 -0000	1.11
+++ java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
@@ -95,7 +95,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.15.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.16.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -116,6 +116,7 @@
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
+Patch3:   java-1.7.0-icedtea-system-tzdata.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -150,6 +151,8 @@
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
 Requires: openssl
+# Require zoneinfo data provided by tzdata-java subpackage.
+Requires: tzdata-java
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -266,6 +269,7 @@
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
+%patch3
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 
@@ -295,10 +299,8 @@
   ./configure 
   make
   echo ====================MAUVE TESTING========================
-  %{expand: 
-     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-	 -showpasses -debug -timeout 30000 2>&1 || :
-   }
+  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+    -showpasses -debug -timeout 30000 2>&1 || :
   echo ====================MAUVE TESTING END====================
 popd
 
@@ -730,15 +732,22 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+- Apply patch to use system tzdata.
+- Require tzdata-java.
+- Fix mauve shell fragment.
+
 * Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Removed jtreg setup line.
 
 * Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Removed jtreg. Does not adhere to Fedora guidelines.
+- Removed jtreg.  Does not adhere to Fedora guidelines.
 
 * Tue Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Fixed running of Xvfb so it does not terminate after a successful test.
-- Fixed mauve and jtreg test runs to not break the build when an error is thrown
+- Fixed running of Xvfb so it does not terminate after a successful
+  test.
+- Fixed mauve and jtreg test runs to not break the build when an error
+  is thrown
 
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added JTreg zip as source



From fedora-extras-commits at redhat.com  Thu Sep 27 18:45:46 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 27 Sep 2007 14:45:46 -0400
Subject: rpms/perl-Unicode-String/devel perl-Unicode-String.spec,1.11,1.12
Message-ID: <200709271845.l8RIjkhY016140@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/perl-Unicode-String/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16081

Modified Files:
	perl-Unicode-String.spec 
Log Message:
* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-5
- fix license tag again (thanks Tom)



Index: perl-Unicode-String.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Unicode-String/devel/perl-Unicode-String.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Unicode-String.spec	26 Aug 2007 09:32:23 -0000	1.11
+++ perl-Unicode-String.spec	27 Sep 2007 18:45:12 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           perl-Unicode-String
 Version:        2.09
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Perl modules to handle various Unicode issues
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-5
+- fix license tag again (thanks Tom)
+
 * Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.09-4
 - fix license tag (like perl itself)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 18:59:15 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 14:59:15 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.140,1.141
Message-ID: <200709271859.l8RIxFgo018636@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599

Modified Files:
	gnome-session.spec 
Log Message:
- drop redhat-artwork dep.  We don't need it.



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-session.spec	17 Sep 2007 19:20:51 -0000	1.140
+++ gnome-session.spec	27 Sep 2007 18:58:42 -0000	1.141
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -21,7 +21,6 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Requires: redhat-artwork >= 0.20
 Requires: system-logos
 # required to get gconf-sanity-check-2 in the right place
 Requires: GConf2-gtk >= %{gconf2_version}
@@ -189,6 +188,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- drop redhat-artwork dep.  We don't need it.
+
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:06:31 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Thu, 27 Sep 2007 15:06:31 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.36,
	1.37 policycoreutils.spec, 1.453, 1.454
Message-ID: <200709271906.l8RJ6VXa025066@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
- Fix bug in building policy with polgengui
- Creating ports correctly


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policycoreutils-gui.patch	27 Sep 2007 15:24:00 -0000	1.36
+++ policycoreutils-gui.patch	27 Sep 2007 19:05:27 -0000	1.37
@@ -3789,7 +3789,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 11:21:40.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 15:04:11.000000000 -0400
 @@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -3891,15 +3891,15 @@
 +                end = int (r[0])
 +            else:
 +                begin = int (r[0])
-+                end = int (r[1]) + 1
++                end = int (r[1])
 +                
 +                if begin > end:
 +                    raise  ValueError
 +                
-+                for p in range(begin, end):
-+                    if p < 1 or p > max_port:
-+                        raise  ValueError
-+                    temp.append(p)
++            for p in range(begin, end + 1):
++                if p < 1 or p > max_port:
++                    raise  ValueError
++                temp.append(p)
 +        return temp
 +    except ValueError:
 +        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
@@ -4516,7 +4516,7 @@
 +    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myxuser", XUSER)
-+    mypolicy.set_in_tcp(1, 1, 1, "")
++    mypolicy.set_in_tcp(1, 1, 1, "28920")
 +    mypolicy.set_in_udp(0, 0, 1, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_syslog(True)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- policycoreutils.spec	27 Sep 2007 15:24:00 -0000	1.453
+++ policycoreutils.spec	27 Sep 2007 19:05:27 -0000	1.454
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,8 +199,9 @@
 fi
 
 %changelog
-* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
 - Fix bug in building policy with polgengui
+- Creating ports correctly
 
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-1
 - Update to upstream



From fedora-extras-commits at redhat.com  Thu Sep 27 19:07:24 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 15:07:24 -0400
Subject: rpms/metacity/devel metacity.spec,1.132,1.133
Message-ID: <200709271907.l8RJ7Oqp025141@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25119

Modified Files:
	metacity.spec 
Log Message:
change theme requires



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- metacity.spec	16 Sep 2007 21:14:18 -0000	1.132
+++ metacity.spec	27 Sep 2007 19:06:49 -0000	1.133
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
@@ -31,7 +31,7 @@
 BuildRequires: control-center >= 2.19.4
 
 Requires: startup-notification >= 0.7
-Requires: redhat-artwork >= 0.62
+Requires: nodoka-metacity-theme
 # for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
 Requires: control-center-filesystem
 # for /etc/gconf/schemas
@@ -150,6 +150,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- Drop dep on redhat-artwork, add one on nodoka
+
 * Sun Sep 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:16:47 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Thu, 27 Sep 2007 15:16:47 -0400
Subject: rpms/aldrin/devel aldrin-docfix.patch, NONE, 1.1 aldrin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709271916.l8RJGlYM025481@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/aldrin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25443/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aldrin-docfix.patch aldrin.spec 
Log Message:
initial import


aldrin-docfix.patch:

--- NEW FILE aldrin-docfix.patch ---
diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct
--- aldrin-0.11/SConstruct.docfix	2007-09-25 20:55:58.000000000 +0200
+++ aldrin-0.11/SConstruct	2007-09-25 20:55:58.000000000 +0200
@@ -127,12 +127,14 @@ if win32:
 	install('${DESTDIR}${PREFIX}', 'aldrin.bat')
 	
 # docs
-install('${DOC_INSTALL_PATH}/aldrin/html', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, 
 	glob.glob('share/doc/aldrin/html/*.html')
 	+ glob.glob('share/doc/aldrin/html/*.css'))
-install('${DOC_INSTALL_PATH}/aldrin/images', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, 
 	glob.glob('share/doc/aldrin/images/*.gif')
 	+ glob.glob('share/doc/aldrin/images/*.png'))
+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, 
+	['ChangeLog', 'CREDITS', 'LICENCE'])
 
 # icon theme
 install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png')
diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py
--- aldrin-0.11/share/aldrin/router.py.docfix	2007-09-25 21:16:54.000000000 +0200
+++ aldrin-0.11/share/aldrin/router.py	2007-09-25 21:17:19.000000000 +0200
@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog):
 		uri = filenameify(self.pluginloader.get_uri())
 		name = filenameify(self.pluginloader.get_name())		
 		helpfilepaths = [
-			filepath('../doc/zzub/plugins/' + uri + '/index.html'),
-			filepath('../doc/zzub/plugins/' + name + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'),
 		]
 		for path in helpfilepaths:
 			print "searching for '%s'..." % path
diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py
--- aldrin-0.11/share/aldrin/main.py.docfix	2007-09-25 21:14:29.000000000 +0200
+++ aldrin-0.11/share/aldrin/main.py	2007-09-25 21:16:17.000000000 +0200
@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window):
 		@type event: wx.MenuEvent
 		"""
 		import webbrowser		
-		webbrowser.open_new(filepath('../doc/aldrin/html/index.html'))
+		webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html'))
 			
 	def on_about(self, event):
 		"""


--- NEW FILE aldrin.spec ---
Name:		aldrin
Version:	0.11
Release:	5%{?dist}
Summary:	Modular music sequencer/tracker

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/aldrin/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		aldrin-docfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	scons >= 0.96.92
BuildRequires:	dos2unix
BuildRequires:	desktop-file-utils
Requires:	pyzzub = 0.2.3
Requires:	pygtk2

%description
Aldrin is a powerful music composition software featuring a flexible audio
routing system commonly found in expensive audio software, enabling you to mix,
split, mutilate and modify audio signals emitted by software synthesizers and
samples.


%prep
%setup -q
mac2unix SConstruct
%patch0 -p1 -b docfix


%build
find share/aldrin share/doc \
     -regextype posix-egrep \
     -regex '.+\.(py|html|xml|prs|col|css)' \
     -exec mac2unix '{}' \; \
     -exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~
%{__mv} CREDITS~ CREDITS

%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install PREFIX=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install \
		     --vendor="fedora" \
		     --remove-category="Application" \
		     --delete-original \
		     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
		     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
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
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

%files
%defattr(-,root,root,-)
%{_bindir}/aldrin
%{_defaultdocdir}/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Thu Sep 27 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-5
- nailed to pyzzub version 0.2.3 for docpath compatibility

* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-4
- updated patch to fix referenced libzzub doc locations

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-3
- generic sf.net source url
- adapted macros wherever feasible (both paths and commands)
- unified buildroot style
- removed redundant ldconfig update call
- new patch to rectify aldrin's installation doc directory and file list
- added missing python module requirement
- added update calls for GTK icon cache and desktop database

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-2
- updated requires to new libzzub w/ integrated pyzzub
- removed redundant requires
- fixed rpm path macros
- fixed CREDITS encoding

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:26:44 -0000	1.1
+++ .cvsignore	27 Sep 2007 19:16:12 -0000	1.2
@@ -0,0 +1 @@
+aldrin-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:26:44 -0000	1.1
+++ sources	27 Sep 2007 19:16:12 -0000	1.2
@@ -0,0 +1 @@
+1a40ea5852e34b69abc55e12d049aef8  aldrin-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 19:20:48 2007
From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl))
Date: Thu, 27 Sep 2007 15:20:48 -0400
Subject: rpms/aldrin/F-7 aldrin-docfix.patch, NONE, 1.1 aldrin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709271920.l8RJKm6n026251@cvs-int.fedora.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/aldrin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26074/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	aldrin-docfix.patch aldrin.spec 
Log Message:
initial import


aldrin-docfix.patch:

--- NEW FILE aldrin-docfix.patch ---
diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct
--- aldrin-0.11/SConstruct.docfix	2007-09-25 20:55:58.000000000 +0200
+++ aldrin-0.11/SConstruct	2007-09-25 20:55:58.000000000 +0200
@@ -127,12 +127,14 @@ if win32:
 	install('${DESTDIR}${PREFIX}', 'aldrin.bat')
 	
 # docs
-install('${DOC_INSTALL_PATH}/aldrin/html', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, 
 	glob.glob('share/doc/aldrin/html/*.html')
 	+ glob.glob('share/doc/aldrin/html/*.css'))
-install('${DOC_INSTALL_PATH}/aldrin/images', 
+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, 
 	glob.glob('share/doc/aldrin/images/*.gif')
 	+ glob.glob('share/doc/aldrin/images/*.png'))
+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, 
+	['ChangeLog', 'CREDITS', 'LICENCE'])
 
 # icon theme
 install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png')
diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py
--- aldrin-0.11/share/aldrin/router.py.docfix	2007-09-25 21:16:54.000000000 +0200
+++ aldrin-0.11/share/aldrin/router.py	2007-09-25 21:17:19.000000000 +0200
@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog):
 		uri = filenameify(self.pluginloader.get_uri())
 		name = filenameify(self.pluginloader.get_name())		
 		helpfilepaths = [
-			filepath('../doc/zzub/plugins/' + uri + '/index.html'),
-			filepath('../doc/zzub/plugins/' + name + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'),
+			filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'),
 		]
 		for path in helpfilepaths:
 			print "searching for '%s'..." % path
diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py
--- aldrin-0.11/share/aldrin/main.py.docfix	2007-09-25 21:14:29.000000000 +0200
+++ aldrin-0.11/share/aldrin/main.py	2007-09-25 21:16:17.000000000 +0200
@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window):
 		@type event: wx.MenuEvent
 		"""
 		import webbrowser		
-		webbrowser.open_new(filepath('../doc/aldrin/html/index.html'))
+		webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html'))
 			
 	def on_about(self, event):
 		"""


--- NEW FILE aldrin.spec ---
Name:		aldrin
Version:	0.11
Release:	5%{?dist}
Summary:	Modular music sequencer/tracker

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://trac.zeitherrschaft.org/aldrin/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		aldrin-docfix.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	scons >= 0.96.92
BuildRequires:	dos2unix
BuildRequires:	desktop-file-utils
Requires:	pyzzub = 0.2.3
Requires:	pygtk2

%description
Aldrin is a powerful music composition software featuring a flexible audio
routing system commonly found in expensive audio software, enabling you to mix,
split, mutilate and modify audio signals emitted by software synthesizers and
samples.


%prep
%setup -q
mac2unix SConstruct
%patch0 -p1 -b docfix


%build
find share/aldrin share/doc \
     -regextype posix-egrep \
     -regex '.+\.(py|html|xml|prs|col|css)' \
     -exec mac2unix '{}' \; \
     -exec chmod 644 '{}' \;

iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~
%{__mv} CREDITS~ CREDITS

%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install PREFIX=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install \
		     --vendor="fedora" \
		     --remove-category="Application" \
		     --delete-original \
		     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
		     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
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
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

%files
%defattr(-,root,root,-)
%{_bindir}/aldrin
%{_defaultdocdir}/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Thu Sep 27 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-5
- nailed to pyzzub version 0.2.3 for docpath compatibility

* Tue Sep 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-4
- updated patch to fix referenced libzzub doc locations

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-3
- generic sf.net source url
- adapted macros wherever feasible (both paths and commands)
- unified buildroot style
- removed redundant ldconfig update call
- new patch to rectify aldrin's installation doc directory and file list
- added missing python module requirement
- added update calls for GTK icon cache and desktop database

* Tue Sep 18 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-2
- updated requires to new libzzub w/ integrated pyzzub
- removed redundant requires
- fixed rpm path macros
- fixed CREDITS encoding

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.11-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:26:44 -0000	1.1
+++ .cvsignore	27 Sep 2007 19:20:15 -0000	1.2
@@ -0,0 +1 @@
+aldrin-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:26:44 -0000	1.1
+++ sources	27 Sep 2007 19:20:15 -0000	1.2
@@ -0,0 +1 @@
+1a40ea5852e34b69abc55e12d049aef8  aldrin-0.11.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 19:31:33 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:31:33 -0400
Subject: rpms/tellico/F-7 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 tellico.spec, 1.12, 1.13
Message-ID: <200709271931.l8RJVXME026818@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26743

Modified Files:
	.cvsignore sources tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
- New upstream version (fixes problem with settings not being saved on Fedora).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Aug 2007 20:04:14 -0000	1.9
+++ .cvsignore	27 Sep 2007 19:30:59 -0000	1.10
@@ -1 +1 @@
-tellico-1.2.13.tar.gz
+tellico-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Aug 2007 20:04:14 -0000	1.9
+++ sources	27 Sep 2007 19:30:59 -0000	1.10
@@ -1 +1 @@
-7c0371d1e2b8e97d62fafb3fd5d79e7e  tellico-1.2.13.tar.gz
+38047e27d482757fae977fa49809a784  tellico-1.2.14.tar.gz


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/tellico.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tellico.spec	27 Aug 2007 15:57:29 -0000	1.12
+++ tellico.spec	27 Sep 2007 19:30:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tellico
-Version:        1.2.13
-Release:        2%{?dist}
+Version:        1.2.14
+Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -47,7 +47,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure --disable-rpath
 make %{?_smp_mflags}
@@ -104,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
+- New upstream version (fixes problem with settings not being saved on Fedora).
+
 * Mon Aug 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.13-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:31:57 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Thu, 27 Sep 2007 15:31:57 -0400
Subject: comps/po de.po,1.5,1.6
Message-ID: <200709271931.l8RJVvOC026974@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26791/po

Modified Files:
	de.po 
Log Message:
2007-09-27  Severin Heiniger <severinheiniger at gmail.com> (via
lantash at fedoraproject.org)

  * po/de.po: German translation nearly completed




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 de.po
Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- de.po	17 Sep 2007 19:22:12 -0000	1.5
+++ de.po	27 Sep 2007 19:31:27 -0000	1.6
@@ -1,649 +1,847 @@
-# translation of de.po to 
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to Deutsch
-# translation of comps-po.po to Deutsch
-# translation of comps-po.po to
-# This file is distributed under the same license as the PACKAGE package.
 # Ronny Buchmann <ronny-vlug at vlugnet.org> 2004, 2005
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003.
 # Bernd Groh <bgroh at redhat.com>, 2003,2004.
 # Verena <vfuehrer at redhat.com>, 2004.
 # Marcus Gl??ckner <mgloeckner at gmail.com>, 2005.
 # PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>, 2006, 2007.
+# Severin Heiniger <severinheiniger at gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-02-26 08:19+1000\n"
-"Last-Translator: PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>\n"
-"Language-Team:  <en at li.org>\n"
+"PO-Revision-Date: 2007-09-27 21:29+0100\n"
+"Last-Translator: Severin Heiniger <severinheiniger at gmail.com>\n"
+"Language-Team: German Translation Team <fedora-trans-de 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"
-
-#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: ../comps-fe5.xml.in.h:1
+#: ../comps-fe6.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
 #: ../comps-f8.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-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
-#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:2
+#: ../comps-fe6.xml.in.h:2
+#: ../comps-f7.xml.in.h:2
+#: ../comps-f8.xml.in.h:2
+#: ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Verwaltungstools"
 
-#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5
-#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:3
+#: ../comps-fe6.xml.in.h:3
+#: ../comps-f7.xml.in.h:5
+#: ../comps-f8.xml.in.h:5
+#: ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3
+#: ../comps-fe5.xml.in.h:4
+#: ../comps-fe6.xml.in.h:4
+#: ../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-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
-#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:5
+#: ../comps-fe6.xml.in.h:5
+#: ../comps-f7.xml.in.h:7
+#: ../comps-f8.xml.in.h:7
+#: ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Unterst??tzung f??r Arabisch"
 
-#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
-#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:6
+#: ../comps-fe6.xml.in.h:6
+#: ../comps-f7.xml.in.h:8
+#: ../comps-f8.xml.in.h:8
+#: ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Unterst??tzung f??r Armenisch"
 
-#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
-#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:7
+#: ../comps-fe6.xml.in.h:7
+#: ../comps-f7.xml.in.h:10
+#: ../comps-f8.xml.in.h:10
+#: ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schreiben und Publizieren"
 
-#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12
-#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:8
+#: ../comps-fe6.xml.in.h:8
+#: ../comps-f7.xml.in.h:12
+#: ../comps-f8.xml.in.h:12
+#: ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
-#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9
+#: ../comps-fe6.xml.in.h:10
+#: ../comps-f7.xml.in.h:31
+#: ../comps-f8.xml.in.h:32
+#: ../comps-el4.xml.in.h:8
+#: ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
 msgstr "Desktopumgebungen"
 
-#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
-#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10
+#: ../comps-fe6.xml.in.h:11
+#: ../comps-f7.xml.in.h:32
+#: ../comps-f8.xml.in.h:33
+#: ../comps-el4.xml.in.h:9
+#: ../comps-el5.xml.in.h:10
 msgid "Desktop environments"
 msgstr "Desktopumgebungen"
 
-#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
-#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11
+#: ../comps-fe6.xml.in.h:12
+#: ../comps-f7.xml.in.h:33
+#: ../comps-f8.xml.in.h:34
+#: ../comps-el4.xml.in.h:10
+#: ../comps-el5.xml.in.h:11
 msgid "Development"
 msgstr "Softwareentwicklung"
 
-#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
-#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12
+#: ../comps-fe6.xml.in.h:13
+#: ../comps-f7.xml.in.h:35
+#: ../comps-f8.xml.in.h:36
+#: ../comps-el4.xml.in.h:11
+#: ../comps-el5.xml.in.h:12
 msgid "Development Tools"
 msgstr "Entwicklungstools"
 
-#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
+#: ../comps-fe5.xml.in.h:13
+#: ../comps-fe6.xml.in.h:14
+#: ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Unterst??tzung f??r Einwahl-Netzwerk"
 
-#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39
-#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14
+#: ../comps-fe6.xml.in.h:15
+#: ../comps-f7.xml.in.h:39
+#: ../comps-f8.xml.in.h:39
+#: ../comps-el4.xml.in.h:13
+#: ../comps-el5.xml.in.h:14
 msgid "Editors"
 msgstr "Editoren"
 
-#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40
[...1928 lines suppressed...]
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Portugiesischen (Brasilien) Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Englischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Franz??sischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Deutschen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Italienischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Spanischen Sprache."
-
 #~ msgid "Japanese"
 #~ msgstr "Japanisch"
-
 #~ msgid "Korean"
 #~ msgstr "Koreanisch"
-
 #~ msgid "Simplified Chinese"
 #~ msgstr "Einfaches Chinesisch"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Japanischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Koreanischen Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Chinesischen (Einfach) Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Chinesischen (Traditionell) Sprache."
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Traditionelles Chinesisch"
-
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "ppc64 Entwicklungsunterst??tzung f??r kompatible Architekturen"
-
 #~ msgid "Bengali"
 #~ msgstr "Bengali"
-
 #~ msgid "Gujarati"
 #~ msgstr "Gujarati"
-
 #~ msgid "Hindi"
 #~ msgstr "Hindi"
-
 #~ msgid "Punjabi"
 #~ msgstr "Punjabi"
-
 #~ msgid "Red Hat Enterprise Linux 4 Documentation"
 #~ msgstr "Red Hat Enterprise Linux 4 Dokumentation"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamil"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Bengali Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Gujarati Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Hindi Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Punjabi Sprache."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr ""
 #~ "Diese Gruppe enth??lt die Red Hat Enterprise Linux Dokumentation in der "
 #~ "Tamil Sprache."
-
 #~ msgid "Cluster Storage"
 #~ msgstr "Cluster-Speicher"
-
 #~ msgid "Clustering Support."
 #~ msgstr "Clustering-Support."
-
 #~ msgid "Packages which provide support for cluster storage."
 #~ msgstr "Pakete, die Unterst??tzung f??r Cluster-Speicher bieten."
-
 #~ msgid "Packages which provide support for single-node GFS."
 #~ msgstr "Pakete, die Support f??r single-node GFS bieten."
-
 #~ msgid "Single Node GFS Support"
 #~ msgstr "Unterst??tzung f??r Single Node GFS"
-
 #~ msgid "These packages provide compatibility support with previous releases."
 #~ msgstr ""
 #~ "Diese Pakete bieten Kompatibilit??tsunterst??tzung f??r fr??here Versionen."
-
 #~ msgid "Java Runtime Environments and Development Kits"
 #~ msgstr "Java Runtime Environments und Development Kits"
-
 #~ msgid "Misc"
 #~ msgstr "Verschiedenes"
-
 #~ msgid "Misc packages"
 #~ msgstr "Verschiedene Pakete"
-
 #~ msgid "Multimedia"
 #~ msgstr "Multimedia"
-
 #~ msgid "Multimedia applications"
 #~ msgstr "Multimedia-Anwendungen"
-
 #~ msgid ""
 #~ "Packages which provide additional functionality for Red Hat Enterprise "
 #~ "Linux"
 #~ msgstr ""
 #~ "Pakete, die zus??tzliche Funktionalit??t f??r Red Hat Enterprise Linux bieten"
-
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux Extras"
-
 #~ msgid "Workstation"
 #~ msgstr "Arbeitsplatzrechner"
-
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Anwendungen und Dienstprogramme f??r Arbeitsplatzrechner."
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Unterst??tzung f??r Virtualisierung."
-
 #~ msgid "Compatibility Arch"
 #~ msgstr "Kompatible Architekturen"
-
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Kompatible Architektur-Bibliotheken"
-
 #~ msgid "Multilib library packages"
 #~ msgstr "Multilib-Bibliothekspakete"
-
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr ""
 #~ "Pakete, die Funktionalit??t f??r die kompatiblen Architekturen bieten."
+



From fedora-extras-commits at redhat.com  Thu Sep 27 19:46:29 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:46:29 -0400
Subject: rpms/tellico/F-7 tellico.spec,1.13,1.14
Message-ID: <200709271946.l8RJkT33027269@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27251

Modified Files:
	tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
- Declare new file (due to the fix for Fedora 7).



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-7/tellico.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tellico.spec	27 Sep 2007 19:30:59 -0000	1.13
+++ tellico.spec	27 Sep 2007 19:45:57 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,12 +97,16 @@
 %{_datadir}/applications/kde/tellico.desktop
 %{_datadir}/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
+%{_datadir}/config/tellicorc
 %{_datadir}/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
+- Declare new file (due to the fix for Fedora 7).
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
 - New upstream version (fixes problem with settings not being saved on Fedora).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:51:52 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Thu, 27 Sep 2007 15:51:52 -0400
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.100,1.101
Message-ID: <200709271951.l8RJpqWL027393@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27375

Modified Files:
	gnome-desktop.spec 
Log Message:
- remove seemingly unneccessary dep on redhat-artwork



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-desktop.spec	26 Sep 2007 13:57:09 -0000	1.100
+++ gnome-desktop.spec	27 Sep 2007 19:51:19 -0000	1.101
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.20/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -25,7 +25,6 @@
 # fixed in upstream svn
 Patch4:	  leak.patch
 
-Requires: redhat-artwork
 Requires: redhat-menus
 
 Obsoletes: gnome-core gnome-core-devel
@@ -128,6 +127,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
+- remove seemingly unneccessary dep on redhat-artwork
+
 * Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Fix a memory leak
 



From fedora-extras-commits at redhat.com  Thu Sep 27 19:55:35 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Thu, 27 Sep 2007 15:55:35 -0400
Subject: rpms/tellico/devel tellico.spec,1.14,1.15
Message-ID: <200709271955.l8RJtZT2027547@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/tellico/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27529

Modified Files:
	tellico.spec 
Log Message:
* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
- Declare new file (due to the fix for Fedora 7).



Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/devel/tellico.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tellico.spec	27 Sep 2007 16:30:39 -0000	1.14
+++ tellico.spec	27 Sep 2007 19:55:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tellico
 Version:        1.2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
@@ -97,12 +97,16 @@
 %{_datadir}/applications/kde/tellico.desktop
 %{_datadir}/apps/kconf_update/
 %{_datadir}/config.kcfg/tellico_config.kcfg
+%{_datadir}/config/tellicorc
 %{_datadir}/apps/tellico/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/application/x-tellico.desktop
 
 
 %changelog
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-2
+- Declare new file (due to the fix for Fedora 7).
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.2.14-1
 - New upstream version (fixes problem with settings not being saved on Fedora).
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:12:40 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:12:40 -0400
Subject: rpms/taglib/devel taglib.spec,1.19,1.20
Message-ID: <200709272012.l8RKCep7002117@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2077

Modified Files:
	taglib.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
- use cmake, fixes "taglib_export.h not included" (#272361#c7)



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- taglib.spec	24 Sep 2007 14:22:03 -0000	1.19
+++ taglib.spec	27 Sep 2007 20:12:07 -0000	1.20
@@ -18,6 +18,7 @@
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: automake
+BuildRequires: cmake
 
 
 %description
@@ -41,15 +42,21 @@
 make -f Makefile.cvs
 
 
+
 %build
-%configure --disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
 rm -fr examples/.deps
 rm -fr examples/Makefile*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -79,6 +86,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
+- use cmake, fixes "taglib_export.h not included" (#272361#c7)
+
 * Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:13:37 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:13:37 -0400
Subject: rpms/taglib/devel taglib.spec,1.20,1.21
Message-ID: <200709272013.l8RKDbbF002247@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211

Modified Files:
	taglib.spec 
Log Message:
release++



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- taglib.spec	27 Sep 2007 20:12:07 -0000	1.20
+++ taglib.spec	27 Sep 2007 20:13:04 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.3.%{svn}svn%{?dist}
+Release:    0.4.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries



From fedora-extras-commits at redhat.com  Thu Sep 27 20:16:18 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 27 Sep 2007 16:16:18 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.84,1.85
Message-ID: <200709272016.l8RKGIxm002428@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2405

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.7-85.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sysprof-kmod.spec	12 Sep 2007 22:50:08 -0000	1.84
+++ sysprof-kmod.spec	27 Sep 2007 20:15:46 -0000	1.85
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.5-76.fc7}
+%{!?kversion: %define kversion 2.6.22.7-85.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:24:41 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Sep 2007 16:24:41 -0400
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.14,1.15
Message-ID: <200709272024.l8RKOfXJ002885@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2831/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
- Enable wavpack support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xine-lib.spec	24 Sep 2007 19:29:43 -0000	1.14
+++ xine-lib.spec	27 Sep 2007 20:24:08 -0000	1.15
@@ -19,22 +19,21 @@
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -387,6 +386,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
 * Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
 - Enable JACK support by default for all distros.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:24:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Sep 2007 16:24:45 -0400
Subject: rpms/xine-lib/devel xine-lib.spec,1.27,1.28
Message-ID: <200709272024.l8RKOjnq002888@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2831/devel

Modified Files:
	xine-lib.spec 
Log Message:
* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
- Enable wavpack support by default for all distros.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xine-lib.spec	24 Sep 2007 19:29:46 -0000	1.27
+++ xine-lib.spec	27 Sep 2007 20:24:11 -0000	1.28
@@ -19,22 +19,21 @@
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif
     %define     with_jack   %{?_without_jack:0}%{!?_without_jack:1}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
     %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -387,6 +386,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
 * Sun Sep 23 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.8-5
 - Enable JACK support by default for all distros.
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:26:20 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Sep 2007 16:26:20 -0400
Subject: rpms/taglib/devel taglib.spec,1.21,1.22
Message-ID: <200709272026.l8RKQKOJ003006@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2969

Modified Files:
	taglib.spec 
Log Message:
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
- -BR: automake 
- +BR: zlib-devel



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- taglib.spec	27 Sep 2007 20:13:04 -0000	1.21
+++ taglib.spec	27 Sep 2007 20:25:47 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:       taglib	
 Version:    1.5
-Release:    0.4.%{svn}svn%{?dist}
+Release:    0.5.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -17,8 +17,8 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: automake
 BuildRequires: cmake
+BuildRequires: zlib-devel
 
 
 %description
@@ -39,8 +39,6 @@
 %prep
 %setup -q -n taglib
 %patch0 -p1 -b .wchar
-make -f Makefile.cvs
-
 
 
 %build
@@ -86,6 +84,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
+- -BR: automake 
+- +BR: zlib-devel
+
 * Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
 - use cmake, fixes "taglib_export.h not included" (#272361#c7)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:27:24 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Thu, 27 Sep 2007 16:27:24 -0400
Subject: rpms/pykickstart/F-7 pykickstart-version.patch, NONE, 1.1 .cvsignore,
	1.56, 1.57 pykickstart.spec, 1.61, 1.62 sources, 1.61, 1.62
Message-ID: <200709272027.l8RKROWP003313@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3005

Modified Files:
	.cvsignore pykickstart.spec sources 
Added Files:
	pykickstart-version.patch 
Log Message:
Rebuild pykickstart-1.13 for F7.


pykickstart-version.patch:

--- NEW FILE pykickstart-version.patch ---
diff -ruN pykickstart-1.13.orig/pykickstart/version.py pykickstart-1.13/pykickstart/version.py
--- pykickstart-1.13.orig/pykickstart/version.py	2007-09-04 12:04:48.000000000 -0400
+++ pykickstart-1.13/pykickstart/version.py	2007-09-27 16:24:45.000000000 -0400
@@ -52,11 +52,11 @@
 FC5 = 3000
 FC6 = 4000
 RHEL5 = 4100
-F7  = 5000
+F7 = 5000
 F8 = 6000
 
 # This always points at the latest version and is the default.
-DEVEL = F8
+DEVEL = F7
 
 """A one-to-one mapping from string representations to version numbers."""
 versionMap = {
diff -ruN pykickstart-1.13.orig/pykickstart.spec pykickstart-1.13/pykickstart.spec
--- pykickstart-1.13.orig/pykickstart.spec	2007-09-12 17:38:43.000000000 -0400
+++ pykickstart-1.13/pykickstart.spec	2007-09-27 16:24:54.000000000 -0400
@@ -4,12 +4,14 @@
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
 Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
 
+Patch0: %{name}-version.patch
+
 License: GPLv2
 Group: System Environment/Libraries
 BuildArch: noarch
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 make
 
 %build
@@ -43,6 +46,9 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Thu Sep 27 2007 Chris Lumens <clumens at redhat.com> 1.13-2
+- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version.
+
 * Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
 - Add a function to convert URL method strings into repo objects
   (jkeating).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	7 Jun 2007 18:07:36 -0000	1.56
+++ .cvsignore	27 Sep 2007 20:26:52 -0000	1.57
@@ -18,3 +18,4 @@
 pykickstart-1.0.tar.gz
 pykickstart-1.1.tar.gz
 pykickstart-1.1.1.tar.gz
+pykickstart-1.13.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/pykickstart.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pykickstart.spec	7 Jun 2007 18:07:36 -0000	1.61
+++ pykickstart.spec	27 Sep 2007 20:26:52 -0000	1.62
@@ -1,17 +1,23 @@
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.13
+Release: 2%{?dist}
+# This is a Red Hat maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+
+Patch0: %{name}-version.patch
+
+License: GPLv2
 Group: System Environment/Libraries
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, gettext
-Requires: python, python-urlgrabber
+Requires: python, python-urlgrabber, rhpl
 
 %description
 The pykickstart package is a python library for manipulating kickstart
@@ -19,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 make
 
 %build
@@ -34,14 +41,74 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING docs/programmers-guide
+%doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
 
 %changelog
-* Thu Jun 07 2007 Chris Lumens <clumens at redhat.com> - 1.1.1-1
-- Fix harddrive install method error checking (#242492).
+* Thu Sep 27 2007 Chris Lumens <clumens at redhat.com> 1.13-2
+- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version.
+
+* Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
+- Add a function to convert URL method strings into repo objects
+  (jkeating).
+- Writer formatting fixes.
+- Add kickstart documentation from the Fedora Wiki.
+
+* Tue Sep 04 2007 Chris Lumens <clumens at redhat.com> 1.12-1
+- Fix lots of problems in processing the bootloader, device, network, and
+  raid commands.
+- Add %end when writing out scripts and packages.
+- Add a makefile target to run pychecker to cut down on errors in
+  releases.
+
+* Mon Sep  3 2007 Jeremy Katz <katzj at redhat.com> - 1.11-1
+- fix a few tracebacks
+
+* Fri Aug 31 2007 Chris Lumens <clumens at redhat.com> 1.10-1
+- Add network --ipv6=.
+
+* Fri Aug 24 2007 Chris Lumens <clumens at redhat.com> 1.9-1
+- Add support for the %end directive to be placed at the end of scripts
+  and packages sections.  Deprecate old syntax.
+- Clean up after ksvalidator if pykickstart issues a traceback.
+- Add support for repo --priority --includepkgs --excludepkgs.
+- Fix newline at end of reboot --eject output (#253562).
+
+* Mon Aug 13 2007 Chris Lumens <clumens at redhat.com> 1.8-1
+- Fix type checking of string values.
+
+* Thu Aug 09 2007 Chris Lumens <clumens at redhat.com> 1.7-1
+- Clarify license in spec file and all source files.
+- Check string values to options to make sure they're not other options
+  (#251318).
+
+* Thu Aug 02 2007 Chris Lumens <clumens at redhat.com> 1.6-1
+- Fix a couple tracebacks in ksvalidator.
+- Change --class to --dhcpclass (#248912).
+
+* Thu Jul 19 2007 Chris Lumens <clumens at redhat.com> 1.5-2
+- Require rhpl (#248953).
+
+* Tue Jul 17 2007 Chris Lumens <clumens at redhat.com> 1.5-1
+- Fix traceback when calling preprocessKickstart.
+
+* Tue Jul 17 2007 Chris Lumens <clumens at redhat.com> 1.4-1
+- Add methods to handle the %ksappend directive.
+- Fix ignoredisk --disks.
+
+* Wed Jul 11 2007 Chris Lumens <clumens at redhat.com> - 1.3-1
+- Add support for ignoredisk --only-use.
+- Fix traceback in raid command printing method (#246709).
+
+* Fri Jun 08 2007 Chris Lumens <clumens at redhat.com> - 1.2-2
+- Fix package review problems (#226334).
+
+* Mon Jun 04 2007 Chris Lumens <clumens at redhat.com> - 1.2-1
+- Fix harddrive install method error checking (#232492).
 - Set authentication information from the input line to preserve quoting
   (#241657).
+- Allow included files to be given by URL.
 - Fix typo in user --iscrypted option.
 
 * Mon May 14 2007 Chris Lumens <clumens at redhat.com> - 1.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-7/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	7 Jun 2007 18:07:36 -0000	1.61
+++ sources	27 Sep 2007 20:26:52 -0000	1.62
@@ -1 +1 @@
-3b6922b6cee85dd615ce4ce256538d05  pykickstart-1.1.1.tar.gz
+806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 20:44:06 2007
From: fedora-extras-commits at redhat.com (Martin Sourada (mso))
Date: Thu, 27 Sep 2007 16:44:06 -0400
Subject: rpms/nodoka-theme-gnome/devel nodoka-theme-gnome.spec,1.8,1.9
Message-ID: <200709272044.l8RKi6Zp004174@cvs-int.fedora.redhat.com>

Author: mso

Update of /cvs/extras/rpms/nodoka-theme-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4155

Modified Files:
	nodoka-theme-gnome.spec 
Log Message:


Require fedora-icon-theme instead of redhat-artwork (rhbz #309631)





Index: nodoka-theme-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/nodoka-theme-gnome/devel/nodoka-theme-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nodoka-theme-gnome.spec	13 Sep 2007 20:34:31 -0000	1.8
+++ nodoka-theme-gnome.spec	27 Sep 2007 20:43:34 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           nodoka-theme-gnome
 Version:        0.3.2
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        The Nodoka Theme Pack for Gnome
 
 Group:          System Environment/Libraries
@@ -17,7 +17,7 @@
 
 Requires:       gtk-nodoka-engine >= 0.3.1.1
 Requires:       nodoka-metacity-theme
-Requires:       redhat-artwork >= 7.0.0
+Requires:       fedora-icon-theme
 
 %description
 The Nodoka Theme Pack for Gnome make use of Nodoka Metacity theme, Nodoka gtk2
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-2
+- Require fedora-icon-theme instead of redhat-artwork (rhbz #309631)
+
 * Thu Sep 13 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.3.2-1.fc8.1
 - fix dir name
 



From fedora-extras-commits at redhat.com  Thu Sep 27 20:57:36 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 27 Sep 2007 16:57:36 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.62,
	1.63
Message-ID: <200709272057.l8RKvawQ004562@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4499

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 7.3-2
- Require libXau-devel when not doing arch bootstrap (#207391)



Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-proto-devel.spec	24 Sep 2007 18:40:07 -0000	1.62
+++ xorg-x11-proto-devel.spec	27 Sep 2007 20:57:03 -0000	1.63
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -70,6 +70,7 @@
 
 %if ! %{build_bootstrap}
 Requires: mesa-libGL-devel
+Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
@@ -289,6 +290,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 7.3-2
+- Require libXau-devel when not doing arch bootstrap (#207391)
+
 * Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
 - dgaproto 2.0.3
 - Bump to 7.3



From fedora-extras-commits at redhat.com  Thu Sep 27 21:00:19 2007
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Thu, 27 Sep 2007 17:00:19 -0400
Subject: rpms/libXau/devel libXau.spec,1.19,1.20
Message-ID: <200709272100.l8RL0JUd004676@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXau/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4622

Modified Files:
	libXau.spec 
Log Message:
* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
- libXau-devel Requires: xorg-x11-proto-devel (#235563)



Index: libXau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXau.spec	21 Aug 2007 20:10:04 -0000	1.19
+++ libXau.spec	27 Sep 2007 20:59:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
+Requires: xorg-x11-proto-devel
 
 # xorg-x11-proto-devel needed by xau.pc
 BuildRequires: xorg-x11-proto-devel
@@ -78,6 +79,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 1.0.3-4
+- libXau-devel Requires: xorg-x11-proto-devel (#235563)
+
 * Tue Aug 21 2007 Adam Jackson <ajax at redhat.com> - 1.0.3-3
 - Rebuild for build id
 



From fedora-extras-commits at redhat.com  Thu Sep 27 21:00:38 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:00:38 -0400
Subject: rpms/mhgui/F-7 mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200709272100.l8RL0cuY004712@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4643

Modified Files:
	sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Import for F-7


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	27 Sep 2007 21:00:04 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:09:00 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 27 Sep 2007 17:09:00 -0400
Subject: rpms/perl-Net-Netmask/devel .cvsignore, 1.6,
	1.7 perl-Net-Netmask.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200709272109.l8RL908b011532@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11492

Modified Files:
	.cvsignore perl-Net-Netmask.spec sources 
Log Message:
1.9015, update license tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2006 18:56:14 -0000	1.6
+++ .cvsignore	27 Sep 2007 21:08:26 -0000	1.7
@@ -1 +1 @@
-Net-Netmask-1.9012.tar.gz
+Net-Netmask-1.9015.tar.gz


Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Netmask.spec	14 Sep 2006 15:30:43 -0000	1.11
+++ perl-Net-Netmask.spec	27 Sep 2007 21:08:26 -0000	1.12
@@ -1,17 +1,16 @@
 Name:           perl-Net-Netmask
-Version:        1.9012
-Release:        3%{?dist}
+Version:        1.9015
+Release:        1%{?dist}
 Summary:        Perl module for manipulation and lookup of IP network blocks
 
 Group:          Development/Libraries
-License:        Artistic
+License:        Copyright only
 URL:            http://search.cpan.org/dist/Net-Netmask/
 Source0:        http://www.cpan.org/authors/id/M/MU/MUIR/modules/Net-Netmask-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Net::Netmask parses and understands IPv4 CIDR blocks. It's built with
@@ -52,6 +51,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Warren Togami <wtogami at redhat.com> - 1.9015-1
+- 1.9015, update license tag
+
 * Thu Sep 14 2006 Warren Togami <wtogami at redhat.com> - 1.9012-3
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 May 2006 18:56:14 -0000	1.6
+++ sources	27 Sep 2007 21:08:26 -0000	1.7
@@ -1 +1 @@
-3d81d214e0203863dbc170029f2d3502  Net-Netmask-1.9012.tar.gz
+90298105cd17a5c2a4059297e09f1546  Net-Netmask-1.9015.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:21:11 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:21:11 -0400
Subject: rpms/mhgui/FC-6 mhgui-0.1-pkgconfig.patch, NONE, 1.1 mhgui.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709272121.l8RLLBd6012569@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/mhgui/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12384

Modified Files:
	sources 
Added Files:
	mhgui-0.1-pkgconfig.patch mhgui.spec 
Log Message:
Import for FC-6


mhgui-0.1-pkgconfig.patch:

--- NEW FILE mhgui-0.1-pkgconfig.patch ---
--- mhgui-0.1/mhgui.pc.in.pkgconfig	2007-07-20 20:18:20.000000000 +0200
+++ mhgui-0.1/mhgui.pc.in	2007-07-20 20:20:29.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/mhgui
 
 Name: @PACKAGE@
 Description: A simple GUI library for MakeHuman


--- NEW FILE mhgui.spec ---
Name:           mhgui
Version:        0.1
Release:        2%{?dist}
Summary:        A simple GUI library for MakeHuman

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/mhgui-%{version}.tar.gz
Patch0:         mhgui-0.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  animorph-devel >= 0.2
BuildRequires:  freeglut-devel
BuildRequires:  libpng-devel
      

%description
A simple GUI library for MakeHuman


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       animorph-devel >= 0.2
Requires:       freeglut-devel
Requires:       libpng-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 0.1-2
- Fix URL
- Change summary

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.1-1
- Initial spec file for Fedora 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhgui/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 16:55:35 -0000	1.1
+++ sources	27 Sep 2007 21:20:39 -0000	1.2
@@ -0,0 +1 @@
+d9c335c032bb41feb99bba7f20db0c00  mhgui-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:23:12 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Thu, 27 Sep 2007 17:23:12 -0400
Subject: rpms/perl-Net-Netmask/devel perl-Net-Netmask.spec,1.12,1.13
Message-ID: <200709272123.l8RLNCwH012720@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-Net-Netmask/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678

Modified Files:
	perl-Net-Netmask.spec 
Log Message:
add buildreqs



Index: perl-Net-Netmask.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Netmask/devel/perl-Net-Netmask.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Net-Netmask.spec	27 Sep 2007 21:08:26 -0000	1.12
+++ perl-Net-Netmask.spec	27 Sep 2007 21:22:39 -0000	1.13
@@ -11,6 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
+BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More)
 
 %description
 Net::Netmask parses and understands IPv4 CIDR blocks. It's built with



From fedora-extras-commits at redhat.com  Thu Sep 27 21:24:45 2007
From: fedora-extras-commits at redhat.com (Chauvet (kwizart))
Date: Thu, 27 Sep 2007 17:24:45 -0400
Subject: rpms/animorph/FC-6 animorph.spec, NONE,
	1.1 animorph-0.2-pkgconfig.patch, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200709272124.l8RLOj1k012894@cvs-int.fedora.redhat.com>

Author: kwizart

Update of /cvs/extras/rpms/animorph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12870

Modified Files:
	sources 
Added Files:
	animorph.spec animorph-0.2-pkgconfig.patch 
Log Message:
Import for FC-6



--- NEW FILE animorph.spec ---
Name:           animorph
Version:        0.2
Release:        2%{?dist}
Summary:        3D Animation and Morph Library

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.dedalo-3d.com
Source0:        http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0:         animorph-0.2-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



%description
3D Animation and Morph Library


%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
%patch0 -p1 -b .pkgconfig

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Removes doc
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
# License is GPLv2+ for these files
#./include/animorph/PoseSemiTarget.h
#./include/animorph/PoseTarget.h
#./src/PoseSemiTarget.cpp
#./src/PoseTarget.cpp
# Others files are LGPLv2+
# Check theses files when there is a new release.
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Wed Sep 12 2007 kwizart < kwizart at gmail.com > - 0.2-2
- Change license to GPLv2+ as said in the source code
- Remove BR glibc-headers
- Change summary (taken from animorph.pc)

* Fri Jul 20 2007 kwizart < kwizart at gmail.com > - 0.2-1
- Initial spec file for Fedora 

animorph-0.2-pkgconfig.patch:

--- NEW FILE animorph-0.2-pkgconfig.patch ---
--- animorph-0.2/animorph.pc.in.pkgconfig	2007-07-20 19:53:00.000000000 +0200
+++ animorph-0.2/animorph.pc.in	2007-07-20 19:53:50.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@prefix@
-libdir=@exec_prefix@/lib
-includedir=@prefix@/include
+libdir=@libdir@
+includedir=@includedir@/animorph
 
 Name: @PACKAGE@
 Description: 3D Animation and Morph Library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/animorph/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Sep 2007 03:42:21 -0000	1.1
+++ sources	27 Sep 2007 21:24:13 -0000	1.2
@@ -0,0 +1 @@
+90cfb95f5eb0b49df0ab5c717e26b2e0  animorph-0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Sep 27 21:41:02 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Thu, 27 Sep 2007 17:41:02 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-3w-9xxx-mem_len.patch, NONE,
	1.1.2.1 kernel-xen.spec, 1.51, 1.51.2.1
Message-ID: <200709272141.l8RLf2qR013842@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13806

Modified Files:
      Tag: private-ehabkost-bz309611-test-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-bz309611-test-branch
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)


linux-2.6-3w-9xxx-mem_len.patch:

--- NEW FILE linux-2.6-3w-9xxx-mem_len.patch ---
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 27 Sep 2007 18:37:44 -0300
Subject: 3w-9xxx: use PCI resource lenght correctly

Trying to ioremap() a larger area than pci_resource_len()
may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
as length parameter to ioremap() instead of PAGE_SIZE.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
===================================================================
--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
+++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
 {
 	struct Scsi_Host *host = NULL;
 	TW_Device_Extension *tw_dev;
-	u32 mem_addr;
+	int bar;
+	unsigned long mem_addr, mem_len;
 	int retval = -ENODEV;
 
 	retval = pci_enable_device(pdev);
@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
 	}
 
 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
-		mem_addr = pci_resource_start(pdev, 1);
+		bar = 1;
 	else
-		mem_addr = pci_resource_start(pdev, 2);
+		bar = 2;
+
+	mem_addr = pci_resource_start(pdev, bar);
+	mem_len = pci_resource_len(pdev, bar);
 
 	/* Save base address */
-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
+	tw_dev->base_addr = ioremap(mem_addr, mem_len);
 	if (!tw_dev->base_addr) {
 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
 		goto out_release_mem_region;
@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
 
 	pci_set_drvdata(pdev, host);
 
-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
+	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
 	       host->host_no, mem_addr, pdev->irq);
 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
+++ kernel-xen.spec	27 Sep 2007 21:40:30 -0000	1.51.2.1
@@ -442,6 +442,7 @@
 
 # SCSI bits.
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-ctlbits.patch
@@ -1002,6 +1003,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2072,6 +2076,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Thu Sep 27 21:45:31 2007
From: fedora-extras-commits at redhat.com (Deepak Bhole (dbhole))
Date: Thu, 27 Sep 2007 17:45:31 -0400
Subject: rpms/struts/devel struts.spec,1.49,1.50
Message-ID: <200709272145.l8RLjVNf014160@cvs-int.fedora.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/struts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14135

Modified Files:
	struts.spec 
Log Message:

Re-enable compliation of webapp classes, and disable run of check-buildroot




Index: struts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/struts/devel/struts.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- struts.spec	24 Sep 2007 15:16:32 -0000	1.49
+++ struts.spec	27 Sep 2007 21:44:59 -0000	1.50
@@ -49,9 +49,12 @@
 %define webapplibs commons-beanutils commons-digester commons-fileupload commons-validator oro struts
 %define section		free
 
+# Disable check-buildroot
+%define __arch_install_post /usr/lib/rpm/check-rpaths 
+
 Name:		struts
 Version:	1.2.9
-Release:	4jpp.8%{?dist}
+Release:	4jpp.9%{?dist}
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -693,7 +696,7 @@
 %endif
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm --exclude %{tomcat5appsdir}/struts-example/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-examples/WEB-INF/classes --exclude %{tomcat5appsdir}/struts-tiles-documentation/WEB-INF/classes
+%{_bindir}/aot-compile-rpm
 %endif
 
 %clean
@@ -968,6 +971,9 @@
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-example_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-examples_classes*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-tiles-documentation_classes*
 %endif
 
 %if %{without_coreonly}
@@ -1058,6 +1064,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.9
+- Re-enable compliation of webapp classes, and disable run of check-buildroot
+
 * Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.8
 - Exclude webapp classes from native compilation (issues with check-build-root)
 



From fedora-extras-commits at redhat.com  Thu Sep 27 21:50:35 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 17:50:35 -0400
Subject: rpms/python-docutils/F-7 python-docutils.spec,1.10,1.11
Message-ID: <200709272150.l8RLoZDk014407@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-docutils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14353/F-7

Modified Files:
	python-docutils.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
- Build egg info.



Index: python-docutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docutils/F-7/python-docutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-docutils.spec	13 Aug 2007 19:38:54 -0000	1.10
+++ python-docutils.spec	27 Sep 2007 21:50:02 -0000	1.11
@@ -4,19 +4,25 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
-Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
@@ -39,13 +45,13 @@
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -76,8 +82,12 @@
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
+%{python_sitelib}/*egg-info/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
+- Build egg info.
+
 * Mon Aug 13 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-6
 - Last version had both the old and new rst.el.  Try again with only
   the new one.



From fedora-extras-commits at redhat.com  Thu Sep 27 21:50:38 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 17:50:38 -0400
Subject: rpms/python-docutils/devel python-docutils.spec,1.10,1.11
Message-ID: <200709272150.l8RLocNG014410@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14353/devel

Modified Files:
	python-docutils.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
- Build egg info.



Index: python-docutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-docutils.spec	13 Aug 2007 18:54:46 -0000	1.10
+++ python-docutils.spec	27 Sep 2007 21:50:06 -0000	1.11
@@ -4,19 +4,25 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
-Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
@@ -39,13 +45,13 @@
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -76,8 +82,12 @@
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
+%{python_sitelib}/*egg-info/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-7
+- Build egg info.
+
 * Mon Aug 13 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4-6
 - Last version had both the old and new rst.el.  Try again with only
   the new one.



From fedora-extras-commits at redhat.com  Thu Sep 27 21:58:21 2007
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Thu, 27 Sep 2007 17:58:21 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2006-07-20-glibc.patch,
	NONE, 1.1 isdn4k-utils.spec, 1.69, 1.70
Message-ID: <200709272158.l8RLwLdl016093@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-CVS-2006-07-20-glibc.patch 
Log Message:
fix build issue with glibc


isdn4k-utils-CVS-2006-07-20-glibc.patch:

--- NEW FILE isdn4k-utils-CVS-2006-07-20-glibc.patch ---
diff -up isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig isdn4k-utils-CVS-2006-07-20/capi20/capi20.h
--- isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig	2007-09-27 21:45:43.000000000 +0200
+++ isdn4k-utils-CVS-2006-07-20/capi20/capi20.h	2007-09-27 23:45:40.000000000 +0200
@@ -20,6 +20,7 @@
 #ifndef __CAPI20_H__
 #define __CAPI20_H__
 
+#include <sys/types.h>
 #include <sys/time.h>
 
 #ifdef __cplusplus


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- isdn4k-utils.spec	12 Feb 2007 09:14:37 -0000	1.69
+++ isdn4k-utils.spec	27 Sep 2007 21:57:49 -0000	1.70
@@ -40,6 +40,7 @@
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
 Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
+Patch15: isdn4k-utils-CVS-2006-07-20-glibc.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
@@ -124,6 +125,7 @@
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
 %patch14 -p1 -b .pppd-2.4.4
+%patch15 -p1 -b .glibc
 
 for i in */configure; do
 	cd `dirname $i`
@@ -498,8 +500,8 @@
 %doc xmonisdn/README
 
 %changelog
-* Mon Feb 12 2007 Than Ngo <than at redhat.com> - 3.2-55.fc7
-- fix spelling error
+* Thu Sep 27 2007 Than Ngo <than at redhat.com> -  3.2-55
+- fix build issue with glibc
 
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 3.2-54.fc7
 - rebuild



From fedora-extras-commits at redhat.com  Thu Sep 27 22:02:21 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 18:02:21 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.1,1.2
Message-ID: <200709272202.l8RM2LUL022461@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22390

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
Update license tag.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-SNPP.spec	7 Dec 2006 12:43:34 -0000	1.1
+++ perl-Net-SNPP.spec	27 Sep 2007 22:01:45 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Net-SNPP/
 Source0:        http://search.cpan.org/CPAN/authors/id/T/TO/TOBEYA/Net-SNPP-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
+- Update license tag.
+
 * Thu Dec  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
 - Fix typo in summary
 



From fedora-extras-commits at redhat.com  Thu Sep 27 22:03:22 2007
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Thu, 27 Sep 2007 18:03:22 -0400
Subject: devel/anaconda .cvsignore, 1.448, 1.449 anaconda.spec, 1.584,
	1.585 sources, 1.577, 1.578
Message-ID: <200709272203.l8RM3M15022556@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/pkgs/devel/anaconda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22519

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
- Support modname.option=value for passing options to kernel modules
- Fix rescue CD + nfsiso (clumens)
- Blacklist more wireless drivers that can't work
- Make buildarch more predictable (#239897)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- .cvsignore	25 Sep 2007 20:53:53 -0000	1.448
+++ .cvsignore	27 Sep 2007 22:02:49 -0000	1.449
@@ -1 +1 @@
-anaconda-11.3.0.34.tar.bz2
+anaconda-11.3.0.35.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- anaconda.spec	25 Sep 2007 20:53:53 -0000	1.584
+++ anaconda.spec	27 Sep 2007 22:02:49 -0000	1.585
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.34
+Version: 11.3.0.35
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
+- Support modname.option=value for passing options to kernel modules
+- Fix rescue CD + nfsiso (clumens)
+- Blacklist more wireless drivers that can't work
+- Make buildarch more predictable (#239897)
+
 * Tue Sep 25 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.34-1
 - A few upgrade fixes; look for packages in 
   /var/cache/yum/anaconda-upgrade/packages so that you can predownload them


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/anaconda/sources,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- sources	25 Sep 2007 20:53:53 -0000	1.577
+++ sources	27 Sep 2007 22:02:49 -0000	1.578
@@ -1 +1 @@
-068dbe6d893b21eaba209e97e12aeefc  anaconda-11.3.0.34.tar.bz2
+cfa6cb69f049ec352fb3c0d6b6301c81  anaconda-11.3.0.35.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 22:51:58 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 18:51:58 -0400
Subject: rpms/kernel/F-7 linux-2.6-libata-2.6.23-rc8-noncq.patch, NONE,
	1.1 linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch,
	NONE, 1.1 linux-2.6-uevent-zero-fill-env.patch, NONE,
	1.1 kernel-2.6.spec, 1.3349, 1.3350
Message-ID: <200709272251.l8RMpwlO024444@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24349

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-2.6.23-rc8-noncq.patch 
	linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch 
	linux-2.6-uevent-zero-fill-env.patch 
Log Message:
* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
- Revert to old RTC driver.
- Zero fill environment for uevent handlers.
- libata: update the NCQ disk blacklist.
- wireless: store channel info in bss list (bz 250913).


linux-2.6-libata-2.6.23-rc8-noncq.patch:

--- NEW FILE linux-2.6-libata-2.6.23-rc8-noncq.patch ---
--- linux-2.6.23/drivers/ata/libata-core.c
+++ linux-2.6.23/drivers/ata/libata-core.c
@@ -3791,6 +3791,8 @@
 	{ "SAMSUNG CD-ROM SN-124","N001",	ATA_HORKAGE_NODMA },
 	{ "Seagate STT20000A", NULL,		ATA_HORKAGE_NODMA },
 	{ "IOMEGA  ZIP 250       ATAPI", NULL,	ATA_HORKAGE_NODMA }, /* temporary fix */
+	{ "IOMEGA  ZIP 250       ATAPI       Floppy",
+				NULL,		ATA_HORKAGE_NODMA },
 
 	/* Weird ATAPI devices */
 	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },
@@ -3806,8 +3808,11 @@
 	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
 	{ "Maxtor 6B200M0",	"BANC1BM0",	ATA_HORKAGE_NONCQ },
 	{ "Maxtor 6B200M0",	"BANC1B10",	ATA_HORKAGE_NONCQ },
+	{ "Maxtor 7B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ, },
+	{ "Maxtor 7B300S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
+	{ "Maxtor 7V300F0",	"VA111630",	ATA_HORKAGE_NONCQ },
 	{ "HITACHI HDS7250SASUN500G 0621KTAWSD", "K2AOAJ0AHITACHI",
-	  ATA_HORKAGE_NONCQ },
+	 ATA_HORKAGE_NONCQ },
 	/* NCQ hard hangs device under heavier load, needs hard power cycle */
 	{ "Maxtor 6B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
 	/* Blacklist entries taken from Silicon Image 3124/3132
@@ -3821,8 +3826,9 @@
 	{ "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
 	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ, },
 	{ "FUJITSU MHV2080BH",	"00840028",	ATA_HORKAGE_NONCQ, },
-
-	/* Devices with NCQ limits */
+	{ "ST9160821AS",	"3.CLF",	ATA_HORKAGE_NONCQ, },
+	{ "ST3160812AS",	"3.AD",		ATA_HORKAGE_NONCQ, },
+	{ "SAMSUNG HD401LJ",	"ZZ100-15",	ATA_HORKAGE_NONCQ, },
 
 	/* End Marker */
 	{ }

linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch:

--- NEW FILE linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch ---
bz 250913

--- a/net/mac80211/ieee80211_sta.c	2007-09-23 23:45:52.000000000 +0100
+++ b/net/mac80211/ieee80211_sta.c	2007-09-23 23:57:12.000000000 +0100
@@ -64,7 +64,7 @@
 static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
 				     u8 *ssid, size_t ssid_len);
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid);
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel);
 static void ieee80211_rx_bss_put(struct net_device *dev,
 				 struct ieee80211_sta_bss *bss);
 static int ieee80211_sta_find_ibss(struct net_device *dev,
@@ -453,6 +453,7 @@
 				     struct ieee80211_if_sta *ifsta,
 				     unsigned int assoc)
 {
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	union iwreq_data wrqu;
 
 	if (!!(ifsta->flags & IEEE80211_STA_ASSOCIATED) == assoc)
@@ -468,7 +469,8 @@
 		if (sdata->type != IEEE80211_IF_TYPE_STA)
 			return;
 
-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+					   local->hw.conf.channel);
 		if (bss) {
 			if (bss->has_erp_value)
 				ieee80211_handle_erp_ie(dev, bss->erp_value);
@@ -615,7 +617,7 @@
 		capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME |
 			WLAN_CAPABILITY_SHORT_PREAMBLE;
 	}
-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
 	if (bss) {
 		if (bss->capability & WLAN_CAPABILITY_PRIVACY)
 			capab |= WLAN_CAPABILITY_PRIVACY;
@@ -1178,6 +1180,7 @@
 static int ieee80211_privacy_mismatch(struct net_device *dev,
 				      struct ieee80211_if_sta *ifsta)
 {
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
 	int res = 0;
 
@@ -1185,7 +1188,7 @@
 	    ifsta->key_management_enabled)
 		return 0;
 
-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
 	if (!bss)
 		return 0;
 
@@ -1693,7 +1696,8 @@
 	 * update our stored copy */
 	if (elems.erp_info && elems.erp_info_len >= 1) {
 		struct ieee80211_sta_bss *bss
-			= ieee80211_rx_bss_get(dev, ifsta->bssid);
+			= ieee80211_rx_bss_get(dev, ifsta->bssid,
+					       local->hw.conf.channel);
 		if (bss) {
 			bss->erp_value = elems.erp_info[0];
 			bss->has_erp_value = 1;
@@ -1723,7 +1727,8 @@
 			       " AP\n", dev->name);
 			return;
 		}
-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
+					   local->hw.conf.channel);
 		if (bss) {
 			sta->last_rssi = bss->rssi;
 			sta->last_signal = bss->signal;
@@ -2071,7 +2076,7 @@
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
+ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
@@ -2082,6 +2087,7 @@
 	atomic_inc(&bss->users);
 	atomic_inc(&bss->users);
 	memcpy(bss->bssid, bssid, ETH_ALEN);
+	bss->channel = channel;
 
 	spin_lock_bh(&local->sta_bss_lock);
 	/* TODO: order by RSSI? */
@@ -2093,7 +2099,7 @@
 
 
 static struct ieee80211_sta_bss *
-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid)
+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel)
 {
 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 	struct ieee80211_sta_bss *bss;
@@ -2101,7 +2107,8 @@
 	spin_lock_bh(&local->sta_bss_lock);
 	bss = local->sta_bss_hash[STA_HASH(bssid)];
 	while (bss) {
-		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0) {
+		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
+		    bss->channel == channel) {
 			atomic_inc(&bss->users);
 			break;
 		}
@@ -2270,9 +2277,9 @@
 	else
 		channel = rx_status->channel;
 
-	bss = ieee80211_rx_bss_get(dev, mgmt->bssid);
+	bss = ieee80211_rx_bss_get(dev, mgmt->bssid, channel);
 	if (!bss) {
-		bss = ieee80211_rx_bss_add(dev, mgmt->bssid);
+		bss = ieee80211_rx_bss_add(dev, mgmt->bssid, channel);
 		if (!bss)
 			return;
 	} else {
@@ -2389,7 +2396,6 @@
 	}
 
 	bss->hw_mode = rx_status->phymode;
-	bss->channel = channel;
 	bss->freq = rx_status->freq;
 	if (channel != rx_status->channel &&
 	    (bss->hw_mode == MODE_IEEE80211G ||
@@ -3345,7 +3351,7 @@
 	printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID " MAC_FMT "\n",
 	       dev->name, MAC_ARG(bssid));
 
-	bss = ieee80211_rx_bss_add(dev, bssid);
+	bss = ieee80211_rx_bss_add(dev, bssid, local->hw.conf.channel);
 	if (!bss)
 		return -ENOMEM;
 
@@ -3356,7 +3362,6 @@
 		local->hw.conf.beacon_int = 100;
 	bss->beacon_int = local->hw.conf.beacon_int;
 	bss->hw_mode = local->hw.conf.phymode;
-	bss->channel = local->hw.conf.channel;
 	bss->freq = local->hw.conf.freq;
 	bss->last_update = jiffies;
 	bss->capability = WLAN_CAPABILITY_IBSS;
@@ -3416,7 +3421,7 @@
 	       MAC_FMT "\n", MAC_ARG(bssid), MAC_ARG(ifsta->bssid));
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 	if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
-	    (bss = ieee80211_rx_bss_get(dev, bssid))) {
+	    (bss = ieee80211_rx_bss_get(dev, bssid, local->hw.conf.channel))) {
 		printk(KERN_DEBUG "%s: Selected IBSS BSSID " MAC_FMT
 		       " based on configured SSID\n",
 		       dev->name, MAC_ARG(bssid));

linux-2.6-uevent-zero-fill-env.patch:

--- NEW FILE linux-2.6-uevent-zero-fill-env.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5309809129ca3ab14f8bd5e5ef66c1b7686eb639
Commit:     5309809129ca3ab14f8bd5e5ef66c1b7686eb639
Parent:     544002ef832730b18327000c898a140bfc93efd4
Author:     Linus Torvalds <torvalds at woody.linux-foundation.org>
AuthorDate: Wed Sep 26 09:16:21 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Wed Sep 26 09:16:21 2007 -0700

    Add explicit zeroing to "envp" array in device 'show' method
    
    As Stephen Hemminger says, this is a "belt and suspenders" patch that
    zeroes the envp array at allocation time, even though all the users
    should NULL-terminate it anyway (and we've hopefully fixed everybody
    that doesn't do that).
    
    And we'll apparently clean the whole envp thing up for 2.6.24 anyway.
    
    But let's just be robust, and do both this *and* make sure that all
    users are doing the right thing.
    
    Acked-by: Stephen Hemminger <shemminger at linux-foundation.org>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 drivers/base/core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6de33d7..67c9258 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -284,6 +284,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
 
 	/* let the kset specific function add its keys */
 	pos = data;
+	memset(envp, 0, sizeof(envp));
 	retval = kset->uevent_ops->uevent(kset, &dev->kobj,
 					  envp, ARRAY_SIZE(envp),
 					  pos, PAGE_SIZE);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3349
retrieving revision 1.3350
diff -u -r1.3349 -r1.3350
--- kernel-2.6.spec	27 Sep 2007 15:33:19 -0000	1.3349
+++ kernel-2.6.spec	27 Sep 2007 22:51:22 -0000	1.3350
@@ -599,6 +599,7 @@
 Patch662: linux-2.6-ata-update-noncq.patch
 Patch663: linux-2.6-ata-quirk.patch
 Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
+Patch668: linux-2.6-libata-2.6.23-rc8-noncq.patch
 Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
 Patch671: linux-2.6-libata-pata_ali-fix-hp-detect.patch
 Patch672: linux-2.6-libata-pata-dma-disable-option.patch
@@ -618,8 +619,10 @@
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
 Patch693: linux-2.6-mac80211-extras.patch
+Patch694: linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch
 Patch700: linux-2.6-b43-module-alias.patch
 Patch701: linux-2.6-b43-use-old-fw.patch
+
 Patch710: linux-2.6-e1000-ich9.patch
 Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
@@ -632,6 +635,7 @@
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
+Patch760: linux-2.6-uevent-zero-fill-env.patch
 Patch770: linux-2.6-irda-smc-remove-quirk.patch
 
 Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
@@ -1322,6 +1326,7 @@
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # libata: update the noncq list
 ApplyPatch linux-2.6-ata-update-noncq.patch
+ApplyPatch linux-2.6-libata-2.6.23-rc8-noncq.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 # NSIA
@@ -1357,6 +1362,8 @@
 ApplyPatch linux-2.6-ath5k.patch
 ApplyPatch linux-2.6-zd1211rw-mac80211.patch
 ApplyPatch linux-2.6-mac80211-extras.patch
+# fix bz 250913
+ApplyPatch linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # add module alias for "bcm43xx-mac80211"
@@ -1392,6 +1399,8 @@
 ApplyPatch linux-2.6-sdhci-fix-interrupt-mask.patch
 # fix the interrupt mask fix
 ApplyPatch linux-2.6-sdhci-clear-error-interrupt.patch
+# uevent: zero fill the environment
+ApplyPatch linux-2.6-uevent-zero-fill-env.patch
 # irda: remove smc quirk that breaks hp 6000 notebooks
 ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
 
@@ -2361,6 +2370,12 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
+- Revert to old RTC driver.
+- Zero fill environment for uevent handlers.
+- libata: update the NCQ disk blacklist.
+- wireless: store channel info in bss list (bz 250913).
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - Update and restructure wireless patches
 



From fedora-extras-commits at redhat.com  Thu Sep 27 22:55:14 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 18:55:14 -0400
Subject: rpms/abyssinica-fonts/devel abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272255.l8RMtEtg024633@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24604/devel

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.



--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 22:54:40 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 22:54:40 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 22:58:56 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Thu, 27 Sep 2007 18:58:56 -0400
Subject: rpms/kernel/F-7/configs config-generic,1.336,1.337
Message-ID: <200709272258.l8RMwu7U024892@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24842/configs

Modified Files:
	config-generic 
Log Message:
update RTC config



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/configs/config-generic,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- config-generic	20 Sep 2007 22:34:06 -0000	1.336
+++ config-generic	27 Sep 2007 22:58:21 -0000	1.337
@@ -1827,18 +1827,15 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
+CONFIG_RTC=y
 # CONFIG_RTC_DEBUG is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_HCTOSYS=n
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m



From fedora-extras-commits at redhat.com  Thu Sep 27 22:59:17 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 18:59:17 -0400
Subject: rpms/abyssinica-fonts/OLPC-2 abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272259.l8RMxHGP024906@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24872/OLPC-2

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.


--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 22:58:38 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/OLPC-2/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 22:58:38 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:03:05 2007
From: fedora-extras-commits at redhat.com (Huang Peng (phuang))
Date: Thu, 27 Sep 2007 19:03:05 -0400
Subject: rpms/scim-python/devel scim-python.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200709272303.l8RN35o6031171@cvs-int.fedora.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31129/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scim-python.spec 
Log Message:
import scim-python.



--- NEW FILE scim-python.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:       scim-python
Version:    0.1.3
Release:    1%{?dist}
Summary:    Python wrapper for Smart Common Input Method platform

License:    LGPLv2+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/scim-python/
Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser)
Requires:   scim, python-enchant, pygtk2

%description
Python wrapper for Smart Common Input Method platform.

%prep
%setup -q

%build
%configure --disable-static
# 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%{python_sitearch}/scim.la
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{python_sitearch}/scim.so
%{_libdir}/scim-1.0/1.4.0/IMEngine/scim-python-engine.so
%{_libdir}/scim-1.0/1.4.0/SetupUI/scim-python-setup.so
%dir %{_datadir}/scim-python
%{_datadir}/scim-python/*
%{_datadir}/scim/icons/*

%changelog
* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.3-1
- Update to 0.1.3.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-3
- Fix build warning.
- Fix rpmlint checking warning.
- Fix build failed in x86_64 platform.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-2
- Change files: add %%dir %%{_datadir}/scim-python
- Fix build failed in x86_64 platform.

* Mon Sep 26 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.1.2-1
- Update to 0.1.2

* Mon Sep 24 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.0.2-1
- Update to 0.0.2

* Mon Sep 17 2007 Huang Peng <shawn.p.huang at gmail.com> - 0.0.1-1
- Init version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:28:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 23:02:32 -0000	1.2
@@ -0,0 +1 @@
+scim-python-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:28:35 -0000	1.1
+++ sources	27 Sep 2007 23:02:32 -0000	1.2
@@ -0,0 +1 @@
+70acce6fc5e343cc0644c81f2092b9a1  scim-python-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:17:11 2007
From: fedora-extras-commits at redhat.com (Jakub Hrozek (jhrozek))
Date: Thu, 27 Sep 2007 19:17:11 -0400
Subject: rpms/pv/devel pv.spec,1.3,1.4
Message-ID: <200709272317.l8RNHBnj031539@cvs-int.fedora.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/pv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31519

Modified Files:
	pv.spec 
Log Message:
* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-2
- Fix the license tag




Index: pv.spec
===================================================================
RCS file: /cvs/extras/rpms/pv/devel/pv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pv.spec	15 Sep 2007 16:07:02 -0000	1.3
+++ pv.spec	27 Sep 2007 23:16:38 -0000	1.4
@@ -1,8 +1,8 @@
 Summary: A tool for monitoring the progress of data through a pipeline
 Name: pv
 Version: 1.1.0
-Release: 1%{?dist}
-License: Artistic (modified)
+Release: 2%{?dist}
+License: Artistic 2.0
 Group: Development/Tools
 Source: http://pipeviewer.googlecode.com/files/%{name}-%{version}.tar.gz
 URL: http://www.ivarch.com/programs/pv.shtml
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-2
+- Fix the license tag
+
 * Sat Sep 15 2007 Jakub Hrozek <jhrozek at redhat.com> - 1.1.0-1
 - Bump to the latest upstream
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:22:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:22:36 -0700
Subject: [pkgdb] coolkey: rrelyea has requested watchbugzilla
Message-ID: <200709272322.l8RNMf4A032748@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has requested the watchbugzilla acl on coolkey (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:24:03 2007
From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie))
Date: Thu, 27 Sep 2007 19:24:03 -0400
Subject: rpms/abyssinica-fonts/F-7 abyssinica-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709272324.l8RNO36R031933@cvs-int.fedora.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/abyssinica-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	abyssinica-fonts.spec 
Log Message:
Initial import.


--- NEW FILE abyssinica-fonts.spec ---
%define archivename     AbyssinicaSIL
%define fontdir         %{_datadir}/fonts/abyssinica

Name:           abyssinica-fonts
Version:        1.0
Release:        1%{?dist}
Summary:        SIL Abyssinica fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/AbyssinicaSIL_Download
# Source0 can be downloaded from the above URL, search for "zip"
# NOTE: the archive has to be converted to a tar.bz2 file for %setup
Source0:        %{archivename}%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  dos2unix

# Providing the name of an upstream RPM
Provides:       fonts-sil-abyssinica = %{version}-%{release}

%description

SIL Abyssinica is a Unicode typeface family containing glyphs for the
Ethiopic script.

The Ethiopic script is used for writing many of the languages of Ethiopia and
Eritrea. Abyssinica SIL supports all Ethiopic characters which are in Unicode
including the Unicode 4.1 extensions. Some languages of Ethiopia are not yet
able to be fully represented in Unicode and, where necessary, we have included
non-Unicode characters in the Private Use Area (see Private-use (PUA)
characters supported by Abyssinica SIL).

Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
a regular typeface, with no bold or italic version available or planned.

%prep
%setup -q -n %{archivename}%{version}


%build
dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt


%install
rm -rf $RPM_BUILD_ROOT

#fonts
install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{fontdir}
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{fontdir}
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt

%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Fri Sep 14 2007 Bernardo Innocenti <bernie at codewiz.org> 1.0-1
- Initial packaging, borrowing many things from gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Sep 2007 21:19:35 -0000	1.1
+++ .cvsignore	27 Sep 2007 23:23:31 -0000	1.2
@@ -0,0 +1 @@
+AbyssinicaSIL1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abyssinica-fonts/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Sep 2007 21:19:35 -0000	1.1
+++ sources	27 Sep 2007 23:23:31 -0000	1.2
@@ -0,0 +1 @@
+a67dd459da402bff41484cd58aaf46db  AbyssinicaSIL1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Sep 27 23:24:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:24:04 -0700
Subject: [pkgdb] coolkey had acl change status
Message-ID: <200709272324.l8RNO9Qj000334@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has set the watchbugzilla acl on coolkey (Fedora devel) to Approved for Robert Relyea (rrelyea)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey had acl change status
Message-ID: <200709272326.l8RNQTLr000491@bastion.fedora.phx.redhat.com>

Robert Relyea (rrelyea) has set the watchbugzilla acl on coolkey (Fedora devel) to Obsolete for Robert Relyea (rrelyea)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey (Fedora, 7) updated by toshio
Message-ID: <200709272326.l8RNQTLv000491@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved watchcommits on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved commit on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved build on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved approveacls on coolkey (Fedora 7) for jmagne
Toshio Ernie Kuratomi (toshio) approved checkout on coolkey (Fedora 7) for jmagne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:26:24 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Thu, 27 Sep 2007 16:26:24 -0700
Subject: [pkgdb] coolkey (Fedora, devel) updated by toshio
Message-ID: <200709272326.l8RNQTM1000491@bastion.fedora.phx.redhat.com>

Toshio Ernie Kuratomi (toshio) approved watchbugzilla on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved watchcommits on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved commit on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved build on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved approveacls on coolkey (Fedora devel) for jmagne
Toshio Ernie Kuratomi (toshio) approved checkout on coolkey (Fedora devel) for jmagne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coolkey



From fedora-extras-commits at redhat.com  Thu Sep 27 23:32:53 2007
From: fedora-extras-commits at redhat.com (Jack Magne (jmagne))
Date: Thu, 27 Sep 2007 19:32:53 -0400
Subject: rpms/coolkey/devel coolkey-cache-dir-move.patch,NONE,1.1
Message-ID: <200709272332.l8RNWrT5032298@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32289

Added Files:
	coolkey-cache-dir-move.patch 
Log Message:
Include patch for moving the cache directory to a safe location.


coolkey-cache-dir-move.patch:

--- NEW FILE coolkey-cache-dir-move.patch ---
Index: src/coolkey/machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.4
diff -u -r1.4 machdep.cpp
--- src/coolkey/machdep.cpp	14 Feb 2007 00:46:28 -0000	1.4
+++ src/coolkey/machdep.cpp	15 Aug 2007 01:41:11 -0000
@@ -185,12 +185,20 @@
 #define MAP_INHERIT 0
 #endif
 
+#ifndef BASEPATH
+#ifdef MAC
+#define BASEPATH "/var"
+#else
+#define BASEPATH "/var/cache"
+#endif
+#endif
+
 #ifdef FULL_CLEANUP
 #define RESERVED_OFFSET 256
-#define MEMSEGPATH "/tmp/.pk11ipc"
+#define MEMSEGPATH BASEPATH"/coolkey-lock"
 #else 
 #define RESERVED_OFFSET 0
-#define MEMSEGPATH "/tmp/.pk11ipc1"
+#define MEMSEGPATH BASEPATH"/coolkey"
 #endif
 
 struct SHMemData {
@@ -208,11 +216,6 @@
 #ifdef FULL_CLEANUP
 	flock(fd,LOCK_EX);
 	unsigned long ref = --(*(unsigned long *)addr); 
-#ifdef notdef
-	if (ref == 0) {
-	    unlink(path);
-	}
-#endif
 	flock(fd, LOCK_UN);
 #endif
 	munmap(addr,size+RESERVED_OFFSET);
@@ -225,6 +228,73 @@
     }
 }
 
+/*
+ * The cache directory is shared and accessible by anyone, make
+ * sure the cache file we are opening is really a valid cache file.
+ */
+int safe_open(char *path, int flags, int mode, int size)
+{
+    struct stat buf;
+    int fd, ret;
+
+    fd = open (path, flags|O_NOFOLLOW, mode);
+
+    if (fd < 0) {
+	return fd;
+    }
+
+    ret = fstat(fd, &buf);
+    if (ret < 0) {
+	close (fd);
+	return ret;
+    }
+
+    /* our cache files are pretty specific, make sure we are looking
+     * at the correct one */
+
+    /* first, we should own the file ourselves, don't open a file
+     * that someone else wanted us to see. */
+    if (buf.st_uid != getuid()) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* next, there should only be one link in this file. Don't
+     * use this code to trash another file */
+    if (buf.st_nlink != 1) {
+	close(fd);
+	errno = EMLINK;
+	return -1;
+    }
+
+    /* next, This better be a regular file */
+    if (!S_ISREG(buf.st_mode)) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* if the permissions don't match, something is wrong */
+    if ((buf.st_mode & 03777) != mode) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* finally the file should be the correct size. This 
+     * check isn't so much to protect from an attack, as it is to
+     * detect a corrupted cache file */
+    if (buf.st_size != size) {
+	close(fd);
+	errno = EACCES;
+	return -1;
+    }
+
+    /* OK, the file checked out, ok to continue */
+    return fd;
+}
+
 SHMem::SHMem(): shmemData(0) {}
 
 SHMem *
@@ -248,7 +318,7 @@
 	return NULL;
     }
     int mask = umask(0);
-    int ret = mkdir (MEMSEGPATH, 0777);
+    int ret = mkdir (MEMSEGPATH, 01777);
     umask(mask);
     if ((ret == -1) && (errno != EEXIST)) {
 	delete shmemData;
@@ -264,21 +334,16 @@
     shmemData->path[sizeof(MEMSEGPATH)-1] = '/';
     strcpy(&shmemData->path[sizeof(MEMSEGPATH)],name);
 
-    int mode = 0777;
-    if (strcmp(name,"token_names") != 0) {
-	/* each user gets his own uid array */
-    	sprintf(uid_str, "-%u",getuid());
-    	strcat(shmemData->path,uid_str);
-	mode = 0700;
-    } 
+    sprintf(uid_str, "-%u",getuid());
+    strcat(shmemData->path,uid_str);
+    int mode = 0600;
+
     shmemData->fd = open(shmemData->path, 
 		O_CREAT|O_RDWR|O_EXCL|O_APPEND|O_EXLOCK, mode);
-    if (shmemData->fd  < 0) {
-	needInit = false;
-	shmemData->fd = open(shmemData->path,O_RDWR|O_EXLOCK, mode);
-    }  else {
+    if (shmemData->fd >= 0) {
 	char *buf;
 	int len = size+RESERVED_OFFSET;
+	int ret;
 
 	buf = (char *)calloc(1,len);
 	if (!buf) {
@@ -289,8 +354,22 @@
 	    delete shmemData;
 	    return NULL;
 	}
-	write(shmemData->fd,buf,len);
+	ret = write(shmemData->fd,buf,len);
+	if (ret != len) {
+	    unlink(shmemData->path);
+#ifdef FULL_CLEANUP
+	    flock(shmemData->fd, LOCK_UN);
+#endif
+	    delete shmemData;
+	    return NULL;
+	}
+	
 	free(buf);
+    } else if (errno == EEXIST) {
+	needInit = false;
+
+	shmemData->fd = safe_open(shmemData->path,O_RDWR|O_EXLOCK, mode,
+				  size+RESERVED_OFFSET);
     }
     if (shmemData->fd < 0) {
 	delete shmemData;



From fedora-extras-commits at redhat.com  Thu Sep 27 23:35:41 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 19:35:41 -0400
Subject: rpms/mlton/devel .cvsignore, 1.6, 1.7 mlton.spec, 1.19, 1.20 sources,
	1.6, 1.7
Message-ID: <200709272335.l8RNZfJ5032379@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32353

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
- Re-bootstrap ppc



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Sep 2007 01:35:04 -0000	1.6
+++ .cvsignore	27 Sep 2007 23:35:08 -0000	1.7
@@ -1 +1,2 @@
+mlton-20061107-1.ppc-linux.tgz
 mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mlton.spec	26 Sep 2007 23:51:46 -0000	1.19
+++ mlton.spec	27 Sep 2007 23:35:08 -0000	1.20
@@ -1,8 +1,12 @@
+%ifarch ppc
+%define mlton_bootstrap 1
+%else
 %define mlton_bootstrap 0
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -10,7 +14,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-#Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
+Source1:	mlton-20061107-1.ppc-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -98,6 +102,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
+- Re-bootstrap ppc
+
 * Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
 - Really fix SRPM conditionals
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Sep 2007 01:35:04 -0000	1.6
+++ sources	27 Sep 2007 23:35:08 -0000	1.7
@@ -1 +1,2 @@
+7f78b83b51fa5d3a020181a460b36a89  mlton-20061107-1.ppc-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Thu Sep 27 23:43:37 2007
From: fedora-extras-commits at redhat.com (Jack Magne (jmagne))
Date: Thu, 27 Sep 2007 19:43:37 -0400
Subject: rpms/coolkey/devel coolkey.spec,1.25,1.26
Message-ID: <200709272343.l8RNhbZc032623@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32483

Modified Files:
	coolkey.spec 
Log Message:
Include patch for moving the cache directory to a safe location. Resolves #299481, related #301031.



Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- coolkey.spec	21 Aug 2007 01:25:01 -0000	1.25
+++ coolkey.spec	27 Sep 2007 23:43:05 -0000	1.26
@@ -22,18 +22,19 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
+Patch1: coolkey-cache-dir-move.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: pcsc-lite-devel
 BuildRequires: zlib-devel
 BuildRequires: mozilla-nss-devel
-#Requires: nss-tools
+Requires: nss-tools
 Requires: pcsc-lite 
 Requires: pcsc-lite-libs
 Requires: ifd-egate
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch1 -b .cache.dir.move
 
 %build
 autoconf
@@ -66,25 +68,26 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p $RPM_BUILD_ROOT/var/cache/coolkey
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-#isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
-#if [ "$isThere" == "NO" ]; then
-#   if [ -x %{_bindir}/pk11install ]; then
-#      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
-#   fi
-#fi
+isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{coolkey_module} || echo NO`
+if [ "$isThere" == "NO" ]; then
+   if [ -x %{_bindir}/pk11install ]; then
+      pk11install -p %{nssdb} 'name=%{coolkey_module} library=libcoolkeypk11.so' ||:
+   fi
+fi
 
 
 %postun
 /sbin/ldconfig
-#if [ $1 -eq 0 ]; then
-#   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
-#fi
+if [ $1 -eq 0 ]; then
+   modutil -delete %{coolkey_module} -dbdir %{nssdb} -force || :
+fi
 
 
 %files
@@ -103,6 +106,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5
+- Include patch for moving the cache directory to a safe location. 
+- Bug #299481.
 * Fri Aug 20 2007 Bob Relyea <rrelyea at redhat.com> - 1.1.0-4
 - Update License description to the new Fedora standard
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:49:43 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 19:49:43 -0400
Subject: rpms/kernel/devel linux-2.6-iwlwifi-fixes.patch, NONE,
	1.1 kernel.spec, 1.194, 1.195 linux-2.6-ath5k.patch, 1.1, 1.2
Message-ID: <200709272349.l8RNnhsC000308@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	kernel.spec linux-2.6-ath5k.patch 
Added Files:
	linux-2.6-iwlwifi-fixes.patch 
Log Message:
A few iwlwifi and ath5k fixes

linux-2.6-iwlwifi-fixes.patch:

--- NEW FILE linux-2.6-iwlwifi-fixes.patch ---
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c	2007-09-27 19:09:01.000000000 -0400
@@ -115,24 +115,38 @@ struct iwl_rate_scale_priv {
 	u8 is_dup;
 	u8 phymode;
 	u8 ibss_sta_added;
+	u32 supp_rates;
 	u16 active_rate;
 	u16 active_siso_rate;
 	u16 active_mimo_rate;
 	u16 active_rate_basic;
 	struct iwl_link_quality_cmd lq;
 	struct iwl_scale_tbl_info lq_info[LQ_SIZE];
+#ifdef CONFIG_MAC80211_DEBUGFS
+	struct dentry *rs_sta_dbgfs_scale_table_file;
+	struct dentry *rs_sta_dbgfs_stats_table_file;
+	struct iwl_rate dbg_fixed;
+	struct iwl_priv *drv;
+#endif
 };
 
 static void rs_rate_scale_perform(struct iwl_priv *priv,
 				   struct net_device *dev,
 				   struct ieee80211_hdr *hdr,
 				   struct sta_info *sta);
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_rate *tx_mcs,
-			     struct iwl_link_quality_cmd *tbl,
-			     struct sta_info *sta);
+			     struct iwl_link_quality_cmd *tbl);
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index);
+#else
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{}
+#endif
 static s32 expected_tpt_A[IWL_RATE_COUNT] = {
 	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186, 186
 };
@@ -539,14 +553,13 @@ static u16 rs_get_adjacent_rate(u8 index
 
 static int rs_get_lower_rate(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_scale_tbl_info *tbl, u8 scale_index,
-			     u8 ht_possible, struct iwl_rate *mcs_rate,
-			     struct sta_info *sta)
+			     u8 ht_possible, struct iwl_rate *mcs_rate)
 {
-	u8 is_green = lq_data->is_green;
 	s32 low;
 	u16 rate_mask;
 	u16 high_low;
 	u8 switch_to_legacy = 0;
+	u8 is_green = lq_data->is_green;
 
 	/* check if we need to switch from HT to legacy rates.
 	 * assumption is that mandatory rates (1Mbps or 6Mbps)
@@ -573,9 +586,9 @@ static int rs_get_lower_rate(struct iwl_
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_mask  = (u16)(rate_mask &
-			   (sta->supp_rates << IWL_FIRST_OFDM_RATE));
+			   (lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
-			rate_mask = (u16)(rate_mask & sta->supp_rates);
+			rate_mask = (u16)(rate_mask & lq_data->supp_rates);
 	}
 
 	/* if we did switched from HT to legacy check current rate */
@@ -619,7 +632,7 @@ static void rs_tx_status(void *priv_rate
 	u16 fc = le16_to_cpu(hdr->frame_control);
 	s32 tpt = 0;
 
-	IWL_DEBUG_RATE("get frame ack response, update rate scale window\n");
+	IWL_DEBUG_RATE_LIMIT("get frame ack response, update rate scale window\n");
 
 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
 		return;
@@ -1388,10 +1401,10 @@ static void rs_rate_scale_perform(struct
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_scale_index_msk = (u16) (rate_mask &
-				(sta->supp_rates << IWL_FIRST_OFDM_RATE));
+				(lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
 			rate_scale_index_msk = (u16) (rate_mask &
-						      sta->supp_rates);
+						      lq_data->supp_rates);
 
 	} else
 		rate_scale_index_msk = rate_mask;
@@ -1431,7 +1444,7 @@ static void rs_rate_scale_perform(struct
 		rs_stay_in_table(lq_data);
 		if (update_lq) {
 			rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		goto out;
@@ -1555,7 +1568,7 @@ static void rs_rate_scale_perform(struct
  lq_update:
 	if (update_lq) {
 		rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 		rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 	}
 	rs_stay_in_table(lq_data);
@@ -1581,7 +1594,7 @@ static void rs_rate_scale_perform(struct
 			IWL_DEBUG_HT("Switch current  mcs: %X index: %d\n",
 				     tbl->current_rate.rate_n_flags, index);
 			rs_fill_link_cmd(lq_data, &tbl->current_rate,
-					 &(lq_data->lq), sta);
+					 &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		tbl1 = &(lq_data->lq_info[lq_data->active_tbl]);
@@ -1672,12 +1685,12 @@ static void rs_initialize_lq(struct iwl_
 	tbl->antenna_type = ANT_AUX;
 	rs_get_tbl_info_from_mcs(&mcs_rate, priv->phymode, tbl, &rate_idx);
 	if (!rs_is_ant_connected(priv->valid_antenna, tbl->antenna_type))
-	    rs_toggle_antenna(&mcs_rate, tbl),
+	    rs_toggle_antenna(&mcs_rate, tbl);
 
 	rs_mcs_from_tbl(&mcs_rate, tbl, rate_idx, use_green);
 	tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
 	rs_get_expected_tpt_table(lq, tbl);
-	rs_fill_link_cmd(lq, &mcs_rate, &(lq->lq), sta);
+	rs_fill_link_cmd(lq, &mcs_rate, &lq->lq);
 	rs_send_lq_cmd(priv, &lq->lq, CMD_ASYNC);
  out:
 	return;
@@ -1714,7 +1727,7 @@ static struct ieee80211_rate *rs_get_rat
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *lq;
 
-	IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
+	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
 	memset(extra, 0, sizeof(*extra));
 
@@ -1775,10 +1788,9 @@ static void *rs_alloc_sta(void *priv, gf
 
 	if (crl == NULL)
 		return NULL;
-
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
 	crl->lq.sta_id = 0xff;
 
+
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
 			rs_rate_scale_clear_window(&(crl->lq_info[j].win[i]));
@@ -1795,10 +1807,8 @@ static void rs_rate_init(void *priv_rate
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *crl = priv_sta;
 
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
-
-	crl->lq.sta_id = 0xff;
 	crl->flush_timer = 0;
+	crl->supp_rates = sta->supp_rates;
 	sta->txrate = 3;
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
@@ -1864,6 +1874,9 @@ static void rs_rate_init(void *priv_rate
 	IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate,
 		     crl->active_mimo_rate);
 #endif /*CONFIG_IWLWIFI_HT*/
+#ifdef CONFIG_MAC80211_DEBUGFS
+	crl->drv = priv;
+#endif
 
 	if (priv->assoc_station_added)
 		priv->lq_mngr.lq_ready = 1;
@@ -1871,28 +1884,28 @@ static void rs_rate_init(void *priv_rate
 	rs_initialize_lq(priv, sta);
 }
 
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			    struct iwl_rate *tx_mcs,
-			    struct iwl_link_quality_cmd *lq_cmd,
-			    struct sta_info *sta)
+			    struct iwl_link_quality_cmd *lq_cmd)
 {
 	int index = 0;
-	int rc = 0;
 	int rate_idx;
+	int repeat_rate = 0;
 	u8 ant_toggle_count = 0;
 	u8 use_ht_possible = 1;
-	u8 repeat_cur_rate = 0;
 	struct iwl_rate new_rate;
 	struct iwl_scale_tbl_info tbl_type = { 0 };
 
+	rs_dbgfs_set_mcs(lq_data, tx_mcs, index);
+
 	rs_get_tbl_info_from_mcs(tx_mcs, lq_data->phymode,
 				  &tbl_type, &rate_idx);
 
 	if (is_legacy(tbl_type.lq_type)) {
 		ant_toggle_count = 1;
-		repeat_cur_rate = IWL_NUMBER_TRY;
+		repeat_rate = IWL_NUMBER_TRY;
 	} else
-		repeat_cur_rate = IWL_HT_NUMBER_TRY;
+		repeat_rate = IWL_HT_NUMBER_TRY;
 
 	lq_cmd->general_params.mimo_delimiter =
 			is_mimo(tbl_type.lq_type) ? 1 : 0;
@@ -1906,10 +1919,10 @@ static int rs_fill_link_cmd(struct iwl_r
 		lq_cmd->general_params.single_stream_ant_msk = 2;
 
 	index++;
-	repeat_cur_rate--;
+	repeat_rate--;
 
 	while (index < LINK_QUAL_MAX_RETRY_NUM) {
-		while (repeat_cur_rate && (index < LINK_QUAL_MAX_RETRY_NUM)) {
+		while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
 			if (is_legacy(tbl_type.lq_type)) {
 				if (ant_toggle_count <
 				    NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1919,9 +1932,11 @@ static int rs_fill_link_cmd(struct iwl_r
 					ant_toggle_count = 1;
 				}
 			}
+
+			rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 			lq_cmd->rs_table[index].rate_n_flags =
 					cpu_to_le32(new_rate.rate_n_flags);
-			repeat_cur_rate--;
+			repeat_rate--;
 			index++;
 		}
 
@@ -1932,7 +1947,7 @@ static int rs_fill_link_cmd(struct iwl_r
 			lq_cmd->general_params.mimo_delimiter = index;
 
 		rs_get_lower_rate(lq_data, &tbl_type, rate_idx,
-				  use_ht_possible, &new_rate, sta);
+				  use_ht_possible, &new_rate);
 
 		if (is_legacy(tbl_type.lq_type)) {
 			if (ant_toggle_count < NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1941,26 +1956,23 @@ static int rs_fill_link_cmd(struct iwl_r
 				rs_toggle_antenna(&new_rate, &tbl_type);
 				ant_toggle_count = 1;
 			}
-			repeat_cur_rate = IWL_NUMBER_TRY;
+			repeat_rate = IWL_NUMBER_TRY;
 		} else
-			repeat_cur_rate = IWL_HT_NUMBER_TRY;
+			repeat_rate = IWL_HT_NUMBER_TRY;
 
 		use_ht_possible = 0;
 
+		rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 		lq_cmd->rs_table[index].rate_n_flags =
 				cpu_to_le32(new_rate.rate_n_flags);
-		/* lq_cmd->rs_table[index].rate_n_flags = 0x800d; */
 
 		index++;
-		repeat_cur_rate--;
+		repeat_rate--;
 	}
 
-	/* lq_cmd->rs_table[0].rate_n_flags = 0x800d; */
-
 	lq_cmd->general_params.dual_stream_ant_msk = 3;
 	lq_cmd->agg_params.agg_dis_start_th = 3;
 	lq_cmd->agg_params.agg_time_limit = cpu_to_le16(4000);
-	return rc;
 }
 
 static void *rs_alloc(struct ieee80211_local *local)
@@ -2000,6 +2012,162 @@ static void rs_free_sta(void *priv, void
 }
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{
+	const u32 cck_rate = 0x820A;
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		if (index < 12)
+			mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
+		else
+			mcs->rate_n_flags = cck_rate;
+		IWL_DEBUG_RATE("Fixed rate ON\n");
+		return;
+	}
+
+	IWL_DEBUG_RATE("Fixed rate OFF\n");
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
+			const char __user *user_buf, size_t count, loff_t *ppos)
+{
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	char buf[64];
+	int buf_size;
+	u32 parsed_rate;
+
+	memset(buf, 0, sizeof(buf));
+	buf_size = min(count, sizeof(buf) -  1);
+	if (copy_from_user(buf, user_buf, buf_size))
+		return -EFAULT;
+
+	if (sscanf(buf, "%x", &parsed_rate) == 1)
+		rs_priv->dbg_fixed.rate_n_flags = parsed_rate;
+	else
+		rs_priv->dbg_fixed.rate_n_flags = 0;
+
+	rs_priv->active_rate = 0x0FFF;
+	rs_priv->active_siso_rate = 0x1FD0;
+	rs_priv->active_mimo_rate = 0x1FD0;
+
+	IWL_DEBUG_RATE("sta_id %d rate 0x%X\n",
+		rs_priv->lq.sta_id, rs_priv->dbg_fixed.rate_n_flags);
+
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		rs_fill_link_cmd(rs_priv, &rs_priv->dbg_fixed, &rs_priv->lq);
+		rs_send_lq_cmd(rs_priv->drv, &rs_priv->lq, CMD_ASYNC);
+	}
+
+	return count;
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i = 0;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+
+	desc += sprintf(buff+desc, "sta_id %d\n", rs_priv->lq.sta_id);
+	desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
+			rs_priv->total_failed, rs_priv->total_success,
+			rs_priv->active_rate);
+	desc += sprintf(buff+desc, "fixed rate 0x%X\n",
+			rs_priv->dbg_fixed.rate_n_flags);
+	desc += sprintf(buff+desc, "general:"
+		"flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
+		rs_priv->lq.general_params.flags,
+		rs_priv->lq.general_params.mimo_delimiter,
+		rs_priv->lq.general_params.single_stream_ant_msk,
+		rs_priv->lq.general_params.dual_stream_ant_msk);
+
+	desc += sprintf(buff+desc, "agg:"
+			"time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
+			le16_to_cpu(rs_priv->lq.agg_params.agg_time_limit),
+			rs_priv->lq.agg_params.agg_dis_start_th,
+			rs_priv->lq.agg_params.agg_frame_cnt_limit);
+
+	desc += sprintf(buff+desc,
+			"Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
+			rs_priv->lq.general_params.start_rate_index[0],
+			rs_priv->lq.general_params.start_rate_index[1],
+			rs_priv->lq.general_params.start_rate_index[2],
+			rs_priv->lq.general_params.start_rate_index[3]);
+
+
+	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+		desc += sprintf(buff+desc, " rate[%d] 0x%X\n",
+			i, le32_to_cpu(rs_priv->lq.rs_table[i].rate_n_flags));
+
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
+	.write = rs_sta_dbgfs_scale_table_write,
+	.read = rs_sta_dbgfs_scale_table_read,
+	.open = open_file_generic,
+};
+static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i, j;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	for (i = 0; i < LQ_SIZE; i++) {
+		desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n"
+				"rate=0x%X\n",
+				rs_priv->active_tbl == i?"*":"x",
+				rs_priv->lq_info[i].lq_type,
+				rs_priv->lq_info[i].is_SGI,
+				rs_priv->lq_info[i].is_fat,
+				rs_priv->lq_info[i].is_dup,
+				rs_priv->lq_info[i].current_rate.rate_n_flags);
+		for (j = 0; j < IWL_RATE_COUNT; j++) {
+			desc += sprintf(buff+desc,
+					"counter=%d success=%d %%=%d\n",
+					rs_priv->lq_info[i].win[j].counter,
+					rs_priv->lq_info[i].win[j].success_counter,
+					rs_priv->lq_info[i].win[j].success_ratio);
+		}
+	}
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+	.read = rs_sta_dbgfs_stats_table_read,
+	.open = open_file_generic,
+};
+
+static void rs_add_debugfs(void *priv, void *priv_sta,
+					struct dentry *dir)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	rs_priv->rs_sta_dbgfs_scale_table_file =
+		debugfs_create_file("rate_scale_table", 0600, dir,
+				rs_priv, &rs_sta_dbgfs_scale_table_ops);
+	rs_priv->rs_sta_dbgfs_stats_table_file =
+		debugfs_create_file("rate_stats_table", 0600, dir,
+			rs_priv, &rs_sta_dbgfs_stats_table_ops);
+}
+
+static void rs_remove_debugfs(void *priv, void *priv_sta)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	debugfs_remove(rs_priv->rs_sta_dbgfs_scale_table_file);
+	debugfs_remove(rs_priv->rs_sta_dbgfs_stats_table_file);
+}
+#endif
+
 static struct rate_control_ops rs_ops = {
 	.module = NULL,
 	.name = RS_NAME,
@@ -2011,6 +2179,10 @@ static struct rate_control_ops rs_ops = 
 	.free = rs_free,
 	.alloc_sta = rs_alloc_sta,
 	.free_sta = rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+	.add_sta_debugfs = rs_add_debugfs,
+	.remove_sta_debugfs = rs_remove_debugfs,
+#endif
 };
 
 int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2007-09-27 19:09:01.000000000 -0400
@@ -102,7 +102,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -203,7 +203,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
 
 /**************************************************************/
 
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,6 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
+#endif
 
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
@@ -851,16 +853,12 @@ int iwl_send_statistics_request(struct i
 static int iwl_rxon_add_station(struct iwl_priv *priv,
 				const u8 *addr, int is_ap)
 {
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
+	u8 sta_id;
 
+	sta_id = iwl_add_station(priv, addr, is_ap, 0);
 	iwl4965_add_station(priv, addr, is_ap);
 
-	return rc;
+	return sta_id;
 }
 
 /**
@@ -1147,16 +1145,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1176,6 +1164,8 @@ static int iwl_commit_rxon(struct iwl_pr
 		return rc;
 	}
 
+	iwl_clear_stations_table(priv);
+
 #ifdef CONFIG_IWLWIFI_SENSITIVITY
 	if (!priv->error_recovering)
 		priv->start_calib = 0;
@@ -4608,6 +4598,7 @@ static void iwl_rx_handle(struct iwl_pri
 		reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
 			(pkt->hdr.cmd != REPLY_RX_PHY_CMD) &&
 			(pkt->hdr.cmd != REPLY_4965_RX) &&
+			(pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
 			(pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
 			(pkt->hdr.cmd != REPLY_TX);
 
@@ -4893,12 +4884,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -7483,9 +7474,8 @@ static void iwl_config_ap(struct iwl_pri
 		iwl_activate_qos(priv, 1);
 #endif
 		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c	2007-09-27 19:10:39.000000000 -0400
@@ -183,7 +183,7 @@ u8 iwl_hw_find_station(struct iwl_priv *
 			goto out;
 		}
 
-	IWL_DEBUG_ASSOC("can not find STA " MAC_FMT " total %d\n",
+	IWL_DEBUG_ASSOC_LIMIT("can not find STA " MAC_FMT " total %d\n",
 			MAC_ARG(addr), priv->num_stations);
 
  out:
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h	2007-09-27 19:09:01.000000000 -0400
@@ -136,8 +136,11 @@ static inline void IWL_DEBUG_LIMIT(int l
 #define IWL_DEBUG_TXPOWER(f, a...) IWL_DEBUG(IWL_DL_TXPOWER, f, ## a)
 #define IWL_DEBUG_IO(f, a...) IWL_DEBUG(IWL_DL_IO, f, ## a)
 #define IWL_DEBUG_RATE(f, a...) IWL_DEBUG(IWL_DL_RATE, f, ## a)
+#define IWL_DEBUG_RATE_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_RATE, f, ## a)
 #define IWL_DEBUG_NOTIF(f, a...) IWL_DEBUG(IWL_DL_NOTIF, f, ## a)
 #define IWL_DEBUG_ASSOC(f, a...) IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
+#define IWL_DEBUG_ASSOC_LIMIT(f, a...) \
+	IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2007-09-27 19:08:16.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2007-09-27 19:10:13.000000000 -0400
@@ -103,7 +103,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -204,7 +204,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
  */
 
 /**************************************************************/
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,7 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
-
+#endif
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
 	unsigned long flags;
@@ -462,6 +463,7 @@ u8 iwl_add_station(struct iwl_priv *priv
 	int index = IWL_INVALID_STATION;
 	struct iwl_station_entry *station;
 	unsigned long flags_spin;
+	u8 rate;
 
 	spin_lock_irqsave(&priv->sta_lock, flags_spin);
 	if (is_ap)
@@ -505,6 +507,15 @@ u8 iwl_add_station(struct iwl_priv *priv
 	station->sta.sta.sta_id = index;
 	station->sta.station_flags = 0;
 
+	rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :
+				IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;
+
+	/* Turn on both antennas for the station... */
+	station->sta.rate_n_flags =
+			iwl_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
+	station->current_rate.rate_n_flags =
+			le16_to_cpu(station->sta.rate_n_flags);
+
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	iwl_send_add_station(priv, &station->sta, flags);
 	return index;
@@ -834,25 +845,6 @@ int iwl_send_statistics_request(struct i
 }
 
 /**
- * iwl_rxon_add_station - add station into station table.
- *
- * there is only one AP station with id= IWL_AP_ID
- * NOTE: mutex must be held before calling the this fnction
-*/
-static int iwl_rxon_add_station(struct iwl_priv *priv,
-				const u8 *addr, int is_ap)
-{
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
-
-	return rc;
-}
-
-/**
  * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
  * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
  * @channel: Any channel valid for the requested phymode
@@ -1121,16 +1113,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1152,6 +1134,8 @@ static int iwl_commit_rxon(struct iwl_pr
 
 	memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
 
+	iwl_clear_stations_table(priv);
+
 	/* If we issue a new RXON command which required a tune then we must
 	 * send a new TXPOWER command or we won't be able to Tx any frames */
 	rc = iwl_hw_reg_send_txpower(priv);
@@ -1161,7 +1145,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	}
 
 	/* Add the broadcast address so we can send broadcast frames */
-	if (iwl_rxon_add_station(priv, BROADCAST_ADDR, 0) ==
+	if (iwl_add_station(priv, BROADCAST_ADDR, 0, 0) ==
 	    IWL_INVALID_STATION) {
 		IWL_ERROR("Error adding BROADCAST address for transmit.\n");
 		return -EIO;
@@ -1171,7 +1155,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	 * add the IWL_AP_ID to the station rate table */
 	if (iwl_is_associated(priv) &&
 	    (priv->iw_mode == IEEE80211_IF_TYPE_STA))
-		if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
+		if (iwl_add_station(priv, priv->active_rxon.bssid_addr, 1, 0)
 		    == IWL_INVALID_STATION) {
 			IWL_ERROR("Error adding AP address for transmit.\n");
 			return -EIO;
@@ -4583,12 +4567,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -4650,7 +4634,7 @@ static void iwl_error_recovery(struct iw
 	priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	iwl_commit_rxon(priv);
 
-	iwl_rxon_add_station(priv, priv->bssid, 1);
+	iwl_add_station(priv, priv->bssid, 1, 0);
 
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
@@ -6793,8 +6777,8 @@ static void iwl_bg_post_associate(struct
 		/* clear out the station table */
 		iwl_clear_stations_table(priv);
 
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_rxon_add_station(priv, priv->bssid, 0);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+		iwl_add_station(priv, priv->bssid, 0, 0);
 		iwl3945_sync_sta(priv, IWL_STA_ID,
 				 (priv->phymode == MODE_IEEE80211A)?
 				 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
@@ -7082,10 +7066,9 @@ static void iwl_config_ap(struct iwl_pri
 		/* restore RXON assoc */
 		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
 		iwl_commit_rxon(priv);
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
@@ -7168,8 +7151,8 @@ static int iwl_mac_config_interface(stru
 						RXON_FILTER_ASSOC_MSK;
 			rc = iwl_commit_rxon(priv);
 			if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
-				iwl_rxon_add_station(
-					priv, priv->active_rxon.bssid_addr, 1);
+				iwl_add_station(priv,
+					priv->active_rxon.bssid_addr, 1, 0);
 		}
 
 	} else {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kernel.spec	27 Sep 2007 16:33:17 -0000	1.194
+++ kernel.spec	27 Sep 2007 23:49:10 -0000	1.195
@@ -632,6 +632,7 @@
 Patch662: linux-2.6-libata-pata-dma-disable-option.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-iwlwifi-fixes.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1143,6 +1144,8 @@
 # wireless patches headed for 2.6.23
 # wireless patches staged for 2.6.24
 ApplyPatch linux-2.6-wireless-pending.patch
+# late-breaking iwlwifi fixes (will be rolled into wireless-pending patch)
+ApplyPatch linux-2.6-iwlwifi-fixes.patch
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 ApplyPatch linux-2.6-ath5k.patch
@@ -1809,6 +1812,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- A few iwlwifi and ath5k fixes
+
 * Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc8-git2
 - Re-add AMD timer fix removed from upstream

linux-2.6-ath5k.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-ath5k.patch
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ath5k.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ath5k.patch	27 Sep 2007 00:43:34 -0000	1.1
+++ linux-2.6-ath5k.patch	27 Sep 2007 23:49:10 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-26 19:59:33.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-26 20:00:12.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 19:26:44.000000000 -0400
 @@ -642,6 +642,14 @@ M:	ecashin at coraid.com
  W:	http://www.coraid.com/support/linux
  S:	Supported
@@ -16,14050 +16,13915 @@
  ATL1 ETHERNET DRIVER
  P:	Jay Cliburn
  M:	jcliburn at gmail.com
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-26 20:00:12.000000000 -0400
-@@ -0,0 +1,1104 @@
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 19:27:03.000000000 -0400
+@@ -61,3 +61,5 @@ obj-$(CONFIG_RT2X00)		+= rt2x00/
+ obj-$(CONFIG_P54_COMMON)	+= p54common.o
+ obj-$(CONFIG_P54_USB)		+= p54usb.o
+ obj-$(CONFIG_P54_PCI)		+= p54pci.o
++
++obj-$(CONFIG_ATH5K)	+= ath5k/
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 19:25:02.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 19:26:44.000000000 -0400
+@@ -598,6 +598,19 @@ config P54_PCI
+ 	tristate "Prism54 PCI support"
+ 	depends on P54_COMMON && PCI
+ 
++config ATH5K
++	tristate "Atheros 5xxx wireless cards support"
++	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
++	default m
++	---help---
++	  This module adds support for atheros 5xxx (e.g. 5212) wireless
++	  cards. If you have this card in your PC, select this to be build.
++
++	  This driver uses the kernel's mac80211 subsystem.
++
++	  If you choose to build a module, it'll be called ath5k. Say M if
++	  unsure.
++
+ source "drivers/net/wireless/hostap/Kconfig"
+ source "drivers/net/wireless/bcm43xx/Kconfig"
+ source "drivers/net/wireless/b43/Kconfig"
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c	2007-09-27 19:26:44.000000000 -0400
+@@ -0,0 +1,1704 @@
 +/*
-+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
-+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
++ * PHY functions
 + *
-+ * Permission to use, copy, modify, and 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.
++ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ *  This file is free software: you can copy, redistribute 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 file 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/>.
++ *
++ * This file incorporates work covered by the following copyright and
++ * permission notice:
++ *
++ *     Copyright (c) 2007 Jiri Slaby <jirislaby at gmail.com>
++ *     Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk at openbsd.org>
++ *
++ *     Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL
++ *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
++ *     AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
 + */
 +
-+#ifndef _ATH5K_H
-+#define _ATH5K_H
++#include <linux/delay.h>
 +
-+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
-+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
-+ * long and results timeouts). It's also illegal to tune to some of the
-+ * supported frequencies in some countries, so use this at your own risk,
-+ * you've been warned. */
-+#define CHAN_DEBUG	0
++#include "ath5k.h"
++#include "reg.h"
 +
-+/* Uncomment this for debuging (warning that it results in TOO much output) */
-+/*#define AR5K_DEBUG	1 */
++/* Struct to hold initial RF register values (RF Banks) */
++struct ath5k_ini_rf {
++	u8	rf_bank;	/* check out ath5k_reg.h */
++	u16	rf_register;	/* register address */
++	u32	rf_value[5];	/* register value for different modes (above) */
++};
 +
-+#include <linux/types.h>
-+#include <net/mac80211.h>
++/*
++ * Mode-specific RF Gain table (64bytes) for RF5111/5112
++ * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial
++ * RF Gain values are included in AR5K_AR5210_INI)
++ */
++struct ath5k_ini_rfgain {
++	u16	rfg_register;	/* RF Gain register address */
++	u32	rfg_value[2];	/* [freq (see below)] */
++};
 +
-+#include "ath5k_hw.h"
-+#include "ath5k_regdom.h"
++struct ath5k_gain_opt {
++	u32			go_default;
++	u32			go_steps_count;
++	const struct ath5k_gain_opt_step	go_step[AR5K_GAIN_STEP_COUNT];
++};
 +
-+/* PCI IDs */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
-+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
++/* RF5111 mode-specific init registers */
++static const struct ath5k_ini_rf rfregs_5111[] = {
++	{ 0, 0x989c,
++	/*    mode a/XR   mode aTurbo mode b      mode g      mode gTurbo */
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
[...25702 lines suppressed...]
-+/*
-+ * PHY current RSSI register [5111+]
-+ */
-+#define	AR5K_PHY_CURRENT_RSSI		0x9c1c
++	ret = pci_register_driver(&ath_pci_drv_id);
++	if (ret) {
++		printk(KERN_ERR "ath_pci: can't register pci driver\n");
++		return ret;
++	}
++	ath_sysctl_header = register_sysctl_table(ath_root_table);
 +
-+/*
-+ * PHY PCDAC TX power table
-+ */
-+#define	AR5K_PHY_PCDAC_TXPOWER_BASE	0xa180
-+#define	AR5K_PHY_PCDAC_TXPOWER(_n)	(AR5K_PHY_PCDAC_TXPOWER_BASE + ((_n) << 2))
++	return 0;
++}
 +
-+/*
-+ * PHY mode register [5111+]
-+ */
-+#define	AR5K_PHY_MODE			0x0a200		/* Register address */
-+#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation mask*/
-+#define AR5K_PHY_MODE_MOD_OFDM		0
-+#define AR5K_PHY_MODE_MOD_CCK		1
-+#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode mask */
-+#define	AR5K_PHY_MODE_FREQ_5GHZ		0
-+#define	AR5K_PHY_MODE_FREQ_2GHZ		2
-+#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Dynamic OFDM/CCK mode mask [5112+] */
-+#define AR5K_PHY_MODE_RAD		0x00000008	/* [5212+] */
-+#define AR5K_PHY_MODE_RAD_RF5111	0
-+#define AR5K_PHY_MODE_RAD_RF5112	8
-+#define AR5K_PHY_MODE_XR		0x00000010	/* [5112+] */
++static void __exit exit_ath_pci(void)
++{
++	if (ath_sysctl_header)
++		unregister_sysctl_table(ath_sysctl_header);
++	pci_unregister_driver(&ath_pci_drv_id);
++}
 +
-+/*
-+ * PHY CCK transmit control register [5111+ (?)]
-+ */
-+#define AR5K_PHY_CCKTXCTL		0xa204
-+#define AR5K_PHY_CCKTXCTL_WORLD		0x00000000
-+#define AR5K_PHY_CCKTXCTL_JAPAN		0x00000010
++module_init(init_ath_pci);
++module_exit(exit_ath_pci);
 +
-+/*
-+ * PHY 2GHz gain register [5111+]
-+ */
-+#define	AR5K_PHY_GAIN_2GHZ		0xa20c
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX	0x00fc0000
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S	18
-+#define	AR5K_PHY_GAIN_2GHZ_INI_5111	0x6480416c
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h
---- /dev/null	2007-09-25 08:26:55.562976333 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h	2007-09-26 20:00:12.000000000 -0400
++MODULE_AUTHOR("Jiri Slaby");
++MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards.");
++MODULE_SUPPORTED_DEVICE("Atheros WLAN cards");
++MODULE_LICENSE("Dual BSD/GPL");
++MODULE_VERSION(ATH_PCI_VERSION " (EXPERIMENTAL)");
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h	2007-09-27 19:26:44.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*-
 + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -14265,3 +14130,128 @@
 +	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
 +
 +#endif
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c	2007-09-27 19:26:44.000000000 -0400
+@@ -0,0 +1,121 @@
++/*
++ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
++ *
++ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Basic regulation domain extensions for the IEEE 802.11 stack
++ */
++
++#include <linux/kernel.h>
++#include <linux/string.h>
++
++#include "regdom.h"
++
++static const struct ath5k_regdommap {
++	enum ath5k_regdom dmn;
++	enum ath5k_regdom dmn5;
++	enum ath5k_regdom dmn2;
++} r_map[] = {
++	{ DMN_DEFAULT,		DMN_DEBUG,	DMN_DEBUG },
++	{ DMN_NULL_WORLD,	DMN_NULL,	DMN_WORLD },
++	{ DMN_NULL_ETSIB,	DMN_NULL,	DMN_ETSIB },
++	{ DMN_NULL_ETSIC,	DMN_NULL,	DMN_ETSIC },
++	{ DMN_FCC1_FCCA,	DMN_FCC1,	DMN_FCCA },
++	{ DMN_FCC1_WORLD,	DMN_FCC1,	DMN_WORLD },
++	{ DMN_FCC2_FCCA,	DMN_FCC2,	DMN_FCCA },
++	{ DMN_FCC2_WORLD,	DMN_FCC2,	DMN_WORLD },
++	{ DMN_FCC2_ETSIC,	DMN_FCC2,	DMN_ETSIC },
++	{ DMN_FRANCE_NULL,	DMN_ETSI3,	DMN_ETSI3 },
++	{ DMN_FCC3_FCCA,	DMN_FCC3,	DMN_WORLD },
++	{ DMN_ETSI1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_ETSI3_ETSIA,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI2_WORLD,	DMN_ETSI2,	DMN_WORLD },
++	{ DMN_ETSI3_WORLD,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI4_WORLD,	DMN_ETSI4,	DMN_WORLD },
++	{ DMN_ETSI4_ETSIC,	DMN_ETSI4,	DMN_ETSIC },
++	{ DMN_ETSI5_WORLD,	DMN_ETSI5,	DMN_WORLD },
++	{ DMN_ETSI6_WORLD,	DMN_ETSI6,	DMN_WORLD },
++	{ DMN_ETSI_NULL,	DMN_ETSI1,	DMN_ETSI1 },
++	{ DMN_MKK1_MKKA,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKB,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL4_WORLD,	DMN_APL4,	DMN_WORLD },
++	{ DMN_MKK2_MKKA,	DMN_MKK2,	DMN_MKKA },
++	{ DMN_APL_NULL,		DMN_APL1,	DMN_NULL },
++	{ DMN_APL2_WORLD,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL2_APLC,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL3_WORLD,	DMN_APL3,	DMN_WORLD },
++	{ DMN_MKK1_FCCA,	DMN_MKK1,	DMN_FCCA },
++	{ DMN_APL2_APLD,	DMN_APL2,	DMN_APLD },
++	{ DMN_MKK1_MKKA1,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKA2,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL1_WORLD,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_FCCA,	DMN_APL1,	DMN_FCCA },
++	{ DMN_APL1_APLA,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_ETSIC,	DMN_APL1,	DMN_ETSIC },
++	{ DMN_APL2_ETSIC,	DMN_APL2,	DMN_ETSIC },
++	{ DMN_APL5_WORLD,	DMN_APL5,	DMN_WORLD },
++	{ DMN_WOR0_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR1_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR2_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR3_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR4_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR5_ETSIC,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR01_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR02_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_EU1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_WOR9_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WORA_WORLD,	DMN_WORLD,	DMN_WORLD },
++};
++
++enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom dmn, u16 mhz)
++{
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(r_map); i++) {
++		if (r_map[i].dmn == dmn) {
++			if (mhz >= 2000 && mhz <= 3000)
++				return r_map[i].dmn2;
++			if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
++					mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
++				return r_map[i].dmn5;
++		}
++	}
++
++	return DMN_DEBUG;
++}
++
++u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee)
++{
++	u32 regdomain = (u32)ieee;
++
++	/*
++	 * Use the default regulation domain if the value is empty
++	 * or not supported by the net80211 regulation code.
++	 */
++	if (ath5k_regdom2flag(regdomain, IEEE80211_CHANNELS_5GHZ_MIN) ==
++			DMN_DEBUG)
++		return (u16)AR5K_TUNE_REGDOMAIN;
++
++	/* It is supported, just return the value */
++	return regdomain;
++}
++
++enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain)
++{
++	enum ath5k_regdom ieee = (enum ath5k_regdom)regdomain;
++
++	return ieee;
++}
++



From fedora-extras-commits at redhat.com  Thu Sep 27 23:51:37 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 19:51:37 -0400
Subject: rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.2,
	1.3 TurboGears.spec, 1.22, 1.23
Message-ID: <200709272351.l8RNpbX6000421@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv394

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
- Update setuptools patch to modify quickstart template for compat eggs as well.


TurboGears-1.0.3.2-setuptools.patch:

Index: TurboGears-1.0.3.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.3.2-setuptools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
+++ TurboGears-1.0.3.2-setuptools.patch	27 Sep 2007 23:51:34 -0000	1.3
@@ -1,6 +1,8 @@
---- setup.py.orig	2007-09-24 15:30:20.000000000 -0400
-+++ setup.py	2007-09-24 15:31:10.000000000 -0400
-@@ -16,34 +16,23 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -16,34 +16,23 @@ install_requires = [
              "TurboJson >= 0.9.9",
              "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
@@ -37,7 +39,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +116,7 @@
+@@ -127,7 +116,7 @@ The latest development version is availa
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,
@@ -46,3 +48,15 @@
          "testtools" : ["nose >= 0.9.1"],
          "tgtesttools" : tgtesttools,
      },
+Index: turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+===================================================================
+--- turbogears/qstemplates/quickstart/start-+package+.py_tmpl.orig
++++ turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+@@ -1,6 +1,6 @@
+ #!${sys_executable}
++__requires__="TurboGears"
+ import pkg_resources
+-pkg_resources.require("TurboGears")
+ 
+ from turbogears import config, update_config, start_server
+ import cherrypy


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
+++ TurboGears.spec	27 Sep 2007 23:51:34 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -27,8 +27,17 @@
 Requires: python-elementtree >= 1.2.6
 %endif
 
-Requires:       python-kid >= 0.8
+# The main packages have gone up a version.  Need to require the older versions
+#Not reviewed yet, cannot require until then
+#%if 0%{?fedora} >= 8
+#Requires:       python-cherrypy2 >= 2.2.1
+#Requires:       python-sqlalchemy0.3
+#%else
 Requires:       python-cherrypy >= 2.2.1
+Requires:       python-sqlalchemy >= 0.3
+#%endif
+
+Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
 Requires:       python-json >= 3.3
@@ -84,6 +93,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
+- Update setuptools patch to modify quickstart template for compat eggs as well.
+
 * Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
 - Update setuptools patch to "fix" CherryPy dependency error
 



From fedora-extras-commits at redhat.com  Thu Sep 27 23:54:58 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 19:54:58 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.2,1.3
Message-ID: <200709272354.l8RNswea000510@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv492

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
Fix BR.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Net-SNPP.spec	27 Sep 2007 22:01:45 -0000	1.2
+++ perl-Net-SNPP.spec	27 Sep 2007 23:54:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNPP
 Version:        1.17
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -45,7 +46,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-4
+- Fix BR
+
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-3
 - Update license tag.
 
 * Thu Dec  7 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-2



From fedora-extras-commits at redhat.com  Fri Sep 28 00:08:05 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 27 Sep 2007 20:08:05 -0400
Subject: rpms/i810switch/devel i810switch-0.6.5-add-i945.patch, NONE,
	1.1 i810switch.spec, 1.9, 1.10
Message-ID: <200709280008.l8S085cP006976@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6949

Modified Files:
	i810switch.spec 
Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 detection, fixes BZ297371

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	28 Sep 2007 00:07:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 00:13:00 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 20:13:00 -0400
Subject: rpms/bzr/FC-6 .cvsignore, 1.12, 1.13 bzr.spec, 1.16, 1.17 sources, 
	1.12, 1.13
Message-ID: <200709280013.l8S0D0P0007207@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7179

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
- Update to 0.91.
  + Fixes some issues with using tag-enabled branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Aug 2007 22:56:27 -0000	1.12
+++ .cvsignore	28 Sep 2007 00:12:25 -0000	1.13
@@ -1 +1 @@
-bzr-0.90.tar.gz
+bzr-0.91.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/bzr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzr.spec	30 Aug 2007 22:56:27 -0000	1.16
+++ bzr.spec	28 Sep 2007 00:12:25 -0000	1.17
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        0.90
+Version:        0.91
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -59,6 +59,10 @@
 %{python_sitearch}/bzrlib/
 
 %changelog
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.91-1
+- Update to 0.91.
+  + Fixes some issues with using tag-enabled branches.
+
 * Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.90-1
 - Update to 0.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Aug 2007 22:56:27 -0000	1.12
+++ sources	28 Sep 2007 00:12:25 -0000	1.13
@@ -1 +1 @@
-596020e249604418e5ab8bde1d512472  bzr-0.90.tar.gz
+2a298cf49d4c4879483db61c52abae31  bzr-0.91.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 00:15:19 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 20:15:19 -0400
Subject: rpms/kernel/F-7 linux-2.6-iwlwifi-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.3350, 1.3351 linux-2.6-ath5k.patch, 1.1, 1.2
Message-ID: <200709280015.l8S0FJl5007401@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298

Modified Files:
	kernel-2.6.spec linux-2.6-ath5k.patch 
Added Files:
	linux-2.6-iwlwifi-fixes.patch 
Log Message:
A few iwlwifi and ath5k fixes

linux-2.6-iwlwifi-fixes.patch:

--- NEW FILE linux-2.6-iwlwifi-fixes.patch ---
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c	2007-09-27 20:06:43.000000000 -0400
@@ -115,24 +115,38 @@ struct iwl_rate_scale_priv {
 	u8 is_dup;
 	u8 phymode;
 	u8 ibss_sta_added;
+	u32 supp_rates;
 	u16 active_rate;
 	u16 active_siso_rate;
 	u16 active_mimo_rate;
 	u16 active_rate_basic;
 	struct iwl_link_quality_cmd lq;
 	struct iwl_scale_tbl_info lq_info[LQ_SIZE];
+#ifdef CONFIG_MAC80211_DEBUGFS
+	struct dentry *rs_sta_dbgfs_scale_table_file;
+	struct dentry *rs_sta_dbgfs_stats_table_file;
+	struct iwl_rate dbg_fixed;
+	struct iwl_priv *drv;
+#endif
 };
 
 static void rs_rate_scale_perform(struct iwl_priv *priv,
 				   struct net_device *dev,
 				   struct ieee80211_hdr *hdr,
 				   struct sta_info *sta);
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_rate *tx_mcs,
-			     struct iwl_link_quality_cmd *tbl,
-			     struct sta_info *sta);
+			     struct iwl_link_quality_cmd *tbl);
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index);
+#else
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{}
+#endif
 static s32 expected_tpt_A[IWL_RATE_COUNT] = {
 	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186, 186
 };
@@ -539,14 +553,13 @@ static u16 rs_get_adjacent_rate(u8 index
 
 static int rs_get_lower_rate(struct iwl_rate_scale_priv *lq_data,
 			     struct iwl_scale_tbl_info *tbl, u8 scale_index,
-			     u8 ht_possible, struct iwl_rate *mcs_rate,
-			     struct sta_info *sta)
+			     u8 ht_possible, struct iwl_rate *mcs_rate)
 {
-	u8 is_green = lq_data->is_green;
 	s32 low;
 	u16 rate_mask;
 	u16 high_low;
 	u8 switch_to_legacy = 0;
+	u8 is_green = lq_data->is_green;
 
 	/* check if we need to switch from HT to legacy rates.
 	 * assumption is that mandatory rates (1Mbps or 6Mbps)
@@ -573,9 +586,9 @@ static int rs_get_lower_rate(struct iwl_
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_mask  = (u16)(rate_mask &
-			   (sta->supp_rates << IWL_FIRST_OFDM_RATE));
+			   (lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
-			rate_mask = (u16)(rate_mask & sta->supp_rates);
+			rate_mask = (u16)(rate_mask & lq_data->supp_rates);
 	}
 
 	/* if we did switched from HT to legacy check current rate */
@@ -619,7 +632,7 @@ static void rs_tx_status(void *priv_rate
 	u16 fc = le16_to_cpu(hdr->frame_control);
 	s32 tpt = 0;
 
-	IWL_DEBUG_RATE("get frame ack response, update rate scale window\n");
+	IWL_DEBUG_RATE_LIMIT("get frame ack response, update rate scale window\n");
 
 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
 		return;
@@ -1388,10 +1401,10 @@ static void rs_rate_scale_perform(struct
 	if (is_legacy(tbl->lq_type)) {
 		if (lq_data->phymode == (u8) MODE_IEEE80211A)
 			rate_scale_index_msk = (u16) (rate_mask &
-				(sta->supp_rates << IWL_FIRST_OFDM_RATE));
+				(lq_data->supp_rates << IWL_FIRST_OFDM_RATE));
 		else
 			rate_scale_index_msk = (u16) (rate_mask &
-						      sta->supp_rates);
+						      lq_data->supp_rates);
 
 	} else
 		rate_scale_index_msk = rate_mask;
@@ -1431,7 +1444,7 @@ static void rs_rate_scale_perform(struct
 		rs_stay_in_table(lq_data);
 		if (update_lq) {
 			rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+			rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		goto out;
@@ -1555,7 +1568,7 @@ static void rs_rate_scale_perform(struct
  lq_update:
 	if (update_lq) {
 		rs_mcs_from_tbl(&mcs_rate, tbl, index, is_green);
-		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq, sta);
+		rs_fill_link_cmd(lq_data, &mcs_rate, &lq_data->lq);
 		rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 	}
 	rs_stay_in_table(lq_data);
@@ -1581,7 +1594,7 @@ static void rs_rate_scale_perform(struct
 			IWL_DEBUG_HT("Switch current  mcs: %X index: %d\n",
 				     tbl->current_rate.rate_n_flags, index);
 			rs_fill_link_cmd(lq_data, &tbl->current_rate,
-					 &(lq_data->lq), sta);
+					 &lq_data->lq);
 			rs_send_lq_cmd(priv, &lq_data->lq, CMD_ASYNC);
 		}
 		tbl1 = &(lq_data->lq_info[lq_data->active_tbl]);
@@ -1672,12 +1685,12 @@ static void rs_initialize_lq(struct iwl_
 	tbl->antenna_type = ANT_AUX;
 	rs_get_tbl_info_from_mcs(&mcs_rate, priv->phymode, tbl, &rate_idx);
 	if (!rs_is_ant_connected(priv->valid_antenna, tbl->antenna_type))
-	    rs_toggle_antenna(&mcs_rate, tbl),
+	    rs_toggle_antenna(&mcs_rate, tbl);
 
 	rs_mcs_from_tbl(&mcs_rate, tbl, rate_idx, use_green);
 	tbl->current_rate.rate_n_flags = mcs_rate.rate_n_flags;
 	rs_get_expected_tpt_table(lq, tbl);
-	rs_fill_link_cmd(lq, &mcs_rate, &(lq->lq), sta);
+	rs_fill_link_cmd(lq, &mcs_rate, &lq->lq);
 	rs_send_lq_cmd(priv, &lq->lq, CMD_ASYNC);
  out:
 	return;
@@ -1714,7 +1727,7 @@ static struct ieee80211_rate *rs_get_rat
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *lq;
 
-	IWL_DEBUG_RATE("rate scale calculate new rate for skb\n");
+	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
 	memset(extra, 0, sizeof(*extra));
 
@@ -1775,10 +1788,9 @@ static void *rs_alloc_sta(void *priv, gf
 
 	if (crl == NULL)
 		return NULL;
-
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
 	crl->lq.sta_id = 0xff;
 
+
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
 			rs_rate_scale_clear_window(&(crl->lq_info[j].win[i]));
@@ -1795,10 +1807,8 @@ static void rs_rate_init(void *priv_rate
 	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
 	struct iwl_rate_scale_priv *crl = priv_sta;
 
-	memset(crl, 0, sizeof(struct iwl_rate_scale_priv));
-
-	crl->lq.sta_id = 0xff;
 	crl->flush_timer = 0;
+	crl->supp_rates = sta->supp_rates;
 	sta->txrate = 3;
 	for (j = 0; j < LQ_SIZE; j++)
 		for (i = 0; i < IWL_RATE_COUNT; i++)
@@ -1864,6 +1874,9 @@ static void rs_rate_init(void *priv_rate
 	IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate,
 		     crl->active_mimo_rate);
 #endif /*CONFIG_IWLWIFI_HT*/
+#ifdef CONFIG_MAC80211_DEBUGFS
+	crl->drv = priv;
+#endif
 
 	if (priv->assoc_station_added)
 		priv->lq_mngr.lq_ready = 1;
@@ -1871,28 +1884,28 @@ static void rs_rate_init(void *priv_rate
 	rs_initialize_lq(priv, sta);
 }
 
-static int rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
+static void rs_fill_link_cmd(struct iwl_rate_scale_priv *lq_data,
 			    struct iwl_rate *tx_mcs,
-			    struct iwl_link_quality_cmd *lq_cmd,
-			    struct sta_info *sta)
+			    struct iwl_link_quality_cmd *lq_cmd)
 {
 	int index = 0;
-	int rc = 0;
 	int rate_idx;
+	int repeat_rate = 0;
 	u8 ant_toggle_count = 0;
 	u8 use_ht_possible = 1;
-	u8 repeat_cur_rate = 0;
 	struct iwl_rate new_rate;
 	struct iwl_scale_tbl_info tbl_type = { 0 };
 
+	rs_dbgfs_set_mcs(lq_data, tx_mcs, index);
+
 	rs_get_tbl_info_from_mcs(tx_mcs, lq_data->phymode,
 				  &tbl_type, &rate_idx);
 
 	if (is_legacy(tbl_type.lq_type)) {
 		ant_toggle_count = 1;
-		repeat_cur_rate = IWL_NUMBER_TRY;
+		repeat_rate = IWL_NUMBER_TRY;
 	} else
-		repeat_cur_rate = IWL_HT_NUMBER_TRY;
+		repeat_rate = IWL_HT_NUMBER_TRY;
 
 	lq_cmd->general_params.mimo_delimiter =
 			is_mimo(tbl_type.lq_type) ? 1 : 0;
@@ -1906,10 +1919,10 @@ static int rs_fill_link_cmd(struct iwl_r
 		lq_cmd->general_params.single_stream_ant_msk = 2;
 
 	index++;
-	repeat_cur_rate--;
+	repeat_rate--;
 
 	while (index < LINK_QUAL_MAX_RETRY_NUM) {
-		while (repeat_cur_rate && (index < LINK_QUAL_MAX_RETRY_NUM)) {
+		while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
 			if (is_legacy(tbl_type.lq_type)) {
 				if (ant_toggle_count <
 				    NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1919,9 +1932,11 @@ static int rs_fill_link_cmd(struct iwl_r
 					ant_toggle_count = 1;
 				}
 			}
+
+			rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 			lq_cmd->rs_table[index].rate_n_flags =
 					cpu_to_le32(new_rate.rate_n_flags);
-			repeat_cur_rate--;
+			repeat_rate--;
 			index++;
 		}
 
@@ -1932,7 +1947,7 @@ static int rs_fill_link_cmd(struct iwl_r
 			lq_cmd->general_params.mimo_delimiter = index;
 
 		rs_get_lower_rate(lq_data, &tbl_type, rate_idx,
-				  use_ht_possible, &new_rate, sta);
+				  use_ht_possible, &new_rate);
 
 		if (is_legacy(tbl_type.lq_type)) {
 			if (ant_toggle_count < NUM_TRY_BEFORE_ANTENNA_TOGGLE)
@@ -1941,26 +1956,23 @@ static int rs_fill_link_cmd(struct iwl_r
 				rs_toggle_antenna(&new_rate, &tbl_type);
 				ant_toggle_count = 1;
 			}
-			repeat_cur_rate = IWL_NUMBER_TRY;
+			repeat_rate = IWL_NUMBER_TRY;
 		} else
-			repeat_cur_rate = IWL_HT_NUMBER_TRY;
+			repeat_rate = IWL_HT_NUMBER_TRY;
 
 		use_ht_possible = 0;
 
+		rs_dbgfs_set_mcs(lq_data, &new_rate, index);
 		lq_cmd->rs_table[index].rate_n_flags =
 				cpu_to_le32(new_rate.rate_n_flags);
-		/* lq_cmd->rs_table[index].rate_n_flags = 0x800d; */
 
 		index++;
-		repeat_cur_rate--;
+		repeat_rate--;
 	}
 
-	/* lq_cmd->rs_table[0].rate_n_flags = 0x800d; */
-
 	lq_cmd->general_params.dual_stream_ant_msk = 3;
 	lq_cmd->agg_params.agg_dis_start_th = 3;
 	lq_cmd->agg_params.agg_time_limit = cpu_to_le16(4000);
-	return rc;
 }
 
 static void *rs_alloc(struct ieee80211_local *local)
@@ -2000,6 +2012,162 @@ static void rs_free_sta(void *priv, void
 }
 
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
+				struct iwl_rate *mcs, int index)
+{
+	const u32 cck_rate = 0x820A;
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		if (index < 12)
+			mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
+		else
+			mcs->rate_n_flags = cck_rate;
+		IWL_DEBUG_RATE("Fixed rate ON\n");
+		return;
+	}
+
+	IWL_DEBUG_RATE("Fixed rate OFF\n");
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
+			const char __user *user_buf, size_t count, loff_t *ppos)
+{
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	char buf[64];
+	int buf_size;
+	u32 parsed_rate;
+
+	memset(buf, 0, sizeof(buf));
+	buf_size = min(count, sizeof(buf) -  1);
+	if (copy_from_user(buf, user_buf, buf_size))
+		return -EFAULT;
+
+	if (sscanf(buf, "%x", &parsed_rate) == 1)
+		rs_priv->dbg_fixed.rate_n_flags = parsed_rate;
+	else
+		rs_priv->dbg_fixed.rate_n_flags = 0;
+
+	rs_priv->active_rate = 0x0FFF;
+	rs_priv->active_siso_rate = 0x1FD0;
+	rs_priv->active_mimo_rate = 0x1FD0;
+
+	IWL_DEBUG_RATE("sta_id %d rate 0x%X\n",
+		rs_priv->lq.sta_id, rs_priv->dbg_fixed.rate_n_flags);
+
+	if (rs_priv->dbg_fixed.rate_n_flags) {
+		rs_fill_link_cmd(rs_priv, &rs_priv->dbg_fixed, &rs_priv->lq);
+		rs_send_lq_cmd(rs_priv->drv, &rs_priv->lq, CMD_ASYNC);
+	}
+
+	return count;
+}
+
+static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i = 0;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+
+	desc += sprintf(buff+desc, "sta_id %d\n", rs_priv->lq.sta_id);
+	desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
+			rs_priv->total_failed, rs_priv->total_success,
+			rs_priv->active_rate);
+	desc += sprintf(buff+desc, "fixed rate 0x%X\n",
+			rs_priv->dbg_fixed.rate_n_flags);
+	desc += sprintf(buff+desc, "general:"
+		"flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
+		rs_priv->lq.general_params.flags,
+		rs_priv->lq.general_params.mimo_delimiter,
+		rs_priv->lq.general_params.single_stream_ant_msk,
+		rs_priv->lq.general_params.dual_stream_ant_msk);
+
+	desc += sprintf(buff+desc, "agg:"
+			"time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
+			le16_to_cpu(rs_priv->lq.agg_params.agg_time_limit),
+			rs_priv->lq.agg_params.agg_dis_start_th,
+			rs_priv->lq.agg_params.agg_frame_cnt_limit);
+
+	desc += sprintf(buff+desc,
+			"Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
+			rs_priv->lq.general_params.start_rate_index[0],
+			rs_priv->lq.general_params.start_rate_index[1],
+			rs_priv->lq.general_params.start_rate_index[2],
+			rs_priv->lq.general_params.start_rate_index[3]);
+
+
+	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+		desc += sprintf(buff+desc, " rate[%d] 0x%X\n",
+			i, le32_to_cpu(rs_priv->lq.rs_table[i].rate_n_flags));
+
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
+	.write = rs_sta_dbgfs_scale_table_write,
+	.read = rs_sta_dbgfs_scale_table_read,
+	.open = open_file_generic,
+};
+static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
+			char __user *user_buf, size_t count, loff_t *ppos)
+{
+	char buff[1024];
+	int desc = 0;
+	int i, j;
+
+	struct iwl_rate_scale_priv *rs_priv = file->private_data;
+	for (i = 0; i < LQ_SIZE; i++) {
+		desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n"
+				"rate=0x%X\n",
+				rs_priv->active_tbl == i?"*":"x",
+				rs_priv->lq_info[i].lq_type,
+				rs_priv->lq_info[i].is_SGI,
+				rs_priv->lq_info[i].is_fat,
+				rs_priv->lq_info[i].is_dup,
+				rs_priv->lq_info[i].current_rate.rate_n_flags);
+		for (j = 0; j < IWL_RATE_COUNT; j++) {
+			desc += sprintf(buff+desc,
+					"counter=%d success=%d %%=%d\n",
+					rs_priv->lq_info[i].win[j].counter,
+					rs_priv->lq_info[i].win[j].success_counter,
+					rs_priv->lq_info[i].win[j].success_ratio);
+		}
+	}
+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+	.read = rs_sta_dbgfs_stats_table_read,
+	.open = open_file_generic,
+};
+
+static void rs_add_debugfs(void *priv, void *priv_sta,
+					struct dentry *dir)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	rs_priv->rs_sta_dbgfs_scale_table_file =
+		debugfs_create_file("rate_scale_table", 0600, dir,
+				rs_priv, &rs_sta_dbgfs_scale_table_ops);
+	rs_priv->rs_sta_dbgfs_stats_table_file =
+		debugfs_create_file("rate_stats_table", 0600, dir,
+			rs_priv, &rs_sta_dbgfs_stats_table_ops);
+}
+
+static void rs_remove_debugfs(void *priv, void *priv_sta)
+{
+	struct iwl_rate_scale_priv *rs_priv = priv_sta;
+	debugfs_remove(rs_priv->rs_sta_dbgfs_scale_table_file);
+	debugfs_remove(rs_priv->rs_sta_dbgfs_stats_table_file);
+}
+#endif
+
 static struct rate_control_ops rs_ops = {
 	.module = NULL,
 	.name = RS_NAME,
@@ -2011,6 +2179,10 @@ static struct rate_control_ops rs_ops = 
 	.free = rs_free,
 	.alloc_sta = rs_alloc_sta,
 	.free_sta = rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+	.add_sta_debugfs = rs_add_debugfs,
+	.remove_sta_debugfs = rs_remove_debugfs,
+#endif
 };
 
 int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2007-09-27 20:06:43.000000000 -0400
@@ -102,7 +102,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -203,7 +203,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
 
 /**************************************************************/
 
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,6 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
+#endif
 
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
@@ -851,16 +853,12 @@ int iwl_send_statistics_request(struct i
 static int iwl_rxon_add_station(struct iwl_priv *priv,
 				const u8 *addr, int is_ap)
 {
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
+	u8 sta_id;
 
+	sta_id = iwl_add_station(priv, addr, is_ap, 0);
 	iwl4965_add_station(priv, addr, is_ap);
 
-	return rc;
+	return sta_id;
 }
 
 /**
@@ -1147,16 +1145,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1176,6 +1164,8 @@ static int iwl_commit_rxon(struct iwl_pr
 		return rc;
 	}
 
+	iwl_clear_stations_table(priv);
+
 #ifdef CONFIG_IWLWIFI_SENSITIVITY
 	if (!priv->error_recovering)
 		priv->start_calib = 0;
@@ -4608,6 +4598,7 @@ static void iwl_rx_handle(struct iwl_pri
 		reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
 			(pkt->hdr.cmd != REPLY_RX_PHY_CMD) &&
 			(pkt->hdr.cmd != REPLY_4965_RX) &&
+			(pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
 			(pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
 			(pkt->hdr.cmd != REPLY_TX);
 
@@ -4893,12 +4884,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -7483,9 +7474,8 @@ static void iwl_config_ap(struct iwl_pri
 		iwl_activate_qos(priv, 1);
 #endif
 		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c	2007-09-27 20:06:43.000000000 -0400
@@ -183,7 +183,7 @@ u8 iwl_hw_find_station(struct iwl_priv *
 			goto out;
 		}
 
-	IWL_DEBUG_ASSOC("can not find STA " MAC_FMT " total %d\n",
+	IWL_DEBUG_ASSOC_LIMIT("can not find STA " MAC_FMT " total %d\n",
 			MAC_ARG(addr), priv->num_stations);
 
  out:
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h	2007-09-27 20:06:43.000000000 -0400
@@ -136,8 +136,11 @@ static inline void IWL_DEBUG_LIMIT(int l
 #define IWL_DEBUG_TXPOWER(f, a...) IWL_DEBUG(IWL_DL_TXPOWER, f, ## a)
 #define IWL_DEBUG_IO(f, a...) IWL_DEBUG(IWL_DL_IO, f, ## a)
 #define IWL_DEBUG_RATE(f, a...) IWL_DEBUG(IWL_DL_RATE, f, ## a)
+#define IWL_DEBUG_RATE_LIMIT(f, a...) IWL_DEBUG_LIMIT(IWL_DL_RATE, f, ## a)
 #define IWL_DEBUG_NOTIF(f, a...) IWL_DEBUG(IWL_DL_NOTIF, f, ## a)
 #define IWL_DEBUG_ASSOC(f, a...) IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
+#define IWL_DEBUG_ASSOC_LIMIT(f, a...) \
+	IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_HT(f, a...) IWL_DEBUG(IWL_DL_HT, f, ## a)
 #define IWL_DEBUG_STATS(f, a...) IWL_DEBUG(IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(f, a...) IWL_DEBUG(IWL_DL_TX_REPLY, f, ## a)
diff -up linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2007-09-27 19:59:56.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2007-09-27 20:06:43.000000000 -0400
@@ -103,7 +103,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.1.15k" VD VS
+#define IWLWIFI_VERSION "1.1.17k" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -204,7 +204,7 @@ static void iwl_print_hex_dump(int level
  * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
  * Tx queue resumed.
  *
- * The IPW operates with six queues, one receive queue in the device's
+ * The IWL operates with six queues, one receive queue in the device's
  * sram, one transmit queue for sending commands to the device firmware,
  * and four transmit queues for data.
  ***************************************************/
@@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0x
  */
 
 /**************************************************************/
+#if 0 /* temparary disable till we add real remove station */
 static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
 {
 	int index = IWL_INVALID_STATION;
@@ -442,7 +443,7 @@ out:
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 	return 0;
 }
-
+#endif
 static void iwl_clear_stations_table(struct iwl_priv *priv)
 {
 	unsigned long flags;
@@ -462,6 +463,7 @@ u8 iwl_add_station(struct iwl_priv *priv
 	int index = IWL_INVALID_STATION;
 	struct iwl_station_entry *station;
 	unsigned long flags_spin;
+	u8 rate;
 
 	spin_lock_irqsave(&priv->sta_lock, flags_spin);
 	if (is_ap)
@@ -505,6 +507,15 @@ u8 iwl_add_station(struct iwl_priv *priv
 	station->sta.sta.sta_id = index;
 	station->sta.station_flags = 0;
 
+	rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP :
+				IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag;
+
+	/* Turn on both antennas for the station... */
+	station->sta.rate_n_flags =
+			iwl_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
+	station->current_rate.rate_n_flags =
+			le16_to_cpu(station->sta.rate_n_flags);
+
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	iwl_send_add_station(priv, &station->sta, flags);
 	return index;
@@ -834,25 +845,6 @@ int iwl_send_statistics_request(struct i
 }
 
 /**
- * iwl_rxon_add_station - add station into station table.
- *
- * there is only one AP station with id= IWL_AP_ID
- * NOTE: mutex must be held before calling the this fnction
-*/
-static int iwl_rxon_add_station(struct iwl_priv *priv,
-				const u8 *addr, int is_ap)
-{
-	u8 rc;
-
-	/* Remove this station if it happens to already exist */
-	iwl_remove_station(priv, addr, is_ap);
-
-	rc = iwl_add_station(priv, addr, is_ap, 0);
-
-	return rc;
-}
-
-/**
  * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
  * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
  * @channel: Any channel valid for the requested phymode
@@ -1121,16 +1113,6 @@ static int iwl_commit_rxon(struct iwl_pr
 				  "configuration (%d).\n", rc);
 			return rc;
 		}
-
-		/* The RXON bit toggling will have cleared out the
-		 * station table in the uCode, so blank it in the driver
-		 * as well */
-		iwl_clear_stations_table(priv);
-	} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
-		/* When switching from non-associated to associated, the
-		 * uCode clears out the station table; so clear it in the
-		 * driver as well */
-		iwl_clear_stations_table(priv);
 	}
 
 	IWL_DEBUG_INFO("Sending RXON\n"
@@ -1152,6 +1134,8 @@ static int iwl_commit_rxon(struct iwl_pr
 
 	memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
 
+	iwl_clear_stations_table(priv);
+
 	/* If we issue a new RXON command which required a tune then we must
 	 * send a new TXPOWER command or we won't be able to Tx any frames */
 	rc = iwl_hw_reg_send_txpower(priv);
@@ -1161,7 +1145,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	}
 
 	/* Add the broadcast address so we can send broadcast frames */
-	if (iwl_rxon_add_station(priv, BROADCAST_ADDR, 0) ==
+	if (iwl_add_station(priv, BROADCAST_ADDR, 0, 0) ==
 	    IWL_INVALID_STATION) {
 		IWL_ERROR("Error adding BROADCAST address for transmit.\n");
 		return -EIO;
@@ -1171,7 +1155,7 @@ static int iwl_commit_rxon(struct iwl_pr
 	 * add the IWL_AP_ID to the station rate table */
 	if (iwl_is_associated(priv) &&
 	    (priv->iw_mode == IEEE80211_IF_TYPE_STA))
-		if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
+		if (iwl_add_station(priv, priv->active_rxon.bssid_addr, 1, 0)
 		    == IWL_INVALID_STATION) {
 			IWL_ERROR("Error adding AP address for transmit.\n");
 			return -EIO;
@@ -4583,12 +4567,12 @@ static void iwl_dump_nic_event_log(struc
 
 	/* bail out if nothing in log */
 	if (size == 0) {
-		IWL_ERROR("Start IPW Event Log Dump: nothing in log\n");
+		IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
 		iwl_release_restricted_access(priv);
 		return;
 	}
 
-	IWL_ERROR("Start IPW Event Log Dump: display count %d, wraps %d\n",
+	IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
 		  size, num_wraps);
 
 	/* if uCode has wrapped back to top of log, start at the oldest entry,
@@ -4650,7 +4634,7 @@ static void iwl_error_recovery(struct iw
 	priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	iwl_commit_rxon(priv);
 
-	iwl_rxon_add_station(priv, priv->bssid, 1);
+	iwl_add_station(priv, priv->bssid, 1, 0);
 
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
@@ -6793,8 +6777,8 @@ static void iwl_bg_post_associate(struct
 		/* clear out the station table */
 		iwl_clear_stations_table(priv);
 
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_rxon_add_station(priv, priv->bssid, 0);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+		iwl_add_station(priv, priv->bssid, 0, 0);
 		iwl3945_sync_sta(priv, IWL_STA_ID,
 				 (priv->phymode == MODE_IEEE80211A)?
 				 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
@@ -7082,10 +7066,9 @@ static void iwl_config_ap(struct iwl_pri
 		/* restore RXON assoc */
 		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
 		iwl_commit_rxon(priv);
-		iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
-		iwl_send_beacon_cmd(priv);
-	} else
-		iwl_send_beacon_cmd(priv);
+		iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
+	}
+	iwl_send_beacon_cmd(priv);
 
 	/* FIXME - we need to add code here to detect a totally new
 	 * configuration, reset the AP, unassoc, rxon timing, assoc,
@@ -7168,8 +7151,8 @@ static int iwl_mac_config_interface(stru
 						RXON_FILTER_ASSOC_MSK;
 			rc = iwl_commit_rxon(priv);
 			if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
-				iwl_rxon_add_station(
-					priv, priv->active_rxon.bssid_addr, 1);
+				iwl_add_station(priv,
+					priv->active_rxon.bssid_addr, 1, 0);
 		}
 
 	} else {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3350
retrieving revision 1.3351
diff -u -r1.3350 -r1.3351
--- kernel-2.6.spec	27 Sep 2007 22:51:22 -0000	1.3350
+++ kernel-2.6.spec	28 Sep 2007 00:14:44 -0000	1.3351
@@ -615,6 +615,7 @@
 Patch681: linux-2.6-wireless.patch
 Patch682: linux-2.6-wireless-pending.patch
 Patch683: linux-2.6-bcm43xx-pci-neuter.patch
+Patch684: linux-2.6-iwlwifi-fixes.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1356,6 +1357,8 @@
 ApplyPatch linux-2.6-wireless.patch
 # pre-2.6.24 wireless patches from upstream
 ApplyPatch linux-2.6-wireless-pending.patch
+# late-breaking iwlwifi fixes (will be rolled into wireless-pending patch)
+ApplyPatch linux-2.6-iwlwifi-fixes.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -2370,6 +2373,9 @@
 %endif
 
 %changelog
+* Thu Sep 27 2007 John W. Linville <linville at redhat.com>
+- A few iwlwifi and ath5k fixes
+
 * Thu Sep 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - Revert to old RTC driver.
 - Zero fill environment for uevent handlers.

linux-2.6-ath5k.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-ath5k.patch
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ath5k.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ath5k.patch	27 Sep 2007 15:33:19 -0000	1.1
+++ linux-2.6-ath5k.patch	28 Sep 2007 00:14:44 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 11:23:09.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 11:24:13.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-09-27 19:58:06.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-09-27 19:59:22.000000000 -0400
 @@ -652,6 +652,14 @@ M:	ecashin at coraid.com
  W:	http://www.coraid.com/support/linux
  S:	Supported
@@ -16,14050 +16,13915 @@
  ATL1 ETHERNET DRIVER
  P:	Jay Cliburn
  M:	jcliburn at gmail.com
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k.h
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig linux-2.6.22.noarch/drivers/net/wireless/Makefile
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-09-27 19:58:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-09-27 19:59:22.000000000 -0400
+@@ -61,3 +61,5 @@ obj-$(CONFIG_RT2X00)		+= rt2x00/
+ obj-$(CONFIG_P54_COMMON)	+= p54common.o
+ obj-$(CONFIG_P54_USB)		+= p54usb.o
+ obj-$(CONFIG_P54_PCI)		+= p54pci.o
++
++obj-$(CONFIG_ATH5K)	+= ath5k/
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-09-27 19:58:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-09-27 19:59:22.000000000 -0400
+@@ -598,6 +598,19 @@ config P54_PCI
+ 	tristate "Prism54 PCI support"
+ 	depends on P54_COMMON && PCI
+ 
++config ATH5K
++	tristate "Atheros 5xxx wireless cards support"
++	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
++	default m
++	---help---
++	  This module adds support for atheros 5xxx (e.g. 5212) wireless
++	  cards. If you have this card in your PC, select this to be build.
++
++	  This driver uses the kernel's mac80211 subsystem.
++
++	  If you choose to build a module, it'll be called ath5k. Say M if
++	  unsure.
++
+ source "drivers/net/wireless/hostap/Kconfig"
+ source "drivers/net/wireless/bcm43xx/Kconfig"
+ source "drivers/net/wireless/b43/Kconfig"
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c
 --- /dev/null	2007-09-27 08:31:24.563724082 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k.h	2007-09-27 11:24:13.000000000 -0400
-@@ -0,0 +1,1104 @@
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/phy.c	2007-09-27 19:59:22.000000000 -0400
+@@ -0,0 +1,1704 @@
 +/*
-+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
-+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
++ * PHY functions
 + *
-+ * Permission to use, copy, modify, and 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.
++ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
 + *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ *  This file is free software: you can copy, redistribute 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 file 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/>.
++ *
++ * This file incorporates work covered by the following copyright and
++ * permission notice:
++ *
++ *     Copyright (c) 2007 Jiri Slaby <jirislaby at gmail.com>
++ *     Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk at openbsd.org>
++ *
++ *     Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL
++ *     WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
++ *     WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
++ *     AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
 + */
 +
-+#ifndef _ATH5K_H
-+#define _ATH5K_H
++#include <linux/delay.h>
 +
-+/* Set this to 1 to disable regulatory domain restrictions for channel tests.
-+ * WARNING: This is for debuging only and has side effects (eg. scan takes too
-+ * long and results timeouts). It's also illegal to tune to some of the
-+ * supported frequencies in some countries, so use this at your own risk,
-+ * you've been warned. */
-+#define CHAN_DEBUG	0
++#include "ath5k.h"
++#include "reg.h"
 +
-+/* Uncomment this for debuging (warning that it results in TOO much output) */
-+/*#define AR5K_DEBUG	1 */
++/* Struct to hold initial RF register values (RF Banks) */
++struct ath5k_ini_rf {
++	u8	rf_bank;	/* check out ath5k_reg.h */
++	u16	rf_register;	/* register address */
++	u32	rf_value[5];	/* register value for different modes (above) */
++};
 +
-+#include <linux/types.h>
-+#include <net/mac80211.h>
++/*
++ * Mode-specific RF Gain table (64bytes) for RF5111/5112
++ * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial
++ * RF Gain values are included in AR5K_AR5210_INI)
++ */
++struct ath5k_ini_rfgain {
++	u16	rfg_register;	/* RF Gain register address */
++	u32	rfg_value[2];	/* [freq (see below)] */
++};
 +
-+#include "ath5k_hw.h"
-+#include "ath5k_regdom.h"
++struct ath5k_gain_opt {
++	u32			go_default;
++	u32			go_steps_count;
++	const struct ath5k_gain_opt_step	go_step[AR5K_GAIN_STEP_COUNT];
++};
 +
-+/* PCI IDs */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210 		0x0007 /* AR5210 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5311 		0x0011 /* AR5311 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211 		0x0012 /* AR5211 */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212 		0x0013 /* AR5212 */
-+#define PCI_DEVICE_ID_3COM_3CRDAG675 		0x0013 /* 3CRDAG675 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_3COM_2_3CRPAG175 		0x0013 /* 3CRPAG175 (Atheros AR5212) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP 	0x0207 /* AR5210 (Early) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_IBM	0x1014 /* AR5212 (IBM MiniPCI) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT 	0x1107 /* AR5210 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT 	0x1113 /* AR5212 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT 	0x1112 /* AR5211 (no eeprom) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA 	0xf013 /* AR5212 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY 	0xff12 /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B 	0xf11b /* AR5211 (emulation board) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV2 	0x0052 /* AR5312 WMAC (AP31) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV7 	0x0057 /* AR5312 WMAC (AP30-040) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_REV8 	0x0058 /* AR5312 WMAC (AP43-030) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014 	0x0014 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015 	0x0015 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016 	0x0016 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017 	0x0017 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018 	0x0018 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019 	0x0019 /* AR5212 compatible */
-+#define PCI_DEVICE_ID_ATHEROS_AR2413 		0x001a /* AR2413 (Griffin-lite) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5413 		0x001b /* AR5413 (Eagle) */
-+#define PCI_DEVICE_ID_ATHEROS_AR5424 		0x001c /* AR5424 (Condor PCI-E) */
++/* RF5111 mode-specific init registers */
++static const struct ath5k_ini_rf rfregs_5111[] = {
++	{ 0, 0x989c,
++	/*    mode a/XR   mode aTurbo mode b      mode g      mode gTurbo */
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
++	    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
++	{ 0, 0x989c,
[...25708 lines suppressed...]
 +
-+/*
-+ * PHY current RSSI register [5111+]
-+ */
-+#define	AR5K_PHY_CURRENT_RSSI		0x9c1c
++	ret = pci_register_driver(&ath_pci_drv_id);
++	if (ret) {
++		printk(KERN_ERR "ath_pci: can't register pci driver\n");
++		return ret;
++	}
++	ath_sysctl_header = register_sysctl_table(ath_root_table);
 +
-+/*
-+ * PHY PCDAC TX power table
-+ */
-+#define	AR5K_PHY_PCDAC_TXPOWER_BASE	0xa180
-+#define	AR5K_PHY_PCDAC_TXPOWER(_n)	(AR5K_PHY_PCDAC_TXPOWER_BASE + ((_n) << 2))
++	return 0;
++}
 +
-+/*
-+ * PHY mode register [5111+]
-+ */
-+#define	AR5K_PHY_MODE			0x0a200		/* Register address */
-+#define	AR5K_PHY_MODE_MOD		0x00000001	/* PHY Modulation mask*/
-+#define AR5K_PHY_MODE_MOD_OFDM		0
-+#define AR5K_PHY_MODE_MOD_CCK		1
-+#define AR5K_PHY_MODE_FREQ		0x00000002	/* Freq mode mask */
-+#define	AR5K_PHY_MODE_FREQ_5GHZ		0
-+#define	AR5K_PHY_MODE_FREQ_2GHZ		2
-+#define AR5K_PHY_MODE_MOD_DYN		0x00000004	/* Dynamic OFDM/CCK mode mask [5112+] */
-+#define AR5K_PHY_MODE_RAD		0x00000008	/* [5212+] */
-+#define AR5K_PHY_MODE_RAD_RF5111	0
-+#define AR5K_PHY_MODE_RAD_RF5112	8
-+#define AR5K_PHY_MODE_XR		0x00000010	/* [5112+] */
++static void __exit exit_ath_pci(void)
++{
++	if (ath_sysctl_header)
++		unregister_sysctl_table(ath_sysctl_header);
++	pci_unregister_driver(&ath_pci_drv_id);
++}
 +
-+/*
-+ * PHY CCK transmit control register [5111+ (?)]
-+ */
-+#define AR5K_PHY_CCKTXCTL		0xa204
-+#define AR5K_PHY_CCKTXCTL_WORLD		0x00000000
-+#define AR5K_PHY_CCKTXCTL_JAPAN		0x00000010
++module_init(init_ath_pci);
++module_exit(exit_ath_pci);
 +
-+/*
-+ * PHY 2GHz gain register [5111+]
-+ */
-+#define	AR5K_PHY_GAIN_2GHZ		0xa20c
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX	0x00fc0000
-+#define	AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S	18
-+#define	AR5K_PHY_GAIN_2GHZ_INI_5111	0x6480416c
-diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h
++MODULE_AUTHOR("Jiri Slaby");
++MODULE_DESCRIPTION("Support for Atheros 802.11 wireless LAN cards.");
++MODULE_SUPPORTED_DEVICE("Atheros WLAN cards");
++MODULE_LICENSE("Dual BSD/GPL");
++MODULE_VERSION(ATH_PCI_VERSION " (EXPERIMENTAL)");
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h
 --- /dev/null	2007-09-27 08:31:24.563724082 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/ath5k_base.h	2007-09-27 11:24:13.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/base.h	2007-09-27 19:59:22.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*-
 + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -14265,3 +14130,128 @@
 +	(ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0)
 +
 +#endif
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c
+--- /dev/null	2007-09-27 08:31:24.563724082 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/ath5k/regdom.c	2007-09-27 19:59:22.000000000 -0400
+@@ -0,0 +1,121 @@
++/*
++ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
++ *
++ * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Basic regulation domain extensions for the IEEE 802.11 stack
++ */
++
++#include <linux/kernel.h>
++#include <linux/string.h>
++
++#include "regdom.h"
++
++static const struct ath5k_regdommap {
++	enum ath5k_regdom dmn;
++	enum ath5k_regdom dmn5;
++	enum ath5k_regdom dmn2;
++} r_map[] = {
++	{ DMN_DEFAULT,		DMN_DEBUG,	DMN_DEBUG },
++	{ DMN_NULL_WORLD,	DMN_NULL,	DMN_WORLD },
++	{ DMN_NULL_ETSIB,	DMN_NULL,	DMN_ETSIB },
++	{ DMN_NULL_ETSIC,	DMN_NULL,	DMN_ETSIC },
++	{ DMN_FCC1_FCCA,	DMN_FCC1,	DMN_FCCA },
++	{ DMN_FCC1_WORLD,	DMN_FCC1,	DMN_WORLD },
++	{ DMN_FCC2_FCCA,	DMN_FCC2,	DMN_FCCA },
++	{ DMN_FCC2_WORLD,	DMN_FCC2,	DMN_WORLD },
++	{ DMN_FCC2_ETSIC,	DMN_FCC2,	DMN_ETSIC },
++	{ DMN_FRANCE_NULL,	DMN_ETSI3,	DMN_ETSI3 },
++	{ DMN_FCC3_FCCA,	DMN_FCC3,	DMN_WORLD },
++	{ DMN_ETSI1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_ETSI3_ETSIA,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI2_WORLD,	DMN_ETSI2,	DMN_WORLD },
++	{ DMN_ETSI3_WORLD,	DMN_ETSI3,	DMN_WORLD },
++	{ DMN_ETSI4_WORLD,	DMN_ETSI4,	DMN_WORLD },
++	{ DMN_ETSI4_ETSIC,	DMN_ETSI4,	DMN_ETSIC },
++	{ DMN_ETSI5_WORLD,	DMN_ETSI5,	DMN_WORLD },
++	{ DMN_ETSI6_WORLD,	DMN_ETSI6,	DMN_WORLD },
++	{ DMN_ETSI_NULL,	DMN_ETSI1,	DMN_ETSI1 },
++	{ DMN_MKK1_MKKA,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKB,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL4_WORLD,	DMN_APL4,	DMN_WORLD },
++	{ DMN_MKK2_MKKA,	DMN_MKK2,	DMN_MKKA },
++	{ DMN_APL_NULL,		DMN_APL1,	DMN_NULL },
++	{ DMN_APL2_WORLD,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL2_APLC,	DMN_APL2,	DMN_WORLD },
++	{ DMN_APL3_WORLD,	DMN_APL3,	DMN_WORLD },
++	{ DMN_MKK1_FCCA,	DMN_MKK1,	DMN_FCCA },
++	{ DMN_APL2_APLD,	DMN_APL2,	DMN_APLD },
++	{ DMN_MKK1_MKKA1,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_MKK1_MKKA2,	DMN_MKK1,	DMN_MKKA },
++	{ DMN_APL1_WORLD,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_FCCA,	DMN_APL1,	DMN_FCCA },
++	{ DMN_APL1_APLA,	DMN_APL1,	DMN_WORLD },
++	{ DMN_APL1_ETSIC,	DMN_APL1,	DMN_ETSIC },
++	{ DMN_APL2_ETSIC,	DMN_APL2,	DMN_ETSIC },
++	{ DMN_APL5_WORLD,	DMN_APL5,	DMN_WORLD },
++	{ DMN_WOR0_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR1_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR2_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR3_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR4_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR5_ETSIC,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR01_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WOR02_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_EU1_WORLD,	DMN_ETSI1,	DMN_WORLD },
++	{ DMN_WOR9_WORLD,	DMN_WORLD,	DMN_WORLD },
++	{ DMN_WORA_WORLD,	DMN_WORLD,	DMN_WORLD },
++};
++
++enum ath5k_regdom ath5k_regdom2flag(enum ath5k_regdom dmn, u16 mhz)
++{
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(r_map); i++) {
++		if (r_map[i].dmn == dmn) {
++			if (mhz >= 2000 && mhz <= 3000)
++				return r_map[i].dmn2;
++			if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
++					mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
++				return r_map[i].dmn5;
++		}
++	}
++
++	return DMN_DEBUG;
++}
++
++u16 ath5k_regdom_from_ieee(enum ath5k_regdom ieee)
++{
++	u32 regdomain = (u32)ieee;
++
++	/*
++	 * Use the default regulation domain if the value is empty
++	 * or not supported by the net80211 regulation code.
++	 */
++	if (ath5k_regdom2flag(regdomain, IEEE80211_CHANNELS_5GHZ_MIN) ==
++			DMN_DEBUG)
++		return (u16)AR5K_TUNE_REGDOMAIN;
++
++	/* It is supported, just return the value */
++	return regdomain;
++}
++
++enum ath5k_regdom ath5k_regdom_to_ieee(u16 regdomain)
++{
++	enum ath5k_regdom ieee = (enum ath5k_regdom)regdomain;
++
++	return ieee;
++}
++



From fedora-extras-commits at redhat.com  Fri Sep 28 00:15:47 2007
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Thu, 27 Sep 2007 20:15:47 -0400
Subject: rpms/bzrtools/FC-6 .cvsignore, 1.10, 1.11 bzrtools.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200709280015.l8S0Fl9T007490@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7273

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
- Update to 0.91.0.  This has numerous bugfixes over the previous version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Apr 2007 02:45:41 -0000	1.10
+++ .cvsignore	28 Sep 2007 00:15:10 -0000	1.11
@@ -1 +1 @@
-bzrtools-0.15.4.tar.gz
+bzrtools-0.91.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/bzrtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzrtools.spec	3 Apr 2007 02:49:50 -0000	1.16
+++ bzrtools.spec	28 Sep 2007 00:15:12 -0000	1.17
@@ -1,22 +1,25 @@
 %{!?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 bzrver 0.15
-%define bzrnextver 0.16
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
+
+%define bzrver 0.91
+%define bzrnextver 0.92
 
 Name:           bzrtools
-Version:        %{bzrver}.4
-Release:        2%{?dist}
+Version:        %{bzrver}.0
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
 Source0:        http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 # Bzrtools is meant to work with a version of bzr that is the same major
 # version.  In addition to being incompatible with older bzr versions, it is 
 # also untested with bzrversion++ and may not work (depending on what has
@@ -46,9 +49,14 @@
 
 %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
+if test "%{python_sitelib}" != "%{python_sitearch}" ; then
+    install -d $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/
+    mv $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins
+fi
+
 # remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
+sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,13 +65,32 @@
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
-%dir %{python_sitelib}/bzrlib/plugins/bzrtools
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
-%{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
-%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
+%dir %{python_sitearch}/bzrlib/plugins/bzrtools
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.py
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyc
+%{python_sitearch}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitearch}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move plugin manually since setuptools has no way of knowing that bzr is
+  arch specific.
+- Disable debuginfo packages.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Fix License tag to conform to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
+* Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
+- Update to 0.18.0.
+
+* Thu Jun 28 2007 Warren Togami <wtogami at redhat.com> 0.17.1-1
+- Update to 0.17.1.
+
 * Mon Apr 2 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.15.4-2
 - Bump for tagging problem.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Apr 2007 02:45:41 -0000	1.10
+++ sources	28 Sep 2007 00:15:12 -0000	1.11
@@ -1 +1 @@
-83f2b309e5320a7269dbb64947265a81  bzrtools-0.15.4.tar.gz
+7ca989b950ea59ff02f9425fb3faa39e  bzrtools-0.91.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 00:32:20 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 20:32:20 -0400
Subject: comps comps-f8.xml.in,1.128,1.129
Message-ID: <200709280032.l8S0WKCY008113@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953

Modified Files:
	comps-f8.xml.in 
Log Message:
[japanese-support] - replace anthy by uim-anthy and anthy-el
- add uim-canna and uim-skk



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- comps-f8.xml.in	26 Sep 2007 17:24:25 -0000	1.128
+++ comps-f8.xml.in	28 Sep 2007 00:31:50 -0000	1.129
@@ -2171,7 +2171,7 @@
       <packagereq type="conditional" requires="stardict">stardict-dic-ja</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
-      <packagereq type="optional">anthy</packagereq>
+      <packagereq type="optional">anthy-el</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
       <packagereq type="optional">ddskk</packagereq>
       <packagereq type="optional">ddskk-xemacs</packagereq>
@@ -2188,6 +2188,9 @@
       <packagereq type="optional">nkf</packagereq>
       <packagereq type="optional">perl-NKF</packagereq>
       <packagereq type="optional">scim-skk</packagereq>
+      <packagereq type="optional">uim-anthy</packagereq>
+      <packagereq type="optional">uim-canna</packagereq>
+      <packagereq type="optional">uim-skk</packagereq>
       <packagereq type="optional">VLGothic-fonts</packagereq>
     </packagelist>
   </group>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:08:23 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 21:08:23 -0400
Subject: rpms/uim/devel uim.spec,1.46,1.47
Message-ID: <200709280108.l8S18NFQ014916@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14869

Modified Files:
	uim.spec 
Log Message:
* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
- Add Requires: uim-gtk2 in uim-gnome.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- uim.spec	20 Sep 2007 02:47:27 -0000	1.46
+++ uim.spec	28 Sep 2007 01:07:50 -0000	1.47
@@ -55,6 +55,7 @@
 Requires:	uim = %{version}-%{release}
 Requires(post):	%{_sbindir}/bonobo-activation-sysconf
 Requires(postun): %{_sbindir}/bonobo-activation-sysconf
+Requires:	uim-gtk2
 
 %package	qt
 Summary:	Qt support for Uim
@@ -197,9 +198,9 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm
@@ -384,6 +385,9 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+- Add Requires: uim-gtk2 in uim-gnome.
+
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
 - Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
 - Correct License tag. (Todd Zullinger)



From fedora-extras-commits at redhat.com  Fri Sep 28 01:09:19 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 21:09:19 -0400
Subject: comps comps-f8.xml.in,1.129,1.130
Message-ID: <200709280109.l8S19J2E014995@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14845

Modified Files:
	comps-f8.xml.in 
Log Message:
[base-x] remove Canna
[base-x] add uim-gtk2 and uim-m17n
[gnome] add uim-gnome
[kde] add uim-qt 



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- comps-f8.xml.in	28 Sep 2007 00:31:50 -0000	1.129
+++ comps-f8.xml.in	28 Sep 2007 01:08:49 -0000	1.130
@@ -349,7 +349,6 @@
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
-      <packagereq type="optional">Canna</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
@@ -366,6 +365,8 @@
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
+      <packagereq type="optional">uim-gtk2</packagereq>
+      <packagereq type="optional">uim-m17n</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
@@ -1035,6 +1036,7 @@
       <packagereq type="optional">trac-webadmin</packagereq>
       <packagereq type="optional">translate-toolkit</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
+      <packagereq type="optional">uim-gnome</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
@@ -2438,6 +2440,7 @@
       <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
+      <packagereq type="optional">uim-qt</packagereq>
     </packagelist>
   </group>
   <group>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:21:53 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Sep 2007 21:21:53 -0400
Subject: comps comps-f8.xml.in,1.130,1.131
Message-ID: <200709280121.l8S1LrKa015527@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15501

Modified Files:
	comps-f8.xml.in 
Log Message:
[desktops] add window-managers (#274791)



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- comps-f8.xml.in	28 Sep 2007 01:08:49 -0000	1.130
+++ comps-f8.xml.in	28 Sep 2007 01:21:23 -0000	1.131
@@ -4199,6 +4199,7 @@
     <grouplist>
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
+      <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>
     </grouplist>
   </category>



From fedora-extras-commits at redhat.com  Fri Sep 28 01:54:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 21:54:44 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.16,1.17
Message-ID: <200709280154.l8S1sifD016429@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16411

Modified Files:
	kinput2.spec 
Log Message:
* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
- Add Requires: Canna to get it working just installing the package.


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kinput2.spec	20 Sep 2007 03:32:40 -0000	1.16
+++ kinput2.spec	28 Sep 2007 01:54:11 -0000	1.17
@@ -67,6 +67,9 @@
 Requires(preun): %{_sbindir}/alternatives
 Requires(triggerpostun): %{_sbindir}/alternatives
 Requires: im-chooser >= 0.4.1-2.fc8
+%if %{is_canna_used}
+Requires: Canna
+%endif
 Obsoletes: kinput2-canna, kinput2-wnn4, kinput2-wnn6, kinput2-canna-wnn4, kinput2-canna-wnn6
 
 %description 
@@ -253,6 +256,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+- Add Requires: Canna to get it working just installing the package.
+
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
 - Add the versioned dependency for im-chooser.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:25 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:25 -0400
Subject: rpms/mlton/devel mlton.spec,1.20,1.21
Message-ID: <200709280208.l8S28Pk1022764@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22702

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mlton.spec	27 Sep 2007 23:35:08 -0000	1.20
+++ mlton.spec	28 Sep 2007 02:07:52 -0000	1.21
@@ -1,12 +1,8 @@
-%ifarch ppc
-%define mlton_bootstrap 1
-%else
 %define mlton_bootstrap 0
-%endif
 
 Name:		mlton
 Version:	20070826
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -14,7 +10,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-Source1:	mlton-20061107-1.ppc-linux.tgz
+#Source1:	mlton-20061107-1.ppc-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -102,6 +98,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
+- Disable bootstrap
+
 * Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
 - Re-bootstrap ppc
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:37 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:37 -0400
Subject: rpms/mlton/devel sources,1.7,1.8
Message-ID: <200709280208.l8S28btm022767@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22725

Modified Files:
	sources 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Sep 2007 23:35:08 -0000	1.7
+++ sources	28 Sep 2007 02:08:04 -0000	1.8
@@ -1,2 +1 @@
-7f78b83b51fa5d3a020181a460b36a89  mlton-20061107-1.ppc-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 02:08:50 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 27 Sep 2007 22:08:50 -0400
Subject: rpms/mlton/devel .cvsignore,1.7,1.8
Message-ID: <200709280208.l8S28on0022771@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22746

Modified Files:
	.cvsignore 
Log Message:
* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
- Disable bootstrap



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Sep 2007 23:35:08 -0000	1.7
+++ .cvsignore	28 Sep 2007 02:08:16 -0000	1.8
@@ -1,2 +1 @@
-mlton-20061107-1.ppc-linux.tgz
 mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 02:10:10 2007
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Thu, 27 Sep 2007 22:10:10 -0400
Subject: rpms/kernel/F-7 linux-2.6-ath5k.patch,1.2,1.3
Message-ID: <200709280210.l8S2AANE022867@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22846

Modified Files:
	linux-2.6-ath5k.patch 
Log Message:
make sure ath5k patch can compile

linux-2.6-ath5k.patch:

Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ath5k.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-ath5k.patch	28 Sep 2007 00:14:44 -0000	1.2
+++ linux-2.6-ath5k.patch	28 Sep 2007 02:10:07 -0000	1.3
@@ -14255,3 +14255,24 @@
 +	return ieee;
 +}
 +
+diff -up linux-2.6.22.noarch/include/linux/pci_ids.h.orig linux-2.6.22.noarch/include/linux/pci_ids.h
+--- linux-2.6.22.noarch/include/linux/pci_ids.h.orig	2007-09-27 22:06:11.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/pci_ids.h	2007-09-27 22:08:08.000000000 -0400
+@@ -2056,6 +2056,8 @@
+ #define PCI_DEVICE_ID_BCM1250_PCI	0x0001
+ #define PCI_DEVICE_ID_BCM1250_HT	0x0002
+ 
++#define PCI_VENDOR_ID_ATHEROS		0x168c
++
+ #define PCI_VENDOR_ID_NETCELL		0x169c
+ #define PCI_DEVICE_ID_REVOLUTION	0x0044
+ 
+@@ -2407,6 +2409,8 @@
+ #define PCI_DEVICE_ID_NETMOS_9845	0x9845
+ #define PCI_DEVICE_ID_NETMOS_9855	0x9855
+ 
++#define PCI_VENDOR_ID_3COM_2		0xa727
++
+ #define PCI_SUBVENDOR_ID_EXSYS		0xd84d
+ #define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
+ #define PCI_SUBDEVICE_ID_EXSYS_4055	0x4055



From fedora-extras-commits at redhat.com  Fri Sep 28 02:30:11 2007
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 27 Sep 2007 22:30:11 -0400
Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.3,1.4
Message-ID: <200709280230.l8S2UBQU023765@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23666

Modified Files:
	perl-Net-SNPP.spec 
Log Message:
More BR fixes.


Index: perl-Net-SNPP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Net-SNPP.spec	27 Sep 2007 23:54:25 -0000	1.3
+++ perl-Net-SNPP.spec	28 Sep 2007 02:29:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-SNPP
 Version:        1.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl modules for the Simple Network Pager Protocol
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +47,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-5
+- More BR fixes.
+
 * Thu Sep 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.17-4
 - Fix BR
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:33:30 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 27 Sep 2007 22:33:30 -0400
Subject: rpms/kinput2/devel kinput2.spec,1.17,1.18
Message-ID: <200709280233.l8S2XUia023865@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	kinput2.spec 
Log Message:
clean up


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/devel/kinput2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kinput2.spec	28 Sep 2007 01:54:11 -0000	1.17
+++ kinput2.spec	28 Sep 2007 02:32:58 -0000	1.18
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -77,7 +77,7 @@
 
 %prep
 %setup -q
-cp ${RPM_SOURCE_DIR}/Kinput2.conf.* .
+cp -a ${RPM_SOURCE_DIR}/Kinput2.conf.* .
 %patch0 -p1
 %ifarch ppc
 %patch1 -p1
@@ -151,37 +151,37 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
 %if %{build_with_wnn4}
-install -c -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn4       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_wnn6}
-install -c -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.wnn6       $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna}
-install -c -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna      $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn4}
-install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
 %endif
 %if %{build_with_canna_wnn6}
-install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
+install -p -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
 
 %if %{is_wnn_used}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -c -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -p -m 0444 ccdef/rule.*  $RPM_BUILD_ROOT/usr/lib/X11/ccdef
 %endif
 
 make install.man DESTDIR=$RPM_BUILD_ROOT
 
 %if %{is_canna_used}
-install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
+install -D -m 0644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
 %endif
 %if %{is_wnn_used}
-install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
+install -D -m 0644 -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
 %endif
 
 %clean
@@ -256,8 +256,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
-* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-36
 - Add Requires: Canna to get it working just installing the package.
+- clean up a bit the spec file.
 
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-35
 - Add the versioned dependency for im-chooser.



From fedora-extras-commits at redhat.com  Fri Sep 28 02:34:14 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Thu, 27 Sep 2007 22:34:14 -0400
Subject: rpms/mesa/devel mesa-7.0.1-stable-branch.patch, 1.1, 1.2 mesa.spec, 
	1.140, 1.141 mesa-6.5.2-hush-synthetic-visual-warning.patch, 1.1,
	NONE mesa-7.0-i-already-defined-glapi-you-twit.patch, 1.1,
	NONE mesa-7.0.1-965-sampler-crash.patch, 1.1, NONE
Message-ID: <200709280234.l8S2YEbX023895@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23872

Modified Files:
	mesa-7.0.1-stable-branch.patch mesa.spec 
Removed Files:
	mesa-6.5.2-hush-synthetic-visual-warning.patch 
	mesa-7.0-i-already-defined-glapi-you-twit.patch 
	mesa-7.0.1-965-sampler-crash.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
- This contains the fixes made to the upstream Mesa stable branch
  including fixes for 965 vblank interrupt issues along with a fix
  in the kernel - remove patches that already upstream.
- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
- mesa-7.0.1-965-sampler-crash.patch - dropped


mesa-7.0.1-stable-branch.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 mesa-7.0.1-stable-branch.patch
Index: mesa-7.0.1-stable-branch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.0.1-stable-branch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.0.1-stable-branch.patch	15 Aug 2007 10:17:48 -0000	1.1
+++ mesa-7.0.1-stable-branch.patch	28 Sep 2007 02:34:11 -0000	1.2
@@ -1,4 +1,7 @@
-Brian (21):
+Adam Jackson (1):
+      Unbreak Linux builds with -fvisibility=hidden.
+
+Brian (64):
       added md5 sums
       fix even-sized point positioning (bug 11874)
       Merge branch 'mesa_7_0_branch' of git+ssh://brianp at git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
@@ -20,18 +23,101 @@
       added some temporary texobj ref counting debug output
       more tex obj ref count debugging (temporary)
       Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
+      copy Target in _mesa_copy_texture_object()
+      Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
+      more debug output (context destroy, fb destroy)
+      log deleting/binding of FBOs
+      Remove recent texobj refcount debug/logging code.
+      don't map buffer in _mesa_validate_DrawElements() unless needed
+      refactor bounds checking code
+      remove unneeded CallStack array
+      remove CallDepth++/-- accidentally removed in prev commit
+      new __gluInvertMatrix() function (Mesa bug 6748)
+      Fixed bugs 6748, 12141
+      s/movaps/movups/ (see bug 12216)
+      fix i965 bugs, x86-64 bugs
+      sync with trunk, fixing bug 12239
+      Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
+      updated VC7 project files
+      clean-up (see bug 12317)
+      fix comment
+      Update depth test state when binding new framebuffer object
+      In _mesa_make_current(), don't unbind FBOs from the old context.
+      fix indirect rendering crash
+      updated with pkg-config info
+      added DSTDIR, pkg-config items
+      added .pc.in files to tarballs
+      Fix state.texgen parsing error (bug 12313).
+      added program_error2() function for better error reporting
+      fix ARB fp/vp parsing bug 12313
+      fix copypixels overlap test bug (#12417)
+      fix glCopyPixel/glPixelZoom bug 12417)
+      updated link
+      From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
+      fix bug 10604
+      Added bluegene-xlc-osmesa config (Alexander Neundorf)
+      fixes for bluegene-xlc-osmesa config
+      added bluegene-xlc-osmesa, fortran fixes
+      fix for __IBMC__
+      fix -D_BSD_SOURC
+      fix DrawRangeElements error msg
+      Restore old _TriangleCaps code to fix Blender problem (bug 12164)
+      fix blend bug 12164
+      bump versions to 7.0.2
+      for Miniglx, use git sources
+      prep for 7.0.2 release
+
+Christoph Kubisch (1):
+      updated VC7 project files
+
+Colin McDonald (1):
+      fixed problem with big glDrawArrays (see bug 12141)
+
+Dan Nicholson (2):
+      DESTDIR support.
+      pkg-config support
 
 Dan Torop (1):
       fix spantmp2 READ_RGBA inline asm (#11931)
 
-Michel D??nzer (1):
+Dave Airlie (1):
+      i965: fix vblank on 965gm laptops by bringing in code from i915
+
+Michel D??nzer (2):
       i915tex: Make sure pitch is aligned properly for render-to-texture.
+      i915tex: Unreference texture buffers on context destruction.
+
+Roland B??r (1):
+      [i965] Bug #11812: Fix fwrite return value checks in AUB file code.
+
+Roland Scheidegger (2):
+      suppress warning about ncon visuals (bug #6689)
+      fix another occurence of movaps which might not be aligned
 
 Wang Zhenyu (1):
       i915tex: Add support for 945GME
 
+Xiang, Haihao (13):
+      i965: flush batch buffer when getting the maximum. This makes
+      i965: samplers group in fours in WM_STATE. fix bug#9415
+      i965: check NULL pointer. fix bug#12193
+      i965: store read drawable info in intel_context. Some OpenGL
+      i965: Take the upper limitation on LOD into account.
+      fix bug#11009
+      i965: limit on LOD Bias, fix#11987
+      i965: take the secondary color into account when drawing
+      i965: fix #11378
+      i965: fix bug#11925
+      i965: The cube map texture coordinates must be devided by the
+      i965: handle all unfilled mode in clip stage. fix bug #12453
+      mesa: make sure the gotten value isn't greater than the
+
+Zou Nan hai (2):
+      fix a bug in 965 ARB_occlusion_query,
+      fix fd.o bug #12217, recalcuate urb when clip plane size change
+
 diff --git a/Makefile b/Makefile
-index 3cab262..56efa83 100644
+index 3cab262..e05e0e6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,5 @@
@@ -42,7 +128,15 @@
  TOP = .
  
  SUBDIRS = src progs
-@@ -156,7 +154,7 @@ sunos5-v9 \
+@@ -70,6 +68,7 @@ aix-gcc \
+ aix-static \
+ beos \
+ bluegene-osmesa \
++bluegene-xlc-osmesa \
+ darwin \
+ darwin-static \
+ darwin-static-x86ppc \
+@@ -156,7 +155,7 @@ sunos5-v9 \
  sunos5-v9-static \
  sunos5-v9-cc-g++ \
  ultrix-gcc:
@@ -51,12 +145,207 @@
  		echo "Please run 'make realclean' before changing configs" ; \
  		exit 1 ; \
  	fi
+@@ -166,10 +165,10 @@ ultrix-gcc:
+ 
+ # Rules for making release tarballs
+ 
+-DIRECTORY = Mesa-7.0.1
+-LIB_NAME = MesaLib-7.0.1
+-DEMO_NAME = MesaDemos-7.0.1
+-GLUT_NAME = MesaGLUT-7.0.1
++DIRECTORY = Mesa-7.0.2-rc1
++LIB_NAME = MesaLib-7.0.2-rc1
++DEMO_NAME = MesaDemos-7.0.2-rc1
++GLUT_NAME = MesaGLUT-7.0.2-rc1
+ 
+ MAIN_FILES = \
+ 	$(DIRECTORY)/Makefile*						\
+@@ -213,6 +212,7 @@ MAIN_FILES = \
+ 	$(DIRECTORY)/src/mesa/Makefile*					\
+ 	$(DIRECTORY)/src/mesa/sources					\
+ 	$(DIRECTORY)/src/mesa/descrip.mms				\
++	$(DIRECTORY)/src/mesa/gl.pc.in					\
+ 	$(DIRECTORY)/src/mesa/depend					\
+ 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
+ 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
+@@ -320,6 +320,7 @@ DRI_FILES = \
+ SGI_GLU_FILES = \
+ 	$(DIRECTORY)/src/glu/Makefile					\
+ 	$(DIRECTORY)/src/glu/descrip.mms				\
++	$(DIRECTORY)/src/glu/glu.pc.in					\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile				\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
+ 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
+@@ -396,6 +397,7 @@ GLUT_FILES = \
+ 	$(DIRECTORY)/include/GL/glutf90.h		\
+ 	$(DIRECTORY)/src/glut/glx/Makefile*		\
+ 	$(DIRECTORY)/src/glut/glx/depend		\
++	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
+ 	$(DIRECTORY)/src/glut/glx/*def			\
+ 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
+ 	$(DIRECTORY)/src/glut/glx/mms_depend		\
+@@ -418,6 +420,7 @@ DEPEND_FILES = \
+ 	$(TOP)/src/mesa/depend		\
+ 	$(TOP)/src/glx/x11/depend	\
+ 	$(TOP)/src/glw/depend		\
++	$(TOP)/src/glw/glw.pc.in	\
+ 	$(TOP)/src/glut/glx/depend	\
+ 	$(TOP)/src/glu/sgi/depend
+ 
+diff --git a/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
+new file mode 100644
+index 0000000..b0c762d
+--- /dev/null
++++ b/configs/bluegene-xlc-osmesa
+@@ -0,0 +1,29 @@
++# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
++# This doesn't really have a lot of dependencies, so it should be usable
++# on similar systems too.
++# It uses static linking and disables multithreading.
++
[...3033 lines suppressed...]
+ #include "enums.h"
+-#include "program.h"
+-#include "prog_instruction.h"
+-#include "prog_parameter.h"
+-#include "prog_print.h"
+-#include "prog_statevars.h"
++#include "shader/program.h"
++#include "shader/prog_instruction.h"
++#include "shader/prog_parameter.h"
++#include "shader/prog_print.h"
++#include "shader/prog_statevars.h"
+ #include "t_context.h" /* NOTE: very light dependency on this */
+ #include "t_vp_build.h"
+ 
+@@ -457,9 +457,13 @@ static void register_matrix_param5( struct tnl_program *p,
+ }
+ 
+ 
++/**
++ * Convert a ureg source register to a prog_src_register.
++ */
+ static void emit_arg( struct prog_src_register *src,
+ 		      struct ureg reg )
+ {
++   assert(reg.file != PROGRAM_OUTPUT);
+    src->File = reg.file;
+    src->Index = reg.idx;
+    src->Swizzle = reg.swz;
+@@ -469,9 +473,18 @@ static void emit_arg( struct prog_src_register *src,
+    src->RelAddr = 0;
+ }
+ 
++/**
++ * Convert a ureg dest register to a prog_dst_register.
++ */
+ static void emit_dst( struct prog_dst_register *dst,
+ 		      struct ureg reg, GLuint mask )
+ {
++   /* Check for legal output register type.  UNDEFINED will occur in
++    * instruction that don't produce a result (like END).
++    */
++   assert(reg.file == PROGRAM_TEMPORARY ||
++          reg.file == PROGRAM_OUTPUT ||
++          reg.file == PROGRAM_UNDEFINED);
+    dst->File = reg.file;
+    dst->Index = reg.idx;
+    /* allow zero as a shorthand for xyzw */
+@@ -956,13 +969,19 @@ static void build_lighting( struct tnl_program *p )
+ 					       STATE_POSITION); 
+ 	    struct ureg V = get_eye_position(p);
+ 	    struct ureg dist = get_temp(p);
++	    struct ureg tmpPpli = get_temp(p);
+ 
+ 	    VPpli = get_temp(p); 
+ 	    half = get_temp(p);
+  
+-	    /* Calulate VPpli vector
++            /* In homogeneous object coordinates
++             */
++            emit_op1(p, OPCODE_RCP, dist, 0, swizzle1(Ppli, W));
++            emit_op2(p, OPCODE_MUL, tmpPpli, 0, Ppli, dist);
++
++	    /* Calculate VPpli vector
+ 	     */
+-	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V); 
++	    emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V); 
+ 
+ 	    /* Normalize VPpli.  The dist value also used in
+ 	     * attenuation below.
+@@ -994,6 +1013,7 @@ static void build_lighting( struct tnl_program *p )
+ 	    emit_normalize_vec3(p, half, half);
+ 
+ 	    release_temp(p, dist);
++	    release_temp(p, tmpPpli);
+ 	 }
+ 
+ 	 /* Calculate dot products:
+@@ -1103,7 +1123,9 @@ static void build_fog( struct tnl_program *p )
+ {
+    struct ureg fog = register_output(p, VERT_RESULT_FOGC);
+    struct ureg input;
+-   
++   GLuint useabs = p->state->fog_source_is_depth && p->state->fog_mode &&
++		   (p->state->fog_mode != FOG_EXP2);
++
+    if (p->state->fog_source_is_depth) {
+       input = swizzle1(get_eye_position(p), Z);
+    }
+@@ -1111,31 +1133,36 @@ static void build_fog( struct tnl_program *p )
+       input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
+    }
+ 
+-   if (p->state->tnl_do_vertex_fog) {
++   if (p->state->fog_mode && p->state->tnl_do_vertex_fog) {
+       struct ureg params = register_param2(p, STATE_INTERNAL,
+ 					   STATE_FOG_PARAMS_OPTIMIZED);
+       struct ureg tmp = get_temp(p);
+ 
++      if (useabs) {
++	 emit_op1(p, OPCODE_ABS, tmp, 0, input);
++      }
++
+       switch (p->state->fog_mode) {
+       case FOG_LINEAR: {
+ 	 struct ureg id = get_identity_param(p);
+-	 emit_op3(p, OPCODE_MAD, tmp, 0, input, swizzle1(params,X), swizzle1(params,Y));
++	 emit_op3(p, OPCODE_MAD, tmp, 0, useabs ? tmp : input,
++			swizzle1(params,X), swizzle1(params,Y));
+ 	 emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
+ 	 emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
+ 	 break;
+       }
+       case FOG_EXP:
+-	 emit_op1(p, OPCODE_ABS, tmp, 0, input); 
+-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, swizzle1(params,Z));
++	 emit_op2(p, OPCODE_MUL, tmp, 0, useabs ? tmp : input,
++			swizzle1(params,Z));
+ 	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ 	 break;
+       case FOG_EXP2:
+ 	 emit_op2(p, OPCODE_MUL, tmp, 0, input, swizzle1(params,W));
+-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp); 
++	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
+ 	 emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ 	 break;
+       }
+-      
++
+       release_temp(p, tmp);
+    }
+    else {
+@@ -1143,7 +1170,7 @@ static void build_fog( struct tnl_program *p )
+        *
+        * KW:  Is it really necessary to do anything in this case?
+        */
+-      emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input);
++      emit_op1(p, useabs ? OPCODE_ABS : OPCODE_MOV, fog, WRITEMASK_X, input);
+    }
+ }
+  
+diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
+index 8940551..697d00e 100644
+--- a/src/mesa/vbo/vbo_save_draw.c
++++ b/src/mesa/vbo/vbo_save_draw.c
+@@ -132,9 +132,11 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
+    }
+ 
+    for (attr = 0; attr < VBO_ATTRIB_MAX; attr++) {
+-      if (node->attrsz[attr]) {
++      GLuint src = map[attr];
++
++      if (node->attrsz[src]) {
+ 	 arrays[attr].Ptr = (const GLubyte *)data;
+-	 arrays[attr].Size = node->attrsz[attr];
++	 arrays[attr].Size = node->attrsz[src];
+ 	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
+ 	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
+ 	 arrays[attr].Type = GL_FLOAT;
 diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
 index e142dde..b71a935 100644
 --- a/src/mesa/vbo/vbo_split_copy.c
@@ -1445,3 +4015,38 @@
        dst->BufferObj = ctx->Array.NullBufferObj;
        dst->_MaxElement = copy->dstbuf_size; /* may be less! */
  
+diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S
+index 65328f6..f512b3a 100644
+--- a/src/mesa/x86-64/xform4.S
++++ b/src/mesa/x86-64/xform4.S
+@@ -1,10 +1,8 @@
+-/* $Id$ */
+-
+ /*
+  * Mesa 3-D graphics library
+- * Version:  3.5
++ * Version:  7.0.1
+  *
+- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
++ * Copyright (C) 1999-2007  Brian Paul   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"),
+@@ -64,7 +62,7 @@ _mesa_x86_64_transform_points4_general:
+ 
+ p4_general_loop:
+ 
+-	movaps (%rdx), %xmm8		/* ox | oy | oz | ow */
++	movups (%rdx), %xmm8		/* ox | oy | oz | ow */
+ 	prefetchw 16(%rdi)
+ 
+ 	pshufd $0x00, %xmm8, %xmm0	/* ox | ox | ox | ox */
+@@ -149,7 +147,7 @@ _mesa_x86_64_transform_points4_3d:
+ 
+ p4_3d_loop:
+ 
+-	movaps (%rdx), %xmm8		/* ox | oy | oz | ow */
++	movups (%rdx), %xmm8		/* ox | oy | oz | ow */
+ 	prefetchw 16(%rdi)
+ 
+ 	pshufd $0x00, %xmm8, %xmm0	/* ox | ox | ox | ox */


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mesa.spec	6 Sep 2007 18:45:11 -0000	1.140
+++ mesa.spec	28 Sep 2007 02:34:11 -0000	1.141
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -46,13 +46,10 @@
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
 Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
 Patch18: mesa-7.0-selinux-awareness.patch
-Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
 Patch23: mesa-6.5.2-bindcontext-paranoia.patch
-Patch24: mesa-7.0-i-already-defined-glapi-you-twit.patch
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.0.1-stable-branch.patch
 Patch27: mesa-7.0-use_master-r300.patch
-Patch28: mesa-7.0.1-965-sampler-crash.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -178,13 +175,10 @@
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 %patch5 -p1 -b .xserver-1.1-compat
 %patch18 -p1 -b .selinux-awareness
-%patch22 -p1 -b .visual-warning
 %patch23 -p1 -b .bindcontext
-%patch24 -p1 -b .glapi
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .stable
 %patch27 -p1 -b .r300
-%patch28 -p1 -b .965-sampler
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -414,6 +408,15 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
+- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
+- This contains the fixes made to the upstream Mesa stable branch
+  including fixes for 965 vblank interrupt issues along with a fix
+  in the kernel - remove patches that already upstream.
+- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
+- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
+- mesa-7.0.1-965-sampler-crash.patch - dropped
+
 * Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
 - mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
 


--- mesa-6.5.2-hush-synthetic-visual-warning.patch DELETED ---


--- mesa-7.0-i-already-defined-glapi-you-twit.patch DELETED ---


--- mesa-7.0.1-965-sampler-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 02:35:48 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 22:35:48 -0400
Subject: rpms/smolt/devel languages.patch,NONE,1.1 smolt.spec,1.29,1.30
Message-ID: <200709280235.l8S2Zmqj023984@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23929

Modified Files:
	smolt.spec 
Added Files:
	languages.patch 
Log Message:
Added languages for firstboot

languages.patch:

--- NEW FILE languages.patch ---
diff -uNr client/po/as.po ../smolt-0.9.8.4/client/po/as.po
--- client/po/as.po	2007-09-21 14:42:33.000000000 -0500
+++ ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-22 12:09-0400\n"
+"POT-Creation-Date: 2007-08-08 15:27-0400\n"
 "PO-Revision-Date: 2007-04-04 17:12+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
 "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
@@ -118,55 +118,47 @@
 msgid "To view your profile visit: %s"
 msgstr "?????????????????? ?????????????????? ???????????? ????????? ???'?????? ????????????: %s"
 
-#: smoltGui.py:74
+#: smoltGui.py:70
 msgid "_Quit"
 msgstr ""
 
-#: smoltGui.py:74
+#: smoltGui.py:70
 msgid "Quit the program without sending your hardware profile to the server"
 msgstr ""
 
-#: smoltGui.py:75
+#: smoltGui.py:71
 msgid "_Send"
 msgstr ""
 
-#: smoltGui.py:75
+#: smoltGui.py:71
 msgid "Send your hardware profile to the server."
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show _Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show the Smolt privacy policy."
 msgstr ""
 
-#: smoltGui.py:77
+#: smoltGui.py:73
 msgid "_About"
 msgstr ""
 
-#: smoltGui.py:78
+#: smoltGui.py:74
 msgid "_File"
 msgstr ""
 
-#: smoltGui.py:79
+#: smoltGui.py:75
 msgid "_Help"
 msgstr ""
 
-#: smoltGui.py:80
-msgid "_My Smolt Page"
-msgstr ""
-
-#: smoltGui.py:80
-msgid "Take me to my smolt profile page"
-msgstr ""
-
-#: smoltGui.py:145
+#: smoltGui.py:137
 msgid "An error occurred while sending the data to the server."
 msgstr ""
 
-#: smoltGui.py:152
+#: smoltGui.py:144
 #, python-format
 msgid ""
 "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
@@ -174,24 +166,24 @@
 "stored in %s"
 msgstr ""
 
-#: smoltGui.py:166
+#: smoltGui.py:157
 msgid "Smolt Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:209
+#: smoltGui.py:200
 msgid "translator-credits"
 msgstr ""
 
-#: smoltGui.py:210
+#: smoltGui.py:201
 #, fuzzy
 msgid "Fedora hardware profiler."
 msgstr "??????????????????????????? ???????????????????????? ?????????????????? ????????????"
 
-#: smoltGui.py:211
+#: smoltGui.py:202
 msgid "Copyright ?? 2007 Mike McGrath"
 msgstr ""
 
-#: smoltGui.py:213
+#: smoltGui.py:204
 msgid ""
 "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.\n"
 "\n"
@@ -218,100 +210,100 @@
 msgid "Run \"service haldaemon start\" as root"
 msgstr "????????? ?????????????????? \"service haldaemon start\" ???????????????"
 
-#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
 #, python-format
 msgid "Error contacting Server: %s"
 msgstr "???????????? ??????????????? ?????????????????? ?????????: %s"
 
-#: smolt.py:408
+#: smolt.py:409
 msgid "Wrong version, server incapable of handling your client"
 msgstr ""
 
-#: smolt.py:424
+#: smolt.py:425
 msgid "Communication with server failed"
 msgstr "??????????????? ???????????? ????????? ????????????????????? ???????????? ???'???"
 
-#: smolt.py:498
+#: smolt.py:499
 msgid "Devices"
 msgstr "??????????????????????????????"
 
-#: smolt.py:509
+#: smolt.py:510
 msgid "UUID"
 msgstr "UUID"
 
-#: smolt.py:510
+#: smolt.py:511
 msgid "OS"
 msgstr "OS"
 
-#: smolt.py:511
+#: smolt.py:512
 msgid "Default run level"
 msgstr "??????????????????????????? ????????????????????????"
 
-#: smolt.py:512
+#: smolt.py:513
 msgid "Language"
 msgstr "????????????"
 
-#: smolt.py:513
+#: smolt.py:514
 msgid "Platform"
 msgstr "????????????"
 
-#: smolt.py:514
+#: smolt.py:515
 msgid "BogoMIPS"
 msgstr "BogoMIPS"
 
-#: smolt.py:515
+#: smolt.py:516
 msgid "CPU Vendor"
 msgstr "CPU ??? ????????????????????????"
 
-#: smolt.py:516
+#: smolt.py:517
 msgid "CPU Model"
 msgstr "CPU ??? ????????????????????????"
 
-#: smolt.py:517
+#: smolt.py:518
 msgid "Number of CPUs"
 msgstr "CPU ??????????????? ??????????????????"
 
-#: smolt.py:518
+#: smolt.py:519
 msgid "CPU Speed"
 msgstr "CPU ??? ?????????"
 
-#: smolt.py:519
+#: smolt.py:520
 msgid "System Memory"
 msgstr "???????????????????????????????????????????????? ?????????????????????????????????"
 
-#: smolt.py:520
+#: smolt.py:521
 msgid "System Swap"
 msgstr "???????????????????????????????????????????????? ???????????????"
 
-#: smolt.py:521
+#: smolt.py:522
 msgid "Vendor"
 msgstr "????????????????????????"
 
[...9471 lines suppressed...]
 msgid "Send your hardware profile to the server."
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show _Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:76
+#: smoltGui.py:72
 msgid "Show the Smolt privacy policy."
 msgstr ""
 
-#: smoltGui.py:77
+#: smoltGui.py:73
 msgid "_About"
 msgstr ""
 
-#: smoltGui.py:78
+#: smoltGui.py:74
 msgid "_File"
 msgstr ""
 
-#: smoltGui.py:79
+#: smoltGui.py:75
 msgid "_Help"
 msgstr ""
 
-#: smoltGui.py:80
-msgid "_My Smolt Page"
-msgstr ""
-
-#: smoltGui.py:80
-msgid "Take me to my smolt profile page"
-msgstr ""
-
-#: smoltGui.py:145
+#: smoltGui.py:137
 msgid "An error occurred while sending the data to the server."
 msgstr ""
 
-#: smoltGui.py:152
+#: smoltGui.py:144
 #, python-format
 msgid ""
 "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
@@ -173,23 +165,23 @@
 "stored in %s"
 msgstr ""
 
-#: smoltGui.py:166
+#: smoltGui.py:157
 msgid "Smolt Privacy Policy"
 msgstr ""
 
-#: smoltGui.py:209
+#: smoltGui.py:200
 msgid "translator-credits"
 msgstr ""
 
-#: smoltGui.py:210
+#: smoltGui.py:201
 msgid "Fedora hardware profiler."
 msgstr ""
 
-#: smoltGui.py:211
+#: smoltGui.py:202
 msgid "Copyright ?? 2007 Mike McGrath"
 msgstr ""
 
-#: smoltGui.py:213
+#: smoltGui.py:204
 msgid ""
 "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.\n"
 "\n"
@@ -215,100 +207,100 @@
 msgid "Run \"service haldaemon start\" as root"
 msgstr ""
 
-#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
 #, python-format
 msgid "Error contacting Server: %s"
 msgstr ""
 
-#: smolt.py:408
+#: smolt.py:409
 msgid "Wrong version, server incapable of handling your client"
 msgstr ""
 
-#: smolt.py:424
+#: smolt.py:425
 msgid "Communication with server failed"
 msgstr ""
 
-#: smolt.py:498
+#: smolt.py:499
 msgid "Devices"
 msgstr ""
 
-#: smolt.py:509
+#: smolt.py:510
 msgid "UUID"
 msgstr ""
 
-#: smolt.py:510
+#: smolt.py:511
 msgid "OS"
 msgstr ""
 
-#: smolt.py:511
+#: smolt.py:512
 msgid "Default run level"
 msgstr ""
 
-#: smolt.py:512
+#: smolt.py:513
 msgid "Language"
 msgstr ""
 
-#: smolt.py:513
+#: smolt.py:514
 msgid "Platform"
 msgstr ""
 
-#: smolt.py:514
+#: smolt.py:515
 msgid "BogoMIPS"
 msgstr ""
 
-#: smolt.py:515
+#: smolt.py:516
 msgid "CPU Vendor"
 msgstr ""
 
-#: smolt.py:516
+#: smolt.py:517
 msgid "CPU Model"
 msgstr ""
 
-#: smolt.py:517
+#: smolt.py:518
 msgid "Number of CPUs"
 msgstr ""
 
-#: smolt.py:518
+#: smolt.py:519
 msgid "CPU Speed"
 msgstr ""
 
-#: smolt.py:519
+#: smolt.py:520
 msgid "System Memory"
 msgstr ""
 
-#: smolt.py:520
+#: smolt.py:521
 msgid "System Swap"
 msgstr ""
 
-#: smolt.py:521
+#: smolt.py:522
 msgid "Vendor"
 msgstr ""
 
-#: smolt.py:522
+#: smolt.py:523
 msgid "System"
 msgstr ""
 
-#: smolt.py:523
+#: smolt.py:524
 msgid "Form factor"
 msgstr ""
 
-#: smolt.py:524
+#: smolt.py:525
 msgid "Kernel"
 msgstr ""
 
-#: smolt.py:525
+#: smolt.py:526
 msgid "SELinux Enabled"
 msgstr ""
 
-#: smolt.py:526
+#: smolt.py:527
 msgid "SELinux Enforce"
 msgstr ""
 
-#: smolt.py:959
+#: smolt.py:960
 msgid "Unable to save UUID, continuing...\n"
 msgstr ""
 
-#: smolt.py:961
+#: smolt.py:962
 msgid "Unable to determine UUID of system!\n"
 msgstr ""
 


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- smolt.spec	21 Sep 2007 20:14:47 -0000	1.29
+++ smolt.spec	28 Sep 2007 02:35:16 -0000	1.30
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -11,6 +11,7 @@
 
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
 Patch0: firstboot.patch
+Patch1: languages.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 cd client/
@@ -179,6 +181,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
+- Added translations
+
 * Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
 - Fixed firstboot issues
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:36:39 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Thu, 27 Sep 2007 22:36:39 -0400
Subject: rpms/kernel/devel
	linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch,
	NONE, 1.1 kernel.spec, 1.195, 1.196
Message-ID: <200709280236.l8S2advc024015@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
- Add i965 drm patch to fix vblank interrupts - should be upstream soon


linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch:

--- NEW FILE linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch ---
>From f1bc762616ca9c2922d39372e95cd37e0742bca0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Fri, 28 Sep 2007 11:46:28 +1000
Subject: [PATCH] i915: make vbl interrupts work properly on i965g/gm hw.

This code is ported from the DRM git tree and allows the vblank interrupts
to function on the i965 hw. It also requires a change in Mesa's 965 driver
to actually use them.

Signed-off-by: Dave Airlie <airlied at linux.ie>
---
 drivers/char/drm/i915_drv.h |    6 ++++++
 drivers/char/drm/i915_irq.c |   12 ++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index bc04dfa..e064292 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -220,6 +220,12 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define I915REG_INT_MASK_R 	0x020a8
 #define I915REG_INT_ENABLE_R	0x020a0
 
+#define I915REG_PIPEASTAT	0x70024
+#define I915REG_PIPEBSTAT	0x71024
+
+#define I915_VBLANK_INTERRUPT_ENABLE	(1UL<<17)
+#define I915_VBLANK_CLEAR		(1UL<<1)
+
 #define SRX_INDEX		0x3c4
 #define SRX_DATA		0x3c5
 #define SR01			1
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 8fccbd6..2c97fe0 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -214,6 +214,10 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 	struct drm_device *dev = (struct drm_device *) arg;
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 	u16 temp;
+	u32 pipea_stats, pipeb_stats;
+
+	pipea_stats = I915_READ(I915REG_PIPEASTAT);
+	pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
 
 	temp = I915_READ16(I915REG_INT_IDENTITY_R);
 
@@ -225,6 +229,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 		return IRQ_NONE;
 
 	I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
+	(void) I915_READ16(I915REG_INT_IDENTITY_R);
+	DRM_READMEMORYBARRIER();
 
 	dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 
@@ -252,6 +258,12 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
 		if (dev_priv->swaps_pending > 0)
 			drm_locked_tasklet(dev, i915_vblank_tasklet);
+		I915_WRITE(I915REG_PIPEASTAT,
+			pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|
+			I915_VBLANK_CLEAR);
+		I915_WRITE(I915REG_PIPEBSTAT,
+			pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
+			I915_VBLANK_CLEAR);
 	}
 
 	return IRQ_HANDLED;
-- 
1.5.3.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kernel.spec	27 Sep 2007 23:49:10 -0000	1.195
+++ kernel.spec	28 Sep 2007 02:36:06 -0000	1.196
@@ -676,9 +676,10 @@
 Patch1512: linux-2.6-firewire-multi-lun.patch
 Patch1515: linux-2.6-lirc.patch
 
-#nouveau
+#nouveau + drm fixes
 Patch1800: drm-mm-git.patch
 Patch1801: nouveau-drm.patch
+Patch1802: linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch
 
 %endif
 
@@ -1001,9 +1002,10 @@
 # setuid /proc/self/maps fix. (dependent on utrace)
 ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
-# Nouveau DRM
+# Nouveau DRM + drm fixes
 ApplyPatch drm-mm-git.patch
 ApplyPatch nouveau-drm.patch
+ApplyPatch linux-2.6-i915-make-vbl-interrupts-work-properly-on-i965g-gm.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1812,6 +1814,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
+- Add i965 drm patch to fix vblank interrupts - should be upstream soon
+
 * Thu Sep 27 2007 John W. Linville <linville at redhat.com>
 - A few iwlwifi and ath5k fixes
 



From fedora-extras-commits at redhat.com  Fri Sep 28 02:42:57 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 27 Sep 2007 22:42:57 -0400
Subject: rpms/smolt/devel languages.patch,1.1,1.2
Message-ID: <200709280242.l8S2gvjx024297@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24276

Modified Files:
	languages.patch 
Log Message:
Updated language patch

languages.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 languages.patch
Index: languages.patch
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/languages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- languages.patch	28 Sep 2007 02:35:16 -0000	1.1
+++ languages.patch	28 Sep 2007 02:42:54 -0000	1.2
@@ -1,5681 +1,5681 @@
-diff -uNr client/po/as.po ../smolt-0.9.8.4/client/po/as.po
---- client/po/as.po	2007-09-21 14:42:33.000000000 -0500
-+++ ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
+diff -uNr ../smolt-0.9.8.4/client/po/as.po client/po/as.po
+--- ../smolt-0.9.8.4/client/po/as.po	2007-08-13 15:46:43.000000000 -0500
++++ client/po/as.po	2007-09-21 14:42:33.000000000 -0500
 @@ -6,7 +6,7 @@
  msgstr ""
  "Project-Id-Version: as\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-08-22 12:09-0400\n"
-+"POT-Creation-Date: 2007-08-08 15:27-0400\n"
+-"POT-Creation-Date: 2007-08-08 15:27-0400\n"
++"POT-Creation-Date: 2007-08-22 12:09-0400\n"
  "PO-Revision-Date: 2007-04-04 17:12+0530\n"
  "Last-Translator: Amitakhya Phukan <aphukan at redhat.com>\n"
  "Language-Team: Assamese <assam at mm.assam-glug.org>\n"
-@@ -118,55 +118,47 @@
+@@ -118,47 +118,55 @@
  msgid "To view your profile visit: %s"
  msgstr "?????????????????? ?????????????????? ???????????? ????????? ???'?????? ????????????: %s"
  
--#: smoltGui.py:74
-+#: smoltGui.py:70
+-#: smoltGui.py:70
++#: smoltGui.py:74
  msgid "_Quit"
  msgstr ""
  
--#: smoltGui.py:74
-+#: smoltGui.py:70
+-#: smoltGui.py:70
++#: smoltGui.py:74
  msgid "Quit the program without sending your hardware profile to the server"
  msgstr ""
  
--#: smoltGui.py:75
-+#: smoltGui.py:71
+-#: smoltGui.py:71
++#: smoltGui.py:75
  msgid "_Send"
  msgstr ""
  
--#: smoltGui.py:75
-+#: smoltGui.py:71
+-#: smoltGui.py:71
++#: smoltGui.py:75
  msgid "Send your hardware profile to the server."
  msgstr ""
  
--#: smoltGui.py:76
-+#: smoltGui.py:72
+-#: smoltGui.py:72
++#: smoltGui.py:76
  msgid "Show _Privacy Policy"
  msgstr ""
  
--#: smoltGui.py:76
-+#: smoltGui.py:72
+-#: smoltGui.py:72
++#: smoltGui.py:76
  msgid "Show the Smolt privacy policy."
  msgstr ""
  
--#: smoltGui.py:77
-+#: smoltGui.py:73
+-#: smoltGui.py:73
++#: smoltGui.py:77
  msgid "_About"
  msgstr ""
  
--#: smoltGui.py:78
-+#: smoltGui.py:74
+-#: smoltGui.py:74
++#: smoltGui.py:78
  msgid "_File"
  msgstr ""
  
--#: smoltGui.py:79
-+#: smoltGui.py:75
+-#: smoltGui.py:75
++#: smoltGui.py:79
  msgid "_Help"
  msgstr ""
  
--#: smoltGui.py:80
--msgid "_My Smolt Page"
--msgstr ""
--
--#: smoltGui.py:80
--msgid "Take me to my smolt profile page"
--msgstr ""
--
--#: smoltGui.py:145
-+#: smoltGui.py:137
+-#: smoltGui.py:137
++#: smoltGui.py:80
++msgid "_My Smolt Page"
++msgstr ""
++
++#: smoltGui.py:80
++msgid "Take me to my smolt profile page"
++msgstr ""
++
++#: smoltGui.py:145
  msgid "An error occurred while sending the data to the server."
  msgstr ""
  
--#: smoltGui.py:152
-+#: smoltGui.py:144
+-#: smoltGui.py:144
++#: smoltGui.py:152
  #, python-format
  msgid ""
  "The data was successfully sent.  If you need to refer to your hardware profile for a bug report your UUID is \n"
-@@ -174,24 +166,24 @@
+@@ -166,24 +174,24 @@
  "stored in %s"
  msgstr ""
  
--#: smoltGui.py:166
-+#: smoltGui.py:157
+-#: smoltGui.py:157
++#: smoltGui.py:166
  msgid "Smolt Privacy Policy"
  msgstr ""
  
--#: smoltGui.py:209
-+#: smoltGui.py:200
+-#: smoltGui.py:200
++#: smoltGui.py:209
  msgid "translator-credits"
  msgstr ""
  
--#: smoltGui.py:210
-+#: smoltGui.py:201
+-#: smoltGui.py:201
++#: smoltGui.py:210
  #, fuzzy
  msgid "Fedora hardware profiler."
  msgstr "??????????????????????????? ???????????????????????? ?????????????????? ????????????"
  
--#: smoltGui.py:211
-+#: smoltGui.py:202
+-#: smoltGui.py:202
++#: smoltGui.py:211
  msgid "Copyright ?? 2007 Mike McGrath"
  msgstr ""
  
--#: smoltGui.py:213
-+#: smoltGui.py:204
+-#: smoltGui.py:204
++#: smoltGui.py:213
  msgid ""
  "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.\n"
  "\n"
-@@ -218,100 +210,100 @@
+@@ -210,100 +218,100 @@
  msgid "Run \"service haldaemon start\" as root"
  msgstr "????????? ?????????????????? \"service haldaemon start\" ???????????????"
  
--#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
-+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
+-#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
++#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
  #, python-format
  msgid "Error contacting Server: %s"
  msgstr "???????????? ??????????????? ?????????????????? ?????????: %s"
  
--#: smolt.py:408
-+#: smolt.py:409
+-#: smolt.py:409
++#: smolt.py:408
  msgid "Wrong version, server incapable of handling your client"
  msgstr ""
  
--#: smolt.py:424
-+#: smolt.py:425
+-#: smolt.py:425
++#: smolt.py:424
  msgid "Communication with server failed"
  msgstr "??????????????? ???????????? ????????? ????????????????????? ???????????? ???'???"
  
--#: smolt.py:498
-+#: smolt.py:499
+-#: smolt.py:499
++#: smolt.py:498
  msgid "Devices"
  msgstr "??????????????????????????????"
  
--#: smolt.py:509
[...16811 lines suppressed...]
+-#: smoltGui.py:200
++#: smoltGui.py:209
  msgid "translator-credits"
  msgstr ""
  
--#: smoltGui.py:210
-+#: smoltGui.py:201
+-#: smoltGui.py:201
++#: smoltGui.py:210
  msgid "Fedora hardware profiler."
  msgstr ""
  
--#: smoltGui.py:211
-+#: smoltGui.py:202
+-#: smoltGui.py:202
++#: smoltGui.py:211
  msgid "Copyright ?? 2007 Mike McGrath"
  msgstr ""
  
--#: smoltGui.py:213
-+#: smoltGui.py:204
+-#: smoltGui.py:204
++#: smoltGui.py:213
  msgid ""
  "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.\n"
  "\n"
-@@ -215,100 +207,100 @@
+@@ -207,100 +215,100 @@
  msgid "Run \"service haldaemon start\" as root"
  msgstr ""
  
--#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
-+#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
+-#: smolt.py:310 smolt.py:400 smolt.py:461 smolt.py:478
++#: smolt.py:310 smolt.py:399 smolt.py:460 smolt.py:477
  #, python-format
  msgid "Error contacting Server: %s"
  msgstr ""
  
--#: smolt.py:408
-+#: smolt.py:409
+-#: smolt.py:409
++#: smolt.py:408
  msgid "Wrong version, server incapable of handling your client"
  msgstr ""
  
--#: smolt.py:424
-+#: smolt.py:425
+-#: smolt.py:425
++#: smolt.py:424
  msgid "Communication with server failed"
  msgstr ""
  
--#: smolt.py:498
-+#: smolt.py:499
+-#: smolt.py:499
++#: smolt.py:498
  msgid "Devices"
  msgstr ""
  
--#: smolt.py:509
-+#: smolt.py:510
+-#: smolt.py:510
++#: smolt.py:509
  msgid "UUID"
  msgstr ""
  
--#: smolt.py:510
-+#: smolt.py:511
+-#: smolt.py:511
++#: smolt.py:510
  msgid "OS"
  msgstr ""
  
--#: smolt.py:511
-+#: smolt.py:512
+-#: smolt.py:512
++#: smolt.py:511
  msgid "Default run level"
  msgstr ""
  
--#: smolt.py:512
-+#: smolt.py:513
+-#: smolt.py:513
++#: smolt.py:512
  msgid "Language"
  msgstr ""
  
--#: smolt.py:513
-+#: smolt.py:514
+-#: smolt.py:514
++#: smolt.py:513
  msgid "Platform"
  msgstr ""
  
--#: smolt.py:514
-+#: smolt.py:515
+-#: smolt.py:515
++#: smolt.py:514
  msgid "BogoMIPS"
  msgstr ""
  
--#: smolt.py:515
-+#: smolt.py:516
+-#: smolt.py:516
++#: smolt.py:515
  msgid "CPU Vendor"
  msgstr ""
  
--#: smolt.py:516
-+#: smolt.py:517
+-#: smolt.py:517
++#: smolt.py:516
  msgid "CPU Model"
  msgstr ""
  
--#: smolt.py:517
-+#: smolt.py:518
+-#: smolt.py:518
++#: smolt.py:517
  msgid "Number of CPUs"
  msgstr ""
  
--#: smolt.py:518
-+#: smolt.py:519
+-#: smolt.py:519
++#: smolt.py:518
  msgid "CPU Speed"
  msgstr ""
  
--#: smolt.py:519
-+#: smolt.py:520
+-#: smolt.py:520
++#: smolt.py:519
  msgid "System Memory"
  msgstr ""
  
--#: smolt.py:520
-+#: smolt.py:521
+-#: smolt.py:521
++#: smolt.py:520
  msgid "System Swap"
  msgstr ""
  
--#: smolt.py:521
-+#: smolt.py:522
+-#: smolt.py:522
++#: smolt.py:521
  msgid "Vendor"
  msgstr ""
  
--#: smolt.py:522
-+#: smolt.py:523
+-#: smolt.py:523
++#: smolt.py:522
  msgid "System"
  msgstr ""
  
--#: smolt.py:523
-+#: smolt.py:524
+-#: smolt.py:524
++#: smolt.py:523
  msgid "Form factor"
  msgstr ""
  
--#: smolt.py:524
-+#: smolt.py:525
+-#: smolt.py:525
++#: smolt.py:524
  msgid "Kernel"
  msgstr ""
  
--#: smolt.py:525
-+#: smolt.py:526
+-#: smolt.py:526
++#: smolt.py:525
  msgid "SELinux Enabled"
  msgstr ""
  
--#: smolt.py:526
-+#: smolt.py:527
+-#: smolt.py:527
++#: smolt.py:526
  msgid "SELinux Enforce"
  msgstr ""
  
--#: smolt.py:959
-+#: smolt.py:960
+-#: smolt.py:960
++#: smolt.py:959
  msgid "Unable to save UUID, continuing...\n"
  msgstr ""
  
--#: smolt.py:961
-+#: smolt.py:962
+-#: smolt.py:962
++#: smolt.py:961
  msgid "Unable to determine UUID of system!\n"
  msgstr ""
  



From fedora-extras-commits at redhat.com  Fri Sep 28 02:55:50 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 22:55:50 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.171,1.172
Message-ID: <200709280255.l8S2toK4024573@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540

Modified Files:
	NetworkManager.spec 
Log Message:
Really fix installation of nm-tool now


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- NetworkManager.spec	25 Sep 2007 19:41:28 -0000	1.171
+++ NetworkManager.spec	28 Sep 2007 02:55:16 -0000	1.172
@@ -167,7 +167,6 @@
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Fri Sep 28 03:30:03 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 23:30:03 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.49, 1.50 NetworkManager.spec,
	1.172, 1.173 sources, 1.68,
	1.69 NetworkManager-0.6.5-deprecated.patch, 1.1, NONE
Message-ID: <200709280330.l8S3U31i031542@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31509

Modified Files:
	.cvsignore NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.6.5-deprecated.patch 
Log Message:
* Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
- New snapshot
	- VPN support (only vpnc plugin ported at this time)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	25 Sep 2007 19:41:28 -0000	1.49
+++ .cvsignore	28 Sep 2007 03:29:30 -0000	1.50
@@ -14,3 +14,5 @@
 NetworkManager-0.7.0.svn2884.tar.gz
 nm-applet-0.7.0.svn200.tar.gz
 NetworkManager-0.7.0.svn2886.tar.gz
+NetworkManager-0.7.0.svn2907.tar.gz
+nm-applet-0.7.0.svn202.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- NetworkManager.spec	28 Sep 2007 02:55:16 -0000	1.172
+++ NetworkManager.spec	28 Sep 2007 03:29:30 -0000	1.173
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2886
+%define snapshot svn2907
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn200.tar.gz
+Source1: nm-applet-%{version}.svn202.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
 Requires: iproute openssl
 Requires: dhclient >= 3.0.2-12
 Requires: wpa_supplicant >= 0.5.7-7
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Obsoletes: dhcdbd
 
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -67,6 +68,7 @@
 Summary: GNOME applications for use with NetworkManager
 Group: Applications/Internet
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -258,6 +260,10 @@
 
 
 %changelog
+* Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
+- New snapshot
+	- VPN support (only vpnc plugin ported at this time)
+
 * Tue Sep 25 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2886
 - New snapshot
 	- Make wired device carrier state work in the applet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	25 Sep 2007 19:41:28 -0000	1.68
+++ sources	28 Sep 2007 03:29:30 -0000	1.69
@@ -1,2 +1,2 @@
-8edfd5854389ea6a6b4eb1f507b46c38  nm-applet-0.7.0.svn200.tar.gz
-fe78cab7288beef5e69dcf897a76d16b  NetworkManager-0.7.0.svn2886.tar.gz
+14197b29863a439baa51f1b9bc5403da  NetworkManager-0.7.0.svn2907.tar.gz
+89e397896518d51c02a6a1f700564a9c  nm-applet-0.7.0.svn202.tar.gz


--- NetworkManager-0.6.5-deprecated.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 03:53:31 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Sep 2007 23:53:31 -0400
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.10,
	1.11 NetworkManager-vpnc.spec, 1.24, 1.25 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
Message-ID: <200709280353.l8S3rVsq031912@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31883

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Removed Files:
	NetworkManager-vpnc-0.6.4-keepalive.patch 
	NetworkManager-vpnc-0.6.4-options.patch 
Log Message:
* 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




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	14 Feb 2007 08:57:28 -0000	1.10
+++ .cvsignore	28 Sep 2007 03:52:58 -0000	1.11
@@ -3,3 +3,4 @@
 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


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NetworkManager-vpnc.spec	17 Aug 2007 06:29:36 -0000	1.24
+++ NetworkManager-vpnc.spec	28 Sep 2007 03:52:58 -0000	1.25
@@ -1,21 +1,20 @@
-%define nm_version          1:0.6.4
-%define dbus_version        0.60
-%define gtk2_version        2.6.0
+%define nm_version          1:0.7.0-0.3.svn2907
+%define dbus_version        1.0
+%define gtk2_version        2.10.0
 %define vpnc_version        0.3.3-3
 %define shared_mime_version 0.16-3
 
+%define svn_snapshot svn2910
+
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.6.4
-Release:   4%{?dist}
+Version:   0.7.0
+Release:   0.1.%{svn_snapshot}%{?dist}
 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
 Patch3:    NetworkManager-vpnc-0.6.4-servpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -46,9 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gppasswd
-%patch1 -p1 -b .keepalive
-%patch2 -p1 -b .options
 %patch3 -p1 -b .servpath
 
 
@@ -101,6 +97,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Feb 2007 08:57:28 -0000	1.11
+++ sources	28 Sep 2007 03:52:58 -0000	1.12
@@ -1 +1 @@
-ae2d37c75bfef1752f9a4fb944d0a7e5  NetworkManager-vpnc-0.6.4.tar.gz
+248b55f9601a6c34bdf9f422f5de2f0c  NetworkManager-vpnc-0.7.0.svn2910.tar.gz


--- NetworkManager-vpnc-0.6.4-keepalive.patch DELETED ---


--- NetworkManager-vpnc-0.6.4-options.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 04:28:44 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 28 Sep 2007 00:28:44 -0400
Subject: rpms/man-pages-ja/devel man-pages-ja-fix-uninitialized-value.patch, 
	NONE, 1.1 man-pages-ja-missing-pkglist.patch, NONE,
	1.1 man-pages-ja-timestamp.patch, NONE, 1.1 .cvsignore, 1.48,
	1.49 man-pages-ja.spec, 1.56, 1.57 rh-man-pages-ja.pl, 1.12,
	1.13 sources, 1.47, 1.48 man-pages-ja-222495-swapon.2.patch, 1.1, NONE
Message-ID: <200709280428.l8S4Sifh008408@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8375

Modified Files:
	.cvsignore man-pages-ja.spec rh-man-pages-ja.pl sources 
Added Files:
	man-pages-ja-fix-uninitialized-value.patch 
	man-pages-ja-missing-pkglist.patch 
	man-pages-ja-timestamp.patch 
Removed Files:
	man-pages-ja-222495-swapon.2.patch 
Log Message:
* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
- updates to 20070915.
  - remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
- clean up the spec file.
- fix some warnings in perl script.

man-pages-ja-fix-uninitialized-value.patch:

--- NEW FILE man-pages-ja-fix-uninitialized-value.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl	2007-09-27 16:34:19.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl	2007-09-27 16:36:44.000000000 +0900
@@ -119,6 +119,7 @@
     chomp;
     my @l = split /:/;
     $l[1] =~ s/ /_/e;
+    unless (exists $main::pw{$l[1]} && defined $main::pw{$l[1]}) {die "Missing `$l[1]' in pkg.list";}
     if ($main::pw{$l[1]} == -1) {next;}
     (my $sec, my $osec) =  split /=>/, $l[5];
     if ($sec eq "pod"){$sec = $podsec;}

man-pages-ja-missing-pkglist.patch:

--- NEW FILE man-pages-ja-missing-pkglist.patch ---
diff -ruN man-pages-ja-20070915.orig/script/pkgs.list man-pages-ja-20070915/script/pkgs.list
--- man-pages-ja-20070915.orig/script/pkgs.list	2006-06-13 01:25:37.000000000 +0900
+++ man-pages-ja-20070915/script/pkgs.list	2007-09-27 16:30:06.000000000 +0900
@@ -65,6 +65,7 @@
 flex		Y
 glibc-linuxthreads	Y
 fort77		Y
+hdparm		Y
 ipfwadm		Y
 ipchains	Y
 iptables	Y
@@ -77,6 +78,7 @@
 man-db		N
 microcode_ctl	Y
 mirrordir	Y
+module-init-tools	Y
 modutils	Y
 mpg123		Y
 ncftp		Y
@@ -89,6 +91,7 @@
 pciutils	Y
 pcmcia-cs	Y
 procinfo	Y
+procmail	Y
 procps		Y
 ppp		Y
 psmisc		Y
@@ -96,6 +99,7 @@
 reiserfsprogs	Y
 rdate		Y
 rp-pppoe	Y
+rpm		Y
 rssh		Y
 sendmail	Y
 setserial	Y
@@ -107,6 +111,7 @@
 ucd-snmp	Y
 util-linux	Y
 uudeview	Y
+vsftpd		Y
 xinetd		Y
 yp-tools	Y
 ypbind		N

man-pages-ja-timestamp.patch:

--- NEW FILE man-pages-ja-timestamp.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl	2007-09-27 16:49:10.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl	2007-09-27 16:50:09.000000000 +0900
@@ -212,7 +212,7 @@
     my $mandst = "$MANROOT/man$sec";
 
     print ISS "echo -n install $pkg: $name.$sec .. \n";
-    print ISS "install -m 644 $mansrc $mandst\n";
+    print ISS "install -m 644 -p $mansrc $mandst\n";
 
     print ISS "echo -n converting to UTF-8 .. \n";
     print ISS "iconv -f euc-jp -t utf-8 $mandst/$name.$sec > $mandst/$name.$sec.tmp && mv $mandst/$name.$sec.tmp $mandst/$name.$sec\n";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	17 Aug 2007 04:48:25 -0000	1.48
+++ .cvsignore	28 Sep 2007 04:28:12 -0000	1.49
@@ -35,3 +35,4 @@
 man-pages-ja-20070615.tar.gz
 man-pages-ja-20070715.tar.gz
 man-pages-ja-20070815.tar.gz
+man-pages-ja-20070915.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- man-pages-ja.spec	17 Aug 2007 03:56:24 -0000	1.56
+++ man-pages-ja.spec	28 Sep 2007 04:28:12 -0000	1.57
@@ -1,16 +1,15 @@
-%define	manver		20070815
 %define	use_utf8	1
 
 Name: man-pages-ja
-Version: %{manver}
-Release: 1
+Version: 20070915
+Release: 1%{?dist}
 # Actual license for each Japanese manpages is the same to the original English manpages' license.
 License: Freely redistributable without restriction
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 URL: http://www.linux.or.jp/JM/
 
-Source: http://www.linux.or.jp/JM/%{name}-%{manver}.tar.gz
+Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz
 Source1: rh-man-pages-ja.pl
 Patch: %{name}-20010515-rh.patch
 Patch1: %{name}-20011115-fixpipe.patch
@@ -19,7 +18,9 @@
 Patch8: man-pages-ja-20050215-ls.patch
 Patch9: man-pages-ja-20060815-204667-nfs.5.patch
 Patch11: man-pages-ja-20060815-178955-at.1.patch
-Patch12: man-pages-ja-222495-swapon.2.patch
+Patch12: man-pages-ja-missing-pkglist.patch
+Patch13: man-pages-ja-fix-uninitialized-value.patch
+Patch14: man-pages-ja-timestamp.patch
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
 Group: Documentation
@@ -27,7 +28,7 @@
 Japanese Manual pages, translated by JM-Project (Japanese Manual Project).
 
 %prep
-%setup -q -n %{name}-%{manver}
+%setup -q -n %{name}-%{version}
 %patch -p1 -b .jp
 %patch1 -p1 -b .pipe
 %if %{use_utf8}
@@ -37,15 +38,17 @@
 %patch8 -p1 -b .ls
 %patch9 -p1 -b .nfs
 %patch11 -p1 -b .at
-%patch12 -p1 -b .swapon
+%patch12 -p1 -b .pkglist
+%patch13 -p1 -b .uninitval
+%patch14 -p1 -b .timestamp
 
 %build
-perl %{SOURCE1} $RPM_BUILD_ROOT | make
+perl %{SOURCE1} '$DESTDIR' | make
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
-sh ./installman.sh
+DESTDIR=$RPM_BUILD_ROOT sh ./installman.sh
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{chage.1,gpasswd.1,sg.1,apropos.1,man.1,whatis.1,newgrp.1}*
 rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man5/{faillog.5,shadow.5,login.defs.5}*
@@ -91,7 +94,11 @@
 	package=`basename \`dirname $i\``;
 	name=`basename $i`;
 	if [ -s $i ]; then
+%if %{use_utf8}
+		iconv -f euc-jp -t utf-8 $i > $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%else
 		cp -a $i $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%endif
 	fi
 done
 )
@@ -100,12 +107,18 @@
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc README translation_lists
 %{_mandir}/ja/*
 
 
 %changelog
+* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
+- updates to 20070915.
+  - remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
+- clean up the spec file.
+- fix some warnings in perl script.
+
 * Fri Aug 17 2007 Akira TAGOH <tagoh at redhat.com> - 20070815-1
 - updates to 20070815.
 


Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rh-man-pages-ja.pl	17 Aug 2006 11:14:40 -0000	1.12
+++ rh-man-pages-ja.pl	28 Sep 2007 04:28:12 -0000	1.13
@@ -15,7 +15,7 @@
 ###
 # Maintainer should update these number according to the original Makefile
 ###
-for($i=0; $i<=104; $i++) {
+for($i=0; $i<=109; $i++) {
   print "\n";
 }
 print "C\n";


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	17 Aug 2007 04:48:25 -0000	1.47
+++ sources	28 Sep 2007 04:28:12 -0000	1.48
@@ -1 +1 @@
-b6c9d323622ac251f4143f7f7fdde4c9  man-pages-ja-20070815.tar.gz
+40af705db14a4ef92bacc0d3e78a4aff  man-pages-ja-20070915.tar.gz


--- man-pages-ja-222495-swapon.2.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 04:44:03 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 00:44:03 -0400
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.25,1.26
Message-ID: <200709280444.l8S4i3J2008777@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 1:0.7.0-0.2.svn2910
- BuildRequire NetworkManager-glib-devel



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NetworkManager-vpnc.spec	28 Sep 2007 03:52:58 -0000	1.25
+++ NetworkManager-vpnc.spec	28 Sep 2007 04:43:29 -0000	1.26
@@ -10,7 +10,7 @@
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.1.%{svn_snapshot}%{?dist}
+Release:   0.2.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -21,6 +21,7 @@
 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
@@ -97,6 +98,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Fri Sep 28 05:07:44 2007
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Fri, 28 Sep 2007 01:07:44 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.7.194-disable-rc410-dri.patch, 
	NONE, 1.1 xorg-x11-drv-ati.spec, 1.61, 1.62
Message-ID: <200709280507.l8S57iME015392@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.7.194-disable-rc410-dri.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
  RC410 by default as it seems to need some more work.


radeon-6.7.194-disable-rc410-dri.patch:

--- NEW FILE radeon-6.7.194-disable-rc410-dri.patch ---
>From d808781d48adf01e80b5bb476bae2d2f599030f1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 28 Sep 2007 14:50:42 +1000
Subject: [PATCH] rc410: disable DRI by default due to it not working

---
 src/radeon_driver.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 89254d3..a8a3d39 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2026,15 +2026,17 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
     info->pKernelDRMVersion = NULL;
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
-	info->Chipset == PCI_CHIP_RN50_5969) {
+	info->Chipset == PCI_CHIP_RN50_5969 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50 forced on -- "
+		"Direct rendering for RN50/RC410 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
     	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"Direct rendering not officially supported on RN50\n");
+		"Direct rendering not officially supported on RN50/RC410\n");
 	    return FALSE;
 	}
     }
-- 
1.5.2.4



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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-drv-ati.spec	24 Sep 2007 04:34:48 -0000	1.61
+++ xorg-x11-drv-ati.spec	28 Sep 2007 05:07:00 -0000	1.62
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.194
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
+Patch3:     radeon-6.7.194-disable-rc410-dri.patch
 
 # Rage 128 patches (100-199)
 
@@ -41,6 +42,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch2 -p1 -b .renderaccel
+%patch3 -p1 -b .rc410dri
 
 %build
 %configure --disable-static
@@ -81,6 +83,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
+- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
+  RC410 by default as it seems to need some more work.
+
 * Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
 - xf86-video-ati 6.7.194
 



From fedora-extras-commits at redhat.com  Fri Sep 28 06:15:47 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:15:47 -0400
Subject: rpms/SteGUI/devel SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE, 
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280615.l8S6FlwU023272@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23200/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:15:14 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:15:14 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 06:17:44 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:17:44 -0400
Subject: rpms/SteGUI/FC-6 SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE,
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280617.l8S6HiiT023411@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:17:11 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:17:11 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 06:19:16 2007
From: fedora-extras-commits at redhat.com (Pierre-YvesChibon (pingou))
Date: Fri, 28 Sep 2007 02:19:16 -0400
Subject: rpms/SteGUI/F-7 SteGUI-icon.png, NONE, 1.1 SteGUI.desktop, NONE,
	1.1 SteGUI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709280619.l8S6JGoP023526@cvs-int.fedora.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/SteGUI/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23487/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	SteGUI-icon.png SteGUI.desktop SteGUI.spec 
Log Message:



--- NEW FILE SteGUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=SteGUI
GenericName=Steganography tool
GenericName[fr]=Outils de St??nographie
Comment=Hides and extracts information within files
Comment[fr]=Cache et extrait des donn??es dans des fichiers
Exec=SteGUI
Icon=SteGUI-icon
Terminal=false
Type=Application
Categories=Utility;X-Fedora;
Version=1.0


--- NEW FILE SteGUI.spec ---
Name:           SteGUI
Version:        0.0.1 
Release:        12%{?dist}
Summary:        Graphical front-end to Steghide
Summary(fr):    Interface graphique pour Steghide

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://stegui.sourceforge.net/
Source0:        http://downloads.sourceforge.net/stegui/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}-icon.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fltk-devel
BuildRequires:  desktop-file-utils 
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  alsa-lib-devel
Requires:       steghide >= 0.5.1, csound-fltk,

%description
SteGUI is a graphical front-end to Steghide. It lets users view the 
images and play the sounds that Steghide allows as cover files, 
and command the program all with one tool. It also embeds a simple 
text editor to manage text payload files.

%description -l fr
SteGUI est une interface graphique de Steghide. Ce programme permet
d'encrypter des fichiers texte dans des images et des fichiers audio.
Il permet aux utilisteurs de voir les images et les sons qui sont 
utilis??s comme couverture. 

%prep
%setup -q


%build
make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" all
 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/


desktop-file-install    --vendor="fedora"                               \
                        --dir %{buildroot}%{_datadir}/applications/     \
                        --mode 0644                                     \
                        %{SOURCE1}  


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README AUTHORS ChangeLog
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.png

%changelog
* Fri Sep 28 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-12
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-11
- Change in the desktop file

* Sat Sep 23 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-10
- Change in the change log (add lines)
- Change in the license tag to fit the packaging guidelines

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-9
- Change in the FLAGS

* Fri Jun 29 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-8
- Change in the desktop file
- Change in the FLAGS

* Wed Jun 27 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-7
- Change in the %%install (forget the rm -rf)
- Change in the summary (remove the name of the package)
- Change in the %%install (removed the strip -s)

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-6
-Add the vendor_id into the desktop file install command
-Add of the strip command to avoid the unstrip remark of rpmlint

* Fri Jun 14 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-5
-Add the libpng-devel to the Buildrequire
-Add the libjpeg-devel Buildrequire

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-4
-Change on the FLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-3
-Correction of the flags to CXXFLAGS
-Add of the french translation of the description and summary

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-2
-Add of the CFLAGS

* Fri May 25 2007 Pingou <pingoufc4 at yahoo.fr> 0.0.1-1
- initial package for Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Sep 2007 01:33:31 -0000	1.1
+++ .cvsignore	28 Sep 2007 06:18:44 -0000	1.2
@@ -0,0 +1 @@
+SteGUI-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SteGUI/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Sep 2007 01:33:31 -0000	1.1
+++ sources	28 Sep 2007 06:18:44 -0000	1.2
@@ -0,0 +1 @@
+1e082d6f0cacdfe6e4b2da5f7b89e1dc  SteGUI-0.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 07:45:08 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 28 Sep 2007 03:45:08 -0400
Subject: rpms/amarok/F-7 amarok-1.4.7-utf8.patch, NONE, 1.1 amarok.spec, 1.81,
	1.82
Message-ID: <200709280745.l8S7j8Ne031937@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/F-7

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-utf8.patch 
Log Message:
* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
  of Unicode filenames to MTP devices


amarok-1.4.7-utf8.patch:

--- NEW FILE amarok-1.4.7-utf8.patch ---
--- amarok-1.4.7.old/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-08-07 13:48:28.000000000 -0400
+++ amarok-1.4.7/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-09-27 03:18:19.000000000 -0400
@@ -295,9 +295,9 @@
     debug() << "Parent id : " << parent_id << endl;
 
     m_critical_mutex.lock();
-    debug() << "Sending track... " << bundle.url().path().latin1() << endl;
+    debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
-        m_device, bundle.url().path().latin1(), trackmeta,
+        m_device, bundle.url().path().utf8(), trackmeta,
         progressCallback, this, parent_id
     );
     m_critical_mutex.unlock();


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- amarok.spec	2 Sep 2007 12:44:48 -0000	1.81
+++ amarok.spec	28 Sep 2007 07:44:31 -0000	1.82
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,7 +12,10 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+# KDE bug 147126: amarok freezes when trying to play mp3 files without mp3 support
 Patch0:     amarok-1.4.7-147126.patch
+# Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
+Patch1:     amarok-1.4.7-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -87,6 +90,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .147126
+%patch1 -p1 -b .utf8
 
 
 
@@ -243,6 +247,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
+- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
+  of Unicode filenames to MTP devices
+
 * Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
 - add patch for kde bug 147126 : amarok freezes when trying to play
   mp3 files without mp3 support



From fedora-extras-commits at redhat.com  Fri Sep 28 07:45:11 2007
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 28 Sep 2007 03:45:11 -0400
Subject: rpms/amarok/devel amarok-1.4.7-utf8.patch, NONE, 1.1 amarok.spec,
	1.84, 1.85
Message-ID: <200709280745.l8S7jBAW031941@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31877/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-utf8.patch 
Log Message:
* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
  of Unicode filenames to MTP devices


amarok-1.4.7-utf8.patch:

--- NEW FILE amarok-1.4.7-utf8.patch ---
--- amarok-1.4.7.old/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-08-07 13:48:28.000000000 -0400
+++ amarok-1.4.7/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2007-09-27 03:18:19.000000000 -0400
@@ -295,9 +295,9 @@
     debug() << "Parent id : " << parent_id << endl;
 
     m_critical_mutex.lock();
-    debug() << "Sending track... " << bundle.url().path().latin1() << endl;
+    debug() << "Sending track... " << bundle.url().path().utf8() << endl;
     int ret = LIBMTP_Send_Track_From_File(
-        m_device, bundle.url().path().latin1(), trackmeta,
+        m_device, bundle.url().path().utf8(), trackmeta,
         progressCallback, this, parent_id
     );
     m_critical_mutex.unlock();


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- amarok.spec	2 Sep 2007 12:44:51 -0000	1.84
+++ amarok.spec	28 Sep 2007 07:44:38 -0000	1.85
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,7 +12,10 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+# KDE bug 147126: amarok freezes when trying to play mp3 files without mp3 support
 Patch0:     amarok-1.4.7-147126.patch
+# Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
+Patch1:     amarok-1.4.7-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -87,6 +90,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .147126
+%patch1 -p1 -b .utf8
 
 
 
@@ -243,6 +247,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
+- add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer
+  of Unicode filenames to MTP devices
+
 * Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
 - add patch for kde bug 147126 : amarok freezes when trying to play
   mp3 files without mp3 support



From fedora-extras-commits at redhat.com  Fri Sep 28 08:27:54 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 04:27:54 -0400
Subject: rpms/lat/devel .cvsignore, 1.7, 1.8 lat.spec, 1.16, 1.17 sources,
	1.7, 1.8
Message-ID: <200709280827.l8S8RsvA007110@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7088

Modified Files:
	.cvsignore lat.spec sources 
Log Message:
Update to 1.2.3
Clarify license as GPL version 2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2007 09:04:17 -0000	1.7
+++ .cvsignore	28 Sep 2007 08:27:20 -0000	1.8
@@ -1 +1 @@
-lat-1.2.2.tar.gz
+lat-1.2.3.tar.gz


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/lat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lat.spec	9 Jun 2007 15:38:08 -0000	1.16
+++ lat.spec	28 Sep 2007 08:27:20 -0000	1.17
@@ -1,8 +1,8 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.2
-Release:            3%{?dist}
-License:            GPL
+Version:            1.2.3
+Release:            1%{?dist}
+License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
 Source0:            http://dev.mmgsecurity.com/downloads/lat/1.2/lat-%{version}.tar.gz
@@ -114,6 +114,10 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 1.2.3-1
+- Update to 1.2.3
+- Clarify license as GPL version 2
+
 * Sat Jun  9 2007 Paul Howarth <paul at city-fan.org> 1.2.2-3
 - ExcludeArch ppc64 due to missing mono support on that arch (#241911)
 - Require yelp (#243403)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2007 09:04:17 -0000	1.7
+++ sources	28 Sep 2007 08:27:20 -0000	1.8
@@ -1 +1 @@
-b33c91e664be723849745db5f85ecb76  lat-1.2.2.tar.gz
+0725508d180720d260a70c5b39d387ba  lat-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 08:49:33 2007
From: fedora-extras-commits at redhat.com (Jonathan Dieter (jdieter))
Date: Fri, 28 Sep 2007 04:49:33 -0400
Subject: rpms/yum-presto import.log,1.10,1.11
Message-ID: <200709280849.l8S8nXcm007631@cvs-int.fedora.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7585

Modified Files:
	import.log 
Log Message:
Fix a couple of typos that caused yum to hang if certain error paths were hit.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	14 Aug 2007 00:23:26 -0000	1.10
+++ import.log	28 Sep 2007 08:48:59 -0000	1.11
@@ -7,3 +7,4 @@
 yum-presto-0_3_10-1:F-7:yum-presto-0.3.10-1.src.rpm:1180594674
 yum-presto-0_4_0-1_fc7:HEAD:yum-presto-0.4.0-1.fc7.src.rpm:1184166008
 yum-presto-0_4_1-1_fc7:HEAD:yum-presto-0.4.1-1.fc7.src.rpm:1187050973
+yum-presto-0_4_2-1_fc7:HEAD:yum-presto-0.4.2-1.fc7.src.rpm:1190969008



From fedora-extras-commits at redhat.com  Fri Sep 28 08:49:36 2007
From: fedora-extras-commits at redhat.com (Jonathan Dieter (jdieter))
Date: Fri, 28 Sep 2007 04:49:36 -0400
Subject: rpms/yum-presto/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 yum-presto.spec, 1.4, 1.5
Message-ID: <200709280849.l8S8nakD007638@cvs-int.fedora.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/yum-presto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7585/devel

Modified Files:
	.cvsignore sources yum-presto.spec 
Log Message:
Fix a couple of typos that caused yum to hang if certain error paths were hit.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2007 00:23:29 -0000	1.5
+++ .cvsignore	28 Sep 2007 08:49:03 -0000	1.6
@@ -1 +1 @@
-yum-presto-0.4.1.tar.bz2
+yum-presto-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2007 00:23:29 -0000	1.5
+++ sources	28 Sep 2007 08:49:03 -0000	1.6
@@ -1 +1 @@
-432f8f39a38a407691b59a0625f62cc7  yum-presto-0.4.1.tar.bz2
+49e9856a966754bac397b25bb4dc9461  yum-presto-0.4.2.tar.bz2


Index: yum-presto.spec
===================================================================
RCS file: /cvs/extras/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-presto.spec	14 Aug 2007 00:23:29 -0000	1.4
+++ yum-presto.spec	28 Sep 2007 08:49:03 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Presto plugin for yum
 Name: yum-presto
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -41,7 +41,11 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
-* Sun Aug  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.1
+* Fri Sep 28 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.2-1
+- Fix a couple of typos that caused yum to hang if certain error paths were
+  hit.
+
+* Sun Aug  5 2007 Jonathan Dieter <jdieter at gmail.com> - 0.4.1-1
 - Applied small patch by Luke Macken to fix problems when not run directly
   from yum.
 - Fix for situation where repository may be removed and then added again



From fedora-extras-commits at redhat.com  Fri Sep 28 08:54:16 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 04:54:16 -0400
Subject: rpms/lat/F-7 .cvsignore,1.7,1.8 lat.spec,1.14,1.15 sources,1.7,1.8
Message-ID: <200709280854.l8S8sG6M007741@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7714

Modified Files:
	.cvsignore lat.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Feb 2007 09:04:17 -0000	1.7
+++ .cvsignore	28 Sep 2007 08:53:42 -0000	1.8
@@ -1 +1 @@
-lat-1.2.2.tar.gz
+lat-1.2.3.tar.gz


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/lat.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lat.spec	16 Mar 2007 14:58:14 -0000	1.14
+++ lat.spec	28 Sep 2007 08:53:42 -0000	1.15
@@ -1,8 +1,8 @@
 Name:               lat
 Summary:            LDAP Administration Tool
-Version:            1.2.2
-Release:            2%{?dist}
-License:            GPL
+Version:            1.2.3
+Release:            1%{?dist}
+License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
 Source0:            http://dev.mmgsecurity.com/downloads/lat/1.2/lat-%{version}.tar.gz
@@ -16,11 +16,14 @@
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
 Requires:           scrollkeeper, gnome-sharp
 %endif
-Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
+Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
 
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
+# Mono not available on ppc64 (#241911)
+ExcludeArch:        ppc64
+
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
@@ -111,6 +114,14 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 1.2.3-1
+- Update to 1.2.3
+- Clarify license as GPL version 2
+
+* Sat Jun  9 2007 Paul Howarth <paul at city-fan.org> 1.2.2-3
+- ExcludeArch ppc64 due to missing mono support on that arch (#241911)
+- Require yelp (#243403)
+
 * Fri Mar 16 2007 Paul Howarth <paul at city-fan.org> 1.2.2-2
 - Upstream now installs correctly into %%{_libdir} rather than %%{_prefix}/lib
   so there's no need to override the destination directory in %%install; this


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2007 09:04:17 -0000	1.7
+++ sources	28 Sep 2007 08:53:42 -0000	1.8
@@ -1 +1 @@
-b33c91e664be723849745db5f85ecb76  lat-1.2.2.tar.gz
+0725508d180720d260a70c5b39d387ba  lat-1.2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 09:08:10 2007
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 28 Sep 2007 05:08:10 -0400
Subject: rpms/uim/devel uim.spec,1.47,1.48
Message-ID: <200709280908.l8S98Ax9014265@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14202

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- uim.spec	28 Sep 2007 01:07:50 -0000	1.47
+++ uim.spec	28 Sep 2007 09:07:38 -0000	1.48
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -385,7 +385,7 @@
 %dir %{_datadir}/uim
 
 %changelog
-* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com>
+* Fri Sep 28 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-9
 - Add Requires: uim-gtk2 in uim-gnome.
 
 * Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8



From fedora-extras-commits at redhat.com  Fri Sep 28 09:17:38 2007
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 28 Sep 2007 05:17:38 -0400
Subject: rpms/gtkwave/devel .cvsignore, 1.41, 1.42 gtkwave.spec, 1.45,
	1.46 sources, 1.41, 1.42
Message-ID: <200709280917.l8S9Hc0P014492@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14468

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
update to 3.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	4 Sep 2007 15:54:23 -0000	1.41
+++ .cvsignore	28 Sep 2007 09:17:04 -0000	1.42
@@ -1 +1 @@
-gtkwave-3.1.0.tar.gz
+gtkwave-3.1.1.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gtkwave.spec	4 Sep 2007 15:54:23 -0000	1.45
+++ gtkwave.spec	28 Sep 2007 09:17:04 -0000	1.46
@@ -1,6 +1,6 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.1.0
+Version:	3.1.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Sep 28 2007 Paul Howarth <paul at city-fan.org> 3.1.1-1
+- update to 3.1.1
+
 * Tue Sep  4 2007 Paul Howarth <paul at city-fan.org> 3.1.0-1
 - update to 3.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	4 Sep 2007 15:54:23 -0000	1.41
+++ sources	28 Sep 2007 09:17:04 -0000	1.42
@@ -1 +1 @@
-b041a02ba825062c062ee8ac1633bbec  gtkwave-3.1.0.tar.gz
+8342dbbb915666cd46730e90d64721b3  gtkwave-3.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 10:50:44 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 06:50:44 -0400
Subject: rpms/yumex/devel .cvsignore, 1.37, 1.38 sources, 1.54,
	1.55 yumex.spec, 1.60, 1.61
Message-ID: <200709281050.l8SAoiRu022988@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22925

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Aug 2007 12:20:20 -0000	1.37
+++ .cvsignore	28 Sep 2007 10:50:10 -0000	1.38
@@ -1 +1 @@
-yumex-2.0.1.tar.gz
+yumex-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	22 Aug 2007 12:20:20 -0000	1.54
+++ sources	28 Sep 2007 10:50:10 -0000	1.55
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yumex.spec	22 Aug 2007 12:20:20 -0000	1.60
+++ yumex.spec	28 Sep 2007 10:50:10 -0000	1.61
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
+Version:  2.0.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 10:52:03 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 06:52:03 -0400
Subject: rpms/yumex/F-7 sources,1.53,1.54 yumex.spec,1.60,1.61
Message-ID: <200709281052.l8SAq34S023075@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23003

Modified Files:
	sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	22 Aug 2007 12:50:29 -0000	1.53
+++ sources	28 Sep 2007 10:51:30 -0000	1.54
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-7/yumex.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yumex.spec	3 Sep 2007 09:34:33 -0000	1.60
+++ yumex.spec	28 Sep 2007 10:51:30 -0000	1.61
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
-Release:  2%{?dist}
+Version:  2.0.2
+Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -68,8 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-2
-- Test build for Bohdi Testing
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 11:06:07 2007
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 28 Sep 2007 07:06:07 -0400
Subject: rpms/yumex/EL-5 sources,1.46,1.47 yumex.spec,1.52,1.53
Message-ID: <200709281106.l8SB67E0029450@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29420

Modified Files:
	sources yumex.spec 
Log Message:
Release 2.0.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/EL-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	22 Aug 2007 12:57:48 -0000	1.46
+++ sources	28 Sep 2007 11:05:28 -0000	1.47
@@ -1 +1 @@
-6352920ec142e990351c8c752d6f0e14  yumex-2.0.1.tar.gz
+9816813e93495af22aa13a4df0c44ee2  yumex-2.0.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/EL-5/yumex.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- yumex.spec	22 Aug 2007 12:57:48 -0000	1.52
+++ yumex.spec	28 Sep 2007 11:05:28 -0000	1.53
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.0.1
+Version:  2.0.2
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -68,6 +68,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Sep 28 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.2-1
+- Release 2.0.2
 * Wed Aug 22 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0.1-1
 - Release 2.0.1
 * Thu Aug 16 2007 Tim Lauridsen <tla at rasmil.dk> - 2.0-1



From fedora-extras-commits at redhat.com  Fri Sep 28 11:10:57 2007
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 28 Sep 2007 07:10:57 -0400
Subject: rpms/quilt/devel quilt.spec,1.15,1.16
Message-ID: <200709281110.l8SBAvU0029609@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29587

Modified Files:
	quilt.spec 
Log Message:
clog


Index: quilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- quilt.spec	22 Aug 2007 03:57:57 -0000	1.15
+++ quilt.spec	28 Sep 2007 11:10:24 -0000	1.16
@@ -7,11 +7,11 @@
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.46
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext gawk
+BuildRequires: gettext gawk util-linux-ng
 Requires: coreutils
 Requires: diffutils
 Requires: gzip
@@ -20,7 +20,7 @@
 Requires: gawk
 Requires: diffstat
 Requires: %{_sbindir}/sendmail
-Requires: util-linux
+Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
 
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 28 2007 - jwboyer at jdub.homelinux.org 0.46-4
+- BR util-linux-ng for getopt
+
 * Tue Aug 21 2007 - jwboyer at jdub.homelinux.org 0.46-3
 - BR gawk
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:04:01 2007
From: fedora-extras-commits at redhat.com (Jon Ciesla (limb))
Date: Fri, 28 Sep 2007 08:04:01 -0400
Subject: comps comps-f7.xml.in, 1.257, 1.258 comps-f8.xml.in, 1.131,
	1.132 comps-fe6.xml.in, 1.376, 1.377
Message-ID: <200709281204.l8SC41AE004625@cvs-int.fedora.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4595

Modified Files:
	comps-f7.xml.in comps-f8.xml.in comps-fe6.xml.in 
Log Message:
Solarwolf comps.



Index: comps-f7.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- comps-f7.xml.in	26 Sep 2007 17:24:25 -0000	1.257
+++ comps-f7.xml.in	28 Sep 2007 12:03:31 -0000	1.258
@@ -1395,6 +1395,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
+      <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- comps-f8.xml.in	28 Sep 2007 01:21:23 -0000	1.131
+++ comps-f8.xml.in	28 Sep 2007 12:03:31 -0000	1.132
@@ -1550,6 +1550,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <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>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-fe6.xml.in,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- comps-fe6.xml.in	19 Sep 2007 22:47:04 -0000	1.376
+++ comps-fe6.xml.in	28 Sep 2007 12:03:31 -0000	1.377
@@ -533,6 +533,7 @@
       <packagereq type="optional">six</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
+      <packagereq type="optional">solarwolf</packagereq>
       <packagereq type="optional">sopwith</packagereq>
       <packagereq type="optional">starfighter</packagereq>
       <packagereq type="optional">sturmbahnfahrer</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 28 12:18:59 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:18:59 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.30,1.31
Message-ID: <200709281219.l8SCIx22005284@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5256

Modified Files:
	sqlite.spec 
Log Message:
- Use bconds for the spec build conditionals
- Enable -tcl subpackage again (#309041)



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sqlite.spec	15 Aug 2007 08:04:07 -0000	1.30
+++ sqlite.spec	28 Sep 2007 12:18:24 -0000	1.31
@@ -1,12 +1,11 @@
-# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
-%define tcl 0%{?_with_tcl:1}
-# --with static enables static library in -devel subpackage
-%define static 0%{?_with_static:1}
+# bcond default logic is nicely backwards...
+%bcond_without tcl
+%bcond_with static
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -14,7 +13,7 @@
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{tcl}
+%if %{with tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -38,7 +37,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{tcl}
+%if %{with tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -53,7 +52,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
-%configure %{!?_with_tcl:--disable-tcl} \
+%configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks 
 make %{?_smp_mflags}
@@ -66,11 +65,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{static}
+%if ! %{with static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{tcl}
+%if %{with tcl}
 %check
 make test
 %endif
@@ -95,17 +94,21 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{static}
+%if %{with static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{tcl}
+%if %{with tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.5.2-2
+- Use bconds for the spec build conditionals
+- Enable -tcl subpackage again (#309041)
+
 * Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
 - Update to 3.4.2
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:20:08 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:20:08 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.31,1.32
Message-ID: <200709281220.l8SCK8Qg005322@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5300

Modified Files:
	sqlite.spec 
Log Message:
- changelog version typo



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sqlite.spec	28 Sep 2007 12:18:24 -0000	1.31
+++ sqlite.spec	28 Sep 2007 12:19:34 -0000	1.32
@@ -105,7 +105,7 @@
 %endif
 
 %changelog
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.5.2-2
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
 - Use bconds for the spec build conditionals
 - Enable -tcl subpackage again (#309041)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 12:49:47 2007
From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai))
Date: Fri, 28 Sep 2007 08:49:47 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.32,1.33
Message-ID: <200709281249.l8SCnl68006159@cvs-int.fedora.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6073

Modified Files:
	sqlite.spec 
Log Message:
- Add another build conditional for enabling %check, disabled by default.
  Previously %check was tied to building with tcl so it hasn't been in use,
  now check fails on koji builders on one of the lock tests but succeeds in
  local builds / mock, dunno...



Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sqlite.spec	28 Sep 2007 12:19:34 -0000	1.32
+++ sqlite.spec	28 Sep 2007 12:49:12 -0000	1.33
@@ -1,11 +1,12 @@
 # bcond default logic is nicely backwards...
 %bcond_without tcl
 %bcond_with static
+%bcond_with check
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -69,7 +70,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{with tcl}
+%if %{with check}
 %check
 make test
 %endif
@@ -105,6 +106,9 @@
 %endif
 
 %changelog
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
+- Add another build conditional for enabling %%check
+
 * Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
 - Use bconds for the spec build conditionals
 - Enable -tcl subpackage again (#309041)



From fedora-extras-commits at redhat.com  Fri Sep 28 13:04:47 2007
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 28 Sep 2007 09:04:47 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.55, 1.56 sources, 1.59,
	1.60 system-config-users.spec, 1.64, 1.65
Message-ID: <200709281304.l8SD4lbZ012545@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12517

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
remove po/POTFILES.in to appease transifex (#299811)
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	15 Sep 2007 22:15:06 -0000	1.55
+++ .cvsignore	28 Sep 2007 13:04:15 -0000	1.56
@@ -1 +1 @@
-system-config-users-1.2.67.tar.bz2
+system-config-users-1.2.68.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	15 Sep 2007 22:15:06 -0000	1.59
+++ sources	28 Sep 2007 13:04:15 -0000	1.60
@@ -1 +1 @@
-abf42a04901188e1cf2dc36378b0e035  system-config-users-1.2.67.tar.bz2
+35c11e707dc1f557a2cf57729630296d  system-config-users-1.2.68.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- system-config-users.spec	15 Sep 2007 22:15:06 -0000	1.64
+++ system-config-users.spec	28 Sep 2007 13:04:15 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.67
+Version: 1.2.68
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -93,6 +93,10 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Fri Sep 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.68
+- remove po/POTFILES.in to appease transifex (#299811)
+- pick up updated translations
+
 * Sun Sep 16 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.67
 - pick up updated translations
 



From fedora-extras-commits at redhat.com  Fri Sep 28 13:19:37 2007
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Fri, 28 Sep 2007 09:19:37 -0400
Subject: rpms/xeuphoric/devel xeuphoric.spec,1.4,1.5
Message-ID: <200709281319.l8SDJbcI012994@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/pkgs/rpms/xeuphoric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12963

Modified Files:
	xeuphoric.spec 
Log Message:



Index: xeuphoric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xeuphoric/devel/xeuphoric.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xeuphoric.spec	26 Aug 2007 15:49:09 -0000	1.4
+++ xeuphoric.spec	28 Sep 2007 13:19:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xeuphoric
 Version:        0.18.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An X based ORIC emulator
 Group:          Applications/Emulators
 # The ROMs are believed to be public domain
@@ -14,8 +14,8 @@
 BuildRequires:  libXext-devel
 Requires:       %{name}-roms
 Requires:       hicolor-icon-theme
-ExcludeArch:    x86_64 ia64 ppc ppc64
-# excluded due to compilation problems - upstream developer changing RSN (me!) -Paul
+# Known to fail on x86_64, ppc, ppc64, ia64 and alpha
+ExclusiveArch:  %{ix86}
 
 %description
 xeuphoric is an X based ORIC emulator which has full support for sound,
@@ -137,12 +137,16 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
@@ -160,11 +164,14 @@
 
 
 %changelog
-* Tue Aug 21 2007 Ian Chapman <packages at amiga-hardware.com> 0.18.2-8
+* Fri Sep 28 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-9
+- Changed to exclusivearch %%{ix86}. (BZ #310391)
+
+* Tue Aug 21 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-8
 - Release bump for F8 mass rebuild
 - License change due to new guidelines
 
-* Fri Jun 29 2007 Ian Chapman <packages at amiga-hardware.com> 0.18.2-7
+* Fri Jun 29 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.18.2-7
 - Various cleanups to the SPEC including conforming to new guidelines
 - Fix BZ #245091
 - Additional .desktop files for other emulator models



From fedora-extras-commits at redhat.com  Fri Sep 28 13:54:02 2007
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Fri, 28 Sep 2007 09:54:02 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.80, 1.81 libsemanage.spec,
	1.135, 1.136 sources, 1.82, 1.83
Message-ID: <200709281354.l8SDs2lY013824@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13800

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Fri Sep 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
- Upgrade to latest from NSA
	* Fix error checking on getpw*_r functions from Todd Miller.
	* Make genhomedircon skip invalid homedir contexts from Todd Miller.
	* Set default user and prefix from seusers from Dan Walsh.
	* Add swigify Makefile target from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	27 Sep 2007 00:20:08 -0000	1.80
+++ .cvsignore	28 Sep 2007 13:53:30 -0000	1.81
@@ -86,3 +86,4 @@
 libsemanage-2.0.5.tgz
 libsemanage-2.0.6.tgz
 libsemanage-2.0.9.tgz
+libsemanage-2.0.10.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- libsemanage.spec	27 Sep 2007 00:20:09 -0000	1.135
+++ libsemanage.spec	28 Sep 2007 13:53:30 -0000	1.136
@@ -2,12 +2,11 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.9
+Version: 2.0.10
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= %{libselinuxver} swig ustr-devel
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -78,6 +76,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 28 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.10-1
+- Upgrade to latest from NSA
+	* Fix error checking on getpw*_r functions from Todd Miller.
+	* Make genhomedircon skip invalid homedir contexts from Todd Miller.
+	* Set default user and prefix from seusers from Dan Walsh.
+	* Add swigify Makefile target from Dan Walsh.
+
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
 - Upgrade to latest from NSA
 	* Pass CFLAGS to CC even on link command, per Dennis Gilmore.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	27 Sep 2007 00:20:09 -0000	1.82
+++ sources	28 Sep 2007 13:53:30 -0000	1.83
@@ -1 +1 @@
-c241e659ddab751e036c3e770583e95c  libsemanage-2.0.9.tgz
+345de8b74ec346600c514641a3876eee  libsemanage-2.0.10.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 14:00:06 2007
From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe))
Date: Fri, 28 Sep 2007 10:00:06 -0400
Subject: rpms/xml-commons-apis/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xml-commons-apis.spec, 1.1, 1.2
Message-ID: <200709281400.l8SE06Xb013970@cvs-int.fedora.redhat.com>

Author: mwringe

Update of /cvs/pkgs/rpms/xml-commons-apis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13940

Modified Files:
	.cvsignore sources xml-commons-apis.spec 
Log Message:
Update to 1.3.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Mar 2007 20:00:46 -0000	1.2
+++ .cvsignore	28 Sep 2007 13:59:34 -0000	1.3
@@ -1 +1 @@
-xml-commons-external-1.3.03-src.tar.gz
+xml-commons-external-1.3.04-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Mar 2007 20:00:46 -0000	1.2
+++ sources	28 Sep 2007 13:59:34 -0000	1.3
@@ -1 +1 @@
-0858a0ba09dc990303887412d722fef4  xml-commons-external-1.3.03-src.tar.gz
+639be783e71e05689b12399ea3d2f625  xml-commons-external-1.3.04-src.tar.gz


Index: xml-commons-apis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/xml-commons-apis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-commons-apis.spec	19 Mar 2007 20:00:46 -0000	1.1
+++ xml-commons-apis.spec	28 Sep 2007 13:59:34 -0000	1.2
@@ -34,14 +34,14 @@
 
 Name:           xml-commons-apis
 Summary:        APIs for DOM, SAX, and JAXP
-Version:        1.3.03
+Version:        1.3.04
 Release:        0jpp.1%{?dist}
 Epoch:          0
 License:        Apache Software License/W3C/Public Domain
 URL:            http://xml.apache.org/commons/
-Source0:        xml-commons-external-1.3.03-src.tar.gz
-# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_03/java/external/
-# tar czf xml-commons-external-1.3.03-src.tar.gz external
+Source0:        xml-commons-external-1.3.04-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/
+# tar czf xml-commons-external-1.3.04-src.tar.gz external
 Requires:       jpackage-utils >= 0:1.5
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
@@ -108,9 +108,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xml-apis.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p build/xml-apis-ext.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-ext-%{version}.jar
 
 # Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}*.jar; do ln -sf ${jar} dom3-${jar}; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}-%{version}.jar; do ln -sf ${jar} dom3-${jar}; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 # for better interoperability with the jpp apis packages
 ln -sf %{name}.jar ${RPM_BUILD_ROOT}%{_javadir}/jaxp13.jar
@@ -165,17 +167,13 @@
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-ext-%{version}.jar.*
 %endif
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc build/docs/*
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/*
@@ -188,6 +186,9 @@
 %endif
 
 %changelog
+* Tue Mar 06 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.04-0jpp.1
+- Update to 1.3.04
+
 * Tue Mar 06 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.03-0jpp.1
 - Split xml-commons package up into 2 separate package: xml-commons-apis
   and xml-commons-which.



From fedora-extras-commits at redhat.com  Fri Sep 28 14:04:07 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 10:04:07 -0400
Subject: rpms/xkeyboard-config/devel sources, 1.4, 1.5 xkeyboard-config.spec,
	1.11, 1.12
Message-ID: <200709281404.l8SE47Jh022392@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21671

Modified Files:
	sources xkeyboard-config.spec 
Log Message:
pick up the respun 1.1 release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2007 04:38:14 -0000	1.4
+++ sources	28 Sep 2007 14:03:34 -0000	1.5
@@ -1 +1 @@
-deef7884b9d9cc280f0d2ef4b60e4d98  xkeyboard-config-1.1.tar.bz2
+2c76b91bd31bff78db771566578fe520  xkeyboard-config-1.1.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xkeyboard-config.spec	26 Sep 2007 04:38:14 -0000	1.11
+++ xkeyboard-config.spec	28 Sep 2007 14:03:34 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-2
+- Pick up the respun 1.1 release
+
 * Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-1
 - Update to 1.1
 - Drop upstreamed patches



From fedora-extras-commits at redhat.com  Fri Sep 28 14:05:42 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:05:42 -0400
Subject: fedora-release/compose - New directory
Message-ID: <200709281405.l8SE5g7e022477@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22462/compose

Log Message:
Directory /cvs/fedora/fedora-release/compose added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 14:09:02 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:09:02 -0400
Subject: fedora-release fedora-release.spec,1.53,1.54
Message-ID: <200709281409.l8SE92H5022646@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22596

Modified Files:
	fedora-release.spec 
Log Message:
Bump for test3, add compose configs for reference.



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- fedora-release.spec	14 Sep 2007 17:27:54 -0000	1.53
+++ fedora-release.spec	28 Sep 2007 14:09:00 -0000	1.54
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	7.91
-Release:	2
+Version:	7.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -49,6 +49,11 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for file in compose/*; do
+  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
+done
+
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -73,10 +78,16 @@
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
+- Bump for F8 Test2.
+- Package up the compose kickstart files
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
 - Use failovermethod=priority in yum configs (243698)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 14:09:03 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:09:03 -0400
Subject: fedora-release/compose README, NONE, 1.1 f8-fedora.ks, NONE,
	1.1 livecd-fedora-base-desktop.ks, NONE,
	1.1 livecd-fedora-desktop.ks, NONE, 1.1 livecd-fedora-kde.ks,
	NONE, 1.1 livedvd-fedora-kde.ks, NONE, 1.1
Message-ID: <200709281409.l8SE93NL022651@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22596/compose

Added Files:
	README f8-fedora.ks livecd-fedora-base-desktop.ks 
	livecd-fedora-desktop.ks livecd-fedora-kde.ks 
	livedvd-fedora-kde.ks 
Log Message:
Bump for test3, add compose configs for reference.



--- NEW FILE README ---
These are the reference config files used to create Fedora releases.

f8-fedora.ks - The traditional DVD release, pick and choose packages.

livecd-fedora-base-desktop.ks - The base Live desktop config

livecd-fedora-desktop.ks - The Fedora Desktop Live config

livecd-fedora-kde.ks - The Fedora KDE Live config


--- NEW FILE f8-fedora.ks ---
# Kickstart file for composing the "Fedora" spin of Fedora 8

# Use a part of 'iso' to define how large you want your isos.
# Only used when composing to more than one iso.
#part iso --size=4998

# Add the repos you wish to use to compose here.  At least one of them needs group data.
repo --name=rawhide  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch

# Package manifest for the compose.  Uses repo group metadata to translate groups.
# (@base is added by default unless you add --nobase to %packages)
%packages
# core
@core
@base-x
kernel*
# Hardware stuff
@hardware-support
@dial-up
# Desktop Packages
@gnome-desktop
@kde-desktop
echo-icon-theme
tracker
gnash
liferea
# apps
@authoring-and-publishing
@editors
emacs
@games
@graphical-internet
@graphics
@office
@sound-and-video
@text-internet
@system-tools
wireshark-gnome
# Devel packages
@development-libs
@development-tools
@gnome-software-development
@kde-software-development
@web-development
@x-software-development
# Server packages
@dns-server
@ftp-server
@mail-server
@mysql
@network-server
@news-server
@printing
@server-cfg
@smb-server
@sql-server
@web-server --optional
# Virt group
@virtualization --optional
# filesystem stuff
reiserfs-utils
xfsprogs
jfsutils
# Languages
@afrikaans-support
@arabic-support
@assamese-support
@basque-support
@bengali-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@faeroese-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@korean-support
@lithuanian-support
@malay-support
@malayalam-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tamil-support
@telugu-support
@thai-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@welsh-support
@xhosa-support
@zulu-support
# Compose Needs
anaconda-runtime
iscsi-initiator-utils
memtest86+
vnc-server
%end


--- NEW FILE livecd-fedora-base-desktop.ks ---
lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --enablemd5
selinux --enforcing
firewall --disabled
xconfig --startxonboot
part / --size 4096
services --enabled=NetworkManager,dhcdbd --disabled=network,sshd

repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

%packages
@base-x
@base
@core
@admin-tools
@dial-up
@hardware-support
@printing
kernel
memtest86+

# save some space
-specspo
-esc
-samba-client
-a2ps
-redhat-lsb
-sox
-hplip
-hpijs
# smartcards won't really work on the livecd.  
-coolkey
-ccid
# duplicate functionality
-pinfo
-vorbis-tools
-wget
# lose the compat stuff
-compat*

# scanning takes quite a bit of space :/
-xsane
-xsane-gimp
-sane-backends

# lots of people want to have this
gparted

# livecd bits to set up the livecd and be able to install
anaconda
isomd5sum

# make sure debuginfo doesn't end up on the live image
-*debuginfo
%end

%post
# FIXME: it'd be better to get this installed from a package
cat > /etc/rc.d/init.d/fedora-live << EOF
#!/bin/bash
#
# live: Init script for live image
#
# chkconfig: 345 00 99
# description: Init script for live image.

. /etc/init.d/functions

if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
    exit 0
fi

exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
}

touch /.liveimg-configured

# mount live image
if [ -b /dev/live ]; then
   mkdir -p /mnt/live
   mount -o ro /dev/live /mnt/live
fi

# enable swaps unless requested otherwise
swaps=\`blkid -t TYPE=swap -o device\`
if ! strstr "\`cat /proc/cmdline\`" noswap -a [ -n "\$swaps" ] ; then
  for s in \$swaps ; do
    action "Enabling swap partition \$s" swapon \$s
  done
fi

# configure X, allowing user to override xdriver
for o in \`cat /proc/cmdline\` ; do
    case \$o in
    xdriver=*)
        xdriver="--set-driver=\${o#xdriver=}"
        ;;
    esac
done

exists system-config-display --noui --reconfig --set-depth=24 \$xdriver

# unmute sound card
exists alsaunmute 0 2> /dev/null

# add fedora user with no passwd
useradd -c "Fedora Live" fedora
passwd -d fedora > /dev/null

# turn off firstboot for livecd boots
echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot

# don't start yum-updatesd for livecd boots
chkconfig --level 345 yum-updatesd off

# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
chkconfig --level 345 crond off
chkconfig --level 345 atd off
chkconfig --level 345 anacron off
chkconfig --level 345 readahead_early off
chkconfig --level 345 readahead_later off

# Stopgap fix for RH #217966; should be fixed in HAL instead
touch /media/.hal-mtab
EOF

chmod 755 /etc/rc.d/init.d/fedora-live
/sbin/restorecon /etc/rc.d/init.d/fedora-live
/sbin/chkconfig --add fedora-live

# save a little bit of space at least...
rm -f /boot/initrd*

%end


%post --nochroot
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
%end


--- NEW FILE livecd-fedora-desktop.ks ---
%include livecd-fedora-base-desktop.ks

%packages
@games
@graphical-internet
@graphics
@sound-and-video
@gnome-desktop
nss-mdns
# we don't include @office so that we don't get OOo.  but some nice bits
abiword
gnumeric
evince
gnome-blog
#planner
#inkscape

@afrikaans-support
@albanian-support
@arabic-support
@armenian-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
@bhutanese-support
@bosnian-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@ethiopic-support
@faeroese-support
@filipino-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@georgian-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@inuktitut-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@khmer-support
@korean-support
@lao-support
@latvian-support
@lithuanian-support
@malay-support
@malayalam-support
@maori-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@samoan-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@somali-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tagalog-support
@tamil-support
@telugu-support
@thai-support
@tibetan-support
@tonga-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@vietnamese-support
@welsh-support
@xhosa-support
@zulu-support

# dictionaries are big
-aspell-*
-m17n-db-*
-man-pages-*
-scim-tables-*
-scim-lang-*
-wqy-bitmap-fonts

# save some space
-gnome-user-docs
-gimp-help
-evolution-help
-autofs

%end

%post
# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf

cat >> /etc/rc.d/init.d/fedora-live << EOF
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
    chown fedora:fedora /home/fedora/.face
    # TODO: would be nice to get e-d-s to pick this one up too... but how?
fi

EOF

%end


--- NEW FILE livecd-fedora-kde.ks ---
%include livecd-fedora-base-desktop.ks

%packages
@kde-desktop
kdegames
beryl-kde
k3b
koffice-kword
koffice-kspread
koffice-kpresenter
koffice-filters
twinkle
filelight
krusader

# if it is enough space include koffice-krita (~40 megs) and ktorrent (~3 megs)
koffice-krita
ktorrent

# some other extra packages
gnupg
synaptics
hal-cups-utils
nss-mdns

# ignore comps.xml and make sure these packages are included
knetworkmanager
kpowersave
redhat-artwork-kde
rhgb
man-pages
smolt-firstboot

#some changes that we don't want...
-specspo
-scribus
-kdeaddons
-kdemultimedia-extras
-kdeartwork-extras
-kmymoney2
-basket
-speedcrunch
-autofs

# try to remove some packages from livecd-fedora-base-desktop.ks
-scim*
-gdm
-authconfig-gtk
-m17n*
-PolicyKit-gnome
-gnome-doc-utils-stylesheets
-anthy
-kasumi
-pygtkglext
-python-devel
-libchewing

# workaround for the moment (requirements of hplip)
python-imaging
python-reportlab

%end

%post
# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf


# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF

# add initscript
cat >> /etc/rc.d/init.d/fedora-live << EOF

if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    # use image also for kdm
    mkdir -p /usr/share/apps/kdm/faces
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
fi

# make fedora user use KDE
echo "startkde" > /home/fedora/.xsession
chmod a+x /home/fedora/.xsession
chown fedora:fedora /home/fedora/.xsession

# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc

# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc

# disable screensaver
sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc

# adding some autostarted applications
cp /usr/share/applications/fedora-knetworkmanager.desktop /usr/share/autostart/

# workaround to put liveinst on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
EOF

%end


--- NEW FILE livedvd-fedora-kde.ks ---
%include livecd-fedora-kde.ks

%packages

# add full language support
@afrikaans-support
@albanian-support
@arabic-support
@armenian-support
@assamese-support
@basque-support
@belarusian-support
@bengali-support
@bhutanese-support
@bosnian-support
@brazilian-support
@breton-support
@british-support
@bulgarian-support
@catalan-support
@chinese-support
@croatian-support
@czech-support
@danish-support
@dutch-support
@estonian-support
@ethiopic-support
@faeroese-support
@filipino-support
@finnish-support
@french-support
@gaelic-support
@galician-support
@georgian-support
@german-support
@greek-support
@gujarati-support
@hebrew-support
@hindi-support
@hungarian-support
@icelandic-support
@indonesian-support
@inuktitut-support
@irish-support
@italian-support
@japanese-support
@kannada-support
@khmer-support
@korean-support
@lao-support
@latvian-support
@lithuanian-support
@malay-support
@malayalam-support
@maori-support
@marathi-support
@northern-sotho-support
@norwegian-support
@oriya-support
@persian-support
@polish-support
@portuguese-support
@punjabi-support
@romanian-support
@russian-support
@samoan-support
@serbian-support
@sinhala-support
@slovak-support
@slovenian-support
@somali-support
@southern-ndebele-support
@southern-sotho-support
@spanish-support
@swati-support
@swedish-support
@tagalog-support
@tamil-support
@telugu-support
@thai-support
@tibetan-support
@tonga-support
@tsonga-support
@tswana-support
@turkish-support
@ukrainian-support
@urdu-support
@venda-support
@vietnamese-support
@welsh-support
@xhosa-support
@zulu-support

# and some extra packages
koffice-*

%end 

%post

# Use gdm here for language selection

# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
#DISPLAYMANAGER="KDE"
EOF

%end 



From fedora-extras-commits at redhat.com  Fri Sep 28 14:25:17 2007
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 28 Sep 2007 10:25:17 -0400
Subject: rpms/fedora-release/devel .cvsignore, 1.28, 1.29 fedora-release.spec,
	1.60, 1.61 sources, 1.48, 1.49
Message-ID: <200709281425.l8SEPHvx023334@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
- Bump for F8 Test2.
- Package up the compose kickstart files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	30 Aug 2007 10:27:31 -0000	1.28
+++ .cvsignore	28 Sep 2007 14:24:44 -0000	1.29
@@ -1 +1 @@
-fedora-release-7.91.tar.gz
+fedora-release-7.92.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- fedora-release.spec	14 Sep 2007 17:29:12 -0000	1.60
+++ fedora-release.spec	28 Sep 2007 14:24:44 -0000	1.61
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	7.91
-Release:	2
+Version:	7.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -49,6 +49,11 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for file in compose/*; do
+  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
+done
+
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -73,10 +78,16 @@
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 7.92-1
+- Bump for F8 Test2.
+- Package up the compose kickstart files
+
 * Fri Sep 14 2007 Jesse Keating <jkeating at redhat.com> - 7.91-2
 - Use failovermethod=priority in yum configs (243698)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	14 Sep 2007 17:29:12 -0000	1.48
+++ sources	28 Sep 2007 14:24:44 -0000	1.49
@@ -1 +1 @@
-1692ee19be5132c951ca19297b22e227  fedora-release-7.91.tar.gz
+c6bd0782ce305e07da65d050126b7ed6  fedora-release-7.92.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 14:30:29 2007
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Fri, 28 Sep 2007 10:30:29 -0400
Subject: rpms/tracker/F-7 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tracker.spec,
	1.14, 1.15 tracker-handler.py, 1.1, NONE
Message-ID: <200709281430.l8SEUTE3023539@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23504

Modified Files:
	.cvsignore sources tracker.spec 
Removed Files:
	tracker-handler.py 
Log Message:
* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
- Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jul 2007 03:13:16 -0000	1.6
+++ .cvsignore	28 Sep 2007 14:29:57 -0000	1.7
@@ -1 +1 @@
-tracker-0.6.0.tar.bz2
+tracker-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jul 2007 03:13:16 -0000	1.6
+++ sources	28 Sep 2007 14:29:57 -0000	1.7
@@ -1 +1 @@
-c7b52531533482593ba6260603c175a3  tracker-0.6.0.tar.bz2
+f718aa38b7527229f5567834ae247a38  tracker-0.6.3.tar.bz2


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/F-7/tracker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tracker.spec	24 Jul 2007 03:13:16 -0000	1.14
+++ tracker.spec	28 Sep 2007 14:29:57 -0000	1.15
@@ -1,22 +1,17 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
-Version:	0.6.0
+Version:	0.6.3
 Release:	1%{?dist}
-License:	GPL
+License:	GPLv2+
 Group:		Applications/System
 URL:		http://www.gnome.org/~jamiemcc/tracker/
-Source0:	http://www.gnome.org/~jamiemcc/tracker/tracker-0.6.0.tar.bz2
-Source1:	tracker-handler.py
+Source0:	http://www.gnome.org/~jamiemcc/tracker/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gmime-devel, poppler-devel, gettext
-BuildRequires:	gnome-desktop-devel, gamin-devel
+BuildRequires:	gnome-desktop-devel, gamin-devel, exempi-devel
 BuildRequires:	libexif-devel, libgsf-devel, gstreamer-devel
 BuildRequires:	desktop-file-utils, intltool, deskbar-applet
-%if "%fedora" >= "6"
-BuildRequires:	sqlite-devel
-%else
-BuildRequires:	dbus-devel, dbus-glib
-%endif
+BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -38,7 +33,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	dbus-glib-devel
+Requires:	dbus-glib-devel gtk2-devel
 
 %description devel
 This package contains the static libraries and header files needed for
@@ -55,19 +50,18 @@
 
 %prep
 %setup -q
-cp -pr %{SOURCE1} python/deskbar-handler/
-# remove shebangs from the python files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i python/deskbar-handler/*.py
-
-%build
-%if "%fedora" >= "6"
-%configure --disable-static --enable-external-sqlite	\
-	--enable-preferences --enable-deskbar-applet	\
-	--with-deskbar-applet-handler-dir=%{_libdir}/deskbar-applet/handlers
+%define deskbar_applet_ver %(pkg-config --modversion deskbar-applet)
+%if "%deskbar_applet_ver" >= "2.19.4"
+ %define deskbar_applet_dir %(pkg-config --variable modulesdir deskbar-applet)
+ %define deskbar_type module
 %else
-%configure --disable-static --enable-preferences	\
-	--enable-deskbar-applet
+ %define deskbar_applet_dir %(pkg-config --variable handlersdir deskbar-applet)
+ %define deskbar_type handler
 %endif
+
+%build
+%configure --disable-static --enable-deskbar-applet=%{deskbar_type}	\
+		--enable-external-qdbm
 # 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
@@ -125,12 +119,33 @@
 %{_bindir}/tracker-preferences
 %{_bindir}/tracker-search-tool
 %{_bindir}/tracker-thumbnailer
-%{_libdir}/deskbar-applet/handlers/*.py*
+%{deskbar_applet_dir}/tracker*.py*
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_datadir}/autostart/*.desktop
 
 %changelog
+* Tue Sep 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.3-1
+- Version 0.6.3
+
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-2
+- Make trackerd start on x86_64 (Bug #286361, fix by Will Woods)
+
+* Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
+- Version 0.6.2
+
+* Sat Aug 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-2
+- Rebuild
+
+* Wed Aug 08 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
+* Fri Aug 03 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.0-3
+- License tag update
+
+* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 0.6.0-2.1
+- rebuild for toolchain bug
+
 * Mon Jul 23 2007 Deji Akingunola <dakingun at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Manually specify path to deskbar-applet handler directory, koji can't find it


--- tracker-handler.py DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 14:31:52 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 28 Sep 2007 10:31:52 -0400
Subject: rpms/kernel-xen-2.6/F-7 linux-2.6-3w-9xxx-mem_len.patch, 1.1,
	1.2 kernel-xen.spec, 1.51, 1.52
Message-ID: <200709281431.l8SEVqtt023665@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23565

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)

(merge from CVS branch private-ehabkost-bz309611-test-branch)


linux-2.6-3w-9xxx-mem_len.patch:

Index: linux-2.6-3w-9xxx-mem_len.patch
===================================================================
RCS file: linux-2.6-3w-9xxx-mem_len.patch
diff -N linux-2.6-3w-9xxx-mem_len.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-3w-9xxx-mem_len.patch	28 Sep 2007 14:31:49 -0000	1.2
@@ -0,0 +1,52 @@
+From: Eduardo Habkost <ehabkost at redhat.com>
+Date: Thu, 27 Sep 2007 18:37:44 -0300
+Subject: 3w-9xxx: use PCI resource lenght correctly
+
+Trying to ioremap() a larger area than pci_resource_len()
+may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
+as length parameter to ioremap() instead of PAGE_SIZE.
+
+Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
+---
+Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
++++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
+@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
+ {
+ 	struct Scsi_Host *host = NULL;
+ 	TW_Device_Extension *tw_dev;
+-	u32 mem_addr;
++	int bar;
++	unsigned long mem_addr, mem_len;
+ 	int retval = -ENODEV;
+ 
+ 	retval = pci_enable_device(pdev);
+@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
+ 	}
+ 
+ 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
+-		mem_addr = pci_resource_start(pdev, 1);
++		bar = 1;
+ 	else
+-		mem_addr = pci_resource_start(pdev, 2);
++		bar = 2;
++
++	mem_addr = pci_resource_start(pdev, bar);
++	mem_len = pci_resource_len(pdev, bar);
+ 
+ 	/* Save base address */
+-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
++	tw_dev->base_addr = ioremap(mem_addr, mem_len);
+ 	if (!tw_dev->base_addr) {
+ 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
+ 		goto out_release_mem_region;
+@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
+ 
+ 	pci_set_drvdata(pdev, host);
+ 
+-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
++	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
+ 	       host->host_no, mem_addr, pdev->irq);
+ 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
+ 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kernel-xen.spec	27 Sep 2007 16:15:48 -0000	1.51
+++ kernel-xen.spec	28 Sep 2007 14:31:49 -0000	1.52
@@ -442,6 +442,7 @@
 
 # SCSI bits.
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-ctlbits.patch
@@ -1002,6 +1003,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2072,6 +2076,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disabled Firewire stack on i686 also. It is not supported
   by current Xen swiotlb implementation (bug #302471)



From fedora-extras-commits at redhat.com  Fri Sep 28 14:33:25 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Fri, 28 Sep 2007 10:33:25 -0400
Subject: rpms/whowatch/devel Makefile, 1.3, 1.4 sources, 1.4,
	1.5 whowatch-1.4.patch, NONE, 1.1 whowatch.spec, 1.10,
	1.11 dead.package, 1.1, NONE
Message-ID: <200709281433.l8SEXPm3023723@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/whowatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23698/devel

Added Files:
	Makefile sources whowatch-1.4.patch whowatch.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Sep 2007 14:32:52 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: whowatch
+# $Id$
+NAME := whowatch
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Sep 2007 14:32:52 -0000	1.5
@@ -0,0 +1 @@
+0870155e8b75b99f9954e76fb20f9528  whowatch-1.4.tar.gz

whowatch-1.4.patch:

--- NEW FILE whowatch-1.4.patch ---
--- process.c	2000-06-06 15:46:12.000000000 +0530
+++ ../process.c	2007-09-24 23:36:02.000000000 +0530
@@ -74,7 +74,7 @@
 		memset(z, 0, sizeof *z);
 		check_line(l);
 		z->line = l++;
-		(struct process *) p->priv = z;
+		p->priv = z;
 		z->proc = p;
 		if (*current){
 			z->next = *current;


Index: whowatch.spec
===================================================================
RCS file: whowatch.spec
diff -N whowatch.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ whowatch.spec	28 Sep 2007 14:32:52 -0000	1.11
@@ -0,0 +1,56 @@
+Summary: Display information about users currently logged on 
+Name: whowatch
+Version: 1.4
+Release: 4%{?dist}
+License: GPLv2
+Group: Applications/System
+URL: http://wizard.ae.krakow.pl/~mike/
+
+Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz
+Patch0: %{name}-%{version}.patch
+BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: ncurses-devel
+
+%description
+Whowatch is an interactive console utility that displays informations about
+the users currently logged on to the machine, in real time. Besides standard
+information (login, tty, host, user's process) you can see type of login
+(ie. ssh, telnet). You can also see selected user's processes tree or all
+system processes tree.  In the process tree mode there is ability to send
+INT or KILL signal to selected process.
+
+%prep
+
+%setup -q
+%patch0 -p0
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \
+			%{buildroot}%{_bindir}
+#%makeinstall
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING KEYS README TODO
+%doc %{_mandir}/man1/whowatch.1*
+%{_bindir}/whowatch
+
+%changelog
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-4
+- fixed broken patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-3
+- fixed issues regarding patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-2
+- fixed few issues  
+* Sat Sep 22 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-1
+-Initial packaging. 
+


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 14:36:44 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 10:36:44 -0400
Subject: rpms/higlayout/devel higlayout.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709281436.l8SEaieq023936@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/higlayout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23894/devel

Modified Files:
	.cvsignore sources 
Added Files:
	higlayout.spec 
Log Message:
initial higlayout import



--- NEW FILE higlayout.spec ---
Name:           higlayout
Version:        1.0
Release:        1%{?dist}
Summary:        Easy to use and powerful layout manager for Java
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.autel.cz/dmi/tutorial.html
Source0:        http://www.autel.cz/dmi/HIGLayout%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  java-javadoc java-gcj-compat-devel

%description
%{summary}.


%package        javadoc
Summary:        Java API documentation for %{name}
Group:          Documentation

%description    javadoc
%{summary}.


%prep
%setup -q -c
sed -i -e 's/\r//g' examples/*.java tutorial/*.html *.txt
rm -r apidoc/*


%build
pushd src
%{javac} cz/autel/dmi/*.java
%{jar} cf ../%{name}.jar cz/autel/dmi/*.class
%{javadoc} -link %{_javadocdir}/java -d ../apidoc cz.autel.dmi
popd


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%post javadoc
rm -f %{_javadocdir}/%{name} && \
ln -s %{name}-%{version} %{_javadocdir}/%{name} || :


%files
%defattr(-,root,root,-)
%doc Changes.txt LGPLicense.txt readme.txt examples/ tutorial/
%{_javadir}/%{name}*.jar
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}


%changelog
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.2
- Rebuild.

* Sun Mar 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/higlayout/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:32:08 -0000	1.1
+++ .cvsignore	28 Sep 2007 14:36:12 -0000	1.2
@@ -0,0 +1 @@
+HIGLayout1.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/higlayout/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:32:08 -0000	1.1
+++ sources	28 Sep 2007 14:36:12 -0000	1.2
@@ -0,0 +1 @@
+5bd79f33157824499b0fc03d6a5e080a  HIGLayout1.0.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 14:37:24 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 10:37:24 -0400
Subject: rpms/startup-notification/devel startup-notification.spec, 1.17,
	1.18
Message-ID: <200709281437.l8SEbOCO023997@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/startup-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931

Modified Files:
	startup-notification.spec 
Log Message:
update spec as per 226435



Index: startup-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/startup-notification/devel/startup-notification.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- startup-notification.spec	23 Aug 2007 17:58:36 -0000	1.17
+++ startup-notification.spec	28 Sep 2007 14:36:51 -0000	1.18
@@ -4,7 +4,7 @@
 Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: http://download.gnome.org/sources/startup-notification/0.9/%{name}-%{version}.tar.bz2
-License: LGPL
+License: LGPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
@@ -91,7 +91,7 @@
 - change to new modular X dependencies
 - move configure to build instead of prep
 - use make install DESTDIR=$RPM_BUILD_ROOT instead of
-  %makeinstall
+  makeinstall macro
 
 * Wed Mar  2 2005 Mark McLoughlin <markmc at redhat.com> 0.8-2
 - Rebuild with gcc4



From fedora-extras-commits at redhat.com  Fri Sep 28 14:40:41 2007
From: fedora-extras-commits at redhat.com (Subhodip Biswas (subhodip))
Date: Fri, 28 Sep 2007 10:40:41 -0400
Subject: rpms/whowatch/F-7 Makefile, 1.3, 1.4 sources, 1.4,
	1.5 whowatch-1.4.patch, NONE, 1.1 whowatch.spec, 1.10,
	1.11 dead.package, 1.1, NONE
Message-ID: <200709281440.l8SEef9e024107@cvs-int.fedora.redhat.com>

Author: subhodip

Update of /cvs/pkgs/rpms/whowatch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24077/F-7

Added Files:
	Makefile sources whowatch-1.4.patch whowatch.spec 
Removed Files:
	dead.package 
Log Message:



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Sep 2007 14:40:08 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: whowatch
+# $Id$
+NAME := whowatch
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Sep 2007 14:40:08 -0000	1.5
@@ -0,0 +1 @@
+0870155e8b75b99f9954e76fb20f9528  whowatch-1.4.tar.gz

whowatch-1.4.patch:

--- NEW FILE whowatch-1.4.patch ---
--- process.c	2000-06-06 15:46:12.000000000 +0530
+++ ../process.c	2007-09-24 23:36:02.000000000 +0530
@@ -74,7 +74,7 @@
 		memset(z, 0, sizeof *z);
 		check_line(l);
 		z->line = l++;
-		(struct process *) p->priv = z;
+		p->priv = z;
 		z->proc = p;
 		if (*current){
 			z->next = *current;


Index: whowatch.spec
===================================================================
RCS file: whowatch.spec
diff -N whowatch.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ whowatch.spec	28 Sep 2007 14:40:08 -0000	1.11
@@ -0,0 +1,56 @@
+Summary: Display information about users currently logged on 
+Name: whowatch
+Version: 1.4
+Release: 4%{?dist}
+License: GPLv2
+Group: Applications/System
+URL: http://wizard.ae.krakow.pl/~mike/
+
+Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz
+Patch0: %{name}-%{version}.patch
+BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: ncurses-devel
+
+%description
+Whowatch is an interactive console utility that displays informations about
+the users currently logged on to the machine, in real time. Besides standard
+information (login, tty, host, user's process) you can see type of login
+(ie. ssh, telnet). You can also see selected user's processes tree or all
+system processes tree.  In the process tree mode there is ability to send
+INT or KILL signal to selected process.
+
+%prep
+
+%setup -q
+%patch0 -p0
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \
+			%{buildroot}%{_bindir}
+#%makeinstall
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING KEYS README TODO
+%doc %{_mandir}/man1/whowatch.1*
+%{_bindir}/whowatch
+
+%changelog
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-4
+- fixed broken patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-3
+- fixed issues regarding patch
+* Mon Sep 24 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-2
+- fixed few issues  
+* Sat Sep 22 2007 Subhodip Biswas <440volt.tux at gmail.com> - 1.4-1
+-Initial packaging. 
+


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 15:06:07 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 11:06:07 -0400
Subject: rpms/ode/devel .cvsignore,1.5,1.6 ode.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200709281506.l8SF67Et030885@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30851

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-0.1.rc1
- New upstream release 0.9-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 14:13:44 -0000	1.5
+++ .cvsignore	28 Sep 2007 15:05:34 -0000	1.6
@@ -1 +1 @@
-ode-src-0.8.1-rc1.zip
+ode-src-0.9-rc1.zip


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ode.spec	11 Sep 2007 14:13:44 -0000	1.8
+++ ode.spec	28 Sep 2007 15:05:34 -0000	1.9
@@ -1,7 +1,7 @@
 %define prever rc1
 
 Name:           ode
-Version:        0.8.1
+Version:        0.9
 Release:        0.1.%{prever}%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-0.1.rc1
+- New upstream release 0.9-rc1
+
 * Tue Sep 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-0.1.rc1
 - New upstream release 0.8.1-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 14:13:44 -0000	1.5
+++ sources	28 Sep 2007 15:05:34 -0000	1.6
@@ -1 +1 @@
-4c8de285f55460ae3a2385fb607270e7  ode-src-0.8.1-rc1.zip
+94187243d98df4c687f11afa11743d54  ode-src-0.9-rc1.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 15:10:59 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Sep 2007 11:10:59 -0400
Subject: rpms/higlayout/F-7 higlayout.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709281510.l8SFAxYZ031166@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/higlayout/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31108

Modified Files:
	.cvsignore sources 
Added Files:
	higlayout.spec 
Log Message:
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission



--- NEW FILE higlayout.spec ---
Name:           higlayout
Version:        1.0
Release:        1%{?dist}
Summary:        Easy to use and powerful layout manager for Java
Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.autel.cz/dmi/tutorial.html
Source0:        http://www.autel.cz/dmi/HIGLayout%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  java-javadoc java-gcj-compat-devel

%description
%{summary}.


%package        javadoc
Summary:        Java API documentation for %{name}
Group:          Documentation

%description    javadoc
%{summary}.


%prep
%setup -q -c
sed -i -e 's/\r//g' examples/*.java tutorial/*.html *.txt
rm -r apidoc/*


%build
pushd src
%{javac} cz/autel/dmi/*.java
%{jar} cf ../%{name}.jar cz/autel/dmi/*.class
%{javadoc} -link %{_javadocdir}/java -d ../apidoc cz.autel.dmi
popd


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

cp -a apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

aot-compile-rpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db || :
fi

%post javadoc
rm -f %{_javadocdir}/%{name} && \
ln -s %{name}-%{version} %{_javadocdir}/%{name} || :


%files
%defattr(-,root,root,-)
%doc Changes.txt LGPLicense.txt readme.txt examples/ tutorial/
%{_javadir}/%{name}*.jar
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}


%changelog
* Sun Sep 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Prepared old specfile by Ville for Fedora review submission

* Sat Sep 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.2
- Rebuild.

* Sun Mar 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/higlayout/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Sep 2007 16:32:08 -0000	1.1
+++ .cvsignore	28 Sep 2007 15:10:27 -0000	1.2
@@ -0,0 +1 @@
+HIGLayout1.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/higlayout/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Sep 2007 16:32:08 -0000	1.1
+++ sources	28 Sep 2007 15:10:27 -0000	1.2
@@ -0,0 +1 @@
+5bd79f33157824499b0fc03d6a5e080a  HIGLayout1.0.zip



From fedora-extras-commits at redhat.com  Fri Sep 28 15:12:43 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Fri, 28 Sep 2007 11:12:43 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.67, 1.68 pykickstart.spec, 1.74,
	1.75 sources, 1.75, 1.76
Message-ID: <200709281512.l8SFChbW031477@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31345

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	12 Sep 2007 21:53:38 -0000	1.67
+++ .cvsignore	28 Sep 2007 15:12:10 -0000	1.68
@@ -1,3 +1,4 @@
 pykickstart-1.11.tar.gz
 pykickstart-1.12.tar.gz
 pykickstart-1.13.tar.gz
+pykickstart-1.14.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pykickstart.spec	12 Sep 2007 21:53:38 -0000	1.74
+++ pykickstart.spec	28 Sep 2007 15:12:10 -0000	1.75
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.13
+Version: 1.14
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -41,8 +41,13 @@
 %doc docs/kickstart-docs.txt
 %{python_sitelib}/pykickstart
 %{_bindir}/ksvalidator
+%{_bindir}/ksflatten
 
 %changelog
+* Fri Sep 28 2007 Chris Lumens <clumens at redhat.com> 1.14-1
+- Fix output formatting for packages section header (#310211).
+- Add a script to flatten kickstart files containing includes (katzj).
+
 * Wed Sep 12 2007 Chris Lumens <clumens at redhat.com> 1.13-1
 - Add a function to convert URL method strings into repo objects
   (jkeating).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	12 Sep 2007 22:06:37 -0000	1.75
+++ sources	28 Sep 2007 15:12:10 -0000	1.76
@@ -1 +1 @@
-806c4a9d946ef0e68ba58a7b64fa0c15  pykickstart-1.13.tar.gz
+b9bfcbfe53bab64d72762cedba97b871  pykickstart-1.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:24:27 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 28 Sep 2007 11:24:27 -0400
Subject: rpms/jd/devel .cvsignore, 1.147, 1.148 jd.spec, 1.173, 1.174 sources,
	1.148, 1.149
Message-ID: <200709281524.l8SFORbs032074@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
- svn 1355



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	18 Sep 2007 13:46:29 -0000	1.147
+++ .cvsignore	28 Sep 2007 15:23:54 -0000	1.148
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-svn1355.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- jd.spec	18 Sep 2007 13:46:29 -0000	1.173
+++ jd.spec	28 Sep 2007 15:23:54 -0000	1.174
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
+%define         strtag        svn1355
 %define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-#BuildRequires:	subversion
+BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
+- svn 1355
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources	18 Sep 2007 13:46:29 -0000	1.148
+++ sources	28 Sep 2007 15:23:54 -0000	1.149
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:27:58 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 28 Sep 2007 11:27:58 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.127, 1.128 jd.spec, 1.146, 1.147 sources, 
	1.128, 1.129
Message-ID: <200709281527.l8SFRwrb032202@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32180

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
- svn 1355



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- .cvsignore	18 Sep 2007 13:46:23 -0000	1.127
+++ .cvsignore	28 Sep 2007 15:27:25 -0000	1.128
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-svn1355.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- jd.spec	18 Sep 2007 13:46:23 -0000	1.146
+++ jd.spec	28 Sep 2007 15:27:25 -0000	1.147
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
+%define         strtag        svn1355
 %define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-#BuildRequires:	subversion
+BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
+- svn 1355
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	18 Sep 2007 13:46:23 -0000	1.128
+++ sources	28 Sep 2007 15:27:25 -0000	1.129
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz



From fedora-extras-commits at redhat.com  Fri Sep 28 15:33:06 2007
From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost))
Date: Fri, 28 Sep 2007 11:33:06 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-3w-9xxx-mem_len.patch, NONE,
	1.1 kernel-xen.spec, 1.62, 1.63
Message-ID: <200709281533.l8SFX6xK032377@cvs-int.fedora.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-3w-9xxx-mem_len.patch 
Log Message:
Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)


linux-2.6-3w-9xxx-mem_len.patch:

--- NEW FILE linux-2.6-3w-9xxx-mem_len.patch ---
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 27 Sep 2007 18:37:44 -0300
Subject: 3w-9xxx: use PCI resource lenght correctly

Trying to ioremap() a larger area than pci_resource_len()
may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
as length parameter to ioremap() instead of PAGE_SIZE.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
===================================================================
--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
+++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
 {
 	struct Scsi_Host *host = NULL;
 	TW_Device_Extension *tw_dev;
-	u32 mem_addr;
+	int bar;
+	unsigned long mem_addr, mem_len;
 	int retval = -ENODEV;
 
 	retval = pci_enable_device(pdev);
@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
 	}
 
 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
-		mem_addr = pci_resource_start(pdev, 1);
+		bar = 1;
 	else
-		mem_addr = pci_resource_start(pdev, 2);
+		bar = 2;
+
+	mem_addr = pci_resource_start(pdev, bar);
+	mem_len = pci_resource_len(pdev, bar);
 
 	/* Save base address */
-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
+	tw_dev->base_addr = ioremap(mem_addr, mem_len);
 	if (!tw_dev->base_addr) {
 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
 		goto out_release_mem_region;
@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
 
 	pci_set_drvdata(pdev, host);
 
-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
+	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
 	       host->host_no, mem_addr, pdev->irq);
 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
 	       host->host_no,


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kernel-xen.spec	27 Sep 2007 16:15:49 -0000	1.62
+++ kernel-xen.spec	28 Sep 2007 15:32:34 -0000	1.63
@@ -497,6 +497,7 @@
 # SCSI bits.
 Patch1100: linux-2.6-scsi-bounce-isa.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
+Patch1107: linux-2.6-3w-9xxx-mem_len.patch
 
 # NIC driver fixes
 Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
@@ -1168,6 +1169,9 @@
 # fix cpqarray pci enable
 %patch1106 -p1
 
+# Fix 3w-9xxx to use PCI resource length correctly (bug #309611)
+%patch1107 -p1
+
 #
 # Various NFS/NFSD fixes.
 #
@@ -2362,6 +2366,9 @@
 #  - tux.
 
 %changelog
+* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix 3w-9xxx to use PCI resources properly and work under Xen (bug #309611)
+
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)



From fedora-extras-commits at redhat.com  Fri Sep 28 15:45:38 2007
From: fedora-extras-commits at redhat.com (Todd M. Zullinger (tmz))
Date: Fri, 28 Sep 2007 11:45:38 -0400
Subject: rpms/rpmlint/devel rpmlint.config,1.15,1.16 rpmlint.spec,1.39,1.40
Message-ID: <200709281545.l8SFjcBm000385@cvs-int.fedora.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv362

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
- Sync Fedora license list with Revision 0.55 (Wiki rev 92).



Index: rpmlint.config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmlint.config	3 Sep 2007 17:30:14 -0000	1.15
+++ rpmlint.config	28 Sep 2007 15:45:05 -0000	1.16
@@ -28,7 +28,7 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Wiki revision 87 of that page.
+    # Last synced with Revision 0.55 (Wiki revision 92) of that page.
     'Adobe',
     'Affero GPL',
     'AFL',
@@ -59,20 +59,26 @@
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'FTL',
     'Giftware',
     'Glide',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
     'GPLv2+',
+    'GPLv2+ with exceptions',
     'GPLv3',
+    'GPLv3 with exceptions',
     'GPLv3+',
+    'GPLv3+ with exceptions',
     'IBM',
     'IJG',
     'ImageMagick',
     'iMatix',
+    'Imlib2',
     'Intel ACPI',
     'Interbase',
     'ISC',
@@ -99,6 +105,7 @@
     'Nokia',
     'OpenLDAP',
     'OpenPBS',
+    'OReilly',
     'OSL 1.0',
     'OSL 1.0+',
     'OSL 1.1',
@@ -150,6 +157,7 @@
     'Free Art',
     # Font licenses
     'Arphic',
+    'Baekmuk',
     'Bitstream Vera',
     'mplus',
     'OFL',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpmlint.spec	3 Sep 2007 17:35:01 -0000	1.39
+++ rpmlint.spec	28 Sep 2007 15:45:05 -0000	1.40
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Todd Zullinger <tmz at pobox.com>
+- Sync Fedora license list with Revision 0.55 (Wiki rev 92).
+
 * Mon Sep  3 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.81-1
 - 0.81, fixes #239611, #240840, #241471, #244835.
 - Improve Fedora license check (Todd Zullinger).



From fedora-extras-commits at redhat.com  Fri Sep 28 15:56:00 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 28 Sep 2007 11:56:00 -0400
Subject: rpms/smolt/devel selinux.patch,NONE,1.1 smolt.spec,1.30,1.31
Message-ID: <200709281556.l8SFu0xg000770@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv733

Modified Files:
	smolt.spec 
Added Files:
	selinux.patch 
Log Message:
Fixed selinux issue in #311181

selinux.patch:

--- NEW FILE selinux.patch ---
--- /tmp/smolt.py	2007-09-28 10:47:24.000000000 -0500
+++ client/smolt.py	2007-08-13 15:46:43.000000000 -0500
@@ -196,24 +196,18 @@
             self.formfactor = hostInfo['system.formfactor']
         except:
             self.formfactor = 'Unknown'
-
         try:
-            import selinux
-            try:
-                if selinux.is_selinux_enabled() == 1:
-                    self.selinux_enabled = True
-                else:
-                    self.selinux_enabled = False
-            except:
-                self.selinux_enabled = False
+            retcode = os.system('/usr/sbin/selinuxenabled')
+            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
+        except:
+            self.selinux_enabled = False
+        if self.selinux_enabled:
             try:
-                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
+                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
             except:
-                self.selinux_enforce = "Unknown"
-        except ImportError:
-            self.selinux_enabled = "Not installed"
-            self.selinux_enforce = "Not Installed"
-    
+                self.selinux_enforce = 'Disabled'
+        else:
+            self.selinux_enforce = 'Disabled'
 
 def ignoreDevice(device):
     ignore = 1
@@ -273,8 +267,8 @@
         except:
             raise SystemBusError, _('Could not bind to dbus.  Is dbus running?')
         
+        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
         try:
-            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
             all_dev_lst = mgr.GetAllDevices()
         except:
             raise SystemBusError, _('Could not connect to hal, is it running?'), _('Run "service haldaemon start" as root')


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- smolt.spec	28 Sep 2007 02:35:16 -0000	1.30
+++ smolt.spec	28 Sep 2007 15:55:27 -0000	1.31
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -12,6 +12,7 @@
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
 Patch0: firstboot.patch
 Patch1: languages.patch
+Patch2: selinux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -68,6 +69,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 cd client/
@@ -181,6 +183,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-7
+- Fixed Selinux
+
 * Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
 - Added translations
 



From fedora-extras-commits at redhat.com  Fri Sep 28 15:59:16 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 11:59:16 -0400
Subject: rpms/i810switch/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE i810switch-0.6.2.makefile.patch, 1.1,
	NONE i810switch-0.6.5-add-i945.patch, 1.1, NONE i810switch.spec,
	1.10, NONE sources, 1.3, NONE
Message-ID: <200709281559.l8SFxGZR000918@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv906

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile i810switch-0.6.2.makefile.patch 
	i810switch-0.6.5-add-i945.patch i810switch.spec sources 
Log Message:
make i810switch a dead.package


--- NEW FILE dead.package ---
i810switch functionality has been replaced by xrandr code provided by
the X server itself.  Users of i810switch should use xrandr now.
-Matt Domsch <Matt_Domsch at dell.com> 28-September-2007


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- i810switch-0.6.2.makefile.patch DELETED ---


--- i810switch-0.6.5-add-i945.patch DELETED ---


--- i810switch.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:32 -0700
Subject: [pkgdb] NetworkManager (Fedora, devel) updated by jkeating
Message-ID: <200709281600.l8SG0cpG020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of NetworkManager in Fedora devel to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:32 -0700
Subject: [pkgdb] NetworkManager (Fedora, 7) updated by jkeating
Message-ID: <200709281600.l8SG0cpJ020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of NetworkManager in Fedora 7 to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:51 -0700
Subject: [pkgdb] wpa_supplicant (Fedora, devel) updated by jkeating
Message-ID: <200709281600.l8SG0cpM020321@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of wpa_supplicant in Fedora devel to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wpa_supplicant



From fedora-extras-commits at redhat.com  Fri Sep 28 16:00:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:00:51 -0700
Subject: [pkgdb] wpa_supplicant (Fedora, 7) updated by jkeating
Message-ID: <200709281600.l8SG0uIn020387@bastion.fedora.phx.redhat.com>

Jesse Keating (jkeating) changed owner of wpa_supplicant in Fedora 7 to dcbw

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wpa_supplicant



From fedora-extras-commits at redhat.com  Fri Sep 28 16:09:18 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 12:09:18 -0400
Subject: rpms/gdm/devel stupid-bullets.patch, NONE,
	1.1 gdm-2.20.0-change-defaults.patch, 1.2, 1.3 gdm.spec, 1.292, 1.293
Message-ID: <200709281609.l8SG9Ir8007638@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610

Modified Files:
	gdm-2.20.0-change-defaults.patch gdm.spec 
Added Files:
	stupid-bullets.patch 
Log Message:
fix the stupid bullets


stupid-bullets.patch:

--- NEW FILE stupid-bullets.patch ---
diff -up gdm-2.20.0/gui/greeter/greeter_canvas_item.c.stupid-bullets gdm-2.20.0/gui/greeter/greeter_canvas_item.c
--- gdm-2.20.0/gui/greeter/greeter_canvas_item.c.stupid-bullets	2007-09-28 11:25:25.000000000 -0400
+++ gdm-2.20.0/gui/greeter/greeter_canvas_item.c	2007-09-28 11:26:08.000000000 -0400
@@ -469,7 +469,7 @@ greeter_item_create_canvas_item (Greeter
     else if (gdm_config_get_bool (GDM_KEY_ENTRY_CIRCLES))
       gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x25cf);
     else
-	    gtk_entry_set_invisible_char (GTK_ENTRY (entry), '*');
+	    gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x2022);
 
     gtk_widget_modify_font (entry, item->data.text.fonts[GREETER_ITEM_STATE_NORMAL]);
 

gdm-2.20.0-change-defaults.patch:

Index: gdm-2.20.0-change-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm-2.20.0-change-defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.20.0-change-defaults.patch	20 Sep 2007 18:31:17 -0000	1.2
+++ gdm-2.20.0-change-defaults.patch	28 Sep 2007 16:09:09 -0000	1.3
@@ -174,15 +174,6 @@
  # Normally there is a session type called 'Last' that is shown which refers to
  # the last session the user used.  If off, we will be in 'switchdesk' mode
  # where the session saving stuff is disabled in GDM
-@@ -506,7 +507,7 @@ GraphicalThemedColor=#76848F
- #Use24Clock=auto
- # Use circles in the password field.  Looks kind of cool actually, but only
- # works with certain fonts.
--#UseCirclesInEntry=false
-+UseCirclesInEntry=true
- # Do not show any visible feedback in the password field. This is standard for
- # instance in console, xdm and ssh.
- #UseInvisibleInEntry=false
 @@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F
  # list then provide a list that is delimited by /: to the GraphicalThemes
  # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- gdm.spec	27 Sep 2007 17:20:23 -0000	1.292
+++ gdm.spec	28 Sep 2007 16:09:09 -0000	1.293
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -59,6 +59,7 @@
 Patch38: hang.patch
 
 Patch100: gdm-2.20.0-change-defaults.patch
+Patch101: stupid-bullets.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -145,6 +146,7 @@
 %patch38 -p1 -b .hang
 
 %patch100 -p1 -b .change-defaults
+%patch101 -p1 -b .stupid-bullets
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -355,6 +357,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-7
+- Fix the stupid bullets again
+
 * Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-6
 - The previously mentioned typo didn't matter before because the
   compiled in default matched what the config file was supposed to



From fedora-extras-commits at redhat.com  Fri Sep 28 16:19:17 2007
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Fri, 28 Sep 2007 12:19:17 -0400
Subject: rpms/gnome-screensaver/devel stupid-bullets.patch, NONE,
	1.1 gnome-screensaver.spec, 1.168, 1.169
Message-ID: <200709281619.l8SGJHiY007989@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7956

Modified Files:
	gnome-screensaver.spec 
Added Files:
	stupid-bullets.patch 
Log Message:
fix stupid bullets


stupid-bullets.patch:

--- NEW FILE stupid-bullets.patch ---
diff -up gnome-screensaver-2.20.0/data/lock-dialog-default.glade.stupid-bullets gnome-screensaver-2.20.0/data/lock-dialog-default.glade
--- gnome-screensaver-2.20.0/data/lock-dialog-default.glade.stupid-bullets	2007-09-28 08:14:04.000000000 -0800
+++ gnome-screensaver-2.20.0/data/lock-dialog-default.glade	2007-09-28 08:14:12.000000000 -0800
@@ -178,7 +178,6 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
 			      <property name="activates_default">True</property>
 			      <accessibility>
 				<atkrelation target="auth-prompt-label" type="labelled-by"/>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gnome-screensaver.spec	25 Sep 2007 01:40:19 -0000	1.168
+++ gnome-screensaver.spec	28 Sep 2007 16:18:44 -0000	1.169
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
+Patch5: stupid-bullets.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -73,6 +74,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch4 -p1 -b .gnome-keyring
+%patch5 -p1 -b .stupid-bullets
 
 %build
 # grr, autoreconf seems to break with intltool 0.36.0, unless
@@ -138,6 +140,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-6
+- Use small bullets in the password entry
+
 * Mon Sep 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
 - Fix up GConf requires (#220547)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 16:23:07 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:23:07 -0700
Subject: [pkgdb] totem: mpg has requested watchcommits
Message-ID: <200709281623.l8SGNCBT020851@bastion.fedora.phx.redhat.com>

Marco Pesenti Gritti (mpg) has requested the watchcommits acl on totem (Fedora OLPC 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:23:51 2007
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 28 Sep 2007 12:23:51 -0400
Subject: rpms/smolt/devel selinux.patch,1.1,1.2 smolt.spec,1.31,1.32
Message-ID: <200709281623.l8SGNpte008470@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8443

Modified Files:
	selinux.patch smolt.spec 
Log Message:
Fixed patch

selinux.patch:

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux.patch	28 Sep 2007 15:55:27 -0000	1.1
+++ selinux.patch	28 Sep 2007 16:23:47 -0000	1.2
@@ -1,46 +1,46 @@
---- /tmp/smolt.py	2007-09-28 10:47:24.000000000 -0500
-+++ client/smolt.py	2007-08-13 15:46:43.000000000 -0500
-@@ -196,24 +196,18 @@
+--- /tmp/smolt.py	2007-09-28 11:17:42.000000000 -0500
++++ client/smolt.py	2007-09-28 10:46:22.000000000 -0500
+@@ -196,18 +196,24 @@
              self.formfactor = hostInfo['system.formfactor']
          except:
              self.formfactor = 'Unknown'
--
++
          try:
--            import selinux
--            try:
--                if selinux.is_selinux_enabled() == 1:
--                    self.selinux_enabled = True
--                else:
--                    self.selinux_enabled = False
--            except:
--                self.selinux_enabled = False
-+            retcode = os.system('/usr/sbin/selinuxenabled')
-+            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
-+        except:
-+            self.selinux_enabled = False
-+        if self.selinux_enabled:
+-            retcode = os.system('/usr/sbin/selinuxenabled')
+-            self.selinux_enabled =  os.WIFEXITED(recode) and os.WEXITCODE(retcode) == 0
+-        except:
+-            self.selinux_enabled = False
+-        if self.selinux_enabled:
++            import selinux
              try:
--                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
-+                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
+-                self.selinux_enforce = os.popen('LANG=C /usr/sbin/getenforce').read().strip()
++                if selinux.is_selinux_enabled() == 1:
++                    self.selinux_enabled = True
++                else:
++                    self.selinux_enabled = False
              except:
--                self.selinux_enforce = "Unknown"
--        except ImportError:
--            self.selinux_enabled = "Not installed"
--            self.selinux_enforce = "Not Installed"
--    
-+                self.selinux_enforce = 'Disabled'
-+        else:
-+            self.selinux_enforce = 'Disabled'
+-                self.selinux_enforce = 'Disabled'
+-        else:
+-            self.selinux_enforce = 'Disabled'
++                self.selinux_enabled = False
++            try:
++                self.selinux_enforce = selinux.selinux_getpolicytype()[1]
++            except:
++                self.selinux_enforce = "Unknown"
++        except ImportError:
++            self.selinux_enabled = "Not installed"
++            self.selinux_enforce = "Not Installed"
++    
  
  def ignoreDevice(device):
      ignore = 1
-@@ -273,8 +267,8 @@
+@@ -267,8 +273,8 @@
          except:
              raise SystemBusError, _('Could not bind to dbus.  Is dbus running?')
          
-+        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
+-        mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
          try:
--            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
++            mgr = self.dbus_get_interface(systemBus, 'org.freedesktop.Hal', '/org/freedesktop/Hal/Manager', 'org.freedesktop.Hal.Manager')
              all_dev_lst = mgr.GetAllDevices()
          except:
              raise SystemBusError, _('Could not connect to hal, is it running?'), _('Run "service haldaemon start" as root')


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- smolt.spec	28 Sep 2007 15:55:27 -0000	1.31
+++ smolt.spec	28 Sep 2007 16:23:47 -0000	1.32
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.8.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -183,7 +183,7 @@
 %{_bindir}/smoltGui
 
 %changelog
-* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-7
+* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-8
 - Fixed Selinux
 
 * Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6



From fedora-extras-commits at redhat.com  Fri Sep 28 16:25:23 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:25:23 -0700
Subject: [pkgdb] totem had acl change status
Message-ID: <200709281625.l8SGPSRG020930@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the watchcommits acl on totem (Fedora OLPC 2) to Approved for Marco Pesenti Gritti (mpg)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:25:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:25:35 -0700
Subject: [pkgdb] totem had acl change status
Message-ID: <200709281625.l8SGPeYV020961@bastion.fedora.phx.redhat.com>

John (J5) Palmieri (johnp) has set the commit acl on totem (Fedora OLPC 2) to Approved for Marco Pesenti Gritti (mpg)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/totem



From fedora-extras-commits at redhat.com  Fri Sep 28 16:29:40 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 28 Sep 2007 12:29:40 -0400
Subject: rpms/totem/OLPC-2 totem-2.18.2-plugin-build.patch, NONE,
	1.1 totem-2.18.3-pluginmime.patch, NONE, 1.1 totem.spec, 1.108, 1.109
Message-ID: <200709281629.l8SGTeEK008732@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/totem/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698

Modified Files:
	totem.spec 
Added Files:
	totem-2.18.2-plugin-build.patch totem-2.18.3-pluginmime.patch 
Log Message:
* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-7
- Apply patches to make it build and to make it recognize wav



totem-2.18.2-plugin-build.patch:

--- NEW FILE totem-2.18.2-plugin-build.patch ---
--- configure.orig	2007-07-19 17:43:05.000000000 +0200
+++ configure	2007-07-19 17:43:43.000000000 +0200
@@ -899,13 +899,13 @@
 INTLTOOL_XGETTEXT
 ALL_LINGUAS
 PKG_CONFIG
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS
 HELP_DIR
 OMF_DIR
 DOC_USER_FORMATS
 ENABLE_SK_TRUE
 ENABLE_SK_FALSE
+HAVE_GNOME_DOC_UTILS_TRUE
+HAVE_GNOME_DOC_UTILS_FALSE
 CXX
 CXXFLAGS
 ac_ct_CXX
@@ -968,6 +968,7 @@
 MOZILLA_IDLDIR
 ENABLE_BROWSER_PLUGINS_TRUE
 ENABLE_BROWSER_PLUGINS_FALSE
+MOZILLA_EXTRA_CXXFLAGS
 LIBXPCOMGLUE_S
 ENABLE_BASIC_PLUGIN_TRUE
 ENABLE_BASIC_PLUGIN_FALSE
@@ -1032,8 +1033,6 @@
 CPPFLAGS
 CPP
 PKG_CONFIG
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS
 CXX
 CXXFLAGS
 CCC
@@ -1729,11 +1728,6 @@
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
-  GDU_MODULE_VERSION_CHECK_CFLAGS
-              C compiler flags for GDU_MODULE_VERSION_CHECK, overriding
-              pkg-config
-  GDU_MODULE_VERSION_CHECK_LIBS
-              linker flags for GDU_MODULE_VERSION_CHECK, overriding pkg-config
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
@@ -6328,6 +6322,149 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                 return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  DATADIRNAME=share
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	case $host in
+    *-*-solaris*)
+                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char bind_textdomain_codeset (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_bind_textdomain_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+
+
 
 
 
@@ -6457,126 +6594,29 @@
 
 fi
 
-if test "x$PACKAGE" != "xgnome-doc-utils"; then
-  GDU_REQUIRED_VERSION=0.3.2
-  if test -n ""; then
-    GDU_REQUIRED_VERSION=
-  fi
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GDU_MODULE_VERSION_CHECK" >&5
-echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6; }
+gdu_cv_version_required=0.3.2
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then
-        pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then
-        pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
+if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
+  gdu_cv_have_gdu=yes
 else
-  pkg_failed=yes
+  gdu_cv_have_gdu=no
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-
 
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+if test "$gdu_cv_have_gdu" = "yes"; then
+	:
 else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
-        else
-	        GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5
-
-	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
+	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
    { (exit 1); exit 1; }; }
-else
-	GDU_MODULE_VERSION_CHECK_CFLAGS=$pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS
-	GDU_MODULE_VERSION_CHECK_LIBS=$pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
 fi
 
 
+
 # Check whether --with-help-dir was given.
 if test "${with_help_dir+set}" = set; then
   withval=$with_help_dir;
@@ -6616,7 +6656,7 @@
   enable_scrollkeeper=yes
 fi
 
- if test "x$enable_scrollkeeper" = "xyes"; then
+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
   ENABLE_SK_TRUE=
   ENABLE_SK_FALSE='#'
 else
@@ -6625,6 +6665,15 @@
 fi
 
 
+ if test "$gdu_cv_have_gdu" = "yes"; then
+  HAVE_GNOME_DOC_UTILS_TRUE=
+  HAVE_GNOME_DOC_UTILS_FALSE='#'
+else
+  HAVE_GNOME_DOC_UTILS_TRUE='#'
+  HAVE_GNOME_DOC_UTILS_FALSE=
+fi
+
+
 
 
 ac_ext=cpp
@@ -7651,7 +7700,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7654 "configure"' > conftest.$ac_ext
+  echo '#line 7703 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9436,11 +9485,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9439: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9443: \$? = $ac_status" >&5
+   echo "$as_me:9492: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9704,11 +9753,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9707: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9711: \$? = $ac_status" >&5
+   echo "$as_me:9760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9808,11 +9857,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9811: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9815: \$? = $ac_status" >&5
+   echo "$as_me:9864: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11273,7 +11322,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 11276 "configure"' > conftest.$ac_ext
+    echo '#line 11325 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11292,7 +11341,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -12137,7 +12186,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12140 "configure"
+#line 12189 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12237,7 +12286,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12240 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12568,9 +12617,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -12704,11 +12750,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -12720,7 +12766,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -12800,7 +12846,7 @@
 link_all_deplibs=$link_all_deplibs
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -14576,11 +14622,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14579: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14583: \$? = $ac_status" >&5
+   echo "$as_me:14629: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14680,11 +14726,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14683: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14687: \$? = $ac_status" >&5
+   echo "$as_me:14733: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15216,7 +15262,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15219 "configure"' > conftest.$ac_ext
+    echo '#line 15265 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15235,7 +15281,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -15620,9 +15666,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_CXX
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -15756,11 +15799,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -15772,7 +15815,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -15852,7 +15895,7 @@
 link_all_deplibs=$link_all_deplibs_CXX
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -16274,11 +16317,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16277: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16320: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16281: \$? = $ac_status" >&5
+   echo "$as_me:16324: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16378,11 +16421,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16381: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16424: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16385: \$? = $ac_status" >&5
+   echo "$as_me:16428: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17823,7 +17866,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17826 "configure"' > conftest.$ac_ext
+    echo '#line 17869 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17842,7 +17885,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -18227,9 +18270,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18363,11 +18403,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18379,7 +18419,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18459,7 +18499,7 @@
 link_all_deplibs=$link_all_deplibs_F77
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18600,11 +18640,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18603: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18643: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18607: \$? = $ac_status" >&5
+   echo "$as_me:18647: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18868,11 +18908,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18871: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18875: \$? = $ac_status" >&5
+   echo "$as_me:18915: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18972,11 +19012,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18975: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19015: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18979: \$? = $ac_status" >&5
+   echo "$as_me:19019: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20437,7 +20477,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 20440 "configure"' > conftest.$ac_ext
+    echo '#line 20480 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -20456,7 +20496,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -20841,9 +20881,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -20977,11 +21014,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -20993,7 +21030,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -21073,7 +21110,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -21324,9 +21361,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -21460,11 +21494,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -21476,7 +21510,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -21556,7 +21590,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23410,6 +23444,101 @@
 fi
 
 
+# Checks for -fshort-wchar compiler variable, and adds it to
+# MOZILLA_XPCOM_CFLAGS if found
+
+# **************************************************************
+# This is really gcc-only
+# Do this test using CXX only since some versions of gcc
+# 2.95-2.97 have a signed wchar_t in c++ only and some versions
+# only have short-wchar support for c++.
+# **************************************************************
+
+MOZILLA_EXTRA_CXXFLAGS=
+
+if test "$enable_browser_plugins" = "yes" ; then
+	ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+	_SAVE_CXXFLAGS=$CXXFLAGS
+	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
+
+	{ echo "$as_me:$LINENO: checking for compiler -fshort-wchar option" >&5
+echo $ECHO_N "checking for compiler -fshort-wchar option... $ECHO_C" >&6; }
+if test "${gecko_cv_have_usable_wchar_option+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+	                  int main () {
+	                    return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ;
+	                  }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gecko_cv_have_usable_wchar_option="yes"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gecko_cv_have_usable_wchar_option="no"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $gecko_cv_have_usable_wchar_option" >&5
+echo "${ECHO_T}$gecko_cv_have_usable_wchar_option" >&6; }
+
+	CXXFLAGS="$_SAVE_CXXFLAGS"
+
+	ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+	if test "$gecko_cv_have_usable_wchar_option" = "yes"; then
+	        MOZILLA_EXTRA_CXXFLAGS="-fshort-wchar"
+	fi
+fi
+
+
+
 # check for libxpcomglue_s
 
 LIBXPCOMGLUE_S=
@@ -23429,7 +23558,7 @@
 	CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
 	CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
 	LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
-	LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
+	LDFLAGS="$LDFLAGS $MOZILLA_EXTRA_CXXFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
 
 	{ echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5
 echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; }
@@ -23497,7 +23626,7 @@
 
 
 	if test "$have_libxpcomglue_s" = "yes"; then
-		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
+		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
 	else
 		{ echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5
 echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;}
@@ -23587,7 +23716,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 	__SAVE_CPPFLAGS=$CPPFLAGS
-	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
+	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS $MOZILLA_EXTRA_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
 
 
 
@@ -25929,6 +26058,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -26774,13 +26910,13 @@
 INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
 ALL_LINGUAS!$ALL_LINGUAS$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
-GDU_MODULE_VERSION_CHECK_CFLAGS!$GDU_MODULE_VERSION_CHECK_CFLAGS$ac_delim
-GDU_MODULE_VERSION_CHECK_LIBS!$GDU_MODULE_VERSION_CHECK_LIBS$ac_delim
 HELP_DIR!$HELP_DIR$ac_delim
 OMF_DIR!$OMF_DIR$ac_delim
 DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
 ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
 ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
@@ -26884,6 +27020,7 @@
 MOZILLA_IDLDIR!$MOZILLA_IDLDIR$ac_delim
 ENABLE_BROWSER_PLUGINS_TRUE!$ENABLE_BROWSER_PLUGINS_TRUE$ac_delim
 ENABLE_BROWSER_PLUGINS_FALSE!$ENABLE_BROWSER_PLUGINS_FALSE$ac_delim
+MOZILLA_EXTRA_CXXFLAGS!$MOZILLA_EXTRA_CXXFLAGS$ac_delim
 LIBXPCOMGLUE_S!$LIBXPCOMGLUE_S$ac_delim
 ENABLE_BASIC_PLUGIN_TRUE!$ENABLE_BASIC_PLUGIN_TRUE$ac_delim
 ENABLE_BASIC_PLUGIN_FALSE!$ENABLE_BASIC_PLUGIN_FALSE$ac_delim
@@ -26939,7 +27076,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- browser-plugin/Makefile.in.orig	2007-07-19 17:51:04.000000000 +0200
+++ browser-plugin/Makefile.in	2007-07-19 17:51:19.000000000 +0200
@@ -295,8 +295,6 @@
 GCONFTOOL = @GCONFTOOL@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -359,6 +357,7 @@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MOZILLA = @MOZILLA@
+MOZILLA_EXTRA_CXXFLAGS = @MOZILLA_EXTRA_CXXFLAGS@
 MOZILLA_IDLDIR = @MOZILLA_IDLDIR@
 MOZILLA_INCLUDE_ROOT = @MOZILLA_INCLUDE_ROOT@
 MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
@@ -580,6 +579,7 @@
 
 @ENABLE_BASIC_PLUGIN_TRUE at libtotem_basic_plugin_la_CXXFLAGS = \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_BASIC_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_BASIC_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -640,6 +640,7 @@
 
 @ENABLE_GMP_PLUGIN_TRUE at libtotem_gmp_plugin_la_CXXFLAGS = \
 @ENABLE_GMP_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_GMP_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_GMP_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -694,6 +695,7 @@
 
 @ENABLE_COMPLEX_PLUGIN_TRUE at libtotem_complex_plugin_la_CXXFLAGS = \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_COMPLEX_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -748,6 +750,7 @@
 
 @ENABLE_NARROWSPACE_PLUGIN_TRUE at libtotem_narrowspace_plugin_la_CXXFLAGS = \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\
@@ -802,6 +805,7 @@
 
 @ENABLE_MULLY_PLUGIN_TRUE at libtotem_mully_plugin_la_CXXFLAGS = \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(BROWSER_PLUGIN_CFLAGS)	\
+ at ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_EXTRA_CXXFLAGS)       \
 @ENABLE_MULLY_PLUGIN_TRUE@	$(MOZILLA_XPCOM_CFLAGS)		\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(DBUS_CFLAGS)			\
 @ENABLE_MULLY_PLUGIN_TRUE@	$(WARN_CXXFLAGS)		\

totem-2.18.3-pluginmime.patch:

--- NEW FILE totem-2.18.3-pluginmime.patch ---
--- browser-plugin/totemBasicPlugin.cpp.old	2007-09-28 16:04:07.000000000 +0200
+++ browser-plugin/totemBasicPlugin.cpp	2007-09-28 16:04:30.000000000 +0200
@@ -52,9 +52,9 @@
 	{ "application/ogg", "ogg", NULL, FALSE },
 	{ "video/mpeg", "mpg, mpeg, mpe", NULL, FALSE },
 	{ "audio/wav", "wav", NULL, FALSE },
-	{ "audio/x-wav", "wav", NULL, TRUE },
+	{ "audio/x-wav", "wav", NULL, FALSE },
 	{ "audio/mpeg", "mp3", NULL, FALSE },
-	{ "audio/x-mpeg", "mp3", NULL, TRUE }
+	{ "audio/x-mpeg", "mp3", NULL, FALSE }
 };
 
 totemScriptablePlugin::totemScriptablePlugin (totemPlugin *aPlugin)


Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- totem.spec	6 Jul 2007 17:24:53 -0000	1.108
+++ totem.spec	28 Sep 2007 16:29:07 -0000	1.109
@@ -5,13 +5,15 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 2.18.2
-Release: 5%{?dist} 
+Release: 7
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
 Source0: http://download.gnome.org/sources/totem/2.18/totem-%{version}.tar.bz2
 Patch0: totem-gtk-init-gst.patch
 Patch1: totem-2.18.1-remove-libsn.patch
+Patch2: totem-2.18.2-plugin-build.patch
+Patch3: totem-2.18.3-pluginmime.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -85,6 +87,8 @@
 %setup -q
 %patch0 -p1 -b .gtk-init-gst
 %patch1 -p1 -b .remove-libsn
+%patch2 -p0 -b .plugin-build
+%patch3 -p0 -b .pluginmime
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -188,6 +192,12 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-7
+- Apply patches to make it build and to make it recognize wav
+
+* Thu Jul 19 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-6.marco
+- Add a patch to make it build with 1.9 alpha 6
+
 * Fri Jul 06 2007 John (J5) Palmieri <johnp at redhat.com> - 2.18.2-5
 - Bump and recompile
 



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:29 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281646.l8SGkYCn021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:43 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:43 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281646.l8SGkYCq021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:46:49 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:46:49 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281646.l8SGkYCt021354@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:27 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 12:47:27 -0400
Subject: comps comps-f8.xml.in,1.132,1.133
Message-ID: <200709281647.l8SGlR7G009872@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417

Modified Files:
	comps-f8.xml.in 
Log Message:
remove i810switch for F8


Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- comps-f8.xml.in	28 Sep 2007 12:03:31 -0000	1.132
+++ comps-f8.xml.in	28 Sep 2007 16:46:57 -0000	1.133
@@ -2014,7 +2014,6 @@
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
-      <packagereq type="optional">i810switch</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:47 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:47 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281647.l8SGlquD021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:48 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:48 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281647.l8SGlquG021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:47:51 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:47:51 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281647.l8SGlquJ021484@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:02 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchbugzilla
Message-ID: <200709281648.l8SGm7XW021541@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchbugzilla acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:06 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:06 -0700
Subject: [pkgdb] rpmlint: tmz has requested commit
Message-ID: <200709281648.l8SGm7XZ021541@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the commit acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 16:48:04 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 09:48:04 -0700
Subject: [pkgdb] rpmlint: tmz has requested watchcommits
Message-ID: <200709281648.l8SGm9ZZ021547@bastion.fedora.phx.redhat.com>

Todd M. Zullinger (tmz) has requested the watchcommits acl on rpmlint (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:19:35 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 13:19:35 -0400
Subject: rpms/gdm/devel gdm-2.20.0-fix-savedie.patch, NONE, 1.1 gdm.spec,
	1.293, 1.294
Message-ID: <200709281719.l8SHJZb7018937@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18896

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.0-fix-savedie.patch 
Log Message:
- Another crack at 240853


gdm-2.20.0-fix-savedie.patch:

--- NEW FILE gdm-2.20.0-fix-savedie.patch ---
diff -up gdm-2.20.0/gui/gdmlogin.c.fix-savedie gdm-2.20.0/gui/gdmlogin.c
--- gdm-2.20.0/gui/gdmlogin.c.fix-savedie	2007-09-28 13:16:05.000000000 -0400
+++ gdm-2.20.0/gui/gdmlogin.c	2007-09-28 13:16:09.000000000 -0400
@@ -1796,6 +1796,9 @@ process_operation (guchar       op_code,
 	gdm_kill_thingies ();
 	gdk_flush ();
 
+	printf ("%c\n", STX);
+	fflush (stdout);
+
 	_exit (EXIT_SUCCESS);
 
     case GDM_QUERY_CAPSLOCK:
diff -up gdm-2.20.0/gui/greeter/greeter.c.fix-savedie gdm-2.20.0/gui/greeter/greeter.c
--- gdm-2.20.0/gui/greeter/greeter.c.fix-savedie	2007-09-28 13:15:48.000000000 -0400
+++ gdm-2.20.0/gui/greeter/greeter.c	2007-09-28 13:15:53.000000000 -0400
@@ -574,6 +574,8 @@ process_operation (guchar       op_code,
 	gdm_wm_save_wm_order ();
 
 	gdk_flush ();
+	printf ("%c\n", STX);
+	fflush (stdout);
 
 	_exit (EXIT_SUCCESS);
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- gdm.spec	28 Sep 2007 16:09:09 -0000	1.293
+++ gdm.spec	28 Sep 2007 17:19:01 -0000	1.294
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -58,6 +58,9 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240853 
+Patch39: gdm-2.20.0-fix-savedie.patch
+
 Patch100: gdm-2.20.0-change-defaults.patch
 Patch101: stupid-bullets.patch
 
@@ -144,6 +147,7 @@
 %patch35 -p1 -b .gdmsetup-path
 %patch37 -p1 -b .selinux
 %patch38 -p1 -b .hang
+%patch39 -p1 -b .fix-savedie
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
@@ -357,6 +361,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-8
+- Another crack at 240853
+
 * Fri Sep 28 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-7
 - Fix the stupid bullets again
 



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:02 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sT022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:02 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:02 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sW022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:03 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:03 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHW7sZ022488@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora devel) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:18 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:18 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMO022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:21 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMR022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:20 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAg022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora 7) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:32 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAj022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchbugzilla acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:33 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:33 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWNMU022550@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the watchcommits acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:32:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 10:32:35 -0700
Subject: [pkgdb] rpmlint had acl change status
Message-ID: <200709281732.l8SHWPAm022556@bastion.fedora.phx.redhat.com>

Ville Skytta (scop) has set the commit acl on rpmlint (Fedora 6) to Approved for Todd M. Zullinger (tmz)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rpmlint



From fedora-extras-commits at redhat.com  Fri Sep 28 17:54:50 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 13:54:50 -0400
Subject: rpms/irqbalance/devel irqbalance-0.55-cputree-parse.patch, NONE,
	1.1 irqbalance-pie.patch, NONE, 1.1 irqbalance.spec, 1.44, 1.45
Message-ID: <200709281754.l8SHsoC3020364@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20339

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-0.55-cputree-parse.patch irqbalance-pie.patch 
Log Message:
Resolves: bz310821

irqbalance-0.55-cputree-parse.patch:

--- NEW FILE irqbalance-0.55-cputree-parse.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/cputree.c.orig irqbalance-0.55/irqbalance-0.55/cputree.c
--- irqbalance-0.55/irqbalance-0.55/cputree.c.orig	2006-12-10 15:04:59.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/cputree.c	2007-09-28 12:43:35.000000000 -0400
@@ -26,6 +26,8 @@
 
 #define _GNU_SOURCE
 
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -131,34 +133,30 @@ static void fill_cache_domain(void)
 }
 
 
-static void do_one_cpu(char *path)
+static void do_one_cpu(int dfd, char *d_name)
 {
 	struct cpu_core *cpu;
 	FILE *file;
 	char new_path[PATH_MAX];
 
 	/* skip offline cpus */
-	snprintf(new_path, PATH_MAX, "%s/online", path);
-	file = fopen(new_path, "r");
-	if (file) {
-		char *line = NULL;
-		size_t size = 0;
-		if (getline(&line, &size, file)==0)
+	snprintf(new_path, PATH_MAX, "%s/online", d_name);
+	int fd = openat(dfd, new_path, O_RDONLY);
+	if (fd != -1) {
+		char buf[1];
+		ssize_t n = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (n != sizeof(buf))
 			return;
-		fclose(file);
-		if (line && line[0]=='0') {
-			free(line);
+		if (buf[0] == '0')
 			return;
-		}
-		free(line);
 	}
 
-	cpu = malloc(sizeof(struct cpu_core));
+	cpu = calloc(1, sizeof(struct cpu_core));
 	if (!cpu)
 		return;
-	memset(cpu, 0, sizeof(struct cpu_core));
 
-	cpu->number = strtoul(&path[27], NULL, 10);
+	cpu->number = strtoul(&d_name[3], NULL, 10);
 	
 	cpu_set(cpu->number, cpu->mask);
 
@@ -170,43 +168,45 @@ static void do_one_cpu(char *path)
 		return;
 	}
 
+	char *line = NULL;
+	size_t size = 0;
 
 	/* try to read the package mask; if it doesn't exist assume solitary */
-	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	cpu_set(cpu->number, cpu->package_mask);
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->package_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
 
 	/* try to read the cache mask; if it doesn't exist assume solitary */
 	/* We want the deepest cache level available so try index1 first, then index2 */
 	cpu_set(cpu->number, cpu->cache_mask);
-	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
-	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	} else if (fd != -1)
+		close(fd);
+
+	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
+
+	free(line);
 
 	/* 
 	   blank out the banned cpus from the various masks so that interrupts
@@ -311,18 +311,19 @@ void parse_cpu_tree(void)
 {
 	DIR *dir;
 	struct dirent *entry;
+	int dfd;
 
 	cpus_complement(unbanned_cpus, banned_cpus);
 
 	dir = opendir("/sys/devices/system/cpu");
 	if (!dir)
 		return;
+	dfd = dirfd(dir);
 	do {
 		entry = readdir(dir);
-                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-			char new_path[PATH_MAX];
-			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
-			do_one_cpu(new_path);
+                if (entry && strlen(entry->d_name)>3 && memcmp(entry->d_name,"cpu",3) == 0
+		    && isdigit(entry->d_name[3])) {
+			do_one_cpu(dfd, entry->d_name);
 		}
 	} while (entry);
 	closedir(dir);  

irqbalance-pie.patch:

--- NEW FILE irqbalance-pie.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
--- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 13:35:46.000000000 -0400
@@ -5,7 +5,7 @@ all: irqbalance
 LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
 
 irqbalance: .depend $(LIBS)
-	gcc  -g -O2 -D_FORTIFY_SOURCE=2 -Wall  `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
+	gcc  -g -D_FORTIFY_SOURCE=2 -Wall -Os -Wl,-z,relro,-z,now -pie -fpie `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
 
 clean:
 	rm -f irqbalance *~ *.o .depend


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- irqbalance.spec	29 Aug 2007 05:10:52 -0000	1.44
+++ irqbalance.spec	28 Sep 2007 17:54:17 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        0.55 
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		2	
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -17,6 +17,9 @@
 BuildRequires:	glib2-devel pkgconfig imake
 Requires:	glib2
 
+Patch0: irqbalance-pie.patch
+Patch1: irqbalance-0.55-cputree-parse.patch
+
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
@@ -24,6 +27,9 @@
 %prep
 %setup -q -c -a 0
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,6 +76,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Neil Horman <nhorman at redhat.com> - 2:0.55-5
+- Install pie patch
+- Grab Ulis cpuparse cleanup (bz 310821)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2:0.55-4
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 18:09:25 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 14:09:25 -0400
Subject: rpms/gdm/devel gdm.spec,1.294,1.295
Message-ID: <200709281809.l8SI9PoK028321@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28284

Modified Files:
	gdm.spec 
Log Message:
update bug link



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- gdm.spec	28 Sep 2007 17:19:01 -0000	1.294
+++ gdm.spec	28 Sep 2007 18:08:52 -0000	1.295
@@ -58,7 +58,7 @@
 # fixed in upstream svn
 Patch38: hang.patch
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240853 
+# http://bugzilla.gnome.org/show_bug.cgi?id=473480
 Patch39: gdm-2.20.0-fix-savedie.patch
 
 Patch100: gdm-2.20.0-change-defaults.patch



From fedora-extras-commits at redhat.com  Fri Sep 28 18:35:44 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 14:35:44 -0400
Subject: rpms/irqbalance/devel irqbalance-pie.patch, 1.1, 1.2 irqbalance.spec,
	1.45, 1.46
Message-ID: <200709281835.l8SIZibX029381@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358

Modified Files:
	irqbalance-pie.patch irqbalance.spec 
Log Message:
updating pie patch

irqbalance-pie.patch:

Index: irqbalance-pie.patch
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance-pie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- irqbalance-pie.patch	28 Sep 2007 17:54:17 -0000	1.1
+++ irqbalance-pie.patch	28 Sep 2007 18:35:42 -0000	1.2
@@ -1,7 +1,12 @@
 diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
 --- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
-+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 13:35:46.000000000 -0400
-@@ -5,7 +5,7 @@ all: irqbalance
++++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 14:10:01.000000000 -0400
+@@ -1,11 +1,11 @@
+-CFLAGS+=-g -Os -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
++CFLAGS+=-g -Os -Os -pie -fpie -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
+ 
+ all: irqbalance
+ 
  LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
  
  irqbalance: .depend $(LIBS)


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- irqbalance.spec	28 Sep 2007 17:54:17 -0000	1.45
+++ irqbalance.spec	28 Sep 2007 18:35:42 -0000	1.46
@@ -27,7 +27,7 @@
 %prep
 %setup -q -c -a 0
 
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 %build



From fedora-extras-commits at redhat.com  Fri Sep 28 18:59:46 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 14:59:46 -0400
Subject: rpms/mugshot/F-7 mugshot.spec,1.22,1.23 sources,1.16,1.17
Message-ID: <200709281859.l8SIxkql030867@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30803

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mugshot.spec	20 Sep 2007 21:37:26 -0000	1.22
+++ mugshot.spec	28 Sep 2007 18:59:14 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.54
+Version:        1.1.55
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -224,6 +224,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 1.1.55-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 1.1.54-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Sep 2007 21:37:26 -0000	1.16
+++ sources	28 Sep 2007 18:59:14 -0000	1.17
@@ -1 +1 @@
-fdf1649c8d43dd61570854d5acee8675  mugshot-1.1.54.tar.gz
+8281a8cbe1ebc7501adaf32f5790b900  mugshot-1.1.55.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 18:59:55 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 14:59:55 -0400
Subject: rpms/bigboard/F-7 bigboard.spec,1.20,1.21 sources,1.16,1.17
Message-ID: <200709281859.l8SIxtmK030905@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825

Modified Files:
	bigboard.spec sources 
Log Message:
merge from devel


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bigboard.spec	14 Sep 2007 21:09:31 -0000	1.20
+++ bigboard.spec	28 Sep 2007 18:59:22 -0000	1.21
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bigboard
-Version:        0.5.16
+Version:        0.5.19
 Release:        1%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
@@ -28,6 +28,7 @@
 BuildRequires:	pygtk2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  gnome-panel-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:	gnome-keyring-devel
 BuildRequires:  mugshot-devel >= 1.1.52
 
@@ -93,6 +94,16 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.5.19-1
+- new upstream
+
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.5.18-1
+- new upstream
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.5.17-1
+- new upstream
+- add br
+
 * Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.5.16-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Sep 2007 21:09:31 -0000	1.16
+++ sources	28 Sep 2007 18:59:22 -0000	1.17
@@ -1 +1 @@
-43cc7a78d91853575eb83201a7536ffb  bigboard-0.5.16.tar.gz
+e162eaefa748b62539282828896ed8b2  bigboard-0.5.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 19:00:10 2007
From: fedora-extras-commits at redhat.com (Colin Walters (walters))
Date: Fri, 28 Sep 2007 15:00:10 -0400
Subject: rpms/online-desktop/F-7 online-desktop.spec, 1.7, 1.8 sources, 1.7,
	1.8
Message-ID: <200709281900.l8SJ0Aat030956@cvs-int.fedora.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30847

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- online-desktop.spec	20 Sep 2007 21:57:32 -0000	1.7
+++ online-desktop.spec	28 Sep 2007 18:59:38 -0000	1.8
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.15
+Version:        0.2.17
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -15,7 +15,6 @@
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
-Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
@@ -187,6 +186,12 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Sep 27 2007 Colin Walters <walters at redhat.com> - 0.2.17-1
+- new upstream
+
+* Fri Sep 21 2007 Colin Walters <walters at redhat.com> - 0.2.16-1
+- new upstream
+
 * Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
 - dbus service


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Sep 2007 21:57:32 -0000	1.7
+++ sources	28 Sep 2007 18:59:38 -0000	1.8
@@ -1 +1 @@
-97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz
+a1a052200e2c422053da2fdd0dfda2e1  online-desktop-0.2.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 19:04:06 2007
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Fri, 28 Sep 2007 15:04:06 -0400
Subject: rpms/irqbalance/F-7 irqbalance-0.55-cputree-parse.patch, NONE,
	1.1 irqbalance-pie.patch, NONE, 1.1 irqbalance.spec, 1.42, 1.43
Message-ID: <200709281904.l8SJ4647004773@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/irqbalance/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4746

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-0.55-cputree-parse.patch irqbalance-pie.patch 
Log Message:
ulis cputree parse fix

irqbalance-0.55-cputree-parse.patch:

--- NEW FILE irqbalance-0.55-cputree-parse.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/cputree.c.orig irqbalance-0.55/irqbalance-0.55/cputree.c
--- irqbalance-0.55/irqbalance-0.55/cputree.c.orig	2006-12-10 15:04:59.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/cputree.c	2007-09-28 12:43:35.000000000 -0400
@@ -26,6 +26,8 @@
 
 #define _GNU_SOURCE
 
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -131,34 +133,30 @@ static void fill_cache_domain(void)
 }
 
 
-static void do_one_cpu(char *path)
+static void do_one_cpu(int dfd, char *d_name)
 {
 	struct cpu_core *cpu;
 	FILE *file;
 	char new_path[PATH_MAX];
 
 	/* skip offline cpus */
-	snprintf(new_path, PATH_MAX, "%s/online", path);
-	file = fopen(new_path, "r");
-	if (file) {
-		char *line = NULL;
-		size_t size = 0;
-		if (getline(&line, &size, file)==0)
+	snprintf(new_path, PATH_MAX, "%s/online", d_name);
+	int fd = openat(dfd, new_path, O_RDONLY);
+	if (fd != -1) {
+		char buf[1];
+		ssize_t n = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (n != sizeof(buf))
 			return;
-		fclose(file);
-		if (line && line[0]=='0') {
-			free(line);
+		if (buf[0] == '0')
 			return;
-		}
-		free(line);
 	}
 
-	cpu = malloc(sizeof(struct cpu_core));
+	cpu = calloc(1, sizeof(struct cpu_core));
 	if (!cpu)
 		return;
-	memset(cpu, 0, sizeof(struct cpu_core));
 
-	cpu->number = strtoul(&path[27], NULL, 10);
+	cpu->number = strtoul(&d_name[3], NULL, 10);
 	
 	cpu_set(cpu->number, cpu->mask);
 
@@ -170,43 +168,45 @@ static void do_one_cpu(char *path)
 		return;
 	}
 
+	char *line = NULL;
+	size_t size = 0;
 
 	/* try to read the package mask; if it doesn't exist assume solitary */
-	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/topology/core_siblings", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	cpu_set(cpu->number, cpu->package_mask);
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->package_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
 
 	/* try to read the cache mask; if it doesn't exist assume solitary */
 	/* We want the deepest cache level available so try index1 first, then index2 */
 	cpu_set(cpu->number, cpu->cache_mask);
-	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	snprintf(new_path, PATH_MAX, "%s/cache/index1/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
-	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", path);
-	file = fopen(new_path, "r");
+	} else if (fd != -1)
+		close(fd);
+
+	snprintf(new_path, PATH_MAX, "%s/cache/index2/shared_cpu_map", d_name);
+	fd = openat(dfd, new_path, O_RDONLY);
+	file = fd == -1 ? NULL : fdopen(fd, "r");
 	if (file) {
-		char *line = NULL;
-		size_t size = 0;
 		if (getline(&line, &size, file)) 
 			cpumask_parse_user(line, strlen(line), cpu->cache_mask);
 		fclose(file);
-		free(line);
-	}
+	} else if (fd != -1)
+		close(fd);
+
+	free(line);
 
 	/* 
 	   blank out the banned cpus from the various masks so that interrupts
@@ -311,18 +311,19 @@ void parse_cpu_tree(void)
 {
 	DIR *dir;
 	struct dirent *entry;
+	int dfd;
 
 	cpus_complement(unbanned_cpus, banned_cpus);
 
 	dir = opendir("/sys/devices/system/cpu");
 	if (!dir)
 		return;
+	dfd = dirfd(dir);
 	do {
 		entry = readdir(dir);
-                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-			char new_path[PATH_MAX];
-			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
-			do_one_cpu(new_path);
+                if (entry && strlen(entry->d_name)>3 && memcmp(entry->d_name,"cpu",3) == 0
+		    && isdigit(entry->d_name[3])) {
+			do_one_cpu(dfd, entry->d_name);
 		}
 	} while (entry);
 	closedir(dir);  

irqbalance-pie.patch:

--- NEW FILE irqbalance-pie.patch ---
diff -up irqbalance-0.55/irqbalance-0.55/Makefile.orig irqbalance-0.55/irqbalance-0.55/Makefile
--- irqbalance-0.55/irqbalance-0.55/Makefile.orig	2006-12-05 08:15:23.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/Makefile	2007-09-28 14:10:01.000000000 -0400
@@ -1,11 +1,11 @@
-CFLAGS+=-g -Os -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
+CFLAGS+=-g -Os -Os -pie -fpie -D_FORTIFY_SOURCE=2 -Wall -W `pkg-config --cflags glib-2.0` 
 
 all: irqbalance
 
 LIBS=bitmap.o irqbalance.o cputree.o  procinterrupts.o irqlist.o placement.o activate.o network.o powermode.o numa.o classify.o
 
 irqbalance: .depend $(LIBS)
-	gcc  -g -O2 -D_FORTIFY_SOURCE=2 -Wall  `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
+	gcc  -g -D_FORTIFY_SOURCE=2 -Wall -Os -Wl,-z,relro,-z,now -pie -fpie `pkg-config --libs glib-2.0` $(LIBS) -o irqbalance 
 
 clean:
 	rm -f irqbalance *~ *.o .depend


Index: irqbalance.spec
===================================================================
RCS file: /cvs/extras/rpms/irqbalance/F-7/irqbalance.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- irqbalance.spec	12 Dec 2006 16:43:01 -0000	1.42
+++ irqbalance.spec	28 Sep 2007 19:03:34 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        0.55 
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		2	
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -17,12 +17,17 @@
 BuildRequires:	glib2-devel pkgconfig imake
 Requires:	glib2
 
+Patch0: irqbalance-pie.patch
+Patch1: irqbalance-0.55-cputree-parse.patch
+
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
 
 %prep
 %setup -q -c -a 0
+%patch0 -p1
+%patch1 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +75,10 @@
 
 
 %changelog
+* Fri Sep 28 2007 Neil Horman <nhorman at redhat.com> - 0.55-3
+- Installed pie build patch
+- Grabbed Uli's cputree parsing fixes
+
 * Tue Dec 12 2006 Neil Horman <nhorman at redhat.com> - 0.55-2
 - Fixing typos in spec file (bz 219301)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:17:39 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:17:39 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec,1.9,1.10
Message-ID: <200709282017.l8SKHdu3013922@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13791

Modified Files:
	gnome-python2-extras.spec 
Log Message:

* Fri Sep 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-6.fc8
- Add a gnome-python2-gdl subpackage (RH bug #303141).



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-python2-extras.spec	22 Aug 2007 15:00:20 -0000	1.9
+++ gnome-python2-extras.spec	28 Sep 2007 20:17:04 -0000	1.10
@@ -8,12 +8,13 @@
 %define firefox_version 2.0.0.6
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
+%define anjuta_gdl_version 0.7.1
 
 ### Abstract ###
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -34,6 +35,7 @@
 
 ### Build Dependencies ###
 
+BuildRequires: anjuta-gdl >= %{anjuta_gdl_version}
 BuildRequires: firefox-devel = %{firefox_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
@@ -50,10 +52,20 @@
 The gnome-python-extra package contains the source packages for additional 
 Python bindings for GNOME. It should be used together with gnome-python.
 
-%package -n gnome-python2-gtkhtml2
+%package -n gnome-python2-gdl
+Summary: Python bindings for the GNOME Development Library
+Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: anjuta-gdl >= %{anjuta_gdl_version}
+
+%description -n gnome-python2-gdl
+This module contains a wrapper that allows the use of the GNOME Development
+Library (gdl) via Python.
+
+%package -n gnome-python2-gtkhtml2
 Summary: Python bindings for interacting with gtkhtml2
 Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
 Requires: gtkhtml2 >= %{gtkhtml2_version}
 Obsoletes: pygnome-gtkhtml
 
@@ -132,6 +144,10 @@
 %{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
 %{_datadir}/pygtk
 
+%files -n gnome-python2-gdl
+%defattr(-,root,root,-)
+%{python_sitearch}/gtk-2.0/gdl.so
+
 %files -n gnome-python2-gtkhtml2
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkhtml*
@@ -164,6 +180,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Fri Sep 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-6.fc8
+- Add a gnome-python2-gdl subpackage (RH bug #303141).
+
 * Wed Aug 22 2007 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-5.fc8
 - Mass rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:27:40 2007
From: fedora-extras-commits at redhat.com (Fernando Nasser (fnasser))
Date: Fri, 28 Sep 2007 16:27:40 -0400
Subject: rpms/icu4j/devel icu4j-updatetimestamp.patch, NONE, 1.1 icu4j.spec, 
	1.5, 1.6
Message-ID: <200709282027.l8SKRe8d014648@cvs-int.fedora.redhat.com>

Author: fnasser

Update of /cvs/extras/rpms/icu4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14614

Modified Files:
	icu4j.spec 
Added Files:
	icu4j-updatetimestamp.patch 
Log Message:
Update timestamp to match Eclipse 3.3.1 release.

icu4j-updatetimestamp.patch:

--- NEW FILE icu4j-updatetimestamp.patch ---
# release-3-6-1-eclipse331-20070906
--- icu4j-3.6.1/build.properties	2007-04-27 11:42:26.000000000 -0400
+++ icu4j-3.6.1/build.properties	2007-09-06 15:18:03.000000000 -0400
@@ -14,4 +14,4 @@
 copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others.  All Rights Reserved.
 corp=IBM Corporation
 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.6.1.v20070417
+icu4j.eclipse.build.version.string=3.6.1.v20070906



Index: icu4j.spec
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icu4j.spec	29 Aug 2007 18:52:59 -0000	1.5
+++ icu4j.spec	28 Sep 2007 20:27:07 -0000	1.6
@@ -48,7 +48,7 @@
 
 Name:           icu4j
 Version:        3.6.1
-Release:        1jpp.3%{?dist}
+Release:        1jpp.4%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT style 
@@ -57,6 +57,7 @@
 Source0:	http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-disable-javadocs.patch
+Patch2:         %{name}-updatetimestamp.patch
 BuildRequires:  ant
 BuildRequires:  java-javadoc
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -112,6 +113,7 @@
 %setup -q -c
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 %{__sed} -i 's/\r//' license.html
 %{__sed} -i 's/\r//' APIChangeReport.html
@@ -231,6 +233,9 @@
 %endif
 
 %changelog
+* Fri Sep 28 2007 Andrew Overholt <overholt at redhat.com> 3.6.1-1jpp.4
+- Update timestamp to match Eclipse 3.3.1 release.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.6.1-1jpp.3
 - Rebuild for selinux ppc32 issue.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:28:21 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:28:21 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.10,
	1.11
Message-ID: <200709282028.l8SKSL1g014721@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14647

Modified Files:
	gnome-python2-extras.spec 
Log Message:
No anjuta-gdl on ppc64, apparently.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python2-extras.spec	28 Sep 2007 20:17:04 -0000	1.10
+++ gnome-python2-extras.spec	28 Sep 2007 20:27:48 -0000	1.11
@@ -57,6 +57,7 @@
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: anjuta-gdl >= %{anjuta_gdl_version}
+ExcludeArch: ppc64
 
 %description -n gnome-python2-gdl
 This module contains a wrapper that allows the use of the GNOME Development



From fedora-extras-commits at redhat.com  Fri Sep 28 20:33:49 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 28 Sep 2007 16:33:49 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15145

Modified Files:
	java-1.7.0-icedtea.spec sources 
Log Message:
* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
- Fixed testing. Output is stored in a file and passes/debug info is not shown.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
+++ java-1.7.0-icedtea.spec	28 Sep 2007 20:33:17 -0000	1.13
@@ -113,6 +113,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  mauve_output
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -300,7 +301,7 @@
   make
   echo ====================MAUVE TESTING========================
   $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-    -showpasses -debug -timeout 30000 2>&1 || :
+	-timeout 30000 2>&1 | tee %{SOURCE8}
   echo ====================MAUVE TESTING END====================
 popd
 
@@ -732,6 +733,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+- Fixed testing. Output is stored in a file and passes/debug info is not shown.
+
 * Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
 - Apply patch to use system tzdata.
 - Require tzdata-java.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2007 19:19:37 -0000	1.7
+++ sources	28 Sep 2007 20:33:17 -0000	1.8
@@ -1,5 +1,4 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
-d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 20:35:20 2007
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Fri, 28 Sep 2007 16:35:20 -0400
Subject: rpms/kernel/devel linux-2.6-x86-setup-e820-workaround.patch, NONE, 
	1.1 kernel.spec, 1.196, 1.197
Message-ID: <200709282035.l8SKZKIG015291@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15259

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-setup-e820-workaround.patch 
Log Message:
* Fri Sep 28 2007 Chuck Ebbert <cebbert at redhat.com>
- fix X86 memory detection (bz #311491)


linux-2.6-x86-setup-e820-workaround.patch:

--- NEW FILE linux-2.6-x86-setup-e820-workaround.patch ---
commit 4ee5b10abeb2b5581be10d3022694cd19084e9b0
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Thu Sep 27 17:17:12 2007 -0700

    [x86 setup] Correct the SMAP check for INT 0x15, AX=0xe820
    
    The e820 probe code was checking %edx, not %eax, for the SMAP
    signature on return.  This worked on *almost* all systems, since %edx
    still contained SMAP from the call on entry, but on a handful of
    systems it failed -- plus, we would have missed real mismatches.
    
    The error output is "=d" to make sure gcc knows %edx is clobbered
    here.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index bccaa1c..3783539 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -28,11 +28,14 @@ static int detect_memory_e820(void)
 
 	do {
 		size = sizeof(struct e820entry);
-		id = SMAP;
+
+		/* Important: %edx is clobbered by some BIOSes,
+		   so it must be either used for the error output
+		   or explicitly marked clobbered. */
 		asm("int $0x15; setc %0"
-		    : "=am" (err), "+b" (next), "+d" (id), "+c" (size),
+		    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
 		      "=m" (*desc)
-		    : "D" (desc), "a" (0xe820));
+		    : "D" (desc), "d" (SMAP), "a" (0xe820));
 
 		/* Some BIOSes stop returning SMAP in the middle of
 		   the search loop.  We don't know exactly how the BIOS


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kernel.spec	28 Sep 2007 02:36:06 -0000	1.196
+++ kernel.spec	28 Sep 2007 20:34:48 -0000	1.197
@@ -581,6 +581,7 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
+Patch77: linux-2.6-x86-setup-e820-workaround.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -1020,6 +1021,8 @@
 ApplyPatch linux-2.6-x86-debug-boot.patch
 # shorter i386 oops reports (scheduled for 2.6.24)
 ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
+# fix e820 detection
+ApplyPatch linux-2.6-x86-setup-e820-workaround.patch
 
 #
 # PowerPC
@@ -1814,6 +1817,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Chuck Ebbert <cebbert at redhat.com>
+- fix X86 memory detection (bz #311491)
+
 * Fri Sep 28 2007 Dave Airlie <airlied at redhat.com>
 - Add i965 drm patch to fix vblank interrupts - should be upstream soon
 



From fedora-extras-commits at redhat.com  Fri Sep 28 20:36:09 2007
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Fri, 28 Sep 2007 16:36:09 -0400
Subject: rpms/java-1.7.0-icedtea/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200709282036.l8SKa9nj015342@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15295

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded mauve_output log




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Sep 2007 19:19:37 -0000	1.8
+++ .cvsignore	28 Sep 2007 20:35:36 -0000	1.9
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
+mauve_output


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Sep 2007 20:33:17 -0000	1.8
+++ sources	28 Sep 2007 20:35:36 -0000	1.9
@@ -1,4 +1,6 @@
 1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
+d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+c78b32f88b61b3645da34179fbb5ece0  mauve_output



From fedora-extras-commits at redhat.com  Fri Sep 28 20:37:37 2007
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Fri, 28 Sep 2007 16:37:37 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.11,
	1.12
Message-ID: <200709282037.l8SKbbpG015379@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15357

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Third try's a charm.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-python2-extras.spec	28 Sep 2007 20:27:48 -0000	1.11
+++ gnome-python2-extras.spec	28 Sep 2007 20:37:05 -0000	1.12
@@ -35,7 +35,7 @@
 
 ### Build Dependencies ###
 
-BuildRequires: anjuta-gdl >= %{anjuta_gdl_version}
+BuildRequires: anjuta-gdl-devel >= %{anjuta_gdl_version}
 BuildRequires: firefox-devel = %{firefox_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}



From fedora-extras-commits at redhat.com  Fri Sep 28 21:00:31 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 17:00:31 -0400
Subject: rpms/i810switch/FC-6 i810switch.spec,1.9,1.10
Message-ID: <200709282100.l8SL0VKw016872@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16718

Modified Files:
	i810switch.spec 
Log Message:
add i945 detection, fixes BZ297371


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-6/i810switch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810switch.spec	2 Oct 2006 20:43:50 -0000	1.9
+++ i810switch.spec	28 Sep 2007 20:59:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -8,6 +8,7 @@
 URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
 Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
+Patch1: i810switch-0.6.5-add-i945.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q
-%patch -p1 -b .buildroot
+%patch0 -p1 -b .buildroot
+%patch1 -p1 -b .i945
 make clean
 
 %build
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 28 2007 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-6
+- add i945 detection, fixes BZ297371
+
 * Mon Oct 02 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:01:15 2007
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Fri, 28 Sep 2007 17:01:15 -0400
Subject: rpms/i810switch/FC-6 i810switch-0.6.5-add-i945.patch,NONE,1.1
Message-ID: <200709282101.l8SL1FTq023031@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22931

Added Files:
	i810switch-0.6.5-add-i945.patch 
Log Message:
add i945 support

i810switch-0.6.5-add-i945.patch:

--- NEW FILE i810switch-0.6.5-add-i945.patch ---
--- i810switch-0.6.5/i810switch.c	2005-06-12 06:36:36.000000000 +0200
+++ i810switch-0.6.5/i810switch.c	2007-05-12 17:54:57.000000000 +0200
@@ -60,6 +60,7 @@
 #define I855STR			"8086:3582"
 //#define I865STR			"8086:2572"
 #define I915STR			"8086:2592"
+#define I945STR                 "8086:27a2"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"
 
@@ -272,7 +273,9 @@
 			return p;
 		}
 
-		i = (p = strstr(*buff_ptr, I855STR)) != NULL;
+		i = (p = strstr(*buff_ptr, I855STR)) != NULL ||
+                (p = strstr(*buff_ptr, I945STR)) != NULL;
+
 		if (i)
 		{
 			*chiptype = I855;



From fedora-extras-commits at redhat.com  Fri Sep 28 21:03:30 2007
From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens))
Date: Fri, 28 Sep 2007 17:03:30 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.449, 1.450 anaconda.spec, 1.585, 
	1.586 sources, 1.578, 1.579
Message-ID: <200709282103.l8SL3Ulq023289@cvs-int.fedora.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23144

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- .cvsignore	27 Sep 2007 22:02:49 -0000	1.449
+++ .cvsignore	28 Sep 2007 21:02:58 -0000	1.450
@@ -1 +1 @@
-anaconda-11.3.0.35.tar.bz2
+anaconda-11.3.0.36.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- anaconda.spec	27 Sep 2007 22:02:49 -0000	1.585
+++ anaconda.spec	28 Sep 2007 21:02:58 -0000	1.586
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.3.0.35
+Version: 11.3.0.36
 Release: 1
 License: GPLv2
 Group:   Applications/System
@@ -213,6 +213,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 28 2007 Chris Lumens <clumens at redhat.com> 11.3.0.36-1
+- Fix rescue CD + nfs tree as well.
+- More wireless driver blacklist fixing (katzj).
+
 * Thu Sep 27 2007 Jeremy Katz <katzj at redhat.com> 11.3.0.35-1
 - Support modname.option=value for passing options to kernel modules
 - Fix rescue CD + nfsiso (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- sources	27 Sep 2007 22:02:49 -0000	1.578
+++ sources	28 Sep 2007 21:02:58 -0000	1.579
@@ -1 +1 @@
-cfa6cb69f049ec352fb3c0d6b6301c81  anaconda-11.3.0.35.tar.bz2
+6ea4859bf0bfdc62c21006363b01b435  anaconda-11.3.0.36.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 21:16:04 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Fri, 28 Sep 2007 17:16:04 -0400
Subject: rpms/cups/devel .cvsignore, 1.35, 1.36 cups.spec, 1.364,
	1.365 sources, 1.38, 1.39
Message-ID: <200709282116.l8SLG4Tl025790@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565

Modified Files:
	.cvsignore cups.spec sources 
Log Message:
* Fri Sep 28 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.3-1
- 1.3.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	19 Sep 2007 11:02:14 -0000	1.35
+++ .cvsignore	28 Sep 2007 21:15:32 -0000	1.36
@@ -27,3 +27,4 @@
 cups-1.3rc2-source.tar.bz2
 cups-1.3.0-source.tar.bz2
 cups-1.3.2-source.tar.bz2
+cups-1.3.3-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- cups.spec	25 Sep 2007 10:24:22 -0000	1.364
+++ cups.spec	28 Sep 2007 21:15:32 -0000	1.365
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -447,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 28 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.3-1
+- 1.3.3.
+
 * Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
 - Don't strip foomatic recommended strings from make/model names.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	19 Sep 2007 11:02:14 -0000	1.38
+++ sources	28 Sep 2007 21:15:32 -0000	1.39
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-0f5f95847d7ca209da25936e47699bfe  cups-1.3.2-source.tar.bz2
+d4911e68b6979d16bc7a55f68d16cc53  cups-1.3.3-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Sep 28 21:18:33 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 28 Sep 2007 17:18:33 -0400
Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.12,
 1.13 sources, 1.7, 1.8
In-Reply-To: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>
References: <200709282033.l8SKXnUB015221@cvs-int.fedora.redhat.com>
Message-ID: <46FD6FA9.7070006@redhat.com>

Lillian Angel wrote:
> Author: langel
> 
> Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15145
> 
> Modified Files:
> 	java-1.7.0-icedtea.spec sources 
> Log Message:
> * Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
> - Fixed testing. Output is stored in a file and passes/debug info is not shown.
> 
> 
> 
> 
> Index: java-1.7.0-icedtea.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -r1.12 -r1.13
> --- java-1.7.0-icedtea.spec	27 Sep 2007 18:44:55 -0000	1.12
> +++ java-1.7.0-icedtea.spec	28 Sep 2007 20:33:17 -0000	1.13
> @@ -113,6 +113,7 @@
>  Source5:  README.plugin
>  Source6:  mauve-%{mauvedate}.tar.gz
>  Source7:  mauve_tests
> +Source8:  mauve_output
>  Patch0:   java-1.7.0-icedtea-makefile.patch
>  Patch1:   java-1.7.0-icedtea-jhat.patch
>  Patch2:   java-1.7.0-icedtea-win32.patch
> @@ -300,7 +301,7 @@
>    make
>    echo ====================MAUVE TESTING========================
>    $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
> -    -showpasses -debug -timeout 30000 2>&1 || :
> +	-timeout 30000 2>&1 | tee %{SOURCE8}
>    echo ====================MAUVE TESTING END====================
>  popd
>  
> @@ -732,6 +733,9 @@
>  %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
>  
>  %changelog
> +* Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
> +- Fixed testing. Output is stored in a file and passes/debug info is not shown.

You can't store the output back into the source file -- that violates the 
"pristine source" rpm philosophy (not to mention that mock likely makes the 
source read-only so the build would fail).  I meant include it in the files 
list, probably as %doc.  In any case, don't build this into Rawhide, for 
stability reasons.  Just wait until sometime next week when F8t3 is out.

Tom



From fedora-extras-commits at redhat.com  Fri Sep 28 21:27:39 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Fri, 28 Sep 2007 17:27:39 -0400
Subject: rpms/gcc/devel gcc41-virtual-inline-backtrace.patch, NONE,
	1.1 gcc41.spec, 1.177, 1.178
Message-ID: <200709282127.l8SLRdcR026346@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26296

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-virtual-inline-backtrace.patch 
Log Message:
4.1.2-29

gcc41-virtual-inline-backtrace.patch:

--- NEW FILE gcc41-virtual-inline-backtrace.patch ---
2007-09-27  Jakub Jelinek  <jakub at redhat.com>

	* builtins.c (expand_builtin, expand_builtin_object_size,
	expand_builtin_memory_chk, maybe_emit_chk_warning,
	maybe_emit_sprintf_chk_warning): Use new %K format string specifier
	for diagnostics.
	* expr.c (expand_expr_real_1): Likewise.
	* langhooks-def.h (struct diagnostic_info): Add forward decl.
	(lhd_print_error_function): Add third argument.
	* langhooks.h (struct diagnostic_info): Add forward decl.
	(struct lang_hooks): Add third argument to print_error_function.
	* diagnostic.h (diagnostic_info): Add abstract_origin field.
	(diagnostic_last_function_changed, diagnostic_set_last_function): Add
	second argument.
	(diagnostic_report_current_function): Likewise.
	* toplev.c (announce_function): Pass NULL as second argument to
	diagnostic_set_last_function.
	* diagnostic.c (diagnostic_report_current_function): Add second
	argument, pass it as third argument to lang_hooks.print_error_function.
	(default_diagnostic_starter): Pass DIAGNOSTIC as second argument
	to diagnostic_report_current_function.
	(diagnostic_report_diagnostic): Initialize diagnostic->abstract_origin
	and message.abstract_origin.
	(verbatim): Initialize abstract_origin.
	* pretty-print.h (text_info): Add abstract_origin field.
	* pretty-print.c (pp_base_format): Handle %K.
	* langhooks.c (lhd_print_error_function): Add third argument.  If
	diagnostic->abstract_origin, print virtual backtrace.
	* c-format.c (gcc_diag_char_table, gcc_tdiag_char_table,
	gcc_cdiag_char_table, gcc_cxxdiag_char_table): Support %K.
	(init_dynamic_diag_info): Likewise.
cp/
	* error.c (cxx_print_error_function): Add third argument, pass
	it over to lhd_print_error_function.
	(cp_print_error_function): If diagnostic->abstract_origin, print
	virtual backtrace.
	* cp-tree.h (struct diagnostic_info): New forward decl.
	(cxx_print_error_function): Add third argument.
testsuite/
	* lib/prune.exp: Prune also "^In function .*$" lines and
	"^    inlined from .*$" lines.
java/
	* lang.c (java_print_error_function): Add third argument.

--- gcc/java/lang.c.jj	2007-02-20 22:35:09.000000000 +0100
+++ gcc/java/lang.c	2007-09-28 22:47:38.000000000 +0200
@@ -55,7 +55,8 @@ static bool java_post_options (const cha
 static int java_handle_option (size_t scode, const char *arg, int value);
 static void put_decl_string (const char *, int);
 static void put_decl_node (tree);
-static void java_print_error_function (diagnostic_context *, const char *);
+static void java_print_error_function (diagnostic_context *, const char *,
+				       diagnostic_info *);
 static tree java_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
 					      void *, struct pointer_set_t *);
 static int merge_init_test_initialization (void * *, void *);
@@ -511,7 +512,8 @@ static GTY(()) tree last_error_function_
 static GTY(()) tree last_error_function;
 static void
 java_print_error_function (diagnostic_context *context ATTRIBUTE_UNUSED,
-			   const char *file)
+			   const char *file,
+			   diagnostic_info *diagnostic ATTRIBUTE_UNUSED)
 {
   /* Don't print error messages with bogus function prototypes.  */
   if (inhibit_error_function_printing)
--- gcc/diagnostic.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/diagnostic.c	2007-09-28 22:45:19.000000000 +0200
@@ -272,10 +272,11 @@ diagnostic_action_after_output (diagnost
 /* Prints out, if necessary, the name of the current function
    that caused an error.  Called from all error and warning functions.  */
 void
-diagnostic_report_current_function (diagnostic_context *context)
+diagnostic_report_current_function (diagnostic_context *context,
+				    diagnostic_info *diagnostic)
 {
   diagnostic_report_current_module (context);
-  lang_hooks.print_error_function (context, input_filename);
+  lang_hooks.print_error_function (context, input_filename, diagnostic);
 }
 
 void
@@ -313,7 +314,7 @@ static void
 default_diagnostic_starter (diagnostic_context *context,
 			    diagnostic_info *diagnostic)
 {
-  diagnostic_report_current_function (context);
+  diagnostic_report_current_function (context, diagnostic);
   pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic));
 }
 
@@ -361,6 +362,8 @@ diagnostic_report_diagnostic (diagnostic
 		      " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
 
       diagnostic->message.locus = &diagnostic->location;
+      diagnostic->message.abstract_origin = &diagnostic->abstract_origin;
+      diagnostic->abstract_origin = NULL;
       pp_format (context->printer, &diagnostic->message);
       (*diagnostic_starter (context)) (context, diagnostic);
       pp_output_formatted_text (context->printer);
@@ -368,6 +371,7 @@ diagnostic_report_diagnostic (diagnostic
       pp_flush (context->printer);
       diagnostic_action_after_output (context, diagnostic);
       diagnostic->message.format_spec = saved_format_spec;
+      diagnostic->abstract_origin = NULL;
     }
 
   context->lock--;
@@ -419,6 +423,7 @@ verbatim (const char *gmsgid, ...)
   text.args_ptr = &ap;
   text.format_spec = _(gmsgid);
   text.locus = NULL;
+  text.abstract_origin = NULL;
   pp_format_verbatim (global_dc->printer, &text);
   pp_flush (global_dc->printer);
   va_end (ap);
--- gcc/builtins.c.jj	2007-09-25 12:26:50.000000000 +0200
+++ gcc/builtins.c	2007-09-28 22:47:00.000000000 +0200
@@ -5982,13 +5982,13 @@ expand_builtin (tree exp, rtx target, rt
     case BUILT_IN_VA_ARG_PACK:
       /* All valid uses of __builtin_va_arg_pack () are removed during
 	 inlining.  */
-      error ("invalid use of %<__builtin_va_arg_pack ()%>");
+      error ("%Kinvalid use of %<__builtin_va_arg_pack ()%>", exp);
       return const0_rtx;
 
     case BUILT_IN_VA_ARG_PACK_LEN:
       /* All valid uses of __builtin_va_arg_pack_len () are removed during
 	 inlining.  */
-      error ("invalid use of %<__builtin_va_arg_pack_len ()%>");
+      error ("%Kinvalid use of %<__builtin_va_arg_pack_len ()%>", exp);
       return const0_rtx;
 
       /* Return the address of the first anonymous stack arg.  */
@@ -10286,12 +10286,11 @@ expand_builtin_object_size (tree exp)
   int object_size_type;
   tree fndecl = get_callee_fndecl (exp);
   tree arglist = TREE_OPERAND (exp, 1);
-  location_t locus = EXPR_LOCATION (exp);
 
   if (!validate_arglist (arglist, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE))
     {
-      error ("%Hfirst argument of %D must be a pointer, second integer constant",
-	     &locus, fndecl);
+      error ("%Kfirst argument of %D must be a pointer, second integer constant",
+	     exp, fndecl);
       expand_builtin_trap ();
       return const0_rtx;
     }
@@ -10303,8 +10302,8 @@ expand_builtin_object_size (tree exp)
       || tree_int_cst_sgn (ost) < 0
       || compare_tree_int (ost, 3) > 0)
     {
-      error ("%Hlast argument of %D is not integer constant between 0 and 3",
-	     &locus, fndecl);
+      error ("%Klast argument of %D is not integer constant between 0 and 3",
+	     exp, fndecl);
       expand_builtin_trap ();
       return const0_rtx;
     }
@@ -10348,9 +10347,8 @@ expand_builtin_memory_chk (tree exp, rtx
 
       if (! integer_all_onesp (size) && tree_int_cst_lt (size, len))
 	{
-	  location_t locus = EXPR_LOCATION (exp);
-	  warning (0, "%Hcall to %D will always overflow destination buffer",
-		   &locus, get_callee_fndecl (exp));
+	  warning (0, "%Kcall to %D will always overflow destination buffer",
+		   exp, get_callee_fndecl (exp));
 	  return 0;
 	}
 
@@ -10463,7 +10461,6 @@ maybe_emit_chk_warning (tree exp, enum b
   int arg_mask, is_strlen = 0;
   tree arglist = TREE_OPERAND (exp, 1), a;
   tree len, size;
-  location_t locus;
 
   switch (fcode)
     {
@@ -10525,9 +10522,8 @@ maybe_emit_chk_warning (tree exp, enum b
       src = c_strlen (src, 1);
       if (! src || ! host_integerp (src, 1))
 	{
-	  locus = EXPR_LOCATION (exp);
-	  warning (0, "%Hcall to %D might overflow destination buffer",
-		   &locus, get_callee_fndecl (exp));
+	  warning (0, "%Kcall to %D might overflow destination buffer",
+		   exp, get_callee_fndecl (exp));
 	  return;
 	}
       else if (tree_int_cst_lt (src, size))
@@ -10536,9 +10532,8 @@ maybe_emit_chk_warning (tree exp, enum b
   else if (! host_integerp (len, 1) || ! tree_int_cst_lt (size, len))
     return;
 
-  locus = EXPR_LOCATION (exp);
-  warning (0, "%Hcall to %D will always overflow destination buffer",
-	   &locus, get_callee_fndecl (exp));
+  warning (0, "%Kcall to %D will always overflow destination buffer",
+	   exp, get_callee_fndecl (exp));
 }
 
 /* Emit warning if a buffer overflow is detected at compile time
@@ -10604,9 +10599,8 @@ maybe_emit_sprintf_chk_warning (tree exp
 
   if (! tree_int_cst_lt (len, size))
     {
-      location_t locus = EXPR_LOCATION (exp);
-      warning (0, "%Hcall to %D will always overflow destination buffer",
-	       &locus, get_callee_fndecl (exp));
+      warning (0, "%Kcall to %D will always overflow destination buffer",
+	       exp, get_callee_fndecl (exp));
     }
 }
 
--- gcc/diagnostic.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/diagnostic.h	2007-09-28 22:45:58.000000000 +0200
@@ -37,10 +37,13 @@ typedef enum
 /* A diagnostic is described by the MESSAGE to send, the FILE and LINE of
    its context and its KIND (ice, error, warning, note, ...)  See complete
    list in diagnostic.def.  */
-typedef struct
+typedef struct diagnostic_info
 {
   text_info message;
   location_t location;
+  /* TREE_BLOCK if the diagnostic is to be reported in some inline
+     function inlined into other function, otherwise NULL.  */
+  tree abstract_origin;
   /* The kind of diagnostic it is about.  */
   diagnostic_t kind;
   /* Which OPT_* directly controls this diagnostic.  */
@@ -130,13 +133,15 @@ struct diagnostic_context
 
 /* True if the last function in which a diagnostic was reported is
    different from the current one.  */
-#define diagnostic_last_function_changed(DC) \
-  ((DC)->last_function != current_function_decl)
+#define diagnostic_last_function_changed(DC, DI) \
+  ((DC)->last_function != ((DI)->abstract_origin \
+			   ? (DI)->abstract_origin : current_function_decl))
 
 /* Remember the current function as being the last one in which we report
    a diagnostic.  */
-#define diagnostic_set_last_function(DC) \
-  (DC)->last_function = current_function_decl
+#define diagnostic_set_last_function(DC, DI) \
+  (DC)->last_function = (((DI) && (DI)->abstract_origin) \
+			 ? (DI)->abstract_origin : current_function_decl)
 
 /* True if the last module or file in which a diagnostic was reported is
    different from the current one.  */
@@ -178,7 +183,8 @@ extern diagnostic_context *global_dc;
 /* Diagnostic related functions.  */
 extern void diagnostic_initialize (diagnostic_context *);
 extern void diagnostic_report_current_module (diagnostic_context *);
-extern void diagnostic_report_current_function (diagnostic_context *);
+extern void diagnostic_report_current_function (diagnostic_context *,
+						diagnostic_info *);
 extern void diagnostic_report_diagnostic (diagnostic_context *,
 					  diagnostic_info *);
 #ifdef ATTRIBUTE_GCC_DIAG
--- gcc/toplev.c.jj	2007-04-03 13:18:27.000000000 +0200
+++ gcc/toplev.c	2007-09-28 22:45:19.000000000 +0200
@@ -448,7 +448,7 @@ announce_function (tree decl)
 	fprintf (stderr, " %s", lang_hooks.decl_printable_name (decl, 2));
       fflush (stderr);
       pp_needs_newline (global_dc->printer) = true;
-      diagnostic_set_last_function (global_dc);
+      diagnostic_set_last_function (global_dc, (diagnostic_info *) NULL);
     }
 }
 
--- gcc/pretty-print.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/pretty-print.c	2007-09-28 22:45:19.000000000 +0200
@@ -188,6 +188,7 @@ pp_base_indent (pretty_printer *pp)
    %Ns: likewise, but length specified as constant in the format string.
    %H: location_t.
    %J: a decl tree, from which DECL_SOURCE_LOCATION will be recorded.
+   %K: a statement, from which EXPR_LOCATION and TREE_BLOCK will be recorded.
    Flag 'q': quote formatted text (must come immediately after '%').
 
    Arguments can be used sequentially, or through %N$ resp. *N$
@@ -487,6 +488,33 @@ pp_base_format (pretty_printer *pp, text
 	  }
 	  break;
 
+	case 'K':
+	  {
+	    tree t = va_arg (*text->args_ptr, tree), block;
+	    gcc_assert (text->locus != NULL);
+	    *text->locus = EXPR_LOCATION (t);
+	    gcc_assert (text->abstract_origin != NULL);
+	    block = TREE_BLOCK (t);
+	    *text->abstract_origin = NULL;
+	    while (block
+		   && TREE_CODE (block) == BLOCK
+		   && BLOCK_ABSTRACT_ORIGIN (block))
+	      {
+		tree ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		  ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		if (TREE_CODE (ao) == FUNCTION_DECL)
+		  {
+		    *text->abstract_origin = block;
+		    break;
+		  }
+		block = BLOCK_SUPERCONTEXT (block);
+	      }
+	  }
+	  break;
+
 	case '.':
 	  {
 	    int n;
--- gcc/pretty-print.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/pretty-print.h	2007-09-28 22:45:19.000000000 +0200
@@ -36,6 +36,7 @@ typedef struct
   va_list *args_ptr;
   int err_no;  /* for %m */
   location_t *locus;
+  tree *abstract_origin;
 } text_info;
 
 /* How often diagnostics are prefixed by their locations:
--- gcc/testsuite/lib/prune.exp.jj	2007-02-20 22:37:09.000000000 +0100
+++ gcc/testsuite/lib/prune.exp	2007-09-28 22:45:19.000000000 +0200
@@ -19,9 +19,10 @@
 proc prune_gcc_output { text } {
     #send_user "Before:$text\n"
 
-    regsub -all "(^|\n)\[^\n\]*: In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
+    regsub -all "(^|\n)(\[^\n\]*: )?In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*:   instantiated from \[^\n\]*" $text "" text
+    regsub -all "(^|\n)    inlined from \[^\n\]*" $text "" text
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
--- gcc/cp/error.c.jj	2007-09-25 11:15:31.000000000 +0200
+++ gcc/cp/error.c	2007-09-28 22:45:19.000000000 +0200
@@ -2150,9 +2150,10 @@ cv_to_string (tree p, int v)
 
 /* Langhook for print_error_function.  */
 void
-cxx_print_error_function (diagnostic_context *context, const char *file)
+cxx_print_error_function (diagnostic_context *context, const char *file,
+			  diagnostic_info *diagnostic)
 {
-  lhd_print_error_function (context, file);
+  lhd_print_error_function (context, file, diagnostic);
   pp_base_set_prefix (context->printer, file);
   maybe_print_instantiation_context (context);
 }
@@ -2180,23 +2181,105 @@ static void
 cp_print_error_function (diagnostic_context *context,
 			 diagnostic_info *diagnostic)
 {
-  if (diagnostic_last_function_changed (context))
+  if (diagnostic_last_function_changed (context, diagnostic))
     {
       const char *old_prefix = context->printer->prefix;
       const char *file = LOCATION_FILE (diagnostic->location);
-      char *new_prefix = file ? file_name_as_prefix (file) : NULL;
+      tree abstract_origin = diagnostic->abstract_origin;
+      char *new_prefix = (file && abstract_origin == NULL)
+			 ? file_name_as_prefix (file) : NULL;
 
       pp_base_set_prefix (context->printer, new_prefix);
 
       if (current_function_decl == NULL)
 	pp_base_string (context->printer, "At global scope:");
       else
-	pp_printf (context->printer, "In %s %qs:",
-		   function_category (current_function_decl),
-		   cxx_printable_name (current_function_decl, 2));
+	{
+	  tree fndecl, ao;
+
+	  if (abstract_origin)
+	    {
+	      ao = BLOCK_ABSTRACT_ORIGIN (abstract_origin);
+	      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		ao = BLOCK_ABSTRACT_ORIGIN (ao);
+	      gcc_assert (TREE_CODE (ao) == FUNCTION_DECL);
+	      fndecl = ao;
+	    }
+	  else
+	    fndecl = current_function_decl;
+
+	  pp_printf (context->printer, "In %s %qs",
+		     function_category (fndecl),
+		     cxx_printable_name (fndecl, 2));
+
+	  while (abstract_origin)
+	    {
+	      location_t *locus;
+	      tree block = abstract_origin;
+
+	      locus = &BLOCK_SOURCE_LOCATION (block);
+	      fndecl = NULL;
+	      block = BLOCK_SUPERCONTEXT (block);
+	      while (block && TREE_CODE (block) == BLOCK
+		     && BLOCK_ABSTRACT_ORIGIN (block))
+		{
+		  ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		  while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		    ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		  if (TREE_CODE (ao) == FUNCTION_DECL)
+		    {
+		      fndecl = ao;
+		      break;
+		    }
+		  else if (TREE_CODE (ao) != BLOCK)
+		    break;
+
+		  block = BLOCK_SUPERCONTEXT (block);
+		}
+	      if (fndecl)
+		abstract_origin = block;
+	      else
+		{
+		  while (block && TREE_CODE (block) == BLOCK)
+		    block = BLOCK_SUPERCONTEXT (block);
+
+		  if (TREE_CODE (block) == FUNCTION_DECL)
+		    fndecl = block;
+		  abstract_origin = NULL;
+		}
+	      if (fndecl)
+		{
+		  expanded_location s = expand_location (*locus);
+		  pp_base_character (context->printer, ',');
+		  pp_base_newline (context->printer);
+		  if (s.file != NULL)
+		    {
+#ifdef USE_MAPPED_LOCATION
+		      if (flag_show_column && s.column != 0)
+			pp_printf (context->printer,
+				   "    inlined from %qs at %s:%d:%d",
+				   cxx_printable_name (fndecl, 2),
+				   s.file, s.line, s.column);
+		      else
+#endif
+			pp_printf (context->printer,
+				   "    inlined from %qs at %s:%d",
+				   cxx_printable_name (fndecl, 2),
+				   s.file, s.line);
+
+		    }
+		  else
+		    pp_printf (context->printer, "    inlined from %qs",
+			       cxx_printable_name (fndecl, 2));
+		}
+	    }
+	  pp_base_character (context->printer, ':');
+	}
       pp_base_newline (context->printer);
 
-      diagnostic_set_last_function (context);
+      diagnostic_set_last_function (context, diagnostic);
       pp_base_destroy_prefix (context->printer);
       context->printer->prefix = old_prefix;
     }
--- gcc/cp/cp-tree.h.jj	2007-09-25 11:45:25.000000000 +0200
+++ gcc/cp/cp-tree.h	2007-09-28 22:45:19.000000000 +0200
@@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA.  */
 #include "c-common.h"
 #include "name-lookup.h"
 struct diagnostic_context;
+struct diagnostic_info;
 
 /* Usage of TREE_LANG_FLAG_?:
    0: IDENTIFIER_MARKED (IDENTIFIER_NODEs)
@@ -3832,7 +3833,8 @@ extern void cxx_print_decl			(FILE *, tr
 extern void cxx_print_type			(FILE *, tree, int);
 extern void cxx_print_identifier		(FILE *, tree, int);
 extern void cxx_print_error_function	(struct diagnostic_context *,
-						 const char *);
+						 const char *,
+						 struct diagnostic_info *);
 extern void build_self_reference		(void);
 extern int same_signature_p			(tree, tree);
 extern void warn_hidden				(tree);
--- gcc/c-format.c.jj	2007-09-25 12:27:55.000000000 +0200
+++ gcc/c-format.c	2007-09-28 22:50:35.000000000 +0200
@@ -547,7 +547,7 @@ static const format_char_info gcc_diag_c
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "J", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",    "",   NULL },
+  { "JK",  0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -570,7 +570,7 @@ static const format_char_info gcc_tdiag_
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "DFJT", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
+  { "DFJKT", 0, STD_C89, { T89_V, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -593,7 +593,7 @@ static const format_char_info gcc_cdiag_
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "DEFJT", 0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
+  { "DEFJKT", 0, STD_C89, { T89_V, BADLEN, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+", "",   NULL },
 
   { "<>'", 0, STD_C89, NOARGUMENTS, "",      "",   NULL },
   { "m",   0, STD_C89, NOARGUMENTS, "q",     "",   NULL },
@@ -616,7 +616,7 @@ static const format_char_info gcc_cxxdia
   { "H",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
 
   /* These will require a "tree" at runtime.  */
-  { "ADEFJTV",0,STD_C89,{ T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+#",   "",   NULL },
+  { "ADEFJKTV",0,STD_C89,{ T89_V, BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q+#",   "",   NULL },
 
   /* These accept either an 'int' or an 'enum tree_code' (which is handled as an 'int'.)  */
   { "CLOPQ",0,STD_C89, { T89_I,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "q",  "",   NULL },
@@ -2601,6 +2601,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (diag_fci, 'J');
 	  diag_fci[i].types[0].type = &t;
 	  diag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (diag_fci, 'K');
+	  diag_fci[i].types[0].type = &t;
+	  diag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_tdiag__ format specifics.  */
@@ -2625,6 +2628,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (tdiag_fci, 'J');
 	  tdiag_fci[i].types[0].type = &t;
 	  tdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (tdiag_fci, 'K');
+	  tdiag_fci[i].types[0].type = &t;
+	  tdiag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_cdiag__ format specifics.  */
@@ -2649,6 +2655,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (cdiag_fci, 'J');
 	  cdiag_fci[i].types[0].type = &t;
 	  cdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (cdiag_fci, 'K');
+	  cdiag_fci[i].types[0].type = &t;
+	  cdiag_fci[i].pointer_count = 1;
 	}
 
       /* Handle the __gcc_cxxdiag__ format specifics.  */
@@ -2673,6 +2682,9 @@ init_dynamic_diag_info (void)
 	  i = find_char_info_specifier_index (cxxdiag_fci, 'J');
 	  cxxdiag_fci[i].types[0].type = &t;
 	  cxxdiag_fci[i].pointer_count = 1;
+	  i = find_char_info_specifier_index (cxxdiag_fci, 'K');
+	  cxxdiag_fci[i].types[0].type = &t;
+	  cxxdiag_fci[i].pointer_count = 1;
 	}
     }
 }
--- gcc/expr.c.jj	2007-09-25 15:19:15.000000000 +0200
+++ gcc/expr.c	2007-09-28 22:45:19.000000000 +0200
@@ -7512,21 +7512,21 @@ expand_expr_real_1 (tree exp, rtx target
       /* All valid uses of __builtin_va_arg_pack () are removed during
 	 inlining.  */
       if (CALL_EXPR_VA_ARG_PACK (exp))
-	error ("invalid use of %<__builtin_va_arg_pack ()%>");
+	error ("%Kinvalid use of %<__builtin_va_arg_pack ()%>", exp);
       {
 	tree fndecl = get_callee_fndecl (exp), attr;
 
 	if (fndecl
 	    && (attr = lookup_attribute ("error",
 					 DECL_ATTRIBUTES (fndecl))) != NULL)
-	  error ("call to %qs declared with attribute error: %s",
-		 lang_hooks.decl_printable_name (fndecl, 1),
+	  error ("%Kcall to %qs declared with attribute error: %s",
+		 exp, lang_hooks.decl_printable_name (fndecl, 1),
 		 TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
 	if (fndecl
 	    && (attr = lookup_attribute ("warning",
 					 DECL_ATTRIBUTES (fndecl))) != NULL)
-	  warning (0, "call to %qs declared with attribute warning: %s",
-		   lang_hooks.decl_printable_name (fndecl, 1),
+	  warning (0, "%Kcall to %qs declared with attribute warning: %s",
+		   exp, lang_hooks.decl_printable_name (fndecl, 1),
 		   TREE_STRING_POINTER (TREE_VALUE (TREE_VALUE (attr))));
 
 	/* Check for a built-in function.  */
--- gcc/langhooks.c.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/langhooks.c	2007-09-28 22:45:19.000000000 +0200
@@ -494,12 +494,15 @@ lhd_initialize_diagnostics (struct diagn
 /* The default function to print out name of current function that caused
    an error.  */
 void
-lhd_print_error_function (diagnostic_context *context, const char *file)
+lhd_print_error_function (diagnostic_context *context, const char *file,
+			  diagnostic_info *diagnostic)
 {
-  if (diagnostic_last_function_changed (context))
+  if (diagnostic_last_function_changed (context, diagnostic))
     {
       const char *old_prefix = context->printer->prefix;
-      char *new_prefix = file ? file_name_as_prefix (file) : NULL;
+      tree abstract_origin = diagnostic->abstract_origin;
+      char *new_prefix = (file && abstract_origin == NULL)
+			 ? file_name_as_prefix (file) : NULL;
 
       pp_set_prefix (context->printer, new_prefix);
 
@@ -507,17 +510,95 @@ lhd_print_error_function (diagnostic_con
 	pp_printf (context->printer, _("At top level:"));
       else
 	{
-	  if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)
+	  tree fndecl, ao;
+
+	  if (abstract_origin)
+	    {
+	      ao = BLOCK_ABSTRACT_ORIGIN (abstract_origin);
+	      while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		ao = BLOCK_ABSTRACT_ORIGIN (ao);
+	      gcc_assert (TREE_CODE (ao) == FUNCTION_DECL);
+	      fndecl = ao;
+	    }
+	  else
+	    fndecl = current_function_decl;
+
+	  if (TREE_CODE (TREE_TYPE (fndecl)) == METHOD_TYPE)
 	    pp_printf
-	      (context->printer, _("In member function %qs:"),
-	       lang_hooks.decl_printable_name (current_function_decl, 2));
+	      (context->printer, _("In member function %qs"),
+	       lang_hooks.decl_printable_name (fndecl, 2));
 	  else
 	    pp_printf
-	      (context->printer, _("In function %qs:"),
-	       lang_hooks.decl_printable_name (current_function_decl, 2));
+	      (context->printer, _("In function %qs"),
+	       lang_hooks.decl_printable_name (fndecl, 2));
+
+	  while (abstract_origin)
+	    {
+	      location_t *locus;
+	      tree block = abstract_origin;
+
+	      locus = &BLOCK_SOURCE_LOCATION (block);
+	      fndecl = NULL;
+	      block = BLOCK_SUPERCONTEXT (block);
+	      while (block && TREE_CODE (block) == BLOCK
+		     && BLOCK_ABSTRACT_ORIGIN (block))
+		{
+		  ao = BLOCK_ABSTRACT_ORIGIN (block);
+
+		  while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao))
+		    ao = BLOCK_ABSTRACT_ORIGIN (ao);
+
+		  if (TREE_CODE (ao) == FUNCTION_DECL)
+		    {
+		      fndecl = ao;
+		      break;
+		    }
+		  else if (TREE_CODE (ao) != BLOCK)
+		    break;
+
+		  block = BLOCK_SUPERCONTEXT (block);
+		}
+	      if (fndecl)
+		abstract_origin = block;
+	      else
+		{
+		  while (block && TREE_CODE (block) == BLOCK)
+		    block = BLOCK_SUPERCONTEXT (block);
+
+		  if (TREE_CODE (block) == FUNCTION_DECL)
+		    fndecl = block;
+		  abstract_origin = NULL;
+		}
+	      if (fndecl)
+		{
+		  expanded_location s = expand_location (*locus);
+		  pp_character (context->printer, ',');
+		  pp_newline (context->printer);
+		  if (s.file != NULL)
+		    {
+#ifdef USE_MAPPED_LOCATION
+		      if (flag_show_column && s.column != 0)
+			pp_printf (context->printer,
+				   _("    inlined from %qs at %s:%d:%d"),
+				   lang_hooks.decl_printable_name (fndecl, 2),
+				   s.file, s.line, s.column);
+		      else
+#endif
+			pp_printf (context->printer,
+				   _("    inlined from %qs at %s:%d"),
+				   lang_hooks.decl_printable_name (fndecl, 2),
+				   s.file, s.line);
+
+		    }
+		  else
+		    pp_printf (context->printer, _("    inlined from %qs"),
+			       lang_hooks.decl_printable_name (fndecl, 2));
+		}
+	    }
+	  pp_character (context->printer, ':');
 	}
 
-      diagnostic_set_last_function (context);
+      diagnostic_set_last_function (context, diagnostic);
       pp_flush (context->printer);
       context->printer->prefix = old_prefix;
       free ((char*) new_prefix);
--- gcc/langhooks.h.jj	2007-02-20 22:39:12.000000000 +0100
+++ gcc/langhooks.h	2007-09-28 22:45:19.000000000 +0200
@@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA.  */
 /* This file should be #include-d after tree.h.  */
 
 struct diagnostic_context;
+struct diagnostic_info;
 
 struct gimplify_omp_ctx;
 
@@ -391,7 +392,8 @@ struct lang_hooks
   tree (*lang_get_callee_fndecl) (tree);
 
   /* Called by report_error_function to print out function name.  */
-  void (*print_error_function) (struct diagnostic_context *, const char *);
+  void (*print_error_function) (struct diagnostic_context *, const char *,
+				struct diagnostic_info *);
 
   /* Called from expr_size to calculate the size of the value of an
      expression in a language-dependent way.  Returns a tree for the size
--- gcc/langhooks-def.h.jj	2007-02-20 22:39:13.000000000 +0100
+++ gcc/langhooks-def.h	2007-09-28 22:45:19.000000000 +0200
@@ -25,6 +25,7 @@ Boston, MA 02110-1301, USA.  */
 #include "hooks.h"
 
 struct diagnostic_context;
+struct diagnostic_info;
 
 /* Provide a hook routine for alias sets that always returns 1.  This is
    used by languages that haven't deal with alias sets yet.  */
@@ -57,7 +58,7 @@ extern int lhd_types_compatible_p (tree,
 extern rtx lhd_expand_expr (tree, rtx, enum machine_mode, int, rtx *);
 extern int lhd_expand_decl (tree);
 extern void lhd_print_error_function (struct diagnostic_context *,
-				      const char *);
+				      const char *, struct diagnostic_info *);
 extern void lhd_set_decl_assembler_name (tree);
 extern bool lhd_can_use_bit_fields_p (void);
 extern bool lhd_warn_unused_global_decl (tree);


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gcc41.spec	25 Sep 2007 16:09:05 -0000	1.177
+++ gcc41.spec	28 Sep 2007 21:27:06 -0000	1.178
@@ -1,6 +1,6 @@
 %define DATE 20070925
 %define gcc_version 4.1.2
-%define gcc_release 28
+%define gcc_release 29
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -145,6 +145,7 @@
 Patch29: gcc41-jdwp.patch
 Patch30: gcc41-pr20880.patch
 Patch31: gcc41-pr32694.patch
+Patch32: gcc41-virtual-inline-backtrace.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -459,6 +460,7 @@
 %patch29 -p0 -b .jdwp~
 %patch30 -p0 -b .pr20880~
 %patch31 -p0 -b .pr32694~
+%patch32 -p0 -b .virtual-inline-backtrace~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1613,6 +1615,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Sep 28 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-29
+- print virtual inline backtrace in some diagnostic messages to help
+  locate bugs reported with -D_FORTIFY_SOURCE{,=2}
+
 * Tue Sep 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-28
 - update from gcc-4_1-branch (-r127672:128736)
   - PRs bootstrap/33418, c++/31941, c++/32113, java/31842, target/33256,



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:15 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:15 -0700
Subject: [pkgdb] lybniz was added for firewing
Message-ID: <200709282129.l8SLTKid029327@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package lybniz with summary A function graph plotter
Kevin Fenzi (kevin) has approved Package lybniz
Kevin Fenzi (kevin) has added a Fedora devel branch for lybniz with an owner of firewing
Kevin Fenzi (kevin) has approved lybniz in Fedora devel
Kevin Fenzi (kevin) has approved Package lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, 6) updated by kevin
Message-ID: <200709282129.l8SLTdkN029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, devel) updated by kevin
Message-ID: <200709282129.l8SLTdkQ029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:29:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:29:34 -0700
Subject: [pkgdb] lybniz (Fedora, 7) updated by kevin
Message-ID: <200709282129.l8SLTdkT029352@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for lybniz
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lybniz (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on lybniz (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/lybniz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:25 -0400
Subject: rpms/lybniz - New directory
Message-ID: <200709282130.l8SLUPQ1026616@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz

Log Message:
Directory /cvs/extras/rpms/lybniz added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:30 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:30 -0400
Subject: rpms/lybniz/devel - New directory
Message-ID: <200709282130.l8SLUUe5026630@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz/devel

Log Message:
Directory /cvs/extras/rpms/lybniz/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:32 -0400
Subject: rpms/lybniz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282130.l8SLUW8K026656@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz

Added Files:
	Makefile import.log 
Log Message:
Setup of module lybniz


--- NEW FILE Makefile ---
# Top level Makefile for module lybniz
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:30:34 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:30:34 -0400
Subject: rpms/lybniz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709282130.l8SLUY0L026673@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26576/rpms/lybniz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lybniz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: lybniz
# $Id: Makefile,v 1.1 2007/09/28 21:30:32 kevin Exp $
NAME := lybniz
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:31:34 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:31:34 -0700
Subject: [pkgdb] aboot was added for oliver
Message-ID: <200709282131.l8SLVdgO029552@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package aboot with summary A bootloader which can be started from the SRM console
Kevin Fenzi (kevin) has approved Package aboot
Kevin Fenzi (kevin) has added a Fedora devel branch for aboot with an owner of oliver
Kevin Fenzi (kevin) has approved aboot in Fedora devel
Kevin Fenzi (kevin) has approved Package aboot
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on aboot (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on aboot (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on aboot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aboot



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:31:35 -0700
Subject: [pkgdb] aboot (Fedora, devel) updated by kevin
Message-ID: <200709282131.l8SLVdgR029552@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on aboot (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aboot



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:47 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:47 -0400
Subject: rpms/aboot - New directory
Message-ID: <200709282131.l8SLVlAW026976@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot

Log Message:
Directory /cvs/extras/rpms/aboot added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:52 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:52 -0400
Subject: rpms/aboot/devel - New directory
Message-ID: <200709282131.l8SLVqbW026991@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot/devel

Log Message:
Directory /cvs/extras/rpms/aboot/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:55 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:55 -0400
Subject: rpms/aboot Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282131.l8SLVtW3027018@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot

Added Files:
	Makefile import.log 
Log Message:
Setup of module aboot


--- NEW FILE Makefile ---
# Top level Makefile for module aboot
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:31:57 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:31:57 -0400
Subject: rpms/aboot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200709282131.l8SLVv85027037@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN26947/rpms/aboot/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aboot


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: aboot
# $Id: Makefile,v 1.1 2007/09/28 21:31:56 kevin Exp $
NAME := aboot
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:32:30 2007
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Fri, 28 Sep 2007 17:32:30 -0400
Subject: rpms/sysprof-kmod/F-7 sysprof-kmod.spec,1.85,1.86
Message-ID: <200709282132.l8SLWUTb027085@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.22.9-91.fc7


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-7/sysprof-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sysprof-kmod.spec	27 Sep 2007 20:15:46 -0000	1.85
+++ sysprof-kmod.spec	28 Sep 2007 21:31:58 -0000	1.86
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.7-85.fc7}
+%{!?kversion: %define kversion 2.6.22.9-91.fc7}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:08 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:33:08 -0400
Subject: rpms/cobbler/devel .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282133.l8SLX8Kg027155@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27084

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:26:04 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:32:35 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:26:04 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:32:35 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:26:04 -0000	1.27
+++ sources	28 Sep 2007 21:32:35 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:33:27 -0700
Subject: [pkgdb] quilt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709282133.l8SLXWcT029761@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for quilt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quilt (Fedora EPEL 5)
Kevin Fenzi (kevin) changed owner of quilt in Fedora EPEL 5 to jwboyer
Kevin Fenzi (kevin) approved watchbugzilla on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved watchcommits on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved commit on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved build on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved approveacls on quilt (Fedora EPEL 5) for markmc
Kevin Fenzi (kevin) approved checkout on quilt (Fedora EPEL 5) for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:27 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:33:27 -0700
Subject: [pkgdb] quilt (Fedora EPEL, 4) updated by kevin
Message-ID: <200709282133.l8SLXWcX029761@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for quilt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quilt (Fedora EPEL 4)
Kevin Fenzi (kevin) changed owner of quilt in Fedora EPEL 4 to jwboyer
Kevin Fenzi (kevin) approved watchbugzilla on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved watchcommits on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved commit on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved build on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved approveacls on quilt (Fedora EPEL 4) for markmc
Kevin Fenzi (kevin) approved checkout on quilt (Fedora EPEL 4) for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From fedora-extras-commits at redhat.com  Fri Sep 28 21:33:56 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:33:56 -0400
Subject: rpms/cobbler/F-7 .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282133.l8SLXu8K027391@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:28:07 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:33:23 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:28:07 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:33:23 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:28:07 -0000	1.27
+++ sources	28 Sep 2007 21:33:23 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:35:20 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:35:20 -0400
Subject: rpms/cobbler/FC-6 .cvsignore, 1.29, 1.30 cobbler.spec, 1.32,
	1.33 sources, 1.30, 1.31
Message-ID: <200709282135.l8SLZKUA027428@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27403

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Aug 2007 16:29:32 -0000	1.29
+++ .cvsignore	28 Sep 2007 21:34:47 -0000	1.30
@@ -26,3 +26,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cobbler.spec	30 Aug 2007 16:29:32 -0000	1.32
+++ cobbler.spec	28 Sep 2007 21:34:47 -0000	1.33
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2007 16:29:32 -0000	1.30
+++ sources	28 Sep 2007 21:34:47 -0000	1.31
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:08 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:36:08 -0400
Subject: rpms/cobbler/EL-5 .cvsignore, 1.29, 1.30 cobbler.spec, 1.32,
	1.33 sources, 1.30, 1.31
Message-ID: <200709282136.l8SLa8hG027466@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27434

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Aug 2007 16:31:08 -0000	1.29
+++ .cvsignore	28 Sep 2007 21:35:35 -0000	1.30
@@ -26,3 +26,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cobbler.spec	30 Aug 2007 16:31:08 -0000	1.32
+++ cobbler.spec	28 Sep 2007 21:35:35 -0000	1.33
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2007 16:31:08 -0000	1.30
+++ sources	28 Sep 2007 21:35:35 -0000	1.31
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:20 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:20 -0700
Subject: [pkgdb] quake3 was added for jwrdegoede
Message-ID: <200709282136.l8SLaPIs029982@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package quake3 with summary Quake 3 Arena tournament 3D shooter game
Kevin Fenzi (kevin) has approved Package quake3
Kevin Fenzi (kevin) has added a Fedora devel branch for quake3 with an owner of jwrdegoede
Kevin Fenzi (kevin) has approved quake3 in Fedora devel
Kevin Fenzi (kevin) has approved Package quake3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quake3 (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quake3 (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quake3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:29 -0700
Subject: [pkgdb] quake3 (Fedora, devel) updated by kevin
Message-ID: <200709282136.l8SLaY9k030007@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on quake3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:36:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Fri, 28 Sep 2007 14:36:29 -0700
Subject: [pkgdb] quake3 (Fedora, 7) updated by kevin
Message-ID: <200709282136.l8SLaY9n030007@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for quake3
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on quake3 (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on quake3 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/quake3



From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:01 -0400
Subject: rpms/quake3 - New directory
Message-ID: <200709282137.l8SLb1rn027523@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3

Log Message:
Directory /cvs/extras/rpms/quake3 added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:07 -0400
Subject: rpms/quake3/devel - New directory
Message-ID: <200709282137.l8SLb7wl027532@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3/devel

Log Message:
Directory /cvs/extras/rpms/quake3/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:10 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:10 -0400
Subject: rpms/quake3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709282137.l8SLbAjV027563@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3

Added Files:
	Makefile import.log 
Log Message:
Setup of module quake3


--- NEW FILE Makefile ---
# Top level Makefile for module quake3
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Sep 28 21:37:13 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 28 Sep 2007 17:37:13 -0400
Subject: rpms/quake3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709282137.l8SLbDFm027579@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP27492/rpms/quake3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module quake3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: quake3
# $Id: Makefile,v 1.1 2007/09/28 21:37:11 kevin Exp $
NAME := quake3
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 fedora-extras-commits at redhat.com  Fri Sep 28 21:38:30 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 17:38:30 -0400
Subject: rpms/gdm/devel gdm.spec,1.295,1.296
Message-ID: <200709282138.l8SLcUix027707@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27677

Modified Files:
	gdm.spec 
Log Message:
- drop redhat-artwork dep, add fedorainfinity-gdm-theme dep



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gdm.spec	28 Sep 2007 18:08:52 -0000	1.295
+++ gdm.spec	28 Sep 2007 21:37:57 -0000	1.296
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -78,7 +78,7 @@
 Requires: usermode
 Requires: /sbin/nologin
 Requires: system-logos
-Requires: redhat-artwork >= 5.0.11-1
+Requires: fedorainfinity-gdm-theme 
 Requires: xorg-x11-server-utils
 Requires: xorg-x11-xkb-utils
 Requires: xorg-x11-xinit
@@ -361,6 +361,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-9
+- drop redhat-artwork dep, add fedorainfinity-gdm-theme dep
+
 * Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-8
 - Another crack at 240853
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:41:27 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:41:27 -0400
Subject: rpms/cobbler/EL-4 .cvsignore, 1.25, 1.26 cobbler.spec, 1.30,
	1.31 sources, 1.27, 1.28
Message-ID: <200709282141.l8SLfR5g027833@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27811

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Aug 2007 16:38:41 -0000	1.25
+++ .cvsignore	28 Sep 2007 21:40:55 -0000	1.26
@@ -22,3 +22,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cobbler.spec	30 Aug 2007 16:38:41 -0000	1.30
+++ cobbler.spec	28 Sep 2007 21:40:55 -0000	1.31
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %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/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Aug 2007 16:38:41 -0000	1.27
+++ sources	28 Sep 2007 21:40:55 -0000	1.28
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:42:54 2007
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Fri, 28 Sep 2007 17:42:54 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.165,1.166
Message-ID: <200709282142.l8SLgscE027880@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27846

Modified Files:
	nautilus.spec 
Log Message:
- drop redhat-artwork dep. Alex says we don't need it anymore 



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- nautilus.spec	18 Sep 2007 16:23:17 -0000	1.165
+++ nautilus.spec	28 Sep 2007 21:42:22 -0000	1.166
@@ -10,7 +10,6 @@
 %define desktop_file_utils_version 0.7
 %define gnome_desktop_version 2.9.91
 %define redhat_menus_version 0.25
-%define redhat_artwork_version 0.41
 %define gnome_vfs2_version 2.19.3
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
@@ -30,7 +29,6 @@
 Requires:       filesystem >= 2.1.1-1
 Requires:       desktop-backgrounds-basic >= %{desktop_backgrounds_version}
 Requires:       redhat-menus >= %{redhat_menus_version}
-Requires:       redhat-artwork >= %{redhat_artwork_version}
 Requires:       gnome-vfs2 >= %{gnome_vfs2_version}
 Requires:       gnome-vfs2-smb
 Requires:       eel2 >= %{eel2_version}
@@ -221,6 +219,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Sep 28 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-2
+- drop redhat-artwork dep. Alex says we don't need it anymore 
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:43:34 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:43:34 -0400
Subject: rpms/koan/devel .cvsignore, 1.15, 1.16 koan.spec, 1.23, 1.24 sources,
	1.18, 1.19
Message-ID: <200709282143.l8SLhYGP027908@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Aug 2007 21:43:08 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:43:02 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- koan.spec	18 Sep 2007 14:54:01 -0000	1.23
+++ koan.spec	28 Sep 2007 21:43:02 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	14 Aug 2007 21:43:08 -0000	1.18
+++ sources	28 Sep 2007 21:43:02 -0000	1.19
@@ -1 +1,2 @@
 f8a7fe8642f564ed79fb46510917e04b  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:46:42 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:46:42 -0400
Subject: rpms/koan/F-7 .cvsignore, 1.15, 1.16 koan.spec, 1.20, 1.21 sources, 
	1.18, 1.19
Message-ID: <200709282146.l8SLkgxO027967@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27936

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 16:42:19 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:46:08 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/koan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- koan.spec	30 Aug 2007 16:42:19 -0000	1.20
+++ koan.spec	28 Sep 2007 21:46:08 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Aug 2007 16:42:19 -0000	1.18
+++ sources	28 Sep 2007 21:46:08 -0000	1.19
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:47:24 2007
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Fri, 28 Sep 2007 17:47:24 -0400
Subject: rpms/sugar/OLPC-2 .cvsignore, 1.55, 1.56 sources, 1.63,
	1.64 sugar.spec, 1.74, 1.75
Message-ID: <200709282147.l8SLlOOF028024@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/extras/rpms/sugar/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27975

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.60.20070928gitb8ec83c5b8
- New snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	20 Sep 2007 19:50:20 -0000	1.55
+++ .cvsignore	28 Sep 2007 21:46:51 -0000	1.56
@@ -1 +1 @@
-sugar-0.65-git5a595ea04e.tar.bz2
+sugar-0.65-gitb8ec83c5b8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	26 Sep 2007 15:32:16 -0000	1.63
+++ sources	28 Sep 2007 21:46:51 -0000	1.64
@@ -1 +1 @@
-de11dc9d6a1bb99b36f7beeea453e210  sugar-0.65-git5a595ea04e.tar.bz2
+6696631569d4e9fc895c63109b0e600c  sugar-0.65-gitb8ec83c5b8.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/extras/rpms/sugar/OLPC-2/sugar.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sugar.spec	26 Sep 2007 15:32:16 -0000	1.74
+++ sugar.spec	28 Sep 2007 21:46:51 -0000	1.75
@@ -1,11 +1,11 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%define alphatag 20070926git
-%define commitid 5a595ea04e
+%define alphatag 20070928git
+%define commitid b8ec83c5b8
 
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.65
-Release: 0.59.%{alphatag}5a595ea04e
+Release: 0.60.%{alphatag}b8ec83c5b8
 URL: http://dev.laptop.org/
 # OLPC is upstream, RPM is canonical source for packaged code.
 # git clone git://dev.laptop.org/sugar
@@ -83,6 +83,9 @@
 %{_datadir}/mime/packages/sugar.xml
 
 %changelog
+* Fri Sep 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.60.20070928gitb8ec83c5b8
+- New snapshot
+
 * Wed Sep 26 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.65-0.59.20070926git5a595ea04e
 - New snapshot
 



From fedora-extras-commits at redhat.com  Fri Sep 28 21:47:32 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:47:32 -0400
Subject: rpms/koan/FC-6 .cvsignore, 1.17, 1.18 koan.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <200709282147.l8SLlWYD028064@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27998

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Aug 2007 16:43:41 -0000	1.17
+++ .cvsignore	28 Sep 2007 21:47:00 -0000	1.18
@@ -14,3 +14,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	30 Aug 2007 16:43:41 -0000	1.22
+++ koan.spec	28 Sep 2007 21:47:00 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Aug 2007 16:43:41 -0000	1.19
+++ sources	28 Sep 2007 21:47:00 -0000	1.20
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:48:25 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:48:25 -0400
Subject: rpms/koan/EL-4 .cvsignore, 1.15, 1.16 koan.spec, 1.19, 1.20 sources,
	1.18, 1.19
Message-ID: <200709282148.l8SLmPX1028117@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28075

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 16:45:52 -0000	1.15
+++ .cvsignore	28 Sep 2007 21:47:53 -0000	1.16
@@ -12,3 +12,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koan.spec	30 Aug 2007 16:45:52 -0000	1.19
+++ koan.spec	28 Sep 2007 21:47:53 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Aug 2007 16:45:52 -0000	1.18
+++ sources	28 Sep 2007 21:47:53 -0000	1.19
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 21:49:21 2007
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Fri, 28 Sep 2007 17:49:21 -0400
Subject: rpms/koan/EL-5 .cvsignore, 1.17, 1.18 koan.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <200709282149.l8SLnLnm028175@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28125

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Aug 2007 16:44:48 -0000	1.17
+++ .cvsignore	28 Sep 2007 21:48:48 -0000	1.18
@@ -14,3 +14,4 @@
 koan-0.4.0.tar.gz
 koan-0.6.0.tar.gz
 koan-0.6.1.tar.gz
+koan-0.6.2.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- koan.spec	30 Aug 2007 16:44:48 -0000	1.22
+++ koan.spec	28 Sep 2007 21:48:48 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+
 * Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	30 Aug 2007 16:44:48 -0000	1.19
+++ sources	28 Sep 2007 21:48:48 -0000	1.20
@@ -1 +1,2 @@
 9f6c52b0c3330ea3df241bac1671f559  koan-0.6.1.tar.gz
+773f437fbb302d58b1e46eda36ca538b  koan-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:18:05 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:18:05 -0400
Subject: rpms/lybniz/devel lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709282218.l8SMI5bd003129@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3056/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Initial lybniz import


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:17:32 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:17:32 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:27:33 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:27:33 -0400
Subject: rpms/lybniz/F-7 lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE, 1.1
Message-ID: <200709282227.l8SMRXvj003632@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3621/F-7

Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Copy devel/ to F-7 & FC-6 (initial import for F-7 & FC-6)


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release



From fedora-extras-commits at redhat.com  Fri Sep 28 22:27:36 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:27:36 -0400
Subject: rpms/lybniz/FC-6 lybniz-exec-desktop.patch, NONE,
	1.1 lybniz-startup.sh, NONE, 1.1 lybniz.spec, NONE, 1.1
Message-ID: <200709282227.l8SMRanJ003652@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3621/FC-6

Added Files:
	lybniz-exec-desktop.patch lybniz-startup.sh lybniz.spec 
Log Message:
Copy devel/ to F-7 & FC-6 (initial import for F-7 & FC-6)


lybniz-exec-desktop.patch:

--- NEW FILE lybniz-exec-desktop.patch ---
--- lybniz.desktop.old	2007-09-27 16:46:22.000000000 -0400
+++ lybniz.desktop	2007-09-27 16:46:26.000000000 -0400
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Lybniz Graph Plotter
 Comment=Plot graphs and functions
-Exec=lybniz.py
+Exec=lybniz
 Terminal=false
 StartupNotify=true
 Type=Application


--- NEW FILE lybniz-startup.sh ---
#!/bin/sh
/usr/bin/python /usr/share/lybniz/lybniz.py


--- NEW FILE lybniz.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:           lybniz
Version:        1.3
Release:        5%{?dist}
Summary:        A function graph plotter

Group:          Applications/Engineering
License:        BSD
URL:            http://lybniz2.sourceforge.net/
Source0:        http://downloads.sourceforge.net/lybniz2/%{name}-%{version}.tar.gz
Source1:        lybniz-startup.sh
Patch0:         lybniz-exec-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python >= 2.4
Requires:       pygtk2 >= 2.6
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils

%description
Lybniz is an easy to use mathematical function graph plotter using PyGTK.

%prep
%setup -q
%patch0 -p0

%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# make dirs
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}

# setup.py installs to /usr/bin/lybniz.py - Let's move it out of there and use
# a startup script instead
mv $RPM_BUILD_ROOT/%{_bindir}/lybniz.py $RPM_BUILD_ROOT%{_datadir}/%{name}

# startup script
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/lybniz

# redo desktop file
desktop-file-install --vendor fedora\
    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
    --delete-original\
    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING PKG-INFO README
%dir %{_datadir}/%{name}
%dir %{_datadir}/gnome/help/%{name}
%{_datadir}/%{name}/*
%{_bindir}/*
%{_datadir}/pixmaps/*%{name}*
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/gnome/help/%{name}/*



%changelog
* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
- Fix changelog version

* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-4
- Directory ownership...

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-3
- Add patch to fix Exec field in desktop file

* Thu Sep 27 2007 Stewart Adam <s.adam at diffingo.com> 1.3-2
- Change Source0 to proper URL
- Fix perms on lybniz-startup.sh
- Why CFLAGS? Gone.
- Use --delete-original and drop rm for the .desktop file

* Tue Sep 25 2007 Stewart Adam <s.adam at diffingo.com> 1.3-1
- Initial Release



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:26 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 28 Sep 2007 18:37:26 -0400
Subject: rpms/em8300-kmod/F-7 em8300-kmod.spec,1.43,1.44
Message-ID: <200709282237.l8SMbQTE003953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3896

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
- Rebuild for kernel 2.6.22.9-91.fc7.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- em8300-kmod.spec	25 Sep 2007 16:53:03 -0000	1.43
+++ em8300-kmod.spec	28 Sep 2007 22:36:54 -0000	1.44
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.7-85.fc7}
+%{!?kversion: %define kversion 2.6.22.9-91.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi>
+- Rebuild for kernel 2.6.22.9-91.fc7.
+
 * Tue Sep 25 2007 Ville Skytt?? <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.7-85.fc7.
 



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:40 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:37:40 -0400
Subject: rpms/lybniz/F-7 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709282237.l8SMbeue003957@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890/F-7

Modified Files:
	.cvsignore sources 
Log Message:
Oops, forgot to "make new-sources"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:37:08 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:37:08 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 22:37:43 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 18:37:43 -0400
Subject: rpms/lybniz/FC-6 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200709282237.l8SMbh2p003961@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
Oops, forgot to "make new-sources"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:30:32 -0000	1.1
+++ .cvsignore	28 Sep 2007 22:37:11 -0000	1.2
@@ -0,0 +1 @@
+lybniz-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:30:32 -0000	1.1
+++ sources	28 Sep 2007 22:37:11 -0000	1.2
@@ -0,0 +1 @@
+6cb01766fb627a5046d482645c69f39a  lybniz-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Sep 28 23:09:53 2007
From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim))
Date: Fri, 28 Sep 2007 19:09:53 -0400
Subject: rpms/system-switch-java/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 system-switch-java.spec, 1.7,
	1.8 system-switch-java-trailing-newlines.patch, 1.1, NONE
Message-ID: <200709282309.l8SN9rSW011360@cvs-int.fedora.redhat.com>

Author: fitzsim

Update of /cvs/pkgs/rpms/system-switch-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338

Modified Files:
	.cvsignore sources system-switch-java.spec 
Removed Files:
	system-switch-java-trailing-newlines.patch 
Log Message:
* Fri Sep 28 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.1-1
- Import system-switch-java 1.1.1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jun 2007 23:11:27 -0000	1.3
+++ .cvsignore	28 Sep 2007 23:09:21 -0000	1.4
@@ -1 +1 @@
-system-switch-java-1.1.0.tar.gz
+system-switch-java-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jun 2007 23:11:27 -0000	1.3
+++ sources	28 Sep 2007 23:09:21 -0000	1.4
@@ -1 +1 @@
-c6608498dfb9c239fdc4b6deffd50a9a  system-switch-java-1.1.0.tar.gz
+9a4cb0fa553a2addb92619ead408b271  system-switch-java-1.1.1.tar.gz


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system-switch-java.spec	21 Jul 2007 05:20:04 -0000	1.7
+++ system-switch-java.spec	28 Sep 2007 23:09:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name: system-switch-java
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Summary: A tool for changing the default Java toolset
 
 Group: Applications/System
@@ -8,7 +8,6 @@
 URL: ftp://sources.redhat.com/pub/rhug
 Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-desktop.patch
-Patch1: %{name}-trailing-newlines.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -36,7 +35,6 @@
 %prep
 %setup -q
 %patch0
-%patch1
 
 %build
 %configure
@@ -69,6 +67,9 @@
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Fri Sep 28 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.1-1
+- Import system-switch-java 1.1.1.
+
 * Sat Jul 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.1.0-4
 - Tolerate trailing newlines in alternatives file.
 - Bump release number.


--- system-switch-java-trailing-newlines.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Sep 28 23:14:09 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 19:14:09 -0400
Subject: rpms/lybniz/F-7 lybniz.spec,1.1,1.2
Message-ID: <200709282314.l8SNE9gR011509@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460/F-7

Modified Files:
	lybniz.spec 
Log Message:
Buildsys can't find source? Bump.




Index: lybniz.spec
===================================================================
RCS file: /cvs/extras/rpms/lybniz/F-7/lybniz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lybniz.spec	28 Sep 2007 22:27:31 -0000	1.1
+++ lybniz.spec	28 Sep 2007 23:13:37 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           lybniz
 Version:        1.3
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        A function graph plotter
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5.1
+- Bump
+
 * Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
 - Fix changelog version
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:14:12 2007
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 28 Sep 2007 19:14:12 -0400
Subject: rpms/lybniz/FC-6 lybniz.spec,1.1,1.2
Message-ID: <200709282314.l8SNECnu011512@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/lybniz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11460/FC-6

Modified Files:
	lybniz.spec 
Log Message:
Buildsys can't find source? Bump.




Index: lybniz.spec
===================================================================
RCS file: /cvs/extras/rpms/lybniz/FC-6/lybniz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lybniz.spec	28 Sep 2007 22:27:34 -0000	1.1
+++ lybniz.spec	28 Sep 2007 23:13:39 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           lybniz
 Version:        1.3
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        A function graph plotter
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5.1
+- Bump
+
 * Fri Sep 28 2007 Stewart Adam <s.adam at diffingo.com> 1.3-5
 - Fix changelog version
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:23:30 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 28 Sep 2007 19:23:30 -0400
Subject: rpms/grace/devel grace-detect-netcdf.diff, NONE, 1.1 grace.spec,
	1.17, 1.18
Message-ID: <200709282323.l8SNNU8R011960@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11930

Modified Files:
	grace.spec 
Added Files:
	grace-detect-netcdf.diff 
Log Message:
* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
- Correctly detect netcdf (signature has changed).
- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.


grace-detect-netcdf.diff:

--- NEW FILE grace-detect-netcdf.diff ---
--- configure.old	2007-02-16 22:44:49.000000000 +0000
+++ configure	2007-09-28 23:03:29.000000000 +0100
@@ -15181,7 +15181,7 @@
       int main(void) {
         char *vlib;
         vlib = nc_inq_libvers();
-        if (strcmp(vlib, "3.0") < 0) {
+        if (strcmp(vlib, "\"3.0\"") < 0) {
           exit(1);
         }
         exit(0);


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grace.spec	27 Sep 2007 16:16:02 -0000	1.17
+++ grace.spec	28 Sep 2007 23:22:58 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -14,13 +14,14 @@
 Source2:        %{name}.png
 Source3:	cephes-license.email
 Source4:	LICENSE.cephes
-Patch:          %{name}-gracerc-no_auxiliary.diff
+Patch0:         %{name}-gracerc-no_auxiliary.diff
+Patch1:	        %{name}-detect-netcdf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  xbae-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
 BuildRequires:  desktop-file-utils, font-utils
 
 %if "%{fedora}" < "5"
@@ -31,6 +32,10 @@
 
 Requires:	nedit
 Requires:	htmlview
+%if "%{fedora}" < "8"
+Requires(post): chkfontpath
+Requires(postun): chkfontpath
+%endif
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -53,7 +58,9 @@
 
 %prep
 %setup -q
-%patch
+%patch0
+%patch1
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae
@@ -70,7 +77,6 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -130,14 +136,19 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%if "%{fedora}" >= "8"
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -145,6 +156,9 @@
 
 
 %postun
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -164,8 +178,9 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
+%if "%{fedora}" >= "8"
 %{catalogue}/%{name}-type1
-
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -177,6 +192,11 @@
 
 
 %changelog
+* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
 * Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
 - Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
 



From fedora-extras-commits at redhat.com  Fri Sep 28 23:39:38 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Fri, 28 Sep 2007 19:39:38 -0400
Subject: rpms/grace/F-7 grace-detect-netcdf.diff, NONE, 1.1 grace.spec, 1.16,
	1.17
Message-ID: <200709282339.l8SNdckl012632@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12593

Modified Files:
	grace.spec 
Added Files:
	grace-detect-netcdf.diff 
Log Message:
* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
- Correctly detect netcdf (signature has changed).
- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.


grace-detect-netcdf.diff:

--- NEW FILE grace-detect-netcdf.diff ---
--- configure.old	2007-02-16 22:44:49.000000000 +0000
+++ configure	2007-09-28 23:03:29.000000000 +0100
@@ -15181,7 +15181,7 @@
       int main(void) {
         char *vlib;
         vlib = nc_inq_libvers();
-        if (strcmp(vlib, "3.0") < 0) {
+        if (strcmp(vlib, "\"3.0\"") < 0) {
           exit(1);
         }
         exit(0);


Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-7/grace.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grace.spec	28 Aug 2007 17:42:40 -0000	1.16
+++ grace.spec	28 Sep 2007 23:39:06 -0000	1.17
@@ -1,6 +1,9 @@
+%define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
+
 Name:           grace
 Version:        5.1.21
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -11,13 +14,14 @@
 Source2:        %{name}.png
 Source3:	cephes-license.email
 Source4:	LICENSE.cephes
-Patch:          %{name}-gracerc-no_auxiliary.diff
+Patch0:         %{name}-gracerc-no_auxiliary.diff
+Patch1:	        %{name}-detect-netcdf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  xbae-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
 BuildRequires:  desktop-file-utils, font-utils
 
 %if "%{fedora}" < "5"
@@ -28,8 +32,10 @@
 
 Requires:	nedit
 Requires:	htmlview
+%if "%{fedora}" < "8"
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
+%endif
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -52,7 +58,9 @@
 
 %prep
 %setup -q
-%patch
+%patch0
+%patch1
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae
@@ -69,7 +77,6 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -129,13 +136,19 @@
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%if "%{fedora}" >= "8"
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -143,7 +156,9 @@
 
 
 %postun
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -163,7 +178,9 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
-
+%if "%{fedora}" >= "8"
+%{catalogue}/%{name}-type1
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -175,6 +192,14 @@
 
 
 %changelog
+* Fri Sep 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
+* Thu Sep 27 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
+- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
+
 * Tue Aug 28 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.21-2
 - License fix, rebuild for devel (F8).
 



From fedora-extras-commits at redhat.com  Sat Sep 29 03:08:10 2007
From: fedora-extras-commits at redhat.com (Lennart Poettering (lennart))
Date: Fri, 28 Sep 2007 23:08:10 -0400
Subject: rpms/pulseaudio/devel .cvsignore, 1.11, 1.12 pulseaudio.spec, 1.20, 
	1.21 sources, 1.13, 1.14
Message-ID: <200709290308.l8T38AZa011045@cvs-int.fedora.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11023

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
Another SVN snapshot, fixing a couple of subtle bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Sep 2007 03:04:46 -0000	1.11
+++ .cvsignore	29 Sep 2007 03:07:37 -0000	1.12
@@ -1 +1 @@
-pulseaudio-0.9.7.svn20070925.tar.gz
+pulseaudio-0.9.7.svn20070929.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pulseaudio.spec	25 Sep 2007 15:55:23 -0000	1.20
+++ pulseaudio.spec	29 Sep 2007 03:07:37 -0000	1.21
@@ -3,11 +3,11 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.7
-Release:	0.13.svn20070925%{?dist}
+Release:	0.14.svn20070929%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
-Source0:	pulseaudio-0.9.7.svn20070925.tar.gz
+Source0:	pulseaudio-0.9.7.svn20070929.tar.gz
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel, libsamplerate-devel, libsndfile-devel
@@ -332,6 +332,9 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Sat Sep 29 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.14.svn20070929
+- Another SVN snapshot, fixing a couple of subtle bugs
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> 0.9.7-0.13.svn20070925
 - Remove libpulsecore.so symlink from pulseaudio-libs-devel to avoid multilib issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Sep 2007 03:04:46 -0000	1.13
+++ sources	29 Sep 2007 03:07:37 -0000	1.14
@@ -1 +1 @@
-2503ce94200e8c79b1f1e77fd922b0e3  pulseaudio-0.9.7.svn20070925.tar.gz
+0100c6c74af31d3c1f918ed52bd929ee  pulseaudio-0.9.7.svn20070929.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 04:24:17 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 29 Sep 2007 00:24:17 -0400
Subject: rpms/NetworkManager/devel .cvsignore, 1.50, 1.51 NetworkManager.spec,
	1.173, 1.174 sources, 1.69, 1.70
Message-ID: <200709290424.l8T4OH6B018739@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18717

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2914
- New snapshot
	- Add WPA passphrase support to password dialog
	- Applet now reflects actual VPN behavior of one active connection
	- Applet now notices VPN active connections on startup
	- Fix connections with some WPA and WEP keys




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	28 Sep 2007 03:29:30 -0000	1.50
+++ .cvsignore	29 Sep 2007 04:23:37 -0000	1.51
@@ -16,3 +16,5 @@
 NetworkManager-0.7.0.svn2886.tar.gz
 NetworkManager-0.7.0.svn2907.tar.gz
 nm-applet-0.7.0.svn202.tar.gz
+NetworkManager-0.7.0.svn2914.tar.gz
+nm-applet-0.7.0.svn207.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- NetworkManager.spec	28 Sep 2007 03:29:30 -0000	1.173
+++ NetworkManager.spec	29 Sep 2007 04:23:37 -0000	1.174
@@ -7,7 +7,7 @@
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2907
+%define snapshot svn2914
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn202.tar.gz
+Source1: nm-applet-%{version}.svn207.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -260,6 +260,13 @@
 
 
 %changelog
+* Fri Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2914
+- New snapshot
+	- Add WPA passphrase support to password dialog
+	- Applet now reflects actual VPN behavior of one active connection
+	- Applet now notices VPN active connections on startup
+	- Fix connections with some WPA and WEP keys
+
 * Thu Sep 27 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.3.svn2907
 - New snapshot
 	- VPN support (only vpnc plugin ported at this time)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	28 Sep 2007 03:29:30 -0000	1.69
+++ sources	29 Sep 2007 04:23:37 -0000	1.70
@@ -1,2 +1,2 @@
-14197b29863a439baa51f1b9bc5403da  NetworkManager-0.7.0.svn2907.tar.gz
-89e397896518d51c02a6a1f700564a9c  nm-applet-0.7.0.svn202.tar.gz
+44be9d03bdb526f100d73a2a88cc7d00  NetworkManager-0.7.0.svn2914.tar.gz
+7ed286b81c305d7541ca1571dfab0a40  nm-applet-0.7.0.svn207.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 04:55:22 2007
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 29 Sep 2007 00:55:22 -0400
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.11,
	1.12 NetworkManager-vpnc.spec, 1.26, 1.27 sources, 1.12,
	1.13 NetworkManager-vpnc-0.6.4-servpath.patch, 1.1, NONE
Message-ID: <200709290455.l8T4tMYU019176@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19152

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Removed Files:
	NetworkManager-vpnc-0.6.4-servpath.patch 
Log Message:
* Thu Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2914
- Fix .name file on 64-bit systems




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Sep 2007 03:52:58 -0000	1.11
+++ .cvsignore	29 Sep 2007 04:54:48 -0000	1.12
@@ -4,3 +4,4 @@
 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


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- NetworkManager-vpnc.spec	28 Sep 2007 04:43:29 -0000	1.26
+++ NetworkManager-vpnc.spec	29 Sep 2007 04:54:48 -0000	1.27
@@ -4,7 +4,7 @@
 %define vpnc_version        0.3.3-3
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn2910
+%define svn_snapshot svn2914
 
 Summary:   NetworkManager VPN integration for vpnc
 Name:      NetworkManager-vpnc
@@ -15,7 +15,6 @@
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.gz
-Patch3:    NetworkManager-vpnc-0.6.4-servpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch3 -p1 -b .servpath
 
 
 %build
@@ -98,6 +96,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Sep 2007 03:52:58 -0000	1.12
+++ sources	29 Sep 2007 04:54:48 -0000	1.13
@@ -1 +1 @@
-248b55f9601a6c34bdf9f422f5de2f0c  NetworkManager-vpnc-0.7.0.svn2910.tar.gz
+ffd945cc9327717b981fbbf14a5cb8b9  NetworkManager-vpnc-0.7.0.svn2914.tar.gz


--- NetworkManager-vpnc-0.6.4-servpath.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 05:13:11 2007
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Sat, 29 Sep 2007 01:13:11 -0400
Subject: rpms/aboot/devel aboot-1.0.doc_install_fix.patch, NONE,
	1.1 aboot-optflags.patch, NONE, 1.1 aboot.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709290513.l8T5DBq9025710@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/pkgs/rpms/aboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25672/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aboot-1.0.doc_install_fix.patch aboot-optflags.patch 
	aboot.spec 
Log Message:

Initial import. Review bz#294641


aboot-1.0.doc_install_fix.patch:

--- NEW FILE aboot-1.0.doc_install_fix.patch ---
diff -up aboot-1.0_pre20040408/doc/man/Makefile.install_fix aboot-1.0_pre20040408/doc/man/Makefile
--- aboot-1.0_pre20040408/doc/man/Makefile.install_fix	2007-09-17 11:36:51.000000000 +0200
+++ aboot-1.0_pre20040408/doc/man/Makefile	2007-09-17 11:42:28.000000000 +0200
@@ -32,20 +32,20 @@ clean:
 	rm -f aboot.8 aboot.conf.5 abootconf.8 isomarkboot.1 sdisklabel.8 netabootwrap.1 manpage.log manpage.links manpage.refs
 
 aboot.8: aboot.sgml
-	nsgmls aboot.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man aboot.sgml
 
 aboot.conf.5: aboot.conf.sgml
-	nsgmls aboot.conf.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man aboot.conf.sgml
 
 abootconf.8: abootconf.sgml
-	nsgmls abootconf.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man abootconf.sgml
 
 isomarkboot.1: isomarkboot.sgml
-	nsgmls isomarkboot.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man isomarkboot.sgml
 
 netabootwrap.1: netabootwrap.sgml
-	nsgmls netabootwrap.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man netabootwrap.sgml
 
 sdisklabel.8: sdisklabel.sgml
-	nsgmls sdisklabel.sgml | sgmlspl sgmlspl-specs/docbook2man-spec.pl
+	docbook2man sdisklabel.sgml

aboot-optflags.patch:

--- NEW FILE aboot-optflags.patch ---
diff -up aboot-1.0_pre20040408/Makefile.optflags aboot-1.0_pre20040408/Makefile
--- aboot-1.0_pre20040408/Makefile.optflags	2007-09-27 15:31:38.000000000 +0200
+++ aboot-1.0_pre20040408/Makefile	2007-09-27 15:32:03.000000000 +0200
@@ -18,6 +18,7 @@ VMLINUXGZ	= $(KSRC)/arch/alpha/boot/vmli
 
 # for boot testing
 #CFGDEFS       	= -DDEBUG_ISO -DDEBUG_ROCK -DDEBUG_EXT2 -DDEBUG
+CFGDEFS = $(OPTFLAGS)
 
 # root, aka prefix
 root		=


--- NEW FILE aboot.spec ---
%define			prever	pre20040408
Summary:		A bootloader which can be started from the SRM console
Name:			aboot
Version:		1.0
Release:		0.1.%{prever}%{?dist}
ExclusiveArch:	alpha
License:		GPLv2+
Group:			System Environment/Base
URL:			http://www.sf.net/projects/aboot
Source0:		http://aboot.sourceforge.net/tarballs/aboot-%{version}_%{prever}.tar.bz2
Patch0:			aboot_1.0~%{prever}-2.diff.gz
Patch1:			aboot-1.0.doc_install_fix.patch
Patch2:			aboot-optflags.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:	kernel-devel, docbook-utils

%description
The aboot program is the preferred way of booting Linux when using SRM
firmware (the firmware normally used to boot an DEC UNIX). Aboot supports
the creation of bootable block devices and contains a program which can
load Linux kernels from a filesystem which is bootable by SRM.  Aboot
also supports direct booting from various filesystems (ext2, ISO9660,
UFS), booting of executable object files (ELF and ECOFF), booting of
compressed kernels, network booting (using bootp), partition tables in
DEC UNIX format, and interactive booting and default configurations for
SRM consoles that cannot pass long option strings.

If you are installing Fedora or Red Hat Linux on an Alpha, you'll need to
install the aboot package.

%prep
%setup -q -n %{name}-%{version}_%{prever}
%patch0 -p1
%patch1 -p1 -b .doc_install_fix
%patch2 -p1 -b .optflags

%build
sed -ie "s^KSRC.*=.*$^KSRC=/lib/modules/`uname -r`/build^" Makefile
export OPTFLAGS="%{optflags}"
make
cd doc/man && make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
chmod go= $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
make root=$RPM_BUILD_ROOT bindir=$RPM_BUILD_ROOT/sbin install

mv -f sdisklabel/README sdisklabel/README-sdisklabel || true

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc INSTALL README ChangeLog TODO aboot.conf sdisklabel/README-sdisklabel COPYING
%attr(644, root, root) /boot/bootlx
/sbin/abootconf
/sbin/e2writeboot
/sbin/isomarkboot
/sbin/swriteboot
%defattr(0644,root,root)
%{_mandir}/man8/*
%{_mandir}/man5/*
%{_mandir}/man1/*

%changelog
* Thu Sep 27 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0-0.1.pre20040408
- bz#294641:
  - New versioning - versioning guidelines
  - Add patch to add global rpm cflags and use 'em
  - Fix manpage attrs - defattr

* Fri Sep 21 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0_pre20040408-2
- Fix some rpmlint warnings, bz#294641
- Fix license: GPLv2+, bz#294641

* Mon Aug 20 2007 Oliver Falk <oliver at linux-kernel.at> - 1.0_pre20040408-1
- Rebuild in koji
- Cleanup spec; Merge RH, AC, MDK spec
- To be included into upstream fp.o hopefully

* Mon Apr  18 2005 Balint Cristian <rezso at rdsor.ro>
- Latest from CVS
- Build for alphacore 1.0
- Fix build with 2.6

* Tue Nov 30 1999 Matt Wilson <msw at redhat.com>
- changed to use ext2 patch based from Ruediger Oertel <ro at suse.de>

* Mon Nov 22 1999 Matt Wilson <msw at redhat.com>
- patched ext2 read code to deal with rev1 filesystems
- added a patch to properly guess IDE cdroms
  (well, sort of)

* Tue Sep 07 1999 Cristian Gafton <gafton at redhat.com>
- add patch to allow it to boot on *large* disks

* Mon Apr 26 1999 Cristian Gafton <gafton at redhat.com>
- patch from Jay Estabrook to make it work with EXT2 filesystems larger
  than 2Gb

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 9)

* Tue Jan 19 1999 Erik Troan <ewt at redhat.com>
- built for Red HAt 6.0

* Tue Sep 15 1998 Richard Henderson <rth at cygnus.com>
- use aboot.lds for elf, so that the phdr comes out right.
- relax the need to have a compiled kernel installed.
- make sdisklabel take partition sizes in sectors, not kilobytes.

* Thu Aug 20 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- corrected a small but essential error in the ELF patch

* Mon Aug  3 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- added a patch to allow booting of ELF images created with binutils >= 2.9
- compiled against glibc 2.0.94

* Sun May 31 1998 Maciej W. Rozycki <macro at ds2.pg.gda.pl>
- made changes needed for glibc2 and 2.1.x kernels



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aboot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:31:56 -0000	1.1
+++ .cvsignore	29 Sep 2007 05:12:37 -0000	1.2
@@ -0,0 +1,2 @@
+aboot-1.0_pre20040408.tar.bz2
+aboot_1.0~pre20040408-2.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aboot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:31:56 -0000	1.1
+++ sources	29 Sep 2007 05:12:37 -0000	1.2
@@ -0,0 +1,2 @@
+ac1214102d8304f326655e3e36d89847  aboot-1.0_pre20040408.tar.bz2
+4958ed11b630af923417d0950229704a  aboot_1.0~pre20040408-2.diff.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 06:51:26 2007
From: fedora-extras-commits at redhat.com (Roberto Bagnara (bagnara))
Date: Sat, 29 Sep 2007 02:51:26 -0400
Subject: rpms/ppl/devel ppl.spec,1.6,1.7
Message-ID: <200709290651.l8T6pQad001008@cvs-int.fedora.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv986

Modified Files:
	ppl.spec 
Log Message:
The value of the `License' tag is now `GPLv2+'.
`ppl-swiprolog' dependency on `readline-devel' removed (again).



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ppl.spec	24 Sep 2007 17:30:03 -0000	1.6
+++ ppl.spec	29 Sep 2007 06:50:53 -0000	1.7
@@ -1,10 +1,10 @@
 Name:		ppl
 Version:	0.9
-Release:	15%{?dist}
+Release:	16%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
-License:	GPL
+License:	GPLv2+
 URL:		http://www.cs.unipr.it/ppl/
 Source:		ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{version}.tar.gz
 Patch0:		ppl-0.9-docfiles.patch
@@ -81,7 +81,7 @@
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
 BuildRequires:	pl >= 5.6.0
-Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0, readline-devel
+Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
@@ -277,10 +277,14 @@
 rm -rf %{buildroot}
 
 %changelog
-* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 0.9-15
-- Rebuild for new libgmpxx
+* Sat Sep 29 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-16
+- The value of the `License' tag is now `GPLv2+'.
+- `ppl-swiprolog' dependency on `readline-devel' removed (again).
 
-* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9-14
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> 0.9-15
+- Rebuild for new libgmpxx.
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> 0.9-14
 - Rebuild for selinux ppc32 issue.
 
 * Fri Jul 06 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-13



From fedora-extras-commits at redhat.com  Sat Sep 29 07:50:52 2007
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sat, 29 Sep 2007 03:50:52 -0400
Subject: rpms/pidgin/devel pidgin.spec,1.33,1.34
Message-ID: <200709290750.l8T7oqn0008019@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7997

Modified Files:
	pidgin.spec 
Log Message:
Build against avahi proper instead of its HOWL compatibility layer



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pidgin.spec	18 Sep 2007 15:27:17 -0000	1.33
+++ pidgin.spec	29 Sep 2007 07:50:19 -0000	1.34
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -142,7 +142,7 @@
 BuildRequires:  dbus-glib-devel >= 0.70
 %endif
 %if %{bonjour_support}
-BuildRequires:	avahi-compat-howl-devel
+BuildRequires:	avahi-devel
 %endif
 # Meanwhile integration (F7+)
 %if %{meanwhile_integration}
@@ -507,6 +507,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Michel Salim <michel.sylvan at gmail.com> - 2.2.0-3
+- Build against avahi proper instead of its HOWL compatibility layer
+
 * Tue Sep 18 2007 Warren Togami <wtogami at redhat.com> - 2.2.0-2
 - License clarification
 - Backport patches to fix memory leaks



From fedora-extras-commits at redhat.com  Sat Sep 29 08:04:57 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:04:57 -0400
Subject: rpms/kazehakase/FC-6 .cvsignore, 1.5, 1.6 kazehakase.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200709290804.l8T84vBw015122@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/FC-6

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2007 17:08:05 -0000	1.5
+++ .cvsignore	29 Sep 2007 08:04:25 -0000	1.6
@@ -1 +1,3 @@
-kazehakase-0.4.8.tar.gz
+gscripttable.h.gz
+kazehakase-0.4.9.tar.gz
+kazehakase-svn3235-3237-diff.patch.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/kazehakase.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kazehakase.spec	29 Aug 2007 17:08:05 -0000	1.13
+++ kazehakase.spec	29 Sep 2007 08:04:25 -0000	1.14
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,11 +221,34 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 
-* Thu May 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1.dist.1
-- gecko engine update
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228.dist.1
+- Mass rebuild (buildID or binutils issue)
+
+* Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228
+- Rebuild against new gecko engine.
+
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-8.svn3228
+- Try svn 3228
+- Disable GTK_DISABLE_DEPRECATED for now
+- License update
+
+* Sat Jul 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-7.svn3227
+- Try svn 3227 to drop GLib patch
+
+* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-5
+- Rebuild against new gecko engine
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
+- Patch to follow the newest GLib symbol
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-2
+- Parse GLib version dependency 
 
 * Wed May 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1
 - 0.4.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2007 17:08:05 -0000	1.5
+++ sources	29 Sep 2007 08:04:25 -0000	1.6
@@ -1 +1,3 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+b94a93fe75d0e7a1645822bfa72145b2  gscripttable.h.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz
+e8882d501ce52ec38af8dca4d1d66a33  kazehakase-svn3235-3237-diff.patch.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:04:55 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:04:55 -0400
Subject: rpms/kazehakase/F-7 .cvsignore, 1.5, 1.6 kazehakase.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200709290804.l8T84tIL015119@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/F-7

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2007 17:08:02 -0000	1.5
+++ .cvsignore	29 Sep 2007 08:04:21 -0000	1.6
@@ -1 +1,3 @@
-kazehakase-0.4.8.tar.gz
+gscripttable.h.gz
+kazehakase-0.4.9.tar.gz
+kazehakase-svn3235-3237-diff.patch.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/kazehakase.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kazehakase.spec	29 Aug 2007 17:08:02 -0000	1.17
+++ kazehakase.spec	29 Sep 2007 08:04:21 -0000	1.18
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,15 +221,35 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 
-* Tue Jul 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-4.dist.1
-- Rebuild against new gecko engine
+* Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228.dist.1
+- Mass rebuild (buildID or binutils issue)
+
+* Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-9.svn3228
+- Rebuild against new gecko engine.
 
-* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-4
+* Fri Aug  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-8.svn3228
+- Try svn 3228
+- Disable GTK_DISABLE_DEPRECATED for now
+- License update
+
+* Sat Jul 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-7.svn3227
+- Try svn 3227 to drop GLib patch
+
+* Wed Jun 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-5
 - Rebuild against new gecko engine
 
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-3
+- Patch to follow the newest GLib symbol
+
+* Tue Jun  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-2
+- Parse GLib version dependency 
+
 * Wed May 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-1
 - 0.4.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2007 17:08:02 -0000	1.5
+++ sources	29 Sep 2007 08:04:21 -0000	1.6
@@ -1 +1,3 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+b94a93fe75d0e7a1645822bfa72145b2  gscripttable.h.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz
+e8882d501ce52ec38af8dca4d1d66a33  kazehakase-svn3235-3237-diff.patch.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:05:01 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 29 Sep 2007 04:05:01 -0400
Subject: rpms/kazehakase/devel .cvsignore, 1.8, 1.9 kazehakase.spec, 1.34,
	1.35 sources, 1.8, 1.9
Message-ID: <200709290805.l8T851pU015152@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15051/devel

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
- 0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2007 16:45:12 -0000	1.8
+++ .cvsignore	29 Sep 2007 08:04:29 -0000	1.9
@@ -1 +1 @@
-kazehakase-0.4.8.tar.gz
+kazehakase-0.4.9.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kazehakase.spec	29 Aug 2007 16:58:08 -0000	1.34
+++ kazehakase.spec	29 Sep 2007 08:04:29 -0000	1.35
@@ -7,10 +7,6 @@
 %if 0%{?fedora} == 6
 %define		FFver		1.5.0.12
 %endif
-%if 0%{?fedora} == 5
-%define		SMver		1.0.9
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
 
 %define		support_anthy	0
 %if 0%{?fedora} >= 6
@@ -20,13 +16,11 @@
 %endif
 %define		rubyabi		1.8
 
-%define		repoid		26898
-%define		svnver		3228
-
-%define		glib_regex_unref_ver	2.13.3
+%define		repoid		27353
+%define		svnver		3237
 
 Name:		kazehakase
-Version:	0.4.8
+Version:	0.4.9
 Release:	1%{?dist}
 Summary:	Kazehakase browser
 
@@ -34,6 +28,10 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}.tar.gz
+%if 0%{?fedora} < 8
+Source1:	gscripttable.h.gz
+Patch0:		kazehakase-svn3235-3237-diff.patch.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -67,17 +65,11 @@
 BuildRequires:	glib2-devel
 Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} == 5
-BuildRequires:	seamonkey-devel %{?SMver:= %{SMver}}
-BuildRequires:	seamonkey %{?SMver:= %{SMver}}
-Requires:	seamonkey %{?SMver:= %{SMver}}
-%else
 BuildRequires:	firefox-devel %{?FFver:= %{FFver}}
 Requires:	firefox %{?FFver:= %{FFver}}
-%endif
 
 # For svn
-%if 0
+%if 0%{?fedora} < 8
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	automake
@@ -128,7 +120,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-#sh autogen.sh
+
+%if 0%{?fedora} < 8
+%patch0 -p1 -R
+
+cd src/utils
+cp -p %SOURCE1 .
+%{__gzip} -d *gz
+cd ../..
+
+sh autogen.sh
+%endif
 
 %{__sed} -i.multilib -e \
 	'/gecko/s|mozilla-config.h|mozilla-config*.h|' \
@@ -138,20 +140,10 @@
 %{__sed} -i.anthy -e '/^anthy_available/d' configure
 %endif
 
-if pkg-config --exists 'gtk+-2.0 >= 2.11.6' ; then
-	for f in `find . -name Makefile.am -or -name Makefile.in` ; do
-		%{__sed} -i 's|-DGTK_DISABLE_DEPRECATED=1| |g' $f
-	done
-fi
-
 %build
 %configure \
 	--enable-migemo \
-%if 0%{?fedora} == 5
-	--with-gecko-engine=seamonkey
-%else
 	--with-gecko-engine=firefox
-%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -229,6 +221,9 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.9-1
+- 0.4.9
+
 * Thu Aug 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.8-1
 - 0.4.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2007 16:45:12 -0000	1.8
+++ sources	29 Sep 2007 08:04:29 -0000	1.9
@@ -1 +1 @@
-a9f58314392b488374bba1cf2d21deec  kazehakase-0.4.8.tar.gz
+6259322e4fb6ed18a5f23ceda97f7ceb  kazehakase-0.4.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 08:05:34 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Sep 2007 04:05:34 -0400
Subject: rpms/quake3/devel quake3-1.34-syslibs.patch, NONE,
	1.1 quake3-demo.sh, 
	NONE, 1.1 quake3.autodlrc, NONE, 1.1 quake3.desktop, NONE,
	1.1 quake3.png, NONE, 1.1 quake3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709290805.l8T85Y54015202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	quake3-1.34-syslibs.patch quake3-demo.sh quake3.autodlrc 
	quake3.desktop quake3.png quake3.spec 
Log Message:
initial quake3 import


quake3-1.34-syslibs.patch:

--- NEW FILE quake3-1.34-syslibs.patch ---
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+* memsrc.c
+*
+* Copyright (C) 1994-1996, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains decompression data source routines for the case of
+* reading JPEG data from a memory buffer that is preloaded with the entire
+* JPEG file. This would not seem especially useful at first sight, but
+* a number of people have asked for it.
+* This is really just a stripped-down version of jdatasrc.c. Comparison
+* of this code with jdatasrc.c may be helpful in seeing how to make
+* custom source managers for other purposes.
+*/
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+/* Expanded data source object for memory input */
+
+typedef struct {
+struct jpeg_source_mgr pub; /* public fields */
+
+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+
+/*
+* Initialize source --- called by jpeg_read_header
+* before any data is actually read.
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+/* No work, since jpeg_memory_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.
+*/
+}
+
+
+/*
+* Fill the input buffer --- called whenever buffer is emptied.
+*
+* In this application, this routine should never be called; if it is called,
+* the decompressor has overrun the end of the input buffer, implying we
+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
+* might be the most appropriate response.
+*
+* But what we choose to do in this code is to supply dummy EOI markers
+* in order to force the decompressor to finish processing and supply
+* some sort of output image, no matter how corrupted.
+*/
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+WARNMS(cinfo, JWRN_JPEG_EOF);
+
+/* Create a fake EOI marker */
+src->eoi_buffer[0] = (JOCTET) 0xFF;
+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
+src->pub.next_input_byte = src->eoi_buffer;
+src->pub.bytes_in_buffer = 2;
+
+return TRUE;
+}
+
+
+/*
+* Skip data --- used to skip over a potentially large amount of
+* uninteresting data (such as an APPn marker).
+*
+* If we overrun the end of the buffer, we let fill_input_buffer deal with
+* it. An extremely large skip could cause some time-wasting here, but
+* it really isn't supposed to happen ... and the decompressor will never
+* skip more than 64K anyway.
+*/
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+if (num_bytes > 0) {
+while (num_bytes > (long) src->pub.bytes_in_buffer) {
+num_bytes -= (long) src->pub.bytes_in_buffer;
+(void) fill_input_buffer(cinfo);
+/* note we assume that fill_input_buffer will never return FALSE,
+* so suspension need not be handled.
+*/
+}
+src->pub.next_input_byte += (size_t) num_bytes;
+src->pub.bytes_in_buffer -= (size_t) num_bytes;
+}
+}
+
+
+/*
+* An additional method that can be provided by data source modules is the
+* resync_to_restart method for error recovery in the presence of RST markers.
+* For the moment, this source module just uses the default resync method
+* provided by the JPEG library. That method assumes that no backtracking
+* is possible.
+*/
+
+
+/*
+* Terminate source --- called by jpeg_finish_decompress
+* after all data has been read. Often a no-op.
+*
+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+* application must deal with any cleanup that should happen even
+* for error exit.
+*/
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+/* no work necessary here */
+}
+
+
+/*
+* Prepare for input from a memory buffer.
+*/
+
+GLOBAL(void)
+jpeg_memory_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
+* 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.
+*/
+if (cinfo->src == NULL) { /* first time for this JPEG object? */
+cinfo->src = (struct jpeg_source_mgr *)
+(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+sizeof(my_source_mgr));
+}
+
+src = (my_src_ptr) cinfo->src;
+src->pub.init_source = init_source;
+src->pub.fill_input_buffer = fill_input_buffer;
+src->pub.skip_input_data = skip_input_data;
+src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+src->pub.term_source = term_source;
+
+src->pub.next_input_byte = buffer;
+src->pub.bytes_in_buffer = 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-25 19:37:48.000000000 +0200
+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
  * You may also wish to include "jerror.h".
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <jpeglib.h>
+#include "jpeg_memsrc.h"
+#else
 #define JPEG_INTERNALS
 #include "../jpeg-6/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;
   byte  *buf;
+  size_t bufsize;
+#ifdef USE_SYSTEM_JPEG
+  int i,j;
+  byte *inptr, *outptr;
+#endif
 
   /* 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
   }
 
   memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
+  row_stride = cinfo.output_width * 4;
 
   out = ri.Malloc(memcount);
 
@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
 	buf = ((out+(row_stride*cinfo.output_scanline)));
 	buffer = &buf;
     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+#ifdef USE_SYSTEM_JPEG
+    /* we have RGB data, we need to expand this out to ARGB */
+    inptr = buf + cinfo.output_width * 3 - 1;
+    outptr = buf + row_stride - 1;
+
+    for (i = 0; i < cinfo.output_width; i++) {
+      /* endian dependent? maybe for big endian this must be done after the
+         color/pixel copy? */
+      *outptr-- = 255;
+      for (j = 0; j < 3; j++) {
+        JOCTET color = *inptr--;
+        *outptr-- = color;
+      }
+    }
+#endif
   }
   
   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.
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include <jpeglib.h>
+
+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
+  size_t bufsize);
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:17:27.000000000 +0200
+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
@@ -15,10 +15,23 @@
  * Note that the max_memory_to_use option is ignored by this implementation.
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <stdio.h>
+#include <stdlib.h>
+#include <jpeglib.h>
+
+#undef GLOBAL
+#define GLOBAL
+#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
 
 #include "../renderer/tr_local.h"
 
@@ -83,7 +96,13 @@ GLOBAL void
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
+#ifdef USE_SYSTEM_JPEG
+  fprintf(stderr,
+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
+  exit(1);
+#else
   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#endif
 }
 
 
diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
--- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
@@ -96,6 +96,10 @@ ifndef USE_OPENAL
 USE_OPENAL=1
 endif
 
+ifndef USE_SYSTEM_JPEG
+USE_SYSTEM_JPEG=1
+endif
+
 ifndef USE_OPENAL_DLOPEN
 USE_OPENAL_DLOPEN=0
 endif
@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
   endif
   endif
 
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+  BASE_CFLAGS = 
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL=1
@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
+  endif
+
   ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
   else
@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    CLIENT_LDFLAGS += -ljpeg
+  endif
+
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -970,40 +982,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/jccoefct.o  \
-  $(B)/client/jccolor.o \
-  $(B)/client/jfdctflt.o \
-  $(B)/client/jcdctmgr.o \
-  $(B)/client/jcphuff.o \
-  $(B)/client/jcmainct.o \
-  $(B)/client/jcmarker.o \
-  $(B)/client/jcmaster.o \
-  $(B)/client/jcomapi.o \
-  $(B)/client/jcparam.o \
-  $(B)/client/jcprepct.o \
-  $(B)/client/jcsample.o \
-  $(B)/client/jdapimin.o \
-  $(B)/client/jdapistd.o \
-  $(B)/client/jdatasrc.o \
-  $(B)/client/jdcoefct.o \
-  $(B)/client/jdcolor.o \
-  $(B)/client/jddctmgr.o \
-  $(B)/client/jdhuff.o \
-  $(B)/client/jdinput.o \
-  $(B)/client/jdmainct.o \
-  $(B)/client/jdmarker.o \
-  $(B)/client/jdmaster.o \
-  $(B)/client/jdpostct.o \
-  $(B)/client/jdsample.o \
-  $(B)/client/jdtrans.o \
-  $(B)/client/jerror.o \
-  $(B)/client/jidctflt.o \
-  $(B)/client/jmemmgr.o \
   $(B)/client/jmemnobs.o \
-  $(B)/client/jutils.o \
   \
   $(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
+
+ifneq ($(USE_SYSTEM_JPEG),1)
+  Q3OBJ += \
+    $(B)/client/jcapimin.o \
+    $(B)/client/jchuff.o   \
+    $(B)/client/jcinit.o \
+    $(B)/client/jccoefct.o  \
+    $(B)/client/jccolor.o \
+    $(B)/client/jfdctflt.o \
+    $(B)/client/jcdctmgr.o \
+    $(B)/client/jcphuff.o \
+    $(B)/client/jcmainct.o \
+    $(B)/client/jcmarker.o \
+    $(B)/client/jcmaster.o \
+    $(B)/client/jcomapi.o \
+    $(B)/client/jcparam.o \
+    $(B)/client/jcprepct.o \
+    $(B)/client/jcsample.o \
+    $(B)/client/jdapimin.o \
+    $(B)/client/jdapistd.o \
+    $(B)/client/jdatasrc.o \
+    $(B)/client/jdcoefct.o \
+    $(B)/client/jdcolor.o \
+    $(B)/client/jddctmgr.o \
+    $(B)/client/jdhuff.o \
+    $(B)/client/jdinput.o \
+    $(B)/client/jdmainct.o \
+    $(B)/client/jdmarker.o \
+    $(B)/client/jdmaster.o \
+    $(B)/client/jdpostct.o \
+    $(B)/client/jdsample.o \
+    $(B)/client/jdtrans.o \
+    $(B)/client/jerror.o \
+    $(B)/client/jidctflt.o \
+    $(B)/client/jmemmgr.o \
+    $(B)/client/jutils.o
+else
+Q3OBJ += $(B)/client/jpeg_memsrc.o
+endif
 
 ifeq ($(ARCH),i386)
   Q3OBJ += \


--- NEW FILE quake3-demo.sh ---
#!/bin/bash

set -e

. /usr/share/opengl-games-utils/opengl-game-functions.sh

checkDriOK quake3

if [ ! -f $HOME/.q3a/baseq3/pak0.pk3 ]; then
  set +e
  /usr/share/autodl/AutoDL.py /usr/share/quake3/quake3.autodlrc
  STATUS=$?
  set -e
  # status 2 means download was ok, but the user choice not to start the game
  if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
    cd ~/.q3a
    unzip -qq -u quake3-latest-pk3s.zip
    tail -n +165 linuxq3ademo-1.11-6.x86.gz.sh | gzip -d -c | \
      tar x demoq3/pak0.pk3
    # remove any old versions (if present) otherwise the mv fails
    rm -fr baseq3 missionpack
    mv quake3-latest-pk3s/* .
    mv demoq3/pak0.pk3 baseq3
    rm quake3-latest-pk3s.zip linuxq3ademo-1.11-6.x86.gz.sh
    rmdir quake3-latest-pk3s demoq3
  fi
  if [ "$STATUS" != "0" ]; then
    exit $STATUS
  fi
fi

exec quake3 "$@"


--- NEW FILE quake3.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Quake 3, an ID software game, the original Quake 3 datafiles are needed.

Click Accept, to download the demo version of the Quake3 datafiles, which can be freely downloaded from the internet.

If you own the full version you can use that instead, copy the .pk3 files from the registered version to <home folder>/.q3a/baseq3, and run quake3 again.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]LIMITED USE SOFTWARE LICENSE AGREEMENT

This Limited Use Software License Agreement (the "Agreement") is a legal agreement between you, the end-user, and Id Software, Inc. ("ID").  BY CONTINUING THE INSTALLATION OF THIS GAME DEMO PROGRAM ENTITLED QUAKE III: ARENA (THE "SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS  AGREEMENT.

1.    Grant of License.  Subject to the terms and provisions of this Agreement, ID grants to you the non-exclusive and limited right to use the Software only in executable or object code form. The term "Software" includes all elements of the Software, including, without limitation, data files and screen displays.  You are not receiving any ownership or proprietary right, title or interest in or to the Software or the  copyright, trademarks, or other rights related thereto.  For purposes of this section, "use" means loading the Software into RAM and/or onto computer hard drive, as well as installation of the Software on a hard disk or other storage device and means the uses permitted in section 3. hereinbelow.  You agree that the Software will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act (or any other law governing such matters) by you or anyone at your direction and that you will not utilize and will not authoriz!
 e anyone to utilize, in any other manner, the Software in violation of any applicable law.  The Software may not be downloaded or otherwise exported or exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.

2.    Prohibitions. You, either directly or indirectly, shall not do any of the following acts:

a.    rent the Software;

b.    sell the Software;

c.    lease or lend the Software;

d.    offer the Software on a "pay-per-play" basis;

e.    distribute the Software (except as permitted by section 3. hereinbelow);

f.    in any other manner and through any medium whatsoever commercially exploit the Software or use the Software for any commercial purpose;

g.    disassemble, reverse engineer, decompile, modify or alter the Software including, without limitation, creating or developing extra or add-on levels for the Software;

h.    translate the Software;

i.    reproduce or copy the Software (except as permitted by section 3. hereinbelow);

j.    publicly display the Software;

k.    prepare or develop derivative works based upon the Software; or

l.    remove or alter any legal notices or other markings or legends, such as trademark and copyright notices, affixed on or within the Software.

3.    Permitted Distribution and Copying.  So long as this Agreement accompanies each copy you make of  the Software, and so long as you fully comply, at all times, with this Agreement, ID grants to you the non-exclusive and limited right to copy the Software and to distribute such copies of the Software free of charge for non-commercial purposes which shall include the free of charge distribution of copies of the Software as mounted on the covers of magazines; provided, however, you shall not copy or distribute the Software in any infringing manner or in any manner which violates any law or  third party right and you shall not distribute the Software together with any material which is infringing, libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You agree to label conspicuously as "SHAREWARE" or "DEMO" each CD or other non-electronic copy of the Software that you make and distribute.  ID reserves all rights not granted in this Agreement. Y!
 ou shall not commercially distribute the Software  unless you first  enter into a separate contract with ID, a copy of which you may request, but which ID may decline to execute. For more information visit www.quake3arena.com.

4.    Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C., ??101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder complies with this Agreement.  You agree that you are receiving a copy of the Software by license only and not by sale and that the "first sale" doctrine of 17 U.S.C. ??109 does not apply to your receipt or use of the Software.

5.    NO WARRANTIES.  ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC REQUIREMENTS.  ADDITIONAL STATEMENTS SUCH AS PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. THIS SECTION 5. SHALL SURVIVE CANCELLATION OR TERMINATION OF THIS AGREEMENT.

6.    Governing Law, Venue, Indemnity and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Copyright and other proprietary matters will be governed by United States laws and international treaties.  Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas and you agree to submit to the jurisdiction of the courts in Dallas, Texas for any such litigation. You agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from your breach of this Agreement.  You agree that your unauthorized use of the Software, or any part thereof, may immediately and irreparably damage ID such that ID could not be adequately compensated solely by a !
 monetary award and that at ID's option ID shall be entitled to an injunctive order, in addition to all other available remedies including a monetary award, appropriately restraining and/or prohibiting such unauthorized use without the necessity of ID posting bond or other security. IN ANY CASE, ID AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, LICENSEES, SUBLICENSEES, SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM BY ANY OTHER PARTY.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not !
 apply to you. This Section 6. shall survive cancellation or te!
 rminatio
n of this Agreement.

7.    U.S. Government Restricted Rights. To the extent applicable, the United States Government shall only have those rights to use the Software as expressly stated and expressly limited and restricted in this Agreement, as provided in 48 C.F.R. ???? 227.7201 through 227.7204, inclusive.

8.    General Provisions.  Neither this Agreement nor any part or portion hereof shall be assigned or sublicensed by you.  ID may assign its rights under this Agreement in ID's sole discretion.  Should any provision of this Agreement be held to be void, invalid, unenforceable or illegal by a court of competent jurisdiction, the validity and enforceability of the other provisions shall not be affected thereby.  If any provision is determined to be unenforceable by a court of competent jurisdiction, you agree to a modification of such provision to provide for enforcement of the provision's intent, to the extent permitted by applicable law. Failure of ID to enforce any provision of this Agreement shall not constitute or be construed as a waiver of such provision or of the right to enforce such provision.  Immediately upon your failure to comply with or breach of any term or provision of this Agreement, THIS AGREEMENT AND YOUR LICENSE SHALL AUTOMATICALLY TERMINATE, WITHOUT NOTIC!
 E, AND ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.   In the event this Agreement is terminated, you shall have no right to use the Software, in any manner, and you shall immediately destroy all copies of the Software in your possession, custody or control.

YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]quake3-latest-pk3s.zip[/FILENAME]
	[MD5]308929f1a6b7068c9912c0759e3b0695[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]http://offload1.icculus.org/~zakk/quake3-latest-pk3s.zip[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]linuxq3ademo-1.11-6.x86.gz.sh[/FILENAME]
	[MD5]484610c1ce34272223a52ec331c99d5d[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE quake3.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Quake 3 Arena
Comment=Quake 3 Arena demo launcher, will automatically download the needed data-files
Exec=quake3-demo
Icon=quake3
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE quake3.spec ---
%define prever rc4

Name:           quake3
Version:        1.34
Release:        0.3.%{prever}%{?dist}
Summary:        Quake 3 Arena tournament 3D shooter game
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}
# 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
# rm -fr code/tools/lcc
# popd
# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
Source0:        %{name}-%{version}-%{prever}.tar.bz2
Source1:        %{name}-demo.sh
Source2:        %{name}.autodlrc
Source3:        %{name}.desktop
Source4:        %{name}.png
Patch0:         %{name}-1.34-syslibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
%ifarch %{ix86} x86_64
BuildRequires:  nasm
%endif
Requires:       hicolor-icon-theme autodownloader opengl-games-utils unzip

%description
This package contains the Quake 3 Arena engine. It comes with an applications
menu entry, which will offer to download and install the Quake 3 demo datafiles
for you. If you own a copy of quake 3, you will need to copy the pak?.pk3 files
from the original 1.32 Quake 3 Arena point release as well as pak0.pk3 from the
original CD-ROM to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.


%prep
%setup -q -n %{name}-%{version}-%{prever}
%patch0 -p1 -b .syslibs


%build
# 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" \
    DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
    CROSS_COMPILING=1


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}

install -m 755 build/release-linux-*/ioquake3.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3
install -m 755 build/release-linux-*/ioquake3-smp.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3-smp
install -m 755 build/release-linux-*/ioq3ded.* \
  $RPM_BUILD_ROOT%{_bindir}/q3ded
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/quake3-demo
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
%doc TODO code/jpeg-6/README
%{_bindir}/%{name}*
%{_bindir}/q3ded
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site

* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.2.rc4
- Use autodownloader to download demo files, thus making the game playable
  without the original CD
- Submit for Fedora inclusion now that the game is playable without the CD
- Update to 1.34-rc4
- Use system libjpeg, system SDL, OpenAL and curl headers

* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc2.svn908
- Update to today's svn code (rev. 908), rc2 from the 1.34 branch.

* Mon May 29 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn792
- Update to today's svn code (rev. 792).
- Update the nostrip patch.
- Fix wrapper script since the binary has been renamed from quake3 to
  ioquake3.<arch>, which we rename to plain ioquake3 (in the patch).
- Include new documentation.

* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn649
- Update to today's svn code (rev. 649).
- Update nostrip patch, now pass OPTFLAGS to the build too.
- Build requires subversion (required for make dist).

* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 1.33-0.2.svn470
- Update to today's svn sode (rev. 470).
- Add modular xorg build conditional.
- Revisit nostrip patch for the new code.
- Add (new?) openal-devel build requirement.
- Update %%doc files.

* Sun Nov 13 2005 Matthias Saou <http://freshrpms.net/> 1.33-0.1.svn338
- Update to GPL'ed 1.33 and spec file cleanup.

* Sun Oct 15 2000 Matthias Saou <http://freshrpms.net/> 1.17-1
- Initial RPM based on Loki's 1.17 point release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:37:11 -0000	1.1
+++ .cvsignore	29 Sep 2007 08:04:58 -0000	1.2
@@ -0,0 +1 @@
+quake3-1.34-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:37:11 -0000	1.1
+++ sources	29 Sep 2007 08:04:58 -0000	1.2
@@ -0,0 +1 @@
+14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 08:08:01 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Sep 2007 04:08:01 -0400
Subject: rpms/quake3/F-7 quake3-1.34-syslibs.patch, NONE, 1.1 quake3-demo.sh,
	NONE, 1.1 quake3.autodlrc, NONE, 1.1 quake3.desktop, NONE,
	1.1 quake3.png, NONE, 1.1 quake3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200709290808.l8T881RB015553@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15522

Modified Files:
	.cvsignore sources 
Added Files:
	quake3-1.34-syslibs.patch quake3-demo.sh quake3.autodlrc 
	quake3.desktop quake3.png quake3.spec 
Log Message:
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site


quake3-1.34-syslibs.patch:

--- NEW FILE quake3-1.34-syslibs.patch ---
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+* memsrc.c
+*
+* Copyright (C) 1994-1996, Thomas G. Lane.
+* This file is part of the Independent JPEG Group's software.
+* For conditions of distribution and use, see the accompanying README file.
+*
+* This file contains decompression data source routines for the case of
+* reading JPEG data from a memory buffer that is preloaded with the entire
+* JPEG file. This would not seem especially useful at first sight, but
+* a number of people have asked for it.
+* This is really just a stripped-down version of jdatasrc.c. Comparison
+* of this code with jdatasrc.c may be helpful in seeing how to make
+* custom source managers for other purposes.
+*/
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+/* Expanded data source object for memory input */
+
+typedef struct {
+struct jpeg_source_mgr pub; /* public fields */
+
+JOCTET eoi_buffer[2]; /* a place to put a dummy EOI */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+
+/*
+* Initialize source --- called by jpeg_read_header
+* before any data is actually read.
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+/* No work, since jpeg_memory_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.
+*/
+}
+
+
+/*
+* Fill the input buffer --- called whenever buffer is emptied.
+*
+* In this application, this routine should never be called; if it is called,
+* the decompressor has overrun the end of the input buffer, implying we
+* supplied an incomplete or corrupt JPEG datastream. A simple error exit
+* might be the most appropriate response.
+*
+* But what we choose to do in this code is to supply dummy EOI markers
+* in order to force the decompressor to finish processing and supply
+* some sort of output image, no matter how corrupted.
+*/
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+WARNMS(cinfo, JWRN_JPEG_EOF);
+
+/* Create a fake EOI marker */
+src->eoi_buffer[0] = (JOCTET) 0xFF;
+src->eoi_buffer[1] = (JOCTET) JPEG_EOI;
+src->pub.next_input_byte = src->eoi_buffer;
+src->pub.bytes_in_buffer = 2;
+
+return TRUE;
+}
+
+
+/*
+* Skip data --- used to skip over a potentially large amount of
+* uninteresting data (such as an APPn marker).
+*
+* If we overrun the end of the buffer, we let fill_input_buffer deal with
+* it. An extremely large skip could cause some time-wasting here, but
+* it really isn't supposed to happen ... and the decompressor will never
+* skip more than 64K anyway.
+*/
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+my_src_ptr src = (my_src_ptr) cinfo->src;
+
+if (num_bytes > 0) {
+while (num_bytes > (long) src->pub.bytes_in_buffer) {
+num_bytes -= (long) src->pub.bytes_in_buffer;
+(void) fill_input_buffer(cinfo);
+/* note we assume that fill_input_buffer will never return FALSE,
+* so suspension need not be handled.
+*/
+}
+src->pub.next_input_byte += (size_t) num_bytes;
+src->pub.bytes_in_buffer -= (size_t) num_bytes;
+}
+}
+
+
+/*
+* An additional method that can be provided by data source modules is the
+* resync_to_restart method for error recovery in the presence of RST markers.
+* For the moment, this source module just uses the default resync method
+* provided by the JPEG library. That method assumes that no backtracking
+* is possible.
+*/
+
+
+/*
+* Terminate source --- called by jpeg_finish_decompress
+* after all data has been read. Often a no-op.
+*
+* NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+* application must deal with any cleanup that should happen even
+* for error exit.
+*/
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+/* no work necessary here */
+}
+
+
+/*
+* Prepare for input from a memory buffer.
+*/
+
+GLOBAL(void)
+jpeg_memory_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
+* 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.
+*/
+if (cinfo->src == NULL) { /* first time for this JPEG object? */
+cinfo->src = (struct jpeg_source_mgr *)
+(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+sizeof(my_source_mgr));
+}
+
+src = (my_src_ptr) cinfo->src;
+src->pub.init_source = init_source;
+src->pub.fill_input_buffer = fill_input_buffer;
+src->pub.skip_input_data = skip_input_data;
+src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+src->pub.term_source = term_source;
+
+src->pub.next_input_byte = buffer;
+src->pub.bytes_in_buffer = 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-25 19:37:48.000000000 +0200
+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
  * You may also wish to include "jerror.h".
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <jpeglib.h>
+#include "jpeg_memsrc.h"
+#else
 #define JPEG_INTERNALS
 #include "../jpeg-6/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;
   byte  *buf;
+  size_t bufsize;
+#ifdef USE_SYSTEM_JPEG
+  int i,j;
+  byte *inptr, *outptr;
+#endif
 
   /* 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
   }
 
   memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
+  row_stride = cinfo.output_width * 4;
 
   out = ri.Malloc(memcount);
 
@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
 	buf = ((out+(row_stride*cinfo.output_scanline)));
 	buffer = &buf;
     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+#ifdef USE_SYSTEM_JPEG
+    /* we have RGB data, we need to expand this out to ARGB */
+    inptr = buf + cinfo.output_width * 3 - 1;
+    outptr = buf + row_stride - 1;
+
+    for (i = 0; i < cinfo.output_width; i++) {
+      /* endian dependent? maybe for big endian this must be done after the
+         color/pixel copy? */
+      *outptr-- = 255;
+      for (j = 0; j < 3; j++) {
+        JOCTET color = *inptr--;
+        *outptr-- = color;
+      }
+    }
+#endif
   }
   
   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.
diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
--- /dev/null	2007-09-24 08:32:51.587004947 +0200
+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include <jpeglib.h>
+
+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
+  size_t bufsize);
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:17:27.000000000 +0200
+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
@@ -15,10 +15,23 @@
  * Note that the max_memory_to_use option is ignored by this implementation.
  */
 
+#ifdef USE_SYSTEM_JPEG
+#include <stdio.h>
+#include <stdlib.h>
+#include <jpeglib.h>
+
+#undef GLOBAL
+#define GLOBAL
+#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
 
 #include "../renderer/tr_local.h"
 
@@ -83,7 +96,13 @@ GLOBAL void
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
+#ifdef USE_SYSTEM_JPEG
+  fprintf(stderr,
+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
+  exit(1);
+#else
   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+#endif
 }
 
 
diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
--- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
@@ -96,6 +96,10 @@ ifndef USE_OPENAL
 USE_OPENAL=1
 endif
 
+ifndef USE_SYSTEM_JPEG
+USE_SYSTEM_JPEG=1
+endif
+
 ifndef USE_OPENAL_DLOPEN
 USE_OPENAL_DLOPEN=0
 endif
@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
   endif
   endif
 
-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+  BASE_CFLAGS = 
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL=1
@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
+  endif
+
   ifeq ($(USE_SDL),1)
     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
   else
@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
   endif
 
+  ifeq ($(USE_SYSTEM_JPEG),1)
+    CLIENT_LDFLAGS += -ljpeg
+  endif
+
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
@@ -970,40 +982,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/jccoefct.o  \
-  $(B)/client/jccolor.o \
-  $(B)/client/jfdctflt.o \
-  $(B)/client/jcdctmgr.o \
-  $(B)/client/jcphuff.o \
-  $(B)/client/jcmainct.o \
-  $(B)/client/jcmarker.o \
-  $(B)/client/jcmaster.o \
-  $(B)/client/jcomapi.o \
-  $(B)/client/jcparam.o \
-  $(B)/client/jcprepct.o \
-  $(B)/client/jcsample.o \
-  $(B)/client/jdapimin.o \
-  $(B)/client/jdapistd.o \
-  $(B)/client/jdatasrc.o \
-  $(B)/client/jdcoefct.o \
-  $(B)/client/jdcolor.o \
-  $(B)/client/jddctmgr.o \
-  $(B)/client/jdhuff.o \
-  $(B)/client/jdinput.o \
-  $(B)/client/jdmainct.o \
-  $(B)/client/jdmarker.o \
-  $(B)/client/jdmaster.o \
-  $(B)/client/jdpostct.o \
-  $(B)/client/jdsample.o \
-  $(B)/client/jdtrans.o \
-  $(B)/client/jerror.o \
-  $(B)/client/jidctflt.o \
-  $(B)/client/jmemmgr.o \
   $(B)/client/jmemnobs.o \
-  $(B)/client/jutils.o \
   \
   $(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
+
+ifneq ($(USE_SYSTEM_JPEG),1)
+  Q3OBJ += \
+    $(B)/client/jcapimin.o \
+    $(B)/client/jchuff.o   \
+    $(B)/client/jcinit.o \
+    $(B)/client/jccoefct.o  \
+    $(B)/client/jccolor.o \
+    $(B)/client/jfdctflt.o \
+    $(B)/client/jcdctmgr.o \
+    $(B)/client/jcphuff.o \
+    $(B)/client/jcmainct.o \
+    $(B)/client/jcmarker.o \
+    $(B)/client/jcmaster.o \
+    $(B)/client/jcomapi.o \
+    $(B)/client/jcparam.o \
+    $(B)/client/jcprepct.o \
+    $(B)/client/jcsample.o \
+    $(B)/client/jdapimin.o \
+    $(B)/client/jdapistd.o \
+    $(B)/client/jdatasrc.o \
+    $(B)/client/jdcoefct.o \
+    $(B)/client/jdcolor.o \
+    $(B)/client/jddctmgr.o \
+    $(B)/client/jdhuff.o \
+    $(B)/client/jdinput.o \
+    $(B)/client/jdmainct.o \
+    $(B)/client/jdmarker.o \
+    $(B)/client/jdmaster.o \
+    $(B)/client/jdpostct.o \
+    $(B)/client/jdsample.o \
+    $(B)/client/jdtrans.o \
+    $(B)/client/jerror.o \
+    $(B)/client/jidctflt.o \
+    $(B)/client/jmemmgr.o \
+    $(B)/client/jutils.o
+else
+Q3OBJ += $(B)/client/jpeg_memsrc.o
+endif
 
 ifeq ($(ARCH),i386)
   Q3OBJ += \


--- NEW FILE quake3-demo.sh ---
#!/bin/bash

set -e

. /usr/share/opengl-games-utils/opengl-game-functions.sh

checkDriOK quake3

if [ ! -f $HOME/.q3a/baseq3/pak0.pk3 ]; then
  set +e
  /usr/share/autodl/AutoDL.py /usr/share/quake3/quake3.autodlrc
  STATUS=$?
  set -e
  # status 2 means download was ok, but the user choice not to start the game
  if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
    cd ~/.q3a
    unzip -qq -u quake3-latest-pk3s.zip
    tail -n +165 linuxq3ademo-1.11-6.x86.gz.sh | gzip -d -c | \
      tar x demoq3/pak0.pk3
    # remove any old versions (if present) otherwise the mv fails
    rm -fr baseq3 missionpack
    mv quake3-latest-pk3s/* .
    mv demoq3/pak0.pk3 baseq3
    rm quake3-latest-pk3s.zip linuxq3ademo-1.11-6.x86.gz.sh
    rmdir quake3-latest-pk3s demoq3
  fi
  if [ "$STATUS" != "0" ]; then
    exit $STATUS
  fi
fi

exec quake3 "$@"


--- NEW FILE quake3.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Quake 3, an ID software game, the original Quake 3 datafiles are needed.

Click Accept, to download the demo version of the Quake3 datafiles, which can be freely downloaded from the internet.

If you own the full version you can use that instead, copy the .pk3 files from the registered version to <home folder>/.q3a/baseq3, and run quake3 again.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]LIMITED USE SOFTWARE LICENSE AGREEMENT

This Limited Use Software License Agreement (the "Agreement") is a legal agreement between you, the end-user, and Id Software, Inc. ("ID").  BY CONTINUING THE INSTALLATION OF THIS GAME DEMO PROGRAM ENTITLED QUAKE III: ARENA (THE "SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS  AGREEMENT.

1.    Grant of License.  Subject to the terms and provisions of this Agreement, ID grants to you the non-exclusive and limited right to use the Software only in executable or object code form. The term "Software" includes all elements of the Software, including, without limitation, data files and screen displays.  You are not receiving any ownership or proprietary right, title or interest in or to the Software or the  copyright, trademarks, or other rights related thereto.  For purposes of this section, "use" means loading the Software into RAM and/or onto computer hard drive, as well as installation of the Software on a hard disk or other storage device and means the uses permitted in section 3. hereinbelow.  You agree that the Software will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act (or any other law governing such matters) by you or anyone at your direction and that you will not utilize and will not authoriz!
 e anyone to utilize, in any other manner, the Software in violation of any applicable law.  The Software may not be downloaded or otherwise exported or exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.

2.    Prohibitions. You, either directly or indirectly, shall not do any of the following acts:

a.    rent the Software;

b.    sell the Software;

c.    lease or lend the Software;

d.    offer the Software on a "pay-per-play" basis;

e.    distribute the Software (except as permitted by section 3. hereinbelow);

f.    in any other manner and through any medium whatsoever commercially exploit the Software or use the Software for any commercial purpose;

g.    disassemble, reverse engineer, decompile, modify or alter the Software including, without limitation, creating or developing extra or add-on levels for the Software;

h.    translate the Software;

i.    reproduce or copy the Software (except as permitted by section 3. hereinbelow);

j.    publicly display the Software;

k.    prepare or develop derivative works based upon the Software; or

l.    remove or alter any legal notices or other markings or legends, such as trademark and copyright notices, affixed on or within the Software.

3.    Permitted Distribution and Copying.  So long as this Agreement accompanies each copy you make of  the Software, and so long as you fully comply, at all times, with this Agreement, ID grants to you the non-exclusive and limited right to copy the Software and to distribute such copies of the Software free of charge for non-commercial purposes which shall include the free of charge distribution of copies of the Software as mounted on the covers of magazines; provided, however, you shall not copy or distribute the Software in any infringing manner or in any manner which violates any law or  third party right and you shall not distribute the Software together with any material which is infringing, libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You agree to label conspicuously as "SHAREWARE" or "DEMO" each CD or other non-electronic copy of the Software that you make and distribute.  ID reserves all rights not granted in this Agreement. Y!
 ou shall not commercially distribute the Software  unless you first  enter into a separate contract with ID, a copy of which you may request, but which ID may decline to execute. For more information visit www.quake3arena.com.

4.    Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C., ??101 et seq. and other applicable law. You agree to use your best efforts to see that any user of the Software licensed hereunder complies with this Agreement.  You agree that you are receiving a copy of the Software by license only and not by sale and that the "first sale" doctrine of 17 U.S.C. ??109 does not apply to your receipt or use of the Software.

5.    NO WARRANTIES.  ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC REQUIREMENTS.  ADDITIONAL STATEMENTS SUCH AS PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. THIS SECTION 5. SHALL SURVIVE CANCELLATION OR TERMINATION OF THIS AGREEMENT.

6.    Governing Law, Venue, Indemnity and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Copyright and other proprietary matters will be governed by United States laws and international treaties.  Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas and you agree to submit to the jurisdiction of the courts in Dallas, Texas for any such litigation. You agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from your breach of this Agreement.  You agree that your unauthorized use of the Software, or any part thereof, may immediately and irreparably damage ID such that ID could not be adequately compensated solely by a !
 monetary award and that at ID's option ID shall be entitled to an injunctive order, in addition to all other available remedies including a monetary award, appropriately restraining and/or prohibiting such unauthorized use without the necessity of ID posting bond or other security. IN ANY CASE, ID AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, LICENSEES, SUBLICENSEES, SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM BY ANY OTHER PARTY.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not !
 apply to you. This Section 6. shall survive cancellation or te!
 rminatio
n of this Agreement.

7.    U.S. Government Restricted Rights. To the extent applicable, the United States Government shall only have those rights to use the Software as expressly stated and expressly limited and restricted in this Agreement, as provided in 48 C.F.R. ???? 227.7201 through 227.7204, inclusive.

8.    General Provisions.  Neither this Agreement nor any part or portion hereof shall be assigned or sublicensed by you.  ID may assign its rights under this Agreement in ID's sole discretion.  Should any provision of this Agreement be held to be void, invalid, unenforceable or illegal by a court of competent jurisdiction, the validity and enforceability of the other provisions shall not be affected thereby.  If any provision is determined to be unenforceable by a court of competent jurisdiction, you agree to a modification of such provision to provide for enforcement of the provision's intent, to the extent permitted by applicable law. Failure of ID to enforce any provision of this Agreement shall not constitute or be construed as a waiver of such provision or of the right to enforce such provision.  Immediately upon your failure to comply with or breach of any term or provision of this Agreement, THIS AGREEMENT AND YOUR LICENSE SHALL AUTOMATICALLY TERMINATE, WITHOUT NOTIC!
 E, AND ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.   In the event this Agreement is terminated, you shall have no right to use the Software, in any manner, and you shall immediately destroy all copies of the Software in your possession, custody or control.

YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]quake3-latest-pk3s.zip[/FILENAME]
	[MD5]308929f1a6b7068c9912c0759e3b0695[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]http://offload1.icculus.org/~zakk/quake3-latest-pk3s.zip[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]linuxq3ademo-1.11-6.x86.gz.sh[/FILENAME]
	[MD5]484610c1ce34272223a52ec331c99d5d[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE quake3.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Quake 3 Arena
Comment=Quake 3 Arena demo launcher, will automatically download the needed data-files
Exec=quake3-demo
Icon=quake3
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE quake3.spec ---
%define prever rc4

Name:           quake3
Version:        1.34
Release:        0.3.%{prever}%{?dist}
Summary:        Quake 3 Arena tournament 3D shooter game
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}
# 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
# rm -fr code/tools/lcc
# popd
# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
Source0:        %{name}-%{version}-%{prever}.tar.bz2
Source1:        %{name}-demo.sh
Source2:        %{name}.autodlrc
Source3:        %{name}.desktop
Source4:        %{name}.png
Patch0:         %{name}-1.34-syslibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
%ifarch %{ix86} x86_64
BuildRequires:  nasm
%endif
Requires:       hicolor-icon-theme autodownloader opengl-games-utils unzip

%description
This package contains the Quake 3 Arena engine. It comes with an applications
menu entry, which will offer to download and install the Quake 3 demo datafiles
for you. If you own a copy of quake 3, you will need to copy the pak?.pk3 files
from the original 1.32 Quake 3 Arena point release as well as pak0.pk3 from the
original CD-ROM to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.


%prep
%setup -q -n %{name}-%{version}-%{prever}
%patch0 -p1 -b .syslibs


%build
# 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" \
    DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
    USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
    CROSS_COMPILING=1


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}

install -m 755 build/release-linux-*/ioquake3.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3
install -m 755 build/release-linux-*/ioquake3-smp.* \
  $RPM_BUILD_ROOT%{_bindir}/quake3-smp
install -m 755 build/release-linux-*/ioq3ded.* \
  $RPM_BUILD_ROOT%{_bindir}/q3ded
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/quake3-demo
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps


%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

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
%doc TODO code/jpeg-6/README
%{_bindir}/%{name}*
%{_bindir}/q3ded
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
- Update autodlrc file to use fast mirrors instead of the slow and unreliable
  official ID software site

* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.2.rc4
- Use autodownloader to download demo files, thus making the game playable
  without the original CD
- Submit for Fedora inclusion now that the game is playable without the CD
- Update to 1.34-rc4
- Use system libjpeg, system SDL, OpenAL and curl headers

* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc2.svn908
- Update to today's svn code (rev. 908), rc2 from the 1.34 branch.

* Mon May 29 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn792
- Update to today's svn code (rev. 792).
- Update the nostrip patch.
- Fix wrapper script since the binary has been renamed from quake3 to
  ioquake3.<arch>, which we rename to plain ioquake3 (in the patch).
- Include new documentation.

* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.34-0.1.rc1.svn649
- Update to today's svn code (rev. 649).
- Update nostrip patch, now pass OPTFLAGS to the build too.
- Build requires subversion (required for make dist).

* Fri Jan 13 2006 Matthias Saou <http://freshrpms.net/> 1.33-0.2.svn470
- Update to today's svn sode (rev. 470).
- Add modular xorg build conditional.
- Revisit nostrip patch for the new code.
- Add (new?) openal-devel build requirement.
- Update %%doc files.

* Sun Nov 13 2005 Matthias Saou <http://freshrpms.net/> 1.33-0.1.svn338
- Update to GPL'ed 1.33 and spec file cleanup.

* Sun Oct 15 2000 Matthias Saou <http://freshrpms.net/> 1.17-1
- Initial RPM based on Loki's 1.17 point release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Sep 2007 21:37:11 -0000	1.1
+++ .cvsignore	29 Sep 2007 08:07:29 -0000	1.2
@@ -0,0 +1 @@
+quake3-1.34-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Sep 2007 21:37:11 -0000	1.1
+++ sources	29 Sep 2007 08:07:29 -0000	1.2
@@ -0,0 +1 @@
+14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:29:28 2007
From: fedora-extras-commits at redhat.com (Transifex CVS User (transifexcvs))
Date: Sat, 29 Sep 2007 06:29:28 -0400
Subject: comps/po bg.po,1.5,1.6
Message-ID: <200709291029.l8TATS1C031102@cvs-int.fedora.redhat.com>

Author: transifexcvs

Update of /cvs/pkgs/comps/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31068/po

Modified Files:
	bg.po 
Log Message:
2007-09-29  Doncho Nicolaev Gunchev <gunchev at gmail.com> (via
mr700 at fedoraproject.org)

  * po/bg.po: Updated Bulgarian translation, 1 language name unknown




Index: bg.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bg.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bg.po	17 Sep 2007 19:22:12 -0000	1.5
+++ bg.po	29 Sep 2007 10:28:58 -0000	1.6
@@ -1,19 +1,18 @@
-# translation of comps.po to Bulgarian
 # translation of comps.pot to Bulgarian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # ?????????????? ???????????????????? <nikolay at sarmadzhiev.com>, 2004, 2005.
 # Doncho N. Gunchev <gunchev at gmail.com>, 2007.
-# Miroslav Ivanov <satyr at globalnet.bg>, 2007.
+# Miroslav Ivanov <kiro.kopeleto at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps\n"
+"Project-Id-Version: bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-17 15:18-0400\n"
-"PO-Revision-Date: 2007-03-29 11:11+0300\n"
-"Last-Translator: Miroslav Ivanov <satyr at globalnet.bg>\n"
-"Language-Team: Bulgarian <bg at li.org>\n"
+"POT-Creation-Date: 2007-09-29 01:43-0700\n"
+"PO-Revision-Date: 2007-09-29 13:24+0300\n"
+"Last-Translator: Doncho N. Gunchev <gunchev at gmail.com>\n"
+"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +21,7 @@
 #: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 #: ../comps-f8.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "???????? ?????????????? ?????????? ???????????????? ?????????? ???? ?????????? ????????????."
+msgstr "???????? ?????????????? ?????????????? ??????????, ?????????? ???????????? ?????????? ???? ?????????? ????????????."
 
 #: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 #: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
@@ -42,12 +41,12 @@
 #: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7
 #: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8
 #: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10
 #: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
@@ -62,7 +61,7 @@
 #: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31
 #: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9
 msgid "Desktop Environments"
-msgstr "?????????????? ??????????"
+msgstr "?????????????? ??????????"
 
 #: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32
 #: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10
@@ -72,12 +71,12 @@
 #: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33
 #: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11
 msgid "Development"
-msgstr "????????????????????????"
+msgstr "????????????????????"
 
 #: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35
 #: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12
 msgid "Development Tools"
-msgstr "?????????????????????? ???? ????????????????????????"
+msgstr "?????????????????????? ???? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12
 #: ../comps-el5.xml.in.h:13
@@ -97,12 +96,12 @@
 #: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41
 #: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16
 msgid "Educational software for learning"
-msgstr "???????????? ??????????????"
+msgstr "???????????? ?????????????? ???? ??????????"
 
 #: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42
 #: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17
 msgid "Engineering and Scientific"
-msgstr "???????????????????? ?? ???????????? ??????????????????????"
+msgstr "?????????????????????? ?? ??????????"
 
 #: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46
 #: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18
@@ -115,8 +114,8 @@
 "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 ""
-"?????????????? ???????????? ?????????????????? ???? ???????????????? ?? ??????????/?????????? - ???? ?????????????????? ???? ?????????????? "
-"?????????????? ???? ?????????????????????? ???? ?????????????????? ????????????."
+"???? ?????????? ???? ?????????????? ?????????????? ???? ?????????????????????? ???? ????????????, ?????????? ?? ???????????????????????? "
+"??????????????, ???????? ?????????? ???????????? ?????????????????? ???????????? ?? ?????????? ?? ?????????? ???? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52
 #: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20
@@ -145,7 +144,7 @@
 #: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60
 #: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid "Graphical Internet"
-msgstr "???????????????? ????????????????"
+msgstr "???????????????? ????????????????"
 
 #: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61
 #: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25
@@ -160,7 +159,7 @@
 #: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65
 #: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27
 msgid "Hebrew Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70
 #: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28
@@ -177,7 +176,7 @@
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
-"???????????????????????? ????????????????, ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? "
+"???????????????????????? ???????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? "
 "????????????????????."
 
 #: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72
@@ -196,17 +195,17 @@
 #: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78
 #: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31
 msgid "Japanese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83
 #: ../comps-el4.xml.in.h:30
 msgid "Java"
-msgstr "?????????? (Java)"
+msgstr "Java"
 
 #: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84
 #: ../comps-el4.xml.in.h:31
 msgid "Java Development"
-msgstr "??????????(Java) ????????????????????????"
+msgstr "Java ????????????????????"
 
 #: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81
 #: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32
@@ -216,7 +215,7 @@
 #: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82
 #: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33
 msgid "KDE Software Development"
-msgstr "KDE ?????????????????? ???????????????????? "
+msgstr "KDE ?????????????????? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34
 #: ../comps-el5.xml.in.h:34
@@ -240,12 +239,12 @@
 #: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101
 #: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
 msgid "News Server"
-msgstr "News ????????????"
+msgstr "???????????????????? ????????????"
 
 #: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104
 #: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
 msgid "Office/Productivity"
-msgstr "????????/????????????????????????????????"
+msgstr "????????/??????????????????????????"
 
 #: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106
 #: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
@@ -266,7 +265,7 @@
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
-"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????."
+"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125
 #: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
@@ -280,7 +279,7 @@
 "and edit files. These include Emacs and Vi."
 msgstr ""
 "????????????????????, ?????????? ???????????????? ???????????????? ??????????????????,  ???????????????????? ?????????????????????? ?? "
-"?????????????????????????? ???? ??????????????. ???? ???????????????? ??????????(emacs) ?? ????(vi)."
+"?????????????????????????? ???? ??????????????. ???? ???????????????? emacs ?? vi."
 
 #: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128
 #: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
@@ -290,12 +289,12 @@
 #: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141
 #: ../comps-el4.xml.in.h:45
 msgid "Support for developing programs in the Java programming language."
-msgstr "?????????????????? ???? ???????????? ???? ???????????????? ???? ?????????? (Java)."
+msgstr "?????????????????? ???? ???????????????????? ???? ???????????????? ???? ???????????????????? ???????? Java."
 
 #: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142
 #: ../comps-el4.xml.in.h:46
 msgid "Support for running programs written in the Java programming language."
-msgstr "?????????????????? ???? ???????????????? ???????????? ???? ?????????? (Java)."
+msgstr "?????????????????? ???? ???????????????? ???????????????? ???? ???????????????????? ???????? Java."
 
 #: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136
 #: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45
@@ -305,22 +304,22 @@
 #: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140
 #: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46
 msgid "Text-based Internet"
-msgstr "??????????-?????????????? ????????????????"
+msgstr "???????????????? ????????????????"
 
 #: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49
 #: ../comps-el5.xml.in.h:47
 msgid "The XEmacs text editor."
-msgstr "XEmacs ?????????????? ????????????????."
+msgstr "?????????????????? ???????????????? XEmacs."
 
 #: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143
 #: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr "???????????????????????? ???????????????? ???????? ??????????, PDF ?????????????? ?? ??????????."
+msgstr "???????????????????????? ???????????????? ???????? ????????????, ???????????????? ???? ?????????????? ???? PDF ?? ??????????."
 
 #: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145
 #: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
-msgstr "???????????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????."
+msgstr "???????? ???????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147
 #: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50
@@ -335,18 +334,18 @@
 "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, Postscript ?????? ??????????."
 
 #: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154
 #: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid "These tools allow you to run a Web server on the system."
-msgstr "?????????????????????????? ???????????????????? ???????????????????????? ???? ?????? ???????????? ???? ??????????????????."
+msgstr "???????? ?????????????????????? ???????????????????? ???????????????????? ???? ?????? ???????????? ?? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155
 #: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53
 msgid "These tools allow you to run an FTP server on the system."
-msgstr "?????????????????????????? ???????????????????? ???????????????????????? ???? FTP ???????????? ???? ??????????????????."
+msgstr "???????? ?????????????????????????? ???????????????????? ???????????????????? ???? FTP ???????????? ?? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156
 #: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54
@@ -355,17 +354,19 @@
 "python, and debuggers."
 msgstr ""
 "?????????????????????????? ???????????????? ???????????????? ?????????????????????? ???? ???????????????????? ???????? automake, "
-"gcc, perl, python ?? ????????????????."
+"gcc, perl, python, ?????????? ?? ????????????????."
 
 #: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157
 #: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55
 msgid "This group allows you to configure the system as a news server."
-msgstr "?????????????? ?????????????????? ?????????????????????????? ???? ?????????????????? ???????? News ????????????."
+msgstr ""
+"???????? ?????????????? ?????????????????? ?????????????????????? ???? ?????????????????? ???? ???????????? ???????? ???????????????????? "
+"????????????."
 
 #: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160
 #: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56
 msgid "This group includes graphical email, Web, and chat clients."
-msgstr "?????????????? ?????????????? ??????????, ?????? ?? ?????? ??????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????? ???? ???????????????? ????????, ?????? ?? ??????."
 
 #: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161
 #: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57
@@ -373,14 +374,14 @@
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr ""
-"?????????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? ???????????????????? ?? "
-"????????????????????????????."
+"???????? ?????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? "
+"????????????????????, ?????????????????????????? ?? ?????????????????????????? ???? ?????????? ??????????????."
 
 #: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162
 #: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
-"?????????????? ???????????????? ????????????, ?????????? ???????????????????? ???????????????????????????? ?? ?????????????????????? ???? "
+"???????? ?????????? ???????????????? ????????????, ?????????? ???????????????????? ?????? ???????????????????????? ?? ?????????????????? ???? "
 "??????????????????????."
 
 #: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163
@@ -389,8 +390,8 @@
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
-"?????????????? ?????????????? ??????????-???????????????? ??????????, ?????? ?? ?????? ??????????????. ???????? ???????????????????? ???? "
-"???? ?????????????? ???? ??."
+"???????? ?????????? ?????????????? ???????????????? ?????????????? ???? ????????, ?????? ?? ??????. ???????? ???????????????????? ???? "
+"???? ?????????????? ???? ?????????????? ???? ???????????????? ??."
 
 #: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164
 #: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60
@@ -398,22 +399,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-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63
 #: ../comps-el5.xml.in.h:61
-#, fuzzy
 msgid "This group is a collection of network servers for specific purposes"
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????????? ?????????????????? ????????????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????"
 
 #: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64
 #: ../comps-el5.xml.in.h:62
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165
 #: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
@@ -423,23 +422,21 @@
 
 #: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66
 #: ../comps-el5.xml.in.h:65
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67
 #: ../comps-el5.xml.in.h:66
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????."
 
 #: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166
 #: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????????? ?????????????????? ????????????????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????."
 
 #: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167
 #: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
@@ -447,14 +444,14 @@
 "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-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179
 #: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69
 msgid "Various core pieces of the system."
-msgstr "???????????????? ?????????????? ???? ???????????? ???? ??????????????????."
+msgstr "???????????????? ???????????? ?????????? ???? ??????????????????."
 
 #: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180
 #: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70
@@ -479,12 +476,12 @@
 #: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190
 #: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74
 msgid "X Window System"
-msgstr "?? ???????????????????? ??????????????"
+msgstr "?????????????? ???? ???????????????? ??"
 
 #: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75
 #: ../comps-el5.xml.in.h:75
 msgid "XEmacs"
-msgstr "????????????"
+msgstr "XEmacs"
 
 #: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191
 #: ../comps-f8.xml.in.h:199
@@ -499,22 +496,20 @@
 #: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29
 #: ../comps-el5.xml.in.h:8
 msgid "Czech Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64
-#, fuzzy
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
-msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????."
+msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????? ?????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3
 msgid "Afrikaans Support"
-msgstr "?????????????????? ???? ???????????????? (????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4
-#, fuzzy
 msgid "Albanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6
 msgid "Applications to perform a variety of tasks"
@@ -522,58 +517,55 @@
 
 #: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9
 msgid "Assamese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11
 msgid "Base"
-msgstr "????????"
+msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13
 msgid "Basic support for the Ruby programming language."
-msgstr "???????????? ?????????????????? ???? Ruby ???????? ???? ????????????????????????."
+msgstr "???????????? ?????????????????? ???? ?????????? ???? ???????????????????????? ruby."
 
 #: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14
 msgid "Basque Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15
-#, fuzzy
 msgid "Belarusian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16
 msgid "Bengali Support"
 msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17
-#, fuzzy
 msgid "Bhutanese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18
-#, fuzzy
 msgid "Bosnian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19
 msgid "Brazilian Portuguese Support"
-msgstr "?????????????????? ???? ?????????????????????? (?????????????????? ????????????)"
+msgstr "?????????????????? ???? ?????????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20
 msgid "Breton Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22
 msgid "Bulgarian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23
 msgid "Catalan Support"
-msgstr "??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24
 msgid "Chinese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25
 msgid "Clustering"
@@ -585,23 +577,23 @@
 
 #: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27
 msgid "Core"
-msgstr "??????????"
+msgstr "????????????"
 
 #: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28
 msgid "Croatian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30
 msgid "DNS Name Server"
-msgstr "DNS Nameserver"
+msgstr "DNS ???????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31
 msgid "Danish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35
 msgid "Development Libraries"
-msgstr "???????????????????? ???? ????????????????????????"
+msgstr "???????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37
 msgid "Dial-up Networking Support"
@@ -609,40 +601,39 @@
 
 #: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38
 msgid "Dutch Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:38
 msgid "Eclipse"
-msgstr "????????????"
+msgstr "Eclipse"
 
 #: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43
 msgid "English (UK) Support"
-msgstr "?????????????????? ???? ?????????????????? ??????????????????"
+msgstr "?????????????????? ???? ?????????????????? ??????????????????"
 
 #: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44
 msgid "Estonian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45
 msgid "Ethiopic Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47
 msgid "Faeroese Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49
-#, fuzzy
 msgid "Filipino Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50
 msgid "Finnish Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53
 msgid "French Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57
 msgid ""
@@ -654,64 +645,62 @@
 
 #: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58
 msgid "Gaelic Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59
 msgid "Galician Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61
-#, fuzzy
 msgid "Georgian Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62
 msgid "German Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65
 msgid "Greek Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66
 msgid "Gujarati Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69
 msgid "Hindi Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70
 msgid "Hungarian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71
 msgid "Icelandic Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72
 msgid "Indonesian Support"
-msgstr "?????????????????? ???? ????????????????????????"
+msgstr "?????????????????? ???? ????????????????????????"
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76
 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:79
-#, fuzzy
 msgid "Inuktitut Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80
 msgid "Irish Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81
 msgid "Italian Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87
 msgid ""
@@ -726,56 +715,52 @@
 msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89
-#, fuzzy
 msgid "Khmer Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90
 msgid "Korean Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91
 msgid "Languages"
 msgstr "??????????"
 
 #: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92
-#, fuzzy
 msgid "Lao Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ??????"
 
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93
-#, fuzzy
 msgid "Latvian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95
 msgid "Legacy Network Server"
-msgstr "???????????????? ?????????????? ??????????????"
+msgstr "???????????????????????? ?????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96
 msgid "Legacy Software Development"
-msgstr "?????????????????? ?????????????????? ???? ???????????????? ??????????????"
+msgstr "???????????????????? ???? ?????????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97
 msgid "Legacy Software Support"
-msgstr "?????????????????? ???? ???????????? ??????????????"
+msgstr "?????????????????? ???? ?????????????????????? ??????????????"
 
 #: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98
 msgid "Lithuanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101
 msgid "Malay Support"
-msgstr "?????????????????? ???? ??????????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102
 msgid "Malayalam Support"
 msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103
-#, fuzzy
 msgid "Maori Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104
 msgid "Marathi Support"
@@ -783,7 +768,7 @@
 
 #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106
 msgid "MySQL Database"
-msgstr "MySQL ??????????????????"
+msgstr "???????? ?????????? MySQL"
 
 #: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110
 msgid "Northern Sotho Support"
@@ -791,57 +776,55 @@
 
 #: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111
 msgid "Norwegian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114
 msgid "Oriya Support"
 msgstr "?????????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116
-#, fuzzy
 msgid "Persian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117
 msgid "Polish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118
 msgid "Portuguese Support"
-msgstr "?????????????????? ???? ??????????????????????"
+msgstr "?????????????????? ???? ??????????????????????"
 
 #: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119
 msgid "PostgreSQL Database"
-msgstr "PostgreSQL ??????????????????"
+msgstr "???????? ?????????? PostgreSQL"
 
 #: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120
 msgid "Printing Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121
 msgid "Punjabi Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122
 msgid "Romanian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123
 msgid "Ruby"
-msgstr "????????"
+msgstr "Ruby"
 
 #: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124
 msgid "Russian Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125
-#, fuzzy
 msgid "Samoan Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126
 msgid "Serbian Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127
 msgid "Server Configuration Tools"
@@ -853,29 +836,27 @@
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131
 msgid "Slovak Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132
 msgid "Slovenian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133
 msgid "Smallest possible installation"
 msgstr "??????-?????????????? ???????????????? ????????????????????"
 
 #: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135
-#, fuzzy
 msgid "Somali Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136
 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
 msgid "Southern Ndebele Support"
@@ -887,7 +868,7 @@
 
 #: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140
 msgid "Spanish Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143
 msgid "Swati Support"
@@ -895,12 +876,11 @@
 
 #: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144
 msgid "Swedish Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146
-#, fuzzy
 msgid "Tagalog Support"
-msgstr "?????????????????? ???? ??????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147
 msgid "Tamil Support"
@@ -912,35 +892,36 @@
 
 #: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150
 msgid "Thai Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:142
 msgid "The Eclipse Integrated Development Environment."
-msgstr "???????????? - ?????????? ???? ????????????????????."
+msgstr "?????????????????????????? ?????????? ???? ???????????????????? Eclipse."
 
 #: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152
 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
 msgid ""
 "These packages allow you to develop applications for the X Window System."
 msgstr ""
-"???????????????? ???????????????????? ???????????????????????? ???? ???????????????????? ???? ?? ???????????????????????? ??????????????."
+"???????????????? ???????????????????? ???????????????????????? ???? ???????????????????? ???? ?????????????????? ???? ???????????????? ??."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr "???????????????? ???????????????? ??????????????-???????????????? ??????????????, ???????? DHCP, Kerberos ?? NIS."
+msgstr "???????? ???????????? ???????????????? ?????????????? ?????????????? ???????? DHCP, Kerberos ?? NIS."
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157
 msgid ""
 "These packages include servers for old network protocols such as rsh and "
 "telnet."
 msgstr ""
-"???????????????? ???????????????? ?????????????? ???? ?????????? ?????????????? ??????????????????, ???????? ???????????? ?? rsh."
+"???????????????? ???????????????? ?????????????? ???? ?????????? ?????????????? ??????????????????, ???????? rsh ?? telnet."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158
 msgid "These packages provide a virtualization environment."
@@ -948,14 +929,14 @@
 
 #: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159
 msgid "These packages provide compatibility with previous releases."
-msgstr "???????? ???????????????? ???????????????????? ???????????????????????? ?? ???????????????? ????????????."
+msgstr "???????? ???????????? ???????????????????? ???????????????????????? ?? ???????????????? ??????????????."
 
 #: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160
 msgid ""
 "These packages provide support for various locales including fonts and input "
 "methods."
 msgstr ""
-"???????????????? ???????????????????? ?????????????????????? ???? ???????????????? ?????????????? - ?????????????????????? ?????????????? ?? "
+"???????????????? ???????????????????? ?????????????????????? ???? ???????????????? ?????????????? ?? ???????????????? ???????????????? ?? "
 "???????????? ???? ??????????????????."
 
 #: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161
@@ -969,46 +950,45 @@
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166
 msgid "This group contains all of Red Hat's custom server configuration tools."
 msgstr ""
-"?????????????? ?????????????? ???????????? Red Hat's ?????????????????????????? ?????????????????????? ???? ?????????????????? ???? "
-"??????????????."
+"???????? ?????????? ?????????????? ???????????????? ?????????????????????? ???? ?????????????????? ???? ?????????????? ???? Red Hat."
 
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167
 msgid ""
 "This group includes a minimal set of packages. Useful for creating small "
 "router/firewall boxes, for example."
 msgstr ""
-"?????????????? ?????????????? ???????????????????? ?????????? ???? ????????????. ?????????????? ?? ???????????????? ???? ?????????????????? "
-"???? ?????????? ????????????/?????????????? ??????????."
+"?????????????? ?????????????? ?????????????????????? ?????????? ???? ????????????. ?????????????? ?? ???????????????? ???? ?????????????????? "
+"???? ?????????? ?????????????? ???? ????????????/?????????????? ??????????."
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176
 msgid ""
 "This package group allows you to run a DNS name server (BIND) on the system."
-msgstr "???????????????? ???????????????????? ???????????????????????? ???? DNS nameserver (BIND)."
+msgstr ""
+"???????? ?????????? ???????????? ?????????????????? ???????????????????????? ???? DNS ???????????? ???? ?????????? (BIND)."
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177
 msgid ""
 "This package group allows you to share files between Linux and MS Windows"
 "(tm) systems."
 msgstr ""
-"???????????????? ???????????????????? ?????????????????????? ???? ?????????????? ?????????? ???????????? ?? ???? ?????????????? ??????????????."
+"???????? ?????????? ???????????? ?????????????????? ?????????????????????? ???? ?????????????? ?????????? ???????????? ?? MS Windows "
+"(tm) ??????????????."
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178
 msgid "This package group contains packages useful for use with MySQL."
-msgstr "?????????????? ?????????????? ???????????? ???? ???????????????????? ?? MySQL."
+msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? MySQL."
 
 #: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179
 msgid "This package group includes packages useful for use with Postgresql."
-msgstr "?????????? ?????????????? ???????????? ???? ???????????????????? ?? Postgresql."
+msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? Postgresql."
 
 #: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180
-#, fuzzy
 msgid "Tibetan Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181
-#, fuzzy
 msgid "Tonga Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182
 msgid "Tsonga Support"
@@ -1020,25 +1000,23 @@
 
 #: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184
 msgid "Turkish Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185
 msgid "Ukrainian Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186
-#, fuzzy
 msgid "Urdu Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ????????"
 
 #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189
 msgid "Venda Support"
 msgstr "?????????????????? ???? ??????????"
 
 #: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190
-#, fuzzy
 msgid "Vietnamese Support"
-msgstr "?????????????????? ???? ????????????????(????????????????)"
+msgstr "?????????????????? ???? ????????????????????"
 
 #: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191
 msgid "Virtualization"
@@ -1046,7 +1024,7 @@
 
 #: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194
 msgid "Welsh Support"
-msgstr "?????????????????? ???? ????????????"
+msgstr "?????????????????? ???? ????????????"
 
 #: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196
 msgid "Windows File Server"
@@ -1062,375 +1040,45 @@
 
 #: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202
 msgid "Zulu Support"
-msgstr "?????????????????? ???? ??????????????"
+msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-f8.xml.in.h:21
 msgid "Buildsystem building group"
-msgstr ""
+msgstr "?????????? ???? ???????????????????????? ??????????????"
 
 #: ../comps-f8.xml.in.h:48
-#, fuzzy
 msgid "Fedora Eclipse"
-msgstr "????????????"
+msgstr "Fedora Eclipse"
 
 #: ../comps-f8.xml.in.h:51
 msgid "Fonts"
-msgstr ""
+msgstr "????????????????"
 
 #: ../comps-f8.xml.in.h:52
 msgid "Fonts packages for rendering text on the desktop."
-msgstr ""
+msgstr "???????????? ?? ???????????????? ???? ?????????????????? ???? ?????????? ?? ?????????????????? ??????????."
 
 #: ../comps-f8.xml.in.h:78
-#, fuzzy
 msgid "Integrated Development Environments based on Eclipse."
-msgstr "???????????? - ?????????? ???? ????????????????????."
+msgstr "?????????????????????????? ?????????? ???? ???????????????????? ???????????????? ???? Eclipse."
 
 #: ../comps-f8.xml.in.h:94
 msgid "Legacy Fonts"
-msgstr ""
+msgstr "???????????????? ????????????????"
 
 #: ../comps-f8.xml.in.h:99
 #, fuzzy
 msgid "Low Saxon Support"
-msgstr "?????????????????? ???? ????????????????????"
+msgstr "?????????????????? ???? Low ??????????????????"
 
 #: ../comps-f8.xml.in.h:105
-#, fuzzy
 msgid "Mongolian Support"
-msgstr "?????????????????? ???? ????????????????"
+msgstr "?????????????????? ???? ??????????????????"
 
 #: ../comps-f8.xml.in.h:107
-#, fuzzy
 msgid "Nepali Support"
-msgstr "?????????????????? ???? ??????????????????"
+msgstr "?????????????????? ???? ????????????????"
 
 #: ../comps-f8.xml.in.h:113
 msgid "Older bitmap and vector fonts packages"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Somail Support"
-#~ msgstr "?????????????????? ???? ??????????"
-
-#~ msgid "Emacs"
-#~ msgstr "??????????"
-
-#~ msgid "The GNU Emacs text editor."
-#~ msgstr "GNU Emacs ?????????????? ????????????????."
-
-#~ msgid "Brazilian Support"
-#~ msgstr "?????????????????? ???? ??????????????????????(??????????????????)"
-
-#~ msgid "British Support"
-#~ msgstr "?????????????????? ???? ??????????????????"
-
-#~ msgid "Canadian Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???? ???????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Mozilla Support"
-#~ msgstr "?????????????????? ???? ???????????? ???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Support"
-#~ msgstr "?????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Cyrillic Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "Desktops"
-#~ msgstr "????????????????"
-
-#~ msgid "GNOME"
-#~ msgstr "??????????"
-
-#~ msgid "ISO8859-14 Support"
-#~ msgstr "?????????????????? ???? ISO8859-14"
-
-#~ msgid "ISO8859-15 Support"
-#~ msgstr "?????????????????? ???? ISO8859-15"
-
-#~ msgid "ISO8859-2 Support"
-#~ msgstr "?????????????????? ???? ISO8859-2"
-
-#~ msgid "ISO8859-9 Support"
-#~ msgstr "?????????????????? ???? ISO8859-9"
-
-#~ msgid "Install these packages to recompile the kernel."
-#~ msgstr "???????????????????????? ???????????????? ???? ???? ???????????? ???? ???????????????????????????? ????????????."
-
-#~ msgid "KDE"
-#~ msgstr "??D??"
-
-#~ msgid "KDE Desktop Environment"
-#~ msgstr "KDE ?????????????? ??????????"
-
-#~ msgid "Kernel Development"
-#~ msgstr "???????????????????????? ???? ????????????"
-
-#~ msgid "Miscellaneous Included Packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Mozilla packages for the x86 platform"
-#~ msgstr "???????????? ???????????? ???? x86 ??????????????????????"
-
-#~ msgid "Multilib support packages"
-#~ msgstr "???????????? ???? Multilib ??????????????????"
-
-#~ msgid "SQL Database"
-#~ msgstr "SQL ??????????????????"
-
-#~ msgid "Server"
-#~ msgstr "????????????"
-
-#~ msgid "Support for developing packages for the non-primary architecture"
-#~ msgstr "?????????????????? ???? ???????????????????????????? ???? ???????????? ???? ????-???????????????????? ??????????????????????"
-
-#~ msgid "Syriac Support"
-#~ msgstr "?????????????????? ???? ????????????????"
-
-#~ msgid "System"
-#~ msgstr "??????????????"
-
-#~ msgid ""
-#~ "These packages allow you to configure an IMAP or Postfix mail server."
-#~ msgstr "???????????????? ???????????????????? ?????????????????????? IMAP ?????? Postfix ???????????????? ??????????????."
-
-#~ msgid ""
-#~ "These packages provide compatibility support for previous releases of Red "
-#~ "Hat Enterprise Linux."
-#~ msgstr ""
-#~ "???????????????? ???????????????????? ?????????????????????? ???? ???????????????????????? ???? ???????????????? ?????????????? ???? "
-#~ "Red Hat Enterprise Linux."
-
-#~ msgid "Unsupported Development Libraries"
-#~ msgstr "???????????????????????? ???????????????????? ???? ????????????????????????"
-
-#~ msgid "Workstation Common"
-#~ msgstr "???????????????? ?????????????? ??????????????"
-
-#~ msgid "ppc64 Compatibility Arch Support"
-#~ msgstr "ppc86 ???????????????????? ?????????????????????? - ??????????????????"
-
-#~ msgid "x86 Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???????????????????????? ???? x86 ???????????????????? ??????????????????????"
-
-#~ msgid "x86 Compatibility Arch Support"
-#~ msgstr "x86 ???????????????????? ?????????????????????? - ??????????????????"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "?????????????????????? (??????????????????)"
-
-#~ msgid "English"
-#~ msgstr "??????????????????"
-
-#~ msgid "French"
-#~ msgstr "??????????????"
-
-#~ msgid "German"
-#~ msgstr "????????????"
-
-#~ msgid "Italian"
-#~ msgstr "????????????????????"
-
-#~ msgid "Red Hat Enterprise Linux 3 Documentation"
-#~ msgstr "Red Hat Enterprise Linux 3 ????????????????????????"
-
-#~ msgid "Spanish"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Brazilian Portuguese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "(??????????????????????) ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "English language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "French language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "German language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Italian language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Spanish language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid "Japanese"
-#~ msgstr "??????????????"
-
-#~ msgid "Korean"
-#~ msgstr "????????????????"
-
-#~ msgid "Simplified Chinese"
-#~ msgstr "???????????????? (????????????????)"
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Japanese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Korean language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Simplified Chinese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? "
-#~ "???????????????? ????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Traditional Chinese language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????????? "
-#~ "???????????????? ????????."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "???????????????? (??????????????????????)"
-
-#~ msgid "ppc64 Compatibility Arch Development Support"
-#~ msgstr "?????????????????? ???????????????????????? ???? ppc64 ???????????????????? ??????????????????????"
-
-#~ msgid "Bengali"
-#~ msgstr "??????????????????"
-
-#~ msgid "Gujarati"
-#~ msgstr "??????????????????"
-
-#~ msgid "Hindi"
-#~ msgstr "??????????"
-
-#~ 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."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Gujarati language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ?????????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Hindi language."
-#~ msgstr "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ??????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Punjabi language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????????? "
-#~ "????????."
-
-#~ msgid ""
-#~ "This group contains the Red Hat Enterprise Linux documentation in the "
-#~ "Tamil language."
-#~ msgstr ""
-#~ "?????????????? ???????????????? Red Hat Enterprise Linux ???????????????????????????? ???? ???????????????? ????????."
-
-#~ msgid "Cluster Storage"
-#~ msgstr "?????????? ???? ????????????????"
-
-#~ msgid "Clustering Support."
-#~ msgstr "?????????????????? ???? ????????????????????????????."
-
-#~ msgid "Packages which provide support for cluster storage."
-#~ msgstr "???????????? ?????????????????????? ?????????????????? ???? ?????????? ???? ????????????????."
-
-#~ msgid "Packages which provide support for single-node GFS."
-#~ msgstr "???????????? ???????????????????????? ?????????????????? ???? GFS ???? ???????????????? ????????????????."
-
-#~ msgid "Single Node GFS Support"
-#~ msgstr "???????????????? GFS ??????????????????"
-
-#~ msgid "These packages provide compatibility support with previous releases."
-#~ msgstr "???????? ???????????????? ???????????????????? ???????????????????????? ?? ???????????????? ????????????."
-
-#~ msgid "Java Runtime Environments and Development Kits"
-#~ msgstr "?????????????????????? ?????????? ???? Java ?? ?????????????????????? ???? ????????????????????"
-
-#~ msgid "Misc"
-#~ msgstr "??????????"
-
-#~ msgid "Misc packages"
-#~ msgstr "?????????? ????????????"
-
-#~ msgid "Multimedia"
-#~ msgstr "????????????????????"
-
-#~ msgid "Multimedia applications"
-#~ msgstr "???????????????????????? ????????????????????"
-
-#~ msgid ""
-#~ "Packages which provide additional functionality for Red Hat Enterprise "
-#~ "Linux"
-#~ msgstr ""
-#~ "???????????? ?????????????????????? ???????????????????????? ???????????????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Red Hat Enterprise Linux Extras"
-#~ msgstr "???????????????????? ???? Red Hat Enterprise Linux"
-
-#~ msgid "Workstation"
-#~ msgstr "?????????????? ??????????????"
-
-#~ msgid "Workstation applications and utilities."
-#~ msgstr "???????????????????? ?? ?????????????????????? ???? ?????????????? ??????????????."
-
-#~ msgid "Virtualization Support."
-#~ msgstr "?????????????????? ???? ??????????????????????????."
-
-#~ msgid "Compatibility Arch"
-#~ msgstr "???????????????????? ??????????????????????"
-
-#~ msgid "Compatibility Arch Libraries"
-#~ msgstr "???????????????????? ???? ?????????????????? ???? ???????????????????? ??????????????????????"
-
-#~ msgid "Multilib library packages"
-#~ msgstr "???????????? ???? ???????????????????????? multilib"
-
-#~ msgid ""
-#~ "Packages which provide functionality for the compatibility architecture."
-#~ msgstr "???????????? ?????????????????????? ?????????????????????????????? ???? ???????????????????? ??????????????????????."
+msgstr "????-?????????? ???????????? ?? ?????????????????? ?? ???????????????? ????????????????"



From fedora-extras-commits at redhat.com  Sat Sep 29 10:39:07 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:39:07 -0400
Subject: rpms/cupsddk/devel .cvsignore, 1.2, 1.3 cupsddk.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200709291039.l8TAd7YS031520@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31395

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:04:16 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:38:34 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/cupsddk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cupsddk.spec	29 Aug 2007 15:21:54 -0000	1.2
+++ cupsddk.spec	29 Sep 2007 10:38:34 -0000	1.3
@@ -15,8 +15,8 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
@@ -113,6 +113,9 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
 * Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
 - More specific license tag.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:04:16 -0000	1.2
+++ sources	29 Sep 2007 10:38:34 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:53:10 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:53:10 -0400
Subject: rpms/cupsddk/F-7 .cvsignore, 1.2, 1.3 cupsddk.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200709291053.l8TArA3f032261@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32194

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:06:15 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:52:35 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/cupsddk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cupsddk.spec	31 Jul 2007 17:06:15 -0000	1.1
+++ cupsddk.spec	29 Sep 2007 10:52:35 -0000	1.2
@@ -15,9 +15,9 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 3%{?dist}
-License: GPL
+Version: 1.2.1
+Release: 1%{?dist}
+License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
 Patch0: cupsddk-no-gzip-man-pages.patch
@@ -113,6 +113,12 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
+- More specific license tag.
+
 * Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-3
 - Fix directory ownership.
 - Better group for driver sub-package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:06:15 -0000	1.2
+++ sources	29 Sep 2007 10:52:35 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 10:57:58 2007
From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh))
Date: Sat, 29 Sep 2007 06:57:58 -0400
Subject: rpms/cupsddk/FC-6 .cvsignore, 1.2, 1.3 cupsddk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200709291057.l8TAvw5Y032350@cvs-int.fedora.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32328

Modified Files:
	.cvsignore cupsddk.spec sources 
Log Message:
* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
- 1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Jul 2007 17:08:03 -0000	1.2
+++ .cvsignore	29 Sep 2007 10:57:24 -0000	1.3
@@ -1 +1,2 @@
 cupsddk-1.2.0-source.tar.bz2
+cupsddk-1.2.1-source.tar.bz2


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/cupsddk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cupsddk.spec	31 Jul 2007 17:08:03 -0000	1.1
+++ cupsddk.spec	29 Sep 2007 10:57:24 -0000	1.2
@@ -15,9 +15,9 @@
 
 Summary: CUPS Driver Development Kit
 Name: cupsddk
-Version: 1.2.0
-Release: 3%{?dist}
-License: GPL
+Version: 1.2.1
+Release: 1%{?dist}
+License: GPLv2
 Group: Development/Libraries
 Source: http://ftp.easysw.com/pub/%{name}/%{version}/cupsddk-%{version}-source.tar.bz2
 Patch0: cupsddk-no-gzip-man-pages.patch
@@ -113,6 +113,12 @@
 %{_mandir}/man1/rastertopclx.1*
 
 %changelog
+* Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
+- 1.2.1.
+
+* Wed Aug 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-4
+- More specific license tag.
+
 * Fri Jul 20 2007 Tim Waugh <twaugh at redhat.com> 1.2.0-3
 - Fix directory ownership.
 - Better group for driver sub-package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Jul 2007 17:08:03 -0000	1.2
+++ sources	29 Sep 2007 10:57:24 -0000	1.3
@@ -1 +1 @@
-d35b74cbfaa4c48b0d650c34249bab6d  cupsddk-1.2.0-source.tar.bz2
+67d1453063188fccf9799e11083bce41  cupsddk-1.2.1-source.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 11:48:02 2007
From: fedora-extras-commits at redhat.com (Christopher Brown (snecker))
Date: Sat, 29 Sep 2007 07:48:02 -0400
Subject: rpms/jokosher/devel .cvsignore, 1.4, 1.5 jokosher.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200709291148.l8TBm2rY006816@cvs-int.fedora.redhat.com>

Author: snecker

Update of /cvs/extras/rpms/jokosher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6794/devel

Modified Files:
	.cvsignore jokosher.spec sources 
Log Message:


updating to latest svn




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2007 19:10:42 -0000	1.4
+++ .cvsignore	29 Sep 2007 11:47:29 -0000	1.5
@@ -1 +1 @@
-jokosher-1.0.tar.gz
+jokosher-20070929svn.tar.gz


Index: jokosher.spec
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/jokosher.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jokosher.spec	4 Sep 2007 12:37:20 -0000	1.10
+++ jokosher.spec	29 Sep 2007 11:47:29 -0000	1.11
@@ -5,12 +5,12 @@
 
 Name: jokosher
 Version: 1.0
-Release: 0.1.20070904svn%{?dist}
+Release: 0.1.20070929svn%{?dist}
 Summary: A simple and easy-to-use Open Source multi-track editor
 Group: Applications/Multimedia
 License: GPLv2+ with exceptions
 URL: http://%{name}.org
-Source0: http://www.%{name}.org/downloads/source/%{name}-1.0.tar.gz
+Source0: http://www.%{name}.org/downloads/source/%{name}-20070929svn.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -104,7 +104,11 @@
 %{_datadir}/omf/%{name}/
 
 %changelog
-* Tue Sep  4 2007 Christopher Brown <chris at localhost.localdomain> - 1.0-0.1.20070904svn
+* Sat Sep 29 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070929svn
+- change to python-setuptools-devel
+- update to latest svn
+
+* Tue Sep  4 2007 Christopher Brown <snecklifter at gmail.com> - 1.0-0.1.20070904svn
 - change to python-setuptools-devel
 - update to latest svn
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jokosher/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Sep 2007 12:37:20 -0000	1.8
+++ sources	29 Sep 2007 11:47:29 -0000	1.9
@@ -1 +1 @@
-9dd1b9c8b7298121136182be574a3c29  jokosher-1.0.tar.gz
+1610e580e4e6e9e238837986a8c228dc  jokosher-20070929svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 14:09:55 2007
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Sat, 29 Sep 2007 10:09:55 -0400
Subject: rpms/sqlite/EL-4 sources,1.17,1.18 sqlite.spec,1.31,1.32
Message-ID: <200709291409.l8TE9tHv027488@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/pkgs/rpms/sqlite/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27462

Modified Files:
	sources sqlite.spec 
Log Message:
Update from devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Aug 2007 19:10:18 -0000	1.17
+++ sources	29 Sep 2007 14:09:23 -0000	1.18
@@ -1 +1 @@
-a2cb1fafad5c2587e513dcbd18ace097  sqlite-3.3.6.tar.gz
+2feec9b429f9298c9f288420c8b449f8  sqlite-3.4.2.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sqlite.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sqlite.spec	17 Aug 2007 19:10:18 -0000	1.31
+++ sqlite.spec	29 Sep 2007 14:09:23 -0000	1.32
@@ -1,23 +1,20 @@
-# Note, this is an RPM built based off of the CentOS Spec Files.  Before doing
-#       any updates please ensure you do not conflict with the other Centos
-#       package.
-# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
-%define tcl 0%{?_with_tcl:1}
-# --with static enables static library in -devel subpackage
-%define static 0%{?_with_static:1}
+# bcond default logic is nicely backwards...
+%bcond_without tcl
+%bcond_with static
+%bcond_with check
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.3.6
-Release: 0.3%{?dist}
+Version: 3.4.2
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Obsoletes: sqlite3 sqlite3-devel
-BuildRequires: ncurses-devel readline-devel
+BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{tcl}
+%if %{with tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,7 +38,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{tcl}
+%if %{with tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -55,9 +52,10 @@
 %setup -q
 
 %build
-%configure %{!?_with_tcl:--disable-tcl} \
+export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
+%configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
-           --enable-threads-override-locks
+           --enable-threads-override-locks 
 make %{?_smp_mflags}
 make doc
 
@@ -68,11 +66,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{static}
+%if ! %{with static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{tcl}
+%if %{with check}
 %check
 make test
 %endif
@@ -97,23 +95,46 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{static}
+%if %{with static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{tcl}
+%if %{with tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
-* Fri Aug 17 2007 Mike McGrath <mmcgrath at redhat.com> - 3.3.6-0.3
-- Official EPEL build
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
+- Add another build conditional for enabling %%check
 
-* Wed Jul 25 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 3.3.6-0.2
-- Prepend 0 to release
-- Rebuild for EPEL
+* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
+- Use bconds for the spec build conditionals
+- Enable -tcl subpackage again (#309041)
+
+* Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
+- Update to 3.4.2
+
+* Sat Jul 21 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Sun Jun 24 2007 Paul Nasrat <pnsarat at redhat.com> - 3.4.0-2
+- Disable load for now (#245486)
+
+* Tue Jun 19 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Fri Jun 01 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.17-2
+- Enable load 
+- Build fts1 and fts2
+- Don't sync on dirs (#237427)
+
+* Tue May 29 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.17-1
+- Update to 3.3.17
+
+* Mon Mar 19 2007 Paul Nasrat <pnasrat at redhat.com> - 3.3.13-1
+- Update to 3.3.13
 
 * Fri Aug 11 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.6-2
 - Fix conditional typo (patch from Gareth Armstrong)



From fedora-extras-commits at redhat.com  Sat Sep 29 14:43:35 2007
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sat, 29 Sep 2007 10:43:35 -0400
Subject: rpms/moodss/devel moodss.spec,1.26,1.27
Message-ID: <200709291443.l8TEhZmU028369@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28351

Modified Files:
	moodss.spec 
Log Message:
moved to GPLv2 and require sqlite-tcl.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- moodss.spec	21 Nov 2006 21:48:31 -0000	1.26
+++ moodss.spec	29 Sep 2007 14:43:02 -0000	1.27
@@ -1,14 +1,14 @@
 Name: moodss
 Version: 21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
-License: GPL
+License: GPLv2
 Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Jean-Luc Fontaine <jfontain at free.fr> 21.5-2
+- moved to GPLv2 and require sqlite-tcl
+
 * Sun Nov 12 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.5-1
 - 21.5 upstream release
 



From fedora-extras-commits at redhat.com  Sat Sep 29 15:02:08 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 11:02:08 -0400
Subject: rpms/osgcal/devel .cvsignore, 1.3, 1.4 osgcal.spec, 1.9,
	1.10 sources, 1.3, 1.4 osgcal-0.1.44-64bit.patch, 1.1, NONE
Message-ID: <200709291502.l8TF28rY002873@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2811

Modified Files:
	.cvsignore osgcal.spec sources 
Removed Files:
	osgcal-0.1.44-64bit.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2006 18:42:47 -0000	1.3
+++ .cvsignore	29 Sep 2007 15:01:35 -0000	1.4
@@ -1 +1 @@
-osgcal-0.1.44.tar.gz
+osgcal-0.1.46.tar.gz


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/osgcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- osgcal.spec	29 Jan 2007 23:58:04 -0000	1.9
+++ osgcal.spec	29 Sep 2007 15:01:35 -0000	1.10
@@ -1,18 +1,17 @@
 Name:           osgcal
-Version:        0.1.44
-Release:        4%{?dist}
+Version:        0.1.46
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://gna.org/projects/underware
-Source0:        http://download.gna.org/underware/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1.44-64bit.patch
+Source0:        http://osgcal.dachary.org/download/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  OpenSceneGraph-devel cal3d-devel libxml2-devel glib2-devel
-BuildRequires:  libungif-devel libGL-devel SDL-devel xorg-x11-server-Xvfb
-BuildRequires:  xorg-x11-server-Xorg
+BuildRequires:  OpenSceneGraph-devel libungif-devel libGL-devel SDL-devel
+BuildRequires:  xorg-x11-server-Xorg cal3d-devel libxml2-devel glib2-devel
+BuildRequires:  xorg-x11-server-Xvfb
 
 
 %description
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .64bit~
 
 # Avoid lib64 rpaths
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -83,6 +81,15 @@
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-1
+- Upstream sync
+- Remove no longer needed 64-bit patch
+- Update source URL
+
+* Tue Sep 11 2007 Christopher Stone <chris.stone at gmail.com> 0.1.45-1
+- Upstream sync
+- Update 64-bit patch
+
 * Mon Jan 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.44-4
 - Disable make check
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2006 18:42:47 -0000	1.3
+++ sources	29 Sep 2007 15:01:35 -0000	1.4
@@ -1 +1 @@
-c6f43aa6014fc7fdc7cc0ab9e4b5a885  osgcal-0.1.44.tar.gz
+96ac955dab57b1b5d74c8afeac46da46  osgcal-0.1.46.tar.gz


--- osgcal-0.1.44-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 15:07:14 2007
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Sat, 29 Sep 2007 11:07:14 -0400
Subject: rpms/sqlite/EL-4 sqlite.spec,1.32,1.33
Message-ID: <200709291507.l8TF7Ead003256@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/pkgs/rpms/sqlite/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3213

Modified Files:
	sqlite.spec 
Log Message:
Use f7 base as no bcond


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/EL-4/sqlite.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sqlite.spec	29 Sep 2007 14:09:23 -0000	1.32
+++ sqlite.spec	29 Sep 2007 15:06:41 -0000	1.33
@@ -1,12 +1,12 @@
-# bcond default logic is nicely backwards...
-%bcond_without tcl
-%bcond_with static
-%bcond_with check
+# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible.
+%define tcl 0%{?_with_tcl:1}
+# --with static enables static library in -devel subpackage
+%define static 0%{?_with_static:1}
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.4.2
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -14,7 +14,7 @@
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: /usr/bin/tclsh
-%if %{with tcl}
+%if %{tcl}
 BuildRequires: tcl-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
@@ -38,7 +38,7 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
-%if %{with tcl}
+%if %{tcl}
 %package tcl
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
@@ -53,7 +53,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
-%configure %{!?with_tcl:--disable-tcl} \
+%configure %{!?_with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks 
 make %{?_smp_mflags}
@@ -66,11 +66,11 @@
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
-%if ! %{with static}
+%if ! %{static}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
-%if %{with check}
+%if %{tcl}
 %check
 make test
 %endif
@@ -95,24 +95,17 @@
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%if %{with static}
+%if %{static}
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
-%if %{with tcl}
+%if %{tcl}
 %files tcl
 %defattr(-, root, root)
 %{_datadir}/tcl*/sqlite3
 %endif
 
 %changelog
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-3
-- Add another build conditional for enabling %%check
-
-* Fri Sep 28 2007 Panu Matilainen <pmatilai at redhat.com> - 3.4.2-2
-- Use bconds for the spec build conditionals
-- Enable -tcl subpackage again (#309041)
-
 * Wed Aug 15 2007 Paul Nasrat <pnasrat at redhat.com> - 3.4.2-1
 - Update to 3.4.2
 



From fedora-extras-commits at redhat.com  Sat Sep 29 17:46:57 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 13:46:57 -0400
Subject: rpms/openalpp/devel dead.package,NONE,1.1 openalpp.spec,1.14,NONE
Message-ID: <200709291746.l8THkvMe012686@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/openalpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12677

Added Files:
	dead.package 
Removed Files:
	openalpp.spec 
Log Message:
End of life.  May this package rest in peace.


--- NEW FILE dead.package ---
Obsoleted by osgal-0.6.1


--- openalpp.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Sep 29 17:53:17 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 13:53:17 -0400
Subject: rpms/abcde/devel abcde.spec,1.14,1.15
Message-ID: <200709291753.l8THrH2o013140@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	abcde.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
- Requires: which



Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- abcde.spec	13 Aug 2007 19:19:12 -0000	1.14
+++ abcde.spec	29 Sep 2007 17:52:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@
 Requires:       cd-discid
 Requires:       cdparanoia
 Requires:       wget
+Requires:       which
 Requires(hint): vorbis-tools
 Requires(hint): flac
 
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
 - License: GPLv2+
 - Add (empty) %%build section.



From fedora-extras-commits at redhat.com  Sat Sep 29 18:15:10 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 14:15:10 -0400
Subject: rpms/colordiff/devel colordiff.spec,1.8,1.9
Message-ID: <200709291815.l8TIFAuX020761@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718

Modified Files:
	colordiff.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-4
- Requires: which



Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colordiff.spec	13 Aug 2007 19:38:09 -0000	1.8
+++ colordiff.spec	29 Sep 2007 18:14:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           colordiff
 Version:        1.0.6a
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
@@ -15,6 +15,7 @@
 Requires:       gzip
 Requires:       less
 Requires:       diffutils
+Requires:       which
 Provides:       cdiff
 
 %description
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6a-3
 - License: GPLv2+
 



From fedora-extras-commits at redhat.com  Sat Sep 29 18:41:52 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:41:52 -0700
Subject: [pkgdb] qwt was added for frankb
Message-ID: <200709291841.l8TIfv8l018719@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qwt with summary Qt Widgets for Technical Applications
Kevin Fenzi (kevin) has approved Package qwt
Kevin Fenzi (kevin) has added a Fedora devel branch for qwt with an owner of frankb
Kevin Fenzi (kevin) has approved qwt in Fedora devel
Kevin Fenzi (kevin) has approved Package qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, 6) updated by kevin
Message-ID: <200709291842.l8TIgK2U018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, devel) updated by kevin
Message-ID: <200709291842.l8TIgK2W018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora, 7) updated by kevin
Message-ID: <200709291842.l8TIgK2P018743@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:14 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:42:14 -0700
Subject: [pkgdb] qwt (Fedora EPEL, 5) updated by kevin
Message-ID: <200709291842.l8TIgK2Z018744@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for qwt
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:48 -0400
Subject: rpms/qwt - New directory
Message-ID: <200709291842.l8TIgmgV022471@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt

Log Message:
Directory /cvs/extras/rpms/qwt added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:50 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:50 -0400
Subject: rpms/qwt/devel - New directory
Message-ID: <200709291842.l8TIgoOX022488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt/devel

Log Message:
Directory /cvs/extras/rpms/qwt/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:53 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:53 -0400
Subject: rpms/qwt Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709291842.l8TIgrGY022515@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt

Added Files:
	Makefile import.log 
Log Message:
Setup of module qwt


--- NEW FILE Makefile ---
# Top level Makefile for module qwt
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 29 18:42:56 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:42:56 -0400
Subject: rpms/qwt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709291842.l8TIgucd022533@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22427/rpms/qwt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qwt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qwt
# $Id: Makefile,v 1.1 2007/09/29 18:42:53 kevin Exp $
NAME := qwt
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 fedora-extras-commits at redhat.com  Sat Sep 29 18:44:22 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:22 -0700
Subject: [pkgdb] fbreader was added for salimma
Message-ID: <200709291844.l8TIiRMa018944@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package fbreader with summary E-book reader
Kevin Fenzi (kevin) has approved Package fbreader
Kevin Fenzi (kevin) has added a Fedora devel branch for fbreader with an owner of salimma
Kevin Fenzi (kevin) has approved fbreader in Fedora devel
Kevin Fenzi (kevin) has approved Package fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora, 7) updated by kevin
Message-ID: <200709291844.l8TIiwrG018970@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora EPEL, 4) updated by kevin
Message-ID: <200709291844.l8TIiwG0018969@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora EPEL 4)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora EPEL, 5) updated by kevin
Message-ID: <200709291844.l8TIiwrJ018970@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for fbreader
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fbreader (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:44:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 11:44:53 -0700
Subject: [pkgdb] fbreader (Fedora, devel) updated by kevin
Message-ID: <200709291844.l8TIiwG3018969@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on fbreader (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fbreader



From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:22 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:22 -0400
Subject: rpms/fbreader - New directory
Message-ID: <200709291845.l8TIjMtp022924@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader

Log Message:
Directory /cvs/extras/rpms/fbreader added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:25 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:25 -0400
Subject: rpms/fbreader/devel - New directory
Message-ID: <200709291845.l8TIjP0c022940@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader/devel

Log Message:
Directory /cvs/extras/rpms/fbreader/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:28 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:28 -0400
Subject: rpms/fbreader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709291845.l8TIjSUH022967@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader

Added Files:
	Makefile import.log 
Log Message:
Setup of module fbreader


--- NEW FILE Makefile ---
# Top level Makefile for module fbreader
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Sep 29 18:45:32 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 29 Sep 2007 14:45:32 -0400
Subject: rpms/fbreader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709291845.l8TIjW8l022986@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22890/rpms/fbreader/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fbreader


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fbreader
# $Id: Makefile,v 1.1 2007/09/29 18:45:29 kevin Exp $
NAME := fbreader
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 fedora-extras-commits at redhat.com  Sat Sep 29 18:52:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 14:52:14 -0400
Subject: rpms/osgal/devel .cvsignore, 1.4, 1.5 osgal.spec, 1.7, 1.8 sources, 
	1.4, 1.5
Message-ID: <200709291852.l8TIqE5e023545@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23495

Modified Files:
	.cvsignore osgal.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 04:08:56 -0000	1.4
+++ .cvsignore	29 Sep 2007 18:51:41 -0000	1.5
@@ -1 +1 @@
-osgal-cvs-20060903.tar.gz
+osgal-0.6.1.tar.gz


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- osgal.spec	5 Feb 2007 03:22:36 -0000	1.7
+++ osgal.spec	29 Sep 2007 18:51:41 -0000	1.8
@@ -1,17 +1,22 @@
 Name:           osgal
-Version:        20060903
-Release:        3%{?dist}
+Epoch:          1
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.vrlab.umu.se/research/osgAL
-Source0:        http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-cvs-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  OpenSceneGraph-devel openalpp-devel freealut-devel libvorbis-devel
+BuildRequires:  OpenSceneGraph-devel OpenThreads-devel
+BuildRequires:  openal-devel freealut-devel libvorbis-devel
 BuildRequires:  libGL-devel libtool
 
+Provides:       openalpp = 20060714
+Obsoletes:      openalpp < 20060714
+
 %description
 osgAL is a toolkit for handling spatial (3D) sound in the OpenSceneGraph
 rendering library.
@@ -20,7 +25,8 @@
 Summary:        Library development files for osgal
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       openalpp-devel
+Requires:       OpenSceneGraph-devel OpenThreads-devel
+Requires:       openal-devel freealut-devel libvorbis-devel
 
 %description devel
 This package contains headers and libraries required to build applications
@@ -28,7 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-cvs-%{version}
+%setup -q -n %{name}-%{version}
 sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in
 chmod -x {include,src}/osg*/*
 autoreconf --force --install
@@ -70,13 +76,19 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html/*
+%doc doc/*html
 %{_includedir}/osgAL
+%{_includedir}/openalpp
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.6.1-1
+- Upstream sync
+- Move openalpp-devel Requires to this package
+- Obsolete/Provides openalpp
+
 * Sun Feb 04 2007 Christopher Stone <chris.stone at gmail.com> 20060903-3
 - Fix setting of CFLAGS in configure.in bug #227290
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 04:08:56 -0000	1.4
+++ sources	29 Sep 2007 18:51:41 -0000	1.5
@@ -1 +1 @@
-92e67bc580900b9a98ba31e18b47c5f3  osgal-cvs-20060903.tar.gz
+94adc3997ec67da05193084af689b22a  osgal-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:53 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:53 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfj019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:50 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:50 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiB019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:13:55 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:13:55 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfm019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:00 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:00 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDwfp019812@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the approveacls acl on mailgraph (Fedora devel) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:29 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:29 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiE019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:26 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRF019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:32 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:32 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRI019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora 7) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:35 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:35 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEWRL019908@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchbugzilla acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:40 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:40 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJDtiH019811@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the commit acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:14:38 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:14:38 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291914.l8TJEhBt019983@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the watchcommits acl on mailgraph (Fedora 6) to Approved for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:16 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sat, 29 Sep 2007 12:15:16 -0700
Subject: [pkgdb] mailgraph had acl change status
Message-ID: <200709291915.l8TJEhBw019983@bastion.fedora.phx.redhat.com>

Bernard Johnson (bjohnson) has set the approveacls acl on mailgraph (Fedora devel) to Obsolete for Michael G. Fleming (mfleming)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mailgraph



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:15:26 -0400
Subject: rpms/qwt import.log,1.1,1.2
Message-ID: <200709291915.l8TJFQ51000839@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2007 18:42:51 -0000	1.1
+++ import.log	29 Sep 2007 19:14:53 -0000	1.2
@@ -0,0 +1 @@
+qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254



From fedora-extras-commits at redhat.com  Sat Sep 29 19:15:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:15:28 -0400
Subject: rpms/qwt/devel qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291915.l8TJFSah000847@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv772/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:14:56 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:18:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:18:24 -0400
Subject: rpms/qwt import.log,1.2,1.3
Message-ID: <200709291918.l8TJIOgn001587@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Sep 2007 19:14:53 -0000	1.2
+++ import.log	29 Sep 2007 19:17:52 -0000	1.3
@@ -1 +1,2 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
+qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426



From fedora-extras-commits at redhat.com  Sat Sep 29 19:18:26 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:18:26 -0400
Subject: rpms/qwt/FC-6 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291918.l8TJIQ4G001612@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:20:43 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:20:43 -0400
Subject: rpms/qwt import.log,1.3,1.4
Message-ID: <200709291920.l8TJKhAb002540@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2459

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Sep 2007 19:17:52 -0000	1.3
+++ import.log	29 Sep 2007 19:20:10 -0000	1.4
@@ -1,2 +1,3 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
 qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426
+qwt-5_0_2-5FC5:F-7:qwt-5.0.2-5FC5.src.rpm:1191093569



From fedora-extras-commits at redhat.com  Sat Sep 29 19:20:45 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:20:45 -0400
Subject: rpms/qwt/F-7 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291920.l8TJKj0c002548@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2459/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:20:13 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:20:13 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:23:42 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:23:42 -0400
Subject: rpms/qwt import.log,1.4,1.5
Message-ID: <200709291923.l8TJNg8E002815@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2775

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	29 Sep 2007 19:20:10 -0000	1.4
+++ import.log	29 Sep 2007 19:23:09 -0000	1.5
@@ -1,3 +1,4 @@
 qwt-5_0_2-5FC5:HEAD:qwt-5.0.2-5FC5.src.rpm:1191093254
 qwt-5_0_2-5FC5:FC-6:qwt-5.0.2-5FC5.src.rpm:1191093426
 qwt-5_0_2-5FC5:F-7:qwt-5.0.2-5FC5.src.rpm:1191093569
+qwt-5_0_2-5FC5:EL-5:qwt-5.0.2-5FC5.src.rpm:1191093745



From fedora-extras-commits at redhat.com  Sat Sep 29 19:23:44 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sat, 29 Sep 2007 15:23:44 -0400
Subject: rpms/qwt/EL-5 qwt-path.patch, NONE, 1.1 qwt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709291923.l8TJNi6I002819@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2775/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:23:12 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:23:12 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 19:34:15 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Sep 2007 15:34:15 -0400
Subject: rpms/abcde/EL-5 abcde.spec,1.13,1.14
Message-ID: <200709291934.l8TJYFSi003235@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3174

Modified Files:
	abcde.spec 
Log Message:
* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
- Requires: which



Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/EL-5/abcde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- abcde.spec	10 Sep 2007 15:21:37 -0000	1.13
+++ abcde.spec	29 Sep 2007 19:33:43 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@
 Requires:       cd-discid
 Requires:       cdparanoia
 Requires:       wget
+Requires:       which
 Requires(hint): vorbis-tools
 Requires(hint): flac
 
@@ -60,6 +61,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-4
+- Requires: which
+
 * Mon Aug 13 2007 Ville Skytt?? <ville.skytta at iki.fi> - 2.3.99.6-3
 - License: GPLv2+
 - Add (empty) %%build section.



From fedora-extras-commits at redhat.com  Sat Sep 29 19:47:59 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 29 Sep 2007 15:47:59 -0400
Subject: rpms/glibc import.log,1.19,1.20
Message-ID: <200709291947.l8TJlxU0003803@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3759

Modified Files:
	import.log 
Log Message:
2.6.90-16



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	20 Sep 2007 00:29:54 -0000	1.19
+++ import.log	29 Sep 2007 19:47:26 -0000	1.20
@@ -16,3 +16,4 @@
 glibc-2_6_90-13:HEAD:glibc-2.6.90-13.src.rpm:1188248254
 glibc-2_6_90-14:HEAD:glibc-2.6.90-14.src.rpm:1190146332
 glibc-2_6_90-15:HEAD:glibc-2.6.90-15.src.rpm:1190248175
+glibc-2_6_90-16:HEAD:glibc-2.6.90-16.src.rpm:1191094837



From fedora-extras-commits at redhat.com  Sat Sep 29 19:48:02 2007
From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub))
Date: Sat, 29 Sep 2007 15:48:02 -0400
Subject: rpms/glibc/devel .cvsignore, 1.217, 1.218 glibc-fedora.patch, 1.239,
	1.240 glibc.spec, 1.328, 1.329 sources, 1.241, 1.242
Message-ID: <200709291948.l8TJm27G003812@cvs-int.fedora.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3759/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
2.6.90-16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- .cvsignore	20 Sep 2007 00:29:56 -0000	1.217
+++ .cvsignore	29 Sep 2007 19:47:29 -0000	1.218
@@ -1,2 +1,2 @@
-glibc-20070920T0007.tar.bz2
-glibc-fedora-20070920T0007.tar.bz2
+glibc-20070929T1859.tar.bz2
+glibc-fedora-20070929T1859.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- glibc-fedora.patch	20 Sep 2007 00:29:56 -0000	1.239
+++ glibc-fedora.patch	29 Sep 2007 19:47:29 -0000	1.240
@@ -1,6 +1,6 @@
---- glibc-20070920T0007/ChangeLog	19 Sep 2007 22:22:51 -0000	1.10857
-+++ glibc-20070920T0007-fedora/ChangeLog	20 Sep 2007 00:11:36 -0000	1.8782.2.272
-@@ -2244,6 +2244,13 @@
+--- glibc-20070929T1859/ChangeLog	29 Sep 2007 06:58:31 -0000	1.10869
++++ glibc-20070929T1859-fedora/ChangeLog	29 Sep 2007 19:10:46 -0000	1.8782.2.273
+@@ -2384,6 +2384,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
-@@ -2539,6 +2546,10 @@
+@@ -2679,6 +2686,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]
-@@ -3796,6 +3807,15 @@
+@@ -3936,6 +3947,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-20070920T0007/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070920T0007-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070929T1859/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070920T0007-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070929T1859/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070920T0007-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070929T1859/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070929T1859-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-20070920T0007/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070920T0007-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070929T1859/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070929T1859-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-20070920T0007/debug/tst-chk1.c	15 Sep 2007 02:21:45 -0000	1.17
-+++ glibc-20070920T0007-fedora/debug/tst-chk1.c	18 Sep 2007 19:57:14 -0000	1.1.2.17
+--- glibc-20070929T1859/debug/tst-chk1.c	26 Sep 2007 20:45:09 -0000	1.18
++++ glibc-20070929T1859-fedora/debug/tst-chk1.c	29 Sep 2007 19:10:47 -0000	1.1.2.18
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -340,7 +340,7 @@
    /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
       and sufficient GCC support, as the string operations overflow
       from a.buf1 into a.buf2.  */
-@@ -345,7 +348,7 @@ do_test (void)
+@@ -353,7 +356,7 @@ do_test (void)
    memset (a.buf1 + 9, 'j', l0 + 2);
    CHK_FAIL_END
  
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20070920T0007/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
-+++ glibc-20070920T0007-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
+--- glibc-20070929T1859/elf/ldconfig.c	12 Aug 2007 20:08:03 -0000	1.61
++++ glibc-20070929T1859-fedora/elf/ldconfig.c	14 Aug 2007 07:38:36 -0000	1.47.2.16
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20070920T0007/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070920T0007-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070929T1859/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070929T1859-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-20070920T0007/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
-+++ glibc-20070920T0007-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
+--- glibc-20070929T1859/include/features.h	15 Sep 2007 02:23:49 -0000	1.48
++++ glibc-20070929T1859-fedora/include/features.h	18 Sep 2007 19:57:15 -0000	1.35.2.17
 @@ -282,7 +282,13 @@
  #endif
  
@@ -475,16 +475,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070920T0007/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070929T1859/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070929T1859/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070920T0007-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070929T1859/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070929T1859-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -494,8 +494,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070920T0007/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
-+++ glibc-20070920T0007-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
+--- glibc-20070929T1859/libio/stdio.h	18 Sep 2007 17:58:29 -0000	1.91
++++ glibc-20070929T1859-fedora/libio/stdio.h	18 Sep 2007 19:57:15 -0000	1.78.2.12
 @@ -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.  */
@@ -509,8 +509,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070920T0007/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070920T0007-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070929T1859/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070929T1859-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 !!!
@@ -602,8 +602,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070920T0007/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20070920T0007-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20070929T1859/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20070929T1859-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,
@@ -635,8 +635,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20070920T0007/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
-+++ glibc-20070920T0007-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
+--- glibc-20070929T1859/localedata/Makefile	10 Jul 2007 22:12:52 -0000	1.106
++++ glibc-20070929T1859-fedora/localedata/Makefile	31 Jul 2007 17:45:53 -0000	1.101.2.6
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -645,8 +645,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070920T0007/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
-+++ glibc-20070920T0007-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
+--- glibc-20070929T1859/localedata/SUPPORTED	22 Aug 2007 07:13:57 -0000	1.104
++++ glibc-20070929T1859-fedora/localedata/SUPPORTED	25 Aug 2007 18:55:03 -0000	1.71.2.18
 @@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -688,8 +688,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070920T0007/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070920T0007-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070929T1859/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070929T1859-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>"
@@ -704,8 +704,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070920T0007/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070920T0007-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070929T1859/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070929T1859-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -717,8 +717,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-20070920T0007/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070929T1859/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -789,8 +789,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070920T0007/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070920T0007-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070929T1859/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070929T1859-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -818,8 +818,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070920T0007/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20070920T0007-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20070929T1859/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20070929T1859-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>
@@ -895,8 +895,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070920T0007/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070920T0007-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070929T1859/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070929T1859-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -952,8 +952,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070920T0007/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
-+++ glibc-20070920T0007-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
+--- glibc-20070929T1859/manual/libc.texinfo	31 Jul 2007 01:53:58 -0000	1.95
++++ glibc-20070929T1859-fedora/manual/libc.texinfo	31 Jul 2007 17:45:53 -0000	1.94.2.2
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -963,9 +963,9 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070920T0007/misc/sys/cdefs.h	16 Sep 2007 05:10:26 -0000	1.70
-+++ glibc-20070920T0007-fedora/misc/sys/cdefs.h	18 Sep 2007 19:57:17 -0000	1.58.2.8
-@@ -282,7 +282,10 @@
+--- glibc-20070929T1859/misc/sys/cdefs.h	26 Sep 2007 20:43:16 -0000	1.71
++++ glibc-20070929T1859-fedora/misc/sys/cdefs.h	29 Sep 2007 19:10:48 -0000	1.58.2.9
+@@ -291,7 +291,10 @@
  
  /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
     inline semantics, unless -fgnu89-inline is used.  */
@@ -977,7 +977,7 @@
  # if defined __GNUC_STDC_INLINE__ || defined __cplusplus
  #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
  #  define __extern_always_inline \
-@@ -295,7 +298,10 @@
+@@ -304,7 +307,10 @@
  
  /* GCC 4.3 and above allow passing all anonymous arguments of an
     __extern_always_inline function to some other vararg function.  */
@@ -989,16 +989,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20070920T0007/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070920T0007-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070929T1859/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070929T1859-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-20070920T0007/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
-+++ glibc-20070920T0007-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
+--- glibc-20070929T1859/nptl/ChangeLog	2 Sep 2007 16:53:13 -0000	1.1032
++++ glibc-20070929T1859-fedora/nptl/ChangeLog	18 Sep 2007 19:57:17 -0000	1.706.2.139
 @@ -2942,6 +2942,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1039,8 +1039,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070920T0007/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
-+++ glibc-20070920T0007-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
+--- glibc-20070929T1859/nptl/Makefile	21 Aug 2007 23:54:26 -0000	1.191
++++ glibc-20070929T1859-fedora/nptl/Makefile	25 Aug 2007 18:55:04 -0000	1.157.2.33
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1073,8 +1073,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070920T0007/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070920T0007-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070929T1859/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070929T1859-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;
@@ -1099,8 +1099,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070920T0007/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070929T1859/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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>
 +
@@ -1108,8 +1108,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070920T0007/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
-+++ glibc-20070920T0007-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
+--- glibc-20070929T1859/nscd/connections.c	29 Aug 2007 06:09:59 -0000	1.102
++++ glibc-20070929T1859-fedora/nscd/connections.c	18 Sep 2007 19:57:17 -0000	1.55.2.33
 @@ -69,6 +69,7 @@ static gid_t *server_groups;
  # define NGROUPS 32
  #endif
@@ -1175,8 +1175,8 @@
 +{
 +  sighup_pending = 1;
 +}
---- glibc-20070920T0007/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
-+++ glibc-20070920T0007-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
+--- glibc-20070929T1859/nscd/nscd.c	16 Jul 2007 00:54:58 -0000	1.58
++++ glibc-20070929T1859-fedora/nscd/nscd.c	31 Jul 2007 17:46:00 -0000	1.38.2.17
 @@ -120,6 +120,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1195,8 +1195,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070920T0007/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070920T0007-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070929T1859/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070929T1859-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1208,8 +1208,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070920T0007/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070920T0007-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070929T1859/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070929T1859-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1250,8 +1250,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070920T0007/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
-+++ glibc-20070920T0007-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
+--- glibc-20070929T1859/posix/Makefile	11 Sep 2007 23:57:22 -0000	1.202
++++ glibc-20070929T1859-fedora/posix/Makefile	4 Aug 2007 20:51:43 -0000	1.171.2.26
 @@ -300,11 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1268,8 +1268,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20070920T0007/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070929T1859/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1286,8 +1286,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070920T0007/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070920T0007-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070929T1859/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070929T1859-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
@@ -1303,8 +1303,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-20070920T0007/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070920T0007-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070929T1859/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070929T1859-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1318,8 +1318,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070920T0007/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070929T1859/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070929T1859-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))
@@ -1331,8 +1331,8 @@
  endif
  endif
  
---- glibc-20070920T0007/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070929T1859/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070929T1859-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.  */
@@ -1684,8 +1684,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070920T0007/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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.
@@ -1771,8 +1771,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070920T0007/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070920T0007-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070929T1859/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070929T1859-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
@@ -1781,8 +1781,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070920T0007/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070920T0007-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070929T1859/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070929T1859-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);
      }
@@ -1797,8 +1797,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/check_pf.c	29 Aug 2007 16:49:45 -0000	1.12
++++ glibc-20070929T1859-fedora/sysdeps/unix/sysv/linux/check_pf.c	18 Sep 2007 19:57:21 -0000	1.3.2.9
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1814,8 +1814,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/dl-osinfo.h	15 Sep 2007 22:54:08 -0000	1.26
++++ glibc-20070929T1859-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	18 Sep 2007 19:57:21 -0000	1.14.2.12
 @@ -19,11 +19,14 @@
     02111-1307 USA.  */
  
@@ -1863,8 +1863,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070929T1859-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;
@@ -1907,8 +1907,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070929T1859-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>
@@ -1934,8 +1934,8 @@
  
  struct netlink_res
  {
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070929T1859-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"
@@ -1945,8 +1945,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070929T1859-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;
@@ -1992,8 +1992,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070929T1859-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
  
@@ -2012,8 +2012,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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.
@@ -2074,8 +2074,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070929T1859-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)
@@ -2108,29 +2108,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070929T1859-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-20070920T0007/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070920T0007-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070929T1859/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070929T1859-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.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- glibc.spec	20 Sep 2007 00:29:56 -0000	1.328
+++ glibc.spec	29 Sep 2007 19:47:29 -0000	1.329
@@ -1,9 +1,9 @@
-%define glibcdate 20070920T0007
+%define glibcdate 20070929T1859
 %define glibcname glibc
-%define glibcsrcdir glibc-20070920T0007
+%define glibcsrcdir glibc-20070929T1859
 %define glibc_release_tarballs 0
 %define glibcversion 2.6.90
-%define glibcrelease 15
+%define glibcrelease 16
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,6 +1015,15 @@
 %endif
 
 %changelog
+* Sat Sep 29 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-16
+- misc fixes (BZ#4963, BZ#4972, BZ#5028, BZ#5043, BZ#5058)
+- improve -D_FORTIFY_SOURCE{,=2} diagnostic through warning/error
+  attributes
+- fix wcscpy, wcpcpy, fgetws, fgetws_unlocked, swprintf and vswprintf
+  fortification inlines
+- fix a scalability issue with lazy binding in heavily multithreaded
+  programs
+
 * Thu Sep 20 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-15
 - $5$ (SHA-256) and $6$ (SHA-512) support in crypt
   (#228697, #249477, #173834)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- sources	20 Sep 2007 00:29:56 -0000	1.241
+++ sources	29 Sep 2007 19:47:29 -0000	1.242
@@ -1,2 +1,2 @@
-68c585139617d926f94df1b5b2f57d13  glibc-20070920T0007.tar.bz2
-2ebd905d6bb60c826db1d0fd99dcec02  glibc-fedora-20070920T0007.tar.bz2
+519315d1475507b2a1eac7f95a6c5041  glibc-20070929T1859.tar.bz2
+922aeab2a07fd5f7dabc34fce941d6fa  glibc-fedora-20070929T1859.tar.bz2



From fedora-extras-commits at redhat.com  Sat Sep 29 22:08:46 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 18:08:46 -0400
Subject: rpms/osgal/devel osgal.spec,1.8,1.9
Message-ID: <200709292208.l8TM8k2G029471@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29448

Modified Files:
	osgal.spec 
Log Message:
add some rpmlint fixes


Index: osgal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- osgal.spec	29 Sep 2007 18:51:41 -0000	1.8
+++ osgal.spec	29 Sep 2007 22:08:11 -0000	1.9
@@ -5,7 +5,7 @@
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.vrlab.umu.se/research/osgAL
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,9 +24,8 @@
 %package devel
 Summary:        Library development files for osgal
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       OpenSceneGraph-devel OpenThreads-devel
-Requires:       openal-devel freealut-devel libvorbis-devel
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       OpenThreads-devel openal-devel freealut-devel libvorbis-devel
 
 %description devel
 This package contains headers and libraries required to build applications
@@ -34,13 +33,17 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 sed -i -e 's/^\(CXXFLAGS="[^"]*\)/\1 $CXXFLAGS/' configure.in
-chmod -x {include,src}/osg*/*
 autoreconf --force --install
 
-# Fix rpmlint errors
+# Fix rpmlint warnings
+chmod -x {include,src}/osg*/*
 chmod -x AUTHORS COPYING NEWS README
+iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 -t utf-8 NEWS > NEWS.conv && mv -f NEWS.conv NEWS
+iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README
+sed -i 's/\r//' AUTHORS NEWS README doc/*html
 
 
 %build
@@ -84,10 +87,11 @@
 
 
 %changelog
-* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.6.1-1
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 1:0.6.1-1
 - Upstream sync
 - Move openalpp-devel Requires to this package
 - Obsolete/Provides openalpp
+- Fix up some rpmlint warnings
 
 * Sun Feb 04 2007 Christopher Stone <chris.stone at gmail.com> 20060903-3
 - Fix setting of CFLAGS in configure.in bug #227290



From fedora-extras-commits at redhat.com  Sun Sep 30 00:13:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 29 Sep 2007 20:13:25 -0400
Subject: rpms/osgcal/devel osgcal.spec,1.10,1.11
Message-ID: <200709300013.l8U0DPQT026018@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/osgcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26000

Modified Files:
	osgcal.spec 
Log Message:
fix some rpmlint warnings


Index: osgcal.spec
===================================================================
RCS file: /cvs/extras/rpms/osgcal/devel/osgcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- osgcal.spec	29 Sep 2007 15:01:35 -0000	1.10
+++ osgcal.spec	30 Sep 2007 00:12:53 -0000	1.11
@@ -1,10 +1,10 @@
 Name:           osgcal
 Version:        0.1.46
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adapts OpenSceneGraph to use Cal3D
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://gna.org/projects/underware
 Source0:        http://osgcal.dachary.org/download/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +37,7 @@
 
 # Fix rpmlint warnings
 chmod -x include/osgCal/HardwareModel
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 
 
 %build
@@ -81,6 +82,10 @@
 
 
 %changelog
+* Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-2
+- Update License
+- Fix encoding on Changelog
+
 * Sat Sep 29 2007 Christopher Stone <chris.stone at gmail.com> 0.1.46-1
 - Upstream sync
 - Remove no longer needed 64-bit patch



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:32 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:32 -0400
Subject: rpms/fbreader/EL-4 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2aWha010115@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:35:57 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:35:57 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:44 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:44 -0400
Subject: rpms/fbreader/EL-5 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2aih1010120@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:03 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:03 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:49 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:49 -0400
Subject: rpms/fbreader/F-7 fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 fbreader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200709300236.l8U2antF010124@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch fbreader.spec 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:14 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:36:52 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:36:52 -0400
Subject: rpms/fbreader/devel fbreader-debug.patch, NONE,
	1.1 fbreader-desktop.patch, NONE, 1.1 fbreader-optflags.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709300236.l8U2aqXx010129@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fbreader-debug.patch fbreader-desktop.patch 
	fbreader-optflags.patch 
Log Message:
fbreader-0.8.6d


fbreader-debug.patch:

--- NEW FILE fbreader-debug.patch ---
--- makefiles/subdir.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/subdir.mk	2007-09-21 11:52:58.000000000 -0400
@@ -9,7 +9,7 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n "Compiling $@ ... with $(CFLAGS)"
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
 	@echo " OK"
 

fbreader-desktop.patch:

--- NEW FILE fbreader-desktop.patch ---
--- fbreader/desktop/desktop.orig	2007-09-07 15:05:37.000000000 -0400
+++ fbreader/desktop/desktop	2007-09-16 23:10:06.000000000 -0400
@@ -11,5 +11,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Application;Office;Viewer;
+Icon=FBReader
+Categories=GTK;Office;Viewer;

fbreader-optflags.patch:

--- NEW FILE fbreader-optflags.patch ---
--- makefiles/config.mk.orig	2007-09-07 15:05:39.000000000 -0400
+++ makefiles/config.mk	2007-09-21 11:51:53.000000000 -0400
@@ -18,7 +18,7 @@
 endif
 
 ifeq "$(TARGET_STATUS)" "release"
-	CFLAGS += -O3
+	CFLAGS += $(RPM_OPT_FLAGS)
 	LDFLAGS += -s
 endif
 ifeq "$(TARGET_STATUS)" "debug"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:45:29 -0000	1.1
+++ .cvsignore	30 Sep 2007 02:36:19 -0000	1.2
@@ -0,0 +1 @@
+fbreader-sources-0.8.6d.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:45:29 -0000	1.1
+++ sources	30 Sep 2007 02:36:19 -0000	1.2
@@ -0,0 +1 @@
+816fc0f2322e23bdaf5968443b1cfab9  fbreader-sources-0.8.6d.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 02:39:08 2007
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 29 Sep 2007 22:39:08 -0400
Subject: rpms/fbreader/devel fbreader.spec,NONE,1.1
Message-ID: <200709300239.l8U2d8G2010208@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10201

Added Files:
	fbreader.spec 
Log Message:
fbreader.spec for devel


--- NEW FILE fbreader.spec ---
# rebuild with --with qt4 to build optional qt4 UI
Name:           fbreader
Version:        0.8.6d
Release:        2%{?dist}
Summary:        E-book reader

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://www.fbreader.org/
Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
Patch0:         fbreader-desktop.patch
Patch1:         fbreader-optflags.patch
# Use to expose the compiler flags used during build
# Patch2:         fbreader-debug.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  expat-devel bzip2-devel enca-devel
BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
%{?_with_qt4:BuildRequires: qt4-devel}
#Requires:       

%description

FBReader is an e-book reader, with the following main features:

* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
  books in one archive are supported.)
* Automatic library building.
* Automatic encoding detection is supported.
* Automatically generated contents table.
* Embedded images support.
* Footnotes/hyperlinks support.
* Position indicator.
* Keeps the last open book and the last read positions for all opened
  books between runs.
* List of last opened books.
* Automatic hyphenations. Liang's algorithm is used. The same
  algorithm is used in TeX, and TeX hyphenation patterns are used in
  FBReader. Patterns for Czech, English, Esperanto, French, German and
  Russian are included in the current version.
* Text search.
* Full-screen mode.
* Screen rotation by 90, 180 and 270 degrees.


%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .optflags
#%patch2 -p0 -b .debug


%build
make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
%if 0%{?_with_qt4:1}
make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy


%install
rm -rf $RPM_BUILD_ROOT
make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=dummy
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=gtk
%if 0%{?_with_qt4:1}
make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     LIBDIR=%{_libdir} UI_TYPE=qt4
%endif
make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
     UI_TYPE=dummy

desktop-file-install --vendor="fedora" \
                     --remove-category="Application" \
                     --delete-original \
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{buildroot}%{_datadir}/applications/FBReader.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc fbreader/LICENSE
%{_bindir}/FBReader
%{_libdir}/*
%{_datadir}/FBReader
%{_datadir}/applications/fedora-FBReader.desktop
%{_datadir}/pixmaps/FBReader.png
%{_datadir}/pixmaps/FBReader
%{_datadir}/zlibrary



%changelog
* Sat Sep 22 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-2
- Fix vendor tag
- Use compiler flags provided by the system

* Sun Sep 16 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8.6d-1
- Initial package



From fedora-extras-commits at redhat.com  Sun Sep 30 03:07:36 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:07:36 -0400
Subject: rpms/ghc/devel .cvsignore, 1.8, 1.9 ghc.spec, 1.21, 1.22 sources,
	1.10, 1.11
Message-ID: <200709300307.l8U37a7G016994@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16961

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
Update to ghc-6.8.0.20070928



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 May 2007 17:09:49 -0000	1.8
+++ .cvsignore	30 Sep 2007 03:06:57 -0000	1.9
@@ -1,2 +1,2 @@
-ghc-6.6.1-src.tar.bz2
-ghc-6.6.1-src-extralibs.tar.bz2
+ghc-6.8.0.20070928-src-extralibs.tar.bz2
+ghc-6.8.0.20070928-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ghc.spec	10 May 2007 19:52:43 -0000	1.21
+++ ghc.spec	30 Sep 2007 03:06:57 -0000	1.22
@@ -1,12 +1,24 @@
-%define ghcver ghc661
+%define ghcver ghc680
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
+# 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
+# your built tree to a directory of the same name suffixed with
+# ".built", using "cp -al".  Finally, set this variable, and it will
+# copy the already-built tree into place during %build instead of
+# actually doing the build.
+#
+# Obviously, this can only work if you leave the %build section
+# completely untouched between builds.
+%define package_debugging 0
+
 Name:		ghc
-Version:	6.6.1
-Release:	3%{?dist}
+Version:	6.8.0.20070928
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	ppc64
@@ -15,15 +27,15 @@
 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
 URL:		http://haskell.org/ghc/
-Requires:	%{ghcver} = %{version}-%{release}
+Requires:	%{ghcver} = %{version}-%{release}, chkconfig
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, sed
-Buildrequires:  gmp-devel, readline-devel
-Buildrequires:  libX11-devel, libXt-devel
-Buildrequires:  freeglut-devel, openal-devel
+BuildRequires:  gmp-devel, readline-devel
+BuildRequires:  libX11-devel, libXt-devel
+BuildRequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
-Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
+BuildRequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
 Prefix:		%{_prefix}
 
@@ -82,31 +94,49 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
-%setup -q -n ghc-%{version} -b1
+%setup -q -n %{name}-%{version} -b1
 
 %build
+%if %{package_debugging}
+cd ..
+rm -rf %{name}-%{version}
+cp -al %{name}-%{version}.built %{name}-%{version}
+cd %{name}-%{version}
+exit 0
+%endif
+
 %if !%{build_prof}
 echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
+./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}
 
 # drop truncated copy of header (#222865)
 rm libraries/network/include/Typeable.h
 
-make all
+make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} all
 %if %{build_doc}
-make html
+make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} html
+make %{_smp_mflags} -C libraries HADDOCK_DOCS=YES
+( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} install
+make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/%{name}-%{version} install
 
 %if %{build_doc}
-make mandir=$RPM_BUILD_ROOT%{_mandir} datadir=$RPM_BUILD_ROOT%{_docdir}/ghc-%{version} XMLDocWays="html" install-docs
+make DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name}-%{version} \
+  XMLDocWays="html" HADDOCK_DOCS=YES install-docs
+mv ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries \
+  ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}
+cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
 %endif
 
 SRC_TOP=$PWD
@@ -126,6 +156,7 @@
 # create package.conf.old
 touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
 
+mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs-ghc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +171,22 @@
 
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/{hasktags,runghc,runhaskell} >/dev/null 2>&1 || :
 
+# Alas, GHC, Hugs, and nhc all come with different set of tools in
+# addition to a runFOO:
+#
+#   * GHC:  hsc2hs
+#   * Hugs: hsc2hs, cpphs
+#   * nhc:  cpphs
+#
+# Therefore it is currently not possible to use --slave below to form
+# link groups under a single name 'runhaskell'. Either these tools
+# should be disentangled from the Haskell implementations, or all
+# implementations should have the same set of tools. *sigh*
+
+update-alternatives --install %{_bindir}/runhaskell runhaskell \
+  %{_bindir}/runghc 500
+update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
+  %{_bindir}/hsc2hs-ghc 500
 
 %post -n %{ghcver}
 ## tweak prefix in drivers scripts if relocating
@@ -152,6 +199,13 @@
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || :
 
 
+%preun
+if test "$1" = 0; then
+  update-alternatives --remove runhaskell %{_bindir}/runghc
+  update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-ghc
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -181,6 +235,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-1
+- prepare for GHC 6.8.1 by building a release candidate snapshot
+
 * Thu May 10 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.6.1-3
 - install man page for ghc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 May 2007 17:09:49 -0000	1.10
+++ sources	30 Sep 2007 03:06:57 -0000	1.11
@@ -1,2 +1,2 @@
-dea271503463bd28c27f25ab90998633  ghc-6.6.1-src.tar.bz2
-43a26b81608b206c056adc3032f7da2a  ghc-6.6.1-src-extralibs.tar.bz2
+8699ec00c510077ad6c632aea19ec1e0  ghc-6.8.0.20070928-src-extralibs.tar.bz2
+2f3d20ad0c68cd77a06b708e4d8360c5  ghc-6.8.0.20070928-src.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 03:19:26 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:19:26 -0400
Subject: rpms/ghc/devel ghc.spec,1.22,1.23
Message-ID: <200709300319.l8U3JQVI017379@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17348

Modified Files:
	ghc.spec 
Log Message:
Work around rpm braindamage: you can't have "%" in comments!?



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ghc.spec	30 Sep 2007 03:06:57 -0000	1.22
+++ ghc.spec	30 Sep 2007 03:18:21 -0000	1.23
@@ -9,10 +9,10 @@
 # the misery, do a complete build once using "rpmbuild -bc", then copy
 # your built tree to a directory of the same name suffixed with
 # ".built", using "cp -al".  Finally, set this variable, and it will
-# copy the already-built tree into place during %build instead of
+# copy the already-built tree into place during build instead of
 # actually doing the build.
 #
-# Obviously, this can only work if you leave the %build section
+# Obviously, this can only work if you leave the build section
 # completely untouched between builds.
 %define package_debugging 0
 



From fedora-extras-commits at redhat.com  Sun Sep 30 03:54:26 2007
From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos))
Date: Sat, 29 Sep 2007 23:54:26 -0400
Subject: rpms/ghc/devel ghc.spec,1.23,1.24
Message-ID: <200709300354.l8U3sQCf018070@cvs-int.fedora.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18052

Modified Files:
	ghc.spec 
Log Message:
Add happy to buldreqs


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ghc.spec	30 Sep 2007 03:18:21 -0000	1.23
+++ ghc.spec	30 Sep 2007 03:53:49 -0000	1.24
@@ -18,7 +18,7 @@
 
 Name:		ghc
 Version:	6.8.0.20070928
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	ppc64
@@ -29,7 +29,7 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}, chkconfig
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ghc, sed
+BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, readline-devel
 BuildRequires:  libX11-devel, libXt-devel
 BuildRequires:  freeglut-devel, openal-devel
@@ -235,6 +235,9 @@
 
 
 %changelog
+* Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-2
+- add happy to BuildRequires
+
 * Sat Sep 29 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.0.20070928-1
 - prepare for GHC 6.8.1 by building a release candidate snapshot
 



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:06 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:06 -0400
Subject: rpms/jd/F-7 .cvsignore, 1.128, 1.129 jd.spec, 1.147, 1.148 sources, 
	1.129, 1.130
Message-ID: <200709301132.l8UBW6Lk026280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- .cvsignore	28 Sep 2007 15:27:25 -0000	1.128
+++ .cvsignore	30 Sep 2007 11:31:34 -0000	1.129
@@ -1 +1 @@
-jd-1.9.6-svn1355.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- jd.spec	28 Sep 2007 15:27:25 -0000	1.147
+++ jd.spec	30 Sep 2007 11:31:34 -0000	1.148
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1355
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
-- svn 1355
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
 
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- sources	28 Sep 2007 15:27:25 -0000	1.129
+++ sources	30 Sep 2007 11:31:34 -0000	1.130
@@ -1 +1 @@
-4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:09 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:09 -0400
Subject: rpms/jd/FC-6 .cvsignore, 1.30, 1.31 jd.spec, 1.36, 1.37 sources,
	1.31, 1.32
Message-ID: <200709301132.l8UBW9d0026285@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	18 Sep 2007 13:46:26 -0000	1.30
+++ .cvsignore	30 Sep 2007 11:31:37 -0000	1.31
@@ -1 +1 @@
-jd-1.9.6-beta070918.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jd.spec	18 Sep 2007 13:46:26 -0000	1.36
+++ jd.spec	30 Sep 2007 11:31:37 -0000	1.37
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070918
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +122,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
+
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	18 Sep 2007 13:46:26 -0000	1.31
+++ sources	30 Sep 2007 11:31:37 -0000	1.32
@@ -1 +1 @@
-6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 11:32:11 2007
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 30 Sep 2007 07:32:11 -0400
Subject: rpms/jd/devel .cvsignore, 1.148, 1.149 jd.spec, 1.174, 1.175 sources,
	1.149, 1.150
Message-ID: <200709301132.l8UBWBbv026290@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26213/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	28 Sep 2007 15:23:54 -0000	1.148
+++ .cvsignore	30 Sep 2007 11:31:39 -0000	1.149
@@ -1 +1 @@
-jd-1.9.6-svn1355.tgz
+jd-1.9.6-rc070930.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- jd.spec	28 Sep 2007 15:23:54 -0000	1.174
+++ jd.spec	30 Sep 2007 11:31:39 -0000	1.175
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        svn1355
-%define         repoid        27206
+%define         strtag        rc070930
+%define         repoid        27371
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -50,7 +50,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 %if %{pre_release}
-BuildRequires:	subversion
+#BuildRequires:	subversion
 %endif
 Requires:       %{fontpackage}
 
@@ -122,8 +122,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Sep 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.svn1355
-- svn 1355
+* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
+- 1.9.6 rc 070930
 
 * Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
 - 1.9.6 beta 070918


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- sources	28 Sep 2007 15:23:54 -0000	1.149
+++ sources	30 Sep 2007 11:31:39 -0000	1.150
@@ -1 +1 @@
-4055da7795e6ac346b06959bcb44ca38  jd-1.9.6-svn1355.tgz
+d8e1d36afc19ce34d34955b78e8cee43  jd-1.9.6-rc070930.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 13:27:05 2007
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 30 Sep 2007 09:27:05 -0400
Subject: rpms/libdockapp/devel libdockapp.spec,1.2,1.3
Message-ID: <200709301327.l8UDR5UX008361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdockapp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8342

Modified Files:
	libdockapp.spec 
Log Message:
* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson



Index: libdockapp.spec
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/devel/libdockapp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdockapp.spec	24 May 2007 08:13:29 -0000	1.2
+++ libdockapp.spec	30 Sep 2007 13:26:32 -0000	1.3
@@ -1,8 +1,9 @@
 %define _x11fontdir %{_datadir}/X11/fonts
+%define catalogue /etc/X11/fontpath.d
 
 Name:           libdockapp
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DockApp Development Standard Library
 
 Group:          System Environment/Libraries
@@ -43,8 +44,6 @@
 %package        fonts
 Summary:        Fonts provided with %{name}
 Group:          User Interface/X
-Requires(post):   chkfontpath
-Requires(postun): chkfontpath
 
 %description fonts
 Bitmap X fonts provided with libdockapp.
@@ -74,6 +73,9 @@
 cp -a examples examples-devel
 rm examples-devel/Makefile*
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_x11fontdir}/dockapp $RPM_BUILD_ROOT%{catalogue}/dockapp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,8 +83,6 @@
 %post -p /sbin/ldconfig
 
 %post fonts
-/usr/sbin/chkfontpath -qa %{_datadir}/X11/fonts/dockapp
-
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/X11/fonts
 fi
@@ -94,7 +94,6 @@
   if [ -x /usr/bin/fc-cache ]; then
     /usr/bin/fc-cache %{_datadir}/X11/fonts
   fi
-  /usr/sbin/chkfontpath -qr %{_datadir}/X11/fonts/dockapp
 fi
 
 %files
@@ -112,8 +111,12 @@
 # there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
 %{_x11fontdir}/
 #%{_x11fontdir}/dockapp/
+%{catalogue}/dockapp
 
 %changelog
+* Sun Sep 30 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-4
+- new fontpath.d configuraton mechanism, change by ajax, Adam Jackson
+
 * Thu May 24 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-3
 - fix libtool bug on ppc64
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:15 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:15 -0400
Subject: rpms/perl-MP3-Info/F-7 .cvsignore, 1.4, 1.5 perl-MP3-Info.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiFtZ026177@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/F-7

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:47 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:42 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	8 Sep 2007 19:03:05 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:47 -0000	1.4
+++ sources	30 Sep 2007 14:43:42 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:19 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:19 -0400
Subject: rpms/perl-MP3-Info/FC-6 .cvsignore, 1.4, 1.5 perl-MP3-Info.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiJod026182@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/FC-6

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:50 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:45 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MP3-Info.spec	8 Sep 2007 19:03:09 -0000	1.7
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:50 -0000	1.4
+++ sources	30 Sep 2007 14:43:45 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:44:21 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:44:21 -0400
Subject: rpms/perl-MP3-Info/devel .cvsignore, 1.4, 1.5 perl-MP3-Info.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200709301444.l8UEiLJP026187@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25856/devel

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2007 18:43:53 -0000	1.4
+++ .cvsignore	30 Sep 2007 14:43:49 -0000	1.5
@@ -1 +1 @@
-MP3-Info-1.22.tar.gz
+MP3-Info-1.23.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	8 Sep 2007 19:03:13 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:43:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
+- Upstream sync
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.22-3
 - Add BuildRequires perl(Test::More)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2007 18:43:53 -0000	1.4
+++ sources	30 Sep 2007 14:43:49 -0000	1.5
@@ -1 +1 @@
-ed00c6821951d98c00a70bc02e6cb82f  MP3-Info-1.22.tar.gz
+fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 14:46:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 10:46:45 -0400
Subject: extras-buildsys ChangeLog,1.220,1.221
Message-ID: <200709301446.l8UEkjHa026320@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26266

Modified Files:
	ChangeLog 
Log Message:
Fix rpmUtils imports


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog	18 Sep 2007 18:26:18 -0000	1.220
+++ ChangeLog	30 Sep 2007 14:46:43 -0000	1.221
@@ -1,9 +1,14 @@
+2007-09-30  Ville Skytt??  <scop at fedoraproject.org>
+
+	* server/PackageJob.py
+	  - Fix rpmUtils imports
+
 2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
 
 	* etc/plague-builder.init, etc/plague-server.init
 	   - Fix usage help output
 
-2007-05-20  Ville Skytt??  <ville.skytta at iki.fi>
+2007-05-20  Ville Skytt??  <scop at fedoraproject.org>
 
     * common/AuthedXMLRPCServer.py
         - Fix SimpleXMLRPCDispatcher initialization for Python 2.5
@@ -1061,7 +1066,7 @@
             returning Error 500 Internal Server Error when, for example, the
             build server isn't running
 
-    Patch from Ville Skytt?? <ville.skytta at iki.fi>
+    Patch from Ville Skytt?? <scop at fedoraproject.org>
     * www/template/head.psp
       www/indiv.psp
         - Use HTTP GET instead of POST to stop nags about form data resubmission



From fedora-extras-commits at redhat.com  Sun Sep 30 14:46:46 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 10:46:46 -0400
Subject: extras-buildsys/server PackageJob.py,1.58,1.59
Message-ID: <200709301446.l8UEkkvs026326@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26266/server

Modified Files:
	PackageJob.py 
Log Message:
Fix rpmUtils imports


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- PackageJob.py	13 Nov 2006 20:10:48 -0000	1.58
+++ PackageJob.py	30 Sep 2007 14:46:43 -0000	1.59
@@ -21,7 +21,8 @@
 import commands
 import threading
 import time
-import rpmUtils
+import rpmUtils.miscutils
+import rpmUtils.transaction
 import exceptions
 import shutil
 import copy



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:14 -0400
Subject: rpms/perl-MP3-Info/F-7 perl-MP3-Info.spec,1.9,1.10
Message-ID: <200709301447.l8UElEFS026358@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/F-7

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/F-7/perl-MP3-Info.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MP3-Info.spec	30 Sep 2007 14:43:42 -0000	1.9
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:42 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:17 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:17 -0400
Subject: rpms/perl-MP3-Info/FC-6 perl-MP3-Info.spec,1.8,1.9
Message-ID: <200709301447.l8UElH4Y026361@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/FC-6

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/FC-6/perl-MP3-Info.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MP3-Info.spec	30 Sep 2007 14:43:45 -0000	1.8
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:44 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 14:47:20 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 10:47:20 -0400
Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.9,1.10
Message-ID: <200709301447.l8UElKGm026364@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/perl-MP3-Info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/devel

Modified Files:
	perl-MP3-Info.spec 
Log Message:
fix license tag


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MP3-Info.spec	30 Sep 2007 14:43:49 -0000	1.9
+++ perl-MP3-Info.spec	30 Sep 2007 14:46:47 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
-License:        Artistic or GPL
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:09:35 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:09:35 -0400
Subject: rpms/php-pear-Net-UserAgent-Detect/devel .cvsignore, 1.3,
	1.4 php-pear-Net-UserAgent-Detect.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200709301509.l8UF9ZUa006687@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6644

Modified Files:
	.cvsignore php-pear-Net-UserAgent-Detect.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2007 02:27:20 -0000	1.3
+++ .cvsignore	30 Sep 2007 15:09:02 -0000	1.4
@@ -1 +1 @@
-Net_UserAgent_Detect-2.3.0.tgz
+Net_UserAgent_Detect-2.4.0.tgz


Index: php-pear-Net-UserAgent-Detect.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/php-pear-Net-UserAgent-Detect.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Net-UserAgent-Detect.spec	2 May 2007 02:27:20 -0000	1.2
+++ php-pear-Net-UserAgent-Detect.spec	30 Sep 2007 15:09:02 -0000	1.3
@@ -2,12 +2,12 @@
 %define pear_name Net_UserAgent_Detect
 
 Name:           php-pear-Net-UserAgent-Detect
-Version:        2.3.0
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        Extract information from an HTTP user agent
 
 Group:          Development/Languages
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Net_UserAgent_Detect
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.4.0-1
+- Upstream sync
+
 * Tue May 01 2007 Christopher Stone <chris.stone at gmail.com> 2.3.0-1
 - Upstream sync
 - Update license to 3.01


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-UserAgent-Detect/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2007 02:27:20 -0000	1.3
+++ sources	30 Sep 2007 15:09:02 -0000	1.4
@@ -1 +1 @@
-f2ceeeb15c7b30e82bc6045b93e366c4  Net_UserAgent_Detect-2.3.0.tgz
+861df334ae59f0502b9af53e4397f97f  Net_UserAgent_Detect-2.4.0.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 15:09:36 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 30 Sep 2007 11:09:36 -0400
Subject: rpms/tig/devel .cvsignore,1.4,1.5 sources,1.4,1.5 tig.spec,1.5,1.6
Message-ID: <200709301509.l8UF9aqO006692@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/tig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6651

Modified Files:
	.cvsignore sources tig.spec 
Log Message:
tig-0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2007 14:14:37 -0000	1.4
+++ .cvsignore	30 Sep 2007 15:09:03 -0000	1.5
@@ -1 +1 @@
-tig-0.9.tar.gz
+tig-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2007 14:14:37 -0000	1.4
+++ sources	30 Sep 2007 15:09:03 -0000	1.5
@@ -1 +1 @@
-29576aee510e0cd1a16702560cf487ce  tig-0.9.tar.gz
+b596682b3cd5892db22d7168d6f99bd1  tig-0.9.1.tar.gz


Index: tig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tig/devel/tig.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tig.spec	20 Sep 2007 14:14:37 -0000	1.5
+++ tig.spec	30 Sep 2007 15:09:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           tig
-Version:        0.9
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Text-mode interface for the git revision control system
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 James Bowes <jbowes at redhat.com> - 0.9.1-1
+- tig-0.9.1
+
 * Thu Sep 20 2007 James Bowes <jbowes at redhat.com> - 0.9-1
 - tig-0.9
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:17:56 2007
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 30 Sep 2007 11:17:56 -0400
Subject: rpms/git/devel .cvsignore, 1.45, 1.46 git.spec, 1.40, 1.41 sources, 
	1.45, 1.46
Message-ID: <200709301517.l8UFHusO006935@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6903

Modified Files:
	.cvsignore git.spec sources 
Log Message:
git 1.5.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	27 Sep 2007 01:34:46 -0000	1.45
+++ .cvsignore	30 Sep 2007 15:17:23 -0000	1.46
@@ -1 +1 @@
-git-1.5.3.2.tar.gz
+git-1.5.3.3.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- git.spec	27 Sep 2007 01:34:46 -0000	1.40
+++ git.spec	30 Sep 2007 15:17:23 -0000	1.41
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.5.3.2
+Version: 	1.5.3.3
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPLv2
@@ -233,6 +233,9 @@
 %{!?_without_docs: %doc Documentation/technical}
 
 %changelog
+* Sun Sep 30 2007 James Bowes <jbowes at redhat.com> 1.5.3.3-1
+- git-1.5.3.3
+
 * Wed Sep 26 2007 James Bowes <jbowes at redhat.com> 1.5.3.2-1
 - git-1.5.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	27 Sep 2007 01:34:46 -0000	1.45
+++ sources	30 Sep 2007 15:17:23 -0000	1.46
@@ -1 +1 @@
-9930f19e22c121b8a803337cbda1e661  git-1.5.3.2.tar.gz
+978bda72a636d805dd3058efec5e6f2e  git-1.5.3.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 15:20:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 11:20:28 -0400
Subject: extras-buildsys ChangeLog,1.221,1.222
Message-ID: <200709301520.l8UFKSAJ007024@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6993

Modified Files:
	ChangeLog 
Log Message:
Fix inaccurate down_message comment


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- ChangeLog	30 Sep 2007 14:46:43 -0000	1.221
+++ ChangeLog	30 Sep 2007 15:20:25 -0000	1.222
@@ -3,6 +3,9 @@
 	* server/PackageJob.py
 	  - Fix rpmUtils imports
 
+	* www/config.psp
+	  - Fix inaccurate down_message comment
+
 2007-09-18  Michael Schwendt  <mschwendt at users.sf.net>
 
 	* etc/plague-builder.init, etc/plague-server.init



From fedora-extras-commits at redhat.com  Sun Sep 30 15:20:28 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 11:20:28 -0400
Subject: extras-buildsys/www config.psp,1.4,1.5
Message-ID: <200709301520.l8UFKScd007030@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6993/www

Modified Files:
	config.psp 
Log Message:
Fix inaccurate down_message comment


Index: config.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.psp	19 Nov 2005 05:43:24 -0000	1.4
+++ config.psp	30 Sep 2007 15:20:26 -0000	1.5
@@ -10,7 +10,7 @@
 config_opts['user_ca_cert'] = CERT_BASE_DIR + "fedora-upload-ca.cert"
 config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert"
 
-# Leave blank (zero-length) to disable
+# Leave blank (zero-length) to use the default
 config_opts['down_message'] = ""
 
 %>



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:11 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:11 -0400
Subject: rpms/php-pecl-radius/EL-5 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYBqj007383@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/EL-5

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/EL-5/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:42:42 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:39 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:14 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:14 -0400
Subject: rpms/php-pecl-radius/F-7 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYEtW007386@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/F-7

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/F-7/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:26 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:42 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:16 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:16 -0400
Subject: rpms/php-pecl-radius/FC-6 php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYGxF007389@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/FC-6

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/FC-6/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:29 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:44 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:34:19 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 11:34:19 -0400
Subject: rpms/php-pecl-radius/devel php-pecl-radius.spec,1.2,1.3
Message-ID: <200709301534.l8UFYJZX007392@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7270/devel

Modified Files:
	php-pecl-radius.spec 
Log Message:
update to latest standards


Index: php-pecl-radius.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-radius/devel/php-pecl-radius.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-radius.spec	8 Sep 2007 19:35:31 -0000	1.2
+++ php-pecl-radius.spec	30 Sep 2007 15:33:47 -0000	1.3
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-radius
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Radius client library
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(radius) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -57,6 +57,20 @@
 EOF
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +83,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-2
+- Update to new standards
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 1.2.5-1
 - Upstream sync
 



From fedora-extras-commits at redhat.com  Sun Sep 30 15:51:02 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 11:51:02 -0400
Subject: rpms/yum-cron/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301551.l8UFp2e7009226@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9137/devel

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 14:52:22 -0000	1.3
+++ .cvsignore	30 Sep 2007 15:50:30 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 14:52:22 -0000	1.3
+++ sources	30 Sep 2007 15:50:30 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 14:52:22 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 15:50:30 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:44 -0400
Subject: extras-buildsys ChangeLog,1.126.2.52,1.126.2.53
Message-ID: <200709301626.l8UGQi3E018252@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
Merge some bits from HEAD


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.52
retrieving revision 1.126.2.53
diff -u -r1.126.2.52 -r1.126.2.53
--- ChangeLog	17 Dec 2006 17:39:34 -0000	1.126.2.52
+++ ChangeLog	30 Sep 2007 16:26:42 -0000	1.126.2.53
@@ -1,3 +1,11 @@
+2007-09-30  Ville Skytt??  <scop at fedoraproject.org>
+
+	* server/PackageJob.py
+	  - Fix rpmUtils imports
+
+	* common/AuthedXMLRPCServer.py
+	  - Fix SimpleXMLRPCDispatcher initialization for Python 2.5
+
 2006-12-17  Dan Williams  <dcbw at redhat.com>
 
 	Toshio Kuratomi <toshio at tiki-lounge.com>
@@ -652,7 +660,7 @@
             returning Error 500 Internal Server Error when, for example, the
             build server isn't running
 
-    Patch from Ville Skytt?? <ville.skytta at iki.fi>
+    Patch from Ville Skytt?? <scop at fedoraproject.org>
     * www/template/head.psp
       www/indiv.psp
         - Use HTTP GET instead of POST to stop nags about form data resubmission



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:44 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:44 -0400
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.6.4.4,1.6.4.5
Message-ID: <200709301626.l8UGQiV0018258@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206/common

Modified Files:
      Tag: STABLE_0_4
	AuthedXMLRPCServer.py 
Log Message:
Merge some bits from HEAD


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -u -r1.6.4.4 -r1.6.4.5
--- AuthedXMLRPCServer.py	26 Feb 2006 17:12:00 -0000	1.6.4.4
+++ AuthedXMLRPCServer.py	30 Sep 2007 16:26:42 -0000	1.6.4.5
@@ -75,7 +75,10 @@
         self.authinfo_callback = authinfo_callback
 
         if sys.version_info[:3] > (2, 2, 3):
-            SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+            if sys.version_info[:2] < (2, 5):
+                SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+            else:
+                SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, False, None)
         else:
             self.funcs = {}
             self.instance = None



From fedora-extras-commits at redhat.com  Sun Sep 30 16:26:45 2007
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 30 Sep 2007 12:26:45 -0400
Subject: extras-buildsys/server PackageJob.py,1.31.2.11,1.31.2.12
Message-ID: <200709301626.l8UGQj0V018264@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206/server

Modified Files:
      Tag: STABLE_0_4
	PackageJob.py 
Log Message:
Merge some bits from HEAD


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.11
retrieving revision 1.31.2.12
diff -u -r1.31.2.11 -r1.31.2.12
--- PackageJob.py	10 Nov 2006 14:31:47 -0000	1.31.2.11
+++ PackageJob.py	30 Sep 2007 16:26:42 -0000	1.31.2.12
@@ -21,7 +21,8 @@
 import commands
 import threading
 import time
-import rpmUtils
+import rpmUtils.miscutils
+import rpmUtils.transaction
 import exceptions
 import shutil
 import copy



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:00 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:00 -0400
Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ0HG018576@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/EL-5

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:02 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:28 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:03 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:03 -0400
Subject: rpms/php-pecl-xdebug/F-7 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ3d9018579@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/F-7

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:06 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:31 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:06 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:06 -0400
Subject: rpms/php-pecl-xdebug/FC-6 php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ6Gd018582@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/FC-6

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/FC-6/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:10 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:33 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 16:35:09 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 12:35:09 -0400
Subject: rpms/php-pecl-xdebug/devel php-pecl-xdebug.spec,1.6,1.7
Message-ID: <200709301635.l8UGZ9KN018587@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pecl-xdebug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506/devel

Modified Files:
	php-pecl-xdebug.spec 
Log Message:
update to latest standards


Index: php-pecl-xdebug.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-xdebug.spec	8 Sep 2007 20:04:14 -0000	1.6
+++ php-pecl-xdebug.spec	30 Sep 2007 16:34:36 -0000	1.7
@@ -1,9 +1,10 @@
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Name:           php-pecl-xdebug
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PECL package for debugging PHP scripts
 
 License:        BSD
@@ -16,11 +17,10 @@
 Provides:       php-pecl(Xdebug) = %{version}
 
 %if %{?php_zend_api}0
-# for fedora >= 6
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
 %else
-# for fedora <= 5
+# for EL-5
 Requires:       php-api = %{php_apiver}
 %endif
 
@@ -31,6 +31,10 @@
 
 %prep
 %setup -qcn xdebug-%{version}
+cd xdebug-%{version}
+
+# fix rpmlint warnings
+iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog
 
 
 %build
@@ -57,6 +61,20 @@
 install -pm 644 Changelog CREDITS LICENSE NEWS README docs
 
 
+%if 0%{?pecl_install:1}
+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+%endif
+
+
+%if 0%{?pecl_uninstall:1}
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{pecl_name} >/dev/null || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +87,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-2
+- Update to latest standards
+- Fix encoding on Changelog
+
 * Sat Sep 08 2007 Christopher Stone <chris.stone at gmail.com> 2.0.0-1
 - Upstream sync
 - Remove %%{?beta} tags



From fedora-extras-commits at redhat.com  Sun Sep 30 17:05:22 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:05:22 -0400
Subject: rpms/yum-cron/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301705.l8UH5Mf7026411@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26148/EL-5

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 15:04:18 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:04:48 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 15:04:18 -0000	1.3
+++ sources	30 Sep 2007 17:04:48 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/EL-5/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 15:04:18 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:04:48 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:06:48 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:06:48 -0400
Subject: rpms/yum-cron/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301706.l8UH6meN026764@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26476/FC-6

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 15:02:13 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:06:16 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 15:02:13 -0000	1.3
+++ sources	30 Sep 2007 17:06:16 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/FC-6/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 15:02:13 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:06:16 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:08:20 2007
From: fedora-extras-commits at redhat.com (Alec Thomas Habig (habig))
Date: Sun, 30 Sep 2007 13:08:20 -0400
Subject: rpms/yum-cron/F-7 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 yum-cron.spec, 1.5, 1.6
Message-ID: <200709301708.l8UH8Kex028233@cvs-int.fedora.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27233/F-7

Modified Files:
	.cvsignore sources yum-cron.spec 
Log Message:
Added a lockfile to prevent multiple instances of the cron scripts
from running and hanging, see bug 311661




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 14:59:33 -0000	1.3
+++ .cvsignore	30 Sep 2007 17:07:47 -0000	1.4
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 14:59:33 -0000	1.3
+++ sources	30 Sep 2007 17:07:47 -0000	1.4
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-7/yum-cron.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yum-cron.spec	3 Sep 2007 14:59:33 -0000	1.5
+++ yum-cron.spec	30 Sep 2007 17:07:47 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig at umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig at umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:23 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:23 -0400
Subject: rpms/python-fpconst/F-7 .cvsignore, 1.2, 1.3 python-fpconst.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGNZQ029656@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/F-7

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:50 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/python-fpconst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-fpconst.spec	9 Dec 2006 01:16:19 -0000	1.5
+++ python-fpconst.spec	30 Sep 2007 17:15:50 -0000	1.6
@@ -1,13 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}.2
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -18,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -39,7 +46,13 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
 * Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
 - Add python-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:50 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:25 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:25 -0400
Subject: rpms/python-fpconst/FC-6 .cvsignore, 1.2, 1.3 python-fpconst.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGPQ3029661@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/FC-6

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:53 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/python-fpconst.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-fpconst.spec	6 Sep 2006 18:50:23 -0000	1.3
+++ python-fpconst.spec	30 Sep 2007 17:15:53 -0000	1.4
@@ -1,15 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  python-devel
 
 %description
 This python module implements constants and functions for working with
@@ -17,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -38,7 +46,19 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
+* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
+- Add python-devel to BR
+
+* Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.1
+- python(abi) = 0:2.5
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3
 - No longer %%ghost pyo files.  Bug #205414
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:53 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 17:16:28 2007
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 30 Sep 2007 13:16:28 -0400
Subject: rpms/python-fpconst/devel .cvsignore, 1.2, 1.3 python-fpconst.spec, 
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200709301716.l8UHGS4w029666@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594/devel

Modified Files:
	.cvsignore python-fpconst.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
+++ .cvsignore	30 Sep 2007 17:15:56 -0000	1.3
@@ -1 +1 @@
-fpconst-0.7.2.tar.gz
+fpconst-0.7.3.tar.gz


Index: python-fpconst.spec
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/python-fpconst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-fpconst.spec	9 Dec 2006 01:16:19 -0000	1.5
+++ python-fpconst.spec	30 Sep 2007 17:15:56 -0000	1.6
@@ -1,13 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fpconst
-Version:        0.7.2
-Release:        3%{?dist}.2
+Version:        0.7.3
+Release:        1%{?dist}
 Summary:        Python module for handling IEEE 754 floating point special values
+
 Group:          Development/Languages
-License:        Apache Software License
-URL:            http://research.warnes.net/projects/RStatServer/fpconst
+License:        ASL 2.0
+URL:            http://research.warnes.net/statcomp/projects/RStatServer/fpconst
 Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -18,19 +20,24 @@
 Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
 (NegInf), as well as functions to test for these values.
 
+
 %prep
-%setup -q -n fpconst-%{version}
+%setup -qn fpconst-%{version}
 chmod -x README pep-0754.txt
 
+
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %defattr(-,root,root,-)
@@ -39,7 +46,13 @@
 %{python_sitelib}/*.pyc
 %{python_sitelib}/*.pyo
 
+
 %changelog
+* Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 0.7.3-1
+- Upstream sync
+- Update source URL
+- Some spec file cleanups
+
 * Fri Dec 08 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-3.fc7.2
 - Add python-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2006 16:55:54 -0000	1.2
+++ sources	30 Sep 2007 17:15:56 -0000	1.3
@@ -1 +1 @@
-0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz
+13884b81da3335b2ec4b6ea1dc26b6fa  fpconst-0.7.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 18:00:50 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:00:50 -0400
Subject: rpms/chmlib/devel chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301800.l8UI0o4G000325@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/devel

Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:06 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:06 -0400
Subject: rpms/chmlib/EL-4 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI166l005538@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/EL-4

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/EL-4/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:06:15 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:31 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:09 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:09 -0400
Subject: rpms/chmlib/EL-5 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI19QC005928@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/EL-5

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/EL-5/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:08:26 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:36 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:12 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:12 -0400
Subject: rpms/chmlib/F-7 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI1C4N006327@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/F-7

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/F-7/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:10:17 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:39 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:01:17 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:01:17 -0400
Subject: rpms/chmlib/FC-6 chmlib-chm_lib-fix_for_multiarch.diff, NONE,
	1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE
Message-ID: <200709301801.l8UI1Hg9006454@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/FC-6

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/FC-6/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:03:07 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:42 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:03:20 2007
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 30 Sep 2007 14:03:20 -0400
Subject: rpms/chmlib/devel chmlib.spec,1.13,1.14
Message-ID: <200709301803.l8UI3Kwu006584@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6554

Modified Files:
	chmlib.spec 
Log Message:
Accidentally forgot to commit spec-file


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:00:16 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:02:47 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:26 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:26 -0700
Subject: [pkgdb] qwt-doc was added for frankb
Message-ID: <200709301844.l8UIiVrq010788@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package qwt-doc with summary Documentation of qwt
Kevin Fenzi (kevin) has approved Package qwt-doc
Kevin Fenzi (kevin) has added a Fedora devel branch for qwt-doc with an owner of frankb
Kevin Fenzi (kevin) has approved qwt-doc in Fedora devel
Kevin Fenzi (kevin) has approved Package qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, 7) updated by kevin
Message-ID: <200709301844.l8UIifP8010812@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora 7)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, 6) updated by kevin
Message-ID: <200709301844.l8UIifNO010811@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora 6)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora EPEL, 5) updated by kevin
Message-ID: <200709301844.l8UIifPB010812@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for qwt-doc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qwt-doc (Fedora EPEL 5)
Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:44:36 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:44:36 -0700
Subject: [pkgdb] qwt-doc (Fedora, devel) updated by kevin
Message-ID: <200709301844.l8UIifNR010811@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Denied cvsextras for commit access on qwt-doc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qwt-doc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:01 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:01 -0400
Subject: rpms/qwt-doc - New directory
Message-ID: <200709301845.l8UIj10P007949@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc

Log Message:
Directory /cvs/extras/rpms/qwt-doc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:02 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:02 -0400
Subject: rpms/qwt-doc/devel - New directory
Message-ID: <200709301845.l8UIj2kr007963@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc/devel

Log Message:
Directory /cvs/extras/rpms/qwt-doc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:05 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:05 -0400
Subject: rpms/qwt-doc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709301845.l8UIj5mH007988@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc

Added Files:
	Makefile import.log 
Log Message:
Setup of module qwt-doc


--- NEW FILE Makefile ---
# Top level Makefile for module qwt-doc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:45:07 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:45:07 -0400
Subject: rpms/qwt-doc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200709301845.l8UIj7f8008004@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPy7902/rpms/qwt-doc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qwt-doc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qwt-doc
# $Id: Makefile,v 1.1 2007/09/30 18:45:05 kevin Exp $
NAME := qwt-doc
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 fedora-extras-commits at redhat.com  Sun Sep 30 18:47:12 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:12 -0700
Subject: [pkgdb] R-DynDoc was added for pingou
Message-ID: <200709301847.l8UIlHKj011058@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) has added Package R-DynDoc with summary Functions for dynamic documents
Kevin Fenzi (kevin) has approved Package R-DynDoc
Kevin Fenzi (kevin) has added a Fedora devel branch for R-DynDoc with an owner of pingou
Kevin Fenzi (kevin) has approved R-DynDoc in Fedora devel
Kevin Fenzi (kevin) has approved Package R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora devel)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora devel)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, 7) updated by kevin
Message-ID: <200709301847.l8UIlQbZ011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 7 branch for R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora 7)
Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, 6) updated by kevin
Message-ID: <200709301847.l8UIlQbc011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora 6 branch for R-DynDoc
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on R-DynDoc (Fedora 6)
Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:21 2007
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Sun, 30 Sep 2007 11:47:21 -0700
Subject: [pkgdb] R-DynDoc (Fedora, devel) updated by kevin
Message-ID: <200709301847.l8UIlQbf011079@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) Approved cvsextras for commit access on R-DynDoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/R-DynDoc



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:36 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:36 -0400
Subject: rpms/R-DynDoc - New directory
Message-ID: <200709301847.l8UIladR008665@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc

Log Message:
Directory /cvs/extras/rpms/R-DynDoc added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:42 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:42 -0400
Subject: rpms/R-DynDoc/devel - New directory
Message-ID: <200709301847.l8UIlg7q008677@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc/devel

Log Message:
Directory /cvs/extras/rpms/R-DynDoc/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:45 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:45 -0400
Subject: rpms/R-DynDoc Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200709301847.l8UIljXt008705@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc

Added Files:
	Makefile import.log 
Log Message:
Setup of module R-DynDoc


--- NEW FILE Makefile ---
# Top level Makefile for module R-DynDoc
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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Sep 30 18:47:48 2007
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 30 Sep 2007 14:47:48 -0400
Subject: rpms/R-DynDoc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200709301847.l8UIlmPa008722@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/R-DynDoc/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfQ8636/rpms/R-DynDoc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-DynDoc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-DynDoc
# $Id: Makefile,v 1.1 2007/09/30 18:47:46 kevin Exp $
NAME := R-DynDoc
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 fedora-extras-commits at redhat.com  Sun Sep 30 18:54:31 2007
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Sep 2007 14:54:31 -0400
Subject: rpms/pingus/devel .cvsignore, 1.3, 1.4 pingus.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200709301854.l8UIsVUd009285@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pingus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9260

Modified Files:
	.cvsignore pingus.spec sources 
Log Message:
* Sun Sep 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
- New upstream release 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2007 20:40:24 -0000	1.3
+++ .cvsignore	30 Sep 2007 18:53:59 -0000	1.4
@@ -1 +1 @@
-pingus-0.7.0.tar.bz2
+pingus-0.7.1.tar.bz2


Index: pingus.spec
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/pingus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pingus.spec	29 Aug 2007 21:00:22 -0000	1.7
+++ pingus.spec	30 Sep 2007 18:53:59 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           pingus
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        Guide the penguins safely home before they drop of the cliff
 Group:          Amusements/Games
@@ -8,7 +8,6 @@
 Source0:        http://pingus.seul.org/files/%{name}-%{version}.tar.bz2
 Source1:        pingus.desktop
 Source2:        pingus.png
-Patch0:         pingus-0.7.0-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel boost-devel libpng-devel
 BuildRequires:  physfs-devel scons desktop-file-utils
@@ -25,12 +24,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
+iconv -f ISO8859-2 -t UTF8 AUTHORS > AUTHORS.tmp
+mv AUTHORS.tmp AUTHORS
 
 
 %build
-export CCFLAGS="$RPM_OPT_FLAGS"
-scons
+scons CCFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -77,6 +76,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
+- New upstream release 0.7.1
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.0-1
 - New upstream release 0.7.0 final
 - This changes pingus from a ClanLib app into an SDL app


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 20:40:24 -0000	1.3
+++ sources	30 Sep 2007 18:53:59 -0000	1.4
@@ -1 +1 @@
-d967a3c233aa094236eb2ce6a3e20dd8  pingus-0.7.0.tar.bz2
+b4fcf66d0dc5e1d6148447988f87d3b1  pingus-0.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:07:02 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:07:02 -0400
Subject: rpms/qwt-doc import.log,1.1,1.2
Message-ID: <200709301907.l8UJ7206015929@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15876

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Sep 2007 18:45:03 -0000	1.1
+++ import.log	30 Sep 2007 19:06:30 -0000	1.2
@@ -0,0 +1 @@
+qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149



From fedora-extras-commits at redhat.com  Sun Sep 30 19:07:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:07:04 -0400
Subject: rpms/qwt-doc/devel qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301907.l8UJ74mr015933@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:06:32 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:09:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:09:04 -0400
Subject: rpms/qwt-doc import.log,1.2,1.3
Message-ID: <200709301909.l8UJ94sA016178@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Sep 2007 19:06:30 -0000	1.2
+++ import.log	30 Sep 2007 19:08:31 -0000	1.3
@@ -1 +1,2 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
+qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281



From fedora-extras-commits at redhat.com  Sun Sep 30 19:09:06 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:09:06 -0400
Subject: rpms/qwt-doc/FC-6 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301909.l8UJ960d016182@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16099/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:08:34 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:08:34 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:11:04 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:11:04 -0400
Subject: rpms/qwt-doc import.log,1.3,1.4
Message-ID: <200709301911.l8UJB4Is016341@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	30 Sep 2007 19:08:31 -0000	1.3
+++ import.log	30 Sep 2007 19:10:31 -0000	1.4
@@ -1,2 +1,3 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
 qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281
+qwt-doc-5_0_2-4FC5:F-7:qwt-doc-5.0.2-4FC5.src.rpm:1191179404



From fedora-extras-commits at redhat.com  Sun Sep 30 19:11:07 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:11:07 -0400
Subject: rpms/qwt-doc/F-7 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301911.l8UJB7qE016345@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:10:34 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:10:34 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 19:13:24 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:13:24 -0400
Subject: rpms/qwt-doc import.log,1.4,1.5
Message-ID: <200709301913.l8UJDOn9016659@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558

Modified Files:
	import.log 
Log Message:
initial import



Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	30 Sep 2007 19:10:31 -0000	1.4
+++ import.log	30 Sep 2007 19:12:52 -0000	1.5
@@ -1,3 +1,4 @@
 qwt-doc-5_0_2-4FC5:HEAD:qwt-doc-5.0.2-4FC5.src.rpm:1191179149
 qwt-doc-5_0_2-4FC5:FC-6:qwt-doc-5.0.2-4FC5.src.rpm:1191179281
 qwt-doc-5_0_2-4FC5:F-7:qwt-doc-5.0.2-4FC5.src.rpm:1191179404
+qwt-doc-5_0_2-4FC5:EL-5:qwt-doc-5.0.2-4FC5.src.rpm:1191179538



From fedora-extras-commits at redhat.com  Sun Sep 30 19:13:28 2007
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 30 Sep 2007 15:13:28 -0400
Subject: rpms/qwt-doc/EL-5 qwt-doc.spec, NONE, 1.1 qwt-path.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200709301913.l8UJDSvb016663@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qwt-doc/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-doc.spec qwt-path.patch 
Log Message:
initial import



--- NEW FILE qwt-doc.spec ---
Name:		qwt-doc
Summary:	Documentation of qwt
Version:	5.0.2
Release:	4%{?dist}
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          Documentation
Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
Patch0:         qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  qt4-devel
Buildarch:	noarch
Requires: 	qwt = %{version}

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%description 
The documentation of the lib.

%prep
%setup -q -n qwt-%{version}
%patch0 -p1
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}\1" qwtconfig.pri

%build
#fix the file coding
iconv -f ISO-8859-1 -t utf-8 doc/man/man3/QwtPicker.3 -o doc/man/man3/QwtPicker.3.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/index.html -o doc/html/index.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/class_qwt_picker.html -o doc/html/class_qwt_picker.html.tmp
iconv -f ISO-8859-1 -t utf-8 doc/html/qwt__symbol_8cpp-source.html -o doc/html/qwt__symbol_8cpp-source.html.tmp
mv doc/man/man3/QwtPicker.3.tmp doc/man/man3/QwtPicker.3
mv doc/html/index.html.tmp doc/html/index.html
mv doc/html/class_qwt_picker.html.tmp doc/html/class_qwt_picker.html
mv doc/html/qwt__symbol_8cpp-source.html.tmp doc/html/qwt__symbol_8cpp-source.html
#replace encoding string at the html files
find doc/html/ -name "*.html" | xargs sed -i "s/iso-8859-1/utf-8/g"


cd src
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif

sed -i "s\install_doc: first FORCE\install_doc: FORCE\1" Makefile 

%install
rm -rf $RPM_BUILD_ROOT
make -f src/Makefile install_doc COPY="cp -a"
cp  -p %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/
#fix the path of the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man

%clean
rm -rf $RPM_BUILD_ROOT

%files
%{_docdir}/qwt-%{version}/*
%{_mandir}/man3/*

%changelog
* Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
 - modify the file encoding
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3
 - add EPEL support
* Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-2
 - fix spec file
* Mon Jun 11 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-1
 - split the doc files.

qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2007 18:45:05 -0000	1.1
+++ .cvsignore	30 Sep 2007 19:12:54 -0000	1.2
@@ -0,0 +1,2 @@
+qwt-5.0.2.pdf
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt-doc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2007 18:45:05 -0000	1.1
+++ sources	30 Sep 2007 19:12:54 -0000	1.2
@@ -0,0 +1,2 @@
+9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 20:08:48 2007
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Sep 2007 16:08:48 -0400
Subject: rpms/neverball/devel neverball.desktop, 1.3, 1.4 neverball.spec,
	1.14, 1.15 neverputt.desktop, 1.2, 1.3
Message-ID: <200709302008.l8UK8m0K024466@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/neverball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24439

Modified Files:
	neverball.desktop neverball.spec neverputt.desktop 
Log Message:
Add wrapper for detecting DRI when launching game (BZ #304811)




Index: neverball.desktop
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- neverball.desktop	9 Mar 2007 21:37:25 -0000	1.3
+++ neverball.desktop	30 Sep 2007 20:08:15 -0000	1.4
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Neverball
 Comment=Ball guiding game.
-Exec=neverball
+Exec=neverball-wrapper
 Terminal=false
 Icon=neverball.png
 Type=Application


Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- neverball.spec	20 Aug 2007 19:57:37 -0000	1.14
+++ neverball.spec	30 Sep 2007 20:08:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -15,6 +15,7 @@
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
 BuildRequires:  libGL-devel
+Requires: opengl-games-utils
 
 %description
 Tilt the floor to roll a ball through an obstacle course within the
@@ -41,6 +42,8 @@
 install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png
 install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png
 cp -ap  data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverball-wrapper
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverputt-wrapper
 
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
@@ -62,6 +65,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 29 2007 Wart <wart at kobold.org> - 1.4.0-10
+- Add wrapper for detecting DRI when launching game (BZ #304811)
+
 * Mon Aug 20 2007 Wart <wart at kobold.org> - 1.4.0-9
 - License tag clarification
 


Index: neverputt.desktop
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverputt.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- neverputt.desktop	9 Mar 2007 21:37:25 -0000	1.2
+++ neverputt.desktop	30 Sep 2007 20:08:15 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Neverputt
 Comment=Minigolf like game
-Exec=neverputt
+Exec=neverputt-wrapper
 Terminal=false
 Icon=neverputt.png
 Type=Application



From fedora-extras-commits at redhat.com  Sun Sep 30 21:10:46 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 30 Sep 2007 17:10:46 -0400
Subject: rpms/scribes/devel .cvsignore, 1.16, 1.17 scribes.spec, 1.34,
	1.35 sources, 1.16, 1.17
Message-ID: <200709302110.l8ULAkMf002378@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2306

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3.2.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Jun 2007 02:00:27 -0000	1.16
+++ .cvsignore	30 Sep 2007 21:10:14 -0000	1.17
@@ -1 +1,2 @@
 scribes-0.3.2.8.tar.bz2
+scribes-0.3.2.9.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- scribes.spec	10 Jun 2007 03:56:21 -0000	1.34
+++ scribes.spec	30 Sep 2007 21:10:14 -0000	1.35
@@ -3,11 +3,11 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2.8
-Release:	3%{?dist}
+Version:	0.3.2.9
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://scribes.sourceforge.net/           
 
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -158,6 +158,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.9-1
+- Update to new upstream release (0.3.2.9).
+- Update License tag (GPLv2+).
+
 * Sat Jun 09 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.8-3
 - Revert previous Yelp dependency addition. It's in the default install (via
   comps) and the only bad thing to happen if it's not available is that


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Jun 2007 02:00:27 -0000	1.16
+++ sources	30 Sep 2007 21:10:14 -0000	1.17
@@ -1 +1,2 @@
 a593994bb80dd35a26a02676ba69e786  scribes-0.3.2.8.tar.bz2
+c2cc2dcc28853b950d618c5ef9a8c170  scribes-0.3.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 21:19:19 2007
From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard))
Date: Sun, 30 Sep 2007 17:19:19 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.24, 1.25 libvirt.spec, 1.64,
	1.65 sources, 1.25, 1.26
Message-ID: <200709302119.l8ULJJiq002896@cvs-int.fedora.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2846

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.3.3 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	21 Aug 2007 15:14:54 -0000	1.24
+++ .cvsignore	30 Sep 2007 21:18:47 -0000	1.25
@@ -21,3 +21,4 @@
 libvirt-0.3.0.tar.gz
 libvirt-0.3.1.tar.gz
 libvirt-0.3.2.tar.gz
+libvirt-0.3.3.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libvirt.spec	24 Aug 2007 15:34:27 -0000	1.64
+++ libvirt.spec	30 Sep 2007 21:18:47 -0000	1.65
@@ -2,8 +2,8 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.3.2
-Release: 2%{?dist}%{?extra_release}
+Version: 0.3.3
+Release: 1%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -25,6 +25,9 @@
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+BuildRequires: avahi-devel
+BuildRequires: dnsmasq
+BuildRequires: bridge-utils
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -180,6 +183,13 @@
 %doc docs/examples/python
 
 %changelog
+* Sun Sep 30 2007 Daniel Veillard <veillard at redhat.com> - 0.3.3-1
+- Release of 0.3.3
+- Avahi support
+- NUMA support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
 * Fri Aug 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.2-2.fc8
 - also build on arches where Xen is not available
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	21 Aug 2007 15:14:54 -0000	1.25
+++ sources	30 Sep 2007 21:18:47 -0000	1.26
@@ -1 +1 @@
-8e6735446ae8a95cf47877725282d775  libvirt-0.3.2.tar.gz
+583fa13938df63bd404cc1b7cf553874  libvirt-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 21:19:30 2007
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 30 Sep 2007 17:19:30 -0400
Subject: rpms/scribes/F-7 .cvsignore, 1.15, 1.16 scribes.spec, 1.31,
	1.32 sources, 1.15, 1.16
Message-ID: <200709302119.l8ULJUmN002938@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2870/F-7

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3.2.9, sync other changes from devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 Jun 2007 02:44:37 -0000	1.15
+++ .cvsignore	30 Sep 2007 21:18:58 -0000	1.16
@@ -1 +1 @@
-scribes-0.3.2.8.tar.bz2
+scribes-0.3.2.9.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/scribes.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scribes.spec	11 Jun 2007 02:44:37 -0000	1.31
+++ scribes.spec	30 Sep 2007 21:18:58 -0000	1.32
@@ -3,11 +3,11 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2.8
+Version:	0.3.2.9
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2+
 URL:		http://scribes.sourceforge.net/           
 
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 BuildRequires:	automake
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
+BuildRequires:	intltool
 
 ## pygtk2 depends on gtk2 as a run-time dependency, which in turn depends on
 ## hicolor-icon-theme; thus the %%_datadir/icons/hicolor directory tree is not
@@ -67,9 +68,9 @@
 * Translations into several different languages,
 ...and more are in development!
 
-In order to make use of its runtime documentation facilities, you will need to
-install Yelp. Also, you may install the python-psyco package (x86-only) for a
-boost in startup speed.
+You may install the python-psyco package (x86-only) for a boost in startup
+speed. Also, you will need to install the Yelp package for Scribes' built-in
+help and documentation. 
 
 
 %prep
@@ -101,10 +102,7 @@
 	--remove-category=Application	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
-## Fix some plugin script permissions...
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
-chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
+rm -f %{buildroot}/%{_datadir}/%{name}/plugins/*/.__junk
 %find_lang %{name}
 
 
@@ -160,6 +158,10 @@
 
 
 %changelog
+* Sun Sep 30 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.9-1
+- Update to new upstream release (0.3.2.9).
+- Update License tag (GPLv2+).
+
 * Sun Jun 10 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.8-1
 - Update to new upstream release (0.3.2.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Jun 2007 02:44:37 -0000	1.15
+++ sources	30 Sep 2007 21:18:58 -0000	1.16
@@ -1 +1 @@
-a593994bb80dd35a26a02676ba69e786  scribes-0.3.2.8.tar.bz2
+c2cc2dcc28853b950d618c5ef9a8c170  scribes-0.3.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Sep 30 22:59:11 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 18:59:11 -0400
Subject: rpms/mlton/F-7 mlton-20070826-debuginfo.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 mlton.spec, 1.9, 1.10 sources, 1.3,
	1.4 mlton-20051202-pdf-docs.patch, 1.1,
	NONE mlton-20061107-debuginfo.patch, 1.1,
	NONE mlton-20061107-optflags.patch, 1.1, NONE
Message-ID: <200709302259.l8UMxBWA012448@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12423

Modified Files:
	.cvsignore mlton.spec sources 
Added Files:
	mlton-20070826-debuginfo.patch 
Removed Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Log Message:
synchronize devel version to F-7

mlton-20070826-debuginfo.patch:

--- NEW FILE mlton-20070826-debuginfo.patch ---
diff -ur mlton-20070826~/Makefile mlton-20070826/Makefile
--- mlton-20070826~/Makefile	2007-08-26 17:04:14.000000000 -0400
+++ mlton-20070826/Makefile	2007-08-26 18:28:15.000000000 -0400
@@ -430,17 +430,6 @@
 	if $(GZIP_MAN); then						\
 		cd "$(TMAN)" && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in "$(TLIB)/$(AOUT)$(EXE)" "$(TBIN)/$(LEX)$(EXE)"	\
-			"$(TBIN)/$(NLFFIGEN)$(EXE)" "$(TBIN)/$(PROF)$(EXE)"	\
-			"$(TBIN)/$(YACC)$(EXE)"; do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note "$$f"; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2006 00:23:17 -0000	1.3
+++ .cvsignore	30 Sep 2007 22:58:38 -0000	1.4
@@ -1 +1 @@
-mlton-20061107.tar.bz2
+mlton-20070826-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/mlton.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mlton.spec	8 Aug 2007 01:53:29 -0000	1.9
+++ mlton.spec	30 Sep 2007 22:58:38 -0000	1.10
@@ -1,23 +1,18 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20061107
-Release:	3%{?dist}
+Version:	20070826
+Release:	10%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	MIT
 URL:		http://mlton.org/
-Source0:	mlton-%{version}.tar.bz2
-%if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1:	mlton-bootstrap.i386.tar.bz2
-Source2:	mlton-bootstrap.ppc.tar.bz2
-%endif
+Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
+#Source1:	mlton-20061107-1.ppc-linux.tgz
 
-Patch0:		mlton-20051202-pdf-docs.patch
-Patch1:		mlton-20061107-debuginfo.patch
-Patch2:		mlton-20061107-optflags.patch
+Patch0:		mlton-20070826-debuginfo.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +24,8 @@
 
 Requires:	gmp-devel gcc
 
-# not yet available for 64-bit arch (#198764)
-ExcludeArch:	x86_64 ppc64
+# need to bootstrap ppc64 still
+ExcludeArch:	ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -45,35 +40,30 @@
 %prep
 %setup -q
 
-# instantiate version numbers
-make version VERSION=%{version}
-
-# build documentation as PDF
-%patch -P 0 -p1 -b .pdf-docs
 # disable strip so debuginfo packages work
-%patch -P 1 -p1 -b .debuginfo
-# enable RPM_OPT_FLAGS
-%patch -P 2 -p1 -b .optflags
-
-# set correct version of PDF guide until this is fixed upstream
-sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
+%patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%ifarch i386
 %setup -T -D -q -a 1
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
+	usr/bin/mlton
 %endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
-	bootstrap/usr/bin/mlton
-%endif
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+  sed -e '/perl(mltex.thm)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
 
 
 %build
 %if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
 %endif
 
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -82,7 +72,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT MAN_PREFIX_EXTRA=/share \
-	TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+	ULIB=%{_lib}/mlton
 
 # remove unecessary regression test
 rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
@@ -107,8 +98,40 @@
 
 
 %changelog
-* Fri May 25 2007 Adam Goode <adam at spicenitz.org> - 20061107-2.1
-- ExcludeArch: ppc64
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
+- Disable bootstrap
+
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
+- Re-bootstrap ppc
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
+- Really fix SRPM conditionals
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
+- Work around strange SRPM problem in conditionals
+- Fix changelog (forgot release 5?)
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+- Build on ppc now that #247407 is fixed
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
+- Do not condition bootstrap source tag
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
+* Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
+- Exclude ppc for now (GCC internal compiler error!)
+
+* Sun Aug 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-1
+- Update to new release
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-4
+- Exclude ppc64 for now
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-3
+- Update license tag
+- Rebuild for buildid
 
 * Fri Nov 24 2006 Adam Goode <adam at spicenitz.org> - 20061107-2
 - Use RPM_OPT_FLAGS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 00:23:17 -0000	1.3
+++ sources	30 Sep 2007 22:58:38 -0000	1.4
@@ -1 +1 @@
-eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2
+08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz


--- mlton-20051202-pdf-docs.patch DELETED ---


--- mlton-20061107-debuginfo.patch DELETED ---


--- mlton-20061107-optflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 23:03:20 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 19:03:20 -0400
Subject: rpms/mlton/F-7 mlton.spec,1.10,1.11
Message-ID: <200709302303.l8UN3KjQ018628@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18595

Modified Files:
	mlton.spec 
Log Message:
* Sun Sep 30 2007 Adam Goode <adam at spicenitz.org> - 20070826-10.1
- Enable bootstrap for x86_64 for Fedora 7



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/mlton.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mlton.spec	30 Sep 2007 22:58:38 -0000	1.10
+++ mlton.spec	30 Sep 2007 23:02:47 -0000	1.11
@@ -1,8 +1,12 @@
+%ifarch x86_64
+%define mlton_bootstrap 1
+%else
 %define mlton_bootstrap 0
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	10%{?dist}
+Release:	10%{?dist}.1
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -10,7 +14,7 @@
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
 
-#Source1:	mlton-20061107-1.ppc-linux.tgz
+Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 
 Patch0:		mlton-20070826-debuginfo.patch
 
@@ -98,6 +102,9 @@
 
 
 %changelog
+* Sun Sep 30 2007 Adam Goode <adam at spicenitz.org> - 20070826-10.1
+- Enable bootstrap for x86_64 for Fedora 7
+
 * Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
 - Disable bootstrap
 



From fedora-extras-commits at redhat.com  Sun Sep 30 23:05:01 2007
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 30 Sep 2007 19:05:01 -0400
Subject: rpms/mlton/F-7 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200709302305.l8UN51ND018695@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18668

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Sep 2007 22:58:38 -0000	1.4
+++ .cvsignore	30 Sep 2007 23:04:28 -0000	1.5
@@ -1 +1,2 @@
+mlton-20070826-1.amd64-linux.tgz
 mlton-20070826-1.src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Sep 2007 22:58:38 -0000	1.4
+++ sources	30 Sep 2007 23:04:28 -0000	1.5
@@ -1 +1,2 @@
+a6bba7e4936b5c57e4383751777998cb  mlton-20070826-1.amd64-linux.tgz
 08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz



From fedora-extras-commits at redhat.com  Sun Sep 30 23:14:52 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Sun, 30 Sep 2007 19:14:52 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.47,1.48
Message-ID: <200709302314.l8UNEqkn018898@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18809

Modified Files:
	fonts-chinese.spec 
Log Message:
* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Taipei fonts was moved to a separate package taipeifonts.
  <<<<< Improved: % defattr(-,root,root,-)
  <<<<<-Put taipeifonts after cjkunifonts in the requires.

* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Tidy up spec file.



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- fonts-chinese.spec	31 Aug 2007 08:20:41 -0000	1.47
+++ fonts-chinese.spec	30 Sep 2007 23:14:19 -0000	1.48
@@ -1,74 +1,44 @@
-%define basefontdir    %{_datadir}/fonts/chinese
-%define miscfontdir    %{basefontdir}/misc
-%define catalogue      /etc/X11/fontpath.d
-
-%define taipeiver 1.2
-
-Summary:     Traditional Chinese bitmap fonts and meta-package for Chinese fonts
 Name:         fonts-chinese
-Version:      3.03
-Release:      10%{?dist}
-License:      Public Domain
+Summary:      Meta-package for Chinese fonts
+License:      GPLv2+
 Group:        User Interface/X
+Version:      3.03
+Release:      12%{?dist}
 BuildArch:    noarch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-
-Source1:     taipeifonts-%{taipeiver}.tar.gz
-Source2:     taipeifonts.alias
+BuildRoot:    %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:       xorg-x11-font-utils
-Obsoletes:           ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28, ttf-moe_sung, ttf-moe_kai, ttf-arphic_bming, ttf-arphic_bkai, taipeifonts
-Requires:            cjkunifonts-uming, cjkunifonts-ukai
+Requires:     cjkunifonts-uming, cjkunifonts-ukai
+Requires:     taipeifonts
 
 %description
-This package includes some Traditional Chinese bitmap fonts and also acts
-as a meta-package for general Chinese fonts support.
+This is a meta-package for Chinese fonts support.
 
 %prep
-%setup -q -T -c -a1
+%{nil}
 
 %build
-pushd taipeifonts-%{taipeiver}/
-bdftopcf taipei24.bdf | gzip -c > taipei24.pcf.gz
-bdftopcf taipei20.bdf | gzip -c > taipei20.pcf.gz
-bdftopcf taipei16.bdf | gzip -c > taipei16.pcf.gz
-popd
+%{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
-
-# for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -s %{miscfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
-
-# for fonts.*
-mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
-
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%dir %{basefontdir}
-%dir %{miscfontdir}
-%{miscfontdir}/*.gz
-%{miscfontdir}/fonts.alias
-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%verify(not md5 size mtime) %{miscfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
-%{catalogue}/%{name}
+%defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Taipei fonts was moved to a separate package taipeifonts.
+  <<<<< Improved: % defattr(-,root,root,-)
+  <<<<<-Put taipeifonts after cjkunifonts in the requires.
+
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Tidy up spec file.
+
 * Fri Aug 31 2007 Jens Petersen <petersen at redhat.com> - 3.03-10.fc8
 - finish moving Uming and Ukai truetype fonts over to cjkunifonts (#266281):
 - update summary and description
@@ -82,7 +52,7 @@
 - Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
 -- remove ttfontdir and cidmapdir
 -- update license to Public Domain for taipeifonts
--- remove %{_datadir}/fonts/zh_*/TrueType/ compat dirs
+-- remove % {_datadir}/fonts/zh_*/TrueType/ compat dirs
 -- remove fc-cache from post and postun scriptlets
 
 * Mon Aug 27 2007 Caius Chance <cchance at redhat.com> - 3.03-9.fc8



From fedora-extras-commits at redhat.com  Sun Sep 30 23:26:12 2007
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 30 Sep 2007 19:26:12 -0400
Subject: rpms/codeina/devel codeina-f8-wishlist.patch, NONE, 1.1 codeina.spec,
	1.4, 1.5 codeina-python-dirs.patch, 1.1, NONE
Message-ID: <200709302326.l8UNQC98019132@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/codeina/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19098

Modified Files:
	codeina.spec 
Added Files:
	codeina-f8-wishlist.patch 
Removed Files:
	codeina-python-dirs.patch 
Log Message:
* Mon Oct 01 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2
- Big patch from myself (fixes from Thomas) to:
- Show a title to the price column (#299251)
- Not redownload already downloaded packages, and check whether corrupted
  (#305421)
- Select free matching codecs by default (#305411)
- Clearly show an empty list and a warning when no codecs match the required
  ones, so users don't get confused


codeina-f8-wishlist.patch:

--- NEW FILE codeina-f8-wishlist.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 827)
+++ ChangeLog	(working copy)
@@ -1,3 +1,24 @@
+2007-09-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Bastien Nocera
+
+	* codeina/httpdownload.py:
+	* codeina/listview.py:
+	* codeina/main.py:
+	* codeina/productlist.py:
+	* codeina/requiredplugin.py:
+	* data/available-plugins.xml.in:
+	  Add sha1sums to plugins, and use it to verify plugin download.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=305421
+	  Add price column header.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=299251
+	  Select free and matching codecs by default.
+	  See https://bugzilla.redhat.com/show_bug.cgi?id=305411
+	  Don't silently switch to the "all available" view when requesting a
+	  plugin that's not available, instead, show an empty list, and
+	  error
+	  message with an explanation on how to see all the plugins
+
 === release 0.10.1 ===
 
 2007-08-27  Thomas Vander Stichele  <thomas at apestaart dot org>
Index: codeina/requiredplugin.py
===================================================================
--- codeina/requiredplugin.py	(revision 827)
+++ codeina/requiredplugin.py	(working copy)
@@ -51,6 +51,10 @@
                     if self.req_type in self.valid_req_types:
                         self.valid = True
 
+    def __repr__(self):
+        return "<%s for %s> " % (self.__class__.__name__, self.req_string)
+
+
   # currently we're only interested in specialising mp3, we should probably
   # do something more generic later that covers other common formats too
     def is_mp3_decoder(self):
Index: codeina/listview.py
===================================================================
--- codeina/listview.py	(revision 827)
+++ codeina/listview.py	(working copy)
@@ -35,6 +35,10 @@
 
 
 class ListView(gtk.VBox):
+    """
+    @ivar productlist: list of products, set when creating the listview
+    @type productlist: L{codeina.productlist.ProductList}
+    """
 
     def __init__(self):
         gtk.VBox.__init__(self)
@@ -53,7 +57,9 @@
         self.view = gtk.TreeView()
         row_height = self.get_estimated_row_height()
         row_padding = 2  # assumed, random number
-        self.view.set_size_request(-1, (row_height + row_padding) * 8)
+        headers_height = 12 # assumed
+        self.view.set_size_request(-1,
+            (row_height + row_padding) * 8 + headers_height)
         self.productlist = None
         self.store = gtk.ListStore(object)
         self.store.set_default_sort_func(self.sort_func, self)
@@ -61,9 +67,8 @@
         self.model = self.store.filter_new()
         self.model.set_visible_func(self.visible_func, self)
         self.view.set_model(self.model)
-        self.view.set_headers_visible(False)
         self.view.set_rules_hint(True)
-        column = gtk.TreeViewColumn("product")
+        column = gtk.TreeViewColumn(_("Product"))
         text_renderer = gtk.CellRendererText()
         text_renderer.set_property('xpad', 6)
         text_renderer.set_property('ypad', 3)
@@ -79,7 +84,7 @@
       # the expand property to False, so that things behave right if the
       # user makes the window wider
 
-        column = gtk.TreeViewColumn('install-status')
+        column = gtk.TreeViewColumn(_('Installed?'))
         status_renderer = gtk.CellRendererText()
         column.pack_start(status_renderer, True)
         status_renderer.set_property('xalign', 0.5)
@@ -90,7 +95,7 @@
         column.set_expand(False)
         self.view.append_column(column)
 
-        column = gtk.TreeViewColumn('price')
+        column = gtk.TreeViewColumn(_('Price'))
         price_renderer = gtk.CellRendererText()
         column.pack_end(price_renderer, False)
         price_renderer.set_property('xalign', 1.0)
@@ -102,7 +107,7 @@
 
      # Put check boxes in separate column for nicer activation
 
-        column = gtk.TreeViewColumn("toggle")
+        column = gtk.TreeViewColumn("")
         toggle_renderer = gtk.CellRendererToggle()
         toggle_renderer.set_property('activatable', True)
         toggle_renderer.connect('toggled', self.cell_toggled_cb, self)
@@ -145,13 +150,16 @@
             return False
         flav = product.get_best_flavor_for_current_system()
         if not flav:
+            print "product %r does not have flavor" % product
             product.set_selected(False)
             return False
         if not self.required_plugins:
             return True
         else:
+            print "Checking visibility of product %r" % product
             for req in self.required_plugins:
                 if product.provides_requirement(req):
+                    print "provides requirement %r, showing" % req
                     return True
             return False
 
@@ -229,7 +237,7 @@
                              data):
         product = tree_model.get_value(tree_iter, 0)
         if product.price:
-            renderer.set_property('text', "%.0f???" % product.price)
+            renderer.set_property('text', "%.0f ???" % product.price)
         else:
             renderer.set_property('text', _("Free"))
         return
@@ -238,11 +246,16 @@
         self.store.clear()
         if self.productlist:
             for p in self.productlist.products:
+                print "appending product %r" % p
                 row = self.store.append()
                 self.store.set_value(row, 0, p)
         return
 
     def set_product_list(self, product_list):
+        """
+        @ivar productlist: list of products the view should handle
+        @type productlist: L{codeina.productlist.ProductList}
+        """
         if self.productlist != product_list:
             self.productlist = product_list
             self.fill_with_products()
Index: codeina/httpdownload.py
===================================================================
--- codeina/httpdownload.py	(revision 827)
+++ codeina/httpdownload.py	(working copy)
@@ -31,7 +31,9 @@
 import thread
 import urllib2
 import xdg.BaseDirectory
+import sha
 
+from codeina.extern.log import log
 from gettext import gettext as _
 
 # Defaults to ~/.local/share/codeina/downloads/ in most cases
@@ -43,7 +45,7 @@
 Downloads a HTTP URI to file in a separate thread and iterates the
 GLib/Gtk main context until either the download is done or an error occurred
 """
-class HttpDownload:
+class HttpDownload(log.Loggable):
     """
     @ivar  content_length: size in bytes of the download
     """
@@ -59,6 +61,7 @@
 
     def __init__ (self):
         self.url = None
+        self.sha1sum = None
         self.directory = None
         self.fn = None
         self.done = False
@@ -71,7 +74,7 @@
     def get_error_msg_from_error(self, err):
         msg = _("Unexpected error of type %s") % type(err)
         try:
-            raise err        
+            raise err
         except urllib2.HTTPError, e:
             if e.code == 403:
               msg = _("Access to this file is forbidden")
@@ -105,7 +108,11 @@
         return msg
 
     """ Iterates the default GLib main context until the download is done """
-    def run(self, url, directory, fn, message=None):
+    def run(self, url, directory, fn, sha1sum, message=None):
+        self.debug("Running download for %s (sha1sum=%s)" % (os.path.join(directory, fn), sha1sum))
+        if sha1sum and self.verify(os.path.join(directory, fn), sha1sum):
+            self.debug("Already downloaded %s" % os.path.join(directory, fn))
+            return None
 
         if self.url:
             return _("Download already in progress")
@@ -116,6 +123,7 @@
         self.url = url
         self.directory = directory
         self.fn = fn
+        self.sha1sum = sha1sum
         self.done = False
         self.err = None
         self.bytes_read = -1
@@ -165,6 +173,23 @@
 
         return not self.done
 
+    """ Check whether a file matches the SHA1 sum given """
+    def verify(self, fn, sha1sum):
+        if not sha1sum:
+            self.debug("No sha1sum or filename, can't check (%s), "
+                "so assuming true" % fn)
+            return True
+
+        fs = open(fn,'rb').read()
+        real_sha1sum = sha.new(fs).hexdigest()
+        if real_sha1sum == sha1sum:
+            self.debug("%s matched its sha1sum" % fn)
+            return True
+
+        self.debug("%s didn't match its sha1sum (got %s expected %s)" % (
+            fn, real_sha1sum, sha1sum))
+        return False
+
     """ Thread where all the downloading and file writing happens """
     def thread_func(self):
 
@@ -191,8 +216,8 @@
                 pass
 
           # Now create a temp file there
-            tmpfile_handle, tmpfile_path = tempfile.mkstemp('.incomplete',\
-                                                            'codeina-download',\
+            tmpfile_handle, tmpfile_path = tempfile.mkstemp('.incomplete',
+                                                            'codeina-download',
                                                             self.directory)
 
             while not self.cancelled:
@@ -211,6 +236,12 @@
                     os.remove(tmpfile_path)
                 except:
                     pass
+            elif not self.verify(tmpfile_path, self.sha1sum):
+                try:
+                    os.remove(tmpfile_path)
+                except:
+                    pass
+                err = _("Downloaded file is corrupted")
             else:
                 os.rename(tmpfile_path, os.path.join(self.directory, self.fn))
 
@@ -277,11 +308,11 @@
     def destroy(self):
         self.dlg.destroy()
 
-    def run(self, url, directory, fn, message):
+    def run(self, url, directory, fn, sha1sum, message):
         if message:
             self.set_dialog_text(message)
         self.dlg.present()
-        err = HttpDownload.run(self, url, directory, fn, None)
+        err = HttpDownload.run(self, url, directory, fn, sha1sum, None)
         self.dlg.hide()
         return err
 
@@ -310,11 +341,16 @@
 
 
 if __name__ == "__main__":
-  # Different URLs for different errors
+    log.init('CODEINA_DEBUG')
+    log.setPackageScrubList('codeina')
+
+    # Different URLs for different errors
     #url='http://shop.fluendo.com/images/mpeg.png'
     #url='http://shop.fluendo.com/tpm-codeina-test.bz2'
     #url='http://example.com/gimme-a-404'
-    url='http://antihost.atari/tpm-codeina-test.bz2'
+    #url='http://antihost.atari/tpm-codeina-test.bz2'
+    url="http://shop.fluendo.com/pub/fluendo-mp3-2.i386.tar.bz2"
+    sha1sum='117f85e118dab2d9f7c9bb10554fbc4e8f7fdf38'
 
     download_dir = DEFAULT_DOWNLOAD_DIR
 
@@ -322,7 +358,7 @@
 
   # Do the downloading, with dialog
     d = HttpDownloadDialog()
-    e = d.run(url, download_dir, fn, "Downloading '%s'" % fn)
+    e = d.run(url, download_dir, fn, sha1sum, "Downloading '%s'" % fn)
     if d.cancelled:
         print "Download cancelled"
     elif e:
Index: codeina/productlist.py
===================================================================
--- codeina/productlist.py	(revision 827)
+++ codeina/productlist.py	(working copy)
@@ -103,13 +103,19 @@
         d['summary'] = self._get_localized(summaries)
         d['flavors'] = flavors
         product = Product(**d)
+
+        # Select the free-not-fully-installed plugins by default
+        if price == 0.0:
+            product.selected = not product.is_fully_installed()
+
         return product
 
     def _parse_flavor(self, node):
         d = {}
         required = ('system', 'arch', 'distro', 'distro-version',
             'core-req', 'base-req', 'last-modified', 'uri', 'comment')
-        attrs = self.parseAttributes(node, required=required)
+        optional = ('sha1sum',)
+        attrs = self.parseAttributes(node, required=required, optional=optional)
         for i in range(0, len(required)):
             # pesky - -> _ translation for attributes
             key = '_'.join(required[i].split('-'))
@@ -125,7 +131,6 @@
         flavor = ProductFlavor(**d)
         return flavor
 
-
     def _parse_name(self, node):
         # parse a name and its language
         # return tuple of language, name
@@ -204,6 +209,9 @@
 
     selected = False # for list view
 
+    def __repr__(self):
+        return "<%s for %s> " % (self.__class__.__name__, self.name)
+
     def get_selected(self):
         return self.selected
 
@@ -398,6 +406,7 @@
     version = None
     uri = None
     comment = None
+    sha1sum = None
 
     def is_compatible(self, system, arch, distro, core_version,
                       base_version):
@@ -418,18 +427,22 @@
 
 
 if __name__ == "__main__":
-    plist = ProductList()
-    try:
-        plist.read_from_xml(open("available-plugins.xml").read())
-        print "done, %d products:" % len(plist.products)
-        for p in plist.products:
-            print " * %s (%.2f EUR)" % (p.name, p.price)
-            for f in p.flavors:
-                print "     - %s %s %s" % (f.system, f.arch, f.distro)
-    except:
-        print "oops, couldn't parse products XML list"
+    xml_data = open("../data/available-plugins.xml")
+    parser = ProductListParser()
+    plist = parser.parse(xml_data)
+    print "done, %d products:" % len(plist.products)
+    for p in plist.products:
+        print " * %s (%.2f EUR)" % (p.name, p.price)
+        for f in p.flavors:
+            print "     - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
 
-#  flavs = plist.products[0].find_compatible_flavors ("Linux", "ppc64", None, Version("0.10.9"), Version ("0.10.9"))
-#  print "Matching flavors:"
-#  for f in flavs:
-#    print " - %s %s %s %s" % (f.product.name, f.system, f.arch, f.distro)
+    f = plist.products[9].get_best_flavor_for_current_system()
+    print "Best flavor:"
+    print " - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
+
+    flavs = plist.products[9].find_compatible_flavors ("Linux", "i386", None, check.Version("0.10.4"), check.Version("0.10.4"))
+#    flavs = plist.products[0].find_compatible_flavors ("Linux", "ppc64", None, Version("0.10.9"), Version ("0.10.9"))
+    print "Matching flavors:"
+    for f in flavs:
+        print " - %s %s %s %s %s" % (f.system, f.arch, f.distro, os.path.basename(f.uri), f.sha1sum)
+
Index: codeina/main.py
===================================================================
--- codeina/main.py	(revision 827)
+++ codeina/main.py	(working copy)
@@ -241,6 +241,18 @@
 
         self.vbox.pack_start(self.listview, True)
 
+      # The label showing we have no matching plugins
+
+        self.no_plugins_box = gtk.HBox()
+        img = gtk.Image()
+        img.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG)
+        self.no_plugins_box.pack_start(img, False, 0, 6)
+        label = gtk.Label(
+            _("There are no plugins available for the requested functionality.")
+            + "\n" + _("Please select the full plugins list in the View menu."))
+        self.no_plugins_box.pack_start(label, False)
+        self.vbox.pack_start(self.no_plugins_box, False)
+
       # status bar
 
         self.statusbar = gtk.Statusbar()
@@ -248,13 +260,15 @@
         self.statusbar.show()
         self.vbox.pack_end(self.statusbar, False)
 
-      # only show matching plugin packages if there are required plugins (?)
+      # only show matching plugin packages if there are required plugins
 
         if self.required_plugins and len(self.required_plugins) > 0:
+            self.debug("Showing the matching plugins list")
             self.actiongroup.get_action('ViewMatching').set_active(True)
         else:
+            self.debug("Showing all the plugins")
             self.actiongroup.get_action('ViewAllAvailable').set_active(True)
-            self.actiongroup.get_action('ViewMatching').set_visible(False)
+            self.actiongroup.get_action('ViewMatching').set_sensitive(False)
 
       # button box
 
@@ -341,7 +355,7 @@
         button.set_property('can-default', True)
         return button
 
-    def download_uri(self, dialog, name, uri):
+    def download_uri(self, dialog, name, uri, sha1sum):
         """
         Download the given uri.
 
@@ -352,7 +366,8 @@
         self.debug("Trying to download '%s'" % uri)
         dl_dir = DEFAULT_DOWNLOAD_DIR
         fn = os.path.basename(uri)
-        err_msg = dialog.run(uri, dl_dir, fn, _("Downloading '%s'") % name)
+        err_msg = dialog.run(uri, dl_dir, fn, sha1sum,
+            _("Downloading '%s'") % name)
         if dialog.cancelled:
             self.debug("Download cancelled")
             return None
@@ -378,7 +393,7 @@
 
         Returns: whether the EULA was accepted.
         """
-        path = self.download_uri(dialog, name, eula_uri)
+        path = self.download_uri(dialog, name, eula_uri, None)
         if not path:
             self.debug('Could not download EULA')
             return False
@@ -412,7 +427,10 @@
                     continue
 
             flavor = p.get_best_flavor_for_current_system()
-            path = self.download_uri(d, p.name, flavor.uri)
+            self.debug("Selected flavour %s %s %s %s %s" % (
+                flavor.system, flavor.arch, flavor.distro,
+                os.path.basename(flavor.uri), flavor.sha1sum))
+            path = self.download_uri(d, p.name, flavor.uri, flavor.sha1sum)
 
             if not path:
                 self.debug('User cancelled')
@@ -513,8 +531,12 @@
             self.listview.show_matching(self.required_plugins)
             no_rows_txt = _(
                 'No matching plugins available for your system yet.')
+
         if self.listview.get_visible_rows() == 0:
             self.set_status_text(no_rows_txt)
+            self.no_plugins_box.show_all()
+        else:
+            self.no_plugins_box.hide()
 
     def do_install(self, filenames):
         failed_installs = []
Index: data/available-plugins.xml.in
===================================================================
--- data/available-plugins.xml.in	(revision 827)
+++ data/available-plugins.xml.in	(working copy)
@@ -50,13 +50,15 @@
                     core-req="0.10.3" base-req="0.10.3"
                     last-modified="2007-05-25"
                     uri="http://shop.fluendo.com/pub/fluendo-mp3-2.i386.tar.bz2"
-                    comment="Tested on FC3, FC4, FC5, and Ubuntu 6.10 (edgy)"
+		    comment="Tested on FC3, FC4, FC5, and Ubuntu 6.10 (edgy)"
+		    sha1sum="117f85e118dab2d9f7c9bb10554fbc4e8f7fdf38"
     />
     <flavor system="Linux" arch="x86_64" distro="generic" distro-version="any"
                     core-req="0.10.3" base-req="0.10.3"
                     last-modified="2007-05-25"
                     uri="http://shop.fluendo.com/pub/fluendo-mp3-2.x86_64.tar.bz2"
-                    comment=""
+		    comment=""
+		    sha1sum="47e2169453c4025e88edd6e4e1b64da26cbf64c6"
     />
   </product>
 


Index: codeina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/codeina/devel/codeina.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeina.spec	27 Aug 2007 15:17:49 -0000	1.4
+++ codeina.spec	30 Sep 2007 23:25:40 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:           codeina
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GStreamer Codec Installation Application
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 # Upstream SVN repository is at https://core.fluendo.com/gstreamer/svn/codeina/trunk/
 Source:         http://www.fluendo.com/downloads/codeina/%{name}-%{version}.tar.bz2
 Source1:        gst-install-plugins-helper.sh
+Patch0:         codeina-f8-wishlist.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:       python >= 2.3
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .old
 
 %build
 %configure
@@ -62,6 +64,15 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Oct 01 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2
+- Big patch from myself (fixes from Thomas) to:
+- Show a title to the price column (#299251)
+- Not redownload already downloaded packages, and check whether corrupted
+  (#305421)
+- Select free matching codecs by default (#305411)
+- Clearly show an empty list and a warning when no codecs match the required
+  ones, so users don't get confused
+
 * Mon Aug 27 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.10.1-1
 - New release


--- codeina-python-dirs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Sep 30 23:44:36 2007
From: fedora-extras-commits at redhat.com (Caius Chance (cchance))
Date: Sun, 30 Sep 2007 19:44:36 -0400
Subject: rpms/fonts-chinese/devel .cvsignore,1.9,1.10 sources,1.11,1.12
Message-ID: <200709302344.l8UNia17019637@cvs-int.fedora.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602

Modified Files:
	.cvsignore sources 
Log Message:
Removed taipeifont sources from 'sources' and '.cvsignore' list.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Nov 2006 00:39:49 -0000	1.9
+++ .cvsignore	30 Sep 2007 23:44:04 -0000	1.10
@@ -2,19 +2,3 @@
 *.bz2
 *.gz
 *.rpm
-bkai00mp.ttf
-bsmi00lp.ttf
-gbsn00lp.ttf
-gkai00mp.ttf
-uming-v0.1-pre2.ttf
-ukai-v0.1-pre2.ttf
-ttf-arphic-uming_0.1-0.dot.3.tar.gz
-ttf-arphic-ukai_0.1-0.dot.3.tar.gz
-taipeifonts-1.2.tar.gz
-ttf-arphic-uming_0.1-0.dot.3-20060822a.tar.gz
-ttf-arphic-ukai_0.1.20060513.rh20060829a.tar.gz
-ttf-arphic-ukai_0.1.20060513.orig.tar.gz
-ttf-arphic-uming_0.1.20060513.orig.tar.gz
-ttf-arphic-uming_0.1.20060513.rh20060829a.tar.gz
-ttf-arphic-uming_0.1.20060928.orig.tar.gz
-ttf-arphic-ukai_0.1.20060928.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Aug 2007 08:17:29 -0000	1.11
+++ sources	30 Sep 2007 23:44:04 -0000	1.12
@@ -1 +0,0 @@
-9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Sep 30 23:55:52 2007
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 30 Sep 2007 19:55:52 -0400
Subject: comps comps-f8.xml.in,1.133,1.134
Message-ID: <200709302355.l8UNtqDC020089@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20065

Modified Files:
	comps-f8.xml.in 
Log Message:
[development-tools] add alex



Index: comps-f8.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f8.xml.in,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- comps-f8.xml.in	28 Sep 2007 16:46:57 -0000	1.133
+++ comps-f8.xml.in	30 Sep 2007 23:55:21 -0000	1.134
@@ -901,6 +901,7 @@
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">valgrind</packagereq>
       <packagereq type="optional">abicheck</packagereq>
+      <packagereq type="optional">alex</packagereq>
       <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>